Attachment 369333 Details for Bug 197676 – WIP Patch

[patch] WIP Patch

bug-197676.diff (text/plain), 30.57 MB, created by Don Olmstead on 2019-05-07 16:28:00 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Don Olmstead

Created: 2019-05-07 16:28:00 PDT

Size: 30.57 MB

patch

obsolete

>diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt
>index 54fe4a2d2bc..8bced685698 100644
>--- a/Source/CMakeLists.txt
>+++ b/Source/CMakeLists.txt
>@@ -13,7 +13,7 @@ endif ()
> 
> add_subdirectory(JavaScriptCore)
> 
>-if (WIN32 AND ENABLE_GRAPHICS_CONTEXT_3D)
>+if (ENABLE_GRAPHICS_CONTEXT_3D)
>     add_subdirectory(ThirdParty/ANGLE)
> endif ()
> 
>diff --git a/Source/ThirdParty/ANGLE/.clang-format b/Source/ThirdParty/ANGLE/.clang-format
>new file mode 100644
>index 00000000000..e5ff7cf4846
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/.clang-format
>@@ -0,0 +1,55 @@
>+# Defines the ANGLE style for automatic reformatting.
>+# https://code.google.com/p/angleproject/wiki/CodingStandard
>+# See Clang docs: http://clang.llvm.org/docs/ClangFormatStyleOptions.html
>+BasedOnStyle: Chromium
>+
>+# Allow double brackets such as std::vector<std::vector<int>>.
>+Standard: Cpp11
>+
>+# Indent 4 spaces at a time.
>+IndentWidth: 4
>+
>+# Keep lines under 100 columns long.
>+ColumnLimit: 100
>+
>+# Always break before braces
>+BreakBeforeBraces: Custom
>+BraceWrapping:
>+  AfterClass: true
>+  AfterControlStatement: true
>+  AfterEnum: true
>+  AfterFunction: true
>+  AfterNamespace: true
>+  AfterStruct: true
>+  AfterUnion: true
>+  BeforeCatch: true
>+  BeforeElse: true
>+  IndentBraces: false
>+  SplitEmptyFunction: false
>+  SplitEmptyRecord: false
>+  SplitEmptyNamespace: false
>+
>+  # Keeps extern "C" blocks unindented.
>+  AfterExternBlock: false
>+
>+# Indent case labels.
>+IndentCaseLabels: true
>+
>+# Right-align pointers and references
>+PointerAlignment: Right
>+
>+# ANGLE likes to align things as much as possible.
>+AlignOperands: true
>+AlignConsecutiveAssignments: true
>+
>+# Use 2 space negative offset for access modifiers
>+AccessModifierOffset: -2
>+
>+# TODO(jmadill): Decide if we want this on. Doesn't have an "all or none" mode.
>+AllowShortCaseLabelsOnASingleLine: false
>+
>+# Useful for spacing out functions in classes
>+KeepEmptyLinesAtTheStartOfBlocks: true
>+
>+# Indent nested PP directives.
>+IndentPPDirectives: AfterHash
>diff --git a/Source/ThirdParty/ANGLE/.gn b/Source/ThirdParty/ANGLE/.gn
>new file mode 100644
>index 00000000000..dd2aacc7e05
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/.gn
>@@ -0,0 +1,45 @@
>+# Copyright 2017 The Chromium Authors. All rights reserved.
>+# Use of this source code is governed by a BSD-style license that can be
>+# found in the LICENSE file.
>+#
>+# This file is used when gn runs in this directory (or a lower directory
>+# and searching upward ends here).  See "gn help dotfile."
>+# As a result this file will only affect stand-alone ANGLE builds,
>+# not chromium builds.
>+
>+import("//build/dotfile_settings.gni")
>+import("//dotfile_settings.gni")
>+
>+# Location of the build configuration file.
>+buildconfig = "//build/config/BUILDCONFIG.gn"
>+
>+# The secondary source root is a parallel directory tree where
>+# GN build files are placed when they can not be placed directly
>+# in the source tree, e.g. for third party source trees.
>+secondary_source = "//build/secondary/"
>+
>+# These are the targets to check headers for by default. The files in targets
>+# matching these patterns (see "gn help label_pattern" for format) will have
>+# their includes checked for proper dependencies when you run either
>+# "gn check" or "gn gen --check".
>+check_targets = [ "*" ]
>+
>+# These are the list of GN files that run exec_script. This whitelist exists
>+# to force additional review for new uses of exec_script, which is strongly
>+# discouraged except for gypi_to_gn calls.
>+exec_script_whitelist = angle_dotfile_settings.exec_script_whitelist +
>+                        build_dotfile_settings.exec_script_whitelist +
>+                        [
>+                          "//build/config/sysroot.gni",
>+                          "//build/config/win/BUILD.gn",
>+                          "//build/config/win/visual_studio_version.gni",
>+                          "//build/gn_helpers.py",
>+                          "//build_overrides/build.gni",
>+                        ]
>+
>+default_args = {
>+  use_custom_libcxx = false
>+  clang_use_chrome_plugins = true
>+  build_angle_deqp_tests = true
>+  use_sysroot = true
>+}
>diff --git a/Source/ThirdParty/ANGLE/.style.yapf b/Source/ThirdParty/ANGLE/.style.yapf
>new file mode 100644
>index 00000000000..7074d0e187b
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/.style.yapf
>@@ -0,0 +1,3 @@
>+[style]
>+based_on_style = chromium
>+column_limit = 99
>\ No newline at end of file
>diff --git a/Source/ThirdParty/ANGLE/ANGLE.txt b/Source/ThirdParty/ANGLE/ANGLE.txt
>deleted file mode 100644
>index 0513b7d0f9f..00000000000
>--- a/Source/ThirdParty/ANGLE/ANGLE.txt
>+++ /dev/null
>@@ -1,32 +0,0 @@
>-// Copyright (C) 2002-2010 The ANGLE Project Authors. 
>-// All rights reserved.
>-//
>-// Redistribution and use in source and binary forms, with or without
>-// modification, are permitted provided that the following conditions
>-// are met:
>-//
>-//     Redistributions of source code must retain the above copyright
>-//     notice, this list of conditions and the following disclaimer.
>-//
>-//     Redistributions in binary form must reproduce the above 
>-//     copyright notice, this list of conditions and the following
>-//     disclaimer in the documentation and/or other materials provided
>-//     with the distribution.
>-//
>-//     Neither the name of TransGaming Inc., Google Inc., 3DLabs Inc.
>-//     Ltd., nor the names of their contributors may be used to endorse
>-//     or promote products derived from this software without specific
>-//     prior written permission.
>-//
>-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
>-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
>-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
>-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
>-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
>-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
>-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
>-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
>-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
>-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
>-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
>-// POSSIBILITY OF SUCH DAMAGE.
>diff --git a/Source/ThirdParty/ANGLE/ANGLE/ShaderLang.h b/Source/ThirdParty/ANGLE/ANGLE/ShaderLang.h
>deleted file mode 100644
>index 73f8ed63f74..00000000000
>--- a/Source/ThirdParty/ANGLE/ANGLE/ShaderLang.h
>+++ /dev/null
>@@ -1 +0,0 @@
>-#include "include/GLSLANG/ShaderLang.h"
>diff --git a/Source/ThirdParty/ANGLE/ANGLE/egl.h b/Source/ThirdParty/ANGLE/ANGLE/egl.h
>deleted file mode 100644
>index cd511edeae2..00000000000
>--- a/Source/ThirdParty/ANGLE/ANGLE/egl.h
>+++ /dev/null
>@@ -1 +0,0 @@
>-#include "include/EGL/egl.h"
>diff --git a/Source/ThirdParty/ANGLE/ANGLE/eglext.h b/Source/ThirdParty/ANGLE/ANGLE/eglext.h
>deleted file mode 100644
>index 063f31c6348..00000000000
>--- a/Source/ThirdParty/ANGLE/ANGLE/eglext.h
>+++ /dev/null
>@@ -1 +0,0 @@
>-#include "include/EGL/eglext.h"
>diff --git a/Source/ThirdParty/ANGLE/ANGLE/eglext_angle.h b/Source/ThirdParty/ANGLE/ANGLE/eglext_angle.h
>deleted file mode 100644
>index c086e497384..00000000000
>--- a/Source/ThirdParty/ANGLE/ANGLE/eglext_angle.h
>+++ /dev/null
>@@ -1 +0,0 @@
>-#include "include/EGL/eglext_angle.h"
>diff --git a/Source/ThirdParty/ANGLE/ANGLE/eglplatform.h b/Source/ThirdParty/ANGLE/ANGLE/eglplatform.h
>deleted file mode 100644
>index 0f3c9453667..00000000000
>--- a/Source/ThirdParty/ANGLE/ANGLE/eglplatform.h
>+++ /dev/null
>@@ -1 +0,0 @@
>-#include "include/EGL/eglplatform.h"
>diff --git a/Source/ThirdParty/ANGLE/ANGLE/entry_points_egl.h b/Source/ThirdParty/ANGLE/ANGLE/entry_points_egl.h
>deleted file mode 100644
>index 41c430a5115..00000000000
>--- a/Source/ThirdParty/ANGLE/ANGLE/entry_points_egl.h
>+++ /dev/null
>@@ -1 +0,0 @@
>-#include "src/libGLESv2/entry_points_egl.h"
>diff --git a/Source/ThirdParty/ANGLE/ANGLE/entry_points_egl_ext.h b/Source/ThirdParty/ANGLE/ANGLE/entry_points_egl_ext.h
>deleted file mode 100644
>index fb9e5b3a10a..00000000000
>--- a/Source/ThirdParty/ANGLE/ANGLE/entry_points_egl_ext.h
>+++ /dev/null
>@@ -1 +0,0 @@
>-#include "src/libGLESv2/entry_points_egl_ext.h"
>diff --git a/Source/ThirdParty/ANGLE/ANGLE/entry_points_gles_2_0.h b/Source/ThirdParty/ANGLE/ANGLE/entry_points_gles_2_0.h
>deleted file mode 100644
>index 5f6ad2c89e7..00000000000
>--- a/Source/ThirdParty/ANGLE/ANGLE/entry_points_gles_2_0.h
>+++ /dev/null
>@@ -1 +0,0 @@
>-#include "src/libGLESv2/entry_points_gles_2_0.h"
>diff --git a/Source/ThirdParty/ANGLE/ANGLE/entry_points_gles_2_0_autogen.h b/Source/ThirdParty/ANGLE/ANGLE/entry_points_gles_2_0_autogen.h
>deleted file mode 100644
>index 2989972285d..00000000000
>--- a/Source/ThirdParty/ANGLE/ANGLE/entry_points_gles_2_0_autogen.h
>+++ /dev/null
>@@ -1 +0,0 @@
>-#include "src/libGLESv2/entry_points_gles_2_0_autogen.h"
>diff --git a/Source/ThirdParty/ANGLE/ANGLE/entry_points_gles_2_0_ext.h b/Source/ThirdParty/ANGLE/ANGLE/entry_points_gles_2_0_ext.h
>deleted file mode 100644
>index 29951767aaa..00000000000
>--- a/Source/ThirdParty/ANGLE/ANGLE/entry_points_gles_2_0_ext.h
>+++ /dev/null
>@@ -1 +0,0 @@
>-#include "src/libGLESv2/entry_points_gles_2_0_ext.h"
>diff --git a/Source/ThirdParty/ANGLE/ANGLE/entry_points_gles_3_0.h b/Source/ThirdParty/ANGLE/ANGLE/entry_points_gles_3_0.h
>deleted file mode 100644
>index 43d4b724279..00000000000
>--- a/Source/ThirdParty/ANGLE/ANGLE/entry_points_gles_3_0.h
>+++ /dev/null
>@@ -1 +0,0 @@
>-#include "src/libGLESv2/entry_points_gles_3_0.h"
>diff --git a/Source/ThirdParty/ANGLE/ANGLE/entry_points_gles_3_0_autogen.h b/Source/ThirdParty/ANGLE/ANGLE/entry_points_gles_3_0_autogen.h
>deleted file mode 100644
>index bbbe094f16d..00000000000
>--- a/Source/ThirdParty/ANGLE/ANGLE/entry_points_gles_3_0_autogen.h
>+++ /dev/null
>@@ -1 +0,0 @@
>-#include "src/libGLESv2/entry_points_gles_3_0_autogen.h"
>diff --git a/Source/ThirdParty/ANGLE/ANGLE/entry_points_gles_3_1_autogen.h b/Source/ThirdParty/ANGLE/ANGLE/entry_points_gles_3_1_autogen.h
>deleted file mode 100644
>index f71f74cec1d..00000000000
>--- a/Source/ThirdParty/ANGLE/ANGLE/entry_points_gles_3_1_autogen.h
>+++ /dev/null
>@@ -1 +0,0 @@
>-#include "src/libGLESv2/entry_points_gles_3_1_autogen.h"
>diff --git a/Source/ThirdParty/ANGLE/ANGLE/export.h b/Source/ThirdParty/ANGLE/ANGLE/export.h
>deleted file mode 100644
>index 9fbd3149b81..00000000000
>--- a/Source/ThirdParty/ANGLE/ANGLE/export.h
>+++ /dev/null
>@@ -1 +0,0 @@
>-#include "include/export.h"
>diff --git a/Source/ThirdParty/ANGLE/ANGLE/gl2.h b/Source/ThirdParty/ANGLE/ANGLE/gl2.h
>deleted file mode 100644
>index 8d502e355cc..00000000000
>--- a/Source/ThirdParty/ANGLE/ANGLE/gl2.h
>+++ /dev/null
>@@ -1 +0,0 @@
>-#include "include/GLES2/gl2.h"
>diff --git a/Source/ThirdParty/ANGLE/ANGLE/gl2ext.h b/Source/ThirdParty/ANGLE/ANGLE/gl2ext.h
>deleted file mode 100644
>index 32ce624d734..00000000000
>--- a/Source/ThirdParty/ANGLE/ANGLE/gl2ext.h
>+++ /dev/null
>@@ -1 +0,0 @@
>-#include "include/GLES2/gl2ext.h"
>diff --git a/Source/ThirdParty/ANGLE/ANGLE/gl2ext_angle.h b/Source/ThirdParty/ANGLE/ANGLE/gl2ext_angle.h
>deleted file mode 100644
>index 440a5c313df..00000000000
>--- a/Source/ThirdParty/ANGLE/ANGLE/gl2ext_angle.h
>+++ /dev/null
>@@ -1 +0,0 @@
>-#include "include/GLES2/gl2ext_angle.h"
>diff --git a/Source/ThirdParty/ANGLE/ANGLE/gl2platform.h b/Source/ThirdParty/ANGLE/ANGLE/gl2platform.h
>deleted file mode 100644
>index 164cee81616..00000000000
>--- a/Source/ThirdParty/ANGLE/ANGLE/gl2platform.h
>+++ /dev/null
>@@ -1 +0,0 @@
>-#include "include/GLES2/gl2platform.h"
>diff --git a/Source/ThirdParty/ANGLE/ANGLE/gl3.h b/Source/ThirdParty/ANGLE/ANGLE/gl3.h
>deleted file mode 100644
>index 1103491fac1..00000000000
>--- a/Source/ThirdParty/ANGLE/ANGLE/gl3.h
>+++ /dev/null
>@@ -1 +0,0 @@
>-#include "include/GLES3/gl3.h"
>diff --git a/Source/ThirdParty/ANGLE/ANGLE/gl31.h b/Source/ThirdParty/ANGLE/ANGLE/gl31.h
>deleted file mode 100644
>index d2b9b9522f8..00000000000
>--- a/Source/ThirdParty/ANGLE/ANGLE/gl31.h
>+++ /dev/null
>@@ -1 +0,0 @@
>-#include "include/GLES3/gl31.h"
>diff --git a/Source/ThirdParty/ANGLE/ANGLE/gl32.h b/Source/ThirdParty/ANGLE/ANGLE/gl32.h
>deleted file mode 100644
>index 2e9089b4704..00000000000
>--- a/Source/ThirdParty/ANGLE/ANGLE/gl32.h
>+++ /dev/null
>@@ -1 +0,0 @@
>-#include "include/GLES3/gl32.h"
>diff --git a/Source/ThirdParty/ANGLE/ANGLE/gl3platform.h b/Source/ThirdParty/ANGLE/ANGLE/gl3platform.h
>deleted file mode 100644
>index 572c782bc07..00000000000
>--- a/Source/ThirdParty/ANGLE/ANGLE/gl3platform.h
>+++ /dev/null
>@@ -1 +0,0 @@
>-#include "include/GLES3/gl3platform.h"
>diff --git a/Source/ThirdParty/ANGLE/ANGLE/khrplatform.h b/Source/ThirdParty/ANGLE/ANGLE/khrplatform.h
>deleted file mode 100644
>index c423a7d472a..00000000000
>--- a/Source/ThirdParty/ANGLE/ANGLE/khrplatform.h
>+++ /dev/null
>@@ -1 +0,0 @@
>-#include "include/KHR/khrplatform.h"
>diff --git a/Source/ThirdParty/ANGLE/AUTHORS b/Source/ThirdParty/ANGLE/AUTHORS
>index 5dacdf8fbdc..082c6f4566e 100644
>--- a/Source/ThirdParty/ANGLE/AUTHORS
>+++ b/Source/ThirdParty/ANGLE/AUTHORS
>@@ -27,6 +27,9 @@ NVIDIA Corporation
> Opera Software ASA
> The Qt Company Ltd.
> Advanced Micro Devices, Inc.
>+LG Electronics, Inc.
>+IBM Inc.
>+AdaptVis GmbH
> 
> Jacek Caban
> Mark Callow
>@@ -49,3 +52,6 @@ Nickolay Artamonov
> Ihsan Akmal
> Andrei Volykhin
> JÃ©rÃ´me Duval
>+Ð ÑÑÐ»Ð°Ð½ ÐÐ¶Ð±ÑÐ»Ð°ÑÐ¾Ð²
>+Thomas Miller
>+Till Rathmann
>diff --git a/Source/ThirdParty/ANGLE/BUILD.gn b/Source/ThirdParty/ANGLE/BUILD.gn
>index fff7ca9925a..c61e1f57d4a 100644
>--- a/Source/ThirdParty/ANGLE/BUILD.gn
>+++ b/Source/ThirdParty/ANGLE/BUILD.gn
>@@ -1,4 +1,4 @@
>-# Copyright 2014-2015 The Chromium Authors. All rights reserved.
>+# Copyright 2019 The ANGLE Project Authors. All rights reserved.
> # Use of this source code is governed by a BSD-style license that can be
> # found in the LICENSE file.
> 
>@@ -8,11 +8,20 @@ import("//build/config/linux/pkg_config.gni")
> import("//build/config/ui.gni")
> import("//testing/libfuzzer/fuzzer_test.gni")
> import("gni/angle.gni")
>+if (is_android) {
>+  # android/rules.gni can only be imported for Android targets
>+  import("//build/config/android/config.gni")
>+  import("//build/config/android/rules.gni")
>+  import("android/angle_apk.gni")
>+}
> 
> declare_args() {
>   # Use the PCI lib to collect GPU information on Linux.
>   use_libpci = is_linux && (!is_chromecast || is_cast_desktop_build) &&
>                (use_x11 || use_ozone)
>+
>+  # Link in system libGL, to work with apitrace.  See doc/DebuggingTips.md.
>+  angle_link_glx = false
> }
> 
> if (!build_with_chromium) {
>@@ -21,6 +30,7 @@ if (!build_with_chromium) {
>     deps = [
>       ":angle_shader_translator",
>       ":translator_fuzzer",
>+      ":xxhash_fuzzer",
>       "//samples:all",
>       "//src/tests:all",
>     ]
>@@ -42,15 +52,8 @@ angle_git_is_present = exec_script("src/commit_id.py",
> 
> angle_use_commit_id = angle_git_is_present == 1
> 
>-gles_gypi = exec_script("//build/gypi_to_gn.py",
>-                        [ rebase_path("src/libGLESv2.gypi") ],
>-                        "scope",
>-                        [ "src/libGLESv2.gypi" ])
>-
>-compiler_gypi = exec_script("//build/gypi_to_gn.py",
>-                            [ rebase_path("src/compiler.gypi") ],
>-                            "scope",
>-                            [ "src/compiler.gypi" ])
>+import("src/compiler.gni")
>+import("src/libGLESv2.gni")
> 
> # This config is exported to dependent targets (and also applied to internal
> # ones).
>@@ -58,6 +61,23 @@ config("external_config") {
>   include_dirs = [ "include" ]
> }
> 
>+# Prevent the GL headers from redeclaring ANGLE entry points.
>+config("no_gl_prototypes") {
>+  defines = [
>+    "GL_GLES_PROTOTYPES=0",
>+    "EGL_EGL_PROTOTYPES=0",
>+  ]
>+}
>+
>+config("gl_prototypes") {
>+  defines = [
>+    "GL_GLES_PROTOTYPES=1",
>+    "EGL_EGL_PROTOTYPES=1",
>+    "GL_GLEXT_PROTOTYPES",
>+    "EGL_EGLEXT_PROTOTYPES",
>+  ]
>+}
>+
> # This config is applied to internal Angle targets (not pushed to dependents).
> config("internal_config") {
>   include_dirs = [
>@@ -65,17 +85,29 @@ config("internal_config") {
>     "src",
>   ]
> 
>-  # Prevent the GL headers from redeclaring ANGLE entry points.
>-  defines = [
>-    "GL_GLEXT_PROTOTYPES",
>-    "EGL_EGLEXT_PROTOTYPES",
>-  ]
>+  defines = []
> 
>-  if (current_cpu == "x86" || current_cpu == "arm") {
>+  if (angle_64bit_current_cpu) {
>+    defines += [ "ANGLE_IS_64_BIT_CPU" ]
>+  } else {
>     defines += [ "ANGLE_IS_32_BIT_CPU" ]
>   }
>-  if (current_cpu == "x64" || current_cpu == "arm64") {
>-    defines += [ "ANGLE_IS_64_BIT_CPU" ]
>+
>+  if (angle_force_thread_safety) {
>+    defines += [ "ANGLE_FORCE_THREAD_SAFETY=1" ]
>+  }
>+
>+  if (angle_enable_vulkan) {
>+    if (angle_enable_vulkan_gpu_trace_events) {
>+      defines += [ "ANGLE_ENABLE_VULKAN_GPU_TRACE_EVENTS=1" ]
>+    }
>+    if (angle_vulkan_conformant_configs_only) {
>+      defines += [ "ANGLE_VULKAN_CONFORMANT_CONFIGS_ONLY=1" ]
>+    }
>+  }
>+
>+  if (angle_enable_trace) {
>+    defines += [ "ANGLE_ENABLE_DEBUG_TRACE=1" ]
>   }
> }
> 
>@@ -88,48 +120,75 @@ config("extra_warnings") {
>       "/we4244",  # Conversion: possible loss of data.
>       "/we4456",  # Variable shadowing.
>       "/we4458",  # declaration hides class member.
>+      "/we4715",  # not all control paths return a value
>+      "/we4800",  # forcing value to bool.
>+      "/we4838",  # narrowing conversion.
>     ]
>   }
>   if (is_clang) {
>-    # Remove when crbug.com/428099 is resolved.
>-    cflags += [ "-Winconsistent-missing-override" ]
>+    cflags += [
>+      # Enable after anglebug.com/3128 is fixed.
>+      # "-Wextra-semi-stmt",
>+
>+      "-Wnon-virtual-dtor",
>+      "-Wunneeded-internal-declaration",
>+    ]
>   }
> }
> 
>-if (is_win) {
>+# This config adds build-ids to the associated library.
>+# -Wl is a special option that indicates that clang should pass the associated
>+# option --build-id to the linker. This will cause a build-id section to be added
>+# to the associated library. The build-id makes it possible for a debugger to
>+# find the right symbol file to use.
>+config("build_id_config") {
>+  ldflags = [ "-Wl,--build-id" ]
>+}
>+
>+# Windows ARM64 is available since 10.0.16299 so no need to copy
>+# d3dcompiler_47.dll because this file is available as inbox.
>+if (is_win && target_cpu != "arm64") {
>+  # We also ship an older DLL for compatiblity with Windows 7 machines without
>+  # the UCRT. This DLL isn't available in the standard SDK distribution.
>+  _old_compiler = "$windows_sdk_path/Redist/D3D/$target_cpu/d3dcompiler_old.dll"
>+  _has_old_compiler =
>+      exec_script("scripts/file_exists.py", [ _old_compiler ], "value")
>+
>   copy("copy_compiler_dll") {
>     sources = [
>       "$windows_sdk_path/Redist/D3D/$target_cpu/d3dcompiler_47.dll",
>     ]
>+
>+    if (_has_old_compiler) {
>+      sources += [ _old_compiler ]
>+    }
>+
>     outputs = [
>-      "$root_out_dir/d3dcompiler_47.dll",
>+      "$root_out_dir/{{source_file_part}}",
>     ]
>   }
> }
> 
>-angle_undefine_configs = [ "//build/config/compiler:default_include_dirs" ]
>-
> # Holds the shared includes so we only need to list them once.
>-source_set("includes") {
>-  sources = rebase_path(gles_gypi.libangle_includes, ".", "src")
>+config("includes_config") {
>+  include_dirs = [ "include" ]
> }
> 
>-static_library("preprocessor") {
>-  sources = rebase_path(compiler_gypi.angle_preprocessor_sources, ".", "src")
>+angle_source_set("includes") {
>+  sources = libangle_includes
>+  public_configs = [ ":includes_config" ]
>+}
> 
>-  configs -= angle_undefine_configs
>-  configs += [
>-    ":extra_warnings",
>-    ":internal_config",
>-  ]
>+angle_static_library("preprocessor") {
>+  sources = angle_preprocessor_sources
> 
>   public_deps = [
>     ":angle_common",
>   ]
> }
> 
>-config("translator_disable_pool_alloc") {
>-  defines = [ "ANGLE_TRANSLATOR_DISABLE_POOL_ALLOC" ]
>+config("angle_disable_pool_alloc") {
>+  defines = [ "ANGLE_DISABLE_POOL_ALLOC" ]
> }
> 
> config("debug_annotations_config") {
>@@ -146,36 +205,51 @@ config("angle_release_asserts_config") {
> 
> config("angle_common_config") {
>   include_dirs = [ "src/common/third_party/base" ]
>+  if (is_android) {
>+    libs = [ "log" ]
>+  }
> }
> 
>-static_library("angle_common") {
>-  sources = rebase_path(gles_gypi.libangle_common_sources, ".", "src")
>+angle_source_set("angle_system_utils") {
>+  sources = angle_system_utils_sources
>+}
> 
>-  if (is_linux || is_android) {
>-    sources += rebase_path(gles_gypi.libangle_common_linux_sources, ".", "src")
>-  }
>+angle_source_set("xxhash") {
>+  sources = xxhash_sources
>+  configs -= [ "${angle_root}:extra_warnings" ]
>+}
> 
>-  if (is_mac) {
>-    sources += rebase_path(gles_gypi.libangle_common_mac_sources, ".", "src")
>-  }
>+fuzzer_test("xxhash_fuzzer") {
>+  sources = [
>+    "src/common/third_party/xxhash/xxhash_fuzzer.cpp",
>+  ]
>+  deps = [
>+    ":xxhash",
>+  ]
>+}
> 
>-  if (is_win) {
>-    sources += rebase_path(gles_gypi.libangle_common_win_sources, ".", "src")
>-  }
>+angle_static_library("angle_common") {
>+  sources = libangle_common_sources
> 
>-  configs -= angle_undefine_configs
>   configs += [
>     ":angle_common_config",
>     ":debug_annotations_config",
>-    ":extra_warnings",
>-    ":internal_config",
>+  ]
>+
>+  deps = [
>+    ":xxhash",
>   ]
> 
>   public_deps = [
>-    ":commit_id",
>+    ":angle_system_utils",
>+    ":angle_version",
>+    ":includes",
>   ]
>-  public_configs = [ ":angle_common_config" ]
>+  public_configs += [ ":angle_common_config" ]
>   all_dependent_configs = [ ":angle_release_asserts_config" ]
>+  if (use_fuzzing_engine) {
>+    all_dependent_configs += [ ":angle_disable_pool_alloc" ]
>+  }
> }
> 
> config("angle_image_util_config") {
>@@ -185,22 +259,28 @@ config("angle_image_util_config") {
>   ]
> }
> 
>-static_library("angle_image_util") {
>-  sources = rebase_path(gles_gypi.libangle_image_util_sources, ".", "src")
>-
>-  configs -= angle_undefine_configs
>-  configs += [
>-    ":internal_config",
>-    ":extra_warnings",
>-  ]
>-
>-  public_configs = [ ":angle_image_util_config" ]
>-
>+angle_static_library("angle_image_util") {
>+  sources = libangle_image_util_sources
>+  public_configs += [ ":angle_image_util_config" ]
>   public_deps = [
>     ":angle_common",
>   ]
> }
> 
>+config("angle_gl_visibility_config") {
>+  if (is_win) {
>+    defines = [
>+      "GL_APICALL=",
>+      "GL_API=",
>+    ]
>+  } else {
>+    defines = [
>+      "GL_APICALL=__attribute__((visibility(\"default\")))",
>+      "GL_API=__attribute__((visibility(\"default\")))",
>+    ]
>+  }
>+}
>+
> config("angle_gpu_info_util_config") {
>   include_dirs = [
>     "include",
>@@ -208,38 +288,31 @@ config("angle_gpu_info_util_config") {
>   ]
> }
> 
>-static_library("angle_gpu_info_util") {
>-  configs -= angle_undefine_configs
>-  configs += [
>-    ":internal_config",
>-    ":extra_warnings",
>-  ]
>-
>-  public_configs = [ ":angle_gpu_info_util_config" ]
>-
>+angle_static_library("angle_gpu_info_util") {
>+  public_configs += [ ":angle_gpu_info_util_config" ]
>   public_deps = [
>     ":angle_common",
>   ]
>-
>-  sources = rebase_path(gles_gypi.libangle_gpu_info_util_sources, ".", "src")
>+  sources = libangle_gpu_info_util_sources
>   deps = []
>   libs = []
>   defines = []
> 
>+  if (is_android) {
>+    sources += [ "src/gpu_info_util/SystemInfo_android.cpp" ]
>+  }
>+
>   if (is_win) {
>-    sources +=
>-        rebase_path(gles_gypi.libangle_gpu_info_util_win_sources, ".", "src")
>+    sources += libangle_gpu_info_util_win_sources
>     libs += [ "setupapi.lib" ]
>     defines += [ "GPU_INFO_USE_SETUPAPI" ]
>   }
> 
>-  if (is_linux) {
>-    sources +=
>-        rebase_path(gles_gypi.libangle_gpu_info_util_linux_sources, ".", "src")
>+  if (is_linux || is_fuchsia) {
>+    sources += libangle_gpu_info_util_linux_sources
> 
>     if (use_x11) {
>-      sources +=
>-          rebase_path(gles_gypi.libangle_gpu_info_util_x11_sources, ".", "src")
>+      sources += libangle_gpu_info_util_x11_sources
>       deps += [ "src/third_party/libXNVCtrl:libXNVCtrl" ]
>       defines += [ "GPU_INFO_USE_X11" ]
>       libs += [
>@@ -251,15 +324,13 @@ static_library("angle_gpu_info_util") {
>   }
> 
>   if (use_libpci) {
>-    sources +=
>-        rebase_path(gles_gypi.libangle_gpu_info_util_libpci_sources, ".", "src")
>+    sources += libangle_gpu_info_util_libpci_sources
>     defines += [ "GPU_INFO_USE_LIBPCI" ]
>     libs += [ "pci" ]
>   }
> 
>   if (is_mac) {
>-    sources +=
>-        rebase_path(gles_gypi.libangle_gpu_info_util_mac_sources, ".", "src")
>+    sources += libangle_gpu_info_util_mac_sources
>     libs += [
>       "IOKit.framework",
>       "CoreFoundation.framework",
>@@ -268,44 +339,31 @@ static_library("angle_gpu_info_util") {
>   }
> }
> 
>-static_library("translator") {
>-  sources = rebase_path(compiler_gypi.angle_translator_sources, ".", "src")
>+angle_static_library("translator") {
>+  sources = angle_translator_sources
>   defines = []
> 
>   if (angle_enable_essl || use_fuzzing_engine) {
>-    sources +=
>-        rebase_path(compiler_gypi.angle_translator_essl_sources, ".", "src")
>+    sources += angle_translator_essl_sources
>     defines += [ "ANGLE_ENABLE_ESSL" ]
>   }
> 
>   if (angle_enable_glsl || use_fuzzing_engine) {
>-    sources +=
>-        rebase_path(compiler_gypi.angle_translator_glsl_sources, ".", "src")
>+    sources += angle_translator_glsl_sources
>     defines += [ "ANGLE_ENABLE_GLSL" ]
>   }
> 
>   if (angle_enable_hlsl || use_fuzzing_engine) {
>-    sources +=
>-        rebase_path(compiler_gypi.angle_translator_hlsl_sources, ".", "src")
>+    sources += angle_translator_hlsl_sources
>     defines += [ "ANGLE_ENABLE_HLSL" ]
>   }
> 
>   if (angle_enable_vulkan || use_fuzzing_engine) {
>-    sources += rebase_path(compiler_gypi.angle_translator_lib_vulkan_sources,
>-                           ".",
>-                           "src")
>+    sources += angle_translator_lib_vulkan_sources
>     defines += [ "ANGLE_ENABLE_VULKAN" ]
>   }
> 
>-  configs -= angle_undefine_configs
>-  configs += [
>-    ":internal_config",
>-    ":extra_warnings",
>-  ]
>-  public_configs = [ ":external_config" ]
>-  if (use_fuzzing_engine) {
>-    all_dependent_configs = [ ":translator_disable_pool_alloc" ]
>-  }
>+  public_configs += [ ":external_config" ]
> 
>   deps = [
>     ":includes",
>@@ -323,7 +381,7 @@ static_library("translator") {
>   }
> }
> 
>-source_set("translator_fuzzer") {
>+angle_source_set("translator_fuzzer") {
>   sources = [
>     "src/compiler/fuzz/translator_fuzzer.cpp",
>   ]
>@@ -340,6 +398,7 @@ source_set("translator_fuzzer") {
> 
> config("commit_id_config") {
>   include_dirs = [ "$root_gen_dir/angle" ]
>+  visibility = [ ":commit_id" ]
> }
> 
> commit_id_output_file = "$root_gen_dir/angle/id/commit.h"
>@@ -350,6 +409,11 @@ if (angle_use_commit_id) {
>       commit_id_output_file,
>     ]
> 
>+    # commit id should depend on angle's HEAD revision
>+    inputs = [
>+      ".git/HEAD",
>+    ]
>+
>     args = [
>       "gen",
>       rebase_path(".", root_build_dir),
>@@ -370,11 +434,23 @@ if (angle_use_commit_id) {
>   }
> }
> 
>+angle_source_set("angle_version") {
>+  sources = [
>+    "src/common/version.h",
>+  ]
>+  public_deps = [
>+    ":commit_id",
>+  ]
>+}
>+
> config("libANGLE_config") {
>   cflags = []
>   defines = []
>+  libs = []
>+  ldflags = []
>   if (angle_enable_d3d9) {
>     defines += [ "ANGLE_ENABLE_D3D9" ]
>+    ldflags += [ "/DELAYLOAD:d3d9.dll" ]
>   }
>   if (angle_enable_d3d11) {
>     defines += [ "ANGLE_ENABLE_D3D11" ]
>@@ -390,6 +466,9 @@ config("libANGLE_config") {
>   }
>   if (angle_enable_vulkan) {
>     defines += [ "ANGLE_ENABLE_VULKAN" ]
>+    if (angle_enable_custom_vulkan_cmd_buffers) {
>+      defines += [ "ANGLE_USE_CUSTOM_VULKAN_CMD_BUFFERS=1" ]
>+    }
>   }
>   if (angle_enable_null) {
>     defines += [ "ANGLE_ENABLE_NULL" ]
>@@ -399,55 +478,121 @@ config("libANGLE_config") {
>   if (is_win) {
>     cflags += [ "/wd4530" ]  # C++ exception handler used, but unwind semantics are not enabled.
>   }
>+
>+  if (is_android && (angle_enable_gl || angle_enable_vulkan)) {
>+    # In API level 26 ANativeWindow APIs were moved from libandroid.so
>+    # into a separate library, libnativewindow.so
>+    if (ndk_api_level_at_least_26) {
>+      libs += [ "nativewindow" ]
>+    } else {
>+      libs += [ "android" ]
>+    }
>+  }
> }
> 
>-static_library("libANGLE") {
>-  sources = rebase_path(gles_gypi.libangle_sources, ".", "src")
>+if (angle_enable_vulkan) {
>+  config("vulkan_config") {
>+    if (is_android) {
>+      libs = [ "vulkan" ]
>+    }
>+  }
>+
>+  # Use this target to include everything ANGLE needs for Vulkan.
>+  group("angle_vulkan") {
>+    public_deps = [
>+      "$angle_root/third_party/vulkan-headers:vulkan_headers",
>+    ]
>+    public_configs = [ ":vulkan_config" ]
>+    data_deps = []
>+    if (!is_android && !is_fuchsia) {
>+      deps = [
>+        "$angle_root/third_party/vulkan-loader:libvulkan",
>+      ]
>+      data_deps += [ "$angle_root/third_party/vulkan-tools:VkICD_mock_icd" ]
>+      public_configs +=
>+          [ "$angle_root/third_party/vulkan-loader:vulkan_loader_config" ]
>+    }
>+    if (is_fuchsia) {
>+      public_deps += [
>+        "$angle_root/src/common/fuchsia_egl",
>+        "//third_party/fuchsia-sdk:vulkan_base",
>+        "//third_party/fuchsia-sdk/sdk:vulkan",
>+      ]
>+    }
>+
>+    if (angle_enable_vulkan_validation_layers) {
>+      if (is_fuchsia) {
>+        deps = [
>+          "//third_party/fuchsia-sdk:vulkan_validation",
>+        ]
>+      } else {
>+        data_deps += [ "$angle_root/third_party/vulkan-validation-layers:vulkan_validation_layers" ]
>+        if (!is_android) {
>+          data_deps += [ "$angle_root/third_party/vulkan-validation-layers:vulkan_gen_json_files" ]
>+        }
>+      }
>+    }
>+  }
>+}
>+
>+angle_static_library("libANGLE") {
>+  sources = libangle_sources
> 
>   include_dirs = []
>   libs = []
>   defines = []
>+  if (angle_link_glx) {
>+    libs += [ "GL" ]
>+    defines += [ "ANGLE_LINK_GLX" ]
>+  }
>   public_deps = [
>     ":angle_common",
>+    ":angle_gpu_info_util",
>+    ":angle_version",
>+    ":translator",
>   ]
>   deps = [
>-    ":angle_gpu_info_util",
>     ":angle_image_util",
>-    ":commit_id",
>     ":includes",
>-    ":translator",
>   ]
> 
>+  # Enable extra Chromium style warnings for libANGLE.
>+  if (is_clang) {
>+    suppressed_configs -= [ "//build/config/clang:find_bad_constructs" ]
>+  }
>+
>   # Shared D3D sources.
>   if (angle_enable_d3d9 || angle_enable_d3d11) {
>-    sources += rebase_path(gles_gypi.libangle_d3d_shared_sources, ".", "src")
>+    sources += libangle_d3d_shared_sources
> 
>     defines += [ "ANGLE_PRELOADED_D3DCOMPILER_MODULE_NAMES={ " + "\"d3dcompiler_47.dll\", \"d3dcompiler_46.dll\", \"d3dcompiler_43.dll\" }" ]
>   }
> 
>   if (angle_enable_d3d9) {
>-    sources += rebase_path(gles_gypi.libangle_d3d9_sources, ".", "src")
>+    sources += libangle_d3d9_sources
>     libs += [ "d3d9.lib" ]
>   }
> 
>   if (angle_enable_d3d11) {
>-    sources += rebase_path(gles_gypi.libangle_d3d11_sources, ".", "src")
>-    sources += rebase_path(gles_gypi.libangle_d3d11_win32_sources, ".", "src")
>+    sources += libangle_d3d11_sources
>+    sources += libangle_d3d11_win32_sources
>     libs += [ "dxguid.lib" ]
>+    import("src/libANGLE/renderer/d3d/d3d11/d3d11_blit_shaders_autogen.gni")
>+    sources += libangle_d3d11_blit_shaders
>   }
> 
>   if (angle_enable_gl) {
>-    sources += rebase_path(gles_gypi.libangle_gl_sources, ".", "src")
>+    sources += libangle_gl_sources
>     include_dirs += [ "src/third_party/khronos" ]
> 
>     if (angle_enable_gl_null) {
>-      sources += rebase_path(gles_gypi.libangle_gl_null_sources, ".", "src")
>+      sources += libangle_gl_null_sources
>     }
>     if (is_win) {
>-      sources += rebase_path(gles_gypi.libangle_gl_wgl_sources, ".", "src")
>+      sources += libangle_gl_wgl_sources
>     }
>     if (use_x11) {
>-      sources += rebase_path(gles_gypi.libangle_gl_glx_sources, ".", "src")
>+      sources += libangle_gl_glx_sources
>       deps += [ "src/third_party/libXNVCtrl:libXNVCtrl" ]
>       libs += [
>         "X11",
>@@ -456,7 +601,7 @@ static_library("libANGLE") {
>       ]
>     }
>     if (is_mac) {
>-      sources += rebase_path(gles_gypi.libangle_gl_cgl_sources, ".", "src")
>+      sources += libangle_gl_cgl_sources
>       libs += [
>         "Cocoa.framework",
>         "IOSurface.framework",
>@@ -465,57 +610,66 @@ static_library("libANGLE") {
>       ]
>     }
>     if (is_android) {
>-      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_egl_android_sources, ".", "src")
>-      libs += [
>-        "android",
>-        "log",
>-      ]
>+      sources += libangle_gl_egl_sources
>+      sources += libangle_gl_egl_dl_sources
>+      sources += libangle_gl_egl_android_sources
>     }
>     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")
>+      sources += libangle_gl_egl_sources
>+      sources += libangle_gl_egl_dl_sources
>+      sources += libangle_gl_ozone_sources
>     }
>   }
> 
>   if (angle_enable_vulkan) {
>-    sources += rebase_path(gles_gypi.libangle_vulkan_sources, ".", "src")
>+    sources += libangle_vulkan_sources
>     if (is_win) {
>-      sources +=
>-          rebase_path(gles_gypi.libangle_vulkan_win32_sources, ".", "src")
>+      sources += libangle_vulkan_win32_sources
>     }
>     if (is_linux) {
>-      sources += rebase_path(gles_gypi.libangle_vulkan_xcb_sources, ".", "src")
>+      sources += libangle_vulkan_xcb_sources
>     }
>-    deps += [ "src/vulkan_support:angle_vulkan" ]
>+    if (is_fuchsia) {
>+      sources += libangle_vulkan_fuchsia_sources
>+      deps += [
>+        "$angle_root/src/common/fuchsia_egl",
>+        "$angle_root/src/common/fuchsia_egl:backend",
>+      ]
>+    }
>+    if (is_android) {
>+      sources += libangle_vulkan_android_sources
>+      libs += [ "vulkan" ]
>+    }
>+    deps += [
>+      ":angle_vulkan",
>+      "${angle_glslang_dir}:glslang_default_resource_limits_sources",
>+      "${angle_glslang_dir}:glslang_sources",
>+      "${angle_spirv_tools_dir}:spvtools_val",
>+    ]
>+    public_deps += [ "$angle_root/third_party/vulkan-headers:vulkan_headers" ]
>+
>+    # Include generated shaders.
>+    import("src/libANGLE/renderer/vulkan/vk_internal_shaders_autogen.gni")
>+    sources += angle_vulkan_internal_shaders
>   }
> 
>   if (angle_enable_null) {
>-    sources += rebase_path(gles_gypi.libangle_null_sources, ".", "src")
>+    sources += libangle_null_sources
>   }
> 
>   if (is_debug) {
>     defines += [ "ANGLE_GENERATE_SHADER_DEBUG_INFO" ]
>   }
> 
>-  configs -= angle_undefine_configs
>-
>-  configs += [
>-    ":commit_id_config",
>-    ":debug_annotations_config",
>-    ":extra_warnings",
>-    ":internal_config",
>-  ]
>-
>-  public_configs = [ ":libANGLE_config" ]
>+  configs += [ ":debug_annotations_config" ]
>+  public_configs += [ ":libANGLE_config" ]
> 
>-  if (is_win) {
>+  # Windows ARM64 is available since 10.0.16299 so no need to copy
>+  # d3dcompiler_47.dll because this file is available as inbox.
>+  if (is_win && target_cpu != "arm64") {
>     data_deps = [
>       ":copy_compiler_dll",
>     ]
>@@ -533,88 +687,114 @@ config("shared_library_public_config") {
>   }
> }
> 
>+config("library_name_config") {
>+  defines = [
>+    "ANGLE_EGL_LIBRARY_NAME=\"libEGL${angle_libs_suffix}\"",
>+    "ANGLE_GLESV2_LIBRARY_NAME=\"libGLESv2${angle_libs_suffix}\"",
>+  ]
>+}
>+
> # This config controls export definitions on ANGLE API calls.
> config("angle_static") {
>   defines = [
>     "ANGLE_EXPORT=",
>+    "ANGLE_UTIL_EXPORT=",
>     "EGLAPI=",
>     "GL_APICALL=",
>+    "GL_API=",
>   ]
> }
> 
>-shared_library("libGLESv2") {
>-  sources = rebase_path(gles_gypi.libglesv2_sources, ".", "src")
>-
>-  if (is_android) {
>-    configs -= [ "//build/config/android:hide_all_but_jni_onload" ]
>-  }
>+angle_shared_library("libGLESv2${angle_libs_suffix}") {
>+  sources = libglesv2_sources
> 
>   if (is_win) {
>-    ldflags =
>-        [ "/DEF:" + rebase_path("src/libGLESv2/libGLESv2.def", root_build_dir) ]
>+    sources += [ "src/libGLESv2/libGLESv2_autogen.def" ]
>   }
> 
>-  if (is_mac && !is_component_build) {
>-    ldflags = [
>-      "-install_name",
>-      "@rpath/${target_name}.dylib",
>-    ]
>-    public_configs = [ ":shared_library_public_config" ]
>-  }
>-
>-  configs -= angle_undefine_configs
>   configs += [
>-    ":commit_id_config",
>+    ":angle_gl_visibility_config",
>     ":debug_annotations_config",
>-    ":extra_warnings",
>-    ":internal_config",
>+    ":gl_prototypes",
>   ]
> 
>   defines = [ "LIBGLESV2_IMPLEMENTATION" ]
>-  if (is_win) {
>-    defines += [ "GL_APICALL=" ]
>-  } else {
>-    defines += [ "GL_APICALL=__attribute__((visibility(\"default\")))" ]
>-  }
> 
>   deps = [
>     ":includes",
>     ":libANGLE",
>-    "//build/config:exe_and_shlib_deps",
>+  ]
>+
>+  public_deps = [
>+    ":angle_version",
>+  ]
>+}
>+
>+angle_static_library("libGLESv2_static") {
>+  sources = libglesv2_sources
>+  configs += [ ":debug_annotations_config" ]
>+  public_configs += [ ":angle_static" ]
>+  deps = [
>+    ":includes",
>+  ]
>+  public_deps = [
>+    ":libANGLE",
>   ]
> }
> 
>-static_library("libGLESv2_static") {
>-  sources = rebase_path(gles_gypi.libglesv2_sources, ".", "src")
>+angle_shared_library("libGLESv1_CM${angle_libs_suffix}") {
>+  sources = libglesv1_cm_sources
> 
>-  configs -= angle_undefine_configs
>   configs += [
>-    ":commit_id_config",
>+    ":angle_gl_visibility_config",
>     ":debug_annotations_config",
>-    ":extra_warnings",
>-    ":internal_config",
>+    ":gl_prototypes",
>   ]
> 
>-  public_configs = [ ":angle_static" ]
>+  defines = []
> 
>   deps = [
>     ":includes",
>-    ":libANGLE",
>+    ":libGLESv2${angle_libs_suffix}",
>   ]
> }
> 
>-shared_library("libEGL") {
>-  sources = rebase_path(gles_gypi.libegl_sources, ".", "src")
>+angle_static_library("libGLESv1_CM_static") {
>+  sources = libglesv1_cm_sources
>+  configs += [ ":debug_annotations_config" ]
>+  public_configs += [ ":angle_static" ]
>+  deps = [
>+    ":includes",
>+    ":libGLESv2_static",
>+  ]
>+}
>+
>+config("libEGL_egl_loader_config") {
>+  defines = [ "ANGLE_USE_EGL_LOADER" ]
>+}
>+
>+angle_source_set("libEGL_egl_loader") {
>+  sources = [
>+    "src/libEGL/egl_loader_autogen.cpp",
>+    "src/libEGL/egl_loader_autogen.h",
>+  ]
>+
>+  public_configs += [
>+    ":libEGL_egl_loader_config",
>+    ":gl_prototypes",
>+  ]
>+
>+  deps = [
>+    ":includes",
>+  ]
>+}
>+
>+angle_shared_library("libEGL${angle_libs_suffix}") {
>+  sources = libegl_sources
> 
>-  if (is_android) {
>-    configs -= [ "//build/config/android:hide_all_but_jni_onload" ]
>-  }
>-  configs -= angle_undefine_configs
>   configs += [
>-    ":commit_id_config",
>     ":debug_annotations_config",
>-    ":extra_warnings",
>-    ":internal_config",
>+    ":library_name_config",
>   ]
> 
>   defines = [ "LIBEGL_IMPLEMENTATION" ]
>@@ -625,36 +805,33 @@ shared_library("libEGL") {
>   }
> 
>   if (is_win) {
>-    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" ]
>+    sources += [ "src/libEGL/libEGL.def" ]
>   }
> 
>   deps = [
>+    ":angle_system_utils",
>+    ":angle_version",
>+    ":libEGL_egl_loader",
>+  ]
>+
>+  public_deps = [
>     ":includes",
>-    ":libGLESv2",
>-    "//build/config:exe_and_shlib_deps",
>+  ]
>+
>+  data_deps = [
>+    ":libGLESv2${angle_libs_suffix}",
>   ]
> }
> 
>-static_library("libEGL_static") {
>-  sources = rebase_path(gles_gypi.libegl_sources, ".", "src")
>+angle_static_library("libEGL_static") {
>+  sources = libegl_sources
> 
>-  configs -= angle_undefine_configs
>   configs += [
>-    ":commit_id_config",
>     ":debug_annotations_config",
>-    ":extra_warnings",
>-    ":internal_config",
>+    ":library_name_config",
>   ]
> 
>-  public_configs = [ ":angle_static" ]
>+  public_configs += [ ":angle_static" ]
> 
>   deps = [
>     ":includes",
>@@ -662,13 +839,53 @@ static_library("libEGL_static") {
>   ]
> }
> 
>-util_gypi = exec_script("//build/gypi_to_gn.py",
>-                        [ rebase_path("util/util.gyp") ],
>-                        "scope",
>-                        [ "util/util.gyp" ])
>+import("util/util.gni")
>+
>+config("angle_util_loader_config") {
>+  defines = [ "ANGLE_USE_UTIL_LOADER" ]
>+}
>+
>+angle_source_set("angle_util_loader_headers") {
>+  sources = [
>+    "util/egl_loader_autogen.h",
>+    "util/gles_loader_autogen.h",
>+    "util/util_export.h",
>+  ]
>+
>+  if (is_win) {
>+    sources += [ "util/windows/wgl_loader_autogen.h" ]
>+  }
>+
>+  public_deps = [
>+    ":includes",
>+  ]
>+}
>+
>+angle_source_set("angle_util_loader") {
>+  defines = [ "LIBANGLE_UTIL_IMPLEMENTATION" ]
>+
>+  sources = [
>+    "util/egl_loader_autogen.cpp",
>+    "util/gles_loader_autogen.cpp",
>+  ]
>+
>+  if (is_win) {
>+    sources += [ "util/windows/wgl_loader_autogen.cpp" ]
>+  }
>+
>+  deps = [
>+    ":angle_util_loader_headers",
>+  ]
>+
>+  public_configs += [
>+    ":angle_util_config",
>+    ":angle_util_loader_config",
>+    ":no_gl_prototypes",
>+  ]
>+}
> 
> config("angle_util_config") {
>-  include_dirs = [ "util" ]
>+  include_dirs = [ "." ]
>   if (is_linux && use_x11) {
>     libs = [ "X11" ]
>   }
>@@ -680,89 +897,100 @@ foreach(is_shared_library,
>           false,
>         ]) {
>   if (is_shared_library) {
>-    library_type = "shared_library"
>+    library_type = "angle_shared_library"
>     library_name = "angle_util"
>-    dep_suffix = ""
>+    dep_suffix = "${angle_libs_suffix}"
>   } else {
>-    library_type = "static_library"
>+    library_type = "angle_static_library"
>     library_name = "angle_util_static"
>     dep_suffix = "_static"
>   }
> 
>   target(library_type, library_name) {
>-    sources = rebase_path(util_gypi.util_sources, ".", "util")
>+    sources = util_sources
> 
>     if (is_win) {
>-      sources += rebase_path(util_gypi.util_win32_sources, ".", "util")
>+      sources += util_win_sources
>     }
> 
>+    libs = []
>     if (is_linux) {
>-      sources += rebase_path(util_gypi.util_linux_sources, ".", "util")
>-      libs = [
>+      sources += util_linux_sources
>+      libs += [
>         "rt",
>         "dl",
>       ]
>     }
> 
>     if (is_mac) {
>-      sources += rebase_path(util_gypi.util_osx_sources, ".", "util")
>-      libs = [
>+      sources += util_osx_sources
>+      libs += [
>         "AppKit.framework",
>         "QuartzCore.framework",
>       ]
>     }
> 
>     if (use_x11) {
>-      sources += rebase_path(util_gypi.util_x11_sources, ".", "util")
>+      sources += util_x11_sources
>     }
> 
>     if (is_android) {
>-      if (is_shared_library) {
>-        configs -= [ "//build/config/android:hide_all_but_jni_onload" ]
>-      }
>-
>       # To prevent linux sources filtering on android
>       set_sources_assignment_filter([])
>-      sources += rebase_path(util_gypi.util_linux_sources, ".", "util")
>-      sources += rebase_path(util_gypi.util_android_sources, ".", "util")
>-      libs = [
>+      sources += util_linux_sources
>+      sources += util_android_sources
>+      libs += [
>         "android",
>         "log",
>       ]
>     }
> 
>-    if (use_ozone) {
>-      sources += rebase_path(util_gypi.util_ozone_sources, ".", "util")
>-    }
>+    configs += [ ":debug_annotations_config" ]
> 
>-    configs += [
>-      ":debug_annotations_config",
>-      ":extra_warnings",
>-    ]
>-
>-    public_configs = [
>-      ":angle_util_config",
>-      ":internal_config",
>-    ]
>+    public_configs += [ ":angle_util_config" ]
> 
>     deps = [
>       ":angle_common",
>-      ":libEGL${dep_suffix}",
>-      ":libGLESv2${dep_suffix}",
>+      ":angle_util_loader_headers",
>     ]
> 
>+    public_deps = []
>+    if (is_fuchsia) {
>+      sources += util_fuchsia_sources
>+      public_deps += [
>+        "$angle_root/src/common/fuchsia_egl",
>+        "//third_party/fuchsia-sdk/sdk:async_loop_cpp",
>+        "//third_party/fuchsia-sdk/sdk:fdio",
>+        "//third_party/fuchsia-sdk/sdk:images",
>+        "//third_party/fuchsia-sdk/sdk:scenic_cpp",
>+        "//third_party/fuchsia-sdk/sdk:ui_policy",
>+        "//third_party/fuchsia-sdk/sdk:ui_scenic",
>+        "//third_party/fuchsia-sdk/sdk:ui_views",
>+      ]
>+    } else if (use_ozone) {
>+      sources += util_ozone_sources
>+    }
>+
>     if (is_shared_library) {
>       defines = [ "LIBANGLE_UTIL_IMPLEMENTATION" ]
> 
>-      deps += [ "//build/config:exe_and_shlib_deps" ]
>+      if (is_win) {
>+        sources += util_win_shared_sources
>+      }
>+
>+      public_deps += [ ":angle_util_loader" ]
> 
>       if (is_mac && !is_component_build) {
>         ldflags = [
>           "-install_name",
>-          "@rpath/lib${target_name}.dylib",
>+          "@rpath/libangle_util.dylib",
>         ]
>-        public_configs += [ ":shared_library_public_config" ]
>       }
>+    } else {
>+      public_configs += [
>+        ":angle_static",
>+        ":gl_prototypes",
>+      ]
>     }
>   }
> }
>@@ -770,7 +998,7 @@ foreach(is_shared_library,
> # Convenience targets for some of the samples so they can be built
> # with Chromium's toolchain.
> 
>-executable("angle_shader_translator") {
>+angle_executable("angle_shader_translator") {
>   testonly = true
> 
>   sources = [
>@@ -779,6 +1007,107 @@ executable("angle_shader_translator") {
> 
>   deps = [
>     ":translator",
>-    "//build/config:exe_and_shlib_deps",
>   ]
> }
>+
>+config("angle_feature_support_config") {
>+  include_dirs = [
>+    "include",
>+    "src",
>+  ]
>+  defines = [ "LIBFEATURE_SUPPORT_IMPLEMENTATION" ]
>+  if (is_debug) {
>+    defines += [ "ANGLE_FEATURE_UTIL_LOG_VERBOSE" ]
>+  }
>+}
>+
>+angle_shared_library("libfeature_support${angle_libs_suffix}") {
>+  if (is_android) {
>+    libs = [ "log" ]
>+  }
>+
>+  public_configs += [
>+    ":angle_feature_support_config",
>+    "${angle_jsoncpp_dir}:jsoncpp_config",
>+  ]
>+
>+  if (is_mac && !is_component_build) {
>+    ldflags = [
>+      "-install_name",
>+      "@rpath/${target_name}.dylib",
>+    ]
>+  }
>+
>+  sources = [
>+    "src/feature_support_util/feature_support_util.cpp",
>+    "src/feature_support_util/feature_support_util.h",
>+  ]
>+
>+  deps = [
>+    ":angle_gpu_info_util",
>+    "${angle_jsoncpp_dir}:jsoncpp",
>+  ]
>+}
>+
>+if (!is_component_build && is_android && symbol_level != 0) {
>+  action_foreach("compressed_symbols") {
>+    sources = []
>+    foreach(_library, angle_libraries) {
>+      sources += [ "${root_out_dir}/lib${_library}${angle_libs_suffix}.so" ]
>+    }
>+    if (angle_enable_vulkan_validation_layers) {
>+      foreach(_layer, vulkan_validation_layers) {
>+        sources += [ "${root_out_dir}/lib${_layer}.so" ]
>+      }
>+    }
>+
>+    script = rebase_path("${root_build_dir}/android/compress_symbols.py",
>+                         root_build_dir)
>+
>+    deps = []
>+    foreach(_library, angle_libraries) {
>+      deps += [ "${angle_root}:lib${_library}${angle_libs_suffix}" ]
>+    }
>+
>+    if (angle_enable_vulkan_validation_layers) {
>+      foreach(_layer, vulkan_validation_layers) {
>+        deps +=
>+            [ "${angle_root}/third_party/vulkan-validation-layers:${_layer}" ]
>+      }
>+    }
>+
>+    outputs = [
>+      "$root_out_dir/lib.compressed/{{source_file_part}}",
>+    ]
>+
>+    android_nm = "${android_tool_prefix}nm"
>+
>+    args = [
>+      "--objcopy",
>+      rebase_path(android_objcopy, root_build_dir),
>+      "--nm",
>+      rebase_path(android_nm, root_build_dir),
>+      "--sofile",
>+      "{{source}}",
>+      "--unstrippedsofile",
>+      "{{source_dir}}/lib.unstripped/{{source_file_part}}",
>+      "--output",
>+      "{{source_dir}}/lib.compressed/{{source_file_part}}",
>+    ]
>+  }
>+}
>+
>+if (!is_component_build && is_android &&
>+    current_toolchain == default_toolchain) {
>+  # Package ANGLE libraries
>+  angle_apk("angle_chromium_apk") {
>+    package_name = "com.chromium.angle"
>+    apk_name = "AngleLibraries"
>+  }
>+
>+  group("angle_apks") {
>+    deps = [
>+      ":angle_chromium_apk",
>+    ]
>+  }
>+}
>diff --git a/Source/ThirdParty/ANGLE/CMakeLists.txt b/Source/ThirdParty/ANGLE/CMakeLists.txt
>index 90de871668d..4a85807af46 100644
>--- a/Source/ThirdParty/ANGLE/CMakeLists.txt
>+++ b/Source/ThirdParty/ANGLE/CMakeLists.txt
>@@ -1,353 +1,158 @@
>-include_directories(
>-    .
>-    src
>-    src/common/third_party/base
>-    include
>-    include/KHR
>-)
>+# TODO REMOVE AFTER RELANDING THIS
>+function(WEBKIT_COPY_FILES target_name)
>+    set(options FLATTENED)
>+    set(oneValueArgs DESTINATION)
>+    set(multiValueArgs FILES)
>+    cmake_parse_arguments(opt "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
>+    set(files ${opt_FILES})
>+    set(dst_files)
>+    foreach (file IN LISTS files)
>+        if (IS_ABSOLUTE ${file})
>+            set(src_file ${file})
>+        else ()
>+            set(src_file ${CMAKE_CURRENT_SOURCE_DIR}/${file})
>+        endif ()
>+        if (opt_FLATTENED)
>+            get_filename_component(filename ${file} NAME)
>+            set(dst_file ${opt_DESTINATION}/${filename})
>+        else ()
>+            get_filename_component(file_dir ${file} DIRECTORY)
>+            file(MAKE_DIRECTORY ${opt_DESTINATION}/${file_dir})
>+            set(dst_file ${opt_DESTINATION}/${file})
>+        endif ()
>+        add_custom_command(OUTPUT ${dst_file}
>+            COMMAND ${CMAKE_COMMAND} -E copy ${src_file} ${dst_file}
>+            MAIN_DEPENDENCY ${file}
>+            VERBATIM
>+        )
>+        list(APPEND dst_files ${dst_file})
>+    endforeach ()
>+    add_custom_target(${target_name} DEPENDS ${dst_files})
>+endfunction()
>+
>+include(Compiler.cmake)
>+include(GLESv2.cmake)
> 
> if (WIN32)
>     # FIXME: DX11 support will not compile if this preprocessor definition is set
>     # DirectX Documentation is setting that version to 0x700 but there is no
>     # corresponding value in sdkddkver.h
>-    remove_definitions(-D_WIN32_WINNT=0x601)
>+    remove_definitions(-D_WIN32_WINNT=0x601 -DWINVER=0x601)
> endif ()
> 
>-set(ANGLEEGL_SOURCES
>-    src/libEGL/libEGL.cpp
>-)
>-
>-set(ANGLEEGL_COMPILE_DEFINITIONS
>-    EGLAPI=
>+set(no_gl_prototypes
>+    GL_GLES_PROTOTYPES=0
>+    EGL_EGL_PROTOTYPES=0
> )
> 
>-set(ANGLEGLESv2_SOURCES
>-    src/libGLESv2/entry_points_egl.cpp
>-    src/libGLESv2/entry_points_egl_ext.cpp
>-    src/libGLESv2/entry_points_gles_2_0_autogen.cpp
>-    src/libGLESv2/entry_points_gles_2_0_ext.cpp
>-    src/libGLESv2/entry_points_gles_3_0_autogen.cpp
>-    src/libGLESv2/entry_points_gles_3_1_autogen.cpp
>-    src/libGLESv2/global_state.cpp
>-    src/libGLESv2/libGLESv2.cpp
>-    src/libGLESv2/proc_table_autogen.cpp
>+set(gl_prototypes
>+    GL_GLES_PROTOTYPES=1
>+    EGL_EGL_PROTOTYPES=1
>+    GL_GLEXT_PROTOTYPES
>+    EGL_EGLEXT_PROTOTYPES
> )
> 
>-set(ANGLEGLESv2_COMPILE_DEFINITIONS
>-    GL_APICALL=
>-    LIBGLESV2_IMPLEMENTATION
>+# ANGLE makes a number of small static libraries that are then joined into a
>+# bigger library that is built shared. Rather than making the small libraries
>+# there will be a ANGLE whose sources are dependent on whether the library
>+# is being used as a compiler or as a GLES implementation.
>+#
>+# The corresponding gn targets are described below
>+#
>+# ANGLE (Compiler only)
>+# + angle_common
>+# + preprocessor
>+# + translator
>+#
>+# ANGLE (GLES)
>+# + ANGLE (Compiler only)
>+# + xxhash
>+# + angle_image_util
>+# + angle_system_utils (OS specific)
>+# + angle_(renderer) (Backend and OS specific)
>+
>+set(ANGLE_PRIVATE_INCLUDE_DIRECTORIES
>+    "${CMAKE_CURRENT_SOURCE_DIR}/include"
>+    "${CMAKE_CURRENT_SOURCE_DIR}/src"
>+    "${CMAKE_CURRENT_SOURCE_DIR}/src/common/third_party/base"
> )
> 
>-set(ANGLEGLESv2_LIBRARIES
>-    libANGLE
>+set(ANGLE_DEFINITIONS
>+    ANGLE_ENABLE_ESSL
> )
> 
> set(ANGLE_SOURCES
>-    src/common/angleutils.cpp
>-    src/common/debug.cpp
>-    src/common/event_tracer.cpp
>-    src/common/Float16ToFloat32.cpp
>-    src/common/mathutil.cpp
>-    src/common/MemoryBuffer.cpp
>-    src/common/string_utils.cpp
>-    src/common/third_party/smhasher/src/PMurHash.cpp
>-    src/common/third_party/base/anglebase/sha1.cc
>-    src/common/tls.cpp
>-    src/common/uniform_type_info_autogen.cpp
>-    src/common/utilities.cpp
>-    src/compiler/preprocessor/DiagnosticsBase.cpp
>-    src/compiler/preprocessor/DirectiveHandlerBase.cpp
>-    src/compiler/preprocessor/DirectiveParser.cpp
>-    src/compiler/preprocessor/ExpressionParser.cpp
>-    src/compiler/preprocessor/Input.cpp
>-    src/compiler/preprocessor/Lexer.cpp
>-    src/compiler/preprocessor/Macro.cpp
>-    src/compiler/preprocessor/MacroExpander.cpp
>-    src/compiler/preprocessor/Preprocessor.cpp
>-    src/compiler/preprocessor/Token.cpp
>-    src/compiler/preprocessor/Tokenizer.cpp
>-    src/compiler/translator/ASTMetadataHLSL.cpp
>-    src/compiler/translator/AddAndTrueToLoopCondition.cpp
>-    src/compiler/translator/AddDefaultReturnStatements.cpp
>-    src/compiler/translator/ArrayReturnValueToOutParameter.cpp
>-    src/compiler/translator/BreakVariableAliasingInInnerLoops.cpp
>-    src/compiler/translator/BuiltInFunctionEmulator.cpp
>-    src/compiler/translator/BuiltInFunctionEmulatorGLSL.cpp
>-    src/compiler/translator/BuiltInFunctionEmulatorHLSL.cpp
>-    src/compiler/translator/Cache.cpp
>-    src/compiler/translator/CallDAG.cpp
>-    src/compiler/translator/ClampPointSize.cpp
>-    src/compiler/translator/CodeGen.cpp
>-    src/compiler/translator/CollectVariables.cpp
>-    src/compiler/translator/Compiler.cpp
>-    src/compiler/translator/ConstantUnion.cpp
>-    src/compiler/translator/DeclareAndInitBuiltinsForInstancedMultiview.cpp
>-    src/compiler/translator/DeferGlobalInitializers.cpp
>-    src/compiler/translator/Diagnostics.cpp
>-    src/compiler/translator/DirectiveHandler.cpp
>-    src/compiler/translator/EmulateGLFragColorBroadcast.cpp
>-    src/compiler/translator/EmulatePrecision.cpp
>-    src/compiler/translator/ExpandIntegerPowExpressions.cpp
>-    src/compiler/translator/ExtensionBehavior.cpp
>-    src/compiler/translator/ExtensionGLSL.cpp
>-    src/compiler/translator/FindMain.cpp
>-    src/compiler/translator/FindSymbolNode.cpp
>-    src/compiler/translator/FlagStd140Structs.cpp
>-    src/compiler/translator/HashNames.cpp
>-    src/compiler/translator/ImageFunctionHLSL.cpp
>-    src/compiler/translator/InfoSink.cpp
>-    src/compiler/translator/Initialize.cpp
>-    src/compiler/translator/InitializeDll.cpp
>-    src/compiler/translator/InitializeVariables.cpp
>-    src/compiler/translator/IntermNode.cpp
>-    src/compiler/translator/IntermNodePatternMatcher.cpp
>-    src/compiler/translator/IntermNode_util.cpp
>-    src/compiler/translator/IntermTraverse.cpp
>-    src/compiler/translator/IsASTDepthBelowLimit.cpp
>-    src/compiler/translator/Operator.cpp
>-    src/compiler/translator/OutputESSL.cpp
>-    src/compiler/translator/OutputGLSL.cpp
>-    src/compiler/translator/OutputGLSLBase.cpp
>-    src/compiler/translator/OutputHLSL.cpp
>-    src/compiler/translator/OutputTree.cpp
>-    src/compiler/translator/OutputVulkanGLSL.cpp
>-    src/compiler/translator/ParseContext.cpp
>-    src/compiler/translator/PoolAlloc.cpp
>-    src/compiler/translator/PruneNoOps.cpp
>-    src/compiler/translator/QualifierTypes.cpp
>-    src/compiler/translator/RecordConstantPrecision.cpp
>-    src/compiler/translator/RegenerateStructNames.cpp
>-    src/compiler/translator/RemoveArrayLengthMethod.cpp
>-    src/compiler/translator/RemoveDynamicIndexing.cpp
>-    src/compiler/translator/RemoveEmptySwitchStatements.cpp
>-    src/compiler/translator/RemoveInvariantDeclaration.cpp
>-    src/compiler/translator/RemoveNoOpCasesFromEndOfSwitchStatements.cpp
>-    src/compiler/translator/RemovePow.cpp
>-    src/compiler/translator/RemoveSwitchFallThrough.cpp
>-    src/compiler/translator/RemoveUnreferencedVariables.cpp
>-    src/compiler/translator/RewriteDoWhile.cpp
>-    src/compiler/translator/RewriteElseBlocks.cpp
>-    src/compiler/translator/RewriteTexelFetchOffset.cpp
>-    src/compiler/translator/RewriteUnaryMinusOperatorFloat.cpp
>-    src/compiler/translator/RewriteUnaryMinusOperatorInt.cpp
>-    src/compiler/translator/RunAtTheEndOfShader.cpp
>-    src/compiler/translator/ScalarizeVecAndMatConstructorArgs.cpp
>-    src/compiler/translator/SearchSymbol.cpp
>-    src/compiler/translator/SeparateArrayInitialization.cpp
>-    src/compiler/translator/SeparateDeclarations.cpp
>-    src/compiler/translator/SeparateExpressionsReturningArrays.cpp
>-    src/compiler/translator/ShaderLang.cpp
>-    src/compiler/translator/ShaderVars.cpp
>-    src/compiler/translator/SimplifyLoopConditions.cpp
>-    src/compiler/translator/SplitSequenceOperator.cpp
>-    src/compiler/translator/StructureHLSL.cpp
>-    src/compiler/translator/SymbolTable.cpp
>-    src/compiler/translator/SymbolUniqueId.cpp
>-    src/compiler/translator/TextureFunctionHLSL.cpp
>-    src/compiler/translator/TranslatorESSL.cpp
>-    src/compiler/translator/TranslatorGLSL.cpp
>-    src/compiler/translator/TranslatorHLSL.cpp
>-    src/compiler/translator/TranslatorVulkan.cpp
>-    src/compiler/translator/Types.cpp
>-    src/compiler/translator/UnfoldShortCircuitAST.cpp
>-    src/compiler/translator/UnfoldShortCircuitToIf.cpp
>-    src/compiler/translator/UniformHLSL.cpp
>-    src/compiler/translator/UseInterfaceBlockFields.cpp
>-    src/compiler/translator/UtilsHLSL.cpp
>-    src/compiler/translator/ValidateGlobalInitializer.cpp
>-    src/compiler/translator/ValidateLimitations.cpp
>-    src/compiler/translator/ValidateMaxParameters.cpp
>-    src/compiler/translator/ValidateOutputs.cpp
>-    src/compiler/translator/ValidateSwitch.cpp
>-    src/compiler/translator/ValidateVaryingLocations.cpp
>-    src/compiler/translator/VariablePacker.cpp
>-    src/compiler/translator/VectorizeVectorScalarArithmetic.cpp
>-    src/compiler/translator/VersionGLSL.cpp
>-    src/compiler/translator/WrapSwitchStatementsInBlocks.cpp
>-    src/compiler/translator/blocklayout.cpp
>-    src/compiler/translator/blocklayoutHLSL.cpp
>-    src/compiler/translator/emulated_builtin_functions_hlsl_autogen.cpp
>-    src/compiler/translator/glslang_lex.cpp
>-    src/compiler/translator/glslang_tab.cpp
>-    src/compiler/translator/util.cpp
>-    src/image_util/copyimage.cpp
>-    src/image_util/imageformats.cpp
>-    src/image_util/loadimage.cpp
>-    src/image_util/loadimage_etc.cpp
>-    src/libANGLE/AttributeMap.cpp
>-    src/libANGLE/Buffer.cpp
>-    src/libANGLE/Caps.cpp
>-    src/libANGLE/Compiler.cpp
>-    src/libANGLE/Config.cpp
>-    src/libANGLE/Context.cpp
>-    src/libANGLE/ContextState.cpp
>-    src/libANGLE/Debug.cpp
>-    src/libANGLE/Device.cpp
>-    src/libANGLE/Display.cpp
>-    src/libANGLE/Error.cpp
>-    src/libANGLE/Fence.cpp
>-    src/libANGLE/Framebuffer.cpp
>-    src/libANGLE/FramebufferAttachment.cpp
>-    src/libANGLE/HandleAllocator.cpp
>-    src/libANGLE/HandleRangeAllocator.cpp
>-    src/libANGLE/Image.cpp
>-    src/libANGLE/ImageIndex.cpp
>-    src/libANGLE/IndexRangeCache.cpp
>-    src/libANGLE/LoggingAnnotator.cpp
>-    src/libANGLE/MemoryProgramCache.cpp
>-    src/libANGLE/PackedGLEnums_autogen.cpp
>-    src/libANGLE/Path.cpp
>-    src/libANGLE/Platform.cpp
>-    src/libANGLE/Program.cpp
>-    src/libANGLE/ProgramLinkedResources.cpp
>-    src/libANGLE/ProgramPipeline.cpp
>-    src/libANGLE/Query.cpp
>-    src/libANGLE/Renderbuffer.cpp
>-    src/libANGLE/ResourceManager.cpp
>-    src/libANGLE/Sampler.cpp
>-    src/libANGLE/Shader.cpp
>-    src/libANGLE/State.cpp
>-    src/libANGLE/Stream.cpp
>-    src/libANGLE/Surface.cpp
>-    src/libANGLE/Texture.cpp
>-    src/libANGLE/Thread.cpp
>-    src/libANGLE/TransformFeedback.cpp
>-    src/libANGLE/Uniform.cpp
>-    src/libANGLE/VaryingPacking.cpp
>-    src/libANGLE/VertexArray.cpp
>-    src/libANGLE/VertexAttribute.cpp
>-    src/libANGLE/WorkerThread.cpp
>-    src/libANGLE/angletypes.cpp
>-    src/libANGLE/es3_copy_conversion_table_autogen.cpp
>-    src/libANGLE/format_map_autogen.cpp
>-    src/libANGLE/formatutils.cpp
>-    src/libANGLE/params.cpp
>-    src/libANGLE/queryconversions.cpp
>-    src/libANGLE/queryutils.cpp
>-    src/libANGLE/renderer/ContextImpl.cpp
>-    src/libANGLE/renderer/DeviceImpl.cpp
>-    src/libANGLE/renderer/DisplayImpl.cpp
>-    src/libANGLE/renderer/Format_table_autogen.cpp
>-    src/libANGLE/renderer/SurfaceImpl.cpp
>-    src/libANGLE/renderer/TextureImpl.cpp
>-    src/libANGLE/renderer/driver_utils.cpp
>-    src/libANGLE/renderer/load_functions_table_autogen.cpp
>-    src/libANGLE/renderer/renderer_utils.cpp
>-    src/libANGLE/validationEGL.cpp
>-    src/libANGLE/validationES.cpp
>-    src/libANGLE/validationES2.cpp
>-    src/libANGLE/validationES3.cpp
>-    src/libANGLE/validationES31.cpp
>-    src/third_party/compiler/ArrayBoundsClamper.cpp
>+    ${libangle_common_sources}
>+    ${angle_preprocessor_sources}
>+    ${angle_translator_essl_sources}
>+    ${angle_translator_glsl_sources}
>+    ${angle_translator_sources}
> )
> 
>-set(ANGLE_COMPILE_DEFINITIONS
>-    ANGLE_ENABLE_ESSL
>-    ANGLE_ENABLE_GLSL
>-    LIBANGLE_IMPLEMENTATION
>-    NOMINMAX
>+set(ANGLEGLESv2_LIBRARIES
>+    ANGLE
> )
> 
>-if (NOT WIN32)
>-    list(APPEND ANGLE_SOURCES
>-        src/libANGLE/renderer/gl/BlitGL.cpp
>-        src/libANGLE/renderer/gl/BufferGL.cpp
>-        src/libANGLE/renderer/gl/ClearMultiviewGL.cpp
>-        src/libANGLE/renderer/gl/CompilerGL.cpp
>-        src/libANGLE/renderer/gl/ContextGL.cpp
>-        src/libANGLE/renderer/gl/DispatchTableGL_autogen.cpp
>-        src/libANGLE/renderer/gl/DisplayGL.cpp
>-        src/libANGLE/renderer/gl/FenceNVGL.cpp
>-        src/libANGLE/renderer/gl/FramebufferGL.cpp
>-        src/libANGLE/renderer/gl/FunctionsGL.cpp
>-        src/libANGLE/renderer/gl/PathGL.cpp
>-        src/libANGLE/renderer/gl/ProgramGL.cpp
>-        src/libANGLE/renderer/gl/ProgramPipelineGL.cpp
>-        src/libANGLE/renderer/gl/QueryGL.cpp
>-        src/libANGLE/renderer/gl/RenderbufferGL.cpp
>-        src/libANGLE/renderer/gl/RendererGL.cpp
>-        src/libANGLE/renderer/gl/SamplerGL.cpp
>-        src/libANGLE/renderer/gl/ShaderGL.cpp
>-        src/libANGLE/renderer/gl/StateManagerGL.cpp
>-        src/libANGLE/renderer/gl/SurfaceGL.cpp
>-        src/libANGLE/renderer/gl/SyncGL.cpp
>-        src/libANGLE/renderer/gl/TextureGL.cpp
>-        src/libANGLE/renderer/gl/TransformFeedbackGL.cpp
>-        src/libANGLE/renderer/gl/VertexArrayGL.cpp
>-        src/libANGLE/renderer/gl/egl/DisplayEGL.cpp
>-        src/libANGLE/renderer/gl/egl/FunctionsEGL.cpp
>-        src/libANGLE/renderer/gl/egl/FunctionsEGLDL.cpp
>-        src/libANGLE/renderer/gl/egl/PbufferSurfaceEGL.cpp
>-        src/libANGLE/renderer/gl/egl/SurfaceEGL.cpp
>-        src/libANGLE/renderer/gl/egl/WindowSurfaceEGL.cpp
>-        src/libANGLE/renderer/gl/egl/android/DisplayAndroid.cpp
>-        src/libANGLE/renderer/gl/egl/egl_utils.cpp
>-        src/libANGLE/renderer/gl/egl/ozone/DisplayOzone.cpp
>-        src/libANGLE/renderer/gl/egl/ozone/SurfaceOzone.cpp
>-        src/libANGLE/renderer/gl/formatutilsgl.cpp
>-        src/libANGLE/renderer/gl/glx/DisplayGLX.cpp
>-        src/libANGLE/renderer/gl/glx/FunctionsGLX.cpp
>-        src/libANGLE/renderer/gl/glx/PbufferSurfaceGLX.cpp
>-        src/libANGLE/renderer/gl/glx/WindowSurfaceGLX.cpp
>-        src/libANGLE/renderer/gl/null_functions.cpp
>-        src/libANGLE/renderer/gl/renderergl_utils.cpp
>-        src/libANGLE/renderer/gl/wgl/D3DTextureSurfaceWGL.cpp
>-        src/libANGLE/renderer/gl/wgl/DXGISwapChainWindowSurfaceWGL.cpp
>-        src/libANGLE/renderer/gl/wgl/DisplayWGL.cpp
>-        src/libANGLE/renderer/gl/wgl/FunctionsWGL.cpp
>-        src/libANGLE/renderer/gl/wgl/PbufferSurfaceWGL.cpp
>-        src/libANGLE/renderer/gl/wgl/WindowSurfaceWGL.cpp
>-        src/libANGLE/renderer/gl/wgl/wgl_utils.cpp
>-    )
>-    list(APPEND ANGLE_COMPILE_DEFINITIONS
>-        ANGLE_ENABLE_OPENGL
>-    )
>-endif ()
>-
> WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS()
> 
>-add_library(libEGL SHARED ${ANGLEEGL_SOURCES})
>-set_property(TARGET libEGL PROPERTY COMPILE_DEFINITIONS ${ANGLEEGL_COMPILE_DEFINITIONS})
>-
>-add_library(libGLESv2 SHARED ${ANGLEGLESv2_SOURCES})
>-set_property(TARGET libGLESv2 PROPERTY COMPILE_DEFINITIONS ${ANGLEGLESv2_COMPILE_DEFINITIONS})
>+add_subdirectory(include)
> 
>-add_library(libANGLE STATIC ${ANGLE_SOURCES})
>-set_property(TARGET libANGLE PROPERTY COMPILE_DEFINITIONS ${ANGLE_COMPILE_DEFINITIONS})
>+add_library(ANGLEFramework INTERFACE)
>+add_dependencies(ANGLEFramework ANGLEHeaders)
> 
>-target_link_libraries(libEGL
>-    libGLESv2
>-)
>+if (USE_ANGLE_EGL)
>+    add_library(ANGLE STATIC
>+        ${ANGLE_SOURCES}
>+        ${libangle_sources}
>+        ${libangle_image_util_sources}
>+        ${xxhash_sources}
>+    )
>+    target_include_directories(ANGLE PRIVATE ${ANGLE_PRIVATE_INCLUDE_DIRECTORIES})
>+    target_compile_definitions(ANGLE PRIVATE
>+        ${no_gl_prototypes}
>+        LIBANGLE_IMPLEMENTATION
>+    )
>+    target_compile_definitions(ANGLE PUBLIC ${ANGLE_DEFINITIONS})
>+
>+    add_library(GLESv2 SHARED ${libglesv2_sources})
>+    target_include_directories(GLESv2 PRIVATE ${ANGLE_PRIVATE_INCLUDE_DIRECTORIES})
>+    target_compile_definitions(GLESv2 PRIVATE LIBGLESV2_IMPLEMENTATION)
>+    target_link_libraries(GLESv2 ${ANGLEGLESv2_LIBRARIES})
>+
>+    add_library(EGL SHARED ${libegl_sources})
>+    target_include_directories(EGL PRIVATE ${ANGLE_PRIVATE_INCLUDE_DIRECTORIES})
>+    target_compile_definitions(EGL PRIVATE
>+        ${gl_prototypes}
>+        EGLAPI=
>+    )
>+    target_link_libraries(EGL GLESv2)
>+
>+    if (WIN32)
>+        target_sources(GLESv2 PRIVATE src/libGLESv2/libGLESv2_autogen.def)
>+        target_sources(EGL PRIVATE src/libEGL/libEGL.def)
>+
>+        # Output library names according to the .def
>+        set_target_properties(GLESv2 PROPERTIES OUTPUT_NAME libGLESv2)
>+        set_target_properties(EGL PROPERTIES OUTPUT_NAME libEGL)
>+    endif ()
>+
>+    target_link_libraries(ANGLEFramework INTERFACE EGL GLESv2)
>+    target_compile_definitions(ANGLEFramework INTERFACE ${gl_prototypes})
>+else ()
>+    add_library(ANGLE STATIC ${ANGLE_SOURCES})
>+    target_include_directories(ANGLE PRIVATE ${ANGLE_PRIVATE_INCLUDE_DIRECTORIES})
>+    target_compile_definitions(ANGLE PRIVATE
>+        ${ANGLE_DEFINITIONS}
>+        ${no_gl_prototypes}
>+        LIBANGLE_IMPLEMENTATION
>+    )
>+endif ()
> 
>-target_link_libraries(libGLESv2 ${ANGLEGLESv2_LIBRARIES})
>+if (COMPILER_IS_GCC_OR_CLANG)
>+    WEBKIT_ADD_TARGET_CXX_FLAGS(ANGLE -Wno-cast-align -Wno-unused-parameter)
>+endif ()
> 
>-file(MAKE_DIRECTORY ${FORWARDING_HEADERS_DIR}/ANGLE/include/egl)
>-file(MAKE_DIRECTORY ${FORWARDING_HEADERS_DIR}/ANGLE/include/GLES2)
>-file(MAKE_DIRECTORY ${FORWARDING_HEADERS_DIR}/ANGLE/include/GLSLANG)
>-file(MAKE_DIRECTORY ${FORWARDING_HEADERS_DIR}/ANGLE/include/khr)
>-file(GLOB _files_ANGLE "${THIRDPARTY_DIR}/ANGLE/ANGLE/*.h")
>-file(GLOB _files_egl "${THIRDPARTY_DIR}/ANGLE/include/egl/*.h")
>-file(GLOB _files_GLES2 "${THIRDPARTY_DIR}/ANGLE/include/GLES2/*.h")
>-file(GLOB _files_GLES3 "${THIRDPARTY_DIR}/ANGLE/include/GLES3/*.h")
>-file(GLOB _files_GLSLANG "${THIRDPARTY_DIR}/ANGLE/include/GLSLANG/*.h")
>-file(GLOB _files_khr "${THIRDPARTY_DIR}/ANGLE/include/khr/*.h")
>-foreach (_file ${_files_ANGLE})
>-    file(COPY ${_file} DESTINATION ${FORWARDING_HEADERS_DIR}/ANGLE/)
>-endforeach ()
>-foreach (_file ${_files_egl})
>-    file(COPY ${_file} DESTINATION ${FORWARDING_HEADERS_DIR}/ANGLE/include/egl)
>-endforeach ()
>-foreach (_file ${_files_GLES2})
>-    file(COPY ${_file} DESTINATION ${FORWARDING_HEADERS_DIR}/ANGLE/include/GLES2)
>-endforeach ()
>-foreach (_file ${_files_GLES3})
>-    file(COPY ${_file} DESTINATION ${FORWARDING_HEADERS_DIR}/ANGLE/include/GLES3)
>-endforeach ()
>-foreach (_file ${_files_GLSLANG})
>-    file(COPY ${_file} DESTINATION ${FORWARDING_HEADERS_DIR}/ANGLE/include/GLSLANG)
>-endforeach ()
>-foreach (_file ${_files_khr})
>-    file(COPY ${_file} DESTINATION ${FORWARDING_HEADERS_DIR}/ANGLE/include/khr)
>-endforeach ()
>+target_link_libraries(ANGLEFramework INTERFACE ANGLE)
>+target_include_directories(ANGLEFramework INTERFACE ${ANGLE_FRAMEWORK_HEADERS_DIR})
> 
> set_property(DIRECTORY . PROPERTY FOLDER "ANGLE")
>diff --git a/Source/ThirdParty/ANGLE/CONTRIBUTORS b/Source/ThirdParty/ANGLE/CONTRIBUTORS
>index a767773b33f..4c3baa352cf 100644
>--- a/Source/ThirdParty/ANGLE/CONTRIBUTORS
>+++ b/Source/ThirdParty/ANGLE/CONTRIBUTORS
>@@ -42,6 +42,8 @@ Google Inc.
>  Scott Graham
>  Corentin Wallez
>  Kai Ninomiya
>+ Victor Costan
>+ Shahbaz Youssefi
> 
> Adobe Systems Inc.
>  Alexandru Chiculita
>@@ -73,11 +75,13 @@ Intel Corporation
>  Yunchao He
>  Xinghua Cao
>  Brandon Jones
>+ Enrico Galli
> 
> KlarÃ¤lvdalens Datakonsult AB
>  Milian Wolff
> 
> Mozilla Corp.
>+ Dzmitry Malyshau
>  Ehsan Akhgari
>  Edwin Flores
>  Jeff Gilbert
>@@ -99,12 +103,16 @@ Sebastian Bergstein
> James Ross-Gowan
> Andrei Volykhin
> JÃ©rÃ´me Duval
>+Till Rathmann
> 
> Microsoft Corporation
>  Cooper Partin
>  Austin Kinross
>+ Mingyu Hu
>  Minmin Gong
>  Shawn Hargreaves
>+ Rafael Cintron
>+ James Clarke
> 
> Microsoft Open Technologies, Inc.
>  Cooper Partin
>@@ -117,6 +125,8 @@ NVIDIA Corporation
>  Kimmo Kinnunen
>  Sami VÃ¤isÃ¤nen
>  Martin Radev
>+ Joonatan Saarhelo
>+ Markus Tavenrath
> 
> Opera Software ASA
>  Daniel Bratell
>@@ -125,3 +135,13 @@ Opera Software ASA
> 
> Advanced Micro Devices, Inc.
>  Russ Lind
>+
>+LG Electronics, Inc.
>+ Jani Hautakangas
>+
>+IBM Inc.
>+ Junliang Yan
>+
>+AdaptVis GmbH
>+ Sascha Kolodzey
>+
>diff --git a/Source/ThirdParty/ANGLE/ChangeLog b/Source/ThirdParty/ANGLE/ChangeLog
>deleted file mode 100644
>index 7dfef2ee964..00000000000
>--- a/Source/ThirdParty/ANGLE/ChangeLog
>+++ /dev/null
>@@ -1,11559 +0,0 @@
>-2019-04-29  Alex Christensen  <achristensen@webkit.org>
>-
>-        <rdar://problem/50299396> Fix internal High Sierra build
>-        https://bugs.webkit.org/show_bug.cgi?id=197388
>-
>-        * Configurations/Base.xcconfig:
>-
>-2019-04-25  Alex Christensen  <achristensen@webkit.org>
>-
>-        Start using C++17
>-        https://bugs.webkit.org/show_bug.cgi?id=197131
>-
>-        Reviewed by Darin Adler.
>-
>-        * Configurations/Base.xcconfig:
>-
>-2019-03-22  Keith Rollin  <krollin@apple.com>
>-
>-        Enable ThinLTO support in Production builds
>-        https://bugs.webkit.org/show_bug.cgi?id=190758
>-        <rdar://problem/45413233>
>-
>-        Reviewed by Daniel Bates.
>-
>-        Enable building with Thin LTO in Production when using Xcode 10.2 or
>-        later. This change results in a 1.45% progression in PLT5. Full
>-        Production build times increase about 2-3%. Incremental build times
>-        are more severely affected, and so LTO is not enabled for local
>-        engineering builds.
>-
>-        LTO is enabled only on macOS for now, until rdar://problem/49013399,
>-        which affects ARM builds, is fixed.
>-
>-        To change the LTO setting when building locally:
>-
>-        - If building with `make`, specify WK_LTO_MODE={none,thin,full} on the
>-          command line.
>-        - If building with `build-webkit`, specify --lto-mode={none,thin,full}
>-          on the command line.
>-        - If building with `build-root`, specify --lto={none,thin,full} on the
>-          command line.
>-        - If building with Xcode, create a LocalOverrides.xcconfig file at the
>-          top level of your repository directory (if needed) and define
>-          WK_LTO_MODE to full, thin, or none.
>-
>-        * Configurations/Base.xcconfig:
>-
>-2019-02-23  Keith Miller  <keith_miller@apple.com>
>-
>-        Add new mac target numbers
>-        https://bugs.webkit.org/show_bug.cgi?id=194955
>-
>-        Reviewed by Tim Horton.
>-
>-        * Configurations/Base.xcconfig:
>-        * Configurations/DebugRelease.xcconfig:
>-
>-2019-02-20  Andy Estes  <aestes@apple.com>
>-
>-        [Xcode] Add SDKVariant.xcconfig to various Xcode projects
>-        https://bugs.webkit.org/show_bug.cgi?id=194869
>-
>-        Rubber-stamped by Jer Noble.
>-
>-        * ANGLE.xcodeproj/project.pbxproj:
>-
>-2019-01-18  Jer Noble  <jer.noble@apple.com>
>-
>-        SDK_VARIANT build destinations should be separate from non-SDK_VARIANT builds
>-        https://bugs.webkit.org/show_bug.cgi?id=189553
>-
>-        Reviewed by Tim Horton.
>-
>-        * Configurations/Base.xcconfig:
>-        * Configurations/SDKVariant.xcconfig: Added.
>-
>-2019-01-17  Truitt Savell  <tsavell@apple.com>
>-
>-        Unreviewed, rolling out r240124.
>-
>-        This commit broke an internal build.
>-
>-        Reverted changeset:
>-
>-        "SDK_VARIANT build destinations should be separate from non-
>-        SDK_VARIANT builds"
>-        https://bugs.webkit.org/show_bug.cgi?id=189553
>-        https://trac.webkit.org/changeset/240124
>-
>-2019-01-17  Jer Noble  <jer.noble@apple.com>
>-
>-        SDK_VARIANT build destinations should be separate from non-SDK_VARIANT builds
>-        https://bugs.webkit.org/show_bug.cgi?id=189553
>-
>-        Reviewed by Tim Horton.
>-
>-        * Configurations/Base.xcconfig:
>-        * Configurations/SDKVariant.xcconfig: Added.
>-
>-2019-01-15  David Kilzer  <ddkilzer@apple.com>
>-
>-        clang-tidy: Fix unnecessary copy of for loop variables in ANGLE
>-        <https://webkit.org/b/193443>
>-
>-        Reviewed by Alex Christensen.
>-
>-        Fix unwanted copying of loop variables by making them const
>-        references.
>-
>-        * src/compiler/preprocessor/MacroExpander.cpp:
>-        (pp::MacroExpander::ScopedMacroReenabler::~ScopedMacroReenabler):
>-        - Prevents copy and reference churn of std::shared_ptr<Macro>
>-          objects.
>-        * src/compiler/translator/Compiler.cpp:
>-        (sh::TCompiler::useAllMembersInUnusedStandardAndSharedBlocks):
>-        - Prevents copy of sh::InterfaceBlock structs.
>-        (sh::TCompiler::initializeOutputVariables):
>-        - Prevents copy of sh::Varying structs.
>-        * src/libANGLE/Program.cpp:
>-        (gl::(anonymous namespace)::IncludeSameArrayElement):
>-        - Prevents copy of std::string objects.
>-
>-2018-10-03  Dan Bernstein  <mitz@apple.com>
>-
>-        ANGLE part of [Xcode] Update some build settings as recommended by Xcode 10
>-        https://bugs.webkit.org/show_bug.cgi?id=190250
>-
>-        Reviewed by Andy Estes.
>-
>-        * ANGLE.xcodeproj/project.pbxproj: Kept the unreachable code warning off for four files that
>-          were generated by tools: glslang_lex.cpp, glslang_tab.cpp, Tokenizer.cpp, and
>-          ExpressionParser.cpp. Let Xcode update LastUpgradeCheck.
>-
>-        * Configurations/Base.xcconfig: Enabled CLANG_WARN_COMMA, CLANG_WARN_INFINITE_RECURSION,
>-          CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS, CLANG_WARN_SUSPICIOUS_MOVE,
>-          CLANG_WARN_UNREACHABLE_CODE, CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF, and
>-          CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED.
>-
>-2018-09-21  Adrian Perez de Castro  <aperez@igalia.com>
>-
>-        [GTK] ANGLE's eglplatform.h does not support Wayland-only builds
>-        https://bugs.webkit.org/show_bug.cgi?id=189844
>-
>-        Reviewed by Michael Catanzaro.
>-
>-        This makes it possible to build WebKitGTK+ after r225340 when the
>-        build is configured to support only Wayland, and the X11 headers
>-        are not present.
>-
>-        * changes.diff: Updated.
>-        * include/EGL/eglplatform.h: Include the X11 headers only when
>-        ANGLE_USE_X11 is defined and, for consistency with Mesa's version
>-        of the header, when MESA_EGL_NO_X11_HEADERS is not defined.
>-
>-2018-08-29  David Kilzer  <ddkilzer@apple.com>
>-
>-        Remove empty directories from from svn.webkit.org repository
>-        <https://webkit.org/b/189081>
>-
>-        * src/angle.xcodeproj: Removed.
>-        * src/common/third_party/numerics: Removed.
>-
>-2018-08-28  David Kilzer  <ddkilzer@apple.com>
>-
>-        Move PMurHash.{cpp,h} into 'src' folder to match path on disk
>-
>-        * ANGLE.xcodeproj/project.pbxproj:
>-        (src/common/third_party/smhasher/src): Add folder and move
>-        PMurHash.{cpp,h} into it.  This makes tidy-Xcode-project-file
>-        run smoothly when updating the ANGLE project.
>-
>-2018-08-27  Keith Rollin  <krollin@apple.com>
>-
>-        Unreviewed build fix -- disable LTO for production builds
>-
>-        * Configurations/Base.xcconfig:
>-
>-2018-08-27  Keith Rollin  <krollin@apple.com>
>-
>-        Build system support for LTO
>-        https://bugs.webkit.org/show_bug.cgi?id=187785
>-        <rdar://problem/42353132>
>-
>-        Reviewed by Dan Bernstein.
>-
>-        Update Base.xcconfig and DebugRelease.xcconfig to optionally enable
>-        LTO.
>-
>-        * Configurations/Base.xcconfig:
>-        * Configurations/DebugRelease.xcconfig:
>-
>-2018-08-03  Alex Christensen  <achristensen@webkit.org>
>-
>-        Fix spelling of "overridden"
>-        https://bugs.webkit.org/show_bug.cgi?id=188315
>-
>-        Reviewed by Darin Adler.
>-
>-        * src/libANGLE/renderer/ProgramImpl.h:
>-
>-2018-07-14  Kocsen Chung  <kocsen_chung@apple.com>
>-
>-        Ensure WebKit stack is ad-hoc signed
>-        https://bugs.webkit.org/show_bug.cgi?id=187667
>-
>-        Reviewed by Alexey Proskuryakov.
>-
>-        * Configurations/Base.xcconfig:
>-
>-2018-07-04  Tim Horton  <timothy_horton@apple.com>
>-
>-        Introduce PLATFORM(IOSMAC)
>-        https://bugs.webkit.org/show_bug.cgi?id=187315
>-
>-        Reviewed by Dan Bernstein.
>-
>-        * Configurations/Base.xcconfig:
>-
>-2018-06-09  Dan Bernstein  <mitz@apple.com>
>-
>-        [Xcode] Clean up and modernize some build setting definitions
>-        https://bugs.webkit.org/show_bug.cgi?id=186463
>-
>-        Reviewed by Sam Weinig.
>-
>-        * Configurations/Base.xcconfig: Removed definition for macOS 10.11.
>-        * Configurations/DebugRelease.xcconfig: Ditto.
>-
>-2018-05-30  David Kilzer  <ddkilzer@apple.com>
>-
>-        ANGLE: Fix clang static analyzer issues in GetExecutablePath() and GetExecutableDirectory()
>-        <https://webkit.org/b/186106>
>-        <rdar://problem/40659179>
>-
>-        Reviewed by Alex Christensen.
>-
>-        * src/common/system_utils_linux.cpp:
>-        (angle::GetExecutablePath):
>-        (angle::GetExecutableDirectory):
>-        * src/common/system_utils_mac.cpp:
>-        (angle::GetExecutablePath):
>-        (angle::GetExecutableDirectory):
>-        * src/common/system_utils_win.cpp:
>-        (angle::GetExecutablePath):
>-        (angle::GetExecutableDirectory):
>-
>-2018-05-22  Ryan Haddad  <ryanhaddad@apple.com>
>-
>-        Unreviewed, rolling out r232052.
>-
>-        Breaks internal builds.
>-
>-        Reverted changeset:
>-
>-        "Use more C++17"
>-        https://bugs.webkit.org/show_bug.cgi?id=185176
>-        https://trac.webkit.org/changeset/232052
>-
>-2018-05-21  Yusuke Suzuki  <utatane.tea@gmail.com>
>-
>-        Use more C++17
>-        https://bugs.webkit.org/show_bug.cgi?id=185176
>-
>-        Reviewed by JF Bastien.
>-
>-        * Configurations/Base.xcconfig:
>-
>-2018-04-18  Jer Noble  <jer.noble@apple.com>
>-
>-        Don't put build products into WK_ALTERNATE_WEBKIT_SDK_PATH for engineering builds
>-        https://bugs.webkit.org/show_bug.cgi?id=184762
>-
>-        Reviewed by Dan Bernstein.
>-
>-        * Configurations/Base.xcconfig:
>-
>-2018-04-19  David Kilzer  <ddkilzer@apple.com>
>-
>-        Enable Objective-C weak references
>-        <https://webkit.org/b/184789>
>-        <rdar://problem/39571716>
>-
>-        Reviewed by Dan Bernstein.
>-
>-        * Configurations/Base.xcconfig:
>-        (CLANG_ENABLE_OBJC_WEAK): Enable.
>-
>-2018-03-19  Carlos Alberto Lopez Perez  <clopez@igalia.com>
>-
>-        REGRESSION(r225340): WPE port should not be getting EGL X11 types on ANGLE
>-        https://bugs.webkit.org/show_bug.cgi?id=183749
>-
>-        Reviewed by Alex Christensen.
>-
>-        Add back the USE_WPE ifdef.
>-
>-        * changes.diff:
>-        * include/EGL/eglplatform.h:
>-
>-2018-03-15  Tim Horton  <timothy_horton@apple.com>
>-
>-        Add and adopt WK_ALTERNATE_FRAMEWORKS_DIR in ANGLE
>-        https://bugs.webkit.org/show_bug.cgi?id=183675
>-        <rdar://problem/38515281>
>-
>-        Reviewed by Dan Bernstein.
>-
>-        * ANGLE.xcodeproj/project.pbxproj:
>-        * Configurations/ANGLE.xcconfig:
>-        * Configurations/Base.xcconfig:
>-
>-2018-01-27  Dan Bernstein  <mitz@apple.com>
>-
>-        HaveInternalSDK includes should be "#include?"
>-        https://bugs.webkit.org/show_bug.cgi?id=179670
>-
>-        * Configurations/Base.xcconfig:
>-
>-2018-01-18  Dan Bernstein  <mitz@apple.com>
>-
>-        [Xcode] Streamline and future-proof target-macOS-version-dependent build setting definitions
>-        https://bugs.webkit.org/show_bug.cgi?id=181803
>-
>-        Reviewed by Tim Horton.
>-
>-        * Configurations/Base.xcconfig: Updated.
>-        * Configurations/DebugRelease.xcconfig: Ditto.
>-
>-2018-01-09  Dan Bernstein  <mitz@apple.com>
>-
>-        Removed some empty directories that were left behind
>-
>-        * src/third_party/murmurhash: Removed.
>-        * third_party: Removed.
>-        * third_party/deqp: Removed.
>-
>-2017-12-14  David Kilzer  <ddkilzer@apple.com>
>-
>-        Enable -Wstrict-prototypes for WebKit
>-        <https://webkit.org/b/180757>
>-        <rdar://problem/36024132>
>-
>-        Rubber-stamped by Joseph Pecoraro.
>-
>-        * Configurations/Base.xcconfig:
>-        (CLANG_WARN_STRICT_PROTOTYPES): Add. Set to YES.
>-
>-2017-12-06  Dean Jackson  <dino@apple.com>
>-
>-        Update ANGLE's changes.diff
>-        https://bugs.webkit.org/show_bug.cgi?id=180491
>-
>-        Reviewed by Antoine Quint.
>-
>-        Here is the list of things we've changed from the
>-        ANGLE commit that we merged in.
>-
>-        * changes.diff:
>-
>-2017-12-06  Dean Jackson  <dino@apple.com>
>-
>-        Some iOS tests failing after ANGLE update
>-        https://bugs.webkit.org/show_bug.cgi?id=180487
>-        <rdar://problem/35885969>
>-
>-        Reviewed by Antoine Quint.
>-
>-        The iOS OpenGL compiler doesn't like function declarations with
>-        nameless array parameters. See:
>-        <rdar://problem/35885989> Nameless array parameters in function declaration cause compiler error
>-
>-        While that is being fixed, tell ANGLE's translator to not cull
>-        the names from parameters. This is not a bug in ANGLE, so we won't
>-        fix it upstream at the moment.
>-
>-        * src/compiler/translator/ParseContext.cpp:
>-        (sh::TParseContext::addFunctionPrototypeDeclaration):
>-
>-2017-12-01  Michael Catanzaro  <mcatanzaro@igalia.com>
>-
>-        Unreviewed, fix byte order macros and address new -Wunknown-pragmas warnings
>-        https://bugs.webkit.org/show_bug.cgi?id=180177
>-        <rdar://problem/35774734>
>-
>-        I'm not sure how this code was developed, as it seems to have been designed for GCC, but it
>-        does not use any of GCC's documented byte order macros, and accordingly does not work. Let's
>-        fix it to guarantee there are no problems when building with GCC. I presume it should help
>-        Clang as well.
>-
>-        This time, hopefully without breaking 32-bit macOS, where __BYTE_ORDER actually is defined.
>-
>-        * src/common/third_party/smhasher/src/PMurHash.cpp:
>-        (angle::PMurHash32_Process):
>-
>-2017-12-01  Ryan Haddad  <ryanhaddad@apple.com>
>-
>-        Unreviewed, rolling out r225412.
>-
>-        Breaks 32-bit macOS builds.
>-
>-        Reverted changeset:
>-
>-        "Unreviewed, fix byte order macros and address new -Wunknown-
>-        pragmas warnings"
>-        https://bugs.webkit.org/show_bug.cgi?id=180177
>-        https://trac.webkit.org/changeset/225412
>-
>-2017-12-01  Michael Catanzaro  <mcatanzaro@igalia.com>
>-
>-        Unreviewed, fix byte order macros and address new -Wunknown-pragmas warnings
>-        https://bugs.webkit.org/show_bug.cgi?id=180177
>-        <rdar://problem/35774734>
>-
>-        I'm not sure how this code was developed, as it seems to have been designed for GCC, but it
>-        does not use any of GCC's documented byte order macros, and accordingly does not work. Let's
>-        fix it to guarantee there are no problems when building with GCC. I presume it should help
>-        Clang as well.
>-
>-        * src/common/third_party/smhasher/src/PMurHash.cpp:
>-        (angle::PMurHash32_Process):
>-
>-2017-12-01  Tomoki Imai  <Tomoki.Imai@sony.com>
>-
>-        Fix WinCairo build break after r225340
>-        https://bugs.webkit.org/show_bug.cgi?id=180230
>-
>-        Unreviewed build fix.
>-
>-        * CMakeLists.txt: Add missing sources.
>-        * PlatformWin.cmake: Add missing sources.
>-
>-2017-12-01  Michael Catanzaro  <mcatanzaro@igalia.com>
>-
>-        Unreviewed, fix -Wunknown-pragmas warnings.
>-        https://bugs.webkit.org/show_bug.cgi?id=180177
>-
>-        It seems GCC has started to warn about unrecognized Clang pragmas. Oh well.
>-
>-        This is not sent upstream, because the Clang pragmas appear to be downstream WebKit
>-        additions. changes.diff is not updated, because it was not updated in yesterday's ANGLE
>-        update.
>-
>-        * include/GLSLANG/ShaderVars.h:
>-        * src/libANGLE/Platform.cpp:
>-
>-2017-11-30  Alex Christensen  <achristensen@webkit.org>
>-
>-        Speculative WinCairo fix.
>-        https://bugs.webkit.org/show_bug.cgi?id=180177
>-
>-        * CMakeLists.txt:
>-        * PlatformWin.cmake:
>-
>-2017-11-30  Ryan Haddad  <ryanhaddad@apple.com>
>-
>-        Unreviewed build fix, remove executable property from a header file.
>-
>-        * include/KHR/khrplatform.h: Removed property svn:executable.
>-
>-2017-11-30  Dean Jackson  <dino@apple.com>
>-
>-        Update ANGLE
>-        https://bugs.webkit.org/show_bug.cgi?id=180177
>-        <rdar://problem/35774734>
>-
>-        Reviewed by Alex Christensen.
>-
>-        Huge list of changed files omitted.
>-
>-2017-07-18  Andy Estes  <aestes@apple.com>
>-
>-        [Xcode] Enable CLANG_WARN_RANGE_LOOP_ANALYSIS
>-        https://bugs.webkit.org/show_bug.cgi?id=174631
>-
>-        Reviewed by Tim Horton.
>-
>-        * Configurations/Base.xcconfig:
>-
>-2017-07-18  Andy Estes  <aestes@apple.com>
>-
>-        [Xcode] Enable CLANG_WARN_OBJC_LITERAL_CONVERSION
>-        https://bugs.webkit.org/show_bug.cgi?id=174631
>-
>-        Reviewed by Sam Weinig.
>-
>-        * Configurations/Base.xcconfig:
>-
>-2017-07-18  Andy Estes  <aestes@apple.com>
>-
>-        [Xcode] Enable CLANG_WARN_NON_LITERAL_NULL_CONVERSION
>-        https://bugs.webkit.org/show_bug.cgi?id=174631
>-
>-        Reviewed by Dan Bernstein.
>-
>-        * Configurations/Base.xcconfig:
>-
>-2017-07-18  Andy Estes  <aestes@apple.com>
>-
>-        [Xcode] Enable CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING
>-        https://bugs.webkit.org/show_bug.cgi?id=174631
>-
>-        Reviewed by Darin Adler.
>-
>-        * Configurations/Base.xcconfig:
>-
>-2017-07-13  Adrian Perez de Castro  <aperez@igalia.com>
>-
>-        eglplatform.h does not support Wayland
>-        https://bugs.webkit.org/show_bug.cgi?id=163482
>-
>-        This makes it possible to build WebKitGTK+ when the target system has only Wayland support,
>-        but no X11 (and therefore the X11 headers are not present).
>-
>-        Reviewed by Alex Christensen.
>-
>-        * include/EGL/eglplatform.h: Add Wayland typedefs when WL_EGL_PLATFORM is defined (for example
>-        by including wayland-egl.h before including EGL/egl.h). Also, include the X11 headers only
>-        when ANGLE_USE_X11 is defined and, for consistency with Mesa's version of the header, when
>-        MESA_EGL_NO_X11_HEADERS is not defined.
>-
>-2017-07-03  Andy Estes  <aestes@apple.com>
>-
>-        [Xcode] Add an experimental setting to build with ccache
>-        https://bugs.webkit.org/show_bug.cgi?id=173875
>-
>-        Reviewed by Tim Horton.
>-
>-        * Configurations/DebugRelease.xcconfig: Included ccache.xcconfig.
>-
>-2017-07-01  Dan Bernstein  <mitz@apple.com>
>-
>-        [macOS] Remove code only needed when building for OS X Yosemite
>-        https://bugs.webkit.org/show_bug.cgi?id=174067
>-
>-        Reviewed by Tim Horton.
>-
>-        * Configurations/Base.xcconfig:
>-        * Configurations/DebugRelease.xcconfig:
>-
>-2017-06-10  Dan Bernstein  <mitz@apple.com>
>-
>-        Reverted r218056 because it made the IDE reindex constantly.
>-
>-        * Configurations/DebugRelease.xcconfig:
>-
>-2017-06-10  Dan Bernstein  <mitz@apple.com>
>-
>-        [Xcode] With Xcode 9 developer beta, everything rebuilds when switching between command-line and IDE
>-        https://bugs.webkit.org/show_bug.cgi?id=173223
>-
>-        Reviewed by Sam Weinig.
>-
>-        The rebuilds were happening due to a difference in the compiler options that the IDE and
>-        xcodebuild were specifying. Only the IDE was passing the -index-store-path option. To make
>-        xcodebuild pass that option, too, set CLANG_INDEX_STORE_ENABLE to YES if it is unset, and
>-        specify an appropriate path in CLANG_INDEX_STORE_PATH.
>-
>-        * Configurations/DebugRelease.xcconfig:
>-
>-2017-05-28  Dan Bernstein  <mitz@apple.com>
>-
>-        [Xcode] ALWAYS_SEARCH_USER_PATHS is set to YES
>-        https://bugs.webkit.org/show_bug.cgi?id=172691
>-
>-        Reviewed by Tim Horton.
>-
>-        * Configurations/Base.xcconfig: Set ALWAYS_SEARCH_USER_PATHS to NO.
>-
>-2017-05-09  Zan Dobersek  <zdobersek@igalia.com>
>-
>-        Upstream the WPE port
>-        https://bugs.webkit.org/show_bug.cgi?id=171110
>-
>-        Reviewed by Alex Christensen.
>-
>-        * include/EGL/eglplatform.h:
>-        Allow building WPE on platforms that don't provide X11 libraries.
>-
>-2017-05-04  Don Olmstead  <don.olmstead@am.sony.com>
>-
>-        [Win] Remove redundant macros that are set in the CMake config
>-        https://bugs.webkit.org/show_bug.cgi?id=171571
>-
>-        Reviewed by Brent Fulgham.
>-
>-        * CMakeLists.txt:
>-
>-2017-04-20  Konstantin Tokarev  <annulen@yandex.ru>
>-
>-        [cmake] Define FORWARDING_HEADERS_DIR in WebKitFS and use it everywhere
>-        https://bugs.webkit.org/show_bug.cgi?id=171071
>-
>-        Reviewed by Michael Catanzaro.
>-
>-        "${DERIVED_SOURCES_DIR}/ForwardingHeaders" path occurs very often in the
>-        build system files. GTK-specifc FORWARDING_HEADERS_DIR variable should
>-        be available for all ports.
>-
>-        * CMakeLists.txt:
>-
>-2017-04-20  Fujii Hironori  <Hironori.Fujii@sony.com>
>-
>-        [WinCairo] Fix build break after updating ANGLE
>-        https://bugs.webkit.org/show_bug.cgi?id=170980
>-
>-        Reviewed by Brent Fulgham.
>-
>-        * CMakeLists.txt: Added some new source files.
>-        * PlatformMac.cmake: Ditto.
>-        * PlatformWin.cmake: Ditto. Remove a macro 'ANGLE_WEBKIT_WIN'
>-        because SoftLinking is not used anymore.
>-        * src/third_party/systeminfo/: Restored.
>-
>-2017-04-19  Ryan Haddad  <ryanhaddad@apple.com>
>-
>-        Remove executable property from a header file.
>-
>-        * include/KHR/khrplatform.h: Removed property svn:executable.
>-
>-2017-04-18  Dean Jackson  <dino@apple.com>
>-
>-        Add the actual content to the files, now that
>-        SVN knows they can have tabs.
>-
>-        * src/third_party/murmurhash/MurmurHash3.cpp:
>-        * src/third_party/murmurhash/MurmurHash3.h:
>-
>-2017-04-18  Dean Jackson  <dino@apple.com>
>-
>-        WinCairo needs these files I recently removed
>-        from our copy of ANGLE.
>-
>-        * src/third_party/murmurhash/LICENSE: Added.
>-        * src/third_party/murmurhash/MurmurHash3.cpp: Added.
>-        * src/third_party/murmurhash/MurmurHash3.h: Added.
>-
>-2017-04-18  Dean Jackson  <dino@apple.com>
>-
>-        Still trying to fix Windows.
>-
>-        * PlatformWin.cmake:
>-
>-2017-04-18  Dean Jackson  <dino@apple.com>
>-
>-        Attempt to fix the Windows build.
>-
>-        * PlatformWin.cmake:
>-
>-2017-04-18  Dean Jackson  <dino@apple.com>
>-
>-        Update ANGLE
>-        https://bugs.webkit.org/show_bug.cgi?id=170941
>-        <rdar://problem/31633999>
>-
>-        Reviewed by Alex Christensen.
>-
>-        Huge list of changed files omitted.
>-
>-2017-04-12  Dan Bernstein  <mitz@apple.com>
>-
>-        [Mac] Future-proof .xcconfig files
>-        https://bugs.webkit.org/show_bug.cgi?id=170802
>-
>-        Reviewed by Tim Horton.
>-
>-        * Configurations/Base.xcconfig:
>-        * Configurations/DebugRelease.xcconfig:
>-
>-2016-12-20  Tim Horton  <timothy_horton@apple.com>
>-
>-        Remove an ANGLE Markdown file from the ANGLE target
>-        https://bugs.webkit.org/show_bug.cgi?id=166279
>-
>-        Reviewed by Alex Christensen.
>-
>-        * ANGLE.xcodeproj/project.pbxproj:
>-        We don't need to build this, it's not source code.
>-
>-2016-12-15  Myles C. Maxfield  <mmaxfield@apple.com>
>-
>-        Sort Xcode project files
>-        https://bugs.webkit.org/show_bug.cgi?id=165937
>-
>-        Reviewed by Simon Fraser.
>-
>-        * ANGLE.xcodeproj/project.pbxproj:
>-
>-2016-12-15  Alex Christensen  <achristensen@webkit.org>
>-
>-        Fix Windows WebGL build after r209832
>-
>-        * CMakeLists.txt:
>-        * include/EGL/egl.h:
>-        * include/GLES2/gl2.h:
>-
>-2016-12-14  Alex Christensen  <achristensen@webkit.org>
>-
>-        Progress towards using ANGLE to do WebGL rendering
>-        https://bugs.webkit.org/show_bug.cgi?id=165864
>-
>-        Reviewed by Dean Jackson.
>-
>-        * ANGLE.xcodeproj/project.pbxproj:
>-        Compile more files, and add some more "public" headers.
>-        ANGLE is not a public framework, so these headers just go in 
>-        WebKitBuild/Release/usr/local/include/ANGLE to be included when compiling WebCore.
>-        * ANGLE/egl.h: Added.
>-        * ANGLE/eglext.h: Added.
>-        * ANGLE/eglplatform.h: Added.
>-        * ANGLE/entry_points_gles_2_0.h: Added.
>-        * ANGLE/entry_points_gles_2_0_ext.h: Added.
>-        * ANGLE/entry_points_gles_3_0.h: Added.
>-        * ANGLE/export.h: Added.
>-        * ANGLE/gl2.h: Added.
>-        * ANGLE/gl2ext.h: Added.
>-        * ANGLE/gl2platform.h: Added.
>-        * ANGLE/gl3.h: Added.
>-        * ANGLE/gl31.h: Added.
>-        * ANGLE/gl3platform.h: Added.
>-        * ANGLE/khrplatform.h: Added.
>-        Add more forwarding headers.  There are already a few, but we need more.
>-        * CMakeLists.txt:
>-        * PlatformMac.cmake:
>-        Make the frameworks linked to by ANGLE be private so frameworks that link with 
>-        ANGLE don't automatically link with them. This allows me to switch ANGLE from a 
>-        static library to a dynamic library to make sure WebCore isn't directly using OpenGL.
>-        * PlatformWin.cmake:
>-        Move HLSL-specific files to only be built on Windows.
>-        * include/EGL/egl.h:
>-        * include/EGL/eglplatform.h:
>-        * include/GLES2/gl2.h:
>-        * include/GLES2/gl2platform.h:
>-        * include/GLES3/gl3.h:
>-        * include/GLES3/gl31.h:
>-        * include/GLES3/gl32.h:
>-        * include/GLES3/gl3platform.h:
>-        * src/libGLESv2/entry_points_egl.h:
>-        * src/libGLESv2/entry_points_egl_ext.h:
>-        * src/libGLESv2/entry_points_gles_2_0.h:
>-        * src/libGLESv2/entry_points_gles_2_0_ext.h:
>-        * src/libGLESv2/entry_points_gles_3_0.h:
>-        * src/libGLESv2/entry_points_gles_3_1.h:
>-        Include ANGLE headers as #include <ANGLE/*> instead of #include <KHR/*> or #include <GLES/*>
>-        This is needed to distinguish the ANGLE headers from any system OpenGL/OpenGLES headers.
>-        We will eventually only include ANGLE's entry_points_*.h directly from WebCore.
>-
>-2016-12-07  Alex Christensen  <achristensen@webkit.org>
>-
>-        Build more of ANGLE on Mac and Windows
>-        https://bugs.webkit.org/show_bug.cgi?id=165543
>-
>-        Reviewed by Dean Jackson.
>-
>-        We will need to compile these files to use ANGLE's GLESv2 implementation instead of 
>-        using OpenGL directly. No functional change.
>-
>-        * ANGLE.xcodeproj/project.pbxproj:
>-        * CMakeLists.txt:
>-        Move platform-specific files to Platform*.cmake.
>-        * PlatformMac.cmake: Added.
>-        * PlatformWin.cmake: Added.
>-        * src/libANGLE/renderer/Format.cpp:
>-        * src/libANGLE/renderer/Format_autogen.cpp:
>-        (angle::Format::Get):
>-        * src/libANGLE/renderer/gl/PathGL.cpp:
>-        * src/libANGLE/renderer/gl/cgl/WindowSurfaceCGL.h:
>-        * src/libANGLE/renderer/gl/cgl/WindowSurfaceCGL.mm:
>-        Rename SwapLayer to WebSwapLayer.  Otherwise, WebCore complains about improperly named ObjC classes.
>-        Since this is the only one, let's just rename it instead of adding an exception.
>-        (rx::WindowSurfaceCGL::initialize):
>-        (-[SwapLayer initWithSharedState:withContext:withFunctions:]): Deleted.
>-        * src/libANGLE/renderer/gl/formatutilsgl.cpp:
>-        (rx::nativegl::GetInternalFormatMap):
>-        (rx::nativegl::GetInternalFormatInfo):
>-        * src/libANGLE/renderer/renderer_utils.cpp:
>-        (rx::GetColorWriteFunction):
>-        * src/libGLESv2/entry_points_egl.cpp:
>-        (egl::GetProcAddress):
>-
>-2016-12-06  Alexey Proskuryakov  <ap@apple.com>
>-
>-        Correct SDKROOT values in xcconfig files
>-        https://bugs.webkit.org/show_bug.cgi?id=165487
>-        rdar://problem/29539209
>-
>-        Reviewed by Dan Bernstein.
>-
>-        Fix suggested by Dan Bernstein.
>-
>-        * Configurations/DebugRelease.xcconfig:
>-
>-2016-10-30  Michael Catanzaro  <mcatanzaro@igalia.com>
>-
>-        -Wpragmas warning spam from angleutils.h
>-        https://bugs.webkit.org/show_bug.cgi?id=164207
>-
>-        Reviewed by Darin Adler.
>-
>-        Use #pragma clang instead of #pragma GCC since all of the warnings we need to suppress are
>-        Clang-specific warnings. GCC ignores unknown pragmas and does not warn, but it does warn if
>-        any GCC pragma is invalid.
>-
>-        Note that this might still be broken for MSVCC, as MSVCC warns when it sees unknown pragmas.
>-
>-        * changes.diff:
>-        * src/common/angleutils.cpp:
>-        (FormatString):
>-        * src/common/angleutils.h:
>-        (MakeStaticString):
>-        * src/common/debug.cpp:
>-        * src/common/mathutil.cpp:
>-        * src/libANGLE/Caps.cpp:
>-        (gl::TextureCapsMap::get):
>-        (gl::GetExtensionInfoMap):
>-        * src/libANGLE/Device.cpp:
>-        (egl::GetDeviceSet):
>-        * src/libANGLE/Display.cpp:
>-        (egl::Display::getClientExtensionString):
>-        * src/libANGLE/formatutils.cpp:
>-        (gl::GetInternalFormatMap):
>-        (gl::GetAllSizedInternalFormats):
>-        * src/libANGLE/validationES3.cpp:
>-        (gl::IsValidES3CopyTexImageCombination):
>-
>-2016-10-28  Alex Christensen  <achristensen@webkit.org>
>-
>-        Another build fix.
>-
>-        * CMakeLists.txt:
>-
>-2016-10-28  Alex Christensen  <achristensen@webkit.org>
>-
>-        Fix Windows WebGL build after r208036
>-        https://bugs.webkit.org/show_bug.cgi?id=164101
>-
>-        * CMakeLists.txt:
>-
>-2016-10-27  Alex Christensen  <achristensen@webkit.org>
>-
>-        Fix Windows WebGL build after r208036
>-        https://bugs.webkit.org/show_bug.cgi?id=164101
>-
>-        * CMakeLists.txt:
>-        Add new files, remove deleted files.
>-
>-2016-10-27  Alex Christensen  <achristensen@webkit.org>
>-
>-        Update ANGLE
>-        https://bugs.webkit.org/show_bug.cgi?id=164101
>-
>-        Reviewed by Darin Adler.
>-
>-        Updated to f01731530e7f754e5ebaf32d00f3e23b62376424
>-        Differences between upstream ANGLE and WebKit's copy of ANGLE are in changes.diff
>-
>-2016-10-24  Alex Christensen  <achristensen@webkit.org>
>-
>-        Remove unused ANGLE.vcxproj after switching to CMake on Windows
>-
>-        * ANGLE.vcxproj: Removed.
>-        * ANGLE.vcxproj/ANGLERelease.props: Removed.
>-        * ANGLE.vcxproj/DirectX32.props: Removed.
>-        * ANGLE.vcxproj/DirectX64.props: Removed.
>-        * ANGLE.vcxproj/libEGL.vcxproj: Removed.
>-        * ANGLE.vcxproj/libEGL.vcxproj.filters: Removed.
>-        * ANGLE.vcxproj/libEGLCommon.props: Removed.
>-        * ANGLE.vcxproj/libGLESv2.vcxproj: Removed.
>-        * ANGLE.vcxproj/libGLESv2.vcxproj.filters: Removed.
>-        * ANGLE.vcxproj/libGLESv2Common.props: Removed.
>-        * ANGLE.vcxproj/preprocessor.vcxproj: Removed.
>-        * ANGLE.vcxproj/preprocessor.vcxproj.filters: Removed.
>-        * ANGLE.vcxproj/translatorCommon.props: Removed.
>-        * ANGLE.vcxproj/translator_common.vcxproj: Removed.
>-        * ANGLE.vcxproj/translator_common.vcxproj.filters: Removed.
>-        * ANGLE.vcxproj/translator_glsl.vcxproj: Removed.
>-        * ANGLE.vcxproj/translator_glsl.vcxproj.filters: Removed.
>-        * ANGLE.vcxproj/translator_hlsl.vcxproj: Removed.
>-        * ANGLE.vcxproj/translator_hlsl.vcxproj.filters: Removed.
>-
>-2016-09-09  Dean Jackson  <dino@apple.com>
>-
>-        [ANGLE] instantiation of variable 'gl::GLTypeToGLenum<float>::value' required here, but no definition is available
>-        https://bugs.webkit.org/show_bug.cgi?id=161829
>-        <rdar://problem/28051244>
>-
>-        Reviewed by Alex Christensen.
>-
>-        Newer versions of clang require explicit definition of some template types
>-        if they are in another translation unit.
>-
>-        * src/libANGLE/Program.cpp: Add definitions for GLTypeToGLenum.
>-
>-2016-07-29  David Kilzer  <ddkilzer@apple.com>
>-
>-        ANGLE: Fix global constructors and exit-time destructors
>-        <https://webkit.org/b/160332>
>-
>-        Reviewed by Darin Adler.
>-
>-        * Configurations/Base.xcconfig:
>-        - Add warning flags.
>-
>-        * src/common/angleutils.cpp:
>-        (FormatString):
>-        * src/common/angleutils.h:
>-        (MakeStaticString):
>-        * src/common/debug.cpp:
>-        * src/common/mathutil.cpp:
>-        (gl::g_sharedexp_max):
>-        (gl::convertRGBFloatsTo999E5):
>-        * src/compiler/translator/ShaderLang.cpp:
>-        (ShGetUniformRegisterMap):
>-        * src/libANGLE/Caps.cpp:
>-        (gl::TextureCapsMap::get):
>-        * src/libANGLE/Device.cpp:
>-        (egl::GetDeviceSet):
>-        * src/libANGLE/Display.cpp:
>-        (egl::Display::getClientExtensionString):
>-        * src/libANGLE/formatutils.cpp:
>-        (gl::BuildFormatMap):
>-        (gl::BuildInternalFormatInfoMap):
>-        (gl::GetInternalFormatMap):
>-        (gl::BuildAllSizedInternalFormatSet):
>-        (gl::GetSizedInternalFormat):
>-        (gl::GetAllSizedInternalFormats):
>-        * src/libANGLE/validationES3.cpp:
>-        (gl::BuildES3FormatSet):
>-        (gl::ValidateTexImageFormatCombination):
>-        (gl::BuildSizedEffectiveInternalFormatList):
>-        (gl::BuildUnsizedEffectiveInternalFormatList):
>-        (gl::GetEffectiveInternalFormat):
>-        (gl::BuildValidES3CopyTexImageCombinations):
>-        (gl::IsValidES3CopyTexImageCombination):
>-        - Fix global constructors and exit-time destructors.
>-
>-2016-07-13  Enrica Casucci  <enrica@apple.com>
>-
>-        Update supported platforms in xcconfig files to match the sdk names.
>-        https://bugs.webkit.org/show_bug.cgi?id=159728
>-
>-        Reviewed by Tim Horton.
>-
>-        * Configurations/Base.xcconfig:
>-
>-2016-05-24  Alex Christensen  <achristensen@webkit.org>
>-
>-        Fix iOS WebGL after r199738
>-        https://bugs.webkit.org/show_bug.cgi?id=158024
>-        rdar://problem/26446679
>-
>-        Reviewed by Myles Maxfield.
>-
>-        * ANGLE.xcodeproj/project.pbxproj:
>-        iOS needs the ESSL translator.
>-
>-2016-05-22  Brady Eidson  <beidson@apple.com>
>-
>-        Move to C++14.
>-        https://bugs.webkit.org/show_bug.cgi?id=157948
>-
>-        Reviewed by Michael Catanzaro.
>-
>-        * Configurations/Base.xcconfig:
>-
>-2016-04-26  Per Arne Vollan  <peavo@outlook.com>
>-
>-        [WinCairo][ANGLE] Display object is not created.
>-        https://bugs.webkit.org/show_bug.cgi?id=157042
>-
>-        Reviewed by Alex Christensen.
>-
>-        The CreateDisplayFromAttribs function will not create a DisplayD3D object when the requested
>-        type is EGL_PLATFORM_ANGLE_TYPE_DEFAULT_ANGLE, because ANGLE_ENABLE_OPENGL is not defined.
>-        We should be able to create a DisplayD3D object without defining ANGLE_ENABLE_OPENGL.
>-
>-        * src/libANGLE/Display.cpp:
>-
>-2016-04-26  Per Arne Vollan  <peavo@outlook.com>
>-
>-        [WinCairo][WebGL] Enable ESSL and GLSL translators.
>-        https://bugs.webkit.org/show_bug.cgi?id=157002
>-
>-        Reviewed by Darin Adler.
>-
>-        Enable support for ESSL and GLSL translators, and add missing files.
>-
>-        * CMakeLists.txt:
>-
>-2016-04-22  Joonghun Park  <jh718.park@samsung.com>
>-
>-        [ANGLE] Remove deprecated auto_ptr warning. Unreviewed.
>-        https://bugs.webkit.org/show_bug.cgi?id=156894
>-
>-        * src/compiler/preprocessor/MacroExpander.h: Use std::unique_ptr instead of std::auto_ptr.
>-
>-2016-04-19  Alex Christensen  <achristensen@webkit.org>
>-
>-        Build fix after r199738
>-
>-        * CMakeLists.txt:
>-
>-2016-04-19  Alex Christensen  <achristensen@webkit.org>
>-
>-        Build fix after r199738
>-
>-        * CMakeLists.txt:
>-
>-2016-04-19  Alex Christensen  <achristensen@webkit.org>
>-
>-        Build fix.
>-
>-        * src/compiler/translator/Intermediate.h: Added.
>-        (TIntermediate::TIntermediate):
>-        * src/compiler/translator/intermediate.h: Removed.
>-        Changed case of Intermediate.h file name for case sensitive file systems.
>-
>-2016-04-19  Alex Christensen  <achristensen@webkit.org>
>-
>-        Update ANGLE
>-        https://bugs.webkit.org/show_bug.cgi?id=156755
>-
>-        Reviewed by Dean Jackson.
>-
>-        Huge list of changed files omitted.
>-
>-2016-04-12  Alex Christensen  <achristensen@webkit.org>
>-
>-        Remove failing assertion in ANGLE
>-        https://bugs.webkit.org/show_bug.cgi?id=156485
>-
>-        Reviewed by Dean Jackson.
>-
>-        * src/compiler/translator/glslang.l:
>-        * src/compiler/translator/glslang_lex.cpp:
>-
>-2016-04-11  Fujii Hironori  <Hironori.Fujii@jp.sony.com>
>-
>-        [CMake] Make FOLDER property INHERITED
>-        https://bugs.webkit.org/show_bug.cgi?id=156460
>-
>-        Reviewed by Brent Fulgham.
>-
>-        * CMakeLists.txt:
>-        Set FOLDER property as a directory property not a target property
>-
>-2016-03-22  Alberto Garcia  <berto@igalia.com>
>-
>-        Unreviewed typo fix.
>-
>-        * src/compiler/translator/InfoSink.cpp:
>-        (TInfoSinkBase::prefix): "UNKOWN" => "UNKOWN".
>-
>-2016-03-20  Dan Bernstein  <mitz@apple.com>
>-
>-        [Mac] Determine TARGET_MAC_OS_X_VERSION_MAJOR from MACOSX_DEPLOYMENT_TARGET rather than from MAC_OS_X_VERSION_MAJOR
>-        https://bugs.webkit.org/show_bug.cgi?id=155707
>-        <rdar://problem/24980691>
>-
>-        Reviewed by Darin Adler.
>-
>-        * Configurations/Base.xcconfig: Set TARGET_MAC_OS_X_VERSION_MAJOR based on the last
>-          component of MACOSX_DEPLOYMENT_TARGET.
>-        * Configurations/DebugRelease.xcconfig: For engineering builds, preserve the behavior of
>-          TARGET_MAC_OS_X_VERSION_MAJOR being the hostâs OS version.
>-
>-2016-03-20  Dan Bernstein  <mitz@apple.com>
>-
>-        Update build settings
>-
>-        Rubber-stamped by Andy Estes.
>-
>-        * Configurations/DebugRelease.xcconfig:
>-
>-2016-02-23  Dan Bernstein  <mitz@apple.com>
>-
>-        [Xcode] Linker errors display mangled names, but no longer should
>-        https://bugs.webkit.org/show_bug.cgi?id=154632
>-
>-        Reviewed by Sam Weinig.
>-
>-        * Configurations/Base.xcconfig: Stop setting LINKER_DISPLAYS_MANGLED_NAMES to YES.
>-
>-2016-01-08  Brent Fulgham  <bfulgham@apple.com>
>-
>-        [ANGLE] Correct UNREACHABLE runtime assertion for void constructors
>-        https://bugs.webkit.org/show_bug.cgi?id=152900
>-        <rdar://problem/24107501>
>-
>-        Reviewed by Alex Christensen.
>-
>-        Tested by Khronos WebGL 1.0.4 suite.
>-
>-        Merge a small part of ANGLE upstream commit r284735:
>-        
>-            commit    01971113492d9aca386f2bca021b1f4b134fc277
>-            author    Dmitry Skiba <dskiba@google.com>  Fri Jul 10 18:54:00 2015
>-            committer Jamie Madill <jmadill@chromium.org>  Fri Jul 10 19:03:34 2015
>-            tree      47e42eac00f7d64cddb14b3cc21a4e605c189d20
>-
>-        This issue was found by <https://www.khronos.org/registry/webgl/sdk/tests/conformance/glsl/bugs/angle-constructor-invalid-parameters.html?webglVersion=1&quiet=0>
>-
>-        * src/compiler/translator/Types.cpp:
>-        (TType::buildMangledName): Don't assert with UNREACHABLE here.
>-
>-2015-12-28  Joonghun Park  <jh718.park@samsung.com>
>-
>-        [ANGLE][EFL][GTK] Remove 'template<class> class std::auto_ptr is deprecated' compile warning
>-        https://bugs.webkit.org/show_bug.cgi?id=152567
>-
>-        Reviewed by Alex Christensen.
>-
>-        Because auto_ptr is deprecated as of C++11, we should use unique_ptr instead.
>-
>-        * src/compiler/preprocessor/MacroExpander.h:
>-
>-2015-12-19  Dan Bernstein  <mitz@apple.com>
>-
>-        [Mac] WebKit contains dead source code for OS X Mavericks and earlier
>-        https://bugs.webkit.org/show_bug.cgi?id=152462
>-
>-        Reviewed by Alexey Proskuryakov.
>-
>-        * Configurations/DebugRelease.xcconfig: Removed definitions of MACOSX_DEPLOYMENT_TARGET for
>-          OS X 10.8 and 10.9.
>-
>-2015-12-03  Anders Carlsson  <andersca@apple.com>
>-
>-        Remove Objective-C GC support
>-        https://bugs.webkit.org/show_bug.cgi?id=151819
>-        rdar://problem/23746991
>-
>-        Reviewed by Dan Bernstein.
>-
>-        * Configurations/Base.xcconfig:
>-
>-2015-11-30  Dana Burkart  <dburkart@apple.com>
>-
>-        Remove Mountain Lion support from ANGLE
>-        https://bugs.webkit.org/show_bug.cgi?id=151679
>-
>-        Reviewed by Darin Adler.
>-
>-        * Configurations/Base.xcconfig:
>-
>-2015-11-02  Andy Estes  <aestes@apple.com>
>-
>-        [Cocoa] Add tvOS and watchOS to SUPPORTED_PLATFORMS
>-        https://bugs.webkit.org/show_bug.cgi?id=150819
>-
>-        Reviewed by Dan Bernstein.
>-
>-        This tells Xcode to include these platforms in its Devices dropdown, making it possible to build in the IDE.
>-
>-        * Configurations/Base.xcconfig:
>-
>-2015-10-10  Dan Bernstein  <mitz@apple.com>
>-
>-        [iOS] Remove project support for iOS 8
>-        https://bugs.webkit.org/show_bug.cgi?id=149993
>-
>-        Reviewed by Alexey Proskuryakov.
>-
>-        * Configurations/ANGLE.xcconfig:
>-        * Configurations/Base.xcconfig:
>-
>-2015-08-20  Alex Christensen  <achristensen@webkit.org>
>-
>-        Clean up CMake build after r188673
>-        https://bugs.webkit.org/show_bug.cgi?id=148234
>-
>-        Reviewed by Tim Horton.
>-
>-        * CMakeLists.txt:
>-        Copy headers to forwarding headers.
>-
>-2015-08-11  Brent Fulgham  <bfulgham@apple.com>
>-
>-        [Win] Switch Windows build to Visual Studio 2015
>-        https://bugs.webkit.org/show_bug.cgi?id=147887
>-        <rdar://problem/22235098>
>-
>-        Reviewed by Alex Christensen.
>-
>-        Update Visual Studio project file settings to use the current Visual
>-        Studio and compiler. Continue targeting binaries to run on our minimum
>-        supported configuration of Windows 7.
>-
>-        * ANGLE.vcxproj/libEGL.vcxproj:
>-        * ANGLE.vcxproj/libGLESv2.vcxproj:
>-        * ANGLE.vcxproj/preprocessor.vcxproj:
>-        * ANGLE.vcxproj/translator_common.vcxproj:
>-        * ANGLE.vcxproj/translator_glsl.vcxproj:
>-        * ANGLE.vcxproj/translator_hlsl.vcxproj:
>-
>-2015-08-04  Alex Christensen  <achristensen@webkit.org>
>-
>-        Build fix after r187928.
>-
>-        * CMakeLists.txt:
>-        Typo. Set libGLESv2 compile definitions instead of libEGL, which are set separately.
>-
>-2015-08-04  Alex Christensen  <achristensen@webkit.org>
>-
>-        Soft link libGLESv2 and libEGL on Windows again
>-        https://bugs.webkit.org/show_bug.cgi?id=147671
>-
>-        Reviewed by Dean Jackson.
>-
>-        * CMakeLists.txt:
>-        Clean up some warnings when compiling with CMake.
>-        * include/EGL/egl.h:
>-        * include/EGL/eglsoftlinking.h:
>-        * include/GLES2/gl2.h:
>-        Soft link egl optionally.
>-
>-2015-08-04  Alex Christensen  <achristensen@webkit.org>
>-
>-        Enable WebGL on Windows CMake build.
>-        https://bugs.webkit.org/show_bug.cgi?id=143311
>-
>-        Reviewed by Csaba OsztrogonÃ¡c.
>-
>-        * CMakeLists.txt: Added.
>-
>-2015-07-03  Dan Bernstein  <mitz@apple.com>
>-
>-        [Xcode] Update some build settings as recommended by Xcode 7
>-        https://bugs.webkit.org/show_bug.cgi?id=146597
>-
>-        Reviewed by Sam Weinig.
>-
>-        * ANGLE.xcodeproj/project.pbxproj: Enabled CLANG_WARN_BOOL_CONVERSION,
>-        CLANG_WARN_ENUM_CONVERSION, CLANG_WARN_INT_CONVERSION, ENABLE_STRICT_OBJC_MSGSEND and
>-        GCC_NO_COMMON_BLOCKS.
>-
>-        * Configurations/Base.xcconfig: Updated LastUpgradeCheck.
>-
>-2015-07-03  Per Arne Vollan  <peavo@outlook.com>
>-
>-        [WinCairo][WebGL] Enable HLSL.
>-        https://bugs.webkit.org/show_bug.cgi?id=146559
>-
>-        Reviewed by Alex Christensen.
>-
>-        High Level Shader Language needs to be enabled for WebGL to work on Windows.
>-
>-        * ANGLE.vcxproj/translatorCommon.props:
>-        * ANGLE.vcxproj/translator_hlsl.vcxproj:
>-        * ANGLE.vcxproj/translator_hlsl.vcxproj.filters:
>-
>-2015-07-01  Alex Christensen  <achristensen@webkit.org>
>-
>-        Re-enable WebGL on WinCairo
>-        https://bugs.webkit.org/show_bug.cgi?id=146537
>-
>-        Reviewed by Csaba OsztrogonÃ¡c.
>-
>-        * ANGLE.vcxproj/DirectX32.props:
>-        * ANGLE.vcxproj/DirectX64.props:
>-        * ANGLE.vcxproj/libGLESv2Common.props:
>-        Update DirectX directories to use the Windows SDK instead of the June 2010 DirectX SDK.
>-
>-2015-07-01  Alex Christensen  <achristensen@webkit.org>
>-
>-        Fix ANGLE Windows build after r186169.
>-        https://bugs.webkit.org/show_bug.cgi?id=146532
>-
>-        Reviewed by Brent Fulgham.
>-
>-        * ANGLE.vcxproj/libEGL.vcxproj:
>-        * ANGLE.vcxproj/libEGL.vcxproj.filters:
>-        * ANGLE.vcxproj/libGLESv2.vcxproj:
>-        * ANGLE.vcxproj/libGLESv2.vcxproj.filters:
>-        * ANGLE.vcxproj/libGLESv2Common.props:
>-        * ANGLE.vcxproj/translator_common.vcxproj:
>-        * ANGLE.vcxproj/translator_common.vcxproj.filters:
>-        * ANGLE.vcxproj/translator_glsl.vcxproj:
>-        * ANGLE.vcxproj/translator_glsl.vcxproj.filters:
>-        * ANGLE.vcxproj/translator_hlsl.vcxproj:
>-        * ANGLE.vcxproj/translator_hlsl.vcxproj.filters:
>-        Update Windows build to build new files.
>-
>-2015-06-30  Alex Christensen  <achristensen@webkit.org>
>-
>-        Update ANGLE to b11e2483742db884bd0af41f78f528240577356b.
>-        https://bugs.webkit.org/show_bug.cgi?id=145010
>-
>-        Reviewed by Dean Jackson.
>-
>-        Huge list of source changes omitted.
>-        ROLL DEPS!
>-
>-2015-05-26  Dan Bernstein  <mitz@apple.com>
>-
>-        <rdar://problem/21104551> Update build settings
>-
>-        Reviewed by Anders Carlsson.
>-
>-        * Configurations/Base.xcconfig:
>-        * Configurations/DebugRelease.xcconfig:
>-
>-2015-05-19  Carlos Alberto Lopez Perez  <clopez@igalia.com>
>-
>-        REGRESSION(r181571): Build broken when USE(OPENGL_ES_2) is defined.
>-        https://bugs.webkit.org/show_bug.cgi?id=145156
>-
>-        Reviewed by Alex Christensen.
>-
>-        * include/GLES2/gl2softlinking.h: Revert r181589. Vertex Array Objects are not in GLESv2.
>-
>-2015-05-11  Brent Fulgham  <bfulgham@apple.com>
>-
>-        [Win] Move Windows build target to Windows 7 (or newer)
>-        https://bugs.webkit.org/show_bug.cgi?id=144890
>-        <rdar://problem/20707307>
>-
>-        Reviewed by Anders Carlsson.
>-
>-        Update linked SDK and minimal Windows level to be compatible with
>-        Windows 7 or newer.
>-
>-        * ANGLE.vcxproj/libEGL.vcxproj:
>-        * ANGLE.vcxproj/libGLESv2.vcxproj:
>-        * ANGLE.vcxproj/preprocessor.vcxproj:
>-        * ANGLE.vcxproj/translator_common.vcxproj:
>-        * ANGLE.vcxproj/translator_glsl.vcxproj:
>-        * ANGLE.vcxproj/translator_hlsl.vcxproj:
>-
>-2015-05-07  Dan Bernstein  <mitz@apple.com>
>-
>-        <rdar://problem/19317140> [Xcode] Remove usage of AspenFamily.xcconfig in Source/
>-        https://bugs.webkit.org/show_bug.cgi?id=144727
>-
>-        Reviewed by Darin Adler.
>-
>-        * Configurations/Base.xcconfig: Donât include AspenFamily.xcconfig, and define
>-        INSTALL_PATH_PREFIX and LD_DYLIB_INSTALL_NAME for the iOS 8.x Simulator.
>-
>-2015-04-01  Alex Christensen  <achristensen@webkit.org>
>-
>-        Progress towards CMake on Windows and Mac.
>-        https://bugs.webkit.org/show_bug.cgi?id=143293
>-
>-        Reviewed by Filip Pizlo.
>-
>-        * include/GLES2/gl2.h:
>-        Temporarily disabled WebGL on Windows CMake builds.
>-
>-2015-03-17  Zan Dobersek  <zdobersek@igalia.com>
>-
>-        [CMake] Use a forwarding header for ANGLE's ShaderLang.h to avoid picking up ANGLE's EGL headers
>-        https://bugs.webkit.org/show_bug.cgi?id=142530
>-
>-        Reviewed by Darin Adler.
>-
>-        * ANGLE/ShaderLang.h: Added. Includes include/GLSLANG/ShaderLang.h. Used in WebCore
>-        so we can avoid using ANGLE's EGL headers and use the system-default headers instead.
>-
>-2015-03-16  Roger Fong  <roger_fong@apple.com>
>-
>-        [Win] Unreviewed build fix after r181571.
>-
>-        * include/GLES2/gl2softlinking.h:
>-
>-2015-03-12  Brent Fulgham  <bfulgham@apple.com>
>-
>-        [Win] Unreviewed build fix (part 2).
>-
>-        * ANGLE.vcxproj/libGLESv2Common.props: Missed a directory separator.
>-
>-2015-03-12  Brent Fulgham  <bfulgham@apple.com>
>-
>-        [Win] Unreviewed build fix for some DirectX SDK Installs
>-
>-        * ANGLE.vcxproj/libGLESv2Common.props: Correct path for Lib and
>-        Include paths based on problems others have had building WebKit
>-        under different Windows and DirectX revisions.
>-
>-2015-02-20  Alexey Proskuryakov  <ap@apple.com>
>-
>-        Remove svn:keywords property.
>-
>-        As far as I can tell, the property had no effect on any of these files, but also,
>-        when it has effect it's likely harmful.
>-
>-        * ANGLE.txt: Removed property svn:keywords.
>-        * src/common/RefCountObject.cpp: Removed property svn:keywords.
>-        * src/common/RefCountObject.h: Removed property svn:keywords.
>-        * src/compiler/translator/BaseTypes.h: Removed property svn:keywords.
>-        * src/compiler/translator/BuiltInFunctionEmulator.cpp: Removed property svn:keywords.
>-        * src/compiler/translator/BuiltInFunctionEmulator.h: Removed property svn:keywords.
>-        * src/compiler/translator/CodeGen.cpp: Removed property svn:keywords.
>-        * src/compiler/translator/Common.h: Removed property svn:keywords.
>-        * src/compiler/translator/Compiler.cpp: Removed property svn:keywords.
>-        * src/compiler/translator/ConstantUnion.h: Removed property svn:keywords.
>-        * src/compiler/translator/DetectCallDepth.cpp: Removed property svn:keywords.
>-        * src/compiler/translator/DetectCallDepth.h: Removed property svn:keywords.
>-        * src/compiler/translator/DetectDiscontinuity.cpp: Removed property svn:keywords.
>-        * src/compiler/translator/DetectDiscontinuity.h: Removed property svn:keywords.
>-        * src/compiler/translator/Diagnostics.cpp: Removed property svn:keywords.
>-        * src/compiler/translator/Diagnostics.h: Removed property svn:keywords.
>-        * src/compiler/translator/DirectiveHandler.cpp: Removed property svn:keywords.
>-        * src/compiler/translator/DirectiveHandler.h: Removed property svn:keywords.
>-        * src/compiler/translator/ExtensionBehavior.h: Removed property svn:keywords.
>-        * src/compiler/translator/ForLoopUnroll.cpp: Removed property svn:keywords.
>-        * src/compiler/translator/ForLoopUnroll.h: Removed property svn:keywords.
>-        * src/compiler/translator/HashNames.h: Removed property svn:keywords.
>-        * src/compiler/translator/InfoSink.cpp: Removed property svn:keywords.
>-        * src/compiler/translator/InfoSink.h: Removed property svn:keywords.
>-        * src/compiler/translator/Initialize.cpp: Removed property svn:keywords.
>-        * src/compiler/translator/Initialize.h: Removed property svn:keywords.
>-        * src/compiler/translator/InitializeDll.cpp: Removed property svn:keywords.
>-        * src/compiler/translator/InitializeDll.h: Removed property svn:keywords.
>-        * src/compiler/translator/InitializeGlobals.h: Removed property svn:keywords.
>-        * src/compiler/translator/InitializeParseContext.cpp: Removed property svn:keywords.
>-        * src/compiler/translator/InitializeParseContext.h: Removed property svn:keywords.
>-        * src/compiler/translator/InitializeVariables.cpp: Removed property svn:keywords.
>-        * src/compiler/translator/InitializeVariables.h: Removed property svn:keywords.
>-        * src/compiler/translator/IntermTraverse.cpp: Removed property svn:keywords.
>-        * src/compiler/translator/Intermediate.cpp: Removed property svn:keywords.
>-        * src/compiler/translator/MMap.h: Removed property svn:keywords.
>-        * src/compiler/translator/NodeSearch.h: Removed property svn:keywords.
>-        * src/compiler/translator/OutputESSL.cpp: Removed property svn:keywords.
>-        * src/compiler/translator/OutputESSL.h: Removed property svn:keywords.
>-        * src/compiler/translator/OutputGLSL.cpp: Removed property svn:keywords.
>-        * src/compiler/translator/OutputGLSL.h: Removed property svn:keywords.
>-        * src/compiler/translator/OutputGLSLBase.cpp: Removed property svn:keywords.
>-        * src/compiler/translator/OutputGLSLBase.h: Removed property svn:keywords.
>-        * src/compiler/translator/OutputHLSL.cpp: Removed property svn:keywords.
>-        * src/compiler/translator/OutputHLSL.h: Removed property svn:keywords.
>-        * src/compiler/translator/ParseContext.cpp: Removed property svn:keywords.
>-        * src/compiler/translator/ParseContext.h: Removed property svn:keywords.
>-        * src/compiler/translator/PoolAlloc.cpp: Removed property svn:keywords.
>-        * src/compiler/translator/PoolAlloc.h: Removed property svn:keywords.
>-        * src/compiler/translator/Pragma.h: Removed property svn:keywords.
>-        * src/compiler/translator/QualifierAlive.cpp: Removed property svn:keywords.
>-        * src/compiler/translator/QualifierAlive.h: Removed property svn:keywords.
>-        * src/compiler/translator/RemoveTree.cpp: Removed property svn:keywords.
>-        * src/compiler/translator/RemoveTree.h: Removed property svn:keywords.
>-        * src/compiler/translator/RenameFunction.h: Removed property svn:keywords.
>-        * src/compiler/translator/RewriteElseBlocks.cpp: Removed property svn:keywords.
>-        * src/compiler/translator/RewriteElseBlocks.h: Removed property svn:keywords.
>-        * src/compiler/translator/SearchSymbol.cpp: Removed property svn:keywords.
>-        * src/compiler/translator/SearchSymbol.h: Removed property svn:keywords.
>-        * src/compiler/translator/ShHandle.h: Removed property svn:keywords.
>-        * src/compiler/translator/ShaderLang.cpp: Removed property svn:keywords.
>-        * src/compiler/translator/SymbolTable.cpp: Removed property svn:keywords.
>-        * src/compiler/translator/SymbolTable.h: Removed property svn:keywords.
>-        * src/compiler/translator/TranslatorESSL.cpp: Removed property svn:keywords.
>-        * src/compiler/translator/TranslatorESSL.h: Removed property svn:keywords.
>-        * src/compiler/translator/TranslatorGLSL.cpp: Removed property svn:keywords.
>-        * src/compiler/translator/TranslatorGLSL.h: Removed property svn:keywords.
>-        * src/compiler/translator/TranslatorHLSL.cpp: Removed property svn:keywords.
>-        * src/compiler/translator/TranslatorHLSL.h: Removed property svn:keywords.
>-        * src/compiler/translator/Types.h: Removed property svn:keywords.
>-        * src/compiler/translator/UnfoldShortCircuit.cpp: Removed property svn:keywords.
>-        * src/compiler/translator/UnfoldShortCircuit.h: Removed property svn:keywords.
>-        * src/compiler/translator/UnfoldShortCircuitAST.cpp: Removed property svn:keywords.
>-        * src/compiler/translator/UnfoldShortCircuitAST.h: Removed property svn:keywords.
>-        * src/compiler/translator/ValidateLimitations.cpp: Removed property svn:keywords.
>-        * src/compiler/translator/ValidateLimitations.h: Removed property svn:keywords.
>-        * src/compiler/translator/VariableInfo.cpp: Removed property svn:keywords.
>-        * src/compiler/translator/VariableInfo.h: Removed property svn:keywords.
>-        * src/compiler/translator/VariablePacker.cpp: Removed property svn:keywords.
>-        * src/compiler/translator/VariablePacker.h: Removed property svn:keywords.
>-        * src/compiler/translator/VersionGLSL.cpp: Removed property svn:keywords.
>-        * src/compiler/translator/VersionGLSL.h: Removed property svn:keywords.
>-        * src/compiler/translator/compilerdebug.cpp: Removed property svn:keywords.
>-        * src/compiler/translator/compilerdebug.h: Removed property svn:keywords.
>-        * src/compiler/translator/depgraph/DependencyGraph.cpp: Removed property svn:keywords.
>-        * src/compiler/translator/depgraph/DependencyGraph.h: Removed property svn:keywords.
>-        * src/compiler/translator/depgraph/DependencyGraphBuilder.cpp: Removed property svn:keywords.
>-        * src/compiler/translator/depgraph/DependencyGraphBuilder.h: Removed property svn:keywords.
>-        * src/compiler/translator/depgraph/DependencyGraphOutput.cpp: Removed property svn:keywords.
>-        * src/compiler/translator/depgraph/DependencyGraphOutput.h: Removed property svn:keywords.
>-        * src/compiler/translator/depgraph/DependencyGraphTraverse.cpp: Removed property svn:keywords.
>-        * src/compiler/translator/generate_parser.sh: Removed property svn:keywords.
>-        * src/compiler/translator/glslang.h: Removed property svn:keywords.
>-        * src/compiler/translator/glslang_lex.cpp: Removed property svn:keywords.
>-        * src/compiler/translator/glslang_tab.cpp: Removed property svn:keywords.
>-        * src/compiler/translator/glslang_tab.h: Removed property svn:keywords.
>-        * src/compiler/translator/intermOut.cpp: Removed property svn:keywords.
>-        * src/compiler/translator/intermediate.h: Removed property svn:keywords.
>-        * src/compiler/translator/localintermediate.h: Removed property svn:keywords.
>-        * src/compiler/translator/osinclude.h: Removed property svn:keywords.
>-        * src/compiler/translator/ossource_posix.cpp: Removed property svn:keywords.
>-        * src/compiler/translator/ossource_win.cpp: Removed property svn:keywords.
>-        * src/compiler/translator/parseConst.cpp: Removed property svn:keywords.
>-        * src/compiler/translator/timing/RestrictFragmentShaderTiming.cpp: Removed property svn:keywords.
>-        * src/compiler/translator/timing/RestrictFragmentShaderTiming.h: Removed property svn:keywords.
>-        * src/compiler/translator/timing/RestrictVertexShaderTiming.cpp: Removed property svn:keywords.
>-        * src/compiler/translator/timing/RestrictVertexShaderTiming.h: Removed property svn:keywords.
>-        * src/compiler/translator/util.cpp: Removed property svn:keywords.
>-        * src/compiler/translator/util.h: Removed property svn:keywords.
>-        * src/libGLESv2/renderer/d3d11/BufferStorage11.cpp: Removed property svn:keywords.
>-        * src/libGLESv2/renderer/d3d11/BufferStorage11.h: Removed property svn:keywords.
>-        * src/libGLESv2/renderer/d3d11/Fence11.cpp: Removed property svn:keywords.
>-        * src/libGLESv2/renderer/d3d11/Fence11.h: Removed property svn:keywords.
>-        * src/libGLESv2/renderer/d3d11/Image11.cpp: Removed property svn:keywords.
>-        * src/libGLESv2/renderer/d3d11/Image11.h: Removed property svn:keywords.
>-        * src/libGLESv2/renderer/d3d11/IndexBuffer11.cpp: Removed property svn:keywords.
>-        * src/libGLESv2/renderer/d3d11/IndexBuffer11.h: Removed property svn:keywords.
>-        * src/libGLESv2/renderer/d3d11/InputLayoutCache.cpp: Removed property svn:keywords.
>-        * src/libGLESv2/renderer/d3d11/InputLayoutCache.h: Removed property svn:keywords.
>-        * src/libGLESv2/renderer/d3d11/Query11.cpp: Removed property svn:keywords.
>-        * src/libGLESv2/renderer/d3d11/Query11.h: Removed property svn:keywords.
>-        * src/libGLESv2/renderer/d3d11/RenderStateCache.cpp: Removed property svn:keywords.
>-        * src/libGLESv2/renderer/d3d11/RenderStateCache.h: Removed property svn:keywords.
>-        * src/libGLESv2/renderer/d3d11/RenderTarget11.cpp: Removed property svn:keywords.
>-        * src/libGLESv2/renderer/d3d11/RenderTarget11.h: Removed property svn:keywords.
>-        * src/libGLESv2/renderer/d3d11/Renderer11.cpp: Removed property svn:keywords.
>-        * src/libGLESv2/renderer/d3d11/Renderer11.h: Removed property svn:keywords.
>-        * src/libGLESv2/renderer/d3d11/ShaderExecutable11.cpp: Removed property svn:keywords.
>-        * src/libGLESv2/renderer/d3d11/ShaderExecutable11.h: Removed property svn:keywords.
>-        * src/libGLESv2/renderer/d3d11/SwapChain11.cpp: Removed property svn:keywords.
>-        * src/libGLESv2/renderer/d3d11/SwapChain11.h: Removed property svn:keywords.
>-        * src/libGLESv2/renderer/d3d11/TextureStorage11.cpp: Removed property svn:keywords.
>-        * src/libGLESv2/renderer/d3d11/TextureStorage11.h: Removed property svn:keywords.
>-        * src/libGLESv2/renderer/d3d11/VertexBuffer11.cpp: Removed property svn:keywords.
>-        * src/libGLESv2/renderer/d3d11/VertexBuffer11.h: Removed property svn:keywords.
>-        * src/libGLESv2/renderer/d3d11/renderer11_utils.cpp: Removed property svn:keywords.
>-        * src/libGLESv2/renderer/d3d11/renderer11_utils.h: Removed property svn:keywords.
>-        * src/libGLESv2/renderer/d3d9/BufferStorage9.cpp: Removed property svn:keywords.
>-        * src/libGLESv2/renderer/d3d9/BufferStorage9.h: Removed property svn:keywords.
>-        * src/libGLESv2/renderer/d3d9/Fence9.cpp: Removed property svn:keywords.
>-        * src/libGLESv2/renderer/d3d9/Fence9.h: Removed property svn:keywords.
>-        * src/libGLESv2/renderer/d3d9/Image9.cpp: Removed property svn:keywords.
>-        * src/libGLESv2/renderer/d3d9/Image9.h: Removed property svn:keywords.
>-        * src/libGLESv2/renderer/d3d9/IndexBuffer9.cpp: Removed property svn:keywords.
>-        * src/libGLESv2/renderer/d3d9/IndexBuffer9.h: Removed property svn:keywords.
>-        * src/libGLESv2/renderer/d3d9/Query9.cpp: Removed property svn:keywords.
>-        * src/libGLESv2/renderer/d3d9/Query9.h: Removed property svn:keywords.
>-        * src/libGLESv2/renderer/d3d9/RenderTarget9.cpp: Removed property svn:keywords.
>-        * src/libGLESv2/renderer/d3d9/RenderTarget9.h: Removed property svn:keywords.
>-        * src/libGLESv2/renderer/d3d9/Renderer9.cpp: Removed property svn:keywords.
>-        * src/libGLESv2/renderer/d3d9/Renderer9.h: Removed property svn:keywords.
>-        * src/libGLESv2/renderer/d3d9/ShaderExecutable9.cpp: Removed property svn:keywords.
>-        * src/libGLESv2/renderer/d3d9/ShaderExecutable9.h: Removed property svn:keywords.
>-        * src/libGLESv2/renderer/d3d9/SwapChain9.cpp: Removed property svn:keywords.
>-        * src/libGLESv2/renderer/d3d9/SwapChain9.h: Removed property svn:keywords.
>-        * src/libGLESv2/renderer/d3d9/TextureStorage9.cpp: Removed property svn:keywords.
>-        * src/libGLESv2/renderer/d3d9/TextureStorage9.h: Removed property svn:keywords.
>-        * src/libGLESv2/renderer/d3d9/VertexBuffer9.cpp: Removed property svn:keywords.
>-        * src/libGLESv2/renderer/d3d9/VertexBuffer9.h: Removed property svn:keywords.
>-        * src/libGLESv2/renderer/d3d9/VertexDeclarationCache.cpp: Removed property svn:keywords.
>-        * src/libGLESv2/renderer/d3d9/VertexDeclarationCache.h: Removed property svn:keywords.
>-        * src/libGLESv2/renderer/d3d9/renderer9_utils.cpp: Removed property svn:keywords.
>-        * src/libGLESv2/renderer/d3d9/renderer9_utils.h: Removed property svn:keywords.
>-        * src/libGLESv2/renderer/d3d9/shaders/compiled/componentmaskps.h: Removed property svn:keywords.
>-        * src/libGLESv2/renderer/d3d9/shaders/compiled/flipyvs.h: Removed property svn:keywords.
>-        * src/libGLESv2/renderer/d3d9/shaders/compiled/luminanceps.h: Removed property svn:keywords.
>-        * src/libGLESv2/renderer/d3d9/shaders/compiled/passthroughps.h: Removed property svn:keywords.
>-        * src/libGLESv2/renderer/d3d9/shaders/compiled/standardvs.h: Removed property svn:keywords.
>-
>-2015-01-28  Dana Burkart  <dburkart@apple.com>
>-
>-        Move ASan flag settings from DebugRelease.xcconfig to Base.xcconfig
>-        https://bugs.webkit.org/show_bug.cgi?id=136765
>-
>-        Reviewed by Alexey Proskuryakov.
>-
>-        * Configurations/Base.xcconfig:
>-        * Configurations/DebugRelease.xcconfig:
>-
>-2014-12-26  Dan Bernstein  <mitz@apple.com>
>-
>-        <rdar://problem/19348208> REGRESSION (r177027): iOS builds use the wrong toolchain
>-        https://bugs.webkit.org/show_bug.cgi?id=139950
>-
>-        Reviewed by David Kilzer.
>-
>-        * Configurations/Base.xcconfig: Only define TOOLCHAINS when building for OS X, doing so
>-        in a manner that works with Xcode 5.1.1.
>-
>-2014-12-24  Dan Bernstein  <mitz@apple.com>
>-
>-        ANGLE extern symbols are not hidden by default, but should be
>-        https://bugs.webkit.org/show_bug.cgi?id=139936
>-
>-        Reviewed by Mark Rowe.
>-
>-        * Configurations/Base.xcconfig: Changed GCC_SYMBOLS_PRIVATE_EXTERN to YES.
>-
>-2014-12-24  Dan Bernstein  <mitz@apple.com>
>-
>-        Removed the Derived Sources target.
>-
>-        It has been empty since r159533.
>-
>-        * ANGLE.xcodeproj/project.pbxproj:
>-
>-2014-12-09  David Kilzer  <ddkilzer@apple.com>
>-
>-        Switch from using PLATFORM_NAME to SDK selectors in ANGLE, bmalloc, gtest, JavaScriptCore, WTF
>-        <http://webkit.org/b/139212>
>-
>-        Reviewed by Joseph Pecoraro.
>-
>-        * Configurations/Base.xcconfig:
>-        - Only set GCC_ENABLE_OBJC_GC, GCC_MODEL_TUNING and TOOLCHAINS
>-          on OS X.
>-        * Configurations/DebugRelease.xcconfig:
>-        - Only set MACOSX_DEPLOYMENT_TARGET and SDKROOT on OS X.
>-
>-2014-10-30  Dana Burkart  <dburkart@apple.com>
>-
>-        <rdar://problem/18821260> Prepare for the mysterious future
>-
>-        Reviewed by Lucas Forschler.
>-
>-        * Configurations/Base.xcconfig:
>-        * Configurations/DebugRelease.xcconfig:
>-
>-2014-10-08  Brent Fulgham  <bfulgham@apple.com>
>-
>-        [Win] Use proper v120 target for 64-bit builds.
>-
>-        * ANGLE.vcxproj/libEGL.vcxproj:
>-
>-2014-09-29  peavo@outlook.com  <peavo@outlook.com>
>-
>-        [WinCairo] D3D11 is not used by default.
>-        https://bugs.webkit.org/show_bug.cgi?id=137215
>-
>-        Reviewed by Alex Christensen.
>-
>-        ANGLE_DEFAULT_D3D11 needs to be defined for D3D11 to be used as default.
>-
>-        * ANGLE.vcxproj/libGLESv2Common.props:
>-
>-2014-09-19  Daniel Bates  <dabates@apple.com>
>-
>-        Always assume internal SDK when building configuration Production
>-        https://bugs.webkit.org/show_bug.cgi?id=136925
>-        <rdar://problem/18362399>
>-
>-        Reviewed by Dan Bernstein.
>-
>-        * Configurations/Base.xcconfig:
>-
>-2014-09-10  Roger Fong  <roger_fong@apple.com>
>-
>-        Check for varying packing restrictions per program instead of per shader.
>-        https://bugs.webkit.org/show_bug.cgi?id=136585.
>-        <rdar://problem/16308409>.
>-
>-        Reviewed by Dean Jackson.
>-
>-        Remove varying packing restrictions checks from ANGLE.
>-        * src/compiler/translator/Compiler.cpp:
>-        (TCompiler::compile):
>-        (TCompiler::enforcePackingRestrictions):
>-        * src/compiler/translator/ShHandle.h:
>-
>-2014-09-06  Darin Adler  <darin@apple.com>
>-
>-        Make updates suggested by new version of Xcode
>-        https://bugs.webkit.org/show_bug.cgi?id=136603
>-
>-        Reviewed by Mark Rowe.
>-
>-        * ANGLE.xcodeproj/project.pbxproj: Updated LastUpgradeCheck.
>-
>-        * Configurations/ANGLE.xcconfig: Added CLANG_WARN_BOOL_CONVERSION,
>-        CLANG_WARN_ENUM_CONVERSION, CLANG_WARN_INT_CONVERSION, COMBINE_HIDPI_IMAGES,
>-        and ENABLE_STRICT_OBJC_MSGSEND as suggested by Xcode upgrade check.
>-
>-2014-09-06  Commit Queue  <commit-queue@webkit.org>
>-
>-        Unreviewed, rolling out r173335.
>-        https://bugs.webkit.org/show_bug.cgi?id=136597
>-
>-        Broke webgl/1.0.2/conformance/glsl/misc/shader-varying-
>-        packing-restrictions.html (Requested by ap on #webkit).
>-
>-        Reverted changeset:
>-
>-        "Remove statically used varyings from packing restrictions
>-        check."
>-        https://bugs.webkit.org/show_bug.cgi?id=136585
>-        http://trac.webkit.org/changeset/173335
>-
>-2014-09-05  Roger Fong  <roger_fong@apple.com>
>-
>-        Remove statically used varyings from packing restrictions check.
>-        https://bugs.webkit.org/show_bug.cgi?id=136585.
>-        <rdar://problem/16308409>
>-
>-        Reviewed by Dean Jackson.
>-
>-        * src/compiler/translator/Compiler.cpp:
>-        (TCompiler::enforcePackingRestrictions):
>-
>-2014-08-29  Csaba OsztrogonÃ¡c  <ossy@webkit.org>
>-
>-        Unreviwed, remove empty directories.
>-
>-        * src/compiler/depgraph: Removed.
>-        * src/compiler/timing: Removed.
>-        * src/libGLESv2/renderer/shaders: Removed.
>-        * src/libGLESv2/renderer/shaders/compiled: Removed.
>-
>-2014-08-11  Andy Estes  <aestes@apple.com>
>-
>-        [iOS] Get rid of iOS.xcconfig
>-        https://bugs.webkit.org/show_bug.cgi?id=135809
>-
>-        Reviewed by Joseph Pecoraro.
>-
>-        All iOS.xcconfig did was include AspenFamily.xcconfig, so there's no need for the indirection.
>-
>-        * ANGLE.xcodeproj/project.pbxproj:
>-        * Configurations/Base.xcconfig:
>-        * Configurations/iOS.xcconfig: Removed.
>-
>-2014-08-07  Brent Fulgham  <bfulgham@apple.com>
>-
>-        [Win] Unreviewed gardening.
>-
>-        DebugSuffix targets should use our debugsuffix property sheet, and
>-        will therefore build to the proper output location with the proper
>-        suffix tags.
>-
>-        Also, we must use the WebKit_Libraries environment variable, not a set
>-        of relative paths to the property sheets.
>-
>-        * ANGLE.vcxproj/libEGL.vcxproj: Use 'debugsuffix.props' sheet.
>-        * ANGLE.vcxproj/libGLESv2.vcxproj: Ditto.
>-        * ANGLE.vcxproj/preprocessor.vcxproj: Ditto.
>-        * ANGLE.vcxproj/translator_common.vcxproj: Ditto.
>-        * ANGLE.vcxproj/translator_glsl.vcxproj: Ditto.
>-        * ANGLE.vcxproj/translator_hlsl.vcxproj: Ditto.
>-        * ANGLE.vcxproj/libEGLCommon.props: Use $(DebugSuffix) endings.
>-        * ANGLE.vcxproj/libGLESv2Common.props: Ditto.
>-        * ANGLE.vcxproj/translatorCommon.props: Output to 'lib' folder,
>-        not 'bin' folder. These are libraries!
>-
>-2014-08-02  Brent Fulgham  <bfulgham@apple.com>
>-
>-        [Win] Unreviewed build fix.
>-
>-        * src/libGLESv2/renderer/d3d11/BufferStorage11.cpp:
>-        (rx::BufferStorage11::copyData): Help compiler make
>-        decision about types.
>-
>-2014-07-25  peavo@outlook.com  <peavo@outlook.com>
>-
>-        [Win][ANGLE] Enable D3D11.
>-        https://bugs.webkit.org/show_bug.cgi?id=135296
>-
>-        Reviewed by Alex Christensen.
>-
>-        Direct3D 11 is not enabled on Windows.
>-
>-        * ANGLE.vcxproj/libGLESv2.vcxproj: Added files.
>-        * ANGLE.vcxproj/libGLESv2.vcxproj.filters: Ditto.
>-        * ANGLE.vcxproj/libGLESv2Common.props: Enable D3D11.
>-        * src/libGLESv2/precompiled.h: Header file does not exist, avoid include.
>-        * changes.diff: Updated diff.
>-
>-2014-06-04  Alex Christensen  <achristensen@webkit.org>
>-
>-        Enable WebGL on Windows.
>-        https://bugs.webkit.org/show_bug.cgi?id=133503
>-
>-        Reviewed by Brent Fulgham.
>-
>-        * changes.diff
>-        Recorded additional changes from ANGLE.
>-        * ANGLE.vcxproj/libEGL.vcxproj:
>-        * ANGLE.vcxproj/libEGL.vcxproj.filters:
>-        * ANGLE.vcxproj/libGLESv2.vcxproj:
>-        * ANGLE.vcxproj/libGLESv2.vcxproj.filters:
>-        * include/EGL/egl.h:
>-        * include/EGL/eglsoftlinking.h: Added.
>-        * include/GLES2/gl2.h:
>-        * include/GLES2/gl2softlinking.h: Added.
>-        Resurrected soft linking headers from r153664.
>-        * src/libGLESv2/renderer/VertexBuffer.cpp:
>-        (rx::VertexBufferInterface::directStoragePossible):
>-        Compile fix for Win64.
>-
>-2014-05-02  Alex Christensen  <achristensen@webkit.org>
>-
>-        Update ANGLE Windows build.
>-        https://bugs.webkit.org/show_bug.cgi?id=132456
>-
>-        Reviewed by Brent Fulgham.
>-
>-        * ANGLE.vcxproj/libEGLCommon.props:
>-        * ANGLE.vcxproj/libGLESv2.vcxproj:
>-        * ANGLE.vcxproj/libGLESv2.vcxproj.filters:
>-        * ANGLE.vcxproj/libGLESv2Common.props:
>-        * ANGLE.vcxproj/translator_common.vcxproj:
>-        * ANGLE.vcxproj/translator_common.vcxproj.filters:
>-        * ANGLE.vcxproj/translator_glsl.vcxproj:
>-        * ANGLE.vcxproj/translator_glsl.vcxproj.filters:
>-        * ANGLE.vcxproj/translator_hlsl.vcxproj:
>-        * ANGLE.vcxproj/translator_hlsl.vcxproj.filters:
>-        Updated ANGLE build.
>-        * src/ANGLE.sln: Removed.
>-        * src/build_angle.gyp: Removed.
>-        * src/commit.h: Added.
>-        * changes.diff:
>-        * src/libGLESv2/Program.cpp:
>-        (gl::InfoLog::append):
>-        Fixed typo.
>-
>-2014-05-01  Alex Christensen  <achristensen@webkit.org>
>-
>-        Finish updating ANGLE.
>-        https://bugs.webkit.org/show_bug.cgi?id=132434
>-
>-        Reviewed by Dean Jackson.
>-
>-        * ANGLE.xcodeproj/project.pbxproj:
>-        Removed Uniform.cpp which is no longer in ANGLE.
>-        * changes.diff:
>-        Added more changes from ANGLE which are already included in WebKit.
>-
>-        Updated ANGLE source files to e7a453a5bd76705ccb151117fa844846d4aa90af.  Long list of changes omitted.
>-
>-2014-04-30  Alex Christensen  <achristensen@webkit.org>
>-
>-        Updated ANGLE.
>-        https://bugs.webkit.org/show_bug.cgi?id=132367
>-        <rdar://problem/16211451>
>-
>-        Reviewed by Dean Jackson.
>-
>-        * ANGLE.plist:
>-        Updated and xml encoded.
>-        * ANGLE.xcodeproj/project.pbxproj:
>-        Added needed new source files.
>-        * changes.diff: 
>-        Added to keep track of differences between WebKit's copy of ANGLE and the master repository.
>-        
>-        Updated ANGLE source files to e7a453a5bd76705ccb151117fa844846d4aa90af.  Long list of changes omitted.
>-
>-2014-03-25  Martin Robinson  <mrobinson@igalia.com>
>-
>-        [GTK] Remove the autotools build
>-        https://bugs.webkit.org/show_bug.cgi?id=130717
>-
>-        Reviewed by Anders Carlsson.
>-
>-        * GNUmakefile.am: Removed.
>-
>-2014-03-14  Mark Rowe  <mrowe@apple.com>
>-
>-        Fix the production build.
>-
>-        Don't rely on USE_INTERNAL_SDK being set for the Production configuration since UseInternalSDK.xcconfig won't
>-        be at the expected relative path when working from installed source.
>-
>-        * Configurations/Base.xcconfig:
>-
>-2014-03-13  Tim Horton  <timothy_horton@apple.com>
>-
>-        Fix relative paths to UseInternalSDK.xcconfig for ANGLE and WebKit/mac
>-
>-        Rubber-stamped by Mark Rowe.
>-
>-        One-too-few "..".
>-
>-        * Configurations/Base.xcconfig:
>-
>-2014-03-13  Radu Stavila  <stavila@adobe.com>
>-
>-        Webkit not building on XCode 5.1 due to garbage collection no longer being supported
>-        https://bugs.webkit.org/show_bug.cgi?id=130087
>-
>-        Reviewed by Mark Rowe.
>-
>-        Disable garbage collection on macosx when not using internal SDK.
>-
>-        * Configurations/Base.xcconfig:
>-
>-2014-02-24  Dean Jackson  <dino@apple.com>
>-
>-        Unreviewed. This file should not be marked as executable (copied in from ANGLE).
>-
>-        * include/KHR/khrplatform.h:
>-
>-2014-02-23  David Kilzer  <ddkilzer@apple.com>
>-
>-        ANGLE: Stop using unsafe strcpy method
>-        <http://webkit.org/b/129237>
>-        <rdar://problem/11077580>
>-
>-        Reviewed by Dean Jackson.
>-
>-        * include/GLSLANG/ShaderLang.h:
>-        - Drive-by fix for header documentation.
>-
>-        * src/compiler/translator/ShaderLang.cpp:
>-        (ShGetInfoLog):
>-        (ShGetObjectCode):
>-        * src/libGLESv2/Program.cpp:
>-        (gl::InfoLog::append):
>-        - Switch to use strncpy(), and explicitly set NULL terminator at
>-          the end of the buffer.
>-
>-2014-02-23  Brent Fulgham  <bfulgham@apple.com>
>-
>-        [WinCairo] Unreviewed build fix after r164565.
>-
>-        * ANGLE.vcxproj/libEGL.vcxproj: Use correct path to files.
>-        * ANGLE.vcxproj/libGLESv2.vcxproj: Ditto.
>-        * ANGLE.vcxproj/libGLESv2.vcxproj.filters: Ditto.
>-        * ANGLE.vcxproj/preprocessor.vcxproj: Ditto.
>-        * ANGLE.vcxproj/translator_common.vcxproj: Ditto.
>-        * ANGLE.vcxproj/translator_common.vcxproj.filters: Ditto.
>-        * ANGLE.vcxproj/translator_glsl.vcxproj: Ditto.
>-        * ANGLE.vcxproj/translator_glsl.vcxproj.filters: Ditto.
>-        * ANGLE.vcxproj/translator_hlsl.vcxproj: Ditto.
>-        * ANGLE.vcxproj/translator_hlsl.vcxproj.filters: Ditto.
>-
>-2014-02-23  Dean Jackson  <dino@apple.com>
>-
>-        Missing files from previous commit.
>-
>-2014-02-23  Dean Jackson  <dino@apple.com>
>-
>-        Update ANGLE to 836bd2176e5607b14846cf1fbc5932dbc91318f4
>-        https://bugs.webkit.org/show_bug.cgi?id=129232
>-
>-        Reviewed by Brent Fulgham.
>-
>-        I also reapplied some of our changes from previous updates, including disabling the clang deprecation
>-        warnings in some files, adding the Apple note about license and defining YY_NO_INPUT.
>-
>-        Huge list of source changes omitted.
>-
>-2013-12-18  Carlos Garcia Campos  <cgarcia@igalia.com>
>-
>-        Unreviewed. Fix make distcheck.
>-
>-        * GNUmakefile.am:
>-
>-2013-12-17  Gustavo Noronha Silva  <gustavo.noronha@collabora.com>
>-
>-        [GTK] Some ANGLE headers missing from dist
>-        https://bugs.webkit.org/show_bug.cgi?id=125782
>-
>-        Reviewed by Carlos Garcia Campos.
>-
>-        * GNUmakefile.am: add a few headers that were missing from the build,
>-        causing build failures when the system headers were incompatible.
>-
>-2013-12-16  Alex Christensen  <achristensen@webkit.org>
>-
>-        Fixed Win64 build on VS2013.
>-        https://bugs.webkit.org/show_bug.cgi?id=125753
>-
>-        Reviewed by Brent Fulgham.
>-
>-        * ANGLE.vcxproj/libGLESv2.vcxproj:
>-        * ANGLE.vcxproj/preprocessor.vcxproj:
>-        * ANGLE.vcxproj/translator_common.vcxproj:
>-        * ANGLE.vcxproj/translator_glsl.vcxproj:
>-        * ANGLE.vcxproj/translator_hlsl.vcxproj:
>-        Added correct PlatformToolset for 64-bit builds.
>-
>-2013-12-13  Brent Fulgham  <bfulgham@apple.com>
>-
>-        [Win] Unreviewed build fix after r160548
>-
>-        I missed the ANGLE files, since we aren't building these
>-        on the Apple Windows port at the moment.
>-
>-        * ANGLE.vcxproj/libEGL.vcxproj: Update to VS2013
>-        * ANGLE.vcxproj/libGLESv2.vcxproj: Ditto
>-        * ANGLE.vcxproj/preprocessor.vcxproj: Ditto
>-        * ANGLE.vcxproj/translator_common.vcxproj: Ditto
>-        * ANGLE.vcxproj/translator_glsl.vcxproj: Ditto
>-        * ANGLE.vcxproj/translator_hlsl.vcxproj: Ditto
>-
>-2013-12-06  Commit Queue  <commit-queue@webkit.org>
>-
>-        Unreviewed, rolling out r159543.
>-        http://trac.webkit.org/changeset/159543
>-        https://bugs.webkit.org/show_bug.cgi?id=125371
>-
>-        Build fix for mac no longer needed (Requested by rfong on
>-        #webkit).
>-
>-        * ANGLE.xcodeproj/project.pbxproj:
>-        * src/compiler/glslang_tab.cpp:
>-        (yysyntax_error):
>-        (glslang_parse):
>-        * src/compiler/glslang_tab.h:
>-        * src/compiler/preprocessor/ExpressionParser.cpp:
>-        (yy_symbol_print):
>-        (yy_stack_print):
>-        (yy_reduce_print):
>-        (yytnamerr):
>-        (yysyntax_error):
>-        (yydestruct):
>-        (yyparse):
>-
>-2013-12-05  Roger Fong  <roger_fong@apple.com>
>-
>-        [WebGL] Make sure we satisfy uniform and varying packing restrictions.
>-        https://bugs.webkit.org/show_bug.cgi?id=125124.
>-        <rdar://problem/15203291>
>-
>-        Reviewed by Brent Fulgham.
>-
>-        * src/compiler/Compiler.cpp: 
>-        Add a check to enforcePackingRestrictions to ensure we make sure packing restrictions for varyings are satisfied as well.
>-        (TCompiler::TCompiler):
>-        (TCompiler::Init):
>-        (TCompiler::compile):
>-        (TCompiler::enforcePackingRestrictions):
>-        * src/compiler/ShHandle.h: Keep track of maximum varying vectors.
>-
>-2013-12-05  Matthew Hanson  <matthew_hanson@apple.com>
>-
>-        Fix ANGLE build failures by re-comitting the changes in http://trac.webkit.org/changeset/154223
>-        on top of the library updates introduced by http://trac.webkit.org/changeset/159533.
>-
>-        Rubber-stamped by Babak Shafiei.
>-
>-        * src/compiler/glslang.l:
>-        * src/compiler/glslang_lex.cpp:
>-        * src/compiler/preprocessor/Tokenizer.cpp:
>-        * src/compiler/preprocessor/Tokenizer.l:
>-
>-2013-12-03  Daniel Bates  <dabates@apple.com>
>-
>-        ANGLE fails to build with trunk clang: unused constant kTraceBufferLen
>-        https://bugs.webkit.org/show_bug.cgi?id=125164
>-        https://code.google.com/p/angleproject/issues/detail?id=534
>-
>-        Reviewed by Darin Adler.
>-
>-        Move the definition of the constant kTraceBufferLen under the macro
>-        guard TRACE_ENABLED since it's only referenced in code guarded by
>-        TRACE_ENABLED.
>-
>-        * src/compiler/debug.cpp:
>-
>-2013-11-21  Alex Christensen  <achristensen@webkit.org>
>-
>-        Remove ANGLEGenerated from Windows build.
>-        https://bugs.webkit.org/show_bug.cgi?id=124759
>-
>-        Reviewed by Darin Adler.
>-
>-        * ANGLE.vcxproj/ANGLEGenerated.vcxproj: Removed.
>-        * ANGLE.vcxproj/ANGLEGenerated.vcxproj.filters: Removed.
>-
>-2013-11-21  Alex Christensen  <achristensen@webkit.org>
>-
>-        Unreviewed build fix.
>-
>-        * src/libGLESv2/Constants.h: Added from checkout a60e0805721f62c28a55faf2df74472cc5fc91fc.
>-
>-2013-11-21  Mark Rowe  <mrowe@apple.com>
>-
>-        <https://webkit.org/b/124701> Fix an error in a few Xcode configuration setting files.
>-
>-        Reviewed by Alexey Proskuryakov.
>-
>-        * Configurations/Base.xcconfig:
>-
>-2013-11-21  Brent Fulgham  <bfulgham@apple.com>
>-
>-        Unreviewed gardening to hide annoying *.user files when.
>-
>-        * ANGLE.vcxproj: Added property svn:ignore.
>-
>-2013-11-21  peavo@outlook.com  <peavo@outlook.com>
>-
>-        [WinCairo] Building ANGLE libraries fails.
>-        https://bugs.webkit.org/show_bug.cgi?id=124679
>-
>-        Reviewed by Brent Fulgham.
>-
>-        Added/removed files to/from project, and re-added constants.h file.
>-
>-        * ANGLE.vcxproj/libEGL.vcxproj:
>-        * ANGLE.vcxproj/libEGL.vcxproj.filters:
>-        * ANGLE.vcxproj/libGLESv2.vcxproj:
>-        * ANGLE.vcxproj/libGLESv2.vcxproj.filters:
>-        * ANGLE.vcxproj/libGLESv2Common.props:
>-        * ANGLE.vcxproj/translator_common.vcxproj:
>-        * ANGLE.vcxproj/translator_common.vcxproj.filters:
>-        * ANGLE.vcxproj/translator_glsl.vcxproj:
>-        * ANGLE.vcxproj/translator_glsl.vcxproj.filters:
>-        * ANGLE.vcxproj/translator_hlsl.vcxproj:
>-        * ANGLE.vcxproj/translator_hlsl.vcxproj.filters:
>-        * src/libGLESv2/libGLESv2.def:
>-
>-2013-11-20  Sergio Correia  <sergio.correia@openbossa.org>
>-
>-        ANGLE doesn't build with bison 3.0
>-        https://bugs.webkit.org/show_bug.cgi?id=124642
>-
>-        Reviewed by Gyuyoung Kim.
>-
>-        This is a reedition of r154109, now that ANGLE source has been updated
>-        in r159533.
>-
>-        * src/compiler/glslang.y: Use %lex-param to set YYLEX_PARAM and stop
>-        using the deprecated YYID macro.
>-
>-2013-11-20  Carlos Garcia Campos  <cgarcia@igalia.com>
>-
>-        Unreviewed. Fix GTK build.
>-
>-        * GNUmakefile.am: Remove duplicated entries.
>-
>-2013-11-19  Martin Robinson  <mrobinson@igalia.com>
>-
>-        Fix the GTK+ build after the ANGLE update in r159533
>-
>-        * GNUmakefile.am: Update the source list.
>-
>-2013-11-19  Roger Fong  <roger_fong@apple.com>
>-
>-        Unreviewed. Build fix for Mac.
>-
>-        * src/compiler/glslang_tab.cpp:
>-        (yysyntax_error):
>-        (yyerror):
>-        * src/compiler/glslang_tab.h:
>-        * src/compiler/preprocessor/ExpressionParser.cpp:
>-        (yysyntax_error):
>-
>-2013-11-19  Roger Fong  <roger_fong@apple.com>
>-
>-        Unreviewed. Prospective build fix for GTK port following r159533.
>-
>-        * GNUmakefile.am:
>-
>-2013-11-19  Roger Fong  <roger_fong@apple.com>
>-
>-        Update ANGLE sources.
>-        https://bugs.webkit.org/show_bug.cgi?id=124615.
>-
>-        Reviewed by Dean Jackson.
>-
>-        Update ANGLE to checkout a60e0805721f62c28a55faf2df74472cc5fc91fc.
>-        Modify xcodeproj files as necessary, update plist.
>-        Stop using DerivedSources.make and just use the generated sources that are checked into ANGLE.
>-        Add a note to bison generated files indicating that Apple elects to distribute said files under the BSD license: 
>-        ExpressionParser.cpp, glslang_tab.cpp, glslang_tab.h.
>-
>-        * ANGLE.plist:
>-        * ANGLE.xcodeproj/project.pbxproj:
>-        * DerivedSources.make: Removed.
>-        * include/EGL/egl.h:
>-        * include/EGL/eglsoftlinking.h: Removed.
>-        * include/GLES2/gl2.h:
>-        * include/GLES2/gl2softlinking.h: Removed.
>-        * include/GLSLANG/ShaderLang.h:
>-        * include/KHR/khrplatform.h:
>-        * src/ANGLE.sln: Added.
>-        * src/build_angle.gypi:
>-        * src/common/debug.h:
>-        * src/common/event_tracer.cpp: Added.
>-        (gl::TraceGetTraceCategoryEnabledFlag):
>-        (gl::TraceAddTraceEvent):
>-        * src/common/event_tracer.h: Added.
>-        * src/common/version.h:
>-        * src/compiler/CodeGen.cpp: Added.
>-        (ConstructCompiler):
>-        (DeleteCompiler):
>-        * src/compiler/CodeGenGLSL.cpp: Removed.
>-        * src/compiler/CodeGenHLSL.cpp: Removed.
>-        * src/compiler/Common.h:
>-        (NewPoolTString):
>-        * src/compiler/Compiler.cpp:
>-        (TCompiler::Init):
>-        (TCompiler::compile):
>-        (TCompiler::InitBuiltInSymbolTable):
>-        (TCompiler::clearResults):
>-        (TCompiler::collectVariables):
>-        * src/compiler/ConstantUnion.h:
>-        * src/compiler/DetectDiscontinuity.cpp:
>-        * src/compiler/InfoSink.h:
>-        * src/compiler/InitializeDll.cpp:
>-        (InitProcess):
>-        (DetachProcess):
>-        * src/compiler/InitializeDll.h:
>-        * src/compiler/InitializeGLPosition.cpp: Added.
>-        (InitializeGLPosition::visitAggregate):
>-        (InitializeGLPosition::insertCode):
>-        * src/compiler/InitializeGLPosition.h: Added.
>-        (InitializeGLPosition::InitializeGLPosition):
>-        (InitializeGLPosition::visitBinary):
>-        (InitializeGLPosition::visitUnary):
>-        (InitializeGLPosition::visitSelection):
>-        (InitializeGLPosition::visitLoop):
>-        (InitializeGLPosition::visitBranch):
>-        * src/compiler/InitializeGlobals.h:
>-        * src/compiler/InitializeParseContext.cpp:
>-        (InitializeParseContextIndex):
>-        (FreeParseContextIndex):
>-        (SetGlobalParseContext):
>-        (GetGlobalParseContext):
>-        * src/compiler/InitializeParseContext.h:
>-        * src/compiler/IntermTraverse.cpp:
>-        (TIntermSymbol::traverse):
>-        (TIntermConstantUnion::traverse):
>-        (TIntermBinary::traverse):
>-        (TIntermUnary::traverse):
>-        (TIntermAggregate::traverse):
>-        (TIntermSelection::traverse):
>-        (TIntermLoop::traverse):
>-        (TIntermBranch::traverse):
>-        * src/compiler/Intermediate.cpp:
>-        (GetHigherPrecision):
>-        (getOperatorString):
>-        (TIntermLoop::replaceChildNode):
>-        (TIntermBranch::replaceChildNode):
>-        (TIntermBinary::replaceChildNode):
>-        (TIntermUnary::replaceChildNode):
>-        (TIntermAggregate::replaceChildNode):
>-        (TIntermSelection::replaceChildNode):
>-        (TIntermOperator::isAssignment):
>-        (TIntermediate::promoteConstantUnion):
>-        * src/compiler/MapLongVariableNames.cpp:
>-        * src/compiler/MapLongVariableNames.h:
>-        * src/compiler/NodeSearch.h: Added.
>-        (sh::NodeSearchTraverser::NodeSearchTraverser):
>-        (sh::NodeSearchTraverser::found):
>-        (sh::NodeSearchTraverser::search):
>-        (sh::FindDiscard::visitBranch):
>-        (sh::FindSideEffectRewriting::visitBinary):
>-        * src/compiler/OutputGLSLBase.cpp:
>-        (TOutputGLSLBase::visitSelection):
>-        (TOutputGLSLBase::visitAggregate):
>-        (TOutputGLSLBase::visitLoop):
>-        * src/compiler/OutputGLSLBase.h:
>-        * src/compiler/OutputHLSL.cpp:
>-        (sh::OutputHLSL::OutputHLSL):
>-        (sh::OutputHLSL::header):
>-        (sh::OutputHLSL::visitBinary):
>-        (sh::OutputHLSL::visitSelection):
>-        (sh::OutputHLSL::visitBranch):
>-        (sh::OutputHLSL::handleExcessiveLoop):
>-        (sh::OutputHLSL::addConstructor):
>-        * src/compiler/OutputHLSL.h:
>-        * src/compiler/ParseContext.cpp: Added.
>-        (TParseContext::parseVectorFields):
>-        (TParseContext::parseMatrixFields):
>-        (TParseContext::recover):
>-        (TParseContext::error):
>-        (TParseContext::warning):
>-        (TParseContext::trace):
>-        (TParseContext::assignError):
>-        (TParseContext::unaryOpError):
>-        (TParseContext::binaryOpError):
>-        (TParseContext::precisionErrorCheck):
>-        (TParseContext::lValueErrorCheck):
>-        (TParseContext::constErrorCheck):
>-        (TParseContext::integerErrorCheck):
>-        (TParseContext::globalErrorCheck):
>-        (TParseContext::reservedErrorCheck):
>-        (TParseContext::constructorErrorCheck):
>-        (TParseContext::voidErrorCheck):
>-        (TParseContext::boolErrorCheck):
>-        (TParseContext::samplerErrorCheck):
>-        (TParseContext::structQualifierErrorCheck):
>-        (TParseContext::parameterSamplerErrorCheck):
>-        (TParseContext::containsSampler):
>-        (TParseContext::arraySizeErrorCheck):
>-        (TParseContext::arrayQualifierErrorCheck):
>-        (TParseContext::arrayTypeErrorCheck):
>-        (TParseContext::arrayErrorCheck):
>-        (TParseContext::nonInitConstErrorCheck):
>-        (TParseContext::nonInitErrorCheck):
>-        (TParseContext::paramErrorCheck):
>-        (TParseContext::extensionErrorCheck):
>-        (TParseContext::supportsExtension):
>-        (TParseContext::isExtensionEnabled):
>-        (TParseContext::findFunction):
>-        (TParseContext::executeInitializer):
>-        (TParseContext::areAllChildConst):
>-        (TParseContext::addConstructor):
>-        (TParseContext::foldConstConstructor):
>-        (TParseContext::constructBuiltIn):
>-        (TParseContext::constructStruct):
>-        (TParseContext::addConstVectorNode):
>-        (TParseContext::addConstMatrixNode):
>-        (TParseContext::addConstArrayNode):
>-        (TParseContext::addConstStruct):
>-        (TParseContext::enterStructDeclaration):
>-        (TParseContext::exitStructDeclaration):
>-        (TParseContext::structNestingErrorCheck):
>-        (TParseContext::addIndexExpression):
>-        (PaParseStrings):
>-        * src/compiler/ParseContext.h: Added.
>-        (TParseContext::TParseContext):
>-        (TParseContext::numErrors):
>-        (TParseContext::infoSink):
>-        (TParseContext::pragma):
>-        (TParseContext::extensionBehavior):
>-        * src/compiler/ParseHelper.cpp: Removed.
>-        * src/compiler/ParseHelper.h: Removed.
>-        * src/compiler/PoolAlloc.cpp:
>-        (InitializePoolIndex):
>-        (FreePoolIndex):
>-        (GetGlobalPoolAllocator):
>-        (SetGlobalPoolAllocator):
>-        * src/compiler/PoolAlloc.h:
>-        (pool_allocator::pool_allocator):
>-        * src/compiler/SearchSymbol.h:
>-        * src/compiler/ShHandle.h:
>-        (TCompiler::getVaryings):
>-        * src/compiler/ShaderLang.cpp:
>-        (checkVariableMaxLengths):
>-        (ShInitialize):
>-        (ShFinalize):
>-        (ShConstructCompiler):
>-        (ShCompile):
>-        (ShGetInfo):
>-        (ShGetVariableInfo):
>-        (ShCheckVariablesWithinPackingLimits):
>-        * src/compiler/SymbolTable.cpp:
>-        (TSymbolTable::~TSymbolTable):
>-        * src/compiler/SymbolTable.h:
>-        (TSymbol::TSymbol):
>-        (TSymbolTableLevel::insert):
>-        (TSymbolTable::push):
>-        (TSymbolTable::pop):
>-        (TSymbolTable::findBuiltIn):
>-        (TSymbolTable::relateToExtension):
>-        (TSymbolTable::setDefaultPrecision):
>-        (TSymbolTable::getDefaultPrecision):
>-        (TSymbolTable::supportsPrecision):
>-        * src/compiler/Types.h:
>-        (NewPoolTFieldList):
>-        (TType::TType):
>-        (TType::setNominalSize):
>-        (TPublicType::setAggregate):
>-        * src/compiler/UnfoldShortCircuit.cpp:
>-        (sh::UnfoldShortCircuit::visitBinary):
>-        (sh::UnfoldShortCircuit::visitSelection):
>-        * src/compiler/UnfoldShortCircuit.h:
>-        * src/compiler/UnfoldShortCircuitAST.cpp: Added.
>-        (UnfoldShortCircuitAST::visitBinary):
>-        (UnfoldShortCircuitAST::updateTree):
>-        * src/compiler/UnfoldShortCircuitAST.h: Added.
>-        (UnfoldShortCircuitAST::UnfoldShortCircuitAST):
>-        (UnfoldShortCircuitAST::NodeUpdateEntry::NodeUpdateEntry):
>-        * src/compiler/Uniform.cpp:
>-        (sh::Uniform::Uniform):
>-        * src/compiler/Uniform.h:
>-        * src/compiler/ValidateLimitations.cpp:
>-        (ValidateLimitations::validateFunctionCall):
>-        (ValidateLimitations::validateOperation):
>-        * src/compiler/VariableInfo.cpp:
>-        (TVariableInfo::TVariableInfo):
>-        (CollectVariables::CollectVariables):
>-        (CollectVariables::visitSymbol):
>-        (CollectVariables::visitAggregate):
>-        * src/compiler/VariableInfo.h:
>-        * src/compiler/debug.cpp:
>-        * src/compiler/depgraph/DependencyGraph.cpp:
>-        * src/compiler/depgraph/DependencyGraphBuilder.cpp:
>-        (TDependencyGraphBuilder::visitBinary):
>-        * src/compiler/generate_parser.sh:
>-        * src/compiler/glslang.l:
>-        * src/compiler/glslang.y:
>-        * src/compiler/glslang_lex.cpp:
>-        (input):
>-        (yyerror):
>-        (int_constant):
>-        (float_constant):
>-        (glslang_scan):
>-        * src/compiler/glslang_tab.cpp:
>-        (yysyntax_error):
>-        (glslang_parse):
>-        * src/compiler/glslang_tab.h:
>-        * src/compiler/intermediate.h:
>-        (TIntermSymbol::hasSideEffects):
>-        (TIntermSymbol::replaceChildNode):
>-        (TIntermConstantUnion::hasSideEffects):
>-        (TIntermConstantUnion::getIConst):
>-        (TIntermConstantUnion::getFConst):
>-        (TIntermConstantUnion::getBConst):
>-        (TIntermConstantUnion::replaceChildNode):
>-        (TIntermOperator::hasSideEffects):
>-        (TIntermBinary::hasSideEffects):
>-        (TIntermUnary::hasSideEffects):
>-        (TIntermAggregate::hasSideEffects):
>-        (TIntermSelection::hasSideEffects):
>-        (TIntermTraverser::~TIntermTraverser):
>-        (TIntermTraverser::incrementDepth):
>-        (TIntermTraverser::decrementDepth):
>-        (TIntermTraverser::getParentNode):
>-        * src/compiler/localintermediate.h:
>-        * src/compiler/parseConst.cpp:
>-        * src/compiler/preprocessor/ExpressionParser.cpp:
>-        (yy_symbol_print):
>-        (yy_stack_print):
>-        (yy_reduce_print):
>-        (yystrlen):
>-        (yystpcpy):
>-        (yytnamerr):
>-        (yysyntax_error):
>-        (yydestruct):
>-        (yyparse):
>-        * src/compiler/preprocessor/ExpressionParser.y:
>-        * src/compiler/preprocessor/Preprocessor.cpp:
>-        (pp::Preprocessor::setMaxTokenLength):
>-        (pp::Preprocessor::lex):
>-        * src/compiler/preprocessor/Preprocessor.h:
>-        * src/compiler/preprocessor/Tokenizer.cpp:
>-        (pp::Tokenizer::Tokenizer):
>-        (pp::Tokenizer::lex):
>-        * src/compiler/preprocessor/Tokenizer.h:
>-        (pp::Tokenizer::setMaxTokenLength):
>-        * src/compiler/preprocessor/Tokenizer.l:
>-        * src/compiler/preprocessor/generate_parser.sh:
>-        * src/compiler/preprocessor/preprocessor.vcxproj: Added.
>-        * src/compiler/preprocessor/preprocessor.vcxproj.filters: Added.
>-        * src/compiler/timing/RestrictFragmentShaderTiming.cpp:
>-        * src/compiler/translator.vcxproj: Added.
>-        * src/compiler/translator.vcxproj.filters: Added.
>-        * src/compiler/util.cpp:
>-        (atof_clamp):
>-        (atoi_clamp):
>-        * src/compiler/util.h:
>-        * src/libEGL/Surface.cpp:
>-        (egl::Surface::checkForOutOfDateSwapChain):
>-        * src/libEGL/libEGL.cpp:
>-        * src/libEGL/libEGL.rc:
>-        * src/libEGL/libEGL.vcxproj: Added.
>-        * src/libEGL/libEGL.vcxproj.filters: Added.
>-        * src/libGLESv2/Buffer.cpp:
>-        (gl::Buffer::bufferData):
>-        (gl::Buffer::bufferSubData):
>-        (gl::Buffer::size):
>-        (gl::Buffer::getIndexRangeCache):
>-        * src/libGLESv2/Buffer.h:
>-        * src/libGLESv2/Context.cpp:
>-        (gl::Context::applyTextures):
>-        (gl::Context::getBoundFramebufferTextureSerials):
>-        * src/libGLESv2/Context.h:
>-        (gl::Context::getRenderer):
>-        * src/libGLESv2/Framebuffer.h:
>-        * src/libGLESv2/ProgramBinary.cpp:
>-        (gl::DiscardWorkaround):
>-        (gl::ProgramBinary::load):
>-        (gl::ProgramBinary::link):
>-        (gl::ProgramBinary::linkAttributes):
>-        (gl::AttributeSorter::AttributeSorter):
>-        (gl::ProgramBinary::initAttributesByLayout):
>-        (gl::ProgramBinary::sortAttributesByLayout):
>-        * src/libGLESv2/ProgramBinary.h:
>-        * src/libGLESv2/Renderbuffer.cpp:
>-        (gl::RenderbufferTexture2D::getTextureSerial):
>-        (gl::RenderbufferTextureCubeMap::getTextureSerial):
>-        (gl::Renderbuffer::getTextureSerial):
>-        * src/libGLESv2/Renderbuffer.h:
>-        (gl::RenderbufferStorage::getTextureSerial):
>-        * src/libGLESv2/Shader.cpp:
>-        (gl::Shader::parseVaryings):
>-        (gl::Shader::uncompile):
>-        * src/libGLESv2/Shader.h:
>-        * src/libGLESv2/Texture.cpp:
>-        (gl::TextureCubeMap::storage):
>-        * src/libGLESv2/Uniform.cpp:
>-        (gl::Uniform::Uniform):
>-        (gl::Uniform::~Uniform):
>-        (gl::Uniform::isArray):
>-        (gl::Uniform::elementCount):
>-        * src/libGLESv2/Uniform.h:
>-        * src/libGLESv2/constants.h: Removed.
>-        * src/libGLESv2/libGLESv2.def:
>-        * src/libGLESv2/libGLESv2.rc:
>-        * src/libGLESv2/libGLESv2.vcxproj: Added.
>-        * src/libGLESv2/libGLESv2.vcxproj.filters: Added.
>-        * src/libGLESv2/precompiled.h:
>-        * src/libGLESv2/renderer/Image11.cpp:
>-        (rx::Image11::generateMipmap):
>-        (rx::Image11::loadData):
>-        (rx::Image11::loadCompressedData):
>-        (rx::Image11::copy):
>-        (rx::Image11::createStagingTexture):
>-        (rx::Image11::map):
>-        * src/libGLESv2/renderer/Image11.h:
>-        * src/libGLESv2/renderer/IndexBuffer.cpp:
>-        (rx::IndexBufferInterface::mapBuffer):
>-        (rx::StaticIndexBufferInterface::getIndexRangeCache):
>-        * src/libGLESv2/renderer/IndexBuffer.h:
>-        * src/libGLESv2/renderer/IndexBuffer11.cpp:
>-        (rx::IndexBuffer11::mapBuffer):
>-        * src/libGLESv2/renderer/IndexDataManager.cpp:
>-        (rx::IndexDataManager::prepareIndexData):
>-        (rx::IndexDataManager::getCountingIndices):
>-        * src/libGLESv2/renderer/IndexRangeCache.cpp: Added.
>-        (rx::IndexRangeCache::addRange):
>-        (rx::IndexRangeCache::invalidateRange):
>-        (rx::IndexRangeCache::findRange):
>-        (rx::IndexRangeCache::clear):
>-        (rx::IndexRangeCache::IndexRange::IndexRange):
>-        (rx::IndexRangeCache::IndexRange::operator<):
>-        (rx::IndexRangeCache::IndexBounds::IndexBounds):
>-        * src/libGLESv2/renderer/IndexRangeCache.h: Added.
>-        * src/libGLESv2/renderer/InputLayoutCache.cpp:
>-        (rx::InputLayoutCache::InputLayoutCache):
>-        (rx::InputLayoutCache::clear):
>-        (rx::InputLayoutCache::markDirty):
>-        (rx::InputLayoutCache::applyVertexBuffers):
>-        (rx::InputLayoutCache::hashInputLayout):
>-        (rx::InputLayoutCache::compareInputLayouts):
>-        * src/libGLESv2/renderer/InputLayoutCache.h:
>-        (rx::InputLayoutCache::InputLayoutKey::begin):
>-        (rx::InputLayoutCache::InputLayoutKey::end):
>-        * src/libGLESv2/renderer/RenderTarget11.cpp:
>-        (rx::RenderTarget11::getTexture):
>-        (rx::RenderTarget11::getRenderTargetView):
>-        (rx::RenderTarget11::getDepthStencilView):
>-        (rx::RenderTarget11::getShaderResourceView):
>-        * src/libGLESv2/renderer/RenderTarget11.h:
>-        * src/libGLESv2/renderer/Renderer.cpp:
>-        (rx::Renderer::initializeCompiler):
>-        * src/libGLESv2/renderer/Renderer.h:
>-        * src/libGLESv2/renderer/Renderer11.cpp:
>-        (rx::Renderer11::initialize):
>-        (rx::Renderer11::applyPrimitiveType):
>-        (rx::Renderer11::applyRenderTarget):
>-        (rx::Renderer11::drawLineLoop):
>-        (rx::Renderer11::drawTriangleFan):
>-        (rx::Renderer11::applyUniforms):
>-        (rx::Renderer11::clear):
>-        (rx::Renderer11::markAllStateDirty):
>-        (rx::Renderer11::copyImage):
>-        (rx::Renderer11::compileToExecutable):
>-        (rx::Renderer11::getRenderTargetResource):
>-        (rx::Renderer11::blitRenderbufferRect):
>-        * src/libGLESv2/renderer/Renderer11.h:
>-        * src/libGLESv2/renderer/Renderer9.cpp:
>-        (rx::Renderer9::initialize):
>-        (rx::Renderer9::setViewport):
>-        (rx::Renderer9::drawLineLoop):
>-        (rx::Renderer9::compileToExecutable):
>-        * src/libGLESv2/renderer/Renderer9.h:
>-        * src/libGLESv2/renderer/SwapChain.h:
>-        * src/libGLESv2/renderer/SwapChain11.cpp:
>-        (rx::SwapChain11::resetOffscreenTexture):
>-        (rx::SwapChain11::reset):
>-        (rx::SwapChain11::swapRect):
>-        * src/libGLESv2/renderer/SwapChain9.cpp:
>-        (rx::convertInterval):
>-        * src/libGLESv2/renderer/TextureStorage11.cpp:
>-        (rx::TextureStorage11::IsTextureFormatRenderable):
>-        (rx::TextureStorage11::generateMipmapLayer):
>-        (rx::TextureStorage11_Cube::getRenderTarget):
>-        * src/libGLESv2/renderer/VertexBuffer.cpp:
>-        (rx::VertexBufferInterface::storeVertexAttributes):
>-        (rx::VertexBufferInterface::storeRawData):
>-        (rx::VertexBufferInterface::reserveVertexSpace):
>-        (rx::StaticVertexBufferInterface::lookupAttribute):
>-        (rx::StaticVertexBufferInterface::storeVertexAttributes):
>-        * src/libGLESv2/renderer/VertexBuffer.h:
>-        * src/libGLESv2/renderer/VertexBuffer11.cpp:
>-        (rx::VertexBuffer11::getSpaceRequired):
>-        * src/libGLESv2/renderer/VertexBuffer11.h:
>-        * src/libGLESv2/renderer/VertexBuffer9.cpp:
>-        (rx::VertexBuffer9::storeVertexAttributes):
>-        (rx::VertexBuffer9::getSpaceRequired):
>-        (rx::VertexBuffer9::requiresConversion):
>-        (rx::VertexBuffer9::getVertexSize):
>-        (rx::VertexBuffer9::spaceRequired):
>-        * src/libGLESv2/renderer/VertexBuffer9.h:
>-        * src/libGLESv2/renderer/VertexDataManager.cpp:
>-        (rx::elementsInBuffer):
>-        (rx::StreamingBufferElementCount):
>-        (rx::VertexDataManager::prepareVertexData):
>-        * src/libGLESv2/renderer/VertexDataManager.h:
>-        * src/libGLESv2/renderer/renderer11_utils.cpp:
>-        (gl_d3d11::ConvertTextureFormat):
>-        * src/libGLESv2/renderer/shaders/compiled/clear11vs.h:
>-        * src/libGLESv2/renderer/shaders/compiled/clearmultiple11ps.h:
>-        * src/libGLESv2/renderer/shaders/compiled/clearsingle11ps.h:
>-        * src/libGLESv2/renderer/shaders/compiled/componentmaskps.h:
>-        * src/libGLESv2/renderer/shaders/compiled/flipyvs.h:
>-        * src/libGLESv2/renderer/shaders/compiled/luminanceps.h:
>-        * src/libGLESv2/renderer/shaders/compiled/passthrough11vs.h:
>-        * src/libGLESv2/renderer/shaders/compiled/passthroughlum11ps.h:
>-        * src/libGLESv2/renderer/shaders/compiled/passthroughlumalpha11ps.h:
>-        * src/libGLESv2/renderer/shaders/compiled/passthroughps.h:
>-        * src/libGLESv2/renderer/shaders/compiled/passthroughrgb11ps.h:
>-        * src/libGLESv2/renderer/shaders/compiled/passthroughrgba11ps.h:
>-        * src/libGLESv2/renderer/shaders/compiled/standardvs.h:
>-        * src/libGLESv2/renderer/shaders/generate_shaders.bat:
>-        * src/libGLESv2/utilities.cpp:
>-        (gl::ComputeTypeSize):
>-        * src/libGLESv2/utilities.h:
>-        * src/third_party/murmurhash/MurmurHash3.cpp:
>-        (rotl32):
>-        (rotl64):
>-        (getblock):
>-        (fmix):
>-        (MurmurHash3_x86_32):
>-        (MurmurHash3_x86_128):
>-        (MurmurHash3_x64_128):
>-        * src/third_party/murmurhash/MurmurHash3.h:
>-        * src/third_party/trace_event: Added.
>-        * src/third_party/trace_event/trace_event.h: Added.
>-        (gl::TraceEvent::TraceID::TraceID):
>-        (gl::TraceEvent::TraceID::data):
>-        (gl::TraceEvent::TraceStringWithCopy::TraceStringWithCopy):
>-        (gl::TraceEvent::TraceStringWithCopy::operator const char* ):
>-        (gl::TraceEvent::setTraceValue):
>-        (gl::TraceEvent::addTraceEvent):
>-        (gl::TraceEvent::TraceEndOnScopeClose::TraceEndOnScopeClose):
>-        (gl::TraceEvent::TraceEndOnScopeClose::~TraceEndOnScopeClose):
>-        (gl::TraceEvent::TraceEndOnScopeClose::initialize):
>-        (gl::TraceEvent::TraceEndOnScopeClose::addEventIfEnabled):
>-        (gl::TraceEvent::SamplingStateScope::SamplingStateScope):
>-        (gl::TraceEvent::SamplingStateScope::~SamplingStateScope):
>-        (gl::TraceEvent::SamplingStateScope::current):
>-        (gl::TraceEvent::SamplingStateScope::set):
>-
>-2013-11-18  Mark Rowe  <mrowe@apple.com>
>-
>-        Use hw.activecpu for determining how many processes to spawn.
>-
>-        It's documented as the preferred way to determine the number of threads
>-        or processes to create in a SMP aware application.
>-
>-        Rubber-stamped by Tim Horton.
>-
>-        * ANGLE.xcodeproj/project.pbxproj:
>-
>-2013-11-06  Dean Jackson  <dino@apple.com>
>-
>-        kTraceBufferLen is unused in default builds
>-        https://bugs.webkit.org/show_bug.cgi?id=123941
>-        <rdar://problem/15409804>
>-
>-        Reviewed by Tim Horton.
>-
>-        kTraceBufferLen is not used in debug.cpp if TRACE_ENABLED is
>-        not defined. This causes a warning in newer builds of clang.
>-        For now, skip warnings on unused variables until we
>-        update from ANGLE.
>-
>-        * src/compiler/debug.cpp: Add unused-variable ignore pragma.
>-
>-2013-10-24  Mark Rowe  <mrowe@apple.com>
>-
>-        Remove references to OS X 10.7 from Xcode configuration settings.
>-
>-        Now that we're not building for OS X 10.7 they're no longer needed.
>-
>-        Reviewed by Anders Carlsson.
>-
>-        * Configurations/Base.xcconfig:
>-        * Configurations/DebugRelease.xcconfig:
>-
>-2013-10-24  Mark Rowe  <mrowe@apple.com>
>-
>-        <rdar://problem/15312643> Prepare for the mysterious future.
>-
>-        Reviewed by David Kilzer.
>-
>-        * Configurations/Base.xcconfig:
>-        * Configurations/DebugRelease.xcconfig:
>-
>-2013-10-10  Mark Rowe  <mrowe@apple.com>
>-
>-        <rdar://problem/13341666> WebKit should always build against an SDK.
>-
>-        Have all projects default to building against the OS X Internal SDK for the Production
>-        configuration. For the Debug and Release configurations, look for UseInternalSDK.xcconfig
>-        to determine whether the OS X Internal SDK should be used. If not, use the normal OS X SDK.
>-
>-        Reviewed by Dan Bernstein.
>-
>-        * Configurations/Base.xcconfig:
>-        * Configurations/DebugRelease.xcconfig:
>-
>-2013-10-08  Alex Christensen  <achristensen@webkit.org>
>-
>-        Generate pdb files for debugging ANGLE DLLs.
>-        https://bugs.webkit.org/show_bug.cgi?id=122530
>-
>-        Reviewed by Brent Fulgham.
>-
>-        * ANGLE.vcxproj/libEGLCommon.props:
>-        * ANGLE.vcxproj/libGLESv2Common.props:
>-        Generate debug information.
>-
>-2013-10-03  Dan Bernstein  <mitz@apple.com>
>-
>-        <rdar://problem/15116673> [mac] Build failure when the source directory is not named ANGLE
>-        https://bugs.webkit.org/show_bug.cgi?id=122307
>-
>-        Reviewed by Mark Rowe.
>-
>-        * ANGLE.xcodeproj/project.pbxproj: Ensure that the symlink to SRCROOT in
>-        DerivedSources/ANGLE is named ANGLE.
>-
>-2013-09-29  Darin Adler  <darin@apple.com>
>-
>-        Take some Xcode advice about turning on additional warnings in ANGLE and gtest
>-        https://bugs.webkit.org/show_bug.cgi?id=122087
>-
>-        Reviewed by Mark Rowe.
>-
>-        * Configurations/Base.xcconfig: Add some of the warnings that Xcode 5 suggested.
>-        * src/compiler/preprocessor/Tokenizer.l: Defined YY_NO_INPUT so we don't compile
>-        an unused function and get a warning.
>-
>-2013-09-29  Darin Adler  <darin@apple.com>
>-
>-        Use RenderElement instead of RenderObject in many places
>-        https://bugs.webkit.org/show_bug.cgi?id=122078
>-
>-        Reviewed by Andreas Kling.
>-
>-        * ANGLE.xcodeproj/project.pbxproj: Let Xcode do its thing to this file.
>-
>-2013-09-24  Mark Rowe  <mrowe@apple.com>
>-
>-        <rdar://problem/14971518> WebKit should build against the Xcode default toolchain when targeting OS X 10.8
>-
>-        Reviewed by Dan Bernstein.
>-
>-        * Configurations/Base.xcconfig:
>-
>-2013-09-06  peavo@outlook.com  <peavo@outlook.com>
>-
>-        [Win][WebGL] WebGL rendering is slow.
>-        https://bugs.webkit.org/show_bug.cgi?id=120841
>-
>-        Reviewed by Brent Fulgham.
>-
>-        Rendering WebGL content is slow on Windows, because lots of debug information is written to debug.txt.
>-
>-        * ANGLE.vcxproj/ANGLERelease.props: Disable logging in release builds.
>-
>-2013-09-05  Dan Bernstein  <mitz@apple.com>
>-
>-        INSTALL_PATH_PREFIX is used even when not installing
>-        https://bugs.webkit.org/show_bug.cgi?id=120818
>-
>-        Reviewed by Darin Adler.
>-
>-        * Configurations/ANGLE.xcconfig: Changed the definition of PRIVATE_HEADERS_FOLDER_PATH
>-        to include INSTALL_PATH_PREFIX only when installing.
>-
>-2013-08-17  David Kilzer  <ddkilzer@apple.com>
>-
>-        ANGLE fails to build with trunk clang: error: 'register' storage class specifier is deprecated [-Werror,-Wdeprecated-register]
>-        <http://webkit.org/b/119931>
>-        <rdar://problem/14763822>
>-
>-        Reviewed by Darin Adler.
>-
>-        * src/compiler/glslang.l:
>-        * src/compiler/glslang_lex.cpp:
>-        * src/compiler/preprocessor/Tokenizer.cpp:
>-        * src/compiler/preprocessor/Tokenizer.l:
>-        Add pragma statements to ignore -Wdeprecated-register warnings
>-        in generated code.  Also ignore -Wunknown-pragmas so this
>-        doesn't cause a build failure in older versions of clang.
>-
>-2013-08-16  Commit Queue  <commit-queue@webkit.org>
>-
>-        Unreviewed, rolling out r153749.
>-        http://trac.webkit.org/changeset/153749
>-        https://bugs.webkit.org/show_bug.cgi?id=119892
>-
>-        The bison generation of the glslang* files has now been fixed. (Requested by zdobersek on #webkit).
>-
>-        * GNUmakefile.am: Preserve the libANGLE.la dependency on the ANGLE's GNUmakefile.am.
>-
>-2013-08-15  Allan Sandfeld Jensen  <allan.jensen@digia.com>
>-
>-        ANGLE doesn't build with bison 3.0
>-        https://bugs.webkit.org/show_bug.cgi?id=119798
>-
>-        Reviewed by Antti Koivisto.
>-
>-        Make glslang.y compatible with bison 3.0, by using %lex-param
>-        to set YYLEX_PARAM and getting rid of useless YYID macro.
>-
>-        * src/compiler/glslang.y:
>-
>-2013-08-09  Zoltan Arvai  <zarvai@inf.u-szeged.hu>
>-
>-        [Qt] Buidfix after r153664. Adding ANGLE_WEBKIT_WIN definition.
>-        https://bugs.webkit.org/show_bug.cgi?id=119577
>-
>-        Reviewed by Allan Sandfeld Jensen.
>-
>-        * Target.pri:
>-
>-2013-08-08  Alex Christensen  <achristensen@apple.com>
>-
>-        Link to correct DirectX libraries for Win64 ANGLE build.
>-        https://bugs.webkit.org/show_bug.cgi?id=119600
>-
>-        Reviewed by Brent Fulgham.
>-
>-        * ANGLE.vcxproj/DirectX32.props: Added with x86 DirectX library directory.
>-        * ANGLE.vcxproj/DirectX64.props: Added with x64 DirectX library directory.
>-        * ANGLE.vcxproj/libEGL.vcxproj:
>-        * ANGLE.vcxproj/libGLESv2.vcxproj:
>-        Use DirectX32.props and DirectX64.props.
>-        * ANGLE.vcxproj/libEGLCommon.props:
>-        * ANGLE.vcxproj/libGLESv2Common.props:
>-        Removed DirectX library directory.
>-
>-2013-07-23  David Farler  <dfarler@apple.com>
>-
>-        Provide optional OTHER_CFLAGS, OTHER_CPPFLAGS, OTHER_LDFLAGS additions for building with ASAN
>-        https://bugs.webkit.org/show_bug.cgi?id=117762
>-
>-        Reviewed by Mark Rowe.
>-
>-        * Configurations/DebugRelease.xcconfig:
>-        Add ASAN_OTHER_CFLAGS, CPLUSPLUSFLAGS.
>-
>-2013-08-06  Zan Dobersek  <zdobersek@igalia.com>
>-
>-        webkit-gtk fails to build with bison-3.0
>-        https://bugs.webkit.org/show_bug.cgi?id=119373
>-
>-        Reviewed by Gustavo Noronha Silva.
>-
>-        * GNUmakefile.am: Stop relying on generated glslang_tab.(cpp|h) and glslang.cpp sources as Bison 3.0
>-        produces non-compilable source code. Instead, compile these pregenerated files as they're included in
>-        the tree. Originally, the ANGLE source tree provides these files as generated by Bison 2.7, but they're
>-        at the moment regenerated with Bison 2.3 when the third-party ANGLE source is being updated.
>-
>-2013-08-05  Alex Christensen  <achristensen@apple.com>
>-
>-        Added optimizations to Windows ANGLE builds.
>-        https://bugs.webkit.org/show_bug.cgi?id=119500
>-
>-        Reviewed by Brent Fulgham.
>-
>-        * ANGLE.vcxproj/ANGLERelease.props: Added.
>-        * ANGLE.vcxproj/libEGL.vcxproj:
>-        * ANGLE.vcxproj/libGLESv2.vcxproj:
>-        * ANGLE.vcxproj/preprocessor.vcxproj:
>-        * ANGLE.vcxproj/translator_common.vcxproj:
>-        * ANGLE.vcxproj/translator_glsl.vcxproj:
>-        * ANGLE.vcxproj/translator_hlsl.vcxproj:
>-        Use ANGLERelease.props for Release, Release_WinCairo, and Production configurations.
>-
>-2013-08-02  Alex Christensen  <achristensen@apple.com>
>-
>-        Soft link ANGLE on Windows.
>-        https://bugs.webkit.org/show_bug.cgi?id=119452
>-
>-        Reviewed by Dean Jackson.
>-
>-        * ANGLE.vcxproj/libEGL.vcxproj:
>-        * ANGLE.vcxproj/libEGL.vcxproj.filters:
>-        * ANGLE.vcxproj/libGLESv2.vcxproj:
>-        * ANGLE.vcxproj/libGLESv2.vcxproj.filters:
>-        Added soft linking headers.
>-        * ANGLE.vcxproj/libEGLCommon.props:
>-        * ANGLE.vcxproj/libGLESv2Common.props:
>-        * ANGLE.vcxproj/translatorCommon.props:
>-        Added ANGLE_WEBKIT_WIN macro definition for egl.h and gl2.h.
>-        * include/EGL/egl.h:
>-        * include/GLES2/gl2.h:
>-        Conditionally include soft linking headers based on ANGLE_WEBKIT_WIN macro.
>-        * include/EGL/eglsoftlinking.h: Added.
>-        * include/GLES2/gl2softlinking.h: Added.
>-
>-2013-08-01  Alex Christensen  <achristensen@apple.com>
>-
>-        Fixed wrong static_casting in ANGLE from r153064.
>-        https://bugs.webkit.org/show_bug.cgi?id=119296
>-
>-        Reviewed by Dean Jackson.
>-
>-        * src/compiler/Intermediate.cpp:
>-        (TIntermediate::promoteConstantUnion):
>-        Undid erroneous static_cast change.
>-        * src/compiler/intermediate.h:
>-        (TIntermConstantUnion::getIConst):
>-        (TIntermConstantUnion::getFConst):
>-        (TIntermConstantUnion::getBConst):
>-        Made getters use size_t instead of int.
>-
>-2013-07-29  Carlos Garcia Campos  <cgarcia@igalia.com>
>-
>-        Unreviewed. Fix make distcheck.
>-
>-        * GNUmakefile.am: Add missing header files to compilation.
>-
>-2013-07-29  Alex Christensen  <achristensen@apple.com>
>-
>-        Separated translator into preprocessor, translator_common,
>-        translator_hlsl (for libGLESv2), and translator_glsl
>-        (for ANGLEWebKitBridge).
>-        https://bugs.webkit.org/show_bug.cgi?id=119221
>-
>-        Reviewed by Brent Fulgham.
>-
>-        * ANGLE.vcxproj/ANGLEGenerated.vcxproj:
>-        Removed unused preprocessor definitions.
>-        * ANGLE.vcxproj/libEGL.vcxproj:
>-        * ANGLE.vcxproj/libGLESv2.vcxproj:
>-        Removed dependency on removed translator project.
>-        * ANGLE.vcxproj/libGLESv2Common.props:
>-        Link to translator_hlsl libraries.
>-        * ANGLE.vcxproj/preprocessor.vcxproj: Added.
>-        * ANGLE.vcxproj/preprocessor.vcxproj.filters: Added.
>-        * ANGLE.vcxproj/translator.vcxproj: Removed.
>-        * ANGLE.vcxproj/translator.vcxproj.filters: Removed.
>-        * ANGLE.vcxproj/translator_common.vcxproj: Added.
>-        * ANGLE.vcxproj/translator_common.vcxproj.filters: Added.
>-        * ANGLE.vcxproj/translator_glsl.vcxproj: Added.
>-        * ANGLE.vcxproj/translator_glsl.vcxproj.filters: Added.
>-        * ANGLE.vcxproj/translator_hlsl.vcxproj: Added.
>-        * ANGLE.vcxproj/translator_hlsl.vcxproj.filters: Added.
>-
>-2013-07-26  Alex Christensen  <achristensen@apple.com>
>-
>-        Added module definition file for building libEGL.
>-        https://bugs.webkit.org/show_bug.cgi?id=119162
>-
>-        Reviewed by Brent Fulgham.
>-
>-        * ANGLE.vcxproj/libEGLCommon.props: Added reference to libEGL.def.
>-
>-2013-07-25  Alex Christensen  <achristensen@apple.com>
>-
>-        Made Windows build system for ANGLE and removed existing broken build system.
>-        Removed empty src/libGLESv2/shaders directory and old README files.
>-        https://bugs.webkit.org/show_bug.cgi?id=119103
>-
>-        Reviewed by Brent Fulgham.
>-
>-        * ANGLE.vcxproj: Added.
>-        * ANGLE.vcxproj/ANGLEGenerated.vcxproj: Added.
>-        * ANGLE.vcxproj/ANGLEGenerated.vcxproj.filters: Added.
>-        * ANGLE.vcxproj/libEGL.vcxproj: Added.
>-        * ANGLE.vcxproj/libEGL.vcxproj.filters: Added.
>-        * ANGLE.vcxproj/libEGLCommon.props: Added.
>-        * ANGLE.vcxproj/libGLESv2.vcxproj: Added.
>-        * ANGLE.vcxproj/libGLESv2.vcxproj.filters: Added.
>-        * ANGLE.vcxproj/libGLESv2Common.props: Added.
>-        * ANGLE.vcxproj/translator.vcxproj: Added.
>-        * ANGLE.vcxproj/translator.vcxproj.filters: Added.
>-        * ANGLE.vcxproj/translatorCommon.props: Added.
>-        * src/ANGLE.sln: Removed.
>-        * src/compiler/preprocessor/preprocessor.vcxproj: Removed.
>-        * src/compiler/preprocessor/preprocessor.vcxproj.filters: Removed.
>-        * src/compiler/translator_common.vcxproj: Removed.
>-        * src/compiler/translator_common.vcxproj.filters: Removed.
>-        * src/compiler/translator_hlsl.vcxproj: Removed.
>-        * src/compiler/translator_hlsl.vcxproj.filters: Removed.
>-        * src/libEGL/README: Removed.
>-        * src/libEGL/libEGL.vcxproj: Removed.
>-        * src/libEGL/libEGL.vcxproj.filters: Removed.
>-        * src/libGLESv2/README: Removed.
>-        * src/libGLESv2/libGLESv2.vcxproj: Removed.
>-        * src/libGLESv2/libGLESv2.vcxproj.filters: Removed.
>-        * src/libGLESv2/shaders: Removed.
>-
>-2013-07-24  Alex Christensen  <achristensen@apple.com>
>-
>-        Generate derived files in ANGLE at build time rather than when updating from upstream.
>-        https://bugs.webkit.org/show_bug.cgi?id=118872
>-
>-        Reviewed by Mark Rowe.
>-
>-        * ANGLE.xcodeproj/project.pbxproj: Made Derived Sources target which calls DerivedSources.make,
>-        moved generated files into Derived Sources group.
>-        * DerivedSources.make: Added.
>-
>-2013-07-24  Zan Dobersek  <zdobersek@igalia.com>
>-
>-        Unreviewed. Setting the svn:eol-style=native property on the ANGLE.sln file.
>-
>-        * src/ANGLE.sln: Added property svn:eol-style.
>-
>-2013-07-24  Gabor Abraham  <abrhm@inf.u-szeged.hu>
>-
>-        [Qt] Buildfix after r153064. Add Uniform files to the Target.pri.
>-
>-        Reviewed by Csaba OsztrogonÃ¡c.
>-
>-        * Target.pri:
>-
>-2013-07-23  Alex Christensen  <achristensen@apple.com>
>-
>-        Updated ANGLE to latest git commit (047373aa3eb408be62be52ade840fa5f11e72337).
>-        Added missing ANGLE files except unused tests, extensions, samples, build, and .git directories.
>-        Ran Bison after making some changes to fix compile errors (see below).
>-
>-        https://bugs.webkit.org/show_bug.cgi?id=118550
>-
>-        Reviewed by Dean Jackson.
>-
>-        * ANGLE.plist: Updated from svn to git.
>-        * ANGLE.xcodeproj/project.pbxproj: Renamed DetectRecursion to DetectCallDepth.
>-        * AUTHORS: Added.
>-        * CONTRIBUTORS: Added.
>-        * DEPS: Added.
>-        * GNUmakefile.am: Renamed DetectRecursion to DetectCallDepth and added Uniform.cpp.
>-        * LICENSE: Added.
>-        * README.chromium: Added.
>-        * Target.pri: Renamed DetectRecursion to DetectCallDepth.
>-        * codereview.settings: Added.
>-        * include/EGL/eglext.h:
>-        * include/GLES2/gl2ext.h:
>-        * include/GLSLANG/ShaderLang.h:
>-        * src/ANGLE.sln: Added.
>-        * src/build_angle.gyp: Added.
>-        * src/build_angle.gypi: Added.
>-        * src/common/RefCountObject.cpp:
>-        * src/common/angleutils.h:
>-        (ArraySize):
>-        (SafeRelease):
>-        * src/common/debug.cpp:
>-        * src/common/debug.h:
>-        * src/common/system.h:
>-        * src/common/version.h:
>-        * src/compiler/64bit-lexer-safety.patch: Added.
>-        * src/compiler/BaseTypes.h:
>-        (getQualifierString):
>-        * src/compiler/CodeGenHLSL.cpp:
>-        (ConstructCompiler):
>-        * src/compiler/Common.h:
>-        * src/compiler/Compiler.cpp:
>-        (TCompiler::TCompiler):
>-        (TCompiler::Init):
>-        (TCompiler::compile):
>-        (TCompiler::InitBuiltInSymbolTable):
>-        (TCompiler::detectCallDepth):
>-        (TCompiler::limitExpressionComplexity):
>-        (TCompiler::getResources):
>-        * src/compiler/ConstantUnion.h:
>-        (ConstantUnion::ConstantUnion):
>-        * src/compiler/DetectCallDepth.cpp: Added.
>-        (DetectCallDepth::FunctionNode::FunctionNode):
>-        (DetectCallDepth::FunctionNode::getName):
>-        (DetectCallDepth::FunctionNode::addCallee):
>-        (DetectCallDepth::FunctionNode::detectCallDepth):
>-        (DetectCallDepth::FunctionNode::reset):
>-        (DetectCallDepth::DetectCallDepth):
>-        (DetectCallDepth::~DetectCallDepth):
>-        (DetectCallDepth::visitAggregate):
>-        (DetectCallDepth::checkExceedsMaxDepth):
>-        (DetectCallDepth::resetFunctionNodes):
>-        (DetectCallDepth::detectCallDepthForFunction):
>-        (DetectCallDepth::detectCallDepth):
>-        (DetectCallDepth::findFunctionByName):
>-        * src/compiler/DetectCallDepth.h: Added.
>-        (DetectCallDepth::getInfoSink):
>-        * src/compiler/DetectRecursion.cpp: Removed.
>-        * src/compiler/DetectRecursion.h: Removed.
>-        * src/compiler/Diagnostics.cpp:
>-        (TDiagnostics::writeInfo):
>-        * src/compiler/ForLoopUnroll.cpp:
>-        (ForLoopUnroll::evaluateIntConstant):
>-        * src/compiler/InfoSink.cpp:
>-        (TInfoSinkBase::prefix):
>-        (TInfoSinkBase::location):
>-        (TInfoSinkBase::message):
>-        * src/compiler/InfoSink.h:
>-        * src/compiler/Initialize.cpp:
>-        (InsertBuiltInFunctions):
>-        (IdentifyBuiltIns):
>-        (InitExtensionBehavior):
>-        * src/compiler/Initialize.h:
>-        * src/compiler/Intermediate.cpp:
>-        (TIntermediate::addSymbol):
>-        (TIntermediate::addBinaryMath):
>-        (TIntermediate::addAssign):
>-        (TIntermediate::addIndex):
>-        (TIntermediate::addUnaryMath):
>-        (TIntermediate::setAggregateOperator):
>-        (TIntermediate::addConversion):
>-        (TIntermediate::growAggregate):
>-        (TIntermediate::makeAggregate):
>-        (TIntermediate::addSelection):
>-        (TIntermediate::addComma):
>-        (TIntermediate::addConstantUnion):
>-        (TIntermediate::addSwizzle):
>-        (TIntermediate::addLoop):
>-        (TIntermediate::addBranch):
>-        (TIntermUnary::promote):
>-        (TIntermBinary::promote):
>-        (CompareStruct):
>-        (CompareStructure):
>-        (TIntermConstantUnion::fold): Added implied static_casts to fix compiling errors on Mac.
>-        (TIntermediate::promoteConstantUnion):
>-        * src/compiler/OutputGLSL.cpp:
>-        (TOutputGLSL::visitSymbol):
>-        * src/compiler/OutputGLSL.h:
>-        * src/compiler/OutputGLSLBase.cpp:
>-        (TOutputGLSLBase::writeVariableType):
>-        (TOutputGLSLBase::writeConstantUnion):
>-        (TOutputGLSLBase::visitBinary):
>-        (TOutputGLSLBase::visitAggregate):
>-        (TOutputGLSLBase::getTypeName):
>-        (TOutputGLSLBase::structDeclared):
>-        (TOutputGLSLBase::declareStruct):
>-        * src/compiler/OutputGLSLBase.h:
>-        * src/compiler/OutputHLSL.cpp:
>-        (sh::OutputHLSL::OutputHLSL):
>-        (sh::OutputHLSL::getUniforms):
>-        (sh::OutputHLSL::header):
>-        (sh::OutputHLSL::visitSymbol):
>-        (sh::OutputHLSL::visitBinary):
>-        (sh::OutputHLSL::visitAggregate):
>-        (sh::OutputHLSL::visitSelection):
>-        (sh::OutputHLSL::visitLoop):
>-        (sh::OutputHLSL::handleExcessiveLoop):
>-        (sh::OutputHLSL::argumentString):
>-        (sh::OutputHLSL::typeString):
>-        (sh::OutputHLSL::textureString):
>-        (sh::OutputHLSL::initializer):
>-        (sh::OutputHLSL::addConstructor):
>-        (sh::OutputHLSL::writeConstantUnion):
>-        (sh::OutputHLSL::decorateUniform):
>-        (sh::OutputHLSL::decorateField):
>-        (sh::OutputHLSL::registerString):
>-        (sh::OutputHLSL::samplerRegister):
>-        (sh::OutputHLSL::uniformRegister):
>-        (sh::OutputHLSL::declareUniform):
>-        (sh::OutputHLSL::glVariableType):
>-        (sh::OutputHLSL::glVariablePrecision):
>-        * src/compiler/OutputHLSL.h:
>-        * src/compiler/ParseHelper.cpp:
>-        (TParseContext::parseVectorFields):
>-        (TParseContext::parseMatrixFields):
>-        (TParseContext::error):
>-        (TParseContext::warning):
>-        (TParseContext::assignError):
>-        (TParseContext::unaryOpError):
>-        (TParseContext::binaryOpError):
>-        (TParseContext::precisionErrorCheck):
>-        (TParseContext::lValueErrorCheck):
>-        (TParseContext::globalErrorCheck):
>-        (TParseContext::reservedErrorCheck):
>-        (TParseContext::constructorErrorCheck):
>-        (TParseContext::voidErrorCheck):
>-        (TParseContext::boolErrorCheck):
>-        (TParseContext::samplerErrorCheck):
>-        (TParseContext::structQualifierErrorCheck):
>-        (TParseContext::parameterSamplerErrorCheck):
>-        (TParseContext::containsSampler):
>-        (TParseContext::arraySizeErrorCheck):
>-        (TParseContext::arrayQualifierErrorCheck):
>-        (TParseContext::arrayTypeErrorCheck):
>-        (TParseContext::arrayErrorCheck):
>-        (TParseContext::nonInitConstErrorCheck):
>-        (TParseContext::nonInitErrorCheck):
>-        (TParseContext::paramErrorCheck):
>-        (TParseContext::extensionErrorCheck):
>-        (TParseContext::isExtensionEnabled):
>-        Replaced auto with std::map<std::string, TBehavior>::const_iterator to fix Qt and EFL compiling errors.
>-        (TParseContext::findFunction):
>-        (TParseContext::executeInitializer):
>-        (TParseContext::addConstructor):
>-        (TParseContext::constructBuiltIn):
>-        (TParseContext::constructStruct):
>-        (TParseContext::addConstVectorNode):
>-        (TParseContext::addConstMatrixNode):
>-        (TParseContext::addConstArrayNode):
>-        (TParseContext::addConstStruct):
>-        (TParseContext::enterStructDeclaration):
>-        (TParseContext::structNestingErrorCheck):
>-        (TParseContext::addIndexExpression):
>-        * src/compiler/ParseHelper.h:
>-        (TParseContext::TParseContext):
>-        (TParseContext::pragma):
>-        * src/compiler/PoolAlloc.cpp:
>-        (TPoolAllocator::allocate):
>-        * src/compiler/ShHandle.h:
>-        (TShHandleBase::getAsTranslatorHLSL):
>-        * src/compiler/ShaderLang.cpp:
>-        (ShInitBuiltInResources):
>-        (ShGetInfoPointer):
>-        * src/compiler/SymbolTable.cpp:
>-        (TType::TType):
>-        (TType::buildMangledName):
>-        (TType::getObjectSize):
>-        (TStructure::containsArrays):
>-        (TStructure::buildMangledName):
>-        (TStructure::calculateObjectSize):
>-        (TStructure::calculateDeepestNesting):
>-        (TSymbolTableLevel::relateToExtension):
>-        * src/compiler/SymbolTable.h:
>-        (TSymbol::relateToExtension):
>-        (TSymbol::getExtension):
>-        (TVariable::TVariable):
>-        (TVariable::setQualifier):
>-        (TVariable::shareConstPointer):
>-        (TSymbolTableLevel::insert):
>-        (TSymbolTable::insertConstInt):
>-        (TSymbolTable::insertBuiltIn):
>-        * src/compiler/TranslatorHLSL.cpp:
>-        (TranslatorHLSL::TranslatorHLSL):
>-        (TranslatorHLSL::translate):
>-        * src/compiler/TranslatorHLSL.h:
>-        (TranslatorHLSL::getAsTranslatorHLSL):
>-        (TranslatorHLSL::getUniforms):
>-        * src/compiler/Types.h: Removed enum bit fields to fix gcc compiler errors.
>-        (TField::TField):
>-        (TField::type):
>-        (TField::name):
>-        (NewPoolTFieldList):
>-        (TStructure::TStructure):
>-        (TStructure::name):
>-        (TStructure::fields):
>-        (TStructure::mangledName):
>-        (TStructure::objectSize):
>-        (TStructure::deepestNesting):
>-        (TType::TType):
>-        (TType::elementRegisterCount):
>-        (TType::totalRegisterCount):
>-        (TType::clearArrayness):
>-        (TType::getStruct):
>-        (TType::setStruct):
>-        (TType::getMangledName):
>-        (TType::getDeepestStructNesting):
>-        (TType::isStructureContainingArrays):
>-        (TPublicType::setBasic):
>-        * src/compiler/Uniform.cpp: Added.
>-        (sh::Uniform::Uniform):
>-        * src/compiler/Uniform.h: Added.
>-        * src/compiler/VariableInfo.cpp:
>-        (getUserDefinedVariableInfo):
>-        * src/compiler/glslang.l:
>-        * src/compiler/glslang.y: Moved YYLTYPE definition into %union to work with Bison 2.3.
>-        * src/compiler/glslang_lex.cpp:
>-        (yy_get_previous_state):
>-        (yy_try_NUL_trans):
>-        (yyget_lloc):
>-        (yyset_lloc):
>-        (string_input):
>-        (check_type):
>-        (reserved_word):
>-        (glslang_scan):
>-        * src/compiler/glslang_tab.cpp:
>-        (yyerror):
>-        * src/compiler/glslang_tab.h:
>-        * src/compiler/intermOut.cpp:
>-        (TOutputTraverser::visitUnary):
>-        (TOutputTraverser::visitAggregate):
>-        (TOutputTraverser::visitConstantUnion):
>-        * src/compiler/intermediate.h:
>-        (TIntermNode::TIntermNode):
>-        (TIntermNode::~TIntermNode):
>-        (TIntermNode::getLine):
>-        (TIntermNode::setLine):
>-        (TIntermNode::getAsLoopNode):
>-        (TIntermTyped::totalRegisterCount):
>-        (TIntermTyped::elementRegisterCount):
>-        (TIntermTyped::getArraySize):
>-        (TIntermConstantUnion::getIConst):
>-        (TIntermConstantUnion::getFConst):
>-        (TIntermConstantUnion::getBConst):
>-        (TIntermAggregate::TIntermAggregate):
>-        (TIntermTraverser::TIntermTraverser):
>-        (TIntermTraverser::getMaxDepth):
>-        (TIntermTraverser::incrementDepth):
>-        * src/compiler/localintermediate.h:
>-        * src/compiler/parseConst.cpp:
>-        (TConstTraverser::visitSymbol):
>-        (TConstTraverser::visitBinary):
>-        (TConstTraverser::visitUnary):
>-        (TConstTraverser::visitAggregate):
>-        (TConstTraverser::visitSelection):
>-        (TConstTraverser::visitConstantUnion):
>-        (TConstTraverser::visitLoop):
>-        (TConstTraverser::visitBranch):
>-        (TIntermediate::parseConstTree):
>-        * src/compiler/preprocessor/64bit-tokenizer-safety.patch: Added.
>-        * src/compiler/preprocessor/Tokenizer.cpp:
>-        (yy_get_previous_state):
>-        (yy_try_NUL_trans):
>-        * src/compiler/preprocessor/Tokenizer.l:
>-        * src/compiler/preprocessor/preprocessor.vcxproj: Added.
>-        * src/compiler/preprocessor/preprocessor.vcxproj.filters: Added.
>-        * src/compiler/timing/RestrictVertexShaderTiming.cpp:
>-        (RestrictVertexShaderTiming::visitSymbol):
>-        * src/compiler/translator_common.vcxproj: Added.
>-        * src/compiler/translator_common.vcxproj.filters: Added.
>-        * src/compiler/translator_hlsl.vcxproj: Added.
>-        * src/compiler/translator_hlsl.vcxproj.filters: Added.
>-        * src/libEGL/Config.cpp: Added.
>-        (egl::Config::Config):
>-        (egl::Config::getHandle):
>-        (egl::SortConfig::SortConfig):
>-        (egl::SortConfig::scanForWantedComponents):
>-        (egl::SortConfig::wantedComponentsSize):
>-        (egl::SortConfig::operator()):
>-        (egl::ConfigSet::ConfigSet):
>-        (egl::ConfigSet::add):
>-        (egl::ConfigSet::size):
>-        (egl::ConfigSet::getConfigs):
>-        (egl::ConfigSet::get):
>-        * src/libEGL/Config.h: Added.
>-        * src/libEGL/Display.cpp: Added.
>-        (egl::Display::getDisplay):
>-        (egl::Display::Display):
>-        (egl::Display::~Display):
>-        (egl::Display::initialize):
>-        (egl::Display::terminate):
>-        (egl::Display::getConfigs):
>-        (egl::Display::getConfigAttrib):
>-        (egl::Display::createWindowSurface):
>-        (egl::Display::createOffscreenSurface):
>-        (egl::Display::createContext):
>-        (egl::Display::restoreLostDevice):
>-        (egl::Display::destroySurface):
>-        (egl::Display::destroyContext):
>-        (egl::Display::notifyDeviceLost):
>-        (egl::Display::recreateSwapChains):
>-        (egl::Display::isInitialized):
>-        (egl::Display::isValidConfig):
>-        (egl::Display::isValidContext):
>-        (egl::Display::isValidSurface):
>-        (egl::Display::hasExistingWindowSurface):
>-        (egl::Display::initExtensionString):
>-        (egl::Display::getExtensionString):
>-        (egl::Display::initVendorString):
>-        (egl::Display::getVendorString):
>-        * src/libEGL/Display.h: Added.
>-        (egl::Display::getRenderer):
>-        * src/libEGL/Surface.cpp: Added.
>-        (egl::Surface::Surface):
>-        (egl::Surface::~Surface):
>-        (egl::Surface::initialize):
>-        (egl::Surface::release):
>-        (egl::Surface::resetSwapChain):
>-        (egl::Surface::resizeSwapChain):
>-        (egl::Surface::swapRect):
>-        (egl::Surface::getWindowHandle):
>-        (egl::SurfaceWindowProc):
>-        (egl::Surface::subclassWindow):
>-        (egl::Surface::unsubclassWindow):
>-        (egl::Surface::checkForOutOfDateSwapChain):
>-        (egl::Surface::swap):
>-        (egl::Surface::postSubBuffer):
>-        (egl::Surface::getWidth):
>-        (egl::Surface::getHeight):
>-        (egl::Surface::isPostSubBufferSupported):
>-        (egl::Surface::getSwapChain):
>-        (egl::Surface::setSwapInterval):
>-        (egl::Surface::getTextureFormat):
>-        (egl::Surface::getTextureTarget):
>-        (egl::Surface::setBoundTexture):
>-        (egl::Surface::getBoundTexture):
>-        (egl::Surface::getFormat):
>-        * src/libEGL/Surface.h: Added.
>-        * src/libEGL/libEGL.cpp: Added.
>-        (validateDisplay):
>-        (validateConfig):
>-        (validateContext):
>-        (validateSurface):
>-        * src/libEGL/libEGL.def: Added.
>-        * src/libEGL/libEGL.rc: Added.
>-        * src/libEGL/libEGL.vcxproj: Added.
>-        * src/libEGL/libEGL.vcxproj.filters: Added.
>-        * src/libEGL/main.cpp: Added.
>-        (DllMain):
>-        (egl::setCurrentError):
>-        (egl::getCurrentError):
>-        (egl::setCurrentAPI):
>-        (egl::getCurrentAPI):
>-        (egl::setCurrentDisplay):
>-        (egl::getCurrentDisplay):
>-        (egl::setCurrentDrawSurface):
>-        (egl::getCurrentDrawSurface):
>-        (egl::setCurrentReadSurface):
>-        (egl::getCurrentReadSurface):
>-        (egl::error):
>-        * src/libEGL/main.h: Added.
>-        (egl::error):
>-        (egl::success):
>-        * src/libEGL/resource.h: Added.
>-        * src/libGLESv2/BinaryStream.h: Added.
>-        (gl::BinaryInputStream::BinaryInputStream):
>-        (gl::BinaryInputStream::read):
>-        (gl::BinaryInputStream::skip):
>-        (gl::BinaryInputStream::offset):
>-        (gl::BinaryInputStream::error):
>-        (gl::BinaryInputStream::endOfStream):
>-        (gl::BinaryOutputStream::BinaryOutputStream):
>-        (gl::BinaryOutputStream::write):
>-        (gl::BinaryOutputStream::length):
>-        (gl::BinaryOutputStream::data):
>-        * src/libGLESv2/Buffer.cpp: Added.
>-        (gl::Buffer::Buffer):
>-        (gl::Buffer::~Buffer):
>-        (gl::Buffer::bufferData):
>-        (gl::Buffer::bufferSubData):
>-        (gl::Buffer::getStorage):
>-        (gl::Buffer::size):
>-        (gl::Buffer::usage):
>-        (gl::Buffer::getStaticVertexBuffer):
>-        (gl::Buffer::getStaticIndexBuffer):
>-        (gl::Buffer::invalidateStaticData):
>-        (gl::Buffer::promoteStaticUsage):
>-        * src/libGLESv2/Buffer.h: Added.
>-        * src/libGLESv2/Context.cpp: Added.
>-        (gl::makeStaticString):
>-        (gl::Context::Context):
>-        (gl::Context::~Context):
>-        (gl::Context::makeCurrent):
>-        (gl::Context::markContextLost):
>-        (gl::Context::isContextLost):
>-        (gl::Context::setClearColor):
>-        (gl::Context::setClearDepth):
>-        (gl::Context::setClearStencil):
>-        (gl::Context::setCullFace):
>-        (gl::Context::isCullFaceEnabled):
>-        (gl::Context::setCullMode):
>-        (gl::Context::setFrontFace):
>-        (gl::Context::setDepthTest):
>-        (gl::Context::isDepthTestEnabled):
>-        (gl::Context::setDepthFunc):
>-        (gl::Context::setDepthRange):
>-        (gl::Context::setBlend):
>-        (gl::Context::isBlendEnabled):
>-        (gl::Context::setBlendFactors):
>-        (gl::Context::setBlendColor):
>-        (gl::Context::setBlendEquation):
>-        (gl::Context::setStencilTest):
>-        (gl::Context::isStencilTestEnabled):
>-        (gl::Context::setStencilParams):
>-        (gl::Context::setStencilBackParams):
>-        (gl::Context::setStencilWritemask):
>-        (gl::Context::setStencilBackWritemask):
>-        (gl::Context::setStencilOperations):
>-        (gl::Context::setStencilBackOperations):
>-        (gl::Context::setPolygonOffsetFill):
>-        (gl::Context::isPolygonOffsetFillEnabled):
>-        (gl::Context::setPolygonOffsetParams):
>-        (gl::Context::setSampleAlphaToCoverage):
>-        (gl::Context::isSampleAlphaToCoverageEnabled):
>-        (gl::Context::setSampleCoverage):
>-        (gl::Context::isSampleCoverageEnabled):
>-        (gl::Context::setSampleCoverageParams):
>-        (gl::Context::setScissorTest):
>-        (gl::Context::isScissorTestEnabled):
>-        (gl::Context::setDither):
>-        (gl::Context::isDitherEnabled):
>-        (gl::Context::setLineWidth):
>-        (gl::Context::setGenerateMipmapHint):
>-        (gl::Context::setFragmentShaderDerivativeHint):
>-        (gl::Context::setViewportParams):
>-        (gl::Context::setScissorParams):
>-        (gl::Context::setColorMask):
>-        (gl::Context::setDepthMask):
>-        (gl::Context::setActiveSampler):
>-        (gl::Context::getReadFramebufferHandle):
>-        (gl::Context::getDrawFramebufferHandle):
>-        (gl::Context::getRenderbufferHandle):
>-        (gl::Context::getArrayBufferHandle):
>-        (gl::Context::getActiveQuery):
>-        (gl::Context::setEnableVertexAttribArray):
>-        (gl::Context::getVertexAttribState):
>-        (gl::Context::setVertexAttribState):
>-        (gl::Context::getVertexAttribPointer):
>-        (gl::Context::setPackAlignment):
>-        (gl::Context::getPackAlignment):
>-        (gl::Context::setUnpackAlignment):
>-        (gl::Context::getUnpackAlignment):
>-        (gl::Context::setPackReverseRowOrder):
>-        (gl::Context::getPackReverseRowOrder):
>-        (gl::Context::createBuffer):
>-        (gl::Context::createProgram):
>-        (gl::Context::createShader):
>-        (gl::Context::createTexture):
>-        (gl::Context::createRenderbuffer):
>-        (gl::Context::createFramebuffer):
>-        (gl::Context::createFence):
>-        (gl::Context::createQuery):
>-        (gl::Context::deleteBuffer):
>-        (gl::Context::deleteShader):
>-        (gl::Context::deleteProgram):
>-        (gl::Context::deleteTexture):
>-        (gl::Context::deleteRenderbuffer):
>-        (gl::Context::deleteFramebuffer):
>-        (gl::Context::deleteFence):
>-        (gl::Context::deleteQuery):
>-        (gl::Context::getBuffer):
>-        (gl::Context::getShader):
>-        (gl::Context::getProgram):
>-        (gl::Context::getTexture):
>-        (gl::Context::getRenderbuffer):
>-        (gl::Context::getReadFramebuffer):
>-        (gl::Context::getDrawFramebuffer):
>-        (gl::Context::bindArrayBuffer):
>-        (gl::Context::bindElementArrayBuffer):
>-        (gl::Context::bindTexture2D):
>-        (gl::Context::bindTextureCubeMap):
>-        (gl::Context::bindReadFramebuffer):
>-        (gl::Context::bindDrawFramebuffer):
>-        (gl::Context::bindRenderbuffer):
>-        (gl::Context::useProgram):
>-        (gl::Context::linkProgram):
>-        (gl::Context::setProgramBinary):
>-        (gl::Context::beginQuery):
>-        (gl::Context::endQuery):
>-        (gl::Context::setFramebufferZero):
>-        (gl::Context::setRenderbufferStorage):
>-        (gl::Context::getFramebuffer):
>-        (gl::Context::getFence):
>-        (gl::Context::getQuery):
>-        (gl::Context::getArrayBuffer):
>-        (gl::Context::getElementArrayBuffer):
>-        (gl::Context::getCurrentProgramBinary):
>-        (gl::Context::getTexture2D):
>-        (gl::Context::getTextureCubeMap):
>-        (gl::Context::getSamplerTexture):
>-        (gl::Context::getBooleanv):
>-        (gl::Context::getFloatv):
>-        (gl::Context::getIntegerv):
>-        (gl::Context::getQueryParameterInfo):
>-        (gl::Context::applyRenderTarget):
>-        (gl::Context::applyState):
>-        (gl::Context::applyShaders):
>-        (gl::Context::applyTextures):
>-        (gl::Context::readPixels):
>-        (gl::Context::clear):
>-        (gl::Context::drawArrays):
>-        (gl::Context::drawElements):
>-        (gl::Context::sync):
>-        (gl::Context::recordInvalidEnum):
>-        (gl::Context::recordInvalidValue):
>-        (gl::Context::recordInvalidOperation):
>-        (gl::Context::recordOutOfMemory):
>-        (gl::Context::recordInvalidFramebufferOperation):
>-        (gl::Context::getError):
>-        (gl::Context::getResetStatus):
>-        (gl::Context::isResetNotificationEnabled):
>-        (gl::Context::getMajorShaderModel):
>-        (gl::Context::getMaximumPointSize):
>-        (gl::Context::getMaximumCombinedTextureImageUnits):
>-        (gl::Context::getMaxSupportedSamples):
>-        (gl::Context::getMaximumRenderTargets):
>-        (gl::Context::supportsEventQueries):
>-        (gl::Context::supportsOcclusionQueries):
>-        (gl::Context::supportsBGRATextures):
>-        (gl::Context::supportsDXT1Textures):
>-        (gl::Context::supportsDXT3Textures):
>-        (gl::Context::supportsDXT5Textures):
>-        (gl::Context::supportsFloat32Textures):
>-        (gl::Context::supportsFloat32LinearFilter):
>-        (gl::Context::supportsFloat32RenderableTextures):
>-        (gl::Context::supportsFloat16Textures):
>-        (gl::Context::supportsFloat16LinearFilter):
>-        (gl::Context::supportsFloat16RenderableTextures):
>-        (gl::Context::getMaximumRenderbufferDimension):
>-        (gl::Context::getMaximumTextureDimension):
>-        (gl::Context::getMaximumCubeTextureDimension):
>-        (gl::Context::getMaximumTextureLevel):
>-        (gl::Context::supportsLuminanceTextures):
>-        (gl::Context::supportsLuminanceAlphaTextures):
>-        (gl::Context::supportsDepthTextures):
>-        (gl::Context::supports32bitIndices):
>-        (gl::Context::supportsNonPower2Texture):
>-        (gl::Context::supportsInstancing):
>-        (gl::Context::supportsTextureFilterAnisotropy):
>-        (gl::Context::getTextureMaxAnisotropy):
>-        (gl::Context::getCurrentReadFormatType):
>-        (gl::Context::detachBuffer):
>-        (gl::Context::detachTexture):
>-        (gl::Context::detachFramebuffer):
>-        (gl::Context::detachRenderbuffer):
>-        (gl::Context::getIncompleteTexture):
>-        (gl::Context::skipDraw):
>-        (gl::Context::setVertexAttrib):
>-        (gl::Context::setVertexAttribDivisor):
>-        (gl::Context::initExtensionString):
>-        (gl::Context::getExtensionString):
>-        (gl::Context::initRendererString):
>-        (gl::Context::getRendererString):
>-        (gl::Context::blitFramebuffer):
>-        * src/libGLESv2/Context.h: Added.
>-        (gl::VertexAttribute::VertexAttribute):
>-        (gl::VertexAttribute::typeSize):
>-        (gl::VertexAttribute::stride):
>-        * src/libGLESv2/Fence.cpp: Added.
>-        (gl::Fence::Fence):
>-        (gl::Fence::~Fence):
>-        (gl::Fence::isFence):
>-        (gl::Fence::setFence):
>-        (gl::Fence::testFence):
>-        (gl::Fence::finishFence):
>-        (gl::Fence::getFenceiv):
>-        * src/libGLESv2/Fence.h: Added.
>-        * src/libGLESv2/Float16ToFloat32.cpp: Added.
>-        (gl::float16ToFloat32):
>-        * src/libGLESv2/Float16ToFloat32.py: Added.
>-        (convertMantissa):
>-        (convertExponent):
>-        (convertOffset):
>-        * src/libGLESv2/Framebuffer.cpp: Added.
>-        (gl::Framebuffer::Framebuffer):
>-        (gl::Framebuffer::~Framebuffer):
>-        (gl::Framebuffer::lookupRenderbuffer):
>-        (gl::Framebuffer::setColorbuffer):
>-        (gl::Framebuffer::setDepthbuffer):
>-        (gl::Framebuffer::setStencilbuffer):
>-        (gl::Framebuffer::detachTexture):
>-        (gl::Framebuffer::detachRenderbuffer):
>-        (gl::Framebuffer::getRenderTargetSerial):
>-        (gl::Framebuffer::getDepthbufferSerial):
>-        (gl::Framebuffer::getStencilbufferSerial):
>-        (gl::Framebuffer::getColorbuffer):
>-        (gl::Framebuffer::getDepthbuffer):
>-        (gl::Framebuffer::getStencilbuffer):
>-        (gl::Framebuffer::getDepthOrStencilbuffer):
>-        (gl::Framebuffer::getReadColorbuffer):
>-        (gl::Framebuffer::getReadColorbufferType):
>-        (gl::Framebuffer::getFirstColorbuffer):
>-        (gl::Framebuffer::getColorbufferType):
>-        (gl::Framebuffer::getDepthbufferType):
>-        (gl::Framebuffer::getStencilbufferType):
>-        (gl::Framebuffer::getColorbufferHandle):
>-        (gl::Framebuffer::getDepthbufferHandle):
>-        (gl::Framebuffer::getStencilbufferHandle):
>-        (gl::Framebuffer::getDrawBufferState):
>-        (gl::Framebuffer::setDrawBufferState):
>-        (gl::Framebuffer::isEnabledColorAttachment):
>-        (gl::Framebuffer::hasEnabledColorAttachment):
>-        (gl::Framebuffer::hasStencil):
>-        (gl::Framebuffer::usingExtendedDrawBuffers):
>-        (gl::Framebuffer::completeness):
>-        (gl::DefaultFramebuffer::DefaultFramebuffer):
>-        (gl::Framebuffer::getSamples):
>-        (gl::DefaultFramebuffer::completeness):
>-        * src/libGLESv2/Framebuffer.h: Added.
>-        * src/libGLESv2/HandleAllocator.cpp: Added.
>-        (gl::HandleAllocator::HandleAllocator):
>-        (gl::HandleAllocator::~HandleAllocator):
>-        (gl::HandleAllocator::setBaseHandle):
>-        (gl::HandleAllocator::allocate):
>-        (gl::HandleAllocator::release):
>-        * src/libGLESv2/HandleAllocator.h: Added.
>-        * src/libGLESv2/Program.cpp: Added.
>-        (gl::AttributeBindings::AttributeBindings):
>-        (gl::AttributeBindings::~AttributeBindings):
>-        (gl::InfoLog::InfoLog):
>-        (gl::InfoLog::~InfoLog):
>-        (gl::InfoLog::getLength):
>-        (gl::InfoLog::getLog):
>-        (gl::InfoLog::appendSanitized):
>-        (gl::InfoLog::append):
>-        (gl::InfoLog::reset):
>-        (gl::Program::Program):
>-        (gl::Program::~Program):
>-        (gl::Program::attachShader):
>-        (gl::Program::detachShader):
>-        (gl::Program::getAttachedShadersCount):
>-        (gl::AttributeBindings::bindAttributeLocation):
>-        (gl::Program::bindAttributeLocation):
>-        (gl::Program::link):
>-        (gl::AttributeBindings::getAttributeBinding):
>-        (gl::Program::unlink):
>-        (gl::Program::isLinked):
>-        (gl::Program::getProgramBinary):
>-        (gl::Program::setProgramBinary):
>-        (gl::Program::release):
>-        (gl::Program::addRef):
>-        (gl::Program::getRefCount):
>-        (gl::Program::getProgramBinaryLength):
>-        (gl::Program::getInfoLogLength):
>-        (gl::Program::getInfoLog):
>-        (gl::Program::getAttachedShaders):
>-        (gl::Program::getActiveAttribute):
>-        (gl::Program::getActiveAttributeCount):
>-        (gl::Program::getActiveAttributeMaxLength):
>-        (gl::Program::getActiveUniform):
>-        (gl::Program::getActiveUniformCount):
>-        (gl::Program::getActiveUniformMaxLength):
>-        (gl::Program::flagForDeletion):
>-        (gl::Program::isFlaggedForDeletion):
>-        (gl::Program::validate):
>-        (gl::Program::isValidated):
>-        * src/libGLESv2/Program.h: Added.
>-        * src/libGLESv2/ProgramBinary.cpp: Added.
>-        (gl::str):
>-        (gl::UniformLocation::UniformLocation):
>-        (gl::ProgramBinary::ProgramBinary):
>-        (gl::ProgramBinary::~ProgramBinary):
>-        (gl::ProgramBinary::getSerial):
>-        (gl::ProgramBinary::issueSerial):
>-        (gl::ProgramBinary::getPixelExecutable):
>-        (gl::ProgramBinary::getVertexExecutable):
>-        (gl::ProgramBinary::getGeometryExecutable):
>-        (gl::ProgramBinary::getAttributeLocation):
>-        (gl::ProgramBinary::getSemanticIndex):
>-        (gl::ProgramBinary::getUsedSamplerRange):
>-        (gl::ProgramBinary::usesPointSize):
>-        (gl::ProgramBinary::usesPointSpriteEmulation):
>-        (gl::ProgramBinary::usesGeometryShader):
>-        (gl::ProgramBinary::getSamplerMapping):
>-        (gl::ProgramBinary::getSamplerTextureType):
>-        (gl::ProgramBinary::getUniformLocation):
>-        (gl::ProgramBinary::setUniform1fv):
>-        (gl::ProgramBinary::setUniform2fv):
>-        (gl::ProgramBinary::setUniform3fv):
>-        (gl::ProgramBinary::setUniform4fv):
>-        (gl::transposeMatrix):
>-        (gl::ProgramBinary::setUniformMatrix2fv):
>-        (gl::ProgramBinary::setUniformMatrix3fv):
>-        (gl::ProgramBinary::setUniformMatrix4fv):
>-        (gl::ProgramBinary::setUniform1iv):
>-        (gl::ProgramBinary::setUniform2iv):
>-        (gl::ProgramBinary::setUniform3iv):
>-        (gl::ProgramBinary::setUniform4iv):
>-        (gl::ProgramBinary::getUniformfv):
>-        (gl::ProgramBinary::getUniformiv):
>-        (gl::ProgramBinary::dirtyAllUniforms):
>-        (gl::ProgramBinary::applyUniforms):
>-        (gl::ProgramBinary::packVaryings):
>-        (gl::ProgramBinary::linkVaryings):
>-        (gl::ProgramBinary::load):
>-        (gl::ProgramBinary::save):
>-        (gl::ProgramBinary::getLength):
>-        (gl::ProgramBinary::link):
>-        (gl::ProgramBinary::linkAttributes):
>-        (gl::ProgramBinary::linkUniforms):
>-        (gl::ProgramBinary::defineUniform):
>-        (gl::ProgramBinary::generateGeometryShaderHLSL):
>-        (gl::ProgramBinary::generatePointSpriteHLSL):
>-        (gl::ProgramBinary::decorateAttribute):
>-        (gl::ProgramBinary::isValidated):
>-        (gl::ProgramBinary::getActiveAttribute):
>-        (gl::ProgramBinary::getActiveAttributeCount):
>-        (gl::ProgramBinary::getActiveAttributeMaxLength):
>-        (gl::ProgramBinary::getActiveUniform):
>-        (gl::ProgramBinary::getActiveUniformCount):
>-        (gl::ProgramBinary::getActiveUniformMaxLength):
>-        (gl::ProgramBinary::validate):
>-        (gl::ProgramBinary::validateSamplers):
>-        (gl::ProgramBinary::Sampler::Sampler):
>-        (gl::AttributeSorter::AttributeSorter):
>-        (gl::AttributeSorter::operator()):
>-        (gl::ProgramBinary::sortAttributesByLayout):
>-        * src/libGLESv2/ProgramBinary.h: Added.
>-        (gl::UniformLocation::UniformLocation):
>-        * src/libGLESv2/Query.cpp: Added.
>-        (gl::Query::Query):
>-        (gl::Query::~Query):
>-        (gl::Query::begin):
>-        (gl::Query::end):
>-        (gl::Query::getResult):
>-        (gl::Query::isResultAvailable):
>-        (gl::Query::getType):
>-        * src/libGLESv2/Query.h: Added.
>-        * src/libGLESv2/Renderbuffer.cpp: Added.
>-        (gl::RenderbufferInterface::RenderbufferInterface):
>-        (gl::RenderbufferInterface::addProxyRef):
>-        (gl::RenderbufferInterface::releaseProxy):
>-        (gl::RenderbufferInterface::getRedSize):
>-        (gl::RenderbufferInterface::getGreenSize):
>-        (gl::RenderbufferInterface::getBlueSize):
>-        (gl::RenderbufferInterface::getAlphaSize):
>-        (gl::RenderbufferInterface::getDepthSize):
>-        (gl::RenderbufferInterface::getStencilSize):
>-        (gl::RenderbufferTexture2D::RenderbufferTexture2D):
>-        (gl::RenderbufferTexture2D::~RenderbufferTexture2D):
>-        (gl::RenderbufferTexture2D::addProxyRef):
>-        (gl::RenderbufferTexture2D::releaseProxy):
>-        (gl::RenderbufferTexture2D::getRenderTarget):
>-        (gl::RenderbufferTexture2D::getDepthStencil):
>-        (gl::RenderbufferTexture2D::getWidth):
>-        (gl::RenderbufferTexture2D::getHeight):
>-        (gl::RenderbufferTexture2D::getInternalFormat):
>-        (gl::RenderbufferTexture2D::getActualFormat):
>-        (gl::RenderbufferTexture2D::getSamples):
>-        (gl::RenderbufferTexture2D::getSerial):
>-        (gl::RenderbufferTextureCubeMap::RenderbufferTextureCubeMap):
>-        (gl::RenderbufferTextureCubeMap::~RenderbufferTextureCubeMap):
>-        (gl::RenderbufferTextureCubeMap::addProxyRef):
>-        (gl::RenderbufferTextureCubeMap::releaseProxy):
>-        (gl::RenderbufferTextureCubeMap::getRenderTarget):
>-        (gl::RenderbufferTextureCubeMap::getDepthStencil):
>-        (gl::RenderbufferTextureCubeMap::getWidth):
>-        (gl::RenderbufferTextureCubeMap::getHeight):
>-        (gl::RenderbufferTextureCubeMap::getInternalFormat):
>-        (gl::RenderbufferTextureCubeMap::getActualFormat):
>-        (gl::RenderbufferTextureCubeMap::getSamples):
>-        (gl::RenderbufferTextureCubeMap::getSerial):
>-        (gl::Renderbuffer::Renderbuffer):
>-        (gl::Renderbuffer::~Renderbuffer):
>-        (gl::Renderbuffer::addRef):
>-        (gl::Renderbuffer::release):
>-        (gl::Renderbuffer::getRenderTarget):
>-        (gl::Renderbuffer::getDepthStencil):
>-        (gl::Renderbuffer::getWidth):
>-        (gl::Renderbuffer::getHeight):
>-        (gl::Renderbuffer::getInternalFormat):
>-        (gl::Renderbuffer::getActualFormat):
>-        (gl::Renderbuffer::getRedSize):
>-        (gl::Renderbuffer::getGreenSize):
>-        (gl::Renderbuffer::getBlueSize):
>-        (gl::Renderbuffer::getAlphaSize):
>-        (gl::Renderbuffer::getDepthSize):
>-        (gl::Renderbuffer::getStencilSize):
>-        (gl::Renderbuffer::getSamples):
>-        (gl::Renderbuffer::getSerial):
>-        (gl::Renderbuffer::setStorage):
>-        (gl::RenderbufferStorage::RenderbufferStorage):
>-        (gl::RenderbufferStorage::~RenderbufferStorage):
>-        (gl::RenderbufferStorage::getRenderTarget):
>-        (gl::RenderbufferStorage::getDepthStencil):
>-        (gl::RenderbufferStorage::getWidth):
>-        (gl::RenderbufferStorage::getHeight):
>-        (gl::RenderbufferStorage::getInternalFormat):
>-        (gl::RenderbufferStorage::getActualFormat):
>-        (gl::RenderbufferStorage::getSamples):
>-        (gl::RenderbufferStorage::getSerial):
>-        (gl::RenderbufferStorage::issueSerial):
>-        (gl::RenderbufferStorage::issueCubeSerials):
>-        (gl::Colorbuffer::Colorbuffer):
>-        (gl::Colorbuffer::~Colorbuffer):
>-        (gl::Colorbuffer::getRenderTarget):
>-        (gl::DepthStencilbuffer::DepthStencilbuffer):
>-        (gl::DepthStencilbuffer::~DepthStencilbuffer):
>-        (gl::DepthStencilbuffer::getDepthStencil):
>-        (gl::Depthbuffer::Depthbuffer):
>-        (gl::Depthbuffer::~Depthbuffer):
>-        (gl::Stencilbuffer::Stencilbuffer):
>-        (gl::Stencilbuffer::~Stencilbuffer):
>-        * src/libGLESv2/Renderbuffer.h: Added.
>-        (gl::RenderbufferInterface::~RenderbufferInterface):
>-        * src/libGLESv2/ResourceManager.cpp: Added.
>-        (gl::ResourceManager::ResourceManager):
>-        (gl::ResourceManager::~ResourceManager):
>-        (gl::ResourceManager::addRef):
>-        (gl::ResourceManager::release):
>-        (gl::ResourceManager::createBuffer):
>-        (gl::ResourceManager::createShader):
>-        (gl::ResourceManager::createProgram):
>-        (gl::ResourceManager::createTexture):
>-        (gl::ResourceManager::createRenderbuffer):
>-        (gl::ResourceManager::deleteBuffer):
>-        (gl::ResourceManager::deleteShader):
>-        (gl::ResourceManager::deleteProgram):
>-        (gl::ResourceManager::deleteTexture):
>-        (gl::ResourceManager::deleteRenderbuffer):
>-        (gl::ResourceManager::getBuffer):
>-        (gl::ResourceManager::getShader):
>-        (gl::ResourceManager::getTexture):
>-        (gl::ResourceManager::getProgram):
>-        (gl::ResourceManager::getRenderbuffer):
>-        (gl::ResourceManager::setRenderbuffer):
>-        (gl::ResourceManager::checkBufferAllocation):
>-        (gl::ResourceManager::checkTextureAllocation):
>-        (gl::ResourceManager::checkRenderbufferAllocation):
>-        * src/libGLESv2/ResourceManager.h: Added.
>-        * src/libGLESv2/Shader.cpp: Added.
>-        (gl::Shader::Shader):
>-        (gl::Shader::~Shader):
>-        (gl::Shader::getHandle):
>-        (gl::Shader::setSource):
>-        (gl::Shader::getInfoLogLength):
>-        (gl::Shader::getInfoLog):
>-        (gl::Shader::getSourceLength):
>-        (gl::Shader::getTranslatedSourceLength):
>-        (gl::Shader::getSourceImpl):
>-        (gl::Shader::getSource):
>-        (gl::Shader::getTranslatedSource):
>-        (gl::Shader::getUniforms):
>-        (gl::Shader::isCompiled):
>-        (gl::Shader::getHLSL):
>-        (gl::Shader::addRef):
>-        (gl::Shader::release):
>-        (gl::Shader::getRefCount):
>-        (gl::Shader::isFlaggedForDeletion):
>-        (gl::Shader::flagForDeletion):
>-        (gl::Shader::initializeCompiler):
>-        (gl::Shader::releaseCompiler):
>-        (gl::Shader::parseVaryings):
>-        (gl::Shader::resetVaryingsRegisterAssignment):
>-        (gl::Shader::uncompile):
>-        (gl::Shader::compileToHLSL):
>-        (gl::Shader::parseType):
>-        (gl::Shader::compareVarying):
>-        (gl::VertexShader::VertexShader):
>-        (gl::VertexShader::~VertexShader):
>-        (gl::VertexShader::getType):
>-        (gl::VertexShader::uncompile):
>-        (gl::VertexShader::compile):
>-        (gl::VertexShader::getSemanticIndex):
>-        (gl::VertexShader::parseAttributes):
>-        (gl::FragmentShader::FragmentShader):
>-        (gl::FragmentShader::~FragmentShader):
>-        (gl::FragmentShader::getType):
>-        (gl::FragmentShader::compile):
>-        * src/libGLESv2/Shader.h: Added.
>-        (gl::Varying::Varying):
>-        (gl::Attribute::Attribute):
>-        * src/libGLESv2/Texture.cpp: Added.
>-        (gl::Texture::Texture):
>-        (gl::Texture::~Texture):
>-        (gl::Texture::setMinFilter):
>-        (gl::Texture::setMagFilter):
>-        (gl::Texture::setWrapS):
>-        (gl::Texture::setWrapT):
>-        (gl::Texture::setMaxAnisotropy):
>-        (gl::Texture::setUsage):
>-        (gl::Texture::getMinFilter):
>-        (gl::Texture::getMagFilter):
>-        (gl::Texture::getWrapS):
>-        (gl::Texture::getWrapT):
>-        (gl::Texture::getMaxAnisotropy):
>-        (gl::Texture::getLodOffset):
>-        (gl::Texture::getSamplerState):
>-        (gl::Texture::getUsage):
>-        (gl::Texture::isMipmapFiltered):
>-        (gl::Texture::setImage):
>-        (gl::Texture::setCompressedImage):
>-        (gl::Texture::subImage):
>-        (gl::Texture::subImageCompressed):
>-        (gl::Texture::getNativeTexture):
>-        (gl::Texture::hasDirtyImages):
>-        (gl::Texture::resetDirty):
>-        (gl::Texture::getTextureSerial):
>-        (gl::Texture::getRenderTargetSerial):
>-        (gl::Texture::isImmutable):
>-        (gl::Texture::creationLevels):
>-        (gl::Texture2D::Texture2D):
>-        (gl::Texture2D::~Texture2D):
>-        (gl::Texture2D::addProxyRef):
>-        (gl::Texture2D::releaseProxy):
>-        (gl::Texture2D::getTarget):
>-        (gl::Texture2D::getWidth):
>-        (gl::Texture2D::getHeight):
>-        (gl::Texture2D::getInternalFormat):
>-        (gl::Texture2D::getActualFormat):
>-        (gl::Texture2D::redefineImage):
>-        (gl::Texture2D::setImage):
>-        (gl::Texture2D::bindTexImage):
>-        (gl::Texture2D::releaseTexImage):
>-        (gl::Texture2D::setCompressedImage):
>-        (gl::Texture2D::commitRect):
>-        (gl::Texture2D::subImage):
>-        (gl::Texture2D::subImageCompressed):
>-        (gl::Texture2D::copyImage):
>-        (gl::Texture2D::copySubImage):
>-        (gl::Texture2D::storage):
>-        (gl::Texture2D::isSamplerComplete):
>-        (gl::Texture2D::isMipmapComplete):
>-        (gl::Texture2D::isCompressed):
>-        (gl::Texture2D::isDepth):
>-        (gl::Texture2D::createTexture):
>-        (gl::Texture2D::updateTexture):
>-        (gl::Texture2D::convertToRenderTarget):
>-        (gl::Texture2D::generateMipmaps):
>-        (gl::Texture2D::getRenderbuffer):
>-        (gl::Texture2D::getRenderTarget):
>-        (gl::Texture2D::getDepthStencil):
>-        (gl::Texture2D::levelCount):
>-        (gl::Texture2D::getStorage):
>-        (gl::TextureCubeMap::TextureCubeMap):
>-        (gl::TextureCubeMap::~TextureCubeMap):
>-        (gl::TextureCubeMap::addProxyRef):
>-        (gl::TextureCubeMap::releaseProxy):
>-        (gl::TextureCubeMap::getTarget):
>-        (gl::TextureCubeMap::getWidth):
>-        (gl::TextureCubeMap::getHeight):
>-        (gl::TextureCubeMap::getInternalFormat):
>-        (gl::TextureCubeMap::getActualFormat):
>-        (gl::TextureCubeMap::setImagePosX):
>-        (gl::TextureCubeMap::setImageNegX):
>-        (gl::TextureCubeMap::setImagePosY):
>-        (gl::TextureCubeMap::setImageNegY):
>-        (gl::TextureCubeMap::setImagePosZ):
>-        (gl::TextureCubeMap::setImageNegZ):
>-        (gl::TextureCubeMap::setCompressedImage):
>-        (gl::TextureCubeMap::commitRect):
>-        (gl::TextureCubeMap::subImage):
>-        (gl::TextureCubeMap::subImageCompressed):
>-        (gl::TextureCubeMap::isSamplerComplete):
>-        (gl::TextureCubeMap::isCubeComplete):
>-        (gl::TextureCubeMap::isMipmapCubeComplete):
>-        (gl::TextureCubeMap::isCompressed):
>-        (gl::TextureCubeMap::createTexture):
>-        (gl::TextureCubeMap::updateTexture):
>-        (gl::TextureCubeMap::convertToRenderTarget):
>-        (gl::TextureCubeMap::setImage):
>-        (gl::TextureCubeMap::faceIndex):
>-        (gl::TextureCubeMap::redefineImage):
>-        (gl::TextureCubeMap::copyImage):
>-        (gl::TextureCubeMap::copySubImage):
>-        (gl::TextureCubeMap::storage):
>-        (gl::TextureCubeMap::generateMipmaps):
>-        (gl::TextureCubeMap::getRenderbuffer):
>-        (gl::TextureCubeMap::getRenderTarget):
>-        (gl::TextureCubeMap::levelCount):
>-        (gl::TextureCubeMap::getStorage):
>-        * src/libGLESv2/Texture.h: Added.
>-        * src/libGLESv2/Uniform.cpp: Added.
>-        (gl::Uniform::Uniform):
>-        (gl::Uniform::~Uniform):
>-        (gl::Uniform::isArray):
>-        (gl::Uniform::elementCount):
>-        * src/libGLESv2/Uniform.h: Added.
>-        * src/libGLESv2/angletypes.h: Added.
>-        * src/libGLESv2/constants.h: Added.
>-        * src/libGLESv2/libGLESv2.cpp: Added.
>-        (validImageSize):
>-        (checkTextureFormatType):
>-        (validateSubImageParams2D):
>-        (validateSubImageParamsCube):
>-        (validReadFormatType):
>-        * src/libGLESv2/libGLESv2.def: Added.
>-        * src/libGLESv2/libGLESv2.rc: Added.
>-        * src/libGLESv2/libGLESv2.vcxproj: Added.
>-        * src/libGLESv2/libGLESv2.vcxproj.filters: Added.
>-        * src/libGLESv2/main.cpp: Added.
>-        (DllMain):
>-        (gl::makeCurrent):
>-        (gl::getContext):
>-        (gl::getNonLostContext):
>-        (gl::getDisplay):
>-        (gl::error):
>-        * src/libGLESv2/main.h: Added.
>-        (gl::error):
>-        * src/libGLESv2/mathutil.h: Added.
>-        (gl::Vector4::Vector4):
>-        (gl::isPow2):
>-        (gl::log2):
>-        (gl::ceilPow2):
>-        (gl::clamp):
>-        (gl::clamp01):
>-        (gl::unorm):
>-        (gl::supportsSSE2):
>-        (gl::float32ToFloat16):
>-        (rx::Range::Range):
>-        * src/libGLESv2/precompiled.cpp: Added.
>-        * src/libGLESv2/precompiled.h: Added.
>-        * src/libGLESv2/renderer: Added.
>-        * src/libGLESv2/renderer/Blit.cpp: Added.
>-        (rx::Blit::Blit):
>-        (rx::Blit::~Blit):
>-        (rx::Blit::initGeometry):
>-        (rx::Blit::setShader):
>-        (rx::Blit::setVertexShader):
>-        (rx::Blit::setPixelShader):
>-        (rx::Blit::getSurfaceRect):
>-        (rx::Blit::boxFilter):
>-        (rx::Blit::copy):
>-        (rx::Blit::formatConvert):
>-        (rx::Blit::setFormatConvertShaders):
>-        (rx::Blit::copySurfaceToTexture):
>-        (rx::Blit::setViewport):
>-        (rx::Blit::setCommonBlitState):
>-        (rx::Blit::render):
>-        (rx::Blit::saveState):
>-        (rx::Blit::restoreState):
>-        * src/libGLESv2/renderer/Blit.h: Added.
>-        * src/libGLESv2/renderer/BufferStorage.cpp: Added.
>-        (rx::BufferStorage::BufferStorage):
>-        (rx::BufferStorage::~BufferStorage):
>-        (rx::BufferStorage::getSerial):
>-        (rx::BufferStorage::updateSerial):
>-        (rx::BufferStorage::markBufferUsage):
>-        * src/libGLESv2/renderer/BufferStorage.h: Added.
>-        * src/libGLESv2/renderer/BufferStorage11.cpp: Added.
>-        (rx::BufferStorage11::BufferStorage11):
>-        (rx::BufferStorage11::~BufferStorage11):
>-        (rx::BufferStorage11::makeBufferStorage11):
>-        (rx::BufferStorage11::getData):
>-        (rx::BufferStorage11::setData):
>-        (rx::BufferStorage11::clear):
>-        (rx::BufferStorage11::getSize):
>-        (rx::BufferStorage11::supportsDirectBinding):
>-        (rx::BufferStorage11::markBufferUsage):
>-        (rx::BufferStorage11::getBuffer):
>-        * src/libGLESv2/renderer/BufferStorage11.h: Added.
>-        * src/libGLESv2/renderer/BufferStorage9.cpp: Added.
>-        (rx::BufferStorage9::BufferStorage9):
>-        (rx::BufferStorage9::~BufferStorage9):
>-        (rx::BufferStorage9::makeBufferStorage9):
>-        (rx::BufferStorage9::getData):
>-        (rx::BufferStorage9::setData):
>-        (rx::BufferStorage9::clear):
>-        (rx::BufferStorage9::getSize):
>-        (rx::BufferStorage9::supportsDirectBinding):
>-        * src/libGLESv2/renderer/BufferStorage9.h: Added.
>-        * src/libGLESv2/renderer/Fence11.cpp: Added.
>-        (rx::Fence11::Fence11):
>-        (rx::Fence11::~Fence11):
>-        (rx::Fence11::isFence):
>-        (rx::Fence11::setFence):
>-        (rx::Fence11::testFence):
>-        (rx::Fence11::finishFence):
>-        (rx::Fence11::getFenceiv):
>-        * src/libGLESv2/renderer/Fence11.h: Added.
>-        * src/libGLESv2/renderer/Fence9.cpp: Added.
>-        (rx::Fence9::Fence9):
>-        (rx::Fence9::~Fence9):
>-        (rx::Fence9::isFence):
>-        (rx::Fence9::setFence):
>-        (rx::Fence9::testFence):
>-        (rx::Fence9::finishFence):
>-        (rx::Fence9::getFenceiv):
>-        * src/libGLESv2/renderer/Fence9.h: Added.
>-        * src/libGLESv2/renderer/FenceImpl.h: Added.
>-        (rx::FenceImpl::FenceImpl):
>-        (rx::FenceImpl::~FenceImpl):
>-        (rx::FenceImpl::setStatus):
>-        (rx::FenceImpl::getStatus):
>-        (rx::FenceImpl::setCondition):
>-        (rx::FenceImpl::getCondition):
>-        * src/libGLESv2/renderer/Image.cpp: Added.
>-        (rx::Image::Image):
>-        (rx::Image::loadAlphaDataToBGRA):
>-        (rx::Image::loadAlphaDataToNative):
>-        (rx::Image::loadAlphaFloatDataToRGBA):
>-        (rx::Image::loadAlphaHalfFloatDataToRGBA):
>-        (rx::Image::loadLuminanceDataToNativeOrBGRA):
>-        (rx::Image::loadLuminanceFloatDataToRGBA):
>-        (rx::Image::loadLuminanceFloatDataToRGB):
>-        (rx::Image::loadLuminanceHalfFloatDataToRGBA):
>-        (rx::Image::loadLuminanceAlphaDataToNativeOrBGRA):
>-        (rx::Image::loadLuminanceAlphaFloatDataToRGBA):
>-        (rx::Image::loadLuminanceAlphaHalfFloatDataToRGBA):
>-        (rx::Image::loadRGBUByteDataToBGRX):
>-        (rx::Image::loadRGBUByteDataToRGBA):
>-        (rx::Image::loadRGB565DataToBGRA):
>-        (rx::Image::loadRGB565DataToRGBA):
>-        (rx::Image::loadRGBFloatDataToRGBA):
>-        (rx::Image::loadRGBFloatDataToNative):
>-        (rx::Image::loadRGBHalfFloatDataToRGBA):
>-        (rx::Image::loadRGBAUByteDataToBGRA):
>-        (rx::Image::loadRGBAUByteDataToNative):
>-        (rx::Image::loadRGBA4444DataToBGRA):
>-        (rx::Image::loadRGBA4444DataToRGBA):
>-        (rx::Image::loadRGBA5551DataToBGRA):
>-        (rx::Image::loadRGBA5551DataToRGBA):
>-        (rx::Image::loadRGBAFloatDataToRGBA):
>-        (rx::Image::loadRGBAHalfFloatDataToRGBA):
>-        (rx::Image::loadBGRADataToBGRA):
>-        * src/libGLESv2/renderer/Image.h: Added.
>-        (rx::Image::~Image):
>-        (rx::Image::getWidth):
>-        (rx::Image::getHeight):
>-        (rx::Image::getInternalFormat):
>-        (rx::Image::getActualFormat):
>-        (rx::Image::markDirty):
>-        (rx::Image::markClean):
>-        (rx::Image::setManagedSurface):
>-        * src/libGLESv2/renderer/Image11.cpp: Added.
>-        (rx::Image11::Image11):
>-        (rx::Image11::~Image11):
>-        (rx::Image11::makeImage11):
>-        (rx::Image11::generateMipmap):
>-        (rx::Image11::isDirty):
>-        (rx::Image11::updateSurface):
>-        (rx::Image11::redefine):
>-        (rx::Image11::isRenderableFormat):
>-        (rx::Image11::getDXGIFormat):
>-        (rx::Image11::loadData):
>-        (rx::Image11::loadCompressedData):
>-        (rx::Image11::copy):
>-        (rx::Image11::getStagingTexture):
>-        (rx::Image11::getStagingSubresource):
>-        (rx::Image11::createStagingTexture):
>-        (rx::Image11::map):
>-        (rx::Image11::unmap):
>-        * src/libGLESv2/renderer/Image11.h: Added.
>-        * src/libGLESv2/renderer/Image9.cpp: Added.
>-        (rx::Image9::Image9):
>-        (rx::Image9::~Image9):
>-        (rx::Image9::generateMip):
>-        (rx::Image9::makeImage9):
>-        (rx::Image9::generateMipmap):
>-        (rx::Image9::copyLockableSurfaces):
>-        (rx::Image9::redefine):
>-        (rx::Image9::createSurface):
>-        (rx::Image9::lock):
>-        (rx::Image9::unlock):
>-        (rx::Image9::isRenderableFormat):
>-        (rx::Image9::getD3DFormat):
>-        (rx::Image9::getSurface):
>-        (rx::Image9::setManagedSurface):
>-        (rx::Image9::updateSurface):
>-        (rx::Image9::loadData):
>-        (rx::Image9::loadCompressedData):
>-        (rx::Image9::copy):
>-        * src/libGLESv2/renderer/Image9.h: Added.
>-        (rx::Image9::isDirty):
>-        * src/libGLESv2/renderer/ImageSSE2.cpp: Added.
>-        (rx::Image::loadRGBAUByteDataToBGRASSE2):
>-        (rx::Image::loadAlphaDataToBGRASSE2):
>-        * src/libGLESv2/renderer/IndexBuffer.cpp: Added.
>-        (rx::IndexBuffer::IndexBuffer):
>-        (rx::IndexBuffer::~IndexBuffer):
>-        (rx::IndexBuffer::getSerial):
>-        (rx::IndexBuffer::updateSerial):
>-        (rx::IndexBufferInterface::IndexBufferInterface):
>-        (rx::IndexBufferInterface::~IndexBufferInterface):
>-        (rx::IndexBufferInterface::getIndexType):
>-        (rx::IndexBufferInterface::getBufferSize):
>-        (rx::IndexBufferInterface::getSerial):
>-        (rx::IndexBufferInterface::mapBuffer):
>-        (rx::IndexBufferInterface::unmapBuffer):
>-        (rx::IndexBufferInterface::getIndexBuffer):
>-        (rx::IndexBufferInterface::getWritePosition):
>-        (rx::IndexBufferInterface::setWritePosition):
>-        (rx::IndexBufferInterface::discard):
>-        (rx::IndexBufferInterface::setBufferSize):
>-        (rx::StreamingIndexBufferInterface::StreamingIndexBufferInterface):
>-        (rx::StreamingIndexBufferInterface::~StreamingIndexBufferInterface):
>-        (rx::StreamingIndexBufferInterface::reserveBufferSpace):
>-        (rx::StaticIndexBufferInterface::StaticIndexBufferInterface):
>-        (rx::StaticIndexBufferInterface::~StaticIndexBufferInterface):
>-        (rx::StaticIndexBufferInterface::reserveBufferSpace):
>-        (rx::StaticIndexBufferInterface::lookupRange):
>-        (rx::StaticIndexBufferInterface::addRange):
>-        * src/libGLESv2/renderer/IndexBuffer.h: Added.
>-        (rx::StaticIndexBufferInterface::IndexRange::operator<):
>-        * src/libGLESv2/renderer/IndexBuffer11.cpp: Added.
>-        (rx::IndexBuffer11::IndexBuffer11):
>-        (rx::IndexBuffer11::~IndexBuffer11):
>-        (rx::IndexBuffer11::initialize):
>-        (rx::IndexBuffer11::makeIndexBuffer11):
>-        (rx::IndexBuffer11::mapBuffer):
>-        (rx::IndexBuffer11::unmapBuffer):
>-        (rx::IndexBuffer11::getIndexType):
>-        (rx::IndexBuffer11::getBufferSize):
>-        (rx::IndexBuffer11::setSize):
>-        (rx::IndexBuffer11::discard):
>-        (rx::IndexBuffer11::getIndexFormat):
>-        (rx::IndexBuffer11::getBuffer):
>-        * src/libGLESv2/renderer/IndexBuffer11.h: Added.
>-        * src/libGLESv2/renderer/IndexBuffer9.cpp: Added.
>-        (rx::IndexBuffer9::IndexBuffer9):
>-        (rx::IndexBuffer9::~IndexBuffer9):
>-        (rx::IndexBuffer9::initialize):
>-        (rx::IndexBuffer9::makeIndexBuffer9):
>-        (rx::IndexBuffer9::mapBuffer):
>-        (rx::IndexBuffer9::unmapBuffer):
>-        (rx::IndexBuffer9::getIndexType):
>-        (rx::IndexBuffer9::getBufferSize):
>-        (rx::IndexBuffer9::setSize):
>-        (rx::IndexBuffer9::discard):
>-        (rx::IndexBuffer9::getIndexFormat):
>-        (rx::IndexBuffer9::getBuffer):
>-        * src/libGLESv2/renderer/IndexBuffer9.h: Added.
>-        * src/libGLESv2/renderer/IndexDataManager.cpp: Added.
>-        (rx::IndexDataManager::IndexDataManager):
>-        (rx::IndexDataManager::~IndexDataManager):
>-        (rx::indexTypeSize):
>-        (rx::convertIndices):
>-        (rx::computeRange):
>-        (rx::IndexDataManager::prepareIndexData):
>-        (rx::IndexDataManager::getCountingIndices):
>-        * src/libGLESv2/renderer/IndexDataManager.h: Added.
>-        * src/libGLESv2/renderer/InputLayoutCache.cpp: Added.
>-        (rx::InputLayoutCache::InputLayoutCache):
>-        (rx::InputLayoutCache::~InputLayoutCache):
>-        (rx::InputLayoutCache::initialize):
>-        (rx::InputLayoutCache::clear):
>-        (rx::InputLayoutCache::applyVertexBuffers):
>-        (rx::InputLayoutCache::hashInputLayout):
>-        (rx::InputLayoutCache::compareInputLayouts):
>-        * src/libGLESv2/renderer/InputLayoutCache.h: Added.
>-        * src/libGLESv2/renderer/Query11.cpp: Added.
>-        (rx::Query11::Query11):
>-        (rx::Query11::~Query11):
>-        (rx::Query11::begin):
>-        (rx::Query11::end):
>-        (rx::Query11::getResult):
>-        (rx::Query11::isResultAvailable):
>-        (rx::Query11::testQuery):
>-        * src/libGLESv2/renderer/Query11.h: Added.
>-        * src/libGLESv2/renderer/Query9.cpp: Added.
>-        (rx::Query9::Query9):
>-        (rx::Query9::~Query9):
>-        (rx::Query9::begin):
>-        (rx::Query9::end):
>-        (rx::Query9::getResult):
>-        (rx::Query9::isResultAvailable):
>-        (rx::Query9::testQuery):
>-        * src/libGLESv2/renderer/Query9.h: Added.
>-        * src/libGLESv2/renderer/QueryImpl.h: Added.
>-        (rx::QueryImpl::QueryImpl):
>-        (rx::QueryImpl::~QueryImpl):
>-        (rx::QueryImpl::getType):
>-        * src/libGLESv2/renderer/RenderStateCache.cpp: Added.
>-        (rx::RenderStateCache::RenderStateCache):
>-        (rx::RenderStateCache::~RenderStateCache):
>-        (rx::RenderStateCache::initialize):
>-        (rx::RenderStateCache::clear):
>-        (rx::RenderStateCache::hashBlendState):
>-        (rx::RenderStateCache::compareBlendStates):
>-        (rx::RenderStateCache::getBlendState):
>-        (rx::RenderStateCache::hashRasterizerState):
>-        (rx::RenderStateCache::compareRasterizerStates):
>-        (rx::RenderStateCache::getRasterizerState):
>-        (rx::RenderStateCache::hashDepthStencilState):
>-        (rx::RenderStateCache::compareDepthStencilStates):
>-        (rx::RenderStateCache::getDepthStencilState):
>-        (rx::RenderStateCache::hashSamplerState):
>-        (rx::RenderStateCache::compareSamplerStates):
>-        (rx::RenderStateCache::getSamplerState):
>-        * src/libGLESv2/renderer/RenderStateCache.h: Added.
>-        * src/libGLESv2/renderer/RenderTarget.h: Added.
>-        (rx::RenderTarget::RenderTarget):
>-        (rx::RenderTarget::~RenderTarget):
>-        (rx::RenderTarget::getWidth):
>-        (rx::RenderTarget::getHeight):
>-        (rx::RenderTarget::getInternalFormat):
>-        (rx::RenderTarget::getActualFormat):
>-        (rx::RenderTarget::getSamples):
>-        * src/libGLESv2/renderer/RenderTarget11.cpp: Added.
>-        (rx::getRTVSubresourceIndex):
>-        (rx::getDSVSubresourceIndex):
>-        (rx::RenderTarget11::RenderTarget11):
>-        (rx::RenderTarget11::~RenderTarget11):
>-        (rx::RenderTarget11::makeRenderTarget11):
>-        (rx::RenderTarget11::getTexture):
>-        (rx::RenderTarget11::getRenderTargetView):
>-        (rx::RenderTarget11::getDepthStencilView):
>-        (rx::RenderTarget11::getShaderResourceView):
>-        (rx::RenderTarget11::getSubresourceIndex):
>-        * src/libGLESv2/renderer/RenderTarget11.h: Added.
>-        * src/libGLESv2/renderer/RenderTarget9.cpp: Added.
>-        (rx::RenderTarget9::RenderTarget9):
>-        (rx::RenderTarget9::~RenderTarget9):
>-        (rx::RenderTarget9::makeRenderTarget9):
>-        (rx::RenderTarget9::getSurface):
>-        * src/libGLESv2/renderer/RenderTarget9.h: Added.
>-        * src/libGLESv2/renderer/Renderer.cpp: Added.
>-        (rx::Renderer::Renderer):
>-        (rx::Renderer::~Renderer):
>-        (rx::Renderer::initializeCompiler):
>-        (rx::Renderer::compileToBinary):
>-        * src/libGLESv2/renderer/Renderer.h: Added.
>-        (getComparableOSVersion):
>-        (rx::Renderer::getVertexTextureSupport):
>-        * src/libGLESv2/renderer/Renderer11.cpp: Added.
>-        (rx::Renderer11::Renderer11):
>-        (rx::Renderer11::~Renderer11):
>-        (rx::Renderer11::makeRenderer11):
>-        (rx::Renderer11::initialize):
>-        (rx::Renderer11::initializeDevice):
>-        (rx::Renderer11::generateConfigs):
>-        (rx::Renderer11::deleteConfigs):
>-        (rx::Renderer11::sync):
>-        (rx::Renderer11::createSwapChain):
>-        (rx::Renderer11::setSamplerState):
>-        (rx::Renderer11::setTexture):
>-        (rx::Renderer11::setRasterizerState):
>-        (rx::Renderer11::setBlendState):
>-        (rx::Renderer11::setDepthStencilState):
>-        (rx::Renderer11::setScissorRectangle):
>-        (rx::Renderer11::setViewport):
>-        (rx::Renderer11::applyPrimitiveType):
>-        (rx::Renderer11::applyRenderTarget):
>-        (rx::Renderer11::applyVertexBuffer):
>-        (rx::Renderer11::applyIndexBuffer):
>-        (rx::Renderer11::drawArrays):
>-        (rx::Renderer11::drawElements):
>-        (rx::Renderer11::drawLineLoop):
>-        (rx::Renderer11::drawTriangleFan):
>-        (rx::Renderer11::applyShaders):
>-        (rx::Renderer11::applyUniforms):
>-        (rx::Renderer11::clear):
>-        (rx::Renderer11::maskedClear):
>-        (rx::Renderer11::markAllStateDirty):
>-        (rx::Renderer11::releaseDeviceResources):
>-        (rx::Renderer11::notifyDeviceLost):
>-        (rx::Renderer11::isDeviceLost):
>-        (rx::Renderer11::testDeviceLost):
>-        (rx::Renderer11::testDeviceResettable):
>-        (rx::Renderer11::release):
>-        (rx::Renderer11::resetDevice):
>-        (rx::Renderer11::getAdapterVendor):
>-        (rx::Renderer11::getRendererDescription):
>-        (rx::Renderer11::getAdapterIdentifier):
>-        (rx::Renderer11::getBGRATextureSupport):
>-        (rx::Renderer11::getDXT1TextureSupport):
>-        (rx::Renderer11::getDXT3TextureSupport):
>-        (rx::Renderer11::getDXT5TextureSupport):
>-        (rx::Renderer11::getDepthTextureSupport):
>-        (rx::Renderer11::getFloat32TextureSupport):
>-        (rx::Renderer11::getFloat16TextureSupport):
>-        (rx::Renderer11::getLuminanceTextureSupport):
>-        (rx::Renderer11::getLuminanceAlphaTextureSupport):
>-        (rx::Renderer11::getTextureFilterAnisotropySupport):
>-        (rx::Renderer11::getTextureMaxAnisotropy):
>-        (rx::Renderer11::getEventQuerySupport):
>-        (rx::Renderer11::getViewportBounds):
>-        (rx::Renderer11::getMaxVertexTextureImageUnits):
>-        (rx::Renderer11::getMaxCombinedTextureImageUnits):
>-        (rx::Renderer11::getReservedVertexUniformVectors):
>-        (rx::Renderer11::getReservedFragmentUniformVectors):
>-        (rx::Renderer11::getMaxVertexUniformVectors):
>-        (rx::Renderer11::getMaxFragmentUniformVectors):
>-        (rx::Renderer11::getMaxVaryingVectors):
>-        (rx::Renderer11::getNonPower2TextureSupport):
>-        (rx::Renderer11::getOcclusionQuerySupport):
>-        (rx::Renderer11::getInstancingSupport):
>-        (rx::Renderer11::getShareHandleSupport):
>-        (rx::Renderer11::getDerivativeInstructionSupport):
>-        (rx::Renderer11::getPostSubBufferSupport):
>-        (rx::Renderer11::getMajorShaderModel):
>-        (rx::Renderer11::getMinorShaderModel):
>-        (rx::Renderer11::getMaxPointSize):
>-        (rx::Renderer11::getMaxViewportDimension):
>-        (rx::Renderer11::getMaxTextureWidth):
>-        (rx::Renderer11::getMaxTextureHeight):
>-        (rx::Renderer11::get32BitIndexSupport):
>-        (rx::Renderer11::getMinSwapInterval):
>-        (rx::Renderer11::getMaxSwapInterval):
>-        (rx::Renderer11::getMaxSupportedSamples):
>-        (rx::Renderer11::getNearestSupportedSamples):
>-        (rx::Renderer11::getMaxRenderTargets):
>-        (rx::Renderer11::copyToRenderTarget):
>-        (rx::Renderer11::copyImage):
>-        (rx::Renderer11::copyTexture):
>-        (rx::Renderer11::unapplyRenderTargets):
>-        (rx::Renderer11::setOneTimeRenderTarget):
>-        (rx::Renderer11::createRenderTarget):
>-        (rx::Renderer11::loadExecutable):
>-        (rx::Renderer11::compileToExecutable):
>-        (rx::Renderer11::createVertexBuffer):
>-        (rx::Renderer11::createIndexBuffer):
>-        (rx::Renderer11::createBufferStorage):
>-        (rx::Renderer11::createQuery):
>-        (rx::Renderer11::createFence):
>-        (rx::Renderer11::getRenderTargetResource):
>-        (rx::Renderer11::blitRect):
>-        (rx::Renderer11::readPixels):
>-        (rx::Renderer11::createImage):
>-        (rx::Renderer11::generateMipmap):
>-        (rx::Renderer11::createTextureStorage2D):
>-        (rx::Renderer11::createTextureStorageCube):
>-        (rx::getFastPixelCopySize):
>-        (rx::readPixelColor):
>-        (rx::writePixelColor):
>-        (rx::Renderer11::readTextureData):
>-        (rx::Renderer11::blitRenderbufferRect):
>-        (rx::Renderer11::resolveMultisampledTexture):
>-        (rx::Renderer11::getLUID):
>-        * src/libGLESv2/renderer/Renderer11.h: Added.
>-        (rx::Renderer11::getDevice):
>-        (rx::Renderer11::getDeviceContext):
>-        (rx::Renderer11::getDxgiFactory):
>-        * src/libGLESv2/renderer/Renderer9.cpp: Added.
>-        (rx::Renderer9::Renderer9):
>-        (rx::Renderer9::~Renderer9):
>-        (rx::Renderer9::makeRenderer9):
>-        (rx::Renderer9::initialize):
>-        (rx::Renderer9::initializeDevice):
>-        (rx::Renderer9::getDefaultPresentParameters):
>-        (rx::Renderer9::generateConfigs):
>-        (rx::Renderer9::deleteConfigs):
>-        (rx::Renderer9::startScene):
>-        (rx::Renderer9::endScene):
>-        (rx::Renderer9::sync):
>-        (rx::Renderer9::createSwapChain):
>-        (rx::Renderer9::allocateEventQuery):
>-        (rx::Renderer9::freeEventQuery):
>-        (rx::Renderer9::createVertexShader):
>-        (rx::Renderer9::createPixelShader):
>-        (rx::Renderer9::createVertexBuffer):
>-        (rx::Renderer9::createIndexBuffer):
>-        (rx::Renderer9::createBufferStorage):
>-        (rx::Renderer9::createQuery):
>-        (rx::Renderer9::createFence):
>-        (rx::Renderer9::setSamplerState):
>-        (rx::Renderer9::setTexture):
>-        (rx::Renderer9::setRasterizerState):
>-        (rx::Renderer9::setBlendState):
>-        (rx::Renderer9::setDepthStencilState):
>-        (rx::Renderer9::setScissorRectangle):
>-        (rx::Renderer9::setViewport):
>-        (rx::Renderer9::applyPrimitiveType):
>-        (rx::Renderer9::getNullColorbuffer):
>-        (rx::Renderer9::applyRenderTarget):
>-        (rx::Renderer9::applyVertexBuffer):
>-        (rx::Renderer9::applyIndexBuffer):
>-        (rx::Renderer9::drawArrays):
>-        (rx::Renderer9::drawElements):
>-        (rx::Renderer9::drawLineLoop):
>-        (rx::drawPoints):
>-        (rx::Renderer9::drawIndexedPoints):
>-        (rx::Renderer9::applyShaders):
>-        (rx::Renderer9::applyUniforms):
>-        (rx::Renderer9::applyUniformnfv):
>-        (rx::Renderer9::applyUniformniv):
>-        (rx::Renderer9::applyUniformnbv):
>-        (rx::Renderer9::clear):
>-        (rx::Renderer9::markAllStateDirty):
>-        (rx::Renderer9::releaseDeviceResources):
>-        (rx::Renderer9::notifyDeviceLost):
>-        (rx::Renderer9::isDeviceLost):
>-        (rx::Renderer9::testDeviceLost):
>-        (rx::Renderer9::testDeviceResettable):
>-        (rx::Renderer9::resetDevice):
>-        (rx::Renderer9::getAdapterVendor):
>-        (rx::Renderer9::getRendererDescription):
>-        (rx::Renderer9::getAdapterIdentifier):
>-        (rx::Renderer9::getMultiSampleSupport):
>-        (rx::Renderer9::getBGRATextureSupport):
>-        (rx::Renderer9::getDXT1TextureSupport):
>-        (rx::Renderer9::getDXT3TextureSupport):
>-        (rx::Renderer9::getDXT5TextureSupport):
>-        (rx::Renderer9::getDepthTextureSupport):
>-        (rx::Renderer9::getFloat32TextureSupport):
>-        (rx::Renderer9::getFloat16TextureSupport):
>-        (rx::Renderer9::getLuminanceTextureSupport):
>-        (rx::Renderer9::getLuminanceAlphaTextureSupport):
>-        (rx::Renderer9::getTextureFilterAnisotropySupport):
>-        (rx::Renderer9::getTextureMaxAnisotropy):
>-        (rx::Renderer9::getEventQuerySupport):
>-        (rx::Renderer9::getMaxVertexTextureImageUnits):
>-        (rx::Renderer9::getMaxCombinedTextureImageUnits):
>-        (rx::Renderer9::getReservedVertexUniformVectors):
>-        (rx::Renderer9::getReservedFragmentUniformVectors):
>-        (rx::Renderer9::getMaxVertexUniformVectors):
>-        (rx::Renderer9::getMaxFragmentUniformVectors):
>-        (rx::Renderer9::getMaxVaryingVectors):
>-        (rx::Renderer9::getNonPower2TextureSupport):
>-        (rx::Renderer9::getOcclusionQuerySupport):
>-        (rx::Renderer9::getInstancingSupport):
>-        (rx::Renderer9::getShareHandleSupport):
>-        (rx::Renderer9::getDerivativeInstructionSupport):
>-        (rx::Renderer9::getPostSubBufferSupport):
>-        (rx::Renderer9::getMajorShaderModel):
>-        (rx::Renderer9::getMaxPointSize):
>-        (rx::Renderer9::getMaxViewportDimension):
>-        (rx::Renderer9::getMaxTextureWidth):
>-        (rx::Renderer9::getMaxTextureHeight):
>-        (rx::Renderer9::get32BitIndexSupport):
>-        (rx::Renderer9::getCapsDeclTypes):
>-        (rx::Renderer9::getMinSwapInterval):
>-        (rx::Renderer9::getMaxSwapInterval):
>-        (rx::Renderer9::getMaxSupportedSamples):
>-        (rx::Renderer9::getNearestSupportedSamples):
>-        (rx::Renderer9::getMaxRenderTargets):
>-        (rx::Renderer9::ConvertTextureInternalFormat):
>-        (rx::Renderer9::copyToRenderTarget):
>-        (rx::Renderer9::getBufferPool):
>-        (rx::Renderer9::copyImage):
>-        (rx::Renderer9::blitRect):
>-        (rx::Renderer9::readPixels):
>-        (rx::Renderer9::createRenderTarget):
>-        (rx::Renderer9::loadExecutable):
>-        (rx::Renderer9::compileToExecutable):
>-        (rx::Renderer9::boxFilter):
>-        (rx::Renderer9::getTexturePool):
>-        (rx::Renderer9::createImage):
>-        (rx::Renderer9::generateMipmap):
>-        (rx::Renderer9::createTextureStorage2D):
>-        (rx::Renderer9::createTextureStorageCube):
>-        (rx::Renderer9::getLUID):
>-        * src/libGLESv2/renderer/Renderer9.h: Added.
>-        (rx::Renderer9::getDevice):
>-        * src/libGLESv2/renderer/ShaderCache.h: Added.
>-        (rx::ShaderCache::ShaderCache):
>-        (rx::ShaderCache::~ShaderCache):
>-        (rx::ShaderCache::initialize):
>-        (rx::ShaderCache::create):
>-        (rx::ShaderCache::clear):
>-        (rx::ShaderCache::createShader):
>-        * src/libGLESv2/renderer/ShaderExecutable.h: Added.
>-        (rx::ShaderExecutable::ShaderExecutable):
>-        (rx::ShaderExecutable::~ShaderExecutable):
>-        (rx::ShaderExecutable::getFunction):
>-        (rx::ShaderExecutable::getLength):
>-        * src/libGLESv2/renderer/ShaderExecutable11.cpp: Added.
>-        (rx::ShaderExecutable11::ShaderExecutable11):
>-        (rx::ShaderExecutable11::~ShaderExecutable11):
>-        (rx::ShaderExecutable11::makeShaderExecutable11):
>-        (rx::ShaderExecutable11::getVertexShader):
>-        (rx::ShaderExecutable11::getPixelShader):
>-        (rx::ShaderExecutable11::getGeometryShader):
>-        (rx::ShaderExecutable11::getConstantBuffer):
>-        * src/libGLESv2/renderer/ShaderExecutable11.h: Added.
>-        * src/libGLESv2/renderer/ShaderExecutable9.cpp: Added.
>-        (rx::ShaderExecutable9::ShaderExecutable9):
>-        (rx::ShaderExecutable9::~ShaderExecutable9):
>-        (rx::ShaderExecutable9::makeShaderExecutable9):
>-        (rx::ShaderExecutable9::getVertexShader):
>-        (rx::ShaderExecutable9::getPixelShader):
>-        * src/libGLESv2/renderer/ShaderExecutable9.h: Added.
>-        * src/libGLESv2/renderer/SwapChain.h: Added.
>-        (rx::SwapChain::SwapChain):
>-        (rx::SwapChain::~SwapChain):
>-        (rx::SwapChain::getShareHandle):
>-        * src/libGLESv2/renderer/SwapChain11.cpp: Added.
>-        (rx::SwapChain11::SwapChain11):
>-        (rx::SwapChain11::~SwapChain11):
>-        (rx::SwapChain11::release):
>-        (rx::SwapChain11::releaseOffscreenTexture):
>-        (rx::SwapChain11::resetOffscreenTexture):
>-        (rx::SwapChain11::resize):
>-        (rx::SwapChain11::reset):
>-        (rx::SwapChain11::initPassThroughResources):
>-        (rx::SwapChain11::swapRect):
>-        (rx::SwapChain11::getOffscreenTexture):
>-        (rx::SwapChain11::getRenderTarget):
>-        (rx::SwapChain11::getRenderTargetShaderResource):
>-        (rx::SwapChain11::getDepthStencil):
>-        (rx::SwapChain11::getDepthStencilTexture):
>-        (rx::SwapChain11::makeSwapChain11):
>-        (rx::SwapChain11::recreate):
>-        * src/libGLESv2/renderer/SwapChain11.h: Added.
>-        (rx::SwapChain11::getWidth):
>-        (rx::SwapChain11::getHeight):
>-        * src/libGLESv2/renderer/SwapChain9.cpp: Added.
>-        (rx::SwapChain9::SwapChain9):
>-        (rx::SwapChain9::~SwapChain9):
>-        (rx::SwapChain9::release):
>-        (rx::convertInterval):
>-        (rx::SwapChain9::resize):
>-        (rx::SwapChain9::reset):
>-        (rx::SwapChain9::swapRect):
>-        (rx::SwapChain9::getRenderTarget):
>-        (rx::SwapChain9::getDepthStencil):
>-        (rx::SwapChain9::getOffscreenTexture):
>-        (rx::SwapChain9::makeSwapChain9):
>-        (rx::SwapChain9::recreate):
>-        * src/libGLESv2/renderer/SwapChain9.h: Added.
>-        * src/libGLESv2/renderer/TextureStorage.cpp: Added.
>-        (rx::TextureStorageInterface::TextureStorageInterface):
>-        (rx::TextureStorageInterface::~TextureStorageInterface):
>-        (rx::TextureStorageInterface::isRenderTarget):
>-        (rx::TextureStorageInterface::isManaged):
>-        (rx::TextureStorageInterface::getTextureSerial):
>-        (rx::TextureStorageInterface::issueTextureSerial):
>-        (rx::TextureStorageInterface::getLodOffset):
>-        (rx::TextureStorageInterface::levelCount):
>-        (rx::TextureStorageInterface2D::TextureStorageInterface2D):
>-        (rx::TextureStorageInterface2D::~TextureStorageInterface2D):
>-        (rx::TextureStorageInterface2D::getRenderTarget):
>-        (rx::TextureStorageInterface2D::generateMipmap):
>-        (rx::TextureStorageInterface2D::getRenderTargetSerial):
>-        (rx::TextureStorageInterfaceCube::TextureStorageInterfaceCube):
>-        (rx::TextureStorageInterfaceCube::~TextureStorageInterfaceCube):
>-        (rx::TextureStorageInterfaceCube::getRenderTarget):
>-        (rx::TextureStorageInterfaceCube::generateMipmap):
>-        (rx::TextureStorageInterfaceCube::getRenderTargetSerial):
>-        * src/libGLESv2/renderer/TextureStorage.h: Added.
>-        (rx::TextureStorage::TextureStorage):
>-        (rx::TextureStorage::~TextureStorage):
>-        (rx::TextureStorageInterface::getStorageInstance):
>-        * src/libGLESv2/renderer/TextureStorage11.cpp: Added.
>-        (rx::TextureStorage11::TextureStorage11):
>-        (rx::TextureStorage11::~TextureStorage11):
>-        (rx::TextureStorage11::makeTextureStorage11):
>-        (rx::TextureStorage11::GetTextureBindFlags):
>-        (rx::TextureStorage11::IsTextureFormatRenderable):
>-        (rx::TextureStorage11::getBindFlags):
>-        (rx::TextureStorage11::getBaseTexture):
>-        (rx::TextureStorage11::getLodOffset):
>-        (rx::TextureStorage11::isRenderTarget):
>-        (rx::TextureStorage11::isManaged):
>-        (rx::TextureStorage11::levelCount):
>-        (rx::TextureStorage11::getSubresourceIndex):
>-        (rx::TextureStorage11::updateSubresourceLevel):
>-        (rx::TextureStorage11::generateMipmapLayer):
>-        (rx::TextureStorage11_2D::TextureStorage11_2D):
>-        (rx::TextureStorage11_2D::~TextureStorage11_2D):
>-        (rx::TextureStorage11_2D::makeTextureStorage11_2D):
>-        (rx::TextureStorage11_2D::getRenderTarget):
>-        (rx::TextureStorage11_2D::getSRV):
>-        (rx::TextureStorage11_2D::generateMipmap):
>-        (rx::TextureStorage11_Cube::TextureStorage11_Cube):
>-        (rx::TextureStorage11_Cube::~TextureStorage11_Cube):
>-        (rx::TextureStorage11_Cube::makeTextureStorage11_Cube):
>-        (rx::TextureStorage11_Cube::getRenderTarget):
>-        (rx::TextureStorage11_Cube::getSRV):
>-        (rx::TextureStorage11_Cube::generateMipmap):
>-        * src/libGLESv2/renderer/TextureStorage11.h: Added.
>-        (rx::TextureStorage11::getRenderTarget):
>-        (rx::TextureStorage11::generateMipmap):
>-        * src/libGLESv2/renderer/TextureStorage9.cpp: Added.
>-        (rx::TextureStorage9::TextureStorage9):
>-        (rx::TextureStorage9::~TextureStorage9):
>-        (rx::TextureStorage9::makeTextureStorage9):
>-        (rx::TextureStorage9::GetTextureUsage):
>-        (rx::TextureStorage9::IsTextureFormatRenderable):
>-        (rx::TextureStorage9::isRenderTarget):
>-        (rx::TextureStorage9::isManaged):
>-        (rx::TextureStorage9::getPool):
>-        (rx::TextureStorage9::getUsage):
>-        (rx::TextureStorage9::getLodOffset):
>-        (rx::TextureStorage9::levelCount):
>-        (rx::TextureStorage9_2D::TextureStorage9_2D):
>-        (rx::TextureStorage9_2D::~TextureStorage9_2D):
>-        (rx::TextureStorage9_2D::makeTextureStorage9_2D):
>-        (rx::TextureStorage9_2D::getSurfaceLevel):
>-        (rx::TextureStorage9_2D::getRenderTarget):
>-        (rx::TextureStorage9_2D::generateMipmap):
>-        (rx::TextureStorage9_2D::getBaseTexture):
>-        (rx::TextureStorage9_2D::initializeRenderTarget):
>-        (rx::TextureStorage9_Cube::TextureStorage9_Cube):
>-        (rx::TextureStorage9_Cube::~TextureStorage9_Cube):
>-        (rx::TextureStorage9_Cube::makeTextureStorage9_Cube):
>-        (rx::TextureStorage9_Cube::getCubeMapSurface):
>-        (rx::TextureStorage9_Cube::getRenderTarget):
>-        (rx::TextureStorage9_Cube::generateMipmap):
>-        (rx::TextureStorage9_Cube::getBaseTexture):
>-        (rx::TextureStorage9_Cube::initializeRenderTarget):
>-        * src/libGLESv2/renderer/TextureStorage9.h: Added.
>-        (rx::TextureStorage9::getRenderTarget):
>-        (rx::TextureStorage9::generateMipmap):
>-        * src/libGLESv2/renderer/VertexBuffer.cpp: Added.
>-        (rx::VertexBuffer::VertexBuffer):
>-        (rx::VertexBuffer::~VertexBuffer):
>-        (rx::VertexBuffer::updateSerial):
>-        (rx::VertexBuffer::getSerial):
>-        (rx::VertexBufferInterface::VertexBufferInterface):
>-        (rx::VertexBufferInterface::~VertexBufferInterface):
>-        (rx::VertexBufferInterface::getSerial):
>-        (rx::VertexBufferInterface::getBufferSize):
>-        (rx::VertexBufferInterface::setBufferSize):
>-        (rx::VertexBufferInterface::getWritePosition):
>-        (rx::VertexBufferInterface::setWritePosition):
>-        (rx::VertexBufferInterface::discard):
>-        (rx::VertexBufferInterface::storeVertexAttributes):
>-        (rx::VertexBufferInterface::storeRawData):
>-        (rx::VertexBufferInterface::reserveVertexSpace):
>-        (rx::VertexBufferInterface::reserveRawDataSpace):
>-        (rx::VertexBufferInterface::getVertexBuffer):
>-        (rx::StreamingVertexBufferInterface::StreamingVertexBufferInterface):
>-        (rx::StreamingVertexBufferInterface::~StreamingVertexBufferInterface):
>-        (rx::StreamingVertexBufferInterface::reserveSpace):
>-        (rx::StaticVertexBufferInterface::StaticVertexBufferInterface):
>-        (rx::StaticVertexBufferInterface::~StaticVertexBufferInterface):
>-        (rx::StaticVertexBufferInterface::lookupAttribute):
>-        (rx::StaticVertexBufferInterface::reserveSpace):
>-        (rx::StaticVertexBufferInterface::storeVertexAttributes):
>-        * src/libGLESv2/renderer/VertexBuffer.h: Added.
>-        * src/libGLESv2/renderer/VertexBuffer11.cpp: Added.
>-        (rx::VertexBuffer11::VertexBuffer11):
>-        (rx::VertexBuffer11::~VertexBuffer11):
>-        (rx::VertexBuffer11::initialize):
>-        (rx::VertexBuffer11::makeVertexBuffer11):
>-        (rx::VertexBuffer11::storeVertexAttributes):
>-        (rx::VertexBuffer11::storeRawData):
>-        (rx::VertexBuffer11::getSpaceRequired):
>-        (rx::VertexBuffer11::requiresConversion):
>-        (rx::VertexBuffer11::getBufferSize):
>-        (rx::VertexBuffer11::setBufferSize):
>-        (rx::VertexBuffer11::discard):
>-        (rx::VertexBuffer11::getVertexSize):
>-        (rx::VertexBuffer11::getDXGIFormat):
>-        (rx::VertexBuffer11::getBuffer):
>-        (rx::copyVertexData):
>-        (rx::copyFixedVertexData):
>-        (rx::copyToFloatVertexData):
>-        (rx::VertexBuffer11::getVertexConversion):
>-        * src/libGLESv2/renderer/VertexBuffer11.h: Added.
>-        * src/libGLESv2/renderer/VertexBuffer9.cpp: Added.
>-        (rx::VertexBuffer9::VertexBuffer9):
>-        (rx::VertexBuffer9::~VertexBuffer9):
>-        (rx::VertexBuffer9::initialize):
>-        (rx::VertexBuffer9::makeVertexBuffer9):
>-        (rx::VertexBuffer9::storeVertexAttributes):
>-        (rx::VertexBuffer9::storeRawData):
>-        (rx::VertexBuffer9::getSpaceRequired):
>-        (rx::VertexBuffer9::requiresConversion):
>-        (rx::VertexBuffer9::getVertexSize):
>-        (rx::VertexBuffer9::getDeclType):
>-        (rx::VertexBuffer9::getBufferSize):
>-        (rx::VertexBuffer9::setBufferSize):
>-        (rx::VertexBuffer9::discard):
>-        (rx::VertexBuffer9::getBuffer):
>-        (rx::VertexBuffer9::initializeTranslations):
>-        (rx::VertexBuffer9::typeIndex):
>-        (rx::VertexBuffer9::formatConverter):
>-        (rx::VertexBuffer9::spaceRequired):
>-        * src/libGLESv2/renderer/VertexBuffer9.h: Added.
>-        * src/libGLESv2/renderer/VertexDataManager.cpp: Added.
>-        (rx::elementsInBuffer):
>-        (rx::VertexDataManager::VertexDataManager):
>-        (rx::VertexDataManager::~VertexDataManager):
>-        (rx::directStoragePossible):
>-        (rx::VertexDataManager::prepareVertexData):
>-        * src/libGLESv2/renderer/VertexDataManager.h: Added.
>-        * src/libGLESv2/renderer/VertexDeclarationCache.cpp: Added.
>-        (rx::VertexDeclarationCache::VertexDeclarationCache):
>-        (rx::VertexDeclarationCache::~VertexDeclarationCache):
>-        (rx::VertexDeclarationCache::applyDeclaration):
>-        (rx::VertexDeclarationCache::markStateDirty):
>-        * src/libGLESv2/renderer/VertexDeclarationCache.h: Added.
>-        * src/libGLESv2/renderer/generatemip.h: Added.
>-        (rx::L8::average):
>-        (rx::A8L8::average):
>-        (rx::A8R8G8B8::average):
>-        (rx::A16B16G16R16F::average):
>-        (rx::R16F::average):
>-        (rx::R16G16F::average):
>-        (rx::A32B32G32R32F::average):
>-        (rx::R32F::average):
>-        (rx::R32G32F::average):
>-        (rx::R32G32B32F::average):
>-        (rx::GenerateMip):
>-        * src/libGLESv2/renderer/renderer11_utils.cpp: Added.
>-        (gl_d3d11::ConvertBlendFunc):
>-        (gl_d3d11::ConvertBlendOp):
>-        (gl_d3d11::ConvertColorMask):
>-        (gl_d3d11::ConvertCullMode):
>-        (gl_d3d11::ConvertComparison):
>-        (gl_d3d11::ConvertDepthMask):
>-        (gl_d3d11::ConvertStencilMask):
>-        (gl_d3d11::ConvertStencilOp):
>-        (gl_d3d11::ConvertFilter):
>-        (gl_d3d11::ConvertTextureWrap):
>-        (gl_d3d11::ConvertMinLOD):
>-        (gl_d3d11::ConvertMaxLOD):
>-        (d3d11_gl::ConvertBackBufferFormat):
>-        (d3d11_gl::ConvertDepthStencilFormat):
>-        (d3d11_gl::ConvertRenderbufferFormat):
>-        (d3d11_gl::ConvertTextureInternalFormat):
>-        (gl_d3d11::ConvertRenderbufferFormat):
>-        (gl_d3d11::ConvertTextureFormat):
>-        (d3d11::SetPositionTexCoordVertex):
>-        (d3d11::SetPositionDepthColorVertex):
>-        (d3d11::ComputePixelSizeBits):
>-        (d3d11::ComputeBlockSizeBits):
>-        (d3d11::IsCompressed):
>-        (d3d11::GetTextureFormatDimensionAlignment):
>-        (d3d11::IsDepthStencilFormat):
>-        (d3d11::GetDepthTextureFormat):
>-        (d3d11::GetDepthShaderResourceFormat):
>-        (d3d11::SetDebugName):
>-        * src/libGLESv2/renderer/renderer11_utils.h: Added.
>-        (d3d11::isDeviceLostError):
>-        * src/libGLESv2/renderer/renderer9_utils.cpp: Added.
>-        (gl_d3d9::ConvertComparison):
>-        (gl_d3d9::ConvertColor):
>-        (gl_d3d9::ConvertBlendFunc):
>-        (gl_d3d9::ConvertBlendOp):
>-        (gl_d3d9::ConvertStencilOp):
>-        (gl_d3d9::ConvertTextureWrap):
>-        (gl_d3d9::ConvertCullMode):
>-        (gl_d3d9::ConvertCubeFace):
>-        (gl_d3d9::ConvertColorMask):
>-        (gl_d3d9::ConvertMagFilter):
>-        (gl_d3d9::ConvertMinFilter):
>-        (gl_d3d9::ConvertRenderbufferFormat):
>-        (gl_d3d9::GetMultisampleTypeFromSamples):
>-        (d3d9_gl::GetStencilSize):
>-        (d3d9_gl::GetAlphaSize):
>-        (d3d9_gl::GetSamplesFromMultisampleType):
>-        (d3d9_gl::IsFormatChannelEquivalent):
>-        (d3d9_gl::ConvertBackBufferFormat):
>-        (d3d9_gl::ConvertDepthStencilFormat):
>-        (d3d9_gl::ConvertRenderTargetFormat):
>-        (d3d9_gl::GetEquivalentFormat):
>-        (d3d9::IsCompressedFormat):
>-        (d3d9::ComputeRowSize):
>-        * src/libGLESv2/renderer/renderer9_utils.h: Added.
>-        (d3d9::isDeviceLostError):
>-        * src/libGLESv2/renderer/shaders: Added.
>-        * src/libGLESv2/renderer/shaders/Blit.ps: Added.
>-        * src/libGLESv2/renderer/shaders/Blit.vs: Added.
>-        * src/libGLESv2/renderer/shaders/Clear11.hlsl: Added.
>-        * src/libGLESv2/renderer/shaders/Passthrough11.hlsl: Added.
>-        * src/libGLESv2/renderer/shaders/compiled: Added.
>-        * src/libGLESv2/renderer/shaders/compiled/clear11vs.h: Added.
>-        * src/libGLESv2/renderer/shaders/compiled/clearmultiple11ps.h: Added.
>-        * src/libGLESv2/renderer/shaders/compiled/clearsingle11ps.h: Added.
>-        * src/libGLESv2/renderer/shaders/compiled/componentmaskps.h: Added.
>-        * src/libGLESv2/renderer/shaders/compiled/flipyvs.h: Added.
>-        * src/libGLESv2/renderer/shaders/compiled/luminanceps.h: Added.
>-        * src/libGLESv2/renderer/shaders/compiled/passthrough11vs.h: Added.
>-        * src/libGLESv2/renderer/shaders/compiled/passthroughlum11ps.h: Added.
>-        * src/libGLESv2/renderer/shaders/compiled/passthroughlumalpha11ps.h: Added.
>-        * src/libGLESv2/renderer/shaders/compiled/passthroughps.h: Added.
>-        * src/libGLESv2/renderer/shaders/compiled/passthroughrgb11ps.h: Added.
>-        * src/libGLESv2/renderer/shaders/compiled/passthroughrgba11ps.h: Added.
>-        * src/libGLESv2/renderer/shaders/compiled/standardvs.h: Added.
>-        * src/libGLESv2/renderer/shaders/generate_shaders.bat: Added.
>-        * src/libGLESv2/renderer/vertexconversion.h: Added.
>-        (rx::Identity::convert):
>-        (rx::Cast::convert):
>-        (rx::Normalize::convert):
>-        (rx::FixedToFloat::convert):
>-        (rx::SimpleDefaultValues::zero):
>-        (rx::SimpleDefaultValues::one):
>-        (rx::NormalizedDefaultValues::zero):
>-        (rx::NormalizedDefaultValues::one):
>-        (rx::VertexDataConverter::convertArray):
>-        (rx::VertexDataConverter::pointerAddBytes):
>-        (rx::VertexDataConverter::copyComponent):
>-        * src/libGLESv2/resource.h: Added.
>-        * src/libGLESv2/utilities.cpp: Added.
>-        (gl::UniformComponentCount):
>-        (gl::UniformComponentType):
>-        (gl::UniformComponentSize):
>-        (gl::UniformInternalSize):
>-        (gl::UniformExternalSize):
>-        (gl::VariableRowCount):
>-        (gl::VariableColumnCount):
>-        (gl::AllocateFirstFreeBits):
>-        (gl::ComputePitch):
>-        (gl::ComputeCompressedPitch):
>-        (gl::ComputeCompressedSize):
>-        (gl::IsCompressed):
>-        (gl::IsDepthTexture):
>-        (gl::IsStencilTexture):
>-        (gl::MakeValidSize):
>-        (gl::ComputePixelSize):
>-        (gl::IsCubemapTextureTarget):
>-        (gl::IsInternalTextureTarget):
>-        (gl::ConvertSizedInternalFormat):
>-        (gl::ExtractFormat):
>-        (gl::ExtractType):
>-        (gl::IsColorRenderable):
>-        (gl::IsDepthRenderable):
>-        (gl::IsStencilRenderable):
>-        (gl::IsFloat32Format):
>-        (gl::IsFloat16Format):
>-        (gl::GetAlphaSize):
>-        (gl::GetRedSize):
>-        (gl::GetGreenSize):
>-        (gl::GetBlueSize):
>-        (gl::GetDepthSize):
>-        (gl::GetStencilSize):
>-        (gl::IsTriangleMode):
>-        (getTempPath):
>-        (writeFile):
>-        * src/libGLESv2/utilities.h: Added.
>-        * src/third_party/murmurhash: Added.
>-        * src/third_party/murmurhash/LICENSE: Added.
>-        * src/third_party/murmurhash/MurmurHash3.cpp: Added, replaced tabs with spaces.
>-        (rotl32):
>-        (rotl64):
>-        (getblock):
>-        (fmix):
>-        (MurmurHash3_x86_32):
>-        (MurmurHash3_x86_128):
>-        (MurmurHash3_x64_128):
>-        * src/third_party/murmurhash/MurmurHash3.h: Added, replaced tabs with spaces.
>-
>-2013-07-20  Dean Jackson  <dino@apple.com>
>-
>-        Updated ANGLE is leaking like a sieve
>-        https://bugs.webkit.org/show_bug.cgi?id=118939
>-
>-        Rollout 152863, r152821, r152929 and r152755.
>-
>-        * ANGLE.plist:
>-        * ANGLE.xcodeproj/project.pbxproj:
>-        * DerivedSources.make: Removed.
>-        * GNUmakefile.am:
>-        * Target.pri:
>-        * include/GLSLANG/ShaderLang.h:
>-        * src/compiler/BaseTypes.h:
>-        (getQualifierString):
>-        * src/compiler/Common.h:
>-        (EncodeSourceLoc):
>-        (DecodeSourceLoc):
>-        * src/compiler/Compiler.cpp:
>-        (TCompiler::TCompiler):
>-        (TCompiler::Init):
>-        (TCompiler::compile):
>-        (TCompiler::detectRecursion):
>-        * src/compiler/ConstantUnion.h:
>-        (ConstantUnion::ConstantUnion):
>-        * src/compiler/DetectCallDepth.cpp: Removed.
>-        * src/compiler/DetectRecursion.cpp: Added.
>-        (DetectRecursion::FunctionNode::FunctionNode):
>-        (DetectRecursion::FunctionNode::getName):
>-        (DetectRecursion::FunctionNode::addCallee):
>-        (DetectRecursion::FunctionNode::detectRecursion):
>-        (DetectRecursion::DetectRecursion):
>-        (DetectRecursion::~DetectRecursion):
>-        (DetectRecursion::visitAggregate):
>-        (DetectRecursion::detectRecursion):
>-        (DetectRecursion::findFunctionByName):
>-        * src/compiler/DetectRecursion.h: Renamed from Source/ThirdParty/ANGLE/src/compiler/DetectCallDepth.h.
>-        * src/compiler/Diagnostics.cpp:
>-        (TDiagnostics::writeInfo):
>-        * src/compiler/ForLoopUnroll.cpp:
>-        (ForLoopUnroll::evaluateIntConstant):
>-        * src/compiler/InfoSink.cpp:
>-        (TInfoSinkBase::prefix):
>-        (TInfoSinkBase::location):
>-        (TInfoSinkBase::message):
>-        * src/compiler/InfoSink.h:
>-        * src/compiler/Initialize.cpp:
>-        (BuiltInFunctionsCommon):
>-        (BuiltInFunctionsVertex):
>-        (TBuiltIns::initialize):
>-        (IdentifyBuiltIns):
>-        (InitExtensionBehavior):
>-        * src/compiler/Intermediate.cpp:
>-        (TIntermediate::addSymbol):
>-        (TIntermediate::addBinaryMath):
>-        (TIntermediate::addAssign):
>-        (TIntermediate::addIndex):
>-        (TIntermediate::addUnaryMath):
>-        (TIntermediate::setAggregateOperator):
>-        (TIntermediate::addConversion):
>-        (TIntermediate::growAggregate):
>-        (TIntermediate::makeAggregate):
>-        (TIntermediate::addSelection):
>-        (TIntermediate::addComma):
>-        (TIntermediate::addConstantUnion):
>-        (TIntermediate::addSwizzle):
>-        (TIntermediate::addLoop):
>-        (TIntermediate::addBranch):
>-        (TIntermUnary::promote):
>-        (TIntermBinary::promote):
>-        (CompareStruct):
>-        (CompareStructure):
>-        (TIntermConstantUnion::fold):
>-        (TIntermediate::promoteConstantUnion):
>-        * src/compiler/OutputGLSL.cpp:
>-        (TOutputGLSL::writeVariablePrecision):
>-        * src/compiler/OutputGLSL.h:
>-        * src/compiler/OutputGLSLBase.cpp:
>-        (TOutputGLSLBase::writeVariableType):
>-        (TOutputGLSLBase::writeConstantUnion):
>-        (TOutputGLSLBase::visitBinary):
>-        (TOutputGLSLBase::visitAggregate):
>-        (TOutputGLSLBase::getTypeName):
>-        (TOutputGLSLBase::hashFunctionName):
>-        * src/compiler/OutputGLSLBase.h:
>-        * src/compiler/OutputHLSL.cpp:
>-        (sh::OutputHLSL::OutputHLSL):
>-        (sh::OutputHLSL::header):
>-        (sh::OutputHLSL::visitSymbol):
>-        (sh::OutputHLSL::visitBinary):
>-        (sh::OutputHLSL::visitAggregate):
>-        (sh::OutputHLSL::visitSelection):
>-        (sh::OutputHLSL::visitLoop):
>-        (sh::OutputHLSL::handleExcessiveLoop):
>-        (sh::OutputHLSL::typeString):
>-        (sh::OutputHLSL::initializer):
>-        (sh::OutputHLSL::addConstructor):
>-        (sh::OutputHLSL::writeConstantUnion):
>-        (sh::OutputHLSL::decorateField):
>-        * src/compiler/OutputHLSL.h:
>-        * src/compiler/ParseHelper.cpp:
>-        (TParseContext::parseVectorFields):
>-        (TParseContext::parseMatrixFields):
>-        (TParseContext::error):
>-        (TParseContext::warning):
>-        (TParseContext::assignError):
>-        (TParseContext::unaryOpError):
>-        (TParseContext::binaryOpError):
>-        (TParseContext::precisionErrorCheck):
>-        (TParseContext::lValueErrorCheck):
>-        (TParseContext::globalErrorCheck):
>-        (TParseContext::reservedErrorCheck):
>-        (TParseContext::constructorErrorCheck):
>-        (TParseContext::voidErrorCheck):
>-        (TParseContext::boolErrorCheck):
>-        (TParseContext::samplerErrorCheck):
>-        (TParseContext::structQualifierErrorCheck):
>-        (TParseContext::parameterSamplerErrorCheck):
>-        (TParseContext::containsSampler):
>-        (TParseContext::arraySizeErrorCheck):
>-        (TParseContext::arrayQualifierErrorCheck):
>-        (TParseContext::arrayTypeErrorCheck):
>-        (TParseContext::arrayErrorCheck):
>-        (TParseContext::arraySetMaxSize):
>-        (TParseContext::nonInitConstErrorCheck):
>-        (TParseContext::nonInitErrorCheck):
>-        (TParseContext::paramErrorCheck):
>-        (TParseContext::extensionErrorCheck):
>-        (TParseContext::handleExtensionDirective):
>-        (TParseContext::handlePragmaDirective):
>-        (TParseContext::findFunction):
>-        (TParseContext::executeInitializer):
>-        (TParseContext::addConstructor):
>-        (TParseContext::constructBuiltIn):
>-        (TParseContext::constructStruct):
>-        (TParseContext::addConstVectorNode):
>-        (TParseContext::addConstMatrixNode):
>-        (TParseContext::addConstArrayNode):
>-        (TParseContext::addConstStruct):
>-        (TParseContext::enterStructDeclaration):
>-        (TParseContext::structNestingErrorCheck):
>-        * src/compiler/ParseHelper.h:
>-        (TParseContext::TParseContext):
>-        (TParseContext::pragma):
>-        * src/compiler/PoolAlloc.cpp:
>-        (TPoolAllocator::allocate):
>-        * src/compiler/ShHandle.h:
>-        * src/compiler/ShaderLang.cpp:
>-        (ShInitBuiltInResources):
>-        * src/compiler/SymbolTable.cpp:
>-        (TType::TType):
>-        (TType::buildMangledName):
>-        (TType::getStructSize):
>-        (TType::computeDeepestStructNesting):
>-        (TType::isStructureContainingArrays):
>-        (TSymbolTableLevel::relateToExtension):
>-        (TSymbol::TSymbol):
>-        (TVariable::TVariable):
>-        (TVariable::clone):
>-        (TFunction::TFunction):
>-        (TFunction::clone):
>-        (TSymbolTableLevel::clone):
>-        (TSymbolTable::copyTable):
>-        * src/compiler/SymbolTable.h:
>-        (TVariable::TVariable):
>-        (TVariable::updateArrayInformationType):
>-        (TVariable::getArrayInformationType):
>-        (TParameter::copyParam):
>-        (TFunction::relateToExtension):
>-        (TFunction::getExtension):
>-        * src/compiler/Types.h:
>-        (NewPoolTTypeList):
>-        (TType::TType):
>-        (TType::copyType):
>-        (TType::clone):
>-        (TType::getObjectSize):
>-        (TType::getMaxArraySize):
>-        (TType::setMaxArraySize):
>-        (TType::clearArrayness):
>-        (TType::setArrayInformationType):
>-        (TType::getArrayInformationType):
>-        (TType::getStruct):
>-        (TType::setStruct):
>-        (TType::getTypeName):
>-        (TType::setTypeName):
>-        (TType::isField):
>-        (TType::getFieldName):
>-        (TType::setFieldName):
>-        (TType::getMangledName):
>-        (TType::getDeepestStructNesting):
>-        (TPublicType::setBasic):
>-        * src/compiler/VariableInfo.cpp:
>-        (getUserDefinedVariableInfo):
>-        * src/compiler/builtin_symbol_table.cpp: Removed.
>-        * src/compiler/builtin_symbol_table.h: Removed.
>-        * src/compiler/builtin_symbols.json: Removed.
>-        * src/compiler/generate_builtin_symbol_table.py: Removed.
>-        * src/compiler/glslang.l:
>-        * src/compiler/glslang.y:
>-        * src/compiler/glslang_lex.cpp:
>-        (yy_get_previous_state):
>-        (yy_try_NUL_trans):
>-        (yy_push_state):
>-        (yy_pop_state):
>-        (yy_top_state):
>-        (string_input):
>-        (check_type):
>-        (reserved_word):
>-        (yyerror):
>-        (glslang_scan):
>-        * src/compiler/glslang_tab.cpp:
>-        * src/compiler/glslang_tab.h:
>-        * src/compiler/intermOut.cpp:
>-        (TOutputTraverser::visitUnary):
>-        (TOutputTraverser::visitAggregate):
>-        (TOutputTraverser::visitConstantUnion):
>-        * src/compiler/intermediate.h:
>-        (TIntermNode::TIntermNode):
>-        (TIntermNode::getLine):
>-        (TIntermNode::setLine):
>-        (TIntermNode::~TIntermNode):
>-        (TIntermConstantUnion::setUnionArrayPointer):
>-        (TIntermAggregate::TIntermAggregate):
>-        (TIntermAggregate::setEndLine):
>-        (TIntermAggregate::getEndLine):
>-        (TIntermTraverser::TIntermTraverser):
>-        (TIntermTraverser::incrementDepth):
>-        * src/compiler/localintermediate.h:
>-        * src/compiler/parseConst.cpp:
>-        (TConstTraverser::visitSymbol):
>-        (TConstTraverser::visitBinary):
>-        (TConstTraverser::visitUnary):
>-        (TConstTraverser::visitAggregate):
>-        (TConstTraverser::visitSelection):
>-        (TConstTraverser::visitConstantUnion):
>-        (TConstTraverser::visitLoop):
>-        (TConstTraverser::visitBranch):
>-        (TIntermediate::parseConstTree):
>-        * src/compiler/timing/RestrictVertexShaderTiming.cpp:
>-        (RestrictVertexShaderTiming::visitSymbol):
>-        * src/libEGL/Config.cpp: Removed.
>-        * src/libEGL/Config.h: Removed.
>-        * src/libEGL/Display.cpp: Removed.
>-        * src/libEGL/Display.h: Removed.
>-        * src/libEGL/README: Added.
>-        * src/libEGL/ShaderCache.h: Removed.
>-        * src/libEGL/Surface.cpp: Removed.
>-        * src/libEGL/Surface.h: Removed.
>-        * src/libEGL/libEGL.cpp: Removed.
>-        * src/libEGL/libEGL.def: Removed.
>-        * src/libEGL/libEGL.rc: Removed.
>-        * src/libEGL/libEGL.vcxproj: Removed.
>-        * src/libEGL/libEGL.vcxproj.filters: Removed.
>-        * src/libEGL/main.cpp: Removed.
>-        * src/libEGL/main.h: Removed.
>-        * src/libEGL/resource.h: Removed.
>-        * src/libGLESv2/BinaryStream.h: Removed.
>-        * src/libGLESv2/Blit.cpp: Removed.
>-        * src/libGLESv2/Blit.h: Removed.
>-        * src/libGLESv2/Buffer.cpp: Removed.
>-        * src/libGLESv2/Buffer.h: Removed.
>-        * src/libGLESv2/Context.cpp: Removed.
>-        * src/libGLESv2/Context.h: Removed.
>-        * src/libGLESv2/D3DConstantTable.cpp: Removed.
>-        * src/libGLESv2/D3DConstantTable.h: Removed.
>-        * src/libGLESv2/Fence.cpp: Removed.
>-        * src/libGLESv2/Fence.h: Removed.
>-        * src/libGLESv2/Float16ToFloat32.cpp: Removed.
>-        * src/libGLESv2/Float16ToFloat32.py: Removed.
>-        * src/libGLESv2/Framebuffer.cpp: Removed.
>-        * src/libGLESv2/Framebuffer.h: Removed.
>-        * src/libGLESv2/HandleAllocator.cpp: Removed.
>-        * src/libGLESv2/HandleAllocator.h: Removed.
>-        * src/libGLESv2/IndexDataManager.cpp: Removed.
>-        * src/libGLESv2/IndexDataManager.h: Removed.
>-        * src/libGLESv2/Program.cpp: Removed.
>-        * src/libGLESv2/Program.h: Removed.
>-        * src/libGLESv2/ProgramBinary.cpp: Removed.
>-        * src/libGLESv2/ProgramBinary.h: Removed.
>-        * src/libGLESv2/Query.cpp: Removed.
>-        * src/libGLESv2/Query.h: Removed.
>-        * src/libGLESv2/README: Added.
>-        * src/libGLESv2/Renderbuffer.cpp: Removed.
>-        * src/libGLESv2/Renderbuffer.h: Removed.
>-        * src/libGLESv2/ResourceManager.cpp: Removed.
>-        * src/libGLESv2/ResourceManager.h: Removed.
>-        * src/libGLESv2/Shader.cpp: Removed.
>-        * src/libGLESv2/Shader.h: Removed.
>-        * src/libGLESv2/Texture.cpp: Removed.
>-        * src/libGLESv2/Texture.h: Removed.
>-        * src/libGLESv2/TextureSSE2.cpp: Removed.
>-        * src/libGLESv2/VertexDataManager.cpp: Removed.
>-        * src/libGLESv2/VertexDataManager.h: Removed.
>-        * src/libGLESv2/libGLESv2.cpp: Removed.
>-        * src/libGLESv2/libGLESv2.def: Removed.
>-        * src/libGLESv2/libGLESv2.rc: Removed.
>-        * src/libGLESv2/libGLESv2.vcxproj: Removed.
>-        * src/libGLESv2/libGLESv2.vcxproj.filters: Removed.
>-        * src/libGLESv2/main.cpp: Removed.
>-        * src/libGLESv2/main.h: Removed.
>-        * src/libGLESv2/mathutil.h: Removed.
>-        * src/libGLESv2/resource.h: Removed.
>-        * src/libGLESv2/shaders/Blit.ps: Removed.
>-        * src/libGLESv2/shaders/Blit.vs: Removed.
>-        * src/libGLESv2/shaders/componentmaskps.h: Removed.
>-        * src/libGLESv2/shaders/flipyvs.h: Removed.
>-        * src/libGLESv2/shaders/generate_shaders.bat: Removed.
>-        * src/libGLESv2/shaders/luminanceps.h: Removed.
>-        * src/libGLESv2/shaders/passthroughps.h: Removed.
>-        * src/libGLESv2/shaders/standardvs.h: Removed.
>-        * src/libGLESv2/utilities.cpp: Removed.
>-        * src/libGLESv2/utilities.h: Removed.
>-        * src/libGLESv2/vertexconversion.h: Removed.
>-
>-2013-07-19  Alex Christensen  <achristensen@apple.com>
>-
>-        Generate derived files in ANGLE at build time rather than when updating from upstream.
>-        https://bugs.webkit.org/show_bug.cgi?id=118872
>-
>-        Reviewed by Mark Rowe.
>-
>-        * ANGLE.xcodeproj/project.pbxproj: Made Derived Sources target which calls DerivedSources.make,
>-        moved generated files into Derived Sources group.
>-        * DerivedSources.make: Added.
>-
>-2013-07-18  Alex Christensen  <achristensen@apple.com>
>-
>-        Added previously unincluded files from ANGLE r2426 with these exceptions:
>-        No gyp files are included.  No WebKit ports use them.
>-        ANGLE.sln is not included.  I will not use that.
>-        translator_common and translator_hlsl projects and filters are not included.
>-        I will need to make a customized translator  project that uses the GLSL translator instead of the HLSL.
>-        https://bugs.webkit.org/show_bug.cgi?id=118833
>-
>-        Reviewed by Dean Jackson.
>-
>-        * src/compiler/builtin_symbols.json: Added.
>-        * src/compiler/generate_builtin_symbol_table.py: Added.
>-        (parseBuiltin):
>-        * src/libEGL: Replaced.
>-        * src/libEGL/Config.cpp: Added.
>-        (egl::Config::Config):
>-        (egl::Config::setDefaults):
>-        (egl::Config::set):
>-        (egl::Config::getHandle):
>-        (egl::SortConfig::SortConfig):
>-        (egl::SortConfig::scanForWantedComponents):
>-        (egl::SortConfig::wantedComponentsSize):
>-        (egl::SortConfig::operator()):
>-        (egl::ConfigSet::ConfigSet):
>-        (egl::ConfigSet::add):
>-        (egl::ConfigSet::size):
>-        (egl::ConfigSet::getConfigs):
>-        (egl::ConfigSet::get):
>-        * src/libEGL/Config.h: Added.
>-        * src/libEGL/Display.cpp: Added.
>-        (egl::Display::getDisplay):
>-        (egl::Display::Display):
>-        (egl::Display::~Display):
>-        (egl::Display::initialize):
>-        (egl::Display::terminate):
>-        (egl::Display::startScene):
>-        (egl::Display::endScene):
>-        (egl::Display::getConfigs):
>-        (egl::Display::getConfigAttrib):
>-        (egl::Display::createDevice):
>-        (egl::Display::initializeDevice):
>-        (egl::Display::resetDevice):
>-        (egl::Display::createWindowSurface):
>-        (egl::Display::createOffscreenSurface):
>-        (egl::Display::createContext):
>-        (egl::Display::restoreLostDevice):
>-        (egl::Display::destroySurface):
>-        (egl::Display::destroyContext):
>-        (egl::Display::notifyDeviceLost):
>-        (egl::Display::isDeviceLost):
>-        (egl::Display::isInitialized):
>-        (egl::Display::isValidConfig):
>-        (egl::Display::isValidContext):
>-        (egl::Display::isValidSurface):
>-        (egl::Display::hasExistingWindowSurface):
>-        (egl::Display::getMinSwapInterval):
>-        (egl::Display::getMaxSwapInterval):
>-        (egl::Display::getDevice):
>-        (egl::Display::getDeviceCaps):
>-        (egl::Display::getAdapterIdentifier):
>-        (egl::Display::testDeviceLost):
>-        (egl::Display::testDeviceResettable):
>-        (egl::Display::sync):
>-        (egl::Display::allocateEventQuery):
>-        (egl::Display::freeEventQuery):
>-        (egl::Display::getMultiSampleSupport):
>-        (egl::Display::getDXT1TextureSupport):
>-        (egl::Display::getDXT3TextureSupport):
>-        (egl::Display::getDXT5TextureSupport):
>-        (egl::Display::getDepthTextureSupport):
>-        (egl::Display::getFloat32TextureSupport):
>-        (egl::Display::getFloat16TextureSupport):
>-        (egl::Display::getLuminanceTextureSupport):
>-        (egl::Display::getLuminanceAlphaTextureSupport):
>-        (egl::Display::getTextureFilterAnisotropySupport):
>-        (egl::Display::getBufferPool):
>-        (egl::Display::getTexturePool):
>-        (egl::Display::getEventQuerySupport):
>-        (egl::Display::getDefaultPresentParameters):
>-        (egl::Display::initExtensionString):
>-        (egl::Display::getExtensionString):
>-        (egl::Display::initVendorString):
>-        (egl::Display::getVendorString):
>-        (egl::Display::shareHandleSupported):
>-        (egl::Display::createVertexShader):
>-        (egl::Display::compileShaderSource):
>-        (egl::Display::createPixelShader):
>-        (egl::Display::getVertexTextureSupport):
>-        (egl::Display::getNonPower2TextureSupport):
>-        (egl::Display::getOcclusionQuerySupport):
>-        (egl::Display::getInstancingSupport):
>-        * src/libEGL/Display.h: Added.
>-        (getComparableOSVersion):
>-        (egl::Display::isD3d9ExDevice):
>-        * src/libEGL/README: Removed.
>-        * src/libEGL/ShaderCache.h: Added.
>-        (egl::ShaderCache::ShaderCache):
>-        (egl::ShaderCache::~ShaderCache):
>-        (egl::ShaderCache::initialize):
>-        (egl::ShaderCache::create):
>-        (egl::ShaderCache::clear):
>-        (egl::ShaderCache::createShader):
>-        * src/libEGL/Surface.cpp: Added.
>-        (egl::Surface::Surface):
>-        (egl::Surface::~Surface):
>-        (egl::Surface::initialize):
>-        (egl::Surface::release):
>-        (egl::Surface::resetSwapChain):
>-        (egl::Surface::swapRect):
>-        (egl::Surface::getWindowHandle):
>-        (egl::SurfaceWindowProc):
>-        (egl::Surface::subclassWindow):
>-        (egl::Surface::unsubclassWindow):
>-        (egl::Surface::checkForOutOfDateSwapChain):
>-        (egl::Surface::convertInterval):
>-        (egl::Surface::swap):
>-        (egl::Surface::postSubBuffer):
>-        (egl::Surface::getWidth):
>-        (egl::Surface::getHeight):
>-        (egl::Surface::isPostSubBufferSupported):
>-        (egl::Surface::getRenderTarget):
>-        (egl::Surface::getDepthStencil):
>-        (egl::Surface::getOffscreenTexture):
>-        (egl::Surface::setSwapInterval):
>-        (egl::Surface::getTextureFormat):
>-        (egl::Surface::getTextureTarget):
>-        (egl::Surface::setBoundTexture):
>-        (egl::Surface::getBoundTexture):
>-        (egl::Surface::getFormat):
>-        * src/libEGL/Surface.h: Added.
>-        (egl::Surface::getShareHandle):
>-        * src/libEGL/libEGL.cpp: Added.
>-        (validateDisplay):
>-        (validateConfig):
>-        (validateContext):
>-        (validateSurface):
>-        * src/libEGL/libEGL.def: Added.
>-        * src/libEGL/libEGL.rc: Added.
>-        * src/libEGL/libEGL.vcxproj: Added.
>-        * src/libEGL/libEGL.vcxproj.filters: Added.
>-        * src/libEGL/main.cpp: Added.
>-        (DllMain):
>-        (egl::setCurrentError):
>-        (egl::getCurrentError):
>-        (egl::setCurrentAPI):
>-        (egl::getCurrentAPI):
>-        (egl::setCurrentDisplay):
>-        (egl::getCurrentDisplay):
>-        (egl::setCurrentDrawSurface):
>-        (egl::getCurrentDrawSurface):
>-        (egl::setCurrentReadSurface):
>-        (egl::getCurrentReadSurface):
>-        (error):
>-        * src/libEGL/main.h: Added.
>-        (error):
>-        (success):
>-        * src/libEGL/resource.h: Added.
>-        * src/libGLESv2: Replaced.
>-        * src/libGLESv2/BinaryStream.h: Added.
>-        (gl::BinaryInputStream::BinaryInputStream):
>-        (gl::BinaryInputStream::read):
>-        (gl::BinaryInputStream::skip):
>-        (gl::BinaryInputStream::offset):
>-        (gl::BinaryInputStream::error):
>-        (gl::BinaryInputStream::endOfStream):
>-        (gl::BinaryOutputStream::BinaryOutputStream):
>-        (gl::BinaryOutputStream::write):
>-        (gl::BinaryOutputStream::length):
>-        (gl::BinaryOutputStream::data):
>-        * src/libGLESv2/Blit.cpp: Added.
>-        (gl::Blit::Blit):
>-        (gl::Blit::~Blit):
>-        (gl::Blit::initGeometry):
>-        (gl::Blit::setShader):
>-        (gl::Blit::setVertexShader):
>-        (gl::Blit::setPixelShader):
>-        (gl::Blit::getSurfaceRect):
>-        (gl::Blit::boxFilter):
>-        (gl::Blit::copy):
>-        (gl::Blit::formatConvert):
>-        (gl::Blit::setFormatConvertShaders):
>-        (gl::Blit::copySurfaceToTexture):
>-        (gl::Blit::setViewport):
>-        (gl::Blit::setCommonBlitState):
>-        (gl::Blit::render):
>-        (gl::Blit::saveState):
>-        (gl::Blit::restoreState):
>-        * src/libGLESv2/Blit.h: Added.
>-        * src/libGLESv2/Buffer.cpp: Added.
>-        (gl::Buffer::Buffer):
>-        (gl::Buffer::~Buffer):
>-        (gl::Buffer::bufferData):
>-        (gl::Buffer::bufferSubData):
>-        (gl::Buffer::getStaticVertexBuffer):
>-        (gl::Buffer::getStaticIndexBuffer):
>-        (gl::Buffer::invalidateStaticData):
>-        (gl::Buffer::promoteStaticUsage):
>-        * src/libGLESv2/Buffer.h: Added.
>-        (gl::Buffer::data):
>-        (gl::Buffer::size):
>-        (gl::Buffer::usage):
>-        * src/libGLESv2/Context.cpp: Added.
>-        (gl::makeStaticString):
>-        (gl::Context::Context):
>-        (gl::Context::~Context):
>-        (gl::Context::makeCurrent):
>-        (gl::Context::markAllStateDirty):
>-        (gl::Context::markDxUniformsDirty):
>-        (gl::Context::markContextLost):
>-        (gl::Context::isContextLost):
>-        (gl::Context::setClearColor):
>-        (gl::Context::setClearDepth):
>-        (gl::Context::setClearStencil):
>-        (gl::Context::setCullFace):
>-        (gl::Context::isCullFaceEnabled):
>-        (gl::Context::setCullMode):
>-        (gl::Context::setFrontFace):
>-        (gl::Context::setDepthTest):
>-        (gl::Context::isDepthTestEnabled):
>-        (gl::Context::setDepthFunc):
>-        (gl::Context::setDepthRange):
>-        (gl::Context::setBlend):
>-        (gl::Context::isBlendEnabled):
>-        (gl::Context::setBlendFactors):
>-        (gl::Context::setBlendColor):
>-        (gl::Context::setBlendEquation):
>-        (gl::Context::setStencilTest):
>-        (gl::Context::isStencilTestEnabled):
>-        (gl::Context::setStencilParams):
>-        (gl::Context::setStencilBackParams):
>-        (gl::Context::setStencilWritemask):
>-        (gl::Context::setStencilBackWritemask):
>-        (gl::Context::setStencilOperations):
>-        (gl::Context::setStencilBackOperations):
>-        (gl::Context::setPolygonOffsetFill):
>-        (gl::Context::isPolygonOffsetFillEnabled):
>-        (gl::Context::setPolygonOffsetParams):
>-        (gl::Context::setSampleAlphaToCoverage):
>-        (gl::Context::isSampleAlphaToCoverageEnabled):
>-        (gl::Context::setSampleCoverage):
>-        (gl::Context::isSampleCoverageEnabled):
>-        (gl::Context::setSampleCoverageParams):
>-        (gl::Context::setScissorTest):
>-        (gl::Context::isScissorTestEnabled):
>-        (gl::Context::setDither):
>-        (gl::Context::isDitherEnabled):
>-        (gl::Context::setLineWidth):
>-        (gl::Context::setGenerateMipmapHint):
>-        (gl::Context::setFragmentShaderDerivativeHint):
>-        (gl::Context::setViewportParams):
>-        (gl::Context::setScissorParams):
>-        (gl::Context::setColorMask):
>-        (gl::Context::setDepthMask):
>-        (gl::Context::setActiveSampler):
>-        (gl::Context::getReadFramebufferHandle):
>-        (gl::Context::getDrawFramebufferHandle):
>-        (gl::Context::getRenderbufferHandle):
>-        (gl::Context::getArrayBufferHandle):
>-        (gl::Context::getActiveQuery):
>-        (gl::Context::setEnableVertexAttribArray):
>-        (gl::Context::getVertexAttribState):
>-        (gl::Context::setVertexAttribState):
>-        (gl::Context::getVertexAttribPointer):
>-        (gl::Context::getVertexAttributes):
>-        (gl::Context::setPackAlignment):
>-        (gl::Context::getPackAlignment):
>-        (gl::Context::setUnpackAlignment):
>-        (gl::Context::getUnpackAlignment):
>-        (gl::Context::setPackReverseRowOrder):
>-        (gl::Context::getPackReverseRowOrder):
>-        (gl::Context::createBuffer):
>-        (gl::Context::createProgram):
>-        (gl::Context::createShader):
>-        (gl::Context::createTexture):
>-        (gl::Context::createRenderbuffer):
>-        (gl::Context::createFramebuffer):
>-        (gl::Context::createFence):
>-        (gl::Context::createQuery):
>-        (gl::Context::deleteBuffer):
>-        (gl::Context::deleteShader):
>-        (gl::Context::deleteProgram):
>-        (gl::Context::deleteTexture):
>-        (gl::Context::deleteRenderbuffer):
>-        (gl::Context::deleteFramebuffer):
>-        (gl::Context::deleteFence):
>-        (gl::Context::deleteQuery):
>-        (gl::Context::getBuffer):
>-        (gl::Context::getShader):
>-        (gl::Context::getProgram):
>-        (gl::Context::getTexture):
>-        (gl::Context::getRenderbuffer):
>-        (gl::Context::getReadFramebuffer):
>-        (gl::Context::getDrawFramebuffer):
>-        (gl::Context::bindArrayBuffer):
>-        (gl::Context::bindElementArrayBuffer):
>-        (gl::Context::bindTexture2D):
>-        (gl::Context::bindTextureCubeMap):
>-        (gl::Context::bindReadFramebuffer):
>-        (gl::Context::bindDrawFramebuffer):
>-        (gl::Context::bindRenderbuffer):
>-        (gl::Context::useProgram):
>-        (gl::Context::linkProgram):
>-        (gl::Context::setProgramBinary):
>-        (gl::Context::beginQuery):
>-        (gl::Context::endQuery):
>-        (gl::Context::setFramebufferZero):
>-        (gl::Context::setRenderbufferStorage):
>-        (gl::Context::getFramebuffer):
>-        (gl::Context::getFence):
>-        (gl::Context::getQuery):
>-        (gl::Context::getArrayBuffer):
>-        (gl::Context::getElementArrayBuffer):
>-        (gl::Context::getCurrentProgramBinary):
>-        (gl::Context::getTexture2D):
>-        (gl::Context::getTextureCubeMap):
>-        (gl::Context::getSamplerTexture):
>-        (gl::Context::getBooleanv):
>-        (gl::Context::getFloatv):
>-        (gl::Context::getIntegerv):
>-        (gl::Context::getQueryParameterInfo):
>-        (gl::Context::applyRenderTarget):
>-        (gl::Context::applyState):
>-        (gl::Context::applyVertexBuffer):
>-        (gl::Context::applyIndexBuffer):
>-        (gl::Context::applyShaders):
>-        (gl::Context::applyTextures):
>-        (gl::Context::readPixels):
>-        (gl::Context::clear):
>-        (gl::Context::drawArrays):
>-        (gl::Context::drawElements):
>-        (gl::Context::sync):
>-        (gl::Context::drawLineLoop):
>-        (gl::Context::recordInvalidEnum):
>-        (gl::Context::recordInvalidValue):
>-        (gl::Context::recordInvalidOperation):
>-        (gl::Context::recordOutOfMemory):
>-        (gl::Context::recordInvalidFramebufferOperation):
>-        (gl::Context::getError):
>-        (gl::Context::getResetStatus):
>-        (gl::Context::isResetNotificationEnabled):
>-        (gl::Context::supportsShaderModel3):
>-        (gl::Context::getMaximumPointSize):
>-        (gl::Context::getMaximumVaryingVectors):
>-        (gl::Context::getMaximumVertexTextureImageUnits):
>-        (gl::Context::getMaximumCombinedTextureImageUnits):
>-        (gl::Context::getMaximumFragmentUniformVectors):
>-        (gl::Context::getMaxSupportedSamples):
>-        (gl::Context::getNearestSupportedSamples):
>-        (gl::Context::supportsEventQueries):
>-        (gl::Context::supportsOcclusionQueries):
>-        (gl::Context::supportsDXT1Textures):
>-        (gl::Context::supportsDXT3Textures):
>-        (gl::Context::supportsDXT5Textures):
>-        (gl::Context::supportsFloat32Textures):
>-        (gl::Context::supportsFloat32LinearFilter):
>-        (gl::Context::supportsFloat32RenderableTextures):
>-        (gl::Context::supportsFloat16Textures):
>-        (gl::Context::supportsFloat16LinearFilter):
>-        (gl::Context::supportsFloat16RenderableTextures):
>-        (gl::Context::getMaximumRenderbufferDimension):
>-        (gl::Context::getMaximumTextureDimension):
>-        (gl::Context::getMaximumCubeTextureDimension):
>-        (gl::Context::getMaximumTextureLevel):
>-        (gl::Context::supportsLuminanceTextures):
>-        (gl::Context::supportsLuminanceAlphaTextures):
>-        (gl::Context::supportsDepthTextures):
>-        (gl::Context::supports32bitIndices):
>-        (gl::Context::supportsNonPower2Texture):
>-        (gl::Context::supportsInstancing):
>-        (gl::Context::supportsTextureFilterAnisotropy):
>-        (gl::Context::supportsDerivativeInstructions):
>-        (gl::Context::getTextureMaxAnisotropy):
>-        (gl::Context::getCurrentReadFormatType):
>-        (gl::Context::detachBuffer):
>-        (gl::Context::detachTexture):
>-        (gl::Context::detachFramebuffer):
>-        (gl::Context::detachRenderbuffer):
>-        (gl::Context::getIncompleteTexture):
>-        (gl::Context::skipDraw):
>-        (gl::Context::isTriangleMode):
>-        (gl::Context::setVertexAttrib):
>-        (gl::Context::setVertexAttribDivisor):
>-        (gl::Context::initExtensionString):
>-        (gl::Context::getExtensionString):
>-        (gl::Context::initRendererString):
>-        (gl::Context::getRendererString):
>-        (gl::Context::blitFramebuffer):
>-        (gl::VertexDeclarationCache::VertexDeclarationCache):
>-        (gl::VertexDeclarationCache::~VertexDeclarationCache):
>-        (gl::VertexDeclarationCache::applyDeclaration):
>-        (gl::VertexDeclarationCache::markStateDirty):
>-        * src/libGLESv2/Context.h: Added.
>-        (gl::VertexAttribute::VertexAttribute):
>-        (gl::VertexAttribute::typeSize):
>-        (gl::VertexAttribute::stride):
>-        (gl::Context::getBlitter):
>-        (gl::Context::getDeviceCaps):
>-        * src/libGLESv2/D3DConstantTable.cpp: Added.
>-        (gl::D3DConstant::D3DConstant):
>-        (gl::D3DConstant::~D3DConstant):
>-        (gl::D3DConstant::addStructMembers):
>-        (gl::D3DConstantTable::D3DConstantTable):
>-        (gl::D3DConstantTable::~D3DConstantTable):
>-        (gl::D3DConstantTable::getConstant):
>-        (gl::D3DConstantTable::getConstantByName):
>-        * src/libGLESv2/D3DConstantTable.h: Added.
>-        (gl::D3DConstantTable::error):
>-        (gl::D3DConstantTable::constants):
>-        * src/libGLESv2/Fence.cpp: Added.
>-        (gl::Fence::Fence):
>-        (gl::Fence::~Fence):
>-        (gl::Fence::isFence):
>-        (gl::Fence::setFence):
>-        (gl::Fence::testFence):
>-        (gl::Fence::finishFence):
>-        (gl::Fence::getFenceiv):
>-        * src/libGLESv2/Fence.h: Added.
>-        * src/libGLESv2/Float16ToFloat32.cpp: Added.
>-        (gl::float16ToFloat32):
>-        * src/libGLESv2/Float16ToFloat32.py: Added.
>-        (convertMantissa):
>-        (convertExponent):
>-        (convertOffset):
>-        * src/libGLESv2/Framebuffer.cpp: Added.
>-        (gl::Framebuffer::Framebuffer):
>-        (gl::Framebuffer::~Framebuffer):
>-        (gl::Framebuffer::lookupRenderbuffer):
>-        (gl::Framebuffer::setColorbuffer):
>-        (gl::Framebuffer::setDepthbuffer):
>-        (gl::Framebuffer::setStencilbuffer):
>-        (gl::Framebuffer::detachTexture):
>-        (gl::Framebuffer::detachRenderbuffer):
>-        (gl::Framebuffer::getRenderTargetSerial):
>-        (gl::Framebuffer::getRenderTarget):
>-        (gl::Framebuffer::getDepthStencil):
>-        (gl::Framebuffer::getDepthbufferSerial):
>-        (gl::Framebuffer::getStencilbufferSerial):
>-        (gl::Framebuffer::getColorbuffer):
>-        (gl::Framebuffer::getDepthbuffer):
>-        (gl::Framebuffer::getStencilbuffer):
>-        (gl::Framebuffer::getNullColorbuffer):
>-        (gl::Framebuffer::getColorbufferType):
>-        (gl::Framebuffer::getDepthbufferType):
>-        (gl::Framebuffer::getStencilbufferType):
>-        (gl::Framebuffer::getColorbufferHandle):
>-        (gl::Framebuffer::getDepthbufferHandle):
>-        (gl::Framebuffer::getStencilbufferHandle):
>-        (gl::Framebuffer::hasStencil):
>-        (gl::Framebuffer::completeness):
>-        (gl::DefaultFramebuffer::DefaultFramebuffer):
>-        (gl::Framebuffer::getSamples):
>-        (gl::DefaultFramebuffer::completeness):
>-        * src/libGLESv2/Framebuffer.h: Added.
>-        * src/libGLESv2/HandleAllocator.cpp: Added.
>-        (gl::HandleAllocator::HandleAllocator):
>-        (gl::HandleAllocator::~HandleAllocator):
>-        (gl::HandleAllocator::setBaseHandle):
>-        (gl::HandleAllocator::allocate):
>-        (gl::HandleAllocator::release):
>-        * src/libGLESv2/HandleAllocator.h: Added.
>-        * src/libGLESv2/IndexDataManager.cpp: Added.
>-        (gl::IndexDataManager::IndexDataManager):
>-        (gl::IndexDataManager::~IndexDataManager):
>-        (gl::convertIndices):
>-        (gl::computeRange):
>-        (gl::IndexDataManager::prepareIndexData):
>-        (gl::IndexDataManager::indexSize):
>-        (gl::IndexDataManager::typeSize):
>-        (gl::IndexDataManager::getCountingIndices):
>-        (gl::IndexBuffer::IndexBuffer):
>-        (gl::IndexBuffer::~IndexBuffer):
>-        (gl::IndexBuffer::getBuffer):
>-        (gl::IndexBuffer::getSerial):
>-        (gl::IndexBuffer::issueSerial):
>-        (gl::IndexBuffer::unmap):
>-        (gl::StreamingIndexBuffer::StreamingIndexBuffer):
>-        (gl::StreamingIndexBuffer::~StreamingIndexBuffer):
>-        (gl::StreamingIndexBuffer::map):
>-        (gl::StreamingIndexBuffer::reserveSpace):
>-        (gl::StaticIndexBuffer::StaticIndexBuffer):
>-        (gl::StaticIndexBuffer::~StaticIndexBuffer):
>-        (gl::StaticIndexBuffer::map):
>-        (gl::StaticIndexBuffer::reserveSpace):
>-        (gl::StaticIndexBuffer::lookupType):
>-        (gl::StaticIndexBuffer::lookupRange):
>-        (gl::StaticIndexBuffer::addRange):
>-        * src/libGLESv2/IndexDataManager.h: Added.
>-        (gl::IndexBuffer::size):
>-        (gl::StaticIndexBuffer::IndexRange::operator<):
>-        * src/libGLESv2/Program.cpp: Added.
>-        (gl::AttributeBindings::AttributeBindings):
>-        (gl::AttributeBindings::~AttributeBindings):
>-        (gl::InfoLog::InfoLog):
>-        (gl::InfoLog::~InfoLog):
>-        (gl::InfoLog::getLength):
>-        (gl::InfoLog::getLog):
>-        (gl::InfoLog::appendSanitized):
>-        (gl::InfoLog::append):
>-        (gl::InfoLog::reset):
>-        (gl::Program::Program):
>-        (gl::Program::~Program):
>-        (gl::Program::attachShader):
>-        (gl::Program::detachShader):
>-        (gl::Program::getAttachedShadersCount):
>-        (gl::AttributeBindings::bindAttributeLocation):
>-        (gl::Program::bindAttributeLocation):
>-        (gl::Program::link):
>-        (gl::AttributeBindings::getAttributeBinding):
>-        (gl::Program::unlink):
>-        (gl::Program::isLinked):
>-        (gl::Program::getProgramBinary):
>-        (gl::Program::setProgramBinary):
>-        (gl::Program::release):
>-        (gl::Program::addRef):
>-        (gl::Program::getRefCount):
>-        (gl::Program::getProgramBinaryLength):
>-        (gl::Program::getInfoLogLength):
>-        (gl::Program::getInfoLog):
>-        (gl::Program::getAttachedShaders):
>-        (gl::Program::getActiveAttribute):
>-        (gl::Program::getActiveAttributeCount):
>-        (gl::Program::getActiveAttributeMaxLength):
>-        (gl::Program::getActiveUniform):
>-        (gl::Program::getActiveUniformCount):
>-        (gl::Program::getActiveUniformMaxLength):
>-        (gl::Program::flagForDeletion):
>-        (gl::Program::isFlaggedForDeletion):
>-        (gl::Program::validate):
>-        (gl::Program::isValidated):
>-        * src/libGLESv2/Program.h: Added.
>-        * src/libGLESv2/ProgramBinary.cpp: Added.
>-        (gl::str):
>-        (gl::Uniform::Uniform):
>-        (gl::Uniform::~Uniform):
>-        (gl::Uniform::isArray):
>-        (gl::UniformLocation::UniformLocation):
>-        (gl::ProgramBinary::ProgramBinary):
>-        (gl::ProgramBinary::~ProgramBinary):
>-        (gl::ProgramBinary::getSerial):
>-        (gl::ProgramBinary::issueSerial):
>-        (gl::ProgramBinary::getPixelShader):
>-        (gl::ProgramBinary::getVertexShader):
>-        (gl::ProgramBinary::getAttributeLocation):
>-        (gl::ProgramBinary::getSemanticIndex):
>-        (gl::ProgramBinary::getUsedSamplerRange):
>-        (gl::ProgramBinary::usesPointSize):
>-        (gl::ProgramBinary::getSamplerMapping):
>-        (gl::ProgramBinary::getSamplerTextureType):
>-        (gl::ProgramBinary::getUniformLocation):
>-        (gl::ProgramBinary::setUniform1fv):
>-        (gl::ProgramBinary::setUniform2fv):
>-        (gl::ProgramBinary::setUniform3fv):
>-        (gl::ProgramBinary::setUniform4fv):
>-        (gl::transposeMatrix):
>-        (gl::ProgramBinary::setUniformMatrix2fv):
>-        (gl::ProgramBinary::setUniformMatrix3fv):
>-        (gl::ProgramBinary::setUniformMatrix4fv):
>-        (gl::ProgramBinary::setUniform1iv):
>-        (gl::ProgramBinary::setUniform2iv):
>-        (gl::ProgramBinary::setUniform3iv):
>-        (gl::ProgramBinary::setUniform4iv):
>-        (gl::ProgramBinary::getUniformfv):
>-        (gl::ProgramBinary::getUniformiv):
>-        (gl::ProgramBinary::dirtyAllUniforms):
>-        (gl::ProgramBinary::applyUniforms):
>-        (gl::ProgramBinary::compileToBinary):
>-        (gl::ProgramBinary::packVaryings):
>-        (gl::ProgramBinary::linkVaryings):
>-        (gl::ProgramBinary::load):
>-        (gl::ProgramBinary::save):
>-        (gl::ProgramBinary::getLength):
>-        (gl::ProgramBinary::link):
>-        (gl::ProgramBinary::linkAttributes):
>-        (gl::ProgramBinary::linkUniforms):
>-        (gl::ProgramBinary::defineUniform):
>-        (gl::ProgramBinary::createUniform):
>-        (gl::ProgramBinary::decorateAttribute):
>-        (gl::ProgramBinary::undecorateUniform):
>-        (gl::ProgramBinary::applyUniformnbv):
>-        (gl::ProgramBinary::applyUniformnfv):
>-        (gl::ProgramBinary::applyUniform1iv):
>-        (gl::ProgramBinary::applyUniform2iv):
>-        (gl::ProgramBinary::applyUniform3iv):
>-        (gl::ProgramBinary::applyUniform4iv):
>-        (gl::ProgramBinary::applyUniformniv):
>-        (gl::ProgramBinary::isValidated):
>-        (gl::ProgramBinary::getActiveAttribute):
>-        (gl::ProgramBinary::getActiveAttributeCount):
>-        (gl::ProgramBinary::getActiveAttributeMaxLength):
>-        (gl::ProgramBinary::getActiveUniform):
>-        (gl::ProgramBinary::getActiveUniformCount):
>-        (gl::ProgramBinary::getActiveUniformMaxLength):
>-        (gl::ProgramBinary::validate):
>-        (gl::ProgramBinary::validateSamplers):
>-        (gl::ProgramBinary::getDxDepthRangeLocation):
>-        (gl::ProgramBinary::getDxDepthLocation):
>-        (gl::ProgramBinary::getDxCoordLocation):
>-        (gl::ProgramBinary::getDxHalfPixelSizeLocation):
>-        (gl::ProgramBinary::getDxFrontCCWLocation):
>-        (gl::ProgramBinary::getDxPointsOrLinesLocation):
>-        (gl::ProgramBinary::Sampler::Sampler):
>-        * src/libGLESv2/ProgramBinary.h: Added.
>-        (gl::Uniform::RegisterInfo::RegisterInfo):
>-        (gl::Uniform::RegisterInfo::set):
>-        (gl::UniformLocation::UniformLocation):
>-        * src/libGLESv2/Query.cpp: Added.
>-        (gl::Query::Query):
>-        (gl::Query::~Query):
>-        (gl::Query::begin):
>-        (gl::Query::end):
>-        (gl::Query::getResult):
>-        (gl::Query::isResultAvailable):
>-        (gl::Query::getType):
>-        (gl::Query::testQuery):
>-        * src/libGLESv2/Query.h: Added.
>-        * src/libGLESv2/README: Removed.
>-        * src/libGLESv2/Renderbuffer.cpp: Added.
>-        (gl::RenderbufferInterface::RenderbufferInterface):
>-        (gl::RenderbufferInterface::addProxyRef):
>-        (gl::RenderbufferInterface::releaseProxy):
>-        (gl::RenderbufferInterface::getRedSize):
>-        (gl::RenderbufferInterface::getGreenSize):
>-        (gl::RenderbufferInterface::getBlueSize):
>-        (gl::RenderbufferInterface::getAlphaSize):
>-        (gl::RenderbufferInterface::getDepthSize):
>-        (gl::RenderbufferInterface::getStencilSize):
>-        (gl::RenderbufferTexture2D::RenderbufferTexture2D):
>-        (gl::RenderbufferTexture2D::~RenderbufferTexture2D):
>-        (gl::RenderbufferTexture2D::addProxyRef):
>-        (gl::RenderbufferTexture2D::releaseProxy):
>-        (gl::RenderbufferTexture2D::getRenderTarget):
>-        (gl::RenderbufferTexture2D::getDepthStencil):
>-        (gl::RenderbufferTexture2D::getWidth):
>-        (gl::RenderbufferTexture2D::getHeight):
>-        (gl::RenderbufferTexture2D::getInternalFormat):
>-        (gl::RenderbufferTexture2D::getD3DFormat):
>-        (gl::RenderbufferTexture2D::getSamples):
>-        (gl::RenderbufferTexture2D::getSerial):
>-        (gl::RenderbufferTextureCubeMap::RenderbufferTextureCubeMap):
>-        (gl::RenderbufferTextureCubeMap::~RenderbufferTextureCubeMap):
>-        (gl::RenderbufferTextureCubeMap::addProxyRef):
>-        (gl::RenderbufferTextureCubeMap::releaseProxy):
>-        (gl::RenderbufferTextureCubeMap::getRenderTarget):
>-        (gl::RenderbufferTextureCubeMap::getDepthStencil):
>-        (gl::RenderbufferTextureCubeMap::getWidth):
>-        (gl::RenderbufferTextureCubeMap::getHeight):
>-        (gl::RenderbufferTextureCubeMap::getInternalFormat):
>-        (gl::RenderbufferTextureCubeMap::getD3DFormat):
>-        (gl::RenderbufferTextureCubeMap::getSamples):
>-        (gl::RenderbufferTextureCubeMap::getSerial):
>-        (gl::Renderbuffer::Renderbuffer):
>-        (gl::Renderbuffer::~Renderbuffer):
>-        (gl::Renderbuffer::addRef):
>-        (gl::Renderbuffer::release):
>-        (gl::Renderbuffer::getRenderTarget):
>-        (gl::Renderbuffer::getDepthStencil):
>-        (gl::Renderbuffer::getWidth):
>-        (gl::Renderbuffer::getHeight):
>-        (gl::Renderbuffer::getInternalFormat):
>-        (gl::Renderbuffer::getD3DFormat):
>-        (gl::Renderbuffer::getRedSize):
>-        (gl::Renderbuffer::getGreenSize):
>-        (gl::Renderbuffer::getBlueSize):
>-        (gl::Renderbuffer::getAlphaSize):
>-        (gl::Renderbuffer::getDepthSize):
>-        (gl::Renderbuffer::getStencilSize):
>-        (gl::Renderbuffer::getSamples):
>-        (gl::Renderbuffer::getSerial):
>-        (gl::Renderbuffer::setStorage):
>-        (gl::RenderbufferStorage::RenderbufferStorage):
>-        (gl::RenderbufferStorage::~RenderbufferStorage):
>-        (gl::RenderbufferStorage::getRenderTarget):
>-        (gl::RenderbufferStorage::getDepthStencil):
>-        (gl::RenderbufferStorage::getWidth):
>-        (gl::RenderbufferStorage::getHeight):
>-        (gl::RenderbufferStorage::getInternalFormat):
>-        (gl::RenderbufferStorage::getD3DFormat):
>-        (gl::RenderbufferStorage::getSamples):
>-        (gl::RenderbufferStorage::getSerial):
>-        (gl::RenderbufferStorage::issueSerial):
>-        (gl::RenderbufferStorage::issueCubeSerials):
>-        (gl::Colorbuffer::Colorbuffer):
>-        (gl::Colorbuffer::~Colorbuffer):
>-        (gl::Colorbuffer::getRenderTarget):
>-        (gl::DepthStencilbuffer::DepthStencilbuffer):
>-        (gl::DepthStencilbuffer::~DepthStencilbuffer):
>-        (gl::DepthStencilbuffer::getDepthStencil):
>-        (gl::Depthbuffer::Depthbuffer):
>-        (gl::Depthbuffer::~Depthbuffer):
>-        (gl::Stencilbuffer::Stencilbuffer):
>-        (gl::Stencilbuffer::~Stencilbuffer):
>-        * src/libGLESv2/Renderbuffer.h: Added.
>-        (gl::RenderbufferInterface::~RenderbufferInterface):
>-        * src/libGLESv2/ResourceManager.cpp: Added.
>-        (gl::ResourceManager::ResourceManager):
>-        (gl::ResourceManager::~ResourceManager):
>-        (gl::ResourceManager::addRef):
>-        (gl::ResourceManager::release):
>-        (gl::ResourceManager::createBuffer):
>-        (gl::ResourceManager::createShader):
>-        (gl::ResourceManager::createProgram):
>-        (gl::ResourceManager::createTexture):
>-        (gl::ResourceManager::createRenderbuffer):
>-        (gl::ResourceManager::deleteBuffer):
>-        (gl::ResourceManager::deleteShader):
>-        (gl::ResourceManager::deleteProgram):
>-        (gl::ResourceManager::deleteTexture):
>-        (gl::ResourceManager::deleteRenderbuffer):
>-        (gl::ResourceManager::getBuffer):
>-        (gl::ResourceManager::getShader):
>-        (gl::ResourceManager::getTexture):
>-        (gl::ResourceManager::getProgram):
>-        (gl::ResourceManager::getRenderbuffer):
>-        (gl::ResourceManager::setRenderbuffer):
>-        (gl::ResourceManager::checkBufferAllocation):
>-        (gl::ResourceManager::checkTextureAllocation):
>-        (gl::ResourceManager::checkRenderbufferAllocation):
>-        * src/libGLESv2/ResourceManager.h: Added.
>-        * src/libGLESv2/Shader.cpp: Added.
>-        (gl::Shader::Shader):
>-        (gl::Shader::~Shader):
>-        (gl::Shader::getHandle):
>-        (gl::Shader::setSource):
>-        (gl::Shader::getInfoLogLength):
>-        (gl::Shader::getInfoLog):
>-        (gl::Shader::getSourceLength):
>-        (gl::Shader::getTranslatedSourceLength):
>-        (gl::Shader::getSourceImpl):
>-        (gl::Shader::getSource):
>-        (gl::Shader::getTranslatedSource):
>-        (gl::Shader::isCompiled):
>-        (gl::Shader::getHLSL):
>-        (gl::Shader::addRef):
>-        (gl::Shader::release):
>-        (gl::Shader::getRefCount):
>-        (gl::Shader::isFlaggedForDeletion):
>-        (gl::Shader::flagForDeletion):
>-        (gl::Shader::initializeCompiler):
>-        (gl::Shader::releaseCompiler):
>-        (gl::Shader::parseVaryings):
>-        (gl::Shader::uncompile):
>-        (gl::Shader::compileToHLSL):
>-        (gl::Shader::parseType):
>-        (gl::Shader::compareVarying):
>-        (gl::VertexShader::VertexShader):
>-        (gl::VertexShader::~VertexShader):
>-        (gl::VertexShader::getType):
>-        (gl::VertexShader::uncompile):
>-        (gl::VertexShader::compile):
>-        (gl::VertexShader::getSemanticIndex):
>-        (gl::VertexShader::parseAttributes):
>-        (gl::FragmentShader::FragmentShader):
>-        (gl::FragmentShader::~FragmentShader):
>-        (gl::FragmentShader::getType):
>-        (gl::FragmentShader::compile):
>-        * src/libGLESv2/Shader.h: Added.
>-        (gl::Varying::Varying):
>-        (gl::Attribute::Attribute):
>-        * src/libGLESv2/Texture.cpp: Added.
>-        (gl::ConvertTextureInternalFormat):
>-        (gl::IsTextureFormatRenderable):
>-        (gl::GetTextureUsage):
>-        (gl::MakeValidSize):
>-        (gl::CopyLockableSurfaces):
>-        (gl::Image::Image):
>-        (gl::Image::~Image):
>-        (gl::Image::redefine):
>-        (gl::Image::createSurface):
>-        (gl::Image::lock):
>-        (gl::Image::unlock):
>-        (gl::Image::isRenderableFormat):
>-        (gl::Image::getD3DFormat):
>-        (gl::Image::getSurface):
>-        (gl::Image::setManagedSurface):
>-        (gl::Image::updateSurface):
>-        (gl::Image::loadData):
>-        (gl::Image::loadAlphaData):
>-        (gl::Image::loadAlphaFloatData):
>-        (gl::Image::loadAlphaHalfFloatData):
>-        (gl::Image::loadLuminanceData):
>-        (gl::Image::loadLuminanceFloatData):
>-        (gl::Image::loadLuminanceHalfFloatData):
>-        (gl::Image::loadLuminanceAlphaData):
>-        (gl::Image::loadLuminanceAlphaFloatData):
>-        (gl::Image::loadLuminanceAlphaHalfFloatData):
>-        (gl::Image::loadRGBUByteData):
>-        (gl::Image::loadRGB565Data):
>-        (gl::Image::loadRGBFloatData):
>-        (gl::Image::loadRGBHalfFloatData):
>-        (gl::Image::loadRGBAUByteData):
>-        (gl::Image::loadRGBA4444Data):
>-        (gl::Image::loadRGBA5551Data):
>-        (gl::Image::loadRGBAFloatData):
>-        (gl::Image::loadRGBAHalfFloatData):
>-        (gl::Image::loadBGRAData):
>-        (gl::Image::loadCompressedData):
>-        (gl::Image::copy):
>-        (gl::TextureStorage::TextureStorage):
>-        (gl::TextureStorage::~TextureStorage):
>-        (gl::TextureStorage::isRenderTarget):
>-        (gl::TextureStorage::isManaged):
>-        (gl::TextureStorage::getPool):
>-        (gl::TextureStorage::getUsage):
>-        (gl::TextureStorage::getTextureSerial):
>-        (gl::TextureStorage::issueTextureSerial):
>-        (gl::TextureStorage::getLodOffset):
>-        (gl::Texture::Texture):
>-        (gl::Texture::~Texture):
>-        (gl::Texture::setMinFilter):
>-        (gl::Texture::setMagFilter):
>-        (gl::Texture::setWrapS):
>-        (gl::Texture::setWrapT):
>-        (gl::Texture::setMaxAnisotropy):
>-        (gl::Texture::setUsage):
>-        (gl::Texture::getMinFilter):
>-        (gl::Texture::getMagFilter):
>-        (gl::Texture::getWrapS):
>-        (gl::Texture::getWrapT):
>-        (gl::Texture::getMaxAnisotropy):
>-        (gl::Texture::getUsage):
>-        (gl::Texture::isMipmapFiltered):
>-        (gl::Texture::setImage):
>-        (gl::Texture::setCompressedImage):
>-        (gl::Texture::subImage):
>-        (gl::Texture::subImageCompressed):
>-        (gl::Texture::getTexture):
>-        (gl::Texture::hasDirtyParameters):
>-        (gl::Texture::hasDirtyImages):
>-        (gl::Texture::resetDirty):
>-        (gl::Texture::getTextureSerial):
>-        (gl::Texture::getRenderTargetSerial):
>-        (gl::Texture::isImmutable):
>-        (gl::Texture::getLodOffset):
>-        (gl::Texture::creationLevels):
>-        (gl::Texture::levelCount):
>-        (gl::Texture::getBlitter):
>-        (gl::Texture::copyToRenderTarget):
>-        (gl::TextureStorage2D::TextureStorage2D):
>-        (gl::TextureStorage2D::~TextureStorage2D):
>-        (gl::TextureStorage2D::getSurfaceLevel):
>-        (gl::TextureStorage2D::getBaseTexture):
>-        (gl::TextureStorage2D::getRenderTargetSerial):
>-        (gl::Texture2D::Texture2D):
>-        (gl::Texture2D::~Texture2D):
>-        (gl::Texture2D::addProxyRef):
>-        (gl::Texture2D::releaseProxy):
>-        (gl::Texture2D::getTarget):
>-        (gl::Texture2D::getWidth):
>-        (gl::Texture2D::getHeight):
>-        (gl::Texture2D::getInternalFormat):
>-        (gl::Texture2D::getD3DFormat):
>-        (gl::Texture2D::redefineImage):
>-        (gl::Texture2D::setImage):
>-        (gl::Texture2D::bindTexImage):
>-        (gl::Texture2D::releaseTexImage):
>-        (gl::Texture2D::setCompressedImage):
>-        (gl::Texture2D::commitRect):
>-        (gl::Texture2D::subImage):
>-        (gl::Texture2D::subImageCompressed):
>-        (gl::Texture2D::copyImage):
>-        (gl::Texture2D::copySubImage):
>-        (gl::Texture2D::storage):
>-        (gl::Texture2D::isSamplerComplete):
>-        (gl::Texture2D::isMipmapComplete):
>-        (gl::Texture2D::isCompressed):
>-        (gl::Texture2D::isDepth):
>-        (gl::Texture2D::getBaseTexture):
>-        (gl::Texture2D::createTexture):
>-        (gl::Texture2D::updateTexture):
>-        (gl::Texture2D::convertToRenderTarget):
>-        (gl::Texture2D::generateMipmaps):
>-        (gl::Texture2D::getRenderbuffer):
>-        (gl::Texture2D::getRenderTarget):
>-        (gl::Texture2D::getDepthStencil):
>-        (gl::Texture2D::getStorage):
>-        (gl::TextureStorageCubeMap::TextureStorageCubeMap):
>-        (gl::TextureStorageCubeMap::~TextureStorageCubeMap):
>-        (gl::TextureStorageCubeMap::getCubeMapSurface):
>-        (gl::TextureStorageCubeMap::getBaseTexture):
>-        (gl::TextureStorageCubeMap::getRenderTargetSerial):
>-        (gl::TextureCubeMap::TextureCubeMap):
>-        (gl::TextureCubeMap::~TextureCubeMap):
>-        (gl::TextureCubeMap::addProxyRef):
>-        (gl::TextureCubeMap::releaseProxy):
>-        (gl::TextureCubeMap::getTarget):
>-        (gl::TextureCubeMap::getWidth):
>-        (gl::TextureCubeMap::getHeight):
>-        (gl::TextureCubeMap::getInternalFormat):
>-        (gl::TextureCubeMap::getD3DFormat):
>-        (gl::TextureCubeMap::setImagePosX):
>-        (gl::TextureCubeMap::setImageNegX):
>-        (gl::TextureCubeMap::setImagePosY):
>-        (gl::TextureCubeMap::setImageNegY):
>-        (gl::TextureCubeMap::setImagePosZ):
>-        (gl::TextureCubeMap::setImageNegZ):
>-        (gl::TextureCubeMap::setCompressedImage):
>-        (gl::TextureCubeMap::commitRect):
>-        (gl::TextureCubeMap::subImage):
>-        (gl::TextureCubeMap::subImageCompressed):
>-        (gl::TextureCubeMap::isSamplerComplete):
>-        (gl::TextureCubeMap::isCubeComplete):
>-        (gl::TextureCubeMap::isMipmapCubeComplete):
>-        (gl::TextureCubeMap::isCompressed):
>-        (gl::TextureCubeMap::getBaseTexture):
>-        (gl::TextureCubeMap::createTexture):
>-        (gl::TextureCubeMap::updateTexture):
>-        (gl::TextureCubeMap::convertToRenderTarget):
>-        (gl::TextureCubeMap::setImage):
>-        (gl::TextureCubeMap::faceIndex):
>-        (gl::TextureCubeMap::redefineImage):
>-        (gl::TextureCubeMap::copyImage):
>-        (gl::TextureCubeMap::copySubImage):
>-        (gl::TextureCubeMap::storage):
>-        (gl::TextureCubeMap::generateMipmaps):
>-        (gl::TextureCubeMap::getRenderbuffer):
>-        (gl::TextureCubeMap::getRenderTarget):
>-        (gl::TextureCubeMap::getStorage):
>-        * src/libGLESv2/Texture.h: Added.
>-        (gl::Image::markDirty):
>-        (gl::Image::markClean):
>-        (gl::Image::getWidth):
>-        (gl::Image::getHeight):
>-        (gl::Image::getInternalFormat):
>-        (gl::Image::isDirty):
>-        * src/libGLESv2/TextureSSE2.cpp: Added.
>-        (gl::Image::loadRGBAUByteDataSSE2):
>-        (gl::Image::loadAlphaDataSSE2):
>-        * src/libGLESv2/VertexDataManager.cpp: Added.
>-        (gl::elementsInBuffer):
>-        (gl::VertexDataManager::VertexDataManager):
>-        (gl::VertexDataManager::~VertexDataManager):
>-        (gl::VertexDataManager::writeAttributeData):
>-        (gl::VertexDataManager::prepareVertexData):
>-        (gl::VertexDataManager::spaceRequired):
>-        (gl::VertexDataManager::checkVertexCaps):
>-        (gl::VertexDataManager::typeIndex):
>-        (gl::VertexBuffer::VertexBuffer):
>-        (gl::VertexBuffer::~VertexBuffer):
>-        (gl::VertexBuffer::unmap):
>-        (gl::VertexBuffer::getBuffer):
>-        (gl::VertexBuffer::getSerial):
>-        (gl::VertexBuffer::issueSerial):
>-        (gl::ArrayVertexBuffer::ArrayVertexBuffer):
>-        (gl::ArrayVertexBuffer::~ArrayVertexBuffer):
>-        (gl::ArrayVertexBuffer::addRequiredSpace):
>-        (gl::StreamingVertexBuffer::StreamingVertexBuffer):
>-        (gl::StreamingVertexBuffer::~StreamingVertexBuffer):
>-        (gl::StreamingVertexBuffer::map):
>-        (gl::StreamingVertexBuffer::reserveRequiredSpace):
>-        (gl::StaticVertexBuffer::StaticVertexBuffer):
>-        (gl::StaticVertexBuffer::~StaticVertexBuffer):
>-        (gl::StaticVertexBuffer::map):
>-        (gl::StaticVertexBuffer::reserveRequiredSpace):
>-        (gl::StaticVertexBuffer::lookupAttribute):
>-        (gl::VertexDataManager::formatConverter):
>-        * src/libGLESv2/VertexDataManager.h: Added.
>-        (gl::ArrayVertexBuffer::size):
>-        (gl::VertexDataManager::dirtyCurrentValue):
>-        * src/libGLESv2/libGLESv2.cpp: Added.
>-        (validImageSize):
>-        (checkTextureFormatType):
>-        (validateSubImageParams2D):
>-        (validateSubImageParamsCube):
>-        (validReadFormatType):
>-        * src/libGLESv2/libGLESv2.def: Added.
>-        * src/libGLESv2/libGLESv2.rc: Added.
>-        * src/libGLESv2/libGLESv2.vcxproj: Added.
>-        * src/libGLESv2/libGLESv2.vcxproj.filters: Added.
>-        * src/libGLESv2/main.cpp: Added.
>-        (DllMain):
>-        (gl::makeCurrent):
>-        (gl::getContext):
>-        (gl::getNonLostContext):
>-        (gl::getDisplay):
>-        (gl::getDevice):
>-        (gl::checkDeviceLost):
>-        (error):
>-        * src/libGLESv2/main.h: Added.
>-        (error):
>-        * src/libGLESv2/mathutil.h: Added.
>-        (gl::Vector4::Vector4):
>-        (gl::isPow2):
>-        (gl::log2):
>-        (gl::ceilPow2):
>-        (gl::clamp):
>-        (gl::clamp01):
>-        (gl::unorm):
>-        (gl::supportsSSE2):
>-        (gl::float32ToFloat16):
>-        * src/libGLESv2/resource.h: Added.
>-        * src/libGLESv2/shaders: Added.
>-        * src/libGLESv2/shaders/Blit.ps: Added.
>-        * src/libGLESv2/shaders/Blit.vs: Added.
>-        * src/libGLESv2/shaders/componentmaskps.h: Added.
>-        * src/libGLESv2/shaders/flipyvs.h: Added.
>-        * src/libGLESv2/shaders/generate_shaders.bat: Added.
>-        * src/libGLESv2/shaders/luminanceps.h: Added.
>-        * src/libGLESv2/shaders/passthroughps.h: Added.
>-        * src/libGLESv2/shaders/standardvs.h: Added.
>-        * src/libGLESv2/utilities.cpp: Added.
>-        (gl::UniformExternalComponentCount):
>-        (gl::UniformInternalComponentCount):
>-        (gl::UniformComponentType):
>-        (gl::UniformComponentSize):
>-        (gl::UniformInternalSize):
>-        (gl::UniformExternalSize):
>-        (gl::VariableRowCount):
>-        (gl::VariableColumnCount):
>-        (gl::AllocateFirstFreeBits):
>-        (gl::ComputePitch):
>-        (gl::ComputeCompressedPitch):
>-        (gl::ComputeCompressedSize):
>-        (gl::IsCompressed):
>-        (gl::IsDepthTexture):
>-        (gl::IsStencilTexture):
>-        (gl::ComputePixelSize):
>-        (gl::IsCubemapTextureTarget):
>-        (gl::IsInternalTextureTarget):
>-        (gl::ConvertSizedInternalFormat):
>-        (gl::ExtractFormat):
>-        (gl::ExtractType):
>-        (gl::IsColorRenderable):
>-        (gl::IsDepthRenderable):
>-        (gl::IsStencilRenderable):
>-        (gl::IsFloat32Format):
>-        (gl::IsFloat16Format):
>-        (es2dx::ConvertComparison):
>-        (es2dx::ConvertColor):
>-        (es2dx::ConvertBlendFunc):
>-        (es2dx::ConvertBlendOp):
>-        (es2dx::ConvertStencilOp):
>-        (es2dx::ConvertTextureWrap):
>-        (es2dx::ConvertCullMode):
>-        (es2dx::ConvertCubeFace):
>-        (es2dx::ConvertColorMask):
>-        (es2dx::ConvertMagFilter):
>-        (es2dx::ConvertMinFilter):
>-        (es2dx::ConvertPrimitiveType):
>-        (es2dx::ConvertRenderbufferFormat):
>-        (es2dx::GetMultisampleTypeFromSamples):
>-        (dx2es::GetStencilSize):
>-        (dx2es::GetAlphaSize):
>-        (dx2es::GetRedSize):
>-        (dx2es::GetGreenSize):
>-        (dx2es::GetBlueSize):
>-        (dx2es::GetDepthSize):
>-        (dx2es::GetSamplesFromMultisampleType):
>-        (dx2es::IsFormatChannelEquivalent):
>-        (dx2es::ConvertReadBufferFormat):
>-        (dx2es::ConvertBackBufferFormat):
>-        (dx2es::ConvertDepthStencilFormat):
>-        (dx::IsCompressedFormat):
>-        (dx::ComputeRowSize):
>-        (getTempPath):
>-        (writeFile):
>-        * src/libGLESv2/utilities.h: Added.
>-        (isDeviceLostError):
>-        * src/libGLESv2/vertexconversion.h: Added.
>-        (gl::Identity::convert):
>-        (gl::Cast::convert):
>-        (gl::Normalize::convert):
>-        (gl::FixedToFloat::convert):
>-        (gl::SimpleDefaultValues::zero):
>-        (gl::SimpleDefaultValues::one):
>-        (gl::NormalizedDefaultValues::zero):
>-        (gl::NormalizedDefaultValues::one):
>-        (gl::VertexDataConverter::convertArray):
>-        (gl::VertexDataConverter::pointerAddBytes):
>-        (gl::VertexDataConverter::copyComponent):
>-
>-2013-07-17  Alex Christensen  <achristensen@apple.com>
>-
>-        Made a repeatable process for updating ANGLE that does not include manually editing any files.
>-        https://bugs.webkit.org/show_bug.cgi?id=118815
>-
>-        Reviewed by Dean Jackson.
>-
>-        * src/compiler/glslang.y:
>-        * src/compiler/glslang_lex.cpp:
>-        * src/compiler/glslang_tab.cpp:
>-        * src/compiler/glslang_tab.h: Put YYLTYPE definition in %union instead of prologue and ran Bison.
>-
>-2013-07-16  Alex Christensen  <achristensen@apple.com>
>-
>-        Update ANGLE from r1987 to r2426 while keeping these changes:
>-        Keeping #if defined(_MSC_VER) around #pragma warning(disable: 4718) in DependencyGraph.cpp.
>-        Keeping include khrplatform.h instead of KHR/khrplatform.h in ShaderLang.h.
>-        Added static_casts in Intermediate.cpp to fix compiling on Mac.
>-        Changed enum bit fields to just enums for GCC in Types.h to fix compiling for GTK.
>-        Ran Bison on Mac after removing the unsupported %code tag (See diff uploaded to bug for details).
>-        Added YYLTYPE definition to glslang_tab.h which would have been put there by the unsupported %code tag.
>-
>-        https://bugs.webkit.org/show_bug.cgi?id=118550
>-
>-        Reviewed by Dean Jackson.
>-
>-        * ANGLE.plist: Updated revision of ANGLE to 2426.
>-        * ANGLE.xcodeproj/project.pbxproj:
>-        * GNUmakefile.am:
>-        * Target.pri:
>-            Renamed DetectRecursion to DetectCallDepth and added builtin_symbol_table.
>-        * include/GLSLANG/ShaderLang.h:
>-        * src/common/version.h:
>-        * src/compiler/BaseTypes.h:
>-        (getQualifierString):
>-        * src/compiler/Common.h:
>-        * src/compiler/Compiler.cpp:
>-        (TCompiler::TCompiler):
>-        (TCompiler::Init):
>-        (TCompiler::compile):
>-        (TCompiler::detectCallDepth):
>-        (TCompiler::enforceTimingRestrictions):
>-        (TCompiler::limitExpressionComplexity):
>-        * src/compiler/ConstantUnion.h:
>-        (ConstantUnion::ConstantUnion):
>-        * src/compiler/DetectCallDepth.cpp: Added.
>-        (DetectCallDepth::FunctionNode::FunctionNode):
>-        (DetectCallDepth::FunctionNode::getName):
>-        (DetectCallDepth::FunctionNode::addCallee):
>-        (DetectCallDepth::FunctionNode::detectCallDepth):
>-        (DetectCallDepth::FunctionNode::reset):
>-        (DetectCallDepth::DetectCallDepth):
>-        (DetectCallDepth::~DetectCallDepth):
>-        (DetectCallDepth::visitAggregate):
>-        (DetectCallDepth::checkExceedsMaxDepth):
>-        (DetectCallDepth::resetFunctionNodes):
>-        (DetectCallDepth::detectCallDepthForFunction):
>-        (DetectCallDepth::detectCallDepth):
>-        (DetectCallDepth::findFunctionByName):
>-        * src/compiler/DetectCallDepth.h: Added.
>-        (DetectCallDepth::getInfoSink):
>-        * src/compiler/DetectRecursion.cpp: Removed.
>-        * src/compiler/DetectRecursion.h: Removed.
>-        * src/compiler/Diagnostics.cpp:
>-        (TDiagnostics::writeInfo):
>-        * src/compiler/ForLoopUnroll.cpp:
>-        (ForLoopUnroll::evaluateIntConstant):
>-        * src/compiler/InfoSink.cpp:
>-        (TInfoSinkBase::prefix):
>-        (TInfoSinkBase::location):
>-        (TInfoSinkBase::message):
>-        * src/compiler/InfoSink.h:
>-        * src/compiler/Initialize.cpp:
>-        (TBuiltIns::initialize):
>-        (IdentifyBuiltIns):
>-        (InitExtensionBehavior):
>-        * src/compiler/Intermediate.cpp: Updated and added static_casts to fix build errors on Mac.
>-        (TIntermediate::addSymbol):
>-        (TIntermediate::addBinaryMath):
>-        (TIntermediate::addAssign):
>-        (TIntermediate::addIndex):
>-        (TIntermediate::addUnaryMath):
>-        (TIntermediate::setAggregateOperator):
>-        (TIntermediate::addConversion):
>-        (TIntermediate::growAggregate):
>-        (TIntermediate::makeAggregate):
>-        (TIntermediate::addSelection):
>-        (TIntermediate::addComma):
>-        (TIntermediate::addConstantUnion):
>-        (TIntermediate::addSwizzle):
>-        (TIntermediate::addLoop):
>-        (TIntermediate::addBranch):
>-        (TIntermUnary::promote):
>-        (TIntermBinary::promote):
>-        (CompareStruct):
>-        (CompareStructure):
>-        (TIntermConstantUnion::fold):
>-        (TIntermediate::promoteConstantUnion):
>-        * src/compiler/OutputGLSL.cpp:
>-        (TOutputGLSL::visitSymbol):
>-        * src/compiler/OutputGLSL.h:
>-        * src/compiler/OutputGLSLBase.cpp:
>-        (TOutputGLSLBase::writeVariableType):
>-        (TOutputGLSLBase::writeConstantUnion):
>-        (TOutputGLSLBase::visitBinary):
>-        (TOutputGLSLBase::visitAggregate):
>-        (TOutputGLSLBase::getTypeName):
>-        (TOutputGLSLBase::hashFunctionName):
>-        (TOutputGLSLBase::structDeclared):
>-        (TOutputGLSLBase::declareStruct):
>-        * src/compiler/OutputGLSLBase.h:
>-        * src/compiler/OutputHLSL.cpp:
>-        (sh::OutputHLSL::OutputHLSL):
>-        (sh::OutputHLSL::header):
>-        (sh::OutputHLSL::visitSymbol):
>-        (sh::OutputHLSL::visitBinary):
>-        (sh::OutputHLSL::visitAggregate):
>-        (sh::OutputHLSL::visitSelection):
>-        (sh::OutputHLSL::visitLoop):
>-        (sh::OutputHLSL::handleExcessiveLoop):
>-        (sh::OutputHLSL::typeString):
>-        (sh::OutputHLSL::initializer):
>-        (sh::OutputHLSL::addConstructor):
>-        (sh::OutputHLSL::writeConstantUnion):
>-        (sh::OutputHLSL::decorateField):
>-        * src/compiler/OutputHLSL.h:
>-        * src/compiler/ParseHelper.cpp:
>-        (TParseContext::parseVectorFields):
>-        (TParseContext::parseMatrixFields):
>-        (TParseContext::error):
>-        (TParseContext::warning):
>-        (TParseContext::assignError):
>-        (TParseContext::unaryOpError):
>-        (TParseContext::binaryOpError):
>-        (TParseContext::precisionErrorCheck):
>-        (TParseContext::lValueErrorCheck):
>-        (TParseContext::globalErrorCheck):
>-        (TParseContext::reservedErrorCheck):
>-        (TParseContext::constructorErrorCheck):
>-        (TParseContext::voidErrorCheck):
>-        (TParseContext::boolErrorCheck):
>-        (TParseContext::samplerErrorCheck):
>-        (TParseContext::structQualifierErrorCheck):
>-        (TParseContext::parameterSamplerErrorCheck):
>-        (TParseContext::containsSampler):
>-        (TParseContext::arraySizeErrorCheck):
>-        (TParseContext::arrayQualifierErrorCheck):
>-        (TParseContext::arrayTypeErrorCheck):
>-        (TParseContext::arrayErrorCheck):
>-        (TParseContext::nonInitConstErrorCheck):
>-        (TParseContext::nonInitErrorCheck):
>-        (TParseContext::paramErrorCheck):
>-        (TParseContext::extensionErrorCheck):
>-        (TParseContext::findFunction):
>-        (TParseContext::isVariableBuiltIn):
>-        (TParseContext::executeInitializer):
>-        (TParseContext::addConstructor):
>-        (TParseContext::constructBuiltIn):
>-        (TParseContext::constructStruct):
>-        (TParseContext::addConstVectorNode):
>-        (TParseContext::addConstMatrixNode):
>-        (TParseContext::addConstArrayNode):
>-        (TParseContext::addConstStruct):
>-        (TParseContext::enterStructDeclaration):
>-        (TParseContext::structNestingErrorCheck):
>-        * src/compiler/ParseHelper.h:
>-        (TParseContext::TParseContext):
>-        (TParseContext::pragma):
>-        * src/compiler/PoolAlloc.cpp:
>-        (TPoolAllocator::allocate):
>-        * src/compiler/ShHandle.h:
>-        * src/compiler/ShaderLang.cpp:
>-        (ShInitBuiltInResources):
>-        * src/compiler/SymbolTable.cpp:
>-        (TType::TType):
>-        (TType::buildMangledName):
>-        (TType::getObjectSize):
>-        (TStructure::containsArrays):
>-        (TStructure::buildMangledName):
>-        (TStructure::calculateObjectSize):
>-        (TStructure::calculateDeepestNesting):
>-        (TSymbolTableLevel::relateToExtension):
>-        * src/compiler/SymbolTable.h:
>-        (TSymbol::relateToExtension):
>-        (TSymbol::getExtension):
>-        (TVariable::TVariable):
>-        (TVariable::setQualifier):
>-        (TVariable::shareConstPointer):
>-        * src/compiler/Types.h: Updated and changed enum bit fields to enums to fix compiling with GCC.
>-        (TField::TField):
>-        (TField::type):
>-        (TField::name):
>-        (NewPoolTFieldList):
>-        (TStructure::TStructure):
>-        (TStructure::name):
>-        (TStructure::fields):
>-        (TStructure::mangledName):
>-        (TStructure::objectSize):
>-        (TStructure::deepestNesting):
>-        (TType::TType):
>-        (TType::clearArrayness):
>-        (TType::getStruct):
>-        (TType::setStruct):
>-        (TType::getMangledName):
>-        (TType::getDeepestStructNesting):
>-        (TType::isStructureContainingArrays):
>-        (TPublicType::setBasic):
>-        * src/compiler/VariableInfo.cpp:
>-        (getUserDefinedVariableInfo):
>-        * src/compiler/builtin_symbol_table.cpp: Added.
>-        (builtin1):
>-        (builtin2):
>-        (builtin3):
>-        (InsertBuiltInFunctionsCommon):
>-        (InsertBuiltInFunctionsVertex):
>-        * src/compiler/builtin_symbol_table.h: Added.
>-        * src/compiler/glslang.l:
>-        * src/compiler/glslang.y:
>-        * src/compiler/glslang_lex.cpp:
>-        (yy_get_previous_state):
>-        (yy_try_NUL_trans):
>-        (yyget_lloc):
>-        (yyset_lloc):
>-        (string_input):
>-        (check_type):
>-        (reserved_word):
>-        (glslang_scan):
>-        * src/compiler/glslang_tab.cpp:
>-        (yysyntax_error):
>-        (yyerror):
>-        (glslang_parse):
>-        * src/compiler/glslang_tab.h: Readded YYLTYPE definition after Bison removed it.
>-        * src/compiler/intermOut.cpp:
>-        (TOutputTraverser::visitUnary):
>-        (TOutputTraverser::visitAggregate):
>-        (TOutputTraverser::visitConstantUnion):
>-        * src/compiler/intermediate.h:
>-        (TIntermNode::TIntermNode):
>-        (TIntermNode::~TIntermNode):
>-        (TIntermNode::getLine):
>-        (TIntermNode::setLine):
>-        (TIntermNode::getAsLoopNode):
>-        (TIntermConstantUnion::getIConst):
>-        (TIntermConstantUnion::getFConst):
>-        (TIntermConstantUnion::getBConst):
>-        (TIntermAggregate::TIntermAggregate):
>-        (TIntermTraverser::TIntermTraverser):
>-        (TIntermTraverser::getMaxDepth):
>-        (TIntermTraverser::incrementDepth):
>-        * src/compiler/localintermediate.h:
>-        * src/compiler/parseConst.cpp:
>-        (TConstTraverser::visitSymbol):
>-        (TConstTraverser::visitBinary):
>-        (TConstTraverser::visitUnary):
>-        (TConstTraverser::visitAggregate):
>-        (TConstTraverser::visitSelection):
>-        (TConstTraverser::visitConstantUnion):
>-        (TConstTraverser::visitLoop):
>-        (TConstTraverser::visitBranch):
>-        (TIntermediate::parseConstTree):
>-        * src/compiler/preprocessor/ExpressionParser.cpp:
>-        * src/compiler/timing/RestrictVertexShaderTiming.cpp:
>-        (RestrictVertexShaderTiming::visitSymbol):
>-            Updated ANGLE to r2426 and ran Bison.
>-
>-2013-06-17  Darin Adler  <darin@apple.com>
>-
>-        Sort all the Xcode project files
>-        https://bugs.webkit.org/show_bug.cgi?id=117696
>-
>-        Reviewed by Anders Carlsson.
>-
>-        * ANGLE.xcodeproj/project.pbxproj: Ran the sort-Xcode-project-file script.
>-
>-2013-04-18  Krzysztof Wolanski  <k.wolanski@samsung.com>
>-
>-        Add checking whether the compiler allows to use #pragma directive.
>-        https://bugs.webkit.org/show_bug.cgi?id=114740
>-
>-        Reviewed by Andreas Kling.
>-
>-        Some compilers may complain that #pragma warning is an undefined macro.
>-
>-        * src/compiler/depgraph/DependencyGraph.cpp:
>-
>-2013-04-11  Andras Becsi  <andras.becsi@digia.com>
>-
>-        [Qt][Mac] Linking fails with Qt 5.1
>-        https://bugs.webkit.org/show_bug.cgi?id=114435
>-
>-        Reviewed by Tor Arne VestbÃ¸.
>-
>-        Qt 5.1 enables C++11 by default when using clang on Mac
>-        and links against the libc++ standard library. As a result
>-        building the QtWebKit shared library fails when linking
>-        agains the ANGLE intermediate static library because libc++
>-        misses some symbols needed by ANGLE.
>-        Disable C++11 for the ANGLE intermediate library to fix the build.
>-
>-        * ANGLE.pri:
>-
>-2013-04-10  Benjamin Poulain  <bpoulain@apple.com>
>-
>-        Mass remove all the empty directories
>-
>-        Rubberstamped by Ryosuke Niwa.
>-
>-        * src/libGLESv2/geometry: Removed.
>-
>-2013-04-08  Ryosuke Niwa  <rniwa@webkit.org>
>-
>-        Remove ANGLE.gyp
>-        https://bugs.webkit.org/show_bug.cgi?id=114245
>-
>-        Unreviewed. Just removing an empty directory.
>-
>-        * ANGLE.gyp: Removed.
>-
>-2013-04-04  Martin Robinson  <mrobinson@igalia.com>
>-
>-        [GTK] Remove the gyp build
>-        https://bugs.webkit.org/show_bug.cgi?id=113942
>-
>-        Reviewed by Gustavo Noronha Silva.
>-
>-        * ANGLE.gyp/ANGLE.gyp: Removed.
>-        * ANGLE.gypi: Removed.
>-
>-2013-03-20  Zan Dobersek  <zdobersek@igalia.com>
>-
>-        [GTK] Build ANGLE sources into a separate library from libWebCore.la
>-        https://bugs.webkit.org/show_bug.cgi?id=112778
>-
>-        Reviewed by Martin Robinson.
>-
>-        * GNUmakefile.am: Added, sets up the libANGLE.la library.
>-
>-2013-03-05  Kenneth Russell  <kbr@google.com>
>-
>-        Upgrade ANGLE to r1987
>-        https://bugs.webkit.org/show_bug.cgi?id=111381
>-
>-        Reviewed by Dean Jackson.
>-
>-        * include/GLSLANG/ShaderLang.h:
>-        * src/common/version.h:
>-        * src/compiler/Compiler.cpp:
>-        (TCompiler::TCompiler):
>-        (TCompiler::Init):
>-        (TCompiler::compile):
>-        * src/compiler/ParseHelper.h:
>-        (TParseContext):
>-        * src/compiler/ShHandle.h:
>-        (TCompiler):
>-        * src/compiler/ShaderLang.cpp:
>-        (ShInitBuiltInResources):
>-        * src/compiler/UnfoldShortCircuit.cpp:
>-        (sh::UnfoldShortCircuit::visitSelection):
>-        * src/compiler/glslang.l:
>-        * src/compiler/glslang.y:
>-        * src/compiler/glslang_lex.cpp:
>-        (glslang_scan):
>-        * src/compiler/glslang_tab.cpp:
>-             Updated ANGLE to r1987.
>-
>-2013-03-01  Martin Robinson  <mrobinson@igalia.com>
>-
>-        [GTK] Add ANGLE to the GTK+ gyp build
>-        https://bugs.webkit.org/show_bug.cgi?id=111128
>-
>-        Reviewed by Dirk Pranke.
>-
>-        Add files that build an ANGLE static library for GTK+ using gyp.
>-
>-        * ANGLE.gyp/ANGLE.gyp: Added.
>-        * ANGLE.gypi: Added.
>-
>-2013-02-22  Kenneth Russell  <kbr@google.com>
>-
>-        Mac OS build broken by new ExpressionParser.cpp
>-        https://bugs.webkit.org/show_bug.cgi?id=110629
>-
>-        Unreviewed build fix. Regenerated ExpressionParser with Bison 2.3.
>-
>-        * src/compiler/preprocessor/ExpressionParser.cpp:
>-
>-2013-02-21  Zhenyao Mo  <zmo@google.com>
>-
>-        Roll ANGLE to r1833
>-        https://bugs.webkit.org/show_bug.cgi?id=110513
>-
>-        Reviewed by Kenneth Russell.
>-
>-        Upstream ANGLE r1833 includes webkit side local fixes
>-        1) r139758 build fix for -Wshorten-64-to-32
>-        2) r139665 build fix for uninitialized variables
>-
>-        After this roll, WebKit side ANGLE is the same as upstream ANGLE r1833, except:
>-        1) include/GLSLANG/ShaderLang.h, where "KHR" is removed from include path.
>-
>-        With this roll, we have EXT_draw_buffers support.
>-        
>-        * ANGLE.xcodeproj/project.pbxproj:
>-        * Target.pri:
>-        * include/GLSLANG/ShaderLang.h:
>-        * src/common/debug.cpp:
>-        * src/common/system.h: Added.
>-        * src/common/version.h:
>-        * src/compiler/ArrayBoundsClamper.cpp: Removed.
>-        * src/compiler/ArrayBoundsClamper.h: Removed.
>-        * src/compiler/Compiler.cpp:
>-        (TCompiler::TCompiler):
>-        (TCompiler::Init):
>-        (TCompiler::compile):
>-        (TCompiler::getArrayBoundsClamper):
>-        (TCompiler::getArrayIndexClampingStrategy):
>-        (TCompiler::getBuiltInFunctionEmulator):
>-        * src/compiler/DetectDiscontinuity.cpp:
>-        (sh::DetectLoopDiscontinuity::traverse):
>-        (sh::DetectLoopDiscontinuity::visitLoop):
>-        (sh):
>-        (sh::DetectLoopDiscontinuity::visitBranch):
>-        * src/compiler/DetectDiscontinuity.h:
>-        (DetectLoopDiscontinuity):
>-        * src/compiler/Initialize.cpp:
>-        (InitExtensionBehavior):
>-        * src/compiler/Intermediate.cpp:
>-        (TIntermConstantUnion::fold):
>-        (TIntermTraverser::hash):
>-        * src/compiler/MapLongVariableNames.cpp:
>-        (LongNameMap::Size):
>-        (MapLongVariableNames::mapGlobalLongName):
>-        * src/compiler/MapLongVariableNames.h:
>-        (LongNameMap):
>-        * src/compiler/OutputESSL.cpp:
>-        (TOutputESSL::TOutputESSL):
>-        * src/compiler/OutputESSL.h:
>-        (TOutputESSL):
>-        * src/compiler/OutputGLSL.cpp:
>-        (TOutputGLSL::TOutputGLSL):
>-        * src/compiler/OutputGLSL.h:
>-        (TOutputGLSL):
>-        * src/compiler/OutputGLSLBase.cpp:
>-        (TOutputGLSLBase::TOutputGLSLBase):
>-        (TOutputGLSLBase::writeConstantUnion):
>-        (TOutputGLSLBase::visitBinary):
>-        * src/compiler/OutputGLSLBase.h:
>-        (TOutputGLSLBase):
>-        * src/compiler/OutputHLSL.cpp:
>-        (sh::OutputHLSL::output):
>-        (sh::OutputHLSL::visitLoop):
>-        (sh::OutputHLSL::writeConstantUnion):
>-        * src/compiler/ParseHelper.cpp:
>-        (TParseContext::constructorErrorCheck):
>-        (PaParseStrings):
>-        * src/compiler/ParseHelper.h:
>-        * src/compiler/ShHandle.h:
>-        (TCompiler):
>-        * src/compiler/ShaderLang.cpp:
>-        (checkActiveUniformAndAttribMaxLengths):
>-        (checkMappedNameMaxLength):
>-        (getVariableInfo):
>-        (ShInitBuiltInResources):
>-        (ShCompile):
>-        (ShGetInfo):
>-        (ShGetActiveAttrib):
>-        (ShGetActiveUniform):
>-        (ShGetNameHashingEntry):
>-        * src/compiler/SymbolTable.h:
>-        (TFunction::getParamCount):
>-        (TFunction::getParam):
>-        (TSymbolTable::setDefaultPrecision):
>-        * src/compiler/TranslatorESSL.cpp:
>-        (TranslatorESSL::translate):
>-        * src/compiler/TranslatorGLSL.cpp:
>-        (TranslatorGLSL::translate):
>-        * src/compiler/ValidateLimitations.cpp:
>-        (ValidateLimitations::validateFunctionCall):
>-        * src/compiler/VariablePacker.cpp:
>-        (VariablePacker::GetNumRows):
>-        * src/compiler/glslang.h:
>-        * src/compiler/glslang.l:
>-        * src/compiler/glslang.y:
>-        * src/compiler/glslang_lex.cpp:
>-        (string_input):
>-        (glslang_scan):
>-        * src/compiler/glslang_tab.cpp:
>-        * src/compiler/preprocessor/ExpressionParser.cpp:
>-        * src/compiler/preprocessor/ExpressionParser.y:
>-        * src/compiler/preprocessor/Input.cpp:
>-        (pp::Input::Input):
>-        (pp::Input::read):
>-        * src/compiler/preprocessor/Input.h:
>-        (Input):
>-        (pp::Input::count):
>-        (pp::Input::string):
>-        (pp::Input::length):
>-        (Location):
>-        * src/compiler/preprocessor/Preprocessor.cpp:
>-        (pp::Preprocessor::init):
>-        * src/compiler/preprocessor/Preprocessor.h:
>-        (Preprocessor):
>-        * src/compiler/preprocessor/Tokenizer.cpp:
>-        (pp::Tokenizer::init):
>-        * src/compiler/preprocessor/Tokenizer.h:
>-        (Tokenizer):
>-        * src/compiler/preprocessor/Tokenizer.l:
>-        * src/third_party: Added.
>-        * src/third_party/compiler: Added.
>-        * src/third_party/compiler/ArrayBoundsClamper.cpp: Added.
>-        (ArrayBoundsClamper::ArrayBoundsClamper):
>-        (ArrayBoundsClamper::SetClampingStrategy):
>-        (ArrayBoundsClamper::MarkIndirectArrayBoundsForClamping):
>-        (ArrayBoundsClamper::OutputClampingFunctionDefinition):
>-        * src/third_party/compiler/ArrayBoundsClamper.h: Added.
>-        (ArrayBoundsClamper):
>-        (ArrayBoundsClamper::Cleanup):
>-        (ArrayBoundsClamper::GetArrayBoundsClampDefinitionNeeded):
>-        (ArrayBoundsClamper::SetArrayBoundsClampDefinitionNeeded):
>-        * src/third_party/compiler/LICENSE: Added.
>-        * src/third_party/compiler/README.angle: Added.
>-
>-2013-02-04  David Kilzer  <ddkilzer@apple.com>
>-
>-        Sort ANGLE Xcode project file.
>-
>-        * ANGLE.xcodeproj/project.pbxproj:
>-
>-2013-01-30  David Kilzer  <ddkilzer@apple.com>
>-
>-        Remove useless comment from Base.xcconfig
>-
>-        Rubber-stamped by Mark Rowe.
>-
>-        * Configurations/Base.xcconfig: Remove comment.
>-
>-2013-01-16  Allan Sandfeld Jensen  <allan.jensen@digia.com>
>-
>-        Doesn't build with GCC 4.7+
>-        https://bugs.webkit.org/show_bug.cgi?id=106999
>-
>-        Reviewed by Csaba OsztrogonÃ¡c.
>-
>-        Correct __GNU_C_MINOR__ macro to __GNUC_MINOR__.
>-
>-        * src/compiler/preprocessor/ExpressionParser.y:
>-
>-2013-01-15  David Kilzer  <ddkilzer@apple.com>
>-
>-        BUILD FIX: Add SUPPORTED_PLATFORMS to Base.xcconfig
>-
>-        * Configurations/Base.xcconfig: Add SUPPORTED_PLATFORMS so that
>-        Xcode knows we can build this project for all three platforms.
>-        Previously the Mac OS X SDKs were missing in the scheme picker.
>-
>-2013-01-15  David Kilzer  <ddkilzer@apple.com>
>-
>-        Upstream iOS changes for ANGLE project
>-        <http://webkit.org/b/106913>
>-
>-        Reviewed by Joseph Pecoraro.
>-
>-        * ANGLE.xcodeproj/project.pbxproj:
>-        - Use $(INSTALL_PATH_PREFIX) with CopyFiles build phase paths.
>-        - Add iOS.xcconfig to project.
>-        * Configurations/ANGLE.xcconfig:
>-        - Use INSTALL_PATH_ACTUAL instead of INSTALL_PATH.  (See below.)
>-        - Use $(INSTALL_PATH_PREFIX) with PUBLIC_HEADERS_FOLDER_PATH.
>-        * Configurations/Base.xcconfig:
>-        - Include iOS.xcconfig.
>-        - Add per-platform values for GCC_ENABLE_OBJC_GC and
>-          GCC_MODEL_TUNING.
>-        - Define INSTALL_PATH when building for macosx SDK.
>-        * Configurations/iOS.xcconfig: Add.  Note that missing include
>-        files are simply ignored without an error by Xcode.
>-
>-2013-01-15  David Kilzer  <ddkilzer@apple.com>
>-
>-        ANGLE should build with -Wshorten-64-to-32
>-        <http://webkit.org/b/106798>
>-        <http://code.google.com/p/angleproject/issues/detail?id=396>
>-
>-        Reviewed by Kenneth Russell.
>-
>-        Most changes below are simply to document issues with #pragma
>-        statements per request by upstream.  The change to osinclude.h
>-        is the only bug fix, which defines OS_TLSIndex in terms of
>-        pthread_key_t instead of unsigned int since pthread_key_t is a
>-        64-bit value on 64-bit Mac OS X.
>-
>-        * Configurations/Base.xcconfig: Enable -Wshorten-64-to-32 by
>-        setting GCC_WARN_64_TO_32_BIT_CONVERSION to YES.
>-        * src/compiler/Intermediate.cpp:
>-        (TIntermTraverser::hash): Add #pragmas for clang to ignore
>-        -Wshorten-64-to-32 warning.
>-        * src/compiler/MapLongVariableNames.cpp:
>-        (LongNameMap::Size): Ditto.
>-        * src/compiler/ShaderLang.cpp:
>-        (getVariableInfo): Ditto.
>-        (ShGetInfo): Ditto.
>-        * src/compiler/ValidateLimitations.cpp:
>-        (ValidateLimitations::validateFunctionCall): Ditto.
>-        * src/compiler/glslang.l: Ditto.
>-        * src/compiler/glslang_lex.cpp: Ditto.
>-        * src/compiler/osinclude.h: Change type of OS_TLSIndex to
>-        pthread_key_t.  Define OS_INVALID_TLS_INDEX by using
>-        static_cast<OS_TLSIndex>(-1).
>-        * src/compiler/preprocessor/Input.cpp:
>-        (pp::Input::Input): Add #pragmas for clang to ignore
>-        -Wshorten-64-to-32 warning.
>-        * src/compiler/preprocessor/Tokenizer.cpp: Ditto.
>-        * src/compiler/preprocessor/Tokenizer.l: Ditto.
>-
>-2013-01-14  David Kilzer  <ddkilzer@apple.com>
>-
>-        Remove nonexistent file in ANGLE Xcode project
>-
>-        * ANGLE.xcodeproj/project.pbxproj: Remove references to
>-        ossource_nspr.cpp which was removed in r139665.
>-
>-2013-01-14  Dean Jackson  <dino@apple.com>
>-
>-        Unreviewed QT build fix.
>-
>-        * ANGLE.pri:
>-
>-2013-01-14  Dean Jackson  <dino@apple.com>
>-
>-        [ANGLE] Update ANGLE in WebKit
>-        https://bugs.webkit.org/show_bug.cgi?id=106274
>-
>-        Unreviewed attempted build fix.
>-
>-        Remove the copy files stage. Make khrplatform.h a public header.
>-
>-        * ANGLE.xcodeproj/project.pbxproj:
>-        * include/GLSLANG/ShaderLang.h:
>-
>-2013-01-14  Max Vujovic  <mvujovic@adobe.com>
>-
>-        [ANGLE] Update ANGLE in WebKit
>-        https://bugs.webkit.org/show_bug.cgi?id=106274
>-
>-        Reviewed by Dean Jackson.
>-
>-        Update ANGLE to r1641.
>-
>-        ANGLE parsers were generated with Bison 2.3.
>-
>-        Additionally, perform the following changes to WebKit's ANGLE build system. Note that these
>-        changes only apply to WebKit's copy of ANGLE, and do not need to be upstreamed to ANGLE.
>-        (a) Remove all files in the libEGL and libGLESv2 directories because nobody is using them. 
>-            Add a README in each directory to explain why their contents are not copied over from
>-            ANGLE. This simplifies updating ANGLE in the future.
>-        (b) Remove the build_angle.xcodeproj file that no-one is using. It appears it was copied
>-            over from a gyp build of ANGLE. The Mac build uses ANGLE.xcodeproj.
>-        (c) Remove duplicate file entries in ANGLE.xcodeproj. Change its Xcode group structure to
>-            match ANGLE's directory structure.
>-        (d) Add a Copy Files task to ANGLE.xcodeproj to put the khrplatform.h header in the right
>-            place so ShaderLang.h can find it. ShaderLang.h is copied to
>-            <BuildDir>/usr/local/include/ANGLE/ShaderLang.h during the Copy Headers task, and it
>-            includes "KHR/khrplatform.h". Thus, we need to copy khrplatform.h to
>-            <BuildDir>/usr/local/include/ANGLE/KHR/khrplatform.h.
>-
>-        Additionally, make one build fix in ANGLE source that should be upstreamed to ANGLE:
>-        (1) Before this patch in ExpressionParser.y, we toggled the "-Wpragmas" flag so compilers
>-            could ignore the pragmas that they didn't understand instead of generating an error.
>-            However, clang does not understand "-Wpragmas" itself. Instead, tt understands
>-            "-Wunknown-pragmas". Now, instead of trying to temporarily ignore pragmas, we apply the
>-            right flags to the right compiler versions. The new code in ExpressionParser.y looks
>-            like:
>-
>-        """
>-        // Turn off uninitialized variable warnings triggered by the auto-generated pplval variable.
>-        // On gcc 4.7+, The flag is called "-Wmaybe-uninitialized".
>-        // On clang and gcc < 4.7, the flag is called "-Wuninitialized".
>-        #if !defined(__clang__) && ((__GNUC__ == 4 && __GNU_C_MINOR__ >= 7) || __GNUC__ >= 5)
>-        #pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
>-        #else
>-        #pragma GCC diagnostic ignored "-Wuninitialized"
>-        #endif
>-        """
>-
>-        * ANGLE.plist:
>-        * ANGLE.pri:
>-        * ANGLE.xcodeproj/project.pbxproj:
>-        * DerivedSources.pri:
>-        * Target.pri:
>-        * include/GLSLANG/ShaderLang.h:
>-        * src/build_angle.xcodeproj/project.pbxproj: Removed.
>-        * src/common/angleutils.h:
>-        * src/common/debug.cpp:
>-        (gl::ScopedPerfEventHelper::ScopedPerfEventHelper):
>-        * src/common/debug.h:
>-        * src/common/version.h:
>-        * src/compiler/Compiler.cpp:
>-        (TCompiler::Init):
>-        (TCompiler::compile):
>-        (TCompiler::clearResults):
>-        (TCompiler::collectAttribsUniforms):
>-        (TCompiler::enforcePackingRestrictions):
>-        * src/compiler/Diagnostics.cpp:
>-        (TDiagnostics::TDiagnostics):
>-        (TDiagnostics::writeInfo):
>-        (TDiagnostics::print):
>-        * src/compiler/Diagnostics.h:
>-        (TDiagnostics::numErrors):
>-        (TDiagnostics::numWarnings):
>-        (TDiagnostics):
>-        * src/compiler/DirectiveHandler.h:
>-        * src/compiler/HashNames.h: Added.
>-        * src/compiler/Intermediate.cpp:
>-        (TIntermTraverser::hash):
>-        * src/compiler/OutputESSL.cpp:
>-        (TOutputESSL::TOutputESSL):
>-        * src/compiler/OutputESSL.h:
>-        (TOutputESSL):
>-        * src/compiler/OutputGLSL.cpp:
>-        (TOutputGLSL::TOutputGLSL):
>-        * src/compiler/OutputGLSL.h:
>-        (TOutputGLSL):
>-        * src/compiler/OutputGLSLBase.cpp:
>-        (TOutputGLSLBase::TOutputGLSLBase):
>-        (TOutputGLSLBase::writeVariableType):
>-        (TOutputGLSLBase::writeFunctionParameters):
>-        (TOutputGLSLBase::writeConstantUnion):
>-        (TOutputGLSLBase::visitSymbol):
>-        (TOutputGLSLBase::visitBinary):
>-        (TOutputGLSLBase::visitAggregate):
>-        (TOutputGLSLBase::getTypeName):
>-        (TOutputGLSLBase::hashName):
>-        (TOutputGLSLBase::hashVariableName):
>-        (TOutputGLSLBase::hashFunctionName):
>-        * src/compiler/OutputGLSLBase.h:
>-        (TOutputGLSLBase):
>-        * src/compiler/OutputHLSL.cpp:
>-        (sh::OutputHLSL::OutputHLSL):
>-        (sh::OutputHLSL::header):
>-        (sh::OutputHLSL::visitAggregate):
>-        (sh::OutputHLSL::visitBranch):
>-        (sh::OutputHLSL::handleExcessiveLoop):
>-        * src/compiler/OutputHLSL.h:
>-        (OutputHLSL):
>-        * src/compiler/ParseHelper.cpp:
>-        (TParseContext::error):
>-        (TParseContext::nonInitConstErrorCheck):
>-        (PaParseStrings):
>-        * src/compiler/ParseHelper.h:
>-        (TParseContext::TParseContext):
>-        (TParseContext):
>-        (TParseContext::numErrors):
>-        * src/compiler/RenameFunction.h:
>-        (RenameFunction::visitAggregate):
>-        * src/compiler/ShHandle.h:
>-        (TCompiler::getHashFunction):
>-        (TCompiler::getNameMap):
>-        (TCompiler::getSymbolTable):
>-        (TCompiler):
>-        * src/compiler/ShaderLang.cpp:
>-        (ShInitBuiltInResources):
>-        (ShGetInfo):
>-        (ShGetNameHashingEntry):
>-        * src/compiler/SymbolTable.cpp:
>-        (TType::TType):
>-        (TType::isStructureContainingArrays):
>-        * src/compiler/SymbolTable.h:
>-        (TSymbolTable::findBuiltIn):
>-        (TSymbolTable):
>-        * src/compiler/TranslatorESSL.cpp:
>-        (TranslatorESSL::translate):
>-        * src/compiler/TranslatorGLSL.cpp:
>-        (TranslatorGLSL::translate):
>-        * src/compiler/Types.h:
>-        (TType):
>-        (TPublicType):
>-        (TPublicType::setBasic):
>-        (TPublicType::setAggregate):
>-        (TPublicType::setArray):
>-        (TPublicType::isStructureContainingArrays):
>-        * src/compiler/UnfoldShortCircuit.cpp:
>-        (sh::UnfoldShortCircuit::visitBinary):
>-        * src/compiler/VariableInfo.cpp:
>-        (getVariableInfo):
>-        (getUserDefinedVariableInfo):
>-        (TVariableInfo::TVariableInfo):
>-        (CollectAttribsUniforms::CollectAttribsUniforms):
>-        (CollectAttribsUniforms::visitAggregate):
>-        * src/compiler/VariableInfo.h:
>-        (TVariableInfo):
>-        (CollectAttribsUniforms):
>-        * src/compiler/VariablePacker.cpp: Added.
>-        (VariablePacker::GetNumComponentsPerRow):
>-        (VariablePacker::GetNumRows):
>-        (TVariableInfoComparer::operator()):
>-        (VariablePacker::makeColumnFlags):
>-        (VariablePacker::fillColumns):
>-        (VariablePacker::searchColumn):
>-        (VariablePacker::CheckVariablesWithinPackingLimits):
>-        * src/compiler/VariablePacker.h: Added.
>-        (VariablePacker):
>-        * src/compiler/VersionGLSL.cpp:
>-        (TVersionGLSL::visitAggregate):
>-        * src/compiler/VersionGLSL.h:
>-        (TVersionGLSL):
>-        * src/compiler/glslang.l:
>-        * src/compiler/glslang.y:
>-        * src/compiler/glslang_lex.cpp:
>-        (string_input):
>-        (glslang_finalize):
>-        (glslang_scan):
>-        * src/compiler/glslang_tab.cpp:
>-        * src/compiler/intermediate.h:
>-        (TIntermTraverser):
>-        * src/compiler/osinclude.h:
>-        (OS_GetTLSValue):
>-        * src/compiler/ossource_nspr.cpp:
>-        * src/compiler/preprocessor/DiagnosticsBase.cpp: Added.
>-        (pp):
>-        (pp::Diagnostics::~Diagnostics):
>-        (pp::Diagnostics::report):
>-        (pp::Diagnostics::severity):
>-        (pp::Diagnostics::message):
>-        * src/compiler/preprocessor/DiagnosticsBase.h: Renamed from Source/ThirdParty/ANGLE/src/compiler/preprocessor/new/Diagnostics.h.
>-        (pp):
>-        (Diagnostics):
>-        * src/compiler/preprocessor/DirectiveHandlerBase.cpp: Renamed from Source/ThirdParty/ANGLE/src/compiler/preprocessor/new/DirectiveHandlerBase.cpp.
>-        (pp):
>-        (pp::DirectiveHandler::~DirectiveHandler):
>-        * src/compiler/preprocessor/DirectiveHandlerBase.h: Renamed from Source/ThirdParty/ANGLE/src/compiler/preprocessor/new/DirectiveHandler.h.
>-        (pp):
>-        (DirectiveHandler):
>-        * src/compiler/preprocessor/DirectiveParser.cpp: Renamed from Source/ThirdParty/ANGLE/src/compiler/preprocessor/new/DirectiveParser.cpp.
>-        (getDirective):
>-        (isConditionalDirective):
>-        (isEOD):
>-        (skipUntilEOD):
>-        (isMacroNameReserved):
>-        (isMacroPredefined):
>-        (pp):
>-        (DefinedParser):
>-        (pp::DefinedParser::DefinedParser):
>-        (pp::DefinedParser::lex):
>-        (pp::DirectiveParser::DirectiveParser):
>-        (pp::DirectiveParser::lex):
>-        (pp::DirectiveParser::parseDirective):
>-        (pp::DirectiveParser::parseDefine):
>-        (pp::DirectiveParser::parseUndef):
>-        (pp::DirectiveParser::parseIf):
>-        (pp::DirectiveParser::parseIfdef):
>-        (pp::DirectiveParser::parseIfndef):
>-        (pp::DirectiveParser::parseElse):
>-        (pp::DirectiveParser::parseElif):
>-        (pp::DirectiveParser::parseEndif):
>-        (pp::DirectiveParser::parseError):
>-        (pp::DirectiveParser::parsePragma):
>-        (pp::DirectiveParser::parseExtension):
>-        (pp::DirectiveParser::parseVersion):
>-        (pp::DirectiveParser::parseLine):
>-        (pp::DirectiveParser::skipping):
>-        (pp::DirectiveParser::parseConditionalIf):
>-        (pp::DirectiveParser::parseExpressionIf):
>-        (pp::DirectiveParser::parseExpressionIfdef):
>-        * src/compiler/preprocessor/DirectiveParser.h: Renamed from Source/ThirdParty/ANGLE/src/compiler/preprocessor/new/DirectiveParser.h.
>-        (pp):
>-        (DirectiveParser):
>-        (ConditionalBlock):
>-        (pp::DirectiveParser::ConditionalBlock::ConditionalBlock):
>-        * src/compiler/preprocessor/ExpressionParser.cpp: Renamed from Source/ThirdParty/ANGLE/src/compiler/preprocessor/new/ExpressionParser.cpp.
>-        (yysyntax_error):
>-        (yylex):
>-        (yyerror):
>-        (pp):
>-        (pp::ExpressionParser::ExpressionParser):
>-        (pp::ExpressionParser::parse):
>-        * src/compiler/preprocessor/ExpressionParser.h: Renamed from Source/ThirdParty/ANGLE/src/compiler/preprocessor/new/ExpressionParser.h.
>-        (pp):
>-        (ExpressionParser):
>-        * src/compiler/preprocessor/ExpressionParser.y: Renamed from Source/ThirdParty/ANGLE/src/compiler/preprocessor/new/ExpressionParser.y.
>-        * src/compiler/preprocessor/Input.cpp: Renamed from Source/ThirdParty/ANGLE/src/compiler/preprocessor/new/Input.cpp.
>-        (pp):
>-        (pp::Input::Input):
>-        (pp::Input::read):
>-        * src/compiler/preprocessor/Input.h: Renamed from Source/ThirdParty/ANGLE/src/compiler/preprocessor/new/Input.h.
>-        (pp):
>-        (Input):
>-        (pp::Input::count):
>-        (pp::Input::string):
>-        (pp::Input::length):
>-        (Location):
>-        (pp::Input::Location::Location):
>-        (pp::Input::readLoc):
>-        * src/compiler/preprocessor/Lexer.cpp: Renamed from Source/ThirdParty/ANGLE/src/compiler/preprocessor/new/Lexer.cpp.
>-        (pp):
>-        (pp::Lexer::~Lexer):
>-        * src/compiler/preprocessor/Lexer.h: Renamed from Source/ThirdParty/ANGLE/src/compiler/preprocessor/new/Lexer.h.
>-        (pp):
>-        (Lexer):
>-        * src/compiler/preprocessor/Macro.cpp: Renamed from Source/ThirdParty/ANGLE/src/compiler/preprocessor/new/Macro.cpp.
>-        (pp):
>-        (pp::Macro::equals):
>-        * src/compiler/preprocessor/Macro.h: Renamed from Source/ThirdParty/ANGLE/src/compiler/preprocessor/new/Macro.h.
>-        (pp):
>-        (pp::Macro::Macro):
>-        (Macro):
>-        * src/compiler/preprocessor/MacroExpander.cpp: Renamed from Source/ThirdParty/ANGLE/src/compiler/preprocessor/new/MacroExpander.cpp.
>-        (pp):
>-        (TokenLexer):
>-        (pp::TokenLexer::TokenLexer):
>-        (pp::TokenLexer::lex):
>-        (pp::MacroExpander::MacroExpander):
>-        (pp::MacroExpander::~MacroExpander):
>-        (pp::MacroExpander::lex):
>-        (pp::MacroExpander::getToken):
>-        (pp::MacroExpander::ungetToken):
>-        (pp::MacroExpander::isNextTokenLeftParen):
>-        (pp::MacroExpander::pushMacro):
>-        (pp::MacroExpander::popMacro):
>-        (pp::MacroExpander::expandMacro):
>-        (pp::MacroExpander::collectMacroArgs):
>-        (pp::MacroExpander::replaceMacroParams):
>-        * src/compiler/preprocessor/MacroExpander.h: Renamed from Source/ThirdParty/ANGLE/src/compiler/preprocessor/new/MacroExpander.h.
>-        (pp):
>-        (MacroExpander):
>-        (MacroContext):
>-        (pp::MacroExpander::MacroContext::MacroContext):
>-        (pp::MacroExpander::MacroContext::empty):
>-        (pp::MacroExpander::MacroContext::get):
>-        (pp::MacroExpander::MacroContext::unget):
>-        * src/compiler/preprocessor/Preprocessor.cpp: Renamed from Source/ThirdParty/ANGLE/src/compiler/preprocessor/new/Preprocessor.cpp.
>-        (pp):
>-        (PreprocessorImpl):
>-        (pp::PreprocessorImpl::PreprocessorImpl):
>-        (pp::Preprocessor::Preprocessor):
>-        (pp::Preprocessor::~Preprocessor):
>-        (pp::Preprocessor::init):
>-        (pp::Preprocessor::predefineMacro):
>-        (pp::Preprocessor::lex):
>-        * src/compiler/preprocessor/Preprocessor.h: Renamed from Source/ThirdParty/ANGLE/src/compiler/preprocessor/new/Preprocessor.h.
>-        (pp):
>-        (Preprocessor):
>-        * src/compiler/preprocessor/SourceLocation.h: Renamed from Source/ThirdParty/ANGLE/src/compiler/preprocessor/new/SourceLocation.h.
>-        (pp):
>-        (pp::SourceLocation::SourceLocation):
>-        (SourceLocation):
>-        (pp::SourceLocation::equals):
>-        (pp::operator==):
>-        (pp::operator!=):
>-        * src/compiler/preprocessor/Token.cpp: Renamed from Source/ThirdParty/ANGLE/src/compiler/preprocessor/new/Token.cpp.
>-        (pp):
>-        (pp::Token::reset):
>-        (pp::Token::equals):
>-        (pp::Token::setAtStartOfLine):
>-        (pp::Token::setHasLeadingSpace):
>-        (pp::Token::setExpansionDisabled):
>-        (pp::Token::iValue):
>-        (pp::Token::uValue):
>-        (pp::Token::fValue):
>-        (pp::operator<<):
>-        * src/compiler/preprocessor/Token.h: Renamed from Source/ThirdParty/ANGLE/src/compiler/preprocessor/new/Token.h.
>-        (pp):
>-        (pp::Token::Token):
>-        (Token):
>-        (pp::Token::atStartOfLine):
>-        (pp::Token::hasLeadingSpace):
>-        (pp::Token::expansionDisabled):
>-        (pp::operator==):
>-        (pp::operator!=):
>-        * src/compiler/preprocessor/Tokenizer.cpp: Renamed from Source/ThirdParty/ANGLE/src/compiler/preprocessor/new/Tokenizer.cpp.
>-        (yy_buffer_state):
>-        (yy_trans_info):
>-        (yyguts_t):
>-        (yy_get_previous_state):
>-        (yy_try_NUL_trans):
>-        (input):
>-        (pprestart):
>-        (pp_switch_to_buffer):
>-        (pp_load_buffer_state):
>-        (pp_create_buffer):
>-        (pp_delete_buffer):
>-        (pp_init_buffer):
>-        (pp_flush_buffer):
>-        (pppush_buffer_state):
>-        (pppop_buffer_state):
>-        (ppensure_buffer_stack):
>-        (pp_scan_buffer):
>-        (pp_scan_string):
>-        (pp_scan_bytes):
>-        (yy_fatal_error):
>-        (ppget_extra):
>-        (ppget_lineno):
>-        (ppget_column):
>-        (ppget_in):
>-        (ppget_out):
>-        (ppget_leng):
>-        (ppget_text):
>-        (ppset_extra):
>-        (ppset_lineno):
>-        (ppset_column):
>-        (ppset_in):
>-        (ppset_out):
>-        (ppget_debug):
>-        (ppset_debug):
>-        (ppget_lval):
>-        (ppset_lval):
>-        (ppget_lloc):
>-        (ppset_lloc):
>-        (pplex_init):
>-        (pplex_init_extra):
>-        (yy_init_globals):
>-        (pplex_destroy):
>-        (yy_flex_strncpy):
>-        (yy_flex_strlen):
>-        (ppalloc):
>-        (pprealloc):
>-        (ppfree):
>-        (pp):
>-        (pp::Tokenizer::Tokenizer):
>-        (pp::Tokenizer::~Tokenizer):
>-        (pp::Tokenizer::init):
>-        (pp::Tokenizer::setFileNumber):
>-        (pp::Tokenizer::setLineNumber):
>-        (pp::Tokenizer::lex):
>-        (pp::Tokenizer::initScanner):
>-        (pp::Tokenizer::destroyScanner):
>-        * src/compiler/preprocessor/Tokenizer.h: Renamed from Source/ThirdParty/ANGLE/src/compiler/preprocessor/new/Tokenizer.h.
>-        (pp):
>-        (Tokenizer):
>-        (Context):
>-        * src/compiler/preprocessor/Tokenizer.l: Renamed from Source/ThirdParty/ANGLE/src/compiler/preprocessor/new/Tokenizer.l.
>-        * src/compiler/preprocessor/atom.c: Removed.
>-        * src/compiler/preprocessor/atom.h: Removed.
>-        * src/compiler/preprocessor/compile.h: Removed.
>-        * src/compiler/preprocessor/cpp.c: Removed.
>-        * src/compiler/preprocessor/cpp.h: Removed.
>-        * src/compiler/preprocessor/cppstruct.c: Removed.
>-        * src/compiler/preprocessor/generate_parser.sh: Renamed from Source/ThirdParty/ANGLE/src/compiler/preprocessor/new/generate_parser.sh.
>-        * src/compiler/preprocessor/memory.c: Removed.
>-        * src/compiler/preprocessor/memory.h: Removed.
>-        * src/compiler/preprocessor/new/DiagnosticsBase.cpp: Removed.
>-        * src/compiler/preprocessor/new/new_file.cpp: Removed.
>-        * src/compiler/preprocessor/new/new_file2.cpp: Removed.
>-        * src/compiler/preprocessor/new/preprocessor.vcproj: Removed.
>-        * src/compiler/preprocessor/numeric_lex.h: Added.
>-        (pp):
>-        (pp::numeric_base_int):
>-        (pp::numeric_lex_int):
>-        (pp::numeric_lex_float):
>-        * src/compiler/preprocessor/parser.h: Removed.
>-        * src/compiler/preprocessor/pp_utils.h: Renamed from Source/ThirdParty/ANGLE/src/compiler/preprocessor/new/pp_utils.h.
>-        * src/compiler/preprocessor/preprocess.h: Removed.
>-        * src/compiler/preprocessor/scanner.c: Removed.
>-        * src/compiler/preprocessor/scanner.h: Removed.
>-        * src/compiler/preprocessor/slglobals.h: Removed.
>-        * src/compiler/preprocessor/symbols.c: Removed.
>-        * src/compiler/preprocessor/symbols.h: Removed.
>-        * src/compiler/preprocessor/tokens.c: Removed.
>-        * src/compiler/preprocessor/tokens.h: Removed.
>-        * src/libEGL/Config.cpp: Removed.
>-        * src/libEGL/Config.h: Removed.
>-        * src/libEGL/Display.cpp: Removed.
>-        * src/libEGL/Display.h: Removed.
>-        * src/libEGL/README: Added.
>-        * src/libEGL/Surface.cpp: Removed.
>-        * src/libEGL/Surface.h: Removed.
>-        * src/libEGL/libEGL.cpp: Removed.
>-        * src/libEGL/libEGL.def: Removed.
>-        * src/libEGL/libEGL.rc: Removed.
>-        * src/libEGL/libEGL.vcproj: Removed.
>-        * src/libEGL/main.cpp: Removed.
>-        * src/libEGL/main.h: Removed.
>-        * src/libEGL/resource.h: Removed.
>-        * src/libGLESv2/Blit.cpp: Removed.
>-        * src/libGLESv2/Blit.h: Removed.
>-        * src/libGLESv2/Buffer.cpp: Removed.
>-        * src/libGLESv2/Buffer.h: Removed.
>-        * src/libGLESv2/Context.cpp: Removed.
>-        * src/libGLESv2/Context.h: Removed.
>-        * src/libGLESv2/Fence.cpp: Removed.
>-        * src/libGLESv2/Fence.h: Removed.
>-        * src/libGLESv2/Framebuffer.cpp: Removed.
>-        * src/libGLESv2/Framebuffer.h: Removed.
>-        * src/libGLESv2/HandleAllocator.cpp: Removed.
>-        * src/libGLESv2/HandleAllocator.h: Removed.
>-        * src/libGLESv2/IndexDataManager.cpp: Removed.
>-        * src/libGLESv2/IndexDataManager.h: Removed.
>-        * src/libGLESv2/Program.cpp: Removed.
>-        * src/libGLESv2/Program.h: Removed.
>-        * src/libGLESv2/ProgramBinary.cpp: Removed.
>-        * src/libGLESv2/ProgramBinary.h: Removed.
>-        * src/libGLESv2/Query.cpp: Removed.
>-        * src/libGLESv2/Query.h: Removed.
>-        * src/libGLESv2/README: Added.
>-        * src/libGLESv2/Renderbuffer.cpp: Removed.
>-        * src/libGLESv2/Renderbuffer.h: Removed.
>-        * src/libGLESv2/ResourceManager.cpp: Removed.
>-        * src/libGLESv2/ResourceManager.h: Removed.
>-        * src/libGLESv2/Shader.cpp: Removed.
>-        * src/libGLESv2/Shader.h: Removed.
>-        * src/libGLESv2/Texture.cpp: Removed.
>-        * src/libGLESv2/Texture.h: Removed.
>-        * src/libGLESv2/VertexDataManager.cpp: Removed.
>-        * src/libGLESv2/VertexDataManager.h: Removed.
>-        * src/libGLESv2/libGLESv2.cpp: Removed.
>-        * src/libGLESv2/libGLESv2.def: Removed.
>-        * src/libGLESv2/libGLESv2.rc: Removed.
>-        * src/libGLESv2/libGLESv2.vcproj: Removed.
>-        * src/libGLESv2/main.cpp: Removed.
>-        * src/libGLESv2/main.h: Removed.
>-        * src/libGLESv2/mathutil.h: Removed.
>-        * src/libGLESv2/resource.h: Removed.
>-        * src/libGLESv2/utilities.cpp: Removed.
>-        * src/libGLESv2/utilities.h: Removed.
>-        * src/libGLESv2/vertexconversion.h: Removed.
>-
>-2012-12-18  Max Vujovic  <mvujovic@adobe.com>
>-
>-        [ANGLE] Use of uninitialized memory in ArrayBoundsClamper
>-        https://bugs.webkit.org/show_bug.cgi?id=105218
>-
>-        Reviewed by Dean Jackson.
>-
>-        TIntermBinary::addIndexClamp is uninitialized when the compile flag 
>-        SH_CLAMP_INDIRECT_ARRAY_BOUNDS is not set. Then, addIndexClamp is used in OutputGLSLBase. 
>-        CSS Shaders needs to do a first validation pass without the SH_CLAMP_INDIRECT_ARRAY_BOUNDS 
>-        flag and its effects. However, sometimes addIndexClamp is true, which inserts clamping code
>-        that causes a shader to fail compilation at the WebGL level.
>-
>-        * src/compiler/intermediate.h:
>-        (TIntermBinary::TIntermBinary):
>-
>-2012-10-29  Anders Carlsson  <andersca@apple.com>
>-
>-        Build WebKit as C++11 on Mac
>-        https://bugs.webkit.org/show_bug.cgi?id=100720
>-
>-        Reviewed by Daniel Bates.
>-
>-        * Configurations/Base.xcconfig:
>-        Add CLANG_CXX_LANGUAGE_STANDARD=gnu++0x.
>-
>-2012-10-28  Mark Rowe  <mrowe@apple.com>
>-
>-        Simplify Xcode configuration settings that used to vary between OS versions.
>-
>-        Reviewed by Dan Bernstein.
>-
>-        * Configurations/Base.xcconfig:
>-        * Configurations/DebugRelease.xcconfig:
>-
>-2012-10-28  Mark Rowe  <mrowe@apple.com>
>-
>-        Remove references to unsupported OS and Xcode versions.
>-
>-        Reviewed by Anders Carlsson.
>-
>-        * Configurations/Base.xcconfig:
>-        * Configurations/CompilerVersion.xcconfig: Removed.
>-        * Configurations/DebugRelease.xcconfig:
>-
>-2012-10-27  Dan Bernstein  <mitz@apple.com>
>-
>-        REAL_PLATFORM_NAME build setting is no longer needed
>-        https://bugs.webkit.org/show_bug.cgi?id=100587
>-
>-        Reviewed by Mark Rowe.
>-
>-        Removed the definition of REAL_PLATFORM_NAME and replaced references to it with references
>-        to PLATFORM_NAME.
>-
>-        * Configurations/Base.xcconfig:
>-        * Configurations/CompilerVersion.xcconfig:
>-
>-2012-10-18  Dean Jackson  <dino@apple.com>
>-
>-        Shader translator needs option to clamp uniform array accesses in vertex shaders
>-        https://bugs.webkit.org/show_bug.cgi?id=98977
>-        https://code.google.com/p/angleproject/issues/detail?id=49
>-
>-        Reviewed by Alok Priyadarshi and Ken Russell.
>-
>-        WebGL does not allow GLSL code to index a uniform array outside its bounds. Add a
>-        flag to the ANGLE compiler to insert clamp statements around such indexing.
>-        Since it is possible to access vec2/3/4 and mat2/3/4 components by array indexing,
>-        they must be similarly clamped.
>-
>-        Unfortunately, it is currently not possible to always determine that the indexing is
>-        operating on a uniform variable. For example, suppose we have "uniform mat4 a". ANGLE
>-        is currently not able to tell us that the rvalue of "a[0]" is a uniform, just that
>-        it has a size of 4. Therefore, the clamping is done on all indirect array indexing.
>-
>-        This will have a performance impact. Future enhancements may be able to determine
>-        cases where the clamping is not necessary. Currently only direct indexing is skipped
>-        (i.e. looking up a value using a constant index).
>-
>-        The clamp insertion is only performed on the GLSL output. Direct3D already guarantees
>-        that out-of-bounds uniform array access returns a zero value.
>-
>-        * ANGLE.xcodeproj/project.pbxproj:
>-        * Target.pri:
>-        * include/GLSLANG/ShaderLang.h: New compiler option.
>-        * src/compiler/ArrayBoundsClamper.cpp: Added.
>-        (ArrayBoundsClamper::ArrayBoundsClamper):
>-        (ArrayBoundsClamper::OutputClampingFunctionDefinition): Injects a clamping function for integers into GLSL source.
>-        (ArrayBoundsClamper::MarkIndirectArrayBoundsForClamping): Examines the AST looking for non-direct array indexing.
>-        * src/compiler/ArrayBoundsClamper.h: Added.
>-        (ArrayBoundsClamper):
>-        (ArrayBoundsClamper::GetArrayBoundsClampDefinitionNeeded):
>-        (ArrayBoundsClamper::SetArrayBoundsClampDefinitionNeeded): Marks the object as needing to output the clamping function.
>-        (ArrayBoundsClamper::Cleanup): Resets the state so that subsequent runs start fresh.
>-        * src/compiler/Compiler.cpp:
>-        (TCompiler::compile): Run the clamping code if the compile option was set.
>-        (TCompiler::clearResults):
>-        (TCompiler::getArrayBoundsClamper):
>-        * src/compiler/OutputGLSLBase.cpp:
>-        (TOutputGLSLBase::visitBinary): If the expression has been flagged, insert an appropriate "clamp" statement.
>-        * src/compiler/ShHandle.h:
>-        (TCompiler):
>-        * src/compiler/TranslatorESSL.cpp:
>-        (TranslatorESSL::translate):
>-        * src/compiler/TranslatorGLSL.cpp:
>-        (TranslatorGLSL::translate):
>-        * src/compiler/intermOut.cpp:
>-        (TType::getCompleteString): Add array size to intermediate tree output.
>-        * src/compiler/intermediate.h:
>-        (TIntermBinary::setAddIndexClamp): New flag for indicating a binary expression needs clamping.
>-        (TIntermBinary::getAddIndexClamp):
>-        (TIntermBinary):
>-
>-2012-09-13  Mark Rowe  <mrowe@apple.com>
>-
>-        <rdar://problem/12255720> Fix the build with newer Clang
>-
>-        Reviewed by Sam Weinig.
>-        
>-        Clang generates a warning about the inclusion of trailing commas on the final enum item as it's apparently
>-        a C++11 extension. Remove them.
>-        
>-        * src/compiler/BaseTypes.h:
>-        * src/compiler/ExtensionBehavior.h:
>-        * src/compiler/ParseHelper.cpp:
>-        (TParseContext::parseVectorFields):
>-        * src/compiler/intermediate.h:
>-
>-2012-09-13  Simon Hausmann  <simon.hausmann@nokia.com>
>-
>-        [Qt] The ANGLE build on Windows breaks with GnuWin32's flex because it is too old
>-        https://bugs.webkit.org/show_bug.cgi?id=96359
>-
>-        Reviewed by Tor Arne VestbÃ¸.
>-
>-        GnuWin32's flex is 2.5.4 and that is too old for ANGLE's preprocessor
>-        lexer. The only viable alternative I could find on Windows that provides
>-        binaries is the winflexbison distribution (http://sourceforge.net/projects/winflexbison/),
>-        so let's use that one instead.
>-
>-        * DerivedSources.pri:
>-
>-2012-09-12  Simon Hausmann  <simon.hausmann@nokia.com>
>-
>-        [Qt] Build on Windows requires bison/flex in PATH
>-        https://bugs.webkit.org/show_bug.cgi?id=96358
>-
>-        Reviewed by Tor Arne VestbÃ¸.
>-
>-        Use MAKEFILE_NOOP_COMMAND instead of the \n\t trick to generate a dummy command. Otherwise
>-        the PATH prepend trick will break because it generates a command line along the lines of
>-        (set PATH="...") && with just that trailing ampersand pair.
>-
>-        * DerivedSources.pri:
>-
>-2012-09-10  Dean Jackson  <dino@apple.com>
>-
>-        [Apple] Install plist for Apple Open Source build system
>-        https://bugs.webkit.org/show_bug.cgi?id=96345
>-
>-        Reviewed by Mark Rowe.
>-
>-        Apple's build system requires a couple of files that describe where
>-        the 3rd party Open Source library came from, and what license it
>-        uses. These files are copied into /usr/local when the project is
>-        being installed.
>-
>-        * ANGLE.plist: Added.
>-        * ANGLE.txt: Added.
>-        * ANGLE.xcodeproj/project.pbxproj:
>-
>-2012-09-06  Andras Becsi  <andras.becsi@nokia.com>
>-
>-        [ANGLE] Fix the build with gcc 4.7
>-        https://bugs.webkit.org/show_bug.cgi?id=95989
>-
>-        Reviewed by Csaba OsztrogonÃ¡c.
>-
>-        The build fails because of a bogus warning about the auto-generated
>-        pplval variable. Unfortunately the warning is called -Wuninitialized
>-        in gcc 4.6 and -Wmaybe-uninitialized in gcc 4.7 thus we also need to
>-        ignore unknown pragmas not to break the build with compilers that do
>-        not recognize these options.
>-
>-        * src/compiler/preprocessor/new/ExpressionParser.y:
>-
>-2012-09-06  Simon Hausmann  <simon.hausmann@nokia.com>
>-
>-        [Qt] Fix build with ANGLE on platforms that provide EGL/GLESv2
>-        https://bugs.webkit.org/show_bug.cgi?id=95965
>-
>-        Reviewed by Tor Arne VestbÃ¸.
>-
>-        Add build rules to build ANGLE as a static library for the Qt port.
>-
>-        * ANGLE.pri: Added.
>-        * ANGLE.pro: Added.
>-        * DerivedSources.pri: Added.
>-        * Target.pri: Added.
>-
>-2012-08-24  Joshua Netterfield  <jnetterfield@rim.com>
>-
>-        [CSS Shaders] [ANGLE] RenameFunction::RenameFunction may store references to temporary string
>-        https://bugs.webkit.org/show_bug.cgi?id=94736
>-        http://code.google.com/p/angleproject/issues/detail?id=360
>-
>-        Reviewed by George Staikos.
>-
>-        When RenameFunction::RenameFunction(const TString& oldFunctionName, const TString&
>-        newFunctionName) is called from TCompiler::rewriteCSSShader(TIntermNode*), references to
>-        the temporaries oldFunctionName and newFunctionName are stored as mOldFunctionName and
>-        mNewFunctionName. This results in undefined behaviour in visitAggregate.
>-
>-        This same patch is being applied in upstream ANGLE, and is needed for CSS Shader
>-        sanitization.
>-
>-        * src/compiler/RenameFunction.h:
>-        (RenameFunction::visitAggregate):
>-        (RenameFunction):
>-
>-2012-07-18  KristÃ³f KosztyÃ³  <kkristof@inf.u-szeged.hu>
>-
>-        [Qt] Buildfix after r122870.
>-        https://bugs.webkit.org/show_bug.cgi?id=89039
>-
>-        Reviewed by Csaba OsztrogonÃ¡c
>-
>-        * src/compiler/preprocessor/new/MacroExpander.cpp:
>-        (pp::MacroExpander::ungetToken):
>-
>-2012-07-17  Max Vujovic  <mvujovic@adobe.com>
>-
>-        Update ANGLE in WebKit
>-        https://bugs.webkit.org/show_bug.cgi?id=89039
>-
>-        Reviewed by Dean Jackson and Mark Rowe.
>-
>-        Update ANGLE to r1170, with the following modifications:
>-
>-        (1) Use Bison 2.3 instead of Bison 2.4.2 to generate ExpressionParser.cpp and
>-        glslang_tab.cpp. I had to modify ExpressionParser.y to make it compatible with Bison
>-        2.3. The changes have been contributed back to ANGLE in r1224.
>-
>-        (2) Continue to recognize QNX as POSIX in ANGLE. This has been contributed back to ANGLE
>-        in r1223.
>-
>-        (3) Rename ANGLE/src/compiler/preprocessor/new/Diagnostic.cpp to DiagnosticBase.cpp.
>-        Rename ANGLE/src/compiler/preprocessor/new/DirectiveHandler.cpp to DirectiveHandlerBase.cpp.
>-
>-        With the introduction of ANGLE's new preprocessor, there were two files named Diagnostic.cpp
>-        in ANGLE under different folders. This caused problems on the QT build when their object
>-        files, both named Diagnostic.o, tried to go in the same folder. Renaming one of them to
>-        DiagnosticBase.cpp avoids this conflict. The same situation occurred with
>-        DirectiveHandler.cpp. I will work on contributing this change back to ANGLE for future
>-        updates.
>-
>-        (4) Add the following lines to glslang.y and ExpressionParser.y:
>-        #define YYENABLE_NLS 0
>-        #define YYLTYPE_IS_TRIVIAL 1
>-
>-        Bison 2.3 doesn't first check that these macros are defined before reading their value,
>-        which causes the QT build to fail.
>-
>-        We work around this issue in the same way in CSSGrammar.y.
>-
>-        I will work on contributing this change back to ANGLE.
>-
>-        * ANGLE.xcodeproj/project.pbxproj:
>-        * include/GLES2/gl2ext.h:
>-        * include/GLSLANG/ShaderLang.h:
>-        * src/build_angle.xcodeproj/project.pbxproj:
>-        * src/common/angleutils.h:
>-        * src/common/debug.cpp:
>-        (gl):
>-        (gl::output):
>-        (gl::trace):
>-        (gl::perfActive):
>-        (gl::ScopedPerfEventHelper::ScopedPerfEventHelper):
>-        (gl::ScopedPerfEventHelper::~ScopedPerfEventHelper):
>-        * src/common/version.h:
>-        * src/compiler/BuiltInFunctionEmulator.cpp:
>-        (BuiltInFunctionEmulator::IdentifyFunction):
>-        * src/compiler/BuiltInFunctionEmulator.h:
>-        * src/compiler/Compiler.cpp:
>-        (isWebGLBasedSpec):
>-        (TCompiler::compile):
>-        (TCompiler::rewriteCSSShader):
>-        (TCompiler::enforceTimingRestrictions):
>-        (TCompiler::enforceFragmentShaderTimingRestrictions):
>-        (TCompiler::enforceVertexShaderTimingRestrictions):
>-        * src/compiler/DetectDiscontinuity.cpp: Added.
>-        (sh::DetectLoopDiscontinuity::traverse):
>-        (sh):
>-        (sh::DetectLoopDiscontinuity::visitBranch):
>-        (sh::DetectLoopDiscontinuity::visitAggregate):
>-        (sh::containsLoopDiscontinuity):
>-        (sh::DetectGradientOperation::traverse):
>-        (sh::DetectGradientOperation::visitUnary):
>-        (sh::DetectGradientOperation::visitAggregate):
>-        (sh::containsGradientOperation):
>-        * src/compiler/DetectDiscontinuity.h: Added.
>-        (sh):
>-        (DetectLoopDiscontinuity):
>-        (DetectGradientOperation):
>-        * src/compiler/Diagnostics.cpp: Added.
>-        (TDiagnostics::TDiagnostics):
>-        (TDiagnostics::~TDiagnostics):
>-        (TDiagnostics::writeInfo):
>-        (TDiagnostics::writeDebug):
>-        (TDiagnostics::print):
>-        * src/compiler/Diagnostics.h: Added.
>-        (TDiagnostics):
>-        (TDiagnostics::infoSink):
>-        * src/compiler/DirectiveHandler.cpp: Added.
>-        (getBehavior):
>-        (TDirectiveHandler::TDirectiveHandler):
>-        (TDirectiveHandler::~TDirectiveHandler):
>-        (TDirectiveHandler::handleError):
>-        (TDirectiveHandler::handlePragma):
>-        (TDirectiveHandler::handleExtension):
>-        (TDirectiveHandler::handleVersion):
>-        * src/compiler/DirectiveHandler.h: Added.
>-        (TDirectiveHandler):
>-        (TDirectiveHandler::pragma):
>-        (TDirectiveHandler::extensionBehavior):
>-        * src/compiler/ExtensionBehavior.h:
>-        (getBehaviorString):
>-        * src/compiler/Initialize.cpp:
>-        (BuiltInConstants):
>-        (TBuiltIns::initialize):
>-        (IdentifyBuiltIns):
>-        * src/compiler/InitializeParseContext.cpp: Added.
>-        (InitializeParseContextIndex):
>-        (FreeParseContextIndex):
>-        (InitializeGlobalParseContext):
>-        (FreeParseContext):
>-        (GetGlobalParseContext):
>-        * src/compiler/InitializeParseContext.h:
>-        (TThreadParseContextRec):
>-        * src/compiler/Intermediate.cpp:
>-        (TIntermediate::addSelection):
>-        * src/compiler/MapLongVariableNames.cpp:
>-        * src/compiler/OutputHLSL.cpp:
>-        (sh::str):
>-        (sh::OutputHLSL::OutputHLSL):
>-        (sh::OutputHLSL::~OutputHLSL):
>-        (sh::OutputHLSL::output):
>-        (sh::OutputHLSL::header):
>-        (sh::OutputHLSL::visitBinary):
>-        (sh::OutputHLSL::visitUnary):
>-        (sh::OutputHLSL::visitAggregate):
>-        (sh::OutputHLSL::visitSelection):
>-        (sh::OutputHLSL::visitLoop):
>-        (sh::OutputHLSL::traverseStatements):
>-        (sh):
>-        (sh::OutputHLSL::handleExcessiveLoop):
>-        (sh::OutputHLSL::typeString):
>-        (sh::OutputHLSL::addConstructor):
>-        (sh::OutputHLSL::decorateField):
>-        * src/compiler/OutputHLSL.h:
>-        (sh):
>-        (OutputHLSL):
>-        * src/compiler/ParseHelper.cpp:
>-        (TParseContext::parseVectorFields):
>-        (TParseContext::parseMatrixFields):
>-        (TParseContext::error):
>-        (TParseContext::warning):
>-        (TParseContext::trace):
>-        (TParseContext::assignError):
>-        (TParseContext::unaryOpError):
>-        (TParseContext::binaryOpError):
>-        (TParseContext::precisionErrorCheck):
>-        (TParseContext::lValueErrorCheck):
>-        (TParseContext::constErrorCheck):
>-        (TParseContext::integerErrorCheck):
>-        (TParseContext::globalErrorCheck):
>-        (TParseContext::reservedErrorCheck):
>-        (TParseContext::constructorErrorCheck):
>-        (TParseContext::voidErrorCheck):
>-        (TParseContext::boolErrorCheck):
>-        (TParseContext::samplerErrorCheck):
>-        (TParseContext::structQualifierErrorCheck):
>-        (TParseContext::parameterSamplerErrorCheck):
>-        (TParseContext::arraySizeErrorCheck):
>-        (TParseContext::arrayQualifierErrorCheck):
>-        (TParseContext::arrayTypeErrorCheck):
>-        (TParseContext::arrayErrorCheck):
>-        (TParseContext::arraySetMaxSize):
>-        (TParseContext::nonInitConstErrorCheck):
>-        (TParseContext::nonInitErrorCheck):
>-        (TParseContext::paramErrorCheck):
>-        (TParseContext::extensionErrorCheck):
>-        (TParseContext::supportsExtension):
>-        (TParseContext::handleExtensionDirective):
>-        (TParseContext::handlePragmaDirective):
>-        (TParseContext::findFunction):
>-        (TParseContext::executeInitializer):
>-        (TParseContext::constructBuiltIn):
>-        (TParseContext::constructStruct):
>-        (TParseContext::addConstVectorNode):
>-        (TParseContext::addConstMatrixNode):
>-        (TParseContext::addConstArrayNode):
>-        (TParseContext::addConstStruct):
>-        (TParseContext::enterStructDeclaration):
>-        (TParseContext::structNestingErrorCheck):
>-        (PaParseStrings):
>-        * src/compiler/ParseHelper.h:
>-        (TParseContext::TParseContext):
>-        (TParseContext):
>-        (TParseContext::infoSink):
>-        (TParseContext::extensionBehavior):
>-        (TParseContext::pragma):
>-        * src/compiler/PoolAlloc.cpp:
>-        (TAllocation::checkGuardBlock):
>-        * src/compiler/Pragma.h: Added.
>-        (TPragma):
>-        (TPragma::TPragma):
>-        * src/compiler/RenameFunction.h: Added.
>-        (RenameFunction):
>-        (RenameFunction::RenameFunction):
>-        (RenameFunction::visitAggregate):
>-        * src/compiler/ShHandle.h:
>-        (TCompiler):
>-        * src/compiler/ShaderLang.cpp:
>-        (getVariableInfo):
>-        * src/compiler/SymbolTable.cpp:
>-        (TType::buildMangledName):
>-        * src/compiler/TranslatorHLSL.cpp:
>-        * src/compiler/UnfoldSelect.cpp: Removed.
>-        * src/compiler/UnfoldSelect.h: Removed.
>-        * src/compiler/UnfoldShortCircuit.cpp: Added.
>-        (sh::UnfoldShortCircuit::UnfoldShortCircuit):
>-        (sh):
>-        (sh::UnfoldShortCircuit::traverse):
>-        (sh::UnfoldShortCircuit::visitBinary):
>-        (sh::UnfoldShortCircuit::visitSelection):
>-        (sh::UnfoldShortCircuit::visitLoop):
>-        (sh::UnfoldShortCircuit::getNextTemporaryIndex):
>-        * src/compiler/UnfoldShortCircuit.h: Added.
>-        (sh):
>-        (UnfoldShortCircuit):
>-        * src/compiler/ValidateLimitations.cpp:
>-        * src/compiler/debug.cpp:
>-        * src/compiler/depgraph: Added.
>-        * src/compiler/depgraph/DependencyGraph.cpp: Added.
>-        (TDependencyGraph::TDependencyGraph):
>-        (TDependencyGraph::~TDependencyGraph):
>-        (TDependencyGraph::createArgument):
>-        (TDependencyGraph::createFunctionCall):
>-        (TDependencyGraph::getOrCreateSymbol):
>-        (TDependencyGraph::createSelection):
>-        (TDependencyGraph::createLoop):
>-        (TDependencyGraph::createLogicalOp):
>-        (TGraphLogicalOp::getOpString):
>-        * src/compiler/depgraph/DependencyGraph.h: Added.
>-        (TGraphNode):
>-        (TGraphNode::TGraphNode):
>-        (TGraphNode::~TGraphNode):
>-        (TGraphParentNode):
>-        (TGraphParentNode::TGraphParentNode):
>-        (TGraphParentNode::~TGraphParentNode):
>-        (TGraphParentNode::addDependentNode):
>-        (TGraphArgument):
>-        (TGraphArgument::TGraphArgument):
>-        (TGraphArgument::~TGraphArgument):
>-        (TGraphArgument::getIntermFunctionCall):
>-        (TGraphArgument::getArgumentNumber):
>-        (TGraphFunctionCall):
>-        (TGraphFunctionCall::TGraphFunctionCall):
>-        (TGraphFunctionCall::~TGraphFunctionCall):
>-        (TGraphFunctionCall::getIntermFunctionCall):
>-        (TGraphSymbol):
>-        (TGraphSymbol::TGraphSymbol):
>-        (TGraphSymbol::~TGraphSymbol):
>-        (TGraphSymbol::getIntermSymbol):
>-        (TGraphSelection):
>-        (TGraphSelection::TGraphSelection):
>-        (TGraphSelection::~TGraphSelection):
>-        (TGraphSelection::getIntermSelection):
>-        (TGraphLoop):
>-        (TGraphLoop::TGraphLoop):
>-        (TGraphLoop::~TGraphLoop):
>-        (TGraphLoop::getIntermLoop):
>-        (TGraphLogicalOp):
>-        (TGraphLogicalOp::TGraphLogicalOp):
>-        (TGraphLogicalOp::~TGraphLogicalOp):
>-        (TGraphLogicalOp::getIntermLogicalOp):
>-        (TDependencyGraph):
>-        (TDependencyGraph::begin):
>-        (TDependencyGraph::end):
>-        (TDependencyGraph::beginSamplerSymbols):
>-        (TDependencyGraph::endSamplerSymbols):
>-        (TDependencyGraph::beginUserDefinedFunctionCalls):
>-        (TDependencyGraph::endUserDefinedFunctionCalls):
>-        (TDependencyGraphTraverser):
>-        (TDependencyGraphTraverser::TDependencyGraphTraverser):
>-        (TDependencyGraphTraverser::visitSymbol):
>-        (TDependencyGraphTraverser::visitArgument):
>-        (TDependencyGraphTraverser::visitFunctionCall):
>-        (TDependencyGraphTraverser::visitSelection):
>-        (TDependencyGraphTraverser::visitLoop):
>-        (TDependencyGraphTraverser::visitLogicalOp):
>-        (TDependencyGraphTraverser::getDepth):
>-        (TDependencyGraphTraverser::incrementDepth):
>-        (TDependencyGraphTraverser::decrementDepth):
>-        (TDependencyGraphTraverser::clearVisited):
>-        (TDependencyGraphTraverser::markVisited):
>-        (TDependencyGraphTraverser::isVisited):
>-        * src/compiler/depgraph/DependencyGraphBuilder.cpp: Added.
>-        (TDependencyGraphBuilder::build):
>-        (TDependencyGraphBuilder::visitAggregate):
>-        (TDependencyGraphBuilder::visitFunctionDefinition):
>-        (TDependencyGraphBuilder::visitFunctionCall):
>-        (TDependencyGraphBuilder::visitAggregateChildren):
>-        (TDependencyGraphBuilder::visitSymbol):
>-        (TDependencyGraphBuilder::visitBinary):
>-        (TDependencyGraphBuilder::visitAssignment):
>-        (TDependencyGraphBuilder::visitLogicalOp):
>-        (TDependencyGraphBuilder::visitBinaryChildren):
>-        (TDependencyGraphBuilder::visitSelection):
>-        (TDependencyGraphBuilder::visitLoop):
>-        (TDependencyGraphBuilder::connectMultipleNodesToSingleNode):
>-        * src/compiler/depgraph/DependencyGraphBuilder.h: Added.
>-        (TDependencyGraphBuilder):
>-        (TNodeSetStack):
>-        (TDependencyGraphBuilder::TNodeSetStack::TNodeSetStack):
>-        (TDependencyGraphBuilder::TNodeSetStack::~TNodeSetStack):
>-        (TDependencyGraphBuilder::TNodeSetStack::getTopSet):
>-        (TDependencyGraphBuilder::TNodeSetStack::pushSet):
>-        (TDependencyGraphBuilder::TNodeSetStack::popSet):
>-        (TDependencyGraphBuilder::TNodeSetStack::popSetIntoNext):
>-        (TDependencyGraphBuilder::TNodeSetStack::insertIntoTopSet):
>-        (TDependencyGraphBuilder::TNodeSetStack::clear):
>-        (TNodeSetMaintainer):
>-        (TDependencyGraphBuilder::TNodeSetMaintainer::TNodeSetMaintainer):
>-        (TDependencyGraphBuilder::TNodeSetMaintainer::~TNodeSetMaintainer):
>-        (TNodeSetPropagatingMaintainer):
>-        (TDependencyGraphBuilder::TNodeSetPropagatingMaintainer::TNodeSetPropagatingMaintainer):
>-        (TDependencyGraphBuilder::TNodeSetPropagatingMaintainer::~TNodeSetPropagatingMaintainer):
>-        (TLeftmostSymbolMaintainer):
>-        (TDependencyGraphBuilder::TLeftmostSymbolMaintainer::TLeftmostSymbolMaintainer):
>-        (TDependencyGraphBuilder::TLeftmostSymbolMaintainer::~TLeftmostSymbolMaintainer):
>-        (TDependencyGraphBuilder::TDependencyGraphBuilder):
>-        (TDependencyGraphBuilder::build):
>-        * src/compiler/depgraph/DependencyGraphOutput.cpp: Added.
>-        (TDependencyGraphOutput::outputIndentation):
>-        (TDependencyGraphOutput::visitArgument):
>-        (TDependencyGraphOutput::visitFunctionCall):
>-        (TDependencyGraphOutput::visitSymbol):
>-        (TDependencyGraphOutput::visitSelection):
>-        (TDependencyGraphOutput::visitLoop):
>-        (TDependencyGraphOutput::visitLogicalOp):
>-        (TDependencyGraphOutput::outputAllSpanningTrees):
>-        * src/compiler/depgraph/DependencyGraphOutput.h: Added.
>-        (TDependencyGraphOutput):
>-        (TDependencyGraphOutput::TDependencyGraphOutput):
>-        * src/compiler/depgraph/DependencyGraphTraverse.cpp: Added.
>-        (TGraphNode::traverse):
>-        (TGraphParentNode::traverse):
>-        (TGraphArgument::traverse):
>-        (TGraphFunctionCall::traverse):
>-        (TGraphSymbol::traverse):
>-        (TGraphSelection::traverse):
>-        (TGraphLoop::traverse):
>-        (TGraphLogicalOp::traverse):
>-        * src/compiler/glslang.h:
>-        * src/compiler/glslang.l:
>-        * src/compiler/glslang.y:
>-        * src/compiler/glslang_lex.cpp:
>-        (yy_buffer_state):
>-        (yyguts_t):
>-        (yy_get_previous_state):
>-        (yy_try_NUL_trans):
>-        (input):
>-        (yyensure_buffer_stack):
>-        (yy_scan_bytes):
>-        (yyget_leng):
>-        (string_input):
>-        (yyerror):
>-        (glslang_finalize):
>-        (glslang_scan):
>-        * src/compiler/glslang_tab.cpp:
>-        * src/compiler/intermediate.h:
>-        (TIntermAggregate::TIntermAggregate):
>-        (TIntermAggregate::~TIntermAggregate):
>-        (TIntermAggregate::isUserDefined):
>-        (TIntermAggregate):
>-        (TIntermTraverser::~TIntermTraverser):
>-        * src/compiler/osinclude.h:
>-        * src/compiler/preprocessor/atom.c:
>-        (FindHashLoc):
>-        (PrintAtomTable):
>-        * src/compiler/preprocessor/cpp.c:
>-        (CPPpragma):
>-        (readCPPline):
>-        (PredefineIntMacro):
>-        (MacroExpand):
>-        * src/compiler/preprocessor/cpp.h:
>-        * src/compiler/preprocessor/memory.h:
>-        * src/compiler/preprocessor/new: Added properties allow-tabs, allow-tabs, allow-tabs, allow-tabs, allow-tabs, allow-tabs, allow-tabs, allow-tabs, allow-tabs, allow-tabs, allow-tabs, allow-tabs, allow-tabs, allow-tabs, allow-tabs, allow-tabs, allow-tabs, allow-tabs, allow-tabs, allow-tabs, allow-tabs, allow-tabs, allow-tabs, allow-tabs, allow-tabs, allow-tabs, allow-tabs, allow-tabs and allow-tabs.
>-        * src/compiler/preprocessor/new/Context.cpp: Removed.
>-        * src/compiler/preprocessor/new/Context.h: Removed.
>-        * src/compiler/preprocessor/new/Diagnostics.h: Added.
>-        (pp):
>-        (Diagnostics):
>-        * src/compiler/preprocessor/new/DiagnosticsBase.cpp: Added.
>-        (pp):
>-        (pp::Diagnostics::~Diagnostics):
>-        (pp::Diagnostics::report):
>-        (pp::Diagnostics::severity):
>-        * src/compiler/preprocessor/new/DirectiveHandler.h: Added.
>-        (pp):
>-        (DirectiveHandler):
>-        * src/compiler/preprocessor/new/DirectiveHandlerBase.cpp: Added.
>-        (pp):
>-        (pp::DirectiveHandler::~DirectiveHandler):
>-        * src/compiler/preprocessor/new/DirectiveParser.cpp: Added.
>-        (getDirective):
>-        (isConditionalDirective):
>-        (isEOD):
>-        (skipUntilEOD):
>-        (isMacroNameReserved):
>-        (isMacroPredefined):
>-        (pp):
>-        (DefinedParser):
>-        (pp::DefinedParser::DefinedParser):
>-        (pp::DefinedParser::lex):
>-        (pp::DirectiveParser::DirectiveParser):
>-        (pp::DirectiveParser::lex):
>-        (pp::DirectiveParser::parseDirective):
>-        (pp::DirectiveParser::parseDefine):
>-        (pp::DirectiveParser::parseUndef):
>-        (pp::DirectiveParser::parseIf):
>-        (pp::DirectiveParser::parseIfdef):
>-        (pp::DirectiveParser::parseIfndef):
>-        (pp::DirectiveParser::parseElse):
>-        (pp::DirectiveParser::parseElif):
>-        (pp::DirectiveParser::parseEndif):
>-        (pp::DirectiveParser::parseError):
>-        (pp::DirectiveParser::parsePragma):
>-        (pp::DirectiveParser::parseExtension):
>-        (pp::DirectiveParser::parseVersion):
>-        (pp::DirectiveParser::parseLine):
>-        (pp::DirectiveParser::skipping):
>-        (pp::DirectiveParser::parseConditionalIf):
>-        (pp::DirectiveParser::parseExpressionIf):
>-        (pp::DirectiveParser::parseExpressionIfdef):
>-        * src/compiler/preprocessor/new/DirectiveParser.h: Added.
>-        (pp):
>-        (DirectiveParser):
>-        (ConditionalBlock):
>-        (pp::DirectiveParser::ConditionalBlock::ConditionalBlock):
>-        * src/compiler/preprocessor/new/ExpressionParser.cpp: Added.
>-        (yysyntax_error):
>-        (yylex):
>-        (yyerror):
>-        (pp):
>-        (pp::ExpressionParser::ExpressionParser):
>-        (pp::ExpressionParser::parse):
>-        * src/compiler/preprocessor/new/ExpressionParser.h: Added.
>-        (pp):
>-        (ExpressionParser):
>-        * src/compiler/preprocessor/new/ExpressionParser.y: Added.
>-        * src/compiler/preprocessor/new/Input.cpp: Added property allow-tabs.
>-        (pp::Input::Input):
>-        (pp::Input::read):
>-        * src/compiler/preprocessor/new/Input.h: Added property allow-tabs.
>-        (pp):
>-        (Input):
>-        (pp::Input::count):
>-        (pp::Input::string):
>-        (pp::Input::length):
>-        (Location):
>-        (pp::Input::Location::Location):
>-        (pp::Input::readLoc):
>-        * src/compiler/preprocessor/new/Lexer.cpp: Added.
>-        (pp):
>-        (pp::Lexer::~Lexer):
>-        * src/compiler/preprocessor/new/Lexer.h: Added.
>-        (pp):
>-        (Lexer):
>-        * src/compiler/preprocessor/new/Macro.cpp: Added property allow-tabs.
>-        (pp::Macro::equals):
>-        * src/compiler/preprocessor/new/Macro.h: Added property allow-tabs.
>-        (pp):
>-        (pp::Macro::Macro):
>-        (Macro):
>-        * src/compiler/preprocessor/new/MacroExpander.cpp: Added.
>-        (pp):
>-        (TokenLexer):
>-        (pp::TokenLexer::TokenLexer):
>-        (pp::TokenLexer::lex):
>-        (pp::MacroExpander::MacroExpander):
>-        (pp::MacroExpander::~MacroExpander):
>-        (pp::MacroExpander::lex):
>-        (pp::MacroExpander::getToken):
>-        (pp::MacroExpander::ungetToken):
>-        (pp::MacroExpander::isNextTokenLeftParen):
>-        (pp::MacroExpander::pushMacro):
>-        (pp::MacroExpander::popMacro):
>-        (pp::MacroExpander::expandMacro):
>-        (pp::MacroExpander::collectMacroArgs):
>-        (pp::MacroExpander::replaceMacroParams):
>-        * src/compiler/preprocessor/new/MacroExpander.h: Added.
>-        (pp):
>-        (MacroExpander):
>-        (MacroContext):
>-        (pp::MacroExpander::MacroContext::MacroContext):
>-        (pp::MacroExpander::MacroContext::empty):
>-        (pp::MacroExpander::MacroContext::get):
>-        (pp::MacroExpander::MacroContext::unget):
>-        * src/compiler/preprocessor/new/Preprocessor.cpp: Added property allow-tabs.
>-        (PreprocessorImpl):
>-        (pp::PreprocessorImpl::PreprocessorImpl):
>-        (pp):
>-        (pp::Preprocessor::Preprocessor):
>-        (pp::Preprocessor::~Preprocessor):
>-        (pp::Preprocessor::init):
>-        (pp::Preprocessor::predefineMacro):
>-        (pp::Preprocessor::lex):
>-        * src/compiler/preprocessor/new/Preprocessor.h: Added property allow-tabs.
>-        (pp):
>-        (Preprocessor):
>-        * src/compiler/preprocessor/new/SourceLocation.h: Added.
>-        (pp):
>-        (pp::SourceLocation::SourceLocation):
>-        (SourceLocation):
>-        (pp::SourceLocation::equals):
>-        (pp::operator==):
>-        (pp::operator!=):
>-        * src/compiler/preprocessor/new/Token.cpp: Added property allow-tabs.
>-        (pp::Token::reset):
>-        (pp::Token::equals):
>-        (pp::Token::setAtStartOfLine):
>-        (pp::Token::setHasLeadingSpace):
>-        (pp):
>-        (pp::Token::setExpansionDisabled):
>-        (pp::operator<<):
>-        * src/compiler/preprocessor/new/Token.h: Added property allow-tabs.
>-        (pp::Token::Token):
>-        (Token):
>-        (pp::Token::atStartOfLine):
>-        (pp::Token::hasLeadingSpace):
>-        (pp::Token::expansionDisabled):
>-        (pp::operator==):
>-        (pp):
>-        (pp::operator!=):
>-        * src/compiler/preprocessor/new/Tokenizer.cpp: Added.
>-        (yy_buffer_state):
>-        (yy_trans_info):
>-        (yyguts_t):
>-        (yy_get_previous_state):
>-        (yy_try_NUL_trans):
>-        (input):
>-        (pprestart):
>-        (pp_switch_to_buffer):
>-        (pp_load_buffer_state):
>-        (pp_create_buffer):
>-        (pp_delete_buffer):
>-        (pp_init_buffer):
>-        (pp_flush_buffer):
>-        (pppush_buffer_state):
>-        (pppop_buffer_state):
>-        (ppensure_buffer_stack):
>-        (pp_scan_buffer):
>-        (pp_scan_string):
>-        (pp_scan_bytes):
>-        (yy_fatal_error):
>-        (ppget_extra):
>-        (ppget_lineno):
>-        (ppget_column):
>-        (ppget_in):
>-        (ppget_out):
>-        (ppget_leng):
>-        (ppget_text):
>-        (ppset_extra):
>-        (ppset_lineno):
>-        (ppset_column):
>-        (ppset_in):
>-        (ppset_out):
>-        (ppget_debug):
>-        (ppset_debug):
>-        (ppget_lval):
>-        (ppset_lval):
>-        (ppget_lloc):
>-        (ppset_lloc):
>-        (pplex_init):
>-        (pplex_init_extra):
>-        (yy_init_globals):
>-        (pplex_destroy):
>-        (yy_flex_strncpy):
>-        (yy_flex_strlen):
>-        (ppalloc):
>-        (pprealloc):
>-        (ppfree):
>-        (pp):
>-        (pp::Tokenizer::Tokenizer):
>-        (pp::Tokenizer::~Tokenizer):
>-        (pp::Tokenizer::init):
>-        (pp::Tokenizer::setFileNumber):
>-        (pp::Tokenizer::setLineNumber):
>-        (pp::Tokenizer::lex):
>-        (pp::Tokenizer::initScanner):
>-        (pp::Tokenizer::destroyScanner):
>-        * src/compiler/preprocessor/new/Tokenizer.h: Added.
>-        (pp):
>-        (Tokenizer):
>-        (Context):
>-        * src/compiler/preprocessor/new/Tokenizer.l: Added.
>-        * src/compiler/preprocessor/new/generate_parser.sh: Added property allow-tabs.
>-        * src/compiler/preprocessor/new/pp.l: Removed.
>-        * src/compiler/preprocessor/new/pp.y: Removed.
>-        * src/compiler/preprocessor/new/pp_lex.cpp: Removed.
>-        * src/compiler/preprocessor/new/pp_tab.cpp: Removed.
>-        * src/compiler/preprocessor/new/pp_tab.h: Removed.
>-        * src/compiler/preprocessor/new/pp_utils.h: Added.
>-        * src/compiler/preprocessor/new/preprocessor.vcproj: Added.
>-        * src/compiler/preprocessor/new/stl_utils.h: Removed.
>-        * src/compiler/preprocessor/new/token_type.h: Removed.
>-        * src/compiler/preprocessor/preprocess.h:
>-        * src/compiler/preprocessor/scanner.c:
>-        (InitScannerInput):
>-        * src/compiler/preprocessor/scanner.h:
>-        * src/compiler/preprocessor/symbols.h:
>-        * src/compiler/preprocessor/tokens.c:
>-        (ReadToken):
>-        (DumpTokenStream):
>-        * src/compiler/preprocessor/tokens.h:
>-        * src/compiler/timing: Added.
>-        * src/compiler/timing/RestrictFragmentShaderTiming.cpp: Added.
>-        (RestrictFragmentShaderTiming::RestrictFragmentShaderTiming):
>-        (RestrictFragmentShaderTiming::enforceRestrictions):
>-        (RestrictFragmentShaderTiming::validateUserDefinedFunctionCallUsage):
>-        (RestrictFragmentShaderTiming::beginError):
>-        (RestrictFragmentShaderTiming::isSamplingOp):
>-        (RestrictFragmentShaderTiming::visitArgument):
>-        (RestrictFragmentShaderTiming::visitSelection):
>-        (RestrictFragmentShaderTiming::visitLoop):
>-        (RestrictFragmentShaderTiming::visitLogicalOp):
>-        * src/compiler/timing/RestrictFragmentShaderTiming.h: Added.
>-        (RestrictFragmentShaderTiming):
>-        (RestrictFragmentShaderTiming::numErrors):
>-        * src/compiler/timing/RestrictVertexShaderTiming.cpp: Added.
>-        (RestrictVertexShaderTiming::visitSymbol):
>-        * src/compiler/timing/RestrictVertexShaderTiming.h: Added.
>-        (RestrictVertexShaderTiming):
>-        (RestrictVertexShaderTiming::RestrictVertexShaderTiming):
>-        (RestrictVertexShaderTiming::enforceRestrictions):
>-        (RestrictVertexShaderTiming::numErrors):
>-        * src/libEGL/Display.cpp:
>-        (egl):
>-        (egl::Display::getDepthTextureSupport):
>-        (egl::Display::getTexturePool):
>-        * src/libEGL/Display.h:
>-        (Display):
>-        * src/libEGL/Surface.cpp:
>-        (egl::Surface::Surface):
>-        (egl::Surface::release):
>-        (egl::Surface::resetSwapChain):
>-        (egl::Surface::swapRect):
>-        (egl):
>-        (egl::Surface::swap):
>-        (egl::Surface::postSubBuffer):
>-        * src/libEGL/Surface.h:
>-        (Surface):
>-        * src/libEGL/libEGL.cpp:
>-        * src/libGLESv2/Context.cpp:
>-        (gl::Context::makeCurrent):
>-        (gl::Context::markDxUniformsDirty):
>-        (gl):
>-        (gl::Context::getIntegerv):
>-        (gl::Context::getQueryParameterInfo):
>-        (gl::Context::applyRenderTarget):
>-        (gl::Context::applyState):
>-        (gl::Context::applyShaders):
>-        (gl::Context::applyTextures):
>-        (gl::Context::readPixels):
>-        (gl::Context::clear):
>-        (gl::Context::drawArrays):
>-        (gl::Context::drawElements):
>-        (gl::Context::supportsDepthTextures):
>-        (gl::Context::initExtensionString):
>-        (gl::Context::blitFramebuffer):
>-        (gl::VertexDeclarationCache::applyDeclaration):
>-        * src/libGLESv2/Context.h:
>-        (Context):
>-        * src/libGLESv2/Framebuffer.cpp:
>-        (gl::Framebuffer::~Framebuffer):
>-        (gl):
>-        (gl::Framebuffer::getNullColorbuffer):
>-        (gl::Framebuffer::completeness):
>-        * src/libGLESv2/Framebuffer.h:
>-        (Framebuffer):
>-        * src/libGLESv2/Program.cpp:
>-        (gl):
>-        (gl::AttributeBindings::AttributeBindings):
>-        (gl::AttributeBindings::~AttributeBindings):
>-        (gl::InfoLog::InfoLog):
>-        (gl::InfoLog::~InfoLog):
>-        (gl::InfoLog::getLength):
>-        (gl::InfoLog::getLog):
>-        (gl::InfoLog::appendSanitized):
>-        (gl::InfoLog::append):
>-        (gl::InfoLog::reset):
>-        (gl::Program::Program):
>-        (gl::Program::~Program):
>-        (gl::Program::attachShader):
>-        (gl::Program::detachShader):
>-        (gl::Program::getAttachedShadersCount):
>-        (gl::AttributeBindings::bindAttributeLocation):
>-        (gl::Program::bindAttributeLocation):
>-        (gl::Program::link):
>-        (gl::AttributeBindings::getAttributeBinding):
>-        (gl::Program::unlink):
>-        (gl::Program::getProgramBinary):
>-        (gl::Program::setProgramBinary):
>-        (gl::Program::getInfoLogLength):
>-        (gl::Program::getInfoLog):
>-        (gl::Program::getActiveAttribute):
>-        (gl::Program::getActiveAttributeCount):
>-        (gl::Program::getActiveAttributeMaxLength):
>-        (gl::Program::getActiveUniform):
>-        (gl::Program::getActiveUniformCount):
>-        (gl::Program::getActiveUniformMaxLength):
>-        (gl::Program::validate):
>-        (gl::Program::isValidated):
>-        * src/libGLESv2/Program.h:
>-        (gl):
>-        (AttributeBindings):
>-        (InfoLog):
>-        (Program):
>-        * src/libGLESv2/ProgramBinary.cpp: Added.
>-        (gl::str):
>-        (gl):
>-        (gl::Uniform::Uniform):
>-        (gl::Uniform::~Uniform):
>-        (gl::Uniform::isArray):
>-        (gl::UniformLocation::UniformLocation):
>-        (gl::ProgramBinary::ProgramBinary):
>-        (gl::ProgramBinary::~ProgramBinary):
>-        (gl::ProgramBinary::getPixelShader):
>-        (gl::ProgramBinary::getVertexShader):
>-        (gl::ProgramBinary::getAttributeLocation):
>-        (gl::ProgramBinary::getSemanticIndex):
>-        (gl::ProgramBinary::getUsedSamplerRange):
>-        (gl::ProgramBinary::getSamplerMapping):
>-        (gl::ProgramBinary::getSamplerTextureType):
>-        (gl::ProgramBinary::getUniformLocation):
>-        (gl::ProgramBinary::setUniform1fv):
>-        (gl::ProgramBinary::setUniform2fv):
>-        (gl::ProgramBinary::setUniform3fv):
>-        (gl::ProgramBinary::setUniform4fv):
>-        (gl::transposeMatrix):
>-        (gl::ProgramBinary::setUniformMatrix2fv):
>-        (gl::ProgramBinary::setUniformMatrix3fv):
>-        (gl::ProgramBinary::setUniformMatrix4fv):
>-        (gl::ProgramBinary::setUniform1iv):
>-        (gl::ProgramBinary::setUniform2iv):
>-        (gl::ProgramBinary::setUniform3iv):
>-        (gl::ProgramBinary::setUniform4iv):
>-        (gl::ProgramBinary::getUniformfv):
>-        (gl::ProgramBinary::getUniformiv):
>-        (gl::ProgramBinary::dirtyAllUniforms):
>-        (gl::ProgramBinary::applyUniforms):
>-        (gl::ProgramBinary::compileToBinary):
>-        (gl::ProgramBinary::packVaryings):
>-        (gl::ProgramBinary::linkVaryings):
>-        (gl::ProgramBinary::link):
>-        (gl::ProgramBinary::linkAttributes):
>-        (gl::ProgramBinary::linkUniforms):
>-        (gl::ProgramBinary::defineUniform):
>-        (gl::ProgramBinary::createUniform):
>-        (gl::ProgramBinary::decorateAttribute):
>-        (gl::ProgramBinary::undecorateUniform):
>-        (gl::ProgramBinary::applyUniformnbv):
>-        (gl::ProgramBinary::applyUniformnfv):
>-        (gl::ProgramBinary::applyUniform1iv):
>-        (gl::ProgramBinary::applyUniform2iv):
>-        (gl::ProgramBinary::applyUniform3iv):
>-        (gl::ProgramBinary::applyUniform4iv):
>-        (gl::ProgramBinary::applyUniformniv):
>-        (gl::ProgramBinary::isValidated):
>-        (gl::ProgramBinary::getActiveAttribute):
>-        (gl::ProgramBinary::getActiveAttributeCount):
>-        (gl::ProgramBinary::getActiveAttributeMaxLength):
>-        (gl::ProgramBinary::getActiveUniform):
>-        (gl::ProgramBinary::getActiveUniformCount):
>-        (gl::ProgramBinary::getActiveUniformMaxLength):
>-        (gl::ProgramBinary::validate):
>-        (gl::ProgramBinary::validateSamplers):
>-        (gl::ProgramBinary::getDxDepthRangeLocation):
>-        (gl::ProgramBinary::getDxDepthLocation):
>-        (gl::ProgramBinary::getDxCoordLocation):
>-        (gl::ProgramBinary::getDxHalfPixelSizeLocation):
>-        (gl::ProgramBinary::getDxFrontCCWLocation):
>-        (gl::ProgramBinary::getDxPointsOrLinesLocation):
>-        * src/libGLESv2/ProgramBinary.h: Added.
>-        (gl):
>-        (Uniform):
>-        (gl::Uniform::RegisterInfo::RegisterInfo):
>-        (RegisterInfo):
>-        (gl::Uniform::RegisterInfo::set):
>-        (UniformLocation):
>-        (ProgramBinary):
>-        (Sampler):
>-        * src/libGLESv2/Renderbuffer.cpp:
>-        (gl):
>-        (gl::RenderbufferTexture2D::RenderbufferTexture2D):
>-        (gl::RenderbufferTexture2D::~RenderbufferTexture2D):
>-        (gl::RenderbufferTexture2D::addProxyRef):
>-        (gl::RenderbufferTexture2D::releaseProxy):
>-        (gl::RenderbufferTexture2D::getRenderTarget):
>-        (gl::RenderbufferTexture2D::getDepthStencil):
>-        (gl::RenderbufferTexture2D::getWidth):
>-        (gl::RenderbufferTexture2D::getHeight):
>-        (gl::RenderbufferTexture2D::getInternalFormat):
>-        (gl::RenderbufferTexture2D::getD3DFormat):
>-        (gl::RenderbufferTexture2D::getSamples):
>-        (gl::RenderbufferTexture2D::getSerial):
>-        (gl::RenderbufferTextureCubeMap::RenderbufferTextureCubeMap):
>-        (gl::RenderbufferTextureCubeMap::~RenderbufferTextureCubeMap):
>-        (gl::RenderbufferTextureCubeMap::addProxyRef):
>-        (gl::RenderbufferTextureCubeMap::releaseProxy):
>-        (gl::RenderbufferTextureCubeMap::getRenderTarget):
>-        (gl::RenderbufferTextureCubeMap::getDepthStencil):
>-        (gl::RenderbufferTextureCubeMap::getWidth):
>-        (gl::RenderbufferTextureCubeMap::getHeight):
>-        (gl::RenderbufferTextureCubeMap::getInternalFormat):
>-        (gl::RenderbufferTextureCubeMap::getD3DFormat):
>-        (gl::RenderbufferTextureCubeMap::getSamples):
>-        (gl::RenderbufferTextureCubeMap::getSerial):
>-        (gl::DepthStencilbuffer::getDepthStencil):
>-        * src/libGLESv2/Renderbuffer.h:
>-        (gl):
>-        (RenderbufferTexture2D):
>-        (RenderbufferTextureCubeMap):
>-        * src/libGLESv2/Shader.cpp:
>-        (gl::Shader::getInfoLog):
>-        (gl::Shader::getSourceImpl):
>-        * src/libGLESv2/Shader.h:
>-        (Shader):
>-        (VertexShader):
>-        * src/libGLESv2/Texture.cpp:
>-        (gl::ConvertTextureFormatType):
>-        (gl::IsTextureFormatRenderable):
>-        (gl::GetTextureUsage):
>-        (gl):
>-        (gl::Image::createSurface):
>-        (gl::Image::updateSurface):
>-        (gl::Image::loadData):
>-        (gl::Image::loadAlphaData):
>-        (gl::Image::loadAlphaDataSSE2):
>-        (gl::Image::loadAlphaFloatData):
>-        (gl::Image::loadAlphaHalfFloatData):
>-        (gl::Image::loadLuminanceData):
>-        (gl::Image::loadLuminanceFloatData):
>-        (gl::Image::loadLuminanceHalfFloatData):
>-        (gl::Image::loadLuminanceAlphaData):
>-        (gl::Image::loadLuminanceAlphaFloatData):
>-        (gl::Image::loadLuminanceAlphaHalfFloatData):
>-        (gl::Image::loadRGBUByteData):
>-        (gl::Image::loadRGB565Data):
>-        (gl::Image::loadRGBFloatData):
>-        (gl::Image::loadRGBHalfFloatData):
>-        (gl::Image::loadRGBAUByteDataSSE2):
>-        (gl::Image::loadRGBAUByteData):
>-        (gl::Image::loadRGBA4444Data):
>-        (gl::Image::loadRGBA5551Data):
>-        (gl::Image::loadRGBAFloatData):
>-        (gl::Image::loadRGBAHalfFloatData):
>-        (gl::Image::loadBGRAData):
>-        (gl::Image::loadCompressedData):
>-        (gl::Image::copy):
>-        (gl::TextureStorage::TextureStorage):
>-        (gl::TextureStorage::isRenderTarget):
>-        (gl::TextureStorage::getUsage):
>-        (gl::Texture::setImage):
>-        (gl::Texture::setCompressedImage):
>-        (gl::Texture::subImage):
>-        (gl::Texture::subImageCompressed):
>-        (gl::TextureStorage2D::TextureStorage2D):
>-        (gl::Texture2D::getInternalFormat):
>-        (gl::Texture2D::getD3DFormat):
>-        (gl::Texture2D::copyImage):
>-        (gl::Texture2D::copySubImage):
>-        (gl::Texture2D::storage):
>-        (gl::Texture2D::isSamplerComplete):
>-        (gl::Texture2D::isCompressed):
>-        (gl::Texture2D::isDepth):
>-        (gl::Texture2D::createTexture):
>-        (gl::Texture2D::convertToRenderTarget):
>-        (gl::Texture2D::getRenderbuffer):
>-        (gl::Texture2D::getRenderTarget):
>-        (gl::Texture2D::getDepthStencil):
>-        (gl::TextureStorageCubeMap::TextureStorageCubeMap):
>-        (gl::TextureCubeMap::getWidth):
>-        (gl::TextureCubeMap::getHeight):
>-        (gl::TextureCubeMap::getInternalFormat):
>-        (gl::TextureCubeMap::getD3DFormat):
>-        (gl::TextureCubeMap::isSamplerComplete):
>-        (gl::TextureCubeMap::isCompressed):
>-        (gl::TextureCubeMap::createTexture):
>-        (gl::TextureCubeMap::convertToRenderTarget):
>-        (gl::TextureCubeMap::copyImage):
>-        (gl::TextureCubeMap::copySubImage):
>-        (gl::TextureCubeMap::storage):
>-        (gl::TextureCubeMap::getRenderbuffer):
>-        * src/libGLESv2/Texture.h:
>-        (Image):
>-        (TextureStorage):
>-        (Texture):
>-        (TextureStorage2D):
>-        (Texture2D):
>-        (TextureStorageCubeMap):
>-        (TextureCubeMap):
>-        * src/libGLESv2/VertexDataManager.cpp:
>-        (gl::VertexDataManager::prepareVertexData):
>-        * src/libGLESv2/libGLESv2.cpp:
>-        (checkTextureFormatType):
>-        (validateSubImageParams2D):
>-        (validateSubImageParamsCube):
>-        * src/libGLESv2/libGLESv2.vcproj:
>-        * src/libGLESv2/mathutil.h:
>-        (gl):
>-        * src/libGLESv2/utilities.cpp:
>-        (gl::IsDepthTexture):
>-        (gl):
>-        (gl::ComputePixelSize):
>-        (gl::ExtractFormat):
>-        (gl::ExtractType):
>-        (es2dx::ConvertCubeFace):
>-        (es2dx::ConvertRenderbufferFormat):
>-        (dx2es::GetStencilSize):
>-        (dx2es::GetDepthSize):
>-        (dx2es::IsDepthTextureFormat):
>-        (dx2es):
>-        (dx2es::IsStencilTextureFormat):
>-        (dx2es::ConvertDepthStencilFormat):
>-        * src/libGLESv2/utilities.h:
>-        (gl):
>-        (dx2es):
>-
>-2012-07-11  Mark Rowe  <mrowe@apple.com>
>-
>-        <http://webkit.org/b/91024> Build against the latest SDK when targeting older OS X versions.
>-
>-        Reviewed by Dan Bernstein.
>-
>-        The deployment target is already set to the version that we're targeting, and it's that setting
>-        which determines which functionality from the SDK is available to us.
>-
>-        * Configurations/Base.xcconfig:
>-
>-2012-06-22  Joshua Netterfield  <jnetterfield@rim.com>
>-
>-        [BlackBerry] Sanitize GLSL code using ANGLE.
>-
>-        BlackBerry port does not sanitize GLSL code with ANGLE
>-        https://bugs.webkit.org/show_bug.cgi?id=89583
>-
>-        Reviewed by Rob Buis.
>-
>-        * src/compiler/osinclude.h: Recognises QNX as POSIX
>-
>-2012-03-26  Dean Jackson  <dino@apple.com>
>-
>-        Update ANGLE in WebKit
>-        https://bugs.webkit.org/show_bug.cgi?id=81717
>-
>-        Reviewed by Kenneth Russell.
>-
>-        Update angleproject to r1009. Synced the source directory
>-        between the angle repository and WebKit. Ran the OS X Lion
>-        version of Bison over the glslang.l input which generates
>-        a slightly different output than angle provided.
>-
>-        * include/EGL/eglext.h:
>-        * include/GLES2/gl2ext.h:
>-        * include/GLSLANG/ShaderLang.h:
>-        * src/common/RefCountObject.cpp: Renamed from Source/ThirdParty/ANGLE/src/libGLESv2/RefCountObject.cpp.
>-        (RefCountObject::RefCountObject):
>-        (RefCountObject::~RefCountObject):
>-        (RefCountObject::addRef):
>-        (RefCountObject::release):
>-        (RefCountObjectBindingPointer::set):
>-        * src/common/RefCountObject.h: Renamed from Source/ThirdParty/ANGLE/src/libGLESv2/RefCountObject.h.
>-        (RefCountObject):
>-        (RefCountObject::id):
>-        (RefCountObjectBindingPointer):
>-        (RefCountObjectBindingPointer::RefCountObjectBindingPointer):
>-        (RefCountObjectBindingPointer::~RefCountObjectBindingPointer):
>-        (RefCountObjectBindingPointer::get):
>-        (RefCountObjectBindingPointer::id):
>-        (RefCountObjectBindingPointer::operator ! ):
>-        (BindingPointer):
>-        (BindingPointer::set):
>-        (BindingPointer::get):
>-        (BindingPointer::operator -> ):
>-        * src/common/debug.cpp:
>-        (gl::output):
>-        * src/common/version.h:
>-        * src/compiler/BaseTypes.h:
>-        * src/compiler/Compiler.cpp:
>-        (TCompiler::TCompiler):
>-        (TCompiler::~TCompiler):
>-        (TCompiler::mapLongVariableNames):
>-        * src/compiler/ConstantUnion.h:
>-        (ConstantUnion::ConstantUnion):
>-        (ConstantUnion::operator==):
>-        (ConstantUnion::operator>):
>-        (ConstantUnion::operator<):
>-        * src/compiler/Intermediate.cpp:
>-        (TIntermConstantUnion::fold):
>-        * src/compiler/MapLongVariableNames.cpp:
>-        (LongNameMap::LongNameMap):
>-        (LongNameMap::~LongNameMap):
>-        (LongNameMap::GetInstance):
>-        (LongNameMap::Release):
>-        (LongNameMap::Find):
>-        (LongNameMap::Insert):
>-        (LongNameMap::Size):
>-        (MapLongVariableNames::MapLongVariableNames):
>-        (MapLongVariableNames::visitSymbol):
>-        (MapLongVariableNames::mapGlobalLongName):
>-        * src/compiler/MapLongVariableNames.h:
>-        (LongNameMap):
>-        (MapLongVariableNames):
>-        * src/compiler/OutputHLSL.cpp:
>-        (sh::OutputHLSL::OutputHLSL):
>-        (sh::OutputHLSL::header):
>-        (sh::OutputHLSL::visitSymbol):
>-        (sh::OutputHLSL::visitUnary):
>-        (sh::OutputHLSL::visitAggregate):
>-        (sh::OutputHLSL::visitLoop):
>-        (sh::OutputHLSL::handleExcessiveLoop):
>-        (sh::OutputHLSL::typeString):
>-        (sh::OutputHLSL::addConstructor):
>-        (sh::OutputHLSL::decorateUniform):
>-        * src/compiler/OutputHLSL.h:
>-        (OutputHLSL):
>-        * src/compiler/PoolAlloc.cpp:
>-        (TAllocation::checkGuardBlock):
>-        * src/compiler/ShHandle.h:
>-        (TCompiler):
>-        * src/compiler/SymbolTable.cpp:
>-        * src/compiler/SymbolTable.h:
>-        (TSymbolTable):
>-        (TSymbolTable::getOuterLevel):
>-        * src/compiler/VariableInfo.cpp:
>-        (getVariableDataType):
>-        * src/compiler/glslang.l:
>-        * src/compiler/glslang.y:
>-        * src/compiler/glslang_lex.cpp:
>-        (yy_buffer_state):
>-        (yyguts_t):
>-        (input):
>-        (yyensure_buffer_stack):
>-        (yy_scan_bytes):
>-        (yyget_leng):
>-        * src/compiler/glslang_tab.cpp:
>-        * src/compiler/osinclude.h:
>-        * src/compiler/preprocessor/cpp.c:
>-        * src/compiler/preprocessor/memory.c:
>-        * src/compiler/preprocessor/new/Context.cpp: Added.
>-        (isMacroNameReserved):
>-        (pp):
>-        (pp::Context::Context):
>-        (pp::Context::~Context):
>-        (pp::Context::init):
>-        (pp::Context::process):
>-        (pp::Context::defineMacro):
>-        (pp::Context::undefineMacro):
>-        (pp::Context::isMacroDefined):
>-        (pp::Context::reset):
>-        (pp::Context::defineBuiltInMacro):
>-        * src/compiler/preprocessor/new/Context.h: Added.
>-        (pp):
>-        (Context):
>-        (pp::Context::lexer):
>-        (pp::Context::output):
>-        * src/compiler/preprocessor/new/Input.cpp: Added.
>-        (pp):
>-        (pp::Input::Input):
>-        (pp::Input::eof):
>-        (pp::Input::read):
>-        (pp::Input::getChar):
>-        (pp::Input::peekChar):
>-        (pp::Input::switchToNextString):
>-        (pp::Input::isStringEmpty):
>-        (pp::Input::stringLength):
>-        * src/compiler/preprocessor/new/Input.h: Added.
>-        (pp):
>-        (Input):
>-        (pp::Input::error):
>-        (pp::Input::stringIndex):
>-        * src/compiler/preprocessor/new/Macro.cpp: Added.
>-        (pp):
>-        (pp::Macro::Macro):
>-        (pp::Macro::~Macro):
>-        * src/compiler/preprocessor/new/Macro.h: Added.
>-        (pp):
>-        (Macro):
>-        (pp::Macro::type):
>-        (pp::Macro::identifier):
>-        (pp::Macro::parameters):
>-        (pp::Macro::replacements):
>-        * src/compiler/preprocessor/new/Preprocessor.cpp: Added.
>-        (pp):
>-        (pp::Preprocessor::Preprocessor):
>-        (pp::Preprocessor::~Preprocessor):
>-        (pp::Preprocessor::init):
>-        (pp::Preprocessor::process):
>-        (pp::Preprocessor::reset):
>-        * src/compiler/preprocessor/new/Preprocessor.h: Added.
>-        (pp):
>-        (Preprocessor):
>-        (pp::Preprocessor::begin):
>-        (pp::Preprocessor::end):
>-        * src/compiler/preprocessor/new/Token.cpp: Added.
>-        (pp):
>-        (pp::Token::encodeLocation):
>-        (pp::Token::decodeLocation):
>-        (pp::Token::Token):
>-        (pp::Token::~Token):
>-        (pp::operator<<):
>-        * src/compiler/preprocessor/new/Token.h: Added.
>-        (pp):
>-        (Token):
>-        (pp::Token::location):
>-        (pp::Token::type):
>-        (pp::Token::value):
>-        * src/compiler/preprocessor/new/generate_parser.sh: Added.
>-        * src/compiler/preprocessor/new/pp.l: Added.
>-        * src/compiler/preprocessor/new/pp.y: Added.
>-        * src/compiler/preprocessor/new/pp_lex.cpp: Added.
>-        (yy_buffer_state):
>-        (yy_trans_info):
>-        (yyguts_t):
>-        (yy_get_previous_state):
>-        (yy_try_NUL_trans):
>-        (input):
>-        (pprestart):
>-        (pp_switch_to_buffer):
>-        (pp_load_buffer_state):
>-        (pp_create_buffer):
>-        (pp_delete_buffer):
>-        (pp_init_buffer):
>-        (pp_flush_buffer):
>-        (pppush_buffer_state):
>-        (pppop_buffer_state):
>-        (ppensure_buffer_stack):
>-        (pp_scan_buffer):
>-        (pp_scan_string):
>-        (pp_scan_bytes):
>-        (yy_push_state):
>-        (yy_pop_state):
>-        (yy_top_state):
>-        (yy_fatal_error):
>-        (ppget_extra):
>-        (ppget_lineno):
>-        (ppget_column):
>-        (ppget_in):
>-        (ppget_out):
>-        (ppget_leng):
>-        (ppget_text):
>-        (ppset_extra):
>-        (ppset_lineno):
>-        (ppset_column):
>-        (ppset_in):
>-        (ppset_out):
>-        (ppget_debug):
>-        (ppset_debug):
>-        (ppget_lval):
>-        (ppset_lval):
>-        (ppget_lloc):
>-        (ppset_lloc):
>-        (pplex_init):
>-        (pplex_init_extra):
>-        (yy_init_globals):
>-        (pplex_destroy):
>-        (yy_flex_strncpy):
>-        (yy_flex_strlen):
>-        (ppalloc):
>-        (pprealloc):
>-        (ppfree):
>-        (extractMacroName):
>-        (pp):
>-        (pp::Context::readInput):
>-        (pp::Context::initLexer):
>-        (pp::Context::destroyLexer):
>-        * src/compiler/preprocessor/new/pp_tab.cpp: Added.
>-        (YYLTYPE):
>-        (yysyntax_error):
>-        (yyerror):
>-        (pushConditionalBlock):
>-        (popConditionalBlock):
>-        (pp::Context::parse):
>-        * src/compiler/preprocessor/new/pp_tab.h: Added.
>-        (YYLTYPE):
>-        * src/compiler/preprocessor/new/stl_utils.h: Added.
>-        (pp):
>-        (Delete):
>-        (pp::Delete::operator()):
>-        (DeleteSecond):
>-        (pp::DeleteSecond::operator()):
>-        * src/compiler/preprocessor/new/token_type.h: Added.
>-        * src/compiler/preprocessor/scanner.c:
>-        (yylex_CPP):
>-        * src/compiler/preprocessor/symbols.c:
>-        * src/compiler/preprocessor/tokens.c:
>-        * src/libEGL/Config.cpp:
>-        (egl::ConfigSet::getConfigs):
>-        * src/libEGL/Display.cpp:
>-        (egl::Display::initialize):
>-        (egl::Display::terminate):
>-        (egl::Display::restoreLostDevice):
>-        (egl::Display::sync):
>-        (egl):
>-        (egl::Display::allocateEventQuery):
>-        (egl::Display::freeEventQuery):
>-        (egl::Display::getFloat32TextureSupport):
>-        (egl::Display::getFloat16TextureSupport):
>-        (egl::Display::getEventQuerySupport):
>-        (egl::Display::initExtensionString):
>-        (egl::Display::shareHandleSupported):
>-        (egl::Display::getOcclusionQuerySupport):
>-        (egl::Display::getInstancingSupport):
>-        * src/libEGL/Display.h:
>-        (Display):
>-        (egl::Display::isD3d9ExDevice):
>-        * src/libEGL/Surface.cpp:
>-        (egl::Surface::resetSwapChain):
>-        * src/libEGL/libEGL.cpp:
>-        * src/libEGL/libEGL.vcproj:
>-        * src/libGLESv2/Blit.cpp:
>-        (gl::Blit::setCommonBlitState):
>-        * src/libGLESv2/Buffer.h:
>-        (Buffer):
>-        * src/libGLESv2/Context.cpp:
>-        (gl::Context::Context):
>-        (gl::Context::~Context):
>-        (gl::Context::makeCurrent):
>-        (gl::Context::getActiveQuery):
>-        (gl):
>-        (gl::Context::createFence):
>-        (gl::Context::createQuery):
>-        (gl::Context::deleteQuery):
>-        (gl::Context::beginQuery):
>-        (gl::Context::endQuery):
>-        (gl::Context::getQuery):
>-        (gl::Context::applyVertexBuffer):
>-        (gl::Context::applyIndexBuffer):
>-        (gl::Context::readPixels):
>-        (gl::Context::clear):
>-        (gl::Context::drawArrays):
>-        (gl::Context::drawElements):
>-        (gl::Context::sync):
>-        (gl::Context::drawLineLoop):
>-        (gl::Context::supportsOcclusionQueries):
>-        (gl::Context::supportsInstancing):
>-        (gl::Context::setVertexAttribDivisor):
>-        (gl::Context::initExtensionString):
>-        (gl::VertexDeclarationCache::applyDeclaration):
>-        (gl::VertexDeclarationCache::markStateDirty):
>-        * src/libGLESv2/Context.h:
>-        (gl):
>-        (gl::VertexAttribute::VertexAttribute):
>-        (State):
>-        (VertexDeclarationCache):
>-        (Context):
>-        * src/libGLESv2/Fence.cpp:
>-        (gl::Fence::Fence):
>-        (gl::Fence::~Fence):
>-        (gl::Fence::setFence):
>-        * src/libGLESv2/Fence.h:
>-        (egl):
>-        (Fence):
>-        * src/libGLESv2/Framebuffer.cpp:
>-        (gl::Framebuffer::lookupRenderbuffer):
>-        (gl::Framebuffer::detachTexture):
>-        (gl::Framebuffer::completeness):
>-        * src/libGLESv2/Framebuffer.h:
>-        * src/libGLESv2/IndexDataManager.cpp:
>-        (gl::IndexDataManager::IndexDataManager):
>-        (gl::IndexDataManager::~IndexDataManager):
>-        (gl::computeRange):
>-        (gl::IndexDataManager::prepareIndexData):
>-        (gl::IndexDataManager::getCountingIndices):
>-        (gl):
>-        * src/libGLESv2/IndexDataManager.h:
>-        (IndexDataManager):
>-        * src/libGLESv2/Program.cpp:
>-        (gl::Program::getUniformLocation):
>-        (gl::Program::setUniform1fv):
>-        (gl::Program::setUniform2fv):
>-        (gl::Program::setUniform3fv):
>-        (gl::Program::setUniform4fv):
>-        (gl::Program::setUniform1iv):
>-        (gl::Program::setUniform2iv):
>-        (gl::Program::setUniform3iv):
>-        (gl::Program::setUniform4iv):
>-        (gl::Program::packVaryings):
>-        (gl::Program::linkVaryings):
>-        (gl::Program::defineUniform):
>-        (gl::Program::createUniform):
>-        (gl::Program::applyUniformnbv):
>-        (gl::Program::applyUniform1iv):
>-        (gl::Program::applyUniform2iv):
>-        (gl::Program::applyUniform3iv):
>-        (gl::Program::applyUniform4iv):
>-        (gl::Program::getInfoLog):
>-        * src/libGLESv2/Program.h:
>-        (Program):
>-        * src/libGLESv2/Query.cpp: Added.
>-        (gl):
>-        (gl::Query::Query):
>-        (gl::Query::~Query):
>-        (gl::Query::begin):
>-        (gl::Query::end):
>-        (gl::Query::getResult):
>-        (gl::Query::isResultAvailable):
>-        (gl::Query::getType):
>-        (gl::Query::testQuery):
>-        * src/libGLESv2/Query.h: Added.
>-        (gl):
>-        (Query):
>-        * src/libGLESv2/Renderbuffer.cpp:
>-        (gl):
>-        (gl::RenderbufferInterface::addProxyRef):
>-        (gl::RenderbufferInterface::releaseProxy):
>-        (gl::RenderbufferTexture::RenderbufferTexture):
>-        (gl::RenderbufferTexture::~RenderbufferTexture):
>-        (gl::RenderbufferTexture::addProxyRef):
>-        (gl::RenderbufferTexture::releaseProxy):
>-        (gl::Renderbuffer::addRef):
>-        (gl::Renderbuffer::release):
>-        * src/libGLESv2/Renderbuffer.h:
>-        (gl):
>-        (RenderbufferInterface):
>-        (RenderbufferTexture):
>-        (Renderbuffer):
>-        * src/libGLESv2/Shader.cpp:
>-        (gl::Shader::Shader):
>-        (gl::Shader::getInfoLog):
>-        (gl::Shader::getSourceImpl):
>-        (gl):
>-        (gl::Shader::initializeCompiler):
>-        (gl::Shader::parseVaryings):
>-        (gl::Shader::uncompile):
>-        (gl::Shader::compileToHLSL):
>-        (gl::VertexShader::uncompile):
>-        (gl::VertexShader::compile):
>-        (gl::VertexShader::parseAttributes):
>-        (gl::FragmentShader::compile):
>-        * src/libGLESv2/Shader.h:
>-        (Shader):
>-        (VertexShader):
>-        * src/libGLESv2/Texture.cpp:
>-        (gl::Texture2D::Texture2D):
>-        (gl::Texture2D::~Texture2D):
>-        (gl):
>-        (gl::Texture2D::addProxyRef):
>-        (gl::Texture2D::releaseProxy):
>-        (gl::Texture2D::getRenderbuffer):
>-        (gl::TextureCubeMap::TextureCubeMap):
>-        (gl::TextureCubeMap::~TextureCubeMap):
>-        (gl::TextureCubeMap::addProxyRef):
>-        (gl::TextureCubeMap::releaseProxy):
>-        (gl::TextureCubeMap::isSamplerComplete):
>-        (gl::TextureCubeMap::convertToRenderTarget):
>-        (gl::TextureCubeMap::getRenderbuffer):
>-        * src/libGLESv2/Texture.h:
>-        (Texture):
>-        (Texture2D):
>-        (TextureCubeMap):
>-        * src/libGLESv2/VertexDataManager.cpp:
>-        (gl::VertexDataManager::writeAttributeData):
>-        (gl::VertexDataManager::prepareVertexData):
>-        (gl::VertexDataManager::spaceRequired):
>-        (gl):
>-        * src/libGLESv2/VertexDataManager.h:
>-        (TranslatedAttribute):
>-        (VertexDataManager):
>-        * src/libGLESv2/libGLESv2.cpp:
>-        * src/libGLESv2/libGLESv2.def:
>-        * src/libGLESv2/libGLESv2.vcproj:
>-        * src/libGLESv2/utilities.cpp:
>-        (gl::IsInternalTextureTarget):
>-        * src/libGLESv2/utilities.h:
>-        (gl):
>-
>-2012-03-09  Ashod Nakashian  <ashodnakashian@yahoo.com>
>-
>-        Bash scripts should support LF endings only
>-        https://bugs.webkit.org/show_bug.cgi?id=79509
>-
>-        Reviewed by David Kilzer.
>-
>-        * src/compiler/generate_parser.sh: Added property svn:eol-style.
>-
>-2012-02-21  Sam Weinig  <sam@webkit.org>
>-
>-        Attempt to fix the Snow Leopard build.
>-
>-        * Configurations/Base.xcconfig:
>-
>-2012-02-21  Sam Weinig  <sam@webkit.org>
>-
>-        Use libc++ when building with Clang on Mac
>-        https://bugs.webkit.org/show_bug.cgi?id=78981
>-
>-        Reviewed by Dan Bernstein.
>-
>-        * Configurations/Base.xcconfig:
>-
>-2012-01-07  Chris Marrin  <cmarrin@apple.com>
>-
>-        Fixed a warning in GTK build of ANGLE
>-
>-        Unreviewed.
>-
>-        * src/compiler/DetectRecursion.cpp:
>-        (DetectRecursion::~DetectRecursion):
>-
>-2012-01-06  Mark Rowe  <mrowe@apple.com>
>-
>-        Regenerate a few files with a more appropriate version of bison.
>-
>-        Rubber-stamped by Dan Bernstein.
>-
>-        * src/compiler/glslang.l: Tweak the input so that it generates code that compiles without warnings.
>-        * src/compiler/glslang_lex.cpp:
>-        * src/compiler/glslang_tab.cpp:
>-        * src/compiler/glslang_tab.h:
>-
>-2012-01-06  Chris Marrin  <cmarrin@apple.com>
>-
>-        Update ANGLE in WebKit tree
>-        https://bugs.webkit.org/show_bug.cgi?id=75753
>-
>-        Reviewed by Simon Fraser.
>-
>-        Updated ANGLE to r939. Fixed a compiler error (missing case in switch statement)
>-        and added 5 new files to xcodeproj. Other than that it is a straight copy of
>-        the files from the ANGLE repository.
>-
>-        * ANGLE.xcodeproj/project.pbxproj:
>-        * include/EGL/eglext.h:
>-        * include/EGL/eglplatform.h:
>-        * include/GLES2/gl2ext.h:
>-        * include/GLSLANG/ShaderLang.h:
>-        * src/common/debug.cpp:
>-        (gl::output):
>-        (gl::trace):
>-        (gl::perfActive):
>-        (gl::ScopedPerfEventHelper::ScopedPerfEventHelper):
>-        (gl::ScopedPerfEventHelper::~ScopedPerfEventHelper):
>-        * src/common/version.h:
>-        * src/compiler/BaseTypes.h:
>-        (getBasicString):
>-        * src/compiler/BuiltInFunctionEmulator.cpp: Added.
>-        (BuiltInFunctionEmulator::BuiltInFunctionEmulator):
>-        (BuiltInFunctionEmulator::SetFunctionCalled):
>-        (BuiltInFunctionEmulator::OutputEmulatedFunctionDefinition):
>-        (BuiltInFunctionEmulator::IdentifyFunction):
>-        (BuiltInFunctionEmulator::MarkBuiltInFunctionsForEmulation):
>-        (BuiltInFunctionEmulator::Cleanup):
>-        (BuiltInFunctionEmulator::GetEmulatedFunctionName):
>-        * src/compiler/BuiltInFunctionEmulator.h: Added.
>-        * src/compiler/Compiler.cpp:
>-        (TCompiler::TCompiler):
>-        (TCompiler::compile):
>-        (TCompiler::clearResults):
>-        (TCompiler::detectRecursion):
>-        (TCompiler::getMappedNameMaxLength):
>-        (TCompiler::getBuiltInFunctionEmulator):
>-        * src/compiler/DetectRecursion.cpp: Added.
>-        (DetectRecursion::FunctionNode::FunctionNode):
>-        (DetectRecursion::FunctionNode::getName):
>-        (DetectRecursion::FunctionNode::addCallee):
>-        (DetectRecursion::FunctionNode::detectRecursion):
>-        (DetectRecursion::DetectRecursion):
>-        (DetectRecursion::~DetectRecursion):
>-        (DetectRecursion::visitAggregate):
>-        (DetectRecursion::detectRecursion):
>-        (DetectRecursion::findFunctionByName):
>-        * src/compiler/DetectRecursion.h: Added.
>-        * src/compiler/ExtensionBehavior.h:
>-        * src/compiler/ForLoopUnroll.cpp:
>-        (ForLoopUnroll::MarkForLoopsWithIntegerIndicesForUnrolling):
>-        * src/compiler/ForLoopUnroll.h:
>-        * src/compiler/Initialize.cpp:
>-        (BuiltInFunctionsCommon):
>-        (BuiltInFunctionsVertex):
>-        (BuiltInFunctionsFragment):
>-        (TBuiltIns::initialize):
>-        (IdentifyBuiltIns):
>-        (InitExtensionBehavior):
>-        * src/compiler/MapLongVariableNames.cpp:
>-        (MapLongVariableNames::MapLongVariableNames):
>-        (MapLongVariableNames::visitSymbol):
>-        (MapLongVariableNames::mapVaryingLongName):
>-        * src/compiler/MapLongVariableNames.h:
>-        * src/compiler/OutputGLSLBase.cpp:
>-        (TOutputGLSLBase::visitUnary):
>-        (TOutputGLSLBase::visitAggregate):
>-        * src/compiler/OutputHLSL.cpp:
>-        (sh::OutputHLSL::OutputHLSL):
>-        (sh::OutputHLSL::header):
>-        (sh::OutputHLSL::visitSymbol):
>-        (sh::OutputHLSL::visitAggregate):
>-        (sh::OutputHLSL::visitSelection):
>-        (sh::OutputHLSL::visitLoop):
>-        (sh::OutputHLSL::handleExcessiveLoop):
>-        (sh::OutputHLSL::addConstructor):
>-        (sh::OutputHLSL::decorate):
>-        (sh::OutputHLSL::decorateUniform):
>-        * src/compiler/OutputHLSL.h:
>-        * src/compiler/ParseHelper.cpp:
>-        (TParseContext::recover):
>-        (TParseContext::reservedErrorCheck):
>-        (TParseContext::constructorErrorCheck):
>-        (TParseContext::extensionErrorCheck):
>-        (TParseContext::supportsExtension):
>-        (TParseContext::enterStructDeclaration):
>-        (TParseContext::exitStructDeclaration):
>-        (TParseContext::structNestingErrorCheck):
>-        * src/compiler/ParseHelper.h:
>-        (TParseContext::TParseContext):
>-        * src/compiler/PoolAlloc.h:
>-        (pool_allocator::pool_allocator):
>-        (pool_allocator::operator=):
>-        (pool_allocator::setAllocator):
>-        (pool_allocator::getAllocator):
>-        * src/compiler/ShHandle.h:
>-        * src/compiler/ShaderLang.cpp:
>-        (checkActiveUniformAndAttribMaxLengths):
>-        (checkMappedNameMaxLength):
>-        (getVariableInfo):
>-        (ShInitBuiltInResources):
>-        (ShGetInfo):
>-        * src/compiler/SymbolTable.cpp:
>-        (TType::computeDeepestStructNesting):
>-        * src/compiler/TranslatorESSL.cpp:
>-        (TranslatorESSL::translate):
>-        (TranslatorESSL::writeExtensionBehavior):
>-        * src/compiler/TranslatorGLSL.cpp:
>-        (TranslatorGLSL::translate):
>-        * src/compiler/Types.h:
>-        (TType::TType):
>-        (TType::copyType):
>-        (TType::setStruct):
>-        (TType::getDeepestStructNesting):
>-        * src/compiler/UnfoldSelect.cpp:
>-        (sh::UnfoldSelect::traverse):
>-        (sh::UnfoldSelect::visitSelection):
>-        (sh::UnfoldSelect::visitLoop):
>-        (sh::UnfoldSelect::getNextTemporaryIndex):
>-        * src/compiler/UnfoldSelect.h:
>-        * src/compiler/ValidateLimitations.cpp:
>-        * src/compiler/ValidateLimitations.h:
>-        * src/compiler/VariableInfo.cpp:
>-        (getVariableDataType):
>-        * src/compiler/generate_glslang_lexer.sh: Removed.
>-        * src/compiler/generate_glslang_parser.sh: Removed.
>-        * src/compiler/generate_parser.sh: Added.
>-        * src/compiler/glslang.l:
>-        * src/compiler/glslang.y:
>-        * src/compiler/glslang_lex.cpp:
>-        (yy_get_previous_state):
>-        (yy_try_NUL_trans):
>-        * src/compiler/glslang_tab.cpp:
>-        * src/compiler/glslang_tab.h:
>-        * src/compiler/intermOut.cpp:
>-        (TOutputTraverser::visitAggregate):
>-        * src/compiler/intermediate.h:
>-        (TIntermUnary::TIntermUnary):
>-        (TIntermUnary::setUseEmulatedFunction):
>-        (TIntermUnary::getUseEmulatedFunction):
>-        (TIntermAggregate::TIntermAggregate):
>-        (TIntermAggregate::setUseEmulatedFunction):
>-        (TIntermAggregate::getUseEmulatedFunction):
>-        * src/compiler/osinclude.h:
>-        * src/compiler/ossource_posix.cpp:
>-        (OS_AllocTLSIndex):
>-        (OS_SetTLSValue):
>-        (OS_FreeTLSIndex):
>-        * src/compiler/preprocessor/atom.c:
>-        (GrowAtomTable):
>-        * src/compiler/preprocessor/length_limits.h: Added.
>-        * src/compiler/preprocessor/scanner.h:
>-        * src/libEGL/Display.cpp:
>-        (egl::Display::getDisplay):
>-        (egl::Display::Display):
>-        (egl::Display::~Display):
>-        (egl::Display::initialize):
>-        (egl::Display::terminate):
>-        (egl::Display::startScene):
>-        (egl::Display::endScene):
>-        (egl::Display::createDevice):
>-        (egl::Display::initializeDevice):
>-        (egl::Display::resetDevice):
>-        (egl::Display::createWindowSurface):
>-        (egl::Display::createOffscreenSurface):
>-        (egl::Display::createContext):
>-        (egl::Display::restoreLostDevice):
>-        (egl::Display::notifyDeviceLost):
>-        (egl::Display::isDeviceLost):
>-        (egl::Display::testDeviceLost):
>-        (egl::Display::testDeviceResettable):
>-        (egl::Display::getDXT1TextureSupport):
>-        (egl::Display::getDXT3TextureSupport):
>-        (egl::Display::getDXT5TextureSupport):
>-        (egl::Display::getFloat32TextureSupport):
>-        (egl::Display::getFloat16TextureSupport):
>-        (egl::Display::getTexturePool):
>-        (egl::Display::initExtensionString):
>-        * src/libEGL/Display.h:
>-        * src/libEGL/Surface.cpp:
>-        (egl::Surface::Surface):
>-        (egl::Surface::initialize):
>-        (egl::Surface::resetSwapChain):
>-        (egl::Surface::subclassWindow):
>-        (egl::Surface::unsubclassWindow):
>-        (egl::Surface::swap):
>-        (egl::Surface::postSubBuffer):
>-        (egl::Surface::isPostSubBufferSupported):
>-        * src/libEGL/Surface.h:
>-        * src/libEGL/libEGL.cpp:
>-        * src/libEGL/libEGL.rc:
>-        * src/libEGL/libEGL.vcproj:
>-        * src/libGLESv2/Buffer.cpp:
>-        (gl::Buffer::bufferSubData):
>-        * src/libGLESv2/Context.cpp:
>-        (gl::Context::Context):
>-        (gl::Context::makeCurrent):
>-        (gl::Context::markAllStateDirty):
>-        (gl::Context::markContextLost):
>-        (gl::Context::isContextLost):
>-        (gl::Context::setPackReverseRowOrder):
>-        (gl::Context::getPackReverseRowOrder):
>-        (gl::Context::deleteProgram):
>-        (gl::Context::getDrawFramebuffer):
>-        (gl::Context::bindDrawFramebuffer):
>-        (gl::Context::useProgram):
>-        (gl::Context::setFramebufferZero):
>-        (gl::Context::getCurrentProgram):
>-        (gl::Context::getBooleanv):
>-        (gl::Context::getIntegerv):
>-        (gl::Context::getQueryParameterInfo):
>-        (gl::Context::applyRenderTarget):
>-        (gl::Context::applyState):
>-        (gl::Context::applyVertexBuffer):
>-        (gl::Context::applyIndexBuffer):
>-        (gl::Context::applyShaders):
>-        (gl::Context::applyTextures):
>-        (gl::Context::readPixels):
>-        (gl::Context::clear):
>-        (gl::Context::drawArrays):
>-        (gl::Context::drawElements):
>-        (gl::Context::sync):
>-        (gl::Context::drawClosingLine):
>-        (gl::Context::getResetStatus):
>-        (gl::Context::isResetNotificationEnabled):
>-        (gl::Context::supportsDXT1Textures):
>-        (gl::Context::supportsDXT3Textures):
>-        (gl::Context::supportsDXT5Textures):
>-        (gl::Context::supportsFloat32Textures):
>-        (gl::Context::supportsFloat32LinearFilter):
>-        (gl::Context::supportsFloat32RenderableTextures):
>-        (gl::Context::supportsFloat16Textures):
>-        (gl::Context::supportsFloat16LinearFilter):
>-        (gl::Context::supportsFloat16RenderableTextures):
>-        (gl::Context::initExtensionString):
>-        (gl::Context::initRendererString):
>-        (gl::Context::getRendererString):
>-        (gl::Context::blitFramebuffer):
>-        (gl::VertexDeclarationCache::applyDeclaration):
>-        (gl::VertexDeclarationCache::markStateDirty):
>-        * src/libGLESv2/Context.h:
>-        * src/libGLESv2/Fence.cpp:
>-        (gl::Fence::testFence):
>-        (gl::Fence::getFenceiv):
>-        * src/libGLESv2/Framebuffer.cpp:
>-        (gl::Framebuffer::setColorbuffer):
>-        (gl::Framebuffer::setDepthbuffer):
>-        (gl::Framebuffer::setStencilbuffer):
>-        (gl::Framebuffer::getColorbuffer):
>-        (gl::Framebuffer::getDepthbuffer):
>-        (gl::Framebuffer::getStencilbuffer):
>-        (gl::Framebuffer::hasStencil):
>-        (gl::Framebuffer::completeness):
>-        (gl::DefaultFramebuffer::DefaultFramebuffer):
>-        * src/libGLESv2/Framebuffer.h:
>-        * src/libGLESv2/IndexDataManager.cpp:
>-        (gl::IndexDataManager::prepareIndexData):
>-        (gl::IndexBuffer::IndexBuffer):
>-        (gl::IndexBuffer::getSerial):
>-        (gl::IndexBuffer::issueSerial):
>-        (gl::StreamingIndexBuffer::reserveSpace):
>-        (gl::StaticIndexBuffer::reserveSpace):
>-        (gl::StaticIndexBuffer::lookupRange):
>-        (gl::StaticIndexBuffer::addRange):
>-        * src/libGLESv2/IndexDataManager.h:
>-        (gl::StaticIndexBuffer::IndexRange::operator<):
>-        * src/libGLESv2/Program.cpp:
>-        (gl::Uniform::Uniform):
>-        (gl::Uniform::isArray):
>-        (gl::UniformLocation::UniformLocation):
>-        (gl::Program::Program):
>-        (gl::Program::detachShader):
>-        (gl::Program::getUsedSamplerRange):
>-        (gl::Program::getSamplerMapping):
>-        (gl::Program::getUniformLocation):
>-        (gl::Program::setUniform1fv):
>-        (gl::Program::setUniform2fv):
>-        (gl::Program::setUniform3fv):
>-        (gl::transposeMatrix):
>-        (gl::Program::setUniformMatrix2fv):
>-        (gl::Program::setUniformMatrix3fv):
>-        (gl::Program::setUniformMatrix4fv):
>-        (gl::Program::getUniformfv):
>-        (gl::Program::getUniformiv):
>-        (gl::Program::applyUniforms):
>-        (gl::Program::compileToBinary):
>-        (gl::Program::linkVaryings):
>-        (gl::Program::link):
>-        (gl::Program::defineUniform):
>-        (gl::Program::createUniform):
>-        (gl::Program::decorateAttribute):
>-        (gl::Program::undecorateUniform):
>-        (gl::Program::applyUniformnbv):
>-        (gl::Program::applyUniformnfv):
>-        (gl::Program::applyUniform1iv):
>-        (gl::Program::applyUniform2iv):
>-        (gl::Program::applyUniform3iv):
>-        (gl::Program::applyUniform4iv):
>-        (gl::Program::applyUniformniv):
>-        (gl::Program::appendToInfoLogSanitized):
>-        (gl::Program::unlink):
>-        (gl::Program::getActiveUniform):
>-        (gl::Program::getActiveUniformCount):
>-        (gl::Program::getActiveUniformMaxLength):
>-        (gl::Program::validateSamplers):
>-        (gl::Program::initializeConstantHandles):
>-        (gl::Program::getDxCoordLocation):
>-        * src/libGLESv2/Program.h:
>-        * src/libGLESv2/Renderbuffer.cpp:
>-        (gl::RenderbufferInterface::RenderbufferInterface):
>-        (gl::RenderbufferInterface::getRedSize):
>-        (gl::RenderbufferInterface::getGreenSize):
>-        (gl::RenderbufferInterface::getBlueSize):
>-        (gl::RenderbufferInterface::getAlphaSize):
>-        (gl::RenderbufferInterface::getDepthSize):
>-        (gl::RenderbufferInterface::getStencilSize):
>-        (gl::RenderbufferTexture::RenderbufferTexture):
>-        (gl::RenderbufferTexture::~RenderbufferTexture):
>-        (gl::RenderbufferTexture::getRenderTarget):
>-        (gl::RenderbufferTexture::getDepthStencil):
>-        (gl::RenderbufferTexture::getWidth):
>-        (gl::RenderbufferTexture::getHeight):
>-        (gl::RenderbufferTexture::getInternalFormat):
>-        (gl::RenderbufferTexture::getD3DFormat):
>-        (gl::RenderbufferTexture::getSamples):
>-        (gl::RenderbufferTexture::getSerial):
>-        (gl::Renderbuffer::Renderbuffer):
>-        (gl::Renderbuffer::~Renderbuffer):
>-        (gl::Renderbuffer::getRenderTarget):
>-        (gl::Renderbuffer::getDepthStencil):
>-        (gl::Renderbuffer::getWidth):
>-        (gl::Renderbuffer::getHeight):
>-        (gl::Renderbuffer::getInternalFormat):
>-        (gl::Renderbuffer::getD3DFormat):
>-        (gl::Renderbuffer::getRedSize):
>-        (gl::Renderbuffer::getGreenSize):
>-        (gl::Renderbuffer::getBlueSize):
>-        (gl::Renderbuffer::getAlphaSize):
>-        (gl::Renderbuffer::getDepthSize):
>-        (gl::Renderbuffer::getStencilSize):
>-        (gl::Renderbuffer::getSamples):
>-        (gl::Renderbuffer::getSerial):
>-        (gl::Renderbuffer::setStorage):
>-        (gl::RenderbufferStorage::getD3DFormat):
>-        (gl::RenderbufferStorage::issueCubeSerials):
>-        (gl::Colorbuffer::Colorbuffer):
>-        (gl::Colorbuffer::getRenderTarget):
>-        (gl::Depthbuffer::Depthbuffer):
>-        (gl::Stencilbuffer::Stencilbuffer):
>-        * src/libGLESv2/Renderbuffer.h:
>-        (gl::RenderbufferInterface::~RenderbufferInterface):
>-        * src/libGLESv2/Shader.cpp:
>-        (gl::Shader::getTranslatedSourceLength):
>-        (gl::Shader::getSourceImpl):
>-        (gl::Shader::getSource):
>-        (gl::Shader::getTranslatedSource):
>-        * src/libGLESv2/Shader.h:
>-        * src/libGLESv2/Texture.cpp:
>-        (gl::ConvertTextureFormatType):
>-        (gl::IsTextureFormatRenderable):
>-        (gl::Image::Image):
>-        (gl::Image::~Image):
>-        (gl::Image::redefine):
>-        (gl::Image::createSurface):
>-        (gl::Image::lock):
>-        (gl::Image::unlock):
>-        (gl::Image::isRenderableFormat):
>-        (gl::Image::getD3DFormat):
>-        (gl::Image::getSurface):
>-        (gl::Image::setManagedSurface):
>-        (gl::Image::updateSurface):
>-        (gl::Image::loadData):
>-        (gl::Image::loadAlphaData):
>-        (gl::Image::loadAlphaFloatData):
>-        (gl::Image::loadAlphaHalfFloatData):
>-        (gl::Image::loadLuminanceData):
>-        (gl::Image::loadLuminanceFloatData):
>-        (gl::Image::loadLuminanceHalfFloatData):
>-        (gl::Image::loadLuminanceAlphaData):
>-        (gl::Image::loadLuminanceAlphaFloatData):
>-        (gl::Image::loadLuminanceAlphaHalfFloatData):
>-        (gl::Image::loadRGBUByteData):
>-        (gl::Image::loadRGB565Data):
>-        (gl::Image::loadRGBFloatData):
>-        (gl::Image::loadRGBHalfFloatData):
>-        (gl::Image::loadRGBAUByteDataSSE2):
>-        (gl::Image::loadRGBAUByteData):
>-        (gl::Image::loadRGBA4444Data):
>-        (gl::Image::loadRGBA5551Data):
>-        (gl::Image::loadRGBAFloatData):
>-        (gl::Image::loadRGBAHalfFloatData):
>-        (gl::Image::loadBGRAData):
>-        (gl::Image::loadCompressedData):
>-        (gl::FlipCopyDXT1BlockFull):
>-        (gl::FlipCopyDXT1BlockHalf):
>-        (gl::FlipCopyDXT3BlockFull):
>-        (gl::FlipCopyDXT3BlockHalf):
>-        (gl::FlipCopyDXT5BlockFull):
>-        (gl::FlipCopyDXT5BlockHalf):
>-        (gl::Image::loadDXT1Data):
>-        (gl::Image::loadDXT3Data):
>-        (gl::Image::loadDXT5Data):
>-        (gl::Image::copy):
>-        (gl::TextureStorage::TextureStorage):
>-        (gl::TextureStorage::~TextureStorage):
>-        (gl::TextureStorage::isRenderTarget):
>-        (gl::TextureStorage::isManaged):
>-        (gl::TextureStorage::getPool):
>-        (gl::TextureStorage::getTextureSerial):
>-        (gl::TextureStorage::issueTextureSerial):
>-        (gl::Texture::Texture):
>-        (gl::Texture::~Texture):
>-        (gl::Texture::setMinFilter):
>-        (gl::Texture::setMagFilter):
>-        (gl::Texture::setWrapS):
>-        (gl::Texture::setWrapT):
>-        (gl::Texture::setUsage):
>-        (gl::Texture::getMinFilter):
>-        (gl::Texture::getMagFilter):
>-        (gl::Texture::getWrapS):
>-        (gl::Texture::getWrapT):
>-        (gl::Texture::getUsage):
>-        (gl::Texture::setImage):
>-        (gl::Texture::setCompressedImage):
>-        (gl::Texture::subImage):
>-        (gl::Texture::subImageCompressed):
>-        (gl::Texture::getTexture):
>-        (gl::Texture::hasDirtyParameters):
>-        (gl::Texture::hasDirtyImages):
>-        (gl::Texture::resetDirty):
>-        (gl::Texture::getTextureSerial):
>-        (gl::Texture::getRenderTargetSerial):
>-        (gl::Texture::isImmutable):
>-        (gl::Texture::creationLevels):
>-        (gl::Texture::getBlitter):
>-        (gl::Texture::copyToRenderTarget):
>-        (gl::TextureStorage2D::TextureStorage2D):
>-        (gl::TextureStorage2D::~TextureStorage2D):
>-        (gl::TextureStorage2D::getSurfaceLevel):
>-        (gl::TextureStorage2D::getBaseTexture):
>-        (gl::TextureStorage2D::getRenderTargetSerial):
>-        (gl::Texture2D::Texture2D):
>-        (gl::Texture2D::~Texture2D):
>-        (gl::Texture2D::getWidth):
>-        (gl::Texture2D::getHeight):
>-        (gl::Texture2D::getInternalFormat):
>-        (gl::Texture2D::getType):
>-        (gl::Texture2D::redefineImage):
>-        (gl::Texture2D::setImage):
>-        (gl::Texture2D::bindTexImage):
>-        (gl::Texture2D::releaseTexImage):
>-        (gl::Texture2D::setCompressedImage):
>-        (gl::Texture2D::commitRect):
>-        (gl::Texture2D::copyImage):
>-        (gl::Texture2D::copySubImage):
>-        (gl::Texture2D::storage):
>-        (gl::Texture2D::isSamplerComplete):
>-        (gl::Texture2D::isMipmapComplete):
>-        (gl::Texture2D::getBaseTexture):
>-        (gl::Texture2D::createTexture):
>-        (gl::Texture2D::updateTexture):
>-        (gl::Texture2D::convertToRenderTarget):
>-        (gl::Texture2D::generateMipmaps):
>-        (gl::Texture2D::getRenderbuffer):
>-        (gl::Texture2D::getRenderTarget):
>-        (gl::Texture2D::getStorage):
>-        (gl::TextureStorageCubeMap::TextureStorageCubeMap):
>-        (gl::TextureStorageCubeMap::~TextureStorageCubeMap):
>-        (gl::TextureStorageCubeMap::getCubeMapSurface):
>-        (gl::TextureStorageCubeMap::getBaseTexture):
>-        (gl::TextureStorageCubeMap::getRenderTargetSerial):
>-        (gl::TextureCubeMap::TextureCubeMap):
>-        (gl::TextureCubeMap::~TextureCubeMap):
>-        (gl::TextureCubeMap::getWidth):
>-        (gl::TextureCubeMap::getHeight):
>-        (gl::TextureCubeMap::getInternalFormat):
>-        (gl::TextureCubeMap::getType):
>-        (gl::TextureCubeMap::setCompressedImage):
>-        (gl::TextureCubeMap::commitRect):
>-        (gl::TextureCubeMap::subImage):
>-        (gl::TextureCubeMap::subImageCompressed):
>-        (gl::TextureCubeMap::isSamplerComplete):
>-        (gl::TextureCubeMap::isCubeComplete):
>-        (gl::TextureCubeMap::isMipmapCubeComplete):
>-        (gl::TextureCubeMap::getBaseTexture):
>-        (gl::TextureCubeMap::createTexture):
>-        (gl::TextureCubeMap::updateTexture):
>-        (gl::TextureCubeMap::convertToRenderTarget):
>-        (gl::TextureCubeMap::setImage):
>-        (gl::TextureCubeMap::redefineImage):
>-        (gl::TextureCubeMap::copyImage):
>-        (gl::TextureCubeMap::copySubImage):
>-        (gl::TextureCubeMap::storage):
>-        (gl::TextureCubeMap::generateMipmaps):
>-        (gl::TextureCubeMap::getRenderbuffer):
>-        (gl::TextureCubeMap::getRenderTarget):
>-        (gl::TextureCubeMap::getStorage):
>-        * src/libGLESv2/Texture.h:
>-        (gl::Image::markDirty):
>-        (gl::Image::markClean):
>-        (gl::Image::getWidth):
>-        (gl::Image::getHeight):
>-        (gl::Image::getFormat):
>-        (gl::Image::getType):
>-        (gl::Image::isDirty):
>-        * src/libGLESv2/VertexDataManager.cpp:
>-        (gl::elementsInBuffer):
>-        (gl::VertexDataManager::VertexDataManager):
>-        (gl::VertexDataManager::writeAttributeData):
>-        (gl::VertexDataManager::prepareVertexData):
>-        (gl::VertexBuffer::VertexBuffer):
>-        (gl::VertexBuffer::getSerial):
>-        (gl::VertexBuffer::issueSerial):
>-        (gl::StreamingVertexBuffer::reserveRequiredSpace):
>-        (gl::StaticVertexBuffer::map):
>-        (gl::StaticVertexBuffer::reserveRequiredSpace):
>-        (gl::StaticVertexBuffer::lookupAttribute):
>-        * src/libGLESv2/VertexDataManager.h:
>-        (gl::ArrayVertexBuffer::size):
>-        * src/libGLESv2/geometry/IndexDataManager.cpp: Removed.
>-        * src/libGLESv2/geometry/IndexDataManager.h: Removed.
>-        * src/libGLESv2/geometry/VertexDataManager.cpp: Removed.
>-        * src/libGLESv2/geometry/VertexDataManager.h: Removed.
>-        * src/libGLESv2/geometry/vertexconversion.h: Removed.
>-        * src/libGLESv2/libGLESv2.cpp:
>-        (validateSubImageParams):
>-        (validReadFormatType):
>-        (Extension::glBindTexImage):
>-        * src/libGLESv2/libGLESv2.def:
>-        * src/libGLESv2/libGLESv2.rc:
>-        * src/libGLESv2/libGLESv2.vcproj:
>-        * src/libGLESv2/main.cpp:
>-        (gl::getNonLostContext):
>-        (gl::checkDeviceLost):
>-        * src/libGLESv2/main.h:
>-        * src/libGLESv2/utilities.cpp:
>-        (gl::UniformExternalComponentCount):
>-        (gl::UniformInternalComponentCount):
>-        (gl::UniformComponentSize):
>-        (gl::UniformInternalSize):
>-        (gl::UniformExternalSize):
>-        (gl::ComputeCompressedSize):
>-        (gl::IsCompressed):
>-        (gl::ExtractFormat):
>-        (gl::ExtractType):
>-        (dx2es::IsFloat32Format):
>-        (dx2es::IsFloat16Format):
>-        * src/libGLESv2/utilities.h:
>-        (isDeviceLostError):
>-
>-2011-11-11  Darin Adler  <darin@apple.com>
>-
>-        * ANGLE.xcodeproj/project.pbxproj: Let a newer Xcode update this file.
>-        If an older Xcode downgrades this file and we have a risk of some kind of
>-        oscillating commit situation, please contact me so I know not to do this again.
>-
>-2011-09-19  Adam Roben  <aroben@apple.com>
>-
>-        Let Xcode 4 do its thang with ANGLE.xcodeproj
>-
>-        * ANGLE.xcodeproj/project.pbxproj:
>-
>-2011-09-13  Anders Carlsson  <andersca@apple.com>
>-
>-        Disable C++ exceptions when building with clang
>-        https://bugs.webkit.org/show_bug.cgi?id=68031
>-        <rdar://problem/9556880>
>-
>-        Reviewed by Mark Rowe.
>-
>-        * Configurations/Base.xcconfig:
>-
>-2011-09-08  Andras Becsi  <andras.becsi@nokia.com>
>-
>-        [Qt] Build fails with strict compiler
>-        https://bugs.webkit.org/show_bug.cgi?id=67778
>-
>-        Reviewed by Csaba OsztrogonÃ¡c.
>-
>-        * src/compiler/glslang_lex.cpp: Regenerate with generate_glslang_lexer.sh using a newer flex
>-        to suppress warning and fix the build when using [-Werror=unused-result]
>-
>-2011-08-12  Mark Rowe  <mrowe@apple.com>
>-
>-        Be more forward-looking in the choice of compiler.
>-
>-        Rubber-stamped by Jon Honeycutt.
>-
>-        * Configurations/CompilerVersion.xcconfig:
>-
>-2011-08-11  Renata Hodovan  <reni@webkit.org>
>-
>-        [Qt]Fix warnings after r92805.
>-
>-        Reviewed by Csaba OsztrogonÃ¡c.
>-
>-        Control reached the end non-void functions.
>-
>-        * src/compiler/ossource_posix.cpp:
>-        (OS_AllocTLSIndex):
>-        (OS_SetTLSValue):
>-
>-2011-08-11  Renata Hodovan  <reni@webkit.org>
>-
>-        Build fix on Qt Windows 32-bit Release/Debug after r92805.
>-
>-        Unreviewed.
>-
>-        * src/compiler/ossource_posix.cpp:
>-        (OS_FreeTLSIndex):
>-
>-2011-08-04  Mark Rowe  <mrowe@apple.com>
>-
>-        Future-proof Xcode configuration settings.
>-
>-        * Configurations/Base.xcconfig:
>-        * Configurations/CompilerVersion.xcconfig:
>-        * Configurations/DebugRelease.xcconfig:
>-
>-2011-06-30  Mark Rowe  <mrowe@apple.com>
>-
>-        Rubber-stamped by Dan Bernstein.
>-
>-        ANGLE shouldn't try to use internal SDKs. It doesn't need them!
>-
>-        * Configurations/Base.xcconfig:
>-
>-2011-06-20  Zhenyao Mo  <zmo@google.com>
>-
>-        Reviewed by Kenneth Russell.
>-
>-        Update ANGLE to r696
>-        https://bugs.webkit.org/show_bug.cgi?id=56396
>-
>-        * ANGLE.xcodeproj/project.pbxproj:
>-        * include/EGL/eglext.h:
>-        * include/GLSLANG/ShaderLang.h:
>-        * src/build_angle.xcodeproj/project.pbxproj:
>-        * src/common/debug.cpp:
>-        (gl::output):
>-        (gl::trace):
>-        (gl::perfActive):
>-        (gl::ScopedPerfEventHelper::ScopedPerfEventHelper):
>-        (gl::ScopedPerfEventHelper::~ScopedPerfEventHelper):
>-        * src/common/debug.h:
>-        * src/common/version.h: Added.
>-        * src/compiler/CodeGenGLSL.cpp:
>-        (ConstructCompiler):
>-        * src/compiler/CodeGenHLSL.cpp:
>-        (ConstructCompiler):
>-        * src/compiler/Compiler.cpp:
>-        (TCompiler::compile):
>-        (TCompiler::mapLongVariableNames):
>-        (TCompiler::getMappedNameMaxLength):
>-        (TCompiler::getExtensionBehavior):
>-        * src/compiler/ConstantUnion.h:
>-        (ConstantUnion::operator==):
>-        (ConstantUnion::operator>):
>-        (ConstantUnion::operator<):
>-        * src/compiler/ExtensionBehavior.h:
>-        (getBehaviorString):
>-        * src/compiler/ForLoopUnroll.cpp: Added.
>-        (ForLoopUnroll::FillLoopIndexInfo):
>-        (ForLoopUnroll::Step):
>-        (ForLoopUnroll::SatisfiesLoopCondition):
>-        (ForLoopUnroll::NeedsToReplaceSymbolWithValue):
>-        (ForLoopUnroll::GetLoopIndexValue):
>-        (ForLoopUnroll::Push):
>-        (ForLoopUnroll::Pop):
>-        (ForLoopUnroll::getLoopIncrement):
>-        (ForLoopUnroll::evaluateIntConstant):
>-        * src/compiler/ForLoopUnroll.h: Added.
>-        (ForLoopUnroll::ForLoopUnroll):
>-        * src/compiler/Initialize.cpp:
>-        (BuiltInFunctionsVertex):
>-        * src/compiler/MapLongVariableNames.cpp: Added.
>-        (MapLongVariableNames::MapLongVariableNames):
>-        (MapLongVariableNames::visitSymbol):
>-        (MapLongVariableNames::visitConstantUnion):
>-        (MapLongVariableNames::visitBinary):
>-        (MapLongVariableNames::visitUnary):
>-        (MapLongVariableNames::visitSelection):
>-        (MapLongVariableNames::visitAggregate):
>-        (MapLongVariableNames::visitLoop):
>-        (MapLongVariableNames::visitBranch):
>-        (MapLongVariableNames::mapVaryingLongName):
>-        * src/compiler/MapLongVariableNames.h: Added.
>-        * src/compiler/OutputESSL.cpp: Added.
>-        (TOutputESSL::TOutputESSL):
>-        (TOutputESSL::writeVariablePrecision):
>-        * src/compiler/OutputESSL.h: Added.
>-        * src/compiler/OutputGLSL.cpp:
>-        (TOutputGLSL::TOutputGLSL):
>-        (TOutputGLSL::writeVariablePrecision):
>-        * src/compiler/OutputGLSL.h:
>-        * src/compiler/OutputGLSLBase.cpp: Added.
>-        (TOutputGLSLBase::TOutputGLSLBase):
>-        (TOutputGLSLBase::writeTriplet):
>-        (TOutputGLSLBase::writeVariableType):
>-        (TOutputGLSLBase::writeFunctionParameters):
>-        (TOutputGLSLBase::writeConstantUnion):
>-        (TOutputGLSLBase::visitSymbol):
>-        (TOutputGLSLBase::visitConstantUnion):
>-        (TOutputGLSLBase::visitBinary):
>-        (TOutputGLSLBase::visitUnary):
>-        (TOutputGLSLBase::visitSelection):
>-        (TOutputGLSLBase::visitAggregate):
>-        (TOutputGLSLBase::visitLoop):
>-        (TOutputGLSLBase::visitBranch):
>-        (TOutputGLSLBase::visitCodeBlock):
>-        * src/compiler/OutputGLSLBase.h: Added.
>-        (TOutputGLSLBase::objSink):
>-        * src/compiler/OutputHLSL.cpp:
>-        (sh::OutputHLSL::OutputHLSL):
>-        (sh::OutputHLSL::header):
>-        (sh::OutputHLSL::visitUnary):
>-        (sh::OutputHLSL::visitAggregate):
>-        (sh::OutputHLSL::visitSelection):
>-        (sh::OutputHLSL::visitLoop):
>-        (sh::OutputHLSL::visitBranch):
>-        (sh::OutputHLSL::handleExcessiveLoop):
>-        (sh::OutputHLSL::outputLineDirective):
>-        * src/compiler/OutputHLSL.h:
>-        * src/compiler/ParseHelper.cpp:
>-        (TParseContext::precisionErrorCheck):
>-        (TParseContext::constructorErrorCheck):
>-        (TParseContext::nonInitErrorCheck):
>-        * src/compiler/ParseHelper.h:
>-        (TParseContext::TParseContext):
>-        * src/compiler/ShHandle.h:
>-        * src/compiler/ShaderLang.cpp:
>-        (getVariableInfo):
>-        (ShConstructCompiler):
>-        (ShGetInfo):
>-        (ShGetActiveAttrib):
>-        (ShGetActiveUniform):
>-        * src/compiler/TranslatorESSL.cpp: Added.
>-        (TranslatorESSL::TranslatorESSL):
>-        (TranslatorESSL::translate):
>-        (TranslatorESSL::writeExtensionBehavior):
>-        * src/compiler/TranslatorESSL.h: Added.
>-        * src/compiler/ValidateLimitations.cpp:
>-        (ValidateLimitations::visitBinary):
>-        (ValidateLimitations::visitLoop):
>-        * src/compiler/ValidateLimitations.h:
>-        * src/compiler/VariableInfo.cpp:
>-        (getVariableInfo):
>-        (getBuiltInVariableInfo):
>-        (getUserDefinedVariableInfo):
>-        (CollectAttribsUniforms::visitAggregate):
>-        * src/compiler/VariableInfo.h:
>-        * src/compiler/VersionGLSL.cpp:
>-        (TVersionGLSL::visitSymbol):
>-        (TVersionGLSL::visitConstantUnion):
>-        (TVersionGLSL::visitBinary):
>-        (TVersionGLSL::visitUnary):
>-        (TVersionGLSL::visitSelection):
>-        (TVersionGLSL::visitAggregate):
>-        (TVersionGLSL::visitLoop):
>-        (TVersionGLSL::visitBranch):
>-        * src/compiler/VersionGLSL.h:
>-        * src/compiler/glslang.y:
>-        * src/compiler/glslang_tab.cpp:
>-        * src/compiler/glslang_tab.h:
>-        * src/compiler/intermediate.h:
>-        (TIntermLoop::TIntermLoop):
>-        (TIntermLoop::setUnrollFlag):
>-        (TIntermLoop::getUnrollFlag):
>-        (TIntermSymbol::TIntermSymbol):
>-        (TIntermSymbol::setId):
>-        (TIntermSymbol::setSymbol):
>-        (TIntermSymbol::getOriginalSymbol):
>-        (TIntermAggregate::TIntermAggregate):
>-        (TIntermAggregate::setEndLine):
>-        (TIntermAggregate::getEndLine):
>-        * src/compiler/preprocessor/atom.c:
>-        (AddString):
>-        * src/compiler/preprocessor/compile.h:
>-        * src/compiler/preprocessor/cpp.c:
>-        (CPPelse):
>-        (eval):
>-        (CPPif):
>-        (CPPifdef):
>-        (readCPPline):
>-        (ChkCorrectElseNesting):
>-        * src/compiler/preprocessor/cppstruct.c:
>-        (ResetPreprocessor):
>-        * src/compiler/preprocessor/scanner.c:
>-        (byte_scan):
>-        (yylex_CPP):
>-        * src/compiler/preprocessor/scanner.h:
>-        * src/libEGL/Config.cpp:
>-        (egl::Config::Config):
>-        (egl::Config::set):
>-        (egl::ConfigSet::add):
>-        (egl::ConfigSet::getConfigs):
>-        * src/libEGL/Config.h:
>-        * src/libEGL/Display.cpp:
>-        (egl::Display::Display):
>-        (egl::Display::initialize):
>-        (egl::Display::terminate):
>-        (egl::Display::getConfigAttrib):
>-        (egl::Display::createDevice):
>-        (egl::Display::createWindowSurface):
>-        (egl::Display::createOffscreenSurface):
>-        (egl::Display::createContext):
>-        (egl::Display::destroyContext):
>-        (egl::Display::isInitialized):
>-        (egl::Display::getAdapterIdentifier):
>-        (egl::Display::isDeviceLost):
>-        (egl::Display::getBufferPool):
>-        (egl::Display::initExtensionString):
>-        (egl::Display::getExtensionString):
>-        (egl::Display::getVertexTextureSupport):
>-        (egl::Display::getNonPower2TextureSupport):
>-        * src/libEGL/Display.h:
>-        (egl::Display::isD3d9ExDevice):
>-        * src/libEGL/Surface.cpp:
>-        (egl::Surface::Surface):
>-        (egl::Surface::initialize):
>-        (egl::Surface::release):
>-        (egl::Surface::resetSwapChain):
>-        (egl::SurfaceWindowProc):
>-        (egl::Surface::subclassWindow):
>-        (egl::Surface::unsubclassWindow):
>-        (egl::Surface::swap):
>-        (egl::Surface::getRenderTarget):
>-        (egl::Surface::getOffscreenTexture):
>-        (egl::Surface::getTextureFormat):
>-        (egl::Surface::getTextureTarget):
>-        (egl::Surface::setBoundTexture):
>-        (egl::Surface::getBoundTexture):
>-        (egl::Surface::getFormat):
>-        * src/libEGL/Surface.h:
>-        (egl::Surface::getShareHandle):
>-        * src/libEGL/libEGL.cpp:
>-        (validateDisplay):
>-        (validateConfig):
>-        (validateContext):
>-        (validateSurface):
>-        * src/libEGL/libEGL.rc: Added.
>-        * src/libEGL/libEGL.vcproj:
>-        * src/libEGL/main.cpp:
>-        (DllMain):
>-        * src/libEGL/main.h:
>-        * src/libEGL/resource.h: Added.
>-        * src/libGLESv2/Blit.cpp:
>-        (gl::Blit::initGeometry):
>-        (gl::Blit::copy):
>-        * src/libGLESv2/Blit.h:
>-        * src/libGLESv2/Buffer.cpp:
>-        (gl::Buffer::Buffer):
>-        (gl::Buffer::~Buffer):
>-        (gl::Buffer::bufferData):
>-        (gl::Buffer::bufferSubData):
>-        (gl::Buffer::getStaticVertexBuffer):
>-        (gl::Buffer::getStaticIndexBuffer):
>-        (gl::Buffer::invalidateStaticData):
>-        (gl::Buffer::promoteStaticUsage):
>-        * src/libGLESv2/Buffer.h:
>-        * src/libGLESv2/Context.cpp:
>-        (gl::Context::Context):
>-        (gl::Context::~Context):
>-        (gl::Context::makeCurrent):
>-        (gl::Context::markAllStateDirty):
>-        (gl::Context::setActiveSampler):
>-        (gl::Context::createFramebuffer):
>-        (gl::Context::createFence):
>-        (gl::Context::deleteFramebuffer):
>-        (gl::Context::deleteFence):
>-        (gl::Context::bindTexture2D):
>-        (gl::Context::bindTextureCubeMap):
>-        (gl::Context::getTexture2D):
>-        (gl::Context::getTextureCubeMap):
>-        (gl::Context::getSamplerTexture):
>-        (gl::Context::getIntegerv):
>-        (gl::Context::applyRenderTarget):
>-        (gl::Context::applyState):
>-        (gl::Context::applyVertexBuffer):
>-        (gl::Context::applyShaders):
>-        (gl::Context::applyTextures):
>-        (gl::Context::readPixels):
>-        (gl::Context::clear):
>-        (gl::Context::drawArrays):
>-        (gl::Context::drawElements):
>-        (gl::Context::finish):
>-        (gl::Context::flush):
>-        (gl::Context::drawClosingLine):
>-        (gl::Context::getMaximumVertexTextureImageUnits):
>-        (gl::Context::getMaximumCombinedTextureImageUnits):
>-        (gl::Context::supportsNonPower2Texture):
>-        (gl::Context::detachTexture):
>-        (gl::Context::getIncompleteTexture):
>-        (gl::Context::initExtensionString):
>-        (gl::Context::blitFramebuffer):
>-        (gl::VertexDeclarationCache::VertexDeclarationCache):
>-        (gl::VertexDeclarationCache::~VertexDeclarationCache):
>-        (gl::VertexDeclarationCache::applyDeclaration):
>-        * src/libGLESv2/Context.h:
>-        * src/libGLESv2/Framebuffer.cpp:
>-        (gl::Framebuffer::lookupRenderbuffer):
>-        (gl::Framebuffer::completeness):
>-        * src/libGLESv2/Framebuffer.h:
>-        * src/libGLESv2/HandleAllocator.cpp: Added.
>-        (gl::HandleAllocator::HandleAllocator):
>-        (gl::HandleAllocator::~HandleAllocator):
>-        (gl::HandleAllocator::setBaseHandle):
>-        (gl::HandleAllocator::allocate):
>-        (gl::HandleAllocator::release):
>-        * src/libGLESv2/HandleAllocator.h: Added.
>-        * src/libGLESv2/IndexDataManager.cpp: Added.
>-        (gl::IndexDataManager::IndexDataManager):
>-        (gl::IndexDataManager::~IndexDataManager):
>-        (gl::convertIndices):
>-        (gl::computeRange):
>-        (gl::IndexDataManager::prepareIndexData):
>-        (gl::IndexDataManager::indexSize):
>-        (gl::IndexDataManager::typeSize):
>-        (gl::IndexBuffer::IndexBuffer):
>-        (gl::IndexBuffer::~IndexBuffer):
>-        (gl::IndexBuffer::getBuffer):
>-        (gl::IndexBuffer::unmap):
>-        (gl::StreamingIndexBuffer::StreamingIndexBuffer):
>-        (gl::StreamingIndexBuffer::~StreamingIndexBuffer):
>-        (gl::StreamingIndexBuffer::map):
>-        (gl::StreamingIndexBuffer::reserveSpace):
>-        (gl::StaticIndexBuffer::StaticIndexBuffer):
>-        (gl::StaticIndexBuffer::~StaticIndexBuffer):
>-        (gl::StaticIndexBuffer::map):
>-        (gl::StaticIndexBuffer::reserveSpace):
>-        (gl::StaticIndexBuffer::lookupType):
>-        (gl::StaticIndexBuffer::lookupRange):
>-        (gl::StaticIndexBuffer::addRange):
>-        * src/libGLESv2/IndexDataManager.h: Added.
>-        (gl::IndexBuffer::size):
>-        * src/libGLESv2/Program.cpp:
>-        (gl::Program::getSemanticIndex):
>-        (gl::Program::getSamplerMapping):
>-        (gl::Program::getSamplerTextureType):
>-        (gl::Program::compileToBinary):
>-        (gl::Program::packVaryings):
>-        (gl::Program::linkVaryings):
>-        (gl::Program::link):
>-        (gl::Program::linkUniforms):
>-        (gl::Program::defineUniform):
>-        (gl::Program::applyUniform1iv):
>-        (gl::Program::appendToInfoLogSanitized):
>-        (gl::Program::unlink):
>-        (gl::Program::getActiveUniformMaxLength):
>-        (gl::Program::validate):
>-        (gl::Program::validateSamplers):
>-        * src/libGLESv2/Program.h:
>-        * src/libGLESv2/Renderbuffer.cpp:
>-        (gl::Renderbuffer::getWidth):
>-        (gl::Renderbuffer::getHeight):
>-        (gl::Renderbuffer::getInternalFormat):
>-        (gl::Renderbuffer::getRedSize):
>-        (gl::Renderbuffer::getGreenSize):
>-        (gl::Renderbuffer::getBlueSize):
>-        (gl::Renderbuffer::getAlphaSize):
>-        (gl::Renderbuffer::getDepthSize):
>-        (gl::Renderbuffer::getStencilSize):
>-        (gl::Renderbuffer::getSamples):
>-        (gl::RenderbufferStorage::RenderbufferStorage):
>-        (gl::RenderbufferStorage::getWidth):
>-        (gl::RenderbufferStorage::getHeight):
>-        (gl::RenderbufferStorage::getInternalFormat):
>-        (gl::RenderbufferStorage::getRedSize):
>-        (gl::RenderbufferStorage::getGreenSize):
>-        (gl::RenderbufferStorage::getBlueSize):
>-        (gl::RenderbufferStorage::getAlphaSize):
>-        (gl::RenderbufferStorage::getDepthSize):
>-        (gl::RenderbufferStorage::getStencilSize):
>-        (gl::RenderbufferStorage::getD3DFormat):
>-        (gl::Colorbuffer::Colorbuffer):
>-        (gl::Colorbuffer::getWidth):
>-        (gl::Colorbuffer::getHeight):
>-        (gl::Colorbuffer::getInternalFormat):
>-        (gl::Colorbuffer::getType):
>-        (gl::Colorbuffer::getD3DFormat):
>-        (gl::Colorbuffer::isColorbuffer):
>-        (gl::Colorbuffer::getRenderTarget):
>-        (gl::DepthStencilbuffer::DepthStencilbuffer):
>-        (gl::Depthbuffer::Depthbuffer):
>-        (gl::Stencilbuffer::Stencilbuffer):
>-        * src/libGLESv2/Renderbuffer.h:
>-        * src/libGLESv2/ResourceManager.cpp:
>-        (gl::ResourceManager::createBuffer):
>-        (gl::ResourceManager::createShader):
>-        (gl::ResourceManager::createProgram):
>-        (gl::ResourceManager::createTexture):
>-        (gl::ResourceManager::createRenderbuffer):
>-        (gl::ResourceManager::deleteBuffer):
>-        (gl::ResourceManager::deleteShader):
>-        (gl::ResourceManager::deleteProgram):
>-        (gl::ResourceManager::deleteTexture):
>-        (gl::ResourceManager::deleteRenderbuffer):
>-        (gl::ResourceManager::checkTextureAllocation):
>-        * src/libGLESv2/ResourceManager.h:
>-        * src/libGLESv2/Shader.cpp:
>-        (gl::Shader::Shader):
>-        (gl::Shader::compileToHLSL):
>-        * src/libGLESv2/Shader.h:
>-        * src/libGLESv2/Texture.cpp:
>-        (gl::Texture::Image::Image):
>-        (gl::Texture::Image::~Image):
>-        (gl::Texture::Image::isRenderable):
>-        (gl::Texture::Image::getD3DFormat):
>-        (gl::Texture::Texture):
>-        (gl::Texture::setMinFilter):
>-        (gl::Texture::setMagFilter):
>-        (gl::Texture::setWrapS):
>-        (gl::Texture::setWrapT):
>-        (gl::Texture::loadImageData):
>-        (gl::Texture::loadAlphaImageData):
>-        (gl::Texture::loadAlphaFloatImageData):
>-        (gl::Texture::loadAlphaHalfFloatImageData):
>-        (gl::Texture::loadLuminanceImageData):
>-        (gl::Texture::loadLuminanceFloatImageData):
>-        (gl::Texture::loadLuminanceHalfFloatImageData):
>-        (gl::Texture::loadLuminanceAlphaImageData):
>-        (gl::Texture::loadLuminanceAlphaFloatImageData):
>-        (gl::Texture::loadLuminanceAlphaHalfFloatImageData):
>-        (gl::Texture::loadRGBUByteImageData):
>-        (gl::Texture::loadRGB565ImageData):
>-        (gl::Texture::loadRGBFloatImageData):
>-        (gl::Texture::loadRGBHalfFloatImageData):
>-        (gl::Texture::loadRGBAUByteImageDataSSE2):
>-        (gl::Texture::loadRGBAUByteImageData):
>-        (gl::Texture::loadRGBA4444ImageData):
>-        (gl::Texture::loadRGBA5551ImageData):
>-        (gl::Texture::loadRGBAFloatImageData):
>-        (gl::Texture::loadRGBAHalfFloatImageData):
>-        (gl::Texture::loadBGRAImageData):
>-        (gl::Texture::loadCompressedImageData):
>-        (gl::Texture::createSurface):
>-        (gl::Texture::setImage):
>-        (gl::Texture::setCompressedImage):
>-        (gl::Texture::subImage):
>-        (gl::Texture::subImageCompressed):
>-        (gl::Texture::copyToImage):
>-        (gl::Texture::getTexture):
>-        (gl::Texture::isDirtyParameter):
>-        (gl::Texture::isDirtyImage):
>-        (gl::Texture::resetDirty):
>-        (gl::Texture::getSerial):
>-        (gl::Texture::creationLevels):
>-        (gl::Texture::levelCount):
>-        (gl::Texture::issueSerial):
>-        (gl::Texture2D::Texture2D):
>-        (gl::Texture2D::~Texture2D):
>-        (gl::Texture2D::getWidth):
>-        (gl::Texture2D::getHeight):
>-        (gl::Texture2D::getInternalFormat):
>-        (gl::Texture2D::getType):
>-        (gl::Texture2D::getD3DFormat):
>-        (gl::Texture2D::redefineTexture):
>-        (gl::Texture2D::setImage):
>-        (gl::Texture2D::bindTexImage):
>-        (gl::Texture2D::releaseTexImage):
>-        (gl::Texture2D::setCompressedImage):
>-        (gl::Texture2D::commitRect):
>-        (gl::Texture2D::copyImage):
>-        (gl::Texture2D::copySubImage):
>-        (gl::Texture2D::isComplete):
>-        (gl::Texture2D::isCompressed):
>-        (gl::Texture2D::getBaseTexture):
>-        (gl::Texture2D::createTexture):
>-        (gl::Texture2D::updateTexture):
>-        (gl::Texture2D::convertToRenderTarget):
>-        (gl::Texture2D::generateMipmaps):
>-        (gl::Texture2D::getRenderbuffer):
>-        (gl::Texture2D::getRenderTarget):
>-        (gl::TextureCubeMap::getWidth):
>-        (gl::TextureCubeMap::getHeight):
>-        (gl::TextureCubeMap::getInternalFormat):
>-        (gl::TextureCubeMap::getType):
>-        (gl::TextureCubeMap::getD3DFormat):
>-        (gl::TextureCubeMap::setImagePosX):
>-        (gl::TextureCubeMap::setImageNegX):
>-        (gl::TextureCubeMap::setImagePosY):
>-        (gl::TextureCubeMap::setImageNegY):
>-        (gl::TextureCubeMap::setImagePosZ):
>-        (gl::TextureCubeMap::setImageNegZ):
>-        (gl::TextureCubeMap::setCompressedImage):
>-        (gl::TextureCubeMap::commitRect):
>-        (gl::TextureCubeMap::isComplete):
>-        (gl::TextureCubeMap::isCompressed):
>-        (gl::TextureCubeMap::getBaseTexture):
>-        (gl::TextureCubeMap::createTexture):
>-        (gl::TextureCubeMap::updateTexture):
>-        (gl::TextureCubeMap::convertToRenderTarget):
>-        (gl::TextureCubeMap::setImage):
>-        (gl::TextureCubeMap::redefineTexture):
>-        (gl::TextureCubeMap::copyImage):
>-        (gl::TextureCubeMap::getCubeMapSurface):
>-        (gl::TextureCubeMap::copySubImage):
>-        (gl::TextureCubeMap::generateMipmaps):
>-        (gl::TextureCubeMap::getRenderbuffer):
>-        (gl::TextureCubeMap::getRenderTarget):
>-        * src/libGLESv2/Texture.h:
>-        * src/libGLESv2/VertexDataManager.cpp: Added.
>-        (gl::VertexDataManager::VertexDataManager):
>-        (gl::VertexDataManager::~VertexDataManager):
>-        (gl::VertexDataManager::writeAttributeData):
>-        (gl::VertexDataManager::prepareVertexData):
>-        (gl::VertexDataManager::spaceRequired):
>-        (gl::VertexDataManager::checkVertexCaps):
>-        (gl::VertexDataManager::typeIndex):
>-        (gl::VertexBuffer::VertexBuffer):
>-        (gl::VertexBuffer::~VertexBuffer):
>-        (gl::VertexBuffer::unmap):
>-        (gl::VertexBuffer::getBuffer):
>-        (gl::ConstantVertexBuffer::ConstantVertexBuffer):
>-        (gl::ConstantVertexBuffer::~ConstantVertexBuffer):
>-        (gl::ArrayVertexBuffer::ArrayVertexBuffer):
>-        (gl::ArrayVertexBuffer::~ArrayVertexBuffer):
>-        (gl::ArrayVertexBuffer::addRequiredSpace):
>-        (gl::ArrayVertexBuffer::addRequiredSpaceFor):
>-        (gl::StreamingVertexBuffer::StreamingVertexBuffer):
>-        (gl::StreamingVertexBuffer::~StreamingVertexBuffer):
>-        (gl::StreamingVertexBuffer::map):
>-        (gl::StreamingVertexBuffer::reserveRequiredSpace):
>-        (gl::StaticVertexBuffer::StaticVertexBuffer):
>-        (gl::StaticVertexBuffer::~StaticVertexBuffer):
>-        (gl::StaticVertexBuffer::map):
>-        (gl::StaticVertexBuffer::reserveRequiredSpace):
>-        (gl::StaticVertexBuffer::lookupAttribute):
>-        (gl::VertexDataManager::formatConverter):
>-        * src/libGLESv2/VertexDataManager.h: Added.
>-        (gl::ArrayVertexBuffer::size):
>-        (gl::VertexDataManager::dirtyCurrentValue):
>-        * src/libGLESv2/libGLESv2.cpp:
>-        (validImageSize):
>-        (Extension::glBindTexImage):
>-        * src/libGLESv2/libGLESv2.def:
>-        * src/libGLESv2/libGLESv2.rc: Added.
>-        * src/libGLESv2/libGLESv2.vcproj:
>-        * src/libGLESv2/main.cpp:
>-        (error):
>-        * src/libGLESv2/mathutil.h:
>-        (gl::clamp):
>-        (gl::clamp01):
>-        (gl::transformPixelRect):
>-        (gl::transformPixelYOffset):
>-        (gl::adjustWinding):
>-        (gl::supportsSSE2):
>-        * src/libGLESv2/resource.h: Added.
>-        * src/libGLESv2/utilities.cpp:
>-        (gl::ComputeCompressedPitch):
>-        (es2dx::ConvertCubeFace):
>-        (es2dx::ConvertPrimitiveType):
>-        (es2dx::ConvertRenderbufferFormat):
>-        (es2dx::GetMultisampleTypeFromSamples):
>-        (dx2es::GetStencilSize):
>-        (dx2es::GetAlphaSize):
>-        (dx2es::GetRedSize):
>-        (dx2es::GetGreenSize):
>-        (dx2es::GetBlueSize):
>-        (dx2es::GetDepthSize):
>-        (getTempPath):
>-        (writeFile):
>-        * src/libGLESv2/utilities.h:
>-        * src/libGLESv2/vertexconversion.h: Added.
>-        (gl::Identity::convert):
>-        (gl::Cast::convert):
>-        (gl::Normalize::convert):
>-        (gl::FixedToFloat::convert):
>-        (gl::SimpleDefaultValues::zero):
>-        (gl::SimpleDefaultValues::one):
>-        (gl::NormalizedDefaultValues::zero):
>-        (gl::NormalizedDefaultValues::one):
>-        (gl::VertexDataConverter::convertArray):
>-        (gl::VertexDataConverter::pointerAddBytes):
>-        (gl::VertexDataConverter::copyComponent):
>-
>-2011-05-24  David Kilzer  <ddkilzer@apple.com>
>-
>-        Part 2 of 2: <http://webkit.org/b/60805> Enable -Wnewline-eof on ANGLE
>-
>-        Reviewed by Adam Roben.
>-
>-        * Configurations/Base.xcconfig:
>-        (GCC_WARN_ABOUT_MISSING_NEWLINE): Added. Set to YES.
>-
>-2011-05-23  David Kilzer  <ddkilzer@apple.com>
>-
>-        Part 1 of 2: <http://webkit.org/b/60805> Enable -Wnewline-eof on ANGLE
>-
>-        Merge ANGLE upstream commit r653 for Issue 154.
>-
>-        * src/compiler/PoolAlloc.h: Added newline to end of file.
>-        * src/compiler/ShHandle.h: Ditto.
>-        * src/libEGL/Display.cpp: Ditto.
>-
>-2011-05-16  David Kilzer  <ddkilzer@apple.com>
>-
>-        <http://webkit.org/b/60913> C++ exceptions should not be enabled when building with llvm-gcc-4.2
>-        <rdar://problem/9446430>
>-
>-        Reviewed by Mark Rowe.
>-
>-        * Configurations/Base.xcconfig: Fixed typo.
>-
>-2011-05-04  David Kilzer  <ddkilzer@apple.com>
>-
>-        Part 2 of 2: <http://webkit.org/b/56337> Enable -Werror on ANGLE
>-
>-        Reviewed by Adam Barth.
>-
>-        * Configurations/Base.xcconfig:
>-        (GCC_TREAT_WARNINGS_AS_ERRORS): Set to YES.
>-
>-2011-05-04  David Kilzer  <ddkilzer@apple.com>
>-
>-        Part 1 of 2: <http://webkit.org/b/56337> Enable -Werror on ANGLE
>-
>-        Merge ANGLE upstream commits r572, r573, r574, r575.
>-
>-        This unblocks enabling -Werror on ANGLE.  Since all changes are
>-        in the upstream repository, they may be safely overwritten
>-        during the next ANGLE update.
>-
>-        * src/compiler/ConstantUnion.h:
>-        (ConstantUnion::operator==): Added a default case.
>-        * src/compiler/Intermediate.cpp:
>-        (TIntermBinary::promote): Added parentheses.
>-        * src/compiler/ParseHelper.cpp:
>-        (TParseContext::precisionErrorCheck): Added a default case.
>-        * src/compiler/PoolAlloc.cpp:
>-        (TAllocation::checkGuardBlock): Changed '%u' to '%lu' for size_t
>-        variable.  Put for loop inside #ifdef GUARD_BLOCKS/#endif macros
>-        to fix tautological-compare warning.
>-        (TAllocation::checkAllocList): Added newline to end of file.
>-
>-2011-04-26  Dan Bernstein  <mitz@apple.com>
>-
>-        Build fix.
>-
>-        * Configurations/CompilerVersion.xcconfig:
>-
>-2011-04-26  Dan Bernstein  <mitz@apple.com>
>-
>-        Reviewed by Mark Rowe.
>-
>-        Choose the compiler based on the Xcode version for Snow Leopard debug builds.
>-
>-        * Configurations/Base.xcconfig:
>-        * Configurations/CompilerVersion.xcconfig: Added.
>-
>-2011-03-17  Jeff Miller  <jeffm@apple.com>
>-
>-        Use a consistent set of file patterns in the svn:ignore property for all .xcodeproj directories, specifically:
>-        
>-        *.mode*
>-        *.pbxuser
>-        *.perspective*
>-        project.xcworkspace
>-        xcuserdata
>-
>-        * ANGLE.xcodeproj: Modified property svn:ignore.
>-        * src/build_angle.xcodeproj: Modified property svn:ignore.
>-
>-2011-01-18  Kenneth Russell  <kbr@google.com>
>-
>-        Unreviewed, Leopard build fix. Remove flex/bison targets for GLSL
>-        grammar because the generated sources are already checked in.
>-
>-        * ANGLE.xcodeproj/project.pbxproj:
>-        * src/build_angle.xcodeproj/project.pbxproj:
>-
>-2011-01-18  Kenneth Russell  <kbr@google.com>
>-
>-        Unreviewed, release build fix. Explicitly cast away const.
>-
>-        * src/compiler/preprocessor/scanner.c:
>-        (ScanFromString):
>-
>-2011-01-18  Ben Vanik  <ben.vanik@gmail.com>
>-
>-        Reviewed by Kenneth Russell.
>-
>-        Updating ANGLE in WebKit to r533.
>-        https://bugs.webkit.org/show_bug.cgi?id=47194
>-
>-        * ANGLE.xcodeproj/project.pbxproj:
>-        * include/GLSLANG/ShaderLang.h:
>-        * src/common/debug.cpp:
>-        (gl::trace):
>-        * src/common/debug.h:
>-        * src/compiler/CodeGenGLSL.cpp:
>-        (ConstructCompiler):
>-        * src/compiler/CodeGenHLSL.cpp:
>-        (ConstructCompiler):
>-        * src/compiler/Common.h:
>-        (EncodeSourceLoc):
>-        (DecodeSourceLoc):
>-        * src/compiler/Compiler.cpp: Added.
>-        (TShHandleBase::TShHandleBase):
>-        (TShHandleBase::~TShHandleBase):
>-        (TCompiler::TCompiler):
>-        (TCompiler::~TCompiler):
>-        (TCompiler::Init):
>-        (TCompiler::compile):
>-        (TCompiler::InitBuiltInSymbolTable):
>-        (TCompiler::clearResults):
>-        (TCompiler::validateLimitations):
>-        (TCompiler::collectAttribsUniforms):
>-        * src/compiler/ExtensionBehavior.h: Added.
>-        * src/compiler/InfoSink.cpp:
>-        (TInfoSinkBase::location):
>-        * src/compiler/InfoSink.h:
>-        (TInfoSinkBase::size):
>-        * src/compiler/Initialize.cpp:
>-        (BuiltInFunctionsCommon):
>-        (BuiltInFunctionsVertex):
>-        (BuiltInFunctionsFragment):
>-        (StandardUniforms):
>-        (DefaultPrecisionVertex):
>-        (DefaultPrecisionFragment):
>-        (BuiltInConstants):
>-        (TBuiltIns::initialize):
>-        (IdentifyBuiltIns):
>-        (InitExtensionBehavior):
>-        * src/compiler/Initialize.h:
>-        * src/compiler/IntermTraverse.cpp:
>-        (TIntermLoop::traverse):
>-        * src/compiler/Intermediate.cpp:
>-        (getOperatorString):
>-        (TIntermediate::addBinaryMath):
>-        (TIntermediate::addLoop):
>-        (TIntermediate::postProcess):
>-        (TIntermBinary::promote):
>-        * src/compiler/OutputGLSL.cpp:
>-        (TOutputGLSL::visitUnary):
>-        (TOutputGLSL::visitLoop):
>-        * src/compiler/OutputHLSL.cpp:
>-        (sh::OutputHLSL::OutputHLSL):
>-        (sh::OutputHLSL::header):
>-        (sh::OutputHLSL::visitBinary):
>-        (sh::OutputHLSL::visitUnary):
>-        (sh::OutputHLSL::visitAggregate):
>-        (sh::OutputHLSL::visitLoop):
>-        (sh::OutputHLSL::handleExcessiveLoop):
>-        (sh::OutputHLSL::argumentString):
>-        * src/compiler/OutputHLSL.h:
>-        * src/compiler/ParseHelper.cpp:
>-        (ReportInfo):
>-        (DefineExtensionMacros):
>-        (TParseContext::error):
>-        (TParseContext::warning):
>-        (TParseContext::reservedErrorCheck):
>-        (TParseContext::constructorErrorCheck):
>-        (TParseContext::arrayQualifierErrorCheck):
>-        (TParseContext::extensionErrorCheck):
>-        (TParseContext::areAllChildConst):
>-        (PaParseStrings):
>-        * src/compiler/ParseHelper.h:
>-        (TParseContext::TParseContext):
>-        * src/compiler/PoolAlloc.cpp:
>-        (InitializeGlobalPools):
>-        (FreeGlobalPools):
>-        (SetGlobalPoolAllocator):
>-        (TPoolAllocator::TPoolAllocator):
>-        (TPoolAllocator::~TPoolAllocator):
>-        (TAllocation::checkAllocList):
>-        * src/compiler/PoolAlloc.h:
>-        * src/compiler/SearchSymbol.cpp: Added.
>-        (sh::SearchSymbol::SearchSymbol):
>-        (sh::SearchSymbol::traverse):
>-        (sh::SearchSymbol::visitSymbol):
>-        (sh::SearchSymbol::foundMatch):
>-        * src/compiler/SearchSymbol.h: Added.
>-        * src/compiler/ShHandle.h:
>-        (TCompiler::getAsCompiler):
>-        (TCompiler::getInfoSink):
>-        (TCompiler::getAttribs):
>-        (TCompiler::getUniforms):
>-        (TCompiler::getShaderType):
>-        (TCompiler::getShaderSpec):
>-        * src/compiler/ShaderLang.cpp:
>-        (getVariableMaxLength):
>-        (getVariableInfo):
>-        (ShInitBuiltInResources):
>-        (ShConstructCompiler):
>-        (ShCompile):
>-        (ShGetInfo):
>-        (ShGetInfoLog):
>-        (ShGetObjectCode):
>-        (ShGetActiveAttrib):
>-        (ShGetActiveUniform):
>-        * src/compiler/SymbolTable.cpp:
>-        (TSymbolTableLevel::relateToExtension):
>-        * src/compiler/SymbolTable.h:
>-        (TVariable::shareConstPointer):
>-        (TFunction::relateToExtension):
>-        (TFunction::getExtension):
>-        (TFunction::getParamCount):
>-        (TFunction::getParam):
>-        (TSymbolTable::getGlobalLevel):
>-        (TSymbolTable::relateToOperator):
>-        (TSymbolTable::relateToExtension):
>-        * src/compiler/TranslatorGLSL.cpp:
>-        (writeVersion):
>-        (TranslatorGLSL::TranslatorGLSL):
>-        (TranslatorGLSL::translate):
>-        * src/compiler/TranslatorGLSL.h:
>-        * src/compiler/TranslatorHLSL.cpp:
>-        (TranslatorHLSL::TranslatorHLSL):
>-        (TranslatorHLSL::translate):
>-        * src/compiler/TranslatorHLSL.h:
>-        * src/compiler/Types.h:
>-        (TType::TType):
>-        * src/compiler/UnfoldSelect.cpp:
>-        (sh::UnfoldSelect::visitSelection):
>-        * src/compiler/UnfoldSelect.h:
>-        * src/compiler/ValidateLimitations.cpp: Added.
>-        (ValidateLimitations::ValidateLimitations):
>-        (ValidateLimitations::visitSymbol):
>-        (ValidateLimitations::visitConstantUnion):
>-        (ValidateLimitations::visitBinary):
>-        (ValidateLimitations::visitUnary):
>-        (ValidateLimitations::visitSelection):
>-        (ValidateLimitations::visitAggregate):
>-        (ValidateLimitations::visitLoop):
>-        (ValidateLimitations::visitBranch):
>-        (ValidateLimitations::error):
>-        (ValidateLimitations::withinLoopBody):
>-        (ValidateLimitations::isLoopIndex):
>-        (ValidateLimitations::validateLoopType):
>-        (ValidateLimitations::validateForLoopHeader):
>-        (ValidateLimitations::validateForLoopInit):
>-        (ValidateLimitations::validateForLoopCond):
>-        (ValidateLimitations::validateForLoopExpr):
>-        (ValidateLimitations::validateFunctionCall):
>-        (ValidateLimitations::validateOperation):
>-        (ValidateLimitations::isConstExpr):
>-        (ValidateLimitations::isConstIndexExpr):
>-        (ValidateLimitations::validateIndexing):
>-        * src/compiler/ValidateLimitations.h: Added.
>-        (ValidateLimitations::numErrors):
>-        * src/compiler/VariableInfo.cpp: Added.
>-        (arrayBrackets):
>-        (getVariableDataType):
>-        (getVariableInfo):
>-        (getBuiltInVariableInfo):
>-        (getUserDefinedVariableInfo):
>-        (CollectAttribsUniforms::CollectAttribsUniforms):
>-        (CollectAttribsUniforms::visitSymbol):
>-        (CollectAttribsUniforms::visitConstantUnion):
>-        (CollectAttribsUniforms::visitBinary):
>-        (CollectAttribsUniforms::visitUnary):
>-        (CollectAttribsUniforms::visitSelection):
>-        (CollectAttribsUniforms::visitAggregate):
>-        (CollectAttribsUniforms::visitLoop):
>-        (CollectAttribsUniforms::visitBranch):
>-        * src/compiler/VariableInfo.h: Added.
>-        * src/compiler/VersionGLSL.cpp: Added.
>-        (TVersionGLSL::TVersionGLSL):
>-        (TVersionGLSL::visitSymbol):
>-        (TVersionGLSL::visitConstantUnion):
>-        (TVersionGLSL::visitBinary):
>-        (TVersionGLSL::visitUnary):
>-        (TVersionGLSL::visitSelection):
>-        (TVersionGLSL::visitAggregate):
>-        (TVersionGLSL::visitLoop):
>-        (TVersionGLSL::visitBranch):
>-        (TVersionGLSL::updateVersion):
>-        * src/compiler/VersionGLSL.h: Added.
>-        (TVersionGLSL::getVersion):
>-        * src/compiler/generate_glslang_lexer.sh: Added.
>-        * src/compiler/generate_glslang_parser.sh: Added.
>-        * src/compiler/glslang.h: Added.
>-        * src/compiler/glslang.l:
>-        * src/compiler/glslang.y:
>-        * src/compiler/glslang_lex.cpp: Added.
>-        (yy_get_next_buffer):
>-        (yy_get_previous_state):
>-        (yy_try_NUL_trans):
>-        (input):
>-        (yyrestart):
>-        (yy_switch_to_buffer):
>-        (yy_load_buffer_state):
>-        (yy_create_buffer):
>-        (yy_delete_buffer):
>-        (yy_init_buffer):
>-        (yy_flush_buffer):
>-        (yypush_buffer_state):
>-        (yypop_buffer_state):
>-        (yyensure_buffer_stack):
>-        (yy_scan_buffer):
>-        (yy_scan_string):
>-        (yy_scan_bytes):
>-        (yy_push_state):
>-        (yy_pop_state):
>-        (yy_top_state):
>-        (yy_fatal_error):
>-        (yyget_extra):
>-        (yyget_lineno):
>-        (yyget_column):
>-        (yyget_in):
>-        (yyget_out):
>-        (yyget_leng):
>-        (yyget_text):
>-        (yyset_extra):
>-        (yyset_lineno):
>-        (yyset_column):
>-        (yyset_in):
>-        (yyset_out):
>-        (yyget_debug):
>-        (yyset_debug):
>-        (yyget_lval):
>-        (yyset_lval):
>-        (yylex_init):
>-        (yylex_init_extra):
>-        (yy_init_globals):
>-        (yylex_destroy):
>-        (yy_flex_strncpy):
>-        (yy_flex_strlen):
>-        (yyalloc):
>-        (yyrealloc):
>-        (yyfree):
>-        (string_input):
>-        (check_type):
>-        (reserved_word):
>-        (yyerror):
>-        (glslang_initialize):
>-        (glslang_finalize):
>-        (glslang_scan):
>-        * src/compiler/glslang_tab.cpp: Added.
>-        (yytnamerr):
>-        (yysyntax_error):
>-        (glslang_parse):
>-        * src/compiler/glslang_tab.h: Added.
>-        * src/compiler/intermOut.cpp:
>-        (TOutputTraverser::TOutputTraverser):
>-        (OutputTreeText):
>-        (TOutputTraverser::visitSymbol):
>-        (TOutputTraverser::visitBinary):
>-        (TOutputTraverser::visitUnary):
>-        (TOutputTraverser::visitAggregate):
>-        (TOutputTraverser::visitSelection):
>-        (TOutputTraverser::visitConstantUnion):
>-        (TOutputTraverser::visitLoop):
>-        (TOutputTraverser::visitBranch):
>-        (TIntermediate::outputTree):
>-        * src/compiler/intermediate.h:
>-        (TIntermLoop::TIntermLoop):
>-        (TIntermLoop::getType):
>-        (TIntermLoop::getInit):
>-        (TIntermLoop::getCondition):
>-        (TIntermLoop::getExpression):
>-        (TIntermLoop::getBody):
>-        * src/compiler/localintermediate.h:
>-        * src/compiler/osinclude.h:
>-        (OS_GetTLSValue):
>-        * src/compiler/ossource_nspr.cpp: Added.
>-        (OS_AllocTLSIndex):
>-        (OS_SetTLSValue):
>-        (OS_FreeTLSIndex):
>-        * src/compiler/preprocessor/compile.h:
>-        * src/compiler/preprocessor/cpp.c:
>-        (CPPdefine):
>-        (CPPelse):
>-        (CPPif):
>-        (CPPifdef):
>-        (CPPerror):
>-        (CPPextension):
>-        (readCPPline):
>-        * src/compiler/preprocessor/preprocess.h:
>-        * src/compiler/preprocessor/scanner.c:
>-        (str_getch):
>-        (str_ungetch):
>-        (ScanFromString):
>-        (lFloatConst):
>-        (byte_scan):
>-        (yylex_CPP):
>-        (check_EOF):
>-        * src/compiler/preprocessor/scanner.h:
>-        * src/compiler/preprocessor/tokens.c:
>-        (RecordToken):
>-        (ReadToken):
>-        * src/compiler/tools: Removed.
>-        * src/compiler/unistd.h: Removed.
>-        * src/compiler/util.cpp: Added.
>-        (atof_dot):
>-        * src/compiler/util.h: Added.
>-        * src/libEGL/Config.cpp:
>-        (egl::Config::set):
>-        * src/libEGL/Display.cpp:
>-        (egl::Display::Display):
>-        (egl::Display::initialize):
>-        (egl::Display::terminate):
>-        (egl::Display::createDevice):
>-        (egl::Display::resetDevice):
>-        (egl::Display::createContext):
>-        (egl::Display::destroyContext):
>-        (egl::Display::getMinSwapInterval):
>-        (egl::Display::getMaxSwapInterval):
>-        (egl::Display::getDevice):
>-        (egl::Display::getFloatTextureSupport):
>-        (egl::Display::getHalfFloatTextureSupport):
>-        (egl::Display::getLuminanceTextureSupport):
>-        (egl::Display::getLuminanceAlphaTextureSupport):
>-        (egl::Display::getBufferPool):
>-        (egl::Display::getEventQuerySupport):
>-        (egl::Display::getDefaultPresentParameters):
>-        * src/libEGL/Display.h:
>-        * src/libEGL/Surface.cpp:
>-        (egl::Surface::Surface):
>-        (egl::Surface::~Surface):
>-        (egl::Surface::release):
>-        (egl::Surface::resetSwapChain):
>-        (egl::Surface::writeRecordableFlipState):
>-        (egl::Surface::restoreState):
>-        (egl::SurfaceWindowProc):
>-        (egl::Surface::subclassWindow):
>-        (egl::Surface::unsubclassWindow):
>-        (egl::Surface::checkForOutOfDateSwapChain):
>-        (egl::Surface::convertInterval):
>-        (egl::Surface::swap):
>-        (egl::Surface::getRenderTarget):
>-        (egl::Surface::setSwapInterval):
>-        * src/libEGL/Surface.h:
>-        * src/libEGL/libEGL.cpp:
>-        * src/libGLESv2/Blit.cpp:
>-        (gl::Blit::copySurfaceToTexture):
>-        (gl::Blit::setCommonBlitState):
>-        * src/libGLESv2/Buffer.cpp:
>-        (gl::Buffer::Buffer):
>-        (gl::Buffer::~Buffer):
>-        (gl::Buffer::bufferData):
>-        (gl::Buffer::bufferSubData):
>-        (gl::Buffer::getVertexBuffer):
>-        (gl::Buffer::getIndexBuffer):
>-        (gl::Buffer::invalidateStaticData):
>-        * src/libGLESv2/Buffer.h:
>-        * src/libGLESv2/Context.cpp:
>-        (gl::Context::Context):
>-        (gl::Context::~Context):
>-        (gl::Context::makeCurrent):
>-        (gl::Context::markAllStateDirty):
>-        (gl::Context::setFragmentShaderDerivativeHint):
>-        (gl::Context::setEnableVertexAttribArray):
>-        (gl::Context::getVertexAttribState):
>-        (gl::Context::getVertexAttributes):
>-        (gl::Context::createFence):
>-        (gl::Context::deleteFence):
>-        (gl::Context::bindTexture2D):
>-        (gl::Context::bindTextureCubeMap):
>-        (gl::Context::getFence):
>-        (gl::Context::getTexture2D):
>-        (gl::Context::getTextureCubeMap):
>-        (gl::Context::getSamplerTexture):
>-        (gl::Context::getBooleanv):
>-        (gl::Context::getIntegerv):
>-        (gl::Context::getQueryParameterInfo):
>-        (gl::Context::applyRenderTarget):
>-        (gl::Context::applyState):
>-        (gl::Context::lookupAttributeMapping):
>-        (gl::Context::applyVertexBuffer):
>-        (gl::Context::applyIndexBuffer):
>-        (gl::Context::readPixels):
>-        (gl::Context::clear):
>-        (gl::Context::drawArrays):
>-        (gl::Context::drawElements):
>-        (gl::Context::finish):
>-        (gl::Context::drawClosingLine):
>-        (gl::Context::getMaximumVaryingVectors):
>-        (gl::Context::getMaximumFragmentUniformVectors):
>-        (gl::Context::supportsEventQueries):
>-        (gl::Context::supportsFloatTextures):
>-        (gl::Context::supportsFloatLinearFilter):
>-        (gl::Context::supportsFloatRenderableTextures):
>-        (gl::Context::supportsHalfFloatTextures):
>-        (gl::Context::supportsHalfFloatLinearFilter):
>-        (gl::Context::supportsHalfFloatRenderableTextures):
>-        (gl::Context::getMaximumRenderbufferDimension):
>-        (gl::Context::getMaximumTextureDimension):
>-        (gl::Context::getMaximumCubeTextureDimension):
>-        (gl::Context::getMaximumTextureLevel):
>-        (gl::Context::supportsLuminanceTextures):
>-        (gl::Context::supportsLuminanceAlphaTextures):
>-        (gl::Context::supports32bitIndices):
>-        (gl::Context::getIncompleteTexture):
>-        (gl::Context::setVertexAttrib):
>-        (gl::Context::initExtensionString):
>-        (gl::Context::blitFramebuffer):
>-        * src/libGLESv2/Context.h:
>-        (gl::VertexAttribute::VertexAttribute):
>-        (gl::VertexAttribute::typeSize):
>-        (gl::VertexAttribute::stride):
>-        * src/libGLESv2/Fence.cpp: Added.
>-        (gl::Fence::Fence):
>-        (gl::Fence::~Fence):
>-        (gl::Fence::isFence):
>-        (gl::Fence::setFence):
>-        (gl::Fence::testFence):
>-        (gl::Fence::finishFence):
>-        (gl::Fence::getFenceiv):
>-        * src/libGLESv2/Fence.h: Added.
>-        * src/libGLESv2/Framebuffer.cpp:
>-        (gl::Framebuffer::completeness):
>-        (gl::DefaultFramebuffer::DefaultFramebuffer):
>-        (gl::DefaultFramebuffer::completeness):
>-        * src/libGLESv2/Program.cpp:
>-        (gl::Program::Program):
>-        (gl::Program::getSamplerMapping):
>-        (gl::Program::getUniformLocation):
>-        (gl::Program::setUniform1iv):
>-        (gl::Program::applyUniforms):
>-        (gl::Program::packVaryings):
>-        (gl::Program::linkVaryings):
>-        (gl::Program::link):
>-        (gl::Program::defineUniform):
>-        (gl::Program::createUniform):
>-        (gl::Program::applyUniform1iv):
>-        (gl::Program::resetInfoLog):
>-        (gl::Program::unlink):
>-        (gl::Program::getActiveAttribute):
>-        (gl::Program::getActiveUniform):
>-        (gl::Program::getDxDepthRangeLocation):
>-        * src/libGLESv2/Program.h:
>-        * src/libGLESv2/RefCountObject.cpp:
>-        (gl::RefCountObject::~RefCountObject):
>-        * src/libGLESv2/Renderbuffer.cpp:
>-        (gl::RenderbufferStorage::RenderbufferStorage):
>-        (gl::RenderbufferStorage::isFloatingPoint):
>-        (gl::Colorbuffer::Colorbuffer):
>-        (gl::DepthStencilbuffer::DepthStencilbuffer):
>-        * src/libGLESv2/Renderbuffer.h:
>-        * src/libGLESv2/Shader.cpp:
>-        (gl::Shader::Shader):
>-        (gl::Shader::parseVaryings):
>-        (gl::Shader::compileToHLSL):
>-        (gl::VertexShader::parseAttributes):
>-        * src/libGLESv2/Texture.cpp:
>-        (gl::Texture::Texture):
>-        (gl::Texture::isFloatingPoint):
>-        (gl::Texture::isRenderableFormat):
>-        (gl::Texture::selectFormat):
>-        (gl::Texture::loadImageData):
>-        (gl::Texture::loadAlphaFloatImageData):
>-        (gl::Texture::loadAlphaHalfFloatImageData):
>-        (gl::Texture::loadLuminanceImageData):
>-        (gl::Texture::loadLuminanceFloatImageData):
>-        (gl::Texture::loadLuminanceHalfFloatImageData):
>-        (gl::Texture::loadLuminanceAlphaImageData):
>-        (gl::Texture::loadLuminanceAlphaFloatImageData):
>-        (gl::Texture::loadLuminanceAlphaHalfFloatImageData):
>-        (gl::Texture::loadRGBFloatImageData):
>-        (gl::Texture::loadRGBHalfFloatImageData):
>-        (gl::Texture::loadRGBAFloatImageData):
>-        (gl::Texture::loadRGBAHalfFloatImageData):
>-        (gl::Texture::createSurface):
>-        (gl::Texture::setImage):
>-        (gl::Texture::setCompressedImage):
>-        (gl::Texture::subImage):
>-        (gl::Texture::subImageCompressed):
>-        (gl::Texture::copyNonRenderable):
>-        (gl::Texture::getD3DFormat):
>-        (gl::Texture::isRenderable):
>-        (gl::Texture2D::Texture2D):
>-        (gl::Texture2D::~Texture2D):
>-        (gl::Texture2D::redefineTexture):
>-        (gl::Texture2D::setImage):
>-        (gl::Texture2D::setCompressedImage):
>-        (gl::Texture2D::copyImage):
>-        (gl::Texture2D::copySubImage):
>-        (gl::Texture2D::isComplete):
>-        (gl::Texture2D::createTexture):
>-        (gl::Texture2D::convertToRenderTarget):
>-        (gl::Texture2D::generateMipmaps):
>-        (gl::Texture2D::getColorbuffer):
>-        (gl::Texture2D::getRenderTarget):
>-        (gl::TextureCubeMap::TextureCubeMap):
>-        (gl::TextureCubeMap::~TextureCubeMap):
>-        (gl::TextureCubeMap::subImage):
>-        (gl::TextureCubeMap::subImageCompressed):
>-        (gl::TextureCubeMap::isComplete):
>-        (gl::TextureCubeMap::createTexture):
>-        (gl::TextureCubeMap::convertToRenderTarget):
>-        (gl::TextureCubeMap::redefineTexture):
>-        (gl::TextureCubeMap::copyImage):
>-        (gl::TextureCubeMap::copySubImage):
>-        (gl::TextureCubeMap::generateMipmaps):
>-        (gl::TextureCubeMap::getColorbuffer):
>-        (gl::TextureCubeMap::getRenderTarget):
>-        (gl::Texture::TextureColorbufferProxy::TextureColorbufferProxy):
>-        (gl::Texture::TextureColorbufferProxy::isFloatingPoint):
>-        * src/libGLESv2/Texture.h:
>-        * src/libGLESv2/geometry/IndexDataManager.cpp:
>-        (gl::IndexDataManager::IndexDataManager):
>-        (gl::IndexDataManager::~IndexDataManager):
>-        (gl::convertIndices):
>-        (gl::computeRange):
>-        (gl::IndexDataManager::prepareIndexData):
>-        (gl::IndexDataManager::indexSize):
>-        (gl::IndexDataManager::typeSize):
>-        (gl::IndexBuffer::IndexBuffer):
>-        (gl::IndexBuffer::~IndexBuffer):
>-        (gl::IndexBuffer::getBuffer):
>-        (gl::IndexBuffer::unmap):
>-        (gl::StreamingIndexBuffer::StreamingIndexBuffer):
>-        (gl::StreamingIndexBuffer::~StreamingIndexBuffer):
>-        (gl::StreamingIndexBuffer::map):
>-        (gl::StreamingIndexBuffer::reserveSpace):
>-        (gl::StaticIndexBuffer::StaticIndexBuffer):
>-        (gl::StaticIndexBuffer::~StaticIndexBuffer):
>-        (gl::StaticIndexBuffer::map):
>-        (gl::StaticIndexBuffer::reserveSpace):
>-        (gl::StaticIndexBuffer::lookupType):
>-        (gl::StaticIndexBuffer::lookupRange):
>-        (gl::StaticIndexBuffer::addRange):
>-        * src/libGLESv2/geometry/IndexDataManager.h:
>-        (gl::IndexBuffer::size):
>-        * src/libGLESv2/geometry/VertexDataManager.cpp:
>-        (gl::VertexDataManager::VertexDataManager):
>-        (gl::VertexDataManager::~VertexDataManager):
>-        (gl::VertexDataManager::writeAttributeData):
>-        (gl::VertexDataManager::prepareVertexData):
>-        (gl::VertexDataManager::spaceRequired):
>-        (gl::VertexDataManager::checkVertexCaps):
>-        (gl::VertexDataManager::typeIndex):
>-        (gl::VertexDataManager::setupAttributes):
>-        (gl::VertexBuffer::VertexBuffer):
>-        (gl::VertexBuffer::~VertexBuffer):
>-        (gl::VertexBuffer::unmap):
>-        (gl::VertexBuffer::getBuffer):
>-        (gl::ConstantVertexBuffer::ConstantVertexBuffer):
>-        (gl::ConstantVertexBuffer::~ConstantVertexBuffer):
>-        (gl::ArrayVertexBuffer::ArrayVertexBuffer):
>-        (gl::ArrayVertexBuffer::~ArrayVertexBuffer):
>-        (gl::ArrayVertexBuffer::addRequiredSpace):
>-        (gl::ArrayVertexBuffer::addRequiredSpaceFor):
>-        (gl::StreamingVertexBuffer::StreamingVertexBuffer):
>-        (gl::StreamingVertexBuffer::~StreamingVertexBuffer):
>-        (gl::StreamingVertexBuffer::map):
>-        (gl::StreamingVertexBuffer::reserveRequiredSpace):
>-        (gl::StaticVertexBuffer::StaticVertexBuffer):
>-        (gl::StaticVertexBuffer::~StaticVertexBuffer):
>-        (gl::StaticVertexBuffer::map):
>-        (gl::StaticVertexBuffer::reserveRequiredSpace):
>-        (gl::StaticVertexBuffer::lookupAttribute):
>-        (gl::VertexDataManager::formatConverter):
>-        * src/libGLESv2/geometry/VertexDataManager.h:
>-        (gl::ArrayVertexBuffer::size):
>-        (gl::VertexDataManager::dirtyCurrentValue):
>-        * src/libGLESv2/geometry/backend.cpp: Removed.
>-        * src/libGLESv2/geometry/backend.h: Removed.
>-        * src/libGLESv2/geometry/dx9.cpp: Removed.
>-        * src/libGLESv2/geometry/dx9.h: Removed.
>-        * src/libGLESv2/libGLESv2.cpp:
>-        * src/libGLESv2/libGLESv2.def:
>-        * src/libGLESv2/libGLESv2.vcproj:
>-        * src/libGLESv2/utilities.cpp:
>-        (gl::UniformComponentCount):
>-        (gl::UniformComponentType):
>-        (gl::ComputePixelSize):
>-        (gl::CheckTextureFormatType):
>-        (gl::IsColorRenderable):
>-        (gl::IsDepthRenderable):
>-        (gl::IsStencilRenderable):
>-        (es2dx::GetAlphaSize):
>-        (es2dx::GetRedSize):
>-        (es2dx::GetGreenSize):
>-        (es2dx::GetBlueSize):
>-        (es2dx::GetDepthSize):
>-        (es2dx::ConvertPrimitiveType):
>-        (dx2es::ConvertBackBufferFormat):
>-        (dx2es::ConvertDepthStencilFormat):
>-        * src/libGLESv2/utilities.h:
>-
>-2011-01-17  Dan Bernstein  <mitz@apple.com>
>-
>-        Rubber-stamped by Mark Rowe.
>-
>-        Update xcodeproj svn:ignore to include xcuserdata.
>-
>-        * ANGLE.xcodeproj: Modified property svn:ignore.
>-        * src/build_angle.xcodeproj: Modified property svn:ignore.
>-
>-2010-12-01  Steve Falkenburg  <sfalken@apple.com>
>-
>-        Reviewed by Adam Roben.
>-
>-        vcproj changes can't be applied cleanly by the Windows EWS bot
>-        https://bugs.webkit.org/show_bug.cgi?id=50328
>-
>-        * src/libEGL/libEGL.vcproj: Added property svn:eol-style.
>-        * src/libGLESv2/libGLESv2.vcproj: Added property svn:eol-style.
>-
>-2010-11-03  Darin Adler  <darin@apple.com>
>-
>-        Updated Xcode projects by opening them with Xcode 3.2.4.
>-        Updated svn:ignore for Xcode projects.
>-
>-        * ANGLE.xcodeproj: Added property svn:ignore.
>-        * ANGLE.xcodeproj/project.pbxproj: Updated with Xcode 3.2.4.
>-        * src/build_angle.xcodeproj: Added property svn:ignore.
>-        * src/build_angle.xcodeproj/project.pbxproj: Updated with Xcode 3.2.4.
>-
>-2010-09-01  Zhenyao Mo  <zmo@google.com>
>-
>-        Reviewed by Kenneth Russell.
>-
>-        Roll ANGLE under webkit to r402
>-        https://bugs.webkit.org/show_bug.cgi?id=45004
>-
>-        * ANGLE.xcodeproj/project.pbxproj:
>-        * include/GLES2/gl2ext.h:
>-        * include/GLSLANG/ResourceLimits.h: Removed.
>-        * include/GLSLANG/ShaderLang.h:
>-        * src/compiler/BaseTypes.h:
>-        (getPrecisionString):
>-        (getBasicString):
>-        (IsSampler):
>-        (getQualifierString):
>-        * src/compiler/Initialize.cpp:
>-        (BuiltInConstants):
>-        (IdentifyBuiltIns):
>-        * src/compiler/Initialize.h:
>-        * src/compiler/InitializeDll.cpp:
>-        (InitProcess):
>-        (DetachProcess):
>-        (InitThread):
>-        (DetachThread):
>-        * src/compiler/InitializeDll.h:
>-        * src/compiler/InitializeParseContext.h:
>-        * src/compiler/Intermediate.cpp:
>-        (GetHigherPrecision):
>-        (TIntermediate::addBinaryMath):
>-        (TIntermediate::setAggregateOperator):
>-        (TIntermediate::addComma):
>-        (TIntermediate::postProcess):
>-        (TIntermBinary::promote):
>-        (CompareStruct):
>-        * src/compiler/OutputGLSL.cpp:
>-        (TOutputGLSL::writeFunctionParameters):
>-        (TOutputGLSL::visitUnary):
>-        (TOutputGLSL::visitBranch):
>-        * src/compiler/OutputHLSL.cpp:
>-        (sh::OutputHLSL::header):
>-        (sh::OutputHLSL::visitBinary):
>-        (sh::OutputHLSL::visitAggregate):
>-        (sh::OutputHLSL::handleExcessiveLoop):
>-        (sh::OutputHLSL::addConstructor):
>-        * src/compiler/ParseHelper.cpp:
>-        (TParseContext::constructorErrorCheck):
>-        (TParseContext::samplerErrorCheck):
>-        (TParseContext::paramErrorCheck):
>-        (TParseContext::findFunction):
>-        (TParseContext::executeInitializer):
>-        (TParseContext::addConstructor):
>-        (TParseContext::addConstStruct):
>-        (FreeParseContextIndex):
>-        (GetGlobalParseContext):
>-        * src/compiler/PoolAlloc.h:
>-        (TPoolAllocator::tHeader::tHeader):
>-        (pool_allocator::allocate):
>-        (pool_allocator::deallocate):
>-        * src/compiler/ShaderLang.cpp:
>-        (ShInitialize):
>-        (ShFinalize):
>-        (ShInitBuiltInResource):
>-        * src/compiler/SymbolTable.cpp:
>-        (TType::getStructSize):
>-        * src/compiler/SymbolTable.h:
>-        (TVariable::setQualifier):
>-        * src/compiler/Types.h:
>-        (TType::TType):
>-        (TType::getBasicType):
>-        (TType::setBasicType):
>-        (TType::getPrecision):
>-        (TType::setPrecision):
>-        (TType::getQualifier):
>-        (TType::setQualifier):
>-        (TType::getNominalSize):
>-        (TType::setNominalSize):
>-        (TType::isMatrix):
>-        (TType::setMatrix):
>-        (TType::isArray):
>-        (TType::getArraySize):
>-        (TType::setArraySize):
>-        (TType::getMaxArraySize):
>-        (TType::setMaxArraySize):
>-        (TType::clearArrayness):
>-        (TType::setArrayInformationType):
>-        (TType::getArrayInformationType):
>-        (TType::isVector):
>-        (TType::isScalar):
>-        (TType::setStruct):
>-        (TType::getTypeName):
>-        (TType::setTypeName):
>-        (TType::isField):
>-        (TType::getFieldName):
>-        (TType::setFieldName):
>-        (TType::getBasicString):
>-        (TType::getPrecisionString):
>-        (TType::getQualifierString):
>-        * src/compiler/glslang.l:
>-        * src/compiler/glslang.y:
>-        * src/compiler/intermediate.h:
>-        (TIntermNode::getLine):
>-        (TIntermNode::setLine):
>-        (TIntermTyped::getAsTyped):
>-        (TIntermTyped::setType):
>-        (TIntermTyped::getType):
>-        (TIntermTyped::getTypePointer):
>-        (TIntermTyped::getBasicType):
>-        (TIntermTyped::getQualifier):
>-        (TIntermTyped::getPrecision):
>-        (TIntermTyped::getNominalSize):
>-        (TIntermTyped::isMatrix):
>-        (TIntermTyped::isArray):
>-        (TIntermTyped::isVector):
>-        (TIntermTyped::isScalar):
>-        (TIntermTyped::getBasicString):
>-        (TIntermTyped::getQualifierString):
>-        (TIntermSymbol::getId):
>-        (TIntermSymbol::getSymbol):
>-        (TIntermOperator::setOp):
>-        (TIntermBinary::setLeft):
>-        (TIntermBinary::setRight):
>-        (TIntermBinary::getLeft):
>-        (TIntermBinary::getRight):
>-        (TIntermUnary::setOperand):
>-        (TIntermUnary::getOperand):
>-        (TIntermAggregate::getAsAggregate):
>-        (TIntermAggregate::getSequence):
>-        (TIntermAggregate::setName):
>-        (TIntermAggregate::getName):
>-        (TIntermAggregate::setUserDefined):
>-        (TIntermAggregate::isUserDefined):
>-        (TIntermAggregate::getQualifier):
>-        (TIntermAggregate::setOptimize):
>-        (TIntermAggregate::setDebug):
>-        (TIntermSelection::getCondition):
>-        (TIntermSelection::getTrueBlock):
>-        (TIntermSelection::getFalseBlock):
>-        (TIntermSelection::getAsSelectionNode):
>-        * src/compiler/parseConst.cpp:
>-        (TConstTraverser::TConstTraverser):
>-        * src/compiler/preprocessor/atom.c:
>-        (InitAtomTable):
>-        * src/compiler/preprocessor/atom.h:
>-        * src/compiler/preprocessor/compile.h:
>-        * src/compiler/preprocessor/cpp.c:
>-        * src/compiler/preprocessor/cpp.h:
>-        * src/compiler/preprocessor/cppstruct.c:
>-        * src/compiler/preprocessor/memory.c:
>-        * src/compiler/preprocessor/memory.h:
>-        * src/compiler/preprocessor/parser.h:
>-        * src/compiler/preprocessor/preprocess.h:
>-        * src/compiler/preprocessor/scanner.c:
>-        * src/compiler/preprocessor/scanner.h:
>-        * src/compiler/preprocessor/slglobals.h:
>-        * src/compiler/preprocessor/symbols.c:
>-        (NewSymbol):
>-        * src/compiler/preprocessor/symbols.h:
>-        * src/compiler/preprocessor/tokens.c:
>-        (RecordToken):
>-        * src/compiler/preprocessor/tokens.h:
>-        * src/libEGL/Display.cpp:
>-        (egl::Display::Display):
>-        (egl::Display::initialize):
>-        (egl::Display::terminate):
>-        (egl::Display::createDevice):
>-        (egl::Display::createWindowSurface):
>-        (egl::Display::createContext):
>-        (egl::Display::getMultiSampleSupport):
>-        (egl::Display::getCompressedTextureSupport):
>-        * src/libEGL/Display.h:
>-        * src/libEGL/Surface.cpp:
>-        (egl::Surface::Surface):
>-        (egl::Surface::resetSwapChain):
>-        (egl::Surface::getWindowHandle):
>-        (egl::Surface::writeRecordableFlipState):
>-        (egl::Surface::applyFlipState):
>-        (egl::Surface::releaseRecordedState):
>-        (egl::Surface::checkForWindowResize):
>-        (egl::Surface::swap):
>-        * src/libEGL/Surface.h:
>-        * src/libEGL/libEGL.cpp:
>-        * src/libEGL/libEGL.vcproj:
>-        * src/libGLESv2/Blit.cpp:
>-        (gl::Blit::setVertexShader):
>-        (gl::Blit::setPixelShader):
>-        (gl::Blit::setFormatConvertShaders):
>-        * src/libGLESv2/Buffer.cpp:
>-        (gl::Buffer::Buffer):
>-        * src/libGLESv2/Buffer.h:
>-        * src/libGLESv2/Context.cpp:
>-        (gl::Context::Context):
>-        (gl::Context::~Context):
>-        (gl::Context::makeCurrent):
>-        (gl::Context::markAllStateDirty):
>-        (gl::Context::getReadFramebufferHandle):
>-        (gl::Context::getDrawFramebufferHandle):
>-        (gl::Context::getRenderbufferHandle):
>-        (gl::Context::getArrayBufferHandle):
>-        (gl::Context::setVertexAttribState):
>-        (gl::Context::createBuffer):
>-        (gl::Context::createProgram):
>-        (gl::Context::createShader):
>-        (gl::Context::createTexture):
>-        (gl::Context::createRenderbuffer):
>-        (gl::Context::deleteBuffer):
>-        (gl::Context::deleteShader):
>-        (gl::Context::deleteProgram):
>-        (gl::Context::deleteTexture):
>-        (gl::Context::deleteRenderbuffer):
>-        (gl::Context::getBuffer):
>-        (gl::Context::getShader):
>-        (gl::Context::getProgram):
>-        (gl::Context::getTexture):
>-        (gl::Context::getRenderbuffer):
>-        (gl::Context::getReadFramebuffer):
>-        (gl::Context::getDrawFramebuffer):
>-        (gl::Context::bindArrayBuffer):
>-        (gl::Context::bindElementArrayBuffer):
>-        (gl::Context::bindTexture2D):
>-        (gl::Context::bindTextureCubeMap):
>-        (gl::Context::bindReadFramebuffer):
>-        (gl::Context::bindDrawFramebuffer):
>-        (gl::Context::bindRenderbuffer):
>-        (gl::Context::useProgram):
>-        (gl::Context::setFramebufferZero):
>-        (gl::Context::setRenderbufferStorage):
>-        (gl::Context::getFramebuffer):
>-        (gl::Context::getArrayBuffer):
>-        (gl::Context::getElementArrayBuffer):
>-        (gl::Context::getCurrentProgram):
>-        (gl::Context::getTexture2D):
>-        (gl::Context::getTextureCubeMap):
>-        (gl::Context::getSamplerTexture):
>-        (gl::Context::getFloatv):
>-        (gl::Context::getIntegerv):
>-        (gl::Context::getQueryParameterInfo):
>-        (gl::Context::applyRenderTarget):
>-        (gl::Context::applyState):
>-        (gl::Context::applyIndexBuffer):
>-        (gl::Context::readPixels):
>-        (gl::Context::clear):
>-        (gl::Context::finish):
>-        (gl::Context::flush):
>-        (gl::Context::supportsShaderModel3):
>-        (gl::Context::getMaxSupportedSamples):
>-        (gl::Context::getNearestSupportedSamples):
>-        (gl::Context::supportsCompressedTextures):
>-        (gl::Context::detachBuffer):
>-        (gl::Context::detachTexture):
>-        (gl::Context::detachFramebuffer):
>-        (gl::Context::detachRenderbuffer):
>-        (gl::Context::getIncompleteTexture):
>-        (gl::Context::initExtensionString):
>-        (gl::Context::blitFramebuffer):
>-        * src/libGLESv2/Context.h:
>-        (gl::AttributeState::AttributeState):
>-        * src/libGLESv2/Framebuffer.cpp:
>-        (gl::Framebuffer::Framebuffer):
>-        (gl::Framebuffer::~Framebuffer):
>-        (gl::Framebuffer::lookupRenderbuffer):
>-        (gl::Framebuffer::setColorbuffer):
>-        (gl::Framebuffer::setDepthbuffer):
>-        (gl::Framebuffer::setStencilbuffer):
>-        (gl::Framebuffer::detachTexture):
>-        (gl::Framebuffer::detachRenderbuffer):
>-        (gl::Framebuffer::getRenderTargetSerial):
>-        (gl::Framebuffer::getRenderTarget):
>-        (gl::Framebuffer::getDepthStencil):
>-        (gl::Framebuffer::getDepthbufferSerial):
>-        (gl::Framebuffer::getStencilbufferSerial):
>-        (gl::Framebuffer::getColorbuffer):
>-        (gl::Framebuffer::getDepthbuffer):
>-        (gl::Framebuffer::getStencilbuffer):
>-        (gl::Framebuffer::getColorbufferHandle):
>-        (gl::Framebuffer::getDepthbufferHandle):
>-        (gl::Framebuffer::getStencilbufferHandle):
>-        (gl::Framebuffer::hasStencil):
>-        (gl::Framebuffer::isMultisample):
>-        (gl::Framebuffer::completeness):
>-        (gl::DefaultFramebuffer::DefaultFramebuffer):
>-        (gl::Framebuffer::getSamples):
>-        (gl::DefaultFramebuffer::completeness):
>-        * src/libGLESv2/Framebuffer.h:
>-        * src/libGLESv2/Program.cpp:
>-        (gl::Program::Program):
>-        (gl::Program::~Program):
>-        (gl::Program::attachShader):
>-        (gl::Program::detachShader):
>-        (gl::Program::linkVaryings):
>-        (gl::Program::link):
>-        (gl::Program::unlink):
>-        (gl::Program::release):
>-        (gl::Program::addRef):
>-        (gl::Program::getRefCount):
>-        (gl::Program::getDxViewportLocation):
>-        * src/libGLESv2/Program.h:
>-        * src/libGLESv2/RefCountObject.cpp: Added.
>-        (gl::RefCountObject::RefCountObject):
>-        (gl::RefCountObject::~RefCountObject):
>-        (gl::RefCountObject::addRef):
>-        (gl::RefCountObject::release):
>-        (gl::RefCountObjectBindingPointer::set):
>-        * src/libGLESv2/RefCountObject.h: Added.
>-        (gl::RefCountObject::id):
>-        (gl::RefCountObjectBindingPointer::RefCountObjectBindingPointer):
>-        (gl::RefCountObjectBindingPointer::~RefCountObjectBindingPointer):
>-        (gl::RefCountObjectBindingPointer::get):
>-        (gl::RefCountObjectBindingPointer::id):
>-        (gl::RefCountObjectBindingPointer::operator ! ):
>-        (gl::BindingPointer::set):
>-        (gl::BindingPointer::get):
>-        (gl::BindingPointer::operator -> ):
>-        * src/libGLESv2/Renderbuffer.cpp:
>-        (gl::Renderbuffer::Renderbuffer):
>-        (gl::Renderbuffer::~Renderbuffer):
>-        (gl::Renderbuffer::isColorbuffer):
>-        (gl::Renderbuffer::isDepthbuffer):
>-        (gl::Renderbuffer::isStencilbuffer):
>-        (gl::Renderbuffer::getRenderTarget):
>-        (gl::Renderbuffer::getDepthStencil):
>-        (gl::Renderbuffer::getWidth):
>-        (gl::Renderbuffer::getHeight):
>-        (gl::Renderbuffer::getFormat):
>-        (gl::Renderbuffer::getD3DFormat):
>-        (gl::Renderbuffer::getSerial):
>-        (gl::Renderbuffer::setStorage):
>-        (gl::RenderbufferStorage::RenderbufferStorage):
>-        (gl::RenderbufferStorage::~RenderbufferStorage):
>-        (gl::RenderbufferStorage::isColorbuffer):
>-        (gl::RenderbufferStorage::isDepthbuffer):
>-        (gl::RenderbufferStorage::isStencilbuffer):
>-        (gl::RenderbufferStorage::getRenderTarget):
>-        (gl::RenderbufferStorage::getDepthStencil):
>-        (gl::RenderbufferStorage::getWidth):
>-        (gl::RenderbufferStorage::getHeight):
>-        (gl::RenderbufferStorage::setSize):
>-        (gl::RenderbufferStorage::getFormat):
>-        (gl::RenderbufferStorage::getD3DFormat):
>-        (gl::RenderbufferStorage::getSamples):
>-        (gl::RenderbufferStorage::getSerial):
>-        (gl::RenderbufferStorage::issueSerial):
>-        (gl::Colorbuffer::Colorbuffer):
>-        (gl::Colorbuffer::isColorbuffer):
>-        (gl::Colorbuffer::getRedSize):
>-        (gl::Colorbuffer::getGreenSize):
>-        (gl::Colorbuffer::getBlueSize):
>-        (gl::Colorbuffer::getAlphaSize):
>-        (gl::DepthStencilbuffer::DepthStencilbuffer):
>-        (gl::DepthStencilbuffer::~DepthStencilbuffer):
>-        (gl::DepthStencilbuffer::isDepthbuffer):
>-        (gl::DepthStencilbuffer::isStencilbuffer):
>-        (gl::DepthStencilbuffer::getDepthSize):
>-        (gl::DepthStencilbuffer::getStencilSize):
>-        (gl::DepthStencilbuffer::getDepthStencil):
>-        (gl::Depthbuffer::Depthbuffer):
>-        (gl::Depthbuffer::~Depthbuffer):
>-        (gl::Depthbuffer::isDepthbuffer):
>-        (gl::Depthbuffer::isStencilbuffer):
>-        (gl::Stencilbuffer::Stencilbuffer):
>-        (gl::Stencilbuffer::~Stencilbuffer):
>-        (gl::Stencilbuffer::isDepthbuffer):
>-        (gl::Stencilbuffer::isStencilbuffer):
>-        * src/libGLESv2/Renderbuffer.h:
>-        (gl::Renderbuffer::getStorage):
>-        * src/libGLESv2/ResourceManager.cpp: Added.
>-        (gl::ResourceManager::ResourceManager):
>-        (gl::ResourceManager::~ResourceManager):
>-        (gl::ResourceManager::addRef):
>-        (gl::ResourceManager::release):
>-        (gl::ResourceManager::createBuffer):
>-        (gl::ResourceManager::createShader):
>-        (gl::ResourceManager::createProgram):
>-        (gl::ResourceManager::createTexture):
>-        (gl::ResourceManager::createRenderbuffer):
>-        (gl::ResourceManager::deleteBuffer):
>-        (gl::ResourceManager::deleteShader):
>-        (gl::ResourceManager::deleteProgram):
>-        (gl::ResourceManager::deleteTexture):
>-        (gl::ResourceManager::deleteRenderbuffer):
>-        (gl::ResourceManager::getBuffer):
>-        (gl::ResourceManager::getShader):
>-        (gl::ResourceManager::getTexture):
>-        (gl::ResourceManager::getProgram):
>-        (gl::ResourceManager::getRenderbuffer):
>-        (gl::ResourceManager::setRenderbuffer):
>-        (gl::ResourceManager::checkBufferAllocation):
>-        (gl::ResourceManager::checkTextureAllocation):
>-        (gl::ResourceManager::checkRenderbufferAllocation):
>-        * src/libGLESv2/ResourceManager.h: Added.
>-        * src/libGLESv2/Shader.cpp:
>-        (gl::Shader::Shader):
>-        (gl::Shader::addRef):
>-        (gl::Shader::release):
>-        (gl::Shader::getRefCount):
>-        (gl::Shader::parseVaryings):
>-        (gl::VertexShader::VertexShader):
>-        (gl::FragmentShader::FragmentShader):
>-        * src/libGLESv2/Shader.h:
>-        * src/libGLESv2/Texture.cpp:
>-        (gl::Texture::Image::Image):
>-        (gl::Texture::Texture):
>-        (gl::Texture::getBlitter):
>-        (gl::Texture::selectFormat):
>-        (gl::Texture::loadImageData):
>-        (gl::Texture::loadAlphaImageData):
>-        (gl::Texture::loadLuminanceImageData):
>-        (gl::Texture::loadLuminanceAlphaImageData):
>-        (gl::Texture::loadRGBUByteImageData):
>-        (gl::Texture::loadRGB565ImageData):
>-        (gl::Texture::loadRGBAUByteImageData):
>-        (gl::Texture::loadRGBA4444ImageData):
>-        (gl::Texture::loadRGBA5551ImageData):
>-        (gl::Texture::loadBGRAImageData):
>-        (gl::Texture::createSurface):
>-        (gl::Texture::setImage):
>-        (gl::Texture::setCompressedImage):
>-        (gl::Texture::subImage):
>-        (gl::Texture::subImageCompressed):
>-        (gl::Texture2D::Texture2D):
>-        (gl::Texture2D::getFormat):
>-        (gl::Texture2D::setCompressedImage):
>-        (gl::Texture2D::subImage):
>-        (gl::Texture2D::subImageCompressed):
>-        (gl::Texture2D::copyImage):
>-        (gl::Texture2D::copySubImage):
>-        (gl::Texture2D::isCompressed):
>-        (gl::Texture2D::getColorbuffer):
>-        (gl::TextureCubeMap::TextureCubeMap):
>-        (gl::TextureCubeMap::getFormat):
>-        (gl::TextureCubeMap::setCompressedImage):
>-        (gl::TextureCubeMap::subImage):
>-        (gl::TextureCubeMap::subImageCompressed):
>-        (gl::TextureCubeMap::isCompressed):
>-        (gl::TextureCubeMap::copyImage):
>-        (gl::TextureCubeMap::copySubImage):
>-        (gl::TextureCubeMap::getColorbuffer):
>-        (gl::Texture::TextureColorbufferProxy::addRef):
>-        (gl::Texture::TextureColorbufferProxy::release):
>-        (gl::Texture::TextureColorbufferProxy::getWidth):
>-        (gl::Texture::TextureColorbufferProxy::getHeight):
>-        (gl::Texture::TextureColorbufferProxy::getFormat):
>-        * src/libGLESv2/Texture.h:
>-        * src/libGLESv2/libGLESv2.cpp:
>-        * src/libGLESv2/libGLESv2.def:
>-        * src/libGLESv2/libGLESv2.vcproj:
>-        * src/libGLESv2/main.h:
>-        * src/libGLESv2/utilities.cpp:
>-        (gl::ComputeCompressedPitch):
>-        (gl::ComputeCompressedSize):
>-        (gl::IsCompressed):
>-        (gl::ComputePixelSize):
>-        (gl::CheckTextureFormatType):
>-        (es2dx::ConvertRenderbufferFormat):
>-        (es2dx::GetSamplesFromMultisampleType):
>-        (es2dx::GetMultisampleTypeFromSamples):
>-        * src/libGLESv2/utilities.h:
>-
>-2010-08-17  Chris Marrin  <cmarrin@apple.com>
>-
>-        Unreviewed.
>-
>-        Moved previous link error fix to Base.xcconfig.
>-
>-        * ANGLE.xcodeproj/project.pbxproj:
>-        * Configurations/Base.xcconfig:
>-
>-2010-08-17  Chris Marrin  <cmarrin@apple.com>
>-
>-        Unreviewed.
>-
>-        Got rid of link errors in WebCore.
>-
>-        Changed GCC_INLINES_ARE_PRIVATE_EXTERN to YES and
>-        GCC_SYMBOLS_PRIVATE_EXTERN to NO to match WebCore
>-        flags.
>-
>-        * ANGLE.xcodeproj/project.pbxproj:
>-
>-2010-08-04  Kenneth Russell  <kbr@google.com>
>-
>-        Reviewed by Dimitri Glazkov.
>-
>-        Update ANGLE to r352
>-        https://bugs.webkit.org/show_bug.cgi?id=43500
>-
>-        Updated ANGLE to r352 (July 26, 2010). Built WebKit to test.
>-
>-        * include/GLSLANG/ShaderLang.h:
>-        * src/compiler/Initialize.cpp:
>-        (BuiltInFunctionsCommon):
>-        (BuiltInFunctionsVertex):
>-        (BuiltInFunctionsFragment):
>-        (StandardUniforms):
>-        (DefaultPrecisionVertex):
>-        (DefaultPrecisionFragment):
>-        (BuiltInConstants):
>-        (TBuiltIns::initialize):
>-        (IdentifyBuiltIns):
>-        * src/compiler/Initialize.h:
>-        (TBuiltIns::getBuiltInStrings):
>-        * src/compiler/OutputGLSL.cpp:
>-        (TOutputGLSL::visitSelection):
>-        * src/compiler/ShHandle.h:
>-        (TCompiler::getLanguage):
>-        (TCompiler::getSpec):
>-        (TCompiler::getSymbolTable):
>-        (TCompiler::getInfoSink):
>-        * src/compiler/ShaderLang.cpp:
>-        (InitializeSymbolTable):
>-        (GenerateBuiltInSymbolTable):
>-        (ShInitialize):
>-        (ShConstructCompiler):
>-        (ShFinalize):
>-        (ShCompile):
>-        * src/compiler/SymbolTable.h:
>-        (TSymbolTable::atBuiltInLevel):
>-        (TSymbolTable::atGlobalLevel):
>-        (TSymbolTable::push):
>-        (TSymbolTable::getGlobalLevel):
>-        (TSymbolTable::currentLevel):
>-        * src/libGLESv2/Shader.cpp:
>-        (gl::Shader::Shader):
>-        (gl::Shader::compileToHLSL):
>-
>-2010-08-03  Mark Rowe  <mrowe@apple.com>
>-
>-        Rubber-stamped by Adele Peterson.
>-
>-        Remove some unnecessary files from the ANGLE tree.
>-
>-        * src/compiler/tools/COPYING.bison: Removed.
>-        * src/compiler/tools/COPYING.flex: Removed.
>-        * src/compiler/tools/README: Removed.
>-        * src/compiler/tools/bison.hairy: Removed.
>-        * src/compiler/tools/bison.simple: Removed.
>-
>-2010-08-03  Mark Rowe  <mrowe@apple.com>
>-
>-        Rubber-stamped by Adele Peterson.
>-
>-        Clean up the ANGLE Xcode project.
>-
>-        Main changes include:
>-        â¢ Adding a Production configuration.
>-        â¢ Modifying the library name from libangle.a to libANGLE.a.
>-        â¢ Installing the headers in a subdirectory of /usr/local/include to avoid polluting the top-level directory.
>-        â¢ Generating derived sources in to the built products directory so they're saved along with the symroot.
>-        â¢ Switching to using .xcconfig files for maximum cleanliness.
>-
>-        * ANGLE.xcodeproj/project.pbxproj:
>-        * Configurations/ANGLE.xcconfig: Added.
>-        * Configurations/Base.xcconfig: Added.
>-        * Configurations/DebugRelease.xcconfig: Added.
>-
>-2010-08-02  Paul Sawaya  <psawaya@apple.com>
>-
>-        Reviewed by Adele Peterson.
>-
>-        Add ANGLE library to WebKit. From the repository (http://angleproject.googlecode.com) as of July 22.
>-        https://bugs.webkit.org/show_bug.cgi?id=42789
>-
>diff --git a/Source/ThirdParty/ANGLE/Compiler.cmake b/Source/ThirdParty/ANGLE/Compiler.cmake
>new file mode 100644
>index 00000000000..c3d8f61f44c
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/Compiler.cmake
>@@ -0,0 +1,301 @@
>+# Contains the source file definitions in src/compiler.gn
>+#
>+# This is a direct mapping of ALL values unless otherwise specified. All
>+# declarations are in the same ordering as the original .gn file
>+
>+set(angle_translator_sources
>+    src/compiler/translator/BaseTypes.h
>+    src/compiler/translator/BuiltInFunctionEmulator.cpp
>+    src/compiler/translator/BuiltInFunctionEmulator.h
>+    src/compiler/translator/CallDAG.cpp
>+    src/compiler/translator/CallDAG.h
>+    src/compiler/translator/CodeGen.cpp
>+    src/compiler/translator/CollectVariables.cpp
>+    src/compiler/translator/CollectVariables.h
>+    src/compiler/translator/Common.h
>+    src/compiler/translator/Compiler.cpp
>+    src/compiler/translator/Compiler.h
>+    src/compiler/translator/ConstantUnion.cpp
>+    src/compiler/translator/ConstantUnion.h
>+    src/compiler/translator/Declarator.cpp
>+    src/compiler/translator/Declarator.h
>+    src/compiler/translator/Diagnostics.cpp
>+    src/compiler/translator/Diagnostics.h
>+    src/compiler/translator/DirectiveHandler.cpp
>+    src/compiler/translator/DirectiveHandler.h
>+    src/compiler/translator/ExtensionBehavior.cpp
>+    src/compiler/translator/ExtensionBehavior.h
>+    src/compiler/translator/FlagStd140Structs.cpp
>+    src/compiler/translator/FlagStd140Structs.h
>+    src/compiler/translator/FunctionLookup.cpp
>+    src/compiler/translator/FunctionLookup.h
>+    src/compiler/translator/HashNames.cpp
>+    src/compiler/translator/HashNames.h
>+    src/compiler/translator/ImmutableString.cpp
>+    src/compiler/translator/ImmutableString.h
>+    src/compiler/translator/ImmutableStringBuilder.cpp
>+    src/compiler/translator/ImmutableStringBuilder.h
>+    src/compiler/translator/InfoSink.cpp
>+    src/compiler/translator/InfoSink.h
>+    src/compiler/translator/Initialize.cpp
>+    src/compiler/translator/Initialize.h
>+    src/compiler/translator/InitializeDll.cpp
>+    src/compiler/translator/InitializeDll.h
>+    src/compiler/translator/InitializeGlobals.h
>+    src/compiler/translator/IntermNode.h
>+    src/compiler/translator/IntermNode.cpp
>+    src/compiler/translator/IsASTDepthBelowLimit.cpp
>+    src/compiler/translator/IsASTDepthBelowLimit.h
>+    src/compiler/translator/Operator.cpp
>+    src/compiler/translator/Operator.h
>+    src/compiler/translator/OutputTree.cpp
>+    src/compiler/translator/OutputTree.h
>+    src/compiler/translator/ParseContext.cpp
>+    src/compiler/translator/ParseContext.h
>+    src/compiler/translator/ParseContext_autogen.h
>+    src/compiler/translator/PoolAlloc.cpp
>+    src/compiler/translator/PoolAlloc.h
>+    src/compiler/translator/Pragma.h
>+    src/compiler/translator/QualifierTypes.h
>+    src/compiler/translator/QualifierTypes.cpp
>+    src/compiler/translator/Severity.h
>+    src/compiler/translator/ShaderLang.cpp
>+    src/compiler/translator/ShaderVars.cpp
>+    src/compiler/translator/StaticType.h
>+    src/compiler/translator/Symbol.cpp
>+    src/compiler/translator/Symbol.h
>+    src/compiler/translator/SymbolTable.cpp
>+    src/compiler/translator/SymbolTable.h
>+    src/compiler/translator/SymbolTable_autogen.cpp
>+    src/compiler/translator/SymbolTable_autogen.h
>+    src/compiler/translator/SymbolUniqueId.cpp
>+    src/compiler/translator/SymbolUniqueId.h
>+    src/compiler/translator/Types.cpp
>+    src/compiler/translator/Types.h
>+    src/compiler/translator/ValidateAST.cpp
>+    src/compiler/translator/ValidateAST.h
>+    src/compiler/translator/ValidateGlobalInitializer.cpp
>+    src/compiler/translator/ValidateGlobalInitializer.h
>+    src/compiler/translator/ValidateLimitations.cpp
>+    src/compiler/translator/ValidateLimitations.h
>+    src/compiler/translator/ValidateMaxParameters.h
>+    src/compiler/translator/ValidateMaxParameters.cpp
>+    src/compiler/translator/ValidateOutputs.cpp
>+    src/compiler/translator/ValidateOutputs.h
>+    src/compiler/translator/ValidateSwitch.cpp
>+    src/compiler/translator/ValidateSwitch.h
>+    src/compiler/translator/ValidateVaryingLocations.cpp
>+    src/compiler/translator/ValidateVaryingLocations.h
>+    src/compiler/translator/VariablePacker.cpp
>+    src/compiler/translator/VariablePacker.h
>+    src/compiler/translator/blocklayout.cpp
>+    src/compiler/translator/blocklayout.h
>+    src/compiler/translator/glslang.h
>+    src/compiler/translator/glslang.l
>+    src/compiler/translator/glslang.y
>+    src/compiler/translator/glslang_lex.cpp
>+    src/compiler/translator/glslang_tab.cpp
>+    src/compiler/translator/glslang_tab.h
>+    src/compiler/translator/length_limits.h
>+    src/compiler/translator/util.cpp
>+    src/compiler/translator/util.h
>+    src/compiler/translator/tree_ops/AddAndTrueToLoopCondition.cpp
>+    src/compiler/translator/tree_ops/AddAndTrueToLoopCondition.h
>+    src/compiler/translator/tree_ops/BreakVariableAliasingInInnerLoops.cpp
>+    src/compiler/translator/tree_ops/BreakVariableAliasingInInnerLoops.h
>+    src/compiler/translator/tree_ops/ClampFragDepth.cpp
>+    src/compiler/translator/tree_ops/ClampFragDepth.h
>+    src/compiler/translator/tree_ops/ClampPointSize.cpp
>+    src/compiler/translator/tree_ops/ClampPointSize.h
>+    src/compiler/translator/tree_ops/DeclareAndInitBuiltinsForInstancedMultiview.h
>+    src/compiler/translator/tree_ops/DeclareAndInitBuiltinsForInstancedMultiview.cpp
>+    src/compiler/translator/tree_ops/DeferGlobalInitializers.cpp
>+    src/compiler/translator/tree_ops/DeferGlobalInitializers.h
>+    src/compiler/translator/tree_ops/EmulateGLDrawID.cpp
>+    src/compiler/translator/tree_ops/EmulateGLDrawID.h
>+    src/compiler/translator/tree_ops/EmulateGLFragColorBroadcast.cpp
>+    src/compiler/translator/tree_ops/EmulateGLFragColorBroadcast.h
>+    src/compiler/translator/tree_ops/EmulatePrecision.cpp
>+    src/compiler/translator/tree_ops/EmulatePrecision.h
>+    src/compiler/translator/tree_ops/ExpandIntegerPowExpressions.cpp
>+    src/compiler/translator/tree_ops/ExpandIntegerPowExpressions.h
>+    src/compiler/translator/tree_ops/FoldExpressions.cpp
>+    src/compiler/translator/tree_ops/FoldExpressions.h
>+    src/compiler/translator/tree_ops/InitializeVariables.cpp
>+    src/compiler/translator/tree_ops/InitializeVariables.h
>+    src/compiler/translator/tree_ops/NameEmbeddedUniformStructs.cpp
>+    src/compiler/translator/tree_ops/NameEmbeddedUniformStructs.h
>+    src/compiler/translator/tree_ops/PruneEmptyCases.cpp
>+    src/compiler/translator/tree_ops/PruneEmptyCases.h
>+    src/compiler/translator/tree_ops/PruneNoOps.cpp
>+    src/compiler/translator/tree_ops/PruneNoOps.h
>+    src/compiler/translator/tree_ops/RecordConstantPrecision.cpp
>+    src/compiler/translator/tree_ops/RecordConstantPrecision.h
>+    src/compiler/translator/tree_ops/RegenerateStructNames.cpp
>+    src/compiler/translator/tree_ops/RegenerateStructNames.h
>+    src/compiler/translator/tree_ops/RemoveArrayLengthMethod.cpp
>+    src/compiler/translator/tree_ops/RemoveArrayLengthMethod.h
>+    src/compiler/translator/tree_ops/RemoveInvariantDeclaration.cpp
>+    src/compiler/translator/tree_ops/RemoveInvariantDeclaration.h
>+    src/compiler/translator/tree_ops/RemovePow.cpp
>+    src/compiler/translator/tree_ops/RemovePow.h
>+    src/compiler/translator/tree_ops/RemoveUnreferencedVariables.cpp
>+    src/compiler/translator/tree_ops/RemoveUnreferencedVariables.h
>+    src/compiler/translator/tree_ops/RewriteAtomicFunctionExpressions.cpp
>+    src/compiler/translator/tree_ops/RewriteAtomicFunctionExpressions.h
>+    src/compiler/translator/tree_ops/RewriteDoWhile.cpp
>+    src/compiler/translator/tree_ops/RewriteDoWhile.h
>+    src/compiler/translator/tree_ops/RewriteExpressionsWithShaderStorageBlock.cpp
>+    src/compiler/translator/tree_ops/RewriteExpressionsWithShaderStorageBlock.h
>+    src/compiler/translator/tree_ops/RewriteStructSamplers.cpp
>+    src/compiler/translator/tree_ops/RewriteStructSamplers.h
>+    src/compiler/translator/tree_ops/RewriteRepeatedAssignToSwizzled.cpp
>+    src/compiler/translator/tree_ops/RewriteRepeatedAssignToSwizzled.h
>+    src/compiler/translator/tree_ops/RewriteTexelFetchOffset.cpp
>+    src/compiler/translator/tree_ops/RewriteTexelFetchOffset.h
>+    src/compiler/translator/tree_ops/RewriteUnaryMinusOperatorFloat.cpp
>+    src/compiler/translator/tree_ops/RewriteUnaryMinusOperatorFloat.h
>+    src/compiler/translator/tree_ops/RewriteUnaryMinusOperatorInt.cpp
>+    src/compiler/translator/tree_ops/RewriteUnaryMinusOperatorInt.h
>+    src/compiler/translator/tree_ops/ScalarizeVecAndMatConstructorArgs.cpp
>+    src/compiler/translator/tree_ops/ScalarizeVecAndMatConstructorArgs.h
>+    src/compiler/translator/tree_ops/SeparateDeclarations.cpp
>+    src/compiler/translator/tree_ops/SeparateDeclarations.h
>+    src/compiler/translator/tree_ops/SimplifyLoopConditions.cpp
>+    src/compiler/translator/tree_ops/SimplifyLoopConditions.h
>+    src/compiler/translator/tree_ops/SplitSequenceOperator.cpp
>+    src/compiler/translator/tree_ops/SplitSequenceOperator.h
>+    src/compiler/translator/tree_ops/UnfoldShortCircuitAST.cpp
>+    src/compiler/translator/tree_ops/UnfoldShortCircuitAST.h
>+    src/compiler/translator/tree_ops/UseInterfaceBlockFields.cpp
>+    src/compiler/translator/tree_ops/UseInterfaceBlockFields.h
>+    src/compiler/translator/tree_ops/VectorizeVectorScalarArithmetic.cpp
>+    src/compiler/translator/tree_ops/VectorizeVectorScalarArithmetic.h
>+    src/compiler/translator/tree_util/BuiltIn_autogen.h
>+    src/compiler/translator/tree_util/FindMain.cpp
>+    src/compiler/translator/tree_util/FindMain.h
>+    src/compiler/translator/tree_util/FindSymbolNode.cpp
>+    src/compiler/translator/tree_util/FindSymbolNode.h
>+    src/compiler/translator/tree_util/IntermNodePatternMatcher.cpp
>+    src/compiler/translator/tree_util/IntermNodePatternMatcher.h
>+    src/compiler/translator/tree_util/IntermNode_util.cpp
>+    src/compiler/translator/tree_util/IntermNode_util.h
>+    src/compiler/translator/tree_util/IntermTraverse.cpp
>+    src/compiler/translator/tree_util/IntermTraverse.h
>+    src/compiler/translator/tree_util/NodeSearch.h
>+    src/compiler/translator/tree_util/ReplaceVariable.cpp
>+    src/compiler/translator/tree_util/ReplaceVariable.h
>+    src/compiler/translator/tree_util/RunAtTheEndOfShader.cpp
>+    src/compiler/translator/tree_util/RunAtTheEndOfShader.h
>+    src/compiler/translator/tree_util/Visit.h
>+    src/third_party/compiler/ArrayBoundsClamper.cpp
>+    src/third_party/compiler/ArrayBoundsClamper.h
>+)
>+
>+set(angle_translator_essl_sources
>+    src/compiler/translator/OutputESSL.cpp
>+    src/compiler/translator/OutputESSL.h
>+    src/compiler/translator/TranslatorESSL.cpp
>+    src/compiler/translator/TranslatorESSL.h
>+)
>+
>+set(angle_translator_glsl_sources
>+    src/compiler/translator/BuiltInFunctionEmulatorGLSL.cpp
>+    src/compiler/translator/BuiltInFunctionEmulatorGLSL.h
>+    src/compiler/translator/ExtensionGLSL.cpp
>+    src/compiler/translator/ExtensionGLSL.h
>+    src/compiler/translator/OutputGLSL.cpp
>+    src/compiler/translator/OutputGLSL.h
>+    src/compiler/translator/OutputGLSLBase.cpp
>+    src/compiler/translator/OutputGLSLBase.h
>+    src/compiler/translator/TranslatorGLSL.cpp
>+    src/compiler/translator/TranslatorGLSL.h
>+    src/compiler/translator/VersionGLSL.cpp
>+    src/compiler/translator/VersionGLSL.h
>+)
>+
>+set(angle_translator_hlsl_sources
>+    src/compiler/translator/ASTMetadataHLSL.cpp
>+    src/compiler/translator/ASTMetadataHLSL.h
>+    src/compiler/translator/AtomicCounterFunctionHLSL.cpp
>+    src/compiler/translator/AtomicCounterFunctionHLSL.h
>+    src/compiler/translator/blocklayoutHLSL.cpp
>+    src/compiler/translator/blocklayoutHLSL.h
>+    src/compiler/translator/BuiltInFunctionEmulatorHLSL.cpp
>+    src/compiler/translator/BuiltInFunctionEmulatorHLSL.h
>+    src/compiler/translator/OutputHLSL.cpp
>+    src/compiler/translator/OutputHLSL.h
>+    src/compiler/translator/ResourcesHLSL.cpp
>+    src/compiler/translator/ResourcesHLSL.h
>+    src/compiler/translator/ShaderStorageBlockFunctionHLSL.cpp
>+    src/compiler/translator/ShaderStorageBlockFunctionHLSL.h
>+    src/compiler/translator/ShaderStorageBlockOutputHLSL.cpp
>+    src/compiler/translator/ShaderStorageBlockOutputHLSL.h
>+    src/compiler/translator/StructureHLSL.cpp
>+    src/compiler/translator/StructureHLSL.h
>+    src/compiler/translator/TextureFunctionHLSL.cpp
>+    src/compiler/translator/TextureFunctionHLSL.h
>+    src/compiler/translator/ImageFunctionHLSL.cpp
>+    src/compiler/translator/ImageFunctionHLSL.h
>+    src/compiler/translator/TranslatorHLSL.cpp
>+    src/compiler/translator/TranslatorHLSL.h
>+    src/compiler/translator/UtilsHLSL.cpp
>+    src/compiler/translator/UtilsHLSL.h
>+    src/compiler/translator/emulated_builtin_functions_hlsl_autogen.cpp
>+    src/compiler/translator/tree_ops/AddDefaultReturnStatements.cpp
>+    src/compiler/translator/tree_ops/AddDefaultReturnStatements.h
>+    src/compiler/translator/tree_ops/ArrayReturnValueToOutParameter.cpp
>+    src/compiler/translator/tree_ops/ArrayReturnValueToOutParameter.h
>+    src/compiler/translator/tree_ops/RemoveDynamicIndexing.cpp
>+    src/compiler/translator/tree_ops/RemoveDynamicIndexing.h
>+    src/compiler/translator/tree_ops/RemoveSwitchFallThrough.cpp
>+    src/compiler/translator/tree_ops/RemoveSwitchFallThrough.h
>+    src/compiler/translator/tree_ops/RewriteElseBlocks.cpp
>+    src/compiler/translator/tree_ops/RewriteElseBlocks.h
>+    src/compiler/translator/tree_ops/SeparateArrayConstructorStatements.cpp
>+    src/compiler/translator/tree_ops/SeparateArrayConstructorStatements.h
>+    src/compiler/translator/tree_ops/SeparateArrayInitialization.cpp
>+    src/compiler/translator/tree_ops/SeparateArrayInitialization.h
>+    src/compiler/translator/tree_ops/SeparateExpressionsReturningArrays.cpp
>+    src/compiler/translator/tree_ops/SeparateExpressionsReturningArrays.h
>+    src/compiler/translator/tree_ops/UnfoldShortCircuitToIf.cpp
>+    src/compiler/translator/tree_ops/UnfoldShortCircuitToIf.h
>+    src/compiler/translator/tree_ops/WrapSwitchStatementsInBlocks.cpp
>+    src/compiler/translator/tree_ops/WrapSwitchStatementsInBlocks.h
>+)
>+
>+set(angle_translator_lib_vulkan_sources
>+    src/compiler/translator/OutputVulkanGLSL.cpp
>+    src/compiler/translator/OutputVulkanGLSL.h
>+    src/compiler/translator/TranslatorVulkan.cpp
>+    src/compiler/translator/TranslatorVulkan.h
>+)
>+
>+set(angle_preprocessor_sources
>+    src/compiler/preprocessor/DiagnosticsBase.cpp
>+    src/compiler/preprocessor/DiagnosticsBase.h
>+    src/compiler/preprocessor/DirectiveHandlerBase.cpp
>+    src/compiler/preprocessor/DirectiveHandlerBase.h
>+    src/compiler/preprocessor/DirectiveParser.cpp
>+    src/compiler/preprocessor/DirectiveParser.h
>+    src/compiler/preprocessor/ExpressionParser.cpp
>+    src/compiler/preprocessor/ExpressionParser.h
>+    src/compiler/preprocessor/ExpressionParser.y
>+    src/compiler/preprocessor/Input.cpp
>+    src/compiler/preprocessor/Input.h
>+    src/compiler/preprocessor/Lexer.cpp
>+    src/compiler/preprocessor/Lexer.h
>+    src/compiler/preprocessor/Macro.cpp
>+    src/compiler/preprocessor/Macro.h
>+    src/compiler/preprocessor/MacroExpander.cpp
>+    src/compiler/preprocessor/MacroExpander.h
>+    src/compiler/preprocessor/Preprocessor.cpp
>+    src/compiler/preprocessor/Preprocessor.h
>+    src/compiler/preprocessor/SourceLocation.h
>+    src/compiler/preprocessor/Token.cpp
>+    src/compiler/preprocessor/Token.h
>+    src/compiler/preprocessor/Tokenizer.cpp
>+    src/compiler/preprocessor/Tokenizer.h
>+    src/compiler/preprocessor/Tokenizer.l
>+    src/compiler/preprocessor/numeric_lex.h
>+)
>diff --git a/Source/ThirdParty/ANGLE/DEPS b/Source/ThirdParty/ANGLE/DEPS
>index 36e64adf52e..6bb57674db3 100644
>--- a/Source/ThirdParty/ANGLE/DEPS
>+++ b/Source/ThirdParty/ANGLE/DEPS
>@@ -1,52 +1,192 @@
> vars = {
>   'android_git': 'https://android.googlesource.com',
>   'chromium_git': 'https://chromium.googlesource.com',
>+
>+  # This variable is set on the Chrome infra for compatiblity with gclient.
>+  'angle_root': '.',
>+
>+  # This variable is overrided in Chromium's DEPS file.
>+  'build_with_chromium': False,
>+
>+  # Current revision of dEQP.
>+  'deqp_revision': '66a49e0a43f7af654ee1de8a3b1bcaf6c0d14aa4',
>+
>+  # Current revision of glslang, the Khronos SPIRV compiler.
>+  'glslang_revision': '86c72c9486a97da534f97e56b8f7ae06cd1b580b',
>+
>+  # Current revision fo the SPIRV-Headers Vulkan support library.
>+  'spirv_headers_revision': '2434b89345a50c018c84f42a310b0fad4f3fd94f',
>+
>+  # Current revision of SPIRV-Tools for Vulkan.
>+  'spirv_tools_revision': 'c8b09744c6a15f3586c26351376bf5c6f656e89f',
>+
>+  # Current revision of Khronos Vulkan-Headers.
>+  'vulkan_headers_revision': '982f0f84dccf6f281b48318c77261a9028000126',
>+
>+  # Current revision of Khronos Vulkan-Loader.
>+  'vulkan_loader_revision': '2f0abfcf9eb04018e6e92125a70bc28665aa17fe',
>+
>+  # Current revision of Khronos Vulkan-Tools.
>+  'vulkan_tools_revision': 'f392e71b994036c92b896c2a62cc63d042b7f9b1',
>+
>+  # Current revision of Khronos Vulkan-ValidationLayers.
>+  'vulkan_validation_revision': 'ff80a937c8a505abbdddb95d8ffaa446820c8391',
> }
> 
> deps = {
> 
>-  'build':
>-    Var('chromium_git') + '/chromium/src/build.git' + '@' + '8a1537f019e55807420ae76c62e4ce8f56fedca1',
>+  '{angle_root}/build': {
>+    'url': '{chromium_git}/chromium/src/build.git@54ea0e7fd122348de2f73ac21d1b6eafb9b78969',
>+    'condition': 'not build_with_chromium',
>+  },
> 
>-  'buildtools':
>-    Var('chromium_git') + '/chromium/buildtools.git' + '@' + '461b345a815c1c745ac0534a6a4bd52d123abe68',
>+  '{angle_root}/buildtools': {
>+    'url': '{chromium_git}/chromium/src/buildtools.git@d5c58b84d50d256968271db459cd29b22bff1ba2',
>+    'condition': 'not build_with_chromium',
>+  },
> 
>-  'testing':
>-    Var('chromium_git') + '/chromium/src/testing' + '@' + '6dfa36ab2e5143fa2f7353e3af5d2935af2e61f7',
>+  '{angle_root}/testing': {
>+    'url': '{chromium_git}/chromium/src/testing@32e614b7ec7b2b741351c1b8470aaf30c2f532fa',
>+    'condition': 'not build_with_chromium',
>+  },
> 
>   # Cherry is a dEQP management GUI written in Go. We use it for viewing test results.
>-  'third_party/cherry':
>-    Var('android_git') + '/platform/external/cherry' + '@' + '4f8fb08d33ca5ff05a1c638f04c85bbb8d8b52cc',
>+  '{angle_root}/third_party/cherry': {
>+    'url': '{android_git}/platform/external/cherry@4f8fb08d33ca5ff05a1c638f04c85bbb8d8b52cc',
>+    'condition': 'not build_with_chromium',
>+  },
>+
>+  '{angle_root}/third_party/deqp/src': {
>+    'url': '{chromium_git}/external/deqp@{deqp_revision}',
>+  },
>+
>+  '{angle_root}/third_party/fuchsia-sdk': {
>+    'url': '{chromium_git}/chromium/src/third_party/fuchsia-sdk.git@8e8db13b538ecb251e5ce9d5c781fc142f9752fd',
>+    'condition': 'checkout_fuchsia and not build_with_chromium',
>+  },
> 
>-  'third_party/deqp/src':
>-    Var('android_git') + '/platform/external/deqp' + '@' + '455d82c60b096e7bd83b6a2f5ed70c61e4bfa759',
>+  # glmark2 is a GPL3-licensed OpenGL ES 2.0 benchmark. We use it for testing.
>+  '{angle_root}/third_party/glmark2/src': {
>+    'url': '{chromium_git}/external/github.com/glmark2/glmark2@c4b3ff5a481348e8bdc2b71ee275864db91e40b1',
>+  },
> 
>-  'third_party/glslang-angle/src':
>-    Var('android_git') + '/platform/external/shaderc/glslang' + '@' + '1e275c8486325aaab34734ad9a650c0121c5efdb',
>+  '{angle_root}/third_party/glslang/src': {
>+    'url': '{chromium_git}/external/github.com/KhronosGroup/glslang@{glslang_revision}',
>+    'condition': 'not build_with_chromium',
>+  },
> 
>-  'third_party/googletest/src':
>-    Var('chromium_git') + '/external/github.com/google/googletest.git' + '@' + 'd175c8bf823e709d570772b038757fadf63bc632',
>+  '{angle_root}/third_party/googletest': {
>+    'url': '{chromium_git}/chromium/src/third_party/googletest@d5024103c8a8977156ee800eb1c84d92dffe9fdf',
>+    'condition': 'not build_with_chromium',
>+  },
> 
>-  'third_party/libpng/src':
>-    Var('android_git') + '/platform/external/libpng' + '@' + '094e181e79a3d6c23fd005679025058b7df1ad6c',
>+  '{angle_root}/third_party/googletest/src': {
>+    'url': '{chromium_git}/external/github.com/google/googletest.git@9997a830ee5589c2da79198bc3b60d1c47e50118',
>+    'condition': 'not build_with_chromium',
>+  },
> 
>-  'third_party/spirv-headers/src':
>-    Var('android_git') + '/platform/external/shaderc/spirv-headers' + '@' + 'c470b68225a04965bf87d35e143ae92f831e8110',
>+  # libjpeg_turbo is used by glmark2.
>+  '{angle_root}/third_party/libjpeg_turbo': {
>+    'url': '{chromium_git}/chromium/deps/libjpeg_turbo@6dcdade8828297e306cabfdae80f3510f3f3eea2',
>+    'condition': 'not build_with_chromium',
>+  },
> 
>-  'third_party/spirv-tools-angle/src':
>-    Var('android_git') + '/platform/external/shaderc/spirv-tools' + '@' + '68c5f0436f1d4f1f137e608780190865d0b193ca',
>+  '{angle_root}/third_party/libpng/src': {
>+    'url': '{android_git}/platform/external/libpng@094e181e79a3d6c23fd005679025058b7df1ad6c',
>+    'condition': 'not build_with_chromium',
>+  },
> 
>-  'third_party/vulkan-validation-layers/src':
>-    Var('android_git') + '/platform/external/vulkan-validation-layers' + '@' + 'f47c534fee2f26f6b783209d56e0ade48e30eb8d',
>+  '{angle_root}/third_party/jsoncpp': {
>+    'url': '{chromium_git}/chromium/src/third_party/jsoncpp@fd0ac8ce63a47e99b71a58f1489136fbb19c9137',
>+    'condition': 'not build_with_chromium',
>+   },
> 
>-  'third_party/zlib':
>-    Var('chromium_git') + '/chromium/src/third_party/zlib' + '@' + '24ab14872e8e068ba08cc31cc3d43bcc6d5cb832',
>+  '{angle_root}/third_party/jsoncpp/source': {
>+    'url' : '{chromium_git}/external/github.com/open-source-parsers/jsoncpp@f572e8e42e22cfcf5ab0aea26574f408943edfa4',
>+    'condition': 'not build_with_chromium',
>+   },
> 
>-  'tools/clang':
>-    Var('chromium_git') + '/chromium/src/tools/clang.git' + '@' + 'e70074db10b27867e6c873adc3ac7e5f9ee0ff6e',
>+  '{angle_root}/third_party/Python-Markdown': {
>+    'url': '{chromium_git}/chromium/src/third_party/Python-Markdown@b08af21eb795e522e1b972cb85bff59edb1ae209',
>+    'condition': 'not build_with_chromium',
>+  },
>+
>+  '{angle_root}/third_party/qemu-linux-x64': {
>+      'packages': [
>+          {
>+              'package': 'fuchsia/qemu/linux-amd64',
>+              'version': '9cc486c5b18a0be515c39a280ca9a309c54cf994'
>+          },
>+      ],
>+      'condition': 'not build_with_chromium and (host_os == "linux" and checkout_fuchsia)',
>+      'dep_type': 'cipd',
>+  },
>+
>+  '{angle_root}/third_party/qemu-mac-x64': {
>+      'packages': [
>+          {
>+              'package': 'fuchsia/qemu/mac-amd64',
>+              'version': '2d3358ae9a569b2d4a474f498b32b202a152134f'
>+          },
>+      ],
>+      'condition': 'not build_with_chromium and (host_os == "mac" and checkout_fuchsia)',
>+      'dep_type': 'cipd',
>+  },
>+
>+  '{angle_root}/third_party/rapidjson/src': {
>+    'url': '{chromium_git}/external/github.com/Tencent/rapidjson@7484e06c589873e1ed80382d262087e4fa80fb63',
>+  },
>+
>+  '{angle_root}/third_party/spirv-headers/src': {
>+    'url': '{chromium_git}/external/github.com/KhronosGroup/SPIRV-Headers@{spirv_headers_revision}',
>+    'condition': 'not build_with_chromium',
>+  },
>+
>+  '{angle_root}/third_party/spirv-tools/src': {
>+    'url': '{chromium_git}/external/github.com/KhronosGroup/SPIRV-Tools@{spirv_tools_revision}',
>+    'condition': 'not build_with_chromium',
>+  },
>+
>+  '{angle_root}/third_party/vulkan-headers/src': {
>+    'url': '{chromium_git}/external/github.com/KhronosGroup/Vulkan-Headers@{vulkan_headers_revision}',
>+  },
>+
>+  '{angle_root}/third_party/vulkan-loader/src': {
>+    'url': '{chromium_git}/external/github.com/KhronosGroup/Vulkan-Loader@{vulkan_loader_revision}',
>+  },
>+
>+  '{angle_root}/third_party/vulkan-tools/src': {
>+    'url': '{chromium_git}/external/github.com/KhronosGroup/Vulkan-Tools@{vulkan_tools_revision}',
>+  },
>+
>+  '{angle_root}/third_party/vulkan-validation-layers/src': {
>+    'url': '{chromium_git}/external/github.com/KhronosGroup/Vulkan-ValidationLayers@{vulkan_validation_revision}',
>+  },
>+
>+  '{angle_root}/third_party/yasm': {
>+    'url': '{chromium_git}/chromium/src/third_party/yasm@86b6058141a42aed51bbd8bb9f9d54d199d9dbd0',
>+    'condition': 'not build_with_chromium',
>+  },
>+
>+  '{angle_root}/third_party/yasm/source/patched-yasm': {
>+    'url': '{chromium_git}/chromium/deps/yasm/patched-yasm.git@720b70524a4424b15fc57e82263568c8ba0496ad',
>+    'condition': 'not build_with_chromium',
>+  },
> 
>-  'tools/gyp':
>-    Var('chromium_git') + '/external/gyp' + '@' + '5e2b3ddde7cda5eb6bc09a5546a76b00e49d888f',
>+  '{angle_root}/third_party/zlib': {
>+    'url': '{chromium_git}/chromium/src/third_party/zlib@f95aeb0fa7f136ef4a457a6d9ba6f3c2701a444b',
>+    'condition': 'not build_with_chromium',
>+  },
>+
>+  '{angle_root}/tools/clang': {
>+    'url': '{chromium_git}/chromium/src/tools/clang.git@210f1dc3ebf8504ae246d925e9110ec427eef43f',
>+    'condition': 'not build_with_chromium',
>+  },
>+
>+  '{angle_root}/tools/md_browser': {
>+    'url': '{chromium_git}/chromium/src/tools/md_browser@e9462696241f3ca832890473173e03e7bcfe6adc',
>+    'condition': 'not build_with_chromium',
>+  },
> }
> 
> hooks = [
>@@ -54,104 +194,138 @@ hooks = [
>   {
>     'name': 'clang_format_win',
>     'pattern': '.',
>-    'condition': 'host_os == "win"',
>+    'condition': 'host_os == "win" and not build_with_chromium',
>     'action': [ 'download_from_google_storage',
>                 '--no_resume',
>                 '--platform=win32',
>                 '--no_auth',
>                 '--bucket', 'chromium-clang-format',
>-                '-s', 'buildtools/win/clang-format.exe.sha1',
>+                '-s', '{angle_root}/buildtools/win/clang-format.exe.sha1',
>     ],
>   },
>   {
>     'name': 'clang_format_mac',
>     'pattern': '.',
>-    'condition': 'host_os == "mac"',
>+    'condition': 'host_os == "mac" and not build_with_chromium',
>     'action': [ 'download_from_google_storage',
>                 '--no_resume',
>                 '--platform=darwin',
>                 '--no_auth',
>                 '--bucket', 'chromium-clang-format',
>-                '-s', 'buildtools/mac/clang-format.sha1',
>+                '-s', '{angle_root}/buildtools/mac/clang-format.sha1',
>     ],
>   },
>   {
>     'name': 'clang_format_linux',
>     'pattern': '.',
>-    'condition': 'host_os == "linux"',
>+    'condition': 'host_os == "linux" and not build_with_chromium',
>     'action': [ 'download_from_google_storage',
>                 '--no_resume',
>                 '--platform=linux*',
>                 '--no_auth',
>                 '--bucket', 'chromium-clang-format',
>-                '-s', 'buildtools/linux64/clang-format.sha1',
>+                '-s', '{angle_root}/buildtools/linux64/clang-format.sha1',
>     ],
>   },
>-  # Pull GN binaries using checked-in hashes.
>   {
>-    'name': 'gn_win',
>+    'name': 'sysroot_x86',
>     'pattern': '.',
>-    'condition': 'host_os == "win"',
>-    'action': [ 'download_from_google_storage',
>-                '--no_resume',
>-                '--platform=win32',
>-                '--no_auth',
>-                '--bucket', 'chromium-gn',
>-                '-s', 'buildtools/win/gn.exe.sha1',
>-    ],
>+    'condition': 'checkout_linux and ((checkout_x86 or checkout_x64) and not build_with_chromium)',
>+    'action': ['python', '{angle_root}/build/linux/sysroot_scripts/install-sysroot.py',
>+               '--arch=x86'],
>   },
>   {
>-    'name': 'gn_mac',
>+    'name': 'sysroot_x64',
>     'pattern': '.',
>-    'condition': 'host_os == "mac"',
>-    'action': [ 'download_from_google_storage',
>-                '--no_resume',
>-                '--platform=darwin',
>-                '--no_auth',
>-                '--bucket', 'chromium-gn',
>-                '-s', 'buildtools/mac/gn.sha1',
>-    ],
>+    'condition': 'checkout_linux and (checkout_x64 and not build_with_chromium)',
>+    'action': ['python', '{angle_root}/build/linux/sysroot_scripts/install-sysroot.py',
>+               '--arch=x64'],
>   },
>   {
>-    'name': 'gn_linux64',
>+    # Update the Windows toolchain if necessary.  Must run before 'clang' below.
>+    'name': 'win_toolchain',
>     'pattern': '.',
>-    'condition': 'host_os == "linux"',
>-    'action': [ 'download_from_google_storage',
>-                '--no_resume',
>-                '--platform=linux*',
>-                '--no_auth',
>-                '--bucket', 'chromium-gn',
>-                '-s', 'buildtools/linux64/gn.sha1',
>-    ],
>+    'condition': 'checkout_win and not build_with_chromium',
>+    'action': ['python', '{angle_root}/build/vs_toolchain.py', 'update', '--force'],
>+  },
>+  {
>+    # Update the Mac toolchain if necessary.
>+    'name': 'mac_toolchain',
>+    'pattern': '.',
>+    'condition': 'checkout_mac and not build_with_chromium',
>+    'action': ['python', '{angle_root}/build/mac_toolchain.py'],
>   },
>+
>   {
>     # Note: On Win, this should run after win_toolchain, as it may use it.
>     'name': 'clang',
>     'pattern': '.',
>-    'action': ['python', 'tools/clang/scripts/update.py', '--if-needed'],
>+    'action': ['python', '{angle_root}/tools/clang/scripts/update.py'],
>+    'condition': 'not build_with_chromium',
>+  },
>+
>+  {
>+    # Update LASTCHANGE.
>+    'name': 'lastchange',
>+    'pattern': '.',
>+    'condition': 'not build_with_chromium',
>+    'action': ['python', '{angle_root}/build/util/lastchange.py',
>+               '-o', '{angle_root}/build/util/LASTCHANGE'],
>   },
> 
>   # Pull rc binaries using checked-in hashes.
>   {
>     'name': 'rc_win',
>     'pattern': '.',
>-    'condition': 'checkout_win and host_os == "win"',
>+    'condition': 'checkout_win and (host_os == "win" and not build_with_chromium)',
>     'action': [ 'download_from_google_storage',
>                 '--no_resume',
>                 '--no_auth',
>                 '--bucket', 'chromium-browser-clang/rc',
>-                '-s', 'build/toolchain/win/rc/win/rc.exe.sha1',
>+                '-s', '{angle_root}/build/toolchain/win/rc/win/rc.exe.sha1',
>+    ],
>+  },
>+
>+  {
>+    'name': 'fuchsia_sdk',
>+    'pattern': '.',
>+    'condition': 'checkout_fuchsia and not build_with_chromium',
>+    'action': [
>+      'python',
>+      '{angle_root}/build/fuchsia/update_sdk.py',
>     ],
>   },
> 
>+  # Download glslang validator binary for Linux.
>   {
>-    # A change to a .gyp, .gypi, or to GYP itself should run the generator.
>+    'name': 'linux_glslang_validator',
>     'pattern': '.',
>-    'action': ['python', 'gyp/gyp_angle'],
>+    'condition': 'checkout_linux and not build_with_chromium',
>+    'action': [ 'download_from_google_storage',
>+                '--no_resume',
>+                '--platform=linux*',
>+                '--no_auth',
>+                '--bucket', 'angle-glslang-validator',
>+                '-s', '{angle_root}/tools/glslang/glslang_validator.sha1',
>+    ],
>+  },
>+
>+  # Download glslang validator binary for Windows.
>+  {
>+    'name': 'win_glslang_validator',
>+    'pattern': '.',
>+    'condition': 'checkout_win and not build_with_chromium',
>+    'action': [ 'download_from_google_storage',
>+                '--no_resume',
>+                '--platform=win32*',
>+                '--no_auth',
>+                '--bucket', 'angle-glslang-validator',
>+                '-s', '{angle_root}/tools/glslang/glslang_validator.exe.sha1',
>+    ],
>   },
> ]
> 
> recursedeps = [
>   # buildtools provides clang_format.
>-  'buildtools',
>+  '{angle_root}/buildtools',
> ]
>diff --git a/Source/ThirdParty/ANGLE/GLESv2.cmake b/Source/ThirdParty/ANGLE/GLESv2.cmake
>new file mode 100644
>index 00000000000..c45aa99baf3
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/GLESv2.cmake
>@@ -0,0 +1,931 @@
>+# Contains the source file definitions in src/libGLESv2.gn
>+#
>+# This is a direct mapping of ALL values unless otherwise specified. All
>+# declarations are in the same ordering as the original .gn file
>+
>+set(libangle_common_sources
>+    src/common/Color.h
>+    src/common/Color.inl
>+    src/common/FastVector.h
>+    src/common/FixedVector.h
>+    src/common/Float16ToFloat32.cpp
>+    src/common/MemoryBuffer.cpp
>+    src/common/MemoryBuffer.h
>+    src/common/Optional.h
>+    src/common/PackedEGLEnums_autogen.cpp
>+    src/common/PackedEGLEnums_autogen.h
>+    src/common/PackedEnums.cpp
>+    src/common/PackedEnums.h
>+    src/common/PackedGLEnums_autogen.cpp
>+    src/common/PackedGLEnums_autogen.h
>+    src/common/PoolAlloc.cpp
>+    src/common/PoolAlloc.h
>+    src/common/aligned_memory.cpp
>+    src/common/aligned_memory.h
>+    src/common/angleutils.cpp
>+    src/common/angleutils.h
>+    src/common/bitset_utils.h
>+    src/common/debug.cpp
>+    src/common/debug.h
>+    src/common/hash_utils.h
>+    src/common/mathutil.cpp
>+    src/common/mathutil.h
>+    src/common/matrix_utils.cpp
>+    src/common/matrix_utils.h
>+    src/common/platform.h
>+    src/common/string_utils.cpp
>+    src/common/string_utils.h
>+    src/common/third_party/base/anglebase/base_export.h
>+    src/common/third_party/base/anglebase/containers/mru_cache.h
>+    src/common/third_party/base/anglebase/logging.h
>+    src/common/third_party/base/anglebase/macros.h
>+    src/common/third_party/base/anglebase/numerics/safe_conversions.h
>+    src/common/third_party/base/anglebase/numerics/safe_conversions_impl.h
>+    src/common/third_party/base/anglebase/numerics/safe_math.h
>+    src/common/third_party/base/anglebase/numerics/safe_math_impl.h
>+    src/common/third_party/base/anglebase/sha1.cc
>+    src/common/third_party/base/anglebase/sha1.h
>+    src/common/third_party/base/anglebase/sys_byteorder.h
>+    src/common/third_party/smhasher/src/PMurHash.cpp
>+    src/common/third_party/smhasher/src/PMurHash.h
>+    src/common/tls.cpp
>+    src/common/tls.h
>+    src/common/uniform_type_info_autogen.cpp
>+    src/common/utilities.cpp
>+    src/common/utilities.h
>+    src/common/vector_utils.h
>+)
>+
>+set(xxhash_sources
>+    src/common/third_party/xxhash/xxhash.c
>+    src/common/third_party/xxhash/xxhash.h
>+)
>+
>+set(angle_system_utils_sources
>+    src/common/Optional.h
>+    src/common/angleutils.h
>+    src/common/platform.h
>+    src/common/system_utils.cpp
>+    src/common/system_utils.h
>+)
>+
>+# Rather than appending to the angle_system_utils_sources we instead make variables that can be used
>+
>+set(angle_system_utils_sources_linux src/common/system_utils_linux.cpp)
>+set(angle_system_utils_sources_posix src/common/system_utils_posix.cpp)
>+set(angle_system_utils_sources_mac src/common/system_utils_mac.cpp)
>+set(angle_system_utils_sources_win src/common/system_utils_win.cpp)
>+set(angle_system_utils_sources_android
>+    src/common/android_util.cpp
>+    src/common/android_util.h
>+)
>+
>+# end modification
>+
>+set(libangle_image_util_sources
>+    src/image_util/copyimage.cpp
>+    src/image_util/copyimage.h
>+    src/image_util/copyimage.inl
>+    src/image_util/generatemip.h
>+    src/image_util/generatemip.inl
>+    src/image_util/imageformats.cpp
>+    src/image_util/imageformats.h
>+    src/image_util/loadimage.cpp
>+    src/image_util/loadimage.h
>+    src/image_util/loadimage.inl
>+    src/image_util/loadimage_etc.cpp
>+)
>+
>+set(libangle_gpu_info_util_sources
>+    src/gpu_info_util/SystemInfo.cpp
>+    src/gpu_info_util/SystemInfo.h
>+    src/gpu_info_util/SystemInfo_internal.h
>+)
>+
>+set(libangle_gpu_info_util_win_sources src/gpu_info_util/SystemInfo_win.cpp)
>+set(libangle_gpu_info_util_linux_sources src/gpu_info_util/SystemInfo_linux.cpp)
>+set(libangle_gpu_info_util_libpci_sources src/gpu_info_util/SystemInfo_libpci.cpp)
>+set(libangle_gpu_info_util_x11_sources src/gpu_info_util/SystemInfo_x11.cpp)
>+set(libangle_gpu_info_util_mac_sources src/gpu_info_util/SystemInfo_mac.mm)
>+
>+set(libangle_includes
>+    include/angle_gl.h
>+    include/export.h
>+    include/EGL/egl.h
>+    include/EGL/eglext.h
>+    include/EGL/eglext_angle.h
>+    include/EGL/eglplatform.h
>+    include/GLES/gl.h
>+    include/GLES/glplatform.h
>+    include/GLES/glext.h
>+    include/GLES/glext_angle.h
>+    include/GLES/glext_explicit_context_autogen.inc
>+    include/GLES2/gl2.h
>+    include/GLES2/gl2ext.h
>+    include/GLES2/gl2ext_angle.h
>+    include/GLES2/gl2ext_explicit_context_autogen.inc
>+    include/GLES2/gl2platform.h
>+    include/GLES3/gl3.h
>+    include/GLES3/gl3ext_explicit_context_autogen.inc
>+    include/GLES3/gl3platform.h
>+    include/GLES3/gl31.h
>+    include/GLES3/gl31ext_explicit_context_autogen.inc
>+    include/GLES3/gl32.h
>+    include/GLSLANG/ShaderLang.h
>+    include/GLSLANG/ShaderVars.h
>+    include/KHR/khrplatform.h
>+    include/WGL/wgl.h
>+    include/platform/FeaturesVk.h
>+    include/platform/Platform.h
>+    include/platform/WorkaroundsD3D.h)
>+
>+set(libangle_sources
>+    src/common/event_tracer.cpp
>+    src/common/event_tracer.h
>+    src/libANGLE/AttributeMap.cpp
>+    src/libANGLE/AttributeMap.h
>+    src/libANGLE/BinaryStream.h
>+    src/libANGLE/BlobCache.cpp
>+    src/libANGLE/BlobCache.h
>+    src/libANGLE/Buffer.cpp
>+    src/libANGLE/Buffer.h
>+    src/libANGLE/Caps.cpp
>+    src/libANGLE/Caps.h
>+    src/libANGLE/Compiler.cpp
>+    src/libANGLE/Compiler.h
>+    src/libANGLE/Config.cpp
>+    src/libANGLE/Config.h
>+    src/libANGLE/Constants.h
>+    src/libANGLE/Context.cpp
>+    src/libANGLE/Context_gles_1_0.cpp
>+    src/libANGLE/Context_gles_1_0_autogen.h
>+    src/libANGLE/Context.h
>+    src/libANGLE/Debug.cpp
>+    src/libANGLE/Debug.h
>+    src/libANGLE/Device.cpp
>+    src/libANGLE/Device.h
>+    src/libANGLE/Display.cpp
>+    src/libANGLE/Display.h
>+    src/libANGLE/EGLSync.cpp
>+    src/libANGLE/EGLSync.h
>+    src/libANGLE/Error.cpp
>+    src/libANGLE/Error.h
>+    src/libANGLE/Error.inl
>+    src/libANGLE/ErrorStrings.h
>+    src/libANGLE/Fence.cpp
>+    src/libANGLE/Fence.h
>+    src/libANGLE/Framebuffer.cpp
>+    src/libANGLE/Framebuffer.h
>+    src/libANGLE/FramebufferAttachment.cpp
>+    src/libANGLE/FramebufferAttachment.h
>+    src/libANGLE/GLES1Renderer.cpp
>+    src/libANGLE/GLES1Renderer.h
>+    src/libANGLE/GLES1Shaders.inc
>+    src/libANGLE/GLES1State.cpp
>+    src/libANGLE/GLES1State.h
>+    src/libANGLE/HandleAllocator.cpp
>+    src/libANGLE/HandleAllocator.h
>+    src/libANGLE/HandleRangeAllocator.h
>+    src/libANGLE/HandleRangeAllocator.cpp
>+    src/libANGLE/Image.h
>+    src/libANGLE/Image.cpp
>+    src/libANGLE/ImageIndex.h
>+    src/libANGLE/ImageIndex.cpp
>+    src/libANGLE/IndexRangeCache.cpp
>+    src/libANGLE/IndexRangeCache.h
>+    src/libANGLE/LoggingAnnotator.cpp
>+    src/libANGLE/LoggingAnnotator.h
>+    src/libANGLE/MemoryObject.cpp
>+    src/libANGLE/MemoryObject.h
>+    src/libANGLE/MemoryProgramCache.cpp
>+    src/libANGLE/MemoryProgramCache.h
>+    src/libANGLE/Observer.cpp
>+    src/libANGLE/Observer.h
>+    src/libANGLE/Path.h
>+    src/libANGLE/Path.cpp
>+    src/libANGLE/Platform.cpp
>+    src/libANGLE/Program.cpp
>+    src/libANGLE/Program.h
>+    src/libANGLE/ProgramLinkedResources.cpp
>+    src/libANGLE/ProgramLinkedResources.h
>+    src/libANGLE/ProgramPipeline.cpp
>+    src/libANGLE/ProgramPipeline.h
>+    src/libANGLE/Query.cpp
>+    src/libANGLE/Query.h
>+    src/libANGLE/RefCountObject.h
>+    src/libANGLE/Renderbuffer.cpp
>+    src/libANGLE/Renderbuffer.h
>+    src/libANGLE/ResourceManager.cpp
>+    src/libANGLE/ResourceManager.h
>+    src/libANGLE/ResourceMap.h
>+    src/libANGLE/Sampler.cpp
>+    src/libANGLE/Sampler.h
>+    src/libANGLE/Shader.cpp
>+    src/libANGLE/Shader.h
>+    src/libANGLE/SizedMRUCache.h
>+    src/libANGLE/State.cpp
>+    src/libANGLE/State.h
>+    src/libANGLE/Stream.cpp
>+    src/libANGLE/Stream.h
>+    src/libANGLE/Surface.cpp
>+    src/libANGLE/Surface.h
>+    src/libANGLE/Texture.cpp
>+    src/libANGLE/Texture.h
>+    src/libANGLE/Thread.cpp
>+    src/libANGLE/Thread.h
>+    src/libANGLE/TransformFeedback.cpp
>+    src/libANGLE/TransformFeedback.h
>+    src/libANGLE/Uniform.cpp
>+    src/libANGLE/Uniform.h
>+    src/libANGLE/VaryingPacking.cpp
>+    src/libANGLE/VaryingPacking.h
>+    src/libANGLE/Version.h
>+    src/libANGLE/Version.inl
>+    src/libANGLE/VertexArray.cpp
>+    src/libANGLE/VertexArray.h
>+    src/libANGLE/VertexAttribute.cpp
>+    src/libANGLE/VertexAttribute.h
>+    src/libANGLE/VertexAttribute.inl
>+    src/libANGLE/Workarounds.h
>+    src/libANGLE/WorkerThread.cpp
>+    src/libANGLE/WorkerThread.h
>+    src/libANGLE/angletypes.cpp
>+    src/libANGLE/angletypes.h
>+    src/libANGLE/angletypes.inl
>+    src/libANGLE/es3_copy_conversion_table_autogen.cpp
>+    src/libANGLE/features.h
>+    src/libANGLE/format_map_autogen.cpp
>+    src/libANGLE/formatutils.cpp
>+    src/libANGLE/formatutils.h
>+    src/libANGLE/histogram_macros.h
>+    src/libANGLE/queryconversions.cpp
>+    src/libANGLE/queryconversions.h
>+    src/libANGLE/queryutils.cpp
>+    src/libANGLE/queryutils.h
>+    src/libANGLE/renderer/BufferImpl.h
>+    src/libANGLE/renderer/CompilerImpl.h
>+    src/libANGLE/renderer/ContextImpl.cpp
>+    src/libANGLE/renderer/ContextImpl.h
>+    src/libANGLE/renderer/driver_utils.cpp
>+    src/libANGLE/renderer/driver_utils.h
>+    src/libANGLE/renderer/DeviceImpl.cpp
>+    src/libANGLE/renderer/DeviceImpl.h
>+    src/libANGLE/renderer/DisplayImpl.cpp
>+    src/libANGLE/renderer/DisplayImpl.h
>+    src/libANGLE/renderer/EGLImplFactory.h
>+    src/libANGLE/renderer/EGLSyncImpl.h
>+    src/libANGLE/renderer/FenceNVImpl.h
>+    src/libANGLE/renderer/FormatID_autogen.h
>+    src/libANGLE/renderer/Format_table_autogen.cpp
>+    src/libANGLE/renderer/Format.h
>+    src/libANGLE/renderer/FramebufferAttachmentObjectImpl.h
>+    src/libANGLE/renderer/FramebufferImpl.h
>+    src/libANGLE/renderer/GLImplFactory.h
>+    src/libANGLE/renderer/ImageImpl.h
>+    src/libANGLE/renderer/MemoryObjectImpl.h
>+    src/libANGLE/renderer/PathImpl.h
>+    src/libANGLE/renderer/ProgramImpl.h
>+    src/libANGLE/renderer/ProgramPipelineImpl.h
>+    src/libANGLE/renderer/QueryImpl.cpp
>+    src/libANGLE/renderer/QueryImpl.h
>+    src/libANGLE/renderer/RenderbufferImpl.h
>+    src/libANGLE/renderer/RenderTargetCache.h
>+    src/libANGLE/renderer/SamplerImpl.h
>+    src/libANGLE/renderer/ShaderImpl.cpp
>+    src/libANGLE/renderer/ShaderImpl.h
>+    src/libANGLE/renderer/StreamProducerImpl.h
>+    src/libANGLE/renderer/SurfaceImpl.cpp
>+    src/libANGLE/renderer/SurfaceImpl.h
>+    src/libANGLE/renderer/SyncImpl.h
>+    src/libANGLE/renderer/TextureImpl.cpp
>+    src/libANGLE/renderer/TextureImpl.h
>+    src/libANGLE/renderer/TransformFeedbackImpl.h
>+    src/libANGLE/renderer/VertexArrayImpl.h
>+    src/libANGLE/renderer/copyvertex.h
>+    src/libANGLE/renderer/copyvertex.inc.h
>+    src/libANGLE/renderer/load_functions_table.h
>+    src/libANGLE/renderer/load_functions_table_autogen.cpp
>+    src/libANGLE/renderer/renderer_utils.cpp
>+    src/libANGLE/renderer/renderer_utils.h
>+    src/libANGLE/validationEGL.cpp
>+    src/libANGLE/validationEGL.h
>+    src/libANGLE/validationES.cpp
>+    src/libANGLE/validationES.h
>+    src/libANGLE/validationES1.cpp
>+    src/libANGLE/validationES1_autogen.h
>+    src/libANGLE/validationES1.h
>+    src/libANGLE/validationES2.cpp
>+    src/libANGLE/validationES2_autogen.h
>+    src/libANGLE/validationES2.h
>+    src/libANGLE/validationES3.cpp
>+    src/libANGLE/validationES31.cpp
>+    src/libANGLE/validationES31_autogen.h
>+    src/libANGLE/validationES31.h
>+    src/libANGLE/validationES3_autogen.h
>+    src/libANGLE/validationES3.h
>+    src/libANGLE/validationESEXT_autogen.h
>+    src/libANGLE/validationESEXT.h
>+    src/third_party/trace_event/trace_event.h
>+)
>+
>+set(libangle_d3d_shared_sources
>+    src/libANGLE/renderer/d3d/BufferD3D.cpp
>+    src/libANGLE/renderer/d3d/BufferD3D.h
>+    src/libANGLE/renderer/d3d/CompilerD3D.cpp
>+    src/libANGLE/renderer/d3d/CompilerD3D.h
>+    src/libANGLE/renderer/d3d/ContextD3D.h
>+    src/libANGLE/renderer/d3d/DeviceD3D.cpp
>+    src/libANGLE/renderer/d3d/DeviceD3D.h
>+    src/libANGLE/renderer/d3d/DisplayD3D.cpp
>+    src/libANGLE/renderer/d3d/DisplayD3D.h
>+    src/libANGLE/renderer/d3d/DynamicHLSL.cpp
>+    src/libANGLE/renderer/d3d/DynamicHLSL.h
>+    src/libANGLE/renderer/d3d/DynamicImage2DHLSL.cpp
>+    src/libANGLE/renderer/d3d/DynamicImage2DHLSL.h
>+    src/libANGLE/renderer/d3d/EGLImageD3D.cpp
>+    src/libANGLE/renderer/d3d/EGLImageD3D.h
>+    src/libANGLE/renderer/d3d/formatutilsD3D.h
>+    src/libANGLE/renderer/d3d/FramebufferD3D.cpp
>+    src/libANGLE/renderer/d3d/FramebufferD3D.h
>+    src/libANGLE/renderer/d3d/HLSLCompiler.cpp
>+    src/libANGLE/renderer/d3d/HLSLCompiler.h
>+    src/libANGLE/renderer/d3d/ImageD3D.cpp
>+    src/libANGLE/renderer/d3d/ImageD3D.h
>+    src/libANGLE/renderer/d3d/IndexBuffer.cpp
>+    src/libANGLE/renderer/d3d/IndexBuffer.h
>+    src/libANGLE/renderer/d3d/IndexDataManager.cpp
>+    src/libANGLE/renderer/d3d/IndexDataManager.h
>+    src/libANGLE/renderer/d3d/NativeWindowD3D.cpp
>+    src/libANGLE/renderer/d3d/NativeWindowD3D.h
>+    src/libANGLE/renderer/d3d/ProgramD3D.cpp
>+    src/libANGLE/renderer/d3d/ProgramD3D.h
>+    src/libANGLE/renderer/d3d/RenderbufferD3D.cpp
>+    src/libANGLE/renderer/d3d/RenderbufferD3D.h
>+    src/libANGLE/renderer/d3d/RendererD3D.cpp
>+    src/libANGLE/renderer/d3d/RendererD3D.h
>+    src/libANGLE/renderer/d3d/RenderTargetD3D.h
>+    src/libANGLE/renderer/d3d/RenderTargetD3D.cpp
>+    src/libANGLE/renderer/d3d/SamplerD3D.h
>+    src/libANGLE/renderer/d3d/ShaderD3D.cpp
>+    src/libANGLE/renderer/d3d/ShaderD3D.h
>+    src/libANGLE/renderer/d3d/ShaderExecutableD3D.cpp
>+    src/libANGLE/renderer/d3d/ShaderExecutableD3D.h
>+    src/libANGLE/renderer/d3d/SurfaceD3D.cpp
>+    src/libANGLE/renderer/d3d/SurfaceD3D.h
>+    src/libANGLE/renderer/d3d/SwapChainD3D.cpp
>+    src/libANGLE/renderer/d3d/SwapChainD3D.h
>+    src/libANGLE/renderer/d3d/TextureD3D.cpp
>+    src/libANGLE/renderer/d3d/TextureD3D.h
>+    src/libANGLE/renderer/d3d/TextureStorage.h
>+    src/libANGLE/renderer/d3d/VertexBuffer.cpp
>+    src/libANGLE/renderer/d3d/VertexBuffer.h
>+    src/libANGLE/renderer/d3d/VertexDataManager.cpp
>+    src/libANGLE/renderer/d3d/VertexDataManager.h
>+)
>+set(libangle_d3d9_sources
>+    src/libANGLE/renderer/d3d/d3d9/Blit9.cpp
>+    src/libANGLE/renderer/d3d/d3d9/Blit9.h
>+    src/libANGLE/renderer/d3d/d3d9/Buffer9.cpp
>+    src/libANGLE/renderer/d3d/d3d9/Buffer9.h
>+    src/libANGLE/renderer/d3d/d3d9/Context9.cpp
>+    src/libANGLE/renderer/d3d/d3d9/Context9.h
>+    src/libANGLE/renderer/d3d/d3d9/DebugAnnotator9.cpp
>+    src/libANGLE/renderer/d3d/d3d9/DebugAnnotator9.h
>+    src/libANGLE/renderer/d3d/d3d9/Fence9.cpp
>+    src/libANGLE/renderer/d3d/d3d9/Fence9.h
>+    src/libANGLE/renderer/d3d/d3d9/formatutils9.cpp
>+    src/libANGLE/renderer/d3d/d3d9/formatutils9.h
>+    src/libANGLE/renderer/d3d/d3d9/Framebuffer9.cpp
>+    src/libANGLE/renderer/d3d/d3d9/Framebuffer9.h
>+    src/libANGLE/renderer/d3d/d3d9/Image9.cpp
>+    src/libANGLE/renderer/d3d/d3d9/Image9.h
>+    src/libANGLE/renderer/d3d/d3d9/IndexBuffer9.cpp
>+    src/libANGLE/renderer/d3d/d3d9/IndexBuffer9.h
>+    src/libANGLE/renderer/d3d/d3d9/NativeWindow9.cpp
>+    src/libANGLE/renderer/d3d/d3d9/NativeWindow9.h
>+    src/libANGLE/renderer/d3d/d3d9/Query9.cpp
>+    src/libANGLE/renderer/d3d/d3d9/Query9.h
>+    src/libANGLE/renderer/d3d/d3d9/Renderer9.cpp
>+    src/libANGLE/renderer/d3d/d3d9/Renderer9.h
>+    src/libANGLE/renderer/d3d/d3d9/renderer9_utils.cpp
>+    src/libANGLE/renderer/d3d/d3d9/renderer9_utils.h
>+    src/libANGLE/renderer/d3d/d3d9/RenderTarget9.cpp
>+    src/libANGLE/renderer/d3d/d3d9/RenderTarget9.h
>+    src/libANGLE/renderer/d3d/d3d9/ShaderCache.h
>+    src/libANGLE/renderer/d3d/d3d9/ShaderExecutable9.cpp
>+    src/libANGLE/renderer/d3d/d3d9/ShaderExecutable9.h
>+    src/libANGLE/renderer/d3d/d3d9/shaders/compiled/componentmaskps.h
>+    src/libANGLE/renderer/d3d/d3d9/shaders/compiled/componentmaskpremultps.h
>+    src/libANGLE/renderer/d3d/d3d9/shaders/compiled/componentmaskunmultps.h
>+    src/libANGLE/renderer/d3d/d3d9/shaders/compiled/luminanceps.h
>+    src/libANGLE/renderer/d3d/d3d9/shaders/compiled/luminancepremultps.h
>+    src/libANGLE/renderer/d3d/d3d9/shaders/compiled/luminanceunmultps.h
>+    src/libANGLE/renderer/d3d/d3d9/shaders/compiled/passthroughps.h
>+    src/libANGLE/renderer/d3d/d3d9/shaders/compiled/standardvs.h
>+    src/libANGLE/renderer/d3d/d3d9/StateManager9.cpp
>+    src/libANGLE/renderer/d3d/d3d9/StateManager9.h
>+    src/libANGLE/renderer/d3d/d3d9/SwapChain9.cpp
>+    src/libANGLE/renderer/d3d/d3d9/SwapChain9.h
>+    src/libANGLE/renderer/d3d/d3d9/TextureStorage9.cpp
>+    src/libANGLE/renderer/d3d/d3d9/TextureStorage9.h
>+    src/libANGLE/renderer/d3d/d3d9/VertexArray9.h
>+    src/libANGLE/renderer/d3d/d3d9/VertexBuffer9.cpp
>+    src/libANGLE/renderer/d3d/d3d9/VertexBuffer9.h
>+    src/libANGLE/renderer/d3d/d3d9/vertexconversion.h
>+    src/libANGLE/renderer/d3d/d3d9/VertexDeclarationCache.cpp
>+    src/libANGLE/renderer/d3d/d3d9/VertexDeclarationCache.h
>+)
>+
>+set(libangle_d3d11_sources
>+    src/libANGLE/renderer/d3d/d3d11/Blit11.cpp
>+    src/libANGLE/renderer/d3d/d3d11/Blit11.h
>+    src/libANGLE/renderer/d3d/d3d11/Blit11Helper_autogen.inc
>+    src/libANGLE/renderer/d3d/d3d11/Buffer11.cpp
>+    src/libANGLE/renderer/d3d/d3d11/Buffer11.h
>+    src/libANGLE/renderer/d3d/d3d11/Clear11.cpp
>+    src/libANGLE/renderer/d3d/d3d11/Clear11.h
>+    src/libANGLE/renderer/d3d/d3d11/Context11.cpp
>+    src/libANGLE/renderer/d3d/d3d11/Context11.h
>+    src/libANGLE/renderer/d3d/d3d11/DebugAnnotator11.cpp
>+    src/libANGLE/renderer/d3d/d3d11/DebugAnnotator11.h
>+    src/libANGLE/renderer/d3d/d3d11/dxgi_format_map_autogen.cpp
>+    src/libANGLE/renderer/d3d/d3d11/dxgi_support_table_autogen.cpp
>+    src/libANGLE/renderer/d3d/d3d11/dxgi_support_table.h
>+    src/libANGLE/renderer/d3d/d3d11/Fence11.cpp
>+    src/libANGLE/renderer/d3d/d3d11/Fence11.h
>+    src/libANGLE/renderer/d3d/d3d11/formatutils11.cpp
>+    src/libANGLE/renderer/d3d/d3d11/formatutils11.h
>+    src/libANGLE/renderer/d3d/d3d11/Framebuffer11.cpp
>+    src/libANGLE/renderer/d3d/d3d11/Framebuffer11.h
>+    src/libANGLE/renderer/d3d/d3d11/Image11.cpp
>+    src/libANGLE/renderer/d3d/d3d11/Image11.h
>+    src/libANGLE/renderer/d3d/d3d11/IndexBuffer11.cpp
>+    src/libANGLE/renderer/d3d/d3d11/IndexBuffer11.h
>+    src/libANGLE/renderer/d3d/d3d11/InputLayoutCache.cpp
>+    src/libANGLE/renderer/d3d/d3d11/InputLayoutCache.h
>+    src/libANGLE/renderer/d3d/d3d11/NativeWindow11.h
>+    src/libANGLE/renderer/d3d/d3d11/PixelTransfer11.cpp
>+    src/libANGLE/renderer/d3d/d3d11/PixelTransfer11.h
>+    src/libANGLE/renderer/d3d/d3d11/Program11.cpp
>+    src/libANGLE/renderer/d3d/d3d11/Program11.h
>+    src/libANGLE/renderer/d3d/d3d11/ProgramPipeline11.cpp
>+    src/libANGLE/renderer/d3d/d3d11/ProgramPipeline11.h
>+    src/libANGLE/renderer/d3d/d3d11/Query11.cpp
>+    src/libANGLE/renderer/d3d/d3d11/Query11.h
>+    src/libANGLE/renderer/d3d/d3d11/Renderer11.cpp
>+    src/libANGLE/renderer/d3d/d3d11/Renderer11.h
>+    src/libANGLE/renderer/d3d/d3d11/renderer11_utils.cpp
>+    src/libANGLE/renderer/d3d/d3d11/renderer11_utils.h
>+    src/libANGLE/renderer/d3d/d3d11/RenderStateCache.cpp
>+    src/libANGLE/renderer/d3d/d3d11/RenderStateCache.h
>+    src/libANGLE/renderer/d3d/d3d11/RenderTarget11.cpp
>+    src/libANGLE/renderer/d3d/d3d11/RenderTarget11.h
>+    src/libANGLE/renderer/d3d/d3d11/ResourceManager11.cpp
>+    src/libANGLE/renderer/d3d/d3d11/ResourceManager11.h
>+    src/libANGLE/renderer/d3d/d3d11/ShaderExecutable11.cpp
>+    src/libANGLE/renderer/d3d/d3d11/ShaderExecutable11.h
>+    src/libANGLE/renderer/d3d/d3d11/shaders/compiled/buffertotexture11_gs.h
>+    src/libANGLE/renderer/d3d/d3d11/shaders/compiled/buffertotexture11_ps_4f.h
>+    src/libANGLE/renderer/d3d/d3d11/shaders/compiled/buffertotexture11_ps_4i.h
>+    src/libANGLE/renderer/d3d/d3d11/shaders/compiled/buffertotexture11_ps_4ui.h
>+    src/libANGLE/renderer/d3d/d3d11/shaders/compiled/buffertotexture11_vs.h
>+    src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clear11_fl9vs.h
>+    src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clear11multiviewgs.h
>+    src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clear11multiviewvs.h
>+    src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clear11vs.h
>+    src/libANGLE/renderer/d3d/d3d11/shaders/compiled/cleardepth11ps.h
>+    src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearfloat11_fl9ps.h
>+    src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearfloat11ps1.h
>+    src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearfloat11ps2.h
>+    src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearfloat11ps3.h
>+    src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearfloat11ps4.h
>+    src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearfloat11ps5.h
>+    src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearfloat11ps6.h
>+    src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearfloat11ps7.h
>+    src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearfloat11ps8.h
>+    src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearsint11ps1.h
>+    src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearsint11ps2.h
>+    src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearsint11ps3.h
>+    src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearsint11ps4.h
>+    src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearsint11ps5.h
>+    src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearsint11ps6.h
>+    src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearsint11ps7.h
>+    src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearsint11ps8.h
>+    src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearuint11ps1.h
>+    src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearuint11ps2.h
>+    src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearuint11ps3.h
>+    src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearuint11ps4.h
>+    src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearuint11ps5.h
>+    src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearuint11ps6.h
>+    src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearuint11ps7.h
>+    src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearuint11ps8.h
>+    src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthrough2d11vs.h
>+    src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthrough3d11gs.h
>+    src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthrough3d11vs.h
>+    src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughdepth2d11ps.h
>+    src/libANGLE/renderer/d3d/d3d11/shaders/compiled/resolvecolor2dps.h
>+    src/libANGLE/renderer/d3d/d3d11/shaders/compiled/resolvedepth11_ps.h
>+    src/libANGLE/renderer/d3d/d3d11/shaders/compiled/resolvedepthstencil11_ps.h
>+    src/libANGLE/renderer/d3d/d3d11/shaders/compiled/resolvedepthstencil11_vs.h
>+    src/libANGLE/renderer/d3d/d3d11/shaders/compiled/resolvestencil11_ps.h
>+    src/libANGLE/renderer/d3d/d3d11/shaders/compiled/swizzlef2darrayps.h
>+    src/libANGLE/renderer/d3d/d3d11/shaders/compiled/swizzlef2dps.h
>+    src/libANGLE/renderer/d3d/d3d11/shaders/compiled/swizzlef3dps.h
>+    src/libANGLE/renderer/d3d/d3d11/shaders/compiled/swizzlei2darrayps.h
>+    src/libANGLE/renderer/d3d/d3d11/shaders/compiled/swizzlei2dps.h
>+    src/libANGLE/renderer/d3d/d3d11/shaders/compiled/swizzlei3dps.h
>+    src/libANGLE/renderer/d3d/d3d11/shaders/compiled/swizzleui2darrayps.h
>+    src/libANGLE/renderer/d3d/d3d11/shaders/compiled/swizzleui2dps.h
>+    src/libANGLE/renderer/d3d/d3d11/shaders/compiled/swizzleui3dps.h
>+    src/libANGLE/renderer/d3d/d3d11/StateManager11.cpp
>+    src/libANGLE/renderer/d3d/d3d11/StateManager11.h
>+    src/libANGLE/renderer/d3d/d3d11/StreamProducerD3DTexture.cpp
>+    src/libANGLE/renderer/d3d/d3d11/StreamProducerD3DTexture.h
>+    src/libANGLE/renderer/d3d/d3d11/SwapChain11.cpp
>+    src/libANGLE/renderer/d3d/d3d11/SwapChain11.h
>+    src/libANGLE/renderer/d3d/d3d11/texture_format_table.cpp
>+    src/libANGLE/renderer/d3d/d3d11/texture_format_table.h
>+    src/libANGLE/renderer/d3d/d3d11/texture_format_table_autogen.cpp
>+    src/libANGLE/renderer/d3d/d3d11/texture_format_table_utils.h
>+    src/libANGLE/renderer/d3d/d3d11/TextureStorage11.cpp
>+    src/libANGLE/renderer/d3d/d3d11/TextureStorage11.h
>+    src/libANGLE/renderer/d3d/d3d11/TransformFeedback11.cpp
>+    src/libANGLE/renderer/d3d/d3d11/TransformFeedback11.h
>+    src/libANGLE/renderer/d3d/d3d11/Trim11.cpp
>+    src/libANGLE/renderer/d3d/d3d11/Trim11.h
>+    src/libANGLE/renderer/d3d/d3d11/VertexArray11.cpp
>+    src/libANGLE/renderer/d3d/d3d11/VertexArray11.h
>+    src/libANGLE/renderer/d3d/d3d11/VertexBuffer11.cpp
>+    src/libANGLE/renderer/d3d/d3d11/VertexBuffer11.h
>+)
>+
>+set(libangle_d3d11_win32_sources
>+    src/libANGLE/renderer/d3d/d3d11/win32/NativeWindow11Win32.cpp
>+    src/libANGLE/renderer/d3d/d3d11/win32/NativeWindow11Win32.h
>+    src/libANGLE/renderer/d3d/d3d11/converged/CompositorNativeWindow11.cpp
>+    src/libANGLE/renderer/d3d/d3d11/converged/CompositorNativeWindow11.h
>+    src/third_party/systeminfo/SystemInfo.cpp
>+    src/third_party/systeminfo/SystemInfo.h
>+)
>+
>+set(libangle_d3d11_winrt_sources
>+    src/libANGLE/renderer/d3d/d3d11/winrt/CoreWindowNativeWindow.cpp
>+    src/libANGLE/renderer/d3d/d3d11/winrt/CoreWindowNativeWindow.h
>+    src/libANGLE/renderer/d3d/d3d11/winrt/InspectableNativeWindow.cpp
>+    src/libANGLE/renderer/d3d/d3d11/winrt/InspectableNativeWindow.h
>+    src/libANGLE/renderer/d3d/d3d11/winrt/NativeWindow11WinRT.cpp
>+    src/libANGLE/renderer/d3d/d3d11/winrt/NativeWindow11WinRT.h
>+    src/libANGLE/renderer/d3d/d3d11/winrt/SwapChainPanelNativeWindow.cpp
>+    src/libANGLE/renderer/d3d/d3d11/winrt/SwapChainPanelNativeWindow.h
>+)
>+
>+set(libangle_gl_sources
>+    src/libANGLE/renderer/gl/BlitGL.cpp
>+    src/libANGLE/renderer/gl/BlitGL.h
>+    src/libANGLE/renderer/gl/BufferGL.cpp
>+    src/libANGLE/renderer/gl/BufferGL.h
>+    src/libANGLE/renderer/gl/ClearMultiviewGL.cpp
>+    src/libANGLE/renderer/gl/ClearMultiviewGL.h
>+    src/libANGLE/renderer/gl/CompilerGL.cpp
>+    src/libANGLE/renderer/gl/CompilerGL.h
>+    src/libANGLE/renderer/gl/ContextGL.cpp
>+    src/libANGLE/renderer/gl/ContextGL.h
>+    src/libANGLE/renderer/gl/DispatchTableGL_autogen.cpp
>+    src/libANGLE/renderer/gl/DispatchTableGL_autogen.h
>+    src/libANGLE/renderer/gl/DisplayGL.cpp
>+    src/libANGLE/renderer/gl/DisplayGL.h
>+    src/libANGLE/renderer/gl/FenceNVGL.cpp
>+    src/libANGLE/renderer/gl/FenceNVGL.h
>+    src/libANGLE/renderer/gl/FramebufferGL.cpp
>+    src/libANGLE/renderer/gl/FramebufferGL.h
>+    src/libANGLE/renderer/gl/FunctionsGL.cpp
>+    src/libANGLE/renderer/gl/FunctionsGL.h
>+    src/libANGLE/renderer/gl/ImageGL.cpp
>+    src/libANGLE/renderer/gl/ImageGL.h
>+    src/libANGLE/renderer/gl/PathGL.h
>+    src/libANGLE/renderer/gl/PathGL.cpp
>+    src/libANGLE/renderer/gl/ProgramGL.cpp
>+    src/libANGLE/renderer/gl/ProgramGL.h
>+    src/libANGLE/renderer/gl/ProgramPipelineGL.cpp
>+    src/libANGLE/renderer/gl/ProgramPipelineGL.h
>+    src/libANGLE/renderer/gl/QueryGL.cpp
>+    src/libANGLE/renderer/gl/QueryGL.h
>+    src/libANGLE/renderer/gl/RenderbufferGL.cpp
>+    src/libANGLE/renderer/gl/RenderbufferGL.h
>+    src/libANGLE/renderer/gl/RendererGL.cpp
>+    src/libANGLE/renderer/gl/RendererGL.h
>+    src/libANGLE/renderer/gl/SamplerGL.cpp
>+    src/libANGLE/renderer/gl/SamplerGL.h
>+    src/libANGLE/renderer/gl/ShaderGL.cpp
>+    src/libANGLE/renderer/gl/ShaderGL.h
>+    src/libANGLE/renderer/gl/StateManagerGL.cpp
>+    src/libANGLE/renderer/gl/StateManagerGL.h
>+    src/libANGLE/renderer/gl/SurfaceGL.cpp
>+    src/libANGLE/renderer/gl/SurfaceGL.h
>+    src/libANGLE/renderer/gl/SyncGL.cpp
>+    src/libANGLE/renderer/gl/SyncGL.h
>+    src/libANGLE/renderer/gl/TextureGL.cpp
>+    src/libANGLE/renderer/gl/TextureGL.h
>+    src/libANGLE/renderer/gl/TransformFeedbackGL.cpp
>+    src/libANGLE/renderer/gl/TransformFeedbackGL.h
>+    src/libANGLE/renderer/gl/VertexArrayGL.cpp
>+    src/libANGLE/renderer/gl/VertexArrayGL.h
>+    src/libANGLE/renderer/gl/WorkaroundsGL.h
>+    src/libANGLE/renderer/gl/formatutilsgl.cpp
>+    src/libANGLE/renderer/gl/formatutilsgl.h
>+    src/libANGLE/renderer/gl/functionsgl_enums.h
>+    src/libANGLE/renderer/gl/functionsgl_typedefs.h
>+    src/libANGLE/renderer/gl/renderergl_utils.cpp
>+    src/libANGLE/renderer/gl/renderergl_utils.h
>+)
>+
>+set(libangle_gl_null_sources
>+    src/libANGLE/renderer/gl/null_functions.cpp
>+    src/libANGLE/renderer/gl/null_functions.h
>+)
>+
>+set(libangle_gl_wgl_sources
>+    src/libANGLE/renderer/gl/wgl/ContextWGL.cpp
>+    src/libANGLE/renderer/gl/wgl/ContextWGL.h
>+    src/libANGLE/renderer/gl/wgl/D3DTextureSurfaceWGL.cpp
>+    src/libANGLE/renderer/gl/wgl/D3DTextureSurfaceWGL.h
>+    src/libANGLE/renderer/gl/wgl/DisplayWGL.cpp
>+    src/libANGLE/renderer/gl/wgl/DisplayWGL.h
>+    src/libANGLE/renderer/gl/wgl/DXGISwapChainWindowSurfaceWGL.cpp
>+    src/libANGLE/renderer/gl/wgl/DXGISwapChainWindowSurfaceWGL.h
>+    src/libANGLE/renderer/gl/wgl/FunctionsWGL.cpp
>+    src/libANGLE/renderer/gl/wgl/FunctionsWGL.h
>+    src/libANGLE/renderer/gl/wgl/PbufferSurfaceWGL.cpp
>+    src/libANGLE/renderer/gl/wgl/PbufferSurfaceWGL.h
>+    src/libANGLE/renderer/gl/wgl/RendererWGL.cpp
>+    src/libANGLE/renderer/gl/wgl/RendererWGL.h
>+    src/libANGLE/renderer/gl/wgl/SurfaceWGL.h
>+    src/libANGLE/renderer/gl/wgl/WindowSurfaceWGL.cpp
>+    src/libANGLE/renderer/gl/wgl/WindowSurfaceWGL.h
>+    src/libANGLE/renderer/gl/wgl/functionswgl_typedefs.h
>+    src/libANGLE/renderer/gl/wgl/wgl_utils.cpp
>+    src/libANGLE/renderer/gl/wgl/wgl_utils.h
>+    src/third_party/khronos/GL/wglext.h
>+)
>+
>+set(libangle_gl_glx_sources
>+    src/libANGLE/renderer/gl/glx/DisplayGLX.cpp
>+    src/libANGLE/renderer/gl/glx/DisplayGLX.h
>+    src/libANGLE/renderer/gl/glx/FunctionsGLX.cpp
>+    src/libANGLE/renderer/gl/glx/FunctionsGLX.h
>+    src/libANGLE/renderer/gl/glx/RendererGLX.h
>+    src/libANGLE/renderer/gl/glx/RendererGLX.cpp
>+    src/libANGLE/renderer/gl/glx/PbufferSurfaceGLX.cpp
>+    src/libANGLE/renderer/gl/glx/PbufferSurfaceGLX.h
>+    src/libANGLE/renderer/gl/glx/SurfaceGLX.h
>+    src/libANGLE/renderer/gl/glx/WindowSurfaceGLX.cpp
>+    src/libANGLE/renderer/gl/glx/WindowSurfaceGLX.h
>+    src/libANGLE/renderer/gl/glx/functionsglx_typedefs.h
>+    src/libANGLE/renderer/gl/glx/platform_glx.h
>+)
>+
>+set(libangle_gl_egl_sources
>+    src/libANGLE/renderer/gl/egl/ContextEGL.cpp
>+    src/libANGLE/renderer/gl/egl/ContextEGL.h
>+    src/libANGLE/renderer/gl/egl/DisplayEGL.cpp
>+    src/libANGLE/renderer/gl/egl/DisplayEGL.h
>+    src/libANGLE/renderer/gl/egl/ExternalImageSiblingEGL.h
>+    src/libANGLE/renderer/gl/egl/egl_utils.cpp
>+    src/libANGLE/renderer/gl/egl/egl_utils.h
>+    src/libANGLE/renderer/gl/egl/FunctionsEGL.cpp
>+    src/libANGLE/renderer/gl/egl/FunctionsEGL.h
>+    src/libANGLE/renderer/gl/egl/ImageEGL.cpp
>+    src/libANGLE/renderer/gl/egl/ImageEGL.h
>+    src/libANGLE/renderer/gl/egl/functionsegl_typedefs.h
>+    src/libANGLE/renderer/gl/egl/PbufferSurfaceEGL.cpp
>+    src/libANGLE/renderer/gl/egl/PbufferSurfaceEGL.h
>+    src/libANGLE/renderer/gl/egl/RendererEGL.cpp
>+    src/libANGLE/renderer/gl/egl/RendererEGL.h
>+    src/libANGLE/renderer/gl/egl/SurfaceEGL.cpp
>+    src/libANGLE/renderer/gl/egl/SurfaceEGL.h
>+    src/libANGLE/renderer/gl/egl/SyncEGL.cpp
>+    src/libANGLE/renderer/gl/egl/SyncEGL.h
>+    src/libANGLE/renderer/gl/egl/WindowSurfaceEGL.cpp
>+    src/libANGLE/renderer/gl/egl/WindowSurfaceEGL.h
>+)
>+
>+set(libangle_gl_egl_dl_sources
>+    src/libANGLE/renderer/gl/egl/FunctionsEGLDL.cpp
>+    src/libANGLE/renderer/gl/egl/FunctionsEGLDL.h
>+)
>+
>+set(libangle_gl_ozone_sources
>+    src/libANGLE/renderer/gl/egl/ozone/DisplayOzone.cpp
>+    src/libANGLE/renderer/gl/egl/ozone/DisplayOzone.h
>+    src/libANGLE/renderer/gl/egl/ozone/SurfaceOzone.cpp
>+    src/libANGLE/renderer/gl/egl/ozone/SurfaceOzone.h
>+)
>+
>+set(libangle_gl_egl_android_sources
>+    src/libANGLE/renderer/gl/egl/android/DisplayAndroid.cpp
>+    src/libANGLE/renderer/gl/egl/android/DisplayAndroid.h
>+    src/libANGLE/renderer/gl/egl/android/NativeBufferImageSiblingAndroid.cpp
>+    src/libANGLE/renderer/gl/egl/android/NativeBufferImageSiblingAndroid.h
>+)
>+
>+set(libangle_gl_cgl_sources
>+    src/libANGLE/renderer/gl/cgl/ContextCGL.cpp
>+    src/libANGLE/renderer/gl/cgl/ContextCGL.h
>+    src/libANGLE/renderer/gl/cgl/DisplayCGL.mm
>+    src/libANGLE/renderer/gl/cgl/DisplayCGL.h
>+    src/libANGLE/renderer/gl/cgl/IOSurfaceSurfaceCGL.mm
>+    src/libANGLE/renderer/gl/cgl/IOSurfaceSurfaceCGL.h
>+    src/libANGLE/renderer/gl/cgl/RendererCGL.mm
>+    src/libANGLE/renderer/gl/cgl/RendererCGL.h
>+    src/libANGLE/renderer/gl/cgl/PbufferSurfaceCGL.mm
>+    src/libANGLE/renderer/gl/cgl/PbufferSurfaceCGL.h
>+    src/libANGLE/renderer/gl/cgl/WindowSurfaceCGL.mm
>+    src/libANGLE/renderer/gl/cgl/WindowSurfaceCGL.h
>+)
>+
>+set(libangle_vulkan_sources
>+    src/libANGLE/renderer/vulkan/BufferVk.cpp
>+    src/libANGLE/renderer/vulkan/BufferVk.h
>+    src/libANGLE/renderer/vulkan/CommandGraph.cpp
>+    src/libANGLE/renderer/vulkan/CommandGraph.h
>+    src/libANGLE/renderer/vulkan/CompilerVk.cpp
>+    src/libANGLE/renderer/vulkan/CompilerVk.h
>+    src/libANGLE/renderer/vulkan/ContextVk.cpp
>+    src/libANGLE/renderer/vulkan/ContextVk.h
>+    src/libANGLE/renderer/vulkan/DeviceVk.cpp
>+    src/libANGLE/renderer/vulkan/DeviceVk.h
>+    src/libANGLE/renderer/vulkan/DisplayVk.cpp
>+    src/libANGLE/renderer/vulkan/DisplayVk.h
>+    src/libANGLE/renderer/vulkan/FenceNVVk.cpp
>+    src/libANGLE/renderer/vulkan/FenceNVVk.h
>+    src/libANGLE/renderer/vulkan/FramebufferVk.cpp
>+    src/libANGLE/renderer/vulkan/FramebufferVk.h
>+    src/libANGLE/renderer/vulkan/GlslangWrapper.cpp
>+    src/libANGLE/renderer/vulkan/GlslangWrapper.h
>+    src/libANGLE/renderer/vulkan/ImageVk.cpp
>+    src/libANGLE/renderer/vulkan/ImageVk.h
>+    src/libANGLE/renderer/vulkan/MemoryObjectVk.cpp
>+    src/libANGLE/renderer/vulkan/MemoryObjectVk.h
>+    src/libANGLE/renderer/vulkan/ProgramVk.cpp
>+    src/libANGLE/renderer/vulkan/ProgramVk.h
>+    src/libANGLE/renderer/vulkan/ProgramPipelineVk.cpp
>+    src/libANGLE/renderer/vulkan/ProgramPipelineVk.h
>+    src/libANGLE/renderer/vulkan/QueryVk.cpp
>+    src/libANGLE/renderer/vulkan/QueryVk.h
>+    src/libANGLE/renderer/vulkan/RenderbufferVk.cpp
>+    src/libANGLE/renderer/vulkan/RenderbufferVk.h
>+    src/libANGLE/renderer/vulkan/RendererVk.cpp
>+    src/libANGLE/renderer/vulkan/RendererVk.h
>+    src/libANGLE/renderer/vulkan/RenderTargetVk.cpp
>+    src/libANGLE/renderer/vulkan/RenderTargetVk.h
>+    src/libANGLE/renderer/vulkan/SamplerVk.cpp
>+    src/libANGLE/renderer/vulkan/SamplerVk.h
>+    src/libANGLE/renderer/vulkan/SecondaryCommandBuffer.cpp
>+    src/libANGLE/renderer/vulkan/SecondaryCommandBuffer.h
>+    src/libANGLE/renderer/vulkan/ShaderVk.cpp
>+    src/libANGLE/renderer/vulkan/ShaderVk.h
>+    src/libANGLE/renderer/vulkan/SurfaceVk.cpp
>+    src/libANGLE/renderer/vulkan/SurfaceVk.h
>+    src/libANGLE/renderer/vulkan/SyncVk.cpp
>+    src/libANGLE/renderer/vulkan/SyncVk.h
>+    src/libANGLE/renderer/vulkan/TextureVk.cpp
>+    src/libANGLE/renderer/vulkan/TextureVk.h
>+    src/libANGLE/renderer/vulkan/TransformFeedbackVk.cpp
>+    src/libANGLE/renderer/vulkan/TransformFeedbackVk.h
>+    src/libANGLE/renderer/vulkan/UtilsVk.cpp
>+    src/libANGLE/renderer/vulkan/UtilsVk.h
>+    src/libANGLE/renderer/vulkan/VertexArrayVk.cpp
>+    src/libANGLE/renderer/vulkan/VertexArrayVk.h
>+    src/libANGLE/renderer/vulkan/vk_cache_utils.cpp
>+    src/libANGLE/renderer/vulkan/vk_cache_utils.h
>+    src/libANGLE/renderer/vulkan/vk_caps_utils.cpp
>+    src/libANGLE/renderer/vulkan/vk_caps_utils.h
>+    src/libANGLE/renderer/vulkan/vk_format_table_autogen.cpp
>+    src/libANGLE/renderer/vulkan/vk_format_utils.h
>+    src/libANGLE/renderer/vulkan/vk_format_utils.cpp
>+    src/libANGLE/renderer/vulkan/vk_helpers.cpp
>+    src/libANGLE/renderer/vulkan/vk_helpers.h
>+    src/libANGLE/renderer/vulkan/vk_internal_shaders_autogen.h
>+    src/libANGLE/renderer/vulkan/vk_internal_shaders_autogen.cpp
>+    src/libANGLE/renderer/vulkan/vk_mandatory_format_support_table_autogen.cpp
>+    src/libANGLE/renderer/vulkan/vk_utils.cpp
>+    src/libANGLE/renderer/vulkan/vk_utils.h
>+    src/libANGLE/renderer/vulkan/vk_wrapper.h
>+)
>+
>+set(libangle_vulkan_android_sources
>+    src/libANGLE/renderer/vulkan/android/DisplayVkAndroid.cpp
>+    src/libANGLE/renderer/vulkan/android/DisplayVkAndroid.h
>+    src/libANGLE/renderer/vulkan/android/HardwareBufferImageSiblingVkAndroid.cpp
>+    src/libANGLE/renderer/vulkan/android/HardwareBufferImageSiblingVkAndroid.h
>+    src/libANGLE/renderer/vulkan/android/WindowSurfaceVkAndroid.cpp
>+    src/libANGLE/renderer/vulkan/android/WindowSurfaceVkAndroid.h
>+)
>+
>+set(libangle_vulkan_win32_sources
>+    src/libANGLE/renderer/vulkan/win32/DisplayVkWin32.cpp
>+    src/libANGLE/renderer/vulkan/win32/DisplayVkWin32.h
>+    src/libANGLE/renderer/vulkan/win32/WindowSurfaceVkWin32.cpp
>+    src/libANGLE/renderer/vulkan/win32/WindowSurfaceVkWin32.h
>+)
>+
>+set(libangle_vulkan_xcb_sources
>+    src/libANGLE/renderer/vulkan/xcb/DisplayVkXcb.cpp
>+    src/libANGLE/renderer/vulkan/xcb/DisplayVkXcb.h
>+    src/libANGLE/renderer/vulkan/xcb/WindowSurfaceVkXcb.cpp
>+    src/libANGLE/renderer/vulkan/xcb/WindowSurfaceVkXcb.h
>+)
>+
>+set(libangle_vulkan_fuchsia_sources
>+    src/libANGLE/renderer/vulkan/fuchsia/DisplayVkFuchsia.cpp
>+    src/libANGLE/renderer/vulkan/fuchsia/DisplayVkFuchsia.h
>+    src/libANGLE/renderer/vulkan/fuchsia/WindowSurfaceVkFuchsia.cpp
>+    src/libANGLE/renderer/vulkan/fuchsia/WindowSurfaceVkFuchsia.h
>+)
>+
>+set(libangle_null_sources
>+    src/libANGLE/renderer/null/BufferNULL.cpp
>+    src/libANGLE/renderer/null/BufferNULL.h
>+    src/libANGLE/renderer/null/CompilerNULL.cpp
>+    src/libANGLE/renderer/null/CompilerNULL.h
>+    src/libANGLE/renderer/null/ContextNULL.cpp
>+    src/libANGLE/renderer/null/ContextNULL.h
>+    src/libANGLE/renderer/null/DeviceNULL.cpp
>+    src/libANGLE/renderer/null/DeviceNULL.h
>+    src/libANGLE/renderer/null/DisplayNULL.cpp
>+    src/libANGLE/renderer/null/DisplayNULL.h
>+    src/libANGLE/renderer/null/FenceNVNULL.cpp
>+    src/libANGLE/renderer/null/FenceNVNULL.h
>+    src/libANGLE/renderer/null/FramebufferNULL.cpp
>+    src/libANGLE/renderer/null/FramebufferNULL.h
>+    src/libANGLE/renderer/null/ImageNULL.cpp
>+    src/libANGLE/renderer/null/ImageNULL.h
>+    src/libANGLE/renderer/null/PathNULL.cpp
>+    src/libANGLE/renderer/null/PathNULL.h
>+    src/libANGLE/renderer/null/ProgramNULL.cpp
>+    src/libANGLE/renderer/null/ProgramNULL.h
>+    src/libANGLE/renderer/null/ProgramPipelineNULL.cpp
>+    src/libANGLE/renderer/null/ProgramPipelineNULL.h
>+    src/libANGLE/renderer/null/QueryNULL.cpp
>+    src/libANGLE/renderer/null/QueryNULL.h
>+    src/libANGLE/renderer/null/RenderbufferNULL.cpp
>+    src/libANGLE/renderer/null/RenderbufferNULL.h
>+    src/libANGLE/renderer/null/SamplerNULL.cpp
>+    src/libANGLE/renderer/null/SamplerNULL.h
>+    src/libANGLE/renderer/null/ShaderNULL.cpp
>+    src/libANGLE/renderer/null/ShaderNULL.h
>+    src/libANGLE/renderer/null/SurfaceNULL.cpp
>+    src/libANGLE/renderer/null/SurfaceNULL.h
>+    src/libANGLE/renderer/null/SyncNULL.cpp
>+    src/libANGLE/renderer/null/SyncNULL.h
>+    src/libANGLE/renderer/null/TextureNULL.cpp
>+    src/libANGLE/renderer/null/TextureNULL.h
>+    src/libANGLE/renderer/null/TransformFeedbackNULL.cpp
>+    src/libANGLE/renderer/null/TransformFeedbackNULL.h
>+    src/libANGLE/renderer/null/VertexArrayNULL.cpp
>+    src/libANGLE/renderer/null/VertexArrayNULL.h
>+)
>+
>+set(libglesv2_sources
>+    src/common/angleutils.h
>+    src/common/debug.h
>+    src/libGLESv2/entry_points_egl.cpp
>+    src/libGLESv2/entry_points_egl.h
>+    src/libGLESv2/entry_points_egl_ext.cpp
>+    src/libGLESv2/entry_points_egl_ext.h
>+    src/libGLESv2/entry_points_enum_autogen.h
>+    src/libGLESv2/entry_points_gles_1_0_autogen.cpp
>+    src/libGLESv2/entry_points_gles_1_0_autogen.h
>+    src/libGLESv2/entry_points_gles_2_0_autogen.cpp
>+    src/libGLESv2/entry_points_gles_2_0_autogen.h
>+    src/libGLESv2/entry_points_gles_3_0_autogen.cpp
>+    src/libGLESv2/entry_points_gles_3_0_autogen.h
>+    src/libGLESv2/entry_points_gles_3_1_autogen.cpp
>+    src/libGLESv2/entry_points_gles_3_1_autogen.h
>+    src/libGLESv2/entry_points_gles_ext_autogen.cpp
>+    src/libGLESv2/entry_points_gles_ext_autogen.h
>+    src/libGLESv2/entry_points_utils.h
>+    src/libGLESv2/global_state.cpp
>+    src/libGLESv2/global_state.h
>+    src/libGLESv2/libGLESv2_autogen.cpp
>+    src/libGLESv2/libGLESv2.rc
>+    src/libGLESv2/proc_table.h
>+    src/libGLESv2/proc_table_autogen.cpp
>+    src/libGLESv2/resource.h
>+)
>+
>+set(libglesv1_cm_sources
>+    src/libGLESv1_CM/libGLESv1_CM.cpp
>+    src/libGLESv1_CM/libGLESv1_CM.def
>+    src/libGLESv1_CM/libGLESv1_CM.rc
>+    src/libGLESv1_CM/resource.h
>+)
>+
>+set(libegl_sources
>+    src/libEGL/libEGL.cpp
>+    src/libEGL/libEGL.rc
>+    src/libEGL/resource.h
>+    src/libGLESv2/entry_points_egl.h
>+    src/libGLESv2/entry_points_egl_ext.h
>+    src/libEGL/egl_loader_autogen.h
>+)
>diff --git a/Source/ThirdParty/ANGLE/LICENSE b/Source/ThirdParty/ANGLE/LICENSE
>index bdacb32e36d..0f65fd60fd6 100644
>--- a/Source/ThirdParty/ANGLE/LICENSE
>+++ b/Source/ThirdParty/ANGLE/LICENSE
>@@ -1,4 +1,4 @@
>-// Copyright (C) 2002-2013 The ANGLE Project Authors. 
>+// Copyright 2018 The ANGLE Project Authors.
> // All rights reserved.
> //
> // Redistribution and use in source and binary forms, with or without
>@@ -8,7 +8,7 @@
> //     Redistributions of source code must retain the above copyright
> //     notice, this list of conditions and the following disclaimer.
> //
>-//     Redistributions in binary form must reproduce the above 
>+//     Redistributions in binary form must reproduce the above
> //     copyright notice, this list of conditions and the following
> //     disclaimer in the documentation and/or other materials provided
> //     with the distribution.
>@@ -19,7 +19,7 @@
> //     prior written permission.
> //
> // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
>-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
>+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
> // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
> // FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
> // COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
>diff --git a/Source/ThirdParty/ANGLE/Makefile b/Source/ThirdParty/ANGLE/Makefile
>deleted file mode 100644
>index cb4c11a57c6..00000000000
>--- a/Source/ThirdParty/ANGLE/Makefile
>+++ /dev/null
>@@ -1 +0,0 @@
>-include ../Makefile.shared
>diff --git a/Source/ThirdParty/ANGLE/OWNERS b/Source/ThirdParty/ANGLE/OWNERS
>new file mode 100644
>index 00000000000..b700861dabe
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/OWNERS
>@@ -0,0 +1,8 @@
>+# See https://chromium.googlesource.com/angle/angle/+/master/doc/ContributingCode.md#selecting-reviewers for per-file owners
>+cwallez@chromium.org
>+geofflang@chromium.org
>+jmadill@chromium.org
>+syoussefi@chromium.org
>+ynovikov@chromium.org
>+
>+# COMPONENT: Internals>GPU>Angle
>diff --git a/Source/ThirdParty/ANGLE/PRESUBMIT.py b/Source/ThirdParty/ANGLE/PRESUBMIT.py
>new file mode 100644
>index 00000000000..501fecdb681
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/PRESUBMIT.py
>@@ -0,0 +1,110 @@
>+# Copyright 2019 The ANGLE Project Authors. All rights reserved.
>+# Use of this source code is governed by a BSD-style license that can be
>+# found in the LICENSE file.
>+
>+"""Top-level presubmit script for code generation.
>+
>+See http://dev.chromium.org/developers/how-tos/depottools/presubmit-scripts
>+for more details on the presubmit API built into depot_tools.
>+"""
>+
>+from subprocess import call
>+
>+
>+# Fragment of a regular expression that matches C++ and Objective-C++ implementation files.
>+_IMPLEMENTATION_EXTENSIONS = r'\.(cc|cpp|cxx|mm)$'
>+
>+
>+# Fragment of a regular expression that matches C++ and Objective-C++ header files.
>+_HEADER_EXTENSIONS = r'\.(h|hpp|hxx)$'
>+
>+
>+def _CheckCodeGeneration(input_api, output_api):
>+
>+    class Msg(output_api.PresubmitError):
>+      """Specialized error message"""
>+      def __init__(self, message):
>+        super(output_api.PresubmitError, self).__init__(message,
>+          long_text='Please ensure your ANGLE repositiory is synced to tip-of-tree\n'
>+          'and you have an up-to-date checkout of all ANGLE dependencies.\n'
>+          'If you are using ANGLE inside Chromium you may need to bootstrap ANGLE \n'
>+          'and run gclient sync. See the DevSetup documentation for details.\n')
>+
>+    code_gen_path = input_api.os_path.join(input_api.PresubmitLocalPath(),
>+                                           'scripts/run_code_generation.py')
>+    cmd_name = 'run_code_generation'
>+    cmd = [input_api.python_executable, code_gen_path, '--verify-no-dirty']
>+    test_cmd = input_api.Command(
>+          name=cmd_name,
>+          cmd=cmd,
>+          kwargs={},
>+          message=Msg)
>+    if input_api.verbose:
>+        print('Running ' + cmd_name)
>+    return input_api.RunTests([test_cmd])
>+
>+
>+# Taken directly from Chromium's PRESUBMIT.py
>+def _CheckNewHeaderWithoutGnChange(input_api, output_api):
>+  """Checks that newly added header files have corresponding GN changes.
>+  Note that this is only a heuristic. To be precise, run script:
>+  build/check_gn_headers.py.
>+  """
>+
>+  def headers(f):
>+    return input_api.FilterSourceFile(
>+      f, white_list=(r'.+%s' % _HEADER_EXTENSIONS, ))
>+
>+  new_headers = []
>+  for f in input_api.AffectedSourceFiles(headers):
>+    if f.Action() != 'A':
>+      continue
>+    new_headers.append(f.LocalPath())
>+
>+  def gn_files(f):
>+    return input_api.FilterSourceFile(f, white_list=(r'.+\.gn', ))
>+
>+  all_gn_changed_contents = ''
>+  for f in input_api.AffectedSourceFiles(gn_files):
>+    for _, line in f.ChangedContents():
>+      all_gn_changed_contents += line
>+
>+  problems = []
>+  for header in new_headers:
>+    basename = input_api.os_path.basename(header)
>+    if basename not in all_gn_changed_contents:
>+      problems.append(header)
>+
>+  if problems:
>+    return [output_api.PresubmitPromptWarning(
>+      'Missing GN changes for new header files', items=sorted(problems),
>+      long_text='Please double check whether newly added header files need '
>+      'corresponding changes in gn or gni files.\nThis checking is only a '
>+      'heuristic. Run build/check_gn_headers.py to be precise.\n'
>+      'Read https://crbug.com/661774 for more info.')]
>+  return []
>+
>+
>+def CheckChangeOnUpload(input_api, output_api):
>+    results = []
>+    results.extend(_CheckCodeGeneration(input_api, output_api))
>+    results.extend(input_api.canned_checks.CheckChangeHasBugField(
>+      input_api, output_api))
>+    results.extend(input_api.canned_checks.CheckChangeHasDescription(
>+      input_api, output_api))
>+    results.extend(_CheckNewHeaderWithoutGnChange(input_api, output_api))
>+    results.extend(
>+      input_api.canned_checks.CheckPatchFormatted(input_api, output_api))
>+    return results
>+
>+
>+def CheckChangeOnCommit(input_api, output_api):
>+    results = []
>+    results.extend(_CheckCodeGeneration(input_api, output_api))
>+    results.extend(
>+      input_api.canned_checks.CheckPatchFormatted(input_api, output_api))
>+    results.extend(input_api.canned_checks.CheckChangeHasBugField(
>+      input_api, output_api))
>+    results.extend(input_api.canned_checks.CheckChangeHasDescription(
>+      input_api, output_api))
>+    return results
>diff --git a/Source/ThirdParty/ANGLE/PlatformMac.cmake b/Source/ThirdParty/ANGLE/PlatformMac.cmake
>deleted file mode 100644
>index 676b6768ad0..00000000000
>--- a/Source/ThirdParty/ANGLE/PlatformMac.cmake
>+++ /dev/null
>@@ -1,15 +0,0 @@
>-list(APPEND ANGLE_SOURCES
>-    src/common/system_utils_mac.cpp
>-    src/libANGLE/renderer/gl/cgl/DisplayCGL.mm
>-    src/libANGLE/renderer/gl/cgl/PbufferSurfaceCGL.mm
>-    src/libANGLE/renderer/gl/cgl/WindowSurfaceCGL.mm
>-)
>-
>-find_library(COREGRAPHICS_LIBRARY CoreGraphics)
>-find_library(OPENGL_LIBRARY OpenGL)
>-find_library(QUARTZCORE_LIBRARY QuartzCore)
>-list(APPEND ANGLEGLESv2_LIBRARIES
>-    PRIVATE ${COREGRAPHICS_LIBRARY}
>-    PRIVATE ${OPENGL_LIBRARY}
>-    PRIVATE ${QUARTZCORE_LIBRARY}
>-)
>diff --git a/Source/ThirdParty/ANGLE/PlatformPlayStation.cmake b/Source/ThirdParty/ANGLE/PlatformPlayStation.cmake
>new file mode 100644
>index 00000000000..5d358cae55d
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/PlatformPlayStation.cmake
>@@ -0,0 +1,2 @@
>+# Allow building ANGLE on platforms that don't provide X11 headers.
>+list(APPEND ANGLE_DEFINITIONS USE_WPE)
>diff --git a/Source/ThirdParty/ANGLE/PlatformWPE.cmake b/Source/ThirdParty/ANGLE/PlatformWPE.cmake
>new file mode 100644
>index 00000000000..5d358cae55d
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/PlatformWPE.cmake
>@@ -0,0 +1,2 @@
>+# Allow building ANGLE on platforms that don't provide X11 headers.
>+list(APPEND ANGLE_DEFINITIONS USE_WPE)
>diff --git a/Source/ThirdParty/ANGLE/PlatformWin.cmake b/Source/ThirdParty/ANGLE/PlatformWin.cmake
>index 3dcbf6fe303..65dbbc73812 100644
>--- a/Source/ThirdParty/ANGLE/PlatformWin.cmake
>+++ b/Source/ThirdParty/ANGLE/PlatformWin.cmake
>@@ -1,147 +1,32 @@
>-if (${CMAKE_GENERATOR} MATCHES "Ninja")
>-    if (${MSVC_CXX_ARCHITECTURE_ID} STREQUAL "X86")
>-        link_directories(${WINDOWSSDKDIR}Lib/${WINDOWSSDKLIBVERSION}/um/x86)
>-    else ()
>-        link_directories(${WINDOWSSDKDIR}Lib/${WINDOWSSDKLIBVERSION}/um/x64)
>-    endif ()
>-else ()
>-    if (${MSVC_CXX_ARCHITECTURE_ID} STREQUAL "X86")
>-        link_directories($(WINDOWSSDKDIR)Lib/$(WINDOWSSDKLIBVERSION)/um/x86)
>-    else ()
>-        link_directories($(WINDOWSSDKDIR)Lib/$(WINDOWSSDKLIBVERSION)/um/x64)
>-    endif ()
>-endif ()
>+# We're targeting Windows 10 which will have DirectX 11 on it so require that
>+# but make DirectX 9 optional
> 
>-list(APPEND ANGLEEGL_SOURCES
>-    src/libEGL/libEGL.def
>-    src/libEGL/libEGL.rc
>+list(APPEND ANGLE_DEFINITIONS
>+    GL_APICALL=
>+    GL_API=
>+    NOMINMAX
> )
> 
>-list(APPEND ANGLEEGL_COMPILE_DEFINITIONS
>-    __STDC_CONSTANT_MACROS
>-)
>+if (USE_ANGLE_EGL)
>+    # We're targeting Windows 10 which will have DirectX 11
>+    list(APPEND ANGLE_SOURCES
>+        ${angle_system_utils_sources_win}
>+        ${angle_translator_hlsl_sources}
> 
>-list(APPEND ANGLEGLESv2_SOURCES
>-    src/libGLESv2/libGLESv2.def
>-    src/libGLESv2/libGLESv2.rc
>-)
>+        ${libangle_d3d_shared_sources}
>+        ${libangle_d3d11_sources}
>+        ${libangle_d3d11_win32_sources}
>+    )
> 
>-list(APPEND ANGLEGLESv2_COMPILE_DEFINITIONS
>-    __STDC_CONSTANT_MACROS
>-    __STDC_LIMIT_MACROS
>-)
>+    list(APPEND ANGLE_DEFINITIONS
>+        ANGLE_ENABLE_HLSL
>+        ANGLE_ENABLE_D3D11
>+    )
> 
>-list(APPEND ANGLEGLESv2_LIBRARIES
>-    D3d9
>-)
>+    list(APPEND ANGLEGLESv2_LIBRARIES dxguid)
> 
>-list(APPEND ANGLE_SOURCES
>-    src/common/system_utils_win.cpp
>-    src/compiler/translator/AddDefaultReturnStatements.cpp
>-    src/compiler/translator/ArrayReturnValueToOutParameter.cpp
>-    src/compiler/translator/ASTMetadataHLSL.cpp
>-    src/compiler/translator/blocklayoutHLSL.cpp
>-    src/compiler/translator/BuiltInFunctionEmulatorHLSL.cpp
>-    src/compiler/translator/OutputHLSL.cpp
>-    src/compiler/translator/RemoveDynamicIndexing.cpp
>-    src/compiler/translator/RemoveSwitchFallThrough.cpp
>-    src/compiler/translator/RewriteElseBlocks.cpp
>-    src/compiler/translator/SeparateArrayInitialization.cpp
>-    src/compiler/translator/SeparateExpressionsReturningArrays.cpp
>-    src/compiler/translator/StructureHLSL.cpp
>-    src/compiler/translator/TextureFunctionHLSL.cpp
>-    src/compiler/translator/ImageFunctionHLSL.cpp
>-    src/compiler/translator/TranslatorHLSL.cpp
>-    src/compiler/translator/UnfoldShortCircuitToIf.cpp
>-    src/compiler/translator/UniformHLSL.cpp
>-    src/compiler/translator/UtilsHLSL.cpp
>-    src/compiler/translator/WrapSwitchStatementsInBlocks.cpp
>-    src/compiler/translator/emulated_builtin_functions_hlsl_autogen.cpp
>-    src/libANGLE/renderer/d3d/BufferD3D.cpp
>-    src/libANGLE/renderer/d3d/CompilerD3D.cpp
>-    src/libANGLE/renderer/d3d/DeviceD3D.cpp
>-    src/libANGLE/renderer/d3d/DisplayD3D.cpp
>-    src/libANGLE/renderer/d3d/DynamicHLSL.cpp
>-    src/libANGLE/renderer/d3d/EGLImageD3D.cpp
>-    src/libANGLE/renderer/d3d/FramebufferD3D.cpp
>-    src/libANGLE/renderer/d3d/HLSLCompiler.cpp
>-    src/libANGLE/renderer/d3d/ImageD3D.cpp
>-    src/libANGLE/renderer/d3d/IndexBuffer.cpp
>-    src/libANGLE/renderer/d3d/IndexDataManager.cpp
>-    src/libANGLE/renderer/d3d/NativeWindowD3D.cpp
>-    src/libANGLE/renderer/d3d/ProgramD3D.cpp
>-    src/libANGLE/renderer/d3d/RenderbufferD3D.cpp
>-    src/libANGLE/renderer/d3d/RendererD3D.cpp
>-    src/libANGLE/renderer/d3d/RenderTargetD3D.cpp
>-    src/libANGLE/renderer/d3d/ShaderD3D.cpp
>-    src/libANGLE/renderer/d3d/ShaderExecutableD3D.cpp
>-    src/libANGLE/renderer/d3d/SurfaceD3D.cpp
>-    src/libANGLE/renderer/d3d/SwapChainD3D.cpp
>-    src/libANGLE/renderer/d3d/TextureD3D.cpp
>-    src/libANGLE/renderer/d3d/VertexBuffer.cpp
>-    src/libANGLE/renderer/d3d/VertexDataManager.cpp
>-    src/libANGLE/renderer/d3d/d3d11/Blit11.cpp
>-    src/libANGLE/renderer/d3d/d3d11/Buffer11.cpp
>-    src/libANGLE/renderer/d3d/d3d11/Clear11.cpp
>-    src/libANGLE/renderer/d3d/d3d11/Context11.cpp
>-    src/libANGLE/renderer/d3d/d3d11/DebugAnnotator11.cpp
>-    src/libANGLE/renderer/d3d/d3d11/dxgi_format_map_autogen.cpp
>-    src/libANGLE/renderer/d3d/d3d11/dxgi_support_table.cpp
>-    src/libANGLE/renderer/d3d/d3d11/Fence11.cpp
>-    src/libANGLE/renderer/d3d/d3d11/formatutils11.cpp
>-    src/libANGLE/renderer/d3d/d3d11/Framebuffer11.cpp
>-    src/libANGLE/renderer/d3d/d3d11/Image11.cpp
>-    src/libANGLE/renderer/d3d/d3d11/IndexBuffer11.cpp
>-    src/libANGLE/renderer/d3d/d3d11/InputLayoutCache.cpp
>-    src/libANGLE/renderer/d3d/d3d11/PixelTransfer11.cpp
>-    src/libANGLE/renderer/d3d/d3d11/ProgramPipeline11.cpp
>-    src/libANGLE/renderer/d3d/d3d11/Query11.cpp
>-    src/libANGLE/renderer/d3d/d3d11/Renderer11.cpp
>-    src/libANGLE/renderer/d3d/d3d11/ResourceManager11.cpp
>-    src/libANGLE/renderer/d3d/d3d11/renderer11_utils.cpp
>-    src/libANGLE/renderer/d3d/d3d11/RenderStateCache.cpp
>-    src/libANGLE/renderer/d3d/d3d11/RenderTarget11.cpp
>-    src/libANGLE/renderer/d3d/d3d11/ShaderExecutable11.cpp
>-    src/libANGLE/renderer/d3d/d3d11/StateManager11.cpp
>-    src/libANGLE/renderer/d3d/d3d11/StreamProducerNV12.cpp
>-    src/libANGLE/renderer/d3d/d3d11/SwapChain11.cpp
>-    src/libANGLE/renderer/d3d/d3d11/TextureStorage11.cpp
>-    src/libANGLE/renderer/d3d/d3d11/TransformFeedback11.cpp
>-    src/libANGLE/renderer/d3d/d3d11/Trim11.cpp
>-    src/libANGLE/renderer/d3d/d3d11/texture_format_table_autogen.cpp
>-    src/libANGLE/renderer/d3d/d3d11/texture_format_table.cpp
>-    src/libANGLE/renderer/d3d/d3d11/VertexArray11.cpp
>-    src/libANGLE/renderer/d3d/d3d11/VertexBuffer11.cpp
>-    src/libANGLE/renderer/d3d/d3d9/Blit9.cpp
>-    src/libANGLE/renderer/d3d/d3d9/Buffer9.cpp
>-    src/libANGLE/renderer/d3d/d3d9/Context9.cpp
>-    src/libANGLE/renderer/d3d/d3d9/DebugAnnotator9.cpp
>-    src/libANGLE/renderer/d3d/d3d9/Fence9.cpp
>-    src/libANGLE/renderer/d3d/d3d9/formatutils9.cpp
>-    src/libANGLE/renderer/d3d/d3d9/Framebuffer9.cpp
>-    src/libANGLE/renderer/d3d/d3d9/Image9.cpp
>-    src/libANGLE/renderer/d3d/d3d9/IndexBuffer9.cpp
>-    src/libANGLE/renderer/d3d/d3d9/NativeWindow9.cpp
>-    src/libANGLE/renderer/d3d/d3d9/Query9.cpp
>-    src/libANGLE/renderer/d3d/d3d9/Renderer9.cpp
>-    src/libANGLE/renderer/d3d/d3d9/renderer9_utils.cpp
>-    src/libANGLE/renderer/d3d/d3d9/RenderTarget9.cpp
>-    src/libANGLE/renderer/d3d/d3d9/ShaderExecutable9.cpp
>-    src/libANGLE/renderer/d3d/d3d9/StateManager9.cpp
>-    src/libANGLE/renderer/d3d/d3d9/SwapChain9.cpp
>-    src/libANGLE/renderer/d3d/d3d9/TextureStorage9.cpp
>-    src/libANGLE/renderer/d3d/d3d9/VertexBuffer9.cpp
>-    src/libANGLE/renderer/d3d/d3d9/VertexDeclarationCache.cpp
>-    src/libANGLE/renderer/d3d/d3d11/win32/NativeWindow11Win32.cpp
>-    src/third_party/systeminfo/SystemInfo.cpp
>-)
>-
>-list(APPEND ANGLE_COMPILE_DEFINITIONS
>-    ANGLE_DEFAULT_D3D11=1
>-    ANGLE_ENABLE_D3D9
>-    ANGLE_ENABLE_D3D11
>-    ANGLE_ENABLE_HLSL
>-    ANGLE_SKIP_DXGI_1_2_CHECK=1
>-    __STDC_CONSTANT_MACROS
>-    __STDC_LIMIT_MACROS
>-)
>+    # DirectX 9 support should be optional but ANGLE will not compile without it
>+    list(APPEND ANGLE_SOURCES ${libangle_d3d9_sources})
>+    list(APPEND ANGLE_DEFINITIONS ANGLE_ENABLE_D3D9)
>+    list(APPEND ANGLEGLESv2_LIBRARIES d3d9)
>+endif ()
>diff --git a/Source/ThirdParty/ANGLE/README.chromium b/Source/ThirdParty/ANGLE/README.chromium
>index b141fb53074..bcee64a416a 100644
>--- a/Source/ThirdParty/ANGLE/README.chromium
>+++ b/Source/ThirdParty/ANGLE/README.chromium
>@@ -1,10 +1,12 @@
> Name: ANGLE
>-URL: https://code.google.com/p/angleproject/
>-Version: 2422
>+URL: http://angleproject.org
>+Version: unknown
> License: BSD
> License File: LICENSE
> 
> Description:
>-ANGLE is a conformant implementation of the OpenGL ES 2.0
>-specification that is hardwareâaccelerated via Direct3D.
>+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.
> 
>diff --git a/Source/ThirdParty/ANGLE/README.md b/Source/ThirdParty/ANGLE/README.md
>index 91a47441b90..b32d55254cb 100644
>--- a/Source/ThirdParty/ANGLE/README.md
>+++ b/Source/ThirdParty/ANGLE/README.md
>@@ -19,10 +19,10 @@ underway, and future plans include compute shader support (ES 3.1) and MacOS sup
> |             |    Direct3D 9  |   Direct3D 11  |   Desktop GL  |    GL ES    |   Vulkan    |
> |------------:|:--------------:|:--------------:|:-------------:|:-----------:|:-----------:|
> | Windows     |    complete    |    complete    |   complete    |   complete  | in progress |
>-| Linux       |                |                |   complete    |             |   planned   |
>-| Mac OS X    |                |                |   in progress |             |             |
>+| Linux       |                |                |   complete    |             | in progress |
>+| Mac OS X    |                |                |  in progress  |             |             |
> | Chrome OS   |                |                |               |   complete  |   planned   |
>-| Android     |                |                |               |   complete  |   planned   |
>+| Android     |                |                |               |   complete  | in progress |
> 
> 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.
>@@ -49,27 +49,30 @@ ANGLE repository is hosted by Chromium project and can be
> 
> ## Building
> 
>-View the [Dev setup instructions](doc/DevSetup.md). For generating a Windows Store version of ANGLE view the [Windows Store instructions](doc/BuildingAngleForWindowsStore.md)
>+View the [Dev setup instructions](doc/DevSetup.md).
> 
> ## Contributing
> 
> * Join our [Google group](https://groups.google.com/group/angleproject) to keep up to date.
> * Join us on IRC in the #ANGLEproject channel on FreeNode.
>-* File bugs in the [issue tracker](http://code.google.com/p/angleproject/issues/list) (preferably with an isolated test-case).
>+* Join us on [Slack](https://chromium.slack.com) in the #angle channel.
>+* [File bugs](http://anglebug.com/new) in the [issue tracker](https://bugs.chromium.org/p/angleproject/issues/list) (preferably with an isolated test-case).
> * [Choose an ANGLE branch](doc/ChoosingANGLEBranch.md) to track in your own project.
> 
> 
> * Read ANGLE development [documentation](doc).
>-* Look at [pending](https://chromium-review.googlesource.com/#/q/project:angle/angle+status:open)
>-  and [merged](https://chromium-review.googlesource.com/#/q/project:angle/angle+status:merged) changes.
>+* Look at [pending](https://chromium-review.googlesource.com/q/project:angle/angle+status:open)
>+  and [merged](https://chromium-review.googlesource.com/q/project:angle/angle+status:merged) changes.
> * Become a [code contributor](doc/ContributingCode.md).
> * Use ANGLE's [coding standard](doc/CodingStandard.md).
> * Learn how to [build ANGLE for Chromium development](doc/BuildingAngleForChromiumDevelopment.md).
> * Get help on [debugging ANGLE](doc/DebuggingTips.md).
>+* Go through [ANGLE's orientation](doc/Orientation.md) and sift through [starter projects](doc/Starter-Projects.md).
> 
> 
> * Read about WebGL on the [Khronos WebGL Wiki](http://khronos.org/webgl/wiki/Main_Page).
> * Learn about implementation details in the [OpenGL Insights chapter on ANGLE](http://www.seas.upenn.edu/~pcozzi/OpenGLInsights/OpenGLInsights-ANGLE.pdf) and this [ANGLE presentation](https://drive.google.com/file/d/0Bw29oYeC09QbbHoxNE5EUFh0RGs/view?usp=sharing).
>-* Learn about the past, present, and future of the ANGLE implementation in [this recent presentation](https://docs.google.com/presentation/d/1CucIsdGVDmdTWRUbg68IxLE5jXwCb2y1E9YVhQo0thg/pub?start=false&loop=false).
>+* Learn about the past, present, and future of the ANGLE implementation in [this presentation](https://docs.google.com/presentation/d/1CucIsdGVDmdTWRUbg68IxLE5jXwCb2y1E9YVhQo0thg/pub?start=false&loop=false).
>+* Watch a [short presentation](https://youtu.be/QrIKdjmpmaA) on the Vulkan back-end.
>+* Track the [dEQP test conformance](doc/dEQP-Charts.md)
> * If you use ANGLE in your own project, we'd love to hear about it!
>-
>diff --git a/Source/ThirdParty/ANGLE/WATCHLISTS b/Source/ThirdParty/ANGLE/WATCHLISTS
>new file mode 100644
>index 00000000000..f4139e54353
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/WATCHLISTS
>@@ -0,0 +1,24 @@
>+# Copyright 2019 The ANGLE Project Authors. All rights reserved.
>+# Use of this source code is governed by a BSD-style license that can be
>+# found in the LICENSE file.
>+
>+# Watchlist Rules
>+# Refer: http://dev.chromium.org/developers/contributing-code/watchlists
>+
>+# IMPORTANT: The regular expression filepath is tested against each path using
>+# re.search, so it is not usually necessary to add .*.
>+
>+{
>+  'WATCHLIST_DEFINITIONS': {
>+    'vulkan': {
>+      'filepath': 'src/libANGLE/renderer/vulkan/',
>+    },
>+  },
>+
>+  ##############################################################################
>+  # Please keep alphabetical
>+  ##############################################################################
>+  'WATCHLISTS': {
>+    'vulkan': ['jmadill+watch@chromium.org'],
>+  },
>+}
>diff --git a/Source/ThirdParty/ANGLE/additional_readme_paths.json b/Source/ThirdParty/ANGLE/additional_readme_paths.json
>new file mode 100644
>index 00000000000..4bb2934a793
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/additional_readme_paths.json
>@@ -0,0 +1,4 @@
>+[
>+    "src/common/third_party/xxhash",
>+    "src/third_party/compiler"
>+]
>\ No newline at end of file
>diff --git a/Source/ThirdParty/ANGLE/android/AndroidManifest.xml.jinja2 b/Source/ThirdParty/ANGLE/android/AndroidManifest.xml.jinja2
>new file mode 100644
>index 00000000000..b559b37da2c
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/android/AndroidManifest.xml.jinja2
>@@ -0,0 +1,20 @@
>+<?xml version="1.0" encoding="utf-8"?>
>+
>+
>+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
>+          xmlns:tools="http://schemas.android.com/tools"
>+          package="{{manifest_package|default('com.chromium.angle')}}">
>+
>+    <uses-sdk android:minSdkVersion="26"
>+              android:targetSdkVersion="28">
>+    </uses-sdk>
>+
>+    <application android:label="Angle for Android"
>+                 android:extractNativeLibs="false"
>+                 android:multiArch="true">
>+    </application>
>+</manifest>
>diff --git a/Source/ThirdParty/ANGLE/android/OWNERS b/Source/ThirdParty/ANGLE/android/OWNERS
>new file mode 100644
>index 00000000000..f38b3668a9f
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/android/OWNERS
>@@ -0,0 +1,6 @@
>+alanward@google.com
>+cnorthrop@google.com
>+courtneygo@google.com
>+ianelliott@google.com
>+timvp@google.com
>+tobine@google.com
>\ No newline at end of file
>diff --git a/Source/ThirdParty/ANGLE/android/angle_apk.gni b/Source/ThirdParty/ANGLE/android/angle_apk.gni
>new file mode 100644
>index 00000000000..d2904abc08a
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/android/angle_apk.gni
>@@ -0,0 +1,114 @@
>+# Copyright 2018 The Chromium Authors. All rights reserved.
>+# Use of this source code is governed by a BSD-style license that can be
>+# found in the LICENSE file.
>+
>+import("//build/config/android/rules.gni")
>+import("//third_party/angle/gni/angle.gni")
>+
>+vulkan_validation_layers = [
>+  "VkLayer_core_validation",
>+  "VkLayer_object_lifetimes",
>+  "VkLayer_stateless_validation",
>+  "VkLayer_thread_safety",
>+  "VkLayer_unique_objects",
>+]
>+
>+angle_libraries = [
>+  "EGL",
>+  "GLESv1_CM",
>+  "GLESv2",
>+  "feature_support",
>+]
>+
>+template("angle_apk") {
>+  manifest_target_name = "${target_name}__manifest"
>+  manifest_path = "${target_gen_dir}/${target_name}/android/AndroidManifest.xml"
>+
>+  jinja_template(manifest_target_name) {
>+    input = "//third_party/angle/android/AndroidManifest.xml.jinja2"
>+    output = manifest_path
>+    variables = [ "manifest_package=${invoker.package_name}" ]
>+  }
>+
>+  android_assets("${invoker.package_name}_assets") {
>+    disable_compression = true
>+    sources = [
>+      "src/feature_support_util/a4a_rules.json",
>+    ]
>+  }
>+
>+  android_apk(target_name) {
>+    forward_variables_from(invoker, "*")
>+    android_manifest = manifest_path
>+    android_manifest_dep = ":$manifest_target_name"
>+    deps = [
>+      ":${invoker.package_name}_assets",
>+    ]
>+    if (symbol_level != 0) {
>+      deps += [ ":compressed_symbols" ]
>+      if (build_apk_secondary_abi && android_64bit_target_cpu) {
>+        deps += [ ":compressed_symbols($android_secondary_abi_toolchain)" ]
>+      }
>+    }
>+
>+    uncompress_shared_libraries = true
>+
>+    if (build_apk_secondary_abi && android_64bit_target_cpu) {
>+      if (symbol_level == 0) {
>+        secondary_abi_shared_libraries = []
>+        foreach(_library, angle_libraries) {
>+          secondary_abi_shared_libraries +=
>+              [ "${angle_root}:lib${_library}${angle_libs_suffix}" +
>+                "($android_secondary_abi_toolchain)" ]
>+        }
>+        if (angle_enable_vulkan_validation_layers) {
>+          foreach(_layer, vulkan_validation_layers) {
>+            secondary_abi_shared_libraries += [
>+              "${angle_root}/third_party/vulkan-validation-layers:${_layer}" +
>+                  "($android_secondary_abi_toolchain)",
>+            ]
>+          }
>+        }
>+      } else {
>+        _secondary_out_dir = get_label_info(
>+                ":compressed_symbols($android_secondary_abi_toolchain)",
>+                "root_out_dir")
>+        secondary_abi_loadable_modules = []
>+        foreach(_library, angle_libraries) {
>+          secondary_abi_loadable_modules += [ "${_secondary_out_dir}/lib.compressed/lib${_library}${angle_libs_suffix}.so" ]
>+        }
>+        if (angle_enable_vulkan_validation_layers) {
>+          foreach(_layer, vulkan_validation_layers) {
>+            secondary_abi_loadable_modules +=
>+                [ "${_secondary_out_dir}/lib.compressed/lib${_layer}.so" ]
>+          }
>+        }
>+      }
>+    }
>+
>+    if (symbol_level == 0) {
>+      shared_libraries = []
>+      foreach(_library, angle_libraries) {
>+        shared_libraries +=
>+            [ "${angle_root}:lib${_library}${angle_libs_suffix}" ]
>+      }
>+      if (angle_enable_vulkan_validation_layers) {
>+        foreach(_layer, vulkan_validation_layers) {
>+          shared_libraries +=
>+              [ "${angle_root}/third_party/vulkan-validation-layers:${_layer}" ]
>+        }
>+      }
>+    } else {
>+      loadable_modules = []
>+      foreach(_library, angle_libraries) {
>+        loadable_modules += [ "${root_out_dir}/lib.compressed/lib${_library}${angle_libs_suffix}.so" ]
>+      }
>+      if (angle_enable_vulkan_validation_layers) {
>+        foreach(_layer, vulkan_validation_layers) {
>+          loadable_modules +=
>+              [ "${root_out_dir}/lib.compressed/lib${_layer}.so" ]
>+        }
>+      }
>+    }
>+  }
>+}
>diff --git a/Source/ThirdParty/ANGLE/android/compress_symbols.py b/Source/ThirdParty/ANGLE/android/compress_symbols.py
>new file mode 100644
>index 00000000000..ab0ed91d459
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/android/compress_symbols.py
>@@ -0,0 +1,128 @@
>+#!/usr/bin/env python
>+#  Copyright 2018 The ANGLE Project Authors. All rights reserved.
>+#  Use of this source code is governed by a BSD-style license that can be
>+#  found in the LICENSE file.
>+
>+# Generate library file with compressed symbols per Android build
>+# process.
>+#
>+
>+import argparse
>+import os
>+import subprocess
>+import sys
>+
>+
>+def main():
>+  parser = argparse.ArgumentParser(description=__doc__)
>+  parser.add_argument(
>+      '--objcopy',
>+      required=True,
>+      help='The objcopy binary to run',
>+      metavar='PATH')
>+  parser.add_argument(
>+      '--nm', required=True, help='The nm binary to run', metavar='PATH')
>+  parser.add_argument(
>+      '--sofile',
>+      required=True,
>+      help='Shared object file produced by linking command',
>+      metavar='FILE')
>+  parser.add_argument(
>+      '--output',
>+      required=True,
>+      help='Final output shared object file',
>+      metavar='FILE')
>+  parser.add_argument(
>+      '--unstrippedsofile',
>+      required=True,
>+      help='Unstripped shared object file produced by linking command',
>+      metavar='FILE')
>+  args = parser.parse_args()
>+
>+  copy_cmd = ["cp", args.sofile, args.output]
>+  result = subprocess.call(copy_cmd)
>+
>+  objcopy_cmd = [args.objcopy]
>+  objcopy_cmd.append('--only-keep-debug')
>+  objcopy_cmd.append(args.unstrippedsofile)
>+  objcopy_cmd.append(args.output + '.debug')
>+  result = subprocess.call(objcopy_cmd)
>+
>+  nm_cmd = subprocess.Popen(
>+      [args.nm, args.unstrippedsofile, '--format=posix', '--defined-only'],
>+      stdout=subprocess.PIPE)
>+
>+  awk_cmd = subprocess.Popen(['awk', '{ print $1}'],
>+                             stdin=nm_cmd.stdout,
>+                             stdout=subprocess.PIPE)
>+
>+  dynsym_out = open(args.output + '.dynsyms', 'w')
>+  sort_cmd = subprocess.Popen(['sort'], stdin=awk_cmd.stdout, stdout=dynsym_out)
>+  dynsym_out.close()
>+
>+  nm_cmd = subprocess.Popen(
>+      [args.nm, args.unstrippedsofile, '--format=posix', '--defined-only'],
>+      stdout=subprocess.PIPE)
>+
>+  awk_cmd = subprocess.Popen(
>+      ['awk', '{ if ($2 == "T" || $2 == "t" ||' + ' $2 == "D") print $1 }'],
>+      stdin=nm_cmd.stdout,
>+      stdout=subprocess.PIPE)
>+
>+  funcsyms_out = open(args.output + '.funcsyms', 'w')
>+  sort_cmd = subprocess.Popen(['sort'],
>+                              stdin=awk_cmd.stdout,
>+                              stdout=funcsyms_out)
>+  funcsyms_out.close()
>+
>+  keep_symbols = open(args.output + '.keep_symbols', 'w')
>+  sort_cmd = subprocess.Popen(
>+      ['comm', '-13', args.output + '.dynsyms', args.output + '.funcsyms'],
>+      stdin=awk_cmd.stdout,
>+      stdout=keep_symbols)
>+
>+  # Ensure that the keep_symbols file is not empty.
>+  keep_symbols.write("\n")
>+  keep_symbols.close()
>+
>+  objcopy_cmd = [
>+      args.objcopy, '--rename-section', '.debug_frame=saved_debug_frame',
>+      args.output + '.debug', args.output + ".mini_debuginfo"
>+  ]
>+  subprocess.check_call(objcopy_cmd)
>+
>+  objcopy_cmd = [
>+      args.objcopy, '-S', '--remove-section', '.gdb_index', '--remove-section',
>+      '.comment', '--keep-symbols=' + args.output + '.keep_symbols',
>+      args.output + '.mini_debuginfo'
>+  ]
>+  subprocess.check_call(objcopy_cmd)
>+
>+  objcopy_cmd = [
>+      args.objcopy, '--rename-section', '.saved_debug_frame=.debug_frame',
>+      args.output + ".mini_debuginfo"
>+  ]
>+  subprocess.check_call(objcopy_cmd)
>+
>+  xz_cmd = ['xz', args.output + '.mini_debuginfo']
>+  subprocess.check_call(xz_cmd)
>+
>+  objcopy_cmd = [
>+      args.objcopy, '--add-section',
>+      '.gnu_debugdata=' + args.output + '.mini_debuginfo.xz', args.output
>+  ]
>+  subprocess.check_call(objcopy_cmd)
>+
>+  # Clean out scratch files
>+  rm_cmd = [
>+      'rm', '-f', args.output + '.dynsyms', args.output + '.funcsyms',
>+      args.output + '.keep_symbols', args.output + '.debug',
>+      args.output + '.mini_debuginfo', args.output + '.mini_debuginfo.xz'
>+  ]
>+  result = subprocess.call(rm_cmd)
>+
>+  return result
>+
>+
>+if __name__ == "__main__":
>+  sys.exit(main())
>diff --git a/Source/ThirdParty/ANGLE/build_overrides/angle.gni b/Source/ThirdParty/ANGLE/build_overrides/angle.gni
>new file mode 100644
>index 00000000000..903a1f51e0d
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/build_overrides/angle.gni
>@@ -0,0 +1,11 @@
>+# Copyright 2019 The ANGLE Project Authors. All rights reserved.
>+# Use of this source code is governed by a BSD-style license that can be
>+# found in the LICENSE file.
>+
>+# Overrides for ANGLE's dependencies
>+angle_glslang_dir = "//third_party/glslang/src"
>+angle_googletest_dir = "//third_party/googletest/src"
>+angle_libjpeg_turbo_dir = "//third_party/libjpeg_turbo"
>+angle_jsoncpp_dir = "//third_party/jsoncpp"
>+angle_libpng_dir = "//third_party/libpng"
>+angle_spirv_tools_dir = "//third_party/spirv-tools/src"
>diff --git a/Source/ThirdParty/ANGLE/build_overrides/build.gni b/Source/ThirdParty/ANGLE/build_overrides/build.gni
>new file mode 100644
>index 00000000000..e82a3fe5cdd
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/build_overrides/build.gni
>@@ -0,0 +1,26 @@
>+# Copyright (c) 2017 The ANGLE Project Authors. All rights reserved.
>+# Use of this source code is governed by a BSD-style license that can be
>+# found in the LICENSE file.
>+
>+declare_args() {
>+  build_with_chromium = false
>+  ignore_elf32_limitations = true
>+  linux_use_bundled_binutils_override = false
>+
>+  use_system_xcode = ""
>+}
>+
>+if (host_os == "mac" && use_system_xcode == "") {
>+  _result = exec_script("//build/mac/should_use_hermetic_xcode.py",
>+                        [ target_os ],
>+                        "value")
>+
>+  assert(_result != 2,
>+         "Do not allow building targets with the default" +
>+             "hermetic toolchain if the minimum OS version is not met.")
>+  assert(_result != 3,
>+         "iOS does not support building with a hermetic toolchain. " +
>+             "Please install Xcode.")
>+
>+  use_system_xcode = _result != 1
>+}
>diff --git a/Source/ThirdParty/ANGLE/build_overrides/glslang.gni b/Source/ThirdParty/ANGLE/build_overrides/glslang.gni
>new file mode 100644
>index 00000000000..534d55d9113
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/build_overrides/glslang.gni
>@@ -0,0 +1,6 @@
>+# Copyright 2019 The ANGLE Project Authors. All rights reserved.
>+# Use of this source code is governed by a BSD-style license that can be
>+# found in the LICENSE file.
>+
>+# Paths to glslang dependencies in ANGLE
>+glslang_spirv_tools_dir = "//third_party/spirv-tools/src"
>diff --git a/Source/ThirdParty/ANGLE/build_overrides/gtest.gni b/Source/ThirdParty/ANGLE/build_overrides/gtest.gni
>new file mode 100644
>index 00000000000..5344cd8318d
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/build_overrides/gtest.gni
>@@ -0,0 +1,17 @@
>+# Copyright 2019 The ANGLE Project Authors. All rights reserved.
>+# Use of this source code is governed by a BSD-style license that can be
>+# found in the LICENSE file.
>+
>+# Override settings for third_party integration with Google Test.
>+
>+# Exclude support for registering main function in multi-process tests.
>+gtest_include_multiprocess = true
>+
>+# Exclude support for platform-specific operations across unit tests.
>+gtest_include_platform_test = true
>+
>+# Exclude support for testing Objective C code on OS X and iOS.
>+gtest_include_objc_support = true
>+
>+# Exclude support for flushing coverage files on iOS.
>+gtest_include_ios_coverage = true
>diff --git a/Source/ThirdParty/ANGLE/build_overrides/spirv_tools.gni b/Source/ThirdParty/ANGLE/build_overrides/spirv_tools.gni
>new file mode 100644
>index 00000000000..adfa08b6d8f
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/build_overrides/spirv_tools.gni
>@@ -0,0 +1,10 @@
>+# Copyright 2019 The ANGLE Project Authors. All rights reserved.
>+# Use of this source code is governed by a BSD-style license that can be
>+# found in the LICENSE file.
>+
>+# We are building inside ANGLE
>+spirv_tools_standalone = false
>+
>+# Paths to SPIRV-Tools dependencies in ANGLE
>+spirv_tools_googletest_dir = "//third_party/googletest/src"
>+spirv_tools_spirv_headers_dir = "//third_party/spirv-headers/src"
>diff --git a/Source/ThirdParty/ANGLE/changes.diff b/Source/ThirdParty/ANGLE/changes.diff
>deleted file mode 100644
>index c3afb79e51a..00000000000
>--- a/Source/ThirdParty/ANGLE/changes.diff
>+++ /dev/null
>@@ -1,8109 +0,0 @@
>-diff --git a/include/GLSLANG/ShaderLang.h b/include/GLSLANG/ShaderLang.h
>-index 1468bb146..2875c02ab 100644
>---- a/include/GLSLANG/ShaderLang.h
>-+++ b/include/GLSLANG/ShaderLang.h
>-@@ -8,7 +8,7 @@
>- 
>- #include <stddef.h>
>- 
>--#include "KHR/khrplatform.h"
>-+#include "khrplatform.h"
>- 
>- #include <array>
>- #include <map>
>-diff --git a/include/GLSLANG/ShaderVars.h b/include/GLSLANG/ShaderVars.h
>-index 709428aeb..acd9c358f 100644
>---- a/include/GLSLANG/ShaderVars.h
>-+++ b/include/GLSLANG/ShaderVars.h
>-@@ -281,10 +281,17 @@ struct WorkGroupSize
>- {
>-     // Must have a trivial default constructor since it is used in YYSTYPE.
>-     WorkGroupSize() = default;
>-+#if defined(__clang__)
>-+#pragma clang diagnostic push
>-+#pragma clang diagnostic ignored "-Wmissing-braces"
>-+#endif
>-     explicit constexpr WorkGroupSize(int initialSize)
>-         : localSizeQualifiers{initialSize, initialSize, initialSize}
>-     {
>-     }
>-+#if defined(__clang__)
>-+#pragma clang diagnostic pop
>-+#endif
>- 
>-     void fill(int fillValue);
>-     void setLocalSize(int localSizeX, int localSizeY, int localSizeZ);
>-diff --git a/include/KHR/khrplatform.h b/include/KHR/khrplatform.h
>-old mode 100755
>-new mode 100644
>-index 68fca4827..07b61b9bd
>---- a/include/KHR/khrplatform.h
>-+++ b/include/KHR/khrplatform.h
>-@@ -282,4 +282,4 @@ typedef enum {
>-     KHRONOS_BOOLEAN_ENUM_FORCE_SIZE = KHRONOS_MAX_ENUM
>- } khronos_boolean_enum_t;
>- 
>--#endif /* __khrplatform_h_ */
>-\ No newline at end of file
>-+#endif /* __khrplatform_h_ */
>-diff --git a/src/common/third_party/smhasher/src/PMurHash.cpp b/src/common/third_party/smhasher/src/PMurHash.cpp
>-index 071bc3153..2d608e97d 100644
>---- a/src/common/third_party/smhasher/src/PMurHash.cpp
>-+++ b/src/common/third_party/smhasher/src/PMurHash.cpp
>-@@ -74,6 +74,12 @@ on big endian machines, or a byte-by-byte read if the endianess is unknown.
>-  * ROTL32(x,r)      Rotate x left by r bits
>-  */
>- 
>-+#if !defined(__BYTE_ORDER) && defined(__GNUC__)
>-+  #define __BIG_ENDIAN __ORDER_BIG_ENDIAN__
>-+  #define __LITTLE_ENDIAN __ORDER_LITTLE_ENDIAN__
>-+  #define __BYTE_ORDER __BYTE_ORDER__
>-+#endif
>-+
>- /* Convention is to define __BYTE_ORDER == to one of these values */
>- #if !defined(__BIG_ENDIAN)
>-   #define __BIG_ENDIAN 4321
>-@@ -84,7 +90,9 @@ on big endian machines, or a byte-by-byte read if the endianess is unknown.
>- 
>- /* I386 */
>- #if defined(_M_IX86) || defined(__i386__) || defined(__i386) || defined(i386)
>--  #define __BYTE_ORDER __LITTLE_ENDIAN
>-+  #if !defined(__BYTE_ORDER)
>-+    #define __BYTE_ORDER __LITTLE_ENDIAN
>-+  #endif
>-   #define UNALIGNED_SAFE
>- #endif
>- 
>-@@ -111,7 +119,14 @@ on big endian machines, or a byte-by-byte read if the endianess is unknown.
>- /* Now find best way we can to READ_UINT32 */
>- #if __BYTE_ORDER==__LITTLE_ENDIAN
>-   /* CPU endian matches murmurhash algorithm, so read 32-bit word directly */
>-+#if defined(__clang__)
>-+#pragma clang diagnostic push
>-+#pragma clang diagnostic ignored "-Wcast-align"
>-+#endif
>-   #define READ_UINT32(ptr)   (*((uint32_t*)(ptr)))
>-+#if defined(__clang__)
>-+#pragma clang diagnostic pop
>-+#endif
>- #elif __BYTE_ORDER==__BIG_ENDIAN
>-   /* TODO: Add additional cases below where a compiler provided bswap32 is available */
>-   #if defined(__GNUC__) && (__GNUC__>4 || (__GNUC__==4 && __GNUC_MINOR__>=3))
>-@@ -218,14 +233,28 @@ void PMurHash32_Process(uint32_t *ph1, uint32_t *pcarry, const void *key, int le
>-   switch(n) { /* how many bytes in c */
>-   case 0: /* c=[----]  w=[3210]  b=[3210]=w            c'=[----] */
>-     for( ; ptr < end ; ptr+=4) {
>-+#if defined(__clang__)
>-+#pragma clang diagnostic push
>-+#pragma clang diagnostic ignored "-Wcast-align"
>-+#endif
>-       uint32_t k1 = READ_UINT32(ptr);
>-+#if defined(__clang__)
>-+#pragma clang diagnostic pop
>-+#endif
>-       DOBLOCK(h1, k1);
>-     }
>-     break;
>-   case 1: /* c=[0---]  w=[4321]  b=[3210]=c>>24|w<<8   c'=[4---] */
>-     for( ; ptr < end ; ptr+=4) {
>-       uint32_t k1 = c>>24;
>-+#if defined(__clang__)
>-+#pragma clang diagnostic push
>-+#pragma clang diagnostic ignored "-Wcast-align"
>-+#endif
>-       c = READ_UINT32(ptr);
>-+#if defined(__clang__)
>-+#pragma clang diagnostic pop
>-+#endif
>-       k1 |= c<<8;
>-       DOBLOCK(h1, k1);
>-     }
>-@@ -233,7 +262,14 @@ void PMurHash32_Process(uint32_t *ph1, uint32_t *pcarry, const void *key, int le
>-   case 2: /* c=[10--]  w=[5432]  b=[3210]=c>>16|w<<16  c'=[54--] */
>-     for( ; ptr < end ; ptr+=4) {
>-       uint32_t k1 = c>>16;
>-+#if defined(__clang__)
>-+#pragma clang diagnostic push
>-+#pragma clang diagnostic ignored "-Wcast-align"
>-+#endif
>-       c = READ_UINT32(ptr);
>-+#if defined(__clang__)
>-+#pragma clang diagnostic pop
>-+#endif
>-       k1 |= c<<16;
>-       DOBLOCK(h1, k1);
>-     }
>-@@ -241,7 +277,14 @@ void PMurHash32_Process(uint32_t *ph1, uint32_t *pcarry, const void *key, int le
>-   case 3: /* c=[210-]  w=[6543]  b=[3210]=c>>8|w<<24   c'=[654-] */
>-     for( ; ptr < end ; ptr+=4) {
>-       uint32_t k1 = c>>8;
>-+#if defined(__clang__)
>-+#pragma clang diagnostic push
>-+#pragma clang diagnostic ignored "-Wcast-align"
>-+#endif
>-       c = READ_UINT32(ptr);
>-+#if defined(__clang__)
>-+#pragma clang diagnostic pop
>-+#endif
>-       k1 |= c<<24;
>-       DOBLOCK(h1, k1);
>-     }
>-diff --git a/src/compiler/preprocessor/ExpressionParser.cpp b/src/compiler/preprocessor/ExpressionParser.cpp
>-index ede334619..c0f8b9c97 100644
>---- a/src/compiler/preprocessor/ExpressionParser.cpp
>-+++ b/src/compiler/preprocessor/ExpressionParser.cpp
>-@@ -1,5 +1,7 @@
>- /* A Bison parser, made by GNU Bison 3.0.4.  */
>- 
>-+/* Apple Note: For the avoidance of doubt, Apple elects to distribute this file under the terms of the BSD license. */
>-+
>- /* Bison implementation for Yacc-like parsers in C
>- 
>-    Copyright (C) 1984, 1989-1990, 2000-2015 Free Software Foundation, Inc.
>-diff --git a/src/compiler/preprocessor/Tokenizer.cpp b/src/compiler/preprocessor/Tokenizer.cpp
>-index d8a9b9a12..d7fad68f1 100644
>---- a/src/compiler/preprocessor/Tokenizer.cpp
>-+++ b/src/compiler/preprocessor/Tokenizer.cpp
>-@@ -1148,7 +1148,7 @@ static void yy_flex_strncpy ( char *, const char *, int , yyscan_t yyscanner);
>- static int yy_flex_strlen ( const char * , yyscan_t yyscanner);
>- #endif
>- 
>--#ifndef YY_NO_INPUT
>-+#if 0 // #ifndef YY_NO_INPUT
>- #ifdef __cplusplus
>- static int yyinput ( yyscan_t yyscanner );
>- #else
>-@@ -2049,7 +2049,7 @@ static int yy_get_next_buffer (yyscan_t yyscanner)
>- 
>- #endif
>- 
>--#ifndef YY_NO_INPUT
>-+#if 0 // #ifndef YY_NO_INPUT
>- #ifdef __cplusplus
>-     static int yyinput (yyscan_t yyscanner)
>- #else
>-diff --git a/src/compiler/translator/ParseContext.cpp b/src/compiler/translator/ParseContext.cpp
>-index c97f91d78..d0a4f6aeb 100644
>---- a/src/compiler/translator/ParseContext.cpp
>-+++ b/src/compiler/translator/ParseContext.cpp
>-@@ -3240,8 +3240,11 @@ TIntermFunctionPrototype *TParseContext::addFunctionPrototypeDeclaration(
>-     }
>-     function->setHasPrototypeDeclaration();
>- 
>-+    // WebKit note: We currently pass true instead of false for the last parameter
>-+    // here because some compilers have an issue with nameless parameters in function
>-+    // declarations.
>-     TIntermFunctionPrototype *prototype =
>--        createPrototypeNodeFromFunction(*function, location, false);
>-+        createPrototypeNodeFromFunction(*function, location, true);
>- 
>-     symbolTable.pop();
>- 
>-diff --git a/src/compiler/translator/TranslatorHLSL.h b/src/compiler/translator/TranslatorHLSL.h
>-index d7005a603..e8436e98e 100644
>---- a/src/compiler/translator/TranslatorHLSL.h
>-+++ b/src/compiler/translator/TranslatorHLSL.h
>-@@ -16,7 +16,7 @@ class TranslatorHLSL : public TCompiler
>- {
>-   public:
>-     TranslatorHLSL(sh::GLenum type, ShShaderSpec spec, ShShaderOutput output);
>--    TranslatorHLSL *getAsTranslatorHLSL() override { return this; }
>-+    TranslatorHLSL *getAsTranslatorHLSL() { return this; }
>- 
>-     bool hasUniformBlock(const std::string &interfaceBlockName) const;
>-     unsigned int getUniformBlockRegister(const std::string &interfaceBlockName) const;
>-diff --git a/src/compiler/translator/glslang_tab.cpp b/src/compiler/translator/glslang_tab.cpp
>-index ce4aacf40..14cd5360c 100644
>---- a/src/compiler/translator/glslang_tab.cpp
>-+++ b/src/compiler/translator/glslang_tab.cpp
>-@@ -1,5 +1,7 @@
>- /* A Bison parser, made by GNU Bison 3.0.4.  */
>- 
>-+/* Apple Note: For the avoidance of doubt, Apple elects to distribute this file under the terms of the BSD license. */
>-+
>- /* Bison implementation for Yacc-like parsers in C
>- 
>-    Copyright (C) 1984, 1989-1990, 2000-2015 Free Software Foundation, Inc.
>-diff --git a/src/compiler/translator/glslang_tab.h b/src/compiler/translator/glslang_tab.h
>-index 1f5308551..cb43a46df 100644
>---- a/src/compiler/translator/glslang_tab.h
>-+++ b/src/compiler/translator/glslang_tab.h
>-@@ -1,5 +1,7 @@
>- /* A Bison parser, made by GNU Bison 3.0.4.  */
>- 
>-+/* Apple Note: For the avoidance of doubt, Apple elects to distribute this file under the terms of the BSD license. */
>-+
>- /* Bison interface for Yacc-like parsers in C
>- 
>-    Copyright (C) 1984, 1989-1990, 2000-2015 Free Software Foundation, Inc.
>-diff --git a/src/libANGLE/MemoryProgramCache.cpp b/src/libANGLE/MemoryProgramCache.cpp
>-index 9eec12e3e..2a9c6836a 100644
>---- a/src/libANGLE/MemoryProgramCache.cpp
>-+++ b/src/libANGLE/MemoryProgramCache.cpp
>-@@ -234,7 +234,10 @@ LinkResult MemoryProgramCache::Deserialize(const Context *context,
>- 
>-     static_assert(MAX_VERTEX_ATTRIBS <= sizeof(unsigned long) * 8,
>-                   "Too many vertex attribs for mask");
>-+#pragma clang diagnostic push
>-+#pragma clang diagnostic ignored "-Wconversion"
>-     state->mActiveAttribLocationsMask = stream.readInt<unsigned long>();
>-+#pragma clang diagnostic pop
>- 
>-     unsigned int attribCount = stream.readInt<unsigned int>();
>-     ASSERT(state->mAttributes.empty());
>-@@ -408,7 +411,10 @@ LinkResult MemoryProgramCache::Deserialize(const Context *context,
>-     state->mAtomicCounterUniformRange   = RangeUI(atomicCounterRangeLow, atomicCounterRangeHigh);
>- 
>-     static_assert(SHADER_TYPE_MAX <= sizeof(unsigned long) * 8, "Too many shader types");
>-+#pragma clang diagnostic push
>-+#pragma clang diagnostic ignored "-Wconversion"
>-     state->mLinkedShaderStages = stream.readInt<unsigned long>();
>-+#pragma clang diagnostic pop
>- 
>-     return program->getImplementation()->load(context, infoLog, &stream);
>- }
>-diff --git a/src/libANGLE/Platform.cpp b/src/libANGLE/Platform.cpp
>-index 702091624..c51289423 100644
>---- a/src/libANGLE/Platform.cpp
>-+++ b/src/libANGLE/Platform.cpp
>-@@ -15,7 +15,14 @@
>- namespace
>- {
>- // TODO(jmadill): Make methods owned by egl::Display.
>--angle::PlatformMethods g_platformMethods;
>-+#if defined(__clang__)
>-+#pragma clang diagnostic push
>-+#pragma clang diagnostic ignored "-Wglobal-constructors"
>-+#endif
>-+    angle::PlatformMethods g_platformMethods;
>-+#if defined(__clang__)
>-+#pragma clang diagnostic pop
>-+#endif
>- }  // anonymous namespace
>- 
>- angle::PlatformMethods::PlatformMethods()
>-diff --git a/src/tests/compiler_tests/QualificationOrder_test.cpp b/src/tests/compiler_tests/QualificationOrder_test.cpp
>-index c0249dbb9..c82acffd7 100644
>---- a/src/tests/compiler_tests/QualificationOrder_test.cpp
>-+++ b/src/tests/compiler_tests/QualificationOrder_test.cpp
>-@@ -429,7 +429,7 @@ TEST_F(QualificationOrderFragmentShaderTest, InvalidFunctionParametersInvariant)
>-         "}\n"
>-         "void main()\n"
>-         "{\n"
>--        "	gl_FragColor = vec4(foo0(value));\n"
>-+        "   gl_FragColor = vec4(foo0(value));\n"
>-         "}\n";
>- 
>-     if (compile(shaderString))
>-@@ -449,7 +449,7 @@ TEST_F(QualificationOrderFragmentShaderTest, InvalidFunctionParametersAttribute)
>-         "}\n"
>-         "void main()\n"
>-         "{\n"
>--        "	gl_FragColor = vec4(foo0(value));\n"
>-+        "   gl_FragColor = vec4(foo0(value));\n"
>-         "}\n";
>- 
>-     if (compile(shaderString))
>-@@ -469,7 +469,7 @@ TEST_F(QualificationOrderFragmentShaderTest, InvalidFunctionParametersVarying)
>-         "}\n"
>-         "void main()\n"
>-         "{\n"
>--        "	gl_FragColor = vec4(foo0(value));\n"
>-+        "   gl_FragColor = vec4(foo0(value));\n"
>-         "}\n";
>- 
>-     if (compile(shaderString))
>-@@ -491,7 +491,7 @@ TEST_F(QualificationOrderFragmentShaderTest, InvalidFunctionParametersLayout)
>-         "out vec4 colorOUT;\n"
>-         "void main()\n"
>-         "{\n"
>--        "	colorOUT = vec4(foo0(value));\n"
>-+        "   colorOUT = vec4(foo0(value));\n"
>-         "}\n";
>- 
>-     if (compile(shaderString))
>-@@ -513,7 +513,7 @@ TEST_F(QualificationOrderFragmentShaderTest, InvalidFunctionParametersCentroidIn
>-         "out vec4 colorOUT;\n"
>-         "void main()\n"
>-         "{\n"
>--        "	colorOUT = vec4(foo0(value));\n"
>-+        "   colorOUT = vec4(foo0(value));\n"
>-         "}\n";
>- 
>-     if (compile(shaderString))
>-@@ -535,7 +535,7 @@ TEST_F(QualificationOrderFragmentShaderTest, InvalidFunctionParametersFlatIn)
>-         "out vec4 colorOUT;\n"
>-         "void main()\n"
>-         "{\n"
>--        "	colorOUT = vec4(foo0(value));\n"
>-+        "   colorOUT = vec4(foo0(value));\n"
>-         "}\n";
>- 
>-     if (compile(shaderString))
>-diff --git a/src/tests/deqp_support/es2fShaderMatrixTests.cpp b/src/tests/deqp_support/es2fShaderMatrixTests.cpp
>-index 9feb4dcfa..54d8474fd 100644
>---- a/src/tests/deqp_support/es2fShaderMatrixTests.cpp
>-+++ b/src/tests/deqp_support/es2fShaderMatrixTests.cpp
>-@@ -69,77 +69,77 @@ using tcu::Mat4;
>- // Uniform / constant values for tests.
>- // \note Input1 should not contain 0 components as it is used as divisor in div cases.
>- // \todo [2012-02-14 pyry] Make these dynamic.
>--static const float	s_constInFloat[2]	= { 0.5f, -0.2f };
>--static const Vec2	s_constInVec2[2]	= { Vec2(1.2f, 0.5f), Vec2(0.5f, 1.0f) };
>--static const Vec3	s_constInVec3[2]	= { Vec3(1.1f, 0.1f, 0.5f), Vec3(-0.2f, 0.5f, 0.8f) };
>--static const Vec4	s_constInVec4[2]	= { Vec4(1.4f, 0.2f, -0.5f, 0.7f), Vec4(0.2f, -1.0f, 0.5f, 0.8f) };
>-+static const float  s_constInFloat[2]   = { 0.5f, -0.2f };
>-+static const Vec2   s_constInVec2[2]    = { Vec2(1.2f, 0.5f), Vec2(0.5f, 1.0f) };
>-+static const Vec3   s_constInVec3[2]    = { Vec3(1.1f, 0.1f, 0.5f), Vec3(-0.2f, 0.5f, 0.8f) };
>-+static const Vec4   s_constInVec4[2]    = { Vec4(1.4f, 0.2f, -0.5f, 0.7f), Vec4(0.2f, -1.0f, 0.5f, 0.8f) };
>- 
>- static const float s_constInMat20[] = { 0.6f, -1.0f, 0.7f, 0.4f };
>- static const float s_constInMat21[] = { -0.5f, -0.4f, 0.7f, -0.8f };
>- 
>- static const float s_constInMat31[] =
>- {
>--	1.2f,  0.1f, -0.1f,
>--	0.1f,  0.9f,  0.2f,
>--	0.2f, -0.1f,  0.7f
>-+    1.2f,  0.1f, -0.1f,
>-+    0.1f,  0.9f,  0.2f,
>-+    0.2f, -0.1f,  0.7f
>- };
>- static const float s_constInMat41[] =
>- {
>--	 1.2f, -0.2f,  0.4f,  0.1f,
>--	 0.1f,  0.8f, -0.1f, -0.2f,
>--	-0.2f,  0.1f, -1.1f,  0.3f,
>--	 0.1f,  0.2f,  0.3f,  0.9f
>-+     1.2f, -0.2f,  0.4f,  0.1f,
>-+     0.1f,  0.8f, -0.1f, -0.2f,
>-+    -0.2f,  0.1f, -1.1f,  0.3f,
>-+     0.1f,  0.2f,  0.3f,  0.9f
>- };
>- 
>--static const Mat2	s_constInMat2[2]	= { tcu::Mat2(s_constInMat20), tcu::Mat2(s_constInMat21) };
>--static const Mat3	s_constInMat3[2]	= { tcu::translationMatrix(tcu::Vec2(0.2f, -0.3f)), tcu::Mat3(s_constInMat31) };
>--static const Mat4	s_constInMat4[2]	= { tcu::translationMatrix(tcu::Vec3(0.2f, -0.3f, 0.15f)), tcu::Mat4(s_constInMat41) };
>-+static const Mat2   s_constInMat2[2]    = { tcu::Mat2(s_constInMat20), tcu::Mat2(s_constInMat21) };
>-+static const Mat3   s_constInMat3[2]    = { tcu::translationMatrix(tcu::Vec2(0.2f, -0.3f)), tcu::Mat3(s_constInMat31) };
>-+static const Mat4   s_constInMat4[2]    = { tcu::translationMatrix(tcu::Vec3(0.2f, -0.3f, 0.15f)), tcu::Mat4(s_constInMat41) };
>- 
>- namespace MatrixCaseUtils
>- {
>- 
>- enum InputType
>- {
>--	INPUTTYPE_CONST = 0,
>--	INPUTTYPE_UNIFORM,
>--	INPUTTYPE_DYNAMIC,
>-+    INPUTTYPE_CONST = 0,
>-+    INPUTTYPE_UNIFORM,
>-+    INPUTTYPE_DYNAMIC,
>- 
>--	INPUTTYPE_LAST
>-+    INPUTTYPE_LAST
>- };
>- 
>- struct ShaderInput
>- {
>--	ShaderInput (InputType inputType_, DataType dataType_, Precision precision_)
>--		: inputType	(inputType_)
>--		, dataType	(dataType_)
>--		, precision	(precision_)
>--	{
>--	}
>--
>--	InputType		inputType;
>--	DataType		dataType;
>--	Precision		precision;
>-+    ShaderInput (InputType inputType_, DataType dataType_, Precision precision_)
>-+        : inputType (inputType_)
>-+        , dataType  (dataType_)
>-+        , precision (precision_)
>-+    {
>-+    }
>-+
>-+    InputType       inputType;
>-+    DataType        dataType;
>-+    Precision       precision;
>- };
>- 
>- enum MatrixOp
>- {
>--	OP_ADD = 0,
>--	OP_SUB,
>--	OP_MUL,
>--	OP_DIV,
>--	OP_COMP_MUL,
>--	OP_UNARY_PLUS,
>--	OP_NEGATION,
>--	OP_PRE_INCREMENT,
>--	OP_PRE_DECREMENT,
>--	OP_POST_INCREMENT,
>--	OP_POST_DECREMENT,
>--	OP_ADD_INTO,
>--	OP_SUBTRACT_FROM,
>--	OP_MULTIPLY_INTO,
>--	OP_DIVIDE_INTO,
>--
>--	OP_LAST
>-+    OP_ADD = 0,
>-+    OP_SUB,
>-+    OP_MUL,
>-+    OP_DIV,
>-+    OP_COMP_MUL,
>-+    OP_UNARY_PLUS,
>-+    OP_NEGATION,
>-+    OP_PRE_INCREMENT,
>-+    OP_PRE_DECREMENT,
>-+    OP_POST_INCREMENT,
>-+    OP_POST_DECREMENT,
>-+    OP_ADD_INTO,
>-+    OP_SUBTRACT_FROM,
>-+    OP_MULTIPLY_INTO,
>-+    OP_DIVIDE_INTO,
>-+
>-+    OP_LAST
>- };
>- 
>- // Type traits.
>-@@ -147,16 +147,16 @@ enum MatrixOp
>- template <int DataT>
>- struct TypeTraits;
>- 
>--#define DECLARE_TYPE_TRAIT(DATATYPE, TYPE)	\
>--template<>									\
>--struct TypeTraits<DATATYPE> {				\
>--	typedef TYPE Type;						\
>-+#define DECLARE_TYPE_TRAIT(DATATYPE, TYPE)  \
>-+template<>                                  \
>-+struct TypeTraits<DATATYPE> {               \
>-+    typedef TYPE Type;                      \
>- }
>- 
>--DECLARE_TYPE_TRAIT(TYPE_FLOAT,		float);
>--DECLARE_TYPE_TRAIT(TYPE_FLOAT_VEC2,	tcu::Vec2);
>--DECLARE_TYPE_TRAIT(TYPE_FLOAT_VEC3,	tcu::Vec3);
>--DECLARE_TYPE_TRAIT(TYPE_FLOAT_VEC4,	tcu::Vec4);
>-+DECLARE_TYPE_TRAIT(TYPE_FLOAT,      float);
>-+DECLARE_TYPE_TRAIT(TYPE_FLOAT_VEC2, tcu::Vec2);
>-+DECLARE_TYPE_TRAIT(TYPE_FLOAT_VEC3, tcu::Vec3);
>-+DECLARE_TYPE_TRAIT(TYPE_FLOAT_VEC4, tcu::Vec4);
>- DECLARE_TYPE_TRAIT(TYPE_FLOAT_MAT2, tcu::Mat2);
>- DECLARE_TYPE_TRAIT(TYPE_FLOAT_MAT3, tcu::Mat3);
>- DECLARE_TYPE_TRAIT(TYPE_FLOAT_MAT4, tcu::Mat4);
>-@@ -165,169 +165,169 @@ DECLARE_TYPE_TRAIT(TYPE_FLOAT_MAT4, tcu::Mat4);
>- 
>- enum OperationType
>- {
>--	OPERATIONTYPE_BINARY_OPERATOR = 0,
>--	OPERATIONTYPE_BINARY_FUNCTION,
>--	OPERATIONTYPE_UNARY_PREFIX_OPERATOR,
>--	OPERATIONTYPE_UNARY_POSTFIX_OPERATOR,
>--	OPERATIONTYPE_ASSIGNMENT,
>-+    OPERATIONTYPE_BINARY_OPERATOR = 0,
>-+    OPERATIONTYPE_BINARY_FUNCTION,
>-+    OPERATIONTYPE_UNARY_PREFIX_OPERATOR,
>-+    OPERATIONTYPE_UNARY_POSTFIX_OPERATOR,
>-+    OPERATIONTYPE_ASSIGNMENT,
>- 
>--	OPERATIONTYPE_LAST
>-+    OPERATIONTYPE_LAST
>- };
>- 
>- static const char* getOperationName (MatrixOp op)
>- {
>--	switch (op)
>--	{
>--		case OP_ADD:			return "+";
>--		case OP_SUB:			return "-";
>--		case OP_MUL:			return "*";
>--		case OP_DIV:			return "/";
>--		case OP_COMP_MUL:		return "matrixCompMult";
>--		case OP_UNARY_PLUS:		return "+";
>--		case OP_NEGATION:		return "-";
>--		case OP_PRE_INCREMENT:	return "++";
>--		case OP_PRE_DECREMENT:	return "--";
>--		case OP_POST_INCREMENT:	return "++";
>--		case OP_POST_DECREMENT:	return "--";
>--		case OP_ADD_INTO:		return "+=";
>--		case OP_SUBTRACT_FROM:	return "-=";
>--		case OP_MULTIPLY_INTO:	return "*=";
>--		case OP_DIVIDE_INTO:	return "/=";
>--		default:
>--			DE_ASSERT(DE_FALSE);
>--			return "";
>--	}
>-+    switch (op)
>-+    {
>-+        case OP_ADD:            return "+";
>-+        case OP_SUB:            return "-";
>-+        case OP_MUL:            return "*";
>-+        case OP_DIV:            return "/";
>-+        case OP_COMP_MUL:       return "matrixCompMult";
>-+        case OP_UNARY_PLUS:     return "+";
>-+        case OP_NEGATION:       return "-";
>-+        case OP_PRE_INCREMENT:  return "++";
>-+        case OP_PRE_DECREMENT:  return "--";
>-+        case OP_POST_INCREMENT: return "++";
>-+        case OP_POST_DECREMENT: return "--";
>-+        case OP_ADD_INTO:       return "+=";
>-+        case OP_SUBTRACT_FROM:  return "-=";
>-+        case OP_MULTIPLY_INTO:  return "*=";
>-+        case OP_DIVIDE_INTO:    return "/=";
>-+        default:
>-+            DE_ASSERT(DE_FALSE);
>-+            return "";
>-+    }
>- }
>- 
>- static OperationType getOperationType (MatrixOp op)
>- {
>--	switch (op)
>--	{
>--		case OP_ADD:			return OPERATIONTYPE_BINARY_OPERATOR;
>--		case OP_SUB:			return OPERATIONTYPE_BINARY_OPERATOR;
>--		case OP_MUL:			return OPERATIONTYPE_BINARY_OPERATOR;
>--		case OP_DIV:			return OPERATIONTYPE_BINARY_OPERATOR;
>--		case OP_COMP_MUL:		return OPERATIONTYPE_BINARY_FUNCTION;
>--		case OP_UNARY_PLUS:		return OPERATIONTYPE_UNARY_PREFIX_OPERATOR;
>--		case OP_NEGATION:		return OPERATIONTYPE_UNARY_PREFIX_OPERATOR;
>--		case OP_PRE_INCREMENT:	return OPERATIONTYPE_UNARY_PREFIX_OPERATOR;
>--		case OP_PRE_DECREMENT:	return OPERATIONTYPE_UNARY_PREFIX_OPERATOR;
>--		case OP_POST_INCREMENT:	return OPERATIONTYPE_UNARY_POSTFIX_OPERATOR;
>--		case OP_POST_DECREMENT:	return OPERATIONTYPE_UNARY_POSTFIX_OPERATOR;
>--		case OP_ADD_INTO:		return OPERATIONTYPE_ASSIGNMENT;
>--		case OP_SUBTRACT_FROM:	return OPERATIONTYPE_ASSIGNMENT;
>--		case OP_MULTIPLY_INTO:	return OPERATIONTYPE_ASSIGNMENT;
>--		case OP_DIVIDE_INTO:	return OPERATIONTYPE_ASSIGNMENT;
>--		default:
>--			DE_ASSERT(DE_FALSE);
>--			return OPERATIONTYPE_LAST;
>--	}
>-+    switch (op)
>-+    {
>-+        case OP_ADD:            return OPERATIONTYPE_BINARY_OPERATOR;
>-+        case OP_SUB:            return OPERATIONTYPE_BINARY_OPERATOR;
>-+        case OP_MUL:            return OPERATIONTYPE_BINARY_OPERATOR;
>-+        case OP_DIV:            return OPERATIONTYPE_BINARY_OPERATOR;
>-+        case OP_COMP_MUL:       return OPERATIONTYPE_BINARY_FUNCTION;
>-+        case OP_UNARY_PLUS:     return OPERATIONTYPE_UNARY_PREFIX_OPERATOR;
>-+        case OP_NEGATION:       return OPERATIONTYPE_UNARY_PREFIX_OPERATOR;
>-+        case OP_PRE_INCREMENT:  return OPERATIONTYPE_UNARY_PREFIX_OPERATOR;
>-+        case OP_PRE_DECREMENT:  return OPERATIONTYPE_UNARY_PREFIX_OPERATOR;
>-+        case OP_POST_INCREMENT: return OPERATIONTYPE_UNARY_POSTFIX_OPERATOR;
>-+        case OP_POST_DECREMENT: return OPERATIONTYPE_UNARY_POSTFIX_OPERATOR;
>-+        case OP_ADD_INTO:       return OPERATIONTYPE_ASSIGNMENT;
>-+        case OP_SUBTRACT_FROM:  return OPERATIONTYPE_ASSIGNMENT;
>-+        case OP_MULTIPLY_INTO:  return OPERATIONTYPE_ASSIGNMENT;
>-+        case OP_DIVIDE_INTO:    return OPERATIONTYPE_ASSIGNMENT;
>-+        default:
>-+            DE_ASSERT(DE_FALSE);
>-+            return OPERATIONTYPE_LAST;
>-+    }
>- }
>- 
>- enum TestMatrixType
>- {
>--	TESTMATRIXTYPE_DEFAULT = 0,
>--	TESTMATRIXTYPE_NEGATED,
>--	TESTMATRIXTYPE_INCREMENTED,
>--	TESTMATRIXTYPE_DECREMENTED,
>-+    TESTMATRIXTYPE_DEFAULT = 0,
>-+    TESTMATRIXTYPE_NEGATED,
>-+    TESTMATRIXTYPE_INCREMENTED,
>-+    TESTMATRIXTYPE_DECREMENTED,
>- 
>--	TESTMATRIXTYPE_LAST
>-+    TESTMATRIXTYPE_LAST
>- };
>- 
>- static TestMatrixType getOperationTestMatrixType (MatrixOp op)
>- {
>--	switch(op)
>--	{
>--		case OP_ADD:			return TESTMATRIXTYPE_DEFAULT;
>--		case OP_SUB:			return TESTMATRIXTYPE_DEFAULT;
>--		case OP_MUL:			return TESTMATRIXTYPE_DEFAULT;
>--		case OP_DIV:			return TESTMATRIXTYPE_DEFAULT;
>--		case OP_COMP_MUL:		return TESTMATRIXTYPE_DEFAULT;
>--		case OP_UNARY_PLUS:		return TESTMATRIXTYPE_DEFAULT;
>--		case OP_NEGATION:		return TESTMATRIXTYPE_NEGATED;
>--		case OP_PRE_INCREMENT:	return TESTMATRIXTYPE_NEGATED;
>--		case OP_PRE_DECREMENT:	return TESTMATRIXTYPE_INCREMENTED;
>--		case OP_POST_INCREMENT:	return TESTMATRIXTYPE_NEGATED;
>--		case OP_POST_DECREMENT:	return TESTMATRIXTYPE_DEFAULT;
>--		case OP_ADD_INTO:		return TESTMATRIXTYPE_DECREMENTED;
>--		case OP_SUBTRACT_FROM:	return TESTMATRIXTYPE_DEFAULT;
>--		case OP_MULTIPLY_INTO:	return TESTMATRIXTYPE_DEFAULT;
>--		case OP_DIVIDE_INTO:	return TESTMATRIXTYPE_DEFAULT;
>--
>--		default:
>--			DE_ASSERT(DE_FALSE);
>--			return TESTMATRIXTYPE_LAST;
>--	}
>-+    switch(op)
>-+    {
>-+        case OP_ADD:            return TESTMATRIXTYPE_DEFAULT;
>-+        case OP_SUB:            return TESTMATRIXTYPE_DEFAULT;
>-+        case OP_MUL:            return TESTMATRIXTYPE_DEFAULT;
>-+        case OP_DIV:            return TESTMATRIXTYPE_DEFAULT;
>-+        case OP_COMP_MUL:       return TESTMATRIXTYPE_DEFAULT;
>-+        case OP_UNARY_PLUS:     return TESTMATRIXTYPE_DEFAULT;
>-+        case OP_NEGATION:       return TESTMATRIXTYPE_NEGATED;
>-+        case OP_PRE_INCREMENT:  return TESTMATRIXTYPE_NEGATED;
>-+        case OP_PRE_DECREMENT:  return TESTMATRIXTYPE_INCREMENTED;
>-+        case OP_POST_INCREMENT: return TESTMATRIXTYPE_NEGATED;
>-+        case OP_POST_DECREMENT: return TESTMATRIXTYPE_DEFAULT;
>-+        case OP_ADD_INTO:       return TESTMATRIXTYPE_DECREMENTED;
>-+        case OP_SUBTRACT_FROM:  return TESTMATRIXTYPE_DEFAULT;
>-+        case OP_MULTIPLY_INTO:  return TESTMATRIXTYPE_DEFAULT;
>-+        case OP_DIVIDE_INTO:    return TESTMATRIXTYPE_DEFAULT;
>-+
>-+        default:
>-+            DE_ASSERT(DE_FALSE);
>-+            return TESTMATRIXTYPE_LAST;
>-+    }
>- }
>- 
>- static bool isOperationBinary (MatrixOp op)
>- {
>--	return getOperationType(op) == OPERATIONTYPE_BINARY_OPERATOR ||
>--	       getOperationType(op) == OPERATIONTYPE_BINARY_FUNCTION ||
>--	       getOperationType(op) == OPERATIONTYPE_ASSIGNMENT;
>-+    return getOperationType(op) == OPERATIONTYPE_BINARY_OPERATOR ||
>-+           getOperationType(op) == OPERATIONTYPE_BINARY_FUNCTION ||
>-+           getOperationType(op) == OPERATIONTYPE_ASSIGNMENT;
>- }
>- 
>- static bool isOperationMatrixScalar (MatrixOp op)
>- {
>--	return op == OP_ADD || op == OP_SUB || op == OP_MUL || op == OP_DIV;
>-+    return op == OP_ADD || op == OP_SUB || op == OP_MUL || op == OP_DIV;
>- }
>- 
>- static bool isOperationMatrixVector (MatrixOp op)
>- {
>--	return op == OP_MUL;
>-+    return op == OP_MUL;
>- }
>- 
>- static bool isOperationMatrixMatrix (MatrixOp op)
>- {
>--	return op == OP_ADD || op == OP_SUB || op == OP_MUL || op == OP_DIV || op == OP_COMP_MUL;
>-+    return op == OP_ADD || op == OP_SUB || op == OP_MUL || op == OP_DIV || op == OP_COMP_MUL;
>- }
>- 
>- static bool isOperationUnary (MatrixOp op)
>- {
>--	return  op == OP_UNARY_PLUS			||
>--			op == OP_NEGATION			||
>--			op == OP_PRE_INCREMENT		||
>--			op == OP_PRE_DECREMENT		||
>--			op == OP_POST_INCREMENT		||
>--			op == OP_POST_DECREMENT;
>-+    return  op == OP_UNARY_PLUS         ||
>-+            op == OP_NEGATION           ||
>-+            op == OP_PRE_INCREMENT      ||
>-+            op == OP_PRE_DECREMENT      ||
>-+            op == OP_POST_INCREMENT     ||
>-+            op == OP_POST_DECREMENT;
>- }
>- 
>- static bool isOperationValueModifying (MatrixOp op)
>- {
>--	return  op == OP_PRE_INCREMENT		||
>--			op == OP_PRE_DECREMENT		||
>--			op == OP_POST_INCREMENT		||
>--			op == OP_POST_DECREMENT;
>-+    return  op == OP_PRE_INCREMENT      ||
>-+            op == OP_PRE_DECREMENT      ||
>-+            op == OP_POST_INCREMENT     ||
>-+            op == OP_POST_DECREMENT;
>- }
>- 
>- static bool isOperationAssignment (MatrixOp op)
>- {
>--	return  op == OP_ADD_INTO		 ||
>--			op == OP_SUBTRACT_FROM	 ||
>--			op == OP_MULTIPLY_INTO	 ||
>--			op == OP_DIVIDE_INTO;
>-+    return  op == OP_ADD_INTO        ||
>-+            op == OP_SUBTRACT_FROM   ||
>-+            op == OP_MULTIPLY_INTO   ||
>-+            op == OP_DIVIDE_INTO;
>- }
>- 
>- // Operation nature
>- 
>- enum OperationNature
>- {
>--	OPERATIONNATURE_PURE = 0,
>--	OPERATIONNATURE_MUTATING,
>--	OPERATIONNATURE_ASSIGNMENT,
>-+    OPERATIONNATURE_PURE = 0,
>-+    OPERATIONNATURE_MUTATING,
>-+    OPERATIONNATURE_ASSIGNMENT,
>- 
>--	OPERATIONNATURE_LAST
>-+    OPERATIONNATURE_LAST
>- };
>- 
>- static OperationNature getOperationNature (MatrixOp op)
>- {
>--	if (isOperationAssignment(op))
>--		return OPERATIONNATURE_ASSIGNMENT;
>-+    if (isOperationAssignment(op))
>-+        return OPERATIONNATURE_ASSIGNMENT;
>- 
>--	if (isOperationValueModifying(op))
>--		return OPERATIONNATURE_MUTATING;
>-+    if (isOperationValueModifying(op))
>-+        return OPERATIONNATURE_MUTATING;
>- 
>--	return OPERATIONNATURE_PURE;
>-+    return OPERATIONNATURE_PURE;
>- }
>- 
>- // Input value loader.
>-@@ -335,47 +335,47 @@ static OperationNature getOperationNature (MatrixOp op)
>- template <int InputT, int DataT>
>- typename TypeTraits<DataT>::Type getInputValue (const ShaderEvalContext& evalCtx, int inputNdx);
>- 
>--template <> inline float		getInputValue<INPUTTYPE_CONST,		TYPE_FLOAT>			(const ShaderEvalContext& evalCtx, int inputNdx) { DE_UNREF(evalCtx); return s_constInFloat[inputNdx];	}
>--template <> inline tcu::Vec2	getInputValue<INPUTTYPE_CONST,		TYPE_FLOAT_VEC2>	(const ShaderEvalContext& evalCtx, int inputNdx) { DE_UNREF(evalCtx); return s_constInVec2[inputNdx];	}
>--template <> inline tcu::Vec3	getInputValue<INPUTTYPE_CONST,		TYPE_FLOAT_VEC3>	(const ShaderEvalContext& evalCtx, int inputNdx) { DE_UNREF(evalCtx); return s_constInVec3[inputNdx];	}
>--template <> inline tcu::Vec4	getInputValue<INPUTTYPE_CONST,		TYPE_FLOAT_VEC4>	(const ShaderEvalContext& evalCtx, int inputNdx) { DE_UNREF(evalCtx); return s_constInVec4[inputNdx];	}
>--template <> inline tcu::Mat2	getInputValue<INPUTTYPE_CONST,		TYPE_FLOAT_MAT2>	(const ShaderEvalContext& evalCtx, int inputNdx) { DE_UNREF(evalCtx); return s_constInMat2[inputNdx];	}
>--template <> inline tcu::Mat3	getInputValue<INPUTTYPE_CONST,		TYPE_FLOAT_MAT3>	(const ShaderEvalContext& evalCtx, int inputNdx) { DE_UNREF(evalCtx); return s_constInMat3[inputNdx];	}
>--template <> inline tcu::Mat4	getInputValue<INPUTTYPE_CONST,		TYPE_FLOAT_MAT4>	(const ShaderEvalContext& evalCtx, int inputNdx) { DE_UNREF(evalCtx); return s_constInMat4[inputNdx];	}
>-+template <> inline float        getInputValue<INPUTTYPE_CONST,      TYPE_FLOAT>         (const ShaderEvalContext& evalCtx, int inputNdx) { DE_UNREF(evalCtx); return s_constInFloat[inputNdx];  }
>-+template <> inline tcu::Vec2    getInputValue<INPUTTYPE_CONST,      TYPE_FLOAT_VEC2>    (const ShaderEvalContext& evalCtx, int inputNdx) { DE_UNREF(evalCtx); return s_constInVec2[inputNdx];   }
>-+template <> inline tcu::Vec3    getInputValue<INPUTTYPE_CONST,      TYPE_FLOAT_VEC3>    (const ShaderEvalContext& evalCtx, int inputNdx) { DE_UNREF(evalCtx); return s_constInVec3[inputNdx];   }
>-+template <> inline tcu::Vec4    getInputValue<INPUTTYPE_CONST,      TYPE_FLOAT_VEC4>    (const ShaderEvalContext& evalCtx, int inputNdx) { DE_UNREF(evalCtx); return s_constInVec4[inputNdx];   }
>-+template <> inline tcu::Mat2    getInputValue<INPUTTYPE_CONST,      TYPE_FLOAT_MAT2>    (const ShaderEvalContext& evalCtx, int inputNdx) { DE_UNREF(evalCtx); return s_constInMat2[inputNdx];   }
>-+template <> inline tcu::Mat3    getInputValue<INPUTTYPE_CONST,      TYPE_FLOAT_MAT3>    (const ShaderEvalContext& evalCtx, int inputNdx) { DE_UNREF(evalCtx); return s_constInMat3[inputNdx];   }
>-+template <> inline tcu::Mat4    getInputValue<INPUTTYPE_CONST,      TYPE_FLOAT_MAT4>    (const ShaderEvalContext& evalCtx, int inputNdx) { DE_UNREF(evalCtx); return s_constInMat4[inputNdx];   }
>- 
>--template <> inline float		getInputValue<INPUTTYPE_DYNAMIC,	TYPE_FLOAT>			(const ShaderEvalContext& evalCtx, int inputNdx) { DE_UNREF(inputNdx); return evalCtx.coords.x();					}
>--template <> inline tcu::Vec2	getInputValue<INPUTTYPE_DYNAMIC,	TYPE_FLOAT_VEC2>	(const ShaderEvalContext& evalCtx, int inputNdx) { DE_UNREF(inputNdx); return evalCtx.coords.swizzle(0, 1);			}
>--template <> inline tcu::Vec3	getInputValue<INPUTTYPE_DYNAMIC,	TYPE_FLOAT_VEC3>	(const ShaderEvalContext& evalCtx, int inputNdx) { DE_UNREF(inputNdx); return evalCtx.coords.swizzle(0, 1, 2);		}
>--template <> inline tcu::Vec4	getInputValue<INPUTTYPE_DYNAMIC,	TYPE_FLOAT_VEC4>	(const ShaderEvalContext& evalCtx, int inputNdx) { DE_UNREF(inputNdx); return evalCtx.coords.swizzle(0, 1, 2, 3);	}
>-+template <> inline float        getInputValue<INPUTTYPE_DYNAMIC,    TYPE_FLOAT>         (const ShaderEvalContext& evalCtx, int inputNdx) { DE_UNREF(inputNdx); return evalCtx.coords.x();                   }
>-+template <> inline tcu::Vec2    getInputValue<INPUTTYPE_DYNAMIC,    TYPE_FLOAT_VEC2>    (const ShaderEvalContext& evalCtx, int inputNdx) { DE_UNREF(inputNdx); return evalCtx.coords.swizzle(0, 1);         }
>-+template <> inline tcu::Vec3    getInputValue<INPUTTYPE_DYNAMIC,    TYPE_FLOAT_VEC3>    (const ShaderEvalContext& evalCtx, int inputNdx) { DE_UNREF(inputNdx); return evalCtx.coords.swizzle(0, 1, 2);      }
>-+template <> inline tcu::Vec4    getInputValue<INPUTTYPE_DYNAMIC,    TYPE_FLOAT_VEC4>    (const ShaderEvalContext& evalCtx, int inputNdx) { DE_UNREF(inputNdx); return evalCtx.coords.swizzle(0, 1, 2, 3);   }
>- 
>- template <> inline tcu::Mat2 getInputValue<INPUTTYPE_DYNAMIC, TYPE_FLOAT_MAT2> (const ShaderEvalContext& evalCtx, int inputNdx)
>- {
>--	DE_UNREF(inputNdx); // Not used.
>--	tcu::Mat2 m;
>--	m.setColumn(0, evalCtx.in[0].swizzle(0,1));
>--	m.setColumn(1, evalCtx.in[1].swizzle(0,1));
>--	return m;
>-+    DE_UNREF(inputNdx); // Not used.
>-+    tcu::Mat2 m;
>-+    m.setColumn(0, evalCtx.in[0].swizzle(0,1));
>-+    m.setColumn(1, evalCtx.in[1].swizzle(0,1));
>-+    return m;
>- }
>- 
>- template <> inline tcu::Mat3 getInputValue<INPUTTYPE_DYNAMIC, TYPE_FLOAT_MAT3> (const ShaderEvalContext& evalCtx, int inputNdx)
>- {
>--	DE_UNREF(inputNdx); // Not used.
>--	tcu::Mat3 m;
>--	m.setColumn(0, evalCtx.in[0].swizzle(0,1,2));
>--	m.setColumn(1, evalCtx.in[1].swizzle(0,1,2));
>--	m.setColumn(2, evalCtx.in[2].swizzle(0,1,2));
>--	return m;
>-+    DE_UNREF(inputNdx); // Not used.
>-+    tcu::Mat3 m;
>-+    m.setColumn(0, evalCtx.in[0].swizzle(0,1,2));
>-+    m.setColumn(1, evalCtx.in[1].swizzle(0,1,2));
>-+    m.setColumn(2, evalCtx.in[2].swizzle(0,1,2));
>-+    return m;
>- }
>- 
>- template <> inline tcu::Mat4 getInputValue<INPUTTYPE_DYNAMIC, TYPE_FLOAT_MAT4> (const ShaderEvalContext& evalCtx, int inputNdx)
>- {
>--	DE_UNREF(inputNdx); // Not used.
>--	tcu::Mat4 m;
>--	m.setColumn(0, evalCtx.in[0]);
>--	m.setColumn(1, evalCtx.in[1]);
>--	m.setColumn(2, evalCtx.in[2]);
>--	m.setColumn(3, evalCtx.in[3]);
>--	return m;
>-+    DE_UNREF(inputNdx); // Not used.
>-+    tcu::Mat4 m;
>-+    m.setColumn(0, evalCtx.in[0]);
>-+    m.setColumn(1, evalCtx.in[1]);
>-+    m.setColumn(2, evalCtx.in[2]);
>-+    m.setColumn(3, evalCtx.in[3]);
>-+    return m;
>- }
>- 
>- // Reduction from expression result to vec3.
>-@@ -392,13 +392,13 @@ inline tcu::Vec3 reduceToVec3 (const tcu::Mat4& value) { return value.getColumn(
>- template <typename T, int Rows, int Cols>
>- tcu::Matrix<T, Rows, Cols> matrixCompMult (const tcu::Matrix<T, Rows, Cols>& a, const tcu::Matrix<T, Rows, Cols>& b)
>- {
>--	tcu::Matrix<T, Rows, Cols> retVal;
>-+    tcu::Matrix<T, Rows, Cols> retVal;
>- 
>--	for (int r = 0; r < Rows; ++r)
>--		for (int c = 0; c < Cols; ++c)
>--			retVal(r,c) = a(r,c) * b(r, c);
>-+    for (int r = 0; r < Rows; ++r)
>-+        for (int c = 0; c < Cols; ++c)
>-+            retVal(r,c) = a(r,c) * b(r, c);
>- 
>--	return retVal;
>-+    return retVal;
>- }
>- 
>- // negate
>-@@ -406,13 +406,13 @@ tcu::Matrix<T, Rows, Cols> matrixCompMult (const tcu::Matrix<T, Rows, Cols>& a,
>- template <typename T, int Rows, int Cols>
>- tcu::Matrix<T, Rows, Cols> negate (const tcu::Matrix<T, Rows, Cols>& mat)
>- {
>--	tcu::Matrix<T, Rows, Cols> retVal;
>-+    tcu::Matrix<T, Rows, Cols> retVal;
>- 
>--	for (int r = 0; r < Rows; ++r)
>--		for (int c = 0; c < Cols; ++c)
>--			retVal(r,c) = -mat(r, c);
>-+    for (int r = 0; r < Rows; ++r)
>-+        for (int c = 0; c < Cols; ++c)
>-+            retVal(r,c) = -mat(r, c);
>- 
>--	return retVal;
>-+    return retVal;
>- }
>- 
>- // increment/decrement
>-@@ -420,25 +420,25 @@ tcu::Matrix<T, Rows, Cols> negate (const tcu::Matrix<T, Rows, Cols>& mat)
>- template <typename T, int Rows, int Cols>
>- tcu::Matrix<T, Rows, Cols> increment (const tcu::Matrix<T, Rows, Cols>& mat)
>- {
>--	tcu::Matrix<T, Rows, Cols> retVal;
>-+    tcu::Matrix<T, Rows, Cols> retVal;
>- 
>--	for (int r = 0; r < Rows; ++r)
>--		for (int c = 0; c < Cols; ++c)
>--			retVal(r,c) = mat(r, c) + 1.0f;
>-+    for (int r = 0; r < Rows; ++r)
>-+        for (int c = 0; c < Cols; ++c)
>-+            retVal(r,c) = mat(r, c) + 1.0f;
>- 
>--	return retVal;
>-+    return retVal;
>- }
>- 
>- template <typename T, int Rows, int Cols>
>- tcu::Matrix<T, Rows, Cols> decrement (const tcu::Matrix<T, Rows, Cols>& mat)
>- {
>--	tcu::Matrix<T, Rows, Cols> retVal;
>-+    tcu::Matrix<T, Rows, Cols> retVal;
>- 
>--	for (int r = 0; r < Rows; ++r)
>--		for (int c = 0; c < Cols; ++c)
>--			retVal(r,c) = mat(r, c) - 1.0f;
>-+    for (int r = 0; r < Rows; ++r)
>-+        for (int c = 0; c < Cols; ++c)
>-+            retVal(r,c) = mat(r, c) - 1.0f;
>- 
>--	return retVal;
>-+    return retVal;
>- }
>- 
>- // Evaluator template.
>-@@ -449,244 +449,244 @@ struct Evaluator;
>- template <int In0Type, int In0DataType, int In1Type, int In1DataType>
>- struct Evaluator<OP_ADD, In0Type, In0DataType, In1Type, In1DataType>
>- {
>--	static void evaluate (ShaderEvalContext& evalCtx)
>--	{
>--		evalCtx.color.xyz() = reduceToVec3(getInputValue<In0Type, In0DataType>(evalCtx, 0) + getInputValue<In1Type, In1DataType>(evalCtx, 1));
>--	}
>-+    static void evaluate (ShaderEvalContext& evalCtx)
>-+    {
>-+        evalCtx.color.xyz() = reduceToVec3(getInputValue<In0Type, In0DataType>(evalCtx, 0) + getInputValue<In1Type, In1DataType>(evalCtx, 1));
>-+    }
>- };
>- 
>- template <int In0Type, int In0DataType, int In1Type, int In1DataType>
>- struct Evaluator<OP_SUB, In0Type, In0DataType, In1Type, In1DataType>
>- {
>--	static void evaluate (ShaderEvalContext& evalCtx)
>--	{
>--		evalCtx.color.xyz() = reduceToVec3(getInputValue<In0Type, In0DataType>(evalCtx, 0) - getInputValue<In1Type, In1DataType>(evalCtx, 1));
>--	}
>-+    static void evaluate (ShaderEvalContext& evalCtx)
>-+    {
>-+        evalCtx.color.xyz() = reduceToVec3(getInputValue<In0Type, In0DataType>(evalCtx, 0) - getInputValue<In1Type, In1DataType>(evalCtx, 1));
>-+    }
>- };
>- 
>- template <int In0Type, int In0DataType, int In1Type, int In1DataType>
>- struct Evaluator<OP_MUL, In0Type, In0DataType, In1Type, In1DataType>
>- {
>--	static void evaluate (ShaderEvalContext& evalCtx)
>--	{
>--		evalCtx.color.xyz() = reduceToVec3(getInputValue<In0Type, In0DataType>(evalCtx, 0) * getInputValue<In1Type, In1DataType>(evalCtx, 1));
>--	}
>-+    static void evaluate (ShaderEvalContext& evalCtx)
>-+    {
>-+        evalCtx.color.xyz() = reduceToVec3(getInputValue<In0Type, In0DataType>(evalCtx, 0) * getInputValue<In1Type, In1DataType>(evalCtx, 1));
>-+    }
>- };
>- 
>- template <int In0Type, int In0DataType, int In1Type, int In1DataType>
>- struct Evaluator<OP_DIV, In0Type, In0DataType, In1Type, In1DataType>
>- {
>--	static void evaluate (ShaderEvalContext& evalCtx)
>--	{
>--		evalCtx.color.xyz() = reduceToVec3(getInputValue<In0Type, In0DataType>(evalCtx, 0) / getInputValue<In1Type, In1DataType>(evalCtx, 1));
>--	}
>-+    static void evaluate (ShaderEvalContext& evalCtx)
>-+    {
>-+        evalCtx.color.xyz() = reduceToVec3(getInputValue<In0Type, In0DataType>(evalCtx, 0) / getInputValue<In1Type, In1DataType>(evalCtx, 1));
>-+    }
>- };
>- 
>- template <int In0Type, int In0DataType, int In1Type, int In1DataType>
>- struct Evaluator<OP_COMP_MUL, In0Type, In0DataType, In1Type, In1DataType>
>- {
>--	static void evaluate (ShaderEvalContext& evalCtx)
>--	{
>--		evalCtx.color.xyz() = reduceToVec3(matrixCompMult(getInputValue<In0Type, In0DataType>(evalCtx, 0), getInputValue<In1Type, In1DataType>(evalCtx, 1)));
>--	}
>-+    static void evaluate (ShaderEvalContext& evalCtx)
>-+    {
>-+        evalCtx.color.xyz() = reduceToVec3(matrixCompMult(getInputValue<In0Type, In0DataType>(evalCtx, 0), getInputValue<In1Type, In1DataType>(evalCtx, 1)));
>-+    }
>- };
>- 
>- template <int In0Type, int In0DataType, int In1Type, int In1DataType>
>- struct Evaluator<OP_UNARY_PLUS, In0Type, In0DataType, In1Type, In1DataType>
>- {
>--	static void evaluate (ShaderEvalContext& evalCtx)
>--	{
>--		evalCtx.color.xyz() = reduceToVec3(getInputValue<In0Type, In0DataType>(evalCtx, 0));
>--	}
>-+    static void evaluate (ShaderEvalContext& evalCtx)
>-+    {
>-+        evalCtx.color.xyz() = reduceToVec3(getInputValue<In0Type, In0DataType>(evalCtx, 0));
>-+    }
>- };
>- 
>- template <int In0Type, int In0DataType, int In1Type, int In1DataType>
>- struct Evaluator<OP_NEGATION, In0Type, In0DataType, In1Type, In1DataType>
>- {
>--	static void evaluate (ShaderEvalContext& evalCtx)
>--	{
>--		evalCtx.color.xyz() = reduceToVec3(negate(getInputValue<In0Type, In0DataType>(evalCtx, 0)));
>--	}
>-+    static void evaluate (ShaderEvalContext& evalCtx)
>-+    {
>-+        evalCtx.color.xyz() = reduceToVec3(negate(getInputValue<In0Type, In0DataType>(evalCtx, 0)));
>-+    }
>- };
>- 
>- template <int In0Type, int In0DataType, int In1Type, int In1DataType>
>- struct Evaluator<OP_PRE_INCREMENT, In0Type, In0DataType, In1Type, In1DataType>
>- {
>--	static void evaluate (ShaderEvalContext& evalCtx)
>--	{
>--		// modifying reduction: sum modified value too
>--		evalCtx.color.xyz() = reduceToVec3(increment(getInputValue<In0Type, In0DataType>(evalCtx, 0))) + reduceToVec3(increment(getInputValue<In0Type, In0DataType>(evalCtx, 0)));
>--	}
>-+    static void evaluate (ShaderEvalContext& evalCtx)
>-+    {
>-+        // modifying reduction: sum modified value too
>-+        evalCtx.color.xyz() = reduceToVec3(increment(getInputValue<In0Type, In0DataType>(evalCtx, 0))) + reduceToVec3(increment(getInputValue<In0Type, In0DataType>(evalCtx, 0)));
>-+    }
>- };
>- 
>- template <int In0Type, int In0DataType, int In1Type, int In1DataType>
>- struct Evaluator<OP_PRE_DECREMENT, In0Type, In0DataType, In1Type, In1DataType>
>- {
>--	static void evaluate (ShaderEvalContext& evalCtx)
>--	{
>--		// modifying reduction: sum modified value too
>--		evalCtx.color.xyz() = reduceToVec3(decrement(getInputValue<In0Type, In0DataType>(evalCtx, 0))) + reduceToVec3(decrement(getInputValue<In0Type, In0DataType>(evalCtx, 0)));
>--	}
>-+    static void evaluate (ShaderEvalContext& evalCtx)
>-+    {
>-+        // modifying reduction: sum modified value too
>-+        evalCtx.color.xyz() = reduceToVec3(decrement(getInputValue<In0Type, In0DataType>(evalCtx, 0))) + reduceToVec3(decrement(getInputValue<In0Type, In0DataType>(evalCtx, 0)));
>-+    }
>- };
>- 
>- template <int In0Type, int In0DataType, int In1Type, int In1DataType>
>- struct Evaluator<OP_POST_INCREMENT, In0Type, In0DataType, In1Type, In1DataType>
>- {
>--	static void evaluate (ShaderEvalContext& evalCtx)
>--	{
>--		// modifying reduction: sum modified value too
>--		evalCtx.color.xyz() = reduceToVec3(getInputValue<In0Type, In0DataType>(evalCtx, 0)) + reduceToVec3(increment(getInputValue<In0Type, In0DataType>(evalCtx, 0)));
>--	}
>-+    static void evaluate (ShaderEvalContext& evalCtx)
>-+    {
>-+        // modifying reduction: sum modified value too
>-+        evalCtx.color.xyz() = reduceToVec3(getInputValue<In0Type, In0DataType>(evalCtx, 0)) + reduceToVec3(increment(getInputValue<In0Type, In0DataType>(evalCtx, 0)));
>-+    }
>- };
>- 
>- template <int In0Type, int In0DataType, int In1Type, int In1DataType>
>- struct Evaluator<OP_POST_DECREMENT, In0Type, In0DataType, In1Type, In1DataType>
>- {
>--	static void evaluate (ShaderEvalContext& evalCtx)
>--	{
>--		// modifying reduction: sum modified value too
>--		evalCtx.color.xyz() = reduceToVec3(getInputValue<In0Type, In0DataType>(evalCtx, 0)) + reduceToVec3(decrement(getInputValue<In0Type, In0DataType>(evalCtx, 0)));
>--	}
>-+    static void evaluate (ShaderEvalContext& evalCtx)
>-+    {
>-+        // modifying reduction: sum modified value too
>-+        evalCtx.color.xyz() = reduceToVec3(getInputValue<In0Type, In0DataType>(evalCtx, 0)) + reduceToVec3(decrement(getInputValue<In0Type, In0DataType>(evalCtx, 0)));
>-+    }
>- };
>- 
>- template <int In0Type, int In0DataType, int In1Type, int In1DataType>
>- struct Evaluator<OP_ADD_INTO, In0Type, In0DataType, In1Type, In1DataType>
>- {
>--	static void evaluate (ShaderEvalContext& evalCtx)
>--	{
>--		evalCtx.color.xyz() = reduceToVec3(getInputValue<In0Type, In0DataType>(evalCtx, 0) + getInputValue<In1Type, In1DataType>(evalCtx, 1));
>--	}
>-+    static void evaluate (ShaderEvalContext& evalCtx)
>-+    {
>-+        evalCtx.color.xyz() = reduceToVec3(getInputValue<In0Type, In0DataType>(evalCtx, 0) + getInputValue<In1Type, In1DataType>(evalCtx, 1));
>-+    }
>- };
>- 
>- template <int In0Type, int In0DataType, int In1Type, int In1DataType>
>- struct Evaluator<OP_SUBTRACT_FROM, In0Type, In0DataType, In1Type, In1DataType>
>- {
>--	static void evaluate (ShaderEvalContext& evalCtx)
>--	{
>--		evalCtx.color.xyz() = reduceToVec3(getInputValue<In0Type, In0DataType>(evalCtx, 0) - getInputValue<In1Type, In1DataType>(evalCtx, 1));
>--	}
>-+    static void evaluate (ShaderEvalContext& evalCtx)
>-+    {
>-+        evalCtx.color.xyz() = reduceToVec3(getInputValue<In0Type, In0DataType>(evalCtx, 0) - getInputValue<In1Type, In1DataType>(evalCtx, 1));
>-+    }
>- };
>- 
>- template <int In0Type, int In0DataType, int In1Type, int In1DataType>
>- struct Evaluator<OP_MULTIPLY_INTO, In0Type, In0DataType, In1Type, In1DataType>
>- {
>--	static void evaluate (ShaderEvalContext& evalCtx)
>--	{
>--		evalCtx.color.xyz() = reduceToVec3(getInputValue<In0Type, In0DataType>(evalCtx, 0) * getInputValue<In1Type, In1DataType>(evalCtx, 1));
>--	}
>-+    static void evaluate (ShaderEvalContext& evalCtx)
>-+    {
>-+        evalCtx.color.xyz() = reduceToVec3(getInputValue<In0Type, In0DataType>(evalCtx, 0) * getInputValue<In1Type, In1DataType>(evalCtx, 1));
>-+    }
>- };
>- 
>- template <int In0Type, int In0DataType, int In1Type, int In1DataType>
>- struct Evaluator<OP_DIVIDE_INTO, In0Type, In0DataType, In1Type, In1DataType>
>- {
>--	static void evaluate (ShaderEvalContext& evalCtx)
>--	{
>--		evalCtx.color.xyz() = reduceToVec3(getInputValue<In0Type, In0DataType>(evalCtx, 0) / getInputValue<In1Type, In1DataType>(evalCtx, 1));
>--	}
>-+    static void evaluate (ShaderEvalContext& evalCtx)
>-+    {
>-+        evalCtx.color.xyz() = reduceToVec3(getInputValue<In0Type, In0DataType>(evalCtx, 0) / getInputValue<In1Type, In1DataType>(evalCtx, 1));
>-+    }
>- };
>- 
>- ShaderEvalFunc getEvalFunc (const ShaderInput& in0, const ShaderInput& in1, MatrixOp op)
>- {
>--	DE_STATIC_ASSERT(TYPE_LAST		<= (1<<7));
>--	DE_STATIC_ASSERT(OP_LAST		<= (1<<4));
>--	DE_STATIC_ASSERT(INPUTTYPE_LAST	<= (1<<2));
>--
>--#define PACK_EVAL_CASE(OP, IN0TYPE, IN0DATATYPE, IN1TYPE, IN1DATATYPE)	(((OP) << 18) | ((IN0TYPE) << 16) | ((IN0DATATYPE) << 9) | ((IN1TYPE) << 7) | (IN1DATATYPE))
>--
>--#define MAKE_EVAL_CASE(OP, IN0TYPE, IN0DATATYPE, IN1TYPE, IN1DATATYPE)		\
>--	case PACK_EVAL_CASE(OP, IN0TYPE, IN0DATATYPE, IN1TYPE, IN1DATATYPE):	\
>--		return Evaluator<OP, IN0TYPE, IN0DATATYPE, IN1TYPE, IN1DATATYPE>::evaluate
>--
>--#define SCALAR_OPS(IN0TYPE, IN0DATATYPE, IN1TYPE, IN1DATATYPE)	\
>--	MAKE_EVAL_CASE(OP_ADD,		IN0TYPE, IN0DATATYPE, IN1TYPE, IN1DATATYPE);	\
>--	MAKE_EVAL_CASE(OP_SUB,		IN0TYPE, IN0DATATYPE, IN1TYPE, IN1DATATYPE);	\
>--	MAKE_EVAL_CASE(OP_MUL,		IN0TYPE, IN0DATATYPE, IN1TYPE, IN1DATATYPE);	\
>--	MAKE_EVAL_CASE(OP_DIV,		IN0TYPE, IN0DATATYPE, IN1TYPE, IN1DATATYPE)
>--
>--#define ALL_OPS(IN0TYPE, IN0DATATYPE, IN1TYPE, IN1DATATYPE)	\
>--	MAKE_EVAL_CASE(OP_ADD,			IN0TYPE, IN0DATATYPE, IN1TYPE, IN1DATATYPE);	\
>--	MAKE_EVAL_CASE(OP_SUB,			IN0TYPE, IN0DATATYPE, IN1TYPE, IN1DATATYPE);	\
>--	MAKE_EVAL_CASE(OP_MUL,			IN0TYPE, IN0DATATYPE, IN1TYPE, IN1DATATYPE);	\
>--	MAKE_EVAL_CASE(OP_DIV,			IN0TYPE, IN0DATATYPE, IN1TYPE, IN1DATATYPE);	\
>--	MAKE_EVAL_CASE(OP_COMP_MUL,		IN0TYPE, IN0DATATYPE, IN1TYPE, IN1DATATYPE);
>--
>--#define MUL_OP(IN0TYPE, IN0DATATYPE, IN1TYPE, IN1DATATYPE)	\
>--	MAKE_EVAL_CASE(OP_MUL, IN0TYPE, IN0DATATYPE, IN1TYPE, IN1DATATYPE)
>--
>--#define MAKE_MAT_SCALAR_VEC_CASES(OP, TYPE0, TYPE1)				\
>--	OP(INPUTTYPE_CONST,		TYPE0, INPUTTYPE_CONST,		TYPE1);	\
>--	OP(INPUTTYPE_DYNAMIC,	TYPE0, INPUTTYPE_CONST,		TYPE1);	\
>--	OP(INPUTTYPE_CONST,		TYPE0, INPUTTYPE_DYNAMIC,	TYPE1);	\
>--	OP(INPUTTYPE_DYNAMIC,	TYPE0, INPUTTYPE_DYNAMIC,	TYPE1)
>--
>--#define MAKE_MAT_MAT_CASES(OP, MATTYPE)								\
>--	OP(INPUTTYPE_CONST,		MATTYPE, INPUTTYPE_CONST,	MATTYPE);	\
>--	OP(INPUTTYPE_DYNAMIC,	MATTYPE, INPUTTYPE_CONST,	MATTYPE)
>--
>--#define UNARY_OP(IN0TYPE, IN0DATATYPE)														\
>--	MAKE_EVAL_CASE(OP_UNARY_PLUS,		IN0TYPE, IN0DATATYPE, INPUTTYPE_CONST, TYPE_LAST);	\
>--	MAKE_EVAL_CASE(OP_NEGATION,			IN0TYPE, IN0DATATYPE, INPUTTYPE_CONST, TYPE_LAST);	\
>--	MAKE_EVAL_CASE(OP_PRE_INCREMENT,	IN0TYPE, IN0DATATYPE, INPUTTYPE_CONST, TYPE_LAST);	\
>--	MAKE_EVAL_CASE(OP_PRE_DECREMENT,	IN0TYPE, IN0DATATYPE, INPUTTYPE_CONST, TYPE_LAST);	\
>--	MAKE_EVAL_CASE(OP_POST_INCREMENT,	IN0TYPE, IN0DATATYPE, INPUTTYPE_CONST, TYPE_LAST);	\
>--	MAKE_EVAL_CASE(OP_POST_DECREMENT,	IN0TYPE, IN0DATATYPE, INPUTTYPE_CONST, TYPE_LAST)
>--
>--#define MAKE_UNARY_CASES(OP, MATTYPE)	\
>--	OP(INPUTTYPE_CONST,		MATTYPE);	\
>--	OP(INPUTTYPE_DYNAMIC,	MATTYPE)
>--
>--#define ASSIGN_OP(IN0TYPE, IN0DATATYPE, IN1TYPE, IN1DATATYPE)							\
>--	MAKE_EVAL_CASE(OP_ADD_INTO,			IN0TYPE, IN0DATATYPE, IN1TYPE, IN1DATATYPE);	\
>--	MAKE_EVAL_CASE(OP_SUBTRACT_FROM,	IN0TYPE, IN0DATATYPE, IN1TYPE, IN1DATATYPE);	\
>--	MAKE_EVAL_CASE(OP_MULTIPLY_INTO,	IN0TYPE, IN0DATATYPE, IN1TYPE, IN1DATATYPE);	\
>--	MAKE_EVAL_CASE(OP_DIVIDE_INTO,		IN0TYPE, IN0DATATYPE, IN1TYPE, IN1DATATYPE)
>--
>--#define MAKE_ASSIGNMENT_CASES(OP, MATTYPE)						\
>--	OP(INPUTTYPE_CONST,		MATTYPE, INPUTTYPE_CONST,	MATTYPE);	\
>--	OP(INPUTTYPE_DYNAMIC,	MATTYPE, INPUTTYPE_CONST,	MATTYPE);	\
>--	OP(INPUTTYPE_CONST,		MATTYPE, INPUTTYPE_DYNAMIC,	MATTYPE);	\
>--	OP(INPUTTYPE_DYNAMIC,	MATTYPE, INPUTTYPE_DYNAMIC,	MATTYPE)
>--
>--	// \note At the moment there is no difference between uniform and const inputs. This saves binary size.
>--	InputType in0Type = in0.inputType == INPUTTYPE_DYNAMIC ? INPUTTYPE_DYNAMIC : INPUTTYPE_CONST;
>--	InputType in1Type = in1.inputType == INPUTTYPE_DYNAMIC ? INPUTTYPE_DYNAMIC : INPUTTYPE_CONST;
>--
>--	switch (PACK_EVAL_CASE(op, in0Type, in0.dataType, in1Type, in1.dataType))
>--	{
>--		// Matrix-scalar.
>--		MAKE_MAT_SCALAR_VEC_CASES(SCALAR_OPS,	TYPE_FLOAT_MAT2, TYPE_FLOAT);
>--		MAKE_MAT_SCALAR_VEC_CASES(SCALAR_OPS,	TYPE_FLOAT_MAT3, TYPE_FLOAT);
>--		MAKE_MAT_SCALAR_VEC_CASES(SCALAR_OPS,	TYPE_FLOAT_MAT4, TYPE_FLOAT);
>--
>--		// Matrix-vector.
>--		MAKE_MAT_SCALAR_VEC_CASES(MUL_OP,		TYPE_FLOAT_MAT2, TYPE_FLOAT_VEC2);
>--		MAKE_MAT_SCALAR_VEC_CASES(MUL_OP,		TYPE_FLOAT_MAT3, TYPE_FLOAT_VEC3);
>--		MAKE_MAT_SCALAR_VEC_CASES(MUL_OP,		TYPE_FLOAT_MAT4, TYPE_FLOAT_VEC4);
>--
>--		// Vector-matrix.
>--		MAKE_MAT_SCALAR_VEC_CASES(MUL_OP,		TYPE_FLOAT_VEC2, TYPE_FLOAT_MAT2);
>--		MAKE_MAT_SCALAR_VEC_CASES(MUL_OP,		TYPE_FLOAT_VEC3, TYPE_FLOAT_MAT3);
>--		MAKE_MAT_SCALAR_VEC_CASES(MUL_OP,		TYPE_FLOAT_VEC4, TYPE_FLOAT_MAT4);
>--
>--		// Matrix-matrix.
>--		MAKE_MAT_MAT_CASES(ALL_OPS,	TYPE_FLOAT_MAT2);
>--		MAKE_MAT_MAT_CASES(ALL_OPS,	TYPE_FLOAT_MAT3);
>--		MAKE_MAT_MAT_CASES(ALL_OPS,	TYPE_FLOAT_MAT4);
>--
>--		// Unary matrix
>--		MAKE_UNARY_CASES(UNARY_OP, TYPE_FLOAT_MAT2);
>--		MAKE_UNARY_CASES(UNARY_OP, TYPE_FLOAT_MAT3);
>--		MAKE_UNARY_CASES(UNARY_OP, TYPE_FLOAT_MAT4);
>--
>--		// Assignment matrix
>--		MAKE_ASSIGNMENT_CASES(ASSIGN_OP, TYPE_FLOAT_MAT2);
>--		MAKE_ASSIGNMENT_CASES(ASSIGN_OP, TYPE_FLOAT_MAT3);
>--		MAKE_ASSIGNMENT_CASES(ASSIGN_OP, TYPE_FLOAT_MAT4);
>--
>--		default:
>--			DE_ASSERT(DE_FALSE);
>--			return DE_NULL;
>--	}
>-+    DE_STATIC_ASSERT(TYPE_LAST      <= (1<<7));
>-+    DE_STATIC_ASSERT(OP_LAST        <= (1<<4));
>-+    DE_STATIC_ASSERT(INPUTTYPE_LAST <= (1<<2));
>-+
>-+#define PACK_EVAL_CASE(OP, IN0TYPE, IN0DATATYPE, IN1TYPE, IN1DATATYPE)  (((OP) << 18) | ((IN0TYPE) << 16) | ((IN0DATATYPE) << 9) | ((IN1TYPE) << 7) | (IN1DATATYPE))
>-+
>-+#define MAKE_EVAL_CASE(OP, IN0TYPE, IN0DATATYPE, IN1TYPE, IN1DATATYPE)      \
>-+    case PACK_EVAL_CASE(OP, IN0TYPE, IN0DATATYPE, IN1TYPE, IN1DATATYPE):    \
>-+        return Evaluator<OP, IN0TYPE, IN0DATATYPE, IN1TYPE, IN1DATATYPE>::evaluate
>-+
>-+#define SCALAR_OPS(IN0TYPE, IN0DATATYPE, IN1TYPE, IN1DATATYPE)  \
>-+    MAKE_EVAL_CASE(OP_ADD,      IN0TYPE, IN0DATATYPE, IN1TYPE, IN1DATATYPE);    \
>-+    MAKE_EVAL_CASE(OP_SUB,      IN0TYPE, IN0DATATYPE, IN1TYPE, IN1DATATYPE);    \
>-+    MAKE_EVAL_CASE(OP_MUL,      IN0TYPE, IN0DATATYPE, IN1TYPE, IN1DATATYPE);    \
>-+    MAKE_EVAL_CASE(OP_DIV,      IN0TYPE, IN0DATATYPE, IN1TYPE, IN1DATATYPE)
>-+
>-+#define ALL_OPS(IN0TYPE, IN0DATATYPE, IN1TYPE, IN1DATATYPE) \
>-+    MAKE_EVAL_CASE(OP_ADD,          IN0TYPE, IN0DATATYPE, IN1TYPE, IN1DATATYPE);    \
>-+    MAKE_EVAL_CASE(OP_SUB,          IN0TYPE, IN0DATATYPE, IN1TYPE, IN1DATATYPE);    \
>-+    MAKE_EVAL_CASE(OP_MUL,          IN0TYPE, IN0DATATYPE, IN1TYPE, IN1DATATYPE);    \
>-+    MAKE_EVAL_CASE(OP_DIV,          IN0TYPE, IN0DATATYPE, IN1TYPE, IN1DATATYPE);    \
>-+    MAKE_EVAL_CASE(OP_COMP_MUL,     IN0TYPE, IN0DATATYPE, IN1TYPE, IN1DATATYPE);
>-+
>-+#define MUL_OP(IN0TYPE, IN0DATATYPE, IN1TYPE, IN1DATATYPE)  \
>-+    MAKE_EVAL_CASE(OP_MUL, IN0TYPE, IN0DATATYPE, IN1TYPE, IN1DATATYPE)
>-+
>-+#define MAKE_MAT_SCALAR_VEC_CASES(OP, TYPE0, TYPE1)             \
>-+    OP(INPUTTYPE_CONST,     TYPE0, INPUTTYPE_CONST,     TYPE1); \
>-+    OP(INPUTTYPE_DYNAMIC,   TYPE0, INPUTTYPE_CONST,     TYPE1); \
>-+    OP(INPUTTYPE_CONST,     TYPE0, INPUTTYPE_DYNAMIC,   TYPE1); \
>-+    OP(INPUTTYPE_DYNAMIC,   TYPE0, INPUTTYPE_DYNAMIC,   TYPE1)
>-+
>-+#define MAKE_MAT_MAT_CASES(OP, MATTYPE)                             \
>-+    OP(INPUTTYPE_CONST,     MATTYPE, INPUTTYPE_CONST,   MATTYPE);   \
>-+    OP(INPUTTYPE_DYNAMIC,   MATTYPE, INPUTTYPE_CONST,   MATTYPE)
>-+
>-+#define UNARY_OP(IN0TYPE, IN0DATATYPE)                                                      \
>-+    MAKE_EVAL_CASE(OP_UNARY_PLUS,       IN0TYPE, IN0DATATYPE, INPUTTYPE_CONST, TYPE_LAST);  \
>-+    MAKE_EVAL_CASE(OP_NEGATION,         IN0TYPE, IN0DATATYPE, INPUTTYPE_CONST, TYPE_LAST);  \
>-+    MAKE_EVAL_CASE(OP_PRE_INCREMENT,    IN0TYPE, IN0DATATYPE, INPUTTYPE_CONST, TYPE_LAST);  \
>-+    MAKE_EVAL_CASE(OP_PRE_DECREMENT,    IN0TYPE, IN0DATATYPE, INPUTTYPE_CONST, TYPE_LAST);  \
>-+    MAKE_EVAL_CASE(OP_POST_INCREMENT,   IN0TYPE, IN0DATATYPE, INPUTTYPE_CONST, TYPE_LAST);  \
>-+    MAKE_EVAL_CASE(OP_POST_DECREMENT,   IN0TYPE, IN0DATATYPE, INPUTTYPE_CONST, TYPE_LAST)
>-+
>-+#define MAKE_UNARY_CASES(OP, MATTYPE)   \
>-+    OP(INPUTTYPE_CONST,     MATTYPE);   \
>-+    OP(INPUTTYPE_DYNAMIC,   MATTYPE)
>-+
>-+#define ASSIGN_OP(IN0TYPE, IN0DATATYPE, IN1TYPE, IN1DATATYPE)                           \
>-+    MAKE_EVAL_CASE(OP_ADD_INTO,         IN0TYPE, IN0DATATYPE, IN1TYPE, IN1DATATYPE);    \
>-+    MAKE_EVAL_CASE(OP_SUBTRACT_FROM,    IN0TYPE, IN0DATATYPE, IN1TYPE, IN1DATATYPE);    \
>-+    MAKE_EVAL_CASE(OP_MULTIPLY_INTO,    IN0TYPE, IN0DATATYPE, IN1TYPE, IN1DATATYPE);    \
>-+    MAKE_EVAL_CASE(OP_DIVIDE_INTO,      IN0TYPE, IN0DATATYPE, IN1TYPE, IN1DATATYPE)
>-+
>-+#define MAKE_ASSIGNMENT_CASES(OP, MATTYPE)                      \
>-+    OP(INPUTTYPE_CONST,     MATTYPE, INPUTTYPE_CONST,   MATTYPE);   \
>-+    OP(INPUTTYPE_DYNAMIC,   MATTYPE, INPUTTYPE_CONST,   MATTYPE);   \
>-+    OP(INPUTTYPE_CONST,     MATTYPE, INPUTTYPE_DYNAMIC, MATTYPE);   \
>-+    OP(INPUTTYPE_DYNAMIC,   MATTYPE, INPUTTYPE_DYNAMIC, MATTYPE)
>-+
>-+    // \note At the moment there is no difference between uniform and const inputs. This saves binary size.
>-+    InputType in0Type = in0.inputType == INPUTTYPE_DYNAMIC ? INPUTTYPE_DYNAMIC : INPUTTYPE_CONST;
>-+    InputType in1Type = in1.inputType == INPUTTYPE_DYNAMIC ? INPUTTYPE_DYNAMIC : INPUTTYPE_CONST;
>-+
>-+    switch (PACK_EVAL_CASE(op, in0Type, in0.dataType, in1Type, in1.dataType))
>-+    {
>-+        // Matrix-scalar.
>-+        MAKE_MAT_SCALAR_VEC_CASES(SCALAR_OPS,   TYPE_FLOAT_MAT2, TYPE_FLOAT);
>-+        MAKE_MAT_SCALAR_VEC_CASES(SCALAR_OPS,   TYPE_FLOAT_MAT3, TYPE_FLOAT);
>-+        MAKE_MAT_SCALAR_VEC_CASES(SCALAR_OPS,   TYPE_FLOAT_MAT4, TYPE_FLOAT);
>-+
>-+        // Matrix-vector.
>-+        MAKE_MAT_SCALAR_VEC_CASES(MUL_OP,       TYPE_FLOAT_MAT2, TYPE_FLOAT_VEC2);
>-+        MAKE_MAT_SCALAR_VEC_CASES(MUL_OP,       TYPE_FLOAT_MAT3, TYPE_FLOAT_VEC3);
>-+        MAKE_MAT_SCALAR_VEC_CASES(MUL_OP,       TYPE_FLOAT_MAT4, TYPE_FLOAT_VEC4);
>-+
>-+        // Vector-matrix.
>-+        MAKE_MAT_SCALAR_VEC_CASES(MUL_OP,       TYPE_FLOAT_VEC2, TYPE_FLOAT_MAT2);
>-+        MAKE_MAT_SCALAR_VEC_CASES(MUL_OP,       TYPE_FLOAT_VEC3, TYPE_FLOAT_MAT3);
>-+        MAKE_MAT_SCALAR_VEC_CASES(MUL_OP,       TYPE_FLOAT_VEC4, TYPE_FLOAT_MAT4);
>-+
>-+        // Matrix-matrix.
>-+        MAKE_MAT_MAT_CASES(ALL_OPS, TYPE_FLOAT_MAT2);
>-+        MAKE_MAT_MAT_CASES(ALL_OPS, TYPE_FLOAT_MAT3);
>-+        MAKE_MAT_MAT_CASES(ALL_OPS, TYPE_FLOAT_MAT4);
>-+
>-+        // Unary matrix
>-+        MAKE_UNARY_CASES(UNARY_OP, TYPE_FLOAT_MAT2);
>-+        MAKE_UNARY_CASES(UNARY_OP, TYPE_FLOAT_MAT3);
>-+        MAKE_UNARY_CASES(UNARY_OP, TYPE_FLOAT_MAT4);
>-+
>-+        // Assignment matrix
>-+        MAKE_ASSIGNMENT_CASES(ASSIGN_OP, TYPE_FLOAT_MAT2);
>-+        MAKE_ASSIGNMENT_CASES(ASSIGN_OP, TYPE_FLOAT_MAT3);
>-+        MAKE_ASSIGNMENT_CASES(ASSIGN_OP, TYPE_FLOAT_MAT4);
>-+
>-+        default:
>-+            DE_ASSERT(DE_FALSE);
>-+            return DE_NULL;
>-+    }
>- 
>- #undef PACK_EVAL_CASE
>- #undef MAKE_EVAL_CASE
>-@@ -701,35 +701,35 @@ ShaderEvalFunc getEvalFunc (const ShaderInput& in0, const ShaderInput& in1, Matr
>- template <int Size>
>- void writeVectorConstructor (std::ostream& str, const tcu::Vector<float, Size>& v)
>- {
>--	str << "vec" << Size << "(";
>--	for (int ndx = 0; ndx < Size; ndx++)
>--	{
>--		if (ndx != 0)
>--			str << ", ";
>--		str << de::floatToString(v[ndx], 1);
>--	}
>--	str << ")";
>-+    str << "vec" << Size << "(";
>-+    for (int ndx = 0; ndx < Size; ndx++)
>-+    {
>-+        if (ndx != 0)
>-+            str << ", ";
>-+        str << de::floatToString(v[ndx], 1);
>-+    }
>-+    str << ")";
>- }
>- 
>- template <int Cols, int Rows>
>- void writeMatrixConstructor (std::ostream& str, const tcu::Matrix<float, Rows, Cols>& m)
>- {
>--	if (Rows == Cols)
>--		str << "mat" << Cols;
>--	else
>--		str << "mat" << Cols << "x" << Rows;
>--
>--	str << "(";
>--	for (int colNdx = 0; colNdx < Cols; colNdx++)
>--	{
>--		for (int rowNdx = 0; rowNdx < Rows; rowNdx++)
>--		{
>--			if (rowNdx > 0 || colNdx > 0)
>--				str << ", ";
>--			str << de::floatToString(m(rowNdx, colNdx), 1);
>--		}
>--	}
>--	str << ")";
>-+    if (Rows == Cols)
>-+        str << "mat" << Cols;
>-+    else
>-+        str << "mat" << Cols << "x" << Rows;
>-+
>-+    str << "(";
>-+    for (int colNdx = 0; colNdx < Cols; colNdx++)
>-+    {
>-+        for (int rowNdx = 0; rowNdx < Rows; rowNdx++)
>-+        {
>-+            if (rowNdx > 0 || colNdx > 0)
>-+                str << ", ";
>-+            str << de::floatToString(m(rowNdx, colNdx), 1);
>-+        }
>-+    }
>-+    str << ")";
>- }
>- 
>- } // MatrixCaseUtils
>-@@ -739,26 +739,26 @@ using namespace MatrixCaseUtils;
>- class ShaderMatrixCase : public ShaderRenderCase
>- {
>- public:
>--					ShaderMatrixCase			(Context& context, const char* name, const char* desc, const ShaderInput& in0, const ShaderInput& in1, MatrixOp op, bool isVertexCase);
>--					~ShaderMatrixCase			(void);
>-+                    ShaderMatrixCase            (Context& context, const char* name, const char* desc, const ShaderInput& in0, const ShaderInput& in1, MatrixOp op, bool isVertexCase);
>-+                    ~ShaderMatrixCase           (void);
>- 
>--	void			init						(void);
>-+    void            init                        (void);
>- 
>- protected:
>--	std::string		genGLSLMatToVec3Reduction	(const glu::DataType& matType, const char* varName);
>--	void			setupUniforms				(int programID, const tcu::Vec4& constCoords);
>-+    std::string     genGLSLMatToVec3Reduction   (const glu::DataType& matType, const char* varName);
>-+    void            setupUniforms               (int programID, const tcu::Vec4& constCoords);
>- 
>- private:
>--	ShaderInput		m_in0;
>--	ShaderInput		m_in1;
>--	MatrixOp		m_op;
>-+    ShaderInput     m_in0;
>-+    ShaderInput     m_in1;
>-+    MatrixOp        m_op;
>- };
>- 
>- ShaderMatrixCase::ShaderMatrixCase (Context& context, const char* name, const char* desc, const ShaderInput& in0, const ShaderInput& in1, MatrixOp op, bool isVertexCase)
>--	: ShaderRenderCase	(context.getTestContext(), context.getRenderContext(), context.getContextInfo(), name, desc, isVertexCase, getEvalFunc(in0, in1, op))
>--	, m_in0				(in0)
>--	, m_in1				(in1)
>--	, m_op				(op)
>-+    : ShaderRenderCase  (context.getTestContext(), context.getRenderContext(), context.getContextInfo(), name, desc, isVertexCase, getEvalFunc(in0, in1, op))
>-+    , m_in0             (in0)
>-+    , m_in1             (in1)
>-+    , m_op              (op)
>- {
>- }
>- 
>-@@ -768,315 +768,315 @@ ShaderMatrixCase::~ShaderMatrixCase (void)
>- 
>- void ShaderMatrixCase::init (void)
>- {
>--	std::ostringstream	vtx;
>--	std::ostringstream	frag;
>--	std::ostringstream&	op				= m_isVertexCase ? vtx : frag;
>--
>--	bool				isInDynMat0		= isDataTypeMatrix(m_in0.dataType) && m_in0.inputType == INPUTTYPE_DYNAMIC;
>--	bool				isInDynMat1		= isDataTypeMatrix(m_in1.dataType) && m_in1.inputType == INPUTTYPE_DYNAMIC;
>--	string				inValue0;
>--	string				inValue1;
>--	DataType			resultType		= TYPE_LAST;
>--	Precision			resultPrec		= m_in0.precision;
>--	vector<string>		passVars;
>--	int					numInputs		= (isOperationBinary(m_op)) ? (2) : (1);
>--
>--	std::string			operationValue0;
>--	std::string			operationValue1;
>--
>--	DE_ASSERT(!isInDynMat0 || !isInDynMat1); // Only single dynamic matrix input is allowed.
>--	DE_UNREF(isInDynMat0 && isInDynMat1);
>--
>--	// Compute result type.
>--	if (isDataTypeMatrix(m_in0.dataType) && isDataTypeMatrix(m_in1.dataType))
>--	{
>--		DE_ASSERT(m_in0.dataType == m_in1.dataType);
>--		resultType = m_in0.dataType;
>--	}
>--	else if (getOperationType(m_op) == OPERATIONTYPE_UNARY_PREFIX_OPERATOR ||
>--			 getOperationType(m_op) == OPERATIONTYPE_UNARY_POSTFIX_OPERATOR)
>--	{
>--		resultType = m_in0.dataType;
>--	}
>--	else
>--	{
>--		int			matNdx		= isDataTypeMatrix(m_in0.dataType) ? 0 : 1;
>--		DataType	matrixType	= matNdx == 0 ? m_in0.dataType : m_in1.dataType;
>--		DataType	otherType	= matNdx == 0 ? m_in1.dataType : m_in0.dataType;
>--
>--		if (otherType == TYPE_FLOAT)
>--			resultType = matrixType;
>--		else
>--		{
>--			DE_ASSERT(isDataTypeVector(otherType));
>--			resultType = otherType;
>--		}
>--	}
>--
>--	vtx << "attribute highp vec4 a_position;\n";
>--	if (m_isVertexCase)
>--	{
>--		vtx << "varying mediump vec4 v_color;\n";
>--		frag << "varying mediump vec4 v_color;\n";
>--	}
>--
>--	// Input declarations.
>--	for (int inNdx = 0; inNdx < numInputs; inNdx++)
>--	{
>--		const ShaderInput&	in			= inNdx > 0 ? m_in1 : m_in0;
>--		const char*			precName	= getPrecisionName(in.precision);
>--		const char*			typeName	= getDataTypeName(in.dataType);
>--		string&				inValue		= inNdx > 0 ? inValue1 : inValue0;
>--
>--		if (in.inputType == INPUTTYPE_DYNAMIC)
>--		{
>--			vtx << "attribute " << precName << " " << typeName << " a_";
>--
>--			if (isDataTypeMatrix(in.dataType))
>--			{
>--				// a_matN, v_matN
>--				vtx << typeName << ";\n";
>--				if (!m_isVertexCase)
>--				{
>--					vtx << "varying " << precName << " " << typeName << " v_" << typeName << ";\n";
>--					frag << "varying " << precName << " " << typeName << " v_" << typeName << ";\n";
>--					passVars.push_back(typeName);
>--				}
>--
>--				inValue = string(m_isVertexCase ? "a_" : "v_") + getDataTypeName(in.dataType);
>--			}
>--			else
>--			{
>--				// a_coords, v_coords
>--				vtx << "coords;\n";
>--				if (!m_isVertexCase)
>--				{
>--					vtx << "varying " << precName << " " << typeName << " v_coords;\n";
>--					frag << "varying " << precName << " " << typeName << " v_coords;\n";
>--					passVars.push_back("coords");
>--				}
>--
>--				inValue = m_isVertexCase ? "a_coords" : "v_coords";
>--			}
>--		}
>--		else if (in.inputType == INPUTTYPE_UNIFORM)
>--		{
>--			op << "uniform " << precName << " " << typeName << " u_in" << inNdx << ";\n";
>--			inValue = string("u_in") + de::toString(inNdx);
>--		}
>--		else if (in.inputType == INPUTTYPE_CONST)
>--		{
>--			op << "const " << precName << " " << typeName << " in" << inNdx << " = ";
>--
>--			// Generate declaration.
>--			switch (in.dataType)
>--			{
>--				case TYPE_FLOAT:		op << de::floatToString(s_constInFloat[inNdx], 1);					break;
>--				case TYPE_FLOAT_VEC2:	writeVectorConstructor<2>(op, s_constInVec2[inNdx]);				break;
>--				case TYPE_FLOAT_VEC3:	writeVectorConstructor<3>(op, s_constInVec3[inNdx]);				break;
>--				case TYPE_FLOAT_VEC4:	writeVectorConstructor<4>(op, s_constInVec4[inNdx]);				break;
>--				case TYPE_FLOAT_MAT2:	writeMatrixConstructor<2, 2>(op, Mat2(s_constInMat2[inNdx]));		break;
>--				case TYPE_FLOAT_MAT3:	writeMatrixConstructor<3, 3>(op, Mat3(s_constInMat3[inNdx]));		break;
>--				case TYPE_FLOAT_MAT4:	writeMatrixConstructor<4, 4>(op, Mat4(s_constInMat4[inNdx]));		break;
>--
>--				default:
>--					DE_ASSERT(DE_FALSE);
>--			}
>--
>--			op << ";\n";
>--
>--			inValue = string("in") + de::toString(inNdx);
>--		}
>--	}
>--
>--	vtx << "\n"
>--		<< "void main (void)\n"
>--		<< "{\n"
>--		<< "	gl_Position = a_position;\n";
>--	frag << "\n"
>--		 << "void main (void)\n"
>--		 << "{\n";
>--
>--	if (m_isVertexCase)
>--	{
>--		frag << "	gl_FragColor = v_color;\n";
>--	}
>--	else
>--	{
>--		for (vector<string>::const_iterator copyIter = passVars.begin(); copyIter != passVars.end(); copyIter++)
>--			vtx << "	v_" << *copyIter << " = " << "a_" << *copyIter << ";\n";
>--	}
>--
>--	// Operation.
>--
>--	switch (getOperationNature(m_op))
>--	{
>--		case OPERATIONNATURE_PURE:
>--			DE_ASSERT(getOperationType(m_op) != OPERATIONTYPE_ASSIGNMENT);
>--
>--			operationValue0 = inValue0;
>--			operationValue1 = inValue1;
>--			break;
>--
>--		case OPERATIONNATURE_MUTATING:
>--			DE_ASSERT(getOperationType(m_op) != OPERATIONTYPE_ASSIGNMENT);
>--
>--			op << "	" << getPrecisionName(resultPrec) << " " << getDataTypeName(resultType) << " tmpValue = " << inValue0 << ";\n";
>--
>--			operationValue0 = "tmpValue";
>--			operationValue1 = inValue1;
>--			break;
>--
>--		case OPERATIONNATURE_ASSIGNMENT:
>--			DE_ASSERT(getOperationType(m_op) == OPERATIONTYPE_ASSIGNMENT);
>--
>--			operationValue0 = inValue0;
>--			operationValue1 = inValue1;
>--			break;
>--
>--		default:
>--			DE_ASSERT(DE_FALSE);
>--	}
>--
>--	switch (getOperationType(m_op))
>--	{
>--		case OPERATIONTYPE_BINARY_OPERATOR:
>--			op << "	" << getPrecisionName(resultPrec) << " " << getDataTypeName(resultType) << " res = " << operationValue0 << " " << getOperationName(m_op) << " " << operationValue1 << ";\n";
>--			break;
>--
>--		case OPERATIONTYPE_UNARY_PREFIX_OPERATOR:
>--			op << "	" << getPrecisionName(resultPrec) << " " << getDataTypeName(resultType) << " res = " << getOperationName(m_op) << operationValue0 << ";\n";
>--			break;
>--
>--		case OPERATIONTYPE_UNARY_POSTFIX_OPERATOR:
>--			op << "	" << getPrecisionName(resultPrec) << " " << getDataTypeName(resultType) << " res = " << operationValue0 << getOperationName(m_op) << ";\n";
>--			break;
>--
>--		case OPERATIONTYPE_BINARY_FUNCTION:
>--			op << "	" << getPrecisionName(resultPrec) << " " << getDataTypeName(resultType) << " res = " << getOperationName(m_op) << "(" << operationValue0 << ", " << operationValue1 << ");\n";
>--			break;
>--
>--		case OPERATIONTYPE_ASSIGNMENT:
>--			op << "	" << getPrecisionName(resultPrec) << " " << getDataTypeName(resultType) << " res = " << operationValue0 << ";\n";
>--			op << "	res " << getOperationName(m_op) << " " << operationValue1 << ";\n";
>--			break;
>--
>--		default:
>--			DE_ASSERT(DE_FALSE);
>--	}
>--
>--	// Reduction to vec3 (rgb). Check the used value too if it was modified.
>--	op << "	" << (m_isVertexCase ? "v_color" : "gl_FragColor") << " = ";
>--
>--	if (isOperationValueModifying(m_op))
>--		op << "vec4(" << genGLSLMatToVec3Reduction(resultType, "res") << ", 1.0) + vec4(" << genGLSLMatToVec3Reduction(resultType, "tmpValue") << ", 0.0);\n";
>--	else
>--		op << "vec4(" << genGLSLMatToVec3Reduction(resultType, "res") << ", 1.0);\n";
>--
>--	vtx << "}\n";
>--	frag << "}\n";
>--
>--	m_vertShaderSource	= vtx.str();
>--	m_fragShaderSource	= frag.str();
>--
>--	// \todo [2012-02-14 pyry] Compute better values for matrix tests.
>--	m_userAttribTransforms.resize(4);
>--	for (int attribNdx = 0; attribNdx < 4; attribNdx++)
>--	{
>--		m_userAttribTransforms[attribNdx] = Mat4(0.0f);
>--		m_userAttribTransforms[attribNdx]((0 + attribNdx) % 4, 0) = 1.0f;
>--		m_userAttribTransforms[attribNdx]((1 + attribNdx) % 4, 1) = 1.0f;
>--		m_userAttribTransforms[attribNdx]((2 + attribNdx) % 4, 2) = 1.0f;
>--		m_userAttribTransforms[attribNdx]((3 + attribNdx) % 4, 3) = 1.0f;
>--	}
>--
>--	// prevent bad reference cases such as black result images by fine-tuning used matrices
>--	if (getOperationTestMatrixType(m_op) != TESTMATRIXTYPE_DEFAULT)
>--	{
>--		for (int attribNdx = 0; attribNdx < 4; attribNdx++)
>--		{
>--			for (int row = 0; row < 4; row++)
>--			for (int col = 0; col < 4; col++)
>--			{
>--				switch (getOperationTestMatrixType(m_op))
>--				{
>--					case TESTMATRIXTYPE_NEGATED:
>--						m_userAttribTransforms[attribNdx](row, col) = -m_userAttribTransforms[attribNdx](row, col);
>--						break;
>--					case TESTMATRIXTYPE_INCREMENTED:
>--						m_userAttribTransforms[attribNdx](row, col) += 0.3f;
>--						break;
>--					case TESTMATRIXTYPE_DECREMENTED:
>--						m_userAttribTransforms[attribNdx](row, col) -= 0.1f;
>--						break;
>--
>--					default:
>--						DE_ASSERT(DE_FALSE);
>--						break;
>--				}
>--			}
>--		}
>--	}
>--
>--	ShaderRenderCase::init();
>-+    std::ostringstream  vtx;
>-+    std::ostringstream  frag;
>-+    std::ostringstream& op              = m_isVertexCase ? vtx : frag;
>-+
>-+    bool                isInDynMat0     = isDataTypeMatrix(m_in0.dataType) && m_in0.inputType == INPUTTYPE_DYNAMIC;
>-+    bool                isInDynMat1     = isDataTypeMatrix(m_in1.dataType) && m_in1.inputType == INPUTTYPE_DYNAMIC;
>-+    string              inValue0;
>-+    string              inValue1;
>-+    DataType            resultType      = TYPE_LAST;
>-+    Precision           resultPrec      = m_in0.precision;
>-+    vector<string>      passVars;
>-+    int                 numInputs       = (isOperationBinary(m_op)) ? (2) : (1);
>-+
>-+    std::string         operationValue0;
>-+    std::string         operationValue1;
>-+
>-+    DE_ASSERT(!isInDynMat0 || !isInDynMat1); // Only single dynamic matrix input is allowed.
>-+    DE_UNREF(isInDynMat0 && isInDynMat1);
>-+
>-+    // Compute result type.
>-+    if (isDataTypeMatrix(m_in0.dataType) && isDataTypeMatrix(m_in1.dataType))
>-+    {
>-+        DE_ASSERT(m_in0.dataType == m_in1.dataType);
>-+        resultType = m_in0.dataType;
>-+    }
>-+    else if (getOperationType(m_op) == OPERATIONTYPE_UNARY_PREFIX_OPERATOR ||
>-+             getOperationType(m_op) == OPERATIONTYPE_UNARY_POSTFIX_OPERATOR)
>-+    {
>-+        resultType = m_in0.dataType;
>-+    }
>-+    else
>-+    {
>-+        int         matNdx      = isDataTypeMatrix(m_in0.dataType) ? 0 : 1;
>-+        DataType    matrixType  = matNdx == 0 ? m_in0.dataType : m_in1.dataType;
>-+        DataType    otherType   = matNdx == 0 ? m_in1.dataType : m_in0.dataType;
>-+
>-+        if (otherType == TYPE_FLOAT)
>-+            resultType = matrixType;
>-+        else
>-+        {
>-+            DE_ASSERT(isDataTypeVector(otherType));
>-+            resultType = otherType;
>-+        }
>-+    }
>-+
>-+    vtx << "attribute highp vec4 a_position;\n";
>-+    if (m_isVertexCase)
>-+    {
>-+        vtx << "varying mediump vec4 v_color;\n";
>-+        frag << "varying mediump vec4 v_color;\n";
>-+    }
>-+
>-+    // Input declarations.
>-+    for (int inNdx = 0; inNdx < numInputs; inNdx++)
>-+    {
>-+        const ShaderInput&  in          = inNdx > 0 ? m_in1 : m_in0;
>-+        const char*         precName    = getPrecisionName(in.precision);
>-+        const char*         typeName    = getDataTypeName(in.dataType);
>-+        string&             inValue     = inNdx > 0 ? inValue1 : inValue0;
>-+
>-+        if (in.inputType == INPUTTYPE_DYNAMIC)
>-+        {
>-+            vtx << "attribute " << precName << " " << typeName << " a_";
>-+
>-+            if (isDataTypeMatrix(in.dataType))
>-+            {
>-+                // a_matN, v_matN
>-+                vtx << typeName << ";\n";
>-+                if (!m_isVertexCase)
>-+                {
>-+                    vtx << "varying " << precName << " " << typeName << " v_" << typeName << ";\n";
>-+                    frag << "varying " << precName << " " << typeName << " v_" << typeName << ";\n";
>-+                    passVars.push_back(typeName);
>-+                }
>-+
>-+                inValue = string(m_isVertexCase ? "a_" : "v_") + getDataTypeName(in.dataType);
>-+            }
>-+            else
>-+            {
>-+                // a_coords, v_coords
>-+                vtx << "coords;\n";
>-+                if (!m_isVertexCase)
>-+                {
>-+                    vtx << "varying " << precName << " " << typeName << " v_coords;\n";
>-+                    frag << "varying " << precName << " " << typeName << " v_coords;\n";
>-+                    passVars.push_back("coords");
>-+                }
>-+
>-+                inValue = m_isVertexCase ? "a_coords" : "v_coords";
>-+            }
>-+        }
>-+        else if (in.inputType == INPUTTYPE_UNIFORM)
>-+        {
>-+            op << "uniform " << precName << " " << typeName << " u_in" << inNdx << ";\n";
>-+            inValue = string("u_in") + de::toString(inNdx);
>-+        }
>-+        else if (in.inputType == INPUTTYPE_CONST)
>-+        {
>-+            op << "const " << precName << " " << typeName << " in" << inNdx << " = ";
>-+
>-+            // Generate declaration.
>-+            switch (in.dataType)
>-+            {
>-+                case TYPE_FLOAT:        op << de::floatToString(s_constInFloat[inNdx], 1);                  break;
>-+                case TYPE_FLOAT_VEC2:   writeVectorConstructor<2>(op, s_constInVec2[inNdx]);                break;
>-+                case TYPE_FLOAT_VEC3:   writeVectorConstructor<3>(op, s_constInVec3[inNdx]);                break;
>-+                case TYPE_FLOAT_VEC4:   writeVectorConstructor<4>(op, s_constInVec4[inNdx]);                break;
>-+                case TYPE_FLOAT_MAT2:   writeMatrixConstructor<2, 2>(op, Mat2(s_constInMat2[inNdx]));       break;
>-+                case TYPE_FLOAT_MAT3:   writeMatrixConstructor<3, 3>(op, Mat3(s_constInMat3[inNdx]));       break;
>-+                case TYPE_FLOAT_MAT4:   writeMatrixConstructor<4, 4>(op, Mat4(s_constInMat4[inNdx]));       break;
>-+
>-+                default:
>-+                    DE_ASSERT(DE_FALSE);
>-+            }
>-+
>-+            op << ";\n";
>-+
>-+            inValue = string("in") + de::toString(inNdx);
>-+        }
>-+    }
>-+
>-+    vtx << "\n"
>-+        << "void main (void)\n"
>-+        << "{\n"
>-+        << "    gl_Position = a_position;\n";
>-+    frag << "\n"
>-+         << "void main (void)\n"
>-+         << "{\n";
>-+
>-+    if (m_isVertexCase)
>-+    {
>-+        frag << "   gl_FragColor = v_color;\n";
>-+    }
>-+    else
>-+    {
>-+        for (vector<string>::const_iterator copyIter = passVars.begin(); copyIter != passVars.end(); copyIter++)
>-+            vtx << "    v_" << *copyIter << " = " << "a_" << *copyIter << ";\n";
>-+    }
>-+
>-+    // Operation.
>-+
>-+    switch (getOperationNature(m_op))
>-+    {
>-+        case OPERATIONNATURE_PURE:
>-+            DE_ASSERT(getOperationType(m_op) != OPERATIONTYPE_ASSIGNMENT);
>-+
>-+            operationValue0 = inValue0;
>-+            operationValue1 = inValue1;
>-+            break;
>-+
>-+        case OPERATIONNATURE_MUTATING:
>-+            DE_ASSERT(getOperationType(m_op) != OPERATIONTYPE_ASSIGNMENT);
>-+
>-+            op << " " << getPrecisionName(resultPrec) << " " << getDataTypeName(resultType) << " tmpValue = " << inValue0 << ";\n";
>-+
>-+            operationValue0 = "tmpValue";
>-+            operationValue1 = inValue1;
>-+            break;
>-+
>-+        case OPERATIONNATURE_ASSIGNMENT:
>-+            DE_ASSERT(getOperationType(m_op) == OPERATIONTYPE_ASSIGNMENT);
>-+
>-+            operationValue0 = inValue0;
>-+            operationValue1 = inValue1;
>-+            break;
>-+
>-+        default:
>-+            DE_ASSERT(DE_FALSE);
>-+    }
>-+
>-+    switch (getOperationType(m_op))
>-+    {
>-+        case OPERATIONTYPE_BINARY_OPERATOR:
>-+            op << " " << getPrecisionName(resultPrec) << " " << getDataTypeName(resultType) << " res = " << operationValue0 << " " << getOperationName(m_op) << " " << operationValue1 << ";\n";
>-+            break;
>-+
>-+        case OPERATIONTYPE_UNARY_PREFIX_OPERATOR:
>-+            op << " " << getPrecisionName(resultPrec) << " " << getDataTypeName(resultType) << " res = " << getOperationName(m_op) << operationValue0 << ";\n";
>-+            break;
>-+
>-+        case OPERATIONTYPE_UNARY_POSTFIX_OPERATOR:
>-+            op << " " << getPrecisionName(resultPrec) << " " << getDataTypeName(resultType) << " res = " << operationValue0 << getOperationName(m_op) << ";\n";
>-+            break;
>-+
>-+        case OPERATIONTYPE_BINARY_FUNCTION:
>-+            op << " " << getPrecisionName(resultPrec) << " " << getDataTypeName(resultType) << " res = " << getOperationName(m_op) << "(" << operationValue0 << ", " << operationValue1 << ");\n";
>-+            break;
>-+
>-+        case OPERATIONTYPE_ASSIGNMENT:
>-+            op << " " << getPrecisionName(resultPrec) << " " << getDataTypeName(resultType) << " res = " << operationValue0 << ";\n";
>-+            op << " res " << getOperationName(m_op) << " " << operationValue1 << ";\n";
>-+            break;
>-+
>-+        default:
>-+            DE_ASSERT(DE_FALSE);
>-+    }
>-+
>-+    // Reduction to vec3 (rgb). Check the used value too if it was modified.
>-+    op << " " << (m_isVertexCase ? "v_color" : "gl_FragColor") << " = ";
>-+
>-+    if (isOperationValueModifying(m_op))
>-+        op << "vec4(" << genGLSLMatToVec3Reduction(resultType, "res") << ", 1.0) + vec4(" << genGLSLMatToVec3Reduction(resultType, "tmpValue") << ", 0.0);\n";
>-+    else
>-+        op << "vec4(" << genGLSLMatToVec3Reduction(resultType, "res") << ", 1.0);\n";
>-+
>-+    vtx << "}\n";
>-+    frag << "}\n";
>-+
>-+    m_vertShaderSource  = vtx.str();
>-+    m_fragShaderSource  = frag.str();
>-+
>-+    // \todo [2012-02-14 pyry] Compute better values for matrix tests.
>-+    m_userAttribTransforms.resize(4);
>-+    for (int attribNdx = 0; attribNdx < 4; attribNdx++)
>-+    {
>-+        m_userAttribTransforms[attribNdx] = Mat4(0.0f);
>-+        m_userAttribTransforms[attribNdx]((0 + attribNdx) % 4, 0) = 1.0f;
>-+        m_userAttribTransforms[attribNdx]((1 + attribNdx) % 4, 1) = 1.0f;
>-+        m_userAttribTransforms[attribNdx]((2 + attribNdx) % 4, 2) = 1.0f;
>-+        m_userAttribTransforms[attribNdx]((3 + attribNdx) % 4, 3) = 1.0f;
>-+    }
>-+
>-+    // prevent bad reference cases such as black result images by fine-tuning used matrices
>-+    if (getOperationTestMatrixType(m_op) != TESTMATRIXTYPE_DEFAULT)
>-+    {
>-+        for (int attribNdx = 0; attribNdx < 4; attribNdx++)
>-+        {
>-+            for (int row = 0; row < 4; row++)
>-+            for (int col = 0; col < 4; col++)
>-+            {
>-+                switch (getOperationTestMatrixType(m_op))
>-+                {
>-+                    case TESTMATRIXTYPE_NEGATED:
>-+                        m_userAttribTransforms[attribNdx](row, col) = -m_userAttribTransforms[attribNdx](row, col);
>-+                        break;
>-+                    case TESTMATRIXTYPE_INCREMENTED:
>-+                        m_userAttribTransforms[attribNdx](row, col) += 0.3f;
>-+                        break;
>-+                    case TESTMATRIXTYPE_DECREMENTED:
>-+                        m_userAttribTransforms[attribNdx](row, col) -= 0.1f;
>-+                        break;
>-+
>-+                    default:
>-+                        DE_ASSERT(DE_FALSE);
>-+                        break;
>-+                }
>-+            }
>-+        }
>-+    }
>-+
>-+    ShaderRenderCase::init();
>- }
>- 
>- std::string ShaderMatrixCase::genGLSLMatToVec3Reduction (const glu::DataType& matType, const char* varName)
>- {
>--	std::ostringstream op;
>--
>--	switch (matType)
>--	{
>--		case TYPE_FLOAT:		op << varName << ", "		<< varName << ", "			<< varName << "";										break;
>--		case TYPE_FLOAT_VEC2:	op << varName << ".x, "		<< varName << ".y, "		<< varName << ".x";										break;
>--		case TYPE_FLOAT_VEC3:	op << varName << "";																							break;
>--		case TYPE_FLOAT_VEC4:	op << varName << ".x, "		<< varName << ".y, "		<< varName << ".z+"			<< varName << ".w";			break;
>--		case TYPE_FLOAT_MAT2:	op << varName << "[0][0], "	<< varName << "[1][0], "	<< varName << "[0][1]+"		<< varName << "[1][1]";		break;
>--		case TYPE_FLOAT_MAT3:	op << varName << "[0]+"		<< varName << "[1]+"		<< varName << "[2]";									break;
>--		case TYPE_FLOAT_MAT4:	op << varName << "[0].xyz+"	<< varName << "[1].yzw+"	<< varName << "[2].zwx+"	<< varName << "[3].wxy";	break;
>--
>--		default:
>--			DE_ASSERT(DE_FALSE);
>--	}
>--
>--	return op.str();
>-+    std::ostringstream op;
>-+
>-+    switch (matType)
>-+    {
>-+        case TYPE_FLOAT:        op << varName << ", "       << varName << ", "          << varName << "";                                       break;
>-+        case TYPE_FLOAT_VEC2:   op << varName << ".x, "     << varName << ".y, "        << varName << ".x";                                     break;
>-+        case TYPE_FLOAT_VEC3:   op << varName << "";                                                                                            break;
>-+        case TYPE_FLOAT_VEC4:   op << varName << ".x, "     << varName << ".y, "        << varName << ".z+"         << varName << ".w";         break;
>-+        case TYPE_FLOAT_MAT2:   op << varName << "[0][0], " << varName << "[1][0], "    << varName << "[0][1]+"     << varName << "[1][1]";     break;
>-+        case TYPE_FLOAT_MAT3:   op << varName << "[0]+"     << varName << "[1]+"        << varName << "[2]";                                    break;
>-+        case TYPE_FLOAT_MAT4:   op << varName << "[0].xyz+" << varName << "[1].yzw+"    << varName << "[2].zwx+"    << varName << "[3].wxy";    break;
>-+
>-+        default:
>-+            DE_ASSERT(DE_FALSE);
>-+    }
>-+
>-+    return op.str();
>- }
>- 
>- void ShaderMatrixCase::setupUniforms (int programID, const tcu::Vec4& constCoords)
>- {
>--	const glw::Functions& gl = m_renderCtx.getFunctions();
>--
>--	DE_UNREF(constCoords);
>--
>--	for (int inNdx = 0; inNdx < 2; inNdx++)
>--	{
>--		const ShaderInput& in = inNdx > 0 ? m_in1 : m_in0;
>--
>--		if (in.inputType == INPUTTYPE_UNIFORM)
>--		{
>--			int loc = gl.getUniformLocation(programID, (string("u_in") + de::toString(inNdx)).c_str());
>--
>--			if (loc < 0)
>--				continue;
>--
>--			switch (in.dataType)
>--			{
>--				case TYPE_FLOAT:		gl.uniform1f(loc, s_constInFloat[inNdx]);													break;
>--				case TYPE_FLOAT_VEC2:	gl.uniform2fv(loc, 1, s_constInVec2[inNdx].getPtr());										break;
>--				case TYPE_FLOAT_VEC3:	gl.uniform3fv(loc, 1, s_constInVec3[inNdx].getPtr());										break;
>--				case TYPE_FLOAT_VEC4:	gl.uniform4fv(loc, 1, s_constInVec4[inNdx].getPtr());										break;
>--				case TYPE_FLOAT_MAT2:	gl.uniformMatrix2fv(loc, 1, GL_FALSE, s_constInMat2[inNdx].getColumnMajorData().getPtr());	break;
>--				case TYPE_FLOAT_MAT3:	gl.uniformMatrix3fv(loc, 1, GL_FALSE, s_constInMat3[inNdx].getColumnMajorData().getPtr());	break;
>--				case TYPE_FLOAT_MAT4:	gl.uniformMatrix4fv(loc, 1, GL_FALSE, s_constInMat4[inNdx].getColumnMajorData().getPtr());	break;
>--				default:
>--					DE_ASSERT(false);
>--			}
>--		}
>--	}
>-+    const glw::Functions& gl = m_renderCtx.getFunctions();
>-+
>-+    DE_UNREF(constCoords);
>-+
>-+    for (int inNdx = 0; inNdx < 2; inNdx++)
>-+    {
>-+        const ShaderInput& in = inNdx > 0 ? m_in1 : m_in0;
>-+
>-+        if (in.inputType == INPUTTYPE_UNIFORM)
>-+        {
>-+            int loc = gl.getUniformLocation(programID, (string("u_in") + de::toString(inNdx)).c_str());
>-+
>-+            if (loc < 0)
>-+                continue;
>-+
>-+            switch (in.dataType)
>-+            {
>-+                case TYPE_FLOAT:        gl.uniform1f(loc, s_constInFloat[inNdx]);                                                   break;
>-+                case TYPE_FLOAT_VEC2:   gl.uniform2fv(loc, 1, s_constInVec2[inNdx].getPtr());                                       break;
>-+                case TYPE_FLOAT_VEC3:   gl.uniform3fv(loc, 1, s_constInVec3[inNdx].getPtr());                                       break;
>-+                case TYPE_FLOAT_VEC4:   gl.uniform4fv(loc, 1, s_constInVec4[inNdx].getPtr());                                       break;
>-+                case TYPE_FLOAT_MAT2:   gl.uniformMatrix2fv(loc, 1, GL_FALSE, s_constInMat2[inNdx].getColumnMajorData().getPtr());  break;
>-+                case TYPE_FLOAT_MAT3:   gl.uniformMatrix3fv(loc, 1, GL_FALSE, s_constInMat3[inNdx].getColumnMajorData().getPtr());  break;
>-+                case TYPE_FLOAT_MAT4:   gl.uniformMatrix4fv(loc, 1, GL_FALSE, s_constInMat4[inNdx].getColumnMajorData().getPtr());  break;
>-+                default:
>-+                    DE_ASSERT(false);
>-+            }
>-+        }
>-+    }
>- }
>- 
>- ShaderMatrixTests::ShaderMatrixTests (Context& context)
>--	: TestCaseGroup(context, "matrix", "Matrix Tests")
>-+    : TestCaseGroup(context, "matrix", "Matrix Tests")
>- {
>- }
>- 
>-@@ -1086,136 +1086,136 @@ ShaderMatrixTests::~ShaderMatrixTests (void)
>- 
>- void ShaderMatrixTests::init (void)
>- {
>--	static const struct
>--	{
>--		const char*		name;
>--		const char*		desc;
>--		MatrixOp		op;
>--		bool			extendedInputTypeCases; // !< test with const and uniform types too
>--	} ops[] =
>--	{
>--		{ "add",			"Matrix addition tests",						OP_ADD,				true	},
>--		{ "sub",			"Matrix subtraction tests",						OP_SUB,				true	},
>--		{ "mul",			"Matrix multiplication tests",					OP_MUL,				true	},
>--		{ "div",			"Matrix division tests",						OP_DIV,				true	},
>--		{ "matrixcompmult",	"Matrix component-wise multiplication tests",	OP_COMP_MUL,		false	},
>--		{ "unary_addition",	"Matrix unary addition tests",					OP_UNARY_PLUS,		false	},
>--		{ "negation",		"Matrix negation tests",						OP_NEGATION,		false	},
>--		{ "pre_increment",	"Matrix prefix increment tests",				OP_PRE_INCREMENT,	false	},
>--		{ "pre_decrement",	"Matrix prefix decrement tests",				OP_PRE_DECREMENT,	false	},
>--		{ "post_increment",	"Matrix postfix increment tests",				OP_POST_INCREMENT,	false	},
>--		{ "post_decrement",	"Matrix postfix decrement tests",				OP_POST_DECREMENT,	false	},
>--		{ "add_assign",		"Matrix add into tests",						OP_ADD_INTO,		false	},
>--		{ "sub_assign",		"Matrix subtract from tests",					OP_SUBTRACT_FROM,	false	},
>--		{ "mul_assign",		"Matrix multiply into tests",					OP_MULTIPLY_INTO,	false	},
>--		{ "div_assign",		"Matrix divide into tests",						OP_DIVIDE_INTO,		false	},
>--	};
>--
>--	struct InputTypeSpec
>--	{
>--		const char*		name;
>--		const char*		desc;
>--		InputType		type;
>--	};
>--	static const InputTypeSpec extendedInputTypes[] =
>--	{
>--		{ "const",		"Constant matrix input",	INPUTTYPE_CONST		},
>--		{ "uniform",	"Uniform matrix input",		INPUTTYPE_UNIFORM	},
>--		{ "dynamic",	"Dynamic matrix input",		INPUTTYPE_DYNAMIC	}
>--	};
>--	static const InputTypeSpec reducedInputTypes[] =
>--	{
>--		{ "dynamic",	"Dynamic matrix input",		INPUTTYPE_DYNAMIC	}
>--	};
>--
>--	static const DataType matrixTypes[] =
>--	{
>--		TYPE_FLOAT_MAT2,
>--		TYPE_FLOAT_MAT3,
>--		TYPE_FLOAT_MAT4
>--	};
>--
>--	static const Precision precisions[] =
>--	{
>--		PRECISION_LOWP,
>--		PRECISION_MEDIUMP,
>--		PRECISION_HIGHP
>--	};
>--
>--	for (int opNdx = 0; opNdx < DE_LENGTH_OF_ARRAY(ops); opNdx++)
>--	{
>--		const InputTypeSpec*	inTypeList		= (ops[opNdx].extendedInputTypeCases) ? (extendedInputTypes) : (reducedInputTypes);
>--		const int				inTypeListSize	= (ops[opNdx].extendedInputTypeCases) ? (DE_LENGTH_OF_ARRAY(extendedInputTypes)) : (DE_LENGTH_OF_ARRAY(reducedInputTypes));
>--		const MatrixOp			op				= ops[opNdx].op;
>--		tcu::TestCaseGroup*		opGroup			= new tcu::TestCaseGroup(m_testCtx, ops[opNdx].name, ops[opNdx].desc);
>--
>--		addChild(opGroup);
>--
>--		for (int inTypeNdx = 0; inTypeNdx < inTypeListSize; inTypeNdx++)
>--		{
>--			const InputType		inputType	= inTypeList[inTypeNdx].type;
>--
>--			for (int matTypeNdx = 0; matTypeNdx < DE_LENGTH_OF_ARRAY(matrixTypes); matTypeNdx++)
>--			{
>--				DataType	matType		= matrixTypes[matTypeNdx];
>--				const char*	matTypeName	= getDataTypeName(matType);
>--
>--				for (int precNdx = 0; precNdx < DE_LENGTH_OF_ARRAY(precisions); precNdx++)
>--				{
>--					Precision	precision	= precisions[precNdx];
>--					const char*	precName	= getPrecisionName(precision);
>--					string		baseName	= string(inTypeList[inTypeNdx].name) + "_" + precName + "_" + matTypeName + "_";
>--					ShaderInput	matIn		(inputType, matType, precision);
>--
>--					if (isOperationMatrixScalar(op))
>--					{
>--						// Matrix-scalar \note For div cases we use uniform input.
>--						ShaderInput scalarIn(op == OP_DIV ? INPUTTYPE_UNIFORM : INPUTTYPE_DYNAMIC, TYPE_FLOAT, precision);
>--						opGroup->addChild(new ShaderMatrixCase(m_context, (baseName + "float_vertex").c_str(),		"Matrix-scalar case", matIn, scalarIn, op, true));
>--						opGroup->addChild(new ShaderMatrixCase(m_context, (baseName + "float_fragment").c_str(),	"Matrix-scalar case", matIn, scalarIn, op, false));
>--					}
>--
>--					if (isOperationMatrixVector(op))
>--					{
>--						// Matrix-vector.
>--						DataType	vecType	= getDataTypeFloatVec(getDataTypeMatrixNumColumns(matType));
>--						ShaderInput vecIn	(op == OP_DIV ? INPUTTYPE_UNIFORM : INPUTTYPE_DYNAMIC, vecType, precision);
>--
>--						opGroup->addChild(new ShaderMatrixCase(m_context, (baseName + getDataTypeName(vecType) + "_vertex").c_str(),	"Matrix-vector case", matIn, vecIn, op, true));
>--						opGroup->addChild(new ShaderMatrixCase(m_context, (baseName + getDataTypeName(vecType) + "_fragment").c_str(),	"Matrix-vector case", matIn, vecIn, op, false));
>--
>--						// Vector-matrix.
>--						string vecMatName = string(inTypeList[inTypeNdx].name) + "_" + precName + "_" + getDataTypeName(vecType) + "_" + matTypeName;
>--						opGroup->addChild(new ShaderMatrixCase(m_context, (vecMatName + "_vertex").c_str(),		"Vector-matrix case", vecIn, matIn, op, true));
>--						opGroup->addChild(new ShaderMatrixCase(m_context, (vecMatName + "_fragment").c_str(),	"Vector-matrix case", vecIn, matIn, op, false));
>--					}
>--
>--					if (isOperationMatrixMatrix(op))
>--					{
>--						// Matrix-matrix.
>--						ShaderInput otherMatIn(inputType == INPUTTYPE_DYNAMIC ? INPUTTYPE_UNIFORM : inputType, matType, precision);
>--						opGroup->addChild(new ShaderMatrixCase(m_context, (baseName + matTypeName + "_vertex").c_str(),		"Matrix-matrix case", matIn, otherMatIn, op, true));
>--						opGroup->addChild(new ShaderMatrixCase(m_context, (baseName + matTypeName + "_fragment").c_str(),	"Matrix-matrix case", matIn, otherMatIn, op, false));
>--					}
>--
>--					if (isOperationUnary(op))
>--					{
>--						// op matrix
>--						ShaderInput voidInput(INPUTTYPE_LAST, TYPE_LAST, PRECISION_LAST);
>--						opGroup->addChild(new ShaderMatrixCase(m_context, (baseName + "vertex").c_str(),		"Matrix case", matIn, voidInput, op, true));
>--						opGroup->addChild(new ShaderMatrixCase(m_context, (baseName + "fragment").c_str(),	"Matrix case", matIn, voidInput, op, false));
>--					}
>--
>--					if (isOperationAssignment(op))
>--					{
>--						ShaderInput otherMatIn(inputType == INPUTTYPE_DYNAMIC ? INPUTTYPE_UNIFORM : inputType, matType, precision);
>--						opGroup->addChild(new ShaderMatrixCase(m_context, (baseName + "vertex").c_str(),		"Matrix assignment case", matIn, otherMatIn, op, true));
>--						opGroup->addChild(new ShaderMatrixCase(m_context, (baseName + "fragment").c_str(),	"Matrix assignment case", matIn, otherMatIn, op, false));
>--					}
>--				}
>--			}
>--		}
>--	}
>-+    static const struct
>-+    {
>-+        const char*     name;
>-+        const char*     desc;
>-+        MatrixOp        op;
>-+        bool            extendedInputTypeCases; // !< test with const and uniform types too
>-+    } ops[] =
>-+    {
>-+        { "add",            "Matrix addition tests",                        OP_ADD,             true    },
>-+        { "sub",            "Matrix subtraction tests",                     OP_SUB,             true    },
>-+        { "mul",            "Matrix multiplication tests",                  OP_MUL,             true    },
>-+        { "div",            "Matrix division tests",                        OP_DIV,             true    },
>-+        { "matrixcompmult", "Matrix component-wise multiplication tests",   OP_COMP_MUL,        false   },
>-+        { "unary_addition", "Matrix unary addition tests",                  OP_UNARY_PLUS,      false   },
>-+        { "negation",       "Matrix negation tests",                        OP_NEGATION,        false   },
>-+        { "pre_increment",  "Matrix prefix increment tests",                OP_PRE_INCREMENT,   false   },
>-+        { "pre_decrement",  "Matrix prefix decrement tests",                OP_PRE_DECREMENT,   false   },
>-+        { "post_increment", "Matrix postfix increment tests",               OP_POST_INCREMENT,  false   },
>-+        { "post_decrement", "Matrix postfix decrement tests",               OP_POST_DECREMENT,  false   },
>-+        { "add_assign",     "Matrix add into tests",                        OP_ADD_INTO,        false   },
>-+        { "sub_assign",     "Matrix subtract from tests",                   OP_SUBTRACT_FROM,   false   },
>-+        { "mul_assign",     "Matrix multiply into tests",                   OP_MULTIPLY_INTO,   false   },
>-+        { "div_assign",     "Matrix divide into tests",                     OP_DIVIDE_INTO,     false   },
>-+    };
>-+
>-+    struct InputTypeSpec
>-+    {
>-+        const char*     name;
>-+        const char*     desc;
>-+        InputType       type;
>-+    };
>-+    static const InputTypeSpec extendedInputTypes[] =
>-+    {
>-+        { "const",      "Constant matrix input",    INPUTTYPE_CONST     },
>-+        { "uniform",    "Uniform matrix input",     INPUTTYPE_UNIFORM   },
>-+        { "dynamic",    "Dynamic matrix input",     INPUTTYPE_DYNAMIC   }
>-+    };
>-+    static const InputTypeSpec reducedInputTypes[] =
>-+    {
>-+        { "dynamic",    "Dynamic matrix input",     INPUTTYPE_DYNAMIC   }
>-+    };
>-+
>-+    static const DataType matrixTypes[] =
>-+    {
>-+        TYPE_FLOAT_MAT2,
>-+        TYPE_FLOAT_MAT3,
>-+        TYPE_FLOAT_MAT4
>-+    };
>-+
>-+    static const Precision precisions[] =
>-+    {
>-+        PRECISION_LOWP,
>-+        PRECISION_MEDIUMP,
>-+        PRECISION_HIGHP
>-+    };
>-+
>-+    for (int opNdx = 0; opNdx < DE_LENGTH_OF_ARRAY(ops); opNdx++)
>-+    {
>-+        const InputTypeSpec*    inTypeList      = (ops[opNdx].extendedInputTypeCases) ? (extendedInputTypes) : (reducedInputTypes);
>-+        const int               inTypeListSize  = (ops[opNdx].extendedInputTypeCases) ? (DE_LENGTH_OF_ARRAY(extendedInputTypes)) : (DE_LENGTH_OF_ARRAY(reducedInputTypes));
>-+        const MatrixOp          op              = ops[opNdx].op;
>-+        tcu::TestCaseGroup*     opGroup         = new tcu::TestCaseGroup(m_testCtx, ops[opNdx].name, ops[opNdx].desc);
>-+
>-+        addChild(opGroup);
>-+
>-+        for (int inTypeNdx = 0; inTypeNdx < inTypeListSize; inTypeNdx++)
>-+        {
>-+            const InputType     inputType   = inTypeList[inTypeNdx].type;
>-+
>-+            for (int matTypeNdx = 0; matTypeNdx < DE_LENGTH_OF_ARRAY(matrixTypes); matTypeNdx++)
>-+            {
>-+                DataType    matType     = matrixTypes[matTypeNdx];
>-+                const char* matTypeName = getDataTypeName(matType);
>-+
>-+                for (int precNdx = 0; precNdx < DE_LENGTH_OF_ARRAY(precisions); precNdx++)
>-+                {
>-+                    Precision   precision   = precisions[precNdx];
>-+                    const char* precName    = getPrecisionName(precision);
>-+                    string      baseName    = string(inTypeList[inTypeNdx].name) + "_" + precName + "_" + matTypeName + "_";
>-+                    ShaderInput matIn       (inputType, matType, precision);
>-+
>-+                    if (isOperationMatrixScalar(op))
>-+                    {
>-+                        // Matrix-scalar \note For div cases we use uniform input.
>-+                        ShaderInput scalarIn(op == OP_DIV ? INPUTTYPE_UNIFORM : INPUTTYPE_DYNAMIC, TYPE_FLOAT, precision);
>-+                        opGroup->addChild(new ShaderMatrixCase(m_context, (baseName + "float_vertex").c_str(),      "Matrix-scalar case", matIn, scalarIn, op, true));
>-+                        opGroup->addChild(new ShaderMatrixCase(m_context, (baseName + "float_fragment").c_str(),    "Matrix-scalar case", matIn, scalarIn, op, false));
>-+                    }
>-+
>-+                    if (isOperationMatrixVector(op))
>-+                    {
>-+                        // Matrix-vector.
>-+                        DataType    vecType = getDataTypeFloatVec(getDataTypeMatrixNumColumns(matType));
>-+                        ShaderInput vecIn   (op == OP_DIV ? INPUTTYPE_UNIFORM : INPUTTYPE_DYNAMIC, vecType, precision);
>-+
>-+                        opGroup->addChild(new ShaderMatrixCase(m_context, (baseName + getDataTypeName(vecType) + "_vertex").c_str(),    "Matrix-vector case", matIn, vecIn, op, true));
>-+                        opGroup->addChild(new ShaderMatrixCase(m_context, (baseName + getDataTypeName(vecType) + "_fragment").c_str(),  "Matrix-vector case", matIn, vecIn, op, false));
>-+
>-+                        // Vector-matrix.
>-+                        string vecMatName = string(inTypeList[inTypeNdx].name) + "_" + precName + "_" + getDataTypeName(vecType) + "_" + matTypeName;
>-+                        opGroup->addChild(new ShaderMatrixCase(m_context, (vecMatName + "_vertex").c_str(),     "Vector-matrix case", vecIn, matIn, op, true));
>-+                        opGroup->addChild(new ShaderMatrixCase(m_context, (vecMatName + "_fragment").c_str(),   "Vector-matrix case", vecIn, matIn, op, false));
>-+                    }
>-+
>-+                    if (isOperationMatrixMatrix(op))
>-+                    {
>-+                        // Matrix-matrix.
>-+                        ShaderInput otherMatIn(inputType == INPUTTYPE_DYNAMIC ? INPUTTYPE_UNIFORM : inputType, matType, precision);
>-+                        opGroup->addChild(new ShaderMatrixCase(m_context, (baseName + matTypeName + "_vertex").c_str(),     "Matrix-matrix case", matIn, otherMatIn, op, true));
>-+                        opGroup->addChild(new ShaderMatrixCase(m_context, (baseName + matTypeName + "_fragment").c_str(),   "Matrix-matrix case", matIn, otherMatIn, op, false));
>-+                    }
>-+
>-+                    if (isOperationUnary(op))
>-+                    {
>-+                        // op matrix
>-+                        ShaderInput voidInput(INPUTTYPE_LAST, TYPE_LAST, PRECISION_LAST);
>-+                        opGroup->addChild(new ShaderMatrixCase(m_context, (baseName + "vertex").c_str(),        "Matrix case", matIn, voidInput, op, true));
>-+                        opGroup->addChild(new ShaderMatrixCase(m_context, (baseName + "fragment").c_str(),  "Matrix case", matIn, voidInput, op, false));
>-+                    }
>-+
>-+                    if (isOperationAssignment(op))
>-+                    {
>-+                        ShaderInput otherMatIn(inputType == INPUTTYPE_DYNAMIC ? INPUTTYPE_UNIFORM : inputType, matType, precision);
>-+                        opGroup->addChild(new ShaderMatrixCase(m_context, (baseName + "vertex").c_str(),        "Matrix assignment case", matIn, otherMatIn, op, true));
>-+                        opGroup->addChild(new ShaderMatrixCase(m_context, (baseName + "fragment").c_str(),  "Matrix assignment case", matIn, otherMatIn, op, false));
>-+                    }
>-+                }
>-+            }
>-+        }
>-+    }
>- }
>- 
>- } // Functional
>-diff --git a/src/tests/deqp_support/es3fShaderMatrixTests.cpp b/src/tests/deqp_support/es3fShaderMatrixTests.cpp
>-index b18f8ba14..25784982c 100644
>---- a/src/tests/deqp_support/es3fShaderMatrixTests.cpp
>-+++ b/src/tests/deqp_support/es3fShaderMatrixTests.cpp
>-@@ -77,127 +77,127 @@ using tcu::Mat4;
>- // Uniform / constant values for tests.
>- // \note Input1 should not contain 0 components as it is used as divisor in div cases.
>- // \todo [2012-02-14 pyry] Make these dynamic.
>--static const float	s_constInFloat[2]	= { 0.5f, -0.2f };
>--static const Vec2	s_constInVec2[2]	= { Vec2(1.2f, 0.5f), Vec2(0.5f, 1.0f) };
>--static const Vec3	s_constInVec3[2]	= { Vec3(1.1f, 0.1f, 0.5f), Vec3(-0.2f, 0.5f, 0.8f) };
>--static const Vec4	s_constInVec4[2]	= { Vec4(1.4f, 0.2f, -0.5f, 0.7f), Vec4(0.2f, -1.0f, 0.5f, 0.8f) };
>-+static const float  s_constInFloat[2]   = { 0.5f, -0.2f };
>-+static const Vec2   s_constInVec2[2]    = { Vec2(1.2f, 0.5f), Vec2(0.5f, 1.0f) };
>-+static const Vec3   s_constInVec3[2]    = { Vec3(1.1f, 0.1f, 0.5f), Vec3(-0.2f, 0.5f, 0.8f) };
>-+static const Vec4   s_constInVec4[2]    = { Vec4(1.4f, 0.2f, -0.5f, 0.7f), Vec4(0.2f, -1.0f, 0.5f, 0.8f) };
>- 
>- static const float s_constInMat2x2[2][4] =
>- {
>--	{
>--		-0.1f,  1.0f,
>--		-0.2f,  0.0f,
>--	},
>--	{
>--		 0.8f,  0.1f,
>--		 0.5f, -0.9f,
>--	},
>-+    {
>-+        -0.1f,  1.0f,
>-+        -0.2f,  0.0f,
>-+    },
>-+    {
>-+         0.8f,  0.1f,
>-+         0.5f, -0.9f,
>-+    },
>- };
>- static const float s_constInMat3x2[2][6] =
>- {
>--	{
>--		 0.8f, -0.3f,  0.3f,
>--		 1.0f,  1.2f, -1.2f,
>--	},
>--	{
>--		 1.2f, -1.0f,  0.5f,
>--		-0.8f,  1.1f,  0.3f,
>--	},
>-+    {
>-+         0.8f, -0.3f,  0.3f,
>-+         1.0f,  1.2f, -1.2f,
>-+    },
>-+    {
>-+         1.2f, -1.0f,  0.5f,
>-+        -0.8f,  1.1f,  0.3f,
>-+    },
>- };
>- static const float s_constInMat4x2[2][8] =
>- {
>--	{
>--		-0.2f,  0.5f, 0.0f, -1.0f,
>--		 1.2f, -0.5f, 0.3f, -0.9f,
>--	},
>--	{
>--		1.0f,  0.1f, -1.1f,  0.6f,
>--		0.8f, -1.2f, -1.1f,  0.7f,
>--	},
>-+    {
>-+        -0.2f,  0.5f, 0.0f, -1.0f,
>-+         1.2f, -0.5f, 0.3f, -0.9f,
>-+    },
>-+    {
>-+        1.0f,  0.1f, -1.1f,  0.6f,
>-+        0.8f, -1.2f, -1.1f,  0.7f,
>-+    },
>- };
>- static const float s_constInMat2x3[2][6] =
>- {
>--	{
>--		-0.6f, -0.1f,
>--		-0.7f, -1.2f,
>--		-0.2f,  0.0f,
>--	},
>--	{
>--		 1.1f,  0.6f,
>--		 0.8f,  1.0f,
>--		 0.7f,  0.1f,
>--	},
>-+    {
>-+        -0.6f, -0.1f,
>-+        -0.7f, -1.2f,
>-+        -0.2f,  0.0f,
>-+    },
>-+    {
>-+         1.1f,  0.6f,
>-+         0.8f,  1.0f,
>-+         0.7f,  0.1f,
>-+    },
>- };
>- static const float s_constInMat3x3[2][9] =
>- {
>--	{
>--		-0.2f,  1.1f, 1.2f,
>--		-1.0f,  1.2f, 0.5f,
>--		 0.7f, -0.2f, 1.0f,
>--	},
>--	{
>--		-0.1f, -0.1f,  0.1f,
>--		-0.1f, -0.2f,  1.0f,
>--		-0.5f,  0.1f, -0.4f,
>--	},
>-+    {
>-+        -0.2f,  1.1f, 1.2f,
>-+        -1.0f,  1.2f, 0.5f,
>-+         0.7f, -0.2f, 1.0f,
>-+    },
>-+    {
>-+        -0.1f, -0.1f,  0.1f,
>-+        -0.1f, -0.2f,  1.0f,
>-+        -0.5f,  0.1f, -0.4f,
>-+    },
>- };
>- static const float s_constInMat4x3[2][12] =
>- {
>--	{
>--		-0.9f,  0.0f,  0.6f,  0.2f,
>--		 0.9f, -0.1f, -0.3f, -0.7f,
>--		-0.1f,  0.1f,  1.0f,  0.0f,
>--	},
>--	{
>--		 0.5f,  0.7f,  0.7f,  1.2f,
>--		 1.1f,  0.1f,  1.0f, -1.0f,
>--		-0.2f, -0.2f, -0.3f, -0.5f,
>--	},
>-+    {
>-+        -0.9f,  0.0f,  0.6f,  0.2f,
>-+         0.9f, -0.1f, -0.3f, -0.7f,
>-+        -0.1f,  0.1f,  1.0f,  0.0f,
>-+    },
>-+    {
>-+         0.5f,  0.7f,  0.7f,  1.2f,
>-+         1.1f,  0.1f,  1.0f, -1.0f,
>-+        -0.2f, -0.2f, -0.3f, -0.5f,
>-+    },
>- };
>- static const float s_constInMat2x4[2][8] =
>- {
>--	{
>--		-0.6f, -1.1f,
>--		-0.6f, -0.6f,
>--		-0.2f, -0.6f,
>--		-0.1f, -0.1f,
>--	},
>--	{
>--		-1.2f, -1.0f,
>--		 0.7f, -1.0f,
>--		 0.7f,  0.7f,
>--		-0.4f, -0.3f,
>--	},
>-+    {
>-+        -0.6f, -1.1f,
>-+        -0.6f, -0.6f,
>-+        -0.2f, -0.6f,
>-+        -0.1f, -0.1f,
>-+    },
>-+    {
>-+        -1.2f, -1.0f,
>-+         0.7f, -1.0f,
>-+         0.7f,  0.7f,
>-+        -0.4f, -0.3f,
>-+    },
>- };
>- static const float s_constInMat3x4[2][12] =
>- {
>--	{
>--		 0.6f, -0.4f,  1.2f,
>--		 0.9f,  0.8f,  0.4f,
>--		 1.1f,  0.3f,  0.5f,
>--		-0.2f,  0.0f,  1.1f,
>--	},
>--	{
>--		-0.8f,  1.2f, -0.2f,
>--		-1.1f, -0.9f, -0.5f,
>--		-1.2f,  1.0f,  1.2f,
>--		 0.1f, -0.7f, -0.5f,
>--	},
>-+    {
>-+         0.6f, -0.4f,  1.2f,
>-+         0.9f,  0.8f,  0.4f,
>-+         1.1f,  0.3f,  0.5f,
>-+        -0.2f,  0.0f,  1.1f,
>-+    },
>-+    {
>-+        -0.8f,  1.2f, -0.2f,
>-+        -1.1f, -0.9f, -0.5f,
>-+        -1.2f,  1.0f,  1.2f,
>-+         0.1f, -0.7f, -0.5f,
>-+    },
>- };
>- static const float s_constInMat4x4[2][16] =
>- {
>--	{
>--		 0.3f,  0.9f, -0.2f,  1.0f,
>--		-0.4f, -0.6f,  0.6f, -1.0f,
>--		-0.9f, -0.1f,  0.3f, -0.2f,
>--		-0.3f, -0.9f,  1.0f,  0.1f,
>--	},
>--	{
>--		 0.4f, -0.7f, -0.8f,  0.7f,
>--		-0.4f, -0.8f,  0.6f, -0.3f,
>--		 0.7f, -1.0f,  0.1f, -0.3f,
>--		 0.2f,  0.6f,  0.4f, -1.0f,
>--	},
>-+    {
>-+         0.3f,  0.9f, -0.2f,  1.0f,
>-+        -0.4f, -0.6f,  0.6f, -1.0f,
>-+        -0.9f, -0.1f,  0.3f, -0.2f,
>-+        -0.3f, -0.9f,  1.0f,  0.1f,
>-+    },
>-+    {
>-+         0.4f, -0.7f, -0.8f,  0.7f,
>-+        -0.4f, -0.8f,  0.6f, -0.3f,
>-+         0.7f, -1.0f,  0.1f, -0.3f,
>-+         0.2f,  0.6f,  0.4f, -1.0f,
>-+    },
>- };
>- 
>- namespace MatrixCaseUtils
>-@@ -205,49 +205,49 @@ namespace MatrixCaseUtils
>- 
>- enum InputType
>- {
>--	INPUTTYPE_CONST = 0,
>--	INPUTTYPE_UNIFORM,
>--	INPUTTYPE_DYNAMIC,
>-+    INPUTTYPE_CONST = 0,
>-+    INPUTTYPE_UNIFORM,
>-+    INPUTTYPE_DYNAMIC,
>- 
>--	INPUTTYPE_LAST
>-+    INPUTTYPE_LAST
>- };
>- 
>- struct ShaderInput
>- {
>--	ShaderInput (InputType inputType_, DataType dataType_, Precision precision_)
>--		: inputType	(inputType_)
>--		, dataType	(dataType_)
>--		, precision	(precision_)
>--	{
>--	}
>-+    ShaderInput (InputType inputType_, DataType dataType_, Precision precision_)
>-+        : inputType (inputType_)
>-+        , dataType  (dataType_)
>-+        , precision (precision_)
>-+    {
>-+    }
>- 
>--	InputType		inputType;
>--	DataType		dataType;
>--	Precision		precision;
>-+    InputType       inputType;
>-+    DataType        dataType;
>-+    Precision       precision;
>- };
>- 
>- enum MatrixOp
>- {
>--	OP_ADD = 0,
>--	OP_SUB,
>--	OP_MUL,
>--	OP_DIV,
>--	OP_COMP_MUL,
>--	OP_OUTER_PRODUCT,
>--	OP_TRANSPOSE,
>--	OP_INVERSE,
>--	OP_DETERMINANT,
>--	OP_UNARY_PLUS,
>--	OP_NEGATION,
>--	OP_PRE_INCREMENT,
>--	OP_PRE_DECREMENT,
>--	OP_POST_INCREMENT,
>--	OP_POST_DECREMENT,
>--	OP_ADD_INTO,
>--	OP_SUBTRACT_FROM,
>--	OP_MULTIPLY_INTO,
>--	OP_DIVIDE_INTO,
>--	OP_LAST
>-+    OP_ADD = 0,
>-+    OP_SUB,
>-+    OP_MUL,
>-+    OP_DIV,
>-+    OP_COMP_MUL,
>-+    OP_OUTER_PRODUCT,
>-+    OP_TRANSPOSE,
>-+    OP_INVERSE,
>-+    OP_DETERMINANT,
>-+    OP_UNARY_PLUS,
>-+    OP_NEGATION,
>-+    OP_PRE_INCREMENT,
>-+    OP_PRE_DECREMENT,
>-+    OP_POST_INCREMENT,
>-+    OP_POST_DECREMENT,
>-+    OP_ADD_INTO,
>-+    OP_SUBTRACT_FROM,
>-+    OP_MULTIPLY_INTO,
>-+    OP_DIVIDE_INTO,
>-+    OP_LAST
>- };
>- 
>- // Type traits.
>-@@ -255,237 +255,237 @@ enum MatrixOp
>- template <int DataT>
>- struct TypeTraits;
>- 
>--#define DECLARE_TYPE_TRAIT(DATATYPE, TYPE)	\
>--template<>									\
>--struct TypeTraits<DATATYPE> {				\
>--	typedef TYPE Type;						\
>-+#define DECLARE_TYPE_TRAIT(DATATYPE, TYPE)  \
>-+template<>                                  \
>-+struct TypeTraits<DATATYPE> {               \
>-+    typedef TYPE Type;                      \
>- }
>- 
>--DECLARE_TYPE_TRAIT(TYPE_FLOAT,			float);
>--DECLARE_TYPE_TRAIT(TYPE_FLOAT_VEC2,		tcu::Vec2);
>--DECLARE_TYPE_TRAIT(TYPE_FLOAT_VEC3,		tcu::Vec3);
>--DECLARE_TYPE_TRAIT(TYPE_FLOAT_VEC4,		tcu::Vec4);
>--DECLARE_TYPE_TRAIT(TYPE_FLOAT_MAT2,		tcu::Mat2);
>--DECLARE_TYPE_TRAIT(TYPE_FLOAT_MAT2X3,	tcu::Mat2x3);
>--DECLARE_TYPE_TRAIT(TYPE_FLOAT_MAT2X4,	tcu::Mat2x4);
>--DECLARE_TYPE_TRAIT(TYPE_FLOAT_MAT3X2,	tcu::Mat3x2);
>--DECLARE_TYPE_TRAIT(TYPE_FLOAT_MAT3,		tcu::Mat3);
>--DECLARE_TYPE_TRAIT(TYPE_FLOAT_MAT3X4,	tcu::Mat3x4);
>--DECLARE_TYPE_TRAIT(TYPE_FLOAT_MAT4X2,	tcu::Mat4x2);
>--DECLARE_TYPE_TRAIT(TYPE_FLOAT_MAT4X3,	tcu::Mat4x3);
>--DECLARE_TYPE_TRAIT(TYPE_FLOAT_MAT4,		tcu::Mat4);
>-+DECLARE_TYPE_TRAIT(TYPE_FLOAT,          float);
>-+DECLARE_TYPE_TRAIT(TYPE_FLOAT_VEC2,     tcu::Vec2);
>-+DECLARE_TYPE_TRAIT(TYPE_FLOAT_VEC3,     tcu::Vec3);
>-+DECLARE_TYPE_TRAIT(TYPE_FLOAT_VEC4,     tcu::Vec4);
>-+DECLARE_TYPE_TRAIT(TYPE_FLOAT_MAT2,     tcu::Mat2);
>-+DECLARE_TYPE_TRAIT(TYPE_FLOAT_MAT2X3,   tcu::Mat2x3);
>-+DECLARE_TYPE_TRAIT(TYPE_FLOAT_MAT2X4,   tcu::Mat2x4);
>-+DECLARE_TYPE_TRAIT(TYPE_FLOAT_MAT3X2,   tcu::Mat3x2);
>-+DECLARE_TYPE_TRAIT(TYPE_FLOAT_MAT3,     tcu::Mat3);
>-+DECLARE_TYPE_TRAIT(TYPE_FLOAT_MAT3X4,   tcu::Mat3x4);
>-+DECLARE_TYPE_TRAIT(TYPE_FLOAT_MAT4X2,   tcu::Mat4x2);
>-+DECLARE_TYPE_TRAIT(TYPE_FLOAT_MAT4X3,   tcu::Mat4x3);
>-+DECLARE_TYPE_TRAIT(TYPE_FLOAT_MAT4,     tcu::Mat4);
>- 
>- // Operation info
>- 
>- enum OperationType
>- {
>--	OPERATIONTYPE_BINARY_OPERATOR = 0,
>--	OPERATIONTYPE_BINARY_FUNCTION,
>--	OPERATIONTYPE_UNARY_PREFIX_OPERATOR,
>--	OPERATIONTYPE_UNARY_POSTFIX_OPERATOR,
>--	OPERATIONTYPE_UNARY_FUNCTION,
>--	OPERATIONTYPE_ASSIGNMENT,
>-+    OPERATIONTYPE_BINARY_OPERATOR = 0,
>-+    OPERATIONTYPE_BINARY_FUNCTION,
>-+    OPERATIONTYPE_UNARY_PREFIX_OPERATOR,
>-+    OPERATIONTYPE_UNARY_POSTFIX_OPERATOR,
>-+    OPERATIONTYPE_UNARY_FUNCTION,
>-+    OPERATIONTYPE_ASSIGNMENT,
>- 
>--	OPERATIONTYPE_LAST
>-+    OPERATIONTYPE_LAST
>- };
>- 
>- static const char* getOperationName (MatrixOp op)
>- {
>--	switch (op)
>--	{
>--		case OP_ADD:			return "+";
>--		case OP_SUB:			return "-";
>--		case OP_MUL:			return "*";
>--		case OP_DIV:			return "/";
>--		case OP_COMP_MUL:		return "matrixCompMult";
>--		case OP_OUTER_PRODUCT:	return "outerProduct";
>--		case OP_TRANSPOSE:		return "transpose";
>--		case OP_INVERSE:		return "inverse";
>--		case OP_DETERMINANT:	return "determinant";
>--		case OP_UNARY_PLUS:		return "+";
>--		case OP_NEGATION:		return "-";
>--		case OP_PRE_INCREMENT:	return "++";
>--		case OP_PRE_DECREMENT:	return "--";
>--		case OP_POST_INCREMENT:	return "++";
>--		case OP_POST_DECREMENT:	return "--";
>--		case OP_ADD_INTO:		return "+=";
>--		case OP_SUBTRACT_FROM:	return "-=";
>--		case OP_MULTIPLY_INTO:	return "*=";
>--		case OP_DIVIDE_INTO:	return "/=";
>--
>--		default:
>--			DE_ASSERT(DE_FALSE);
>--			return "";
>--	}
>-+    switch (op)
>-+    {
>-+        case OP_ADD:            return "+";
>-+        case OP_SUB:            return "-";
>-+        case OP_MUL:            return "*";
>-+        case OP_DIV:            return "/";
>-+        case OP_COMP_MUL:       return "matrixCompMult";
>-+        case OP_OUTER_PRODUCT:  return "outerProduct";
>-+        case OP_TRANSPOSE:      return "transpose";
>-+        case OP_INVERSE:        return "inverse";
>-+        case OP_DETERMINANT:    return "determinant";
>-+        case OP_UNARY_PLUS:     return "+";
>-+        case OP_NEGATION:       return "-";
>-+        case OP_PRE_INCREMENT:  return "++";
>-+        case OP_PRE_DECREMENT:  return "--";
>-+        case OP_POST_INCREMENT: return "++";
>-+        case OP_POST_DECREMENT: return "--";
>-+        case OP_ADD_INTO:       return "+=";
>-+        case OP_SUBTRACT_FROM:  return "-=";
>-+        case OP_MULTIPLY_INTO:  return "*=";
>-+        case OP_DIVIDE_INTO:    return "/=";
>-+
>-+        default:
>-+            DE_ASSERT(DE_FALSE);
>-+            return "";
>-+    }
>- }
>- 
>- static OperationType getOperationType (MatrixOp op)
>- {
>--	switch (op)
>--	{
>--		case OP_ADD:			return OPERATIONTYPE_BINARY_OPERATOR;
>--		case OP_SUB:			return OPERATIONTYPE_BINARY_OPERATOR;
>--		case OP_MUL:			return OPERATIONTYPE_BINARY_OPERATOR;
>--		case OP_DIV:			return OPERATIONTYPE_BINARY_OPERATOR;
>--		case OP_COMP_MUL:		return OPERATIONTYPE_BINARY_FUNCTION;
>--		case OP_OUTER_PRODUCT:	return OPERATIONTYPE_BINARY_FUNCTION;
>--		case OP_TRANSPOSE:		return OPERATIONTYPE_UNARY_FUNCTION;
>--		case OP_INVERSE:		return OPERATIONTYPE_UNARY_FUNCTION;
>--		case OP_DETERMINANT:	return OPERATIONTYPE_UNARY_FUNCTION;
>--		case OP_UNARY_PLUS:		return OPERATIONTYPE_UNARY_PREFIX_OPERATOR;
>--		case OP_NEGATION:		return OPERATIONTYPE_UNARY_PREFIX_OPERATOR;
>--		case OP_PRE_INCREMENT:	return OPERATIONTYPE_UNARY_PREFIX_OPERATOR;
>--		case OP_PRE_DECREMENT:	return OPERATIONTYPE_UNARY_PREFIX_OPERATOR;
>--		case OP_POST_INCREMENT:	return OPERATIONTYPE_UNARY_POSTFIX_OPERATOR;
>--		case OP_POST_DECREMENT:	return OPERATIONTYPE_UNARY_POSTFIX_OPERATOR;
>--		case OP_ADD_INTO:		return OPERATIONTYPE_ASSIGNMENT;
>--		case OP_SUBTRACT_FROM:	return OPERATIONTYPE_ASSIGNMENT;
>--		case OP_MULTIPLY_INTO:	return OPERATIONTYPE_ASSIGNMENT;
>--		case OP_DIVIDE_INTO:	return OPERATIONTYPE_ASSIGNMENT;
>--		default:
>--			DE_ASSERT(DE_FALSE);
>--			return OPERATIONTYPE_LAST;
>--	}
>-+    switch (op)
>-+    {
>-+        case OP_ADD:            return OPERATIONTYPE_BINARY_OPERATOR;
>-+        case OP_SUB:            return OPERATIONTYPE_BINARY_OPERATOR;
>-+        case OP_MUL:            return OPERATIONTYPE_BINARY_OPERATOR;
>-+        case OP_DIV:            return OPERATIONTYPE_BINARY_OPERATOR;
>-+        case OP_COMP_MUL:       return OPERATIONTYPE_BINARY_FUNCTION;
>-+        case OP_OUTER_PRODUCT:  return OPERATIONTYPE_BINARY_FUNCTION;
>-+        case OP_TRANSPOSE:      return OPERATIONTYPE_UNARY_FUNCTION;
>-+        case OP_INVERSE:        return OPERATIONTYPE_UNARY_FUNCTION;
>-+        case OP_DETERMINANT:    return OPERATIONTYPE_UNARY_FUNCTION;
>-+        case OP_UNARY_PLUS:     return OPERATIONTYPE_UNARY_PREFIX_OPERATOR;
>-+        case OP_NEGATION:       return OPERATIONTYPE_UNARY_PREFIX_OPERATOR;
>-+        case OP_PRE_INCREMENT:  return OPERATIONTYPE_UNARY_PREFIX_OPERATOR;
>-+        case OP_PRE_DECREMENT:  return OPERATIONTYPE_UNARY_PREFIX_OPERATOR;
>-+        case OP_POST_INCREMENT: return OPERATIONTYPE_UNARY_POSTFIX_OPERATOR;
>-+        case OP_POST_DECREMENT: return OPERATIONTYPE_UNARY_POSTFIX_OPERATOR;
>-+        case OP_ADD_INTO:       return OPERATIONTYPE_ASSIGNMENT;
>-+        case OP_SUBTRACT_FROM:  return OPERATIONTYPE_ASSIGNMENT;
>-+        case OP_MULTIPLY_INTO:  return OPERATIONTYPE_ASSIGNMENT;
>-+        case OP_DIVIDE_INTO:    return OPERATIONTYPE_ASSIGNMENT;
>-+        default:
>-+            DE_ASSERT(DE_FALSE);
>-+            return OPERATIONTYPE_LAST;
>-+    }
>- }
>- 
>- enum TestMatrixType
>- {
>--	TESTMATRIXTYPE_DEFAULT = 0,
>--	TESTMATRIXTYPE_NEGATED,
>--	TESTMATRIXTYPE_INCREMENTED,
>--	TESTMATRIXTYPE_DECREMENTED,
>--	TESTMATRIXTYPE_NEGATED_INCREMENTED,
>--	TESTMATRIXTYPE_INCREMENTED_LESS,
>-+    TESTMATRIXTYPE_DEFAULT = 0,
>-+    TESTMATRIXTYPE_NEGATED,
>-+    TESTMATRIXTYPE_INCREMENTED,
>-+    TESTMATRIXTYPE_DECREMENTED,
>-+    TESTMATRIXTYPE_NEGATED_INCREMENTED,
>-+    TESTMATRIXTYPE_INCREMENTED_LESS,
>- 
>--	TESTMATRIXTYPE_LAST
>-+    TESTMATRIXTYPE_LAST
>- };
>- 
>- static TestMatrixType getOperationTestMatrixType (MatrixOp op)
>- {
>--	switch(op)
>--	{
>--		case OP_ADD:			return TESTMATRIXTYPE_DEFAULT;
>--		case OP_SUB:			return TESTMATRIXTYPE_DEFAULT;
>--		case OP_MUL:			return TESTMATRIXTYPE_DEFAULT;
>--		case OP_DIV:			return TESTMATRIXTYPE_DEFAULT;
>--		case OP_COMP_MUL:		return TESTMATRIXTYPE_DEFAULT;
>--		case OP_OUTER_PRODUCT:	return TESTMATRIXTYPE_DEFAULT;
>--		case OP_TRANSPOSE:		return TESTMATRIXTYPE_DEFAULT;
>--		case OP_INVERSE:		return TESTMATRIXTYPE_DEFAULT;
>--		case OP_DETERMINANT:	return TESTMATRIXTYPE_DEFAULT;
>--		case OP_UNARY_PLUS:		return TESTMATRIXTYPE_DECREMENTED;
>--		case OP_NEGATION:		return TESTMATRIXTYPE_NEGATED_INCREMENTED;
>--		case OP_PRE_INCREMENT:	return TESTMATRIXTYPE_NEGATED;
>--		case OP_PRE_DECREMENT:	return TESTMATRIXTYPE_INCREMENTED;
>--		case OP_POST_INCREMENT:	return TESTMATRIXTYPE_NEGATED;
>--		case OP_POST_DECREMENT:	return TESTMATRIXTYPE_DEFAULT;
>--		case OP_ADD_INTO:		return TESTMATRIXTYPE_DEFAULT;
>--		case OP_SUBTRACT_FROM:	return TESTMATRIXTYPE_INCREMENTED_LESS;
>--		case OP_MULTIPLY_INTO:	return TESTMATRIXTYPE_NEGATED;
>--		case OP_DIVIDE_INTO:	return TESTMATRIXTYPE_DECREMENTED;
>--
>--		default:
>--			DE_ASSERT(DE_FALSE);
>--			return TESTMATRIXTYPE_LAST;
>--	}
>-+    switch(op)
>-+    {
>-+        case OP_ADD:            return TESTMATRIXTYPE_DEFAULT;
>-+        case OP_SUB:            return TESTMATRIXTYPE_DEFAULT;
>-+        case OP_MUL:            return TESTMATRIXTYPE_DEFAULT;
>-+        case OP_DIV:            return TESTMATRIXTYPE_DEFAULT;
>-+        case OP_COMP_MUL:       return TESTMATRIXTYPE_DEFAULT;
>-+        case OP_OUTER_PRODUCT:  return TESTMATRIXTYPE_DEFAULT;
>-+        case OP_TRANSPOSE:      return TESTMATRIXTYPE_DEFAULT;
>-+        case OP_INVERSE:        return TESTMATRIXTYPE_DEFAULT;
>-+        case OP_DETERMINANT:    return TESTMATRIXTYPE_DEFAULT;
>-+        case OP_UNARY_PLUS:     return TESTMATRIXTYPE_DECREMENTED;
>-+        case OP_NEGATION:       return TESTMATRIXTYPE_NEGATED_INCREMENTED;
>-+        case OP_PRE_INCREMENT:  return TESTMATRIXTYPE_NEGATED;
>-+        case OP_PRE_DECREMENT:  return TESTMATRIXTYPE_INCREMENTED;
>-+        case OP_POST_INCREMENT: return TESTMATRIXTYPE_NEGATED;
>-+        case OP_POST_DECREMENT: return TESTMATRIXTYPE_DEFAULT;
>-+        case OP_ADD_INTO:       return TESTMATRIXTYPE_DEFAULT;
>-+        case OP_SUBTRACT_FROM:  return TESTMATRIXTYPE_INCREMENTED_LESS;
>-+        case OP_MULTIPLY_INTO:  return TESTMATRIXTYPE_NEGATED;
>-+        case OP_DIVIDE_INTO:    return TESTMATRIXTYPE_DECREMENTED;
>-+
>-+        default:
>-+            DE_ASSERT(DE_FALSE);
>-+            return TESTMATRIXTYPE_LAST;
>-+    }
>- }
>- 
>- static bool isOperationBinary (MatrixOp op)
>- {
>--	return getOperationType(op) == OPERATIONTYPE_BINARY_OPERATOR ||
>--	       getOperationType(op) == OPERATIONTYPE_BINARY_FUNCTION ||
>--	       getOperationType(op) == OPERATIONTYPE_ASSIGNMENT;
>-+    return getOperationType(op) == OPERATIONTYPE_BINARY_OPERATOR ||
>-+           getOperationType(op) == OPERATIONTYPE_BINARY_FUNCTION ||
>-+           getOperationType(op) == OPERATIONTYPE_ASSIGNMENT;
>- }
>- 
>- static bool isOperationMatrixScalar (MatrixOp op)
>- {
>--	return op == OP_ADD || op == OP_SUB || op == OP_MUL || op == OP_DIV;
>-+    return op == OP_ADD || op == OP_SUB || op == OP_MUL || op == OP_DIV;
>- }
>- 
>- static bool isOperationMatrixVector (MatrixOp op)
>- {
>--	return op == OP_MUL;
>-+    return op == OP_MUL;
>- }
>- 
>- static bool isOperationArithmeticMatrixMatrix (MatrixOp op)
>- {
>--	return op == OP_MUL;
>-+    return op == OP_MUL;
>- }
>- 
>- static bool isOperationComponentwiseMatrixMatrix (MatrixOp op)
>- {
>--	return op == OP_ADD || op == OP_SUB || op == OP_MUL || op == OP_DIV || op == OP_COMP_MUL;
>-+    return op == OP_ADD || op == OP_SUB || op == OP_MUL || op == OP_DIV || op == OP_COMP_MUL;
>- }
>- 
>- static bool isOperationVectorVector (MatrixOp op)
>- {
>--	return op == OP_OUTER_PRODUCT;
>-+    return op == OP_OUTER_PRODUCT;
>- }
>- 
>- static bool isOperationUnaryAnyMatrix (MatrixOp op)
>- {
>--	return  op == OP_TRANSPOSE			 ||
>--			op == OP_UNARY_PLUS			 ||
>--			op == OP_NEGATION			 ||
>--			op == OP_PRE_INCREMENT		 ||
>--			op == OP_PRE_DECREMENT		 ||
>--			op == OP_POST_INCREMENT		 ||
>--			op == OP_POST_DECREMENT;
>-+    return  op == OP_TRANSPOSE           ||
>-+            op == OP_UNARY_PLUS          ||
>-+            op == OP_NEGATION            ||
>-+            op == OP_PRE_INCREMENT       ||
>-+            op == OP_PRE_DECREMENT       ||
>-+            op == OP_POST_INCREMENT      ||
>-+            op == OP_POST_DECREMENT;
>- }
>- 
>- static bool isOperationUnarySymmetricMatrix (MatrixOp op)
>- {
>--	return op == OP_INVERSE || op == OP_DETERMINANT;
>-+    return op == OP_INVERSE || op == OP_DETERMINANT;
>- }
>- 
>- static bool isOperationValueModifying (MatrixOp op)
>- {
>--	return  op == OP_PRE_INCREMENT		 ||
>--			op == OP_PRE_DECREMENT		 ||
>--			op == OP_POST_INCREMENT		 ||
>--			op == OP_POST_DECREMENT;
>-+    return  op == OP_PRE_INCREMENT       ||
>-+            op == OP_PRE_DECREMENT       ||
>-+            op == OP_POST_INCREMENT      ||
>-+            op == OP_POST_DECREMENT;
>- }
>- 
>- static bool isOperationAssignment (MatrixOp op)
>- {
>--	return  op == OP_ADD_INTO		 ||
>--			op == OP_SUBTRACT_FROM	 ||
>--			op == OP_MULTIPLY_INTO	 ||
>--			op == OP_DIVIDE_INTO;
>-+    return  op == OP_ADD_INTO        ||
>-+            op == OP_SUBTRACT_FROM   ||
>-+            op == OP_MULTIPLY_INTO   ||
>-+            op == OP_DIVIDE_INTO;
>- }
>- 
>- static bool isOperationAssignmentAnyMatrix (MatrixOp op)
>- {
>--	return  op == OP_ADD_INTO		 ||
>--			op == OP_SUBTRACT_FROM	 ||
>--			op == OP_DIVIDE_INTO;
>-+    return  op == OP_ADD_INTO        ||
>-+            op == OP_SUBTRACT_FROM   ||
>-+            op == OP_DIVIDE_INTO;
>- }
>- 
>- static bool isOperationAssignmentSymmetricMatrix (MatrixOp op)
>- {
>--	return op == OP_MULTIPLY_INTO;
>-+    return op == OP_MULTIPLY_INTO;
>- }
>- 
>- // Operation nature
>- 
>- enum OperationNature
>- {
>--	OPERATIONNATURE_PURE = 0,
>--	OPERATIONNATURE_MUTATING,
>--	OPERATIONNATURE_ASSIGNMENT,
>-+    OPERATIONNATURE_PURE = 0,
>-+    OPERATIONNATURE_MUTATING,
>-+    OPERATIONNATURE_ASSIGNMENT,
>- 
>--	OPERATIONNATURE_LAST
>-+    OPERATIONNATURE_LAST
>- };
>- 
>- static OperationNature getOperationNature (MatrixOp op)
>- {
>--	if (isOperationAssignment(op))
>--		return OPERATIONNATURE_ASSIGNMENT;
>-+    if (isOperationAssignment(op))
>-+        return OPERATIONNATURE_ASSIGNMENT;
>- 
>--	if (isOperationValueModifying(op))
>--		return OPERATIONNATURE_MUTATING;
>-+    if (isOperationValueModifying(op))
>-+        return OPERATIONNATURE_MUTATING;
>- 
>--	return OPERATIONNATURE_PURE;
>-+    return OPERATIONNATURE_PURE;
>- }
>- 
>- // Input value loader.
>-@@ -493,143 +493,143 @@ static OperationNature getOperationNature (MatrixOp op)
>- template <int InputT, int DataT>
>- typename TypeTraits<DataT>::Type getInputValue (const ShaderEvalContext& evalCtx, int inputNdx);
>- 
>--template <> inline float		getInputValue<INPUTTYPE_CONST,		TYPE_FLOAT>			(const ShaderEvalContext& evalCtx, int inputNdx) { DE_UNREF(evalCtx); return s_constInFloat[inputNdx];	}
>--template <> inline tcu::Vec2	getInputValue<INPUTTYPE_CONST,		TYPE_FLOAT_VEC2>	(const ShaderEvalContext& evalCtx, int inputNdx) { DE_UNREF(evalCtx); return s_constInVec2[inputNdx];	}
>--template <> inline tcu::Vec3	getInputValue<INPUTTYPE_CONST,		TYPE_FLOAT_VEC3>	(const ShaderEvalContext& evalCtx, int inputNdx) { DE_UNREF(evalCtx); return s_constInVec3[inputNdx];	}
>--template <> inline tcu::Vec4	getInputValue<INPUTTYPE_CONST,		TYPE_FLOAT_VEC4>	(const ShaderEvalContext& evalCtx, int inputNdx) { DE_UNREF(evalCtx); return s_constInVec4[inputNdx];	}
>--
>--template <> inline tcu::Mat2	getInputValue<INPUTTYPE_CONST,		TYPE_FLOAT_MAT2>	(const ShaderEvalContext& evalCtx, int inputNdx) { DE_UNREF(evalCtx); return tcu::Mat2(s_constInMat2x2[inputNdx]);		}
>--template <> inline tcu::Mat2x3	getInputValue<INPUTTYPE_CONST,		TYPE_FLOAT_MAT2X3>	(const ShaderEvalContext& evalCtx, int inputNdx) { DE_UNREF(evalCtx); return tcu::Mat2x3(s_constInMat2x3[inputNdx]);	}
>--template <> inline tcu::Mat2x4	getInputValue<INPUTTYPE_CONST,		TYPE_FLOAT_MAT2X4>	(const ShaderEvalContext& evalCtx, int inputNdx) { DE_UNREF(evalCtx); return tcu::Mat2x4(s_constInMat2x4[inputNdx]);	}
>--template <> inline tcu::Mat3x2	getInputValue<INPUTTYPE_CONST,		TYPE_FLOAT_MAT3X2>	(const ShaderEvalContext& evalCtx, int inputNdx) { DE_UNREF(evalCtx); return tcu::Mat3x2(s_constInMat3x2[inputNdx]);	}
>--template <> inline tcu::Mat3	getInputValue<INPUTTYPE_CONST,		TYPE_FLOAT_MAT3>	(const ShaderEvalContext& evalCtx, int inputNdx) { DE_UNREF(evalCtx); return tcu::Mat3(s_constInMat3x3[inputNdx]);		}
>--template <> inline tcu::Mat3x4	getInputValue<INPUTTYPE_CONST,		TYPE_FLOAT_MAT3X4>	(const ShaderEvalContext& evalCtx, int inputNdx) { DE_UNREF(evalCtx); return tcu::Mat3x4(s_constInMat3x4[inputNdx]);	}
>--template <> inline tcu::Mat4x2	getInputValue<INPUTTYPE_CONST,		TYPE_FLOAT_MAT4X2>	(const ShaderEvalContext& evalCtx, int inputNdx) { DE_UNREF(evalCtx); return tcu::Mat4x2(s_constInMat4x2[inputNdx]);	}
>--template <> inline tcu::Mat4x3	getInputValue<INPUTTYPE_CONST,		TYPE_FLOAT_MAT4X3>	(const ShaderEvalContext& evalCtx, int inputNdx) { DE_UNREF(evalCtx); return tcu::Mat4x3(s_constInMat4x3[inputNdx]);	}
>--template <> inline tcu::Mat4	getInputValue<INPUTTYPE_CONST,		TYPE_FLOAT_MAT4>	(const ShaderEvalContext& evalCtx, int inputNdx) { DE_UNREF(evalCtx); return tcu::Mat4(s_constInMat4x4[inputNdx]);		}
>--
>--template <> inline float		getInputValue<INPUTTYPE_DYNAMIC,	TYPE_FLOAT>			(const ShaderEvalContext& evalCtx, int inputNdx) { DE_UNREF(inputNdx); return evalCtx.coords.x();					}
>--template <> inline tcu::Vec2	getInputValue<INPUTTYPE_DYNAMIC,	TYPE_FLOAT_VEC2>	(const ShaderEvalContext& evalCtx, int inputNdx) { DE_UNREF(inputNdx); return evalCtx.coords.swizzle(0, 1);			}
>--template <> inline tcu::Vec3	getInputValue<INPUTTYPE_DYNAMIC,	TYPE_FLOAT_VEC3>	(const ShaderEvalContext& evalCtx, int inputNdx) { DE_UNREF(inputNdx); return evalCtx.coords.swizzle(0, 1, 2);		}
>--template <> inline tcu::Vec4	getInputValue<INPUTTYPE_DYNAMIC,	TYPE_FLOAT_VEC4>	(const ShaderEvalContext& evalCtx, int inputNdx) { DE_UNREF(inputNdx); return evalCtx.coords.swizzle(0, 1, 2, 3);	}
>-+template <> inline float        getInputValue<INPUTTYPE_CONST,      TYPE_FLOAT>         (const ShaderEvalContext& evalCtx, int inputNdx) { DE_UNREF(evalCtx); return s_constInFloat[inputNdx];  }
>-+template <> inline tcu::Vec2    getInputValue<INPUTTYPE_CONST,      TYPE_FLOAT_VEC2>    (const ShaderEvalContext& evalCtx, int inputNdx) { DE_UNREF(evalCtx); return s_constInVec2[inputNdx];   }
>-+template <> inline tcu::Vec3    getInputValue<INPUTTYPE_CONST,      TYPE_FLOAT_VEC3>    (const ShaderEvalContext& evalCtx, int inputNdx) { DE_UNREF(evalCtx); return s_constInVec3[inputNdx];   }
>-+template <> inline tcu::Vec4    getInputValue<INPUTTYPE_CONST,      TYPE_FLOAT_VEC4>    (const ShaderEvalContext& evalCtx, int inputNdx) { DE_UNREF(evalCtx); return s_constInVec4[inputNdx];   }
>-+
>-+template <> inline tcu::Mat2    getInputValue<INPUTTYPE_CONST,      TYPE_FLOAT_MAT2>    (const ShaderEvalContext& evalCtx, int inputNdx) { DE_UNREF(evalCtx); return tcu::Mat2(s_constInMat2x2[inputNdx]);      }
>-+template <> inline tcu::Mat2x3  getInputValue<INPUTTYPE_CONST,      TYPE_FLOAT_MAT2X3>  (const ShaderEvalContext& evalCtx, int inputNdx) { DE_UNREF(evalCtx); return tcu::Mat2x3(s_constInMat2x3[inputNdx]);    }
>-+template <> inline tcu::Mat2x4  getInputValue<INPUTTYPE_CONST,      TYPE_FLOAT_MAT2X4>  (const ShaderEvalContext& evalCtx, int inputNdx) { DE_UNREF(evalCtx); return tcu::Mat2x4(s_constInMat2x4[inputNdx]);    }
>-+template <> inline tcu::Mat3x2  getInputValue<INPUTTYPE_CONST,      TYPE_FLOAT_MAT3X2>  (const ShaderEvalContext& evalCtx, int inputNdx) { DE_UNREF(evalCtx); return tcu::Mat3x2(s_constInMat3x2[inputNdx]);    }
>-+template <> inline tcu::Mat3    getInputValue<INPUTTYPE_CONST,      TYPE_FLOAT_MAT3>    (const ShaderEvalContext& evalCtx, int inputNdx) { DE_UNREF(evalCtx); return tcu::Mat3(s_constInMat3x3[inputNdx]);      }
>-+template <> inline tcu::Mat3x4  getInputValue<INPUTTYPE_CONST,      TYPE_FLOAT_MAT3X4>  (const ShaderEvalContext& evalCtx, int inputNdx) { DE_UNREF(evalCtx); return tcu::Mat3x4(s_constInMat3x4[inputNdx]);    }
>-+template <> inline tcu::Mat4x2  getInputValue<INPUTTYPE_CONST,      TYPE_FLOAT_MAT4X2>  (const ShaderEvalContext& evalCtx, int inputNdx) { DE_UNREF(evalCtx); return tcu::Mat4x2(s_constInMat4x2[inputNdx]);    }
>-+template <> inline tcu::Mat4x3  getInputValue<INPUTTYPE_CONST,      TYPE_FLOAT_MAT4X3>  (const ShaderEvalContext& evalCtx, int inputNdx) { DE_UNREF(evalCtx); return tcu::Mat4x3(s_constInMat4x3[inputNdx]);    }
>-+template <> inline tcu::Mat4    getInputValue<INPUTTYPE_CONST,      TYPE_FLOAT_MAT4>    (const ShaderEvalContext& evalCtx, int inputNdx) { DE_UNREF(evalCtx); return tcu::Mat4(s_constInMat4x4[inputNdx]);      }
>-+
>-+template <> inline float        getInputValue<INPUTTYPE_DYNAMIC,    TYPE_FLOAT>         (const ShaderEvalContext& evalCtx, int inputNdx) { DE_UNREF(inputNdx); return evalCtx.coords.x();                   }
>-+template <> inline tcu::Vec2    getInputValue<INPUTTYPE_DYNAMIC,    TYPE_FLOAT_VEC2>    (const ShaderEvalContext& evalCtx, int inputNdx) { DE_UNREF(inputNdx); return evalCtx.coords.swizzle(0, 1);         }
>-+template <> inline tcu::Vec3    getInputValue<INPUTTYPE_DYNAMIC,    TYPE_FLOAT_VEC3>    (const ShaderEvalContext& evalCtx, int inputNdx) { DE_UNREF(inputNdx); return evalCtx.coords.swizzle(0, 1, 2);      }
>-+template <> inline tcu::Vec4    getInputValue<INPUTTYPE_DYNAMIC,    TYPE_FLOAT_VEC4>    (const ShaderEvalContext& evalCtx, int inputNdx) { DE_UNREF(inputNdx); return evalCtx.coords.swizzle(0, 1, 2, 3);   }
>- 
>- template <> inline tcu::Mat2 getInputValue<INPUTTYPE_DYNAMIC, TYPE_FLOAT_MAT2> (const ShaderEvalContext& evalCtx, int inputNdx)
>- {
>--	DE_UNREF(inputNdx); // Not used.
>--	tcu::Mat2 m;
>--	m.setColumn(0, evalCtx.in[0].swizzle(0,1));
>--	m.setColumn(1, evalCtx.in[1].swizzle(0,1));
>--	return m;
>-+    DE_UNREF(inputNdx); // Not used.
>-+    tcu::Mat2 m;
>-+    m.setColumn(0, evalCtx.in[0].swizzle(0,1));
>-+    m.setColumn(1, evalCtx.in[1].swizzle(0,1));
>-+    return m;
>- }
>- 
>- template <> inline tcu::Mat2x3 getInputValue<INPUTTYPE_DYNAMIC, TYPE_FLOAT_MAT2X3> (const ShaderEvalContext& evalCtx, int inputNdx)
>- {
>--	DE_UNREF(inputNdx); // Not used.
>--	tcu::Mat2x3 m;
>--	m.setColumn(0, evalCtx.in[0].swizzle(0,1,2));
>--	m.setColumn(1, evalCtx.in[1].swizzle(0,1,2));
>--	return m;
>-+    DE_UNREF(inputNdx); // Not used.
>-+    tcu::Mat2x3 m;
>-+    m.setColumn(0, evalCtx.in[0].swizzle(0,1,2));
>-+    m.setColumn(1, evalCtx.in[1].swizzle(0,1,2));
>-+    return m;
>- }
>- 
>- template <> inline tcu::Mat2x4 getInputValue<INPUTTYPE_DYNAMIC, TYPE_FLOAT_MAT2X4> (const ShaderEvalContext& evalCtx, int inputNdx)
>- {
>--	DE_UNREF(inputNdx); // Not used.
>--	tcu::Mat2x4 m;
>--	m.setColumn(0, evalCtx.in[0]);
>--	m.setColumn(1, evalCtx.in[1]);
>--	return m;
>-+    DE_UNREF(inputNdx); // Not used.
>-+    tcu::Mat2x4 m;
>-+    m.setColumn(0, evalCtx.in[0]);
>-+    m.setColumn(1, evalCtx.in[1]);
>-+    return m;
>- }
>- 
>- template <> inline tcu::Mat3x2 getInputValue<INPUTTYPE_DYNAMIC, TYPE_FLOAT_MAT3X2> (const ShaderEvalContext& evalCtx, int inputNdx)
>- {
>--	DE_UNREF(inputNdx); // Not used.
>--	tcu::Mat3x2 m;
>--	m.setColumn(0, evalCtx.in[0].swizzle(0,1));
>--	m.setColumn(1, evalCtx.in[1].swizzle(0,1));
>--	m.setColumn(2, evalCtx.in[2].swizzle(0,1));
>--	return m;
>-+    DE_UNREF(inputNdx); // Not used.
>-+    tcu::Mat3x2 m;
>-+    m.setColumn(0, evalCtx.in[0].swizzle(0,1));
>-+    m.setColumn(1, evalCtx.in[1].swizzle(0,1));
>-+    m.setColumn(2, evalCtx.in[2].swizzle(0,1));
>-+    return m;
>- }
>- 
>- template <> inline tcu::Mat3 getInputValue<INPUTTYPE_DYNAMIC, TYPE_FLOAT_MAT3> (const ShaderEvalContext& evalCtx, int inputNdx)
>- {
>--	DE_UNREF(inputNdx); // Not used.
>--	tcu::Mat3 m;
>--	m.setColumn(0, evalCtx.in[0].swizzle(0,1,2));
>--	m.setColumn(1, evalCtx.in[1].swizzle(0,1,2));
>--	m.setColumn(2, evalCtx.in[2].swizzle(0,1,2));
>--	return m;
>-+    DE_UNREF(inputNdx); // Not used.
>-+    tcu::Mat3 m;
>-+    m.setColumn(0, evalCtx.in[0].swizzle(0,1,2));
>-+    m.setColumn(1, evalCtx.in[1].swizzle(0,1,2));
>-+    m.setColumn(2, evalCtx.in[2].swizzle(0,1,2));
>-+    return m;
>- }
>- 
>- template <> inline tcu::Mat3x4 getInputValue<INPUTTYPE_DYNAMIC, TYPE_FLOAT_MAT3X4> (const ShaderEvalContext& evalCtx, int inputNdx)
>- {
>--	DE_UNREF(inputNdx); // Not used.
>--	tcu::Mat3x4 m;
>--	m.setColumn(0, evalCtx.in[0]);
>--	m.setColumn(1, evalCtx.in[1]);
>--	m.setColumn(2, evalCtx.in[2]);
>--	return m;
>-+    DE_UNREF(inputNdx); // Not used.
>-+    tcu::Mat3x4 m;
>-+    m.setColumn(0, evalCtx.in[0]);
>-+    m.setColumn(1, evalCtx.in[1]);
>-+    m.setColumn(2, evalCtx.in[2]);
>-+    return m;
>- }
>- 
>- template <> inline tcu::Mat4x2 getInputValue<INPUTTYPE_DYNAMIC, TYPE_FLOAT_MAT4X2> (const ShaderEvalContext& evalCtx, int inputNdx)
>- {
>--	DE_UNREF(inputNdx); // Not used.
>--	tcu::Mat4x2 m;
>--	m.setColumn(0, evalCtx.in[0].swizzle(0,1));
>--	m.setColumn(1, evalCtx.in[1].swizzle(0,1));
>--	m.setColumn(2, evalCtx.in[2].swizzle(0,1));
>--	m.setColumn(3, evalCtx.in[3].swizzle(0,1));
>--	return m;
>-+    DE_UNREF(inputNdx); // Not used.
>-+    tcu::Mat4x2 m;
>-+    m.setColumn(0, evalCtx.in[0].swizzle(0,1));
>-+    m.setColumn(1, evalCtx.in[1].swizzle(0,1));
>-+    m.setColumn(2, evalCtx.in[2].swizzle(0,1));
>-+    m.setColumn(3, evalCtx.in[3].swizzle(0,1));
>-+    return m;
>- }
>- 
>- template <> inline tcu::Mat4x3 getInputValue<INPUTTYPE_DYNAMIC, TYPE_FLOAT_MAT4X3> (const ShaderEvalContext& evalCtx, int inputNdx)
>- {
>--	DE_UNREF(inputNdx); // Not used.
>--	tcu::Mat4x3 m;
>--	m.setColumn(0, evalCtx.in[0].swizzle(0,1,2));
>--	m.setColumn(1, evalCtx.in[1].swizzle(0,1,2));
>--	m.setColumn(2, evalCtx.in[2].swizzle(0,1,2));
>--	m.setColumn(3, evalCtx.in[3].swizzle(0,1,2));
>--	return m;
>-+    DE_UNREF(inputNdx); // Not used.
>-+    tcu::Mat4x3 m;
>-+    m.setColumn(0, evalCtx.in[0].swizzle(0,1,2));
>-+    m.setColumn(1, evalCtx.in[1].swizzle(0,1,2));
>-+    m.setColumn(2, evalCtx.in[2].swizzle(0,1,2));
>-+    m.setColumn(3, evalCtx.in[3].swizzle(0,1,2));
>-+    return m;
>- }
>- 
>- template <> inline tcu::Mat4 getInputValue<INPUTTYPE_DYNAMIC, TYPE_FLOAT_MAT4> (const ShaderEvalContext& evalCtx, int inputNdx)
>- {
>--	DE_UNREF(inputNdx); // Not used.
>--	tcu::Mat4 m;
>--	m.setColumn(0, evalCtx.in[0]);
>--	m.setColumn(1, evalCtx.in[1]);
>--	m.setColumn(2, evalCtx.in[2]);
>--	m.setColumn(3, evalCtx.in[3]);
>--	return m;
>-+    DE_UNREF(inputNdx); // Not used.
>-+    tcu::Mat4 m;
>-+    m.setColumn(0, evalCtx.in[0]);
>-+    m.setColumn(1, evalCtx.in[1]);
>-+    m.setColumn(2, evalCtx.in[2]);
>-+    m.setColumn(3, evalCtx.in[3]);
>-+    return m;
>- }
>- 
>- // Reduction from expression result to vec3.
>- 
>--inline tcu::Vec3 reduceToVec3 (const tcu::Vec2& value)		{ return value.swizzle(0,1,0); }
>--inline tcu::Vec3 reduceToVec3 (const tcu::Vec3& value)		{ return value; }
>--inline tcu::Vec3 reduceToVec3 (const tcu::Vec4& value)		{ return tcu::Vec3(value.x(), value.y(), value.z()+value.w()); }
>--inline tcu::Vec3 reduceToVec3 (const tcu::Mat2& value)		{ return tcu::Vec3(value(0, 0), value(0, 1), value(1, 0)+value(1, 1)); }
>--inline tcu::Vec3 reduceToVec3 (const tcu::Mat2x3& value)	{ return value.getColumn(0) + value.getColumn(1); }
>--inline tcu::Vec3 reduceToVec3 (const tcu::Mat2x4& value)	{ return value.getColumn(0).swizzle(0,1,2) + value.getColumn(1).swizzle(1,2,3); }
>--inline tcu::Vec3 reduceToVec3 (const tcu::Mat3x2& value)	{ return tcu::Vec3(value(0,0)+value(1,0), value(0,1)+value(1,1), value(0,2)+value(1,2)); }
>--inline tcu::Vec3 reduceToVec3 (const tcu::Mat3& value)		{ return value.getColumn(0) + value.getColumn(1) + value.getColumn(2); }
>--inline tcu::Vec3 reduceToVec3 (const tcu::Mat3x4& value)	{ return value.getColumn(0).swizzle(0,1,2) + value.getColumn(1).swizzle(1,2,3) + value.getColumn(2).swizzle(2,3,0); }
>--inline tcu::Vec3 reduceToVec3 (const tcu::Mat4x2& value)	{ return tcu::Vec3(value(0,0)+value(1,0)+value(0,3), value(0,1)+value(1,1)+value(1,3), value(0,2)+value(1,2)); }
>--inline tcu::Vec3 reduceToVec3 (const tcu::Mat4x3& value)	{ return value.getColumn(0) + value.getColumn(1) + value.getColumn(2) + value.getColumn(3); }
>--inline tcu::Vec3 reduceToVec3 (const tcu::Mat4& value)		{ return value.getColumn(0).swizzle(0,1,2) + value.getColumn(1).swizzle(1,2,3) + value.getColumn(2).swizzle(2,3,0) + value.getColumn(3).swizzle(3,0,1); }
>-+inline tcu::Vec3 reduceToVec3 (const tcu::Vec2& value)      { return value.swizzle(0,1,0); }
>-+inline tcu::Vec3 reduceToVec3 (const tcu::Vec3& value)      { return value; }
>-+inline tcu::Vec3 reduceToVec3 (const tcu::Vec4& value)      { return tcu::Vec3(value.x(), value.y(), value.z()+value.w()); }
>-+inline tcu::Vec3 reduceToVec3 (const tcu::Mat2& value)      { return tcu::Vec3(value(0, 0), value(0, 1), value(1, 0)+value(1, 1)); }
>-+inline tcu::Vec3 reduceToVec3 (const tcu::Mat2x3& value)    { return value.getColumn(0) + value.getColumn(1); }
>-+inline tcu::Vec3 reduceToVec3 (const tcu::Mat2x4& value)    { return value.getColumn(0).swizzle(0,1,2) + value.getColumn(1).swizzle(1,2,3); }
>-+inline tcu::Vec3 reduceToVec3 (const tcu::Mat3x2& value)    { return tcu::Vec3(value(0,0)+value(1,0), value(0,1)+value(1,1), value(0,2)+value(1,2)); }
>-+inline tcu::Vec3 reduceToVec3 (const tcu::Mat3& value)      { return value.getColumn(0) + value.getColumn(1) + value.getColumn(2); }
>-+inline tcu::Vec3 reduceToVec3 (const tcu::Mat3x4& value)    { return value.getColumn(0).swizzle(0,1,2) + value.getColumn(1).swizzle(1,2,3) + value.getColumn(2).swizzle(2,3,0); }
>-+inline tcu::Vec3 reduceToVec3 (const tcu::Mat4x2& value)    { return tcu::Vec3(value(0,0)+value(1,0)+value(0,3), value(0,1)+value(1,1)+value(1,3), value(0,2)+value(1,2)); }
>-+inline tcu::Vec3 reduceToVec3 (const tcu::Mat4x3& value)    { return value.getColumn(0) + value.getColumn(1) + value.getColumn(2) + value.getColumn(3); }
>-+inline tcu::Vec3 reduceToVec3 (const tcu::Mat4& value)      { return value.getColumn(0).swizzle(0,1,2) + value.getColumn(1).swizzle(1,2,3) + value.getColumn(2).swizzle(2,3,0) + value.getColumn(3).swizzle(3,0,1); }
>- 
>- // matrixCompMult
>- 
>- template <typename T, int Rows, int Cols>
>- tcu::Matrix<T, Rows, Cols> matrixCompMult (const tcu::Matrix<T, Rows, Cols>& a, const tcu::Matrix<T, Rows, Cols>& b)
>- {
>--	tcu::Matrix<T, Rows, Cols> retVal;
>-+    tcu::Matrix<T, Rows, Cols> retVal;
>- 
>--	for (int r = 0; r < Rows; ++r)
>--		for (int c = 0; c < Cols; ++c)
>--			retVal(r,c) = a(r,c) * b(r, c);
>-+    for (int r = 0; r < Rows; ++r)
>-+        for (int c = 0; c < Cols; ++c)
>-+            retVal(r,c) = a(r,c) * b(r, c);
>- 
>--	return retVal;
>-+    return retVal;
>- }
>- 
>- // transpose
>-@@ -637,13 +637,13 @@ tcu::Matrix<T, Rows, Cols> matrixCompMult (const tcu::Matrix<T, Rows, Cols>& a,
>- template <typename T, int Rows, int Cols>
>- tcu::Matrix<T, Cols, Rows> transpose (const tcu::Matrix<T, Rows, Cols>& mat)
>- {
>--	tcu::Matrix<T, Cols, Rows> retVal;
>-+    tcu::Matrix<T, Cols, Rows> retVal;
>- 
>--	for (int r = 0; r < Rows; ++r)
>--		for (int c = 0; c < Cols; ++c)
>--			retVal(c, r) = mat(r, c);
>-+    for (int r = 0; r < Rows; ++r)
>-+        for (int c = 0; c < Cols; ++c)
>-+            retVal(c, r) = mat(r, c);
>- 
>--	return retVal;
>-+    return retVal;
>- }
>- 
>- // outerProduct
>-@@ -651,13 +651,13 @@ tcu::Matrix<T, Cols, Rows> transpose (const tcu::Matrix<T, Rows, Cols>& mat)
>- template <typename T, int Rows, int Cols>
>- tcu::Matrix<T, Cols, Rows> outerProduct (const tcu::Vector<T, Cols>& a, const tcu::Vector<T, Rows>& b)
>- {
>--	tcu::Matrix<T, Rows, Cols> retVal;
>-+    tcu::Matrix<T, Rows, Cols> retVal;
>- 
>--	for (int r = 0; r < Rows; ++r)
>--		for (int c = 0; c < Cols; ++c)
>--			retVal(r,c) = a[c] * b[r];
>-+    for (int r = 0; r < Rows; ++r)
>-+        for (int c = 0; c < Cols; ++c)
>-+            retVal(r,c) = a[c] * b[r];
>- 
>--	return transpose(retVal); // to gl-form (column-major)
>-+    return transpose(retVal); // to gl-form (column-major)
>- }
>- 
>- // Determinant
>-@@ -668,51 +668,51 @@ float determinant (const tcu::Matrix<float, Size, Size>& mat);
>- template <>
>- float determinant<2> (const tcu::Matrix<float, 2, 2>& mat)
>- {
>--	return mat(0,0) * mat(1,1) - mat(1,0) * mat(0,1);
>-+    return mat(0,0) * mat(1,1) - mat(1,0) * mat(0,1);
>- }
>- 
>- template <>
>- float determinant<3> (const tcu::Matrix<float, 3, 3>& mat)
>- {
>--	return	+ mat(0,0) * mat(1,1) * mat(2,2)
>--			+ mat(0,1) * mat(1,2) * mat(2,0)
>--			+ mat(0,2) * mat(1,0) * mat(2,1)
>--			- mat(0,0) * mat(1,2) * mat(2,1)
>--			- mat(0,1) * mat(1,0) * mat(2,2)
>--			- mat(0,2) * mat(1,1) * mat(2,0);
>-+    return  + mat(0,0) * mat(1,1) * mat(2,2)
>-+            + mat(0,1) * mat(1,2) * mat(2,0)
>-+            + mat(0,2) * mat(1,0) * mat(2,1)
>-+            - mat(0,0) * mat(1,2) * mat(2,1)
>-+            - mat(0,1) * mat(1,0) * mat(2,2)
>-+            - mat(0,2) * mat(1,1) * mat(2,0);
>- }
>- 
>- template <>
>- float determinant<4> (const tcu::Matrix<float, 4, 4>& mat)
>- {
>--	const float minorMatrices[4][3*3] =
>--	{
>--		{
>--			mat(1,1),	mat(2,1),	mat(3,1),
>--			mat(1,2),	mat(2,2),	mat(3,2),
>--			mat(1,3),	mat(2,3),	mat(3,3),
>--		},
>--		{
>--			mat(1,0),	mat(2,0),	mat(3,0),
>--			mat(1,2),	mat(2,2),	mat(3,2),
>--			mat(1,3),	mat(2,3),	mat(3,3),
>--		},
>--		{
>--			mat(1,0),	mat(2,0),	mat(3,0),
>--			mat(1,1),	mat(2,1),	mat(3,1),
>--			mat(1,3),	mat(2,3),	mat(3,3),
>--		},
>--		{
>--			mat(1,0),	mat(2,0),	mat(3,0),
>--			mat(1,1),	mat(2,1),	mat(3,1),
>--			mat(1,2),	mat(2,2),	mat(3,2),
>--		}
>--	};
>--
>--	return	+ mat(0,0) * determinant(tcu::Mat3(minorMatrices[0]))
>--			- mat(0,1) * determinant(tcu::Mat3(minorMatrices[1]))
>--			+ mat(0,2) * determinant(tcu::Mat3(minorMatrices[2]))
>--			- mat(0,3) * determinant(tcu::Mat3(minorMatrices[3]));
>-+    const float minorMatrices[4][3*3] =
>-+    {
>-+        {
>-+            mat(1,1),   mat(2,1),   mat(3,1),
>-+            mat(1,2),   mat(2,2),   mat(3,2),
>-+            mat(1,3),   mat(2,3),   mat(3,3),
>-+        },
>-+        {
>-+            mat(1,0),   mat(2,0),   mat(3,0),
>-+            mat(1,2),   mat(2,2),   mat(3,2),
>-+            mat(1,3),   mat(2,3),   mat(3,3),
>-+        },
>-+        {
>-+            mat(1,0),   mat(2,0),   mat(3,0),
>-+            mat(1,1),   mat(2,1),   mat(3,1),
>-+            mat(1,3),   mat(2,3),   mat(3,3),
>-+        },
>-+        {
>-+            mat(1,0),   mat(2,0),   mat(3,0),
>-+            mat(1,1),   mat(2,1),   mat(3,1),
>-+            mat(1,2),   mat(2,2),   mat(3,2),
>-+        }
>-+    };
>-+
>-+    return  + mat(0,0) * determinant(tcu::Mat3(minorMatrices[0]))
>-+            - mat(0,1) * determinant(tcu::Mat3(minorMatrices[1]))
>-+            + mat(0,2) * determinant(tcu::Mat3(minorMatrices[2]))
>-+            - mat(0,3) * determinant(tcu::Mat3(minorMatrices[3]));
>- }
>- 
>- // Inverse
>-@@ -723,120 +723,120 @@ tcu::Matrix<float, Size, Size> inverse (const tcu::Matrix<float, Size, Size>& ma
>- template <>
>- tcu::Matrix<float, 2, 2> inverse<2> (const tcu::Matrix<float, 2, 2>& mat)
>- {
>--	const float					det		= determinant(mat);
>--	tcu::Matrix<float, 2, 2>	retVal;
>-+    const float                 det     = determinant(mat);
>-+    tcu::Matrix<float, 2, 2>    retVal;
>- 
>--	DE_ASSERT(det != 0.0f);
>-+    DE_ASSERT(det != 0.0f);
>- 
>--	retVal(0, 0) =  mat(1, 1) / det;
>--	retVal(0, 1) = -mat(0, 1) / det;
>--	retVal(1, 0) = -mat(1, 0) / det;
>--	retVal(1, 1) =  mat(0, 0) / det;
>-+    retVal(0, 0) =  mat(1, 1) / det;
>-+    retVal(0, 1) = -mat(0, 1) / det;
>-+    retVal(1, 0) = -mat(1, 0) / det;
>-+    retVal(1, 1) =  mat(0, 0) / det;
>- 
>--	return retVal;
>-+    return retVal;
>- }
>- 
>- template <>
>- tcu::Matrix<float, 3, 3> inverse<3> (const tcu::Matrix<float, 3, 3>& mat)
>- {
>--	// Blockwise inversion
>--
>--	DE_ASSERT(determinant(mat) != 0.0f);
>--
>--	const float areaA[2*2] =
>--	{
>--		mat(0,0),	mat(0,1),
>--		mat(1,0),	mat(1,1)
>--	};
>--	const float areaB[2] =
>--	{
>--		mat(0,2),
>--		mat(1,2),
>--	};
>--	const float areaC[2] =
>--	{
>--		mat(2,0),	mat(2,1),
>--	};
>--	const float areaD[1] =
>--	{
>--		mat(2,2)
>--	};
>--	const float nullField[4] = { 0.0f };
>--
>--	const tcu::Matrix<float, 2, 2>	invA = inverse(tcu::Matrix<float, 2, 2>(areaA));
>--	const tcu::Matrix<float, 2, 1>	matB =         tcu::Matrix<float, 2, 1>(areaB);
>--	const tcu::Matrix<float, 1, 2>	matC =         tcu::Matrix<float, 1, 2>(areaC);
>--	const tcu::Matrix<float, 1, 1>	matD =         tcu::Matrix<float, 1, 1>(areaD);
>--
>--	const float						schurComplement = 1.0f / (matD - matC*invA*matB)(0,0);
>--	const tcu::Matrix<float, 2, 2>	zeroMat         = Mat2(nullField);
>--
>--	const tcu::Matrix<float, 2, 2>	blockA = invA + invA*matB*schurComplement*matC*invA;
>--	const tcu::Matrix<float, 2, 1>	blockB = (zeroMat-invA)*matB*schurComplement;
>--	const tcu::Matrix<float, 1, 2>	blockC = matC*invA*(-schurComplement);
>--	const float						blockD = schurComplement;
>--
>--	const float result[3*3] =
>--	{
>--		blockA(0,0),	blockA(0,1),	blockB(0,0),
>--		blockA(1,0),	blockA(1,1),	blockB(1,0),
>--		blockC(0,0),	blockC(0,1),	blockD,
>--	};
>--
>--	return Mat3(result);
>-+    // Blockwise inversion
>-+
>-+    DE_ASSERT(determinant(mat) != 0.0f);
>-+
>-+    const float areaA[2*2] =
>-+    {
>-+        mat(0,0),   mat(0,1),
>-+        mat(1,0),   mat(1,1)
>-+    };
>-+    const float areaB[2] =
>-+    {
>-+        mat(0,2),
>-+        mat(1,2),
>-+    };
>-+    const float areaC[2] =
>-+    {
>-+        mat(2,0),   mat(2,1),
>-+    };
>-+    const float areaD[1] =
>-+    {
>-+        mat(2,2)
>-+    };
>-+    const float nullField[4] = { 0.0f };
>-+
>-+    const tcu::Matrix<float, 2, 2>  invA = inverse(tcu::Matrix<float, 2, 2>(areaA));
>-+    const tcu::Matrix<float, 2, 1>  matB =         tcu::Matrix<float, 2, 1>(areaB);
>-+    const tcu::Matrix<float, 1, 2>  matC =         tcu::Matrix<float, 1, 2>(areaC);
>-+    const tcu::Matrix<float, 1, 1>  matD =         tcu::Matrix<float, 1, 1>(areaD);
>-+
>-+    const float                     schurComplement = 1.0f / (matD - matC*invA*matB)(0,0);
>-+    const tcu::Matrix<float, 2, 2>  zeroMat         = Mat2(nullField);
>-+
>-+    const tcu::Matrix<float, 2, 2>  blockA = invA + invA*matB*schurComplement*matC*invA;
>-+    const tcu::Matrix<float, 2, 1>  blockB = (zeroMat-invA)*matB*schurComplement;
>-+    const tcu::Matrix<float, 1, 2>  blockC = matC*invA*(-schurComplement);
>-+    const float                     blockD = schurComplement;
>-+
>-+    const float result[3*3] =
>-+    {
>-+        blockA(0,0),    blockA(0,1),    blockB(0,0),
>-+        blockA(1,0),    blockA(1,1),    blockB(1,0),
>-+        blockC(0,0),    blockC(0,1),    blockD,
>-+    };
>-+
>-+    return Mat3(result);
>- }
>- 
>- template <>
>- tcu::Matrix<float, 4, 4> inverse<4> (const tcu::Matrix<float, 4, 4>& mat)
>- {
>--	// Blockwise inversion
>--
>--	DE_ASSERT(determinant(mat) != 0.0f);
>--
>--	const float areaA[2*2] =
>--	{
>--		mat(0,0),	mat(0,1),
>--		mat(1,0),	mat(1,1)
>--	};
>--	const float areaB[2*2] =
>--	{
>--		mat(0,2),	mat(0,3),
>--		mat(1,2),	mat(1,3)
>--	};
>--	const float areaC[2*2] =
>--	{
>--		mat(2,0),	mat(2,1),
>--		mat(3,0),	mat(3,1)
>--	};
>--	const float areaD[2*2] =
>--	{
>--		mat(2,2),	mat(2,3),
>--		mat(3,2),	mat(3,3)
>--	};
>--	const float nullField[4] = { 0.0f };
>--
>--	const tcu::Matrix<float, 2, 2> invA = inverse(Mat2(areaA));
>--	const tcu::Matrix<float, 2, 2> matB =         Mat2(areaB);
>--	const tcu::Matrix<float, 2, 2> matC =         Mat2(areaC);
>--	const tcu::Matrix<float, 2, 2> matD =         Mat2(areaD);
>--
>--	const tcu::Matrix<float, 2, 2> schurComplement = inverse(matD - matC*invA*matB);
>--	const tcu::Matrix<float, 2, 2> zeroMat         = Mat2(nullField);
>--
>--	const tcu::Matrix<float, 2, 2> blockA = invA + invA*matB*schurComplement*matC*invA;
>--	const tcu::Matrix<float, 2, 2> blockB = (zeroMat-invA)*matB*schurComplement;
>--	const tcu::Matrix<float, 2, 2> blockC = (zeroMat-schurComplement)*matC*invA;
>--	const tcu::Matrix<float, 2, 2> blockD = schurComplement;
>--
>--	const float result[4*4] =
>--	{
>--		blockA(0,0),	blockA(0,1),	blockB(0,0),	blockB(0,1),
>--		blockA(1,0),	blockA(1,1),	blockB(1,0),	blockB(1,1),
>--		blockC(0,0),	blockC(0,1),	blockD(0,0),	blockD(0,1),
>--		blockC(1,0),	blockC(1,1),	blockD(1,0),	blockD(1,1),
>--	};
>--
>--	return Mat4(result);
>-+    // Blockwise inversion
>-+
>-+    DE_ASSERT(determinant(mat) != 0.0f);
>-+
>-+    const float areaA[2*2] =
>-+    {
>-+        mat(0,0),   mat(0,1),
>-+        mat(1,0),   mat(1,1)
>-+    };
>-+    const float areaB[2*2] =
>-+    {
>-+        mat(0,2),   mat(0,3),
>-+        mat(1,2),   mat(1,3)
>-+    };
>-+    const float areaC[2*2] =
>-+    {
>-+        mat(2,0),   mat(2,1),
>-+        mat(3,0),   mat(3,1)
>-+    };
>-+    const float areaD[2*2] =
>-+    {
>-+        mat(2,2),   mat(2,3),
>-+        mat(3,2),   mat(3,3)
>-+    };
>-+    const float nullField[4] = { 0.0f };
>-+
>-+    const tcu::Matrix<float, 2, 2> invA = inverse(Mat2(areaA));
>-+    const tcu::Matrix<float, 2, 2> matB =         Mat2(areaB);
>-+    const tcu::Matrix<float, 2, 2> matC =         Mat2(areaC);
>-+    const tcu::Matrix<float, 2, 2> matD =         Mat2(areaD);
>-+
>-+    const tcu::Matrix<float, 2, 2> schurComplement = inverse(matD - matC*invA*matB);
>-+    const tcu::Matrix<float, 2, 2> zeroMat         = Mat2(nullField);
>-+
>-+    const tcu::Matrix<float, 2, 2> blockA = invA + invA*matB*schurComplement*matC*invA;
>-+    const tcu::Matrix<float, 2, 2> blockB = (zeroMat-invA)*matB*schurComplement;
>-+    const tcu::Matrix<float, 2, 2> blockC = (zeroMat-schurComplement)*matC*invA;
>-+    const tcu::Matrix<float, 2, 2> blockD = schurComplement;
>-+
>-+    const float result[4*4] =
>-+    {
>-+        blockA(0,0),    blockA(0,1),    blockB(0,0),    blockB(0,1),
>-+        blockA(1,0),    blockA(1,1),    blockB(1,0),    blockB(1,1),
>-+        blockC(0,0),    blockC(0,1),    blockD(0,0),    blockD(0,1),
>-+        blockC(1,0),    blockC(1,1),    blockD(1,0),    blockD(1,1),
>-+    };
>-+
>-+    return Mat4(result);
>- }
>- 
>- // negate
>-@@ -844,13 +844,13 @@ tcu::Matrix<float, 4, 4> inverse<4> (const tcu::Matrix<float, 4, 4>& mat)
>- template <typename T, int Rows, int Cols>
>- tcu::Matrix<T, Rows, Cols> negate (const tcu::Matrix<T, Rows, Cols>& mat)
>- {
>--	tcu::Matrix<T, Rows, Cols> retVal;
>-+    tcu::Matrix<T, Rows, Cols> retVal;
>- 
>--	for (int r = 0; r < Rows; ++r)
>--		for (int c = 0; c < Cols; ++c)
>--			retVal(r,c) = -mat(r, c);
>-+    for (int r = 0; r < Rows; ++r)
>-+        for (int c = 0; c < Cols; ++c)
>-+            retVal(r,c) = -mat(r, c);
>- 
>--	return retVal;
>-+    return retVal;
>- }
>- 
>- // increment/decrement
>-@@ -858,25 +858,25 @@ tcu::Matrix<T, Rows, Cols> negate (const tcu::Matrix<T, Rows, Cols>& mat)
>- template <typename T, int Rows, int Cols>
>- tcu::Matrix<T, Rows, Cols> increment (const tcu::Matrix<T, Rows, Cols>& mat)
>- {
>--	tcu::Matrix<T, Rows, Cols> retVal;
>-+    tcu::Matrix<T, Rows, Cols> retVal;
>- 
>--	for (int r = 0; r < Rows; ++r)
>--		for (int c = 0; c < Cols; ++c)
>--			retVal(r,c) = mat(r, c) + 1.0f;
>-+    for (int r = 0; r < Rows; ++r)
>-+        for (int c = 0; c < Cols; ++c)
>-+            retVal(r,c) = mat(r, c) + 1.0f;
>- 
>--	return retVal;
>-+    return retVal;
>- }
>- 
>- template <typename T, int Rows, int Cols>
>- tcu::Matrix<T, Rows, Cols> decrement (const tcu::Matrix<T, Rows, Cols>& mat)
>- {
>--	tcu::Matrix<T, Rows, Cols> retVal;
>-+    tcu::Matrix<T, Rows, Cols> retVal;
>- 
>--	for (int r = 0; r < Rows; ++r)
>--		for (int c = 0; c < Cols; ++c)
>--			retVal(r,c) = mat(r, c) - 1.0f;
>-+    for (int r = 0; r < Rows; ++r)
>-+        for (int c = 0; c < Cols; ++c)
>-+            retVal(r,c) = mat(r, c) - 1.0f;
>- 
>--	return retVal;
>-+    return retVal;
>- }
>- 
>- // Evaluator template.
>-@@ -889,423 +889,423 @@ struct Evaluator;
>- template <int In0DataType, int In1DataType>
>- struct Evaluator<OP_ADD, In0DataType, In1DataType>
>- {
>--	static void evaluate (ShaderEvalContext& evalCtx, InputType in0Type, InputType in1Type)
>--	{
>--		typename TypeTraits<In0DataType>::Type	in0	= (in0Type == INPUTTYPE_DYNAMIC) ? getInputValue<INPUTTYPE_DYNAMIC, In0DataType>(evalCtx, 0)
>--																				     : getInputValue<INPUTTYPE_CONST,	In0DataType>(evalCtx, 0);
>--		typename TypeTraits<In1DataType>::Type	in1	= (in1Type == INPUTTYPE_DYNAMIC) ? getInputValue<INPUTTYPE_DYNAMIC, In1DataType>(evalCtx, 1)
>--																				     : getInputValue<INPUTTYPE_CONST,	In1DataType>(evalCtx, 1);
>--		evalCtx.color.xyz() = reduceToVec3(in0 + in1);
>--	}
>-+    static void evaluate (ShaderEvalContext& evalCtx, InputType in0Type, InputType in1Type)
>-+    {
>-+        typename TypeTraits<In0DataType>::Type  in0 = (in0Type == INPUTTYPE_DYNAMIC) ? getInputValue<INPUTTYPE_DYNAMIC, In0DataType>(evalCtx, 0)
>-+                                                                                     : getInputValue<INPUTTYPE_CONST,   In0DataType>(evalCtx, 0);
>-+        typename TypeTraits<In1DataType>::Type  in1 = (in1Type == INPUTTYPE_DYNAMIC) ? getInputValue<INPUTTYPE_DYNAMIC, In1DataType>(evalCtx, 1)
>-+                                                                                     : getInputValue<INPUTTYPE_CONST,   In1DataType>(evalCtx, 1);
>-+        evalCtx.color.xyz() = reduceToVec3(in0 + in1);
>-+    }
>- };
>- 
>- template <int In0DataType, int In1DataType>
>- struct Evaluator<OP_SUB, In0DataType, In1DataType>
>- {
>--	static void evaluate (ShaderEvalContext& evalCtx, InputType in0Type, InputType in1Type)
>--	{
>--		typename TypeTraits<In0DataType>::Type	in0	= (in0Type == INPUTTYPE_DYNAMIC) ? getInputValue<INPUTTYPE_DYNAMIC, In0DataType>(evalCtx, 0)
>--																				     : getInputValue<INPUTTYPE_CONST,	In0DataType>(evalCtx, 0);
>--		typename TypeTraits<In1DataType>::Type	in1	= (in1Type == INPUTTYPE_DYNAMIC) ? getInputValue<INPUTTYPE_DYNAMIC, In1DataType>(evalCtx, 1)
>--																				     : getInputValue<INPUTTYPE_CONST,	In1DataType>(evalCtx, 1);
>--		evalCtx.color.xyz() = reduceToVec3(in0 - in1);
>--	}
>-+    static void evaluate (ShaderEvalContext& evalCtx, InputType in0Type, InputType in1Type)
>-+    {
>-+        typename TypeTraits<In0DataType>::Type  in0 = (in0Type == INPUTTYPE_DYNAMIC) ? getInputValue<INPUTTYPE_DYNAMIC, In0DataType>(evalCtx, 0)
>-+                                                                                     : getInputValue<INPUTTYPE_CONST,   In0DataType>(evalCtx, 0);
>-+        typename TypeTraits<In1DataType>::Type  in1 = (in1Type == INPUTTYPE_DYNAMIC) ? getInputValue<INPUTTYPE_DYNAMIC, In1DataType>(evalCtx, 1)
>-+                                                                                     : getInputValue<INPUTTYPE_CONST,   In1DataType>(evalCtx, 1);
>-+        evalCtx.color.xyz() = reduceToVec3(in0 - in1);
>-+    }
>- };
>- 
>- template <int In0DataType, int In1DataType>
>- struct Evaluator<OP_MUL, In0DataType, In1DataType>
>- {
>--	static void evaluate (ShaderEvalContext& evalCtx, InputType in0Type, InputType in1Type)
>--	{
>--		typename TypeTraits<In0DataType>::Type	in0	= (in0Type == INPUTTYPE_DYNAMIC) ? getInputValue<INPUTTYPE_DYNAMIC, In0DataType>(evalCtx, 0)
>--																				     : getInputValue<INPUTTYPE_CONST,	In0DataType>(evalCtx, 0);
>--		typename TypeTraits<In1DataType>::Type	in1	= (in1Type == INPUTTYPE_DYNAMIC) ? getInputValue<INPUTTYPE_DYNAMIC, In1DataType>(evalCtx, 1)
>--																				     : getInputValue<INPUTTYPE_CONST,	In1DataType>(evalCtx, 1);
>--		evalCtx.color.xyz() = reduceToVec3(in0 * in1);
>--	}
>-+    static void evaluate (ShaderEvalContext& evalCtx, InputType in0Type, InputType in1Type)
>-+    {
>-+        typename TypeTraits<In0DataType>::Type  in0 = (in0Type == INPUTTYPE_DYNAMIC) ? getInputValue<INPUTTYPE_DYNAMIC, In0DataType>(evalCtx, 0)
>-+                                                                                     : getInputValue<INPUTTYPE_CONST,   In0DataType>(evalCtx, 0);
>-+        typename TypeTraits<In1DataType>::Type  in1 = (in1Type == INPUTTYPE_DYNAMIC) ? getInputValue<INPUTTYPE_DYNAMIC, In1DataType>(evalCtx, 1)
>-+                                                                                     : getInputValue<INPUTTYPE_CONST,   In1DataType>(evalCtx, 1);
>-+        evalCtx.color.xyz() = reduceToVec3(in0 * in1);
>-+    }
>- };
>- 
>- template <int In0DataType, int In1DataType>
>- struct Evaluator<OP_DIV, In0DataType, In1DataType>
>- {
>--	static void evaluate (ShaderEvalContext& evalCtx, InputType in0Type, InputType in1Type)
>--	{
>--		typename TypeTraits<In0DataType>::Type	in0	= (in0Type == INPUTTYPE_DYNAMIC) ? getInputValue<INPUTTYPE_DYNAMIC, In0DataType>(evalCtx, 0)
>--																				     : getInputValue<INPUTTYPE_CONST,	In0DataType>(evalCtx, 0);
>--		typename TypeTraits<In1DataType>::Type	in1	= (in1Type == INPUTTYPE_DYNAMIC) ? getInputValue<INPUTTYPE_DYNAMIC, In1DataType>(evalCtx, 1)
>--																				     : getInputValue<INPUTTYPE_CONST,	In1DataType>(evalCtx, 1);
>--		evalCtx.color.xyz() = reduceToVec3(in0 / in1);
>--	}
>-+    static void evaluate (ShaderEvalContext& evalCtx, InputType in0Type, InputType in1Type)
>-+    {
>-+        typename TypeTraits<In0DataType>::Type  in0 = (in0Type == INPUTTYPE_DYNAMIC) ? getInputValue<INPUTTYPE_DYNAMIC, In0DataType>(evalCtx, 0)
>-+                                                                                     : getInputValue<INPUTTYPE_CONST,   In0DataType>(evalCtx, 0);
>-+        typename TypeTraits<In1DataType>::Type  in1 = (in1Type == INPUTTYPE_DYNAMIC) ? getInputValue<INPUTTYPE_DYNAMIC, In1DataType>(evalCtx, 1)
>-+                                                                                     : getInputValue<INPUTTYPE_CONST,   In1DataType>(evalCtx, 1);
>-+        evalCtx.color.xyz() = reduceToVec3(in0 / in1);
>-+    }
>- };
>- 
>- template <int In0DataType, int In1DataType>
>- struct Evaluator<OP_COMP_MUL, In0DataType, In1DataType>
>- {
>--	static void evaluate (ShaderEvalContext& evalCtx, InputType in0Type, InputType in1Type)
>--	{
>--		typename TypeTraits<In0DataType>::Type	in0	= (in0Type == INPUTTYPE_DYNAMIC) ? getInputValue<INPUTTYPE_DYNAMIC, In0DataType>(evalCtx, 0)
>--																				     : getInputValue<INPUTTYPE_CONST,	In0DataType>(evalCtx, 0);
>--		typename TypeTraits<In1DataType>::Type	in1	= (in1Type == INPUTTYPE_DYNAMIC) ? getInputValue<INPUTTYPE_DYNAMIC, In1DataType>(evalCtx, 1)
>--																				     : getInputValue<INPUTTYPE_CONST,	In1DataType>(evalCtx, 1);
>--		evalCtx.color.xyz() = reduceToVec3(matrixCompMult(in0, in1));
>--	}
>-+    static void evaluate (ShaderEvalContext& evalCtx, InputType in0Type, InputType in1Type)
>-+    {
>-+        typename TypeTraits<In0DataType>::Type  in0 = (in0Type == INPUTTYPE_DYNAMIC) ? getInputValue<INPUTTYPE_DYNAMIC, In0DataType>(evalCtx, 0)
>-+                                                                                     : getInputValue<INPUTTYPE_CONST,   In0DataType>(evalCtx, 0);
>-+        typename TypeTraits<In1DataType>::Type  in1 = (in1Type == INPUTTYPE_DYNAMIC) ? getInputValue<INPUTTYPE_DYNAMIC, In1DataType>(evalCtx, 1)
>-+                                                                                     : getInputValue<INPUTTYPE_CONST,   In1DataType>(evalCtx, 1);
>-+        evalCtx.color.xyz() = reduceToVec3(matrixCompMult(in0, in1));
>-+    }
>- };
>- 
>- template <int In0DataType, int In1DataType>
>- struct Evaluator<OP_OUTER_PRODUCT, In0DataType, In1DataType>
>- {
>--	static void evaluate (ShaderEvalContext& evalCtx, InputType in0Type, InputType in1Type)
>--	{
>--		typename TypeTraits<In0DataType>::Type	in0	= (in0Type == INPUTTYPE_DYNAMIC) ? getInputValue<INPUTTYPE_DYNAMIC, In0DataType>(evalCtx, 0)
>--																				     : getInputValue<INPUTTYPE_CONST,	In0DataType>(evalCtx, 0);
>--		typename TypeTraits<In1DataType>::Type	in1	= (in1Type == INPUTTYPE_DYNAMIC) ? getInputValue<INPUTTYPE_DYNAMIC, In1DataType>(evalCtx, 1)
>--																				     : getInputValue<INPUTTYPE_CONST,	In1DataType>(evalCtx, 1);
>--		evalCtx.color.xyz() = reduceToVec3(outerProduct(in0, in1));
>--	}
>-+    static void evaluate (ShaderEvalContext& evalCtx, InputType in0Type, InputType in1Type)
>-+    {
>-+        typename TypeTraits<In0DataType>::Type  in0 = (in0Type == INPUTTYPE_DYNAMIC) ? getInputValue<INPUTTYPE_DYNAMIC, In0DataType>(evalCtx, 0)
>-+                                                                                     : getInputValue<INPUTTYPE_CONST,   In0DataType>(evalCtx, 0);
>-+        typename TypeTraits<In1DataType>::Type  in1 = (in1Type == INPUTTYPE_DYNAMIC) ? getInputValue<INPUTTYPE_DYNAMIC, In1DataType>(evalCtx, 1)
>-+                                                                                     : getInputValue<INPUTTYPE_CONST,   In1DataType>(evalCtx, 1);
>-+        evalCtx.color.xyz() = reduceToVec3(outerProduct(in0, in1));
>-+    }
>- };
>- 
>- template <int In0DataType, int In1DataType>
>- struct Evaluator<OP_TRANSPOSE, In0DataType, In1DataType>
>- {
>--	static void evaluate (ShaderEvalContext& evalCtx, InputType in0Type, InputType in1Type)
>--	{
>--		DE_UNREF(in1Type);
>--		typename TypeTraits<In0DataType>::Type	in0	= (in0Type == INPUTTYPE_DYNAMIC) ? getInputValue<INPUTTYPE_DYNAMIC, In0DataType>(evalCtx, 0)
>--																				     : getInputValue<INPUTTYPE_CONST,	In0DataType>(evalCtx, 0);
>--		evalCtx.color.xyz() = reduceToVec3(transpose(in0));
>--	}
>-+    static void evaluate (ShaderEvalContext& evalCtx, InputType in0Type, InputType in1Type)
>-+    {
>-+        DE_UNREF(in1Type);
>-+        typename TypeTraits<In0DataType>::Type  in0 = (in0Type == INPUTTYPE_DYNAMIC) ? getInputValue<INPUTTYPE_DYNAMIC, In0DataType>(evalCtx, 0)
>-+                                                                                     : getInputValue<INPUTTYPE_CONST,   In0DataType>(evalCtx, 0);
>-+        evalCtx.color.xyz() = reduceToVec3(transpose(in0));
>-+    }
>- };
>- 
>- template <int In0DataType, int In1DataType>
>- struct Evaluator<OP_INVERSE, In0DataType, In1DataType>
>- {
>--	static void evaluate (ShaderEvalContext& evalCtx, InputType in0Type, InputType in1Type)
>--	{
>--		DE_UNREF(in1Type);
>--		typename TypeTraits<In0DataType>::Type	in0	= (in0Type == INPUTTYPE_DYNAMIC) ? getInputValue<INPUTTYPE_DYNAMIC, In0DataType>(evalCtx, 0)
>--																				     : getInputValue<INPUTTYPE_CONST,	In0DataType>(evalCtx, 0);
>--		evalCtx.color.xyz() = reduceToVec3(inverse(in0));
>--	}
>-+    static void evaluate (ShaderEvalContext& evalCtx, InputType in0Type, InputType in1Type)
>-+    {
>-+        DE_UNREF(in1Type);
>-+        typename TypeTraits<In0DataType>::Type  in0 = (in0Type == INPUTTYPE_DYNAMIC) ? getInputValue<INPUTTYPE_DYNAMIC, In0DataType>(evalCtx, 0)
>-+                                                                                     : getInputValue<INPUTTYPE_CONST,   In0DataType>(evalCtx, 0);
>-+        evalCtx.color.xyz() = reduceToVec3(inverse(in0));
>-+    }
>- };
>- 
>- template <int In0DataType, int In1DataType>
>- struct Evaluator<OP_DETERMINANT, In0DataType, In1DataType>
>- {
>--	static void evaluate (ShaderEvalContext& evalCtx, InputType in0Type, InputType in1Type)
>--	{
>--		DE_UNREF(in1Type);
>--		typename TypeTraits<In0DataType>::Type	in0	= (in0Type == INPUTTYPE_DYNAMIC) ? getInputValue<INPUTTYPE_DYNAMIC, In0DataType>(evalCtx, 0)
>--																				     : getInputValue<INPUTTYPE_CONST,	In0DataType>(evalCtx, 0);
>--		evalCtx.color.xyz() = Vec3(determinant(in0));
>--	}
>-+    static void evaluate (ShaderEvalContext& evalCtx, InputType in0Type, InputType in1Type)
>-+    {
>-+        DE_UNREF(in1Type);
>-+        typename TypeTraits<In0DataType>::Type  in0 = (in0Type == INPUTTYPE_DYNAMIC) ? getInputValue<INPUTTYPE_DYNAMIC, In0DataType>(evalCtx, 0)
>-+                                                                                     : getInputValue<INPUTTYPE_CONST,   In0DataType>(evalCtx, 0);
>-+        evalCtx.color.xyz() = Vec3(determinant(in0));
>-+    }
>- };
>- 
>- template <int In0DataType, int In1DataType>
>- struct Evaluator<OP_UNARY_PLUS, In0DataType, In1DataType>
>- {
>--	static void evaluate (ShaderEvalContext& evalCtx, InputType in0Type, InputType in1Type)
>--	{
>--		DE_UNREF(in1Type);
>--		typename TypeTraits<In0DataType>::Type	in0	= (in0Type == INPUTTYPE_DYNAMIC) ? getInputValue<INPUTTYPE_DYNAMIC, In0DataType>(evalCtx, 0)
>--																				     : getInputValue<INPUTTYPE_CONST,	In0DataType>(evalCtx, 0);
>--		evalCtx.color.xyz() = reduceToVec3(in0);
>--	}
>-+    static void evaluate (ShaderEvalContext& evalCtx, InputType in0Type, InputType in1Type)
>-+    {
>-+        DE_UNREF(in1Type);
>-+        typename TypeTraits<In0DataType>::Type  in0 = (in0Type == INPUTTYPE_DYNAMIC) ? getInputValue<INPUTTYPE_DYNAMIC, In0DataType>(evalCtx, 0)
>-+                                                                                     : getInputValue<INPUTTYPE_CONST,   In0DataType>(evalCtx, 0);
>-+        evalCtx.color.xyz() = reduceToVec3(in0);
>-+    }
>- };
>- 
>- template <int In0DataType, int In1DataType>
>- struct Evaluator<OP_NEGATION, In0DataType, In1DataType>
>- {
>--	static void evaluate (ShaderEvalContext& evalCtx, InputType in0Type, InputType in1Type)
>--	{
>--		DE_UNREF(in1Type);
>--		typename TypeTraits<In0DataType>::Type	in0	= (in0Type == INPUTTYPE_DYNAMIC) ? getInputValue<INPUTTYPE_DYNAMIC, In0DataType>(evalCtx, 0)
>--																				     : getInputValue<INPUTTYPE_CONST,	In0DataType>(evalCtx, 0);
>--		evalCtx.color.xyz() = reduceToVec3(negate(in0));
>--	}
>-+    static void evaluate (ShaderEvalContext& evalCtx, InputType in0Type, InputType in1Type)
>-+    {
>-+        DE_UNREF(in1Type);
>-+        typename TypeTraits<In0DataType>::Type  in0 = (in0Type == INPUTTYPE_DYNAMIC) ? getInputValue<INPUTTYPE_DYNAMIC, In0DataType>(evalCtx, 0)
>-+                                                                                     : getInputValue<INPUTTYPE_CONST,   In0DataType>(evalCtx, 0);
>-+        evalCtx.color.xyz() = reduceToVec3(negate(in0));
>-+    }
>- };
>- 
>- template <int In0DataType, int In1DataType>
>- struct Evaluator<OP_PRE_INCREMENT, In0DataType, In1DataType>
>- {
>--	static void evaluate (ShaderEvalContext& evalCtx, InputType in0Type, InputType in1Type)
>--	{
>--		DE_UNREF(in1Type);
>--		typename TypeTraits<In0DataType>::Type	in0	= (in0Type == INPUTTYPE_DYNAMIC) ? getInputValue<INPUTTYPE_DYNAMIC, In0DataType>(evalCtx, 0)
>--																				     : getInputValue<INPUTTYPE_CONST,	In0DataType>(evalCtx, 0);
>-+    static void evaluate (ShaderEvalContext& evalCtx, InputType in0Type, InputType in1Type)
>-+    {
>-+        DE_UNREF(in1Type);
>-+        typename TypeTraits<In0DataType>::Type  in0 = (in0Type == INPUTTYPE_DYNAMIC) ? getInputValue<INPUTTYPE_DYNAMIC, In0DataType>(evalCtx, 0)
>-+                                                                                     : getInputValue<INPUTTYPE_CONST,   In0DataType>(evalCtx, 0);
>- 
>--		// modifying reduction: sum modified value too
>--		evalCtx.color.xyz() = reduceToVec3(increment(in0)) + reduceToVec3(increment(in0));
>--	}
>-+        // modifying reduction: sum modified value too
>-+        evalCtx.color.xyz() = reduceToVec3(increment(in0)) + reduceToVec3(increment(in0));
>-+    }
>- };
>- 
>- template <int In0DataType, int In1DataType>
>- struct Evaluator<OP_PRE_DECREMENT, In0DataType, In1DataType>
>- {
>--	static void evaluate (ShaderEvalContext& evalCtx, InputType in0Type, InputType in1Type)
>--	{
>--		DE_UNREF(in1Type);
>--		typename TypeTraits<In0DataType>::Type	in0	= (in0Type == INPUTTYPE_DYNAMIC) ? getInputValue<INPUTTYPE_DYNAMIC, In0DataType>(evalCtx, 0)
>--																				     : getInputValue<INPUTTYPE_CONST,	In0DataType>(evalCtx, 0);
>-+    static void evaluate (ShaderEvalContext& evalCtx, InputType in0Type, InputType in1Type)
>-+    {
>-+        DE_UNREF(in1Type);
>-+        typename TypeTraits<In0DataType>::Type  in0 = (in0Type == INPUTTYPE_DYNAMIC) ? getInputValue<INPUTTYPE_DYNAMIC, In0DataType>(evalCtx, 0)
>-+                                                                                     : getInputValue<INPUTTYPE_CONST,   In0DataType>(evalCtx, 0);
>- 
>--		// modifying reduction: sum modified value too
>--		evalCtx.color.xyz() = reduceToVec3(decrement(in0)) + reduceToVec3(decrement(in0));
>--	}
>-+        // modifying reduction: sum modified value too
>-+        evalCtx.color.xyz() = reduceToVec3(decrement(in0)) + reduceToVec3(decrement(in0));
>-+    }
>- };
>- 
>- template <int In0DataType, int In1DataType>
>- struct Evaluator<OP_POST_INCREMENT, In0DataType, In1DataType>
>- {
>--	static void evaluate (ShaderEvalContext& evalCtx, InputType in0Type, InputType in1Type)
>--	{
>--		DE_UNREF(in1Type);
>--		typename TypeTraits<In0DataType>::Type	in0	= (in0Type == INPUTTYPE_DYNAMIC) ? getInputValue<INPUTTYPE_DYNAMIC, In0DataType>(evalCtx, 0)
>--																				     : getInputValue<INPUTTYPE_CONST,	In0DataType>(evalCtx, 0);
>-+    static void evaluate (ShaderEvalContext& evalCtx, InputType in0Type, InputType in1Type)
>-+    {
>-+        DE_UNREF(in1Type);
>-+        typename TypeTraits<In0DataType>::Type  in0 = (in0Type == INPUTTYPE_DYNAMIC) ? getInputValue<INPUTTYPE_DYNAMIC, In0DataType>(evalCtx, 0)
>-+                                                                                     : getInputValue<INPUTTYPE_CONST,   In0DataType>(evalCtx, 0);
>- 
>--		// modifying reduction: sum modified value too
>--		evalCtx.color.xyz() = reduceToVec3(in0) + reduceToVec3(increment(in0));
>--	}
>-+        // modifying reduction: sum modified value too
>-+        evalCtx.color.xyz() = reduceToVec3(in0) + reduceToVec3(increment(in0));
>-+    }
>- };
>- 
>- template <int In0DataType, int In1DataType>
>- struct Evaluator<OP_POST_DECREMENT, In0DataType, In1DataType>
>- {
>--	static void evaluate (ShaderEvalContext& evalCtx, InputType in0Type, InputType in1Type)
>--	{
>--		DE_UNREF(in1Type);
>--		typename TypeTraits<In0DataType>::Type	in0	= (in0Type == INPUTTYPE_DYNAMIC) ? getInputValue<INPUTTYPE_DYNAMIC, In0DataType>(evalCtx, 0)
>--																				     : getInputValue<INPUTTYPE_CONST,	In0DataType>(evalCtx, 0);
>-+    static void evaluate (ShaderEvalContext& evalCtx, InputType in0Type, InputType in1Type)
>-+    {
>-+        DE_UNREF(in1Type);
>-+        typename TypeTraits<In0DataType>::Type  in0 = (in0Type == INPUTTYPE_DYNAMIC) ? getInputValue<INPUTTYPE_DYNAMIC, In0DataType>(evalCtx, 0)
>-+                                                                                     : getInputValue<INPUTTYPE_CONST,   In0DataType>(evalCtx, 0);
>- 
>--		// modifying reduction: sum modified value too
>--		evalCtx.color.xyz() = reduceToVec3(in0) + reduceToVec3(decrement(in0));
>--	}
>-+        // modifying reduction: sum modified value too
>-+        evalCtx.color.xyz() = reduceToVec3(in0) + reduceToVec3(decrement(in0));
>-+    }
>- };
>- 
>- template <int In0DataType, int In1DataType>
>- struct Evaluator<OP_ADD_INTO, In0DataType, In1DataType>
>- {
>--	static void evaluate (ShaderEvalContext& evalCtx, InputType in0Type, InputType in1Type)
>--	{
>--		typename TypeTraits<In0DataType>::Type	in0	= (in0Type == INPUTTYPE_DYNAMIC) ? getInputValue<INPUTTYPE_DYNAMIC, In0DataType>(evalCtx, 0)
>--																				     : getInputValue<INPUTTYPE_CONST,	In0DataType>(evalCtx, 0);
>--		typename TypeTraits<In1DataType>::Type	in1	= (in1Type == INPUTTYPE_DYNAMIC) ? getInputValue<INPUTTYPE_DYNAMIC, In1DataType>(evalCtx, 1)
>--																				     : getInputValue<INPUTTYPE_CONST,	In1DataType>(evalCtx, 1);
>--		evalCtx.color.xyz() = reduceToVec3(in0 + in1);
>--	}
>-+    static void evaluate (ShaderEvalContext& evalCtx, InputType in0Type, InputType in1Type)
>-+    {
>-+        typename TypeTraits<In0DataType>::Type  in0 = (in0Type == INPUTTYPE_DYNAMIC) ? getInputValue<INPUTTYPE_DYNAMIC, In0DataType>(evalCtx, 0)
>-+                                                                                     : getInputValue<INPUTTYPE_CONST,   In0DataType>(evalCtx, 0);
>-+        typename TypeTraits<In1DataType>::Type  in1 = (in1Type == INPUTTYPE_DYNAMIC) ? getInputValue<INPUTTYPE_DYNAMIC, In1DataType>(evalCtx, 1)
>-+                                                                                     : getInputValue<INPUTTYPE_CONST,   In1DataType>(evalCtx, 1);
>-+        evalCtx.color.xyz() = reduceToVec3(in0 + in1);
>-+    }
>- };
>- 
>- template <int In0DataType, int In1DataType>
>- struct Evaluator<OP_SUBTRACT_FROM, In0DataType, In1DataType>
>- {
>--	static void evaluate (ShaderEvalContext& evalCtx, InputType in0Type, InputType in1Type)
>--	{
>--		typename TypeTraits<In0DataType>::Type	in0	= (in0Type == INPUTTYPE_DYNAMIC) ? getInputValue<INPUTTYPE_DYNAMIC, In0DataType>(evalCtx, 0)
>--																				     : getInputValue<INPUTTYPE_CONST,	In0DataType>(evalCtx, 0);
>--		typename TypeTraits<In1DataType>::Type	in1	= (in1Type == INPUTTYPE_DYNAMIC) ? getInputValue<INPUTTYPE_DYNAMIC, In1DataType>(evalCtx, 1)
>--																				     : getInputValue<INPUTTYPE_CONST,	In1DataType>(evalCtx, 1);
>--		evalCtx.color.xyz() = reduceToVec3(in0 - in1);
>--	}
>-+    static void evaluate (ShaderEvalContext& evalCtx, InputType in0Type, InputType in1Type)
>-+    {
>-+        typename TypeTraits<In0DataType>::Type  in0 = (in0Type == INPUTTYPE_DYNAMIC) ? getInputValue<INPUTTYPE_DYNAMIC, In0DataType>(evalCtx, 0)
>-+                                                                                     : getInputValue<INPUTTYPE_CONST,   In0DataType>(evalCtx, 0);
>-+        typename TypeTraits<In1DataType>::Type  in1 = (in1Type == INPUTTYPE_DYNAMIC) ? getInputValue<INPUTTYPE_DYNAMIC, In1DataType>(evalCtx, 1)
>-+                                                                                     : getInputValue<INPUTTYPE_CONST,   In1DataType>(evalCtx, 1);
>-+        evalCtx.color.xyz() = reduceToVec3(in0 - in1);
>-+    }
>- };
>- 
>- template <int In0DataType, int In1DataType>
>- struct Evaluator<OP_MULTIPLY_INTO, In0DataType, In1DataType>
>- {
>--	static void evaluate (ShaderEvalContext& evalCtx, InputType in0Type, InputType in1Type)
>--	{
>--		typename TypeTraits<In0DataType>::Type	in0	= (in0Type == INPUTTYPE_DYNAMIC) ? getInputValue<INPUTTYPE_DYNAMIC, In0DataType>(evalCtx, 0)
>--																				     : getInputValue<INPUTTYPE_CONST,	In0DataType>(evalCtx, 0);
>--		typename TypeTraits<In1DataType>::Type	in1	= (in1Type == INPUTTYPE_DYNAMIC) ? getInputValue<INPUTTYPE_DYNAMIC, In1DataType>(evalCtx, 1)
>--																				     : getInputValue<INPUTTYPE_CONST,	In1DataType>(evalCtx, 1);
>--		evalCtx.color.xyz() = reduceToVec3(in0 * in1);
>--	}
>-+    static void evaluate (ShaderEvalContext& evalCtx, InputType in0Type, InputType in1Type)
>-+    {
>-+        typename TypeTraits<In0DataType>::Type  in0 = (in0Type == INPUTTYPE_DYNAMIC) ? getInputValue<INPUTTYPE_DYNAMIC, In0DataType>(evalCtx, 0)
>-+                                                                                     : getInputValue<INPUTTYPE_CONST,   In0DataType>(evalCtx, 0);
>-+        typename TypeTraits<In1DataType>::Type  in1 = (in1Type == INPUTTYPE_DYNAMIC) ? getInputValue<INPUTTYPE_DYNAMIC, In1DataType>(evalCtx, 1)
>-+                                                                                     : getInputValue<INPUTTYPE_CONST,   In1DataType>(evalCtx, 1);
>-+        evalCtx.color.xyz() = reduceToVec3(in0 * in1);
>-+    }
>- };
>- 
>- template <int In0DataType, int In1DataType>
>- struct Evaluator<OP_DIVIDE_INTO, In0DataType, In1DataType>
>- {
>--	static void evaluate (ShaderEvalContext& evalCtx, InputType in0Type, InputType in1Type)
>--	{
>--		typename TypeTraits<In0DataType>::Type	in0	= (in0Type == INPUTTYPE_DYNAMIC) ? getInputValue<INPUTTYPE_DYNAMIC, In0DataType>(evalCtx, 0)
>--																				     : getInputValue<INPUTTYPE_CONST,	In0DataType>(evalCtx, 0);
>--		typename TypeTraits<In1DataType>::Type	in1	= (in1Type == INPUTTYPE_DYNAMIC) ? getInputValue<INPUTTYPE_DYNAMIC, In1DataType>(evalCtx, 1)
>--																				     : getInputValue<INPUTTYPE_CONST,	In1DataType>(evalCtx, 1);
>--		evalCtx.color.xyz() = reduceToVec3(in0 / in1);
>--	}
>-+    static void evaluate (ShaderEvalContext& evalCtx, InputType in0Type, InputType in1Type)
>-+    {
>-+        typename TypeTraits<In0DataType>::Type  in0 = (in0Type == INPUTTYPE_DYNAMIC) ? getInputValue<INPUTTYPE_DYNAMIC, In0DataType>(evalCtx, 0)
>-+                                                                                     : getInputValue<INPUTTYPE_CONST,   In0DataType>(evalCtx, 0);
>-+        typename TypeTraits<In1DataType>::Type  in1 = (in1Type == INPUTTYPE_DYNAMIC) ? getInputValue<INPUTTYPE_DYNAMIC, In1DataType>(evalCtx, 1)
>-+                                                                                     : getInputValue<INPUTTYPE_CONST,   In1DataType>(evalCtx, 1);
>-+        evalCtx.color.xyz() = reduceToVec3(in0 / in1);
>-+    }
>- };
>- 
>- MatrixShaderEvalFunc getEvalFunc (const ShaderInput& in0, const ShaderInput& in1, MatrixOp op)
>- {
>--	// Evaluator is selected based on op and input data types.
>--	// For efficient lookup the types and op enums are packed together to form a 19-bit key:
>--	// [18..14 OP] [13..7 TYPE0] [6..0 TYPE1]
>--
>--	DE_STATIC_ASSERT(TYPE_LAST	<= (1<<7));
>--	DE_STATIC_ASSERT(OP_LAST	<= (1<<5));
>--
>--#define PACK_EVAL_CASE(OP, IN0DATATYPE, IN1DATATYPE)	(((OP) << 14) | ((IN0DATATYPE) << 7) | (IN1DATATYPE))
>--
>--#define MAKE_EVAL_CASE(OP, IN0DATATYPE, IN1DATATYPE)	\
>--	case PACK_EVAL_CASE(OP, IN0DATATYPE, IN1DATATYPE):	\
>--		return Evaluator<OP, IN0DATATYPE, IN1DATATYPE>::evaluate
>--
>--#define MAKE_SCALAR_OPS(IN0DATATYPE, IN1DATATYPE)		\
>--	MAKE_EVAL_CASE(OP_ADD, IN0DATATYPE, IN1DATATYPE);	\
>--	MAKE_EVAL_CASE(OP_SUB, IN0DATATYPE, IN1DATATYPE);	\
>--	MAKE_EVAL_CASE(OP_MUL, IN0DATATYPE, IN1DATATYPE);	\
>--	MAKE_EVAL_CASE(OP_DIV, IN0DATATYPE, IN1DATATYPE)
>--
>--#define MAKE_CWISE_OPS(IN0DATATYPE, IN1DATATYPE)			\
>--	MAKE_EVAL_CASE(OP_ADD,		IN0DATATYPE, IN1DATATYPE);	\
>--	MAKE_EVAL_CASE(OP_SUB,		IN0DATATYPE, IN1DATATYPE);	\
>--	MAKE_EVAL_CASE(OP_DIV,		IN0DATATYPE, IN1DATATYPE);	\
>--	MAKE_EVAL_CASE(OP_COMP_MUL,	IN0DATATYPE, IN1DATATYPE)
>--
>--#define MAKE_MUL_OP(IN0DATATYPE, IN1DATATYPE)			\
>--	MAKE_EVAL_CASE(OP_MUL, IN0DATATYPE, IN1DATATYPE)
>--
>--#define MAKE_VECVEC_OP(IN0DATATYPE, IN1DATATYPE)			\
>--	MAKE_EVAL_CASE(OP_OUTER_PRODUCT, IN0DATATYPE, IN1DATATYPE)
>--
>--#define MAKE_UNARY_OP(IN0DATATYPE)								\
>--	MAKE_EVAL_CASE(OP_TRANSPOSE,		IN0DATATYPE, TYPE_LAST);	\
>--	MAKE_EVAL_CASE(OP_UNARY_PLUS,		IN0DATATYPE, TYPE_LAST);	\
>--	MAKE_EVAL_CASE(OP_NEGATION,			IN0DATATYPE, TYPE_LAST);	\
>--	MAKE_EVAL_CASE(OP_PRE_INCREMENT,	IN0DATATYPE, TYPE_LAST);	\
>--	MAKE_EVAL_CASE(OP_PRE_DECREMENT,	IN0DATATYPE, TYPE_LAST);	\
>--	MAKE_EVAL_CASE(OP_POST_INCREMENT,	IN0DATATYPE, TYPE_LAST);	\
>--	MAKE_EVAL_CASE(OP_POST_DECREMENT,	IN0DATATYPE, TYPE_LAST)
>--
>--#define MAKE_UNARY_SYMMETRIC_OP(IN0DATATYPE)					\
>--	MAKE_UNARY_OP(IN0DATATYPE);									\
>--	MAKE_EVAL_CASE(OP_DETERMINANT,	IN0DATATYPE, TYPE_LAST);	\
>--	MAKE_EVAL_CASE(OP_INVERSE,		IN0DATATYPE, TYPE_LAST)
>--
>--#define MAKE_ASSIGNMENT_OP(IN0DATATYPE)								\
>--	MAKE_EVAL_CASE(OP_ADD_INTO,			IN0DATATYPE, IN0DATATYPE);	\
>--	MAKE_EVAL_CASE(OP_SUBTRACT_FROM,	IN0DATATYPE, IN0DATATYPE);	\
>--	MAKE_EVAL_CASE(OP_DIVIDE_INTO,		IN0DATATYPE, IN0DATATYPE)
>--
>--#define MAKE_ASSIGNMENT_SYMMETRIC_OP(IN0DATATYPE)					\
>--	MAKE_ASSIGNMENT_OP(IN0DATATYPE);								\
>--	MAKE_EVAL_CASE(OP_MULTIPLY_INTO,	IN0DATATYPE, IN0DATATYPE)
>--
>--	switch (PACK_EVAL_CASE(op, in0.dataType, in1.dataType))
>--	{
>--		// Matrix-scalar.
>--		MAKE_SCALAR_OPS(TYPE_FLOAT_MAT2,	TYPE_FLOAT);
>--		MAKE_SCALAR_OPS(TYPE_FLOAT_MAT2X3,	TYPE_FLOAT);
>--		MAKE_SCALAR_OPS(TYPE_FLOAT_MAT2X4,	TYPE_FLOAT);
>--		MAKE_SCALAR_OPS(TYPE_FLOAT_MAT3X2,	TYPE_FLOAT);
>--		MAKE_SCALAR_OPS(TYPE_FLOAT_MAT3,	TYPE_FLOAT);
>--		MAKE_SCALAR_OPS(TYPE_FLOAT_MAT3X4,	TYPE_FLOAT);
>--		MAKE_SCALAR_OPS(TYPE_FLOAT_MAT4X2,	TYPE_FLOAT);
>--		MAKE_SCALAR_OPS(TYPE_FLOAT_MAT4X3,	TYPE_FLOAT);
>--		MAKE_SCALAR_OPS(TYPE_FLOAT_MAT4,	TYPE_FLOAT);
>--
>--		// Matrix-vector.
>--		MAKE_MUL_OP(TYPE_FLOAT_MAT2,	TYPE_FLOAT_VEC2);
>--		MAKE_MUL_OP(TYPE_FLOAT_MAT2X3,	TYPE_FLOAT_VEC2);
>--		MAKE_MUL_OP(TYPE_FLOAT_MAT2X4,	TYPE_FLOAT_VEC2);
>--		MAKE_MUL_OP(TYPE_FLOAT_MAT3X2,	TYPE_FLOAT_VEC3);
>--		MAKE_MUL_OP(TYPE_FLOAT_MAT3,	TYPE_FLOAT_VEC3);
>--		MAKE_MUL_OP(TYPE_FLOAT_MAT3X4,	TYPE_FLOAT_VEC3);
>--		MAKE_MUL_OP(TYPE_FLOAT_MAT4X2,	TYPE_FLOAT_VEC4);
>--		MAKE_MUL_OP(TYPE_FLOAT_MAT4X3,	TYPE_FLOAT_VEC4);
>--		MAKE_MUL_OP(TYPE_FLOAT_MAT4,	TYPE_FLOAT_VEC4);
>--
>--		// Vector-matrix.
>--		MAKE_MUL_OP(TYPE_FLOAT_VEC2, TYPE_FLOAT_MAT2);
>--		MAKE_MUL_OP(TYPE_FLOAT_VEC3, TYPE_FLOAT_MAT2X3);
>--		MAKE_MUL_OP(TYPE_FLOAT_VEC4, TYPE_FLOAT_MAT2X4);
>--		MAKE_MUL_OP(TYPE_FLOAT_VEC2, TYPE_FLOAT_MAT3X2);
>--		MAKE_MUL_OP(TYPE_FLOAT_VEC3, TYPE_FLOAT_MAT3);
>--		MAKE_MUL_OP(TYPE_FLOAT_VEC4, TYPE_FLOAT_MAT3X4);
>--		MAKE_MUL_OP(TYPE_FLOAT_VEC2, TYPE_FLOAT_MAT4X2);
>--		MAKE_MUL_OP(TYPE_FLOAT_VEC3, TYPE_FLOAT_MAT4X3);
>--		MAKE_MUL_OP(TYPE_FLOAT_VEC4, TYPE_FLOAT_MAT4);
>--
>--		// Matrix-matrix.
>--		MAKE_CWISE_OPS(TYPE_FLOAT_MAT2,		TYPE_FLOAT_MAT2);
>--		MAKE_MUL_OP(TYPE_FLOAT_MAT2,		TYPE_FLOAT_MAT2);
>--		MAKE_MUL_OP(TYPE_FLOAT_MAT2,		TYPE_FLOAT_MAT3X2);
>--		MAKE_MUL_OP(TYPE_FLOAT_MAT2,		TYPE_FLOAT_MAT4X2);
>--
>--		MAKE_CWISE_OPS(TYPE_FLOAT_MAT2X3,	TYPE_FLOAT_MAT2X3);
>--		MAKE_MUL_OP(TYPE_FLOAT_MAT2X3,		TYPE_FLOAT_MAT2);
>--		MAKE_MUL_OP(TYPE_FLOAT_MAT2X3,		TYPE_FLOAT_MAT3X2);
>--		MAKE_MUL_OP(TYPE_FLOAT_MAT2X3,		TYPE_FLOAT_MAT4X2);
>--
>--		MAKE_CWISE_OPS(TYPE_FLOAT_MAT2X4,	TYPE_FLOAT_MAT2X4);
>--		MAKE_MUL_OP(TYPE_FLOAT_MAT2X4,		TYPE_FLOAT_MAT2);
>--		MAKE_MUL_OP(TYPE_FLOAT_MAT2X4,		TYPE_FLOAT_MAT3X2);
>--		MAKE_MUL_OP(TYPE_FLOAT_MAT2X4,		TYPE_FLOAT_MAT4X2);
>--
>--		MAKE_CWISE_OPS(TYPE_FLOAT_MAT3X2,	TYPE_FLOAT_MAT3X2);
>--		MAKE_MUL_OP(TYPE_FLOAT_MAT3X2,		TYPE_FLOAT_MAT2X3);
>--		MAKE_MUL_OP(TYPE_FLOAT_MAT3X2,		TYPE_FLOAT_MAT3);
>--		MAKE_MUL_OP(TYPE_FLOAT_MAT3X2,		TYPE_FLOAT_MAT4X3);
>--
>--		MAKE_CWISE_OPS(TYPE_FLOAT_MAT3,		TYPE_FLOAT_MAT3);
>--		MAKE_MUL_OP(TYPE_FLOAT_MAT3,		TYPE_FLOAT_MAT2X3);
>--		MAKE_MUL_OP(TYPE_FLOAT_MAT3,		TYPE_FLOAT_MAT3);
>--		MAKE_MUL_OP(TYPE_FLOAT_MAT3,		TYPE_FLOAT_MAT4X3);
>--
>--		MAKE_CWISE_OPS(TYPE_FLOAT_MAT3X4,	TYPE_FLOAT_MAT3X4);
>--		MAKE_MUL_OP(TYPE_FLOAT_MAT3X4,		TYPE_FLOAT_MAT2X3);
>--		MAKE_MUL_OP(TYPE_FLOAT_MAT3X4,		TYPE_FLOAT_MAT3);
>--		MAKE_MUL_OP(TYPE_FLOAT_MAT3X4,		TYPE_FLOAT_MAT4X3);
>--
>--		MAKE_CWISE_OPS(TYPE_FLOAT_MAT4X2,	TYPE_FLOAT_MAT4X2);
>--		MAKE_MUL_OP(TYPE_FLOAT_MAT4X2,		TYPE_FLOAT_MAT2X4);
>--		MAKE_MUL_OP(TYPE_FLOAT_MAT4X2,		TYPE_FLOAT_MAT3X4);
>--		MAKE_MUL_OP(TYPE_FLOAT_MAT4X2,		TYPE_FLOAT_MAT4);
>--
>--		MAKE_CWISE_OPS(TYPE_FLOAT_MAT4X3,	TYPE_FLOAT_MAT4X3);
>--		MAKE_MUL_OP(TYPE_FLOAT_MAT4X3,		TYPE_FLOAT_MAT2X4);
>--		MAKE_MUL_OP(TYPE_FLOAT_MAT4X3,		TYPE_FLOAT_MAT3X4);
>--		MAKE_MUL_OP(TYPE_FLOAT_MAT4X3,		TYPE_FLOAT_MAT4);
>--
>--		MAKE_CWISE_OPS(TYPE_FLOAT_MAT4,		TYPE_FLOAT_MAT4);
>--		MAKE_MUL_OP(TYPE_FLOAT_MAT4,		TYPE_FLOAT_MAT2X4);
>--		MAKE_MUL_OP(TYPE_FLOAT_MAT4,		TYPE_FLOAT_MAT3X4);
>--		MAKE_MUL_OP(TYPE_FLOAT_MAT4,		TYPE_FLOAT_MAT4);
>--
>--		// Vector-vector.
>--		MAKE_VECVEC_OP(TYPE_FLOAT_VEC2,		TYPE_FLOAT_VEC2);
>--		MAKE_VECVEC_OP(TYPE_FLOAT_VEC2,		TYPE_FLOAT_VEC3);
>--		MAKE_VECVEC_OP(TYPE_FLOAT_VEC2,		TYPE_FLOAT_VEC4);
>--		MAKE_VECVEC_OP(TYPE_FLOAT_VEC3,		TYPE_FLOAT_VEC2);
>--		MAKE_VECVEC_OP(TYPE_FLOAT_VEC3,		TYPE_FLOAT_VEC3);
>--		MAKE_VECVEC_OP(TYPE_FLOAT_VEC3,		TYPE_FLOAT_VEC4);
>--		MAKE_VECVEC_OP(TYPE_FLOAT_VEC4,		TYPE_FLOAT_VEC2);
>--		MAKE_VECVEC_OP(TYPE_FLOAT_VEC4,		TYPE_FLOAT_VEC3);
>--		MAKE_VECVEC_OP(TYPE_FLOAT_VEC4,		TYPE_FLOAT_VEC4);
>--
>--		// Unary Matrix.
>--		MAKE_UNARY_SYMMETRIC_OP(TYPE_FLOAT_MAT2);
>--		MAKE_UNARY_OP(TYPE_FLOAT_MAT2X3);
>--		MAKE_UNARY_OP(TYPE_FLOAT_MAT2X4);
>--		MAKE_UNARY_OP(TYPE_FLOAT_MAT3X2);
>--		MAKE_UNARY_SYMMETRIC_OP(TYPE_FLOAT_MAT3);
>--		MAKE_UNARY_OP(TYPE_FLOAT_MAT3X4);
>--		MAKE_UNARY_OP(TYPE_FLOAT_MAT4X2);
>--		MAKE_UNARY_OP(TYPE_FLOAT_MAT4X3);
>--		MAKE_UNARY_SYMMETRIC_OP(TYPE_FLOAT_MAT4);
>--
>--		// Assignments
>--		MAKE_ASSIGNMENT_SYMMETRIC_OP(TYPE_FLOAT_MAT2);
>--		MAKE_ASSIGNMENT_OP(TYPE_FLOAT_MAT2X3);
>--		MAKE_ASSIGNMENT_OP(TYPE_FLOAT_MAT2X4);
>--		MAKE_ASSIGNMENT_OP(TYPE_FLOAT_MAT3X2);
>--		MAKE_ASSIGNMENT_SYMMETRIC_OP(TYPE_FLOAT_MAT3);
>--		MAKE_ASSIGNMENT_OP(TYPE_FLOAT_MAT3X4);
>--		MAKE_ASSIGNMENT_OP(TYPE_FLOAT_MAT4X2);
>--		MAKE_ASSIGNMENT_OP(TYPE_FLOAT_MAT4X3);
>--		MAKE_ASSIGNMENT_SYMMETRIC_OP(TYPE_FLOAT_MAT4);
>--
>--		default:
>--			DE_ASSERT(DE_FALSE);
>--			return DE_NULL;
>--	}
>-+    // Evaluator is selected based on op and input data types.
>-+    // For efficient lookup the types and op enums are packed together to form a 19-bit key:
>-+    // [18..14 OP] [13..7 TYPE0] [6..0 TYPE1]
>-+
>-+    DE_STATIC_ASSERT(TYPE_LAST  <= (1<<7));
>-+    DE_STATIC_ASSERT(OP_LAST    <= (1<<5));
>-+
>-+#define PACK_EVAL_CASE(OP, IN0DATATYPE, IN1DATATYPE)    (((OP) << 14) | ((IN0DATATYPE) << 7) | (IN1DATATYPE))
>-+
>-+#define MAKE_EVAL_CASE(OP, IN0DATATYPE, IN1DATATYPE)    \
>-+    case PACK_EVAL_CASE(OP, IN0DATATYPE, IN1DATATYPE):  \
>-+        return Evaluator<OP, IN0DATATYPE, IN1DATATYPE>::evaluate
>-+
>-+#define MAKE_SCALAR_OPS(IN0DATATYPE, IN1DATATYPE)       \
>-+    MAKE_EVAL_CASE(OP_ADD, IN0DATATYPE, IN1DATATYPE);   \
>-+    MAKE_EVAL_CASE(OP_SUB, IN0DATATYPE, IN1DATATYPE);   \
>-+    MAKE_EVAL_CASE(OP_MUL, IN0DATATYPE, IN1DATATYPE);   \
>-+    MAKE_EVAL_CASE(OP_DIV, IN0DATATYPE, IN1DATATYPE)
>-+
>-+#define MAKE_CWISE_OPS(IN0DATATYPE, IN1DATATYPE)            \
>-+    MAKE_EVAL_CASE(OP_ADD,      IN0DATATYPE, IN1DATATYPE);  \
>-+    MAKE_EVAL_CASE(OP_SUB,      IN0DATATYPE, IN1DATATYPE);  \
>-+    MAKE_EVAL_CASE(OP_DIV,      IN0DATATYPE, IN1DATATYPE);  \
>-+    MAKE_EVAL_CASE(OP_COMP_MUL, IN0DATATYPE, IN1DATATYPE)
>-+
>-+#define MAKE_MUL_OP(IN0DATATYPE, IN1DATATYPE)           \
>-+    MAKE_EVAL_CASE(OP_MUL, IN0DATATYPE, IN1DATATYPE)
>-+
>-+#define MAKE_VECVEC_OP(IN0DATATYPE, IN1DATATYPE)            \
>-+    MAKE_EVAL_CASE(OP_OUTER_PRODUCT, IN0DATATYPE, IN1DATATYPE)
>-+
>-+#define MAKE_UNARY_OP(IN0DATATYPE)                              \
>-+    MAKE_EVAL_CASE(OP_TRANSPOSE,        IN0DATATYPE, TYPE_LAST);    \
>-+    MAKE_EVAL_CASE(OP_UNARY_PLUS,       IN0DATATYPE, TYPE_LAST);    \
>-+    MAKE_EVAL_CASE(OP_NEGATION,         IN0DATATYPE, TYPE_LAST);    \
>-+    MAKE_EVAL_CASE(OP_PRE_INCREMENT,    IN0DATATYPE, TYPE_LAST);    \
>-+    MAKE_EVAL_CASE(OP_PRE_DECREMENT,    IN0DATATYPE, TYPE_LAST);    \
>-+    MAKE_EVAL_CASE(OP_POST_INCREMENT,   IN0DATATYPE, TYPE_LAST);    \
>-+    MAKE_EVAL_CASE(OP_POST_DECREMENT,   IN0DATATYPE, TYPE_LAST)
>-+
>-+#define MAKE_UNARY_SYMMETRIC_OP(IN0DATATYPE)                    \
>-+    MAKE_UNARY_OP(IN0DATATYPE);                                 \
>-+    MAKE_EVAL_CASE(OP_DETERMINANT,  IN0DATATYPE, TYPE_LAST);    \
>-+    MAKE_EVAL_CASE(OP_INVERSE,      IN0DATATYPE, TYPE_LAST)
>-+
>-+#define MAKE_ASSIGNMENT_OP(IN0DATATYPE)                             \
>-+    MAKE_EVAL_CASE(OP_ADD_INTO,         IN0DATATYPE, IN0DATATYPE);  \
>-+    MAKE_EVAL_CASE(OP_SUBTRACT_FROM,    IN0DATATYPE, IN0DATATYPE);  \
>-+    MAKE_EVAL_CASE(OP_DIVIDE_INTO,      IN0DATATYPE, IN0DATATYPE)
>-+
>-+#define MAKE_ASSIGNMENT_SYMMETRIC_OP(IN0DATATYPE)                   \
>-+    MAKE_ASSIGNMENT_OP(IN0DATATYPE);                                \
>-+    MAKE_EVAL_CASE(OP_MULTIPLY_INTO,    IN0DATATYPE, IN0DATATYPE)
>-+
>-+    switch (PACK_EVAL_CASE(op, in0.dataType, in1.dataType))
>-+    {
>-+        // Matrix-scalar.
>-+        MAKE_SCALAR_OPS(TYPE_FLOAT_MAT2,    TYPE_FLOAT);
>-+        MAKE_SCALAR_OPS(TYPE_FLOAT_MAT2X3,  TYPE_FLOAT);
>-+        MAKE_SCALAR_OPS(TYPE_FLOAT_MAT2X4,  TYPE_FLOAT);
>-+        MAKE_SCALAR_OPS(TYPE_FLOAT_MAT3X2,  TYPE_FLOAT);
>-+        MAKE_SCALAR_OPS(TYPE_FLOAT_MAT3,    TYPE_FLOAT);
>-+        MAKE_SCALAR_OPS(TYPE_FLOAT_MAT3X4,  TYPE_FLOAT);
>-+        MAKE_SCALAR_OPS(TYPE_FLOAT_MAT4X2,  TYPE_FLOAT);
>-+        MAKE_SCALAR_OPS(TYPE_FLOAT_MAT4X3,  TYPE_FLOAT);
>-+        MAKE_SCALAR_OPS(TYPE_FLOAT_MAT4,    TYPE_FLOAT);
>-+
>-+        // Matrix-vector.
>-+        MAKE_MUL_OP(TYPE_FLOAT_MAT2,    TYPE_FLOAT_VEC2);
>-+        MAKE_MUL_OP(TYPE_FLOAT_MAT2X3,  TYPE_FLOAT_VEC2);
>-+        MAKE_MUL_OP(TYPE_FLOAT_MAT2X4,  TYPE_FLOAT_VEC2);
>-+        MAKE_MUL_OP(TYPE_FLOAT_MAT3X2,  TYPE_FLOAT_VEC3);
>-+        MAKE_MUL_OP(TYPE_FLOAT_MAT3,    TYPE_FLOAT_VEC3);
>-+        MAKE_MUL_OP(TYPE_FLOAT_MAT3X4,  TYPE_FLOAT_VEC3);
>-+        MAKE_MUL_OP(TYPE_FLOAT_MAT4X2,  TYPE_FLOAT_VEC4);
>-+        MAKE_MUL_OP(TYPE_FLOAT_MAT4X3,  TYPE_FLOAT_VEC4);
>-+        MAKE_MUL_OP(TYPE_FLOAT_MAT4,    TYPE_FLOAT_VEC4);
>-+
>-+        // Vector-matrix.
>-+        MAKE_MUL_OP(TYPE_FLOAT_VEC2, TYPE_FLOAT_MAT2);
>-+        MAKE_MUL_OP(TYPE_FLOAT_VEC3, TYPE_FLOAT_MAT2X3);
>-+        MAKE_MUL_OP(TYPE_FLOAT_VEC4, TYPE_FLOAT_MAT2X4);
>-+        MAKE_MUL_OP(TYPE_FLOAT_VEC2, TYPE_FLOAT_MAT3X2);
>-+        MAKE_MUL_OP(TYPE_FLOAT_VEC3, TYPE_FLOAT_MAT3);
>-+        MAKE_MUL_OP(TYPE_FLOAT_VEC4, TYPE_FLOAT_MAT3X4);
>-+        MAKE_MUL_OP(TYPE_FLOAT_VEC2, TYPE_FLOAT_MAT4X2);
>-+        MAKE_MUL_OP(TYPE_FLOAT_VEC3, TYPE_FLOAT_MAT4X3);
>-+        MAKE_MUL_OP(TYPE_FLOAT_VEC4, TYPE_FLOAT_MAT4);
>-+
>-+        // Matrix-matrix.
>-+        MAKE_CWISE_OPS(TYPE_FLOAT_MAT2,     TYPE_FLOAT_MAT2);
>-+        MAKE_MUL_OP(TYPE_FLOAT_MAT2,        TYPE_FLOAT_MAT2);
>-+        MAKE_MUL_OP(TYPE_FLOAT_MAT2,        TYPE_FLOAT_MAT3X2);
>-+        MAKE_MUL_OP(TYPE_FLOAT_MAT2,        TYPE_FLOAT_MAT4X2);
>-+
>-+        MAKE_CWISE_OPS(TYPE_FLOAT_MAT2X3,   TYPE_FLOAT_MAT2X3);
>-+        MAKE_MUL_OP(TYPE_FLOAT_MAT2X3,      TYPE_FLOAT_MAT2);
>-+        MAKE_MUL_OP(TYPE_FLOAT_MAT2X3,      TYPE_FLOAT_MAT3X2);
>-+        MAKE_MUL_OP(TYPE_FLOAT_MAT2X3,      TYPE_FLOAT_MAT4X2);
>-+
>-+        MAKE_CWISE_OPS(TYPE_FLOAT_MAT2X4,   TYPE_FLOAT_MAT2X4);
>-+        MAKE_MUL_OP(TYPE_FLOAT_MAT2X4,      TYPE_FLOAT_MAT2);
>-+        MAKE_MUL_OP(TYPE_FLOAT_MAT2X4,      TYPE_FLOAT_MAT3X2);
>-+        MAKE_MUL_OP(TYPE_FLOAT_MAT2X4,      TYPE_FLOAT_MAT4X2);
>-+
>-+        MAKE_CWISE_OPS(TYPE_FLOAT_MAT3X2,   TYPE_FLOAT_MAT3X2);
>-+        MAKE_MUL_OP(TYPE_FLOAT_MAT3X2,      TYPE_FLOAT_MAT2X3);
>-+        MAKE_MUL_OP(TYPE_FLOAT_MAT3X2,      TYPE_FLOAT_MAT3);
>-+        MAKE_MUL_OP(TYPE_FLOAT_MAT3X2,      TYPE_FLOAT_MAT4X3);
>-+
>-+        MAKE_CWISE_OPS(TYPE_FLOAT_MAT3,     TYPE_FLOAT_MAT3);
>-+        MAKE_MUL_OP(TYPE_FLOAT_MAT3,        TYPE_FLOAT_MAT2X3);
>-+        MAKE_MUL_OP(TYPE_FLOAT_MAT3,        TYPE_FLOAT_MAT3);
>-+        MAKE_MUL_OP(TYPE_FLOAT_MAT3,        TYPE_FLOAT_MAT4X3);
>-+
>-+        MAKE_CWISE_OPS(TYPE_FLOAT_MAT3X4,   TYPE_FLOAT_MAT3X4);
>-+        MAKE_MUL_OP(TYPE_FLOAT_MAT3X4,      TYPE_FLOAT_MAT2X3);
>-+        MAKE_MUL_OP(TYPE_FLOAT_MAT3X4,      TYPE_FLOAT_MAT3);
>-+        MAKE_MUL_OP(TYPE_FLOAT_MAT3X4,      TYPE_FLOAT_MAT4X3);
>-+
>-+        MAKE_CWISE_OPS(TYPE_FLOAT_MAT4X2,   TYPE_FLOAT_MAT4X2);
>-+        MAKE_MUL_OP(TYPE_FLOAT_MAT4X2,      TYPE_FLOAT_MAT2X4);
>-+        MAKE_MUL_OP(TYPE_FLOAT_MAT4X2,      TYPE_FLOAT_MAT3X4);
>-+        MAKE_MUL_OP(TYPE_FLOAT_MAT4X2,      TYPE_FLOAT_MAT4);
>-+
>-+        MAKE_CWISE_OPS(TYPE_FLOAT_MAT4X3,   TYPE_FLOAT_MAT4X3);
>-+        MAKE_MUL_OP(TYPE_FLOAT_MAT4X3,      TYPE_FLOAT_MAT2X4);
>-+        MAKE_MUL_OP(TYPE_FLOAT_MAT4X3,      TYPE_FLOAT_MAT3X4);
>-+        MAKE_MUL_OP(TYPE_FLOAT_MAT4X3,      TYPE_FLOAT_MAT4);
>-+
>-+        MAKE_CWISE_OPS(TYPE_FLOAT_MAT4,     TYPE_FLOAT_MAT4);
>-+        MAKE_MUL_OP(TYPE_FLOAT_MAT4,        TYPE_FLOAT_MAT2X4);
>-+        MAKE_MUL_OP(TYPE_FLOAT_MAT4,        TYPE_FLOAT_MAT3X4);
>-+        MAKE_MUL_OP(TYPE_FLOAT_MAT4,        TYPE_FLOAT_MAT4);
>-+
>-+        // Vector-vector.
>-+        MAKE_VECVEC_OP(TYPE_FLOAT_VEC2,     TYPE_FLOAT_VEC2);
>-+        MAKE_VECVEC_OP(TYPE_FLOAT_VEC2,     TYPE_FLOAT_VEC3);
>-+        MAKE_VECVEC_OP(TYPE_FLOAT_VEC2,     TYPE_FLOAT_VEC4);
>-+        MAKE_VECVEC_OP(TYPE_FLOAT_VEC3,     TYPE_FLOAT_VEC2);
>-+        MAKE_VECVEC_OP(TYPE_FLOAT_VEC3,     TYPE_FLOAT_VEC3);
>-+        MAKE_VECVEC_OP(TYPE_FLOAT_VEC3,     TYPE_FLOAT_VEC4);
>-+        MAKE_VECVEC_OP(TYPE_FLOAT_VEC4,     TYPE_FLOAT_VEC2);
>-+        MAKE_VECVEC_OP(TYPE_FLOAT_VEC4,     TYPE_FLOAT_VEC3);
>-+        MAKE_VECVEC_OP(TYPE_FLOAT_VEC4,     TYPE_FLOAT_VEC4);
>-+
>-+        // Unary Matrix.
>-+        MAKE_UNARY_SYMMETRIC_OP(TYPE_FLOAT_MAT2);
>-+        MAKE_UNARY_OP(TYPE_FLOAT_MAT2X3);
>-+        MAKE_UNARY_OP(TYPE_FLOAT_MAT2X4);
>-+        MAKE_UNARY_OP(TYPE_FLOAT_MAT3X2);
>-+        MAKE_UNARY_SYMMETRIC_OP(TYPE_FLOAT_MAT3);
>-+        MAKE_UNARY_OP(TYPE_FLOAT_MAT3X4);
>-+        MAKE_UNARY_OP(TYPE_FLOAT_MAT4X2);
>-+        MAKE_UNARY_OP(TYPE_FLOAT_MAT4X3);
>-+        MAKE_UNARY_SYMMETRIC_OP(TYPE_FLOAT_MAT4);
>-+
>-+        // Assignments
>-+        MAKE_ASSIGNMENT_SYMMETRIC_OP(TYPE_FLOAT_MAT2);
>-+        MAKE_ASSIGNMENT_OP(TYPE_FLOAT_MAT2X3);
>-+        MAKE_ASSIGNMENT_OP(TYPE_FLOAT_MAT2X4);
>-+        MAKE_ASSIGNMENT_OP(TYPE_FLOAT_MAT3X2);
>-+        MAKE_ASSIGNMENT_SYMMETRIC_OP(TYPE_FLOAT_MAT3);
>-+        MAKE_ASSIGNMENT_OP(TYPE_FLOAT_MAT3X4);
>-+        MAKE_ASSIGNMENT_OP(TYPE_FLOAT_MAT4X2);
>-+        MAKE_ASSIGNMENT_OP(TYPE_FLOAT_MAT4X3);
>-+        MAKE_ASSIGNMENT_SYMMETRIC_OP(TYPE_FLOAT_MAT4);
>-+
>-+        default:
>-+            DE_ASSERT(DE_FALSE);
>-+            return DE_NULL;
>-+    }
>- 
>- #undef PACK_EVAL_CASE
>- #undef MAKE_EVAL_CASE
>-@@ -1320,35 +1320,35 @@ MatrixShaderEvalFunc getEvalFunc (const ShaderInput& in0, const ShaderInput& in1
>- template <int Size>
>- void writeVectorConstructor (std::ostream& str, const tcu::Vector<float, Size>& v)
>- {
>--	str << "vec" << Size << "(";
>--	for (int ndx = 0; ndx < Size; ndx++)
>--	{
>--		if (ndx != 0)
>--			str << ", ";
>--		str << de::floatToString(v[ndx], 1);
>--	}
>--	str << ")";
>-+    str << "vec" << Size << "(";
>-+    for (int ndx = 0; ndx < Size; ndx++)
>-+    {
>-+        if (ndx != 0)
>-+            str << ", ";
>-+        str << de::floatToString(v[ndx], 1);
>-+    }
>-+    str << ")";
>- }
>- 
>- template <int Cols, int Rows>
>- void writeMatrixConstructor (std::ostream& str, const tcu::Matrix<float, Rows, Cols>& m)
>- {
>--	if (Rows == Cols)
>--		str << "mat" << Cols;
>--	else
>--		str << "mat" << Cols << "x" << Rows;
>--
>--	str << "(";
>--	for (int colNdx = 0; colNdx < Cols; colNdx++)
>--	{
>--		for (int rowNdx = 0; rowNdx < Rows; rowNdx++)
>--		{
>--			if (rowNdx > 0 || colNdx > 0)
>--				str << ", ";
>--			str << de::floatToString(m(rowNdx, colNdx), 1);
>--		}
>--	}
>--	str << ")";
>-+    if (Rows == Cols)
>-+        str << "mat" << Cols;
>-+    else
>-+        str << "mat" << Cols << "x" << Rows;
>-+
>-+    str << "(";
>-+    for (int colNdx = 0; colNdx < Cols; colNdx++)
>-+    {
>-+        for (int rowNdx = 0; rowNdx < Rows; rowNdx++)
>-+        {
>-+            if (rowNdx > 0 || colNdx > 0)
>-+                str << ", ";
>-+            str << de::floatToString(m(rowNdx, colNdx), 1);
>-+        }
>-+    }
>-+    str << ")";
>- }
>- 
>- } // MatrixCaseUtils
>-@@ -1358,53 +1358,53 @@ using namespace MatrixCaseUtils;
>- class MatrixShaderEvaluator : public ShaderEvaluator
>- {
>- public:
>--							MatrixShaderEvaluator	(MatrixShaderEvalFunc evalFunc, InputType inType0, InputType inType1);
>-+                            MatrixShaderEvaluator   (MatrixShaderEvalFunc evalFunc, InputType inType0, InputType inType1);
>- 
>--	virtual void			evaluate				(ShaderEvalContext& evalCtx);
>-+    virtual void            evaluate                (ShaderEvalContext& evalCtx);
>- 
>- private:
>--	MatrixShaderEvalFunc	m_matEvalFunc;
>--	InputType				m_inType0;
>--	InputType				m_inType1;
>-+    MatrixShaderEvalFunc    m_matEvalFunc;
>-+    InputType               m_inType0;
>-+    InputType               m_inType1;
>- };
>- 
>- MatrixShaderEvaluator::MatrixShaderEvaluator (MatrixShaderEvalFunc evalFunc, InputType inType0, InputType inType1)
>--	: m_matEvalFunc	(evalFunc)
>--	, m_inType0		(inType0)
>--	, m_inType1		(inType1)
>-+    : m_matEvalFunc (evalFunc)
>-+    , m_inType0     (inType0)
>-+    , m_inType1     (inType1)
>- {
>- }
>- 
>- void MatrixShaderEvaluator::evaluate (ShaderEvalContext& evalCtx)
>- {
>--	m_matEvalFunc(evalCtx, m_inType0, m_inType1);
>-+    m_matEvalFunc(evalCtx, m_inType0, m_inType1);
>- }
>- 
>- class ShaderMatrixCase : public ShaderRenderCase
>- {
>- public:
>--							ShaderMatrixCase			(Context& context, const char* name, const char* desc, const ShaderInput& in0, const ShaderInput& in1, MatrixOp op, bool isVertexCase);
>--							~ShaderMatrixCase			(void);
>-+                            ShaderMatrixCase            (Context& context, const char* name, const char* desc, const ShaderInput& in0, const ShaderInput& in1, MatrixOp op, bool isVertexCase);
>-+                            ~ShaderMatrixCase           (void);
>- 
>--	void					init						(void);
>-+    void                    init                        (void);
>- 
>- protected:
>--	std::string				genGLSLMatToVec3Reduction	(const glu::DataType& matType, const char* varName);
>--	void					setupUniforms				(int programID, const tcu::Vec4& constCoords);
>-+    std::string             genGLSLMatToVec3Reduction   (const glu::DataType& matType, const char* varName);
>-+    void                    setupUniforms               (int programID, const tcu::Vec4& constCoords);
>- 
>- private:
>--	ShaderInput				m_in0;
>--	ShaderInput				m_in1;
>--	MatrixOp				m_op;
>--	MatrixShaderEvaluator	m_matEvaluator;
>-+    ShaderInput             m_in0;
>-+    ShaderInput             m_in1;
>-+    MatrixOp                m_op;
>-+    MatrixShaderEvaluator   m_matEvaluator;
>- };
>- 
>- ShaderMatrixCase::ShaderMatrixCase (Context& context, const char* name, const char* desc, const ShaderInput& in0, const ShaderInput& in1, MatrixOp op, bool isVertexCase)
>--	: ShaderRenderCase	(context.getTestContext(), context.getRenderContext(), context.getContextInfo(), name, desc, isVertexCase, m_matEvaluator)
>--	, m_in0				(in0)
>--	, m_in1				(in1)
>--	, m_op				(op)
>--	, m_matEvaluator	(getEvalFunc(in0, in1, op), in0.inputType, in1.inputType)
>-+    : ShaderRenderCase  (context.getTestContext(), context.getRenderContext(), context.getContextInfo(), name, desc, isVertexCase, m_matEvaluator)
>-+    , m_in0             (in0)
>-+    , m_in1             (in1)
>-+    , m_op              (op)
>-+    , m_matEvaluator    (getEvalFunc(in0, in1, op), in0.inputType, in1.inputType)
>- {
>- }
>- 
>-@@ -1414,374 +1414,374 @@ ShaderMatrixCase::~ShaderMatrixCase (void)
>- 
>- void ShaderMatrixCase::init (void)
>- {
>--	std::ostringstream	vtx;
>--	std::ostringstream	frag;
>--	std::ostringstream&	op				= m_isVertexCase ? vtx : frag;
>--
>--	bool				isInDynMat0		= isDataTypeMatrix(m_in0.dataType) && m_in0.inputType == INPUTTYPE_DYNAMIC;
>--	bool				isInDynMat1		= isDataTypeMatrix(m_in1.dataType) && m_in1.inputType == INPUTTYPE_DYNAMIC;
>--	string				inValue0;
>--	string				inValue1;
>--	DataType			resultType		= TYPE_LAST;
>--	Precision			resultPrec		= m_in0.precision;
>--	vector<string>		passVars;
>--	int					numInputs		= (isOperationBinary(m_op)) ? (2) : (1);
>--
>--	std::string			operationValue0;
>--	std::string			operationValue1;
>--
>--	DE_ASSERT(!isInDynMat0 || !isInDynMat1); // Only single dynamic matrix input is allowed.
>--	DE_UNREF(isInDynMat0 && isInDynMat1);
>--
>--	// Compute result type.
>--	if (m_op == OP_MUL && isDataTypeMatrix(m_in0.dataType) && isDataTypeMatrix(m_in1.dataType))
>--	{
>--		resultType = getDataTypeMatrix(getDataTypeMatrixNumColumns(m_in1.dataType), getDataTypeMatrixNumRows(m_in0.dataType));
>--	}
>--	else if (m_op == OP_OUTER_PRODUCT)
>--	{
>--		resultType = getDataTypeMatrix(getDataTypeScalarSize(m_in1.dataType), getDataTypeScalarSize(m_in0.dataType));
>--	}
>--	else if (m_op == OP_TRANSPOSE)
>--	{
>--		resultType = getDataTypeMatrix(getDataTypeMatrixNumRows(m_in0.dataType), getDataTypeMatrixNumColumns(m_in0.dataType));
>--	}
>--	else if (m_op == OP_INVERSE)
>--	{
>--		resultType = m_in0.dataType;
>--	}
>--	else if (m_op == OP_DETERMINANT)
>--	{
>--		resultType = TYPE_FLOAT;
>--	}
>--	else if (getOperationType(m_op) == OPERATIONTYPE_UNARY_PREFIX_OPERATOR ||
>--			 getOperationType(m_op) == OPERATIONTYPE_UNARY_POSTFIX_OPERATOR)
>--	{
>--		resultType = m_in0.dataType;
>--	}
>--	else if (isDataTypeMatrix(m_in0.dataType) && isDataTypeMatrix(m_in1.dataType))
>--	{
>--		DE_ASSERT(m_in0.dataType == m_in1.dataType);
>--		resultType = m_in0.dataType;
>--	}
>--	else if (isDataTypeMatrix(m_in0.dataType) || isDataTypeMatrix(m_in1.dataType))
>--	{
>--		int			matNdx		= isDataTypeMatrix(m_in0.dataType) ? 0 : 1;
>--		DataType	matrixType	= matNdx == 0 ? m_in0.dataType : m_in1.dataType;
>--		DataType	otherType	= matNdx == 0 ? m_in1.dataType : m_in0.dataType;
>--
>--		if (otherType == TYPE_FLOAT)
>--			resultType = matrixType;
>--		else
>--		{
>--			DE_ASSERT(isDataTypeVector(otherType));
>--			resultType = getDataTypeFloatVec(matNdx == 0 ? getDataTypeMatrixNumRows(matrixType) : getDataTypeMatrixNumColumns(matrixType));
>--		}
>--	}
>--	else
>--	{
>--		DE_ASSERT(DE_FALSE);
>--	}
>--
>--	vtx << "#version 300 es\n";
>--	frag << "#version 300 es\n";
>--
>--	vtx << "in highp vec4 a_position;\n";
>--	frag << "layout(location = 0) out mediump vec4 dEQP_FragColor;\n";
>--	if (m_isVertexCase)
>--	{
>--		vtx << "out mediump vec4 v_color;\n";
>--		frag << "in mediump vec4 v_color;\n";
>--	}
>--
>--	// Input declarations.
>--	for (int inNdx = 0; inNdx < numInputs; inNdx++)
>--	{
>--		const ShaderInput&	in			= inNdx > 0 ? m_in1 : m_in0;
>--		const char*			precName	= getPrecisionName(in.precision);
>--		const char*			typeName	= getDataTypeName(in.dataType);
>--		string&				inValue		= inNdx > 0 ? inValue1 : inValue0;
>--
>--		if (in.inputType == INPUTTYPE_DYNAMIC)
>--		{
>--			vtx << "in " << precName << " " << typeName << " a_";
>--
>--			if (isDataTypeMatrix(in.dataType))
>--			{
>--				// a_matN, v_matN
>--				vtx << typeName << ";\n";
>--				if (!m_isVertexCase)
>--				{
>--					vtx << "out " << precName << " " << typeName << " v_" << typeName << ";\n";
>--					frag << "in " << precName << " " << typeName << " v_" << typeName << ";\n";
>--					passVars.push_back(typeName);
>--				}
>--
>--				inValue = string(m_isVertexCase ? "a_" : "v_") + getDataTypeName(in.dataType);
>--			}
>--			else
>--			{
>--				// a_coords, v_coords
>--				vtx << "coords;\n";
>--				if (!m_isVertexCase)
>--				{
>--					vtx << "out " << precName << " " << typeName << " v_coords;\n";
>--					frag << "in " << precName << " " << typeName << " v_coords;\n";
>--					passVars.push_back("coords");
>--				}
>--
>--				inValue = m_isVertexCase ? "a_coords" : "v_coords";
>--			}
>--		}
>--		else if (in.inputType == INPUTTYPE_UNIFORM)
>--		{
>--			op << "uniform " << precName << " " << typeName << " u_in" << inNdx << ";\n";
>--			inValue = string("u_in") + de::toString(inNdx);
>--		}
>--		else if (in.inputType == INPUTTYPE_CONST)
>--		{
>--			op << "const " << precName << " " << typeName << " in" << inNdx << " = ";
>--
>--			// Generate declaration.
>--			switch (in.dataType)
>--			{
>--				case TYPE_FLOAT:		op << de::floatToString(s_constInFloat[inNdx], 1);					break;
>--				case TYPE_FLOAT_VEC2:	writeVectorConstructor<2>(op, s_constInVec2[inNdx]);				break;
>--				case TYPE_FLOAT_VEC3:	writeVectorConstructor<3>(op, s_constInVec3[inNdx]);				break;
>--				case TYPE_FLOAT_VEC4:	writeVectorConstructor<4>(op, s_constInVec4[inNdx]);				break;
>--				case TYPE_FLOAT_MAT2:	writeMatrixConstructor<2, 2>(op, Mat2(s_constInMat2x2[inNdx]));		break;
>--				case TYPE_FLOAT_MAT2X3:	writeMatrixConstructor<2, 3>(op, Mat2x3(s_constInMat2x3[inNdx]));	break;
>--				case TYPE_FLOAT_MAT2X4:	writeMatrixConstructor<2, 4>(op, Mat2x4(s_constInMat2x4[inNdx]));	break;
>--				case TYPE_FLOAT_MAT3X2:	writeMatrixConstructor<3, 2>(op, Mat3x2(s_constInMat3x2[inNdx]));	break;
>--				case TYPE_FLOAT_MAT3:	writeMatrixConstructor<3, 3>(op, Mat3(s_constInMat3x3[inNdx]));		break;
>--				case TYPE_FLOAT_MAT3X4:	writeMatrixConstructor<3, 4>(op, Mat3x4(s_constInMat3x4[inNdx]));	break;
>--				case TYPE_FLOAT_MAT4X2:	writeMatrixConstructor<4, 2>(op, Mat4x2(s_constInMat4x2[inNdx]));	break;
>--				case TYPE_FLOAT_MAT4X3:	writeMatrixConstructor<4, 3>(op, Mat4x3(s_constInMat4x3[inNdx]));	break;
>--				case TYPE_FLOAT_MAT4:	writeMatrixConstructor<4, 4>(op, Mat4(s_constInMat4x4[inNdx]));		break;
>--
>--				default:
>--					DE_ASSERT(DE_FALSE);
>--			}
>--
>--			op << ";\n";
>--
>--			inValue = string("in") + de::toString(inNdx);
>--		}
>--	}
>--
>--	vtx << "\n"
>--		<< "void main (void)\n"
>--		<< "{\n"
>--		<< "	gl_Position = a_position;\n";
>--	frag << "\n"
>--		 << "void main (void)\n"
>--		 << "{\n";
>--
>--	if (m_isVertexCase)
>--		frag << "	dEQP_FragColor = v_color;\n";
>--	else
>--	{
>--		for (vector<string>::const_iterator copyIter = passVars.begin(); copyIter != passVars.end(); copyIter++)
>--			vtx << "	v_" << *copyIter << " = " << "a_" << *copyIter << ";\n";
>--	}
>--
>--	// Operation.
>--
>--	switch (getOperationNature(m_op))
>--	{
>--		case OPERATIONNATURE_PURE:
>--			DE_ASSERT(getOperationType(m_op) != OPERATIONTYPE_ASSIGNMENT);
>--
>--			operationValue0 = inValue0;
>--			operationValue1 = inValue1;
>--			break;
>--
>--		case OPERATIONNATURE_MUTATING:
>--			DE_ASSERT(getOperationType(m_op) != OPERATIONTYPE_ASSIGNMENT);
>--
>--			op << "	" << getPrecisionName(resultPrec) << " " << getDataTypeName(resultType) << " tmpValue = " << inValue0 << ";\n";
>--
>--			operationValue0 = "tmpValue";
>--			operationValue1 = inValue1;
>--			break;
>--
>--		case OPERATIONNATURE_ASSIGNMENT:
>--			DE_ASSERT(getOperationType(m_op) == OPERATIONTYPE_ASSIGNMENT);
>--
>--			operationValue0 = inValue0;
>--			operationValue1 = inValue1;
>--			break;
>--
>--		default:
>--			DE_ASSERT(DE_FALSE);
>--	}
>--
>--	switch (getOperationType(m_op))
>--	{
>--		case OPERATIONTYPE_BINARY_OPERATOR:
>--			op << "	" << getPrecisionName(resultPrec) << " " << getDataTypeName(resultType) << " res = " << operationValue0 << " " << getOperationName(m_op) << " " << operationValue1 << ";\n";
>--			break;
>--
>--		case OPERATIONTYPE_UNARY_PREFIX_OPERATOR:
>--			op << "	" << getPrecisionName(resultPrec) << " " << getDataTypeName(resultType) << " res = " << getOperationName(m_op) << operationValue0 << ";\n";
>--			break;
>--
>--		case OPERATIONTYPE_UNARY_POSTFIX_OPERATOR:
>--			op << "	" << getPrecisionName(resultPrec) << " " << getDataTypeName(resultType) << " res = " << operationValue0 << getOperationName(m_op) << ";\n";
>--			break;
>--
>--		case OPERATIONTYPE_BINARY_FUNCTION:
>--			op << "	" << getPrecisionName(resultPrec) << " " << getDataTypeName(resultType) << " res = " << getOperationName(m_op) << "(" << operationValue0 << ", " << operationValue1 << ");\n";
>--			break;
>--
>--		case OPERATIONTYPE_UNARY_FUNCTION:
>--			op << "	" << getPrecisionName(resultPrec) << " " << getDataTypeName(resultType) << " res = " << getOperationName(m_op) << "(" << operationValue0 << ");\n";
>--			break;
>--
>--		case OPERATIONTYPE_ASSIGNMENT:
>--			op << "	" << getPrecisionName(resultPrec) << " " << getDataTypeName(resultType) << " res = " << operationValue0 << ";\n";
>--			op << "	res " << getOperationName(m_op) << " " << operationValue1 << ";\n";
>--			break;
>--
>--		default:
>--			DE_ASSERT(DE_FALSE);
>--	}
>--
>--	// Reduction to vec3 (rgb). Check the used value too if it was modified
>--	op << "	" << (m_isVertexCase ? "v_color" : "dEQP_FragColor") << " = ";
>--
>--	if (isOperationValueModifying(m_op))
>--		op << "vec4(" << genGLSLMatToVec3Reduction(resultType, "res") << ", 1.0) + vec4(" << genGLSLMatToVec3Reduction(resultType, "tmpValue") << ", 0.0);\n";
>--	else
>--		op << "vec4(" << genGLSLMatToVec3Reduction(resultType, "res") << ", 1.0);\n";
>--
>--	vtx << "}\n";
>--	frag << "}\n";
>--
>--	m_vertShaderSource	= vtx.str();
>--	m_fragShaderSource	= frag.str();
>--
>--	// \todo [2012-02-14 pyry] Compute better values for matrix tests.
>--	m_userAttribTransforms.resize(4);
>--	for (int attribNdx = 0; attribNdx < 4; attribNdx++)
>--	{
>--		m_userAttribTransforms[attribNdx] = Mat4(0.0f);
>--		m_userAttribTransforms[attribNdx](                  0, 3) = 0.2f;								// !< prevent matrix*vec from going into zero (assuming vec.w != 0)
>--		m_userAttribTransforms[attribNdx](                  1, 3) = 0.1f;								// !<
>--		m_userAttribTransforms[attribNdx](                  2, 3) = 0.4f + 0.15f * float(attribNdx);	// !<
>--		m_userAttribTransforms[attribNdx](                  3, 3) = 0.7f;								// !<
>--		m_userAttribTransforms[attribNdx]((0 + attribNdx) % 4, 0) = 1.0f;
>--		m_userAttribTransforms[attribNdx]((1 + attribNdx) % 4, 1) = 1.0f;
>--		m_userAttribTransforms[attribNdx]((2 + attribNdx) % 4, 2) = 1.0f;
>--		m_userAttribTransforms[attribNdx]((3 + attribNdx) % 4, 3) = 1.0f;
>--	}
>--
>--	// prevent bad reference cases such as black result images by fine-tuning used matrices
>--	if (getOperationTestMatrixType(m_op) != TESTMATRIXTYPE_DEFAULT)
>--	{
>--		for (int attribNdx = 0; attribNdx < 4; attribNdx++)
>--		{
>--			for (int row = 0; row < 4; row++)
>--			for (int col = 0; col < 4; col++)
>--			{
>--				switch (getOperationTestMatrixType(m_op))
>--				{
>--					case TESTMATRIXTYPE_NEGATED:
>--						m_userAttribTransforms[attribNdx](row, col) = -m_userAttribTransforms[attribNdx](row, col);
>--						break;
>--					case TESTMATRIXTYPE_INCREMENTED:
>--						m_userAttribTransforms[attribNdx](row, col) += 0.3f;
>--						break;
>--					case TESTMATRIXTYPE_DECREMENTED:
>--						m_userAttribTransforms[attribNdx](row, col) -= 0.3f;
>--						break;
>--					case TESTMATRIXTYPE_NEGATED_INCREMENTED:
>--						m_userAttribTransforms[attribNdx](row, col) = -m_userAttribTransforms[attribNdx](row, col) + 0.3f;
>--						break;
>--					case TESTMATRIXTYPE_INCREMENTED_LESS:
>--						m_userAttribTransforms[attribNdx](row, col) -= 0.1f;
>--						break;
>--
>--					default:
>--						DE_ASSERT(DE_FALSE);
>--						break;
>--				}
>--			}
>--		}
>--	}
>--
>--	ShaderRenderCase::init();
>-+    std::ostringstream  vtx;
>-+    std::ostringstream  frag;
>-+    std::ostringstream& op              = m_isVertexCase ? vtx : frag;
>-+
>-+    bool                isInDynMat0     = isDataTypeMatrix(m_in0.dataType) && m_in0.inputType == INPUTTYPE_DYNAMIC;
>-+    bool                isInDynMat1     = isDataTypeMatrix(m_in1.dataType) && m_in1.inputType == INPUTTYPE_DYNAMIC;
>-+    string              inValue0;
>-+    string              inValue1;
>-+    DataType            resultType      = TYPE_LAST;
>-+    Precision           resultPrec      = m_in0.precision;
>-+    vector<string>      passVars;
>-+    int                 numInputs       = (isOperationBinary(m_op)) ? (2) : (1);
>-+
>-+    std::string         operationValue0;
>-+    std::string         operationValue1;
>-+
>-+    DE_ASSERT(!isInDynMat0 || !isInDynMat1); // Only single dynamic matrix input is allowed.
>-+    DE_UNREF(isInDynMat0 && isInDynMat1);
>-+
>-+    // Compute result type.
>-+    if (m_op == OP_MUL && isDataTypeMatrix(m_in0.dataType) && isDataTypeMatrix(m_in1.dataType))
>-+    {
>-+        resultType = getDataTypeMatrix(getDataTypeMatrixNumColumns(m_in1.dataType), getDataTypeMatrixNumRows(m_in0.dataType));
>-+    }
>-+    else if (m_op == OP_OUTER_PRODUCT)
>-+    {
>-+        resultType = getDataTypeMatrix(getDataTypeScalarSize(m_in1.dataType), getDataTypeScalarSize(m_in0.dataType));
>-+    }
>-+    else if (m_op == OP_TRANSPOSE)
>-+    {
>-+        resultType = getDataTypeMatrix(getDataTypeMatrixNumRows(m_in0.dataType), getDataTypeMatrixNumColumns(m_in0.dataType));
>-+    }
>-+    else if (m_op == OP_INVERSE)
>-+    {
>-+        resultType = m_in0.dataType;
>-+    }
>-+    else if (m_op == OP_DETERMINANT)
>-+    {
>-+        resultType = TYPE_FLOAT;
>-+    }
>-+    else if (getOperationType(m_op) == OPERATIONTYPE_UNARY_PREFIX_OPERATOR ||
>-+             getOperationType(m_op) == OPERATIONTYPE_UNARY_POSTFIX_OPERATOR)
>-+    {
>-+        resultType = m_in0.dataType;
>-+    }
>-+    else if (isDataTypeMatrix(m_in0.dataType) && isDataTypeMatrix(m_in1.dataType))
>-+    {
>-+        DE_ASSERT(m_in0.dataType == m_in1.dataType);
>-+        resultType = m_in0.dataType;
>-+    }
>-+    else if (isDataTypeMatrix(m_in0.dataType) || isDataTypeMatrix(m_in1.dataType))
>-+    {
>-+        int         matNdx      = isDataTypeMatrix(m_in0.dataType) ? 0 : 1;
>-+        DataType    matrixType  = matNdx == 0 ? m_in0.dataType : m_in1.dataType;
>-+        DataType    otherType   = matNdx == 0 ? m_in1.dataType : m_in0.dataType;
>-+
>-+        if (otherType == TYPE_FLOAT)
>-+            resultType = matrixType;
>-+        else
>-+        {
>-+            DE_ASSERT(isDataTypeVector(otherType));
>-+            resultType = getDataTypeFloatVec(matNdx == 0 ? getDataTypeMatrixNumRows(matrixType) : getDataTypeMatrixNumColumns(matrixType));
>-+        }
>-+    }
>-+    else
>-+    {
>-+        DE_ASSERT(DE_FALSE);
>-+    }
>-+
>-+    vtx << "#version 300 es\n";
>-+    frag << "#version 300 es\n";
>-+
>-+    vtx << "in highp vec4 a_position;\n";
>-+    frag << "layout(location = 0) out mediump vec4 dEQP_FragColor;\n";
>-+    if (m_isVertexCase)
>-+    {
>-+        vtx << "out mediump vec4 v_color;\n";
>-+        frag << "in mediump vec4 v_color;\n";
>-+    }
>-+
>-+    // Input declarations.
>-+    for (int inNdx = 0; inNdx < numInputs; inNdx++)
>-+    {
>-+        const ShaderInput&  in          = inNdx > 0 ? m_in1 : m_in0;
>-+        const char*         precName    = getPrecisionName(in.precision);
>-+        const char*         typeName    = getDataTypeName(in.dataType);
>-+        string&             inValue     = inNdx > 0 ? inValue1 : inValue0;
>-+
>-+        if (in.inputType == INPUTTYPE_DYNAMIC)
>-+        {
>-+            vtx << "in " << precName << " " << typeName << " a_";
>-+
>-+            if (isDataTypeMatrix(in.dataType))
>-+            {
>-+                // a_matN, v_matN
>-+                vtx << typeName << ";\n";
>-+                if (!m_isVertexCase)
>-+                {
>-+                    vtx << "out " << precName << " " << typeName << " v_" << typeName << ";\n";
>-+                    frag << "in " << precName << " " << typeName << " v_" << typeName << ";\n";
>-+                    passVars.push_back(typeName);
>-+                }
>-+
>-+                inValue = string(m_isVertexCase ? "a_" : "v_") + getDataTypeName(in.dataType);
>-+            }
>-+            else
>-+            {
>-+                // a_coords, v_coords
>-+                vtx << "coords;\n";
>-+                if (!m_isVertexCase)
>-+                {
>-+                    vtx << "out " << precName << " " << typeName << " v_coords;\n";
>-+                    frag << "in " << precName << " " << typeName << " v_coords;\n";
>-+                    passVars.push_back("coords");
>-+                }
>-+
>-+                inValue = m_isVertexCase ? "a_coords" : "v_coords";
>-+            }
>-+        }
>-+        else if (in.inputType == INPUTTYPE_UNIFORM)
>-+        {
>-+            op << "uniform " << precName << " " << typeName << " u_in" << inNdx << ";\n";
>-+            inValue = string("u_in") + de::toString(inNdx);
>-+        }
>-+        else if (in.inputType == INPUTTYPE_CONST)
>-+        {
>-+            op << "const " << precName << " " << typeName << " in" << inNdx << " = ";
>-+
>-+            // Generate declaration.
>-+            switch (in.dataType)
>-+            {
>-+                case TYPE_FLOAT:        op << de::floatToString(s_constInFloat[inNdx], 1);                  break;
>-+                case TYPE_FLOAT_VEC2:   writeVectorConstructor<2>(op, s_constInVec2[inNdx]);                break;
>-+                case TYPE_FLOAT_VEC3:   writeVectorConstructor<3>(op, s_constInVec3[inNdx]);                break;
>-+                case TYPE_FLOAT_VEC4:   writeVectorConstructor<4>(op, s_constInVec4[inNdx]);                break;
>-+                case TYPE_FLOAT_MAT2:   writeMatrixConstructor<2, 2>(op, Mat2(s_constInMat2x2[inNdx]));     break;
>-+                case TYPE_FLOAT_MAT2X3: writeMatrixConstructor<2, 3>(op, Mat2x3(s_constInMat2x3[inNdx]));   break;
>-+                case TYPE_FLOAT_MAT2X4: writeMatrixConstructor<2, 4>(op, Mat2x4(s_constInMat2x4[inNdx]));   break;
>-+                case TYPE_FLOAT_MAT3X2: writeMatrixConstructor<3, 2>(op, Mat3x2(s_constInMat3x2[inNdx]));   break;
>-+                case TYPE_FLOAT_MAT3:   writeMatrixConstructor<3, 3>(op, Mat3(s_constInMat3x3[inNdx]));     break;
>-+                case TYPE_FLOAT_MAT3X4: writeMatrixConstructor<3, 4>(op, Mat3x4(s_constInMat3x4[inNdx]));   break;
>-+                case TYPE_FLOAT_MAT4X2: writeMatrixConstructor<4, 2>(op, Mat4x2(s_constInMat4x2[inNdx]));   break;
>-+                case TYPE_FLOAT_MAT4X3: writeMatrixConstructor<4, 3>(op, Mat4x3(s_constInMat4x3[inNdx]));   break;
>-+                case TYPE_FLOAT_MAT4:   writeMatrixConstructor<4, 4>(op, Mat4(s_constInMat4x4[inNdx]));     break;
>-+
>-+                default:
>-+                    DE_ASSERT(DE_FALSE);
>-+            }
>-+
>-+            op << ";\n";
>-+
>-+            inValue = string("in") + de::toString(inNdx);
>-+        }
>-+    }
>-+
>-+    vtx << "\n"
>-+        << "void main (void)\n"
>-+        << "{\n"
>-+        << "    gl_Position = a_position;\n";
>-+    frag << "\n"
>-+         << "void main (void)\n"
>-+         << "{\n";
>-+
>-+    if (m_isVertexCase)
>-+        frag << "   dEQP_FragColor = v_color;\n";
>-+    else
>-+    {
>-+        for (vector<string>::const_iterator copyIter = passVars.begin(); copyIter != passVars.end(); copyIter++)
>-+            vtx << "    v_" << *copyIter << " = " << "a_" << *copyIter << ";\n";
>-+    }
>-+
>-+    // Operation.
>-+
>-+    switch (getOperationNature(m_op))
>-+    {
>-+        case OPERATIONNATURE_PURE:
>-+            DE_ASSERT(getOperationType(m_op) != OPERATIONTYPE_ASSIGNMENT);
>-+
>-+            operationValue0 = inValue0;
>-+            operationValue1 = inValue1;
>-+            break;
>-+
>-+        case OPERATIONNATURE_MUTATING:
>-+            DE_ASSERT(getOperationType(m_op) != OPERATIONTYPE_ASSIGNMENT);
>-+
>-+            op << " " << getPrecisionName(resultPrec) << " " << getDataTypeName(resultType) << " tmpValue = " << inValue0 << ";\n";
>-+
>-+            operationValue0 = "tmpValue";
>-+            operationValue1 = inValue1;
>-+            break;
>-+
>-+        case OPERATIONNATURE_ASSIGNMENT:
>-+            DE_ASSERT(getOperationType(m_op) == OPERATIONTYPE_ASSIGNMENT);
>-+
>-+            operationValue0 = inValue0;
>-+            operationValue1 = inValue1;
>-+            break;
>-+
>-+        default:
>-+            DE_ASSERT(DE_FALSE);
>-+    }
>-+
>-+    switch (getOperationType(m_op))
>-+    {
>-+        case OPERATIONTYPE_BINARY_OPERATOR:
>-+            op << " " << getPrecisionName(resultPrec) << " " << getDataTypeName(resultType) << " res = " << operationValue0 << " " << getOperationName(m_op) << " " << operationValue1 << ";\n";
>-+            break;
>-+
>-+        case OPERATIONTYPE_UNARY_PREFIX_OPERATOR:
>-+            op << " " << getPrecisionName(resultPrec) << " " << getDataTypeName(resultType) << " res = " << getOperationName(m_op) << operationValue0 << ";\n";
>-+            break;
>-+
>-+        case OPERATIONTYPE_UNARY_POSTFIX_OPERATOR:
>-+            op << " " << getPrecisionName(resultPrec) << " " << getDataTypeName(resultType) << " res = " << operationValue0 << getOperationName(m_op) << ";\n";
>-+            break;
>-+
>-+        case OPERATIONTYPE_BINARY_FUNCTION:
>-+            op << " " << getPrecisionName(resultPrec) << " " << getDataTypeName(resultType) << " res = " << getOperationName(m_op) << "(" << operationValue0 << ", " << operationValue1 << ");\n";
>-+            break;
>-+
>-+        case OPERATIONTYPE_UNARY_FUNCTION:
>-+            op << " " << getPrecisionName(resultPrec) << " " << getDataTypeName(resultType) << " res = " << getOperationName(m_op) << "(" << operationValue0 << ");\n";
>-+            break;
>-+
>-+        case OPERATIONTYPE_ASSIGNMENT:
>-+            op << " " << getPrecisionName(resultPrec) << " " << getDataTypeName(resultType) << " res = " << operationValue0 << ";\n";
>-+            op << " res " << getOperationName(m_op) << " " << operationValue1 << ";\n";
>-+            break;
>-+
>-+        default:
>-+            DE_ASSERT(DE_FALSE);
>-+    }
>-+
>-+    // Reduction to vec3 (rgb). Check the used value too if it was modified
>-+    op << " " << (m_isVertexCase ? "v_color" : "dEQP_FragColor") << " = ";
>-+
>-+    if (isOperationValueModifying(m_op))
>-+        op << "vec4(" << genGLSLMatToVec3Reduction(resultType, "res") << ", 1.0) + vec4(" << genGLSLMatToVec3Reduction(resultType, "tmpValue") << ", 0.0);\n";
>-+    else
>-+        op << "vec4(" << genGLSLMatToVec3Reduction(resultType, "res") << ", 1.0);\n";
>-+
>-+    vtx << "}\n";
>-+    frag << "}\n";
>-+
>-+    m_vertShaderSource  = vtx.str();
>-+    m_fragShaderSource  = frag.str();
>-+
>-+    // \todo [2012-02-14 pyry] Compute better values for matrix tests.
>-+    m_userAttribTransforms.resize(4);
>-+    for (int attribNdx = 0; attribNdx < 4; attribNdx++)
>-+    {
>-+        m_userAttribTransforms[attribNdx] = Mat4(0.0f);
>-+        m_userAttribTransforms[attribNdx](                  0, 3) = 0.2f;                               // !< prevent matrix*vec from going into zero (assuming vec.w != 0)
>-+        m_userAttribTransforms[attribNdx](                  1, 3) = 0.1f;                               // !<
>-+        m_userAttribTransforms[attribNdx](                  2, 3) = 0.4f + 0.15f * float(attribNdx);    // !<
>-+        m_userAttribTransforms[attribNdx](                  3, 3) = 0.7f;                               // !<
>-+        m_userAttribTransforms[attribNdx]((0 + attribNdx) % 4, 0) = 1.0f;
>-+        m_userAttribTransforms[attribNdx]((1 + attribNdx) % 4, 1) = 1.0f;
>-+        m_userAttribTransforms[attribNdx]((2 + attribNdx) % 4, 2) = 1.0f;
>-+        m_userAttribTransforms[attribNdx]((3 + attribNdx) % 4, 3) = 1.0f;
>-+    }
>-+
>-+    // prevent bad reference cases such as black result images by fine-tuning used matrices
>-+    if (getOperationTestMatrixType(m_op) != TESTMATRIXTYPE_DEFAULT)
>-+    {
>-+        for (int attribNdx = 0; attribNdx < 4; attribNdx++)
>-+        {
>-+            for (int row = 0; row < 4; row++)
>-+            for (int col = 0; col < 4; col++)
>-+            {
>-+                switch (getOperationTestMatrixType(m_op))
>-+                {
>-+                    case TESTMATRIXTYPE_NEGATED:
>-+                        m_userAttribTransforms[attribNdx](row, col) = -m_userAttribTransforms[attribNdx](row, col);
>-+                        break;
>-+                    case TESTMATRIXTYPE_INCREMENTED:
>-+                        m_userAttribTransforms[attribNdx](row, col) += 0.3f;
>-+                        break;
>-+                    case TESTMATRIXTYPE_DECREMENTED:
>-+                        m_userAttribTransforms[attribNdx](row, col) -= 0.3f;
>-+                        break;
>-+                    case TESTMATRIXTYPE_NEGATED_INCREMENTED:
>-+                        m_userAttribTransforms[attribNdx](row, col) = -m_userAttribTransforms[attribNdx](row, col) + 0.3f;
>-+                        break;
>-+                    case TESTMATRIXTYPE_INCREMENTED_LESS:
>-+                        m_userAttribTransforms[attribNdx](row, col) -= 0.1f;
>-+                        break;
>-+
>-+                    default:
>-+                        DE_ASSERT(DE_FALSE);
>-+                        break;
>-+                }
>-+            }
>-+        }
>-+    }
>-+
>-+    ShaderRenderCase::init();
>- }
>- 
>- std::string ShaderMatrixCase::genGLSLMatToVec3Reduction (const glu::DataType& matType, const char* varName)
>- {
>--	std::ostringstream op;
>--
>--	switch (matType)
>--	{
>--		case TYPE_FLOAT:		op << varName << ", "			<< varName << ", "			<< varName << "";																																			break;
>--		case TYPE_FLOAT_VEC2:	op << varName << ".x, "			<< varName << ".y, "		<< varName << ".x";																																			break;
>--		case TYPE_FLOAT_VEC3:	op << varName << "";																																																	break;
>--		case TYPE_FLOAT_VEC4:	op << varName << ".x, "			<< varName << ".y, "		<< varName << ".z+"			<< varName << ".w";																												break;
>--		case TYPE_FLOAT_MAT2:	op << varName << "[0][0], "		<< varName << "[1][0], "	<< varName << "[0][1]+"		<< varName << "[1][1]";																											break;
>--		case TYPE_FLOAT_MAT2X3:	op << varName << "[0] + "		<< varName << "[1]";																																									break;
>--		case TYPE_FLOAT_MAT2X4:	op << varName << "[0].xyz + "	<< varName << "[1].yzw";																																								break;
>--		case TYPE_FLOAT_MAT3X2:	op << varName << "[0][0]+"		<< varName << "[0][1], "	<< varName << "[1][0]+"		<< varName << "[1][1], "	<< varName << "[2][0]+" << varName << "[2][1]";														break;
>--		case TYPE_FLOAT_MAT3:	op << varName << "[0] + "		<< varName << "[1] + "		<< varName << "[2]";																																		break;
>--		case TYPE_FLOAT_MAT3X4:	op << varName << "[0].xyz + "	<< varName << "[1].yzw + "	<< varName << "[2].zwx";																																	break;
>--		case TYPE_FLOAT_MAT4X2:	op << varName << "[0][0]+"		<< varName << "[0][1]+"		<< varName << "[3][0], "	<< varName << "[1][0]+"		<< varName << "[1][1]+" << varName << "[3][1], " << varName << "[2][0]+" << varName << "[2][1]";	break;
>--		case TYPE_FLOAT_MAT4X3:	op << varName << "[0] + "		<< varName << "[1] + "		<< varName << "[2] + "		<< varName << "[3]";																											break;
>--		case TYPE_FLOAT_MAT4:	op << varName << "[0].xyz+"		<< varName << "[1].yzw+"	<< varName << "[2].zwx+"	<< varName << "[3].wxy";																										break;
>--
>--		default:
>--			DE_ASSERT(DE_FALSE);
>--	}
>--
>--	return op.str();
>-+    std::ostringstream op;
>-+
>-+    switch (matType)
>-+    {
>-+        case TYPE_FLOAT:        op << varName << ", "           << varName << ", "          << varName << "";                                                                                                                                           break;
>-+        case TYPE_FLOAT_VEC2:   op << varName << ".x, "         << varName << ".y, "        << varName << ".x";                                                                                                                                         break;
>-+        case TYPE_FLOAT_VEC3:   op << varName << "";                                                                                                                                                                                                    break;
>-+        case TYPE_FLOAT_VEC4:   op << varName << ".x, "         << varName << ".y, "        << varName << ".z+"         << varName << ".w";                                                                                                             break;
>-+        case TYPE_FLOAT_MAT2:   op << varName << "[0][0], "     << varName << "[1][0], "    << varName << "[0][1]+"     << varName << "[1][1]";                                                                                                         break;
>-+        case TYPE_FLOAT_MAT2X3: op << varName << "[0] + "       << varName << "[1]";                                                                                                                                                                    break;
>-+        case TYPE_FLOAT_MAT2X4: op << varName << "[0].xyz + "   << varName << "[1].yzw";                                                                                                                                                                break;
>-+        case TYPE_FLOAT_MAT3X2: op << varName << "[0][0]+"      << varName << "[0][1], "    << varName << "[1][0]+"     << varName << "[1][1], "    << varName << "[2][0]+" << varName << "[2][1]";                                                     break;
>-+        case TYPE_FLOAT_MAT3:   op << varName << "[0] + "       << varName << "[1] + "      << varName << "[2]";                                                                                                                                        break;
>-+        case TYPE_FLOAT_MAT3X4: op << varName << "[0].xyz + "   << varName << "[1].yzw + "  << varName << "[2].zwx";                                                                                                                                    break;
>-+        case TYPE_FLOAT_MAT4X2: op << varName << "[0][0]+"      << varName << "[0][1]+"     << varName << "[3][0], "    << varName << "[1][0]+"     << varName << "[1][1]+" << varName << "[3][1], " << varName << "[2][0]+" << varName << "[2][1]";    break;
>-+        case TYPE_FLOAT_MAT4X3: op << varName << "[0] + "       << varName << "[1] + "      << varName << "[2] + "      << varName << "[3]";                                                                                                            break;
>-+        case TYPE_FLOAT_MAT4:   op << varName << "[0].xyz+"     << varName << "[1].yzw+"    << varName << "[2].zwx+"    << varName << "[3].wxy";                                                                                                        break;
>-+
>-+        default:
>-+            DE_ASSERT(DE_FALSE);
>-+    }
>-+
>-+    return op.str();
>- }
>- 
>- void ShaderMatrixCase::setupUniforms (int programID, const tcu::Vec4& constCoords)
>- {
>--	const glw::Functions& gl = m_renderCtx.getFunctions();
>--
>--	DE_UNREF(constCoords);
>--
>--	for (int inNdx = 0; inNdx < 2; inNdx++)
>--	{
>--		const ShaderInput& in = inNdx > 0 ? m_in1 : m_in0;
>--
>--		if (in.inputType == INPUTTYPE_UNIFORM)
>--		{
>--			int loc = gl.getUniformLocation(programID, (string("u_in") + de::toString(inNdx)).c_str());
>--
>--			if (loc < 0)
>--				continue;
>--
>--			switch (in.dataType)
>--			{
>--				case TYPE_FLOAT:		gl.uniform1f(loc, s_constInFloat[inNdx]);						break;
>--				case TYPE_FLOAT_VEC2:	gl.uniform2fv(loc, 1, s_constInVec2[inNdx].getPtr());			break;
>--				case TYPE_FLOAT_VEC3:	gl.uniform3fv(loc, 1, s_constInVec3[inNdx].getPtr());			break;
>--				case TYPE_FLOAT_VEC4:	gl.uniform4fv(loc, 1, s_constInVec4[inNdx].getPtr());			break;
>--				// \note GLES3 supports transpose in matrix upload.
>--				case TYPE_FLOAT_MAT2:	gl.uniformMatrix2fv	(loc, 1, GL_TRUE, s_constInMat2x2[inNdx]);	break;
>--				case TYPE_FLOAT_MAT2X3:	gl.uniformMatrix2x3fv(loc, 1, GL_TRUE, s_constInMat2x3[inNdx]);	break;
>--				case TYPE_FLOAT_MAT2X4:	gl.uniformMatrix2x4fv(loc, 1, GL_TRUE, s_constInMat2x4[inNdx]);	break;
>--				case TYPE_FLOAT_MAT3X2:	gl.uniformMatrix3x2fv(loc, 1, GL_TRUE, s_constInMat3x2[inNdx]);	break;
>--				case TYPE_FLOAT_MAT3:	gl.uniformMatrix3fv	(loc, 1, GL_TRUE, s_constInMat3x3[inNdx]);	break;
>--				case TYPE_FLOAT_MAT3X4:	gl.uniformMatrix3x4fv(loc, 1, GL_TRUE, s_constInMat3x4[inNdx]);	break;
>--				case TYPE_FLOAT_MAT4X2:	gl.uniformMatrix4x2fv(loc, 1, GL_TRUE, s_constInMat4x2[inNdx]);	break;
>--				case TYPE_FLOAT_MAT4X3:	gl.uniformMatrix4x3fv(loc, 1, GL_TRUE, s_constInMat4x3[inNdx]);	break;
>--				case TYPE_FLOAT_MAT4:	gl.uniformMatrix4fv	(loc, 1, GL_TRUE, s_constInMat4x4[inNdx]);	break;
>--				default:
>--					DE_ASSERT(false);
>--			}
>--		}
>--	}
>-+    const glw::Functions& gl = m_renderCtx.getFunctions();
>-+
>-+    DE_UNREF(constCoords);
>-+
>-+    for (int inNdx = 0; inNdx < 2; inNdx++)
>-+    {
>-+        const ShaderInput& in = inNdx > 0 ? m_in1 : m_in0;
>-+
>-+        if (in.inputType == INPUTTYPE_UNIFORM)
>-+        {
>-+            int loc = gl.getUniformLocation(programID, (string("u_in") + de::toString(inNdx)).c_str());
>-+
>-+            if (loc < 0)
>-+                continue;
>-+
>-+            switch (in.dataType)
>-+            {
>-+                case TYPE_FLOAT:        gl.uniform1f(loc, s_constInFloat[inNdx]);                       break;
>-+                case TYPE_FLOAT_VEC2:   gl.uniform2fv(loc, 1, s_constInVec2[inNdx].getPtr());           break;
>-+                case TYPE_FLOAT_VEC3:   gl.uniform3fv(loc, 1, s_constInVec3[inNdx].getPtr());           break;
>-+                case TYPE_FLOAT_VEC4:   gl.uniform4fv(loc, 1, s_constInVec4[inNdx].getPtr());           break;
>-+                // \note GLES3 supports transpose in matrix upload.
>-+                case TYPE_FLOAT_MAT2:   gl.uniformMatrix2fv (loc, 1, GL_TRUE, s_constInMat2x2[inNdx]);  break;
>-+                case TYPE_FLOAT_MAT2X3: gl.uniformMatrix2x3fv(loc, 1, GL_TRUE, s_constInMat2x3[inNdx]); break;
>-+                case TYPE_FLOAT_MAT2X4: gl.uniformMatrix2x4fv(loc, 1, GL_TRUE, s_constInMat2x4[inNdx]); break;
>-+                case TYPE_FLOAT_MAT3X2: gl.uniformMatrix3x2fv(loc, 1, GL_TRUE, s_constInMat3x2[inNdx]); break;
>-+                case TYPE_FLOAT_MAT3:   gl.uniformMatrix3fv (loc, 1, GL_TRUE, s_constInMat3x3[inNdx]);  break;
>-+                case TYPE_FLOAT_MAT3X4: gl.uniformMatrix3x4fv(loc, 1, GL_TRUE, s_constInMat3x4[inNdx]); break;
>-+                case TYPE_FLOAT_MAT4X2: gl.uniformMatrix4x2fv(loc, 1, GL_TRUE, s_constInMat4x2[inNdx]); break;
>-+                case TYPE_FLOAT_MAT4X3: gl.uniformMatrix4x3fv(loc, 1, GL_TRUE, s_constInMat4x3[inNdx]); break;
>-+                case TYPE_FLOAT_MAT4:   gl.uniformMatrix4fv (loc, 1, GL_TRUE, s_constInMat4x4[inNdx]);  break;
>-+                default:
>-+                    DE_ASSERT(false);
>-+            }
>-+        }
>-+    }
>- }
>- 
>- ShaderMatrixTests::ShaderMatrixTests (Context& context)
>--	: TestCaseGroup(context, "matrix", "Matrix Tests")
>-+    : TestCaseGroup(context, "matrix", "Matrix Tests")
>- {
>- }
>- 
>-@@ -1791,181 +1791,181 @@ ShaderMatrixTests::~ShaderMatrixTests (void)
>- 
>- void ShaderMatrixTests::init (void)
>- {
>--	static const struct
>--	{
>--		const char*		name;
>--		const char*		desc;
>--		MatrixOp		op;
>--		bool			extendedInputTypeCases; // !< test with const and uniform types too
>--		bool			createInputTypeGroup;	// !< create group for input types
>--	} ops[] =
>--	{
>--		{ "add",			"Matrix addition tests",						OP_ADD,				true,	true	},
>--		{ "sub",			"Matrix subtraction tests",						OP_SUB,				true,	true	},
>--		{ "mul",			"Matrix multiplication tests",					OP_MUL,				true,	true	},
>--		{ "div",			"Matrix division tests",						OP_DIV,				true,	true	},
>--		{ "matrixcompmult",	"Matrix component-wise multiplication tests",	OP_COMP_MUL,		false,	true	},
>--		{ "outerproduct",	"Matrix outerProduct() tests",					OP_OUTER_PRODUCT,	false,	true	},
>--		{ "transpose",		"Matrix transpose() tests",						OP_TRANSPOSE,		false,	true	},
>--		{ "determinant",	"Matrix determinant() tests",					OP_DETERMINANT,		false,	true	},
>--		{ "inverse",		"Matrix inverse() tests",						OP_INVERSE,			false,	true	},
>--		{ "unary_addition",	"Matrix unary addition tests",					OP_UNARY_PLUS,		false,	false	},
>--		{ "negation",		"Matrix negation tests",						OP_NEGATION,		false,	false	},
>--		{ "pre_increment",	"Matrix prefix increment tests",				OP_PRE_INCREMENT,	false,	false	},
>--		{ "pre_decrement",	"Matrix prefix decrement tests",				OP_PRE_DECREMENT,	false,	false	},
>--		{ "post_increment",	"Matrix postfix increment tests",				OP_POST_INCREMENT,	false,	false	},
>--		{ "post_decrement",	"Matrix postfix decrement tests",				OP_POST_DECREMENT,	false,	false	},
>--		{ "add_assign",		"Matrix add into tests",						OP_ADD_INTO,		false,	false	},
>--		{ "sub_assign",		"Matrix subtract from tests",					OP_SUBTRACT_FROM,	false,	false	},
>--		{ "mul_assign",		"Matrix multiply into tests",					OP_MULTIPLY_INTO,	false,	false	},
>--		{ "div_assign",		"Matrix divide into tests",						OP_DIVIDE_INTO,		false,	false	},
>--	};
>--
>--	struct InputTypeSpec
>--	{
>--		const char*		name;
>--		const char*		desc;
>--		InputType		type;
>--	};
>--	static const InputTypeSpec extendedInputTypes[] =
>--	{
>--		{ "const",		"Constant matrix input",	INPUTTYPE_CONST		},
>--		{ "uniform",	"Uniform matrix input",		INPUTTYPE_UNIFORM	},
>--		{ "dynamic",	"Dynamic matrix input",		INPUTTYPE_DYNAMIC	}
>--	};
>--	static const InputTypeSpec reducedInputTypes[] =
>--	{
>--		{ "dynamic",	"Dynamic matrix input",		INPUTTYPE_DYNAMIC	}
>--	};
>--
>--	static const DataType matrixTypes[] =
>--	{
>--		TYPE_FLOAT_MAT2,
>--		TYPE_FLOAT_MAT2X3,
>--		TYPE_FLOAT_MAT2X4,
>--		TYPE_FLOAT_MAT3X2,
>--		TYPE_FLOAT_MAT3,
>--		TYPE_FLOAT_MAT3X4,
>--		TYPE_FLOAT_MAT4X2,
>--		TYPE_FLOAT_MAT4X3,
>--		TYPE_FLOAT_MAT4
>--	};
>--
>--	static const Precision precisions[] =
>--	{
>--		PRECISION_LOWP,
>--		PRECISION_MEDIUMP,
>--		PRECISION_HIGHP
>--	};
>--
>--	for (int opNdx = 0; opNdx < DE_LENGTH_OF_ARRAY(ops); opNdx++)
>--	{
>--		const InputTypeSpec*	inTypeList		= (ops[opNdx].extendedInputTypeCases) ? (extendedInputTypes) : (reducedInputTypes);
>--		const int				inTypeListSize	= (ops[opNdx].extendedInputTypeCases) ? (DE_LENGTH_OF_ARRAY(extendedInputTypes)) : (DE_LENGTH_OF_ARRAY(reducedInputTypes));
>--		const MatrixOp			op				= ops[opNdx].op;
>--		tcu::TestCaseGroup*		opGroup			= new tcu::TestCaseGroup(m_testCtx, ops[opNdx].name, ops[opNdx].desc);
>--
>--		addChild(opGroup);
>--
>--		for (int inTypeNdx = 0; inTypeNdx < inTypeListSize; inTypeNdx++)
>--		{
>--			const InputType		inputType	= inTypeList[inTypeNdx].type;
>--			tcu::TestCaseGroup* inGroup;
>--
>--			if (ops[opNdx].createInputTypeGroup)
>--			{
>--				inGroup = new tcu::TestCaseGroup(m_testCtx, inTypeList[inTypeNdx].name, inTypeList[inTypeNdx].desc);
>--				opGroup->addChild(inGroup);
>--			}
>--			else
>--				inGroup = opGroup;
>--
>--			for (int matTypeNdx = 0; matTypeNdx < DE_LENGTH_OF_ARRAY(matrixTypes); matTypeNdx++)
>--			{
>--				DataType	matType		= matrixTypes[matTypeNdx];
>--				int			numCols		= getDataTypeMatrixNumColumns(matType);
>--				int			numRows		= getDataTypeMatrixNumRows(matType);
>--				const char*	matTypeName	= getDataTypeName(matType);
>--
>--				for (int precNdx = 0; precNdx < DE_LENGTH_OF_ARRAY(precisions); precNdx++)
>--				{
>--					Precision	precision	= precisions[precNdx];
>--					const char*	precName	= getPrecisionName(precision);
>--					string		baseName	= string(precName) + "_" + matTypeName + "_";
>--					ShaderInput	matIn		(inputType, matType, precision);
>--
>--					if (isOperationMatrixScalar(op))
>--					{
>--						// Matrix-scalar \note For div cases we use uniform input.
>--						ShaderInput scalarIn(op == OP_DIV ? INPUTTYPE_UNIFORM : INPUTTYPE_DYNAMIC, TYPE_FLOAT, precision);
>--						inGroup->addChild(new ShaderMatrixCase(m_context, (baseName + "float_vertex").c_str(),		"Matrix-scalar case", matIn, scalarIn, op, true));
>--						inGroup->addChild(new ShaderMatrixCase(m_context, (baseName + "float_fragment").c_str(),	"Matrix-scalar case", matIn, scalarIn, op, false));
>--					}
>--
>--					if (isOperationMatrixVector(op))
>--					{
>--						// Matrix-vector.
>--						DataType	colVecType	= getDataTypeFloatVec(numCols);
>--						ShaderInput colVecIn	(op == OP_DIV ? INPUTTYPE_UNIFORM : INPUTTYPE_DYNAMIC, colVecType, precision);
>--
>--						inGroup->addChild(new ShaderMatrixCase(m_context, (baseName + getDataTypeName(colVecType) + "_vertex").c_str(),		"Matrix-vector case", matIn, colVecIn, op, true));
>--						inGroup->addChild(new ShaderMatrixCase(m_context, (baseName + getDataTypeName(colVecType) + "_fragment").c_str(),	"Matrix-vector case", matIn, colVecIn, op, false));
>--
>--						// Vector-matrix.
>--						DataType	rowVecType	= getDataTypeFloatVec(numRows);
>--						ShaderInput	rowVecIn	(op == OP_DIV ? INPUTTYPE_UNIFORM : INPUTTYPE_DYNAMIC, rowVecType, precision);
>--						string		vecMatName	= string(precName) + "_" + getDataTypeName(rowVecType) + "_" + matTypeName;
>--
>--						inGroup->addChild(new ShaderMatrixCase(m_context, (vecMatName + "_vertex").c_str(),		"Vector-matrix case", rowVecIn, matIn, op, true));
>--						inGroup->addChild(new ShaderMatrixCase(m_context, (vecMatName + "_fragment").c_str(),	"Vector-matrix case", rowVecIn, matIn, op, false));
>--					}
>--
>--					if (isOperationArithmeticMatrixMatrix(op))
>--					{
>--						// Arithmetic matrix-matrix multiplication.
>--						for (int otherCols = 2; otherCols <= 4; otherCols++)
>--						{
>--							ShaderInput otherMatIn(inputType == INPUTTYPE_DYNAMIC ? INPUTTYPE_UNIFORM : inputType, getDataTypeMatrix(otherCols, numCols /* rows */), precision);
>--							inGroup->addChild(new ShaderMatrixCase(m_context, (baseName + getDataTypeName(otherMatIn.dataType) + "_vertex").c_str(),	"Matrix-matrix case", matIn, otherMatIn, op, true));
>--							inGroup->addChild(new ShaderMatrixCase(m_context, (baseName + getDataTypeName(otherMatIn.dataType) + "_fragment").c_str(),	"Matrix-matrix case", matIn, otherMatIn, op, false));
>--						}
>--					}
>--					else if (isOperationComponentwiseMatrixMatrix(op))
>--					{
>--						// Component-wise.
>--						ShaderInput otherMatIn(inputType == INPUTTYPE_DYNAMIC ? INPUTTYPE_UNIFORM : inputType, matType, precision);
>--						inGroup->addChild(new ShaderMatrixCase(m_context, (baseName + matTypeName + "_vertex").c_str(),		"Matrix-matrix case", matIn, otherMatIn, op, true));
>--						inGroup->addChild(new ShaderMatrixCase(m_context, (baseName + matTypeName + "_fragment").c_str(),	"Matrix-matrix case", matIn, otherMatIn, op, false));
>--					}
>--
>--					if (isOperationVectorVector(op))
>--					{
>--						ShaderInput vec1In(inputType,																getDataTypeFloatVec(numRows), precision);
>--						ShaderInput vec2In((inputType == INPUTTYPE_DYNAMIC) ? (INPUTTYPE_UNIFORM) : (inputType),	getDataTypeFloatVec(numCols), precision);
>--
>--						inGroup->addChild(new ShaderMatrixCase(m_context, (baseName + "float_vertex").c_str(),		"Vector-vector case", vec1In, vec2In, op, true));
>--						inGroup->addChild(new ShaderMatrixCase(m_context, (baseName + "float_fragment").c_str(),	"Vector-vector case", vec1In, vec2In, op, false));
>--					}
>--
>--					if ((isOperationUnaryAnyMatrix(op)) ||
>--						(isOperationUnarySymmetricMatrix(op) && numCols == numRows))
>--					{
>--						ShaderInput voidInput(INPUTTYPE_LAST, TYPE_LAST, PRECISION_LAST);
>--						inGroup->addChild(new ShaderMatrixCase(m_context, (baseName + "float_vertex").c_str(),		"Matrix case", matIn, voidInput, op, true));
>--						inGroup->addChild(new ShaderMatrixCase(m_context, (baseName + "float_fragment").c_str(),	"Matrix case", matIn, voidInput, op, false));
>--					}
>--
>--					if ((isOperationAssignmentAnyMatrix(op)) ||
>--						(isOperationAssignmentSymmetricMatrix(op) && numCols == numRows))
>--					{
>--						ShaderInput otherMatIn(inputType == INPUTTYPE_DYNAMIC ? INPUTTYPE_UNIFORM : inputType, matType, precision);
>--						inGroup->addChild(new ShaderMatrixCase(m_context, (baseName + "float_vertex").c_str(),		"Matrix assignment case", matIn, otherMatIn, op, true));
>--						inGroup->addChild(new ShaderMatrixCase(m_context, (baseName + "float_fragment").c_str(),	"Matrix assignment case", matIn, otherMatIn, op, false));
>--					}
>--				}
>--			}
>--		}
>--	}
>-+    static const struct
>-+    {
>-+        const char*     name;
>-+        const char*     desc;
>-+        MatrixOp        op;
>-+        bool            extendedInputTypeCases; // !< test with const and uniform types too
>-+        bool            createInputTypeGroup;   // !< create group for input types
>-+    } ops[] =
>-+    {
>-+        { "add",            "Matrix addition tests",                        OP_ADD,             true,   true    },
>-+        { "sub",            "Matrix subtraction tests",                     OP_SUB,             true,   true    },
>-+        { "mul",            "Matrix multiplication tests",                  OP_MUL,             true,   true    },
>-+        { "div",            "Matrix division tests",                        OP_DIV,             true,   true    },
>-+        { "matrixcompmult", "Matrix component-wise multiplication tests",   OP_COMP_MUL,        false,  true    },
>-+        { "outerproduct",   "Matrix outerProduct() tests",                  OP_OUTER_PRODUCT,   false,  true    },
>-+        { "transpose",      "Matrix transpose() tests",                     OP_TRANSPOSE,       false,  true    },
>-+        { "determinant",    "Matrix determinant() tests",                   OP_DETERMINANT,     false,  true    },
>-+        { "inverse",        "Matrix inverse() tests",                       OP_INVERSE,         false,  true    },
>-+        { "unary_addition", "Matrix unary addition tests",                  OP_UNARY_PLUS,      false,  false   },
>-+        { "negation",       "Matrix negation tests",                        OP_NEGATION,        false,  false   },
>-+        { "pre_increment",  "Matrix prefix increment tests",                OP_PRE_INCREMENT,   false,  false   },
>-+        { "pre_decrement",  "Matrix prefix decrement tests",                OP_PRE_DECREMENT,   false,  false   },
>-+        { "post_increment", "Matrix postfix increment tests",               OP_POST_INCREMENT,  false,  false   },
>-+        { "post_decrement", "Matrix postfix decrement tests",               OP_POST_DECREMENT,  false,  false   },
>-+        { "add_assign",     "Matrix add into tests",                        OP_ADD_INTO,        false,  false   },
>-+        { "sub_assign",     "Matrix subtract from tests",                   OP_SUBTRACT_FROM,   false,  false   },
>-+        { "mul_assign",     "Matrix multiply into tests",                   OP_MULTIPLY_INTO,   false,  false   },
>-+        { "div_assign",     "Matrix divide into tests",                     OP_DIVIDE_INTO,     false,  false   },
>-+    };
>-+
>-+    struct InputTypeSpec
>-+    {
>-+        const char*     name;
>-+        const char*     desc;
>-+        InputType       type;
>-+    };
>-+    static const InputTypeSpec extendedInputTypes[] =
>-+    {
>-+        { "const",      "Constant matrix input",    INPUTTYPE_CONST     },
>-+        { "uniform",    "Uniform matrix input",     INPUTTYPE_UNIFORM   },
>-+        { "dynamic",    "Dynamic matrix input",     INPUTTYPE_DYNAMIC   }
>-+    };
>-+    static const InputTypeSpec reducedInputTypes[] =
>-+    {
>-+        { "dynamic",    "Dynamic matrix input",     INPUTTYPE_DYNAMIC   }
>-+    };
>-+
>-+    static const DataType matrixTypes[] =
>-+    {
>-+        TYPE_FLOAT_MAT2,
>-+        TYPE_FLOAT_MAT2X3,
>-+        TYPE_FLOAT_MAT2X4,
>-+        TYPE_FLOAT_MAT3X2,
>-+        TYPE_FLOAT_MAT3,
>-+        TYPE_FLOAT_MAT3X4,
>-+        TYPE_FLOAT_MAT4X2,
>-+        TYPE_FLOAT_MAT4X3,
>-+        TYPE_FLOAT_MAT4
>-+    };
>-+
>-+    static const Precision precisions[] =
>-+    {
>-+        PRECISION_LOWP,
>-+        PRECISION_MEDIUMP,
>-+        PRECISION_HIGHP
>-+    };
>-+
>-+    for (int opNdx = 0; opNdx < DE_LENGTH_OF_ARRAY(ops); opNdx++)
>-+    {
>-+        const InputTypeSpec*    inTypeList      = (ops[opNdx].extendedInputTypeCases) ? (extendedInputTypes) : (reducedInputTypes);
>-+        const int               inTypeListSize  = (ops[opNdx].extendedInputTypeCases) ? (DE_LENGTH_OF_ARRAY(extendedInputTypes)) : (DE_LENGTH_OF_ARRAY(reducedInputTypes));
>-+        const MatrixOp          op              = ops[opNdx].op;
>-+        tcu::TestCaseGroup*     opGroup         = new tcu::TestCaseGroup(m_testCtx, ops[opNdx].name, ops[opNdx].desc);
>-+
>-+        addChild(opGroup);
>-+
>-+        for (int inTypeNdx = 0; inTypeNdx < inTypeListSize; inTypeNdx++)
>-+        {
>-+            const InputType     inputType   = inTypeList[inTypeNdx].type;
>-+            tcu::TestCaseGroup* inGroup;
>-+
>-+            if (ops[opNdx].createInputTypeGroup)
>-+            {
>-+                inGroup = new tcu::TestCaseGroup(m_testCtx, inTypeList[inTypeNdx].name, inTypeList[inTypeNdx].desc);
>-+                opGroup->addChild(inGroup);
>-+            }
>-+            else
>-+                inGroup = opGroup;
>-+
>-+            for (int matTypeNdx = 0; matTypeNdx < DE_LENGTH_OF_ARRAY(matrixTypes); matTypeNdx++)
>-+            {
>-+                DataType    matType     = matrixTypes[matTypeNdx];
>-+                int         numCols     = getDataTypeMatrixNumColumns(matType);
>-+                int         numRows     = getDataTypeMatrixNumRows(matType);
>-+                const char* matTypeName = getDataTypeName(matType);
>-+
>-+                for (int precNdx = 0; precNdx < DE_LENGTH_OF_ARRAY(precisions); precNdx++)
>-+                {
>-+                    Precision   precision   = precisions[precNdx];
>-+                    const char* precName    = getPrecisionName(precision);
>-+                    string      baseName    = string(precName) + "_" + matTypeName + "_";
>-+                    ShaderInput matIn       (inputType, matType, precision);
>-+
>-+                    if (isOperationMatrixScalar(op))
>-+                    {
>-+                        // Matrix-scalar \note For div cases we use uniform input.
>-+                        ShaderInput scalarIn(op == OP_DIV ? INPUTTYPE_UNIFORM : INPUTTYPE_DYNAMIC, TYPE_FLOAT, precision);
>-+                        inGroup->addChild(new ShaderMatrixCase(m_context, (baseName + "float_vertex").c_str(),      "Matrix-scalar case", matIn, scalarIn, op, true));
>-+                        inGroup->addChild(new ShaderMatrixCase(m_context, (baseName + "float_fragment").c_str(),    "Matrix-scalar case", matIn, scalarIn, op, false));
>-+                    }
>-+
>-+                    if (isOperationMatrixVector(op))
>-+                    {
>-+                        // Matrix-vector.
>-+                        DataType    colVecType  = getDataTypeFloatVec(numCols);
>-+                        ShaderInput colVecIn    (op == OP_DIV ? INPUTTYPE_UNIFORM : INPUTTYPE_DYNAMIC, colVecType, precision);
>-+
>-+                        inGroup->addChild(new ShaderMatrixCase(m_context, (baseName + getDataTypeName(colVecType) + "_vertex").c_str(),     "Matrix-vector case", matIn, colVecIn, op, true));
>-+                        inGroup->addChild(new ShaderMatrixCase(m_context, (baseName + getDataTypeName(colVecType) + "_fragment").c_str(),   "Matrix-vector case", matIn, colVecIn, op, false));
>-+
>-+                        // Vector-matrix.
>-+                        DataType    rowVecType  = getDataTypeFloatVec(numRows);
>-+                        ShaderInput rowVecIn    (op == OP_DIV ? INPUTTYPE_UNIFORM : INPUTTYPE_DYNAMIC, rowVecType, precision);
>-+                        string      vecMatName  = string(precName) + "_" + getDataTypeName(rowVecType) + "_" + matTypeName;
>-+
>-+                        inGroup->addChild(new ShaderMatrixCase(m_context, (vecMatName + "_vertex").c_str(),     "Vector-matrix case", rowVecIn, matIn, op, true));
>-+                        inGroup->addChild(new ShaderMatrixCase(m_context, (vecMatName + "_fragment").c_str(),   "Vector-matrix case", rowVecIn, matIn, op, false));
>-+                    }
>-+
>-+                    if (isOperationArithmeticMatrixMatrix(op))
>-+                    {
>-+                        // Arithmetic matrix-matrix multiplication.
>-+                        for (int otherCols = 2; otherCols <= 4; otherCols++)
>-+                        {
>-+                            ShaderInput otherMatIn(inputType == INPUTTYPE_DYNAMIC ? INPUTTYPE_UNIFORM : inputType, getDataTypeMatrix(otherCols, numCols /* rows */), precision);
>-+                            inGroup->addChild(new ShaderMatrixCase(m_context, (baseName + getDataTypeName(otherMatIn.dataType) + "_vertex").c_str(),    "Matrix-matrix case", matIn, otherMatIn, op, true));
>-+                            inGroup->addChild(new ShaderMatrixCase(m_context, (baseName + getDataTypeName(otherMatIn.dataType) + "_fragment").c_str(),  "Matrix-matrix case", matIn, otherMatIn, op, false));
>-+                        }
>-+                    }
>-+                    else if (isOperationComponentwiseMatrixMatrix(op))
>-+                    {
>-+                        // Component-wise.
>-+                        ShaderInput otherMatIn(inputType == INPUTTYPE_DYNAMIC ? INPUTTYPE_UNIFORM : inputType, matType, precision);
>-+                        inGroup->addChild(new ShaderMatrixCase(m_context, (baseName + matTypeName + "_vertex").c_str(),     "Matrix-matrix case", matIn, otherMatIn, op, true));
>-+                        inGroup->addChild(new ShaderMatrixCase(m_context, (baseName + matTypeName + "_fragment").c_str(),   "Matrix-matrix case", matIn, otherMatIn, op, false));
>-+                    }
>-+
>-+                    if (isOperationVectorVector(op))
>-+                    {
>-+                        ShaderInput vec1In(inputType,                                                               getDataTypeFloatVec(numRows), precision);
>-+                        ShaderInput vec2In((inputType == INPUTTYPE_DYNAMIC) ? (INPUTTYPE_UNIFORM) : (inputType),    getDataTypeFloatVec(numCols), precision);
>-+
>-+                        inGroup->addChild(new ShaderMatrixCase(m_context, (baseName + "float_vertex").c_str(),      "Vector-vector case", vec1In, vec2In, op, true));
>-+                        inGroup->addChild(new ShaderMatrixCase(m_context, (baseName + "float_fragment").c_str(),    "Vector-vector case", vec1In, vec2In, op, false));
>-+                    }
>-+
>-+                    if ((isOperationUnaryAnyMatrix(op)) ||
>-+                        (isOperationUnarySymmetricMatrix(op) && numCols == numRows))
>-+                    {
>-+                        ShaderInput voidInput(INPUTTYPE_LAST, TYPE_LAST, PRECISION_LAST);
>-+                        inGroup->addChild(new ShaderMatrixCase(m_context, (baseName + "float_vertex").c_str(),      "Matrix case", matIn, voidInput, op, true));
>-+                        inGroup->addChild(new ShaderMatrixCase(m_context, (baseName + "float_fragment").c_str(),    "Matrix case", matIn, voidInput, op, false));
>-+                    }
>-+
>-+                    if ((isOperationAssignmentAnyMatrix(op)) ||
>-+                        (isOperationAssignmentSymmetricMatrix(op) && numCols == numRows))
>-+                    {
>-+                        ShaderInput otherMatIn(inputType == INPUTTYPE_DYNAMIC ? INPUTTYPE_UNIFORM : inputType, matType, precision);
>-+                        inGroup->addChild(new ShaderMatrixCase(m_context, (baseName + "float_vertex").c_str(),      "Matrix assignment case", matIn, otherMatIn, op, true));
>-+                        inGroup->addChild(new ShaderMatrixCase(m_context, (baseName + "float_fragment").c_str(),    "Matrix assignment case", matIn, otherMatIn, op, false));
>-+                    }
>-+                }
>-+            }
>-+        }
>-+    }
>- }
>- 
>- } // Functional
>-diff --git a/src/tests/deqp_support/qpTestLog.c b/src/tests/deqp_support/qpTestLog.c
>-index 7252ae049..e3eaa9b14 100644
>---- a/src/tests/deqp_support/qpTestLog.c
>-+++ b/src/tests/deqp_support/qpTestLog.c
>-@@ -33,7 +33,7 @@
>- #include "deMutex.h"
>- 
>- #if defined(QP_SUPPORT_PNG)
>--#	include <png.h>
>-+#   include <png.h>
>- #endif
>- 
>- #include <stdio.h>
>-@@ -41,8 +41,8 @@
>- #include <stdarg.h>
>- 
>- #if (DE_OS == DE_OS_WIN32)
>--#	include <windows.h>
>--#	include <io.h>
>-+#   include <windows.h>
>-+#   include <io.h>
>- #endif
>- 
>- #if defined(DE_DEBUG)
>-@@ -51,70 +51,70 @@
>- 
>- typedef enum ContainerType_e
>- {
>--	CONTAINERTYPE_SECTION = 0,
>--	CONTAINERTYPE_IMAGESET,
>--	CONTAINERTYPE_EGLCONFIGSET,
>--	CONTAINERTYPE_SHADERPROGRAM,
>--	CONTAINERTYPE_SAMPLELIST,
>--	CONTAINERTYPE_SAMPLEINFO,
>--	CONTAINERTYPE_SAMPLE,
>-+    CONTAINERTYPE_SECTION = 0,
>-+    CONTAINERTYPE_IMAGESET,
>-+    CONTAINERTYPE_EGLCONFIGSET,
>-+    CONTAINERTYPE_SHADERPROGRAM,
>-+    CONTAINERTYPE_SAMPLELIST,
>-+    CONTAINERTYPE_SAMPLEINFO,
>-+    CONTAINERTYPE_SAMPLE,
>- 
>--	CONTAINERTYPE_LAST
>-+    CONTAINERTYPE_LAST
>- } ContainerType;
>- 
>- DE_INLINE deBool childContainersOk (ContainerType type)
>- {
>--	return type == CONTAINERTYPE_SECTION || type == CONTAINERTYPE_SAMPLELIST;
>-+    return type == CONTAINERTYPE_SECTION || type == CONTAINERTYPE_SAMPLELIST;
>- }
>- 
>- enum
>- {
>--	MAX_CONTAINER_STACK_DEPTH		= 32
>-+    MAX_CONTAINER_STACK_DEPTH       = 32
>- };
>- 
>- typedef struct ContainerStack_s
>- {
>--	int				numElements;
>--	ContainerType	elements[MAX_CONTAINER_STACK_DEPTH];
>-+    int             numElements;
>-+    ContainerType   elements[MAX_CONTAINER_STACK_DEPTH];
>- } ContainerStack;
>- 
>- DE_INLINE void ContainerStack_reset (ContainerStack* stack)
>- {
>--	deMemset(stack, 0, sizeof(ContainerStack));
>-+    deMemset(stack, 0, sizeof(ContainerStack));
>- }
>- 
>- DE_INLINE deBool ContainerStack_isEmpty (const ContainerStack* stack)
>- {
>--	return stack->numElements == 0;
>-+    return stack->numElements == 0;
>- }
>- 
>- DE_INLINE deBool ContainerStack_push (ContainerStack* stack, ContainerType type)
>- {
>--	if (stack->numElements == MAX_CONTAINER_STACK_DEPTH)
>--		return DE_FALSE;
>-+    if (stack->numElements == MAX_CONTAINER_STACK_DEPTH)
>-+        return DE_FALSE;
>- 
>--	if (stack->numElements > 0 && !childContainersOk(stack->elements[stack->numElements-1]))
>--		return DE_FALSE;
>-+    if (stack->numElements > 0 && !childContainersOk(stack->elements[stack->numElements-1]))
>-+        return DE_FALSE;
>- 
>--	stack->elements[stack->numElements]  = type;
>--	stack->numElements					+= 1;
>-+    stack->elements[stack->numElements]  = type;
>-+    stack->numElements                  += 1;
>- 
>--	return DE_TRUE;
>-+    return DE_TRUE;
>- }
>- 
>- DE_INLINE ContainerType ContainerStack_pop (ContainerStack* stack)
>- {
>--	DE_ASSERT(stack->numElements > 0);
>--	stack->numElements -= 1;
>--	return stack->elements[stack->numElements];
>-+    DE_ASSERT(stack->numElements > 0);
>-+    stack->numElements -= 1;
>-+    return stack->elements[stack->numElements];
>- }
>- 
>- DE_INLINE ContainerType ContainerStack_getTop (const ContainerStack* stack)
>- {
>--	if (stack->numElements > 0)
>--		return stack->elements[stack->numElements-1];
>--	else
>--		return CONTAINERTYPE_LAST;
>-+    if (stack->numElements > 0)
>-+        return stack->elements[stack->numElements-1];
>-+    else
>-+        return CONTAINERTYPE_LAST;
>- }
>- 
>- #endif
>-@@ -122,26 +122,26 @@ DE_INLINE ContainerType ContainerStack_getTop (const ContainerStack* stack)
>- /* qpTestLog instance */
>- struct qpTestLog_s
>- {
>--	deUint32				flags;				/*!< Logging flags.						*/
>-+    deUint32                flags;              /*!< Logging flags.                     */
>- 
>--	deMutex					lock;				/*!< Lock for mutable state below.		*/
>-+    deMutex                 lock;               /*!< Lock for mutable state below.      */
>- 
>--	/* State protected by lock. */
>--	FILE*					outputFile;
>--	qpXmlWriter*			writer;
>--	deBool					isSessionOpen;
>--	deBool					isCaseOpen;
>-+    /* State protected by lock. */
>-+    FILE*                   outputFile;
>-+    qpXmlWriter*            writer;
>-+    deBool                  isSessionOpen;
>-+    deBool                  isCaseOpen;
>- 
>- #if defined(DE_DEBUG)
>--	ContainerStack			containerStack;		/*!< For container usage verification.	*/
>-+    ContainerStack          containerStack;     /*!< For container usage verification.  */
>- #endif
>- };
>- 
>- /* Maps integer to string. */
>- typedef struct qpKeyStringMap_s
>- {
>--	int		key;
>--	char*	string;
>-+    int     key;
>-+    char*   string;
>- } qpKeyStringMap;
>- 
>- static const char* LOG_FORMAT_VERSION = "0.3.4";
>-@@ -149,32 +149,32 @@ static const char* LOG_FORMAT_VERSION = "0.3.4";
>- /* Mapping enum to above strings... */
>- static const qpKeyStringMap s_qpTestTypeMap[] =
>- {
>--	{ QP_TEST_CASE_TYPE_SELF_VALIDATE,		"SelfValidate"	},
>--	{ QP_TEST_CASE_TYPE_PERFORMANCE,		"Performance"	},
>--	{ QP_TEST_CASE_TYPE_CAPABILITY,			"Capability"	},
>--	{ QP_TEST_CASE_TYPE_ACCURACY,			"Accuracy"		},
>-+    { QP_TEST_CASE_TYPE_SELF_VALIDATE,      "SelfValidate"  },
>-+    { QP_TEST_CASE_TYPE_PERFORMANCE,        "Performance"   },
>-+    { QP_TEST_CASE_TYPE_CAPABILITY,         "Capability"    },
>-+    { QP_TEST_CASE_TYPE_ACCURACY,           "Accuracy"      },
>- 
>--	{ QP_TEST_CASE_TYPE_LAST,				DE_NULL			}
>-+    { QP_TEST_CASE_TYPE_LAST,               DE_NULL         }
>- };
>- 
>- DE_STATIC_ASSERT(DE_LENGTH_OF_ARRAY(s_qpTestTypeMap) == QP_TEST_CASE_TYPE_LAST + 1);
>- 
>- static const qpKeyStringMap s_qpTestResultMap[] =
>- {
>--	{ QP_TEST_RESULT_PASS,						"Pass"					},
>--	{ QP_TEST_RESULT_FAIL,						"Fail"					},
>--	{ QP_TEST_RESULT_QUALITY_WARNING,			"QualityWarning"		},
>--	{ QP_TEST_RESULT_COMPATIBILITY_WARNING,		"CompatibilityWarning"	},
>--	{ QP_TEST_RESULT_PENDING,					"Pending"				},	/* should not be needed here */
>--	{ QP_TEST_RESULT_NOT_SUPPORTED,				"NotSupported"			},
>--	{ QP_TEST_RESULT_RESOURCE_ERROR,			"ResourceError"			},
>--	{ QP_TEST_RESULT_INTERNAL_ERROR,			"InternalError"			},
>--	{ QP_TEST_RESULT_CRASH,						"Crash"					},
>--	{ QP_TEST_RESULT_TIMEOUT,					"Timeout"				},
>-+    { QP_TEST_RESULT_PASS,                      "Pass"                  },
>-+    { QP_TEST_RESULT_FAIL,                      "Fail"                  },
>-+    { QP_TEST_RESULT_QUALITY_WARNING,           "QualityWarning"        },
>-+    { QP_TEST_RESULT_COMPATIBILITY_WARNING,     "CompatibilityWarning"  },
>-+    { QP_TEST_RESULT_PENDING,                   "Pending"               },  /* should not be needed here */
>-+    { QP_TEST_RESULT_NOT_SUPPORTED,             "NotSupported"          },
>-+    { QP_TEST_RESULT_RESOURCE_ERROR,            "ResourceError"         },
>-+    { QP_TEST_RESULT_INTERNAL_ERROR,            "InternalError"         },
>-+    { QP_TEST_RESULT_CRASH,                     "Crash"                 },
>-+    { QP_TEST_RESULT_TIMEOUT,                   "Timeout"               },
>- 
>--	/* Add new values here if needed, remember to update qpTestResult enumeration. */
>-+    /* Add new values here if needed, remember to update qpTestResult enumeration. */
>- 
>--	{ QP_TEST_RESULT_LAST,						DE_NULL					}
>-+    { QP_TEST_RESULT_LAST,                      DE_NULL                 }
>- };
>- 
>- DE_STATIC_ASSERT(DE_LENGTH_OF_ARRAY(s_qpTestResultMap) == QP_TEST_RESULT_LAST + 1);
>-@@ -183,13 +183,13 @@ DE_STATIC_ASSERT(DE_LENGTH_OF_ARRAY(s_qpTestResultMap) == QP_TEST_RESULT_LAST +
>- 
>- static const qpKeyStringMap s_qpTagMap[] =
>- {
>--	{ QP_KEY_TAG_NONE,			DE_NULL			},
>--	{ QP_KEY_TAG_PERFORMANCE,	"Performance"	},
>--	{ QP_KEY_TAG_QUALITY,		"Quality"		},
>--	{ QP_KEY_TAG_PRECISION,		"Precision"		},
>--	{ QP_KEY_TAG_TIME,			"Time"			},
>-+    { QP_KEY_TAG_NONE,          DE_NULL         },
>-+    { QP_KEY_TAG_PERFORMANCE,   "Performance"   },
>-+    { QP_KEY_TAG_QUALITY,       "Quality"       },
>-+    { QP_KEY_TAG_PRECISION,     "Precision"     },
>-+    { QP_KEY_TAG_TIME,          "Time"          },
>- 
>--	{ QP_KEY_TAG_LAST,			DE_NULL			}
>-+    { QP_KEY_TAG_LAST,          DE_NULL         }
>- };
>- 
>- DE_STATIC_ASSERT(DE_LENGTH_OF_ARRAY(s_qpTagMap) == QP_KEY_TAG_LAST + 1);
>-@@ -198,10 +198,10 @@ DE_STATIC_ASSERT(DE_LENGTH_OF_ARRAY(s_qpTagMap) == QP_KEY_TAG_LAST + 1);
>- 
>- static const qpKeyStringMap s_qpSampleValueTagMap[] =
>- {
>--	{ QP_SAMPLE_VALUE_TAG_PREDICTOR,	"Predictor"	},
>--	{ QP_SAMPLE_VALUE_TAG_RESPONSE,		"Response"	},
>-+    { QP_SAMPLE_VALUE_TAG_PREDICTOR,    "Predictor" },
>-+    { QP_SAMPLE_VALUE_TAG_RESPONSE,     "Response"  },
>- 
>--	{ QP_SAMPLE_VALUE_TAG_LAST,			DE_NULL		}
>-+    { QP_SAMPLE_VALUE_TAG_LAST,         DE_NULL     }
>- };
>- 
>- DE_STATIC_ASSERT(DE_LENGTH_OF_ARRAY(s_qpSampleValueTagMap) == QP_SAMPLE_VALUE_TAG_LAST + 1);
>-@@ -210,12 +210,12 @@ DE_STATIC_ASSERT(DE_LENGTH_OF_ARRAY(s_qpSampleValueTagMap) == QP_SAMPLE_VALUE_TA
>- 
>- static const qpKeyStringMap s_qpImageCompressionModeMap[] =
>- {
>--	{ QP_IMAGE_COMPRESSION_MODE_NONE,	"None"	},
>--	{ QP_IMAGE_COMPRESSION_MODE_PNG,	"PNG"	},
>-+    { QP_IMAGE_COMPRESSION_MODE_NONE,   "None"  },
>-+    { QP_IMAGE_COMPRESSION_MODE_PNG,    "PNG"   },
>- 
>--	{ QP_IMAGE_COMPRESSION_MODE_BEST,	DE_NULL	},	/* not allowed to be written! */
>-+    { QP_IMAGE_COMPRESSION_MODE_BEST,   DE_NULL },  /* not allowed to be written! */
>- 
>--	{ QP_IMAGE_COMPRESSION_MODE_LAST,	DE_NULL	}
>-+    { QP_IMAGE_COMPRESSION_MODE_LAST,   DE_NULL }
>- };
>- 
>- DE_STATIC_ASSERT(DE_LENGTH_OF_ARRAY(s_qpImageCompressionModeMap) == QP_IMAGE_COMPRESSION_MODE_LAST + 1);
>-@@ -224,10 +224,10 @@ DE_STATIC_ASSERT(DE_LENGTH_OF_ARRAY(s_qpImageCompressionModeMap) == QP_IMAGE_COM
>- 
>- static const qpKeyStringMap s_qpImageFormatMap[] =
>- {
>--	{ QP_IMAGE_FORMAT_RGB888,	"RGB888"	},
>--	{ QP_IMAGE_FORMAT_RGBA8888,	"RGBA8888"	},
>-+    { QP_IMAGE_FORMAT_RGB888,   "RGB888"    },
>-+    { QP_IMAGE_FORMAT_RGBA8888, "RGBA8888"  },
>- 
>--	{ QP_IMAGE_FORMAT_LAST,		DE_NULL		}
>-+    { QP_IMAGE_FORMAT_LAST,     DE_NULL     }
>- };
>- 
>- DE_STATIC_ASSERT(DE_LENGTH_OF_ARRAY(s_qpImageFormatMap) == QP_IMAGE_FORMAT_LAST + 1);
>-@@ -236,91 +236,91 @@ DE_STATIC_ASSERT(DE_LENGTH_OF_ARRAY(s_qpImageFormatMap) == QP_IMAGE_FORMAT_LAST
>- 
>- static const qpKeyStringMap s_qpShaderTypeMap[] =
>- {
>--	{ QP_SHADER_TYPE_VERTEX,			"VertexShader"			},
>--	{ QP_SHADER_TYPE_FRAGMENT,			"FragmentShader"		},
>--	{ QP_SHADER_TYPE_GEOMETRY,			"GeometryShader"		},
>--	{ QP_SHADER_TYPE_TESS_CONTROL,		"TessControlShader"		},
>--	{ QP_SHADER_TYPE_TESS_EVALUATION,	"TessEvaluationShader"	},
>--	{ QP_SHADER_TYPE_COMPUTE,			"ComputeShader"			},
>-+    { QP_SHADER_TYPE_VERTEX,            "VertexShader"          },
>-+    { QP_SHADER_TYPE_FRAGMENT,          "FragmentShader"        },
>-+    { QP_SHADER_TYPE_GEOMETRY,          "GeometryShader"        },
>-+    { QP_SHADER_TYPE_TESS_CONTROL,      "TessControlShader"     },
>-+    { QP_SHADER_TYPE_TESS_EVALUATION,   "TessEvaluationShader"  },
>-+    { QP_SHADER_TYPE_COMPUTE,           "ComputeShader"         },
>- 
>--	{ QP_SHADER_TYPE_LAST,				DE_NULL					}
>-+    { QP_SHADER_TYPE_LAST,              DE_NULL                 }
>- };
>- 
>- DE_STATIC_ASSERT(DE_LENGTH_OF_ARRAY(s_qpShaderTypeMap) == QP_SHADER_TYPE_LAST + 1);
>- 
>- static void qpTestLog_flushFile (qpTestLog* log)
>- {
>--	DE_ASSERT(log && log->outputFile);
>--	fflush(log->outputFile);
>-+    DE_ASSERT(log && log->outputFile);
>-+    fflush(log->outputFile);
>- #if (DE_OS == DE_OS_WIN32) && (DE_COMPILER == DE_COMPILER_MSC)
>--	/* \todo [petri] Is this really necessary? */
>--	FlushFileBuffers((HANDLE)_get_osfhandle(_fileno(log->outputFile)));
>-+    /* \todo [petri] Is this really necessary? */
>-+    FlushFileBuffers((HANDLE)_get_osfhandle(_fileno(log->outputFile)));
>- #endif
>- }
>- 
>--#define QP_LOOKUP_STRING(KEYMAP, KEY)	qpLookupString(KEYMAP, DE_LENGTH_OF_ARRAY(KEYMAP), (int)(KEY))
>-+#define QP_LOOKUP_STRING(KEYMAP, KEY)   qpLookupString(KEYMAP, DE_LENGTH_OF_ARRAY(KEYMAP), (int)(KEY))
>- 
>- static const char* qpLookupString (const qpKeyStringMap* keyMap, int keyMapSize, int key)
>- {
>--	DE_ASSERT(keyMap);
>--	DE_ASSERT(deInBounds32(key, 0, keyMapSize));
>--	DE_ASSERT(keyMap[key].key == key);
>--	DE_UNREF(keyMapSize); /* for asserting only */
>--	return keyMap[key].string;
>-+    DE_ASSERT(keyMap);
>-+    DE_ASSERT(deInBounds32(key, 0, keyMapSize));
>-+    DE_ASSERT(keyMap[key].key == key);
>-+    DE_UNREF(keyMapSize); /* for asserting only */
>-+    return keyMap[key].string;
>- }
>- 
>- DE_INLINE void int32ToString (int val, char buf[32])
>- {
>--	deSprintf(&buf[0], 32, "%d", val);
>-+    deSprintf(&buf[0], 32, "%d", val);
>- }
>- 
>- DE_INLINE void int64ToString (deInt64 val, char buf[32])
>- {
>--	deSprintf(&buf[0], 32, "%lld", (long long int)val);
>-+    deSprintf(&buf[0], 32, "%lld", (long long int)val);
>- }
>- 
>- DE_INLINE void floatToString (float value, char* buf, size_t bufSize)
>- {
>--	deSprintf(buf, bufSize, "%f", value);
>-+    deSprintf(buf, bufSize, "%f", value);
>- }
>- 
>- DE_INLINE void doubleToString (double value, char* buf, size_t bufSize)
>- {
>--	deSprintf(buf, bufSize, "%f", value);
>-+    deSprintf(buf, bufSize, "%f", value);
>- }
>- 
>- static deBool beginSession (qpTestLog* log)
>- {
>--	DE_ASSERT(log && !log->isSessionOpen);
>-+    DE_ASSERT(log && !log->isSessionOpen);
>- 
>--	/* Write session info. */
>--	fprintf(log->outputFile, "#sessionInfo releaseName %s\n", qpGetReleaseName());
>--	fprintf(log->outputFile, "#sessionInfo releaseId 0x%08x\n", qpGetReleaseId());
>--	fprintf(log->outputFile, "#sessionInfo targetName \"%s\"\n", qpGetTargetName());
>-+    /* Write session info. */
>-+    fprintf(log->outputFile, "#sessionInfo releaseName %s\n", qpGetReleaseName());
>-+    fprintf(log->outputFile, "#sessionInfo releaseId 0x%08x\n", qpGetReleaseId());
>-+    fprintf(log->outputFile, "#sessionInfo targetName \"%s\"\n", qpGetTargetName());
>- 
>-     /* Write out #beginSession. */
>--	fprintf(log->outputFile, "#beginSession\n");
>--	qpTestLog_flushFile(log);
>-+    fprintf(log->outputFile, "#beginSession\n");
>-+    qpTestLog_flushFile(log);
>- 
>--	log->isSessionOpen = DE_TRUE;
>-+    log->isSessionOpen = DE_TRUE;
>- 
>--	return DE_TRUE;
>-+    return DE_TRUE;
>- }
>- 
>- static deBool endSession (qpTestLog* log)
>- {
>--	DE_ASSERT(log && log->isSessionOpen);
>-+    DE_ASSERT(log && log->isSessionOpen);
>- 
>-     /* Make sure xml is flushed. */
>-     qpXmlWriter_flush(log->writer);
>- 
>-     /* Write out #endSession. */
>--	fprintf(log->outputFile, "\n#endSession\n");
>--	qpTestLog_flushFile(log);
>-+    fprintf(log->outputFile, "\n#endSession\n");
>-+    qpTestLog_flushFile(log);
>- 
>--	log->isSessionOpen = DE_FALSE;
>-+    log->isSessionOpen = DE_FALSE;
>- 
>--	return DE_TRUE;
>-+    return DE_TRUE;
>- }
>- 
>- /*--------------------------------------------------------------------*//*!
>-@@ -330,117 +330,117 @@ static deBool endSession (qpTestLog* log)
>-  *//*--------------------------------------------------------------------*/
>- qpTestLog* qpTestLog_createFileLog (const char* fileName, deUint32 flags)
>- {
>--	qpTestLog* log = (qpTestLog*)deCalloc(sizeof(qpTestLog));
>--	if (!log)
>--		return DE_NULL;
>-+    qpTestLog* log = (qpTestLog*)deCalloc(sizeof(qpTestLog));
>-+    if (!log)
>-+        return DE_NULL;
>- 
>--	DE_ASSERT(fileName && fileName[0]); /* must have filename. */
>-+    DE_ASSERT(fileName && fileName[0]); /* must have filename. */
>- 
>- #if defined(DE_DEBUG)
>--	ContainerStack_reset(&log->containerStack);
>-+    ContainerStack_reset(&log->containerStack);
>- #endif
>- 
>--	qpPrintf("Writing test log into %s\n", fileName);
>--
>--	/* Create output file. */
>--	log->outputFile = fopen(fileName, "wb");
>--	if (!log->outputFile)
>--	{
>--		qpPrintf("ERROR: Unable to open test log output file '%s'.\n", fileName);
>--		qpTestLog_destroy(log);
>--		return DE_NULL;
>--	}
>--
>--	log->flags			= flags;
>--	log->writer			= qpXmlWriter_createFileWriter(log->outputFile, 0, !(flags & QP_TEST_LOG_NO_FLUSH));
>--	log->lock			= deMutex_create(DE_NULL);
>--	log->isSessionOpen	= DE_FALSE;
>--	log->isCaseOpen		= DE_FALSE;
>--
>--	if (!log->writer)
>--	{
>--		qpPrintf("ERROR: Unable to create output XML writer to file '%s'.\n", fileName);
>--		qpTestLog_destroy(log);
>--		return DE_NULL;
>--	}
>--
>--	if (!log->lock)
>--	{
>--		qpPrintf("ERROR: Unable to create mutex.\n");
>--		qpTestLog_destroy(log);
>--		return DE_NULL;
>--	}
>--
>--	beginSession(log);
>--
>--	return log;
>-+    qpPrintf("Writing test log into %s\n", fileName);
>-+
>-+    /* Create output file. */
>-+    log->outputFile = fopen(fileName, "wb");
>-+    if (!log->outputFile)
>-+    {
>-+        qpPrintf("ERROR: Unable to open test log output file '%s'.\n", fileName);
>-+        qpTestLog_destroy(log);
>-+        return DE_NULL;
>-+    }
>-+
>-+    log->flags          = flags;
>-+    log->writer         = qpXmlWriter_createFileWriter(log->outputFile, 0, !(flags & QP_TEST_LOG_NO_FLUSH));
>-+    log->lock           = deMutex_create(DE_NULL);
>-+    log->isSessionOpen  = DE_FALSE;
>-+    log->isCaseOpen     = DE_FALSE;
>-+
>-+    if (!log->writer)
>-+    {
>-+        qpPrintf("ERROR: Unable to create output XML writer to file '%s'.\n", fileName);
>-+        qpTestLog_destroy(log);
>-+        return DE_NULL;
>-+    }
>-+
>-+    if (!log->lock)
>-+    {
>-+        qpPrintf("ERROR: Unable to create mutex.\n");
>-+        qpTestLog_destroy(log);
>-+        return DE_NULL;
>-+    }
>-+
>-+    beginSession(log);
>-+
>-+    return log;
>- }
>- 
>- /*--------------------------------------------------------------------*//*!
>-  * \brief Destroy a logger instance
>-- * \param a	qpTestLog instance
>-+ * \param a qpTestLog instance
>-  *//*--------------------------------------------------------------------*/
>- void qpTestLog_destroy (qpTestLog* log)
>- {
>--	DE_ASSERT(log);
>-+    DE_ASSERT(log);
>- 
>--	if (log->isSessionOpen)
>--		endSession(log);
>-+    if (log->isSessionOpen)
>-+        endSession(log);
>- 
>--	if (log->writer)
>--		qpXmlWriter_destroy(log->writer);
>-+    if (log->writer)
>-+        qpXmlWriter_destroy(log->writer);
>- 
>--	if (log->outputFile)
>--		fclose(log->outputFile);
>-+    if (log->outputFile)
>-+        fclose(log->outputFile);
>- 
>--	if (log->lock)
>--		deMutex_destroy(log->lock);
>-+    if (log->lock)
>-+        deMutex_destroy(log->lock);
>- 
>--	deFree(log);
>-+    deFree(log);
>- }
>- 
>- /*--------------------------------------------------------------------*//*!
>-  * \brief Log start of test case
>-  * \param log qpTestLog instance
>-- * \param testCasePath	Full test case path (as seen in Candy).
>-- * \param testCaseType	Test case type
>-+ * \param testCasePath  Full test case path (as seen in Candy).
>-+ * \param testCaseType  Test case type
>-  * \return true if ok, false otherwise
>-  *//*--------------------------------------------------------------------*/
>- deBool qpTestLog_startCase (qpTestLog* log, const char* testCasePath, qpTestCaseType testCaseType)
>- {
>--	const char*		typeStr				= QP_LOOKUP_STRING(s_qpTestTypeMap, testCaseType);
>--	int				numResultAttribs	= 0;
>--	qpXmlAttribute	resultAttribs[8];
>-+    const char*     typeStr             = QP_LOOKUP_STRING(s_qpTestTypeMap, testCaseType);
>-+    int             numResultAttribs    = 0;
>-+    qpXmlAttribute  resultAttribs[8];
>- 
>--	DE_ASSERT(log && testCasePath && (testCasePath[0] != 0));
>--	deMutex_lock(log->lock);
>-+    DE_ASSERT(log && testCasePath && (testCasePath[0] != 0));
>-+    deMutex_lock(log->lock);
>- 
>--	DE_ASSERT(!log->isCaseOpen);
>--	DE_ASSERT(ContainerStack_isEmpty(&log->containerStack));
>-+    DE_ASSERT(!log->isCaseOpen);
>-+    DE_ASSERT(ContainerStack_isEmpty(&log->containerStack));
>- 
>--	/* Flush XML and write out #beginTestCaseResult. */
>--	qpXmlWriter_flush(log->writer);
>--	fprintf(log->outputFile, "\n#beginTestCaseResult %s\n", testCasePath);
>--	if (!(log->flags & QP_TEST_LOG_NO_FLUSH))
>--		qpTestLog_flushFile(log);
>--
>--	log->isCaseOpen = DE_TRUE;
>--
>--	/* Fill in attributes. */
>--	resultAttribs[numResultAttribs++] = qpSetStringAttrib("Version", LOG_FORMAT_VERSION);
>--	resultAttribs[numResultAttribs++] = qpSetStringAttrib("CasePath", testCasePath);
>--	resultAttribs[numResultAttribs++] = qpSetStringAttrib("CaseType", typeStr);
>--
>--	if (!qpXmlWriter_startDocument(log->writer) ||
>--		!qpXmlWriter_startElement(log->writer, "TestCaseResult", numResultAttribs, resultAttribs))
>--	{
>--		qpPrintf("qpTestLog_startCase(): Writing XML failed\n");
>--		deMutex_unlock(log->lock);
>--		return DE_FALSE;
>--	}
>--
>--	deMutex_unlock(log->lock);
>--	return DE_TRUE;
>-+    /* Flush XML and write out #beginTestCaseResult. */
>-+    qpXmlWriter_flush(log->writer);
>-+    fprintf(log->outputFile, "\n#beginTestCaseResult %s\n", testCasePath);
>-+    if (!(log->flags & QP_TEST_LOG_NO_FLUSH))
>-+        qpTestLog_flushFile(log);
>-+
>-+    log->isCaseOpen = DE_TRUE;
>-+
>-+    /* Fill in attributes. */
>-+    resultAttribs[numResultAttribs++] = qpSetStringAttrib("Version", LOG_FORMAT_VERSION);
>-+    resultAttribs[numResultAttribs++] = qpSetStringAttrib("CasePath", testCasePath);
>-+    resultAttribs[numResultAttribs++] = qpSetStringAttrib("CaseType", typeStr);
>-+
>-+    if (!qpXmlWriter_startDocument(log->writer) ||
>-+        !qpXmlWriter_startElement(log->writer, "TestCaseResult", numResultAttribs, resultAttribs))
>-+    {
>-+        qpPrintf("qpTestLog_startCase(): Writing XML failed\n");
>-+        deMutex_unlock(log->lock);
>-+        return DE_FALSE;
>-+    }
>-+
>-+    deMutex_unlock(log->lock);
>-+    return DE_TRUE;
>- }
>- 
>- /*--------------------------------------------------------------------*//*!
>-@@ -452,600 +452,600 @@ deBool qpTestLog_startCase (qpTestLog* log, const char* testCasePath, qpTestCase
>-  *//*--------------------------------------------------------------------*/
>- deBool qpTestLog_endCase (qpTestLog* log, qpTestResult result, const char* resultDetails)
>- {
>--	const char*		statusStr		= QP_LOOKUP_STRING(s_qpTestResultMap, result);
>--	qpXmlAttribute	statusAttrib	= qpSetStringAttrib("StatusCode", statusStr);
>--
>--	deMutex_lock(log->lock);
>--
>--	DE_ASSERT(log->isCaseOpen);
>--	DE_ASSERT(ContainerStack_isEmpty(&log->containerStack));
>--
>--	/* <Result StatusCode="Pass">Result details</Result>
>--	 * </TestCaseResult>
>--	 */
>--	if (!qpXmlWriter_startElement(log->writer, "Result", 1, &statusAttrib) ||
>--		(resultDetails && !qpXmlWriter_writeString(log->writer, resultDetails)) ||
>--		!qpXmlWriter_endElement(log->writer, "Result") ||
>--		!qpXmlWriter_endElement(log->writer, "TestCaseResult") ||
>--		!qpXmlWriter_endDocument(log->writer))		/* Close any XML elements still open */
>--	{
>--		qpPrintf("qpTestLog_endCase(): Writing XML failed\n");
>--		deMutex_unlock(log->lock);
>--		return DE_FALSE;
>--	}
>--
>--	/* Flush XML and write #endTestCaseResult. */
>--	qpXmlWriter_flush(log->writer);
>--	fprintf(log->outputFile, "\n#endTestCaseResult\n");
>--	if (!(log->flags & QP_TEST_LOG_NO_FLUSH))
>--		qpTestLog_flushFile(log);
>--
>--	log->isCaseOpen = DE_FALSE;
>--
>--	deMutex_unlock(log->lock);
>--	return DE_TRUE;
>-+    const char*     statusStr       = QP_LOOKUP_STRING(s_qpTestResultMap, result);
>-+    qpXmlAttribute  statusAttrib    = qpSetStringAttrib("StatusCode", statusStr);
>-+
>-+    deMutex_lock(log->lock);
>-+
>-+    DE_ASSERT(log->isCaseOpen);
>-+    DE_ASSERT(ContainerStack_isEmpty(&log->containerStack));
>-+
>-+    /* <Result StatusCode="Pass">Result details</Result>
>-+     * </TestCaseResult>
>-+     */
>-+    if (!qpXmlWriter_startElement(log->writer, "Result", 1, &statusAttrib) ||
>-+        (resultDetails && !qpXmlWriter_writeString(log->writer, resultDetails)) ||
>-+        !qpXmlWriter_endElement(log->writer, "Result") ||
>-+        !qpXmlWriter_endElement(log->writer, "TestCaseResult") ||
>-+        !qpXmlWriter_endDocument(log->writer))      /* Close any XML elements still open */
>-+    {
>-+        qpPrintf("qpTestLog_endCase(): Writing XML failed\n");
>-+        deMutex_unlock(log->lock);
>-+        return DE_FALSE;
>-+    }
>-+
>-+    /* Flush XML and write #endTestCaseResult. */
>-+    qpXmlWriter_flush(log->writer);
>-+    fprintf(log->outputFile, "\n#endTestCaseResult\n");
>-+    if (!(log->flags & QP_TEST_LOG_NO_FLUSH))
>-+        qpTestLog_flushFile(log);
>-+
>-+    log->isCaseOpen = DE_FALSE;
>-+
>-+    deMutex_unlock(log->lock);
>-+    return DE_TRUE;
>- }
>- 
>- /*--------------------------------------------------------------------*//*!
>-  * \brief Abrupt termination of logging.
>-- * \param log		qpTestLog instance
>-- * \param result	Result code, only Crash and Timeout are allowed.
>-+ * \param log       qpTestLog instance
>-+ * \param result    Result code, only Crash and Timeout are allowed.
>-  * \return true if ok, false otherwise
>-  *//*--------------------------------------------------------------------*/
>- deBool qpTestLog_terminateCase (qpTestLog* log, qpTestResult result)
>- {
>--	const char* resultStr = QP_LOOKUP_STRING(s_qpTestResultMap, result);
>-+    const char* resultStr = QP_LOOKUP_STRING(s_qpTestResultMap, result);
>- 
>--	DE_ASSERT(log);
>--	DE_ASSERT(result == QP_TEST_RESULT_CRASH || result == QP_TEST_RESULT_TIMEOUT);
>-+    DE_ASSERT(log);
>-+    DE_ASSERT(result == QP_TEST_RESULT_CRASH || result == QP_TEST_RESULT_TIMEOUT);
>- 
>--	deMutex_lock(log->lock);
>-+    deMutex_lock(log->lock);
>- 
>--	if (!log->isCaseOpen)
>--	{
>--		deMutex_unlock(log->lock);
>--		return DE_FALSE; /* Soft error. This is called from error handler. */
>--	}
>-+    if (!log->isCaseOpen)
>-+    {
>-+        deMutex_unlock(log->lock);
>-+        return DE_FALSE; /* Soft error. This is called from error handler. */
>-+    }
>- 
>--	/* Flush XML and write #terminateTestCaseResult. */
>--	qpXmlWriter_flush(log->writer);
>--	fprintf(log->outputFile, "\n#terminateTestCaseResult %s\n", resultStr);
>--	qpTestLog_flushFile(log);
>-+    /* Flush XML and write #terminateTestCaseResult. */
>-+    qpXmlWriter_flush(log->writer);
>-+    fprintf(log->outputFile, "\n#terminateTestCaseResult %s\n", resultStr);
>-+    qpTestLog_flushFile(log);
>- 
>--	log->isCaseOpen = DE_FALSE;
>-+    log->isCaseOpen = DE_FALSE;
>- 
>- #if defined(DE_DEBUG)
>--	ContainerStack_reset(&log->containerStack);
>-+    ContainerStack_reset(&log->containerStack);
>- #endif
>- 
>--	deMutex_unlock(log->lock);
>--	return DE_TRUE;
>-+    deMutex_unlock(log->lock);
>-+    return DE_TRUE;
>- }
>- 
>- static deBool qpTestLog_writeKeyValuePair (qpTestLog* log, const char* elementName, const char* name, const char* description, const char* unit, qpKeyValueTag tag, const char* text)
>- {
>--	const char*		tagString = QP_LOOKUP_STRING(s_qpTagMap, tag);
>--	qpXmlAttribute	attribs[8];
>--	int				numAttribs = 0;
>--
>--	DE_ASSERT(log && elementName && text);
>--	deMutex_lock(log->lock);
>--
>--	/* Fill in attributes. */
>--	if (name)			attribs[numAttribs++] = qpSetStringAttrib("Name", name);
>--	if (description)	attribs[numAttribs++] = qpSetStringAttrib("Description", description);
>--	if (tagString)		attribs[numAttribs++] = qpSetStringAttrib("Tag", tagString);
>--	if (unit)			attribs[numAttribs++] = qpSetStringAttrib("Unit", unit);
>--
>--	if (!qpXmlWriter_startElement(log->writer, elementName, numAttribs, attribs) ||
>--		!qpXmlWriter_writeString(log->writer, text) ||
>--		!qpXmlWriter_endElement(log->writer, elementName))
>--	{
>--		qpPrintf("qpTestLog_writeKeyValuePair(): Writing XML failed\n");
>--		deMutex_unlock(log->lock);
>--		return DE_FALSE;
>--	}
>--
>--	deMutex_unlock(log->lock);
>--	return DE_TRUE;
>-+    const char*     tagString = QP_LOOKUP_STRING(s_qpTagMap, tag);
>-+    qpXmlAttribute  attribs[8];
>-+    int             numAttribs = 0;
>-+
>-+    DE_ASSERT(log && elementName && text);
>-+    deMutex_lock(log->lock);
>-+
>-+    /* Fill in attributes. */
>-+    if (name)           attribs[numAttribs++] = qpSetStringAttrib("Name", name);
>-+    if (description)    attribs[numAttribs++] = qpSetStringAttrib("Description", description);
>-+    if (tagString)      attribs[numAttribs++] = qpSetStringAttrib("Tag", tagString);
>-+    if (unit)           attribs[numAttribs++] = qpSetStringAttrib("Unit", unit);
>-+
>-+    if (!qpXmlWriter_startElement(log->writer, elementName, numAttribs, attribs) ||
>-+        !qpXmlWriter_writeString(log->writer, text) ||
>-+        !qpXmlWriter_endElement(log->writer, elementName))
>-+    {
>-+        qpPrintf("qpTestLog_writeKeyValuePair(): Writing XML failed\n");
>-+        deMutex_unlock(log->lock);
>-+        return DE_FALSE;
>-+    }
>-+
>-+    deMutex_unlock(log->lock);
>-+    return DE_TRUE;
>- }
>- 
>- /*--------------------------------------------------------------------*//*!
>-  * \brief Write a message to output log
>-- * \param log		qpTestLog instance
>-- * \param format	Format string of message
>-- * \param ...		Parameters for message
>-+ * \param log       qpTestLog instance
>-+ * \param format    Format string of message
>-+ * \param ...       Parameters for message
>-  * \return true if ok, false otherwise
>-  *//*--------------------------------------------------------------------*/
>- deBool qpTestLog_writeMessage (qpTestLog* log, const char* format, ...)
>- {
>--	char	buffer[1024];
>--	va_list	args;
>-+    char    buffer[1024];
>-+    va_list args;
>- 
>--	/* \todo [petri] Handle buffer overflows! */
>-+    /* \todo [petri] Handle buffer overflows! */
>- 
>--	va_start(args, format);
>--	buffer[DE_LENGTH_OF_ARRAY(buffer) - 1] = 0;
>--	vsnprintf(buffer, sizeof(buffer), format, args);
>--	va_end(args);
>-+    va_start(args, format);
>-+    buffer[DE_LENGTH_OF_ARRAY(buffer) - 1] = 0;
>-+    vsnprintf(buffer, sizeof(buffer), format, args);
>-+    va_end(args);
>- 
>--	/* <Text>text</Text> */
>--	return qpTestLog_writeKeyValuePair(log, "Text", DE_NULL, DE_NULL, DE_NULL, QP_KEY_TAG_LAST, buffer);
>-+    /* <Text>text</Text> */
>-+    return qpTestLog_writeKeyValuePair(log, "Text", DE_NULL, DE_NULL, DE_NULL, QP_KEY_TAG_LAST, buffer);
>- }
>- 
>- /*--------------------------------------------------------------------*//*!
>-  * \brief Write key-value-pair into log
>-- * \param log			qpTestLog instance
>-- * \param name			Unique identifier for entry
>-- * \param description	Human readable description
>-- * \param tag			Optional tag
>-- * \param value			Value of the key-value-pair
>-+ * \param log           qpTestLog instance
>-+ * \param name          Unique identifier for entry
>-+ * \param description   Human readable description
>-+ * \param tag           Optional tag
>-+ * \param value         Value of the key-value-pair
>-  * \return true if ok, false otherwise
>-  *//*--------------------------------------------------------------------*/
>- deBool qpTestLog_writeText (qpTestLog* log, const char* name, const char* description, qpKeyValueTag tag, const char* text)
>- {
>--	/* <Text Name="name" Description="description" Tag="tag">text</Text> */
>--	return qpTestLog_writeKeyValuePair(log, "Text", name, description, DE_NULL, tag, text);
>-+    /* <Text Name="name" Description="description" Tag="tag">text</Text> */
>-+    return qpTestLog_writeKeyValuePair(log, "Text", name, description, DE_NULL, tag, text);
>- }
>- 
>- /*--------------------------------------------------------------------*//*!
>-  * \brief Write key-value-pair into log
>-- * \param log			qpTestLog instance
>-- * \param name			Unique identifier for entry
>-- * \param description	Human readable description
>-- * \param tag			Optional tag
>-- * \param value			Value of the key-value-pair
>-+ * \param log           qpTestLog instance
>-+ * \param name          Unique identifier for entry
>-+ * \param description   Human readable description
>-+ * \param tag           Optional tag
>-+ * \param value         Value of the key-value-pair
>-  * \return true if ok, false otherwise
>-  *//*--------------------------------------------------------------------*/
>- deBool qpTestLog_writeInteger (qpTestLog* log, const char* name, const char* description, const char* unit, qpKeyValueTag tag, deInt64 value)
>- {
>--	char tmpString[64];
>--	int64ToString(value, tmpString);
>-+    char tmpString[64];
>-+    int64ToString(value, tmpString);
>- 
>--	/* <Number Name="name" Description="description" Tag="Performance">15</Number> */
>--	return qpTestLog_writeKeyValuePair(log, "Number", name, description, unit, tag, tmpString);
>-+    /* <Number Name="name" Description="description" Tag="Performance">15</Number> */
>-+    return qpTestLog_writeKeyValuePair(log, "Number", name, description, unit, tag, tmpString);
>- }
>- 
>- /*--------------------------------------------------------------------*//*!
>-  * \brief Write key-value-pair into log
>-- * \param log			qpTestLog instance
>-- * \param name			Unique identifier for entry
>-- * \param description	Human readable description
>-- * \param tag			Optional tag
>-- * \param value			Value of the key-value-pair
>-+ * \param log           qpTestLog instance
>-+ * \param name          Unique identifier for entry
>-+ * \param description   Human readable description
>-+ * \param tag           Optional tag
>-+ * \param value         Value of the key-value-pair
>-  * \return true if ok, false otherwise
>-  *//*--------------------------------------------------------------------*/
>- deBool qpTestLog_writeFloat (qpTestLog* log, const char* name, const char* description, const char* unit, qpKeyValueTag tag, float value)
>- {
>--	char tmpString[64];
>--	floatToString(value, tmpString, sizeof(tmpString));
>-+    char tmpString[64];
>-+    floatToString(value, tmpString, sizeof(tmpString));
>- 
>--	/* <Number Name="name" Description="description" Tag="Performance">15</Number> */
>--	return qpTestLog_writeKeyValuePair(log, "Number", name, description, unit, tag, tmpString);
>-+    /* <Number Name="name" Description="description" Tag="Performance">15</Number> */
>-+    return qpTestLog_writeKeyValuePair(log, "Number", name, description, unit, tag, tmpString);
>- }
>- 
>- typedef struct Buffer_s
>- {
>--	size_t		capacity;
>--	size_t		size;
>--	deUint8*	data;
>-+    size_t      capacity;
>-+    size_t      size;
>-+    deUint8*    data;
>- } Buffer;
>- 
>- void Buffer_init (Buffer* buffer)
>- {
>--	buffer->capacity	= 0;
>--	buffer->size		= 0;
>--	buffer->data		= DE_NULL;
>-+    buffer->capacity    = 0;
>-+    buffer->size        = 0;
>-+    buffer->data        = DE_NULL;
>- }
>- 
>- void Buffer_deinit (Buffer* buffer)
>- {
>--	deFree(buffer->data);
>--	Buffer_init(buffer);
>-+    deFree(buffer->data);
>-+    Buffer_init(buffer);
>- }
>- 
>- deBool Buffer_resize (Buffer* buffer, size_t newSize)
>- {
>--	/* Grow buffer if necessary. */
>--	if (newSize > buffer->capacity)
>--	{
>--		size_t		newCapacity	= (size_t)deAlign32(deMax32(2*(int)buffer->capacity, (int)newSize), 512);
>--		deUint8*	newData		= (deUint8*)deMalloc(newCapacity);
>--		if (!newData)
>--			return DE_FALSE;
>--
>--		memcpy(newData, buffer->data, buffer->size);
>--		deFree(buffer->data);
>--		buffer->data		= newData;
>--		buffer->capacity	= newCapacity;
>--	}
>--
>--	buffer->size = newSize;
>--	return DE_TRUE;
>-+    /* Grow buffer if necessary. */
>-+    if (newSize > buffer->capacity)
>-+    {
>-+        size_t      newCapacity = (size_t)deAlign32(deMax32(2*(int)buffer->capacity, (int)newSize), 512);
>-+        deUint8*    newData     = (deUint8*)deMalloc(newCapacity);
>-+        if (!newData)
>-+            return DE_FALSE;
>-+
>-+        memcpy(newData, buffer->data, buffer->size);
>-+        deFree(buffer->data);
>-+        buffer->data        = newData;
>-+        buffer->capacity    = newCapacity;
>-+    }
>-+
>-+    buffer->size = newSize;
>-+    return DE_TRUE;
>- }
>- 
>- deBool Buffer_append (Buffer* buffer, const deUint8* data, size_t numBytes)
>- {
>--	size_t offset = buffer->size;
>-+    size_t offset = buffer->size;
>- 
>--	if (!Buffer_resize(buffer, buffer->size + numBytes))
>--		return DE_FALSE;
>-+    if (!Buffer_resize(buffer, buffer->size + numBytes))
>-+        return DE_FALSE;
>- 
>--	/* Append bytes. */
>--	memcpy(&buffer->data[offset], data, numBytes);
>--	return DE_TRUE;
>-+    /* Append bytes. */
>-+    memcpy(&buffer->data[offset], data, numBytes);
>-+    return DE_TRUE;
>- }
>- 
>- #if defined(QP_SUPPORT_PNG)
>- void pngWriteData (png_structp png, png_bytep dataPtr, png_size_t numBytes)
>- {
>--	Buffer* buffer = (Buffer*)png_get_io_ptr(png);
>--	if (!Buffer_append(buffer, (const deUint8*)dataPtr, numBytes))
>--		png_error(png, "unable to resize PNG write buffer!");
>-+    Buffer* buffer = (Buffer*)png_get_io_ptr(png);
>-+    if (!Buffer_append(buffer, (const deUint8*)dataPtr, numBytes))
>-+        png_error(png, "unable to resize PNG write buffer!");
>- }
>- 
>- void pngFlushData (png_structp png)
>- {
>--	DE_UNREF(png);
>--	/* nada */
>-+    DE_UNREF(png);
>-+    /* nada */
>- }
>- 
>- static deBool writeCompressedPNG (png_structp png, png_infop info, png_byte** rowPointers, int width, int height, int colorFormat)
>- {
>--	if (setjmp(png_jmpbuf(png)) == 0)
>--	{
>--		/* Write data. */
>--		png_set_IHDR(png, info, (png_uint_32)width, (png_uint_32)height,
>--			8,
>--			colorFormat,
>--			PNG_INTERLACE_NONE,
>--			PNG_COMPRESSION_TYPE_BASE,
>--			PNG_FILTER_TYPE_BASE);
>--		png_write_info(png, info);
>--		png_write_image(png, rowPointers);
>--		png_write_end(png, NULL);
>--
>--		return DE_TRUE;
>--	}
>--	else
>--		return DE_FALSE;
>-+    if (setjmp(png_jmpbuf(png)) == 0)
>-+    {
>-+        /* Write data. */
>-+        png_set_IHDR(png, info, (png_uint_32)width, (png_uint_32)height,
>-+            8,
>-+            colorFormat,
>-+            PNG_INTERLACE_NONE,
>-+            PNG_COMPRESSION_TYPE_BASE,
>-+            PNG_FILTER_TYPE_BASE);
>-+        png_write_info(png, info);
>-+        png_write_image(png, rowPointers);
>-+        png_write_end(png, NULL);
>-+
>-+        return DE_TRUE;
>-+    }
>-+    else
>-+        return DE_FALSE;
>- }
>- 
>- static deBool compressImagePNG (Buffer* buffer, qpImageFormat imageFormat, int width, int height, int rowStride, const void* data)
>- {
>--	deBool			compressOk		= DE_FALSE;
>--	png_structp		png				= DE_NULL;
>--	png_infop		info			= DE_NULL;
>--	png_byte**		rowPointers		= DE_NULL;
>--	deBool			hasAlpha		= imageFormat == QP_IMAGE_FORMAT_RGBA8888;
>--	int				ndx;
>--
>--	/* Handle format. */
>--	DE_ASSERT(imageFormat == QP_IMAGE_FORMAT_RGB888 || imageFormat == QP_IMAGE_FORMAT_RGBA8888);
>--
>--	/* Allocate & set row pointers. */
>--	rowPointers = (png_byte**)deMalloc((size_t)height * sizeof(png_byte*));
>--	if (!rowPointers)
>--		return DE_FALSE;
>--
>--	for (ndx = 0; ndx < height; ndx++)
>--		rowPointers[ndx] = (png_byte*)((const deUint8*)data + ndx*rowStride);
>--
>--	/* Initialize PNG compressor. */
>--	png = png_create_write_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL);
>--	info = png ? png_create_info_struct(png) : DE_NULL;
>--	if (png && info)
>--	{
>--		/* Set our own write function. */
>--		png_set_write_fn(png, buffer, pngWriteData, pngFlushData);
>--
>--		compressOk = writeCompressedPNG(png, info, rowPointers, width, height,
>--										hasAlpha ? PNG_COLOR_TYPE_RGBA : PNG_COLOR_TYPE_RGB);
>--	}
>--
>--	/* Cleanup & return. */
>--	if (png && info)
>--	{
>--		png_destroy_info_struct(png, &info);
>--		png_destroy_write_struct(&png, DE_NULL);
>--	}
>--	else if (png)
>--		png_destroy_write_struct(&png, &info);
>--
>--	deFree(rowPointers);
>--	return compressOk;
>-+    deBool          compressOk      = DE_FALSE;
>-+    png_structp     png             = DE_NULL;
>-+    png_infop       info            = DE_NULL;
>-+    png_byte**      rowPointers     = DE_NULL;
>-+    deBool          hasAlpha        = imageFormat == QP_IMAGE_FORMAT_RGBA8888;
>-+    int             ndx;
>-+
>-+    /* Handle format. */
>-+    DE_ASSERT(imageFormat == QP_IMAGE_FORMAT_RGB888 || imageFormat == QP_IMAGE_FORMAT_RGBA8888);
>-+
>-+    /* Allocate & set row pointers. */
>-+    rowPointers = (png_byte**)deMalloc((size_t)height * sizeof(png_byte*));
>-+    if (!rowPointers)
>-+        return DE_FALSE;
>-+
>-+    for (ndx = 0; ndx < height; ndx++)
>-+        rowPointers[ndx] = (png_byte*)((const deUint8*)data + ndx*rowStride);
>-+
>-+    /* Initialize PNG compressor. */
>-+    png = png_create_write_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL);
>-+    info = png ? png_create_info_struct(png) : DE_NULL;
>-+    if (png && info)
>-+    {
>-+        /* Set our own write function. */
>-+        png_set_write_fn(png, buffer, pngWriteData, pngFlushData);
>-+
>-+        compressOk = writeCompressedPNG(png, info, rowPointers, width, height,
>-+                                        hasAlpha ? PNG_COLOR_TYPE_RGBA : PNG_COLOR_TYPE_RGB);
>-+    }
>-+
>-+    /* Cleanup & return. */
>-+    if (png && info)
>-+    {
>-+        png_destroy_info_struct(png, &info);
>-+        png_destroy_write_struct(&png, DE_NULL);
>-+    }
>-+    else if (png)
>-+        png_destroy_write_struct(&png, &info);
>-+
>-+    deFree(rowPointers);
>-+    return compressOk;
>- }
>- #endif /* QP_SUPPORT_PNG */
>- 
>- /*--------------------------------------------------------------------*//*!
>-  * \brief Start image set
>-- * \param log			qpTestLog instance
>-- * \param name			Unique identifier for the set
>-- * \param description	Human readable description
>-+ * \param log           qpTestLog instance
>-+ * \param name          Unique identifier for the set
>-+ * \param description   Human readable description
>-  * \return true if ok, false otherwise
>-  *//*--------------------------------------------------------------------*/
>- deBool qpTestLog_startImageSet (qpTestLog* log, const char* name, const char* description)
>- {
>--	qpXmlAttribute	attribs[4];
>--	int				numAttribs = 0;
>-+    qpXmlAttribute  attribs[4];
>-+    int             numAttribs = 0;
>- 
>--	DE_ASSERT(log && name);
>--	deMutex_lock(log->lock);
>-+    DE_ASSERT(log && name);
>-+    deMutex_lock(log->lock);
>- 
>--	attribs[numAttribs++] = qpSetStringAttrib("Name", name);
>--	if (description)
>--		attribs[numAttribs++] = qpSetStringAttrib("Description", description);
>-+    attribs[numAttribs++] = qpSetStringAttrib("Name", name);
>-+    if (description)
>-+        attribs[numAttribs++] = qpSetStringAttrib("Description", description);
>- 
>--	/* <ImageSet Name="<name>"> */
>--	if (!qpXmlWriter_startElement(log->writer, "ImageSet", numAttribs, attribs))
>--	{
>--		qpPrintf("qpTestLog_startImageSet(): Writing XML failed\n");
>--		deMutex_unlock(log->lock);
>--		return DE_FALSE;
>--	}
>-+    /* <ImageSet Name="<name>"> */
>-+    if (!qpXmlWriter_startElement(log->writer, "ImageSet", numAttribs, attribs))
>-+    {
>-+        qpPrintf("qpTestLog_startImageSet(): Writing XML failed\n");
>-+        deMutex_unlock(log->lock);
>-+        return DE_FALSE;
>-+    }
>- 
>--	DE_ASSERT(ContainerStack_push(&log->containerStack, CONTAINERTYPE_IMAGESET));
>-+    DE_ASSERT(ContainerStack_push(&log->containerStack, CONTAINERTYPE_IMAGESET));
>- 
>--	deMutex_unlock(log->lock);
>--	return DE_TRUE;
>-+    deMutex_unlock(log->lock);
>-+    return DE_TRUE;
>- }
>- 
>- /*--------------------------------------------------------------------*//*!
>-  * \brief End image set
>-- * \param log			qpTestLog instance
>-+ * \param log           qpTestLog instance
>-  * \return true if ok, false otherwise
>-  *//*--------------------------------------------------------------------*/
>- deBool qpTestLog_endImageSet (qpTestLog* log)
>- {
>--	DE_ASSERT(log);
>--	deMutex_lock(log->lock);
>-+    DE_ASSERT(log);
>-+    deMutex_lock(log->lock);
>- 
>--	/* <ImageSet Name="<name>"> */
>--	if (!qpXmlWriter_endElement(log->writer, "ImageSet"))
>--	{
>--		qpPrintf("qpTestLog_endImageSet(): Writing XML failed\n");
>--		deMutex_unlock(log->lock);
>--		return DE_FALSE;
>--	}
>-+    /* <ImageSet Name="<name>"> */
>-+    if (!qpXmlWriter_endElement(log->writer, "ImageSet"))
>-+    {
>-+        qpPrintf("qpTestLog_endImageSet(): Writing XML failed\n");
>-+        deMutex_unlock(log->lock);
>-+        return DE_FALSE;
>-+    }
>- 
>--	DE_ASSERT(ContainerStack_pop(&log->containerStack) == CONTAINERTYPE_IMAGESET);
>-+    DE_ASSERT(ContainerStack_pop(&log->containerStack) == CONTAINERTYPE_IMAGESET);
>- 
>--	deMutex_unlock(log->lock);
>--	return DE_TRUE;
>-+    deMutex_unlock(log->lock);
>-+    return DE_TRUE;
>- }
>- 
>- /*--------------------------------------------------------------------*//*!
>-  * \brief Write base64 encoded raw image data into log
>-- * \param log				qpTestLog instance
>-- * \param name				Unique name (matching names can be compared across BatchResults).
>-- * \param description		Textual description (shown in Candy).
>-- * \param compressionMode	Compression mode
>-- * \param imageFormat		Color format
>-- * \param width				Width in pixels
>-- * \param height			Height in pixels
>-- * \param stride			Data stride (offset between rows)
>-- * \param data				Pointer to pixel data
>-+ * \param log               qpTestLog instance
>-+ * \param name              Unique name (matching names can be compared across BatchResults).
>-+ * \param description       Textual description (shown in Candy).
>-+ * \param compressionMode   Compression mode
>-+ * \param imageFormat       Color format
>-+ * \param width             Width in pixels
>-+ * \param height            Height in pixels
>-+ * \param stride            Data stride (offset between rows)
>-+ * \param data              Pointer to pixel data
>-  * \return 0 if OK, otherwise <0
>-  *//*--------------------------------------------------------------------*/
>--deBool qpTestLog_writeImage	(
>--	qpTestLog*				log,
>--	const char*				name,
>--	const char*				description,
>--	qpImageCompressionMode	compressionMode,
>--	qpImageFormat			imageFormat,
>--	int						width,
>--	int						height,
>--	int						stride,
>--	const void*				data)
>--{
>--	char			widthStr[32];
>--	char			heightStr[32];
>--	qpXmlAttribute	attribs[8];
>--	int				numAttribs			= 0;
>--	Buffer			compressedBuffer;
>--	const void*		writeDataPtr		= DE_NULL;
>--	size_t			writeDataBytes		= ~(size_t)0;
>--
>--	DE_ASSERT(log && name);
>--	DE_ASSERT(deInRange32(width, 1, 16384));
>--	DE_ASSERT(deInRange32(height, 1, 16384));
>--	DE_ASSERT(data);
>--
>--	if (log->flags & QP_TEST_LOG_EXCLUDE_IMAGES)
>--		return DE_TRUE; /* Image not logged. */
>--
>--	Buffer_init(&compressedBuffer);
>--
>--	/* BEST compression mode defaults to PNG. */
>--	if (compressionMode == QP_IMAGE_COMPRESSION_MODE_BEST)
>--	{
>-+deBool qpTestLog_writeImage (
>-+    qpTestLog*              log,
>-+    const char*             name,
>-+    const char*             description,
>-+    qpImageCompressionMode  compressionMode,
>-+    qpImageFormat           imageFormat,
>-+    int                     width,
>-+    int                     height,
>-+    int                     stride,
>-+    const void*             data)
>-+{
>-+    char            widthStr[32];
>-+    char            heightStr[32];
>-+    qpXmlAttribute  attribs[8];
>-+    int             numAttribs          = 0;
>-+    Buffer          compressedBuffer;
>-+    const void*     writeDataPtr        = DE_NULL;
>-+    size_t          writeDataBytes      = ~(size_t)0;
>-+
>-+    DE_ASSERT(log && name);
>-+    DE_ASSERT(deInRange32(width, 1, 16384));
>-+    DE_ASSERT(deInRange32(height, 1, 16384));
>-+    DE_ASSERT(data);
>-+
>-+    if (log->flags & QP_TEST_LOG_EXCLUDE_IMAGES)
>-+        return DE_TRUE; /* Image not logged. */
>-+
>-+    Buffer_init(&compressedBuffer);
>-+
>-+    /* BEST compression mode defaults to PNG. */
>-+    if (compressionMode == QP_IMAGE_COMPRESSION_MODE_BEST)
>-+    {
>- #if defined(QP_SUPPORT_PNG)
>--		compressionMode = QP_IMAGE_COMPRESSION_MODE_PNG;
>-+        compressionMode = QP_IMAGE_COMPRESSION_MODE_PNG;
>- #else
>--		compressionMode = QP_IMAGE_COMPRESSION_MODE_NONE;
>-+        compressionMode = QP_IMAGE_COMPRESSION_MODE_NONE;
>- #endif
>--	}
>-+    }
>- 
>- #if defined(QP_SUPPORT_PNG)
>--	/* Try storing with PNG compression. */
>--	if (compressionMode == QP_IMAGE_COMPRESSION_MODE_PNG)
>--	{
>--		deBool compressOk = compressImagePNG(&compressedBuffer, imageFormat, width, height, stride, data);
>--		if (compressOk)
>--		{
>--			writeDataPtr	= compressedBuffer.data;
>--			writeDataBytes	= compressedBuffer.size;
>--		}
>--		else
>--		{
>--			/* Fall-back to default compression. */
>--			qpPrintf("WARNING: PNG compression failed -- storing image uncompressed.\n");
>--			compressionMode	= QP_IMAGE_COMPRESSION_MODE_NONE;
>--		}
>--	}
>-+    /* Try storing with PNG compression. */
>-+    if (compressionMode == QP_IMAGE_COMPRESSION_MODE_PNG)
>-+    {
>-+        deBool compressOk = compressImagePNG(&compressedBuffer, imageFormat, width, height, stride, data);
>-+        if (compressOk)
>-+        {
>-+            writeDataPtr    = compressedBuffer.data;
>-+            writeDataBytes  = compressedBuffer.size;
>-+        }
>-+        else
>-+        {
>-+            /* Fall-back to default compression. */
>-+            qpPrintf("WARNING: PNG compression failed -- storing image uncompressed.\n");
>-+            compressionMode = QP_IMAGE_COMPRESSION_MODE_NONE;
>-+        }
>-+    }
>- #endif
>- 
>--	/* Handle image compression. */
>--	switch (compressionMode)
>--	{
>--		case QP_IMAGE_COMPRESSION_MODE_NONE:
>--		{
>--			int pixelSize		= imageFormat == QP_IMAGE_FORMAT_RGB888 ? 3 : 4;
>--			int packedStride	= pixelSize*width;
>--
>--			if (packedStride == stride)
>--				writeDataPtr = data;
>--			else
>--			{
>--				/* Need to re-pack pixels. */
>--				if (Buffer_resize(&compressedBuffer, (size_t)(packedStride*height)))
>--				{
>--					int row;
>--					for (row = 0; row < height; row++)
>--						memcpy(&compressedBuffer.data[packedStride*row], &((const deUint8*)data)[row*stride], (size_t)(pixelSize*width));
>--				}
>--				else
>--				{
>--					qpPrintf("ERROR: Failed to pack pixels for writing.\n");
>--					Buffer_deinit(&compressedBuffer);
>--					return DE_FALSE;
>--				}
>--			}
>--
>--			writeDataBytes = (size_t)(packedStride*height);
>--			break;
>--		}
>-+    /* Handle image compression. */
>-+    switch (compressionMode)
>-+    {
>-+        case QP_IMAGE_COMPRESSION_MODE_NONE:
>-+        {
>-+            int pixelSize       = imageFormat == QP_IMAGE_FORMAT_RGB888 ? 3 : 4;
>-+            int packedStride    = pixelSize*width;
>-+
>-+            if (packedStride == stride)
>-+                writeDataPtr = data;
>-+            else
>-+            {
>-+                /* Need to re-pack pixels. */
>-+                if (Buffer_resize(&compressedBuffer, (size_t)(packedStride*height)))
>-+                {
>-+                    int row;
>-+                    for (row = 0; row < height; row++)
>-+                        memcpy(&compressedBuffer.data[packedStride*row], &((const deUint8*)data)[row*stride], (size_t)(pixelSize*width));
>-+                }
>-+                else
>-+                {
>-+                    qpPrintf("ERROR: Failed to pack pixels for writing.\n");
>-+                    Buffer_deinit(&compressedBuffer);
>-+                    return DE_FALSE;
>-+                }
>-+            }
>-+
>-+            writeDataBytes = (size_t)(packedStride*height);
>-+            break;
>-+        }
>- 
>- #if defined(QP_SUPPORT_PNG)
>--		case QP_IMAGE_COMPRESSION_MODE_PNG:
>--			DE_ASSERT(writeDataPtr); /* Already handled. */
>--			break;
>-+        case QP_IMAGE_COMPRESSION_MODE_PNG:
>-+            DE_ASSERT(writeDataPtr); /* Already handled. */
>-+            break;
>- #endif
>- 
>--		default:
>--			qpPrintf("qpTestLog_writeImage(): Unknown compression mode: %s\n", QP_LOOKUP_STRING(s_qpImageCompressionModeMap, compressionMode));
>--			Buffer_deinit(&compressedBuffer);
>--			return DE_FALSE;
>--	}
>--
>--	/* Fill in attributes. */
>--	int32ToString(width, widthStr);
>--	int32ToString(height, heightStr);
>--	attribs[numAttribs++] = qpSetStringAttrib("Name", name);
>--	attribs[numAttribs++] = qpSetStringAttrib("Width", widthStr);
>--	attribs[numAttribs++] = qpSetStringAttrib("Height", heightStr);
>--	attribs[numAttribs++] = qpSetStringAttrib("Format", QP_LOOKUP_STRING(s_qpImageFormatMap, imageFormat));
>--	attribs[numAttribs++] = qpSetStringAttrib("CompressionMode", QP_LOOKUP_STRING(s_qpImageCompressionModeMap, compressionMode));
>--	if (description) attribs[numAttribs++] = qpSetStringAttrib("Description", description);
>--
>--	/* \note Log lock is acquired after compression! */
>--	deMutex_lock(log->lock);
>--
>--	/* <Image ID="result" Name="Foobar" Width="640" Height="480" Format="RGB888" CompressionMode="None">base64 data</Image> */
>--	if (!qpXmlWriter_startElement(log->writer, "Image", numAttribs, attribs) ||
>--		!qpXmlWriter_writeBase64(log->writer, (const deUint8*)writeDataPtr, writeDataBytes) ||
>--		!qpXmlWriter_endElement(log->writer, "Image"))
>--	{
>--		qpPrintf("qpTestLog_writeImage(): Writing XML failed\n");
>--		deMutex_unlock(log->lock);
>--		Buffer_deinit(&compressedBuffer);
>--		return DE_FALSE;
>--	}
>--
>--	deMutex_unlock(log->lock);
>--
>--	/* Free compressed data if allocated. */
>--	Buffer_deinit(&compressedBuffer);
>--
>--	return DE_TRUE;
>-+        default:
>-+            qpPrintf("qpTestLog_writeImage(): Unknown compression mode: %s\n", QP_LOOKUP_STRING(s_qpImageCompressionModeMap, compressionMode));
>-+            Buffer_deinit(&compressedBuffer);
>-+            return DE_FALSE;
>-+    }
>-+
>-+    /* Fill in attributes. */
>-+    int32ToString(width, widthStr);
>-+    int32ToString(height, heightStr);
>-+    attribs[numAttribs++] = qpSetStringAttrib("Name", name);
>-+    attribs[numAttribs++] = qpSetStringAttrib("Width", widthStr);
>-+    attribs[numAttribs++] = qpSetStringAttrib("Height", heightStr);
>-+    attribs[numAttribs++] = qpSetStringAttrib("Format", QP_LOOKUP_STRING(s_qpImageFormatMap, imageFormat));
>-+    attribs[numAttribs++] = qpSetStringAttrib("CompressionMode", QP_LOOKUP_STRING(s_qpImageCompressionModeMap, compressionMode));
>-+    if (description) attribs[numAttribs++] = qpSetStringAttrib("Description", description);
>-+
>-+    /* \note Log lock is acquired after compression! */
>-+    deMutex_lock(log->lock);
>-+
>-+    /* <Image ID="result" Name="Foobar" Width="640" Height="480" Format="RGB888" CompressionMode="None">base64 data</Image> */
>-+    if (!qpXmlWriter_startElement(log->writer, "Image", numAttribs, attribs) ||
>-+        !qpXmlWriter_writeBase64(log->writer, (const deUint8*)writeDataPtr, writeDataBytes) ||
>-+        !qpXmlWriter_endElement(log->writer, "Image"))
>-+    {
>-+        qpPrintf("qpTestLog_writeImage(): Writing XML failed\n");
>-+        deMutex_unlock(log->lock);
>-+        Buffer_deinit(&compressedBuffer);
>-+        return DE_FALSE;
>-+    }
>-+
>-+    deMutex_unlock(log->lock);
>-+
>-+    /* Free compressed data if allocated. */
>-+    Buffer_deinit(&compressedBuffer);
>-+
>-+    return DE_TRUE;
>- }
>- 
>- /*--------------------------------------------------------------------*//*!
>-  * \brief Write a OpenGL ES shader program into the log.
>-- * \param linkOk			Shader program link result, false on failure
>-- * \param linkInfoLog		Implementation provided linkage log
>-+ * \param linkOk            Shader program link result, false on failure
>-+ * \param linkInfoLog       Implementation provided linkage log
>-  *//*--------------------------------------------------------------------*/
>- deBool qpTestLog_startShaderProgram (qpTestLog* log, deBool linkOk, const char* linkInfoLog)
>- {
>--	qpXmlAttribute	programAttribs[4];
>--	int				numProgramAttribs = 0;
>-+    qpXmlAttribute  programAttribs[4];
>-+    int             numProgramAttribs = 0;
>- 
>--	DE_ASSERT(log);
>--	deMutex_lock(log->lock);
>-+    DE_ASSERT(log);
>-+    deMutex_lock(log->lock);
>- 
>--	programAttribs[numProgramAttribs++] = qpSetStringAttrib("LinkStatus", linkOk ? "OK" : "Fail");
>-+    programAttribs[numProgramAttribs++] = qpSetStringAttrib("LinkStatus", linkOk ? "OK" : "Fail");
>- 
>--	if (!qpXmlWriter_startElement(log->writer, "ShaderProgram", numProgramAttribs, programAttribs) ||
>--		!qpXmlWriter_writeStringElement(log->writer, "InfoLog", linkInfoLog))
>--	{
>--		qpPrintf("qpTestLog_startShaderProgram(): Writing XML failed\n");
>--		deMutex_unlock(log->lock);
>--		return DE_FALSE;
>--	}
>-+    if (!qpXmlWriter_startElement(log->writer, "ShaderProgram", numProgramAttribs, programAttribs) ||
>-+        !qpXmlWriter_writeStringElement(log->writer, "InfoLog", linkInfoLog))
>-+    {
>-+        qpPrintf("qpTestLog_startShaderProgram(): Writing XML failed\n");
>-+        deMutex_unlock(log->lock);
>-+        return DE_FALSE;
>-+    }
>- 
>--	DE_ASSERT(ContainerStack_push(&log->containerStack, CONTAINERTYPE_SHADERPROGRAM));
>-+    DE_ASSERT(ContainerStack_push(&log->containerStack, CONTAINERTYPE_SHADERPROGRAM));
>- 
>--	deMutex_unlock(log->lock);
>--	return DE_TRUE;
>-+    deMutex_unlock(log->lock);
>-+    return DE_TRUE;
>- }
>- 
>- /*--------------------------------------------------------------------*//*!
>-  * \brief End shader program
>-- * \param log			qpTestLog instance
>-+ * \param log           qpTestLog instance
>-  * \return true if ok, false otherwise
>-  *//*--------------------------------------------------------------------*/
>- deBool qpTestLog_endShaderProgram (qpTestLog* log)
>- {
>--	DE_ASSERT(log);
>--	deMutex_lock(log->lock);
>-+    DE_ASSERT(log);
>-+    deMutex_lock(log->lock);
>- 
>--	/* </ShaderProgram> */
>--	if (!qpXmlWriter_endElement(log->writer, "ShaderProgram"))
>--	{
>--		qpPrintf("qpTestLog_endShaderProgram(): Writing XML failed\n");
>--		deMutex_unlock(log->lock);
>--		return DE_FALSE;
>--	}
>-+    /* </ShaderProgram> */
>-+    if (!qpXmlWriter_endElement(log->writer, "ShaderProgram"))
>-+    {
>-+        qpPrintf("qpTestLog_endShaderProgram(): Writing XML failed\n");
>-+        deMutex_unlock(log->lock);
>-+        return DE_FALSE;
>-+    }
>- 
>--	DE_ASSERT(ContainerStack_pop(&log->containerStack) == CONTAINERTYPE_SHADERPROGRAM);
>-+    DE_ASSERT(ContainerStack_pop(&log->containerStack) == CONTAINERTYPE_SHADERPROGRAM);
>- 
>--	deMutex_unlock(log->lock);
>--	return DE_TRUE;
>-+    deMutex_unlock(log->lock);
>-+    return DE_TRUE;
>- }
>- 
>- /*--------------------------------------------------------------------*//*!
>-  * \brief Write a OpenGL ES shader into the log.
>-- * \param type				Shader type
>-- * \param source			Shader source
>-- * \param compileOk			Shader compilation result, false on failure
>-- * \param infoLog			Implementation provided shader compilation log
>-+ * \param type              Shader type
>-+ * \param source            Shader source
>-+ * \param compileOk         Shader compilation result, false on failure
>-+ * \param infoLog           Implementation provided shader compilation log
>-  *//*--------------------------------------------------------------------*/
>- deBool qpTestLog_writeShader (qpTestLog* log, qpShaderType type, const char* source, deBool compileOk, const char* infoLog)
>- {
>--	const char*		tagName				= QP_LOOKUP_STRING(s_qpShaderTypeMap, type);
>--	const char*		sourceStr			= ((log->flags & QP_TEST_LOG_EXCLUDE_SHADER_SOURCES) == 0 || !compileOk) ? source : "";
>--	int				numShaderAttribs	= 0;
>--	qpXmlAttribute	shaderAttribs[4];
>-+    const char*     tagName             = QP_LOOKUP_STRING(s_qpShaderTypeMap, type);
>-+    const char*     sourceStr           = ((log->flags & QP_TEST_LOG_EXCLUDE_SHADER_SOURCES) == 0 || !compileOk) ? source : "";
>-+    int             numShaderAttribs    = 0;
>-+    qpXmlAttribute  shaderAttribs[4];
>- 
>--	deMutex_lock(log->lock);
>-+    deMutex_lock(log->lock);
>- 
>--	DE_ASSERT(source);
>--	DE_ASSERT(ContainerStack_getTop(&log->containerStack) == CONTAINERTYPE_SHADERPROGRAM);
>-+    DE_ASSERT(source);
>-+    DE_ASSERT(ContainerStack_getTop(&log->containerStack) == CONTAINERTYPE_SHADERPROGRAM);
>- 
>--	shaderAttribs[numShaderAttribs++]	= qpSetStringAttrib("CompileStatus", compileOk ? "OK" : "Fail");
>-+    shaderAttribs[numShaderAttribs++]   = qpSetStringAttrib("CompileStatus", compileOk ? "OK" : "Fail");
>- 
>--	if (!qpXmlWriter_startElement(log->writer, tagName, numShaderAttribs, shaderAttribs) ||
>--		!qpXmlWriter_writeStringElement(log->writer, "ShaderSource", sourceStr) ||
>--		!qpXmlWriter_writeStringElement(log->writer, "InfoLog", infoLog) ||
>--		!qpXmlWriter_endElement(log->writer, tagName))
>--	{
>--		qpPrintf("qpTestLog_writeShader(): Writing XML failed\n");
>--		deMutex_unlock(log->lock);
>--		return DE_FALSE;
>--	}
>-+    if (!qpXmlWriter_startElement(log->writer, tagName, numShaderAttribs, shaderAttribs) ||
>-+        !qpXmlWriter_writeStringElement(log->writer, "ShaderSource", sourceStr) ||
>-+        !qpXmlWriter_writeStringElement(log->writer, "InfoLog", infoLog) ||
>-+        !qpXmlWriter_endElement(log->writer, tagName))
>-+    {
>-+        qpPrintf("qpTestLog_writeShader(): Writing XML failed\n");
>-+        deMutex_unlock(log->lock);
>-+        return DE_FALSE;
>-+    }
>- 
>--	deMutex_unlock(log->lock);
>--	return DE_TRUE;
>-+    deMutex_unlock(log->lock);
>-+    return DE_TRUE;
>- }
>- 
>- /*--------------------------------------------------------------------*//*!
>-@@ -1053,28 +1053,28 @@ deBool qpTestLog_writeShader (qpTestLog* log, qpShaderType type, const char* sou
>-  *//*--------------------------------------------------------------------*/
>- deBool qpTestLog_startEglConfigSet (qpTestLog* log, const char* name, const char* description)
>- {
>--	qpXmlAttribute	attribs[4];
>--	int				numAttribs = 0;
>-+    qpXmlAttribute  attribs[4];
>-+    int             numAttribs = 0;
>- 
>--	DE_ASSERT(log && name);
>--	deMutex_lock(log->lock);
>-+    DE_ASSERT(log && name);
>-+    deMutex_lock(log->lock);
>- 
>--	attribs[numAttribs++] = qpSetStringAttrib("Name", name);
>--	if (description)
>--		attribs[numAttribs++] = qpSetStringAttrib("Description", description);
>-+    attribs[numAttribs++] = qpSetStringAttrib("Name", name);
>-+    if (description)
>-+        attribs[numAttribs++] = qpSetStringAttrib("Description", description);
>- 
>--	/* <EglConfigSet Name="<name>"> */
>--	if (!qpXmlWriter_startElement(log->writer, "EglConfigSet", numAttribs, attribs))
>--	{
>--		qpPrintf("qpTestLog_startEglImageSet(): Writing XML failed\n");
>--		deMutex_unlock(log->lock);
>--		return DE_FALSE;
>--	}
>-+    /* <EglConfigSet Name="<name>"> */
>-+    if (!qpXmlWriter_startElement(log->writer, "EglConfigSet", numAttribs, attribs))
>-+    {
>-+        qpPrintf("qpTestLog_startEglImageSet(): Writing XML failed\n");
>-+        deMutex_unlock(log->lock);
>-+        return DE_FALSE;
>-+    }
>- 
>--	DE_ASSERT(ContainerStack_push(&log->containerStack, CONTAINERTYPE_EGLCONFIGSET));
>-+    DE_ASSERT(ContainerStack_push(&log->containerStack, CONTAINERTYPE_EGLCONFIGSET));
>- 
>--	deMutex_unlock(log->lock);
>--	return DE_TRUE;
>-+    deMutex_unlock(log->lock);
>-+    return DE_TRUE;
>- }
>- 
>- /*--------------------------------------------------------------------*//*!
>-@@ -1082,21 +1082,21 @@ deBool qpTestLog_startEglConfigSet (qpTestLog* log, const char* name, const char
>-  *//*--------------------------------------------------------------------*/
>- deBool qpTestLog_endEglConfigSet (qpTestLog* log)
>- {
>--	DE_ASSERT(log);
>--	deMutex_lock(log->lock);
>-+    DE_ASSERT(log);
>-+    deMutex_lock(log->lock);
>- 
>--	/* <EglConfigSet Name="<name>"> */
>--	if (!qpXmlWriter_endElement(log->writer, "EglConfigSet"))
>--	{
>--		qpPrintf("qpTestLog_endEglImageSet(): Writing XML failed\n");
>--		deMutex_unlock(log->lock);
>--		return DE_FALSE;
>--	}
>-+    /* <EglConfigSet Name="<name>"> */
>-+    if (!qpXmlWriter_endElement(log->writer, "EglConfigSet"))
>-+    {
>-+        qpPrintf("qpTestLog_endEglImageSet(): Writing XML failed\n");
>-+        deMutex_unlock(log->lock);
>-+        return DE_FALSE;
>-+    }
>- 
>--	DE_ASSERT(ContainerStack_pop(&log->containerStack) == CONTAINERTYPE_EGLCONFIGSET);
>-+    DE_ASSERT(ContainerStack_pop(&log->containerStack) == CONTAINERTYPE_EGLCONFIGSET);
>- 
>--	deMutex_unlock(log->lock);
>--	return DE_TRUE;
>-+    deMutex_unlock(log->lock);
>-+    return DE_TRUE;
>- }
>- 
>- /*--------------------------------------------------------------------*//*!
>-@@ -1105,111 +1105,111 @@ deBool qpTestLog_endEglConfigSet (qpTestLog* log)
>-  *//*--------------------------------------------------------------------*/
>- deBool qpTestLog_writeEglConfig (qpTestLog* log, const qpEglConfigInfo* config)
>- {
>--	qpXmlAttribute	attribs[64];
>--	int				numAttribs = 0;
>--
>--	DE_ASSERT(log && config);
>--	deMutex_lock(log->lock);
>--
>--	attribs[numAttribs++] = qpSetIntAttrib		("BufferSize", config->bufferSize);
>--	attribs[numAttribs++] = qpSetIntAttrib		("RedSize", config->redSize);
>--	attribs[numAttribs++] = qpSetIntAttrib		("GreenSize", config->greenSize);
>--	attribs[numAttribs++] = qpSetIntAttrib		("BlueSize", config->blueSize);
>--	attribs[numAttribs++] = qpSetIntAttrib		("LuminanceSize", config->luminanceSize);
>--	attribs[numAttribs++] = qpSetIntAttrib		("AlphaSize", config->alphaSize);
>--	attribs[numAttribs++] = qpSetIntAttrib		("AlphaMaskSize", config->alphaMaskSize);
>--	attribs[numAttribs++] = qpSetBoolAttrib		("BindToTextureRGB", config->bindToTextureRGB);
>--	attribs[numAttribs++] = qpSetBoolAttrib		("BindToTextureRGBA", config->bindToTextureRGBA);
>--	attribs[numAttribs++] = qpSetStringAttrib	("ColorBufferType", config->colorBufferType);
>--	attribs[numAttribs++] = qpSetStringAttrib	("ConfigCaveat", config->configCaveat);
>--	attribs[numAttribs++] = qpSetIntAttrib		("ConfigID", config->configID);
>--	attribs[numAttribs++] = qpSetStringAttrib	("Conformant", config->conformant);
>--	attribs[numAttribs++] = qpSetIntAttrib		("DepthSize", config->depthSize);
>--	attribs[numAttribs++] = qpSetIntAttrib		("Level", config->level);
>--	attribs[numAttribs++] = qpSetIntAttrib		("MaxPBufferWidth", config->maxPBufferWidth);
>--	attribs[numAttribs++] = qpSetIntAttrib		("MaxPBufferHeight", config->maxPBufferHeight);
>--	attribs[numAttribs++] = qpSetIntAttrib		("MaxPBufferPixels", config->maxPBufferPixels);
>--	attribs[numAttribs++] = qpSetIntAttrib		("MaxSwapInterval", config->maxSwapInterval);
>--	attribs[numAttribs++] = qpSetIntAttrib		("MinSwapInterval", config->minSwapInterval);
>--	attribs[numAttribs++] = qpSetBoolAttrib		("NativeRenderable", config->nativeRenderable);
>--	attribs[numAttribs++] = qpSetStringAttrib	("RenderableType", config->renderableType);
>--	attribs[numAttribs++] = qpSetIntAttrib		("SampleBuffers", config->sampleBuffers);
>--	attribs[numAttribs++] = qpSetIntAttrib		("Samples", config->samples);
>--	attribs[numAttribs++] = qpSetIntAttrib		("StencilSize", config->stencilSize);
>--	attribs[numAttribs++] = qpSetStringAttrib	("SurfaceTypes", config->surfaceTypes);
>--	attribs[numAttribs++] = qpSetStringAttrib	("TransparentType", config->transparentType);
>--	attribs[numAttribs++] = qpSetIntAttrib		("TransparentRedValue", config->transparentRedValue);
>--	attribs[numAttribs++] = qpSetIntAttrib		("TransparentGreenValue", config->transparentGreenValue);
>--	attribs[numAttribs++] = qpSetIntAttrib		("TransparentBlueValue", config->transparentBlueValue);
>--	DE_ASSERT(numAttribs <= DE_LENGTH_OF_ARRAY(attribs));
>--
>--	if (!qpXmlWriter_startElement(log->writer, "EglConfig", numAttribs, attribs) ||
>--		!qpXmlWriter_endElement(log->writer, "EglConfig"))
>--	{
>--		qpPrintf("qpTestLog_writeEglConfig(): Writing XML failed\n");
>--		deMutex_unlock(log->lock);
>--		return DE_FALSE;
>--	}
>--
>--	deMutex_unlock(log->lock);
>--	return DE_TRUE;
>-+    qpXmlAttribute  attribs[64];
>-+    int             numAttribs = 0;
>-+
>-+    DE_ASSERT(log && config);
>-+    deMutex_lock(log->lock);
>-+
>-+    attribs[numAttribs++] = qpSetIntAttrib      ("BufferSize", config->bufferSize);
>-+    attribs[numAttribs++] = qpSetIntAttrib      ("RedSize", config->redSize);
>-+    attribs[numAttribs++] = qpSetIntAttrib      ("GreenSize", config->greenSize);
>-+    attribs[numAttribs++] = qpSetIntAttrib      ("BlueSize", config->blueSize);
>-+    attribs[numAttribs++] = qpSetIntAttrib      ("LuminanceSize", config->luminanceSize);
>-+    attribs[numAttribs++] = qpSetIntAttrib      ("AlphaSize", config->alphaSize);
>-+    attribs[numAttribs++] = qpSetIntAttrib      ("AlphaMaskSize", config->alphaMaskSize);
>-+    attribs[numAttribs++] = qpSetBoolAttrib     ("BindToTextureRGB", config->bindToTextureRGB);
>-+    attribs[numAttribs++] = qpSetBoolAttrib     ("BindToTextureRGBA", config->bindToTextureRGBA);
>-+    attribs[numAttribs++] = qpSetStringAttrib   ("ColorBufferType", config->colorBufferType);
>-+    attribs[numAttribs++] = qpSetStringAttrib   ("ConfigCaveat", config->configCaveat);
>-+    attribs[numAttribs++] = qpSetIntAttrib      ("ConfigID", config->configID);
>-+    attribs[numAttribs++] = qpSetStringAttrib   ("Conformant", config->conformant);
>-+    attribs[numAttribs++] = qpSetIntAttrib      ("DepthSize", config->depthSize);
>-+    attribs[numAttribs++] = qpSetIntAttrib      ("Level", config->level);
>-+    attribs[numAttribs++] = qpSetIntAttrib      ("MaxPBufferWidth", config->maxPBufferWidth);
>-+    attribs[numAttribs++] = qpSetIntAttrib      ("MaxPBufferHeight", config->maxPBufferHeight);
>-+    attribs[numAttribs++] = qpSetIntAttrib      ("MaxPBufferPixels", config->maxPBufferPixels);
>-+    attribs[numAttribs++] = qpSetIntAttrib      ("MaxSwapInterval", config->maxSwapInterval);
>-+    attribs[numAttribs++] = qpSetIntAttrib      ("MinSwapInterval", config->minSwapInterval);
>-+    attribs[numAttribs++] = qpSetBoolAttrib     ("NativeRenderable", config->nativeRenderable);
>-+    attribs[numAttribs++] = qpSetStringAttrib   ("RenderableType", config->renderableType);
>-+    attribs[numAttribs++] = qpSetIntAttrib      ("SampleBuffers", config->sampleBuffers);
>-+    attribs[numAttribs++] = qpSetIntAttrib      ("Samples", config->samples);
>-+    attribs[numAttribs++] = qpSetIntAttrib      ("StencilSize", config->stencilSize);
>-+    attribs[numAttribs++] = qpSetStringAttrib   ("SurfaceTypes", config->surfaceTypes);
>-+    attribs[numAttribs++] = qpSetStringAttrib   ("TransparentType", config->transparentType);
>-+    attribs[numAttribs++] = qpSetIntAttrib      ("TransparentRedValue", config->transparentRedValue);
>-+    attribs[numAttribs++] = qpSetIntAttrib      ("TransparentGreenValue", config->transparentGreenValue);
>-+    attribs[numAttribs++] = qpSetIntAttrib      ("TransparentBlueValue", config->transparentBlueValue);
>-+    DE_ASSERT(numAttribs <= DE_LENGTH_OF_ARRAY(attribs));
>-+
>-+    if (!qpXmlWriter_startElement(log->writer, "EglConfig", numAttribs, attribs) ||
>-+        !qpXmlWriter_endElement(log->writer, "EglConfig"))
>-+    {
>-+        qpPrintf("qpTestLog_writeEglConfig(): Writing XML failed\n");
>-+        deMutex_unlock(log->lock);
>-+        return DE_FALSE;
>-+    }
>-+
>-+    deMutex_unlock(log->lock);
>-+    return DE_TRUE;
>- }
>- 
>- /*--------------------------------------------------------------------*//*!
>-  * \brief Start section in log.
>-- * \param log			qpTestLog instance
>-- * \param name			Section name
>-- * \param description	Human readable description
>-+ * \param log           qpTestLog instance
>-+ * \param name          Section name
>-+ * \param description   Human readable description
>-  * \return true if ok, false otherwise
>-  *//*--------------------------------------------------------------------*/
>- deBool qpTestLog_startSection (qpTestLog* log, const char* name, const char* description)
>- {
>--	qpXmlAttribute	attribs[2];
>--	int				numAttribs = 0;
>-+    qpXmlAttribute  attribs[2];
>-+    int             numAttribs = 0;
>- 
>--	DE_ASSERT(log && name);
>--	deMutex_lock(log->lock);
>-+    DE_ASSERT(log && name);
>-+    deMutex_lock(log->lock);
>- 
>--	attribs[numAttribs++] = qpSetStringAttrib("Name", name);
>--	if (description)
>--		attribs[numAttribs++] = qpSetStringAttrib("Description", description);
>-+    attribs[numAttribs++] = qpSetStringAttrib("Name", name);
>-+    if (description)
>-+        attribs[numAttribs++] = qpSetStringAttrib("Description", description);
>- 
>--	/* <Section Name="<name>" Description="<description>"> */
>--	if (!qpXmlWriter_startElement(log->writer, "Section", numAttribs, attribs))
>--	{
>--		qpPrintf("qpTestLog_startSection(): Writing XML failed\n");
>--		deMutex_unlock(log->lock);
>--		return DE_FALSE;
>--	}
>-+    /* <Section Name="<name>" Description="<description>"> */
>-+    if (!qpXmlWriter_startElement(log->writer, "Section", numAttribs, attribs))
>-+    {
>-+        qpPrintf("qpTestLog_startSection(): Writing XML failed\n");
>-+        deMutex_unlock(log->lock);
>-+        return DE_FALSE;
>-+    }
>- 
>--	DE_ASSERT(ContainerStack_push(&log->containerStack, CONTAINERTYPE_SECTION));
>-+    DE_ASSERT(ContainerStack_push(&log->containerStack, CONTAINERTYPE_SECTION));
>- 
>--	deMutex_unlock(log->lock);
>--	return DE_TRUE;
>-+    deMutex_unlock(log->lock);
>-+    return DE_TRUE;
>- }
>- 
>- /*--------------------------------------------------------------------*//*!
>-  * \brief End section in log.
>-- * \param log			qpTestLog instance
>-+ * \param log           qpTestLog instance
>-  * \return true if ok, false otherwise
>-  *//*--------------------------------------------------------------------*/
>- deBool qpTestLog_endSection (qpTestLog* log)
>- {
>--	DE_ASSERT(log);
>--	deMutex_lock(log->lock);
>-+    DE_ASSERT(log);
>-+    deMutex_lock(log->lock);
>- 
>--	/* </Section> */
>--	if (!qpXmlWriter_endElement(log->writer, "Section"))
>--	{
>--		qpPrintf("qpTestLog_endSection(): Writing XML failed\n");
>--		deMutex_unlock(log->lock);
>--		return DE_FALSE;
>--	}
>-+    /* </Section> */
>-+    if (!qpXmlWriter_endElement(log->writer, "Section"))
>-+    {
>-+        qpPrintf("qpTestLog_endSection(): Writing XML failed\n");
>-+        deMutex_unlock(log->lock);
>-+        return DE_FALSE;
>-+    }
>- 
>--	DE_ASSERT(ContainerStack_pop(&log->containerStack) == CONTAINERTYPE_SECTION);
>-+    DE_ASSERT(ContainerStack_pop(&log->containerStack) == CONTAINERTYPE_SECTION);
>- 
>--	deMutex_unlock(log->lock);
>--	return DE_TRUE;
>-+    deMutex_unlock(log->lock);
>-+    return DE_TRUE;
>- }
>- 
>- /*--------------------------------------------------------------------*//*!
>-@@ -1217,20 +1217,20 @@ deBool qpTestLog_endSection (qpTestLog* log)
>-  *//*--------------------------------------------------------------------*/
>- deBool qpTestLog_writeKernelSource (qpTestLog* log, const char* source)
>- {
>--	const char*		sourceStr	= (log->flags & QP_TEST_LOG_EXCLUDE_SHADER_SOURCES) != 0 ? "" : source;
>-+    const char*     sourceStr   = (log->flags & QP_TEST_LOG_EXCLUDE_SHADER_SOURCES) != 0 ? "" : source;
>- 
>--	DE_ASSERT(log);
>--	deMutex_lock(log->lock);
>-+    DE_ASSERT(log);
>-+    deMutex_lock(log->lock);
>- 
>--	if (!qpXmlWriter_writeStringElement(log->writer, "KernelSource", sourceStr))
>--	{
>--		qpPrintf("qpTestLog_writeKernelSource(): Writing XML failed\n");
>--		deMutex_unlock(log->lock);
>--		return DE_FALSE;
>--	}
>-+    if (!qpXmlWriter_writeStringElement(log->writer, "KernelSource", sourceStr))
>-+    {
>-+        qpPrintf("qpTestLog_writeKernelSource(): Writing XML failed\n");
>-+        deMutex_unlock(log->lock);
>-+        return DE_FALSE;
>-+    }
>- 
>--	deMutex_unlock(log->lock);
>--	return DE_TRUE;
>-+    deMutex_unlock(log->lock);
>-+    return DE_TRUE;
>- }
>- 
>- /*--------------------------------------------------------------------*//*!
>-@@ -1238,21 +1238,21 @@ deBool qpTestLog_writeKernelSource (qpTestLog* log, const char* source)
>-  *//*--------------------------------------------------------------------*/
>- deBool qpTestLog_writeSpirVAssemblySource (qpTestLog* log, const char* source)
>- {
>--	const char* const	sourceStr	= (log->flags & QP_TEST_LOG_EXCLUDE_SHADER_SOURCES) != 0 ? "" : source;
>-+    const char* const   sourceStr   = (log->flags & QP_TEST_LOG_EXCLUDE_SHADER_SOURCES) != 0 ? "" : source;
>- 
>--	deMutex_lock(log->lock);
>-+    deMutex_lock(log->lock);
>- 
>--	DE_ASSERT(ContainerStack_getTop(&log->containerStack) == CONTAINERTYPE_SHADERPROGRAM);
>-+    DE_ASSERT(ContainerStack_getTop(&log->containerStack) == CONTAINERTYPE_SHADERPROGRAM);
>- 
>--	if (!qpXmlWriter_writeStringElement(log->writer, "SpirVAssemblySource", sourceStr))
>--	{
>--		qpPrintf("qpTestLog_writeSpirVAssemblySource(): Writing XML failed\n");
>--		deMutex_unlock(log->lock);
>--		return DE_FALSE;
>--	}
>-+    if (!qpXmlWriter_writeStringElement(log->writer, "SpirVAssemblySource", sourceStr))
>-+    {
>-+        qpPrintf("qpTestLog_writeSpirVAssemblySource(): Writing XML failed\n");
>-+        deMutex_unlock(log->lock);
>-+        return DE_FALSE;
>-+    }
>- 
>--	deMutex_unlock(log->lock);
>--	return DE_TRUE;
>-+    deMutex_unlock(log->lock);
>-+    return DE_TRUE;
>- }
>- 
>- /*--------------------------------------------------------------------*//*!
>-@@ -1260,222 +1260,222 @@ deBool qpTestLog_writeSpirVAssemblySource (qpTestLog* log, const char* source)
>-  *//*--------------------------------------------------------------------*/
>- deBool qpTestLog_writeCompileInfo (qpTestLog* log, const char* name, const char* description, deBool compileOk, const char* infoLog)
>- {
>--	int				numAttribs = 0;
>--	qpXmlAttribute	attribs[3];
>-+    int             numAttribs = 0;
>-+    qpXmlAttribute  attribs[3];
>- 
>--	DE_ASSERT(log && name && description && infoLog);
>--	deMutex_lock(log->lock);
>-+    DE_ASSERT(log && name && description && infoLog);
>-+    deMutex_lock(log->lock);
>- 
>--	attribs[numAttribs++] = qpSetStringAttrib("Name", name);
>--	attribs[numAttribs++] = qpSetStringAttrib("Description", description);
>--	attribs[numAttribs++] = qpSetStringAttrib("CompileStatus", compileOk ? "OK" : "Fail");
>-+    attribs[numAttribs++] = qpSetStringAttrib("Name", name);
>-+    attribs[numAttribs++] = qpSetStringAttrib("Description", description);
>-+    attribs[numAttribs++] = qpSetStringAttrib("CompileStatus", compileOk ? "OK" : "Fail");
>- 
>--	if (!qpXmlWriter_startElement(log->writer, "CompileInfo", numAttribs, attribs) ||
>--		!qpXmlWriter_writeStringElement(log->writer, "InfoLog", infoLog) ||
>--		!qpXmlWriter_endElement(log->writer, "CompileInfo"))
>--	{
>--		qpPrintf("qpTestLog_writeCompileInfo(): Writing XML failed\n");
>--		deMutex_unlock(log->lock);
>--		return DE_FALSE;
>--	}
>-+    if (!qpXmlWriter_startElement(log->writer, "CompileInfo", numAttribs, attribs) ||
>-+        !qpXmlWriter_writeStringElement(log->writer, "InfoLog", infoLog) ||
>-+        !qpXmlWriter_endElement(log->writer, "CompileInfo"))
>-+    {
>-+        qpPrintf("qpTestLog_writeCompileInfo(): Writing XML failed\n");
>-+        deMutex_unlock(log->lock);
>-+        return DE_FALSE;
>-+    }
>- 
>--	deMutex_unlock(log->lock);
>--	return DE_TRUE;
>-+    deMutex_unlock(log->lock);
>-+    return DE_TRUE;
>- }
>- 
>- deBool qpTestLog_startSampleList (qpTestLog* log, const char* name, const char* description)
>- {
>--	int				numAttribs = 0;
>--	qpXmlAttribute	attribs[2];
>-+    int             numAttribs = 0;
>-+    qpXmlAttribute  attribs[2];
>- 
>--	DE_ASSERT(log && name && description);
>--	deMutex_lock(log->lock);
>-+    DE_ASSERT(log && name && description);
>-+    deMutex_lock(log->lock);
>- 
>--	attribs[numAttribs++] = qpSetStringAttrib("Name", name);
>--	attribs[numAttribs++] = qpSetStringAttrib("Description", description);
>-+    attribs[numAttribs++] = qpSetStringAttrib("Name", name);
>-+    attribs[numAttribs++] = qpSetStringAttrib("Description", description);
>- 
>--	if (!qpXmlWriter_startElement(log->writer, "SampleList", numAttribs, attribs))
>--	{
>--		qpPrintf("qpTestLog_startSampleList(): Writing XML failed\n");
>--		deMutex_unlock(log->lock);
>--		return DE_FALSE;
>--	}
>-+    if (!qpXmlWriter_startElement(log->writer, "SampleList", numAttribs, attribs))
>-+    {
>-+        qpPrintf("qpTestLog_startSampleList(): Writing XML failed\n");
>-+        deMutex_unlock(log->lock);
>-+        return DE_FALSE;
>-+    }
>- 
>--	DE_ASSERT(ContainerStack_push(&log->containerStack, CONTAINERTYPE_SAMPLELIST));
>-+    DE_ASSERT(ContainerStack_push(&log->containerStack, CONTAINERTYPE_SAMPLELIST));
>- 
>--	deMutex_unlock(log->lock);
>--	return DE_TRUE;
>-+    deMutex_unlock(log->lock);
>-+    return DE_TRUE;
>- }
>- 
>- deBool qpTestLog_startSampleInfo (qpTestLog* log)
>- {
>--	DE_ASSERT(log);
>--	deMutex_lock(log->lock);
>-+    DE_ASSERT(log);
>-+    deMutex_lock(log->lock);
>- 
>--	if (!qpXmlWriter_startElement(log->writer, "SampleInfo", 0, DE_NULL))
>--	{
>--		qpPrintf("qpTestLog_startSampleInfo(): Writing XML failed\n");
>--		deMutex_unlock(log->lock);
>--		return DE_FALSE;
>--	}
>-+    if (!qpXmlWriter_startElement(log->writer, "SampleInfo", 0, DE_NULL))
>-+    {
>-+        qpPrintf("qpTestLog_startSampleInfo(): Writing XML failed\n");
>-+        deMutex_unlock(log->lock);
>-+        return DE_FALSE;
>-+    }
>- 
>--	DE_ASSERT(ContainerStack_push(&log->containerStack, CONTAINERTYPE_SAMPLEINFO));
>-+    DE_ASSERT(ContainerStack_push(&log->containerStack, CONTAINERTYPE_SAMPLEINFO));
>- 
>--	deMutex_unlock(log->lock);
>--	return DE_TRUE;
>-+    deMutex_unlock(log->lock);
>-+    return DE_TRUE;
>- }
>- 
>- deBool qpTestLog_writeValueInfo (qpTestLog* log, const char* name, const char* description, const char* unit, qpSampleValueTag tag)
>- {
>--	const char*		tagName		= QP_LOOKUP_STRING(s_qpSampleValueTagMap, tag);
>--	int				numAttribs	= 0;
>--	qpXmlAttribute	attribs[4];
>-+    const char*     tagName     = QP_LOOKUP_STRING(s_qpSampleValueTagMap, tag);
>-+    int             numAttribs  = 0;
>-+    qpXmlAttribute  attribs[4];
>- 
>--	DE_ASSERT(log && name && description && tagName);
>--	deMutex_lock(log->lock);
>-+    DE_ASSERT(log && name && description && tagName);
>-+    deMutex_lock(log->lock);
>- 
>--	DE_ASSERT(ContainerStack_getTop(&log->containerStack) == CONTAINERTYPE_SAMPLEINFO);
>-+    DE_ASSERT(ContainerStack_getTop(&log->containerStack) == CONTAINERTYPE_SAMPLEINFO);
>- 
>--	attribs[numAttribs++] = qpSetStringAttrib("Name", name);
>--	attribs[numAttribs++] = qpSetStringAttrib("Description", description);
>--	attribs[numAttribs++] = qpSetStringAttrib("Tag", tagName);
>-+    attribs[numAttribs++] = qpSetStringAttrib("Name", name);
>-+    attribs[numAttribs++] = qpSetStringAttrib("Description", description);
>-+    attribs[numAttribs++] = qpSetStringAttrib("Tag", tagName);
>- 
>--	if (unit)
>--		attribs[numAttribs++] = qpSetStringAttrib("Unit", unit);
>-+    if (unit)
>-+        attribs[numAttribs++] = qpSetStringAttrib("Unit", unit);
>- 
>--	if (!qpXmlWriter_startElement(log->writer, "ValueInfo", numAttribs, attribs) ||
>--		!qpXmlWriter_endElement(log->writer, "ValueInfo"))
>--	{
>--		qpPrintf("qpTestLog_writeValueInfo(): Writing XML failed\n");
>--		deMutex_unlock(log->lock);
>--		return DE_FALSE;
>--	}
>-+    if (!qpXmlWriter_startElement(log->writer, "ValueInfo", numAttribs, attribs) ||
>-+        !qpXmlWriter_endElement(log->writer, "ValueInfo"))
>-+    {
>-+        qpPrintf("qpTestLog_writeValueInfo(): Writing XML failed\n");
>-+        deMutex_unlock(log->lock);
>-+        return DE_FALSE;
>-+    }
>- 
>--	deMutex_unlock(log->lock);
>--	return DE_TRUE;
>-+    deMutex_unlock(log->lock);
>-+    return DE_TRUE;
>- }
>- 
>- deBool qpTestLog_endSampleInfo (qpTestLog* log)
>- {
>--	DE_ASSERT(log);
>--	deMutex_lock(log->lock);
>-+    DE_ASSERT(log);
>-+    deMutex_lock(log->lock);
>- 
>--	if (!qpXmlWriter_endElement(log->writer, "SampleInfo"))
>--	{
>--		qpPrintf("qpTestLog_endSampleInfo(): Writing XML failed\n");
>--		deMutex_unlock(log->lock);
>--		return DE_FALSE;
>--	}
>-+    if (!qpXmlWriter_endElement(log->writer, "SampleInfo"))
>-+    {
>-+        qpPrintf("qpTestLog_endSampleInfo(): Writing XML failed\n");
>-+        deMutex_unlock(log->lock);
>-+        return DE_FALSE;
>-+    }
>- 
>--	DE_ASSERT(ContainerStack_pop(&log->containerStack) == CONTAINERTYPE_SAMPLEINFO);
>-+    DE_ASSERT(ContainerStack_pop(&log->containerStack) == CONTAINERTYPE_SAMPLEINFO);
>- 
>--	deMutex_unlock(log->lock);
>--	return DE_TRUE;
>-+    deMutex_unlock(log->lock);
>-+    return DE_TRUE;
>- }
>- 
>- deBool qpTestLog_startSample (qpTestLog* log)
>- {
>--	DE_ASSERT(log);
>--	deMutex_lock(log->lock);
>-+    DE_ASSERT(log);
>-+    deMutex_lock(log->lock);
>- 
>--	DE_ASSERT(ContainerStack_getTop(&log->containerStack) == CONTAINERTYPE_SAMPLELIST);
>-+    DE_ASSERT(ContainerStack_getTop(&log->containerStack) == CONTAINERTYPE_SAMPLELIST);
>- 
>--	if (!qpXmlWriter_startElement(log->writer, "Sample", 0, DE_NULL))
>--	{
>--		qpPrintf("qpTestLog_startSample(): Writing XML failed\n");
>--		deMutex_unlock(log->lock);
>--		return DE_FALSE;
>--	}
>-+    if (!qpXmlWriter_startElement(log->writer, "Sample", 0, DE_NULL))
>-+    {
>-+        qpPrintf("qpTestLog_startSample(): Writing XML failed\n");
>-+        deMutex_unlock(log->lock);
>-+        return DE_FALSE;
>-+    }
>- 
>--	DE_ASSERT(ContainerStack_push(&log->containerStack, CONTAINERTYPE_SAMPLE));
>-+    DE_ASSERT(ContainerStack_push(&log->containerStack, CONTAINERTYPE_SAMPLE));
>- 
>--	deMutex_unlock(log->lock);
>--	return DE_TRUE;
>-+    deMutex_unlock(log->lock);
>-+    return DE_TRUE;
>- }
>- 
>- deBool qpTestLog_writeValueFloat (qpTestLog* log, double value)
>- {
>--	char tmpString[512];
>--	doubleToString(value, tmpString, (int)sizeof(tmpString));
>-+    char tmpString[512];
>-+    doubleToString(value, tmpString, (int)sizeof(tmpString));
>- 
>--	deMutex_lock(log->lock);
>-+    deMutex_lock(log->lock);
>- 
>--	DE_ASSERT(ContainerStack_getTop(&log->containerStack) == CONTAINERTYPE_SAMPLE);
>-+    DE_ASSERT(ContainerStack_getTop(&log->containerStack) == CONTAINERTYPE_SAMPLE);
>- 
>--	if (!qpXmlWriter_writeStringElement(log->writer, "Value", &tmpString[0]))
>--	{
>--		qpPrintf("qpTestLog_writeSampleValue(): Writing XML failed\n");
>--		deMutex_unlock(log->lock);
>--		return DE_FALSE;
>--	}
>-+    if (!qpXmlWriter_writeStringElement(log->writer, "Value", &tmpString[0]))
>-+    {
>-+        qpPrintf("qpTestLog_writeSampleValue(): Writing XML failed\n");
>-+        deMutex_unlock(log->lock);
>-+        return DE_FALSE;
>-+    }
>- 
>--	deMutex_unlock(log->lock);
>--	return DE_TRUE;
>-+    deMutex_unlock(log->lock);
>-+    return DE_TRUE;
>- }
>- 
>- deBool qpTestLog_writeValueInteger (qpTestLog* log, deInt64 value)
>- {
>--	char tmpString[64];
>--	int64ToString(value, tmpString);
>-+    char tmpString[64];
>-+    int64ToString(value, tmpString);
>- 
>--	deMutex_lock(log->lock);
>-+    deMutex_lock(log->lock);
>- 
>--	DE_ASSERT(ContainerStack_getTop(&log->containerStack) == CONTAINERTYPE_SAMPLE);
>-+    DE_ASSERT(ContainerStack_getTop(&log->containerStack) == CONTAINERTYPE_SAMPLE);
>- 
>--	if (!qpXmlWriter_writeStringElement(log->writer, "Value", &tmpString[0]))
>--	{
>--		qpPrintf("qpTestLog_writeSampleValue(): Writing XML failed\n");
>--		deMutex_unlock(log->lock);
>--		return DE_FALSE;
>--	}
>-+    if (!qpXmlWriter_writeStringElement(log->writer, "Value", &tmpString[0]))
>-+    {
>-+        qpPrintf("qpTestLog_writeSampleValue(): Writing XML failed\n");
>-+        deMutex_unlock(log->lock);
>-+        return DE_FALSE;
>-+    }
>- 
>--	deMutex_unlock(log->lock);
>--	return DE_TRUE;
>-+    deMutex_unlock(log->lock);
>-+    return DE_TRUE;
>- }
>- 
>- deBool qpTestLog_endSample (qpTestLog* log)
>- {
>--	DE_ASSERT(log);
>--	deMutex_lock(log->lock);
>-+    DE_ASSERT(log);
>-+    deMutex_lock(log->lock);
>- 
>--	if (!qpXmlWriter_endElement(log->writer, "Sample"))
>--	{
>--		qpPrintf("qpTestLog_endSample(): Writing XML failed\n");
>--		deMutex_unlock(log->lock);
>--		return DE_FALSE;
>--	}
>-+    if (!qpXmlWriter_endElement(log->writer, "Sample"))
>-+    {
>-+        qpPrintf("qpTestLog_endSample(): Writing XML failed\n");
>-+        deMutex_unlock(log->lock);
>-+        return DE_FALSE;
>-+    }
>- 
>--	DE_ASSERT(ContainerStack_pop(&log->containerStack) == CONTAINERTYPE_SAMPLE);
>-+    DE_ASSERT(ContainerStack_pop(&log->containerStack) == CONTAINERTYPE_SAMPLE);
>- 
>--	deMutex_unlock(log->lock);
>--	return DE_TRUE;
>-+    deMutex_unlock(log->lock);
>-+    return DE_TRUE;
>- }
>- 
>- deBool qpTestLog_endSampleList (qpTestLog* log)
>- {
>--	DE_ASSERT(log);
>--	deMutex_lock(log->lock);
>-+    DE_ASSERT(log);
>-+    deMutex_lock(log->lock);
>- 
>--	if (!qpXmlWriter_endElement(log->writer, "SampleList"))
>--	{
>--		qpPrintf("qpTestLog_endSampleList(): Writing XML failed\n");
>--		deMutex_unlock(log->lock);
>--		return DE_FALSE;
>--	}
>-+    if (!qpXmlWriter_endElement(log->writer, "SampleList"))
>-+    {
>-+        qpPrintf("qpTestLog_endSampleList(): Writing XML failed\n");
>-+        deMutex_unlock(log->lock);
>-+        return DE_FALSE;
>-+    }
>- 
>--	DE_ASSERT(ContainerStack_pop(&log->containerStack) == CONTAINERTYPE_SAMPLELIST);
>-+    DE_ASSERT(ContainerStack_pop(&log->containerStack) == CONTAINERTYPE_SAMPLELIST);
>- 
>--	deMutex_unlock(log->lock);
>--	return DE_TRUE;
>-+    deMutex_unlock(log->lock);
>-+    return DE_TRUE;
>- }
>- 
>- deUint32 qpTestLog_getLogFlags (const qpTestLog* log)
>- {
>--	DE_ASSERT(log);
>--	return log->flags;
>-+    DE_ASSERT(log);
>-+    return log->flags;
>- }
>- 
>- const char* qpGetTestResultName (qpTestResult result)
>- {
>--	return QP_LOOKUP_STRING(s_qpTestResultMap, result);
>-+    return QP_LOOKUP_STRING(s_qpTestResultMap, result);
>- }
>-diff --git a/src/tests/perf_tests/MultiviewPerf.cpp b/src/tests/perf_tests/MultiviewPerf.cpp
>-index 8c106b493..c3d99d23d 100644
>---- a/src/tests/perf_tests/MultiviewPerf.cpp
>-+++ b/src/tests/perf_tests/MultiviewPerf.cpp
>-@@ -273,7 +273,7 @@ void MultiviewCPUBoundBenchmark::initializeBenchmark()
>-         "{\n"
>-         "   vec4 v = vPosition;\n"
>-         "   v.xy += uOffset;\n"
>--        "	gl_Position = v;\n"
>-+        "   gl_Position = v;\n"
>-         "}\n";
>- 
>-     const std::string &fs =
>-@@ -371,7 +371,7 @@ void MultiviewGPUBoundBenchmark::initializeBenchmark()
>-         "   frag_Col3 = vert_Col3;\n"
>-         "   frag_Col4 = vert_Col4;\n"
>-         "   frag_Col5 = vert_Col5;\n"
>--        "	gl_Position = vPosition;\n"
>-+        "   gl_Position = vPosition;\n"
>-         "}\n";
>- 
>-     const std::string &fs =
>-diff --git a/src/tests/third_party/rapidjson/include/rapidjson/prettywriter.h b/src/tests/third_party/rapidjson/include/rapidjson/prettywriter.h
>-index ce2dac5a1..1d7c70f02 100644
>---- a/src/tests/third_party/rapidjson/include/rapidjson/prettywriter.h
>-+++ b/src/tests/third_party/rapidjson/include/rapidjson/prettywriter.h
>-@@ -89,7 +89,7 @@ public:
>-     }
>- 
>-     bool Key(const Ch* str, SizeType length, bool copy = false) { return String(str, length, copy); }
>--	
>-+    
>-     bool EndObject(SizeType memberCount = 0) {
>-         (void)memberCount;
>-         RAPIDJSON_ASSERT(Base::level_stack_.GetSize() >= sizeof(typename Base::Level));
>-diff --git a/src/tests/third_party/rapidjson/include/rapidjson/reader.h b/src/tests/third_party/rapidjson/include/rapidjson/reader.h
>-index 08425eb9e..bc5cdcf2d 100644
>---- a/src/tests/third_party/rapidjson/include/rapidjson/reader.h
>-+++ b/src/tests/third_party/rapidjson/include/rapidjson/reader.h
>-@@ -261,23 +261,23 @@ void SkipWhitespace(InputStream& is) {
>- #ifdef RAPIDJSON_SSE42
>- //! Skip whitespace with SSE 4.2 pcmpistrm instruction, testing 16 8-byte characters at once.
>- inline const char *SkipWhitespace_SIMD(const char* p) {
>--	// Fast return for single non-whitespace
>--	if (*p == ' ' || *p == '\n' || *p == '\r' || *p == '\t')
>--		++p;
>--	else
>--		return p;
>--
>--	// 16-byte align to the next boundary
>--	const char* nextAligned = reinterpret_cast<const char*>((reinterpret_cast<size_t>(p) + 15) & ~15);
>--	while (p != nextAligned)
>--		if (*p == ' ' || *p == '\n' || *p == '\r' || *p == '\t')
>--			++p;
>--		else
>--			return p;
>-+    // Fast return for single non-whitespace
>-+    if (*p == ' ' || *p == '\n' || *p == '\r' || *p == '\t')
>-+        ++p;
>-+    else
>-+        return p;
>-+
>-+    // 16-byte align to the next boundary
>-+    const char* nextAligned = reinterpret_cast<const char*>((reinterpret_cast<size_t>(p) + 15) & ~15);
>-+    while (p != nextAligned)
>-+        if (*p == ' ' || *p == '\n' || *p == '\r' || *p == '\t')
>-+            ++p;
>-+        else
>-+            return p;
>- 
>-     // The rest of string using SIMD
>--	static const char whitespace[16] = " \n\r\t";
>--	const __m128i w = _mm_loadu_si128((const __m128i *)&whitespace[0]);
>-+    static const char whitespace[16] = " \n\r\t";
>-+    const __m128i w = _mm_loadu_si128((const __m128i *)&whitespace[0]);
>- 
>-     for (;; p += 16) {
>-         const __m128i s = _mm_load_si128((const __m128i *)p);
>-@@ -298,31 +298,31 @@ inline const char *SkipWhitespace_SIMD(const char* p) {
>- 
>- //! Skip whitespace with SSE2 instructions, testing 16 8-byte characters at once.
>- inline const char *SkipWhitespace_SIMD(const char* p) {
>--	// Fast return for single non-whitespace
>--	if (*p == ' ' || *p == '\n' || *p == '\r' || *p == '\t')
>--		++p;
>--	else
>--		return p;
>-+    // Fast return for single non-whitespace
>-+    if (*p == ' ' || *p == '\n' || *p == '\r' || *p == '\t')
>-+        ++p;
>-+    else
>-+        return p;
>- 
>-     // 16-byte align to the next boundary
>--	const char* nextAligned = reinterpret_cast<const char*>((reinterpret_cast<size_t>(p) + 15) & ~15);
>--	while (p != nextAligned)
>--		if (*p == ' ' || *p == '\n' || *p == '\r' || *p == '\t')
>--			++p;
>--		else
>--			return p;
>-+    const char* nextAligned = reinterpret_cast<const char*>((reinterpret_cast<size_t>(p) + 15) & ~15);
>-+    while (p != nextAligned)
>-+        if (*p == ' ' || *p == '\n' || *p == '\r' || *p == '\t')
>-+            ++p;
>-+        else
>-+            return p;
>- 
>-     // The rest of string
>--	static const char whitespaces[4][17] = {
>--		"                ",
>--		"\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n",
>--		"\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r",
>--		"\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t"};
>--
>--		const __m128i w0 = _mm_loadu_si128((const __m128i *)&whitespaces[0][0]);
>--		const __m128i w1 = _mm_loadu_si128((const __m128i *)&whitespaces[1][0]);
>--		const __m128i w2 = _mm_loadu_si128((const __m128i *)&whitespaces[2][0]);
>--		const __m128i w3 = _mm_loadu_si128((const __m128i *)&whitespaces[3][0]);
>-+    static const char whitespaces[4][17] = {
>-+        "                ",
>-+        "\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n",
>-+        "\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r",
>-+        "\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t"};
>-+
>-+        const __m128i w0 = _mm_loadu_si128((const __m128i *)&whitespaces[0][0]);
>-+        const __m128i w1 = _mm_loadu_si128((const __m128i *)&whitespaces[1][0]);
>-+        const __m128i w2 = _mm_loadu_si128((const __m128i *)&whitespaces[2][0]);
>-+        const __m128i w3 = _mm_loadu_si128((const __m128i *)&whitespaces[3][0]);
>- 
>-     for (;; p += 16) {
>-         const __m128i s = _mm_load_si128((const __m128i *)p);
>-diff --git a/src/tests/third_party/rapidjson/include/rapidjson/writer.h b/src/tests/third_party/rapidjson/include/rapidjson/writer.h
>-index 6daa78330..98931fe31 100644
>---- a/src/tests/third_party/rapidjson/include/rapidjson/writer.h
>-+++ b/src/tests/third_party/rapidjson/include/rapidjson/writer.h
>-@@ -134,7 +134,7 @@ public:
>-     }
>- 
>-     bool Key(const Ch* str, SizeType length, bool copy = false) { return String(str, length, copy); }
>--	
>-+    
>-     bool EndObject(SizeType memberCount = 0) {
>-         (void)memberCount;
>-         RAPIDJSON_ASSERT(level_stack_.GetSize() >= sizeof(Level));
>-diff --git a/include/EGL/eglplatform.h b/include/EGL/eglplatform.h
>-index 333448be348..47d18093c96 100644
>---- a/include/EGL/eglplatform.h
>-+++ b/include/EGL/eglplatform.h
>-@@ -100,7 +100,7 @@ typedef struct ANativeWindow*           EGLNativeWindowType;
>- typedef struct egl_native_pixmap_t*     EGLNativePixmapType;
>- typedef void*                           EGLNativeDisplayType;
>- 
>--#elif defined(USE_OZONE)
>-+#elif defined(USE_OZONE) || defined(USE_WPE)
>- 
>- typedef intptr_t EGLNativeDisplayType;
>- typedef intptr_t EGLNativeWindowType;
>-diff --git a/include/EGL/eglplatform.h b/include/EGL/eglplatform.h
>-index 47d18093c96..e781564891d 100644
>---- a/include/EGL/eglplatform.h
>-+++ b/include/EGL/eglplatform.h
>-@@ -114,6 +114,8 @@ typedef struct wl_egl_window *EGLNativeWindowType;
>- 
>- #elif defined(__unix__)
>- 
>-+#if defined(ANGLE_USE_X11) && !defined(MESA_EGL_NO_X11_HEADERS)
>-+
>- /* X11 (tentative)  */
>- #include <X11/Xlib.h>
>- #include <X11/Xutil.h>
>-@@ -122,6 +124,14 @@ typedef Display *EGLNativeDisplayType;
>- typedef Pixmap   EGLNativePixmapType;
>- typedef Window   EGLNativeWindowType;
>- 
>-+#else
>-+
>-+typedef void             *EGLNativeDisplayType;
>-+typedef khronos_uintptr_t EGLNativePixmapType;
>-+typedef khronos_uintptr_t EGLNativeWindowType;
>-+
>-+#endif /* ANGLE_USE_X11 && !MESA_EGL_NO_X11_HEADERS */
>-+
>- #else
>- #error "Platform not recognized"
>- #endif
>diff --git a/Source/ThirdParty/ANGLE/doc/64BitSafety.md b/Source/ThirdParty/ANGLE/doc/64BitSafety.md
>new file mode 100644
>index 00000000000..94ed06414cd
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/doc/64BitSafety.md
>@@ -0,0 +1,15 @@
>+# 64-bit Safety In the Compiler
>+
>+An issue that has arisen recently for contributors making changes to the GLSL ES
>+grammar files has been that certain versions of flex, the lexer on which ANGLE
>+relies, produce outputs which are not safe in 64-bit builds.
>+
>+To address this issue, ANGLE has added a step to its generation scripts to apply
>+64-bit safety fixes to newly regenerated outputs. This should be unnoticeable to
>+developers invoking flex via the generate\_parser.sh scripts in the relevant
>+compiler directories, as the fixes will be applied by the patch utility as part
>+of that script.
>+
>+When making code contributions that affect the grammar files, please ensure that
>+you've generated the outputs using the script, to make certain that the 64-bit
>+safety fixes are applied.
>diff --git a/Source/ThirdParty/ANGLE/doc/BranchingAndRolling.md b/Source/ThirdParty/ANGLE/doc/BranchingAndRolling.md
>new file mode 100644
>index 00000000000..19e2abc3513
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/doc/BranchingAndRolling.md
>@@ -0,0 +1,55 @@
>+# How to Branch and Roll Chromium's ANGLE Dependency
>+
>+ANGLE provides an implementation of OpenGL ES on Windows, which Chromium relies
>+upon for hardware accelerated rendering and WebGL support. Chromium specifies
>+its dependency on a specific version of ANGLE in the repository; this document
>+describes how to update that dependency, and, if necessary, create an ANGLE
>+branch to correspond to a branched release of Chrome.
>+
>+## Rolling DEPS
>+
>+Chromium's dependency on third-party projects is tracked in [the Chromium
>+repository's src/DEPS file]
>+(http://src.chromium.org/viewvc/chrome/trunk/src/DEPS). To update the ANGLE
>+dependency:
>+
>+ * Find the line in this file that defines "src/third\_party/angle"
>+for deps (**not** deps\_os)
>+ * Change the [git SHA-1 revision number]
>+(http://git-scm.com/book/ch6-1.html) to be that of the commit on which Chromium
>+should depend. Please use the full SHA-1, not a shortened version.
>+ * You can
>+find the SHA-1 for a particular commit with `git log` on the appropriate branch
>+of the repository, or via [the public repository viewer]
>+(https://chromium.googlesource.com/angle/angle).
>+ * If using the public repository viewer, you will need to select the branch whose log you wish to view
>+from the list on the left-hand side, and then click on the "tree" link at the
>+top of the resulting page. Alternatively, you can navigate to
>+`https://chromium.googlesource.com/angle/angle/+/<branch name>/` -- including
>+the terminating forward slash. (e.g.
>+`https://chromium.googlesource.com/angle/angle/+/master/`)
>+
>+## Branching ANGLE
>+
>+Sometimes, individual changes to ANGLE are needed for a release of Chrome which
>+has already been branched. If this is the case, a branch of ANGLE should be
>+created to correspond to the Chrome release version, so that Chrome may
>+incorporate only these changes, and not everything that has been committed since
>+the version on which Chrome depended at branch time. **Please note: Only ANGLE
>+admins can create a new branch.** To create a branch of ANGLE for a branched
>+Chrome release:
>+
>+ * Determine what the ANGLE dependency is for the Chrome release
>+by checking the DEPS file for that branch.
>+ * Check out this commit as a new branch in your local repository.
>+    * e.g., for [the Chrome 34 release at chrome/branches/1847]
>+(http://src.chromium.org/viewvc/chrome/branches/1847/src/DEPS), the ANGLE
>+version is 4df02c1ed5e97dd54576b06964b1da67ea30238e. To check this commit out
>+locally and create a new branch named 'mybranch' from this commit, use: ```git
>+checkout -b mybranch 4df02c1ed5e97dd54576b06964b1da67ea30238e```
>+ * To create this new branch in the public repository, you'll need to push the
>+branch to the special Gerrit reference location, 'refs/heads/<branch name>'. You
>+must be an ANGLE administrator to be able to push this new branch.
>+    * e.g., to use your local 'mybranch' to create a branch in the public repository called
>+'chrome\_m34', use: ```git push origin mybranch:refs/heads/chrome_m34```
>+    * The naming convention that ANGLE uses for its release-dedicated branches is 'chrome\_m##'.
>diff --git a/Source/ThirdParty/ANGLE/doc/BufferImplementation.md b/Source/ThirdParty/ANGLE/doc/BufferImplementation.md
>new file mode 100644
>index 00000000000..99eaf0038f2
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/doc/BufferImplementation.md
>@@ -0,0 +1,122 @@
>+# Introduction
>+
>+Since Direct3D 9 only supports buffers that either contain vertex or index data,
>+and OpenGL buffers can contain both, ANGLE waits till a draw call is issued to
>+determine which resources to create/update. The generic implementation 'streams'
>+the data into global vertex and index buffers. This streaming buffer
>+implementation works in all circumstances, but does not offer optimal
>+performance. When buffer data isn't updated, there's no reason to copy the data
>+again. For these cases a 'static' buffer implementation is used.
>+
>+The OpenGL ES 2.0 glBufferData() function allows to specify a usage hint
>+parameter (GL\_STREAM\_DRAW, GL\_DYNAMIC\_DRAW or GL\_STATIC\_DRAW). Both
>+GL\_STREAM\_DRAW and GL\_DYNAMIC\_DRAW use the streaming buffer implementation.
>+With the GL\_STATIC\_DRAW hint, ANGLE will attempt to use the static buffer
>+implementation. If you update the buffer data after it has already been used in
>+a draw call, it falls back to the streaming buffer implementation, because
>+updating static ones would involve creating new ones, which is slower than
>+updating streaming ones (more on this later).
>+
>+Because some applications use GL\_STREAM\_DRAW or GL\_DYNAMIC\_DRAW even when
>+the data is not or very infrequently updated, ANGLE also has a heuristic to
>+promote buffers to use the static implementation.
>+
>+# Streaming buffers
>+
>+The streaming buffers implementation uses one Context-global vertex buffer
>+(VertexDataManager::mStreamingBuffer) and two index buffers
>+(IndexDataManager::mStreamingBufferShort and
>+IndexDataManager::mStreamingBufferInt). The streaming behavior is achieved by
>+writing new data behind previously written data (i.e. without overwriting old
>+data). Direct3D 9 allows to efficiently update vertex and index buffers when
>+you're not reading or overwriting anything (it won't stall waiting for the GPU
>+finish using it).
>+
>+When the end of these streaming buffers is reached, they are 'recycled' by
>+discarding their content. D3D9 will still keep a copy of the data that's in use,
>+so this recycling efficiently renames the driver level buffers. ANGLE can then
>+write new data to the beginning of the vertex or index buffer.
>+
>+The ArrayVertexBuffer::mWritePosition variable holds the current end position of
>+the last data that was written. StreamingVertexBuffer::reserveRequiredSpace()
>+allocates space to write the data, and StreamingVertexBuffer::map() actually
>+locks the D3D buffer and updates the write position. Similar for index buffers.
>+
>+# Static buffers
>+
>+Each GL buffer object can have a corresponding static vertex or index buffer
>+(Buffer::mVertexBuffer and Buffer::mIndexBuffer). When a GL buffer with static
>+usage is used in a draw call for the first time, all of its data is converted to
>+a D3D vertex or index buffer, based on the attribute or index formats
>+respectively. If a subsequent draw call uses different formats, the static
>+buffer is invalidated (deleted) and the streaming buffer implementation is used
>+for this buffer object instead. So for optimal performance it's important to
>+store only a single format of vertices or indices in a buffer. This is highly
>+typical, and even when in some cases it falls back to the streaming buffer
>+implementation the performance isn't bad at all.
>+
>+The StreamingVertexBuffer and StaticVertexBuffer classes share a common base
>+class, ArrayVertexBuffer. StaticVertexBuffer also has access to the write
>+position, but it's used only for the initial conversion of the data. So the
>+interfaces of both classes are not that different. Static buffers have an exact
>+size though, and can't be changed afterwards (streaming buffers can grow to
>+handle draw calls which use more data, and avoid excessive recycling).
>+StaticVertexBuffer has a lookupAttribute() method to retrieve the location of a
>+certain attribute (this is also used to verify that the formats haven't changed,
>+which would result in invalidating the static buffer). The descriptions of all
>+the attribute formats a static buffer contains are stored in the
>+StaticVertexBuffer::mCache vector.
>+
>+StaticIndexBuffer also caches information about what's stored in them, namely
>+the minimum and maximum value for certain ranges of indices. This information is
>+required by the Direct3D 9 draw calls, and is also used to know the range of
>+vertices that need to be copied to the streaming vertex buffer in case it needs
>+to be used (e.g. it is not uncommon to have a buffer with static vertex position
>+data and a buffer with streaming texture coordinate data for skinning).
>+
>+# Constant attributes
>+
>+Aside from using array buffers to feed attribute data to the vertex shader,
>+OpenGL also supports attributes which remain constant for all vertices used in a
>+draw call. Direct3D 9 doesn't have a similar concept, at least not explicitly.
>+
>+Constant attributes are implemented using separate (static) vertex buffers,
>+and uses a stride of 0 to ensure that every vertex retrieves the same data.
>+Using a stride of 0 is not possible with streaming buffers because on some
>+hardware it is incompatible with the D3DUSAGE\_DYNAMIC flag. We found that with
>+static usage, all hardware tested so far can handle stride 0 fine.
>+
>+This functionality was implemented in a ConstantVertexBuffer class, and it
>+integrates nicely with the rest of the static buffer implementation.
>+
>+# Line loops
>+
>+Direct3D 9 does not support the 'line loop' primitive type directly. This is
>+implemented by drawing the 'closing' line segment separately, constructing a
>+tiny temporary index buffer connecting the last and first vertex.
>+
>+# Putting it all together
>+
>+glDrawElements() calls IndexDataManager::prepareIndexData() to retrieve a
>+Direct3D index buffer containing the necessary data. If an element array is used
>+(i.e. a buffer object), it has static usage, and it hasn't been invalidated, the
>+GL buffer's static D3D index buffer will be returned. Else the updated streaming
>+index buffer is returned, as well as the index offset (write position) where the
>+new data is located. When prepareIndexData() does find a static index buffer,
>+but it's empty, it means the GL buffer's data hasn't been converted and stored
>+in the D3D index buffer yet. So in the convertIndices() call it will convert the
>+entire buffer. prepareIndexData() will also look up the min/max value of a range
>+of indices, or computes it when not already in the static buffer or when a
>+streaming buffer is used.
>+
>+Similarly, both glDrawElements() and glDrawArrays() both call
>+VertexDataManager::prepareVertexData() to retrieve a set of Direct3D vertex
>+buffers and their translated format and offset information. It's implementation
>+is more complicated than prepareIndexData() because buffer objects can contain
>+multiple vertex attributes, and multiple buffers can be used as input to the
>+vertex shader. So first it accumulates how much storage space is required for
>+each of the buffers in use. For all static non-empty buffers in use, it
>+determines whether the stored attributes still match what is required by the
>+draw call, and invalidates them if not (at which point more space is allocated
>+in the streaming buffer). Converting the GL buffer object's data into D3D
>+compatible vertex formats is still done by specialized template functions.
>diff --git a/Source/ThirdParty/ANGLE/doc/BuildingAngleForChromiumDevelopment.md b/Source/ThirdParty/ANGLE/doc/BuildingAngleForChromiumDevelopment.md
>new file mode 100644
>index 00000000000..35fd95a52e5
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/doc/BuildingAngleForChromiumDevelopment.md
>@@ -0,0 +1,66 @@
>+# How to build ANGLE in Chromium for dev
>+
>+## Introduction
>+
>+On Windows, Linux, and Mac ANGLE now builds most core components cross platform, including the shader validator and translator as well as the graphics API translator. These parts can be built and tested inside a Chromium checkout.
>+
>+ANGLE also includes some sample applications and a few other targets that don't build on Chromium. These steps describe how to build such targets within a Chromium checkout.
>+
>+Prerequisite Steps:
>+
>+  * Checkout and build [Chromium](http://dev.chromium.org/Home).
>+  * To setup run these commands (note similarity to [DevSetup](DevSetup.md)):
>+
>+## Standalone ANGLE inside Chromium
>+
>+  * To sync all standalone dependencies run:
>+
>+```bash
>+cd src/third_party/angle
>+python scripts/bootstrap.py
>+gclient sync
>+```
>+
>+  * To generate ANGLE standalone build files run:
>+
>+```bash
>+cd src/third_party/angle
>+gn gen out/Debug
>+```
>+
>+  * To build:
>+
>+```bash
>+cd src/third_party/angle
>+ninja -j 10 -k1 -C out/Debug
>+```
>+
>+  * For example, `ninja -j 10 -k1 -C out/Debug angle_gles2_deqp_tests`
>+  * To run a sample application: `./out/Debug/hello_triangle`
>+  * To go back to the Chromium-managed version, remove `third_party/angle/.gclient`.
>+
>+## Working with ANGLE in Chromium
>+
>+You will also want to work with a local version of ANGLE instead of the version that is pulled in by Chromium's [DEPS](https://chromium.googlesource.com/chromium/src/+/master/DEPS) file. To do this do the following:
>+
>+  * cd to `chromium/`. One directory above `chromium/src`. Add this to `chromium/.gclient`:
>+
>+```python
>+solutions = [
>+  {
>+    # ...
>+    u'custom_deps':
>+    {
>+      "src/third_party/angle": None,
>+    },
>+  },
>+]
>+```
>+
>+You will have full control over your ANGLE workspace and are responsible for running all git commands (pull, rebase, etc.) for managing your branches.
>+
>+If you decide you need to go back to the DEPS version of ANGLE:
>+
>+  * Comment out or remove the `src/third_party/angle` line in your `custom_deps` in `chomium/.gclient`.
>+  * Se the ANGLE workspace to the version specified in Chromium's DEPS. Ensure there are no modified or new files.
>+  * `gclient sync` your Chromium workspace.
>diff --git a/Source/ThirdParty/ANGLE/doc/ChoosingANGLEBranch.md b/Source/ThirdParty/ANGLE/doc/ChoosingANGLEBranch.md
>new file mode 100644
>index 00000000000..c2ac1ae2c40
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/doc/ChoosingANGLEBranch.md
>@@ -0,0 +1,68 @@
>+# Choosing an ANGLE branch for your project
>+
>+ANGLE is under continuous development, and does not create release tarballs or
>+tag specific revisions as releases, which may make the process of choosing a
>+point in ANGLE's history as the dependency for your project less than obvious.
>+This document illustrates how to choose a branch of ANGLE which can be expected
>+to be updated with critical fixes, should they be needed.
>+
>+## ANGLE automatic branching
>+
>+Branches are created automatically in ANGLE to correspond to branches created in
>+Chromium. These branches are named `chromium/####`, where the number is the
>+matching Chromium branch. These branches will be created from the revision which
>+that Chromium branch points to as its dependency. So, for example, the
>+`chromium/2013` branch point is at r28bcf4ff, because [Chromium's dependency
>+file for the 2013 branch]
>+(http://src.chromium.org/viewvc/chrome/branches/2013/src/DEPS?revision=272741)
>+uses this ANGLE revision.
>+
>+It isn't necessary to be familiar with how Chromium's dependency management
>+works to choose an appropriate ANGLE branch for your project. You will, however,
>+likely want to make sure that you choose a branch that is used for a relatively
>+stable Chromium release channel build, as those branches will be deployed with
>+Chromium, and receive updates if bugs are found and fixed during release
>+lifetime, while the more volatile channels will turn over quickly, and their
>+branches will be short-lived.
>+
>+**We recommend choosing a branch corresponding to a Beta or Stable Chromium
>+release** if you are pursuing periodic, not continuous, integration of ANGLE.
>+
>+## Matching a Chromium release to an ANGLE branch
>+
>+In order to determine which branches are used by Chromium releases, please use
>+[the OmahaProxy tool](http://omahaproxy.appspot.com/), which lists build
>+information about current Chromium releases. Find the entry for a suitable
>+release channel (for now, we recommend one of the Windows desktop releases), and
>+note the branch listed in the `true_branch` column. This identifies the ANGLE
>+branch used by that Chromium release.
>+
>+## Updates to release branches
>+
>+If bugs (stability, security, performance, or otherwise) are discovered after a
>+branch has been created, and that branch is used by a Chromium release, the
>+fixes for those bugs will be applied to the ANGLE branches for uptake by
>+Chromium and any other projects using that branch. You should need only to
>+perform a `git pull` to check for and apply any such changes.
>+
>+## Cherry-picking a change to a release branch
>+
>+Occasionally a bug fix must be merged back to an earlier Chromium
>+release branch. To do this, first look up the branch number in
>+[OmahaProxy](https://omahaproxy.appspot.com/). For example, M55
>+corresponds to branch number 2883.
>+
>+In the simple case where there are no conflicts, the merge can be done
>+entirely in the Gerrit UI. Click the "Cherry pick" button and enter
>+`chromium/[branch_number]` as the branch to merge to.
>+
>+If there are conflicts, however, follow these steps:
>+
>+1. `git checkout chromium/[branch_number]`
>+2. `git cherry-pick [commit_hash]`
>+3. Fix any merge conflicts.
>+4. `git cl upload`
>+
>+Have the cherry-pick reviewed, and then land it. It's also OK to skip
>+the review and land it yourself with TBR= in the issue description, if
>+you have that ability.
>diff --git a/Source/ThirdParty/ANGLE/doc/CodeReviewProcess.md b/Source/ThirdParty/ANGLE/doc/CodeReviewProcess.md
>new file mode 100644
>index 00000000000..9a53e2aa1d0
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/doc/CodeReviewProcess.md
>@@ -0,0 +1,57 @@
>+# ANGLE's Code Review Process
>+
>+This page describes the review process for ANGLE reviewers and committers. For
>+instructions on submitting your change list for review, please see
>+[ContributingCode](ContributingCode.md).
>+
>+## Reviewing Changes
>+
>+The author of a CL may designate reviewers. Please feel free to weigh in on
>+changes even if you are not a designated reviewer!
>+
>+1.  To review a change, you can either navigate directly to the URL for the CL,
>+    or, if you are one of the designated reviewers, the change will appear in
>+    your dashboard at https://chromium-review.googlesource.com/
>+2.  Review the change listed by looking over the diffs listed in the most recent
>+    patch set.
>+    *   You may view the diffs either side-to-side, or in unified diff format.
>+    *   You can comment on a specific line of code by double-clicking that line,
>+        or on the file as a whole by clicking the "Add file comment" icon, which
>+        appears above the diff, in the line number column.
>+    *   Note that, for CLs submitted as fixes to standing bugs, style issues
>+        that pre-exist the CL are not required to be addressed in the CL. As a
>+        reviewer, you can request a follow-up CL to address the style issue if
>+        you desire. This exception doesn't apply for CLs which implement new
>+        functionality, perform refactoring, or introduce style issues
>+        themselves.
>+3.  Once your review is complete, click the "Review" button
>+    *   If you are satisfied with the change list as it is, give a positive
>+        review (Code-Review +1 or +2).
>+    *   If you think the change list is a good idea, but needs changes, leave
>+        comments and a neutral review. (Code-Review 0)
>+    *   If you think the change list should be abandoned, give a negative
>+        review. (Code-Review -1 or -2)
>+    *   A +2 code review is required before landing. Only ANGLE committers may
>+        provide a +2 code review.
>+    *   ANGLE has a 2-reviewer policy for CLs. This means all changes should get
>+        a positive review from more than one person before they are accepted.
>+        This is most usually handled by reserving the +2 review for the second
>+        reviewer to clear the CL.
>+    *   If you made comments on the files, the draft comments will appear below
>+        the cover message. These comments are not published until you click on
>+        the "Publish Comments" button.
>+4.  Verification and landing:
>+    *   If the CL author is not an ANGLE committer, the CL should be verified
>+        and landed by a committer. Once verified, the "+1 Verified" status may
>+        be added, and the CL may be landed with the "Publish and Submit" button.
>+        There should be no need to rebase via the "Rebase Change" button prior
>+        to landing.
>+    *   If the CL author is an ANGLE committer, they should verify and land the
>+        CL themselves.
>+    *   Please note: Verification and commit-queue workflow may be subject to
>+        change in the near future.
>+5.  Cherry-picking to other branches
>+    *   If the change is needed on other branches, you may be able to land it
>+        using the "Cherry Pick To" button on the CL page.
>+    *   If this cherry pick fails, you will need to rebase the patch yourself
>+        and submit a new change for review on the branch.
>diff --git a/Source/ThirdParty/ANGLE/doc/CodingStandard.md b/Source/ThirdParty/ANGLE/doc/CodingStandard.md
>new file mode 100644
>index 00000000000..b5b78e2876f
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/doc/CodingStandard.md
>@@ -0,0 +1,177 @@
>+# Coding Standard for the ANGLE Project
>+
>+## Google Style Guide
>+
>+We generally use the [Google C++ Style Guide](https://google.github.io/styleguide/cppguide.html) as a basis for
>+our Coding Standard, however we will deviate from it in a few areas, as noted
>+below.
>+
>+Items marked {DEV} indicate a deviation from the Google guidelines. Items marked
>+{DO} are reiterating points from the Google guidelines.
>+
>+Before you upload code to Gerrit, use `git cl format` to auto-format your code.
>+This will catch most of the trivial formatting errors and save you time.
>+
>+### [Header Files](https://google.github.io/styleguide/cppguide.html#Header_Files)
>+
>+*   We use **`.h`** for C++ headers.
>+*   {DEV} #define guards should be of the form: `<PATH>_<FILE>_H_`. (Compiler
>+    codebase is varied, including `<PROJECT>_` makes the names excessively
>+    long).
>+
>+### [Scoping](https://google.github.io/styleguide/cppguide.html#Scoping)
>+
>+*   {DO} avoid globally scoped variables, unless absolutely necessary.
>+
>+### [Classes](https://google.github.io/styleguide/cppguide.html#Classes)
>+
>+*   {DEV} Inherit (privately) from angle::NonCopyable helper class (defined in
>+    common/angleutils.h) to disable default copy and assignment operators.
>+
>+### [Other C++ Features](https://google.github.io/styleguide/cppguide.html#Other_C++_Features)
>+
>+*   {DEV} all parameters passed by reference, except for STL containers (e.g.
>+    std::vector, std::list), must be labeled `const`. For return parameters
>+    other than STL containers, use a pointer.
>+*   {DO} avoid use of default arguments.
>+*   {DONT} use C++ exceptions, they are disabled in the builds and not caught.
>+*   {DO} use nullptr (instead of 0 or NULL) for pointers.
>+*   {DO} use size\_t for loop iterators and size values.
>+*   {DO} use uint8\_t pointers instead of void pointers to denote binary data.
>+*   {DO} use C++11/14 according to the [Chromium c++ 11/14 guide]
>+    (http://chromium-cpp.appspot.com/).
>+
>+### [Naming](https://google.github.io/styleguide/cppguide.html#Naming)
>+
>+#### File Names
>+
>+*   {DEV} Filenames should be all lowercase and can include underscores (`_`).
>+    If the file is an implementation of a class, the filename may be capitalized
>+    the same as the major class.
>+*   {DEV} We use .cpp (instead of .cc), .h and .inl (inlined files) for C++
>+    files and headers.
>+
>+#### Directory Names
>+*   Directory names should be all lowercase, unless following an externally
>+    imposed capitalization (eg include/EGL, or src/libGLESv2, etc)
>+
>+#### Variable Names
>+
>+Use the following guidelines, they do deviate somewhat from the [Google
>+guidelines](https://google.github.io/styleguide/cppguide.html#Naming).
>+
>+* Class and type names: start with capital letter and use CamelCase.
>+* {DEV} Class member variables: use an **`m`** prefix instead of trailing
>+underscore and use CamelCase.
>+* Global variables (if they must be used): use a **`g`** prefix.
>+* {DEV} Variable names: start with lower case and use CamelCase (chosen for consistency)
>+* {DEV} Function names: Member functions start with lower case and use CamelCase. Non-member and static member functions start with capital letter and
>+use CamelCase (chosen for consistency)
>+* {DO} Constants: start with a **`k`** and use CamelCase
>+* Namespaces: short names. use all lower case
>+* Enum Names: use class enums when possible. The values should be uppercase with underscores or CamelCase.
>+* Macros: all uppercase with underscores
>+* Exceptions to naming: use common sense!
>+
>+### [Comments](https://google.github.io/styleguide/cppguide.html#Comments)
>+
>+*   {DO} read and follow Google's recommendations.
>+*   Each file **must** start with the following boilerplate notice:
>+
>+```
>+//
>+//  Copyright $YEAR The ANGLE Project Authors. All rights reserved.
>+//  Use of this source code is governed by a BSD-style license that can be
>+//  found in the LICENSE file.
>+//
>+```
>+
>+* $YEAR should be set to the current year at the time a file is created, and not changed thereafter.
>+
>+### [Formatting](https://google.github.io/styleguide/cppguide.html#Formatting)
>+
>+*   {DEV} Avoid excessively long lines. Please keep lines under 100 columns
>+    long.
>+*   Use unix-style newlines.
>+*   {DO} use only spaces. No tab characters. Configure your editor to emit
>+    spaces when you hit the TAB-key.
>+*   {DEV} indent 4 spaces at a time.
>+*   conditionals: place space outside the parenthesis. No spaces inside.
>+*   switch statements: use the output of `git cl format`.
>+*   class format(eg private, public, protected): indent by 2 spaces. Regular
>+    4-space indent from the outer scope for declarations/definitions.
>+*   pointers and references: **`*`** and **`&`** tight against the variable
>+*   namespaces: are not indented.
>+*   extern code blocks: are not indented.
>+*   {DEV} braces should go on a separate line, except for functions defined in a
>+    header file where the whole function declaration and definition fit on one
>+    line.
>+
>+Examples:
>+
>+```
>+if (conditional)
>+{
>+    stuff();
>+}
>+else
>+{
>+    otherstuff()
>+}
>+```
>+
>+```
>+switch (conditional)
>+{
>+  case foo:
>+    dostuff();
>+    break;
>+  case bar:
>+    otherstuff();
>+    break;
>+  default:
>+    WTFBBQ();
>+}
>+```
>+
>+```
>+class MyClass : public Foo
>+{
>+  public:
>+    MyClass();
>+    ~MyClass() {};
>+  private:
>+    DISALLOW_COPY_AND_ASSIGN(MyClass);
>+};
>+```
>+
>+```
>+char *c;
>+const string &str;
>+```
>+
>+### [Exceptions to the Rules](https://google.github.io/styleguide/cppguide.html#Exceptions_to_the_Rules)
>+
>+*   If modifying pre-existing code that does not match the standard, the altered
>+    portions of the code should be changed to match the standard.
>+
>+### Generated Source Files
>+
>+Prefer storing generated sources as baked files in the repository. Avoid using
>+GN actions to run Python scripts.
>+
>+**Definition:**
>+
>+Sometimes helper scripts can create compilable sources more easily from XML or
>+JSON data sources than maintaining source files by hand. These scripts are often
>+written in Python and output generated sources.
>+
>+**Decision**
>+
>+Storing generated sources in the repository makes integration easier for non-GN
>+users. Python scripts can be expensive and slow to run at compile-time.
>+Generated sources can be a pain point for messing up builds.
>+
>+It could be possible to solve the build clobbering problem. And we could replace
>+Python with something faster. But to allow for easier integration with our tools
>+and customers we should bake generated files into the repository.
>diff --git a/Source/ThirdParty/ANGLE/doc/CompilingTranslatorWithEmscripten.md b/Source/ThirdParty/ANGLE/doc/CompilingTranslatorWithEmscripten.md
>new file mode 100644
>index 00000000000..8b6654201a6
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/doc/CompilingTranslatorWithEmscripten.md
>@@ -0,0 +1,108 @@
>+# Introduction
>+
>+There are many situations in which it's useful for WebGL applications to
>+transform shaders in various ways. ANGLE's shader translator can be used for
>+this purpose: compiling it with [Emscripten](http://emscripten.org/) allows it
>+to be invoked from a web page. This wiki page provides some preliminary details
>+about how to do this.
>+
>+# Details
>+
>+Pull top of tree ANGLE.
>+
>+Install the Emscripten toolchain per the [instructions](http://emscripten.org/).
>+
>+Symlink (preferred) or copy the ANGLE directory into ...emsdk/emscripten/master.
>+
>+Put a shader to compile into a file (named with .vert or .frag suffix) in the
>+same directory. For example, put the following shader from the [WebGL Aquarium]
>+(http://webglsamples.org/aquarium/aquarium.html) into `aq-fish-nm.frag`:
>+
>+```
>+precision mediump float;
>+uniform vec4 lightColor;
>+varying vec4 v_position;
>+varying vec2 v_texCoord;
>+varying vec3 v_tangent;  // #normalMap
>+varying vec3 v_binormal;  // #normalMap
>+varying vec3 v_normal;
>+varying vec3 v_surfaceToLight;
>+varying vec3 v_surfaceToView;
>+
>+uniform vec4 ambient;
>+uniform sampler2D diffuse;
>+uniform vec4 specular;
>+uniform sampler2D normalMap;  // #normalMap
>+uniform float shininess;
>+uniform float specularFactor;
>+// #fogUniforms
>+
>+vec4 lit(float l ,float h, float m) {
>+  return vec4(1.0,
>+              max(l, 0.0),
>+              (l > 0.0) ? pow(max(0.0, h), m) : 0.0,
>+              1.0);
>+}
>+void main() {
>+  vec4 diffuseColor = texture2D(diffuse, v_texCoord);
>+  mat3 tangentToWorld = mat3(v_tangent,  // #normalMap
>+                             v_binormal,  // #normalMap
>+                             v_normal);  // #normalMap
>+  vec4 normalSpec = texture2D(normalMap, v_texCoord.xy);  // #normalMap
>+  vec3 tangentNormal = normalSpec.xyz - vec3(0.5, 0.5, 0.5);  // #normalMap
>+  tangentNormal = normalize(tangentNormal + vec3(0, 0, 2));  // #normalMap
>+  vec3 normal = (tangentToWorld * tangentNormal);  // #normalMap
>+  normal = normalize(normal);  // #normalMap
>+  vec3 surfaceToLight = normalize(v_surfaceToLight);
>+  vec3 surfaceToView = normalize(v_surfaceToView);
>+  vec3 halfVector = normalize(surfaceToLight + surfaceToView);
>+  vec4 litR = lit(dot(normal, surfaceToLight),
>+                    dot(normal, halfVector), shininess);
>+  vec4 outColor = vec4(
>+    (lightColor * (diffuseColor * litR.y + diffuseColor * ambient +
>+                  specular * litR.z * specularFactor * normalSpec.a)).rgb,
>+      diffuseColor.a);
>+  // #fogCode
>+  gl_FragColor = outColor;
>+}
>+```
>+
>+Compile the shader translator, the translator sample, and the shader all
>+together:
>+
>+```
>+./emcc -Iangle/include -Iangle/src angle/samples/translator/translator.cpp angle/src/compiler/preprocessor/*.cpp angle/src/compiler/translator/*.cpp angle/src/compiler/translator/timing/*.cpp angle/src/compiler/translator/depgraph/*.cpp angle/src/third_party/compiler/*.cpp angle/src/common/*.cpp -o translator.html --preload-file aq-fish-nm.frag -s NO_EXIT_RUNTIME=1
>+```
>+
>+Serve up the resulting translator.html via `python -m SimpleHTTPServer`.
>+Navigate the browser to localhost:8000.
>+
>+The translator sample will run, displaying its output into the text area on the
>+page. Since it isn't receiving any input, it simply outputs a help message and
>+exits.
>+
>+To invoke the translator again, processing the shader we included along with the
>+source code, open the JavaScript console and type:
>+
>+```
>+Module['callMain'](['-s=w', '-u', 'aq-fish-nm.frag'])
>+```
>+
>+The active uniforms and their types will be printed to the text area after the
>+translator sample processes the shader.
>+
>+# Issues and Next Steps
>+
>+It's clearly not useful to have to compile the shader in to the
>+Emscripten-translated executable. It would be helpful to define a simple wrapper
>+function which can easily be called from JavaScript and which defines enough
>+parameters to pass in a shader as a string, transform it somehow or compile it
>+to another language target, and return the compiled result (or other
>+information). A simple JavaScript library that wraps all of the interactions
>+with the Emscripten binary would be useful.
>+
>+It's not feasible to interact with the translator's data structures, nor
>+traverse the AST from JavaScript. The code that operates upon the shader must be
>+written in C++ and compiled in to the shader translator.
>+
>+emcc should be integrated better with ANGLE's build system.
>diff --git a/Source/ThirdParty/ANGLE/doc/ContributingCode.md b/Source/ThirdParty/ANGLE/doc/ContributingCode.md
>new file mode 100644
>index 00000000000..c0eecb242c1
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/doc/ContributingCode.md
>@@ -0,0 +1,113 @@
>+# Contributing Code
>+
>+## Communicate
>+
>+ * Whether you're writing a new feature or fixing an existing bug, it pays to get a second opinion before you get too far. If it's a new feature idea, post to the discussion group ([angleproject](https://groups.google.com/forum/?fromgroups#!forum/angleproject)) and propose it or talk with the ANGLE team on IRC in the #ANGLEproject channel on FreeNode.
>+ * Not all bugs in our [bug system](https://bugs.chromium.org/p/angleproject/issues/list) are assigned, but if the one you're interested in fixing is, send a note to the person it's assigned to and ask if they would like a patch.
>+ * Behavior changes and anything nontrivial (i.e. anything other than simple cleanups and style fixes) should generally be tracked in the bug system. Please [file a bug](http://anglebug.com/new) and describe what you're doing if there isn't one already.
>+ * If you would like bug-editing rights, simply ask a team member via email or the disussion group.
>+
>+## Get your code ready
>+### Code
>+ 1. Must conform to the [ANGLE style](CodingStandard.md) guidelines.
>+ 2. Must be tested. (see the 'Testing' section below)
>+ 3.  Should be a reasonable size to review.  Giant patches are unlikely to get reviewed quickly.
>+
>+### Build maintenance
>+ 1. If you added or removed source files:
>+    * You _must_ update the build files with your changes. See `src/libGLESv2.gni` and `src/compiler.gni`.
>+ 2. ANGLE's BUILD.gn script is used by [Chromium's gn build](https://www.chromium.org/developers/gn-build-configuration). If you change build files other than to add or remove source files be aware you could break the Chromium build. ANGLE's commit queue (CQ) will detect such breakage. Ask a project member for help with Chromium issues if you don't have a Chromium checkout.
>+ 3. If you modified `glslang.y` or `glslang.l`:
>+    * You _must_ update the bison-generated compiler sources. Download and install the latest 64-bit Bison and flex from official [Cygwin](https://cygwin.com/install.html) on _Windows_. From the Cygwin shell run `generate_parser.sh` in `src/compiler/translator` and update your CL. Do not edit the generated files by hand.
>+    * _NOTE:_ You can ignore failing chunk messages if there are no compile errors.
>+    * If you modified `ExpressionParser.y` or `Tokenizer.l`, follow the same process by running `src/compiler/preprocessor/generate_parser.sh`.
>+
>+### Testing
>+ * ANGLE uses trybots to test on a variety of platforms. Please run your changes against our bots and check the results before landing changes or requesting reviews.
>+    * Upload your change (see [Making changes](#making-changes)).
>+    * To kick of a try job, use the 'CQ Dry Run' button, or set the Commit-Queue +1 label to trigger a dry run of the CQ (will not land the change).
>+    * If you are not part of the `angle-committers` group, you will need to either ask to be added or ask a member of the group to submit the tryjob for you. Add jmadill or geofflang as a reviewer for assistance.
>+    * Wait for the bots to report the result on the code review page. The bot results should be visible in Gerrit as yellow (in-progress), green (passed), or red (failed). This can take up to two hours for some of the debug bots. Click on the colored rectangle to open the bot log to triage failed tests.
>+    * If a failure is unexpected, or seems likely unrelated to your change, ask an ANGLE project member for advice.
>+    * We do not currently have the capability to run individual bots or tests in a run.
>+ * Tests can also be run locally, ANGLE's main testing methods are:
>+    * `angle_unittests`, `angle_end2end_tests` and `angle_white_box_tests` targets.
>+    * The [Top-of-Tree WebGL Conformance tests](https://www.khronos.org/registry/webgl/sdk/tests/webgl-conformance-tests.html).
>+      * If you are a Chromium developer, see [Building ANGLE for Chromium Development](BuildingAngleForChromiumDevelopment.md) for instructions on building ANGLE within Chromium.
>+      * If you aren't a browser developer, you should be able to drop your compiled DLLs into a Chrome installation, in place of those distributed with Chrome, to check WebGL conformance. [Chrome Canary](https://www.google.com/chrome/browser/canary.html) is well-suited for this.
>+    * If your code isn't covered by an existing test, you are *strongly encouraged* to add new test coverage. This both ensures that your code is correct and that new contributors won't break it in the future.
>+    * Add new tests to `angle_end2end_tests` for OpenGL-based API tests, `angle_unittests` for cross-platform internal tests, and `angle_white_box_tests` for rendering tests which also need visibility into internal ANGLE classes.
>+   * If you are submitting a performance fix, test your code with `angle_perftests` and add a new performance test if it is not covered by the existing benchmarks. For more documentation on `angle_perftests` see the [README](../src/tests/perf_tests/README.md).
>+   * The [Chromium GPU FYI bot waterfall](http://build.chromium.org/p/chromium.gpu.fyi/console) provides continuous integration for ANGLE patches that have been committed.  There may be hardware configurations that are not tested by the ANGLE trybots, if you notice breakage on this waterfall after landing a patch, please notify a project member.
>+   * ANGLE also includes the [drawElements Quality Program (dEQP)](dEQP.md) for additional testing. If you're working on a new feature, there may be some extensive tests for it already written.
>+
>+### Legal
>+ 1. You must complete the [Individual Contributor License Agreement](https://cla.developers.google.com/about/google-individual). You can do this online, and it only takes a minute. If you are contributing on behalf of a corporation, you must fill out the [Corporate Contributor License Agreement](https://cla.developers.google.com/about/google-corporate) and send it to Google as described on that page.
>+ 2. Once you've submitted the CLA, please email the following information (as entered on the CLA) to `shannonwoods at chromium dot org` for record keeping purposes:
>+    * Full Name:
>+    * Email:
>+    * Company (If applicable):
>+ 3. If you've never submitted code before, you must add your (or your organization's) name and contact info to the [AUTHORS](../AUTHORS) file.
>+ 4. *NOTE TO REVIEWERS*: Follow the [External Contributor Checklist](http://www.chromium.org/developers/contributing-code/external-contributor-checklist).
>+
>+## Life of a Change List
>+
>+### Getting started with Gerrit for ANGLE
>+  1. Go to [https://chromium-review.googlesource.com/new-password](https://chromium-review.googlesource.com/new-password)
>+  2. Log in with the email you use for your git commits.
>+  3. Follow the directions on the new-password page to set up authentication with your Google account.
>+  4. Make sure to set your real name.
>+     * Visit [https://chromium-review.googlesource.com/#/settings](https://chromium-review.googlesource.com/#/settings) and check the "Full Name" field.
>+  5. Check out the repository (see [DevSetup](DevSetup.md)).
>+  6. Install the Gerrit `commit_msg` hook
>+     * Gerrit requires a hook to append a change ID tag to each commit, so that it can associate your CL with a particular review, and track dependencies between commits.
>+     * Download the hook from [https://chromium-review.googlesource.com/tools/hooks/commit-msg](https://chromium-review.googlesource.com/tools/hooks/commit-msg) and copy this file to `.git/hooks/commit-msg` within your local repository. On non-Windows, platforms, ensure that permissions are set to allow execution.
>+     * *BE AWARE:* Some patch management tools, such as StGit, currently bypass git hooks. They should not currently be used with changes intended for review.
>+
>+### Making changes
>+ 1. Commit your changes locally:
>+    * `git add src/../FileName.cpp`
>+    * `git commit`
>+    * A text editor will open. Add a description at the top of the file.
>+       * If your changes are associated with an issue in the issue tracker (e.g. a fix for a reported bug), please associate the CL with that issue by adding the following line to the commit message: `BUG=angleproject:<issue number>`.
>+    * Save.
>+    * Close the text editor.
>+    * Use `git commit --amend` to update your CL with new changes.
>+    * Use `git cl format` to amend the style of your CL. This saves both your time and the reviewers'!
>+ 2. Ensure your code is landed on top of latest changes
>+    * `git pull --rebase`
>+    * Resolve conflicts if necessary
>+ 3. Upload the change list
>+    * `git cl upload`
>+    * The change list and modified files will be uploaded to
>+      [ANGLE Gerrit](https://chromium-review.googlesource.com/q/project:angle/angle).
>+    * Follow the generated URL to the new issue.
>+    * Take a moment to perform a self-review of your code. Gerrit's viewer makes it easy to see whitespace errors, erroneous tabs, and other simple style problems.
>+    * [Select reviewers](#selecting-reviewers).  If you don't do this, reviewers may not realize you're requesting a review!
>+    * Make changes, upload and repeat as necessary.
>+    * Project members and others will review your code as described in the [CodeReviewProcess](CodeReviewProcess.md).
>+ 5. If your change list needs revision:
>+    * If you have correctly installed the commit hook from the section above, Gerrit will be able to track your changes by Change-Id.
>+    * You should need only to update your commit with `git commit --amend` and re-upload with `git cl upload`.
>+ 6. Landing change after it receives +2 Code Review:
>+    * If you are a committer, you may submit the change yourself via the Gerrit web interface.
>+    * If you are not a committer, ask your reviewer to submit the change list.
>+ 7. Pull and integrate reviewed CL:
>+    * `git pull --rebase`
>+
>+### Selecting reviewers
>+When your CL is ready to review, add any of the following reviewers. They will be able to route your CL to additional reviewers as neccssary and answer any questions you may have about the process.
>+ * `geofflang at chromium dot org`
>+ * `jmadill at chromium dot org`
>+ * `syoussefi at chromium dot org`
>+ * `ynovikov at chromium dot org`
>+
>+### Committer status
>+Similar to [Chromium's committer status](https://dev.chromium.org/getting-involved/become-a-committer), long-term contributors to the ANGLE project may request to join the `angle-committers` group.  This allows you to give `+2` on code reviews and land patches without assistance.  After about 6 months of regular contributions, you may request committer status from a core ANGLE team member via email or code review.  Chromium committers may ask at any time.
>+
>+See also:
>+
>+* [ANGLE Gerrit](https://chromium-review.googlesource.com/q/project:angle/angle)
>+* [Chromium Projects: Contributing Code](http://www.chromium.org/developers/contributing-code/)
>+* [depot_tools tutorial](http://commondatastorage.googleapis.com/chrome-infra-docs/flat/depot_tools/docs/html/depot_tools_tutorial.html)
>+* [angle_perftests README](../src/tests/perf_tests/README.md)
>diff --git a/Source/ThirdParty/ANGLE/doc/DebuggingTips.md b/Source/ThirdParty/ANGLE/doc/DebuggingTips.md
>new file mode 100644
>index 00000000000..fdae9174312
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/doc/DebuggingTips.md
>@@ -0,0 +1,230 @@
>+# Debugging Tips
>+
>+There are many ways to debug ANGLE using generic or platform-dependent tools. Here is a list of tips
>+on how to use them.
>+
>+## Running ANGLE under apitrace on Linux
>+
>+[Apitrace](http://apitrace.github.io/) captures traces of OpenGL commands for later analysis,
>+allowing us to see how ANGLE translates OpenGL ES commands. In order to capture the trace, it
>+inserts a driver shim using `LD_PRELOAD` that records the command and then forwards it to the OpenGL
>+driver.
>+
>+The problem with ANGLE is that it exposes the same symbols as the OpenGL driver so apitrace captures
>+the entry point calls intended for ANGLE and reroutes them to the OpenGL driver. In order to avoid
>+this problem, use the following:
>+
>+1. Link your application against the static ANGLE libraries (libGLESv2_static and libEGL_static) so
>+   they don't get shadowed by apitrace's shim.
>+2. Ask apitrace to explicitly load the driver instead of using a dlsym on the current module.
>+   Otherwise apitrace will use ANGLE's symbols as the OpenGL driver entrypoint (causing infinite
>+   recursion). To do this you must point an environment variable to your GL driver.  For example:
>+   `export TRACE_LIBGL=/usr/lib/libGL.so.1`. You can find your libGL with
>+   `ldconfig -p | grep libGL`.
>+3. Link ANGLE against libGL instead of dlsyming the symbols at runtime; otherwise ANGLE won't use
>+   the replaced driver entry points. This is done with the gn arg `angle_link_glx = true`.
>+
>+If you follow these steps, apitrace will work correctly aside from a few minor bugs like not being
>+able to figure out what the default framebuffer size is if there is no glViewport command.
>+
>+For example, to trace a run of `hello_triangle`, assuming the apitrace executables are in `$PATH`:
>+
>+```
>+gn args out/Debug # add "angle_link_glx = true"
>+# edit samples/BUILD.gn and append "_static" to "angle_util", "libEGL", "libGLESv2"
>+ninja -C out/Debug
>+export TRACE_LIBGL="/usr/lib/libGL.so.1" # may require a different path
>+apitrace trace -o mytrace ./out/Debug/hello_triangle
>+qapitrace mytrace
>+```
>+
>+## Running ANGLE under GAPID on Linux
>+
>+[GAPID](https://github.com/google/gapid) can be used to capture trace of Vulkan commands on Linux.
>+For it to work, libvulkan has to be a shared library, instead of being statically linked into ANGLE,
>+which is the default behavior.  This is done with the gn arg:
>+
>+```
>+angle_shared_libvulkan = true
>+```
>+
>+When capturing traces of gtest based tests built inside Chromium checkout, make sure to run the
>+tests with `--single-process-tests` argument.
>+
>+## Running ANGLE under GAPID on Android
>+
>+[GAPID](https://github.com/google/gapid) can be used to capture a trace of the Vulkan or OpenGL ES
>+command stream on Android.  For it to work, ANGLE's libraries must have different names from the
>+system OpenGL libraries.  This is done with the gn arg:
>+
>+```
>+angle_libs_suffix = "_ANGLE_DEV"
>+```
>+
>+All
>+[NativeTest](https://chromium.googlesource.com/chromium/src/+/master/testing/android/native_test/java/src/org/chromium/native_test/NativeTest.java)
>+based tests share the same activity name, `org.chromium.native_test.NativeUnitTestNativeActivity`.
>+Thus, prior to capturing your test trace, the specific test APK must be installed on the device.
>+When you build the test, a test launcher is generated, for example,
>+`./out/Release/bin/run_angle_end2end_tests`. The best way to install the APK is to run this test
>+launcher once.
>+
>+In GAPID's "Capture Trace" dialog, "Package / Action:" should be:
>+
>+```
>+android.intent.action.MAIN:org.chromium.native_test/org.chromium.native_test.NativeUnitTestNativeActivity
>+```
>+
>+The mandatory [extra intent
>+argument](https://developer.android.com/studio/command-line/adb.html#IntentSpec) for starting the
>+activity is `org.chromium.native_test.NativeTest.StdoutFile`. Without it the test APK crashes. Test
>+filters can be specified via either the `org.chromium.native_test.NativeTest.CommandLineFlags` or
>+the `org.chromium.native_test.NativeTest.Shard` argument.  Example "Intent Arguments:" values in
>+GAPID's "Capture Trace" dialog:
>+
>+```
>+-e org.chromium.native_test.NativeTest.StdoutFile /sdcard/chromium_tests_root/out.txt -e org.chromium.native_test.NativeTest.CommandLineFlags "--gtest_filter=*ES2_VULKAN"
>+```
>+
>+or
>+
>+```
>+-e org.chromium.native_test.NativeTest.StdoutFile /sdcard/chromium_tests_root/out.txt --esal org.chromium.native_test.NativeTest.Shard RendererTest.SimpleOperation/ES2_VULKAN,SimpleOperationTest.DrawWithTexture/ES2_VULKAN
>+```
>+
>+## Running ANGLE under RenderDoc
>+
>+An application running through ANGLE can confuse [RenderDoc](https://github.com/baldurk/renderdoc),
>+as RenderDoc [hooks to EGL](https://github.com/baldurk/renderdoc/issues/1045) and ends up tracing
>+the calls the application makes, instead of the calls ANGLE makes to its backend.  As ANGLE is a
>+special case, there's little support for it by RenderDoc, though there are workarounds.
>+
>+### Windows
>+
>+On Windows, RenderDoc supports setting the environment variable `RENDERDOC_HOOK_EGL` to 0 to avoid
>+this issue.
>+### Linux
>+
>+On Linux, there is no supported workaround by RenderDoc.  See [this
>+issue](https://github.com/baldurk/renderdoc/issues/1045#issuecomment-463999869).  To capture Vulkan
>+traces, the workaround is to build RenderDoc without GL(ES) support.
>+
>+Building RenderDoc is straightforward.  However, here are a few instructions to keep in mind.
>+
>+```
>+# Install dependencies based on RenderDoc document.  Here are some packages that are unlikely to be already installed:
>+$ sudo apt install libxcb-keysyms1-dev python3-dev qt5-qmake libqt5svg5-dev libqt5x11extras5-dev
>+
>+# Inside the RenderDoc directory:
>+$ cmake -DCMAKE_BUILD_TYPE=Release -Bbuild -H. -DENABLE_GLES=OFF -DENABLE_GL=OFF
>+
>+# QT_SELECT=5 is necessary if your distribution doesn't default to Qt5
>+$ QT_SELECT=5 make -j -C build
>+
>+# Run RenderDoc from the build directory:
>+$ ./build/bin/qrenderdoc
>+```
>+
>+Additionally, libvulkan has to be a shared library, instead of being statically linked into ANGLE,
>+which is the default behavior.  This is done with the gn arg:
>+
>+```
>+angle_shared_libvulkan = true
>+```
>+
>+If your distribution does not provide a recent Vulkan SDK package, you would need to manually
>+install that.  This script tries to perform this installation as safely as possible.  It would
>+overwrite the system package's files, so follow at your own risk.  Place this script just above the
>+extracted SDK directory.
>+
>+```
>+#! /bin/bash
>+
>+if [ $# -lt 1 ]; then
>+  echo "Usage: $0 <version>"
>+  exit 1
>+fi
>+
>+ver=$1
>+
>+if [ ! -d "$ver" ]; then
>+  echo "$ver is not a directory"
>+fi
>+
>+# Verify everything first
>+echo "Verifying files..."
>+echo "$ver"/x86_64/bin/vulkaninfo
>+test -f "$ver"/x86_64/bin/vulkaninfo || exit 1
>+echo "$ver"/x86_64/etc/explicit_layer.d/
>+test -d "$ver"/x86_64/etc/explicit_layer.d || exit 1
>+echo "$ver"/x86_64/lib/
>+test -d "$ver"/x86_64/lib || exit 1
>+
>+echo "Verified. Performing copy..."
>+
>+echo sudo cp "$ver"/x86_64/bin/vulkaninfo /usr/bin/vulkaninfo
>+sudo cp "$ver"/x86_64/bin/vulkaninfo /usr/bin/vulkaninfo
>+echo sudo cp "$ver"/x86_64/etc/explicit_layer.d/* /etc/explicit_layer.d/
>+sudo cp "$ver"/x86_64/etc/explicit_layer.d/* /etc/explicit_layer.d/
>+echo sudo rm /usr/lib/x86_64-linux-gnu/libvulkan.so*
>+sudo rm /usr/lib/x86_64-linux-gnu/libvulkan.so*
>+echo sudo cp -P "$ver"/x86_64/lib/lib* /usr/lib/x86_64-linux-gnu/
>+sudo cp -P "$ver"/x86_64/lib/lib* /usr/lib/x86_64-linux-gnu/
>+
>+echo "Done."
>+```
>+
>+### Android
>+
>+If you are on Linux, make sure not to use the build done in the previous section.  The GL renderer
>+disabled in the previous section is actually needed in this section.
>+
>+Define the following environment variables, for example in `.bashrc` (values are examples):
>+
>+```
>+export JAVA_HOME=/usr/local/buildtools/java/jdk
>+export ANDROID_SDK=$HOME/chromium/src/third_party/android_sdk/public
>+export ANDROID_NDK=$HOME/chromium/src/third_party/android_ndk
>+export ANDROID_NDK_HOME=$HOME/chromium/src/third_party/android_ndk
>+```
>+
>+In the renderdoc directory, create Android builds of RenderDoc:
>+
>+```
>+mkdir build-android-arm32
>+cd build-android-arm32/
>+cmake -DBUILD_ANDROID=On -DANDROID_ABI=armeabi-v7a ..
>+make -j
>+cd ../
>+
>+mkdir build-android-arm64
>+cd build-android-arm64/
>+cmake -DBUILD_ANDROID=On -DANDROID_ABI=arm64-v8a ..
>+make -j
>+cd ../
>+```
>+
>+Note that you need both arm32 and arm64 builds even if working with an arm64 device.  See
>+[RenderDoc's documentation](https://github.com/baldurk/renderdoc/blob/v1.x/docs/CONTRIBUTING/Compiling.md#android)
>+for more information.
>+
>+When you run RenderDoc, choose the "Replay Context" from the bottom-left part of the UI (defaults to
>+Local).  When selecting the device, you should see the RenderDoc application running.
>+
>+In ANGLE itself, make sure you add a suffix for its names to be different from the system's.  Add
>+this to gn args:
>+
>+```
>+angle_libs_suffix = "_ANGLE_DEV"
>+```
>+
>+Next, you need to install an ANGLE test apk.  When you build the test, a test launcher is generated,
>+for example, `./out/Release/bin/run_angle_end2end_tests`. The best way to install the APK is to run
>+this test launcher once.
>+
>+In RenderDoc, use `org.chromium.native_test` as the Executable Path, and provide the following
>+arguments:
>+
>+```
>+-e org.chromium.native_test.NativeTest.StdoutFile /sdcard/chromium_tests_root/out.txt -e org.chromium.native_test.NativeTest.CommandLineFlags "--gtest_filter=*ES2_VULKAN"
>+```
>diff --git a/Source/ThirdParty/ANGLE/doc/DevSetup.md b/Source/ThirdParty/ANGLE/doc/DevSetup.md
>new file mode 100644
>index 00000000000..0308f5d9d69
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/doc/DevSetup.md
>@@ -0,0 +1,184 @@
>+# ANGLE Development
>+
>+ANGLE provides OpenGL ES 2.0 and EGL 1.4 libraries and dlls.  You can use these to build and run OpenGL ES 2.0 applications on Windows, Linux, Mac and Android.
>+
>+## Development setup
>+
>+### Version Control
>+ANGLE uses git for version control. If you are not familiar with git, helpful documentation can be found at [http://git-scm.com/documentation](http://git-scm.com/documentation).
>+
>+### Required Tools
>+On all platforms:
>+
>+ * GN is the build system.  GYP support has been removed.
>+ * Clang will be set up by the build system and used by default.  See below for platform-specific compiler choices.
>+ * [depot_tools](http://dev.chromium.org/developers/how-tos/install-depot-tools)
>+   * Required to generate projects and build files, contribute patches, run the unit tests or build the shader compiler on non-Windows systems.
>+
>+On Windows:
>+
>+ * [Visual Studio Community 2017 Update 3.2](https://www.visualstudio.com/en-us/news/releasenotes/vs2017-relnotes)
>+   * Put `is_clang = false` in your gn args to compile with the Microsoft Visual C++ compiler instead of clang.
>+   * See the [Chromium Windows build instructions](https://chromium.googlesource.com/chromium/src/+/master/docs/windows_build_instructions.md) for more info.
>+   * Required for the packaged Windows 10 SDK.
>+ * [Windows 10 Standalone SDK version 10.0.17134 exactly](https://developer.microsoft.com/en-us/windows/downloads/windows-10-sdk).
>+   * Comes with additional features that aid development, such as the Debug runtime for D3D11. Required for the D3D Compiler DLL.
>+ * [Cygwin's Bison, flex, and patch](https://cygwin.com/setup-x86_64.exe) (optional)
>+   * This is only required if you need to modify GLSL ES grammar files (`glslang.l` and `glslang.y` under `src/compiler/translator`, or `ExpressionParser.y` and `Tokenizer.l` in `src/compiler/preprocessor`).
>+     Use the latest versions of bison, flex and patch from the 64-bit cygwin distribution.
>+ * **IMPORTANT**: Non-googlers need to set `DEPOT_TOOLS_WIN_TOOLCHAIN` environment variable to 0.
>+
>+On Linux:
>+
>+ * Development packages for OpenGL, X11 and libpci (all of these dependencies should be installed automatically when running `install-build-deps.sh` later on).
>+ * Bison and flex are not needed as we only support generating the translator grammar on Windows.
>+
>+On MacOS:
>+
>+ * [XCode](https://developer.apple.com/xcode/) for Clang and development files.
>+ * Bison and flex are not needed as we only support generating the translator grammar on Windows.
>+
>+### Getting the source
>+
>+```
>+git clone https://chromium.googlesource.com/angle/angle
>+cd angle
>+python scripts/bootstrap.py
>+gclient sync
>+git checkout master
>+```
>+
>+On Linux only, you need to install all the necessary dependencies before going further by running this command:
>+```
>+./build/install-build-deps.sh
>+```
>+
>+After this completes successfully, you are ready to generate the ninja files:
>+```
>+gn gen out/Debug
>+```
>+
>+GN will generate ninja files by default.  To change the default build options run `gn args out/Debug`.  Some commonly used options are:
>+```
>+target_cpu = "x64"  (or "x86")
>+is_clang = false    (to use system default compiler instead of clang)
>+is_debug = true     (enable debugging, true is the default)
>+```
>+For a release build run `gn args out/Release` and set `is_debug = false`.
>+
>+For more information on GN run `gn help`.
>+
>+Ninja can be used to compile on all platforms with one of the following commands:
>+```
>+ninja -C out/Debug
>+ninja -C out/Release
>+```
>+Ninja automatically calls GN to regenerate the build files on any configuration change.
>+Ensure `depot_tools` is in your path as it provides ninja.
>+
>+### Building with Visual Studio
>+
>+Run `scripts/msvs_projects.py` to generate a Visual Studio solution in `out/sln/ANGLE.sln`.
>+This script runs GN and consolidates all the targets in `out` into a single meta-solution.
>+
>+In Visual Studio:
>+ 1. Open the ANGLE solution file `out/sln/ANGLE.sln`.
>+ 2. The configurations found in your `out` directory will be mapped to configurations in the configuration manager.  For compatibility reasons all configurations are listed as 64-bits.
>+ 3. Right click the "all" solution and select build.  "Build Solution" is not functional with GN; instead build one target at a time."
>+Once the build completes the output directory for your selected configuration (e.g. `out/Release_x64`) will contain the required libraries and dlls to build and run an OpenGL ES 2.0 application.  ANGLE executables (tests and samples) are under out/sln.
>+
>+### Building ANGLE for Android
>+Building ANGLE for Android is heavily dependent on the Chromium toolchain. It is not currently possible to build ANGLE for Android without a Chromium checkout. See http://anglebug.com/2344 for more details on why.
>+Please follow the steps in
>+[Checking out and building Chromium for Android](https://chromium.googlesource.com/chromium/src/+/master/docs/android_build_instructions.md).
>+This must be done on Linux, the only platform that Chromium for Android supports.
>+Name your output directories `out/Debug` and `out/Release`, because Chromium GPU tests look for browser binaries in these folders. Replacing `out` with other names seems to be OK when working with multiple build configurations.
>+It's best to use a build configuration of some Android bot on [GPU.FYI waterfall](https://ci.chromium.org/p/chromium/g/chromium.gpu.fyi/console). Look for `generate_build_files` step output of that bot. Remove `goma_dir` flag.
>+For example, these are the build flags from Nexus 5X bot:
>+```
>+build_angle_deqp_tests = true
>+dcheck_always_on = true
>+ffmpeg_branding = "Chrome"
>+is_component_build = false
>+is_debug = false
>+proprietary_codecs = true
>+symbol_level = 1
>+target_cpu = "arm64"          # Nexus 5X is 64 bit, remove this on 32 bit devices
>+target_os = "android"
>+use_goma = true               # Remove this if you don't have goma
>+```
>+Additional flags to build the Vulkan backend, enable only if running on Android O or higher:
>+```
>+android32_ndk_api_level = 26
>+android64_ndk_api_level = 26
>+```
>+
>+These ANGLE targets are supported:
>+`ninja -C out/Release translator libEGL libGLESv2 angle_unittests angle_end2end_tests angle_white_box_tests angle_deqp_gles2_tests angle_deqp_gles3_tests angle_deqp_egl_tests angle_perftests angle_white_box_perftests`
>+
>+In order to run ANGLE tests, prepend `bin/run_` to the test name, for example: `./out/Release/bin/run_angle_unittests`.
>+Additional details are in [Android Test Instructions](https://chromium.googlesource.com/chromium/src/+/master/docs/android_test_instructions.md).
>+
>+**dEQP Note**: Running the tests not using the test runner is tricky, but is necessary in order to get a complete TestResults.qpa from the dEQP tests (since the runner shards the tests, only the results of the last shard will be available when using the test runner). First, use the runner to install the APK, test data and test expectations on the device. After the tests start running, the test runner can be stopped with Ctrl+C. Then, run
>+```
>+adb shell am start -a android.intent.action.MAIN -n org.chromium.native_test/.NativeUnitTestNativeActivity -e org.chromium.native_test.NativeTest.StdoutFile /sdcard/chromium_tests_root/out.txt
>+```
>+After the tests finish, get the results with
>+```
>+adb pull /sdcard/chromium_tests_root/third_party/deqp/src/data/TestResults.qpa .
>+```
>+
>+In order to run GPU telemetry tests, build `chrome_public_apk` target. Then follow [GPU Testing](http://www.chromium.org/developers/testing/gpu-testing#TOC-Running-the-GPU-Tests-Locally) doc, using `--browser=android-chromium` argument. Make sure to set your `CHROMIUM_OUT_DIR` environment variable, so that your browser is found, otherwise the stock one will run.
>+
>+Also, follow [How to build ANGLE in Chromium for dev](BuildingAngleForChromiumDevelopment.md) to work with Top of Tree ANGLE in Chromium.
>+
>+## Application Development with ANGLE
>+This sections describes how to use ANGLE to build an OpenGL ES application.
>+
>+### Choosing a Backend
>+ANGLE can use a variety of backing renderers based on platform.  On Windows, it defaults to D3D11 where it's available,
>+or D3D9 otherwise.  On other desktop platforms, it defaults to GL.  On mobile, it defaults to GLES.
>+
>+ANGLE provides an EGL extension called `EGL_ANGLE_platform_angle` which allows uers to select which renderer to use at EGL initialization time by calling eglGetPlatformDisplayEXT with special enums. Details of the extension can be found in it's specification in `extensions/ANGLE_platform_angle.txt` and `extensions/ANGLE_platform_angle_*.txt` and examples of it's use can be seen in the ANGLE samples and tests, particularly `util/EGLWindow.cpp`.
>+
>+To change the default D3D backend:
>+
>+ 1. Open `src/libANGLE/renderer/d3d/DisplayD3D.cpp`
>+ 2. Locate the definition of `ANGLE_DEFAULT_D3D11` near the head of the file, and set it to your preference.
>+
>+### To Use ANGLE in Your Application
>+On Windows:
>+
>+ 1. Configure your build environment to have access to the `include` folder to provide access to the standard Khronos EGL and GLES2 header files.
>+  * For Visual C++
>+     * Right-click your project in the _Solution Explorer_, and select _Properties_.
>+     * Under the _Configuration Properties_ branch, click _C/C++_.
>+     * Add the relative path to the Khronos EGL and GLES2 header files to _Additional Include Directories_.
>+ 2. Configure your build environment to have access to `libEGL.lib` and `libGLESv2.lib` found in the build output directory (see [Building ANGLE](#building-with-visual-studio)).
>+   * For Visual C++
>+     * Right-click your project in the _Solution Explorer_, and select _Properties_.
>+     * Under the _Configuration Properties_ branch, open the _Linker_ branch and click _Input_.
>+     * Add the relative paths to both the `libEGL.lib` file and `libGLESv2.lib` file to _Additional Dependencies_, separated by a semicolon.
>+ 3. Copy `libEGL.dll` and `libGLESv2.dll` from the build output directory (see [Building ANGLE](#building-with-visual-studio)) into your application folder.
>+ 4. Code your application to the Khronos [OpenGL ES 2.0](http://www.khronos.org/registry/gles/) and [EGL 1.4](http://www.khronos.org/registry/egl/) APIs.
>+
>+On Linux and MacOS, either:
>+
>+ - Link you application against `libGLESv2` and `libEGL`
>+ - Use `dlopen` to load the OpenGL ES and EGL entry points at runtime.
>+
>+## GLSL ES to GLSL Translator
>+In addition to OpenGL ES 2.0 and EGL 1.4 libraries, ANGLE also provides a GLSL ES to GLSL translator. This is useful for implementing OpenGL ES emulators on top of desktop OpenGL.
>+
>+### Source and Building
>+The translator code is included with ANGLE but fully independent; it resides in `src/compiler`.
>+Follow the steps above for [getting and building ANGLE](#getting-the-source) to build the translator on the platform of your choice.
>+
>+### Usage
>+The basic usage is shown in `essl_to_glsl` sample under `samples/translator`. To translate a GLSL ES shader, following functions need to be called in the same order:
>+
>+ * `ShInitialize()` initializes the translator library and must be called only once from each process using the translator.
>+ * `ShContructCompiler()` creates a translator object for vertex or fragment shader.
>+ * `ShCompile()` translates the given shader.
>+ * `ShDestruct()` destroys the given translator.
>+ * `ShFinalize()` shuts down the translator library and must be called only once from each process using the translator.
>diff --git a/Source/ThirdParty/ANGLE/doc/DirtyBits.md b/Source/ThirdParty/ANGLE/doc/DirtyBits.md
>new file mode 100644
>index 00000000000..8c19b13f1d6
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/doc/DirtyBits.md
>@@ -0,0 +1,110 @@
>+# Dirty Bits and State Changes
>+
>+OpenGL render loops typically involve changing some render states followed by
>+a draw call. For instance the app might change a few uniforms and invoke
>+`glDrawElements`:
>+
>+```
>+for (const auto &obj : scene) {
>+    for (const auto &uni : obj.uniforms) {
>+        glUniform4fv(uni.loc, uni.data);
>+    }
>+    glDrawElements(GL_TRIANGLES, obj.eleCount, GL_UNSIGNED_SHORT, obj.eleOffset);
>+}
>+```
>+
>+Another update loop may change Texture and Vertex Array state before the draw:
>+
>+```
>+for (const auto &obj : scene) {
>+    glBindBuffer(GL_ARRAY_BUFFER, obj.arrayBuffer);
>+    glBufferSubData(GL_ARRAY_BUFFER, obj.bufferOffset, obj.bufferSize, obj.bufferData);
>+    glVertexAttribPointer(obj.arrayIndex, obj.arraySize, GL_FLOAT, GL_FALSE, 0, nullptr);
>+    glBindTexture(GL_TEXTURE_2D, obj.texture);
>+    glDrawElements(GL_TRIANGLES, obj.eleCount, GL_UNSIGNED_SHORT, obj.eleOffset);
>+}
>+```
>+
>+Other update loops may change render states like the blending modes, the depth test, or Framebuffer
>+attachments. In each case ANGLE needs to validate, track, and translate these state changes to the
>+back-end as efficiently as possible.
>+
>+## Dirty Bits
>+
>+Each OpenGL Context state value is stored in [`gl::State`](../src/libANGLE/State.h). For instance
>+the blending state, depth/stencil state, and current object bindings. Our problem is deciding how to
>+notify the back-end when app changes front-end state. We decided to bundle changed state into
>+bitsets. Each 1 bit indicates a specific changed state value. We call these bitsets "*dirty bits*".
>+See [`gl::State::DirtyBitType`][DirtyBitType].
>+
>+Each back-end handles state changes in a `syncState` implementation function that takes a dirty
>+bitset. See examples in the [GL back-end][GLSyncState], [D3D11 back-end][D3D11SyncState] and
>+[Vulkan back-end][VulkanSyncState].
>+
>+Container objects such as Vertex Array Objects and Framebuffers also have their own OpenGL front-end
>+state. [VAOs][VAOState] store vertex arrays and array buffer bindings. [Framebuffers][FBOState]
>+store attachment state and the active read and draw buffers. These containers also have internal
>+dirty bits and `syncState` methods. See [`gl::Framebuffer::DirtyBitType`][FBODirtyBits] and
>+[`rx::FramebufferVk::syncState`][FBOVkSyncState] for example.
>+
>+Dirty bits allow us to efficiently process groups of state updates. We use fast instrinsic functions
>+to scan the bitsets for 1 bits. See [`bitset_utils.h`](../src/common/bitset_utils.h) for more
>+information.
>+
>+## Cached Validation and State Change Notifications
>+
>+To optimize validation we cache many checks. See [`gl::StateCache`][StateCache] for examples. We
>+need to refresh cached values on state changes. For instance, enabling a generic vertex array
>+changes a cached mask of active vertex arrays. Changes to a texture's images could change a cached
>+framebuffer's completeness when the texture is bound as an attachment. And if the draw framebuffer
>+becomes incomplete it changes a cached draw call validation check.
>+
>+See a below example of a call to `glTexImage2D` that can affect draw call validation:
>+
>+
>+
>+![State Change Example](https://raw.githubusercontent.com/google/angle/master/doc/img/StateNotificationExample.svg?sanitize=true)
>+
>+We use the [Observer pattern](https://en.wikipedia.org/wiki/Observer_pattern) to implement cache
>+invalidation notifications. See [`Observer.h`](../src/libANGLE/Observer.h). In the example the
>+`Framebuffer` observes `Texture` attachments via [`angle::ObserverBinding`][ObserverBinding].
>+`Framebuffer` implements [`angle::ObserverInterface::onSubjectStateChange`][FBOStateChange] to
>+receive a notification to update its completeness cache. The `STORAGE_CHANGED` message triggers a
>+call to [`gl::Context::onSubjectStateChange`][ContextStateChange] which in turn calls
>+[`gl::StateCache::updateBasicDrawStatesError`][StateCacheUpdate] to re-validate the draw
>+framebuffer's completeness. On subsequent draw calls we skip re-validation at minimal cost.
>+
>+See the below diagram for the dependency relations between Subjects and Observers.
>+
>+![State Change Notification Flow](https://raw.githubusercontent.com/google/angle/master/doc/img/StateChangeNotificationFlow.svg?sanitize=true)
>+
>+## Back-end specific Optimizations
>+
>+See the [Vulkan README][VulkanREADME] for additional information for how we implement state change
>+optimization on the Vulkan back-end.
>+
>+[DirtyBitType]: https://chromium.googlesource.com/angle/angle/+/5f662c0042703344eb0eef6d1c123e902e3aefbf/src/libANGLE/State.h#483
>+[GLSyncState]: https://chromium.googlesource.com/angle/angle/+/5f662c0042703344eb0eef6d1c123e902e3aefbf/src/libANGLE/renderer/gl/StateManagerGL.cpp#1576
>+[D3D11SyncState]: https://chromium.googlesource.com/angle/angle/+/5f662c0042703344eb0eef6d1c123e902e3aefbf/src/libANGLE/renderer/d3d/d3d11/StateManager11.cpp#852
>+[VulkanSyncState]: https://chromium.googlesource.com/angle/angle/+/5f662c0042703344eb0eef6d1c123e902e3aefbf/src/libANGLE/renderer/vulkan/ContextVk.cpp#642
>+[VAOState]: https://chromium.googlesource.com/angle/angle/+/5f662c0042703344eb0eef6d1c123e902e3aefbf/src/libANGLE/VertexArray.h#35
>+[FBOState]: https://chromium.googlesource.com/angle/angle/+/5f662c0042703344eb0eef6d1c123e902e3aefbf/src/libANGLE/Framebuffer.h#52
>+[FBODirtyBits]: https://chromium.googlesource.com/angle/angle/+/5f662c0042703344eb0eef6d1c123e902e3aefbf/src/libANGLE/Framebuffer.h#319
>+[FBOVkSyncState]: https://chromium.googlesource.com/angle/angle/+/5f662c0042703344eb0eef6d1c123e902e3aefbf/src/libANGLE/renderer/vulkan/FramebufferVk.cpp#726
>+[StateCache]: https://chromium.googlesource.com/angle/angle/+/5f662c0042703344eb0eef6d1c123e902e3aefbf/src/libANGLE/Context.h#98
>+[ObserverBinding]: https://chromium.googlesource.com/angle/angle/+/5f662c0042703344eb0eef6d1c123e902e3aefbf/src/libANGLE/Observer.h#103
>+[FBOStateChange]: https://chromium.googlesource.com/angle/angle/+/5f662c0042703344eb0eef6d1c123e902e3aefbf/src/libANGLE/Framebuffer.cpp#1811
>+[ContextStateChange]: https://chromium.googlesource.com/angle/angle/+/5f662c0042703344eb0eef6d1c123e902e3aefbf/src/libANGLE/Context.cpp#7981
>+[StateCacheUpdate]: https://chromium.googlesource.com/angle/angle/+/5f662c0042703344eb0eef6d1c123e902e3aefbf/src/libANGLE/Context.cpp#8190
>+[VulkanREADME]: ../src/libANGLE/renderer/vulkan/README.md#fast-opengl-state-transitions
>diff --git a/Source/ThirdParty/ANGLE/doc/DynamicShaderCompilation.md b/Source/ThirdParty/ANGLE/doc/DynamicShaderCompilation.md
>new file mode 100644
>index 00000000000..894142f7e08
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/doc/DynamicShaderCompilation.md
>@@ -0,0 +1,24 @@
>+# About
>+
>+Because ANGLE can only generate full HLSL programs after we known the signatures
>+between the vertex and pixel stages, we can not immediately call the D3D
>+compiler at GL shader compile time. Moreover, we can insert additional
>+optimization code right at draw-time.
>+
>+ESSL 1.00 shaders treat all vertex inputs as floating point. We insert a
>+conversion routine to transform un-normalized integer vertex attributes in the
>+shader preamble to floating point, saving CPU conversion time.
>+
>+At draw-time, we also optimize out any unused render target outputs. This
>+improved draw call performance significantly on lower spec and integrated
>+devices. Changing render target setups may trigger a shader recompile at draw
>+time.
>+
>+# Addendum
>+
>+ANGLE is not the only program to do this kind of draw-time optimization. A
>+common complaint from application developers is that draw calls sometimes
>+perform very slowly due to dynamic shader re-compilation. A future design
>+direction for ANGLE, when targeting a more modern API, is to perform the vertex
>+conversion in a separate shader pass, which would then be linked with another
>+compiled shader.
>diff --git a/Source/ThirdParty/ANGLE/doc/ExtensionSupport.md b/Source/ThirdParty/ANGLE/doc/ExtensionSupport.md
>new file mode 100644
>index 00000000000..1df3c5808c4
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/doc/ExtensionSupport.md
>@@ -0,0 +1,65 @@
>+# Introduction
>+
>+This page details the extensions that are supported by ANGLE.
>+
>+Specifications for GLES extensions can be found in the [Khronos OpenGL ES API
>+Registry](http://www.khronos.org/registry/gles/)
>+
>+Specifications for EGL extensions can be found in the [Khronos EGL API Registry]
>+(http://www.khronos.org/registry/egl/)
>+
>+Specifications for ANGLE-specific extensions can be found in the [ANGLE
>+extension registry](../extensions)
>+
>+# Details
>+
>+## GLES extensions
>+
>+*   GL\_OES\_element\_index\_uint (fn1)
>+*   GL\_OES\_get\_program\_binary
>+*   GL\_OES\_packed\_depth\_stencil
>+*   GL\_OES\_rgb8\_rgba8
>+*   GL\_OES\_standard\_derivatives
>+*   GL\_OES\_texture\_half\_float (fn1)
>+*   GL\_OES\_texture\_half\_float\_linear (fn1)
>+*   GL\_OES\_texture\_float (fn1)
>+*   GL\_OES\_texture\_float\_linear (fn1)
>+*   GL\_OES\_texture\_npot (fn1)
>+*   GL\_EXT\_occlusion\_query\_boolean (fn1)
>+*   GL\_EXT\_read\_format\_bgra
>+*   GL\_EXT\_robustness
>+    *   reset notifications and sized queries only, no robust buffer access
>+*   GL\_EXT\_texture\_compression\_dxt1 (fn1)
>+*   GL\_EXT\_texture\_filter\_anisotropic (fn1)
>+*   GL\_EXT\_texture\_format\_BGRA8888
>+*   GL\_EXT\_texture\_storage
>+*   GL\_ANGLE\_depth\_texture
>+    *   requires support for INTZ and NULL surfaces in D3D9 (see
>+        http://aras-p.info/texts/D3D9GPUHacks.html)
>+*   GL\_ANGLE\_framebuffer\_blit
>+*   GL\_ANGLE\_framebuffer\_multisample (fn1)
>+*   GL\_ANGLE\_instanced\_arrays
>+    *   requires SM3 support
>+*   GL\_ANGLE\_pack\_reverse\_row\_order
>+*   GL\_ANGLE\_texture\_compression\_dxt3 (fn1)
>+*   GL\_ANGLE\_texture\_compression\_dxt5 (fn1)
>+*   GL\_ANGLE\_texture\_usage
>+*   GL\_ANGLE\_translated\_shader\_source
>+*   GL\_NV\_fence (fn1)
>+
>+## EGL Extensions
>+
>+*   EGL\_EXT\_create\_context\_robustness
>+    *   only reset notifications supported
>+*   EGL\_ANGLE\_d3d\_share\_handle\_client\_buffer (fn2)
>+*   EGL\_ANGLE\_query\_surface\_pointer
>+*   EGL\_ANGLE\_software\_display (fn3)
>+*   EGL\_ANGLE\_surface\_d3d\_texture\_2d\_share\_handle (fn2)
>+*   EGL\_NV\_post\_sub\_buffer
>+
>+### Notes
>+
>+*   fn1: extensions are only exposed if underlying D3D9 device has support for
>+    the required features
>+*   fn2: extensions are only exposed when running on D3D9Ex (ie Win Vista/7)
>+*   fn3: extension is only exposed when swiftshader is present
>diff --git a/Source/ThirdParty/ANGLE/doc/ExternalBenchmarks.md b/Source/ThirdParty/ANGLE/doc/ExternalBenchmarks.md
>new file mode 100644
>index 00000000000..bb98394058a
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/doc/ExternalBenchmarks.md
>@@ -0,0 +1,124 @@
>+# Using External Benchmarks with ANGLE
>+
>+This document contains instructions on how to run external benchmarks on ANGLE as the GLES renderer.
>+There is a section for each benchmark with subsections for each platform.  The general theme is to
>+make the benchmark application pick ANGLE's `libGLESv2.so` and `libEGL.so` files instead of the
>+system ones.
>+
>+On Linux, this is generally achieved with setting `LD_LIBRARY_PATH`.  On Windows, ANGLE dlls may
>+need to be copied to the benchmark's executable directory.
>+
>+## glmark2
>+
>+This benchmark can be found on [github](https://github.com/glmark2/glmark2).  It's written against
>+GLES 2.0 and supports Linux and Android.  It performs tens of tests and reports the framerate for
>+each test.
>+
>+### glmark2 on Linux
>+
>+To build glmark2 on Linux:
>+
>+```
>+$ git clone https://github.com/glmark2/glmark2.git
>+$ cd glmark2
>+$ ./waf configure --with-flavors=x11-glesv2 --data-path=$PWD/data/
>+$ ./waf
>+```
>+
>+To run glmark2 using the native implementation of GLES:
>+
>+```
>+$ cd build/src
>+$ ./glmark2-es2
>+```
>+
>+To run glmark2 using ANGLE, we need to first create a few links in the build directory of ANGLE:
>+
>+```
>+$ cd /path/to/angle/out/release
>+$ ln -s libEGL.so libEGL.so.1
>+$ ln -s libGLESv2.so libGLESv2.so.2
>+```
>+
>+Back in glmark2, we need to make sure these shared objects are picked up:
>+
>+```
>+$ cd /path/to/glmark2/build/src
>+$ LD_LIBRARY_PATH=/path/to/angle/out/release/ ldd ./glmark2-es2
>+```
>+
>+With `ldd`, you can verify that `libEGL.so.1` and `libGLESv2.so.2` are correctly picked up from
>+ANGLE's build directory.
>+
>+To run glmark2 on the default back-end of ANGLE:
>+
>+```
>+$ LD_LIBRARY_PATH=/path/to/angle/out/release/ ./glmark2-es2
>+```
>+
>+To run glmark2 on a specific back-end of ANGLE:
>+
>+```
>+$ ANGLE_DEFAULT_PLATFORM=vulkan LD_LIBRARY_PATH=/path/to/angle/out/release/ ./glmark2-es2
>+```
>+
>+### glmark2 on Linux for Android
>+
>+**Prerequisites**
>+
>+Below steps are set up to use version 26.0.1 of build-tools, which can be downloaded here:
>+
>+[https://dl.google.com/android/repository/build-tools_r26.0.1-linux.zip](https://dl.google.com/android/repository/build-tools_r26.0.1-linux.zip)
>+
>+Tested with r19 of NDK, which can be downloaded here:
>+
>+[https://dl.google.com/android/repository/android-ndk-r19-linux-x86_64.zip](https://dl.google.com/android/repository/android-ndk-r19-linux-x86_64.zip)
>+
>+Tested with OpenJDK 8:
>+
>+```
>+sudo apt-get install openjdk-8-jdk
>+```
>+
>+Note: This is built from a branch that has fixes for Android.  It only supports
>+32-bit ARM (armeabi-v7a).  Supporting other ABIs requires more work, possibly
>+including a move to cmake instead of ndk-build.
>+
>+**Setup**
>+
>+```
>+export ANDROID_SDK=<path_to_Android_SDK>
>+export ANDROID_NDK=<path_to_Android_NDK>
>+export JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64
>+```
>+
>+**Build**
>+
>+```
>+git clone https://github.com/cnorthrop/glmark2.git
>+cd glmark2/android
>+git checkout android_fixes
>+./build.sh
>+```
>+
>+**Install**
>+
>+```
>+adb install --abi armeabi-v7a glmark2.apk
>+```
>+
>+**Run**
>+
>+To select ANGLE as the driver on Android (requires Android Q):
>+
>+```
>+adb shell settings put global angle_gl_driver_selection_pkgs org.linaro.glmark2
>+adb shell settings put global angle_gl_driver_selection_values angle
>+```
>+
>+To switch back to native GLES driver:
>+
>+```
>+adb shell settings delete global angle_gl_driver_selection_values
>+adb shell settings delete global angle_gl_driver_selection_pkgs
>+```
>diff --git a/Source/ThirdParty/ANGLE/doc/MANGLE.md b/Source/ThirdParty/ANGLE/doc/MANGLE.md
>new file mode 100644
>index 00000000000..132a7763030
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/doc/MANGLE.md
>@@ -0,0 +1,9 @@
>+# M(ulti-platform)ANGLE effort
>+
>+Starting in early 2014, the ANGLE team has begun work on refactoring the code
>+with the goal of supporting translation to desktop OpenGL. In 2016, work on
>+supporting Vulkan as a back-end started. The new purpose of ANGLE is to
>+provide a consistent OpenGL ES and EGL context on as many platforms as possible.
>+
>+The design doc is available [here]
>+(https://docs.google.com/document/d/17mxRfzXuEWyvGM3t2KqVY4svvfRj_GzysOEpmnDpqeo/edit?usp=sharing).
>diff --git a/Source/ThirdParty/ANGLE/doc/Orientation.md b/Source/ThirdParty/ANGLE/doc/Orientation.md
>new file mode 100644
>index 00000000000..ecaf25d56dd
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/doc/Orientation.md
>@@ -0,0 +1,146 @@
>+# ANGLE Orientation
>+
>+A basic guide to get up and running fixing bugs and performance issues in ANGLE.
>+
>+## First ANGLE Compile
>+
>+### Windows
>+
>+- Download and install
>+  [Visual Studio 2017 Community](https://www.visualstudio.com/en-us/products/visual-studio-community-vs.aspx).
>+  Installing takes some time.
>+
>+- Take the time to register a Microsoft account, otherwise you'll get nagged to death.
>+
>+- Download and install Chromium's
>+  [depot_tools](http://commondatastorage.googleapis.com/chrome-infra-docs/flat/depot_tools/docs/html/depot_tools_tutorial.html#_setting_up)
>+  for building ANGLE.
>+
>+- Add the `depot_tools` dir to your system path. Open start menu, type "edit environment variables",
>+  add it to PATH.
>+
>+- (recommended) Download and install [Git for Windows](http://gitforwindows.org/).
>+
>+- Open Git bash, head to C:/src and follow the steps on
>+  [the ANGLE wiki](https://chromium.googlesource.com/angle/angle/+/master/doc/DevSetup.md#Development-setup-Getting-the-source)
>+  to set up the ANGLE solution for the first time.
>+
>+- The VS 2017 solution will be in `c:/src/angle/out/sln/ANGLE.sln`. Open and let the installation
>+  finish.  **Important**: set indent style to spaces, not tabs!
>+
>+- Building should work at this point!
>+
>+- Try running `angle_end2end_tests`, `angle_unittests` or a sample program.
>+
>+- Useful VS extensions:
>+
>+  1. [Build Only Startup Project](https://marketplace.visualstudio.com/items?itemName=SenHarada.BuildOnlyStartupProject)
>+  2. [SwitchStartupProject](https://marketplace.visualstudio.com/items?itemName=vs-publisher-141975.SwitchStartupProject)
>+  3. [Smart CommandLine Arguments](https://www.visualstudiogallery.msdn.microsoft.com/535f79b1-fbe0-4b0a-a346-8cdf271ea071)
>+
>+### Linux
>+
>+- Download and install Chromium's
>+  [depot_tools](http://commondatastorage.googleapis.com/chrome-infra-docs/flat/depot_tools/docs/html/depot_tools_tutorial.html#_setting_up)
>+  for building ANGLE.
>+
>+- Ensure you add `depot_tools` to your bashrc as in the wiki link above.
>+
>+- Follow the steps on
>+  [the ANGLE wiki](https://chromium.googlesource.com/angle/angle/+/master/doc/DevSetup.md#Development-setup-Getting-the-source)
>+  to setup ANGLE's build.
>+
>+- Building should work at this point! Follow the steps on the Wiki.
>+
>+- Try running `angle_end2end_tests`, `angle_unittests` or a sample program.
>+
>+## Setting up the [drawElements testing suite](http://go/dEQP)
>+
>+- [Cherry](https://sites.google.com/a/google.com/deqp/cherry) is the UI for viewing test results.
>+  ANGLE checks out a copy in `<angledir>/third_party/cherry`.
>+
>+- Follow the instructions in the
>+  [installation README](https://android.googlesource.com/platform/external/cherry/+/refs/heads/master/README)
>+  to get it running. On Windows, use 64-bit.
>+
>+- Read up on testing with
>+  [dEQP on the ANGLE Wiki](https://chromium.googlesource.com/angle/angle/+/master/doc/dEQP.md).
>+
>+- Try running `angle_deqp_gles2_tests_no_gtest` with the flag
>+  `--deqp-case=dEQP-GLES2.functional.negative_api.*` and load a test report in Cherry.
>+
>+- To use Cherry, browse to [http://localhost:8080/#/results](http://localhost:8080/#/results) and
>+  click '**Import existing batch**', loading `TestResults.qpa`.  Look for the qpa file in the
>+  current working directory, or `<angledir>/src/tests` if you ran the tests from Visual Studio.
>+
>+- Note: we only use Cherry for viewing test output, not running the tests. On start, you may see
>+  some runtime messages about unable to load case lists. These are safe to ignore. If you didn't
>+  load the results URL directly, click the "**Results**" tab to find the Import button.
>+
>+## Profiling
>+
>+- You can use `scripts/perf_test_runner.py` to run any target of `./angle_perftests` (see script
>+  source for details).
>+
>+### With Visual Studio
>+
>+- In Visual Studio 2017, look under Debug/Profiler/Performance Explorer/New Performance Session.
>+  Right-click "Targets" and add `angle_perftests` as a Target Project.
>+
>+- Run `angle_perftests` with the flag `--gtest_filter=DrawCallPerfBenchmark.Run/d3d11_null` for
>+  D3D11, `.../d3d9_null` for D3D9, `.../gl_null` for OpenGL and `.../vulkan_null` for Vulkan.
>+
>+- Make sure you close all open instances of Chrome, they use a lot of background CPU and GPU. In
>+  fact, close every process and application you can.
>+
>+### Profiling with Visual Studio + Chrome
>+
>+- Install [Chrome Canary](https://www.google.com/chrome/browser/canary.html).
>+
>+- Canary's install dir is usually `%APPDATA%/Local/Google/Chrome SxS/Application`
>+
>+- Build ANGLE x64, Release, and run 'python scripts/update_canary_angle.py' to replace Canary's
>+  ANGLE with your custom ANGLE. (Note: Canary must be closed)
>+
>+- Start Canary with `--gpu-startup-dialog --disable-gpu-sandbox`, wait for the dialog.
>+
>+- In Visual Studio, under Debug/Profiler, choose attach to process.
>+
>+- Attach to the Chrome GPU process, then immediately pause profiling.
>+
>+- **IMPORTANT:** Verify ANGLE details are correct in `about:gpu`.
>+
>+- In Canary, start your benchmark, then resume profiling, and exit when done. The report will load
>+  automatically.
>+
>+## Bookmark the latest Khronos specs
>+
>+- [The GLES 2.0 Spec](https://www.khronos.org/registry/OpenGL/specs/es/2.0/es_full_spec_2.0.pdf)
>+
>+- [The GLES 3.0 Spec](https://www.khronos.org/registry/OpenGL/specs/es/3.0/es_spec_3.0.pdf)
>+
>+- [The GLES 3.1 Spec](https://www.khronos.org/registry/gles/specs/3.1/es_spec_3.1.pdf)
>+
>+- [The GLES Shading Language 1.00 Spec](https://www.khronos.org/files/opengles_shading_language.pdf)
>+
>+- [The GLES Shading Language 3.00 Spec](https://www.khronos.org/registry/gles/specs/3.0/GLSL_ES_Specification_3.00.4.pdf)
>+
>+- [The WebGL Specs](https://www.khronos.org/registry/webgl/specs/latest/)
>+
>+- [A modern desktop OpenGL Spec](https://www.opengl.org/registry/doc/glspec45.core.pdf)
>+  (for reference)
>+
>+- [The Vulkan Spec](https://www.khronos.org/registry/vulkan/specs/1.0-wsi_extensions/html/vkspec.html)
>+
>+These specs can be found in the [OpenGL Registry](https://github.com/KhronosGroup/OpenGL-Registry)
>+and the [Vulkan Docs](https://github.com/KhronosGroup/Vulkan-Docs) repositories as well.
>+
>+## Join Groups and Chats
>+
>+- Join the `#angle` channel in `chromium.slack.com`.
>+
>+### For Googlers
>+
>+- Join angle-team@ for access to many important emails and shared documents.
>+
>+- We have a Hangouts Chat channel. Ask for an invite.
>diff --git a/Source/ThirdParty/ANGLE/doc/ResourceLimits.md b/Source/ThirdParty/ANGLE/doc/ResourceLimits.md
>new file mode 100644
>index 00000000000..bc44a495b8f
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/doc/ResourceLimits.md
>@@ -0,0 +1,34 @@
>+# Resource Limits
>+
>+OpenGL ES 2.0 API is quite powerful but there are still some features that are
>+optional or allow for wide variability between implementations.
>+
>+Applications that need more than the minimum values for these limits should
>+query the capabilities of the GL device and scale their usage based on the
>+deviceâs feature set. Failing to do so and assuming sufficient limits typically
>+results in reduced portability.
>+
>+The various implementation dependent limits can be found in Tables 6.18 â 6.20
>+of the [OpenGL ES 2.0.25 specification]
>+(http://www.khronos.org/registry/gles/specs/2.0/es_full_spec_2.0.25.pdf).
>+
>+# Capabilities
>+
>+Capability                                 | ES 2.0 Minimum | ANGLE            | SM2   | SM3      | SM4+
>+:----------------------------------------- | :------------- | :--------------- | :---- | :------- | :-------
>+GL\_MAX\_VERTEX\_ATTRIBS                   | 8              | 16               |       |          |
>+GL\_MAX\_VERTEX\_UNIFORM\_VECTORS          | 128            | 254              |       |          |
>+GL\_MAX\_VERTEX\_TEXTURE\_IMAGE\_UNITS     | 0              | (fn1)            | 0     | 0        | 4
>+GL\_MAX\_VARYING\_VECTORS                  | 8              | (fn1)            | 8     | 10       | 10
>+GL\_MAX\_FRAGMENT\_UNIFORM\_VECTORS        | 16             | (fn1)            | 29    | 221      | 221
>+GL\_MAX\_TEXTURE\_IMAGE\_UNITS             | 8              | 16               |       |          |
>+GL\_MAX\_TEXTURE\_SIZE                     | 64             | 2048-16384 (fn1) |       |          |
>+GL\_MAX\_CUBE\_MAP\_SIZE                   | 16             | 2048-16384 (fn1) |       |          |
>+GL\_MAX\_RENDERBUFFER\_SIZE                | 1              | 2048-16384 (fn1) |       |          |
>+GL\_ALIASED\_POINT\_SIZE\_RANGE (min, max) | (1, 1)         | (fn2)            | (1,1) | (1, fn2) | (1, fn2)
>+GL\_ALIASED\_LINE\_WIDTH\_RANGE (min, max) | (1, 1)         | (1, 1)           |       |          |
>+
>+## Notes
>+
>+*   fn1: limits vary based on the underlying hardware capabilities
>+*   fn2: on SM3 or better hardware the max point size is D3DCAPS9.MaxPointSize
>diff --git a/Source/ThirdParty/ANGLE/doc/SourceAccess.md b/Source/ThirdParty/ANGLE/doc/SourceAccess.md
>new file mode 100644
>index 00000000000..89a5b1866c9
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/doc/SourceAccess.md
>@@ -0,0 +1,15 @@
>+# ANGLE Source Code
>+
>+# Browsing
>+
>+ANGLE's source no longer resides at code.google.com! To browse the ANGLE source,
>+please visit https://chromium.googlesource.com/angle/angle
>+
>+# Checkout
>+
>+You may clone the ANGLE repository with:
>+
>+> `git clone https://chromium.googlesource.com/angle/angle`
>+
>+For full instructions on setting up your system with the necessary prerequisites
>+for development with ANGLE, please see the DevSetup page.
>diff --git a/Source/ThirdParty/ANGLE/doc/Starter-Projects.md b/Source/ThirdParty/ANGLE/doc/Starter-Projects.md
>new file mode 100644
>index 00000000000..4ce1aa71b0d
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/doc/Starter-Projects.md
>@@ -0,0 +1,111 @@
>+# ANGLE Starter Projects
>+
>+For the most up-to-date list of starter projects, see
>+[anglebug.com](https://bugs.chromium.org/p/angleproject/issues/list?q=Hotlist%3DStarterBug).  If you
>+decide to take on any task, write a comment so you can get in touch with us, and more importantly,
>+set yourself as the "owner" of the bug.  This avoids having multiple people accidentally working on
>+the same issue.
>+
>+## Refactors
>+
>+### EGL Validation Refactoring
>+
>+[anglebug.com/798](http://anglebug.com/798)
>+
>+Move all EGL validation into separate functions in ValidationEGL.h. This opens up many possibilities
>+for auto-generation of entry points and is simply a cleaner structure.
>+
>+### EGL Entry Point Auto-generation
>+
>+[anglebug.com/2621](http://anglebug.com/2621)
>+
>+Auto-generate EGL entry points and stub functions. This greatly reduces the chance of bugs in this
>+highly repetitive code and reduces the friction to adding new extensions.
>+
>+### Support Separate Read and Draw Surfaces
>+
>+[anglebug.com/2620](http://anglebug.com/2620)
>+
>+ANGLE has never supported binding separate read and draw surfaces with eglMakeCurrent due to its
>+architecture. Some refactoring could be done to support this use case.
>+
>+### Convert GLenums into typed internal Enums
>+
>+[anglebug.com/2169](http://anglebug.com/2169)
>+
>+Using a compact enum instead of GLenum offers type safety. Flat enums can also index into flat
>+arrays. We are in the process of migrating all internal GLenums into packed enums.
>+
>+## Medium Features
>+
>+### Add an AST Validator to the Shader Translator
>+
>+[anglebug.com/2733](http://anglebug.com/2733)
>+
>+An AST validator will reduce the number of bugs in our AST transforms and allow us to be more
>+confident about all ASTs generated by the translator.
>+
>+## Small Features
>+
>+### Fix shader source viewing in RenderDoc/NSIGHT
>+
>+[anglebug.com/2734](http://anglebug.com/2734)
>+
>+It used to be possible to view the shader source when debugging shaders in graphics debuggers but
>+now only the shader disassembly is available.
>+
>+### Implement Android CDD Extensions
>+
>+[anglebug.com/2506](http://anglebug.com/2506)
>+
>+The Android CDD requires some EGL and OpenGL ES extensions from every driver. Many of them are
>+simply exposing the native driver's extension to ANGLE's frontend.
>+
>+## Performance
>+
>+### Add perf test for eglMakeCurrent
>+
>+[anglebug.com/2556](http://anglebug.com/2556)
>+
>+Many customers switch Contexts frequently. MakeCurrent shows up as a hotspot. A performance test
>+would protect against regressions.
>+
>+### Refactor std::maps into Static Arrays
>+
>+[anglebug.com/1389](http://anglebug.com/1389)
>+
>+ANGLE uses internal global maps for texture tables. We should rewrite them to save on binary size
>+and optimize startup time.
>+
>+## Maintenance
>+
>+### Add a presubmit python script
>+
>+[anglebug.com/2626](http://anglebug.com/2626)
>+
>+This simple script could verify that there is no diff on git cl upload.  This saves developer time
>+in the long run.
>+
>+## Conformance
>+
>+### Vulkan ES2 fixes
>+
>+[anglebug.com/2615](http://anglebug.com/2615) - see open blocking bugs. Also
>+[this link](https://bugs.chromium.org/p/angleproject/issues/list?can=2&q=Renderer%3DVulkan+-has%3Aowner&colspec=ID+Type+Status+Priority+Feature+Owner+Summary&cells=ids)
>+for open issues.
>+
>+Many small edge cases still need attention.
>+
>+### WebGL Conformance on Windows
>+
>+[tracking document](https://docs.google.com/spreadsheets/d/1NQePFOdCKT1WKG2P4Qt8igLrLVy4U3vLOLvVWwbkllw/edit?usp=sharing)
>+
>+ANGLE is preparing to release its OpenGL backend on Windows in Chrome using the passthrough command
>+decoder. There are still some failing WebGL tests.
>+
>+### EGL Conformance
>+
>+[anglebug.com/2623](http://anglebug.com/2623)
>+
>+ANGLE's EGL implementation has a lot of holes in it's conformance. There are many tests that fail on
>+all platforms due to bugs in ANGLE's EGL frontend.
>diff --git a/Source/ThirdParty/ANGLE/doc/Update20120704.md b/Source/ThirdParty/ANGLE/doc/Update20120704.md
>new file mode 100644
>index 00000000000..c3d80333f6e
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/doc/Update20120704.md
>@@ -0,0 +1,119 @@
>+# ANGLE Development Update - July 4, 2012
>+
>+We haven't posted an update on the development status of ANGLE in quite some
>+time and we'd like to provide an update on some of the new features and
>+improvements that we've been working on.
>+
>+## Conformance
>+
>+As announced in the [Chromium Blog]
>+(http://blog.chromium.org/2011/11/opengl-es-20-certification-for-angle.html),
>+ANGLE v1.0 has passed the Khronos OpenGL ES 2.0 certification process and is now
>+a [conformant](http://www.khronos.org/conformance/adopters/conformant-products/)
>+OpenGL ES 2.0 implementation.
>+
>+## Extensions
>+
>+We have recently completed the implementation of depth texture support
>+([ANGLE\_depth\_texture]
>+(https://code.google.com/p/angleproject/source/browse/extensions/ANGLE_depth_texture.txt?name=master))
>+and earlier in the year we added support for instancing via attribute array
>+divisors ([ANGLE\_instanced\_arrays]
>+(https://code.google.com/p/angleproject/source/browse/extensions/ANGLE_instanced_arrays.txt?name=master)).
>+See ExtensionSupport for a complete list of extensions that are supported by
>+ANGLE.
>+
>+## Shader Compiler
>+
>+We have also made a number of improvements in the shader compiler.
>+
>+* We addressed a number of defects related to scoping differences between HLSL and
>+GLSL and improved the scoping support in ANGLE's compiler front-end. We also
>+worked with The Khronos Group to get an ESSL spec bug fixed and several items
>+clarified.
>+* We addressed a number of correctness issues in the GLSL to HLSL
>+translation process. We fixed some bugs related to constant propagation and
>+comma conditional assignments. More importantly, we fully implemented support
>+for short-circuiting boolean logic operations. In GLSL, Boolean expressions do
>+short-circuit evaluation as in C, but HLSL evaluates them entirely. This only
>+has an observable effect if a short-circuited operation has side effects, such
>+as a function call that modifies global variables.
>+* We implemented detection
>+for discontinuous gradient or derivative computations inside loops and replace
>+them with explicitly defined continuous behaviour. HLSL and GLSL differ in their
>+specified behaviour for operations which compute gradients or derivatives.
>+Gradients are computed by texture samplingÂ functions which don't specify a
>+specific mipmap LOD level, and by the OES\_standard\_derivatives built-in
>+functions. To determine the gradient, theÂ corresponding values in neighbouring
>+pixels are differentiated. If neighbouring pixels execute different paths
>+through the shader this can cause a discontinuity in the gradient. GLSL
>+specifies that in these cases the gradient is undefined. HLSL tries to avoid the
>+discontinuity in the compiler by unrolling loops so that every pixel executes
>+all iterations. This can make the D3D HLSL compiler spend a long time generating
>+code permutations, and possiblyÂ even fail compilation due to running out of
>+instruction slots or registers. Because the GLSL specification allows undefined
>+behaviour, we can define such texture sampling functions to useÂ mipmap LOD level
>+0, and have the derivatives functions return 0.0. To do this we examine the GLSL
>+code's abstract syntax tree and detect whether the shader contains any loops
>+withÂ discontinuities and gradient operations. Within such loops, we generate
>+HLSL code that uses explicitly defined texture LODs and derivative information.
>+One additional consideration is that within these loops there can be calls to
>+user-defined functions which may containÂ gradient operations. In this case, we
>+generate variants of user-defined functions where these operations are
>+explicitly defined. We use these newÂ functions instead of the original ones in
>+loops with discontinuities.
>+
>+These fixes result in ANGLE being able successfully compile a number of the more
>+complex shaders. Unfortunately there are still some complex shaders which we
>+have not yet been able to obtain solutions for. Ultimately Direct3D 9 SM3
>+shaders are more restricted than what can be expressed in GLSL. Â Most of the
>+problematic shaders we've encountered will also not compile successfully on
>+current ES 2.0 implementations. Â We would only be able to achieve parity with
>+Desktop GL implementations by using Direct3D 10 or above.
>+
>+## Texture Origin Changes
>+
>+We have also made a major change to ANGLE in the way the origin difference
>+between D3D and OpenGL is handled. This difference is normally observable when
>+using render-to-texture techniques, and if not accounted for, it would appear
>+that images rendered to textures are upside down. In recent versions of ANGLE
>+(r536 (on Google Code)-r1161 (on Google Code)), we have been storing surfaces
>+following the D3D Y convention where (0, 0) is the top-left, rather than GL's
>+bottom-left convention. This was done by vertically flipping textures on load
>+and then adjusting the texture coordinates in the shaders to compensate. This
>+approach worked well, but it did leave the orientation of pbuffers inverted when
>+compared to native GL implementations. As of ANGLE r1162 (on Google Code), we
>+have changed this back to the original way it was implemented - textures are
>+loaded and stored in the GL orientation, and the final rendered scene is flipped
>+when it is displayed to a window by eglSwapBuffers. This should be essentially
>+transparent to applications except that orientation of pbuffers will change.Â  In
>+addition to fixing the pbuffer orientation, this change:
>+
>+* eliminates
>+dependent-texture look-ups in the shaders, caused by flipping the texture
>+y-coordinates
>+* rounding of texture coordinates (while previously within spec)
>+will be more consistent with other implementations, and
>+* allows potential
>+faster paths for loading texture data to be implemented. The only potential
>+downside to this approach is that window-based rendering may be a bit slower for
>+simple scenes. The good news is that this path is not used by browser
>+implementations on most versions of Windows.
>+
>+## Preprocessor
>+
>+Finally, Alok P. from Google has been working on implementing a new shader
>+preprocessor for the last number of months and this effort is nearly complete.
>+This new preprocessor should be more robust and much more maintainable. It also
>+includes many (~5000) unit tests and passes all WebGL conformance tests. If you
>+wish to try this out before it is enabled by default, define
>+ANGLE\_USE\_NEW\_PREPROCESSOR=1 in your project settings for the
>+translator\_common project.
>+
>+## Contributions
>+
>+As always we welcome contributions either in the bug reports (preferably with an
>+isolated test-case) or in the form of code contributions. We have added a
>+[ContributingCode](ContributingCode.md) wiki page documenting the preferred
>+process for contributing code. We do need to ask that you sign a Contributor
>+License Agreement before we can integrate your patches.
>diff --git a/Source/ThirdParty/ANGLE/doc/Update20130618.md b/Source/ThirdParty/ANGLE/doc/Update20130618.md
>new file mode 100644
>index 00000000000..576c76185b7
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/doc/Update20130618.md
>@@ -0,0 +1,26 @@
>+# ANGLE Development Update - June 18, 2013
>+
>+This week brings some significant changes to ANGLE, which we think are worth
>+covering in a development update.
>+
>+## Migration from svn to git
>+
>+We've changed our backing version control system from svn to git. Projects and
>+contributors pulling from the svn repository will continue to be able to do so,
>+but please note that this repository is now read-only, and no further updates
>+will be made there. To continue tracking new development and issue fixes, you'll
>+need to watch the git repository. Instructions on checking out code from the git
>+repository can be found on the [Source Checkout](https://code.google.com/p/angleproject/source/checkout) page.
>+
>+## DirectX 11 Support
>+
>+ANGLE now provides both a DirectX 9 and a DirectX 11-backed renderer in the same
>+code base. By default, support for the DirectX 11 renderer is disabled, but it
>+can be enabled by toggling the value of ANGLE\_ENABLE\_D3D11 as described on the
>+DevSetup page. On systems without DirectX 11 support, ANGLE will fall back to
>+DirectX 9.
>+
>+This work originally appeared in our dx11proto branch, which, with the move to
>+the new repository, has been promoted to master. Code previously located in the
>+trunk of the svn repository will now be located in the git legacy branch, and
>+active development will now move to the newly promoted master.
>diff --git a/Source/ThirdParty/ANGLE/doc/Update20131120.md b/Source/ThirdParty/ANGLE/doc/Update20131120.md
>new file mode 100644
>index 00000000000..968e5f6b89c
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/doc/Update20131120.md
>@@ -0,0 +1,15 @@
>+# ANGLE Development Update - November 20, 2013
>+
>+ANGLE has undergone a few further migrations in the past week, which we thought
>+it important to mention in a front-page update.
>+
>+The review process for contributed code has moved from [Rietveld](https://codereview.appspot.com/)
>+to [Gerrit](https://chromium-review.googlesource.com). This migration allows us to more
>+easily support a Git-centric workflow, and eases the process of accepting
>+changes submitted by contributors without commit access to our repositories.
>+
>+As a result of this change, our repository has also moved from its prior
>+location at code.google.com to https://chromium.googlesource.com/angle/angle.
>+The repository may still be pulled from its old location, but no further changes
>+will be committed there. Updates will be made only to the repository's new
>+location.
>diff --git a/Source/ThirdParty/ANGLE/doc/Update20140325.md b/Source/ThirdParty/ANGLE/doc/Update20140325.md
>new file mode 100644
>index 00000000000..763b539e929
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/doc/Update20140325.md
>@@ -0,0 +1,30 @@
>+# ES 3.0 Development Branch merging
>+
>+ANGLE will soon be merging its ES 3.0 development branch to master, to make
>+available (and more visible) the changes we've been making over the past several
>+months in support of ES 3.0, and to remove divergence between the master and
>+development branches.
>+
>+The previous master branch will still be available as the es2only-legacy branch,
>+and SHAs will not change, so dependencies on individual commits of ANGLE will
>+continue to work as expected. However, new contributions against es2only-legacy
>+will generally not be considered, and future work should be done on master.
>+
>+This merge doesn't signify completion of ES 3.0, as we have some features still
>+left to implement there, but interested developers can explore the work in
>+progress. A significant portion of 3.0 features have been implemented,
>+including:
>+
>+* 2D array textures, 3D textures
>+* Expanded texture format support
>+* Uniform Buffer Objects
>+* Vertex Array Objects
>+* Sampler objects, expanded sampler types
>+* Transform Feedback
>+* Texture Swizzle
>+* GLSL integer support
>+
>+ES 3.0 features should not yet be considered stable, even where implemented, and
>+some features are present only via naive implementation so far. There is still
>+quite a bit of work ahead of us before ES 3.0 support is complete, but this
>+merge should provide insight to those interested in what we've been working on!
>diff --git a/Source/ThirdParty/ANGLE/doc/Update20150105.md b/Source/ThirdParty/ANGLE/doc/Update20150105.md
>new file mode 100644
>index 00000000000..e0e41b02522
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/doc/Update20150105.md
>@@ -0,0 +1,45 @@
>+# Multiplatform ANGLE Refactor Complete
>+
>+ANGLE's [multiplatform refactoring effort](MANGLE.md) is now complete, paving
>+the way for additional rendering backends, allowing ANGLE to enable OpenGL ES
>+not just over Direct3D 9 and 11, but also desktop OpenGL.
>+
>+The refactoring we've done encapsulates D3D-related assumptions and API calls at
>+the renderer level, so that no D3D calls are made in the renderer-agnostic
>+portions of the codebase, and D3D-specific feature implementations won't be
>+included on non-D3D platforms. For example, the creation and maintenance of
>+CPU-side copies of texture data, which are required to enable GL-style
>+per-mip-level texture creation over D3D's entire-mipchain texture creation API,
>+is contained entirely within the D3D renderers, allowing a GL implementation to
>+avoid this complication.
>+
>+Work will now begin within ANGLE to add a desktop OpenGL renderer, and EGL
>+implementations compatible with OS X and Linux.
>+
>+# ES 3.0 Development Status
>+
>+Our ES 3.0 development branch was merged into mainline ANGLE in April 2014, but
>+ES 3.0 support is not yet complete. The majority of API functionality has been
>+implemented; features still pending include:
>+
>+* ETC2/EAC support
>+* primitive restart index
>+* drawRangeElements
>+* full GetProgramBinary support in core
>+
>+Additional work remains in the compiler, including:
>+
>+* Array .length()
>+* inf/nan detection
>+* math utility functions, rounding
>+* VertexID/InstanceID support
>+* floating point packing functions
>+* operators new in ES 3.0
>+* name redeclaration
>+* relaxed array indexing
>+* switch statement support
>+* loop & iteration improvements
>+
>+ES 3.0 features should not be considered stable, even where implemented, and
>+some features are present only via naive implementation so far, but we welcome
>+bugs filed against this functionality, and thank all our contributors!
>diff --git a/Source/ThirdParty/ANGLE/doc/VTF.md b/Source/ThirdParty/ANGLE/doc/VTF.md
>new file mode 100644
>index 00000000000..ebf3c56e3de
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/doc/VTF.md
>@@ -0,0 +1,76 @@
>+# Vertex Texture Fetch
>+
>+This page details the steps necessary to implement vertex texture fetch in ANGLE
>+and documents some of the pitfalls that may be encountered along the way.
>+
>+# Details
>+
>+Tasks to implement vertex texture support.
>+
>+1.  add/enable vertex shader texture look up functions in compiler & HLSL
>+    translator.
>+    *   add texture2DLod, texture2DProjLod (2 variants), textureCubeLod (these
>+        are **only** valid in vertex shaders)
>+    *   ensure other (non-bias/non-LOD) texture functions work in vertex shaders
>+    *   non-mipmapped textures use the only level available
>+    *   mipmapped textures use only the base level (ie level 0).
>+2.  update implementation-dependent constants in Context.h
>+    *   MAX\_VERTEX\_TEXTURE\_IMAGE\_UNITS = 4
>+    *   MAX\_COMBINED\_TEXTURE\_IMAGE\_UNITS =
>+        MAX\_VERTEX\_TEXTURE\_IMAGE\_UNITS + MAX\_TEXTURE\_IMAGE\_UNITS (ie 20).
>+    *   these limits have to change based on the d3d device characteristics. For
>+        example we likely don't want to advertise vertex image units on SM2.0
>+        cards (unless we end up using software vertex processing).
>+    *   detection of hardware support for various formats, types, etc.
>+    *   As a first pass, use the "hasVertexTextures" check that Aras suggested
>+        to only enable VTF on DX10 NVIDIA and AMD parts, and SM3 Intel parts.
>+    *   If this proves insufficient, there are other things we can do, but it
>+        involves using software vertex processing for unsupported formats and
>+        system memory copies of textures -- all stuff which is rather annoying
>+        and likely to hurt performance (see point 4. below).
>+3.  add support and handling for vertex textures/samplers in the API.
>+    *   any textures used in a vertex shader need to get assigned to the special
>+        samplers in d3d9
>+    *   there are only 4 of them (D3DVERTEXTEXTURESAMPLER0..
>+        D3DVERTEXTEXTURESAMPLER3)
>+    *   if a texture is used in both vertex & fragment it counts twice against
>+        the "MAX\_COMBINED" limit (validated in Program::validateSamplers)
>+    *   there are a number of places in our code where we have arrays of size,
>+        or iterate over, MAX\_TEXTURE\_IMAGE\_UNITS. These will need to be
>+        changed to operate on MAX\_COMBINED\_TEXTURE\_IMAGE\_UNITS instead. A
>+        (possibly incomplete & outdated) list of areas that need to be updated
>+        is as follows:
>+    *   Program.h - increase size of mSamplers
>+    *   Context.h - increase size of samplerTexture
>+    *   glActiveTexture needs accept values in the range
>+        0..MAX\_COMBINED\_TEXTURE\_IMAGE\_UNITS-1
>+    *   Context::~Context
>+    *   GetIntegerv (2D\_BINDING, CUBE\_BINDING)
>+    *   Context::applyTextures
>+    *   Context::detachTexture
>+    *   Program::getSamplerMapping
>+    *   Program::dirtyAllSamplers
>+    *   Program::applyUniform1iv
>+    *   Program::unlink
>+    *   Program::validateSamplers
>+4.  handling the nasty corner cases: texture formats, filtering and cube
>+    textures.
>+    *   OpenGL doesn't provide any restrictions on what formats and/or types of
>+        textures can used for vertex textures, or if filtering can be enabled,
>+        whereas D3D9 does.
>+    *   Reference Rasterizer / Software Vertex Processing: all formats & types
>+        supported (including filtering)
>+    *   ATI R500 (on Google Code) cards do not support VTF (even though they are
>+        SM 3.0)
>+    *   ATI R600 (on Google Code) (and later) and in theory the Intel 965+,
>+        claim to support all texture formats/types we care about and some with
>+        filtering
>+    *   NVIDIA cards fall into two camps:
>+    *   dx9 SM3 (6&7 series): only R32F & A32B32G32R32F supported for 2D and no
>+        filtering, CUBE or VOL texture support
>+    *   dx10 (8+ series): only float texture formats for 2D, CUBE & VOLUME. no
>+        filtering (according to caps)
>+        *   further info from Aras P. suggests that all formats are supported on
>+            DX10 hardware, but are just not advertised.
>+    *   unsure what they do on these cards under OpenGL. Need to do more
>+        testing, but suspect software fallback.
>diff --git a/Source/ThirdParty/ANGLE/doc/WritingShaderASTTransformations.md b/Source/ThirdParty/ANGLE/doc/WritingShaderASTTransformations.md
>new file mode 100644
>index 00000000000..fed9b44519b
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/doc/WritingShaderASTTransformations.md
>@@ -0,0 +1,50 @@
>+# How to write ANGLE shader translator AST transformations
>+
>+Usually, a shader AST transformation is structured as such:
>+
>+**.h file**: one function taking a node to transform, often the root node. If the transformation needs to create new variables or functions, you need to pass a pointer to the TSymbolTable as well (all functions and variables need an id number that's based on a counter in TSymbolTable).
>+
>+    class TIntermBlock;
>+    TransformAST(TIntermBlock *root)
>+
>+**.cpp file**: implementation of the transformation, with all the implementation code in an anonymous namespace.
>+
>+## Utilities to implement a transformation
>+
>+The utilities for implementing AST transformations are in **src/compiler/translator/tree_util/**
>+
>+**TIntermTraverser**: This traverses the tree recursively, visiting all nodes. Override the visit* functions you need.
>+
>+**TLValueTrackingTraverser**: If you need to know if the node that is being visited is a target of a write (used as an l-value), use TLValueTrackingTraverser and its isLValueRequiredHere() function.
>+
>+If you're only interested in function declarations or global variables, they're all in the global scope, so you can get away with just iterating over the root block instead of using a traverser.
>+
>+TIntermTraverser has member functions to insert and replace nodes. To remove a node, replace it with an empty list. Usually visit functions queue replacements and then updateTree() is called after the traversal is complete - this way the replacement doesn't affect the current traversal. For some transformations of nested AST structures you may need to do multiple traversals.
>+
>+**BuiltIn_autogen.h**: With the helpers here you can easily and cheaply create references to built-in variables that are stored as constexpr.
>+
>+**IntermNode_utils.h**: These utilities can do things like create a zero node with an arbitrary type, create bool nodes, index nodes, or operations on temporary variables.
>+
>+**RunAtTheEndOfShader.h**: Use this when you need to run code at the end of the shader so you don't need to worry about corner cases like return statements in main().
>+
>+**ReplaceVariable.h**: Replace all references to a specific variable in the AST. Useful if a type of a variable needs to be changed, for example.
>+
>+**FindMain.h**: Find the main() function in the AST.
>+
>+**FindSymbolNode.h**: Find a particular symbol in the AST.
>+
>+**IntermNodePatternMatcher.h**: This helper matches certain AST patterns that are needed in more than one different transformation, such as expressions returning an array.
>+
>+**StaticType.h**: Create TType objects that are initialized at compile time.
>+
>+Some member functions of AST nodes can also be useful:
>+* **deepCopy()** creates a copy of any typed node, including its children.
>+* **hasSideEffects()** determines whether an expression might have side effects. Usually we want to avoid removing nodes with side effects unless there's certainty they would never be executed.
>+
>+## Checklist
>+
>+When implementing traversers, be careful that:
>+* Each node will only have one parent (multiple parents could mess up further AST transformations)
>+* You take into account some less common AST structures, such as declarations inside a loop header.
>+* You run the transformation at the right stage of compilation. You don't want to reintroduce AST structures that have already been pruned away for example, and on the other hand you can depend on earlier transformations to clean up some inconvenient structures from the AST, like empty declarations or multiple variables declared on the same line.
>+* Make sure that any functions you add are marked with SymbolType::AngleInternal so they exist in a separate namespace from user-defined names and can't conflict with them.
>diff --git a/Source/ThirdParty/ANGLE/doc/dEQP-Charts.md b/Source/ThirdParty/ANGLE/doc/dEQP-Charts.md
>new file mode 100644
>index 00000000000..f8f5d7fc874
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/doc/dEQP-Charts.md
>@@ -0,0 +1,144 @@
>+# Charts
>+
>+These charts are generated nightly from the [chrome GPU waterfall bots](https://ci.chromium.org/p/chromium/g/chromium.gpu.fyi/console?limit=200). The output of dEQP tests are parsed by [generate_stats.py](https://chromium.googlesource.com/angle/angle/+/HEAD/scripts/generate_stats.py) and collected into a Sheet here: https://docs.google.com/spreadsheets/d/1D6Yh7dAPP-aYLbX3HHQD8WubJV9XPuxvkKowmn2qhIw
>+
>+[TOC]
>+
>+## Win Desktop OpenGL Charts
>+
>+[https://docs.google.com/spreadsheets/d/1D6Yh7dAPP-aYLbX3HHQD8WubJV9XPuxvkKowmn2qhIw/edit#gid=594707611](https://docs.google.com/spreadsheets/d/1D6Yh7dAPP-aYLbX3HHQD8WubJV9XPuxvkKowmn2qhIw/edit#gid=594707611)
>+
>+<iframe width="600px" height="371px" class="noborder" src="https://docs.google.com/spreadsheets/d/e/2PACX-1vSVry_ITbQWPOeDkQcnwGAceB-9uwDY43edtgwa8yS48muFZSddlPKfuLC6v85DpF1xFZivWpslUZFv/pubchart?oid=1998734038&format=interactive"></iframe>
>+
>+<iframe width="600px" height="371px" class="noborder" src="https://docs.google.com/spreadsheets/d/e/2PACX-1vSVry_ITbQWPOeDkQcnwGAceB-9uwDY43edtgwa8yS48muFZSddlPKfuLC6v85DpF1xFZivWpslUZFv/pubchart?oid=1544220508&format=interactive"></iframe>
>+
>+<iframe width="600px" height="371px" class="noborder" src="https://docs.google.com/spreadsheets/d/e/2PACX-1vSVry_ITbQWPOeDkQcnwGAceB-9uwDY43edtgwa8yS48muFZSddlPKfuLC6v85DpF1xFZivWpslUZFv/pubchart?oid=1149595028&format=interactive"></iframe>
>+
>+<iframe width="600px" height="371px" class="noborder" src="https://docs.google.com/spreadsheets/d/e/2PACX-1vSVry_ITbQWPOeDkQcnwGAceB-9uwDY43edtgwa8yS48muFZSddlPKfuLC6v85DpF1xFZivWpslUZFv/pubchart?oid=348149668&format=interactive"></iframe>
>+
>+<iframe width="600px" height="371px" class="noborder" src="https://docs.google.com/spreadsheets/d/e/2PACX-1vSVry_ITbQWPOeDkQcnwGAceB-9uwDY43edtgwa8yS48muFZSddlPKfuLC6v85DpF1xFZivWpslUZFv/pubchart?oid=1599260099&format=interactive"></iframe>
>+
>+<iframe width="600px" height="371px" class="noborder" src="https://docs.google.com/spreadsheets/d/e/2PACX-1vSVry_ITbQWPOeDkQcnwGAceB-9uwDY43edtgwa8yS48muFZSddlPKfuLC6v85DpF1xFZivWpslUZFv/pubchart?oid=1933215664&format=interactive"></iframe>
>+
>+<iframe width="600px" height="371px" class="noborder" src="https://docs.google.com/spreadsheets/d/e/2PACX-1vSVry_ITbQWPOeDkQcnwGAceB-9uwDY43edtgwa8yS48muFZSddlPKfuLC6v85DpF1xFZivWpslUZFv/pubchart?oid=2041081385&format=interactive"></iframe>
>+
>+<iframe width="600px" height="371px" class="noborder" src="https://docs.google.com/spreadsheets/d/e/2PACX-1vSVry_ITbQWPOeDkQcnwGAceB-9uwDY43edtgwa8yS48muFZSddlPKfuLC6v85DpF1xFZivWpslUZFv/pubchart?oid=1660391707&format=interactive"></iframe>
>+
>+## Win Vulkan Charts
>+
>+[https://docs.google.com/spreadsheets/d/1D6Yh7dAPP-aYLbX3HHQD8WubJV9XPuxvkKowmn2qhIw/edit#gid=1309999426](https://docs.google.com/spreadsheets/d/1D6Yh7dAPP-aYLbX3HHQD8WubJV9XPuxvkKowmn2qhIw/edit#gid=1309999426)
>+
>+<iframe width="600px" height="371px" class="noborder" src="https://docs.google.com/spreadsheets/d/e/2PACX-1vSVry_ITbQWPOeDkQcnwGAceB-9uwDY43edtgwa8yS48muFZSddlPKfuLC6v85DpF1xFZivWpslUZFv/pubchart?oid=1898485969&format=interactive"></iframe>
>+
>+<iframe width="600px" height="371px" class="noborder" src="https://docs.google.com/spreadsheets/d/e/2PACX-1vSVry_ITbQWPOeDkQcnwGAceB-9uwDY43edtgwa8yS48muFZSddlPKfuLC6v85DpF1xFZivWpslUZFv/pubchart?oid=1062362791&format=interactive"></iframe>
>+
>+<iframe width="600px" height="371px" class="noborder" src="https://docs.google.com/spreadsheets/d/e/2PACX-1vSVry_ITbQWPOeDkQcnwGAceB-9uwDY43edtgwa8yS48muFZSddlPKfuLC6v85DpF1xFZivWpslUZFv/pubchart?oid=1220829706&format=interactive"></iframe>
>+
>+<iframe width="600px" height="371px" class="noborder" src="https://docs.google.com/spreadsheets/d/e/2PACX-1vSVry_ITbQWPOeDkQcnwGAceB-9uwDY43edtgwa8yS48muFZSddlPKfuLC6v85DpF1xFZivWpslUZFv/pubchart?oid=1890226161&format=interactive"></iframe>
>+
>+<iframe width="600px" height="371px" class="noborder" src="https://docs.google.com/spreadsheets/d/e/2PACX-1vSVry_ITbQWPOeDkQcnwGAceB-9uwDY43edtgwa8yS48muFZSddlPKfuLC6v85DpF1xFZivWpslUZFv/pubchart?oid=2116243008&format=interactive"></iframe>
>+
>+<iframe width="600px" height="371px" class="noborder" src="https://docs.google.com/spreadsheets/d/e/2PACX-1vSVry_ITbQWPOeDkQcnwGAceB-9uwDY43edtgwa8yS48muFZSddlPKfuLC6v85DpF1xFZivWpslUZFv/pubchart?oid=1562925234&format=interactive"></iframe>
>+
>+<iframe width="600px" height="371px" class="noborder" src="https://docs.google.com/spreadsheets/d/e/2PACX-1vSVry_ITbQWPOeDkQcnwGAceB-9uwDY43edtgwa8yS48muFZSddlPKfuLC6v85DpF1xFZivWpslUZFv/pubchart?oid=1787463364&format=interactive"></iframe>
>+
>+## Win D3D11 Charts
>+
>+[https://docs.google.com/spreadsheets/d/1D6Yh7dAPP-aYLbX3HHQD8WubJV9XPuxvkKowmn2qhIw/edit#gid=1992689006](https://docs.google.com/spreadsheets/d/1D6Yh7dAPP-aYLbX3HHQD8WubJV9XPuxvkKowmn2qhIw/edit#gid=1992689006)
>+
>+<iframe width="600px" height="371px" class="noborder" src="https://docs.google.com/spreadsheets/d/e/2PACX-1vSVry_ITbQWPOeDkQcnwGAceB-9uwDY43edtgwa8yS48muFZSddlPKfuLC6v85DpF1xFZivWpslUZFv/pubchart?oid=1518262999&format=interactive"></iframe>
>+
>+<iframe width="600px" height="371px" class="noborder" src="https://docs.google.com/spreadsheets/d/e/2PACX-1vSVry_ITbQWPOeDkQcnwGAceB-9uwDY43edtgwa8yS48muFZSddlPKfuLC6v85DpF1xFZivWpslUZFv/pubchart?oid=97125514&format=interactive"></iframe>
>+
>+<iframe width="600px" height="371px" class="noborder" src="https://docs.google.com/spreadsheets/d/e/2PACX-1vSVry_ITbQWPOeDkQcnwGAceB-9uwDY43edtgwa8yS48muFZSddlPKfuLC6v85DpF1xFZivWpslUZFv/pubchart?oid=1060253235&format=interactive"></iframe>
>+
>+<iframe width="600px" height="371px" class="noborder" src="https://docs.google.com/spreadsheets/d/e/2PACX-1vSVry_ITbQWPOeDkQcnwGAceB-9uwDY43edtgwa8yS48muFZSddlPKfuLC6v85DpF1xFZivWpslUZFv/pubchart?oid=246254186&format=interactive"></iframe>
>+
>+<iframe width="600px" height="371px" class="noborder" src="https://docs.google.com/spreadsheets/d/e/2PACX-1vSVry_ITbQWPOeDkQcnwGAceB-9uwDY43edtgwa8yS48muFZSddlPKfuLC6v85DpF1xFZivWpslUZFv/pubchart?oid=1271554861&format=interactive"></iframe>
>+
>+<iframe width="600px" height="371px" class="noborder" src="https://docs.google.com/spreadsheets/d/e/2PACX-1vSVry_ITbQWPOeDkQcnwGAceB-9uwDY43edtgwa8yS48muFZSddlPKfuLC6v85DpF1xFZivWpslUZFv/pubchart?oid=1056966792&format=interactive"></iframe>
>+
>+<iframe width="600px" height="371px" class="noborder" src="https://docs.google.com/spreadsheets/d/e/2PACX-1vSVry_ITbQWPOeDkQcnwGAceB-9uwDY43edtgwa8yS48muFZSddlPKfuLC6v85DpF1xFZivWpslUZFv/pubchart?oid=520899822&format=interactive"></iframe>
>+
>+<iframe width="600px" height="371px" class="noborder" src="https://docs.google.com/spreadsheets/d/e/2PACX-1vSVry_ITbQWPOeDkQcnwGAceB-9uwDY43edtgwa8yS48muFZSddlPKfuLC6v85DpF1xFZivWpslUZFv/pubchart?oid=1801387528&format=interactive"></iframe>
>+
>+<iframe width="600px" height="371px" class="noborder" src="https://docs.google.com/spreadsheets/d/e/2PACX-1vSVry_ITbQWPOeDkQcnwGAceB-9uwDY43edtgwa8yS48muFZSddlPKfuLC6v85DpF1xFZivWpslUZFv/pubchart?oid=1672704177&format=interactive"></iframe>
>+
>+<iframe width="600px" height="371px" class="noborder" src="https://docs.google.com/spreadsheets/d/e/2PACX-1vSVry_ITbQWPOeDkQcnwGAceB-9uwDY43edtgwa8yS48muFZSddlPKfuLC6v85DpF1xFZivWpslUZFv/pubchart?oid=618835896&format=interactive"></iframe>
>+
>+## Mac Desktop Open GL Charts
>+
>+[https://docs.google.com/spreadsheets/d/1D6Yh7dAPP-aYLbX3HHQD8WubJV9XPuxvkKowmn2qhIw/edit#gid=88498958](https://docs.google.com/spreadsheets/d/1D6Yh7dAPP-aYLbX3HHQD8WubJV9XPuxvkKowmn2qhIw/edit#gid=88498958)
>+
>+<iframe width="600px" height="371px" class="noborder" src="https://docs.google.com/spreadsheets/d/e/2PACX-1vSVry_ITbQWPOeDkQcnwGAceB-9uwDY43edtgwa8yS48muFZSddlPKfuLC6v85DpF1xFZivWpslUZFv/pubchart?oid=1082337120&format=interactive"></iframe>
>+
>+<iframe width="600px" height="371px" class="noborder" src="https://docs.google.com/spreadsheets/d/e/2PACX-1vSVry_ITbQWPOeDkQcnwGAceB-9uwDY43edtgwa8yS48muFZSddlPKfuLC6v85DpF1xFZivWpslUZFv/pubchart?oid=1360910790&format=interactive"></iframe>
>+
>+<iframe width="600px" height="371px" class="noborder" src="https://docs.google.com/spreadsheets/d/e/2PACX-1vSVry_ITbQWPOeDkQcnwGAceB-9uwDY43edtgwa8yS48muFZSddlPKfuLC6v85DpF1xFZivWpslUZFv/pubchart?oid=800492117&format=interactive"></iframe>
>+
>+<iframe width="600px" height="371px" class="noborder" src="https://docs.google.com/spreadsheets/d/e/2PACX-1vSVry_ITbQWPOeDkQcnwGAceB-9uwDY43edtgwa8yS48muFZSddlPKfuLC6v85DpF1xFZivWpslUZFv/pubchart?oid=1963521198&format=interactive"></iframe>
>+
>+<iframe width="600px" height="371px" class="noborder" src="https://docs.google.com/spreadsheets/d/e/2PACX-1vSVry_ITbQWPOeDkQcnwGAceB-9uwDY43edtgwa8yS48muFZSddlPKfuLC6v85DpF1xFZivWpslUZFv/pubchart?oid=969157188&format=interactive"></iframe>
>+
>+<iframe width="600px" height="371px" class="noborder" src="https://docs.google.com/spreadsheets/d/e/2PACX-1vSVry_ITbQWPOeDkQcnwGAceB-9uwDY43edtgwa8yS48muFZSddlPKfuLC6v85DpF1xFZivWpslUZFv/pubchart?oid=1793044649&format=interactive"></iframe>
>+
>+## Linux Desktop Open GL Charts
>+
>+[https://docs.google.com/spreadsheets/d/1D6Yh7dAPP-aYLbX3HHQD8WubJV9XPuxvkKowmn2qhIw/edit#gid=399484153](https://docs.google.com/spreadsheets/d/1D6Yh7dAPP-aYLbX3HHQD8WubJV9XPuxvkKowmn2qhIw/edit#gid=399484153)
>+
>+<iframe width="600px" height="371px" class="noborder" src="https://docs.google.com/spreadsheets/d/e/2PACX-1vSVry_ITbQWPOeDkQcnwGAceB-9uwDY43edtgwa8yS48muFZSddlPKfuLC6v85DpF1xFZivWpslUZFv/pubchart?oid=128497133&format=interactive"></iframe>
>+
>+<iframe width="600px" height="371px" class="noborder" src="https://docs.google.com/spreadsheets/d/e/2PACX-1vSVry_ITbQWPOeDkQcnwGAceB-9uwDY43edtgwa8yS48muFZSddlPKfuLC6v85DpF1xFZivWpslUZFv/pubchart?oid=701825003&format=interactive"></iframe>
>+
>+<iframe width="600px" height="371px" class="noborder" src="https://docs.google.com/spreadsheets/d/e/2PACX-1vSVry_ITbQWPOeDkQcnwGAceB-9uwDY43edtgwa8yS48muFZSddlPKfuLC6v85DpF1xFZivWpslUZFv/pubchart?oid=1832030107&format=interactive"></iframe>
>+
>+<iframe width="600px" height="371px" class="noborder" src="https://docs.google.com/spreadsheets/d/e/2PACX-1vSVry_ITbQWPOeDkQcnwGAceB-9uwDY43edtgwa8yS48muFZSddlPKfuLC6v85DpF1xFZivWpslUZFv/pubchart?oid=685804323&format=interactive"></iframe>
>+
>+<iframe width="600px" height="371px" class="noborder" src="https://docs.google.com/spreadsheets/d/e/2PACX-1vSVry_ITbQWPOeDkQcnwGAceB-9uwDY43edtgwa8yS48muFZSddlPKfuLC6v85DpF1xFZivWpslUZFv/pubchart?oid=1485502774&format=interactive"></iframe>
>+
>+## Linux Vulkan Charts
>+
>+[https://docs.google.com/spreadsheets/d/1D6Yh7dAPP-aYLbX3HHQD8WubJV9XPuxvkKowmn2qhIw/edit#gid=1599548256](https://docs.google.com/spreadsheets/d/1D6Yh7dAPP-aYLbX3HHQD8WubJV9XPuxvkKowmn2qhIw/edit#gid=1599548256)
>+
>+<iframe width="600px" height="371px" class="noborder" src="https://docs.google.com/spreadsheets/d/e/2PACX-1vSVry_ITbQWPOeDkQcnwGAceB-9uwDY43edtgwa8yS48muFZSddlPKfuLC6v85DpF1xFZivWpslUZFv/pubchart?oid=479459897&format=interactive"></iframe>
>+
>+<iframe width="600px" height="371px" class="noborder" src="https://docs.google.com/spreadsheets/d/e/2PACX-1vSVry_ITbQWPOeDkQcnwGAceB-9uwDY43edtgwa8yS48muFZSddlPKfuLC6v85DpF1xFZivWpslUZFv/pubchart?oid=928302537&format=interactive"></iframe>
>+
>+<iframe width="600px" height="371px" class="noborder" src="https://docs.google.com/spreadsheets/d/e/2PACX-1vSVry_ITbQWPOeDkQcnwGAceB-9uwDY43edtgwa8yS48muFZSddlPKfuLC6v85DpF1xFZivWpslUZFv/pubchart?oid=1745663833&format=interactive"></iframe>
>+
>+## Android Vulkan Charts
>+
>+[https://docs.google.com/spreadsheets/d/1D6Yh7dAPP-aYLbX3HHQD8WubJV9XPuxvkKowmn2qhIw/edit#gid=1077550384](https://docs.google.com/spreadsheets/d/1D6Yh7dAPP-aYLbX3HHQD8WubJV9XPuxvkKowmn2qhIw/edit#gid=1077550384)
>+
>+<iframe width="600px" height="371px" class="noborder" src="https://docs.google.com/spreadsheets/d/e/2PACX-1vSVry_ITbQWPOeDkQcnwGAceB-9uwDY43edtgwa8yS48muFZSddlPKfuLC6v85DpF1xFZivWpslUZFv/pubchart?oid=897493509&format=interactive"></iframe>
>+
>+<iframe width="600px" height="371px" class="noborder" src="https://docs.google.com/spreadsheets/d/e/2PACX-1vSVry_ITbQWPOeDkQcnwGAceB-9uwDY43edtgwa8yS48muFZSddlPKfuLC6v85DpF1xFZivWpslUZFv/pubchart?oid=1225937714&format=interactive"></iframe>
>+
>+<iframe width="600px" height="371px" class="noborder" src="https://docs.google.com/spreadsheets/d/e/2PACX-1vSVry_ITbQWPOeDkQcnwGAceB-9uwDY43edtgwa8yS48muFZSddlPKfuLC6v85DpF1xFZivWpslUZFv/pubchart?oid=2095717740&format=interactive"></iframe>
>+
>+<iframe width="600px" height="371px" class="noborder" src="https://docs.google.com/spreadsheets/d/e/2PACX-1vSVry_ITbQWPOeDkQcnwGAceB-9uwDY43edtgwa8yS48muFZSddlPKfuLC6v85DpF1xFZivWpslUZFv/pubchart?oid=2090897373&format=interactive"></iframe>
>+
>+<iframe width="600px" height="371px" class="noborder" src="https://docs.google.com/spreadsheets/d/e/2PACX-1vSVry_ITbQWPOeDkQcnwGAceB-9uwDY43edtgwa8yS48muFZSddlPKfuLC6v85DpF1xFZivWpslUZFv/pubchart?oid=1842182124&format=interactive"></iframe>
>+
>+<iframe width="600px" height="371px" class="noborder" src="https://docs.google.com/spreadsheets/d/e/2PACX-1vSVry_ITbQWPOeDkQcnwGAceB-9uwDY43edtgwa8yS48muFZSddlPKfuLC6v85DpF1xFZivWpslUZFv/pubchart?oid=592534104&format=interactive"></iframe>
>+
>+<iframe width="600px" height="371px" class="noborder" src="https://docs.google.com/spreadsheets/d/e/2PACX-1vSVry_ITbQWPOeDkQcnwGAceB-9uwDY43edtgwa8yS48muFZSddlPKfuLC6v85DpF1xFZivWpslUZFv/pubchart?oid=759272530&format=interactive"></iframe>
>+
>+<iframe width="600px" height="371px" class="noborder" src="https://docs.google.com/spreadsheets/d/e/2PACX-1vSVry_ITbQWPOeDkQcnwGAceB-9uwDY43edtgwa8yS48muFZSddlPKfuLC6v85DpF1xFZivWpslUZFv/pubchart?oid=1826530566&format=interactive"></iframe>
>+
>+<iframe width="600px" height="371px" class="noborder" src="https://docs.google.com/spreadsheets/d/e/2PACX-1vSVry_ITbQWPOeDkQcnwGAceB-9uwDY43edtgwa8yS48muFZSddlPKfuLC6v85DpF1xFZivWpslUZFv/pubchart?oid=1075893765&format=interactive"></iframe>
>+
>+<iframe width="600px" height="371px" class="noborder" src="https://docs.google.com/spreadsheets/d/e/2PACX-1vSVry_ITbQWPOeDkQcnwGAceB-9uwDY43edtgwa8yS48muFZSddlPKfuLC6v85DpF1xFZivWpslUZFv/pubchart?oid=872522689&format=interactive"></iframe>
>+
>+<iframe width="600px" height="371px" class="noborder" src="https://docs.google.com/spreadsheets/d/e/2PACX-1vSVry_ITbQWPOeDkQcnwGAceB-9uwDY43edtgwa8yS48muFZSddlPKfuLC6v85DpF1xFZivWpslUZFv/pubchart?oid=332316384&format=interactive"></iframe>
>+
>+<iframe width="600px" height="371px" class="noborder" src="https://docs.google.com/spreadsheets/d/e/2PACX-1vSVry_ITbQWPOeDkQcnwGAceB-9uwDY43edtgwa8yS48muFZSddlPKfuLC6v85DpF1xFZivWpslUZFv/pubchart?oid=1867448905&format=interactive"></iframe>
>+
>+## Unexpected Passes/Failures
>+
>+The latest list of unexpected passed/failed tests on HEAD.
>+Each test is followed by a list of links to any builds on which they passed/failed unexpectedly.
>+
>+<iframe src="https://docs.google.com/spreadsheets/d/e/2PACX-1vSVry_ITbQWPOeDkQcnwGAceB-9uwDY43edtgwa8yS48muFZSddlPKfuLC6v85DpF1xFZivWpslUZFv/pubhtml?gid=227024905&single=true&widget=true&headers=false" width="100%" height="600px"></iframe>
>+
>+<iframe src="https://docs.google.com/spreadsheets/d/e/2PACX-1vSVry_ITbQWPOeDkQcnwGAceB-9uwDY43edtgwa8yS48muFZSddlPKfuLC6v85DpF1xFZivWpslUZFv/pubhtml?gid=101098052&single=true&widget=true&headers=false" width="100%" height="600px"></iframe>
>\ No newline at end of file
>diff --git a/Source/ThirdParty/ANGLE/doc/dEQP.md b/Source/ThirdParty/ANGLE/doc/dEQP.md
>new file mode 100644
>index 00000000000..80d21702d16
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/doc/dEQP.md
>@@ -0,0 +1,71 @@
>+# ANGLE + dEQP
>+
>+drawElements (dEQP) is a very robust and comprehensive set of open-source
>+tests for GLES2, GLES3+ and EGL. They provide a huge net of coverage for
>+almost every GL API feature. ANGLE by default builds dEQP testing targets for
>+testing against GLES 2, GLES 3, EGL, and GLES 3.1 (on supported platforms).
>+
>+## How to build dEQP
>+
>+You should have dEQP as a target if you followed the [DevSetup](DevSetup.md)
>+instructions. Current targets:
>+
>+  * `angle_deqp_gles2_tests` for GLES 2.0 tests
>+  * `angle_deqp_gles2_no_gtest` for GLES 2.0 tests without google test suite
>+  * `angle_deqp_gles3_tests` for GLES 3.0 tests
>+  * `angle_deqp_gles3_no_gtest` for GLES 3.0 tests without google test suite
>+  * `angle_deqp_egl_tests` for EGL 1.x tests
>+  * `angle_deqp_egl_no_gtest` for EGL 1.x tests without google test suite
>+  * `angle_deqp_gles31_tests` for GLES 3.1 tests (currently very experimental)
>+  * `angle_deqp_gles31_no_gtest` for GLES 3.1 tests (currently very experimental) without google test suite
>+
>+## How to use dEQP
>+
>+Note:
>+To run an individual test, use the `--deqp-case` flag on any of the `no_gtest` targets.
>+It supports simple wildcard support. For example: `--deqp-case=dEQP-
>+GLES2.functional.shaders.linkage.*`.
>+The `gtest` targets support wildcards via the `--gtest_filter` argument,
>+but have different test names.
>+
>+The tests lists are sourced from the Android CTS masters in
>+`third_party/deqp/src/android/cts/master`. See `gles2-master.txt`,
>+`gles3-master.txt`, `gles31-master.txt` and `egl-master.txt`.
>+
>+If you're running a full test suite, it might take very long time. Running in
>+Debug is only useful to isolate and fix particular failures, Release will give
>+a better sense of total passing rate.
>+
>+### Choosing a Renderer
>+
>+By default ANGLE tests with D3D11 on Windows, GLES on mobile and Desktop GL otherwise.
>+To specify the exact platform for ANGLE + dEQP, use the arguments:
>+
>+  * `--deqp-egl-display-type=angle-d3d11` for D3D11 (highest available feature level)
>+  * `--deqp-egl-display-type=angle-d3d9` for D3D9
>+  * `--deqp-egl-display-type=angle-d3d11-fl93` for D3D11 Feature level 9_3
>+  * `--deqp-egl-display-type=angle-gl` for OpenGL Desktop (OSX, Linux and Windows)
>+  * `--deqp-egl-display-type=angle-gles` for OpenGL ES (Android/ChromeOS, some Windows platforms)
>+  * `--deqp-egl-display-type=angle-vulkan` for Vulkan (Android, Linux, Windows)
>+
>+The flag `--use-angle=X` has the same effect as `--deqp-egl-display-type=angle-X`.
>+
>+### Check your results
>+
>+If run from Visual Studio 2015, dEQP generates a test log to
>+`out/sln/obj/src/tests/TestResults.qpa`. To view the test log information, you'll need to
>+use the open-source GUI
>+[Cherry](https://android.googlesource.com/platform/external/cherry). ANGLE
>+checks out a copy of Cherry to `angle/third_party/cherry` when you sync with
>+gclient. Note, if you are using ninja or another build system, the qpa file
>+will be located in your working directory.
>+
>+See the [official Cherry README](https://android.googlesource.com/platform/external/cherry/+/master/README)
>+for instructions on how to run Cherry on Linux or Windows.
>+
>+### GoogleTest, ANGLE and dEQP
>+
>+ANGLE also supports the same set of targets built with GoogleTest, for running
>+on the bots. We don't currently recommend using these for local debugging, but
>+we do maintain lists of test expectations in `src/tests/deqp_support`. When
>+you fix tests, please remove the suppression(s) from the relevant files!
>diff --git a/Source/ThirdParty/ANGLE/doc/img/StateChangeNotificationFlow.svg b/Source/ThirdParty/ANGLE/doc/img/StateChangeNotificationFlow.svg
>new file mode 100644
>index 00000000000..df65f9dac4e
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/doc/img/StateChangeNotificationFlow.svg
>@@ -0,0 +1,2 @@
>+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
>+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="642px" height="682px" viewBox="-0.5 -0.5 642 682" content="&lt;mxfile modified=&quot;2019-05-01T19:07:07.556Z&quot; host=&quot;www.draw.io&quot; agent=&quot;Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/74.0.3729.131 Safari/537.36&quot; etag=&quot;7MVQbu2uo8iAHLBw1ZlM&quot; version=&quot;10.6.5&quot; type=&quot;google&quot;&gt;&lt;diagram id=&quot;6a731a19-8d31-9384-78a2-239565b7b9f0&quot; name=&quot;Page-1&quot;&gt;7Vxbc+I2GP01PIbRzbfHQJLdTrdNJ2m7m74pIIyzwqJGJCS/fmVbxja+YAg4MDGTSaxPsix/53zS0YX08HC2+hLQ+fQPMWa8h8B41cNXPYQQwET9CS2v2kLs2OAG3jg2wdRw770xbQTauvTGbJErKIXg0pvnjSPh+2wkczYaBOIlX2wieP6pc+qyguF+RHnR+t0by6m2QtNJM74yz53qR9vIijMe6einG4ilr5/XQ3gSfeLsGU3q0i+6mNKxeMmY8HUPDwMhZHw1Ww0ZD32buC2+76Yid93ugPmyyQ2GGd/xTPlSv/u9pJIp03BKfTe8+FNIb+KNqPSEr5I3XDU4brx8TRy2kIH4yYaCiyAy4MHl0L7CPTyYeJxn7AgTYlyFduFLDTwiKh3XkHgb6RI3dObxkERfGX9mUrVCZUzljCsT1GUytd9En6R23TwQ1j6nI893B0JKMVM2O7XdaRgzxb6xSWKh3HN9dT1SDmXqKYOih7XTn1kg2Spj0h7/wsSMyeBVFdG5RIOvg8MmuoaXlGpmUmaaZZm2Uc1ud11zirC60CCXA27aBcC3g5m6NQ9mCnIKJrT3BlOE3pdhARMcxdMOauhpCA7hauccXO0cx9UQtOprC5yDr49Eawjb9TU8B18fi9eoXV+jc/D1sXiN2/U1PgdfH4vXpFVf207BtWysJLhOikBOhSt8yq9T6yDS1WysXfK0nM2T8r7wWd5hbOXJH5nrh1DP9Y0w5au2/tDyLkqkeZw+Mj5Ya/gMnlrFh/jRQF6Gc4xQFXK6WHijxHzj8fXz/XFSSDfuiUn5qplAl1KEqK5f85sQc31ngWJgiAm+KlAH11Eny7oSnQyiT9xM3ei1N65WudSrTlVSTr24y2QisGJbiGUtCQPG1XziOT/dKiNUdKvyJH3NFJgLz5eLTM1/hYaU2yiJ3ET3WRuzoC3lIbDMDTbHTSi/HTpW6ePW7V2IZTBi+q66dlj2xsC+WVPs7EJNUbit3dsoAp2iYnJV2Uv1M1RkYStZiNB8/FVN7PL81eTfr9dzAzr2WMpcXVntpE+T3jhML2mBPnaIYVg2wlDRO4+PylHdxmavCZPFgGyvaRyg03SKwitYxZANlpMJC36bzXmHmnI2NPoOIJYJ9e+N6DaKQ93xQCsquCTOYtA6wKKOr48NbBFIHNNwbPMDAXt+mEnj++31wLcRtB7+sdDj8gIa1nZxuIuCAVXDf4lMyEC1t/rID/SVkMUjlWYuLhngzUMP8I3jqKjOkzi6CeiMPXbBlAkmUt37oZYHLVI5aP2tRMYyYN2o1WjUwi3jZlTG2z1ViHWx1mDgIi1jVtzNSTDTsdZhthWzluMMgmIHydaRtgwmdNShpntHy7ANgAmA2ARGHjXYMmqwwcJsVg8y/iheslIwMqiMqQi8N+UuyktXeKpXg5rAtk0HNpSTzeQieIdc1CBfQAf3DQMCBAiwoYlRHmYbgTKUMew7lgprB0LDJCYiRdBrVy3LV2O2NcZJG7PrQs+FCfvrNQUDmo5T9ZpbFn7euzIGoY31o0rXuvZYWIKwwTp6FxqJvupC41RDAzjo4KFRHOs/e2igktCAXWgcNTT2om5xPniS1E0299K9vods3q67W9u4WrFaCDoGnx6Di7PjE2RwMyaaJb0m7jh3epzbcdvgEwz4ZdQlHXVPjrqoeEDgE1L3LClJgFG7A2Ttzchtq3DFmg/HyHKpRc6kh60+dFanSw9E75rTcCqVPjtM7CaJdxa6NqwNE9ximCCQPwO5/7kte+Mw5fqM9NGX7/Lf73n3CsX97dsDHw0n1/T3/+gtvHt5MvgFTPz9wYcfSqm2laL1M7SsDKl4eVzO6IOfcKhvaMme3r/R5onmkMnVWwwegxwq5v/L8JtkURd1sYj8eqkKQGO+ivyZ5KsrV649/Lk3muq3B1s+8ldHyY4Tu3CiQIASmlQfA4V5SqCP5ERFP1F9XuNOaQYWdAekGh4AaHkruRxOs8GXrE5B1p7M7Muok5VWm7MvXPjKWEqoXZVloa7oRRtpy8OpP/TpqLhdY1ZTkRDUBzVUTLbHj0/EA34vxamvaG8KqmT6zw7i4ul/lMDXvwA=&lt;/diagram&gt;&lt;/mxfile&gt;"><defs/><g><rect x="1" y="1" width="640" height="80" fill="#23445d" stroke="#bac8d3" stroke-width="2" pointer-events="none"/><g transform="translate(155.5,23.5)"><switch><foreignObject style="overflow:visible;" pointer-events="all" width="330" height="26" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; font-size: 24px; font-family: Helvetica; color: rgb(255, 255, 255); line-height: 1.2; vertical-align: top; white-space: nowrap; text-align: center;"><div xmlns="http://www.w3.org/1999/xhtml" style="display:inline-block;text-align:inherit;text-decoration:inherit;">State Change Notification Flow</div></div></foreignObject><text x="165" y="25" fill="#FFFFFF" text-anchor="middle" font-size="24px" font-family="Helvetica">State Change Notification Flow</text></switch></g><rect x="1" y="81" width="640" height="100" fill-opacity="0.6" fill="#bac8d3" stroke="#ffffff" stroke-opacity="0.6" stroke-width="2" pointer-events="none"/><rect x="1" y="181" width="640" height="100" fill-opacity="0.9" fill="#bac8d3" stroke="#ffffff" stroke-opacity="0.9" stroke-width="2" pointer-events="none"/><rect x="1" y="281" width="640" height="100" fill-opacity="0.6" fill="#bac8d3" stroke="#ffffff" stroke-opacity="0.6" stroke-width="2" pointer-events="none"/><rect x="1" y="381" width="640" height="100" fill-opacity="0.9" fill="#bac8d3" stroke="#ffffff" stroke-opacity="0.9" stroke-width="2" pointer-events="none"/><rect x="1" y="481" width="640" height="100" fill-opacity="0.6" fill="#bac8d3" stroke="#ffffff" stroke-opacity="0.6" stroke-width="2" pointer-events="none"/><rect x="1" y="581" width="640" height="100" fill-opacity="0.9" fill="#bac8d3" stroke="#ffffff" stroke-opacity="0.9" stroke-width="2" pointer-events="none"/><path d="M 168.1 130 L 175.55 130 Q 183 130 183 140 L 183 226 Q 183 236 193 236 L 239 236" fill="none" stroke="#0c343d" stroke-width="3" stroke-miterlimit="10" pointer-events="none"/><path d="M 161.35 130 L 170.35 125.5 L 168.1 130 L 170.35 134.5 Z" fill="#0c343d" stroke="#0c343d" stroke-width="3" stroke-miterlimit="10" pointer-events="none"/><rect x="31.39" y="105.5" width="127" height="50" rx="7.5" ry="7.5" fill="#23445d" stroke="none" pointer-events="none"/><g transform="translate(58.5,122.5)"><switch><foreignObject style="overflow:visible;" pointer-events="all" width="72" height="16" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; font-size: 15px; font-family: Helvetica; color: rgb(255, 255, 255); line-height: 1.2; vertical-align: top; white-space: nowrap; text-align: center;"><div xmlns="http://www.w3.org/1999/xhtml" style="display:inline-block;text-align:inherit;text-decoration:inherit;">gl::Context</div></div></foreignObject><text x="36" y="16" fill="#FFFFFF" text-anchor="middle" font-size="15px" font-family="Helvetica">gl::Context</text></switch></g><rect x="476.9" y="211" width="127" height="50" rx="7.5" ry="7.5" fill="#23445d" stroke="none" pointer-events="none"/><g transform="translate(495.5,227.5)"><switch><foreignObject style="overflow:visible;" pointer-events="all" width="89" height="16" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; font-size: 15px; font-family: Helvetica; color: rgb(255, 255, 255); line-height: 1.2; vertical-align: top; white-space: nowrap; text-align: center;"><div xmlns="http://www.w3.org/1999/xhtml" style="display:inline-block;text-align:inherit;text-decoration:inherit;">rx::BufferImpl</div></div></foreignObject><text x="45" y="16" fill="#FFFFFF" text-anchor="middle" font-size="15px" font-family="Helvetica">rx::BufferImpl</text></switch></g><rect x="239.35" y="211" width="127" height="50" rx="7.5" ry="7.5" fill="#23445d" stroke="none" pointer-events="none"/><g transform="translate(272.5,227.5)"><switch><foreignObject style="overflow:visible;" pointer-events="all" width="60" height="16" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; font-size: 15px; font-family: Helvetica; color: rgb(255, 255, 255); line-height: 1.2; vertical-align: top; white-space: nowrap; text-align: center;"><div xmlns="http://www.w3.org/1999/xhtml" style="display:inline-block;text-align:inherit;text-decoration:inherit;">gl::Buffer</div></div></foreignObject><text x="30" y="16" fill="#FFFFFF" text-anchor="middle" font-size="15px" font-family="Helvetica">gl::Buffer</text></switch></g><path d="M 302.9 461.87 L 302.9 505.5" fill="none" stroke="#000000" stroke-miterlimit="10" pointer-events="none"/><path d="M 302.9 456.62 L 306.4 463.62 L 302.9 461.87 L 299.4 463.62 Z" fill="#000000" stroke="#000000" stroke-miterlimit="10" pointer-events="none"/><rect x="239.4" y="405.5" width="127" height="50" rx="7.5" ry="7.5" fill="#23445d" stroke="none" pointer-events="none"/><g transform="translate(251.5,422.5)"><switch><foreignObject style="overflow:visible;" pointer-events="all" width="101" height="16" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; font-size: 15px; font-family: Helvetica; color: rgb(255, 255, 255); line-height: 1.2; vertical-align: top; white-space: nowrap; text-align: center;"><div xmlns="http://www.w3.org/1999/xhtml" style="display:inline-block;text-align:inherit;text-decoration:inherit;">gl::Framebuffer</div></div></foreignObject><text x="51" y="16" fill="#FFFFFF" text-anchor="middle" font-size="15px" font-family="Helvetica">gl::Framebuffer</text></switch></g><rect x="476.9" y="505.5" width="127" height="50" rx="7.5" ry="7.5" fill="#23445d" stroke="none" pointer-events="none"/><g transform="translate(490.5,522.5)"><switch><foreignObject style="overflow:visible;" pointer-events="all" width="98" height="16" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; font-size: 15px; font-family: Helvetica; color: rgb(255, 255, 255); line-height: 1.2; vertical-align: top; white-space: nowrap; text-align: center;"><div xmlns="http://www.w3.org/1999/xhtml" style="display:inline-block;text-align:inherit;text-decoration:inherit;">rx::TextureImpl</div></div></foreignObject><text x="49" y="16" fill="#FFFFFF" text-anchor="middle" font-size="15px" font-family="Helvetica">rx::TextureImpl</text></switch></g><rect x="239.35" y="605.5" width="127" height="50" rx="7.5" ry="7.5" fill="#23445d" stroke="none" pointer-events="none"/><g transform="translate(264.5,622.5)"><switch><foreignObject style="overflow:visible;" pointer-events="all" width="76" height="16" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; font-size: 15px; font-family: Helvetica; color: rgb(255, 255, 255); line-height: 1.2; vertical-align: top; white-space: nowrap; text-align: center;"><div xmlns="http://www.w3.org/1999/xhtml" style="display:inline-block;text-align:inherit;text-decoration:inherit;">gl::Sampler</div></div></foreignObject><text x="38" y="16" fill="#FFFFFF" text-anchor="middle" font-size="15px" font-family="Helvetica">gl::Sampler</text></switch></g><rect x="239.35" y="505.5" width="127" height="50" rx="7.5" ry="7.5" fill="#23445d" stroke="none" pointer-events="none"/><g transform="translate(267.5,522.5)"><switch><foreignObject style="overflow:visible;" pointer-events="all" width="69" height="16" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; font-size: 15px; font-family: Helvetica; color: rgb(255, 255, 255); line-height: 1.2; vertical-align: top; white-space: nowrap; text-align: center;"><div xmlns="http://www.w3.org/1999/xhtml" style="display:inline-block;text-align:inherit;text-decoration:inherit;">gl::Texture</div></div></foreignObject><text x="35" y="16" fill="#FFFFFF" text-anchor="middle" font-size="15px" font-family="Helvetica">gl::Texture</text></switch></g><rect x="476.76" y="305.5" width="127" height="50" rx="7.5" ry="7.5" fill="#23445d" stroke="none" pointer-events="none"/><g transform="translate(499.5,322.5)"><switch><foreignObject style="overflow:visible;" pointer-events="all" width="80" height="16" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; font-size: 15px; font-family: Helvetica; color: rgb(255, 255, 255); line-height: 1.2; vertical-align: top; white-space: nowrap; text-align: center;"><div xmlns="http://www.w3.org/1999/xhtml" style="display:inline-block;text-align:inherit;text-decoration:inherit;">egl::Surface</div></div></foreignObject><text x="40" y="16" fill="#FFFFFF" text-anchor="middle" font-size="15px" font-family="Helvetica">egl::Surface</text></switch></g><path d="M 168.5 130.5 L 175.75 130.5 Q 183 130.5 183 140.5 L 183 520.5 Q 183 530.5 193 530.5 L 239.35 530.5" fill="none" stroke="#0c343d" stroke-width="3" stroke-miterlimit="10" pointer-events="none"/><path d="M 161.75 130.5 L 170.75 126 L 168.5 130.5 L 170.75 135 Z" fill="#0c343d" stroke="#0c343d" stroke-width="3" stroke-miterlimit="10" pointer-events="none"/><path d="M 168.5 130.5 L 175.75 130.5 Q 183 130.5 183 140.5 L 183 620.5 Q 183 630.5 193 630.5 L 239.35 630.5" fill="none" stroke="#0c343d" stroke-width="3" stroke-miterlimit="10" pointer-events="none"/><path d="M 161.75 130.5 L 170.75 126 L 168.5 130.5 L 170.75 135 Z" fill="#0c343d" stroke="#0c343d" stroke-width="3" stroke-miterlimit="10" pointer-events="none"/><path d="M 376.46 236 L 412 236 Q 422 236 432 236 L 476.9 236" fill="none" stroke="#0c343d" stroke-width="3" stroke-miterlimit="10" pointer-events="none"/><path d="M 369.71 236 L 378.71 231.5 L 376.46 236 L 378.71 240.5 Z" fill="#0c343d" stroke="#0c343d" stroke-width="3" stroke-miterlimit="10" pointer-events="none"/><path d="M 303 211 L 303 193.5 Q 303 183.5 303 174.8 L 303 166.1" fill="none" stroke="#0c343d" stroke-width="3" stroke-miterlimit="10" pointer-events="none"/><path d="M 303 159.35 L 307.5 168.35 L 303 166.1 L 298.5 168.35 Z" fill="#0c343d" stroke="#0c343d" stroke-width="3" stroke-miterlimit="10" pointer-events="none"/><path d="M 303 505.5 L 303 490.5 Q 303 480.5 303 473.05 L 303 465.6" fill="none" stroke="#0c343d" stroke-width="3" stroke-miterlimit="10" pointer-events="none"/><path d="M 303 458.85 L 307.5 467.85 L 303 465.6 L 298.5 467.85 Z" fill="#0c343d" stroke="#0c343d" stroke-width="3" stroke-miterlimit="10" pointer-events="none"/><path d="M 376.46 530.5 L 412 530.5 Q 422 530.5 432 530.5 L 476.9 530.5" fill="none" stroke="#0c343d" stroke-width="3" stroke-miterlimit="10" pointer-events="none"/><path d="M 369.71 530.5 L 378.71 526 L 376.46 530.5 L 378.71 535 Z" fill="#0c343d" stroke="#0c343d" stroke-width="3" stroke-miterlimit="10" pointer-events="none"/><path d="M 376.51 430.5 L 412 430.5 Q 422 430.5 422 420.5 L 422 340.5 Q 422 330.5 432 330.5 L 476.76 330.5" fill="none" stroke="#0c343d" stroke-width="3" stroke-miterlimit="10" pointer-events="none"/><path d="M 369.76 430.5 L 378.76 426 L 376.51 430.5 L 378.76 435 Z" fill="#0c343d" stroke="#0c343d" stroke-width="3" stroke-miterlimit="10" pointer-events="none"/><path d="M 168.1 131 L 175.55 131 Q 183 131 183 141 L 183 421 Q 183 431 193 431 L 241 431" fill="none" stroke="#0c343d" stroke-width="3" stroke-miterlimit="10" pointer-events="none"/><path d="M 161.35 131 L 170.35 126.5 L 168.1 131 L 170.35 135.5 Z" fill="#0c343d" stroke="#0c343d" stroke-width="3" stroke-miterlimit="10" pointer-events="none"/><path d="M 239.35 130.5 L 165.72 130.5" fill="none" stroke="#000000" stroke-miterlimit="10" pointer-events="none"/><path d="M 160.47 130.5 L 167.47 127 L 165.72 130.5 L 167.47 134 Z" fill="#000000" stroke="#000000" stroke-miterlimit="10" pointer-events="none"/><rect x="239.35" y="105.5" width="127" height="50" rx="7.5" ry="7.5" fill="#23445d" stroke="none" pointer-events="none"/><g transform="translate(253.5,122.5)"><switch><foreignObject style="overflow:visible;" pointer-events="all" width="98" height="16" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; font-size: 15px; font-family: Helvetica; color: rgb(255, 255, 255); line-height: 1.2; vertical-align: top; white-space: nowrap; text-align: center;"><div xmlns="http://www.w3.org/1999/xhtml" style="display:inline-block;text-align:inherit;text-decoration:inherit;">gl::VertexArray<br style="font-size: 15px" /></div></div></foreignObject><text x="49" y="16" fill="#FFFFFF" text-anchor="middle" font-size="15px" font-family="Helvetica">[Not supported by viewer]</text></switch></g><rect x="32.35" y="105.5" width="127" height="50" rx="7.5" ry="7.5" fill="#23445d" stroke="none" pointer-events="none"/><g transform="translate(46.5,122.5)"><switch><foreignObject style="overflow:visible;" pointer-events="all" width="98" height="16" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; font-size: 15px; font-family: Helvetica; color: rgb(255, 255, 255); line-height: 1.2; vertical-align: top; white-space: nowrap; text-align: center;"><div xmlns="http://www.w3.org/1999/xhtml" style="display:inline-block;text-align:inherit;text-decoration:inherit;">gl::VertexArray<br style="font-size: 15px" /></div></div></foreignObject><text x="49" y="16" fill="#FFFFFF" text-anchor="middle" font-size="15px" font-family="Helvetica">[Not supported by viewer]</text></switch></g><rect x="239.35" y="305.5" width="127" height="50" rx="7.5" ry="7.5" fill="#23445d" stroke="none" pointer-events="none"/><g transform="translate(248.5,322.5)"><switch><foreignObject style="overflow:visible;" pointer-events="all" width="107" height="16" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; font-size: 15px; font-family: Helvetica; color: rgb(255, 255, 255); line-height: 1.2; vertical-align: top; white-space: nowrap; text-align: center;"><div xmlns="http://www.w3.org/1999/xhtml" style="display:inline-block;text-align:inherit;text-decoration:inherit;">gl::Renderbuffer</div></div></foreignObject><text x="54" y="16" fill="#FFFFFF" text-anchor="middle" font-size="15px" font-family="Helvetica">gl::Renderbuffer</text></switch></g><path d="M 301 395.4 L 301 387.95 Q 301 380.5 301 370.5 L 301 355.5" fill="none" stroke="#0c343d" stroke-width="3" stroke-miterlimit="10" pointer-events="none"/><path d="M 301 402.15 L 296.5 393.15 L 301 395.4 L 305.5 393.15 Z" fill="#0c343d" stroke="#0c343d" stroke-width="3" stroke-miterlimit="10" pointer-events="none"/><path d="M 168.1 130 L 189 130 Q 199 130 209 130 L 240 130" fill="none" stroke="#0c343d" stroke-width="3" stroke-miterlimit="10" pointer-events="none"/><path d="M 161.35 130 L 170.35 125.5 L 168.1 130 L 170.35 134.5 Z" fill="#0c343d" stroke="#0c343d" stroke-width="3" stroke-miterlimit="10" pointer-events="none"/></g></svg>
>\ No newline at end of file
>diff --git a/Source/ThirdParty/ANGLE/doc/img/StateNotificationExample.svg b/Source/ThirdParty/ANGLE/doc/img/StateNotificationExample.svg
>new file mode 100644
>index 00000000000..44bcb66dcdd
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/doc/img/StateNotificationExample.svg
>@@ -0,0 +1,11 @@
>+<?xml version="1.0" encoding="utf-8" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20010904//EN" "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd"><svg xmlns="http://www.w3.org/2000/svg" width="621" height="390" xmlns:xlink="http://www.w3.org/1999/xlink"><source><![CDATA[participant App
>+participant Context
>+participant Framebuffer
>+participant Texture
>+App->Context: glTexImage2D
>+Context->Texture: setImage
>+Texture-->Framebuffer: onSubjectStateChange
>+Note over Framebuffer: cache update
>+Framebuffer-->Context: onSubjectStateChange
>+Note over Context: cache update
>+]]></source><desc></desc><defs><marker viewBox="0 0 5 5" markerWidth="5" markerHeight="5" orient="auto" refX="5" refY="2.5" id="markerArrowBlock"><path d="M 0 0 L 5 2.5 L 0 5 z"></path></marker><marker viewBox="0 0 9.6 16" markerWidth="4" markerHeight="16" orient="auto" refX="9.6" refY="8" id="markerArrowOpen"><path d="M 9.6,8 1.92,16 0,13.7 5.76,8 0,2.286 1.92,0 9.6,8 z"></path></marker></defs><g class="title"></g><g class="actor"><rect x="10" y="20" width="46.953125" height="38.84375" stroke="#000000" fill="#ffffff" style="stroke-width: 2;"></rect><text x="20.5625" y="44.84375" style="font-size: 16px; font-family: &quot;Andale Mono&quot;, monospace;"><tspan x="20">App</tspan></text></g><g class="actor"><rect x="10" y="331.90625" width="46.953125" height="38.84375" stroke="#000000" fill="#ffffff" style="stroke-width: 2;"></rect><text x="20.5625" y="356.75" style="font-size: 16px; font-family: &quot;Andale Mono&quot;, monospace;"><tspan x="20">App</tspan></text></g><line x1="33.4765625" x2="33.4765625" y1="58.84375" y2="331.90625" stroke="#000000" fill="none" style="stroke-width: 2;"></line><g class="actor"><rect x="118.25" y="20" width="81.578125" height="38.84375" stroke="#000000" fill="#ffffff" style="stroke-width: 2;"></rect><text x="128.25" y="44.84375" style="font-size: 16px; font-family: &quot;Andale Mono&quot;, monospace;"><tspan x="128.25">Context</tspan></text></g><g class="actor"><rect x="118.25" y="331.90625" width="81.578125" height="38.84375" stroke="#000000" fill="#ffffff" style="stroke-width: 2;"></rect><text x="128.25" y="356.75" style="font-size: 16px; font-family: &quot;Andale Mono&quot;, monospace;"><tspan x="128.25">Context</tspan></text></g><line x1="159.0390625" x2="159.0390625" y1="58.84375" y2="331.90625" stroke="#000000" fill="none" style="stroke-width: 2;"></line><g class="actor"><rect x="296.59375" y="20" width="116.765625" height="38.84375" stroke="#000000" fill="#ffffff" style="stroke-width: 2;"></rect><text x="306.59375" y="44.84375" style="font-size: 16px; font-family: &quot;Andale Mono&quot;, monospace;"><tspan x="306.59375">Framebuffer</tspan></text></g><g class="actor"><rect x="296.59375" y="331.90625" width="116.765625" height="38.84375" stroke="#000000" fill="#ffffff" style="stroke-width: 2;"></rect><text x="306.59375" y="356.75" style="font-size: 16px; font-family: &quot;Andale Mono&quot;, monospace;"><tspan x="306.59375">Framebuffer</tspan></text></g><line x1="354.9765625" x2="354.9765625" y1="58.84375" y2="331.90625" stroke="#000000" fill="none" style="stroke-width: 2;"></line><g class="actor"><rect x="510.125" y="20" width="81.578125" height="38.84375" stroke="#000000" fill="#ffffff" style="stroke-width: 2;"></rect><text x="520.125" y="44.84375" style="font-size: 16px; font-family: &quot;Andale Mono&quot;, monospace;"><tspan x="520.125">Texture</tspan></text></g><g class="actor"><rect x="510.125" y="331.90625" width="81.578125" height="38.84375" stroke="#000000" fill="#ffffff" style="stroke-width: 2;"></rect><text x="520.125" y="356.75" style="font-size: 16px; font-family: &quot;Andale Mono&quot;, monospace;"><tspan x="520.125">Texture</tspan></text></g><line x1="550.9140625" x2="550.9140625" y1="58.84375" y2="331.90625" stroke="#000000" fill="none" style="stroke-width: 2;"></line><g class="signal"><text x="43.4765625" y="89.265625" style="font-size: 16px; font-family: &quot;Andale Mono&quot;, monospace;"><tspan x="43.4765625">glTexImage2D</tspan></text><line x1="33.4765625" x2="159.0390625" y1="97.6875" y2="97.6875" stroke="#000000" fill="none" style="stroke-width: 2; marker-end: url(&quot;#markerArrowBlock&quot;);"></line></g><g class="signal"><text x="319.7890625" y="128.109375" style="font-size: 16px; font-family: &quot;Andale Mono&quot;, monospace;"><tspan x="319.7890625">setImage</tspan></text><line x1="159.0390625" x2="550.9140625" y1="136.53125" y2="136.53125" stroke="#000000" fill="none" style="stroke-width: 2; marker-end: url(&quot;#markerArrowBlock&quot;);"></line></g><g class="signal"><text x="364.9765625" y="166.953125" style="font-size: 16px; font-family: &quot;Andale Mono&quot;, monospace;"><tspan x="364.9765625">onSubjectStateChange</tspan></text><line x1="550.9140625" x2="354.9765625" y1="175.375" y2="175.375" stroke="#000000" fill="none" style="stroke-width: 2; stroke-dasharray: 6, 2; marker-end: url(&quot;#markerArrowBlock&quot;);"></line></g><g class="note"><rect x="297.1953125" y="195.375" width="115.5625" height="28.84375" stroke="#000000" fill="#ffffff" style="stroke-width: 2;"></rect><text x="302.1953125" y="215.21875" style="font-size: 16px; font-family: &quot;Andale Mono&quot;, monospace;"><tspan x="302.1953125">cache update</tspan></text></g><g class="signal"><text x="169.0390625" y="254.640625" style="font-size: 16px; font-family: &quot;Andale Mono&quot;, monospace;"><tspan x="169.0390625">onSubjectStateChange</tspan></text><line x1="354.9765625" x2="159.0390625" y1="263.0625" y2="263.0625" stroke="#000000" fill="none" style="stroke-width: 2; stroke-dasharray: 6, 2; marker-end: url(&quot;#markerArrowBlock&quot;);"></line></g><g class="note"><rect x="101.2578125" y="283.0625" width="115.5625" height="28.84375" stroke="#000000" fill="#ffffff" style="stroke-width: 2;"></rect><text x="106.2578125" y="302.90625" style="font-size: 16px; font-family: &quot;Andale Mono&quot;, monospace;"><tspan x="106.2578125">cache update</tspan></text></g></svg>
>\ No newline at end of file
>diff --git a/Source/ThirdParty/ANGLE/dotfile_settings.gni b/Source/ThirdParty/ANGLE/dotfile_settings.gni
>new file mode 100644
>index 00000000000..8c370c36f51
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/dotfile_settings.gni
>@@ -0,0 +1,16 @@
>+# Copyright 2018 The ANGLE Project Authors. All rights reserved.
>+# Use of this source code is governed by a BSD-style license that can be
>+# found in the LICENSE file.
>+
>+# This file contains variables that can be imported into a repo's dotfile (.gn)
>+# to make it easier to roll new versions of ANGLE in.
>+
>+angle_dotfile_settings = {
>+  exec_script_whitelist = [
>+    get_path_info("BUILD.gn", "abspath"),
>+    get_path_info("third_party/vulkan-headers/BUILD.gn", "abspath"),
>+    get_path_info("third_party/vulkan-loader/BUILD.gn", "abspath"),
>+    get_path_info("third_party/vulkan-tools/BUILD.gn", "abspath"),
>+    get_path_info("third_party/vulkan-validation-layers/BUILD.gn", "abspath"),
>+  ]
>+}
>diff --git a/Source/ThirdParty/ANGLE/extensions/ANGLE_client_arrays.txt b/Source/ThirdParty/ANGLE/extensions/ANGLE_client_arrays.txt
>new file mode 100644
>index 00000000000..c8074b5a335
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/extensions/ANGLE_client_arrays.txt
>@@ -0,0 +1,103 @@
>+Name
>+
>+    ANGLE_client_arrays
>+
>+Name Strings
>+
>+    GL_ANGLE_client_arrays
>+
>+Contributors
>+
>+    Geoff Lang
>+
>+Contact
>+
>+    Geoff Lang (geofflang 'at' google.com)
>+
>+Notice
>+
>+    Copyright (c) 2016 The Khronos Group Inc. Copyright terms at
>+        http://www.khronos.org/registry/speccopyright.html
>+
>+Status
>+
>+    Draft
>+
>+Version
>+
>+    Version 1, February 13, 2016
>+
>+Number
>+
>+    OpenGL ES Extension #??
>+
>+Dependencies
>+
>+    Requires OpenGL ES 2.0
>+
>+    Written against the OpenGL ES 2.0 specification.
>+
>+Overview
>+
>+    This extension allows the OpenGL context to indicate if it supports drawing
>+    with client-side vertex or index data.  Client-side can be very inefficient
>+    and unsafe, it is convenient for some users to completely disable its usage.
>+
>+New Procedures and Functions
>+
>+    None
>+
>+New Tokens
>+
>+    Accepted by the <cap> parameter to IsEnabled and the <pname> parameter to
>+    GetBooleanv, GetIntegerv, GetFloatv, and GetInteger64v:
>+
>+    CLIENT_ARRAYS_ANGLE                 0x93AA
>+
>+Additions to the OpenGL ES Specification
>+
>+    Add after paragraph 3 of section 2.8 "Vertex Arrays":
>+
>+    If VertexAttribPointer is called while zero is bound to the ARRAY_BUFFER
>+    buffer object binding point, the pointer argument is not NULL, and
>+    CLIENT_ARRAYS_ANGLE is TRUE, an INVALID_OPERATION error is generated.
>+
>+    Add to the end of section 2.9.1 "Vertex Arrays in Buffer Objects":
>+
>+    Rendering commands that draw more than 0 primitives using enabled vertex
>+    attributes with no buffer bound when CLIENT_ARRAYS_ANGLE is TRUE generate
>+    an INVALID_OPERATION error.
>+
>+    Add to the end of section 2.9.2 "Array Indices in Buffer Objects":
>+
>+    Rendering commands that draw using index data when no buffer is bound to
>+    the ELEMENT_ARRAY_BUFFER binding point when CLIENT_ARRAYS_ANGLE is TRUE
>+    generate an INVALID_OPERATION error.
>+
>+New State
>+
>+    Modify Table 6.22, Miscellaneous
>+
>+    Add:
>+
>+                                          Initial
>+    Get Value            Type Get Command Value   Description
>+    -------------------- ---- ----------- ------- ---------------------
>+    CLIENT_ARRAYS_ANGLE  B    IsEnabled   TRUE    Client arrays enabled
>+
>+Conformance Tests
>+
>+    TBD
>+
>+Issues
>+
>+    None
>+
>+Revision History
>+
>+    Rev.    Date         Author                 Changes
>+    ----  -------------  ---------              ----------------------------------------
>+      2   Jun 12, 2018   Brandon Jones (Intel)  Remove primitives > 0 requirement to error
>+                                                when doing an indexed draw with no bound
>+                                                ELEMENT_ARRAY_BUFFER
>+      1   Feb 13, 2016   geofflang              Initial version
>diff --git a/Source/ThirdParty/ANGLE/extensions/ANGLE_copy_texture_3d.txt b/Source/ThirdParty/ANGLE/extensions/ANGLE_copy_texture_3d.txt
>new file mode 100644
>index 00000000000..dfa8f1e680f
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/extensions/ANGLE_copy_texture_3d.txt
>@@ -0,0 +1,225 @@
>+Name
>+
>+    ANGLE_copy_texture_3d
>+
>+Name Strings
>+
>+    GL_ANGLE_copy_texture_3d
>+
>+Contributors
>+
>+    Brandon Jones, Intel
>+
>+Contacts
>+
>+    Brandon Jones, Intel (brandon1.jones 'at' intel 'dot' com)
>+
>+Status
>+
>+    Implemented.
>+
>+Version
>+
>+    Version 1, 2018-8-8
>+
>+Dependencies
>+
>+    OpenGL ES 3.0 required.
>+
>+Overview
>+
>+    This extension adds 3D texture support to the functionality
>+    provided by the CHROMIUM_copy_texture extension. Two new
>+    functions are exported, glCopyTexture3DANGLE and
>+    glCopySubTexture3DANGLE that perform the same copy operations as
>+    glCopyTextureCHROMIUM and glCopySubTextureCHROMIUM, respectively,
>+    on GL_TEXTURE_3D and GL_TEXTURE_2D_ARRAY bound textures.
>+
>+New Procedures and Functions
>+
>+    void CopyTexture3DANGLE(uint sourceId,
>+                            int sourceLevel,
>+                            enum destTarget,
>+                            uint destId,
>+                            int destLevel,
>+                            int internalFormat,
>+                            enum destType,
>+                            boolean unpackFlipY,
>+                            boolean unpackPremultiplyAlpha,
>+                            boolean unpackUnmultiplyAlpha)
>+
>+    void CopySubTexture3DANGLE(uint sourceId,
>+                               int sourceLevel,
>+                               enum destTarget,
>+                               uint destId,
>+                               int destLevel,
>+                               int xoffset,
>+                               int yoffset,
>+                               int zoffset,
>+                               int x,
>+                               int y,
>+                               int z,
>+                               sizei width,
>+                               sizei height,
>+                               sizei depth,
>+                               boolean unpackFlipY,
>+                               boolean unpackPremultiplyAlpha,
>+                               boolean unpackUnmultiplyAlpha)
>+
>+Additions to the OpenGL ES 3.0 Specification
>+
>+    The command
>+
>+        CopyTexture3DANGLE
>+
>+    All CopyTexture3DANGLE behavior is the same as
>+    CopyTextureCHROMIUM unless otherwise defined below.
>+
>+    When source texture doesn't contain a superset of the component
>+    required by <internalFormat>, fill the components by the
>+    following rules.
>+
>+       source format           color components
>+       ----------------------------------------
>+       RED                     (R, 0, 0, 1)
>+       RED_INTEGER             (R, 0, 0, 1)
>+       RG                      (R, G, 0, 1)
>+       RG_INTEGER              (R, G, 0, 1)
>+       RGB                     (R, G, B, 1)
>+       RGB_INTEGER             (R, G, B, 1)
>+       RGBA                    (R, G, B, A)
>+       RGBA_INTEGER            (R, G, B, A)
>+       LUMINANCE_ALPHA         (L, L, L, A)
>+       LUMINANCE               (L, L, L, 1)
>+       ALPHA                   (0, 0, 0, A)
>+
>+    INVALID_OPERATION is generated if the format of <sourceId> is not
>+    one of formats in Table 1.1.
>+
>+    INVALID_ENUM is generated if <destTarget> is not TEXTURE_3D or
>+    TEXTURE_2D_ARRAY.
>+
>+    INVALID_VALUE is generated if the texture corresponding to
>+    <sourceId> has not been bound as <destTarget>.
>+
>+    INVALID_OPERATION is generated if <internalFormat> is not one of
>+    the sized internal formats in Table 1.0.
>+
>+    The command
>+
>+        CopySubTexture3DANGLE
>+
>+    All CopySubTexture3DANGLE behavior is the same as
>+    CopySubTextureCHROMIUM unless otherwise defined below.
>+
>+    <zoffset> specifies a texel offset in the z direction
>+    respectively within the destination texture.
>+
>+    <z> specifies a texel offset in the z direction respectively
>+    within the source texture.
>+
>+    <depth> specifies the depth of the texture subimage.
>+
>+    INVALID_ENUM is generated if <destTarget> is not TEXTURE_3D or
>+    TEXTURE_2D_ARRAY.
>+
>+    INVALID_VALUE is generated if the texture corresponding to
>+    <sourceId> and <destId> have not been bound as <destTarget>.
>+
>+    INVALID_VALUE is generated if either <sourceId> texture or
>+    <destId> texture is not defined.
>+
>+    INVALID_OPERATION is generated if the format of <sourceId> or
>+    <destId> is not one of formats in Table 1.1.
>+
>+    INVALID_VALUE is generated if zoffset is less than 0.
>+
>+    INVALID_VALUE is generated if z is less than 0.
>+
>+    INVALID_VALUE is generated if depth is less than 0.
>+
>+    INVALID_VALUE is generated if (<z> + <depth>) > srcDepth.
>+
>+    INVALID_VALUE is generated if (<zoffset> + <depth>) > destDepth.
>+
>+    Table 1.0 internal formats for CopyTexture3DANGLE:
>+
>+        <internalFormat>
>+        ---------------
>+        RGB
>+        RGBA
>+        LUMINANCE
>+        LUMINANCE_ALPHA
>+        ALPHA
>+        R8
>+        R8_SNORM
>+        R16F
>+        R32F
>+        R8UI
>+        R8I
>+        R16UI
>+        R16I
>+        R32UI
>+        R32I
>+        RG8
>+        RG8_SNORM
>+        RG16F
>+        RG32F
>+        RG8UI
>+        RG8I
>+        RG16UI
>+        RG16I
>+        RG32UI
>+        RG32I
>+        RGB8
>+        SRGB8
>+        RGB565
>+        RGB8_SNORM
>+        R11F_G11F_B10F
>+        RGB9_E5
>+        RGB16F
>+        RGB32F
>+        RGB8UI
>+        RGB8I
>+        RGB16UI
>+        RGB16I
>+        RGB32UI
>+        RGB32I
>+        RGBA8
>+        SRGB8_ALPHA8
>+        RGBA8_SNORM
>+        RGB5_A1
>+        RGBA4
>+        RGB10_A2
>+        RGBA16F
>+        RGBA32F
>+        RGBA8UI
>+        RGBA8I
>+        RGB10_A2UI
>+        RGBA16UI
>+        RGBA16I
>+        RGBA32I
>+        RGBA32UI
>+
>+    Table 1.1 Valid source texture formats for
>+    CopyTexture3DANGLE and source and destination formats for
>+    CopySubTexture3DANGLE:
>+
>+        Format
>+        ---------------
>+        RED
>+        RED_INTEGER
>+        RG
>+        RG_INTEGER
>+        RGB
>+        RGB_INTEGER
>+        RGBA
>+        RGBA_INTEGER
>+        LUMINANCE_ALPHA
>+        LUMINANCE
>+        ALPHA
>+
>+Revision History
>+
>+    Version 1, 2018-8-8 (Brandon Jones)
>+        - Initial implementation.
>\ No newline at end of file
>diff --git a/Source/ThirdParty/ANGLE/extensions/ANGLE_depth_texture.txt b/Source/ThirdParty/ANGLE/extensions/ANGLE_depth_texture.txt
>new file mode 100644
>index 00000000000..067ecc5ed2a
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/extensions/ANGLE_depth_texture.txt
>@@ -0,0 +1,402 @@
>+Name
>+
>+    ANGLE_depth_texture
>+
>+Name Strings
>+
>+    GL_ANGLE_depth_texture
>+
>+Contributors
>+
>+    Nicolas Capens, TransGaming
>+    Daniel Koch, TransGaming
>+    Shannon Woods, TransGaming
>+    Kenneth Russell, Google
>+    Vangelis Kokkevis, Google
>+    Gregg Tavares, Google
>+    Contributors to OES_depth_texture
>+    Contributors to OES_packed_depth_stencil
>+
>+Contact
>+
>+    Shannon Woods, TransGaming (shannon 'dot' woods 'at' transgaming.com)
>+
>+Status
>+
>+    Implemented in ANGLE.
>+
>+Version
>+
>+    Last Modified Date: February 25, 2013
>+    Revision: #4
>+
>+Number
>+
>+    TBD
>+
>+Dependencies
>+
>+    OpenGL ES 2.0 is required.
>+    This extension is written against the OpenGL ES 2.0.25 specification
>+
>+    OES_packed_depth_stencil affects the definition of this extension.
>+
>+    EXT_texture_storage affects the definition of this extension.
>+
>+Overview
>+
>+    This extension defines support for 2D depth and depth-stencil
>+    textures in an OpenGL ES implementation.
>+
>+    This extension incorporates the depth texturing functionality of 
>+    OES_depth_texture and OES_packed_depth_stencil, but does not 
>+    provide the ability to load existing data via TexImage2D or
>+    TexSubImage2D. This extension also allows implementation 
>+    variability in which components from a sampled depth texture
>+    contain the depth data. Depth textures created with this
>+    extension only support 1 level.
>+
>+New Procedures and Functions
>+
>+    None
>+
>+New Tokens
>+
>+    Accepted by the <format> parameter of TexImage2D and TexSubImage2D and
>+    <internalformat> parameter of TexImage2D:
>+    
>+        DEPTH_COMPONENT             0x1902
>+        DEPTH_STENCIL_OES           0x84F9
>+        
>+    Accepted by the <type> parameter of TexImage2D, TexSubImage2D: 
>+
>+        UNSIGNED_SHORT              0x1403
>+        UNSIGNED_INT                0x1405
>+        UNSIGNED_INT_24_8_OES       0x84FA
>+
>+    Accepted by the <internalformat> parameter of TexStorage2DEXT:
>+
>+        DEPTH_COMPONENT16           0x81A5
>+        DEPTH_COMPONENT32_OES       0x81A7
>+        DEPTH24_STENCIL8_OES        0x88F0
>+
>+Additions to Chapter 2 of the OpenGL ES 2.0 Specification (OpenGL Operation)
>+
>+    Update Section 2.10.5 "Shader Execution" in the subsection titled 
>+    "Texture Access" add a new paragraph before the last paragraph add
>+    this line:
>+
>+    "The stencil index texture internal component is ignored if the base
>+    internal format is DEPTH_STENCIL_OES.
>+
>+    If a vertex shader uses..."
>+
>+Additions to Chapter 3 of the OpenGL ES 2.0 specification (Rasterization)
>+
>+    Add the following rows to Table 3.2 (page 62):
>+
>+      type Parameter           GL Data Type    Special
>+      ------------------------------------------------
>+      ...                      ...              ...
>+      UNSIGNED_SHORT           ushort           No
>+      UNSIGNED_INT             uint             No
>+      UNSIGNED_INT_24_8_OES    uint             Yes
>+
>+    Add the following rows to Table 3.3 (page 62):
>+
>+      Format Name       Element Meaning and Order      Target Buffer
>+      ------------------------------------------------------------------
>+      ...               ...                            ...
>+      DEPTH_COMPONENT   Depth                          Depth
>+      DEPTH_STENCIL_OES Depth and Stencil Index        Depth and Stencil
>+      ...               ...                            ...
>+
>+    Add a row to Table 3.5 "Packed pixel formats" (page 64):
>+
>+      type Parameter               GL Type  Components  Pixel Formats
>+      ------------------------------------------------------------------
>+      ...                          ...      ...         ...
>+      UNSIGNED_INT_24_8_OES        uint     2           DEPTH_STENCIL_OES
>+
>+    Add a new table after Table 3.6 (page 64):
>+
>+    UNSIGNED_INT_24_8_OES
>+
>+       31 30 29 28 27 26 ... 12 11 10 9 8 7 6 5 4 3 2 1 0
>+      +----------------------------------+---------------+
>+      |           1st Component          | 2nd Component |
>+      +----------------------------------+---------------+
>+
>+      Table 3.6.B: UNSIGNED_INT formats
>+
>+    Add a row to Table 3.7 "Packed pixel field assignments" (page 65):
>+
>+      Format            |  1st     2nd     3rd     4th
>+      ------------------+-------------------------------
>+      ...               |  ...     ...     ...     ...
>+      DEPTH_STENCIL_OES |  depth   stencil N/A     N/A
>+
>+    Add the following paragraph to the end of the section "Conversion to
>+    floating-point" (page 65):
>+
>+    "For groups of components that contain both standard components and index
>+    elements, such as DEPTH_STENCIL_OES, the index elements are not converted."
>+
>+    In section 3.7.1 "Texture Image Specification", update page 67 to
>+    say:
>+
>+    "The selected groups are processed as described in section 3.6.2, stopping
>+    just before final conversion.  Each R, G, B, A, or depth value so generated
>+    is clamped to [0, 1], while the stencil index values are masked by 2^n-1,
>+    where n is the number of stencil bits in the internal format resolution
>+    (see below).
>+
>+    Components are then selected from the resulting R, G, B, A, depth, or
>+    stencil index values to obtain a texture with the base internal format
>+    specified by <internalformat>.  Table 3.8 summarizes the mapping of R, G,
>+    B, A, depth, or stencil values to texture components, as a function of the
>+    base internal format of the texture image.  <internalformat> may be
>+    specified as one of the internal format symbolic constants listed in
>+    table 3.8. Specifying a value for <internalformat> that is not one of the
>+    above values generates the error INVALID_VALUE. If <internalformat> does
>+    not match <format>, the error INVALID_OPERATION is generated.
>+
>+    Textures with a base internal format of DEPTH_COMPONENT or 
>+    DEPTH_STENCIL_OES are supported by texture image specification commands
>+    only if <target> is TEXTURE_2D.  Using these formats in conjunction with
>+    any other <target> will result in an INVALID_OPERATION error.
>+
>+    Textures with a base internal format of DEPTH_COMPONENT or
>+    DEPTH_STENCIL_OES only support one level of image data.  Specifying a
>+    non-zero value for <level> will result in an INVALID_OPERATION error.
>+
>+    Textures with a base internal format of DEPTH_COMPONENT or DEPTH_STENCIL_OES
>+    require either depth component data or depth/stencil component data.
>+    Textures with other base internal formats require RGBA component data.  The
>+    error INVALID_OPERATION is generated if the base internal format is
>+    DEPTH_COMPONENT or DEPTH_STENCIL_OES and <format> is not DEPTH_COMPONENT or
>+    DEPTH_STENCIL_OES, or if the base internal format is not DEPTH_COMPONENT or
>+    DEPTH_STENCIL_OES and <format> is DEPTH_COMPONENT or DEPTH_STENCIL_OES.
>+
>+    Textures with a base internal format of DEPTH_COMPONENT or
>+    DEPTH_STENCIL_OES do not support loading image data via the TexImage
>+    commands. They can only have their contents specified by rendering
>+    to them. The INVALID_OPERATION error is generated by the TexImage2D
>+    command if <data> is not NULL for such textures."
>+
>+    Add a row to table 3.8 (page 68), and update the title of the
>+    second column:
>+
>+      Base Internal Format  RGBA, Depth and Stencil Values  Internal Components
>+      -------------------------------------------------------------------------
>+      ...                   ...                             ...
>+      DEPTH_COMPONENT       Depth                           D
>+      DEPTH_STENCIL_OES     Depth,Stencil                   D,S
>+      ...                   ...                             ...
>+
>+    Update the caption for table 3.8 (page 68)
>+
>+    "Table 3.8: Conversion from RGBA, depth, and stencil pixel components to
>+    internal texture components.  Texture components R, G, B, A, and L are 
>+    converted back to RGBA colors during filtering as shown in table 3.12.
>+    Texture components D are converted to RGBA colors as described in 
>+    section 3.7.8-1/2."
>+
>+    Add the following to section 3.7.2 "Alternate Texture Image Specification
>+    Commands":
>+
>+    "CopyTexImage2D and CopyTexSubImage2D generate the INVALID_OPERATION 
>+    error if the base internal format of the destination texture is 
>+    DEPTH_COMPONENT or DEPTH_STENCIL_OES.
>+
>+    TexSubImage2D generates the INVALID_OPERATION error if the base internal
>+    format of the texture is DEPTH_COMPONENT or DEPTH_STENCIL_OES."
>+
>+    Add a new section between sections 3.7.8 and 3.7.9:
>+
>+    "3.7.8-1/2 Depth/Stencil Textures
>+
>+    If the currently bound texture's base internal format is DEPTH_COMPONENT or
>+    DEPTH_STENCIL_OES, then the output of the texture unit is as described
>+    below. Otherwise, the texture unit operates in the normal manner.
>+
>+    Let <D_t> be the depth texture value, provided by the shader's texture lookup
>+    function. Then the effective texture value is computed as follows:
>+            <Tau> = <D_t>
>+
>+    If the texture image has a base internal format of DEPTH_STENCIL_OES, then
>+    the stencil index texture component is ignored.  The texture value <Tau> does
>+    not include a stencil index component, but includes only the depth
>+    component.
>+
>+    The resulting <Tau> is assigned to <R_t>. In some implementations, <Tau> is
>+    also assigned to <G_t>, <B_t>, or <A_t>. Thus in table 3.12, textures with
>+    depth component data behave as if their base internal format is RGBA, with
>+    values in <G_t>, <B_t>, and <A_t> being implementation dependent."
>+
>+    Add the following to section 3.7.11 "Mipmap Generation":
>+
>+    "If the level zero array contains depth or depth-stencil data, the
>+     error INVALID_OPERATION is generated."
>+
>+    Insert a new paragraph after the first paragraph of the "Texture Access"
>+    subsection of section 3.8.2 on page 87, which says:
>+
>+    "Texture lookups involving textures with depth component data generate
>+    a texture source color by using depth data directly, as described in
>+    section 3.7.8-1/2.  The stencil texture internal component is ignored
>+    if the base internal format is DEPTH_STENCIL_OES."
>+
>+Additions to Chapter 4 of the OpenGL ES 2.0 specification (Per-Fragment
>+Operations and the Framebuffer)
>+
>+    In section 4.4.5 "Framebuffer Completeness", replace the the 3rd
>+    paragraph with the following text:
>+
>+     "* An internal format is color-renderable if it is one of the formats
>+        from table 4.5 noted as color-renderable or if it is unsized format
>+        RGBA or RGB. No other formats, including compressed internal formats,
>+        are color-renderable.
>+
>+      * An internal format is depth-renderable if it is one of the sized
>+        internal formats from table 4.5 noted as depth-renderable, if it
>+        is the unsized format DEPTH_COMPONENT or if it is the internal 
>+        format value of DEPTH24_STENCIL8_OES. No other formats are 
>+        depth-renderable.
>+
>+      * An internal format is stencil-renderable if it is one of the sized 
>+        internal formats from table 4.5 noted as stencil-renderable or if it
>+        is DEPTH24_STENCIL8_OES. No other formats are stencil-renderable."
>+
>+Additions to Chapter 5 of the OpenGL ES 2.0 Specification (Special
>+Functions)
>+
>+    None.
>+
>+Additions to Chapter 6 of the OpenGL ES 2.0 Specification (State and State
>+Requests)
>+
>+    None.
>+
>+Interactions with OES_packed_depth_stencil
>+
>+    If OES_packed_depth_stencil is not supported, mentions of
>+    DEPTH_STENCIL_OES and UNSIGNED_INT_24_8_OES as a format/type combinations
>+    for TexImage2D and TexSubImage2D are omitted. Mentions of
>+    the internal format DEPTH24_STENCIL8_OES are also omitted.
>+
>+Interactions with EXT_texture_storage
>+
>+    If EXT_texture_storage is supported the following internalformat
>+    to format/type mappings are used:
>+
>+        <internalformat>       <format>           <type>
>+        ----------------       --------           ------
>+        DEPTH_COMPONENT16      DEPTH_COMPONENT    UNSIGNED_SHORT
>+        DEPTH_COMPONENT32_OES  DEPTH_COMPONENT    UNSIGNED_INT
>+        DEPTH24_STENCIL8_OES   DEPTH_STENCIL_OES  UNSIGNED_INT
>+
>+    Textures with the above <internalformats> only support one level of
>+    image data. Specifying a value other than one for the <levels> parameter
>+    to TexStorage2DEXT will result in an INVALID_OPERATION error.
>+
>+    If EXT_texture_storage is not supported, ignore any references
>+    to TexStorage2DEXT. 
>+
>+Errors
>+
>+    The error INVALID_OPERATION is generated by TexImage2D if <format> and 
>+    <internalformat> are DEPTH_COMPONENT and <type> is not UNSIGNED_SHORT,
>+    or UNSIGNED_INT.
>+
>+    The error INVALID_OPERATION is generated by TexSubImage2D if <format> is 
>+    DEPTH_COMPONENT and <type> is not UNSIGNED_SHORT, or UNSIGNED_INT.
>+
>+    The error INVALID_OPERATION is generated by TexImage2D if <format> and
>+    <internalformat> are not DEPTH_COMPONENT and <type> is UNSIGNED_SHORT,
>+    or UNSIGNED_INT.
>+
>+    The error INVALID_OPERATION is generated by TexSubImage2D if <format> is
>+    not DEPTH_COMPONENT and <type> is UNSIGNED_SHORT, or UNSIGNED_INT.
>+
>+    The error INVALID_OPERATION is generated by TexImage2D if <format> and
>+    <internalformat> are DEPTH_STENCIL_OES and <type> is not
>+    UNSIGNED_INT_24_8_OES. 
>+
>+    The error INVALID_OPERATION is generated by TexSubImage2D if <format>
>+    is DEPTH_STENCIL_OES and <type> is not UNSIGNED_INT_24_8_OES. 
>+
>+    The error INVALID_OPERATION is generated by TexImage2D if <format> and
>+    <internalformat> is not DEPTH_STENCIL_OES and <type> is 
>+    UNSIGNED_INT_24_8_OES.
>+
>+    The error INVALID_OPERATION is generated by TexSubImage2D if <format>
>+    is not DEPTH_STENCIL_OES and <type> is UNSIGNED_INT_24_8_OES.
>+
>+    The error INVALID_OPERATION is generated in the following situations:
>+    - TexImage2D is called with <format> and <internalformat> of
>+      DEPTH_COMPONENT or DEPTH_STENCIL_OES and
>+       - <target> is not TEXTURE_2D,
>+       - <data> is not NULL, or
>+       - <level> is not zero.
>+    - TexSubImage2D is called with <format> of DEPTH_COMPONENT or 
>+      DEPTH_STENCIL_OES.
>+    - TexStorage2DEXT is called with <internalformat> of DEPTH_COMPONENT16,
>+      DEPTH_COMPONENT32_OES, or DEPTH24_STENCIL8_OES, and 
>+       - <target> is not TEXTURE_2D, or
>+       - <levels> is not one.
>+    - CopyTexImage2D is called with an <internalformat> that has a base
>+      internal format of DEPTH_COMPONENT or DEPTH_STENCIL_OES.
>+    - CopyTexSubImage2D is called with a target texture that has a base
>+      internal format of DEPTH_COMPONENT or DEPTH_STENCIL_OES.
>+    - GenerateMipmap is called on a texture that has a base internal format
>+      of DEPTH_COMPONENT or DEPTH_STENCIL_OES.
>+    
>+New State
>+
>+    None.
>+
>+Issues
>+
>+    1) What are the differences between this extension and OES_depth_texture
>+       and OES_packed_depth_stencil?
>+    
>+       RESOLVED: This extension:
>+         - does not support loading pre-baked depth stencil data via 
>+           TexImage2D or TexSubImage2D.
>+         - allows variability in the y-, z-, and w-components of the sample
>+           results from depth textures.
>+         - only supports one level textures.
>+         - explicitly lists the errors for unsupported functionality.
>+           Since these were not clearly specified in the OES_depth_texture
>+           extension there may be differences in error values between 
>+           implementations of OES_depth_texture and ANGLE_depth_texture.
>+       This specification was also rebased to apply against the OpenGL ES 2.0
>+       specification instead of the OpenGL specification, making it more 
>+       obvious what all the functionality changes are.
>+
>+    2) Why does TexSubImage2D accept the new format/type combinations even
>+       though it does not actually support loading data?
>+
>+       RESOLVED: This was done to be more consistent with the OES_depth_texture
>+       extension and to make it easier to add support for loading texture
>+       data if it is possible to support in the future.
>+
>+    3) Why are only 1-level depth textures supported? 
>+
>+       RESOLVED: The only use for multiple levels of depth textures would
>+       be for fitlered texturing. However since it is not possible to
>+       render to non-zero-level texture levels in OpenGL ES 2.0, and since
>+       this extension forbids loading existing data and GenerateMipmap on 
>+       depth textures, it is impossible to initialize or specify contents
>+       for non-zero levels of depth textures.
>+
>+Revision History
>+ 
>+    02/25/2013  swoods  revise to allow texture lookup to guarantee depth values
>+                        only in red channel of sample result.
>+    06/04/2012  dgkoch  fix errors, disallow multi-level depth textures.
>+    05/30/2012  dgkoch  minor updates and add issues.
>+    05/23/2012  dgkoch  intial revision based on OES_depth_texture and 
>+                        OES_packed_depth_stencil and rebased against the ES 2.0 spec
>+
>diff --git a/Source/ThirdParty/ANGLE/extensions/ANGLE_explicit_context.txt b/Source/ThirdParty/ANGLE/extensions/ANGLE_explicit_context.txt
>new file mode 100644
>index 00000000000..32f0459304f
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/extensions/ANGLE_explicit_context.txt
>@@ -0,0 +1,81 @@
>+Name
>+
>+    ANGLE_explicit_context
>+
>+Name Strings
>+
>+    GL_ANGLE_explicit_context
>+
>+Contributors
>+
>+    Brandon Jones, Intel
>+
>+Contacts
>+
>+    Brandon Jones, Intel (brandon1.jones 'at' intel 'dot' com)
>+
>+Status
>+
>+    Complete.
>+
>+Version
>+
>+    Version 1, 2018-5-22
>+
>+Number
>+
>+    GL Extension XXX
>+
>+Dependencies
>+
>+    OpenGL ES 3.1 is required.
>+
>+    EGL_ANGLE_explicit_context is required.
>+
>+Overview
>+
>+    This extension adds new OpenGL ES entry points that allow the user to pass the current EGL
>+    context as a function parameter. This allows users to skip lookup of the thread's current
>+    context upon entry.
>+
>+New Types
>+
>+    typedef void* GLeglContextANGLE
>+
>+New Procedures and Functions
>+
>+    For every OpenGL ES entry point available in OpenGL ES 2.0, 3.0 and 3.1, an additional entry
>+    point is made available. The entry points have the form of:
>+
>+    <return value> gl<entry point name>ContextANGLE(GLeglContextANGLE context, <entry point parameters>)
>+
>+    If a function already has an extension suffix, this form still applies.
>+
>+New Tokens
>+
>+    None.
>+
>+Additions to Chapter 2 of the OpenGL ES 3.1 Specification (OpenGL ES Fundamentals)
>+
>+    The ContextANGLE entry points allow the user to pass the current EGL context as a function
>+    parameter to provide better performance than looking up the current EGL context at every GL
>+    entry point.
>+
>+    Calls made with an explicit context provide no additional validation for the passed context
>+    parameter.
>+
>+    Calls made with an explicit context will generate errors under the same conditions as they
>+    would without an explicit context. Any instances of undefined behaviour without specifying
>+    an explicit context are still undefined when specifying an explicit context.
>+
>+    When an EGL context that is not current is explicitly passed, the resulting behavior is
>+    undefined.
>+
>+Issues
>+
>+    None.
>+
>+Revision History
>+
>+    Version 1, 2018-5-22 (Brandon Jones)
>+        - Initial draft
>\ No newline at end of file
>diff --git a/Source/ThirdParty/ANGLE/extensions/ANGLE_explicit_context_gles1.txt b/Source/ThirdParty/ANGLE/extensions/ANGLE_explicit_context_gles1.txt
>new file mode 100644
>index 00000000000..3c7e9d875dc
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/extensions/ANGLE_explicit_context_gles1.txt
>@@ -0,0 +1,81 @@
>+Name
>+
>+    ANGLE_explicit_context_gles1
>+
>+Name Strings
>+
>+    GL_ANGLE_explicit_context_gles1
>+
>+Contributors
>+
>+    Brandon Jones, Intel
>+
>+Contacts
>+
>+    Brandon Jones, Intel (brandon1.jones 'at' intel 'dot' com)
>+
>+Status
>+
>+    Complete.
>+
>+Version
>+
>+    Version 1, 2018-5-22
>+
>+Number
>+
>+    GL Extension XXX
>+
>+Dependencies
>+
>+    OpenGL ES 1.0 is required.
>+
>+    EGL_ANGLE_explicit_context is required.
>+
>+Overview
>+
>+    This extension adds new OpenGL ES entry points that allow the user to pass the current EGL
>+    context as a function parameter. This allows users to skip lookup of the thread's current
>+    context upon entry.
>+
>+New Types
>+
>+    typedef void* GLeglContextANGLE
>+
>+New Procedures and Functions
>+
>+    For every OpenGL ES entry point available in OpenGL ES 1.0, an additional entry point is made
>+    available. The entry points have the form of:
>+
>+    <return value> gl<entry point name>ContextANGLE(GLeglContextANGLE context, <entry point parameters>)
>+
>+    If a function already has an extension suffix, this form still applies.
>+
>+New Tokens
>+
>+    None.
>+
>+Additions to Chapter 2 of the OpenGL ES 1.0 Specification (OpenGL ES Operation)
>+
>+    The ContextANGLE entry points allow the user to pass the current EGL context as a function
>+    parameter to provide better performance than looking up the current EGL context at every GL
>+    entry point.
>+
>+    Calls made with an explicit context provide no additional validation for the passed context
>+    parameter.
>+
>+    Calls made with an explicit context will generate errors under the same conditions as they
>+    would without an explicit context. Any instances of undefined behaviour without specifying
>+    an explicit context are still undefined when specifying an explicit context.
>+
>+    When an EGL context that is not current is explicitly passed, the resulting behavior is
>+    undefined.
>+
>+Issues
>+
>+    None.
>+
>+Revision History
>+
>+    Version 1, 2018-5-22 (Brandon Jones)
>+        - Initial draft
>\ No newline at end of file
>diff --git a/Source/ThirdParty/ANGLE/extensions/ANGLE_framebuffer_blit.txt b/Source/ThirdParty/ANGLE/extensions/ANGLE_framebuffer_blit.txt
>new file mode 100644
>index 00000000000..53056c44977
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/extensions/ANGLE_framebuffer_blit.txt
>@@ -0,0 +1,437 @@
>+Name
>+
>+    ANGLE_framebuffer_blit
>+
>+Name Strings
>+
>+    GL_ANGLE_framebuffer_blit
>+
>+Contributors
>+
>+    Contributors to EXT_framebuffer_blit
>+    Daniel Koch, TransGaming Inc.
>+    Shannon Woods, TransGaming Inc.
>+    Kenneth Russell, Google Inc.
>+    Vangelis Kokkevis, Google Inc.
>+
>+Contact
>+
>+    Daniel Koch, TransGaming Inc. (daniel 'at' transgaming 'dot' com)
>+
>+Status
>+
>+    Implemented in ANGLE ES2
>+
>+Version
>+
>+    Last Modified Date: Sept 22, 2012
>+    Author Revision: 4
>+
>+Number
>+
>+    OpenGL ES Extension #83
>+
>+Dependencies
>+
>+    OpenGL ES 2.0 is required.
>+
>+    The extension is written against the OpenGL ES 2.0 specification.
>+
>+    OES_texture_3D affects the definition of this extension.
>+
>+Overview
>+
>+    This extension modifies framebuffer objects by splitting the
>+    framebuffer object binding point into separate DRAW and READ
>+    bindings.  This allows copying directly from one framebuffer to
>+    another.  In addition, a new high performance blit function is
>+    added to facilitate these blits and perform some data conversion
>+    where allowed.
>+
>+IP Status
>+
>+    No known IP claims.
>+
>+New Procedures and Functions
>+
>+    void BlitFramebufferANGLE(int srcX0, int srcY0, int srcX1, int srcY1,
>+                              int dstX0, int dstY0, int dstX1, int dstY1,
>+                              bitfield mask, enum filter);
>+
>+New Tokens
>+
>+    Accepted by the <target> parameter of BindFramebuffer,
>+    CheckFramebufferStatus, FramebufferTexture2D, FramebufferTexture3DOES,
>+    FramebufferRenderbuffer, and
>+    GetFramebufferAttachmentParameteriv:
>+
>+    // (reusing the tokens from EXT_framebuffer_blit)
>+    READ_FRAMEBUFFER_ANGLE                0x8CA8
>+    DRAW_FRAMEBUFFER_ANGLE                0x8CA9
>+
>+    Accepted by the <pname> parameters of GetIntegerv and GetFloatv:
>+
>+    // (reusing the tokens from EXT_framebuffer_blit)
>+    DRAW_FRAMEBUFFER_BINDING_ANGLE        0x8CA6 // alias FRAMEBUFFER_BINDING
>+    READ_FRAMEBUFFER_BINDING_ANGLE        0x8CAA
>+
>+
>+Additions to Chapter 3 of the OpenGL ES 2.0 Specification (Rasterization)
>+
>+    Change the last paragraph of section 3.7.2 (Alternate Texture Image
>+    Specification Commands) to:
>+
>+    "Calling CopyTexSubImage3DOES, CopyTexImage2D or CopyTexSubImage2D will
>+    result in an INVALID_FRAMEBUFFER_OPERATION error if the object bound
>+    to READ_FRAMEBUFFER_BINDING_ANGLE is not "framebuffer complete"
>+    (section 4.4.4.2)."
>+
>+Additions to Chapter 4 of the OpenGL ES 2.0 Specification (Per-Fragment
>+Operations and the Framebuffer)
>+
>+    Change the first word of Chapter 4 from "The" to "A".
>+
>+    Append to the introduction of Chapter 4:
>+
>+    "Conceptually, the GL has two active framebuffers; the draw
>+    framebuffer is the destination for rendering operations, and the
>+    read framebuffer is the source for readback operations.  The same
>+    framebuffer may be used for both drawing and reading.  Section
>+    4.4.1 describes the mechanism for controlling framebuffer usage."
>+
>+    Modify the first sentence of the last paragraph of section 4.1.1 as follows:
>+
>+    "While an application-created framebuffer object is bound to
>+    DRAW_FRAMEBUFFER_ANGLE, the pixel ownership test always passes."
>+
>+    Add to 4.3.1 (Reading Pixels), right before the subsection titled
>+    "Obtaining Pixels from the Framebuffer":
>+
>+    "Calling ReadPixels generates INVALID_FRAMEBUFFER_OPERATION if
>+    the object bound to READ_FRAMEBUFFER_BINDING_ANGLE is not "framebuffer
>+    complete" (section 4.4.4.2). GetIntegerv generates an INVALID_OPERATION
>+    error if the object bound to READ_FRAMEBUFFER_BINDING_ANGLE is not
>+    framebuffer complete, or if the GL is using a framebuffer object 
>+    (i.e. READ_FRAMEBUFFER_BINDING_ANGLE is non-zero) and there is no color
>+    attachment."
>+
>+    Insert a new section 4.3.2 titled "Copying Pixels" and renumber the
>+    subsequent sections.  Add the following text:
>+
>+    "BlitFramebufferANGLE transfers a rectangle of pixel values from one
>+    region of the read framebuffer to another in the draw framebuffer.
>+
>+    BlitFramebufferANGLE(int srcX0, int srcY0, int srcX1, int srcY1,
>+                         int dstX0, int dstY0, int dstX1, int dstY1,
>+                         bitfield mask, enum filter);
>+
>+    <mask> is the bitwise OR of a number of values indicating which
>+    buffers are to be copied. The values are COLOR_BUFFER_BIT,
>+    DEPTH_BUFFER_BIT, and STENCIL_BUFFER_BIT, which are described in
>+    section 4.2.3.  The pixels corresponding to these buffers are
>+    copied from the source rectangle, bound by the locations (srcX0,
>+    srcY0) and (srcX1, srcY1), to the destination rectangle, bound by
>+    the locations (dstX0, dstY0) and (dstX1, dstY1).  The lower bounds
>+    of the rectangle are inclusive, while the upper bounds are
>+    exclusive.
>+
>+    The actual region taken from the read framebuffer is limited to the
>+    intersection of the source buffers being transferred, which may include
>+    the color buffer, the depth buffer, and/or the stencil buffer depending on
>+    <mask>. The actual region written to the draw framebuffer is limited to the
>+    intersection of the destination buffers being written, which may include
>+    the color buffer, the depth buffer, and/or the stencil buffer
>+    depending on <mask>. Whether or not the source or destination regions are
>+    altered due to these limits, the offset applied to pixels being transferred
>+    is performed as though no such limits were present.
>+
>+    Stretching and scaling during a copy are not supported. If the source
>+    and destination rectangle dimensions do not match, no copy is
>+    performed and an INVALID_OPERATION error is generated.
>+    Because stretching is not supported, <filter> must be NEAREST and
>+    no filtering is applied. 
>+
>+    Flipping during a copy is not supported. If either the source or 
>+    destination rectangle specifies a negative dimension, the error 
>+    INVALID_OPERATION is generated. If both the source and 
>+    destination rectangles specify a negative dimension for the same 
>+    direction, no reversal is required and the operation is supported.
>+
>+    If the source and destination buffers are identical, and the
>+    source and destination rectangles overlap, the result of the blit
>+    operation is undefined.
>+
>+    The pixel copy bypasses the fragment pipeline.  The only fragment
>+    operations which affect the blit are the pixel ownership test and
>+    the scissor test.
>+
>+    If a buffer is specified in <mask> and does not exist in both the
>+    read and draw framebuffers, the corresponding bit is silently
>+    ignored.
>+
>+    Calling BlitFramebufferANGLE will result in an
>+    INVALID_FRAMEBUFFER_OPERATION error if the objects bound to
>+    DRAW_FRAMEBUFFER_BINDING_ANGLE and READ_FRAMEBUFFER_BINDING_ANGLE are
>+    not "framebuffer complete" (section 4.4.4.2)."
>+
>+    Calling BlitFramebufferANGLE will result in an INVALID_OPERATION
>+    error if <mask> includes COLOR_BUFFER_BIT and the source and 
>+    destination color formats to not match.
>+
>+    Calling BlitFramebufferANGLE will result in an INVALID_OPERATION
>+    error if <mask> includes DEPTH_BUFFER_BIT or STENCIL_BUFFER_BIT
>+    and the source and destination depth and stencil buffer formats do
>+    not match.
>+
>+    If <mask> includes DEPTH_BUFFER_BIT or STENCIL_BUFFER_BIT, only 
>+    complete buffers can be copied.  If the source rectangle does not 
>+    specify the complete source buffer or the destination rectangle 
>+    (after factoring the scissor region, if applicable) does not specify 
>+    the complete destination buffer, an INVALID_OPERATION
>+    error is generated.
>+
>+    Modify the beginning of section 4.4.1 as follows:
>+
>+    "The default framebuffer for rendering and readback operations is
>+    provided by the windowing system.  In addition, named framebuffer
>+    objects can be created and operated upon.  The namespace for
>+    framebuffer objects is the unsigned integers, with zero reserved
>+    by the GL for the default framebuffer.
>+
>+    A framebuffer object is created by binding an unused name to
>+    DRAW_FRAMEBUFFER_ANGLE or READ_FRAMEBUFFER_ANGLE.  The binding is
>+    effected by calling
>+
>+        void BindFramebuffer(enum target, uint framebuffer);
>+
>+    with <target> set to the desired framebuffer target and
>+    <framebuffer> set to the unused name.  The resulting framebuffer
>+    object is a new state vector, comprising one set of the state values
>+    listed in table 6.23 for each attachment point of the
>+    framebuffer, set to the same initial values.  There is one
>+    color attachment point, plus one each
>+    for the depth and stencil attachment points.
>+
>+    BindFramebuffer may also be used to bind an existing
>+    framebuffer object to DRAW_FRAMEBUFFER_ANGLE or
>+    READ_FRAMEBUFFER_ANGLE.  If the bind is successful no change is made
>+    to the state of the bound framebuffer object, and any previous
>+    binding to <target> is broken.
>+
>+    If a framebuffer object is bound to DRAW_FRAMEBUFFER_ANGLE or
>+    READ_FRAMEBUFFER_ANGLE, it becomes the target for rendering or
>+    readback operations, respectively, until it is deleted or another
>+    framebuffer is bound to the corresponding bind point.  Calling
>+    BindFramebuffer with <target> set to FRAMEBUFFER binds the
>+    framebuffer to both DRAW_FRAMEBUFFER_ANGLE and READ_FRAMEBUFFER_ANGLE.
>+
>+    While a framebuffer object is bound, GL operations on the target
>+    to which it is bound affect the images attached to the bound
>+    framebuffer object, and queries of the target to which it is bound
>+    return state from the bound object.  Queries of the values
>+    specified in table 6.20 (Implementation Dependent Pixel Depths)
>+    and table 6.yy (Framebuffer Dependent Values) are
>+    derived from the framebuffer object bound to DRAW_FRAMEBUFFER_ANGLE.
>+
>+    The initial state of DRAW_FRAMEBUFFER_ANGLE and READ_FRAMEBUFFER_ANGLE
>+    refers to the default framebuffer provided by the windowing
>+    system.  In order that access to the default framebuffer is not
>+    lost, it is treated as a framebuffer object with the name of 0.
>+    The default framebuffer is therefore rendered to and read from
>+    while 0 is bound to the corresponding targets.  On some
>+    implementations, the properties of the default framebuffer can
>+    change over time (e.g., in response to windowing system events
>+    such as attaching the context to a new windowing system drawable.)"
>+
>+    Change the description of DeleteFramebuffers as follows:
>+
>+    "<framebuffers> contains <n> names of framebuffer objects to be
>+    deleted.  After a framebuffer object is deleted, it has no
>+    attachments, and its name is again unused.  If a framebuffer that
>+    is currently bound to one or more of the targets
>+    DRAW_FRAMEBUFFER_ANGLE or READ_FRAMEBUFFER_ANGLE is deleted, it is as
>+    though BindFramebuffer had been executed with the corresponding
>+    <target> and <framebuffer> zero.  Unused names in <framebuffers>
>+    are silently ignored, as is the value zero."
>+
>+
>+    In section 4.4.3 (Renderbuffer Objects), modify the first two sentences
>+    of the description of FramebufferRenderbuffer as follows:
>+
>+    "<target> must be DRAW_FRAMEBUFFER_ANGLE, READ_FRAMEBUFFER_ANGLE, or
>+    FRAMEBUFFER.  If <target> is FRAMEBUFFER, it behaves as
>+    though DRAW_FRAMEBUFFER_ANGLE was specified.  The INVALID_OPERATION 
>+    error is generated if the value of the corresponding binding is zero."
>+
>+    In section 4.4.3 (Renderbuffer Objects), modify the first two sentences
>+    of the description of FramebufferTexture2D as follows:
>+
>+    "<target> must be DRAW_FRAMEBUFFER_ANGLE,
>+    READ_FRAMEBUFFER_ANGLE, or FRAMEBUFFER.  If <target> is
>+    FRAMEBUFFER, it behaves as though DRAW_FRAMEBUFFER_ANGLE was
>+    specified.  The INVALID_OPERATION error is generated if the value of the
>+    corresponding binding is zero."
>+
>+    In section 4.4.5 (Framebuffer Completeness), modify the first sentence 
>+    of the description of CheckFramebufferStatus as follows:
>+
>+    "If <target> is not DRAW_FRAMEBUFFER_ANGLE, READ_FRAMEBUFFER_ANGLE or
>+    FRAMEBUFFER, the error INVALID_ENUM is generated.  If <target> is
>+    FRAMEBUFFER, it behaves as though DRAW_FRAMEBUFFER_ANGLE was
>+    specified."
>+
>+    Modify the first sentence of the subsection titled "Effects of Framebuffer
>+    Completeness on Framebuffer Operations" to be:
>+
>+    "Attempting to render to or read from a framebuffer which is not
>+    framebuffer complete will generate an
>+    INVALID_FRAMEBUFFER_OPERATION error."
>+    
>+
>+
>+Additions to Chapter 6 of the OpenGL 1.5 Specification (State and State
>+Requests)
>+
>+    In section 6.1.3, modify the first sentence of the description of
>+    GetFramebufferAttachmentParameteriv as follows:
>+
>+    "<target> must be DRAW_FRAMEBUFFER_ANGLE, READ_FRAMEBUFFER_ANGLE or
>+    FRAMEBUFFER.  If <target> is FRAMEBUFFER, it behaves as
>+    though DRAW_FRAMEBUFFER_ANGLE was specified."
>+
>+    Modify the title of Table 6.23 (Framebuffer State) to be "Framebuffer 
>+    (state per attachment point)". 
>+
>+
>+Dependencies on OES_texture_3D
>+
>+    On an OpenGL ES implementation, in the absense of OES_texture_3D,
>+    omit references to FramebufferTexture3DOES and CopyTexSubImage3DOES.
>+
>+Errors
>+
>+    The error INVALID_FRAMEBUFFER_OPERATION is generated if
>+    BlitFramebufferANGLE is called while the
>+    draw framebuffer is not framebuffer complete.
>+
>+    The error INVALID_FRAMEBUFFER_OPERATION is generated if
>+    BlitFramebufferANGLE, ReadPixels, CopyTex{Sub}Image*, is called while the
>+    read framebuffer is not framebuffer complete.
>+
>+    The error INVALID_OPERATION is generated if GetIntegerv is called
>+    while the read framebuffer is not framebuffer complete, or if there
>+    is no color attachment present on the read framebuffer object.
>+
>+    The error INVALID_VALUE is generated by BlitFramebufferANGLE if
>+    <mask> has any bits set other than those named by
>+    COLOR_BUFFER_BIT, DEPTH_BUFFER_BIT or STENCIL_BUFFER_BIT.
>+
>+    The error INVALID_OPERATION is generated if BlitFramebufferANGLE is
>+    called and <mask> includes DEPTH_BUFFER_BIT or STENCIL_BUFFER_BIT
>+    and the source and destination depth or stencil buffer formats do
>+    not match.
>+
>+    The error INVALID_OPERATION is generated if BlitFramebufferANGLE is 
>+    called and any of the following conditions are true:
>+     - the source and destination rectangle dimensions do not match
>+       (ie scaling or flipping is required).
>+     - <mask> includes COLOR_BUFFER_BIT and the source and destination 
>+       buffer formats do not match.
>+     - <mask> includes DEPTH_BUFFER_BIT or STENCIL_BUFFER_BIT and the
>+       source or destination rectangles do not specify the entire source
>+       or destination buffer (after applying any scissor region).
>+
>+    The error INVALID_ENUM is generated by BlitFramebufferANGLE if
>+    <filter> is not NEAREST.
>+
>+    The error INVALID_ENUM is generated if BindFramebuffer,
>+    CheckFramebufferStatus, FramebufferTexture{2D|3DOES},
>+    FramebufferRenderbuffer, or
>+    GetFramebufferAttachmentParameteriv is called and <target> is
>+    not DRAW_FRAMEBUFFER_ANGLE, READ_FRAMEBUFFER_ANGLE or FRAMEBUFFER.
>+
>+New State
>+
>+    (Add a new table 6.xx, "Framebuffer (state per framebuffer target binding point)")
>+
>+    Get Value                     Type   Get Command   Initial Value    Description               Section
>+    ------------------------------  ----   -----------   --------------   -------------------       ------------
>+    DRAW_FRAMEBUFFER_BINDING_ANGLE   Z+    GetIntegerv   0                framebuffer object bound  4.4.1
>+                                                                          to DRAW_FRAMEBUFFER_ANGLE
>+    READ_FRAMEBUFFER_BINDING_ANGLE   Z+    GetIntegerv   0                framebuffer object        4.4.1
>+                                                                          to READ_FRAMEBUFFER_ANGLE
>+
>+    Remove reference to FRAMEBUFFER_BINDING from Table 6.23.
>+
>+    (Add a new table 6.yy, "Framebuffer Dependent Values") 
>+
>+    Get Value                     Type   Get Command   Initial Value    Description               Section
>+    ----------------------------  ----   -----------   --------------   -------------------       ------------
>+    SAMPLE_BUFFERS                 Z+    GetIntegerv   0                Number of multisample     3.2
>+                                                                        buffers
>+    SAMPLES                        Z+    GetIntegerv   0                Coverage mask size        3.2
>+
>+    Remove the references to SAMPLE_BUFFERS and SAMPLES from Table 6.17.
>+
>+
>+Issues
>+
>+    1) What should we call this extension?
>+  
>+       Resolved: ANGLE_framebuffer_blit.  
>+
>+       This extension is a result of a collaboration between Google and 
>+       TransGaming for the open-source ANGLE project. Typically one would
>+       label a multi-vendor extension as EXT, but EXT_framebuffer_blit 
>+       is already the name for this on Desktop GL.  Additionally this
>+       isn't truely a multi-vendor extension because there is only one
>+       implementation of this.  We'll follow the example of the open-source
>+       MESA project which uses the project name for the vendor suffix.
>+
>+    2) Why is this done as a separate extension instead of just supporting
>+       EXT_framebuffer_blit?
>+
>+       To date, EXT_framebuffer_blit has not had interactions with OpenGL ES
>+       specified and, as far as we know, it has not previously been exposed on 
>+       an ES 1.1 or ES 2.0 implementation. Because there are enough 
>+       differences between Desktop GL and OpenGL ES, and since OpenGL ES 2.0 
>+       has already subsumed the EXT_framebuffer_object functionality (with 
>+       some changes) it was deemed a worthwhile exercise to fully specify the
>+       interactions.  Additionally, some of the choices in exactly which 
>+       functionality is supported by BlitFramebufferANGLE is dictated by
>+       what is reasonable to support on a implementation which is 
>+       layered on Direct3D9.  It is not expected that other implementations 
>+       will necessary have the same set of restrictions or requirements. 
>+
>+    3) How does this extension differ from EXT_framebuffer_blit?
>+
>+       This extension is designed to be a pure subset of the 
>+       EXT_framebuffer_blit functionality as applicable to OpenGL ES 2.0.
>+
>+       Functionality that is unchanged:
>+        - the split DRAW and READ framebuffer attachment points and related sematics.
>+        - the token values for the DRAW/READ_FRAMEBUFFER and DRAW/READ_FRAMBUFFER_BINDING
>+        - the signature of the BlitFramebuffer entry-point.
>+       
>+       Additional restrictions imposed by BlitFramebufferANGLE:
>+        - no color conversions are supported
>+        - no scaling, stretching or flipping are supported
>+        - no filtering is supported (a consequence of no stretching)
>+        - only whole depth and/or stencil buffers can be copied
>+
>+Revision History
>+
>+    Revision 1, 2010/07/06
>+      - copied from revision 15 of EXT_framebuffer_object
>+      - removed language that was clearly not relevant to ES2
>+      - rebased changes against the OpenGL ES 2.0 specification
>+      - added ANGLE-specific restrictions
>+    Revision 2, 2010/07/15
>+      - clarifications of implicit clamping to buffer sizes (from ARB_fbo)
>+      - clarify that D/S restricts apply after the scissor is applied
>+      - improve some error language
>+    Revision 3, 2010/08/06
>+      - add additional contributors, update implementation status
>+    Revision 4, 2012/09/22
>+      - document errors for GetIntegerv.
>+
>diff --git a/Source/ThirdParty/ANGLE/extensions/ANGLE_framebuffer_multisample.txt b/Source/ThirdParty/ANGLE/extensions/ANGLE_framebuffer_multisample.txt
>new file mode 100644
>index 00000000000..cf5e45830cb
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/extensions/ANGLE_framebuffer_multisample.txt
>@@ -0,0 +1,363 @@
>+Name
>+
>+    ANGLE_framebuffer_multisample
>+
>+Name Strings
>+
>+    GL_ANGLE_framebuffer_multisample
>+
>+Contributors
>+
>+    Contributors to EXT_framebuffer_multisample
>+    Daniel Koch, TransGaming Inc.
>+    Shannon Woods, TransGaming Inc.
>+    Kenneth Russell, Google Inc.
>+    Vangelis Kokkevis, Google Inc.
>+
>+Contacts
>+
>+    Daniel Koch, TransGaming Inc. (daniel 'at' transgaming 'dot' com)
>+
>+Status
>+
>+    Implemented in ANGLE ES2
>+
>+Version
>+
>+    Last Modified Date: Aug 6, 2010 
>+    Author Revision: #3
>+
>+Number
>+
>+    OpenGL ES Extension #84
>+
>+Dependencies
>+
>+    Requires OpenGL ES 2.0.
>+
>+    Requires GL_ANGLE_framebuffer_blit (or equivalent functionality).
>+
>+    The extension is written against the OpenGL ES 2.0 specification. 
>+
>+    OES_texture_3D affects the definition of this extension.
>+
>+Overview
>+
>+    This extension extends the framebuffer object framework to
>+    enable multisample rendering.
>+
>+    The new operation RenderbufferStorageMultisampleANGLE() allocates
>+    storage for a renderbuffer object that can be used as a multisample
>+    buffer.  A multisample render buffer image differs from a
>+    single-sample render buffer image in that a multisample image has a
>+    number of SAMPLES that is greater than zero.  No method is provided
>+    for creating multisample texture images.
>+
>+    All of the framebuffer-attachable images attached to a framebuffer
>+    object must have the same number of SAMPLES or else the framebuffer
>+    object is not "framebuffer complete".  If a framebuffer object with
>+    multisample attachments is "framebuffer complete", then the
>+    framebuffer object behaves as if SAMPLE_BUFFERS is one.
>+
>+    The resolve operation is affected by calling 
>+    BlitFramebufferANGLE (provided by the ANGLE_framebuffer_blit
>+    extension) where the source is a multisample application-created
>+    framebuffer object and the destination is a single-sample
>+    framebuffer object (either application-created or window-system
>+    provided).
>+
>+New Procedures and Functions
>+
>+    void RenderbufferStorageMultisampleANGLE(
>+            enum target, sizei samples,
>+            enum internalformat,
>+            sizei width, sizei height);
>+
>+New Types
>+
>+    None.
>+
>+New Tokens
>+
>+    Accepted by the <pname> parameter of GetRenderbufferParameteriv:
>+
>+        RENDERBUFFER_SAMPLES_ANGLE                  0x8CAB
>+
>+    Returned by CheckFramebufferStatus:
>+
>+        FRAMEBUFFER_INCOMPLETE_MULTISAMPLE_ANGLE    0x8D56
>+
>+    Accepted by the <pname> parameter of GetBooleanv, GetIntegerv,
>+    and GetFloatv:
>+
>+        MAX_SAMPLES_ANGLE                           0x8D57
>+
>+Additions to Chapter 2 of the OpenGL ES 2.0 Specification (OpenGL Operation)
>+
>+Additions to Chapter 3 of the OpenGL ES 2.0 Specification (Rasterization)
>+
>+    Add to the last paragraph of 3.7.2 (Alternate Texture Image Specification)
>+    (as modified by ANGLE_framebuffer_blit) the following:
>+
>+    "Calling CopyTexSubImage3DOES, CopyTexImage2D or CopyTexSubImage2D will
>+    result in INVALID_OPERATION being generated if the object bound to
>+    READ_FRAMEBUFFER_BINDING_ANGLE is "framebuffer complete" and the value
>+    of SAMPLE_BUFFERS is greater than zero."
>+
>+Additions to Chapter 4 of the OpenGL ES 2.0 Specification (Per-Fragment
>+Operations and the Framebuffer)
>+
>+    Add to 4.3.1 (Reading Pixels), right before the subsection titled
>+    "Obtaining Pixels from the Framebuffer":
>+
>+    "ReadPixels generates INVALID_OPERATION if READ_FRAMEBUFFER_BINDING_ANGLE
>+    (section 4.4) is non-zero, the read framebuffer is framebuffer
>+    complete, and the value of SAMPLE_BUFFERS for the read framebuffer
>+    is greater than zero."
>+
>+    In 4.3.2 (Copying Pixels), add to the section describing BlitFramebuffer
>+    that was added by ANGLE_framebuffer_blit.
>+
>+    "If SAMPLE_BUFFERS for the read framebuffer is greater than zero and
>+    SAMPLE_BUFFERS for the draw framebuffer is zero, the samples
>+    corresponding to each pixel location in the source are converted to
>+    a single sample before being written to the destination.
>+
>+    If SAMPLE_BUFFERS for the draw framebuffer is greater than zero, 
>+    no copy is performed and an INVALID_OPERATION error is generated.
>+
>+    If SAMPLE_BUFFERS for the read framebuffer is greater than zero and
>+    <mask> includes DEPTH_BUFFER_BIT or STENCIL_BUFFER_BIT, no copy is 
>+    performed and an INVALID_OPERATION error is generated.
>+
>+    If SAMPLE_BUFFERS for the read framebuffer is greater than zero and 
>+    the format of the read and draw framebuffers are not identical, no
>+    copy is performed and an INVALID_OPERATION error is generated.
>+
>+    If SAMPLE_BUFFERS for the read framebuffer is greater than zero, the
>+    dimensions of the source and destination rectangles provided to 
>+    BlitFramebufferANGLE must be identical and must specify the complete 
>+    source and destination buffers, otherwise no copy is performed and 
>+    an INVALID_OPERATION error is generated."
>+
>+    Modification to 4.4.3 (Renderbuffer Objects)
>+
>+    Add, just above the definition of RenderbufferStorage:
>+
>+    "The command
>+
>+        void RenderbufferStorageMultisampleANGLE(
>+            enum target, sizei samples,
>+            enum internalformat,
>+            sizei width, sizei height);
>+
>+    establishes the data storage, format, dimensions, and number of
>+    samples of a renderbuffer object's image.  <target> must be
>+    RENDERBUFFER.  <internalformat> must be one of the color-renderable,
>+    depth-renderable, or stencil-renderable formats described in table 4.5.
>+    <width> and <height> are the dimensions in pixels of the renderbuffer.  If
>+    either <width> or <height> is greater than the value of 
>+    MAX_RENDERBUFFER_SIZE, or if <samples> is greater than MAX_SAMPLES_ANGLE, 
>+    then the error INVALID_VALUE is generated. If OpenGL ES is unable to 
>+    create a data store of the requested size, the error OUT_OF_MEMORY 
>+    is generated.
>+
>+    Upon success, RenderbufferStorageMultisampleANGLE deletes any existing
>+    data store for the renderbuffer image and the contents of the data
>+    store after calling RenderbufferStorageMultisampleANGLE are undefined.
>+    RENDERBUFFER_WIDTH is set to <width>, RENDERBUFFER_HEIGHT is
>+    set to <height>, and RENDERBUFFER_INTERNAL_FORMAT is set to
>+    <internalformat>.
>+
>+    If <samples> is zero, then RENDERBUFFER_SAMPLES_ANGLE is set to zero.
>+    Otherwise <samples> represents a request for a desired minimum
>+    number of samples. Since different implementations may support
>+    different sample counts for multisampled rendering, the actual
>+    number of samples allocated for the renderbuffer image is
>+    implementation dependent.  However, the resulting value for
>+    RENDERBUFFER_SAMPLES_ANGLE is guaranteed to be greater than or equal
>+    to <samples> and no more than the next larger sample count supported
>+    by the implementation.
>+
>+    An OpenGL ES implementation may vary its allocation of internal component
>+    resolution based on any RenderbufferStorageMultisampleANGLE parameter (except
>+    target), but the allocation and chosen internal format must not be a
>+    function of any other state and cannot be changed once they are
>+    established. The actual resolution in bits of each component of the 
>+    allocated image can be queried with GetRenderbufferParameteriv."
>+
>+    Modify the definiton of RenderbufferStorage as follows:
>+
>+    "The command
>+
>+        void RenderbufferStorage(enum target, enum internalformat,
>+                                    sizei width, sizei height);
>+
>+     is equivalent to calling RenderbufferStorageMultisampleANGLE with
>+     <samples> equal to zero."
>+
>+    In section 4.4.5 (Framebuffer Completeness) in the subsection
>+    titled "Framebuffer Completeness" add an entry to the bullet list:
>+
>+    * The value of RENDERBUFFER_SAMPLES_ANGLE is the same for all attached
>+      images.
>+      { FRAMEBUFFER_INCOMPLETE_MULTISAMPLE_ANGLE }
>+
>+    Also add a paragraph to the end of the section after the definition
>+    of CheckFramebufferStatus:
>+
>+    "The values of SAMPLE_BUFFERS and SAMPLES are derived from the
>+    attachments of the currently bound framebuffer object.  If the
>+    current DRAW_FRAMEBUFFER_BINDING_ANGLE is not "framebuffer complete",
>+    then both SAMPLE_BUFFERS and SAMPLES are undefined.  Otherwise,
>+    SAMPLES is equal to the value of RENDERBUFFER_SAMPLES_ANGLE for the
>+    attached images (which all must have the same value for
>+    RENDERBUFFER_SAMPLES_ANGLE).  Further, SAMPLE_BUFFERS is one if
>+    SAMPLES is non-zero.  Otherwise, SAMPLE_BUFFERS is zero.
>+
>+Additions to Chapter 5 of the OpenGL ES 2.0 Specification (Special Functions)
>+
>+
>+Additions to Chapter 6 of the OpenGL ES 2.0 Specification (State and State
>+Requests)
>+
>+    In section 6.1.3 (Enumeraged Queries), modify the third paragraph 
>+    of the description of GetRenderbufferParameteriv as follows:
>+
>+    "Upon successful return from GetRenderbufferParameteriv, if
>+    <pname> is RENDERBUFFER_WIDTH, RENDERBUFFER_HEIGHT,
>+    RENDERBUFFER_INTERNAL_FORMAT, or RENDERBUFFER_SAMPLES_ANGLE, then <params> 
>+    will contain the width in pixels, height in pixels, internal format, or 
>+    number of samples, respectively, of the image of the renderbuffer 
>+    currently bound to <target>."
>+
>+
>+Dependencies on ANGLE_framebuffer_blit    
>+
>+    ANGLE_framebuffer_blit is required.  Technically, ANGLE_framebuffer_blit
>+    would not be required to support multisampled rendering, except for
>+    the fact that it provides the only method of doing a multisample
>+    resovle from a multisample renderbuffer.
>+
>+Dependencies on OES_texture_3D
>+
>+    On an OpenGL ES implementation, in the absense of OES_texture_3D,
>+    omit references to CopyTexSubImage3DOES.
>+
>+Errors
>+
>+    The error INVALID_OPERATION is generated if ReadPixels or 
>+    CopyTex{Sub}Image* is called while READ_FRAMEBUFFER_BINDING_ANGLE
>+    is non-zero, the read framebuffer is framebuffer complete, and the
>+    value of SAMPLE_BUFFERS for the read framebuffer is greater than
>+    zero.
>+
>+    If both the draw and read framebuffers are framebuffer complete and
>+    the draw framebuffer has a value of SAMPLE_BUFFERS that is greater 
>+    than zero, then the error INVALID_OPERATION is generated if 
>+    BlitFramebufferANGLE is called.
>+
>+    If both the draw and read framebuffers are framebuffer complete and
>+    the read framebuffer has a value of SAMPLE_BUFFERS that is greater
>+    than zero, the error INVALID_OPERATION is generated if 
>+    BlitFramebufferANGLE is called and any of the following conditions
>+    are true:
>+     - <mask> includes DEPTH_BUFFER_BIT or STENCIL_BUFFER_BIT.
>+     - the source or destination rectangles do not specify the entire
>+       source or destination buffer.
>+
>+    If both the draw and read framebuffers are framebuffer complete and
>+    either has a value of SAMPLE_BUFFERS that is greater than zero, then
>+    the error INVALID_OPERATION is generated if BlitFramebufferANGLE is
>+    called and the formats of the draw and read framebuffers are not
>+    identical.
>+
>+    If either the draw or read framebuffer is framebuffer complete and
>+    has a value of SAMPLE_BUFFERS that is greater than zero, then the
>+    error INVALID_OPERATION is generated if BlitFramebufferANGLE is called
>+    and the specified source and destination dimensions are not
>+    identical.
>+
>+    If RenderbufferStorageMultisampleANGLE is called with <target> not
>+    equal to RENDERBUFFER, the error INVALID_ENUM is generated.
>+
>+    If RenderbufferStorageMultisampleANGLE is called with an 
>+    <internalformat> that is not listed as one of the color-, depth- 
>+    or stencil-renderable formats in Table 4.5, then the error
>+    INVALID_ENUM is generated.
>+
>+    If RenderbufferStorageMultisampleANGLE is called with <width> or 
>+    <height> greater than MAX_RENDERBUFFER_SIZE, then the error 
>+    INVALID_VALUE is generated.
>+
>+    If RenderbufferStorageMultisampleANGLE is called with a value of
>+    <samples> that is greater than MAX_SAMPLES_ANGLE or less than zero,
>+    then the error INVALID_VALUE is generated.
>+
>+    The error OUT_OF_MEMORY is generated when
>+    RenderbufferStorageMultisampleANGLE cannot create storage of the
>+    specified size.
>+
>+New State
>+
>+    Add to table 6.22 (Renderbuffer State)
>+
>+    Get Value                          Type    Get Command                 Initial Value  Description             Section
>+    -------------------------------    ------  --------------------------  -------------  --------------------    -------
>+    RENDERBUFFER_SAMPLES_ANGLE         Z+      GetRenderbufferParameteriv  0              number of samples       4.4.3
>+
>+
>+    Add to table 6.yy (Framebuffer Dependent Vaues) (added by 
>+    ANGLE_framebuffer_blit), the following new framebuffer dependent state.
>+
>+    Get Value          Type  Get Command     Minimum Value    Description             Section
>+    -----------------  ----  -----------     -------------    -------------------     -------
>+    MAX_SAMPLES_ANGLE  Z+    GetIntegerv     1                Maximum number of       4.4.3
>+                                                              samples supported
>+                                                              for multisampling
>+                                                            
>+
>+
>+Issues
>+    
>+    Issues from EXT_framebuffer_multisample have been removed.
>+ 
>+    1) What should we call this extension?
>+
>+       Resolved: ANGLE_framebuffer_blit.  
>+
>+       This extension is a result of a collaboration between Google and 
>+       TransGaming for the open-source ANGLE project. Typically one would
>+       label a multi-vendor extension as EXT, but EXT_framebuffer_mulitsample 
>+       is already the name for this on Desktop GL.  Additionally this
>+       isn't truely a multi-vendor extension because there is only one
>+       implementation of this.  We'll follow the example of the open-source
>+       MESA project which uses the project name for the vendor suffix.
>+ 
>+    2) How does this extension differ from EXT_framebuffer_multisample?
>+
>+       This is designed to be a proper subset of EXT_framebuffer_multisample
>+       functionality as applicable to OpenGL ES 2.0.
>+
>+       Functionality that is unchanged: 
>+        - creation of multisample renderbuffers.
>+        - whole buffer multi-sample->single-sample resolve.
>+        - no format conversions, stretching or flipping supported on multisample blits.
>+
>+       Additional restrictions on BlitFramebufferANGLE:
>+        - multisample resolve is only supported on color buffers.
>+        - no blits to multisample destinations (no single->multi or multi-multi).
>+        - only entire buffers can be resolved.
>+         
>+Revision History
>+
>+    Revision 1, 2010/07/08
>+      - copied from revision 7 of EXT_framebuffer_multisample
>+      - removed language that was not relevant to ES2 
>+      - rebase changes against the Open GL ES 2.0 specification
>+      - added ANGLE-specific restrictions
>+    Revision 2, 2010/07/19
>+      - fix missing error code
>+    Revision 3, 2010/08/06
>+      - add additional contributors, update implementation status
>+      - disallow negative samples 
>diff --git a/Source/ThirdParty/ANGLE/extensions/ANGLE_instanced_arrays.txt b/Source/ThirdParty/ANGLE/extensions/ANGLE_instanced_arrays.txt
>new file mode 100644
>index 00000000000..69d11504536
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/extensions/ANGLE_instanced_arrays.txt
>@@ -0,0 +1,359 @@
>+Name
>+
>+    ANGLE_instanced_arrays
>+
>+Name Strings
>+
>+    GL_ANGLE_instanced_arrays
>+
>+Contributors
>+
>+    Contributors to ARB_instanced_arrays
>+    Nicolas Capens, TransGaming Inc.
>+    James Helferty, TransGaming Inc.
>+    Kenneth Russell, Google Inc.
>+    Vangelis Kokkevis, Google Inc.
>+
>+Contact
>+
>+    Daniel Koch, TransGaming Inc. (daniel 'at' transgaming.com)
>+
>+Status
>+
>+    Implemented in ANGLE r976.
>+
>+Version
>+
>+    Last Modified Date: February 8, 2012
>+    Author Revision: 3
>+
>+Number
>+
>+    OpenGL ES Extension #109
>+
>+Dependencies
>+
>+    OpenGL ES 2.0 is required.
>+
>+    This extension is written against the OpenGL ES 2.0 Specification.
>+
>+Overview
>+
>+    A common use case in GL for some applications is to be able to
>+    draw the same object, or groups of similar objects that share
>+    vertex data, primitive count and type, multiple times.  This 
>+    extension provides a means of accelerating such use cases while 
>+    restricting the number of API calls, and keeping the amount of 
>+    duplicate data to a minimum.
>+    
>+    This extension introduces an array "divisor" for generic
>+    vertex array attributes, which when non-zero specifies that the
>+    attribute is "instanced."  An instanced attribute does not
>+    advance per-vertex as usual, but rather after every <divisor>
>+    conceptual draw calls.
>+    
>+    (Attributes which aren't instanced are repeated in their entirety
>+    for every conceptual draw call.)
>+    
>+    By specifying transform data in an instanced attribute or series
>+    of instanced attributes, vertex shaders can, in concert with the 
>+    instancing draw calls, draw multiple instances of an object with 
>+    one draw call.
>+
>+IP Status
>+
>+    No known IP claims.
>+
>+New Tokens
>+
>+    Accepted by the <pname> parameters of GetVertexAttribfv and 
>+    GetVertexAttribiv:
>+
>+        VERTEX_ATTRIB_ARRAY_DIVISOR_ANGLE               0x88FE
>+
>+New Procedures and Functions
>+
>+    void DrawArraysInstancedANGLE(enum mode, int first, sizei count,
>+            sizei primcount);
>+
>+    void DrawElementsInstancedANGLE(enum mode, sizei count, enum type,
>+            const void *indices, sizei primcount);
>+
>+    void VertexAttribDivisorANGLE(uint index, uint divisor);
>+
>+Additions to Chapter 2 of the OpenGL ES 2.0 Specification
>+(OpenGL ES Operation)
>+
>+    Modify section 2.8 (Vertex Arrays), p. 21
>+
>+    After description of EnableVertexAttribArray / DisableVertexAttribArray
>+    add the following:
>+
>+    "The command
>+
>+        void VertexAttribDivisorANGLE(uint index, uint divisor);
>+
>+    modifies the rate at which generic vertex attributes advance when
>+    rendering multiple instances of primitives in a single draw call
>+    (see DrawArraysInstancedANGLE and DrawElementsInstancedANGLE below).
>+    If <divisor> is zero, the attribute at slot <index> advances once
>+    per vertex.  If <divisor> is non-zero, the attribute advances once
>+    per <divisor> instances of the primitives being rendered.
>+    An attribute is referred to as "instanced" if its <divisor> value is
>+    non-zero."
>+
>+    Replace the text describing DrawArrays and DrawElements in the
>+    "Transferring Array Elements" subsection of 2.8, from the second paragraph
>+    through the end of the section with the following:
>+
>+    "The command
>+
>+        void DrawArraysOneInstance( enum mode, int first, sizei count, int instance );
>+
>+    does not exist in the GL, but is used to describe functionality in
>+    the rest of this section.  This function constructs a sequence of
>+    geometric primitives by transferring elements <first> through <first> +
>+    <count> - 1 of each enabled non-instanced array to the GL. <mode>
>+    specifies what kind of primitives are constructed, as defined in section
>+    2.6.1.
>+
>+    If an enabled vertex attribute array is instanced (it has a non-zero
>+    attribute <divisor> as specified by VertexAttribDivisorANGLE), the element
>+    that is transferred to the GL is given by:
>+
>+        floor( <instance> / <divisor> ).
>+
>+    If an array corresponding to a generic attribute required by a vertex shader
>+    is not enabled, then the corresponding element is taken from the current
>+    generic attribute state (see section 2.7).
>+
>+    If an array corresponding to a generic attribute required by a vertex shader
>+    is enabled, the corresponding current generic attribute value is unaffected 
>+    by the execution of DrawArraysOneInstance.
>+
>+    Specifying <first> < 0 results in undefined behavior. Generating the error 
>+    INVALID_VALUE is recommended in this case.
>+
>+    The command
>+
>+        void DrawArrays( enum mode, int first, sizei count );
>+
>+    is equivalent to the command sequence
>+    
>+        DrawArraysOneInstance(mode, first, count, 0);
>+
>+    The command
>+
>+        void DrawArraysInstancedANGLE(enum mode, int first, sizei count,
>+                sizei primcount);
>+
>+    behaves identically to DrawArrays except that <primcount>
>+    instances of the range of elements are executed, and the
>+    <instance> advances for each iteration. Instanced attributes that
>+    have <divisor> N, (where N > 0, as specified by
>+    VertexAttribDivisorANGLE) advance once every N instances.
>+    
>+    It has the same effect as: 
>+
>+        if (mode, count, or primcount is invalid)
>+            generate appropriate error
>+        else {
>+            for (i = 0; i < primcount; i++) {
>+                DrawArraysOneInstance(mode, first, count, i);
>+            }
>+        }
>+
>+    The command
>+
>+       void DrawElementsOneInstance( enum mode, sizei count, enum type,
>+            void *indices, int instance );
>+
>+    does not exist in the GL, but is used to describe functionality in
>+    the rest of this section.  This command constructs a sequence of
>+    geometric primitives by successively transferring the <count> elements
>+    whose indices are stored in the currently bound element array buffer
>+    (see section 2.9.2) at the offset defined by <indices> to the GL.
>+    The <i>-th element transferred by DrawElementsOneInstance will be taken
>+    from element <indices>[i] of each enabled non-instanced array.
>+    <type> must be one of UNSIGNED_BYTE, UNSIGNED_SHORT, or UNSIGNED_INT, 
>+    indicating that the index values are of GL type ubyte, ushort, or uint
>+    respectively. <mode> specifies what kind of primitives are constructed,
>+    as defined in section 2.6.1.
>+
>+    If an enabled vertex attribute array is instanced (it has a non-zero
>+    attribute <divisor> as specified by VertexAttribDivisorANGLE), the element
>+    that is transferred to the GL is given by:
>+
>+        floor( <instance> / <divisor> );
>+
>+    If an array corresponding to a generic attribute required by a vertex
>+    shader is not enabled, then the corresponding element is taken from the 
>+    current generic attribute state (see section 2.7). Otherwise, if an array
>+    is enabled, the corresponding current generic attribute value is 
>+    unaffected by the execution of DrawElementsOneInstance.
>+
>+    The command
>+
>+        void DrawElements( enum mode, sizei count, enum type,
>+             const void *indices);
>+
>+    behaves identically to DrawElementsOneInstance with the <instance> 
>+    parameter set to zero; the effect of calling
>+
>+        DrawElements(mode, count, type, indices);
>+
>+    is equivalent to the command sequence:
>+
>+       if (mode, count or type is invalid )
>+            generate appropriate error
>+        else
>+            DrawElementsOneInstance(mode, count, type, indices, 0);
>+
>+    The command
>+
>+        void DrawElementsInstancedANGLE(enum mode, sizei count, enum type,
>+                const void *indices, sizei primcount);
>+
>+    behaves identically to DrawElements except that <primcount>
>+    instances of the set of elements are executed and the instance
>+    advances between each set. Instanced attributes are advanced as they do
>+    during the execution of DrawArraysInstancedANGLE. It has the same effect as:
>+
>+        if (mode, count, primcount, or type is invalid )
>+            generate appropriate error
>+        else {
>+            for (int i = 0; i < primcount; i++) {
>+                DrawElementsOneInstance(mode, count, type, indices, i);
>+            }
>+        }
>+
>+    If the number of supported generic vertex attributes (the value of 
>+    MAX_VERTEX_ATTRIBS) is <n>, then the client state required to implement
>+    vertex arrays consists of <n> boolean values, <n> memory pointers, <n>
>+    integer stride values, <n> symbolic constants representing array types,
>+    <n> integers representing values per element, <n> boolean values 
>+    indicating normalization, and <n> integers representing vertex attribute
>+    divisors. 
>+
>+    In the initial state, the boolean values are each false, the memory
>+    pointers are each NULL, the strides are each zero, the array types are 
>+    each FLOAT, the integers representing values per element are each four,
>+    and the divisors are each zero."
>+
>+Additions to Chapter 3 of the OpenGL ES 2.0 Specification (Rasterization)
>+
>+    None
>+
>+Additions to Chapter 4 of the OpenGL ES 2.0 Specification (Per-Fragment
>+Operations and the Framebuffer)
>+
>+    None
>+
>+Additions to Chapter 5 of the OpenGL ES 2.0 Specification (Special Functions)
>+
>+    None
>+
>+Additions to Chapter 6 of the OpenGL ES 2.0 Specification (State and State
>+Requests)
>+
>+    In section 6.1.8, add VERTEX_ATTRIB_ARRAY_DIVISOR_ANGLE to the list of 
>+    pnames accepted by GetVertexAttribfv and GetVertexAttribiv.
>+
>+Additions to the AGL/EGL/GLX/WGL Specifications
>+
>+    None
>+
>+Dependencies on OES_element_index_uint
>+
>+    If OES_element_index_uint is not supported, removed all references
>+    to UNSIGNED_INT indices and the associated GL data type uint in 
>+    the description of DrawElementsOneInstance.
>+
>+Errors
>+
>+    INVALID_VALUE is generated by VertexAttribDivisorANGLE if <index>
>+    is greater than or equal to MAX_VERTEX_ATTRIBS.
>+
>+    INVALID_ENUM is generated by DrawElementsInstancedANGLE if <type> is
>+    not one of UNSIGNED_BYTE, UNSIGNED_SHORT or UNSIGNED_INT.
>+
>+    INVALID_VALUE is generated by DrawArraysInstancedANGLE if <first>,
>+    <count>, or <primcount> is less than zero.
>+
>+    INVALID_ENUM is generated by DrawArraysInstancedANGLE or 
>+    DrawElementsInstancedANGLE if <mode> is not one of the modes described in
>+    section 2.6.1.
>+
>+    INVALID_VALUE is generated by DrawElementsInstancedANGLE if <count> or
>+    <primcount> is less than zero.
>+
>+    INVALID_OPERATION is generated by DrawArraysInstancedANGLE or 
>+    DrawElementsInstancedANGLE if there is not at least one enabled
>+    vertex attribute array that has a <divisor> of zero and is bound to an
>+    active generic attribute value in the program used for the draw command.
>+
>+New State
>+
>+    Changes to table 6.7, p. 268 (Vertex Array Data)
>+
>+                                                               Initial
>+    Get Value                          Type   Get Command      Value    Description       Sec.  
>+    ---------                          -----  -----------      -------  -----------       ----
>+    VERTEX_ATTRIB_ARRAY_DIVISOR_ANGLE  8*xZ+  GetVertexAttrib  0        Instance Divisor  2.8
>+
>+Issues
>+
>+    1) Should vertex attribute zero be instance-able?
>+
>+       Resolved: Yes. 
>+       Discussion: In Direct3D 9 stream 0 must be specified as indexed data
>+       and it cannot be instanced. In ANGLE we can work around this by
>+       remapping any other stream that does have indexed data (ie a zero
>+       attribute divisor) to stream 0 in D3D9. This works because the HLSL
>+       vertex shader matches attributes against the stream by using the 
>+       shader semantic index.
>+
>+    2) Can all vertex attributes be instanced simultaneously?
>+
>+       Resolved: No
>+       Discussion: In rare cases it is possible for no attribute to have a 
>+       divisor of 0, meaning that all attributes are instanced and none of
>+       them are regularly indexed. This in turn means each instance can only
>+       have a single position element, and so it only actually renders
>+       something when rendering point primitives. This is not a very 
>+       meaningful way of using instancing (which is likely why D3D restricts
>+       stream 0 to be indexed regularly for position data in the first place).
>+       We could implement it by drawing these points one at a time (essentially
>+       emulating instancing), but it would not be very efficient and there
>+       seems to be little-to-no value in doing so.
>+
>+       If all of the enabled vertex attribute arrays that are bound to active
>+       generic attributes in the program have a non-zero divisor, the draw
>+       call should return INVALID_OPERATION.
>+
>+    3) Direct3D 9 only supports instancing for DrawIndexedPrimitive which
>+       corresponds to DrawElementsInstanced.  Should we support 
>+       DrawArraysInstanced?
>+
>+       Resolved: Yes
>+       Discussion: This can be supported easily enough by simply manufacturing
>+       a linear index buffer of sufficient size and using that to do indexed
>+       D3D9 drawing.
>+
>+    4) How much data is needed in a buffer for an instanced attribute?
>+
>+       Resolved: Where stride is the value passed to VertexAttribPointer:
>+
>+       if stride > 0
>+         size = stride * ceil(primcount / divisor);
>+       else
>+         size = elementsize * ceil(primcount / divisor);
>+
>+Revision History
>+
>+    #3 February 8, 2012 dgkoch
>+       - clarify Issue 3 and the error condition for no indexed attributes
>+    #2 January 24, 2012 dgkoch
>+       - fix typos, add clarifications, and more errors
>+    #1 January 17, 2012 dgkoch
>+       - initial GLES2 version from ARB_instanced_arrays
>diff --git a/Source/ThirdParty/ANGLE/extensions/ANGLE_lossy_etc_decode.txt b/Source/ThirdParty/ANGLE/extensions/ANGLE_lossy_etc_decode.txt
>new file mode 100644
>index 00000000000..14881922e04
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/extensions/ANGLE_lossy_etc_decode.txt
>@@ -0,0 +1,159 @@
>+Name
>+
>+    ANGLE_lossy_etc_decode
>+
>+Name Strings
>+
>+    GL_ANGLE_lossy_etc_decode
>+
>+Contributors
>+
>+    Minmin Gong  (mgong 'at' microsoft.com)
>+
>+Contacts
>+
>+    Minmin Gong  (mgong 'at' microsoft.com)
>+
>+Status
>+
>+    Draft
>+
>+Version
>+
>+    Last Modified Date: Nov 25, 2015
>+    Author Revision: 1
>+
>+Number
>+
>+    TBD
>+
>+Dependencies
>+
>+    Requires OpenGL ES 3.0 for ETC2 and EAC formats, or OpenGL ES 2.0 and
>+    OES_compressed_ETC1_RGB8_texture for ETC1 format.
>+    The extension is written against the OpenGL ES 2.0 specification.
>+
>+Overview
>+
>+    Both the OpenGL ES 3.0 specification and OES_compressed_ETC1_RGB8_texture
>+    specify that Ericsson Texture Compression (ETC) decoding must not be lossy.
>+    The goal of this extension is to allow a lossy decode of
>+    compressed textures in the ETC formats in OpenGL ES, for lower memory
>+    and bandwidth consumption.
>+
>+    This extension uses the same ETC compression format as OpenGL ES 3.0
>+    and OES_compressed_ETC1_RGB8_texture, with the restriction that the texture
>+    dimensions must be a multiple of four (except for mip levels where the
>+    dimensions are either 2 or 1). And the requirement that ETC decoding must
>+    not be lossy is relaxed.
>+
>+    See OES_compressed_ETC1_RGB8_texture for a description of the ETC1 format.
>+    Also see OpenGL ES 3.0 specification appendix C.2 (ETC Compressed Texture
>+    ImageFormats) for a description of ETC2 and EAC formats.
>+
>+IP Status
>+
>+    See Ericsson's "IP Statement"
>+
>+New Procedures and Functions
>+
>+    None.
>+
>+New Types
>+
>+    None.
>+
>+New Tokens
>+
>+    Accepted by the <internalformat> parameter of CompressedTexImage2D
>+    and the <format> parameter of CompressedTexSubImage2D:
>+
>+    ETC1_RGB8_LOSSY_DECODE_ANGLE                                  0x9690
>+    COMPRESSED_R11_LOSSY_DECODE_EAC_ANGLE                         0x9691
>+    COMPRESSED_SIGNED_R11_LOSSY_DECODE_EAC_ANGLE                  0x9692
>+    COMPRESSED_RG11_LOSSY_DECODE_EAC_ANGLE                        0x9693
>+    COMPRESSED_SIGNED_RG11_LOSSY_DECODE_EAC_ANGLE                 0x9694
>+    COMPRESSED_RGB8_LOSSY_DECODE_ETC2_ANGLE                       0x9695
>+    COMPRESSED_SRGB8_LOSSY_DECODE_ETC2_ANGLE                      0x9696
>+    COMPRESSED_RGB8_PUNCHTHROUGH_ALPHA1_LOSSY_DECODE_ETC2_ANGLE   0x9697
>+    COMPRESSED_SRGB8_PUNCHTHROUGH_ALPHA1_LOSSY_DECODE_ETC2_ANGLE  0x9698
>+    COMPRESSED_RGBA8_LOSSY_DECODE_ETC2_EAC_ANGLE                  0x9699
>+    COMPRESSED_SRGB8_ALPHA8_LOSSY_DECODE_ETC2_EAC_ANGLE           0x969A
>+
>+Additions to Chapter 3 of the OpenGL ES 2.0 Specification (Rasterization)
>+
>+    Add the following to Section 3.7.3 (Compressed Texture Images)
>+    (at the end of the description of the CompressedTexImage2D command):
>+
>+    Compressed Internal Format                                    Base Internal Format
>+    ==========================                                    ====================
>+    ETC1_RGB8_LOSSY_DECODE_ANGLE                                  RGB
>+    COMPRESSED_R11_LOSSY_DECODE_EAC_ANGLE                         R
>+    COMPRESSED_SIGNED_R11_LOSSY_DECODE_EAC_ANGLE                  R
>+    COMPRESSED_RG11_LOSSY_DECODE_EAC_ANGLE                        RG
>+    COMPRESSED_SIGNED_RG11_LOSSY_DECODE_EAC_ANGLE                 RG
>+    COMPRESSED_RGB8_LOSSY_DECODE_ETC2_ANGLE                       RGB
>+    COMPRESSED_SRGB8_LOSSY_DECODE_ETC2_ANGLE                      RGB
>+    COMPRESSED_RGB8_PUNCHTHROUGH_ALPHA1_LOSSY_DECODE_ETC2_ANGLE   RGBA
>+    COMPRESSED_SRGB8_PUNCHTHROUGH_ALPHA1_LOSSY_DECODE_ETC2_ANGLE  RGBA
>+    COMPRESSED_RGBA8_LOSSY_DECODE_ETC2_EAC_ANGLE                  RGBA
>+    COMPRESSED_SRGB8_ALPHA8_LOSSY_DECODE_ETC2_EAC_ANGLE           RGBA
>+
>+    Table 3.x: Specific Compressed Internal Formats
>+
>+    If <internalformat> is one of the ETC lossy decode formats listed in
>+    Table 3.x, the compressed texture is stored in an unspecified compressed
>+    texture format, that may introduce losses of precision in the texture data.
>+    The GL and the ETC texture compression algorithm support only 2D images
>+    without borders.
>+
>+    CompressedTexImage2D will produce the INVALID_OPERATION error when
>+    <internalformat> is one of the lossy decode ETC-format values from
>+    Table 3.x under the following conditions:
>+
>+      * <border> is non-zero.
>+      * <width> is not one, two, nor a multiple of four.
>+      * <height> is not one, two, nor a multiple of four.
>+
>+    Add the following to Section 3.7.3 (Compressed Texture Images)
>+    (at the end of the description of the CompressedTexSubImage2D command):
>+
>+    If the internal format of the texture image being modified is an ETC-format
>+    listed in Table 3.x, the compressed texture is stored in an unspecified
>+    compressed texture format. The xoffset and yoffset must also be aligned to
>+    4x4 texel block boundaries, since ETC encoding makes it difficult to modify
>+    non-aligned regions. CompressedTexSubImage2D will result in an
>+    INVALID_OPERATION error only if one of the following conditions occurs:
>+
>+      * <width> is not a multiple of four nor equal to TEXTURE_WIDTH.
>+      * <height> is not a multiple of four nor equal to TEXTURE_HEIGHT.
>+      * <xoffset> or <yoffset> is not a multiple of four.
>+      * <format> does not match the internal format of the texture image
>+        being modified.
>+
>+Errors
>+
>+    INVALID_OPERATION is generated by CompressedTexImage2D if
>+    lossy decode ETC-format is used and <internalformat> is one of the
>+    compressed internal formats from Table 3.x and any of the following apply:
>+      - <border> is not equal to zero.
>+      - <width> is not one, two, nor a multiple of four.
>+      - <height> is not one, two, nor a multiple of four.
>+
>+    INVALID_OPERATION is generated by CompressedTexSubImage2D if
>+    lossy decode ETC-format is used and <format> is one of the compressed
>+    interal formats from Table 3.x and any of the following apply:
>+      - <width> is not a multiple of four nor equal to TEXTURE_WIDTH;
>+      - <height> is not a multiple of four nor equal to TEXTURE_HEIGHT;
>+      - <xoffset> or <yoffset> is not a multiple of four;
>+      - <format> does not match the internal format of the texture image
>+      being modified.
>+
>+New State
>+
>+    None.
>+
>+Revision History
>+
>+    Revision 1, 2015/11/25 - mgong
>+      - Initial revision
>diff --git a/Source/ThirdParty/ANGLE/extensions/ANGLE_memory_size.txt b/Source/ThirdParty/ANGLE/extensions/ANGLE_memory_size.txt
>new file mode 100644
>index 00000000000..d6e824ebfc2
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/extensions/ANGLE_memory_size.txt
>@@ -0,0 +1,128 @@
>+Name
>+
>+    ANGLE_memory_size
>+
>+Name Strings
>+
>+    GL_ANGLE_memory_size
>+
>+Contributors
>+
>+    Geoff Lang
>+
>+Contact
>+
>+    Geoff Lang (geofflang 'at' google.com)
>+
>+Notice
>+
>+    Copyright (c) 2018 The Khronos Group Inc. Copyright terms at
>+        http://www.khronos.org/registry/speccopyright.html
>+
>+Status
>+
>+    Draft
>+
>+Version
>+
>+    Version 1, November 1, 2018
>+
>+Number
>+
>+    OpenGL ES Extension #??
>+
>+Dependencies
>+
>+    Requires OpenGL ES 2.0
>+
>+    Written against the OpenGL ES 3.1 specification.
>+
>+Overview
>+
>+    This extension allows the user to query the estimated memory internally
>+    allocated for an OpenGL resource. This information can be useful for
>+    determining which resources should be deleted under memory pressure.
>+
>+New Procedures and Functions
>+
>+    None
>+
>+New Tokens
>+
>+    Accepted by the <name> parameter of GetTexParameter*,
>+    GetTexLevelParameter*, GetBufferParameter* and GetRenderbufferParameter*
>+    functions:
>+
>+        GL_MEMORY_SIZE_ANGLE              0x93AD
>+
>+Additions to the OpenGL ES 3.1 Specification
>+
>+    Add an entry to Table 6.2, Buffer object parameters and their values:
>+
>+    Name              Type  Initial Value Legal Values
>+    ----------------- ----- ------------- ------------------------
>+    MEMORY_SIZE_ANGLE int64 0             any non-negative integer
>+
>+    Change the last sentence of the first paragraph of section 8.10.2,
>+    Texture Parameter Queries:
>+
>+    - pname must be IMAGE_FORMAT_COMPATIBILITY_TYPE, TEXTURE_-
>+    - IMMUTABLE_FORMAT, TEXTURE_IMMUTABLE_LEVELS, or one of the symbolic
>+    - values in table 8.20.
>+    + pname must be IMAGE_FORMAT_COMPATIBILITY_TYPE, TEXTURE_-
>+    + IMMUTABLE_FORMAT, TEXTURE_IMMUTABLE_LEVELS, MEMORY_SIZE_ANGLE,
>+    + or one of the symbolic values in table 8.20.
>+
>+    Add to the end of the fifth paragraph of section 8.10.3, Texture Level
>+    Parameter Queries:
>+
>+    + queries of pname MEMORY_SIZE_ANGLE return the estimated number of bytes
>+    + allocated for level of the texture bound to target.
>+
>+    Add a new paragraph after paragraph 3 in section 9.2.6, Renderbuffer
>+    Object Queries:
>+
>+    If pname is MEMORY_SIZE_ANGLE, then params will contain the esimated
>+    number of bytes allocated for the renderbuffer bound to target.
>+
>+New State
>+
>+    Add to Table 20.4: Buffer Object State
>+
>+    Get value           Type Get Cmd                Min Value Description               Sec.
>+    ------------------- ---- ---------------------  --------- ------------------------- ----
>+    MEMORY_SIZE_ANGLE   Z+   GetBufferParameter64v  -         Estimated bytes allocated 6
>+
>+    Add to Table 20.9: Textures (state per texture object)
>+
>+    Get value           Type Get Cmd               Min Value Description               Sec.
>+    ------------------- ---- --------------------  --------- ------------------------- -----
>+    MEMORY_SIZE_ANGLE   Z+   GetTexParameter       -         Estimated bytes allocated 6.1.3
>+                             GetTexLevelParameter
>+
>+    Add to Table 20.16: Renderbuffer (state per renderbuffer object)
>+
>+    Get value           Type Get Cmd                     Min Value Description               Sec.
>+    ------------------- ---- --------------------------  --------- ------------------------- -----
>+    MEMORY_SIZE_ANGLE   Z+   GetRenderbufferParameteriv  -         Estimated bytes allocated 9.2.6
>+
>+
>+Interactions with the OpenGL ES 2.0 and 3.0 specifications:
>+
>+    Remove all references to GetTexLevelParameter and replace references to
>+    GetBufferParameter64v with GetBufferParameteriv.
>+
>+Issues
>+
>+    (1) Could the estimated number of bytes be specified more tightly to an
>+        upper or lower bound?
>+
>+        RESOLVED: Implementations should attempt to return the lower bound on
>+        the allocated memory if exact numbers are not known. The lower bound is
>+        the most actionable value for making decisions when caching.
>+
>+Revision History
>+
>+    Rev.    Date         Author     Changes
>+    ----  -------------  ---------  ----------------------------------------
>+      1    Nov 1, 2018   geofflang  Initial version
>diff --git a/Source/ThirdParty/ANGLE/extensions/ANGLE_multi_draw.txt b/Source/ThirdParty/ANGLE/extensions/ANGLE_multi_draw.txt
>new file mode 100644
>index 00000000000..b0ab240130b
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/extensions/ANGLE_multi_draw.txt
>@@ -0,0 +1,232 @@
>+Name
>+
>+    ANGLE_multi_draw
>+
>+Name Strings
>+
>+    GL_ANGLE_multi_draw
>+
>+Contributors
>+
>+    Austin Eng, Google Inc.
>+    Kai Ninomiya, Google Inc.
>+    Kenneth Russell, Google Inc.
>+    Contributors to the EXT_multi_draw_arrays specification
>+    Contributors to the ARB_shader_draw_parameters specification
>+
>+Contact
>+
>+    Austin Eng (enga 'at' google.com)
>+
>+Status
>+
>+    Incomplete
>+
>+Version
>+
>+    Last Modified Date: October 24, 2018
>+    Author Revision: 1
>+
>+Number
>+
>+    OpenGL ES Extension XX
>+
>+Dependencies
>+
>+    OpenGL ES 2.0 is required.
>+
>+    This extension is written against the OpenGL ES 2.0 specification,
>+    the OpenGL ES 3.0 specification, and the OpenGL ES Shading Language 3.0
>+    specification.
>+
>+    The presence of the GL_ANGLE_instanced_arrays or GL_EXT_instanced_arrays 
>+    extensions affects the definition of this extension.
>+
>+Overview
>+
>+    This extension exposes the Multi* draw call variants in
>+    EXT_multi_draw_arrays functionality in addition to the vertex shader builtin
>+    gl_DrawID exposed by ARB_shader_draw_parameters for OpenGL.
>+
>+    These functions behave identically to the standard functions
>+    DrawArrays() and DrawElements() except they handle multiple lists of
>+    vertices in one call. Their main purpose is to allow one function call
>+    to render more than one primitive such as triangle strip, triangle fan,
>+    etc.
>+
>+    Additionally, this extension adds a further built-in variable, gl_DrawID
>+    to the shading language. This variable contains the index of the draw
>+    currently being processed by a Multi* variant of a drawing command.
>+
>+IP Status
>+
>+    No known IP claims.
>+
>+New Procedures and Functions
>+
>+    void MultiDrawArraysANGLE(enum mode,
>+                              const GLint* firsts,
>+                              const GLsizei* counts,
>+                              const GLsizei drawcount);
>+
>+    void MultiDrawElementsANGLE(enum mode,
>+                                const GLint* counts,
>+                                GLenum type,
>+                                const GLvoid* const* indices,
>+                                const GLsizei drawcount);
>+
>+    void MultiDrawArraysInstancedANGLE(enum mode,
>+                                       const GLint* firsts,
>+                                       const GLsizei* counts,
>+                                       const GLsizei* instanceCounts,
>+                                       const GLsizei drawcount);
>+
>+    void MultiDrawElementsInstancedANGLE(enum mode,
>+                                         const GLint* counts,
>+                                         GLenum type,
>+                                         const GLvoid* const* indices,
>+                                         const GLsizei* instanceCounts,
>+                                         const GLsizei drawcount);
>+
>+New Tokens
>+
>+    None.
>+
>+Additions to Chapter 2 of the OpenGL ES 2.0 Specification
>+
>+    Section 2.8 Vertex Arrays:
>+
>+    The command
>+
>+      void MultiDrawArraysANGLE(GLenum mode,
>+              const GLint* firsts,
>+              const GLsizei *counts,
>+              GLsizei drawcount)
>+
>+    Behaves identically to DrawArrays except that a list of arrays is
>+    specified instead. The number of lists is specified in the drawcount
>+    parameter. It has the same effect as:
>+
>+      for(i=0; i<drawcount; i++) {
>+        if (*(counts+i)>0) DrawArrays(mode, *(firsts+i), *(counts+i));
>+      }
>+
>+    The index of the draw (<i> in the above pseudo-code) may be read by
>+    a vertex shader as <gl_DrawID>.
>+
>+    The command
>+
>+      void MultiDrawElementsANGLE(GLenum mode,
>+                GLsizei* counts,
>+                GLenum type,
>+                const GLvoid* const* indices,
>+                GLsizei drawcount)
>+
>+    Behaves identically to DrawElements except that a list of arrays is
>+    specified instead. The number of lists is specified in the drawcount
>+    parameter. It has the same effect as:
>+
>+      for(i=0; i<drawcount; i++) {
>+          if (*(counts+i)>0) {
>+              DrawElements(mode, *(counts+i), type, *(indices+i));
>+          }
>+      }
>+
>+    The index of the draw (<i> in the above pseudo-code) may be read by
>+    a vertex shader as <gl_DrawID>.
>+
>+Additions to Chapter 2 of the OpenGL ES 3.0 Specification
>+
>+    Section 2.9.3 Drawing Commands:
>+
>+    The command
>+
>+      void MultiDrawArraysInstancedANGLE(
>+              GLenum mode,
>+              const GLint* firsts,
>+              const GLsizei *counts,
>+              const GLsizei* instanceCounts,
>+              GLsizei drawcount)
>+
>+    Behaves identically to DrawArraysInstanced except that a list of arrays is
>+    specified instead. The number of lists is specified in the drawcount
>+    parameter. It has the same effect as:
>+
>+      for(i=0; i<drawcount; i++) {
>+        if (*(counts+i)>0) DrawArraysInstanced(mode, *(firsts+i), *(counts+i),
>+              *(instanceCounts+1));
>+      }
>+
>+    The index of the draw (<i> in the above pseudo-code) may be read by
>+    a vertex shader as <gl_DrawID>.
>+
>+    The command
>+
>+      void MultiDrawElementsInstancedANGLE(
>+                GLenum mode,
>+                GLsizei* counts,
>+                GLenum type,
>+                const GLvoid* const* indices,
>+                const GLsizei* instanceCounts,
>+                GLsizei drawcount)
>+
>+    Behaves identically to DrawElementsInstanced except that a list of arrays is
>+    specified instead. The number of lists is specified in the drawcount
>+    parameter. It has the same effect as:
>+
>+      for(i=0; i<drawcount; i++) {
>+          if (*(counts+i)>0) {
>+              DrawElementsInstanced(mode, *(counts+i), type,
>+                                    *(indices+i), *(instanceCounts+1));
>+          }
>+      }
>+
>+    The index of the draw (<i> in the above pseudo-code) may be read by
>+    a vertex shader as <gl_DrawID>.
>+
>+Errors
>+
>+    The error INVALID_VALUE is generated by the new functions if <drawcount>
>+    is less than 0.
>+
>+    MultiDrawArraysANGLE, MultiDrawElementsANGLE,
>+    MultiDrawArraysInstancedANGLE, and MultiDrawElementsInstancedANGLE generate
>+    the same errors as DrawArrays, DrawElements, DrawArraysInstanced,
>+    and DrawElementsInstanced, respectively, for any draw <i> where an error
>+    is generated. If any call would produce an error, no drawing is performed.
>+
>+Modifications to the OpenGL ES Shading Language Specification, Version 3.00
>+
>+    Including the following line in a shader can be used to control the
>+    language featured described in this extension:
>+
>+      #extension GL_ANGLE_multi_draw : <behavior>
>+
>+    where <behavior> is as specified in section 3.5.
>+
>+    A new preprocessor #define is added to the OpenGL ES Shading Language:
>+
>+      #define GL_ANGLE_multi_draw 1
>+
>+Dependencies on GL_ANGLE_instanced_arrays
>+
>+    If GL_ANGLE_instanced_arrays or GL_EXT_instanced_arrays is enabled, 
>+    append the lanuage in "Additions to Chapter 2 of the OpenGL ES 3.0
>+    Specification, Section 2.9.3 Drawing Commands" to the language in 
>+    "Additions to Chapter 2 of the OpenGL ES 2.0 Specification, Section 
>+    2.8 Vertex Arrays".
>+
>+    If GL_ANGLE_instanced_arrays or GL_EXT_instanced_arrays is not enabled
>+    and the context is less than a OpenGL ES 3.0 context, the error 
>+    INVALID_OPERATION is generated by any call to the functions 
>+    MultiDrawArraysInstancedANGLE and MultiDrawElementsInstancedANGLE.
>+
>+Issues
>+    None
>+
>+Revision History
>+
>+    Rev.    Date    Author       Changes
>+    ----  --------  ----------   --------------------------------------------
>+    1     10/24/18   Austin Eng  First revision.
>+    2     10/25/18   Austin Eng  Second revision. Add instanced variants
>diff --git a/Source/ThirdParty/ANGLE/extensions/ANGLE_multiview_multisample.txt b/Source/ThirdParty/ANGLE/extensions/ANGLE_multiview_multisample.txt
>new file mode 100644
>index 00000000000..6b3d4ab5682
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/extensions/ANGLE_multiview_multisample.txt
>@@ -0,0 +1,99 @@
>+Name
>+
>+    ANGLE_multiview_multisample
>+
>+Name Strings
>+
>+    GL_ANGLE_multiview_multisample
>+
>+Contributors
>+
>+    Olli Etuaho, NVIDIA Corporation
>+
>+Contact
>+
>+    Olli Etuaho (oetuaho 'at' nvidia.com)
>+
>+Status
>+
>+    Incomplete
>+
>+Version
>+
>+    Last Modified Date: September 12, 2018
>+    Author Revision: 1
>+
>+Number
>+
>+    OpenGL ES Extension XX
>+
>+Dependencies
>+
>+    OpenGL ES 3.0 and the extensions ANGLE_texture_multisample, OVR_multiview2
>+    and OES_texture_storage_multisample_2d_array are required.
>+
>+    With OpenGL ES 3.1, only the extensions ANGLE_multiview and
>+    OES_texture_storage_multisample_2d_array are required.
>+
>+Overview
>+
>+    This extension enhances the functionality introduced in ANGLE_multiview by
>+    enabling rendering into multisample texture arrays in addition to regular
>+    non-multisampled texture arrays.
>+
>+IP Status
>+
>+    No known IP claims.
>+
>+New Tokens
>+
>+    None
>+
>+New Procedures and Functions
>+
>+    None
>+
>+Additions to Chapter 4 of the OpenGL ES 3.0 Specification
>+(Per-Fragment Operations and the Framebuffer)
>+
>+    Modify section 4.4.2 (Attaching Images to Framebuffer Objects), p. 202
>+
>+    Add the following bullet point:
>+
>+    "* Layers of a two-dimensional multisample array texture which can be used
>+       for multi-view rendering."
>+
>+    Modify the error list of FramebufferTextureMultiviewOVR:
>+
>+    Change
>+
>+    "An INVALID_OPERATION error is generated if texture is not zero,
>+    and does not name an existing texture object of type TEXTURE_2D_ARRAY."
>+
>+    to
>+
>+    "An INVALID_OPERATION error is generated if texture is not zero,
>+    and does not name an existing texture object of type TEXTURE_2D_ARRAY or
>+    TEXTURE_2D_MULTISAMPLE_ARRAY_OES."
>+
>+
>+    Modify section 4.4.4.1 (Framebuffer Attachment Completeness), p. 213
>+
>+    Change the bullet point about num_views and base_view_index:
>+
>+    "If the value of FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE is TEXTURE and
>+    the value of FRAMEBUFFER_ATTACHMENT_OBJECT_NAME names a two-dimensional
>+    array texture or a two-dimensional multisample array texture, then the sum
>+    of FRAMEBUFFER_ATTACHMENT_TEXTURE_NUM_VIEWS_ANGLE and
>+    FRAMEBUFFER_ATTACHMENT_TEXTURE_BASE_VIEW_INDEX_ANGLE must be less than the
>+    number of layers in the texture."
>+
>+Additions to the AGL/EGL/GLX/WGL Specifications
>+
>+    None
>+
>+Errors
>+
>+    None
>+
>+Issues
>diff --git a/Source/ThirdParty/ANGLE/extensions/ANGLE_pack_reverse_row_order.txt b/Source/ThirdParty/ANGLE/extensions/ANGLE_pack_reverse_row_order.txt
>new file mode 100644
>index 00000000000..6ec06491e8e
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/extensions/ANGLE_pack_reverse_row_order.txt
>@@ -0,0 +1,168 @@
>+Name
>+
>+    ANGLE_pack_reverse_row_order
>+
>+Name Strings
>+
>+    GL_ANGLE_pack_reverse_row_order
>+
>+Contact
>+
>+    Daniel Koch, TransGaming (daniel 'at' transgaming.com)
>+
>+Contributors
>+
>+    Brian Salomon
>+    Daniel Koch
>+
>+Status
>+
>+    Implemented in ANGLE ES2
>+
>+Version
>+
>+    Last Modified Date: February 22, 2011
>+    Author Revision: 22
>+
>+Number
>+
>+    OpenGL ES Extension #110
>+
>+Dependencies
>+
>+    OpenGL 1.5 or OpenGL ES 1.0 are required.
>+
>+    Some of the functionality of this extension is not supported
>+    when implemented against OpenGL ES.
>+
>+    EXT_texture_rg interacts with this extension.
>+
>+    The extension is written against the OpenGL 3.2 Specification
>+    (Core Profile).
>+
>+Overview
>+
>+    This extension introduces a mechanism to allow reversing the order
>+    in which image rows are written into a pack destination. This
>+    effectively allows an application to flip the results of a ReadPixels
>+    in the y direction operation without having to render upside down.
>+
>+    The coordinate system of OpenGL is vertically reversed in comparison to a
>+    number of other graphics systems such as native windowing APIs. Applications
>+    that perform ReadPixels may have to either render to an intermediate color
>+    buffer before calling ReadPixels or perform a flip in software after
>+    ReadPixels. In some systems the GL can perform the row reversal during
>+    ReadPixels without incurring additional cost.
>+
>+IP Status
>+
>+    No known IP claims.
>+
>+New Procedures and Functions
>+
>+    None
>+
>+New Types
>+
>+    None
>+
>+New Tokens
>+
>+    Accepted by the <pname> parameter of PixelStore{if}, GetIntegerv(),
>+    GetBooleanv(), and GetFloatv():
>+
>+        PACK_REVERSE_ROW_ORDER_ANGLE    0x93A4
>+
>+Additions to Chapter 3 of the OpenGL 3.2 Specification (Rasterization)
>+
>+    In Section 4.3.1 (Reading Pixels) add a row to table 4.7:
>+
>+        +------------------------------+---------+---------------+-------------+
>+        | Parameter Name               | Type    | Initial Value | Valid Range |
>+        +------------------------------+---------+---------------+-------------+
>+        | PACK_REVERSE_ROW_ORDER_ANGLE | boolean | FALSE         | TRUE/FALSE  |
>+        +------------------------------+---------+---------------+-------------+
>+
>+    In Section 4.3.1 (Reading Pixels) modify the second paragraph of subsection 
>+    "Placement in Pixel Pack Buffer or Client Memory" to read:
>+
>+        When PACK_REVERSE_ROW_ORDER_ANGLE is FALSE groups of elements are placed
>+        in memory just as they are taken from memory when transferring pixel
>+        rectangles to the GL. That is, the ith group of the jth row
>+        (corresponding to the ith pixel in the jth row) is placed in memory just
>+        where the ith group of the jth row would be taken from when transferring
>+        pixels. See Unpacking under section 3.7.2. The only difference is that
>+        the storage mode parameters whose names begin with PACK_ are used
>+        instead of those whose names begin with UNPACK_. If the format is RED,
>+        GREEN, BLUE, or ALPHA, only the corresponding single element is written.
>+        Likewise if the format is RG, RGB, or BGR, only the corresponding two or
>+        three elements are written. Otherwise all the elements of each group are
>+        written. When PACK_REVERSE_ROW_ORDER_ANGLE is TRUE the order of the rows
>+        of elements is reversed before the data is packed. That is, the element
>+        corresponding to pixel (x, y + height - 1) becomes the first element
>+        packed, followed by (x + 1, y + height - 1), etc. Otherwise, pixel data
>+        is packed in the same manner as when PACK_REVERSE_ROW_ORDER_ANGLE is
>+        FALSE.
>+
>+Additions to Chapter 6 of the OpenGL 3.2 Specification (State and State Requests)
>+
>+    In Section 6.1.4 add the following sentence to the fifth paragraph
>+    (beginning with "For three-dimensional and two-dimensional array
>+    textures..."):
>+        When PACK_REVERSE_ROW_ORDER_ANGLE is TRUE the order of rows within
>+        each image are reversed without reordering the images themselves.
>+
>+Dependencies on OpenGL ES
>+
>+    If implemented for OpenGL ES, this extension behaves as specified, except:
>+
>+    -Delete all references to formats RED, GREEN, BLUE, RG, and BGR.
>+
>+    -The language about image order in Section 6.1.4 does not apply as OpenGL ES
>+     does not have GetTexImage.
>+
>+Dependencies on EXT_texture_rg
>+
>+    If EXT_texture_rg is present reinsert language about formats RED and RG
>+    into the OpenGL ES 2.0 specification.
>+
>+Errors
>+
>+    None
>+
>+New State
>+                                                           Initial
>+    Get Value                       Type  Get Command      Value    Description                    Sec.
>+    ---------                       ----  -----------      -------  -----------                    ----
>+    PACK_REVERSE_ROW_ORDER_ANGLE    B     GetIntegerv      FALSE    Pixel pack row order reversal  4.3.1
>+
>+New Implementation Dependent State
>+
>+    None
>+
>+Issues
>+
>+    None
>+
>+Sample Code
>+
>+    /* Allocate space to hold the pixel data */
>+    const GLvoid* pixels = malloc(width * height * 4);
>+
>+    /* Bind the framebuffer object to be read */
>+    glBindFramebuffer(GL_READ_FRAMEBUFFER, framebuffer);
>+
>+    /* Enable row order reversal */
>+    glPixelStore(GL_PACK_REVERSE_ROW_ORDER_ANGLE, TRUE);
>+
>+    /* The pixel data stored in pixels will be in top-down order, ready for
>+     * use with a windowing system API that expects this order.
>+     */
>+    glReadPixels(x, y, width, height, GL_RGBA, GL_UNSIGNED_BYTE, pixels);
>+
>+Revision History
>+
>+    Revision 1, 2011/11/22 (Brian Salomon)
>+      - First version
>+    Revision 2, 2012/02/22 (dgkoch)
>+      - prepare for publishing
>diff --git a/Source/ThirdParty/ANGLE/extensions/ANGLE_program_binary.txt b/Source/ThirdParty/ANGLE/extensions/ANGLE_program_binary.txt
>new file mode 100644
>index 00000000000..67550bc1182
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/extensions/ANGLE_program_binary.txt
>@@ -0,0 +1,94 @@
>+Name
>+
>+    ANGLE_program_binary
>+
>+Name Strings
>+
>+    GL_ANGLE_program_binary
>+
>+Contributors
>+
>+    Alastair Patrick, Google Inc.
>+    Daniel Koch, TransGaming Inc.
>+
>+Contact
>+
>+    Alastair Patrick, Google Inc. (apatrick 'at' google 'dot' com)
>+
>+Status
>+
>+    Under development.
>+
>+Version
>+
>+    Last Modifed Date: June 6, 2012
>+    Revision: #1
>+
>+Number
>+
>+    TBD
>+
>+Dependencies
>+
>+    OpenGL ES 2.0 is required.
>+    OES_get_program_binary is required.
>+    This extension is written against the OpenGL ES 2.0.25 specification.
>+
>+Overview
>+
>+    This extension makes available a program binary format,
>+    PROGRAM_BINARY_ANGLE. It enables retrieving and loading of pre-linked
>+    ANGLE program objects.
>+
>+New Procedures and Functions
>+
>+    None
>+
>+New Tokens
>+
>+    Accepted by the <binaryFormat> parameter of ProgramBinaryOES:
>+
>+        PROGRAM_BINARY_ANGLE        0x93A6
>+
>+Additions to Chapter 2 of the OpenGL-ES 2.0 Specification (OpenGL Operation)
>+
>+    Add the following paragraph to the end of section 2.15.4, Program Binaries:
>+    
>+    "PROGRAM_BINARY_ANGLE, returned in the list of PROGRAM_BINARY_FORMATS_OES,
>+    is a format that may be loaded into a program object via ProgramBinaryOES." 
>+    
>+Additions to Chapter 3 of the OpenGL ES 2.0 specification (Rasterizatoin)
>+
>+    None.
>+
>+Additions to Chapter 4 of the OpenGL ES 2.0 specification (Per-Fragment
>+Operations and the Framebuffer)
>+
>+    None.
>+
>+Additions to Chapter 5 of the OpenGL ES 2.0 Specification (Special
>+Functions)
>+
>+    None.
>+
>+Additions to Chapter 6 of the OpenGL ES 2.0 Specification (State and State
>+Requests)
>+
>+    None.
>+
>+Errors
>+
>+    None
>+
>+New State
>+
>+    None.
>+
>+Issues
>+
>+    None
>+
>+Revision History
>+ 
>+    06/06/2012  apatrick  intial revision
>+
>diff --git a/Source/ThirdParty/ANGLE/extensions/ANGLE_program_cache_control.txt b/Source/ThirdParty/ANGLE/extensions/ANGLE_program_cache_control.txt
>new file mode 100644
>index 00000000000..ed46c6b9287
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/extensions/ANGLE_program_cache_control.txt
>@@ -0,0 +1,75 @@
>+Name
>+
>+    ANGLE_program_cache_control
>+
>+Name Strings
>+
>+    GL_ANGLE_program_cache_control
>+
>+Contributors
>+
>+    Jamie Madill, Google
>+
>+Contacts
>+
>+    Jamie Madill (jmadill 'at' google.com)
>+
>+Status
>+
>+    Draft
>+
>+Version
>+
>+    Version 1, June 29, 2017
>+
>+Number
>+
>+    OpenGL ES Extension #??
>+
>+Dependencies
>+
>+    OpenGL ES 3.0 is required.
>+
>+    This extension is written against the wording of the OpenGL ES
>+    3.0 specification.
>+
>+Overview
>+
>+    With the program cache enabled, created OpenGL ES contexts will use an
>+    internal program binary cache to save linking time. The extension allows the
>+    application to determine if a particular Context has this feature enabled.
>+
>+New Types
>+
>+    None
>+
>+New Procedures and Functions
>+
>+    None
>+
>+New Tokens
>+
>+    Accepted by the <cap> parameter to IsEnabled and the <pname> parameter to
>+    GetBooleanv, GetIntegerv, GetFloatv, and GetInteger64v:
>+
>+    PROGRAM_CACHE_ENABLED_ANGLE           0x93AC
>+
>+Additions to the OpenGL ES Specification:
>+
>+    Add to section 2.12.3 (Program Objects), p. 52, after paragraph 4:
>+
>+    Contexts with PROGRAM_CACHE_ENABLED_ANGLE set to TRUE will query the
>+    internal program cache on any LinkProgram call, and re-use program binaries
>+    if matching values are found. LinkProgram will succeed in this case. If the
>+    binary load fails for any reason, LinkProgram will fall back to linking
>+    normally.
>+
>+Issues
>+
>+    None
>+
>+Revision History
>+
>+    Rev.    Date         Author     Changes
>+    ----  -------------  ---------  -------------------------------------------
>+      1   June 29, 2017  jmadill    Initial version
>diff --git a/Source/ThirdParty/ANGLE/extensions/ANGLE_request_extension.txt b/Source/ThirdParty/ANGLE/extensions/ANGLE_request_extension.txt
>new file mode 100644
>index 00000000000..6536035fa7e
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/extensions/ANGLE_request_extension.txt
>@@ -0,0 +1,116 @@
>+Name
>+
>+    ANGLE_request_extension
>+
>+Name Strings
>+
>+    GL_ANGLE_request_extension
>+
>+Contributors
>+
>+    Geoff Lang
>+
>+Contact
>+
>+    Geoff Lang (geofflang 'at' google.com)
>+
>+Notice
>+
>+    Copyright (c) 2016 The Khronos Group Inc. Copyright terms at
>+        http://www.khronos.org/registry/speccopyright.html
>+
>+Status
>+
>+    Draft
>+
>+Version
>+
>+    Version 1, November 28, 2016
>+
>+Number
>+
>+    OpenGL ES Extension #??
>+
>+Dependencies
>+
>+    Requires OpenGL ES 2.0
>+
>+    Written against the OpenGL ES 3.0 specification.
>+
>+Overview
>+
>+    This extension allows the client to query extensions that can be enabled and
>+    explicitly request than an extension be enabled.
>+
>+New Procedures and Functions
>+
>+    void RequestExtension(const char *name)
>+
>+New Tokens
>+
>+    Accepted by the <name> parameter of GetString and GetStringi:
>+
>+        REQUESTABLE_EXTENSIONS_ANGLE      0x93A8
>+
>+    Accepted by the <value> parameter of the GetInteger* functions:
>+
>+        NUM_REQUESTABLE_EXTENSIONS_ANGLE  0x93A9
>+
>+Additions to the OpenGL ES 3.0 Specification
>+
>+    Add the following paragraph to the end paragraph 4 of section 6.1.6, String
>+    Queries:
>+
>+    "REQUESTABLE_EXTENSIONS_ANGLE returns a list of extensions that can be
>+    enabled at runtime by calling RequestExtension."
>+
>+    Change the following section of paragraph 6 of section 6.1.6, String Queries:
>+
>+    - "name may only be EXTENSIONS, indicating that the extension name
>+    - corresponding to the indexth supported extension should be returned.
>+    - <index> may range from zero to the value of NUM_EXTENSIONS minus one"
>+    + "name may be EXTENSIONS or REQUESTABLE_EXTENSIONS_ANGLE, indicating that
>+    + the extension name corresponding to the indexth supported or requestable
>+    + extension should be returned. <index> may range from zero to the value of
>+    + NUM_EXTENSIONS and NUM_REQUESTABLE_EXTENSIONS_ANGLE minus one"
>+
>+    The command
>+
>+       void RequestExtension(const char *name)
>+
>+    enables the requestable OpenGL ES extension named <name>. If the extension
>+    was not requestable, INVALID_OPERATION is generated.
>+
>+New State
>+
>+    Add to Table 6.30 (Implementation Dependent Version and Extension Support)
>+
>+    Get value                        Type Get Cmd     Min Value Description                      Sec.
>+    -------------------------------- ---- ----------- --------- -------------------------------- -----
>+    NUM_REQUESTABLE_EXTENSIONS_ANGLE Z+   GetIntegerv -         Number of individual requestable 6.1.6
>+                                                                extension names
>+
>+Interactions with the OpenGL ES 2.0 specification:
>+
>+    Remove all references to GetStringi and NUM_REQUESTABLE_EXTENSIONS_ANGLE.
>+
>+Issues
>+
>+    (1) How can the user determine which extensions can be enabled without
>+        potentially generating errors?
>+
>+      This can be solved by:
>+      a) Never generate an error in EnableExtensions, simply return false when
>+         the extension is not recognized or cannot be enabled.
>+      b) Add another query for the extensions that the context supports
>+         enabling.
>+
>+      RESOLVED: Use (b) because it allows the context to explicity advertise
>+      which extensions support enabling and doesn't generate errors in the
>+      normal use case.
>+
>+Revision History
>+
>+    Rev.    Date         Author     Changes
>+    ----  -------------  ---------  ----------------------------------------
>+      1    Nov 28, 2016  geofflang  Initial version
>diff --git a/Source/ThirdParty/ANGLE/extensions/ANGLE_robust_client_memory.txt b/Source/ThirdParty/ANGLE/extensions/ANGLE_robust_client_memory.txt
>new file mode 100644
>index 00000000000..933deb0f49a
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/extensions/ANGLE_robust_client_memory.txt
>@@ -0,0 +1,180 @@
>+Name
>+
>+    ANGLE_robust_client_memory
>+
>+Name Strings
>+
>+    GL_ANGLE_robust_client_memory
>+
>+Contributors
>+
>+    Geoff Lang, Google
>+
>+Contacts
>+
>+    Geoff Lang, Google (geofflang 'at' google.com)
>+
>+Status
>+
>+    Draft
>+
>+Version
>+
>+    Version 4, March 30, 2017
>+
>+Number
>+
>+    OpenGL ES Extension #??
>+
>+Dependencies
>+
>+    OpenGL ES 2.0 is required.
>+
>+    This extension is written against the wording of the OpenGL ES
>+    3.2 specification.
>+
>+    Interacts with GL_KHR_debug, GL_EXT_disjoint_timer_queries,
>+    GL_KHR_robustness.
>+
>+Overview
>+
>+    This extension adds overloads of many OpenGL ES functions that read from
>+    and write to client memory to ensure that all reads and writes done by the
>+    OpenGL ES implementation are safe.  When the OpenGL ES API is exposed to
>+    users through complex bindings such as WebGL, allowing undefined behaviour
>+    that may result in crashing the implementation is not acceptable.
>+
>+New Types
>+
>+    None
>+
>+New Procedures and Functions
>+
>+    void GetBooleanvRobustANGLE(enum pname, sizei bufSize, sizei *length, boolean *data)
>+    void GetBufferParameterivRobustANGLE(enum target, enum pname, sizei bufSize, sizei *length, int *params)
>+    void GetFloatvRobustANGLE(enum pname, sizei bufSize, sizei *length, float *data)
>+    void GetFramebufferAttachmentParameterivRobustANGLE(enum target, enum attachment, enum pname, sizei bufSize, sizei *length, int *params)
>+    void GetIntegervRobustANGLE(enum pname, sizei bufSize, sizei *length, int *data)
>+    void GetProgramivRobustANGLE(uint program, enum pname, sizei bufSize, sizei *length, int *params)
>+    void GetRenderbufferParameterivRobustANGLE(enum target, enum pname, sizei bufSize, sizei *length, int *params)
>+    void GetShaderivRobustANGLE(uint shader, enum pname, sizei bufSize, sizei *length, int *params)
>+    void GetTexParameterfvRobustANGLE(enum target, enum pname, sizei bufSize, sizei *length, float *params)
>+    void GetTexParameterivRobustANGLE(enum target, enum pname, sizei bufSize, sizei *length, int *params)
>+    void GetUniformfvRobustANGLE(uint program, int location, sizei bufSize, sizei *length, float *params)
>+    void GetUniformivRobustANGLE(uint program, int location, sizei bufSize, sizei *length, int *params)
>+    void GetVertexAttribfvRobustANGLE(uint index, enum pname, sizei bufSize, sizei *length, float *params)
>+    void GetVertexAttribivRobustANGLE(uint index, enum pname, sizei bufSize, sizei *length, int *params)
>+    void GetVertexAttribPointervRobustANGLE(uint index, enum pname, sizei bufSize, sizei *length, void **pointer)
>+    void ReadPixelsRobustANGLE(int x, int y, sizei width, sizei height, enum format, enum type, sizei bufSize, sizei *length, sizei *columns, sizei *rows, void *pixels)
>+    void TexImage2DRobustANGLE(enum target, int level, int internalformat, sizei width, sizei height, int border, enum format, enum type, sizei bufSize, const void *pixels)
>+    void TexParameterfvRobustANGLE(enum target, enum pname, sizei bufSize, const GLfloat *params)
>+    void TexParameterivRobustANGLE(enum target, enum pname, sizei bufSize, const GLint *params)
>+    void TexSubImage2DRobustANGLE(enum target, int level, int xoffset, int yoffset, sizei width, sizei height, enum format, enum type, sizei bufSize, const void *pixels)
>+    void CompressedTexImage2D(enum target, int level, enum internalformat, sizei width, sizei height, int border, sizei imageSize, sizei bufSize, const void* data)
>+    void CompressedTexSubImage2D(enum target, int level, int xoffset, int yoffset, sizei width, sizei height, enum format, sizei imageSize, sizei bufSize, const void* data)
>+    void CompressedTexImage3D(enum target, int level, enum internalformat, sizei width, sizei height, sizei depth, int border, sizei imageSize, sizei bufSize, const void* data)
>+    void CompressedTexSubImage3D(enum target, int level, int xoffset, int yoffset, int zoffset, sizei width, sizei height, sizei depth, enum format, sizei imageSize, sizei bufSize, const void* data)
>+
>+    void TexImage3DRobustANGLE(enum target, int level, int internalformat, sizei width, sizei height, sizei depth, int border, enum format, enum type, sizei bufSize, const void *pixels);
>+    void TexSubImage3DRobustANGLE(enum target, int level, int xoffset, int yoffset, int zoffset, sizei width, sizei height, sizei depth, enum format, enum type, sizei bufSize, const void *pixels);
>+    void GetQueryivRobustANGLE(enum target, enum pname, sizei bufSize, sizei *length, int *params)
>+    void GetQueryObjectuivRobustANGLE(uint id, enum pname, sizei bufSize, sizei *length, uint *params)
>+    void GetBufferPointervRobustANGLE(enum target, enum pname, sizei bufSize, sizei *length, void **params)
>+    void GetIntegeri_vRobustANGLE(enum target, uint index, sizei bufSize, sizei *length, int *data)
>+    void GetInternalformativRobustANGLE(enum target, enum internalformat, enum pname, sizei bufSize, sizei *length, int *params)
>+    void GetVertexAttribIivRobustANGLE(uint index, enum pname, sizei bufSize, sizei *length, int *params)
>+    void GetVertexAttribIuivRobustANGLE(uint index, enum pname, sizei bufSize, sizei *length, uint *params)
>+    void GetUniformuivRobustANGLE(uint program, int location, sizei bufSize, sizei *length, uint *params)
>+    void GetActiveUniformBlockivRobustANGLE(uint program, uint uniformBlockIndex, enum pname, sizei bufSize, sizei *length, int *params)
>+    void GetInteger64vRobustANGLE(enum pname, sizei bufSize, sizei *length, int64 *data)
>+    void GetInteger64i_vRobustANGLE(enum target, uint index, sizei bufSize, sizei *length, int64 *data)
>+    void GetBufferParameteri64vRobustANGLE(enum target, enum pname, sizei bufSize, sizei *length, int64 *params)
>+    void SamplerParameterivRobustANGLE(uint sampler, enum pname, sizei bufSize, const GLint *param)
>+    void SamplerParameterfvRobustANGLE(uint sampler, enum pname, sizei bufSize, const GLfloat *param)
>+    void GetSamplerParameterivRobustANGLE(uint sampler, enum pname, sizei bufSize, sizei *length, int *params)
>+    void GetSamplerParameterfvRobustANGLE(uint sampler, enum pname, sizei bufSize, sizei *length, float *params)
>+
>+    void GetFramebufferParameterivRobustANGLE(enum target, enum pname, sizei bufSize, sizei *length, int *params)
>+    void GetProgramInterfaceivRobustANGLE(uint program, enum programInterface, enum pname, sizei bufSize, sizei *length, int *params)
>+    void GetBooleani_vRobustANGLE(enum target, uint index, sizei bufSize, sizei *length, boolean *data)
>+    void GetMultisamplefvRobustANGLE(enum pname, uint index, sizei bufSize, sizei *length, float *val)
>+    void GetTexLevelParameterivRobustANGLE(enum target, int level, enum pname, sizei bufSize, sizei *length, int *params)
>+    void GetTexLevelParameterfvRobustANGLE(enum target, int level, enum pname, sizei bufSize, sizei *length, float *params)
>+
>+    void GetPointervRobustANGLERobustANGLE(enum pname, sizei bufSize, sizei *length, void **params)
>+    void ReadnPixelsRobustANGLE(int x, int y, sizei width, sizei height, enum format, enum type, sizei bufSize, sizei *length, sizei *columns, sizei *rows, void *data)
>+    void GetnUniformfvRobustANGLE(uint program, int location, sizei bufSize, sizei *length, float *params)
>+    void GetnUniformivRobustANGLE(uint program, int location, sizei bufSize, sizei *length, int *params)
>+    void GetnUniformuivRobustANGLE(uint program, int location, sizei bufSize, sizei *length, uint *params)
>+    void TexParameterIivRobustANGLE(enum target, enum pname, sizei bufSize, const GLint *params)
>+    void TexParameterIuivRobustANGLE(enum target, enum pname, sizei bufSize, const GLuint *params)
>+    void GetTexParameterIivRobustANGLE(enum target, enum pname, sizei bufSize, sizei *length, int *params)
>+    void GetTexParameterIuivRobustANGLE(enum target, enum pname, sizei bufSize, sizei *length, uint *params)
>+    void SamplerParameterIivRobustANGLE(uint sampler, enum pname, sizei bufSize, const GLint *param)
>+    void SamplerParameterIuivRobustANGLE(uint sampler, enum pname, sizei bufSize, const GLuint *param)
>+    void GetSamplerParameterIivRobustANGLE(uint sampler, enum pname, sizei bufSize, sizei *length, int *params)
>+    void GetSamplerParameterIuivRobustANGLE(uint sampler, enum pname, sizei bufSize, sizei *length, uint *params)
>+
>+    void GetQueryObjectivRobustANGLE(uint id, enum pname, sizei bufSize, sizei *length, int *params)
>+    void GetQueryObjecti64vRobustANGLE(uint id, enum pname, sizei bufSize, sizei *length, int64 *params)
>+    void GetQueryObjectui64vRobustANGLE(uint id, enum pname, sizei bufSize, sizei *length, uint64 *params)
>+
>+New Tokens
>+
>+    None
>+
>+Additions to the OpenGL ES Specification:
>+
>+    The xRobustANGLE entry points perform additional validation using <bufSize>
>+    to indicate the maximum number of values that can be read from or written
>+    to the provided buffer.  INVALID_OPERATION is generated if <bufSize> is not
>+    large enough.  The optional <length> specifies an address of a variable to
>+    recieve the number of values written to the buffer.  When an error is
>+    generated nothing will be written to <length>.
>+
>+    The <columns> and <rows> parameters of ReadPixelsRobustANGLE and
>+    ReadnPixelsRobustANGLE specify addresses of variables to recieve the number
>+    of columns and rows of pixels written to the buffer which may be less than
>+    the <width> and <height> parameters if they would have read outside of the
>+    framebuffer.
>+
>+    Calls to "xRobustANGLE" will generate errors under the same conditions as
>+    "x". Any instances of undefined behaviour in "x" will also be undefined in
>+    "xRobustANGLE".  For example, it is invalid to call
>+    GetPointervRobustANGLERobustANGLE without first verifying that the context
>+    is at least OpenGL ES version 3.2 or the GL_KHR_debug extension is present.
>+
>+Issues
>+
>+    1) Should additional entry points be added to specify sizes of client side
>+       data provided to the VertexAttribPointer functions?
>+
>+    2) Should <length> be allowed to be null?
>+
>+       RESOLVED: Yes, <length> will not be written to when it is a null
>+       pointer.
>+
>+    3) Should <bufSize> be specified in bytes or values (uint, int, float,
>+       etc)?
>+
>+       There is no consistancy in current entry points for this.  For example,
>+       glGetnUniformuiv indicates that bufSize is in bytes while GetSynciv
>+       uses values despite GetnUniformuiv having a clear value type.
>+
>+       RESOLOVED: <bufSize> always indicates size in values. Functions that
>+       specify data by void* such as TexImage2DRobustANGLE treat the client
>+       data as bytes.
>+
>+    4) Should <length> be written to if an error is generated?
>+
>+       RESOLVED: No, using the prescedent set by glGetSynciv.
>+
>+Revision History
>+
>+    Rev.    Date         Author     Changes
>+    ----  -------------  ---------  -------------------------------------------
>+      1   Sept 26, 2016  geofflang  Initial version
>+      2   Sept 28, 2016  geofflang  Changed name from ANGLE_robust_queries to
>+                                    ANGLE_robust_client_memory, added issue 3.
>+      3   Oct 7, 2016    geofflang  Added and resolved issue 4.
>+      4   Mar 30, 2017   geofflang  Added columns and rows to ReadPixels.
>diff --git a/Source/ThirdParty/ANGLE/extensions/ANGLE_robust_resource_initialization.txt b/Source/ThirdParty/ANGLE/extensions/ANGLE_robust_resource_initialization.txt
>new file mode 100644
>index 00000000000..30372ec8c67
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/extensions/ANGLE_robust_resource_initialization.txt
>@@ -0,0 +1,144 @@
>+Name
>+
>+    ANGLE_robust_resource_initialization
>+
>+Name Strings
>+
>+    GL_ANGLE_robust_resource_intialization
>+
>+Contributors
>+
>+    Geoff Lang, Google
>+    Ken Russell, Google
>+
>+Contacts
>+
>+    Shannon Woods, Google (shannonwoods 'at' google.com)
>+
>+Status
>+
>+    Draft
>+
>+Version
>+
>+    Version 3, September 19, 2017
>+
>+Number
>+
>+    OpenGL ES Extension TBD
>+
>+Dependencies
>+
>+    OpenGL ES 2.0 is required.
>+
>+    This extension is written against the wording of the OpenGL ES
>+    3.1 specification.
>+
>+    EGL_ANGLE_robust_initialization is required to request a
>+    context that supports this extension, and resource initialization.
>+
>+Overview
>+
>+    This extension specifies the behavior for initialization of
>+    resources such as textures and buffers to default values. This
>+    initialization ensures that access will not be provided by the
>+    GL to previously allocated data not owned by the application.
>+
>+New Types
>+
>+    None
>+
>+New Procedures and Functions
>+
>+    None
>+
>+New Tokens
>+
>+    Accepted by the <value> parameter of GetBooleanv, GetIntegerv,
>+    GetFloatv, GetDoublev, GetInteger64v, and IsEnabled:
>+
>+        ROBUST_RESOURCE_INITIALIZATION_ANGLE    0x93A7
>+
>+Additions to Chapter 6 of the OpenGL ES 3.1 Specification (Buffer
>+Objects)
>+
>+    Replace the last sentence of the first paragraph of section 6.2
>+    "BufferData":
>+
>+    If <data> is NULL, and robust resource initialization is enabled,
>+    the contents of the buffer object's data store are set to zero.
>+    Otherwise, the contents of the buffer object's data store are
>+    undefined.
>+
>+Additions to Chapter 8 of the OpenGL ES 3.1 Specification (Textures and
>+Samplers)
>+
>+    Replace the first two sentances of the final paragraph in section
>+    8.5.3 "Texture Image Structure":
>+
>+    If the <data> argument of TexImage2D or TexImage3D is NULL, and the
>+    pixel unpack buffer object is zero, a two- or three-dimensional
>+    texel array is created with the specified <target>, <level>,
>+    <internalformat>, <border>, <width>, <height>, and <depth>. If
>+    robust resource initialization is enabled, the contents of the image
>+    are initialized as though a zero value were provided for each
>+    component of each pixel, and processed and transferred to the GL
>+    as described above. The components comprising this zero-filled data
>+    are determined by <internalformat>. If robust resource
>+    initialization is not enabled, the image contents are undefined, and
>+    no pixel processing is performed. In either case, no pixel values
>+    are accessed in client memory.
>+
>+    Replace the first sentence of the fifth paragraph in section 8.8
>+    "Multisample Textures":
>+
>+    Upon success, TexStorage2DMultisample deletes any existing image
>+    for target. If robust resource initialization is enabled, the
>+    contents of each texel are initialized as though a zero value were
>+    written to each channel of each sample; otherwise the contents of
>+    texels are undefined.
>+
>+    Add to the final paragraph of section 8.17 "Immutable-Format Texture
>+    Images":
>+
>+    If robust resource initialization is enabled, the contents of each
>+    texel is initialized as though a zero value were provided for each
>+    component of each pixel, and processed and transferred to the GL
>+    as for a call to the appropriate TexSubImage* call for <target>.
>+    Otherwise, the contents of texels are undefined.
>+
>+Additions to Chapter 9 of the OpenGL ES 3.1 Specification (Framebuffers
>+and Framebuffer Objects)
>+
>+    Replace the sentence in section 9.2.4 "Renderbuffer Objects"
>+    beginning "Upon success, RenderbufferStorageMultisample":
>+
>+    Upon success, RenderbufferStorageMultisample deletes any existing
>+    data store for the renderbuffer image. If robust resource
>+    initialization is enabled, the contents of each pixel in the data
>+    store are initialized as though a zero value was written to each
>+    channel of each sample; otherwise, the contents of the data store
>+    are undefined.
>+
>+Interactions with EGL_ANGLE_create_context_robust_resource_initialization
>+
>+    If the EGL window-system binding API is used to create a context,
>+    the EGL_ANGLE_create_context_robust_initialization extension is
>+    supported, and the attribute
>+    EGL_CONTEXT_ROBUST_RESOURCE_INITIALIZATION_ANGLE is set to
>+    EGL_TRUE when eglCreateContext is called, the resulting context
>+    will perform robust resource initialization as described above in
>+    section <section>, and the
>+    CONTEXT_ROBUST_RESOURCE_INITIALIZATION_ANGLE
>+    query will return GL_TRUE as described above in section 2.6.1.1.
>+    Otherwise queries will return GL_FALSE.
>+
>+Issues
>+
>+    None
>+
>+Revision History
>+
>+    Version 1, 2015/01/07 - first draft.
>+    Version 2, 2017/03/07 - fixed EGL naming and added IsEnabled.
>+    Version 3, 2017/09/19 - name cleanup.
>diff --git a/Source/ThirdParty/ANGLE/extensions/ANGLE_texture_compression_dxt.txt b/Source/ThirdParty/ANGLE/extensions/ANGLE_texture_compression_dxt.txt
>new file mode 100644
>index 00000000000..0e844bfec0e
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/extensions/ANGLE_texture_compression_dxt.txt
>@@ -0,0 +1,163 @@
>+Name
>+
>+    ANGLE_texture_compression_dxt
>+
>+Name Strings
>+
>+    GL_ANGLE_texture_compression_dxt1
>+    GL_ANGLE_texture_compression_dxt3
>+    GL_ANGLE_texture_compression_dxt5
>+
>+Contributors
>+
>+    Gregg Tavares, Google Inc.
>+    Daniel Koch, TransGaming Inc.
>+    Al Patrick, Google Inc.
>+
>+Contacts
>+
>+    Gregg Tavares, Google Inc. (gman 'at' google 'dot' com)
>+
>+Status
>+
>+    Implemented in ANGLE ES2
>+
>+Version
>+
>+    Last Modified Date: Sept 22, 2012
>+    Author Revision: 2
>+
>+Number
>+
>+    OpenGL ES Extension #111
>+
>+Dependencies
>+
>+    Requires OpenGL ES 1.0.
>+
>+    The extension is written against the OpenGL ES 2.0 specification.
>+
>+Overview
>+
>+    These extensions are exactly the same as EXT_texture_compression_dxt1
>+    except they additionally expose the COMPRESSED_RGBA_S3TC_DXT3_ANGLE and
>+    COMPRESSED_RGBA_S3TC_DXT5_ANGLE formats and have a size restrictions
>+    such that the size must be a multiple of four (except for mip levels
>+    where the dimensions are either 2 or 1).
>+
>+    See EXT_texture_compression_dxt1 for the full list of changes. Also
>+    see EXT_texture_compression_s3tc for a description of the formats.
>+
>+IP Status
>+
>+    A license to the S3TC Intellectual Property may be necessary for 
>+    implementation of this extension.  You should consult with your 
>+    Attorney to determine the need for a license.
>+
>+New Procedures and Functions
>+
>+    None.
>+
>+New Types
>+
>+    None.
>+
>+New Tokens
>+
>+    Accepted by the <internalformat> parameter of CompressedTexImage2D
>+    and the <format> parameter of CompressedTexSubImage2D:
>+
>+    COMPRESSED_RGB_S3TC_DXT1_ANGLE                    0x83F0
>+    COMPRESSED_RGBA_S3TC_DXT1_ANGLE                   0x83F1
>+    COMPRESSED_RGBA_S3TC_DXT3_ANGLE                   0x83F2
>+    COMPRESSED_RGBA_S3TC_DXT5_ANGLE                   0x83F3
>+
>+Additions to Chapter 3 of the OpenGL ES 2.0 Specification (Rasterization)
>+
>+    Add the following to Section 3.7.3 (Compressed Texture Images)
>+    (at the end of the description of the CompressedTexImage2D command):
>+
>+    Compressed Internal Format        Base Internal Format
>+    ==========================        ====================
>+    COMPRESSED_RGB_S3TC_DXT1_ANGLE    RGB
>+    COMPRESSED_RGBA_S3TC_DXT1_ANGLE   RGBA
>+    COMPRESSED_RGBA_S3TC_DXT3_ANGLE   RGBA
>+    COMPRESSED_RGBA_S3TC_DXT5_ANGLE   RGBA
>+
>+    Table 3.x: Specific Compressed Internal Formats
>+
>+    If <internalformat> is one of the S3TC formats listed in Table 3.x,
>+    the compressed texture is stored in the appropriate S3TC compressed
>+    texture format (see Appendix). The GL and the S3TC texture compression
>+    algorithm support only 2D images without borders.
>+
>+    CompressedTexImage2D will produce the INVALID_OPERATION error when
>+    <internalformat> is one of the values from Table 3.x under the following
>+    conditions: 
>+
>+      * <border> is non-zero.
>+      * <width> is not one, two, or a multiple of four.
>+      * <height> is not one, two, or a multiple of four.
>+
>+    Add the following to Section 3.7.3 (Compressed Texture Images)
>+    (at the end of the description of the CompressedTexSubImage2D command):
>+
>+    If the internal format of the texture image being modified is listed
>+    in Table 3.x, the texture is stored in the appropriate S3TC compressed
>+    texture format (see Appendix). Since DXT/S3TC images are easily edited
>+    along 4x4 texel boundaries, the limitations of CompressedTexSubImage2D
>+    are relaxed. CompressedTexSubImage2D will result in an INVALID_OPERATION
>+    error only if one of the following conditions occurs:
>+
>+      * <width> is not a multiple of four or equal to TEXTURE_WIDTH.
>+      * <height> is not a multipls of four or equal to TEXTURE_HEIGHT.
>+      * <xoffset> or <yoffset> is not a multiple of four.
>+      * <format> does not match the internal format of the texture image
>+        being modified.
>+
>+    The following restrictions at the end of section 3.7.3 do not apply
>+    to S3TC DXT texture formats, since subimage modification is straightforward
>+    as long as the subimage is properly aligned.
>+
>+Errors
>+
>+    INVALID_OPERATION is generated by CompressedTexImage2D if <internalformat>
>+    is one of the compressed internal formats from Table 3.x and any of the 
>+    following apply:
>+      - <border> is not equal to zero.
>+      - <width> is not one, two, or a multiple of four. 
>+      - <height> is not one, two, or a multiple of four. 
>+
>+    INVALID_OPERATION is generated by TexImage2D and CopyTexImage2D if
>+    <internalformat> is one of the compressed internal formats from
>+    Table 3.x.
>+
>+    INVALID_OPERATION is generated by TexSubImage2D and CopyTexSubImage2D
>+    if the internal format of the texture currently bound to <target> is
>+    one of the compressed internal formats from Table 3.x.
>+
>+    INVALID_OPERATION is generated by CompressedTexSubImage2D if <format>
>+    is one of the compressed interal formats from Table 3.x and any of the
>+    following apply:
>+      - <width> is not a multiple of four or equal to TEXTURE_WIDTH;
>+      - <height> is not a multiple of four or equal to TEXTURE_HEIGHT;
>+      - <xoffset> or <yoffset> is not a multiple of four;
>+      - <format> does not match the internal format of the texture image
>+      being modified.
>+
>+New State
>+
>+    None.
>+
>+Appendix: 
>+
>+    The format for the S3TC Compressed Texture Images Formats is documented
>+    in the appendix of EXT_texture_compression_s3tc.
>+
>+Revision History
>+
>+    Revision 1, 2010/08/06 - gman
>+      - Initial revision
>+    Revision 2, 2012/09/22 - dgkoch
>+      - Added DXT1 formats and documented multiple of 4 restriction.
>+
>diff --git a/Source/ThirdParty/ANGLE/extensions/ANGLE_texture_multisample.txt b/Source/ThirdParty/ANGLE/extensions/ANGLE_texture_multisample.txt
>new file mode 100644
>index 00000000000..246a5bbf2ed
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/extensions/ANGLE_texture_multisample.txt
>@@ -0,0 +1,764 @@
>+Name
>+
>+    ANGLE_texture_multisample
>+
>+Name Strings
>+
>+    GL_ANGLE_texture_multisample
>+
>+Contributors
>+
>+    Yunchao He, Intel Corporation
>+    Yizhou Jiang, Intel Corporation
>+    Contributors to the OpenGL ES 3.1, GLSL ES 3.1, and ARB_texture_multisample
>+
>+Contact
>+
>+    Yunchao He (yunchao.he 'at' intel.com)
>+
>+Status
>+
>+    Incomplete
>+
>+Version
>+
>+    Last Modified Date: August 27, 2018
>+    Author Revision: 1
>+
>+Number
>+
>+    OpenGL ES Extension XX
>+
>+Dependencies
>+
>+    OpenGL ES 3.0 is required.
>+
>+    This extension is written against the OpenGL ES 3.0.5 and OpenGL ES
>+    Shading Language 3.0 (Document Revision 6) specifications.
>+
>+    KHR_robustness affects the behavior of this specification.
>+
>+Overview
>+
>+    This extension provides support for a new type of texture -
>+    two-dimensional multisample textures - as well as mechanisms to
>+    allocate storage and attach such textures to FBOs for rendering.
>+    It also add supports using such textures in a shader, fetching specific
>+    samples from such textures in a shader, and querying the dimensions of
>+    such textures in a shader.
>+
>+    This extension also includes the following functionality, some of which
>+    was first described in NV_explicit_multisample:
>+
>+     * An API to query the location of samples within the pixel
>+
>+     * An explicit control for the multisample sample mask to augment the
>+       control provided by SampleCoverage
>+
>+     * An API to query the texture's level-of-detail information for various
>+       parameters
>+
>+     * A mechanism to support the SAMPLE_MASK capability
>+
>+     * A mechanism to return corresponding types for multisample textures when
>+       the uniform type is queried by getActiveUniform
>+
>+    This extension does not expose multisampled 2D array textures, because they
>+    are not supported in OpenGL ES 3.1.
>+
>+IP Status
>+
>+    No known IP claims.
>+
>+New Procedures and Functions
>+
>+    void TexStorage2DMultisampleANGLE(enum target,
>+                                      sizei samples,
>+                                      enum sizedinternalformat,
>+                                      sizei width,
>+                                      sizei height,
>+                                      boolean fixedsamplelocations);
>+
>+    void GetMultisamplefvANGLE(enum pname, uint index, float *val);
>+
>+    void SampleMaskiANGLE(uint maskNumber, bitfield mask);
>+
>+    void GetTexLevelParameter{if}vANGLE(enum target, int level,
>+                                        enum pname, T *params );
>+
>+New Tokens
>+
>+    Accepted by the <target> parameter of BindTexture,
>+    TexStorage2DMultisampleANGLE, GetInternalformativ, TexParameter{if}*,
>+    GetTexParameter{if}v, GetTexLevelParameter{if}vANGLE and
>+    by the <textarget> parameter of FramebufferTexture2D:
>+
>+        TEXTURE_2D_MULTISAMPLE_ANGLE                      0x9100
>+
>+    Accepted by the <pname> parameter of GetMultisamplefvANGLE:
>+
>+        SAMPLE_POSITION_ANGLE                             0x8E50
>+
>+    Accepted by the <cap> parameter of Enable, Disable, and IsEnabled:
>+
>+        SAMPLE_MASK_ANGLE                                 0x8E51
>+
>+    Accepted by the <target> parameter of GetIntegeri_v:
>+
>+        SAMPLE_MASK_VALUE_ANGLE                           0x8E52
>+
>+    Accepted by the <pname> parameter of GetIntegerv:
>+
>+        MAX_SAMPLE_MASK_WORDS_ANGLE                       0x8E59
>+        MAX_COLOR_TEXTURE_SAMPLES_ANGLE                   0x910E
>+        MAX_DEPTH_TEXTURE_SAMPLES_ANGLE                   0x910F
>+        MAX_INTEGER_SAMPLES_ANGLE                         0x9110
>+        TEXTURE_BINDING_2D_MULTISAMPLE_ANGLE              0x9104
>+
>+    Accepted by the <pname> parameter of GetTexLevelParameter{if}vANGLE:
>+
>+        TEXTURE_SAMPLES_ANGLE                             0x9106
>+        TEXTURE_FIXED_SAMPLE_LOCATIONS_ANGLE              0x9107
>+        TEXTURE_WIDTH                                     0x1000
>+        TEXTURE_HEIGHT                                    0x1001
>+        TEXTURE_DEPTH                                     0x8071
>+        TEXTURE_INTERNAL_FORMAT                           0x1003
>+        TEXTURE_RED_SIZE                                  0x805C
>+        TEXTURE_GREEN_SIZE                                0x805D
>+        TEXTURE_BLUE_SIZE                                 0x805E
>+        TEXTURE_ALPHA_SIZE                                0x805F
>+        TEXTURE_DEPTH_SIZE                                0x884A
>+        TEXTURE_STENCIL_SIZE                              0x88F1
>+        TEXTURE_SHARED_SIZE                               0x8C3F
>+        TEXTURE_RED_TYPE                                  0x8C10
>+        TEXTURE_GREEN_TYPE                                0x8C11
>+        TEXTURE_BLUE_TYPE                                 0x8C12
>+        TEXTURE_ALPHA_TYPE                                0x8C13
>+        TEXTURE_DEPTH_TYPE                                0x8C16
>+        TEXTURE_COMPRESSED                                0x86A1
>+
>+    Returned by the <type> parameter of GetActiveUniform:
>+
>+        SAMPLER_2D_MULTISAMPLE_ANGLE                      0x9108
>+        INT_SAMPLER_2D_MULTISAMPLE_ANGLE                  0x9109
>+        UNSIGNED_INT_SAMPLER_2D_MULTISAMPLE_ANGLE         0x910A
>+
>+Additions to Chapter 2 of the OpenGL ES 3.0.5 Specification (OpenGL ES
>+Operation)
>+
>+    Add to table 2.10 "OpenGL ES Shading Language type tokens" page 64:
>+
>+    Type Name Token                                       Keyword
>+    -----------------------------------------             ------------
>+    SAMPLER_2D_MULTISAMPLE_ANGLE                          sampler2DMS
>+    INT_SAMPLER_2D_MULTISAMPLE_ANGLE                      isampler2DMS
>+    UNSIGNED_INT_SAMPLER_2D_MULTISAMPLE_ANGLE             usampler2DMS
>+
>+    Add to section 2.12.9, after subsection "Texel Fetches":
>+
>+    Multisample Texel Fetches
>+
>+    Multisample buffers do not have mipmaps, and there is no level of
>+    detail parameter for multisample texel fetches. Instead, an integer
>+    parameter selects the sample number to be fetched from the buffer.
>+    The number identifying the sample is the same as the value used to
>+    query the sample location using GetMultisamplefvANGLE. Multisample
>+    textures are not filtered when samples are fetched, and filter state
>+    is ignored.
>+
>+    If the context was created with robust buffer access enabled, the result
>+    of the texel fetch in the following cases is zero. If robust buffer
>+    access is not enabled, the result of the texel fetch is undefined if
>+    any of the following conditions hold:
>+
>+    * the texel coordinate (i, j) refer to a texel outside the extents
>+      of the multisample texture image, where any of
>+                  i < 0           i >= W
>+                  j < 0           j >= H
>+      and the size parameter W and H refer to the width and height of
>+      the image.
>+
>+    * the specified sample number does not exist (is negative, or greater
>+      than or equal to the number of samples in the texture).
>+
>+    Additionally, these fetches may only be performed on a multisample
>+    texture sampler. No other sample or fetch commands may be performed
>+    on a multisample texture sampler.
>+
>+Additions to Chapter 3 of the OpenGL ES 3.0.5 Specification (Rasterization)
>+
>+    Insert into section 3.3, "Multisampling" after the discussion of
>+    the query for SAMPLES:
>+
>+    (..., and is queried by calling GetIntegerv with pname set to SAMPLES.)
>+
>+    The location at which shading is performed for a given sample (the
>+    shading sample location) is queried with the command
>+
>+        void GetMultisamplefvANGLE(enum pname, uint index, float *val);
>+
>+    <pname> must be SAMPLE_POSITION_ANGLE, and <index> corresponds to the
>+    sample for which the location should be returned. The shading sample
>+    location (x, y) is returned as two floating-point values in (val[0],
>+    val[1]) respectively. x and y each lie in the range [0, 1] and
>+    represent a location in pixel space at which depth and associated
>+    data for that sample are evaluated for a fragment (e.g. where sample
>+    shading is performed). (0.5, 0.5) thus corresponds to the pixel center.
>+    If the multisample mode does not have fixed sample locations, the returned
>+    values may only reflect the locations of samples within some pixels.
>+
>+    An INVALID_ENUM error is generated if <pname> is not SAMPLE_LOCATION.
>+    An INVALID_VALUE error is generated if <index> is greater than or equal to
>+    the value of SAMPLES.
>+
>+    Modify Section 3.8.1, "Texture Objects":
>+
>+    (modify first paragraph of section, p. 122, simply adding
>+     references to multisample textures)
>+
>+    Textures in GL are represented by named objects. The name space for texture
>+    objects is the unsigned integers, with zero reserved by the GL to represent
>+    the default texture object. The default texture object is bound to each of
>+    the TEXTURE_2D, TEXTURE_3D, TEXTURE_2D_ARRAY, TEXTURE_CUBE_MAP, and
>+    TEXTURE_2D_MULTISAMPLE_ANGLE targets during context initialization.
>+
>+    (modify the last paragraph, p. 123)
>+
>+    The texture object name space, including the initial two- and
>+    three-dimensional, two-dimensional array, cube map, and two-dimensional
>+    multisample texture objects, is shared among all texture units. A texture
>+    object may be bound to more than one texture unit simultaneously. After a
>+    texture object is bound, any GL operations on that target object affect
>+    any other texture units to which the same texture object is bound.
>+
>+    Modify Section 3.8.3, "Texture Image Specification" (p. 134):
>+
>+    (add the new target to MAX_TEXTURE_SIZE description)
>+
>+    In a similar fashion, the maximum allowable width of a texel array
>+    for a two-dimensional texture, two-dimensional array texture,
>+    or two-dimensional multisample texture, and the maximum allowable
>+    height of a two-dimensional texture, two-dimensional array texture,
>+    or two-dimensional multisample texture, must be at least 2^(k-lod)
>+    for image arrays of level 0 through k, where k is the log base 2 of
>+    MAX_TEXTURE_SIZE.
>+
>+    Insert new Section 3.8.5, "Multisample Textures". Renumber subsequent
>+    sections:
>+
>+    In addition to the texture types described in previous sections, an
>+    additional type of texture is supported. A multisample texture is
>+    similar to a two-dimensional texture, except it contains multiple
>+    samples per texel. Multisample textures do not have multiple image
>+    levels, and are immutable.
>+
>+    The command
>+
>+        void TexStorage2DMultisampleANGLE(enum target, sizei samples,
>+                                   int sizedinternalformat,
>+                                   sizei width, sizei height,
>+                                   boolean fixedsamplelocations);
>+
>+    establishes the data storage, format, dimensions, and number of samples
>+    of a multisample texture's image. <target> must be
>+    TEXTURE_2D_MULTISAMPLE_ANGLE. <width> and <height> are the dimensions
>+    in texels of the texture.
>+
>+    <samples> represents a request for a desired minimum number of samples.
>+    Since different implementations may support different sample counts for
>+    multisampled textures, the actual number of samples allocated for the
>+    texture image is implementation-dependent. However, the resulting value
>+    for TEXTURE_SAMPLES_ANGLE is guaranteed to be greater than or equal to
>+    <samples> and no more than the next larger sample count supported by the
>+    implementation.
>+
>+    If <fixedsamplelocations> is TRUE, the image will use identical sample
>+    locations and the same number of samples for all texels in the image,
>+    and the sample locations will not depend on the sizedinternalformat or
>+    size of the image.
>+
>+    Upon success, TexStorage2DMultisampleANGLE deletes any existing image
>+    for <target> and the contents of texels are undefined. The values of
>+    TEXTURE_WIDTH, TEXTURE_HEIGHT, TEXTURE_SAMPLES_ANGLE,
>+    TEXTURE_INTERNAL_FORMAT and TEXTURE_FIXED_SAMPLE_LOCATIONS_ANGLE are
>+    set to <width>, <height>, the actual number of samples allocated,
>+    <sizedinternalformat>, and <fixedsamplelocations> respectively.
>+
>+    When a multisample texture is accessed in a shader, the access takes one
>+    vector of integers describing which texel to fetch and an integer
>+    corresponding to the sample numbers described in section 3.3 describing
>+    which sample within the texel to fetch. No standard sampling instructions
>+    are allowed on the multisample texture targets, and no filtering is
>+    performed by the fetch. Fetching a sample number less than zero, or
>+    greater than or equal to the number of samples in the texture, produces
>+    undefined results.
>+
>+    An INVALID_ENUM error is generated if target is not
>+    TEXTURE_2D_MULTISAMPLE_ANGLE.
>+    An INVALID_OPERATION error is generated if zero is bound to <target>.
>+    An INVALID_VALUE is generated if <width> or <height> is less than 1.
>+    An INVALID_VALUE is generated if <width> or <height> is greater than
>+    the value of MAX_TEXTURE_SIZE.
>+    An INVALID_VALUE is generated if samples is zero.
>+    An INVALID_ENUM error is generated if <sizedinternalformat> is not
>+    color-renderable, depth-renderable, or stencil-renderable (as defined
>+    in section 4.4.4).
>+    An INVALID_ENUM error is generated if <sizedinternalformat> is one of the
>+    unsized base internal formats listed in table 3.11.
>+    An INVALID_OPERATION is generated if <samples> is greater than the maximum
>+    number of samples supported for this <target> and <sizedinternalformat>,
>+    The maximum number of samples supported can be determined by calling
>+    GetInternalformativ with a <pname> of SAMPLES (see section 6.1.15).
>+    An INVALID_OPERATION is generated if the value of TEXTURE_IMMUTABLE_FORMAT
>+    for the texture currently bound to <target> on the active texture unit is
>+    TRUE.
>+    An OUT_OF_MEMORY error is generated if the GL is unable to create a texture
>+    image of the requested size.
>+
>+    Modify Section 3.8.7, "Texture Parameters":
>+
>+    (add TEXTURE_2D_MULTISAMPLE_ANGLE to the texture targets accepted by
>+    TexParameter*)
>+
>+    <target> is the target, either TEXTURE_2D, TEXTURE_3D, TEXTURE_2D_ARRAY,
>+    TEXTURE_CUBE_MAP, or TEXTURE_2D_MULTISAMPLE_ANGLE.
>+
>+    Add the following paragraph to the end of Section 3.8.7:
>+
>+    An INVALID_ENUM is generated if <target> is TEXTURE_2D_MULTISAMPLE_ANGLE
>+    and <pname> is any sampler state from table 6.10. An INVALID_OPERATION
>+    error is generated if <target> is TEXTURE_2D_MULTISAMPLE_ANGLE, and
>+    <pname> TEXTURE_BASE_LEVEL is set to any value other than zero.
>+
>+    Modify Section 3.8.14, "Texture State" (p. 162):
>+
>+    (... the compressed flag set to FALSE, and a zero compressed size).
>+
>+    Multisample textures also contain an integer identifying the number of
>+    samples in each texel, and a boolean indicating whether identical sample
>+    locations and number of samples will be used for all texels in the image.
>+
>+Additions to Chapter 4 of the OpenGL ES 3.0.5 Specification (Per-Fragment
>+Operations and the Framebuffer)
>+
>+    Modify Section 4.1.3, "Multisample Fragment Operations" (p. 174):
>+
>+    (modify the first paragraph to include SAMPLE_MASK_ANGLE and
>+    SAMPLE_MASK_VALUE_ANGLE on the list of values the coverage value is
>+    modified based on.)
>+
>+    This step modifies fragment alpha and coverage values based on the values
>+    of SAMPLE_ALPHA_TO_COVERAGE, SAMPLE_COVERAGE, SAMPLE_COVERAGE_VALUE,
>+    SAMPLE_COVERAGE_INVERT, SAMPLE_MASK_ANGLE, and SAMPLE_MASK_VALUE_ANGLE.
>+
>+    Add to the end of Section 4.1.3, after the discussion of SAMPLE_COVERAGE:
>+
>+    If SAMPLE_MASK_ANGLE is enabled, the fragment coverage is ANDed
>+    with the coverage value SAMPLE_MASK_VALUE_ANGLE.
>+
>+    The value of SAMPLE_MASK_VALUE_ANGLE is specified using
>+
>+        void SampleMaskiANGLE(GLuint maskNumber, GLbitfield mask);
>+
>+    with <mask> set to the desired mask for mask word <maskNumber>. Bit B of
>+    mask word M corresponds to sample 32*M+B as described in Section 3.3. The
>+    sample mask value is queried by calling GetIntegeri_v with <target> set to
>+    SAMPLE_MASK_VALUE_ANGLE and the index set to <maskNumber>.
>+
>+    An INVALID_VALUE error is generated if <maskNumber> is greater than or
>+    equal to the value of MAX_SAMPLE_MASK_WORDS_ANGLE.
>+
>+    Modify Section 4.4.2, "Attaching Images to Framebuffer Objects":
>+
>+    (the first paragraph of RenderbufferStorageMultisample p. 204)
>+
>+    ... If either <width> or <height> is greater than the value of
>+    MAX_RENDERBUFFER_SIZE, then the error INVALID_VALUE is generated. If
>+    <samples> is greater than the maximum number of samples supported for
>+    <sizedinternalformat>, then the error INVALID_OPERATION is generated (see
>+    GetInternalformativ in section 6.1.15). If the GL is unable to create
>+    a data store of the requested size, the error OUT_OF_MEMORY is generated.
>+
>+    (the third paragraph of "Required Renderbuffer Formats" p. 205):
>+
>+    Implementations must support creation of renderbuffers in these
>+    required formats with up to the value of MAX_SAMPLES multisamples,
>+    with the exception that the signed and unsigned integer formats are
>+    required only to support creation of renderbuffers with up to the
>+    value of MAX_INTEGER_SAMPLES_ANGLE multisamples, which must be at
>+    least one.
>+
>+    (modify section 4.4.2.4 "Attaching Texture Images to a Framebuffer",
>+    describing FrameBufferTexture2D p. 207)
>+
>+    If texture is not zero, then texture must either name an existing
>+    two-dimensional texture object and textarget must be TEXTURE_2D, texture
>+    must name an existing cube map texture and textarget must be one of the
>+    cube map face targets from table 3.21, or texture must name an existing
>+    multisample texture and textarget must be TEXTURE_2D_MULTISAMPLE_ANGLE.
>+    Otherwise, an INVALID_OPERATION error is generated.
>+
>+    <level> specifies ...
>+
>+    If <textarget> is TEXTURE_2D_MULTISAMPLE_ANGLE, then <level> must be zero.
>+    Otherwise, an INVALID_VALUE error is generated. If textarget is one of ...
>+
>+
>+    Modify Section 4.4.4.2, "Whole Framebuffer Completeness":
>+
>+    (modify the last bullet at the top of p. 215)
>+
>+    - The value of RENDERBUFFER_SAMPLES is the same for all attached
>+      renderbuffers; the value of TEXTURE_SAMPLES_ANGLE is the same for all
>+      attached textures; and, if the attached images are a mix of
>+      renderbuffers and textures, the value of RENDERBUFFER_SAMPLES
>+      matches the value of TEXTURE_SAMPLES_ANGLE.
>+
>+      { FRAMEBUFFER_INCOMPLETE_MULTISAMPLE }
>+
>+    (add one more bullet after the last bullet, p. 215)
>+
>+    - The value of TEXTURE_FIXED_SAMPLE_LOCATIONS_ANGLE is the same for all
>+      attached textures; and, if the attached images are a mix of renderbuffers
>+      and textures, the value of TEXTURE_FIXED_SAMPLE_LOCATIONS_ANGLE must be
>+      TRUE for all attached textures.
>+
>+      { FRAMEBUFFER_INCOMPLETE_MULTISAMPLE }
>+
>+Additions to Chapter 6 of the OpenGL ES 3.0.5 Specification (State and State
>+Requests)
>+
>+    Modify Section 6.1.3, "Enumerated Queries":
>+
>+    (modify the paragraph describing the <target> parameter of
>+    GetTexParameter*)
>+
>+    <target> may be one of TEXTURE_2D, TEXTURE_3D, TEXTURE_2D_ARRAY,
>+    TEXTURE_CUBE_MAP, or TEXTURE_2D_MULTISAMPLE_ANGLE, indicating the
>+    currently bound two-dimensional, three-dimensional, two-dimensional
>+    array, cube map, or two-dimensional multisample texture object,
>+    respectively.
>+
>+    An INVALID_ENUM is generated if <target> is not one of the texture
>+    targets described above.
>+    An INVALID_ENUM is generated if <pname> is not one of the texture
>+    parameters described above.
>+
>+    Modify Section 6.1.4 "Texture Queries":
>+
>+    (Add the following text to the end of the section)
>+
>+    The commands
>+
>+        void GetTexLevelParameter{if}vANGLE(enum target, int level,
>+                                            enum pname, T *params );
>+
>+    place information about texture image parameter <pname> for level-of-detail
>+    <level> of the specified target into <params>. <pname> must be one of the
>+    symbolic values in table 6.11.
>+
>+    <target> may be one of TEXTURE_2D, TEXTURE_3D, TEXTURE_2D_ARRAY, one of
>+    the cube map face targets from table 3.18, or TEXTURE_2D_MULTISAMPLE_ANGLE,
>+    indicating the two- or three-dimensional texture, two-dimensional array
>+    texture, one of the six distinct 2D images making up the cube map texture
>+    object, or two-dimensional multisample texture. Otherwise an INVALID_ENUM is
>+    generated.
>+
>+    <level> determines which level-of-detail's state is returned. If <level>
>+    is negative or larger than the maximum allowable level-of-detail, then an
>+    INVALID_VALUE error is generated.
>+
>+    Note that TEXTURE_CUBE_MAP is not a valid <target> parameter for
>+    GetTexLevelParameter{if}vANGLE, because it does not specify a particular
>+    cube map face.
>+
>+    For texture images with uncompressed internal formats, queries of
>+    <pname> TEXTURE_RED_TYPE, TEXTURE_GREEN_TYPE, TEXTURE_BLUE_TYPE,
>+    TEXTURE_ALPHA_TYPE, and TEXTURE_DEPTH_TYPE return the data type used
>+    to store the component. Types NONE, SIGNED_NORMALIZED, UNSIGNED_-
>+    NORMALIZED, FLOAT, INT, and UNSIGNED_INT respectively indicate missing,
>+    signed normalized fixed-point, unsigned normalized fixed-point,
>+    floating-point, signed unnormalized integer, and unsigned unnormalized
>+    integer components. Queries of <pname> TEXTURE_RED_SIZE, TEXTURE_GREEN_SIZE,
>+    TEXTURE_BLUE_SIZE, TEXTURE_ALPHA_SIZE, TEXTURE_DEPTH_SIZE,
>+    TEXTURE_STENCIL_SIZE, and TEXTURE_SHARED_SIZE return the actual resolutions
>+    of the stored image components, not the resolutions specified when the image
>+    was defined. Invalid <pname> generate an INVALID_ENUM error.
>+
>+    For texture images with compressed internal formats, the types returned
>+    specify how components are interpreted after decompression, while the
>+    resolutions returned specify the component resolution of an uncompressed
>+    internal format that produces an image of roughly the same quality as the
>+    compressed image in question. Since the quality of the implementation's
>+    compression algorithm is likely data-dependent, the returned component sizes
>+    should be treated only as rough approximations.
>+
>+    Queries of <pname> TEXTURE_INTERNAL_FORMAT, TEXTURE_WIDTH, TEXTURE_HEIGHT,
>+    and TEXTURE_DEPTH return the internal format, width, height, and depth,
>+    respectively, as specified when the image array was created.
>+
>+    Queries of <pname> TEXTURE_SAMPLES_ANGLE, and
>+    TEXTURE_FIXED_SAMPLE_LOCATIONS_ANGLE on multisample textures return the
>+    number of samples and whether texture sample fixed locations are enabled,
>+    respectively. For non-multisample texture, the default values 0 and TRUE
>+    as in new added table 6.11 are returned respectively.
>+
>+    Modify Section 6.1.15, "Internal Format Queries":
>+
>+    (modify the paragraph describing target as follows, p. 244)
>+
>+    <target> indicates the usage of the internalformat, and must be either
>+    RENDERBUFFER or TEXTURE_2D_MULTISAMPLE_ANGLE, indicating the renderbuffer,
>+    or two-dimensional multisample texture. Otherwise an INVALID_ENUM error
>+    is generated.
>+
>+    (add the following paragraph after "Querying SAMPLES with a <bufSize>
>+    ...")
>+
>+    The maximum value of SAMPLES is guaranteed to be at least the lowest of
>+    the value of MAX_INTEGER_SAMPLES_ANGLE if internal format is a signed or
>+    unsigned integer format, the value of MAX_DEPTH_TEXTURE_SAMPLES_ANGLE if
>+    internalformat is a depth or stencil-renderable format and target is
>+    TEXTURE_2D_MULTISAMPLE_ANGLE, the value of MAX_COLOR_TEXTURE_SAMPLES_ANGLE
>+    if internal format is a color-renderable format and target is
>+    TEXTURE_2D_MULTISAMPLE_ANGLE, or the value of MAX_SAMPLES.
>+
>+    (remove the last paragraph on p. 244)
>+    "Since multisampling is not supported for signed and unsigned integer
>+    internal formats, the value of NUM_SAMPLE_COUNTS will be zero for such
>+    formats."
>+
>+    (modify to the first paragraph on p. 245)
>+    When query every accepted <internalformat> on multisample renderbuffer or
>+    texture, the value of NUM_SAMPLE_COUNTS is guaranteed to be at least
>+    one, and the maximum value in SAMPLES is guaranteed to be at least the
>+    value of MAX_SAMPLES. If <target> does not support multisample (is not
>+    multisample renderbuffer or texture), the value of NUM_SAMPLE_COUNTS will
>+    be zero for any accepted <internalformat>.
>+
>+Errors
>+
>+    The error INVALID_VALUE is generated by GetIntegeri_v if <target> is
>+    SAMPLE_MASK_VALUE_ANGLE and <index> is greater than or equal to
>+    MAX_SAMPLE_MASK_WORDS_ANGLE.
>+
>+    The error INVALID_VALUE is generated by SampleMaskiANGLE if <index> is
>+    greater than or equal to MAX_SAMPLE_MASK_WORDS_ANGLE.
>+
>+    The error INVALID_ENUM is generated by TexStorage2DMultisampleANGLE if
>+    <target> is not TEXTURE_2D_MULTISAMPLE_ANGLE.
>+
>+    The error INVALID_OPERATION is generated by TexStorage2DMultisampleANGLE
>+    if zero is bound to <target>.
>+
>+    The error INVALID_VALUE is generated by TexStorage2DMultisampleANGLE if
>+    <width> or <height> is less than 1 or greater than the value of
>+    MAX_TEXTURE_SIZE.
>+
>+    The error INVALID_VALUE is generated by TexStorage2DMultisampleANGLE if
>+    <samples> is zero.
>+
>+    The error INVALID_ENUM is generated by TexStorage2DMultisampleANGLE if
>+    <sizedinternalformat> is not color-renderable, depth-renderable, or
>+    stencil-renderable (as defined
>+    in section 4.4.4).
>+
>+    The error INVALID_ENUM is generated by TexStorage2DMultisampleANGLE if
>+    <sizedinternalformat> is one of the unsized base internal formats listed
>+    in table 3.11.
>+
>+    The error INVALID_OPERATION is generated by TexStorage2DMultisampleANGLE
>+    if <samples> is greater than the maximum number of samples supported for
>+    this <target> and <sizedinternalformat>, The maximum number of samples
>+    supported can be determined by calling GetInternalformativ with a <pname>
>+    of SAMPLES (see section 6.1.15).
>+
>+    The error INVALID_OPERATION is generated by TexStorage2DMultisampleANGLE
>+    if the value of TEXTURE_IMMUTABLE_FORMAT for the texture currently bound
>+    to <target> on the active texture unit is TRUE.
>+
>+    The error OUT_OF_MEMORY is generated by TexStorage2DMultisampleANGLE
>+    if the GL is unable to create a texture image of the requested size.
>+
>+    The error INVALID_ENUM is generated by GetMultisamplefvANGLE if <pname>
>+    is not SAMPLE_POSITION_ANGLE.
>+
>+    The error INVALID_VALUE is generated by GetMultisamplefvANGLE if <index>
>+    is greater than or equal to the value of SAMPLES.
>+
>+    The error INVALID_OPERATION is generated by RenderbufferStorageMultisample
>+    if <sizedinternalformat> is a signed or unsigned integer format and
>+    <samples> is greater than the value of MAX_INTEGER_SAMPLES_ANGLE.
>+
>+    The error INVALID_OPERATION is generated by TexParameter* if <target> is
>+    TEXTURE_2D_MULTISAMPLE_ANGLE, <pname> is TEXTURE_BASE_LEVEL, and <value>
>+    is not zero.
>+
>+    The error INVALID_OPERATION is generated by TexParameter* if <target> is
>+    TEXTURE_2D_MULTISAMPLE_ANGLE and <pname> is sampler state value from table
>+    6.10.
>+
>+    The error INVALID_ENUM is generated by GetTexLevelParameter{if}vANGLE
>+    if <target> is not one of TEXTURE_2D, TEXTURE_3D, TEXTURE_2D_ARRAY, one of
>+    the cube map face targets from table 3.18, or TEXTURE_2D_MULTISAMPLE_ANGLE.
>+
>+    The error INVALID_VALUE is generated by GetTexLevelParameter{if}vANGLE
>+    if <level> is negative or larger than the maximum allowable level-of-detail.
>+
>+    The error INVALID_ENUM is generated by GetTexLevelParameter{if}vANGLE
>+    if <value> is not one of TEXTURE_RED_TYPE, TEXTURE_GREEN_TYPE,
>+    TEXTURE_BLUE_TYPE, TEXTURE_ALPHA_TYPE, TEXTURE_DEPTH_TYPE,
>+    TEXTURE_DEPTH_SIZE, TEXTURE_STENCIL_SIZE, TEXTURE_SHARED_SIZE,
>+    TEXTURE_SAMPLES_ANGLE, TEXTURE_FIXED_SAMPLE_LOCATIONS_ANGLE, TEXTURE_WIDTH,
>+    TEXTURE_HEIGHT, TEXTURE_DEPTH, TEXTURE_INTERNAL_FORMAT, TEXTURE_RED_SIZE,
>+    TEXTURE_GREEN_SIZE, TEXTURE_BLUE_SIZE, TEXTURE_ALPHA_SIZE,
>+    or TEXTURE_COMPRESSED.
>+
>+New State
>+
>+    (add to table 6.7, Multisampling p. 252)
>+
>+                                                               Initial
>+    Get Value                           Type    Get Command     Value     Description                     Sec.
>+    ---------                           ----    -----------    -------    ----------------------          -----
>+    SAMPLE_MASK_ANGLE                   B       IsEnabled      FALSE      Additional sample mask          4.1.3
>+    SAMPLE_MASK_VALUE_ANGLE             nxZ+    GetIntegeri_v  ~0         Additional sample mask value    4.1.3
>+
>+    Where n is the number of sample mask words (the value of
>+    MAX_SAMPLE_MASK_WORDS_ANGLE) the implementation supports.
>+
>+    (add to table 6.8, Textures (selector, state per texture unit) p. 253)
>+
>+                                                                     Initial
>+    Get Value                                 Type     Get Command    Value  Description                   Sec.
>+    ------------------------------------      ----     -----------    ------ ---------------------------   -----
>+    TEXTURE_BINDING_2D_MULTISAMPLE_ANGLE        32*xZ+   GetIntegerv    0      Texture object bound to     3.8.1
>+                                                                             TEXTURE_2D_MULTISAMPLE_ANGLE
>+
>+    (add new table 6.10, Textures (state per texture image), renumber subsequent tables)
>+
>+                                                                          Initial
>+    Get Value                            Type   Get Command                Value   Description                  Sec.
>+    ----------------------               ----   -------------------        ------  ---------------------------  ------
>+    TEXTURE_SAMPLES_ANGLE                 Z+    GetTexLevelParameterANGLE  0       Number of samples per texel  3.8.5
>+    TEXTURE_FIXED_SAMPLE_LOCATIONS_ANGLE  B     GetTexLevelParameterANGLE  TRUE    Whether the image uses a     3.8.5
>+                                                                                   fixed sample pattern
>+
>+    TEXTURE_WIDTH                         Z+    GetTexLevelParameterANGLE  0       Specified width              3.8
>+    TEXTURE_HEIGHT                        Z+    GetTexLevelParameterANGLE  0       Specified height (2D/3D)     3.8
>+    TEXTURE_DEPTH                         Z+    GetTexLevelParameterANGLE  0       Specified depth (3D)         3.8
>+    TEXTURE_INTERNAL_FORMAT               E     GetTexLevelParameterANGLE  RGBA    Internal format              3.8
>+                                                                           or R8   (see section 3.8.14)
>+    TEXTURE_x_SIZE                        6xZ+  GetTexLevelParameterANGLE  0       Component resolution (x is   3.8
>+                                                                                   RED, GREEN, BLUE, ALPHA,
>+                                                                                   DEPTH, or STENCIL)
>+    TEXTURE_SHARED_SIZE                   Z+    GetTexLevelParameterANGLE  0       Shared exponent field        3.8
>+                                                                                   resolution
>+    TEXTURE_x_TYPE                        E     GetTexLevelParameterANGLE  NONE    Component type (x is RED,    6.1.4
>+                                                                                   GREEN, BLUE, ALPHA, or
>+                                                                                   DEPTH)
>+    TEXTURE_COMPRESSED                    B     GetTexLevelParameterANGLE  FALSE   True if image has a          3.8.6
>+                                                                                   compressed internal format
>+
>+    (add to table 6.35, Framebuffer dependent Values, p. 280)
>+
>+                                                              Initial
>+    Get Value               Type        Get Command            Value           Description      Sec.
>+    ------------------      ----------  ------------------     --------------  ---------------  ------
>+    SAMPLE_POSITION_ANGLE   N*2*R[0,1]  GetMultisamplefvANGLE  implementation  Explicit sample  3.3.1
>+                                                               dependent       positions
>+
>+    Where N is the number of samples (the value of SAMPLES) the framebuffer supports.
>+
>+New Implementation Dependent State
>+
>+                                                          Minimum
>+    Get Value                        Type    Get Command  Value   Description                Sec.
>+    ---------                        ------- -----------  ------- ------------------------   ------
>+    MAX_SAMPLE_MASK_WORDS_ANGLE      Z+      GetIntegerv  1       maximum number of sample   4.1.3
>+                                                                  mask words
>+    MAX_COLOR_TEXTURE_SAMPLES_ANGLE  Z+      GetIntegerv  1       maximum number of samples  4.1.3
>+                                                                  in a color multisample
>+                                                                  texture
>+    MAX_DEPTH_TEXTURE_SAMPLES_ANGLE  Z+      GetIntegerv  1       maximum number of samples  4.1.3
>+                                                                  in a depth/stencil
>+                                                                  multisample texture
>+    MAX_INTEGER_SAMPLES_ANGLE        Z+      GetIntegerv  1       Maximum number of samples  4.4.2
>+                                                                  in integer format
>+                                                                  multisample buffers
>+
>+Modifications to the OpenGL ES Shading Language Specification, Version 3.00,
>+Document Revision 6
>+
>+    Including the following line in a shader can be used to control the
>+    language featured described in this extension:
>+
>+      #extension GL_ANGLE_texture_multisample : <behavior>
>+
>+    where <behavior> is as specified in section 3.5.
>+
>+    A new preprocessor #define is added to the OpenGL ES Shading Language:
>+
>+      #define GL_ANGLE_texture_multisample 1
>+
>+    Add to section 3.8 "Keywords":
>+
>+    The following new sampler types are added:
>+
>+      sampler2DMS, isampler2DMS, usampler2DMS,
>+
>+    Add to section 4.1 "Basic Types":
>+
>+    Add the following sampler type to the "Floating Point Sampler
>+    Types (opaque)" table:
>+
>+      sampler2DMS    handle for accessing a 2D multisample texture
>+
>+    Add the following sampler type to the "Unsigned Integer Sampler
>+    Types (opaque)" table:
>+
>+      usampler2DMS    handle for accessing an unsigned integer 2D
>+                      multisample texture
>+
>+    Add the following sampler type to the "Integer Sampler Types" table:
>+
>+      isampler2DMS    handle for accessing an integer 2D
>+                      multisample texture
>+
>+    Add to section 8.8 "Texture Lookup Functions":
>+
>+    Add new functions to the set of allowed texture lookup functions:
>+
>+    Syntax:
>+
>+      gvec4 texelFetch(gsampler2DMS sampler, ivec2 P, int sample)
>+
>+    Description:
>+
>+      Use integer texture coordinate <P> to lookup a single sample
>+      <sample> on the texture bound to <sampler> as described in section
>+      2.12.9.3 of the OpenGL ES specification "Multisample Texel Fetches".
>+
>+    Syntax:
>+
>+      ivec2 textureSize(gsampler2DMS sampler)
>+
>+    Description:
>+
>+      Returns the dimensions, width and height of level 0 for the
>+      texture bound to <sampler>, as described in section 2.12.9.4 of
>+      the OpenGL ES specification section "Texture Size Query".
>+
>+Examples
>+
>+Issues
>+    None
>+
>+Revision History
>+
>+    Rev.    Date    Author       Changes
>+    ----  --------  ----------   --------------------------------------------
>+    1     08/27/18   Yunchao He  First revision. Adapted from OpenGL ES
>+                                 specification 3.1, OpenGLSL ES specification
>+                                 3.10 at document revision 4, and
>+                                 ARB_texture_multisample at revision 12.
>diff --git a/Source/ThirdParty/ANGLE/extensions/ANGLE_texture_usage.txt b/Source/ThirdParty/ANGLE/extensions/ANGLE_texture_usage.txt
>new file mode 100644
>index 00000000000..17936538f7d
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/extensions/ANGLE_texture_usage.txt
>@@ -0,0 +1,202 @@
>+Name
>+
>+    ANGLE_texture_usage
>+
>+Name Strings
>+
>+    GL_ANGLE_texture_usage
>+
>+Contributors
>+
>+    Nicolas Capens, TransGaming
>+    Daniel Koch, TransGaming
>+
>+Contact
>+
>+    Daniel Koch, TransGaming (daniel 'at' transgaming.com)
>+
>+Status
>+
>+    Complete
>+
>+Version
>+
>+    Last Modified Date:  November 10, 2011
>+    Version:             2
>+
>+Number
>+
>+    OpenGL ES Extension #112 
>+
>+Dependencies
>+
>+    This extension is written against the OpenGL ES 2.0 Specification.
>+
>+Overview
>+
>+    In some implementations it is advantageous to know the expected
>+    usage of a texture before the backing storage for it is allocated.  
>+    This can help to inform the implementation's choice of format
>+    and type of memory used for the allocation. If the usage is not
>+    known in advance, the implementation essentially has to make a 
>+    guess as to how it will be used.  If it is later proven wrong,
>+    it may need to perform costly re-allocations and/or reformatting 
>+    of the texture data, resulting in reduced performance.
>+
>+    This extension adds a texture usage flag that is specified via
>+    the TEXTURE_USAGE_ANGLE TexParameter.  This can be used to 
>+    indicate that the application knows that this texture will be 
>+    used for rendering.
>+
>+IP Status
>+
>+    No known IP claims.
>+
>+New Procedures and Functions
>+
>+    None
>+
>+New Tokens
>+
>+    Accepted as a value for <pname> for the TexParameter{if} and 
>+    TexParameter{if}v commands and for the <value> parameter of
>+    GetTexParameter{if}v: 
>+
>+        TEXTURE_USAGE_ANGLE                     0x93A2
>+
>+    Accepted as a value to <param> for the TexParameter{if} and 
>+    to <params> for the TexParameter{if}v commands with a <pname> of 
>+    TEXTURE_USAGE_ANGLE; returned as possible values for <data> when 
>+    GetTexParameter{if}v is queried with a <value> of TEXTURE_USAGE_ANGLE:
>+
>+        NONE                                    0x0000
>+        FRAMEBUFFER_ATTACHMENT_ANGLE            0x93A3
>+
>+Additions to Chapter 2 of the OpenGL ES 2.0 Specification (OpenGL ES Operation)
>+
>+    None
>+
>+Additions to Chapter 3 of the OpenGL ES 2.0 Specification (Rasterization)
>+
>+    Add a new row to Table 3.10 (Texture parameters and their values):
>+
>+    Name                | Type | Legal Values 
>+    ------------------------------------------------------------
>+    TEXTURE_USAGE_ANGLE | enum | NONE, FRAMEBUFFER_ATTACHMENT_ANGLE
>+
>+    Add a new section 3.7.x (Texture Usage) before section 3.7.12 and 
>+    renumber the subsequent sections: 
>+
>+    "3.7.x Texture Usage
>+
>+    Texture usage can be specified via the TEXTURE_USAGE_ANGLE value
>+    for the <pname> argument to TexParameter{if}[v]. In order to take effect,
>+    the texture usage must be specified before the texture contents are
>+    defined either via TexImage2D or TexStorage2DEXT.
>+
>+    The usage values can impact the layout and type of memory used for the 
>+    texture data. Specifying incorrect usage values may result in reduced
>+    functionality and/or significantly degraded performance.
>+
>+    Possible values for <params> when <pname> is TEXTURE_USAGE_ANGLE are:
>+
>+    NONE - the default. No particular usage has been specified and it is
>+        up to the implementation to determine the usage of the texture.
>+        Leaving the usage unspecified means that the implementation may 
>+        have to reallocate the texture data as the texture is used in 
>+        various ways.
>+
>+    FRAMEBUFFER_ATTACHMENT_ANGLE - this texture will be attached to a 
>+        framebuffer object and used as a desination for rendering or blits."
>+
>+    Modify section 3.7.12 (Texture State) and place the last 3 sentences
>+    with the following:
>+
>+    "Next, there are the three sets of texture properties; each consists of
>+    the selected minification and magnification filters, the wrap modes for
>+    <s> and <t>, and the usage flags. In the initial state, the value assigned
>+    to TEXTURE_MIN_FILTER is NEAREST_MIPMAP_LINEAR, and the value for 
>+    TEXTURE_MAG_FILTER is LINEAR. <s> and <t> wrap modes are both set to
>+    REPEAT. The initial value for TEXTURE_USAGE_ANGLE is NONE."
>+
>+
>+Additions to Chapter 4 of the OpenGL ES 2.0 Specification (Per-Fragment
>+Operations and the Framebuffer)
>+
>+    None
>+
>+Additions to Chapter 5 of the OpenGL ES 2.0 Specification (Special
>+Functions):
>+
>+    None
>+
>+Additions to Chapter 6 of the OpenGL ES 2.0 Specification (State and
>+State Requests)
>+
>+    None
>+
>+Dependencies on EXT_texture_storage
>+
>+    If EXT_texture_storage is not supported, omit any references to 
>+    TexStorage2DEXT.
>+
>+Errors
>+
>+    If TexParameter{if} or TexParamter{if}v is called with a <pname>
>+    of TEXTURE_USAGE_ANGLE and the value of <param> or <params> is not
>+    NONE or FRAMEBUFFER_ATTACHMENT_ANGLE the error INVALID_VALUE is
>+    generated.
>+
>+Usage Example
>+
>+    /* create and bind texture */
>+    glGenTextures(1, &texture);
>+    glActiveTexture(GL_TEXTURE0);
>+    glBindTexture(GL_TEXTURE_2D, texture);
>+
>+    /* specify texture parameters */
>+    glTexParameteri(GL_TEXTURE_2D, GL_*, ...);  /* as before */
>+    
>+    /* specify that we'll be rendering to the texture */
>+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_USAGE_ANGLE, GL_FRAMEBUFFER_ATTACHMENT_ANGLE);
>+
>+    glTexStorage2DEXT(GL_TEXTURE_2D, levels, ...); // Allocation
>+    for(int level = 0; level < levels; ++level)
>+        glTexSubImage2D(GL_TEXTURE_2D, level, ...); // Initialisation
>+
>+Issues
>+
>+    1. Should there be a dynamic usage value?
>+   
>+       DISCUSSION: We could accept a dynamic flag to indicate that a texture will
>+       be updated frequently. We could map this to D3D9 dynamic textures. This would
>+       allow us to avoid creating temporary surfaces when updating the texture.
>+       However renderable textures cannot be dynamic in D3D9, which eliminates the 
>+       primary use case for this.  Furthermore, the memory usage of dynamic textures
>+       typically increases threefold when you lock it.
>+
>+    2. Should the texture usage be an enum or a bitfield?
>+
>+       UNRESOLVED.  Using a bitfield would allow combination of values to be specified.
>+       On the other hand, if combinations are really required, additional <pnames>
>+       could be added as necessary.  Querying a bitfield via the GetTexParameter command
>+       feels a bit odd.
>+
>+    3. What should happen if TEXTURE_USAGE_ANGLE is set/changed after the texture
>+       contents have been specified?
>+
>+       RESOLVED: It will have no effect. However, if the texture is redefined (for 
>+       example by TexImage2D) the new allocation will use the updated usage.
>+       GetTexParameter is used to query the value of the TEXTURE_USAGE_ANGLE
>+       state that was last set by TexParameter for the currently bound texture, or
>+       the default value if it has never been set. There is no way to determine the 
>+       usage that was in effect at the time the texture was defined.
>+
>+Revision History
>+
>+    Rev.    Date      Author     Changes
>+    ----  ----------- ---------  ----------------------------------------
>+      1   10 Nov 2011 dgkoch     Initial revision
>+      2   10 Nov 2011 dgkoch     Add overview
>+   
>+
>diff --git a/Source/ThirdParty/ANGLE/extensions/ANGLE_timer_query.txt b/Source/ThirdParty/ANGLE/extensions/ANGLE_timer_query.txt
>new file mode 100644
>index 00000000000..c1371ad8bb2
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/extensions/ANGLE_timer_query.txt
>@@ -0,0 +1,591 @@
>+Name
>+
>+    ANGLE_timer_query
>+
>+Name Strings
>+
>+    GL_ANGLE_timer_query
>+
>+Contributors
>+
>+    Contributors to ARB_occlusion_query
>+    Contributors to EXT_timer_query
>+    Contributors to ARB_timer_query
>+    Ben Vanik, Google Inc.
>+    Daniel Koch, TransGaming Inc.
>+
>+Contact
>+
>+    Ben Vanik, Google Inc. (benvanik 'at' google 'dot' com)
>+
>+Status
>+
>+    Draft
>+
>+Version
>+
>+    Last Modified Date: Apr 28, 2011
>+    Author Revision: 1
>+
>+Number
>+
>+    OpenGL ES Extension #??
>+
>+Dependencies
>+
>+    OpenGL ES 2.0 is required.
>+
>+    The extension is written against the OpenGL ES 2.0 specification.
>+
>+Overview
>+
>+    Applications can benefit from accurate timing information in a number of
>+    different ways.  During application development, timing information can
>+    help identify application or driver bottlenecks.  At run time,
>+    applications can use timing information to dynamically adjust the amount
>+    of detail in a scene to achieve constant frame rates.  OpenGL
>+    implementations have historically provided little to no useful timing
>+    information.  Applications can get some idea of timing by reading timers
>+    on the CPU, but these timers are not synchronized with the graphics
>+    rendering pipeline.  Reading a CPU timer does not guarantee the completion
>+    of a potentially large amount of graphics work accumulated before the
>+    timer is read, and will thus produce wildly inaccurate results.
>+    glFinish() can be used to determine when previous rendering commands have
>+    been completed, but will idle the graphics pipeline and adversely affect
>+    application performance.
>+
>+    This extension provides a query mechanism that can be used to determine
>+    the amount of time it takes to fully complete a set of GL commands, and
>+    without stalling the rendering pipeline.  It uses the query object
>+    mechanisms first introduced in the occlusion query extension, which allow
>+    time intervals to be polled asynchronously by the application.
>+
>+IP Status
>+
>+    No known IP claims.
>+
>+New Procedures and Functions
>+
>+    void GenQueriesANGLE(sizei n, uint *ids);
>+    void DeleteQueriesANGLE(sizei n, const uint *ids);
>+    boolean IsQueryANGLE(uint id);
>+    void BeginQueryANGLE(enum target, uint id);
>+    void EndQueryANGLE(enum target);
>+    void QueryCounterANGLE(uint id, enum target);
>+    void GetQueryivANGLE(enum target, enum pname, int *params);
>+    void GetQueryObjectivANGLE(uint id, enum pname, int *params);
>+    void GetQueryObjectuivANGLE(uint id, enum pname, uint *params);
>+    void GetQueryObjecti64vANGLE(uint id, enum pname, int64 *params);
>+    void GetQueryObjectui64vANGLE(uint id, enum pname, uint64 *params);
>+
>+New Tokens
>+
>+    Accepted by the <pname> parameter of GetQueryivANGLE:
>+
>+        QUERY_COUNTER_BITS_ANGLE                       0x8864
>+        CURRENT_QUERY_ANGLE                            0x8865
>+
>+    Accepted by the <pname> parameter of GetQueryObjectivANGLE,
>+    GetQueryObjectuivANGLE, GetQueryObjecti64vANGLE, and
>+    GetQueryObjectui64vANGLE:
>+
>+        QUERY_RESULT_ANGLE                             0x8866
>+        QUERY_RESULT_AVAILABLE_ANGLE                   0x8867
>+        
>+    Accepted by the <target> parameter of BeginQueryANGLE, EndQueryANGLE, and
>+    GetQueryivANGLE:
>+
>+        TIME_ELAPSED_ANGLE                             0x88BF
>+
>+    Accepted by the <target> parameter of GetQueryivANGLE and
>+    QueryCounterANGLE:
>+
>+        TIMESTAMP_ANGLE                                0x8E28
>+
>+Additions to Chapter 2 of the OpenGL ES 2.0 Specification (OpenGL ES Operation)
>+
>+    (Modify table 2.1, Correspondence of command suffix letters to GL argument)
>+    Add two new types:
>+    
>+    Letter Corresponding GL Type
>+    ------ ---------------------
>+    i64    int64ANGLE
>+    ui64   uint64ANGLE
>+
>+    (Modify table 2.2, GL data types) Add two new types:
>+    
>+    GL Type       Minimum Bit Width   Description
>+    -------       -----------------   -----------------------------
>+    int64ANGLE    64                  Signed 2's complement integer
>+    uint64ANGLE   64                  Unsigned binary integer
>+
>+Additions to Chapter 5 of the OpenGL ES 2.0 Specification (Special Functions)
>+
>+    Add a new section 5.3 "Timer Queries":
>+
>+    "5.3  Timer Queries
>+
>+    Timer queries use query objects to track the amount of time needed to
>+    fully complete a set of GL commands, or to determine the current time
>+    of the GL.
>+    
>+    Timer queries are associated with query objects.  The command
>+
>+      void GenQueriesANGLE(sizei n, uint *ids);
>+
>+    returns <n> previously unused query object names in <ids>.  These
>+    names are marked as used, but no object is associated with them until
>+    the first time they are used by BeginQueryANGLE.  Query objects contain
>+    one piece of state, an integer result value.  This result value is
>+    initialized to zero when the object is created.  Any positive integer
>+    except for zero (which is reserved for the GL) is a valid query
>+    object name.
>+
>+    Query objects are deleted by calling
>+
>+      void DeleteQueriesANGLE(sizei n, const uint *ids);
>+
>+    <ids> contains <n> names of query objects to be deleted.  After a
>+    query object is deleted, its name is again unused.  Unused names in
>+    <ids> are silently ignored.
>+    If an active query object is deleted its name immediately becomes unused,
>+    but the underlying object is not deleted until it is no longer active.
>+
>+    A timer query can be started and finished by calling
>+
>+      void BeginQueryANGLE(enum target, uint id);
>+      void EndQueryANGLE(enum target);
>+
>+    where <target> is TIME_ELAPSED_ANGLE.  If BeginQueryANGLE is called
>+    with an unused <id>, that name is marked as used and associated with
>+    a new query object.
>+    
>+    If BeginQueryANGLE is called with an <id> of zero, if the active query
>+    object name for <target> is non-zero, if <id> is the name of an existing
>+    query object whose type does not match <target>, or if <id> is the active
>+    query object name for any query type, the error INVALID_OPERATION is
>+    generated.  If EndQueryANGLE is called while no query with the same target
>+    is in progress, an INVALID_OPERATION error is generated.
>+
>+    When BeginQueryANGLE and EndQueryANGLE are called with a <target> of
>+    TIME_ELAPSED_ANGLE, the GL prepares to start and stop the timer used for
>+    timer queries.  The timer is started or stopped when the effects from all
>+    previous commands on the GL client and server state and the framebuffer
>+    have been fully realized.  The BeginQueryANGLE and EndQueryANGLE commands
>+    may return before the timer is actually started or stopped.  When the timer
>+    query timer is finally stopped, the elapsed time (in nanoseconds) is
>+    written to the corresponding query object as the query result value, and
>+    the query result for that object is marked as available.
>+
>+    If the elapsed time overflows the number of bits, <n>, available to hold
>+    elapsed time, its value becomes undefined.  It is recommended, but not
>+    required, that implementations handle this overflow case by saturating at
>+    2^n - 1.
>+
>+    The necessary state is a single bit indicating whether an timer
>+    query is active, the identifier of the currently active timer
>+    query, and a counter keeping track of the time that has passed.
>+
>+    When the command
>+
>+         void QueryCounterANGLE(uint id, enum target);
>+
>+    is called with <target> TIMESTAMP_ANGLE, the GL records the current time
>+    into the corresponding query object. The time is recorded after all
>+    previous commands on the GL client and server state and the framebuffer
>+    have been fully realized. When the time is recorded, the query result for
>+    that object is marked available. QueryCounterANGLE timer queries can be
>+    used within a BeginQueryANGLE / EndQueryANGLE block where the <target> is
>+    TIME_ELAPSED_ANGLE and it does not affect the result of that query object.
>+    The error INVALID_OPERATION is generated if the <id> is already in use
>+    within a BeginQueryANGLE/EndQueryANGLE block."
>+
>+Additions to Chapter 6 of the OpenGL ES 2.0 Specification (State and State
>+Requests)
>+
>+    Add a new section 6.1.9 "Timer Queries":
>+
>+    "The command
>+
>+      boolean IsQueryANGLE(uint id);
>+
>+    returns TRUE if <id> is the name of a query object.  If <id> is zero,
>+    or if <id> is a non-zero value that is not the name of a query
>+    object, IsQueryANGLE returns FALSE.
>+
>+    Information about a query target can be queried with the command
>+
>+      void GetQueryivANGLE(enum target, enum pname, int *params);
>+
>+    <target> identifies the query target and can be TIME_ELAPSED_ANGLE or
>+    TIMESTAMP_ANGLE for timer queries.
>+
>+    If <pname> is CURRENT_QUERY_ANGLE, the name of the currently active query
>+    for <target>, or zero if no query is active, will be placed in <params>.
>+
>+    If <pname> is QUERY_COUNTER_BITS_ANGLE, the implementation-dependent number
>+    of bits used to hold the query result for <target> will be placed in
>+    <params>.  The number of query counter bits may be zero, in which case
>+    the counter contains no useful information.
>+
>+    For timer queries (TIME_ELAPSED_ANGLE and TIMESTAMP_ANGLE), if the number
>+    of bits is non-zero, the minimum number of bits allowed is 30 which
>+    will allow at least 1 second of timing.
>+
>+    The state of a query object can be queried with the commands
>+
>+      void GetQueryObjectivANGLE(uint id, enum pname, int *params);
>+      void GetQueryObjectuivANGLE(uint id, enum pname, uint *params);
>+      void GetQueryObjecti64vANGLE(uint id, enum pname, int64 *params);
>+      void GetQueryObjectui64vANGLE(uint id, enum pname, uint64 *params);
>+
>+    If <id> is not the name of a query object, or if the query object
>+    named by <id> is currently active, then an INVALID_OPERATION error is
>+    generated.
>+
>+    If <pname> is QUERY_RESULT_ANGLE, then the query object's result
>+    value is returned as a single integer in <params>. If the value is so
>+    large in magnitude that it cannot be represented with the requested type,
>+    then the nearest value representable using the requested type is
>+    returned. If the number of query counter bits for target is zero, then
>+    the result is returned as a single integer with the value zero.
>+    
>+    There may be an indeterminate delay before the above query returns. If
>+    <pname> is QUERY_RESULT_AVAILABLE_ANGLE, FALSE is returned if such a delay
>+    would be required; otherwise TRUE is returned. It must always be true
>+    that if any query object returns a result available of TRUE, all queries
>+    of the same type issued prior to that query must also return TRUE.
>+
>+    Querying the state for a given timer query forces that timer query to
>+    complete within a finite amount of time.
>+
>+    If multiple queries are issued on the same target and id prior to 
>+    calling GetQueryObject[u]i[64]vANGLE, the result returned will always be
>+    from the last query issued.  The results from any queries before the
>+    last one will be lost if the results are not retrieved before starting
>+    a new query on the same <target> and <id>."
>+
>+Errors
>+
>+    The error INVALID_VALUE is generated if GenQueriesANGLE is called where
>+    <n> is negative.
>+
>+    The error INVALID_VALUE is generated if DeleteQueriesANGLE is called
>+    where <n> is negative.
>+
>+    The error INVALID_OPERATION is generated if BeginQueryANGLE is called
>+    when a query of the given <target> is already active.
>+
>+    The error INVALID_OPERATION is generated if EndQueryANGLE is called
>+    when a query of the given <target> is not active.
>+
>+    The error INVALID_OPERATION is generated if BeginQueryANGLE is called
>+    where <id> is zero.
>+
>+    The error INVALID_OPERATION is generated if BeginQueryANGLE is called
>+    where <id> is the name of a query currently in progress.
>+    
>+    The error INVALID_OPERATION is generated if BeginQueryANGLE is called
>+    where <id> is the name of an existing query object whose type does not
>+    match <target>.
>+
>+    The error INVALID_ENUM is generated if BeginQueryANGLE or EndQueryANGLE
>+    is called where <target> is not TIME_ELAPSED_ANGLE.
>+
>+    The error INVALID_ENUM is generated if GetQueryivANGLE is called where
>+    <target> is not TIME_ELAPSED_ANGLE or TIMESTAMP_ANGLE.
>+
>+    The error INVALID_ENUM is generated if GetQueryivANGLE is called where
>+    <pname> is not QUERY_COUNTER_BITS_ANGLE or CURRENT_QUERY_ANGLE.
>+
>+    The error INVALID_ENUM is generated if QueryCounterANGLE is called where
>+    <target> is not TIMESTAMP_ANGLE.
>+
>+    The error INVALID_OPERATION is generated if QueryCounterANGLE is called
>+    on a query object that is already in use inside a
>+    BeginQueryANGLE/EndQueryANGLE.
>+
>+    The error INVALID_OPERATION is generated if GetQueryObjectivANGLE,
>+    GetQueryObjectuivANGLE, GetQueryObjecti64vANGLE, or
>+    GetQueryObjectui64vANGLE is called where <id> is not the name of a query
>+    object.
>+
>+    The error INVALID_OPERATION is generated if GetQueryObjectivANGLE,
>+    GetQueryObjectuivANGLE, GetQueryObjecti64vANGLE, or
>+    GetQueryObjectui64vANGLE is called where <id> is the name of a currently
>+    active query object.
>+
>+    The error INVALID_ENUM is generated if GetQueryObjectivANGLE,
>+    GetQueryObjectuivANGLE, GetQueryObjecti64vANGLE, or
>+    GetQueryObjectui64vANGLE is called where <pname> is not
>+    QUERY_RESULT_ANGLE or QUERY_RESULT_AVAILABLE_ANGLE.
>+
>+New State
>+
>+    (Add a new table 6.xx, "Query Operations")
>+    
>+    Get Value                      Type    Get Command              Initial Value   Description              Sec
>+    ---------                      ----    -----------              -------------   -----------              ------
>+    -                              B       -                        FALSE           query active             5.3
>+    CURRENT_QUERY_ANGLE            Z+      GetQueryivANGLE          0               active query ID          5.3
>+    QUERY_RESULT_ANGLE             Z+      GetQueryObjectuivANGLE,  0               samples-passed count     5.3
>+                                           GetQueryObjectui64vANGLE
>+    QUERY_RESULT_AVAILABLE_ANGLE   B       GetQueryObjectivANGLE    FALSE           query result available   5.3
>+
>+New Implementation Dependent State
>+
>+    (Add the following entry to table 6.18):
>+
>+    Get Value                      Type    Get Command      Minimum Value      Description           Sec
>+    --------------------------     ----    -----------      -------------      ----------------      ------
>+    QUERY_COUNTER_BITS_ANGLE       Z+      GetQueryivANGLE  see 6.1.9          Number of bits in     6.1.9
>+                                                                               query counter
>+
>+Examples
>+
>+    (1) Here is some rough sample code that demonstrates the intended usage
>+        of this extension.
>+
>+        GLint queries[N];
>+        GLint available = 0;
>+        // timer queries can contain more than 32 bits of data, so always
>+        // query them using the 64 bit types to avoid overflow
>+        GLuint64ANGLE timeElapsed = 0;
>+
>+        // Create a query object.
>+        glGenQueriesANGLE(N, queries);
>+
>+        // Start query 1
>+        glBeginQueryANGLE(GL_TIME_ELAPSED_ANGLE, queries[0]);
>+
>+        // Draw object 1
>+        ....
>+
>+        // End query 1
>+        glEndQueryANGLE(GL_TIME_ELAPSED_ANGLE);
>+
>+        ...
>+
>+        // Start query N
>+        glBeginQueryANGLE(GL_TIME_ELAPSED_ANGLE, queries[N-1]);
>+
>+        // Draw object N
>+        ....
>+
>+        // End query N
>+        glEndQueryANGLE(GL_TIME_ELAPSED_ANGLE);
>+
>+        // Wait for all results to become available
>+        while (!available) {
>+            glGetQueryObjectivANGLE(queries[N-1], GL_QUERY_RESULT_AVAILABLE_ANGLE, &available);
>+        }
>+
>+        for (i = 0; i < N; i++) {
>+            // See how much time the rendering of object i took in nanoseconds.
>+            glGetQueryObjectui64vANGLE(queries[i], GL_QUERY_RESULT_ANGLE, &timeElapsed);
>+
>+            // Do something useful with the time.  Note that care should be
>+            // taken to use all significant bits of the result, not just the
>+            // least significant 32 bits.
>+            AdjustObjectLODBasedOnDrawTime(i, timeElapsed);
>+        }
>+
>+        This example is sub-optimal in that it stalls at the end of every
>+        frame to wait for query results.  Ideally, the collection of results
>+        would be delayed one frame to minimize the amount of time spent
>+        waiting for the GPU to finish rendering.
>+        
>+    (2) This example is basically the same as the example above but uses
>+        QueryCounter instead.
>+    
>+        GLint queries[N+1];
>+        GLint available = 0;
>+        // timer queries can contain more than 32 bits of data, so always
>+        // query them using the 64 bit types to avoid overflow
>+        GLuint64ANGLE timeStart, timeEnd, timeElapsed = 0;
>+
>+        // Create a query object.
>+        glGenQueriesANGLE(N+1, queries);
>+
>+        // Query current timestamp 1
>+        glQueryCounterANGLE(queries[0], GL_TIMESTAMP_ANGLE);
>+
>+        // Draw object 1
>+        ....
>+
>+        // Query current timestamp N
>+        glQueryCounterANGLE(queries[N-1], GL_TIMESTAMP_ANGLE);
>+
>+        // Draw object N
>+        ....
>+
>+        // Query current timestamp N+1
>+        glQueryCounterANGLE(queries[N], GL_TIMESTAMP_ANGLE);
>+
>+        // Wait for all results to become available
>+        while (!available) {
>+            glGetQueryObjectivANGLE(queries[N], GL_QUERY_RESULT_AVAILABLE_ANGLE, &available);
>+        }
>+
>+        for (i = 0; i < N; i++) {
>+            // See how much time the rendering of object i took in nanoseconds.
>+            glGetQueryObjectui64vANGLE(queries[i], GL_QUERY_RESULT_ANGLE, &timeStart);
>+            glGetQueryObjectui64vANGLE(queries[i+1], GL_QUERY_RESULT_ANGLE, &timeEnd);
>+            timeElapsed = timeEnd - timeStart;
>+
>+            // Do something useful with the time.  Note that care should be
>+            // taken to use all significant bits of the result, not just the
>+            // least significant 32 bits.
>+            AdjustObjectLODBasedOnDrawTime(i, timeElapsed);
>+        }
>+
>+Issues from EXT_timer_query
>+
>+    (1) What time interval is being measured?
>+
>+    RESOLVED:  The timer starts when all commands prior to BeginQuery() have
>+    been fully executed.  At that point, everything that should be drawn by
>+    those commands has been written to the framebuffer.  The timer stops
>+    when all commands prior to EndQuery() have been fully executed.
>+
>+    (2) What unit of time will time intervals be returned in?
>+
>+    RESOLVED:  Nanoseconds (10^-9 seconds).  This unit of measurement allows
>+    for reasonably accurate timing of even small blocks of rendering
>+    commands.  The granularity of the timer is implementation-dependent.  A
>+    32-bit query counter can express intervals of up to approximately 4
>+    seconds.
>+
>+    (3) What should be the minimum number of counter bits for timer queries?
>+
>+    RESOLVED:  30 bits, which will allow timing sections that take up to 1
>+    second to render.
>+
>+    (4) How are counter results of more than 32 bits returned?
>+
>+    RESOLVED:  Via two new datatypes, int64ANGLE and uint64ANGLE, and their
>+    corresponding GetQueryObject entry points.  These types hold integer
>+    values and have a minimum bit width of 64.
>+
>+    (5) Should the extension measure total time elapsed between the full
>+        completion of the BeginQuery and EndQuery commands, or just time
>+        spent in the graphics library?
>+
>+    RESOLVED:  This extension will measure the total time elapsed between
>+    the full completion of these commands.  Future extensions may implement
>+    a query to determine time elapsed at different stages of the graphics
>+    pipeline.
>+
>+    (6) If multiple query types are supported, can multiple query types be
>+        active simultaneously?
>+
>+    RESOLVED:  Yes; an application may perform a timer query and another
>+    type of query simultaneously.  An application can not perform multiple
>+    timer queries or multiple queries of other types simultaneously.  An
>+    application also can not use the same query object for another query
>+    and a timer query simultaneously.
>+
>+    (7) Do query objects have a query type permanently associated with them?
>+
>+    RESOLVED:  No.  A single query object can be used to perform different
>+    types of queries, but not at the same time.
>+
>+    Having a fixed type for each query object simplifies some aspects of the
>+    implementation -- not having to deal with queries with different result
>+    sizes, for example.  It would also mean that BeginQuery() with a query
>+    object of the "wrong" type would result in an INVALID_OPERATION error.
>+
>+    UPDATE: This resolution was relevant for EXT_timer_query and OpenGL 2.0.
>+    Since EXT_transform_feedback has since been incorporated into the core,
>+    the resolution is that BeginQuery will generate error INVALID_OPERATION
>+    if <id> represents a query object of a different type.
>+
>+    (8) How predictable/repeatable are the results returned by the timer
>+        query?
>+
>+    RESOLVED:  In general, the amount of time needed to render the same
>+    primitives should be fairly constant.  But there may be many other
>+    system issues (e.g., context switching on the CPU and GPU, virtual
>+    memory page faults, memory cache behavior on the CPU and GPU) that can
>+    cause times to vary wildly.
>+
>+    Note that modern GPUs are generally highly pipelined, and may be
>+    processing different primitives in different pipeline stages
>+    simultaneously.  In this extension, the timers start and stop when the
>+    BeginQuery/EndQuery commands reach the bottom of the rendering pipeline.
>+    What that means is that by the time the timer starts, the GL driver on
>+    the CPU may have started work on GL commands issued after BeginQuery,
>+    and the higher pipeline stages (e.g., vertex transformation) may have
>+    started as well.
>+
>+   (9) What should the new 64 bit integer type be called?
>+
>+    RESOLVED: The new types will be called GLint64ANGLE/GLuint64ANGLE.  The new
>+    command suffixes will be i64 and ui64.  These names clearly convey the
>+    minimum size of the types.  These types are similar to the C99 standard
>+    type int_least64_t, but we use names similar to the C99 optional type
>+    int64_t for simplicity.
>+
>+Issues from ARB_timer_query
>+
>+   (10) What about tile-based implementations? The effects of a command are
>+        not complete until the frame is completely rendered. Timing recorded
>+        before the frame is complete may not be what developers expect. Also
>+        the amount of time needed to render the same primitives is not
>+        consistent, which conflicts with issue (8) above. The time depends on
>+        how early or late in the scene it is placed.
>+
>+    RESOLVED: The current language supports tile-based rendering okay as it
>+    is written. Developers are warned that using timers on tile-based
>+    implementation may not produce results they expect since rendering is not
>+    done in a linear order. Timing results are calculated when the frame is
>+    completed and may depend on how early or late in the scene it is placed.
>+    
>+   (11) Can the GL implementation use different clocks to implement the
>+        TIME_ELAPSED and TIMESTAMP queries?
>+
>+   RESOLVED: Yes, the implemenation can use different internal clocks to
>+   implement TIME_ELAPSED and TIMESTAMP. If different clocks are
>+   used it is possible there is a slight discrepancy when comparing queries
>+   made from TIME_ELAPSED and TIMESTAMP; they may have slight
>+   differences when both are used to measure the same sequence. However, this
>+   is unlikely to affect real applications since comparing the two queries is
>+   not expected to be useful.
>+
>+Issues
>+
>+    (12) What should we call this extension?
>+
>+    RESOLVED: ANGLE_timer_query
>+
>+    (13) Why is this done as a separate extension instead of just supporting
>+         ARB_timer_query?
>+
>+    ARB_timer_query is written against OpenGL 3.2, which includes a lot of
>+    the required support for dealing with query objects. None of these
>+    functions or tokens exist in OpenGL ES, and as such have to be added in
>+    this specification.
>+
>+    (14) How does this extension differ from ARB_timer_query?
>+
>+    This extension contains most ARB_timer_query behavior unchanged as well
>+    as a subset of the query support required to use it from the core
>+    OpenGL 3.2 spec. It omits the glGetInteger(TIMESTAMP) functionality used to
>+    query the current time on the GPU, but the behavior for all remaining
>+    functionality taken from ARB_timer_query is the same.
>+    
>+    (15) Are query objects shareable between multiple contexts?
>+
>+    RESOLVED: No.  Query objects are lightweight and we normally share 
>+    large data across contexts.  Also, being able to share query objects
>+    across contexts is not particularly useful.  In order to do the async 
>+    query across contexts, a query on one context would have to be finished 
>+    before the other context could query it. 
>+
>+Revision History
>+
>+    Revision 1, 2011/04/28
>+      - copied from revision 9 of ARB_timer_query and revision 7 of
>+        ARB_occlusion_query
>+      - removed language that was clearly not relevant to ES2
>+      - rebased changes against the OpenGL ES 2.0 specification
>diff --git a/Source/ThirdParty/ANGLE/extensions/ANGLE_translated_shader_source.txt b/Source/ThirdParty/ANGLE/extensions/ANGLE_translated_shader_source.txt
>new file mode 100644
>index 00000000000..69161156fc5
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/extensions/ANGLE_translated_shader_source.txt
>@@ -0,0 +1,118 @@
>+Name
>+
>+    ANGLE_translated_shader_source
>+
>+Name Strings
>+
>+    GL_ANGLE_translated_shader_source
>+
>+Contributors
>+
>+    Daniel Koch, TransGaming Inc.
>+    Gregg Tavares, Google Inc.
>+    Kenneth Russell, Google Inc.
>+    Zhenyao Mo, Google Inc.
>+
>+Contact
>+
>+    Zhenyao Mo, Google Inc. (zmo 'at' google 'dot' com)
>+
>+Status
>+
>+    Implemented in ANGLE ES2
>+
>+Version
>+
>+    Last Modified Date: October 5, 2011
>+    Author Revision: 2
>+
>+Number
>+
>+    OpenGL ES Extension #113
>+
>+Dependencies
>+
>+    OpenGL ES 2.0 is required.
>+
>+    The extension is written against the OpenGL ES 2.0 specification.
>+
>+Overview
>+
>+    WebGL uses the GLSL ES 2.0 spec on all platforms, and translates these
>+    shaders to the host platform's native language (HLSL, GLSL, and even GLSL
>+    ES). For debugging purposes, it is useful to be able to examine the shader
>+    after translation.
>+
>+    This extension addes a new function to query the translated shader source,
>+    and adds a new enum for GetShaderiv's <pname> parameter to query the
>+    translated shader source length. 
>+
>+IP Status
>+
>+    No known IP claims.
>+
>+New Types
>+
>+    None
>+
>+New Procedures and Functions
>+
>+    void GetTranslatedShaderSourceANGLE(uint shader, sizei bufsize,
>+                                        sizei* length, char* source);
>+
>+New Tokens
>+
>+    Accepted by the <pname> parameter of GetShaderiv:
>+
>+    TRANSLATED_SHADER_SOURCE_LENGTH_ANGLE              0x93A0
>+
>+Additions to Chapter 6 of the OpenGL ES 2.0 Specification (State and State
>+Requests)
>+
>+    Append in the end of the fourth paragraph of section 6.1.8 (Shader and
>+    Program Queries):
>+
>+    " If <pname> is TRANSLATED_SHADER_LENGTH_ANGLE, the length of the translated
>+    source string, including a null terminator, is returned. If no source has
>+    been defined, CompileShader has not been called, or the translation has
>+    failed for <shader>, zero is returned."
>+
>+    Append after the last paragraph of section 6.1.8 (Shader and Program
>+    Queries):
>+
>+    "The command
>+
>+      void GetTranslatedShaderSourceANGLE( uint shader, sizei bufSize,
>+         sizei *length, char *source );
>+
>+    returns in <source> the string making up the translated source code for
>+    the shader object <shader>. The string <source> will be null terminated.
>+    The actual number of characters written into <source>, excluding the null
>+    terminator, is returned in <length>. If <length> is NULL, no length is
>+    returned. The maximum number of characters that may be written into 
>+    <source>, including the null terminator, is speciï¬ed by <bufSize>. The
>+    string <source> is the translated string of a concatenation of the strings
>+    passed to the GL using ShaderSource. The length of this translated string
>+    is given by TRANSLATED_SHADER_SOURCE_LENGTH_ANGLE, which can be queried
>+    with GetShaderiv.
>+
>+    If no source has been defined, CompileShader has not been called, or the
>+    translation has failed for <shader>, zero is returned for <length>, and
>+    an empty string is returned for <source>.
>+
>+    If the value of SHADER_COMPILER is not TRUE, then the error INVALID_-
>+    OPERATION is generated."
>+
>+Issues
>+
>+    1) What enum value should be used for TRANSLATED_SHADER_SOURCE_LENGTH_ANGLE?
>+
>+      RESOLVED: The first draft used a temporary enum value. This been replaced
>+      with a enum allocated from the ANGLE range of GL enums. 
>+
>+Revision History
>+
>+    Revision 1, 2011/09/29, zmo
>+      - first draft
>+    Revision 2, 2011/10/05, dgkoch
>+      - assigned enum
>diff --git a/Source/ThirdParty/ANGLE/extensions/ANGLE_webgl_compatibility.txt b/Source/ThirdParty/ANGLE/extensions/ANGLE_webgl_compatibility.txt
>new file mode 100644
>index 00000000000..cc013136fea
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/extensions/ANGLE_webgl_compatibility.txt
>@@ -0,0 +1,81 @@
>+Name
>+
>+    ANGLE_webgl_compatibility
>+
>+Name Strings
>+
>+    GL_ANGLE_webgl_compatibility
>+
>+Contributors
>+
>+    Geoff Lang
>+
>+Contact
>+
>+    Geoff Lang (geofflang 'at' google.com)
>+
>+Notice
>+
>+    Copyright (c) 2016 The Khronos Group Inc. Copyright terms at
>+        http://www.khronos.org/registry/speccopyright.html
>+
>+Status
>+
>+    Draft
>+
>+Version
>+
>+    Version 2, November 28, 2016
>+
>+Number
>+
>+    OpenGL ES Extension #??
>+
>+Dependencies
>+
>+    Requires OpenGL ES 2.0
>+
>+    Written against the OpenGL ES 2.0 specification.
>+
>+    Interacts with EGL_ANGLE_create_context_webgl_compatibility (or equivalent)
>+    extension.
>+
>+Overview
>+
>+    With this extension enabled, the OpenGL ES context will have additional
>+    features and validation to be compatible with the WebGL specification.
>+
>+New Procedures and Functions
>+
>+    None
>+
>+
>+New Tokens
>+
>+    None
>+
>+Additions to the OpenGL ES Specification
>+
>+    Additional validation will be performed according to the the sections of
>+    the WebGL specification entitled "Differences Between WebGL and OpenGL ES
>+    2.0" and "Differences Between WebGL and OpenGL ES 3.0".
>+
>+New State
>+
>+    None
>+
>+Conformance Tests
>+
>+    TBD
>+
>+Issues
>+
>+    None
>+
>+Revision History
>+
>+    Rev.    Date         Author     Changes
>+    ----  -------------  ---------  ----------------------------------------
>+      1   Sept 16, 2016  geofflang  Initial version
>+      2    Nov 28, 2016  geofflang  Break the extension requests into a
>+                                    separate extension.
>diff --git a/Source/ThirdParty/ANGLE/extensions/CHROMIUM_bind_generates_resource.txt b/Source/ThirdParty/ANGLE/extensions/CHROMIUM_bind_generates_resource.txt
>new file mode 100644
>index 00000000000..498acad1fdb
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/extensions/CHROMIUM_bind_generates_resource.txt
>@@ -0,0 +1,118 @@
>+Name
>+
>+    CHROMIUM_bind_generates_resource
>+
>+Name Strings
>+
>+    GL_CHROMIUM_bind_generates_resource
>+
>+Contributors
>+
>+    Geoff Lang
>+
>+Contact
>+
>+    Geoff Lang (geofflang 'at' google.com)
>+
>+Notice
>+
>+    Copyright (c) 2016 The Khronos Group Inc. Copyright terms at
>+        http://www.khronos.org/registry/speccopyright.html
>+
>+Status
>+
>+    Draft
>+
>+Version
>+
>+    Version 1, September 19, 2016
>+
>+Number
>+
>+    OpenGL ES Extension #??
>+
>+Dependencies
>+
>+    Requires OpenGL ES 2.0
>+
>+    Written against the OpenGL ES 2.0 specification.
>+
>+Overview
>+
>+    This extension allows the user to control the behaviour when binding an
>+    object that has not been generated.  This functionality is useful to
>+    notify the user of potential use-after-free errors or support other APIs
>+    such as WebGL on top of an OpenGL ES context.
>+
>+New Procedures and Functions
>+
>+    None
>+
>+New Tokens
>+
>+    Accepted by the <cap> parameter to IsEnabled and the <pname> parameter to
>+    GetBooleanv, GetIntegerv, GetFloatv, and GetInteger64v:
>+
>+    BIND_GENERATES_RESOURCE_CHROMIUM            0x9244
>+
>+Additions to the OpenGL ES Specification
>+
>+    Add to the end of Section 2.9 "Buffer Objects":
>+
>+    If BIND_GENERATES_RESOURCE_CHROMIUM is false, BindBuffer fails and an
>+    INVALID_OPERATION error is generated if buffer is not zero or a name
>+    returned from a previous call to GenBuffers, or if such a name has since
>+    been deleted with DeleteBuffers.
>+
>+    Add to the end of Section 3.7.13 "Texture Objects":
>+
>+    If BIND_GENERATES_RESOURCE_CHROMIUM is false, BindTexture fails and an
>+    INVALID_OPERATION error is generated if texture is not zero or a name
>+    returned from a previous call to GenTextures, or if such a name has since
>+    been deleted with DeleteTextures.
>+
>+    Add to the end of Section 4.4.1 "Binding and Managing Framebuffer Objects":
>+
>+    If BIND_GENERATES_RESOURCE_CHROMIUM is false, BindFramebuffer fails and an
>+    INVALID_OPERATION error is generated if framebuffer is not zero or a name
>+    returned from a previous call to GenFramebuffers, or if such a name has
>+    since been deleted with DeleteFramebuffers.
>+
>+    Add to the end of Section 4.4.3 "Renderbuffer Objects":
>+
>+    If BIND_GENERATES_RESOURCE_CHROMIUM is false, BindRenderbuffer fails and an
>+    INVALID_OPERATION error is generated if renderbuffer is not zero or a name
>+    returned from a previous call to GenRenderbuffers, or if such a name has
>+    since been deleted with DeleteRenderbuffers.
>+
>+New State
>+
>+    Modify Table 6.22, Miscellaneous
>+
>+    Add:
>+
>+                                                      Initial
>+    Get Value                        Type Get Command Value   Description
>+    -----------------------          ---- ----------- ------- --------------
>+    BIND_GENERATES_RESOURCE_CHROMIUM B    IsEnabled   TRUE    Bind generates
>+                                                              new resources
>+
>+Conformance Tests
>+
>+    TBD
>+
>+Issues
>+
>+    (1) Should the BIND_GENERATES_RESOURCE_CHROMIUM state be enabled at context
>+        creation time or dynamically through the Enable and Disable functions?
>+
>+    RESOLOVED: BIND_GENERATES_RESOURCE_CHROMIUM is initialized by a context
>+    creation attribute and cannot be modified.  One of the major use cases of
>+    this extension is to back WebGL contexts and the end user should not be
>+    allowed to modify this state.
>+
>+Revision History
>+
>+    Rev.    Date         Author     Changes
>+    ----  -------------  ---------  ----------------------------------------
>+      1   Sept 19, 2016  geofflang  Initial version
>diff --git a/Source/ThirdParty/ANGLE/extensions/CHROMIUM_bind_uniform_location.txt b/Source/ThirdParty/ANGLE/extensions/CHROMIUM_bind_uniform_location.txt
>new file mode 100644
>index 00000000000..33187af3217
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/extensions/CHROMIUM_bind_uniform_location.txt
>@@ -0,0 +1,141 @@
>+Name
>+
>+    CHROMIUM_bind_uniform_location
>+
>+Name Strings
>+
>+    GL_CHROMIUM_bind_uniform_location
>+
>+Version
>+
>+    Last Modifed Date: September 8, 2015
>+
>+Dependencies
>+
>+    OpenGL ES 2.0 is required.
>+
>+Overview
>+
>+    This extension is simlar to glBindAttribLocation but instead
>+    lets you choose a location for a uniform. This allows you
>+    to not have to query the locations of uniforms.
>+
>+    This allows the client program to know the locations of uniforms
>+    without having to wait for shaders to compile or GLSL programs to
>+    link to query the locations and therefore have no blocking calls
>+    when initializing programs.
>+
>+Issues
>+
>+    If a uniform is an array you can only call glBindUniformLocation
>+    for the location of the first element. Other elements' locations
>+    must be queried if you need them. Often this is not an issue
>+    because you can set all the elements with a single gl call from
>+    the first location.
>+
>+    Good Example:
>+
>+        --shader--
>+        uniform float u_someArray[4];
>+
>+        --C--
>+        GLint location = 123;
>+        glBindUniformLocation(program, location, "u_someArray");
>+        glLinkProgram(program);
>+        glUseProgram(program);
>+
>+        // set all 4 floats in u_someArray
>+        float values[] = { 0.1f, 0.2f, 0.3f, 0.4f, };
>+        glUniform1fv(location, 4, values);
>+
>+    Bad example 1:
>+
>+        GLint location = 123;
>+        glBindUniformLocation(program, location, "u_someArray");
>+        glLinkProgram(program);
>+        glUseProgram(program);
>+
>+        // set floats in u_someArray one at a time
>+        glUniform1f(location, 0.1f);
>+        glUniform1f(location + 1, 0.2f);  // ERROR! math not allowed on locations
>+
>+    Bad example 2:
>+
>+        GLint location0 = 123;
>+        GLint location1 = 124;
>+        glBindUniformLocation(program, location0, "u_someArray[0]");
>+        glBindUniformLocation(program, location1, "u_someArray[1]"); // ERROR!
>+        // not allowed to assign locations to array elements
>+
>+    If you need to set individual elements of a uniform array you must query the
>+    location of the each element you wish to set.
>+
>+    If a uniform has its location explicitly set within the shader text and a
>+    different location set via the API, the assignment in the shader text is
>+    used.
>+
>+    If the location of a statically used uniform set via the API conflicts with
>+    the location of a different uniform set in the shader text, linking must
>+    fail.
>+
>+New Tokens
>+
>+    None
>+
>+New Procedures and Functions
>+
>+    void BindUniformLocationCHROMIUM (GLuint program, GLint location,
>+                                      const GLhchar* name);
>+
>+    specifes that the uniform variable named <name> in program <program>
>+    should be bound to uniform location <location> when the program is next
>+    linked.  If <name> was bound previously, its assigned binding is replaced
>+    with <location>. <name> must be a null terminated string.  The error
>+    INVALID_VALUE is generated if <location> is equal or greater than
>+
>+    (MAX_VERTEX_UNIFORM_VECTORS + MAX_FRAGMENT_UNIFORM_VECTORS) * 4
>+
>+    or less than 0. BindUniformLocation has no effect until the program is
>+    linked. In particular, it doesn't modify the bindings of uniform
>+    variables in a program that has already been linked.
>+
>+    The error INVALID_OPERATION is generated if name starts with the reserved
>+    "gl_" prefix. The error INVALID_VALUE is generated if name ends with
>+    an array element expression other than "[0]".
>+
>+    When a program is linked, any active uniforms without a binding specified
>+    through BindUniformLocation will be automatically be bound to locations by
>+    the GL.  Such bindings can be queried using the command
>+    GetUniformLocation.
>+
>+    BindUniformLocation may be issued before any shader objects are attached
>+    to a program object.  Hence it is allowed to bind any name (except a name
>+    starting with "gl_") to an index, including a name that is never used as a
>+    uniform in any shader object.  Assigned bindings for uniform variables
>+    that do not exist or are not active are ignored. Using such bindings
>+    behaves as if passed location was -1.
>+
>+    It is possible for an application to bind more than one uniform name to
>+    the same location.  This is referred to as aliasing.  This will only work
>+    if only one of the aliased uniforms is statically used in the executable
>+    program.  If two statically used uniforms in a program are bound to the same
>+    location, link must fail.
>+
>+Errors
>+
>+    None.
>+
>+New State
>+
>+    None.
>+
>+Revision History
>+
>+    7/20/2012    Documented the extension
>+    9/8/2015     Require program link to fail if two statically used uniforms
>+                 are bound to the same location.
>+    11/6/2015    Require inactive and non-existing, bound uniform locations
>+                 to behave like location -1.
>+    3/9/2017     Locations set in the shader override ones set by the binding
>+                 API.
>+    3/26/2018    Clarify that aliasing rules apply to statically used uniforms.
>\ No newline at end of file
>diff --git a/Source/ThirdParty/ANGLE/extensions/CHROMIUM_compressed_copy_texture.txt b/Source/ThirdParty/ANGLE/extensions/CHROMIUM_compressed_copy_texture.txt
>new file mode 100644
>index 00000000000..a2cfb2c7620
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/extensions/CHROMIUM_compressed_copy_texture.txt
>@@ -0,0 +1,88 @@
>+Name
>+
>+    CHROMIUM_copy_compressed_texture
>+
>+Name Strings
>+
>+    GL_CHROMIUM_copy_compressed_texture
>+
>+Version
>+
>+    Last Modifed Date: August 5, 2015
>+
>+Dependencies
>+
>+    OpenGL ES 2.0 is required.
>+
>+    GL_AMD_compressed_ATC_texture, GL_ATI_texture_compression_atitc,
>+    GL_EXT_texture_compression_dxt1, GL_ANGLE_texture_compression_dxt5,
>+    GL_EXT_texture_compression_s3tc and GL_OES_compressed_ETC1_RGB8_texture
>+    affects the definition of this extension.
>+
>+Overview
>+
>+    This extension provides functionality for copying compressed textures. It
>+    adds a new function glCompressedCopyTextureCHROMIUM that works similarily
>+    to glCopyTextureCHROMIUM, but for compressed textures.
>+
>+    Which compressed texture formats that this extension supports depends on
>+    the supported texture compression formats of the host GPU.
>+
>+Issues
>+
>+    glCompressedCopyTextureCHROMIUM will first try to copy into a compressed
>+    texture of the same format as the source texture. If unsucessful, the
>+    destination texture format will be changed to GL_RGBA and the texture will
>+    be stored uncompressed.
>+
>+New Procedures and Functions
>+
>+    The command
>+
>+        void glCompressedCopyTextureCHROMIUM (GLuint source_id, GLuint dest_id)
>+
>+    Copies the contents of a compressed texture referred to by <source_id> to
>+    <dest_id> texture.
>+
>+    Texture level 0 is copied from the source image to level 0 of the
>+    destination texture.
>+
>+    The internal format of the source texture must be one of the following
>+    symbolic constants: GL_ATC_RGB_AMD, GL_ATC_RGBA_INTERPOLATED_ALPHA_AMD,
>+    GL_COMPRESSED_RGB_S3TC_DXT1_EXT, GL_COMPRESSED_RGBA_S3TC_DXT5_EXT,
>+    GL_ETC1_RGB8_OES
>+
>+    The destination texture will be created or replaced with the same internal
>+    format as the source texture.
>+
>+    INVALID_OPERATION is generated if internal format of source texture is not
>+    one of the valid formats described above.
>+
>+    INVALID_OPERATION is generated if destination texture is immutable.
>+
>+    INVALID_VALUE is generated if <source_id> or <dest_id> are not valid texture
>+    objects.
>+
>+    INVALID_VALUE is generated if textures corresponding to <dest_id> have not
>+    been bound as GL_TEXTURE_2D object.
>+
>+    INVALID_VALUE is generated if level 0 of the source texture is not defined.
>+
>+Errors
>+
>+    None.
>+
>+New Tokens
>+
>+    None.
>+
>+New State
>+
>+    None.
>+
>+Revision History
>+
>+    15/6/2015    Documented the extension.
>+    5/8/2015     Added glCompressedCopySubTextureCHROMIUM.
>+    1/6/2016     Remove glCompressedCopySubTextureCHROMIUM.
>+    1/8/2016     Remove <target> argument.
>diff --git a/Source/ThirdParty/ANGLE/extensions/CHROMIUM_copy_texture.txt b/Source/ThirdParty/ANGLE/extensions/CHROMIUM_copy_texture.txt
>new file mode 100644
>index 00000000000..dfdafc92707
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/extensions/CHROMIUM_copy_texture.txt
>@@ -0,0 +1,263 @@
>+Name
>+
>+    CHROMIUM_copy_texture
>+
>+Name Strings
>+
>+    GL_CHROMIUM_copy_texture
>+
>+Version
>+
>+    Last Modifed Date: March 24, 2017
>+
>+Dependencies
>+
>+    OpenGL ES 2.0 or OpenGL ES 3.0 is required.
>+
>+    EXT_texture_format_BGRA8888 affects the definition of this extension.
>+    ARB_texture_rg affects the definition of this extension.
>+    CHROMIUM_ycbcr_422_image affects the definition of this extension.
>+
>+Overview
>+
>+    This extension expands on the functionality provided by the
>+    glCopyTexImage2D command.  A new function is exported,
>+    glCopyTextureCHROMIUM, that performs the same copy operation as
>+    glCopyTexImage2D.
>+
>+    The extension also supports copying BGRA textures and copying
>+    EXTERNAL_OES texture to BGRA texture, which is not explicitly
>+    granted by EXT_texture_format_BGRA8888.
>+
>+New Procedures and Functions
>+
>+    void CopyTextureCHROMIUM(uint sourceId,
>+                             int sourceLevel,
>+                             enum destTarget,
>+                             uint destId,
>+                             int destLevel,
>+                             int internalFormat,
>+                             enum destType,
>+                             boolean unpackFlipY,
>+                             boolean unpackPremultiplyAlpha,
>+                             boolean unpackUnmultiplyAlpha)
>+
>+
>+    void CopySubTextureCHROMIUM(uint sourceId,
>+                                int sourceLevel,
>+                                enum destTarget,
>+                                uint destId,
>+                                int destLevel,
>+                                int xoffset,
>+                                int yoffset,
>+                                int x,
>+                                int y,
>+                                sizei width,
>+                                sizei height,
>+                                boolean unpackFlipY,
>+                                boolean unpackPremultiplyAlpha,
>+                                boolean unpackUnmultiplyAlpha)
>+
>+Additions to the OpenGL ES 2.0 Specification
>+
>+    The command
>+
>+        CopyTextureCHROMIUM
>+
>+    Copies the contents of <sourceLevel> level of <sourceId> texture to
>+    <destLevel> level and <destTarget> target of <destId> texture.
>+
>+    <destTarget> must be TEXTURE_2D,
>+    TEXTURE_CUBE_MAP_POSITIVE_X, TEXTURE_CUBE_MAP_NEGATIVE_X,
>+    TEXTURE_CUBE_MAP_POSITIVE_Y, TEXTURE_CUBE_MAP_NEGATIVE_Y,
>+    TEXTURE_CUBE_MAP_POSITIVE_Z, TEXTURE_CUBE_MAP_NEGATIVE_Z,
>+    TEXTURE_RECTANGLE_ARB.
>+
>+    The internal format of the destination texture is converted to that
>+    specified by <internalFormat>.
>+
>+    When source texture doens't contain a superset of the component
>+    required by <internalFormat>, fill the components by following rules.
>+
>+       source format           color components
>+       ----------------------------------------
>+       ALPHA                   (0, 0, 0, A)
>+       RED                     (R, 0, 0, 1)
>+       LUMINANCE               (L, L, L, 1)
>+       LUMINANCE_ALPHA         (L, L, L, A)
>+       RGB                     (R, G, B, 1)
>+       RGB8                    (R, G, B, 1)
>+       RGBA                    (R, G, B, A)
>+       RGBA8                   (R, G, B, A)
>+       BGRA_EXT                (R, G, B, A)
>+       BGRA8_EXT               (R, G, B, A)
>+       RGB_YCBCR_420V_CHROMIUM (R, G, B, 1)
>+       RGB_YCBCR_422_CHROMIUM  (R, G, B, 1)
>+
>+    The format type of the destination texture is converted to that specified
>+    by <destType>.
>+
>+    If <flipY> is true, vertically flip texture image data.
>+
>+    If <unpackPremultiplyAlpha> and <unpackUnmultiplyAlpha> are true,
>+    no alpha processing occurs.  This is the equivalent of having neither flag
>+    set.
>+
>+    When <sourceId> refers to a stream texture, the texture matrix will be
>+    applied as part of the copy operation.
>+
>+    INVALID_OPERATION is generated if <internalFormat> is not one of the
>+    formats in Table 1.0.
>+
>+    INVALID_OPERATION is generated if the internal format of <sourceId> is not
>+    one of formats in Table 1.1.
>+
>+    INVALID_VALUE is generated if <sourceId> or <destId> are not valid texture
>+    objects.
>+
>+    INVALID_ENUM is generated if <destTarget> is not one of the valid targets
>+    described above.
>+
>+    INVALID_OPERATION is generated if the bound target of destination texture
>+    does not match <target>.
>+
>+    INVALID_VALUE is generated if textures corresponding to <destId> have not
>+    been bound as TEXTURE_2D, TEXTURE_CUBE_MAP, or
>+    TEXTURE_RECTANGLE_ARB objects.
>+
>+    INVALID_VALUE is generated if textures corresponding to <sourceId> have not
>+    been bound as TEXTURE_2D, TEXTURE_RECTANGLE_ARB or
>+    TEXTURE_EXTERNAL_OES objects.
>+
>+    INVALID_VALUE is generated if <sourceLevel> is not 0 for ES 2.0, or if
>+    <sourceLevel> or <destLevel> is less than 0 for ES 3.0.
>+
>+    INVALID_VALUE is generated if <sourceLevel> of the source texture is not
>+    defined.
>+
>+    The command
>+
>+        CopySubTextureCHROMIUM
>+
>+    Copies the sub contents of texture referred to by <sourceId> to <destId>
>+    texture without redefining <destId> texture.
>+
>+    See CopyTextureCHROMIUM for the interpretation of the <destTarget>,
>+    <sourceLevel>, <destLevel>, <flipY>, <premultiplyAlpha>, and
>+    <unmultiplyAlpha> arguments.
>+
>+    <xoffset> and <yoffset> specify a texel offset in the x and y direction
>+    respectively within the destination texture.
>+
>+    <x> and <y> specify specify a texel offset in the x and y direction
>+    respectively within the source texture.
>+
>+    <width> specifies the width of the texture subimage.
>+
>+    <height> specifies the width of the texture subimage.
>+
>+    INVALID_VALUE is generated if either <sourceId> texture or <destId>
>+    texture is not defined.
>+
>+    INVALID_OPERATION is generated if the internal format of <sourceId> or
>+    <destId> is not one of formats in Table 1.1.
>+
>+    INVALID_OPERATION is generated if the destination texture array has not
>+    been defined.
>+
>+    INVALID_VALUE is generated if <destId> texture is not bound as
>+    TEXTURE_2D or TEXTURE_RECTANGLE_ARB.
>+
>+    INVALID_VALUE is generated if level 0 of the source texture or
>+    the destination texture is not defined.
>+
>+    INVALID_VALUE is generated if (<xoffset> + <width>) > destWidth,
>+    or (<yoffset> + <height>) > destHeight.
>+
>+    Table 1.0 Valid internal formats for CopyTextureCHROMIUM:
>+
>+        <internalFormat>
>+        ---------------
>+        RGB
>+        RGBA
>+        RGB8
>+        RGBA8
>+        BGRA_EXT
>+        BGRA8_EXT
>+        SRGB_EXT
>+        SRGB_ALPHA_EXT
>+        R8
>+        R8UI
>+        RG8
>+        RG8UI
>+        SRGB8
>+        RGB565
>+        RGB8UI
>+        SRGB8_ALPHA8
>+        RGB5_A1
>+        RGBA4
>+        RGBA8UI
>+        RGB9_E5
>+        R16F
>+        R32F
>+        RG16F
>+        RG32F
>+        RGB16F
>+        RGB32F
>+        RGBA16F
>+        RGBA32F
>+        R11F_G11F_B10F
>+
>+    Table 1.1 Valid source texture internal formats for CopyTextureCHROMIUM and
>+    source and destination formats for CopySubTextureCHROMIUM:
>+
>+        internal format
>+        ---------------
>+        RED
>+        ALPHA
>+        LUMINANCE
>+        LUMINANCE_ALPHA
>+        RGB
>+        RGBA
>+        RGB8
>+        RGBA8
>+        BGRA_EXT
>+        BGRA8_EXT
>+        RGB_YCBCR_420V_CHROMIUM
>+        RGB_YCBCR_422_CHROMIUM
>+
>+Dependencies on ARB_texture_rg
>+
>+    If ARB_texture_rg is not supported:
>+     * delete any reference to the R8 format.
>+
>+Dependencies on CHROMIUM_ycbcr_422_image
>+
>+    If CHROMIUM_ycbcr_422_image is not supported:
>+     * delete any reference to the RGB_YCBCR_422_CHROMIUM format.
>+
>+Errors
>+
>+    None.
>+
>+New Tokens
>+
>+    None.
>+
>+New State
>+
>+    None.
>+
>+Revision History
>+
>+    8/1/2011    Documented the extension
>+    7/4/2013    Add a new parameter dest_type to glCopyTextureCHROMIUM()
>+    16/7/2014   Add TEXTURE_RECTANGLE_ARB as valid source_id target
>+    19/6/2015   Add arguments unpack_flip_y, unpack_premultiply_alpha, and
>+                unpack_unmultiply_alpha to both commands.
>+    4/1/2016    Removed the argument target.
>+    4/1/2016    Added TEXTURE_RECTANGLE_ARB as valid dest_id target.
>+    19/12/2016  Supported more ES 3.0 formats.
>+    18/1/2017   Supported source_level and dest_level.
>+    19/1/2017   Added TEXTURE_CUBE_MAP as valid dest_id target.
>+    24/3/2017   Clean up naming and move formats into tables.
>diff --git a/Source/ThirdParty/ANGLE/extensions/CHROMIUM_sync_query.txt b/Source/ThirdParty/ANGLE/extensions/CHROMIUM_sync_query.txt
>new file mode 100644
>index 00000000000..98763d0a383
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/extensions/CHROMIUM_sync_query.txt
>@@ -0,0 +1,53 @@
>+Name
>+
>+    CHROMIUM_sync_query
>+
>+Name Strings
>+
>+    GL_CHROMIUM_sync_query
>+
>+Version
>+
>+    Last Modifed Date: April 15, 2014
>+
>+Dependencies
>+
>+    OpenGL ES 2.0 is required.
>+
>+    EXT_occlusion_query_boolean is required.
>+
>+Overview
>+
>+    This extension provides a query mechanism that allow for synchronization
>+    between the host CPU and the GPU, which may be accessing the same
>+    resources (typically memory).
>+
>+    This extension is useful in conjunction with CHROMIUM_map_image to
>+    determine when it is safe to access a mapped image. Once the result of
>+    a COMMANDS_COMPLETED_CHROMIUM query is available, all drawing commands
>+    issued before the query must have finished. This ensures that the memory
>+    corresponding to the issued commands can be safely modified (assuming no
>+    other outstanding drawing commands are issued subsequent to the query).
>+
>+New Procedures and Functions
>+
>+    None.
>+
>+Errors
>+
>+    None.
>+
>+New Tokens
>+
>+    Accepted by the <target> parameter of BeginQueryEXT, EndQueryEXT,
>+    and GetQueryivEXT:
>+
>+        COMMANDS_COMPLETED_CHROMIUM                     0x84F7
>+
>+New State
>+
>+    None.
>+
>+Revision History
>+
>+    4/15/2014   Documented the extension
>diff --git a/Source/ThirdParty/ANGLE/extensions/EGL_ANGLE_create_context_client_arrays.txt b/Source/ThirdParty/ANGLE/extensions/EGL_ANGLE_create_context_client_arrays.txt
>new file mode 100644
>index 00000000000..994695a5dcf
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/extensions/EGL_ANGLE_create_context_client_arrays.txt
>@@ -0,0 +1,87 @@
>+Name
>+
>+    ANGLE_create_context_client_arrays
>+
>+Name Strings
>+
>+    EGL_ANGLE_create_context_client_arrays
>+
>+Contributors
>+
>+    Geoff Lang
>+
>+Contacts
>+
>+    Geoff Lang (geofflang 'at' google.com)
>+
>+Status
>+
>+    Draft
>+
>+Version
>+
>+    Version 1, February 13, 2016
>+
>+Number
>+
>+    EGL Extension #??
>+
>+Dependencies
>+
>+    Requires EGL 1.4.
>+
>+    Written against the EGL 1.4 specification.
>+
>+    An OpenGL ES implementation supporting GL_ANGLE_client_arrays or equivalent
>+    functionality is required.
>+
>+Overview
>+
>+    This extension allows the creation of an OpenGL or OpenGL ES context that
>+    allows or disallows drawing with client-side vertex or index data.
>+
>+New Types
>+
>+    None
>+
>+New Procedures and Functions
>+
>+    None
>+
>+New Tokens
>+
>+    Accepted as an attribute name in the <*attrib_list> argument to
>+    eglCreateContext:
>+
>+        EGL_CONTEXT_CLIENT_ARRAYS_ENABLED_ANGLE 0x3452
>+
>+Additions to the EGL 1.4 Specification
>+
>+    Add the following to section 3.7.1 "Creating Rendering Contexts":
>+
>+    EGL_CONTEXT_CLIENT_ARRAYS_ENABLED_ANGLE indicates whether the context
>+    should be created with the GL_CLIENT_ARRAYS_ANGLE state initialized to
>+    GL_TRUE or GL_FALSE. The default value of
>+    EGL_CONTEXT_CLIENT_ARRAYS_ENABLED_ANGLE is EGL_FALSE.
>+
>+Errors
>+
>+    None
>+
>+New State
>+
>+    None
>+
>+Conformance Tests
>+
>+    TBD
>+
>+Issues
>+
>+    None
>+
>+Revision History
>+
>+    Rev.    Date         Author     Changes
>+    ----  -------------  ---------  ----------------------------------------
>+      1   Feb 13, 2016   geofflang  Initial version
>diff --git a/Source/ThirdParty/ANGLE/extensions/EGL_ANGLE_create_context_extensions_enabled.txt b/Source/ThirdParty/ANGLE/extensions/EGL_ANGLE_create_context_extensions_enabled.txt
>new file mode 100644
>index 00000000000..898559f644c
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/extensions/EGL_ANGLE_create_context_extensions_enabled.txt
>@@ -0,0 +1,88 @@
>+Name
>+
>+    ANGLE_create_context_extensions_enabled
>+
>+Name Strings
>+
>+    EGL_ANGLE_create_context_extensions_enabled
>+
>+Contributors
>+
>+    Geoff Lang
>+
>+Contacts
>+
>+    Geoff Lang (geofflang 'at' google.com)
>+
>+Status
>+
>+    Draft
>+
>+Version
>+
>+    Version 1, Marchh 14, 2018
>+
>+Number
>+
>+    EGL Extension #??
>+
>+Dependencies
>+
>+    This extension is written against the wording of the EGL 1.4
>+    Specification.
>+
>+    This extension has interactions with
>+    EGL_ANGLE_create_context_webgl_compatibility.
>+
>+Overview
>+
>+    This extension allows the creation of an OpenGL or OpenGL ES context that
>+    enables or disables all requestable extensions by default.
>+
>+New Types
>+
>+    None
>+
>+New Procedures and Functions
>+
>+    None
>+
>+New Tokens
>+
>+    Accepted as an attribute name in the <*attrib_list> argument to
>+    eglCreateContext:
>+
>+        EGL_EXTENSIONS_ENABLED_ANGLE 0x345F
>+
>+Additions to the EGL 1.4 Specification
>+
>+    Add the following to section 3.7.1 "Creating Rendering Contexts":
>+
>+    EGL_EXTENSIONS_ENABLED_ANGLE indicates whether the context should be
>+    created with all requestable extensions initially enabled or disabled. The
>+    default value of EGL_EXTENSIONS_ENABLED_ANGLE is EGL_TRUE.  However, if
>+    EGL_ANGLE_create_context_webgl_compatibility is also supported and
>+    EGL_CONTEXT_WEBGL_COMPATIBILITY_ANGLE has a value of EGL_TRUE, the default
>+    value of EGL_EXTENSIONS_ENABLED_ANGLE is EGL_FALSE.
>+
>+Errors
>+
>+    None
>+
>+New State
>+
>+    None
>+
>+Conformance Tests
>+
>+    TBD
>+
>+Issues
>+
>+    None
>+
>+Revision History
>+
>+    Rev.    Date         Author     Changes
>+    ----  -------------  ---------  ----------------------------------------
>+      1   Mar 14, 2018   geofflang  Initial version
>diff --git a/Source/ThirdParty/ANGLE/extensions/EGL_ANGLE_create_context_webgl_compatibility.txt b/Source/ThirdParty/ANGLE/extensions/EGL_ANGLE_create_context_webgl_compatibility.txt
>new file mode 100644
>index 00000000000..4245d6ca732
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/extensions/EGL_ANGLE_create_context_webgl_compatibility.txt
>@@ -0,0 +1,88 @@
>+Name
>+
>+    ANGLE_create_context_webgl_compatibility
>+
>+Name Strings
>+
>+    EGL_ANGLE_create_context_webgl_compatibility
>+
>+Contributors
>+
>+    Geoff Lang
>+
>+Contacts
>+
>+    Geoff Lang (geofflang 'at' google.com)
>+
>+Status
>+
>+    Draft
>+
>+Version
>+
>+    Version 1, September 16, 2016
>+
>+Number
>+
>+    EGL Extension #??
>+
>+Dependencies
>+
>+    Requires EGL 1.4.
>+
>+    Written against the EGL 1.4 specification.
>+
>+    This spec interacts with GL_ANGLE_webgl_compatibility (or equivalent)
>+    extension.
>+
>+Overview
>+
>+    This extension allows the creation of an OpenGL or OpenGL ES context that
>+    provides additional WebGL features and validation.
>+
>+New Types
>+
>+    None
>+
>+New Procedures and Functions
>+
>+    None
>+
>+New Tokens
>+
>+    Accepted as an attribute name in the <*attrib_list> argument to
>+    eglCreateContext:
>+
>+        EGL_CONTEXT_WEBGL_COMPATIBILITY_ANGLE 0x33AC
>+
>+Additions to the EGL 1.4 Specification
>+
>+    Add the following to section 3.7.1 "Creating Rendering Contexts":
>+
>+    EGL_CONTEXT_WEBGL_COMPATIBILITY_ANGLE indicates whether a WebGL mode should
>+    be enabled for the OpenGL ES context.  In this mode, the OpenGL ES context
>+    will provide additional features and validation to be compatible with the
>+    WebGL specification. The default value of
>+    EGL_CONTEXT_WEBGL_COMPATIBILITY_ANGLE is EGL_FALSE.
>+
>+Errors
>+
>+    None
>+
>+New State
>+
>+    None
>+
>+Conformance Tests
>+
>+    TBD
>+
>+Issues
>+
>+    None
>+
>+Revision History
>+
>+    Rev.    Date         Author     Changes
>+    ----  -------------  ---------  ----------------------------------------
>+      1   Sept 16, 2016  geofflang  Initial version
>diff --git a/Source/ThirdParty/ANGLE/extensions/EGL_ANGLE_d3d_share_handle_client_buffer.txt b/Source/ThirdParty/ANGLE/extensions/EGL_ANGLE_d3d_share_handle_client_buffer.txt
>new file mode 100644
>index 00000000000..d54eaca66de
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/extensions/EGL_ANGLE_d3d_share_handle_client_buffer.txt
>@@ -0,0 +1,98 @@
>+Name
>+
>+    ANGLE_d3d_share_handle_client_buffer
>+
>+Name Strings
>+
>+    EGL_ANGLE_d3d_share_handle_client_buffer
>+
>+Contributors
>+
>+    John Bauman
>+    Alastair Patrick
>+    Daniel Koch
>+
>+Contacts
>+
>+    John Bauman, Google Inc. (jbauman 'at' chromium.org)
>+
>+Status
>+
>+    Complete
>+    Implemented (ANGLE r650)
>+
>+Version
>+
>+    Version 3, May 12, 2011
>+
>+Number
>+
>+    EGL Extension #??
>+
>+Dependencies
>+
>+    Requires the EGL_ANGLE_surface_d3d_texture_2d_share_handle extension.
>+
>+    This extension is written against the wording of the EGL 1.4
>+    Specification.
>+
>+Overview
>+
>+    This extension allows creating EGL surfaces from handles to textures
>+    shared from the Direct3D API or from
>+    EGL_ANGLE_surface_texture_2d_share_handle.
>+
>+New Types
>+
>+    None
>+
>+New Procedures and Functions
>+
>+    None
>+
>+New Tokens
>+
>+    Accepted in the <buftype> parameter of eglCreatePbufferFromClientBuffer:
>+
>+        EGL_D3D_TEXTURE_2D_SHARE_HANDLE_ANGLE            0x3200
>+
>+Additions to Chapter 3 of the EGL 1.4 Specification (EGL Functions and Errors)
>+
>+    Replace the last sentence of paragraph 1 of Section 3.5.3 with the
>+    following text.
>+    "Currently, the only client API resources which may be bound in this
>+    fashion are OpenVG VGImage objects and Direct3D share handles."
>+
>+    Replace the last sentence of paragraph 2 ("To bind a client API...") of
>+    Section 3.5.3 with the following text.
>+    "When <buftype> is EGL_OPENVG_IMAGE, the width and height of the pbuffer
>+    are determined by the width and height of <buffer>. When <buftype> is
>+    EGL_D3D_TEXTURE_2D_SHARE_HANDLE_ANGLE, the width and height are specified
>+    using EGL_WIDTH and EGL_HEIGHT, or else they default to zero. The width
>+    and height must match the dimensions of the texture which the share handle 
>+    was created from or else an EGL_BAD_ALLOC error is generated."
>+
>+    Replace the third paragraph of Section 3.5.3 with the following text.
>+    "<buftype> specifies the type of buffer to be bound. The only allowed values
>+    of <buftype> are EGL_OPENVG_IMAGE and
>+    EGL_D3D_TEXTURE_2D_SHARE_HANDLE_ANGLE".
>+
>+    Append the following text to the fourth paragraph of Section 3.5.3.
>+    "When <buftype> is EGL_D3D_TEXTURE_2D_SHARE_HANDLE_ANGLE, <buffer> must be
>+    a valid D3D share handle, cast into the type EGLClientBuffer. The handle
>+    may be obtained from the Direct3D9Ex CreateTexture function, from DXGI's
>+    GetSharedHandle method on an ID3D10Texture2D, or from the
>+    EGL_ANGLE_surface_d3d_texture_2d_share_handle extension."
>+
>+Issues
>+
>+Revision History
>+
>+    Version 3, 2011/05/12
>+      - publish
>+
>+    Version 2, 2011/05/03
>+      - specify EGL_D3D_TEXTURE_2D_SHARE_HANDLE
>+      - specify error if dimensions don't match
>+
>+    Version 1, 2011/04/12 - first draft.
>diff --git a/Source/ThirdParty/ANGLE/extensions/EGL_ANGLE_d3d_texture_client_buffer.txt b/Source/ThirdParty/ANGLE/extensions/EGL_ANGLE_d3d_texture_client_buffer.txt
>new file mode 100644
>index 00000000000..ba102b22480
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/extensions/EGL_ANGLE_d3d_texture_client_buffer.txt
>@@ -0,0 +1,146 @@
>+Name
>+
>+    ANGLE_d3d_texture_client_buffer
>+
>+Name Strings
>+
>+    EGL_ANGLE_d3d_texture_client_buffer
>+
>+Contributors
>+
>+    Geoff Lang
>+    Olli Etuaho
>+    Sunny Sachanandani
>+
>+Contacts
>+
>+    Geoff Lang, Google Inc. (geofflang 'at' google.com)
>+
>+Status
>+
>+    Draft
>+
>+Version
>+
>+    Version 3, Jan 23, 2018
>+
>+Number
>+
>+    EGL Extension #??
>+
>+Dependencies
>+
>+    This extension is written against the wording of the EGL 1.5
>+    Specification.
>+
>+    References the EGL_ANGLE_device_d3d extension.
>+
>+Overview
>+
>+    This extension allows creating EGL surfaces from D3D texture objects.
>+
>+New Types
>+
>+    None
>+
>+New Procedures and Functions
>+
>+    None
>+
>+New Tokens
>+
>+    Accepted in the <buftype> parameter of eglCreatePbufferFromClientBuffer:
>+
>+        EGL_D3D_TEXTURE_ANGLE            0x33A3
>+
>+Additions to Chapter 3 of the EGL 1.5 Specification (EGL Functions and Errors)
>+
>+    Replace the last sentence of paragraph 1 of Section 3.5.3 with the
>+    following text.
>+    "Currently, the only client API resources which may be bound in this
>+    fashion are OpenVG VGImage objects and Direct3D texture objects."
>+
>+    Replace the last sentence of paragraph 2 ("To bind a client API...") of
>+    Section 3.5.3 with the following text.
>+    "When <buftype> is EGL_OPENVG_IMAGE or EGL_D3D_TEXTURE_ANGLE, the width and
>+    height of the pbuffer are determined by the width and height of <buffer>."
>+
>+    Replace the third paragraph of Section 3.5.3 with the following text.
>+    "<buftype> specifies the type of buffer to be bound. The only allowed values
>+    of <buftype> are EGL_OPENVG_IMAGE and EGL_D3D_TEXTURE_ANGLE".
>+
>+    Append the following text to the fourth paragraph of Section 3.5.3.
>+    "When <buftype> is EGL_D3D_TEXTURE_ANGLE, <buffer> must be
>+    a valid D3D texture object, cast into the type EGLClientBuffer. See table
>+    egl.restrictions for acceptable texture object types and formats. If the
>+    EGL_ANGLE_device_d3d extension is present, the provided D3D texture object
>+    must have been created by the same D3D device queried from the display.
>+    If these requirements are not met, an EGL_BAD_PARAMETER error is
>+    generated."
>+
>+    ---------------------------------------------------------------------------
>+    Resource Type      Resource Restrictions
>+    ---------------------------------------------------------------------------
>+    IDirect3DTexture9  Memory pool must be D3DPOOL_DEFAULT. Format must be
>+                       D3DFMT_R8G8B8, D3DFMT_A8R8G8B8, D3DFMT_A16B16G16R16F or
>+                       D3DFMT_A32B32G32R32F.
>+    ID3D11Texture2D    Usage flags must be D3D11_USAGE_DEFAULT. Format must be
>+                       DXGI_FORMAT_R8G8B8A8_UNORM,
>+                       DXGI_FORMAT_R8G8B8A8_UNORM_SRGB,
>+                       DXGI_FORMAT_B8G8R8A8_UNORM,
>+                       DXGI_FORMAT_B8G8R8A8_UNORM_SRGB (support is optional),
>+                       DXGI_FORMAT_R8G8B8A8_TYPELESS (support is optional),
>+                       DXGI_FORMAT_B8G8R8A8_TYPELESS (support is optional),
>+                       DXGI_FORMAT_R16G16B16A16_FLOAT,
>+                       DXGI_FORMAT_R32G32B32A32_FLOAT or
>+                       DXGI_FORMAT_R10G10B10A2_UNORM.
>+    --------------------------------------------------------------------------
>+    Table egl.restrictions - Restrictions on D3D resources that can be used
>+    as a <buffer>.
>+    --------------------------------------------------------------------------
>+
>+    Append to the fifth paragraph of Section 3.5.3.
>+    "In addition, in case buftype is EGL_D3D_TEXTURE_ANGLE and the D3D resource
>+    has a typeless DXGI format, attrib_list may contain the attribute
>+    EGL_GL_COLORSPACE."
>+
>+    Append to the end of Section 3.5.3.
>+    "When a pbuffer is created with type EGL_D3D_TEXTURE_ANGLE, the contents
>+    of the associcated D3D texture object are undefined while the pbuffer is
>+    the current read surface, draw surface or bound to a client texture."
>+
>+    Append to the end of Section 3.5.3.
>+    "When a pbuffer is created with type EGL_D3D_TEXTURE_ANGLE, and the
>+    EGL_GL_COLORSPACE attribute is not specified in attrib_list, the
>+    EGL_GL_COLORSPACE attribute of the surface is determined by the DXGI format
>+    of the Direct3D texture. For *_SRGB DXGI formats, the value of
>+    EGL_GL_COLORSPACE is EGL_GL_COLORSPACE_SRGB. For other formats including
>+    *_TYPELESS DXGI formats, the value of EGL_GL_COLORSPACE defaults to
>+    EGL_GL_COLORSPACE_LINEAR."
>+
>+Issues
>+
>+    1. What renderers allow the use of a multi-sampled texture?
>+
>+    PROPOSED: Mutli-sampled texture support is currently limited to D3D11. Additionally,
>+    the client is responsible for resolving the texture.
>+
>+    2. How does this extension interact with EXT_sRGB_write_control?
>+
>+    If GL_FRAMEBUFFER_SRGB_EXT is disabled and a pbuffer created from a D3D
>+    texture with an *_SRGB format is being rendered to, it is undefined whether
>+    SRGB conversion will be performed.
>+
>+    3. What renderers allow the use of typeless textures?
>+
>+    PROPOSED: Support for typeless textures is currently limited to D3D11.
>+
>+Revision History
>+
>+    Version 4, 2019/04/15 - added support for DXGI_FORMAT_R10G10B10A2_UNORM.
>+
>+    Version 3, 2018/01/23 - added support for typeless textures.
>+
>+    Version 2, 2018/01/15 - clarified SRGB conversion handling.
>+
>+    Version 1, 2016/10/05 - first draft.
>diff --git a/Source/ThirdParty/ANGLE/extensions/EGL_ANGLE_device_creation.txt b/Source/ThirdParty/ANGLE/extensions/EGL_ANGLE_device_creation.txt
>new file mode 100644
>index 00000000000..2401a094d17
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/extensions/EGL_ANGLE_device_creation.txt
>@@ -0,0 +1,120 @@
>+Name
>+
>+    ANGLE_device_creation
>+
>+Name Strings
>+
>+    EGL_ANGLE_device_creation
>+
>+Contributors
>+
>+    Austin Kinross  (aukinros 'at' microsoft.com)
>+
>+Contact
>+
>+    Austin Kinross  (aukinros 'at' microsoft.com)
>+
>+Status
>+
>+    Draft
>+
>+Version
>+
>+    Version 1, Nov 02, 2015
>+
>+Number
>+
>+    EGL Extension #XXX
>+
>+Extension Type
>+
>+    EGL client extension
>+
>+Dependencies
>+
>+    Requires EGL_EXT_device_query.
>+
>+    Written against the wording of EGL 1.5 as modified by EGL_EXT_device_query.
>+
>+Overview
>+
>+    Increasingly, EGL and its client APIs are being used in place of "native"
>+    rendering APIs to implement the basic graphics functionality of native
>+    windowing systems. This extension defines a way to create an EGL device
>+    which maps to an inputted "native" rendering API device.
>+
>+    This extension is intended to be used with EGL_EXT_platform_device to
>+    initialize a display using an existing "native" rendering device, but
>+    EGL_EXT_platform_device is not required.
>+
>+IP Status
>+
>+    No known claims.
>+
>+New Types
>+
>+    None.
>+
>+New Procedures and Functions
>+
>+    EGLDeviceEXT eglCreateDeviceANGLE(EGLint device_type,
>+                                      void *native_device,
>+                                      cost EGLAttrib *attrib_list)
>+
>+    EGLBoolean eglReleaseDeviceANGLE(EGLDeviceEXT device)
>+
>+New Tokens
>+
>+    None.
>+
>+Changes to section 3.2 (Devices)
>+
>+    Add the following after the final paragraph to section 3.2 (Devices):
>+
>+    To create an EGL device wrapping an existing native rendering device, use:
>+
>+        EGLDeviceEXT eglCreateDeviceANGLE(EGLint device_type,
>+                                          void *native_device,
>+                                          cost EGLAttrib *attrib_list);
>+
>+    On success, a valid EGLDeviceEXT is returned. On failure, EGL_NO_DEVICE_EXT
>+    is returned.
>+
>+    An EGL_BAD_ATTRIBUTE error is generated if <device_type> is not a valid
>+    device type. This extension defines no valid values for <device_type>.
>+
>+    All attribute names in <attrib_list> are immediately followed by the
>+    corresponding desired value. The list is terminated with EGL_NONE. The
>+    <attrib_list> is considered empty if either <attrib_list> is NULL or if its
>+    first element is EGL_NONE. This specification defines no valid attribute
>+    names for inclusion in <attrib_list>. If <attrib_list> is not empty then
>+    an EGL_BAD_ATTRIBUTE error is generated.
>+
>+    If a device is created using eglCreateDeviceANGLE then it is the
>+    caller's responsibility to manage the lifetime of the device, and to call
>+    eglReleaseDeviceANGLE at an appropriate time.
>+
>+    To release a device, use:
>+
>+        EGLBoolean eglReleaseDeviceANGLE(EGLDeviceEXT device);
>+
>+    On success, EGL_TRUE is returned. On failure, EGL_FALSE is returned.
>+
>+    If <device> equals EGL_NO_DEVICE_EXT then an EGL_BAD_DEVICE_EXT error is
>+    generated. If <device> is not a valid device then the behavior is undefined.
>+
>+    <device> must have been created using eglGetDeviceANGLE. If <device> was
>+    obtained by other means, such as through eglQueryDisplayAttribEXT, then an
>+    EGL_BAD_DEVICE_EXT error is generated.
>+
>+    If eglReleaseDeviceANGLE is called on a device that is still in use by other
>+    EGL objects, then the resulting behavior of those objects is undefined.
>+
>+Issues
>+
>+    None.
>+
>+Revision History
>+
>+    Version 1, Nov 2, 2015 (Austin Kinross)
>+        - Initial Draft
>diff --git a/Source/ThirdParty/ANGLE/extensions/EGL_ANGLE_device_creation_d3d11.txt b/Source/ThirdParty/ANGLE/extensions/EGL_ANGLE_device_creation_d3d11.txt
>new file mode 100644
>index 00000000000..6f25f53b10b
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/extensions/EGL_ANGLE_device_creation_d3d11.txt
>@@ -0,0 +1,92 @@
>+Name
>+
>+    ANGLE_device_creation_d3d11
>+
>+Name Strings
>+
>+    EGL_ANGLE_device_creation_d3d11
>+
>+Contributors
>+
>+    Austin Kinross  (aukinros 'at' microsoft.com)
>+
>+Contact
>+
>+    Austin Kinross  (aukinros 'at' microsoft.com)
>+
>+Status
>+
>+    Draft
>+
>+Version
>+
>+    Version 1, Nov 02, 2015
>+
>+Number
>+
>+    EGL Extension #XXX
>+
>+Extension Type
>+
>+    EGL client extension
>+
>+Dependencies
>+
>+    Requires EGL_ANGLE_device_d3d and EGL_ANGLE_device_creation.
>+
>+    Written against the wording of EGL 1.5 as modified by EGL_ANGLE_device_d3d
>+    and EGL_ANGLE_device_creation.
>+
>+Overview
>+
>+    ANGLE has the ability to run GPU commands on a native D3D device. This
>+    extension defines a way to create a EGL device which maps to an inputted
>+    Direct3D 11 device.
>+
>+    This extension is intended to be used with EGL_EXT_platform_device to
>+    initialize a display using an existing Direct3D 11 device, but
>+    EGL_EXT_platform_device is not required.
>+
>+IP Status
>+
>+    No known claims.
>+
>+New Types
>+
>+    None.
>+
>+New Procedures and Functions
>+
>+    None.
>+
>+New Tokens
>+
>+    None.
>+
>+Changes to section 3.2 (Devices)
>+
>+    Modify the language in section 3.2 (Devices) describing valid attribute
>+    names passed into eglCreateDeviceANGLE via <device_type>:
>+
>+    "This specification defines one value for <device_type>:
>+    EGL_D3D11_DEVICE_ANGLE. If this device type is specified then
>+    <native_device> must be a valid pointer to a Direct3D 11 device. If
>+    <native_device> is not a valid pointer to a Direct3D 11 device then the
>+    resulting behavior is undefined."
>+
>+    Append the following to the end of section 3.2 (Devices):
>+
>+    "If a Direct3D 11 device used to create a device experiences a "lost device"
>+    then all resulting behavior of the device (and any dependent EGL objects) is
>+    undefined. It is the caller's responsibility to monitor for "lost device"
>+    and to create a new device (and dependent EGL objects) as appropriate. For
>+    more information on "lost device", see the Direct3D documentation."
>+
>+Issues
>+
>+    None.
>+
>+Revision History
>+
>+    Version 1, Nov 2, 2015 (Austin Kinross)
>+        - Initial Draft
>diff --git a/Source/ThirdParty/ANGLE/extensions/EGL_ANGLE_device_d3d.txt b/Source/ThirdParty/ANGLE/extensions/EGL_ANGLE_device_d3d.txt
>new file mode 100644
>index 00000000000..6e562473fef
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/extensions/EGL_ANGLE_device_d3d.txt
>@@ -0,0 +1,93 @@
>+Name
>+
>+    ANGLE_device_d3d
>+
>+Name Strings
>+
>+    EGL_ANGLE_device_d3d
>+
>+Contributors
>+
>+    Jamie Madill  (jmadill 'at' google.com)
>+
>+Contact
>+
>+    Jamie Madill  (jmadill 'at' google.com)
>+
>+Status
>+
>+    Draft
>+
>+Version
>+
>+    Version 1, Mar 25, 2015
>+
>+Number
>+
>+    EGL Extension #XXX
>+
>+Extension Type
>+
>+    EGL device extension
>+
>+Dependencies
>+
>+    This extension is written against the language of EGL 1.5 as
>+    modified by EGL_EXT_device_query.
>+
>+    EGL_EXT_device_query is required.
>+
>+Overview
>+
>+    ANGLE has the ability to run GPU commands on a native D3D device.
>+    This extension defines a mapping from an EGL device to a D3D
>+    device, after it's queried from an EGL display.
>+
>+IP Status
>+
>+    No known claims.
>+
>+New Types
>+
>+    None.
>+
>+New Procedures and Functions
>+
>+    None.
>+
>+New Tokens
>+
>+    Accepted as a queried <attribute> in eglQueryDeviceAttribEXT:
>+
>+        EGL_D3D9_DEVICE_ANGLE              0x33A0
>+        EGL_D3D11_DEVICE_ANGLE             0x33A1
>+
>+Add a new section 2.1.3 (D3D Devices) after 2.1.2 (Devices)
>+
>+    Somewhat analogous to an EGL device, a D3D device establishes a
>+    namespace for D3D operations. In the D3D APIs, such devices are
>+    represented by pointers. For more details, see the D3D
>+    documentation.
>+
>+Changes to section 3.2 (Devices)
>+
>+    Replace the paragraph immediately following the prototype for
>+    eglQueryDeviceAttribEXT:
>+
>+    <attribute> may be either EGL_D3D9_DEVICE_ANGLE or EGL_D3D11_DEVICE_ANGLE.
>+    On success, EGL_TRUE is returned, and a valid D3D9 or D3D11 device pointer
>+    corresponding to the EGL device is returned in <value>. This handle
>+    is compatible with D3D API functions. If the EGL device is not currently
>+    associated with a D3D9 device and <attribute> is EGL_D3D9_DEVICE_ANGLE,
>+    or if the EGL device is not currently associated with a D3D11 device and
>+    <attribute> is EGL_D3D11_DEVICE_ANGLE, EGL_BAD_ATTRIBUTE is returned,
>+    and <value> is left unchanged.
>+
>+Issues
>+
>+    None
>+
>+Revision History
>+
>+    Version 1, Mar 25, 2015 (Jamie Madill)
>+        - Initial Draft
>diff --git a/Source/ThirdParty/ANGLE/extensions/EGL_ANGLE_direct3d_display.txt b/Source/ThirdParty/ANGLE/extensions/EGL_ANGLE_direct3d_display.txt
>new file mode 100644
>index 00000000000..267ca9ce9d9
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/extensions/EGL_ANGLE_direct3d_display.txt
>@@ -0,0 +1,68 @@
>+Name
>+
>+    ANGLE_direct3d_display
>+
>+Name Strings
>+
>+    EGL_ANGLE_direct3d_display
>+
>+Contributors
>+
>+    Nicolas Capens
>+    Shannon Woods
>+
>+Contacts
>+
>+    Shannon Woods, Google Inc. (shannonwoods 'at' chromium.org)
>+
>+Status
>+
>+    In progress
>+
>+Version
>+
>+    Version 1, May 15, 2013
>+
>+Number
>+
>+    EGL Extension #??
>+
>+Dependencies
>+
>+    This extension is written against the wording of the EGL 1.4
>+    Specification. 
>+
>+Overview
>+
>+    This extension allows for specifying the behavior of the renderer backing the display.
>+
>+New Types
>+
>+    None
>+
>+New Procedures and Functions
>+
>+    None
>+
>+New Tokens
>+
>+    EGL_D3D11_ELSE_D3D9_DISPLAY_ANGLE         (EGLNativeDisplayType)-2
>+    EGL_D3D11_ONLY_DISPLAY_ANGLE              (EGLNativeDisplayType)-3
>+
>+Additions to Chapter 3 of the EGL 1.4 Specification (EGL Functions and Errors)
>+
>+    Add before the last sentence of the first paragraph of section 3.2,
>+    "Initialization":
>+
>+    "If <display_id> is EGL_D3D11_ELSE_D3D9_DISPLAY_ANGLE, the display returned
>+    will be backed by a Direct3D 11 renderer if one is available, or by a
>+    Direct3D 9 renderer otherwise. If <display_id> is EGL_D3D11_ONLY_DISPLAY_ANGLE,
>+    the display returned will be backed by a Direct3D 11 renderer if one is
>+    available, or will return NULL otherwise."
>+
>+Issues
>+
>+Revision History
>+
>+    Version 1, 2013/05/15 - First draft.
>+
>diff --git a/Source/ThirdParty/ANGLE/extensions/EGL_ANGLE_direct_composition.txt b/Source/ThirdParty/ANGLE/extensions/EGL_ANGLE_direct_composition.txt
>new file mode 100644
>index 00000000000..72bbfc319f5
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/extensions/EGL_ANGLE_direct_composition.txt
>@@ -0,0 +1,97 @@
>+Name
>+
>+    ANGLE_direct_composition
>+
>+Name Strings
>+
>+    EGL_ANGLE_direct_composition
>+
>+Contributors
>+
>+    John Bauman
>+
>+Contacts
>+
>+    John Bauman (jbauman 'at' google.com)
>+
>+Status
>+
>+    Draft
>+
>+Version
>+
>+    Version 2, Dec 14, 2015
>+
>+Number
>+
>+    EGL Extension #??
>+
>+Dependencies
>+
>+    This extension is written against the wording of the EGL 1.5 Specification.
>+
>+Overview
>+
>+    This extension allows specifying that the contents of a window surface be
>+    posted to the screen using the DirectComposition API.
>+
>+New Types
>+
>+    None
>+
>+New Procedures and Functions
>+
>+    None
>+
>+New Tokens
>+
>+    Accepted by the <attribute> parameter of eglQuerySurface and by the
>+    <attrib_list> parameter of eglCreateWindowSurface and
>+    eglCreatePlatformWindowSurface
>+
>+    EGL_DIRECT_COMPOSITION_ANGLE                         0x33A5
>+
>+Changes to Chapter 3 of the EGL 1.5 Specification (EGL Functions and Errors)
>+
>+    Modify the fourth paragraph of Section 3.5.1, page 32
>+    (Creating On-Screen rendering Surfaces)
>+
>+    "<attrib_list> specifies a list of attributes for the window. The list has
>+    the same structure as described for eglChooseConfig. Attributes that can
>+    be specified in <attrib_list> include EGL_DIRECT_COMPOSITION_ANGLE,
>+    EGL_GL_COLORSPACE, EGL_RENDER_BUFFER, EGL_VG_COLORSPACE, and
>+    EGL_VG_ALPHA_FORMAT."
>+
>+    Add the following between paragraphs 6 and 7 of Section 3.5.1, page 32
>+    (Creating On-Screen Rendering Surfaces)
>+
>+    "EGL_DIRECT_COMPOSITION_ANGLE specifies whether the surface will be posted
>+    to the window using DirectComposition. The default is EGL_FALSE. If
>+    EGL_TRUE is specified, <native_window> must be owned by the current
>+    process, and contents drawn by native APIs or EGLSurfaces with
>+    EGL_DIRECT_COMPOSITION_ANGLE as EGL_FALSE will appear underneath the
>+    contents of this surface."
>+
>+
>+    Add the following entry to Table 3.5, page 44 (Queryable surface
>+    attributes and types)
>+
>+    Attribute                    Type    Description
>+    ---------------------------- ------- --------------------------------------
>+    EGL_DIRECT_COMPOSITION_ANGLE boolean Surface will be posted to the window
>+                                         using DirectComposition
>+
>+Issues
>+    1. Should a surface attrib or config be used to specify that
>+    DirectComposition is needed.
>+
>+    PROPOSED: A surface attrib would work and avoids creating
>+    otherwise-duplicate configs.
>+
>+Revision History
>+
>+    Version 2, 2015/12/14
>+      - Use attrib instead of config.
>+
>+    Version 1, 2015/12/10
>+      - Initial draft.
>diff --git a/Source/ThirdParty/ANGLE/extensions/EGL_ANGLE_display_texture_share_group.txt b/Source/ThirdParty/ANGLE/extensions/EGL_ANGLE_display_texture_share_group.txt
>new file mode 100644
>index 00000000000..90f75ec3601
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/extensions/EGL_ANGLE_display_texture_share_group.txt
>@@ -0,0 +1,82 @@
>+Name
>+
>+    ANGLE_display_texture_share_group
>+
>+Name Strings
>+
>+    EGL_ANGLE_display_texture_share_group
>+
>+Contributors
>+
>+    Geoff Lang, Google
>+
>+Contacts
>+
>+    Geoff Lang, Google (geofflang 'at' google.com)
>+
>+Status
>+
>+    Draft
>+
>+Version
>+
>+    Version 1, February 7, 2017
>+
>+Number
>+
>+    EGL Extension TBD
>+
>+Dependencies
>+
>+    This extension is written against the wording of the EGL 1.5 specification.
>+
>+Overview
>+
>+    This extension allows for the creation of OpenGL ES contexts that share
>+    texture objects with other contexts owned by the same display. This method
>+    of sharing textures can be used in conjuction with regular share groups.
>+
>+New Types
>+
>+    None
>+
>+New Procedures and Functions
>+
>+    None
>+
>+New Tokens
>+
>+    Accepted as an attribute name in the <*attrib_list> argument to
>+    eglCreateContext:
>+
>+        EGL_DISPLAY_TEXTURE_SHARE_GROUP_ANGLE    0x33AF
>+
>+Additions to the EGL 1.5 Specification
>+
>+    Add a new section entitled "OpenGL ES Global Texture Share Groups"
>+    to section 3.7.1:
>+
>+    "If the attribute EGL_DISPLAY_TEXTURE_SHARE_GROUP_ANGLE is set to EGL_TRUE,
>+    a context that shares textures with other contexts owned by the same
>+    display and created with EGL_DISPLAY_TEXTURE_SHARE_GROUP_ANGLE set to
>+    EGL_TRUE will be created. If the share_context parameter to
>+    eglCreateContext is not NULL, all contexts within the share group must have
>+    been created with the same value of EGL_DISPLAY_TEXTURE_SHARE_GROUP_ANGLE.
>+    The default value of EGL_DISPLAY_TEXTURE_SHARE_GROUP_ANGLE is EGL_FALSE."
>+
>+Issues
>+
>+    (1) What happens to the shared textures when a context in the global share
>+        group is destroyed?
>+
>+    RESOLOVED: When the last context in the global texture share group is
>+    destroyed, all textures in the global texture share group are released. If
>+    a new context is created in the global texture share group, no textures
>+    will exist.
>+
>+    This mirrors how regular share groups work, releasing all objects when the
>+    last context is destroyed.
>+
>+Revision History
>+
>+    Version 1, 2017/02/07 - first draft.
>diff --git a/Source/ThirdParty/ANGLE/extensions/EGL_ANGLE_experimental_present_path.txt b/Source/ThirdParty/ANGLE/extensions/EGL_ANGLE_experimental_present_path.txt
>new file mode 100644
>index 00000000000..4f96c1fa2bc
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/extensions/EGL_ANGLE_experimental_present_path.txt
>@@ -0,0 +1,106 @@
>+Name
>+
>+    ANGLE_experimental_present_path
>+
>+Name Strings
>+
>+    EGL_ANGLE_experimental_present_path
>+
>+Contributors
>+
>+    Austin Kinross
>+
>+Contacts
>+
>+    Austin Kinross (aukinros 'at' microsoft 'dot' com)
>+
>+Status
>+
>+    Experimental
>+
>+Version
>+
>+    Version 1, Jan 22 2016
>+
>+Number
>+
>+    EGL Extension #XXX
>+
>+Extension Type
>+
>+    EGL display extension
>+
>+Dependencies
>+
>+    Requires ANGLE_platform_angle_d3d.
>+
>+    Written against the wording of EGL 1.4 as modified by
>+    ANGLE_platform_angle_d3d.
>+
>+Overview
>+
>+    This extension exposes an optimized, but potentially non-conformant,
>+    rendering path for ANGLE's D3D11 renderer on Windows.
>+
>+New Types
>+
>+    None
>+
>+New Procedures and Functions
>+
>+    None
>+
>+New Tokens
>+
>+    Accepted as an attribute name in the <attrib_list> argument of
>+    eglGetPlatformDisplayEXT:
>+
>+        EGL_EXPERIMENTAL_PRESENT_PATH_ANGLE      0x33A4
>+
>+    Accepted as values for the EGL_EXPERIMENTAL_PRESENT_PATH_ANGLE attribute:
>+
>+        EGL_EXPERIMENTAL_PRESENT_PATH_FAST_ANGLE 0x33A9
>+        EGL_EXPERIMENTAL_PRESENT_PATH_COPY_ANGLE 0x33AA
>+
>+Additions to the EGL Specification
>+
>+    None.
>+
>+New Behavior
>+
>+    To request a display that enables this optimized rendering path,
>+    the value of EGL_EXPERIMENTAL_PRESENT_PATH_ANGLE should be set to
>+    EGL_EXPERIMENTAL_PRESENT_PATH_FAST_ANGLE. Setting this value may impact
>+    OpenGL ES conformance (see Issue 1 below).
>+
>+    The only valid values for the attribute
>+    EGL_EXPERIMENTAL_PRESENT_PATH_ANGLE are
>+    EGL_EXPERIMENTAL_PRESENT_PATH_FAST_ANGLE and
>+    EGL_EXPERIMENTAL_PRESENT_PATH_COPY_ANGLE. If any other value is specified
>+    then an EGL_BAD_ATTRIBUTE error is generated and EGL_NO_DISPLAY is
>+    returned.
>+
>+    If a value for EGL_EXPERIMENTAL_PRESENT_PATH_ANGLE is specified and
>+    EGL_PLATFORM_ANGLE_TYPE_ANGLE is not set to
>+    EGL_PLATFORM_ANGLE_TYPE_D3D11_ANGLE then an EGL_BAD_ATTRIBUTE error is
>+    generated and EGL_NO_DISPLAY is returned.
>+
>+	If the attribute EGL_EXPERIMENTAL_PRESENT_PATH_ANGLE
>+    is unspecified then it is implicitly set to
>+    EGL_EXPERIMENTAL_PRESENT_PATH_COPY_ANGLE.
>+
>+Issues
>+
>+    1) Does setting EGL_EXPERIMENTAL_PRESENT_PATH_ANGLE to be
>+       EGL_EXPERIMENTAL_PRESENT_PATH_FAST_ANGLE maintain OpenGL ES
>+       conformance?
>+
>+       RESOLVED: Not necessarily, that is implementation-specific. Check then
>+       EGL_CONFORMANT attribute to see if the implementation supports any
>+       conformant EGL configs when EGL_EXPERIMENTAL_PRESENT_PATH_FAST_ANGLE
>+       is specified.
>+
>+Revision History
>+
>+    Version 1, Jan 22 2016 (Austin Kinross)
>+      - Initial draft
>\ No newline at end of file
>diff --git a/Source/ThirdParty/ANGLE/extensions/EGL_ANGLE_explicit_context.txt b/Source/ThirdParty/ANGLE/extensions/EGL_ANGLE_explicit_context.txt
>new file mode 100644
>index 00000000000..42287e36171
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/extensions/EGL_ANGLE_explicit_context.txt
>@@ -0,0 +1,87 @@
>+Name
>+
>+    ANGLE_explicit_context
>+
>+Name Strings
>+
>+    EGL_ANGLE_explicit_context
>+
>+Contributors
>+
>+    Brandon Jones, Intel
>+
>+Contacts
>+
>+    Brandon Jones, Intel (brandon1.jones 'at' intel 'dot' com)
>+
>+Status
>+
>+    Complete.
>+
>+Version
>+
>+    Version 1, 2018-5-22
>+
>+Number
>+
>+    EGL Extension XXX
>+
>+Extension Type
>+
>+    EGL Client Extension
>+
>+Dependencies
>+
>+    OpenGL ES 3.1 is required.
>+
>+    EGL_KHR_get_all_proc_addresses is required.
>+
>+    EGL_EXT_client_extensions is required.
>+
>+Overview
>+
>+    This extension adds new OpenGL ES entry points that allow the user to pass the current EGL
>+    context as a function parameter. This allows users to skip lookup of the thread's current
>+    context upon entry.
>+
>+New Types
>+
>+    None.
>+
>+New Procedures and Functions
>+
>+    For every OpenGL ES entry point available through eglGetProcAddress, an additional entry point
>+    is made available. The entry points have the form of:
>+
>+    <return value> gl<entry point name>ContextANGLE(GLeglContextANGLE context, <entry point parameters>)
>+
>+    If a function already has an extension suffix, this form still applies.
>+
>+New Tokens
>+
>+    None.
>+
>+Additions to the EGL Specification
>+
>+    When using OpenGL ES as a client library, the ContextANGLE entry points allow the user to
>+    pass the current EGL context as a function parameter to provide better performance than
>+    looking up the current EGL context at every GL entry point.
>+
>+    Calls made with an explicit context provide no additional validation for the passed context
>+    parameter.
>+
>+    Calls made with an explicit context will generate errors under the same conditions as they
>+    would without an explicit context. Any instances of undefined behaviour without specifying
>+    an explicit context are still undefined when specifying an explicit context.
>+
>+    When an EGL context that is not current is explicitly passed, the resulting behavior is
>+    undefined.
>+
>+Issues
>+
>+    None.
>+
>+Revision History
>+
>+    Version 1, 2018-5-22 (Brandon Jones)
>+        - Initial draft
>\ No newline at end of file
>diff --git a/Source/ThirdParty/ANGLE/extensions/EGL_ANGLE_flexible_surface_compatibility.txt b/Source/ThirdParty/ANGLE/extensions/EGL_ANGLE_flexible_surface_compatibility.txt
>new file mode 100644
>index 00000000000..55d94636d8f
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/extensions/EGL_ANGLE_flexible_surface_compatibility.txt
>@@ -0,0 +1,154 @@
>+Name
>+
>+    ANGLE_flexible_surface_compatibility
>+
>+Name Strings
>+
>+    EGL_ANGLE_flexible_surface_compatibility
>+
>+Contributors
>+
>+    John Bauman   (jbauman 'at' google.com)
>+    Shannon Woods (shannonwoods 'at' google.com)
>+
>+Contact
>+
>+    John Bauman   (jbauman 'at' google.com)
>+
>+Status
>+
>+    Draft
>+
>+Version
>+
>+    Version 3, Dec 15, 2015
>+
>+Number
>+
>+    EGL Extension #XXX
>+
>+Extension Type
>+
>+    EGL display extension
>+
>+Dependencies
>+
>+    This extension is written against the language of EGL 1.5.
>+
>+Overview
>+
>+    Some EGL implementations may allow any surface to be made current with any
>+    context from the same display, without restrictions due to bit depth.
>+
>+IP Status
>+
>+    No known claims.
>+
>+New Types
>+
>+    None.
>+
>+New Procedures and Functions
>+
>+    None.
>+
>+New Tokens
>+
>+    Accepted by the <attribute> parameter of eglQuerySurface and by the
>+    <attrib_list> parameter of eglCreateWindowSurface,
>+    eglCreatePlatformWindowSurface, eglCreatePbufferSurface, and
>+    eglCreatePbufferFromClientBuffer:
>+
>+    EGL_FLEXIBLE_SURFACE_COMPATIBILITY_SUPPORTED_ANGLE  0x33A6
>+
>+Changes to Chapter 2 of the EGL 1.5 Specification (EGL Operation)
>+
>+    Replace the first paragraph of the first bulleted list item in section
>+    2.2, page 4
>+    (Rendering Contexts and Drawing Surfaces)
>+
>+    "They support the same type of color buffer (RGB or luminance), or the
>+    surface has the EGL_FLEXIBLE_SURFACE_COMPATIBILITY_SUPPORTED_ANGLE
>+    attribute set to EGL_TRUE."
>+
>+    Replace the first paragraph of the second bulleted list item in section
>+    2.2, page 4
>+    (Rendering Contexts and Drawing Surfaces)
>+
>+    "They have color buffers and ancillary buffers of the same depth, or the
>+    surface has the EGL_FLEXIBLE_SURFACE_COMPATIBILITY_SUPPORTED_ANGLE
>+    attribute set to EGL_TRUE."
>+
>+Changes to Chapter 3 of the EGL 1.5 Specification (EGL Functions and Errors)
>+
>+    Modify the fourth paragraph of Section 3.5.1, page 32
>+    (Creating On-Screen rendering Surfaces)
>+
>+    "<attrib_list> specifies a list of attributes for the window. The list has
>+    the same structure as described for eglChooseConfig. Attributes that can
>+    be specified in <attrib_list> include
>+    EGL_FLEXIBLE_SURFACE_COMPATIBILITY_SUPPORTED_ANGLE, EGL_GL_COLORSPACE,
>+    EGL_RENDER_BUFFER, EGL_VG_COLORSPACE, and EGL_VG_ALPHA_FORMAT."
>+
>+    Add the following between paragraphs 6 and 7 of Section 3.5.1, page 32
>+    (Creating On-Screen Rendering Surfaces)
>+
>+    "EGL_FLEXIBLE_SURFACE_COMPATIBILITY_SUPPORTED_ANGLE specifies whether the
>+    surface can be made current with a context with a config of different bit
>+    depth. Its values can be EGL_TRUE, in which case that is supported, or
>+    EGL_FALSE, in which case that is not supported."
>+
>+    Modify the fourth paragraph of Section 3.5.2, page 35
>+    (Creating Off-Screen Rendering Surfaces)
>+
>+    "<attrib_list> specifies a list of attributes for the pbuffer. The list
>+    has the same structure as described for eglChooseConfig. Attributes that
>+    can be specified in <attrib_list> include EGL_WIDTH, EGL_HEIGHT,
>+    EGL_LARGEST_PBUFFER, EGL_TEXTURE_FORMAT, EGL_TEXTURE_TARGET,
>+    EGL_MIPMAP_TEXTURE, EGL_GL_COLORSPACE, EGL_VG_COLORSPACE,
>+    EGL_FLEXIBLE_SURFACE_COMPATIBILITY_SUPPORTED_ANGLE, and
>+    EGL_VG_ALPHA_FORMAT."
>+
>+    Modify paragraph twelve of Section 3.5.2, page 36
>+
>+    "EGL_GL_COLORSPACE, EGL_VG_COLORSPACE,
>+    EGL_FLEXIBLE_SURFACE_COMPATIBILITY_SUPPORTED_ANGLE, and
>+    EGL_VG_ALPHA_FORMAT have the same meaning and default values as when used
>+    with eglCreatePlatformWindowSurface."
>+
>+    Modify the fifth paragraph of Section 3.5.3, page 37
>+    (Binding Off-Screen Rendering Surfaces To Client Buffers)
>+
>+    "<attrib_list> specifies a list of attributes for the pbuffer. The list
>+    has the same structure as described for eglChooseConfig. Attributes that
>+    can be specified in <attrib_list> include EGL_TEXTURE_FORMAT,
>+    EGL_TEXTURE_TARGET, EGL_- MIPMAP_TEXTURE, and
>+    EGL_FLEXIBLE_SURFACE_COMPATIBILITY_SUPPORTED_ANGLE. The meaning of these
>+    attributes is as described above for eglCreatePbufferSurface. The
>+    EGL_VG_COLORSPACE and EGL_VG_ALPHA_FORMAT attributes of the surface are
>+    determined by the VGImageFormat of buffer."
>+
>+    Add the following entry to Table 3.5, page 44 (Queryable surface
>+    attributes and types)
>+
>+    Attribute                                          Type    Description
>+    -------------------------------------------------- ------- ------------------------
>+    EGL_FLEXIBLE_SURFACE_COMPATIBILITY_SUPPORTED_ANGLE boolean Surface can be made
>+                                                               current with contexts
>+                                                               of a different bit depth
>+
>+Issues
>+
>+    None
>+
>+Revision History
>+
>+    Version 3, Dec 15, 2015 (John Bauman)
>+        - Modify EGL_FLEXIBLE_SURFACE_COMPATIBILITY_SUPPORTED_ANGLE value.
>+
>+    Version 2, Dec 1, 2015 (John Bauman)
>+        - Add EGL_FLEXIBLE_SURFACE_COMPATIBILITY_SUPPORTED_ANGLE to specify
>+          new behavior.
>+
>+    Version 1, Nov 24, 2015 (John Bauman)
>+        - Initial Draft
>diff --git a/Source/ThirdParty/ANGLE/extensions/EGL_ANGLE_iosurface_client_buffer.txt b/Source/ThirdParty/ANGLE/extensions/EGL_ANGLE_iosurface_client_buffer.txt
>new file mode 100644
>index 00000000000..0ec5beae05f
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/extensions/EGL_ANGLE_iosurface_client_buffer.txt
>@@ -0,0 +1,118 @@
>+Name
>+
>+    ANGLE_iosurface_client_buffer
>+
>+Name Strings
>+
>+    EGL_ANGLE_iosurface_client_buffer
>+
>+Contributors
>+
>+    Corentin Wallez
>+    Geoff Lang
>+    James Darpinian
>+
>+Contacts
>+
>+    Corentin Wallez, Google Inc. (cwallez 'at' google.com)
>+
>+Status
>+
>+    Draft
>+
>+Version
>+    Version 2, Apr 1, 2019
>+
>+Number
>+
>+    EGL Extension #??
>+
>+Dependencies
>+
>+    This extension is written against the wording of the EGL 1.4
>+    Specification.
>+
>+Overview
>+
>+    This extension allows creating EGL surfaces from IOSurface objects.
>+
>+New Types
>+
>+    None
>+
>+New Procedures and Functions
>+
>+    None
>+
>+New Tokens
>+
>+    Accepted in the <buftype> parameter of eglCreatePbufferFromClientBuffer:
>+
>+        EGL_IOSURFACE_ANGLE            0x3454
>+        EGL_IOSURFACE_PLANE_ANGLE      0x345A
>+        EGL_TEXTURE_RECTANGLE_ANGLE    0x345B
>+        EGL_TEXTURE_TYPE_ANGLE         0x345C
>+        EGL_TEXTURE_INTERNAL_FORMAT_ANGLE 0x345D
>+
>+Additions to Chapter 3 of the EGL 1.4 Specification (EGL Functions and Errors)
>+
>+    Replace the last sentence of paragraph 1 of Section 3.5.3 with the
>+    following text.
>+    "Currently, the only client API resources which may be bound in this
>+    fashion are OpenVG VGImage objects and IOSurface objects."
>+
>+    Replace the third paragraph of Section 3.5.3 with the following text.
>+    "<buftype> specifies the type of buffer to be bound. The only allowed values
>+    of <buftype> are EGL_OPENVG_IMAGE and EGL_IOSURFACE_ANGLE".
>+
>+    Append the following text to the fourth paragraph of Section 3.5.3.
>+    "When <buftype> is EGL_IOSURFACE_ANGLE, <buffer> must be a valid IOSurface
>+    object case into the type EGLClientBuffer."
>+
>+    Append to the end of Section 3.5.3.
>+    "When <buftype> is EGL_IOSURFACE_ANGLE, <attrib_list> must contain all the
>+    following attributes otherwise EGL_BAD_PARAMETER is generated. The
>+    attributes must satisfy the following constraints otherwise
>+    EGL_BAD_ATTRIBUTE is generated:
>+      - EGL_TEXTURE_TYPE_ANGLE, and EGL_TEXTURE_INTERNAL_FORMAT_ANGLE followed
>+    by OpenGL enums for texture types, and texture internal format
>+    respectively.
>+      - EGL_TEXTURE_FORMAT with a value of EGL_TEXTURE_RGBA
>+      - EGL_WIDTH with a value between 1 and the width of <buffer>.
>+      - EGL_HEIGHT with a value between 1 and the height of <buffer>.
>+      - EGL_TEXTURE_TARGET with a value of EGL_TEXTURE_RECTANGLE_ANGLE
>+      - EGL_IOSURFACE_PLANE_ANGLE with a value between 0 and the number of
>+    planes of <buffer> (exclusive).
>+
>+    In addition the EGL_TEXTURE_TYPE_ANGLE and
>+    EGL_TEXTURE_INTERNAL_FORMAT_ANGLE attributes must be one of the
>+    combinations listed in table egl.iosurface.formats or an
>+    EGL_BAD_PARAMETER is generated. The combination must also be a valid
>+    combinations for glTexImage2D or EGL_BAD_PARAMETER is generated."
>+
>+    ---------------------------------------------------------------------------
>+    Texture Type               Texture Internal Format
>+    ---------------------------------------------------------------------------
>+    GL_UNSIGNED_BYTE           GL_RED
>+    GL_UNSIGNED_SHORT          GL_R16UI
>+    GL_UNSIGNED_BYTE           GL_RG
>+    GL_UNSIGNED_BYTE           GL_BGRA_EXT
>+    GL_HALF_FLOAT              GL_RGBA
>+    ---------------------------------------------------------------------------
>+    Table egl.iosurface.formats - Valid combinations of format, type and
>+    internal format for IOSurface-backed pbuffers.
>+    ---------------------------------------------------------------------------
>+
>+    Append to the end of Section 3.5.3.
>+    "When a pbuffer is created with type EGL_IOSURFACE_ANGLE, the contents
>+    of the associcated IOSurface object are undefined while the pbuffer is
>+    bound to a client texture."
>+
>+Issues
>+
>+    There are no issues, please move on.
>+
>+Revision History
>+
>+    Version 1, 2017/12/06 - first draft.
>+    Version 2, 2019/04/01 - Allow MakeCurrent.
>diff --git a/Source/ThirdParty/ANGLE/extensions/EGL_ANGLE_keyed_mutex.txt b/Source/ThirdParty/ANGLE/extensions/EGL_ANGLE_keyed_mutex.txt
>new file mode 100644
>index 00000000000..647af90df8e
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/extensions/EGL_ANGLE_keyed_mutex.txt
>@@ -0,0 +1,75 @@
>+Name
>+
>+    ANGLE_keyed_mutex
>+
>+Name Strings
>+
>+    EGL_ANGLE_keyed_mutex
>+
>+Contributors
>+
>+    Jeff Muizelaar
>+
>+Contacts
>+
>+    Jeff Muizelaar, Mozilla (jmuizelaar 'at' mozilla.org)
>+
>+Status
>+
>+    Implemented in ANGLE.
>+
>+Version
>+
>+    Version 1, Oct 29, 2014
>+
>+Number
>+
>+    EGL Extension #??
>+
>+Dependencies
>+
>+    Requires the EGL_ANGLE_query_surface_pointer extension.
>+
>+    This extension is written against the wording of the EGL 1.4
>+    Specification.
>+
>+Overview
>+
>+    Some EGL implementations generate EGLSurface handles that are
>+    backed by Direct3D 11 2D textures.  This extension allows
>+    obtaining the IDXGIKeyedMutex for such EGL surfaces.
>+
>+New Types
>+
>+    None
>+
>+New Procedures and Functions
>+
>+    None
>+
>+New Tokens
>+
>+    Accepted in the <attribute> parameter of eglQuerySurfacePointerANGLE:
>+
>+        EGL_DXGI_KEYED_MUTEX_ANGLE                       0x33A2
>+
>+    Add to table 3.5, "Queryable surface attributes and types":
>+
>+        Attribute                              Type      Description
>+        ---------                              ----      -----------
>+        EGL_DXGI_KEYED_MUTEX_ANGLE             pointer   IDXGIKeyedMutex
>+
>+    Add before the last paragraph in section 3.5, "Surface attributes":
>+
>+        "Querying EGL_DXGI_KEYED_MUTEX_ANGLE returns a IDXGIKeyedMutex, or NULL
>+        if a keyed mutex for the surface is not available.  The keyed mutex
>+        must be queried using eglQuerySurfaceAttribPointerANGLE.  Keyed Mutexes
>+        are only available from EGL surfaces backed by Direct3D 11 surfaces.
>+        Before using the keyed mutex, ensure that all rendering to the EGLSurface
>+        with EGL client APIs has completed."
>+
>+Issues
>+
>+Revision History
>+
>+    Version 1, 2014/10/29 - first draft.
>diff --git a/Source/ThirdParty/ANGLE/extensions/EGL_ANGLE_platform_angle.txt b/Source/ThirdParty/ANGLE/extensions/EGL_ANGLE_platform_angle.txt
>new file mode 100644
>index 00000000000..69f8dbc17fd
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/extensions/EGL_ANGLE_platform_angle.txt
>@@ -0,0 +1,163 @@
>+Name
>+
>+    ANGLE_platform_angle
>+
>+Name Strings
>+
>+    EGL_ANGLE_platform_angle
>+
>+Contributors
>+
>+    Scott Graham, Google
>+    Shannon Woods, Google
>+    Geoff Lang, Google
>+
>+Contacts
>+
>+    Scott Graham, Google (scottmg 'at' google 'dot' com)
>+
>+Status
>+
>+    Draft
>+
>+Version
>+
>+    Version 5, 2017-12-28
>+
>+Number
>+
>+    EGL Extension XXX
>+
>+Extension Type
>+
>+    EGL client extension
>+
>+Dependencies
>+
>+    Requires EGL_EXT_client_extensions to query its existence without
>+    a display.
>+
>+    Requires EGL_EXT_platform_base.
>+
>+    This extension is written against the wording of version 9 of the
>+    EGL_EXT_platform_base specification.
>+
>+    ANGLE_platform_angle_d3d affects the definition of this extension.
>+    ANGLE_platform_angle_opengl affects the definition of this extension.
>+
>+Overview
>+
>+    This extension defines how to create EGL resources from native resources
>+    using the functions defined by EGL_EXT_platform_base.
>+
>+New Types
>+
>+    None
>+
>+New Procedures and Functions
>+
>+    None
>+
>+New Tokens
>+
>+    Accepted as the <platform> argument of eglGetPlatformDisplayEXT:
>+
>+        EGL_PLATFORM_ANGLE_ANGLE                           0x3202
>+
>+    Accepted as an attribute name in the <attrib_list> argument of
>+    eglGetPlatformDisplayEXT:
>+
>+        EGL_PLATFORM_ANGLE_TYPE_ANGLE                      0x3203
>+        EGL_PLATFORM_ANGLE_MAX_VERSION_MAJOR_ANGLE         0x3204
>+        EGL_PLATFORM_ANGLE_MAX_VERSION_MINOR_ANGLE         0x3205
>+        EGL_PLATFORM_ANGLE_DEBUG_LAYERS_ENABLED            0x3451
>+
>+    Accepted as values for the EGL_PLATFORM_ANGLE_TYPE_ANGLE attribute:
>+
>+        EGL_PLATFORM_ANGLE_TYPE_DEFAULT_ANGLE              0x3206
>+
>+    Accepted as values for the EGL_PLATFORM_ANGLE_DEVICE_TYPE_ANGLE attribute:
>+
>+        EGL_PLATFORM_ANGLE_DEVICE_TYPE_HARDWARE_ANGLE      0x320A
>+        EGL_PLATFORM_ANGLE_DEVICE_TYPE_NULL_ANGLE          0x345E
>+
>+Additions to the EGL Specification
>+
>+    None.
>+
>+New Behavior
>+
>+    To determine if the EGL implementation supports this extension, clients
>+    should query the EGL_EXTENSIONS string of EGL_NO_DISPLAY.
>+
>+    To obtain an EGLDisplay backed by a ANGLE display, call
>+    eglGetPlatformDisplayEXT with <platform> set to EGL_PLATFORM_ANGLE_ANGLE.
>+
>+    The <native_display> parameter is of type EGLNativeDisplayType. If
>+    <native_display> is EGL_DEFAULT_DISPLAY a default display is returned.
>+    Multiple calls with the same <native_display> will return the same
>+    EGLDisplay handle. If <platform> is set to EGL_PLATFORM_ANGLE_ANGLE and
>+    the returned display is in an uninitialized state, its attributes are
>+    overwritten by those provided in the <attrib_list>, if any.
>+
>+    If no <attrib_list> is specified, the value of
>+    EGL_PLATFORM_ANGLE_TYPE_ANGLE is implicitly set to
>+    EGL_PLATFORM_ANGLE_TYPE_DEFAULT_ANGLE.
>+
>+    If no <attrib_list> is specified, the values of
>+    EGL_PLATFORM_ANGLE_MAX_VERSION_MAJOR_ANGLE and
>+    EGL_PLATFORM_ANGLE_MAX_VERSION_MINOR_ANGLE are implicitly set to
>+    EGL_DONT_CARE.
>+
>+    If no <attrib_list> is specified, the value of
>+    EGL_PLATFORM_ANGLE_DEBUG_LAYERS_ENABLED is implicitly set to
>+    EGL_DONT_CARE.
>+
>+    If no <attrib_list> is specified to eglGetPlatformDisplayEXT, the value of
>+    EGL_PLATFORM_ANGLE_DEVICE_TYPE_ANGLE is implicitly set to
>+    EGL_PLATFORM_ANGLE_DEVICE_TYPE_HARDWARE_ANGLE. Otherwise, the value of
>+    EGL_PLATFORM_ANGLE_DEVICE_TYPE_ANGLE should be:
>+      - EGL_PLATFORM_ANGLE_DEVICE_TYPE_HARDWARE_ANGLE to request a hardware
>+        accelerated device.
>+      - EGL_PLATFORM_ANGLE_DEVICE_TYPE_NULL_ANGLE to request a no-op driver
>+        for testing. If unavailable, the implementation will fall back to
>+        EGL_PLATFORM_ANGLE_DEVICE_TYPE_HARDWARE_ANGLE.
>+
>+    If EGL_PLATFORM_ANGLE_MAX_VERSION_MAJOR_ANGLE is set to EGL_DONT_CARE and
>+    EGL_PLATFORM_ANGLE_MAX_VERSION_MINOR_ANGLE is not set to EGL_DONT_CARE,
>+    an EGL_BAD_ATTRIBUTE error is generated and EGL_NO_DISPLAY is returned.
>+
>+    If no display matching the requested <native_display> or of the type
>+    requested by the value of EGL_PLATFORM_ANGLE_TYPE_ANGLE is available,
>+    EGL_NO_DISPLAY is returned. No error condition is raised in this case.
>+
>+    If EGL_PLATFORM_ANGLE_DEBUG_LAYERS_ENABLED is specified, it
>+    controls enabling back-end validation layers. EGL_TRUE enables
>+    validation and EGL_FALSE disables it. If it is set to EGL_DONT_CARE, the
>+    default setting depends on the implementation. Any value other than these
>+    will result in an error.
>+
>+Issues
>+
>+    1) Should the validation layers default to on, off, or no guarantee?
>+
>+       Defaulting to off offers some consistency. However, it's customary for
>+       some applications like ANGLE to turn on debugging features by default
>+       in Debug builds.
>+
>+       RESOLVED: default to implementation-dependent behaviour.
>+
>+Revision History
>+
>+    Version 1, 2014-02-04 (Scott Graham)
>+      - Initial draft
>+    Version 2, 2014-06-05 (Geoff Lang)
>+      - Rename extension from ANGLE_platform_angle_d3d to ANGLE_platform_angle.
>+      - Add sub-extensions for specific platforms.
>+    Version 3, 2014-10-20 (Geoff Lang)
>+      - Add attributes to request specific feature level and context versions.
>+      - Moved descriptions of platforms to child extension specs.
>+    Version 4, 2017-07-19 (Jamie Madill)
>+      - Add a debug layers enabled attribute to control runtime validation.
>+    Version 5, 2017-12-28 (Jamie Madill)
>+      - Expose device type selection.
>diff --git a/Source/ThirdParty/ANGLE/extensions/EGL_ANGLE_platform_angle_context_virtualization.txt b/Source/ThirdParty/ANGLE/extensions/EGL_ANGLE_platform_angle_context_virtualization.txt
>new file mode 100644
>index 00000000000..8a714dd9248
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/extensions/EGL_ANGLE_platform_angle_context_virtualization.txt
>@@ -0,0 +1,80 @@
>+Name
>+
>+    ANGLE_platform_angle_context_virtualization
>+
>+Name Strings
>+
>+    EGL_ANGLE_platform_angle_context_virtualization
>+
>+Contributors
>+
>+    Geoff Lang, Google
>+
>+Contacts
>+
>+    Geoff Lang, Google (geofflang 'at' chromium 'dot' org)
>+
>+Status
>+
>+    Draft
>+
>+Version
>+
>+    Version 1, 2018-06-11
>+
>+Number
>+
>+    EGL Extension XXX
>+
>+Extension Type
>+
>+    EGL client extension
>+
>+Dependencies
>+
>+    Requires ANGLE_platform_angle.
>+
>+Overview
>+
>+    This extension allows the client to request a Display that internally
>+    virtualizes contexts. Requesting virtualized contexts may impact
>+    performance or ability to render from multiple threads simultaneously.
>+
>+New Types
>+
>+    None
>+
>+New Procedures and Functions
>+
>+    None
>+
>+New Tokens
>+
>+    Accepted as an attribute name in the <attrib_list> argument of
>+    eglGetPlatformDisplayEXT:
>+
>+        EGL_PLATFORM_ANGLE_CONTEXT_VIRTUALIZATION_ANGLE    0x3481
>+
>+Additions to the EGL Specification
>+
>+    None.
>+
>+New Behavior
>+
>+    To request a display that internally utilizes context virtualization,
>+    use the attribute EGL_PLATFORM_ANGLE_CONTEXT_VIRTUALIZATION_ANGLE.
>+    EGL_TRUE enables context virtualization and EGL false disables it.
>+    If it is set to EGL_DONT_CARE, the default setting depends on the
>+    implementation. Any value other than these will result in an error.
>+    The default value for EGL_PLATFORM_ANGLE_CONTEXT_VIRTUALIZATION_ANGLE
>+    is EGL_DONT_CARE. Display creation may fail if hardware limitations
>+    prohibit the requested setting.
>+
>+Issues
>+
>+    None
>+
>+Revision History
>+
>+    Version 1, 2018-06-11 (Geoff Lang)
>+      - Initial draft
>diff --git a/Source/ThirdParty/ANGLE/extensions/EGL_ANGLE_platform_angle_d3d.txt b/Source/ThirdParty/ANGLE/extensions/EGL_ANGLE_platform_angle_d3d.txt
>new file mode 100644
>index 00000000000..27536572243
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/extensions/EGL_ANGLE_platform_angle_d3d.txt
>@@ -0,0 +1,141 @@
>+Name
>+
>+    ANGLE_platform_angle_d3d
>+
>+Name Strings
>+
>+    EGL_ANGLE_platform_angle_d3d
>+
>+Contributors
>+
>+    Shannon Woods, Google
>+    Geoff Lang, Google
>+
>+Contacts
>+
>+    Geoff Lang, Google (geofflang 'at' chromium 'dot' org)
>+
>+Status
>+
>+    Draft
>+
>+Version
>+
>+    Version 3, 2014-11-26
>+
>+Number
>+
>+    EGL Extension XXX
>+
>+Extension Type
>+
>+    EGL client extension
>+
>+Dependencies
>+
>+    Requires ANGLE_platform_angle.
>+
>+Overview
>+
>+    This extension enables selection of D3D display types.
>+
>+New Types
>+
>+    None
>+
>+New Procedures and Functions
>+
>+    None
>+
>+New Tokens
>+
>+    Accepted as values for the EGL_PLATFORM_ANGLE_TYPE_ANGLE attribute:
>+
>+        EGL_PLATFORM_ANGLE_TYPE_D3D9_ANGLE                 0x3207
>+        EGL_PLATFORM_ANGLE_TYPE_D3D11_ANGLE                0x3208
>+
>+    Accepted as an attribute name in the <attrib_list> argument of
>+    eglGetPlatformDisplayEXT:
>+
>+        EGL_PLATFORM_ANGLE_DEVICE_TYPE_ANGLE               0x3209
>+        EGL_PLATFORM_ANGLE_ENABLE_AUTOMATIC_TRIM_ANGLE     0x320F
>+
>+    Accepted as values for the EGL_PLATFORM_ANGLE_DEVICE_TYPE_ANGLE attribute:
>+
>+        EGL_PLATFORM_ANGLE_DEVICE_TYPE_D3D_WARP_ANGLE      0x320B
>+        EGL_PLATFORM_ANGLE_DEVICE_TYPE_D3D_REFERENCE_ANGLE 0x320C
>+
>+Additions to the EGL Specification
>+
>+    None.
>+
>+New Behavior
>+
>+    To request a display that is backed by Direct3D resources, the value of
>+    EGL_PLATFORM_ANGLE_TYPE_ANGLE should be:
>+      - EGL_PLATFORM_ANGLE_TYPE_D3D9_ANGLE for a D3D9 display,
>+      - EGL_PLATFORM_ANGLE_TYPE_D3D11_ANGLE for a D3D11 display.
>+
>+    To request a specific maximum feature level to be used by the D3D11
>+    display, EGL_PLATFORM_ANGLE_MAX_VERSION_MAJOR_ANGLE and
>+    EGL_PLATFORM_ANGLE_MAX_VERSION_MINOR_ANGLE can be used.  Only feature
>+    levels that are capable of supporting all available client APIs will be
>+    used unless explicitly requested.
>+    EGL_PLATFORM_ANGLE_MAX_VERSION_MAJOR_ANGLE and
>+    EGL_PLATFORM_ANGLE_MAX_VERSION_MINOR_ANGLE have no effect when requesting
>+    a D3D9 display.
>+
>+    If no <attrib_list> is specified to eglGetPlatformDisplayEXT, the value of
>+    EGL_PLATFORM_ANGLE_DEVICE_TYPE_ANGLE is implicitly set to
>+    EGL_PLATFORM_ANGLE_DEVICE_TYPE_HARDWARE_ANGLE. Otherwise, the value of
>+    EGL_PLATFORM_ANGLE_DEVICE_TYPE_ANGLE should be:
>+      - EGL_PLATFORM_ANGLE_DEVICE_TYPE_HARDWARE_ANGLE to request a hardware
>+        accelerated device.
>+      - EGL_PLATFORM_ANGLE_DEVICE_TYPE_NULL_ANGLE to request a no-op driver
>+        for testing.
>+      - EGL_PLATFORM_ANGLE_DEVICE_TYPE_D3D_WARP_ANGLE to request an
>+        optimized software rasterizer.
>+      - EGL_PLATFORM_ANGLE_DEVICE_TYPE_D3D_REFERENCE_ANGLE to request a
>+        reference rasterizer.
>+
>+    If EGL_PLATFORM_ANGLE_TYPE_ANGLE is set to
>+    EGL_PLATFORM_ANGLE_TYPE_D3D11_ANGLE, the display can automatically respond
>+    to trim events from the operating system.  If the attribute
>+    EGL_PLATFORM_ANGLE_ENABLE_AUTOMATIC_TRIM_ANGLE is unspecified, it is
>+    implicitly set to EGL_FALSE.  Otherwise, the value of
>+    EGL_PLATFORM_ANGLE_ENABLE_AUTOMATIC_TRIM_ANGLE should be EGL_TRUE or
>+    EGL_FALSE.
>+
>+    If EGL_PLATFORM_ANGLE_DEVICE_TYPE_ANGLE is set to
>+    EGL_PLATFORM_ANGLE_DEVICE_TYPE_WARP_ANGLE and EGL_PLATFORM_ANGLE_TYPE_ANGLE
>+    is not set to EGL_PLATFORM_ANGLE_TYPE_D3D11_ANGLE, an EGL_BAD_ATTRIBUTE
>+    error is generated and EGL_NO_DISPLAY is returned.
>+
>+    If EGL_PLATFORM_ANGLE_ENABLE_AUTOMATIC_TRIM_ANGLE is specified when
>+    EGL_PLATFORM_ANGLE_TYPE_ANGLE is not EGL_PLATFORM_ANGLE_TYPE_D3D11_ANGLE
>+    or a value other than EGL_TRUE or EGL_FALSE is used, an EGL_BAD_ATTRIBUTE
>+    error is generated and EGL_NO_DISPLAY is returned.
>+
>+Issues
>+
>+    1) Some multithreaded applications can crash if the display automatically
>+       responds to trim events while the application is rendering from another
>+       thread.
>+
>+       RESOLVED: Added an EGL_PLATFORM_ANGLE_ENABLE_AUTOMATIC_TRIM_ANGLE
>+       enum to specify if the display should respond to trim events.
>+       Applications that do multithreaded rendering should disable automatic
>+       trim and handle the trim events on their own.
>+
>+Revision History
>+
>+    Version 1, 2014-06-05 (Geoff Lang)
>+      - Initial draft
>+    Version 2, 2014-10-27 (Geoff Lang)
>+      - Separate WARP devices into a new attribute instead of a platform type.
>+      - Moved descriptions of platforms and major/minor versions from
>+        EGL_ANGLE_platform_angle spec to EGL_ANGLE_platform_angle_d3d.
>+    Version 3, 2014-11-26 (Geoff Lang)
>+      - Remove the USE_WARP bool and replace it with a DEVICE_TYPE enum.
>+    Version 4, 2015-03-11 (Geoff Lang)
>+      - Add the ENABLE_AUTOMATIC_TRIM enum.
>diff --git a/Source/ThirdParty/ANGLE/extensions/EGL_ANGLE_platform_angle_null.txt b/Source/ThirdParty/ANGLE/extensions/EGL_ANGLE_platform_angle_null.txt
>new file mode 100644
>index 00000000000..e9b8ee2cddb
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/extensions/EGL_ANGLE_platform_angle_null.txt
>@@ -0,0 +1,73 @@
>+Name
>+
>+    ANGLE_platform_angle_null
>+
>+Name Strings
>+
>+    EGL_ANGLE_platform_angle_null
>+
>+Contributors
>+
>+    Geoff Lang, Google
>+
>+Contacts
>+
>+    Geoff Lang, Google (geofflang 'at' google 'dot' com)
>+
>+Status
>+
>+    Draft
>+
>+Version
>+
>+    Version 1, September 23, 2016
>+
>+Number
>+
>+    EGL Extension #??
>+
>+Extension Type
>+
>+    EGL client extension
>+
>+Dependencies
>+
>+    Requires ANGLE_platform_angle.
>+
>+Overview
>+
>+    This extension enables selection of null display types which perform state
>+    tracking and validation but do not render any content.
>+
>+New Types
>+
>+    None
>+
>+New Procedures and Functions
>+
>+    None
>+
>+New Tokens
>+
>+    Accepted as values for the EGL_PLATFORM_ANGLE_TYPE_ANGLE attribute:
>+
>+        EGL_PLATFORM_ANGLE_TYPE_NULL_ANGLE               0x33AE
>+
>+Additions to the EGL Specification
>+
>+    None.
>+
>+New Behavior
>+
>+    To request a display that performs no rendering and has no platform
>+    dependencies, the value of EGL_PLATFORM_ANGLE_TYPE_ANGLE should be
>+    EGL_PLATFORM_ANGLE_TYPE_NULL_ANGLE.
>+
>+Issues
>+
>+    None
>+
>+Revision History
>+
>+    Version 1, 2016-09-23 (Geoff Lang)
>+      - Initial draft
>diff --git a/Source/ThirdParty/ANGLE/extensions/EGL_ANGLE_platform_angle_opengl.txt b/Source/ThirdParty/ANGLE/extensions/EGL_ANGLE_platform_angle_opengl.txt
>new file mode 100644
>index 00000000000..52ef4ee277f
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/extensions/EGL_ANGLE_platform_angle_opengl.txt
>@@ -0,0 +1,100 @@
>+Name
>+
>+    ANGLE_platform_angle_opengl
>+
>+Name Strings
>+
>+    EGL_ANGLE_platform_angle_opengl
>+
>+Contributors
>+
>+    Shannon Woods, Google
>+    Geoff Lang, Google
>+    Courtney Goeltzenleuchter, Google
>+
>+Contacts
>+
>+    Geoff Lang, Google (geofflang 'at' chromium 'dot' org)
>+
>+Status
>+
>+    Draft
>+
>+Version
>+
>+    Version 4, 2018-05-17
>+
>+Number
>+
>+    EGL Extension XXX
>+
>+Extension Type
>+
>+    EGL client extension
>+
>+Dependencies
>+
>+    Requires ANGLE_platform_angle.
>+
>+Overview
>+
>+    This extension enables selection of OpenGL display types and,
>+    for OpenGL ES display types, allows the application to pass
>+    in a handle to the EGL library to use.
>+
>+New Types
>+
>+    None
>+
>+New Procedures and Functions
>+
>+    None
>+
>+New Tokens
>+
>+    Accepted as values for the EGL_PLATFORM_ANGLE_TYPE_ANGLE attribute:
>+
>+        EGL_PLATFORM_ANGLE_TYPE_OPENGL_ANGLE               0x320D
>+        EGL_PLATFORM_ANGLE_TYPE_OPENGLES_ANGLE             0x320E
>+
>+    Accepted as an attribute name in the <attrib_list> argument of
>+    eglGetPlatformDisplayEXT:
>+        EGL_PLATFORM_ANGLE_EGL_HANDLE_ANGLE                0x3480
>+
>+Additions to the EGL Specification
>+
>+    None.
>+
>+New Behavior
>+
>+    To request a display that translates to OpenGL or OpenGL ES, the value of
>+    EGL_PLATFORM_ANGLE_TYPE_ANGLE should be:
>+      - EGL_PLATFORM_ANGLE_TYPE_OPENGL_ANGLE for an OpenGL display,
>+      - EGL_PLATFORM_ANGLE_TYPE_OPENGLES_ANGLE for a native OpenGL ES display.
>+
>+    To request a specific maximum context version to use for the underlying
>+    API, EGL_PLATFORM_ANGLE_MAX_VERSION_MAJOR_ANGLE and
>+    EGL_PLATFORM_ANGLE_MAX_VERSION_MINOR_ANGLE can be used.
>+
>+    To pass in a handle to the system EGL library, use the attribute
>+    EGL_PLATFORM_ANGLE_EGL_HANDLE_ANGLE. If EGL_PLATFORM_ANGLE_TYPE_ANGLE
>+    is not equal to EGL_PLATFORM_ANGLE_TYPE_OPENGLES_ANGLE, an
>+    EGL_BAD_ATTRIBUTE is generated. If the handle provided with
>+    EGL_PLATFORM_ANGLE_EGL_HANDLE_ANGLE is not a valid EGL handle,
>+    behaviour is undefined.
>+
>+Issues
>+
>+    None
>+
>+Revision History
>+
>+    Version 1, 2014-06-05 (Geoff Lang)
>+      - Initial draft
>+    Version 2, 2014-10-27 (Geoff Lang)
>+      - Moved descriptions of platforms and major/minor versions from
>+        EGL_ANGLE_platform_angle spec to EGL_ANGLE_platform_angle_opengl.
>+    Version 3, 2014-11-26 (Geoff Lang)
>+      - Updated enum values.
>+    Version 4, 2018-05-17 (Courtney Goeltzenleuchter)
>+      - Add attribute for specifying underlying EGL library.
>diff --git a/Source/ThirdParty/ANGLE/extensions/EGL_ANGLE_platform_angle_vulkan.txt b/Source/ThirdParty/ANGLE/extensions/EGL_ANGLE_platform_angle_vulkan.txt
>new file mode 100644
>index 00000000000..b677532b5dc
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/extensions/EGL_ANGLE_platform_angle_vulkan.txt
>@@ -0,0 +1,86 @@
>+Name
>+
>+    ANGLE_platform_angle_vulkan
>+
>+Name Strings
>+
>+    EGL_ANGLE_platform_angle_vulkan
>+
>+Contributors
>+
>+    Jamie Madill, Google
>+
>+Contacts
>+
>+    Jamie Madill, Google (jmadill 'at' google 'dot' com)
>+
>+Status
>+
>+    Draft
>+
>+Version
>+
>+    Version 2, 2017-07-19
>+
>+Number
>+
>+    EGL Extension XXX
>+
>+Extension Type
>+
>+    EGL client extension
>+
>+Dependencies
>+
>+    Requires ANGLE_platform_angle.
>+
>+Overview
>+
>+    This extension enables selection of Vulkan display types.
>+
>+New Types
>+
>+    None
>+
>+New Procedures and Functions
>+
>+    None
>+
>+New Tokens
>+
>+    Accepted as values for the EGL_PLATFORM_ANGLE_TYPE_ANGLE attribute:
>+
>+        EGL_PLATFORM_ANGLE_TYPE_VULKAN_ANGLE               0x3450
>+
>+Additions to the EGL Specification
>+
>+    None.
>+
>+New Behavior
>+
>+    To request a display that is backed by a Vulkan driver, the value of
>+    EGL_PLATFORM_ANGLE_TYPE_ANGLE should be
>+    EGL_PLATFORM_ANGLE_TYPE_VULKAN_ANGLE.
>+
>+    If EGL_PLATFORM_ANGLE_MAX_VERSION_MAJOR_ANGLE and
>+    EGL_PLATFORM_ANGLE_MAX_VERSION_MINOR_ANGLE are not specified, the
>+    implementation will decide which version of Vulkan to instantiate. If they
>+    are specified, it will choose a version that is lower or equal to the
>+    specified major and minor versions. The only current values accepted for
>+    major and minor version are 1 for major and 0 for minor.
>+
>+Issues
>+
>+    1) Should ANGLE always instantiate the highest available version of Vulkan?
>+
>+       RESOLVED: It's possible that in a future implementation of Vulkan there
>+       may be driver issues present only on some version of Vulkan, and there's
>+       no explicit guarantee higher versions will be more stable. Hence, we should
>+       give ANGLE some flexiblity in this regard and leave this unspecified.
>+
>+Revision History
>+
>+    Version 1, 2016-11-17 (Jamie Madill)
>+      - Initial draft
>+    Version 2, 2017-07-19 (Jamie Madill)
>+      - Moved debug layer control to EGL_ANGLE_platform_angle
>diff --git a/Source/ThirdParty/ANGLE/extensions/EGL_ANGLE_power_preference.txt b/Source/ThirdParty/ANGLE/extensions/EGL_ANGLE_power_preference.txt
>new file mode 100644
>index 00000000000..43bdc959bd0
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/extensions/EGL_ANGLE_power_preference.txt
>@@ -0,0 +1,85 @@
>+Name
>+
>+    ANGLE_power_preference
>+
>+Name Strings
>+
>+    EGL_ANGLE_power_preference
>+
>+Contributors
>+
>+    Kenneth Russell
>+
>+Contacts
>+
>+    Kenneth Russell, Google Inc. (kbr 'at' google.com)
>+
>+Status
>+
>+    Draft
>+
>+Version
>+
>+    Version 1, April 16, 2019
>+
>+Number
>+
>+    EGL Extension #??
>+
>+Dependencies
>+
>+    This extension is written against the wording of the EGL 1.4
>+    Specification.
>+
>+Overview
>+
>+    This extension allows selection of the high- or low-power GPU on
>+    dual-GPU systems, specifically on macOS.
>+
>+New Types
>+
>+    None
>+
>+New Procedures and Functions
>+
>+    None
>+
>+New Tokens
>+
>+    Accepted as an attribute name in the <*attrib_list> argument to
>+    eglCreateContext:
>+
>+        EGL_POWER_PREFERENCE_ANGLE  0x3482
>+
>+    Accepted as an attribute value in the <*attrib_list> argument to
>+    eglCreateContext:
>+
>+        EGL_LOW_POWER_ANGLE         0x0001
>+        EGL_HIGH_POWER_ANGLE        0x0002
>+
>+Additions to the EGL 1.4 Specification
>+
>+    Add the following to section 3.7.1 "Creating Rendering Contexts":
>+
>+    EGL_POWER_PREFERENCE_ANGLE indicates whether the context should be
>+    created on the integrated (low-power) or discrete (high-power) GPU
>+    on dual-GPU systems. EGL_POWER_PREFERENCE_ANGLE is only a legal
>+    context creation attribute when the EGL_ANGLE_power_preference
>+    extension is advertised. The valid values for this attribute are
>+    EGL_LOW_POWER_ANGLE and EGL_HIGH_POWER_ANGLE. If this extension is
>+    advertised and this context creation attribute is not specified,
>+    the default value is EGL_LOW_POWER_ANGLE.
>+
>+    The containing application must set the
>+    NSSupportsAutomaticGraphicsSwitching attribute to true in its
>+    Info.plist in order for this extension to operate as advertised.
>+
>+Issues
>+
>+    None yet.
>+
>+Revision History
>+
>+    Rev.    Date         Author     Changes
>+    ----  -------------  ---------  ----------------------------------------
>+      1   Apr 16, 2019   kbr        Initial version
>diff --git a/Source/ThirdParty/ANGLE/extensions/EGL_ANGLE_program_cache_control.txt b/Source/ThirdParty/ANGLE/extensions/EGL_ANGLE_program_cache_control.txt
>new file mode 100644
>index 00000000000..184f0e503c8
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/extensions/EGL_ANGLE_program_cache_control.txt
>@@ -0,0 +1,233 @@
>+Name
>+
>+    EGL_ANGLE_program_cache_control
>+
>+Name Strings
>+
>+    EGL_ANGLE_program_cache_control
>+
>+Contributors
>+
>+    Jamie Madill, Google
>+
>+Contacts
>+
>+    Jamie Madill (jmadill 'at' google.com)
>+
>+Status
>+
>+    Draft
>+
>+Version
>+
>+    Version 1, June 29, 2017
>+
>+Number
>+
>+    EGL Extension #??
>+
>+Dependencies
>+
>+    Requires EGL 1.5.
>+
>+    Written against the EGL 1.5 specification.
>+
>+Overview
>+
>+    This extension allows the for creation of an OpenGL or OpenGL ES contexts
>+    that have access to an internal binary program cache. It also allows for
>+    querying and populating the contents of the binary cache.
>+
>+    An OpenGL ES implementation supporting GL_ANGLE_program_cache_control or
>+    equivalent functionality is required.
>+
>+New Types
>+
>+    None
>+
>+New Procedures and Functions
>+
>+    EGLint eglProgramCacheGetAttribANGLE(
>+        EGLDisplay dpy,
>+        EGLenum attrib);
>+
>+    void eglProgramCacheQueryANGLE(
>+        EGLDisplay dpy,
>+        EGLint index,
>+        void *key,
>+        EGLint *keysize,
>+        void *binary,
>+        EGLint *binarysize);
>+
>+    void eglProgramCachePopulateANGLE(
>+        EGLDisplay dpy,
>+        const void *key,
>+        EGLint keysize,
>+        const void *binary,
>+        EGLint binarysize);
>+
>+    EGLint eglProgramCacheResizeANGLE(
>+        EGLDisplay dpy,
>+        EGLint limit,
>+        EGLenum mode);
>+
>+New Tokens
>+
>+    Accepted as a value for 'attrib' in eglProgramCacheGetAttribANGLE:
>+
>+        EGL_PROGRAM_CACHE_SIZE_ANGLE                     0x3455
>+        EGL_PROGRAM_CACHE_KEY_LENGTH_ANGLE               0x3456
>+
>+    Accepted as a value for 'mode' in eglProgramCacheResizeANGLE:
>+
>+        EGL_PROGRAM_CACHE_RESIZE_ANGLE                   0x3457
>+        EGL_PROGRAM_CACHE_TRIM_ANGLE                     0x3458
>+
>+    Accepted as an attribute name in the <*attrib_list> argument to
>+    eglCreateContext:
>+
>+        EGL_CONTEXT_PROGRAM_BINARY_CACHE_ENABLED_ANGLE   0x3459
>+
>+Additions to the EGL 1.5 Specification
>+
>+    Add the following to section 3.7.1 "Creating Rendering Contexts":
>+
>+    EGL_CONTEXT_PROGRAM_BINARY_CACHE_ENABLED_ANGLE indicates whether the context
>+    should be created with the GL_PROGRAM_BINARY_CACHE_ENABLE_ANGLE state
>+    initialized to GL_TRUE or GL_FALSE. The default value of
>+    EGL_CONTEXT_PROGRAM_BINARY_CACHE_ENABLED_ANGLE is EGL_TRUE. See section 3.13
>+    for details on the program binary cache.
>+
>+    Add a section 3.13 to the end of section 3 "EGL Program Binary Cache":
>+
>+    Each display has an associated program binary cache. This cache stores
>+    compiled programs for re-use on subsequent calls to glLinkProgram. The
>+    application can control the behaviour of the cache by enabling or disabling
>+    its use per-context (see section 3.7.1) and specifying a cache size. It
>+    can also query the current cache values and populate the cache during start-
>+    up.
>+
>+    Program binary cache properties may be queried using
>+
>+        EGLint eglProgramCacheGetAttribANGLE(EGLDisplay dpy, EGLenum attrib);
>+
>+    The only accepted values for 'attrib' are EGL_PROGRAM_CACHE_SIZE_ANGLE and
>+    EGL_PROGRAM_CACHE_KEY_LENGTH_ANGLE. A query for EGL_PROGRAM_CACHE_SIZE_ANGLE
>+    will return the number of cache entries in the program cache. A
>+    query of EGL_PROGRAM_CACHE_KEY_LENGTH_ANGLE will return the required length
>+    (in bytes) of the 'key' parameter to eglProgramCacheQueryANGLE and
>+    eglPopulateProgramCacheANGLE. Any other value for 'attrib' will produce an
>+    error of EGL_BAD_ATTRIBUTE, and an invalid display for 'dpy' will produce an
>+    error of EGL_BAD_DISPLAY. All error cases will return zero.
>+
>+    Cache contents may be queried by using
>+
>+        void eglProgramCacheQueryANGLE(EGLDisplay dpy, EGLint index,
>+            void *key, EGLint *keysize, void *binary, EGLint *binarysize);
>+
>+    If 'dpy' is not a valid display an EGL_BAD_DISPLAY error is generated. If
>+    'index' is not equal to or greater than zero and less than
>+    EGL_PROGRAM_CACHE_SIZE_ANGLE, an EGL_BAD_PARAMETER error is generated. If
>+    'dpy' is not a valid display EGL_BAD_DISPLAY is generated. If 'binarysize'
>+    and 'keysize' are non-null, and 'binary' and 'key' are null, the size of the
>+    binary at 'index' is written to 'binarysize', and the key size to 'keysize'.
>+    If 'binary' is not null, 'binarysize' specifies the maximum size of the
>+    'binary' out parameter, and if 'keysize' is not null, the size of the 'key'
>+    out parameter. Any attempt to write more than 'binarysize' or 'keysize'
>+    bytes will produce an EGL_BAD_ACCESS error in this case. If 'keysize' or
>+    'binarysize' is null, an EGL_BAD_PARAMETER error is generated. If 'key' is
>+    not null, 'binary' must also be non-null, and vice versa, or an
>+    EGL_BAD_PARAMETER error is generated. If the cache contents change such that
>+    a cache entry at 'index' is not retrievable, either EGL_BAD_ACCESS is
>+    generated or a null key and binary are returned. Valid entries returned are
>+    not guaranteed to be in the cache. Otherwise, the binary is written to
>+    'binary' and the program key is written to 'key'.
>+
>+    The cache may be warmed up on startup with
>+
>+        void eglProgramCachePopulateANGLE(EGLDisplay dpy, const void *key,
>+            EGLint keysize, const void *binary, EGLint binarysize);
>+
>+    If 'dpy' is not a valid display an EGL_BAD_DISPLAY error is generated. If
>+    'binarysize' is not positive or is greater than an internally defined
>+    maximum size, EGL_BAD_PARAMETER is generated. If 'keysize' does not equal
>+    EGL_PROGRAM_CACHE_KEY_LENGTH_ANGLE, EGL_BAD_PARAMETER is generated. If the
>+    program binary is invalid for any reason, behaviour is undefined. Otherwise
>+    the program will be loaded into the internal binary cache with the key
>+    'key'. If 'binary' or 'key' are null, an EGL_BAD_PARAMETER error is
>+    generated.
>+
>+    The cache contents size may be changed using
>+
>+        EGLint eglProgramCacheResizeANGLE(EGLDisplay dpy, EGLint limit,
>+            EGLenum mode);
>+
>+    If 'dpy' is not a valid display an EGL_BAD_DISPLAY error is generated. If
>+    limit is negative then EGL_BAD_PARAMETER is generated. If 'mode' is
>+    EGL_PROGRAM_CACHE_RESIZE, cache contents are discarded and a new maximum
>+    cache size is set to 'limit'. If 'limit' is larget than an implementation-
>+    defined internal constant, EGL_BAD_PARAMETER is generated. Otherwise the
>+    initial cache size is returned. If 'mode' is EGL_PROGRAM_CACHE_TRIM, cache
>+    resources are released until the total cache size, in bytes, is less than or
>+    equal to 'limit', and the  number of bytes of memory released is returned.
>+    In any error case, zero is returned.
>+
>+ Errors
>+
>+    None
>+
>+New State
>+
>+    None
>+
>+Conformance Tests
>+
>+    TBD
>+
>+Issues
>+
>+    1. Should the cache control be a property of the display or the contexts?
>+
>+      The cache itself will internally be a property of the display, since we
>+      want to share caches between contexts. It is possible to design an
>+      implementation with other kinds of cache sharing, such as between share
>+      groups.
>+
>+      We can choose to prefer simplicity of design in this case.
>+
>+      RESOLVED: the cache should be a property of the display.
>+
>+    2. What should happen if the cache is modified as the user is querying its
>+       contents?
>+
>+      It is more difficult to design a query API such that it can be returned
>+      atomically. Hence the cache can change in some cases while it is being
>+      queried. This can be controlled in the application layer. It can also be
>+      locked using OS-level synchronization.
>+
>+      Introducing undefined behaviour can be very problematic.
>+
>+      RESOLVED: we should use a mutex or similar lock to allow for multithreaded
>+      access, and not expose undefined behaviour.
>+
>+    3. Should we expose the key/value semantics or just have a binary value?
>+
>+      Having just the binary would eliminate one query enum, and make the APIs
>+      simpler. Having both key and value represents the implementation exactly.
>+
>+      RESOLVED: we should expose the key to mirror the implementation.
>+
>+    4. Should the extension allow for setting cache size limits?
>+
>+      If caches are a property of the display, they could be set in
>+      eglGetPlatformDisplay as an attribute.
>+
>+      Cache controls can be a necessary feature for memory management.
>+
>+      RESOLVED: yes, we should expose cache size controls.
>+
>+Revision History
>+
>+    Rev.    Date         Author     Changes
>+    ----  -------------  ---------  ----------------------------------------
>+      1   June 29, 2017  jmadill    Initial version
>diff --git a/Source/ThirdParty/ANGLE/extensions/EGL_ANGLE_query_surface_pointer.txt b/Source/ThirdParty/ANGLE/extensions/EGL_ANGLE_query_surface_pointer.txt
>new file mode 100644
>index 00000000000..75126fcbc31
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/extensions/EGL_ANGLE_query_surface_pointer.txt
>@@ -0,0 +1,88 @@
>+Name
>+
>+    ANGLE_query_surface_pointer
>+
>+Name Strings
>+
>+    EGL_ANGLE_query_surface_pointer
>+
>+Contributors
>+
>+    Vladimir Vukicevic
>+    Daniel Koch
>+
>+Contacts
>+
>+    Vladimir Vukicevic (vladimir 'at' pobox.com)
>+
>+Status
>+
>+    Complete
>+    Implemented (ANGLE r558)
>+
>+Version
>+
>+    Version 3, February 11, 2011
>+
>+Number
>+
>+    EGL Extension #28
>+
>+Dependencies
>+
>+    This extension is written against the wording of the EGL 1.4
>+    Specification. 
>+
>+Overview
>+
>+    This extension allows querying pointer-sized surface attributes,
>+    thus avoiding problems with coercing 64-bit pointers into a 32-bit
>+    integer.
>+
>+New Types
>+
>+    None
>+
>+New Procedures and Functions
>+
>+    EGLBoolean eglQuerySurfacePointerANGLE(
>+                        EGLDisplay dpy,
>+                        EGLSurface surface,
>+                        EGLint attribute,
>+                        void **value);
>+
>+New Tokens
>+
>+    None
>+
>+Additions to Chapter 3 of the EGL 1.4 Specification (EGL Functions and Errors)
>+
>+    Add to the end of the paragraph starting with "To query an
>+    attribute associated with an EGLSurface" in section 3.5.6,
>+    "Surface Attributes":
>+
>+    "If the attribute type in table 3.5 is 'pointer', then
>+    eglQuerySurface returns EGL_FALSE and an EGL_BAD_PARAMETER error
>+    is generated.  To query pointer attributes, call:
>+
>+         EGLBoolean eglQuerySurfacePointerANGLE(
>+                             EGLDisplay dpy,
>+                             EGLSurface surface,
>+                             EGLint attribute,
>+                             void **value);
>+
>+     eglQuerySurfacePointerANGLE behaves identically to eglQuerySurface,
>+     except that only attributes of type 'pointer' can be queried.
>+     If an attribute queried via eglQuerySurfacePointerANGLE is not
>+     of type 'pointer', then eglQuerySurfacePointer returns EGL_FALSE
>+     and an EGL_BAD_PARAMETER error is generated."
>+
>+Issues
>+
>+Revision History
>+
>+    Version 3, 2011/02/11 - publish
>+
>+    Version 2, 2010/12/21 - fix typos.
>+
>+    Version 1, 2010/12/07 - first draft.
>diff --git a/Source/ThirdParty/ANGLE/extensions/EGL_ANGLE_robust_resource_initialization.txt b/Source/ThirdParty/ANGLE/extensions/EGL_ANGLE_robust_resource_initialization.txt
>new file mode 100644
>index 00000000000..125a3edbf16
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/extensions/EGL_ANGLE_robust_resource_initialization.txt
>@@ -0,0 +1,121 @@
>+Name
>+
>+    ANGLE_robust_resource_initialization
>+
>+Name Strings
>+
>+    EGL_ANGLE_robust_resource_initialization
>+
>+Contributors
>+
>+    Geoff Lang, Google
>+    Ken Russell, Google
>+
>+Contacts
>+
>+    Shannon Woods, Google (shannonwoods 'at' google.com)
>+
>+Status
>+
>+    Draft
>+
>+Version
>+
>+    Version 4, September 19, 2017
>+
>+Number
>+
>+    EGL Extension TBD
>+
>+Dependencies
>+
>+    This extension is written against the wording of the EGL 1.5
>+    specification.
>+
>+    An OpenGL ES implementation supporting ANGLE_robust_resource_initialization
>+    or an implementation supporting equivalent functionality is required.
>+
>+Overview
>+
>+    This extension allows creating an OpenGL ES context or EGL surface
>+    supporting robust resource initialization.
>+
>+New Types
>+
>+    None
>+
>+New Procedures and Functions
>+
>+    None
>+
>+New Tokens
>+
>+    Accepted as an attribute name by eglCreateContext, eglQueryContext,
>+    eglCreateWindowSurface, eglCreatePbufferSurface, eglCreatePixmapSurface,
>+    and eglQuerySurface:
>+
>+        EGL_ROBUST_RESOURCE_INITIALIZATION_ANGLE    0x3453
>+
>+Additions to the EGL 1.5 Specification
>+
>+    Add a new section entitled "OpenGL ES Robust Resource Initialization"
>+    to section 3.7.1:
>+
>+    "If the attribute EGL_ROBUST_RESOURCE_INITIALIZATION_ANGLE
>+    is set to EGL_TRUE, a context supporting <robust resource initialization>
>+    will be created. OpenGL ES contexts must support the
>+    ANGLE_robust_resource_initialization extension, or equivalent core API
>+    functionality. This attribute is supported only for OpenGL ES contexts.
>+    The default value of EGL_ROBUST_RESOURCE_INITIALIZATION_ANGLE
>+    is EGL_FALSE."
>+
>+    Add a new paragraph to section 3.7.4 "Context Queries" under
>+    eglQueryContext:
>+
>+    "Querying EGL_ROBUST_RESOURCE_INITIALIZATION_ANGLE returns if
>+    the context was created using robust initialization."
>+
>+    Add a new paragrah to section 3.5.1 "Creating On-Screen Rendering
>+    Surfaces" and section 3.5.2 "Creating Off-Screen Rendering Surfaces":
>+
>+    "EGL_ROBUST_RESOURCE_INITIALIZATION_ANGLE specifies if the pixel
>+    values of the surface are initialized.  If its value is EGL_TRUE then all
>+    pixel values in the surface are initialized to zero, otherwise the contents
>+    are undefined. The default value of
>+    EGL_ROBUST_RESOURCE_INITIALIZATION_ANGLE is EGL_FALSE."
>+
>+    Add a new paragrah to section 3.5.6 "Surface Attributes" under
>+    eglQuerySurface:
>+
>+    "Querying EGL_CONTEXT_ROBUST_RESOURCE_INITIALIZATION_ANGLE returns if
>+    the surface was created using robust initialization."
>+
>+    Modify the 2nd paragraph of section 3.10.1 "Posting to a Window":
>+
>+    "... The contents of the color buffer are undefined if the value of the
>+    EGL_SWAP_BEHAVIOR attribute of surface is not EGL_BUFFER_PRESERVED and
>+    the value of the EGL_ROBUST_RESOURCE_INITIALIZATION_ANGLE is
>+    EGL_FALSE. ..."
>+
>+Issues
>+
>+    (1) Should this be a Display or Context creation extension?
>+
>+    RESOLVED (3): Making this a Context creation extension has complications in
>+    the implementation - what happens to resources shared between Contexts
>+    with and without the extension enabled? Also for display-created resources,
>+    such as those used in the D3D11 SwapChain, there's no way to specify if
>+    we want them robustly initialized. Hence it is clearer to specify this
>+    extension as a Display extension.
>+
>+    RESOLVED (4): This extension has been moved back to a context/surface
>+    creation attribute. This makes the extension much easier to detect before
>+    the GL context is created.
>+
>+Revision History
>+
>+    Version 1, 2015/01/07 - first draft.
>+    Version 2, 2017/03/01 - renamed extension and enum.
>+    Version 3, 2017/05/31 - renamed extension and made into display extension.
>+    Version 4, 2017/09/19 - renamed extension and changed into a
>+                            context/surface creation attribute.
>\ No newline at end of file
>diff --git a/Source/ThirdParty/ANGLE/extensions/EGL_ANGLE_software_display.txt b/Source/ThirdParty/ANGLE/extensions/EGL_ANGLE_software_display.txt
>new file mode 100644
>index 00000000000..556e1bee505
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/extensions/EGL_ANGLE_software_display.txt
>@@ -0,0 +1,65 @@
>+Name
>+
>+    ANGLE_software_display
>+
>+Name Strings
>+
>+    EGL_ANGLE_software_display
>+
>+Contributors
>+
>+    John Bauman
>+    Daniel Koch
>+
>+Contacts
>+
>+    John Bauman, Google Inc. (jbauman 'at' chromium.org)
>+
>+Status
>+
>+    In progress
>+
>+Version
>+
>+    Version 2, October 19, 2011
>+
>+Number
>+
>+    EGL Extension #??
>+
>+Dependencies
>+
>+    This extension is written against the wording of the EGL 1.4
>+    Specification. 
>+
>+Overview
>+
>+    This extension allows for receiving a device that uses software rendering.
>+
>+New Types
>+
>+    None
>+
>+New Procedures and Functions
>+
>+    None
>+
>+New Tokens
>+
>+    EGL_SOFTWARE_DISPLAY_ANGLE         (EGLNativeDisplayType)-1
>+
>+Additions to Chapter 3 of the EGL 1.4 Specification (EGL Functions and Errors)
>+
>+    Add before the last sentence of the first paragraph of section 3.2,
>+    "Initialization":
>+
>+    "If <display_id> is EGL_SOFTWARE_DISPLAY_ANGLE, a display that will render
>+    everything in software will be returned."
>+
>+Issues
>+
>+Revision History
>+
>+    Version 1, 2011/07/12 - first draft.
>+    Version 2, 2011/10/18 - add token definition
>+
>diff --git a/Source/ThirdParty/ANGLE/extensions/EGL_ANGLE_stream_producer_d3d_texture.txt b/Source/ThirdParty/ANGLE/extensions/EGL_ANGLE_stream_producer_d3d_texture.txt
>new file mode 100644
>index 00000000000..67581b41855
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/extensions/EGL_ANGLE_stream_producer_d3d_texture.txt
>@@ -0,0 +1,165 @@
>+Name
>+
>+    ANGLE_stream_producer_d3d_texture
>+
>+Name Strings
>+
>+    EGL_ANGLE_stream_producer_d3d_texture
>+
>+Contributors
>+
>+    Ian Ewell
>+    Geoff Lang
>+    John Bauman
>+    Jeff Gilbert
>+
>+Contacts
>+
>+    Geoff Lang, Google (geofflang âatâ google.com)
>+
>+Status
>+
>+    Draft
>+
>+Version
>+
>+    Version 2, November 15, 2017
>+
>+Number
>+
>+    EGL Extension #XXX
>+
>+Dependencies
>+
>+    Requires EGL 1.4.
>+    Requires OpenGL ES 2.0.
>+
>+    Requires the EGL_KHR_stream extension.
>+    Requires the EGL_NV_stream_consumer_gltexture_yuv extension.
>+    Requires the EGL_KHR_stream_consumer_gltexture extension.
>+    Requires the EGL_ANGLE_device_d3d extension.
>+
>+Overview
>+
>+    This extension allows D3D11 textures to be inserted into an EGL stream
>+    with the expectation that the stream consumer will be either an RGB GL
>+    texture consumer, or a YUV GL texture consumer using a two plane
>+    configuration (i.e. a Y plane and a UV plane).
>+    This will act as the producer of the stream.
>+
>+New procedures and functions
>+
>+    EGLBoolean eglCreateStreamProducerD3DTextureANGLE(
>+                EGLDisplay dpy,
>+                EGLStreamKHR stream,
>+                const EGLAttrib *attrib_list)
>+    EGLBoolean eglStreamPostD3DTextureANGLE(EGLDisplay dpy,
>+                EGLStreamKHR stream,
>+                void *texture,
>+                const EGLAttrib *attrib_list)
>+
>+New Tokens
>+
>+    Accepted as an <attribute> in eglStreamPostD3DTextureANGLE:
>+
>+        EGL_D3D_TEXTURE_SUBRESOURCE_ID_ANGLE 0x33AB
>+
>+Replace section "3.10.3.1 No way to connect producer to EGLStream" in the
>+EGL_KHR_stream extension with this:
>+
>+    3.10.3.1 Stream Surface Producer
>+
>+    Call
>+
>+        EGLBoolean eglCreateStreamProducerD3DTextureANGLE(
>+                    EGLDisplay dpy,
>+                    EGLStreamKHR stream,
>+                    const EGLAttrib *attrib_list)
>+
>+    to create a producer that accepts D3D11 textures and connect it as the
>+    producer of <stream>. <attrib_list> is used to specify attributes for the
>+    stream producer. Currently there are no attributes to specify, and the
>+    attribute list is used as a placeholder for future additions.
>+
>+    On failure, eglCreateStreamProducerD3DTextureANGLE returns EGL_FALSE and
>+    generates an error.
>+
>+        - EGL_BAD_STATE_KHR is generated if <stream> is not in the state
>+          EGL_STREAM_STATE_CONNECTING_KHR.
>+
>+        - EGL_BAD_MATCH is generated if <stream> does not have a connected GL
>+          texture consumer.
>+
>+        - EGL_BAD_STREAM_KHR is generated if <stream> is not a valid EGLStream
>+          generated for <dpy>.
>+
>+        - EGL_BAD_DISPLAY is generated if <dpy> is not a valid, initialized
>+          display.
>+
>+Add a section preceding "3.9.3 Posting Semantics" in the EGL specification:
>+
>+    3.9.x Posting to a Stream
>+
>+    To post a D3D11 texture to a stream, call
>+
>+        EGLBoolean eglStreamPostD3DTextureANGLE(
>+                    EGLDisplay dpy,
>+                    EGLStreamKHR stream,
>+                    void *texture,
>+                    const EGLAttrib *attrib_list);
>+
>+    If <stream> is an appropriately configured stream and <texture> points to a
>+    valid ID3D11Texture2D object of a supported format that is owned
>+    by the same ID3D11Device that is queried with the EGL_ANGLE_device_d3d
>+    extension, the texture will be posted to the stream and can be bound as one
>+    or more OpenGL texture objects.
>+
>+    The parameter <attrib_list> allows for per-frame attributes to be specified
>+    along with the texture. The only parameter currently available is
>+    EGL_D3D_TEXTURE_SUBRESOURCE_ID_ANGLE, which allows the subresource id of
>+    the texture that will be used to be specified. If this attribute is not
>+    explicitly specified, it will default to the value of 0.
>+
>+    It is the responsibility of the application to perform any synchronization
>+    between the insertion of the frame into the stream and the use of the
>+    consumer textures output by the stream. The EGL_CONSUMER_LATENCY_USEC_KHR
>+    attribute will have no effect on the function of the implementation of this
>+    extension, but can still be used for communication between components of
>+    the application.
>+
>+    The implementation will hold a reference to the D3D11 texture object if the
>+    insertion is successful and will release the texture object when a new frame
>+    is inserted or when the stream is destroyed.
>+
>+    On failure, eglStreamInsertD3DTexture returns EGL_FALSE and generates an
>+    error.
>+
>+        - EGL_BAD_STATE is generated if <stream> is not in the state
>+          EGL_STREAM_STATE_EMPTY_KHR, EGL_STREAM_STATE_NEW_FRAME_AVAILABLE_KHR,
>+          or EGL_STREAM_STATE_OLD_FRAME_AVAILABLE_KHR.
>+
>+        - EGL_BAD_MATCH is generated if the stream is not associated with a
>+          D3D11 texture producer.
>+
>+        - EGL_BAD_PARAMETER is generated if <texture> is not owned by the
>+          queried device, is not a supported format, is not compatible with the
>+          implementation, or if the specified value for
>+          EGL_D3D_TEXTURE_SUBRESOURCE_ID_ANGLE is not a valid subresource id for
>+          the texture.
>+
>+        - EGL_BAD_STREAM_KHR is generated if <stream> is not a valid EGLStream.
>+
>+        - EGL_BAD_ATTRIBUTE is generated if an attribute other than
>+          EGL_D3D_TEXTURE_SUBRESOURCE_ID_ANGLE is specified in <attrib_list>.
>+
>+Revision History
>+
>+    #1 (April 6, 2016) Ian Ewell
>+        - initial draft
>+
>+    #2 (November 15, 2017) Jeff Gilbert
>+        - Rename from EGL_ANGLE_stream_producer_d3d_texture_nv12 to
>+          EGL_ANGLE_stream_producer_d3d_texture
>+        - Remove NV12 suffix from function names
>+        - add RGB GL texture consumer support
>+        - reduce required EGL version to 1.4 (from 1.5)
>diff --git a/Source/ThirdParty/ANGLE/extensions/EGL_ANGLE_surface_d3d_texture_2d_share_handle.txt b/Source/ThirdParty/ANGLE/extensions/EGL_ANGLE_surface_d3d_texture_2d_share_handle.txt
>new file mode 100644
>index 00000000000..917e4456589
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/extensions/EGL_ANGLE_surface_d3d_texture_2d_share_handle.txt
>@@ -0,0 +1,95 @@
>+Name
>+
>+    ANGLE_surface_d3d_texture_2d_share_handle
>+
>+Name Strings
>+
>+    EGL_ANGLE_surface_d3d_texture_2d_share_handle
>+
>+Contributors
>+
>+    Vladimir Vukicevic
>+    Daniel Koch
>+
>+Contacts
>+
>+    Vladimir Vukicevic (vladimir 'at' pobox.com)
>+
>+Status
>+
>+    Complete
>+    Implemented (ANGLE r558)
>+
>+Version
>+
>+    Version 2, December 21, 2010
>+
>+Number
>+
>+    EGL Extension #29
>+
>+Dependencies
>+
>+    Requires the EGL_ANGLE_query_surface_pointer extension.
>+
>+    This extension is written against the wording of the EGL 1.4
>+    Specification.
>+
>+Overview
>+
>+    Some EGL implementations generate EGLSurface handles that are
>+    backed by Direct3D 2D textures.  For such surfaces, a D3D share
>+    handle can be generated, allowing access to the same surface
>+    from the Direct3D API.
>+
>+New Types
>+
>+    None
>+
>+New Procedures and Functions
>+
>+    None
>+
>+New Tokens
>+
>+    Accepted in the <attribute> parameter of eglQuerySurfacePointerANGLE:
>+
>+        EGL_D3D_TEXTURE_2D_SHARE_HANDLE_ANGLE            0x3200
>+
>+Additions to Chapter 3 of the EGL 1.4 Specification (EGL Functions and Errors)
>+
>+    Add to table 3.5, "Queryable surface attributes and types":
>+
>+        Attribute                              Type      Description
>+        ---------                              ----      -----------
>+        EGL_D3D_TEXTURE_2D_SHARE_HANDLE_ANGLE  pointer   Direct3D share handle
>+
>+    Add before the last paragraph in section 3.5, "Surface attributes":
>+
>+   "Querying EGL_D3D_TEXTURE_2D_SHARE_HANDLE_ANGLE returns a Direct3D
>+    share handle, or NULL if a share handle for the surface is not
>+    available.  The share handle must be queried using
>+    eglQuerySurfaceAttribPointerANGLE.  Before using a Direct3D surface
>+    created with this share handle, ensure that all rendering
>+    to the EGLSurface with EGL client APIs has completed.
>+
>+    The Direct3D share handle may be passed as the pSharedHandle
>+    parameter of the Direct3D9Ex CreateTexture function, or via the
>+    Direct3D10 OpenSharedResource function.  If used with Direct3D 9,
>+    the level argument to CreateTexture must be 1, and the dimensions
>+    must match the dimensions of the EGL surface.  If used with
>+    Direct3D 10, OpenSharedResource should be called with the
>+    ID3D10Texture2D uuid to obtain an ID3D10Texture2D object.
>+
>+Issues
>+
>+Revision History
>+
>+    Version 3, 2011/02/11 - publish
>+
>+    Version 2, 2010/12/21
>+      - renamed token to EGL_D3D_TEXTURE_2D_SHARE_HANDLE_ANGLE (adding "2D")
>+      - renamed extension to ANGLE_surface_d3d_texture_2d_share_handle
>+      - added language about supported usage of the shared handle from D3D
>+
>+    Version 1, 2010/12/07 - first draft.
>diff --git a/Source/ThirdParty/ANGLE/extensions/EGL_ANGLE_surface_orientation.txt b/Source/ThirdParty/ANGLE/extensions/EGL_ANGLE_surface_orientation.txt
>new file mode 100644
>index 00000000000..c6e3b27fe5a
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/extensions/EGL_ANGLE_surface_orientation.txt
>@@ -0,0 +1,133 @@
>+Name
>+
>+    ANGLE_surface_orientation
>+
>+Name Strings
>+
>+    EGL_ANGLE_surface_orientation
>+
>+Contributors
>+
>+    Geoff Lang, Google
>+
>+Contacts
>+
>+    Geoff Lang, Google (geofflang 'at' google 'dot' com)
>+
>+Status
>+
>+    Draft
>+
>+Version
>+
>+    Version 1, 2015-12-15
>+
>+Number
>+
>+    EGL Extension XXX
>+
>+Extension Type
>+
>+    EGL display extension
>+
>+Dependencies
>+
>+    Written based on the wording of the EGL 1.5 Specification
>+    (August 7 2014).
>+
>+Overview
>+
>+    This extension provides a mechanism for querying the most optimal
>+    orientation of a window surface and creating window sufraces with
>+    non-default orientations for the most performant rendering.
>+
>+New Types
>+
>+    None
>+
>+New Procedures and Functions
>+
>+    None
>+
>+New Tokens
>+
>+    New EGLConfig bitmask attribute name:
>+
>+        EGL_OPTIMAL_SURFACE_ORIENTATION_ANGLE 0x33A7
>+
>+    Accepted as an attribute name in the <attrib_list> argument of
>+    eglCreateWindowSurface and attribute name in the <attribute>
>+    argument of eglQuerySurface:
>+
>+        EGL_SURFACE_ORIENTATION_ANGLE 0x33A8
>+
>+    Valid bitfields in the EGL_OPTIMAL_SURFACE_ORIENTATION_ANGLE bitmask
>+    attribute of EGLConfig and EGL_SURFACE_ORIENTATION_ANGLE bitmask attribute
>+    of eglCreateWindowSurface:
>+
>+        EGL_SURFACE_ORIENTATION_INVERT_X_ANGLE 0x0001
>+        EGL_SURFACE_ORIENTATION_INVERT_Y_ANGLE 0x0002
>+
>+Additions to the EGL Specification
>+
>+    Additions to Chapter 3 of the EGL 1.5 Specification (EGL Functions and Errors)
>+
>+    Add to table 3.1 (EGLConfig Attributes)
>+
>+    Attribute                              Type     Notes
>+    -------------------------------------  -------  ----------------------
>+    EGL_OPTIMAL_SURFACE_ORIENTATION_ANGLE  bitmask  Optimal window surface
>+                                                    orientation.
>+
>+
>+    Add a paragraph to section 3.4, section Other EGLConfig Attribute
>+    Descriptions.
>+
>+    "EGL_OPTIMAL_SURFACE_ORIENTATION_ANGLE is a mask indicating which
>+    window surface orientation will provide the best performance."
>+
>+    Add to table 3.4 (Default values and match criteria for EGLConfig
>+    attributes):
>+
>+    Attribute                              Default  Selection  Sort     Sort
>+                                                    Criteria   Order    Priority
>+    -------------------------------------  -------  ---------  -------  --------
>+    EGL_OPTIMAL_SURFACE_ORIENTATION_ANGLE  0        Exact      None
>+
>+    Add a paragraph to section 3.5.1, section Creating On-Screen Rendering
>+    Surfaces.
>+
>+    EGL_SURFACE_ORIENTATION_ANGLE attribute specifies how the surface's content
>+    will appear on the screen. If its value contains
>+    EGL_SURFACE_ORIENTATION_INVERT_X_ANGLE then all displayed content will be
>+    inverted along the vertical axis. Similarly, if its value contains
>+    EGL_SURFACE_ORIENTATION_INVERT_Y_ANGLE then all displayed content will be
>+    inverted along the horizontal axis.
>+
>+    Add to table 3.5 (Queryable surface attributes and types):
>+
>+    Attribute                      Type     Description
>+    -----------------------------  -------  ----------------------
>+    EGL_SURFACE_ORIENTATION_ANGLE  bitmask  Orientation of surface
>+
>+    Add a paragraph to section 3.5.6, Surface Attributes:
>+
>+    "Querying EGL_SURFACE_ORIENTATION_ANGLE returns the orientation of the
>+    surface.  For a window surface, this is the same attribute value specified
>+    when the surface was created.  For other types of surfaces, it is always
>+    0."
>+
>+Issues
>+
>+    1) What about dirty regions and sub regions specified by extensions such as
>+       NV_post_sub_buffer?
>+
>+       These regions will be applied to the same region of the window as
>+       before because they are often specified based on events from the
>+       operating system.  The content in these regions will be displayed
>+       according to the value of EGL_SURFACE_ORIENTATION_ANGLE.
>+
>+Revision History
>+
>+    Version 1, 2015-12-15 (Geoff Lang)
>+      - Initial draft
>diff --git a/Source/ThirdParty/ANGLE/extensions/EGL_ANGLE_window_fixed_size.txt b/Source/ThirdParty/ANGLE/extensions/EGL_ANGLE_window_fixed_size.txt
>new file mode 100644
>index 00000000000..f6a86ab0362
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/extensions/EGL_ANGLE_window_fixed_size.txt
>@@ -0,0 +1,160 @@
>+Name
>+
>+    ANGLE_window_fixed_size
>+
>+Name Strings
>+
>+    EGL_ANGLE_window_fixed_size
>+
>+Contributors
>+
>+    John Bauman
>+    Shannon Woods
>+    Geoff Lang
>+
>+Contacts
>+
>+    John Bauman, Google Inc. (jbauman 'at' google.com)
>+
>+Status
>+
>+    Complete
>+
>+Version
>+
>+    Version 5, July 23, 2018
>+
>+Number
>+
>+    EGL Extension #??
>+
>+Dependencies
>+
>+    This extension is written against the wording of the EGL 1.4
>+    Specification.
>+
>+Overview
>+
>+    This extension allows creating a window surface that does not resize
>+    automatically.
>+
>+New Types
>+
>+    None
>+
>+New Procedures and Functions
>+
>+    None
>+
>+New Tokens
>+
>+    Accepted by the <attribute> parameter of eglQuerySurface and by the
>+    <attrib_list> parameter of eglCreateWindowSurface:
>+
>+    EGL_FIXED_SIZE_ANGLE        0x3201
>+
>+Additions to Chapter 3 of the EGL 1.4 Specification:
>+
>+    Modify the third paragraph of Section 3.5.1 (Creating On-Screen Rendering
>+    Surfaces)
>+
>+    "<attrib_list> specifies a list of attributes for the window. The list has
>+    the same structure as described for eglChooseConfig.  Attributes that can
>+    be specified in <attrib_list> include EGL_RENDER_BUFFER,
>+    EGL_VG_COLORSPACE, EGL_VG_ALPHA_FORMAT, EGL_FIXED_SIZE_ANGLE, EGL_WIDTH,
>+    and EGL_HEIGHT."
>+
>+    Add before the last paragraph of Section 3.5.1
>+
>+    "EGL_FIXED_SIZE_ANGLE specifies whether the surface must be resized by the
>+    implementation when the native window is resized.  The default value is
>+    EGL_FALSE.  Its value can be EGL_TRUE, in which case the size must be
>+    specified when the window is created, or EGL_FALSE, in which case the size
>+    is taken from the native window. Its default value is EGL_FALSE.
>+
>+    If the value of EGL_FIXED_SIZE_ANGLE is EGL_TRUE, the window surface's
>+    size in pixels is specified by the EGL_WIDTH and EGL_HEIGHT attributes.
>+    If its value is EGL_FALSE, then the values of EGL_WIDTH and EGL_HEIGHT
>+    are ignored and the window surface must be resized by the implementation
>+    subsequent to the native window being resized, and prior to copying its
>+    contents to the native window (e.g. in eglSwapBuffers, as described in
>+    section 3.9.1.1). The default values for EGL_WIDTH and EGL_HEIGHT are zero.
>+    If the value specified for either of EGL_WIDTH or EGL_HEIGHT is less than
>+    zero then an EGL_BAD_PARAMETER error is generated."
>+
>+    Add the following entry to Table 3.5
>+    (Queryable surface attributes and types)
>+
>+    Attribute            Type    Description
>+    -------------------- ------- ---------------------------------------------
>+    EGL_FIXED_SIZE_ANGLE boolean Surface will not be resized with a native
>+                                 window
>+
>+    Replace the last paragraph on page 37 in Section 3.5.6 (Surface Attributes)
>+
>+    "Querying EGL_WIDTH and EGL_HEIGHT returns respectively the width and
>+    height, in pixels, of the surface. For a pixmap surface or window surface
>+    with EGL_FIXED_SIZE_ANGLE set to EGL_FALSE, these values are initially
>+    equal to the width and height of the native window or pixmap with respect
>+    to which the surface was created. If the native window is resized and the
>+    corresponding window surface is not fixed size, the corresponding window
>+    surface will eventually be resized by the implementation to match (as
>+    discussed in section 3.9.1). If there is a discrepancy because EGL has not
>+    yet resized the window surface, the size returned by eglQuerySurface will
>+    always be that of the EGL surface, not the corresponding native window."
>+
>+    Alter the beginning of the first paragraph of Section 3.5.6 (Surface
>+    Attributes)
>+
>+    "The specified attribute of surface is set to value. Attributes that can
>+    be specified are EGL_MIPMAP_LEVEL, EGL_MULTISAMPLE_RESOLVE,
>+    EGL_SWAP_BEHAVIOR, EGL_WIDTH, and EGL_HEIGHT."
>+
>+    Add the following paragraph to Section 3.5.6 (Surface Attributes)
>+
>+    "If attribute is EGL_WIDTH or EGL_HEIGHT then the value specifies the new
>+    surface width or height respectively. The new width and height are not
>+    guarenteed to be applied until the next call to eglSwapBuffers or
>+    eglWaitNative. If the surface does not have EGL_FIXED_SIZE_ANGLE set then
>+    an EGL_BAD_MATCH error is generated."
>+
>+    Add the following paragraph to Section 3.5.6 (Surface Attributes)
>+
>+    "Querying EGL_FIXED_SIZE_ANGLE returns EGL_FALSE if the surface will be
>+    resized to match a native window, and EGL_TRUE if the surface cannot be
>+    resized."
>+
>+    Alter the beginning of the first paragraph of Section 3.9.1.1 (Native
>+    Window Resizing)
>+
>+    "If the surface has EGL_FIXED_SIZE_ANGLE set and EGL_WIDTH or EGL_HEIGHT
>+    have changed or the surface does not have EGL_FIXED_SIZE_ANGLE set and its
>+    corresponding native window has been resized prior to the swap, surface
>+    must be resized to match".
>+
>+Issues
>+
>+    1. Should there be a way to resize a window surface that had its size
>+    specified initially.
>+
>+    RESOLVED: No. Surfaces that have their sizes specified initially must have
>+    EGL_FIXED_SIZE_ANGLE set and can never be resized.
>+
>+    RESOLVED(rev 5): Fixed size surfaces can now be resized by setting
>+    EGL_WIDTH and EGL_HEIGHT surface attributes. This is the best way to give
>+    users explicit control of the size of window surfaces without re-creating
>+    them on each resize.
>+
>+Revision History
>+
>+    Version 5, 2018/07/23 - Allow reizing fixed size surfaces.
>+
>+    Version 4, 2014/02/24 - formatting changes.
>+
>+    Version 3, 2014/02/12 - ignore EGL_WIDTH and EGL_HEIGHT if
>+    EGL_FIXED_SIZE_ANGLE is EGL_FALSE
>+
>+    Version 2, 2014/02/07 - rename to EGL_ANGLE_window_fixed_size, and add an
>+    EGL_FIXED_SIZE_ANGLE token.
>+
>+    Version 1, 2014/02/05 - first draft.
>diff --git a/Source/ThirdParty/ANGLE/extensions/EGL_ANGLE_x11_visual.txt b/Source/ThirdParty/ANGLE/extensions/EGL_ANGLE_x11_visual.txt
>new file mode 100644
>index 00000000000..d77561e4326
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/extensions/EGL_ANGLE_x11_visual.txt
>@@ -0,0 +1,106 @@
>+Name
>+
>+    ANGLE_x11_visual
>+
>+Name Strings
>+
>+    EGL_ANGLE_x11_visual
>+
>+Contributors
>+
>+    Corentin Wallez, Google
>+    Shannon Woods, Google
>+    Jamie Madill, Google
>+    Geoff Lang, Google
>+
>+Contacts
>+
>+    Corentin Wallez, Google (cwallez 'at' chromium 'dot' org)
>+
>+Status
>+
>+    Draft
>+
>+Version
>+
>+    Version 1, 2015-11-13
>+
>+Number
>+
>+    EGL Extension XXX
>+
>+Extension Type
>+
>+    EGL client extension
>+
>+Dependencies
>+
>+    Requires EGL_EXT_client_extensions to query its existence without
>+    a display.
>+
>+    Requires EGL_EXT_platform_base.
>+
>+    This extension is written against the wording of version 9 of the
>+    EGL_EXT_platform_base specification.
>+
>+    Written based on the wording of the EGL 1.5 Specification
>+    (August 7 2014).
>+
>+Overview
>+
>+    This extension allows passing the X11 visual ID used by the native
>+    EGL surface types at display creation time. This will restrict
>+    EGLSurfaces to be created from native types with this visual ID,
>+    which may allow the created display to be more compatible and
>+    performant.
>+
>+New Types
>+
>+    None
>+
>+New Procedures and Functions
>+
>+    None
>+
>+New Tokens
>+
>+    Accepted as an attribute name in the <attrib_list> argument of
>+    eglGetPlatformDisplayEXT:
>+
>+        EGL_X11_VISUAL_ID_ANGLE 0x33A3
>+
>+Additions to the EGL Specification
>+
>+    Modify section 3.5.1 (Creating On-Screen Rendering Surfaces), p. 34
>+
>+    Append the following to the errors of CreateWindowSurface:
>+
>+    "If an X11 visual was specified at display creation time using
>+    EGL_ANGLE_X11_VISUAL_ID that is not equal to the ID of the
>+    native_window's visual, an EGL_BAD_MATCH error is generated and
>+    EGL_NO_SURFACE is returned."
>+
>+New Behavior
>+
>+    To request a display created with a X11 visual ID, the value of
>+    EGL_ANGLE_X11_VISUAL_ID should be set to a valid X11 visual ID. If
>+    present, this ID will be used during display creation to make a
>+    display that is more compatible and potentially more performant when
>+    used with EGLsurfaces created from native types with this ID. If the
>+    visual ID passed isn't a valid visual ID, eglGetPlatformDisplay will
>+    return EGL_NO_DISPLAY and generate an EGL_NOT_INITIALIZED error.
>+
>+Issues
>+
>+    1) When the hint is present, should EGLsurface creation functions
>+       only accept native types with the hint's visual ID?
>+
>+       RESOLVED: Yes, generate an error when the visual of the native
>+       surface doesn't match. This will avoid having hidden performance
>+       or compatibility losses when using this extension.
>+
>+Revision History
>+
>+    Version 1, 2015-11-13 (Corentin Wallez)
>+      - Initial draft
>+
>diff --git a/Source/ThirdParty/ANGLE/extensions/EGL_CHROMIUM_create_context_bind_generates_resource.txt b/Source/ThirdParty/ANGLE/extensions/EGL_CHROMIUM_create_context_bind_generates_resource.txt
>new file mode 100644
>index 00000000000..7b623e924a3
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/extensions/EGL_CHROMIUM_create_context_bind_generates_resource.txt
>@@ -0,0 +1,87 @@
>+Name
>+
>+    CHROMIUM_create_context_bind_generates_resource
>+
>+Name Strings
>+
>+    EGL_CHROMIUM_create_context_bind_generates_resource
>+
>+Contributors
>+
>+    Geoff Lang
>+
>+Contacts
>+
>+    Geoff Lang (geofflang 'at' google.com)
>+
>+Status
>+
>+    Draft
>+
>+Version
>+
>+    Version 1, September 21, 2016
>+
>+Number
>+
>+    EGL Extension #??
>+
>+Dependencies
>+
>+    Requires EGL 1.4.
>+
>+    Written against the EGL 1.4 specification.
>+
>+    This spec interacts with GL_CHROMIUM_bind_generates_resource (or
>+    equivalent) extension.
>+
>+Overview
>+
>+    This extension allows the creation of an OpenGL or OpenGL ES context that
>+    allows or disallows implicit creation of OpenGL resources on bind.
>+
>+New Types
>+
>+    None
>+
>+New Procedures and Functions
>+
>+    None
>+
>+New Tokens
>+
>+    Accepted as an attribute name in the <*attrib_list> argument to
>+    eglCreateContext:
>+
>+        EGL_CONTEXT_BIND_GENERATES_RESOURCE_CHROMIUM 0x33AD
>+
>+Additions to the EGL 1.4 Specification
>+
>+    Add the following to section 3.7.1 "Creating Rendering Contexts":
>+
>+    EGL_CONTEXT_BIND_GENERATES_RESOURCE_CHROMIUM indicates whether the context
>+    should be created with the GL_BIND_GENERATES_RESOURCE_CHROMIUM state
>+    initialized to GL_TRUE or GL_FALSE. The default value of
>+    EGL_CONTEXT_BIND_GENERATES_RESOURCE_CHROMIUM is EGL_TRUE.
>+
>+Errors
>+
>+    None
>+
>+New State
>+
>+    None
>+
>+Conformance Tests
>+
>+    TBD
>+
>+Issues
>+
>+    None
>+
>+Revision History
>+
>+    Rev.    Date         Author     Changes
>+    ----  -------------  ---------  ----------------------------------------
>+      1   Sept 21, 2016  geofflang  Initial version
>diff --git a/Source/ThirdParty/ANGLE/extensions/EGL_CHROMIUM_get_sync_values.txt b/Source/ThirdParty/ANGLE/extensions/EGL_CHROMIUM_get_sync_values.txt
>new file mode 100644
>index 00000000000..d95b348c845
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/extensions/EGL_CHROMIUM_get_sync_values.txt
>@@ -0,0 +1,131 @@
>+ï»¿Name
>+
>+   CHROMIUM_get_sync_values
>+
>+Name Strings
>+
>+   EGL_CHROMIUM_get_sync_values
>+
>+Contact
>+
>+   StÃ©phane Marchesin, Google (marcheu 'at' google.com)
>+
>+Status
>+
>+   Draft.
>+
>+Version
>+
>+   Last Modified Date: N/A   Revision: 1.0
>+
>+   Based on GLX_OML_sync_control Revision 6.0
>+
>+Number
>+
>+   ???
>+
>+Dependencies
>+
>+   The extension is written against the EGL 1.2 Specification, although it
>+   should work on other versions of these specifications. This extension
>+   also requires an operating system which supports CLOCK_MONOTONIC.
>+
>+Overview
>+
>+   This extension provides counters which let applications know about the
>+   timing of the last vertical retrace. By looking at the system clock, as
>+   well as the refresh rate of the monitor, this should enable applications
>+   to predict the position of future retraces so as to schedule an optimal
>+   workload.
>+
>+   This extension incorporates the use of three counters that provide
>+   the necessary synchronization. The Unadjusted System Time (or UST)
>+   is the 64-bit CLOCK_MONOTONIC clock; in particular this lets the
>+   application schedule future vertical retraces by querying this clock.
>+   The graphics Media Stream Counter (or graphics MSC) is a counter
>+   that is unique to the graphics subsystem and increments for each
>+   vertical retrace that occurs. The Swap Buffer Counter (SBC) is an
>+   attribute of an EGLSurface and is incremented each time a swap
>+   buffer action is performed on the associated surface.
>+
>+   The use of these three counters allows the application to
>+   synchronize graphics rendering to vertical retraces and/or swap
>+   buffer actions. For example, by querying the synchronization values for
>+   a given surface, the application can accurately predict the timing for
>+   the next vertical retraces and schedule rendering accordingly.
>+
>+Issues
>+
>+   None.
>+
>+IP Status
>+
>+   No known issues.
>+
>+New Procedures and Functions
>+
>+   Bool eglGetSyncValuesCHROMIUM(EGLDisplay dpy,
>+                                 EGLSurface surface,
>+                                 int64_t* ust,
>+                                 int64_t* msc,
>+                                 int64_t* sbc)
>+
>+
>+New Tokens
>+
>+   None
>+
>+Additions to the EGL 1.3 Specification
>+
>+   eglGetSyncValuesCHROMIUM returns the current UST/MSC/SBC triple. A UST
>+   timestamp is obtained each time the graphics MSC is incremented.
>+   If this value does not reflect the value of the UST at the time the
>+   first scan line of the display begins passing through the video
>+   output port, it will be adjusted by the graphics driver to do so
>+   prior to being returned by any of the functions defined by this
>+   extension.
>+
>+   This UST timestamp, together with the current graphics MSC and the
>+   current SBC, comprise the current UST/MSC/SBC triple. The UST,
>+   graphics MSC, and SBC values are not part of the render context
>+   state. These values cannot be pushed or popped. The graphics MSC
>+   value is initialized to 0 when the graphics device is initialized.
>+   The SBC is per-surface state and is initialized to 0 when the
>+   EGLSurface data structure is initialized.
>+
>+   The SBC value is incremented by the graphics driver at the completion
>+   of each buffer swap (e.g., the pixel copy has been completed or the
>+   hardware register that swaps memory banks has been written). For pixel
>+   formats that do not contain a back buffer, the SBC will always be
>+   returned as 0.
>+
>+   The graphics MSC value is incremented once for each screen refresh.
>+   For a non-interlaced display, this means that the graphics MSC value
>+   is incremented for each frame. For an interlaced display, it means
>+   that it will be incremented for each field. For a multi-monitor
>+   system, the monitor used to determine MSC is the one where the surface
>+   is located. If the surface spans multiple monitors, the monitor used
>+   to determine MSC is the one with the biggest coverage in pixels.
>+
>+   The function eglGetSyncValuesCHROMIUM will return TRUE if the function
>+   completed successfully, FALSE otherwise.
>+
>+   Each time eglSwapBuffer succeeds, the SBC will be increased within a
>+   finite time period.
>+
>+Errors
>+
>+   eglGetSyncValuesCHROMIUM will return FALSE if there is no current
>+   EGLContext.
>+
>+New State
>+
>+   Get Value                 Get Command            Type    Initial Value
>+   ---------                 -----------            ----    -------------
>+     [UST]             eglGetSyncValuesCHROMIUM      Z      unspecified
>+     [MSC]             eglGetSyncValuesCHROMIUM      Z                  0
>+     [SBC]             eglGetSyncValuesCHROMIUM      Z                  0
>+
>+New Implementation Dependent State
>+
>+   None
>diff --git a/Source/ThirdParty/ANGLE/extensions/EGL_EXT_create_context_robustness.txt b/Source/ThirdParty/ANGLE/extensions/EGL_EXT_create_context_robustness.txt
>new file mode 100644
>index 00000000000..a78f8789ea1
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/extensions/EGL_EXT_create_context_robustness.txt
>@@ -0,0 +1,169 @@
>+Name
>+
>+    EXT_create_context_robustness
>+
>+Name Strings
>+
>+    EGL_EXT_create_context_robustness
>+
>+Contributors
>+
>+    Daniel Koch, TransGaming
>+    Contributors to EGL_KHR_create_context
>+
>+Contact
>+
>+    Greg Roth (groth 'at' nvidia.com)
>+
>+Status
>+
>+    Complete.
>+
>+Version
>+
>+    Version 3, 2011/10/31
>+
>+Number
>+
>+    EGL Extension #37
>+
>+Dependencies
>+
>+    Requires EGL 1.4
>+
>+    Written against the EGL 1.4 specification.
>+
>+    An OpenGL implementation supporting GL_ARB_robustness, an OpenGL ES
>+    implementation supporting GL_EXT_robustness, or an implementation
>+    supporting equivalent functionality is required.
>+
>+Overview
>+
>+    This extension allows creating an OpenGL or OpenGL ES context
>+    supporting robust buffer access behavior and a specified graphics
>+    reset notification behavior.
>+
>+New Procedures and Functions
>+
>+    None
>+
>+New Tokens
>+
>+    Accepted as an attribute name in the <*attrib_list> argument to
>+    eglCreateContext:
>+
>+        EGL_CONTEXT_OPENGL_ROBUST_ACCESS_EXT    0x30BF
>+        EGL_CONTEXT_OPENGL_RESET_NOTIFICATION_STRATEGY_EXT  0x3138
>+
>+    Accepted as an attribute value for EGL_CONTEXT_RESET_NOTIFICATION_-
>+    STRATEGY_EXT in the <*attrib_list> argument to eglCreateContext:
>+
>+        EGL_NO_RESET_NOTIFICATION_EXT           0x31BE
>+        EGL_LOSE_CONTEXT_ON_RESET_EXT           0x31BF
>+
>+Additions to the EGL 1.4 Specification
>+
>+    Replace section 3.7.1 "Creating Rendering Contexts" from the
>+    fifth paragraph through the seventh paragraph:
>+
>+    <attrib_list> specifies a list of attributes for the context. The
>+    list has the same structure as described for eglChooseConfig. If an
>+    attribute is not specified in <attrib_list>, then the default value
>+    specified below is used instead. <attrib_list> may be NULL or empty
>+    (first attribute is EGL_NONE), in which case attributes assume their
>+    default values as described below. Most attributes are only meaningful
>+    for specific client APIs, and will generate an EGL_BAD_ATTRIBUTE
>+    error when specified to create for another client API context.
>+
>+    Context Versions
>+    ----------------
>+
>+    EGL_CONTEXT_CLIENT_VERSION determines which version of an OpenGL ES
>+    context to create. This attribute may only be specified when creating
>+    an OpenGL ES context (e.g. when the current rendering API is
>+    EGL_OPENGL_ES_API). An attribute value of 1 specifies creation of an
>+    OpenGL ES 1.x context.  An attribute value of 2 specifies creation of an
>+    Open GL ES 2.x context. The default value for EGL_CONTEXT_CLIENT_VERSION
>+    is 1.
>+
>+    Context Robust Access
>+    -------------
>+
>+    EGL_CONTEXT_OPENGL_ROBUST_ACCESS_EXT indicates whether <robust buffer
>+    access> should be enabled for the OpenGL ES context. Robust buffer
>+    access is defined in the GL_EXT_robustness extension specification,
>+    and the resulting context must support GL_EXT_robustness and robust
>+    buffer access as described therein. The default value of
>+    EGL_CONTEXT_OPENGL_ROBUST_ACCESS_EXT is EGL_FALSE.
>+
>+    Context Reset Notification
>+    --------------------------
>+
>+    The attribute name EGL_CONTEXT_OPENGL_RESET_NOTIFICATION_STRATEGY_-
>+    EXT specifies the <reset notification behavior> of the rendering
>+    context. This attribute is only meaningful for OpenGL ES contexts,
>+    and specifying it for other types of contexts will generate an
>+    EGL_BAD_ATTRIBUTE error.
>+
>+    Reset notification behavior is defined in the GL_EXT_robustness
>+    extension for OpenGL ES, and the resulting context must support
>+    GL_EXT_robustness and the specified reset strategy. The attribute
>+    value may be either EGL_NO_RESET_NOTIFICATION_EXT or EGL_LOSE_-
>+    CONTEXT_ON_RESET_EXT, which respectively result in disabling
>+    delivery of reset notifications or the loss of all context state
>+    upon reset notification as described by the GL_EXT_robustness. The
>+    default value for EGL_CONTEXT_OPENGL_RESET_NOTIFICATION_STRATEGY_EXT
>+    is EGL_NO_RESET_NOTIFICATION_EXT.
>+    
>+    Add to the eglCreateContext context creation errors:
>+
>+    * If <config> does not support a client API context compatible
>+      with the requested context flags and context reset notification
>+      behavior (for client API types where these attributes are
>+      supported), then an EGL_BAD_CONFIG error is generated.
>+
>+    * If the reset notification behavior of <share_context> and the
>+      newly created context are different then an EGL_BAD_MATCH error is
>+      generated.
>+
>+
>+Errors
>+
>+    EGL_BAD_CONFIG is generated if EGL_CONTEXT_OPENGL_ROBUST_ACCESS_-
>+    EXT is set to EGL_TRUE and no GL context supporting the GL_EXT_-
>+    robustness extension and robust access as described therein can be
>+    created.
>+
>+    EGL_BAD_CONFIG is generated if no GL context supporting the
>+    GL_EXT_robustness extension and the specified reset notification
>+    behavior (the value of attribute EGL_CONTEXT_RESET_NOTIFICATION_-
>+    STRATEGY_EXT) can be created.
>+
>+    BAD_MATCH is generated if the reset notification behavior of
>+    <share_context> does not match the reset notification behavior of
>+    the context being created.
>+
>+New State
>+
>+    None
>+
>+Conformance Tests
>+
>+    TBD
>+
>+Sample Code
>+
>+    TBD
>+
>+Issues
>+
>+    None
>+
>+Revision History
>+
>+    Rev.    Date       Author     Changes
>+    ----  ------------ ---------  ----------------------------------------
>+      3   31 Oct  2011 groth      Reverted to attribute for robust access. Now it's a
>+                                  companion to rather than subset of KHR_create_context
>+      2   11 Oct  2011 groth      Merged ANGLE and NV extensions.
>+      1   15 July 2011 groth      Initial version
>diff --git a/Source/ThirdParty/ANGLE/extensions/EGL_EXT_device_query.txt b/Source/ThirdParty/ANGLE/extensions/EGL_EXT_device_query.txt
>new file mode 100644
>index 00000000000..d92fb6dceeb
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/extensions/EGL_EXT_device_query.txt
>@@ -0,0 +1,188 @@
>+Name
>+
>+    EXT_device_query
>+
>+Name Strings
>+
>+    EGL_EXT_device_query
>+
>+Contributors
>+
>+    James Jones, NVIDIA  (jajones 'at' nvidia.com)
>+    Jamie Madill, Google  (jmadill 'at' google.com)
>+
>+Contacts
>+
>+    Jamie Madill, Google  (jmadill 'at' google.com)
>+
>+Status
>+
>+    Draft
>+
>+Version
>+
>+    Version 1 - Mar 25rd, 2015
>+
>+Number
>+
>+    EGL Extension #XXX
>+
>+Extension Type
>+
>+    EGL client extension
>+
>+Dependencies
>+
>+    Written against the wording of EGL 1.5.
>+
>+    Requires EGL 1.5 or an earlier verison of EGL with the
>+    EGL_EXT_client_extensions extension.
>+
>+Overview
>+
>+    Increasingly, EGL and its client APIs are being used in place of
>+    "native" rendering APIs to implement the basic graphics
>+    functionality of native windowing systems.  This creates demand
>+    for a method to access native GPU or device objects directly
>+    rather than calling EGL or GL entry points.
>+
>+    This extension defines the method for an application to query
>+    native device objects from an EGL Display.
>+
>+New Types
>+
>+    This is the type of a handle that represents an EGLDeviceEXT
>+    object.
>+
>+        typedef void* EGLDeviceEXT;
>+
>+    If EGL 1.5 is not supported, the following type is added, as
>+    defined in the EGL 1.5 specification:
>+
>+        typedef intptr_t EGLAttrib;
>+
>+New Functions
>+
>+    EGLBoolean eglQueryDeviceAttribEXT(EGLDeviceEXT device,
>+                                       EGLint attribute,
>+                                       EGLAttrib *value);
>+
>+    const char *eglQueryDeviceStringEXT(EGLDeviceEXT device,
>+                                        EGLint name);
>+
>+    EGLBoolean eglQueryDisplayAttribEXT(EGLDisplay dpy,
>+                                        EGLint attribute,
>+                                        EGLAttrib *value);
>+
>+New Tokens
>+
>+    Functions with a return type of EGLDeviceEXT will return this
>+    value on failure:
>+
>+        EGL_NO_DEVICE_EXT                      ((EGLDeviceEXT)0)
>+
>+    This error value will be generated by functions that take an
>+    EGLDeviceEXT object as a parameter:
>+
>+        EGL_BAD_DEVICE_EXT                     0x322B
>+
>+    Accepted by the <attribute> parameter of
>+    eglQueryDisplayAttribEXT:
>+
>+        EGL_DEVICE_EXT                         0x322C
>+
>+Add a new section "2.1.2 Devices" after "2.1.1 Scalar Types"
>+
>+    All EGL operations occur on an EGLDeviceEXT.  However, devices
>+    themselves expose no functionality.  They are simple abstract
>+    objects that exist only for the sake of enumeration and
>+    defining a namespace.
>+
>+Modify the last sentence of section "2.1.3" Displays" to read:
>+
>+    Besides devices, objects are always specified by the combination
>+    of an EGLDisplay parameter with a parameter representing the
>+    handle of the object.
>+
>+Add a new extension type to the list in section "2.8 Extensions"
>+
>+    Device Extensions
>+        A *device extension* adds functionality to an individual
>+        EGLDeviceEXT.  Different instances of EGLDeviceEXT may support
>+        different sets of device extensions
>+
>+Add a new error to section "3.1 Errors"
>+
>+    EGL_BAD_DEVICE_EXT
>+        An EGLDeviceEXT argument does not refer to a valid
>+        EGLDeviceEXT.  Any command taking an EGLDeviceEXT parameter
>+        may generate this error.
>+
>+Add a section "3.2 Devices" after "3.1 Errors"
>+
>+    To query the properties of a device, use:
>+
>+        EGLBoolean eglQueryDeviceAttribEXT(EGLDeviceEXT device,
>+                                           EGLint attribute,
>+                                           EGLAttrib *value);
>+
>+    On success, EGL_TRUE is returned and the requested attribute value
>+    is returned in <value>.  Currently there are no valid values of
>+    <attribute> defined.
>+
>+    On failure, EGL_FALSE is returned.  An EGL_BAD_ATTRIBUTE error is
>+    generated if <attribute> is not a valid attribute.  An
>+    EGL_BAD_DEVICE_EXT error is generated if <device> is not a valid
>+    EGLDeviceEXT.
>+
>+        const char *eglQueryDeviceStringEXT(EGLDeviceEXT device,
>+                                            EGLint name);
>+
>+    returns a pointer to a static, zero-terminated string describing
>+    some aspect of the specified EGLDeviceEXT.  <name> must be
>+    EGL_EXTENSIONS.
>+
>+    The EGL_EXTENSIONS string describes which device extensions are
>+    supported by <device>.  The string is of the same format specified
>+    for display and client extension strings in section 3.4. Note that
>+    device extensions are properties of the device, and are distinct
>+    from other extension strings.
>+
>+    On failure, NULL is returned.  An EGL_BAD_DEVICE_EXT error is
>+    generated if <device> is not a valid EGLDeviceEXT.  An
>+    EGL_BAD_PARAMETER error is generated if <name> is not one of the
>+    values described above.
>+
>+Add a section "3.4 Display Attributes" after "3.3 EGL Versioning"
>+
>+    To query attributes of an initialized display, use:
>+
>+        EGLBoolean eglQueryDisplayAttribEXT(EGLDisplay dpy,
>+                                            EGLint name,
>+                                            EGLAttrib *value);
>+
>+    On success, EGL_TRUE is returned.  If <name> is EGL_DEVICE_EXT,
>+    the EGLDeviceEXT associated with <dpy> is returned in <value>.
>+    All displays have an associated EGLDeviceEXT, regardless of how
>+    they were created.  A successful query of EGL_DEVICE_EXT will
>+    never return EGL_NO_DEVICE_EXT.
>+
>+    On failure, EGL_FALSE is returned.  An EGL_NOT_INITIALIZED error
>+    is generated if EGL is not initialized for <dpy>.  An
>+    EGL_BAD_ATTRIBUTE error is generated if <name> is not a valid
>+    value.
>+
>+    Because the EGLDeviceEXT is a property of <dpy>, any use of an
>+    associated EGLDeviceEXT after <dpy> has been terminated gives
>+    undefined results. Querying an EGL_DEVICE_EXT from <dpy> after a
>+    call to eglTerminate() (and subsequent re-initialization) may
>+    return a different value.
>+
>+Issues
>+
>+    None.
>+
>+Revision History:
>+
>+    #1  (Mar 25rd, 2015) Jamie Madill
>+        - Initial Draft based on EGL_EXT_device_base
>diff --git a/Source/ThirdParty/ANGLE/extensions/EXT_blend_func_extended.txt b/Source/ThirdParty/ANGLE/extensions/EXT_blend_func_extended.txt
>new file mode 100644
>index 00000000000..13f93e68851
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/extensions/EXT_blend_func_extended.txt
>@@ -0,0 +1,771 @@
>+Name
>+
>+    EXT_blend_func_extended
>+
>+Name Strings
>+
>+    GL_EXT_blend_func_extended
>+
>+Contact
>+
>+    Mark Kilgard, NVIDIA Corporation (mjk 'at' nvidia.com)
>+
>+Contributors
>+
>+    Daniel Koch, NVIDIA
>+    Slawomir Grajewski, Intel
>+    Chris Dalton, NVIDIA
>+    Brian Salomon, Google
>+
>+    From ARB_blend_func_extended...
>+
>+    Graham Sellers, AMD
>+    Mark Young, AMD
>+    Nick Haemel, AMD
>+    Pierre Boudier, AMD
>+    Mais Alnasser, AMD
>+    Jeff Bolz, NVIDIA
>+    Pat Brown, NVIDIA
>+    Ian Stewart, NVIDIA
>+    Jon Leech, Khronos
>+
>+Status
>+
>+    Draft, almost complete
>+
>+Version
>+
>+    Last Modified Date:         July 29, 2015
>+    Revision:                   5
>+
>+Number
>+
>+    XXX
>+
>+Dependencies
>+
>+    This extension is written against the OpenGL ES 3.1 (June 4, 2014)
>+    specification, but can apply to earlier versions back to ES 2.0.
>+
>+    GLSL version 300 and 310 language is written against The OpenGL ES
>+    Shading Language (July 11, 2012).
>+
>+    GLSL version 100 language is written against The OpenGL ES Shading
>+    Language (May 12, 2009).
>+
>+    The NV_draw_buffers and EXT_draw_buffers extensions trivially affect
>+    the definition of this extension.
>+
>+    The EXT_draw_buffers_indexed extension affects the definition of
>+    this extension.
>+
>+Overview
>+
>+    This extension provides an ES version of the ARB_blend_func_extended
>+    functionality.
>+
>+    Traditional OpenGL includes fixed-function blending that combines
>+    source colors with the existing content of a render buffer in
>+    a variety of ways.  A number of extensions have enhanced this
>+    functionality by adding further sources of blending weights and
>+    methods to combine them. However, the inputs to the fixed-function
>+    blending units are constrained to a source color (as output from
>+    fragment shading), destination color (as the current content of the
>+    frame buffer) or constants that may be used in their place.
>+
>+    This extension adds new blending functions whereby a fragment
>+    shader may output two colors, one of which is treated as the
>+    source color, and the other used as a blending factor for either
>+    source or destination colors.  Furthermore, this extension increases
>+    orthogonality by allowing the SRC_ALPHA_SATURATE function to be used
>+    as the destination weight.
>+
>+    Because of the limitations of the OpenGL ES 2.0 shading language,
>+    new built-in variables (gl_SecondaryFragColorEXT,
>+    gl_SecondaryFragDataEXT) are added to the ES 1.00 shading language
>+    rather than introduce more complex features for user-defined fragment
>+    outputs.  Because such built-in variable are deprecated in ES 3.0,
>+    these variables are NOT available in the OpenGL ES 3.xx shading
>+    language verisons.
>+
>+IP Status
>+
>+    No known IP claims.
>+
>+New Procedures and Functions
>+
>+    void BindFragDataLocationIndexedEXT(uint program, uint colorNumber,
>+                                        uint index, const char * name);
>+
>+    int GetFragDataIndexEXT(uint program, const char * name);
>+
>+    void BindFragDataLocationEXT(uint program, uint colorNumber, const char * name)
>+
>+    int GetProgramResourceLocationIndexEXT(uint program, enum programInterface, const char *name);
>+
>+New Tokens
>+
>+    Accepted by the <src> and <dst> parameters of BlendFunc and
>+    BlendFunciEXT, and by the <srcRGB>, <dstRGB>, <srcAlpha> and <dstAlpha>
>+    parameters of BlendFuncSeparate and BlendFuncSeparateiEXT:
>+
>+        SRC1_COLOR_EXT                                  0x88F9
>+        SRC1_ALPHA_EXT                                  0x8589  // OpenGL 1.5 token value
>+        ONE_MINUS_SRC1_COLOR_EXT                        0x88FA
>+        ONE_MINUS_SRC1_ALPHA_EXT                        0x88FB
>+        SRC_ALPHA_SATURATE_EXT                          0x0308
>+
>+    Accepted in the <props> array of GetProgramResourceiv:
>+
>+        LOCATION_INDEX_EXT                              0x930F
>+
>+    Accepted by the <pname> parameter of GetBooleanv, GetIntegerv,
>+    and GetFloatv:
>+
>+        MAX_DUAL_SOURCE_DRAW_BUFFERS_EXT                0x88FC
>+
>+Additions to Chapter 7 of the OpenGL ES 3.1 Specification (Programs and
>+Shaders)
>+
>+   Add a row to table 7.2 "GetProgramResourceiv properties and supported
>+   interfaces" (page 82):
>+
>+   Property            Supported Interfaces
>+   ------------------  --------------------
>+   LOCATION_INDEX_EXT  PROGRAM_OUTPUT
>+
>+   Modify section 7.3.1.1 "Naming Active Resources" subsection to include
>+   after the LOCATION paragraph (page 84):
>+
>+   "For the property LOCATION_INDEX_EXT, a single integer identifying the
>+   fragment color index of an active fragment shader output variable
>+   is written to params. If the active variable is not an output for a
>+   fragment shader, the value -1 will be written to params."
>+
>+   Modify (page 87) the paragraph introducing GetProgramResourceLocation
>+   to begin:
>+
>+   "The commands
>+
>+        int GetProgramResourceLocation( uint program,
>+            enum programInterface, const char *name );
>+        int GetProgramResourceLocationIndexEXT( uint program,
>+            enum programInterface, const char *name );
>+
>+    return the location or the fragment color index, respectively,
>+    assigned to the variable named name in interface programInterface
>+    of program object program."
>+
>+    Change the ending of the same paragraph to read:
>+
>+    "For GetProgramResourceLocationIndexEXT, programInterface must be
>+    PROGRAM_OUTPUT. The value -1 will be returned by either command if
>+    an error occurs, if name does not identify an active variable on
>+    programInterface, or if name identifies an active variable that
>+    does not have a valid location assigned, as described above. The
>+    locations returned by these commands are the same locations returned
>+    when querying the LOCATION and LOCATION_INDEX resource properties."
>+
>+    Change the next paragaph to begin:
>+
>+    "A string provided to GetProgramResourceLocation or
>+    GetProgramResourceLocationIndexEXT is considered to match an active
>+    variable if ..."
>+
>+    Change the last paragraph of the section (page 88) to read:
>+
>+    ... "If the string specifies an element of an array variable,
>+    GetProgramResourceLocation and GetProgramResourceLocationIndexEXT
>+    return the location or fragment color index assigned to that
>+    element. If it specifies the base name of an array, it identifies
>+    the resources associated with the first element of the array."
>+
>+Additions to Chapter 14 of the OpenGL ES 3.1 Specification (Programmable
>+Fragment Processing)
>+
>+    Modify section 14.2.3 "Shader Outputs" subsection to include:
>+
>+    "The binding of a user-defined varying out variable to a fragment color number
>+    can be specified explicitly. The command
>+
>+        void BindFragDataLocationIndexedEXT(uint program, uint colorNumber,
>+                                            uint index, const char * name);
>+
>+    specifies that the varying out variable name in <program> should
>+    be bound to fragment color <colorNumber> when the program is next
>+    linked. <index> may be zero or one to specify that the color
>+    be used as either the first or second color input to the blend
>+    equation, respectively, as described in Section 15.1.5 (Blending).
>+    If <name> was bound previously, its assigned binding is replaced
>+    with colorNumber. <name> must be a null-terminated string. The error
>+    INVALID_VALUE is generated if <colorNumber> is equal or greater
>+    than the value of MAX_DRAW_BUFFERS and <index> is zero,
>+    or if <colorNumber> is equal or greater than the value of
>+    MAX_DUAL_SOURCE_DRAW_BUFFERS_EXT and <index> is greater than or
>+    equal to one.  The command
>+
>+        void BindFragDataLocationEXT(uint program, uint colorNumber,
>+                                     const char * name)
>+
>+    is equivalent to calling BindFragDataLocationIndexedEXT with the
>+    same values for <program>, <colorNumber> and <name>, and with <index>
>+    set to zero.
>+
>+    When a program is linked, any varying out variables without
>+    a binding specified through BindFragDataLocationIndexedEXT or
>+    BindFragDataLocationEXT will automatically be bound to fragment
>+    colors and indices by the GL.  All such assignments will use color
>+    indices of zero.  Such bindings can be queried using the commands
>+    GetFragDataLocation and GetFragDataIndexEXT.  Output binding
>+    assignments will cause LinkProgram to fail:
>+
>+      * if the number of active outputs is greater than the value of
>+        MAX_DRAW_BUFFERS_EXT;
>+
>+      * if the program has an active output assigned to a location greater
>+        than or equal to the value of MAX_DUAL_SOURCE_DRAW_BUFFERS_EXT
>+        and has an active output assigned an index greater than or equal
>+        to one;
>+
>+      * if more than one varying out variable is bound to the same number
>+        and index; or
>+
>+      * if the explicit binding assignments do not leave enough space
>+        for the linker to automatically assign a location for a varying
>+        out array, which requires multiple contiguous locations.
>+
>+    BindFragDataLocationIndexedEXT may be issued before any shader objects
>+    are attached to a program object. Hence it is allowed to bind any
>+    name (except a name starting with gl_) to a color number and index,
>+    including a name that is never used as a varying out variable in
>+    any fragment shader object.  Assigned bindings for variables that
>+    do not exist are ignored."
>+
>+    Add to end of section:
>+
>+    "The command
>+
>+        int GetFragDataIndexEXT(uint program, const char * name);
>+
>+    returns the index of the fragment color to which the variable <name>
>+    was bound when the program object <program> was last linked. If
>+    program has not been successfully linked, the error INVALID_OPERATION
>+    is generated. If name is not a varying out variable, or if an error
>+    occurs, -1 will be returned.  The command is equivalent to
>+
>+        GetProgramResourceLocationIndex(program, PROGRAM_OUTPUT, name);"
>+
>+Additions to Chapter 15 of the OpenGL ES 3.1 Specification (Writing
>+Fragments and Samples to the Framebuffer)
>+
>+    Modify section 15.1.5.2 "Blend Functions":
>+
>+    Change the first paragraph to read:
>+
>+    "The weighting factors used by the blend equation are determined by
>+    the blend functions. There are four possible sources for weighting
>+    factors. These are the constant color (Rc, Gc, Bc, Ac) (see
>+    BlendColor, p. 211), the first source color (Rs0, Gs0, Bs0, As0),
>+    the second source color (Rs1, Gs1, Bs1, As1), and the destination
>+    color (the existing content of the draw buffer). Additionally the
>+    special constants ZERO and ONE are available as weighting factors."
>+
>+    Modify Table 15.2 (RGB and ALPHA source and destination blend
>+    functions ...) as follows
>+
>+                                                            RGB Blend Factors                   Alpha Blend Factors
>+        Value                                               (Sr, Sg, Sb) or (Dr, Dg, Db)        Sa or Da
>+        -----                                               ----------------------------        -------------------
>+        ZERO                                                (0, 0, 0)                           0
>+        ONE                                                 (1, 1, 1)                           1
>+        SRC_COLOR                                           (Rs0, Gs0, Bs0)                     As0
>+        ONE_MINUS_SRC_COLOR                                 (1, 1, 1) - (Rs0, Gs0, Bs0)         1 - As0
>+        DST_COLOR                                           (Rd, Gd, Bd)                        Ad
>+        ONE_MINUS_DST_COLOR                                 (1, 1, 1) - (Rd, Gd, Bd)            1 - Ad
>+        SRC_ALPHA                                           (As0, As0, As0)                     As0
>+        ONE_MINUS_SRC_ALPHA                                 (1, 1, 1) - (As0, As0, As0)         1 - As0
>+        DST_ALPHA                                           (Ad, Ad, Ad)                        Ad
>+        ONE_MINUS_DST_ALPHA                                 (1, 1, 1) - (Ad, Ad, Ad)            1 - Ad
>+        CONSTANT_COLOR                                      (Rc, Gc, Bc)                        Ac
>+        ONE_MINUS_CONSTANT_COLOR                            (1, 1, 1) - (Rc, Gc, Bc)            1 - Ac
>+        CONSTANT_ALPHA                                      (Ac, Ac, Ac)                        Ac
>+        ONE_MINUS_CONSTANT_ALPHA                            (1, 1, 1) - (Ac, Ac, Ac)            1 - Ac
>+        SRC_ALPHA_SATURATE                                  (f, f, f)                           1                       New (for ES 2.x)
>+        SRC1_COLOR_EXT                                      (Rs1, Gs1, Bs1)                     As1                     New
>+        ONE_MINUS_SRC1_COLOR_EXT                            (1, 1, 1) - (Rs1, Gs1, Bs1)         1 - As1                 New
>+        SRC1_ALPHA_EXT                                      (As1, As1, As1)                     As1                     New
>+        ONE_MINUS_SRC1_ALPHA_EXT                            (1, 1, 1) - (As1, As1, As1)         1 - As1                 New
>+
>+    For ES 2.0, remove table's footnote saying (ES 3.x already has this
>+    removed):
>+
>+        SRC_ALPHA_SATURATE is valid only for source RGB and alpha
>+        blending functions.
>+
>+    Add the following subsections to Section 5.1.5 Blending, at the end
>+    of the subsection 15.1.5.2 "Blend Functions":
>+
>+    "15.1.5.X  Dual Source Blending and Multiple Draw Buffers
>+
>+    Blend functions that require the second color input, <Rs1, Gs1, Bs1,
>+    As1> (SRC1_COLOR_EXT, SRC1_ALPHA_EXT, ONE_MINUS_SRC1_COLOR_EXT, or
>+    ONE_MINUS_SRC1_ALPHA_EXT) may consume hardware resources that could
>+    otherwise be used for rendering to multiple draw buffers. Therefore,
>+    the number of draw buffers that can be attached to a frame buffer
>+    may be lower when using dual-source blending.
>+
>+    The maximum number of draw buffers that may be attached to a
>+    single frame buffer when using dual-source blending functions is
>+    implementation dependent and can be queried by calling GetIntegerv
>+    with the symbolic constant MAX_DUAL_SOURCE_DRAW_BUFFERS_EXT. When
>+    using dual-source blending, MAX_DUAL_SOURCE_DRAW_BUFFERS_EXT should be
>+    used in place of MAX_DRAW_BUFFERS_EXT to determine the maximum number
>+    of draw buffers that may be attached to a single frame buffer. The
>+    value of MAX_DUAL_SOURCE_DRAW_BUFFERS_EXT must be at least 1. If
>+    the value of MAX_DUAL_SOURCE_DRAW_BUFFERS_EXT is 1, then dual-source
>+    blending and multiple draw buffers cannot be used simultaneously.
>+
>+    If either blend function is set to one of the second source factors
>+    (SRC1_COLOR_EXT, SRC1_ALPHA_EXT, ONE_MINUS_SRC1_COLOR_EXT, or
>+    ONE_MINUS_SRC1_ALPHA_EXT) for any draw buffer and any draw buffers
>+    equal to or greater than the value of MAX_DUAL_SOURCE_DRAW_BUFFERS_EXT
>+    have values other than NONE, the error INVALID_OPERATION is generated
>+    by drawing commands.
>+
>+    15.1.5.Y  Generation of Second Color Source for Blending
>+
>+    Rendering using any of the blend functions that consume the second
>+    input color (SRC1_COLOR_EXT, ONE_MINUS_SRC1_COLOR_EXT, SRC1_ALPHA_EXT
>+    or ONE_MINUS_SRC1_ALPHA_EXT) using a shader that does not output
>+    a second source color will produce undefined results.  To produce
>+    input for the second source color, a shader must be used that outputs
>+    a second source color.
>+
>+    When using a GLSL version 300 es or higher fragment shader with
>+    dual-source blending functions, the color output varyings are bound
>+    to the first (index 0) and second (index 1) inputs of a draw buffer
>+    using BindFragDataLocationIndexedEXT as described in the "Shader
>+    Outputs" subsection of Section 3.12.2 or by layout qualifiers for
>+    location=/n/ and index=/m/. Data written to the first of these outputs
>+    becomes the first source color input to the blender (corresponding
>+    to SRC_COLOR and SRC_ALPHA). Data written to the second of these
>+    outputs generates the second source color input to the blender
>+    (corresponding to SRC1_COLOR_EXT and SRC1_ALPHA_EXT).
>+
>+    Alternatively if the GLSL version 100 fragment shader is used (where
>+    user-defined color outputs are unsupported, hence a user-defined
>+    color output is not available for BindFragDataLocationIndexEXT), the
>+    gl_FragColor and gl_SecondaryFragColorEXT fragment outputs correspond
>+    to the first and second source color respectively.  Similarly the
>+    gl_FragData and gl_SecondaryFragDataEXT fragment output arrays
>+    correspond to the first and second source color respectively of each
>+    color buffer output.
>+
>+    If the second color input to the blender is not written in the
>+    shader, or if no output is bound to the second input of a blender,
>+    the result of the blending operation is not defined.
>+
>+    Other shading languages may define similar methods for producing
>+    the first and second color inputs to blending equations."
>+
>+Additions to the OpenGL ES Shading Language 1.00 Specification
>+
>+    Including the following line in a shader can be used to control the
>+    language features described in this extension:
>+
>+      #extension GL_EXT_blend_func_extended : <behavior>
>+
>+    where <behavior> is as specified in section 3.4.
>+
>+    A new preprocessor #define is added to the OpenGL ES Shading Language:
>+
>+      #define GL_EXT_blend_func_extended 1
>+
>+    Modify paragraphs in section 7.2 "Fragment Shader Special Variables" as follows:
>+
>+    First paragraph, second sentence:
>+
>+    "Fragment shaders output values to the OpenGL ES pipeline using
>+    the built-in variables gl_FragColor, gl_SecondaryFragColorEXT,
>+    gl_FragData, and gl_SecondaryFragDataEXT, unless the discard keyword
>+    is executed."
>+
>+    Second paragraph, first sentence:
>+
>+    "It is not a requirement for the fragment shader to write to
>+    either gl_FragColor, gl_SecondaryFragColorEXT, gl_FragData, or
>+    gl_SecondaryFragDataEXT."
>+
>+    Add after the fourth paragraph:
>+
>+    "Writing to gl_SecondaryFragColorEXT specifies a second fragment color
>+    that will be used by the subsequent fixed functionality pipeline for
>+    dual source blending. If subsequent fixed functionality consumes the
>+    second fragment color and an execution of a fragment shader does
>+    not write a value to gl_SecondaryFragColorEXT then the secondary
>+    fragment color consumed is undefined."
>+
>+    Add after the fifth paragraph:
>+    
>+    "The variable gl_SecondaryFragDataEXT is an array. Writing to
>+    gl_SecondaryFragDataEXT[n] specifies the secondary fragment data that
>+    will be used by the subsequent fixed functionality pipeline for data n
>+    for dual source blending. If subsequent fixed functionality consumes
>+    secondary fragment data and an execution of a fragment shader does
>+    not write a value to it, then the secondary fragment data consumed
>+    is undefined."
>+
>+    Modify the sixth paragraph to read:
>+
>+    "If a shader statically assigns a value to gl_FragColor or
>+    gl_SecondaryFragColorEXT, it may not assign a value to any
>+    element of gl_FragData or gl_SecondaryFragDataEXT. If a shader
>+    statically writes a value to any element of gl_FragData or
>+    gl_SecondaryFragDataEXT, it may not assign a value to gl_FragColor
>+    or gl_SecondaryFragColorEXT. That is, a shader may assign values to
>+    either the set of gl_FragColor and gl_SecondaryFragColorEXT or the
>+    set of gl_FragData and gl_SecondaryFragDataEXT, but not both."
>+
>+    Modify the eighth paragraph to read:
>+
>+    "If a shader executes the discard keyword, the fragment is discarded,
>+    and the values of gl_FragColor, gl_SecondaryFragColorEXT, gl_FragData,
>+    and gl_SecondaryFragDataEXT become irrelevant."
>+
>+    Add these built-in variable to the list "accessible from a fragment shader":
>+
>+        mediump vec4 gl_SecondaryFragColorEXT;
>+        mediump vec4 gl_SecondaryFragDataEXT[gl_MaxDualSourceDrawBuffersEXT];
>+
>+    Add to section 7.4 "Built-In Constants" the following constant:
>+
>+        const mediump int gl_MaxDualSourceDrawBuffersEXT = 1;
>+
>+Additions to the OpenGL ES Shading Language 3.00 and 3.10 Specification
>+
>+    Including the following line in a shader can be used to control the
>+    language features described in this extension:
>+
>+      #extension GL_EXT_blend_func_extended : <behavior>
>+
>+    where <behavior> is as specified in section 3.4.
>+
>+    A new preprocessor #define is added to the OpenGL ES Shading Language:
>+
>+      #define GL_EXT_blend_func_extended 1
>+
>+    Modify section 4.4.2 "Output Layout Qualifiers":
>+
>+    Change the second paragraph to read:
>+
>+    "Fragment shaders allow output layout qualifiers only on the interface
>+    qualifier out. The layout qualifier identifier for fragment shader
>+    outputs is:
>+
>+        layout-qualifier-id
>+            location = integer-constant
>+            index = integer-constant
>+
>+    Each of these qualifiers may appear at most once. If index is
>+    specified, location must also be specified.  If index is not
>+    specified, the value 0 is used."
>+
>+    Add an additional example to the end of the fourth paragraph's example:
>+
>+    "And,
>+
>+        layout(location = 3, index = 1) out vec4 factor;
>+
>+    will establish that the fragment shader output factor is copied out
>+    to fragment color 3 as the second (index one) input to the blend
>+    equation."
>+
>+    Change the first sentence of the second to last paragraph to read:
>+
>+    "If there is more than one fragment output, the location must
>+    be specified for all outputs unless the EXT_blend_func_extended
>+    extension is enabled in which case more than one unassigned fragment
>+    output locations are allowed though they must be assigned to unique
>+    locations assigned with glBindFragDataLocationIndexedEXT prior to
>+    linking."
>+
>+    Add to section 7.4 "Built-In Constants" the following constant:
>+
>+        const mediump int gl_MaxDualSourceDrawBuffersEXT = 1;
>+
>+Dependencies on OpenGL ES 3.0
>+
>+    If OpenGL ES 3.0 or higher is not supported (meaning OpenGL ES 2.0
>+    support only), remove all references to the functions:
>+
>+        BindFragDataLocationIndexedEXT
>+        GetFragDataIndexEXT
>+        BindFragDataLocationEXT
>+        GetProgramResourceLocationIndexEXT
>+
>+    Also ignore the additions to chapters 7 and 14 and the paragraph in
>+    section 15.1.5.Y related to GLSL version 300 es or higher.
>+
>+    When OpenGL ES 3.0 or higher, the "Additions to the OpenGL ES
>+    Shading Language 1.00 Specification" applies to the version 100
>+    shading language, but not later versions.
>+
>+Dependencies on OpenGL ES 3.1
>+
>+    If OpenGL ES 3.1 or higher is not supported (meaning OpenGL ES 3.0
>+    or earlier), remove all references to the function
>+
>+        GetProgramResourceLocationIndexEXT
>+
>+    because program resource queries are added by ES 3.1.  
>+
>+    Also ignore the additions to chapter 7.
>+
>+Dependencies on EXT_draw_buffers or NV_draw_buffers
>+
>+    Using dual-source blending functions may consume additional outputs
>+    from hardware shading units and therefore can reduce the number
>+    of draw buffers that may be attached to a single frame buffer when
>+    dual-source blending functions are enabled. In this case, the value
>+    of MAX_DUAL_SOURCE_DRAW_BUFFERS_EXT may be less than the value of
>+    MAX_DRAW_BUFFERS_EXT. If EXT_draw_buffers or NV_draw_buffers is not
>+    supported then the value of MAX_DUAL_SOURCE_DRAW_BUFFERS_EXT must
>+    be 1. Furthermore, the discussion in the subsection entitled "Dual
>+    Source Blending and Multiple Draw Buffers" may be discarded.
>+
>+Dependencies on EXT_draw_buffers_indexed
>+
>+    If EXT_draw_buffers_indexed is not supported, all references to
>+    BlendFunciEXT and BlendFuncSeparateiEXT should be removed. In this
>+    case, the blend functions for all attached draw buffers will be the
>+    same.
>+
>+Errors
>+
>+    The error INVALID_OPERATION is generated by Begin or any
>+    procedure that implicitly calls Begin if any draw buffer has a
>+    blend function requiring the second color input (SRC1_COLOR_EXT,
>+    ONE_MINUS_SRC1_COLOR_EXT, SRC1_ALPHA_EXT or ONE_MINUS_SRC1_ALPHA_EXT),
>+    and a framebuffer is bound that has more than the value of
>+    MAX_DUAL_SOURCE_DRAW_BUFFERS_EXT-1 active color attachments.
>+
>+New State
>+
>+    None
>+
>+    While no changes to table 20.12 (Pixel Operations) are strictly
>+    necessary, new enumerations are supported for the BLEND_SRC_RGB,
>+    BLEND_SRC_ALPHA, BLEND_DST_RGB, and BLEND_DST_ALPHA state to support
>+    SRC1_COLOR_EXT, SRC1_ALPHA_EXT, ONE_MINUS_SRC1_COLOR_EXT, and
>+    ONE_MINUS_SRC1_ALPHA_EXT (and for ES 2.0, SRC_ALPHA_SATURATE_EXT).
>+
>+New Implementation Dependent State
>+
>+    Get Value                        Type  Get Command     Minimum Value    Description             Sec.
>+    ---------                        ----  -----------     -------------    -------------------     ------
>+    MAX_DUAL_SOURCE_DRAW_BUFFERS_EXT Z+    GetIntegerv     1                Maximum number of       15.1.5
>+                                                                            active draw buffers
>+                                                                            when using dual-source
>+                                                                            blending
>+
>+Example Use Cases
>+
>+    There are several potential uses for this functionality. A first
>+    example is in the implementation of sub-pixel accurate font rendering
>+    algorithms.  Given a known layout of pixel elements (red, green
>+    and blue components), coverage may be calculated independently for
>+    each element and passed to the blender in the second source color
>+    as a per-channel opacity. To use this mode, use the following blend
>+    functions:
>+
>+        glBlendFunc(GL_SRC1_COLOR_EXT, GL_ONE_MINUS_SRC1_COLOR_EXT);
>+
>+    As a second example, consider a partially reflective colored glass
>+    window.  It will attenuate light passing through it, and reflect
>+    some of the light that strikes it. Using an appropriate combination
>+    of functions, this effect may be simulated in a single pass using
>+    only fixed-function blending hardware. In this case, the following
>+    blend functions may be used:
>+
>+        glBlendFunc(GL_SRC_ALPHA, GL_SRC1_COLOR_EXT);
>+
>+Issues
>+
>+    0.  What should this extension be named?
>+
>+    RESOLVED:  EXT_blend_func_extended, matching the name of
>+    ARB_blend_func_extended upon which this extension is based but
>+    providing a multi-vendor extension for ES implementations.
>+
>+    1.  Is this extension compatible with the ARB_blend_func_extended
>+    version?
>+
>+    RESOLVED:  Yes.  This extension is 100% functionally identical to
>+    ARB_blend_func_extended but for the ES 2.x and 3.x APIs.
>+
>+    The token values are _EXT suffixed but have the same values as
>+    the ARB_blend_func_extended tokens.
>+
>+    Philosophically if this extension is going for 100% parity and
>+    functionality with ARB_blend_func_extended, it should simply add
>+    all the stuff in ARB_blend_func_extended...
>+
>+    2.  Should the next commands be EXT suffixed?
>+
>+    RESOLVED:  Yes.  This is not an OES extension.
>+
>+    This means source code coming from a desktop environment should
>+    call eglGetProcAddress on function names with the EXT suffix.
>+    However because extension functions are called through function
>+    pointers, this is only a minor change isolated to function pointer
>+    initialization.
>+
>+    2.  Should this extension allow ES 2.0 contexts to use
>+    GL_SRC_ALPHA_SATURATE for the destination blend function?
>+
>+    RESOLVED:  Yes, the ARB_blend_func_extended extension adds support
>+    for using GL_SRC_ALPHA_SATURATE as the destination factor as "bonus"
>+    functionality.
>+
>+    ES 3.x already allows GL_SRC_ALPHA_SATURATE for the destination
>+    factor so this additional functionality is new only to ES 2.0 contexts
>+    supporting this extension.
>+
>+    We expect no GPU hardware capable of dual-source blending to not
>+    also support GL_SRC_ALPHA_SATURATE as the destination factor.
>+
>+    3.  Should this extension provide the glBindFragDataLocation and
>+    glBindFragDataLocationIndexed functionality?
>+
>+    RESOLVED:  Yes.  With EXT suffixes.
>+
>+    4.  Should this really be OES_blend_func_extended?
>+
>+    RESOLVED:  Go with EXT is for expediency.
>+
>+    Additionally this extension supports functionality such
>+    GL_SRC_ALPHA_SATURATE that all desktop GPU hardware is assumed to
>+    have.  ES-only vendors might not want this in an OES extension.
>+
>+    The same could be said for the glBindFragDataLocation* functionality.
>+
>+    5.  Does this extension need an interaction with
>+    OES_blend_equation_separate?
>+
>+    RESOLVED:  No, that's an ES 1.1 extension.  ES 2.0 and on all support
>+    separate blend functions.
>+
>+    6.  Are there any OpenGL ES Shading Language interactions?
>+
>+    RESOLVED: Yes, to use this extension, a #extension line will be needed
>+    in the shader requesting the EXT_blend_func_extended functionality.
>+    Example:
>+
>+        #extension GL_EXT_blend_func_extended : require
>+
>+    The ARB_blend_func_extended functionality does NOT require a special
>+    #extension line to use its functionality because the ARB version
>+    relies on existing GLSL functionality that allows for multiple
>+    fragment outputs as part of supporting multiple render targets.
>+    In the ARB version, then glBindFragDataLocationIndexed can bind
>+    these unassigned locations to different source output colors.
>+    But GLSL OpenGL ES 3.00 and 3.10 both explicitly preclude more than
>+    one fragment shader output with an unassigned location.  Hence a
>+    #extension is needed to relax this error condition.  And then this
>+    extension's glBindFragDataLocationIndexedEXT must be used to assign
>+    locations as necessary.
>+
>+    7.  Can the indexed location be assigned explicitly in the shader?
>+
>+    RESOLVED:  Yes, for ES 3.x shaders where the GLSL ES 3.x supports
>+    layout qualifiers.  ES 2.0 does not support the layout qualifier or
>+    user-defined fragment outputs.
>+
>+    8.  Should both the layout qualifier mechanism and the
>+    glBindFragDataLocationIndexed-style API for specifying the index of
>+    a user-defined fragment shader output be supported?
>+
>+    RESOLVED:  Yes, both should be supported.  This makes it easier
>+    for existing applications to port to ES 3.0 as both mechanisms are
>+    available.
>+    
>+    FYI: The "layout(location=0,index=1)" type syntax for dual-source
>+    blending was introduced to OpenGL in GLSL 3.30 and 4.00 in
>+    conjunction with OpenGL 3.3 and 4.0 respectively.  The original
>+    ARB_blend_func_extended was written with respect to OpenGL 3.2 and
>+    intended to support dual-source blending without the need to extend
>+    the GLSL language by instead supporting assignment if the fragment
>+    output index via glBindFragDataLocationIndexed.
>+
>+    9.  How to support OpenGL ES 2.0 where user-defined fragment shader
>+    outputs are not supported?
>+
>+    RESOLVED:  Introduce new gl_SecondaryFragColorEXT and
>+    gl_SecondaryFragDataEXT built-in variables for specifying the second
>+    source color.
>+
>+    These built-ins are only available in the ES 1.00 shader language
>+    version.
>+
>+    It is important to provide an ES 2.0 mechanism because WebGL 1.0 is
>+    based on ES 2.0.  Chrome's internal command buffer mechanism is also
>+    based around ES 2.0 and Skia intends to use this extension.
>+
>+    This includes adding a gl_MaxDualSourceDrawBuffersEXT
>+    implementation-dependent constant.
>+
>+    10. Does the version 100 syntax (gl_SecondaryFragColorEXT,
>+    gl_SecondaryFragDataEXT) work in an ES 3.0 context?
>+
>+    RESOLVED:  Yes.  For compatibility reasons, an ES 3.0 context
>+    advertising EXT_blend_func_extended must support the built-ins for
>+    the fragment shader secondary color outputs.
>+
>+    11. How many elements should be in the gl_SecondaryFragDataEXT array?
>+
>+    RESOLVED: The gl_SecondaryFragDataEXT array should have as
>+    many elements as the GLSL built-in implementation constant
>+    gl_MaxDualSourceDrawBuffersEXT which should be the value of the
>+    context's GL_MAX_DUAL_SOURCE_DRAW_BUFFERS_EXT implementation-dependent
>+    constant.
>+
>+    This means the number of elements in gl_SecondaryFragDataEXT is
>+    different than the number of gl_FragData elements.
>+
>+    12. What precision should the gl_SecondaryFragColorEXT and
>+    gl_SecondaryFragDataEXT be?
>+
>+    RESOLVED:  mediump.  This is consistent with gl_FragColor and
>+    gl_FragData.
>+
>+    13. Should gl_MaxDualSourceDrawBuffersEXT be exposed in both ES 2.0
>+    (where it sizes the gl_SecondaryFragDataEXT array) and also 3.x
>+    contexts (where there is no fixed-function array)?
>+
>+    RESOLVED:  Implementation-wise, it is easiest to expose this
>+    implementation-dependent constant for all ES contexts.
>+
>+    As a practical matter, we don't expect any implementations will
>+    advertise any value other than 1 for this constant.
>+
>+    Note:  There is no implementation-dependent GLSL constant comparable
>+    to gl_MaxDualSourceDrawBuffersEXT in ARB_blend_func_extended
>+    (or OpenGL 3.3/4.0 introducing the ARB_blend_func_extended
>+    functionality).
>+
>+    14. Any more issues?
>+
>+    RESOLVED:  See the issues in the ARB_blend_func_extended
>+    specification.  This extension resolves those issues to match the
>+    ARB extension version.
>+
>+Revision History
>+
>+    Rev.    Date    Author     Changes
>+    ----  --------  ---------  -----------------------------------------
>+     1    05/22/15  mjk        Initial revision.
>+     2    07/06/15  mjk        Proper ES 2.0 interactions; complete.
>+     3    07/08/15  mjk        Feedback from Brian
>+     4    07/08/15  mjk        Feedback from Daniel
>+     5    07/29/15  mjk        ES 3.x contexts (as well as 2.0) expose
>+                               gl_MaxDualSourceDrawBuffersEXT
>diff --git a/Source/ThirdParty/ANGLE/extensions/EXT_blend_minmax.txt b/Source/ThirdParty/ANGLE/extensions/EXT_blend_minmax.txt
>new file mode 100644
>index 00000000000..522ac202233
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/extensions/EXT_blend_minmax.txt
>@@ -0,0 +1,164 @@
>+Name
>+
>+    EXT_blend_minmax
>+
>+Name Strings
>+
>+    GL_EXT_blend_minmax
>+
>+Version
>+
>+    Last Modified Date: September 17, 2009
>+    Version:            1.5
>+
>+Number
>+
>+    OpenGL Extension #37
>+    OpenGL ES Extension #65
>+
>+Dependencies
>+
>+    There is an interaction with OpenGL ES.
>+
>+Overview
>+
>+    Blending capability is extended by respecifying the entire blend
>+    equation.  While this document defines only two new equations, the
>+    BlendEquationEXT procedure that it defines will be used by subsequent
>+    extensions to define additional blending equations.
>+
>+    The two new equations defined by this extension produce the minimum
>+    (or maximum) color components of the source and destination colors.
>+    Taking the maximum is useful for applications such as maximum projection
>+    in medical imaging.
>+
>+Issues
>+
>+    *   I've prefixed the ADD token with FUNC, to indicate that the blend
>+        equation includes the parameters specified by BlendFunc.  (The min
>+        and max equations don't.)  Is this necessary?  Is it too ugly?
>+        Is there a better way to accomplish the same thing?
>+    
>+New Procedures and Functions
>+
>+    void BlendEquationEXT(enum mode);
>+
>+New Tokens
>+
>+    Accepted by the <mode> parameter of BlendEquationEXT:
>+
>+        FUNC_ADD_EXT                     0x8006
>+        MIN_EXT                          0x8007
>+        MAX_EXT                          0x8008
>+
>+    Accepted by the <pname> parameter of GetBooleanv, GetIntegerv,
>+    GetFloatv, and GetDoublev:
>+
>+        BLEND_EQUATION_EXT               0x8009
>+
>+Additions to Chapter 2 of the GL Specification (OpenGL Operation)
>+
>+    None
>+
>+Additions to Chapter 3 of the GL Specification (Rasterization)
>+
>+    None
>+
>+Additions to Chapter 4 of the GL Specification (Per-Fragment Operations
>+and the Framebuffer)
>+
>+    The GL Specification defines a single blending equation.  This
>+    extension introduces a blend equation mode that is specified by calling
>+    BlendEquationEXT with one of three enumerated values.  The default
>+    value FUNC_ADD_EXT specifies that the blending equation defined in
>+    the GL Specification be used.  This equation is
>+
>+        C' = (Cs * S) + (Cd * D)
>+
>+             /  1.0     C' > 1.0
>+        C = (
>+             \   C'     C' <= 1.0
>+
>+    where Cs and Cd are the source and destination colors, and S and D are
>+    as specified by BlendFunc.
>+
>+    If BlendEquationEXT is called with <mode> set to MIN_EXT, the
>+    blending equation becomes
>+
>+        C = min (Cs, Cd)
>+
>+    Finally, if BlendEquationEXT is called with <mode> set to MAX_EXT, the
>+    blending equation becomes
>+
>+        C = max (Cs, Cd)
>+
>+    In all cases the blending equation is evaluated separately for each
>+    color component.
>+
>+Additions to Chapter 5 of the GL Specification (Special Functions)
>+
>+    None
>+
>+Additions to Chapter 6 of the GL Specification (State and State Requests)
>+
>+    None
>+
>+Additions to the GLX Specification
>+
>+    None
>+
>+GLX Protocol
>+
>+    A new GL rendering command is added. The following command is sent to the 
>+    server as part of a glXRender request:
>+
>+        BlendEquationEXT
>+            2           8               rendering command length
>+            2           4097            rendering command opcode
>+            4           ENUM            mode
>+
>+Dependencies on OpenGL ES
>+
>+    If the GL is OpenGL ES, only the new MIN_EXT and MAX_EXT blend equations
>+    are introduced by this extension.  BlendEquationOES, FUNC_ADD_OES, and
>+    BLEND_EQUATION_OES are introduced by the OES_blend_subtract extension,
>+    which is required for this extension to operate.  Alternatively,
>+    OpenGL ES 2.0 is required, which introduces BlendEquation, FUNC_ADD, and
>+    BLEND_EQUATION without the suffixes.
>+
>+    MIN_EXT and MAX_EXT should be added to Table 4.blendeq described in the
>+    OES_blend_subtract extension specification, and Table 4.1 of the OpenGL
>+    ES 2.0 specification.
>+
>+    Mentions of GetDoublev, Begin/End, and GLX in this extension specification
>+    can be ignored for OpenGL ES.  Also, BlendEquationEXT and FUNC_ADD_EXT
>+    instead have the OES suffix courtesy of OES_blend_subtract, or no suffix
>+    courtesy of core OpenGL ES 2.0.
>+
>+Errors
>+
>+    INVALID_ENUM is generated by BlendEquationEXT if its single parameter
>+    is not FUNC_ADD_EXT, MIN_EXT, or MAX_EXT.
>+
>+    INVALID_OPERATION is generated if BlendEquationEXT is executed between
>+    the execution of Begin and the corresponding execution to End.
>+
>+New State
>+
>+    Get Value           Get Command     Type    Initial Value   Attribute
>+    ---------           -----------     ----    -------------   ---------
>+    BLEND_EQUATION_EXT  GetIntegerv     Z3      FUNC_ADD_EXT    color-buffer
>+
>+New Implementation Dependent State
>+
>+    None
>+
>+Revision History
>+
>+    Version 1.5, September 17, 2009 (Jon Leech) -
>+        Merge into OpenGL Registry version of the extension and assign
>+        OpenGL ES extension number.
>+    Version 1.4, May 19, 2009 (Benj Lipchak) -
>+        Adapted for OpenGL ES.
>+    Version 1.3, May 31, 1995 -
>+        Last SGI revision.
>diff --git a/Source/ThirdParty/ANGLE/extensions/EXT_color_buffer_float.txt b/Source/ThirdParty/ANGLE/extensions/EXT_color_buffer_float.txt
>new file mode 100644
>index 00000000000..2eb163dba15
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/extensions/EXT_color_buffer_float.txt
>@@ -0,0 +1,230 @@
>+Name
>+
>+    EXT_color_buffer_float
>+
>+Name Strings
>+
>+    GL_EXT_color_buffer_float
>+
>+Contributors
>+
>+    OpenGL ES Working Group members
>+
>+Contact
>+
>+    Mark Callow, HI Corp. (callow.mark 'at' artspark.co.jp)
>+
>+Notice
>+
>+    Â©2012 The Khronos Group Inc.
>+
>+Status
>+
>+    Complete
>+
>+IP Status
>+
>+    Graphics Properties Holdings (GPH, formerly SGI) owns US Patent
>+    #6,650,327, issued November 18, 2003. GPH believes this patent
>+    contains necessary IP for graphics systems implementing floating
>+    point (FP) rasterization and FP framebuffer capabilities.
>+
>+    GPH will not grant Khronos royalty-free use of this IP for use
>+    in OpenGL ES, but will discuss licensing on RAND terms, on an
>+    individual basis with companies wishing to use this IP in the
>+    context of conformant OpenGL ES implementations. GPH does not
>+    plan to make any special exemption for open source
>+    implementations.
>+
>+    See
>+    https://www.khronos.org/files/ip-disclosures/opengl/SGI%20IP%20Disclosure%20Mar05_clean.pdf
>+    for the full disclosure.
>+
>+Version
>+
>+    Date: January 11th, 2013
>+    Revision: 5
>+
>+Number
>+
>+    OpenGL ES Extension #137
>+
>+Dependencies
>+
>+    Requires OpenGL ES 3.0.
>+
>+    Written based on the wording of the OpenGL ES 3.0.1 Specification
>+    (January 10th, 2013).
>+
>+Overview
>+
>+    This extension allows a variety of floating point formats to be
>+    rendered to via framebuffer objects.
>+
>+New Procedures and Functions
>+
>+    None
>+
>+New Tokens
>+
>+    None
>+
>+Additions to Chapter 3 of the OpenGL ES 3.0 Specification
>+(Rasterization)
>+
>+    3.8.3 Texture Image Specification, unnumbered subsection "Required
>+    Texture Formats", p. 126
>+
>+    Change the first two bullet items to the following:
>+
>+    - Texture and renderbuffer color formats (see section 4.4.2).
>+      - RGBA32F, RGBA32I, RGBA32UI, RGBA16F, RGBA16I, RGBA16UI,
>+        RGBA8, RGBA8I, RGBA8UI, SRGB8_ALPHA8, RGB10_A2, RGB10_-
>+        A2UI, RGBA4, and RGB5_A1.
>+      - RGB8 and RGB565.
>+      - R11F G11F B10F.
>+      - RG32F, RG32I, RG32UI, RG16F, RG16I, RG16UI, RG8, RG8I, and
>+        RG8UI.
>+      - R32F, R32I, R32UI, R16F, R16I, R16UI, R8, R8I, and R8UI.
>+
>+    - Texture-only color formats:
>+      - RGBA8_SNORM.
>+      - RGB32F, RGB32I, and RGB32UI.
>+      - RGB16F, RGB16I, and RGB16UI.
>+      - RGB8_SNORM, RGB8I, RGB8UI, and SRGB8.
>+      - RGB9_E5.
>+      - RG8_SNORM.
>+      - R8_SNORM.
>+
>+    Table 3.12, p. 128 & 129
>+
>+    Convert the dash under 'Color-renderable' to a 'check' for the
>+    following internal formats: R16F, RG16F, RGBA16F, R32F, RG32F,
>+    RGBA32F and R11F_G11F_B10F.
>+    
>+Additions to Chapter 4 of the OpenGL ES 3.0 Specification (Per-Fragment
>+Operations and the Framebuffer)
>+
>+    (changed lines marked with *; added lines marked with +)
>+
>+    Chapter 4 Introduction, p. 167
>+
>+    Paragraph 5, sentence 3, p 168, insert "floating point" as shown:
>+        "R, G, B, and A components may be represented as unsigned
>+ *      normalized fixed-point, floating point or signed or unsigned
>+        integer values; ..."    ^^^^^^^^^^^^^^
>+
>+    4.1.7 Blending, p. 174
>+
>+    Modify paragraphs 3 & 4:
>+    
>+ *      "If the color buffer is fixed-point, the components of the
>+    source and destination values and blend factors are clamped
>+ *  to [0; 1] prior to evaluating the blend equation. If the color
>+ +  buffer is floating-point, no clamping occurs. The resulting four
>+ +  values are sent to the next operation.
>+    
>+        Blending applies only if the color buffer has a fixed-point or
>+ *  or floating-point format. If the color buffer has an integer
>+ *  format, proceed to the next operation.  Furthermore, an
>+ +  INVALID_OPERATION error is generated by DrawArrays and the other
>+ +  drawing commands defined in section 2.8.3 if blending is enabled
>+ +  (see below) and any draw buffer has a 32-bit floating-point
>+ +  format."
>+
>+    4.2.3 Clearing the Buffers, p. 183
>+
>+    Modify second paragraph, inserting "floating point":
>+
>+    "   void ClearColor(float r, float g, float b, float a);
>+
>+ *  sets the clear value for fixed- and floating-point color buffers.
>+    ..."                            ^^^^^^^^^^^^^^^^^^
>+
>+    4.3.1 Reading Pixels, p. 186
>+
>+    In paragraph 4, beginning "Only two combinations of format
>+    and type are accepted ...", after the sentence ending "... type
>+    UNSIGNED_BYTE is accepted." insert the following sentence:
>+        "For floating-point rendering surfaces, the combination
>+        format RGBA and type FLOAT is accepted."
>+
>+    4.3.1 unnumbered subsection "Obtaining Pixels from the Framebuffer",
>+    p. 188
>+
>+    Modify penultimate paragraph, p189, "If format is an integer ..."
>+
>+    "If format is an integer format and the color buffer is not an
>+    integer format; if the color buffer is an integer format and
>+ *  format is not an integer format; if format is an integer format
>+ *  and type is FLOAT, HALF_FLOAT, or UNSIGNED_INT_10F_11F_11F_REV;
>+ +  or if the color buffer is a floating-point format and type is
>+ +  not FLOAT, HALF FLOAT, or UNSIGNED_INT_10F_11F_11F_REV, the error
>+    INVALID_OPERATION occurs."
>+
>+    4.3.1 unnumbered subsection "Conversion of RGBA values", p.190
>+
>+    Sole paragraph, sentence 3, insert "or floating point" as shown:
>+ *      "For an integer or floating point color buffer, the elements
>+        are unmodified."^^^^^^^^^^^^^^^^^
>+
>+    4.3.2 Copying Pixels, p192
>+
>+    Modify first error condition, at bottom of p193, "The read buffer
>+    contains ..." to encompass floating-point buffers.
>+
>+ *  "- The read buffer contains fixed-point or floating-point values
>+ *     and any draw buffer contains neither fixed-point nor
>+ *     floating-point values."
>+
>+    4.4.2 Attaching Images to Framebuffer Objects, p. 197, unnumbered
>+    subsection "Required Renderbuffer Formats", p. 200
>+
>+    In the last paragraph beginning "Implementations must support
>+    creation ...", modify the final phrase to
>+
>+ *   "with the exception of signed and unsigned integer, RGBA16F,
>+ +   R32F, RG32F and RGBA32F formats.
>+
>+Additions to Chapter 5 of the OpenGL ES 2.0 Specification (Special Functions)
>+
>+    None
>+
>+Additions to Chapter 6 of the OpenGL ES 2.0 Specification (State and State
>+Requests)
>+
>+    6.1.15 Internal Format Queries, p. 237
>+
>+    P. 238, paragraph 8 after "Since multisampling is not supported
>+    for signed and unsigned integer internal formats, the value of
>+    NUM_SAMPLE_COUNTS will be zero for such formats.", insert new
>+    one-sentence paragraph:
>+
>+        "If <internalformat> is RGBA16F, R32F, RG32F, or RGBA32F, the
>+        value of NUM_SAMPLE_COUNTS may be zero, or else the maximum
>+        value in SAMPLES may be less than the value of MAX_SAMPLES."
>+
>+New Implementation Dependent State
>+
>+    None
>+
>+Issues
>+
>+Revision History
>+
>+    Rev.  Date     Author     Changes
>+    ----  -------- ---------  -----------------------------------------
>+      1   10/16/12 markc      Initial version
>+      2   10/18/12 markc      Referenced preliminary version of OpenGL
>+                              ES 3.0.1 specification and updated page
>+                              numbers.
>+      3   11/21/12 markc      Corrected IP status.
>+      4   01/09/13 markc      Changed date of referenced OpenGL ES
>+                              3.0.1 specification. Made minor language
>+                              simplification.
>+      5   01/11/13 markc      Changed date to release version of
>+                              OpenGL ES 3.0.1 specification.
>+                              Clarified change to "Required
>+                              renderbuffer formats" section.
>+
>+# vim:ai:ts=4:sts=4:sw=4:expandtab:textwidth=70
>diff --git a/Source/ThirdParty/ANGLE/extensions/EXT_draw_buffers.txt b/Source/ThirdParty/ANGLE/extensions/EXT_draw_buffers.txt
>new file mode 100644
>index 00000000000..735460212d5
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/extensions/EXT_draw_buffers.txt
>@@ -0,0 +1,542 @@
>+Name
>+
>+    EXT_draw_buffers
>+
>+Name Strings
>+
>+    GL_EXT_draw_buffers
>+
>+Contributors
>+
>+    Contributors to GL_NV_draw_buffers
>+    Contributors to GL_NV_fbo_color_attachments
>+    Contributors to the OpenGL ES 2.0 specification
>+    Contributors to the OpenGLSL ES 1.0.17 specification
>+    Contributors to the OpenGL ES 3.0 specification
>+    Nicolas Capens, TransGaming Inc.
>+    Daniel Koch, TransGaming Inc.
>+    Alastair Patrick, Google Inc.
>+    Kenneth Russell, Google Inc.
>+    Greg Roth, NVIDIA Corporation
>+    Ben Bowman, Imagination Technologies
>+    Members of the WebGL and OpenGL ES working groups
>+
>+Contact
>+
>+    Daniel Koch (daniel 'at' transgaming.com)
>+
>+Status
>+
>+    Draft Complete 
>+
>+Version
>+
>+    Last Modified Date: January 30, 2013
>+    Revision: #7
>+
>+Number
>+
>+    TBD
>+
>+Dependencies
>+
>+    OpenGL ES 2.0 is required.
>+
>+    The extension is written against the OpenGL ES 2.0 specification.
>+
>+    ANGLE_framebuffer_blit affects the definition of this extension.
>+    APPLE_framebuffer_multisample affects the definitin of this extension.
>+
>+Overview
>+
>+    This extension increases the number of available framebuffer object
>+    color attachment points, extends OpenGL ES 2.0 to allow multiple output
>+    colors, and provides a mechanism for directing those outputs to
>+    multiple color buffers.
>+
>+    This extension is similar to the combination of the GL_NV_draw_buffers
>+    and GL_NV_fbo_color_attachments extensions, but imposes certain
>+    restrictions informed by the OpenGL ES 3.0 API.
>+
>+New Procedures and Functions
>+
>+      void DrawBuffersEXT(sizei n, const enum *bufs);
>+
>+New Tokens
>+
>+    Accepted by the <pname> parameter of GetIntegerv:
>+
>+        MAX_COLOR_ATTACHMENTS_EXT             0x8CDF
>+
>+    Accepted by the <pname> parameters of GetIntegerv and GetFloatv:
>+
>+        MAX_DRAW_BUFFERS_EXT                  0x8824
>+        DRAW_BUFFER0_EXT                      0x8825
>+        DRAW_BUFFER1_EXT                      0x8826
>+        DRAW_BUFFER2_EXT                      0x8827
>+        DRAW_BUFFER3_EXT                      0x8828
>+        DRAW_BUFFER4_EXT                      0x8829
>+        DRAW_BUFFER5_EXT                      0x882A
>+        DRAW_BUFFER6_EXT                      0x882B
>+        DRAW_BUFFER7_EXT                      0x882C
>+        DRAW_BUFFER8_EXT                      0x882D
>+        DRAW_BUFFER9_EXT                      0x882E
>+        DRAW_BUFFER10_EXT                     0x882F
>+        DRAW_BUFFER11_EXT                     0x8830
>+        DRAW_BUFFER12_EXT                     0x8831
>+        DRAW_BUFFER13_EXT                     0x8832
>+        DRAW_BUFFER14_EXT                     0x8833
>+        DRAW_BUFFER15_EXT                     0x8834
>+
>+    Accepted by the <attachment> parameter of FramebufferRenderbuffer,
>+    FramebufferTexture2D and GetFramebufferAttachmentParameteriv, and by
>+    the <bufs> parameter of DrawBuffersEXT:
>+
>+        COLOR_ATTACHMENT0_EXT                      0x8CE0
>+        COLOR_ATTACHMENT1_EXT                      0x8CE1
>+        COLOR_ATTACHMENT2_EXT                      0x8CE2
>+        COLOR_ATTACHMENT3_EXT                      0x8CE3
>+        COLOR_ATTACHMENT4_EXT                      0x8CE4
>+        COLOR_ATTACHMENT5_EXT                      0x8CE5
>+        COLOR_ATTACHMENT6_EXT                      0x8CE6
>+        COLOR_ATTACHMENT7_EXT                      0x8CE7
>+        COLOR_ATTACHMENT8_EXT                      0x8CE8
>+        COLOR_ATTACHMENT9_EXT                      0x8CE9
>+        COLOR_ATTACHMENT10_EXT                     0x8CEA
>+        COLOR_ATTACHMENT11_EXT                     0x8CEB
>+        COLOR_ATTACHMENT12_EXT                     0x8CEC
>+        COLOR_ATTACHMENT13_EXT                     0x8CED
>+        COLOR_ATTACHMENT14_EXT                     0x8CEE
>+        COLOR_ATTACHMENT15_EXT                     0x8CEF
>+
>+    The COLOR_ATTACHMENT0_EXT constant is equal to the
>+    COLOR_ATTACHMENT0 constant.
>+
>+    Each COLOR_ATTACHMENT<i>_EXT adheres to COLOR_ATTACHMENT<i>_EXT
>+    = COLOR_ATTACHMENT0_EXT + <i>.
>+
>+Changes to Chapter 3 of the OpenGL ES 2.0 Specification (Rasterization)
>+
>+    Section 3.2, (Multisampling). Replace the second paragraph:
>+
>+    An additional buffer, called the multisample buffer, is added to the
>+    window system-provided framebuffer. Pixel sample values, including
>+    color, depth, and stencil values, are stored in this buffer. Samples
>+    contain separate color values for each fragment color. When the
>+    window system-provided framebuffer includes a multisample buffer, it
>+    does not include depth or stencil buffers, even if the multisample
>+    buffer does not store depth or stencil values. Color buffers do
>+    coexist with the multisample buffer, however.
>+
>+    Section 3.8.2, (Shader Execution) Replace subsection "Shader
>+    Outputs":
>+
>+    The OpenGL ES Shading Language specification describes the values
>+    that may be output by a fragment shader. These are gl_FragColor and
>+    gl_FragData[n].  The final fragment color values or the final
>+    fragment data values written by a fragment shader are clamped to the
>+    range [0, 1] and then converted to fixed-point as described in
>+    section 2.1.2 for framebuffer color components.
>+
>+    Writing to gl_FragColor specifies the fragment color (color number
>+    zero) that will be used by subsequent stages of the pipeline.
>+    Writing to gl_FragData[n] specifies the value of fragment color
>+    number n. Any colors, or color components, associated with a
>+    fragment that are not written by the fragment shader are undefined.
>+    A fragment shader may not statically assign values to both
>+    gl_FragColor and gl_FragData. In this case, a compile or link error
>+    will result. A shader statically assigns a value to a variable if,
>+    after preprocessing, it contains a statement that would write to the
>+    variable, whether or not run-time flow of control will cause that
>+    statement to be executed.
>+
>+Changes to Chapter 4 of the OpenGL ES 2.0 Specification (Per-Fragment
>+Operations and the Frame Buffer)
>+
>+    Modify the overview of Chapter 4 and replace the sentences
>+    of the fifth paragraph which read: 
>+
>+    "The name of the color buffer of an application-created framebuffer
>+    object is COLOR_ATTACHMENT0. The names of the depth and stencil buffers
>+    are DEPTH_ATTACHMENT and STENCIL_ATTACHMENT." 
>+
>+    With the following:
>+
>+    "A framebuffer object has an array of color buffer attachment points,
>+    numbered zero through <n>, a depth buffer attachment point, and a
>+    stencil buffer attachment point." 
>+
>+    Insert Table 4.3 to Section 4.2.1 (and renumber subsequent tables):
>+
>+    Symbolic Constant                       Meaning
>+    -----------------                       ---------------------
>+    NONE                                    No buffer
>+
>+    COLOR_ATTACHMENT<i>_EXT (see caption)   Output fragment color to image 
>+                                            attached at color attachment
>+                                            point i
>+
>+    Table 4.3: Arguments to DrawBuffersEXT when the context is bound to a
>+    framebuffer object, and the buffers they indicate. <i> in
>+    COLOR_ATTACHMENT<i>_EXT may range from zero to the value of
>+    MAX_COLOR_ATTACHMENTS_EXT minus one.
>+
>+    Replace Section 4.2.1, "Selecting a Buffer for Writing" with the following:
>+
>+    "By default, color values are written into the front buffer for
>+    single buffered surfaces or into the back buffer for back buffered
>+    surfaces as determined when making the context current. To control
>+    the color buffer into which each of the fragment color values is
>+    written, DrawBuffersEXT is used.
>+
>+    The command
>+
>+      void DrawBuffersEXT(sizei n, const enum *bufs);
>+
>+    defines the draw buffers to which all fragment colors are written.
>+    <n> specifies the number of buffers in <bufs>. <bufs> is a pointer
>+    to an array of symbolic constants specifying the buffer to which
>+    each fragment color is written.
>+
>+    Each buffer listed in <bufs> must be BACK, NONE, or one of the
>+    values from table 4.3. Further, acceptable values for the constants
>+    in <bufs> depend on whether the GL is using the default framebuffer
>+    (i.e., DRAW_FRAMEBUFFER_BINDING is zero), or a framebuffer object
>+    (i.e., DRAW_FRAMEBUFFER_BINDING is non-zero). For more information
>+    about framebuffer objects, see section 4.4.
>+
>+    If the GL is bound to the default framebuffer, then <n> must be 1
>+    and the constant must be BACK or NONE. When draw buffer zero is
>+    BACK, color values are written into the sole buffer for single-
>+    buffered contexts, or into the back buffer for double-buffered
>+    contexts. If DrawBuffersEXT is supplied with a constant other than
>+    BACK and NONE, the error INVALID_OPERATION is generated.
>+
>+    If the GL is bound to a draw framebuffer object, then each of the
>+    constants must be one of the values listed in table 4.3.
>+
>+    In both cases, the draw buffers being defined correspond in order to
>+    the respective fragment colors. The draw buffer for fragment
>+    colors beyond <n> is set to NONE.
>+
>+    The maximum number of draw buffers is implementation-dependent. The
>+    number of draw buffers supported can be queried by calling
>+    GetIntegerv with the symbolic constant MAX_DRAW_BUFFERS_EXT. An
>+    INVALID_VALUE error is generated if <n> is greater than
>+    MAX_DRAW_BUFFERS_EXT.
>+
>+    If the GL is bound to a draw framebuffer object, the <i>th buffer listed
>+    in <bufs> must be COLOR_ATTACHMENT<i>_EXT or NONE. Specifying a
>+    buffer out of order, BACK, or COLOR_ATTACHMENT<m>_EXT where <m> is
>+    greater than or equal to the value of MAX_COLOR_ATTACHMENTS_EXT,
>+    will generate the error INVALID_OPERATION.
>+
>+    If a fragment shader writes to "gl_FragColor", DrawBuffersEXT 
>+    specifies the set of draw buffers into which the color 
>+    written to "gl_FragColor" is written. If a fragment shader writes to
>+    "gl_FragData", DrawBuffersEXT specifies a set of draw buffers
>+    into which each of the multiple output colors defined by these
>+    variables are separately written. If a fragment shader writes to
>+    neither "gl_FragColor" nor "gl_FragData" the values of the
>+    fragment colors following shader execution are undefined, and may
>+    differ for each fragment color.
>+
>+    Indicating a buffer or buffers using DrawBuffersEXT causes
>+    subsequent pixel color value writes to affect the indicated
>+    buffers. If the GL is bound to a draw framebuffer object and a draw
>+    buffer selects an attachment that has no image attached, then that
>+    fragment color is not written.
>+
>+    Specifying NONE as the draw buffer for a fragment color will inhibit
>+    that fragment color from being written.
>+
>+    The state required to handle color buffer selection for each
>+    framebuffer is an integer for each supported fragment color. For the
>+    default framebuffer, in the initial state the draw buffer for
>+    fragment color zero is BACK if there is a default framebuffer
>+    associated with the context, otherwise NONE. For framebuffer
>+    objects, in the initial state the draw buffer for fragment color
>+    zero is COLOR_ATTACHMENT0_EXT.
>+
>+    For both the default framebuffer and framebuffer objects, the
>+    initial state of draw buffers for fragment colors other than zero is
>+    NONE.
>+
>+    The value of the draw buffer selected for fragment color <i> can be
>+    queried by calling GetIntegerv with the symbolic constant
>+    DRAW_BUFFER<i>_EXT."
>+
>+    Modify Section 4.2.3 (Clearing the Buffers) and replace the first
>+    two paragraphs with the following:
>+
>+    "The GL provides a means for setting portions of every pixel in a
>+    particular buffer to the same value.  The argument to
>+    
>+        void Clear(bitfield buf);
>+
>+    is the bitwise OR of a number of values indicating which buffers are
>+    to be cleared. The values are COLOR_BUFFER_BIT, DEPTH_BUFFER_BIT, and
>+    STENCIL_BUFFER_BIT, indicating the buffers currently enabled for color
>+    writing, the depth buffer, and the stencil buffer (see below), 
>+    respectively. The value to which each buffer is cleared depends on
>+    the setting of the clear value for that buffer.  If the mask is not a
>+    bitwise OR of the specified values, then the error INVALID_VALUE is
>+    generated.
>+
>+        void ClearColor(clampf r, clampf, g, clampf b, clampf a);
>+   
>+    sets the clear value for fixed-point color buffers.  Each of the
>+    specified components is clamped to [0, 1] and converted to fixed-point
>+    as described in section 2.1.2 for framebuffer color components."
>+
>+    Replace the second paragraph of Section 4.4.1 (Binding and Managing
>+    Framebuffer Objects) with the following:
>+
>+    "The namespace for framebuffer objects is the unsigned integers, with
>+    zero reserved by OpenGL ES to refer to the default framebuffer. A
>+    framebuffer object is created by binding an unused name to the
>+    target FRAMEBUFFER, DRAW_FRAMEBUFFER, or READ_FRAMEBUFFER. The binding
>+    is effected by calling
>+
>+        void BindFramebuffer(enum target, uint framebuffer);
>+
>+    with <target> set the desired framebuffer target and <framebuffer> set 
>+    to the unused name. The resulting framebuffer object is a new state 
>+    vector. There is a number of color attachment points, plus one each
>+    for the depth and stencil attachment points. The number of color attachment
>+    points is equal to the value of MAX_COLOR_ATTACHMENTS_EXT."
>+
>+    Replace the third item in the bulleted list in Section 4.4.1 (Binding
>+    and Managing Framebuffer Objects) with the following:
>+
>+    " * The only color buffer bitplanes are the ones defined by the
>+    framebuffer attachments points named COLOR_ATTACHMENT0_EXT through
>+    COLOR_ATTACHMENT<n>_EXT."
>+
>+    Modify Section 4.4.3 (Renderbuffer Objects) in the 
>+    "Attaching Renderbuffer Images to a Framebuffer" subsection as follows:
>+
>+    Insert the following table:
>+
>+    Name of attachment
>+    ---------------------------------------
>+    COLOR_ATTACHMENT<i>_EXT (see caption)
>+    DEPTH_ATTACHMENT
>+    STENCIL_ATTACHMENT
>+
>+    Table 4.x: Framebuffer attachment points. <i> in COLOR_ATTACHMENT<i>_EXT
>+    may range from zero to the value of MAX_COLOR_ATTACHMENTS_EXT minus 1.
>+
>+    Modify the third sentence of the paragraph following the definition of
>+    FramebufferRenderbuffer to be as follows:
>+
>+    "<attachment> should be set to one of the attachment points of the 
>+    framebuffer listed in Table 4.x." 
>+
>+    Modify Section 4.4.3 (Renderbuffer Objects) in the "Attaching Texture
>+    Images to a Framebuffer" subsection as follows:
>+
>+    Modify the last sentence of the paragraph following the definition of
>+    FramebufferTexture2D to be as follows:
>+
>+    "<attachment> must be one of the attachment points of the framebuffer
>+    listed in Table 4.x."
>+
>+    Modify Section 4.4.5 (Framebuffer Completeness) and replace the 3rd
>+    item in the bulleted list in the "Framebuffer Attachment Completeness"
>+    subsection with the following:
>+
>+    " * If <attachment> is COLOR_ATTACHMENT<i>_EXT, then <image> must
>+    have a color-renderable internal format."
>+
>+Changes to Chapter 6 of the OpenGL ES 2.0 Specification (State and
>+State Requests)
>+
>+    In section 6.1.3 (Enumerated Queries) modify the third sentence in
>+    the definition of GetFramebufferAttachmentParameteriv to be as follows:
>+
>+    "<attachment> must be one of the attachment points of the framebuffer
>+    listed in Table 4.x."
>+
>+Changes to Chapter 3 of the OpenGL ES Shading Language 1.0.17 Specification (Basics)
>+
>+    Add a new section:
>+
>+    3.4.1 GL_EXT_draw_buffers Extension
>+
>+    To use the GL_EXT_draw_buffers extension in a shader it
>+    must be enabled using the #extension directive.
>+
>+    The shading language preprocessor #define
>+    GL_EXT_draw_buffers will be defined to 1, if the
>+    GL_EXT_draw_buffers extension is supported.
>+
>+Dependencies on ANGLE_framebuffer_blit and APPLE_framebuffer_multisample:
>+
>+    If neither ANGLE_framebuffer_blit nor APPLE_framebuffer_multisample are
>+    supported, then all references to "draw framebuffers" should be replaced
>+    with references to "framebuffers". References to DRAW_FRAMEBUFFER_BINDING
>+    should be replaced with references to FRAMEBUFFER_BINDING. References to
>+    DRAW_FRAMEBUFFER and READ_FRAMEBUFFER should be removed.
>+
>+    If ANGLE_framebuffer_blit is supported, DRAW_FRAMEBUFFER_BINDING, DRAW_FRAMEBUFFER
>+    and READ_FRAMEBUFFER all refer to corresponding _ANGLE suffixed names
>+    (they have the same token values).
>+
>+    If APPLE_framebuffer_multisample is supported, DRAW_FRAMEBUFFER_BINDING,
>+    DRAW_FRAMEBUFFER and READ_FRAMEBUFFER all refer to the corresponding _APPLE
>+    suffixed names (they have the same token values).
>+
>+Errors
>+
>+    The INVALID_OPERATION error is generated if DrawBuffersEXT is called
>+    when the default framebuffer is bound and any of the following conditions
>+    hold: 
>+     - <n> is greater than 1 and less than MAX_DRAW_BUFFERS_EXT,
>+     - <bufs> contains a value other than BACK or NONE.
>+
>+    The INVALID_OPERATION error is generated if DrawBuffersEXT is called
>+    when bound to a draw framebuffer object and any of the following
>+    conditions hold:
>+     - the <i>th value in <bufs> is not COLOR_ATTACHMENT<i>_EXT or NONE.
>+
>+    The INVALID_VALUE error is generated if DrawBuffersEXT is called
>+    with a value of <n> which is greater than MAX_DRAW_BUFFERS_EXT.
>+
>+    The INVALID_ENUM error is generated by FramebufferRenderbuffer if
>+    the <attachment> parameter is not one of the values listed in Table 4.x.
>+
>+    The INVALID_ENUM error is generated by FramebufferTexture2D if
>+    the <attachment> parameter is not one of the values listed in Table 4.x.
>+
>+    The INVALID_ENUM error is generated by GetFramebufferAttachmentParameteriv
>+    if the <attachment> parameter is not one of the values listed in Table 4.x.
>+
>+New State
>+
>+    Add Table 6.X Framebuffer (State per framebuffer object):
>+
>+    State               Type Get Command  Initial Value Description 
>+    ------------------  ---- ------------ ------------- -----------
>+    DRAW_BUFFER<i>_EXT  Z10* GetIntegerv  see 4.2.1     Draw buffer selected 
>+							  for fragment color i
>+
>+    Add to Table 6.18 (Implementation Dependent Values)
>+
>+    Get value                 Type Get Cmnd    Minimum Value Description             Sec.
>+    --------------------      ---- ----------- ------------- -----------             -----
>+    MAX_DRAW_BUFFERS_EXT      Z+   GetIntegerv 1             Maximum number of       4.2.1
>+                                                             active draw buffers
>+    MAX_COLOR_ATTACHMENTS_EXT Z+   GetIntegerv 1             Number of framebuffer   4.4.1
>+                                                             color attachment points
>+Issues
>+
>+    See ARB_draw_buffers for relevant issues.
>+
>+  1) What are the differences between this extension and NV_draw_buffers
>+    + NV_fbo_color_attachments?
>+
>+    RESOLVED. This extension:
>+     - adds interactions with blit_framebuffer and the separate 
>+       draw/read binding points
>+     - The draw buffer and color attachment limits are global instead
>+       of per-fbo (see Issue 2)
>+     - can be used to with default framebuffer to set NONE/BACK (see Issue 4)
>+     - retains the ordering restrictions on color attachments that are 
>+       imposed by ES 3.0.
>+
>+   2) Should the MAX_DRAW_BUFFERS_EXT and MAX_COLOR_ATTACHMENTS_EXT limits
>+    be per-framebuffer values or implementation dependent constants?
>+
>+    DISCUSSION: In ARB_draw_buffers this was per-context (see Issue 2).
>+    EXT_framebuffer_object (and subsequently ARB_framebuffer_object, and GL 3.0
>+    through GL 4.2) made these queries framebuffer-dependent. 
>+    However in GL 4.3 and GLES 3.0, these limits were changed from 
>+    framebuffer-dependent state to implementation-dependent state after
>+    much discussion (Bug 7990).
>+
>+    NV_draw_buffers has MAX_DRAW_BUFFERS listed as per-framebuffer state,
>+    but NV_fbo_color_attachments has MAX_COLOR_ATTACHMENTS as an 
>+    implementation-dependent constant.
>+
>+    This is relevant because some implementations are not able to support 
>+    multisampling in conjuction with multiple color attachments.  If the
>+    query is per-framebuffer, they can report a maximum of one attachment
>+    when there are multisampled attachments, but a higher limit when only
>+    single-sampled attachments are present.
>+
>+    RESOLVED. Make this global context state as this is most consistent 
>+    with GLES 3.0 and updated GL drivers. In an implementation cannot
>+    support multisampling in conjunction with multiple color attachments,
>+    perhaps such an implementation could report FBO incomplete in this 
>+    situation, but this is less than desirable.
>+
>+   3) Should we support broadcast from gl_FragColor to all gl_FragData[x]
>+    or should it be synonymous with gl_FragData[0]?
>+
>+    DISCUSSION: With NV_draw_buffers, writing to gl_FragColor writes to all
>+    the enabled draw buffers (ie broadcast). In OpenGL ES 3.0 when using 
>+    ESSL 1.0, gl_FragColor is equivalent to writing a single output to 
>+    gl_FragData[0] and multiple outputs are not possible. When using ESSL 3.0,
>+    only user-defined out variables may be used.
>+
>+    If broadcast is supported, some implementations may have to replace
>+    writes to gl_FragColor with replicated writes to all possible gl_FragData
>+    locations when this extension is enabled.
>+
>+    RESOLVED: Writes to gl_FragColor are broadcast to all enabled color
>+    buffers. ES 3.0 using ESSL 1.0 doesn't support broadcast because
>+    ESSL 1.0 was not extended to have multiple color outputs (but that is
>+    what this extension adds). ESSL 3.0 doesn't support the broadcast because
>+    it doesn't have the gl_FragColor variable at all, and only has user-
>+    defined out variables. This extension extends ESSL 1.0 to have multiple
>+    color outputs. Broadcasting from gl_FragColor to all enabled color 
>+    buffers is the most consistent with existing draw buffer extensions to
>+    date (both NV_draw_buffers and desktop GL).
>+    
>+   4) Should we allow DrawBuffersEXT to be called when the default FBO is
>+    bound?
>+
>+    DISCUSSION: NV_draw_buffers specifies that DrawBuffersNV errors with 
>+    INVALID_OPERATION when the default FBO is bound. OpenGL ES 3.0 allows
>+    DrawBuffers to toggle between BACK and NONE on the default FBO.
>+
>+    An implementation that does not natively support disabling the drawbuffer
>+    on the default FBO could emulate this by disabling color writes.
>+
>+    RESOLVED: Allow DrawBuffersEXT to be called for the default FBO. This
>+    is more forward looking and is compatible with ES 3.0.
>+
>+   5) What are the requirements on the color attachment sizes and formats?
>+    
>+    RESOLVED: ES 2.0 requires that all color buffers attached to application-
>+    created framebuffer objects must have the same number of bitplanes
>+    (Chapter 4 overview p91). ES 2.0 also requires that all attached images
>+    have the same width and height (Section 4.4.5 Framebuffer Completeness).
>+    This extension does not lift those requirements, and failing to meet
>+    them will result in an incomplete FBO.
>+
>+   6) Does this have any interactions with glClear?
>+
>+    RESOLVED: Yes. When multiple color buffers are enabled for writing,
>+    glClear clears all of the color buffers.  Added language clarifying
>+    that glClear and glClearColor may affect multiple color buffers.
>+
>+Revision History
>+
>+    01/30/2013  dgkoch  add issue 6 and clear interactions
>+                        renamed to EXT_draw_buffers based on feedback
>+                        changed resolution of issue 3.
>+    01/23/2013  dgkoch  add resolutions to issues 2-4.
>+                        add issue 5.
>+                        Add Table 4.x and update various explicit
>+                        references to COLOR_ATTACHMENT0.
>+                        Add errors.
>+    11/13/2012  dgkoch  add revision history
>+                        add text from updated ES 3.0 spec
>+                        add issues for discussion
>+    10/16/2012  kbr     update name string
>+    10/16/2012  kbr     remove restrition requiring draw buffer 0 to be non-NULL
>+    10/12/2012  kbr     remove references to GetDoublev and ReadBuffer
>+    10/11/2012  kbr     initial draft extension
>+
>diff --git a/Source/ThirdParty/ANGLE/extensions/EXT_robustness.txt b/Source/ThirdParty/ANGLE/extensions/EXT_robustness.txt
>new file mode 100644
>index 00000000000..1c26a55889a
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/extensions/EXT_robustness.txt
>@@ -0,0 +1,365 @@
>+Name
>+
>+    EXT_robustness
>+
>+Name Strings
>+
>+    GL_EXT_robustness
>+
>+Contributors
>+
>+    Daniel Koch, TransGaming
>+    Nicolas Capens, TransGaming
>+    Contributors to ARB_robustness
>+
>+Contact
>+
>+    Greg Roth, NVIDIA (groth 'at' nvidia.com)
>+
>+Status
>+
>+    Complete.
>+
>+Version
>+
>+    Version 3, 2011/10/31
>+
>+Number
>+
>+    OpenGL ES Extension #107
>+
>+Dependencies
>+
>+    This extension is written against the OpenGL ES 2.0 Specification
>+    but can apply to OpenGL ES 1.1 and up.
>+
>+    EGL_EXT_create_context_robustness is used to determine if a context
>+    implementing this extension supports robust buffer access, and if it
>+    supports reset notification. 
>+
>+Overview
>+
>+    Several recent trends in how OpenGL integrates into modern computer
>+    systems have created new requirements for robustness and security
>+    for OpenGL rendering contexts.
>+    
>+    Additionally GPU architectures now support hardware fault detection;
>+    for example, video memory supporting ECC (error correcting codes)
>+    and error detection.  OpenGL contexts should be capable of recovering
>+    from hardware faults such as uncorrectable memory errors.  Along with
>+    recovery from such hardware faults, the recovery mechanism can
>+    also allow recovery from video memory access exceptions and system
>+    software failures.  System software failures can be due to device
>+    changes or driver failures.
>+
>+    OpenGL queries that that return (write) some number of bytes to a
>+    buffer indicated by a pointer parameter introduce risk of buffer
>+    overflows that might be exploitable by malware. To address this,
>+    queries with return value sizes that are not expressed directly by
>+    the parameters to the query itself are given additional API
>+    functions with an additional parameter that specifies the number of
>+    bytes in the buffer and never writing bytes beyond that limit. This
>+    is particularly useful for multi-threaded usage of OpenGL contexts
>+    in a "share group" where one context can change objects in ways that
>+    can cause buffer overflows for another context's OpenGL queries.
>+
>+    The original ARB_vertex_buffer_object extension includes an issue
>+    that explicitly states program termination is allowed when
>+    out-of-bounds vertex buffer object fetches occur. Modern graphics
>+    hardware is capable well-defined behavior in the case of out-of-
>+    bounds vertex buffer object fetches. Older hardware may require
>+    extra checks to enforce well-defined (and termination free)
>+    behavior, but this expense is warranted when processing potentially
>+    untrusted content.
>+
>+    The intent of this extension is to address some specific robustness
>+    goals:
>+
>+    *   For all existing OpenGL queries, provide additional "safe" APIs 
>+        that limit data written to user pointers to a buffer size in 
>+        bytes that is an explicit additional parameter of the query.
>+
>+    *   Provide a mechanism for an OpenGL application to learn about
>+        graphics resets that affect the context.  When a graphics reset
>+        occurs, the OpenGL context becomes unusable and the application
>+        must create a new context to continue operation. Detecting a
>+        graphics reset happens through an inexpensive query.
>+
>+    *   Provide an enable to guarantee that out-of-bounds buffer object
>+        accesses by the GPU will have deterministic behavior and preclude
>+        application instability or termination due to an incorrect buffer
>+        access.  Such accesses include vertex buffer fetches of
>+        attributes and indices, and indexed reads of uniforms or
>+        parameters from buffers.
>+
>+New Procedures and Functions
>+
>+        enum GetGraphicsResetStatusEXT();
>+
>+        void ReadnPixelsEXT(int x, int y, sizei width, sizei height,
>+                            enum format, enum type, sizei bufSize,
>+                            void *data);
>+
>+        void GetnUniformfvEXT(uint program, int location, sizei bufSize,
>+                              float *params);
>+        void GetnUniformivEXT(uint program, int location, sizei bufSize,
>+                              int *params);
>+
>+New Tokens
>+
>+    Returned by GetGraphicsResetStatusEXT:
>+
>+        NO_ERROR                                        0x0000
>+        GUILTY_CONTEXT_RESET_EXT                        0x8253
>+        INNOCENT_CONTEXT_RESET_EXT                      0x8254
>+        UNKNOWN_CONTEXT_RESET_EXT                       0x8255
>+
>+    Accepted by the <value> parameter of GetBooleanv, GetIntegerv,
>+    and GetFloatv:
>+
>+        CONTEXT_ROBUST_ACCESS_EXT                       0x90F3
>+        RESET_NOTIFICATION_STRATEGY_EXT                 0x8256
>+
>+    Returned by GetIntegerv and related simple queries when <value> is
>+    RESET_NOTIFICATION_STRATEGY_EXT :
>+
>+        LOSE_CONTEXT_ON_RESET_EXT                       0x8252
>+        NO_RESET_NOTIFICATION_EXT                       0x8261
>+
>+Additions to Chapter 2 of the OpenGL ES 2.0 Specification (OpenGL ES Operation)
>+
>+Add a new subsection after 2.5 "GL Errors" and renumber subsequent
>+sections accordingly.
>+
>+    2.6 "Graphics Reset Recovery"
>+
>+    Certain events can result in a reset of the GL context. Such a reset
>+    causes all context state to be lost. Recovery from such events
>+    requires recreation of all objects in the affected context. The
>+    current status of the graphics reset state is returned by
>+
>+        enum GetGraphicsResetStatusEXT();
>+
>+    The symbolic constant returned indicates if the GL context has been
>+    in a reset state at any point since the last call to
>+    GetGraphicsResetStatusEXT. NO_ERROR indicates that the GL context
>+    has not been in a reset state since the last call.
>+    GUILTY_CONTEXT_RESET_EXT indicates that a reset has been detected
>+    that is attributable to the current GL context.
>+    INNOCENT_CONTEXT_RESET_EXT indicates a reset has been detected that
>+    is not attributable to the current GL context.
>+    UNKNOWN_CONTEXT_RESET_EXT indicates a detected graphics reset whose
>+    cause is unknown.
>+
>+    If a reset status other than NO_ERROR is returned and subsequent
>+    calls return NO_ERROR, the context reset was encountered and
>+    completed. If a reset status is repeatedly returned, the context may
>+    be in the process of resetting.
>+
>+    Reset notification behavior is determined at context creation time,
>+    and may be queried by calling GetIntegerv with the symbolic constant
>+    RESET_NOTIFICATION_STRATEGY_EXT.
>+
>+    If the reset notification behavior is NO_RESET_NOTIFICATION_EXT,
>+    then the implementation will never deliver notification of reset
>+    events, and GetGraphicsResetStatusEXT will always return
>+    NO_ERROR[fn1].
>+       [fn1: In this case it is recommended that implementations should
>+        not allow loss of context state no matter what events occur.
>+        However, this is only a recommendation, and cannot be relied
>+        upon by applications.]
>+
>+    If the behavior is LOSE_CONTEXT_ON_RESET_EXT, a graphics reset will
>+    result in the loss of all context state, requiring the recreation of
>+    all associated objects. In this case GetGraphicsResetStatusEXT may
>+    return any of the values described above.
>+
>+    If a graphics reset notification occurs in a context, a notification
>+    must also occur in all other contexts which share objects with that
>+    context[fn2].
>+       [fn2: The values returned by GetGraphicsResetStatusEXT in the
>+        different contexts may differ.]
>+
>+    Add to Section 2.8 "Vertex Arrays" before subsection "Transferring
>+    Array Elements"
>+
>+    Robust buffer access is enabled by creating a context with robust
>+    access enabled through the window system binding APIs. When enabled,
>+    indices within the vertex array that lie outside the arrays defined
>+    for enabled attributes result in undefined values for the
>+    corresponding attributes, but cannot result in application failure.
>+    Robust buffer access behavior may be queried by calling GetIntegerv
>+    with the symbolic constant CONTEXT_ROBUST_ACCESS_EXT.
>+
>+Additions to Chapter 4 of the OpenGL ES 2.0 Specification (Per-Fragment
>+Operations and the Frame Buffer)
>+
>+    Modify section 4.3.1 "Reading Pixels"
>+
>+    Pixels are read using
>+
>+        void ReadPixels(int x, int y, sizei width, sizei height,
>+                        enum format, enum type, void *data);
>+        void ReadnPixelsEXT(int x, int y, sizei width, sizei height,
>+                           enum format, enum type, sizei bufSize,
>+                           void *data);
>+
>+    Add to the description of ReadPixels:
>+
>+    ReadnPixelsEXT behaves identically to ReadPixels except that it does
>+    not write more than <bufSize> bytes into <data>. If the buffer size
>+    required to fill all the requested data is greater than <bufSize> an
>+    INVALID_OPERATION error is generated and <data> is not altered.
>+
>+Additions to Chapter 5 of the OpenGL ES 2.0 Specification (Special
>+Functions):
>+
>+    None
>+
>+Additions to Chapter 6 of the OpenGL ES 2.0 Specification (State and
>+State Requests)
>+
>+    Modify Section 6.1.8 "Shader and Program Queries"
>+
>+    The commands
>+
>+        void GetUniformfv(uint program, int location, float *params);
>+        void GetnUniformfvEXT(uint program, int location, sizei bufSize,
>+                              float *params);
>+        void GetUniformiv(uint program, int location, int *params);
>+        void GetnUniformivEXT(uint program, int location, sizei bufSize,
>+                              int *params);
>+
>+    return the value or values of the uniform at location <location>
>+    for program object <program> in the array <params>. Calling
>+    GetnUniformfvEXT or GetnUniformivEXT ensures that no more than
>+    <bufSize> bytes are written into <params>. If the buffer size
>+    required to fill all the requested data is greater than <bufSize> an
>+    INVALID_OPERATION error is generated and <params> is not altered.
>+    ...
>+
>+Additions to The OpenGL ES Shading Language Specification, Version 1.
>+
>+    Append to the third paragraph of section 4.1.9 "Arrays"
>+
>+    If robust buffer access is enabled via the OpenGL ES API, such
>+    indexing must not result in abnormal program termination. The
>+    results are still undefined, but implementations are encouraged to
>+    produce zero values for such accesses.
>+
>+Interactions with EGL_EXT_create_context_robustness
>+
>+    If the EGL window-system binding API is used to create a context,
>+    the EGL_EXT_create_context_robustness extension is supported, and
>+    the attribute EGL_CONTEXT_OPENGL_ROBUST_ACCESS_EXT is set to
>+    EGL_TRUE when eglCreateContext is called, the resulting context will
>+    perform robust buffer access as described above in section 2.8, and
>+    the CONTEXT_ROBUST_ACCESS_EXT query will return GL_TRUE as described
>+    above in section 6.1.5.
>+
>+    If the EGL window-system binding API is used to create a context and
>+    the EGL_EXT_create_context_robustness extension is supported, then
>+    the value of attribute EGL_CONTEXT_RESET_NOTIFICATION_STRATEGY_EXT
>+    determines the reset notification behavior and the value of
>+    RESET_NOTIFICATION_STRATEGY_EXT, as described in section 2.6.
>+
>+Errors
>+
>+    ReadnPixelsEXT, GetnUniformfvEXT, and GetnUniformivEXT share all the
>+    errors of their unsized buffer query counterparts with the addition
>+    that INVALID_OPERATION is generated if the buffer size required to
>+    fill all the requested data is greater than <bufSize>.
>+
>+New Implementation Dependent State
>+
>+    Get Value                       Type  Get Command     Minimum Value    Description                  Sec.  Attribute
>+    ---------                       ----  -----------     -------------    ---------------------------  ----- ---------
>+    CONTEXT_ROBUST_ACCESS_EXT       B     GetIntegerv     -                Robust access enabled        6.1.5 -
>+    RESET_NOTIFICATION_STRATEGY_EXT Z_2   GetIntegerv     See sec. 2.6     Reset notification behavior  2.6   -
>+
>+Issues
>+
>+
>+    1.  What should this extension be called?
>+
>+        RESOLVED: EXT_robustness
>+
>+        Since this is intended to be a version of ARB_robustness for
>+        OpenGL ES, it should be named accordingly.
>+
>+    2.  How does this extension differ from Desktop GL's ARB_robustness?
>+
>+        RESOLVED: Because EGL_EXT_create_context_robustness uses a
>+	separate attribute to enable robust buffer access, a
>+	corresponding query is added here.
>+
>+    3.  Should we provide a context creation mechanism to enable this extension?
>+
>+        RESOLVED. Yes.
>+
>+        Currently, EGL_EXT_create_context_robustness provides this
>+        mechanism via two unique attributes. These attributes differ
>+	from those specified by KHR_create_context to allow for
>+	differences in what functionality those attributes define.
>+        
>+    4. What can cause a graphics reset?
>+
>+       Either user or implementor errors may result in a graphics reset.
>+       If the application attempts to perform a rendering that takes too long
>+       whether due to an infinite loop in a shader or even just a rendering
>+       operation that takes too long on the given hardware. Implementation
>+       errors may produce badly formed hardware commands. Memory access errors
>+       may result from user or implementor mistakes. On some systems, power
>+       management events such as system sleep, screen saver activation, or
>+       pre-emption may also context resets to occur. Any of these events may
>+       result in a graphics reset event that will be detectable by the
>+       mechanism described in this extension.
>+
>+    5. How should the application react to a reset context event?
>+
>+       RESOLVED: For this extension, the application is expected to query
>+       the reset status until NO_ERROR is returned. If a reset is encountered,
>+       at least one *RESET* status will be returned. Once NO_ERROR is again
>+       encountered, the application can safely destroy the old context and
>+       create a new one.
>+
>+       After a reset event, apps should not use a context for any purpose
>+       other than determining its reset status, and then destroying it. If a
>+       context receives a reset event, all other contexts in its share group
>+       will also receive reset events, and should be destroyed and
>+       recreated.
>+
>+       Apps should be cautious in interpreting the GUILTY and INNOCENT reset
>+       statuses. These are guidelines to the immediate cause of a reset, but
>+       not guarantees of the ultimate cause.
>+
>+    6. If a graphics reset occurs in a shared context, what happens in
>+       shared contexts?
>+
>+       RESOLVED: A reset in one context will result in a reset in all other
>+       contexts in its share group. 
>+
>+    7. How can an application query for robust buffer access support,
>+       since this is now determined at context creation time?
>+
>+       RESOLVED. The application can query the value of ROBUST_ACCESS_EXT
>+       using GetIntegerv. If true, this functionality is enabled.
>+
>+    8. How is the reset notification behavior controlled?
>+
>+       RESOLVED: Reset notification behavior is determined at context
>+       creation time using EGL/GLX/WGL/etc. mechanisms. In order that shared
>+       objects be handled predictably, a context cannot share with
>+       another context unless both have the same reset notification
>+       behavior.
>+
>+
>+Revision History
>+
>+    Rev.    Date       Author     Changes
>+    ----  ------------ ---------  ----------------------------------------
>+      3   31 Oct  2011 groth      Reverted to attribute for robust access. Now it's a
>+                                  companion to rather than subset of KHR_create_context
>+      2   11 Oct  2011 groth      Merged ANGLE and NV extensions.
>+                                  Convert to using flag to indicate robust access.
>+      1   15 July 2011 groth      Initial version
>diff --git a/Source/ThirdParty/ANGLE/extensions/EXT_texture_rg.txt b/Source/ThirdParty/ANGLE/extensions/EXT_texture_rg.txt
>new file mode 100644
>index 00000000000..968b28d1003
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/extensions/EXT_texture_rg.txt
>@@ -0,0 +1,195 @@
>+Name
>+
>+    EXT_texture_rg
>+
>+Name Strings
>+    
>+    GL_EXT_texture_rg
>+
>+Contributors
>+
>+    Contributors to ARB_texture_rg, on which this extension is based
>+    Kyle Haughey
>+    Richard Schreyer
>+
>+Contact
>+
>+    Benj Lipchak, Apple (lipchak 'at' apple.com)
>+
>+Status 
>+    
>+    Complete
>+
>+Version
>+    
>+    Date: July 22, 2011
>+    Revision: 3
>+
>+Number
>+
>+    OpenGL ES Extension #103
>+
>+Dependencies
>+
>+    Requires OpenGL ES 2.0.
>+
>+    Written based on the wording of the OpenGL ES 2.0.25 Full Specification
>+    (November 2, 2010).
>+
>+    OES_texture_float affects the definition of this extension.
>+
>+    OES_texture_half_float affects the definition of this extension.
>+
>+    APPLE_framebuffer_multisample affects the definition of this extension.
>+
>+Overview
>+
>+    Historically one- and two-component textures have been specified in OpenGL
>+    ES using the luminance or luminance-alpha (L/LA) formats. With the advent
>+    of programmable shaders and render-to-texture capabilities these legacy
>+    formats carry some historical artifacts which are no longer useful.
>+
>+    For example, when sampling from such textures, the luminance values are
>+    replicated across the color components. This is no longer necessary with
>+    programmable shaders.
>+    
>+    It is also desirable to be able to render to one- and two-component format
>+    textures using capabilities such as framebuffer objects (FBO), but
>+    rendering to L/LA formats is under-specified (specifically how to map
>+    R/G/B/A values to L/A texture channels).
>+
>+    This extension adds new base internal formats for one-component RED and
>+    two-component RG (red green) textures as well as sized RED and RG internal
>+    formats for renderbuffers. The RED and RG texture formats can be used for
>+    both texturing and rendering into with framebuffer objects.
>+
>+New Procedures and Functions
>+    
>+    None
>+
>+New Tokens
>+
>+    Accepted by the <internalformat> parameter of TexImage2D and CopyTexImage2D,
>+    and the <format> parameter of TexImage2D, TexSubImage2D, and ReadPixels:
>+
>+        RED_EXT                 0x1903
>+        RG_EXT                  0x8227
>+
>+    Accepted by the <internalformat> parameter of RenderbufferStorage and
>+    RenderbufferStorageMultisampleAPPLE:
>+
>+        R8_EXT                  0x8229
>+        RG8_EXT                 0x822B
>+
>+Additions to Chapter 2 of the OpenGL ES 2.0 Specification (OpenGL ES Operation)
>+
>+    None
>+
>+Additions to Chapter 3 of the OpenGL ES 2.0 Specification (Rasterization)
>+
>+    (Add the following to Table 3.3: "TexImage2D and ReadPixels formats")
>+
>+    Format Name     Element Meaning and Order      Target Buffer
>+    -----------     -------------------------      -------------
>+    RED_EXT         R                              Color
>+    RG_EXT          R, G                           Color
>+
>+    (Add the following to Table 3.4: "Valid pixel format and type combinations")
>+    (as modified by OES_texture_float and OES_texture_half_float)
>+
>+    Format          Type                           Bytes per Pixel
>+    -----------     -------------------------      ---------------
>+    RED_EXT         FLOAT                          4
>+    RED_EXT         HALF_FLOAT_OES                 2
>+    RED_EXT         UNSIGNED_BYTE                  1
>+    RG_EXT          FLOAT                          8
>+    RG_EXT          HALF_FLOAT_OES                 4
>+    RG_EXT          UNSIGNED_BYTE                  2
>+
>+    (Add the following to Table 3.8: "Conversion from RGBA and depth pixel
>+    components to internal texture")
>+
>+    Base Internal Format     RGBA       Internal Components
>+    --------------------     ------     -------------------
>+    RED_EXT                  R          R
>+    RG_EXT                   R,G        R,G
>+
>+    (Modify Table 3.9: "CopyTexImage internal format/color buffer combinations")
>+
>+                            Texture Format
>+    Color Buffer      A  L  LA  R  RG  RGB  RGBA
>+    ------------      -  -  --  -  --  ---  ----
>+    A                 X
>+    R                    X      X
>+    RG                   X      X  X
>+    RGB                  X      X  X   X
>+    RGBA              X  X  X   X  X   X    X
>+
>+    (Add the following to Table 3.12: "Correspondence of filtered texture
>+    components to texture source color components")
>+
>+    Texture Base        Texture source color
>+    Internal Format     C_s             A_s
>+    ---------------     -------------   ------
>+    RED_EXT             (R_t, 0, 0)     1
>+    RG_EXT              (R_t, G_t, 0)   1
>+
>+Additions to Chapter 4 of the OpenGL ES 2.0 Specification (Per-Fragment
>+Operations and the Framebuffer)
>+
>+    In section 4.3.1 "Reading Pixels", subsection "Obtaining Pixels from the
>+    Framebuffer", modify the last sentence to read:
>+
>+    "If the framebuffer does not support G, B, or A values then the G, B, and A
>+    values that are obtained are 0.0, 0.0, and 1.0 respectively."
>+
>+    In section 4.4.5 "Framebuffer Completeness", modify the last sentence of
>+    the second paragraph to read:
>+
>+    "Color-renderable formats contain red, and possibly green, blue, and alpha
>+    components; depth-renderable formats contain depth components; and
>+    stencil-renderable formats contain stencil components."
>+
>+    (Add the following to Table 4.5: "Renderbuffer image formats, showing their
>+    renderable type (color-, depth-, or stencil-renderable) and the number of
>+    bits each format contains for color (R, G, B, A), depth (D), and stencil
>+    (S) components")
>+
>+    Sized Internal  Renderable Type   R bits G bits B bits A bits D bits S bits
>+    Format
>+    --------------  ----------------  ------ ------ ------ ------ ------ ------
>+    R8_EXT        color-renderable  8
>+    RG8_EXT       color-renderable  8      8
>+
>+Additions to Chapter 5 of the OpenGL ES 2.0 Specification (Special Functions)
>+
>+    None
>+
>+Additions to Chapter 6 of the OpenGL ES 2.0 Specification (State and State
>+Requests)
>+
>+    None
>+
>+Dependencies on OES_texture_float
>+
>+    If OES_texture_float is not supported, then omit the rows of
>+    Table 3.4 that have Type FLOAT.
>+
>+Dependencies on OES_texture_half_float
>+
>+    If OES_texture_half_float is not supported, then omit the rows of 
>+    Table 3.4 that have Type HALF_FLOAT_OES.
>+
>+Dependencies on APPLE_framebuffer_multisample
>+
>+    If APPLE_framebuffer_multisample is not supported, then all references to
>+    RenderbufferStorageMultisampleAPPLE should be ignored.
>+
>+Revision History
>+    
>+    #1 February 22, 2011, khaughey
>+        - initial version adapted from ARB_texture_rg.
>+    #2 June 16, 2011, benj
>+        - add interaction with APPLE_framebuffer_multisample
>+    #3 July 22, 2011, benj
>+        - rename from APPLE to EXT
>diff --git a/Source/ThirdParty/ANGLE/extensions/EXT_texture_storage.txt b/Source/ThirdParty/ANGLE/extensions/EXT_texture_storage.txt
>new file mode 100644
>index 00000000000..fd629e7b3a5
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/extensions/EXT_texture_storage.txt
>@@ -0,0 +1,1090 @@
>+Name
>+
>+    EXT_texture_storage
>+
>+Name Strings
>+
>+    GL_EXT_texture_storage
>+
>+Contact
>+
>+    Bruce Merry (bmerry 'at' gmail.com)
>+    Ian Romanick, Intel (ian.d.romanick 'at' intel.com)
>+
>+Contributors
>+
>+    Jeremy Sandmel, Apple
>+    Bruce Merry, ARM
>+    Tom Olson, ARM
>+    Benji Bowman, Imagination Technologies
>+    Ian Romanick, Intel
>+    Jeff Bolz, NVIDIA
>+    Pat Brown, NVIDIA
>+    Maurice Ribble, Qualcomm
>+    Lingjun Chen, Qualcomm
>+    Daniel Koch, Transgaming Inc
>+
>+Status
>+
>+    Complete. 
>+
>+Version
>+
>+    Last Modified Date: November 11, 2011
>+    Author Revision: 24
>+
>+Number
>+
>+    OpenGL ES Extension #108
>+
>+Dependencies
>+
>+    OpenGL ES 1.0, OpenGL ES 2.0 or OpenGL 1.2 is required.
>+
>+    OES_texture_npot, OES_texture_cube_map, OES_texture_3D,
>+    OES_depth_texture, OES_packed_depth_stencil,
>+    OES_compressed_paletted_texture, OES_texture_float, OES_texture_half_float
>+    EXT_texture_type_2_10_10_10_REV, EXT_texture_format_BGRA8888,
>+    EXT_texture3D, OES_texture_npot, APPLE_texture_2D_limited_npot,
>+    ARB_texture_cube_map, ARB_texture_cube_map_array,
>+    ARB_texture_rectangle, SGIS_generate_mipmap,
>+    EXT_direct_state_access, OES_EGL_image, WGL_ARB_render_texture,
>+    GLX_EXT_texture_from_pixmap, and core specifications that
>+    incorporate these extensions affect the definition of this
>+    extension.
>+
>+    This extension is written against the OpenGL 3.2 Core Profile
>+    specification.
>+
>+Overview
>+
>+    The texture image specification commands in OpenGL allow each level
>+    to be separately specified with different sizes, formats, types and
>+    so on, and only imposes consistency checks at draw time. This adds
>+    overhead for implementations.
>+
>+    This extension provides a mechanism for specifying the entire
>+    structure of a texture in a single call, allowing certain
>+    consistency checks and memory allocations to be done up front. Once
>+    specified, the format and dimensions of the image array become
>+    immutable, to simplify completeness checks in the implementation.
>+
>+    When using this extension, it is no longer possible to supply texture
>+    data using TexImage*. Instead, data can be uploaded using TexSubImage*,
>+    or produced by other means (such as render-to-texture, mipmap generation,
>+    or rendering to a sibling EGLImage).
>+
>+    This extension has complicated interactions with other extensions.
>+    The goal of most of these interactions is to ensure that a texture
>+    is always mipmap complete (and cube complete for cubemap textures).
>+
>+IP Status
>+
>+    No known IP claims
>+
>+New Procedures and Functions
>+
>+    void TexStorage1DEXT(enum target, sizei levels,
>+                         enum internalformat,
>+                         sizei width);
>+
>+    void TexStorage2DEXT(enum target, sizei levels,
>+                         enum internalformat,
>+                         sizei width, sizei height);
>+
>+    void TexStorage3DEXT(enum target, sizei levels,
>+                         enum internalformat,
>+                         sizei width, sizei height, sizei depth);
>+
>+    void TextureStorage1DEXT(uint texture, enum target, sizei levels,
>+                         enum internalformat,
>+                         sizei width);
>+
>+    void TextureStorage2DEXT(uint texture, enum target, sizei levels,
>+                         enum internalformat,
>+                         sizei width, sizei height);
>+
>+    void TextureStorage3DEXT(uint texture, enum target, sizei levels,
>+                         enum internalformat,
>+                         sizei width, sizei height, sizei depth);
>+
>+New Types
>+
>+    None
>+
>+New Tokens
>+
>+    Accepted by the <value> parameter of GetTexParameter{if}v:
>+
>+        TEXTURE_IMMUTABLE_FORMAT_EXT   0x912F
>+
>+    Accepted by the <internalformat> parameter of TexStorage* when
>+    implemented on OpenGL ES:
>+
>+        ALPHA8_EXT                     0x803C  /* reuse tokens from EXT_texture */
>+        LUMINANCE8_EXT                 0x8040
>+        LUMINANCE8_ALPHA8_EXT          0x8045
>+
>+      (if OES_texture_float is supported)
>+        RGBA32F_EXT                    0x8814  /* reuse tokens from ARB_texture_float */
>+        RGB32F_EXT                     0x8815
>+        ALPHA32F_EXT                   0x8816
>+        LUMINANCE32F_EXT               0x8818
>+        LUMINANCE_ALPHA32F_EXT         0x8819
>+
>+      (if OES_texture_half_float is supported)
>+        RGBA16F_EXT                    0x881A  /* reuse tokens from ARB_texture_float */
>+        RGB16F_EXT                     0x881B
>+        ALPHA16F_EXT                   0x881C
>+        LUMINANCE16F_EXT               0x881E
>+        LUMINANCE_ALPHA16F_EXT         0x881F
>+
>+      (if EXT_texture_type_2_10_10_10_REV is supported)
>+        RGB10_A2_EXT                   0x8059  /* reuse tokens from EXT_texture */
>+        RGB10_EXT                      0x8052
>+
>+      (if EXT_texture_format_BGRA8888 is supported)
>+        BGRA8_EXT                      0x93A1
>+
>+
>+Additions to Chapter 2 of the OpenGL 3.2 Core Profile Specification
>+(OpenGL Operation)
>+
>+    None
>+
>+Additions to Chapter 3 of the OpenGL 3.2 Core Profile Specification
>+(Rasterization)
>+
>+    After section 3.8.1 (Texture Image Specification) add a new
>+    subsection called "Immutable-format texture images":
>+
>+    "An alterative set of commands is provided for specifying the
>+    properties of all levels of a texture at once. Once a texture is
>+    specified with such a command, the format and dimensions of all
>+    levels becomes immutable, unless it is a proxy texture (since
>+    otherwise it would no longer be possible to use the proxy). The
>+    contents of the images and the parameters can still be modified.
>+    Such a texture is referred to as an "immutable-format" texture. The
>+    immutability status of a texture can be determined by calling
>+    GetTexParameter with <pname> TEXTURE_IMMUTABLE_FORMAT_EXT.
>+
>+    Each of the commands below is described by pseudo-code which
>+    indicates the effect on the dimensions and format of the texture.
>+    For all of the commands, the following apply in addition to the
>+    pseudo-code:
>+
>+    - If the default texture object is bound to <target>, an
>+      INVALID_OPERATION error is generated.
>+    - If executing the pseudo-code would lead to an error, the error is
>+      generated and the command will have no effect.
>+    - Any existing levels that are not replaced are reset to their
>+      initial state.
>+    - If <width>, <height>, <depth> or <levels> is less than 1, the
>+      error INVALID_VALUE is generated.
>+    - Since no pixel data are provided, the <format> and <type> values
>+      used in the pseudo-code are irrelevant; they can be considered to
>+      be any values that are legal to use with <internalformat>.
>+    - If the command is successful, TEXTURE_IMMUTABLE_FORMAT_EXT becomes
>+      TRUE.
>+    - If <internalformat> is a specific compressed texture format, then
>+      references to TexImage* should be replaced by CompressedTexImage*,
>+      with <format>, <type> and <data> replaced by any valid <imageSize> and
>+      <data>. If there is no <imageSize> for which this command would have
>+      been valid, an INVALID_OPERATION error is generated [fn: This
>+      condition is not required for OpenGL, but is necessary for OpenGL
>+      ES which does not support on-the-fly compression.]
>+    - If <internalformat> is one of the internal formats listed in table
>+      3.11, an INVALID_ENUM error is generated. [fn: The corresponding table
>+      in OpenGL ES 2.0 is table 3.8.]
>+
>+    The command
>+
>+        void TexStorage1DEXT(enum target, sizei levels,
>+                             enum internalformat,
>+                             sizei width);
>+
>+    specifies all the levels of a one-dimensional texture (or proxy) at
>+    the same time. It is described by the pseudo-code below:
>+
>+        for (i = 0; i < levels; i++)
>+        {
>+            TexImage1D(target, i, internalformat, width, 0,
>+                       format, type, NULL);
>+            width = max(1, floor(width / 2));
>+        }
>+
>+    If <target> is not TEXTURE_1D or PROXY_TEXTURE_1D then INVALID_ENUM
>+    is generated. If <levels> is greater than floor(log_2(width)) + 1
>+    then INVALID_OPERATION is generated.
>+
>+    The command
>+
>+        void TexStorage2DEXT(enum target, sizei levels,
>+                             enum internalformat,
>+                             sizei width, sizei height);
>+
>+    specifies all the levels of a two-dimensional, cube-map,
>+    one-dimension array or rectangle texture (or proxy) at the same
>+    time. The pseudo-code depends on the <target>:
>+
>+    [PROXY_]TEXTURE_2D, [PROXY_]TEXTURE_RECTANGLE or
>+    PROXY_TEXTURE_CUBE_MAP:
>+
>+        for (i = 0; i < levels; i++)
>+        {
>+            TexImage2D(target, i, internalformat, width, height, 0,
>+                       format, type, NULL);
>+            width = max(1, floor(width / 2));
>+            height = max(1, floor(height / 2));
>+        }
>+
>+    TEXTURE_CUBE_MAP:
>+
>+        for (i = 0; i < levels; i++)
>+        {
>+            for face in (+X, -X, +Y, -Y, +Z, -Z)
>+            {
>+                TexImage2D(face, i, internalformat, width, height, 0,
>+                           format, type, NULL);
>+            }
>+            width = max(1, floor(width / 2));
>+            height = max(1, floor(height / 2));
>+        }
>+
>+    [PROXY_]TEXTURE_1D_ARRAY:
>+
>+        for (i = 0; i < levels; i++)
>+        {
>+            TexImage2D(target, i, internalformat, width, height, 0,
>+                       format, type, NULL);
>+            width = max(1, floor(width / 2));
>+        }
>+
>+    If <target> is not one of those listed above, the error INVALID_ENUM
>+    is generated.
>+
>+    The error INVALID_OPERATION is generated if any of the following
>+    conditions hold:
>+    - <target> is [PROXY_]TEXTURE_1D_ARRAY and <levels> is greater than
>+      floor(log_2(width)) + 1
>+    - <target> is not [PROXY_]TEXTURE_1D_ARRAY and <levels> is greater
>+    than floor(log_2(max(width, height))) + 1
>+
>+    The command
>+
>+        void TexStorage3DEXT(enum target, sizei levels, enum internalformat,
>+                             sizei width, sizei height, sizei depth);
>+
>+    specifies all the levels of a three-dimensional, two-dimensional
>+    array texture, or cube-map array texture (or proxy). The pseudo-code
>+    depends on <target>:
>+
>+    [PROXY_]TEXTURE_3D:
>+
>+        for (i = 0; i < levels; i++)
>+        {
>+            TexImage3D(target, i, internalformat, width, height, depth, 0,
>+                       format, type, NULL);
>+            width = max(1, floor(width / 2));
>+            height = max(1, floor(height / 2));
>+            depth = max(1, floor(depth / 2));
>+        }
>+
>+    [PROXY_]TEXTURE_2D_ARRAY, [PROXY_]TEXTURE_CUBE_MAP_ARRAY_ARB:
>+
>+        for (i = 0; i < levels; i++)
>+        {
>+            TexImage3D(target, i, internalformat, width, height, depth, 0,
>+                       format, type, NULL);
>+            width = max(1, floor(width / 2));
>+            height = max(1, floor(height / 2));
>+        }
>+
>+    If <target> is not one of those listed above, the error INVALID_ENUM
>+    is generated.
>+
>+    The error INVALID_OPERATION is generated if any of the following
>+    conditions hold:
>+    - <target> is [PROXY_]TEXTURE_3D and <levels> is greater than
>+      floor(log_2(max(width, height, depth))) + 1
>+    - <target> is [PROXY_]TEXTURE_2D_ARRAY or
>+      [PROXY_]TEXTURE_CUBE_MAP_ARRAY_EXT and <levels> is greater than
>+      floor(log_2(max(width, height))) + 1
>+
>+    After a successful call to any TexStorage* command with a non-proxy
>+    target, the value of TEXTURE_IMMUTABLE_FORMAT_EXT for this texture
>+    object is set to TRUE, and no further changes to the dimensions or
>+    format of the texture object may be made. Other commands may only
>+    alter the texel values and texture parameters. Using any of the
>+    following commands with the same texture will result in the error
>+    INVALID_OPERATION being generated, even if it does not affect the
>+    dimensions or format:
>+
>+        - TexImage*
>+        - CompressedTexImage*
>+        - CopyTexImage*
>+        - TexStorage*
>+
>+    The TextureStorage* commands operate identically to the
>+    corresponding command where "Texture" is substituted for "Tex"
>+    except, rather than updating the current bound texture for the
>+    texture unit indicated by the current active texture state and the
>+    target parameter, these "Texture" commands update the texture object
>+    named by the initial texture parameter. The error INVALID_VALUE
>+    is generated if <texture> is zero.
>+    "
>+
>+    In section 3.8.6 (Texture Parameters), after the sentence
>+
>+    "In the remainder of section 3.8, denote by lod_min, lod_max,
>+    level_base, and level_max the values of the texture parameters
>+    TEXTURE_MIN_LOD, TEXTURE_MAX_LOD, TEXTURE_BASE_LEVEL, and
>+    TEXTURE_MAX_LEVEL respectively."
>+
>+    add
>+
>+    "However, if TEXTURE_IMMUTABLE_FORMAT_EXT is
>+    TRUE, then level_base is clamped to the range [0, <levels> - 1] and
>+    level_max is then clamped to the range [level_base, <levels> - 1],
>+    where <levels> is the parameter passed the call to TexStorage* for
>+    the texture object.
>+
>+    In section 3.8.9 (Rendering feedback loops) replace all references
>+    to TEXTURE_BASE_LEVEL by level_base.
>+
>+    In section 3.8.9 (Mipmapping), replace the paragraph starting "Each
>+    array in a mipmap is defined..." by
>+
>+    "Each array in a mipmap is defined using TexImage3D, TexImage2D,
>+    CopyTexImage2D, TexImage1D, CopyTexImage1D, or by functions that are
>+    defined in terms of these functions. Level-of-detail numbers proceed
>+    from level_base for the original texel array through the maximum
>+    level p, with each unit increase indicating an array of half the
>+    dimensions of the previous one (rounded down to the next integer if
>+    fractional) as already described. For immutable-format textures,
>+    p is one less than the <levels> parameter passed to TexStorage*;
>+    otherwise p = floor(log_2(maxsize)) + level_base.  All arrays from
>+    level_base through q = min(p, level_max) must be defined, as
>+    discussed in section 3.8.12."
>+
>+    In section 3.8.12 (Texture Completeness), modify the last sentence
>+    to avoid refering to level_base and level_max:
>+
>+    "An implementation may allow a texture image array of level 1 or
>+    greater to be created only if a mipmap complete set of image arrays
>+    consistent with the requested array can be supported where the
>+    values of TEXTURE_BASE_LEVEL and TEXTURE_MAX_LEVEL are 0 and 1000
>+    respectively."
>+
>+    Modify section 3.8.13 (Texture State and Proxy State) to add the new
>+    state:
>+
>+    "Each set consists of ..., and a boolean flag indicating whether the
>+    format and dimensions of the texture are immutable."
>+
>+    Add
>+    "The initial value of TEXTURE_IMMUTABLE_FORMAT_EXT is FALSE."
>+
>+Additions to Chapter 4 of the OpenGL 3.2 Core Profile Specification
>+(Per-Fragment Operations and the Frame Buffer)
>+
>+    None
>+
>+Additions to Chapter 5 of the OpenGL 3.2 Compatibility Profile Specification
>+(Special Functions)
>+
>+    In section 5.4.1 (Commands Not Usable in Display Lists), add
>+    TexStorage* to the list of commands that cannot be used.
>+
>+Additions to Chapter 6 of the OpenGL 3.2 Core Profile Specification
>+(State and State Requests)
>+
>+    Replace the following statement in 6.1.3 (Enumerated Queries):
>+
>+    "<value> must be one of the symbolic values in table 3.10."
>+
>+    with
>+
>+    "<value> must be TEXTURE_IMMUTABLE_FORMAT_EXT or one of the symbolic
>+    values in table 3.22."
>+
>+Additions to the AGL/EGL/GLX/WGL Specifications
>+
>+    None
>+
>+Additions to OES_compressed_ETC1_RGB8_texture
>+
>+    Add the following to the additions to Chapter 3:
>+
>+    "Since ETC1 images are easily edited along 4x4 texel boundaries, the
>+    limitations on CompressedTexSubImage2D are relaxed.
>+    CompressedTexSubImage2D will result in an INVALID_OPERATION error
>+    only if one of the following conditions occurs:
>+
>+        * <width> is not a multiple of four, and <width> plus <xoffset> is not
>+          equal to the texture width;
>+
>+        * <height> is not a multiple of four, and <height> plus <yoffset> is
>+          not equal to the texture height; or
>+
>+        * <xoffset> or <yoffset> is not a multiple of four.
>+
>+    Remove CompressedTexSubImage2D from this error:
>+
>+    "INVALID_OPERATION is generated by CompressedTexSubImage2D,
>+    TexSubImage2D, or CopyTexSubImage2D if the texture image <level>
>+    bound to <target> has internal format ETC1_RGB8_OES."
>+
>+    Add the following error:
>+
>+    "INVALID_OPERATION is generated by CompressedTexSubImage2D
>+    if the region to be modified is not aligned to block boundaries
>+    (refer to the extension text for details)."
>+
>+Additions to AMD_compressed_ATC_texture and AMD_compressed_3DC_texture:
>+
>+    Apply the same changes as for OES_compressed_ETC1_RGB8_texture
>+    above, substituting the appropriate internal format tokens from
>+    these extensions.
>+
>+Dependencies on EXT_direct_state_access
>+
>+    If EXT_direct_state_access is not present, references to
>+    TextureStorage* should be ignored.
>+
>+Dependencies on OpenGL ES
>+
>+    On OpenGL ES without extensions introducing TEXTURE_MAX_LEVEL,
>+    mipmapped textures specified with TexStorage are required to have a
>+    full set of mipmaps. If TEXTURE_MAX_LEVEL is not supported, this
>+    extension is modified as follows:
>+
>+    - Where an upper bound is placed on <levels> in this extension (i.e.
>+      the maximum number of mipmap levels for a texture of the given
>+      target and dimensions), an INVALID_OPERATION error is generated if
>+      <levels> is neither 1 nor this upper bound.
>+    - q (the effective maximum number of levels) is redefined to clamp
>+      to the number of levels present in immutable-format textures.
>+
>+    OpenGL ES does not accept sized internal formats (e.g., RGBA8) and
>+    instead derives an internal format from the <format> and <type>
>+    parameters of TexImage2D. Since TexStorage* does not specify texel
>+    data, the API doesn't include <format> and <type> parameters.
>+    On an OpenGL ES implementation, the values in the <internalformat>
>+    column in the tables below are accepted as <internalformat>
>+    parameters, and base internal formats are not accepted. The
>+    TexImage* calls in the TexStorage* pseudocode are modified so that
>+    the <internalformat>, <format> and <type> parameters are
>+    taken from the <format>, <format> and <type> columns (respectively)
>+    in the tables below, according to the <internalformat>
>+    specified in the TexStorage* command.
>+
>+        <internalformat>       <format>           <type>
>+        ----------------       --------           ------
>+        RGB565                 RGB                UNSIGNED_SHORT_5_6_5
>+        RGBA4                  RGBA               UNSIGNED_SHORT_4_4_4_4
>+        RGB5_A1                RGBA               UNSIGNED_SHORT_5_5_5_1
>+        RGB8_OES               RGB                UNSIGNED_BYTE
>+        RGBA8_OES              RGBA               UNSIGNED_BYTE
>+        LUMINANCE8_ALPHA8_EXT  LUMINANCE_ALPHA    UNSIGNED_BYTE
>+        LUMINANCE8_EXT         LUMINANCE          UNSIGNED_BYTE
>+        ALPHA8_EXT             ALPHA              UNSIGNED_BYTE
>+
>+    If OES_depth_texture is supported:
>+
>+        <internalformat>       <format>           <type>
>+        ----------------       --------           ------
>+        DEPTH_COMPONENT16_OES  DEPTH_COMPONENT    UNSIGNED_SHORT
>+        DEPTH_COMPONENT32_OES  DEPTH_COMPONENT    UNSIGNED_INT
>+
>+    If OES_packed_depth_stencil is supported:
>+
>+        <internalformat>       <format>           <type>
>+        ----------------       --------           ------
>+        DEPTH24_STENCIL8_OES   DEPTH_STENCIL_OES  UNSIGNED_INT
>+
>+    If OES_texture_float is supported:
>+
>+        <internalformat>       <format>           <type>
>+        ----------------       --------           ------
>+        RGBA32F_EXT            RGBA               FLOAT
>+        RGB32F_EXT             RGB                FLOAT
>+        LUMINANCE_ALPHA32F_EXT LUMINANCE_ALPHA    FLOAT
>+        LUMINANCE32F_EXT       LUMINANCE          FLOAT 
>+        ALPHA32F_EXT           ALPHA              FLOAT
>+
>+    If OES_texture_half_float is supported:
>+
>+        <internalformat>       <format>           <type>
>+        ----------------       --------           ------
>+        RGBA16F_EXT            RGBA               HALF_FLOAT_OES
>+        RGB16F_EXT             RGB                HALF_FLOAT_OES
>+        LUMINANCE_ALPHA16F_EXT LUMINANCE_ALPHA    HALF_FLOAT_OES
>+        LUMINANCE16F_EXT       LUMINANCE          HALF_FLOAT_OES 
>+        ALPHA16F_EXT           ALPHA              HALF_FLOAT_OES
>+
>+    If EXT_texture_type_2_10_10_10_REV is supported:
>+
>+        <internalformat>    <format>   <type>
>+        ----------------    --------   ------
>+        RGB10_A2_EXT        RGBA       UNSIGNED_INT_2_10_10_10_REV_EXT
>+        RGB10_EXT           RGB        UNSIGNED_INT_2_10_10_10_REV_EXT
>+
>+    If EXT_texture_format_BGRA8888 is supported:
>+
>+        <internalformat>    <format>   <type>
>+        ----------------    --------   ------
>+        BGRA8_EXT           BGRA_EXT   UNSIGNED_BYTE
>+
>+
>+Dependencies on texture targets
>+
>+    If a particular texture target is not supported by the
>+    implementation, passing it as a <target> to TexStorage* will
>+    generate an INVALID_ENUM error. If as a result, any of the commands
>+    defined in this extension would no longer have any valid <target>,
>+    all references to the command should be ignored.
>+
>+    In particular, note that OpenGL ES 1.x/2.0 do not have proxy textures,
>+    1D textures, or 3D textures, and thus only the TexStorage2DEXT
>+    entry point is required. If OES_texture_3D is supported, the
>+    TexStorage3DEXT entry point is also required.
>+
>+Dependencies on OES_texture_npot
>+
>+    If OpenGL ES 2.0 or APPLE_texture_2D_limited_npot is present but
>+    OES_texture_npot is not present, then INVALID_OPERATION is
>+    generated by TexStorage* and TexStorage3DEXT if <levels> is
>+    not one and <width>, <height> or <depth> is not a power of
>+    two.
>+
>+Dependencies on WGL_ARB_render_texture, GLX_EXT_texture_from_pixmap, EGL
>+1.4 and GL_OES_EGL_image
>+
>+    The commands eglBindTexImage, wglBindTexImageARB, glXBindTexImageEXT or
>+    EGLImageTargetTexture2DOES are not permitted on an immutable-format
>+    texture.
>+    They will generate the following errors:
>+      - EGLImageTargetTexture2DOES: INVALID_OPERATION
>+      - eglBindTexImage: EGL_BAD_MATCH
>+      - wglBindTexImage: ERROR_INVALID_OPERATION
>+      - glXBindTexImageEXT: BadMatch
>+
>+Dependencies on OES_compressed_paletted_texture
>+
>+    The compressed texture formats exposed by
>+    OES_compressed_paletted_texture are not supported by TexStorage*.
>+    Passing one of these tokens to TexStorage* will generate an
>+    INVALID_ENUM error.
>+
>+Errors
>+
>+    Note that dependencies above modify the errors.
>+
>+    If TexStorage* is called with a <width>, <height>, <depth> or
>+    <levels> parameter that is less than one, then the error
>+    INVALID_VALUE is generated.
>+
>+    If the <target> parameter to TexStorage1DEXT is not
>+    [PROXY_]TEXTURE_1D, then the error INVALID_ENUM is generated.
>+
>+    If the <target> parameter to TexStorage2DEXT is not
>+    [PROXY_]TEXTURE_2D, [PROXY_]TEXTURE_CUBE_MAP,
>+    [PROXY_]TEXTURE_RECTANGLE or [PROXY_]TEXTURE_1D_ARRAY, then the
>+    error INVALID_ENUM is generated.
>+
>+    If the <target> parameter to TexStorage3DEXT is not
>+    [PROXY_]TEXTURE_3D, [PROXY_]TEXTURE_2D_ARRAY or
>+    [PROXY_]TEXTURE_CUBE_MAP_ARRAY then the error INVALID_ENUM is
>+    generated.
>+
>+    If the <levels> parameter to TexStorage* is greater than the
>+    <target>-specific value listed below then the error
>+    INVALID_OPERATION is generated:
>+        [PROXY_]TEXTURE_{1D,1D_ARRAY}:
>+            floor(log_2(width)) + 1
>+        [PROXY_]TEXTURE_{2D,2D_ARRAY,CUBE_MAP,CUBE_MAP_ARRAY}:
>+            floor(log_2(max(width, height))) + 1
>+        [PROXY_]TEXTURE_3D:
>+            floor(log_2(max(width, height, depth))) + 1
>+        [PROXY_]TEXTURE_RECTANGLE:
>+            1
>+
>+    If the default texture object is bound to the <target> passed to
>+    TexStorage*, then the error INVALID_OPERATION is generated.
>+
>+    If the <target> parameter to TextureStorage* does not match the
>+    dimensionality of <texture>, then the error INVALID_OPERATION is
>+    generated.
>+
>+    If the <texture> parameter to TextureStorage* is zero, then the
>+    INVALID_VALUE is generated.
>+
>+    If any pseudo-code listed in this extension would generate an error,
>+    then that error is generated.
>+
>+    Calling any of the following functions on a texture for which
>+    TEXTURE_IMMUTABLE_FORMAT_EXT is TRUE will generate an
>+    INVALID_OPERATION error:
>+        - TexImage*
>+        - CompressedTexImage*
>+        - CopyTexImage*
>+
>+New State
>+
>+    Additions to Table 6.8 Textures (state per texture object)
>+
>+                                                               Initial
>+        Get Value                      Type   Get Command      Value    Description                Sec.
>+        ---------                      ----   -----------      -------  -----------                ----
>+        TEXTURE_IMMUTABLE_FORMAT_EXT   B      GetTexParameter  FALSE    Size and format immutable  2.6
>+
>+New Implementation Dependent State
>+
>+    None
>+
>+Issues
>+
>+    1. What should this extension be called?
>+
>+    RESOLVED: EXT_texture_storage is chosen for consistency with the
>+    glRenderbufferStorage entry point.
>+
>+    2. Should TexStorage* accept a border parameter?
>+
>+    RESOLVED: no.
>+
>+    DISCUSSION: Currently it does not, since borders are a deprecated
>+    feature which is not supported by all hardware. Users of the
>+    compatibility profile can continue to use the existing texture
>+    specification functions, but there is an argument that users of
>+    compatibility profile may also want to use this extension.
>+
>+    3. What is the correct error when <levels> specifies a partial
>+    mipmap pyramid for OpenGL ES?
>+
>+    RESOLVED: INVALID_OPERATION, since it is an interaction between
>+    parameters rather than a single value being invalid. It also makes
>+    sense to relax this condition for desktop GL where it makes sense to
>+    use a truncated pyramid with TEXTURE_MAX_LEVEL.
>+
>+    4. Should use of these entry-points make the metadata (format and
>+    dimensions) immutable?
>+
>+    RESOLVED: Yes.
>+
>+    DISCUSSION: The benefits of knowing metadata can't change will
>+    probably outweigh the extra cost of checking the
>+    TEXTURE_IMMUTABLE_FORMAT_EXT flag on each texture specification
>+    call.
>+
>+    5. Should it be legal to completely replace the texture using a new call
>+    to TexStorage*?
>+
>+    RESOLVED. It will not be allowed.
>+
>+    DISCUSSION: This is useful to invalidate all levels of a texture.
>+    Allowing the metadata to be changed here seems easier than trying to
>+    define a portable definition of what it means to change the metadata
>+    (e.g. what if you used an unsized internal format the first time and
>+    the corresponding sized internal format the second time, or vice
>+    versa)?
>+
>+    However, while this is largely similar to deleting the old texture
>+    object and replacing it with a new one, it does lose some of the
>+    advantages of immutability. Specifically, because doing so does not
>+    reset bindings, it doesn't allow a migration path to an API that
>+    validates the texture format at bind time.
>+
>+    6. Should it be legal to use TexImage* after TexStorage* if it doesn't
>+    affect the metadata?
>+
>+    RESOLVED: No.
>+
>+    DISCUSSION: A potential use case is to allow a single level of a
>+    texture to be invalidated using a NULL pointer. However, as noted
>+    above it is non-trivial to determine what constitutes a change.
>+
>+    7. How does this extension interact with APPLE_texture_2D_limited_npot?
>+
>+    RESOLVED. APPLE_texture_2D_limited_npot is equivalent to the NPOT
>+    support in OpenGL ES 2.0.
>+
>+    8. Should this extension be written to work with desktop OpenGL?
>+
>+    RESOLVED: Yes.
>+
>+    DISCUSSION: There has been been interest and it will future-proof it
>+    against further additions to OpenGL ES.
>+
>+    9. Which texture targets should be supported?
>+
>+    RESOLVED. All targets except multisample and buffer textures are
>+    supported.
>+
>+    Initially all targets except TEXTURE_BUFFER were supported. It was
>+    noted that the entrypoints for multisample targets added no useful
>+    functionality, since multisample textures have no completeness
>+    checks beyond being non-empty.
>+
>+    Rectangle textures have completeness checks to prevent filtering of
>+    integer textures. However, since we decided to only force mipmap
>+    completeness, this becomes less useful.
>+
>+    10. Should this extension support proxy textures?
>+
>+    RESOLVED: Yes.
>+
>+    DISCUSSION: It should be orthogonal.
>+
>+    11. Are the <format> and <type> parameters necessary?
>+
>+    RESOLVED. No, they will be removed.
>+
>+    DISCUSSION: For OpenGL ES the type parameter was necessary to
>+    determine the precision of the texture, but this can be solved by
>+    having these functions accept sized internal formats (which are
>+    already accepted by renderbuffers).
>+
>+    12. Should it be legal to make the default texture (id 0)
>+    immutable-format?
>+
>+    RESOLVED: No.
>+
>+    DISCUSSION: This would make it impossible to restore the context to
>+    it's default state, which is deemed undesirable. There is no good
>+    reason not to use named texture objects.
>+
>+    13. Should we try to guarantee that textures made through this path
>+    will always be complete?
>+
>+    RESOLVED: It should be guaranteed that the texture will be mipmap
>+    complete.
>+
>+    DISCUSSION: Future separation between images and samplers will still
>+    allow users to create combinations that are invalid, but
>+    constraining the simple cases will make these APIs easier to use for
>+    beginners.
>+
>+    14. Should these functions use a EXT_direct_state_access approach to
>+    specifying the texture objects?
>+
>+    UNRESOLVED.
>+
>+    DISCUSSION: as a standalone extension, no DSA-like functions will be
>+    added. However, interactions with EXT_direct_state_access and
>+    ARB_direct_state_access need to be resolved.
>+
>+    15. Should these functions accept generic compressed formats?
>+
>+    RESOLVED: Yes. Note that the spec language will need to be modified
>+    to allow this for ES, since the pseudocode is written in terms of
>+    TexImage2D, which does not allow compressed texture formats in ES.
>+    See also issues 23 and 27.
>+
>+    16. How should completeness be forced when TEXTURE_MAX_LEVEL is not
>+    present?
>+
>+    RESOLVED. The maximum level q will be redefined to clamp to the
>+    highest level available.
>+
>+    DISCUSSION: A single-level texture can be made complete either by
>+    making it mipmap complete (by setting TEXTURE_MAX_LEVEL to 0) or by
>+    turning off mipmapping (by choose an appropriate minification
>+    filter).
>+
>+    Some options:
>+
>+    A: Specify that TexStorage* changes the default minification filter
>+    for OpenGL ES. This makes it awkward to add TEXTURE_MAX_LEVEL
>+    support to OpenGL ES later, since switching to match GL would break
>+    compatibility. The two mechanisms also do not give identical
>+    results, since the magnification threshold depends on the
>+    minification filter.
>+
>+    B: Specify that the texture behaves as though TEXTURE_MAX_LEVEL were
>+    zero. To specify this properly probably requires fairly intrusive
>+    changes to the OpenGL ES full specification to add back all the
>+    language relating to the max level. It also does not solve the
>+    similar problem of what to do with NPOT textures; and it may have
>+    hardware impacts due to the change in the min/mag crossover.
>+
>+    C: Specify that TexStorage* changes the default minification filter
>+    for all implementations when a single-level texture is specified.
>+    This may be slightly counter-intuitive to desktop GL users, but will
>+    give consistent behaviour across variants of GL and avoids changing
>+    the functional behaviour of this extension based on the presence or
>+    absence of some other feature.
>+
>+    Currently B is specified. This has potential hardware implications
>+    for OpenGL ES because of the effect of the minification filter on
>+    the min/mag crossover. However, C has potential hardware implications
>+    for OpenGL due to the separation of texture and sampler state.
>+
>+    17. How should completeness be forced when only ES2-style NPOT is
>+    available?
>+
>+    RESOLVED. It is not worth trying to do this, in light of issue 13.
>+
>+    Previous revisions of this extension overrode the minification
>+    filter and wrap modes, but that is no longer the case. Since
>+    OES_texture_npot removes the caveats on NPOT textures anyway, it
>+    might not be worth trying to "fix" this.
>+
>+    18. For OpenGL ES, how do the new sized internal formats interact
>+    with OES_required_internal_format?
>+
>+    RESOLVED.
>+
>+    If OES_required_internal_format is not present, then the
>+    <internalformat> parameter is intended merely to indicate what the
>+    corresponding <format> and <type> would have been, had TexImage*
>+    been used instead. If OES_required_internal_format is present, then
>+    it is intended that the <internalformat> will be interpreted as if
>+    it had been passed directly to TexImage*.
>+
>+    19. Should there be some hinting mechanism to indicate whether data
>+    is coming immediately or later?
>+
>+    RESOLVED. No parameter is needed. An extension can be added to provide
>+    a TexParameter value which is latched at TexStorage time.
>+
>+    DISCUSSION: Some members felt that this would be useful so that they
>+    could defer allocation when suitable, particularly if higher-
>+    resolution images will be streamed in later; or to choose a memory
>+    type or layout appropriate to the usage. However, implementation
>+    experience with BufferData is that developers frequently provide
>+    wrong values and implementations have to guess anyway.
>+
>+    One option suggested was the <usage> parameter currently passed to
>+    BufferData. Another option was to set it with TexParameter.
>+
>+    20. How should this extension interact with
>+    EGLImageTargetTexture2DOES, eglBindTexImage, glXBindTexImage and
>+    wglBindTexImage?
>+
>+    RESOLVED. These functions will not be permitted after glTexStorage*.
>+
>+    Several options are possible:
>+
>+    A) Disallow these functions.
>+    B) Allow them, but have them reset the TEXTURE_IMMUTABLE_FORMAT_EXT
>+       flag.
>+    C) Allow them unconditionally.
>+
>+    C would violate the design principle that the dimensions and format
>+    of the mipmap array are immutable. B does not so much modify the
>+    dimension and formats as replace them with an entirely different
>+    set.
>+
>+    21. Should there be a single function for specifying 1D, 2D and 3D
>+    targets?
>+
>+    RESOLVED. No, we will stick with existing precedent.
>+
>+    22. Is it possible to use GenerateMipmap with an incomplete mipmap
>+    pyramid?
>+
>+    RESOLVED. Yes, because the effective max level is limited to the
>+    levels that were specified, and so GenerateMipmap does not generate
>+    any new levels.
>+
>+    However, to make automatic mipmap generation work, it is necessary
>+    to redefine p rather than q, since automatic mipmap generation
>+    ignores the max level.
>+
>+    23. How should this extension interact with
>+    OES_compressed_paletted_texture?
>+
>+    RESOLVED. Paletted textures will not be permitted, and will
>+    generate INVALID_ENUM.
>+
>+    DISCUSSION: OES_compressed_paletted_texture supplies all the mipmaps
>+    in a single function call, with the palette specified once. That's
>+    incompatible with the upload model in this extension.
>+
>+    24. How can ETC1 textures be used with this extension?
>+
>+    RESOLVED. Add language in this extension to allow subregion uploads
>+    for ETC1.
>+
>+    DISCUSSION: GL_OES_compressed_ETC1_RGB8_texture doesn't allow
>+    CompressedTexSubImage*, so it would be impossible to use this
>+    extension with ETC1. This is seen as an oversight in the ETC1
>+    extension. While it cannot be fixed in that extension (since it is
>+    already shipping), this extension can add that capability.
>+
>+    25. Should any other compressed formats be similarly modified?
>+
>+    RESOLVED. Yes, AMD_compressed_ATC_texture and
>+    AMD_compressed_3DC_texture can be modified similarly to ETC1
>+    (Maurice Ribble indicated that both formats use 4x4 blocks). Desktop
>+    OpenGL requires that whole-image replacement is supported for any
>+    compressed texture format, and the OpenGL ES extensions
>+    EXT_texture_compression_dxt1 and IMG_texture_compression_pvrtc
>+    already allow whole-image replacement, so it is not necessary to
>+    modify them to be used with this extension.
>+
>+    26. Should these commands be permitted in display lists?
>+
>+    RESOLVED. No.
>+
>+    DISCUSSION: Display lists are most useful for repeating commands,
>+    and TexStorage* commands cannot be repeated because the first call
>+    makes the format immutable.
>+
>+    27. Should these commands accept unsized internal formats?
>+
>+    RESOLVED: No, for both OpenGL and OpenGL ES.
>+
>+    DISCUSSION: normally the <type> parameter to TexImage* can serve as
>+    a hint to select a sized format (and in OpenGL ES, this is the only
>+    mechanism available); since TexStorage* does not have a <type>
>+    parameter, the implementation has no information on which to base a
>+    decision.
>+
>+Revision History
>+
>+    Revision 24, 2011/11/11 (dgkoch)
>+      - Mark complete. Clarify ES clarifications.
>+
>+    Revision 23, 2011/11/10 (dgkoch)
>+      - Add GLES clarifcations and interactions with more GLES extensions
>+
>+    Revision 22, 2011/11/10 (bmerry)
>+      - Update my contact details
>+
>+    Revision 21, 2011/07/25 (bmerry)
>+      - Remove dangling references to MultiTexStorage in Errors section
>+
>+    Revision 20, 2011/07/21 (bmerry)
>+      - Remove dangling reference to <samples> in Errors section
>+
>+    Revision 19, 2011/05/02 (Jon Leech)
>+      - Assign enum value
>+
>+    Revision 18, 2011/01/24 (bmerry)
>+      - Disallow unsized internal formats (oversight in revision 17).
>+
>+    Revision 17, 2011/01/24 (bmerry)
>+      - Added and resolved issue 26.
>+      - Split issue 27 out from issue 15.
>+      - Disallow TexStorage* in display lists.
>+      - Use the term "immutable-format" consistently (bug 7281).
>+
>+    Revision 16, 2010/11/23 (bmerry)
>+      - Disallowed TexStorage on an immutable-format texture
>+        (resolves issue 5).
>+      - Deleted MultiTexStorage* commands (other DSA functions still
>+        unresolved).
>+      - Some minor wording changes suggested by Pat Brown (bug 7002).
>+
>+    Revision 15, 2010/11/09 (bmerry)
>+      - Reopened issue 5.
>+      - Reopened issue 14, pending stabilisation of
>+        ARB_direct_state_access.
>+      - Marked issue 9 resolved, pending any objections.
>+      - Fix references to no object being bound (was meant to refer to
>+        the default object).
>+      - Adding missing pseudocode for TEXTURE_1D_ARRAY.
>+      - Corrected TEXTURE_2D_ARRAY -> TEXTURE_1D_ARRAY in error checks.
>+      - Changed "levels... are removed" to "levels... are reset to their
>+        init state", since desktop GL has per-level state apart from the
>+        texels.
>+      - Miscellaneous wording fixes.
>+
>+    Revision 14, 2010/09/25 (bmerry)
>+      - Add issues 24-25 and alterations to
>+        OES_compressed_ETC1_RGB8_texture, AMD_compressed_ATC_texture and
>+        AMD_compressed_3DC_texture.
>+
>+    Revision 13, 2010/09/19 (bmerry)
>+      - Two typo fixes from Daniel Koch
>+
>+    Revision 12, 2010/09/18 (bmerry)
>+      - Changed resolution to issue 20
>+      - Added and resolved issue 23
>+      - Added explanation of how to upload data (in overview)
>+      - Added spec language to implement resolution to issue 15
>+
>+    Revision 11, 2010/07/21 (bmerry)
>+      - Resolved issue 16
>+      - Reopen issue 20
>+      - Fix some typos
>+
>+    Revision 10, 2010/07/15 (bmerry)
>+      - Update some issues to match core text
>+      - Resolved issue 17
>+
>+    Revision 9, 2010/05/24 (bmerry)
>+      - Marked issue 2 as resolved
>+      - Resolved issue 19 (as no change)
>+      - Resolved issue 20
>+      - Add issues 21-22
>+      - Add in spec language to forbid use on default textures
>+      - Redefine level_base, level_max to be clamped forms of
>+        TEXTURE_BASE_LEVEL/TEXTURE_MAX_LEVEL when using immutable
>+        textures
>+      - Redefine p to also be clamped to the provided levels for
>+        immutable textures, to support automatic mipmap generation
>+      - Removed multisample functions
>+      - Removed language stating that texture parameters were reset to
>+        defaults
>+
>+    Revision 8, 2010/05/18 (bmerry)
>+      - Added issue about EGLimage
>+      - Marked issue 14 as resolved
>+
>+    Revision 7, 2010/05/04 (bmerry)
>+      - Removed some lingering <format>, <type> parameters to the new
>+        functions that should have been removed in revision 4
>+      - Trivial typo fixes
>+
>+    Revision 6, 2010/02/18 (bmerry)
>+      - Resolved issues 5, 6 and 18
>+      - Added MultiTexStorage* functions for DSA interaction
>+      - Added error for texture-target mismatch in DSA
>+      - Allowed TexStorage* to be called again
>+
>+    Revision 5, 2010/01/25 (bmerry)
>+      - Added to contributors list
>+      - Require OpenGL 1.2, to simplify interactions with
>+        TEXTURE_BASE_LEVEL/TEXTURE_MAX_LEVEL and CLAMP_TO_EDGE
>+      - Change default wrap modes to always be CLAMP_TO_EDGE
>+      - Change default filters to always be NEAREST
>+      - Moved language about generating new levels into an interaction,
>+        since it can only happen on OpenGL ES
>+      - Added interaction with EXT_direct_state_access
>+      - Added extra <internalformats> for GL ES when OES_depth_texture,
>+        OES_packed_depth_stencil and EXT_texture_type_2_10_10_10_REV are
>+        present.
>+      - Minor non-functional wording fixes and typos
>+      - Resolved issue 16
>+      - Added issues 17-19
>+
>+    Revision 4, 2010/01/13 (bmerry)
>+      - Changed suffix from ARM to EXT
>+      - Added list of contributors
>+      - Added language to force the texture to always be complete
>+      - Removed <format> and <type> arguments
>+      - Added issues 14-16
>+      - Reopened issue 2
>+      - Reformatted issues to separate resolution and discussion
>+      - Resolved issues 1, 9 and 11-13
>+      - Fixed the max number of levels in a cube map array
>+
>+    Revision 3, 2009/12/17 (bmerry)
>+      - Added missing vendor suffix to TEXTURE_IMMUTABLE_FORMAT_ARM
>+      - Rewritten to against desktop OpenGL
>+      - Added prototypes for 1D and multisample storage functions
>+      - Added issues 8-13
>+
>+    Revision 2, 2009/08/20 (bmerry)
>+      - Resolved issue 2 (no border parameter)
>+      - Resolved issue 4 (metadata becomes immutable)
>+      - Added interaction with OES_texture_cube_map
>+      - Added error if width != height in a cube map
>+      - Added issues 5-7
>+
>+    Revision 1, 2009/05/06 (bmerry)
>+      - First draft
>diff --git a/Source/ThirdParty/ANGLE/extensions/KHR_parallel_shader_compile.txt b/Source/ThirdParty/ANGLE/extensions/KHR_parallel_shader_compile.txt
>new file mode 100644
>index 00000000000..559dc3dca08
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/extensions/KHR_parallel_shader_compile.txt
>@@ -0,0 +1,167 @@
>+Name
>+
>+    KHR_parallel_shader_compile
>+
>+Name Strings
>+
>+    GL_KHR_parallel_shader_compile
>+
>+Contact
>+
>+    Geoff Lang, (geofflang 'at' google.com)
>+
>+Contributors
>+
>+    Timothy Lottes, AMD
>+    Graham Sellers, AMD
>+    Eric Werness, NVIDIA
>+    Geoff Lang, Google
>+    Daniel Koch, NVIDIA
>+
>+Notice
>+
>+    Copyright (c) 2015 The Khronos Group Inc. Copyright terms at
>+        http://www.khronos.org/registry/speccopyright.html
>+
>+Status
>+
>+    Complete
>+
>+Version
>+
>+    Last Modified Date: 2017-04-24
>+    Revision: 2
>+
>+Number
>+
>+    ARB Extension #192
>+    OpenGL ES Extension #288
>+
>+Dependencies
>+
>+    This extension is written against OpenGL 4.5 (CoreProfile) dated
>+    May 28 2015.
>+
>+    OpenGL ES 2.0 is required (for mobile).
>+
>+Overview
>+
>+    Compiling GLSL into implementation-specific code can be a time consuming
>+    process, so a GL implementation may wish to perform the compilation in a
>+    separate CPU thread. This extension provides a mechanism for the application
>+    to provide a hint to limit the number of threads it wants to be used to
>+    compile shaders, as well as a query to determine if the compilation process
>+    is complete.
>+
>+New Procedures and Functions
>+
>+    void MaxShaderCompilerThreadsKHR(uint count);
>+
>+New Tokens
>+
>+    Accepted by the <pname> parameter of GetBooleanv, GetIntegerv,
>+    GetInteger64v, GetFloatv, and GetDoublev:
>+
>+        MAX_SHADER_COMPILER_THREADS_KHR   0x91B0
>+
>+    Accepted as part of the <pname> parameter to GetShaderiv and
>+    accepted as part of the <pname> parameter to GetProgramiv:
>+
>+        COMPLETION_STATUS_KHR             0x91B1
>+
>+IP Status
>+
>+    None.
>+
>+Additions to Chapter 7 "Programs and Shaders",
>+
>+    Append to the end of 7.1 "Shader Objects",
>+
>+        Applications may use the following to hint to the driver the maximum
>+    number background threads it would like to be used in the process of
>+    compiling shaders or linking programs,
>+
>+        void MaxShaderCompilerThreadsKHR(uint count);
>+
>+    where <count> is the number of background threads. A <count> of zero
>+    specifies a request for no parallel compiling or linking and a <count> of
>+    0xFFFFFFFF requests an implementation-specific maximum.
>+
>+    An implementation may combine the maximum compiler thread request from
>+    multiple contexts in a share group in an implementation-specific way.
>+
>+    An application can query the current MaxShaderCompilerThreadsKHR <count>
>+    by calling GetIntegerv with <pname> set to MAX_SHADER_COMPILER_THREADS_KHR,
>+    which returns the value of the current state (Table 23.51).
>+
>+
>+    Add to 7.13 "Shader, Program, and Program Pipeline Queries" under the
>+    descriptions for "pname" for "GetShaderiv",
>+
>+        If <pname> is COMPLETION_STATUS_KHR, TRUE is returned if the shader
>+        compilation has completed, FALSE otherwise.
>+
>+    Add to 7.13 "Shader, Program, and Program Pipeline Queries" under the
>+    descriptions for "pname" for "GetProgramiv",
>+
>+        If <pname> is COMPLETION_STATUS_KHR, TRUE is returned if the program
>+        linking has completed, FALSE otherwise.
>+
>+New State
>+
>+    Add to Table 23.51: Hints
>+    Get Value                        Type  Get Command   Initial Value  Description           Sec
>+    -------------------------------  ----  ------------  -------------  --------------------  ----
>+    MAX_SHADER_COMPILER_THREADS_KHR  Z+    GetIntegerv   0xFFFFFFFF     Max compile threads   7.13
>+
>+    Add to Table 23.32: Program Object State
>+    Get Value               Type  Get Command   Initial Value  Description           Sec
>+    ----------------------  ----  ------------  -------------  --------------------  ----
>+    COMPLETION_STATUS_KHR   B     GetProgramiv  TRUE           Program linking has   7.13
>+                                                               completed
>+
>+    Add to Table 23.30: Shader Object State
>+    Get Value               Type  Get Command   Initial Value  Description           Sec
>+    ---------------------   ----  ------------  -------------  --------------------  ----
>+    COMPLETION_STATUS_KHR   B     GetShaderiv   TRUE           Shader compilation    7.13
>+                                                               has completed
>+
>+Interactions with OpenGL ES
>+
>+    If implemented in OpenGL ES ignore all references to GetDoublev.
>+
>+    If the supported ES version is less than 3.0, ignore all references to
>+    GetInteger64v.
>+
>+Issues
>+
>+    1) Where should the hint state be stored?
>+
>+    UNRESOLVED: Each context has its own value which may be specified and
>+    queried, but an implementation may choose to combine the hints from multiple
>+    contexts in an implementation-specific manner. There isn't really any
>+    precedent for per-share group state.
>+
>+    2) Can we make the requirements more strict?
>+
>+    RESOLVED: We could, but making sure all of the error behavior is correct and
>+    fully specified would likely take more time than we have. This spec allows
>+    an application to clearly request its intent even if there aren't guarantees
>+    that the implementation will exactly obey the request.
>+
>+    3) Does glGetIntegerv(MAX_SHADER_COMPILER_THREADS_KHR) just return the
>+    value set by MaxShaderCompilerThreadsKHR? Or, if the state is 0xFFFFFFFF
>+    ("do something implementation specific"), does it return the number of
>+    threads the implementation has actually chosen to use?
>+
>+    RESOLVED: As with other state queries, this returns the value that was last
>+    set, or if no value was set by the application it returns the default state
>+    value (0xFFFFFFFF).
>+
>+Revision History
>+
>+    Rev  Date        Author    Changes
>+    ---  ----------  --------  ---------------------------------------------
>+      1  2017-03-23  glang     Cast as KHR based on v6 of
>+                               ARB_parallel_shader_compile.
>+      2  2017-04-24  dgkoch    Spec clarifications, add issue 3.
>diff --git a/Source/ThirdParty/ANGLE/gni/angle.gni b/Source/ThirdParty/ANGLE/gni/angle.gni
>new file mode 100644
>index 00000000000..9e76b75e319
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/gni/angle.gni
>@@ -0,0 +1,243 @@
>+# Copyright 2019 The ANGLE Project Authors. All rights reserved.
>+# Use of this source code is governed by a BSD-style license that can be
>+# found in the LICENSE file.
>+
>+import("//build/config/sanitizers/sanitizers.gni")
>+import("//build/config/ui.gni")  # import the use_x11 variable
>+import("//build_overrides/angle.gni")
>+import("//build_overrides/build.gni")
>+import("//testing/test.gni")
>+if (is_android) {
>+  import("//build/config/android/config.gni")
>+}
>+
>+if (build_with_chromium) {
>+  angle_root = "//third_party/angle"
>+
>+  import("//ui/ozone/ozone.gni")
>+} else {
>+  angle_root = "//"
>+
>+  declare_args() {
>+    ozone_platform_gbm = false
>+  }
>+}
>+
>+# Subdirectory to place data files (e.g. layer JSON files).
>+data_dir = "angledata"
>+
>+declare_args() {
>+  if (current_cpu == "arm64" || current_cpu == "x64" ||
>+      current_cpu == "mips64el" || current_cpu == "s390x" ||
>+      current_cpu == "ppc64") {
>+    angle_64bit_current_cpu = true
>+  } else if (current_cpu == "arm" || current_cpu == "x86" ||
>+             current_cpu == "mipsel" || current_cpu == "s390" ||
>+             current_cpu == "ppc") {
>+    angle_64bit_current_cpu = false
>+  } else {
>+    assert(false, "Unknown current CPU: $current_cpu")
>+  }
>+}
>+
>+declare_args() {
>+  if (!is_android) {
>+    ndk_api_level_at_least_26 = false
>+  } else {
>+    ndk_api_level_at_least_26 =
>+        (!angle_64bit_current_cpu && android32_ndk_api_level >= 26) ||
>+        (angle_64bit_current_cpu && android64_ndk_api_level >= 26)
>+  }
>+  angle_shared_libvulkan = false
>+  angle_libs_suffix = ""
>+}
>+
>+declare_args() {
>+  angle_enable_d3d9 = is_win
>+  angle_enable_d3d11 = is_win
>+  angle_enable_gl = (ozone_platform_gbm || !is_linux ||
>+                     (use_x11 && !is_chromeos)) && !is_fuchsia
>+
>+  # ANGLE Vulkan backend on Android requires API level 26, i.e. Oreo, due to
>+  # Vulkan Validation Layers compatibility issues, see http://crrev/c/1405714.
>+  # Otherwise, API level 24 would have been enough.
>+  angle_enable_vulkan = is_win || (is_linux && use_x11 && !is_chromeos) ||
>+                        (is_android && ndk_api_level_at_least_26) || is_fuchsia
>+  angle_enable_null = true
>+  angle_enable_essl = true
>+  angle_enable_glsl = true
>+  angle_force_thread_safety = false
>+}
>+
>+declare_args() {
>+  angle_enable_gl_null = angle_enable_gl
>+  angle_enable_hlsl = angle_enable_d3d9 || angle_enable_d3d11
>+  angle_enable_trace = false
>+
>+  # Disable the layers in ubsan builds because of really slow builds.
>+  angle_enable_vulkan_validation_layers =
>+      angle_enable_vulkan && !is_ubsan && !is_tsan && !is_asan
>+
>+  if (angle_enable_vulkan) {
>+    # Enable Vulkan GPU trace event capability
>+    angle_enable_vulkan_gpu_trace_events = false
>+
>+    # Disallow non-conformant configurations in official builds.
>+    angle_vulkan_conformant_configs_only = is_official_build
>+
>+    # Enable custom (cpu-side) secondary command buffers
>+    angle_enable_custom_vulkan_cmd_buffers = true
>+  }
>+}
>+
>+if (is_win) {
>+  import("//build/config/win/visual_studio_version.gni")
>+}
>+
>+angle_common_configs = [
>+  angle_root + ":extra_warnings",
>+  angle_root + ":internal_config",
>+]
>+
>+angle_remove_configs = [ "//build/config/compiler:default_include_dirs" ]
>+
>+if (is_clang) {
>+  angle_remove_configs += [ "//build/config/clang:find_bad_constructs" ]
>+}
>+
>+set_defaults("angle_executable") {
>+  configs = angle_common_configs
>+  public_configs = []
>+  suppressed_configs = angle_remove_configs
>+}
>+
>+set_defaults("angle_shared_library") {
>+  configs = angle_common_configs
>+  public_configs = []
>+  suppressed_configs = angle_remove_configs
>+}
>+
>+set_defaults("angle_source_set") {
>+  configs = angle_common_configs
>+  public_configs = []
>+  suppressed_configs = angle_remove_configs
>+}
>+
>+set_defaults("angle_static_library") {
>+  configs = angle_common_configs
>+  public_configs = []
>+  suppressed_configs = angle_remove_configs
>+}
>+
>+set_defaults("angle_test") {
>+  configs = angle_common_configs
>+  public_configs = []
>+  suppressed_configs = angle_remove_configs
>+}
>+
>+template("angle_executable") {
>+  executable(target_name) {
>+    forward_variables_from(invoker,
>+                           "*",
>+                           [
>+                             "configs",
>+                             "suppressed_configs",
>+                             "visibility",
>+                           ])
>+
>+    # Needed because visibility is global.
>+    forward_variables_from(invoker, [ "visibility" ])
>+
>+    configs += invoker.configs
>+    configs -= invoker.suppressed_configs
>+  }
>+}
>+
>+template("angle_shared_library") {
>+  shared_library(target_name) {
>+    forward_variables_from(invoker,
>+                           "*",
>+                           [
>+                             "configs",
>+                             "suppressed_configs",
>+                             "visibility",
>+                           ])
>+
>+    # Needed because visibility is global.
>+    forward_variables_from(invoker, [ "visibility" ])
>+
>+    configs += invoker.configs
>+    configs -= invoker.suppressed_configs
>+
>+    public_configs += [ angle_root + ":shared_library_public_config" ]
>+
>+    if (is_android) {
>+      configs += [ angle_root + ":build_id_config" ]
>+      configs -= [ "//build/config/android:hide_all_but_jni_onload" ]
>+    }
>+  }
>+}
>+
>+template("angle_source_set") {
>+  source_set(target_name) {
>+    forward_variables_from(invoker,
>+                           "*",
>+                           [
>+                             "configs",
>+                             "suppressed_configs",
>+                             "visibility",
>+                           ])
>+
>+    # Needed because visibility is global.
>+    forward_variables_from(invoker, [ "visibility" ])
>+
>+    configs += invoker.configs
>+    configs -= invoker.suppressed_configs
>+  }
>+}
>+
>+template("angle_static_library") {
>+  static_library(target_name) {
>+    forward_variables_from(invoker,
>+                           "*",
>+                           [
>+                             "configs",
>+                             "suppressed_configs",
>+                             "visibility",
>+                           ])
>+
>+    # Needed because visibility is global.
>+    forward_variables_from(invoker, [ "visibility" ])
>+
>+    configs += invoker.configs
>+    configs -= invoker.suppressed_configs
>+  }
>+}
>+
>+template("angle_test") {
>+  test(target_name) {
>+    forward_variables_from(invoker,
>+                           "*",
>+                           [
>+                             "configs",
>+                             "suppressed_configs",
>+                             "visibility",
>+                           ])
>+
>+    # Needed because visibility is global.
>+    forward_variables_from(invoker, [ "visibility" ])
>+
>+    configs += invoker.configs
>+    configs -= invoker.suppressed_configs
>+
>+    if (is_linux && !is_component_build) {
>+      # Set rpath to find shared libs in a non-component build.
>+      configs += [ "//build/config/gcc:rpath_for_built_shared_libraries" ]
>+    }
>+
>+    if (is_android) {
>+      configs += [ angle_root + ":build_id_config" ]
>+      configs -= [ "//build/config/android:hide_all_but_jni" ]
>+    }
>+  }
>+}
>diff --git a/Source/ThirdParty/ANGLE/include/CMakeLists.txt b/Source/ThirdParty/ANGLE/include/CMakeLists.txt
>new file mode 100644
>index 00000000000..7249db38444
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/include/CMakeLists.txt
>@@ -0,0 +1,59 @@
>+set(egl_headers
>+    EGL/egl.h
>+    EGL/eglext.h
>+    EGL/eglext_angle.h
>+    EGL/eglplatform.h
>+)
>+
>+set(gles_headers
>+    GLES/egl.h
>+    GLES/gl.h
>+    GLES/glext.h
>+    GLES/glext_explicit_context_autogen.inc
>+    GLES/glext_angle.h
>+    GLES/glplatform.h
>+)
>+
>+set(gles2_headers
>+    GLES2/gl2.h
>+    GLES2/gl2ext.h
>+    GLES2/gl2ext_explicit_context_autogen.inc
>+    GLES2/gl2ext_angle.h
>+    GLES2/gl2platform.h
>+)
>+
>+set(gles3_headers
>+    GLES3/gl3.h
>+    GLES3/gl3ext_explicit_context_autogen.inc
>+    GLES3/gl31.h
>+    GLES3/gl31ext_explicit_context_autogen.inc
>+    GLES3/gl32.h
>+    GLES3/gl3platform.h
>+)
>+
>+set(glslang_headers
>+    GLSLANG/ShaderLang.h
>+    GLSLANG/ShaderVars.h
>+)
>+
>+set(khr_headers KHR/khrplatform.h)
>+
>+# All ports require GLSLANG headers
>+set(ANGLE_PUBLIC_HEADERS ${glslang_headers})
>+
>+if (USE_ANGLE_EGL)
>+    list(APPEND ANGLE_PUBLIC_HEADERS
>+        ${egl_headers}
>+        ${gles_headers}
>+        ${gles2_headers}
>+        ${gles3_headers}
>+        ${khr_headers}
>+    )
>+elseif (NOT USE_EGL)
>+    list(APPEND ANGLE_PUBLIC_HEADERS ${khr_headers})
>+endif ()
>+
>+WEBKIT_COPY_FILES(ANGLEHeaders
>+    DESTINATION ${ANGLE_FRAMEWORK_HEADERS_DIR}
>+    FILES ${ANGLE_PUBLIC_HEADERS}
>+)
>diff --git a/Source/ThirdParty/ANGLE/include/EGL/.clang-format b/Source/ThirdParty/ANGLE/include/EGL/.clang-format
>new file mode 100644
>index 00000000000..06147100144
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/include/EGL/.clang-format
>@@ -0,0 +1,3 @@
>+
>+
>+DisableFormat: true
>diff --git a/Source/ThirdParty/ANGLE/include/EGL/README.md b/Source/ThirdParty/ANGLE/include/EGL/README.md
>new file mode 100644
>index 00000000000..519ef3e9b74
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/include/EGL/README.md
>@@ -0,0 +1,19 @@
>+#  ANGLE EGL Headers
>+
>+The EGL headers ANGLE uses are generated using the Khronos tools but modified to include function pointer types and function prototype guards.
>+
>+### Regenerating EGL.h
>+
>+1. Install **Python 3** (not 2) with the **lxml** addon. You can do this using `pip install lxml` from your Python's Scripts folder.
>+1. Clone [https://github.com/KhronosGroup/EGL-Registry.git](https://github.com/KhronosGroup/EGL-Registry.git).
>+1. Edit `EGL-Registry/api/genheaders.py`:
>+
>+   1. Look for the section titled `# EGL API - EGL/egl.h (no function pointers, yet @@@)`
>+   1. Change `genFuncPointers   = False,` to `genFuncPointers   = True,`
>+   1. Change `protectProto      = False,` to `protectProto      = 'nonzero',`
>+   1. Change `protectProtoStr   = 'EGL_EGLEXT_PROTOTYPES',` to `protectProtoStr   = 'EGL_EGL_PROTOTYPES',`
>+
>+1. Set your working directory to `EGL-Registry/api/`.
>+1. Run `python genheaders.py -registry egl.xml EGL/egl.h`
>+1. The generated header will now be in `EGL-Registry/api/EGL/egl.h`. You can copy the header over to this folder.
>+1. Also update `scripts/egl.xml` with the latest version from `EGL-Registry/api/`.
>diff --git a/Source/ThirdParty/ANGLE/include/EGL/egl.h b/Source/ThirdParty/ANGLE/include/EGL/egl.h
>index 29f30d94de1..21cb210d235 100644
>--- a/Source/ThirdParty/ANGLE/include/EGL/egl.h
>+++ b/Source/ThirdParty/ANGLE/include/EGL/egl.h
>@@ -28,17 +28,17 @@ extern "C" {
> ** MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
> */
> /*
>-** This header is generated from the Khronos OpenGL / OpenGL ES XML
>-** API Registry. The current version of the Registry, generator scripts
>+** This header is generated from the Khronos EGL XML API Registry.
>+** The current version of the Registry, generator scripts
> ** used to make the header, and the header can be found at
>-**   http://www.opengl.org/registry/egl
>+**   http://www.khronos.org/registry/egl
> **
>-** Khronos $Revision$ on $Date$
>+** Khronos $Git commit SHA1: 4136522c4d $ on $Git commit date: 2018-12-06 03:51:22 -0800 $
> */
> 
> #include <EGL/eglplatform.h>
> 
>-/* Generated on date 20161230 */
>+/* Generated on date 20181214 */
> 
> /* Generated C header for:
>  * API: egl
>@@ -53,8 +53,8 @@ extern "C" {
> #define EGL_VERSION_1_0 1
> typedef unsigned int EGLBoolean;
> typedef void *EGLDisplay;
>-#include <KHR/khrplatform.h>
> #include <EGL/eglplatform.h>
>+#include <KHR/khrplatform.h>
> typedef void *EGLConfig;
> typedef void *EGLSurface;
> typedef void *EGLContext;
>@@ -118,6 +118,31 @@ typedef void (*__eglMustCastToProperFunctionPointerType)(void);
> #define EGL_VERSION                       0x3054
> #define EGL_WIDTH                         0x3057
> #define EGL_WINDOW_BIT                    0x0004
>+typedef EGLBoolean (EGLAPIENTRYP PFNEGLCHOOSECONFIGPROC) (EGLDisplay dpy, const EGLint *attrib_list, EGLConfig *configs, EGLint config_size, EGLint *num_config);
>+typedef EGLBoolean (EGLAPIENTRYP PFNEGLCOPYBUFFERSPROC) (EGLDisplay dpy, EGLSurface surface, EGLNativePixmapType target);
>+typedef EGLContext (EGLAPIENTRYP PFNEGLCREATECONTEXTPROC) (EGLDisplay dpy, EGLConfig config, EGLContext share_context, const EGLint *attrib_list);
>+typedef EGLSurface (EGLAPIENTRYP PFNEGLCREATEPBUFFERSURFACEPROC) (EGLDisplay dpy, EGLConfig config, const EGLint *attrib_list);
>+typedef EGLSurface (EGLAPIENTRYP PFNEGLCREATEPIXMAPSURFACEPROC) (EGLDisplay dpy, EGLConfig config, EGLNativePixmapType pixmap, const EGLint *attrib_list);
>+typedef EGLSurface (EGLAPIENTRYP PFNEGLCREATEWINDOWSURFACEPROC) (EGLDisplay dpy, EGLConfig config, EGLNativeWindowType win, const EGLint *attrib_list);
>+typedef EGLBoolean (EGLAPIENTRYP PFNEGLDESTROYCONTEXTPROC) (EGLDisplay dpy, EGLContext ctx);
>+typedef EGLBoolean (EGLAPIENTRYP PFNEGLDESTROYSURFACEPROC) (EGLDisplay dpy, EGLSurface surface);
>+typedef EGLBoolean (EGLAPIENTRYP PFNEGLGETCONFIGATTRIBPROC) (EGLDisplay dpy, EGLConfig config, EGLint attribute, EGLint *value);
>+typedef EGLBoolean (EGLAPIENTRYP PFNEGLGETCONFIGSPROC) (EGLDisplay dpy, EGLConfig *configs, EGLint config_size, EGLint *num_config);
>+typedef EGLDisplay (EGLAPIENTRYP PFNEGLGETCURRENTDISPLAYPROC) (void);
>+typedef EGLSurface (EGLAPIENTRYP PFNEGLGETCURRENTSURFACEPROC) (EGLint readdraw);
>+typedef EGLDisplay (EGLAPIENTRYP PFNEGLGETDISPLAYPROC) (EGLNativeDisplayType display_id);
>+typedef EGLint (EGLAPIENTRYP PFNEGLGETERRORPROC) (void);
>+typedef __eglMustCastToProperFunctionPointerType (EGLAPIENTRYP PFNEGLGETPROCADDRESSPROC) (const char *procname);
>+typedef EGLBoolean (EGLAPIENTRYP PFNEGLINITIALIZEPROC) (EGLDisplay dpy, EGLint *major, EGLint *minor);
>+typedef EGLBoolean (EGLAPIENTRYP PFNEGLMAKECURRENTPROC) (EGLDisplay dpy, EGLSurface draw, EGLSurface read, EGLContext ctx);
>+typedef EGLBoolean (EGLAPIENTRYP PFNEGLQUERYCONTEXTPROC) (EGLDisplay dpy, EGLContext ctx, EGLint attribute, EGLint *value);
>+typedef const char *(EGLAPIENTRYP PFNEGLQUERYSTRINGPROC) (EGLDisplay dpy, EGLint name);
>+typedef EGLBoolean (EGLAPIENTRYP PFNEGLQUERYSURFACEPROC) (EGLDisplay dpy, EGLSurface surface, EGLint attribute, EGLint *value);
>+typedef EGLBoolean (EGLAPIENTRYP PFNEGLSWAPBUFFERSPROC) (EGLDisplay dpy, EGLSurface surface);
>+typedef EGLBoolean (EGLAPIENTRYP PFNEGLTERMINATEPROC) (EGLDisplay dpy);
>+typedef EGLBoolean (EGLAPIENTRYP PFNEGLWAITGLPROC) (void);
>+typedef EGLBoolean (EGLAPIENTRYP PFNEGLWAITNATIVEPROC) (EGLint engine);
>+#if EGL_EGL_PROTOTYPES
> EGLAPI EGLBoolean EGLAPIENTRY eglChooseConfig (EGLDisplay dpy, const EGLint *attrib_list, EGLConfig *configs, EGLint config_size, EGLint *num_config);
> EGLAPI EGLBoolean EGLAPIENTRY eglCopyBuffers (EGLDisplay dpy, EGLSurface surface, EGLNativePixmapType target);
> EGLAPI EGLContext EGLAPIENTRY eglCreateContext (EGLDisplay dpy, EGLConfig config, EGLContext share_context, const EGLint *attrib_list);
>@@ -142,6 +167,7 @@ EGLAPI EGLBoolean EGLAPIENTRY eglSwapBuffers (EGLDisplay dpy, EGLSurface surface
> EGLAPI EGLBoolean EGLAPIENTRY eglTerminate (EGLDisplay dpy);
> EGLAPI EGLBoolean EGLAPIENTRY eglWaitGL (void);
> EGLAPI EGLBoolean EGLAPIENTRY eglWaitNative (EGLint engine);
>+#endif
> #endif /* EGL_VERSION_1_0 */
> 
> #ifndef EGL_VERSION_1_1
>@@ -160,10 +186,16 @@ EGLAPI EGLBoolean EGLAPIENTRY eglWaitNative (EGLint engine);
> #define EGL_TEXTURE_RGB                   0x305D
> #define EGL_TEXTURE_RGBA                  0x305E
> #define EGL_TEXTURE_TARGET                0x3081
>+typedef EGLBoolean (EGLAPIENTRYP PFNEGLBINDTEXIMAGEPROC) (EGLDisplay dpy, EGLSurface surface, EGLint buffer);
>+typedef EGLBoolean (EGLAPIENTRYP PFNEGLRELEASETEXIMAGEPROC) (EGLDisplay dpy, EGLSurface surface, EGLint buffer);
>+typedef EGLBoolean (EGLAPIENTRYP PFNEGLSURFACEATTRIBPROC) (EGLDisplay dpy, EGLSurface surface, EGLint attribute, EGLint value);
>+typedef EGLBoolean (EGLAPIENTRYP PFNEGLSWAPINTERVALPROC) (EGLDisplay dpy, EGLint interval);
>+#if EGL_EGL_PROTOTYPES
> EGLAPI EGLBoolean EGLAPIENTRY eglBindTexImage (EGLDisplay dpy, EGLSurface surface, EGLint buffer);
> EGLAPI EGLBoolean EGLAPIENTRY eglReleaseTexImage (EGLDisplay dpy, EGLSurface surface, EGLint buffer);
> EGLAPI EGLBoolean EGLAPIENTRY eglSurfaceAttrib (EGLDisplay dpy, EGLSurface surface, EGLint attribute, EGLint value);
> EGLAPI EGLBoolean EGLAPIENTRY eglSwapInterval (EGLDisplay dpy, EGLint interval);
>+#endif
> #endif /* EGL_VERSION_1_1 */
> 
> #ifndef EGL_VERSION_1_2
>@@ -199,11 +231,18 @@ typedef void *EGLClientBuffer;
> #define EGL_SWAP_BEHAVIOR                 0x3093
> #define EGL_UNKNOWN                       EGL_CAST(EGLint,-1)
> #define EGL_VERTICAL_RESOLUTION           0x3091
>+typedef EGLBoolean (EGLAPIENTRYP PFNEGLBINDAPIPROC) (EGLenum api);
>+typedef EGLenum (EGLAPIENTRYP PFNEGLQUERYAPIPROC) (void);
>+typedef EGLSurface (EGLAPIENTRYP PFNEGLCREATEPBUFFERFROMCLIENTBUFFERPROC) (EGLDisplay dpy, EGLenum buftype, EGLClientBuffer buffer, EGLConfig config, const EGLint *attrib_list);
>+typedef EGLBoolean (EGLAPIENTRYP PFNEGLRELEASETHREADPROC) (void);
>+typedef EGLBoolean (EGLAPIENTRYP PFNEGLWAITCLIENTPROC) (void);
>+#if EGL_EGL_PROTOTYPES
> EGLAPI EGLBoolean EGLAPIENTRY eglBindAPI (EGLenum api);
> EGLAPI EGLenum EGLAPIENTRY eglQueryAPI (void);
> EGLAPI EGLSurface EGLAPIENTRY eglCreatePbufferFromClientBuffer (EGLDisplay dpy, EGLenum buftype, EGLClientBuffer buffer, EGLConfig config, const EGLint *attrib_list);
> EGLAPI EGLBoolean EGLAPIENTRY eglReleaseThread (void);
> EGLAPI EGLBoolean EGLAPIENTRY eglWaitClient (void);
>+#endif
> #endif /* EGL_VERSION_1_2 */
> 
> #ifndef EGL_VERSION_1_3
>@@ -232,7 +271,10 @@ EGLAPI EGLBoolean EGLAPIENTRY eglWaitClient (void);
> #define EGL_OPENGL_API                    0x30A2
> #define EGL_OPENGL_BIT                    0x0008
> #define EGL_SWAP_BEHAVIOR_PRESERVED_BIT   0x0400
>+typedef EGLContext (EGLAPIENTRYP PFNEGLGETCURRENTCONTEXTPROC) (void);
>+#if EGL_EGL_PROTOTYPES
> EGLAPI EGLContext EGLAPIENTRY eglGetCurrentContext (void);
>+#endif
> #endif /* EGL_VERSION_1_4 */
> 
> #ifndef EGL_VERSION_1_5
>@@ -284,6 +326,17 @@ typedef void *EGLImage;
> #define EGL_GL_TEXTURE_CUBE_MAP_NEGATIVE_Z 0x30B8
> #define EGL_IMAGE_PRESERVED               0x30D2
> #define EGL_NO_IMAGE                      EGL_CAST(EGLImage,0)
>+typedef EGLSync (EGLAPIENTRYP PFNEGLCREATESYNCPROC) (EGLDisplay dpy, EGLenum type, const EGLAttrib *attrib_list);
>+typedef EGLBoolean (EGLAPIENTRYP PFNEGLDESTROYSYNCPROC) (EGLDisplay dpy, EGLSync sync);
>+typedef EGLint (EGLAPIENTRYP PFNEGLCLIENTWAITSYNCPROC) (EGLDisplay dpy, EGLSync sync, EGLint flags, EGLTime timeout);
>+typedef EGLBoolean (EGLAPIENTRYP PFNEGLGETSYNCATTRIBPROC) (EGLDisplay dpy, EGLSync sync, EGLint attribute, EGLAttrib *value);
>+typedef EGLImage (EGLAPIENTRYP PFNEGLCREATEIMAGEPROC) (EGLDisplay dpy, EGLContext ctx, EGLenum target, EGLClientBuffer buffer, const EGLAttrib *attrib_list);
>+typedef EGLBoolean (EGLAPIENTRYP PFNEGLDESTROYIMAGEPROC) (EGLDisplay dpy, EGLImage image);
>+typedef EGLDisplay (EGLAPIENTRYP PFNEGLGETPLATFORMDISPLAYPROC) (EGLenum platform, void *native_display, const EGLAttrib *attrib_list);
>+typedef EGLSurface (EGLAPIENTRYP PFNEGLCREATEPLATFORMWINDOWSURFACEPROC) (EGLDisplay dpy, EGLConfig config, void *native_window, const EGLAttrib *attrib_list);
>+typedef EGLSurface (EGLAPIENTRYP PFNEGLCREATEPLATFORMPIXMAPSURFACEPROC) (EGLDisplay dpy, EGLConfig config, void *native_pixmap, const EGLAttrib *attrib_list);
>+typedef EGLBoolean (EGLAPIENTRYP PFNEGLWAITSYNCPROC) (EGLDisplay dpy, EGLSync sync, EGLint flags);
>+#if EGL_EGL_PROTOTYPES
> EGLAPI EGLSync EGLAPIENTRY eglCreateSync (EGLDisplay dpy, EGLenum type, const EGLAttrib *attrib_list);
> EGLAPI EGLBoolean EGLAPIENTRY eglDestroySync (EGLDisplay dpy, EGLSync sync);
> EGLAPI EGLint EGLAPIENTRY eglClientWaitSync (EGLDisplay dpy, EGLSync sync, EGLint flags, EGLTime timeout);
>@@ -294,6 +347,7 @@ EGLAPI EGLDisplay EGLAPIENTRY eglGetPlatformDisplay (EGLenum platform, void *nat
> EGLAPI EGLSurface EGLAPIENTRY eglCreatePlatformWindowSurface (EGLDisplay dpy, EGLConfig config, void *native_window, const EGLAttrib *attrib_list);
> EGLAPI EGLSurface EGLAPIENTRY eglCreatePlatformPixmapSurface (EGLDisplay dpy, EGLConfig config, void *native_pixmap, const EGLAttrib *attrib_list);
> EGLAPI EGLBoolean EGLAPIENTRY eglWaitSync (EGLDisplay dpy, EGLSync sync, EGLint flags);
>+#endif
> #endif /* EGL_VERSION_1_5 */
> 
> #ifdef __cplusplus
>diff --git a/Source/ThirdParty/ANGLE/include/EGL/eglext.h b/Source/ThirdParty/ANGLE/include/EGL/eglext.h
>index 79f6ccd418d..87e9d90ca36 100644
>--- a/Source/ThirdParty/ANGLE/include/EGL/eglext.h
>+++ b/Source/ThirdParty/ANGLE/include/EGL/eglext.h
>@@ -33,12 +33,12 @@ extern "C" {
> ** used to make the header, and the header can be found at
> **   http://www.khronos.org/registry/egl
> **
>-** Khronos $Git commit SHA1: a732b061e7 $ on $Git commit date: 2017-06-17 23:27:53 +0100 $
>+** Khronos $Git commit SHA1: bae3518c48 $ on $Git commit date: 2018-05-17 10:56:57 -0700 $
> */
> 
> #include <EGL/eglplatform.h>
> 
>-#define EGL_EGLEXT_VERSION 20170627
>+#define EGL_EGLEXT_VERSION 20180517
> 
> /* Generated C header for:
>  * API: egl
>@@ -495,6 +495,47 @@ EGLAPI EGLClientBuffer EGLAPIENTRY eglCreateNativeClientBufferANDROID (const EGL
> #define EGL_FRONT_BUFFER_AUTO_REFRESH_ANDROID 0x314C
> #endif /* EGL_ANDROID_front_buffer_auto_refresh */
> 
>+#ifndef EGL_ANDROID_get_frame_timestamps
>+#define EGL_ANDROID_get_frame_timestamps 1
>+typedef khronos_stime_nanoseconds_t EGLnsecsANDROID;
>+#define EGL_TIMESTAMP_PENDING_ANDROID     EGL_CAST(EGLnsecsANDROID,-2)
>+#define EGL_TIMESTAMP_INVALID_ANDROID     EGL_CAST(EGLnsecsANDROID,-1)
>+#define EGL_TIMESTAMPS_ANDROID            0x3430
>+#define EGL_COMPOSITE_DEADLINE_ANDROID    0x3431
>+#define EGL_COMPOSITE_INTERVAL_ANDROID    0x3432
>+#define EGL_COMPOSITE_TO_PRESENT_LATENCY_ANDROID 0x3433
>+#define EGL_REQUESTED_PRESENT_TIME_ANDROID 0x3434
>+#define EGL_RENDERING_COMPLETE_TIME_ANDROID 0x3435
>+#define EGL_COMPOSITION_LATCH_TIME_ANDROID 0x3436
>+#define EGL_FIRST_COMPOSITION_START_TIME_ANDROID 0x3437
>+#define EGL_LAST_COMPOSITION_START_TIME_ANDROID 0x3438
>+#define EGL_FIRST_COMPOSITION_GPU_FINISHED_TIME_ANDROID 0x3439
>+#define EGL_DISPLAY_PRESENT_TIME_ANDROID  0x343A
>+#define EGL_DEQUEUE_READY_TIME_ANDROID    0x343B
>+#define EGL_READS_DONE_TIME_ANDROID       0x343C
>+typedef EGLBoolean (EGLAPIENTRYP PFNEGLGETCOMPOSITORTIMINGSUPPORTEDANDROIDPROC) (EGLDisplay dpy, EGLSurface surface, EGLint name);
>+typedef EGLBoolean (EGLAPIENTRYP PFNEGLGETCOMPOSITORTIMINGANDROIDPROC) (EGLDisplay dpy, EGLSurface surface, EGLint numTimestamps,  const EGLint *names, EGLnsecsANDROID *values);
>+typedef EGLBoolean (EGLAPIENTRYP PFNEGLGETNEXTFRAMEIDANDROIDPROC) (EGLDisplay dpy, EGLSurface surface, EGLuint64KHR *frameId);
>+typedef EGLBoolean (EGLAPIENTRYP PFNEGLGETFRAMETIMESTAMPSUPPORTEDANDROIDPROC) (EGLDisplay dpy, EGLSurface surface, EGLint timestamp);
>+typedef EGLBoolean (EGLAPIENTRYP PFNEGLGETFRAMETIMESTAMPSANDROIDPROC) (EGLDisplay dpy, EGLSurface surface, EGLuint64KHR frameId, EGLint numTimestamps,  const EGLint *timestamps, EGLnsecsANDROID *values);
>+#ifdef EGL_EGLEXT_PROTOTYPES
>+EGLAPI EGLBoolean EGLAPIENTRY eglGetCompositorTimingSupportedANDROID (EGLDisplay dpy, EGLSurface surface, EGLint name);
>+EGLAPI EGLBoolean EGLAPIENTRY eglGetCompositorTimingANDROID (EGLDisplay dpy, EGLSurface surface, EGLint numTimestamps,  const EGLint *names, EGLnsecsANDROID *values);
>+EGLAPI EGLBoolean EGLAPIENTRY eglGetNextFrameIdANDROID (EGLDisplay dpy, EGLSurface surface, EGLuint64KHR *frameId);
>+EGLAPI EGLBoolean EGLAPIENTRY eglGetFrameTimestampSupportedANDROID (EGLDisplay dpy, EGLSurface surface, EGLint timestamp);
>+EGLAPI EGLBoolean EGLAPIENTRY eglGetFrameTimestampsANDROID (EGLDisplay dpy, EGLSurface surface, EGLuint64KHR frameId, EGLint numTimestamps,  const EGLint *timestamps, EGLnsecsANDROID *values);
>+#endif
>+#endif /* EGL_ANDROID_get_frame_timestamps */
>+
>+#ifndef EGL_ANDROID_get_native_client_buffer
>+#define EGL_ANDROID_get_native_client_buffer 1
>+struct AHardwareBuffer;
>+typedef EGLClientBuffer (EGLAPIENTRYP PFNEGLGETNATIVECLIENTBUFFERANDROIDPROC) (const struct AHardwareBuffer *buffer);
>+#ifdef EGL_EGLEXT_PROTOTYPES
>+EGLAPI EGLClientBuffer EGLAPIENTRY eglGetNativeClientBufferANDROID (const struct AHardwareBuffer *buffer);
>+#endif
>+#endif /* EGL_ANDROID_get_native_client_buffer */
>+
> #ifndef EGL_ANDROID_image_native_buffer
> #define EGL_ANDROID_image_native_buffer 1
> #define EGL_NATIVE_BUFFER_ANDROID         0x3140
>@@ -514,7 +555,6 @@ EGLAPI EGLint EGLAPIENTRY eglDupNativeFenceFDANDROID (EGLDisplay dpy, EGLSyncKHR
> 
> #ifndef EGL_ANDROID_presentation_time
> #define EGL_ANDROID_presentation_time 1
>-typedef khronos_stime_nanoseconds_t EGLnsecsANDROID;
> typedef EGLBoolean (EGLAPIENTRYP PFNEGLPRESENTATIONTIMEANDROIDPROC) (EGLDisplay dpy, EGLSurface surface, EGLnsecsANDROID time);
> #ifdef EGL_EGLEXT_PROTOTYPES
> EGLAPI EGLBoolean EGLAPIENTRY eglPresentationTimeANDROID (EGLDisplay dpy, EGLSurface surface, EGLnsecsANDROID time);
>@@ -578,6 +618,16 @@ EGLAPI EGLBoolean EGLAPIENTRY eglQuerySurfacePointerANGLE (EGLDisplay dpy, EGLSu
> #define EGL_EXT_client_extensions 1
> #endif /* EGL_EXT_client_extensions */
> 
>+#ifndef EGL_EXT_client_sync
>+#define EGL_EXT_client_sync 1
>+#define EGL_SYNC_CLIENT_EXT               0x3364
>+#define EGL_SYNC_CLIENT_SIGNAL_EXT        0x3365
>+typedef EGLBoolean (EGLAPIENTRYP PFNEGLCLIENTSIGNALSYNCEXTPROC) (EGLDisplay dpy, EGLSync sync, const EGLAttrib *attrib_list);
>+#ifdef EGL_EGLEXT_PROTOTYPES
>+EGLAPI EGLBoolean EGLAPIENTRY eglClientSignalSyncEXT (EGLDisplay dpy, EGLSync sync, const EGLAttrib *attrib_list);
>+#endif
>+#endif /* EGL_EXT_client_sync */
>+
> #ifndef EGL_EXT_compositor
> #define EGL_EXT_compositor 1
> #define EGL_PRIMARY_COMPOSITOR_CONTEXT_EXT 0x3460
>@@ -723,6 +773,11 @@ EGLAPI EGLBoolean EGLAPIENTRY eglQueryDmaBufModifiersEXT (EGLDisplay dpy, EGLint
> #endif
> #endif /* EGL_EXT_image_dma_buf_import_modifiers */
> 
>+#ifndef EGL_EXT_image_gl_colorspace
>+#define EGL_EXT_image_gl_colorspace 1
>+#define EGL_GL_COLORSPACE_DEFAULT_EXT     0x314D
>+#endif /* EGL_EXT_image_gl_colorspace */
>+
> #ifndef EGL_EXT_image_implicit_sync_control
> #define EGL_EXT_image_implicit_sync_control 1
> #define EGL_IMPORT_SYNC_TYPE_EXT          0x3470
>@@ -858,6 +913,14 @@ EGLAPI EGLBoolean EGLAPIENTRY eglSwapBuffersWithDamageEXT (EGLDisplay dpy, EGLSu
> #endif
> #endif /* EGL_EXT_swap_buffers_with_damage */
> 
>+#ifndef EGL_EXT_sync_reuse
>+#define EGL_EXT_sync_reuse 1
>+typedef EGLBoolean (EGLAPIENTRYP PFNEGLUNSIGNALSYNCEXTPROC) (EGLDisplay dpy, EGLSync sync, const EGLAttrib *attrib_list);
>+#ifdef EGL_EGLEXT_PROTOTYPES
>+EGLAPI EGLBoolean EGLAPIENTRY eglUnsignalSyncEXT (EGLDisplay dpy, EGLSync sync, const EGLAttrib *attrib_list);
>+#endif
>+#endif /* EGL_EXT_sync_reuse */
>+
> #ifndef EGL_EXT_yuv_surface
> #define EGL_EXT_yuv_surface 1
> #define EGL_YUV_ORDER_EXT                 0x3301
>@@ -933,6 +996,7 @@ EGLAPI EGLSurface EGLAPIENTRY eglCreatePixmapSurfaceHI (EGLDisplay dpy, EGLConfi
> #define EGL_DRM_BUFFER_STRIDE_MESA        0x31D4
> #define EGL_DRM_BUFFER_USE_SCANOUT_MESA   0x00000001
> #define EGL_DRM_BUFFER_USE_SHARE_MESA     0x00000002
>+#define EGL_DRM_BUFFER_USE_CURSOR_MESA    0x00000004
> typedef EGLImageKHR (EGLAPIENTRYP PFNEGLCREATEDRMIMAGEMESAPROC) (EGLDisplay dpy, const EGLint *attrib_list);
> typedef EGLBoolean (EGLAPIENTRYP PFNEGLEXPORTDRMIMAGEMESAPROC) (EGLDisplay dpy, EGLImageKHR image, EGLint *name, EGLint *handle, EGLint *stride);
> #ifdef EGL_EGLEXT_PROTOTYPES
>@@ -987,6 +1051,11 @@ EGLAPI EGLBoolean EGLAPIENTRY eglSwapBuffersRegion2NOK (EGLDisplay dpy, EGLSurfa
> #define EGL_AUTO_STEREO_NV                0x3136
> #endif /* EGL_NV_3dvision_surface */
> 
>+#ifndef EGL_NV_context_priority_realtime
>+#define EGL_NV_context_priority_realtime 1
>+#define EGL_CONTEXT_PRIORITY_REALTIME_NV  0x3357
>+#endif /* EGL_NV_context_priority_realtime */
>+
> #ifndef EGL_NV_coverage_sample
> #define EGL_NV_coverage_sample 1
> #define EGL_COVERAGE_BUFFERS_NV           0x30E0
>@@ -1054,9 +1123,9 @@ EGLAPI EGLBoolean EGLAPIENTRY eglPostSubBufferNV (EGLDisplay dpy, EGLSurface sur
> #define EGL_YUV_PLANE0_TEXTURE_UNIT_NV    0x332C
> #define EGL_YUV_PLANE1_TEXTURE_UNIT_NV    0x332D
> #define EGL_YUV_PLANE2_TEXTURE_UNIT_NV    0x332E
>-typedef EGLBoolean (EGLAPIENTRYP PFNEGLSTREAMCONSUMERGLTEXTUREEXTERNALATTRIBSNVPROC) (EGLDisplay dpy, EGLStreamKHR stream, EGLAttrib *attrib_list);
>+typedef EGLBoolean (EGLAPIENTRYP PFNEGLSTREAMCONSUMERGLTEXTUREEXTERNALATTRIBSNVPROC) (EGLDisplay dpy, EGLStreamKHR stream, const EGLAttrib *attrib_list);
> #ifdef EGL_EGLEXT_PROTOTYPES
>-EGLAPI EGLBoolean EGLAPIENTRY eglStreamConsumerGLTextureExternalAttribsNV (EGLDisplay dpy, EGLStreamKHR stream, EGLAttrib *attrib_list);
>+EGLAPI EGLBoolean EGLAPIENTRY eglStreamConsumerGLTextureExternalAttribsNV (EGLDisplay dpy, EGLStreamKHR stream, const EGLAttrib *attrib_list);
> #endif
> #endif /* EGL_NV_stream_consumer_gltexture_yuv */
> 
>@@ -1096,6 +1165,14 @@ EGLAPI EGLBoolean EGLAPIENTRY eglStreamConsumerGLTextureExternalAttribsNV (EGLDi
> #define EGL_STREAM_FIFO_SYNCHRONOUS_NV    0x3336
> #endif /* EGL_NV_stream_fifo_synchronous */
> 
>+#ifndef EGL_NV_stream_flush
>+#define EGL_NV_stream_flush 1
>+typedef EGLBoolean (EGLAPIENTRYP PFNEGLSTREAMFLUSHNVPROC) (EGLDisplay dpy, EGLStreamKHR stream);
>+#ifdef EGL_EGLEXT_PROTOTYPES
>+EGLAPI EGLBoolean EGLAPIENTRY eglStreamFlushNV (EGLDisplay dpy, EGLStreamKHR stream);
>+#endif
>+#endif /* EGL_NV_stream_flush */
>+
> #ifndef EGL_NV_stream_frame_limits
> #define EGL_NV_stream_frame_limits 1
> #define EGL_PRODUCER_MAX_FRAME_HINT_NV    0x3337
>diff --git a/Source/ThirdParty/ANGLE/include/EGL/eglext_angle.h b/Source/ThirdParty/ANGLE/include/EGL/eglext_angle.h
>index 95f0902838b..86943264133 100644
>--- a/Source/ThirdParty/ANGLE/include/EGL/eglext_angle.h
>+++ b/Source/ThirdParty/ANGLE/include/EGL/eglext_angle.h
>@@ -51,16 +51,17 @@
> #define EGL_PLATFORM_ANGLE_MAX_VERSION_MINOR_ANGLE 0x3205
> #define EGL_PLATFORM_ANGLE_TYPE_DEFAULT_ANGLE 0x3206
> #define EGL_PLATFORM_ANGLE_DEBUG_LAYERS_ENABLED_ANGLE 0x3451
>+#define EGL_PLATFORM_ANGLE_DEVICE_TYPE_ANGLE 0x3209
>+#define EGL_PLATFORM_ANGLE_DEVICE_TYPE_HARDWARE_ANGLE 0x320A
>+#define EGL_PLATFORM_ANGLE_DEVICE_TYPE_NULL_ANGLE 0x345E
> #endif /* EGL_ANGLE_platform_angle */
> 
> #ifndef EGL_ANGLE_platform_angle_d3d
> #define EGL_ANGLE_platform_angle_d3d 1
> #define EGL_PLATFORM_ANGLE_TYPE_D3D9_ANGLE 0x3207
> #define EGL_PLATFORM_ANGLE_TYPE_D3D11_ANGLE 0x3208
>-#define EGL_PLATFORM_ANGLE_DEVICE_TYPE_ANGLE 0x3209
>-#define EGL_PLATFORM_ANGLE_DEVICE_TYPE_HARDWARE_ANGLE 0x320A
>-#define EGL_PLATFORM_ANGLE_DEVICE_TYPE_WARP_ANGLE 0x320B
>-#define EGL_PLATFORM_ANGLE_DEVICE_TYPE_REFERENCE_ANGLE 0x320C
>+#define EGL_PLATFORM_ANGLE_DEVICE_TYPE_D3D_WARP_ANGLE 0x320B
>+#define EGL_PLATFORM_ANGLE_DEVICE_TYPE_D3D_REFERENCE_ANGLE 0x320C
> #define EGL_PLATFORM_ANGLE_ENABLE_AUTOMATIC_TRIM_ANGLE 0x320F
> #endif /* EGL_ANGLE_platform_angle_d3d */
> 
>@@ -68,6 +69,7 @@
> #define EGL_ANGLE_platform_angle_opengl 1
> #define EGL_PLATFORM_ANGLE_TYPE_OPENGL_ANGLE 0x320D
> #define EGL_PLATFORM_ANGLE_TYPE_OPENGLES_ANGLE 0x320E
>+#define EGL_PLATFORM_ANGLE_EGL_HANDLE_ANGLE 0x3480
> #endif /* EGL_ANGLE_platform_angle_opengl */
> 
> #ifndef EGL_ANGLE_platform_angle_null
>@@ -80,6 +82,11 @@
> #define EGL_PLATFORM_ANGLE_TYPE_VULKAN_ANGLE 0x3450
> #endif /* EGL_ANGLE_platform_angle_vulkan */
> 
>+#ifndef EGL_ANGLE_platform_angle_context_virtualization
>+#define EGL_ANGLE_platform_angle_context_virtualization 1
>+#define EGL_PLATFORM_ANGLE_CONTEXT_VIRTUALIZATION_ANGLE 0x3481
>+#endif /* EGL_ANGLE_platform_angle_context_virtualization */
>+
> #ifndef EGL_ANGLE_x11_visual
> #define EGL_ANGLE_x11_visual
> #define EGL_X11_VISUAL_ID_ANGLE 0x33A3
>@@ -105,30 +112,30 @@
> #define EGL_EXPERIMENTAL_PRESENT_PATH_COPY_ANGLE 0x33AA
> #endif /* EGL_ANGLE_experimental_present_path */
> 
>-#ifndef EGL_ANGLE_stream_producer_d3d_texture_nv12
>-#define EGL_ANGLE_stream_producer_d3d_texture_nv12
>+#ifndef EGL_ANGLE_stream_producer_d3d_texture
>+#define EGL_ANGLE_stream_producer_d3d_texture
> #define EGL_D3D_TEXTURE_SUBRESOURCE_ID_ANGLE 0x33AB
>-typedef EGLBoolean(EGLAPIENTRYP PFNEGLCREATESTREAMPRODUCERD3DTEXTURENV12ANGLEPROC)(EGLDisplay dpy, EGLStreamKHR stream, const EGLAttrib *attrib_list);
>-typedef EGLBoolean(EGLAPIENTRYP PFNEGLSTREAMPOSTD3DTEXTURENV12ANGLEPROC)(EGLDisplay dpy, EGLStreamKHR stream, void *texture, const EGLAttrib *attrib_list);
>+typedef EGLBoolean(EGLAPIENTRYP PFNEGLCREATESTREAMPRODUCERD3DTEXTUREANGLEPROC)(EGLDisplay dpy, EGLStreamKHR stream, const EGLAttrib *attrib_list);
>+typedef EGLBoolean(EGLAPIENTRYP PFNEGLSTREAMPOSTD3DTEXTUREANGLEPROC)(EGLDisplay dpy, EGLStreamKHR stream, void *texture, const EGLAttrib *attrib_list);
> #ifdef EGL_EGLEXT_PROTOTYPES
>-EGLAPI EGLBoolean EGLAPIENTRY eglCreateStreamProducerD3DTextureNV12ANGLE(EGLDisplay dpy, EGLStreamKHR stream, const EGLAttrib *attrib_list);
>-EGLAPI EGLBoolean EGLAPIENTRY eglStreamPostD3DTextureNV12ANGLE(EGLDisplay dpy, EGLStreamKHR stream, void *texture, const EGLAttrib *attrib_list);
>+EGLAPI EGLBoolean EGLAPIENTRY eglCreateStreamProducerD3DTextureANGLE(EGLDisplay dpy, EGLStreamKHR stream, const EGLAttrib *attrib_list);
>+EGLAPI EGLBoolean EGLAPIENTRY eglStreamPostD3DTextureANGLE(EGLDisplay dpy, EGLStreamKHR stream, void *texture, const EGLAttrib *attrib_list);
> #endif
>-#endif /* EGL_ANGLE_stream_producer_d3d_texture_nv12 */
>+#endif /* EGL_ANGLE_stream_producer_d3d_texture */
> 
> #ifndef EGL_ANGLE_create_context_webgl_compatibility
> #define EGL_ANGLE_create_context_webgl_compatibility 1
>-#define EGL_CONTEXT_WEBGL_COMPATIBILITY_ANGLE 0x3AAC
>+#define EGL_CONTEXT_WEBGL_COMPATIBILITY_ANGLE 0x33AC
> #endif /* EGL_ANGLE_create_context_webgl_compatibility */
> 
> #ifndef EGL_ANGLE_display_texture_share_group
> #define EGL_ANGLE_display_texture_share_group 1
>-#define EGL_DISPLAY_TEXTURE_SHARE_GROUP_ANGLE 0x3AAF
>+#define EGL_DISPLAY_TEXTURE_SHARE_GROUP_ANGLE 0x33AF
> #endif /* EGL_ANGLE_display_texture_share_group */
> 
> #ifndef EGL_CHROMIUM_create_context_bind_generates_resource
> #define EGL_CHROMIUM_create_context_bind_generates_resource 1
>-#define EGL_CONTEXT_BIND_GENERATES_RESOURCE_CHROMIUM 0x3AAD
>+#define EGL_CONTEXT_BIND_GENERATES_RESOURCE_CHROMIUM 0x33AD
> #endif /* EGL_CHROMIUM_create_context_bind_generates_resource */
> 
> #ifndef EGL_ANGLE_create_context_client_arrays
>@@ -155,7 +162,7 @@ EGLAPI EGLBoolean EGLAPIENTRY eglReleaseDeviceANGLE(EGLDeviceEXT device);
> #define EGL_CONTEXT_PROGRAM_BINARY_CACHE_ENABLED_ANGLE 0x3459
> typedef EGLint (EGLAPIENTRYP PFNEGLPROGRAMCACHEGETATTRIBANGLEPROC) (EGLDisplay dpy, EGLenum attrib);
> typedef void (EGLAPIENTRYP PFNEGLPROGRAMCACHEQUERYANGLEPROC) (EGLDisplay dpy, EGLint index, void *key, EGLint *keysize, void *binary, EGLint *binarysize);
>-typedef void (EGLAPIENTRYP PFNEGPROGRAMCACHELPOPULATEANGLEPROC) (EGLDisplay dpy, const void *key, EGLint keysize, const void *binary, EGLint binarysize);
>+typedef void (EGLAPIENTRYP PFNEGLPROGRAMCACHEPOPULATEANGLEPROC) (EGLDisplay dpy, const void *key, EGLint keysize, const void *binary, EGLint binarysize);
> typedef EGLint (EGLAPIENTRYP PFNEGLPROGRAMCACHERESIZEANGLEPROC) (EGLDisplay dpy, EGLint limit, EGLenum mode);
> #ifdef EGL_EGLEXT_PROTOTYPES
> EGLAPI EGLint EGLAPIENTRY eglProgramCacheGetAttribANGLE(EGLDisplay dpy, EGLenum attrib);
>@@ -165,6 +172,43 @@ EGLAPI EGLint EGLAPIENTRY eglProgramCacheResizeANGLE(EGLDisplay dpy, EGLint limi
> #endif
> #endif /* EGL_ANGLE_program_cache_control */
> 
>+#ifndef EGL_ANGLE_iosurface_client_buffer
>+#define EGL_ANGLE_iosurface_client_buffer 1
>+#define EGL_IOSURFACE_ANGLE 0x3454
>+#define EGL_IOSURFACE_PLANE_ANGLE 0x345A
>+#define EGL_TEXTURE_RECTANGLE_ANGLE 0x345B
>+#define EGL_TEXTURE_TYPE_ANGLE 0x345C
>+#define EGL_TEXTURE_INTERNAL_FORMAT_ANGLE 0x345D
>+#endif /* EGL_ANGLE_iosurface_client_buffer */
>+
>+#ifndef EGL_ANGLE_create_context_extensions_enabled
>+#define EGL_ANGLE_create_context_extensions_enabled 1
>+#define EGL_EXTENSIONS_ENABLED_ANGLE 0x345F
>+#endif /* EGL_ANGLE_create_context_extensions_enabled */
>+
>+#ifndef EGL_CHROMIUM_get_sync_values
>+#define EGL_CHROMIUM_get_sync_values 1
>+typedef EGLBoolean (EGLAPIENTRYP PFNEGLGETSYNCVALUESCHROMIUMPROC) (EGLDisplay dpy,
>+                                                             EGLSurface surface,
>+                                                             EGLuint64KHR *ust,
>+                                                             EGLuint64KHR *msc,
>+                                                             EGLuint64KHR *sbc);
>+#ifdef EGL_EGLEXT_PROTOTYPES
>+EGLAPI EGLBoolean EGLAPIENTRY eglGetSyncValuesCHROMIUM(EGLDisplay dpy,
>+                                                             EGLSurface surface,
>+                                                             EGLuint64KHR *ust,
>+                                                             EGLuint64KHR *msc,
>+                                                             EGLuint64KHR *sbc);
>+#endif
>+#endif /* EGL_CHROMIUM_get_sync_values */
>+
>+#ifndef EGL_ANGLE_power_preference
>+#define EGL_ANGLE_power_preference 1
>+#define EGL_POWER_PREFERENCE_ANGLE 0x3482
>+#define EGL_LOW_POWER_ANGLE 0x0001
>+#define EGL_HIGH_POWER_ANGLE 0x0002
>+#endif /* EGL_ANGLE_power_preference */
>+
> // clang-format on
> 
> #endif  // INCLUDE_EGL_EGLEXT_ANGLE_
>diff --git a/Source/ThirdParty/ANGLE/include/EGL/eglplatform.h b/Source/ThirdParty/ANGLE/include/EGL/eglplatform.h
>index e781564891d..9203604a3ad 100644
>--- a/Source/ThirdParty/ANGLE/include/EGL/eglplatform.h
>+++ b/Source/ThirdParty/ANGLE/include/EGL/eglplatform.h
>@@ -83,38 +83,40 @@ typedef HWND    EGLNativeWindowType;
> typedef IInspectable* EGLNativeWindowType;
> #endif
> 
>-#elif defined(__APPLE__) || defined(__WINSCW__) || defined(__SYMBIAN32__) || \
>-      defined(__Fuchsia__) || defined(__HAIKU__)
>+#elif defined(__WINSCW__) || defined(__SYMBIAN32__)  /* Symbian */
> 
> typedef int   EGLNativeDisplayType;
>-typedef void *EGLNativeWindowType;
> typedef void *EGLNativePixmapType;
>+typedef void *EGLNativeWindowType;
> 
>-#elif defined(__ANDROID__) || defined(ANDROID)
>+#elif defined(WL_EGL_PLATFORM)
>+
>+typedef struct wl_display     *EGLNativeDisplayType;
>+typedef struct wl_egl_pixmap  *EGLNativePixmapType;
>+typedef struct wl_egl_window  *EGLNativeWindowType;
>+
>+#elif defined(__GBM__)
>+
>+typedef struct gbm_device  *EGLNativeDisplayType;
>+typedef struct gbm_bo      *EGLNativePixmapType;
>+typedef void               *EGLNativeWindowType;
> 
>-#include <android/native_window.h>
>+#elif defined(__ANDROID__) || defined(ANDROID)
> 
>+struct ANativeWindow;
> struct egl_native_pixmap_t;
> 
>-typedef struct ANativeWindow*           EGLNativeWindowType;
>-typedef struct egl_native_pixmap_t*     EGLNativePixmapType;
> typedef void*                           EGLNativeDisplayType;
>+typedef struct egl_native_pixmap_t*     EGLNativePixmapType;
>+typedef struct ANativeWindow*           EGLNativeWindowType;
> 
> #elif defined(USE_OZONE) || defined(USE_WPE)
> 
> typedef intptr_t EGLNativeDisplayType;
>-typedef intptr_t EGLNativeWindowType;
> typedef intptr_t EGLNativePixmapType;
>+typedef intptr_t EGLNativeWindowType;
> 
>-#elif defined(WL_EGL_PLATFORM)
>-
>-typedef struct wl_display    *EGLNativeDisplayType;
>-typedef struct wl_egl_pixmap *EGLNativePixmapType;
>-typedef struct wl_egl_window *EGLNativeWindowType;
>-
>-#elif defined(__unix__)
>-
>-#if defined(ANGLE_USE_X11) && !defined(MESA_EGL_NO_X11_HEADERS)
>+#elif defined(__unix__) || defined(USE_X11)
> 
> /* X11 (tentative)  */
> #include <X11/Xlib.h>
>@@ -124,13 +126,25 @@ typedef Display *EGLNativeDisplayType;
> typedef Pixmap   EGLNativePixmapType;
> typedef Window   EGLNativeWindowType;
> 
>-#else
>+#elif defined(__APPLE__)
>+
>+typedef int   EGLNativeDisplayType;
>+typedef void *EGLNativePixmapType;
>+typedef void *EGLNativeWindowType;
>+
>+#elif defined(__HAIKU__)
>+
>+#include <kernel/image.h>
> 
>-typedef void             *EGLNativeDisplayType;
>-typedef khronos_uintptr_t EGLNativePixmapType;
>-typedef khronos_uintptr_t EGLNativeWindowType;
>+typedef void              *EGLNativeDisplayType;
>+typedef khronos_uintptr_t  EGLNativePixmapType;
>+typedef khronos_uintptr_t  EGLNativeWindowType;
> 
>-#endif /* ANGLE_USE_X11 && !MESA_EGL_NO_X11_HEADERS */
>+#elif defined(__Fuchsia__)
>+
>+typedef int   EGLNativeDisplayType;
>+typedef void *EGLNativePixmapType;
>+typedef void *EGLNativeWindowType
> 
> #else
> #error "Platform not recognized"
>diff --git a/Source/ThirdParty/ANGLE/include/GLES/.clang-format b/Source/ThirdParty/ANGLE/include/GLES/.clang-format
>new file mode 100644
>index 00000000000..06147100144
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/include/GLES/.clang-format
>@@ -0,0 +1,3 @@
>+
>+
>+DisableFormat: true
>diff --git a/Source/ThirdParty/ANGLE/include/GLES/README.md b/Source/ThirdParty/ANGLE/include/GLES/README.md
>new file mode 100644
>index 00000000000..1aa31f5ac2e
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/include/GLES/README.md
>@@ -0,0 +1,20 @@
>+#  ANGLE GLES 1.0 Headers
>+
>+The GLES 1.0 headers ANGLE uses are generated using the Khronos tools but modified to include function pointer types and function prototype guards.
>+
>+### Regenerating gl.h
>+
>+1. Install **Python 3** (not 2) with the **lxml** addon. You can do this using `pip install lxml` from your Python's Scripts folder.
>+1. Clone [https://github.com/KhronosGroup/OpenGL-Registry.git](https://github.com/KhronosGroup/OpenGL-Registry.git).
>+1. Edit `OpenGL-Registry/xml/genheaders.py`:
>+
>+   1. Look for the section titled `# GLES 1.x API + mandatory extensions - GLES/gl.h (no function pointers)`
>+   1. Change `prefixText        = prefixStrings + gles1PlatformStrings + genDateCommentString,` to `prefixText        = prefixStrings + gles1PlatformStrings + apiEntryPrefixStrings + genDateCommentString,`
>+   1. Change `genFuncPointers   = False,` to `genFuncPointers   = True,`
>+   1. Change `protectProto      = False,` to `protectProto      = 'nonzero',`
>+   1. Change `protectProtoStr   = 'GL_GLEXT_PROTOTYPES',` to `protectProtoStr   = 'GL_GLES_PROTOTYPES',`
>+
>+1. Set your working directory to `OpenGL-Registry/xml/`.
>+1. Run `python genheaders.py ../api/GLES/gl.h`
>+1. The generated header will now be in `OpenGL-Registry/api/GLES/gl.h`. You can copy the header over to this folder.
>+1. Also update `scripts/gl.xml` with the latest version from `OpenGL-Registry/xml/`.
>diff --git a/Source/ThirdParty/ANGLE/include/GLES/egl.h b/Source/ThirdParty/ANGLE/include/GLES/egl.h
>new file mode 100644
>index 00000000000..86f644c923b
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/include/GLES/egl.h
>@@ -0,0 +1,29 @@
>+/*
>+** Copyright (c) 2008-2017 The Khronos Group Inc.
>+**
>+** Licensed under the Apache License, Version 2.0 (the "License");
>+** you may not use this file except in compliance with the License.
>+** You may obtain a copy of the License at
>+**
>+**     http://www.apache.org/licenses/LICENSE-2.0
>+**
>+** Unless required by applicable law or agreed to in writing, software
>+** distributed under the License is distributed on an "AS IS" BASIS,
>+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
>+** See the License for the specific language governing permissions and
>+** limitations under the License.
>+*/
>+
>+/*
>+ * Skeleton egl.h to provide compatibility for early GLES 1.0
>+ * applications. Several early implementations included gl.h
>+ * in egl.h leading applications to include only egl.h
>+ */
>+
>+#ifndef __legacy_egl_h_
>+#define __legacy_egl_h_
>+
>+#include <EGL/egl.h>
>+#include <GLES/gl.h>
>+
>+#endif /* __legacy_egl_h_ */
>diff --git a/Source/ThirdParty/ANGLE/include/GLES/gl.h b/Source/ThirdParty/ANGLE/include/GLES/gl.h
>new file mode 100644
>index 00000000000..9f3ed3438a9
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/include/GLES/gl.h
>@@ -0,0 +1,743 @@
>+#ifndef __gles1_gl_h_
>+#define __gles1_gl_h_ 1
>+
>+#ifdef __cplusplus
>+extern "C" {
>+#endif
>+
>+/*
>+** Copyright (c) 2013-2018 The Khronos Group Inc.
>+**
>+** Permission is hereby granted, free of charge, to any person obtaining a
>+** copy of this software and/or associated documentation files (the
>+** "Materials"), to deal in the Materials without restriction, including
>+** without limitation the rights to use, copy, modify, merge, publish,
>+** distribute, sublicense, and/or sell copies of the Materials, and to
>+** permit persons to whom the Materials are furnished to do so, subject to
>+** the following conditions:
>+**
>+** The above copyright notice and this permission notice shall be included
>+** in all copies or substantial portions of the Materials.
>+**
>+** THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
>+** EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
>+** MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
>+** IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
>+** CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
>+** TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
>+** MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
>+*/
>+/*
>+** This header is generated from the Khronos OpenGL / OpenGL ES XML
>+** API Registry. The current version of the Registry, generator scripts
>+** used to make the header, and the header can be found at
>+**   https://github.com/KhronosGroup/OpenGL-Registry
>+*/
>+
>+#include <GLES/glplatform.h>
>+
>+#ifndef GL_APIENTRYP
>+#define GL_APIENTRYP GL_APIENTRY*
>+#endif
>+
>+/* Generated on date 20181204 */
>+
>+/* Generated C header for:
>+ * API: gles1
>+ * Profile: common
>+ * Versions considered: .*
>+ * Versions emitted: .*
>+ * Default extensions included: None
>+ * Additional extensions included: ^(GL_OES_read_format|GL_OES_compressed_paletted_texture|GL_OES_point_size_array|GL_OES_point_sprite)$
>+ * Extensions removed: _nomatch_^
>+ */
>+
>+#ifndef GL_VERSION_ES_CM_1_0
>+#define GL_VERSION_ES_CM_1_0 1
>+#include <KHR/khrplatform.h>
>+typedef khronos_int8_t GLbyte;
>+typedef khronos_float_t GLclampf;
>+typedef khronos_int16_t GLshort;
>+typedef khronos_uint16_t GLushort;
>+typedef void GLvoid;
>+typedef unsigned int GLenum;
>+typedef khronos_float_t GLfloat;
>+typedef khronos_int32_t GLfixed;
>+typedef unsigned int GLuint;
>+typedef khronos_ssize_t GLsizeiptr;
>+typedef khronos_intptr_t GLintptr;
>+typedef unsigned int GLbitfield;
>+typedef int GLint;
>+typedef khronos_uint8_t GLubyte;
>+typedef unsigned char GLboolean;
>+typedef int GLsizei;
>+typedef khronos_int32_t GLclampx;
>+#define GL_VERSION_ES_CL_1_0              1
>+#define GL_VERSION_ES_CM_1_1              1
>+#define GL_VERSION_ES_CL_1_1              1
>+#define GL_DEPTH_BUFFER_BIT               0x00000100
>+#define GL_STENCIL_BUFFER_BIT             0x00000400
>+#define GL_COLOR_BUFFER_BIT               0x00004000
>+#define GL_FALSE                          0
>+#define GL_TRUE                           1
>+#define GL_POINTS                         0x0000
>+#define GL_LINES                          0x0001
>+#define GL_LINE_LOOP                      0x0002
>+#define GL_LINE_STRIP                     0x0003
>+#define GL_TRIANGLES                      0x0004
>+#define GL_TRIANGLE_STRIP                 0x0005
>+#define GL_TRIANGLE_FAN                   0x0006
>+#define GL_NEVER                          0x0200
>+#define GL_LESS                           0x0201
>+#define GL_EQUAL                          0x0202
>+#define GL_LEQUAL                         0x0203
>+#define GL_GREATER                        0x0204
>+#define GL_NOTEQUAL                       0x0205
>+#define GL_GEQUAL                         0x0206
>+#define GL_ALWAYS                         0x0207
>+#define GL_ZERO                           0
>+#define GL_ONE                            1
>+#define GL_SRC_COLOR                      0x0300
>+#define GL_ONE_MINUS_SRC_COLOR            0x0301
>+#define GL_SRC_ALPHA                      0x0302
>+#define GL_ONE_MINUS_SRC_ALPHA            0x0303
>+#define GL_DST_ALPHA                      0x0304
>+#define GL_ONE_MINUS_DST_ALPHA            0x0305
>+#define GL_DST_COLOR                      0x0306
>+#define GL_ONE_MINUS_DST_COLOR            0x0307
>+#define GL_SRC_ALPHA_SATURATE             0x0308
>+#define GL_CLIP_PLANE0                    0x3000
>+#define GL_CLIP_PLANE1                    0x3001
>+#define GL_CLIP_PLANE2                    0x3002
>+#define GL_CLIP_PLANE3                    0x3003
>+#define GL_CLIP_PLANE4                    0x3004
>+#define GL_CLIP_PLANE5                    0x3005
>+#define GL_FRONT                          0x0404
>+#define GL_BACK                           0x0405
>+#define GL_FRONT_AND_BACK                 0x0408
>+#define GL_FOG                            0x0B60
>+#define GL_LIGHTING                       0x0B50
>+#define GL_TEXTURE_2D                     0x0DE1
>+#define GL_CULL_FACE                      0x0B44
>+#define GL_ALPHA_TEST                     0x0BC0
>+#define GL_BLEND                          0x0BE2
>+#define GL_COLOR_LOGIC_OP                 0x0BF2
>+#define GL_DITHER                         0x0BD0
>+#define GL_STENCIL_TEST                   0x0B90
>+#define GL_DEPTH_TEST                     0x0B71
>+#define GL_POINT_SMOOTH                   0x0B10
>+#define GL_LINE_SMOOTH                    0x0B20
>+#define GL_SCISSOR_TEST                   0x0C11
>+#define GL_COLOR_MATERIAL                 0x0B57
>+#define GL_NORMALIZE                      0x0BA1
>+#define GL_RESCALE_NORMAL                 0x803A
>+#define GL_VERTEX_ARRAY                   0x8074
>+#define GL_NORMAL_ARRAY                   0x8075
>+#define GL_COLOR_ARRAY                    0x8076
>+#define GL_TEXTURE_COORD_ARRAY            0x8078
>+#define GL_MULTISAMPLE                    0x809D
>+#define GL_SAMPLE_ALPHA_TO_COVERAGE       0x809E
>+#define GL_SAMPLE_ALPHA_TO_ONE            0x809F
>+#define GL_SAMPLE_COVERAGE                0x80A0
>+#define GL_NO_ERROR                       0
>+#define GL_INVALID_ENUM                   0x0500
>+#define GL_INVALID_VALUE                  0x0501
>+#define GL_INVALID_OPERATION              0x0502
>+#define GL_STACK_OVERFLOW                 0x0503
>+#define GL_STACK_UNDERFLOW                0x0504
>+#define GL_OUT_OF_MEMORY                  0x0505
>+#define GL_EXP                            0x0800
>+#define GL_EXP2                           0x0801
>+#define GL_FOG_DENSITY                    0x0B62
>+#define GL_FOG_START                      0x0B63
>+#define GL_FOG_END                        0x0B64
>+#define GL_FOG_MODE                       0x0B65
>+#define GL_FOG_COLOR                      0x0B66
>+#define GL_CW                             0x0900
>+#define GL_CCW                            0x0901
>+#define GL_CURRENT_COLOR                  0x0B00
>+#define GL_CURRENT_NORMAL                 0x0B02
>+#define GL_CURRENT_TEXTURE_COORDS         0x0B03
>+#define GL_POINT_SIZE                     0x0B11
>+#define GL_POINT_SIZE_MIN                 0x8126
>+#define GL_POINT_SIZE_MAX                 0x8127
>+#define GL_POINT_FADE_THRESHOLD_SIZE      0x8128
>+#define GL_POINT_DISTANCE_ATTENUATION     0x8129
>+#define GL_SMOOTH_POINT_SIZE_RANGE        0x0B12
>+#define GL_LINE_WIDTH                     0x0B21
>+#define GL_SMOOTH_LINE_WIDTH_RANGE        0x0B22
>+#define GL_ALIASED_POINT_SIZE_RANGE       0x846D
>+#define GL_ALIASED_LINE_WIDTH_RANGE       0x846E
>+#define GL_CULL_FACE_MODE                 0x0B45
>+#define GL_FRONT_FACE                     0x0B46
>+#define GL_SHADE_MODEL                    0x0B54
>+#define GL_DEPTH_RANGE                    0x0B70
>+#define GL_DEPTH_WRITEMASK                0x0B72
>+#define GL_DEPTH_CLEAR_VALUE              0x0B73
>+#define GL_DEPTH_FUNC                     0x0B74
>+#define GL_STENCIL_CLEAR_VALUE            0x0B91
>+#define GL_STENCIL_FUNC                   0x0B92
>+#define GL_STENCIL_VALUE_MASK             0x0B93
>+#define GL_STENCIL_FAIL                   0x0B94
>+#define GL_STENCIL_PASS_DEPTH_FAIL        0x0B95
>+#define GL_STENCIL_PASS_DEPTH_PASS        0x0B96
>+#define GL_STENCIL_REF                    0x0B97
>+#define GL_STENCIL_WRITEMASK              0x0B98
>+#define GL_MATRIX_MODE                    0x0BA0
>+#define GL_VIEWPORT                       0x0BA2
>+#define GL_MODELVIEW_STACK_DEPTH          0x0BA3
>+#define GL_PROJECTION_STACK_DEPTH         0x0BA4
>+#define GL_TEXTURE_STACK_DEPTH            0x0BA5
>+#define GL_MODELVIEW_MATRIX               0x0BA6
>+#define GL_PROJECTION_MATRIX              0x0BA7
>+#define GL_TEXTURE_MATRIX                 0x0BA8
>+#define GL_ALPHA_TEST_FUNC                0x0BC1
>+#define GL_ALPHA_TEST_REF                 0x0BC2
>+#define GL_BLEND_DST                      0x0BE0
>+#define GL_BLEND_SRC                      0x0BE1
>+#define GL_LOGIC_OP_MODE                  0x0BF0
>+#define GL_SCISSOR_BOX                    0x0C10
>+#define GL_COLOR_CLEAR_VALUE              0x0C22
>+#define GL_COLOR_WRITEMASK                0x0C23
>+#define GL_MAX_LIGHTS                     0x0D31
>+#define GL_MAX_CLIP_PLANES                0x0D32
>+#define GL_MAX_TEXTURE_SIZE               0x0D33
>+#define GL_MAX_MODELVIEW_STACK_DEPTH      0x0D36
>+#define GL_MAX_PROJECTION_STACK_DEPTH     0x0D38
>+#define GL_MAX_TEXTURE_STACK_DEPTH        0x0D39
>+#define GL_MAX_VIEWPORT_DIMS              0x0D3A
>+#define GL_MAX_TEXTURE_UNITS              0x84E2
>+#define GL_SUBPIXEL_BITS                  0x0D50
>+#define GL_RED_BITS                       0x0D52
>+#define GL_GREEN_BITS                     0x0D53
>+#define GL_BLUE_BITS                      0x0D54
>+#define GL_ALPHA_BITS                     0x0D55
>+#define GL_DEPTH_BITS                     0x0D56
>+#define GL_STENCIL_BITS                   0x0D57
>+#define GL_POLYGON_OFFSET_UNITS           0x2A00
>+#define GL_POLYGON_OFFSET_FILL            0x8037
>+#define GL_POLYGON_OFFSET_FACTOR          0x8038
>+#define GL_TEXTURE_BINDING_2D             0x8069
>+#define GL_VERTEX_ARRAY_SIZE              0x807A
>+#define GL_VERTEX_ARRAY_TYPE              0x807B
>+#define GL_VERTEX_ARRAY_STRIDE            0x807C
>+#define GL_NORMAL_ARRAY_TYPE              0x807E
>+#define GL_NORMAL_ARRAY_STRIDE            0x807F
>+#define GL_COLOR_ARRAY_SIZE               0x8081
>+#define GL_COLOR_ARRAY_TYPE               0x8082
>+#define GL_COLOR_ARRAY_STRIDE             0x8083
>+#define GL_TEXTURE_COORD_ARRAY_SIZE       0x8088
>+#define GL_TEXTURE_COORD_ARRAY_TYPE       0x8089
>+#define GL_TEXTURE_COORD_ARRAY_STRIDE     0x808A
>+#define GL_VERTEX_ARRAY_POINTER           0x808E
>+#define GL_NORMAL_ARRAY_POINTER           0x808F
>+#define GL_COLOR_ARRAY_POINTER            0x8090
>+#define GL_TEXTURE_COORD_ARRAY_POINTER    0x8092
>+#define GL_SAMPLE_BUFFERS                 0x80A8
>+#define GL_SAMPLES                        0x80A9
>+#define GL_SAMPLE_COVERAGE_VALUE          0x80AA
>+#define GL_SAMPLE_COVERAGE_INVERT         0x80AB
>+#define GL_NUM_COMPRESSED_TEXTURE_FORMATS 0x86A2
>+#define GL_COMPRESSED_TEXTURE_FORMATS     0x86A3
>+#define GL_DONT_CARE                      0x1100
>+#define GL_FASTEST                        0x1101
>+#define GL_NICEST                         0x1102
>+#define GL_PERSPECTIVE_CORRECTION_HINT    0x0C50
>+#define GL_POINT_SMOOTH_HINT              0x0C51
>+#define GL_LINE_SMOOTH_HINT               0x0C52
>+#define GL_FOG_HINT                       0x0C54
>+#define GL_GENERATE_MIPMAP_HINT           0x8192
>+#define GL_LIGHT_MODEL_AMBIENT            0x0B53
>+#define GL_LIGHT_MODEL_TWO_SIDE           0x0B52
>+#define GL_AMBIENT                        0x1200
>+#define GL_DIFFUSE                        0x1201
>+#define GL_SPECULAR                       0x1202
>+#define GL_POSITION                       0x1203
>+#define GL_SPOT_DIRECTION                 0x1204
>+#define GL_SPOT_EXPONENT                  0x1205
>+#define GL_SPOT_CUTOFF                    0x1206
>+#define GL_CONSTANT_ATTENUATION           0x1207
>+#define GL_LINEAR_ATTENUATION             0x1208
>+#define GL_QUADRATIC_ATTENUATION          0x1209
>+#define GL_BYTE                           0x1400
>+#define GL_UNSIGNED_BYTE                  0x1401
>+#define GL_SHORT                          0x1402
>+#define GL_UNSIGNED_SHORT                 0x1403
>+#define GL_FLOAT                          0x1406
>+#define GL_FIXED                          0x140C
>+#define GL_CLEAR                          0x1500
>+#define GL_AND                            0x1501
>+#define GL_AND_REVERSE                    0x1502
>+#define GL_COPY                           0x1503
>+#define GL_AND_INVERTED                   0x1504
>+#define GL_NOOP                           0x1505
>+#define GL_XOR                            0x1506
>+#define GL_OR                             0x1507
>+#define GL_NOR                            0x1508
>+#define GL_EQUIV                          0x1509
>+#define GL_INVERT                         0x150A
>+#define GL_OR_REVERSE                     0x150B
>+#define GL_COPY_INVERTED                  0x150C
>+#define GL_OR_INVERTED                    0x150D
>+#define GL_NAND                           0x150E
>+#define GL_SET                            0x150F
>+#define GL_EMISSION                       0x1600
>+#define GL_SHININESS                      0x1601
>+#define GL_AMBIENT_AND_DIFFUSE            0x1602
>+#define GL_MODELVIEW                      0x1700
>+#define GL_PROJECTION                     0x1701
>+#define GL_TEXTURE                        0x1702
>+#define GL_ALPHA                          0x1906
>+#define GL_RGB                            0x1907
>+#define GL_RGBA                           0x1908
>+#define GL_LUMINANCE                      0x1909
>+#define GL_LUMINANCE_ALPHA                0x190A
>+#define GL_UNPACK_ALIGNMENT               0x0CF5
>+#define GL_PACK_ALIGNMENT                 0x0D05
>+#define GL_UNSIGNED_SHORT_4_4_4_4         0x8033
>+#define GL_UNSIGNED_SHORT_5_5_5_1         0x8034
>+#define GL_UNSIGNED_SHORT_5_6_5           0x8363
>+#define GL_FLAT                           0x1D00
>+#define GL_SMOOTH                         0x1D01
>+#define GL_KEEP                           0x1E00
>+#define GL_REPLACE                        0x1E01
>+#define GL_INCR                           0x1E02
>+#define GL_DECR                           0x1E03
>+#define GL_VENDOR                         0x1F00
>+#define GL_RENDERER                       0x1F01
>+#define GL_VERSION                        0x1F02
>+#define GL_EXTENSIONS                     0x1F03
>+#define GL_MODULATE                       0x2100
>+#define GL_DECAL                          0x2101
>+#define GL_ADD                            0x0104
>+#define GL_TEXTURE_ENV_MODE               0x2200
>+#define GL_TEXTURE_ENV_COLOR              0x2201
>+#define GL_TEXTURE_ENV                    0x2300
>+#define GL_NEAREST                        0x2600
>+#define GL_LINEAR                         0x2601
>+#define GL_NEAREST_MIPMAP_NEAREST         0x2700
>+#define GL_LINEAR_MIPMAP_NEAREST          0x2701
>+#define GL_NEAREST_MIPMAP_LINEAR          0x2702
>+#define GL_LINEAR_MIPMAP_LINEAR           0x2703
>+#define GL_TEXTURE_MAG_FILTER             0x2800
>+#define GL_TEXTURE_MIN_FILTER             0x2801
>+#define GL_TEXTURE_WRAP_S                 0x2802
>+#define GL_TEXTURE_WRAP_T                 0x2803
>+#define GL_GENERATE_MIPMAP                0x8191
>+#define GL_TEXTURE0                       0x84C0
>+#define GL_TEXTURE1                       0x84C1
>+#define GL_TEXTURE2                       0x84C2
>+#define GL_TEXTURE3                       0x84C3
>+#define GL_TEXTURE4                       0x84C4
>+#define GL_TEXTURE5                       0x84C5
>+#define GL_TEXTURE6                       0x84C6
>+#define GL_TEXTURE7                       0x84C7
>+#define GL_TEXTURE8                       0x84C8
>+#define GL_TEXTURE9                       0x84C9
>+#define GL_TEXTURE10                      0x84CA
>+#define GL_TEXTURE11                      0x84CB
>+#define GL_TEXTURE12                      0x84CC
>+#define GL_TEXTURE13                      0x84CD
>+#define GL_TEXTURE14                      0x84CE
>+#define GL_TEXTURE15                      0x84CF
>+#define GL_TEXTURE16                      0x84D0
>+#define GL_TEXTURE17                      0x84D1
>+#define GL_TEXTURE18                      0x84D2
>+#define GL_TEXTURE19                      0x84D3
>+#define GL_TEXTURE20                      0x84D4
>+#define GL_TEXTURE21                      0x84D5
>+#define GL_TEXTURE22                      0x84D6
>+#define GL_TEXTURE23                      0x84D7
>+#define GL_TEXTURE24                      0x84D8
>+#define GL_TEXTURE25                      0x84D9
>+#define GL_TEXTURE26                      0x84DA
>+#define GL_TEXTURE27                      0x84DB
>+#define GL_TEXTURE28                      0x84DC
>+#define GL_TEXTURE29                      0x84DD
>+#define GL_TEXTURE30                      0x84DE
>+#define GL_TEXTURE31                      0x84DF
>+#define GL_ACTIVE_TEXTURE                 0x84E0
>+#define GL_CLIENT_ACTIVE_TEXTURE          0x84E1
>+#define GL_REPEAT                         0x2901
>+#define GL_CLAMP_TO_EDGE                  0x812F
>+#define GL_LIGHT0                         0x4000
>+#define GL_LIGHT1                         0x4001
>+#define GL_LIGHT2                         0x4002
>+#define GL_LIGHT3                         0x4003
>+#define GL_LIGHT4                         0x4004
>+#define GL_LIGHT5                         0x4005
>+#define GL_LIGHT6                         0x4006
>+#define GL_LIGHT7                         0x4007
>+#define GL_ARRAY_BUFFER                   0x8892
>+#define GL_ELEMENT_ARRAY_BUFFER           0x8893
>+#define GL_ARRAY_BUFFER_BINDING           0x8894
>+#define GL_ELEMENT_ARRAY_BUFFER_BINDING   0x8895
>+#define GL_VERTEX_ARRAY_BUFFER_BINDING    0x8896
>+#define GL_NORMAL_ARRAY_BUFFER_BINDING    0x8897
>+#define GL_COLOR_ARRAY_BUFFER_BINDING     0x8898
>+#define GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING 0x889A
>+#define GL_STATIC_DRAW                    0x88E4
>+#define GL_DYNAMIC_DRAW                   0x88E8
>+#define GL_BUFFER_SIZE                    0x8764
>+#define GL_BUFFER_USAGE                   0x8765
>+#define GL_SUBTRACT                       0x84E7
>+#define GL_COMBINE                        0x8570
>+#define GL_COMBINE_RGB                    0x8571
>+#define GL_COMBINE_ALPHA                  0x8572
>+#define GL_RGB_SCALE                      0x8573
>+#define GL_ADD_SIGNED                     0x8574
>+#define GL_INTERPOLATE                    0x8575
>+#define GL_CONSTANT                       0x8576
>+#define GL_PRIMARY_COLOR                  0x8577
>+#define GL_PREVIOUS                       0x8578
>+#define GL_OPERAND0_RGB                   0x8590
>+#define GL_OPERAND1_RGB                   0x8591
>+#define GL_OPERAND2_RGB                   0x8592
>+#define GL_OPERAND0_ALPHA                 0x8598
>+#define GL_OPERAND1_ALPHA                 0x8599
>+#define GL_OPERAND2_ALPHA                 0x859A
>+#define GL_ALPHA_SCALE                    0x0D1C
>+#define GL_SRC0_RGB                       0x8580
>+#define GL_SRC1_RGB                       0x8581
>+#define GL_SRC2_RGB                       0x8582
>+#define GL_SRC0_ALPHA                     0x8588
>+#define GL_SRC1_ALPHA                     0x8589
>+#define GL_SRC2_ALPHA                     0x858A
>+#define GL_DOT3_RGB                       0x86AE
>+#define GL_DOT3_RGBA                      0x86AF
>+typedef void (GL_APIENTRYP PFNGLALPHAFUNCPROC) (GLenum func, GLfloat ref);
>+typedef void (GL_APIENTRYP PFNGLCLEARCOLORPROC) (GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha);
>+typedef void (GL_APIENTRYP PFNGLCLEARDEPTHFPROC) (GLfloat d);
>+typedef void (GL_APIENTRYP PFNGLCLIPPLANEFPROC) (GLenum p, const GLfloat *eqn);
>+typedef void (GL_APIENTRYP PFNGLCOLOR4FPROC) (GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha);
>+typedef void (GL_APIENTRYP PFNGLDEPTHRANGEFPROC) (GLfloat n, GLfloat f);
>+typedef void (GL_APIENTRYP PFNGLFOGFPROC) (GLenum pname, GLfloat param);
>+typedef void (GL_APIENTRYP PFNGLFOGFVPROC) (GLenum pname, const GLfloat *params);
>+typedef void (GL_APIENTRYP PFNGLFRUSTUMFPROC) (GLfloat l, GLfloat r, GLfloat b, GLfloat t, GLfloat n, GLfloat f);
>+typedef void (GL_APIENTRYP PFNGLGETCLIPPLANEFPROC) (GLenum plane, GLfloat *equation);
>+typedef void (GL_APIENTRYP PFNGLGETFLOATVPROC) (GLenum pname, GLfloat *data);
>+typedef void (GL_APIENTRYP PFNGLGETLIGHTFVPROC) (GLenum light, GLenum pname, GLfloat *params);
>+typedef void (GL_APIENTRYP PFNGLGETMATERIALFVPROC) (GLenum face, GLenum pname, GLfloat *params);
>+typedef void (GL_APIENTRYP PFNGLGETTEXENVFVPROC) (GLenum target, GLenum pname, GLfloat *params);
>+typedef void (GL_APIENTRYP PFNGLGETTEXPARAMETERFVPROC) (GLenum target, GLenum pname, GLfloat *params);
>+typedef void (GL_APIENTRYP PFNGLLIGHTMODELFPROC) (GLenum pname, GLfloat param);
>+typedef void (GL_APIENTRYP PFNGLLIGHTMODELFVPROC) (GLenum pname, const GLfloat *params);
>+typedef void (GL_APIENTRYP PFNGLLIGHTFPROC) (GLenum light, GLenum pname, GLfloat param);
>+typedef void (GL_APIENTRYP PFNGLLIGHTFVPROC) (GLenum light, GLenum pname, const GLfloat *params);
>+typedef void (GL_APIENTRYP PFNGLLINEWIDTHPROC) (GLfloat width);
>+typedef void (GL_APIENTRYP PFNGLLOADMATRIXFPROC) (const GLfloat *m);
>+typedef void (GL_APIENTRYP PFNGLMATERIALFPROC) (GLenum face, GLenum pname, GLfloat param);
>+typedef void (GL_APIENTRYP PFNGLMATERIALFVPROC) (GLenum face, GLenum pname, const GLfloat *params);
>+typedef void (GL_APIENTRYP PFNGLMULTMATRIXFPROC) (const GLfloat *m);
>+typedef void (GL_APIENTRYP PFNGLMULTITEXCOORD4FPROC) (GLenum target, GLfloat s, GLfloat t, GLfloat r, GLfloat q);
>+typedef void (GL_APIENTRYP PFNGLNORMAL3FPROC) (GLfloat nx, GLfloat ny, GLfloat nz);
>+typedef void (GL_APIENTRYP PFNGLORTHOFPROC) (GLfloat l, GLfloat r, GLfloat b, GLfloat t, GLfloat n, GLfloat f);
>+typedef void (GL_APIENTRYP PFNGLPOINTPARAMETERFPROC) (GLenum pname, GLfloat param);
>+typedef void (GL_APIENTRYP PFNGLPOINTPARAMETERFVPROC) (GLenum pname, const GLfloat *params);
>+typedef void (GL_APIENTRYP PFNGLPOINTSIZEPROC) (GLfloat size);
>+typedef void (GL_APIENTRYP PFNGLPOLYGONOFFSETPROC) (GLfloat factor, GLfloat units);
>+typedef void (GL_APIENTRYP PFNGLROTATEFPROC) (GLfloat angle, GLfloat x, GLfloat y, GLfloat z);
>+typedef void (GL_APIENTRYP PFNGLSCALEFPROC) (GLfloat x, GLfloat y, GLfloat z);
>+typedef void (GL_APIENTRYP PFNGLTEXENVFPROC) (GLenum target, GLenum pname, GLfloat param);
>+typedef void (GL_APIENTRYP PFNGLTEXENVFVPROC) (GLenum target, GLenum pname, const GLfloat *params);
>+typedef void (GL_APIENTRYP PFNGLTEXPARAMETERFPROC) (GLenum target, GLenum pname, GLfloat param);
>+typedef void (GL_APIENTRYP PFNGLTEXPARAMETERFVPROC) (GLenum target, GLenum pname, const GLfloat *params);
>+typedef void (GL_APIENTRYP PFNGLTRANSLATEFPROC) (GLfloat x, GLfloat y, GLfloat z);
>+typedef void (GL_APIENTRYP PFNGLACTIVETEXTUREPROC) (GLenum texture);
>+typedef void (GL_APIENTRYP PFNGLALPHAFUNCXPROC) (GLenum func, GLfixed ref);
>+typedef void (GL_APIENTRYP PFNGLBINDBUFFERPROC) (GLenum target, GLuint buffer);
>+typedef void (GL_APIENTRYP PFNGLBINDTEXTUREPROC) (GLenum target, GLuint texture);
>+typedef void (GL_APIENTRYP PFNGLBLENDFUNCPROC) (GLenum sfactor, GLenum dfactor);
>+typedef void (GL_APIENTRYP PFNGLBUFFERDATAPROC) (GLenum target, GLsizeiptr size, const void *data, GLenum usage);
>+typedef void (GL_APIENTRYP PFNGLBUFFERSUBDATAPROC) (GLenum target, GLintptr offset, GLsizeiptr size, const void *data);
>+typedef void (GL_APIENTRYP PFNGLCLEARPROC) (GLbitfield mask);
>+typedef void (GL_APIENTRYP PFNGLCLEARCOLORXPROC) (GLfixed red, GLfixed green, GLfixed blue, GLfixed alpha);
>+typedef void (GL_APIENTRYP PFNGLCLEARDEPTHXPROC) (GLfixed depth);
>+typedef void (GL_APIENTRYP PFNGLCLEARSTENCILPROC) (GLint s);
>+typedef void (GL_APIENTRYP PFNGLCLIENTACTIVETEXTUREPROC) (GLenum texture);
>+typedef void (GL_APIENTRYP PFNGLCLIPPLANEXPROC) (GLenum plane, const GLfixed *equation);
>+typedef void (GL_APIENTRYP PFNGLCOLOR4UBPROC) (GLubyte red, GLubyte green, GLubyte blue, GLubyte alpha);
>+typedef void (GL_APIENTRYP PFNGLCOLOR4XPROC) (GLfixed red, GLfixed green, GLfixed blue, GLfixed alpha);
>+typedef void (GL_APIENTRYP PFNGLCOLORMASKPROC) (GLboolean red, GLboolean green, GLboolean blue, GLboolean alpha);
>+typedef void (GL_APIENTRYP PFNGLCOLORPOINTERPROC) (GLint size, GLenum type, GLsizei stride, const void *pointer);
>+typedef void (GL_APIENTRYP PFNGLCOMPRESSEDTEXIMAGE2DPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const void *data);
>+typedef void (GL_APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE2DPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const void *data);
>+typedef void (GL_APIENTRYP PFNGLCOPYTEXIMAGE2DPROC) (GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border);
>+typedef void (GL_APIENTRYP PFNGLCOPYTEXSUBIMAGE2DPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height);
>+typedef void (GL_APIENTRYP PFNGLCULLFACEPROC) (GLenum mode);
>+typedef void (GL_APIENTRYP PFNGLDELETEBUFFERSPROC) (GLsizei n, const GLuint *buffers);
>+typedef void (GL_APIENTRYP PFNGLDELETETEXTURESPROC) (GLsizei n, const GLuint *textures);
>+typedef void (GL_APIENTRYP PFNGLDEPTHFUNCPROC) (GLenum func);
>+typedef void (GL_APIENTRYP PFNGLDEPTHMASKPROC) (GLboolean flag);
>+typedef void (GL_APIENTRYP PFNGLDEPTHRANGEXPROC) (GLfixed n, GLfixed f);
>+typedef void (GL_APIENTRYP PFNGLDISABLEPROC) (GLenum cap);
>+typedef void (GL_APIENTRYP PFNGLDISABLECLIENTSTATEPROC) (GLenum array);
>+typedef void (GL_APIENTRYP PFNGLDRAWARRAYSPROC) (GLenum mode, GLint first, GLsizei count);
>+typedef void (GL_APIENTRYP PFNGLDRAWELEMENTSPROC) (GLenum mode, GLsizei count, GLenum type, const void *indices);
>+typedef void (GL_APIENTRYP PFNGLENABLEPROC) (GLenum cap);
>+typedef void (GL_APIENTRYP PFNGLENABLECLIENTSTATEPROC) (GLenum array);
>+typedef void (GL_APIENTRYP PFNGLFINISHPROC) (void);
>+typedef void (GL_APIENTRYP PFNGLFLUSHPROC) (void);
>+typedef void (GL_APIENTRYP PFNGLFOGXPROC) (GLenum pname, GLfixed param);
>+typedef void (GL_APIENTRYP PFNGLFOGXVPROC) (GLenum pname, const GLfixed *param);
>+typedef void (GL_APIENTRYP PFNGLFRONTFACEPROC) (GLenum mode);
>+typedef void (GL_APIENTRYP PFNGLFRUSTUMXPROC) (GLfixed l, GLfixed r, GLfixed b, GLfixed t, GLfixed n, GLfixed f);
>+typedef void (GL_APIENTRYP PFNGLGETBOOLEANVPROC) (GLenum pname, GLboolean *data);
>+typedef void (GL_APIENTRYP PFNGLGETBUFFERPARAMETERIVPROC) (GLenum target, GLenum pname, GLint *params);
>+typedef void (GL_APIENTRYP PFNGLGETCLIPPLANEXPROC) (GLenum plane, GLfixed *equation);
>+typedef void (GL_APIENTRYP PFNGLGENBUFFERSPROC) (GLsizei n, GLuint *buffers);
>+typedef void (GL_APIENTRYP PFNGLGENTEXTURESPROC) (GLsizei n, GLuint *textures);
>+typedef GLenum (GL_APIENTRYP PFNGLGETERRORPROC) (void);
>+typedef void (GL_APIENTRYP PFNGLGETFIXEDVPROC) (GLenum pname, GLfixed *params);
>+typedef void (GL_APIENTRYP PFNGLGETINTEGERVPROC) (GLenum pname, GLint *data);
>+typedef void (GL_APIENTRYP PFNGLGETLIGHTXVPROC) (GLenum light, GLenum pname, GLfixed *params);
>+typedef void (GL_APIENTRYP PFNGLGETMATERIALXVPROC) (GLenum face, GLenum pname, GLfixed *params);
>+typedef void (GL_APIENTRYP PFNGLGETPOINTERVPROC) (GLenum pname, void **params);
>+typedef const GLubyte *(GL_APIENTRYP PFNGLGETSTRINGPROC) (GLenum name);
>+typedef void (GL_APIENTRYP PFNGLGETTEXENVIVPROC) (GLenum target, GLenum pname, GLint *params);
>+typedef void (GL_APIENTRYP PFNGLGETTEXENVXVPROC) (GLenum target, GLenum pname, GLfixed *params);
>+typedef void (GL_APIENTRYP PFNGLGETTEXPARAMETERIVPROC) (GLenum target, GLenum pname, GLint *params);
>+typedef void (GL_APIENTRYP PFNGLGETTEXPARAMETERXVPROC) (GLenum target, GLenum pname, GLfixed *params);
>+typedef void (GL_APIENTRYP PFNGLHINTPROC) (GLenum target, GLenum mode);
>+typedef GLboolean (GL_APIENTRYP PFNGLISBUFFERPROC) (GLuint buffer);
>+typedef GLboolean (GL_APIENTRYP PFNGLISENABLEDPROC) (GLenum cap);
>+typedef GLboolean (GL_APIENTRYP PFNGLISTEXTUREPROC) (GLuint texture);
>+typedef void (GL_APIENTRYP PFNGLLIGHTMODELXPROC) (GLenum pname, GLfixed param);
>+typedef void (GL_APIENTRYP PFNGLLIGHTMODELXVPROC) (GLenum pname, const GLfixed *param);
>+typedef void (GL_APIENTRYP PFNGLLIGHTXPROC) (GLenum light, GLenum pname, GLfixed param);
>+typedef void (GL_APIENTRYP PFNGLLIGHTXVPROC) (GLenum light, GLenum pname, const GLfixed *params);
>+typedef void (GL_APIENTRYP PFNGLLINEWIDTHXPROC) (GLfixed width);
>+typedef void (GL_APIENTRYP PFNGLLOADIDENTITYPROC) (void);
>+typedef void (GL_APIENTRYP PFNGLLOADMATRIXXPROC) (const GLfixed *m);
>+typedef void (GL_APIENTRYP PFNGLLOGICOPPROC) (GLenum opcode);
>+typedef void (GL_APIENTRYP PFNGLMATERIALXPROC) (GLenum face, GLenum pname, GLfixed param);
>+typedef void (GL_APIENTRYP PFNGLMATERIALXVPROC) (GLenum face, GLenum pname, const GLfixed *param);
>+typedef void (GL_APIENTRYP PFNGLMATRIXMODEPROC) (GLenum mode);
>+typedef void (GL_APIENTRYP PFNGLMULTMATRIXXPROC) (const GLfixed *m);
>+typedef void (GL_APIENTRYP PFNGLMULTITEXCOORD4XPROC) (GLenum texture, GLfixed s, GLfixed t, GLfixed r, GLfixed q);
>+typedef void (GL_APIENTRYP PFNGLNORMAL3XPROC) (GLfixed nx, GLfixed ny, GLfixed nz);
>+typedef void (GL_APIENTRYP PFNGLNORMALPOINTERPROC) (GLenum type, GLsizei stride, const void *pointer);
>+typedef void (GL_APIENTRYP PFNGLORTHOXPROC) (GLfixed l, GLfixed r, GLfixed b, GLfixed t, GLfixed n, GLfixed f);
>+typedef void (GL_APIENTRYP PFNGLPIXELSTOREIPROC) (GLenum pname, GLint param);
>+typedef void (GL_APIENTRYP PFNGLPOINTPARAMETERXPROC) (GLenum pname, GLfixed param);
>+typedef void (GL_APIENTRYP PFNGLPOINTPARAMETERXVPROC) (GLenum pname, const GLfixed *params);
>+typedef void (GL_APIENTRYP PFNGLPOINTSIZEXPROC) (GLfixed size);
>+typedef void (GL_APIENTRYP PFNGLPOLYGONOFFSETXPROC) (GLfixed factor, GLfixed units);
>+typedef void (GL_APIENTRYP PFNGLPOPMATRIXPROC) (void);
>+typedef void (GL_APIENTRYP PFNGLPUSHMATRIXPROC) (void);
>+typedef void (GL_APIENTRYP PFNGLREADPIXELSPROC) (GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, void *pixels);
>+typedef void (GL_APIENTRYP PFNGLROTATEXPROC) (GLfixed angle, GLfixed x, GLfixed y, GLfixed z);
>+typedef void (GL_APIENTRYP PFNGLSAMPLECOVERAGEPROC) (GLfloat value, GLboolean invert);
>+typedef void (GL_APIENTRYP PFNGLSAMPLECOVERAGEXPROC) (GLclampx value, GLboolean invert);
>+typedef void (GL_APIENTRYP PFNGLSCALEXPROC) (GLfixed x, GLfixed y, GLfixed z);
>+typedef void (GL_APIENTRYP PFNGLSCISSORPROC) (GLint x, GLint y, GLsizei width, GLsizei height);
>+typedef void (GL_APIENTRYP PFNGLSHADEMODELPROC) (GLenum mode);
>+typedef void (GL_APIENTRYP PFNGLSTENCILFUNCPROC) (GLenum func, GLint ref, GLuint mask);
>+typedef void (GL_APIENTRYP PFNGLSTENCILMASKPROC) (GLuint mask);
>+typedef void (GL_APIENTRYP PFNGLSTENCILOPPROC) (GLenum fail, GLenum zfail, GLenum zpass);
>+typedef void (GL_APIENTRYP PFNGLTEXCOORDPOINTERPROC) (GLint size, GLenum type, GLsizei stride, const void *pointer);
>+typedef void (GL_APIENTRYP PFNGLTEXENVIPROC) (GLenum target, GLenum pname, GLint param);
>+typedef void (GL_APIENTRYP PFNGLTEXENVXPROC) (GLenum target, GLenum pname, GLfixed param);
>+typedef void (GL_APIENTRYP PFNGLTEXENVIVPROC) (GLenum target, GLenum pname, const GLint *params);
>+typedef void (GL_APIENTRYP PFNGLTEXENVXVPROC) (GLenum target, GLenum pname, const GLfixed *params);
>+typedef void (GL_APIENTRYP PFNGLTEXIMAGE2DPROC) (GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const void *pixels);
>+typedef void (GL_APIENTRYP PFNGLTEXPARAMETERIPROC) (GLenum target, GLenum pname, GLint param);
>+typedef void (GL_APIENTRYP PFNGLTEXPARAMETERXPROC) (GLenum target, GLenum pname, GLfixed param);
>+typedef void (GL_APIENTRYP PFNGLTEXPARAMETERIVPROC) (GLenum target, GLenum pname, const GLint *params);
>+typedef void (GL_APIENTRYP PFNGLTEXPARAMETERXVPROC) (GLenum target, GLenum pname, const GLfixed *params);
>+typedef void (GL_APIENTRYP PFNGLTEXSUBIMAGE2DPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const void *pixels);
>+typedef void (GL_APIENTRYP PFNGLTRANSLATEXPROC) (GLfixed x, GLfixed y, GLfixed z);
>+typedef void (GL_APIENTRYP PFNGLVERTEXPOINTERPROC) (GLint size, GLenum type, GLsizei stride, const void *pointer);
>+typedef void (GL_APIENTRYP PFNGLVIEWPORTPROC) (GLint x, GLint y, GLsizei width, GLsizei height);
>+#if GL_GLES_PROTOTYPES
>+GL_API void GL_APIENTRY glAlphaFunc (GLenum func, GLfloat ref);
>+GL_API void GL_APIENTRY glClearColor (GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha);
>+GL_API void GL_APIENTRY glClearDepthf (GLfloat d);
>+GL_API void GL_APIENTRY glClipPlanef (GLenum p, const GLfloat *eqn);
>+GL_API void GL_APIENTRY glColor4f (GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha);
>+GL_API void GL_APIENTRY glDepthRangef (GLfloat n, GLfloat f);
>+GL_API void GL_APIENTRY glFogf (GLenum pname, GLfloat param);
>+GL_API void GL_APIENTRY glFogfv (GLenum pname, const GLfloat *params);
>+GL_API void GL_APIENTRY glFrustumf (GLfloat l, GLfloat r, GLfloat b, GLfloat t, GLfloat n, GLfloat f);
>+GL_API void GL_APIENTRY glGetClipPlanef (GLenum plane, GLfloat *equation);
>+GL_API void GL_APIENTRY glGetFloatv (GLenum pname, GLfloat *data);
>+GL_API void GL_APIENTRY glGetLightfv (GLenum light, GLenum pname, GLfloat *params);
>+GL_API void GL_APIENTRY glGetMaterialfv (GLenum face, GLenum pname, GLfloat *params);
>+GL_API void GL_APIENTRY glGetTexEnvfv (GLenum target, GLenum pname, GLfloat *params);
>+GL_API void GL_APIENTRY glGetTexParameterfv (GLenum target, GLenum pname, GLfloat *params);
>+GL_API void GL_APIENTRY glLightModelf (GLenum pname, GLfloat param);
>+GL_API void GL_APIENTRY glLightModelfv (GLenum pname, const GLfloat *params);
>+GL_API void GL_APIENTRY glLightf (GLenum light, GLenum pname, GLfloat param);
>+GL_API void GL_APIENTRY glLightfv (GLenum light, GLenum pname, const GLfloat *params);
>+GL_API void GL_APIENTRY glLineWidth (GLfloat width);
>+GL_API void GL_APIENTRY glLoadMatrixf (const GLfloat *m);
>+GL_API void GL_APIENTRY glMaterialf (GLenum face, GLenum pname, GLfloat param);
>+GL_API void GL_APIENTRY glMaterialfv (GLenum face, GLenum pname, const GLfloat *params);
>+GL_API void GL_APIENTRY glMultMatrixf (const GLfloat *m);
>+GL_API void GL_APIENTRY glMultiTexCoord4f (GLenum target, GLfloat s, GLfloat t, GLfloat r, GLfloat q);
>+GL_API void GL_APIENTRY glNormal3f (GLfloat nx, GLfloat ny, GLfloat nz);
>+GL_API void GL_APIENTRY glOrthof (GLfloat l, GLfloat r, GLfloat b, GLfloat t, GLfloat n, GLfloat f);
>+GL_API void GL_APIENTRY glPointParameterf (GLenum pname, GLfloat param);
>+GL_API void GL_APIENTRY glPointParameterfv (GLenum pname, const GLfloat *params);
>+GL_API void GL_APIENTRY glPointSize (GLfloat size);
>+GL_API void GL_APIENTRY glPolygonOffset (GLfloat factor, GLfloat units);
>+GL_API void GL_APIENTRY glRotatef (GLfloat angle, GLfloat x, GLfloat y, GLfloat z);
>+GL_API void GL_APIENTRY glScalef (GLfloat x, GLfloat y, GLfloat z);
>+GL_API void GL_APIENTRY glTexEnvf (GLenum target, GLenum pname, GLfloat param);
>+GL_API void GL_APIENTRY glTexEnvfv (GLenum target, GLenum pname, const GLfloat *params);
>+GL_API void GL_APIENTRY glTexParameterf (GLenum target, GLenum pname, GLfloat param);
>+GL_API void GL_APIENTRY glTexParameterfv (GLenum target, GLenum pname, const GLfloat *params);
>+GL_API void GL_APIENTRY glTranslatef (GLfloat x, GLfloat y, GLfloat z);
>+GL_API void GL_APIENTRY glActiveTexture (GLenum texture);
>+GL_API void GL_APIENTRY glAlphaFuncx (GLenum func, GLfixed ref);
>+GL_API void GL_APIENTRY glBindBuffer (GLenum target, GLuint buffer);
>+GL_API void GL_APIENTRY glBindTexture (GLenum target, GLuint texture);
>+GL_API void GL_APIENTRY glBlendFunc (GLenum sfactor, GLenum dfactor);
>+GL_API void GL_APIENTRY glBufferData (GLenum target, GLsizeiptr size, const void *data, GLenum usage);
>+GL_API void GL_APIENTRY glBufferSubData (GLenum target, GLintptr offset, GLsizeiptr size, const void *data);
>+GL_API void GL_APIENTRY glClear (GLbitfield mask);
>+GL_API void GL_APIENTRY glClearColorx (GLfixed red, GLfixed green, GLfixed blue, GLfixed alpha);
>+GL_API void GL_APIENTRY glClearDepthx (GLfixed depth);
>+GL_API void GL_APIENTRY glClearStencil (GLint s);
>+GL_API void GL_APIENTRY glClientActiveTexture (GLenum texture);
>+GL_API void GL_APIENTRY glClipPlanex (GLenum plane, const GLfixed *equation);
>+GL_API void GL_APIENTRY glColor4ub (GLubyte red, GLubyte green, GLubyte blue, GLubyte alpha);
>+GL_API void GL_APIENTRY glColor4x (GLfixed red, GLfixed green, GLfixed blue, GLfixed alpha);
>+GL_API void GL_APIENTRY glColorMask (GLboolean red, GLboolean green, GLboolean blue, GLboolean alpha);
>+GL_API void GL_APIENTRY glColorPointer (GLint size, GLenum type, GLsizei stride, const void *pointer);
>+GL_API void GL_APIENTRY glCompressedTexImage2D (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const void *data);
>+GL_API void GL_APIENTRY glCompressedTexSubImage2D (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const void *data);
>+GL_API void GL_APIENTRY glCopyTexImage2D (GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border);
>+GL_API void GL_APIENTRY glCopyTexSubImage2D (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height);
>+GL_API void GL_APIENTRY glCullFace (GLenum mode);
>+GL_API void GL_APIENTRY glDeleteBuffers (GLsizei n, const GLuint *buffers);
>+GL_API void GL_APIENTRY glDeleteTextures (GLsizei n, const GLuint *textures);
>+GL_API void GL_APIENTRY glDepthFunc (GLenum func);
>+GL_API void GL_APIENTRY glDepthMask (GLboolean flag);
>+GL_API void GL_APIENTRY glDepthRangex (GLfixed n, GLfixed f);
>+GL_API void GL_APIENTRY glDisable (GLenum cap);
>+GL_API void GL_APIENTRY glDisableClientState (GLenum array);
>+GL_API void GL_APIENTRY glDrawArrays (GLenum mode, GLint first, GLsizei count);
>+GL_API void GL_APIENTRY glDrawElements (GLenum mode, GLsizei count, GLenum type, const void *indices);
>+GL_API void GL_APIENTRY glEnable (GLenum cap);
>+GL_API void GL_APIENTRY glEnableClientState (GLenum array);
>+GL_API void GL_APIENTRY glFinish (void);
>+GL_API void GL_APIENTRY glFlush (void);
>+GL_API void GL_APIENTRY glFogx (GLenum pname, GLfixed param);
>+GL_API void GL_APIENTRY glFogxv (GLenum pname, const GLfixed *param);
>+GL_API void GL_APIENTRY glFrontFace (GLenum mode);
>+GL_API void GL_APIENTRY glFrustumx (GLfixed l, GLfixed r, GLfixed b, GLfixed t, GLfixed n, GLfixed f);
>+GL_API void GL_APIENTRY glGetBooleanv (GLenum pname, GLboolean *data);
>+GL_API void GL_APIENTRY glGetBufferParameteriv (GLenum target, GLenum pname, GLint *params);
>+GL_API void GL_APIENTRY glGetClipPlanex (GLenum plane, GLfixed *equation);
>+GL_API void GL_APIENTRY glGenBuffers (GLsizei n, GLuint *buffers);
>+GL_API void GL_APIENTRY glGenTextures (GLsizei n, GLuint *textures);
>+GL_API GLenum GL_APIENTRY glGetError (void);
>+GL_API void GL_APIENTRY glGetFixedv (GLenum pname, GLfixed *params);
>+GL_API void GL_APIENTRY glGetIntegerv (GLenum pname, GLint *data);
>+GL_API void GL_APIENTRY glGetLightxv (GLenum light, GLenum pname, GLfixed *params);
>+GL_API void GL_APIENTRY glGetMaterialxv (GLenum face, GLenum pname, GLfixed *params);
>+GL_API void GL_APIENTRY glGetPointerv (GLenum pname, void **params);
>+GL_API const GLubyte *GL_APIENTRY glGetString (GLenum name);
>+GL_API void GL_APIENTRY glGetTexEnviv (GLenum target, GLenum pname, GLint *params);
>+GL_API void GL_APIENTRY glGetTexEnvxv (GLenum target, GLenum pname, GLfixed *params);
>+GL_API void GL_APIENTRY glGetTexParameteriv (GLenum target, GLenum pname, GLint *params);
>+GL_API void GL_APIENTRY glGetTexParameterxv (GLenum target, GLenum pname, GLfixed *params);
>+GL_API void GL_APIENTRY glHint (GLenum target, GLenum mode);
>+GL_API GLboolean GL_APIENTRY glIsBuffer (GLuint buffer);
>+GL_API GLboolean GL_APIENTRY glIsEnabled (GLenum cap);
>+GL_API GLboolean GL_APIENTRY glIsTexture (GLuint texture);
>+GL_API void GL_APIENTRY glLightModelx (GLenum pname, GLfixed param);
>+GL_API void GL_APIENTRY glLightModelxv (GLenum pname, const GLfixed *param);
>+GL_API void GL_APIENTRY glLightx (GLenum light, GLenum pname, GLfixed param);
>+GL_API void GL_APIENTRY glLightxv (GLenum light, GLenum pname, const GLfixed *params);
>+GL_API void GL_APIENTRY glLineWidthx (GLfixed width);
>+GL_API void GL_APIENTRY glLoadIdentity (void);
>+GL_API void GL_APIENTRY glLoadMatrixx (const GLfixed *m);
>+GL_API void GL_APIENTRY glLogicOp (GLenum opcode);
>+GL_API void GL_APIENTRY glMaterialx (GLenum face, GLenum pname, GLfixed param);
>+GL_API void GL_APIENTRY glMaterialxv (GLenum face, GLenum pname, const GLfixed *param);
>+GL_API void GL_APIENTRY glMatrixMode (GLenum mode);
>+GL_API void GL_APIENTRY glMultMatrixx (const GLfixed *m);
>+GL_API void GL_APIENTRY glMultiTexCoord4x (GLenum texture, GLfixed s, GLfixed t, GLfixed r, GLfixed q);
>+GL_API void GL_APIENTRY glNormal3x (GLfixed nx, GLfixed ny, GLfixed nz);
>+GL_API void GL_APIENTRY glNormalPointer (GLenum type, GLsizei stride, const void *pointer);
>+GL_API void GL_APIENTRY glOrthox (GLfixed l, GLfixed r, GLfixed b, GLfixed t, GLfixed n, GLfixed f);
>+GL_API void GL_APIENTRY glPixelStorei (GLenum pname, GLint param);
>+GL_API void GL_APIENTRY glPointParameterx (GLenum pname, GLfixed param);
>+GL_API void GL_APIENTRY glPointParameterxv (GLenum pname, const GLfixed *params);
>+GL_API void GL_APIENTRY glPointSizex (GLfixed size);
>+GL_API void GL_APIENTRY glPolygonOffsetx (GLfixed factor, GLfixed units);
>+GL_API void GL_APIENTRY glPopMatrix (void);
>+GL_API void GL_APIENTRY glPushMatrix (void);
>+GL_API void GL_APIENTRY glReadPixels (GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, void *pixels);
>+GL_API void GL_APIENTRY glRotatex (GLfixed angle, GLfixed x, GLfixed y, GLfixed z);
>+GL_API void GL_APIENTRY glSampleCoverage (GLfloat value, GLboolean invert);
>+GL_API void GL_APIENTRY glSampleCoveragex (GLclampx value, GLboolean invert);
>+GL_API void GL_APIENTRY glScalex (GLfixed x, GLfixed y, GLfixed z);
>+GL_API void GL_APIENTRY glScissor (GLint x, GLint y, GLsizei width, GLsizei height);
>+GL_API void GL_APIENTRY glShadeModel (GLenum mode);
>+GL_API void GL_APIENTRY glStencilFunc (GLenum func, GLint ref, GLuint mask);
>+GL_API void GL_APIENTRY glStencilMask (GLuint mask);
>+GL_API void GL_APIENTRY glStencilOp (GLenum fail, GLenum zfail, GLenum zpass);
>+GL_API void GL_APIENTRY glTexCoordPointer (GLint size, GLenum type, GLsizei stride, const void *pointer);
>+GL_API void GL_APIENTRY glTexEnvi (GLenum target, GLenum pname, GLint param);
>+GL_API void GL_APIENTRY glTexEnvx (GLenum target, GLenum pname, GLfixed param);
>+GL_API void GL_APIENTRY glTexEnviv (GLenum target, GLenum pname, const GLint *params);
>+GL_API void GL_APIENTRY glTexEnvxv (GLenum target, GLenum pname, const GLfixed *params);
>+GL_API void GL_APIENTRY glTexImage2D (GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const void *pixels);
>+GL_API void GL_APIENTRY glTexParameteri (GLenum target, GLenum pname, GLint param);
>+GL_API void GL_APIENTRY glTexParameterx (GLenum target, GLenum pname, GLfixed param);
>+GL_API void GL_APIENTRY glTexParameteriv (GLenum target, GLenum pname, const GLint *params);
>+GL_API void GL_APIENTRY glTexParameterxv (GLenum target, GLenum pname, const GLfixed *params);
>+GL_API void GL_APIENTRY glTexSubImage2D (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const void *pixels);
>+GL_API void GL_APIENTRY glTranslatex (GLfixed x, GLfixed y, GLfixed z);
>+GL_API void GL_APIENTRY glVertexPointer (GLint size, GLenum type, GLsizei stride, const void *pointer);
>+GL_API void GL_APIENTRY glViewport (GLint x, GLint y, GLsizei width, GLsizei height);
>+#endif
>+#endif /* GL_VERSION_ES_CM_1_0 */
>+
>+#ifndef GL_OES_compressed_paletted_texture
>+#define GL_OES_compressed_paletted_texture 1
>+#define GL_PALETTE4_RGB8_OES              0x8B90
>+#define GL_PALETTE4_RGBA8_OES             0x8B91
>+#define GL_PALETTE4_R5_G6_B5_OES          0x8B92
>+#define GL_PALETTE4_RGBA4_OES             0x8B93
>+#define GL_PALETTE4_RGB5_A1_OES           0x8B94
>+#define GL_PALETTE8_RGB8_OES              0x8B95
>+#define GL_PALETTE8_RGBA8_OES             0x8B96
>+#define GL_PALETTE8_R5_G6_B5_OES          0x8B97
>+#define GL_PALETTE8_RGBA4_OES             0x8B98
>+#define GL_PALETTE8_RGB5_A1_OES           0x8B99
>+#endif /* GL_OES_compressed_paletted_texture */
>+
>+#ifndef GL_OES_point_size_array
>+#define GL_OES_point_size_array 1
>+#define GL_POINT_SIZE_ARRAY_OES           0x8B9C
>+#define GL_POINT_SIZE_ARRAY_TYPE_OES      0x898A
>+#define GL_POINT_SIZE_ARRAY_STRIDE_OES    0x898B
>+#define GL_POINT_SIZE_ARRAY_POINTER_OES   0x898C
>+#define GL_POINT_SIZE_ARRAY_BUFFER_BINDING_OES 0x8B9F
>+typedef void (GL_APIENTRYP PFNGLPOINTSIZEPOINTEROESPROC) (GLenum type, GLsizei stride, const void *pointer);
>+#if GL_GLES_PROTOTYPES
>+GL_API void GL_APIENTRY glPointSizePointerOES (GLenum type, GLsizei stride, const void *pointer);
>+#endif
>+#endif /* GL_OES_point_size_array */
>+
>+#ifndef GL_OES_point_sprite
>+#define GL_OES_point_sprite 1
>+#define GL_POINT_SPRITE_OES               0x8861
>+#define GL_COORD_REPLACE_OES              0x8862
>+#endif /* GL_OES_point_sprite */
>+
>+#ifndef GL_OES_read_format
>+#define GL_OES_read_format 1
>+#define GL_IMPLEMENTATION_COLOR_READ_TYPE_OES 0x8B9A
>+#define GL_IMPLEMENTATION_COLOR_READ_FORMAT_OES 0x8B9B
>+#endif /* GL_OES_read_format */
>+
>+#ifdef __cplusplus
>+}
>+#endif
>+
>+#endif
>diff --git a/Source/ThirdParty/ANGLE/include/GLES/glext.h b/Source/ThirdParty/ANGLE/include/GLES/glext.h
>new file mode 100644
>index 00000000000..ddd4078166e
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/include/GLES/glext.h
>@@ -0,0 +1,965 @@
>+#ifndef __glext_h_
>+#define __glext_h_ 1
>+
>+#ifdef __cplusplus
>+extern "C" {
>+#endif
>+
>+/*
>+** Copyright (c) 2013-2017 The Khronos Group Inc.
>+**
>+** Permission is hereby granted, free of charge, to any person obtaining a
>+** copy of this software and/or associated documentation files (the
>+** "Materials"), to deal in the Materials without restriction, including
>+** without limitation the rights to use, copy, modify, merge, publish,
>+** distribute, sublicense, and/or sell copies of the Materials, and to
>+** permit persons to whom the Materials are furnished to do so, subject to
>+** the following conditions:
>+**
>+** The above copyright notice and this permission notice shall be included
>+** in all copies or substantial portions of the Materials.
>+**
>+** THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
>+** EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
>+** MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
>+** IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
>+** CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
>+** TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
>+** MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
>+*/
>+/*
>+** This header is generated from the Khronos OpenGL / OpenGL ES XML
>+** API Registry. The current version of the Registry, generator scripts
>+** used to make the header, and the header can be found at
>+**   https://github.com/KhronosGroup/OpenGL-Registry
>+*/
>+
>+#ifndef GL_APIENTRYP
>+#define GL_APIENTRYP GL_APIENTRY*
>+#endif
>+
>+/* Generated on date 20171212 */
>+
>+/* Generated C header for:
>+ * API: gles1
>+ * Profile: common
>+ * Versions considered: .*
>+ * Versions emitted: _nomatch_^
>+ * Default extensions included: gles1
>+ * Additional extensions included: _nomatch_^
>+ * Extensions removed: ^(GL_OES_read_format|GL_OES_compressed_paletted_texture|GL_OES_point_size_array|GL_OES_point_sprite)$
>+ */
>+
>+#ifndef GL_OES_EGL_image
>+#define GL_OES_EGL_image 1
>+typedef void *GLeglImageOES;
>+typedef void (GL_APIENTRYP PFNGLEGLIMAGETARGETTEXTURE2DOESPROC) (GLenum target, GLeglImageOES image);
>+typedef void (GL_APIENTRYP PFNGLEGLIMAGETARGETRENDERBUFFERSTORAGEOESPROC) (GLenum target, GLeglImageOES image);
>+#ifdef GL_GLEXT_PROTOTYPES
>+GL_API void GL_APIENTRY glEGLImageTargetTexture2DOES (GLenum target, GLeglImageOES image);
>+GL_API void GL_APIENTRY glEGLImageTargetRenderbufferStorageOES (GLenum target, GLeglImageOES image);
>+#endif
>+#endif /* GL_OES_EGL_image */
>+
>+#ifndef GL_OES_blend_equation_separate
>+#define GL_OES_blend_equation_separate 1
>+#define GL_BLEND_EQUATION_RGB_OES         0x8009
>+#define GL_BLEND_EQUATION_ALPHA_OES       0x883D
>+typedef void (GL_APIENTRYP PFNGLBLENDEQUATIONSEPARATEOESPROC) (GLenum modeRGB, GLenum modeAlpha);
>+#ifdef GL_GLEXT_PROTOTYPES
>+GL_API void GL_APIENTRY glBlendEquationSeparateOES (GLenum modeRGB, GLenum modeAlpha);
>+#endif
>+#endif /* GL_OES_blend_equation_separate */
>+
>+#ifndef GL_OES_blend_func_separate
>+#define GL_OES_blend_func_separate 1
>+#define GL_BLEND_DST_RGB_OES              0x80C8
>+#define GL_BLEND_SRC_RGB_OES              0x80C9
>+#define GL_BLEND_DST_ALPHA_OES            0x80CA
>+#define GL_BLEND_SRC_ALPHA_OES            0x80CB
>+typedef void (GL_APIENTRYP PFNGLBLENDFUNCSEPARATEOESPROC) (GLenum srcRGB, GLenum dstRGB, GLenum srcAlpha, GLenum dstAlpha);
>+#ifdef GL_GLEXT_PROTOTYPES
>+GL_API void GL_APIENTRY glBlendFuncSeparateOES (GLenum srcRGB, GLenum dstRGB, GLenum srcAlpha, GLenum dstAlpha);
>+#endif
>+#endif /* GL_OES_blend_func_separate */
>+
>+#ifndef GL_OES_blend_subtract
>+#define GL_OES_blend_subtract 1
>+#define GL_BLEND_EQUATION_OES             0x8009
>+#define GL_FUNC_ADD_OES                   0x8006
>+#define GL_FUNC_SUBTRACT_OES              0x800A
>+#define GL_FUNC_REVERSE_SUBTRACT_OES      0x800B
>+typedef void (GL_APIENTRYP PFNGLBLENDEQUATIONOESPROC) (GLenum mode);
>+#ifdef GL_GLEXT_PROTOTYPES
>+GL_API void GL_APIENTRY glBlendEquationOES (GLenum mode);
>+#endif
>+#endif /* GL_OES_blend_subtract */
>+
>+#ifndef GL_OES_byte_coordinates
>+#define GL_OES_byte_coordinates 1
>+#endif /* GL_OES_byte_coordinates */
>+
>+#ifndef GL_OES_compressed_ETC1_RGB8_sub_texture
>+#define GL_OES_compressed_ETC1_RGB8_sub_texture 1
>+#endif /* GL_OES_compressed_ETC1_RGB8_sub_texture */
>+
>+#ifndef GL_OES_compressed_ETC1_RGB8_texture
>+#define GL_OES_compressed_ETC1_RGB8_texture 1
>+#define GL_ETC1_RGB8_OES                  0x8D64
>+#endif /* GL_OES_compressed_ETC1_RGB8_texture */
>+
>+#ifndef GL_OES_depth24
>+#define GL_OES_depth24 1
>+#define GL_DEPTH_COMPONENT24_OES          0x81A6
>+#endif /* GL_OES_depth24 */
>+
>+#ifndef GL_OES_depth32
>+#define GL_OES_depth32 1
>+#define GL_DEPTH_COMPONENT32_OES          0x81A7
>+#endif /* GL_OES_depth32 */
>+
>+#ifndef GL_OES_draw_texture
>+#define GL_OES_draw_texture 1
>+#define GL_TEXTURE_CROP_RECT_OES          0x8B9D
>+typedef void (GL_APIENTRYP PFNGLDRAWTEXSOESPROC) (GLshort x, GLshort y, GLshort z, GLshort width, GLshort height);
>+typedef void (GL_APIENTRYP PFNGLDRAWTEXIOESPROC) (GLint x, GLint y, GLint z, GLint width, GLint height);
>+typedef void (GL_APIENTRYP PFNGLDRAWTEXXOESPROC) (GLfixed x, GLfixed y, GLfixed z, GLfixed width, GLfixed height);
>+typedef void (GL_APIENTRYP PFNGLDRAWTEXSVOESPROC) (const GLshort *coords);
>+typedef void (GL_APIENTRYP PFNGLDRAWTEXIVOESPROC) (const GLint *coords);
>+typedef void (GL_APIENTRYP PFNGLDRAWTEXXVOESPROC) (const GLfixed *coords);
>+typedef void (GL_APIENTRYP PFNGLDRAWTEXFOESPROC) (GLfloat x, GLfloat y, GLfloat z, GLfloat width, GLfloat height);
>+typedef void (GL_APIENTRYP PFNGLDRAWTEXFVOESPROC) (const GLfloat *coords);
>+#ifdef GL_GLEXT_PROTOTYPES
>+GL_API void GL_APIENTRY glDrawTexsOES (GLshort x, GLshort y, GLshort z, GLshort width, GLshort height);
>+GL_API void GL_APIENTRY glDrawTexiOES (GLint x, GLint y, GLint z, GLint width, GLint height);
>+GL_API void GL_APIENTRY glDrawTexxOES (GLfixed x, GLfixed y, GLfixed z, GLfixed width, GLfixed height);
>+GL_API void GL_APIENTRY glDrawTexsvOES (const GLshort *coords);
>+GL_API void GL_APIENTRY glDrawTexivOES (const GLint *coords);
>+GL_API void GL_APIENTRY glDrawTexxvOES (const GLfixed *coords);
>+GL_API void GL_APIENTRY glDrawTexfOES (GLfloat x, GLfloat y, GLfloat z, GLfloat width, GLfloat height);
>+GL_API void GL_APIENTRY glDrawTexfvOES (const GLfloat *coords);
>+#endif
>+#endif /* GL_OES_draw_texture */
>+
>+#ifndef GL_OES_element_index_uint
>+#define GL_OES_element_index_uint 1
>+#define GL_UNSIGNED_INT                   0x1405
>+#endif /* GL_OES_element_index_uint */
>+
>+#ifndef GL_OES_extended_matrix_palette
>+#define GL_OES_extended_matrix_palette 1
>+#endif /* GL_OES_extended_matrix_palette */
>+
>+#ifndef GL_OES_fbo_render_mipmap
>+#define GL_OES_fbo_render_mipmap 1
>+#endif /* GL_OES_fbo_render_mipmap */
>+
>+#ifndef GL_OES_fixed_point
>+#define GL_OES_fixed_point 1
>+#define GL_FIXED_OES                      0x140C
>+typedef void (GL_APIENTRYP PFNGLALPHAFUNCXOESPROC) (GLenum func, GLfixed ref);
>+typedef void (GL_APIENTRYP PFNGLCLEARCOLORXOESPROC) (GLfixed red, GLfixed green, GLfixed blue, GLfixed alpha);
>+typedef void (GL_APIENTRYP PFNGLCLEARDEPTHXOESPROC) (GLfixed depth);
>+typedef void (GL_APIENTRYP PFNGLCLIPPLANEXOESPROC) (GLenum plane, const GLfixed *equation);
>+typedef void (GL_APIENTRYP PFNGLCOLOR4XOESPROC) (GLfixed red, GLfixed green, GLfixed blue, GLfixed alpha);
>+typedef void (GL_APIENTRYP PFNGLDEPTHRANGEXOESPROC) (GLfixed n, GLfixed f);
>+typedef void (GL_APIENTRYP PFNGLFOGXOESPROC) (GLenum pname, GLfixed param);
>+typedef void (GL_APIENTRYP PFNGLFOGXVOESPROC) (GLenum pname, const GLfixed *param);
>+typedef void (GL_APIENTRYP PFNGLFRUSTUMXOESPROC) (GLfixed l, GLfixed r, GLfixed b, GLfixed t, GLfixed n, GLfixed f);
>+typedef void (GL_APIENTRYP PFNGLGETCLIPPLANEXOESPROC) (GLenum plane, GLfixed *equation);
>+typedef void (GL_APIENTRYP PFNGLGETFIXEDVOESPROC) (GLenum pname, GLfixed *params);
>+typedef void (GL_APIENTRYP PFNGLGETTEXENVXVOESPROC) (GLenum target, GLenum pname, GLfixed *params);
>+typedef void (GL_APIENTRYP PFNGLGETTEXPARAMETERXVOESPROC) (GLenum target, GLenum pname, GLfixed *params);
>+typedef void (GL_APIENTRYP PFNGLLIGHTMODELXOESPROC) (GLenum pname, GLfixed param);
>+typedef void (GL_APIENTRYP PFNGLLIGHTMODELXVOESPROC) (GLenum pname, const GLfixed *param);
>+typedef void (GL_APIENTRYP PFNGLLIGHTXOESPROC) (GLenum light, GLenum pname, GLfixed param);
>+typedef void (GL_APIENTRYP PFNGLLIGHTXVOESPROC) (GLenum light, GLenum pname, const GLfixed *params);
>+typedef void (GL_APIENTRYP PFNGLLINEWIDTHXOESPROC) (GLfixed width);
>+typedef void (GL_APIENTRYP PFNGLLOADMATRIXXOESPROC) (const GLfixed *m);
>+typedef void (GL_APIENTRYP PFNGLMATERIALXOESPROC) (GLenum face, GLenum pname, GLfixed param);
>+typedef void (GL_APIENTRYP PFNGLMATERIALXVOESPROC) (GLenum face, GLenum pname, const GLfixed *param);
>+typedef void (GL_APIENTRYP PFNGLMULTMATRIXXOESPROC) (const GLfixed *m);
>+typedef void (GL_APIENTRYP PFNGLMULTITEXCOORD4XOESPROC) (GLenum texture, GLfixed s, GLfixed t, GLfixed r, GLfixed q);
>+typedef void (GL_APIENTRYP PFNGLNORMAL3XOESPROC) (GLfixed nx, GLfixed ny, GLfixed nz);
>+typedef void (GL_APIENTRYP PFNGLORTHOXOESPROC) (GLfixed l, GLfixed r, GLfixed b, GLfixed t, GLfixed n, GLfixed f);
>+typedef void (GL_APIENTRYP PFNGLPOINTPARAMETERXVOESPROC) (GLenum pname, const GLfixed *params);
>+typedef void (GL_APIENTRYP PFNGLPOINTSIZEXOESPROC) (GLfixed size);
>+typedef void (GL_APIENTRYP PFNGLPOLYGONOFFSETXOESPROC) (GLfixed factor, GLfixed units);
>+typedef void (GL_APIENTRYP PFNGLROTATEXOESPROC) (GLfixed angle, GLfixed x, GLfixed y, GLfixed z);
>+typedef void (GL_APIENTRYP PFNGLSCALEXOESPROC) (GLfixed x, GLfixed y, GLfixed z);
>+typedef void (GL_APIENTRYP PFNGLTEXENVXOESPROC) (GLenum target, GLenum pname, GLfixed param);
>+typedef void (GL_APIENTRYP PFNGLTEXENVXVOESPROC) (GLenum target, GLenum pname, const GLfixed *params);
>+typedef void (GL_APIENTRYP PFNGLTEXPARAMETERXOESPROC) (GLenum target, GLenum pname, GLfixed param);
>+typedef void (GL_APIENTRYP PFNGLTEXPARAMETERXVOESPROC) (GLenum target, GLenum pname, const GLfixed *params);
>+typedef void (GL_APIENTRYP PFNGLTRANSLATEXOESPROC) (GLfixed x, GLfixed y, GLfixed z);
>+typedef void (GL_APIENTRYP PFNGLGETLIGHTXVOESPROC) (GLenum light, GLenum pname, GLfixed *params);
>+typedef void (GL_APIENTRYP PFNGLGETMATERIALXVOESPROC) (GLenum face, GLenum pname, GLfixed *params);
>+typedef void (GL_APIENTRYP PFNGLPOINTPARAMETERXOESPROC) (GLenum pname, GLfixed param);
>+typedef void (GL_APIENTRYP PFNGLSAMPLECOVERAGEXOESPROC) (GLclampx value, GLboolean invert);
>+typedef void (GL_APIENTRYP PFNGLGETTEXGENXVOESPROC) (GLenum coord, GLenum pname, GLfixed *params);
>+typedef void (GL_APIENTRYP PFNGLTEXGENXOESPROC) (GLenum coord, GLenum pname, GLfixed param);
>+typedef void (GL_APIENTRYP PFNGLTEXGENXVOESPROC) (GLenum coord, GLenum pname, const GLfixed *params);
>+#ifdef GL_GLEXT_PROTOTYPES
>+GL_API void GL_APIENTRY glAlphaFuncxOES (GLenum func, GLfixed ref);
>+GL_API void GL_APIENTRY glClearColorxOES (GLfixed red, GLfixed green, GLfixed blue, GLfixed alpha);
>+GL_API void GL_APIENTRY glClearDepthxOES (GLfixed depth);
>+GL_API void GL_APIENTRY glClipPlanexOES (GLenum plane, const GLfixed *equation);
>+GL_API void GL_APIENTRY glColor4xOES (GLfixed red, GLfixed green, GLfixed blue, GLfixed alpha);
>+GL_API void GL_APIENTRY glDepthRangexOES (GLfixed n, GLfixed f);
>+GL_API void GL_APIENTRY glFogxOES (GLenum pname, GLfixed param);
>+GL_API void GL_APIENTRY glFogxvOES (GLenum pname, const GLfixed *param);
>+GL_API void GL_APIENTRY glFrustumxOES (GLfixed l, GLfixed r, GLfixed b, GLfixed t, GLfixed n, GLfixed f);
>+GL_API void GL_APIENTRY glGetClipPlanexOES (GLenum plane, GLfixed *equation);
>+GL_API void GL_APIENTRY glGetFixedvOES (GLenum pname, GLfixed *params);
>+GL_API void GL_APIENTRY glGetTexEnvxvOES (GLenum target, GLenum pname, GLfixed *params);
>+GL_API void GL_APIENTRY glGetTexParameterxvOES (GLenum target, GLenum pname, GLfixed *params);
>+GL_API void GL_APIENTRY glLightModelxOES (GLenum pname, GLfixed param);
>+GL_API void GL_APIENTRY glLightModelxvOES (GLenum pname, const GLfixed *param);
>+GL_API void GL_APIENTRY glLightxOES (GLenum light, GLenum pname, GLfixed param);
>+GL_API void GL_APIENTRY glLightxvOES (GLenum light, GLenum pname, const GLfixed *params);
>+GL_API void GL_APIENTRY glLineWidthxOES (GLfixed width);
>+GL_API void GL_APIENTRY glLoadMatrixxOES (const GLfixed *m);
>+GL_API void GL_APIENTRY glMaterialxOES (GLenum face, GLenum pname, GLfixed param);
>+GL_API void GL_APIENTRY glMaterialxvOES (GLenum face, GLenum pname, const GLfixed *param);
>+GL_API void GL_APIENTRY glMultMatrixxOES (const GLfixed *m);
>+GL_API void GL_APIENTRY glMultiTexCoord4xOES (GLenum texture, GLfixed s, GLfixed t, GLfixed r, GLfixed q);
>+GL_API void GL_APIENTRY glNormal3xOES (GLfixed nx, GLfixed ny, GLfixed nz);
>+GL_API void GL_APIENTRY glOrthoxOES (GLfixed l, GLfixed r, GLfixed b, GLfixed t, GLfixed n, GLfixed f);
>+GL_API void GL_APIENTRY glPointParameterxvOES (GLenum pname, const GLfixed *params);
>+GL_API void GL_APIENTRY glPointSizexOES (GLfixed size);
>+GL_API void GL_APIENTRY glPolygonOffsetxOES (GLfixed factor, GLfixed units);
>+GL_API void GL_APIENTRY glRotatexOES (GLfixed angle, GLfixed x, GLfixed y, GLfixed z);
>+GL_API void GL_APIENTRY glScalexOES (GLfixed x, GLfixed y, GLfixed z);
>+GL_API void GL_APIENTRY glTexEnvxOES (GLenum target, GLenum pname, GLfixed param);
>+GL_API void GL_APIENTRY glTexEnvxvOES (GLenum target, GLenum pname, const GLfixed *params);
>+GL_API void GL_APIENTRY glTexParameterxOES (GLenum target, GLenum pname, GLfixed param);
>+GL_API void GL_APIENTRY glTexParameterxvOES (GLenum target, GLenum pname, const GLfixed *params);
>+GL_API void GL_APIENTRY glTranslatexOES (GLfixed x, GLfixed y, GLfixed z);
>+GL_API void GL_APIENTRY glGetLightxvOES (GLenum light, GLenum pname, GLfixed *params);
>+GL_API void GL_APIENTRY glGetMaterialxvOES (GLenum face, GLenum pname, GLfixed *params);
>+GL_API void GL_APIENTRY glPointParameterxOES (GLenum pname, GLfixed param);
>+GL_API void GL_APIENTRY glSampleCoveragexOES (GLclampx value, GLboolean invert);
>+GL_API void GL_APIENTRY glGetTexGenxvOES (GLenum coord, GLenum pname, GLfixed *params);
>+GL_API void GL_APIENTRY glTexGenxOES (GLenum coord, GLenum pname, GLfixed param);
>+GL_API void GL_APIENTRY glTexGenxvOES (GLenum coord, GLenum pname, const GLfixed *params);
>+#endif
>+#endif /* GL_OES_fixed_point */
>+
>+#ifndef GL_OES_framebuffer_object
>+#define GL_OES_framebuffer_object 1
>+#define GL_NONE_OES                       0
>+#define GL_FRAMEBUFFER_OES                0x8D40
>+#define GL_RENDERBUFFER_OES               0x8D41
>+#define GL_RGBA4_OES                      0x8056
>+#define GL_RGB5_A1_OES                    0x8057
>+#define GL_RGB565_OES                     0x8D62
>+#define GL_DEPTH_COMPONENT16_OES          0x81A5
>+#define GL_RENDERBUFFER_WIDTH_OES         0x8D42
>+#define GL_RENDERBUFFER_HEIGHT_OES        0x8D43
>+#define GL_RENDERBUFFER_INTERNAL_FORMAT_OES 0x8D44
>+#define GL_RENDERBUFFER_RED_SIZE_OES      0x8D50
>+#define GL_RENDERBUFFER_GREEN_SIZE_OES    0x8D51
>+#define GL_RENDERBUFFER_BLUE_SIZE_OES     0x8D52
>+#define GL_RENDERBUFFER_ALPHA_SIZE_OES    0x8D53
>+#define GL_RENDERBUFFER_DEPTH_SIZE_OES    0x8D54
>+#define GL_RENDERBUFFER_STENCIL_SIZE_OES  0x8D55
>+#define GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE_OES 0x8CD0
>+#define GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME_OES 0x8CD1
>+#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL_OES 0x8CD2
>+#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE_OES 0x8CD3
>+#define GL_COLOR_ATTACHMENT0_OES          0x8CE0
>+#define GL_DEPTH_ATTACHMENT_OES           0x8D00
>+#define GL_STENCIL_ATTACHMENT_OES         0x8D20
>+#define GL_FRAMEBUFFER_COMPLETE_OES       0x8CD5
>+#define GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT_OES 0x8CD6
>+#define GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT_OES 0x8CD7
>+#define GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS_OES 0x8CD9
>+#define GL_FRAMEBUFFER_INCOMPLETE_FORMATS_OES 0x8CDA
>+#define GL_FRAMEBUFFER_UNSUPPORTED_OES    0x8CDD
>+#define GL_FRAMEBUFFER_BINDING_OES        0x8CA6
>+#define GL_RENDERBUFFER_BINDING_OES       0x8CA7
>+#define GL_MAX_RENDERBUFFER_SIZE_OES      0x84E8
>+#define GL_INVALID_FRAMEBUFFER_OPERATION_OES 0x0506
>+typedef GLboolean (GL_APIENTRYP PFNGLISRENDERBUFFEROESPROC) (GLuint renderbuffer);
>+typedef void (GL_APIENTRYP PFNGLBINDRENDERBUFFEROESPROC) (GLenum target, GLuint renderbuffer);
>+typedef void (GL_APIENTRYP PFNGLDELETERENDERBUFFERSOESPROC) (GLsizei n, const GLuint *renderbuffers);
>+typedef void (GL_APIENTRYP PFNGLGENRENDERBUFFERSOESPROC) (GLsizei n, GLuint *renderbuffers);
>+typedef void (GL_APIENTRYP PFNGLRENDERBUFFERSTORAGEOESPROC) (GLenum target, GLenum internalformat, GLsizei width, GLsizei height);
>+typedef void (GL_APIENTRYP PFNGLGETRENDERBUFFERPARAMETERIVOESPROC) (GLenum target, GLenum pname, GLint *params);
>+typedef GLboolean (GL_APIENTRYP PFNGLISFRAMEBUFFEROESPROC) (GLuint framebuffer);
>+typedef void (GL_APIENTRYP PFNGLBINDFRAMEBUFFEROESPROC) (GLenum target, GLuint framebuffer);
>+typedef void (GL_APIENTRYP PFNGLDELETEFRAMEBUFFERSOESPROC) (GLsizei n, const GLuint *framebuffers);
>+typedef void (GL_APIENTRYP PFNGLGENFRAMEBUFFERSOESPROC) (GLsizei n, GLuint *framebuffers);
>+typedef GLenum (GL_APIENTRYP PFNGLCHECKFRAMEBUFFERSTATUSOESPROC) (GLenum target);
>+typedef void (GL_APIENTRYP PFNGLFRAMEBUFFERRENDERBUFFEROESPROC) (GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer);
>+typedef void (GL_APIENTRYP PFNGLFRAMEBUFFERTEXTURE2DOESPROC) (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level);
>+typedef void (GL_APIENTRYP PFNGLGETFRAMEBUFFERATTACHMENTPARAMETERIVOESPROC) (GLenum target, GLenum attachment, GLenum pname, GLint *params);
>+typedef void (GL_APIENTRYP PFNGLGENERATEMIPMAPOESPROC) (GLenum target);
>+#ifdef GL_GLEXT_PROTOTYPES
>+GL_API GLboolean GL_APIENTRY glIsRenderbufferOES (GLuint renderbuffer);
>+GL_API void GL_APIENTRY glBindRenderbufferOES (GLenum target, GLuint renderbuffer);
>+GL_API void GL_APIENTRY glDeleteRenderbuffersOES (GLsizei n, const GLuint *renderbuffers);
>+GL_API void GL_APIENTRY glGenRenderbuffersOES (GLsizei n, GLuint *renderbuffers);
>+GL_API void GL_APIENTRY glRenderbufferStorageOES (GLenum target, GLenum internalformat, GLsizei width, GLsizei height);
>+GL_API void GL_APIENTRY glGetRenderbufferParameterivOES (GLenum target, GLenum pname, GLint *params);
>+GL_API GLboolean GL_APIENTRY glIsFramebufferOES (GLuint framebuffer);
>+GL_API void GL_APIENTRY glBindFramebufferOES (GLenum target, GLuint framebuffer);
>+GL_API void GL_APIENTRY glDeleteFramebuffersOES (GLsizei n, const GLuint *framebuffers);
>+GL_API void GL_APIENTRY glGenFramebuffersOES (GLsizei n, GLuint *framebuffers);
>+GL_API GLenum GL_APIENTRY glCheckFramebufferStatusOES (GLenum target);
>+GL_API void GL_APIENTRY glFramebufferRenderbufferOES (GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer);
>+GL_API void GL_APIENTRY glFramebufferTexture2DOES (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level);
>+GL_API void GL_APIENTRY glGetFramebufferAttachmentParameterivOES (GLenum target, GLenum attachment, GLenum pname, GLint *params);
>+GL_API void GL_APIENTRY glGenerateMipmapOES (GLenum target);
>+#endif
>+#endif /* GL_OES_framebuffer_object */
>+
>+#ifndef GL_OES_mapbuffer
>+#define GL_OES_mapbuffer 1
>+#define GL_WRITE_ONLY_OES                 0x88B9
>+#define GL_BUFFER_ACCESS_OES              0x88BB
>+#define GL_BUFFER_MAPPED_OES              0x88BC
>+#define GL_BUFFER_MAP_POINTER_OES         0x88BD
>+typedef void *(GL_APIENTRYP PFNGLMAPBUFFEROESPROC) (GLenum target, GLenum access);
>+typedef GLboolean (GL_APIENTRYP PFNGLUNMAPBUFFEROESPROC) (GLenum target);
>+typedef void (GL_APIENTRYP PFNGLGETBUFFERPOINTERVOESPROC) (GLenum target, GLenum pname, void **params);
>+#ifdef GL_GLEXT_PROTOTYPES
>+GL_API void *GL_APIENTRY glMapBufferOES (GLenum target, GLenum access);
>+GL_API GLboolean GL_APIENTRY glUnmapBufferOES (GLenum target);
>+GL_API void GL_APIENTRY glGetBufferPointervOES (GLenum target, GLenum pname, void **params);
>+#endif
>+#endif /* GL_OES_mapbuffer */
>+
>+#ifndef GL_OES_matrix_get
>+#define GL_OES_matrix_get 1
>+#define GL_MODELVIEW_MATRIX_FLOAT_AS_INT_BITS_OES 0x898D
>+#define GL_PROJECTION_MATRIX_FLOAT_AS_INT_BITS_OES 0x898E
>+#define GL_TEXTURE_MATRIX_FLOAT_AS_INT_BITS_OES 0x898F
>+#endif /* GL_OES_matrix_get */
>+
>+#ifndef GL_OES_matrix_palette
>+#define GL_OES_matrix_palette 1
>+#define GL_MAX_VERTEX_UNITS_OES           0x86A4
>+#define GL_MAX_PALETTE_MATRICES_OES       0x8842
>+#define GL_MATRIX_PALETTE_OES             0x8840
>+#define GL_MATRIX_INDEX_ARRAY_OES         0x8844
>+#define GL_WEIGHT_ARRAY_OES               0x86AD
>+#define GL_CURRENT_PALETTE_MATRIX_OES     0x8843
>+#define GL_MATRIX_INDEX_ARRAY_SIZE_OES    0x8846
>+#define GL_MATRIX_INDEX_ARRAY_TYPE_OES    0x8847
>+#define GL_MATRIX_INDEX_ARRAY_STRIDE_OES  0x8848
>+#define GL_MATRIX_INDEX_ARRAY_POINTER_OES 0x8849
>+#define GL_MATRIX_INDEX_ARRAY_BUFFER_BINDING_OES 0x8B9E
>+#define GL_WEIGHT_ARRAY_SIZE_OES          0x86AB
>+#define GL_WEIGHT_ARRAY_TYPE_OES          0x86A9
>+#define GL_WEIGHT_ARRAY_STRIDE_OES        0x86AA
>+#define GL_WEIGHT_ARRAY_POINTER_OES       0x86AC
>+#define GL_WEIGHT_ARRAY_BUFFER_BINDING_OES 0x889E
>+typedef void (GL_APIENTRYP PFNGLCURRENTPALETTEMATRIXOESPROC) (GLuint matrixpaletteindex);
>+typedef void (GL_APIENTRYP PFNGLLOADPALETTEFROMMODELVIEWMATRIXOESPROC) (void);
>+typedef void (GL_APIENTRYP PFNGLMATRIXINDEXPOINTEROESPROC) (GLint size, GLenum type, GLsizei stride, const void *pointer);
>+typedef void (GL_APIENTRYP PFNGLWEIGHTPOINTEROESPROC) (GLint size, GLenum type, GLsizei stride, const void *pointer);
>+#ifdef GL_GLEXT_PROTOTYPES
>+GL_API void GL_APIENTRY glCurrentPaletteMatrixOES (GLuint matrixpaletteindex);
>+GL_API void GL_APIENTRY glLoadPaletteFromModelViewMatrixOES (void);
>+GL_API void GL_APIENTRY glMatrixIndexPointerOES (GLint size, GLenum type, GLsizei stride, const void *pointer);
>+GL_API void GL_APIENTRY glWeightPointerOES (GLint size, GLenum type, GLsizei stride, const void *pointer);
>+#endif
>+#endif /* GL_OES_matrix_palette */
>+
>+#ifndef GL_OES_packed_depth_stencil
>+#define GL_OES_packed_depth_stencil 1
>+#define GL_DEPTH_STENCIL_OES              0x84F9
>+#define GL_UNSIGNED_INT_24_8_OES          0x84FA
>+#define GL_DEPTH24_STENCIL8_OES           0x88F0
>+#endif /* GL_OES_packed_depth_stencil */
>+
>+#ifndef GL_OES_query_matrix
>+#define GL_OES_query_matrix 1
>+typedef GLbitfield (GL_APIENTRYP PFNGLQUERYMATRIXXOESPROC) (GLfixed *mantissa, GLint *exponent);
>+#ifdef GL_GLEXT_PROTOTYPES
>+GL_API GLbitfield GL_APIENTRY glQueryMatrixxOES (GLfixed *mantissa, GLint *exponent);
>+#endif
>+#endif /* GL_OES_query_matrix */
>+
>+#ifndef GL_OES_required_internalformat
>+#define GL_OES_required_internalformat 1
>+#define GL_ALPHA8_OES                     0x803C
>+#define GL_LUMINANCE4_ALPHA4_OES          0x8043
>+#define GL_LUMINANCE8_ALPHA8_OES          0x8045
>+#define GL_LUMINANCE8_OES                 0x8040
>+#define GL_RGB8_OES                       0x8051
>+#define GL_RGBA8_OES                      0x8058
>+#define GL_RGB10_EXT                      0x8052
>+#define GL_RGB10_A2_EXT                   0x8059
>+#endif /* GL_OES_required_internalformat */
>+
>+#ifndef GL_OES_rgb8_rgba8
>+#define GL_OES_rgb8_rgba8 1
>+#endif /* GL_OES_rgb8_rgba8 */
>+
>+#ifndef GL_OES_single_precision
>+#define GL_OES_single_precision 1
>+typedef void (GL_APIENTRYP PFNGLCLEARDEPTHFOESPROC) (GLclampf depth);
>+typedef void (GL_APIENTRYP PFNGLCLIPPLANEFOESPROC) (GLenum plane, const GLfloat *equation);
>+typedef void (GL_APIENTRYP PFNGLDEPTHRANGEFOESPROC) (GLclampf n, GLclampf f);
>+typedef void (GL_APIENTRYP PFNGLFRUSTUMFOESPROC) (GLfloat l, GLfloat r, GLfloat b, GLfloat t, GLfloat n, GLfloat f);
>+typedef void (GL_APIENTRYP PFNGLGETCLIPPLANEFOESPROC) (GLenum plane, GLfloat *equation);
>+typedef void (GL_APIENTRYP PFNGLORTHOFOESPROC) (GLfloat l, GLfloat r, GLfloat b, GLfloat t, GLfloat n, GLfloat f);
>+#ifdef GL_GLEXT_PROTOTYPES
>+GL_API void GL_APIENTRY glClearDepthfOES (GLclampf depth);
>+GL_API void GL_APIENTRY glClipPlanefOES (GLenum plane, const GLfloat *equation);
>+GL_API void GL_APIENTRY glDepthRangefOES (GLclampf n, GLclampf f);
>+GL_API void GL_APIENTRY glFrustumfOES (GLfloat l, GLfloat r, GLfloat b, GLfloat t, GLfloat n, GLfloat f);
>+GL_API void GL_APIENTRY glGetClipPlanefOES (GLenum plane, GLfloat *equation);
>+GL_API void GL_APIENTRY glOrthofOES (GLfloat l, GLfloat r, GLfloat b, GLfloat t, GLfloat n, GLfloat f);
>+#endif
>+#endif /* GL_OES_single_precision */
>+
>+#ifndef GL_OES_stencil1
>+#define GL_OES_stencil1 1
>+#define GL_STENCIL_INDEX1_OES             0x8D46
>+#endif /* GL_OES_stencil1 */
>+
>+#ifndef GL_OES_stencil4
>+#define GL_OES_stencil4 1
>+#define GL_STENCIL_INDEX4_OES             0x8D47
>+#endif /* GL_OES_stencil4 */
>+
>+#ifndef GL_OES_stencil8
>+#define GL_OES_stencil8 1
>+#define GL_STENCIL_INDEX8_OES             0x8D48
>+#endif /* GL_OES_stencil8 */
>+
>+#ifndef GL_OES_stencil_wrap
>+#define GL_OES_stencil_wrap 1
>+#define GL_INCR_WRAP_OES                  0x8507
>+#define GL_DECR_WRAP_OES                  0x8508
>+#endif /* GL_OES_stencil_wrap */
>+
>+#ifndef GL_OES_surfaceless_context
>+#define GL_OES_surfaceless_context 1
>+#define GL_FRAMEBUFFER_UNDEFINED_OES      0x8219
>+#endif /* GL_OES_surfaceless_context */
>+
>+#ifndef GL_OES_texture_cube_map
>+#define GL_OES_texture_cube_map 1
>+#define GL_NORMAL_MAP_OES                 0x8511
>+#define GL_REFLECTION_MAP_OES             0x8512
>+#define GL_TEXTURE_CUBE_MAP_OES           0x8513
>+#define GL_TEXTURE_BINDING_CUBE_MAP_OES   0x8514
>+#define GL_TEXTURE_CUBE_MAP_POSITIVE_X_OES 0x8515
>+#define GL_TEXTURE_CUBE_MAP_NEGATIVE_X_OES 0x8516
>+#define GL_TEXTURE_CUBE_MAP_POSITIVE_Y_OES 0x8517
>+#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_OES 0x8518
>+#define GL_TEXTURE_CUBE_MAP_POSITIVE_Z_OES 0x8519
>+#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_OES 0x851A
>+#define GL_MAX_CUBE_MAP_TEXTURE_SIZE_OES  0x851C
>+#define GL_TEXTURE_GEN_MODE_OES           0x2500
>+#define GL_TEXTURE_GEN_STR_OES            0x8D60
>+typedef void (GL_APIENTRYP PFNGLTEXGENFOESPROC) (GLenum coord, GLenum pname, GLfloat param);
>+typedef void (GL_APIENTRYP PFNGLTEXGENFVOESPROC) (GLenum coord, GLenum pname, const GLfloat *params);
>+typedef void (GL_APIENTRYP PFNGLTEXGENIOESPROC) (GLenum coord, GLenum pname, GLint param);
>+typedef void (GL_APIENTRYP PFNGLTEXGENIVOESPROC) (GLenum coord, GLenum pname, const GLint *params);
>+typedef void (GL_APIENTRYP PFNGLGETTEXGENFVOESPROC) (GLenum coord, GLenum pname, GLfloat *params);
>+typedef void (GL_APIENTRYP PFNGLGETTEXGENIVOESPROC) (GLenum coord, GLenum pname, GLint *params);
>+#ifdef GL_GLEXT_PROTOTYPES
>+GL_API void GL_APIENTRY glTexGenfOES (GLenum coord, GLenum pname, GLfloat param);
>+GL_API void GL_APIENTRY glTexGenfvOES (GLenum coord, GLenum pname, const GLfloat *params);
>+GL_API void GL_APIENTRY glTexGeniOES (GLenum coord, GLenum pname, GLint param);
>+GL_API void GL_APIENTRY glTexGenivOES (GLenum coord, GLenum pname, const GLint *params);
>+GL_API void GL_APIENTRY glGetTexGenfvOES (GLenum coord, GLenum pname, GLfloat *params);
>+GL_API void GL_APIENTRY glGetTexGenivOES (GLenum coord, GLenum pname, GLint *params);
>+#endif
>+#endif /* GL_OES_texture_cube_map */
>+
>+#ifndef GL_OES_texture_env_crossbar
>+#define GL_OES_texture_env_crossbar 1
>+#endif /* GL_OES_texture_env_crossbar */
>+
>+#ifndef GL_OES_texture_mirrored_repeat
>+#define GL_OES_texture_mirrored_repeat 1
>+#define GL_MIRRORED_REPEAT_OES            0x8370
>+#endif /* GL_OES_texture_mirrored_repeat */
>+
>+#ifndef GL_OES_texture_npot
>+#define GL_OES_texture_npot 1
>+#endif /* GL_OES_texture_npot */
>+
>+#ifndef GL_OES_vertex_array_object
>+#define GL_OES_vertex_array_object 1
>+#define GL_VERTEX_ARRAY_BINDING_OES       0x85B5
>+typedef void (GL_APIENTRYP PFNGLBINDVERTEXARRAYOESPROC) (GLuint array);
>+typedef void (GL_APIENTRYP PFNGLDELETEVERTEXARRAYSOESPROC) (GLsizei n, const GLuint *arrays);
>+typedef void (GL_APIENTRYP PFNGLGENVERTEXARRAYSOESPROC) (GLsizei n, GLuint *arrays);
>+typedef GLboolean (GL_APIENTRYP PFNGLISVERTEXARRAYOESPROC) (GLuint array);
>+#ifdef GL_GLEXT_PROTOTYPES
>+GL_API void GL_APIENTRY glBindVertexArrayOES (GLuint array);
>+GL_API void GL_APIENTRY glDeleteVertexArraysOES (GLsizei n, const GLuint *arrays);
>+GL_API void GL_APIENTRY glGenVertexArraysOES (GLsizei n, GLuint *arrays);
>+GL_API GLboolean GL_APIENTRY glIsVertexArrayOES (GLuint array);
>+#endif
>+#endif /* GL_OES_vertex_array_object */
>+
>+#ifndef GL_AMD_compressed_3DC_texture
>+#define GL_AMD_compressed_3DC_texture 1
>+#define GL_3DC_X_AMD                      0x87F9
>+#define GL_3DC_XY_AMD                     0x87FA
>+#endif /* GL_AMD_compressed_3DC_texture */
>+
>+#ifndef GL_AMD_compressed_ATC_texture
>+#define GL_AMD_compressed_ATC_texture 1
>+#define GL_ATC_RGB_AMD                    0x8C92
>+#define GL_ATC_RGBA_EXPLICIT_ALPHA_AMD    0x8C93
>+#define GL_ATC_RGBA_INTERPOLATED_ALPHA_AMD 0x87EE
>+#endif /* GL_AMD_compressed_ATC_texture */
>+
>+#ifndef GL_APPLE_copy_texture_levels
>+#define GL_APPLE_copy_texture_levels 1
>+typedef void (GL_APIENTRYP PFNGLCOPYTEXTURELEVELSAPPLEPROC) (GLuint destinationTexture, GLuint sourceTexture, GLint sourceBaseLevel, GLsizei sourceLevelCount);
>+#ifdef GL_GLEXT_PROTOTYPES
>+GL_API void GL_APIENTRY glCopyTextureLevelsAPPLE (GLuint destinationTexture, GLuint sourceTexture, GLint sourceBaseLevel, GLsizei sourceLevelCount);
>+#endif
>+#endif /* GL_APPLE_copy_texture_levels */
>+
>+#ifndef GL_APPLE_framebuffer_multisample
>+#define GL_APPLE_framebuffer_multisample 1
>+#define GL_RENDERBUFFER_SAMPLES_APPLE     0x8CAB
>+#define GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE_APPLE 0x8D56
>+#define GL_MAX_SAMPLES_APPLE              0x8D57
>+#define GL_READ_FRAMEBUFFER_APPLE         0x8CA8
>+#define GL_DRAW_FRAMEBUFFER_APPLE         0x8CA9
>+#define GL_DRAW_FRAMEBUFFER_BINDING_APPLE 0x8CA6
>+#define GL_READ_FRAMEBUFFER_BINDING_APPLE 0x8CAA
>+typedef void (GL_APIENTRYP PFNGLRENDERBUFFERSTORAGEMULTISAMPLEAPPLEPROC) (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height);
>+typedef void (GL_APIENTRYP PFNGLRESOLVEMULTISAMPLEFRAMEBUFFERAPPLEPROC) (void);
>+#ifdef GL_GLEXT_PROTOTYPES
>+GL_API void GL_APIENTRY glRenderbufferStorageMultisampleAPPLE (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height);
>+GL_API void GL_APIENTRY glResolveMultisampleFramebufferAPPLE (void);
>+#endif
>+#endif /* GL_APPLE_framebuffer_multisample */
>+
>+#ifndef GL_APPLE_sync
>+#define GL_APPLE_sync 1
>+typedef struct __GLsync *GLsync;
>+typedef khronos_uint64_t GLuint64;
>+typedef khronos_int64_t GLint64;
>+#define GL_SYNC_OBJECT_APPLE              0x8A53
>+#define GL_MAX_SERVER_WAIT_TIMEOUT_APPLE  0x9111
>+#define GL_OBJECT_TYPE_APPLE              0x9112
>+#define GL_SYNC_CONDITION_APPLE           0x9113
>+#define GL_SYNC_STATUS_APPLE              0x9114
>+#define GL_SYNC_FLAGS_APPLE               0x9115
>+#define GL_SYNC_FENCE_APPLE               0x9116
>+#define GL_SYNC_GPU_COMMANDS_COMPLETE_APPLE 0x9117
>+#define GL_UNSIGNALED_APPLE               0x9118
>+#define GL_SIGNALED_APPLE                 0x9119
>+#define GL_ALREADY_SIGNALED_APPLE         0x911A
>+#define GL_TIMEOUT_EXPIRED_APPLE          0x911B
>+#define GL_CONDITION_SATISFIED_APPLE      0x911C
>+#define GL_WAIT_FAILED_APPLE              0x911D
>+#define GL_SYNC_FLUSH_COMMANDS_BIT_APPLE  0x00000001
>+#define GL_TIMEOUT_IGNORED_APPLE          0xFFFFFFFFFFFFFFFFull
>+typedef GLsync (GL_APIENTRYP PFNGLFENCESYNCAPPLEPROC) (GLenum condition, GLbitfield flags);
>+typedef GLboolean (GL_APIENTRYP PFNGLISSYNCAPPLEPROC) (GLsync sync);
>+typedef void (GL_APIENTRYP PFNGLDELETESYNCAPPLEPROC) (GLsync sync);
>+typedef GLenum (GL_APIENTRYP PFNGLCLIENTWAITSYNCAPPLEPROC) (GLsync sync, GLbitfield flags, GLuint64 timeout);
>+typedef void (GL_APIENTRYP PFNGLWAITSYNCAPPLEPROC) (GLsync sync, GLbitfield flags, GLuint64 timeout);
>+typedef void (GL_APIENTRYP PFNGLGETINTEGER64VAPPLEPROC) (GLenum pname, GLint64 *params);
>+typedef void (GL_APIENTRYP PFNGLGETSYNCIVAPPLEPROC) (GLsync sync, GLenum pname, GLsizei bufSize, GLsizei *length, GLint *values);
>+#ifdef GL_GLEXT_PROTOTYPES
>+GL_API GLsync GL_APIENTRY glFenceSyncAPPLE (GLenum condition, GLbitfield flags);
>+GL_API GLboolean GL_APIENTRY glIsSyncAPPLE (GLsync sync);
>+GL_API void GL_APIENTRY glDeleteSyncAPPLE (GLsync sync);
>+GL_API GLenum GL_APIENTRY glClientWaitSyncAPPLE (GLsync sync, GLbitfield flags, GLuint64 timeout);
>+GL_API void GL_APIENTRY glWaitSyncAPPLE (GLsync sync, GLbitfield flags, GLuint64 timeout);
>+GL_API void GL_APIENTRY glGetInteger64vAPPLE (GLenum pname, GLint64 *params);
>+GL_API void GL_APIENTRY glGetSyncivAPPLE (GLsync sync, GLenum pname, GLsizei bufSize, GLsizei *length, GLint *values);
>+#endif
>+#endif /* GL_APPLE_sync */
>+
>+#ifndef GL_APPLE_texture_2D_limited_npot
>+#define GL_APPLE_texture_2D_limited_npot 1
>+#endif /* GL_APPLE_texture_2D_limited_npot */
>+
>+#ifndef GL_APPLE_texture_format_BGRA8888
>+#define GL_APPLE_texture_format_BGRA8888 1
>+#define GL_BGRA_EXT                       0x80E1
>+#define GL_BGRA8_EXT                      0x93A1
>+#endif /* GL_APPLE_texture_format_BGRA8888 */
>+
>+#ifndef GL_APPLE_texture_max_level
>+#define GL_APPLE_texture_max_level 1
>+#define GL_TEXTURE_MAX_LEVEL_APPLE        0x813D
>+#endif /* GL_APPLE_texture_max_level */
>+
>+#ifndef GL_ARM_rgba8
>+#define GL_ARM_rgba8 1
>+#endif /* GL_ARM_rgba8 */
>+
>+#ifndef GL_EXT_blend_minmax
>+#define GL_EXT_blend_minmax 1
>+#define GL_MIN_EXT                        0x8007
>+#define GL_MAX_EXT                        0x8008
>+#endif /* GL_EXT_blend_minmax */
>+
>+#ifndef GL_EXT_debug_marker
>+#define GL_EXT_debug_marker 1
>+typedef char GLchar;
>+typedef void (GL_APIENTRYP PFNGLINSERTEVENTMARKEREXTPROC) (GLsizei length, const GLchar *marker);
>+typedef void (GL_APIENTRYP PFNGLPUSHGROUPMARKEREXTPROC) (GLsizei length, const GLchar *marker);
>+typedef void (GL_APIENTRYP PFNGLPOPGROUPMARKEREXTPROC) (void);
>+#ifdef GL_GLEXT_PROTOTYPES
>+GL_API void GL_APIENTRY glInsertEventMarkerEXT (GLsizei length, const GLchar *marker);
>+GL_API void GL_APIENTRY glPushGroupMarkerEXT (GLsizei length, const GLchar *marker);
>+GL_API void GL_APIENTRY glPopGroupMarkerEXT (void);
>+#endif
>+#endif /* GL_EXT_debug_marker */
>+
>+#ifndef GL_EXT_discard_framebuffer
>+#define GL_EXT_discard_framebuffer 1
>+#define GL_COLOR_EXT                      0x1800
>+#define GL_DEPTH_EXT                      0x1801
>+#define GL_STENCIL_EXT                    0x1802
>+typedef void (GL_APIENTRYP PFNGLDISCARDFRAMEBUFFEREXTPROC) (GLenum target, GLsizei numAttachments, const GLenum *attachments);
>+#ifdef GL_GLEXT_PROTOTYPES
>+GL_API void GL_APIENTRY glDiscardFramebufferEXT (GLenum target, GLsizei numAttachments, const GLenum *attachments);
>+#endif
>+#endif /* GL_EXT_discard_framebuffer */
>+
>+#ifndef GL_EXT_map_buffer_range
>+#define GL_EXT_map_buffer_range 1
>+#define GL_MAP_READ_BIT_EXT               0x0001
>+#define GL_MAP_WRITE_BIT_EXT              0x0002
>+#define GL_MAP_INVALIDATE_RANGE_BIT_EXT   0x0004
>+#define GL_MAP_INVALIDATE_BUFFER_BIT_EXT  0x0008
>+#define GL_MAP_FLUSH_EXPLICIT_BIT_EXT     0x0010
>+#define GL_MAP_UNSYNCHRONIZED_BIT_EXT     0x0020
>+typedef void *(GL_APIENTRYP PFNGLMAPBUFFERRANGEEXTPROC) (GLenum target, GLintptr offset, GLsizeiptr length, GLbitfield access);
>+typedef void (GL_APIENTRYP PFNGLFLUSHMAPPEDBUFFERRANGEEXTPROC) (GLenum target, GLintptr offset, GLsizeiptr length);
>+#ifdef GL_GLEXT_PROTOTYPES
>+GL_API void *GL_APIENTRY glMapBufferRangeEXT (GLenum target, GLintptr offset, GLsizeiptr length, GLbitfield access);
>+GL_API void GL_APIENTRY glFlushMappedBufferRangeEXT (GLenum target, GLintptr offset, GLsizeiptr length);
>+#endif
>+#endif /* GL_EXT_map_buffer_range */
>+
>+#ifndef GL_EXT_multi_draw_arrays
>+#define GL_EXT_multi_draw_arrays 1
>+typedef void (GL_APIENTRYP PFNGLMULTIDRAWARRAYSEXTPROC) (GLenum mode, const GLint *first, const GLsizei *count, GLsizei primcount);
>+typedef void (GL_APIENTRYP PFNGLMULTIDRAWELEMENTSEXTPROC) (GLenum mode, const GLsizei *count, GLenum type, const void *const*indices, GLsizei primcount);
>+#ifdef GL_GLEXT_PROTOTYPES
>+GL_API void GL_APIENTRY glMultiDrawArraysEXT (GLenum mode, const GLint *first, const GLsizei *count, GLsizei primcount);
>+GL_API void GL_APIENTRY glMultiDrawElementsEXT (GLenum mode, const GLsizei *count, GLenum type, const void *const*indices, GLsizei primcount);
>+#endif
>+#endif /* GL_EXT_multi_draw_arrays */
>+
>+#ifndef GL_EXT_multisampled_render_to_texture
>+#define GL_EXT_multisampled_render_to_texture 1
>+#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_SAMPLES_EXT 0x8D6C
>+#define GL_RENDERBUFFER_SAMPLES_EXT       0x8CAB
>+#define GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE_EXT 0x8D56
>+#define GL_MAX_SAMPLES_EXT                0x8D57
>+typedef void (GL_APIENTRYP PFNGLRENDERBUFFERSTORAGEMULTISAMPLEEXTPROC) (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height);
>+typedef void (GL_APIENTRYP PFNGLFRAMEBUFFERTEXTURE2DMULTISAMPLEEXTPROC) (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLsizei samples);
>+#ifdef GL_GLEXT_PROTOTYPES
>+GL_API void GL_APIENTRY glRenderbufferStorageMultisampleEXT (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height);
>+GL_API void GL_APIENTRY glFramebufferTexture2DMultisampleEXT (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLsizei samples);
>+#endif
>+#endif /* GL_EXT_multisampled_render_to_texture */
>+
>+#ifndef GL_EXT_read_format_bgra
>+#define GL_EXT_read_format_bgra 1
>+#define GL_UNSIGNED_SHORT_4_4_4_4_REV_EXT 0x8365
>+#define GL_UNSIGNED_SHORT_1_5_5_5_REV_EXT 0x8366
>+#endif /* GL_EXT_read_format_bgra */
>+
>+#ifndef GL_EXT_robustness
>+#define GL_EXT_robustness 1
>+#define GL_GUILTY_CONTEXT_RESET_EXT       0x8253
>+#define GL_INNOCENT_CONTEXT_RESET_EXT     0x8254
>+#define GL_UNKNOWN_CONTEXT_RESET_EXT      0x8255
>+#define GL_CONTEXT_ROBUST_ACCESS_EXT      0x90F3
>+#define GL_RESET_NOTIFICATION_STRATEGY_EXT 0x8256
>+#define GL_LOSE_CONTEXT_ON_RESET_EXT      0x8252
>+#define GL_NO_RESET_NOTIFICATION_EXT      0x8261
>+typedef GLenum (GL_APIENTRYP PFNGLGETGRAPHICSRESETSTATUSEXTPROC) (void);
>+typedef void (GL_APIENTRYP PFNGLREADNPIXELSEXTPROC) (GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLsizei bufSize, void *data);
>+typedef void (GL_APIENTRYP PFNGLGETNUNIFORMFVEXTPROC) (GLuint program, GLint location, GLsizei bufSize, GLfloat *params);
>+typedef void (GL_APIENTRYP PFNGLGETNUNIFORMIVEXTPROC) (GLuint program, GLint location, GLsizei bufSize, GLint *params);
>+#ifdef GL_GLEXT_PROTOTYPES
>+GL_API GLenum GL_APIENTRY glGetGraphicsResetStatusEXT (void);
>+GL_API void GL_APIENTRY glReadnPixelsEXT (GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLsizei bufSize, void *data);
>+GL_API void GL_APIENTRY glGetnUniformfvEXT (GLuint program, GLint location, GLsizei bufSize, GLfloat *params);
>+GL_API void GL_APIENTRY glGetnUniformivEXT (GLuint program, GLint location, GLsizei bufSize, GLint *params);
>+#endif
>+#endif /* GL_EXT_robustness */
>+
>+#ifndef GL_EXT_sRGB
>+#define GL_EXT_sRGB 1
>+#define GL_SRGB_EXT                       0x8C40
>+#define GL_SRGB_ALPHA_EXT                 0x8C42
>+#define GL_SRGB8_ALPHA8_EXT               0x8C43
>+#define GL_FRAMEBUFFER_ATTACHMENT_COLOR_ENCODING_EXT 0x8210
>+#endif /* GL_EXT_sRGB */
>+
>+#ifndef GL_EXT_texture_compression_dxt1
>+#define GL_EXT_texture_compression_dxt1 1
>+#define GL_COMPRESSED_RGB_S3TC_DXT1_EXT   0x83F0
>+#define GL_COMPRESSED_RGBA_S3TC_DXT1_EXT  0x83F1
>+#endif /* GL_EXT_texture_compression_dxt1 */
>+
>+#ifndef GL_EXT_texture_filter_anisotropic
>+#define GL_EXT_texture_filter_anisotropic 1
>+#define GL_TEXTURE_MAX_ANISOTROPY_EXT     0x84FE
>+#define GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT 0x84FF
>+#endif /* GL_EXT_texture_filter_anisotropic */
>+
>+#ifndef GL_EXT_texture_format_BGRA8888
>+#define GL_EXT_texture_format_BGRA8888 1
>+#endif /* GL_EXT_texture_format_BGRA8888 */
>+
>+#ifndef GL_EXT_texture_lod_bias
>+#define GL_EXT_texture_lod_bias 1
>+#define GL_MAX_TEXTURE_LOD_BIAS_EXT       0x84FD
>+#define GL_TEXTURE_FILTER_CONTROL_EXT     0x8500
>+#define GL_TEXTURE_LOD_BIAS_EXT           0x8501
>+#endif /* GL_EXT_texture_lod_bias */
>+
>+#ifndef GL_EXT_texture_storage
>+#define GL_EXT_texture_storage 1
>+#define GL_TEXTURE_IMMUTABLE_FORMAT_EXT   0x912F
>+#define GL_ALPHA8_EXT                     0x803C
>+#define GL_LUMINANCE8_EXT                 0x8040
>+#define GL_LUMINANCE8_ALPHA8_EXT          0x8045
>+#define GL_RGBA32F_EXT                    0x8814
>+#define GL_RGB32F_EXT                     0x8815
>+#define GL_ALPHA32F_EXT                   0x8816
>+#define GL_LUMINANCE32F_EXT               0x8818
>+#define GL_LUMINANCE_ALPHA32F_EXT         0x8819
>+#define GL_RGBA16F_EXT                    0x881A
>+#define GL_RGB16F_EXT                     0x881B
>+#define GL_ALPHA16F_EXT                   0x881C
>+#define GL_LUMINANCE16F_EXT               0x881E
>+#define GL_LUMINANCE_ALPHA16F_EXT         0x881F
>+#define GL_R8_EXT                         0x8229
>+#define GL_RG8_EXT                        0x822B
>+#define GL_R32F_EXT                       0x822E
>+#define GL_RG32F_EXT                      0x8230
>+#define GL_R16F_EXT                       0x822D
>+#define GL_RG16F_EXT                      0x822F
>+typedef void (GL_APIENTRYP PFNGLTEXSTORAGE1DEXTPROC) (GLenum target, GLsizei levels, GLenum internalformat, GLsizei width);
>+typedef void (GL_APIENTRYP PFNGLTEXSTORAGE2DEXTPROC) (GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height);
>+typedef void (GL_APIENTRYP PFNGLTEXSTORAGE3DEXTPROC) (GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth);
>+typedef void (GL_APIENTRYP PFNGLTEXTURESTORAGE1DEXTPROC) (GLuint texture, GLenum target, GLsizei levels, GLenum internalformat, GLsizei width);
>+typedef void (GL_APIENTRYP PFNGLTEXTURESTORAGE2DEXTPROC) (GLuint texture, GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height);
>+typedef void (GL_APIENTRYP PFNGLTEXTURESTORAGE3DEXTPROC) (GLuint texture, GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth);
>+#ifdef GL_GLEXT_PROTOTYPES
>+GL_API void GL_APIENTRY glTexStorage1DEXT (GLenum target, GLsizei levels, GLenum internalformat, GLsizei width);
>+GL_API void GL_APIENTRY glTexStorage2DEXT (GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height);
>+GL_API void GL_APIENTRY glTexStorage3DEXT (GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth);
>+GL_API void GL_APIENTRY glTextureStorage1DEXT (GLuint texture, GLenum target, GLsizei levels, GLenum internalformat, GLsizei width);
>+GL_API void GL_APIENTRY glTextureStorage2DEXT (GLuint texture, GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height);
>+GL_API void GL_APIENTRY glTextureStorage3DEXT (GLuint texture, GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth);
>+#endif
>+#endif /* GL_EXT_texture_storage */
>+
>+#ifndef GL_IMG_multisampled_render_to_texture
>+#define GL_IMG_multisampled_render_to_texture 1
>+#define GL_RENDERBUFFER_SAMPLES_IMG       0x9133
>+#define GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE_IMG 0x9134
>+#define GL_MAX_SAMPLES_IMG                0x9135
>+#define GL_TEXTURE_SAMPLES_IMG            0x9136
>+typedef void (GL_APIENTRYP PFNGLRENDERBUFFERSTORAGEMULTISAMPLEIMGPROC) (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height);
>+typedef void (GL_APIENTRYP PFNGLFRAMEBUFFERTEXTURE2DMULTISAMPLEIMGPROC) (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLsizei samples);
>+#ifdef GL_GLEXT_PROTOTYPES
>+GL_API void GL_APIENTRY glRenderbufferStorageMultisampleIMG (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height);
>+GL_API void GL_APIENTRY glFramebufferTexture2DMultisampleIMG (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLsizei samples);
>+#endif
>+#endif /* GL_IMG_multisampled_render_to_texture */
>+
>+#ifndef GL_IMG_read_format
>+#define GL_IMG_read_format 1
>+#define GL_BGRA_IMG                       0x80E1
>+#define GL_UNSIGNED_SHORT_4_4_4_4_REV_IMG 0x8365
>+#endif /* GL_IMG_read_format */
>+
>+#ifndef GL_IMG_texture_compression_pvrtc
>+#define GL_IMG_texture_compression_pvrtc 1
>+#define GL_COMPRESSED_RGB_PVRTC_4BPPV1_IMG 0x8C00
>+#define GL_COMPRESSED_RGB_PVRTC_2BPPV1_IMG 0x8C01
>+#define GL_COMPRESSED_RGBA_PVRTC_4BPPV1_IMG 0x8C02
>+#define GL_COMPRESSED_RGBA_PVRTC_2BPPV1_IMG 0x8C03
>+#endif /* GL_IMG_texture_compression_pvrtc */
>+
>+#ifndef GL_IMG_texture_env_enhanced_fixed_function
>+#define GL_IMG_texture_env_enhanced_fixed_function 1
>+#define GL_MODULATE_COLOR_IMG             0x8C04
>+#define GL_RECIP_ADD_SIGNED_ALPHA_IMG     0x8C05
>+#define GL_TEXTURE_ALPHA_MODULATE_IMG     0x8C06
>+#define GL_FACTOR_ALPHA_MODULATE_IMG      0x8C07
>+#define GL_FRAGMENT_ALPHA_MODULATE_IMG    0x8C08
>+#define GL_ADD_BLEND_IMG                  0x8C09
>+#define GL_DOT3_RGBA_IMG                  0x86AF
>+#endif /* GL_IMG_texture_env_enhanced_fixed_function */
>+
>+#ifndef GL_IMG_user_clip_plane
>+#define GL_IMG_user_clip_plane 1
>+#define GL_CLIP_PLANE0_IMG                0x3000
>+#define GL_CLIP_PLANE1_IMG                0x3001
>+#define GL_CLIP_PLANE2_IMG                0x3002
>+#define GL_CLIP_PLANE3_IMG                0x3003
>+#define GL_CLIP_PLANE4_IMG                0x3004
>+#define GL_CLIP_PLANE5_IMG                0x3005
>+#define GL_MAX_CLIP_PLANES_IMG            0x0D32
>+typedef void (GL_APIENTRYP PFNGLCLIPPLANEFIMGPROC) (GLenum p, const GLfloat *eqn);
>+typedef void (GL_APIENTRYP PFNGLCLIPPLANEXIMGPROC) (GLenum p, const GLfixed *eqn);
>+#ifdef GL_GLEXT_PROTOTYPES
>+GL_API void GL_APIENTRY glClipPlanefIMG (GLenum p, const GLfloat *eqn);
>+GL_API void GL_APIENTRY glClipPlanexIMG (GLenum p, const GLfixed *eqn);
>+#endif
>+#endif /* GL_IMG_user_clip_plane */
>+
>+#ifndef GL_NV_fence
>+#define GL_NV_fence 1
>+#define GL_ALL_COMPLETED_NV               0x84F2
>+#define GL_FENCE_STATUS_NV                0x84F3
>+#define GL_FENCE_CONDITION_NV             0x84F4
>+typedef void (GL_APIENTRYP PFNGLDELETEFENCESNVPROC) (GLsizei n, const GLuint *fences);
>+typedef void (GL_APIENTRYP PFNGLGENFENCESNVPROC) (GLsizei n, GLuint *fences);
>+typedef GLboolean (GL_APIENTRYP PFNGLISFENCENVPROC) (GLuint fence);
>+typedef GLboolean (GL_APIENTRYP PFNGLTESTFENCENVPROC) (GLuint fence);
>+typedef void (GL_APIENTRYP PFNGLGETFENCEIVNVPROC) (GLuint fence, GLenum pname, GLint *params);
>+typedef void (GL_APIENTRYP PFNGLFINISHFENCENVPROC) (GLuint fence);
>+typedef void (GL_APIENTRYP PFNGLSETFENCENVPROC) (GLuint fence, GLenum condition);
>+#ifdef GL_GLEXT_PROTOTYPES
>+GL_API void GL_APIENTRY glDeleteFencesNV (GLsizei n, const GLuint *fences);
>+GL_API void GL_APIENTRY glGenFencesNV (GLsizei n, GLuint *fences);
>+GL_API GLboolean GL_APIENTRY glIsFenceNV (GLuint fence);
>+GL_API GLboolean GL_APIENTRY glTestFenceNV (GLuint fence);
>+GL_API void GL_APIENTRY glGetFenceivNV (GLuint fence, GLenum pname, GLint *params);
>+GL_API void GL_APIENTRY glFinishFenceNV (GLuint fence);
>+GL_API void GL_APIENTRY glSetFenceNV (GLuint fence, GLenum condition);
>+#endif
>+#endif /* GL_NV_fence */
>+
>+#ifndef GL_QCOM_driver_control
>+#define GL_QCOM_driver_control 1
>+typedef void (GL_APIENTRYP PFNGLGETDRIVERCONTROLSQCOMPROC) (GLint *num, GLsizei size, GLuint *driverControls);
>+typedef void (GL_APIENTRYP PFNGLGETDRIVERCONTROLSTRINGQCOMPROC) (GLuint driverControl, GLsizei bufSize, GLsizei *length, GLchar *driverControlString);
>+typedef void (GL_APIENTRYP PFNGLENABLEDRIVERCONTROLQCOMPROC) (GLuint driverControl);
>+typedef void (GL_APIENTRYP PFNGLDISABLEDRIVERCONTROLQCOMPROC) (GLuint driverControl);
>+#ifdef GL_GLEXT_PROTOTYPES
>+GL_API void GL_APIENTRY glGetDriverControlsQCOM (GLint *num, GLsizei size, GLuint *driverControls);
>+GL_API void GL_APIENTRY glGetDriverControlStringQCOM (GLuint driverControl, GLsizei bufSize, GLsizei *length, GLchar *driverControlString);
>+GL_API void GL_APIENTRY glEnableDriverControlQCOM (GLuint driverControl);
>+GL_API void GL_APIENTRY glDisableDriverControlQCOM (GLuint driverControl);
>+#endif
>+#endif /* GL_QCOM_driver_control */
>+
>+#ifndef GL_QCOM_extended_get
>+#define GL_QCOM_extended_get 1
>+#define GL_TEXTURE_WIDTH_QCOM             0x8BD2
>+#define GL_TEXTURE_HEIGHT_QCOM            0x8BD3
>+#define GL_TEXTURE_DEPTH_QCOM             0x8BD4
>+#define GL_TEXTURE_INTERNAL_FORMAT_QCOM   0x8BD5
>+#define GL_TEXTURE_FORMAT_QCOM            0x8BD6
>+#define GL_TEXTURE_TYPE_QCOM              0x8BD7
>+#define GL_TEXTURE_IMAGE_VALID_QCOM       0x8BD8
>+#define GL_TEXTURE_NUM_LEVELS_QCOM        0x8BD9
>+#define GL_TEXTURE_TARGET_QCOM            0x8BDA
>+#define GL_TEXTURE_OBJECT_VALID_QCOM      0x8BDB
>+#define GL_STATE_RESTORE                  0x8BDC
>+typedef void (GL_APIENTRYP PFNGLEXTGETTEXTURESQCOMPROC) (GLuint *textures, GLint maxTextures, GLint *numTextures);
>+typedef void (GL_APIENTRYP PFNGLEXTGETBUFFERSQCOMPROC) (GLuint *buffers, GLint maxBuffers, GLint *numBuffers);
>+typedef void (GL_APIENTRYP PFNGLEXTGETRENDERBUFFERSQCOMPROC) (GLuint *renderbuffers, GLint maxRenderbuffers, GLint *numRenderbuffers);
>+typedef void (GL_APIENTRYP PFNGLEXTGETFRAMEBUFFERSQCOMPROC) (GLuint *framebuffers, GLint maxFramebuffers, GLint *numFramebuffers);
>+typedef void (GL_APIENTRYP PFNGLEXTGETTEXLEVELPARAMETERIVQCOMPROC) (GLuint texture, GLenum face, GLint level, GLenum pname, GLint *params);
>+typedef void (GL_APIENTRYP PFNGLEXTTEXOBJECTSTATEOVERRIDEIQCOMPROC) (GLenum target, GLenum pname, GLint param);
>+typedef void (GL_APIENTRYP PFNGLEXTGETTEXSUBIMAGEQCOMPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, void *texels);
>+typedef void (GL_APIENTRYP PFNGLEXTGETBUFFERPOINTERVQCOMPROC) (GLenum target, void **params);
>+#ifdef GL_GLEXT_PROTOTYPES
>+GL_API void GL_APIENTRY glExtGetTexturesQCOM (GLuint *textures, GLint maxTextures, GLint *numTextures);
>+GL_API void GL_APIENTRY glExtGetBuffersQCOM (GLuint *buffers, GLint maxBuffers, GLint *numBuffers);
>+GL_API void GL_APIENTRY glExtGetRenderbuffersQCOM (GLuint *renderbuffers, GLint maxRenderbuffers, GLint *numRenderbuffers);
>+GL_API void GL_APIENTRY glExtGetFramebuffersQCOM (GLuint *framebuffers, GLint maxFramebuffers, GLint *numFramebuffers);
>+GL_API void GL_APIENTRY glExtGetTexLevelParameterivQCOM (GLuint texture, GLenum face, GLint level, GLenum pname, GLint *params);
>+GL_API void GL_APIENTRY glExtTexObjectStateOverrideiQCOM (GLenum target, GLenum pname, GLint param);
>+GL_API void GL_APIENTRY glExtGetTexSubImageQCOM (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, void *texels);
>+GL_API void GL_APIENTRY glExtGetBufferPointervQCOM (GLenum target, void **params);
>+#endif
>+#endif /* GL_QCOM_extended_get */
>+
>+#ifndef GL_QCOM_extended_get2
>+#define GL_QCOM_extended_get2 1
>+typedef void (GL_APIENTRYP PFNGLEXTGETSHADERSQCOMPROC) (GLuint *shaders, GLint maxShaders, GLint *numShaders);
>+typedef void (GL_APIENTRYP PFNGLEXTGETPROGRAMSQCOMPROC) (GLuint *programs, GLint maxPrograms, GLint *numPrograms);
>+typedef GLboolean (GL_APIENTRYP PFNGLEXTISPROGRAMBINARYQCOMPROC) (GLuint program);
>+typedef void (GL_APIENTRYP PFNGLEXTGETPROGRAMBINARYSOURCEQCOMPROC) (GLuint program, GLenum shadertype, GLchar *source, GLint *length);
>+#ifdef GL_GLEXT_PROTOTYPES
>+GL_API void GL_APIENTRY glExtGetShadersQCOM (GLuint *shaders, GLint maxShaders, GLint *numShaders);
>+GL_API void GL_APIENTRY glExtGetProgramsQCOM (GLuint *programs, GLint maxPrograms, GLint *numPrograms);
>+GL_API GLboolean GL_APIENTRY glExtIsProgramBinaryQCOM (GLuint program);
>+GL_API void GL_APIENTRY glExtGetProgramBinarySourceQCOM (GLuint program, GLenum shadertype, GLchar *source, GLint *length);
>+#endif
>+#endif /* GL_QCOM_extended_get2 */
>+
>+#ifndef GL_QCOM_perfmon_global_mode
>+#define GL_QCOM_perfmon_global_mode 1
>+#define GL_PERFMON_GLOBAL_MODE_QCOM       0x8FA0
>+#endif /* GL_QCOM_perfmon_global_mode */
>+
>+#ifndef GL_QCOM_tiled_rendering
>+#define GL_QCOM_tiled_rendering 1
>+#define GL_COLOR_BUFFER_BIT0_QCOM         0x00000001
>+#define GL_COLOR_BUFFER_BIT1_QCOM         0x00000002
>+#define GL_COLOR_BUFFER_BIT2_QCOM         0x00000004
>+#define GL_COLOR_BUFFER_BIT3_QCOM         0x00000008
>+#define GL_COLOR_BUFFER_BIT4_QCOM         0x00000010
>+#define GL_COLOR_BUFFER_BIT5_QCOM         0x00000020
>+#define GL_COLOR_BUFFER_BIT6_QCOM         0x00000040
>+#define GL_COLOR_BUFFER_BIT7_QCOM         0x00000080
>+#define GL_DEPTH_BUFFER_BIT0_QCOM         0x00000100
>+#define GL_DEPTH_BUFFER_BIT1_QCOM         0x00000200
>+#define GL_DEPTH_BUFFER_BIT2_QCOM         0x00000400
>+#define GL_DEPTH_BUFFER_BIT3_QCOM         0x00000800
>+#define GL_DEPTH_BUFFER_BIT4_QCOM         0x00001000
>+#define GL_DEPTH_BUFFER_BIT5_QCOM         0x00002000
>+#define GL_DEPTH_BUFFER_BIT6_QCOM         0x00004000
>+#define GL_DEPTH_BUFFER_BIT7_QCOM         0x00008000
>+#define GL_STENCIL_BUFFER_BIT0_QCOM       0x00010000
>+#define GL_STENCIL_BUFFER_BIT1_QCOM       0x00020000
>+#define GL_STENCIL_BUFFER_BIT2_QCOM       0x00040000
>+#define GL_STENCIL_BUFFER_BIT3_QCOM       0x00080000
>+#define GL_STENCIL_BUFFER_BIT4_QCOM       0x00100000
>+#define GL_STENCIL_BUFFER_BIT5_QCOM       0x00200000
>+#define GL_STENCIL_BUFFER_BIT6_QCOM       0x00400000
>+#define GL_STENCIL_BUFFER_BIT7_QCOM       0x00800000
>+#define GL_MULTISAMPLE_BUFFER_BIT0_QCOM   0x01000000
>+#define GL_MULTISAMPLE_BUFFER_BIT1_QCOM   0x02000000
>+#define GL_MULTISAMPLE_BUFFER_BIT2_QCOM   0x04000000
>+#define GL_MULTISAMPLE_BUFFER_BIT3_QCOM   0x08000000
>+#define GL_MULTISAMPLE_BUFFER_BIT4_QCOM   0x10000000
>+#define GL_MULTISAMPLE_BUFFER_BIT5_QCOM   0x20000000
>+#define GL_MULTISAMPLE_BUFFER_BIT6_QCOM   0x40000000
>+#define GL_MULTISAMPLE_BUFFER_BIT7_QCOM   0x80000000
>+typedef void (GL_APIENTRYP PFNGLSTARTTILINGQCOMPROC) (GLuint x, GLuint y, GLuint width, GLuint height, GLbitfield preserveMask);
>+typedef void (GL_APIENTRYP PFNGLENDTILINGQCOMPROC) (GLbitfield preserveMask);
>+#ifdef GL_GLEXT_PROTOTYPES
>+GL_API void GL_APIENTRY glStartTilingQCOM (GLuint x, GLuint y, GLuint width, GLuint height, GLbitfield preserveMask);
>+GL_API void GL_APIENTRY glEndTilingQCOM (GLbitfield preserveMask);
>+#endif
>+#endif /* GL_QCOM_tiled_rendering */
>+
>+#ifndef GL_QCOM_writeonly_rendering
>+#define GL_QCOM_writeonly_rendering 1
>+#define GL_WRITEONLY_RENDERING_QCOM       0x8823
>+#endif /* GL_QCOM_writeonly_rendering */
>+
>+/* ANGLE GLES1 extensions */
>+#include "glext_angle.h"
>+
>+#ifdef __cplusplus
>+}
>+#endif
>+
>+#endif
>diff --git a/Source/ThirdParty/ANGLE/include/GLES/glext_angle.h b/Source/ThirdParty/ANGLE/include/GLES/glext_angle.h
>new file mode 100644
>index 00000000000..2f8ae9208d8
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/include/GLES/glext_angle.h
>@@ -0,0 +1,23 @@
>+//
>+// Copyright (c) 2018 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// glext_angle.h: ANGLE modifications to the glext.h header file.
>+//   Currently we don't include this file directly, we patch glext.h
>+//   to include it implicitly so it is visible throughout our code.
>+
>+#ifndef INCLUDE_GLES_GLEXT_ANGLE_H_
>+#define INCLUDE_GLES_GLEXT_ANGLE_H_
>+
>+// clang-format off
>+
>+#ifndef GL_ANGLE_explicit_context_gles1
>+#define GL_ANGLE_explicit_context_gles1
>+typedef void *GLeglContext;
>+#include "glext_explicit_context_autogen.inc"
>+#endif /* GL_ANGLE_explicit_context_gles1 */
>+
>+// clang-format on
>+
>+#endif  // INCLUDE_GLES_GLEXT_ANGLE_H_
>diff --git a/Source/ThirdParty/ANGLE/include/GLES/glext_explicit_context_autogen.inc b/Source/ThirdParty/ANGLE/include/GLES/glext_explicit_context_autogen.inc
>new file mode 100644
>index 00000000000..c1f0c21d409
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/include/GLES/glext_explicit_context_autogen.inc
>@@ -0,0 +1,260 @@
>+// GENERATED FILE - DO NOT EDIT.
>+// Generated by generate_entry_points.py using data from gl.xml and gl_angle_ext.xml.
>+//
>+// Copyright 2019 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// glext_explicit_context_autogen.inc:
>+//   Function declarations for the EGL_ANGLE_explicit_context extension
>+
>+typedef void (GL_APIENTRYP PFNGLALPHAFUNCCONTEXTANGLEPROC)(GLeglContext ctx, GLenum func, GLfloat ref);
>+typedef void (GL_APIENTRYP PFNGLALPHAFUNCXCONTEXTANGLEPROC)(GLeglContext ctx, GLenum func, GLfixed ref);
>+typedef void (GL_APIENTRYP PFNGLCLEARCOLORXCONTEXTANGLEPROC)(GLeglContext ctx, GLfixed red, GLfixed green, GLfixed blue, GLfixed alpha);
>+typedef void (GL_APIENTRYP PFNGLCLEARDEPTHXCONTEXTANGLEPROC)(GLeglContext ctx, GLfixed depth);
>+typedef void (GL_APIENTRYP PFNGLCLIENTACTIVETEXTURECONTEXTANGLEPROC)(GLeglContext ctx, GLenum texture);
>+typedef void (GL_APIENTRYP PFNGLCLIPPLANEFCONTEXTANGLEPROC)(GLeglContext ctx, GLenum p, const GLfloat *eqn);
>+typedef void (GL_APIENTRYP PFNGLCLIPPLANEXCONTEXTANGLEPROC)(GLeglContext ctx, GLenum plane, const GLfixed *equation);
>+typedef void (GL_APIENTRYP PFNGLCOLOR4FCONTEXTANGLEPROC)(GLeglContext ctx, GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha);
>+typedef void (GL_APIENTRYP PFNGLCOLOR4UBCONTEXTANGLEPROC)(GLeglContext ctx, GLubyte red, GLubyte green, GLubyte blue, GLubyte alpha);
>+typedef void (GL_APIENTRYP PFNGLCOLOR4XCONTEXTANGLEPROC)(GLeglContext ctx, GLfixed red, GLfixed green, GLfixed blue, GLfixed alpha);
>+typedef void (GL_APIENTRYP PFNGLCOLORPOINTERCONTEXTANGLEPROC)(GLeglContext ctx, GLint size, GLenum type, GLsizei stride, const void *pointer);
>+typedef void (GL_APIENTRYP PFNGLDEPTHRANGEXCONTEXTANGLEPROC)(GLeglContext ctx, GLfixed n, GLfixed f);
>+typedef void (GL_APIENTRYP PFNGLDISABLECLIENTSTATECONTEXTANGLEPROC)(GLeglContext ctx, GLenum array);
>+typedef void (GL_APIENTRYP PFNGLENABLECLIENTSTATECONTEXTANGLEPROC)(GLeglContext ctx, GLenum array);
>+typedef void (GL_APIENTRYP PFNGLFOGFCONTEXTANGLEPROC)(GLeglContext ctx, GLenum pname, GLfloat param);
>+typedef void (GL_APIENTRYP PFNGLFOGFVCONTEXTANGLEPROC)(GLeglContext ctx, GLenum pname, const GLfloat *params);
>+typedef void (GL_APIENTRYP PFNGLFOGXCONTEXTANGLEPROC)(GLeglContext ctx, GLenum pname, GLfixed param);
>+typedef void (GL_APIENTRYP PFNGLFOGXVCONTEXTANGLEPROC)(GLeglContext ctx, GLenum pname, const GLfixed *param);
>+typedef void (GL_APIENTRYP PFNGLFRUSTUMFCONTEXTANGLEPROC)(GLeglContext ctx, GLfloat l, GLfloat r, GLfloat b, GLfloat t, GLfloat n, GLfloat f);
>+typedef void (GL_APIENTRYP PFNGLFRUSTUMXCONTEXTANGLEPROC)(GLeglContext ctx, GLfixed l, GLfixed r, GLfixed b, GLfixed t, GLfixed n, GLfixed f);
>+typedef void (GL_APIENTRYP PFNGLGETCLIPPLANEFCONTEXTANGLEPROC)(GLeglContext ctx, GLenum plane, GLfloat *equation);
>+typedef void (GL_APIENTRYP PFNGLGETCLIPPLANEXCONTEXTANGLEPROC)(GLeglContext ctx, GLenum plane, GLfixed *equation);
>+typedef void (GL_APIENTRYP PFNGLGETFIXEDVCONTEXTANGLEPROC)(GLeglContext ctx, GLenum pname, GLfixed *params);
>+typedef void (GL_APIENTRYP PFNGLGETLIGHTFVCONTEXTANGLEPROC)(GLeglContext ctx, GLenum light, GLenum pname, GLfloat *params);
>+typedef void (GL_APIENTRYP PFNGLGETLIGHTXVCONTEXTANGLEPROC)(GLeglContext ctx, GLenum light, GLenum pname, GLfixed *params);
>+typedef void (GL_APIENTRYP PFNGLGETMATERIALFVCONTEXTANGLEPROC)(GLeglContext ctx, GLenum face, GLenum pname, GLfloat *params);
>+typedef void (GL_APIENTRYP PFNGLGETMATERIALXVCONTEXTANGLEPROC)(GLeglContext ctx, GLenum face, GLenum pname, GLfixed *params);
>+typedef void (GL_APIENTRYP PFNGLGETPOINTERVCONTEXTANGLEPROC)(GLeglContext ctx, GLenum pname, void **params);
>+typedef void (GL_APIENTRYP PFNGLGETTEXENVFVCONTEXTANGLEPROC)(GLeglContext ctx, GLenum target, GLenum pname, GLfloat *params);
>+typedef void (GL_APIENTRYP PFNGLGETTEXENVIVCONTEXTANGLEPROC)(GLeglContext ctx, GLenum target, GLenum pname, GLint *params);
>+typedef void (GL_APIENTRYP PFNGLGETTEXENVXVCONTEXTANGLEPROC)(GLeglContext ctx, GLenum target, GLenum pname, GLfixed *params);
>+typedef void (GL_APIENTRYP PFNGLGETTEXPARAMETERXVCONTEXTANGLEPROC)(GLeglContext ctx, GLenum target, GLenum pname, GLfixed *params);
>+typedef void (GL_APIENTRYP PFNGLLIGHTMODELFCONTEXTANGLEPROC)(GLeglContext ctx, GLenum pname, GLfloat param);
>+typedef void (GL_APIENTRYP PFNGLLIGHTMODELFVCONTEXTANGLEPROC)(GLeglContext ctx, GLenum pname, const GLfloat *params);
>+typedef void (GL_APIENTRYP PFNGLLIGHTMODELXCONTEXTANGLEPROC)(GLeglContext ctx, GLenum pname, GLfixed param);
>+typedef void (GL_APIENTRYP PFNGLLIGHTMODELXVCONTEXTANGLEPROC)(GLeglContext ctx, GLenum pname, const GLfixed *param);
>+typedef void (GL_APIENTRYP PFNGLLIGHTFCONTEXTANGLEPROC)(GLeglContext ctx, GLenum light, GLenum pname, GLfloat param);
>+typedef void (GL_APIENTRYP PFNGLLIGHTFVCONTEXTANGLEPROC)(GLeglContext ctx, GLenum light, GLenum pname, const GLfloat *params);
>+typedef void (GL_APIENTRYP PFNGLLIGHTXCONTEXTANGLEPROC)(GLeglContext ctx, GLenum light, GLenum pname, GLfixed param);
>+typedef void (GL_APIENTRYP PFNGLLIGHTXVCONTEXTANGLEPROC)(GLeglContext ctx, GLenum light, GLenum pname, const GLfixed *params);
>+typedef void (GL_APIENTRYP PFNGLLINEWIDTHXCONTEXTANGLEPROC)(GLeglContext ctx, GLfixed width);
>+typedef void (GL_APIENTRYP PFNGLLOADIDENTITYCONTEXTANGLEPROC)(GLeglContext ctx);
>+typedef void (GL_APIENTRYP PFNGLLOADMATRIXFCONTEXTANGLEPROC)(GLeglContext ctx, const GLfloat *m);
>+typedef void (GL_APIENTRYP PFNGLLOADMATRIXXCONTEXTANGLEPROC)(GLeglContext ctx, const GLfixed *m);
>+typedef void (GL_APIENTRYP PFNGLLOGICOPCONTEXTANGLEPROC)(GLeglContext ctx, GLenum opcode);
>+typedef void (GL_APIENTRYP PFNGLMATERIALFCONTEXTANGLEPROC)(GLeglContext ctx, GLenum face, GLenum pname, GLfloat param);
>+typedef void (GL_APIENTRYP PFNGLMATERIALFVCONTEXTANGLEPROC)(GLeglContext ctx, GLenum face, GLenum pname, const GLfloat *params);
>+typedef void (GL_APIENTRYP PFNGLMATERIALXCONTEXTANGLEPROC)(GLeglContext ctx, GLenum face, GLenum pname, GLfixed param);
>+typedef void (GL_APIENTRYP PFNGLMATERIALXVCONTEXTANGLEPROC)(GLeglContext ctx, GLenum face, GLenum pname, const GLfixed *param);
>+typedef void (GL_APIENTRYP PFNGLMATRIXMODECONTEXTANGLEPROC)(GLeglContext ctx, GLenum mode);
>+typedef void (GL_APIENTRYP PFNGLMULTMATRIXFCONTEXTANGLEPROC)(GLeglContext ctx, const GLfloat *m);
>+typedef void (GL_APIENTRYP PFNGLMULTMATRIXXCONTEXTANGLEPROC)(GLeglContext ctx, const GLfixed *m);
>+typedef void (GL_APIENTRYP PFNGLMULTITEXCOORD4FCONTEXTANGLEPROC)(GLeglContext ctx, GLenum target, GLfloat s, GLfloat t, GLfloat r, GLfloat q);
>+typedef void (GL_APIENTRYP PFNGLMULTITEXCOORD4XCONTEXTANGLEPROC)(GLeglContext ctx, GLenum texture, GLfixed s, GLfixed t, GLfixed r, GLfixed q);
>+typedef void (GL_APIENTRYP PFNGLNORMAL3FCONTEXTANGLEPROC)(GLeglContext ctx, GLfloat nx, GLfloat ny, GLfloat nz);
>+typedef void (GL_APIENTRYP PFNGLNORMAL3XCONTEXTANGLEPROC)(GLeglContext ctx, GLfixed nx, GLfixed ny, GLfixed nz);
>+typedef void (GL_APIENTRYP PFNGLNORMALPOINTERCONTEXTANGLEPROC)(GLeglContext ctx, GLenum type, GLsizei stride, const void *pointer);
>+typedef void (GL_APIENTRYP PFNGLORTHOFCONTEXTANGLEPROC)(GLeglContext ctx, GLfloat l, GLfloat r, GLfloat b, GLfloat t, GLfloat n, GLfloat f);
>+typedef void (GL_APIENTRYP PFNGLORTHOXCONTEXTANGLEPROC)(GLeglContext ctx, GLfixed l, GLfixed r, GLfixed b, GLfixed t, GLfixed n, GLfixed f);
>+typedef void (GL_APIENTRYP PFNGLPOINTPARAMETERFCONTEXTANGLEPROC)(GLeglContext ctx, GLenum pname, GLfloat param);
>+typedef void (GL_APIENTRYP PFNGLPOINTPARAMETERFVCONTEXTANGLEPROC)(GLeglContext ctx, GLenum pname, const GLfloat *params);
>+typedef void (GL_APIENTRYP PFNGLPOINTPARAMETERXCONTEXTANGLEPROC)(GLeglContext ctx, GLenum pname, GLfixed param);
>+typedef void (GL_APIENTRYP PFNGLPOINTPARAMETERXVCONTEXTANGLEPROC)(GLeglContext ctx, GLenum pname, const GLfixed *params);
>+typedef void (GL_APIENTRYP PFNGLPOINTSIZECONTEXTANGLEPROC)(GLeglContext ctx, GLfloat size);
>+typedef void (GL_APIENTRYP PFNGLPOINTSIZEXCONTEXTANGLEPROC)(GLeglContext ctx, GLfixed size);
>+typedef void (GL_APIENTRYP PFNGLPOLYGONOFFSETXCONTEXTANGLEPROC)(GLeglContext ctx, GLfixed factor, GLfixed units);
>+typedef void (GL_APIENTRYP PFNGLPOPMATRIXCONTEXTANGLEPROC)(GLeglContext ctx);
>+typedef void (GL_APIENTRYP PFNGLPUSHMATRIXCONTEXTANGLEPROC)(GLeglContext ctx);
>+typedef void (GL_APIENTRYP PFNGLROTATEFCONTEXTANGLEPROC)(GLeglContext ctx, GLfloat angle, GLfloat x, GLfloat y, GLfloat z);
>+typedef void (GL_APIENTRYP PFNGLROTATEXCONTEXTANGLEPROC)(GLeglContext ctx, GLfixed angle, GLfixed x, GLfixed y, GLfixed z);
>+typedef void (GL_APIENTRYP PFNGLSAMPLECOVERAGEXCONTEXTANGLEPROC)(GLeglContext ctx, GLclampx value, GLboolean invert);
>+typedef void (GL_APIENTRYP PFNGLSCALEFCONTEXTANGLEPROC)(GLeglContext ctx, GLfloat x, GLfloat y, GLfloat z);
>+typedef void (GL_APIENTRYP PFNGLSCALEXCONTEXTANGLEPROC)(GLeglContext ctx, GLfixed x, GLfixed y, GLfixed z);
>+typedef void (GL_APIENTRYP PFNGLSHADEMODELCONTEXTANGLEPROC)(GLeglContext ctx, GLenum mode);
>+typedef void (GL_APIENTRYP PFNGLTEXCOORDPOINTERCONTEXTANGLEPROC)(GLeglContext ctx, GLint size, GLenum type, GLsizei stride, const void *pointer);
>+typedef void (GL_APIENTRYP PFNGLTEXENVFCONTEXTANGLEPROC)(GLeglContext ctx, GLenum target, GLenum pname, GLfloat param);
>+typedef void (GL_APIENTRYP PFNGLTEXENVFVCONTEXTANGLEPROC)(GLeglContext ctx, GLenum target, GLenum pname, const GLfloat *params);
>+typedef void (GL_APIENTRYP PFNGLTEXENVICONTEXTANGLEPROC)(GLeglContext ctx, GLenum target, GLenum pname, GLint param);
>+typedef void (GL_APIENTRYP PFNGLTEXENVIVCONTEXTANGLEPROC)(GLeglContext ctx, GLenum target, GLenum pname, const GLint *params);
>+typedef void (GL_APIENTRYP PFNGLTEXENVXCONTEXTANGLEPROC)(GLeglContext ctx, GLenum target, GLenum pname, GLfixed param);
>+typedef void (GL_APIENTRYP PFNGLTEXENVXVCONTEXTANGLEPROC)(GLeglContext ctx, GLenum target, GLenum pname, const GLfixed *params);
>+typedef void (GL_APIENTRYP PFNGLTEXPARAMETERXCONTEXTANGLEPROC)(GLeglContext ctx, GLenum target, GLenum pname, GLfixed param);
>+typedef void (GL_APIENTRYP PFNGLTEXPARAMETERXVCONTEXTANGLEPROC)(GLeglContext ctx, GLenum target, GLenum pname, const GLfixed *params);
>+typedef void (GL_APIENTRYP PFNGLTRANSLATEFCONTEXTANGLEPROC)(GLeglContext ctx, GLfloat x, GLfloat y, GLfloat z);
>+typedef void (GL_APIENTRYP PFNGLTRANSLATEXCONTEXTANGLEPROC)(GLeglContext ctx, GLfixed x, GLfixed y, GLfixed z);
>+typedef void (GL_APIENTRYP PFNGLVERTEXPOINTERCONTEXTANGLEPROC)(GLeglContext ctx, GLint size, GLenum type, GLsizei stride, const void *pointer);
>+typedef void (GL_APIENTRYP PFNGLBINDFRAMEBUFFEROESCONTEXTANGLEPROC)(GLeglContext ctx, GLenum target, GLuint framebuffer);
>+typedef void (GL_APIENTRYP PFNGLBINDRENDERBUFFEROESCONTEXTANGLEPROC)(GLeglContext ctx, GLenum target, GLuint renderbuffer);
>+typedef GLenum (GL_APIENTRYP PFNGLCHECKFRAMEBUFFERSTATUSOESCONTEXTANGLEPROC)(GLeglContext ctx, GLenum target);
>+typedef void (GL_APIENTRYP PFNGLCURRENTPALETTEMATRIXOESCONTEXTANGLEPROC)(GLeglContext ctx, GLuint matrixpaletteindex);
>+typedef void (GL_APIENTRYP PFNGLDELETEFRAMEBUFFERSOESCONTEXTANGLEPROC)(GLeglContext ctx, GLsizei n, const GLuint *framebuffers);
>+typedef void (GL_APIENTRYP PFNGLDELETERENDERBUFFERSOESCONTEXTANGLEPROC)(GLeglContext ctx, GLsizei n, const GLuint *renderbuffers);
>+typedef void (GL_APIENTRYP PFNGLDRAWTEXFOESCONTEXTANGLEPROC)(GLeglContext ctx, GLfloat x, GLfloat y, GLfloat z, GLfloat width, GLfloat height);
>+typedef void (GL_APIENTRYP PFNGLDRAWTEXFVOESCONTEXTANGLEPROC)(GLeglContext ctx, const GLfloat *coords);
>+typedef void (GL_APIENTRYP PFNGLDRAWTEXIOESCONTEXTANGLEPROC)(GLeglContext ctx, GLint x, GLint y, GLint z, GLint width, GLint height);
>+typedef void (GL_APIENTRYP PFNGLDRAWTEXIVOESCONTEXTANGLEPROC)(GLeglContext ctx, const GLint *coords);
>+typedef void (GL_APIENTRYP PFNGLDRAWTEXSOESCONTEXTANGLEPROC)(GLeglContext ctx, GLshort x, GLshort y, GLshort z, GLshort width, GLshort height);
>+typedef void (GL_APIENTRYP PFNGLDRAWTEXSVOESCONTEXTANGLEPROC)(GLeglContext ctx, const GLshort *coords);
>+typedef void (GL_APIENTRYP PFNGLDRAWTEXXOESCONTEXTANGLEPROC)(GLeglContext ctx, GLfixed x, GLfixed y, GLfixed z, GLfixed width, GLfixed height);
>+typedef void (GL_APIENTRYP PFNGLDRAWTEXXVOESCONTEXTANGLEPROC)(GLeglContext ctx, const GLfixed *coords);
>+typedef void (GL_APIENTRYP PFNGLFRAMEBUFFERRENDERBUFFEROESCONTEXTANGLEPROC)(GLeglContext ctx, GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer);
>+typedef void (GL_APIENTRYP PFNGLFRAMEBUFFERTEXTURE2DOESCONTEXTANGLEPROC)(GLeglContext ctx, GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level);
>+typedef void (GL_APIENTRYP PFNGLGENFRAMEBUFFERSOESCONTEXTANGLEPROC)(GLeglContext ctx, GLsizei n, GLuint *framebuffers);
>+typedef void (GL_APIENTRYP PFNGLGENRENDERBUFFERSOESCONTEXTANGLEPROC)(GLeglContext ctx, GLsizei n, GLuint *renderbuffers);
>+typedef void (GL_APIENTRYP PFNGLGENERATEMIPMAPOESCONTEXTANGLEPROC)(GLeglContext ctx, GLenum target);
>+typedef void (GL_APIENTRYP PFNGLGETFRAMEBUFFERATTACHMENTPARAMETERIVOESCONTEXTANGLEPROC)(GLeglContext ctx, GLenum target, GLenum attachment, GLenum pname, GLint *params);
>+typedef void (GL_APIENTRYP PFNGLGETRENDERBUFFERPARAMETERIVOESCONTEXTANGLEPROC)(GLeglContext ctx, GLenum target, GLenum pname, GLint *params);
>+typedef void (GL_APIENTRYP PFNGLGETTEXGENFVOESCONTEXTANGLEPROC)(GLeglContext ctx, GLenum coord, GLenum pname, GLfloat *params);
>+typedef void (GL_APIENTRYP PFNGLGETTEXGENIVOESCONTEXTANGLEPROC)(GLeglContext ctx, GLenum coord, GLenum pname, GLint *params);
>+typedef void (GL_APIENTRYP PFNGLGETTEXGENXVOESCONTEXTANGLEPROC)(GLeglContext ctx, GLenum coord, GLenum pname, GLfixed *params);
>+typedef GLboolean (GL_APIENTRYP PFNGLISFRAMEBUFFEROESCONTEXTANGLEPROC)(GLeglContext ctx, GLuint framebuffer);
>+typedef GLboolean (GL_APIENTRYP PFNGLISRENDERBUFFEROESCONTEXTANGLEPROC)(GLeglContext ctx, GLuint renderbuffer);
>+typedef void (GL_APIENTRYP PFNGLLOADPALETTEFROMMODELVIEWMATRIXOESCONTEXTANGLEPROC)(GLeglContext ctx);
>+typedef void (GL_APIENTRYP PFNGLMATRIXINDEXPOINTEROESCONTEXTANGLEPROC)(GLeglContext ctx, GLint size, GLenum type, GLsizei stride, const void *pointer);
>+typedef void (GL_APIENTRYP PFNGLPOINTSIZEPOINTEROESCONTEXTANGLEPROC)(GLeglContext ctx, GLenum type, GLsizei stride, const void *pointer);
>+typedef GLbitfield (GL_APIENTRYP PFNGLQUERYMATRIXXOESCONTEXTANGLEPROC)(GLeglContext ctx, GLfixed *mantissa, GLint *exponent);
>+typedef void (GL_APIENTRYP PFNGLRENDERBUFFERSTORAGEOESCONTEXTANGLEPROC)(GLeglContext ctx, GLenum target, GLenum internalformat, GLsizei width, GLsizei height);
>+typedef void (GL_APIENTRYP PFNGLTEXGENFOESCONTEXTANGLEPROC)(GLeglContext ctx, GLenum coord, GLenum pname, GLfloat param);
>+typedef void (GL_APIENTRYP PFNGLTEXGENFVOESCONTEXTANGLEPROC)(GLeglContext ctx, GLenum coord, GLenum pname, const GLfloat *params);
>+typedef void (GL_APIENTRYP PFNGLTEXGENIOESCONTEXTANGLEPROC)(GLeglContext ctx, GLenum coord, GLenum pname, GLint param);
>+typedef void (GL_APIENTRYP PFNGLTEXGENIVOESCONTEXTANGLEPROC)(GLeglContext ctx, GLenum coord, GLenum pname, const GLint *params);
>+typedef void (GL_APIENTRYP PFNGLTEXGENXOESCONTEXTANGLEPROC)(GLeglContext ctx, GLenum coord, GLenum pname, GLfixed param);
>+typedef void (GL_APIENTRYP PFNGLTEXGENXVOESCONTEXTANGLEPROC)(GLeglContext ctx, GLenum coord, GLenum pname, const GLfixed *params);
>+typedef void (GL_APIENTRYP PFNGLWEIGHTPOINTEROESCONTEXTANGLEPROC)(GLeglContext ctx, GLint size, GLenum type, GLsizei stride, const void *pointer);
>+#ifdef GL_GLEXT_PROTOTYPES
>+GL_API void GL_APIENTRY glAlphaFuncContextANGLE(GLeglContext ctx, GLenum func, GLfloat ref);
>+GL_API void GL_APIENTRY glAlphaFuncxContextANGLE(GLeglContext ctx, GLenum func, GLfixed ref);
>+GL_API void GL_APIENTRY glClearColorxContextANGLE(GLeglContext ctx, GLfixed red, GLfixed green, GLfixed blue, GLfixed alpha);
>+GL_API void GL_APIENTRY glClearDepthxContextANGLE(GLeglContext ctx, GLfixed depth);
>+GL_API void GL_APIENTRY glClientActiveTextureContextANGLE(GLeglContext ctx, GLenum texture);
>+GL_API void GL_APIENTRY glClipPlanefContextANGLE(GLeglContext ctx, GLenum p, const GLfloat *eqn);
>+GL_API void GL_APIENTRY glClipPlanexContextANGLE(GLeglContext ctx, GLenum plane, const GLfixed *equation);
>+GL_API void GL_APIENTRY glColor4fContextANGLE(GLeglContext ctx, GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha);
>+GL_API void GL_APIENTRY glColor4ubContextANGLE(GLeglContext ctx, GLubyte red, GLubyte green, GLubyte blue, GLubyte alpha);
>+GL_API void GL_APIENTRY glColor4xContextANGLE(GLeglContext ctx, GLfixed red, GLfixed green, GLfixed blue, GLfixed alpha);
>+GL_API void GL_APIENTRY glColorPointerContextANGLE(GLeglContext ctx, GLint size, GLenum type, GLsizei stride, const void *pointer);
>+GL_API void GL_APIENTRY glDepthRangexContextANGLE(GLeglContext ctx, GLfixed n, GLfixed f);
>+GL_API void GL_APIENTRY glDisableClientStateContextANGLE(GLeglContext ctx, GLenum array);
>+GL_API void GL_APIENTRY glEnableClientStateContextANGLE(GLeglContext ctx, GLenum array);
>+GL_API void GL_APIENTRY glFogfContextANGLE(GLeglContext ctx, GLenum pname, GLfloat param);
>+GL_API void GL_APIENTRY glFogfvContextANGLE(GLeglContext ctx, GLenum pname, const GLfloat *params);
>+GL_API void GL_APIENTRY glFogxContextANGLE(GLeglContext ctx, GLenum pname, GLfixed param);
>+GL_API void GL_APIENTRY glFogxvContextANGLE(GLeglContext ctx, GLenum pname, const GLfixed *param);
>+GL_API void GL_APIENTRY glFrustumfContextANGLE(GLeglContext ctx, GLfloat l, GLfloat r, GLfloat b, GLfloat t, GLfloat n, GLfloat f);
>+GL_API void GL_APIENTRY glFrustumxContextANGLE(GLeglContext ctx, GLfixed l, GLfixed r, GLfixed b, GLfixed t, GLfixed n, GLfixed f);
>+GL_API void GL_APIENTRY glGetClipPlanefContextANGLE(GLeglContext ctx, GLenum plane, GLfloat *equation);
>+GL_API void GL_APIENTRY glGetClipPlanexContextANGLE(GLeglContext ctx, GLenum plane, GLfixed *equation);
>+GL_API void GL_APIENTRY glGetFixedvContextANGLE(GLeglContext ctx, GLenum pname, GLfixed *params);
>+GL_API void GL_APIENTRY glGetLightfvContextANGLE(GLeglContext ctx, GLenum light, GLenum pname, GLfloat *params);
>+GL_API void GL_APIENTRY glGetLightxvContextANGLE(GLeglContext ctx, GLenum light, GLenum pname, GLfixed *params);
>+GL_API void GL_APIENTRY glGetMaterialfvContextANGLE(GLeglContext ctx, GLenum face, GLenum pname, GLfloat *params);
>+GL_API void GL_APIENTRY glGetMaterialxvContextANGLE(GLeglContext ctx, GLenum face, GLenum pname, GLfixed *params);
>+GL_API void GL_APIENTRY glGetPointervContextANGLE(GLeglContext ctx, GLenum pname, void **params);
>+GL_API void GL_APIENTRY glGetTexEnvfvContextANGLE(GLeglContext ctx, GLenum target, GLenum pname, GLfloat *params);
>+GL_API void GL_APIENTRY glGetTexEnvivContextANGLE(GLeglContext ctx, GLenum target, GLenum pname, GLint *params);
>+GL_API void GL_APIENTRY glGetTexEnvxvContextANGLE(GLeglContext ctx, GLenum target, GLenum pname, GLfixed *params);
>+GL_API void GL_APIENTRY glGetTexParameterxvContextANGLE(GLeglContext ctx, GLenum target, GLenum pname, GLfixed *params);
>+GL_API void GL_APIENTRY glLightModelfContextANGLE(GLeglContext ctx, GLenum pname, GLfloat param);
>+GL_API void GL_APIENTRY glLightModelfvContextANGLE(GLeglContext ctx, GLenum pname, const GLfloat *params);
>+GL_API void GL_APIENTRY glLightModelxContextANGLE(GLeglContext ctx, GLenum pname, GLfixed param);
>+GL_API void GL_APIENTRY glLightModelxvContextANGLE(GLeglContext ctx, GLenum pname, const GLfixed *param);
>+GL_API void GL_APIENTRY glLightfContextANGLE(GLeglContext ctx, GLenum light, GLenum pname, GLfloat param);
>+GL_API void GL_APIENTRY glLightfvContextANGLE(GLeglContext ctx, GLenum light, GLenum pname, const GLfloat *params);
>+GL_API void GL_APIENTRY glLightxContextANGLE(GLeglContext ctx, GLenum light, GLenum pname, GLfixed param);
>+GL_API void GL_APIENTRY glLightxvContextANGLE(GLeglContext ctx, GLenum light, GLenum pname, const GLfixed *params);
>+GL_API void GL_APIENTRY glLineWidthxContextANGLE(GLeglContext ctx, GLfixed width);
>+GL_API void GL_APIENTRY glLoadIdentityContextANGLE(GLeglContext ctx);
>+GL_API void GL_APIENTRY glLoadMatrixfContextANGLE(GLeglContext ctx, const GLfloat *m);
>+GL_API void GL_APIENTRY glLoadMatrixxContextANGLE(GLeglContext ctx, const GLfixed *m);
>+GL_API void GL_APIENTRY glLogicOpContextANGLE(GLeglContext ctx, GLenum opcode);
>+GL_API void GL_APIENTRY glMaterialfContextANGLE(GLeglContext ctx, GLenum face, GLenum pname, GLfloat param);
>+GL_API void GL_APIENTRY glMaterialfvContextANGLE(GLeglContext ctx, GLenum face, GLenum pname, const GLfloat *params);
>+GL_API void GL_APIENTRY glMaterialxContextANGLE(GLeglContext ctx, GLenum face, GLenum pname, GLfixed param);
>+GL_API void GL_APIENTRY glMaterialxvContextANGLE(GLeglContext ctx, GLenum face, GLenum pname, const GLfixed *param);
>+GL_API void GL_APIENTRY glMatrixModeContextANGLE(GLeglContext ctx, GLenum mode);
>+GL_API void GL_APIENTRY glMultMatrixfContextANGLE(GLeglContext ctx, const GLfloat *m);
>+GL_API void GL_APIENTRY glMultMatrixxContextANGLE(GLeglContext ctx, const GLfixed *m);
>+GL_API void GL_APIENTRY glMultiTexCoord4fContextANGLE(GLeglContext ctx, GLenum target, GLfloat s, GLfloat t, GLfloat r, GLfloat q);
>+GL_API void GL_APIENTRY glMultiTexCoord4xContextANGLE(GLeglContext ctx, GLenum texture, GLfixed s, GLfixed t, GLfixed r, GLfixed q);
>+GL_API void GL_APIENTRY glNormal3fContextANGLE(GLeglContext ctx, GLfloat nx, GLfloat ny, GLfloat nz);
>+GL_API void GL_APIENTRY glNormal3xContextANGLE(GLeglContext ctx, GLfixed nx, GLfixed ny, GLfixed nz);
>+GL_API void GL_APIENTRY glNormalPointerContextANGLE(GLeglContext ctx, GLenum type, GLsizei stride, const void *pointer);
>+GL_API void GL_APIENTRY glOrthofContextANGLE(GLeglContext ctx, GLfloat l, GLfloat r, GLfloat b, GLfloat t, GLfloat n, GLfloat f);
>+GL_API void GL_APIENTRY glOrthoxContextANGLE(GLeglContext ctx, GLfixed l, GLfixed r, GLfixed b, GLfixed t, GLfixed n, GLfixed f);
>+GL_API void GL_APIENTRY glPointParameterfContextANGLE(GLeglContext ctx, GLenum pname, GLfloat param);
>+GL_API void GL_APIENTRY glPointParameterfvContextANGLE(GLeglContext ctx, GLenum pname, const GLfloat *params);
>+GL_API void GL_APIENTRY glPointParameterxContextANGLE(GLeglContext ctx, GLenum pname, GLfixed param);
>+GL_API void GL_APIENTRY glPointParameterxvContextANGLE(GLeglContext ctx, GLenum pname, const GLfixed *params);
>+GL_API void GL_APIENTRY glPointSizeContextANGLE(GLeglContext ctx, GLfloat size);
>+GL_API void GL_APIENTRY glPointSizexContextANGLE(GLeglContext ctx, GLfixed size);
>+GL_API void GL_APIENTRY glPolygonOffsetxContextANGLE(GLeglContext ctx, GLfixed factor, GLfixed units);
>+GL_API void GL_APIENTRY glPopMatrixContextANGLE(GLeglContext ctx);
>+GL_API void GL_APIENTRY glPushMatrixContextANGLE(GLeglContext ctx);
>+GL_API void GL_APIENTRY glRotatefContextANGLE(GLeglContext ctx, GLfloat angle, GLfloat x, GLfloat y, GLfloat z);
>+GL_API void GL_APIENTRY glRotatexContextANGLE(GLeglContext ctx, GLfixed angle, GLfixed x, GLfixed y, GLfixed z);
>+GL_API void GL_APIENTRY glSampleCoveragexContextANGLE(GLeglContext ctx, GLclampx value, GLboolean invert);
>+GL_API void GL_APIENTRY glScalefContextANGLE(GLeglContext ctx, GLfloat x, GLfloat y, GLfloat z);
>+GL_API void GL_APIENTRY glScalexContextANGLE(GLeglContext ctx, GLfixed x, GLfixed y, GLfixed z);
>+GL_API void GL_APIENTRY glShadeModelContextANGLE(GLeglContext ctx, GLenum mode);
>+GL_API void GL_APIENTRY glTexCoordPointerContextANGLE(GLeglContext ctx, GLint size, GLenum type, GLsizei stride, const void *pointer);
>+GL_API void GL_APIENTRY glTexEnvfContextANGLE(GLeglContext ctx, GLenum target, GLenum pname, GLfloat param);
>+GL_API void GL_APIENTRY glTexEnvfvContextANGLE(GLeglContext ctx, GLenum target, GLenum pname, const GLfloat *params);
>+GL_API void GL_APIENTRY glTexEnviContextANGLE(GLeglContext ctx, GLenum target, GLenum pname, GLint param);
>+GL_API void GL_APIENTRY glTexEnvivContextANGLE(GLeglContext ctx, GLenum target, GLenum pname, const GLint *params);
>+GL_API void GL_APIENTRY glTexEnvxContextANGLE(GLeglContext ctx, GLenum target, GLenum pname, GLfixed param);
>+GL_API void GL_APIENTRY glTexEnvxvContextANGLE(GLeglContext ctx, GLenum target, GLenum pname, const GLfixed *params);
>+GL_API void GL_APIENTRY glTexParameterxContextANGLE(GLeglContext ctx, GLenum target, GLenum pname, GLfixed param);
>+GL_API void GL_APIENTRY glTexParameterxvContextANGLE(GLeglContext ctx, GLenum target, GLenum pname, const GLfixed *params);
>+GL_API void GL_APIENTRY glTranslatefContextANGLE(GLeglContext ctx, GLfloat x, GLfloat y, GLfloat z);
>+GL_API void GL_APIENTRY glTranslatexContextANGLE(GLeglContext ctx, GLfixed x, GLfixed y, GLfixed z);
>+GL_API void GL_APIENTRY glVertexPointerContextANGLE(GLeglContext ctx, GLint size, GLenum type, GLsizei stride, const void *pointer);
>+GL_API void GL_APIENTRY glBindFramebufferOESContextANGLE(GLeglContext ctx, GLenum target, GLuint framebuffer);
>+GL_API void GL_APIENTRY glBindRenderbufferOESContextANGLE(GLeglContext ctx, GLenum target, GLuint renderbuffer);
>+GL_API GLenum GL_APIENTRY glCheckFramebufferStatusOESContextANGLE(GLeglContext ctx, GLenum target);
>+GL_API void GL_APIENTRY glCurrentPaletteMatrixOESContextANGLE(GLeglContext ctx, GLuint matrixpaletteindex);
>+GL_API void GL_APIENTRY glDeleteFramebuffersOESContextANGLE(GLeglContext ctx, GLsizei n, const GLuint *framebuffers);
>+GL_API void GL_APIENTRY glDeleteRenderbuffersOESContextANGLE(GLeglContext ctx, GLsizei n, const GLuint *renderbuffers);
>+GL_API void GL_APIENTRY glDrawTexfOESContextANGLE(GLeglContext ctx, GLfloat x, GLfloat y, GLfloat z, GLfloat width, GLfloat height);
>+GL_API void GL_APIENTRY glDrawTexfvOESContextANGLE(GLeglContext ctx, const GLfloat *coords);
>+GL_API void GL_APIENTRY glDrawTexiOESContextANGLE(GLeglContext ctx, GLint x, GLint y, GLint z, GLint width, GLint height);
>+GL_API void GL_APIENTRY glDrawTexivOESContextANGLE(GLeglContext ctx, const GLint *coords);
>+GL_API void GL_APIENTRY glDrawTexsOESContextANGLE(GLeglContext ctx, GLshort x, GLshort y, GLshort z, GLshort width, GLshort height);
>+GL_API void GL_APIENTRY glDrawTexsvOESContextANGLE(GLeglContext ctx, const GLshort *coords);
>+GL_API void GL_APIENTRY glDrawTexxOESContextANGLE(GLeglContext ctx, GLfixed x, GLfixed y, GLfixed z, GLfixed width, GLfixed height);
>+GL_API void GL_APIENTRY glDrawTexxvOESContextANGLE(GLeglContext ctx, const GLfixed *coords);
>+GL_API void GL_APIENTRY glFramebufferRenderbufferOESContextANGLE(GLeglContext ctx, GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer);
>+GL_API void GL_APIENTRY glFramebufferTexture2DOESContextANGLE(GLeglContext ctx, GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level);
>+GL_API void GL_APIENTRY glGenFramebuffersOESContextANGLE(GLeglContext ctx, GLsizei n, GLuint *framebuffers);
>+GL_API void GL_APIENTRY glGenRenderbuffersOESContextANGLE(GLeglContext ctx, GLsizei n, GLuint *renderbuffers);
>+GL_API void GL_APIENTRY glGenerateMipmapOESContextANGLE(GLeglContext ctx, GLenum target);
>+GL_API void GL_APIENTRY glGetFramebufferAttachmentParameterivOESContextANGLE(GLeglContext ctx, GLenum target, GLenum attachment, GLenum pname, GLint *params);
>+GL_API void GL_APIENTRY glGetRenderbufferParameterivOESContextANGLE(GLeglContext ctx, GLenum target, GLenum pname, GLint *params);
>+GL_API void GL_APIENTRY glGetTexGenfvOESContextANGLE(GLeglContext ctx, GLenum coord, GLenum pname, GLfloat *params);
>+GL_API void GL_APIENTRY glGetTexGenivOESContextANGLE(GLeglContext ctx, GLenum coord, GLenum pname, GLint *params);
>+GL_API void GL_APIENTRY glGetTexGenxvOESContextANGLE(GLeglContext ctx, GLenum coord, GLenum pname, GLfixed *params);
>+GL_API GLboolean GL_APIENTRY glIsFramebufferOESContextANGLE(GLeglContext ctx, GLuint framebuffer);
>+GL_API GLboolean GL_APIENTRY glIsRenderbufferOESContextANGLE(GLeglContext ctx, GLuint renderbuffer);
>+GL_API void GL_APIENTRY glLoadPaletteFromModelViewMatrixOESContextANGLE(GLeglContext ctx);
>+GL_API void GL_APIENTRY glMatrixIndexPointerOESContextANGLE(GLeglContext ctx, GLint size, GLenum type, GLsizei stride, const void *pointer);
>+GL_API void GL_APIENTRY glPointSizePointerOESContextANGLE(GLeglContext ctx, GLenum type, GLsizei stride, const void *pointer);
>+GL_API GLbitfield GL_APIENTRY glQueryMatrixxOESContextANGLE(GLeglContext ctx, GLfixed *mantissa, GLint *exponent);
>+GL_API void GL_APIENTRY glRenderbufferStorageOESContextANGLE(GLeglContext ctx, GLenum target, GLenum internalformat, GLsizei width, GLsizei height);
>+GL_API void GL_APIENTRY glTexGenfOESContextANGLE(GLeglContext ctx, GLenum coord, GLenum pname, GLfloat param);
>+GL_API void GL_APIENTRY glTexGenfvOESContextANGLE(GLeglContext ctx, GLenum coord, GLenum pname, const GLfloat *params);
>+GL_API void GL_APIENTRY glTexGeniOESContextANGLE(GLeglContext ctx, GLenum coord, GLenum pname, GLint param);
>+GL_API void GL_APIENTRY glTexGenivOESContextANGLE(GLeglContext ctx, GLenum coord, GLenum pname, const GLint *params);
>+GL_API void GL_APIENTRY glTexGenxOESContextANGLE(GLeglContext ctx, GLenum coord, GLenum pname, GLfixed param);
>+GL_API void GL_APIENTRY glTexGenxvOESContextANGLE(GLeglContext ctx, GLenum coord, GLenum pname, const GLfixed *params);
>+GL_API void GL_APIENTRY glWeightPointerOESContextANGLE(GLeglContext ctx, GLint size, GLenum type, GLsizei stride, const void *pointer);
>+#endif
>diff --git a/Source/ThirdParty/ANGLE/include/GLES/glplatform.h b/Source/ThirdParty/ANGLE/include/GLES/glplatform.h
>new file mode 100644
>index 00000000000..16060a9a73b
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/include/GLES/glplatform.h
>@@ -0,0 +1,38 @@
>+#ifndef __glplatform_h_
>+#define __glplatform_h_
>+
>+/*
>+** Copyright (c) 2017 The Khronos Group Inc.
>+**
>+** Licensed under the Apache License, Version 2.0 (the "License");
>+** you may not use this file except in compliance with the License.
>+** You may obtain a copy of the License at
>+**
>+**     http://www.apache.org/licenses/LICENSE-2.0
>+**
>+** Unless required by applicable law or agreed to in writing, software
>+** distributed under the License is distributed on an "AS IS" BASIS,
>+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
>+** See the License for the specific language governing permissions and
>+** limitations under the License.
>+*/
>+
>+/* Platform-specific types and definitions for OpenGL ES 1.X  gl.h
>+ *
>+ * Adopters may modify khrplatform.h and this file to suit their platform.
>+ * Please contribute modifications back to Khronos as pull requests on the
>+ * public github repository:
>+ *      https://github.com/KhronosGroup/OpenGL-Registry
>+ */
>+
>+#include <KHR/khrplatform.h>
>+
>+#ifndef GL_API
>+#define GL_API      KHRONOS_APICALL
>+#endif
>+
>+#ifndef GL_APIENTRY
>+#define GL_APIENTRY KHRONOS_APIENTRY
>+#endif
>+
>+#endif /* __glplatform_h_ */
>diff --git a/Source/ThirdParty/ANGLE/include/GLES2/.clang-format b/Source/ThirdParty/ANGLE/include/GLES2/.clang-format
>new file mode 100644
>index 00000000000..06147100144
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/include/GLES2/.clang-format
>@@ -0,0 +1,3 @@
>+
>+
>+DisableFormat: true
>diff --git a/Source/ThirdParty/ANGLE/include/GLES2/gl2ext.h b/Source/ThirdParty/ANGLE/include/GLES2/gl2ext.h
>index 4def3ced4b8..0ee082a3d0f 100644
>--- a/Source/ThirdParty/ANGLE/include/GLES2/gl2ext.h
>+++ b/Source/ThirdParty/ANGLE/include/GLES2/gl2ext.h
>@@ -1,12 +1,12 @@
>-#ifndef __gl2ext_h_
>-#define __gl2ext_h_ 1
>+#ifndef __gles2_gl2ext_h_
>+#define __gles2_gl2ext_h_ 1
> 
> #ifdef __cplusplus
> extern "C" {
> #endif
> 
> /*
>-** Copyright (c) 2013-2017 The Khronos Group Inc.
>+** Copyright (c) 2013-2018 The Khronos Group Inc.
> **
> ** Permission is hereby granted, free of charge, to any person obtaining a
> ** copy of this software and/or associated documentation files (the
>@@ -38,7 +38,7 @@ extern "C" {
> #define GL_APIENTRYP GL_APIENTRY*
> #endif
> 
>-/* Generated on date 20170613 */
>+/* Generated on date 20180525 */
> 
> /* Generated C header for:
>  * API: gles2
>@@ -159,6 +159,16 @@ GL_APICALL void GL_APIENTRY glGetPointervKHR (GLenum pname, void **params);
> #define GL_CONTEXT_FLAG_NO_ERROR_BIT_KHR  0x00000008
> #endif /* GL_KHR_no_error */
> 
>+#ifndef GL_KHR_parallel_shader_compile
>+#define GL_KHR_parallel_shader_compile 1
>+#define GL_MAX_SHADER_COMPILER_THREADS_KHR 0x91B0
>+#define GL_COMPLETION_STATUS_KHR          0x91B1
>+typedef void (GL_APIENTRYP PFNGLMAXSHADERCOMPILERTHREADSKHRPROC) (GLuint count);
>+#ifdef GL_GLEXT_PROTOTYPES
>+GL_APICALL void GL_APIENTRY glMaxShaderCompilerThreadsKHR (GLuint count);
>+#endif
>+#endif /* GL_KHR_parallel_shader_compile */
>+
> #ifndef GL_KHR_robust_buffer_access_behavior
> #define GL_KHR_robust_buffer_access_behavior 1
> #endif /* GL_KHR_robust_buffer_access_behavior */
>@@ -324,12 +334,12 @@ GL_APICALL GLboolean GL_APIENTRY glIsEnablediOES (GLenum target, GLuint index);
> typedef void (GL_APIENTRYP PFNGLDRAWELEMENTSBASEVERTEXOESPROC) (GLenum mode, GLsizei count, GLenum type, const void *indices, GLint basevertex);
> typedef void (GL_APIENTRYP PFNGLDRAWRANGEELEMENTSBASEVERTEXOESPROC) (GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const void *indices, GLint basevertex);
> typedef void (GL_APIENTRYP PFNGLDRAWELEMENTSINSTANCEDBASEVERTEXOESPROC) (GLenum mode, GLsizei count, GLenum type, const void *indices, GLsizei instancecount, GLint basevertex);
>-typedef void (GL_APIENTRYP PFNGLMULTIDRAWELEMENTSBASEVERTEXOESPROC) (GLenum mode, const GLsizei *count, GLenum type, const void *const*indices, GLsizei primcount, const GLint *basevertex);
>+typedef void (GL_APIENTRYP PFNGLMULTIDRAWELEMENTSBASEVERTEXEXTPROC) (GLenum mode, const GLsizei *count, GLenum type, const void *const*indices, GLsizei primcount, const GLint *basevertex);
> #ifdef GL_GLEXT_PROTOTYPES
> GL_APICALL void GL_APIENTRY glDrawElementsBaseVertexOES (GLenum mode, GLsizei count, GLenum type, const void *indices, GLint basevertex);
> GL_APICALL void GL_APIENTRY glDrawRangeElementsBaseVertexOES (GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const void *indices, GLint basevertex);
> GL_APICALL void GL_APIENTRY glDrawElementsInstancedBaseVertexOES (GLenum mode, GLsizei count, GLenum type, const void *indices, GLsizei instancecount, GLint basevertex);
>-GL_APICALL void GL_APIENTRY glMultiDrawElementsBaseVertexOES (GLenum mode, const GLsizei *count, GLenum type, const void *const*indices, GLsizei primcount, const GLint *basevertex);
>+GL_APICALL void GL_APIENTRY glMultiDrawElementsBaseVertexEXT (GLenum mode, const GLsizei *count, GLenum type, const void *const*indices, GLsizei primcount, const GLint *basevertex);
> #endif
> #endif /* GL_OES_draw_elements_base_vertex */
> 
>@@ -1055,6 +1065,16 @@ GL_APICALL void GL_APIENTRY glGetSyncivAPPLE (GLsync sync, GLenum pname, GLsizei
> #define GL_EXT_EGL_image_array 1
> #endif /* GL_EXT_EGL_image_array */
> 
>+#ifndef GL_EXT_EGL_image_storage
>+#define GL_EXT_EGL_image_storage 1
>+typedef void (GL_APIENTRYP PFNGLEGLIMAGETARGETTEXSTORAGEEXTPROC) (GLenum target, GLeglImageOES image, const GLint* attrib_list);
>+typedef void (GL_APIENTRYP PFNGLEGLIMAGETARGETTEXTURESTORAGEEXTPROC) (GLuint texture, GLeglImageOES image, const GLint* attrib_list);
>+#ifdef GL_GLEXT_PROTOTYPES
>+GL_APICALL void GL_APIENTRY glEGLImageTargetTexStorageEXT (GLenum target, GLeglImageOES image, const GLint* attrib_list);
>+GL_APICALL void GL_APIENTRY glEGLImageTargetTextureStorageEXT (GLuint texture, GLeglImageOES image, const GLint* attrib_list);
>+#endif
>+#endif /* GL_EXT_EGL_image_storage */
>+
> #ifndef GL_EXT_YUV_target
> #define GL_EXT_YUV_target 1
> #define GL_SAMPLER_EXTERNAL_2D_Y2Y_EXT    0x8BE7
>@@ -1126,6 +1146,20 @@ GL_APICALL void GL_APIENTRY glClearTexSubImageEXT (GLuint texture, GLint level,
> #endif
> #endif /* GL_EXT_clear_texture */
> 
>+#ifndef GL_EXT_clip_control
>+#define GL_EXT_clip_control 1
>+#define GL_LOWER_LEFT_EXT                 0x8CA1
>+#define GL_UPPER_LEFT_EXT                 0x8CA2
>+#define GL_NEGATIVE_ONE_TO_ONE_EXT        0x935E
>+#define GL_ZERO_TO_ONE_EXT                0x935F
>+#define GL_CLIP_ORIGIN_EXT                0x935C
>+#define GL_CLIP_DEPTH_MODE_EXT            0x935D
>+typedef void (GL_APIENTRYP PFNGLCLIPCONTROLEXTPROC) (GLenum origin, GLenum depth);
>+#ifdef GL_GLEXT_PROTOTYPES
>+GL_APICALL void GL_APIENTRY glClipControlEXT (GLenum origin, GLenum depth);
>+#endif
>+#endif /* GL_EXT_clip_control */
>+
> #ifndef GL_EXT_clip_cull_distance
> #define GL_EXT_clip_cull_distance 1
> #define GL_MAX_CLIP_DISTANCES_EXT         0x0D32
>@@ -1311,12 +1345,10 @@ GL_APICALL GLboolean GL_APIENTRY glIsEnablediEXT (GLenum target, GLuint index);
> typedef void (GL_APIENTRYP PFNGLDRAWELEMENTSBASEVERTEXEXTPROC) (GLenum mode, GLsizei count, GLenum type, const void *indices, GLint basevertex);
> typedef void (GL_APIENTRYP PFNGLDRAWRANGEELEMENTSBASEVERTEXEXTPROC) (GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const void *indices, GLint basevertex);
> typedef void (GL_APIENTRYP PFNGLDRAWELEMENTSINSTANCEDBASEVERTEXEXTPROC) (GLenum mode, GLsizei count, GLenum type, const void *indices, GLsizei instancecount, GLint basevertex);
>-typedef void (GL_APIENTRYP PFNGLMULTIDRAWELEMENTSBASEVERTEXEXTPROC) (GLenum mode, const GLsizei *count, GLenum type, const void *const*indices, GLsizei primcount, const GLint *basevertex);
> #ifdef GL_GLEXT_PROTOTYPES
> GL_APICALL void GL_APIENTRY glDrawElementsBaseVertexEXT (GLenum mode, GLsizei count, GLenum type, const void *indices, GLint basevertex);
> GL_APICALL void GL_APIENTRY glDrawRangeElementsBaseVertexEXT (GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const void *indices, GLint basevertex);
> GL_APICALL void GL_APIENTRY glDrawElementsInstancedBaseVertexEXT (GLenum mode, GLsizei count, GLenum type, const void *indices, GLsizei instancecount, GLint basevertex);
>-GL_APICALL void GL_APIENTRY glMultiDrawElementsBaseVertexEXT (GLenum mode, const GLsizei *count, GLenum type, const void *const*indices, GLsizei primcount, const GLint *basevertex);
> #endif
> #endif /* GL_EXT_draw_elements_base_vertex */
> 
>@@ -1682,6 +1714,8 @@ GL_APICALL void GL_APIENTRY glGetnUniformivEXT (GLuint program, GLint location,
> #define GL_LAYOUT_SHADER_READ_ONLY_EXT    0x9591
> #define GL_LAYOUT_TRANSFER_SRC_EXT        0x9592
> #define GL_LAYOUT_TRANSFER_DST_EXT        0x9593
>+#define GL_LAYOUT_DEPTH_READ_ONLY_STENCIL_ATTACHMENT_EXT 0x9530
>+#define GL_LAYOUT_DEPTH_ATTACHMENT_STENCIL_READ_ONLY_EXT 0x9531
> typedef void (GL_APIENTRYP PFNGLGENSEMAPHORESEXTPROC) (GLsizei n, GLuint *semaphores);
> typedef void (GL_APIENTRYP PFNGLDELETESEMAPHORESEXTPROC) (GLsizei n, const GLuint *semaphores);
> typedef GLboolean (GL_APIENTRYP PFNGLISSEMAPHOREEXTPROC) (GLuint semaphore);
>@@ -1825,6 +1859,14 @@ GL_APICALL void GL_APIENTRY glProgramUniformMatrix4x3fvEXT (GLuint program, GLin
> #define GL_FRAGMENT_SHADER_DISCARDS_SAMPLES_EXT 0x8A52
> #endif /* GL_EXT_shader_framebuffer_fetch */
> 
>+#ifndef GL_EXT_shader_framebuffer_fetch_non_coherent
>+#define GL_EXT_shader_framebuffer_fetch_non_coherent 1
>+typedef void (GL_APIENTRYP PFNGLFRAMEBUFFERFETCHBARRIEREXTPROC) (void);
>+#ifdef GL_GLEXT_PROTOTYPES
>+GL_APICALL void GL_APIENTRY glFramebufferFetchBarrierEXT (void);
>+#endif
>+#endif /* GL_EXT_shader_framebuffer_fetch_non_coherent */
>+
> #ifndef GL_EXT_shader_group_vote
> #define GL_EXT_shader_group_vote 1
> #endif /* GL_EXT_shader_group_vote */
>@@ -2012,18 +2054,42 @@ GL_APICALL void GL_APIENTRY glTexBufferRangeEXT (GLenum target, GLenum internalf
> #define GL_TEXTURE_ASTC_DECODE_PRECISION_EXT 0x8F69
> #endif /* GL_EXT_texture_compression_astc_decode_mode */
> 
>+#ifndef GL_EXT_texture_compression_bptc
>+#define GL_EXT_texture_compression_bptc 1
>+#define GL_COMPRESSED_RGBA_BPTC_UNORM_EXT 0x8E8C
>+#define GL_COMPRESSED_SRGB_ALPHA_BPTC_UNORM_EXT 0x8E8D
>+#define GL_COMPRESSED_RGB_BPTC_SIGNED_FLOAT_EXT 0x8E8E
>+#define GL_COMPRESSED_RGB_BPTC_UNSIGNED_FLOAT_EXT 0x8E8F
>+#endif /* GL_EXT_texture_compression_bptc */
>+
> #ifndef GL_EXT_texture_compression_dxt1
> #define GL_EXT_texture_compression_dxt1 1
> #define GL_COMPRESSED_RGB_S3TC_DXT1_EXT   0x83F0
> #define GL_COMPRESSED_RGBA_S3TC_DXT1_EXT  0x83F1
> #endif /* GL_EXT_texture_compression_dxt1 */
> 
>+#ifndef GL_EXT_texture_compression_rgtc
>+#define GL_EXT_texture_compression_rgtc 1
>+#define GL_COMPRESSED_RED_RGTC1_EXT       0x8DBB
>+#define GL_COMPRESSED_SIGNED_RED_RGTC1_EXT 0x8DBC
>+#define GL_COMPRESSED_RED_GREEN_RGTC2_EXT 0x8DBD
>+#define GL_COMPRESSED_SIGNED_RED_GREEN_RGTC2_EXT 0x8DBE
>+#endif /* GL_EXT_texture_compression_rgtc */
>+
> #ifndef GL_EXT_texture_compression_s3tc
> #define GL_EXT_texture_compression_s3tc 1
> #define GL_COMPRESSED_RGBA_S3TC_DXT3_EXT  0x83F2
> #define GL_COMPRESSED_RGBA_S3TC_DXT5_EXT  0x83F3
> #endif /* GL_EXT_texture_compression_s3tc */
> 
>+#ifndef GL_EXT_texture_compression_s3tc_srgb
>+#define GL_EXT_texture_compression_s3tc_srgb 1
>+#define GL_COMPRESSED_SRGB_S3TC_DXT1_EXT  0x8C4C
>+#define GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT1_EXT 0x8C4D
>+#define GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT3_EXT 0x8C4E
>+#define GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT5_EXT 0x8C4F
>+#endif /* GL_EXT_texture_compression_s3tc_srgb */
>+
> #ifndef GL_EXT_texture_cube_map_array
> #define GL_EXT_texture_cube_map_array 1
> #define GL_TEXTURE_CUBE_MAP_ARRAY_EXT     0x9009
>@@ -2045,12 +2111,24 @@ GL_APICALL void GL_APIENTRY glTexBufferRangeEXT (GLenum target, GLenum internalf
> 
> #ifndef GL_EXT_texture_filter_minmax
> #define GL_EXT_texture_filter_minmax 1
>+#define GL_TEXTURE_REDUCTION_MODE_EXT     0x9366
>+#define GL_WEIGHTED_AVERAGE_EXT           0x9367
> #endif /* GL_EXT_texture_filter_minmax */
> 
> #ifndef GL_EXT_texture_format_BGRA8888
> #define GL_EXT_texture_format_BGRA8888 1
> #endif /* GL_EXT_texture_format_BGRA8888 */
> 
>+#ifndef GL_EXT_texture_format_sRGB_override
>+#define GL_EXT_texture_format_sRGB_override 1
>+#define GL_TEXTURE_FORMAT_SRGB_OVERRIDE_EXT 0x8FBF
>+#endif /* GL_EXT_texture_format_sRGB_override */
>+
>+#ifndef GL_EXT_texture_mirror_clamp_to_edge
>+#define GL_EXT_texture_mirror_clamp_to_edge 1
>+#define GL_MIRROR_CLAMP_TO_EDGE_EXT       0x8743
>+#endif /* GL_EXT_texture_mirror_clamp_to_edge */
>+
> #ifndef GL_EXT_texture_norm16
> #define GL_EXT_texture_norm16 1
> #define GL_R16_EXT                        0x822A
>@@ -2253,6 +2331,11 @@ GL_APICALL void GL_APIENTRY glFramebufferTexture2DMultisampleIMG (GLenum target,
> #define GL_CUBIC_MIPMAP_LINEAR_IMG        0x913B
> #endif /* GL_IMG_texture_filter_cubic */
> 
>+#ifndef GL_INTEL_blackhole_render
>+#define GL_INTEL_blackhole_render 1
>+#define GL_BLACKHOLE_RENDER_INTEL         0x83FC
>+#endif /* GL_INTEL_blackhole_render */
>+
> #ifndef GL_INTEL_conservative_rasterization
> #define GL_INTEL_conservative_rasterization 1
> #define GL_CONSERVATIVE_RASTERIZATION_INTEL 0x83FE
>@@ -2295,7 +2378,7 @@ typedef void (GL_APIENTRYP PFNGLENDPERFQUERYINTELPROC) (GLuint queryHandle);
> typedef void (GL_APIENTRYP PFNGLGETFIRSTPERFQUERYIDINTELPROC) (GLuint *queryId);
> typedef void (GL_APIENTRYP PFNGLGETNEXTPERFQUERYIDINTELPROC) (GLuint queryId, GLuint *nextQueryId);
> typedef void (GL_APIENTRYP PFNGLGETPERFCOUNTERINFOINTELPROC) (GLuint queryId, GLuint counterId, GLuint counterNameLength, GLchar *counterName, GLuint counterDescLength, GLchar *counterDesc, GLuint *counterOffset, GLuint *counterDataSize, GLuint *counterTypeEnum, GLuint *counterDataTypeEnum, GLuint64 *rawCounterMaxValue);
>-typedef void (GL_APIENTRYP PFNGLGETPERFQUERYDATAINTELPROC) (GLuint queryHandle, GLuint flags, GLsizei dataSize, GLvoid *data, GLuint *bytesWritten);
>+typedef void (GL_APIENTRYP PFNGLGETPERFQUERYDATAINTELPROC) (GLuint queryHandle, GLuint flags, GLsizei dataSize, void *data, GLuint *bytesWritten);
> typedef void (GL_APIENTRYP PFNGLGETPERFQUERYIDBYNAMEINTELPROC) (GLchar *queryName, GLuint *queryId);
> typedef void (GL_APIENTRYP PFNGLGETPERFQUERYINFOINTELPROC) (GLuint queryId, GLuint queryNameLength, GLchar *queryName, GLuint *dataSize, GLuint *noCounters, GLuint *noInstances, GLuint *capsMask);
> #ifdef GL_GLEXT_PROTOTYPES
>@@ -2306,12 +2389,17 @@ GL_APICALL void GL_APIENTRY glEndPerfQueryINTEL (GLuint queryHandle);
> GL_APICALL void GL_APIENTRY glGetFirstPerfQueryIdINTEL (GLuint *queryId);
> GL_APICALL void GL_APIENTRY glGetNextPerfQueryIdINTEL (GLuint queryId, GLuint *nextQueryId);
> GL_APICALL void GL_APIENTRY glGetPerfCounterInfoINTEL (GLuint queryId, GLuint counterId, GLuint counterNameLength, GLchar *counterName, GLuint counterDescLength, GLchar *counterDesc, GLuint *counterOffset, GLuint *counterDataSize, GLuint *counterTypeEnum, GLuint *counterDataTypeEnum, GLuint64 *rawCounterMaxValue);
>-GL_APICALL void GL_APIENTRY glGetPerfQueryDataINTEL (GLuint queryHandle, GLuint flags, GLsizei dataSize, GLvoid *data, GLuint *bytesWritten);
>+GL_APICALL void GL_APIENTRY glGetPerfQueryDataINTEL (GLuint queryHandle, GLuint flags, GLsizei dataSize, void *data, GLuint *bytesWritten);
> GL_APICALL void GL_APIENTRY glGetPerfQueryIdByNameINTEL (GLchar *queryName, GLuint *queryId);
> GL_APICALL void GL_APIENTRY glGetPerfQueryInfoINTEL (GLuint queryId, GLuint queryNameLength, GLchar *queryName, GLuint *dataSize, GLuint *noCounters, GLuint *noInstances, GLuint *capsMask);
> #endif
> #endif /* GL_INTEL_performance_query */
> 
>+#ifndef GL_MESA_program_binary_formats
>+#define GL_MESA_program_binary_formats 1
>+#define GL_PROGRAM_BINARY_FORMAT_MESA     0x875F
>+#endif /* GL_MESA_program_binary_formats */
>+
> #ifndef GL_MESA_shader_integer_functions
> #define GL_MESA_shader_integer_functions 1
> #endif /* GL_MESA_shader_integer_functions */
>@@ -2416,6 +2504,23 @@ GL_APICALL void GL_APIENTRY glBlendBarrierNV (void);
> #define GL_BLEND_ADVANCED_COHERENT_NV     0x9285
> #endif /* GL_NV_blend_equation_advanced_coherent */
> 
>+#ifndef GL_NV_blend_minmax_factor
>+#define GL_NV_blend_minmax_factor 1
>+#define GL_FACTOR_MIN_AMD                 0x901C
>+#define GL_FACTOR_MAX_AMD                 0x901D
>+#endif /* GL_NV_blend_minmax_factor */
>+
>+#ifndef GL_NV_clip_space_w_scaling
>+#define GL_NV_clip_space_w_scaling 1
>+#define GL_VIEWPORT_POSITION_W_SCALE_NV   0x937C
>+#define GL_VIEWPORT_POSITION_W_SCALE_X_COEFF_NV 0x937D
>+#define GL_VIEWPORT_POSITION_W_SCALE_Y_COEFF_NV 0x937E
>+typedef void (GL_APIENTRYP PFNGLVIEWPORTPOSITIONWSCALENVPROC) (GLuint index, GLfloat xcoeff, GLfloat ycoeff);
>+#ifdef GL_GLEXT_PROTOTYPES
>+GL_APICALL void GL_APIENTRY glViewportPositionWScaleNV (GLuint index, GLfloat xcoeff, GLfloat ycoeff);
>+#endif
>+#endif /* GL_NV_clip_space_w_scaling */
>+
> #ifndef GL_NV_conditional_render
> #define GL_NV_conditional_render 1
> #define GL_QUERY_WAIT_NV                  0x8E13
>@@ -2442,6 +2547,11 @@ GL_APICALL void GL_APIENTRY glSubpixelPrecisionBiasNV (GLuint xbits, GLuint ybit
> #endif
> #endif /* GL_NV_conservative_raster */
> 
>+#ifndef GL_NV_conservative_raster_pre_snap
>+#define GL_NV_conservative_raster_pre_snap 1
>+#define GL_CONSERVATIVE_RASTER_MODE_PRE_SNAP_NV 0x9550
>+#endif /* GL_NV_conservative_raster_pre_snap */
>+
> #ifndef GL_NV_conservative_raster_pre_snap_triangles
> #define GL_NV_conservative_raster_pre_snap_triangles 1
> #define GL_CONSERVATIVE_RASTER_MODE_NV    0x954D
>@@ -2813,6 +2923,7 @@ GL_APICALL void GL_APIENTRY glUniformMatrix4x3fvNV (GLint location, GLsizei coun
> 
> #ifndef GL_NV_path_rendering
> #define GL_NV_path_rendering 1
>+typedef double GLdouble;
> #define GL_PATH_FORMAT_SVG_NV             0x9070
> #define GL_PATH_FORMAT_PS_NV              0x9071
> #define GL_STANDARD_FONT_NAME_NV          0x9072
>@@ -3023,6 +3134,25 @@ typedef GLenum (GL_APIENTRYP PFNGLPATHGLYPHINDEXARRAYNVPROC) (GLuint firstPathNa
> typedef GLenum (GL_APIENTRYP PFNGLPATHMEMORYGLYPHINDEXARRAYNVPROC) (GLuint firstPathName, GLenum fontTarget, GLsizeiptr fontSize, const void *fontData, GLsizei faceIndex, GLuint firstGlyphIndex, GLsizei numGlyphs, GLuint pathParameterTemplate, GLfloat emScale);
> typedef void (GL_APIENTRYP PFNGLPROGRAMPATHFRAGMENTINPUTGENNVPROC) (GLuint program, GLint location, GLenum genMode, GLint components, const GLfloat *coeffs);
> typedef void (GL_APIENTRYP PFNGLGETPROGRAMRESOURCEFVNVPROC) (GLuint program, GLenum programInterface, GLuint index, GLsizei propCount, const GLenum *props, GLsizei bufSize, GLsizei *length, GLfloat *params);
>+typedef void (GL_APIENTRYP PFNGLMATRIXFRUSTUMEXTPROC) (GLenum mode, GLdouble left, GLdouble right, GLdouble bottom, GLdouble top, GLdouble zNear, GLdouble zFar);
>+typedef void (GL_APIENTRYP PFNGLMATRIXLOADIDENTITYEXTPROC) (GLenum mode);
>+typedef void (GL_APIENTRYP PFNGLMATRIXLOADTRANSPOSEFEXTPROC) (GLenum mode, const GLfloat *m);
>+typedef void (GL_APIENTRYP PFNGLMATRIXLOADTRANSPOSEDEXTPROC) (GLenum mode, const GLdouble *m);
>+typedef void (GL_APIENTRYP PFNGLMATRIXLOADFEXTPROC) (GLenum mode, const GLfloat *m);
>+typedef void (GL_APIENTRYP PFNGLMATRIXLOADDEXTPROC) (GLenum mode, const GLdouble *m);
>+typedef void (GL_APIENTRYP PFNGLMATRIXMULTTRANSPOSEFEXTPROC) (GLenum mode, const GLfloat *m);
>+typedef void (GL_APIENTRYP PFNGLMATRIXMULTTRANSPOSEDEXTPROC) (GLenum mode, const GLdouble *m);
>+typedef void (GL_APIENTRYP PFNGLMATRIXMULTFEXTPROC) (GLenum mode, const GLfloat *m);
>+typedef void (GL_APIENTRYP PFNGLMATRIXMULTDEXTPROC) (GLenum mode, const GLdouble *m);
>+typedef void (GL_APIENTRYP PFNGLMATRIXORTHOEXTPROC) (GLenum mode, GLdouble left, GLdouble right, GLdouble bottom, GLdouble top, GLdouble zNear, GLdouble zFar);
>+typedef void (GL_APIENTRYP PFNGLMATRIXPOPEXTPROC) (GLenum mode);
>+typedef void (GL_APIENTRYP PFNGLMATRIXPUSHEXTPROC) (GLenum mode);
>+typedef void (GL_APIENTRYP PFNGLMATRIXROTATEFEXTPROC) (GLenum mode, GLfloat angle, GLfloat x, GLfloat y, GLfloat z);
>+typedef void (GL_APIENTRYP PFNGLMATRIXROTATEDEXTPROC) (GLenum mode, GLdouble angle, GLdouble x, GLdouble y, GLdouble z);
>+typedef void (GL_APIENTRYP PFNGLMATRIXSCALEFEXTPROC) (GLenum mode, GLfloat x, GLfloat y, GLfloat z);
>+typedef void (GL_APIENTRYP PFNGLMATRIXSCALEDEXTPROC) (GLenum mode, GLdouble x, GLdouble y, GLdouble z);
>+typedef void (GL_APIENTRYP PFNGLMATRIXTRANSLATEFEXTPROC) (GLenum mode, GLfloat x, GLfloat y, GLfloat z);
>+typedef void (GL_APIENTRYP PFNGLMATRIXTRANSLATEDEXTPROC) (GLenum mode, GLdouble x, GLdouble y, GLdouble z);
> #ifdef GL_GLEXT_PROTOTYPES
> GL_APICALL GLuint GL_APIENTRY glGenPathsNV (GLsizei range);
> GL_APICALL void GL_APIENTRY glDeletePathsNV (GLuint path, GLsizei range);
>@@ -3081,6 +3211,25 @@ GL_APICALL GLenum GL_APIENTRY glPathGlyphIndexArrayNV (GLuint firstPathName, GLe
> GL_APICALL GLenum GL_APIENTRY glPathMemoryGlyphIndexArrayNV (GLuint firstPathName, GLenum fontTarget, GLsizeiptr fontSize, const void *fontData, GLsizei faceIndex, GLuint firstGlyphIndex, GLsizei numGlyphs, GLuint pathParameterTemplate, GLfloat emScale);
> GL_APICALL void GL_APIENTRY glProgramPathFragmentInputGenNV (GLuint program, GLint location, GLenum genMode, GLint components, const GLfloat *coeffs);
> GL_APICALL void GL_APIENTRY glGetProgramResourcefvNV (GLuint program, GLenum programInterface, GLuint index, GLsizei propCount, const GLenum *props, GLsizei bufSize, GLsizei *length, GLfloat *params);
>+GL_APICALL void GL_APIENTRY glMatrixFrustumEXT (GLenum mode, GLdouble left, GLdouble right, GLdouble bottom, GLdouble top, GLdouble zNear, GLdouble zFar);
>+GL_APICALL void GL_APIENTRY glMatrixLoadIdentityEXT (GLenum mode);
>+GL_APICALL void GL_APIENTRY glMatrixLoadTransposefEXT (GLenum mode, const GLfloat *m);
>+GL_APICALL void GL_APIENTRY glMatrixLoadTransposedEXT (GLenum mode, const GLdouble *m);
>+GL_APICALL void GL_APIENTRY glMatrixLoadfEXT (GLenum mode, const GLfloat *m);
>+GL_APICALL void GL_APIENTRY glMatrixLoaddEXT (GLenum mode, const GLdouble *m);
>+GL_APICALL void GL_APIENTRY glMatrixMultTransposefEXT (GLenum mode, const GLfloat *m);
>+GL_APICALL void GL_APIENTRY glMatrixMultTransposedEXT (GLenum mode, const GLdouble *m);
>+GL_APICALL void GL_APIENTRY glMatrixMultfEXT (GLenum mode, const GLfloat *m);
>+GL_APICALL void GL_APIENTRY glMatrixMultdEXT (GLenum mode, const GLdouble *m);
>+GL_APICALL void GL_APIENTRY glMatrixOrthoEXT (GLenum mode, GLdouble left, GLdouble right, GLdouble bottom, GLdouble top, GLdouble zNear, GLdouble zFar);
>+GL_APICALL void GL_APIENTRY glMatrixPopEXT (GLenum mode);
>+GL_APICALL void GL_APIENTRY glMatrixPushEXT (GLenum mode);
>+GL_APICALL void GL_APIENTRY glMatrixRotatefEXT (GLenum mode, GLfloat angle, GLfloat x, GLfloat y, GLfloat z);
>+GL_APICALL void GL_APIENTRY glMatrixRotatedEXT (GLenum mode, GLdouble angle, GLdouble x, GLdouble y, GLdouble z);
>+GL_APICALL void GL_APIENTRY glMatrixScalefEXT (GLenum mode, GLfloat x, GLfloat y, GLfloat z);
>+GL_APICALL void GL_APIENTRY glMatrixScaledEXT (GLenum mode, GLdouble x, GLdouble y, GLdouble z);
>+GL_APICALL void GL_APIENTRY glMatrixTranslatefEXT (GLenum mode, GLfloat x, GLfloat y, GLfloat z);
>+GL_APICALL void GL_APIENTRY glMatrixTranslatedEXT (GLenum mode, GLdouble x, GLdouble y, GLdouble z);
> #endif
> #endif /* GL_NV_path_rendering */
> 
>@@ -3089,6 +3238,14 @@ GL_APICALL void GL_APIENTRY glGetProgramResourcefvNV (GLuint program, GLenum pro
> #define GL_SHARED_EDGE_NV                 0xC0
> #endif /* GL_NV_path_rendering_shared_edge */
> 
>+#ifndef GL_NV_pixel_buffer_object
>+#define GL_NV_pixel_buffer_object 1
>+#define GL_PIXEL_PACK_BUFFER_NV           0x88EB
>+#define GL_PIXEL_UNPACK_BUFFER_NV         0x88EC
>+#define GL_PIXEL_PACK_BUFFER_BINDING_NV   0x88ED
>+#define GL_PIXEL_UNPACK_BUFFER_BINDING_NV 0x88EF
>+#endif /* GL_NV_pixel_buffer_object */
>+
> #ifndef GL_NV_polygon_mode
> #define GL_NV_polygon_mode 1
> #define GL_POLYGON_MODE_NV                0x0B40
>@@ -3184,6 +3341,10 @@ GL_APICALL void GL_APIENTRY glResolveDepthValuesNV (void);
> #define GL_SAMPLER_CUBE_SHADOW_NV         0x8DC5
> #endif /* GL_NV_shadow_samplers_cube */
> 
>+#ifndef GL_NV_stereo_view_rendering
>+#define GL_NV_stereo_view_rendering 1
>+#endif /* GL_NV_stereo_view_rendering */
>+
> #ifndef GL_NV_texture_border_clamp
> #define GL_NV_texture_border_clamp 1
> #define GL_TEXTURE_BORDER_COLOR_NV        0x1004
>@@ -3386,6 +3547,19 @@ GL_APICALL void GL_APIENTRY glFramebufferFetchBarrierQCOM (void);
> #endif
> #endif /* GL_QCOM_shader_framebuffer_fetch_noncoherent */
> 
>+#ifndef GL_QCOM_texture_foveated
>+#define GL_QCOM_texture_foveated 1
>+#define GL_TEXTURE_FOVEATED_FEATURE_BITS_QCOM 0x8BFB
>+#define GL_TEXTURE_FOVEATED_MIN_PIXEL_DENSITY_QCOM 0x8BFC
>+#define GL_TEXTURE_FOVEATED_FEATURE_QUERY_QCOM 0x8BFD
>+#define GL_TEXTURE_FOVEATED_NUM_FOCAL_POINTS_QUERY_QCOM 0x8BFE
>+#define GL_FRAMEBUFFER_INCOMPLETE_FOVEATION_QCOM 0x8BFF
>+typedef void (GL_APIENTRYP PFNGLTEXTUREFOVEATIONPARAMETERSQCOMPROC) (GLuint texture, GLuint layer, GLuint focalPoint, GLfloat focalX, GLfloat focalY, GLfloat gainX, GLfloat gainY, GLfloat foveaArea);
>+#ifdef GL_GLEXT_PROTOTYPES
>+GL_APICALL void GL_APIENTRY glTextureFoveationParametersQCOM (GLuint texture, GLuint layer, GLuint focalPoint, GLfloat focalX, GLfloat focalY, GLfloat gainX, GLfloat gainY, GLfloat foveaArea);
>+#endif
>+#endif /* GL_QCOM_texture_foveated */
>+
> #ifndef GL_QCOM_tiled_rendering
> #define GL_QCOM_tiled_rendering 1
> #define GL_COLOR_BUFFER_BIT0_QCOM         0x00000001
>diff --git a/Source/ThirdParty/ANGLE/include/GLES2/gl2ext_angle.h b/Source/ThirdParty/ANGLE/include/GLES2/gl2ext_angle.h
>index fc5a4bf35db..d0cbaa425e2 100644
>--- a/Source/ThirdParty/ANGLE/include/GLES2/gl2ext_angle.h
>+++ b/Source/ThirdParty/ANGLE/include/GLES2/gl2ext_angle.h
>@@ -32,6 +32,17 @@ GL_APICALL void GL_APIENTRY glRequestExtensionANGLE (const GLchar *name);
> #define GL_ROBUST_RESOURCE_INITIALIZATION_ANGLE 0x93AB
> #endif /* GL_ANGLE_robust_resource_initialization */
> 
>+#ifndef GL_ANGLE_provoking_vertex
>+#define GL_ANGLE_provoking_vertex 1
>+#define GL_FIRST_VERTEX_CONVENTION                   0x8E4D
>+#define GL_LAST_VERTEX_CONVENTION                    0x8E4E
>+#define GL_PROVOKING_VERTEX                          0x8E4F
>+typedef void (GL_APIENTRYP PFNGLPROVOKINGVERTEXANGLEPROC) (GLenum);
>+#ifdef GL_GLEXT_PROTOTYPES
>+GL_APICALL void GL_APIENTRY glProvokingVertexANGLE(GLenum mode);
>+#endif
>+#endif /* GL_ANGLE_provoking_vertex */
>+
> #ifndef GL_CHROMIUM_framebuffer_mixed_samples
> #define GL_CHROMIUM_frambuffer_mixed_samples 1
> #define GL_COVERAGE_MODULATION_CHROMIUM 0x9332
>@@ -46,6 +57,11 @@ GL_APICALL void GL_APIENTRY glCoverageModulationCHROMIUM(GLenum components);
> #define GL_BIND_GENERATES_RESOURCE_CHROMIUM 0x9244
> #endif /* GL_CHROMIUM_bind_generates_resource */
> 
>+#ifndef GL_ANGLE_memory_size
>+#define GL_ANGLE_memory_size
>+#define GL_MEMORY_SIZE_ANGLE 0x93AD
>+#endif /* GL_ANGLE_memory_size */
>+
> // needed by NV_path_rendering (and thus CHROMIUM_path_rendering)
> // but CHROMIUM_path_rendering only needs MatrixLoadfEXT, MatrixLoadIdentityEXT
> #ifndef GL_EXT_direct_state_access
>@@ -188,7 +204,7 @@ typedef void(GL_APIENTRYP PFNGLSTENCILTHENCOVERSTROKEPATHINSTANCEDCHROMIUMPROC)(
>     GLenum transformType,
>     const GLfloat *transformValues);
> 
>-typedef void(GL_APIENTRY PFNGLBINDFRAGMENTINPUTLOCATIONCHROMIUMPROC)(GLuint program,
>+typedef void(GL_APIENTRYP PFNGLBINDFRAGMENTINPUTLOCATIONCHROMIUMPROC)(GLuint program,
>                                                                      GLint location,
>                                                                      const GLchar *name);
> typedef void(GL_APIENTRYP PFNGLPROGRAMPATHFRAGMENTINPUTGENCHROMIUMPROC)(GLuint program,
>@@ -351,6 +367,67 @@ GL_APICALL void GL_APIENTRY glCompressedCopyTextureCHROMIUM(GLuint sourceId, GLu
> #endif
> #endif /* GL_CHROMIUM_compressed_copy_texture */
> 
>+
>+#ifndef GL_ANGLE_copy_texture_3d
>+#define GL_ANGLE_copy_texture_3d 1
>+typedef void(GL_APIENTRYP PFNGLCOPYTEXTURE3DANGLEPROC)(GLuint sourceId,
>+                                                        GLint sourceLevel,
>+                                                        GLenum destTarget,
>+                                                        GLuint destId,
>+                                                        GLint destLevel,
>+                                                        GLint internalFormat,
>+                                                        GLenum destType,
>+                                                        GLboolean unpackFlipY,
>+                                                        GLboolean unpackPremultiplyAlpha,
>+                                                        GLboolean unpackUnmultiplyAlpha);
>+typedef void(GL_APIENTRYP PFNGLCOPYSUBTEXTURE3DANGLEPROC)(GLuint sourceId,
>+                                                           GLint sourceLevel,
>+                                                           GLenum destTarget,
>+                                                           GLuint destId,
>+                                                           GLint destLevel,
>+                                                           GLint xoffset,
>+                                                           GLint yoffset,
>+                                                           GLint zoffset,
>+                                                           GLint x,
>+                                                           GLint y,
>+                                                           GLint z,
>+                                                           GLsizei width,
>+                                                           GLsizei height,
>+                                                           GLsizei depth,
>+                                                           GLboolean unpackFlipY,
>+                                                           GLboolean unpackPremultiplyAlpha,
>+                                                           GLboolean unpackUnmultiplyAlpha);
>+#ifdef GL_GLEXT_PROTOTYPES
>+GL_APICALL void GL_APIENTRY glCopyTexture3DANGLE(GLuint sourceId,
>+                                                  GLint sourceLevel,
>+                                                  GLenum destTarget,
>+                                                  GLuint destId,
>+                                                  GLint destLevel,
>+                                                  GLint internalFormat,
>+                                                  GLenum destType,
>+                                                  GLboolean unpackFlipY,
>+                                                  GLboolean unpackPremultiplyAlpha,
>+                                                  GLboolean unpackUnmultiplyAlpha);
>+GL_APICALL void GL_APIENTRY glCopySubTexture3DANGLE(GLuint sourceId,
>+                                                     GLint sourceLevel,
>+                                                     GLenum destTarget,
>+                                                     GLuint destId,
>+                                                     GLint destLevel,
>+                                                     GLint xoffset,
>+                                                     GLint yoffset,
>+                                                     GLint zoffset,
>+                                                     GLint x,
>+                                                     GLint y,
>+                                                     GLint z,
>+                                                     GLsizei width,
>+                                                     GLsizei height,
>+                                                     GLsizei depth,
>+                                                     GLboolean unpackFlipY,
>+                                                     GLboolean unpackPremultiplyAlpha,
>+                                                     GLboolean unpackUnmultiplyAlpha);
>+#endif
>+#endif /* GL_ANGLE_copy_texture_3d */
>+
> #ifndef GL_CHROMIUM_sync_query
> #define GL_CHROMIUM_sync_query 1
> #define GL_COMMANDS_COMPLETED_CHROMIUM    0x84F7
>@@ -381,70 +458,70 @@ GL_APICALL void GL_APIENTRY glCompressedCopyTextureCHROMIUM(GLuint sourceId, GLu
> 
> #ifndef GL_ANGLE_robust_client_memory
> #define GL_ANGLE_robust_client_memory 1
>-typedef void (GL_APIENTRYP PFNGLGETBOOLEANVROBUSTANGLE) (GLenum pname, GLsizei bufSize, GLsizei *length, GLboolean *data);
>-typedef void (GL_APIENTRYP PFNGLGETBUFFERPARAMETERIVROBUSTANGLE) (GLenum target, GLenum pname, GLsizei bufSize, GLsizei *length, GLint *params);
>-typedef void (GL_APIENTRYP PFNGLGETFLOATVROBUSTANGLE) (GLenum pname, GLsizei bufSize, GLsizei *length, GLfloat *data);
>-typedef void (GL_APIENTRYP PFNGLGETFRAMEBUFFERATTACHMENTPARAMETERIVROBUSTANGLE) (GLenum target, GLenum attachment, GLenum pname, GLsizei bufSize, GLsizei *length, GLint *params);
>-typedef void (GL_APIENTRYP PFNGLGETINTEGERVROBUSTANGLE) (GLenum pname, GLsizei bufSize, GLsizei *length, GLint *data);
>-typedef void (GL_APIENTRYP PFNGLGETPROGRAMIVROBUSTANGLE) (GLuint program, GLenum pname, GLsizei bufSize, GLsizei *length, GLint *params);
>-typedef void (GL_APIENTRYP PFNGLGETRENDERBUFFERPARAMETERIVROBUSTANGLE) (GLenum target, GLenum pname, GLsizei bufSize, GLsizei *length, GLint *params);
>-typedef void (GL_APIENTRYP PFNGLGETSHADERIVROBUSTANGLE) (GLuint shader, GLenum pname, GLsizei bufSize, GLsizei *length, GLint *params);
>-typedef void (GL_APIENTRYP PFNGLGETTEXPARAMETERFVROBUSTANGLE) (GLenum target, GLenum pname, GLsizei bufSize, GLsizei *length, GLfloat *params);
>-typedef void (GL_APIENTRYP PFNGLGETTEXPARAMETERIVROBUSTANGLE) (GLenum target, GLenum pname, GLsizei bufSize, GLsizei *length, GLint *params);
>-typedef void (GL_APIENTRYP PFNGLGETUNIFORMFVROBUSTANGLE) (GLuint program, GLint location, GLsizei bufSize, GLsizei *length, GLfloat *params);
>-typedef void (GL_APIENTRYP PFNGLGETUNIFORMIVROBUSTANGLE) (GLuint program, GLint location, GLsizei bufSize, GLsizei *length, GLint *params);
>-typedef void (GL_APIENTRYP PFNGLGETVERTEXATTRIBFVROBUSTANGLE) (GLuint index, GLenum pname, GLsizei bufSize, GLsizei *length, GLfloat *params);
>-typedef void (GL_APIENTRYP PFNGLGETVERTEXATTRIBIVROBUSTANGLE) (GLuint index, GLenum pname, GLsizei bufSize, GLsizei *length, GLint *params);
>-typedef void (GL_APIENTRYP PFNGLGETVERTEXATTRIBPOINTERVROBUSTANGLE) (GLuint index, GLenum pname, GLsizei bufSize, GLsizei *length, void **pointer);
>-typedef void (GL_APIENTRYP PFNGLREADPIXELSROBUSTANGLE) (GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLsizei bufSize, GLsizei *length, GLsizei *columns, GLsizei *rows, void *pixels);
>-typedef void (GL_APIENTRYP PFNGLTEXIMAGE2DROBUSTANGLE) (GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, GLsizei bufSize, const void *pixels);
>-typedef void (GL_APIENTRYP PFNGLTEXPARAMETERFVROBUSTANGLE) (GLenum target, GLenum pname, GLsizei bufSize, const GLfloat *params);
>-typedef void (GL_APIENTRYP PFNGLTEXPARAMETERIVROBUSTANGLE) (GLenum target, GLenum pname, GLsizei bufSize, const GLint *params);
>-typedef void (GL_APIENTRYP PFNGLTEXSUBIMAGE2DROBUSTANGLE) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, GLsizei bufSize, const void *pixels);
>-typedef void (GL_APIENTRYP PFNGLTEXIMAGE3DROBUSTANGLE) (GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, GLsizei bufSize, const void *pixels);
>-typedef void (GL_APIENTRYP PFNGLTEXSUBIMAGE3DROBUSTANGLE) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, GLsizei bufSize, const void *pixels);
>-typedef void (GL_APIENTRYP PFNGLCOMPRESSEDTEXIMAGE2DROBUSTANGLE) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, GLsizei bufSize, const void *data);
>-typedef void (GL_APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE2DROBUSTANGLE) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, GLsizei bufSize, const void *data);
>-typedef void (GL_APIENTRYP PFNGLCOMPRESSEDTEXIMAGE3DROBUSTANGLE) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, GLsizei bufSize, const void *data);
>-typedef void (GL_APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE3DROBUSTANGLE) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, GLsizei bufSize, const void *data);
>-typedef void (GL_APIENTRYP PFNGLGETQUERYIVROBUSTANGLE) (GLenum target, GLenum pname, GLsizei bufSize, GLsizei *length, GLint *params);
>-typedef void (GL_APIENTRYP PFNGLGETQUERYOBJECTUIVROBUSTANGLE) (GLuint id, GLenum pname, GLsizei bufSize, GLsizei *length, GLuint *params);
>-typedef void (GL_APIENTRYP PFNGLGETBUFFERPOINTERVROBUSTANGLE) (GLenum target, GLenum pname, GLsizei bufSize, GLsizei *length, void **params);
>-typedef void (GL_APIENTRYP PFNGLGETINTEGERI_VROBUSTANGLE) (GLenum target, GLuint index, GLsizei bufSize, GLsizei *length, GLint *data);
>-typedef void (GL_APIENTRYP PFNGETINTERNALFORMATIVROBUSTANGLE) (GLenum target, GLenum internalformat, GLenum pname, GLsizei bufSize, GLsizei *length, GLint *params);
>-typedef void (GL_APIENTRYP PFNGLGETVERTEXATTRIBIIVROBUSTANGLE) (GLuint index, GLenum pname, GLsizei bufSize, GLsizei *length, GLint *params);
>-typedef void (GL_APIENTRYP PFNGLGETVERTEXATTRIBIUIVROBUSTANGLE) (GLuint index, GLenum pname, GLsizei bufSize, GLsizei *length, GLuint *params);
>-typedef void (GL_APIENTRYP PFNGLGETUNIFORMUIVROBUSTANGLE) (GLuint program, GLint location, GLsizei bufSize, GLsizei *length, GLuint *params);
>-typedef void (GL_APIENTRYP PFNGLGETACTIVEUNIFORMBLOCKIVROBUSTANGLE) (GLuint program, GLuint uniformBlockIndex, GLenum pname, GLsizei bufSize, GLsizei *length, GLint *params);
>-typedef void (GL_APIENTRYP PFNGLGETINTEGER64VROBUSTANGLE) (GLenum pname, GLsizei bufSize, GLsizei *length, GLint64 *data);
>-typedef void (GL_APIENTRYP PFNGLGETINTEGER64I_VROBUSTANGLE) (GLenum target, GLuint index, GLsizei bufSize, GLsizei *length, GLint64 *data);
>-typedef void (GL_APIENTRYP PFNGLGETBUFFERPARAMETERI64VROBUSTANGLE) (GLenum target, GLenum pname, GLsizei bufSize, GLsizei *length, GLint64 *params);
>-typedef void (GL_APIENTRYP PFNGLSAMPLERPARAMETERIVROBUSTANGLE) (GLuint sampler, GLenum pname, GLsizei bufSize, const GLint *param);
>-typedef void (GL_APIENTRYP PFNGLSAMPLERPARAMETERFVROBUSTANGLE) (GLuint sampler, GLenum pname, GLsizei bufSize, const GLfloat *param);
>-typedef void (GL_APIENTRYP PFNGLGETSAMPLERPARAMETERIVROBUSTANGLE) (GLuint sampler, GLenum pname, GLsizei bufSize, GLsizei *length, GLint *params);
>-typedef void (GL_APIENTRYP PFNGLGETSAMPLERPARAMETERFVROBUSTANGLE) (GLuint sampler, GLenum pname, GLsizei bufSize, GLsizei *length, GLfloat *params);
>-typedef void (GL_APIENTRYP PFNGLGETFRAMEBUFFERPARAMETERIVROBUSTANGLE) (GLenum target, GLenum pname, GLsizei bufSize, GLsizei *length, GLint *params);
>-typedef void (GL_APIENTRYP PFNGLGETPROGRAMINTERFACEIVROBUSTANGLE) (GLuint program, GLenum programInterface, GLenum pname, GLsizei bufSize, GLsizei *length, GLint *params);
>-typedef void (GL_APIENTRYP PFNGLGETBOOLEANI_VROBUSTANGLE) (GLenum target, GLuint index, GLsizei bufSize, GLsizei *length, GLboolean *data);
>-typedef void (GL_APIENTRYP PFNGLGETMULTISAMPLEFVROBUSTANGLE) (GLenum pname, GLuint index, GLsizei bufSize, GLsizei *length, GLfloat *val);
>-typedef void (GL_APIENTRYP PFNGLGETTEXLEVELPARAMETERIVROBUSTANGLE) (GLenum target, GLint level, GLenum pname, GLsizei bufSize, GLsizei *length, GLint *params);
>-typedef void (GL_APIENTRYP PFNGLGETTEXLEVELPARAMETERFVROBUSTANGLE) (GLenum target, GLint level, GLenum pname, GLsizei bufSize, GLsizei *length, GLfloat *params);
>-typedef void (GL_APIENTRYP PFNGLGETPOINTERVROBUSTANGLEROBUSTANGLE) (GLenum pname, GLsizei bufSize, GLsizei *length, void **params);
>-typedef void (GL_APIENTRYP PFNGLREADNPIXELSROBUSTANGLE) (GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLsizei bufSize, GLsizei *length, GLsizei *columns, GLsizei *rows, void *data);
>-typedef void (GL_APIENTRYP PFNGLGETNUNIFORMFVROBUSTANGLE) (GLuint program, GLint location, GLsizei bufSize, GLsizei *length, GLfloat *params);
>-typedef void (GL_APIENTRYP PFNGLGETNUNIFORMIVROBUSTANGLE) (GLuint program, GLint location, GLsizei bufSize, GLsizei *length, GLint *params);
>-typedef void (GL_APIENTRYP PFNGLGETNUNIFORMUIVROBUSTANGLE) (GLuint program, GLint location, GLsizei bufSize, GLsizei *length, GLuint *params);
>-typedef void (GL_APIENTRYP PFNGLTEXPARAMETERIIVROBUSTANGLE) (GLenum target, GLenum pname, GLsizei bufSize, const GLint *params);
>-typedef void (GL_APIENTRYP PFNGLTEXPARAMETERIUIVROBUSTANGLE) (GLenum target, GLenum pname, GLsizei bufSize, const GLuint *params);
>-typedef void (GL_APIENTRYP PFNGLGETTEXPARAMETERIIVROBUSTANGLE) (GLenum target, GLenum pname, GLsizei bufSize, GLsizei *length, GLint *params);
>-typedef void (GL_APIENTRYP PFNGLGETTEXPARAMETERIUIVROBUSTANGLE) (GLenum target, GLenum pname, GLsizei bufSize, GLsizei *length, GLuint *params);
>-typedef void (GL_APIENTRYP PFNGLSAMPLERPARAMETERIIVROBUSTANGLE) (GLuint sampler, GLenum pname, GLsizei bufSize, const GLint *param);
>-typedef void (GL_APIENTRYP PFNGLSAMPLERPARAMETERIUIVROBUSTANGLE) (GLuint sampler, GLenum pname, GLsizei bufSize, const GLuint *param);
>-typedef void (GL_APIENTRYP PFNGLGETSAMPLERPARAMETERIIVROBUSTANGLE) (GLuint sampler, GLenum pname, GLsizei bufSize, GLsizei *length, GLint *params);
>-typedef void (GL_APIENTRYP PFNGLGETSAMPLERPARAMETERIUIVROBUSTANGLE) (GLuint sampler, GLenum pname, GLsizei bufSize, GLsizei *length, GLuint *params);
>-typedef void (GL_APIENTRYP PFNGLGETQUERYOBJECTIVROBUSTANGLE)(GLuint id, GLenum pname, GLsizei bufSize, GLsizei *length, GLint *params);
>-typedef void (GL_APIENTRYP PFNGLGETQUERYOBJECTI64VROBUSTANGLE)(GLuint id, GLenum pname, GLsizei bufSize, GLsizei *length, GLint64 *params);
>-typedef void (GL_APIENTRYP PFNGLGETQUERYOBJECTUI64VROBUSTANGLE)(GLuint id, GLenum pname, GLsizei bufSize, GLsizei *length, GLuint64 *params);
>+typedef void (GL_APIENTRYP PFNGLGETBOOLEANVROBUSTANGLEPROC) (GLenum pname, GLsizei bufSize, GLsizei *length, GLboolean *data);
>+typedef void (GL_APIENTRYP PFNGLGETBUFFERPARAMETERIVROBUSTANGLEPROC) (GLenum target, GLenum pname, GLsizei bufSize, GLsizei *length, GLint *params);
>+typedef void (GL_APIENTRYP PFNGLGETFLOATVROBUSTANGLEPROC) (GLenum pname, GLsizei bufSize, GLsizei *length, GLfloat *data);
>+typedef void (GL_APIENTRYP PFNGLGETFRAMEBUFFERATTACHMENTPARAMETERIVROBUSTANGLEPROC) (GLenum target, GLenum attachment, GLenum pname, GLsizei bufSize, GLsizei *length, GLint *params);
>+typedef void (GL_APIENTRYP PFNGLGETINTEGERVROBUSTANGLEPROC) (GLenum pname, GLsizei bufSize, GLsizei *length, GLint *data);
>+typedef void (GL_APIENTRYP PFNGLGETPROGRAMIVROBUSTANGLEPROC) (GLuint program, GLenum pname, GLsizei bufSize, GLsizei *length, GLint *params);
>+typedef void (GL_APIENTRYP PFNGLGETRENDERBUFFERPARAMETERIVROBUSTANGLEPROC) (GLenum target, GLenum pname, GLsizei bufSize, GLsizei *length, GLint *params);
>+typedef void (GL_APIENTRYP PFNGLGETSHADERIVROBUSTANGLEPROC) (GLuint shader, GLenum pname, GLsizei bufSize, GLsizei *length, GLint *params);
>+typedef void (GL_APIENTRYP PFNGLGETTEXPARAMETERFVROBUSTANGLEPROC) (GLenum target, GLenum pname, GLsizei bufSize, GLsizei *length, GLfloat *params);
>+typedef void (GL_APIENTRYP PFNGLGETTEXPARAMETERIVROBUSTANGLEPROC) (GLenum target, GLenum pname, GLsizei bufSize, GLsizei *length, GLint *params);
>+typedef void (GL_APIENTRYP PFNGLGETUNIFORMFVROBUSTANGLEPROC) (GLuint program, GLint location, GLsizei bufSize, GLsizei *length, GLfloat *params);
>+typedef void (GL_APIENTRYP PFNGLGETUNIFORMIVROBUSTANGLEPROC) (GLuint program, GLint location, GLsizei bufSize, GLsizei *length, GLint *params);
>+typedef void (GL_APIENTRYP PFNGLGETVERTEXATTRIBFVROBUSTANGLEPROC) (GLuint index, GLenum pname, GLsizei bufSize, GLsizei *length, GLfloat *params);
>+typedef void (GL_APIENTRYP PFNGLGETVERTEXATTRIBIVROBUSTANGLEPROC) (GLuint index, GLenum pname, GLsizei bufSize, GLsizei *length, GLint *params);
>+typedef void (GL_APIENTRYP PFNGLGETVERTEXATTRIBPOINTERVROBUSTANGLEPROC) (GLuint index, GLenum pname, GLsizei bufSize, GLsizei *length, void **pointer);
>+typedef void (GL_APIENTRYP PFNGLREADPIXELSROBUSTANGLEPROC) (GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLsizei bufSize, GLsizei *length, GLsizei *columns, GLsizei *rows, void *pixels);
>+typedef void (GL_APIENTRYP PFNGLTEXIMAGE2DROBUSTANGLEPROC) (GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, GLsizei bufSize, const void *pixels);
>+typedef void (GL_APIENTRYP PFNGLTEXPARAMETERFVROBUSTANGLEPROC) (GLenum target, GLenum pname, GLsizei bufSize, const GLfloat *params);
>+typedef void (GL_APIENTRYP PFNGLTEXPARAMETERIVROBUSTANGLEPROC) (GLenum target, GLenum pname, GLsizei bufSize, const GLint *params);
>+typedef void (GL_APIENTRYP PFNGLTEXSUBIMAGE2DROBUSTANGLEPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, GLsizei bufSize, const void *pixels);
>+typedef void (GL_APIENTRYP PFNGLTEXIMAGE3DROBUSTANGLEPROC) (GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, GLsizei bufSize, const void *pixels);
>+typedef void (GL_APIENTRYP PFNGLTEXSUBIMAGE3DROBUSTANGLEPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, GLsizei bufSize, const void *pixels);
>+typedef void (GL_APIENTRYP PFNGLCOMPRESSEDTEXIMAGE2DROBUSTANGLEPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, GLsizei bufSize, const void *data);
>+typedef void (GL_APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE2DROBUSTANGLEPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, GLsizei bufSize, const void *data);
>+typedef void (GL_APIENTRYP PFNGLCOMPRESSEDTEXIMAGE3DROBUSTANGLEPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, GLsizei bufSize, const void *data);
>+typedef void (GL_APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE3DROBUSTANGLEPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, GLsizei bufSize, const void *data);
>+typedef void (GL_APIENTRYP PFNGLGETQUERYIVROBUSTANGLEPROC) (GLenum target, GLenum pname, GLsizei bufSize, GLsizei *length, GLint *params);
>+typedef void (GL_APIENTRYP PFNGLGETQUERYOBJECTUIVROBUSTANGLEPROC) (GLuint id, GLenum pname, GLsizei bufSize, GLsizei *length, GLuint *params);
>+typedef void (GL_APIENTRYP PFNGLGETBUFFERPOINTERVROBUSTANGLEPROC) (GLenum target, GLenum pname, GLsizei bufSize, GLsizei *length, void **params);
>+typedef void (GL_APIENTRYP PFNGLGETINTEGERI_VROBUSTANGLEPROC) (GLenum target, GLuint index, GLsizei bufSize, GLsizei *length, GLint *data);
>+typedef void (GL_APIENTRYP PFNGLGETINTERNALFORMATIVROBUSTANGLEPROC) (GLenum target, GLenum internalformat, GLenum pname, GLsizei bufSize, GLsizei *length, GLint *params);
>+typedef void (GL_APIENTRYP PFNGLGETVERTEXATTRIBIIVROBUSTANGLEPROC) (GLuint index, GLenum pname, GLsizei bufSize, GLsizei *length, GLint *params);
>+typedef void (GL_APIENTRYP PFNGLGETVERTEXATTRIBIUIVROBUSTANGLEPROC) (GLuint index, GLenum pname, GLsizei bufSize, GLsizei *length, GLuint *params);
>+typedef void (GL_APIENTRYP PFNGLGETUNIFORMUIVROBUSTANGLEPROC) (GLuint program, GLint location, GLsizei bufSize, GLsizei *length, GLuint *params);
>+typedef void (GL_APIENTRYP PFNGLGETACTIVEUNIFORMBLOCKIVROBUSTANGLEPROC) (GLuint program, GLuint uniformBlockIndex, GLenum pname, GLsizei bufSize, GLsizei *length, GLint *params);
>+typedef void (GL_APIENTRYP PFNGLGETINTEGER64VROBUSTANGLEPROC) (GLenum pname, GLsizei bufSize, GLsizei *length, GLint64 *data);
>+typedef void (GL_APIENTRYP PFNGLGETINTEGER64I_VROBUSTANGLEPROC) (GLenum target, GLuint index, GLsizei bufSize, GLsizei *length, GLint64 *data);
>+typedef void (GL_APIENTRYP PFNGLGETBUFFERPARAMETERI64VROBUSTANGLEPROC) (GLenum target, GLenum pname, GLsizei bufSize, GLsizei *length, GLint64 *params);
>+typedef void (GL_APIENTRYP PFNGLSAMPLERPARAMETERIVROBUSTANGLEPROC) (GLuint sampler, GLenum pname, GLsizei bufSize, const GLint *param);
>+typedef void (GL_APIENTRYP PFNGLSAMPLERPARAMETERFVROBUSTANGLEPROC) (GLuint sampler, GLenum pname, GLsizei bufSize, const GLfloat *param);
>+typedef void (GL_APIENTRYP PFNGLGETSAMPLERPARAMETERIVROBUSTANGLEPROC) (GLuint sampler, GLenum pname, GLsizei bufSize, GLsizei *length, GLint *params);
>+typedef void (GL_APIENTRYP PFNGLGETSAMPLERPARAMETERFVROBUSTANGLEPROC) (GLuint sampler, GLenum pname, GLsizei bufSize, GLsizei *length, GLfloat *params);
>+typedef void (GL_APIENTRYP PFNGLGETFRAMEBUFFERPARAMETERIVROBUSTANGLEPROC) (GLenum target, GLenum pname, GLsizei bufSize, GLsizei *length, GLint *params);
>+typedef void (GL_APIENTRYP PFNGLGETPROGRAMINTERFACEIVROBUSTANGLEPROC) (GLuint program, GLenum programInterface, GLenum pname, GLsizei bufSize, GLsizei *length, GLint *params);
>+typedef void (GL_APIENTRYP PFNGLGETBOOLEANI_VROBUSTANGLEPROC) (GLenum target, GLuint index, GLsizei bufSize, GLsizei *length, GLboolean *data);
>+typedef void (GL_APIENTRYP PFNGLGETMULTISAMPLEFVROBUSTANGLEPROC) (GLenum pname, GLuint index, GLsizei bufSize, GLsizei *length, GLfloat *val);
>+typedef void (GL_APIENTRYP PFNGLGETTEXLEVELPARAMETERIVROBUSTANGLEPROC) (GLenum target, GLint level, GLenum pname, GLsizei bufSize, GLsizei *length, GLint *params);
>+typedef void (GL_APIENTRYP PFNGLGETTEXLEVELPARAMETERFVROBUSTANGLEPROC) (GLenum target, GLint level, GLenum pname, GLsizei bufSize, GLsizei *length, GLfloat *params);
>+typedef void (GL_APIENTRYP PFNGLGETPOINTERVROBUSTANGLEROBUSTANGLEPROC) (GLenum pname, GLsizei bufSize, GLsizei *length, void **params);
>+typedef void (GL_APIENTRYP PFNGLREADNPIXELSROBUSTANGLEPROC) (GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLsizei bufSize, GLsizei *length, GLsizei *columns, GLsizei *rows, void *data);
>+typedef void (GL_APIENTRYP PFNGLGETNUNIFORMFVROBUSTANGLEPROC) (GLuint program, GLint location, GLsizei bufSize, GLsizei *length, GLfloat *params);
>+typedef void (GL_APIENTRYP PFNGLGETNUNIFORMIVROBUSTANGLEPROC) (GLuint program, GLint location, GLsizei bufSize, GLsizei *length, GLint *params);
>+typedef void (GL_APIENTRYP PFNGLGETNUNIFORMUIVROBUSTANGLEPROC) (GLuint program, GLint location, GLsizei bufSize, GLsizei *length, GLuint *params);
>+typedef void (GL_APIENTRYP PFNGLTEXPARAMETERIIVROBUSTANGLEPROC) (GLenum target, GLenum pname, GLsizei bufSize, const GLint *params);
>+typedef void (GL_APIENTRYP PFNGLTEXPARAMETERIUIVROBUSTANGLEPROC) (GLenum target, GLenum pname, GLsizei bufSize, const GLuint *params);
>+typedef void (GL_APIENTRYP PFNGLGETTEXPARAMETERIIVROBUSTANGLEPROC) (GLenum target, GLenum pname, GLsizei bufSize, GLsizei *length, GLint *params);
>+typedef void (GL_APIENTRYP PFNGLGETTEXPARAMETERIUIVROBUSTANGLEPROC) (GLenum target, GLenum pname, GLsizei bufSize, GLsizei *length, GLuint *params);
>+typedef void (GL_APIENTRYP PFNGLSAMPLERPARAMETERIIVROBUSTANGLEPROC) (GLuint sampler, GLenum pname, GLsizei bufSize, const GLint *param);
>+typedef void (GL_APIENTRYP PFNGLSAMPLERPARAMETERIUIVROBUSTANGLEPROC) (GLuint sampler, GLenum pname, GLsizei bufSize, const GLuint *param);
>+typedef void (GL_APIENTRYP PFNGLGETSAMPLERPARAMETERIIVROBUSTANGLEPROC) (GLuint sampler, GLenum pname, GLsizei bufSize, GLsizei *length, GLint *params);
>+typedef void (GL_APIENTRYP PFNGLGETSAMPLERPARAMETERIUIVROBUSTANGLEPROC) (GLuint sampler, GLenum pname, GLsizei bufSize, GLsizei *length, GLuint *params);
>+typedef void (GL_APIENTRYP PFNGLGETQUERYOBJECTIVROBUSTANGLEPROC)(GLuint id, GLenum pname, GLsizei bufSize, GLsizei *length, GLint *params);
>+typedef void (GL_APIENTRYP PFNGLGETQUERYOBJECTI64VROBUSTANGLEPROC)(GLuint id, GLenum pname, GLsizei bufSize, GLsizei *length, GLint64 *params);
>+typedef void (GL_APIENTRYP PFNGLGETQUERYOBJECTUI64VROBUSTANGLEPROC)(GLuint id, GLenum pname, GLsizei bufSize, GLsizei *length, GLuint64 *params);
> #ifdef GL_GLEXT_PROTOTYPES
> GL_APICALL void GL_APIENTRY glGetBooleanvRobustANGLE (GLenum pname, GLsizei bufSize, GLsizei *length, GLboolean *data);
> GL_APICALL void GL_APIENTRY glGetBufferParameterivRobustANGLE (GLenum target, GLenum pname, GLsizei bufSize, GLsizei *length, GLint *params);
>@@ -518,26 +595,6 @@ GL_APICALL void GL_APIENTRY glGetQueryObjectui64vRobustANGLE(GLuint id, GLenum p
> #define GL_PROGRAM_CACHE_ENABLED_ANGLE 0x93AC
> #endif  /* GL_ANGLE_program_cache_control */
> 
>-#ifndef GL_ANGLE_multiview
>-#define GL_ANGLE_multiview 1
>-// The next four enums coincide with the enums introduced by the GL_OVR_multiview extension and use the values reserved by that extension.
>-#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_NUM_VIEWS_ANGLE 0x9630
>-#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_BASE_VIEW_INDEX_ANGLE 0x9632
>-#define GL_MAX_VIEWS_ANGLE 0x9631
>-#define GL_FRAMEBUFFER_INCOMPLETE_VIEW_TARGETS_ANGLE 0x9633
>-// The next four enums are reserved specifically for ANGLE.
>-#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_VIEWPORT_OFFSETS_ANGLE 0x969B
>-#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_MULTIVIEW_LAYOUT_ANGLE 0x969C
>-#define GL_FRAMEBUFFER_MULTIVIEW_SIDE_BY_SIDE_ANGLE 0x969D
>-#define GL_FRAMEBUFFER_MULTIVIEW_LAYERED_ANGLE 0x969E
>-typedef void(GL_APIENTRYP PFNGLFRAMEBUFFERTEXTUREMULTIVIEWLAYEREDANGLE)(GLenum target, GLenum attachment, GLuint texture, GLint level, GLint baseViewIndex, GLsizei numViews);
>-typedef void(GL_APIENTRYP PFNGLFRAMEBUFFERTEXTUREMULTIVIEWSIDEBYSIDEANGLE)(GLenum target, GLenum attachment, GLuint texture, GLint level, GLsizei numViews, const GLint *viewportOffsets);
>-#ifdef GL_GLEXT_PROTOTYPES
>-GL_APICALL void GL_APIENTRY glFramebufferTextureMultiviewLayeredANGLE(GLenum target, GLenum attachment, GLuint texture, GLint level, GLint baseViewIndex, GLsizei numViews);
>-GL_APICALL void GL_APIENTRY glFramebufferTextureMultiviewSideBySideANGLE(GLenum target, GLenum attachment, GLuint texture, GLint level, GLsizei numViews, const GLint *viewportOffsets);
>-#endif
>-#endif /* GL_ANGLE_multiview */
>-
> #ifndef GL_ANGLE_texture_rectangle
> #define GL_ANGLE_texture_rectangle 1
> #define GL_MAX_RECTANGLE_TEXTURE_SIZE_ANGLE 0x84F8
>@@ -546,6 +603,72 @@ GL_APICALL void GL_APIENTRY glFramebufferTextureMultiviewSideBySideANGLE(GLenum
> #define GL_SAMPLER_2D_RECT_ANGLE 0x8B63
> #endif /* GL_ANGLE_texture_rectangle */
> 
>+#ifndef GL_ANGLE_texture_multisample
>+#define GL_ANGLE_texture_multisample 1
>+#define GL_SAMPLE_POSITION_ANGLE 0x8E50
>+#define GL_SAMPLE_MASK_ANGLE 0x8E51
>+#define GL_SAMPLE_MASK_VALUE_ANGLE 0x8E52
>+#define GL_TEXTURE_2D_MULTISAMPLE_ANGLE 0x9100
>+#define GL_MAX_SAMPLE_MASK_WORDS_ANGLE 0x8E59
>+#define GL_MAX_COLOR_TEXTURE_SAMPLES_ANGLE 0x910E
>+#define GL_MAX_DEPTH_TEXTURE_SAMPLES_ANGLE 0x910F
>+#define GL_MAX_INTEGER_SAMPLES_ANGLE 0x9110
>+#define GL_TEXTURE_BINDING_2D_MULTISAMPLE_ANGLE 0x9104
>+#define GL_TEXTURE_SAMPLES_ANGLE 0x9106
>+#define GL_TEXTURE_FIXED_SAMPLE_LOCATIONS_ANGLE 0x9107
>+typedef void(GL_APIENTRYP PFNGLTEXSTORAGE2DMULTISAMPLEANGLEPROC)(GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height, GLboolean fixedsamplelocations);
>+typedef void(GL_APIENTRYP PFNGLGETTEXLEVELPARAMETERFVANGLEPROC)(GLenum target, GLint level, GLenum pname, GLfloat *params);
>+typedef void(GL_APIENTRYP PFNGLGETTEXLEVELPARAMETERIVANGLEPROC)(GLenum target, GLint level, GLenum pname, GLint *params);
>+typedef void (GL_APIENTRYP PFNGLGETMULTISAMPLEFVANGLEPROC)(GLenum pname, GLuint index, GLfloat *val);
>+typedef void (GL_APIENTRYP PFNGLSAMPLEMASKIANGLEPROC)(GLuint maskNumber, GLbitfield mask);
>+#ifdef GL_GLEXT_PROTOTYPES
>+GL_APICALL void GL_APIENTRY glTexStorage2DMultisampleANGLE(GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height, GLboolean fixedsamplelocations);
>+GL_APICALL void GL_APIENTRY glGetTexLevelParameterfvANGLE(GLenum target, GLint level, GLenum pname, GLfloat *params);
>+GL_APICALL void GL_APIENTRY glGetTexLevelParameterivANGLE(GLenum target, GLint level, GLenum pname, GLint *params);
>+GL_APICALL void GL_APIENTRY glGetMultisamplefvANGLE(GLenum pname, GLuint index, GLfloat *val);
>+GL_APICALL void GL_APIENTRY glSampleMaskiANGLE(GLuint maskNumber, GLbitfield mask);
>+#endif
>+#endif  // !GL_ANGLE_texture_multisample
>+
>+#ifndef GL_ANGLE_explicit_context
>+#define GL_ANGLE_explicit_context
>+typedef void *GLeglContext;
>+#include "gl2ext_explicit_context_autogen.inc"
>+#include "../GLES3/gl3ext_explicit_context_autogen.inc"
>+#include "../GLES3/gl31ext_explicit_context_autogen.inc"
>+#endif /* GL_ANGLE_explicit_context */
>+
>+#ifndef GL_ANGLE_multi_draw
>+#define GL_ANGLE_multi_draw 1
>+typedef void (GL_APIENTRYP PFNGLMULTIDRAWARRAYSANGLEPROC) (GLenum mode, const GLint *firsts, const GLsizei *counts, GLsizei drawcount);
>+typedef void (GL_APIENTRYP PFNGLMULTIDRAWARRAYSINSTANCEDANGLEPROC) (GLenum mode, const GLint *firsts, const GLsizei *counts, const GLsizei *instanceCounts, GLsizei drawcount);
>+typedef void (GL_APIENTRYP PFNGLMULTIDRAWELEMENTSANGLEPROC) (GLenum mode, const GLsizei *counts, GLenum type, const GLvoid* const *indices, GLsizei drawcount);
>+typedef void (GL_APIENTRYP PFNGLMULTIDRAWELEMENTSINSTANCEDANGLEPROC) (GLenum mode, const GLsizei *counts, GLenum type, const GLvoid* const *indices, const GLsizei *instanceCounts, GLsizei drawcount);
>+#ifdef GL_GLEXT_PROTOTYPES
>+GL_APICALL void GL_APIENTRY glMultiDrawArraysANGLE (GLenum mode, const GLint *firsts, const GLsizei *counts, GLsizei drawcount);
>+GL_APICALL void GL_APIENTRY glMultiDrawArraysInstancedANGLE (GLenum mode, const GLint *firsts, const GLsizei *counts, const GLsizei *instanceCounts, GLsizei drawcount);
>+GL_APICALL void GL_APIENTRY glMultiDrawElementsANGLE (GLenum mode, const GLsizei *counts, GLenum type, const GLvoid* const *indices, GLsizei drawcount);
>+GL_APICALL void GL_APIENTRY glMultiDrawElementsInstancedANGLE (GLenum mode, const GLsizei *counts, GLenum type, const GLvoid* const *indices, const GLsizei *instanceCounts, GLsizei drawcount);
>+#endif
>+#endif /* GL_ANGLE_multi_draw */
>+
>+#ifndef GL_CHROMIUM_bind_uniform_location
>+#define GL_CHROMIUM_bind_uniform_location 1
>+typedef void (GL_APIENTRYP PFNGLBINDUNIFORMLOCATIONCHROMIUMPROC)(GLuint program, GLint location, const GLchar *name);
>+#ifdef GL_GLEXT_PROTOTYPES
>+GL_APICALL void GL_APIENTRY glBindUniformLocationCHROMIUM(GLuint program, GLint location, const GLchar *name);
>+#endif
>+#endif /* GL_CHROMIUM_bind_uniform_location */
>+
>+/* GL_CHROMIUM_lose_context */
>+#ifndef GL_CHROMIUM_lose_context
>+#define GL_CHROMIUM_lose_context 1
>+#ifdef GL_GLEXT_PROTOTYPES
>+GL_APICALL void GL_APIENTRY glLoseContextCHROMIUM(GLenum current, GLenum other);
>+#endif
>+typedef void (GL_APIENTRYP PFNGLLOSECONTEXTCHROMIUMPROC) (GLenum current, GLenum other);
>+#endif  /* GL_CHROMIUM_lose_context */
>+
> // clang-format on
> 
> #endif  // INCLUDE_GLES2_GL2EXT_ANGLE_H_
>diff --git a/Source/ThirdParty/ANGLE/include/GLES2/gl2ext_explicit_context_autogen.inc b/Source/ThirdParty/ANGLE/include/GLES2/gl2ext_explicit_context_autogen.inc
>new file mode 100644
>index 00000000000..749224d58b0
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/include/GLES2/gl2ext_explicit_context_autogen.inc
>@@ -0,0 +1,712 @@
>+// GENERATED FILE - DO NOT EDIT.
>+// Generated by generate_entry_points.py using data from gl.xml and gl_angle_ext.xml.
>+//
>+// Copyright 2019 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// gl2ext_explicit_context_autogen.inc:
>+//   Function declarations for the EGL_ANGLE_explicit_context extension
>+
>+typedef void (GL_APIENTRYP PFNGLACTIVETEXTURECONTEXTANGLEPROC)(GLeglContext ctx, GLenum texture);
>+typedef void (GL_APIENTRYP PFNGLATTACHSHADERCONTEXTANGLEPROC)(GLeglContext ctx, GLuint program, GLuint shader);
>+typedef void (GL_APIENTRYP PFNGLBINDATTRIBLOCATIONCONTEXTANGLEPROC)(GLeglContext ctx, GLuint program, GLuint index, const GLchar *name);
>+typedef void (GL_APIENTRYP PFNGLBINDBUFFERCONTEXTANGLEPROC)(GLeglContext ctx, GLenum target, GLuint buffer);
>+typedef void (GL_APIENTRYP PFNGLBINDFRAMEBUFFERCONTEXTANGLEPROC)(GLeglContext ctx, GLenum target, GLuint framebuffer);
>+typedef void (GL_APIENTRYP PFNGLBINDRENDERBUFFERCONTEXTANGLEPROC)(GLeglContext ctx, GLenum target, GLuint renderbuffer);
>+typedef void (GL_APIENTRYP PFNGLBINDTEXTURECONTEXTANGLEPROC)(GLeglContext ctx, GLenum target, GLuint texture);
>+typedef void (GL_APIENTRYP PFNGLBLENDCOLORCONTEXTANGLEPROC)(GLeglContext ctx, GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha);
>+typedef void (GL_APIENTRYP PFNGLBLENDEQUATIONCONTEXTANGLEPROC)(GLeglContext ctx, GLenum mode);
>+typedef void (GL_APIENTRYP PFNGLBLENDEQUATIONSEPARATECONTEXTANGLEPROC)(GLeglContext ctx, GLenum modeRGB, GLenum modeAlpha);
>+typedef void (GL_APIENTRYP PFNGLBLENDFUNCCONTEXTANGLEPROC)(GLeglContext ctx, GLenum sfactor, GLenum dfactor);
>+typedef void (GL_APIENTRYP PFNGLBLENDFUNCSEPARATECONTEXTANGLEPROC)(GLeglContext ctx, GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
>+typedef void (GL_APIENTRYP PFNGLBUFFERDATACONTEXTANGLEPROC)(GLeglContext ctx, GLenum target, GLsizeiptr size, const void *data, GLenum usage);
>+typedef void (GL_APIENTRYP PFNGLBUFFERSUBDATACONTEXTANGLEPROC)(GLeglContext ctx, GLenum target, GLintptr offset, GLsizeiptr size, const void *data);
>+typedef GLenum (GL_APIENTRYP PFNGLCHECKFRAMEBUFFERSTATUSCONTEXTANGLEPROC)(GLeglContext ctx, GLenum target);
>+typedef void (GL_APIENTRYP PFNGLCLEARCONTEXTANGLEPROC)(GLeglContext ctx, GLbitfield mask);
>+typedef void (GL_APIENTRYP PFNGLCLEARCOLORCONTEXTANGLEPROC)(GLeglContext ctx, GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha);
>+typedef void (GL_APIENTRYP PFNGLCLEARDEPTHFCONTEXTANGLEPROC)(GLeglContext ctx, GLfloat d);
>+typedef void (GL_APIENTRYP PFNGLCLEARSTENCILCONTEXTANGLEPROC)(GLeglContext ctx, GLint s);
>+typedef void (GL_APIENTRYP PFNGLCOLORMASKCONTEXTANGLEPROC)(GLeglContext ctx, GLboolean red, GLboolean green, GLboolean blue, GLboolean alpha);
>+typedef void (GL_APIENTRYP PFNGLCOMPILESHADERCONTEXTANGLEPROC)(GLeglContext ctx, GLuint shader);
>+typedef void (GL_APIENTRYP PFNGLCOMPRESSEDTEXIMAGE2DCONTEXTANGLEPROC)(GLeglContext ctx, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const void *data);
>+typedef void (GL_APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE2DCONTEXTANGLEPROC)(GLeglContext ctx, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const void *data);
>+typedef void (GL_APIENTRYP PFNGLCOPYTEXIMAGE2DCONTEXTANGLEPROC)(GLeglContext ctx, GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border);
>+typedef void (GL_APIENTRYP PFNGLCOPYTEXSUBIMAGE2DCONTEXTANGLEPROC)(GLeglContext ctx, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height);
>+typedef GLuint (GL_APIENTRYP PFNGLCREATEPROGRAMCONTEXTANGLEPROC)(GLeglContext ctx);
>+typedef GLuint (GL_APIENTRYP PFNGLCREATESHADERCONTEXTANGLEPROC)(GLeglContext ctx, GLenum type);
>+typedef void (GL_APIENTRYP PFNGLCULLFACECONTEXTANGLEPROC)(GLeglContext ctx, GLenum mode);
>+typedef void (GL_APIENTRYP PFNGLDELETEBUFFERSCONTEXTANGLEPROC)(GLeglContext ctx, GLsizei n, const GLuint *buffers);
>+typedef void (GL_APIENTRYP PFNGLDELETEFRAMEBUFFERSCONTEXTANGLEPROC)(GLeglContext ctx, GLsizei n, const GLuint *framebuffers);
>+typedef void (GL_APIENTRYP PFNGLDELETEPROGRAMCONTEXTANGLEPROC)(GLeglContext ctx, GLuint program);
>+typedef void (GL_APIENTRYP PFNGLDELETERENDERBUFFERSCONTEXTANGLEPROC)(GLeglContext ctx, GLsizei n, const GLuint *renderbuffers);
>+typedef void (GL_APIENTRYP PFNGLDELETESHADERCONTEXTANGLEPROC)(GLeglContext ctx, GLuint shader);
>+typedef void (GL_APIENTRYP PFNGLDELETETEXTURESCONTEXTANGLEPROC)(GLeglContext ctx, GLsizei n, const GLuint *textures);
>+typedef void (GL_APIENTRYP PFNGLDEPTHFUNCCONTEXTANGLEPROC)(GLeglContext ctx, GLenum func);
>+typedef void (GL_APIENTRYP PFNGLDEPTHMASKCONTEXTANGLEPROC)(GLeglContext ctx, GLboolean flag);
>+typedef void (GL_APIENTRYP PFNGLDEPTHRANGEFCONTEXTANGLEPROC)(GLeglContext ctx, GLfloat n, GLfloat f);
>+typedef void (GL_APIENTRYP PFNGLDETACHSHADERCONTEXTANGLEPROC)(GLeglContext ctx, GLuint program, GLuint shader);
>+typedef void (GL_APIENTRYP PFNGLDISABLECONTEXTANGLEPROC)(GLeglContext ctx, GLenum cap);
>+typedef void (GL_APIENTRYP PFNGLDISABLEVERTEXATTRIBARRAYCONTEXTANGLEPROC)(GLeglContext ctx, GLuint index);
>+typedef void (GL_APIENTRYP PFNGLDRAWARRAYSCONTEXTANGLEPROC)(GLeglContext ctx, GLenum mode, GLint first, GLsizei count);
>+typedef void (GL_APIENTRYP PFNGLDRAWELEMENTSCONTEXTANGLEPROC)(GLeglContext ctx, GLenum mode, GLsizei count, GLenum type, const void *indices);
>+typedef void (GL_APIENTRYP PFNGLENABLECONTEXTANGLEPROC)(GLeglContext ctx, GLenum cap);
>+typedef void (GL_APIENTRYP PFNGLENABLEVERTEXATTRIBARRAYCONTEXTANGLEPROC)(GLeglContext ctx, GLuint index);
>+typedef void (GL_APIENTRYP PFNGLFINISHCONTEXTANGLEPROC)(GLeglContext ctx);
>+typedef void (GL_APIENTRYP PFNGLFLUSHCONTEXTANGLEPROC)(GLeglContext ctx);
>+typedef void (GL_APIENTRYP PFNGLFRAMEBUFFERRENDERBUFFERCONTEXTANGLEPROC)(GLeglContext ctx, GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer);
>+typedef void (GL_APIENTRYP PFNGLFRAMEBUFFERTEXTURE2DCONTEXTANGLEPROC)(GLeglContext ctx, GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level);
>+typedef void (GL_APIENTRYP PFNGLFRONTFACECONTEXTANGLEPROC)(GLeglContext ctx, GLenum mode);
>+typedef void (GL_APIENTRYP PFNGLGENBUFFERSCONTEXTANGLEPROC)(GLeglContext ctx, GLsizei n, GLuint *buffers);
>+typedef void (GL_APIENTRYP PFNGLGENFRAMEBUFFERSCONTEXTANGLEPROC)(GLeglContext ctx, GLsizei n, GLuint *framebuffers);
>+typedef void (GL_APIENTRYP PFNGLGENRENDERBUFFERSCONTEXTANGLEPROC)(GLeglContext ctx, GLsizei n, GLuint *renderbuffers);
>+typedef void (GL_APIENTRYP PFNGLGENTEXTURESCONTEXTANGLEPROC)(GLeglContext ctx, GLsizei n, GLuint *textures);
>+typedef void (GL_APIENTRYP PFNGLGENERATEMIPMAPCONTEXTANGLEPROC)(GLeglContext ctx, GLenum target);
>+typedef void (GL_APIENTRYP PFNGLGETACTIVEATTRIBCONTEXTANGLEPROC)(GLeglContext ctx, GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLint *size, GLenum *type, GLchar *name);
>+typedef void (GL_APIENTRYP PFNGLGETACTIVEUNIFORMCONTEXTANGLEPROC)(GLeglContext ctx, GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLint *size, GLenum *type, GLchar *name);
>+typedef void (GL_APIENTRYP PFNGLGETATTACHEDSHADERSCONTEXTANGLEPROC)(GLeglContext ctx, GLuint program, GLsizei maxCount, GLsizei *count, GLuint *shaders);
>+typedef GLint (GL_APIENTRYP PFNGLGETATTRIBLOCATIONCONTEXTANGLEPROC)(GLeglContext ctx, GLuint program, const GLchar *name);
>+typedef void (GL_APIENTRYP PFNGLGETBOOLEANVCONTEXTANGLEPROC)(GLeglContext ctx, GLenum pname, GLboolean *data);
>+typedef void (GL_APIENTRYP PFNGLGETBUFFERPARAMETERIVCONTEXTANGLEPROC)(GLeglContext ctx, GLenum target, GLenum pname, GLint *params);
>+typedef GLenum (GL_APIENTRYP PFNGLGETERRORCONTEXTANGLEPROC)(GLeglContext ctx);
>+typedef void (GL_APIENTRYP PFNGLGETFLOATVCONTEXTANGLEPROC)(GLeglContext ctx, GLenum pname, GLfloat *data);
>+typedef void (GL_APIENTRYP PFNGLGETFRAMEBUFFERATTACHMENTPARAMETERIVCONTEXTANGLEPROC)(GLeglContext ctx, GLenum target, GLenum attachment, GLenum pname, GLint *params);
>+typedef void (GL_APIENTRYP PFNGLGETINTEGERVCONTEXTANGLEPROC)(GLeglContext ctx, GLenum pname, GLint *data);
>+typedef void (GL_APIENTRYP PFNGLGETPROGRAMINFOLOGCONTEXTANGLEPROC)(GLeglContext ctx, GLuint program, GLsizei bufSize, GLsizei *length, GLchar *infoLog);
>+typedef void (GL_APIENTRYP PFNGLGETPROGRAMIVCONTEXTANGLEPROC)(GLeglContext ctx, GLuint program, GLenum pname, GLint *params);
>+typedef void (GL_APIENTRYP PFNGLGETRENDERBUFFERPARAMETERIVCONTEXTANGLEPROC)(GLeglContext ctx, GLenum target, GLenum pname, GLint *params);
>+typedef void (GL_APIENTRYP PFNGLGETSHADERINFOLOGCONTEXTANGLEPROC)(GLeglContext ctx, GLuint shader, GLsizei bufSize, GLsizei *length, GLchar *infoLog);
>+typedef void (GL_APIENTRYP PFNGLGETSHADERPRECISIONFORMATCONTEXTANGLEPROC)(GLeglContext ctx, GLenum shadertype, GLenum precisiontype, GLint *range, GLint *precision);
>+typedef void (GL_APIENTRYP PFNGLGETSHADERSOURCECONTEXTANGLEPROC)(GLeglContext ctx, GLuint shader, GLsizei bufSize, GLsizei *length, GLchar *source);
>+typedef void (GL_APIENTRYP PFNGLGETSHADERIVCONTEXTANGLEPROC)(GLeglContext ctx, GLuint shader, GLenum pname, GLint *params);
>+typedef const GLubyte *(GL_APIENTRYP PFNGLGETSTRINGCONTEXTANGLEPROC)(GLeglContext ctx, GLenum name);
>+typedef void (GL_APIENTRYP PFNGLGETTEXPARAMETERFVCONTEXTANGLEPROC)(GLeglContext ctx, GLenum target, GLenum pname, GLfloat *params);
>+typedef void (GL_APIENTRYP PFNGLGETTEXPARAMETERIVCONTEXTANGLEPROC)(GLeglContext ctx, GLenum target, GLenum pname, GLint *params);
>+typedef GLint (GL_APIENTRYP PFNGLGETUNIFORMLOCATIONCONTEXTANGLEPROC)(GLeglContext ctx, GLuint program, const GLchar *name);
>+typedef void (GL_APIENTRYP PFNGLGETUNIFORMFVCONTEXTANGLEPROC)(GLeglContext ctx, GLuint program, GLint location, GLfloat *params);
>+typedef void (GL_APIENTRYP PFNGLGETUNIFORMIVCONTEXTANGLEPROC)(GLeglContext ctx, GLuint program, GLint location, GLint *params);
>+typedef void (GL_APIENTRYP PFNGLGETVERTEXATTRIBPOINTERVCONTEXTANGLEPROC)(GLeglContext ctx, GLuint index, GLenum pname, void **pointer);
>+typedef void (GL_APIENTRYP PFNGLGETVERTEXATTRIBFVCONTEXTANGLEPROC)(GLeglContext ctx, GLuint index, GLenum pname, GLfloat *params);
>+typedef void (GL_APIENTRYP PFNGLGETVERTEXATTRIBIVCONTEXTANGLEPROC)(GLeglContext ctx, GLuint index, GLenum pname, GLint *params);
>+typedef void (GL_APIENTRYP PFNGLHINTCONTEXTANGLEPROC)(GLeglContext ctx, GLenum target, GLenum mode);
>+typedef GLboolean (GL_APIENTRYP PFNGLISBUFFERCONTEXTANGLEPROC)(GLeglContext ctx, GLuint buffer);
>+typedef GLboolean (GL_APIENTRYP PFNGLISENABLEDCONTEXTANGLEPROC)(GLeglContext ctx, GLenum cap);
>+typedef GLboolean (GL_APIENTRYP PFNGLISFRAMEBUFFERCONTEXTANGLEPROC)(GLeglContext ctx, GLuint framebuffer);
>+typedef GLboolean (GL_APIENTRYP PFNGLISPROGRAMCONTEXTANGLEPROC)(GLeglContext ctx, GLuint program);
>+typedef GLboolean (GL_APIENTRYP PFNGLISRENDERBUFFERCONTEXTANGLEPROC)(GLeglContext ctx, GLuint renderbuffer);
>+typedef GLboolean (GL_APIENTRYP PFNGLISSHADERCONTEXTANGLEPROC)(GLeglContext ctx, GLuint shader);
>+typedef GLboolean (GL_APIENTRYP PFNGLISTEXTURECONTEXTANGLEPROC)(GLeglContext ctx, GLuint texture);
>+typedef void (GL_APIENTRYP PFNGLLINEWIDTHCONTEXTANGLEPROC)(GLeglContext ctx, GLfloat width);
>+typedef void (GL_APIENTRYP PFNGLLINKPROGRAMCONTEXTANGLEPROC)(GLeglContext ctx, GLuint program);
>+typedef void (GL_APIENTRYP PFNGLPIXELSTOREICONTEXTANGLEPROC)(GLeglContext ctx, GLenum pname, GLint param);
>+typedef void (GL_APIENTRYP PFNGLPOLYGONOFFSETCONTEXTANGLEPROC)(GLeglContext ctx, GLfloat factor, GLfloat units);
>+typedef void (GL_APIENTRYP PFNGLREADPIXELSCONTEXTANGLEPROC)(GLeglContext ctx, GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, void *pixels);
>+typedef void (GL_APIENTRYP PFNGLRELEASESHADERCOMPILERCONTEXTANGLEPROC)(GLeglContext ctx);
>+typedef void (GL_APIENTRYP PFNGLRENDERBUFFERSTORAGECONTEXTANGLEPROC)(GLeglContext ctx, GLenum target, GLenum internalformat, GLsizei width, GLsizei height);
>+typedef void (GL_APIENTRYP PFNGLSAMPLECOVERAGECONTEXTANGLEPROC)(GLeglContext ctx, GLfloat value, GLboolean invert);
>+typedef void (GL_APIENTRYP PFNGLSCISSORCONTEXTANGLEPROC)(GLeglContext ctx, GLint x, GLint y, GLsizei width, GLsizei height);
>+typedef void (GL_APIENTRYP PFNGLSHADERBINARYCONTEXTANGLEPROC)(GLeglContext ctx, GLsizei count, const GLuint *shaders, GLenum binaryformat, const void *binary, GLsizei length);
>+typedef void (GL_APIENTRYP PFNGLSHADERSOURCECONTEXTANGLEPROC)(GLeglContext ctx, GLuint shader, GLsizei count, const GLchar *const*string, const GLint *length);
>+typedef void (GL_APIENTRYP PFNGLSTENCILFUNCCONTEXTANGLEPROC)(GLeglContext ctx, GLenum func, GLint ref, GLuint mask);
>+typedef void (GL_APIENTRYP PFNGLSTENCILFUNCSEPARATECONTEXTANGLEPROC)(GLeglContext ctx, GLenum face, GLenum func, GLint ref, GLuint mask);
>+typedef void (GL_APIENTRYP PFNGLSTENCILMASKCONTEXTANGLEPROC)(GLeglContext ctx, GLuint mask);
>+typedef void (GL_APIENTRYP PFNGLSTENCILMASKSEPARATECONTEXTANGLEPROC)(GLeglContext ctx, GLenum face, GLuint mask);
>+typedef void (GL_APIENTRYP PFNGLSTENCILOPCONTEXTANGLEPROC)(GLeglContext ctx, GLenum fail, GLenum zfail, GLenum zpass);
>+typedef void (GL_APIENTRYP PFNGLSTENCILOPSEPARATECONTEXTANGLEPROC)(GLeglContext ctx, GLenum face, GLenum sfail, GLenum dpfail, GLenum dppass);
>+typedef void (GL_APIENTRYP PFNGLTEXIMAGE2DCONTEXTANGLEPROC)(GLeglContext ctx, GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const void *pixels);
>+typedef void (GL_APIENTRYP PFNGLTEXPARAMETERFCONTEXTANGLEPROC)(GLeglContext ctx, GLenum target, GLenum pname, GLfloat param);
>+typedef void (GL_APIENTRYP PFNGLTEXPARAMETERFVCONTEXTANGLEPROC)(GLeglContext ctx, GLenum target, GLenum pname, const GLfloat *params);
>+typedef void (GL_APIENTRYP PFNGLTEXPARAMETERICONTEXTANGLEPROC)(GLeglContext ctx, GLenum target, GLenum pname, GLint param);
>+typedef void (GL_APIENTRYP PFNGLTEXPARAMETERIVCONTEXTANGLEPROC)(GLeglContext ctx, GLenum target, GLenum pname, const GLint *params);
>+typedef void (GL_APIENTRYP PFNGLTEXSUBIMAGE2DCONTEXTANGLEPROC)(GLeglContext ctx, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const void *pixels);
>+typedef void (GL_APIENTRYP PFNGLUNIFORM1FCONTEXTANGLEPROC)(GLeglContext ctx, GLint location, GLfloat v0);
>+typedef void (GL_APIENTRYP PFNGLUNIFORM1FVCONTEXTANGLEPROC)(GLeglContext ctx, GLint location, GLsizei count, const GLfloat *value);
>+typedef void (GL_APIENTRYP PFNGLUNIFORM1ICONTEXTANGLEPROC)(GLeglContext ctx, GLint location, GLint v0);
>+typedef void (GL_APIENTRYP PFNGLUNIFORM1IVCONTEXTANGLEPROC)(GLeglContext ctx, GLint location, GLsizei count, const GLint *value);
>+typedef void (GL_APIENTRYP PFNGLUNIFORM2FCONTEXTANGLEPROC)(GLeglContext ctx, GLint location, GLfloat v0, GLfloat v1);
>+typedef void (GL_APIENTRYP PFNGLUNIFORM2FVCONTEXTANGLEPROC)(GLeglContext ctx, GLint location, GLsizei count, const GLfloat *value);
>+typedef void (GL_APIENTRYP PFNGLUNIFORM2ICONTEXTANGLEPROC)(GLeglContext ctx, GLint location, GLint v0, GLint v1);
>+typedef void (GL_APIENTRYP PFNGLUNIFORM2IVCONTEXTANGLEPROC)(GLeglContext ctx, GLint location, GLsizei count, const GLint *value);
>+typedef void (GL_APIENTRYP PFNGLUNIFORM3FCONTEXTANGLEPROC)(GLeglContext ctx, GLint location, GLfloat v0, GLfloat v1, GLfloat v2);
>+typedef void (GL_APIENTRYP PFNGLUNIFORM3FVCONTEXTANGLEPROC)(GLeglContext ctx, GLint location, GLsizei count, const GLfloat *value);
>+typedef void (GL_APIENTRYP PFNGLUNIFORM3ICONTEXTANGLEPROC)(GLeglContext ctx, GLint location, GLint v0, GLint v1, GLint v2);
>+typedef void (GL_APIENTRYP PFNGLUNIFORM3IVCONTEXTANGLEPROC)(GLeglContext ctx, GLint location, GLsizei count, const GLint *value);
>+typedef void (GL_APIENTRYP PFNGLUNIFORM4FCONTEXTANGLEPROC)(GLeglContext ctx, GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3);
>+typedef void (GL_APIENTRYP PFNGLUNIFORM4FVCONTEXTANGLEPROC)(GLeglContext ctx, GLint location, GLsizei count, const GLfloat *value);
>+typedef void (GL_APIENTRYP PFNGLUNIFORM4ICONTEXTANGLEPROC)(GLeglContext ctx, GLint location, GLint v0, GLint v1, GLint v2, GLint v3);
>+typedef void (GL_APIENTRYP PFNGLUNIFORM4IVCONTEXTANGLEPROC)(GLeglContext ctx, GLint location, GLsizei count, const GLint *value);
>+typedef void (GL_APIENTRYP PFNGLUNIFORMMATRIX2FVCONTEXTANGLEPROC)(GLeglContext ctx, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
>+typedef void (GL_APIENTRYP PFNGLUNIFORMMATRIX3FVCONTEXTANGLEPROC)(GLeglContext ctx, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
>+typedef void (GL_APIENTRYP PFNGLUNIFORMMATRIX4FVCONTEXTANGLEPROC)(GLeglContext ctx, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
>+typedef void (GL_APIENTRYP PFNGLUSEPROGRAMCONTEXTANGLEPROC)(GLeglContext ctx, GLuint program);
>+typedef void (GL_APIENTRYP PFNGLVALIDATEPROGRAMCONTEXTANGLEPROC)(GLeglContext ctx, GLuint program);
>+typedef void (GL_APIENTRYP PFNGLVERTEXATTRIB1FCONTEXTANGLEPROC)(GLeglContext ctx, GLuint index, GLfloat x);
>+typedef void (GL_APIENTRYP PFNGLVERTEXATTRIB1FVCONTEXTANGLEPROC)(GLeglContext ctx, GLuint index, const GLfloat *v);
>+typedef void (GL_APIENTRYP PFNGLVERTEXATTRIB2FCONTEXTANGLEPROC)(GLeglContext ctx, GLuint index, GLfloat x, GLfloat y);
>+typedef void (GL_APIENTRYP PFNGLVERTEXATTRIB2FVCONTEXTANGLEPROC)(GLeglContext ctx, GLuint index, const GLfloat *v);
>+typedef void (GL_APIENTRYP PFNGLVERTEXATTRIB3FCONTEXTANGLEPROC)(GLeglContext ctx, GLuint index, GLfloat x, GLfloat y, GLfloat z);
>+typedef void (GL_APIENTRYP PFNGLVERTEXATTRIB3FVCONTEXTANGLEPROC)(GLeglContext ctx, GLuint index, const GLfloat *v);
>+typedef void (GL_APIENTRYP PFNGLVERTEXATTRIB4FCONTEXTANGLEPROC)(GLeglContext ctx, GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
>+typedef void (GL_APIENTRYP PFNGLVERTEXATTRIB4FVCONTEXTANGLEPROC)(GLeglContext ctx, GLuint index, const GLfloat *v);
>+typedef void (GL_APIENTRYP PFNGLVERTEXATTRIBPOINTERCONTEXTANGLEPROC)(GLeglContext ctx, GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const void *pointer);
>+typedef void (GL_APIENTRYP PFNGLVIEWPORTCONTEXTANGLEPROC)(GLeglContext ctx, GLint x, GLint y, GLsizei width, GLsizei height);
>+typedef void (GL_APIENTRYP PFNGLBEGINQUERYEXTCONTEXTANGLEPROC)(GLeglContext ctx, GLenum target, GLuint id);
>+typedef void (GL_APIENTRYP PFNGLBINDFRAGDATALOCATIONEXTCONTEXTANGLEPROC)(GLeglContext ctx, GLuint program, GLuint color, const GLchar *name);
>+typedef void (GL_APIENTRYP PFNGLBINDFRAGDATALOCATIONINDEXEDEXTCONTEXTANGLEPROC)(GLeglContext ctx, GLuint program, GLuint colorNumber, GLuint index, const GLchar *name);
>+typedef void (GL_APIENTRYP PFNGLBINDVERTEXARRAYOESCONTEXTANGLEPROC)(GLeglContext ctx, GLuint array);
>+typedef void (GL_APIENTRYP PFNGLBLITFRAMEBUFFERANGLECONTEXTANGLEPROC)(GLeglContext ctx, GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter);
>+typedef void (GL_APIENTRYP PFNGLBUFFERSTORAGEMEMEXTCONTEXTANGLEPROC)(GLeglContext ctx, GLenum target, GLsizeiptr size, GLuint memory, GLuint64 offset);
>+typedef void (GL_APIENTRYP PFNGLCREATEMEMORYOBJECTSEXTCONTEXTANGLEPROC)(GLeglContext ctx, GLsizei n, GLuint *memoryObjects);
>+typedef void (GL_APIENTRYP PFNGLDEBUGMESSAGECALLBACKKHRCONTEXTANGLEPROC)(GLeglContext ctx, GLDEBUGPROCKHR callback, const void *userParam);
>+typedef void (GL_APIENTRYP PFNGLDEBUGMESSAGECONTROLKHRCONTEXTANGLEPROC)(GLeglContext ctx, GLenum source, GLenum type, GLenum severity, GLsizei count, const GLuint *ids, GLboolean enabled);
>+typedef void (GL_APIENTRYP PFNGLDEBUGMESSAGEINSERTKHRCONTEXTANGLEPROC)(GLeglContext ctx, GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const GLchar *buf);
>+typedef void (GL_APIENTRYP PFNGLDELETEFENCESNVCONTEXTANGLEPROC)(GLeglContext ctx, GLsizei n, const GLuint *fences);
>+typedef void (GL_APIENTRYP PFNGLDELETEMEMORYOBJECTSEXTCONTEXTANGLEPROC)(GLeglContext ctx, GLsizei n, const GLuint *memoryObjects);
>+typedef void (GL_APIENTRYP PFNGLDELETEQUERIESEXTCONTEXTANGLEPROC)(GLeglContext ctx, GLsizei n, const GLuint *ids);
>+typedef void (GL_APIENTRYP PFNGLDELETESEMAPHORESEXTCONTEXTANGLEPROC)(GLeglContext ctx, GLsizei n, const GLuint *semaphores);
>+typedef void (GL_APIENTRYP PFNGLDELETEVERTEXARRAYSOESCONTEXTANGLEPROC)(GLeglContext ctx, GLsizei n, const GLuint *arrays);
>+typedef void (GL_APIENTRYP PFNGLDISCARDFRAMEBUFFEREXTCONTEXTANGLEPROC)(GLeglContext ctx, GLenum target, GLsizei numAttachments, const GLenum *attachments);
>+typedef void (GL_APIENTRYP PFNGLDRAWARRAYSINSTANCEDANGLECONTEXTANGLEPROC)(GLeglContext ctx, GLenum mode, GLint first, GLsizei count, GLsizei primcount);
>+typedef void (GL_APIENTRYP PFNGLDRAWARRAYSINSTANCEDEXTCONTEXTANGLEPROC)(GLeglContext ctx, GLenum mode, GLint start, GLsizei count, GLsizei primcount);
>+typedef void (GL_APIENTRYP PFNGLDRAWBUFFERSEXTCONTEXTANGLEPROC)(GLeglContext ctx, GLsizei n, const GLenum *bufs);
>+typedef void (GL_APIENTRYP PFNGLDRAWELEMENTSINSTANCEDANGLECONTEXTANGLEPROC)(GLeglContext ctx, GLenum mode, GLsizei count, GLenum type, const void *indices, GLsizei primcount);
>+typedef void (GL_APIENTRYP PFNGLDRAWELEMENTSINSTANCEDEXTCONTEXTANGLEPROC)(GLeglContext ctx, GLenum mode, GLsizei count, GLenum type, const void *indices, GLsizei primcount);
>+typedef void (GL_APIENTRYP PFNGLEGLIMAGETARGETRENDERBUFFERSTORAGEOESCONTEXTANGLEPROC)(GLeglContext ctx, GLenum target, GLeglImageOES image);
>+typedef void (GL_APIENTRYP PFNGLEGLIMAGETARGETTEXTURE2DOESCONTEXTANGLEPROC)(GLeglContext ctx, GLenum target, GLeglImageOES image);
>+typedef void (GL_APIENTRYP PFNGLENDQUERYEXTCONTEXTANGLEPROC)(GLeglContext ctx, GLenum target);
>+typedef void (GL_APIENTRYP PFNGLFINISHFENCENVCONTEXTANGLEPROC)(GLeglContext ctx, GLuint fence);
>+typedef void (GL_APIENTRYP PFNGLFLUSHMAPPEDBUFFERRANGEEXTCONTEXTANGLEPROC)(GLeglContext ctx, GLenum target, GLintptr offset, GLsizeiptr length);
>+typedef void (GL_APIENTRYP PFNGLFRAMEBUFFERTEXTUREEXTCONTEXTANGLEPROC)(GLeglContext ctx, GLenum target, GLenum attachment, GLuint texture, GLint level);
>+typedef void (GL_APIENTRYP PFNGLFRAMEBUFFERTEXTUREMULTIVIEWOVRCONTEXTANGLEPROC)(GLeglContext ctx, GLenum target, GLenum attachment, GLuint texture, GLint level, GLint baseViewIndex, GLsizei numViews);
>+typedef void (GL_APIENTRYP PFNGLGENFENCESNVCONTEXTANGLEPROC)(GLeglContext ctx, GLsizei n, GLuint *fences);
>+typedef void (GL_APIENTRYP PFNGLGENQUERIESEXTCONTEXTANGLEPROC)(GLeglContext ctx, GLsizei n, GLuint *ids);
>+typedef void (GL_APIENTRYP PFNGLGENSEMAPHORESEXTCONTEXTANGLEPROC)(GLeglContext ctx, GLsizei n, GLuint *semaphores);
>+typedef void (GL_APIENTRYP PFNGLGENVERTEXARRAYSOESCONTEXTANGLEPROC)(GLeglContext ctx, GLsizei n, GLuint *arrays);
>+typedef void (GL_APIENTRYP PFNGLGETBUFFERPOINTERVOESCONTEXTANGLEPROC)(GLeglContext ctx, GLenum target, GLenum pname, void **params);
>+typedef GLuint (GL_APIENTRYP PFNGLGETDEBUGMESSAGELOGKHRCONTEXTANGLEPROC)(GLeglContext ctx, GLuint count, GLsizei bufSize, GLenum *sources, GLenum *types, GLuint *ids, GLenum *severities, GLsizei *lengths, GLchar *messageLog);
>+typedef void (GL_APIENTRYP PFNGLGETFENCEIVNVCONTEXTANGLEPROC)(GLeglContext ctx, GLuint fence, GLenum pname, GLint *params);
>+typedef GLint (GL_APIENTRYP PFNGLGETFRAGDATAINDEXEXTCONTEXTANGLEPROC)(GLeglContext ctx, GLuint program, const GLchar *name);
>+typedef GLenum (GL_APIENTRYP PFNGLGETGRAPHICSRESETSTATUSEXTCONTEXTANGLEPROC)(GLeglContext ctx);
>+typedef void (GL_APIENTRYP PFNGLGETMEMORYOBJECTPARAMETERIVEXTCONTEXTANGLEPROC)(GLeglContext ctx, GLuint memoryObject, GLenum pname, GLint *params);
>+typedef void (GL_APIENTRYP PFNGLGETOBJECTLABELKHRCONTEXTANGLEPROC)(GLeglContext ctx, GLenum identifier, GLuint name, GLsizei bufSize, GLsizei *length, GLchar *label);
>+typedef void (GL_APIENTRYP PFNGLGETOBJECTPTRLABELKHRCONTEXTANGLEPROC)(GLeglContext ctx, const void *ptr, GLsizei bufSize, GLsizei *length, GLchar *label);
>+typedef void (GL_APIENTRYP PFNGLGETPOINTERVKHRCONTEXTANGLEPROC)(GLeglContext ctx, GLenum pname, void **params);
>+typedef void (GL_APIENTRYP PFNGLGETPROGRAMBINARYOESCONTEXTANGLEPROC)(GLeglContext ctx, GLuint program, GLsizei bufSize, GLsizei *length, GLenum *binaryFormat, void *binary);
>+typedef GLint (GL_APIENTRYP PFNGLGETPROGRAMRESOURCELOCATIONINDEXEXTCONTEXTANGLEPROC)(GLeglContext ctx, GLuint program, GLenum programInterface, const GLchar *name);
>+typedef void (GL_APIENTRYP PFNGLGETQUERYOBJECTI64VEXTCONTEXTANGLEPROC)(GLeglContext ctx, GLuint id, GLenum pname, GLint64 *params);
>+typedef void (GL_APIENTRYP PFNGLGETQUERYOBJECTIVEXTCONTEXTANGLEPROC)(GLeglContext ctx, GLuint id, GLenum pname, GLint *params);
>+typedef void (GL_APIENTRYP PFNGLGETQUERYOBJECTUI64VEXTCONTEXTANGLEPROC)(GLeglContext ctx, GLuint id, GLenum pname, GLuint64 *params);
>+typedef void (GL_APIENTRYP PFNGLGETQUERYOBJECTUIVEXTCONTEXTANGLEPROC)(GLeglContext ctx, GLuint id, GLenum pname, GLuint *params);
>+typedef void (GL_APIENTRYP PFNGLGETQUERYIVEXTCONTEXTANGLEPROC)(GLeglContext ctx, GLenum target, GLenum pname, GLint *params);
>+typedef void (GL_APIENTRYP PFNGLGETSAMPLERPARAMETERIIVOESCONTEXTANGLEPROC)(GLeglContext ctx, GLuint sampler, GLenum pname, GLint *params);
>+typedef void (GL_APIENTRYP PFNGLGETSAMPLERPARAMETERIUIVOESCONTEXTANGLEPROC)(GLeglContext ctx, GLuint sampler, GLenum pname, GLuint *params);
>+typedef void (GL_APIENTRYP PFNGLGETSEMAPHOREPARAMETERUI64VEXTCONTEXTANGLEPROC)(GLeglContext ctx, GLuint semaphore, GLenum pname, GLuint64 *params);
>+typedef void (GL_APIENTRYP PFNGLGETTEXPARAMETERIIVOESCONTEXTANGLEPROC)(GLeglContext ctx, GLenum target, GLenum pname, GLint *params);
>+typedef void (GL_APIENTRYP PFNGLGETTEXPARAMETERIUIVOESCONTEXTANGLEPROC)(GLeglContext ctx, GLenum target, GLenum pname, GLuint *params);
>+typedef void (GL_APIENTRYP PFNGLGETTRANSLATEDSHADERSOURCEANGLECONTEXTANGLEPROC)(GLeglContext ctx, GLuint shader, GLsizei bufsize, GLsizei *length, GLchar *source);
>+typedef void (GL_APIENTRYP PFNGLGETUNSIGNEDBYTEVEXTCONTEXTANGLEPROC)(GLeglContext ctx, GLenum pname, GLubyte *data);
>+typedef void (GL_APIENTRYP PFNGLGETUNSIGNEDBYTEI_VEXTCONTEXTANGLEPROC)(GLeglContext ctx, GLenum target, GLuint index, GLubyte *data);
>+typedef void (GL_APIENTRYP PFNGLGETNUNIFORMFVEXTCONTEXTANGLEPROC)(GLeglContext ctx, GLuint program, GLint location, GLsizei bufSize, GLfloat *params);
>+typedef void (GL_APIENTRYP PFNGLGETNUNIFORMIVEXTCONTEXTANGLEPROC)(GLeglContext ctx, GLuint program, GLint location, GLsizei bufSize, GLint *params);
>+typedef void (GL_APIENTRYP PFNGLIMPORTMEMORYFDEXTCONTEXTANGLEPROC)(GLeglContext ctx, GLuint memory, GLuint64 size, GLenum handleType, GLint fd);
>+typedef void (GL_APIENTRYP PFNGLIMPORTSEMAPHOREFDEXTCONTEXTANGLEPROC)(GLeglContext ctx, GLuint semaphore, GLenum handleType, GLint fd);
>+typedef void (GL_APIENTRYP PFNGLINSERTEVENTMARKEREXTCONTEXTANGLEPROC)(GLeglContext ctx, GLsizei length, const GLchar *marker);
>+typedef GLboolean (GL_APIENTRYP PFNGLISFENCENVCONTEXTANGLEPROC)(GLeglContext ctx, GLuint fence);
>+typedef GLboolean (GL_APIENTRYP PFNGLISMEMORYOBJECTEXTCONTEXTANGLEPROC)(GLeglContext ctx, GLuint memoryObject);
>+typedef GLboolean (GL_APIENTRYP PFNGLISQUERYEXTCONTEXTANGLEPROC)(GLeglContext ctx, GLuint id);
>+typedef GLboolean (GL_APIENTRYP PFNGLISSEMAPHOREEXTCONTEXTANGLEPROC)(GLeglContext ctx, GLuint semaphore);
>+typedef GLboolean (GL_APIENTRYP PFNGLISVERTEXARRAYOESCONTEXTANGLEPROC)(GLeglContext ctx, GLuint array);
>+typedef void *(GL_APIENTRYP PFNGLMAPBUFFEROESCONTEXTANGLEPROC)(GLeglContext ctx, GLenum target, GLenum access);
>+typedef void *(GL_APIENTRYP PFNGLMAPBUFFERRANGEEXTCONTEXTANGLEPROC)(GLeglContext ctx, GLenum target, GLintptr offset, GLsizeiptr length, GLbitfield access);
>+typedef void (GL_APIENTRYP PFNGLMAXSHADERCOMPILERTHREADSKHRCONTEXTANGLEPROC)(GLeglContext ctx, GLuint count);
>+typedef void (GL_APIENTRYP PFNGLMEMORYOBJECTPARAMETERIVEXTCONTEXTANGLEPROC)(GLeglContext ctx, GLuint memoryObject, GLenum pname, const GLint *params);
>+typedef void (GL_APIENTRYP PFNGLOBJECTLABELKHRCONTEXTANGLEPROC)(GLeglContext ctx, GLenum identifier, GLuint name, GLsizei length, const GLchar *label);
>+typedef void (GL_APIENTRYP PFNGLOBJECTPTRLABELKHRCONTEXTANGLEPROC)(GLeglContext ctx, const void *ptr, GLsizei length, const GLchar *label);
>+typedef void (GL_APIENTRYP PFNGLPOPDEBUGGROUPKHRCONTEXTANGLEPROC)(GLeglContext ctx);
>+typedef void (GL_APIENTRYP PFNGLPOPGROUPMARKEREXTCONTEXTANGLEPROC)(GLeglContext ctx);
>+typedef void (GL_APIENTRYP PFNGLPROGRAMBINARYOESCONTEXTANGLEPROC)(GLeglContext ctx, GLuint program, GLenum binaryFormat, const void *binary, GLint length);
>+typedef void (GL_APIENTRYP PFNGLPUSHDEBUGGROUPKHRCONTEXTANGLEPROC)(GLeglContext ctx, GLenum source, GLuint id, GLsizei length, const GLchar *message);
>+typedef void (GL_APIENTRYP PFNGLPUSHGROUPMARKEREXTCONTEXTANGLEPROC)(GLeglContext ctx, GLsizei length, const GLchar *marker);
>+typedef void (GL_APIENTRYP PFNGLQUERYCOUNTEREXTCONTEXTANGLEPROC)(GLeglContext ctx, GLuint id, GLenum target);
>+typedef void (GL_APIENTRYP PFNGLREADNPIXELSEXTCONTEXTANGLEPROC)(GLeglContext ctx, GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLsizei bufSize, void *data);
>+typedef void (GL_APIENTRYP PFNGLRENDERBUFFERSTORAGEMULTISAMPLEANGLECONTEXTANGLEPROC)(GLeglContext ctx, GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height);
>+typedef void (GL_APIENTRYP PFNGLSAMPLERPARAMETERIIVOESCONTEXTANGLEPROC)(GLeglContext ctx, GLuint sampler, GLenum pname, const GLint *param);
>+typedef void (GL_APIENTRYP PFNGLSAMPLERPARAMETERIUIVOESCONTEXTANGLEPROC)(GLeglContext ctx, GLuint sampler, GLenum pname, const GLuint *param);
>+typedef void (GL_APIENTRYP PFNGLSEMAPHOREPARAMETERUI64VEXTCONTEXTANGLEPROC)(GLeglContext ctx, GLuint semaphore, GLenum pname, const GLuint64 *params);
>+typedef void (GL_APIENTRYP PFNGLSETFENCENVCONTEXTANGLEPROC)(GLeglContext ctx, GLuint fence, GLenum condition);
>+typedef void (GL_APIENTRYP PFNGLSIGNALSEMAPHOREEXTCONTEXTANGLEPROC)(GLeglContext ctx, GLuint semaphore, GLuint numBufferBarriers, const GLuint *buffers, GLuint numTextureBarriers, const GLuint *textures, const GLenum *dstLayouts);
>+typedef GLboolean (GL_APIENTRYP PFNGLTESTFENCENVCONTEXTANGLEPROC)(GLeglContext ctx, GLuint fence);
>+typedef void (GL_APIENTRYP PFNGLTEXPARAMETERIIVOESCONTEXTANGLEPROC)(GLeglContext ctx, GLenum target, GLenum pname, const GLint *params);
>+typedef void (GL_APIENTRYP PFNGLTEXPARAMETERIUIVOESCONTEXTANGLEPROC)(GLeglContext ctx, GLenum target, GLenum pname, const GLuint *params);
>+typedef void (GL_APIENTRYP PFNGLTEXSTORAGE1DEXTCONTEXTANGLEPROC)(GLeglContext ctx, GLenum target, GLsizei levels, GLenum internalformat, GLsizei width);
>+typedef void (GL_APIENTRYP PFNGLTEXSTORAGE2DEXTCONTEXTANGLEPROC)(GLeglContext ctx, GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height);
>+typedef void (GL_APIENTRYP PFNGLTEXSTORAGE3DEXTCONTEXTANGLEPROC)(GLeglContext ctx, GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth);
>+typedef void (GL_APIENTRYP PFNGLTEXSTORAGE3DMULTISAMPLEOESCONTEXTANGLEPROC)(GLeglContext ctx, GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedsamplelocations);
>+typedef void (GL_APIENTRYP PFNGLTEXSTORAGEMEM2DEXTCONTEXTANGLEPROC)(GLeglContext ctx, GLenum target, GLsizei levels, GLenum internalFormat, GLsizei width, GLsizei height, GLuint memory, GLuint64 offset);
>+typedef void (GL_APIENTRYP PFNGLTEXSTORAGEMEM2DMULTISAMPLEEXTCONTEXTANGLEPROC)(GLeglContext ctx, GLenum target, GLsizei samples, GLenum internalFormat, GLsizei width, GLsizei height, GLboolean fixedSampleLocations, GLuint memory, GLuint64 offset);
>+typedef void (GL_APIENTRYP PFNGLTEXSTORAGEMEM3DEXTCONTEXTANGLEPROC)(GLeglContext ctx, GLenum target, GLsizei levels, GLenum internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLuint memory, GLuint64 offset);
>+typedef void (GL_APIENTRYP PFNGLTEXSTORAGEMEM3DMULTISAMPLEEXTCONTEXTANGLEPROC)(GLeglContext ctx, GLenum target, GLsizei samples, GLenum internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedSampleLocations, GLuint memory, GLuint64 offset);
>+typedef GLboolean (GL_APIENTRYP PFNGLUNMAPBUFFEROESCONTEXTANGLEPROC)(GLeglContext ctx, GLenum target);
>+typedef void (GL_APIENTRYP PFNGLVERTEXATTRIBDIVISORANGLECONTEXTANGLEPROC)(GLeglContext ctx, GLuint index, GLuint divisor);
>+typedef void (GL_APIENTRYP PFNGLVERTEXATTRIBDIVISOREXTCONTEXTANGLEPROC)(GLeglContext ctx, GLuint index, GLuint divisor);
>+typedef void (GL_APIENTRYP PFNGLWAITSEMAPHOREEXTCONTEXTANGLEPROC)(GLeglContext ctx, GLuint semaphore, GLuint numBufferBarriers, const GLuint *buffers, GLuint numTextureBarriers, const GLuint *textures, const GLenum *srcLayouts);
>+typedef void (GL_APIENTRYP PFNGLBINDUNIFORMLOCATIONCHROMIUMCONTEXTANGLEPROC)(GLeglContext ctx, GLuint program, GLint location, const GLchar* name);
>+typedef void (GL_APIENTRYP PFNGLCOVERAGEMODULATIONCHROMIUMCONTEXTANGLEPROC)(GLeglContext ctx, GLenum components);
>+typedef void (GL_APIENTRYP PFNGLMATRIXLOADFCHROMIUMCONTEXTANGLEPROC)(GLeglContext ctx, GLenum matrixMode, const GLfloat * matrix);
>+typedef void (GL_APIENTRYP PFNGLMATRIXLOADIDENTITYCHROMIUMCONTEXTANGLEPROC)(GLeglContext ctx, GLenum matrixMode);
>+typedef GLuint (GL_APIENTRYP PFNGLGENPATHSCHROMIUMCONTEXTANGLEPROC)(GLeglContext ctx, GLsizei range);
>+typedef void (GL_APIENTRYP PFNGLDELETEPATHSCHROMIUMCONTEXTANGLEPROC)(GLeglContext ctx, GLuint first, GLsizei range);
>+typedef GLboolean (GL_APIENTRYP PFNGLISPATHCHROMIUMCONTEXTANGLEPROC)(GLeglContext ctx, GLuint path);
>+typedef void (GL_APIENTRYP PFNGLPATHCOMMANDSCHROMIUMCONTEXTANGLEPROC)(GLeglContext ctx, GLuint path, GLsizei numCommands, const GLubyte * commands, GLsizei numCoords, GLenum coordType, const void* coords);
>+typedef void (GL_APIENTRYP PFNGLPATHPARAMETERFCHROMIUMCONTEXTANGLEPROC)(GLeglContext ctx, GLuint path, GLenum pname, GLfloat value);
>+typedef void (GL_APIENTRYP PFNGLPATHPARAMETERICHROMIUMCONTEXTANGLEPROC)(GLeglContext ctx, GLuint path, GLenum pname, GLint value);
>+typedef void (GL_APIENTRYP PFNGLGETPATHPARAMETERFVCHROMIUMCONTEXTANGLEPROC)(GLeglContext ctx, GLuint path, GLenum pname, GLfloat * value);
>+typedef void (GL_APIENTRYP PFNGLGETPATHPARAMETERIVCHROMIUMCONTEXTANGLEPROC)(GLeglContext ctx, GLuint path, GLenum pname, GLint * value);
>+typedef void (GL_APIENTRYP PFNGLPATHSTENCILFUNCCHROMIUMCONTEXTANGLEPROC)(GLeglContext ctx, GLenum func, GLint ref, GLuint mask);
>+typedef void (GL_APIENTRYP PFNGLSTENCILFILLPATHCHROMIUMCONTEXTANGLEPROC)(GLeglContext ctx, GLuint path, GLenum fillMode, GLuint mask);
>+typedef void (GL_APIENTRYP PFNGLSTENCILSTROKEPATHCHROMIUMCONTEXTANGLEPROC)(GLeglContext ctx, GLuint path, GLint reference, GLuint mask);
>+typedef void (GL_APIENTRYP PFNGLCOVERFILLPATHCHROMIUMCONTEXTANGLEPROC)(GLeglContext ctx, GLuint path, GLenum coverMode);
>+typedef void (GL_APIENTRYP PFNGLCOVERSTROKEPATHCHROMIUMCONTEXTANGLEPROC)(GLeglContext ctx, GLuint path, GLenum coverMode);
>+typedef void (GL_APIENTRYP PFNGLSTENCILTHENCOVERFILLPATHCHROMIUMCONTEXTANGLEPROC)(GLeglContext ctx, GLuint path, GLenum fillMode, GLuint mask, GLenum coverMode);
>+typedef void (GL_APIENTRYP PFNGLSTENCILTHENCOVERSTROKEPATHCHROMIUMCONTEXTANGLEPROC)(GLeglContext ctx, GLuint path, GLint reference, GLuint mask, GLenum coverMode);
>+typedef void (GL_APIENTRYP PFNGLCOVERFILLPATHINSTANCEDCHROMIUMCONTEXTANGLEPROC)(GLeglContext ctx, GLsizei numPath, GLenum pathNameType, const void * paths, GLuint pathBase, GLenum coverMode, GLenum transformType, const GLfloat * transformValues);
>+typedef void (GL_APIENTRYP PFNGLCOVERSTROKEPATHINSTANCEDCHROMIUMCONTEXTANGLEPROC)(GLeglContext ctx, GLsizei numPath, GLenum pathNameType, const void * paths, GLuint pathBase, GLenum coverMode, GLenum transformType, const GLfloat * transformValues);
>+typedef void (GL_APIENTRYP PFNGLSTENCILSTROKEPATHINSTANCEDCHROMIUMCONTEXTANGLEPROC)(GLeglContext ctx, GLsizei numPath, GLenum pathNameType, const void * paths, GLuint pathBase, GLint reference, GLuint mask, GLenum transformType, const GLfloat * transformValues);
>+typedef void (GL_APIENTRYP PFNGLSTENCILFILLPATHINSTANCEDCHROMIUMCONTEXTANGLEPROC)(GLeglContext ctx, GLsizei numPaths, GLenum pathNameType, const void * paths, GLuint pathBase, GLenum fillMode, GLuint mask, GLenum transformType, const GLfloat * transformValues);
>+typedef void (GL_APIENTRYP PFNGLSTENCILTHENCOVERFILLPATHINSTANCEDCHROMIUMCONTEXTANGLEPROC)(GLeglContext ctx, GLsizei numPaths, GLenum pathNameType, const void * paths, GLuint pathBase, GLenum fillMode, GLuint mask, GLenum coverMode, GLenum transformType, const GLfloat * transformValues);
>+typedef void (GL_APIENTRYP PFNGLSTENCILTHENCOVERSTROKEPATHINSTANCEDCHROMIUMCONTEXTANGLEPROC)(GLeglContext ctx, GLsizei numPaths, GLenum pathNameType, const void * paths, GLuint pathBase, GLint reference, GLuint mask, GLenum coverMode, GLenum transformType, const GLfloat * transformValues);
>+typedef void (GL_APIENTRYP PFNGLBINDFRAGMENTINPUTLOCATIONCHROMIUMCONTEXTANGLEPROC)(GLeglContext ctx, GLuint programs, GLint location, const GLchar * name);
>+typedef void (GL_APIENTRYP PFNGLPROGRAMPATHFRAGMENTINPUTGENCHROMIUMCONTEXTANGLEPROC)(GLeglContext ctx, GLuint program, GLint location, GLenum genMode, GLint components, const GLfloat * coeffs);
>+typedef void (GL_APIENTRYP PFNGLCOPYTEXTURECHROMIUMCONTEXTANGLEPROC)(GLeglContext ctx, GLuint sourceId, GLint sourceLevel, GLenum destTarget, GLuint destId, GLint destLevel, GLint internalFormat, GLenum destType, GLboolean unpackFlipY, GLboolean unpackPremultiplyAlpha, GLboolean unpackUnmultiplyAlpha);
>+typedef void (GL_APIENTRYP PFNGLCOPYSUBTEXTURECHROMIUMCONTEXTANGLEPROC)(GLeglContext ctx, GLuint sourceId, GLint sourceLevel, GLenum destTarget, GLuint destId, GLint destLevel, GLint xoffset, GLint yoffset, GLint x, GLint y, GLint width, GLint height, GLboolean unpackFlipY, GLboolean unpackPremultiplyAlpha, GLboolean unpackUnmultiplyAlpha);
>+typedef void (GL_APIENTRYP PFNGLCOMPRESSEDCOPYTEXTURECHROMIUMCONTEXTANGLEPROC)(GLeglContext ctx, GLuint sourceId, GLuint destId);
>+typedef void (GL_APIENTRYP PFNGLREQUESTEXTENSIONANGLECONTEXTANGLEPROC)(GLeglContext ctx, const GLchar * name);
>+typedef void (GL_APIENTRYP PFNGLGETBOOLEANVROBUSTANGLECONTEXTANGLEPROC)(GLeglContext ctx, GLenum pname, GLsizei bufSize, GLsizei * length, GLboolean * params);
>+typedef void (GL_APIENTRYP PFNGLGETBUFFERPARAMETERIVROBUSTANGLECONTEXTANGLEPROC)(GLeglContext ctx, GLenum target, GLenum pname, GLsizei bufSize, GLsizei * length, GLint * params);
>+typedef void (GL_APIENTRYP PFNGLGETFLOATVROBUSTANGLECONTEXTANGLEPROC)(GLeglContext ctx, GLenum pname, GLsizei bufSize, GLsizei * length, GLfloat * params);
>+typedef void (GL_APIENTRYP PFNGLGETFRAMEBUFFERATTACHMENTPARAMETERIVROBUSTANGLECONTEXTANGLEPROC)(GLeglContext ctx, GLenum target, GLenum attachment, GLenum pname, GLsizei bufSize, GLsizei * length, GLint * params);
>+typedef void (GL_APIENTRYP PFNGLGETINTEGERVROBUSTANGLECONTEXTANGLEPROC)(GLeglContext ctx, GLenum pname, GLsizei bufSize, GLsizei * length, GLint * data);
>+typedef void (GL_APIENTRYP PFNGLGETPROGRAMIVROBUSTANGLECONTEXTANGLEPROC)(GLeglContext ctx, GLuint program, GLenum pname, GLsizei bufSize, GLsizei * length, GLint * params);
>+typedef void (GL_APIENTRYP PFNGLGETRENDERBUFFERPARAMETERIVROBUSTANGLECONTEXTANGLEPROC)(GLeglContext ctx, GLenum target, GLenum pname, GLsizei bufSize, GLsizei * length, GLint * params);
>+typedef void (GL_APIENTRYP PFNGLGETSHADERIVROBUSTANGLECONTEXTANGLEPROC)(GLeglContext ctx, GLuint shader, GLenum pname, GLsizei bufSize, GLsizei * length, GLint * params);
>+typedef void (GL_APIENTRYP PFNGLGETTEXPARAMETERFVROBUSTANGLECONTEXTANGLEPROC)(GLeglContext ctx, GLenum target, GLenum pname, GLsizei bufSize, GLsizei * length, GLfloat * params);
>+typedef void (GL_APIENTRYP PFNGLGETTEXPARAMETERIVROBUSTANGLECONTEXTANGLEPROC)(GLeglContext ctx, GLenum target, GLenum pname, GLsizei bufSize, GLsizei * length, GLint * params);
>+typedef void (GL_APIENTRYP PFNGLGETUNIFORMFVROBUSTANGLECONTEXTANGLEPROC)(GLeglContext ctx, GLuint program, GLint location, GLsizei bufSize, GLsizei * length, GLfloat * params);
>+typedef void (GL_APIENTRYP PFNGLGETUNIFORMIVROBUSTANGLECONTEXTANGLEPROC)(GLeglContext ctx, GLuint program, GLint location, GLsizei bufSize, GLsizei * length, GLint * params);
>+typedef void (GL_APIENTRYP PFNGLGETVERTEXATTRIBFVROBUSTANGLECONTEXTANGLEPROC)(GLeglContext ctx, GLuint index, GLenum pname, GLsizei bufSize, GLsizei * length, GLfloat * params);
>+typedef void (GL_APIENTRYP PFNGLGETVERTEXATTRIBIVROBUSTANGLECONTEXTANGLEPROC)(GLeglContext ctx, GLuint index, GLenum pname, GLsizei bufSize, GLsizei * length, GLint * params);
>+typedef void (GL_APIENTRYP PFNGLGETVERTEXATTRIBPOINTERVROBUSTANGLECONTEXTANGLEPROC)(GLeglContext ctx, GLuint index, GLenum pname, GLsizei bufSize, GLsizei * length, void ** pointer);
>+typedef void (GL_APIENTRYP PFNGLREADPIXELSROBUSTANGLECONTEXTANGLEPROC)(GLeglContext ctx, GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLsizei bufSize, GLsizei * length, GLsizei * columns, GLsizei * rows, void * pixels);
>+typedef void (GL_APIENTRYP PFNGLTEXIMAGE2DROBUSTANGLECONTEXTANGLEPROC)(GLeglContext ctx, GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, GLsizei bufSize, const void * pixels);
>+typedef void (GL_APIENTRYP PFNGLTEXPARAMETERFVROBUSTANGLECONTEXTANGLEPROC)(GLeglContext ctx, GLenum target, GLenum pname, GLsizei bufSize, const GLfloat * params);
>+typedef void (GL_APIENTRYP PFNGLTEXPARAMETERIVROBUSTANGLECONTEXTANGLEPROC)(GLeglContext ctx, GLenum target, GLenum pname, GLsizei bufSize, const GLint * params);
>+typedef void (GL_APIENTRYP PFNGLTEXSUBIMAGE2DROBUSTANGLECONTEXTANGLEPROC)(GLeglContext ctx, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, GLsizei bufSize, const void * pixels);
>+typedef void (GL_APIENTRYP PFNGLTEXIMAGE3DROBUSTANGLECONTEXTANGLEPROC)(GLeglContext ctx, GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, GLsizei bufSize, const void * pixels);
>+typedef void (GL_APIENTRYP PFNGLTEXSUBIMAGE3DROBUSTANGLECONTEXTANGLEPROC)(GLeglContext ctx, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, GLsizei bufSize, const void * pixels);
>+typedef void (GL_APIENTRYP PFNGLCOMPRESSEDTEXIMAGE2DROBUSTANGLECONTEXTANGLEPROC)(GLeglContext ctx, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, GLsizei dataSize, const GLvoid * data);
>+typedef void (GL_APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE2DROBUSTANGLECONTEXTANGLEPROC)(GLeglContext ctx, GLenum target, GLint level, GLsizei xoffset, GLsizei yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, GLsizei dataSize, const GLvoid * data);
>+typedef void (GL_APIENTRYP PFNGLCOMPRESSEDTEXIMAGE3DROBUSTANGLECONTEXTANGLEPROC)(GLeglContext ctx, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, GLsizei dataSize, const GLvoid * data);
>+typedef void (GL_APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE3DROBUSTANGLECONTEXTANGLEPROC)(GLeglContext ctx, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, GLsizei dataSize, const GLvoid * data);
>+typedef void (GL_APIENTRYP PFNGLGETQUERYIVROBUSTANGLECONTEXTANGLEPROC)(GLeglContext ctx, GLenum target, GLenum pname, GLsizei bufSize, GLsizei * length, GLint * params);
>+typedef void (GL_APIENTRYP PFNGLGETQUERYOBJECTUIVROBUSTANGLECONTEXTANGLEPROC)(GLeglContext ctx, GLuint id, GLenum pname, GLsizei bufSize, GLsizei * length, GLuint * params);
>+typedef void (GL_APIENTRYP PFNGLGETBUFFERPOINTERVROBUSTANGLECONTEXTANGLEPROC)(GLeglContext ctx, GLenum target, GLenum pname, GLsizei bufSize, GLsizei * length, void ** params);
>+typedef void (GL_APIENTRYP PFNGLGETINTEGERI_VROBUSTANGLECONTEXTANGLEPROC)(GLeglContext ctx, GLenum target, GLuint index, GLsizei bufSize, GLsizei * length, GLint * data);
>+typedef void (GL_APIENTRYP PFNGLGETINTERNALFORMATIVROBUSTANGLECONTEXTANGLEPROC)(GLeglContext ctx, GLenum target, GLenum internalformat, GLenum pname, GLsizei bufSize, GLsizei * length, GLint * params);
>+typedef void (GL_APIENTRYP PFNGLGETVERTEXATTRIBIIVROBUSTANGLECONTEXTANGLEPROC)(GLeglContext ctx, GLuint index, GLenum pname, GLsizei bufSize, GLsizei * length, GLint * params);
>+typedef void (GL_APIENTRYP PFNGLGETVERTEXATTRIBIUIVROBUSTANGLECONTEXTANGLEPROC)(GLeglContext ctx, GLuint index, GLenum pname, GLsizei bufSize, GLsizei * length, GLuint * params);
>+typedef void (GL_APIENTRYP PFNGLGETUNIFORMUIVROBUSTANGLECONTEXTANGLEPROC)(GLeglContext ctx, GLuint program, GLint location, GLsizei bufSize, GLsizei * length, GLuint * params);
>+typedef void (GL_APIENTRYP PFNGLGETACTIVEUNIFORMBLOCKIVROBUSTANGLECONTEXTANGLEPROC)(GLeglContext ctx, GLuint program, GLuint uniformBlockIndex, GLenum pname, GLsizei bufSize, GLsizei * length, GLint * params);
>+typedef void (GL_APIENTRYP PFNGLGETINTEGER64VROBUSTANGLECONTEXTANGLEPROC)(GLeglContext ctx, GLenum pname, GLsizei bufSize, GLsizei * length, GLint64 * data);
>+typedef void (GL_APIENTRYP PFNGLGETINTEGER64I_VROBUSTANGLECONTEXTANGLEPROC)(GLeglContext ctx, GLenum target, GLuint index, GLsizei bufSize, GLsizei * length, GLint64 * data);
>+typedef void (GL_APIENTRYP PFNGLGETBUFFERPARAMETERI64VROBUSTANGLECONTEXTANGLEPROC)(GLeglContext ctx, GLenum target, GLenum pname, GLsizei bufSize, GLsizei * length, GLint64 * params);
>+typedef void (GL_APIENTRYP PFNGLSAMPLERPARAMETERIVROBUSTANGLECONTEXTANGLEPROC)(GLeglContext ctx, GLuint sampler, GLuint pname, GLsizei bufSize, const GLint * param);
>+typedef void (GL_APIENTRYP PFNGLSAMPLERPARAMETERFVROBUSTANGLECONTEXTANGLEPROC)(GLeglContext ctx, GLuint sampler, GLenum pname, GLsizei bufSize, const GLfloat * param);
>+typedef void (GL_APIENTRYP PFNGLGETSAMPLERPARAMETERIVROBUSTANGLECONTEXTANGLEPROC)(GLeglContext ctx, GLuint sampler, GLenum pname, GLsizei bufSize, GLsizei * length, GLint * params);
>+typedef void (GL_APIENTRYP PFNGLGETSAMPLERPARAMETERFVROBUSTANGLECONTEXTANGLEPROC)(GLeglContext ctx, GLuint sampler, GLenum pname, GLsizei bufSize, GLsizei * length, GLfloat * params);
>+typedef void (GL_APIENTRYP PFNGLGETFRAMEBUFFERPARAMETERIVROBUSTANGLECONTEXTANGLEPROC)(GLeglContext ctx, GLuint sampler, GLenum pname, GLsizei bufSize, GLsizei * length, GLint * params);
>+typedef void (GL_APIENTRYP PFNGLGETPROGRAMINTERFACEIVROBUSTANGLECONTEXTANGLEPROC)(GLeglContext ctx, GLuint program, GLenum programInterface, GLenum pname, GLsizei bufSize, GLsizei * length, GLint * params);
>+typedef void (GL_APIENTRYP PFNGLGETBOOLEANI_VROBUSTANGLECONTEXTANGLEPROC)(GLeglContext ctx, GLenum target, GLuint index, GLsizei bufSize, GLsizei * length, GLboolean * data);
>+typedef void (GL_APIENTRYP PFNGLGETMULTISAMPLEFVROBUSTANGLECONTEXTANGLEPROC)(GLeglContext ctx, GLenum pname, GLuint index, GLsizei bufSize, GLsizei * length, GLfloat * val);
>+typedef void (GL_APIENTRYP PFNGLGETTEXLEVELPARAMETERIVROBUSTANGLECONTEXTANGLEPROC)(GLeglContext ctx, GLenum target, GLint level, GLenum pname, GLsizei bufSize, GLsizei * length, GLint * params);
>+typedef void (GL_APIENTRYP PFNGLGETTEXLEVELPARAMETERFVROBUSTANGLECONTEXTANGLEPROC)(GLeglContext ctx, GLenum target, GLint level, GLenum pname, GLsizei bufSize, GLsizei * length, GLfloat * params);
>+typedef void (GL_APIENTRYP PFNGLGETPOINTERVROBUSTANGLEROBUSTANGLECONTEXTANGLEPROC)(GLeglContext ctx, GLenum pname, GLsizei bufSize, GLsizei * length, void ** params);
>+typedef void (GL_APIENTRYP PFNGLREADNPIXELSROBUSTANGLECONTEXTANGLEPROC)(GLeglContext ctx, GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLsizei bufSize, GLsizei * length, GLsizei * columns, GLsizei * rows, void * data);
>+typedef void (GL_APIENTRYP PFNGLGETNUNIFORMFVROBUSTANGLECONTEXTANGLEPROC)(GLeglContext ctx, GLuint program, GLint location, GLsizei bufSize, GLsizei * length, GLfloat * params);
>+typedef void (GL_APIENTRYP PFNGLGETNUNIFORMIVROBUSTANGLECONTEXTANGLEPROC)(GLeglContext ctx, GLuint program, GLint location, GLsizei bufSize, GLsizei * length, GLint * params);
>+typedef void (GL_APIENTRYP PFNGLGETNUNIFORMUIVROBUSTANGLECONTEXTANGLEPROC)(GLeglContext ctx, GLuint program, GLint location, GLsizei bufSize, GLsizei * length, GLuint * params);
>+typedef void (GL_APIENTRYP PFNGLTEXPARAMETERIIVROBUSTANGLECONTEXTANGLEPROC)(GLeglContext ctx, GLenum target, GLenum pname, GLsizei bufSize, const GLint * params);
>+typedef void (GL_APIENTRYP PFNGLTEXPARAMETERIUIVROBUSTANGLECONTEXTANGLEPROC)(GLeglContext ctx, GLenum target, GLenum pname, GLsizei bufSize, const GLuint * params);
>+typedef void (GL_APIENTRYP PFNGLGETTEXPARAMETERIIVROBUSTANGLECONTEXTANGLEPROC)(GLeglContext ctx, GLenum target, GLenum pname, GLsizei bufSize, GLsizei * length, GLint * params);
>+typedef void (GL_APIENTRYP PFNGLGETTEXPARAMETERIUIVROBUSTANGLECONTEXTANGLEPROC)(GLeglContext ctx, GLenum target, GLenum pname, GLsizei bufSize, GLsizei * length, GLuint * params);
>+typedef void (GL_APIENTRYP PFNGLSAMPLERPARAMETERIIVROBUSTANGLECONTEXTANGLEPROC)(GLeglContext ctx, GLuint sampler, GLenum pname, GLsizei bufSize, const GLint * param);
>+typedef void (GL_APIENTRYP PFNGLSAMPLERPARAMETERIUIVROBUSTANGLECONTEXTANGLEPROC)(GLeglContext ctx, GLuint sampler, GLenum pname, GLsizei bufSize, const GLuint * param);
>+typedef void (GL_APIENTRYP PFNGLGETSAMPLERPARAMETERIIVROBUSTANGLECONTEXTANGLEPROC)(GLeglContext ctx, GLuint sampler, GLenum pname, GLsizei bufSize, GLsizei * length, GLint * params);
>+typedef void (GL_APIENTRYP PFNGLGETSAMPLERPARAMETERIUIVROBUSTANGLECONTEXTANGLEPROC)(GLeglContext ctx, GLuint sampler, GLenum pname, GLsizei bufSize, GLsizei * length, GLuint * params);
>+typedef void (GL_APIENTRYP PFNGLGETQUERYOBJECTIVROBUSTANGLECONTEXTANGLEPROC)(GLeglContext ctx, GLuint id, GLenum pname, GLsizei bufSize, GLsizei * length, GLint * params);
>+typedef void (GL_APIENTRYP PFNGLGETQUERYOBJECTI64VROBUSTANGLECONTEXTANGLEPROC)(GLeglContext ctx, GLuint id, GLenum pname, GLsizei bufSize, GLsizei * length, GLint64 * params);
>+typedef void (GL_APIENTRYP PFNGLGETQUERYOBJECTUI64VROBUSTANGLECONTEXTANGLEPROC)(GLeglContext ctx, GLuint id, GLenum pname, GLsizei bufSize, GLsizei * length, GLuint64 * params);
>+typedef void (GL_APIENTRYP PFNGLCOPYTEXTURE3DANGLECONTEXTANGLEPROC)(GLeglContext ctx, GLuint sourceId, GLint sourceLevel, GLenum destTarget, GLuint destId, GLint destLevel, GLint internalFormat, GLenum destType, GLboolean unpackFlipY, GLboolean unpackPremultiplyAlpha, GLboolean unpackUnmultiplyAlpha);
>+typedef void (GL_APIENTRYP PFNGLCOPYSUBTEXTURE3DANGLECONTEXTANGLEPROC)(GLeglContext ctx, GLuint sourceId, GLint sourceLevel, GLenum destTarget, GLuint destId, GLint destLevel, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLint z, GLint width, GLint height, GLint depth, GLboolean unpackFlipY, GLboolean unpackPremultiplyAlpha, GLboolean unpackUnmultiplyAlpha);
>+typedef void (GL_APIENTRYP PFNGLTEXSTORAGE2DMULTISAMPLEANGLECONTEXTANGLEPROC)(GLeglContext ctx, GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height, GLboolean fixedsamplelocations);
>+typedef void (GL_APIENTRYP PFNGLGETTEXLEVELPARAMETERIVANGLECONTEXTANGLEPROC)(GLeglContext ctx, GLenum target, GLint level, GLenum pname, GLint * params);
>+typedef void (GL_APIENTRYP PFNGLGETTEXLEVELPARAMETERFVANGLECONTEXTANGLEPROC)(GLeglContext ctx, GLenum target, GLint level, GLenum pname, GLfloat * params);
>+typedef void (GL_APIENTRYP PFNGLMULTIDRAWARRAYSANGLECONTEXTANGLEPROC)(GLeglContext ctx, GLenum mode, const GLint *firsts, const GLsizei *counts, GLsizei drawcount);
>+typedef void (GL_APIENTRYP PFNGLMULTIDRAWARRAYSINSTANCEDANGLECONTEXTANGLEPROC)(GLeglContext ctx, GLenum mode, const GLint *firsts, const GLsizei *counts, const GLsizei *instanceCounts, GLsizei drawcount);
>+typedef void (GL_APIENTRYP PFNGLMULTIDRAWELEMENTSANGLECONTEXTANGLEPROC)(GLeglContext ctx, GLenum mode, const GLsizei *counts, GLenum type, const GLvoid *const*indices, GLsizei drawcount);
>+typedef void (GL_APIENTRYP PFNGLMULTIDRAWELEMENTSINSTANCEDANGLECONTEXTANGLEPROC)(GLeglContext ctx, GLenum mode, const GLsizei *counts, GLenum type, const GLvoid *const*indices, const GLsizei*instanceCounts, GLsizei drawcount);
>+typedef void (GL_APIENTRYP PFNGLGETMULTISAMPLEFVANGLECONTEXTANGLEPROC)(GLeglContext ctx, GLenum pname, GLuint index, GLfloat * val);
>+typedef void (GL_APIENTRYP PFNGLSAMPLEMASKIANGLECONTEXTANGLEPROC)(GLeglContext ctx, GLuint maskNumber, GLbitfield mask);
>+typedef void (GL_APIENTRYP PFNGLPROVOKINGVERTEXANGLECONTEXTANGLEPROC)(GLeglContext ctx, GLenum mode);
>+typedef void (GL_APIENTRYP PFNGLLOSECONTEXTCHROMIUMCONTEXTANGLEPROC)(GLeglContext ctx, GLenum current, GLenum other);
>+#ifdef GL_GLEXT_PROTOTYPES
>+GL_APICALL void GL_APIENTRY glActiveTextureContextANGLE(GLeglContext ctx, GLenum texture);
>+GL_APICALL void GL_APIENTRY glAttachShaderContextANGLE(GLeglContext ctx, GLuint program, GLuint shader);
>+GL_APICALL void GL_APIENTRY glBindAttribLocationContextANGLE(GLeglContext ctx, GLuint program, GLuint index, const GLchar *name);
>+GL_APICALL void GL_APIENTRY glBindBufferContextANGLE(GLeglContext ctx, GLenum target, GLuint buffer);
>+GL_APICALL void GL_APIENTRY glBindFramebufferContextANGLE(GLeglContext ctx, GLenum target, GLuint framebuffer);
>+GL_APICALL void GL_APIENTRY glBindRenderbufferContextANGLE(GLeglContext ctx, GLenum target, GLuint renderbuffer);
>+GL_APICALL void GL_APIENTRY glBindTextureContextANGLE(GLeglContext ctx, GLenum target, GLuint texture);
>+GL_APICALL void GL_APIENTRY glBlendColorContextANGLE(GLeglContext ctx, GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha);
>+GL_APICALL void GL_APIENTRY glBlendEquationContextANGLE(GLeglContext ctx, GLenum mode);
>+GL_APICALL void GL_APIENTRY glBlendEquationSeparateContextANGLE(GLeglContext ctx, GLenum modeRGB, GLenum modeAlpha);
>+GL_APICALL void GL_APIENTRY glBlendFuncContextANGLE(GLeglContext ctx, GLenum sfactor, GLenum dfactor);
>+GL_APICALL void GL_APIENTRY glBlendFuncSeparateContextANGLE(GLeglContext ctx, GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
>+GL_APICALL void GL_APIENTRY glBufferDataContextANGLE(GLeglContext ctx, GLenum target, GLsizeiptr size, const void *data, GLenum usage);
>+GL_APICALL void GL_APIENTRY glBufferSubDataContextANGLE(GLeglContext ctx, GLenum target, GLintptr offset, GLsizeiptr size, const void *data);
>+GL_APICALL GLenum GL_APIENTRY glCheckFramebufferStatusContextANGLE(GLeglContext ctx, GLenum target);
>+GL_APICALL void GL_APIENTRY glClearContextANGLE(GLeglContext ctx, GLbitfield mask);
>+GL_APICALL void GL_APIENTRY glClearColorContextANGLE(GLeglContext ctx, GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha);
>+GL_APICALL void GL_APIENTRY glClearDepthfContextANGLE(GLeglContext ctx, GLfloat d);
>+GL_APICALL void GL_APIENTRY glClearStencilContextANGLE(GLeglContext ctx, GLint s);
>+GL_APICALL void GL_APIENTRY glColorMaskContextANGLE(GLeglContext ctx, GLboolean red, GLboolean green, GLboolean blue, GLboolean alpha);
>+GL_APICALL void GL_APIENTRY glCompileShaderContextANGLE(GLeglContext ctx, GLuint shader);
>+GL_APICALL void GL_APIENTRY glCompressedTexImage2DContextANGLE(GLeglContext ctx, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const void *data);
>+GL_APICALL void GL_APIENTRY glCompressedTexSubImage2DContextANGLE(GLeglContext ctx, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const void *data);
>+GL_APICALL void GL_APIENTRY glCopyTexImage2DContextANGLE(GLeglContext ctx, GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border);
>+GL_APICALL void GL_APIENTRY glCopyTexSubImage2DContextANGLE(GLeglContext ctx, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height);
>+GL_APICALL GLuint GL_APIENTRY glCreateProgramContextANGLE(GLeglContext ctx);
>+GL_APICALL GLuint GL_APIENTRY glCreateShaderContextANGLE(GLeglContext ctx, GLenum type);
>+GL_APICALL void GL_APIENTRY glCullFaceContextANGLE(GLeglContext ctx, GLenum mode);
>+GL_APICALL void GL_APIENTRY glDeleteBuffersContextANGLE(GLeglContext ctx, GLsizei n, const GLuint *buffers);
>+GL_APICALL void GL_APIENTRY glDeleteFramebuffersContextANGLE(GLeglContext ctx, GLsizei n, const GLuint *framebuffers);
>+GL_APICALL void GL_APIENTRY glDeleteProgramContextANGLE(GLeglContext ctx, GLuint program);
>+GL_APICALL void GL_APIENTRY glDeleteRenderbuffersContextANGLE(GLeglContext ctx, GLsizei n, const GLuint *renderbuffers);
>+GL_APICALL void GL_APIENTRY glDeleteShaderContextANGLE(GLeglContext ctx, GLuint shader);
>+GL_APICALL void GL_APIENTRY glDeleteTexturesContextANGLE(GLeglContext ctx, GLsizei n, const GLuint *textures);
>+GL_APICALL void GL_APIENTRY glDepthFuncContextANGLE(GLeglContext ctx, GLenum func);
>+GL_APICALL void GL_APIENTRY glDepthMaskContextANGLE(GLeglContext ctx, GLboolean flag);
>+GL_APICALL void GL_APIENTRY glDepthRangefContextANGLE(GLeglContext ctx, GLfloat n, GLfloat f);
>+GL_APICALL void GL_APIENTRY glDetachShaderContextANGLE(GLeglContext ctx, GLuint program, GLuint shader);
>+GL_APICALL void GL_APIENTRY glDisableContextANGLE(GLeglContext ctx, GLenum cap);
>+GL_APICALL void GL_APIENTRY glDisableVertexAttribArrayContextANGLE(GLeglContext ctx, GLuint index);
>+GL_APICALL void GL_APIENTRY glDrawArraysContextANGLE(GLeglContext ctx, GLenum mode, GLint first, GLsizei count);
>+GL_APICALL void GL_APIENTRY glDrawElementsContextANGLE(GLeglContext ctx, GLenum mode, GLsizei count, GLenum type, const void *indices);
>+GL_APICALL void GL_APIENTRY glEnableContextANGLE(GLeglContext ctx, GLenum cap);
>+GL_APICALL void GL_APIENTRY glEnableVertexAttribArrayContextANGLE(GLeglContext ctx, GLuint index);
>+GL_APICALL void GL_APIENTRY glFinishContextANGLE(GLeglContext ctx);
>+GL_APICALL void GL_APIENTRY glFlushContextANGLE(GLeglContext ctx);
>+GL_APICALL void GL_APIENTRY glFramebufferRenderbufferContextANGLE(GLeglContext ctx, GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer);
>+GL_APICALL void GL_APIENTRY glFramebufferTexture2DContextANGLE(GLeglContext ctx, GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level);
>+GL_APICALL void GL_APIENTRY glFrontFaceContextANGLE(GLeglContext ctx, GLenum mode);
>+GL_APICALL void GL_APIENTRY glGenBuffersContextANGLE(GLeglContext ctx, GLsizei n, GLuint *buffers);
>+GL_APICALL void GL_APIENTRY glGenFramebuffersContextANGLE(GLeglContext ctx, GLsizei n, GLuint *framebuffers);
>+GL_APICALL void GL_APIENTRY glGenRenderbuffersContextANGLE(GLeglContext ctx, GLsizei n, GLuint *renderbuffers);
>+GL_APICALL void GL_APIENTRY glGenTexturesContextANGLE(GLeglContext ctx, GLsizei n, GLuint *textures);
>+GL_APICALL void GL_APIENTRY glGenerateMipmapContextANGLE(GLeglContext ctx, GLenum target);
>+GL_APICALL void GL_APIENTRY glGetActiveAttribContextANGLE(GLeglContext ctx, GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLint *size, GLenum *type, GLchar *name);
>+GL_APICALL void GL_APIENTRY glGetActiveUniformContextANGLE(GLeglContext ctx, GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLint *size, GLenum *type, GLchar *name);
>+GL_APICALL void GL_APIENTRY glGetAttachedShadersContextANGLE(GLeglContext ctx, GLuint program, GLsizei maxCount, GLsizei *count, GLuint *shaders);
>+GL_APICALL GLint GL_APIENTRY glGetAttribLocationContextANGLE(GLeglContext ctx, GLuint program, const GLchar *name);
>+GL_APICALL void GL_APIENTRY glGetBooleanvContextANGLE(GLeglContext ctx, GLenum pname, GLboolean *data);
>+GL_APICALL void GL_APIENTRY glGetBufferParameterivContextANGLE(GLeglContext ctx, GLenum target, GLenum pname, GLint *params);
>+GL_APICALL GLenum GL_APIENTRY glGetErrorContextANGLE(GLeglContext ctx);
>+GL_APICALL void GL_APIENTRY glGetFloatvContextANGLE(GLeglContext ctx, GLenum pname, GLfloat *data);
>+GL_APICALL void GL_APIENTRY glGetFramebufferAttachmentParameterivContextANGLE(GLeglContext ctx, GLenum target, GLenum attachment, GLenum pname, GLint *params);
>+GL_APICALL void GL_APIENTRY glGetIntegervContextANGLE(GLeglContext ctx, GLenum pname, GLint *data);
>+GL_APICALL void GL_APIENTRY glGetProgramInfoLogContextANGLE(GLeglContext ctx, GLuint program, GLsizei bufSize, GLsizei *length, GLchar *infoLog);
>+GL_APICALL void GL_APIENTRY glGetProgramivContextANGLE(GLeglContext ctx, GLuint program, GLenum pname, GLint *params);
>+GL_APICALL void GL_APIENTRY glGetRenderbufferParameterivContextANGLE(GLeglContext ctx, GLenum target, GLenum pname, GLint *params);
>+GL_APICALL void GL_APIENTRY glGetShaderInfoLogContextANGLE(GLeglContext ctx, GLuint shader, GLsizei bufSize, GLsizei *length, GLchar *infoLog);
>+GL_APICALL void GL_APIENTRY glGetShaderPrecisionFormatContextANGLE(GLeglContext ctx, GLenum shadertype, GLenum precisiontype, GLint *range, GLint *precision);
>+GL_APICALL void GL_APIENTRY glGetShaderSourceContextANGLE(GLeglContext ctx, GLuint shader, GLsizei bufSize, GLsizei *length, GLchar *source);
>+GL_APICALL void GL_APIENTRY glGetShaderivContextANGLE(GLeglContext ctx, GLuint shader, GLenum pname, GLint *params);
>+GL_APICALL const GLubyte *GL_APIENTRY glGetStringContextANGLE(GLeglContext ctx, GLenum name);
>+GL_APICALL void GL_APIENTRY glGetTexParameterfvContextANGLE(GLeglContext ctx, GLenum target, GLenum pname, GLfloat *params);
>+GL_APICALL void GL_APIENTRY glGetTexParameterivContextANGLE(GLeglContext ctx, GLenum target, GLenum pname, GLint *params);
>+GL_APICALL GLint GL_APIENTRY glGetUniformLocationContextANGLE(GLeglContext ctx, GLuint program, const GLchar *name);
>+GL_APICALL void GL_APIENTRY glGetUniformfvContextANGLE(GLeglContext ctx, GLuint program, GLint location, GLfloat *params);
>+GL_APICALL void GL_APIENTRY glGetUniformivContextANGLE(GLeglContext ctx, GLuint program, GLint location, GLint *params);
>+GL_APICALL void GL_APIENTRY glGetVertexAttribPointervContextANGLE(GLeglContext ctx, GLuint index, GLenum pname, void **pointer);
>+GL_APICALL void GL_APIENTRY glGetVertexAttribfvContextANGLE(GLeglContext ctx, GLuint index, GLenum pname, GLfloat *params);
>+GL_APICALL void GL_APIENTRY glGetVertexAttribivContextANGLE(GLeglContext ctx, GLuint index, GLenum pname, GLint *params);
>+GL_APICALL void GL_APIENTRY glHintContextANGLE(GLeglContext ctx, GLenum target, GLenum mode);
>+GL_APICALL GLboolean GL_APIENTRY glIsBufferContextANGLE(GLeglContext ctx, GLuint buffer);
>+GL_APICALL GLboolean GL_APIENTRY glIsEnabledContextANGLE(GLeglContext ctx, GLenum cap);
>+GL_APICALL GLboolean GL_APIENTRY glIsFramebufferContextANGLE(GLeglContext ctx, GLuint framebuffer);
>+GL_APICALL GLboolean GL_APIENTRY glIsProgramContextANGLE(GLeglContext ctx, GLuint program);
>+GL_APICALL GLboolean GL_APIENTRY glIsRenderbufferContextANGLE(GLeglContext ctx, GLuint renderbuffer);
>+GL_APICALL GLboolean GL_APIENTRY glIsShaderContextANGLE(GLeglContext ctx, GLuint shader);
>+GL_APICALL GLboolean GL_APIENTRY glIsTextureContextANGLE(GLeglContext ctx, GLuint texture);
>+GL_APICALL void GL_APIENTRY glLineWidthContextANGLE(GLeglContext ctx, GLfloat width);
>+GL_APICALL void GL_APIENTRY glLinkProgramContextANGLE(GLeglContext ctx, GLuint program);
>+GL_APICALL void GL_APIENTRY glPixelStoreiContextANGLE(GLeglContext ctx, GLenum pname, GLint param);
>+GL_APICALL void GL_APIENTRY glPolygonOffsetContextANGLE(GLeglContext ctx, GLfloat factor, GLfloat units);
>+GL_APICALL void GL_APIENTRY glReadPixelsContextANGLE(GLeglContext ctx, GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, void *pixels);
>+GL_APICALL void GL_APIENTRY glReleaseShaderCompilerContextANGLE(GLeglContext ctx);
>+GL_APICALL void GL_APIENTRY glRenderbufferStorageContextANGLE(GLeglContext ctx, GLenum target, GLenum internalformat, GLsizei width, GLsizei height);
>+GL_APICALL void GL_APIENTRY glSampleCoverageContextANGLE(GLeglContext ctx, GLfloat value, GLboolean invert);
>+GL_APICALL void GL_APIENTRY glScissorContextANGLE(GLeglContext ctx, GLint x, GLint y, GLsizei width, GLsizei height);
>+GL_APICALL void GL_APIENTRY glShaderBinaryContextANGLE(GLeglContext ctx, GLsizei count, const GLuint *shaders, GLenum binaryformat, const void *binary, GLsizei length);
>+GL_APICALL void GL_APIENTRY glShaderSourceContextANGLE(GLeglContext ctx, GLuint shader, GLsizei count, const GLchar *const*string, const GLint *length);
>+GL_APICALL void GL_APIENTRY glStencilFuncContextANGLE(GLeglContext ctx, GLenum func, GLint ref, GLuint mask);
>+GL_APICALL void GL_APIENTRY glStencilFuncSeparateContextANGLE(GLeglContext ctx, GLenum face, GLenum func, GLint ref, GLuint mask);
>+GL_APICALL void GL_APIENTRY glStencilMaskContextANGLE(GLeglContext ctx, GLuint mask);
>+GL_APICALL void GL_APIENTRY glStencilMaskSeparateContextANGLE(GLeglContext ctx, GLenum face, GLuint mask);
>+GL_APICALL void GL_APIENTRY glStencilOpContextANGLE(GLeglContext ctx, GLenum fail, GLenum zfail, GLenum zpass);
>+GL_APICALL void GL_APIENTRY glStencilOpSeparateContextANGLE(GLeglContext ctx, GLenum face, GLenum sfail, GLenum dpfail, GLenum dppass);
>+GL_APICALL void GL_APIENTRY glTexImage2DContextANGLE(GLeglContext ctx, GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const void *pixels);
>+GL_APICALL void GL_APIENTRY glTexParameterfContextANGLE(GLeglContext ctx, GLenum target, GLenum pname, GLfloat param);
>+GL_APICALL void GL_APIENTRY glTexParameterfvContextANGLE(GLeglContext ctx, GLenum target, GLenum pname, const GLfloat *params);
>+GL_APICALL void GL_APIENTRY glTexParameteriContextANGLE(GLeglContext ctx, GLenum target, GLenum pname, GLint param);
>+GL_APICALL void GL_APIENTRY glTexParameterivContextANGLE(GLeglContext ctx, GLenum target, GLenum pname, const GLint *params);
>+GL_APICALL void GL_APIENTRY glTexSubImage2DContextANGLE(GLeglContext ctx, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const void *pixels);
>+GL_APICALL void GL_APIENTRY glUniform1fContextANGLE(GLeglContext ctx, GLint location, GLfloat v0);
>+GL_APICALL void GL_APIENTRY glUniform1fvContextANGLE(GLeglContext ctx, GLint location, GLsizei count, const GLfloat *value);
>+GL_APICALL void GL_APIENTRY glUniform1iContextANGLE(GLeglContext ctx, GLint location, GLint v0);
>+GL_APICALL void GL_APIENTRY glUniform1ivContextANGLE(GLeglContext ctx, GLint location, GLsizei count, const GLint *value);
>+GL_APICALL void GL_APIENTRY glUniform2fContextANGLE(GLeglContext ctx, GLint location, GLfloat v0, GLfloat v1);
>+GL_APICALL void GL_APIENTRY glUniform2fvContextANGLE(GLeglContext ctx, GLint location, GLsizei count, const GLfloat *value);
>+GL_APICALL void GL_APIENTRY glUniform2iContextANGLE(GLeglContext ctx, GLint location, GLint v0, GLint v1);
>+GL_APICALL void GL_APIENTRY glUniform2ivContextANGLE(GLeglContext ctx, GLint location, GLsizei count, const GLint *value);
>+GL_APICALL void GL_APIENTRY glUniform3fContextANGLE(GLeglContext ctx, GLint location, GLfloat v0, GLfloat v1, GLfloat v2);
>+GL_APICALL void GL_APIENTRY glUniform3fvContextANGLE(GLeglContext ctx, GLint location, GLsizei count, const GLfloat *value);
>+GL_APICALL void GL_APIENTRY glUniform3iContextANGLE(GLeglContext ctx, GLint location, GLint v0, GLint v1, GLint v2);
>+GL_APICALL void GL_APIENTRY glUniform3ivContextANGLE(GLeglContext ctx, GLint location, GLsizei count, const GLint *value);
>+GL_APICALL void GL_APIENTRY glUniform4fContextANGLE(GLeglContext ctx, GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3);
>+GL_APICALL void GL_APIENTRY glUniform4fvContextANGLE(GLeglContext ctx, GLint location, GLsizei count, const GLfloat *value);
>+GL_APICALL void GL_APIENTRY glUniform4iContextANGLE(GLeglContext ctx, GLint location, GLint v0, GLint v1, GLint v2, GLint v3);
>+GL_APICALL void GL_APIENTRY glUniform4ivContextANGLE(GLeglContext ctx, GLint location, GLsizei count, const GLint *value);
>+GL_APICALL void GL_APIENTRY glUniformMatrix2fvContextANGLE(GLeglContext ctx, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
>+GL_APICALL void GL_APIENTRY glUniformMatrix3fvContextANGLE(GLeglContext ctx, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
>+GL_APICALL void GL_APIENTRY glUniformMatrix4fvContextANGLE(GLeglContext ctx, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
>+GL_APICALL void GL_APIENTRY glUseProgramContextANGLE(GLeglContext ctx, GLuint program);
>+GL_APICALL void GL_APIENTRY glValidateProgramContextANGLE(GLeglContext ctx, GLuint program);
>+GL_APICALL void GL_APIENTRY glVertexAttrib1fContextANGLE(GLeglContext ctx, GLuint index, GLfloat x);
>+GL_APICALL void GL_APIENTRY glVertexAttrib1fvContextANGLE(GLeglContext ctx, GLuint index, const GLfloat *v);
>+GL_APICALL void GL_APIENTRY glVertexAttrib2fContextANGLE(GLeglContext ctx, GLuint index, GLfloat x, GLfloat y);
>+GL_APICALL void GL_APIENTRY glVertexAttrib2fvContextANGLE(GLeglContext ctx, GLuint index, const GLfloat *v);
>+GL_APICALL void GL_APIENTRY glVertexAttrib3fContextANGLE(GLeglContext ctx, GLuint index, GLfloat x, GLfloat y, GLfloat z);
>+GL_APICALL void GL_APIENTRY glVertexAttrib3fvContextANGLE(GLeglContext ctx, GLuint index, const GLfloat *v);
>+GL_APICALL void GL_APIENTRY glVertexAttrib4fContextANGLE(GLeglContext ctx, GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
>+GL_APICALL void GL_APIENTRY glVertexAttrib4fvContextANGLE(GLeglContext ctx, GLuint index, const GLfloat *v);
>+GL_APICALL void GL_APIENTRY glVertexAttribPointerContextANGLE(GLeglContext ctx, GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const void *pointer);
>+GL_APICALL void GL_APIENTRY glViewportContextANGLE(GLeglContext ctx, GLint x, GLint y, GLsizei width, GLsizei height);
>+GL_APICALL void GL_APIENTRY glBeginQueryEXTContextANGLE(GLeglContext ctx, GLenum target, GLuint id);
>+GL_APICALL void GL_APIENTRY glBindFragDataLocationEXTContextANGLE(GLeglContext ctx, GLuint program, GLuint color, const GLchar *name);
>+GL_APICALL void GL_APIENTRY glBindFragDataLocationIndexedEXTContextANGLE(GLeglContext ctx, GLuint program, GLuint colorNumber, GLuint index, const GLchar *name);
>+GL_APICALL void GL_APIENTRY glBindVertexArrayOESContextANGLE(GLeglContext ctx, GLuint array);
>+GL_APICALL void GL_APIENTRY glBlitFramebufferANGLEContextANGLE(GLeglContext ctx, GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter);
>+GL_APICALL void GL_APIENTRY glBufferStorageMemEXTContextANGLE(GLeglContext ctx, GLenum target, GLsizeiptr size, GLuint memory, GLuint64 offset);
>+GL_APICALL void GL_APIENTRY glCreateMemoryObjectsEXTContextANGLE(GLeglContext ctx, GLsizei n, GLuint *memoryObjects);
>+GL_APICALL void GL_APIENTRY glDebugMessageCallbackKHRContextANGLE(GLeglContext ctx, GLDEBUGPROCKHR callback, const void *userParam);
>+GL_APICALL void GL_APIENTRY glDebugMessageControlKHRContextANGLE(GLeglContext ctx, GLenum source, GLenum type, GLenum severity, GLsizei count, const GLuint *ids, GLboolean enabled);
>+GL_APICALL void GL_APIENTRY glDebugMessageInsertKHRContextANGLE(GLeglContext ctx, GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const GLchar *buf);
>+GL_APICALL void GL_APIENTRY glDeleteFencesNVContextANGLE(GLeglContext ctx, GLsizei n, const GLuint *fences);
>+GL_APICALL void GL_APIENTRY glDeleteMemoryObjectsEXTContextANGLE(GLeglContext ctx, GLsizei n, const GLuint *memoryObjects);
>+GL_APICALL void GL_APIENTRY glDeleteQueriesEXTContextANGLE(GLeglContext ctx, GLsizei n, const GLuint *ids);
>+GL_APICALL void GL_APIENTRY glDeleteSemaphoresEXTContextANGLE(GLeglContext ctx, GLsizei n, const GLuint *semaphores);
>+GL_APICALL void GL_APIENTRY glDeleteVertexArraysOESContextANGLE(GLeglContext ctx, GLsizei n, const GLuint *arrays);
>+GL_APICALL void GL_APIENTRY glDiscardFramebufferEXTContextANGLE(GLeglContext ctx, GLenum target, GLsizei numAttachments, const GLenum *attachments);
>+GL_APICALL void GL_APIENTRY glDrawArraysInstancedANGLEContextANGLE(GLeglContext ctx, GLenum mode, GLint first, GLsizei count, GLsizei primcount);
>+GL_APICALL void GL_APIENTRY glDrawArraysInstancedEXTContextANGLE(GLeglContext ctx, GLenum mode, GLint start, GLsizei count, GLsizei primcount);
>+GL_APICALL void GL_APIENTRY glDrawBuffersEXTContextANGLE(GLeglContext ctx, GLsizei n, const GLenum *bufs);
>+GL_APICALL void GL_APIENTRY glDrawElementsInstancedANGLEContextANGLE(GLeglContext ctx, GLenum mode, GLsizei count, GLenum type, const void *indices, GLsizei primcount);
>+GL_APICALL void GL_APIENTRY glDrawElementsInstancedEXTContextANGLE(GLeglContext ctx, GLenum mode, GLsizei count, GLenum type, const void *indices, GLsizei primcount);
>+GL_APICALL void GL_APIENTRY glEGLImageTargetRenderbufferStorageOESContextANGLE(GLeglContext ctx, GLenum target, GLeglImageOES image);
>+GL_APICALL void GL_APIENTRY glEGLImageTargetTexture2DOESContextANGLE(GLeglContext ctx, GLenum target, GLeglImageOES image);
>+GL_APICALL void GL_APIENTRY glEndQueryEXTContextANGLE(GLeglContext ctx, GLenum target);
>+GL_APICALL void GL_APIENTRY glFinishFenceNVContextANGLE(GLeglContext ctx, GLuint fence);
>+GL_APICALL void GL_APIENTRY glFlushMappedBufferRangeEXTContextANGLE(GLeglContext ctx, GLenum target, GLintptr offset, GLsizeiptr length);
>+GL_APICALL void GL_APIENTRY glFramebufferTextureEXTContextANGLE(GLeglContext ctx, GLenum target, GLenum attachment, GLuint texture, GLint level);
>+GL_APICALL void GL_APIENTRY glFramebufferTextureMultiviewOVRContextANGLE(GLeglContext ctx, GLenum target, GLenum attachment, GLuint texture, GLint level, GLint baseViewIndex, GLsizei numViews);
>+GL_APICALL void GL_APIENTRY glGenFencesNVContextANGLE(GLeglContext ctx, GLsizei n, GLuint *fences);
>+GL_APICALL void GL_APIENTRY glGenQueriesEXTContextANGLE(GLeglContext ctx, GLsizei n, GLuint *ids);
>+GL_APICALL void GL_APIENTRY glGenSemaphoresEXTContextANGLE(GLeglContext ctx, GLsizei n, GLuint *semaphores);
>+GL_APICALL void GL_APIENTRY glGenVertexArraysOESContextANGLE(GLeglContext ctx, GLsizei n, GLuint *arrays);
>+GL_APICALL void GL_APIENTRY glGetBufferPointervOESContextANGLE(GLeglContext ctx, GLenum target, GLenum pname, void **params);
>+GL_APICALL GLuint GL_APIENTRY glGetDebugMessageLogKHRContextANGLE(GLeglContext ctx, GLuint count, GLsizei bufSize, GLenum *sources, GLenum *types, GLuint *ids, GLenum *severities, GLsizei *lengths, GLchar *messageLog);
>+GL_APICALL void GL_APIENTRY glGetFenceivNVContextANGLE(GLeglContext ctx, GLuint fence, GLenum pname, GLint *params);
>+GL_APICALL GLint GL_APIENTRY glGetFragDataIndexEXTContextANGLE(GLeglContext ctx, GLuint program, const GLchar *name);
>+GL_APICALL GLenum GL_APIENTRY glGetGraphicsResetStatusEXTContextANGLE(GLeglContext ctx);
>+GL_APICALL void GL_APIENTRY glGetMemoryObjectParameterivEXTContextANGLE(GLeglContext ctx, GLuint memoryObject, GLenum pname, GLint *params);
>+GL_APICALL void GL_APIENTRY glGetObjectLabelKHRContextANGLE(GLeglContext ctx, GLenum identifier, GLuint name, GLsizei bufSize, GLsizei *length, GLchar *label);
>+GL_APICALL void GL_APIENTRY glGetObjectPtrLabelKHRContextANGLE(GLeglContext ctx, const void *ptr, GLsizei bufSize, GLsizei *length, GLchar *label);
>+GL_APICALL void GL_APIENTRY glGetPointervKHRContextANGLE(GLeglContext ctx, GLenum pname, void **params);
>+GL_APICALL void GL_APIENTRY glGetProgramBinaryOESContextANGLE(GLeglContext ctx, GLuint program, GLsizei bufSize, GLsizei *length, GLenum *binaryFormat, void *binary);
>+GL_APICALL GLint GL_APIENTRY glGetProgramResourceLocationIndexEXTContextANGLE(GLeglContext ctx, GLuint program, GLenum programInterface, const GLchar *name);
>+GL_APICALL void GL_APIENTRY glGetQueryObjecti64vEXTContextANGLE(GLeglContext ctx, GLuint id, GLenum pname, GLint64 *params);
>+GL_APICALL void GL_APIENTRY glGetQueryObjectivEXTContextANGLE(GLeglContext ctx, GLuint id, GLenum pname, GLint *params);
>+GL_APICALL void GL_APIENTRY glGetQueryObjectui64vEXTContextANGLE(GLeglContext ctx, GLuint id, GLenum pname, GLuint64 *params);
>+GL_APICALL void GL_APIENTRY glGetQueryObjectuivEXTContextANGLE(GLeglContext ctx, GLuint id, GLenum pname, GLuint *params);
>+GL_APICALL void GL_APIENTRY glGetQueryivEXTContextANGLE(GLeglContext ctx, GLenum target, GLenum pname, GLint *params);
>+GL_APICALL void GL_APIENTRY glGetSamplerParameterIivOESContextANGLE(GLeglContext ctx, GLuint sampler, GLenum pname, GLint *params);
>+GL_APICALL void GL_APIENTRY glGetSamplerParameterIuivOESContextANGLE(GLeglContext ctx, GLuint sampler, GLenum pname, GLuint *params);
>+GL_APICALL void GL_APIENTRY glGetSemaphoreParameterui64vEXTContextANGLE(GLeglContext ctx, GLuint semaphore, GLenum pname, GLuint64 *params);
>+GL_APICALL void GL_APIENTRY glGetTexParameterIivOESContextANGLE(GLeglContext ctx, GLenum target, GLenum pname, GLint *params);
>+GL_APICALL void GL_APIENTRY glGetTexParameterIuivOESContextANGLE(GLeglContext ctx, GLenum target, GLenum pname, GLuint *params);
>+GL_APICALL void GL_APIENTRY glGetTranslatedShaderSourceANGLEContextANGLE(GLeglContext ctx, GLuint shader, GLsizei bufsize, GLsizei *length, GLchar *source);
>+GL_APICALL void GL_APIENTRY glGetUnsignedBytevEXTContextANGLE(GLeglContext ctx, GLenum pname, GLubyte *data);
>+GL_APICALL void GL_APIENTRY glGetUnsignedBytei_vEXTContextANGLE(GLeglContext ctx, GLenum target, GLuint index, GLubyte *data);
>+GL_APICALL void GL_APIENTRY glGetnUniformfvEXTContextANGLE(GLeglContext ctx, GLuint program, GLint location, GLsizei bufSize, GLfloat *params);
>+GL_APICALL void GL_APIENTRY glGetnUniformivEXTContextANGLE(GLeglContext ctx, GLuint program, GLint location, GLsizei bufSize, GLint *params);
>+GL_APICALL void GL_APIENTRY glImportMemoryFdEXTContextANGLE(GLeglContext ctx, GLuint memory, GLuint64 size, GLenum handleType, GLint fd);
>+GL_APICALL void GL_APIENTRY glImportSemaphoreFdEXTContextANGLE(GLeglContext ctx, GLuint semaphore, GLenum handleType, GLint fd);
>+GL_APICALL void GL_APIENTRY glInsertEventMarkerEXTContextANGLE(GLeglContext ctx, GLsizei length, const GLchar *marker);
>+GL_APICALL GLboolean GL_APIENTRY glIsFenceNVContextANGLE(GLeglContext ctx, GLuint fence);
>+GL_APICALL GLboolean GL_APIENTRY glIsMemoryObjectEXTContextANGLE(GLeglContext ctx, GLuint memoryObject);
>+GL_APICALL GLboolean GL_APIENTRY glIsQueryEXTContextANGLE(GLeglContext ctx, GLuint id);
>+GL_APICALL GLboolean GL_APIENTRY glIsSemaphoreEXTContextANGLE(GLeglContext ctx, GLuint semaphore);
>+GL_APICALL GLboolean GL_APIENTRY glIsVertexArrayOESContextANGLE(GLeglContext ctx, GLuint array);
>+GL_APICALL void *GL_APIENTRY glMapBufferOESContextANGLE(GLeglContext ctx, GLenum target, GLenum access);
>+GL_APICALL void *GL_APIENTRY glMapBufferRangeEXTContextANGLE(GLeglContext ctx, GLenum target, GLintptr offset, GLsizeiptr length, GLbitfield access);
>+GL_APICALL void GL_APIENTRY glMaxShaderCompilerThreadsKHRContextANGLE(GLeglContext ctx, GLuint count);
>+GL_APICALL void GL_APIENTRY glMemoryObjectParameterivEXTContextANGLE(GLeglContext ctx, GLuint memoryObject, GLenum pname, const GLint *params);
>+GL_APICALL void GL_APIENTRY glObjectLabelKHRContextANGLE(GLeglContext ctx, GLenum identifier, GLuint name, GLsizei length, const GLchar *label);
>+GL_APICALL void GL_APIENTRY glObjectPtrLabelKHRContextANGLE(GLeglContext ctx, const void *ptr, GLsizei length, const GLchar *label);
>+GL_APICALL void GL_APIENTRY glPopDebugGroupKHRContextANGLE(GLeglContext ctx);
>+GL_APICALL void GL_APIENTRY glPopGroupMarkerEXTContextANGLE(GLeglContext ctx);
>+GL_APICALL void GL_APIENTRY glProgramBinaryOESContextANGLE(GLeglContext ctx, GLuint program, GLenum binaryFormat, const void *binary, GLint length);
>+GL_APICALL void GL_APIENTRY glPushDebugGroupKHRContextANGLE(GLeglContext ctx, GLenum source, GLuint id, GLsizei length, const GLchar *message);
>+GL_APICALL void GL_APIENTRY glPushGroupMarkerEXTContextANGLE(GLeglContext ctx, GLsizei length, const GLchar *marker);
>+GL_APICALL void GL_APIENTRY glQueryCounterEXTContextANGLE(GLeglContext ctx, GLuint id, GLenum target);
>+GL_APICALL void GL_APIENTRY glReadnPixelsEXTContextANGLE(GLeglContext ctx, GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLsizei bufSize, void *data);
>+GL_APICALL void GL_APIENTRY glRenderbufferStorageMultisampleANGLEContextANGLE(GLeglContext ctx, GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height);
>+GL_APICALL void GL_APIENTRY glSamplerParameterIivOESContextANGLE(GLeglContext ctx, GLuint sampler, GLenum pname, const GLint *param);
>+GL_APICALL void GL_APIENTRY glSamplerParameterIuivOESContextANGLE(GLeglContext ctx, GLuint sampler, GLenum pname, const GLuint *param);
>+GL_APICALL void GL_APIENTRY glSemaphoreParameterui64vEXTContextANGLE(GLeglContext ctx, GLuint semaphore, GLenum pname, const GLuint64 *params);
>+GL_APICALL void GL_APIENTRY glSetFenceNVContextANGLE(GLeglContext ctx, GLuint fence, GLenum condition);
>+GL_APICALL void GL_APIENTRY glSignalSemaphoreEXTContextANGLE(GLeglContext ctx, GLuint semaphore, GLuint numBufferBarriers, const GLuint *buffers, GLuint numTextureBarriers, const GLuint *textures, const GLenum *dstLayouts);
>+GL_APICALL GLboolean GL_APIENTRY glTestFenceNVContextANGLE(GLeglContext ctx, GLuint fence);
>+GL_APICALL void GL_APIENTRY glTexParameterIivOESContextANGLE(GLeglContext ctx, GLenum target, GLenum pname, const GLint *params);
>+GL_APICALL void GL_APIENTRY glTexParameterIuivOESContextANGLE(GLeglContext ctx, GLenum target, GLenum pname, const GLuint *params);
>+GL_APICALL void GL_APIENTRY glTexStorage1DEXTContextANGLE(GLeglContext ctx, GLenum target, GLsizei levels, GLenum internalformat, GLsizei width);
>+GL_APICALL void GL_APIENTRY glTexStorage2DEXTContextANGLE(GLeglContext ctx, GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height);
>+GL_APICALL void GL_APIENTRY glTexStorage3DEXTContextANGLE(GLeglContext ctx, GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth);
>+GL_APICALL void GL_APIENTRY glTexStorage3DMultisampleOESContextANGLE(GLeglContext ctx, GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedsamplelocations);
>+GL_APICALL void GL_APIENTRY glTexStorageMem2DEXTContextANGLE(GLeglContext ctx, GLenum target, GLsizei levels, GLenum internalFormat, GLsizei width, GLsizei height, GLuint memory, GLuint64 offset);
>+GL_APICALL void GL_APIENTRY glTexStorageMem2DMultisampleEXTContextANGLE(GLeglContext ctx, GLenum target, GLsizei samples, GLenum internalFormat, GLsizei width, GLsizei height, GLboolean fixedSampleLocations, GLuint memory, GLuint64 offset);
>+GL_APICALL void GL_APIENTRY glTexStorageMem3DEXTContextANGLE(GLeglContext ctx, GLenum target, GLsizei levels, GLenum internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLuint memory, GLuint64 offset);
>+GL_APICALL void GL_APIENTRY glTexStorageMem3DMultisampleEXTContextANGLE(GLeglContext ctx, GLenum target, GLsizei samples, GLenum internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedSampleLocations, GLuint memory, GLuint64 offset);
>+GL_APICALL GLboolean GL_APIENTRY glUnmapBufferOESContextANGLE(GLeglContext ctx, GLenum target);
>+GL_APICALL void GL_APIENTRY glVertexAttribDivisorANGLEContextANGLE(GLeglContext ctx, GLuint index, GLuint divisor);
>+GL_APICALL void GL_APIENTRY glVertexAttribDivisorEXTContextANGLE(GLeglContext ctx, GLuint index, GLuint divisor);
>+GL_APICALL void GL_APIENTRY glWaitSemaphoreEXTContextANGLE(GLeglContext ctx, GLuint semaphore, GLuint numBufferBarriers, const GLuint *buffers, GLuint numTextureBarriers, const GLuint *textures, const GLenum *srcLayouts);
>+GL_APICALL void GL_APIENTRY glBindUniformLocationCHROMIUMContextANGLE(GLeglContext ctx, GLuint program, GLint location, const GLchar* name);
>+GL_APICALL void GL_APIENTRY glCoverageModulationCHROMIUMContextANGLE(GLeglContext ctx, GLenum components);
>+GL_APICALL void GL_APIENTRY glMatrixLoadfCHROMIUMContextANGLE(GLeglContext ctx, GLenum matrixMode, const GLfloat * matrix);
>+GL_APICALL void GL_APIENTRY glMatrixLoadIdentityCHROMIUMContextANGLE(GLeglContext ctx, GLenum matrixMode);
>+GL_APICALL GLuint GL_APIENTRY glGenPathsCHROMIUMContextANGLE(GLeglContext ctx, GLsizei range);
>+GL_APICALL void GL_APIENTRY glDeletePathsCHROMIUMContextANGLE(GLeglContext ctx, GLuint first, GLsizei range);
>+GL_APICALL GLboolean GL_APIENTRY glIsPathCHROMIUMContextANGLE(GLeglContext ctx, GLuint path);
>+GL_APICALL void GL_APIENTRY glPathCommandsCHROMIUMContextANGLE(GLeglContext ctx, GLuint path, GLsizei numCommands, const GLubyte * commands, GLsizei numCoords, GLenum coordType, const void* coords);
>+GL_APICALL void GL_APIENTRY glPathParameterfCHROMIUMContextANGLE(GLeglContext ctx, GLuint path, GLenum pname, GLfloat value);
>+GL_APICALL void GL_APIENTRY glPathParameteriCHROMIUMContextANGLE(GLeglContext ctx, GLuint path, GLenum pname, GLint value);
>+GL_APICALL void GL_APIENTRY glGetPathParameterfvCHROMIUMContextANGLE(GLeglContext ctx, GLuint path, GLenum pname, GLfloat * value);
>+GL_APICALL void GL_APIENTRY glGetPathParameterivCHROMIUMContextANGLE(GLeglContext ctx, GLuint path, GLenum pname, GLint * value);
>+GL_APICALL void GL_APIENTRY glPathStencilFuncCHROMIUMContextANGLE(GLeglContext ctx, GLenum func, GLint ref, GLuint mask);
>+GL_APICALL void GL_APIENTRY glStencilFillPathCHROMIUMContextANGLE(GLeglContext ctx, GLuint path, GLenum fillMode, GLuint mask);
>+GL_APICALL void GL_APIENTRY glStencilStrokePathCHROMIUMContextANGLE(GLeglContext ctx, GLuint path, GLint reference, GLuint mask);
>+GL_APICALL void GL_APIENTRY glCoverFillPathCHROMIUMContextANGLE(GLeglContext ctx, GLuint path, GLenum coverMode);
>+GL_APICALL void GL_APIENTRY glCoverStrokePathCHROMIUMContextANGLE(GLeglContext ctx, GLuint path, GLenum coverMode);
>+GL_APICALL void GL_APIENTRY glStencilThenCoverFillPathCHROMIUMContextANGLE(GLeglContext ctx, GLuint path, GLenum fillMode, GLuint mask, GLenum coverMode);
>+GL_APICALL void GL_APIENTRY glStencilThenCoverStrokePathCHROMIUMContextANGLE(GLeglContext ctx, GLuint path, GLint reference, GLuint mask, GLenum coverMode);
>+GL_APICALL void GL_APIENTRY glCoverFillPathInstancedCHROMIUMContextANGLE(GLeglContext ctx, GLsizei numPath, GLenum pathNameType, const void * paths, GLuint pathBase, GLenum coverMode, GLenum transformType, const GLfloat * transformValues);
>+GL_APICALL void GL_APIENTRY glCoverStrokePathInstancedCHROMIUMContextANGLE(GLeglContext ctx, GLsizei numPath, GLenum pathNameType, const void * paths, GLuint pathBase, GLenum coverMode, GLenum transformType, const GLfloat * transformValues);
>+GL_APICALL void GL_APIENTRY glStencilStrokePathInstancedCHROMIUMContextANGLE(GLeglContext ctx, GLsizei numPath, GLenum pathNameType, const void * paths, GLuint pathBase, GLint reference, GLuint mask, GLenum transformType, const GLfloat * transformValues);
>+GL_APICALL void GL_APIENTRY glStencilFillPathInstancedCHROMIUMContextANGLE(GLeglContext ctx, GLsizei numPaths, GLenum pathNameType, const void * paths, GLuint pathBase, GLenum fillMode, GLuint mask, GLenum transformType, const GLfloat * transformValues);
>+GL_APICALL void GL_APIENTRY glStencilThenCoverFillPathInstancedCHROMIUMContextANGLE(GLeglContext ctx, GLsizei numPaths, GLenum pathNameType, const void * paths, GLuint pathBase, GLenum fillMode, GLuint mask, GLenum coverMode, GLenum transformType, const GLfloat * transformValues);
>+GL_APICALL void GL_APIENTRY glStencilThenCoverStrokePathInstancedCHROMIUMContextANGLE(GLeglContext ctx, GLsizei numPaths, GLenum pathNameType, const void * paths, GLuint pathBase, GLint reference, GLuint mask, GLenum coverMode, GLenum transformType, const GLfloat * transformValues);
>+GL_APICALL void GL_APIENTRY glBindFragmentInputLocationCHROMIUMContextANGLE(GLeglContext ctx, GLuint programs, GLint location, const GLchar * name);
>+GL_APICALL void GL_APIENTRY glProgramPathFragmentInputGenCHROMIUMContextANGLE(GLeglContext ctx, GLuint program, GLint location, GLenum genMode, GLint components, const GLfloat * coeffs);
>+GL_APICALL void GL_APIENTRY glCopyTextureCHROMIUMContextANGLE(GLeglContext ctx, GLuint sourceId, GLint sourceLevel, GLenum destTarget, GLuint destId, GLint destLevel, GLint internalFormat, GLenum destType, GLboolean unpackFlipY, GLboolean unpackPremultiplyAlpha, GLboolean unpackUnmultiplyAlpha);
>+GL_APICALL void GL_APIENTRY glCopySubTextureCHROMIUMContextANGLE(GLeglContext ctx, GLuint sourceId, GLint sourceLevel, GLenum destTarget, GLuint destId, GLint destLevel, GLint xoffset, GLint yoffset, GLint x, GLint y, GLint width, GLint height, GLboolean unpackFlipY, GLboolean unpackPremultiplyAlpha, GLboolean unpackUnmultiplyAlpha);
>+GL_APICALL void GL_APIENTRY glCompressedCopyTextureCHROMIUMContextANGLE(GLeglContext ctx, GLuint sourceId, GLuint destId);
>+GL_APICALL void GL_APIENTRY glRequestExtensionANGLEContextANGLE(GLeglContext ctx, const GLchar * name);
>+GL_APICALL void GL_APIENTRY glGetBooleanvRobustANGLEContextANGLE(GLeglContext ctx, GLenum pname, GLsizei bufSize, GLsizei * length, GLboolean * params);
>+GL_APICALL void GL_APIENTRY glGetBufferParameterivRobustANGLEContextANGLE(GLeglContext ctx, GLenum target, GLenum pname, GLsizei bufSize, GLsizei * length, GLint * params);
>+GL_APICALL void GL_APIENTRY glGetFloatvRobustANGLEContextANGLE(GLeglContext ctx, GLenum pname, GLsizei bufSize, GLsizei * length, GLfloat * params);
>+GL_APICALL void GL_APIENTRY glGetFramebufferAttachmentParameterivRobustANGLEContextANGLE(GLeglContext ctx, GLenum target, GLenum attachment, GLenum pname, GLsizei bufSize, GLsizei * length, GLint * params);
>+GL_APICALL void GL_APIENTRY glGetIntegervRobustANGLEContextANGLE(GLeglContext ctx, GLenum pname, GLsizei bufSize, GLsizei * length, GLint * data);
>+GL_APICALL void GL_APIENTRY glGetProgramivRobustANGLEContextANGLE(GLeglContext ctx, GLuint program, GLenum pname, GLsizei bufSize, GLsizei * length, GLint * params);
>+GL_APICALL void GL_APIENTRY glGetRenderbufferParameterivRobustANGLEContextANGLE(GLeglContext ctx, GLenum target, GLenum pname, GLsizei bufSize, GLsizei * length, GLint * params);
>+GL_APICALL void GL_APIENTRY glGetShaderivRobustANGLEContextANGLE(GLeglContext ctx, GLuint shader, GLenum pname, GLsizei bufSize, GLsizei * length, GLint * params);
>+GL_APICALL void GL_APIENTRY glGetTexParameterfvRobustANGLEContextANGLE(GLeglContext ctx, GLenum target, GLenum pname, GLsizei bufSize, GLsizei * length, GLfloat * params);
>+GL_APICALL void GL_APIENTRY glGetTexParameterivRobustANGLEContextANGLE(GLeglContext ctx, GLenum target, GLenum pname, GLsizei bufSize, GLsizei * length, GLint * params);
>+GL_APICALL void GL_APIENTRY glGetUniformfvRobustANGLEContextANGLE(GLeglContext ctx, GLuint program, GLint location, GLsizei bufSize, GLsizei * length, GLfloat * params);
>+GL_APICALL void GL_APIENTRY glGetUniformivRobustANGLEContextANGLE(GLeglContext ctx, GLuint program, GLint location, GLsizei bufSize, GLsizei * length, GLint * params);
>+GL_APICALL void GL_APIENTRY glGetVertexAttribfvRobustANGLEContextANGLE(GLeglContext ctx, GLuint index, GLenum pname, GLsizei bufSize, GLsizei * length, GLfloat * params);
>+GL_APICALL void GL_APIENTRY glGetVertexAttribivRobustANGLEContextANGLE(GLeglContext ctx, GLuint index, GLenum pname, GLsizei bufSize, GLsizei * length, GLint * params);
>+GL_APICALL void GL_APIENTRY glGetVertexAttribPointervRobustANGLEContextANGLE(GLeglContext ctx, GLuint index, GLenum pname, GLsizei bufSize, GLsizei * length, void ** pointer);
>+GL_APICALL void GL_APIENTRY glReadPixelsRobustANGLEContextANGLE(GLeglContext ctx, GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLsizei bufSize, GLsizei * length, GLsizei * columns, GLsizei * rows, void * pixels);
>+GL_APICALL void GL_APIENTRY glTexImage2DRobustANGLEContextANGLE(GLeglContext ctx, GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, GLsizei bufSize, const void * pixels);
>+GL_APICALL void GL_APIENTRY glTexParameterfvRobustANGLEContextANGLE(GLeglContext ctx, GLenum target, GLenum pname, GLsizei bufSize, const GLfloat * params);
>+GL_APICALL void GL_APIENTRY glTexParameterivRobustANGLEContextANGLE(GLeglContext ctx, GLenum target, GLenum pname, GLsizei bufSize, const GLint * params);
>+GL_APICALL void GL_APIENTRY glTexSubImage2DRobustANGLEContextANGLE(GLeglContext ctx, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, GLsizei bufSize, const void * pixels);
>+GL_APICALL void GL_APIENTRY glTexImage3DRobustANGLEContextANGLE(GLeglContext ctx, GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, GLsizei bufSize, const void * pixels);
>+GL_APICALL void GL_APIENTRY glTexSubImage3DRobustANGLEContextANGLE(GLeglContext ctx, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, GLsizei bufSize, const void * pixels);
>+GL_APICALL void GL_APIENTRY glCompressedTexImage2DRobustANGLEContextANGLE(GLeglContext ctx, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, GLsizei dataSize, const GLvoid * data);
>+GL_APICALL void GL_APIENTRY glCompressedTexSubImage2DRobustANGLEContextANGLE(GLeglContext ctx, GLenum target, GLint level, GLsizei xoffset, GLsizei yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, GLsizei dataSize, const GLvoid * data);
>+GL_APICALL void GL_APIENTRY glCompressedTexImage3DRobustANGLEContextANGLE(GLeglContext ctx, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, GLsizei dataSize, const GLvoid * data);
>+GL_APICALL void GL_APIENTRY glCompressedTexSubImage3DRobustANGLEContextANGLE(GLeglContext ctx, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, GLsizei dataSize, const GLvoid * data);
>+GL_APICALL void GL_APIENTRY glGetQueryivRobustANGLEContextANGLE(GLeglContext ctx, GLenum target, GLenum pname, GLsizei bufSize, GLsizei * length, GLint * params);
>+GL_APICALL void GL_APIENTRY glGetQueryObjectuivRobustANGLEContextANGLE(GLeglContext ctx, GLuint id, GLenum pname, GLsizei bufSize, GLsizei * length, GLuint * params);
>+GL_APICALL void GL_APIENTRY glGetBufferPointervRobustANGLEContextANGLE(GLeglContext ctx, GLenum target, GLenum pname, GLsizei bufSize, GLsizei * length, void ** params);
>+GL_APICALL void GL_APIENTRY glGetIntegeri_vRobustANGLEContextANGLE(GLeglContext ctx, GLenum target, GLuint index, GLsizei bufSize, GLsizei * length, GLint * data);
>+GL_APICALL void GL_APIENTRY glGetInternalformativRobustANGLEContextANGLE(GLeglContext ctx, GLenum target, GLenum internalformat, GLenum pname, GLsizei bufSize, GLsizei * length, GLint * params);
>+GL_APICALL void GL_APIENTRY glGetVertexAttribIivRobustANGLEContextANGLE(GLeglContext ctx, GLuint index, GLenum pname, GLsizei bufSize, GLsizei * length, GLint * params);
>+GL_APICALL void GL_APIENTRY glGetVertexAttribIuivRobustANGLEContextANGLE(GLeglContext ctx, GLuint index, GLenum pname, GLsizei bufSize, GLsizei * length, GLuint * params);
>+GL_APICALL void GL_APIENTRY glGetUniformuivRobustANGLEContextANGLE(GLeglContext ctx, GLuint program, GLint location, GLsizei bufSize, GLsizei * length, GLuint * params);
>+GL_APICALL void GL_APIENTRY glGetActiveUniformBlockivRobustANGLEContextANGLE(GLeglContext ctx, GLuint program, GLuint uniformBlockIndex, GLenum pname, GLsizei bufSize, GLsizei * length, GLint * params);
>+GL_APICALL void GL_APIENTRY glGetInteger64vRobustANGLEContextANGLE(GLeglContext ctx, GLenum pname, GLsizei bufSize, GLsizei * length, GLint64 * data);
>+GL_APICALL void GL_APIENTRY glGetInteger64i_vRobustANGLEContextANGLE(GLeglContext ctx, GLenum target, GLuint index, GLsizei bufSize, GLsizei * length, GLint64 * data);
>+GL_APICALL void GL_APIENTRY glGetBufferParameteri64vRobustANGLEContextANGLE(GLeglContext ctx, GLenum target, GLenum pname, GLsizei bufSize, GLsizei * length, GLint64 * params);
>+GL_APICALL void GL_APIENTRY glSamplerParameterivRobustANGLEContextANGLE(GLeglContext ctx, GLuint sampler, GLuint pname, GLsizei bufSize, const GLint * param);
>+GL_APICALL void GL_APIENTRY glSamplerParameterfvRobustANGLEContextANGLE(GLeglContext ctx, GLuint sampler, GLenum pname, GLsizei bufSize, const GLfloat * param);
>+GL_APICALL void GL_APIENTRY glGetSamplerParameterivRobustANGLEContextANGLE(GLeglContext ctx, GLuint sampler, GLenum pname, GLsizei bufSize, GLsizei * length, GLint * params);
>+GL_APICALL void GL_APIENTRY glGetSamplerParameterfvRobustANGLEContextANGLE(GLeglContext ctx, GLuint sampler, GLenum pname, GLsizei bufSize, GLsizei * length, GLfloat * params);
>+GL_APICALL void GL_APIENTRY glGetFramebufferParameterivRobustANGLEContextANGLE(GLeglContext ctx, GLuint sampler, GLenum pname, GLsizei bufSize, GLsizei * length, GLint * params);
>+GL_APICALL void GL_APIENTRY glGetProgramInterfaceivRobustANGLEContextANGLE(GLeglContext ctx, GLuint program, GLenum programInterface, GLenum pname, GLsizei bufSize, GLsizei * length, GLint * params);
>+GL_APICALL void GL_APIENTRY glGetBooleani_vRobustANGLEContextANGLE(GLeglContext ctx, GLenum target, GLuint index, GLsizei bufSize, GLsizei * length, GLboolean * data);
>+GL_APICALL void GL_APIENTRY glGetMultisamplefvRobustANGLEContextANGLE(GLeglContext ctx, GLenum pname, GLuint index, GLsizei bufSize, GLsizei * length, GLfloat * val);
>+GL_APICALL void GL_APIENTRY glGetTexLevelParameterivRobustANGLEContextANGLE(GLeglContext ctx, GLenum target, GLint level, GLenum pname, GLsizei bufSize, GLsizei * length, GLint * params);
>+GL_APICALL void GL_APIENTRY glGetTexLevelParameterfvRobustANGLEContextANGLE(GLeglContext ctx, GLenum target, GLint level, GLenum pname, GLsizei bufSize, GLsizei * length, GLfloat * params);
>+GL_APICALL void GL_APIENTRY glGetPointervRobustANGLERobustANGLEContextANGLE(GLeglContext ctx, GLenum pname, GLsizei bufSize, GLsizei * length, void ** params);
>+GL_APICALL void GL_APIENTRY glReadnPixelsRobustANGLEContextANGLE(GLeglContext ctx, GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLsizei bufSize, GLsizei * length, GLsizei * columns, GLsizei * rows, void * data);
>+GL_APICALL void GL_APIENTRY glGetnUniformfvRobustANGLEContextANGLE(GLeglContext ctx, GLuint program, GLint location, GLsizei bufSize, GLsizei * length, GLfloat * params);
>+GL_APICALL void GL_APIENTRY glGetnUniformivRobustANGLEContextANGLE(GLeglContext ctx, GLuint program, GLint location, GLsizei bufSize, GLsizei * length, GLint * params);
>+GL_APICALL void GL_APIENTRY glGetnUniformuivRobustANGLEContextANGLE(GLeglContext ctx, GLuint program, GLint location, GLsizei bufSize, GLsizei * length, GLuint * params);
>+GL_APICALL void GL_APIENTRY glTexParameterIivRobustANGLEContextANGLE(GLeglContext ctx, GLenum target, GLenum pname, GLsizei bufSize, const GLint * params);
>+GL_APICALL void GL_APIENTRY glTexParameterIuivRobustANGLEContextANGLE(GLeglContext ctx, GLenum target, GLenum pname, GLsizei bufSize, const GLuint * params);
>+GL_APICALL void GL_APIENTRY glGetTexParameterIivRobustANGLEContextANGLE(GLeglContext ctx, GLenum target, GLenum pname, GLsizei bufSize, GLsizei * length, GLint * params);
>+GL_APICALL void GL_APIENTRY glGetTexParameterIuivRobustANGLEContextANGLE(GLeglContext ctx, GLenum target, GLenum pname, GLsizei bufSize, GLsizei * length, GLuint * params);
>+GL_APICALL void GL_APIENTRY glSamplerParameterIivRobustANGLEContextANGLE(GLeglContext ctx, GLuint sampler, GLenum pname, GLsizei bufSize, const GLint * param);
>+GL_APICALL void GL_APIENTRY glSamplerParameterIuivRobustANGLEContextANGLE(GLeglContext ctx, GLuint sampler, GLenum pname, GLsizei bufSize, const GLuint * param);
>+GL_APICALL void GL_APIENTRY glGetSamplerParameterIivRobustANGLEContextANGLE(GLeglContext ctx, GLuint sampler, GLenum pname, GLsizei bufSize, GLsizei * length, GLint * params);
>+GL_APICALL void GL_APIENTRY glGetSamplerParameterIuivRobustANGLEContextANGLE(GLeglContext ctx, GLuint sampler, GLenum pname, GLsizei bufSize, GLsizei * length, GLuint * params);
>+GL_APICALL void GL_APIENTRY glGetQueryObjectivRobustANGLEContextANGLE(GLeglContext ctx, GLuint id, GLenum pname, GLsizei bufSize, GLsizei * length, GLint * params);
>+GL_APICALL void GL_APIENTRY glGetQueryObjecti64vRobustANGLEContextANGLE(GLeglContext ctx, GLuint id, GLenum pname, GLsizei bufSize, GLsizei * length, GLint64 * params);
>+GL_APICALL void GL_APIENTRY glGetQueryObjectui64vRobustANGLEContextANGLE(GLeglContext ctx, GLuint id, GLenum pname, GLsizei bufSize, GLsizei * length, GLuint64 * params);
>+GL_APICALL void GL_APIENTRY glCopyTexture3DANGLEContextANGLE(GLeglContext ctx, GLuint sourceId, GLint sourceLevel, GLenum destTarget, GLuint destId, GLint destLevel, GLint internalFormat, GLenum destType, GLboolean unpackFlipY, GLboolean unpackPremultiplyAlpha, GLboolean unpackUnmultiplyAlpha);
>+GL_APICALL void GL_APIENTRY glCopySubTexture3DANGLEContextANGLE(GLeglContext ctx, GLuint sourceId, GLint sourceLevel, GLenum destTarget, GLuint destId, GLint destLevel, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLint z, GLint width, GLint height, GLint depth, GLboolean unpackFlipY, GLboolean unpackPremultiplyAlpha, GLboolean unpackUnmultiplyAlpha);
>+GL_APICALL void GL_APIENTRY glTexStorage2DMultisampleANGLEContextANGLE(GLeglContext ctx, GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height, GLboolean fixedsamplelocations);
>+GL_APICALL void GL_APIENTRY glGetTexLevelParameterivANGLEContextANGLE(GLeglContext ctx, GLenum target, GLint level, GLenum pname, GLint * params);
>+GL_APICALL void GL_APIENTRY glGetTexLevelParameterfvANGLEContextANGLE(GLeglContext ctx, GLenum target, GLint level, GLenum pname, GLfloat * params);
>+GL_APICALL void GL_APIENTRY glMultiDrawArraysANGLEContextANGLE(GLeglContext ctx, GLenum mode, const GLint *firsts, const GLsizei *counts, GLsizei drawcount);
>+GL_APICALL void GL_APIENTRY glMultiDrawArraysInstancedANGLEContextANGLE(GLeglContext ctx, GLenum mode, const GLint *firsts, const GLsizei *counts, const GLsizei *instanceCounts, GLsizei drawcount);
>+GL_APICALL void GL_APIENTRY glMultiDrawElementsANGLEContextANGLE(GLeglContext ctx, GLenum mode, const GLsizei *counts, GLenum type, const GLvoid *const*indices, GLsizei drawcount);
>+GL_APICALL void GL_APIENTRY glMultiDrawElementsInstancedANGLEContextANGLE(GLeglContext ctx, GLenum mode, const GLsizei *counts, GLenum type, const GLvoid *const*indices, const GLsizei*instanceCounts, GLsizei drawcount);
>+GL_APICALL void GL_APIENTRY glGetMultisamplefvANGLEContextANGLE(GLeglContext ctx, GLenum pname, GLuint index, GLfloat * val);
>+GL_APICALL void GL_APIENTRY glSampleMaskiANGLEContextANGLE(GLeglContext ctx, GLuint maskNumber, GLbitfield mask);
>+GL_APICALL void GL_APIENTRY glProvokingVertexANGLEContextANGLE(GLeglContext ctx, GLenum mode);
>+GL_APICALL void GL_APIENTRY glLoseContextCHROMIUMContextANGLE(GLeglContext ctx, GLenum current, GLenum other);
>+#endif
>diff --git a/Source/ThirdParty/ANGLE/include/GLES3/.clang-format b/Source/ThirdParty/ANGLE/include/GLES3/.clang-format
>new file mode 100644
>index 00000000000..06147100144
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/include/GLES3/.clang-format
>@@ -0,0 +1,3 @@
>+
>+
>+DisableFormat: true
>diff --git a/Source/ThirdParty/ANGLE/include/GLES3/gl3.h b/Source/ThirdParty/ANGLE/include/GLES3/gl3.h
>index 53c59b85fed..45707856d29 100644
>--- a/Source/ThirdParty/ANGLE/include/GLES3/gl3.h
>+++ b/Source/ThirdParty/ANGLE/include/GLES3/gl3.h
>@@ -1,12 +1,12 @@
>-#ifndef __gl3_h_
>-#define __gl3_h_ 1
>+#ifndef __gles2_gl3_h_
>+#define __gles2_gl3_h_ 1
> 
> #ifdef __cplusplus
> extern "C" {
> #endif
> 
> /*
>-** Copyright (c) 2013-2015 The Khronos Group Inc.
>+** Copyright (c) 2013-2018 The Khronos Group Inc.
> **
> ** Permission is hereby granted, free of charge, to any person obtaining a
> ** copy of this software and/or associated documentation files (the
>@@ -31,9 +31,7 @@ extern "C" {
> ** This header is generated from the Khronos OpenGL / OpenGL ES XML
> ** API Registry. The current version of the Registry, generator scripts
> ** used to make the header, and the header can be found at
>-**   http://www.opengl.org/registry/
>-**
>-** Khronos $Revision: 31811 $ on $Date: 2015-08-10 00:01:11 -0700 (Mon, 10 Aug 2015) $
>+**   https://github.com/KhronosGroup/OpenGL-Registry
> */
> 
> #include <GLES3/gl3platform.h>
>@@ -42,7 +40,11 @@ extern "C" {
> #define GL_APIENTRYP GL_APIENTRY*
> #endif
> 
>-/* Generated on date 20150809 */
>+#ifndef GL_GLES_PROTOTYPES
>+#define GL_GLES_PROTOTYPES 1
>+#endif
>+
>+/* Generated on date 20181130 */
> 
> /* Generated C header for:
>  * API: gles2
>@@ -60,8 +62,8 @@ extern "C" {
> typedef khronos_int8_t GLbyte;
> typedef khronos_float_t GLclampf;
> typedef khronos_int32_t GLfixed;
>-typedef short GLshort;
>-typedef unsigned short GLushort;
>+typedef khronos_int16_t GLshort;
>+typedef khronos_uint16_t GLushort;
> typedef void GLvoid;
> typedef struct __GLsync *GLsync;
> typedef khronos_int64_t GLint64;
>@@ -520,7 +522,7 @@ typedef void (GL_APIENTRYP PFNGLVERTEXATTRIB4FPROC) (GLuint index, GLfloat x, GL
> typedef void (GL_APIENTRYP PFNGLVERTEXATTRIB4FVPROC) (GLuint index, const GLfloat *v);
> typedef void (GL_APIENTRYP PFNGLVERTEXATTRIBPOINTERPROC) (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const void *pointer);
> typedef void (GL_APIENTRYP PFNGLVIEWPORTPROC) (GLint x, GLint y, GLsizei width, GLsizei height);
>-#ifdef GL_GLEXT_PROTOTYPES
>+#if GL_GLES_PROTOTYPES
> GL_APICALL void GL_APIENTRY glActiveTexture (GLenum texture);
> GL_APICALL void GL_APIENTRY glAttachShader (GLuint program, GLuint shader);
> GL_APICALL void GL_APIENTRY glBindAttribLocation (GLuint program, GLuint index, const GLchar *name);
>@@ -668,7 +670,7 @@ GL_APICALL void GL_APIENTRY glViewport (GLint x, GLint y, GLsizei width, GLsizei
> 
> #ifndef GL_ES_VERSION_3_0
> #define GL_ES_VERSION_3_0 1
>-typedef unsigned short GLhalf;
>+typedef khronos_uint16_t GLhalf;
> #define GL_READ_BUFFER                    0x0C02
> #define GL_UNPACK_ROW_LENGTH              0x0CF2
> #define GL_UNPACK_SKIP_ROWS               0x0CF3
>@@ -1094,7 +1096,7 @@ typedef void (GL_APIENTRYP PFNGLINVALIDATESUBFRAMEBUFFERPROC) (GLenum target, GL
> typedef void (GL_APIENTRYP PFNGLTEXSTORAGE2DPROC) (GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height);
> typedef void (GL_APIENTRYP PFNGLTEXSTORAGE3DPROC) (GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth);
> typedef void (GL_APIENTRYP PFNGLGETINTERNALFORMATIVPROC) (GLenum target, GLenum internalformat, GLenum pname, GLsizei bufSize, GLint *params);
>-#ifdef GL_GLEXT_PROTOTYPES
>+#if GL_GLES_PROTOTYPES
> GL_APICALL void GL_APIENTRY glReadBuffer (GLenum src);
> GL_APICALL void GL_APIENTRY glDrawRangeElements (GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const void *indices);
> GL_APICALL void GL_APIENTRY glTexImage3D (GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const void *pixels);
>diff --git a/Source/ThirdParty/ANGLE/include/GLES3/gl31.h b/Source/ThirdParty/ANGLE/include/GLES3/gl31.h
>index 26f869b781d..4806181e042 100644
>--- a/Source/ThirdParty/ANGLE/include/GLES3/gl31.h
>+++ b/Source/ThirdParty/ANGLE/include/GLES3/gl31.h
>@@ -6,7 +6,7 @@ extern "C" {
> #endif
> 
> /*
>-** Copyright (c) 2013-2015 The Khronos Group Inc.
>+** Copyright (c) 2013-2016 The Khronos Group Inc.
> **
> ** Permission is hereby granted, free of charge, to any person obtaining a
> ** copy of this software and/or associated documentation files (the
>@@ -42,7 +42,11 @@ extern "C" {
> #define GL_APIENTRYP GL_APIENTRY*
> #endif
> 
>-/* Generated on date 20150809 */
>+#ifndef GL_GLES_PROTOTYPES
>+#define GL_GLES_PROTOTYPES 1
>+#endif
>+
>+/* Generated on date 20161024 */
> 
> /* Generated C header for:
>  * API: gles2
>@@ -520,7 +524,7 @@ typedef void (GL_APIENTRYP PFNGLVERTEXATTRIB4FPROC) (GLuint index, GLfloat x, GL
> typedef void (GL_APIENTRYP PFNGLVERTEXATTRIB4FVPROC) (GLuint index, const GLfloat *v);
> typedef void (GL_APIENTRYP PFNGLVERTEXATTRIBPOINTERPROC) (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const void *pointer);
> typedef void (GL_APIENTRYP PFNGLVIEWPORTPROC) (GLint x, GLint y, GLsizei width, GLsizei height);
>-#ifdef GL_GLEXT_PROTOTYPES
>+#if GL_GLES_PROTOTYPES
> GL_APICALL void GL_APIENTRY glActiveTexture (GLenum texture);
> GL_APICALL void GL_APIENTRY glAttachShader (GLuint program, GLuint shader);
> GL_APICALL void GL_APIENTRY glBindAttribLocation (GLuint program, GLuint index, const GLchar *name);
>@@ -1094,7 +1098,7 @@ typedef void (GL_APIENTRYP PFNGLINVALIDATESUBFRAMEBUFFERPROC) (GLenum target, GL
> typedef void (GL_APIENTRYP PFNGLTEXSTORAGE2DPROC) (GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height);
> typedef void (GL_APIENTRYP PFNGLTEXSTORAGE3DPROC) (GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth);
> typedef void (GL_APIENTRYP PFNGLGETINTERNALFORMATIVPROC) (GLenum target, GLenum internalformat, GLenum pname, GLsizei bufSize, GLint *params);
>-#ifdef GL_GLEXT_PROTOTYPES
>+#if GL_GLES_PROTOTYPES
> GL_APICALL void GL_APIENTRY glReadBuffer (GLenum src);
> GL_APICALL void GL_APIENTRY glDrawRangeElements (GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const void *indices);
> GL_APICALL void GL_APIENTRY glTexImage3D (GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const void *pixels);
>@@ -1445,7 +1449,7 @@ typedef void (GL_APIENTRYP PFNGLVERTEXATTRIBFORMATPROC) (GLuint attribindex, GLi
> typedef void (GL_APIENTRYP PFNGLVERTEXATTRIBIFORMATPROC) (GLuint attribindex, GLint size, GLenum type, GLuint relativeoffset);
> typedef void (GL_APIENTRYP PFNGLVERTEXATTRIBBINDINGPROC) (GLuint attribindex, GLuint bindingindex);
> typedef void (GL_APIENTRYP PFNGLVERTEXBINDINGDIVISORPROC) (GLuint bindingindex, GLuint divisor);
>-#ifdef GL_GLEXT_PROTOTYPES
>+#if GL_GLES_PROTOTYPES
> GL_APICALL void GL_APIENTRY glDispatchCompute (GLuint num_groups_x, GLuint num_groups_y, GLuint num_groups_z);
> GL_APICALL void GL_APIENTRY glDispatchComputeIndirect (GLintptr indirect);
> GL_APICALL void GL_APIENTRY glDrawArraysIndirect (GLenum mode, const void *indirect);
>diff --git a/Source/ThirdParty/ANGLE/include/GLES3/gl31ext_explicit_context_autogen.inc b/Source/ThirdParty/ANGLE/include/GLES3/gl31ext_explicit_context_autogen.inc
>new file mode 100644
>index 00000000000..62db01b3f81
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/include/GLES3/gl31ext_explicit_context_autogen.inc
>@@ -0,0 +1,148 @@
>+// GENERATED FILE - DO NOT EDIT.
>+// Generated by generate_entry_points.py using data from gl.xml and gl_angle_ext.xml.
>+//
>+// Copyright 2019 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// gl31ext_explicit_context_autogen.inc:
>+//   Function declarations for the EGL_ANGLE_explicit_context extension
>+
>+typedef void (GL_APIENTRYP PFNGLACTIVESHADERPROGRAMCONTEXTANGLEPROC)(GLeglContext ctx, GLuint pipeline, GLuint program);
>+typedef void (GL_APIENTRYP PFNGLBINDIMAGETEXTURECONTEXTANGLEPROC)(GLeglContext ctx, GLuint unit, GLuint texture, GLint level, GLboolean layered, GLint layer, GLenum access, GLenum format);
>+typedef void (GL_APIENTRYP PFNGLBINDPROGRAMPIPELINECONTEXTANGLEPROC)(GLeglContext ctx, GLuint pipeline);
>+typedef void (GL_APIENTRYP PFNGLBINDVERTEXBUFFERCONTEXTANGLEPROC)(GLeglContext ctx, GLuint bindingindex, GLuint buffer, GLintptr offset, GLsizei stride);
>+typedef GLuint (GL_APIENTRYP PFNGLCREATESHADERPROGRAMVCONTEXTANGLEPROC)(GLeglContext ctx, GLenum type, GLsizei count, const GLchar *const*strings);
>+typedef void (GL_APIENTRYP PFNGLDELETEPROGRAMPIPELINESCONTEXTANGLEPROC)(GLeglContext ctx, GLsizei n, const GLuint *pipelines);
>+typedef void (GL_APIENTRYP PFNGLDISPATCHCOMPUTECONTEXTANGLEPROC)(GLeglContext ctx, GLuint num_groups_x, GLuint num_groups_y, GLuint num_groups_z);
>+typedef void (GL_APIENTRYP PFNGLDISPATCHCOMPUTEINDIRECTCONTEXTANGLEPROC)(GLeglContext ctx, GLintptr indirect);
>+typedef void (GL_APIENTRYP PFNGLDRAWARRAYSINDIRECTCONTEXTANGLEPROC)(GLeglContext ctx, GLenum mode, const void *indirect);
>+typedef void (GL_APIENTRYP PFNGLDRAWELEMENTSINDIRECTCONTEXTANGLEPROC)(GLeglContext ctx, GLenum mode, GLenum type, const void *indirect);
>+typedef void (GL_APIENTRYP PFNGLFRAMEBUFFERPARAMETERICONTEXTANGLEPROC)(GLeglContext ctx, GLenum target, GLenum pname, GLint param);
>+typedef void (GL_APIENTRYP PFNGLGENPROGRAMPIPELINESCONTEXTANGLEPROC)(GLeglContext ctx, GLsizei n, GLuint *pipelines);
>+typedef void (GL_APIENTRYP PFNGLGETBOOLEANI_VCONTEXTANGLEPROC)(GLeglContext ctx, GLenum target, GLuint index, GLboolean *data);
>+typedef void (GL_APIENTRYP PFNGLGETFRAMEBUFFERPARAMETERIVCONTEXTANGLEPROC)(GLeglContext ctx, GLenum target, GLenum pname, GLint *params);
>+typedef void (GL_APIENTRYP PFNGLGETMULTISAMPLEFVCONTEXTANGLEPROC)(GLeglContext ctx, GLenum pname, GLuint index, GLfloat *val);
>+typedef void (GL_APIENTRYP PFNGLGETPROGRAMINTERFACEIVCONTEXTANGLEPROC)(GLeglContext ctx, GLuint program, GLenum programInterface, GLenum pname, GLint *params);
>+typedef void (GL_APIENTRYP PFNGLGETPROGRAMPIPELINEINFOLOGCONTEXTANGLEPROC)(GLeglContext ctx, GLuint pipeline, GLsizei bufSize, GLsizei *length, GLchar *infoLog);
>+typedef void (GL_APIENTRYP PFNGLGETPROGRAMPIPELINEIVCONTEXTANGLEPROC)(GLeglContext ctx, GLuint pipeline, GLenum pname, GLint *params);
>+typedef GLuint (GL_APIENTRYP PFNGLGETPROGRAMRESOURCEINDEXCONTEXTANGLEPROC)(GLeglContext ctx, GLuint program, GLenum programInterface, const GLchar *name);
>+typedef GLint (GL_APIENTRYP PFNGLGETPROGRAMRESOURCELOCATIONCONTEXTANGLEPROC)(GLeglContext ctx, GLuint program, GLenum programInterface, const GLchar *name);
>+typedef void (GL_APIENTRYP PFNGLGETPROGRAMRESOURCENAMECONTEXTANGLEPROC)(GLeglContext ctx, GLuint program, GLenum programInterface, GLuint index, GLsizei bufSize, GLsizei *length, GLchar *name);
>+typedef void (GL_APIENTRYP PFNGLGETPROGRAMRESOURCEIVCONTEXTANGLEPROC)(GLeglContext ctx, GLuint program, GLenum programInterface, GLuint index, GLsizei propCount, const GLenum *props, GLsizei bufSize, GLsizei *length, GLint *params);
>+typedef void (GL_APIENTRYP PFNGLGETTEXLEVELPARAMETERFVCONTEXTANGLEPROC)(GLeglContext ctx, GLenum target, GLint level, GLenum pname, GLfloat *params);
>+typedef void (GL_APIENTRYP PFNGLGETTEXLEVELPARAMETERIVCONTEXTANGLEPROC)(GLeglContext ctx, GLenum target, GLint level, GLenum pname, GLint *params);
>+typedef GLboolean (GL_APIENTRYP PFNGLISPROGRAMPIPELINECONTEXTANGLEPROC)(GLeglContext ctx, GLuint pipeline);
>+typedef void (GL_APIENTRYP PFNGLMEMORYBARRIERCONTEXTANGLEPROC)(GLeglContext ctx, GLbitfield barriers);
>+typedef void (GL_APIENTRYP PFNGLMEMORYBARRIERBYREGIONCONTEXTANGLEPROC)(GLeglContext ctx, GLbitfield barriers);
>+typedef void (GL_APIENTRYP PFNGLPROGRAMUNIFORM1FCONTEXTANGLEPROC)(GLeglContext ctx, GLuint program, GLint location, GLfloat v0);
>+typedef void (GL_APIENTRYP PFNGLPROGRAMUNIFORM1FVCONTEXTANGLEPROC)(GLeglContext ctx, GLuint program, GLint location, GLsizei count, const GLfloat *value);
>+typedef void (GL_APIENTRYP PFNGLPROGRAMUNIFORM1ICONTEXTANGLEPROC)(GLeglContext ctx, GLuint program, GLint location, GLint v0);
>+typedef void (GL_APIENTRYP PFNGLPROGRAMUNIFORM1IVCONTEXTANGLEPROC)(GLeglContext ctx, GLuint program, GLint location, GLsizei count, const GLint *value);
>+typedef void (GL_APIENTRYP PFNGLPROGRAMUNIFORM1UICONTEXTANGLEPROC)(GLeglContext ctx, GLuint program, GLint location, GLuint v0);
>+typedef void (GL_APIENTRYP PFNGLPROGRAMUNIFORM1UIVCONTEXTANGLEPROC)(GLeglContext ctx, GLuint program, GLint location, GLsizei count, const GLuint *value);
>+typedef void (GL_APIENTRYP PFNGLPROGRAMUNIFORM2FCONTEXTANGLEPROC)(GLeglContext ctx, GLuint program, GLint location, GLfloat v0, GLfloat v1);
>+typedef void (GL_APIENTRYP PFNGLPROGRAMUNIFORM2FVCONTEXTANGLEPROC)(GLeglContext ctx, GLuint program, GLint location, GLsizei count, const GLfloat *value);
>+typedef void (GL_APIENTRYP PFNGLPROGRAMUNIFORM2ICONTEXTANGLEPROC)(GLeglContext ctx, GLuint program, GLint location, GLint v0, GLint v1);
>+typedef void (GL_APIENTRYP PFNGLPROGRAMUNIFORM2IVCONTEXTANGLEPROC)(GLeglContext ctx, GLuint program, GLint location, GLsizei count, const GLint *value);
>+typedef void (GL_APIENTRYP PFNGLPROGRAMUNIFORM2UICONTEXTANGLEPROC)(GLeglContext ctx, GLuint program, GLint location, GLuint v0, GLuint v1);
>+typedef void (GL_APIENTRYP PFNGLPROGRAMUNIFORM2UIVCONTEXTANGLEPROC)(GLeglContext ctx, GLuint program, GLint location, GLsizei count, const GLuint *value);
>+typedef void (GL_APIENTRYP PFNGLPROGRAMUNIFORM3FCONTEXTANGLEPROC)(GLeglContext ctx, GLuint program, GLint location, GLfloat v0, GLfloat v1, GLfloat v2);
>+typedef void (GL_APIENTRYP PFNGLPROGRAMUNIFORM3FVCONTEXTANGLEPROC)(GLeglContext ctx, GLuint program, GLint location, GLsizei count, const GLfloat *value);
>+typedef void (GL_APIENTRYP PFNGLPROGRAMUNIFORM3ICONTEXTANGLEPROC)(GLeglContext ctx, GLuint program, GLint location, GLint v0, GLint v1, GLint v2);
>+typedef void (GL_APIENTRYP PFNGLPROGRAMUNIFORM3IVCONTEXTANGLEPROC)(GLeglContext ctx, GLuint program, GLint location, GLsizei count, const GLint *value);
>+typedef void (GL_APIENTRYP PFNGLPROGRAMUNIFORM3UICONTEXTANGLEPROC)(GLeglContext ctx, GLuint program, GLint location, GLuint v0, GLuint v1, GLuint v2);
>+typedef void (GL_APIENTRYP PFNGLPROGRAMUNIFORM3UIVCONTEXTANGLEPROC)(GLeglContext ctx, GLuint program, GLint location, GLsizei count, const GLuint *value);
>+typedef void (GL_APIENTRYP PFNGLPROGRAMUNIFORM4FCONTEXTANGLEPROC)(GLeglContext ctx, GLuint program, GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3);
>+typedef void (GL_APIENTRYP PFNGLPROGRAMUNIFORM4FVCONTEXTANGLEPROC)(GLeglContext ctx, GLuint program, GLint location, GLsizei count, const GLfloat *value);
>+typedef void (GL_APIENTRYP PFNGLPROGRAMUNIFORM4ICONTEXTANGLEPROC)(GLeglContext ctx, GLuint program, GLint location, GLint v0, GLint v1, GLint v2, GLint v3);
>+typedef void (GL_APIENTRYP PFNGLPROGRAMUNIFORM4IVCONTEXTANGLEPROC)(GLeglContext ctx, GLuint program, GLint location, GLsizei count, const GLint *value);
>+typedef void (GL_APIENTRYP PFNGLPROGRAMUNIFORM4UICONTEXTANGLEPROC)(GLeglContext ctx, GLuint program, GLint location, GLuint v0, GLuint v1, GLuint v2, GLuint v3);
>+typedef void (GL_APIENTRYP PFNGLPROGRAMUNIFORM4UIVCONTEXTANGLEPROC)(GLeglContext ctx, GLuint program, GLint location, GLsizei count, const GLuint *value);
>+typedef void (GL_APIENTRYP PFNGLPROGRAMUNIFORMMATRIX2FVCONTEXTANGLEPROC)(GLeglContext ctx, GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
>+typedef void (GL_APIENTRYP PFNGLPROGRAMUNIFORMMATRIX2X3FVCONTEXTANGLEPROC)(GLeglContext ctx, GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
>+typedef void (GL_APIENTRYP PFNGLPROGRAMUNIFORMMATRIX2X4FVCONTEXTANGLEPROC)(GLeglContext ctx, GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
>+typedef void (GL_APIENTRYP PFNGLPROGRAMUNIFORMMATRIX3FVCONTEXTANGLEPROC)(GLeglContext ctx, GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
>+typedef void (GL_APIENTRYP PFNGLPROGRAMUNIFORMMATRIX3X2FVCONTEXTANGLEPROC)(GLeglContext ctx, GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
>+typedef void (GL_APIENTRYP PFNGLPROGRAMUNIFORMMATRIX3X4FVCONTEXTANGLEPROC)(GLeglContext ctx, GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
>+typedef void (GL_APIENTRYP PFNGLPROGRAMUNIFORMMATRIX4FVCONTEXTANGLEPROC)(GLeglContext ctx, GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
>+typedef void (GL_APIENTRYP PFNGLPROGRAMUNIFORMMATRIX4X2FVCONTEXTANGLEPROC)(GLeglContext ctx, GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
>+typedef void (GL_APIENTRYP PFNGLPROGRAMUNIFORMMATRIX4X3FVCONTEXTANGLEPROC)(GLeglContext ctx, GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
>+typedef void (GL_APIENTRYP PFNGLSAMPLEMASKICONTEXTANGLEPROC)(GLeglContext ctx, GLuint maskNumber, GLbitfield mask);
>+typedef void (GL_APIENTRYP PFNGLTEXSTORAGE2DMULTISAMPLECONTEXTANGLEPROC)(GLeglContext ctx, GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height, GLboolean fixedsamplelocations);
>+typedef void (GL_APIENTRYP PFNGLUSEPROGRAMSTAGESCONTEXTANGLEPROC)(GLeglContext ctx, GLuint pipeline, GLbitfield stages, GLuint program);
>+typedef void (GL_APIENTRYP PFNGLVALIDATEPROGRAMPIPELINECONTEXTANGLEPROC)(GLeglContext ctx, GLuint pipeline);
>+typedef void (GL_APIENTRYP PFNGLVERTEXATTRIBBINDINGCONTEXTANGLEPROC)(GLeglContext ctx, GLuint attribindex, GLuint bindingindex);
>+typedef void (GL_APIENTRYP PFNGLVERTEXATTRIBFORMATCONTEXTANGLEPROC)(GLeglContext ctx, GLuint attribindex, GLint size, GLenum type, GLboolean normalized, GLuint relativeoffset);
>+typedef void (GL_APIENTRYP PFNGLVERTEXATTRIBIFORMATCONTEXTANGLEPROC)(GLeglContext ctx, GLuint attribindex, GLint size, GLenum type, GLuint relativeoffset);
>+typedef void (GL_APIENTRYP PFNGLVERTEXBINDINGDIVISORCONTEXTANGLEPROC)(GLeglContext ctx, GLuint bindingindex, GLuint divisor);
>+#ifdef GL_GLEXT_PROTOTYPES
>+GL_APICALL void GL_APIENTRY glActiveShaderProgramContextANGLE(GLeglContext ctx, GLuint pipeline, GLuint program);
>+GL_APICALL void GL_APIENTRY glBindImageTextureContextANGLE(GLeglContext ctx, GLuint unit, GLuint texture, GLint level, GLboolean layered, GLint layer, GLenum access, GLenum format);
>+GL_APICALL void GL_APIENTRY glBindProgramPipelineContextANGLE(GLeglContext ctx, GLuint pipeline);
>+GL_APICALL void GL_APIENTRY glBindVertexBufferContextANGLE(GLeglContext ctx, GLuint bindingindex, GLuint buffer, GLintptr offset, GLsizei stride);
>+GL_APICALL GLuint GL_APIENTRY glCreateShaderProgramvContextANGLE(GLeglContext ctx, GLenum type, GLsizei count, const GLchar *const*strings);
>+GL_APICALL void GL_APIENTRY glDeleteProgramPipelinesContextANGLE(GLeglContext ctx, GLsizei n, const GLuint *pipelines);
>+GL_APICALL void GL_APIENTRY glDispatchComputeContextANGLE(GLeglContext ctx, GLuint num_groups_x, GLuint num_groups_y, GLuint num_groups_z);
>+GL_APICALL void GL_APIENTRY glDispatchComputeIndirectContextANGLE(GLeglContext ctx, GLintptr indirect);
>+GL_APICALL void GL_APIENTRY glDrawArraysIndirectContextANGLE(GLeglContext ctx, GLenum mode, const void *indirect);
>+GL_APICALL void GL_APIENTRY glDrawElementsIndirectContextANGLE(GLeglContext ctx, GLenum mode, GLenum type, const void *indirect);
>+GL_APICALL void GL_APIENTRY glFramebufferParameteriContextANGLE(GLeglContext ctx, GLenum target, GLenum pname, GLint param);
>+GL_APICALL void GL_APIENTRY glGenProgramPipelinesContextANGLE(GLeglContext ctx, GLsizei n, GLuint *pipelines);
>+GL_APICALL void GL_APIENTRY glGetBooleani_vContextANGLE(GLeglContext ctx, GLenum target, GLuint index, GLboolean *data);
>+GL_APICALL void GL_APIENTRY glGetFramebufferParameterivContextANGLE(GLeglContext ctx, GLenum target, GLenum pname, GLint *params);
>+GL_APICALL void GL_APIENTRY glGetMultisamplefvContextANGLE(GLeglContext ctx, GLenum pname, GLuint index, GLfloat *val);
>+GL_APICALL void GL_APIENTRY glGetProgramInterfaceivContextANGLE(GLeglContext ctx, GLuint program, GLenum programInterface, GLenum pname, GLint *params);
>+GL_APICALL void GL_APIENTRY glGetProgramPipelineInfoLogContextANGLE(GLeglContext ctx, GLuint pipeline, GLsizei bufSize, GLsizei *length, GLchar *infoLog);
>+GL_APICALL void GL_APIENTRY glGetProgramPipelineivContextANGLE(GLeglContext ctx, GLuint pipeline, GLenum pname, GLint *params);
>+GL_APICALL GLuint GL_APIENTRY glGetProgramResourceIndexContextANGLE(GLeglContext ctx, GLuint program, GLenum programInterface, const GLchar *name);
>+GL_APICALL GLint GL_APIENTRY glGetProgramResourceLocationContextANGLE(GLeglContext ctx, GLuint program, GLenum programInterface, const GLchar *name);
>+GL_APICALL void GL_APIENTRY glGetProgramResourceNameContextANGLE(GLeglContext ctx, GLuint program, GLenum programInterface, GLuint index, GLsizei bufSize, GLsizei *length, GLchar *name);
>+GL_APICALL void GL_APIENTRY glGetProgramResourceivContextANGLE(GLeglContext ctx, GLuint program, GLenum programInterface, GLuint index, GLsizei propCount, const GLenum *props, GLsizei bufSize, GLsizei *length, GLint *params);
>+GL_APICALL void GL_APIENTRY glGetTexLevelParameterfvContextANGLE(GLeglContext ctx, GLenum target, GLint level, GLenum pname, GLfloat *params);
>+GL_APICALL void GL_APIENTRY glGetTexLevelParameterivContextANGLE(GLeglContext ctx, GLenum target, GLint level, GLenum pname, GLint *params);
>+GL_APICALL GLboolean GL_APIENTRY glIsProgramPipelineContextANGLE(GLeglContext ctx, GLuint pipeline);
>+GL_APICALL void GL_APIENTRY glMemoryBarrierContextANGLE(GLeglContext ctx, GLbitfield barriers);
>+GL_APICALL void GL_APIENTRY glMemoryBarrierByRegionContextANGLE(GLeglContext ctx, GLbitfield barriers);
>+GL_APICALL void GL_APIENTRY glProgramUniform1fContextANGLE(GLeglContext ctx, GLuint program, GLint location, GLfloat v0);
>+GL_APICALL void GL_APIENTRY glProgramUniform1fvContextANGLE(GLeglContext ctx, GLuint program, GLint location, GLsizei count, const GLfloat *value);
>+GL_APICALL void GL_APIENTRY glProgramUniform1iContextANGLE(GLeglContext ctx, GLuint program, GLint location, GLint v0);
>+GL_APICALL void GL_APIENTRY glProgramUniform1ivContextANGLE(GLeglContext ctx, GLuint program, GLint location, GLsizei count, const GLint *value);
>+GL_APICALL void GL_APIENTRY glProgramUniform1uiContextANGLE(GLeglContext ctx, GLuint program, GLint location, GLuint v0);
>+GL_APICALL void GL_APIENTRY glProgramUniform1uivContextANGLE(GLeglContext ctx, GLuint program, GLint location, GLsizei count, const GLuint *value);
>+GL_APICALL void GL_APIENTRY glProgramUniform2fContextANGLE(GLeglContext ctx, GLuint program, GLint location, GLfloat v0, GLfloat v1);
>+GL_APICALL void GL_APIENTRY glProgramUniform2fvContextANGLE(GLeglContext ctx, GLuint program, GLint location, GLsizei count, const GLfloat *value);
>+GL_APICALL void GL_APIENTRY glProgramUniform2iContextANGLE(GLeglContext ctx, GLuint program, GLint location, GLint v0, GLint v1);
>+GL_APICALL void GL_APIENTRY glProgramUniform2ivContextANGLE(GLeglContext ctx, GLuint program, GLint location, GLsizei count, const GLint *value);
>+GL_APICALL void GL_APIENTRY glProgramUniform2uiContextANGLE(GLeglContext ctx, GLuint program, GLint location, GLuint v0, GLuint v1);
>+GL_APICALL void GL_APIENTRY glProgramUniform2uivContextANGLE(GLeglContext ctx, GLuint program, GLint location, GLsizei count, const GLuint *value);
>+GL_APICALL void GL_APIENTRY glProgramUniform3fContextANGLE(GLeglContext ctx, GLuint program, GLint location, GLfloat v0, GLfloat v1, GLfloat v2);
>+GL_APICALL void GL_APIENTRY glProgramUniform3fvContextANGLE(GLeglContext ctx, GLuint program, GLint location, GLsizei count, const GLfloat *value);
>+GL_APICALL void GL_APIENTRY glProgramUniform3iContextANGLE(GLeglContext ctx, GLuint program, GLint location, GLint v0, GLint v1, GLint v2);
>+GL_APICALL void GL_APIENTRY glProgramUniform3ivContextANGLE(GLeglContext ctx, GLuint program, GLint location, GLsizei count, const GLint *value);
>+GL_APICALL void GL_APIENTRY glProgramUniform3uiContextANGLE(GLeglContext ctx, GLuint program, GLint location, GLuint v0, GLuint v1, GLuint v2);
>+GL_APICALL void GL_APIENTRY glProgramUniform3uivContextANGLE(GLeglContext ctx, GLuint program, GLint location, GLsizei count, const GLuint *value);
>+GL_APICALL void GL_APIENTRY glProgramUniform4fContextANGLE(GLeglContext ctx, GLuint program, GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3);
>+GL_APICALL void GL_APIENTRY glProgramUniform4fvContextANGLE(GLeglContext ctx, GLuint program, GLint location, GLsizei count, const GLfloat *value);
>+GL_APICALL void GL_APIENTRY glProgramUniform4iContextANGLE(GLeglContext ctx, GLuint program, GLint location, GLint v0, GLint v1, GLint v2, GLint v3);
>+GL_APICALL void GL_APIENTRY glProgramUniform4ivContextANGLE(GLeglContext ctx, GLuint program, GLint location, GLsizei count, const GLint *value);
>+GL_APICALL void GL_APIENTRY glProgramUniform4uiContextANGLE(GLeglContext ctx, GLuint program, GLint location, GLuint v0, GLuint v1, GLuint v2, GLuint v3);
>+GL_APICALL void GL_APIENTRY glProgramUniform4uivContextANGLE(GLeglContext ctx, GLuint program, GLint location, GLsizei count, const GLuint *value);
>+GL_APICALL void GL_APIENTRY glProgramUniformMatrix2fvContextANGLE(GLeglContext ctx, GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
>+GL_APICALL void GL_APIENTRY glProgramUniformMatrix2x3fvContextANGLE(GLeglContext ctx, GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
>+GL_APICALL void GL_APIENTRY glProgramUniformMatrix2x4fvContextANGLE(GLeglContext ctx, GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
>+GL_APICALL void GL_APIENTRY glProgramUniformMatrix3fvContextANGLE(GLeglContext ctx, GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
>+GL_APICALL void GL_APIENTRY glProgramUniformMatrix3x2fvContextANGLE(GLeglContext ctx, GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
>+GL_APICALL void GL_APIENTRY glProgramUniformMatrix3x4fvContextANGLE(GLeglContext ctx, GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
>+GL_APICALL void GL_APIENTRY glProgramUniformMatrix4fvContextANGLE(GLeglContext ctx, GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
>+GL_APICALL void GL_APIENTRY glProgramUniformMatrix4x2fvContextANGLE(GLeglContext ctx, GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
>+GL_APICALL void GL_APIENTRY glProgramUniformMatrix4x3fvContextANGLE(GLeglContext ctx, GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
>+GL_APICALL void GL_APIENTRY glSampleMaskiContextANGLE(GLeglContext ctx, GLuint maskNumber, GLbitfield mask);
>+GL_APICALL void GL_APIENTRY glTexStorage2DMultisampleContextANGLE(GLeglContext ctx, GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height, GLboolean fixedsamplelocations);
>+GL_APICALL void GL_APIENTRY glUseProgramStagesContextANGLE(GLeglContext ctx, GLuint pipeline, GLbitfield stages, GLuint program);
>+GL_APICALL void GL_APIENTRY glValidateProgramPipelineContextANGLE(GLeglContext ctx, GLuint pipeline);
>+GL_APICALL void GL_APIENTRY glVertexAttribBindingContextANGLE(GLeglContext ctx, GLuint attribindex, GLuint bindingindex);
>+GL_APICALL void GL_APIENTRY glVertexAttribFormatContextANGLE(GLeglContext ctx, GLuint attribindex, GLint size, GLenum type, GLboolean normalized, GLuint relativeoffset);
>+GL_APICALL void GL_APIENTRY glVertexAttribIFormatContextANGLE(GLeglContext ctx, GLuint attribindex, GLint size, GLenum type, GLuint relativeoffset);
>+GL_APICALL void GL_APIENTRY glVertexBindingDivisorContextANGLE(GLeglContext ctx, GLuint bindingindex, GLuint divisor);
>+#endif
>diff --git a/Source/ThirdParty/ANGLE/include/GLES3/gl32.h b/Source/ThirdParty/ANGLE/include/GLES3/gl32.h
>index 2975a6f4e74..a1af7c6970d 100644
>--- a/Source/ThirdParty/ANGLE/include/GLES3/gl32.h
>+++ b/Source/ThirdParty/ANGLE/include/GLES3/gl32.h
>@@ -6,7 +6,7 @@ extern "C" {
> #endif
> 
> /*
>-** Copyright (c) 2013-2015 The Khronos Group Inc.
>+** Copyright (c) 2013-2016 The Khronos Group Inc.
> **
> ** Permission is hereby granted, free of charge, to any person obtaining a
> ** copy of this software and/or associated documentation files (the
>@@ -42,7 +42,11 @@ extern "C" {
> #define GL_APIENTRYP GL_APIENTRY*
> #endif
> 
>-/* Generated on date 20150809 */
>+#ifndef GL_GLES_PROTOTYPES
>+#define GL_GLES_PROTOTYPES 1
>+#endif
>+
>+/* Generated on date 20161024 */
> 
> /* Generated C header for:
>  * API: gles2
>@@ -520,7 +524,7 @@ typedef void (GL_APIENTRYP PFNGLVERTEXATTRIB4FPROC) (GLuint index, GLfloat x, GL
> typedef void (GL_APIENTRYP PFNGLVERTEXATTRIB4FVPROC) (GLuint index, const GLfloat *v);
> typedef void (GL_APIENTRYP PFNGLVERTEXATTRIBPOINTERPROC) (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const void *pointer);
> typedef void (GL_APIENTRYP PFNGLVIEWPORTPROC) (GLint x, GLint y, GLsizei width, GLsizei height);
>-#ifdef GL_GLEXT_PROTOTYPES
>+#if GL_GLES_PROTOTYPES
> GL_APICALL void GL_APIENTRY glActiveTexture (GLenum texture);
> GL_APICALL void GL_APIENTRY glAttachShader (GLuint program, GLuint shader);
> GL_APICALL void GL_APIENTRY glBindAttribLocation (GLuint program, GLuint index, const GLchar *name);
>@@ -1094,7 +1098,7 @@ typedef void (GL_APIENTRYP PFNGLINVALIDATESUBFRAMEBUFFERPROC) (GLenum target, GL
> typedef void (GL_APIENTRYP PFNGLTEXSTORAGE2DPROC) (GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height);
> typedef void (GL_APIENTRYP PFNGLTEXSTORAGE3DPROC) (GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth);
> typedef void (GL_APIENTRYP PFNGLGETINTERNALFORMATIVPROC) (GLenum target, GLenum internalformat, GLenum pname, GLsizei bufSize, GLint *params);
>-#ifdef GL_GLEXT_PROTOTYPES
>+#if GL_GLES_PROTOTYPES
> GL_APICALL void GL_APIENTRY glReadBuffer (GLenum src);
> GL_APICALL void GL_APIENTRY glDrawRangeElements (GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const void *indices);
> GL_APICALL void GL_APIENTRY glTexImage3D (GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const void *pixels);
>@@ -1445,7 +1449,7 @@ typedef void (GL_APIENTRYP PFNGLVERTEXATTRIBFORMATPROC) (GLuint attribindex, GLi
> typedef void (GL_APIENTRYP PFNGLVERTEXATTRIBIFORMATPROC) (GLuint attribindex, GLint size, GLenum type, GLuint relativeoffset);
> typedef void (GL_APIENTRYP PFNGLVERTEXATTRIBBINDINGPROC) (GLuint attribindex, GLuint bindingindex);
> typedef void (GL_APIENTRYP PFNGLVERTEXBINDINGDIVISORPROC) (GLuint bindingindex, GLuint divisor);
>-#ifdef GL_GLEXT_PROTOTYPES
>+#if GL_GLES_PROTOTYPES
> GL_APICALL void GL_APIENTRY glDispatchCompute (GLuint num_groups_x, GLuint num_groups_y, GLuint num_groups_z);
> GL_APICALL void GL_APIENTRY glDispatchComputeIndirect (GLintptr indirect);
> GL_APICALL void GL_APIENTRY glDrawArraysIndirect (GLenum mode, const void *indirect);
>@@ -1770,7 +1774,7 @@ typedef void (GL_APIENTRYP PFNGLGETSAMPLERPARAMETERIUIVPROC) (GLuint sampler, GL
> typedef void (GL_APIENTRYP PFNGLTEXBUFFERPROC) (GLenum target, GLenum internalformat, GLuint buffer);
> typedef void (GL_APIENTRYP PFNGLTEXBUFFERRANGEPROC) (GLenum target, GLenum internalformat, GLuint buffer, GLintptr offset, GLsizeiptr size);
> typedef void (GL_APIENTRYP PFNGLTEXSTORAGE3DMULTISAMPLEPROC) (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedsamplelocations);
>-#ifdef GL_GLEXT_PROTOTYPES
>+#if GL_GLES_PROTOTYPES
> GL_APICALL void GL_APIENTRY glBlendBarrier (void);
> GL_APICALL void GL_APIENTRY glCopyImageSubData (GLuint srcName, GLenum srcTarget, GLint srcLevel, GLint srcX, GLint srcY, GLint srcZ, GLuint dstName, GLenum dstTarget, GLint dstLevel, GLint dstX, GLint dstY, GLint dstZ, GLsizei srcWidth, GLsizei srcHeight, GLsizei srcDepth);
> GL_APICALL void GL_APIENTRY glDebugMessageControl (GLenum source, GLenum type, GLenum severity, GLsizei count, const GLuint *ids, GLboolean enabled);
>diff --git a/Source/ThirdParty/ANGLE/include/GLES3/gl3ext_explicit_context_autogen.inc b/Source/ThirdParty/ANGLE/include/GLES3/gl3ext_explicit_context_autogen.inc
>new file mode 100644
>index 00000000000..1e765792712
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/include/GLES3/gl3ext_explicit_context_autogen.inc
>@@ -0,0 +1,220 @@
>+// GENERATED FILE - DO NOT EDIT.
>+// Generated by generate_entry_points.py using data from gl.xml and gl_angle_ext.xml.
>+//
>+// Copyright 2019 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// gl3ext_explicit_context_autogen.inc:
>+//   Function declarations for the EGL_ANGLE_explicit_context extension
>+
>+typedef void (GL_APIENTRYP PFNGLBEGINQUERYCONTEXTANGLEPROC)(GLeglContext ctx, GLenum target, GLuint id);
>+typedef void (GL_APIENTRYP PFNGLBEGINTRANSFORMFEEDBACKCONTEXTANGLEPROC)(GLeglContext ctx, GLenum primitiveMode);
>+typedef void (GL_APIENTRYP PFNGLBINDBUFFERBASECONTEXTANGLEPROC)(GLeglContext ctx, GLenum target, GLuint index, GLuint buffer);
>+typedef void (GL_APIENTRYP PFNGLBINDBUFFERRANGECONTEXTANGLEPROC)(GLeglContext ctx, GLenum target, GLuint index, GLuint buffer, GLintptr offset, GLsizeiptr size);
>+typedef void (GL_APIENTRYP PFNGLBINDSAMPLERCONTEXTANGLEPROC)(GLeglContext ctx, GLuint unit, GLuint sampler);
>+typedef void (GL_APIENTRYP PFNGLBINDTRANSFORMFEEDBACKCONTEXTANGLEPROC)(GLeglContext ctx, GLenum target, GLuint id);
>+typedef void (GL_APIENTRYP PFNGLBINDVERTEXARRAYCONTEXTANGLEPROC)(GLeglContext ctx, GLuint array);
>+typedef void (GL_APIENTRYP PFNGLBLITFRAMEBUFFERCONTEXTANGLEPROC)(GLeglContext ctx, GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter);
>+typedef void (GL_APIENTRYP PFNGLCLEARBUFFERFICONTEXTANGLEPROC)(GLeglContext ctx, GLenum buffer, GLint drawbuffer, GLfloat depth, GLint stencil);
>+typedef void (GL_APIENTRYP PFNGLCLEARBUFFERFVCONTEXTANGLEPROC)(GLeglContext ctx, GLenum buffer, GLint drawbuffer, const GLfloat *value);
>+typedef void (GL_APIENTRYP PFNGLCLEARBUFFERIVCONTEXTANGLEPROC)(GLeglContext ctx, GLenum buffer, GLint drawbuffer, const GLint *value);
>+typedef void (GL_APIENTRYP PFNGLCLEARBUFFERUIVCONTEXTANGLEPROC)(GLeglContext ctx, GLenum buffer, GLint drawbuffer, const GLuint *value);
>+typedef GLenum (GL_APIENTRYP PFNGLCLIENTWAITSYNCCONTEXTANGLEPROC)(GLeglContext ctx, GLsync sync, GLbitfield flags, GLuint64 timeout);
>+typedef void (GL_APIENTRYP PFNGLCOMPRESSEDTEXIMAGE3DCONTEXTANGLEPROC)(GLeglContext ctx, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const void *data);
>+typedef void (GL_APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE3DCONTEXTANGLEPROC)(GLeglContext ctx, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const void *data);
>+typedef void (GL_APIENTRYP PFNGLCOPYBUFFERSUBDATACONTEXTANGLEPROC)(GLeglContext ctx, GLenum readTarget, GLenum writeTarget, GLintptr readOffset, GLintptr writeOffset, GLsizeiptr size);
>+typedef void (GL_APIENTRYP PFNGLCOPYTEXSUBIMAGE3DCONTEXTANGLEPROC)(GLeglContext ctx, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height);
>+typedef void (GL_APIENTRYP PFNGLDELETEQUERIESCONTEXTANGLEPROC)(GLeglContext ctx, GLsizei n, const GLuint *ids);
>+typedef void (GL_APIENTRYP PFNGLDELETESAMPLERSCONTEXTANGLEPROC)(GLeglContext ctx, GLsizei count, const GLuint *samplers);
>+typedef void (GL_APIENTRYP PFNGLDELETESYNCCONTEXTANGLEPROC)(GLeglContext ctx, GLsync sync);
>+typedef void (GL_APIENTRYP PFNGLDELETETRANSFORMFEEDBACKSCONTEXTANGLEPROC)(GLeglContext ctx, GLsizei n, const GLuint *ids);
>+typedef void (GL_APIENTRYP PFNGLDELETEVERTEXARRAYSCONTEXTANGLEPROC)(GLeglContext ctx, GLsizei n, const GLuint *arrays);
>+typedef void (GL_APIENTRYP PFNGLDRAWARRAYSINSTANCEDCONTEXTANGLEPROC)(GLeglContext ctx, GLenum mode, GLint first, GLsizei count, GLsizei instancecount);
>+typedef void (GL_APIENTRYP PFNGLDRAWBUFFERSCONTEXTANGLEPROC)(GLeglContext ctx, GLsizei n, const GLenum *bufs);
>+typedef void (GL_APIENTRYP PFNGLDRAWELEMENTSINSTANCEDCONTEXTANGLEPROC)(GLeglContext ctx, GLenum mode, GLsizei count, GLenum type, const void *indices, GLsizei instancecount);
>+typedef void (GL_APIENTRYP PFNGLDRAWRANGEELEMENTSCONTEXTANGLEPROC)(GLeglContext ctx, GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const void *indices);
>+typedef void (GL_APIENTRYP PFNGLENDQUERYCONTEXTANGLEPROC)(GLeglContext ctx, GLenum target);
>+typedef void (GL_APIENTRYP PFNGLENDTRANSFORMFEEDBACKCONTEXTANGLEPROC)(GLeglContext ctx);
>+typedef GLsync (GL_APIENTRYP PFNGLFENCESYNCCONTEXTANGLEPROC)(GLeglContext ctx, GLenum condition, GLbitfield flags);
>+typedef void (GL_APIENTRYP PFNGLFLUSHMAPPEDBUFFERRANGECONTEXTANGLEPROC)(GLeglContext ctx, GLenum target, GLintptr offset, GLsizeiptr length);
>+typedef void (GL_APIENTRYP PFNGLFRAMEBUFFERTEXTURELAYERCONTEXTANGLEPROC)(GLeglContext ctx, GLenum target, GLenum attachment, GLuint texture, GLint level, GLint layer);
>+typedef void (GL_APIENTRYP PFNGLGENQUERIESCONTEXTANGLEPROC)(GLeglContext ctx, GLsizei n, GLuint *ids);
>+typedef void (GL_APIENTRYP PFNGLGENSAMPLERSCONTEXTANGLEPROC)(GLeglContext ctx, GLsizei count, GLuint *samplers);
>+typedef void (GL_APIENTRYP PFNGLGENTRANSFORMFEEDBACKSCONTEXTANGLEPROC)(GLeglContext ctx, GLsizei n, GLuint *ids);
>+typedef void (GL_APIENTRYP PFNGLGENVERTEXARRAYSCONTEXTANGLEPROC)(GLeglContext ctx, GLsizei n, GLuint *arrays);
>+typedef void (GL_APIENTRYP PFNGLGETACTIVEUNIFORMBLOCKNAMECONTEXTANGLEPROC)(GLeglContext ctx, GLuint program, GLuint uniformBlockIndex, GLsizei bufSize, GLsizei *length, GLchar *uniformBlockName);
>+typedef void (GL_APIENTRYP PFNGLGETACTIVEUNIFORMBLOCKIVCONTEXTANGLEPROC)(GLeglContext ctx, GLuint program, GLuint uniformBlockIndex, GLenum pname, GLint *params);
>+typedef void (GL_APIENTRYP PFNGLGETACTIVEUNIFORMSIVCONTEXTANGLEPROC)(GLeglContext ctx, GLuint program, GLsizei uniformCount, const GLuint *uniformIndices, GLenum pname, GLint *params);
>+typedef void (GL_APIENTRYP PFNGLGETBUFFERPARAMETERI64VCONTEXTANGLEPROC)(GLeglContext ctx, GLenum target, GLenum pname, GLint64 *params);
>+typedef void (GL_APIENTRYP PFNGLGETBUFFERPOINTERVCONTEXTANGLEPROC)(GLeglContext ctx, GLenum target, GLenum pname, void **params);
>+typedef GLint (GL_APIENTRYP PFNGLGETFRAGDATALOCATIONCONTEXTANGLEPROC)(GLeglContext ctx, GLuint program, const GLchar *name);
>+typedef void (GL_APIENTRYP PFNGLGETINTEGER64I_VCONTEXTANGLEPROC)(GLeglContext ctx, GLenum target, GLuint index, GLint64 *data);
>+typedef void (GL_APIENTRYP PFNGLGETINTEGER64VCONTEXTANGLEPROC)(GLeglContext ctx, GLenum pname, GLint64 *data);
>+typedef void (GL_APIENTRYP PFNGLGETINTEGERI_VCONTEXTANGLEPROC)(GLeglContext ctx, GLenum target, GLuint index, GLint *data);
>+typedef void (GL_APIENTRYP PFNGLGETINTERNALFORMATIVCONTEXTANGLEPROC)(GLeglContext ctx, GLenum target, GLenum internalformat, GLenum pname, GLsizei bufSize, GLint *params);
>+typedef void (GL_APIENTRYP PFNGLGETPROGRAMBINARYCONTEXTANGLEPROC)(GLeglContext ctx, GLuint program, GLsizei bufSize, GLsizei *length, GLenum *binaryFormat, void *binary);
>+typedef void (GL_APIENTRYP PFNGLGETQUERYOBJECTUIVCONTEXTANGLEPROC)(GLeglContext ctx, GLuint id, GLenum pname, GLuint *params);
>+typedef void (GL_APIENTRYP PFNGLGETQUERYIVCONTEXTANGLEPROC)(GLeglContext ctx, GLenum target, GLenum pname, GLint *params);
>+typedef void (GL_APIENTRYP PFNGLGETSAMPLERPARAMETERFVCONTEXTANGLEPROC)(GLeglContext ctx, GLuint sampler, GLenum pname, GLfloat *params);
>+typedef void (GL_APIENTRYP PFNGLGETSAMPLERPARAMETERIVCONTEXTANGLEPROC)(GLeglContext ctx, GLuint sampler, GLenum pname, GLint *params);
>+typedef const GLubyte *(GL_APIENTRYP PFNGLGETSTRINGICONTEXTANGLEPROC)(GLeglContext ctx, GLenum name, GLuint index);
>+typedef void (GL_APIENTRYP PFNGLGETSYNCIVCONTEXTANGLEPROC)(GLeglContext ctx, GLsync sync, GLenum pname, GLsizei bufSize, GLsizei *length, GLint *values);
>+typedef void (GL_APIENTRYP PFNGLGETTRANSFORMFEEDBACKVARYINGCONTEXTANGLEPROC)(GLeglContext ctx, GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLsizei *size, GLenum *type, GLchar *name);
>+typedef GLuint (GL_APIENTRYP PFNGLGETUNIFORMBLOCKINDEXCONTEXTANGLEPROC)(GLeglContext ctx, GLuint program, const GLchar *uniformBlockName);
>+typedef void (GL_APIENTRYP PFNGLGETUNIFORMINDICESCONTEXTANGLEPROC)(GLeglContext ctx, GLuint program, GLsizei uniformCount, const GLchar *const*uniformNames, GLuint *uniformIndices);
>+typedef void (GL_APIENTRYP PFNGLGETUNIFORMUIVCONTEXTANGLEPROC)(GLeglContext ctx, GLuint program, GLint location, GLuint *params);
>+typedef void (GL_APIENTRYP PFNGLGETVERTEXATTRIBIIVCONTEXTANGLEPROC)(GLeglContext ctx, GLuint index, GLenum pname, GLint *params);
>+typedef void (GL_APIENTRYP PFNGLGETVERTEXATTRIBIUIVCONTEXTANGLEPROC)(GLeglContext ctx, GLuint index, GLenum pname, GLuint *params);
>+typedef void (GL_APIENTRYP PFNGLINVALIDATEFRAMEBUFFERCONTEXTANGLEPROC)(GLeglContext ctx, GLenum target, GLsizei numAttachments, const GLenum *attachments);
>+typedef void (GL_APIENTRYP PFNGLINVALIDATESUBFRAMEBUFFERCONTEXTANGLEPROC)(GLeglContext ctx, GLenum target, GLsizei numAttachments, const GLenum *attachments, GLint x, GLint y, GLsizei width, GLsizei height);
>+typedef GLboolean (GL_APIENTRYP PFNGLISQUERYCONTEXTANGLEPROC)(GLeglContext ctx, GLuint id);
>+typedef GLboolean (GL_APIENTRYP PFNGLISSAMPLERCONTEXTANGLEPROC)(GLeglContext ctx, GLuint sampler);
>+typedef GLboolean (GL_APIENTRYP PFNGLISSYNCCONTEXTANGLEPROC)(GLeglContext ctx, GLsync sync);
>+typedef GLboolean (GL_APIENTRYP PFNGLISTRANSFORMFEEDBACKCONTEXTANGLEPROC)(GLeglContext ctx, GLuint id);
>+typedef GLboolean (GL_APIENTRYP PFNGLISVERTEXARRAYCONTEXTANGLEPROC)(GLeglContext ctx, GLuint array);
>+typedef void *(GL_APIENTRYP PFNGLMAPBUFFERRANGECONTEXTANGLEPROC)(GLeglContext ctx, GLenum target, GLintptr offset, GLsizeiptr length, GLbitfield access);
>+typedef void (GL_APIENTRYP PFNGLPAUSETRANSFORMFEEDBACKCONTEXTANGLEPROC)(GLeglContext ctx);
>+typedef void (GL_APIENTRYP PFNGLPROGRAMBINARYCONTEXTANGLEPROC)(GLeglContext ctx, GLuint program, GLenum binaryFormat, const void *binary, GLsizei length);
>+typedef void (GL_APIENTRYP PFNGLPROGRAMPARAMETERICONTEXTANGLEPROC)(GLeglContext ctx, GLuint program, GLenum pname, GLint value);
>+typedef void (GL_APIENTRYP PFNGLREADBUFFERCONTEXTANGLEPROC)(GLeglContext ctx, GLenum src);
>+typedef void (GL_APIENTRYP PFNGLRENDERBUFFERSTORAGEMULTISAMPLECONTEXTANGLEPROC)(GLeglContext ctx, GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height);
>+typedef void (GL_APIENTRYP PFNGLRESUMETRANSFORMFEEDBACKCONTEXTANGLEPROC)(GLeglContext ctx);
>+typedef void (GL_APIENTRYP PFNGLSAMPLERPARAMETERFCONTEXTANGLEPROC)(GLeglContext ctx, GLuint sampler, GLenum pname, GLfloat param);
>+typedef void (GL_APIENTRYP PFNGLSAMPLERPARAMETERFVCONTEXTANGLEPROC)(GLeglContext ctx, GLuint sampler, GLenum pname, const GLfloat *param);
>+typedef void (GL_APIENTRYP PFNGLSAMPLERPARAMETERICONTEXTANGLEPROC)(GLeglContext ctx, GLuint sampler, GLenum pname, GLint param);
>+typedef void (GL_APIENTRYP PFNGLSAMPLERPARAMETERIVCONTEXTANGLEPROC)(GLeglContext ctx, GLuint sampler, GLenum pname, const GLint *param);
>+typedef void (GL_APIENTRYP PFNGLTEXIMAGE3DCONTEXTANGLEPROC)(GLeglContext ctx, GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const void *pixels);
>+typedef void (GL_APIENTRYP PFNGLTEXSTORAGE2DCONTEXTANGLEPROC)(GLeglContext ctx, GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height);
>+typedef void (GL_APIENTRYP PFNGLTEXSTORAGE3DCONTEXTANGLEPROC)(GLeglContext ctx, GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth);
>+typedef void (GL_APIENTRYP PFNGLTEXSUBIMAGE3DCONTEXTANGLEPROC)(GLeglContext ctx, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const void *pixels);
>+typedef void (GL_APIENTRYP PFNGLTRANSFORMFEEDBACKVARYINGSCONTEXTANGLEPROC)(GLeglContext ctx, GLuint program, GLsizei count, const GLchar *const*varyings, GLenum bufferMode);
>+typedef void (GL_APIENTRYP PFNGLUNIFORM1UICONTEXTANGLEPROC)(GLeglContext ctx, GLint location, GLuint v0);
>+typedef void (GL_APIENTRYP PFNGLUNIFORM1UIVCONTEXTANGLEPROC)(GLeglContext ctx, GLint location, GLsizei count, const GLuint *value);
>+typedef void (GL_APIENTRYP PFNGLUNIFORM2UICONTEXTANGLEPROC)(GLeglContext ctx, GLint location, GLuint v0, GLuint v1);
>+typedef void (GL_APIENTRYP PFNGLUNIFORM2UIVCONTEXTANGLEPROC)(GLeglContext ctx, GLint location, GLsizei count, const GLuint *value);
>+typedef void (GL_APIENTRYP PFNGLUNIFORM3UICONTEXTANGLEPROC)(GLeglContext ctx, GLint location, GLuint v0, GLuint v1, GLuint v2);
>+typedef void (GL_APIENTRYP PFNGLUNIFORM3UIVCONTEXTANGLEPROC)(GLeglContext ctx, GLint location, GLsizei count, const GLuint *value);
>+typedef void (GL_APIENTRYP PFNGLUNIFORM4UICONTEXTANGLEPROC)(GLeglContext ctx, GLint location, GLuint v0, GLuint v1, GLuint v2, GLuint v3);
>+typedef void (GL_APIENTRYP PFNGLUNIFORM4UIVCONTEXTANGLEPROC)(GLeglContext ctx, GLint location, GLsizei count, const GLuint *value);
>+typedef void (GL_APIENTRYP PFNGLUNIFORMBLOCKBINDINGCONTEXTANGLEPROC)(GLeglContext ctx, GLuint program, GLuint uniformBlockIndex, GLuint uniformBlockBinding);
>+typedef void (GL_APIENTRYP PFNGLUNIFORMMATRIX2X3FVCONTEXTANGLEPROC)(GLeglContext ctx, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
>+typedef void (GL_APIENTRYP PFNGLUNIFORMMATRIX2X4FVCONTEXTANGLEPROC)(GLeglContext ctx, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
>+typedef void (GL_APIENTRYP PFNGLUNIFORMMATRIX3X2FVCONTEXTANGLEPROC)(GLeglContext ctx, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
>+typedef void (GL_APIENTRYP PFNGLUNIFORMMATRIX3X4FVCONTEXTANGLEPROC)(GLeglContext ctx, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
>+typedef void (GL_APIENTRYP PFNGLUNIFORMMATRIX4X2FVCONTEXTANGLEPROC)(GLeglContext ctx, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
>+typedef void (GL_APIENTRYP PFNGLUNIFORMMATRIX4X3FVCONTEXTANGLEPROC)(GLeglContext ctx, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
>+typedef GLboolean (GL_APIENTRYP PFNGLUNMAPBUFFERCONTEXTANGLEPROC)(GLeglContext ctx, GLenum target);
>+typedef void (GL_APIENTRYP PFNGLVERTEXATTRIBDIVISORCONTEXTANGLEPROC)(GLeglContext ctx, GLuint index, GLuint divisor);
>+typedef void (GL_APIENTRYP PFNGLVERTEXATTRIBI4ICONTEXTANGLEPROC)(GLeglContext ctx, GLuint index, GLint x, GLint y, GLint z, GLint w);
>+typedef void (GL_APIENTRYP PFNGLVERTEXATTRIBI4IVCONTEXTANGLEPROC)(GLeglContext ctx, GLuint index, const GLint *v);
>+typedef void (GL_APIENTRYP PFNGLVERTEXATTRIBI4UICONTEXTANGLEPROC)(GLeglContext ctx, GLuint index, GLuint x, GLuint y, GLuint z, GLuint w);
>+typedef void (GL_APIENTRYP PFNGLVERTEXATTRIBI4UIVCONTEXTANGLEPROC)(GLeglContext ctx, GLuint index, const GLuint *v);
>+typedef void (GL_APIENTRYP PFNGLVERTEXATTRIBIPOINTERCONTEXTANGLEPROC)(GLeglContext ctx, GLuint index, GLint size, GLenum type, GLsizei stride, const void *pointer);
>+typedef void (GL_APIENTRYP PFNGLWAITSYNCCONTEXTANGLEPROC)(GLeglContext ctx, GLsync sync, GLbitfield flags, GLuint64 timeout);
>+#ifdef GL_GLEXT_PROTOTYPES
>+GL_APICALL void GL_APIENTRY glBeginQueryContextANGLE(GLeglContext ctx, GLenum target, GLuint id);
>+GL_APICALL void GL_APIENTRY glBeginTransformFeedbackContextANGLE(GLeglContext ctx, GLenum primitiveMode);
>+GL_APICALL void GL_APIENTRY glBindBufferBaseContextANGLE(GLeglContext ctx, GLenum target, GLuint index, GLuint buffer);
>+GL_APICALL void GL_APIENTRY glBindBufferRangeContextANGLE(GLeglContext ctx, GLenum target, GLuint index, GLuint buffer, GLintptr offset, GLsizeiptr size);
>+GL_APICALL void GL_APIENTRY glBindSamplerContextANGLE(GLeglContext ctx, GLuint unit, GLuint sampler);
>+GL_APICALL void GL_APIENTRY glBindTransformFeedbackContextANGLE(GLeglContext ctx, GLenum target, GLuint id);
>+GL_APICALL void GL_APIENTRY glBindVertexArrayContextANGLE(GLeglContext ctx, GLuint array);
>+GL_APICALL void GL_APIENTRY glBlitFramebufferContextANGLE(GLeglContext ctx, GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter);
>+GL_APICALL void GL_APIENTRY glClearBufferfiContextANGLE(GLeglContext ctx, GLenum buffer, GLint drawbuffer, GLfloat depth, GLint stencil);
>+GL_APICALL void GL_APIENTRY glClearBufferfvContextANGLE(GLeglContext ctx, GLenum buffer, GLint drawbuffer, const GLfloat *value);
>+GL_APICALL void GL_APIENTRY glClearBufferivContextANGLE(GLeglContext ctx, GLenum buffer, GLint drawbuffer, const GLint *value);
>+GL_APICALL void GL_APIENTRY glClearBufferuivContextANGLE(GLeglContext ctx, GLenum buffer, GLint drawbuffer, const GLuint *value);
>+GL_APICALL GLenum GL_APIENTRY glClientWaitSyncContextANGLE(GLeglContext ctx, GLsync sync, GLbitfield flags, GLuint64 timeout);
>+GL_APICALL void GL_APIENTRY glCompressedTexImage3DContextANGLE(GLeglContext ctx, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const void *data);
>+GL_APICALL void GL_APIENTRY glCompressedTexSubImage3DContextANGLE(GLeglContext ctx, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const void *data);
>+GL_APICALL void GL_APIENTRY glCopyBufferSubDataContextANGLE(GLeglContext ctx, GLenum readTarget, GLenum writeTarget, GLintptr readOffset, GLintptr writeOffset, GLsizeiptr size);
>+GL_APICALL void GL_APIENTRY glCopyTexSubImage3DContextANGLE(GLeglContext ctx, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height);
>+GL_APICALL void GL_APIENTRY glDeleteQueriesContextANGLE(GLeglContext ctx, GLsizei n, const GLuint *ids);
>+GL_APICALL void GL_APIENTRY glDeleteSamplersContextANGLE(GLeglContext ctx, GLsizei count, const GLuint *samplers);
>+GL_APICALL void GL_APIENTRY glDeleteSyncContextANGLE(GLeglContext ctx, GLsync sync);
>+GL_APICALL void GL_APIENTRY glDeleteTransformFeedbacksContextANGLE(GLeglContext ctx, GLsizei n, const GLuint *ids);
>+GL_APICALL void GL_APIENTRY glDeleteVertexArraysContextANGLE(GLeglContext ctx, GLsizei n, const GLuint *arrays);
>+GL_APICALL void GL_APIENTRY glDrawArraysInstancedContextANGLE(GLeglContext ctx, GLenum mode, GLint first, GLsizei count, GLsizei instancecount);
>+GL_APICALL void GL_APIENTRY glDrawBuffersContextANGLE(GLeglContext ctx, GLsizei n, const GLenum *bufs);
>+GL_APICALL void GL_APIENTRY glDrawElementsInstancedContextANGLE(GLeglContext ctx, GLenum mode, GLsizei count, GLenum type, const void *indices, GLsizei instancecount);
>+GL_APICALL void GL_APIENTRY glDrawRangeElementsContextANGLE(GLeglContext ctx, GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const void *indices);
>+GL_APICALL void GL_APIENTRY glEndQueryContextANGLE(GLeglContext ctx, GLenum target);
>+GL_APICALL void GL_APIENTRY glEndTransformFeedbackContextANGLE(GLeglContext ctx);
>+GL_APICALL GLsync GL_APIENTRY glFenceSyncContextANGLE(GLeglContext ctx, GLenum condition, GLbitfield flags);
>+GL_APICALL void GL_APIENTRY glFlushMappedBufferRangeContextANGLE(GLeglContext ctx, GLenum target, GLintptr offset, GLsizeiptr length);
>+GL_APICALL void GL_APIENTRY glFramebufferTextureLayerContextANGLE(GLeglContext ctx, GLenum target, GLenum attachment, GLuint texture, GLint level, GLint layer);
>+GL_APICALL void GL_APIENTRY glGenQueriesContextANGLE(GLeglContext ctx, GLsizei n, GLuint *ids);
>+GL_APICALL void GL_APIENTRY glGenSamplersContextANGLE(GLeglContext ctx, GLsizei count, GLuint *samplers);
>+GL_APICALL void GL_APIENTRY glGenTransformFeedbacksContextANGLE(GLeglContext ctx, GLsizei n, GLuint *ids);
>+GL_APICALL void GL_APIENTRY glGenVertexArraysContextANGLE(GLeglContext ctx, GLsizei n, GLuint *arrays);
>+GL_APICALL void GL_APIENTRY glGetActiveUniformBlockNameContextANGLE(GLeglContext ctx, GLuint program, GLuint uniformBlockIndex, GLsizei bufSize, GLsizei *length, GLchar *uniformBlockName);
>+GL_APICALL void GL_APIENTRY glGetActiveUniformBlockivContextANGLE(GLeglContext ctx, GLuint program, GLuint uniformBlockIndex, GLenum pname, GLint *params);
>+GL_APICALL void GL_APIENTRY glGetActiveUniformsivContextANGLE(GLeglContext ctx, GLuint program, GLsizei uniformCount, const GLuint *uniformIndices, GLenum pname, GLint *params);
>+GL_APICALL void GL_APIENTRY glGetBufferParameteri64vContextANGLE(GLeglContext ctx, GLenum target, GLenum pname, GLint64 *params);
>+GL_APICALL void GL_APIENTRY glGetBufferPointervContextANGLE(GLeglContext ctx, GLenum target, GLenum pname, void **params);
>+GL_APICALL GLint GL_APIENTRY glGetFragDataLocationContextANGLE(GLeglContext ctx, GLuint program, const GLchar *name);
>+GL_APICALL void GL_APIENTRY glGetInteger64i_vContextANGLE(GLeglContext ctx, GLenum target, GLuint index, GLint64 *data);
>+GL_APICALL void GL_APIENTRY glGetInteger64vContextANGLE(GLeglContext ctx, GLenum pname, GLint64 *data);
>+GL_APICALL void GL_APIENTRY glGetIntegeri_vContextANGLE(GLeglContext ctx, GLenum target, GLuint index, GLint *data);
>+GL_APICALL void GL_APIENTRY glGetInternalformativContextANGLE(GLeglContext ctx, GLenum target, GLenum internalformat, GLenum pname, GLsizei bufSize, GLint *params);
>+GL_APICALL void GL_APIENTRY glGetProgramBinaryContextANGLE(GLeglContext ctx, GLuint program, GLsizei bufSize, GLsizei *length, GLenum *binaryFormat, void *binary);
>+GL_APICALL void GL_APIENTRY glGetQueryObjectuivContextANGLE(GLeglContext ctx, GLuint id, GLenum pname, GLuint *params);
>+GL_APICALL void GL_APIENTRY glGetQueryivContextANGLE(GLeglContext ctx, GLenum target, GLenum pname, GLint *params);
>+GL_APICALL void GL_APIENTRY glGetSamplerParameterfvContextANGLE(GLeglContext ctx, GLuint sampler, GLenum pname, GLfloat *params);
>+GL_APICALL void GL_APIENTRY glGetSamplerParameterivContextANGLE(GLeglContext ctx, GLuint sampler, GLenum pname, GLint *params);
>+GL_APICALL const GLubyte *GL_APIENTRY glGetStringiContextANGLE(GLeglContext ctx, GLenum name, GLuint index);
>+GL_APICALL void GL_APIENTRY glGetSyncivContextANGLE(GLeglContext ctx, GLsync sync, GLenum pname, GLsizei bufSize, GLsizei *length, GLint *values);
>+GL_APICALL void GL_APIENTRY glGetTransformFeedbackVaryingContextANGLE(GLeglContext ctx, GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLsizei *size, GLenum *type, GLchar *name);
>+GL_APICALL GLuint GL_APIENTRY glGetUniformBlockIndexContextANGLE(GLeglContext ctx, GLuint program, const GLchar *uniformBlockName);
>+GL_APICALL void GL_APIENTRY glGetUniformIndicesContextANGLE(GLeglContext ctx, GLuint program, GLsizei uniformCount, const GLchar *const*uniformNames, GLuint *uniformIndices);
>+GL_APICALL void GL_APIENTRY glGetUniformuivContextANGLE(GLeglContext ctx, GLuint program, GLint location, GLuint *params);
>+GL_APICALL void GL_APIENTRY glGetVertexAttribIivContextANGLE(GLeglContext ctx, GLuint index, GLenum pname, GLint *params);
>+GL_APICALL void GL_APIENTRY glGetVertexAttribIuivContextANGLE(GLeglContext ctx, GLuint index, GLenum pname, GLuint *params);
>+GL_APICALL void GL_APIENTRY glInvalidateFramebufferContextANGLE(GLeglContext ctx, GLenum target, GLsizei numAttachments, const GLenum *attachments);
>+GL_APICALL void GL_APIENTRY glInvalidateSubFramebufferContextANGLE(GLeglContext ctx, GLenum target, GLsizei numAttachments, const GLenum *attachments, GLint x, GLint y, GLsizei width, GLsizei height);
>+GL_APICALL GLboolean GL_APIENTRY glIsQueryContextANGLE(GLeglContext ctx, GLuint id);
>+GL_APICALL GLboolean GL_APIENTRY glIsSamplerContextANGLE(GLeglContext ctx, GLuint sampler);
>+GL_APICALL GLboolean GL_APIENTRY glIsSyncContextANGLE(GLeglContext ctx, GLsync sync);
>+GL_APICALL GLboolean GL_APIENTRY glIsTransformFeedbackContextANGLE(GLeglContext ctx, GLuint id);
>+GL_APICALL GLboolean GL_APIENTRY glIsVertexArrayContextANGLE(GLeglContext ctx, GLuint array);
>+GL_APICALL void *GL_APIENTRY glMapBufferRangeContextANGLE(GLeglContext ctx, GLenum target, GLintptr offset, GLsizeiptr length, GLbitfield access);
>+GL_APICALL void GL_APIENTRY glPauseTransformFeedbackContextANGLE(GLeglContext ctx);
>+GL_APICALL void GL_APIENTRY glProgramBinaryContextANGLE(GLeglContext ctx, GLuint program, GLenum binaryFormat, const void *binary, GLsizei length);
>+GL_APICALL void GL_APIENTRY glProgramParameteriContextANGLE(GLeglContext ctx, GLuint program, GLenum pname, GLint value);
>+GL_APICALL void GL_APIENTRY glReadBufferContextANGLE(GLeglContext ctx, GLenum src);
>+GL_APICALL void GL_APIENTRY glRenderbufferStorageMultisampleContextANGLE(GLeglContext ctx, GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height);
>+GL_APICALL void GL_APIENTRY glResumeTransformFeedbackContextANGLE(GLeglContext ctx);
>+GL_APICALL void GL_APIENTRY glSamplerParameterfContextANGLE(GLeglContext ctx, GLuint sampler, GLenum pname, GLfloat param);
>+GL_APICALL void GL_APIENTRY glSamplerParameterfvContextANGLE(GLeglContext ctx, GLuint sampler, GLenum pname, const GLfloat *param);
>+GL_APICALL void GL_APIENTRY glSamplerParameteriContextANGLE(GLeglContext ctx, GLuint sampler, GLenum pname, GLint param);
>+GL_APICALL void GL_APIENTRY glSamplerParameterivContextANGLE(GLeglContext ctx, GLuint sampler, GLenum pname, const GLint *param);
>+GL_APICALL void GL_APIENTRY glTexImage3DContextANGLE(GLeglContext ctx, GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const void *pixels);
>+GL_APICALL void GL_APIENTRY glTexStorage2DContextANGLE(GLeglContext ctx, GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height);
>+GL_APICALL void GL_APIENTRY glTexStorage3DContextANGLE(GLeglContext ctx, GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth);
>+GL_APICALL void GL_APIENTRY glTexSubImage3DContextANGLE(GLeglContext ctx, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const void *pixels);
>+GL_APICALL void GL_APIENTRY glTransformFeedbackVaryingsContextANGLE(GLeglContext ctx, GLuint program, GLsizei count, const GLchar *const*varyings, GLenum bufferMode);
>+GL_APICALL void GL_APIENTRY glUniform1uiContextANGLE(GLeglContext ctx, GLint location, GLuint v0);
>+GL_APICALL void GL_APIENTRY glUniform1uivContextANGLE(GLeglContext ctx, GLint location, GLsizei count, const GLuint *value);
>+GL_APICALL void GL_APIENTRY glUniform2uiContextANGLE(GLeglContext ctx, GLint location, GLuint v0, GLuint v1);
>+GL_APICALL void GL_APIENTRY glUniform2uivContextANGLE(GLeglContext ctx, GLint location, GLsizei count, const GLuint *value);
>+GL_APICALL void GL_APIENTRY glUniform3uiContextANGLE(GLeglContext ctx, GLint location, GLuint v0, GLuint v1, GLuint v2);
>+GL_APICALL void GL_APIENTRY glUniform3uivContextANGLE(GLeglContext ctx, GLint location, GLsizei count, const GLuint *value);
>+GL_APICALL void GL_APIENTRY glUniform4uiContextANGLE(GLeglContext ctx, GLint location, GLuint v0, GLuint v1, GLuint v2, GLuint v3);
>+GL_APICALL void GL_APIENTRY glUniform4uivContextANGLE(GLeglContext ctx, GLint location, GLsizei count, const GLuint *value);
>+GL_APICALL void GL_APIENTRY glUniformBlockBindingContextANGLE(GLeglContext ctx, GLuint program, GLuint uniformBlockIndex, GLuint uniformBlockBinding);
>+GL_APICALL void GL_APIENTRY glUniformMatrix2x3fvContextANGLE(GLeglContext ctx, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
>+GL_APICALL void GL_APIENTRY glUniformMatrix2x4fvContextANGLE(GLeglContext ctx, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
>+GL_APICALL void GL_APIENTRY glUniformMatrix3x2fvContextANGLE(GLeglContext ctx, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
>+GL_APICALL void GL_APIENTRY glUniformMatrix3x4fvContextANGLE(GLeglContext ctx, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
>+GL_APICALL void GL_APIENTRY glUniformMatrix4x2fvContextANGLE(GLeglContext ctx, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
>+GL_APICALL void GL_APIENTRY glUniformMatrix4x3fvContextANGLE(GLeglContext ctx, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
>+GL_APICALL GLboolean GL_APIENTRY glUnmapBufferContextANGLE(GLeglContext ctx, GLenum target);
>+GL_APICALL void GL_APIENTRY glVertexAttribDivisorContextANGLE(GLeglContext ctx, GLuint index, GLuint divisor);
>+GL_APICALL void GL_APIENTRY glVertexAttribI4iContextANGLE(GLeglContext ctx, GLuint index, GLint x, GLint y, GLint z, GLint w);
>+GL_APICALL void GL_APIENTRY glVertexAttribI4ivContextANGLE(GLeglContext ctx, GLuint index, const GLint *v);
>+GL_APICALL void GL_APIENTRY glVertexAttribI4uiContextANGLE(GLeglContext ctx, GLuint index, GLuint x, GLuint y, GLuint z, GLuint w);
>+GL_APICALL void GL_APIENTRY glVertexAttribI4uivContextANGLE(GLeglContext ctx, GLuint index, const GLuint *v);
>+GL_APICALL void GL_APIENTRY glVertexAttribIPointerContextANGLE(GLeglContext ctx, GLuint index, GLint size, GLenum type, GLsizei stride, const void *pointer);
>+GL_APICALL void GL_APIENTRY glWaitSyncContextANGLE(GLeglContext ctx, GLsync sync, GLbitfield flags, GLuint64 timeout);
>+#endif
>diff --git a/Source/ThirdParty/ANGLE/include/GLSLANG/ShaderLang.h b/Source/ThirdParty/ANGLE/include/GLSLANG/ShaderLang.h
>index 2875c02aba3..c804715d27f 100644
>--- a/Source/ThirdParty/ANGLE/include/GLSLANG/ShaderLang.h
>+++ b/Source/ThirdParty/ANGLE/include/GLSLANG/ShaderLang.h
>@@ -8,10 +8,11 @@
> 
> #include <stddef.h>
> 
>-#include "khrplatform.h"
>+#include "KHR/khrplatform.h"
> 
> #include <array>
> #include <map>
>+#include <set>
> #include <string>
> #include <vector>
> 
>@@ -25,7 +26,7 @@
> 
> // Version number for shader translation API.
> // It is incremented every time the API changes.
>-#define ANGLE_SH_VERSION 190
>+#define ANGLE_SH_VERSION 206
> 
> enum ShShaderSpec
> {
>@@ -71,13 +72,13 @@ enum ShShaderOutput
> // The Compile options type is defined in ShaderVars.h, to allow ANGLE to import the ShaderVars
> // header without needing the ShaderLang header. This avoids some conflicts with glslang.
> 
>-const ShCompileOptions SH_VALIDATE                           = 0;
>-const ShCompileOptions SH_VALIDATE_LOOP_INDEXING             = UINT64_C(1) << 0;
>-const ShCompileOptions SH_INTERMEDIATE_TREE                  = UINT64_C(1) << 1;
>-const ShCompileOptions SH_OBJECT_CODE                        = UINT64_C(1) << 2;
>-const ShCompileOptions SH_VARIABLES                          = UINT64_C(1) << 3;
>-const ShCompileOptions SH_LINE_DIRECTIVES                    = UINT64_C(1) << 4;
>-const ShCompileOptions SH_SOURCE_PATH                        = UINT64_C(1) << 5;
>+const ShCompileOptions SH_VALIDATE               = 0;
>+const ShCompileOptions SH_VALIDATE_LOOP_INDEXING = UINT64_C(1) << 0;
>+const ShCompileOptions SH_INTERMEDIATE_TREE      = UINT64_C(1) << 1;
>+const ShCompileOptions SH_OBJECT_CODE            = UINT64_C(1) << 2;
>+const ShCompileOptions SH_VARIABLES              = UINT64_C(1) << 3;
>+const ShCompileOptions SH_LINE_DIRECTIVES        = UINT64_C(1) << 4;
>+const ShCompileOptions SH_SOURCE_PATH            = UINT64_C(1) << 5;
> 
> // This flag will keep invariant declaration for input in fragment shader for GLSL >=4.20 on AMD.
> // From GLSL >= 4.20, it's optional to add invariant for fragment input, but GPU vendors have
>@@ -214,13 +215,9 @@ const ShCompileOptions SH_REWRITE_FLOAT_UNARY_MINUS_OPERATOR = UINT64_C(1) << 29
> // It works by using an expression to emulate this function.
> const ShCompileOptions SH_EMULATE_ATAN2_FLOAT_FUNCTION = UINT64_C(1) << 30;
> 
>-// Set to 1 to translate gl_ViewID_OVR to an uniform so that the extension can be emulated.
>-// "uniform highp uint ViewID_OVR".
>-const ShCompileOptions SH_TRANSLATE_VIEWID_OVR_TO_UNIFORM = UINT64_C(1) << 31;
>-
> // Set to initialize uninitialized local and global temporary variables. Should only be used with
> // GLSL output. In HLSL output variables are initialized regardless of if this flag is set.
>-const ShCompileOptions SH_INITIALIZE_UNINITIALIZED_LOCALS = UINT64_C(1) << 32;
>+const ShCompileOptions SH_INITIALIZE_UNINITIALIZED_LOCALS = UINT64_C(1) << 31;
> 
> // The flag modifies the shader in the following way:
> // Every occurrence of gl_InstanceID is replaced by the global temporary variable InstanceID.
>@@ -229,7 +226,7 @@ const ShCompileOptions SH_INITIALIZE_UNINITIALIZED_LOCALS = UINT64_C(1) << 32;
> // ViewID_OVR = uint(gl_InstanceID) % num_views;
> // InstanceID = gl_InstanceID / num_views;
> // ViewID_OVR is added as a varying variable to both the vertex and fragment shaders.
>-const ShCompileOptions SH_INITIALIZE_BUILTINS_FOR_INSTANCED_MULTIVIEW = UINT64_C(1) << 33;
>+const ShCompileOptions SH_INITIALIZE_BUILTINS_FOR_INSTANCED_MULTIVIEW = UINT64_C(1) << 32;
> 
> // With the flag enabled the GLSL/ESSL vertex shader is modified to include code for viewport
> // selection in the following way:
>@@ -239,11 +236,11 @@ const ShCompileOptions SH_INITIALIZE_BUILTINS_FOR_INSTANCED_MULTIVIEW = UINT64_C
> // - A declaration of the uniform multiviewBaseViewLayerIndex.
> // Note: The SH_INITIALIZE_BUILTINS_FOR_INSTANCED_MULTIVIEW flag also has to be enabled to have the
> // temporary variable ViewID_OVR declared and initialized.
>-const ShCompileOptions SH_SELECT_VIEW_IN_NV_GLSL_VERTEX_SHADER = UINT64_C(1) << 34;
>+const ShCompileOptions SH_SELECT_VIEW_IN_NV_GLSL_VERTEX_SHADER = UINT64_C(1) << 33;
> 
> // If the flag is enabled, gl_PointSize is clamped to the maximum point size specified in
> // ShBuiltInResources in vertex shaders.
>-const ShCompileOptions SH_CLAMP_POINT_SIZE = UINT64_C(1) << 35;
>+const ShCompileOptions SH_CLAMP_POINT_SIZE = UINT64_C(1) << 34;
> 
> // Turn some arithmetic operations that operate on a float vector-scalar pair into vector-vector
> // operations. This is done recursively. Some scalar binary operations inside vector constructors
>@@ -251,11 +248,38 @@ const ShCompileOptions SH_CLAMP_POINT_SIZE = UINT64_C(1) << 35;
> //
> // This is targeted to work around a bug in NVIDIA OpenGL drivers that was reproducible on NVIDIA
> // driver version 387.92. It works around the most common occurrences of the bug.
>-const ShCompileOptions SH_REWRITE_VECTOR_SCALAR_ARITHMETIC = UINT64_C(1) << 36;
>+const ShCompileOptions SH_REWRITE_VECTOR_SCALAR_ARITHMETIC = UINT64_C(1) << 35;
> 
> // Don't use loops to initialize uninitialized variables. Only has an effect if some kind of
> // variable initialization is turned on.
>-const ShCompileOptions SH_DONT_USE_LOOPS_TO_INITIALIZE_VARIABLES = UINT64_C(1) << 37;
>+const ShCompileOptions SH_DONT_USE_LOOPS_TO_INITIALIZE_VARIABLES = UINT64_C(1) << 36;
>+
>+// Don't use D3D constant register zero when allocating space for uniforms. This is targeted to work
>+// around a bug in NVIDIA D3D driver version 388.59 where in very specific cases the driver would
>+// not handle constant register zero correctly. Only has an effect on HLSL translation.
>+const ShCompileOptions SH_SKIP_D3D_CONSTANT_REGISTER_ZERO = UINT64_C(1) << 37;
>+
>+// Clamp gl_FragDepth to the range [0.0, 1.0] in case it is statically used.
>+const ShCompileOptions SH_CLAMP_FRAG_DEPTH = UINT64_C(1) << 38;
>+
>+// Rewrite expressions like "v.x = z = expression;". Works around a bug in NVIDIA OpenGL drivers
>+// prior to version 397.31.
>+const ShCompileOptions SH_REWRITE_REPEATED_ASSIGN_TO_SWIZZLED = UINT64_C(1) << 39;
>+
>+// Rewrite gl_DrawID as a uniform int
>+const ShCompileOptions SH_EMULATE_GL_DRAW_ID = UINT64_C(1) << 40;
>+
>+// This flag initializes shared variables to 0.
>+// It is to avoid ompute shaders being able to read undefined values that could be coming from
>+// another webpage/application.
>+const ShCompileOptions SH_INIT_SHARED_VARIABLES = UINT64_C(1) << 41;
>+
>+// Forces the value returned from an atomic operations to be always be resolved. This is targeted to
>+// workaround a bug in NVIDIA D3D driver where the return value from
>+// RWByteAddressBuffer.InterlockedAdd does not get resolved when used in the .yzw components of a
>+// RWByteAddressBuffer.Store operation. Only has an effect on HLSL translation.
>+// http://anglebug.com/3246
>+const ShCompileOptions SH_FORCE_ATOMIC_VALUE_RESOLUTION = UINT64_C(1) << 42;
> 
> // Defines alternate strategies for implementing array index clamping.
> enum ShArrayIndexClampingStrategy
>@@ -302,9 +326,12 @@ struct ShBuiltInResources
>     int EXT_shader_framebuffer_fetch;
>     int NV_shader_framebuffer_fetch;
>     int ARM_shader_framebuffer_fetch;
>-    int OVR_multiview;
>+    int OVR_multiview2;
>     int EXT_YUV_target;
>-    int OES_geometry_shader;
>+    int EXT_geometry_shader;
>+    int OES_texture_storage_multisample_2d_array;
>+    int ANGLE_texture_multisample;
>+    int ANGLE_multi_draw;
> 
>     // Set to 1 to enable replacing GL_EXT_draw_buffers #extension directives
>     // with GL_NV_draw_buffers in ESSL output. This flag can be used to emulate
>@@ -430,7 +457,7 @@ struct ShBuiltInResources
>     // maximum point size (higher limit from ALIASED_POINT_SIZE_RANGE)
>     float MaxPointSize;
> 
>-    // OES_geometry_shader constants
>+    // EXT_geometry_shader constants
>     int MaxGeometryUniformComponents;
>     int MaxGeometryUniformBlocks;
>     int MaxGeometryInputComponents;
>@@ -583,6 +610,17 @@ int GetVertexShaderNumViews(const ShHandle handle);
> bool CheckVariablesWithinPackingLimits(int maxVectors,
>                                        const std::vector<sh::ShaderVariable> &variables);
> 
>+// Gives the compiler-assigned register for a shader storage block.
>+// The method writes the value to the output variable "indexOut".
>+// Returns true if it found a valid shader storage block, false otherwise.
>+// Parameters:
>+// handle: Specifies the compiler
>+// shaderStorageBlockName: Specifies the shader storage block
>+// indexOut: output variable that stores the assigned register
>+bool GetShaderStorageBlockRegister(const ShHandle handle,
>+                                   const std::string &shaderStorageBlockName,
>+                                   unsigned int *indexOut);
>+
> // Gives the compiler-assigned register for a uniform block.
> // The method writes the value to the output variable "indexOut".
> // Returns true if it found a valid uniform block, false otherwise.
>@@ -598,11 +636,34 @@ bool GetUniformBlockRegister(const ShHandle handle,
> // Note that the map contains also registers of samplers that have been extracted from structs.
> const std::map<std::string, unsigned int> *GetUniformRegisterMap(const ShHandle handle);
> 
>+// Sampler, image and atomic counters share registers(t type and u type),
>+// GetReadonlyImage2DRegisterIndex and GetImage2DRegisterIndex return the first index into
>+// a range of reserved registers for image2D/iimage2D/uimage2D variables.
>+// Parameters: handle: Specifies the compiler
>+unsigned int GetReadonlyImage2DRegisterIndex(const ShHandle handle);
>+unsigned int GetImage2DRegisterIndex(const ShHandle handle);
>+
>+// The method records these used function names related with image2D/iimage2D/uimage2D, these
>+// functions will be dynamically generated.
>+// Parameters:
>+// handle: Specifies the compiler
>+const std::set<std::string> *GetUsedImage2DFunctionNames(const ShHandle handle);
>+
>+bool HasValidGeometryShaderInputPrimitiveType(const ShHandle handle);
>+bool HasValidGeometryShaderOutputPrimitiveType(const ShHandle handle);
>+bool HasValidGeometryShaderMaxVertices(const ShHandle handle);
> GLenum GetGeometryShaderInputPrimitiveType(const ShHandle handle);
> GLenum GetGeometryShaderOutputPrimitiveType(const ShHandle handle);
> int GetGeometryShaderInvocations(const ShHandle handle);
> int GetGeometryShaderMaxVertices(const ShHandle handle);
> 
>+//
>+// Helper function to identify specs that are based on the WebGL spec.
>+//
>+inline bool IsWebGLBasedSpec(ShShaderSpec spec)
>+{
>+    return (spec == SH_WEBGL_SPEC || spec == SH_WEBGL2_SPEC || spec == SH_WEBGL3_SPEC);
>+}
> }  // namespace sh
> 
>-#endif // GLSLANG_SHADERLANG_H_
>+#endif  // GLSLANG_SHADERLANG_H_
>diff --git a/Source/ThirdParty/ANGLE/include/GLSLANG/ShaderVars.h b/Source/ThirdParty/ANGLE/include/GLSLANG/ShaderVars.h
>index acd9c358f8c..2bb267e93f8 100644
>--- a/Source/ThirdParty/ANGLE/include/GLSLANG/ShaderVars.h
>+++ b/Source/ThirdParty/ANGLE/include/GLSLANG/ShaderVars.h
>@@ -71,6 +71,12 @@ struct ShaderVariable
>     bool isArrayOfArrays() const { return arraySizes.size() >= 2u; }
>     bool isArray() const { return !arraySizes.empty(); }
>     unsigned int getArraySizeProduct() const;
>+    // Return the inner array size product.
>+    // For example, if there's a variable declared as size 3 array of size 4 array of size 5 array
>+    // of int:
>+    //   int a[3][4][5];
>+    // then getInnerArraySizeProduct of a would be 4*5.
>+    unsigned int getInnerArraySizeProduct() const;
> 
>     // Array size 0 means not an array when passed to or returned from these functions.
>     // Note that setArraySize() is deprecated and should not be used inside ANGLE.
>@@ -106,9 +112,10 @@ struct ShaderVariable
>     // If no match is found, return false.
>     bool findInfoByMappedName(const std::string &mappedFullName,
>                               const ShaderVariable **leafVar,
>-                              std::string* originalFullName) const;
>+                              std::string *originalFullName) const;
> 
>     bool isBuiltIn() const;
>+    bool isEmulatedBuiltIn() const;
> 
>     GLenum type;
>     GLenum precision;
>@@ -124,22 +131,36 @@ struct ShaderVariable
>     //   int a[3][4];
>     // then the flattenedOffsetInParentArrays of a[2] would be 2.
>     // and flattenedOffsetInParentArrays of a[2][1] would be 2*4 + 1 = 9.
>-    unsigned int flattenedOffsetInParentArrays;
>+    int parentArrayIndex() const
>+    {
>+        return hasParentArrayIndex() ? flattenedOffsetInParentArrays : 0;
>+    }
>+
>+    void setParentArrayIndex(int index) { flattenedOffsetInParentArrays = index; }
> 
>+    bool hasParentArrayIndex() const { return flattenedOffsetInParentArrays != -1; }
>+
>+    // Static use means that the variable is accessed somewhere in the shader source.
>     bool staticUse;
>+    // A variable is active unless the compiler determined that it is not accessed by the shader.
>+    // All active variables are statically used, but not all statically used variables are
>+    // necessarily active. GLES 3.0.5 section 2.12.6. GLES 3.1 section 7.3.1.
>+    bool active;
>     std::vector<ShaderVariable> fields;
>     std::string structName;
> 
>+    // Only applies to interface block fields. Kept here for simplicity.
>+    bool isRowMajorLayout;
>+
>   protected:
>     bool isSameVariableAtLinkTime(const ShaderVariable &other,
>                                   bool matchPrecision,
>                                   bool matchName) const;
> 
>     bool operator==(const ShaderVariable &other) const;
>-    bool operator!=(const ShaderVariable &other) const
>-    {
>-        return !operator==(other);
>-    }
>+    bool operator!=(const ShaderVariable &other) const { return !operator==(other); }
>+
>+    int flattenedOffsetInParentArrays;
> };
> 
> // A variable with an integer location to pass back to the GL API: either uniform (can have location
>@@ -163,13 +184,13 @@ struct Uniform : public VariableWithLocation
>     Uniform(const Uniform &other);
>     Uniform &operator=(const Uniform &other);
>     bool operator==(const Uniform &other) const;
>-    bool operator!=(const Uniform &other) const
>-    {
>-        return !operator==(other);
>-    }
>+    bool operator!=(const Uniform &other) const { return !operator==(other); }
> 
>     int binding;
>+    GLenum imageUnitFormat;
>     int offset;
>+    bool readonly;
>+    bool writeonly;
> 
>     // Decide whether two uniforms are the same at shader link time,
>     // assuming one from vertex shader and the other from fragment shader.
>@@ -196,6 +217,9 @@ struct OutputVariable : public VariableWithLocation
>     OutputVariable &operator=(const OutputVariable &other);
>     bool operator==(const OutputVariable &other) const;
>     bool operator!=(const OutputVariable &other) const { return !operator==(other); }
>+
>+    // From EXT_blend_func_extended.
>+    int index;
> };
> 
> struct InterfaceBlockField : public ShaderVariable
>@@ -205,32 +229,23 @@ struct InterfaceBlockField : public ShaderVariable
>     InterfaceBlockField(const InterfaceBlockField &other);
>     InterfaceBlockField &operator=(const InterfaceBlockField &other);
>     bool operator==(const InterfaceBlockField &other) const;
>-    bool operator!=(const InterfaceBlockField &other) const
>-    {
>-        return !operator==(other);
>-    }
>+    bool operator!=(const InterfaceBlockField &other) const { return !operator==(other); }
> 
>     // Decide whether two InterfaceBlock fields are the same at shader
>     // link time, assuming one from vertex shader and the other from
>     // fragment shader.
>     // See GLSL ES Spec 3.00.3, sec 4.3.7.
>-    bool isSameInterfaceBlockFieldAtLinkTime(
>-        const InterfaceBlockField &other) const;
>-
>-    bool isRowMajorLayout;
>+    bool isSameInterfaceBlockFieldAtLinkTime(const InterfaceBlockField &other) const;
> };
> 
> struct Varying : public VariableWithLocation
> {
>     Varying();
>     ~Varying();
>-    Varying(const Varying &otherg);
>+    Varying(const Varying &other);
>     Varying &operator=(const Varying &other);
>     bool operator==(const Varying &other) const;
>-    bool operator!=(const Varying &other) const
>-    {
>-        return !operator==(other);
>-    }
>+    bool operator!=(const Varying &other) const { return !operator==(other); }
> 
>     // Decide whether two varyings are the same at shader link time,
>     // assuming one from vertex shader and the other from fragment shader.
>@@ -270,9 +285,14 @@ struct InterfaceBlock
>     std::string instanceName;
>     unsigned int arraySize;
>     BlockLayoutType layout;
>+
>+    // Deprecated. Matrix packing should only be queried from individual fields of the block.
>+    // TODO(oetuaho): Remove this once it is no longer used in Chromium.
>     bool isRowMajorLayout;
>+
>     int binding;
>     bool staticUse;
>+    bool active;
>     BlockType blockType;
>     std::vector<InterfaceBlockField> fields;
> };
>@@ -280,18 +300,8 @@ struct InterfaceBlock
> struct WorkGroupSize
> {
>     // Must have a trivial default constructor since it is used in YYSTYPE.
>-    WorkGroupSize() = default;
>-#if defined(__clang__)
>-#pragma clang diagnostic push
>-#pragma clang diagnostic ignored "-Wmissing-braces"
>-#endif
>-    explicit constexpr WorkGroupSize(int initialSize)
>-        : localSizeQualifiers{initialSize, initialSize, initialSize}
>-    {
>-    }
>-#if defined(__clang__)
>-#pragma clang diagnostic pop
>-#endif
>+    inline WorkGroupSize() = default;
>+    inline explicit constexpr WorkGroupSize(int initialSize);
> 
>     void fill(int fillValue);
>     void setLocalSize(int localSizeX, int localSizeY, int localSizeZ);
>@@ -314,9 +324,13 @@ struct WorkGroupSize
>     // Checks whether either all of the values are set, or none of them are.
>     bool isLocalSizeValid() const;
> 
>-    std::array<int, 3> localSizeQualifiers;
>+    int localSizeQualifiers[3];
> };
> 
>+inline constexpr WorkGroupSize::WorkGroupSize(int initialSize)
>+    : localSizeQualifiers{initialSize, initialSize, initialSize}
>+{}
>+
> }  // namespace sh
> 
>-#endif // GLSLANG_SHADERVARS_H_
>+#endif  // GLSLANG_SHADERVARS_H_
>diff --git a/Source/ThirdParty/ANGLE/include/KHR/.clang-format b/Source/ThirdParty/ANGLE/include/KHR/.clang-format
>new file mode 100644
>index 00000000000..06147100144
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/include/KHR/.clang-format
>@@ -0,0 +1,3 @@
>+
>+
>+DisableFormat: true
>diff --git a/Source/ThirdParty/ANGLE/include/KHR/khrplatform.h b/Source/ThirdParty/ANGLE/include/KHR/khrplatform.h
>index 07b61b9bd60..975bbffed67 100644
>--- a/Source/ThirdParty/ANGLE/include/KHR/khrplatform.h
>+++ b/Source/ThirdParty/ANGLE/include/KHR/khrplatform.h
>@@ -2,7 +2,7 @@
> #define __khrplatform_h_
> 
> /*
>-** Copyright (c) 2008-2009 The Khronos Group Inc.
>+** Copyright (c) 2008-2018 The Khronos Group Inc.
> **
> ** Permission is hereby granted, free of charge, to any person obtaining a
> ** copy of this software and/or associated documentation files (the
>@@ -26,18 +26,16 @@
> 
> /* Khronos platform-specific types and definitions.
>  *
>- * $Revision: 32517 $ on $Date: 2016-03-11 02:41:19 -0800 (Fri, 11 Mar 2016) $
>+ * The master copy of khrplatform.h is maintained in the Khronos EGL
>+ * Registry repository at https://github.com/KhronosGroup/EGL-Registry
>+ * The last semantic modification to khrplatform.h was at commit ID:
>+ *      67a3e0864c2d75ea5287b9f3d2eb74a745936692
>  *
>  * Adopters may modify this file to suit their platform. Adopters are
>  * encouraged to submit platform specific modifications to the Khronos
>  * group so that they can be included in future versions of this file.
>- * Please submit changes by sending them to the public Khronos Bugzilla
>- * (http://khronos.org/bugzilla) by filing a bug against product
>- * "Khronos (general)" component "Registry".
>- *
>- * A predefined template which fills in some of the bug fields can be
>- * reached using http://tinyurl.com/khrplatform-h-bugreport, but you
>- * must create a Bugzilla login first.
>+ * Please submit changes by filing pull requests or issues on
>+ * the EGL Registry repository linked above.
>  *
>  *
>  * See the Implementer's Guidelines for information about where this file
>@@ -102,8 +100,7 @@
> #elif defined (__SYMBIAN32__)
> #   define KHRONOS_APICALL IMPORT_C
> #elif defined(__ANDROID__)
>-#   include <sys/cdefs.h>
>-#   define KHRONOS_APICALL __attribute__((visibility("default"))) __NDK_FPABI__
>+#   define KHRONOS_APICALL __attribute__((visibility("default")))
> #else
> #   define KHRONOS_APICALL
> #endif
>diff --git a/Source/ThirdParty/ANGLE/include/WGL/.clang-format b/Source/ThirdParty/ANGLE/include/WGL/.clang-format
>new file mode 100644
>index 00000000000..06147100144
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/include/WGL/.clang-format
>@@ -0,0 +1,3 @@
>+
>+
>+DisableFormat: true
>diff --git a/Source/ThirdParty/ANGLE/include/WGL/wgl.h b/Source/ThirdParty/ANGLE/include/WGL/wgl.h
>new file mode 100644
>index 00000000000..0bae52bddae
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/include/WGL/wgl.h
>@@ -0,0 +1,946 @@
>+#ifndef __wgl_wgl_h_
>+#define __wgl_wgl_h_ 1
>+
>+#ifdef __cplusplus
>+extern "C" {
>+#endif
>+
>+/*
>+** Copyright (c) 2013-2018 The Khronos Group Inc.
>+**
>+** Permission is hereby granted, free of charge, to any person obtaining a
>+** copy of this software and/or associated documentation files (the
>+** "Materials"), to deal in the Materials without restriction, including
>+** without limitation the rights to use, copy, modify, merge, publish,
>+** distribute, sublicense, and/or sell copies of the Materials, and to
>+** permit persons to whom the Materials are furnished to do so, subject to
>+** the following conditions:
>+**
>+** The above copyright notice and this permission notice shall be included
>+** in all copies or substantial portions of the Materials.
>+**
>+** THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
>+** EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
>+** MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
>+** IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
>+** CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
>+** TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
>+** MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
>+*/
>+/*
>+** This header is generated from the Khronos OpenGL / OpenGL ES XML
>+** API Registry. The current version of the Registry, generator scripts
>+** used to make the header, and the header can be found at
>+**   https://github.com/KhronosGroup/OpenGL-Registry
>+*/
>+
>+#if defined(_WIN32) && !defined(APIENTRY) && !defined(__CYGWIN__) && !defined(__SCITECH_SNAP__)
>+#define WIN32_LEAN_AND_MEAN 1
>+#include <windows.h>
>+#endif
>+
>+/* Generated on date 20181206 */
>+
>+/* Generated C header for:
>+ * API: wgl
>+ * Versions considered: .*
>+ * Versions emitted: .*
>+ * Default extensions included: wgl
>+ * Additional extensions included: _nomatch_^
>+ * Extensions removed: _nomatch_^
>+ */
>+
>+#ifndef WGL_VERSION_1_0
>+#define WGL_VERSION_1_0 1
>+#define WGL_FONT_LINES                    0
>+#define WGL_FONT_POLYGONS                 1
>+#define WGL_SWAP_MAIN_PLANE               0x00000001
>+#define WGL_SWAP_OVERLAY1                 0x00000002
>+#define WGL_SWAP_OVERLAY2                 0x00000004
>+#define WGL_SWAP_OVERLAY3                 0x00000008
>+#define WGL_SWAP_OVERLAY4                 0x00000010
>+#define WGL_SWAP_OVERLAY5                 0x00000020
>+#define WGL_SWAP_OVERLAY6                 0x00000040
>+#define WGL_SWAP_OVERLAY7                 0x00000080
>+#define WGL_SWAP_OVERLAY8                 0x00000100
>+#define WGL_SWAP_OVERLAY9                 0x00000200
>+#define WGL_SWAP_OVERLAY10                0x00000400
>+#define WGL_SWAP_OVERLAY11                0x00000800
>+#define WGL_SWAP_OVERLAY12                0x00001000
>+#define WGL_SWAP_OVERLAY13                0x00002000
>+#define WGL_SWAP_OVERLAY14                0x00004000
>+#define WGL_SWAP_OVERLAY15                0x00008000
>+#define WGL_SWAP_UNDERLAY1                0x00010000
>+#define WGL_SWAP_UNDERLAY2                0x00020000
>+#define WGL_SWAP_UNDERLAY3                0x00040000
>+#define WGL_SWAP_UNDERLAY4                0x00080000
>+#define WGL_SWAP_UNDERLAY5                0x00100000
>+#define WGL_SWAP_UNDERLAY6                0x00200000
>+#define WGL_SWAP_UNDERLAY7                0x00400000
>+#define WGL_SWAP_UNDERLAY8                0x00800000
>+#define WGL_SWAP_UNDERLAY9                0x01000000
>+#define WGL_SWAP_UNDERLAY10               0x02000000
>+#define WGL_SWAP_UNDERLAY11               0x04000000
>+#define WGL_SWAP_UNDERLAY12               0x08000000
>+#define WGL_SWAP_UNDERLAY13               0x10000000
>+#define WGL_SWAP_UNDERLAY14               0x20000000
>+#define WGL_SWAP_UNDERLAY15               0x40000000
>+typedef int (WINAPI * PFNCHOOSEPIXELFORMATPROC) (HDC hDc, const PIXELFORMATDESCRIPTOR *pPfd);
>+typedef int (WINAPI * PFNDESCRIBEPIXELFORMATPROC) (HDC hdc, int ipfd, UINT cjpfd, const PIXELFORMATDESCRIPTOR *ppfd);
>+typedef UINT (WINAPI * PFNGETENHMETAFILEPIXELFORMATPROC) (HENHMETAFILE hemf, const PIXELFORMATDESCRIPTOR *ppfd);
>+typedef int (WINAPI * PFNGETPIXELFORMATPROC) (HDC hdc);
>+typedef BOOL (WINAPI * PFNSETPIXELFORMATPROC) (HDC hdc, int ipfd, const PIXELFORMATDESCRIPTOR *ppfd);
>+typedef BOOL (WINAPI * PFNSWAPBUFFERSPROC) (HDC hdc);
>+typedef BOOL (WINAPI * PFNWGLCOPYCONTEXTPROC) (HGLRC hglrcSrc, HGLRC hglrcDst, UINT mask);
>+typedef HGLRC (WINAPI * PFNWGLCREATECONTEXTPROC) (HDC hDc);
>+typedef HGLRC (WINAPI * PFNWGLCREATELAYERCONTEXTPROC) (HDC hDc, int level);
>+typedef BOOL (WINAPI * PFNWGLDELETECONTEXTPROC) (HGLRC oldContext);
>+typedef BOOL (WINAPI * PFNWGLDESCRIBELAYERPLANEPROC) (HDC hDc, int pixelFormat, int layerPlane, UINT nBytes, const LAYERPLANEDESCRIPTOR *plpd);
>+typedef HGLRC (WINAPI * PFNWGLGETCURRENTCONTEXTPROC) (void);
>+typedef HDC (WINAPI * PFNWGLGETCURRENTDCPROC) (void);
>+typedef int (WINAPI * PFNWGLGETLAYERPALETTEENTRIESPROC) (HDC hdc, int iLayerPlane, int iStart, int cEntries, const COLORREF *pcr);
>+typedef PROC (WINAPI * PFNWGLGETPROCADDRESSPROC) (LPCSTR lpszProc);
>+typedef BOOL (WINAPI * PFNWGLMAKECURRENTPROC) (HDC hDc, HGLRC newContext);
>+typedef BOOL (WINAPI * PFNWGLREALIZELAYERPALETTEPROC) (HDC hdc, int iLayerPlane, BOOL bRealize);
>+typedef int (WINAPI * PFNWGLSETLAYERPALETTEENTRIESPROC) (HDC hdc, int iLayerPlane, int iStart, int cEntries, const COLORREF *pcr);
>+typedef BOOL (WINAPI * PFNWGLSHARELISTSPROC) (HGLRC hrcSrvShare, HGLRC hrcSrvSource);
>+typedef BOOL (WINAPI * PFNWGLSWAPLAYERBUFFERSPROC) (HDC hdc, UINT fuFlags);
>+typedef BOOL (WINAPI * PFNWGLUSEFONTBITMAPSPROC) (HDC hDC, DWORD first, DWORD count, DWORD listBase);
>+typedef BOOL (WINAPI * PFNWGLUSEFONTBITMAPSAPROC) (HDC hDC, DWORD first, DWORD count, DWORD listBase);
>+typedef BOOL (WINAPI * PFNWGLUSEFONTBITMAPSWPROC) (HDC hDC, DWORD first, DWORD count, DWORD listBase);
>+typedef BOOL (WINAPI * PFNWGLUSEFONTOUTLINESPROC) (HDC hDC, DWORD first, DWORD count, DWORD listBase, FLOAT deviation, FLOAT extrusion, int format, LPGLYPHMETRICSFLOAT lpgmf);
>+typedef BOOL (WINAPI * PFNWGLUSEFONTOUTLINESAPROC) (HDC hDC, DWORD first, DWORD count, DWORD listBase, FLOAT deviation, FLOAT extrusion, int format, LPGLYPHMETRICSFLOAT lpgmf);
>+typedef BOOL (WINAPI * PFNWGLUSEFONTOUTLINESWPROC) (HDC hDC, DWORD first, DWORD count, DWORD listBase, FLOAT deviation, FLOAT extrusion, int format, LPGLYPHMETRICSFLOAT lpgmf);
>+#ifdef WGL_WGLEXT_PROTOTYPES
>+int WINAPI ChoosePixelFormat (HDC hDc, const PIXELFORMATDESCRIPTOR *pPfd);
>+int WINAPI DescribePixelFormat (HDC hdc, int ipfd, UINT cjpfd, const PIXELFORMATDESCRIPTOR *ppfd);
>+UINT WINAPI GetEnhMetaFilePixelFormat (HENHMETAFILE hemf, const PIXELFORMATDESCRIPTOR *ppfd);
>+int WINAPI GetPixelFormat (HDC hdc);
>+BOOL WINAPI SetPixelFormat (HDC hdc, int ipfd, const PIXELFORMATDESCRIPTOR *ppfd);
>+BOOL WINAPI SwapBuffers (HDC hdc);
>+BOOL WINAPI wglCopyContext (HGLRC hglrcSrc, HGLRC hglrcDst, UINT mask);
>+HGLRC WINAPI wglCreateContext (HDC hDc);
>+HGLRC WINAPI wglCreateLayerContext (HDC hDc, int level);
>+BOOL WINAPI wglDeleteContext (HGLRC oldContext);
>+BOOL WINAPI wglDescribeLayerPlane (HDC hDc, int pixelFormat, int layerPlane, UINT nBytes, const LAYERPLANEDESCRIPTOR *plpd);
>+HGLRC WINAPI wglGetCurrentContext (void);
>+HDC WINAPI wglGetCurrentDC (void);
>+int WINAPI wglGetLayerPaletteEntries (HDC hdc, int iLayerPlane, int iStart, int cEntries, const COLORREF *pcr);
>+PROC WINAPI wglGetProcAddress (LPCSTR lpszProc);
>+BOOL WINAPI wglMakeCurrent (HDC hDc, HGLRC newContext);
>+BOOL WINAPI wglRealizeLayerPalette (HDC hdc, int iLayerPlane, BOOL bRealize);
>+int WINAPI wglSetLayerPaletteEntries (HDC hdc, int iLayerPlane, int iStart, int cEntries, const COLORREF *pcr);
>+BOOL WINAPI wglShareLists (HGLRC hrcSrvShare, HGLRC hrcSrvSource);
>+BOOL WINAPI wglSwapLayerBuffers (HDC hdc, UINT fuFlags);
>+BOOL WINAPI wglUseFontBitmaps (HDC hDC, DWORD first, DWORD count, DWORD listBase);
>+BOOL WINAPI wglUseFontBitmapsA (HDC hDC, DWORD first, DWORD count, DWORD listBase);
>+BOOL WINAPI wglUseFontBitmapsW (HDC hDC, DWORD first, DWORD count, DWORD listBase);
>+BOOL WINAPI wglUseFontOutlines (HDC hDC, DWORD first, DWORD count, DWORD listBase, FLOAT deviation, FLOAT extrusion, int format, LPGLYPHMETRICSFLOAT lpgmf);
>+BOOL WINAPI wglUseFontOutlinesA (HDC hDC, DWORD first, DWORD count, DWORD listBase, FLOAT deviation, FLOAT extrusion, int format, LPGLYPHMETRICSFLOAT lpgmf);
>+BOOL WINAPI wglUseFontOutlinesW (HDC hDC, DWORD first, DWORD count, DWORD listBase, FLOAT deviation, FLOAT extrusion, int format, LPGLYPHMETRICSFLOAT lpgmf);
>+#endif
>+#endif /* WGL_VERSION_1_0 */
>+
>+#ifndef WGL_ARB_buffer_region
>+#define WGL_ARB_buffer_region 1
>+#define WGL_FRONT_COLOR_BUFFER_BIT_ARB    0x00000001
>+#define WGL_BACK_COLOR_BUFFER_BIT_ARB     0x00000002
>+#define WGL_DEPTH_BUFFER_BIT_ARB          0x00000004
>+#define WGL_STENCIL_BUFFER_BIT_ARB        0x00000008
>+typedef HANDLE (WINAPI * PFNWGLCREATEBUFFERREGIONARBPROC) (HDC hDC, int iLayerPlane, UINT uType);
>+typedef VOID (WINAPI * PFNWGLDELETEBUFFERREGIONARBPROC) (HANDLE hRegion);
>+typedef BOOL (WINAPI * PFNWGLSAVEBUFFERREGIONARBPROC) (HANDLE hRegion, int x, int y, int width, int height);
>+typedef BOOL (WINAPI * PFNWGLRESTOREBUFFERREGIONARBPROC) (HANDLE hRegion, int x, int y, int width, int height, int xSrc, int ySrc);
>+#ifdef WGL_WGLEXT_PROTOTYPES
>+HANDLE WINAPI wglCreateBufferRegionARB (HDC hDC, int iLayerPlane, UINT uType);
>+VOID WINAPI wglDeleteBufferRegionARB (HANDLE hRegion);
>+BOOL WINAPI wglSaveBufferRegionARB (HANDLE hRegion, int x, int y, int width, int height);
>+BOOL WINAPI wglRestoreBufferRegionARB (HANDLE hRegion, int x, int y, int width, int height, int xSrc, int ySrc);
>+#endif
>+#endif /* WGL_ARB_buffer_region */
>+
>+#ifndef WGL_ARB_context_flush_control
>+#define WGL_ARB_context_flush_control 1
>+#define WGL_CONTEXT_RELEASE_BEHAVIOR_ARB  0x2097
>+#define WGL_CONTEXT_RELEASE_BEHAVIOR_NONE_ARB 0
>+#define WGL_CONTEXT_RELEASE_BEHAVIOR_FLUSH_ARB 0x2098
>+#endif /* WGL_ARB_context_flush_control */
>+
>+#ifndef WGL_ARB_create_context
>+#define WGL_ARB_create_context 1
>+#define WGL_CONTEXT_DEBUG_BIT_ARB         0x00000001
>+#define WGL_CONTEXT_FORWARD_COMPATIBLE_BIT_ARB 0x00000002
>+#define WGL_CONTEXT_MAJOR_VERSION_ARB     0x2091
>+#define WGL_CONTEXT_MINOR_VERSION_ARB     0x2092
>+#define WGL_CONTEXT_LAYER_PLANE_ARB       0x2093
>+#define WGL_CONTEXT_FLAGS_ARB             0x2094
>+#define ERROR_INVALID_VERSION_ARB         0x2095
>+typedef HGLRC (WINAPI * PFNWGLCREATECONTEXTATTRIBSARBPROC) (HDC hDC, HGLRC hShareContext, const int *attribList);
>+#ifdef WGL_WGLEXT_PROTOTYPES
>+HGLRC WINAPI wglCreateContextAttribsARB (HDC hDC, HGLRC hShareContext, const int *attribList);
>+#endif
>+#endif /* WGL_ARB_create_context */
>+
>+#ifndef WGL_ARB_create_context_no_error
>+#define WGL_ARB_create_context_no_error 1
>+#define WGL_CONTEXT_OPENGL_NO_ERROR_ARB   0x31B3
>+#endif /* WGL_ARB_create_context_no_error */
>+
>+#ifndef WGL_ARB_create_context_profile
>+#define WGL_ARB_create_context_profile 1
>+#define WGL_CONTEXT_PROFILE_MASK_ARB      0x9126
>+#define WGL_CONTEXT_CORE_PROFILE_BIT_ARB  0x00000001
>+#define WGL_CONTEXT_COMPATIBILITY_PROFILE_BIT_ARB 0x00000002
>+#define ERROR_INVALID_PROFILE_ARB         0x2096
>+#endif /* WGL_ARB_create_context_profile */
>+
>+#ifndef WGL_ARB_create_context_robustness
>+#define WGL_ARB_create_context_robustness 1
>+#define WGL_CONTEXT_ROBUST_ACCESS_BIT_ARB 0x00000004
>+#define WGL_LOSE_CONTEXT_ON_RESET_ARB     0x8252
>+#define WGL_CONTEXT_RESET_NOTIFICATION_STRATEGY_ARB 0x8256
>+#define WGL_NO_RESET_NOTIFICATION_ARB     0x8261
>+#endif /* WGL_ARB_create_context_robustness */
>+
>+#ifndef WGL_ARB_extensions_string
>+#define WGL_ARB_extensions_string 1
>+typedef const char *(WINAPI * PFNWGLGETEXTENSIONSSTRINGARBPROC) (HDC hdc);
>+#ifdef WGL_WGLEXT_PROTOTYPES
>+const char *WINAPI wglGetExtensionsStringARB (HDC hdc);
>+#endif
>+#endif /* WGL_ARB_extensions_string */
>+
>+#ifndef WGL_ARB_framebuffer_sRGB
>+#define WGL_ARB_framebuffer_sRGB 1
>+#define WGL_FRAMEBUFFER_SRGB_CAPABLE_ARB  0x20A9
>+#endif /* WGL_ARB_framebuffer_sRGB */
>+
>+#ifndef WGL_ARB_make_current_read
>+#define WGL_ARB_make_current_read 1
>+#define ERROR_INVALID_PIXEL_TYPE_ARB      0x2043
>+#define ERROR_INCOMPATIBLE_DEVICE_CONTEXTS_ARB 0x2054
>+typedef BOOL (WINAPI * PFNWGLMAKECONTEXTCURRENTARBPROC) (HDC hDrawDC, HDC hReadDC, HGLRC hglrc);
>+typedef HDC (WINAPI * PFNWGLGETCURRENTREADDCARBPROC) (void);
>+#ifdef WGL_WGLEXT_PROTOTYPES
>+BOOL WINAPI wglMakeContextCurrentARB (HDC hDrawDC, HDC hReadDC, HGLRC hglrc);
>+HDC WINAPI wglGetCurrentReadDCARB (void);
>+#endif
>+#endif /* WGL_ARB_make_current_read */
>+
>+#ifndef WGL_ARB_multisample
>+#define WGL_ARB_multisample 1
>+#define WGL_SAMPLE_BUFFERS_ARB            0x2041
>+#define WGL_SAMPLES_ARB                   0x2042
>+#endif /* WGL_ARB_multisample */
>+
>+#ifndef WGL_ARB_pbuffer
>+#define WGL_ARB_pbuffer 1
>+DECLARE_HANDLE(HPBUFFERARB);
>+#define WGL_DRAW_TO_PBUFFER_ARB           0x202D
>+#define WGL_MAX_PBUFFER_PIXELS_ARB        0x202E
>+#define WGL_MAX_PBUFFER_WIDTH_ARB         0x202F
>+#define WGL_MAX_PBUFFER_HEIGHT_ARB        0x2030
>+#define WGL_PBUFFER_LARGEST_ARB           0x2033
>+#define WGL_PBUFFER_WIDTH_ARB             0x2034
>+#define WGL_PBUFFER_HEIGHT_ARB            0x2035
>+#define WGL_PBUFFER_LOST_ARB              0x2036
>+typedef HPBUFFERARB (WINAPI * PFNWGLCREATEPBUFFERARBPROC) (HDC hDC, int iPixelFormat, int iWidth, int iHeight, const int *piAttribList);
>+typedef HDC (WINAPI * PFNWGLGETPBUFFERDCARBPROC) (HPBUFFERARB hPbuffer);
>+typedef int (WINAPI * PFNWGLRELEASEPBUFFERDCARBPROC) (HPBUFFERARB hPbuffer, HDC hDC);
>+typedef BOOL (WINAPI * PFNWGLDESTROYPBUFFERARBPROC) (HPBUFFERARB hPbuffer);
>+typedef BOOL (WINAPI * PFNWGLQUERYPBUFFERARBPROC) (HPBUFFERARB hPbuffer, int iAttribute, int *piValue);
>+#ifdef WGL_WGLEXT_PROTOTYPES
>+HPBUFFERARB WINAPI wglCreatePbufferARB (HDC hDC, int iPixelFormat, int iWidth, int iHeight, const int *piAttribList);
>+HDC WINAPI wglGetPbufferDCARB (HPBUFFERARB hPbuffer);
>+int WINAPI wglReleasePbufferDCARB (HPBUFFERARB hPbuffer, HDC hDC);
>+BOOL WINAPI wglDestroyPbufferARB (HPBUFFERARB hPbuffer);
>+BOOL WINAPI wglQueryPbufferARB (HPBUFFERARB hPbuffer, int iAttribute, int *piValue);
>+#endif
>+#endif /* WGL_ARB_pbuffer */
>+
>+#ifndef WGL_ARB_pixel_format
>+#define WGL_ARB_pixel_format 1
>+#define WGL_NUMBER_PIXEL_FORMATS_ARB      0x2000
>+#define WGL_DRAW_TO_WINDOW_ARB            0x2001
>+#define WGL_DRAW_TO_BITMAP_ARB            0x2002
>+#define WGL_ACCELERATION_ARB              0x2003
>+#define WGL_NEED_PALETTE_ARB              0x2004
>+#define WGL_NEED_SYSTEM_PALETTE_ARB       0x2005
>+#define WGL_SWAP_LAYER_BUFFERS_ARB        0x2006
>+#define WGL_SWAP_METHOD_ARB               0x2007
>+#define WGL_NUMBER_OVERLAYS_ARB           0x2008
>+#define WGL_NUMBER_UNDERLAYS_ARB          0x2009
>+#define WGL_TRANSPARENT_ARB               0x200A
>+#define WGL_TRANSPARENT_RED_VALUE_ARB     0x2037
>+#define WGL_TRANSPARENT_GREEN_VALUE_ARB   0x2038
>+#define WGL_TRANSPARENT_BLUE_VALUE_ARB    0x2039
>+#define WGL_TRANSPARENT_ALPHA_VALUE_ARB   0x203A
>+#define WGL_TRANSPARENT_INDEX_VALUE_ARB   0x203B
>+#define WGL_SHARE_DEPTH_ARB               0x200C
>+#define WGL_SHARE_STENCIL_ARB             0x200D
>+#define WGL_SHARE_ACCUM_ARB               0x200E
>+#define WGL_SUPPORT_GDI_ARB               0x200F
>+#define WGL_SUPPORT_OPENGL_ARB            0x2010
>+#define WGL_DOUBLE_BUFFER_ARB             0x2011
>+#define WGL_STEREO_ARB                    0x2012
>+#define WGL_PIXEL_TYPE_ARB                0x2013
>+#define WGL_COLOR_BITS_ARB                0x2014
>+#define WGL_RED_BITS_ARB                  0x2015
>+#define WGL_RED_SHIFT_ARB                 0x2016
>+#define WGL_GREEN_BITS_ARB                0x2017
>+#define WGL_GREEN_SHIFT_ARB               0x2018
>+#define WGL_BLUE_BITS_ARB                 0x2019
>+#define WGL_BLUE_SHIFT_ARB                0x201A
>+#define WGL_ALPHA_BITS_ARB                0x201B
>+#define WGL_ALPHA_SHIFT_ARB               0x201C
>+#define WGL_ACCUM_BITS_ARB                0x201D
>+#define WGL_ACCUM_RED_BITS_ARB            0x201E
>+#define WGL_ACCUM_GREEN_BITS_ARB          0x201F
>+#define WGL_ACCUM_BLUE_BITS_ARB           0x2020
>+#define WGL_ACCUM_ALPHA_BITS_ARB          0x2021
>+#define WGL_DEPTH_BITS_ARB                0x2022
>+#define WGL_STENCIL_BITS_ARB              0x2023
>+#define WGL_AUX_BUFFERS_ARB               0x2024
>+#define WGL_NO_ACCELERATION_ARB           0x2025
>+#define WGL_GENERIC_ACCELERATION_ARB      0x2026
>+#define WGL_FULL_ACCELERATION_ARB         0x2027
>+#define WGL_SWAP_EXCHANGE_ARB             0x2028
>+#define WGL_SWAP_COPY_ARB                 0x2029
>+#define WGL_SWAP_UNDEFINED_ARB            0x202A
>+#define WGL_TYPE_RGBA_ARB                 0x202B
>+#define WGL_TYPE_COLORINDEX_ARB           0x202C
>+typedef BOOL (WINAPI * PFNWGLGETPIXELFORMATATTRIBIVARBPROC) (HDC hdc, int iPixelFormat, int iLayerPlane, UINT nAttributes, const int *piAttributes, int *piValues);
>+typedef BOOL (WINAPI * PFNWGLGETPIXELFORMATATTRIBFVARBPROC) (HDC hdc, int iPixelFormat, int iLayerPlane, UINT nAttributes, const int *piAttributes, FLOAT *pfValues);
>+typedef BOOL (WINAPI * PFNWGLCHOOSEPIXELFORMATARBPROC) (HDC hdc, const int *piAttribIList, const FLOAT *pfAttribFList, UINT nMaxFormats, int *piFormats, UINT *nNumFormats);
>+#ifdef WGL_WGLEXT_PROTOTYPES
>+BOOL WINAPI wglGetPixelFormatAttribivARB (HDC hdc, int iPixelFormat, int iLayerPlane, UINT nAttributes, const int *piAttributes, int *piValues);
>+BOOL WINAPI wglGetPixelFormatAttribfvARB (HDC hdc, int iPixelFormat, int iLayerPlane, UINT nAttributes, const int *piAttributes, FLOAT *pfValues);
>+BOOL WINAPI wglChoosePixelFormatARB (HDC hdc, const int *piAttribIList, const FLOAT *pfAttribFList, UINT nMaxFormats, int *piFormats, UINT *nNumFormats);
>+#endif
>+#endif /* WGL_ARB_pixel_format */
>+
>+#ifndef WGL_ARB_pixel_format_float
>+#define WGL_ARB_pixel_format_float 1
>+#define WGL_TYPE_RGBA_FLOAT_ARB           0x21A0
>+#endif /* WGL_ARB_pixel_format_float */
>+
>+#ifndef WGL_ARB_render_texture
>+#define WGL_ARB_render_texture 1
>+#define WGL_BIND_TO_TEXTURE_RGB_ARB       0x2070
>+#define WGL_BIND_TO_TEXTURE_RGBA_ARB      0x2071
>+#define WGL_TEXTURE_FORMAT_ARB            0x2072
>+#define WGL_TEXTURE_TARGET_ARB            0x2073
>+#define WGL_MIPMAP_TEXTURE_ARB            0x2074
>+#define WGL_TEXTURE_RGB_ARB               0x2075
>+#define WGL_TEXTURE_RGBA_ARB              0x2076
>+#define WGL_NO_TEXTURE_ARB                0x2077
>+#define WGL_TEXTURE_CUBE_MAP_ARB          0x2078
>+#define WGL_TEXTURE_1D_ARB                0x2079
>+#define WGL_TEXTURE_2D_ARB                0x207A
>+#define WGL_MIPMAP_LEVEL_ARB              0x207B
>+#define WGL_CUBE_MAP_FACE_ARB             0x207C
>+#define WGL_TEXTURE_CUBE_MAP_POSITIVE_X_ARB 0x207D
>+#define WGL_TEXTURE_CUBE_MAP_NEGATIVE_X_ARB 0x207E
>+#define WGL_TEXTURE_CUBE_MAP_POSITIVE_Y_ARB 0x207F
>+#define WGL_TEXTURE_CUBE_MAP_NEGATIVE_Y_ARB 0x2080
>+#define WGL_TEXTURE_CUBE_MAP_POSITIVE_Z_ARB 0x2081
>+#define WGL_TEXTURE_CUBE_MAP_NEGATIVE_Z_ARB 0x2082
>+#define WGL_FRONT_LEFT_ARB                0x2083
>+#define WGL_FRONT_RIGHT_ARB               0x2084
>+#define WGL_BACK_LEFT_ARB                 0x2085
>+#define WGL_BACK_RIGHT_ARB                0x2086
>+#define WGL_AUX0_ARB                      0x2087
>+#define WGL_AUX1_ARB                      0x2088
>+#define WGL_AUX2_ARB                      0x2089
>+#define WGL_AUX3_ARB                      0x208A
>+#define WGL_AUX4_ARB                      0x208B
>+#define WGL_AUX5_ARB                      0x208C
>+#define WGL_AUX6_ARB                      0x208D
>+#define WGL_AUX7_ARB                      0x208E
>+#define WGL_AUX8_ARB                      0x208F
>+#define WGL_AUX9_ARB                      0x2090
>+typedef BOOL (WINAPI * PFNWGLBINDTEXIMAGEARBPROC) (HPBUFFERARB hPbuffer, int iBuffer);
>+typedef BOOL (WINAPI * PFNWGLRELEASETEXIMAGEARBPROC) (HPBUFFERARB hPbuffer, int iBuffer);
>+typedef BOOL (WINAPI * PFNWGLSETPBUFFERATTRIBARBPROC) (HPBUFFERARB hPbuffer, const int *piAttribList);
>+#ifdef WGL_WGLEXT_PROTOTYPES
>+BOOL WINAPI wglBindTexImageARB (HPBUFFERARB hPbuffer, int iBuffer);
>+BOOL WINAPI wglReleaseTexImageARB (HPBUFFERARB hPbuffer, int iBuffer);
>+BOOL WINAPI wglSetPbufferAttribARB (HPBUFFERARB hPbuffer, const int *piAttribList);
>+#endif
>+#endif /* WGL_ARB_render_texture */
>+
>+#ifndef WGL_ARB_robustness_application_isolation
>+#define WGL_ARB_robustness_application_isolation 1
>+#define WGL_CONTEXT_RESET_ISOLATION_BIT_ARB 0x00000008
>+#endif /* WGL_ARB_robustness_application_isolation */
>+
>+#ifndef WGL_ARB_robustness_share_group_isolation
>+#define WGL_ARB_robustness_share_group_isolation 1
>+#endif /* WGL_ARB_robustness_share_group_isolation */
>+
>+#ifndef WGL_3DFX_multisample
>+#define WGL_3DFX_multisample 1
>+#define WGL_SAMPLE_BUFFERS_3DFX           0x2060
>+#define WGL_SAMPLES_3DFX                  0x2061
>+#endif /* WGL_3DFX_multisample */
>+
>+#ifndef WGL_3DL_stereo_control
>+#define WGL_3DL_stereo_control 1
>+#define WGL_STEREO_EMITTER_ENABLE_3DL     0x2055
>+#define WGL_STEREO_EMITTER_DISABLE_3DL    0x2056
>+#define WGL_STEREO_POLARITY_NORMAL_3DL    0x2057
>+#define WGL_STEREO_POLARITY_INVERT_3DL    0x2058
>+typedef BOOL (WINAPI * PFNWGLSETSTEREOEMITTERSTATE3DLPROC) (HDC hDC, UINT uState);
>+#ifdef WGL_WGLEXT_PROTOTYPES
>+BOOL WINAPI wglSetStereoEmitterState3DL (HDC hDC, UINT uState);
>+#endif
>+#endif /* WGL_3DL_stereo_control */
>+
>+#ifndef WGL_AMD_gpu_association
>+#define WGL_AMD_gpu_association 1
>+#define WGL_GPU_VENDOR_AMD                0x1F00
>+#define WGL_GPU_RENDERER_STRING_AMD       0x1F01
>+#define WGL_GPU_OPENGL_VERSION_STRING_AMD 0x1F02
>+#define WGL_GPU_FASTEST_TARGET_GPUS_AMD   0x21A2
>+#define WGL_GPU_RAM_AMD                   0x21A3
>+#define WGL_GPU_CLOCK_AMD                 0x21A4
>+#define WGL_GPU_NUM_PIPES_AMD             0x21A5
>+#define WGL_GPU_NUM_SIMD_AMD              0x21A6
>+#define WGL_GPU_NUM_RB_AMD                0x21A7
>+#define WGL_GPU_NUM_SPI_AMD               0x21A8
>+typedef UINT (WINAPI * PFNWGLGETGPUIDSAMDPROC) (UINT maxCount, UINT *ids);
>+typedef INT (WINAPI * PFNWGLGETGPUINFOAMDPROC) (UINT id, int property, GLenum dataType, UINT size, void *data);
>+typedef UINT (WINAPI * PFNWGLGETCONTEXTGPUIDAMDPROC) (HGLRC hglrc);
>+typedef HGLRC (WINAPI * PFNWGLCREATEASSOCIATEDCONTEXTAMDPROC) (UINT id);
>+typedef HGLRC (WINAPI * PFNWGLCREATEASSOCIATEDCONTEXTATTRIBSAMDPROC) (UINT id, HGLRC hShareContext, const int *attribList);
>+typedef BOOL (WINAPI * PFNWGLDELETEASSOCIATEDCONTEXTAMDPROC) (HGLRC hglrc);
>+typedef BOOL (WINAPI * PFNWGLMAKEASSOCIATEDCONTEXTCURRENTAMDPROC) (HGLRC hglrc);
>+typedef HGLRC (WINAPI * PFNWGLGETCURRENTASSOCIATEDCONTEXTAMDPROC) (void);
>+typedef VOID (WINAPI * PFNWGLBLITCONTEXTFRAMEBUFFERAMDPROC) (HGLRC dstCtx, GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter);
>+#ifdef WGL_WGLEXT_PROTOTYPES
>+UINT WINAPI wglGetGPUIDsAMD (UINT maxCount, UINT *ids);
>+INT WINAPI wglGetGPUInfoAMD (UINT id, int property, GLenum dataType, UINT size, void *data);
>+UINT WINAPI wglGetContextGPUIDAMD (HGLRC hglrc);
>+HGLRC WINAPI wglCreateAssociatedContextAMD (UINT id);
>+HGLRC WINAPI wglCreateAssociatedContextAttribsAMD (UINT id, HGLRC hShareContext, const int *attribList);
>+BOOL WINAPI wglDeleteAssociatedContextAMD (HGLRC hglrc);
>+BOOL WINAPI wglMakeAssociatedContextCurrentAMD (HGLRC hglrc);
>+HGLRC WINAPI wglGetCurrentAssociatedContextAMD (void);
>+VOID WINAPI wglBlitContextFramebufferAMD (HGLRC dstCtx, GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter);
>+#endif
>+#endif /* WGL_AMD_gpu_association */
>+
>+#ifndef WGL_ATI_pixel_format_float
>+#define WGL_ATI_pixel_format_float 1
>+#define WGL_TYPE_RGBA_FLOAT_ATI           0x21A0
>+#endif /* WGL_ATI_pixel_format_float */
>+
>+#ifndef WGL_ATI_render_texture_rectangle
>+#define WGL_ATI_render_texture_rectangle 1
>+#define WGL_TEXTURE_RECTANGLE_ATI         0x21A5
>+#endif /* WGL_ATI_render_texture_rectangle */
>+
>+#ifndef WGL_EXT_colorspace
>+#define WGL_EXT_colorspace 1
>+#define WGL_COLORSPACE_EXT                0x309D
>+#define WGL_COLORSPACE_SRGB_EXT           0x3089
>+#define WGL_COLORSPACE_LINEAR_EXT         0x308A
>+#endif /* WGL_EXT_colorspace */
>+
>+#ifndef WGL_EXT_create_context_es2_profile
>+#define WGL_EXT_create_context_es2_profile 1
>+#define WGL_CONTEXT_ES2_PROFILE_BIT_EXT   0x00000004
>+#endif /* WGL_EXT_create_context_es2_profile */
>+
>+#ifndef WGL_EXT_create_context_es_profile
>+#define WGL_EXT_create_context_es_profile 1
>+#define WGL_CONTEXT_ES_PROFILE_BIT_EXT    0x00000004
>+#endif /* WGL_EXT_create_context_es_profile */
>+
>+#ifndef WGL_EXT_depth_float
>+#define WGL_EXT_depth_float 1
>+#define WGL_DEPTH_FLOAT_EXT               0x2040
>+#endif /* WGL_EXT_depth_float */
>+
>+#ifndef WGL_EXT_display_color_table
>+#define WGL_EXT_display_color_table 1
>+typedef GLboolean (WINAPI * PFNWGLCREATEDISPLAYCOLORTABLEEXTPROC) (GLushort id);
>+typedef GLboolean (WINAPI * PFNWGLLOADDISPLAYCOLORTABLEEXTPROC) (const GLushort *table, GLuint length);
>+typedef GLboolean (WINAPI * PFNWGLBINDDISPLAYCOLORTABLEEXTPROC) (GLushort id);
>+typedef VOID (WINAPI * PFNWGLDESTROYDISPLAYCOLORTABLEEXTPROC) (GLushort id);
>+#ifdef WGL_WGLEXT_PROTOTYPES
>+GLboolean WINAPI wglCreateDisplayColorTableEXT (GLushort id);
>+GLboolean WINAPI wglLoadDisplayColorTableEXT (const GLushort *table, GLuint length);
>+GLboolean WINAPI wglBindDisplayColorTableEXT (GLushort id);
>+VOID WINAPI wglDestroyDisplayColorTableEXT (GLushort id);
>+#endif
>+#endif /* WGL_EXT_display_color_table */
>+
>+#ifndef WGL_EXT_extensions_string
>+#define WGL_EXT_extensions_string 1
>+typedef const char *(WINAPI * PFNWGLGETEXTENSIONSSTRINGEXTPROC) (void);
>+#ifdef WGL_WGLEXT_PROTOTYPES
>+const char *WINAPI wglGetExtensionsStringEXT (void);
>+#endif
>+#endif /* WGL_EXT_extensions_string */
>+
>+#ifndef WGL_EXT_framebuffer_sRGB
>+#define WGL_EXT_framebuffer_sRGB 1
>+#define WGL_FRAMEBUFFER_SRGB_CAPABLE_EXT  0x20A9
>+#endif /* WGL_EXT_framebuffer_sRGB */
>+
>+#ifndef WGL_EXT_make_current_read
>+#define WGL_EXT_make_current_read 1
>+#define ERROR_INVALID_PIXEL_TYPE_EXT      0x2043
>+typedef BOOL (WINAPI * PFNWGLMAKECONTEXTCURRENTEXTPROC) (HDC hDrawDC, HDC hReadDC, HGLRC hglrc);
>+typedef HDC (WINAPI * PFNWGLGETCURRENTREADDCEXTPROC) (void);
>+#ifdef WGL_WGLEXT_PROTOTYPES
>+BOOL WINAPI wglMakeContextCurrentEXT (HDC hDrawDC, HDC hReadDC, HGLRC hglrc);
>+HDC WINAPI wglGetCurrentReadDCEXT (void);
>+#endif
>+#endif /* WGL_EXT_make_current_read */
>+
>+#ifndef WGL_EXT_multisample
>+#define WGL_EXT_multisample 1
>+#define WGL_SAMPLE_BUFFERS_EXT            0x2041
>+#define WGL_SAMPLES_EXT                   0x2042
>+#endif /* WGL_EXT_multisample */
>+
>+#ifndef WGL_EXT_pbuffer
>+#define WGL_EXT_pbuffer 1
>+DECLARE_HANDLE(HPBUFFEREXT);
>+#define WGL_DRAW_TO_PBUFFER_EXT           0x202D
>+#define WGL_MAX_PBUFFER_PIXELS_EXT        0x202E
>+#define WGL_MAX_PBUFFER_WIDTH_EXT         0x202F
>+#define WGL_MAX_PBUFFER_HEIGHT_EXT        0x2030
>+#define WGL_OPTIMAL_PBUFFER_WIDTH_EXT     0x2031
>+#define WGL_OPTIMAL_PBUFFER_HEIGHT_EXT    0x2032
>+#define WGL_PBUFFER_LARGEST_EXT           0x2033
>+#define WGL_PBUFFER_WIDTH_EXT             0x2034
>+#define WGL_PBUFFER_HEIGHT_EXT            0x2035
>+typedef HPBUFFEREXT (WINAPI * PFNWGLCREATEPBUFFEREXTPROC) (HDC hDC, int iPixelFormat, int iWidth, int iHeight, const int *piAttribList);
>+typedef HDC (WINAPI * PFNWGLGETPBUFFERDCEXTPROC) (HPBUFFEREXT hPbuffer);
>+typedef int (WINAPI * PFNWGLRELEASEPBUFFERDCEXTPROC) (HPBUFFEREXT hPbuffer, HDC hDC);
>+typedef BOOL (WINAPI * PFNWGLDESTROYPBUFFEREXTPROC) (HPBUFFEREXT hPbuffer);
>+typedef BOOL (WINAPI * PFNWGLQUERYPBUFFEREXTPROC) (HPBUFFEREXT hPbuffer, int iAttribute, int *piValue);
>+#ifdef WGL_WGLEXT_PROTOTYPES
>+HPBUFFEREXT WINAPI wglCreatePbufferEXT (HDC hDC, int iPixelFormat, int iWidth, int iHeight, const int *piAttribList);
>+HDC WINAPI wglGetPbufferDCEXT (HPBUFFEREXT hPbuffer);
>+int WINAPI wglReleasePbufferDCEXT (HPBUFFEREXT hPbuffer, HDC hDC);
>+BOOL WINAPI wglDestroyPbufferEXT (HPBUFFEREXT hPbuffer);
>+BOOL WINAPI wglQueryPbufferEXT (HPBUFFEREXT hPbuffer, int iAttribute, int *piValue);
>+#endif
>+#endif /* WGL_EXT_pbuffer */
>+
>+#ifndef WGL_EXT_pixel_format
>+#define WGL_EXT_pixel_format 1
>+#define WGL_NUMBER_PIXEL_FORMATS_EXT      0x2000
>+#define WGL_DRAW_TO_WINDOW_EXT            0x2001
>+#define WGL_DRAW_TO_BITMAP_EXT            0x2002
>+#define WGL_ACCELERATION_EXT              0x2003
>+#define WGL_NEED_PALETTE_EXT              0x2004
>+#define WGL_NEED_SYSTEM_PALETTE_EXT       0x2005
>+#define WGL_SWAP_LAYER_BUFFERS_EXT        0x2006
>+#define WGL_SWAP_METHOD_EXT               0x2007
>+#define WGL_NUMBER_OVERLAYS_EXT           0x2008
>+#define WGL_NUMBER_UNDERLAYS_EXT          0x2009
>+#define WGL_TRANSPARENT_EXT               0x200A
>+#define WGL_TRANSPARENT_VALUE_EXT         0x200B
>+#define WGL_SHARE_DEPTH_EXT               0x200C
>+#define WGL_SHARE_STENCIL_EXT             0x200D
>+#define WGL_SHARE_ACCUM_EXT               0x200E
>+#define WGL_SUPPORT_GDI_EXT               0x200F
>+#define WGL_SUPPORT_OPENGL_EXT            0x2010
>+#define WGL_DOUBLE_BUFFER_EXT             0x2011
>+#define WGL_STEREO_EXT                    0x2012
>+#define WGL_PIXEL_TYPE_EXT                0x2013
>+#define WGL_COLOR_BITS_EXT                0x2014
>+#define WGL_RED_BITS_EXT                  0x2015
>+#define WGL_RED_SHIFT_EXT                 0x2016
>+#define WGL_GREEN_BITS_EXT                0x2017
>+#define WGL_GREEN_SHIFT_EXT               0x2018
>+#define WGL_BLUE_BITS_EXT                 0x2019
>+#define WGL_BLUE_SHIFT_EXT                0x201A
>+#define WGL_ALPHA_BITS_EXT                0x201B
>+#define WGL_ALPHA_SHIFT_EXT               0x201C
>+#define WGL_ACCUM_BITS_EXT                0x201D
>+#define WGL_ACCUM_RED_BITS_EXT            0x201E
>+#define WGL_ACCUM_GREEN_BITS_EXT          0x201F
>+#define WGL_ACCUM_BLUE_BITS_EXT           0x2020
>+#define WGL_ACCUM_ALPHA_BITS_EXT          0x2021
>+#define WGL_DEPTH_BITS_EXT                0x2022
>+#define WGL_STENCIL_BITS_EXT              0x2023
>+#define WGL_AUX_BUFFERS_EXT               0x2024
>+#define WGL_NO_ACCELERATION_EXT           0x2025
>+#define WGL_GENERIC_ACCELERATION_EXT      0x2026
>+#define WGL_FULL_ACCELERATION_EXT         0x2027
>+#define WGL_SWAP_EXCHANGE_EXT             0x2028
>+#define WGL_SWAP_COPY_EXT                 0x2029
>+#define WGL_SWAP_UNDEFINED_EXT            0x202A
>+#define WGL_TYPE_RGBA_EXT                 0x202B
>+#define WGL_TYPE_COLORINDEX_EXT           0x202C
>+typedef BOOL (WINAPI * PFNWGLGETPIXELFORMATATTRIBIVEXTPROC) (HDC hdc, int iPixelFormat, int iLayerPlane, UINT nAttributes, int *piAttributes, int *piValues);
>+typedef BOOL (WINAPI * PFNWGLGETPIXELFORMATATTRIBFVEXTPROC) (HDC hdc, int iPixelFormat, int iLayerPlane, UINT nAttributes, int *piAttributes, FLOAT *pfValues);
>+typedef BOOL (WINAPI * PFNWGLCHOOSEPIXELFORMATEXTPROC) (HDC hdc, const int *piAttribIList, const FLOAT *pfAttribFList, UINT nMaxFormats, int *piFormats, UINT *nNumFormats);
>+#ifdef WGL_WGLEXT_PROTOTYPES
>+BOOL WINAPI wglGetPixelFormatAttribivEXT (HDC hdc, int iPixelFormat, int iLayerPlane, UINT nAttributes, int *piAttributes, int *piValues);
>+BOOL WINAPI wglGetPixelFormatAttribfvEXT (HDC hdc, int iPixelFormat, int iLayerPlane, UINT nAttributes, int *piAttributes, FLOAT *pfValues);
>+BOOL WINAPI wglChoosePixelFormatEXT (HDC hdc, const int *piAttribIList, const FLOAT *pfAttribFList, UINT nMaxFormats, int *piFormats, UINT *nNumFormats);
>+#endif
>+#endif /* WGL_EXT_pixel_format */
>+
>+#ifndef WGL_EXT_pixel_format_packed_float
>+#define WGL_EXT_pixel_format_packed_float 1
>+#define WGL_TYPE_RGBA_UNSIGNED_FLOAT_EXT  0x20A8
>+#endif /* WGL_EXT_pixel_format_packed_float */
>+
>+#ifndef WGL_EXT_swap_control
>+#define WGL_EXT_swap_control 1
>+typedef BOOL (WINAPI * PFNWGLSWAPINTERVALEXTPROC) (int interval);
>+typedef int (WINAPI * PFNWGLGETSWAPINTERVALEXTPROC) (void);
>+#ifdef WGL_WGLEXT_PROTOTYPES
>+BOOL WINAPI wglSwapIntervalEXT (int interval);
>+int WINAPI wglGetSwapIntervalEXT (void);
>+#endif
>+#endif /* WGL_EXT_swap_control */
>+
>+#ifndef WGL_EXT_swap_control_tear
>+#define WGL_EXT_swap_control_tear 1
>+#endif /* WGL_EXT_swap_control_tear */
>+
>+#ifndef WGL_I3D_digital_video_control
>+#define WGL_I3D_digital_video_control 1
>+#define WGL_DIGITAL_VIDEO_CURSOR_ALPHA_FRAMEBUFFER_I3D 0x2050
>+#define WGL_DIGITAL_VIDEO_CURSOR_ALPHA_VALUE_I3D 0x2051
>+#define WGL_DIGITAL_VIDEO_CURSOR_INCLUDED_I3D 0x2052
>+#define WGL_DIGITAL_VIDEO_GAMMA_CORRECTED_I3D 0x2053
>+typedef BOOL (WINAPI * PFNWGLGETDIGITALVIDEOPARAMETERSI3DPROC) (HDC hDC, int iAttribute, int *piValue);
>+typedef BOOL (WINAPI * PFNWGLSETDIGITALVIDEOPARAMETERSI3DPROC) (HDC hDC, int iAttribute, const int *piValue);
>+#ifdef WGL_WGLEXT_PROTOTYPES
>+BOOL WINAPI wglGetDigitalVideoParametersI3D (HDC hDC, int iAttribute, int *piValue);
>+BOOL WINAPI wglSetDigitalVideoParametersI3D (HDC hDC, int iAttribute, const int *piValue);
>+#endif
>+#endif /* WGL_I3D_digital_video_control */
>+
>+#ifndef WGL_I3D_gamma
>+#define WGL_I3D_gamma 1
>+#define WGL_GAMMA_TABLE_SIZE_I3D          0x204E
>+#define WGL_GAMMA_EXCLUDE_DESKTOP_I3D     0x204F
>+typedef BOOL (WINAPI * PFNWGLGETGAMMATABLEPARAMETERSI3DPROC) (HDC hDC, int iAttribute, int *piValue);
>+typedef BOOL (WINAPI * PFNWGLSETGAMMATABLEPARAMETERSI3DPROC) (HDC hDC, int iAttribute, const int *piValue);
>+typedef BOOL (WINAPI * PFNWGLGETGAMMATABLEI3DPROC) (HDC hDC, int iEntries, USHORT *puRed, USHORT *puGreen, USHORT *puBlue);
>+typedef BOOL (WINAPI * PFNWGLSETGAMMATABLEI3DPROC) (HDC hDC, int iEntries, const USHORT *puRed, const USHORT *puGreen, const USHORT *puBlue);
>+#ifdef WGL_WGLEXT_PROTOTYPES
>+BOOL WINAPI wglGetGammaTableParametersI3D (HDC hDC, int iAttribute, int *piValue);
>+BOOL WINAPI wglSetGammaTableParametersI3D (HDC hDC, int iAttribute, const int *piValue);
>+BOOL WINAPI wglGetGammaTableI3D (HDC hDC, int iEntries, USHORT *puRed, USHORT *puGreen, USHORT *puBlue);
>+BOOL WINAPI wglSetGammaTableI3D (HDC hDC, int iEntries, const USHORT *puRed, const USHORT *puGreen, const USHORT *puBlue);
>+#endif
>+#endif /* WGL_I3D_gamma */
>+
>+#ifndef WGL_I3D_genlock
>+#define WGL_I3D_genlock 1
>+#define WGL_GENLOCK_SOURCE_MULTIVIEW_I3D  0x2044
>+#define WGL_GENLOCK_SOURCE_EXTERNAL_SYNC_I3D 0x2045
>+#define WGL_GENLOCK_SOURCE_EXTERNAL_FIELD_I3D 0x2046
>+#define WGL_GENLOCK_SOURCE_EXTERNAL_TTL_I3D 0x2047
>+#define WGL_GENLOCK_SOURCE_DIGITAL_SYNC_I3D 0x2048
>+#define WGL_GENLOCK_SOURCE_DIGITAL_FIELD_I3D 0x2049
>+#define WGL_GENLOCK_SOURCE_EDGE_FALLING_I3D 0x204A
>+#define WGL_GENLOCK_SOURCE_EDGE_RISING_I3D 0x204B
>+#define WGL_GENLOCK_SOURCE_EDGE_BOTH_I3D  0x204C
>+typedef BOOL (WINAPI * PFNWGLENABLEGENLOCKI3DPROC) (HDC hDC);
>+typedef BOOL (WINAPI * PFNWGLDISABLEGENLOCKI3DPROC) (HDC hDC);
>+typedef BOOL (WINAPI * PFNWGLISENABLEDGENLOCKI3DPROC) (HDC hDC, BOOL *pFlag);
>+typedef BOOL (WINAPI * PFNWGLGENLOCKSOURCEI3DPROC) (HDC hDC, UINT uSource);
>+typedef BOOL (WINAPI * PFNWGLGETGENLOCKSOURCEI3DPROC) (HDC hDC, UINT *uSource);
>+typedef BOOL (WINAPI * PFNWGLGENLOCKSOURCEEDGEI3DPROC) (HDC hDC, UINT uEdge);
>+typedef BOOL (WINAPI * PFNWGLGETGENLOCKSOURCEEDGEI3DPROC) (HDC hDC, UINT *uEdge);
>+typedef BOOL (WINAPI * PFNWGLGENLOCKSAMPLERATEI3DPROC) (HDC hDC, UINT uRate);
>+typedef BOOL (WINAPI * PFNWGLGETGENLOCKSAMPLERATEI3DPROC) (HDC hDC, UINT *uRate);
>+typedef BOOL (WINAPI * PFNWGLGENLOCKSOURCEDELAYI3DPROC) (HDC hDC, UINT uDelay);
>+typedef BOOL (WINAPI * PFNWGLGETGENLOCKSOURCEDELAYI3DPROC) (HDC hDC, UINT *uDelay);
>+typedef BOOL (WINAPI * PFNWGLQUERYGENLOCKMAXSOURCEDELAYI3DPROC) (HDC hDC, UINT *uMaxLineDelay, UINT *uMaxPixelDelay);
>+#ifdef WGL_WGLEXT_PROTOTYPES
>+BOOL WINAPI wglEnableGenlockI3D (HDC hDC);
>+BOOL WINAPI wglDisableGenlockI3D (HDC hDC);
>+BOOL WINAPI wglIsEnabledGenlockI3D (HDC hDC, BOOL *pFlag);
>+BOOL WINAPI wglGenlockSourceI3D (HDC hDC, UINT uSource);
>+BOOL WINAPI wglGetGenlockSourceI3D (HDC hDC, UINT *uSource);
>+BOOL WINAPI wglGenlockSourceEdgeI3D (HDC hDC, UINT uEdge);
>+BOOL WINAPI wglGetGenlockSourceEdgeI3D (HDC hDC, UINT *uEdge);
>+BOOL WINAPI wglGenlockSampleRateI3D (HDC hDC, UINT uRate);
>+BOOL WINAPI wglGetGenlockSampleRateI3D (HDC hDC, UINT *uRate);
>+BOOL WINAPI wglGenlockSourceDelayI3D (HDC hDC, UINT uDelay);
>+BOOL WINAPI wglGetGenlockSourceDelayI3D (HDC hDC, UINT *uDelay);
>+BOOL WINAPI wglQueryGenlockMaxSourceDelayI3D (HDC hDC, UINT *uMaxLineDelay, UINT *uMaxPixelDelay);
>+#endif
>+#endif /* WGL_I3D_genlock */
>+
>+#ifndef WGL_I3D_image_buffer
>+#define WGL_I3D_image_buffer 1
>+#define WGL_IMAGE_BUFFER_MIN_ACCESS_I3D   0x00000001
>+#define WGL_IMAGE_BUFFER_LOCK_I3D         0x00000002
>+typedef LPVOID (WINAPI * PFNWGLCREATEIMAGEBUFFERI3DPROC) (HDC hDC, DWORD dwSize, UINT uFlags);
>+typedef BOOL (WINAPI * PFNWGLDESTROYIMAGEBUFFERI3DPROC) (HDC hDC, LPVOID pAddress);
>+typedef BOOL (WINAPI * PFNWGLASSOCIATEIMAGEBUFFEREVENTSI3DPROC) (HDC hDC, const HANDLE *pEvent, const LPVOID *pAddress, const DWORD *pSize, UINT count);
>+typedef BOOL (WINAPI * PFNWGLRELEASEIMAGEBUFFEREVENTSI3DPROC) (HDC hDC, const LPVOID *pAddress, UINT count);
>+#ifdef WGL_WGLEXT_PROTOTYPES
>+LPVOID WINAPI wglCreateImageBufferI3D (HDC hDC, DWORD dwSize, UINT uFlags);
>+BOOL WINAPI wglDestroyImageBufferI3D (HDC hDC, LPVOID pAddress);
>+BOOL WINAPI wglAssociateImageBufferEventsI3D (HDC hDC, const HANDLE *pEvent, const LPVOID *pAddress, const DWORD *pSize, UINT count);
>+BOOL WINAPI wglReleaseImageBufferEventsI3D (HDC hDC, const LPVOID *pAddress, UINT count);
>+#endif
>+#endif /* WGL_I3D_image_buffer */
>+
>+#ifndef WGL_I3D_swap_frame_lock
>+#define WGL_I3D_swap_frame_lock 1
>+typedef BOOL (WINAPI * PFNWGLENABLEFRAMELOCKI3DPROC) (void);
>+typedef BOOL (WINAPI * PFNWGLDISABLEFRAMELOCKI3DPROC) (void);
>+typedef BOOL (WINAPI * PFNWGLISENABLEDFRAMELOCKI3DPROC) (BOOL *pFlag);
>+typedef BOOL (WINAPI * PFNWGLQUERYFRAMELOCKMASTERI3DPROC) (BOOL *pFlag);
>+#ifdef WGL_WGLEXT_PROTOTYPES
>+BOOL WINAPI wglEnableFrameLockI3D (void);
>+BOOL WINAPI wglDisableFrameLockI3D (void);
>+BOOL WINAPI wglIsEnabledFrameLockI3D (BOOL *pFlag);
>+BOOL WINAPI wglQueryFrameLockMasterI3D (BOOL *pFlag);
>+#endif
>+#endif /* WGL_I3D_swap_frame_lock */
>+
>+#ifndef WGL_I3D_swap_frame_usage
>+#define WGL_I3D_swap_frame_usage 1
>+typedef BOOL (WINAPI * PFNWGLGETFRAMEUSAGEI3DPROC) (float *pUsage);
>+typedef BOOL (WINAPI * PFNWGLBEGINFRAMETRACKINGI3DPROC) (void);
>+typedef BOOL (WINAPI * PFNWGLENDFRAMETRACKINGI3DPROC) (void);
>+typedef BOOL (WINAPI * PFNWGLQUERYFRAMETRACKINGI3DPROC) (DWORD *pFrameCount, DWORD *pMissedFrames, float *pLastMissedUsage);
>+#ifdef WGL_WGLEXT_PROTOTYPES
>+BOOL WINAPI wglGetFrameUsageI3D (float *pUsage);
>+BOOL WINAPI wglBeginFrameTrackingI3D (void);
>+BOOL WINAPI wglEndFrameTrackingI3D (void);
>+BOOL WINAPI wglQueryFrameTrackingI3D (DWORD *pFrameCount, DWORD *pMissedFrames, float *pLastMissedUsage);
>+#endif
>+#endif /* WGL_I3D_swap_frame_usage */
>+
>+#ifndef WGL_NV_DX_interop
>+#define WGL_NV_DX_interop 1
>+#define WGL_ACCESS_READ_ONLY_NV           0x00000000
>+#define WGL_ACCESS_READ_WRITE_NV          0x00000001
>+#define WGL_ACCESS_WRITE_DISCARD_NV       0x00000002
>+typedef BOOL (WINAPI * PFNWGLDXSETRESOURCESHAREHANDLENVPROC) (void *dxObject, HANDLE shareHandle);
>+typedef HANDLE (WINAPI * PFNWGLDXOPENDEVICENVPROC) (void *dxDevice);
>+typedef BOOL (WINAPI * PFNWGLDXCLOSEDEVICENVPROC) (HANDLE hDevice);
>+typedef HANDLE (WINAPI * PFNWGLDXREGISTEROBJECTNVPROC) (HANDLE hDevice, void *dxObject, GLuint name, GLenum type, GLenum access);
>+typedef BOOL (WINAPI * PFNWGLDXUNREGISTEROBJECTNVPROC) (HANDLE hDevice, HANDLE hObject);
>+typedef BOOL (WINAPI * PFNWGLDXOBJECTACCESSNVPROC) (HANDLE hObject, GLenum access);
>+typedef BOOL (WINAPI * PFNWGLDXLOCKOBJECTSNVPROC) (HANDLE hDevice, GLint count, HANDLE *hObjects);
>+typedef BOOL (WINAPI * PFNWGLDXUNLOCKOBJECTSNVPROC) (HANDLE hDevice, GLint count, HANDLE *hObjects);
>+#ifdef WGL_WGLEXT_PROTOTYPES
>+BOOL WINAPI wglDXSetResourceShareHandleNV (void *dxObject, HANDLE shareHandle);
>+HANDLE WINAPI wglDXOpenDeviceNV (void *dxDevice);
>+BOOL WINAPI wglDXCloseDeviceNV (HANDLE hDevice);
>+HANDLE WINAPI wglDXRegisterObjectNV (HANDLE hDevice, void *dxObject, GLuint name, GLenum type, GLenum access);
>+BOOL WINAPI wglDXUnregisterObjectNV (HANDLE hDevice, HANDLE hObject);
>+BOOL WINAPI wglDXObjectAccessNV (HANDLE hObject, GLenum access);
>+BOOL WINAPI wglDXLockObjectsNV (HANDLE hDevice, GLint count, HANDLE *hObjects);
>+BOOL WINAPI wglDXUnlockObjectsNV (HANDLE hDevice, GLint count, HANDLE *hObjects);
>+#endif
>+#endif /* WGL_NV_DX_interop */
>+
>+#ifndef WGL_NV_DX_interop2
>+#define WGL_NV_DX_interop2 1
>+#endif /* WGL_NV_DX_interop2 */
>+
>+#ifndef WGL_NV_copy_image
>+#define WGL_NV_copy_image 1
>+typedef BOOL (WINAPI * PFNWGLCOPYIMAGESUBDATANVPROC) (HGLRC hSrcRC, GLuint srcName, GLenum srcTarget, GLint srcLevel, GLint srcX, GLint srcY, GLint srcZ, HGLRC hDstRC, GLuint dstName, GLenum dstTarget, GLint dstLevel, GLint dstX, GLint dstY, GLint dstZ, GLsizei width, GLsizei height, GLsizei depth);
>+#ifdef WGL_WGLEXT_PROTOTYPES
>+BOOL WINAPI wglCopyImageSubDataNV (HGLRC hSrcRC, GLuint srcName, GLenum srcTarget, GLint srcLevel, GLint srcX, GLint srcY, GLint srcZ, HGLRC hDstRC, GLuint dstName, GLenum dstTarget, GLint dstLevel, GLint dstX, GLint dstY, GLint dstZ, GLsizei width, GLsizei height, GLsizei depth);
>+#endif
>+#endif /* WGL_NV_copy_image */
>+
>+#ifndef WGL_NV_delay_before_swap
>+#define WGL_NV_delay_before_swap 1
>+typedef BOOL (WINAPI * PFNWGLDELAYBEFORESWAPNVPROC) (HDC hDC, GLfloat seconds);
>+#ifdef WGL_WGLEXT_PROTOTYPES
>+BOOL WINAPI wglDelayBeforeSwapNV (HDC hDC, GLfloat seconds);
>+#endif
>+#endif /* WGL_NV_delay_before_swap */
>+
>+#ifndef WGL_NV_float_buffer
>+#define WGL_NV_float_buffer 1
>+#define WGL_FLOAT_COMPONENTS_NV           0x20B0
>+#define WGL_BIND_TO_TEXTURE_RECTANGLE_FLOAT_R_NV 0x20B1
>+#define WGL_BIND_TO_TEXTURE_RECTANGLE_FLOAT_RG_NV 0x20B2
>+#define WGL_BIND_TO_TEXTURE_RECTANGLE_FLOAT_RGB_NV 0x20B3
>+#define WGL_BIND_TO_TEXTURE_RECTANGLE_FLOAT_RGBA_NV 0x20B4
>+#define WGL_TEXTURE_FLOAT_R_NV            0x20B5
>+#define WGL_TEXTURE_FLOAT_RG_NV           0x20B6
>+#define WGL_TEXTURE_FLOAT_RGB_NV          0x20B7
>+#define WGL_TEXTURE_FLOAT_RGBA_NV         0x20B8
>+#endif /* WGL_NV_float_buffer */
>+
>+#ifndef WGL_NV_gpu_affinity
>+#define WGL_NV_gpu_affinity 1
>+DECLARE_HANDLE(HGPUNV);
>+struct _GPU_DEVICE {
>+    DWORD  cb;
>+    CHAR   DeviceName[32];
>+    CHAR   DeviceString[128];
>+    DWORD  Flags;
>+    RECT   rcVirtualScreen;
>+};
>+typedef struct _GPU_DEVICE *PGPU_DEVICE;
>+#define ERROR_INCOMPATIBLE_AFFINITY_MASKS_NV 0x20D0
>+#define ERROR_MISSING_AFFINITY_MASK_NV    0x20D1
>+typedef BOOL (WINAPI * PFNWGLENUMGPUSNVPROC) (UINT iGpuIndex, HGPUNV *phGpu);
>+typedef BOOL (WINAPI * PFNWGLENUMGPUDEVICESNVPROC) (HGPUNV hGpu, UINT iDeviceIndex, PGPU_DEVICE lpGpuDevice);
>+typedef HDC (WINAPI * PFNWGLCREATEAFFINITYDCNVPROC) (const HGPUNV *phGpuList);
>+typedef BOOL (WINAPI * PFNWGLENUMGPUSFROMAFFINITYDCNVPROC) (HDC hAffinityDC, UINT iGpuIndex, HGPUNV *hGpu);
>+typedef BOOL (WINAPI * PFNWGLDELETEDCNVPROC) (HDC hdc);
>+#ifdef WGL_WGLEXT_PROTOTYPES
>+BOOL WINAPI wglEnumGpusNV (UINT iGpuIndex, HGPUNV *phGpu);
>+BOOL WINAPI wglEnumGpuDevicesNV (HGPUNV hGpu, UINT iDeviceIndex, PGPU_DEVICE lpGpuDevice);
>+HDC WINAPI wglCreateAffinityDCNV (const HGPUNV *phGpuList);
>+BOOL WINAPI wglEnumGpusFromAffinityDCNV (HDC hAffinityDC, UINT iGpuIndex, HGPUNV *hGpu);
>+BOOL WINAPI wglDeleteDCNV (HDC hdc);
>+#endif
>+#endif /* WGL_NV_gpu_affinity */
>+
>+#ifndef WGL_NV_multisample_coverage
>+#define WGL_NV_multisample_coverage 1
>+#define WGL_COVERAGE_SAMPLES_NV           0x2042
>+#define WGL_COLOR_SAMPLES_NV              0x20B9
>+#endif /* WGL_NV_multisample_coverage */
>+
>+#ifndef WGL_NV_present_video
>+#define WGL_NV_present_video 1
>+DECLARE_HANDLE(HVIDEOOUTPUTDEVICENV);
>+#define WGL_NUM_VIDEO_SLOTS_NV            0x20F0
>+typedef int (WINAPI * PFNWGLENUMERATEVIDEODEVICESNVPROC) (HDC hDC, HVIDEOOUTPUTDEVICENV *phDeviceList);
>+typedef BOOL (WINAPI * PFNWGLBINDVIDEODEVICENVPROC) (HDC hDC, unsigned int uVideoSlot, HVIDEOOUTPUTDEVICENV hVideoDevice, const int *piAttribList);
>+typedef BOOL (WINAPI * PFNWGLQUERYCURRENTCONTEXTNVPROC) (int iAttribute, int *piValue);
>+#ifdef WGL_WGLEXT_PROTOTYPES
>+int WINAPI wglEnumerateVideoDevicesNV (HDC hDC, HVIDEOOUTPUTDEVICENV *phDeviceList);
>+BOOL WINAPI wglBindVideoDeviceNV (HDC hDC, unsigned int uVideoSlot, HVIDEOOUTPUTDEVICENV hVideoDevice, const int *piAttribList);
>+BOOL WINAPI wglQueryCurrentContextNV (int iAttribute, int *piValue);
>+#endif
>+#endif /* WGL_NV_present_video */
>+
>+#ifndef WGL_NV_render_depth_texture
>+#define WGL_NV_render_depth_texture 1
>+#define WGL_BIND_TO_TEXTURE_DEPTH_NV      0x20A3
>+#define WGL_BIND_TO_TEXTURE_RECTANGLE_DEPTH_NV 0x20A4
>+#define WGL_DEPTH_TEXTURE_FORMAT_NV       0x20A5
>+#define WGL_TEXTURE_DEPTH_COMPONENT_NV    0x20A6
>+#define WGL_DEPTH_COMPONENT_NV            0x20A7
>+#endif /* WGL_NV_render_depth_texture */
>+
>+#ifndef WGL_NV_render_texture_rectangle
>+#define WGL_NV_render_texture_rectangle 1
>+#define WGL_BIND_TO_TEXTURE_RECTANGLE_RGB_NV 0x20A0
>+#define WGL_BIND_TO_TEXTURE_RECTANGLE_RGBA_NV 0x20A1
>+#define WGL_TEXTURE_RECTANGLE_NV          0x20A2
>+#endif /* WGL_NV_render_texture_rectangle */
>+
>+#ifndef WGL_NV_swap_group
>+#define WGL_NV_swap_group 1
>+typedef BOOL (WINAPI * PFNWGLJOINSWAPGROUPNVPROC) (HDC hDC, GLuint group);
>+typedef BOOL (WINAPI * PFNWGLBINDSWAPBARRIERNVPROC) (GLuint group, GLuint barrier);
>+typedef BOOL (WINAPI * PFNWGLQUERYSWAPGROUPNVPROC) (HDC hDC, GLuint *group, GLuint *barrier);
>+typedef BOOL (WINAPI * PFNWGLQUERYMAXSWAPGROUPSNVPROC) (HDC hDC, GLuint *maxGroups, GLuint *maxBarriers);
>+typedef BOOL (WINAPI * PFNWGLQUERYFRAMECOUNTNVPROC) (HDC hDC, GLuint *count);
>+typedef BOOL (WINAPI * PFNWGLRESETFRAMECOUNTNVPROC) (HDC hDC);
>+#ifdef WGL_WGLEXT_PROTOTYPES
>+BOOL WINAPI wglJoinSwapGroupNV (HDC hDC, GLuint group);
>+BOOL WINAPI wglBindSwapBarrierNV (GLuint group, GLuint barrier);
>+BOOL WINAPI wglQuerySwapGroupNV (HDC hDC, GLuint *group, GLuint *barrier);
>+BOOL WINAPI wglQueryMaxSwapGroupsNV (HDC hDC, GLuint *maxGroups, GLuint *maxBarriers);
>+BOOL WINAPI wglQueryFrameCountNV (HDC hDC, GLuint *count);
>+BOOL WINAPI wglResetFrameCountNV (HDC hDC);
>+#endif
>+#endif /* WGL_NV_swap_group */
>+
>+#ifndef WGL_NV_vertex_array_range
>+#define WGL_NV_vertex_array_range 1
>+typedef void *(WINAPI * PFNWGLALLOCATEMEMORYNVPROC) (GLsizei size, GLfloat readfreq, GLfloat writefreq, GLfloat priority);
>+typedef void (WINAPI * PFNWGLFREEMEMORYNVPROC) (void *pointer);
>+#ifdef WGL_WGLEXT_PROTOTYPES
>+void *WINAPI wglAllocateMemoryNV (GLsizei size, GLfloat readfreq, GLfloat writefreq, GLfloat priority);
>+void WINAPI wglFreeMemoryNV (void *pointer);
>+#endif
>+#endif /* WGL_NV_vertex_array_range */
>+
>+#ifndef WGL_NV_video_capture
>+#define WGL_NV_video_capture 1
>+DECLARE_HANDLE(HVIDEOINPUTDEVICENV);
>+#define WGL_UNIQUE_ID_NV                  0x20CE
>+#define WGL_NUM_VIDEO_CAPTURE_SLOTS_NV    0x20CF
>+typedef BOOL (WINAPI * PFNWGLBINDVIDEOCAPTUREDEVICENVPROC) (UINT uVideoSlot, HVIDEOINPUTDEVICENV hDevice);
>+typedef UINT (WINAPI * PFNWGLENUMERATEVIDEOCAPTUREDEVICESNVPROC) (HDC hDc, HVIDEOINPUTDEVICENV *phDeviceList);
>+typedef BOOL (WINAPI * PFNWGLLOCKVIDEOCAPTUREDEVICENVPROC) (HDC hDc, HVIDEOINPUTDEVICENV hDevice);
>+typedef BOOL (WINAPI * PFNWGLQUERYVIDEOCAPTUREDEVICENVPROC) (HDC hDc, HVIDEOINPUTDEVICENV hDevice, int iAttribute, int *piValue);
>+typedef BOOL (WINAPI * PFNWGLRELEASEVIDEOCAPTUREDEVICENVPROC) (HDC hDc, HVIDEOINPUTDEVICENV hDevice);
>+#ifdef WGL_WGLEXT_PROTOTYPES
>+BOOL WINAPI wglBindVideoCaptureDeviceNV (UINT uVideoSlot, HVIDEOINPUTDEVICENV hDevice);
>+UINT WINAPI wglEnumerateVideoCaptureDevicesNV (HDC hDc, HVIDEOINPUTDEVICENV *phDeviceList);
>+BOOL WINAPI wglLockVideoCaptureDeviceNV (HDC hDc, HVIDEOINPUTDEVICENV hDevice);
>+BOOL WINAPI wglQueryVideoCaptureDeviceNV (HDC hDc, HVIDEOINPUTDEVICENV hDevice, int iAttribute, int *piValue);
>+BOOL WINAPI wglReleaseVideoCaptureDeviceNV (HDC hDc, HVIDEOINPUTDEVICENV hDevice);
>+#endif
>+#endif /* WGL_NV_video_capture */
>+
>+#ifndef WGL_NV_video_output
>+#define WGL_NV_video_output 1
>+DECLARE_HANDLE(HPVIDEODEV);
>+#define WGL_BIND_TO_VIDEO_RGB_NV          0x20C0
>+#define WGL_BIND_TO_VIDEO_RGBA_NV         0x20C1
>+#define WGL_BIND_TO_VIDEO_RGB_AND_DEPTH_NV 0x20C2
>+#define WGL_VIDEO_OUT_COLOR_NV            0x20C3
>+#define WGL_VIDEO_OUT_ALPHA_NV            0x20C4
>+#define WGL_VIDEO_OUT_DEPTH_NV            0x20C5
>+#define WGL_VIDEO_OUT_COLOR_AND_ALPHA_NV  0x20C6
>+#define WGL_VIDEO_OUT_COLOR_AND_DEPTH_NV  0x20C7
>+#define WGL_VIDEO_OUT_FRAME               0x20C8
>+#define WGL_VIDEO_OUT_FIELD_1             0x20C9
>+#define WGL_VIDEO_OUT_FIELD_2             0x20CA
>+#define WGL_VIDEO_OUT_STACKED_FIELDS_1_2  0x20CB
>+#define WGL_VIDEO_OUT_STACKED_FIELDS_2_1  0x20CC
>+typedef BOOL (WINAPI * PFNWGLGETVIDEODEVICENVPROC) (HDC hDC, int numDevices, HPVIDEODEV *hVideoDevice);
>+typedef BOOL (WINAPI * PFNWGLRELEASEVIDEODEVICENVPROC) (HPVIDEODEV hVideoDevice);
>+typedef BOOL (WINAPI * PFNWGLBINDVIDEOIMAGENVPROC) (HPVIDEODEV hVideoDevice, HPBUFFERARB hPbuffer, int iVideoBuffer);
>+typedef BOOL (WINAPI * PFNWGLRELEASEVIDEOIMAGENVPROC) (HPBUFFERARB hPbuffer, int iVideoBuffer);
>+typedef BOOL (WINAPI * PFNWGLSENDPBUFFERTOVIDEONVPROC) (HPBUFFERARB hPbuffer, int iBufferType, unsigned long *pulCounterPbuffer, BOOL bBlock);
>+typedef BOOL (WINAPI * PFNWGLGETVIDEOINFONVPROC) (HPVIDEODEV hpVideoDevice, unsigned long *pulCounterOutputPbuffer, unsigned long *pulCounterOutputVideo);
>+#ifdef WGL_WGLEXT_PROTOTYPES
>+BOOL WINAPI wglGetVideoDeviceNV (HDC hDC, int numDevices, HPVIDEODEV *hVideoDevice);
>+BOOL WINAPI wglReleaseVideoDeviceNV (HPVIDEODEV hVideoDevice);
>+BOOL WINAPI wglBindVideoImageNV (HPVIDEODEV hVideoDevice, HPBUFFERARB hPbuffer, int iVideoBuffer);
>+BOOL WINAPI wglReleaseVideoImageNV (HPBUFFERARB hPbuffer, int iVideoBuffer);
>+BOOL WINAPI wglSendPbufferToVideoNV (HPBUFFERARB hPbuffer, int iBufferType, unsigned long *pulCounterPbuffer, BOOL bBlock);
>+BOOL WINAPI wglGetVideoInfoNV (HPVIDEODEV hpVideoDevice, unsigned long *pulCounterOutputPbuffer, unsigned long *pulCounterOutputVideo);
>+#endif
>+#endif /* WGL_NV_video_output */
>+
>+#ifndef WGL_OML_sync_control
>+#define WGL_OML_sync_control 1
>+typedef BOOL (WINAPI * PFNWGLGETSYNCVALUESOMLPROC) (HDC hdc, INT64 *ust, INT64 *msc, INT64 *sbc);
>+typedef BOOL (WINAPI * PFNWGLGETMSCRATEOMLPROC) (HDC hdc, INT32 *numerator, INT32 *denominator);
>+typedef INT64 (WINAPI * PFNWGLSWAPBUFFERSMSCOMLPROC) (HDC hdc, INT64 target_msc, INT64 divisor, INT64 remainder);
>+typedef INT64 (WINAPI * PFNWGLSWAPLAYERBUFFERSMSCOMLPROC) (HDC hdc, int fuPlanes, INT64 target_msc, INT64 divisor, INT64 remainder);
>+typedef BOOL (WINAPI * PFNWGLWAITFORMSCOMLPROC) (HDC hdc, INT64 target_msc, INT64 divisor, INT64 remainder, INT64 *ust, INT64 *msc, INT64 *sbc);
>+typedef BOOL (WINAPI * PFNWGLWAITFORSBCOMLPROC) (HDC hdc, INT64 target_sbc, INT64 *ust, INT64 *msc, INT64 *sbc);
>+#ifdef WGL_WGLEXT_PROTOTYPES
>+BOOL WINAPI wglGetSyncValuesOML (HDC hdc, INT64 *ust, INT64 *msc, INT64 *sbc);
>+BOOL WINAPI wglGetMscRateOML (HDC hdc, INT32 *numerator, INT32 *denominator);
>+INT64 WINAPI wglSwapBuffersMscOML (HDC hdc, INT64 target_msc, INT64 divisor, INT64 remainder);
>+INT64 WINAPI wglSwapLayerBuffersMscOML (HDC hdc, int fuPlanes, INT64 target_msc, INT64 divisor, INT64 remainder);
>+BOOL WINAPI wglWaitForMscOML (HDC hdc, INT64 target_msc, INT64 divisor, INT64 remainder, INT64 *ust, INT64 *msc, INT64 *sbc);
>+BOOL WINAPI wglWaitForSbcOML (HDC hdc, INT64 target_sbc, INT64 *ust, INT64 *msc, INT64 *sbc);
>+#endif
>+#endif /* WGL_OML_sync_control */
>+
>+#ifdef __cplusplus
>+}
>+#endif
>+
>+#endif
>diff --git a/Source/ThirdParty/ANGLE/include/angle_gl.h b/Source/ThirdParty/ANGLE/include/angle_gl.h
>index b70a31c2738..d2ec0a36079 100644
>--- a/Source/ThirdParty/ANGLE/include/angle_gl.h
>+++ b/Source/ThirdParty/ANGLE/include/angle_gl.h
>@@ -10,10 +10,12 @@
> #ifndef ANGLEGL_H_
> #define ANGLEGL_H_
> 
>+#include "GLES/gl.h"
>+#include "GLES/glext.h"
> #include "GLES2/gl2.h"
> #include "GLES2/gl2ext.h"
> #include "GLES3/gl3.h"
> #include "GLES3/gl31.h"
> #include "GLES3/gl32.h"
> 
>-#endif // ANGLEGL_H_
>+#endif  // ANGLEGL_H_
>diff --git a/Source/ThirdParty/ANGLE/include/export.h b/Source/ThirdParty/ANGLE/include/export.h
>index cf144f92a54..8ddffd9647d 100644
>--- a/Source/ThirdParty/ANGLE/include/export.h
>+++ b/Source/ThirdParty/ANGLE/include/export.h
>@@ -10,23 +10,23 @@
> #define LIBGLESV2_EXPORT_H_
> 
> #if !defined(ANGLE_EXPORT)
>-#if defined(_WIN32)
>-#if defined(LIBGLESV2_IMPLEMENTATION) || defined(LIBANGLE_IMPLEMENTATION) || \
>-    defined(LIBANGLE_UTIL_IMPLEMENTATION)
>-#       define ANGLE_EXPORT __declspec(dllexport)
>-#   else
>-#       define ANGLE_EXPORT __declspec(dllimport)
>-#   endif
>-#elif defined(__GNUC__)
>-#if defined(LIBGLESV2_IMPLEMENTATION) || defined(LIBANGLE_IMPLEMENTATION) || \
>-    defined(LIBANGLE_UTIL_IMPLEMENTATION)
>-#       define ANGLE_EXPORT __attribute__((visibility ("default")))
>-#   else
>-#       define ANGLE_EXPORT
>-#   endif
>-#else
>-#   define ANGLE_EXPORT
>-#endif
>+#    if defined(_WIN32)
>+#        if defined(LIBGLESV2_IMPLEMENTATION) || defined(LIBANGLE_IMPLEMENTATION) || \
>+            defined(LIBFEATURE_SUPPORT_IMPLEMENTATION)
>+#            define ANGLE_EXPORT __declspec(dllexport)
>+#        else
>+#            define ANGLE_EXPORT __declspec(dllimport)
>+#        endif
>+#    elif defined(__GNUC__)
>+#        if defined(LIBGLESV2_IMPLEMENTATION) || defined(LIBANGLE_IMPLEMENTATION) || \
>+            defined(LIBFEATURE_SUPPORT_IMPLEMENTATION)
>+#            define ANGLE_EXPORT __attribute__((visibility("default")))
>+#        else
>+#            define ANGLE_EXPORT
>+#        endif
>+#    else
>+#        define ANGLE_EXPORT
>+#    endif
> #endif  // !defined(ANGLE_EXPORT)
> 
>-#endif // LIBGLESV2_EXPORT_H_
>+#endif  // LIBGLESV2_EXPORT_H_
>diff --git a/Source/ThirdParty/ANGLE/include/id/commit.h b/Source/ThirdParty/ANGLE/include/id/commit.h
>deleted file mode 100644
>index 3b30105a4a6..00000000000
>--- a/Source/ThirdParty/ANGLE/include/id/commit.h
>+++ /dev/null
>@@ -1,3 +0,0 @@
>-#define ANGLE_COMMIT_HASH "57ea533f79a7"
>-#define ANGLE_COMMIT_HASH_SIZE 12
>-#define ANGLE_COMMIT_DATE "2017-11-28 23:33:41 +0000"
>diff --git a/Source/ThirdParty/ANGLE/include/platform/FeaturesVk.h b/Source/ThirdParty/ANGLE/include/platform/FeaturesVk.h
>new file mode 100644
>index 00000000000..92698eac167
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/include/platform/FeaturesVk.h
>@@ -0,0 +1,91 @@
>+//
>+// Copyright 2018 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// FeaturesVk.h: Optional features for the Vulkan renderer.
>+//
>+
>+#ifndef ANGLE_PLATFORM_FEATURESVK_H_
>+#define ANGLE_PLATFORM_FEATURESVK_H_
>+
>+namespace angle
>+{
>+
>+struct FeaturesVk
>+{
>+    FeaturesVk();
>+
>+    // Line segment rasterization must follow OpenGL rules. This means using an algorithm similar
>+    // to Bresenham's. Vulkan uses a different algorithm. This feature enables the use of pixel
>+    // shader patching to implement OpenGL basic line rasterization rules. This feature will
>+    // normally always be enabled. Exposing it as an option enables performance testing.
>+    bool basicGLLineRasterization = false;
>+
>+    // Flips the viewport to render upside-down. This has the effect to render the same way as
>+    // OpenGL. If this feature gets enabled, we enable the KHR_MAINTENANCE_1 extension to allow
>+    // negative viewports. We inverse rendering to the backbuffer by reversing the height of the
>+    // viewport and increasing Y by the height. So if the viewport was (0,0,width,height), it
>+    // becomes (0, height, width, -height). Unfortunately, when we start doing this, we also need
>+    // to adjust a lot of places since the rendering now happens upside-down. Affected places so
>+    // far:
>+    // -readPixels
>+    // -copyTexImage
>+    // -framebuffer blit
>+    // -generating mipmaps
>+    // -Point sprites tests
>+    // -texStorage
>+    bool flipViewportY = false;
>+
>+    // Add an extra copy region when using vkCmdCopyBuffer as the Windows Intel driver seems
>+    // to have a bug where the last region is ignored.
>+    bool extraCopyBufferRegion = false;
>+
>+    // This flag is added for the sole purpose of end2end tests, to test the correctness
>+    // of various algorithms when a fallback format is used, such as using a packed format to
>+    // emulate a depth- or stencil-only format.
>+    bool forceFallbackFormat = false;
>+
>+    // On some NVIDIA drivers the point size range reported from the API is inconsistent with the
>+    // actual behavior. Clamp the point size to the value from the API to fix this.
>+    // Tracked in http://anglebug.com/2970.
>+    bool clampPointSize = false;
>+
>+    // On some android devices, the memory barrier between the compute shader that converts vertex
>+    // attributes and the vertex shader that reads from it is ineffective.  Only known workaround is
>+    // to perform a flush after the conversion.  http://anglebug.com/3016
>+    bool flushAfterVertexConversion = false;
>+
>+    // Whether the VkDevice supports the VK_KHR_incremental_present extension, on which the
>+    // EGL_KHR_swap_buffers_with_damage extension can be layered.
>+    bool supportsIncrementalPresent = false;
>+
>+    // Whether texture copies on cube map targets should be done on GPU.  This is a workaround for
>+    // Intel drivers on windows that have an issue with creating single-layer views on cube map
>+    // textures.
>+    bool forceCpuPathForCubeMapCopy = false;
>+
>+    // Whether the VkDevice supports the VK_ANDROID_external_memory_android_hardware_buffer
>+    // extension, on which the EGL_ANDROID_image_native_buffer extension can be layered.
>+    bool supportsAndroidHardwareBuffer = false;
>+
>+    // Whether the VkDevice supports the VK_KHR_external_memory_fd
>+    // extension, on which the GL_EXT_memory_object_fd extension can be layered.
>+    bool supportsExternalMemoryFd = false;
>+
>+    // Whether the VkDevice supports the VK_KHR_external_semaphore_fd
>+    // extension, on which the GL_EXT_semaphore_fd extension can be layered.
>+    bool supportsExternalSemaphoreFd = false;
>+
>+    // VK_PRESENT_MODE_FIFO_KHR causes random timeouts on Linux Intel. http://anglebug.com/3153
>+    bool disableFifoPresentMode = false;
>+
>+    // On Qualcomm, a bug is preventing us from using loadOp=Clear with inline commands in the
>+    // render pass.  http://anglebug.com/2361
>+    bool restartRenderPassAfterLoadOpClear = false;
>+};
>+
>+inline FeaturesVk::FeaturesVk() = default;
>+}  // namespace angle
>+
>+#endif  // ANGLE_PLATFORM_FEATURESVK_H_
>diff --git a/Source/ThirdParty/ANGLE/include/platform/Platform.h b/Source/ThirdParty/ANGLE/include/platform/Platform.h
>index aa1221a86e8..837892f7303 100644
>--- a/Source/ThirdParty/ANGLE/include/platform/Platform.h
>+++ b/Source/ThirdParty/ANGLE/include/platform/Platform.h
>@@ -12,28 +12,31 @@
> #include <stdint.h>
> #include <array>
> 
>+#define EGL_PLATFORM_ANGLE_PLATFORM_METHODS_ANGLEX 0x3482
>+
> #if defined(_WIN32)
>-#   if !defined(LIBANGLE_IMPLEMENTATION)
>-#       define ANGLE_PLATFORM_EXPORT __declspec(dllimport)
>-#   else
>-#       define ANGLE_PLATFORM_EXPORT __declspec(dllexport)
>-#   endif
>+#    if !defined(LIBANGLE_IMPLEMENTATION)
>+#        define ANGLE_PLATFORM_EXPORT __declspec(dllimport)
>+#    else
>+#        define ANGLE_PLATFORM_EXPORT __declspec(dllexport)
>+#    endif
> #elif defined(__GNUC__) || defined(__clang__)
>-#   define ANGLE_PLATFORM_EXPORT __attribute__((visibility ("default")))
>+#    define ANGLE_PLATFORM_EXPORT __attribute__((visibility("default")))
> #endif
> #if !defined(ANGLE_PLATFORM_EXPORT)
>-#   define ANGLE_PLATFORM_EXPORT
>+#    define ANGLE_PLATFORM_EXPORT
> #endif
> 
> #if defined(_WIN32)
>-#   define ANGLE_APIENTRY __stdcall
>+#    define ANGLE_APIENTRY __stdcall
> #else
>-#   define ANGLE_APIENTRY
>+#    define ANGLE_APIENTRY
> #endif
> 
> namespace angle
> {
> struct WorkaroundsD3D;
>+struct FeaturesVk;
> using TraceEventHandle = uint64_t;
> using EGLDisplayType   = void *;
> struct PlatformMethods;
>@@ -65,21 +68,15 @@ inline double DefaultMonotonicallyIncreasingTime(PlatformMethods *platform)
> 
> // Log an error message within the platform implementation.
> using LogErrorFunc = void (*)(PlatformMethods *platform, const char *errorMessage);
>-inline void DefaultLogError(PlatformMethods *platform, const char *errorMessage)
>-{
>-}
>+inline void DefaultLogError(PlatformMethods *platform, const char *errorMessage) {}
> 
> // Log a warning message within the platform implementation.
> using LogWarningFunc = void (*)(PlatformMethods *platform, const char *warningMessage);
>-inline void DefaultLogWarning(PlatformMethods *platform, const char *warningMessage)
>-{
>-}
>+inline void DefaultLogWarning(PlatformMethods *platform, const char *warningMessage) {}
> 
> // Log an info message within the platform implementation.
> using LogInfoFunc = void (*)(PlatformMethods *platform, const char *infoMessage);
>-inline void DefaultLogInfo(PlatformMethods *platform, const char *infoMessage)
>-{
>-}
>+inline void DefaultLogInfo(PlatformMethods *platform, const char *infoMessage) {}
> 
> // Tracing --------
> 
>@@ -120,7 +117,7 @@ inline const unsigned char *DefaultGetTraceCategoryEnabledFlag(PlatformMethods *
> // - name is the name of the event. Also used to match BEGIN/END and
> //   START/FINISH pairs.
> // - id optionally allows events of the same name to be distinguished from
>-//   each other. For example, to trace the consutruction and destruction of
>+//   each other. For example, to trace the construction and destruction of
> //   objects, specify the pointer as the id parameter.
> // - timestamp should be a time value returned from monotonicallyIncreasingTime.
> // - numArgs specifies the number of elements in argNames, argTypes, and
>@@ -180,8 +177,7 @@ inline void DefaultUpdateTraceEventDuration(PlatformMethods *platform,
>                                             const unsigned char *categoryEnabledFlag,
>                                             const char *name,
>                                             angle::TraceEventHandle eventHandle)
>-{
>-}
>+{}
> 
> // Callbacks for reporting histogram data.
> // CustomCounts histogram has exponential bucket sizes, so that min=1, max=1000000, bucketCount=50
>@@ -198,8 +194,7 @@ inline void DefaultHistogramCustomCounts(PlatformMethods *platform,
>                                          int min,
>                                          int max,
>                                          int bucketCount)
>-{
>-}
>+{}
> // Enumeration histogram buckets are linear, boundaryValue should be larger than any possible sample
> // value.
> using HistogramEnumerationFunc = void (*)(PlatformMethods *platform,
>@@ -210,26 +205,26 @@ inline void DefaultHistogramEnumeration(PlatformMethods *platform,
>                                         const char *name,
>                                         int sample,
>                                         int boundaryValue)
>-{
>-}
>+{}
> // Unlike enumeration histograms, sparse histograms only allocate memory for non-empty buckets.
> using HistogramSparseFunc = void (*)(PlatformMethods *platform, const char *name, int sample);
>-inline void DefaultHistogramSparse(PlatformMethods *platform, const char *name, int sample)
>-{
>-}
>+inline void DefaultHistogramSparse(PlatformMethods *platform, const char *name, int sample) {}
> // Boolean histograms track two-state variables.
> using HistogramBooleanFunc = void (*)(PlatformMethods *platform, const char *name, bool sample);
>-inline void DefaultHistogramBoolean(PlatformMethods *platform, const char *name, bool sample)
>-{
>-}
>+inline void DefaultHistogramBoolean(PlatformMethods *platform, const char *name, bool sample) {}
> 
> // Allows us to programatically override ANGLE's default workarounds for testing purposes.
> using OverrideWorkaroundsD3DFunc = void (*)(PlatformMethods *platform,
>                                             angle::WorkaroundsD3D *workaroundsD3D);
> inline void DefaultOverrideWorkaroundsD3D(PlatformMethods *platform,
>                                           angle::WorkaroundsD3D *workaroundsD3D)
>-{
>-}
>+{}
>+
>+using OverrideFeaturesVkFunc = void (*)(PlatformMethods *platform,
>+                                        angle::FeaturesVk *workaroundsVulkan);
>+inline void DefaultOverrideFeaturesVk(PlatformMethods *platform,
>+                                      angle::FeaturesVk *workaroundsVulkan)
>+{}
> 
> // Callback on a successful program link with the program binary. Can be used to store
> // shaders to disk. Keys are a 160-bit SHA-1 hash.
>@@ -242,8 +237,7 @@ inline void DefaultCacheProgram(PlatformMethods *platform,
>                                 const ProgramKeyType &key,
>                                 size_t programSize,
>                                 const uint8_t *programBytes)
>-{
>-}
>+{}
> 
> // Platform methods are enumerated here once.
> #define ANGLE_PLATFORM_OP(OP)                                    \
>@@ -260,22 +254,25 @@ inline void DefaultCacheProgram(PlatformMethods *platform,
>     OP(histogramSparse, HistogramSparse)                         \
>     OP(histogramBoolean, HistogramBoolean)                       \
>     OP(overrideWorkaroundsD3D, OverrideWorkaroundsD3D)           \
>+    OP(overrideFeaturesVk, OverrideFeaturesVk)                   \
>     OP(cacheProgram, CacheProgram)
> 
> #define ANGLE_PLATFORM_METHOD_DEF(Name, CapsName) CapsName##Func Name = Default##CapsName;
> 
> struct ANGLE_PLATFORM_EXPORT PlatformMethods
> {
>-    PlatformMethods();
>+    inline PlatformMethods();
> 
>     // User data pointer for any implementation specific members. Put it at the start of the
>     // platform structure so it doesn't become overwritten if one version of the platform
>     // adds or removes new members.
>     void *context = 0;
> 
>-    ANGLE_PLATFORM_OP(ANGLE_PLATFORM_METHOD_DEF);
>+    ANGLE_PLATFORM_OP(ANGLE_PLATFORM_METHOD_DEF)
> };
> 
>+inline PlatformMethods::PlatformMethods() = default;
>+
> #undef ANGLE_PLATFORM_METHOD_DEF
> 
> // Subtract one to account for the context pointer.
>@@ -324,4 +321,4 @@ typedef void(ANGLE_APIENTRY *ResetDisplayPlatformFunc)(angle::EGLDisplayType);
> // This function is not exported
> angle::PlatformMethods *ANGLEPlatformCurrent();
> 
>-#endif // ANGLE_PLATFORM_H
>+#endif  // ANGLE_PLATFORM_H
>diff --git a/Source/ThirdParty/ANGLE/include/platform/WorkaroundsD3D.h b/Source/ThirdParty/ANGLE/include/platform/WorkaroundsD3D.h
>index cc2abbf1d28..f70ac4eed91 100644
>--- a/Source/ThirdParty/ANGLE/include/platform/WorkaroundsD3D.h
>+++ b/Source/ThirdParty/ANGLE/include/platform/WorkaroundsD3D.h
>@@ -26,6 +26,9 @@ struct CompilerWorkaroundsD3D
> 
> struct WorkaroundsD3D
> {
>+    WorkaroundsD3D();
>+    WorkaroundsD3D(const WorkaroundsD3D &other);
>+
>     // On some systems, having extra rendertargets than necessary slows down the shader.
>     // We can fix this by optimizing those out of the shader. At the same time, we can
>     // work around a bug on some nVidia drivers that they ignore "null" render targets
>@@ -123,8 +126,23 @@ struct WorkaroundsD3D
>     // then rendering samples also pass neglecting discard statements in pixel shader.
>     // So we add a dummy texture as render target in such case. See http://anglebug.com/2152
>     bool addDummyTextureNoRenderTarget = false;
>+
>+    // Don't use D3D constant register zero when allocating space for uniforms in the vertex shader.
>+    // This is targeted to work around a bug in NVIDIA D3D driver version 388.59 where in very
>+    // specific cases the driver would not handle constant register zero correctly.
>+    bool skipVSConstantRegisterZero = false;
>+
>+    // Forces the value returned from an atomic operations to be always be resolved. This is
>+    // targeted to workaround a bug in NVIDIA D3D driver where the return value from
>+    // RWByteAddressBuffer.InterlockedAdd does not get resolved when used in the .yzw components of
>+    // a RWByteAddressBuffer.Store operation. Only has an effect on HLSL translation.
>+    // http://anglebug.com/3246
>+    bool forceAtomicValueResolution = false;
> };
> 
>+inline WorkaroundsD3D::WorkaroundsD3D()                            = default;
>+inline WorkaroundsD3D::WorkaroundsD3D(const WorkaroundsD3D &other) = default;
>+
> }  // namespace angle
> 
> #endif  // ANGLE_PLATFORM_WORKAROUNDSD3D_H_
>diff --git a/Source/ThirdParty/ANGLE/infra/ANGLEWrangling.md b/Source/ThirdParty/ANGLE/infra/ANGLEWrangling.md
>new file mode 100644
>index 00000000000..fec5d75ee68
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/infra/ANGLEWrangling.md
>@@ -0,0 +1,88 @@
>+# ANGLE Wrangling
>+
>+As an ANGLE Sheriff. Your job is to:
>+
>+ 1. Keep the [ANGLE Try Waterfall](https://ci.chromium.org/p/chromium/g/angle.try/builders) in good
>+    working order.
>+ 1. Monitor the
>+    [Chromium GPU FYI Waterfall](https://ci.chromium.org/p/chromium/g/chromium.gpu.fyi/console)
>+    and respond to ANGLE bugs.
>+ 1. Control and monitor the [ANGLE auto-rollers](#task-3_the-auto_rollers).
>+ 1. Keep the [ANGLE Standalone Testers](README.md) in good working order.
>+
>+If you're not an ANGLE team member, you can contact us on the public ANGLE project
>+[Google group](https://groups.google.com/forum/#!forum/angleproject).
>+
>+## Task 1: The Try Waterfall
>+
>+Your first job is to keep the
>+[ANGLE Try Waterfall](https://ci.chromium.org/p/chromium/g/angle.try/builders) healthy.  Some
>+failures are expected on this waterfall. Developers might be testing expectedly buggy code. But
>+persistent flakiness and failures should be reported and reverted.
>+
>+When encoutering an unexpected failure in your CLs please
>+[file an ANGLE bug](http://anglebug.com/new) and cc the current ANGLE wrangler. If the failure is
>+unrelated to ANGLE [file a Chromium bug](http://crbug.com/new) and mark the bug as
>+`Hotlist-PixelWrangler`. Refer to
>+[build.chromium.org](https://ci.chromium.org/p/chromium/g/main/console) to find the current ANGLE
>+wrangler and GPU Pixel Wrangler.
>+
>+**NOTE: When all builds seem to be purple or otherwise broken:**
>+
>+This could be a major infrastructure outage. File a high-priority bug using
>+[g.co/bugatrooper](http://g.co/bugatrooper).
>+
>+## Task 2: Respond to Bugs
>+
>+ANGLE bugs sometimes make it past the commit queue testing and into the master branch. This can be
>+because of flaky tests or because the failures are specific to system configurations for which we
>+lack full pre-commit testing support.
>+
>+The [Chromium GPU FYI Waterfall](https://ci.chromium.org/p/chromium/g/chromium.gpu.fyi/console)
>+waterfall includes a number of these one-off specialized configurations.  Monitor this console for
>+persistent breakage that could be related to ANGLE.  Also follow the `Internals>GPU>ANGLE` component
>+on the Chromium issue tracker to be alerted to reports of breakage on the GPU.FYI waterfall.
>+Googlers can use [sheriff-o-matic](https://sheriff-o-matic.appspot.com/chromium.gpu.fyi) to monitor
>+the health of the GPU.FYI waterfall.
>+
>+Note that the GPU Pixel Wrangler is responsible for the *Chromium* bugs.  Please file issues with
>+the tag `Hotlist-PixelWrangler` for bugs that aren't caused by ANGLE regressions.
>+
>+*IMPORTANT*: Info to include in bug reports:
>+
>+ * Links to all first failing builds (eg first windows failure, first mac failure, etc).
>+ * Related regression ranges. See below on how to determine the ANGLE regression range.
>+ * Relevant error messages.
>+ * Set components: `Internals>GPU` and/or `Internals>GPU>ANGLE`.
>+ * cc relevant sheriffs or blame suspects.
>+ * Set the `Hotlist-PixelWrangler` label.
>+
>+### How to determine the ANGLE regression range on the GPU.FYI bots:
>+
>+ 1. Open the first failing and last passing builds.
>+ 1. For test failures: record `parent_got_angle_revision` in both builds.
>+ 1. For compile failures record `got_angle_revision`.
>+ 1. Use this URL:
>+    `https://chromium.googlesource.com/angle/angle.git/+log/<last passing revision>..<first failing revision>`
>+
>+## Task 3: The Auto-Rollers
>+
>+The [ANGLE auto-roller](https://autoroll.skia.org/r/angle-chromium-autoroll) automatically updates
>+Chrome with the latest ANGLE changes.
>+
>+ 1. **Roller health**: You will be cc'ed on all rolls. Please check failed rolls to verify there is no blocking
>+    breakage.
>+ 1. **Chrome Branching**: You are responsible for pausing the roller 24h before branch days, and resuming afterwards.
>+    See the [Chrome Release Schedule](https://chromiumdash.appspot.com/schedule).
>+
>+We also use additional auto-rollers to roll third party libraries into ANGLE once per day:
>+
>+ * [SPIRV-Headers into ANGLE](https://autoroll.skia.org/r/spirv-headers-angle-autoroll),
>+ * [SPIRV-Tools into ANGLE](https://autoroll.skia.org/r/spirv-tools-angle-autoroll) and
>+ * [glslang into ANGLE](https://autoroll.skia.org/r/glslang-angle-autoroll)
>+
>+Please ensure these rollers are also healthy and unblocked.
>+
>+## Task 4: ANGLE Standalone Testing
>+
>+See more detailed instructions on by following [this link](README.md).
>diff --git a/Source/ThirdParty/ANGLE/infra/README.md b/Source/ThirdParty/ANGLE/infra/README.md
>new file mode 100644
>index 00000000000..45f562ee77d
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/infra/README.md
>@@ -0,0 +1,56 @@
>+# ANGLE Standalone Testing Infrastructure
>+
>+In addition to the ANGLE try bots using Chrome, and the GPU.FYI bots, ANGLE
>+has standalone testing on the Chrome infrastructure. Currently these tests are
>+compile-only. This page is for maintaining the configurations that don't use
>+Chromium. Also see the main instructions for [ANGLE Wrangling](ANGLEWrangling.md).
>+
>+It's the ANGLE team's responsibility for maintaining this testing
>+infrastructure. The bot configurations live in four different repos and six
>+branches.
>+
>+## Info Consoles
>+
>+Continuous builders for every ANGLE revision are found on the CI console:
>+
>+[https://ci.chromium.org/p/angle/g/ci/console](https://ci.chromium.org/p/angle/g/ci/console)
>+
>+Try jobs from pre-commit builds are found on the builders console:
>+
>+[https://ci.chromium.org/p/angle/g/try/builders](https://ci.chromium.org/p/angle/g/try/builders)
>+
>+## How to add a new build configuration
>+
>+ 1. [`bugs.chromium.org/p/chromium/issues/entry?template=Build+Infrastructure`](http://bugs.chromium.org/p/chromium/issues/entry?template=Build+Infrastructure):
>+
>+    * Request new slaves by filing an infra issue.
>+
>+ 1. [`chromium.googlesource.com/chromium/tools/build`](https://chromium.googlesource.com/chromium/tools/build):
>+
>+    * Update **`scripts/slave/recipes/angle.py`** with new the config.
>+    * The recipe code requires 100% code coverage through mock bots, so add mock bot config to GenTests.
>+    * Maybe run `./scripts/slave/recipes.py test train` to update checked-in golden files. This might no longer be necessary.
>+
>+ 1. [`chrome-internal.googlesource.com/infradata/config`](http://chrome-internal.googlesource.com/infradata/config):
>+
>+    * Update **`configs/chromium-swarm/bots.cfg`** to map from the slaves requested in step 1 to the builder configured in step 2.
>+
>+ 1. [`chromium.googlesource.com/angle/angle`](http://chromium.googlesource.com/angle/angle):
>+
>+    * Update **`infra/config/global/cr-buildbucket.cfg`** to add the new builder (to ci and try), and set the new config option.
>+    * Update **`infra/config/global/luci-milo.cfg`** to make the builders show up on the ci and try waterfalls.
>+    * Update **`infra/config/global/luci-scheduler.cfg`** to make the builders trigger on new commits or try jobs respectively.
>+    * Update **`infra/config/cq.cfg`** to add the builder to the default CQ jobs (if desired).
>+
>+## Other Configuration
>+
>+There are other places where configuration for ANGLE infra lives. These are files that we shouldn't need to modify very often:
>+
>+ 1. [`chrome-internal.googlesource.com/infradata/config`](http://chrome-internal.googlesource.com/infradata/config):
>+
>+    * **`configs/luci-token-server/service_accounts.cfg`** (service account names)
>+    * **`configs/chromium-swarm/pools.cfg`** (swarming pools)
>+
>+ 1. [`chromium.googlesource.com/chromium/tools/depot_tools`](http://chromium.googlesource.com/chromium/tools/depot_tools):
>+
>+    * **`recipes/recipe_modules/gclient/config.py`** (gclient config)
>diff --git a/Source/ThirdParty/ANGLE/infra/config/OWNERS b/Source/ThirdParty/ANGLE/infra/config/OWNERS
>new file mode 100644
>index 00000000000..9a1736e904e
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/infra/config/OWNERS
>@@ -0,0 +1,2 @@
>+geofflang@chromium.org
>+jmadill@chromium.org
>diff --git a/Source/ThirdParty/ANGLE/infra/config/README.md b/Source/ThirdParty/ANGLE/infra/config/README.md
>new file mode 100644
>index 00000000000..8aae5da6ada
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/infra/config/README.md
>@@ -0,0 +1,27 @@
>+## Configurations files for chrome-infra services.
>+
>+There are two kinds of configs: **global** and **ref-specific**.
>+
>+
>+## Global configs.
>+
>+Apply to the whole repo regardless of the ref (branch).
>+
>+Located in [global](global) directory.
>+
>+Currently active version can be checked at
>+https://luci-config.appspot.com/#/projects/angle .
>+
>+
>+## Ref-specific configs.
>+
>+Apply only to a ref(branch) they are located in.
>+
>+Located in [branch](branch) directory.
>+
>+Currently active version can be checked at
>+
>+    https://luci-config.appspot.com/#/projects/angle/<ref>
>+    # For example, for master branch:
>+    #   https://luci-config.appspot.com/#/projects/angle/refs/heads/master
>+
>diff --git a/Source/ThirdParty/ANGLE/infra/config/branch/OWNERS b/Source/ThirdParty/ANGLE/infra/config/branch/OWNERS
>new file mode 100644
>index 00000000000..9a1736e904e
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/infra/config/branch/OWNERS
>@@ -0,0 +1,2 @@
>+geofflang@chromium.org
>+jmadill@chromium.org
>diff --git a/Source/ThirdParty/ANGLE/infra/config/branch/README.md b/Source/ThirdParty/ANGLE/infra/config/branch/README.md
>new file mode 100644
>index 00000000000..a46a2e7f34e
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/infra/config/branch/README.md
>@@ -0,0 +1 @@
>+This directory contains configuration files for chrome infrastructure services.
>diff --git a/Source/ThirdParty/ANGLE/infra/config/global/OWNERS b/Source/ThirdParty/ANGLE/infra/config/global/OWNERS
>new file mode 100644
>index 00000000000..9a1736e904e
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/infra/config/global/OWNERS
>@@ -0,0 +1,2 @@
>+geofflang@chromium.org
>+jmadill@chromium.org
>diff --git a/Source/ThirdParty/ANGLE/infra/config/global/README.md b/Source/ThirdParty/ANGLE/infra/config/global/README.md
>new file mode 100644
>index 00000000000..cbccc969bc6
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/infra/config/global/README.md
>@@ -0,0 +1,14 @@
>+## Global configs.
>+
>+**IMPORTANT:** If you see this in a branch which is not `master`,
>+**this directory has no effect and should be ignored.**
>+
>+This branch contains ANGLE project-wide configurations
>+for chrome-infra services.
>+For example, [cr-buildbucket.cfg](cr-buildbucket.cfg) defines builders.
>+
>+**Remember** Change these configs on `master` branch only!
>+
>+Currently active version can be checked at
>+https://luci-config.appspot.com/#/projects/angle .
>+
>diff --git a/Source/ThirdParty/ANGLE/infra/config/global/commit-queue.cfg b/Source/ThirdParty/ANGLE/infra/config/global/commit-queue.cfg
>new file mode 100644
>index 00000000000..5bef04bba2d
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/infra/config/global/commit-queue.cfg
>@@ -0,0 +1,113 @@
>+# See http://luci-config.appspot.com/schemas/projects:commit-queue.cfg for the
>+# documentation of this file format.
>+
>+cq_status_host: "chromium-cq-status.appspot.com"
>+submit_options {
>+  max_burst: 4
>+  burst_delay {
>+    seconds: 480
>+  }
>+}
>+config_groups {
>+  gerrit {
>+    url: "https://chromium-review.googlesource.com"
>+    projects {
>+      name: "angle/angle"
>+      ref_regexp: "refs/heads/.+"
>+    }
>+  }
>+  verifiers {
>+    gerrit_cq_ability {
>+      committer_list: "project-angle-committers"
>+      dry_run_access_list: "project-angle-tryjob-access"
>+    }
>+    tryjob {
>+      builders {
>+        name: "angle/try/linux-clang-dbg"
>+      }
>+      builders {
>+        name: "angle/try/linux-clang-rel"
>+      }
>+      builders {
>+        name: "angle/try/mac-dbg"
>+      }
>+      builders {
>+        name: "angle/try/mac-rel"
>+      }
>+      builders {
>+        name: "angle/try/presubmit"
>+        disable_reuse: true
>+      }
>+      builders {
>+        name: "angle/try/win-clang-x64-dbg"
>+      }
>+      builders {
>+        name: "angle/try/win-clang-x64-rel"
>+      }
>+      builders {
>+        name: "angle/try/win-clang-x86-dbg"
>+      }
>+      builders {
>+        name: "angle/try/win-clang-x86-rel"
>+      }
>+      builders {
>+        name: "angle/try/win-msvc-x64-dbg"
>+      }
>+      builders {
>+        name: "angle/try/win-msvc-x64-rel"
>+      }
>+      builders {
>+        name: "angle/try/win-msvc-x86-dbg"
>+      }
>+      builders {
>+        name: "angle/try/win-msvc-x86-rel"
>+      }
>+      builders {
>+        name: "chromium/try/android_angle_deqp_rel_ng"
>+      }
>+      builders {
>+        name: "chromium/try/android_angle_rel_ng"
>+      }
>+      builders {
>+        name: "chromium/try/android_angle_vk32_deqp_rel_ng"
>+      }
>+      builders {
>+        name: "chromium/try/android_angle_vk32_rel_ng"
>+      }
>+      builders {
>+        name: "chromium/try/android_angle_vk64_deqp_rel_ng"
>+      }
>+      builders {
>+        name: "chromium/try/android_angle_vk64_rel_ng"
>+      }
>+      builders {
>+        name: "chromium/try/fuchsia_x64"
>+      }
>+      builders {
>+        name: "chromium/try/linux_angle_deqp_rel_ng"
>+      }
>+      builders {
>+        name: "chromium/try/linux_angle_ozone_rel_ng"
>+      }
>+      builders {
>+        name: "chromium/try/linux-angle-rel"
>+      }
>+      builders {
>+        name: "chromium/try/mac-angle-rel"
>+      }
>+      builders {
>+        name: "chromium/try/win-angle-rel"
>+      }
>+      builders {
>+        name: "chromium/try/win_angle_deqp_rel_ng"
>+      }
>+      retry_config {
>+        single_quota: 1
>+        global_quota: 2
>+        failure_weight: 1
>+        transient_failure_weight: 1
>+        timeout_weight: 2
>+      }
>+    }
>+  }
>+}
>diff --git a/Source/ThirdParty/ANGLE/infra/config/global/cr-buildbucket.cfg b/Source/ThirdParty/ANGLE/infra/config/global/cr-buildbucket.cfg
>new file mode 100644
>index 00000000000..4378cf11a28
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/infra/config/global/cr-buildbucket.cfg
>@@ -0,0 +1,381 @@
>+# Defines buckets on cr-buildbucket.appspot.com, used to schedule builds
>+# on buildbot. In particular, CQ uses some of these buckets to schedule tryjobs.
>+#
>+# See http://luci-config.appspot.com/schemas/projects:cr-buildbucket.cfg for
>+# schema of this file and documentation.
>+#
>+# Please keep this list sorted by bucket name.
>+
>+acl_sets {
>+  name: "ci"
>+  acls {
>+    role: READER
>+    group: "all"
>+  }
>+  acls {
>+    role: SCHEDULER
>+    identity: "luci-scheduler@appspot.gserviceaccount.com"
>+  }
>+  acls {
>+    role: SCHEDULER
>+    identity: "angle-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
>+  }
>+}
>+
>+acl_sets {
>+  name: "try"
>+  acls {
>+    role: READER
>+    group: "all"
>+  }
>+  acls {
>+    role: SCHEDULER
>+    group: "project-angle-tryjob-access"
>+  }
>+  acls {
>+    role: SCHEDULER
>+    group: "service-account-cq"
>+  }
>+}
>+
>+builder_mixins {
>+  name: "linux"
>+  dimensions: "os:Ubuntu-14.04"
>+}
>+
>+builder_mixins {
>+  name: "win"
>+  dimensions: "os:Windows"
>+}
>+
>+builder_mixins {
>+  name: "mac"
>+  dimensions: "os:Mac"
>+}
>+
>+builder_mixins {
>+  name: "clang"
>+  recipe {
>+    properties_j: "clang:true"
>+  }
>+}
>+
>+builder_mixins {
>+  name: "no_clang"
>+  recipe {
>+    properties_j: "clang:false"
>+  }
>+}
>+
>+builder_mixins {
>+  name: "rel"
>+  recipe {
>+    properties_j: "debug:false"
>+  }
>+}
>+
>+builder_mixins {
>+  name: "dbg"
>+  recipe {
>+    properties_j: "debug:true"
>+  }
>+}
>+
>+builder_mixins {
>+  name: "x86"
>+  recipe {
>+    properties: "target_cpu:x86"
>+  }
>+}
>+
>+builder_mixins {
>+  name: "x64"
>+  recipe {
>+    properties: "target_cpu:x64"
>+  }
>+}
>+
>+buckets {
>+  name: "luci.angle.ci"
>+  acl_sets: "ci"
>+
>+  swarming {
>+    hostname: "chromium-swarm.appspot.com"
>+
>+    builder_defaults {
>+      recipe: {
>+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
>+        cipd_version: "refs/heads/master"
>+        name: "angle"
>+      }
>+      build_numbers: YES
>+      service_account: "angle-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
>+
>+      caches {
>+        path: "win_toolchain"
>+        name: "win_toolchain"
>+      }
>+    }
>+
>+    builders {
>+      name: "linux-clang-dbg"
>+      mixins: "linux"
>+      mixins: "clang"
>+      mixins: "dbg"
>+    }
>+
>+    builders {
>+      name: "linux-clang-rel"
>+      mixins: "linux"
>+      mixins: "clang"
>+      mixins: "rel"
>+    }
>+
>+    builders {
>+      name: "linux-gcc-dbg"
>+      mixins: "linux"
>+      mixins: "no_clang"
>+      mixins: "dbg"
>+    }
>+
>+    builders {
>+      name: "linux-gcc-rel"
>+      mixins: "linux"
>+      mixins: "no_clang"
>+      mixins: "rel"
>+    }
>+
>+    builders {
>+      name: "mac-dbg"
>+      mixins: "mac"
>+      mixins: "dbg"
>+    }
>+
>+    builders {
>+      name: "mac-rel"
>+      mixins: "mac"
>+      mixins: "rel"
>+    }
>+
>+    builders {
>+      name: "win-msvc-x86-dbg"
>+      mixins: "win"
>+      mixins: "no_clang"
>+      mixins: "x86"
>+      mixins: "dbg"
>+    }
>+
>+    builders {
>+      name: "win-msvc-x86-rel"
>+      mixins: "win"
>+      mixins: "no_clang"
>+      mixins: "x86"
>+      mixins: "rel"
>+    }
>+
>+    builders {
>+      name: "win-msvc-x64-dbg"
>+      mixins: "win"
>+      mixins: "no_clang"
>+      mixins: "x64"
>+      mixins: "dbg"
>+    }
>+
>+    builders {
>+      name: "win-msvc-x64-rel"
>+      mixins: "win"
>+      mixins: "no_clang"
>+      mixins: "x64"
>+      mixins: "rel"
>+    }
>+
>+    builders {
>+      name: "win-clang-x86-dbg"
>+      mixins: "win"
>+      mixins: "clang"
>+      mixins: "x86"
>+      mixins: "dbg"
>+    }
>+
>+    builders {
>+      name: "win-clang-x86-rel"
>+      mixins: "win"
>+      mixins: "clang"
>+      mixins: "x86"
>+      mixins: "rel"
>+    }
>+
>+    builders {
>+      name: "win-clang-x64-dbg"
>+      mixins: "win"
>+      mixins: "clang"
>+      mixins: "x64"
>+      mixins: "dbg"
>+    }
>+
>+    builders {
>+      name: "win-clang-x64-rel"
>+      mixins: "win"
>+      mixins: "clang"
>+      mixins: "x64"
>+      mixins: "rel"
>+    }
>+  }
>+}
>+
>+# Note that many angle trybots are defined in the luci.chromium.try bucket
>+# over in chromium.
>+buckets {
>+  name: "luci.angle.try"
>+  acl_sets: "try"
>+
>+  swarming {
>+    hostname: "chromium-swarm.appspot.com"
>+
>+    builder_defaults {
>+      recipe: {
>+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
>+        cipd_version: "refs/heads/master"
>+        name: "angle"
>+        properties_j: "$depot_tools/bot_update:{\"apply_patch_on_gclient\":true}"
>+      }
>+      build_numbers: YES
>+      service_account: "angle-try-builder@chops-service-accounts.iam.gserviceaccount.com"
>+
>+      caches {
>+        path: "win_toolchain"
>+        name: "win_toolchain"
>+      }
>+    }
>+
>+    builders {
>+      name: "presubmit"
>+      dimensions: "os:Ubuntu-14.04"
>+      recipe {
>+        name: "run_presubmit"
>+        properties: "repo_name:angle"
>+        properties_j: "runhooks:true"
>+      }
>+    }
>+
>+    builders {
>+      name: "linux-clang-dbg"
>+      mixins: "linux"
>+      mixins: "clang"
>+      mixins: "dbg"
>+    }
>+
>+    builders {
>+      name: "linux-clang-rel"
>+      mixins: "linux"
>+      mixins: "clang"
>+      mixins: "rel"
>+    }
>+
>+    builders {
>+      name: "linux-gcc-dbg"
>+      mixins: "linux"
>+      mixins: "no_clang"
>+      mixins: "dbg"
>+    }
>+
>+    builders {
>+      name: "linux-gcc-rel"
>+      mixins: "linux"
>+      mixins: "no_clang"
>+      mixins: "rel"
>+    }
>+
>+    builders {
>+      name: "mac-dbg"
>+      mixins: "mac"
>+      mixins: "dbg"
>+    }
>+
>+    builders {
>+      name: "mac-rel"
>+      mixins: "mac"
>+      mixins: "rel"
>+    }
>+
>+    builders {
>+      name: "win-msvc-x86-dbg"
>+      mixins: "win"
>+      mixins: "no_clang"
>+      mixins: "x86"
>+      mixins: "dbg"
>+    }
>+
>+    builders {
>+      name: "win-msvc-x86-rel"
>+      mixins: "win"
>+      mixins: "no_clang"
>+      mixins: "x86"
>+      mixins: "rel"
>+    }
>+
>+    builders {
>+      name: "win-msvc-x64-dbg"
>+      mixins: "win"
>+      mixins: "no_clang"
>+      mixins: "x64"
>+      mixins: "dbg"
>+    }
>+
>+    builders {
>+      name: "win-msvc-x64-rel"
>+      mixins: "win"
>+      mixins: "no_clang"
>+      mixins: "x64"
>+      mixins: "rel"
>+    }
>+
>+    builders {
>+      name: "win-clang-x86-dbg"
>+      mixins: "win"
>+      mixins: "clang"
>+      mixins: "x86"
>+      mixins: "dbg"
>+    }
>+
>+    builders {
>+      name: "win-clang-x86-rel"
>+      mixins: "win"
>+      mixins: "clang"
>+      mixins: "x86"
>+      mixins: "rel"
>+    }
>+
>+    builders {
>+      name: "win-clang-x64-dbg"
>+      mixins: "win"
>+      mixins: "clang"
>+      mixins: "x64"
>+      mixins: "dbg"
>+    }
>+
>+    builders {
>+      name: "win-clang-x64-rel"
>+      mixins: "win"
>+      mixins: "clang"
>+      mixins: "x64"
>+      mixins: "rel"
>+    }
>+  }
>+}
>+
>+buckets {
>+  name: "master.tryserver.chromium.angle"
>+  acls {
>+    role: READER
>+    group: "all"
>+  }
>+  acls {
>+    role: SCHEDULER
>+    group: "project-angle-tryjob-access"
>+  }
>+  acls {
>+    role: WRITER
>+    group: "service-account-chromium-tryserver"
>+  }
>+}
>diff --git a/Source/ThirdParty/ANGLE/infra/config/global/luci-logdog.cfg b/Source/ThirdParty/ANGLE/infra/config/global/luci-logdog.cfg
>new file mode 100644
>index 00000000000..ee321e6c46c
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/infra/config/global/luci-logdog.cfg
>@@ -0,0 +1,10 @@
>+# See http://luci-config.appspot.com/schemas/services/luci-logdog:logdog.cfg
>+# for schema of this file and documentation.
>+
>+reader_auth_groups: "all"
>+writer_auth_groups: "luci-logdog-angle-writers"
>+
>+# The base Google Storage archival path for this project.
>+#
>+# Archived LogDog logs will be written to this bucket/path.
>+archive_gs_bucket: "chromium-luci-logdog"
>diff --git a/Source/ThirdParty/ANGLE/infra/config/global/luci-milo.cfg b/Source/ThirdParty/ANGLE/infra/config/global/luci-milo.cfg
>new file mode 100644
>index 00000000000..32be53a795d
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/infra/config/global/luci-milo.cfg
>@@ -0,0 +1,165 @@
>+# See http://luci-config.appspot.com/schemas/projects:luci-milo.cfg for
>+# schema of this file and documentation.
>+
>+logo_url: "https://storage.googleapis.com/chrome-infra/OpenGL%20ES_RGB_June16.svg"
>+
>+consoles {
>+  id: "ci"
>+  name: "ANGLE CI builders"
>+  repo_url: "https://chromium.googlesource.com/angle/angle"
>+  refs: "refs/heads/master"
>+  manifest_name: "REVISION"
>+
>+  builders {
>+    name: "buildbucket/luci.angle.ci/linux-clang-dbg"
>+    category: "linux|clang"
>+    short_name: "dbg"
>+  }
>+  builders {
>+    name: "buildbucket/luci.angle.ci/linux-clang-rel"
>+    category: "linux|clang"
>+    short_name: "rel"
>+  }
>+  builders {
>+    name: "buildbucket/luci.angle.ci/linux-gcc-dbg"
>+    category: "linux|gcc"
>+    short_name: "dbg"
>+  }
>+  builders {
>+    name: "buildbucket/luci.angle.ci/linux-gcc-rel"
>+    category: "linux|gcc"
>+    short_name: "rel"
>+  }
>+  builders {
>+    name: "buildbucket/luci.angle.ci/mac-dbg"
>+    category: "mac"
>+    short_name: "dbg"
>+  }
>+  builders {
>+    name: "buildbucket/luci.angle.ci/mac-rel"
>+    category: "mac"
>+    short_name: "rel"
>+  }
>+  builders {
>+    name: "buildbucket/luci.angle.ci/win-clang-x86-dbg"
>+    category: "win|clang|x86"
>+    short_name: "dbg"
>+  }
>+  builders {
>+    name: "buildbucket/luci.angle.ci/win-clang-x86-rel"
>+    category: "win|clang|x86"
>+    short_name: "rel"
>+  }
>+  builders {
>+    name: "buildbucket/luci.angle.ci/win-clang-x64-dbg"
>+    category: "win|clang|x64"
>+    short_name: "dbg"
>+  }
>+  builders {
>+    name: "buildbucket/luci.angle.ci/win-clang-x64-rel"
>+    category: "win|clang|x64"
>+    short_name: "rel"
>+  }
>+  builders {
>+    name: "buildbucket/luci.angle.ci/win-msvc-x86-dbg"
>+    category: "win|msvc|x86"
>+    short_name: "dbg"
>+  }
>+  builders {
>+    name: "buildbucket/luci.angle.ci/win-msvc-x86-rel"
>+    category: "win|msvc|x86"
>+    short_name: "rel"
>+  }
>+  builders {
>+    name: "buildbucket/luci.angle.ci/win-msvc-x64-dbg"
>+    category: "win|msvc|x64"
>+    short_name: "dbg"
>+  }
>+  builders {
>+    name: "buildbucket/luci.angle.ci/win-msvc-x64-rel"
>+    category: "win|msvc|x64"
>+    short_name: "rel"
>+  }
>+}
>+
>+consoles {
>+  id: "try"
>+  name: "ANGLE try builders"
>+  repo_url: "https://chromium.googlesource.com/angle/angle"
>+  refs: "refs/heads/master"
>+  manifest_name: "PATCHED"
>+
>+  builders {
>+    name: "buildbucket/luci.angle.try/presubmit"
>+  }
>+  builders {
>+    name: "buildbucket/luci.angle.try/linux-clang-dbg"
>+    category: "linux|clang"
>+    short_name: "dbg"
>+  }
>+  builders {
>+    name: "buildbucket/luci.angle.try/linux-clang-rel"
>+    category: "linux|clang"
>+    short_name: "rel"
>+  }
>+  builders {
>+    name: "buildbucket/luci.angle.try/linux-gcc-dbg"
>+    category: "linux|gcc"
>+    short_name: "dbg"
>+  }
>+  builders {
>+    name: "buildbucket/luci.angle.try/linux-gcc-rel"
>+    category: "linux|gcc"
>+    short_name: "rel"
>+  }
>+  builders {
>+    name: "buildbucket/luci.angle.try/mac-dbg"
>+    category: "mac"
>+    short_name: "dbg"
>+  }
>+  builders {
>+    name: "buildbucket/luci.angle.try/mac-rel"
>+    category: "mac"
>+    short_name: "rel"
>+  }
>+  builders {
>+    name: "buildbucket/luci.angle.try/win-clang-x86-dbg"
>+    category: "mac|clang|x86"
>+    short_name: "dbg"
>+  }
>+  builders {
>+    name: "buildbucket/luci.angle.try/win-clang-x86-rel"
>+    category: "win|clang|x86"
>+    short_name: "rel"
>+  }
>+  builders {
>+    name: "buildbucket/luci.angle.try/win-clang-x64-dbg"
>+    category: "win|clang|x64"
>+    short_name: "dbg"
>+  }
>+  builders {
>+    name: "buildbucket/luci.angle.try/win-clang-x64-rel"
>+    category: "win|clang|x64"
>+    short_name: "rel"
>+  }
>+  builders {
>+    name: "buildbucket/luci.angle.try/win-msvc-x86-dbg"
>+    category: "win|msvc|x86"
>+    short_name: "dbg"
>+  }
>+  builders {
>+    name: "buildbucket/luci.angle.try/win-msvc-x86-rel"
>+    category: "win|msvc|x86"
>+    short_name: "rel"
>+  }
>+  builders {
>+    name: "buildbucket/luci.angle.try/win-msvc-x64-dbg"
>+    category: "win|msvc|x64"
>+    short_name: "dbg"
>+  }
>+  builders {
>+    name: "buildbucket/luci.angle.try/win-msvc-x64-rel"
>+    category: "win|msvc|x64"
>+    short_name: "rel"
>+  }
>+}
>diff --git a/Source/ThirdParty/ANGLE/infra/config/global/luci-scheduler.cfg b/Source/ThirdParty/ANGLE/infra/config/global/luci-scheduler.cfg
>new file mode 100644
>index 00000000000..de913530c81
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/infra/config/global/luci-scheduler.cfg
>@@ -0,0 +1,182 @@
>+# Defines jobs on luci-scheduler.appspot.com.
>+#
>+# For schema of this file and documentation see ProjectConfig message in
>+#
>+# https://chromium.googlesource.com/infra/luci/luci-go/+/master/scheduler/appengine/messages/cron.proto
>+
>+acl_sets {
>+  name: "default"
>+  acls {
>+    role: READER
>+    granted_to: "group:all"
>+  }
>+  acls {
>+    role: OWNER
>+    granted_to: "group:project-angle-admins"
>+  }
>+}
>+
>+trigger {
>+  id: "master-gitiles-trigger"
>+  acl_sets: "default"
>+
>+  gitiles {
>+    repo: "https://chromium.googlesource.com/angle/angle.git"
>+    refs: "refs/heads/master"
>+  }
>+
>+  triggers: "linux-clang-dbg"
>+  triggers: "linux-clang-rel"
>+  triggers: "linux-gcc-dbg"
>+  triggers: "linux-gcc-rel"
>+  triggers: "mac-dbg"
>+  triggers: "mac-rel"
>+  triggers: "win-clang-x86-dbg"
>+  triggers: "win-clang-x86-rel"
>+  triggers: "win-clang-x64-dbg"
>+  triggers: "win-clang-x64-rel"
>+  triggers: "win-msvc-x86-dbg"
>+  triggers: "win-msvc-x86-rel"
>+  triggers: "win-msvc-x64-dbg"
>+  triggers: "win-msvc-x64-rel"
>+}
>+
>+job {
>+  id: "linux-clang-dbg"
>+  acl_sets: "default"
>+  buildbucket: {
>+    server: "cr-buildbucket.appspot.com"
>+    bucket: "luci.angle.ci"
>+    builder: "linux-clang-dbg"
>+  }
>+}
>+
>+job {
>+  id: "linux-clang-rel"
>+  acl_sets: "default"
>+  buildbucket: {
>+    server: "cr-buildbucket.appspot.com"
>+    bucket: "luci.angle.ci"
>+    builder: "linux-clang-rel"
>+  }
>+}
>+
>+job {
>+  id: "linux-gcc-dbg"
>+  acl_sets: "default"
>+  buildbucket: {
>+    server: "cr-buildbucket.appspot.com"
>+    bucket: "luci.angle.ci"
>+    builder: "linux-gcc-dbg"
>+  }
>+}
>+
>+job {
>+  id: "linux-gcc-rel"
>+  acl_sets: "default"
>+  buildbucket: {
>+    server: "cr-buildbucket.appspot.com"
>+    bucket: "luci.angle.ci"
>+    builder: "linux-gcc-rel"
>+  }
>+}
>+
>+job {
>+  id: "mac-dbg"
>+  acl_sets: "default"
>+  buildbucket: {
>+    server: "cr-buildbucket.appspot.com"
>+    bucket: "luci.angle.ci"
>+    builder: "mac-dbg"
>+  }
>+}
>+
>+job {
>+  id: "mac-rel"
>+  acl_sets: "default"
>+  buildbucket: {
>+    server: "cr-buildbucket.appspot.com"
>+    bucket: "luci.angle.ci"
>+    builder: "mac-rel"
>+  }
>+}
>+
>+job {
>+  id: "win-clang-x86-dbg"
>+  acl_sets: "default"
>+  buildbucket: {
>+    server: "cr-buildbucket.appspot.com"
>+    bucket: "luci.angle.ci"
>+    builder: "win-clang-x86-dbg"
>+  }
>+}
>+
>+job {
>+  id: "win-clang-x86-rel"
>+  acl_sets: "default"
>+  buildbucket: {
>+    server: "cr-buildbucket.appspot.com"
>+    bucket: "luci.angle.ci"
>+    builder: "win-clang-x86-rel"
>+  }
>+}
>+
>+job {
>+  id: "win-clang-x64-dbg"
>+  acl_sets: "default"
>+  buildbucket: {
>+    server: "cr-buildbucket.appspot.com"
>+    bucket: "luci.angle.ci"
>+    builder: "win-clang-x64-dbg"
>+  }
>+}
>+
>+job {
>+  id: "win-clang-x64-rel"
>+  acl_sets: "default"
>+  buildbucket: {
>+    server: "cr-buildbucket.appspot.com"
>+    bucket: "luci.angle.ci"
>+    builder: "win-clang-x64-rel"
>+  }
>+}
>+
>+job {
>+  id: "win-msvc-x86-dbg"
>+  acl_sets: "default"
>+  buildbucket: {
>+    server: "cr-buildbucket.appspot.com"
>+    bucket: "luci.angle.ci"
>+    builder: "win-msvc-x86-dbg"
>+  }
>+}
>+
>+job {
>+  id: "win-msvc-x86-rel"
>+  acl_sets: "default"
>+  buildbucket: {
>+    server: "cr-buildbucket.appspot.com"
>+    bucket: "luci.angle.ci"
>+    builder: "win-msvc-x86-rel"
>+  }
>+}
>+
>+job {
>+  id: "win-msvc-x64-dbg"
>+  acl_sets: "default"
>+  buildbucket: {
>+    server: "cr-buildbucket.appspot.com"
>+    bucket: "luci.angle.ci"
>+    builder: "win-msvc-x64-dbg"
>+  }
>+}
>+
>+job {
>+  id: "win-msvc-x64-rel"
>+  acl_sets: "default"
>+  buildbucket: {
>+    server: "cr-buildbucket.appspot.com"
>+    bucket: "luci.angle.ci"
>+    builder: "win-msvc-x64-rel"
>+  }
>+}
>diff --git a/Source/ThirdParty/ANGLE/infra/config/global/project.cfg b/Source/ThirdParty/ANGLE/infra/config/global/project.cfg
>new file mode 100644
>index 00000000000..e266c98bf59
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/infra/config/global/project.cfg
>@@ -0,0 +1,4 @@
>+# For the schema of this file and documentation, see ProjectCfg message in
>+# https://luci-config.appspot.com/schemas/projects:project.cfg
>+name: "angle"
>+access: "group:all" # public
>diff --git a/Source/ThirdParty/ANGLE/infra/config/global/refs.cfg b/Source/ThirdParty/ANGLE/infra/config/global/refs.cfg
>new file mode 100644
>index 00000000000..b287e225083
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/infra/config/global/refs.cfg
>@@ -0,0 +1,6 @@
>+# Refs configuration file. The documentation of the format can be found
>+# at https://luci-config.appspot.com/schemas/projects:refs.cfg.
>+refs {
>+  name: "refs/heads/master"
>+  config_path: "infra/config/branch"
>+}
>diff --git a/Source/ThirdParty/ANGLE/samples/BUILD.gn b/Source/ThirdParty/ANGLE/samples/BUILD.gn
>new file mode 100644
>index 00000000000..13022bfd39c
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/samples/BUILD.gn
>@@ -0,0 +1,239 @@
>+# Copyright 2017 The Chromium Authors. All rights reserved.
>+# Use of this source code is governed by a BSD-style license that can be
>+# found in the LICENSE file.
>+
>+import("../gni/angle.gni")
>+
>+angle_executable("shader_translator") {
>+  sources = [
>+    "shader_translator/shader_translator.cpp",
>+  ]
>+  include_dirs = [ "../include" ]
>+  deps = [
>+    "../:translator",
>+  ]
>+}
>+
>+config("sample_util_config") {
>+  include_dirs = [ "sample_util" ]
>+}
>+
>+angle_static_library("sample_util") {
>+  sources = [
>+    "sample_util/SampleApplication.cpp",
>+    "sample_util/SampleApplication.h",
>+    "sample_util/texture_utils.cpp",
>+    "sample_util/texture_utils.h",
>+    "sample_util/tga_utils.cpp",
>+    "sample_util/tga_utils.h",
>+  ]
>+  data_deps = [
>+    "../:libEGL${angle_libs_suffix}",
>+    "../:libGLESv1_CM${angle_libs_suffix}",
>+    "../:libGLESv2${angle_libs_suffix}",
>+  ]
>+  public_deps = [
>+    "../:angle_common",
>+    "../:angle_util",
>+    "../:angle_util_loader_headers",
>+  ]
>+  configs += [ "../:library_name_config" ]
>+  public_configs = [
>+    ":sample_util_config",
>+    "../:no_gl_prototypes",
>+  ]
>+}
>+
>+template("angle_sample") {
>+  if (defined(invoker.data)) {
>+    copy(target_name + "_data") {
>+      sources = invoker.data
>+      outputs = [
>+        "$root_out_dir/{{source_file_part}}",
>+      ]
>+    }
>+  }
>+
>+  angle_executable(target_name) {
>+    deps = [
>+      ":sample_util",
>+    ]
>+    if (defined(invoker.data)) {
>+      deps += [ ":${target_name}_data" ]
>+    }
>+    sources = invoker.sources
>+  }
>+}
>+
>+angle_sample("hello_triangle") {
>+  sources = [
>+    "hello_triangle/HelloTriangle.cpp",
>+  ]
>+}
>+
>+angle_sample("mip_map_2d") {
>+  sources = [
>+    "mip_map_2d/MipMap2D.cpp",
>+  ]
>+}
>+
>+angle_sample("multi_texture") {
>+  sources = [
>+    "multi_texture/MultiTexture.cpp",
>+  ]
>+  data = [
>+    "multi_texture/basemap.tga",
>+    "multi_texture/lightmap.tga",
>+  ]
>+}
>+
>+angle_sample("multi_window") {
>+  sources = [
>+    "multi_window/MultiWindow.cpp",
>+  ]
>+}
>+
>+angle_sample("multiple_draw_buffers") {
>+  sources = [
>+    "multiple_draw_buffers/MultipleDrawBuffers.cpp",
>+  ]
>+  data = [
>+    "multiple_draw_buffers/multiple_draw_buffers_copy_fs.glsl",
>+    "multiple_draw_buffers/multiple_draw_buffers_fs.glsl",
>+    "multiple_draw_buffers/multiple_draw_buffers_vs.glsl",
>+  ]
>+}
>+
>+angle_sample("multiview") {
>+  sources = [
>+    "multiview/Multiview.cpp",
>+  ]
>+}
>+
>+angle_sample("particle_system") {
>+  sources = [
>+    "particle_system/ParticleSystem.cpp",
>+  ]
>+  data = [
>+    "particle_system/smoke.tga",
>+  ]
>+}
>+
>+angle_sample("post_sub_buffer") {
>+  sources = [
>+    "post_sub_buffer/PostSubBuffer.cpp",
>+  ]
>+}
>+
>+angle_sample("simple_instancing") {
>+  sources = [
>+    "simple_instancing/SimpleInstancing.cpp",
>+  ]
>+}
>+
>+angle_sample("simple_texture_2d") {
>+  sources = [
>+    "simple_texture_2d/SimpleTexture2D.cpp",
>+  ]
>+}
>+
>+angle_sample("simple_texture_cubemap") {
>+  sources = [
>+    "simple_texture_cubemap/SimpleTextureCubemap.cpp",
>+  ]
>+}
>+
>+angle_sample("simple_vertex_shader") {
>+  sources = [
>+    "simple_vertex_shader/SimpleVertexShader.cpp",
>+  ]
>+}
>+
>+angle_sample("stencil_operations") {
>+  sources = [
>+    "stencil_operations/StencilOperations.cpp",
>+  ]
>+}
>+
>+angle_sample("tex_redef_microbench") {
>+  sources = [
>+    "tex_redef_microbench/TexRedefMicroBench.cpp",
>+  ]
>+}
>+
>+angle_sample("texture_wrap") {
>+  sources = [
>+    "texture_wrap/TextureWrap.cpp",
>+  ]
>+}
>+
>+angle_sample("tri_fan_microbench") {
>+  sources = [
>+    "tri_fan_microbench/TriFanMicroBench.cpp",
>+  ]
>+}
>+
>+angle_sample("window_test") {
>+  sources = [
>+    "WindowTest/WindowTest.cpp",
>+  ]
>+}
>+
>+angle_sample("gles1_hello_triangle") {
>+  sources = [
>+    "gles1/HelloTriangle.cpp",
>+  ]
>+}
>+
>+angle_sample("gles1_simple_texture_2d") {
>+  sources = [
>+    "gles1/SimpleTexture2D.cpp",
>+  ]
>+}
>+
>+angle_sample("gles1_simple_lighting") {
>+  sources = [
>+    "gles1/SimpleLighting.cpp",
>+  ]
>+}
>+
>+angle_sample("gles1_flat_shading") {
>+  sources = [
>+    "gles1/FlatShading.cpp",
>+  ]
>+}
>+
>+angle_sample("gles1_draw_texture") {
>+  sources = [
>+    "gles1/DrawTexture.cpp",
>+  ]
>+}
>+
>+group("all") {
>+  testonly = true
>+  deps = [
>+    ":gles1_draw_texture",
>+    ":gles1_flat_shading",
>+    ":gles1_hello_triangle",
>+    ":gles1_simple_lighting",
>+    ":gles1_simple_texture_2d",
>+    ":hello_triangle",
>+    ":mip_map_2d",
>+    ":multi_texture",
>+    ":multi_window",
>+    ":multiple_draw_buffers",
>+    ":multiview",
>+    ":particle_system",
>+    ":post_sub_buffer",
>+    ":sample_util",
>+    ":simple_instancing",
>+    ":simple_texture_2d",
>+    ":simple_texture_cubemap",
>+    ":simple_vertex_shader",
>+    ":stencil_operations",
>+    ":tex_redef_microbench",
>+    ":texture_wrap",
>+    ":tri_fan_microbench",
>+    ":window_test",
>+  ]
>+}
>diff --git a/Source/ThirdParty/ANGLE/samples/WindowTest/WindowTest.cpp b/Source/ThirdParty/ANGLE/samples/WindowTest/WindowTest.cpp
>new file mode 100644
>index 00000000000..0cf426cc8b1
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/samples/WindowTest/WindowTest.cpp
>@@ -0,0 +1,139 @@
>+//
>+// Copyright The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+
>+// WindowTest.cpp: Sample used to test various function of OSWindow
>+
>+#include <algorithm>
>+#include <iostream>
>+
>+#include "util/OSWindow.h"
>+#include "util/system_utils.h"
>+
>+int main(int argc, char *argv[])
>+{
>+    OSWindow *window = OSWindow::New();
>+    int width        = 400;
>+    int height       = 400;
>+    int x            = 0;
>+    int y            = 0;
>+
>+    if (!window->initialize("Window Test", width, height))
>+    {
>+        return -1;
>+    }
>+    window->setVisible(true);
>+    window->setPosition(x, y);
>+
>+    bool running = true;
>+    while (running)
>+    {
>+        Event event;
>+        while (window->popEvent(&event))
>+        {
>+            if (event.Type == Event::EVENT_CLOSED)
>+            {
>+                running = false;
>+                break;
>+            }
>+
>+            if (event.Type == Event::EVENT_KEY_PRESSED)
>+            {
>+                int newWidth  = width;
>+                int newHeight = height;
>+                int newX      = x;
>+                int newY      = y;
>+                switch (event.Key.Code)
>+                {
>+                    case KEY_ESCAPE:
>+                        running = false;
>+                        break;
>+
>+                    case KEY_W:
>+                        newWidth = std::max(0, width + (event.Key.Shift ? -20 : 20));
>+                        break;
>+                    case KEY_H:
>+                        newHeight = std::max(0, height + (event.Key.Shift ? -20 : 20));
>+                        break;
>+
>+                    case KEY_LEFT:
>+                        newX = x - 20;
>+                        break;
>+                    case KEY_RIGHT:
>+                        newX = x + 20;
>+                        break;
>+                    case KEY_UP:
>+                        newY = y - 20;
>+                        break;
>+                    case KEY_DOWN:
>+                        newY = y + 20;
>+                        break;
>+
>+                    case KEY_C:
>+                        window->setMousePosition(width / 2, height / 2);
>+                        break;
>+                    case KEY_T:
>+                        window->signalTestEvent();
>+                        window->messageLoop();
>+                        if (window->didTestEventFire())
>+                        {
>+                            std::cout << "Test event did fire" << std::endl;
>+                        }
>+                        else
>+                        {
>+                            std::cout << "Test event did not fire" << std::endl;
>+                        }
>+                        break;
>+                    case KEY_S:
>+                        window->setVisible(false);
>+                        window->messageLoop();
>+                        angle::Sleep(1000);
>+                        window->setVisible(true);
>+                        window->messageLoop();
>+                        break;
>+
>+                    default:
>+                        break;
>+                }
>+
>+                if (newWidth != width || newHeight != height)
>+                {
>+                    width  = newWidth;
>+                    height = newHeight;
>+                    window->resize(width, height);
>+                }
>+                if (newX != x || newY != y)
>+                {
>+                    x = newX;
>+                    y = newY;
>+                    window->setPosition(x, y);
>+                }
>+
>+                angle::Sleep(0);
>+                window->messageLoop();
>+                if (window->getWidth() != width || window->getHeight() != height)
>+                {
>+                    std::cout << "Discrepancy between set dimensions and retrieved dimensions"
>+                              << std::endl;
>+                    std::cout << "Width: " << width << " vs. " << window->getWidth() << std::endl;
>+                    std::cout << "Height: " << height << " vs. " << window->getHeight()
>+                              << std::endl;
>+                }
>+                if (window->getX() != x || window->getY() != y)
>+                {
>+                    std::cout << "Discrepancy between set position and retrieved position"
>+                              << std::endl;
>+                    std::cout << "X: " << x << " vs. " << window->getX() << std::endl;
>+                    std::cout << "Y: " << y << " vs. " << window->getY() << std::endl;
>+                }
>+            }
>+        }
>+
>+        angle::Sleep(0);
>+        window->messageLoop();
>+    }
>+
>+    window->destroy();
>+}
>diff --git a/Source/ThirdParty/ANGLE/samples/gles1/DrawTexture.cpp b/Source/ThirdParty/ANGLE/samples/gles1/DrawTexture.cpp
>new file mode 100644
>index 00000000000..aa062b6a630
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/samples/gles1/DrawTexture.cpp
>@@ -0,0 +1,108 @@
>+//
>+// Copyright 2018 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+
>+//            Based on Simple_Texture2D.c from
>+// Book:      OpenGL(R) ES 2.0 Programming Guide
>+// Authors:   Aaftab Munshi, Dan Ginsburg, Dave Shreiner
>+// ISBN-10:   0321502795
>+// ISBN-13:   9780321502797
>+// Publisher: Addison-Wesley Professional
>+// URLs:      http://safari.informit.com/9780321563835
>+//            http://www.opengles-book.com
>+
>+#include "SampleApplication.h"
>+#include "texture_utils.h"
>+#include "util/shader_utils.h"
>+#include "util/system_utils.h"
>+
>+#include <GLES/gl.h>
>+#include <GLES/glext.h>
>+
>+class GLES1DrawTextureSample : public SampleApplication
>+{
>+  public:
>+    GLES1DrawTextureSample(int argc, char **argv)
>+        : SampleApplication("GLES1DrawTexture", argc, argv, 1, 0, 1280, 800)
>+    {}
>+
>+    bool initialize() override
>+    {
>+        // Load the texture
>+        mTexture = CreateSimpleTexture2D();
>+
>+        glClearColor(0.0f, 0.0f, 0.0f, 0.0f);
>+        glActiveTexture(GL_TEXTURE0);
>+        glEnable(GL_TEXTURE_2D);
>+
>+        glActiveTexture(GL_TEXTURE0);
>+        glEnable(GL_TEXTURE_2D);
>+        glBindTexture(GL_TEXTURE_2D, mTexture);
>+
>+        GLint crop[4] = {0, 0, 2, 2};
>+        glTexParameteriv(GL_TEXTURE_2D, GL_TEXTURE_CROP_RECT_OES, crop);
>+        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
>+
>+        glViewport(0, 0, getWindow()->getWidth(), getWindow()->getHeight());
>+
>+        return true;
>+    }
>+
>+    void destroy() override { glDeleteTextures(1, &mTexture); }
>+
>+    void draw() override
>+    {
>+        glClear(GL_COLOR_BUFFER_BIT);
>+
>+        GLint windowWidth  = getWindow()->getWidth();
>+        GLint windowHeight = getWindow()->getHeight();
>+
>+        glDrawTexiOES(mX, mY, 0, mWidth, mHeight);
>+        glDrawTexiOES(windowWidth - mX, mY, 0, mWidth, mHeight);
>+        glDrawTexiOES(mX, windowHeight - mY, 0, mWidth, mHeight);
>+        glDrawTexiOES(windowWidth - mX, windowHeight - mY, 0, mWidth, mHeight);
>+
>+        mX += mReverseX ? -1 : 1;
>+        mY += mReverseY ? -1 : 1;
>+
>+        if (mX + mWidth >= windowWidth)
>+            mReverseX = true;
>+        if (mX < 0)
>+            mReverseX = false;
>+
>+        if (mY + mHeight >= windowHeight)
>+            mReverseY = true;
>+        if (mY < 0)
>+            mReverseY = false;
>+
>+        ++mWidth;
>+        ++mHeight;
>+        if (mWidth >= windowWidth)
>+            mWidth = 0;
>+        if (mHeight >= windowHeight)
>+            mHeight = 0;
>+
>+        angle::Sleep(16);
>+    }
>+
>+  private:
>+    // Texture handle
>+    GLuint mTexture = 0;
>+
>+    // Draw texture coordinates and dimensions to loop through
>+    GLint mX      = 0;
>+    GLint mY      = 0;
>+    GLint mWidth  = 0;
>+    GLint mHeight = 0;
>+
>+    bool mReverseX = false;
>+    bool mReverseY = false;
>+};
>+
>+int main(int argc, char **argv)
>+{
>+    GLES1DrawTextureSample app(argc, argv);
>+    return app.run();
>+}
>diff --git a/Source/ThirdParty/ANGLE/samples/gles1/FlatShading.cpp b/Source/ThirdParty/ANGLE/samples/gles1/FlatShading.cpp
>new file mode 100644
>index 00000000000..56be7ddd913
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/samples/gles1/FlatShading.cpp
>@@ -0,0 +1,103 @@
>+//
>+// Copyright 2018 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+
>+//            Based on Hello_Triangle.c from
>+// Book:      OpenGL(R) ES 2.0 Programming Guide
>+// Authors:   Aaftab Munshi, Dan Ginsburg, Dave Shreiner
>+// ISBN-10:   0321502795
>+// ISBN-13:   9780321502797
>+// Publisher: Addison-Wesley Professional
>+// URLs:      http://safari.informit.com/9780321563835
>+//            http://www.opengles-book.com
>+
>+#include "SampleApplication.h"
>+
>+#include <algorithm>
>+
>+#include "util/gles_loader_autogen.h"
>+
>+class FlatShadingSample : public SampleApplication
>+{
>+  public:
>+    FlatShadingSample(int argc, char **argv)
>+        : SampleApplication("FlatShadingSample", argc, argv, 1, 0)
>+    {}
>+
>+    bool initialize() override
>+    {
>+        glClearColor(0.1f, 0.1f, 0.2f, 1.0f);
>+        mRotDeg = 0.0f;
>+
>+        return true;
>+    }
>+
>+    void draw() override
>+    {
>+        glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
>+
>+        GLfloat vertices[] = {
>+            -0.5f, 0.5f, 0.0f, -0.5f, -0.5f, 0.0f, 0.5f,  -0.5f,
>+            0.0f,  0.5f, 0.5f, 0.0f,  0.0f,  0.0f, -1.0f,
>+        };
>+
>+        GLfloat colors[] = {
>+            1.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f, 0.0f, 1.0f, 0.0f, 0.0f,
>+            1.0f, 1.0f, 1.0f, 1.0f, 0.0f, 1.0f, 1.0f, 0.0f, 1.0f, 1.0f,
>+        };
>+
>+        GLuint indices[] = {
>+            0, 1, 2, 2, 3, 0,
>+
>+            4, 1, 0, 4, 2, 1, 4, 3, 2, 4, 0, 3,
>+        };
>+
>+        glEnable(GL_DEPTH_TEST);
>+
>+        glEnableClientState(GL_VERTEX_ARRAY);
>+        glEnableClientState(GL_COLOR_ARRAY);
>+        glVertexPointer(3, GL_FLOAT, 0, vertices);
>+        glColorPointer(4, GL_FLOAT, 0, colors);
>+
>+        for (int i = 0; i < 6; i++)
>+        {
>+            for (int j = 0; j < 6; j++)
>+            {
>+                if ((i + j * 6) % 2 == 0)
>+                {
>+                    glShadeModel(GL_FLAT);
>+                }
>+                else
>+                {
>+                    glShadeModel(GL_SMOOTH);
>+                }
>+
>+                glPushMatrix();
>+
>+                glTranslatef(-0.7f + i * 0.3f, -0.7f + j * 0.3f, 0.0f);
>+
>+                glRotatef(mRotDeg + (5.0f * (6.0f * i + j)), 0.0f, 1.0f, 0.0f);
>+                glRotatef(20.0f + (10.0f * (6.0f * i + j)), 1.0f, 0.0f, 0.0f);
>+                GLfloat scale = 0.2f;
>+                glScalef(scale, scale, scale);
>+                glDrawElements(GL_TRIANGLES, sizeof(indices) / sizeof(GLuint), GL_UNSIGNED_INT,
>+                               indices);
>+
>+                glPopMatrix();
>+            }
>+        }
>+
>+        mRotDeg += 0.1f;
>+    }
>+
>+  private:
>+    float mRotDeg = 0.0f;
>+};
>+
>+int main(int argc, char **argv)
>+{
>+    FlatShadingSample app(argc, argv);
>+    return app.run();
>+}
>diff --git a/Source/ThirdParty/ANGLE/samples/gles1/HelloTriangle.cpp b/Source/ThirdParty/ANGLE/samples/gles1/HelloTriangle.cpp
>new file mode 100644
>index 00000000000..472ac48925e
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/samples/gles1/HelloTriangle.cpp
>@@ -0,0 +1,55 @@
>+//
>+// Copyright 2018 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+
>+//            Based on Hello_Triangle.c from
>+// Book:      OpenGL(R) ES 2.0 Programming Guide
>+// Authors:   Aaftab Munshi, Dan Ginsburg, Dave Shreiner
>+// ISBN-10:   0321502795
>+// ISBN-13:   9780321502797
>+// Publisher: Addison-Wesley Professional
>+// URLs:      http://safari.informit.com/9780321563835
>+//            http://www.opengles-book.com
>+
>+#include "SampleApplication.h"
>+#include "util/shader_utils.h"
>+
>+class GLES1HelloTriangleSample : public SampleApplication
>+{
>+  public:
>+    GLES1HelloTriangleSample(int argc, char **argv)
>+        : SampleApplication("GLES1HelloTriangle", argc, argv, 1, 0)
>+    {}
>+
>+    bool initialize() override
>+    {
>+        glClearColor(0.0f, 0.0f, 0.0f, 0.0f);
>+
>+        return true;
>+    }
>+
>+    void draw() override
>+    {
>+        GLfloat vertices[] = {
>+            0.0f, 0.5f, 0.0f, -0.5f, -0.5f, 0.0f, 0.5f, -0.5f, 0.0f,
>+        };
>+
>+        glViewport(0, 0, getWindow()->getWidth(), getWindow()->getHeight());
>+        glClear(GL_COLOR_BUFFER_BIT);
>+
>+        glEnableClientState(GL_VERTEX_ARRAY);
>+        glVertexPointer(3, GL_FLOAT, 0, vertices);
>+
>+        glColor4f(1.0f, 0.0f, 0.0f, 1.0f);
>+
>+        glDrawArrays(GL_TRIANGLES, 0, 3);
>+    }
>+};
>+
>+int main(int argc, char **argv)
>+{
>+    GLES1HelloTriangleSample app(argc, argv);
>+    return app.run();
>+}
>diff --git a/Source/ThirdParty/ANGLE/samples/gles1/SimpleLighting.cpp b/Source/ThirdParty/ANGLE/samples/gles1/SimpleLighting.cpp
>new file mode 100644
>index 00000000000..6981b26a8e2
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/samples/gles1/SimpleLighting.cpp
>@@ -0,0 +1,115 @@
>+//
>+// Copyright 2018 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+
>+//            Based on Hello_Triangle.c from
>+// Book:      OpenGL(R) ES 2.0 Programming Guide
>+// Authors:   Aaftab Munshi, Dan Ginsburg, Dave Shreiner
>+// ISBN-10:   0321502795
>+// ISBN-13:   9780321502797
>+// Publisher: Addison-Wesley Professional
>+// URLs:      http://safari.informit.com/9780321563835
>+//            http://www.opengles-book.com
>+
>+#include "SampleApplication.h"
>+
>+#include <algorithm>
>+
>+#include "util/gles_loader_autogen.h"
>+
>+class SimpleLightingSample : public SampleApplication
>+{
>+  public:
>+    SimpleLightingSample(int argc, char **argv)
>+        : SampleApplication("SimpleLightingSample", argc, argv, 1, 0)
>+    {}
>+
>+    virtual bool initialize()
>+    {
>+        glClearColor(0.4f, 0.3f, 0.2f, 1.0f);
>+        mRotDeg = 0.0f;
>+
>+        return true;
>+    }
>+
>+    virtual void destroy() {}
>+
>+    virtual void draw()
>+    {
>+
>+        glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
>+        glColor4f(0.2f, 0.6f, 0.8f, 1.0f);
>+
>+        GLfloat mat_ambient[]  = {0.7f, 0.4f, 0.2f, 1.0f};
>+        GLfloat mat_specular[] = {0.5f, 0.5f, 0.5f, 1.0f};
>+        GLfloat mat_diffuse[]  = {0.3f, 0.4f, 0.6f, 1.0f};
>+        GLfloat lightpos[]     = {0.0f, 1.0f, 0.0f, 0.0f};
>+
>+        GLfloat normals[] = {
>+            -0.4f, 0.4f, -0.4f, -0.4f, -0.4f, -0.4f, 0.2f, 0.0f, -0.4f,
>+
>+            -0.4f, 0.4f, 0.4f,  -0.4f, -0.4f, 0.4f,  0.2f, 0.0f, 0.4f,
>+        };
>+
>+        GLfloat vertices[] = {
>+            -0.5f, 0.5f, 0.0f, -0.5f, -0.5f, 0.0f, 0.5f, 0.0f, 0.0f,
>+
>+            -0.5f, 0.5f, 0.3f, -0.5f, -0.5f, 0.3f, 0.5f, 0.0f, 0.3f,
>+        };
>+
>+        GLuint indices[] = {
>+            0, 1, 2, 3, 4, 5,
>+
>+            0, 4, 3, 4, 0, 1,
>+
>+            4, 1, 2, 2, 5, 4,
>+
>+            5, 2, 3, 3, 2, 0,
>+        };
>+
>+        glMaterialfv(GL_FRONT_AND_BACK, GL_AMBIENT, mat_ambient);
>+        glMaterialfv(GL_FRONT_AND_BACK, GL_SPECULAR, mat_specular);
>+        glMaterialfv(GL_FRONT_AND_BACK, GL_DIFFUSE, mat_diffuse);
>+
>+        glEnable(GL_DEPTH_TEST);
>+        glEnable(GL_LIGHTING);
>+        glEnable(GL_LIGHT0);
>+        glLightfv(GL_LIGHT0, GL_POSITION, lightpos);
>+
>+        glEnableClientState(GL_VERTEX_ARRAY);
>+        glEnableClientState(GL_NORMAL_ARRAY);
>+        glVertexPointer(3, GL_FLOAT, 0, vertices);
>+        glNormalPointer(GL_FLOAT, 0, normals);
>+
>+        for (int i = 0; i < 3; i++)
>+        {
>+            for (int j = 0; j < 3; j++)
>+            {
>+                glPushMatrix();
>+
>+                glTranslatef(-0.6f + i * 0.6f, -0.6f + j * 0.6f, 0.0f);
>+
>+                glRotatef(mRotDeg + (10.0f * (3.0f * i + j)), 0.0f, 1.0f, 0.0f);
>+                glRotatef(20.0f + (20.0f * (3.0f * i + j)), 1.0f, 0.0f, 0.0f);
>+                GLfloat scale = 0.5;
>+                glScalef(scale, scale, scale);
>+                glDrawElements(GL_TRIANGLES, 3 * 8, GL_UNSIGNED_INT, indices);
>+
>+                glPopMatrix();
>+            }
>+        }
>+
>+        mRotDeg += 0.03f;
>+    }
>+
>+  private:
>+    float mRotDeg;
>+};
>+
>+int main(int argc, char **argv)
>+{
>+    SimpleLightingSample app(argc, argv);
>+    return app.run();
>+}
>diff --git a/Source/ThirdParty/ANGLE/samples/gles1/SimpleTexture2D.cpp b/Source/ThirdParty/ANGLE/samples/gles1/SimpleTexture2D.cpp
>new file mode 100644
>index 00000000000..87a37031cc7
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/samples/gles1/SimpleTexture2D.cpp
>@@ -0,0 +1,86 @@
>+//
>+// Copyright 2018 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+
>+//            Based on Simple_Texture2D.c from
>+// Book:      OpenGL(R) ES 2.0 Programming Guide
>+// Authors:   Aaftab Munshi, Dan Ginsburg, Dave Shreiner
>+// ISBN-10:   0321502795
>+// ISBN-13:   9780321502797
>+// Publisher: Addison-Wesley Professional
>+// URLs:      http://safari.informit.com/9780321563835
>+//            http://www.opengles-book.com
>+
>+#include "SampleApplication.h"
>+
>+#include "texture_utils.h"
>+#include "util/gles_loader_autogen.h"
>+#include "util/shader_utils.h"
>+
>+class GLES1SimpleTexture2DSample : public SampleApplication
>+{
>+  public:
>+    GLES1SimpleTexture2DSample(int argc, char **argv)
>+        : SampleApplication("GLES1SimpleTexture2D", argc, argv, 1, 0)
>+    {}
>+
>+    bool initialize() override
>+    {
>+        // Load the texture
>+        mTexture = CreateSimpleTexture2D();
>+
>+        glClearColor(0.0f, 0.0f, 0.0f, 0.0f);
>+        glEnable(GL_TEXTURE_2D);
>+
>+        return true;
>+    }
>+
>+    void destroy() override { glDeleteTextures(1, &mTexture); }
>+
>+    void draw() override
>+    {
>+        GLfloat vertices[] = {
>+            -0.5f, 0.5f,  0.0f,  // Position 0
>+            0.0f,  0.0f,         // TexCoord 0
>+            -0.5f, -0.5f, 0.0f,  // Position 1
>+            0.0f,  1.0f,         // TexCoord 1
>+            0.5f,  -0.5f, 0.0f,  // Position 2
>+            1.0f,  1.0f,         // TexCoord 2
>+            0.5f,  0.5f,  0.0f,  // Position 3
>+            1.0f,  0.0f          // TexCoord 3
>+        };
>+        GLushort indices[] = {0, 1, 2, 0, 2, 3};
>+
>+        // Set the viewport
>+        glViewport(0, 0, getWindow()->getWidth(), getWindow()->getHeight());
>+
>+        // Clear the color buffer
>+        glClear(GL_COLOR_BUFFER_BIT);
>+
>+        // Load the vertex position
>+        glVertexPointer(3, GL_FLOAT, 5 * sizeof(GLfloat), vertices);
>+        // Load the texture coordinate
>+        glTexCoordPointer(2, GL_FLOAT, 5 * sizeof(GLfloat), vertices + 3);
>+
>+        glEnableClientState(GL_VERTEX_ARRAY);
>+        glEnableClientState(GL_TEXTURE_COORD_ARRAY);
>+
>+        // Bind the texture
>+        glActiveTexture(GL_TEXTURE0);
>+        glBindTexture(GL_TEXTURE_2D, mTexture);
>+
>+        glDrawElements(GL_TRIANGLES, 6, GL_UNSIGNED_SHORT, indices);
>+    }
>+
>+  private:
>+    // Texture handle
>+    GLuint mTexture = 0;
>+};
>+
>+int main(int argc, char **argv)
>+{
>+    GLES1SimpleTexture2DSample app(argc, argv);
>+    return app.run();
>+}
>diff --git a/Source/ThirdParty/ANGLE/samples/hello_triangle/HelloTriangle.cpp b/Source/ThirdParty/ANGLE/samples/hello_triangle/HelloTriangle.cpp
>new file mode 100644
>index 00000000000..8e949b4bbaa
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/samples/hello_triangle/HelloTriangle.cpp
>@@ -0,0 +1,84 @@
>+//
>+// Copyright (c) 2014 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+
>+//            Based on Hello_Triangle.c from
>+// Book:      OpenGL(R) ES 2.0 Programming Guide
>+// Authors:   Aaftab Munshi, Dan Ginsburg, Dave Shreiner
>+// ISBN-10:   0321502795
>+// ISBN-13:   9780321502797
>+// Publisher: Addison-Wesley Professional
>+// URLs:      http://safari.informit.com/9780321563835
>+//            http://www.opengles-book.com
>+
>+#include "SampleApplication.h"
>+
>+#include "util/shader_utils.h"
>+
>+class HelloTriangleSample : public SampleApplication
>+{
>+  public:
>+    HelloTriangleSample(int argc, char **argv)
>+        : SampleApplication("HelloTriangle", argc, argv, 2, 0)
>+    {}
>+
>+    bool initialize() override
>+    {
>+        constexpr char kVS[] = R"(attribute vec4 vPosition;
>+void main()
>+{
>+    gl_Position = vPosition;
>+})";
>+
>+        constexpr char kFS[] = R"(precision mediump float;
>+void main()
>+{
>+    gl_FragColor = vec4(1.0, 0.0, 0.0, 1.0);
>+})";
>+
>+        mProgram = CompileProgram(kVS, kFS);
>+        if (!mProgram)
>+        {
>+            return false;
>+        }
>+
>+        glClearColor(0.0f, 0.0f, 0.0f, 0.0f);
>+
>+        return true;
>+    }
>+
>+    void destroy() override { glDeleteProgram(mProgram); }
>+
>+    void draw() override
>+    {
>+        GLfloat vertices[] = {
>+            0.0f, 0.5f, 0.0f, -0.5f, -0.5f, 0.0f, 0.5f, -0.5f, 0.0f,
>+        };
>+
>+        // Set the viewport
>+        glViewport(0, 0, getWindow()->getWidth(), getWindow()->getHeight());
>+
>+        // Clear the color buffer
>+        glClear(GL_COLOR_BUFFER_BIT);
>+
>+        // Use the program object
>+        glUseProgram(mProgram);
>+
>+        // Load the vertex data
>+        glVertexAttribPointer(0, 3, GL_FLOAT, GL_FALSE, 0, vertices);
>+        glEnableVertexAttribArray(0);
>+
>+        glDrawArrays(GL_TRIANGLES, 0, 3);
>+    }
>+
>+  private:
>+    GLuint mProgram;
>+};
>+
>+int main(int argc, char **argv)
>+{
>+    HelloTriangleSample app(argc, argv);
>+    return app.run();
>+}
>diff --git a/Source/ThirdParty/ANGLE/samples/mip_map_2d/MipMap2D.cpp b/Source/ThirdParty/ANGLE/samples/mip_map_2d/MipMap2D.cpp
>new file mode 100644
>index 00000000000..f541dd79e99
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/samples/mip_map_2d/MipMap2D.cpp
>@@ -0,0 +1,161 @@
>+//
>+// Copyright (c) 2014 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+
>+//            Based on MipMap2D.c from
>+// Book:      OpenGL(R) ES 2.0 Programming Guide
>+// Authors:   Aaftab Munshi, Dan Ginsburg, Dave Shreiner
>+// ISBN-10:   0321502795
>+// ISBN-13:   9780321502797
>+// Publisher: Addison-Wesley Professional
>+// URLs:      http://safari.informit.com/9780321563835
>+//            http://www.opengles-book.com
>+
>+#include "SampleApplication.h"
>+
>+#include "texture_utils.h"
>+#include "util/shader_utils.h"
>+
>+class MipMap2DSample : public SampleApplication
>+{
>+  public:
>+    MipMap2DSample(int argc, char **argv) : SampleApplication("MipMap2D", argc, argv) {}
>+
>+    bool initialize() override
>+    {
>+        constexpr char kVS[] = R"(uniform float u_offset;
>+attribute vec4 a_position;
>+attribute vec2 a_texCoord;
>+varying vec2 v_texCoord;
>+void main()
>+{
>+    gl_Position = a_position;
>+    gl_Position.x += u_offset;
>+    v_texCoord = a_texCoord;
>+})";
>+
>+        constexpr char kFS[] = R"(precision mediump float;
>+varying vec2 v_texCoord;
>+uniform sampler2D s_texture;
>+void main()
>+{
>+    gl_FragColor = texture2D(s_texture, v_texCoord);
>+})";
>+
>+        mProgram = CompileProgram(kVS, kFS);
>+        if (!mProgram)
>+        {
>+            return false;
>+        }
>+
>+        // Get the attribute locations
>+        mPositionLoc = glGetAttribLocation(mProgram, "a_position");
>+        mTexCoordLoc = glGetAttribLocation(mProgram, "a_texCoord");
>+
>+        // Get the sampler location
>+        mSamplerLoc = glGetUniformLocation(mProgram, "s_texture");
>+
>+        // Get the offset location
>+        mOffsetLoc = glGetUniformLocation(mProgram, "u_offset");
>+
>+        // Load the texture
>+        mTextureID = CreateMipMappedTexture2D();
>+
>+        // Check Anisotropy limits
>+        glGetFloatv(GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT, &mMaxAnisotropy);
>+
>+        glClearColor(0.0f, 0.0f, 0.0f, 0.0f);
>+
>+        return true;
>+    }
>+
>+    void destroy() override
>+    {
>+        glDeleteProgram(mProgram);
>+        glDeleteTextures(1, &mTextureID);
>+    }
>+
>+    void draw() override
>+    {
>+        const GLfloat vertices[] = {
>+            -0.25f, 0.5f,  0.0f, 5.0f,  // Position 0
>+            0.0f,   0.0f,               // TexCoord 0
>+            -0.25f, -0.5f, 0.0f, 1.0f,  // Position 1
>+            0.0f,   1.0f,               // TexCoord 1
>+            0.25f,  -0.5f, 0.0f, 1.0f,  // Position 2
>+            1.0f,   1.0f,               // TexCoord 2
>+            0.25f,  0.5f,  0.0f, 5.0f,  // Position 3
>+            1.0f,   0.0f                // TexCoord 3
>+        };
>+        const GLushort indices[] = {0, 1, 2, 0, 2, 3};
>+
>+        // Set the viewport
>+        glViewport(0, 0, getWindow()->getWidth(), getWindow()->getHeight());
>+
>+        // Clear the color buffer
>+        glClear(GL_COLOR_BUFFER_BIT);
>+
>+        // Use the program object
>+        glUseProgram(mProgram);
>+
>+        // Load the vertex position
>+        glVertexAttribPointer(mPositionLoc, 4, GL_FLOAT, GL_FALSE, 6 * sizeof(GLfloat), vertices);
>+        // Load the texture coordinate
>+        glVertexAttribPointer(mTexCoordLoc, 2, GL_FLOAT, GL_FALSE, 6 * sizeof(GLfloat),
>+                              vertices + 4);
>+
>+        glEnableVertexAttribArray(mPositionLoc);
>+        glEnableVertexAttribArray(mTexCoordLoc);
>+
>+        // Bind the texture
>+        glActiveTexture(GL_TEXTURE0);
>+        glBindTexture(GL_TEXTURE_2D, mTextureID);
>+
>+        // Set the sampler texture unit to 0
>+        glUniform1i(mSamplerLoc, 0);
>+
>+        // Draw quad with nearest sampling
>+        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
>+        glUniform1f(mOffsetLoc, -0.6f);
>+        glDrawElements(GL_TRIANGLES, 6, GL_UNSIGNED_SHORT, indices);
>+
>+        // Draw quad with trilinear filtering
>+        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR);
>+        glUniform1f(mOffsetLoc, 0.0f);
>+        glDrawElements(GL_TRIANGLES, 6, GL_UNSIGNED_SHORT, indices);
>+
>+        // Draw quad with anisotropic filtering
>+        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR);
>+        glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAX_ANISOTROPY_EXT, mMaxAnisotropy);
>+        glUniform1f(mOffsetLoc, 0.6f);
>+        glDrawElements(GL_TRIANGLES, 6, GL_UNSIGNED_SHORT, indices);
>+        glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAX_ANISOTROPY_EXT, 1.0f);
>+    }
>+
>+  private:
>+    // Handle to a program object
>+    GLuint mProgram;
>+
>+    // Attribute locations
>+    GLint mPositionLoc;
>+    GLint mTexCoordLoc;
>+
>+    // Sampler location
>+    GLint mSamplerLoc;
>+
>+    // Offset location
>+    GLint mOffsetLoc;
>+
>+    // Texture handle
>+    GLuint mTextureID;
>+
>+    float mMaxAnisotropy;
>+};
>+
>+int main(int argc, char **argv)
>+{
>+    MipMap2DSample app(argc, argv);
>+    return app.run();
>+}
>diff --git a/Source/ThirdParty/ANGLE/samples/multi_texture/MultiTexture.cpp b/Source/ThirdParty/ANGLE/samples/multi_texture/MultiTexture.cpp
>new file mode 100644
>index 00000000000..ffadfaed4f7
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/samples/multi_texture/MultiTexture.cpp
>@@ -0,0 +1,171 @@
>+//
>+// Copyright (c) 2014 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+
>+//            Based on MultiTexture.c from
>+// Book:      OpenGL(R) ES 2.0 Programming Guide
>+// Authors:   Aaftab Munshi, Dan Ginsburg, Dave Shreiner
>+// ISBN-10:   0321502795
>+// ISBN-13:   9780321502797
>+// Publisher: Addison-Wesley Professional
>+// URLs:      http://safari.informit.com/9780321563835
>+//            http://www.opengles-book.com
>+
>+#include "SampleApplication.h"
>+
>+#include "tga_utils.h"
>+#include "util/shader_utils.h"
>+#include "util/system_utils.h"
>+
>+class MultiTextureSample : public SampleApplication
>+{
>+  public:
>+    MultiTextureSample(int argc, char **argv) : SampleApplication("MultiTexture", argc, argv) {}
>+
>+    GLuint loadTexture(const std::string &path)
>+    {
>+        TGAImage img;
>+        if (!LoadTGAImageFromFile(path, &img))
>+        {
>+            return 0;
>+        }
>+
>+        return LoadTextureFromTGAImage(img);
>+    }
>+
>+    bool initialize() override
>+    {
>+        constexpr char kVS[] = R"(attribute vec4 a_position;
>+attribute vec2 a_texCoord;
>+varying vec2 v_texCoord;
>+void main()
>+{
>+    gl_Position = a_position;
>+    v_texCoord = a_texCoord;
>+})";
>+
>+        constexpr char kFS[] = R"(precision mediump float;
>+varying vec2 v_texCoord;
>+uniform sampler2D s_baseMap;
>+uniform sampler2D s_lightMap;
>+void main()
>+{
>+    vec4 baseColor;
>+    vec4 lightColor;
>+
>+    baseColor = texture2D(s_baseMap, v_texCoord);
>+    lightColor = texture2D(s_lightMap, v_texCoord);
>+    gl_FragColor = baseColor * (lightColor + 0.25);
>+})";
>+
>+        mProgram = CompileProgram(kVS, kFS);
>+        if (!mProgram)
>+        {
>+            return false;
>+        }
>+
>+        // Get the attribute locations
>+        mPositionLoc = glGetAttribLocation(mProgram, "a_position");
>+        mTexCoordLoc = glGetAttribLocation(mProgram, "a_texCoord");
>+
>+        // Get the sampler location
>+        mBaseMapLoc  = glGetUniformLocation(mProgram, "s_baseMap");
>+        mLightMapLoc = glGetUniformLocation(mProgram, "s_lightMap");
>+
>+        // Load the textures
>+        std::stringstream baseStr;
>+        baseStr << angle::GetExecutableDirectory() << "/basemap.tga";
>+
>+        std::stringstream lightStr;
>+        lightStr << angle::GetExecutableDirectory() << "/lightmap.tga";
>+
>+        mBaseMapTexID  = loadTexture(baseStr.str());
>+        mLightMapTexID = loadTexture(lightStr.str());
>+        if (mBaseMapTexID == 0 || mLightMapTexID == 0)
>+        {
>+            return false;
>+        }
>+
>+        return true;
>+    }
>+
>+    void destroy() override
>+    {
>+        glDeleteProgram(mProgram);
>+        glDeleteTextures(1, &mBaseMapTexID);
>+        glDeleteTextures(1, &mLightMapTexID);
>+    }
>+
>+    void draw() override
>+    {
>+        GLfloat vertices[] = {
>+            -0.5f, 0.5f,  0.0f,  // Position 0
>+            0.0f,  0.0f,         // TexCoord 0
>+            -0.5f, -0.5f, 0.0f,  // Position 1
>+            0.0f,  1.0f,         // TexCoord 1
>+            0.5f,  -0.5f, 0.0f,  // Position 2
>+            1.0f,  1.0f,         // TexCoord 2
>+            0.5f,  0.5f,  0.0f,  // Position 3
>+            1.0f,  0.0f          // TexCoord 3
>+        };
>+        GLushort indices[] = {0, 1, 2, 0, 2, 3};
>+
>+        // Set the viewport
>+        glViewport(0, 0, getWindow()->getWidth(), getWindow()->getHeight());
>+
>+        // Clear the color buffer
>+        glClear(GL_COLOR_BUFFER_BIT);
>+
>+        // Use the program object
>+        glUseProgram(mProgram);
>+
>+        // Load the vertex position
>+        glVertexAttribPointer(mPositionLoc, 3, GL_FLOAT, GL_FALSE, 5 * sizeof(GLfloat), vertices);
>+        // Load the texture coordinate
>+        glVertexAttribPointer(mTexCoordLoc, 2, GL_FLOAT, GL_FALSE, 5 * sizeof(GLfloat),
>+                              vertices + 3);
>+
>+        glEnableVertexAttribArray(mPositionLoc);
>+        glEnableVertexAttribArray(mTexCoordLoc);
>+
>+        // Bind the base map
>+        glActiveTexture(GL_TEXTURE0);
>+        glBindTexture(GL_TEXTURE_2D, mBaseMapTexID);
>+
>+        // Set the base map sampler to texture unit to 0
>+        glUniform1i(mBaseMapLoc, 0);
>+
>+        // Bind the light map
>+        glActiveTexture(GL_TEXTURE1);
>+        glBindTexture(GL_TEXTURE_2D, mLightMapTexID);
>+
>+        // Set the light map sampler to texture unit 1
>+        glUniform1i(mLightMapLoc, 1);
>+
>+        glDrawElements(GL_TRIANGLES, 6, GL_UNSIGNED_SHORT, indices);
>+    }
>+
>+  private:
>+    // Handle to a program object
>+    GLuint mProgram;
>+
>+    // Attribute locations
>+    GLint mPositionLoc;
>+    GLint mTexCoordLoc;
>+
>+    // Sampler locations
>+    GLint mBaseMapLoc;
>+    GLint mLightMapLoc;
>+
>+    // Texture handle
>+    GLuint mBaseMapTexID;
>+    GLuint mLightMapTexID;
>+};
>+
>+int main(int argc, char **argv)
>+{
>+    MultiTextureSample app(argc, argv);
>+    return app.run();
>+}
>diff --git a/Source/ThirdParty/ANGLE/samples/multi_texture/basemap.tga b/Source/ThirdParty/ANGLE/samples/multi_texture/basemap.tga
>new file mode 100644
>index 00000000000..8acafae236c
>Binary files /dev/null and b/Source/ThirdParty/ANGLE/samples/multi_texture/basemap.tga differ
>diff --git a/Source/ThirdParty/ANGLE/samples/multi_texture/lightmap.tga b/Source/ThirdParty/ANGLE/samples/multi_texture/lightmap.tga
>new file mode 100644
>index 00000000000..d95b262837d
>Binary files /dev/null and b/Source/ThirdParty/ANGLE/samples/multi_texture/lightmap.tga differ
>diff --git a/Source/ThirdParty/ANGLE/samples/multi_window/MultiWindow.cpp b/Source/ThirdParty/ANGLE/samples/multi_window/MultiWindow.cpp
>new file mode 100644
>index 00000000000..d71751d83ed
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/samples/multi_window/MultiWindow.cpp
>@@ -0,0 +1,199 @@
>+//
>+// Copyright (c) 2015 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+
>+#include "SampleApplication.h"
>+
>+#include <algorithm>
>+#include <cmath>
>+#include <vector>
>+
>+#include "util/Matrix.h"
>+#include "util/random_utils.h"
>+#include "util/shader_utils.h"
>+
>+using namespace angle;
>+
>+class MultiWindowSample : public SampleApplication
>+{
>+  public:
>+    MultiWindowSample(int argc, char **argv)
>+        : SampleApplication("MultiWindow", argc, argv, 2, 0, 256, 256)
>+    {}
>+
>+    bool initialize() override
>+    {
>+        constexpr char kVS[] = R"(attribute vec4 vPosition;
>+void main()
>+{
>+    gl_Position = vPosition;
>+})";
>+
>+        constexpr char kFS[] = R"(precision mediump float;
>+void main()
>+{
>+    gl_FragColor = vec4(1.0, 0.0, 0.0, 1.0);
>+})";
>+
>+        mProgram = CompileProgram(kVS, kFS);
>+        if (!mProgram)
>+        {
>+            return false;
>+        }
>+
>+        // Set an initial rotation
>+        mRotation = 45.0f;
>+
>+        glClearColor(0.0f, 0.0f, 0.0f, 0.0f);
>+
>+        window rootWindow;
>+        rootWindow.osWindow = getWindow();
>+        rootWindow.surface  = getSurface();
>+        mWindows.push_back(rootWindow);
>+
>+        const size_t numWindows = 5;
>+        for (size_t i = 1; i < numWindows; i++)
>+        {
>+            window window;
>+
>+            window.osWindow = OSWindow::New();
>+            if (!window.osWindow->initialize("MultiWindow", 256, 256))
>+            {
>+                return false;
>+            }
>+
>+            window.surface = eglCreateWindowSurface(getDisplay(), getConfig(),
>+                                                    window.osWindow->getNativeWindow(), nullptr);
>+            if (window.surface == EGL_NO_SURFACE)
>+            {
>+                return false;
>+            }
>+
>+            window.osWindow->setVisible(true);
>+
>+            mWindows.push_back(window);
>+        }
>+
>+        int baseX = rootWindow.osWindow->getX();
>+        int baseY = rootWindow.osWindow->getY();
>+        for (auto &window : mWindows)
>+        {
>+            int x      = baseX + mRNG.randomIntBetween(0, 512);
>+            int y      = baseY + mRNG.randomIntBetween(0, 512);
>+            int width  = mRNG.randomIntBetween(128, 512);
>+            int height = mRNG.randomIntBetween(128, 512);
>+            window.osWindow->setPosition(x, y);
>+            window.osWindow->resize(width, height);
>+        }
>+
>+        return true;
>+    }
>+
>+    void destroy() override { glDeleteProgram(mProgram); }
>+
>+    void step(float dt, double totalTime) override
>+    {
>+        mRotation = fmod(mRotation + (dt * 40.0f), 360.0f);
>+
>+        for (auto &window : mWindows)
>+        {
>+            window.osWindow->messageLoop();
>+        }
>+    }
>+
>+    void draw() override
>+    {
>+        OSWindow *rootWindow = mWindows[0].osWindow;
>+        int left             = rootWindow->getX();
>+        int right            = rootWindow->getX() + rootWindow->getWidth();
>+        int top              = rootWindow->getY();
>+        int bottom           = rootWindow->getY() + rootWindow->getHeight();
>+
>+        for (auto &windowRecord : mWindows)
>+        {
>+            OSWindow *window = windowRecord.osWindow;
>+            left             = std::min(left, window->getX());
>+            right            = std::max(right, window->getX() + window->getWidth());
>+            top              = std::min(top, window->getY());
>+            bottom           = std::max(bottom, window->getY() + window->getHeight());
>+        }
>+
>+        float midX = (left + right) * 0.5f;
>+        float midY = (top + bottom) * 0.5f;
>+
>+        Matrix4 modelMatrix = Matrix4::translate(Vector3(midX, midY, 0.0f)) *
>+                              Matrix4::rotate(mRotation, Vector3(0.0f, 0.0f, 1.0f)) *
>+                              Matrix4::translate(Vector3(-midX, -midY, 0.0f));
>+        Matrix4 viewMatrix = Matrix4::identity();
>+
>+        for (auto &windowRecord : mWindows)
>+        {
>+            OSWindow *window   = windowRecord.osWindow;
>+            EGLSurface surface = windowRecord.surface;
>+
>+            eglMakeCurrent(getDisplay(), surface, surface, getContext());
>+
>+            Matrix4 orthoMatrix =
>+                Matrix4::ortho(static_cast<float>(window->getX()),
>+                               static_cast<float>(window->getX() + window->getWidth()),
>+                               static_cast<float>(window->getY() + window->getHeight()),
>+                               static_cast<float>(window->getY()), 0.0f, 1.0f);
>+            Matrix4 mvpMatrix = orthoMatrix * viewMatrix * modelMatrix;
>+
>+            Vector3 vertices[] = {
>+                Matrix4::transform(mvpMatrix, Vector4(midX, static_cast<float>(top), 0.0f, 1.0f)),
>+                Matrix4::transform(mvpMatrix, Vector4(static_cast<float>(left),
>+                                                      static_cast<float>(bottom), 0.0f, 1.0f)),
>+                Matrix4::transform(mvpMatrix, Vector4(static_cast<float>(right),
>+                                                      static_cast<float>(bottom), 0.0f, 1.0f)),
>+            };
>+
>+            // Set the viewport
>+            glViewport(0, 0, window->getWidth(), window->getHeight());
>+
>+            // Clear the color buffer
>+            glClear(GL_COLOR_BUFFER_BIT);
>+
>+            // Use the program object
>+            glUseProgram(mProgram);
>+
>+            // Load the vertex data
>+            glVertexAttribPointer(0, 3, GL_FLOAT, GL_FALSE, 0, vertices[0].data());
>+            glEnableVertexAttribArray(0);
>+
>+            glDrawArrays(GL_TRIANGLES, 0, 3);
>+
>+            eglSwapBuffers(getDisplay(), surface);
>+        }
>+    }
>+
>+    // Override swap to do nothing as we already swapped the root
>+    // window in draw() and swapping another time would invalidate
>+    // the content of the default framebuffer.
>+    void swap() override {}
>+
>+  private:
>+    // Handle to a program object
>+    GLuint mProgram;
>+
>+    // Current rotation
>+    float mRotation;
>+
>+    // Window and surface data
>+    struct window
>+    {
>+        OSWindow *osWindow;
>+        EGLSurface surface;
>+    };
>+    std::vector<window> mWindows;
>+
>+    RNG mRNG;
>+};
>+
>+int main(int argc, char **argv)
>+{
>+    MultiWindowSample app(argc, argv);
>+    return app.run();
>+}
>diff --git a/Source/ThirdParty/ANGLE/samples/multiple_draw_buffers/MultipleDrawBuffers.cpp b/Source/ThirdParty/ANGLE/samples/multiple_draw_buffers/MultipleDrawBuffers.cpp
>new file mode 100644
>index 00000000000..84571b2e520
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/samples/multiple_draw_buffers/MultipleDrawBuffers.cpp
>@@ -0,0 +1,222 @@
>+//
>+// Copyright (c) 2014 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+
>+//            Based on Simple_Texture2D.c from
>+// Book:      OpenGL(R) ES 2.0 Programming Guide
>+// Authors:   Aaftab Munshi, Dan Ginsburg, Dave Shreiner
>+// ISBN-10:   0321502795
>+// ISBN-13:   9780321502797
>+// Publisher: Addison-Wesley Professional
>+// URLs:      http://safari.informit.com/9780321563835
>+//            http://www.opengles-book.com
>+
>+#include "SampleApplication.h"
>+
>+#include "texture_utils.h"
>+#include "util/shader_utils.h"
>+#include "util/system_utils.h"
>+
>+#include <cstring>
>+#include <iostream>
>+
>+class MultipleDrawBuffersSample : public SampleApplication
>+{
>+  public:
>+    MultipleDrawBuffersSample(int argc, char **argv)
>+        : SampleApplication("MultipleDrawBuffers", argc, argv)
>+    {}
>+
>+    virtual bool initialize()
>+    {
>+        // Check EXT_draw_buffers is supported
>+        char *extensionString = (char *)glGetString(GL_EXTENSIONS);
>+        if (strstr(extensionString, "GL_EXT_draw_buffers") != nullptr)
>+        {
>+            // Retrieve the address of glDrawBuffersEXT from EGL
>+            mDrawBuffers = (PFNGLDRAWBUFFERSEXTPROC)eglGetProcAddress("glDrawBuffersEXT");
>+        }
>+        else
>+        {
>+            mDrawBuffers = glDrawBuffers;
>+        }
>+
>+        if (!mDrawBuffers)
>+        {
>+            std::cerr << "Unable to load glDrawBuffers[EXT] entry point.";
>+            return false;
>+        }
>+
>+        std::stringstream vsStream;
>+        vsStream << angle::GetExecutableDirectory() << "/multiple_draw_buffers_vs.glsl";
>+
>+        std::stringstream fsStream;
>+        fsStream << angle::GetExecutableDirectory() << "/multiple_draw_buffers_fs.glsl";
>+
>+        std::stringstream copyFsStream;
>+        fsStream << angle::GetExecutableDirectory() << "/multiple_draw_buffers_copy_fs.glsl";
>+
>+        mMRTProgram = CompileProgramFromFiles(vsStream.str(), fsStream.str());
>+        if (!mMRTProgram)
>+        {
>+            return false;
>+        }
>+
>+        mCopyProgram = CompileProgramFromFiles(vsStream.str(), copyFsStream.str());
>+        if (!mCopyProgram)
>+        {
>+            return false;
>+        }
>+
>+        // Get the attribute locations
>+        mPositionLoc = glGetAttribLocation(mCopyProgram, "a_position");
>+        mTexCoordLoc = glGetAttribLocation(mCopyProgram, "a_texCoord");
>+
>+        // Get the sampler location
>+        mSamplerLoc = glGetUniformLocation(mCopyProgram, "s_texture");
>+
>+        // Load the texture
>+        mTexture = CreateSimpleTexture2D();
>+
>+        // Initialize the user framebuffer
>+        glGenFramebuffers(1, &mFramebuffer);
>+        glGenTextures(mFramebufferAttachmentCount, mFramebufferTextures);
>+
>+        glBindFramebuffer(GL_FRAMEBUFFER, mFramebuffer);
>+        for (size_t i = 0; i < mFramebufferAttachmentCount; i++)
>+        {
>+            // Create textures for the four color attachments
>+            glBindTexture(GL_TEXTURE_2D, mFramebufferTextures[i]);
>+            glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, getWindow()->getWidth(),
>+                         getWindow()->getHeight(), 0, GL_RGBA, GL_UNSIGNED_BYTE, nullptr);
>+            glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
>+            glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
>+            glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
>+            glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
>+            glFramebufferTexture2D(GL_FRAMEBUFFER,
>+                                   static_cast<GLenum>(GL_COLOR_ATTACHMENT0_EXT + i), GL_TEXTURE_2D,
>+                                   mFramebufferTextures[i], 0);
>+        }
>+
>+        glBindTexture(GL_TEXTURE_2D, 0);
>+
>+        glClearColor(0.0f, 0.0f, 0.0f, 0.0f);
>+
>+        return true;
>+    }
>+
>+    virtual void destroy()
>+    {
>+        glDeleteProgram(mCopyProgram);
>+        glDeleteProgram(mMRTProgram);
>+        glDeleteTextures(1, &mTexture);
>+        glDeleteTextures(mFramebufferAttachmentCount, mFramebufferTextures);
>+        glDeleteFramebuffers(1, &mFramebuffer);
>+    }
>+
>+    virtual void draw()
>+    {
>+        GLfloat vertices[] = {
>+            -0.8f, 0.8f,  0.0f,  // Position 0
>+            0.0f,  0.0f,         // TexCoord 0
>+            -0.8f, -0.8f, 0.0f,  // Position 1
>+            0.0f,  1.0f,         // TexCoord 1
>+            0.8f,  -0.8f, 0.0f,  // Position 2
>+            1.0f,  1.0f,         // TexCoord 2
>+            0.8f,  0.8f,  0.0f,  // Position 3
>+            1.0f,  0.0f          // TexCoord 3
>+        };
>+        GLushort indices[]                              = {0, 1, 2, 0, 2, 3};
>+        GLenum drawBuffers[mFramebufferAttachmentCount] = {
>+            GL_COLOR_ATTACHMENT0_EXT, GL_COLOR_ATTACHMENT1_EXT, GL_COLOR_ATTACHMENT2_EXT,
>+            GL_COLOR_ATTACHMENT3_EXT};
>+
>+        // Enable drawing to the four color attachments of the user framebuffer
>+        glBindFramebuffer(GL_FRAMEBUFFER, mFramebuffer);
>+        mDrawBuffers(mFramebufferAttachmentCount, drawBuffers);
>+
>+        // Set the viewport
>+        GLint width  = static_cast<GLint>(getWindow()->getWidth());
>+        GLint height = static_cast<GLint>(getWindow()->getHeight());
>+        glViewport(0, 0, width, height);
>+
>+        // Clear the color buffer
>+        glClear(GL_COLOR_BUFFER_BIT);
>+
>+        // Use the program object
>+        glUseProgram(mMRTProgram);
>+
>+        // Load the vertex position
>+        glVertexAttribPointer(mPositionLoc, 3, GL_FLOAT, GL_FALSE, 5 * sizeof(GLfloat), vertices);
>+        glEnableVertexAttribArray(mPositionLoc);
>+
>+        // Load the texture coordinate
>+        glVertexAttribPointer(mTexCoordLoc, 2, GL_FLOAT, GL_FALSE, 5 * sizeof(GLfloat),
>+                              vertices + 3);
>+        glEnableVertexAttribArray(mTexCoordLoc);
>+
>+        // Bind the texture
>+        glActiveTexture(GL_TEXTURE0);
>+        glBindTexture(GL_TEXTURE_2D, mTexture);
>+
>+        // Set the sampler texture unit to 0
>+        glUniform1i(mSamplerLoc, 0);
>+
>+        // Draw the textured quad to the four render targets
>+        glDrawElements(GL_TRIANGLES, 6, GL_UNSIGNED_SHORT, indices);
>+
>+        // Enable the default framebuffer and single textured drawing
>+        glBindFramebuffer(GL_FRAMEBUFFER, 0);
>+        glUseProgram(mCopyProgram);
>+
>+        // Draw the four textured quads to a separate region in the viewport
>+        glBindTexture(GL_TEXTURE_2D, mFramebufferTextures[0]);
>+        glViewport(0, 0, width / 2, height / 2);
>+        glDrawElements(GL_TRIANGLES, 6, GL_UNSIGNED_SHORT, indices);
>+
>+        glBindTexture(GL_TEXTURE_2D, mFramebufferTextures[1]);
>+        glViewport(width / 2, 0, width / 2, height / 2);
>+        glDrawElements(GL_TRIANGLES, 6, GL_UNSIGNED_SHORT, indices);
>+
>+        glBindTexture(GL_TEXTURE_2D, mFramebufferTextures[2]);
>+        glViewport(0, height / 2, width / 2, height / 2);
>+        glDrawElements(GL_TRIANGLES, 6, GL_UNSIGNED_SHORT, indices);
>+
>+        glBindTexture(GL_TEXTURE_2D, mFramebufferTextures[3]);
>+        glViewport(width / 2, height / 2, width / 2, height / 2);
>+        glDrawElements(GL_TRIANGLES, 6, GL_UNSIGNED_SHORT, indices);
>+    }
>+
>+  private:
>+    // Handle to a program object
>+    GLuint mMRTProgram;
>+    GLuint mCopyProgram;
>+
>+    // Attribute locations
>+    GLint mPositionLoc;
>+    GLint mTexCoordLoc;
>+
>+    // Sampler location
>+    GLint mSamplerLoc;
>+
>+    // Texture handle
>+    GLuint mTexture;
>+
>+    // Framebuffer object handle
>+    GLuint mFramebuffer;
>+
>+    // Framebuffer color attachments
>+    static const size_t mFramebufferAttachmentCount = 4;
>+    GLuint mFramebufferTextures[mFramebufferAttachmentCount];
>+
>+    // Loaded draw buffer entry points
>+    PFNGLDRAWBUFFERSEXTPROC mDrawBuffers;
>+};
>+
>+int main(int argc, char **argv)
>+{
>+    MultipleDrawBuffersSample app(argc, argv);
>+    return app.run();
>+}
>diff --git a/Source/ThirdParty/ANGLE/samples/multiple_draw_buffers/multiple_draw_buffers_copy_fs.glsl b/Source/ThirdParty/ANGLE/samples/multiple_draw_buffers/multiple_draw_buffers_copy_fs.glsl
>new file mode 100644
>index 00000000000..59deb61ce04
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/samples/multiple_draw_buffers/multiple_draw_buffers_copy_fs.glsl
>@@ -0,0 +1,8 @@
>+precision mediump float;
>+varying vec2 v_texCoord;
>+uniform sampler2D s_texture;
>+void main()
>+{
>+    vec4 color = texture2D(s_texture, v_texCoord);
>+    gl_FragColor = color;
>+}
>diff --git a/Source/ThirdParty/ANGLE/samples/multiple_draw_buffers/multiple_draw_buffers_fs.glsl b/Source/ThirdParty/ANGLE/samples/multiple_draw_buffers/multiple_draw_buffers_fs.glsl
>new file mode 100644
>index 00000000000..d0143d5dc63
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/samples/multiple_draw_buffers/multiple_draw_buffers_fs.glsl
>@@ -0,0 +1,12 @@
>+#extension GL_EXT_draw_buffers : enable
>+precision mediump float;
>+varying vec2 v_texCoord;
>+uniform sampler2D s_texture;
>+void main()
>+{
>+    vec4 color = texture2D(s_texture, v_texCoord);
>+    gl_FragData[0] = color;
>+    gl_FragData[1] = vec4(1.0, 1.0, 1.0, 1.0) - color.brga;
>+    gl_FragData[2] = vec4(0.2, 1.0, 0.5, 1.0) * color.gbra;
>+    gl_FragData[3] = color.rrra;
>+}
>diff --git a/Source/ThirdParty/ANGLE/samples/multiple_draw_buffers/multiple_draw_buffers_vs.glsl b/Source/ThirdParty/ANGLE/samples/multiple_draw_buffers/multiple_draw_buffers_vs.glsl
>new file mode 100644
>index 00000000000..0978752573f
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/samples/multiple_draw_buffers/multiple_draw_buffers_vs.glsl
>@@ -0,0 +1,8 @@
>+attribute vec4 a_position;
>+attribute vec2 a_texCoord;
>+varying vec2 v_texCoord;
>+void main()
>+{
>+    gl_Position = a_position;
>+    v_texCoord = a_texCoord;
>+}
>diff --git a/Source/ThirdParty/ANGLE/samples/multiview/Multiview.cpp b/Source/ThirdParty/ANGLE/samples/multiview/Multiview.cpp
>new file mode 100644
>index 00000000000..fd5e30ecbd4
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/samples/multiview/Multiview.cpp
>@@ -0,0 +1,382 @@
>+//
>+// Copyright (c) 2017 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// This sample shows basic usage of the GL_OVR_multiview2 extension.
>+
>+#include "SampleApplication.h"
>+
>+#include "util/geometry_utils.h"
>+#include "util/shader_utils.h"
>+
>+#include <iostream>
>+
>+namespace
>+{
>+
>+void FillTranslationMatrix(float xOffset, float yOffset, float zOffset, float *matrix)
>+{
>+    matrix[0] = 1.0f;
>+    matrix[1] = 0.0f;
>+    matrix[2] = 0.0f;
>+    matrix[3] = xOffset;
>+
>+    matrix[4] = 0.0f;
>+    matrix[5] = 1.0f;
>+    matrix[6] = 0.0f;
>+    matrix[7] = yOffset;
>+
>+    matrix[8]  = 0.0f;
>+    matrix[9]  = 0.0f;
>+    matrix[10] = 1.0f;
>+    matrix[11] = zOffset;
>+
>+    matrix[12] = 0.0f;
>+    matrix[13] = 0.0f;
>+    matrix[14] = 0.0f;
>+    matrix[15] = 1.0f;
>+}
>+
>+}  // namespace
>+
>+class MultiviewSample : public SampleApplication
>+{
>+  public:
>+    MultiviewSample(int argc, char **argv)
>+        : SampleApplication("Multiview", argc, argv, 3, 0),
>+          mMultiviewProgram(0),
>+          mMultiviewPersperiveUniformLoc(-1),
>+          mMultiviewLeftEyeCameraUniformLoc(-1),
>+          mMultiviewRightEyeCameraUniformLoc(-1),
>+          mMultiviewTranslationUniformLoc(-1),
>+          mMultiviewFBO(0),
>+          mColorTexture(0),
>+          mDepthTexture(0),
>+          mQuadVAO(0),
>+          mQuadVBO(0),
>+          mCubeVAO(0),
>+          mCubePosVBO(0),
>+          mCubeNormalVBO(0),
>+          mCubeIBO(0),
>+          mCombineProgram(0)
>+    {}
>+
>+    bool initialize() override
>+    {
>+        // Check whether the GL_OVR_multiview2 extension is supported. If not, abort
>+        // initialization.
>+        const char *allExtensions = reinterpret_cast<const char *>(glGetString(GL_EXTENSIONS));
>+        const std::string paddedExtensions = std::string(" ") + allExtensions + std::string(" ");
>+        if (paddedExtensions.find(std::string(" GL_OVR_multiview2 ")) == std::string::npos)
>+        {
>+            std::cout << "GL_OVR_multiview2 is not available." << std::endl;
>+            return false;
>+        }
>+
>+        // A view covers horizontally half of the screen.
>+        int viewWidth  = getWindow()->getWidth() / 2;
>+        int viewHeight = getWindow()->getHeight();
>+
>+        // Create color and depth texture arrays with two layers to which we render each view.
>+        glGenTextures(1, &mColorTexture);
>+        glBindTexture(GL_TEXTURE_2D_ARRAY, mColorTexture);
>+        glTexImage3D(GL_TEXTURE_2D_ARRAY, 0, GL_RGBA8, viewWidth, viewHeight, 2, 0, GL_RGBA,
>+                     GL_UNSIGNED_BYTE, nullptr);
>+        glTexParameteri(GL_TEXTURE_2D_ARRAY, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
>+        glTexParameteri(GL_TEXTURE_2D_ARRAY, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
>+
>+        glGenTextures(1, &mDepthTexture);
>+        glBindTexture(GL_TEXTURE_2D_ARRAY, mDepthTexture);
>+        glTexImage3D(GL_TEXTURE_2D_ARRAY, 0, GL_DEPTH_COMPONENT32F, viewWidth, viewHeight, 2, 0,
>+                     GL_DEPTH_COMPONENT, GL_FLOAT, nullptr);
>+
>+        // Generate multiview framebuffer for layered rendering.
>+        glGenFramebuffers(1, &mMultiviewFBO);
>+        glBindFramebuffer(GL_FRAMEBUFFER, mMultiviewFBO);
>+        glFramebufferTextureMultiviewOVR(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, mColorTexture, 0, 0,
>+                                         2);
>+        glFramebufferTextureMultiviewOVR(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, mDepthTexture, 0, 0,
>+                                         2);
>+        GLenum drawBuffer = GL_COLOR_ATTACHMENT0;
>+        glDrawBuffers(1, &drawBuffer);
>+
>+        // Check that the framebuffer is complete. Abort initialization otherwise.
>+        if (glCheckFramebufferStatus(GL_FRAMEBUFFER) != GL_FRAMEBUFFER_COMPLETE)
>+        {
>+            return false;
>+        }
>+
>+        // Create multiview program and query the uniform locations.
>+        // The program has two code paths based on the gl_ViewID_OVR attribute which tells us which
>+        // view is currently being rendered to. Based on it we decide which eye's camera matrix to
>+        // use.
>+        constexpr char kMultiviewVS[] =
>+            "#version 300 es\n"
>+            "#extension GL_OVR_multiview2 : require\n"
>+            "layout(num_views = 2) in;\n"
>+            "layout(location=0) in vec3 posIn;\n"
>+            "layout(location=1) in vec3 normalIn;\n"
>+            "uniform mat4 uPerspective;\n"
>+            "uniform mat4 uCameraLeftEye;\n"
>+            "uniform mat4 uCameraRightEye;\n"
>+            "uniform mat4 uTranslation;\n"
>+            "out vec3 oNormal;\n"
>+            "void main()\n"
>+            "{\n"
>+            "   vec4 p = uTranslation * vec4(posIn,1.);\n"
>+            "   if (gl_ViewID_OVR == 0u) {\n"
>+            "       p = uCameraLeftEye * p;\n"
>+            "   } else {\n"
>+            "       p = uCameraRightEye * p;\n"
>+            "   }\n"
>+            "   oNormal = normalIn;\n"
>+            "   gl_Position = uPerspective * p;\n"
>+            "}\n";
>+
>+        constexpr char kMultiviewFS[] =
>+            "#version 300 es\n"
>+            "#extension GL_OVR_multiview2 : require\n"
>+            "precision mediump float;\n"
>+            "out vec4 color;\n"
>+            "in vec3 oNormal;\n"
>+            "void main()\n"
>+            "{\n"
>+            "   vec3 col = 0.5 * oNormal + vec3(0.5);\n"
>+            "   color = vec4(col, 1.);\n"
>+            "}\n";
>+
>+        mMultiviewProgram = CompileProgram(kMultiviewVS, kMultiviewFS);
>+        if (!mMultiviewProgram)
>+        {
>+            return false;
>+        }
>+        mMultiviewPersperiveUniformLoc = glGetUniformLocation(mMultiviewProgram, "uPerspective");
>+        mMultiviewLeftEyeCameraUniformLoc =
>+            glGetUniformLocation(mMultiviewProgram, "uCameraLeftEye");
>+        mMultiviewRightEyeCameraUniformLoc =
>+            glGetUniformLocation(mMultiviewProgram, "uCameraRightEye");
>+        mMultiviewTranslationUniformLoc = glGetUniformLocation(mMultiviewProgram, "uTranslation");
>+
>+        // Create a normal program to combine both layers of the color array texture.
>+        constexpr char kCombineVS[] =
>+            "#version 300 es\n"
>+            "in vec2 vIn;\n"
>+            "out vec2 uv;\n"
>+            "void main()\n"
>+            "{\n"
>+            "   gl_Position = vec4(vIn, 0., 1.);\n"
>+            "   uv = vIn * .5 + vec2(.5);\n"
>+            "}\n";
>+
>+        constexpr char kCombineFS[] =
>+            "#version 300 es\n"
>+            "precision mediump float;\n"
>+            "precision mediump sampler2DArray;\n"
>+            "uniform sampler2DArray uMultiviewTex;\n"
>+            "in vec2 uv;\n"
>+            "out vec4 color;\n"
>+            "void main()\n"
>+            "{\n"
>+            "   float scaledX = 2.0 * uv.x;\n"
>+            "   float layer = floor(scaledX);\n"
>+            "   vec2 adjustedUV = vec2(fract(scaledX), uv.y);\n"
>+            "   vec3 texColor = texture(uMultiviewTex, vec3(adjustedUV, layer)).rgb;\n"
>+            "   color = vec4(texColor, 1.);\n"
>+            "}\n";
>+
>+        mCombineProgram = CompileProgram(kCombineVS, kCombineFS);
>+        if (!mCombineProgram)
>+        {
>+            return false;
>+        }
>+
>+        // Generate a quad which covers the whole screen.
>+        glGenVertexArrays(1, &mQuadVAO);
>+        glBindVertexArray(mQuadVAO);
>+
>+        glGenBuffers(1, &mQuadVBO);
>+        glBindBuffer(GL_ARRAY_BUFFER, mQuadVBO);
>+        const float kQuadPositionData[] = {1.f, -1.f, 1.f, 1.f, -1.f, -1.f, -1.f, 1.f};
>+        glBufferData(GL_ARRAY_BUFFER, sizeof(float) * 8, kQuadPositionData, GL_STATIC_DRAW);
>+        glVertexAttribPointer(0, 2, GL_FLOAT, GL_FALSE, 0, nullptr);
>+        glEnableVertexAttribArray(0);
>+        glBindVertexArray(0);
>+
>+        // Generate a cube.
>+        GenerateCubeGeometry(1.0f, &mCube);
>+        glGenVertexArrays(1, &mCubeVAO);
>+        glBindVertexArray(mCubeVAO);
>+
>+        glGenBuffers(1, &mCubePosVBO);
>+        glBindBuffer(GL_ARRAY_BUFFER, mCubePosVBO);
>+        glBufferData(GL_ARRAY_BUFFER, sizeof(angle::Vector3) * mCube.positions.size(),
>+                     mCube.positions.data(), GL_STATIC_DRAW);
>+        glVertexAttribPointer(0, 3, GL_FLOAT, GL_FALSE, 0, nullptr);
>+        glEnableVertexAttribArray(0);
>+
>+        glGenBuffers(1, &mCubeNormalVBO);
>+        glBindBuffer(GL_ARRAY_BUFFER, mCubeNormalVBO);
>+        glBufferData(GL_ARRAY_BUFFER, sizeof(angle::Vector3) * mCube.normals.size(),
>+                     mCube.normals.data(), GL_STATIC_DRAW);
>+        glVertexAttribPointer(1, 3, GL_FLOAT, GL_FALSE, 0, nullptr);
>+        glEnableVertexAttribArray(1);
>+
>+        glGenBuffers(1, &mCubeIBO);
>+        glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, mCubeIBO);
>+        glBufferData(GL_ELEMENT_ARRAY_BUFFER, sizeof(GLushort) * mCube.indices.size(),
>+                     mCube.indices.data(), GL_STATIC_DRAW);
>+
>+        glBindVertexArray(0);
>+
>+        glEnable(GL_DEPTH_TEST);
>+        glClearColor(0.0f, 0.0f, 0.0f, 0.0f);
>+
>+        return true;
>+    }
>+
>+    void destroy() override
>+    {
>+        glDeleteProgram(mMultiviewProgram);
>+        glDeleteFramebuffers(1, &mMultiviewFBO);
>+        glDeleteTextures(1, &mColorTexture);
>+        glDeleteTextures(1, &mDepthTexture);
>+        glDeleteVertexArrays(1, &mQuadVAO);
>+        glDeleteBuffers(1, &mQuadVBO);
>+        glDeleteVertexArrays(1, &mCubeVAO);
>+        glDeleteBuffers(1, &mQuadVBO);
>+        glDeleteBuffers(1, &mCubePosVBO);
>+        glDeleteBuffers(1, &mCubeNormalVBO);
>+        glDeleteBuffers(1, &mCubeIBO);
>+        glDeleteProgram(mCombineProgram);
>+    }
>+
>+    void draw() override
>+    {
>+        // Draw to multiview fbo.
>+        {
>+            // Generate the perspective projection matrix.
>+            const int viewWidth          = getWindow()->getWidth() / 2;
>+            const int viewHeight         = getWindow()->getHeight();
>+            const float kFOV             = 90.f;
>+            const float kNear            = 1.0f;
>+            const float kFar             = 100.0f;
>+            const float kPlaneDifference = kFar - kNear;
>+            const float kXYScale         = 1.f / (tanf(kFOV / 2.0f));
>+            const float kAspectRatio     = static_cast<float>(viewWidth) / viewHeight;
>+            float kPerspectiveProjectionMatrix[16];
>+            kPerspectiveProjectionMatrix[0] = kXYScale / kAspectRatio;
>+            kPerspectiveProjectionMatrix[1] = .0f;
>+            kPerspectiveProjectionMatrix[2] = .0f;
>+            kPerspectiveProjectionMatrix[3] = .0f;
>+
>+            kPerspectiveProjectionMatrix[4] = .0f;
>+            kPerspectiveProjectionMatrix[5] = kXYScale;
>+            kPerspectiveProjectionMatrix[6] = .0f;
>+            kPerspectiveProjectionMatrix[7] = .0f;
>+
>+            kPerspectiveProjectionMatrix[8]  = .0f;
>+            kPerspectiveProjectionMatrix[9]  = .0;
>+            kPerspectiveProjectionMatrix[10] = -kFar / kPlaneDifference;
>+            kPerspectiveProjectionMatrix[11] = -1.f;
>+
>+            kPerspectiveProjectionMatrix[12] = .0f;
>+            kPerspectiveProjectionMatrix[13] = .0;
>+            kPerspectiveProjectionMatrix[14] = -kFar * kNear / kPlaneDifference;
>+            kPerspectiveProjectionMatrix[15] = .0;
>+
>+            // Generate the camera matrices for the left and right eye.
>+            const float kXOffset = 1.5f;
>+            const float kYOffset = 1.5f;
>+            const float kZOffset = 5.0f;
>+            float kLeftCameraMatrix[16];
>+            FillTranslationMatrix(kXOffset, -kYOffset, -kZOffset, kLeftCameraMatrix);
>+            float kRightCameraMatrix[16];
>+            FillTranslationMatrix(-kXOffset, -kYOffset, -kZOffset, kRightCameraMatrix);
>+
>+            // Bind and clear the multiview framebuffer.
>+            glBindFramebuffer(GL_FRAMEBUFFER, mMultiviewFBO);
>+            glClearColor(0, 0, 0, 1);
>+            glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
>+
>+            // Set the viewport to be the size as one of the views.
>+            glViewport(0, 0, viewWidth, viewHeight);
>+
>+            // Bind multiview program and set matrices.
>+            glUseProgram(mMultiviewProgram);
>+            glUniformMatrix4fv(mMultiviewPersperiveUniformLoc, 1, GL_TRUE,
>+                               kPerspectiveProjectionMatrix);
>+            glUniformMatrix4fv(mMultiviewLeftEyeCameraUniformLoc, 1, GL_TRUE, kLeftCameraMatrix);
>+            glUniformMatrix4fv(mMultiviewRightEyeCameraUniformLoc, 1, GL_TRUE, kRightCameraMatrix);
>+
>+            glBindVertexArray(mCubeVAO);
>+
>+            // Draw first cube.
>+            float kTranslationMatrix[16];
>+            FillTranslationMatrix(0.0f, 0.0f, 0.0f, kTranslationMatrix);
>+            glUniformMatrix4fv(mMultiviewTranslationUniformLoc, 1, GL_TRUE, kTranslationMatrix);
>+            glDrawElements(GL_TRIANGLES, static_cast<GLsizei>(mCube.indices.size()),
>+                           GL_UNSIGNED_SHORT, nullptr);
>+
>+            // Draw second cube.
>+            FillTranslationMatrix(1.0f, 1.0f, -2.0f, kTranslationMatrix);
>+            glUniformMatrix4fv(mMultiviewTranslationUniformLoc, 1, GL_TRUE, kTranslationMatrix);
>+            glDrawElements(GL_TRIANGLES, static_cast<GLsizei>(mCube.indices.size()),
>+                           GL_UNSIGNED_SHORT, nullptr);
>+
>+            glBindVertexArray(0);
>+        }
>+
>+        // Combine both views.
>+        {
>+            // Bind the default framebuffer object and clear.
>+            glBindFramebuffer(GL_FRAMEBUFFER, 0);
>+
>+            glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
>+
>+            // Set the viewport to cover the whole screen.
>+            glViewport(0, 0, getWindow()->getWidth(), getWindow()->getHeight());
>+
>+            glUseProgram(mCombineProgram);
>+
>+            // Bind the 2D array texture to be used as a sampler.
>+            glUniform1i(glGetUniformLocation(mCombineProgram, "uMultiviewTex"), 0);
>+            glBindTexture(GL_TEXTURE_2D_ARRAY, mMultiviewFBO);
>+            glActiveTexture(GL_TEXTURE0);
>+
>+            // Draw a quad which covers the whole screen. Layer and texture coordinates are
>+            // calculated in the vertex shader based on the UV coordinates of the quad.
>+            glBindVertexArray(mQuadVAO);
>+            glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
>+            glBindVertexArray(0);
>+        }
>+    }
>+
>+  private:
>+    GLuint mMultiviewProgram;
>+    GLint mMultiviewPersperiveUniformLoc;
>+    GLint mMultiviewLeftEyeCameraUniformLoc;
>+    GLint mMultiviewRightEyeCameraUniformLoc;
>+    GLint mMultiviewTranslationUniformLoc;
>+
>+    GLuint mMultiviewFBO;
>+    GLuint mColorTexture;
>+    GLuint mDepthTexture;
>+
>+    GLuint mQuadVAO;
>+    GLuint mQuadVBO;
>+
>+    CubeGeometry mCube;
>+    GLuint mCubeVAO;
>+    GLuint mCubePosVBO;
>+    GLuint mCubeNormalVBO;
>+    GLuint mCubeIBO;
>+
>+    GLuint mCombineProgram;
>+};
>+
>+int main(int argc, char **argv)
>+{
>+    MultiviewSample app(argc, argv);
>+    return app.run();
>+}
>diff --git a/Source/ThirdParty/ANGLE/samples/particle_system/ParticleSystem.cpp b/Source/ThirdParty/ANGLE/samples/particle_system/ParticleSystem.cpp
>new file mode 100644
>index 00000000000..934bc8d6917
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/samples/particle_system/ParticleSystem.cpp
>@@ -0,0 +1,227 @@
>+//
>+// Copyright (c) 2014 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+
>+//            Based on ParticleSystem.c from
>+// Book:      OpenGL(R) ES 2.0 Programming Guide
>+// Authors:   Aaftab Munshi, Dan Ginsburg, Dave Shreiner
>+// ISBN-10:   0321502795
>+// ISBN-13:   9780321502797
>+// Publisher: Addison-Wesley Professional
>+// URLs:      http://safari.informit.com/9780321563835
>+//            http://www.opengles-book.com
>+
>+#include "SampleApplication.h"
>+
>+#include "common/vector_utils.h"
>+#include "tga_utils.h"
>+#include "util/random_utils.h"
>+#include "util/shader_utils.h"
>+#include "util/system_utils.h"
>+
>+#define _USE_MATH_DEFINES
>+#include <math.h>
>+
>+using namespace angle;
>+
>+class ParticleSystemSample : public SampleApplication
>+{
>+  public:
>+    ParticleSystemSample(int argc, char **argv) : SampleApplication("ParticleSystem", argc, argv) {}
>+
>+    bool initialize() override
>+    {
>+        constexpr char kVS[] = R"(uniform float u_time;
>+uniform vec3 u_centerPosition;
>+attribute float a_lifetime;
>+attribute vec3 a_startPosition;
>+attribute vec3 a_endPosition;
>+varying float v_lifetime;
>+void main()
>+{
>+    if (u_time <= a_lifetime)
>+    {
>+        gl_Position.xyz = a_startPosition + (u_time * a_endPosition);
>+        gl_Position.xyz += u_centerPosition;
>+        gl_Position.w = 1.0;
>+    }
>+    else
>+    {
>+        gl_Position = vec4(-1000, -1000, 0, 0);
>+    }
>+    v_lifetime = 1.0 - (u_time / a_lifetime);
>+    v_lifetime = clamp(v_lifetime, 0.0, 1.0);
>+    gl_PointSize = (v_lifetime * v_lifetime) * 40.0;
>+})";
>+
>+        constexpr char kFS[] = R"(precision mediump float;
>+uniform vec4 u_color;
>+varying float v_lifetime;
>+uniform sampler2D s_texture;
>+void main()
>+{
>+    vec4 texColor;
>+    texColor = texture2D(s_texture, gl_PointCoord);
>+    gl_FragColor = vec4(u_color) * texColor;
>+    gl_FragColor.a *= v_lifetime;
>+})";
>+
>+        mProgram = CompileProgram(kVS, kFS);
>+        if (!mProgram)
>+        {
>+            return false;
>+        }
>+
>+        // Get the attribute locations
>+        mLifetimeLoc      = glGetAttribLocation(mProgram, "a_lifetime");
>+        mStartPositionLoc = glGetAttribLocation(mProgram, "a_startPosition");
>+        mEndPositionLoc   = glGetAttribLocation(mProgram, "a_endPosition");
>+
>+        // Get the uniform locations
>+        mTimeLoc           = glGetUniformLocation(mProgram, "u_time");
>+        mCenterPositionLoc = glGetUniformLocation(mProgram, "u_centerPosition");
>+        mColorLoc          = glGetUniformLocation(mProgram, "u_color");
>+        mSamplerLoc        = glGetUniformLocation(mProgram, "s_texture");
>+
>+        glClearColor(0.0f, 0.0f, 0.0f, 0.0f);
>+
>+        // Fill in particle data array
>+        for (size_t i = 0; i < mParticleCount; i++)
>+        {
>+            mParticles[i].lifetime = mRNG.randomFloatBetween(0.0f, 1.0f);
>+
>+            float endAngle                = mRNG.randomFloatBetween(0, 2.0f * float(M_PI));
>+            float endRadius               = mRNG.randomFloatBetween(0.0f, 2.0f);
>+            mParticles[i].endPosition.x() = sinf(endAngle) * endRadius;
>+            mParticles[i].endPosition.y() = cosf(endAngle) * endRadius;
>+            mParticles[i].endPosition.z() = 0.0f;
>+
>+            float startAngle                = mRNG.randomFloatBetween(0, 2.0f * float(M_PI));
>+            float startRadius               = mRNG.randomFloatBetween(0.0f, 0.25f);
>+            mParticles[i].startPosition.x() = sinf(startAngle) * startRadius;
>+            mParticles[i].startPosition.y() = cosf(startAngle) * startRadius;
>+            mParticles[i].startPosition.z() = 0.0f;
>+        }
>+
>+        mParticleTime = 1.0f;
>+
>+        std::stringstream smokeStr;
>+        smokeStr << angle::GetExecutableDirectory() << "/smoke.tga";
>+
>+        TGAImage img;
>+        if (!LoadTGAImageFromFile(smokeStr.str(), &img))
>+        {
>+            return false;
>+        }
>+        mTextureID = LoadTextureFromTGAImage(img);
>+        if (!mTextureID)
>+        {
>+            return false;
>+        }
>+
>+        return true;
>+    }
>+
>+    void destroy() override { glDeleteProgram(mProgram); }
>+
>+    void step(float dt, double totalTime) override
>+    {
>+        // Use the program object
>+        glUseProgram(mProgram);
>+
>+        mParticleTime += dt;
>+        if (mParticleTime >= 1.0f)
>+        {
>+            mParticleTime = 0.0f;
>+
>+            // Pick a new start location and color
>+            Vector3 centerPos(mRNG.randomFloatBetween(-0.5f, 0.5f),
>+                              mRNG.randomFloatBetween(-0.5f, 0.5f),
>+                              mRNG.randomFloatBetween(-0.5f, 0.5f));
>+            glUniform3fv(mCenterPositionLoc, 1, centerPos.data());
>+
>+            // Random color
>+            Vector4 color(mRNG.randomFloatBetween(0.0f, 1.0f), mRNG.randomFloatBetween(0.0f, 1.0f),
>+                          mRNG.randomFloatBetween(0.0f, 1.0f), 0.5f);
>+            glUniform4fv(mColorLoc, 1, color.data());
>+        }
>+
>+        // Load uniform time variable
>+        glUniform1f(mTimeLoc, mParticleTime);
>+    }
>+
>+    void draw() override
>+    {
>+        // Set the viewport
>+        glViewport(0, 0, getWindow()->getWidth(), getWindow()->getHeight());
>+
>+        // Clear the color buffer
>+        glClear(GL_COLOR_BUFFER_BIT);
>+
>+        // Use the program object
>+        glUseProgram(mProgram);
>+
>+        // Load the vertex attributes
>+        glVertexAttribPointer(mLifetimeLoc, 1, GL_FLOAT, GL_FALSE, sizeof(Particle),
>+                              &mParticles[0].lifetime);
>+        glVertexAttribPointer(mEndPositionLoc, 3, GL_FLOAT, GL_FALSE, sizeof(Particle),
>+                              &mParticles[0].endPosition);
>+        glVertexAttribPointer(mStartPositionLoc, 3, GL_FLOAT, GL_FALSE, sizeof(Particle),
>+                              &mParticles[0].startPosition);
>+
>+        glEnableVertexAttribArray(mLifetimeLoc);
>+        glEnableVertexAttribArray(mEndPositionLoc);
>+        glEnableVertexAttribArray(mStartPositionLoc);
>+
>+        // Blend particles
>+        glEnable(GL_BLEND);
>+        glBlendFunc(GL_SRC_ALPHA, GL_ONE);
>+
>+        // Bind the texture
>+        glActiveTexture(GL_TEXTURE0);
>+        glBindTexture(GL_TEXTURE_2D, mTextureID);
>+
>+        // Set the sampler texture unit to 0
>+        glUniform1i(mSamplerLoc, 0);
>+
>+        glDrawArrays(GL_POINTS, 0, mParticleCount);
>+    }
>+
>+  private:
>+    // Handle to a program object
>+    GLuint mProgram;
>+
>+    // Attribute locations
>+    GLint mLifetimeLoc;
>+    GLint mStartPositionLoc;
>+    GLint mEndPositionLoc;
>+
>+    // Uniform location
>+    GLint mTimeLoc;
>+    GLint mColorLoc;
>+    GLint mCenterPositionLoc;
>+    GLint mSamplerLoc;
>+
>+    // Texture handle
>+    GLuint mTextureID;
>+
>+    // Particle vertex data
>+    struct Particle
>+    {
>+        float lifetime;
>+        Vector3 startPosition;
>+        Vector3 endPosition;
>+    };
>+    static const size_t mParticleCount = 1024;
>+    std::array<Particle, mParticleCount> mParticles;
>+    float mParticleTime;
>+    RNG mRNG;
>+};
>+
>+int main(int argc, char **argv)
>+{
>+    ParticleSystemSample app(argc, argv);
>+    return app.run();
>+}
>diff --git a/Source/ThirdParty/ANGLE/samples/particle_system/smoke.tga b/Source/ThirdParty/ANGLE/samples/particle_system/smoke.tga
>new file mode 100644
>index 00000000000..06a0705c7e6
>Binary files /dev/null and b/Source/ThirdParty/ANGLE/samples/particle_system/smoke.tga differ
>diff --git a/Source/ThirdParty/ANGLE/samples/post_sub_buffer/PostSubBuffer.cpp b/Source/ThirdParty/ANGLE/samples/post_sub_buffer/PostSubBuffer.cpp
>new file mode 100644
>index 00000000000..eed4455277d
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/samples/post_sub_buffer/PostSubBuffer.cpp
>@@ -0,0 +1,167 @@
>+//
>+// Copyright (c) 2014 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+
>+//            Based on Simple_VertexShader.c from
>+// Book:      OpenGL(R) ES 2.0 Programming Guide
>+// Authors:   Aaftab Munshi, Dan Ginsburg, Dave Shreiner
>+// ISBN-10:   0321502795
>+// ISBN-13:   9780321502797
>+// Publisher: Addison-Wesley Professional
>+// URLs:      http://safari.informit.com/9780321563835
>+//            http://www.opengles-book.com
>+
>+#include "SampleApplication.h"
>+#include "texture_utils.h"
>+#include "util/Matrix.h"
>+#include "util/geometry_utils.h"
>+#include "util/shader_utils.h"
>+
>+#include <cmath>
>+#include <iostream>
>+
>+class PostSubBufferSample : public SampleApplication
>+{
>+  public:
>+    PostSubBufferSample(int argc, char **argv) : SampleApplication("PostSubBuffer", argc, argv) {}
>+
>+    bool initialize() override
>+    {
>+        mPostSubBufferNV = (PFNEGLPOSTSUBBUFFERNVPROC)eglGetProcAddress("eglPostSubBufferNV");
>+        if (!mPostSubBufferNV)
>+        {
>+            std::cerr << "Could not load eglPostSubBufferNV.";
>+            return false;
>+        }
>+
>+        constexpr char kVS[] = R"(uniform mat4 u_mvpMatrix;
>+attribute vec4 a_position;
>+attribute vec2 a_texcoord;
>+varying vec2 v_texcoord;
>+void main()
>+{
>+    gl_Position = u_mvpMatrix * a_position;
>+    v_texcoord = a_texcoord;
>+})";
>+
>+        constexpr char kFS[] = R"(precision mediump float;
>+varying vec2 v_texcoord;
>+void main()
>+{
>+    gl_FragColor = vec4(v_texcoord.x, v_texcoord.y, 1.0, 1.0);
>+})";
>+
>+        mProgram = CompileProgram(kVS, kFS);
>+        if (!mProgram)
>+        {
>+            return false;
>+        }
>+
>+        // Get the attribute locations
>+        mPositionLoc = glGetAttribLocation(mProgram, "a_position");
>+        mTexcoordLoc = glGetAttribLocation(mProgram, "a_texcoord");
>+
>+        // Get the uniform locations
>+        mMVPMatrixLoc = glGetUniformLocation(mProgram, "u_mvpMatrix");
>+
>+        // Generate the geometry data
>+        GenerateCubeGeometry(0.5f, &mCube);
>+
>+        // Set an initial rotation
>+        mRotation = 45.0f;
>+
>+        // Clear the whole window surface to blue.
>+        glClearColor(0.0f, 0.0f, 1.0f, 0.0f);
>+        glClear(GL_COLOR_BUFFER_BIT);
>+        SampleApplication::swap();
>+
>+        glClearColor(0.0f, 0.0f, 0.0f, 0.0f);
>+        glCullFace(GL_BACK);
>+        glEnable(GL_CULL_FACE);
>+
>+        return true;
>+    }
>+
>+    void destroy() override { glDeleteProgram(mProgram); }
>+
>+    void step(float dt, double totalTime) override
>+    {
>+        mRotation = fmod(mRotation + (dt * 40.0f), 360.0f);
>+
>+        Matrix4 perspectiveMatrix = Matrix4::perspective(
>+            60.0f, float(getWindow()->getWidth()) / getWindow()->getHeight(), 1.0f, 20.0f);
>+
>+        Matrix4 modelMatrix = Matrix4::translate(angle::Vector3(0.0f, 0.0f, -2.0f)) *
>+                              Matrix4::rotate(mRotation, angle::Vector3(1.0f, 0.0f, 1.0f));
>+
>+        Matrix4 viewMatrix = Matrix4::identity();
>+
>+        Matrix4 mvpMatrix = perspectiveMatrix * viewMatrix * modelMatrix;
>+
>+        // Load the matrices
>+        glUniformMatrix4fv(mMVPMatrixLoc, 1, GL_FALSE, mvpMatrix.data);
>+    }
>+
>+    void draw() override
>+    {
>+        // Set the viewport
>+        glViewport(0, 0, getWindow()->getWidth(), getWindow()->getHeight());
>+
>+        // Clear the color buffer
>+        glClear(GL_COLOR_BUFFER_BIT);
>+
>+        // Use the program object
>+        glUseProgram(mProgram);
>+
>+        // Load the vertex position
>+        glVertexAttribPointer(mPositionLoc, 3, GL_FLOAT, GL_FALSE, 0, mCube.positions.data());
>+        glEnableVertexAttribArray(mPositionLoc);
>+
>+        // Load the texcoord data
>+        glVertexAttribPointer(mTexcoordLoc, 2, GL_FLOAT, GL_FALSE, 0, mCube.texcoords.data());
>+        glEnableVertexAttribArray(mTexcoordLoc);
>+
>+        // Draw the cube
>+        glDrawElements(GL_TRIANGLES, static_cast<GLsizei>(mCube.indices.size()), GL_UNSIGNED_SHORT,
>+                       mCube.indices.data());
>+    }
>+
>+    void swap() override
>+    {
>+        // Instead of letting the application call eglSwapBuffers, call eglPostSubBufferNV here
>+        // instead
>+        EGLint windowWidth  = static_cast<EGLint>(getWindow()->getWidth());
>+        EGLint windowHeight = static_cast<EGLint>(getWindow()->getHeight());
>+        EGLDisplay display  = getDisplay();
>+        EGLSurface surface  = getSurface();
>+        mPostSubBufferNV(display, surface, 60, 60, windowWidth - 120, windowHeight - 120);
>+    }
>+
>+  private:
>+    // Handle to a program object
>+    GLuint mProgram;
>+
>+    // Attribute locations
>+    GLint mPositionLoc;
>+    GLint mTexcoordLoc;
>+
>+    // Uniform locations
>+    GLuint mMVPMatrixLoc;
>+
>+    // Current rotation
>+    float mRotation;
>+
>+    // Geometry data
>+    CubeGeometry mCube;
>+
>+    // eglPostSubBufferNV entry point
>+    PFNEGLPOSTSUBBUFFERNVPROC mPostSubBufferNV;
>+};
>+
>+int main(int argc, char **argv)
>+{
>+    PostSubBufferSample app(argc, argv);
>+    return app.run();
>+}
>diff --git a/Source/ThirdParty/ANGLE/samples/sample_util/SampleApplication.cpp b/Source/ThirdParty/ANGLE/samples/sample_util/SampleApplication.cpp
>new file mode 100644
>index 00000000000..6e7bb3b7088
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/samples/sample_util/SampleApplication.cpp
>@@ -0,0 +1,211 @@
>+//
>+// Copyright (c) 2013 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+
>+#include "SampleApplication.h"
>+
>+#include "util/EGLWindow.h"
>+#include "util/gles_loader_autogen.h"
>+#include "util/random_utils.h"
>+#include "util/system_utils.h"
>+
>+#include <string.h>
>+#include <iostream>
>+#include <utility>
>+
>+namespace
>+{
>+const char *kUseAngleArg = "--use-angle=";
>+
>+using DisplayTypeInfo = std::pair<const char *, EGLint>;
>+
>+const DisplayTypeInfo kDisplayTypes[] = {
>+    {"d3d9", EGL_PLATFORM_ANGLE_TYPE_D3D9_ANGLE}, {"d3d11", EGL_PLATFORM_ANGLE_TYPE_D3D11_ANGLE},
>+    {"gl", EGL_PLATFORM_ANGLE_TYPE_OPENGL_ANGLE}, {"gles", EGL_PLATFORM_ANGLE_TYPE_OPENGLES_ANGLE},
>+    {"null", EGL_PLATFORM_ANGLE_TYPE_NULL_ANGLE}, {"vulkan", EGL_PLATFORM_ANGLE_TYPE_VULKAN_ANGLE}};
>+
>+EGLint GetDisplayTypeFromArg(const char *displayTypeArg)
>+{
>+    for (const auto &displayTypeInfo : kDisplayTypes)
>+    {
>+        if (strcmp(displayTypeInfo.first, displayTypeArg) == 0)
>+        {
>+            std::cout << "Using ANGLE back-end API: " << displayTypeInfo.first << std::endl;
>+            return displayTypeInfo.second;
>+        }
>+    }
>+
>+    std::cout << "Unknown ANGLE back-end API: " << displayTypeArg << std::endl;
>+    return EGL_PLATFORM_ANGLE_TYPE_DEFAULT_ANGLE;
>+}
>+}  // anonymous namespace
>+
>+SampleApplication::SampleApplication(std::string name,
>+                                     int argc,
>+                                     char **argv,
>+                                     EGLint glesMajorVersion,
>+                                     EGLint glesMinorVersion,
>+                                     size_t width,
>+                                     size_t height)
>+    : mName(std::move(name)),
>+      mWidth(width),
>+      mHeight(height),
>+      mRunning(false),
>+      mEGLWindow(nullptr),
>+      mOSWindow(nullptr)
>+{
>+    mPlatformParams.majorVersion = glesMajorVersion;
>+    mPlatformParams.minorVersion = glesMinorVersion;
>+    mPlatformParams.renderer     = EGL_PLATFORM_ANGLE_TYPE_DEFAULT_ANGLE;
>+
>+    if (argc > 1 && strncmp(argv[1], kUseAngleArg, strlen(kUseAngleArg)) == 0)
>+    {
>+        mPlatformParams.renderer = GetDisplayTypeFromArg(argv[1] + strlen(kUseAngleArg));
>+    }
>+
>+    // Load EGL library so we can initialize the display.
>+    mEntryPointsLib.reset(angle::OpenSharedLibrary(ANGLE_EGL_LIBRARY_NAME));
>+
>+    mEGLWindow = EGLWindow::New(glesMajorVersion, glesMinorVersion);
>+    mTimer.reset(CreateTimer());
>+    mOSWindow = OSWindow::New();
>+}
>+
>+SampleApplication::~SampleApplication()
>+{
>+    EGLWindow::Delete(&mEGLWindow);
>+    OSWindow::Delete(&mOSWindow);
>+}
>+
>+bool SampleApplication::initialize()
>+{
>+    return true;
>+}
>+
>+void SampleApplication::destroy() {}
>+
>+void SampleApplication::step(float dt, double totalTime) {}
>+
>+void SampleApplication::draw() {}
>+
>+void SampleApplication::swap()
>+{
>+    mEGLWindow->swap();
>+}
>+
>+OSWindow *SampleApplication::getWindow() const
>+{
>+    return mOSWindow;
>+}
>+
>+EGLConfig SampleApplication::getConfig() const
>+{
>+    return mEGLWindow->getConfig();
>+}
>+
>+EGLDisplay SampleApplication::getDisplay() const
>+{
>+    return mEGLWindow->getDisplay();
>+}
>+
>+EGLSurface SampleApplication::getSurface() const
>+{
>+    return mEGLWindow->getSurface();
>+}
>+
>+EGLContext SampleApplication::getContext() const
>+{
>+    return mEGLWindow->getContext();
>+}
>+
>+int SampleApplication::run()
>+{
>+    if (!mOSWindow->initialize(mName, mWidth, mHeight))
>+    {
>+        return -1;
>+    }
>+
>+    mOSWindow->setVisible(true);
>+
>+    ConfigParameters configParams;
>+    configParams.redBits     = 8;
>+    configParams.greenBits   = 8;
>+    configParams.blueBits    = 8;
>+    configParams.alphaBits   = 8;
>+    configParams.depthBits   = 24;
>+    configParams.stencilBits = 8;
>+
>+    if (!mEGLWindow->initializeGL(mOSWindow, mEntryPointsLib.get(), mPlatformParams, configParams))
>+    {
>+        return -1;
>+    }
>+
>+    // Disable vsync
>+    if (!mEGLWindow->setSwapInterval(0))
>+    {
>+        return -1;
>+    }
>+
>+    angle::LoadGLES(eglGetProcAddress);
>+
>+    mRunning   = true;
>+    int result = 0;
>+
>+    if (!initialize())
>+    {
>+        mRunning = false;
>+        result   = -1;
>+    }
>+
>+    mTimer->start();
>+    double prevTime = 0.0;
>+
>+    while (mRunning)
>+    {
>+        double elapsedTime = mTimer->getElapsedTime();
>+        double deltaTime   = elapsedTime - prevTime;
>+
>+        step(static_cast<float>(deltaTime), elapsedTime);
>+
>+        // Clear events that the application did not process from this frame
>+        Event event;
>+        while (popEvent(&event))
>+        {
>+            // If the application did not catch a close event, close now
>+            if (event.Type == Event::EVENT_CLOSED)
>+            {
>+                exit();
>+            }
>+        }
>+
>+        if (!mRunning)
>+        {
>+            break;
>+        }
>+
>+        draw();
>+        swap();
>+
>+        mOSWindow->messageLoop();
>+
>+        prevTime = elapsedTime;
>+    }
>+
>+    destroy();
>+    mEGLWindow->destroyGL();
>+    mOSWindow->destroy();
>+
>+    return result;
>+}
>+
>+void SampleApplication::exit()
>+{
>+    mRunning = false;
>+}
>+
>+bool SampleApplication::popEvent(Event *event)
>+{
>+    return mOSWindow->popEvent(event);
>+}
>diff --git a/Source/ThirdParty/ANGLE/samples/sample_util/SampleApplication.h b/Source/ThirdParty/ANGLE/samples/sample_util/SampleApplication.h
>new file mode 100644
>index 00000000000..65201d6747a
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/samples/sample_util/SampleApplication.h
>@@ -0,0 +1,74 @@
>+//
>+// Copyright (c) 2014 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+
>+#ifndef SAMPLE_UTIL_SAMPLE_APPLICATION_H
>+#define SAMPLE_UTIL_SAMPLE_APPLICATION_H
>+
>+#include <stdint.h>
>+#include <list>
>+#include <memory>
>+#include <string>
>+
>+#include "util/EGLPlatformParameters.h"
>+#include "util/OSWindow.h"
>+#include "util/Timer.h"
>+#include "util/egl_loader_autogen.h"
>+
>+class EGLWindow;
>+
>+namespace angle
>+{
>+class Library;
>+}  // namespace angle
>+
>+class SampleApplication
>+{
>+  public:
>+    SampleApplication(std::string name,
>+                      int argc,
>+                      char **argv,
>+                      EGLint glesMajorVersion = 2,
>+                      EGLint glesMinorVersion = 0,
>+                      size_t width            = 1280,
>+                      size_t height           = 720);
>+    virtual ~SampleApplication();
>+
>+    virtual bool initialize();
>+    virtual void destroy();
>+
>+    virtual void step(float dt, double totalTime);
>+    virtual void draw();
>+
>+    virtual void swap();
>+
>+    OSWindow *getWindow() const;
>+    EGLConfig getConfig() const;
>+    EGLDisplay getDisplay() const;
>+    EGLSurface getSurface() const;
>+    EGLContext getContext() const;
>+
>+    bool popEvent(Event *event);
>+
>+    int run();
>+    void exit();
>+
>+  private:
>+    std::string mName;
>+    size_t mWidth;
>+    size_t mHeight;
>+    bool mRunning;
>+
>+    std::unique_ptr<Timer> mTimer;
>+    EGLWindow *mEGLWindow;
>+    OSWindow *mOSWindow;
>+
>+    EGLPlatformParameters mPlatformParams;
>+
>+    // Handle to the entry point binding library.
>+    std::unique_ptr<angle::Library> mEntryPointsLib;
>+};
>+
>+#endif  // SAMPLE_UTIL_SAMPLE_APPLICATION_H
>diff --git a/Source/ThirdParty/ANGLE/samples/sample_util/texture_utils.cpp b/Source/ThirdParty/ANGLE/samples/sample_util/texture_utils.cpp
>new file mode 100644
>index 00000000000..24cc66be796
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/samples/sample_util/texture_utils.cpp
>@@ -0,0 +1,130 @@
>+//
>+// Copyright (c) 2014 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+
>+#include "texture_utils.h"
>+#include <array>
>+
>+GLuint CreateSimpleTexture2D()
>+{
>+    // Use tightly packed data
>+    glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
>+
>+    // Generate a texture object
>+    GLuint texture;
>+    glGenTextures(1, &texture);
>+
>+    // Bind the texture object
>+    glBindTexture(GL_TEXTURE_2D, texture);
>+
>+    // Load the texture: 2x2 Image, 3 bytes per pixel (R, G, B)
>+    const size_t width = 2;
>+    const size_t height = 2;
>+    GLubyte pixels[width * height * 3] =
>+    {
>+        255,   0,   0, // Red
>+          0, 255,   0, // Green
>+          0,   0, 255, // Blue
>+        255, 255,   0, // Yellow
>+    };
>+    glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB, width, height, 0, GL_RGB, GL_UNSIGNED_BYTE, pixels);
>+
>+    // Set the filtering mode
>+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
>+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
>+
>+    return texture;
>+}
>+
>+GLuint CreateSimpleTextureCubemap()
>+{
>+    // Generate a texture object
>+    GLuint texture;
>+    glGenTextures(1, &texture);
>+
>+    // Bind the texture object
>+    glBindTexture(GL_TEXTURE_CUBE_MAP, texture);
>+
>+    // Load the texture faces
>+    GLubyte pixels[6][3] =
>+    {
>+        // Face 0 - Red
>+        { 255, 0, 0 },
>+        // Face 1 - Green,
>+        { 0, 255, 0 },
>+        // Face 3 - Blue
>+        { 0, 0, 255 },
>+        // Face 4 - Yellow
>+        { 255, 255, 0 },
>+        // Face 5 - Purple
>+        { 255, 0, 255 },
>+        // Face 6 - White
>+        { 255, 255, 255 }
>+    };
>+
>+    for (size_t i = 0; i < 6; i++)
>+    {
>+        glTexImage2D(static_cast<GLenum>(GL_TEXTURE_CUBE_MAP_POSITIVE_X + i), 0, GL_RGB, 1, 1, 0,
>+                     GL_RGB, GL_UNSIGNED_BYTE, &pixels[i]);
>+    }
>+
>+    // Set the filtering mode
>+    glTexParameteri(GL_TEXTURE_CUBE_MAP, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
>+    glTexParameteri(GL_TEXTURE_CUBE_MAP, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
>+
>+    return texture;
>+}
>+
>+GLuint CreateMipMappedTexture2D()
>+{
>+    // Texture object handle
>+    const size_t width = 256;
>+    const size_t height = 256;
>+    std::array<GLubyte, width * height * 3> pixels;
>+
>+    const size_t checkerSize = 8;
>+    for (size_t y = 0; y < height; y++)
>+    {
>+        for (size_t x = 0; x < width; x++)
>+        {
>+            GLubyte rColor = 0;
>+            GLubyte bColor = 0;
>+
>+            if ((x / checkerSize) % 2 == 0)
>+            {
>+                rColor = 255 * ((y / checkerSize) % 2);
>+                bColor = 255 * (1 - ((y / checkerSize) % 2));
>+            }
>+            else
>+            {
>+                bColor = 255 * ((y / checkerSize) % 2);
>+                rColor = 255 * (1 - ((y / checkerSize) % 2));
>+            }
>+
>+            pixels[(y * height + x) * 3] = rColor;
>+            pixels[(y * height + x) * 3 + 1] = 0;
>+            pixels[(y * height + x) * 3 + 2] = bColor;
>+        }
>+    }
>+
>+    // Generate a texture object
>+    GLuint texture;
>+    glGenTextures(1, &texture);
>+
>+    // Bind the texture object
>+    glBindTexture(GL_TEXTURE_2D, texture);
>+
>+    // Load mipmap level 0
>+    glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB, width, height, 0, GL_RGB, GL_UNSIGNED_BYTE, pixels.data());
>+
>+    // Generate mipmaps
>+    glGenerateMipmap(GL_TEXTURE_2D);
>+
>+    // Set the filtering mode
>+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST_MIPMAP_NEAREST);
>+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
>+
>+    return texture;
>+}
>diff --git a/Source/ThirdParty/ANGLE/samples/sample_util/texture_utils.h b/Source/ThirdParty/ANGLE/samples/sample_util/texture_utils.h
>new file mode 100644
>index 00000000000..90bc1139494
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/samples/sample_util/texture_utils.h
>@@ -0,0 +1,17 @@
>+//
>+// Copyright (c) 2014 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+
>+#ifndef SAMPLE_UTIL_TEXTURE_UTILS_H
>+#define SAMPLE_UTIL_TEXTURE_UTILS_H
>+
>+#include "util/gles_loader_autogen.h"
>+
>+GLuint CreateSimpleTexture2D();
>+GLuint CreateSimpleTextureCubemap();
>+
>+GLuint CreateMipMappedTexture2D();
>+
>+#endif  // SAMPLE_UTIL_TEXTURE_UTILS_H
>diff --git a/Source/ThirdParty/ANGLE/samples/sample_util/tga_utils.cpp b/Source/ThirdParty/ANGLE/samples/sample_util/tga_utils.cpp
>new file mode 100644
>index 00000000000..41a6d244eb3
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/samples/sample_util/tga_utils.cpp
>@@ -0,0 +1,123 @@
>+//
>+// Copyright (c) 2014 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+
>+#include "tga_utils.h"
>+
>+#include <fstream>
>+#include <iostream>
>+#include <limits.h>
>+#include <stdint.h>
>+#include <string>
>+
>+TGAImage::TGAImage()
>+    : width(0), height(0), data(0)
>+{
>+}
>+
>+struct TGAHeader
>+{
>+    uint8_t idSize;
>+    uint8_t mapType;
>+    uint8_t imageType;
>+    uint16_t paletteStart;
>+    uint16_t paletteSize;
>+    uint8_t paletteEntryDepth;
>+    uint16_t x;
>+    uint16_t y;
>+    uint16_t width;
>+    uint16_t height;
>+    uint8_t colorDepth;
>+    uint8_t descriptor;
>+};
>+
>+#define INVERTED_BIT (1 << 5)
>+
>+template <typename dataType>
>+void readBinary(std::ifstream &stream, dataType &item)
>+{
>+    stream.read(reinterpret_cast<char *>(&item), sizeof(dataType));
>+}
>+
>+template <typename dataType>
>+void readBinary(std::ifstream &stream, std::vector<dataType> &items)
>+{
>+    stream.read(reinterpret_cast<char *>(items.data()), sizeof(dataType) * items.size());
>+}
>+
>+bool LoadTGAImageFromFile(const std::string &path, TGAImage *image)
>+{
>+    std::ifstream stream(path, std::ios::binary);
>+    if (!stream)
>+    {
>+        std::cerr << "error opening tga file " << path << " for reading.\n";
>+        return false;
>+    }
>+
>+    TGAHeader header;
>+    readBinary(stream, header.idSize);
>+    readBinary(stream, header.mapType);
>+    readBinary(stream, header.imageType);
>+    readBinary(stream, header.paletteStart);
>+    readBinary(stream, header.paletteSize);
>+    readBinary(stream, header.paletteEntryDepth);
>+    readBinary(stream, header.x);
>+    readBinary(stream, header.y);
>+    readBinary(stream, header.width);
>+    readBinary(stream, header.height);
>+    readBinary(stream, header.colorDepth);
>+    readBinary(stream, header.descriptor);
>+
>+    image->width = header.width;
>+    image->height = header.height;
>+
>+    size_t pixelComponentCount = header.colorDepth / CHAR_BIT;
>+    std::vector<unsigned char> buffer(header.width * header.height * pixelComponentCount);
>+    readBinary(stream, buffer);
>+
>+    image->data.reserve(header.width * header.height);
>+
>+    for (size_t y = 0; y < header.height; y++)
>+    {
>+        size_t rowIdx = ((header.descriptor & INVERTED_BIT) ? (header.height - 1 - y) : y) * header.width * pixelComponentCount;
>+        for (size_t x = 0; x < header.width; x++)
>+        {
>+            size_t pixelIdx = rowIdx + x * pixelComponentCount;
>+
>+            Byte4 pixel;
>+            pixel[0] = (pixelComponentCount > 2) ? buffer[pixelIdx + 2] : 0;
>+            pixel[2] = (pixelComponentCount > 0) ? buffer[pixelIdx + 0] : 0;
>+            pixel[1] = (pixelComponentCount > 1) ? buffer[pixelIdx + 1] : 0;
>+            pixel[3] = (pixelComponentCount > 3) ? buffer[pixelIdx + 3] : 255;
>+
>+            image->data.push_back(pixel);
>+        }
>+    }
>+
>+    std::cout << "loaded image " << path << ".\n";
>+
>+    return true;
>+}
>+
>+GLuint LoadTextureFromTGAImage(const TGAImage &image)
>+{
>+    if (image.width > 0 && image.height > 0)
>+    {
>+        GLuint texture;
>+        glGenTextures(1, &texture);
>+        glBindTexture(GL_TEXTURE_2D, texture);
>+        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR);
>+        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
>+        glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
>+        glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, static_cast<GLsizei>(image.width), static_cast<GLsizei>(image.height), 0,
>+                     GL_RGBA, GL_UNSIGNED_BYTE, image.data.data());
>+        glGenerateMipmap(GL_TEXTURE_2D);
>+        return texture;
>+    }
>+    else
>+    {
>+        return 0;
>+    }
>+}
>diff --git a/Source/ThirdParty/ANGLE/samples/sample_util/tga_utils.h b/Source/ThirdParty/ANGLE/samples/sample_util/tga_utils.h
>new file mode 100644
>index 00000000000..53a42830301
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/samples/sample_util/tga_utils.h
>@@ -0,0 +1,29 @@
>+//
>+// Copyright (c) 2014 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+
>+#ifndef SAMPLE_UTIL_TGA_UTILS_HPP
>+#define SAMPLE_UTIL_TGA_UTILS_HPP
>+
>+#include <array>
>+#include <vector>
>+
>+#include "util/gles_loader_autogen.h"
>+
>+typedef std::array<unsigned char, 4> Byte4;
>+
>+struct TGAImage
>+{
>+    size_t width;
>+    size_t height;
>+    std::vector<Byte4> data;
>+
>+    TGAImage();
>+};
>+
>+bool LoadTGAImageFromFile(const std::string &path, TGAImage *image);
>+GLuint LoadTextureFromTGAImage(const TGAImage &image);
>+
>+#endif  // SAMPLE_UTIL_TGA_UTILS_HPP
>diff --git a/Source/ThirdParty/ANGLE/samples/shader_translator/shader_translator.cpp b/Source/ThirdParty/ANGLE/samples/shader_translator/shader_translator.cpp
>new file mode 100644
>index 00000000000..a5528122968
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/samples/shader_translator/shader_translator.cpp
>@@ -0,0 +1,829 @@
>+//
>+// Copyright (c) 2002-2013 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+
>+#include "GLSLANG/ShaderLang.h"
>+
>+#include <assert.h>
>+#include <math.h>
>+#include <stdio.h>
>+#include <stdlib.h>
>+#include <string.h>
>+#include <sstream>
>+#include <vector>
>+#include "angle_gl.h"
>+
>+//
>+// Return codes from main.
>+//
>+enum TFailCode
>+{
>+    ESuccess = 0,
>+    EFailUsage,
>+    EFailCompile,
>+    EFailCompilerCreate,
>+};
>+
>+static void usage();
>+static sh::GLenum FindShaderType(const char *fileName);
>+static bool CompileFile(char *fileName, ShHandle compiler, ShCompileOptions compileOptions);
>+static void LogMsg(const char *msg, const char *name, const int num, const char *logName);
>+static void PrintVariable(const std::string &prefix, size_t index, const sh::ShaderVariable &var);
>+static void PrintActiveVariables(ShHandle compiler);
>+
>+// If NUM_SOURCE_STRINGS is set to a value > 1, the input file data is
>+// broken into that many chunks. This will affect file/line numbering in
>+// the preprocessor.
>+const unsigned int NUM_SOURCE_STRINGS = 1;
>+typedef std::vector<char *> ShaderSource;
>+static bool ReadShaderSource(const char *fileName, ShaderSource &source);
>+static void FreeShaderSource(ShaderSource &source);
>+
>+static bool ParseGLSLOutputVersion(const std::string &, ShShaderOutput *outResult);
>+static bool ParseIntValue(const std::string &, int emptyDefault, int *outValue);
>+
>+//
>+// Set up the per compile resources
>+//
>+void GenerateResources(ShBuiltInResources *resources)
>+{
>+    sh::InitBuiltInResources(resources);
>+
>+    resources->MaxVertexAttribs             = 8;
>+    resources->MaxVertexUniformVectors      = 128;
>+    resources->MaxVaryingVectors            = 8;
>+    resources->MaxVertexTextureImageUnits   = 0;
>+    resources->MaxCombinedTextureImageUnits = 8;
>+    resources->MaxTextureImageUnits         = 8;
>+    resources->MaxFragmentUniformVectors    = 16;
>+    resources->MaxDrawBuffers               = 1;
>+    resources->MaxDualSourceDrawBuffers     = 1;
>+
>+    resources->OES_standard_derivatives  = 0;
>+    resources->OES_EGL_image_external    = 0;
>+    resources->EXT_geometry_shader       = 1;
>+    resources->ANGLE_texture_multisample = 0;
>+}
>+
>+int main(int argc, char *argv[])
>+{
>+    TFailCode failCode = ESuccess;
>+
>+    ShCompileOptions compileOptions = 0;
>+    int numCompiles                 = 0;
>+    ShHandle vertexCompiler         = 0;
>+    ShHandle fragmentCompiler       = 0;
>+    ShHandle computeCompiler        = 0;
>+    ShHandle geometryCompiler       = 0;
>+    ShShaderSpec spec               = SH_GLES2_SPEC;
>+    ShShaderOutput output           = SH_ESSL_OUTPUT;
>+
>+    sh::Initialize();
>+
>+    ShBuiltInResources resources;
>+    GenerateResources(&resources);
>+
>+    argc--;
>+    argv++;
>+    for (; (argc >= 1) && (failCode == ESuccess); argc--, argv++)
>+    {
>+        if (argv[0][0] == '-')
>+        {
>+            switch (argv[0][1])
>+            {
>+                case 'i':
>+                    compileOptions |= SH_INTERMEDIATE_TREE;
>+                    break;
>+                case 'o':
>+                    compileOptions |= SH_OBJECT_CODE;
>+                    break;
>+                case 'u':
>+                    compileOptions |= SH_VARIABLES;
>+                    break;
>+                case 'p':
>+                    resources.WEBGL_debug_shader_precision = 1;
>+                    break;
>+                case 's':
>+                    if (argv[0][2] == '=')
>+                    {
>+                        switch (argv[0][3])
>+                        {
>+                            case 'e':
>+                                if (argv[0][4] == '3')
>+                                {
>+                                    if (argv[0][5] == '1')
>+                                    {
>+                                        spec = SH_GLES3_1_SPEC;
>+                                    }
>+                                    else
>+                                    {
>+                                        spec = SH_GLES3_SPEC;
>+                                    }
>+                                }
>+                                else
>+                                {
>+                                    spec = SH_GLES2_SPEC;
>+                                }
>+                                break;
>+                            case 'w':
>+                                if (argv[0][4] == '3')
>+                                {
>+                                    spec = SH_WEBGL3_SPEC;
>+                                }
>+                                else if (argv[0][4] == '2')
>+                                {
>+                                    spec = SH_WEBGL2_SPEC;
>+                                }
>+                                else if (argv[0][4] == 'n')
>+                                {
>+                                    spec = SH_WEBGL_SPEC;
>+                                }
>+                                else
>+                                {
>+                                    spec                            = SH_WEBGL_SPEC;
>+                                    resources.FragmentPrecisionHigh = 1;
>+                                }
>+                                break;
>+                            default:
>+                                failCode = EFailUsage;
>+                        }
>+                    }
>+                    else
>+                    {
>+                        failCode = EFailUsage;
>+                    }
>+                    break;
>+                case 'b':
>+                    if (argv[0][2] == '=')
>+                    {
>+                        switch (argv[0][3])
>+                        {
>+                            case 'e':
>+                                output = SH_ESSL_OUTPUT;
>+                                compileOptions |= SH_INITIALIZE_UNINITIALIZED_LOCALS;
>+                                break;
>+                            case 'g':
>+                                if (!ParseGLSLOutputVersion(&argv[0][sizeof("-b=g") - 1], &output))
>+                                {
>+                                    failCode = EFailUsage;
>+                                }
>+                                compileOptions |= SH_INITIALIZE_UNINITIALIZED_LOCALS;
>+                                break;
>+                            case 'h':
>+                                if (argv[0][4] == '1' && argv[0][5] == '1')
>+                                {
>+                                    output = SH_HLSL_4_1_OUTPUT;
>+                                }
>+                                else
>+                                {
>+                                    output = SH_HLSL_3_0_OUTPUT;
>+                                }
>+                                break;
>+                            default:
>+                                failCode = EFailUsage;
>+                        }
>+                    }
>+                    else
>+                    {
>+                        failCode = EFailUsage;
>+                    }
>+                    break;
>+                case 'x':
>+                    if (argv[0][2] == '=')
>+                    {
>+                        // clang-format off
>+                    switch (argv[0][3])
>+                    {
>+                      case 'i': resources.OES_EGL_image_external = 1; break;
>+                      case 'd': resources.OES_standard_derivatives = 1; break;
>+                      case 'r': resources.ARB_texture_rectangle = 1; break;
>+                      case 'b':
>+                          if (ParseIntValue(&argv[0][sizeof("-x=b") - 1], 1,
>+                                            &resources.MaxDualSourceDrawBuffers))
>+                          {
>+                              resources.EXT_blend_func_extended = 1;
>+                          }
>+                          else
>+                          {
>+                              failCode = EFailUsage;
>+                          }
>+                          break;
>+                      case 'w':
>+                          if (ParseIntValue(&argv[0][sizeof("-x=w") - 1], 1,
>+                                            &resources.MaxDrawBuffers))
>+                          {
>+                              resources.EXT_draw_buffers = 1;
>+                          }
>+                          else
>+                          {
>+                              failCode = EFailUsage;
>+                          }
>+                          break;
>+                      case 'g': resources.EXT_frag_depth = 1; break;
>+                      case 'l': resources.EXT_shader_texture_lod = 1; break;
>+                      case 'f': resources.EXT_shader_framebuffer_fetch = 1; break;
>+                      case 'n': resources.NV_shader_framebuffer_fetch = 1; break;
>+                      case 'a': resources.ARM_shader_framebuffer_fetch = 1; break;
>+                      case 'm':
>+                          resources.OVR_multiview2 = 1;
>+                          compileOptions |= SH_INITIALIZE_BUILTINS_FOR_INSTANCED_MULTIVIEW;
>+                          compileOptions |= SH_SELECT_VIEW_IN_NV_GLSL_VERTEX_SHADER;
>+                          break;
>+                      case 'y': resources.EXT_YUV_target = 1; break;
>+                      default: failCode = EFailUsage;
>+                    }
>+                        // clang-format on
>+                    }
>+                    else
>+                    {
>+                        failCode = EFailUsage;
>+                    }
>+                    break;
>+                default:
>+                    failCode = EFailUsage;
>+            }
>+        }
>+        else
>+        {
>+            if (spec != SH_GLES2_SPEC && spec != SH_WEBGL_SPEC)
>+            {
>+                resources.MaxDrawBuffers             = 8;
>+                resources.MaxVertexTextureImageUnits = 16;
>+                resources.MaxTextureImageUnits       = 16;
>+            }
>+            ShHandle compiler = 0;
>+            switch (FindShaderType(argv[0]))
>+            {
>+                case GL_VERTEX_SHADER:
>+                    if (vertexCompiler == 0)
>+                    {
>+                        vertexCompiler =
>+                            sh::ConstructCompiler(GL_VERTEX_SHADER, spec, output, &resources);
>+                    }
>+                    compiler = vertexCompiler;
>+                    break;
>+                case GL_FRAGMENT_SHADER:
>+                    if (fragmentCompiler == 0)
>+                    {
>+                        fragmentCompiler =
>+                            sh::ConstructCompiler(GL_FRAGMENT_SHADER, spec, output, &resources);
>+                    }
>+                    compiler = fragmentCompiler;
>+                    break;
>+                case GL_COMPUTE_SHADER:
>+                    if (computeCompiler == 0)
>+                    {
>+                        computeCompiler =
>+                            sh::ConstructCompiler(GL_COMPUTE_SHADER, spec, output, &resources);
>+                    }
>+                    compiler = computeCompiler;
>+                    break;
>+                case GL_GEOMETRY_SHADER_EXT:
>+                    if (geometryCompiler == 0)
>+                    {
>+                        geometryCompiler =
>+                            sh::ConstructCompiler(GL_GEOMETRY_SHADER_EXT, spec, output, &resources);
>+                    }
>+                    compiler = geometryCompiler;
>+                    break;
>+                default:
>+                    break;
>+            }
>+            if (compiler)
>+            {
>+                switch (output)
>+                {
>+                    case SH_HLSL_3_0_OUTPUT:
>+                    case SH_HLSL_4_1_OUTPUT:
>+                    case SH_HLSL_4_0_FL9_3_OUTPUT:
>+                        compileOptions &= ~SH_SELECT_VIEW_IN_NV_GLSL_VERTEX_SHADER;
>+                        break;
>+                    default:
>+                        break;
>+                }
>+
>+                bool compiled = CompileFile(argv[0], compiler, compileOptions);
>+
>+                LogMsg("BEGIN", "COMPILER", numCompiles, "INFO LOG");
>+                std::string log = sh::GetInfoLog(compiler);
>+                puts(log.c_str());
>+                LogMsg("END", "COMPILER", numCompiles, "INFO LOG");
>+                printf("\n\n");
>+
>+                if (compiled && (compileOptions & SH_OBJECT_CODE))
>+                {
>+                    LogMsg("BEGIN", "COMPILER", numCompiles, "OBJ CODE");
>+                    std::string code = sh::GetObjectCode(compiler);
>+                    puts(code.c_str());
>+                    LogMsg("END", "COMPILER", numCompiles, "OBJ CODE");
>+                    printf("\n\n");
>+                }
>+                if (compiled && (compileOptions & SH_VARIABLES))
>+                {
>+                    LogMsg("BEGIN", "COMPILER", numCompiles, "VARIABLES");
>+                    PrintActiveVariables(compiler);
>+                    LogMsg("END", "COMPILER", numCompiles, "VARIABLES");
>+                    printf("\n\n");
>+                }
>+                if (!compiled)
>+                    failCode = EFailCompile;
>+                ++numCompiles;
>+            }
>+            else
>+            {
>+                failCode = EFailCompilerCreate;
>+            }
>+        }
>+    }
>+
>+    if ((vertexCompiler == 0) && (fragmentCompiler == 0) && (computeCompiler == 0) &&
>+        (geometryCompiler == 0))
>+        failCode = EFailUsage;
>+    if (failCode == EFailUsage)
>+        usage();
>+
>+    if (vertexCompiler)
>+        sh::Destruct(vertexCompiler);
>+    if (fragmentCompiler)
>+        sh::Destruct(fragmentCompiler);
>+    if (computeCompiler)
>+        sh::Destruct(computeCompiler);
>+    if (geometryCompiler)
>+        sh::Destruct(geometryCompiler);
>+
>+    sh::Finalize();
>+
>+    return failCode;
>+}
>+
>+//
>+//   print usage to stdout
>+//
>+void usage()
>+{
>+    // clang-format off
>+    printf(
>+        "Usage: translate [-i -o -u -l -p -b=e -b=g -b=h9 -x=i -x=d] file1 file2 ...\n"
>+        "Where: filename : filename ending in .frag or .vert\n"
>+        "       -i       : print intermediate tree\n"
>+        "       -o       : print translated code\n"
>+        "       -u       : print active attribs, uniforms, varyings and program outputs\n"
>+        "       -p       : use precision emulation\n"
>+        "       -s=e2    : use GLES2 spec (this is by default)\n"
>+        "       -s=e3    : use GLES3 spec\n"
>+        "       -s=e31   : use GLES31 spec (in development)\n"
>+        "       -s=w     : use WebGL 1.0 spec\n"
>+        "       -s=wn    : use WebGL 1.0 spec with no highp support in fragment shaders\n"
>+        "       -s=w2    : use WebGL 2.0 spec\n"
>+        "       -b=e     : output GLSL ES code (this is by default)\n"
>+        "       -b=g     : output GLSL code (compatibility profile)\n"
>+        "       -b=g[NUM]: output GLSL code (NUM can be 130, 140, 150, 330, 400, 410, 420, 430, "
>+        "440, 450)\n"
>+        "       -b=h9    : output HLSL9 code\n"
>+        "       -b=h11   : output HLSL11 code\n"
>+        "       -x=i     : enable GL_OES_EGL_image_external\n"
>+        "       -x=d     : enable GL_OES_EGL_standard_derivatives\n"
>+        "       -x=r     : enable ARB_texture_rectangle\n"
>+        "       -x=b[NUM]: enable EXT_blend_func_extended (NUM default 1)\n"
>+        "       -x=w[NUM]: enable EXT_draw_buffers (NUM default 1)\n"
>+        "       -x=g     : enable EXT_frag_depth\n"
>+        "       -x=l     : enable EXT_shader_texture_lod\n"
>+        "       -x=f     : enable EXT_shader_framebuffer_fetch\n"
>+        "       -x=n     : enable NV_shader_framebuffer_fetch\n"
>+        "       -x=a     : enable ARM_shader_framebuffer_fetch\n"
>+        "       -x=m     : enable OVR_multiview\n"
>+        "       -x=y     : enable YUV_target\n");
>+    // clang-format on
>+}
>+
>+//
>+//   Deduce the shader type from the filename.  Files must end in one of the
>+//   following extensions:
>+//
>+//   .frag*    = fragment shader
>+//   .vert*    = vertex shader
>+//
>+sh::GLenum FindShaderType(const char *fileName)
>+{
>+    assert(fileName);
>+
>+    const char *ext = strrchr(fileName, '.');
>+
>+    if (ext && strcmp(ext, ".sl") == 0)
>+        for (; ext > fileName && ext[0] != '.'; ext--)
>+            ;
>+
>+    ext = strrchr(fileName, '.');
>+    if (ext)
>+    {
>+        if (strncmp(ext, ".frag", 5) == 0)
>+            return GL_FRAGMENT_SHADER;
>+        if (strncmp(ext, ".vert", 5) == 0)
>+            return GL_VERTEX_SHADER;
>+        if (strncmp(ext, ".comp", 5) == 0)
>+            return GL_COMPUTE_SHADER;
>+        if (strncmp(ext, ".geom", 5) == 0)
>+            return GL_GEOMETRY_SHADER_EXT;
>+    }
>+
>+    return GL_FRAGMENT_SHADER;
>+}
>+
>+//
>+//   Read a file's data into a string, and compile it using sh::Compile
>+//
>+bool CompileFile(char *fileName, ShHandle compiler, ShCompileOptions compileOptions)
>+{
>+    ShaderSource source;
>+    if (!ReadShaderSource(fileName, source))
>+        return false;
>+
>+    int ret = sh::Compile(compiler, &source[0], source.size(), compileOptions);
>+
>+    FreeShaderSource(source);
>+    return ret ? true : false;
>+}
>+
>+void LogMsg(const char *msg, const char *name, const int num, const char *logName)
>+{
>+    printf("#### %s %s %d %s ####\n", msg, name, num, logName);
>+}
>+
>+void PrintVariable(const std::string &prefix, size_t index, const sh::ShaderVariable &var)
>+{
>+    std::string typeName;
>+    switch (var.type)
>+    {
>+        case GL_FLOAT:
>+            typeName = "GL_FLOAT";
>+            break;
>+        case GL_FLOAT_VEC2:
>+            typeName = "GL_FLOAT_VEC2";
>+            break;
>+        case GL_FLOAT_VEC3:
>+            typeName = "GL_FLOAT_VEC3";
>+            break;
>+        case GL_FLOAT_VEC4:
>+            typeName = "GL_FLOAT_VEC4";
>+            break;
>+        case GL_INT:
>+            typeName = "GL_INT";
>+            break;
>+        case GL_INT_VEC2:
>+            typeName = "GL_INT_VEC2";
>+            break;
>+        case GL_INT_VEC3:
>+            typeName = "GL_INT_VEC3";
>+            break;
>+        case GL_INT_VEC4:
>+            typeName = "GL_INT_VEC4";
>+            break;
>+        case GL_UNSIGNED_INT:
>+            typeName = "GL_UNSIGNED_INT";
>+            break;
>+        case GL_UNSIGNED_INT_VEC2:
>+            typeName = "GL_UNSIGNED_INT_VEC2";
>+            break;
>+        case GL_UNSIGNED_INT_VEC3:
>+            typeName = "GL_UNSIGNED_INT_VEC3";
>+            break;
>+        case GL_UNSIGNED_INT_VEC4:
>+            typeName = "GL_UNSIGNED_INT_VEC4";
>+            break;
>+        case GL_BOOL:
>+            typeName = "GL_BOOL";
>+            break;
>+        case GL_BOOL_VEC2:
>+            typeName = "GL_BOOL_VEC2";
>+            break;
>+        case GL_BOOL_VEC3:
>+            typeName = "GL_BOOL_VEC3";
>+            break;
>+        case GL_BOOL_VEC4:
>+            typeName = "GL_BOOL_VEC4";
>+            break;
>+        case GL_FLOAT_MAT2:
>+            typeName = "GL_FLOAT_MAT2";
>+            break;
>+        case GL_FLOAT_MAT3:
>+            typeName = "GL_FLOAT_MAT3";
>+            break;
>+        case GL_FLOAT_MAT4:
>+            typeName = "GL_FLOAT_MAT4";
>+            break;
>+        case GL_FLOAT_MAT2x3:
>+            typeName = "GL_FLOAT_MAT2x3";
>+            break;
>+        case GL_FLOAT_MAT3x2:
>+            typeName = "GL_FLOAT_MAT3x2";
>+            break;
>+        case GL_FLOAT_MAT4x2:
>+            typeName = "GL_FLOAT_MAT4x2";
>+            break;
>+        case GL_FLOAT_MAT2x4:
>+            typeName = "GL_FLOAT_MAT2x4";
>+            break;
>+        case GL_FLOAT_MAT3x4:
>+            typeName = "GL_FLOAT_MAT3x4";
>+            break;
>+        case GL_FLOAT_MAT4x3:
>+            typeName = "GL_FLOAT_MAT4x3";
>+            break;
>+
>+        case GL_SAMPLER_2D:
>+            typeName = "GL_SAMPLER_2D";
>+            break;
>+        case GL_SAMPLER_3D:
>+            typeName = "GL_SAMPLER_3D";
>+            break;
>+        case GL_SAMPLER_CUBE:
>+            typeName = "GL_SAMPLER_CUBE";
>+            break;
>+        case GL_SAMPLER_CUBE_SHADOW:
>+            typeName = "GL_SAMPLER_CUBE_SHADOW";
>+            break;
>+        case GL_SAMPLER_2D_SHADOW:
>+            typeName = "GL_SAMPLER_2D_ARRAY_SHADOW";
>+            break;
>+        case GL_SAMPLER_2D_ARRAY:
>+            typeName = "GL_SAMPLER_2D_ARRAY";
>+            break;
>+        case GL_SAMPLER_2D_ARRAY_SHADOW:
>+            typeName = "GL_SAMPLER_2D_ARRAY_SHADOW";
>+            break;
>+        case GL_SAMPLER_2D_MULTISAMPLE:
>+            typeName = "GL_SAMPLER_2D_MULTISAMPLE";
>+            break;
>+        case GL_IMAGE_2D:
>+            typeName = "GL_IMAGE_2D";
>+            break;
>+        case GL_IMAGE_3D:
>+            typeName = "GL_IMAGE_3D";
>+            break;
>+        case GL_IMAGE_CUBE:
>+            typeName = "GL_IMAGE_CUBE";
>+            break;
>+        case GL_IMAGE_2D_ARRAY:
>+            typeName = "GL_IMAGE_2D_ARRAY";
>+            break;
>+
>+        case GL_INT_SAMPLER_2D:
>+            typeName = "GL_INT_SAMPLER_2D";
>+            break;
>+        case GL_INT_SAMPLER_3D:
>+            typeName = "GL_INT_SAMPLER_3D";
>+            break;
>+        case GL_INT_SAMPLER_CUBE:
>+            typeName = "GL_INT_SAMPLER_CUBE";
>+            break;
>+        case GL_INT_SAMPLER_2D_ARRAY:
>+            typeName = "GL_INT_SAMPLER_2D_ARRAY";
>+            break;
>+        case GL_INT_SAMPLER_2D_MULTISAMPLE:
>+            typeName = "GL_INT_SAMPLER_2D_MULTISAMPLE";
>+            break;
>+        case GL_INT_IMAGE_2D:
>+            typeName = "GL_INT_IMAGE_2D";
>+            break;
>+        case GL_INT_IMAGE_3D:
>+            typeName = "GL_INT_IMAGE_3D";
>+            break;
>+        case GL_INT_IMAGE_CUBE:
>+            typeName = "GL_INT_IMAGE_CUBE";
>+            break;
>+        case GL_INT_IMAGE_2D_ARRAY:
>+            typeName = "GL_INT_IMAGE_2D_ARRAY";
>+            break;
>+
>+        case GL_UNSIGNED_INT_SAMPLER_2D:
>+            typeName = "GL_UNSIGNED_INT_SAMPLER_2D";
>+            break;
>+        case GL_UNSIGNED_INT_SAMPLER_3D:
>+            typeName = "GL_UNSIGNED_INT_SAMPLER_3D";
>+            break;
>+        case GL_UNSIGNED_INT_SAMPLER_CUBE:
>+            typeName = "GL_UNSIGNED_INT_SAMPLER_CUBE";
>+            break;
>+        case GL_UNSIGNED_INT_SAMPLER_2D_ARRAY:
>+            typeName = "GL_UNSIGNED_INT_SAMPLER_2D_ARRAY";
>+            break;
>+        case GL_UNSIGNED_INT_ATOMIC_COUNTER:
>+            typeName = "GL_UNSIGNED_INT_ATOMIC_COUNTER";
>+            break;
>+        case GL_UNSIGNED_INT_SAMPLER_2D_MULTISAMPLE:
>+            typeName = "GL_UNSIGNED_INT_SAMPLER_2D_MULTISAMPLE";
>+            break;
>+        case GL_UNSIGNED_INT_IMAGE_2D:
>+            typeName = "GL_UNSIGNED_INT_IMAGE_2D";
>+            break;
>+        case GL_UNSIGNED_INT_IMAGE_3D:
>+            typeName = "GL_UNSIGNED_INT_IMAGE_3D";
>+            break;
>+        case GL_UNSIGNED_INT_IMAGE_CUBE:
>+            typeName = "GL_UNSIGNED_INT_IMAGE_CUBE";
>+            break;
>+        case GL_UNSIGNED_INT_IMAGE_2D_ARRAY:
>+            typeName = "GL_UNSIGNED_INT_IMAGE_2D_ARRAY";
>+            break;
>+
>+        case GL_SAMPLER_EXTERNAL_OES:
>+            typeName = "GL_SAMPLER_EXTERNAL_OES";
>+            break;
>+        case GL_SAMPLER_EXTERNAL_2D_Y2Y_EXT:
>+            typeName = "GL_SAMPLER_EXTERNAL_2D_Y2Y_EXT";
>+            break;
>+        default:
>+            typeName = "UNKNOWN";
>+            break;
>+    }
>+
>+    printf("%s %u : name=%s, mappedName=%s, type=%s, arraySizes=", prefix.c_str(),
>+           static_cast<unsigned int>(index), var.name.c_str(), var.mappedName.c_str(),
>+           typeName.c_str());
>+    for (unsigned int arraySize : var.arraySizes)
>+    {
>+        printf("%u ", arraySize);
>+    }
>+    printf("\n");
>+    if (var.fields.size())
>+    {
>+        std::string structPrefix;
>+        for (size_t i = 0; i < prefix.size(); ++i)
>+            structPrefix += ' ';
>+        printf("%s  struct %s\n", structPrefix.c_str(), var.structName.c_str());
>+        structPrefix += "    field";
>+        for (size_t i = 0; i < var.fields.size(); ++i)
>+            PrintVariable(structPrefix, i, var.fields[i]);
>+    }
>+}
>+
>+static void PrintActiveVariables(ShHandle compiler)
>+{
>+    const std::vector<sh::Uniform> *uniforms       = sh::GetUniforms(compiler);
>+    const std::vector<sh::Varying> *inputVaryings  = sh::GetInputVaryings(compiler);
>+    const std::vector<sh::Varying> *outputVaryings = sh::GetOutputVaryings(compiler);
>+    const std::vector<sh::Attribute> *attributes   = sh::GetAttributes(compiler);
>+    const std::vector<sh::OutputVariable> *outputs = sh::GetOutputVariables(compiler);
>+    for (size_t varCategory = 0; varCategory < 5; ++varCategory)
>+    {
>+        size_t numVars = 0;
>+        std::string varCategoryName;
>+        if (varCategory == 0)
>+        {
>+            numVars         = uniforms->size();
>+            varCategoryName = "uniform";
>+        }
>+        else if (varCategory == 1)
>+        {
>+            numVars         = inputVaryings->size();
>+            varCategoryName = "input varying";
>+        }
>+        else if (varCategory == 2)
>+        {
>+            numVars         = outputVaryings->size();
>+            varCategoryName = "output varying";
>+        }
>+        else if (varCategory == 3)
>+        {
>+            numVars         = attributes->size();
>+            varCategoryName = "attribute";
>+        }
>+        else
>+        {
>+            numVars         = outputs->size();
>+            varCategoryName = "output";
>+        }
>+
>+        for (size_t i = 0; i < numVars; ++i)
>+        {
>+            const sh::ShaderVariable *var;
>+            if (varCategory == 0)
>+                var = &((*uniforms)[i]);
>+            else if (varCategory == 1)
>+                var = &((*inputVaryings)[i]);
>+            else if (varCategory == 2)
>+                var = &((*outputVaryings)[i]);
>+            else if (varCategory == 3)
>+                var = &((*attributes)[i]);
>+            else
>+                var = &((*outputs)[i]);
>+
>+            PrintVariable(varCategoryName, i, *var);
>+        }
>+        printf("\n");
>+    }
>+}
>+
>+static bool ReadShaderSource(const char *fileName, ShaderSource &source)
>+{
>+    FILE *in = fopen(fileName, "rb");
>+    if (!in)
>+    {
>+        printf("Error: unable to open input file: %s\n", fileName);
>+        return false;
>+    }
>+
>+    // Obtain file size.
>+    fseek(in, 0, SEEK_END);
>+    size_t count = ftell(in);
>+    rewind(in);
>+
>+    int len = (int)ceil((float)count / (float)NUM_SOURCE_STRINGS);
>+    source.reserve(NUM_SOURCE_STRINGS);
>+    // Notice the usage of do-while instead of a while loop here.
>+    // It is there to handle empty files in which case a single empty
>+    // string is added to vector.
>+    do
>+    {
>+        char *data   = new char[len + 1];
>+        size_t nread = fread(data, 1, len, in);
>+        data[nread]  = '\0';
>+        source.push_back(data);
>+
>+        count -= nread;
>+    } while (count > 0);
>+
>+    fclose(in);
>+    return true;
>+}
>+
>+static void FreeShaderSource(ShaderSource &source)
>+{
>+    for (ShaderSource::size_type i = 0; i < source.size(); ++i)
>+    {
>+        delete[] source[i];
>+    }
>+    source.clear();
>+}
>+
>+static bool ParseGLSLOutputVersion(const std::string &num, ShShaderOutput *outResult)
>+{
>+    if (num.length() == 0)
>+    {
>+        *outResult = SH_GLSL_COMPATIBILITY_OUTPUT;
>+        return true;
>+    }
>+    std::istringstream input(num);
>+    int value;
>+    if (!(input >> value && input.eof()))
>+    {
>+        return false;
>+    }
>+
>+    switch (value)
>+    {
>+        case 130:
>+            *outResult = SH_GLSL_130_OUTPUT;
>+            return true;
>+        case 140:
>+            *outResult = SH_GLSL_140_OUTPUT;
>+            return true;
>+        case 150:
>+            *outResult = SH_GLSL_150_CORE_OUTPUT;
>+            return true;
>+        case 330:
>+            *outResult = SH_GLSL_330_CORE_OUTPUT;
>+            return true;
>+        case 400:
>+            *outResult = SH_GLSL_400_CORE_OUTPUT;
>+            return true;
>+        case 410:
>+            *outResult = SH_GLSL_410_CORE_OUTPUT;
>+            return true;
>+        case 420:
>+            *outResult = SH_GLSL_420_CORE_OUTPUT;
>+            return true;
>+        case 430:
>+            *outResult = SH_GLSL_430_CORE_OUTPUT;
>+            return true;
>+        case 440:
>+            *outResult = SH_GLSL_440_CORE_OUTPUT;
>+            return true;
>+        case 450:
>+            *outResult = SH_GLSL_450_CORE_OUTPUT;
>+            return true;
>+        default:
>+            break;
>+    }
>+    return false;
>+}
>+
>+static bool ParseIntValue(const std::string &num, int emptyDefault, int *outValue)
>+{
>+    if (num.length() == 0)
>+    {
>+        *outValue = emptyDefault;
>+        return true;
>+    }
>+
>+    std::istringstream input(num);
>+    int value;
>+    if (!(input >> value && input.eof()))
>+    {
>+        return false;
>+    }
>+    *outValue = value;
>+    return true;
>+}
>diff --git a/Source/ThirdParty/ANGLE/samples/simple_instancing/SimpleInstancing.cpp b/Source/ThirdParty/ANGLE/samples/simple_instancing/SimpleInstancing.cpp
>new file mode 100644
>index 00000000000..847acc6c6a9
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/samples/simple_instancing/SimpleInstancing.cpp
>@@ -0,0 +1,203 @@
>+//
>+// Copyright (c) 2014 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+
>+//            Based on Simple_Texture2D.c from
>+// Book:      OpenGL(R) ES 2.0 Programming Guide
>+// Authors:   Aaftab Munshi, Dan Ginsburg, Dave Shreiner
>+// ISBN-10:   0321502795
>+// ISBN-13:   9780321502797
>+// Publisher: Addison-Wesley Professional
>+// URLs:      http://safari.informit.com/9780321563835
>+//            http://www.opengles-book.com
>+
>+#include "SampleApplication.h"
>+
>+#include "common/vector_utils.h"
>+#include "texture_utils.h"
>+#include "util/shader_utils.h"
>+
>+#include <cstring>
>+#include <iostream>
>+#include <vector>
>+
>+using namespace angle;
>+
>+class SimpleInstancingSample : public SampleApplication
>+{
>+  public:
>+    SimpleInstancingSample(int argc, char **argv)
>+        : SampleApplication("SimpleInstancing", argc, argv)
>+    {}
>+
>+    bool initialize() override
>+    {
>+        // init instancing functions
>+        char *extensionString = (char *)glGetString(GL_EXTENSIONS);
>+        if (strstr(extensionString, "GL_ANGLE_instanced_arrays"))
>+        {
>+            mVertexAttribDivisorANGLE =
>+                (PFNGLVERTEXATTRIBDIVISORANGLEPROC)eglGetProcAddress("glVertexAttribDivisorANGLE");
>+            mDrawArraysInstancedANGLE =
>+                (PFNGLDRAWARRAYSINSTANCEDANGLEPROC)eglGetProcAddress("glDrawArraysInstancedANGLE");
>+            mDrawElementsInstancedANGLE = (PFNGLDRAWELEMENTSINSTANCEDANGLEPROC)eglGetProcAddress(
>+                "glDrawElementsInstancedANGLE");
>+        }
>+
>+        if (!mVertexAttribDivisorANGLE || !mDrawArraysInstancedANGLE ||
>+            !mDrawElementsInstancedANGLE)
>+        {
>+            std::cerr << "Unable to load GL_ANGLE_instanced_arrays entry points.";
>+            return false;
>+        }
>+
>+        constexpr char kVS[] = R"(attribute vec3 a_position;
>+attribute vec2 a_texCoord;
>+attribute vec3 a_instancePos;
>+varying vec2 v_texCoord;
>+void main()
>+{
>+    gl_Position = vec4(a_position.xyz + a_instancePos.xyz, 1.0);
>+    v_texCoord = a_texCoord;
>+})";
>+
>+        constexpr char kFS[] = R"(precision mediump float;
>+varying vec2 v_texCoord;
>+uniform sampler2D s_texture;
>+void main()
>+{
>+    gl_FragColor = texture2D(s_texture, v_texCoord);
>+})";
>+
>+        mProgram = CompileProgram(kVS, kFS);
>+        if (!mProgram)
>+        {
>+            return false;
>+        }
>+
>+        // Get the attribute locations
>+        mPositionLoc    = glGetAttribLocation(mProgram, "a_position");
>+        mTexCoordLoc    = glGetAttribLocation(mProgram, "a_texCoord");
>+        mInstancePosLoc = glGetAttribLocation(mProgram, "a_instancePos");
>+
>+        // Get the sampler location
>+        mSamplerLoc = glGetUniformLocation(mProgram, "s_texture");
>+
>+        // Load the texture
>+        mTextureID = CreateSimpleTexture2D();
>+
>+        // Initialize the vertex and index vectors
>+        const GLfloat quadRadius = 0.01f;
>+
>+        mVertices.push_back(Vector3(-quadRadius, quadRadius, 0.0f));
>+        mVertices.push_back(Vector3(-quadRadius, -quadRadius, 0.0f));
>+        mVertices.push_back(Vector3(quadRadius, -quadRadius, 0.0f));
>+        mVertices.push_back(Vector3(quadRadius, quadRadius, 0.0f));
>+
>+        mTexcoords.push_back(Vector2(0.0f, 0.0f));
>+        mTexcoords.push_back(Vector2(0.0f, 1.0f));
>+        mTexcoords.push_back(Vector2(1.0f, 1.0f));
>+        mTexcoords.push_back(Vector2(1.0f, 0.0f));
>+
>+        mIndices.push_back(0);
>+        mIndices.push_back(1);
>+        mIndices.push_back(2);
>+        mIndices.push_back(0);
>+        mIndices.push_back(2);
>+        mIndices.push_back(3);
>+
>+        // Tile thousands of quad instances
>+        for (float y = -1.0f + quadRadius; y < 1.0f - quadRadius; y += quadRadius * 3)
>+        {
>+            for (float x = -1.0f + quadRadius; x < 1.0f - quadRadius; x += quadRadius * 3)
>+            {
>+                mInstances.push_back(Vector3(x, y, 0.0f));
>+            }
>+        }
>+
>+        glClearColor(0.0f, 0.0f, 0.0f, 0.0f);
>+
>+        return true;
>+    }
>+
>+    void destroy() override
>+    {
>+        glDeleteProgram(mProgram);
>+        glDeleteTextures(1, &mTextureID);
>+    }
>+
>+    void draw() override
>+    {
>+        // Set the viewport
>+        glViewport(0, 0, getWindow()->getWidth(), getWindow()->getHeight());
>+
>+        // Clear the color buffer
>+        glClear(GL_COLOR_BUFFER_BIT);
>+
>+        // Use the program object
>+        glUseProgram(mProgram);
>+
>+        // Load the vertex position
>+        glVertexAttribPointer(mPositionLoc, 3, GL_FLOAT, GL_FALSE, 0, mVertices.data());
>+        glEnableVertexAttribArray(mPositionLoc);
>+
>+        // Load the texture coordinate
>+        glVertexAttribPointer(mTexCoordLoc, 2, GL_FLOAT, GL_FALSE, 0, mTexcoords.data());
>+        glEnableVertexAttribArray(mTexCoordLoc);
>+
>+        // Load the instance position
>+        glVertexAttribPointer(mInstancePosLoc, 3, GL_FLOAT, GL_FALSE, 0, mInstances.data());
>+        glEnableVertexAttribArray(mInstancePosLoc);
>+
>+        // Enable instancing
>+        mVertexAttribDivisorANGLE(mInstancePosLoc, 1);
>+
>+        // Bind the texture
>+        glActiveTexture(GL_TEXTURE0);
>+        glBindTexture(GL_TEXTURE_2D, mTextureID);
>+
>+        // Set the sampler texture unit to 0
>+        glUniform1i(mSamplerLoc, 0);
>+
>+        // Do the instanced draw
>+        mDrawElementsInstancedANGLE(GL_TRIANGLES, static_cast<GLsizei>(mIndices.size()),
>+                                    GL_UNSIGNED_SHORT, mIndices.data(),
>+                                    static_cast<GLsizei>(mInstances.size()));
>+    }
>+
>+  private:
>+    // Handle to a program object
>+    GLuint mProgram;
>+
>+    // Attribute locations
>+    GLint mPositionLoc;
>+    GLint mTexCoordLoc;
>+
>+    // Sampler location
>+    GLint mSamplerLoc;
>+
>+    // Texture handle
>+    GLuint mTextureID;
>+
>+    // Instance VBO
>+    GLint mInstancePosLoc;
>+
>+    // Loaded entry points
>+    PFNGLVERTEXATTRIBDIVISORANGLEPROC mVertexAttribDivisorANGLE;
>+    PFNGLDRAWARRAYSINSTANCEDANGLEPROC mDrawArraysInstancedANGLE;
>+    PFNGLDRAWELEMENTSINSTANCEDANGLEPROC mDrawElementsInstancedANGLE;
>+
>+    // Vertex data
>+    std::vector<Vector3> mVertices;
>+    std::vector<Vector2> mTexcoords;
>+    std::vector<Vector3> mInstances;
>+    std::vector<GLushort> mIndices;
>+};
>+
>+int main(int argc, char **argv)
>+{
>+    SimpleInstancingSample app(argc, argv);
>+    return app.run();
>+}
>diff --git a/Source/ThirdParty/ANGLE/samples/simple_texture_2d/SimpleTexture2D.cpp b/Source/ThirdParty/ANGLE/samples/simple_texture_2d/SimpleTexture2D.cpp
>new file mode 100644
>index 00000000000..93da4a31f67
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/samples/simple_texture_2d/SimpleTexture2D.cpp
>@@ -0,0 +1,134 @@
>+//
>+// Copyright (c) 2014 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+
>+//            Based on Simple_Texture2D.c from
>+// Book:      OpenGL(R) ES 2.0 Programming Guide
>+// Authors:   Aaftab Munshi, Dan Ginsburg, Dave Shreiner
>+// ISBN-10:   0321502795
>+// ISBN-13:   9780321502797
>+// Publisher: Addison-Wesley Professional
>+// URLs:      http://safari.informit.com/9780321563835
>+//            http://www.opengles-book.com
>+
>+#include "SampleApplication.h"
>+
>+#include "texture_utils.h"
>+#include "util/shader_utils.h"
>+
>+class SimpleTexture2DSample : public SampleApplication
>+{
>+  public:
>+    SimpleTexture2DSample(int argc, char **argv) : SampleApplication("SimpleTexture2D", argc, argv)
>+    {}
>+
>+    bool initialize() override
>+    {
>+        constexpr char kVS[] = R"(attribute vec4 a_position;
>+attribute vec2 a_texCoord;
>+varying vec2 v_texCoord;
>+void main()
>+{
>+    gl_Position = a_position;
>+    v_texCoord = a_texCoord;
>+})";
>+
>+        constexpr char kFS[] = R"(precision mediump float;
>+varying vec2 v_texCoord;
>+uniform sampler2D s_texture;
>+void main()
>+{
>+    gl_FragColor = texture2D(s_texture, v_texCoord);
>+})";
>+
>+        mProgram = CompileProgram(kVS, kFS);
>+        if (!mProgram)
>+        {
>+            return false;
>+        }
>+
>+        // Get the attribute locations
>+        mPositionLoc = glGetAttribLocation(mProgram, "a_position");
>+        mTexCoordLoc = glGetAttribLocation(mProgram, "a_texCoord");
>+
>+        // Get the sampler location
>+        mSamplerLoc = glGetUniformLocation(mProgram, "s_texture");
>+
>+        // Load the texture
>+        mTexture = CreateSimpleTexture2D();
>+
>+        glClearColor(0.0f, 0.0f, 0.0f, 0.0f);
>+
>+        return true;
>+    }
>+
>+    void destroy() override
>+    {
>+        glDeleteProgram(mProgram);
>+        glDeleteTextures(1, &mTexture);
>+    }
>+
>+    void draw() override
>+    {
>+        GLfloat vertices[] = {
>+            -0.5f, 0.5f,  0.0f,  // Position 0
>+            0.0f,  0.0f,         // TexCoord 0
>+            -0.5f, -0.5f, 0.0f,  // Position 1
>+            0.0f,  1.0f,         // TexCoord 1
>+            0.5f,  -0.5f, 0.0f,  // Position 2
>+            1.0f,  1.0f,         // TexCoord 2
>+            0.5f,  0.5f,  0.0f,  // Position 3
>+            1.0f,  0.0f          // TexCoord 3
>+        };
>+        GLushort indices[] = {0, 1, 2, 0, 2, 3};
>+
>+        // Set the viewport
>+        glViewport(0, 0, getWindow()->getWidth(), getWindow()->getHeight());
>+
>+        // Clear the color buffer
>+        glClear(GL_COLOR_BUFFER_BIT);
>+
>+        // Use the program object
>+        glUseProgram(mProgram);
>+
>+        // Load the vertex position
>+        glVertexAttribPointer(mPositionLoc, 3, GL_FLOAT, GL_FALSE, 5 * sizeof(GLfloat), vertices);
>+        // Load the texture coordinate
>+        glVertexAttribPointer(mTexCoordLoc, 2, GL_FLOAT, GL_FALSE, 5 * sizeof(GLfloat),
>+                              vertices + 3);
>+
>+        glEnableVertexAttribArray(mPositionLoc);
>+        glEnableVertexAttribArray(mTexCoordLoc);
>+
>+        // Bind the texture
>+        glActiveTexture(GL_TEXTURE0);
>+        glBindTexture(GL_TEXTURE_2D, mTexture);
>+
>+        // Set the texture sampler to texture unit to 0
>+        glUniform1i(mSamplerLoc, 0);
>+
>+        glDrawElements(GL_TRIANGLES, 6, GL_UNSIGNED_SHORT, indices);
>+    }
>+
>+  private:
>+    // Handle to a program object
>+    GLuint mProgram;
>+
>+    // Attribute locations
>+    GLint mPositionLoc;
>+    GLint mTexCoordLoc;
>+
>+    // Sampler location
>+    GLint mSamplerLoc;
>+
>+    // Texture handle
>+    GLuint mTexture;
>+};
>+
>+int main(int argc, char **argv)
>+{
>+    SimpleTexture2DSample app(argc, argv);
>+    return app.run();
>+}
>diff --git a/Source/ThirdParty/ANGLE/samples/simple_texture_cubemap/SimpleTextureCubemap.cpp b/Source/ThirdParty/ANGLE/samples/simple_texture_cubemap/SimpleTextureCubemap.cpp
>new file mode 100644
>index 00000000000..c3f4437afc2
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/samples/simple_texture_cubemap/SimpleTextureCubemap.cpp
>@@ -0,0 +1,132 @@
>+//
>+// Copyright (c) 2014 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+
>+//            Based on Simple_TextureCubemap.c from
>+// Book:      OpenGL(R) ES 2.0 Programming Guide
>+// Authors:   Aaftab Munshi, Dan Ginsburg, Dave Shreiner
>+// ISBN-10:   0321502795
>+// ISBN-13:   9780321502797
>+// Publisher: Addison-Wesley Professional
>+// URLs:      http://safari.informit.com/9780321563835
>+//            http://www.opengles-book.com
>+
>+#include "SampleApplication.h"
>+
>+#include "texture_utils.h"
>+#include "util/geometry_utils.h"
>+#include "util/shader_utils.h"
>+
>+class SimpleTextureCubemapSample : public SampleApplication
>+{
>+  public:
>+    SimpleTextureCubemapSample(int argc, char **argv)
>+        : SampleApplication("SimpleTextureCubemap", argc, argv)
>+    {}
>+
>+    bool initialize() override
>+    {
>+        constexpr char kVS[] = R"(attribute vec4 a_position;
>+attribute vec3 a_normal;
>+varying vec3 v_normal;
>+void main()
>+{
>+    gl_Position = a_position;
>+    v_normal = a_normal;
>+})";
>+
>+        constexpr char kFS[] = R"(precision mediump float;
>+varying vec3 v_normal;
>+uniform samplerCube s_texture;
>+void main()
>+{
>+    gl_FragColor = textureCube(s_texture, v_normal);
>+})";
>+
>+        mProgram = CompileProgram(kVS, kFS);
>+        if (!mProgram)
>+        {
>+            return false;
>+        }
>+
>+        // Get the attribute locations
>+        mPositionLoc = glGetAttribLocation(mProgram, "a_position");
>+        mNormalLoc   = glGetAttribLocation(mProgram, "a_normal");
>+
>+        // Get the sampler locations
>+        mSamplerLoc = glGetUniformLocation(mProgram, "s_texture");
>+
>+        // Load the texture
>+        mTexture = CreateSimpleTextureCubemap();
>+
>+        // Generate the geometry data
>+        CreateSphereGeometry(128, 0.75f, &mSphere);
>+
>+        glClearColor(0.0f, 0.0f, 0.0f, 0.0f);
>+        glCullFace(GL_BACK);
>+        glEnable(GL_CULL_FACE);
>+
>+        return true;
>+    }
>+
>+    void destroy() override
>+    {
>+        glDeleteProgram(mProgram);
>+        glDeleteTextures(1, &mTexture);
>+    }
>+
>+    void draw() override
>+    {
>+        // Set the viewport
>+        glViewport(0, 0, getWindow()->getWidth(), getWindow()->getHeight());
>+
>+        // Clear the color buffer
>+        glClear(GL_COLOR_BUFFER_BIT);
>+
>+        // Use the program object
>+        glUseProgram(mProgram);
>+
>+        // Load the vertex position
>+        glVertexAttribPointer(mPositionLoc, 3, GL_FLOAT, GL_FALSE, 0, mSphere.positions.data());
>+        glEnableVertexAttribArray(mPositionLoc);
>+
>+        // Load the normal
>+        glVertexAttribPointer(mNormalLoc, 3, GL_FLOAT, GL_FALSE, 0, mSphere.normals.data());
>+        glEnableVertexAttribArray(mNormalLoc);
>+
>+        // Bind the texture
>+        glActiveTexture(GL_TEXTURE0);
>+        glBindTexture(GL_TEXTURE_CUBE_MAP, mTexture);
>+
>+        // Set the texture sampler to texture unit to 0
>+        glUniform1i(mSamplerLoc, 0);
>+
>+        glDrawElements(GL_TRIANGLES, static_cast<GLsizei>(mSphere.indices.size()),
>+                       GL_UNSIGNED_SHORT, mSphere.indices.data());
>+    }
>+
>+  private:
>+    // Handle to a program object
>+    GLuint mProgram;
>+
>+    // Attribute locations
>+    GLint mPositionLoc;
>+    GLint mNormalLoc;
>+
>+    // Sampler location
>+    GLint mSamplerLoc;
>+
>+    // Texture handle
>+    GLuint mTexture;
>+
>+    // Geometry data
>+    SphereGeometry mSphere;
>+};
>+
>+int main(int argc, char **argv)
>+{
>+    SimpleTextureCubemapSample app(argc, argv);
>+    return app.run();
>+}
>diff --git a/Source/ThirdParty/ANGLE/samples/simple_vertex_shader/SimpleVertexShader.cpp b/Source/ThirdParty/ANGLE/samples/simple_vertex_shader/SimpleVertexShader.cpp
>new file mode 100644
>index 00000000000..8ef35d3b131
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/samples/simple_vertex_shader/SimpleVertexShader.cpp
>@@ -0,0 +1,143 @@
>+//
>+// Copyright (c) 2014 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+
>+//            Based on Simple_VertexShader.c from
>+// Book:      OpenGL(R) ES 2.0 Programming Guide
>+// Authors:   Aaftab Munshi, Dan Ginsburg, Dave Shreiner
>+// ISBN-10:   0321502795
>+// ISBN-13:   9780321502797
>+// Publisher: Addison-Wesley Professional
>+// URLs:      http://safari.informit.com/9780321563835
>+//            http://www.opengles-book.com
>+
>+#include "SampleApplication.h"
>+
>+#include "texture_utils.h"
>+#include "util/Matrix.h"
>+#include "util/geometry_utils.h"
>+#include "util/shader_utils.h"
>+
>+#include <cmath>
>+
>+class SimpleVertexShaderSample : public SampleApplication
>+{
>+  public:
>+    SimpleVertexShaderSample(int argc, char **argv)
>+        : SampleApplication("SimpleVertexShader", argc, argv)
>+    {}
>+
>+    bool initialize() override
>+    {
>+        constexpr char kVS[] = R"(uniform mat4 u_mvpMatrix;
>+attribute vec4 a_position;
>+attribute vec2 a_texcoord;
>+varying vec2 v_texcoord;
>+void main()
>+{
>+    gl_Position = u_mvpMatrix * a_position;
>+    v_texcoord = a_texcoord;
>+})";
>+
>+        constexpr char kFS[] = R"(precision mediump float;
>+varying vec2 v_texcoord;
>+void main()
>+{
>+    gl_FragColor = vec4(v_texcoord.x, v_texcoord.y, 1.0, 1.0);
>+})";
>+
>+        mProgram = CompileProgram(kVS, kFS);
>+        if (!mProgram)
>+        {
>+            return false;
>+        }
>+
>+        // Get the attribute locations
>+        mPositionLoc = glGetAttribLocation(mProgram, "a_position");
>+        mTexcoordLoc = glGetAttribLocation(mProgram, "a_texcoord");
>+
>+        // Get the uniform locations
>+        mMVPMatrixLoc = glGetUniformLocation(mProgram, "u_mvpMatrix");
>+
>+        // Generate the geometry data
>+        GenerateCubeGeometry(0.5f, &mCube);
>+
>+        // Set an initial rotation
>+        mRotation = 45.0f;
>+
>+        glClearColor(0.0f, 0.0f, 0.0f, 0.0f);
>+        glCullFace(GL_BACK);
>+        glEnable(GL_CULL_FACE);
>+
>+        return true;
>+    }
>+
>+    void destroy() override { glDeleteProgram(mProgram); }
>+
>+    void step(float dt, double totalTime) override
>+    {
>+        mRotation = fmod(mRotation + (dt * 40.0f), 360.0f);
>+
>+        Matrix4 perspectiveMatrix = Matrix4::perspective(
>+            60.0f, float(getWindow()->getWidth()) / getWindow()->getHeight(), 1.0f, 20.0f);
>+
>+        Matrix4 modelMatrix = Matrix4::translate(angle::Vector3(0.0f, 0.0f, -2.0f)) *
>+                              Matrix4::rotate(mRotation, angle::Vector3(1.0f, 0.0f, 1.0f));
>+
>+        Matrix4 viewMatrix = Matrix4::identity();
>+
>+        Matrix4 mvpMatrix = perspectiveMatrix * viewMatrix * modelMatrix;
>+
>+        // Load the matrices
>+        glUniformMatrix4fv(mMVPMatrixLoc, 1, GL_FALSE, mvpMatrix.data);
>+    }
>+
>+    void draw() override
>+    {
>+        // Set the viewport
>+        glViewport(0, 0, getWindow()->getWidth(), getWindow()->getHeight());
>+
>+        // Clear the color buffer
>+        glClear(GL_COLOR_BUFFER_BIT);
>+
>+        // Use the program object
>+        glUseProgram(mProgram);
>+
>+        // Load the vertex position
>+        glVertexAttribPointer(mPositionLoc, 3, GL_FLOAT, GL_FALSE, 0, mCube.positions.data());
>+        glEnableVertexAttribArray(mPositionLoc);
>+
>+        // Load the texcoord data
>+        glVertexAttribPointer(mTexcoordLoc, 2, GL_FLOAT, GL_FALSE, 0, mCube.texcoords.data());
>+        glEnableVertexAttribArray(mTexcoordLoc);
>+
>+        // Draw the cube
>+        glDrawElements(GL_TRIANGLES, static_cast<GLsizei>(mCube.indices.size()), GL_UNSIGNED_SHORT,
>+                       mCube.indices.data());
>+    }
>+
>+  private:
>+    // Handle to a program object
>+    GLuint mProgram;
>+
>+    // Attribute locations
>+    GLint mPositionLoc;
>+    GLint mTexcoordLoc;
>+
>+    // Uniform locations
>+    GLuint mMVPMatrixLoc;
>+
>+    // Current rotation
>+    float mRotation;
>+
>+    // Geometry data
>+    CubeGeometry mCube;
>+};
>+
>+int main(int argc, char **argv)
>+{
>+    SimpleVertexShaderSample app(argc, argv);
>+    return app.run();
>+}
>diff --git a/Source/ThirdParty/ANGLE/samples/stencil_operations/StencilOperations.cpp b/Source/ThirdParty/ANGLE/samples/stencil_operations/StencilOperations.cpp
>new file mode 100644
>index 00000000000..0099a0ac1a5
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/samples/stencil_operations/StencilOperations.cpp
>@@ -0,0 +1,219 @@
>+//
>+// Copyright (c) 2014 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+
>+//            Based on Stencil_Test.c from
>+// Book:      OpenGL(R) ES 2.0 Programming Guide
>+// Authors:   Aaftab Munshi, Dan Ginsburg, Dave Shreiner
>+// ISBN-10:   0321502795
>+// ISBN-13:   9780321502797
>+// Publisher: Addison-Wesley Professional
>+// URLs:      http://safari.informit.com/9780321563835
>+//            http://www.opengles-book.com
>+
>+#include "SampleApplication.h"
>+
>+#include "util/shader_utils.h"
>+
>+class StencilOperationsSample : public SampleApplication
>+{
>+  public:
>+    StencilOperationsSample(int argc, char **argv)
>+        : SampleApplication("StencilOperations", argc, argv)
>+    {}
>+
>+    bool initialize() override
>+    {
>+        constexpr char kVS[] = R"(attribute vec4 a_position;
>+void main()
>+{
>+    gl_Position = a_position;
>+})";
>+
>+        constexpr char kFS[] = R"(precision mediump float;
>+uniform vec4 u_color;
>+void main()
>+{
>+    gl_FragColor = u_color;
>+})";
>+
>+        mProgram = CompileProgram(kVS, kFS);
>+        if (!mProgram)
>+        {
>+            return false;
>+        }
>+
>+        // Get the attribute locations
>+        mPositionLoc = glGetAttribLocation(mProgram, "a_position");
>+
>+        // Get the sampler location
>+        mColorLoc = glGetUniformLocation(mProgram, "u_color");
>+
>+        // Set the clear color
>+        glClearColor(0.0f, 0.0f, 0.0f, 0.0f);
>+
>+        // Set the stencil clear value
>+        glClearStencil(0x01);
>+
>+        // Set the depth clear value
>+        glClearDepthf(0.75f);
>+
>+        // Enable the depth and stencil tests
>+        glEnable(GL_DEPTH_TEST);
>+        glEnable(GL_STENCIL_TEST);
>+
>+        return true;
>+    }
>+
>+    void destroy() override { glDeleteProgram(mProgram); }
>+
>+    void draw() override
>+    {
>+        GLfloat vertices[] = {
>+            -0.75f, 0.25f,  0.50f,  // Quad #0
>+            -0.25f, 0.25f,  0.50f, -0.25f, 0.75f,  0.50f, -0.75f, 0.75f,  0.50f,
>+            0.25f,  0.25f,  0.90f,  // Quad #1
>+            0.75f,  0.25f,  0.90f, 0.75f,  0.75f,  0.90f, 0.25f,  0.75f,  0.90f,
>+            -0.75f, -0.75f, 0.50f,  // Quad #2
>+            -0.25f, -0.75f, 0.50f, -0.25f, -0.25f, 0.50f, -0.75f, -0.25f, 0.50f,
>+            0.25f,  -0.75f, 0.50f,  // Quad #3
>+            0.75f,  -0.75f, 0.50f, 0.75f,  -0.25f, 0.50f, 0.25f,  -0.25f, 0.50f,
>+            -1.00f, -1.00f, 0.00f,  // Big Quad
>+            1.00f,  -1.00f, 0.00f, 1.00f,  1.00f,  0.00f, -1.00f, 1.00f,  0.00f,
>+        };
>+
>+        GLubyte indices[][6] = {
>+            {0, 1, 2, 0, 2, 3},        // Quad #0
>+            {4, 5, 6, 4, 6, 7},        // Quad #1
>+            {8, 9, 10, 8, 10, 11},     // Quad #2
>+            {12, 13, 14, 12, 14, 15},  // Quad #3
>+            {16, 17, 18, 16, 18, 19},  // Big Quad
>+        };
>+
>+        static const size_t testCount = 4;
>+        GLfloat colors[testCount][4]  = {
>+            {1.0f, 0.0f, 0.0f, 1.0f},
>+            {0.0f, 1.0f, 0.0f, 1.0f},
>+            {0.0f, 0.0f, 1.0f, 1.0f},
>+            {1.0f, 1.0f, 0.0f, 0.0f},
>+        };
>+
>+        GLuint stencilValues[testCount] = {
>+            0x7,  // Result of test 0
>+            0x0,  // Result of test 1
>+            0x2,  // Result of test 2
>+            0xff  // Result of test 3.  We need to fill this value in at run-time
>+        };
>+
>+        // Set the viewport
>+        glViewport(0, 0, getWindow()->getWidth(), getWindow()->getHeight());
>+
>+        // Clear the color, depth, and stencil buffers.  At this point, the stencil
>+        // buffer will be 0x1 for all pixels
>+        glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT);
>+
>+        // Use the program object
>+        glUseProgram(mProgram);
>+
>+        // Load the vertex data
>+        glVertexAttribPointer(mPositionLoc, 3, GL_FLOAT, GL_FALSE, 0, vertices);
>+        glEnableVertexAttribArray(mPositionLoc);
>+
>+        // Test 0:
>+        //
>+        // Initialize upper-left region.  In this case, the stencil-buffer values will
>+        // be replaced because the stencil test for the rendered pixels will fail the
>+        // stencil test, which is
>+        //
>+        //      ref   mask   stencil  mask
>+        //    ( 0x7 & 0x3 ) < ( 0x1 & 0x7 )
>+        //
>+        // The value in the stencil buffer for these pixels will be 0x7.
>+        glStencilFunc(GL_LESS, 0x7, 0x3);
>+        glStencilOp(GL_REPLACE, GL_DECR, GL_DECR);
>+        glDrawElements(GL_TRIANGLES, 6, GL_UNSIGNED_BYTE, indices[0]);
>+
>+        // Test 1:
>+        //
>+        // Initialize the upper-right region. Here, we'll decrement the stencil-buffer
>+        // values where the stencil test passes but the depth test fails. The stencil test is
>+        //
>+        //      ref  mask    stencil  mask
>+        //    ( 0x3 & 0x3 ) > ( 0x1 & 0x3 )
>+        //
>+        // but where the geometry fails the depth test. The stencil values for these pixels
>+        // will be 0x0.
>+        glStencilFunc(GL_GREATER, 0x3, 0x3);
>+        glStencilOp(GL_KEEP, GL_DECR, GL_KEEP);
>+        glDrawElements(GL_TRIANGLES, 6, GL_UNSIGNED_BYTE, indices[1]);
>+
>+        // Test 2:
>+        //
>+        // Initialize the lower-left region.  Here we'll increment (with saturation) the
>+        // stencil value where both the stencil and depth tests pass.  The stencil test for
>+        // these pixels will be
>+        //
>+        //      ref  mask     stencil  mask
>+        //    ( 0x1 & 0x3 ) == ( 0x1 & 0x3 )
>+        //
>+        // The stencil values for these pixels will be 0x2.
>+        glStencilFunc(GL_EQUAL, 0x1, 0x3);
>+        glStencilOp(GL_KEEP, GL_INCR, GL_INCR);
>+        glDrawElements(GL_TRIANGLES, 6, GL_UNSIGNED_BYTE, indices[2]);
>+
>+        // Test 3:
>+        //
>+        // Finally, initialize the lower-right region.  We'll invert the stencil value
>+        // where the stencil tests fails. The stencil test for these pixels will be
>+        //
>+        //      ref   mask    stencil  mask
>+        //    ( 0x2 & 0x1 ) == ( 0x1 & 0x1 )
>+        //
>+        // The stencil value here will be set to ~((2^s-1) & 0x1), (with the 0x1 being
>+        // from the stencil clear value), where 's' is the number of bits in the stencil
>+        // buffer
>+        glStencilFunc(GL_EQUAL, 0x2, 0x1);
>+        glStencilOp(GL_INVERT, GL_KEEP, GL_KEEP);
>+        glDrawElements(GL_TRIANGLES, 6, GL_UNSIGNED_BYTE, indices[3]);
>+
>+        // Since we don't know at compile time how many stencil bits are present, we'll
>+        // query, and update the value correct value in the  stencilValues arrays for the
>+        // fourth tests. We'll use this value later in rendering.
>+        GLint stencilBitCount = 0;
>+        glGetIntegerv(GL_STENCIL_BITS, &stencilBitCount);
>+        stencilValues[3] = ~(((1 << stencilBitCount) - 1) & 0x1) & 0xff;
>+
>+        // Use the stencil buffer for controlling where rendering will occur.  We disable
>+        // writing to the stencil buffer so we can test against them without modifying
>+        // the values we generated.
>+        glStencilMask(0x0);
>+
>+        for (size_t i = 0; i < testCount; ++i)
>+        {
>+            glStencilFunc(GL_EQUAL, stencilValues[i], 0xff);
>+            glUniform4fv(mColorLoc, 1, colors[i]);
>+            glDrawElements(GL_TRIANGLES, 6, GL_UNSIGNED_BYTE, indices[4]);
>+        }
>+
>+        // Reset the stencil mask
>+        glStencilMask(0xFF);
>+    }
>+
>+  private:
>+    // Handle to a program object
>+    GLuint mProgram;
>+
>+    // Attribute locations
>+    GLint mPositionLoc;
>+
>+    // Uniform locations
>+    GLint mColorLoc;
>+};
>+
>+int main(int argc, char **argv)
>+{
>+    StencilOperationsSample app(argc, argv);
>+    return app.run();
>+}
>diff --git a/Source/ThirdParty/ANGLE/samples/tex_redef_microbench/TexRedefMicroBench.cpp b/Source/ThirdParty/ANGLE/samples/tex_redef_microbench/TexRedefMicroBench.cpp
>new file mode 100644
>index 00000000000..52299a727fd
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/samples/tex_redef_microbench/TexRedefMicroBench.cpp
>@@ -0,0 +1,285 @@
>+//
>+// Copyright (c) 2014 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+
>+//            Based on Hello_Triangle.c from
>+// Book:      OpenGL(R) ES 2.0 Programming Guide
>+// Authors:   Aaftab Munshi, Dan Ginsburg, Dave Shreiner
>+// ISBN-10:   0321502795
>+// ISBN-13:   9780321502797
>+// Publisher: Addison-Wesley Professional
>+// URLs:      http://safari.informit.com/9780321563835
>+//            http://www.opengles-book.com
>+
>+#include "SampleApplication.h"
>+
>+#include "texture_utils.h"
>+#include "util/shader_utils.h"
>+
>+#include <cstring>
>+#include <iostream>
>+
>+// This sample demonstrates the differences in rendering efficiency when
>+// drawing with already-created textures whose dimensions have been altered
>+// versus drawing with newly created textures.
>+//
>+// In order to support GL's per-level texture creation semantics over the
>+// D3D API in particular, which requires textures' full mip chains to be
>+// created at texture object creation time, ANGLE maintains copies of the
>+// constituent texture images in system memory until the texture is used in
>+// a draw call, at which time, if the texture passes GL's mip completeness
>+// rules, the D3D texture is created and the contents of the texture are
>+// uploaded. Once the texture is created, redefinition of the dimensions or
>+// format of the texture is costly-- a new D3D texture needs to be created,
>+// and ANGLE may need to read the contents back into system memory.
>+//
>+// Creating an entirely new texture also requires that a new D3D texture be
>+// created, but any overhead associated with tracking the already-present
>+// texture images is eliminated, as it's a novel texture. This sample
>+// demonstrates the contrast in draw call time between these two situations.
>+//
>+// The resizing & creation of a new texture is delayed until several frames
>+// after startup, to eliminate draw time differences caused by caching of
>+// rendering state subsequent to the first frame.
>+
>+class TexRedefBenchSample : public SampleApplication
>+{
>+  public:
>+    TexRedefBenchSample(int argc, char **argv)
>+        : SampleApplication("Microbench", argc, argv, 2, 0, 1280, 1280),
>+          mPixelsResize(nullptr),
>+          mPixelsNewTex(nullptr),
>+          mTimeFrame(false),
>+          mFrameCount(0)
>+    {}
>+
>+    void defineSquareTexture2D(GLuint texId,
>+                               GLsizei baseDimension,
>+                               GLenum format,
>+                               GLenum type,
>+                               void *data)
>+    {
>+        glBindTexture(GL_TEXTURE_2D, texId);
>+        GLsizei curDim = baseDimension;
>+        GLuint level   = 0;
>+
>+        while (curDim >= 1)
>+        {
>+            glTexImage2D(GL_TEXTURE_2D, level, format, curDim, curDim, 0, format, type, data);
>+            curDim /= 2;
>+            level++;
>+        }
>+    }
>+
>+    void createPixelData()
>+    {
>+        mPixelsResize     = new GLubyte[512 * 512 * 4];
>+        mPixelsNewTex     = new GLubyte[512 * 512 * 4];
>+        GLubyte *pixPtr0  = mPixelsResize;
>+        GLubyte *pixPtr1  = mPixelsNewTex;
>+        GLubyte zeroPix[] = {0, 192, 192, 255};
>+        GLubyte onePix[]  = {192, 0, 0, 255};
>+        for (int i = 0; i < 512 * 512; ++i)
>+        {
>+            memcpy(pixPtr0, zeroPix, 4 * sizeof(GLubyte));
>+            memcpy(pixPtr1, onePix, 4 * sizeof(GLubyte));
>+            pixPtr0 += 4;
>+            pixPtr1 += 4;
>+        }
>+    }
>+
>+    bool initialize() override
>+    {
>+        constexpr char kVS[] = R"(attribute vec4 a_position;
>+attribute vec2 a_texCoord;
>+varying vec2 v_texCoord;
>+void main()
>+{
>+    gl_Position = a_position;
>+    v_texCoord = a_texCoord;
>+})";
>+
>+        constexpr char kFS[] = R"(precision mediump float;
>+varying vec2 v_texCoord;
>+uniform sampler2D s_texture;
>+void main()
>+{
>+    gl_FragColor = texture2D(s_texture, v_texCoord);
>+})";
>+
>+        mProgram = CompileProgram(kVS, kFS);
>+        if (!mProgram)
>+        {
>+            return false;
>+        }
>+
>+        // Get the attribute locations
>+        mPositionLoc = glGetAttribLocation(mProgram, "a_position");
>+        mTexCoordLoc = glGetAttribLocation(mProgram, "a_texCoord");
>+
>+        // Get the sampler location
>+        mSamplerLoc = glGetUniformLocation(mProgram, "s_texture");
>+
>+        // Generate texture IDs, and create texture 0
>+        glGenTextures(3, mTextureIds);
>+
>+        createPixelData();
>+        defineSquareTexture2D(mTextureIds[0], 256, GL_RGBA, GL_UNSIGNED_BYTE, mPixelsResize);
>+
>+        glClearColor(0.0f, 0.0f, 0.0f, 0.0f);
>+
>+        mOrigTimer         = CreateTimer();
>+        mResizeDrawTimer   = CreateTimer();
>+        mResizeDefineTimer = CreateTimer();
>+        mNewTexDrawTimer   = CreateTimer();
>+        mNewTexDefineTimer = CreateTimer();
>+
>+        return true;
>+    }
>+
>+    void destroy() override
>+    {
>+        glDeleteProgram(mProgram);
>+
>+        delete[] mPixelsResize;
>+        delete[] mPixelsNewTex;
>+    }
>+
>+    void draw() override
>+    {
>+        GLfloat vertices[] = {
>+            -0.5f, 0.5f,  0.0f,  // Position 0
>+            0.0f,  0.0f,         // TexCoord 0
>+            -0.5f, -0.5f, 0.0f,  // Position 1
>+            0.0f,  1.0f,         // TexCoord 1
>+            0.5f,  -0.5f, 0.0f,  // Position 2
>+            1.0f,  1.0f,         // TexCoord 2
>+            0.5f,  0.5f,  0.0f,  // Position 3
>+            1.0f,  0.0f          // TexCoord 3
>+        };
>+        GLushort indices[] = {0, 1, 2, 0, 2, 3};
>+
>+        // Set the viewport
>+        glViewport(0, 0, getWindow()->getWidth(), getWindow()->getHeight());
>+
>+        // Clear the color buffer
>+        glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
>+
>+        // Use the program object
>+        glUseProgram(mProgram);
>+
>+        // Load the vertex position
>+        glVertexAttribPointer(mPositionLoc, 3, GL_FLOAT, GL_FALSE, 5 * sizeof(GLfloat), vertices);
>+        // Load the texture coordinate
>+        glVertexAttribPointer(mTexCoordLoc, 2, GL_FLOAT, GL_FALSE, 5 * sizeof(GLfloat),
>+                              vertices + 3);
>+
>+        glEnableVertexAttribArray(mPositionLoc);
>+        glEnableVertexAttribArray(mTexCoordLoc);
>+
>+        // Bind the texture
>+        glActiveTexture(GL_TEXTURE0);
>+        glBindTexture(GL_TEXTURE_2D, mTextureIds[0]);
>+
>+        // Set the texture sampler to texture unit to 0
>+        glUniform1i(mSamplerLoc, 0);
>+
>+        // We delay timing of texture resize/creation until after the first frame, as
>+        // caching optimizations will reduce draw time for subsequent frames for reasons
>+        // unreleated to texture creation. mTimeFrame is set to true on the fifth frame.
>+        if (mTimeFrame)
>+        {
>+            mOrigTimer->start();
>+        }
>+
>+        glDrawElements(GL_TRIANGLES, 6, GL_UNSIGNED_SHORT, indices);
>+
>+        if (mTimeFrame)
>+        {
>+            mOrigTimer->stop();
>+            // This timer indicates draw time for an already-created texture resident on the GPU,
>+            // which needs no updates. It will be faster than the other draws.
>+            std::cout << "Original texture draw: " << mOrigTimer->getElapsedTime() * 1000 << "msec"
>+                      << std::endl;
>+
>+            glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
>+
>+            // Now, change the texture dimensions of the original texture
>+            mResizeDefineTimer->start();
>+            defineSquareTexture2D(mTextureIds[0], 512, GL_RGBA, GL_UNSIGNED_BYTE, mPixelsResize);
>+            mResizeDefineTimer->stop();
>+
>+            mResizeDrawTimer->start();
>+            glDrawElements(GL_TRIANGLES, 6, GL_UNSIGNED_SHORT, indices);
>+            mResizeDrawTimer->stop();
>+            // This timer indicates draw time for a texture which has already been used in a draw,
>+            // causing the underlying resource to be allocated, and then resized, requiring resource
>+            // reallocation and related overhead.
>+            std::cout << "Resized texture definition: "
>+                      << mResizeDefineTimer->getElapsedTime() * 1000 << "msec" << std::endl;
>+            std::cout << "Resized texture draw: " << mResizeDrawTimer->getElapsedTime() * 1000
>+                      << "msec" << std::endl;
>+
>+            glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
>+
>+            // Create texure at same dimensions we resized previous texture to
>+            mNewTexDefineTimer->start();
>+            defineSquareTexture2D(mTextureIds[1], 512, GL_RGBA, GL_UNSIGNED_BYTE, mPixelsNewTex);
>+            mNewTexDefineTimer->stop();
>+
>+            mNewTexDrawTimer->start();
>+            glDrawElements(GL_TRIANGLES, 6, GL_UNSIGNED_SHORT, indices);
>+            mNewTexDrawTimer->stop();
>+            // This timer indicates draw time for a texture newly created this frame. The underlying
>+            // resource will need to be created, but because it has not previously been used, there
>+            // is no already-resident texture object to manage. This draw is expected to be faster
>+            // than the resized texture draw.
>+            std::cout << "Newly created texture definition: "
>+                      << mNewTexDefineTimer->getElapsedTime() * 1000 << "msec" << std::endl;
>+            std::cout << "Newly created texture draw: " << mNewTexDrawTimer->getElapsedTime() * 1000
>+                      << "msec" << std::endl;
>+        }
>+
>+        if (mFrameCount == 5)
>+            mTimeFrame = true;
>+        else
>+            mTimeFrame = false;
>+
>+        mFrameCount++;
>+    }
>+
>+  private:
>+    // Handle to a program object
>+    GLuint mProgram;
>+
>+    // Attribute locations
>+    GLint mPositionLoc;
>+    GLint mTexCoordLoc;
>+
>+    // Sampler location
>+    GLint mSamplerLoc;
>+
>+    // Texture handle
>+    GLuint mTextureIds[2];  // 0: texture created, then resized
>+                            // 1: texture newly created with TexImage
>+
>+    // Texture pixel data
>+    GLubyte *mPixelsResize;
>+    GLubyte *mPixelsNewTex;
>+
>+    Timer *mOrigTimer;
>+    Timer *mResizeDrawTimer;
>+    Timer *mResizeDefineTimer;
>+    Timer *mNewTexDrawTimer;
>+    Timer *mNewTexDefineTimer;
>+    bool mTimeFrame;
>+    unsigned int mFrameCount;
>+};
>+
>+int main(int argc, char **argv)
>+{
>+    TexRedefBenchSample app(argc, argv);
>+    return app.run();
>+}
>diff --git a/Source/ThirdParty/ANGLE/samples/texture_wrap/TextureWrap.cpp b/Source/ThirdParty/ANGLE/samples/texture_wrap/TextureWrap.cpp
>new file mode 100644
>index 00000000000..a8f812b9214
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/samples/texture_wrap/TextureWrap.cpp
>@@ -0,0 +1,149 @@
>+//
>+// Copyright (c) 2014 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+
>+//            Based on TextureWrap.c from
>+// Book:      OpenGL(R) ES 2.0 Programming Guide
>+// Authors:   Aaftab Munshi, Dan Ginsburg, Dave Shreiner
>+// ISBN-10:   0321502795
>+// ISBN-13:   9780321502797
>+// Publisher: Addison-Wesley Professional
>+// URLs:      http://safari.informit.com/9780321563835
>+//            http://www.opengles-book.com
>+
>+#include "SampleApplication.h"
>+
>+#include "texture_utils.h"
>+#include "util/shader_utils.h"
>+
>+class TextureWrapSample : public SampleApplication
>+{
>+  public:
>+    TextureWrapSample(int argc, char **argv) : SampleApplication("TextureWrap", argc, argv) {}
>+
>+    bool initialize() override
>+    {
>+        constexpr char kVS[] = R"(uniform float u_offset;
>+attribute vec4 a_position;
>+attribute vec2 a_texCoord;
>+varying vec2 v_texCoord;
>+void main()
>+{
>+    gl_Position = a_position;
>+    gl_Position.x += u_offset;
>+    v_texCoord = a_texCoord;
>+})";
>+
>+        constexpr char kFS[] = R"(precision mediump float;
>+varying vec2 v_texCoord;
>+uniform sampler2D s_texture;
>+void main()
>+{
>+    gl_FragColor = texture2D(s_texture, v_texCoord);
>+})";
>+
>+        mProgram = CompileProgram(kVS, kFS);
>+        if (!mProgram)
>+        {
>+            return false;
>+        }
>+
>+        // Get the attribute locations
>+        mPositionLoc = glGetAttribLocation(mProgram, "a_position");
>+        mTexCoordLoc = glGetAttribLocation(mProgram, "a_texCoord");
>+
>+        // Get the sampler location
>+        mSamplerLoc = glGetUniformLocation(mProgram, "s_texture");
>+
>+        // Get the offset location
>+        mOffsetLoc = glGetUniformLocation(mProgram, "u_offset");
>+
>+        // Load the texture
>+        mTexture = CreateMipMappedTexture2D();
>+
>+        glClearColor(0.0f, 0.0f, 0.0f, 0.0f);
>+
>+        return true;
>+    }
>+
>+    void destroy() override { glDeleteProgram(mProgram); }
>+
>+    void draw() override
>+    {
>+        GLfloat vertices[] = {
>+            -0.3f, 0.3f,  0.0f, 1.0f,  // Position 0
>+            -1.0f, -1.0f,              // TexCoord 0
>+            -0.3f, -0.3f, 0.0f, 1.0f,  // Position 1
>+            -1.0f, 2.0f,               // TexCoord 1
>+            0.3f,  -0.3f, 0.0f, 1.0f,  // Position 2
>+            2.0f,  2.0f,               // TexCoord 2
>+            0.3f,  0.3f,  0.0f, 1.0f,  // Position 3
>+            2.0f,  -1.0f               // TexCoord 3
>+        };
>+        GLushort indices[] = {0, 1, 2, 0, 2, 3};
>+
>+        // Set the viewport
>+        glViewport(0, 0, getWindow()->getWidth(), getWindow()->getHeight());
>+
>+        // Clear the color buffer
>+        glClear(GL_COLOR_BUFFER_BIT);
>+
>+        // Use the program object
>+        glUseProgram(mProgram);
>+
>+        // Load the vertex position
>+        glVertexAttribPointer(mPositionLoc, 4, GL_FLOAT, GL_FALSE, 6 * sizeof(GLfloat), vertices);
>+        glEnableVertexAttribArray(mPositionLoc);
>+
>+        // Load the texture coordinate
>+        glVertexAttribPointer(mTexCoordLoc, 2, GL_FLOAT, GL_FALSE, 6 * sizeof(GLfloat),
>+                              vertices + 4);
>+        glEnableVertexAttribArray(mTexCoordLoc);
>+
>+        // Set the sampler texture unit to 0
>+        glUniform1i(mSamplerLoc, 0);
>+
>+        // Draw quad with repeat wrap mode
>+        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
>+        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
>+        glUniform1f(mOffsetLoc, -0.7f);
>+        glDrawElements(GL_TRIANGLES, 6, GL_UNSIGNED_SHORT, indices);
>+
>+        // Draw quad with clamp to edge wrap mode
>+        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
>+        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
>+        glUniform1f(mOffsetLoc, 0.0f);
>+        glDrawElements(GL_TRIANGLES, 6, GL_UNSIGNED_SHORT, indices);
>+
>+        // Draw quad with mirrored repeat
>+        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_MIRRORED_REPEAT);
>+        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_MIRRORED_REPEAT);
>+        glUniform1f(mOffsetLoc, 0.7f);
>+        glDrawElements(GL_TRIANGLES, 6, GL_UNSIGNED_SHORT, indices);
>+    }
>+
>+  private:
>+    // Handle to a program object
>+    GLuint mProgram;
>+
>+    // Attribute locations
>+    GLint mPositionLoc;
>+    GLint mTexCoordLoc;
>+
>+    // Sampler location
>+    GLint mSamplerLoc;
>+
>+    // Offset location
>+    GLint mOffsetLoc;
>+
>+    // Texture handle
>+    GLuint mTexture;
>+};
>+
>+int main(int argc, char **argv)
>+{
>+    TextureWrapSample app(argc, argv);
>+    return app.run();
>+}
>diff --git a/Source/ThirdParty/ANGLE/samples/tri_fan_microbench/TriFanMicroBench.cpp b/Source/ThirdParty/ANGLE/samples/tri_fan_microbench/TriFanMicroBench.cpp
>new file mode 100644
>index 00000000000..d3874c15102
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/samples/tri_fan_microbench/TriFanMicroBench.cpp
>@@ -0,0 +1,244 @@
>+//
>+// Copyright (c) 2014 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+
>+//            Based on Hello_Triangle.c from
>+// Book:      OpenGL(R) ES 2.0 Programming Guide
>+// Authors:   Aaftab Munshi, Dan Ginsburg, Dave Shreiner
>+// ISBN-10:   0321502795
>+// ISBN-13:   9780321502797
>+// Publisher: Addison-Wesley Professional
>+// URLs:      http://safari.informit.com/9780321563835
>+//            http://www.opengles-book.com
>+
>+#include "SampleApplication.h"
>+
>+#include "util/shader_utils.h"
>+
>+#include <cstring>
>+#include <iostream>
>+
>+// This small sample compares the per-frame render time for a series of
>+// squares drawn with TRIANGLE_FANS versus squares drawn with TRIANGLES.
>+// To exacerbate differences between the two, we use a large collection
>+// of short buffers with pre-translated vertex data.
>+
>+class TriangleFanBenchSample : public SampleApplication
>+{
>+  public:
>+    TriangleFanBenchSample(int argc, char **argv)
>+        : SampleApplication("Microbench", argc, argv, 2, 0, 1280, 1280), mFrameCount(0)
>+    {}
>+
>+    void createVertexBuffers()
>+    {
>+        const unsigned int slices         = 8;
>+        const unsigned int numFanVertices = slices + 2;
>+        const unsigned int fanFloats      = numFanVertices * 3;
>+
>+        mNumFanVerts = numFanVertices;
>+
>+        const GLfloat halfDim = 0.0625;
>+        GLfloat fanVertices[] = {
>+            0.0f,     0.0f,     0.0f,  // center
>+            -halfDim, -halfDim, 0.0f,  // LL
>+            -halfDim, 0.0f,     0.0f,  // CL
>+            -halfDim, halfDim,  0.0f,  // UL
>+            0.0f,     halfDim,  0.0f,  // UC
>+            halfDim,  halfDim,  0.0f,  // UR
>+            halfDim,  0.0f,     0.0f,  // CR
>+            halfDim,  -halfDim, 0.0f,  // LR
>+            0.0f,     -halfDim, 0.0f,  // LC
>+            -halfDim, -halfDim, 0.0f   // LL (closes the fan)
>+        };
>+
>+        const GLfloat xMin = -1.0f;  // We leave viewport/worldview untransformed in this sample
>+        const GLfloat xMax = 1.0f;
>+        const GLfloat yMin = -1.0f;
>+        // const GLfloat yMax = 1.0f;
>+
>+        glGenBuffers(mNumSquares, mFanBufId);
>+
>+        GLfloat xOffset = xMin;
>+        GLfloat yOffset = yMin;
>+        for (unsigned int i = 0; i < mNumSquares; ++i)
>+        {
>+            GLfloat tempVerts[fanFloats] = {0};
>+            for (unsigned int j = 0; j < numFanVertices; ++j)
>+            {
>+                tempVerts[j * 3]     = fanVertices[j * 3] + xOffset;
>+                tempVerts[j * 3 + 1] = fanVertices[j * 3 + 1] + yOffset;
>+                tempVerts[j * 3 + 2] = 0.0f;
>+            }
>+
>+            glBindBuffer(GL_ARRAY_BUFFER, mFanBufId[i]);
>+            glBufferData(GL_ARRAY_BUFFER, fanFloats * sizeof(GLfloat), tempVerts, GL_STATIC_DRAW);
>+
>+            xOffset += 2 * halfDim;
>+            if (xOffset > xMax)
>+            {
>+                xOffset = xMin;
>+                yOffset += 2 * halfDim;
>+            }
>+        }
>+
>+        const unsigned int numTriVertices = slices * 3;
>+        const unsigned int triFloats      = numTriVertices * 3;
>+        GLfloat triVertices[triFloats];
>+        GLfloat *triPointer = triVertices;
>+
>+        mNumTriVerts = numTriVertices;
>+
>+        for (unsigned int i = 0; i < slices; ++i)
>+        {
>+            memcpy(triPointer, fanVertices,
>+                   3 * sizeof(GLfloat));  // copy center point as first vertex for this slice
>+            triPointer += 3;
>+            for (unsigned int j = 1; j < 3; ++j)
>+            {
>+                GLfloat *vertex =
>+                    &(fanVertices[(i + j) * 3]);  // copy two outer vertices for this point
>+                memcpy(triPointer, vertex, 3 * sizeof(GLfloat));
>+                triPointer += 3;
>+            }
>+        }
>+
>+        // GLfloat triVertices2[triFloats];
>+        glGenBuffers(mNumSquares, mTriBufId);
>+        xOffset = xMin;
>+        yOffset = yMin;
>+
>+        for (unsigned int i = 0; i < mNumSquares; ++i)
>+        {
>+            triPointer = triVertices;
>+            GLfloat tempVerts[triFloats];
>+            for (unsigned int j = 0; j < numTriVertices; ++j)
>+            {
>+                tempVerts[j * 3]     = triPointer[0] + xOffset;
>+                tempVerts[j * 3 + 1] = triPointer[1] + yOffset;
>+                tempVerts[j * 3 + 2] = 0.0f;
>+                triPointer += 3;
>+            }
>+
>+            glBindBuffer(GL_ARRAY_BUFFER, mTriBufId[i]);
>+            glBufferData(GL_ARRAY_BUFFER, triFloats * sizeof(GLfloat), tempVerts, GL_STATIC_DRAW);
>+            xOffset += 2 * halfDim;
>+            if (xOffset > xMax)
>+            {
>+                yOffset += 2 * halfDim;
>+                xOffset = xMin;
>+            }
>+        }
>+    }
>+
>+    bool initialize() override
>+    {
>+        constexpr char kVS[] = R"(attribute vec4 vPosition;
>+void main()
>+{
>+    gl_Position = vPosition;
>+})";
>+
>+        constexpr char kFS[] = R"(precision mediump float;
>+void main()
>+{
>+    gl_FragColor = vec4(1.0, 0.0, 0.0, 1.0);
>+})";
>+
>+        mProgram = CompileProgram(kVS, kFS);
>+        if (!mProgram)
>+        {
>+            return false;
>+        }
>+
>+        glClearColor(0.0f, 0.0f, 0.0f, 0.0f);
>+
>+        createVertexBuffers();
>+
>+        mFanTimer     = CreateTimer();
>+        mTriTimer     = CreateTimer();
>+        mFanTotalTime = 0;
>+        mTriTotalTime = 0;
>+
>+        return true;
>+    }
>+
>+    void destroy() override
>+    {
>+        std::cout << "Total draw time using TRIANGLE_FAN: " << mFanTotalTime << "ms ("
>+                  << (float)mFanTotalTime / (float)mFrameCount << " average per frame)"
>+                  << std::endl;
>+        std::cout << "Total draw time using TRIANGLES: " << mTriTotalTime << "ms ("
>+                  << (float)mTriTotalTime / (float)mFrameCount << " average per frame)"
>+                  << std::endl;
>+        glDeleteProgram(mProgram);
>+    }
>+
>+    void draw() override
>+    {
>+        // Set the viewport
>+        glViewport(0, 0, getWindow()->getWidth(), getWindow()->getHeight());
>+
>+        // Clear the color buffer
>+        glClear(GL_COLOR_BUFFER_BIT);
>+
>+        // Use the program object
>+        glUseProgram(mProgram);
>+
>+        // Bind the vertex data
>+        glEnableVertexAttribArray(0);
>+
>+        // Draw using triangle fans, stored in VBO
>+        mFanTimer->start();
>+        for (unsigned i = 0; i < mNumSquares; ++i)
>+        {
>+            glBindBuffer(GL_ARRAY_BUFFER, mFanBufId[i]);
>+            glVertexAttribPointer(0, 3, GL_FLOAT, GL_FALSE, 0, nullptr);
>+            glDrawArrays(GL_TRIANGLE_FAN, 0, mNumFanVerts);
>+        }
>+        mFanTimer->stop();
>+
>+        mFanTotalTime += static_cast<unsigned int>(
>+            mFanTimer->getElapsedTime() * 1000);  // convert from usec to msec when accumulating
>+
>+        // Clear to eliminate driver-side gains from occlusion
>+        glClear(GL_COLOR_BUFFER_BIT);
>+
>+        // Draw using triangles, stored in VBO
>+        mTriTimer->start();
>+        for (unsigned i = 1; i < mNumSquares; ++i)
>+        {
>+            glBindBuffer(GL_ARRAY_BUFFER, mTriBufId[i]);
>+            glVertexAttribPointer(0, 3, GL_FLOAT, GL_FALSE, 0, nullptr);
>+            glDrawArrays(GL_TRIANGLES, 0, mNumTriVerts);
>+        }
>+        mTriTimer->stop();
>+
>+        mTriTotalTime += static_cast<unsigned int>(
>+            mTriTimer->getElapsedTime() * 1000);  // convert from usec to msec when accumulating
>+
>+        mFrameCount++;
>+    }
>+
>+  private:
>+    static const unsigned int mNumSquares = 289;
>+    unsigned int mNumFanVerts;
>+    unsigned int mNumTriVerts;
>+    GLuint mProgram;
>+    GLuint mFanBufId[mNumSquares];
>+    GLuint mTriBufId[mNumSquares];
>+
>+    Timer *mFanTimer;
>+    Timer *mTriTimer;
>+    unsigned int mFrameCount;
>+    unsigned int mTriTotalTime;
>+    unsigned int mFanTotalTime;
>+};
>+
>+int main(int argc, char **argv)
>+{
>+    TriangleFanBenchSample app(argc, argv);
>+    return app.run();
>+}
>diff --git a/Source/ThirdParty/ANGLE/scripts/bmp_to_nv12.py b/Source/ThirdParty/ANGLE/scripts/bmp_to_nv12.py
>new file mode 100644
>index 00000000000..c76ac7af3b1
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/scripts/bmp_to_nv12.py
>@@ -0,0 +1,89 @@
>+#!/usr/bin/python2
>+#
>+# Copyright 2016 The ANGLE Project Authors. All rights reserved.
>+# Use of this source code is governed by a BSD-style license that can be
>+# found in the LICENSE file.
>+#
>+# bmp_to_nv12.py:
>+#   Script to convert a simple BMP file to an NV12 format. Used to create
>+#   test images for the NV12 texture stream end to end tests
>+
>+import sys
>+import struct
>+
>+if len(sys.argv) != 4:
>+    print("Usage: bmp_to_nv12.py input output prefix")
>+    exit(0)
>+
>+bmp_file = open(sys.argv[1], "rb")
>+
>+magic = bmp_file.read(2)
>+if (magic != "BM"):
>+    print("Invalid BMP magic")
>+    exit(1)
>+
>+file_size, = struct.unpack("I", bmp_file.read(4))
>+
>+# eat reserved bytes
>+bmp_file.read(4)
>+
>+offset, = struct.unpack("I", bmp_file.read(4))
>+
>+headersize, = struct.unpack("I", bmp_file.read(4))
>+width, = struct.unpack("i", bmp_file.read(4))
>+height, = struct.unpack("i", bmp_file.read(4))
>+planes, = struct.unpack("H", bmp_file.read(2))
>+bpp, = struct.unpack("H", bmp_file.read(2))
>+compression, = struct.unpack("i", bmp_file.read(4))
>+image_size, = struct.unpack("i", bmp_file.read(4))
>+
>+if (bpp != 24 or compression != 0):
>+    print("Unsupported BMP file")
>+    bmp_file.close()
>+    exit(1)
>+
>+bmp_file.seek(offset, 0)
>+pixels = bmp_file.read(width * height * 3)
>+bmp_file.close()
>+
>+# convert to YUV 4:4:4
>+converted_pixels = bytearray(pixels)
>+for i in range(0, width * height):
>+    R, = struct.unpack("B", pixels[i*3+2])
>+    G, = struct.unpack("B", pixels[i*3+1])
>+    B, = struct.unpack("B", pixels[i*3])
>+    converted_pixels[i*3] = ((66*R + 129*G + 25*B + 128) >> 8) + 16
>+    converted_pixels[i*3+1] = ((-38*R - 74*G + 112*B + 128) >> 8) + 128
>+    converted_pixels[i*3+2] = ((112*R - 94*G - 18*B + 128) >> 8) + 128
>+
>+# downsample to packed UV buffer
>+uv_buffer = bytearray(width * height / 2)
>+for i in range(0, width * height / 2, 2):
>+    U1 = converted_pixels[((((i / width) * 2) * width) + (i % width)) * 3 + 1]
>+    U2 = converted_pixels[((((i / width) * 2) * width) + width + (i % width)) * 3 + 1]
>+    V1 = converted_pixels[((((i / width) * 2) * width) + (i % width)) * 3 + 2]
>+    V2 = converted_pixels[((((i / width) * 2) * width) + width + (i % width)) * 3 + 2]
>+    uv_buffer[i] = (U1 + U2) / 2
>+    uv_buffer[i + 1] = (V1 + V2) / 2
>+
>+# extract the Y buffer
>+y_buffer = bytearray(width * height)
>+for i in range(0, width * height):
>+    y_buffer[i] = converted_pixels[i * 3]
>+
>+# write out the file as a C header
>+nv12_file = open(sys.argv[2], "w")
>+nv12_file.write("// Automatically generated from " + sys.argv[1] + "\n")
>+nv12_file.write("static const size_t " + sys.argv[3] + "_width = " + str(width) + ";\n")
>+nv12_file.write("static const size_t " + sys.argv[3] + "_height = " + str(height) + ";\n")
>+nv12_file.write("static const unsigned char " + sys.argv[3] + "_data[] = \n{")
>+for i in range(0, width * height):
>+    if (i % 16) == 0:
>+        nv12_file.write("\n    ")
>+    nv12_file.write(str(y_buffer[i]) + ",")
>+for i in range(0, width * height / 2):
>+    if (i % 16) == 0:
>+        nv12_file.write("\n    ")
>+    nv12_file.write(str(uv_buffer[i]) + ",")
>+nv12_file.write("\n};")
>+nv12_file.close()
>diff --git a/Source/ThirdParty/ANGLE/scripts/bootstrap.py b/Source/ThirdParty/ANGLE/scripts/bootstrap.py
>new file mode 100644
>index 00000000000..e97a6b350b7
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/scripts/bootstrap.py
>@@ -0,0 +1,38 @@
>+#!/usr/bin/python2
>+
>+# Copyright 2015 Google Inc.  All rights reserved.
>+# Use of this source code is governed by a BSD-style license that can be
>+# found in the LICENSE file.
>+
>+"""Generate .gclient file for Angle.
>+
>+Because gclient won't accept "--name ." use a different name then edit.
>+"""
>+
>+import subprocess
>+import sys
>+
>+
>+def main():
>+  gclient_cmd = ('gclient config --name change2dot --unmanaged '
>+      'https://chromium.googlesource.com/angle/angle.git')
>+  try:
>+    rc = subprocess.call(gclient_cmd, shell=True)
>+  except OSError:
>+    print 'could not run "%s" via shell' % gclient_cmd
>+    sys.exit(1)
>+
>+  if rc:
>+    print 'failed command: "%s"' % gclient_cmd
>+    sys.exit(1)
>+
>+  with open('.gclient') as gclient_file:
>+    content = gclient_file.read()
>+
>+  with open('.gclient', 'w') as gclient_file:
>+    gclient_file.write(content.replace('change2dot', '.'))
>+
>+  print 'created .gclient'
>+
>+if __name__ == '__main__':
>+  main()
>diff --git a/Source/ThirdParty/ANGLE/scripts/egl.xml b/Source/ThirdParty/ANGLE/scripts/egl.xml
>new file mode 100644
>index 00000000000..ab0a6518b7f
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/scripts/egl.xml
>@@ -0,0 +1,3122 @@
>+<?xml version="1.0" encoding="UTF-8"?>
>+<registry>
>+    
>+    
>+
>+    
>+    <types>
>+            
>+        <type name="khrplatform">#include &lt;KHR/khrplatform.h&gt;</type>
>+        <type name="eglplatform" requires="khrplatform">#include &lt;EGL/eglplatform.h&gt;</type>
>+        <type name="khronos_utime_nanoseconds_t" requires="khrplatform"/>
>+        <type name="khronos_stime_nanoseconds_t" requires="khrplatform"/>
>+        <type name="khronos_uint64_t" requires="khrplatform"/>
>+        <type name="khronos_ssize_t" requires="khrplatform"/>
>+        <type name="EGLNativeDisplayType" requires="eglplatform"/>
>+        <type name="EGLNativePixmapType" requires="eglplatform"/>
>+        <type name="EGLNativeWindowType" requires="eglplatform"/>
>+        <type name="EGLint" requires="eglplatform"/>
>+        <type name="NativeDisplayType" requires="eglplatform"/>
>+        <type name="NativePixmapType" requires="eglplatform"/>
>+        <type name="NativeWindowType" requires="eglplatform"/>
>+        <type>struct <name>AHardwareBuffer</name>;</type>
>+        
>+        <type name="Bool"/>
>+            
>+        <type>typedef unsigned int <name>EGLBoolean</name>;</type>
>+        <type>typedef unsigned int <name>EGLenum</name>;</type>
>+        <type requires="khrplatform">typedef intptr_t <name>EGLAttribKHR</name>;</type>
>+        <type requires="khrplatform">typedef intptr_t <name>EGLAttrib</name>;</type>
>+        <type>typedef void *<name>EGLClientBuffer</name>;</type>
>+        <type>typedef void *<name>EGLConfig</name>;</type>
>+        <type>typedef void *<name>EGLContext</name>;</type>
>+        <type>typedef void *<name>EGLDeviceEXT</name>;</type>
>+        <type>typedef void *<name>EGLDisplay</name>;</type>
>+        <type>typedef void *<name>EGLImage</name>;</type>
>+        <type>typedef void *<name>EGLImageKHR</name>;</type>
>+        <type>typedef void *<name>EGLLabelKHR</name>;</type>
>+        <type>typedef void *<name>EGLObjectKHR</name>;</type>
>+        <type>typedef void *<name>EGLOutputLayerEXT</name>;</type>
>+        <type>typedef void *<name>EGLOutputPortEXT</name>;</type>
>+        <type>typedef void *<name>EGLStreamKHR</name>;</type>
>+        <type>typedef void *<name>EGLSurface</name>;</type>
>+        <type>typedef void *<name>EGLSync</name>;</type>
>+        <type>typedef void *<name>EGLSyncKHR</name>;</type>
>+        <type>typedef void *<name>EGLSyncNV</name>;</type>
>+        <type>typedef void (*<name>__eglMustCastToProperFunctionPointerType</name>)(void);</type>
>+        <type requires="khrplatform">typedef khronos_utime_nanoseconds_t <name>EGLTimeKHR</name>;</type>
>+        <type requires="khrplatform">typedef khronos_utime_nanoseconds_t <name>EGLTime</name>;</type>
>+        <type requires="khrplatform">typedef khronos_utime_nanoseconds_t <name>EGLTimeNV</name>;</type>
>+        <type requires="khrplatform">typedef khronos_utime_nanoseconds_t <name>EGLuint64NV</name>;</type>
>+        <type requires="khrplatform">typedef khronos_uint64_t <name>EGLuint64KHR</name>;</type>
>+        <type requires="khrplatform">typedef khronos_stime_nanoseconds_t <name>EGLnsecsANDROID</name>;</type>
>+        <type>typedef int <name>EGLNativeFileDescriptorKHR</name>;</type>
>+        <type requires="khrplatform">typedef khronos_ssize_t <name>EGLsizeiANDROID</name>;</type>
>+        <type requires="EGLsizeiANDROID">typedef void (*<name>EGLSetBlobFuncANDROID</name>) (const void *key, EGLsizeiANDROID keySize, const void *value, EGLsizeiANDROID valueSize);</type>
>+        <type requires="EGLsizeiANDROID">typedef EGLsizeiANDROID (*<name>EGLGetBlobFuncANDROID</name>) (const void *key, EGLsizeiANDROID keySize, void *value, EGLsizeiANDROID valueSize);</type>
>+        <type>struct <name>EGLClientPixmapHI</name> {
>+    void  *pData;
>+    EGLint iWidth;
>+    EGLint iHeight;
>+    EGLint iStride;
>+};</type>
>+        <type>typedef void (<apientry/> *<name>EGLDEBUGPROCKHR</name>)(EGLenum error,const char *command,EGLint messageType,EGLLabelKHR threadLabel,EGLLabelKHR objectLabel,const char* message);</type>
>+    </types>
>+
>+    
>+
>+    
>+
>+    <enums namespace="EGLSurfaceTypeMask" type="bitmask" comment="EGL_SURFACE_TYPE bits">
>+        <enum value="0x0001" name="EGL_PBUFFER_BIT"/>
>+        <enum value="0x0002" name="EGL_PIXMAP_BIT"/>
>+        <enum value="0x0004" name="EGL_WINDOW_BIT"/>
>+        <enum value="0x0008" name="EGL_PBUFFER_IMAGE_BIT_TAO" comment="Unreleased TAO extension"/>
>+        <enum value="0x0010" name="EGL_PBUFFER_PALETTE_IMAGE_BIT_TAO" comment="Unreleased TAO extension"/>
>+        <enum value="0x0020" name="EGL_VG_COLORSPACE_LINEAR_BIT"/>
>+        <enum value="0x0020" name="EGL_VG_COLORSPACE_LINEAR_BIT_KHR"/>
>+        <enum value="0x0040" name="EGL_VG_ALPHA_FORMAT_PRE_BIT"/>
>+        <enum value="0x0040" name="EGL_VG_ALPHA_FORMAT_PRE_BIT_KHR"/>
>+        <enum value="0x0080" name="EGL_LOCK_SURFACE_BIT_KHR"/>
>+        <enum value="0x0100" name="EGL_OPTIMAL_FORMAT_BIT_KHR"/>
>+        <enum value="0x0200" name="EGL_MULTISAMPLE_RESOLVE_BOX_BIT"/>
>+        <enum value="0x0400" name="EGL_SWAP_BEHAVIOR_PRESERVED_BIT"/>
>+        <enum value="0x0800" name="EGL_STREAM_BIT_KHR"/>
>+            
>+        <enum value="0x1000" name="EGL_MUTABLE_RENDER_BUFFER_BIT_KHR"/>
>+    </enums>
>+
>+    <enums namespace="EGLRenderableTypeMask" type="bitmask" comment="EGL_RENDERABLE_TYPE bits">
>+        <enum value="0x0001" name="EGL_OPENGL_ES_BIT"/>
>+        <enum value="0x0002" name="EGL_OPENVG_BIT"/>
>+        <enum value="0x0004" name="EGL_OPENGL_ES2_BIT"/>
>+        <enum value="0x0008" name="EGL_OPENGL_BIT"/>
>+        <enum value="0x0010" name="EGL_INTEROP_BIT_KHR" comment="EGL_KHR_interop"/>
>+        <enum value="0x0020" name="EGL_OPENMAX_IL_BIT_KHR" comment="EGL_KHR_interop"/>
>+        <enum value="0x00000040" name="EGL_OPENGL_ES3_BIT"/>
>+        <enum value="0x00000040" name="EGL_OPENGL_ES3_BIT_KHR" alias="EGL_OPENGL_ES3_BIT"/>
>+    </enums>
>+
>+    <enums namespace="EGLLockUsageHintKHRMask" type="bitmask" comment="EGL_LOCK_USAGE_HINT_KHR bits">
>+        <enum value="0x0001" name="EGL_READ_SURFACE_BIT_KHR"/>
>+        <enum value="0x0002" name="EGL_WRITE_SURFACE_BIT_KHR"/>
>+    </enums>
>+
>+    <enums namespace="EGLNativeBufferUsageFlags" type="bitmask" comment="EGL_NATIVE_BUFFER_USAGE_ANDROID bits">
>+        <enum value="0x00000001" name="EGL_NATIVE_BUFFER_USAGE_PROTECTED_BIT_ANDROID"/>
>+        <enum value="0x00000002" name="EGL_NATIVE_BUFFER_USAGE_RENDERBUFFER_BIT_ANDROID"/>
>+        <enum value="0x00000004" name="EGL_NATIVE_BUFFER_USAGE_TEXTURE_BIT_ANDROID"/>
>+    </enums>
>+
>+    <enums namespace="EGLSyncFlagsKHR" type="bitmask" comment="Fence/reusable sync wait bits">
>+        <enum value="0x0001" name="EGL_SYNC_FLUSH_COMMANDS_BIT"/>
>+        <enum value="0x0001" name="EGL_SYNC_FLUSH_COMMANDS_BIT_KHR" alias="EGL_SYNC_FLUSH_COMMANDS_BIT"/>
>+        <enum value="0x0001" name="EGL_SYNC_FLUSH_COMMANDS_BIT_NV" alias="EGL_SYNC_FLUSH_COMMANDS_BIT"/>
>+    </enums>
>+
>+    <enums namespace="EGLDRMBufferUseMESAMask" type="bitmask" comment="EGL_DRM_BUFFER_USE_MESA bits">
>+        <enum value="0x00000001" name="EGL_DRM_BUFFER_USE_SCANOUT_MESA"/>
>+        <enum value="0x00000002" name="EGL_DRM_BUFFER_USE_SHARE_MESA"/>
>+        <enum value="0x00000004" name="EGL_DRM_BUFFER_USE_CURSOR_MESA"/>
>+    </enums>
>+
>+    
>+    <enums namespace="EGLContextFlagMask" type="bitmask" comment="EGL_CONTEXT_FLAGS_KHR bits">
>+        <enum value="0x00000001" name="EGL_CONTEXT_OPENGL_DEBUG_BIT_KHR"/>
>+        <enum value="0x00000002" name="EGL_CONTEXT_OPENGL_FORWARD_COMPATIBLE_BIT_KHR"/>
>+        <enum value="0x00000004" name="EGL_CONTEXT_OPENGL_ROBUST_ACCESS_BIT_KHR"/>
>+    </enums>
>+
>+    <enums namespace="EGLContextProfileMask" type="bitmask" comment="Shared with GL">
>+        <enum value="0x00000001" name="EGL_CONTEXT_OPENGL_CORE_PROFILE_BIT"/>
>+        <enum value="0x00000001" name="EGL_CONTEXT_OPENGL_CORE_PROFILE_BIT_KHR" alias="EGL_CONTEXT_OPENGL_CORE_PROFILE_BIT"/>
>+        <enum value="0x00000002" name="EGL_CONTEXT_OPENGL_COMPATIBILITY_PROFILE_BIT"/>
>+        <enum value="0x00000002" name="EGL_CONTEXT_OPENGL_COMPATIBILITY_PROFILE_BIT_KHR" alias="EGL_CONTEXT_OPENGL_COMPATIBILITY_PROFILE_BIT"/>
>+    </enums>
>+
>+    
>+
>+    <enums namespace="EGL" start="0x0000" end="0x2FFF" vendor="KHR" comment="Reserved for enumerants shared with WGL, GLX, and GL">
>+        <enum value="0" name="EGL_CONTEXT_RELEASE_BEHAVIOR_NONE_KHR"/>
>+        <enum value="0x2097" name="EGL_CONTEXT_RELEASE_BEHAVIOR_KHR"/>
>+        <enum value="0x2098" name="EGL_CONTEXT_RELEASE_BEHAVIOR_FLUSH_KHR"/>
>+    </enums>
>+
>+    <enums namespace="EGL" group="Boolean" vendor="ARB">
>+        <enum value="0" name="EGL_FALSE"/>
>+        <enum value="1" name="EGL_TRUE"/>
>+    </enums>
>+
>+    <enums namespace="EGL" group="SpecialNumbers" vendor="ARB" comment="Tokens whose numeric value is intrinsically meaningful">
>+        <enum value="EGL_CAST(EGLint,-1)" name="EGL_DONT_CARE"/>
>+        <enum value="EGL_CAST(EGLint,-1)" name="EGL_UNKNOWN"/>
>+        <enum value="-1" name="EGL_NO_NATIVE_FENCE_FD_ANDROID"/>
>+        <enum value="0" name="EGL_DEPTH_ENCODING_NONE_NV"/>
>+        <enum value="EGL_CAST(EGLContext,0)" name="EGL_NO_CONTEXT"/>
>+        <enum value="EGL_CAST(EGLDeviceEXT,0)" name="EGL_NO_DEVICE_EXT"/>
>+        <enum value="EGL_CAST(EGLDisplay,0)" name="EGL_NO_DISPLAY"/>
>+        <enum value="EGL_CAST(EGLImage,0)" name="EGL_NO_IMAGE"/>
>+        <enum value="EGL_CAST(EGLImageKHR,0)" name="EGL_NO_IMAGE_KHR"/>
>+        <enum value="EGL_CAST(EGLNativeDisplayType,0)" name="EGL_DEFAULT_DISPLAY"/>
>+        <enum value="EGL_CAST(EGLNativeFileDescriptorKHR,-1)" name="EGL_NO_FILE_DESCRIPTOR_KHR"/>
>+        <enum value="EGL_CAST(EGLOutputLayerEXT,0)" name="EGL_NO_OUTPUT_LAYER_EXT"/>
>+        <enum value="EGL_CAST(EGLOutputPortEXT,0)" name="EGL_NO_OUTPUT_PORT_EXT"/>
>+        <enum value="EGL_CAST(EGLStreamKHR,0)" name="EGL_NO_STREAM_KHR"/>
>+        <enum value="EGL_CAST(EGLSurface,0)" name="EGL_NO_SURFACE"/>
>+        <enum value="EGL_CAST(EGLSync,0)" name="EGL_NO_SYNC"/>
>+        <enum value="EGL_CAST(EGLSyncKHR,0)" name="EGL_NO_SYNC_KHR" alias="EGL_NO_SYNC"/>
>+        <enum value="EGL_CAST(EGLSyncNV,0)" name="EGL_NO_SYNC_NV" alias="EGL_NO_SYNC"/>
>+        <enum value="EGL_CAST(EGLConfig,0)" name="EGL_NO_CONFIG_KHR"/>
>+        <enum value="10000" name="EGL_DISPLAY_SCALING"/>
>+        <enum value="0xFFFFFFFFFFFFFFFF" name="EGL_FOREVER" type="ull"/>
>+        <enum value="0xFFFFFFFFFFFFFFFF" name="EGL_FOREVER_KHR" type="ull" alias="EGL_FOREVER"/>
>+        <enum value="0xFFFFFFFFFFFFFFFF" name="EGL_FOREVER_NV" type="ull" alias="EGL_FOREVER"/>
>+    </enums>
>+
>+    <enums namespace="EGL" start="0x3000" end="0x305F" vendor="KHR">
>+        <enum value="0x3000" name="EGL_SUCCESS"/>
>+        <enum value="0x3001" name="EGL_NOT_INITIALIZED"/>
>+        <enum value="0x3002" name="EGL_BAD_ACCESS"/>
>+        <enum value="0x3003" name="EGL_BAD_ALLOC"/>
>+        <enum value="0x3004" name="EGL_BAD_ATTRIBUTE"/>
>+        <enum value="0x3005" name="EGL_BAD_CONFIG"/>
>+        <enum value="0x3006" name="EGL_BAD_CONTEXT"/>
>+        <enum value="0x3007" name="EGL_BAD_CURRENT_SURFACE"/>
>+        <enum value="0x3008" name="EGL_BAD_DISPLAY"/>
>+        <enum value="0x3009" name="EGL_BAD_MATCH"/>
>+        <enum value="0x300A" name="EGL_BAD_NATIVE_PIXMAP"/>
>+        <enum value="0x300B" name="EGL_BAD_NATIVE_WINDOW"/>
>+        <enum value="0x300C" name="EGL_BAD_PARAMETER"/>
>+        <enum value="0x300D" name="EGL_BAD_SURFACE"/>
>+        <enum value="0x300E" name="EGL_CONTEXT_LOST"/>
>+            <unused start="0x300F" end="0x301F" comment="for additional errors"/>
>+        <enum value="0x3020" name="EGL_BUFFER_SIZE"/>
>+        <enum value="0x3021" name="EGL_ALPHA_SIZE"/>
>+        <enum value="0x3022" name="EGL_BLUE_SIZE"/>
>+        <enum value="0x3023" name="EGL_GREEN_SIZE"/>
>+        <enum value="0x3024" name="EGL_RED_SIZE"/>
>+        <enum value="0x3025" name="EGL_DEPTH_SIZE"/>
>+        <enum value="0x3026" name="EGL_STENCIL_SIZE"/>
>+        <enum value="0x3027" name="EGL_CONFIG_CAVEAT"/>
>+        <enum value="0x3028" name="EGL_CONFIG_ID"/>
>+        <enum value="0x3029" name="EGL_LEVEL"/>
>+        <enum value="0x302A" name="EGL_MAX_PBUFFER_HEIGHT"/>
>+        <enum value="0x302B" name="EGL_MAX_PBUFFER_PIXELS"/>
>+        <enum value="0x302C" name="EGL_MAX_PBUFFER_WIDTH"/>
>+        <enum value="0x302D" name="EGL_NATIVE_RENDERABLE"/>
>+        <enum value="0x302E" name="EGL_NATIVE_VISUAL_ID"/>
>+        <enum value="0x302F" name="EGL_NATIVE_VISUAL_TYPE"/>
>+        <enum value="0x3031" name="EGL_SAMPLES"/>
>+        <enum value="0x3032" name="EGL_SAMPLE_BUFFERS"/>
>+        <enum value="0x3033" name="EGL_SURFACE_TYPE"/>
>+        <enum value="0x3034" name="EGL_TRANSPARENT_TYPE"/>
>+        <enum value="0x3035" name="EGL_TRANSPARENT_BLUE_VALUE"/>
>+        <enum value="0x3036" name="EGL_TRANSPARENT_GREEN_VALUE"/>
>+        <enum value="0x3037" name="EGL_TRANSPARENT_RED_VALUE"/>
>+        <enum value="0x3038" name="EGL_NONE" comment="Attribute list terminator"/>
>+        <enum value="0x3039" name="EGL_BIND_TO_TEXTURE_RGB"/>
>+        <enum value="0x303A" name="EGL_BIND_TO_TEXTURE_RGBA"/>
>+        <enum value="0x303B" name="EGL_MIN_SWAP_INTERVAL"/>
>+        <enum value="0x303C" name="EGL_MAX_SWAP_INTERVAL"/>
>+        <enum value="0x303D" name="EGL_LUMINANCE_SIZE"/>
>+        <enum value="0x303E" name="EGL_ALPHA_MASK_SIZE"/>
>+        <enum value="0x303F" name="EGL_COLOR_BUFFER_TYPE"/>
>+        <enum value="0x3040" name="EGL_RENDERABLE_TYPE"/>
>+        <enum value="0x3041" name="EGL_MATCH_NATIVE_PIXMAP"/>
>+        <enum value="0x3042" name="EGL_CONFORMANT"/>
>+        <enum value="0x3042" name="EGL_CONFORMANT_KHR"/>
>+        <enum value="0x3043" name="EGL_MATCH_FORMAT_KHR"/>
>+            <unused start="0x3044" end="0x304F" comment="for additional config attributes"/>
>+        <enum value="0x3050" name="EGL_SLOW_CONFIG"/>
>+        <enum value="0x3051" name="EGL_NON_CONFORMANT_CONFIG"/>
>+        <enum value="0x3052" name="EGL_TRANSPARENT_RGB"/>
>+        <enum value="0x3053" name="EGL_VENDOR"/>
>+        <enum value="0x3054" name="EGL_VERSION"/>
>+        <enum value="0x3055" name="EGL_EXTENSIONS"/>
>+        <enum value="0x3056" name="EGL_HEIGHT"/>
>+        <enum value="0x3057" name="EGL_WIDTH"/>
>+        <enum value="0x3058" name="EGL_LARGEST_PBUFFER"/>
>+        <enum value="0x3059" name="EGL_DRAW"/>
>+        <enum value="0x305A" name="EGL_READ"/>
>+        <enum value="0x305B" name="EGL_CORE_NATIVE_ENGINE"/>
>+        <enum value="0x305C" name="EGL_NO_TEXTURE"/>
>+        <enum value="0x305D" name="EGL_TEXTURE_RGB"/>
>+        <enum value="0x305E" name="EGL_TEXTURE_RGBA"/>
>+        <enum value="0x305F" name="EGL_TEXTURE_2D"/>
>+    </enums>
>+
>+    <enums namespace="EGL" start="0x3060-0x306F" vendor="TAO" comment="Reserved for Phil Huxley">
>+        <unused start="0x3060" end="0x306F"/>
>+    </enums>
>+
>+    <enums namespace="EGL" start="0x3070-0x307F" vendor="NOK" comment="Reserved for Jani Vaarala">
>+        <unused start="0x3070" end="0x307E"/>
>+        <enum value="0x307F" name="EGL_Y_INVERTED_NOK"/>
>+    </enums>
>+
>+    <enums namespace="EGL" start="0x3080-0x30AF" vendor="KHR">
>+        <enum value="0x3080" name="EGL_TEXTURE_FORMAT"/>
>+        <enum value="0x3081" name="EGL_TEXTURE_TARGET"/>
>+        <enum value="0x3082" name="EGL_MIPMAP_TEXTURE"/>
>+        <enum value="0x3083" name="EGL_MIPMAP_LEVEL"/>
>+        <enum value="0x3084" name="EGL_BACK_BUFFER"/>
>+        <enum value="0x3085" name="EGL_SINGLE_BUFFER"/>
>+        <enum value="0x3086" name="EGL_RENDER_BUFFER"/>
>+        <enum value="0x3087" name="EGL_COLORSPACE" alias="EGL_VG_COLORSPACE"/>
>+        <enum value="0x3087" name="EGL_VG_COLORSPACE"/>
>+        <enum value="0x3088" name="EGL_ALPHA_FORMAT" alias="EGL_VG_ALPHA_FORMAT"/>
>+        <enum value="0x3088" name="EGL_VG_ALPHA_FORMAT"/>
>+        <enum value="0x3089" name="EGL_COLORSPACE_sRGB"/>
>+        <enum value="0x3089" name="EGL_GL_COLORSPACE_SRGB" alias="EGL_COLORSPACE_sRGB"/>
>+        <enum value="0x3089" name="EGL_GL_COLORSPACE_SRGB_KHR" alias="EGL_COLORSPACE_sRGB"/>
>+        <enum value="0x3089" name="EGL_VG_COLORSPACE_sRGB" alias="EGL_COLORSPACE_sRGB"/>
>+        <enum value="0x308A" name="EGL_COLORSPACE_LINEAR"/>
>+        <enum value="0x308A" name="EGL_GL_COLORSPACE_LINEAR" alias="EGL_COLORSPACE_LINEAR"/>
>+        <enum value="0x308A" name="EGL_GL_COLORSPACE_LINEAR_KHR" alias="EGL_COLORSPACE_LINEAR"/>
>+        <enum value="0x308A" name="EGL_VG_COLORSPACE_LINEAR" alias="EGL_COLORSPACE_LINEAR"/>
>+        <enum value="0x308B" name="EGL_ALPHA_FORMAT_NONPRE" alias="EGL_VG_ALPHA_FORMAT_NONPRE"/>
>+        <enum value="0x308B" name="EGL_VG_ALPHA_FORMAT_NONPRE"/>
>+        <enum value="0x308C" name="EGL_ALPHA_FORMAT_PRE" alias="EGL_VG_ALPHA_FORMAT_PRE"/>
>+        <enum value="0x308C" name="EGL_VG_ALPHA_FORMAT_PRE"/>
>+        <enum value="0x308D" name="EGL_CLIENT_APIS"/>
>+        <enum value="0x308E" name="EGL_RGB_BUFFER"/>
>+        <enum value="0x308F" name="EGL_LUMINANCE_BUFFER"/>
>+        <enum value="0x3090" name="EGL_HORIZONTAL_RESOLUTION"/>
>+        <enum value="0x3091" name="EGL_VERTICAL_RESOLUTION"/>
>+        <enum value="0x3092" name="EGL_PIXEL_ASPECT_RATIO"/>
>+        <enum value="0x3093" name="EGL_SWAP_BEHAVIOR"/>
>+        <enum value="0x3094" name="EGL_BUFFER_PRESERVED"/>
>+        <enum value="0x3095" name="EGL_BUFFER_DESTROYED"/>
>+        <enum value="0x3096" name="EGL_OPENVG_IMAGE"/>
>+        <enum value="0x3097" name="EGL_CONTEXT_CLIENT_TYPE"/>
>+        <enum value="0x3098" name="EGL_CONTEXT_CLIENT_VERSION"/>
>+        <enum value="0x3098" name="EGL_CONTEXT_MAJOR_VERSION" alias="EGL_CONTEXT_CLIENT_VERSION"/>
>+        <enum value="0x3098" name="EGL_CONTEXT_MAJOR_VERSION_KHR" alias="EGL_CONTEXT_CLIENT_VERSION"/>
>+        <enum value="0x3099" name="EGL_MULTISAMPLE_RESOLVE"/>
>+        <enum value="0x309A" name="EGL_MULTISAMPLE_RESOLVE_DEFAULT"/>
>+        <enum value="0x309B" name="EGL_MULTISAMPLE_RESOLVE_BOX"/>
>+        <enum value="0x309C" name="EGL_CL_EVENT_HANDLE"/>
>+        <enum value="0x309C" name="EGL_CL_EVENT_HANDLE_KHR" alias="EGL_CL_EVENT_HANDLE"/>
>+        <enum value="0x309D" name="EGL_GL_COLORSPACE"/>
>+        <enum value="0x309D" name="EGL_GL_COLORSPACE_KHR" alias="EGL_GL_COLORSPACE"/>
>+            <unused start="0x309E" end="0x309F"/>
>+        <enum value="0x30A0" name="EGL_OPENGL_ES_API"/>
>+        <enum value="0x30A1" name="EGL_OPENVG_API"/>
>+        <enum value="0x30A2" name="EGL_OPENGL_API"/>
>+            <unused start="0x30A3" end="0x30AF" comment="for additional client API names"/>
>+    </enums>
>+
>+    <enums namespace="EGL" start="0x30B0-0x30BF" vendor="NV" comment="Reserved for Ignacio Llamas">
>+        <enum value="0x30B0" name="EGL_NATIVE_PIXMAP_KHR"/>
>+        <enum value="0x30B1" name="EGL_GL_TEXTURE_2D"/>
>+        <enum value="0x30B1" name="EGL_GL_TEXTURE_2D_KHR" alias="EGL_GL_TEXTURE_2D"/>
>+        <enum value="0x30B2" name="EGL_GL_TEXTURE_3D"/>
>+        <enum value="0x30B2" name="EGL_GL_TEXTURE_3D_KHR" alias="EGL_GL_TEXTURE_3D"/>
>+        <enum value="0x30B3" name="EGL_GL_TEXTURE_CUBE_MAP_POSITIVE_X"/>
>+        <enum value="0x30B3" name="EGL_GL_TEXTURE_CUBE_MAP_POSITIVE_X_KHR" alias="EGL_GL_TEXTURE_CUBE_MAP_POSITIVE_X"/>
>+        <enum value="0x30B4" name="EGL_GL_TEXTURE_CUBE_MAP_NEGATIVE_X"/>
>+        <enum value="0x30B4" name="EGL_GL_TEXTURE_CUBE_MAP_NEGATIVE_X_KHR" alias="EGL_GL_TEXTURE_CUBE_MAP_NEGATIVE_X"/>
>+        <enum value="0x30B5" name="EGL_GL_TEXTURE_CUBE_MAP_POSITIVE_Y"/>
>+        <enum value="0x30B5" name="EGL_GL_TEXTURE_CUBE_MAP_POSITIVE_Y_KHR" alias="EGL_GL_TEXTURE_CUBE_MAP_POSITIVE_Y"/>
>+        <enum value="0x30B6" name="EGL_GL_TEXTURE_CUBE_MAP_NEGATIVE_Y"/>
>+        <enum value="0x30B6" name="EGL_GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_KHR" alias="EGL_GL_TEXTURE_CUBE_MAP_NEGATIVE_Y"/>
>+        <enum value="0x30B7" name="EGL_GL_TEXTURE_CUBE_MAP_POSITIVE_Z"/>
>+        <enum value="0x30B7" name="EGL_GL_TEXTURE_CUBE_MAP_POSITIVE_Z_KHR" alias="EGL_GL_TEXTURE_CUBE_MAP_POSITIVE_Z"/>
>+        <enum value="0x30B8" name="EGL_GL_TEXTURE_CUBE_MAP_NEGATIVE_Z"/>
>+        <enum value="0x30B8" name="EGL_GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_KHR" alias="EGL_GL_TEXTURE_CUBE_MAP_NEGATIVE_Z"/>
>+        <enum value="0x30B9" name="EGL_GL_RENDERBUFFER"/>
>+        <enum value="0x30B9" name="EGL_GL_RENDERBUFFER_KHR" alias="EGL_GL_RENDERBUFFER"/>
>+        <enum value="0x30BA" name="EGL_VG_PARENT_IMAGE_KHR"/>
>+        <enum value="0x30BC" name="EGL_GL_TEXTURE_LEVEL"/>
>+        <enum value="0x30BC" name="EGL_GL_TEXTURE_LEVEL_KHR" alias="EGL_GL_TEXTURE_LEVEL"/>
>+        <enum value="0x30BD" name="EGL_GL_TEXTURE_ZOFFSET"/>
>+        <enum value="0x30BD" name="EGL_GL_TEXTURE_ZOFFSET_KHR" alias="EGL_GL_TEXTURE_ZOFFSET"/>
>+        <enum value="0x30BE" name="EGL_POST_SUB_BUFFER_SUPPORTED_NV"/>
>+        <enum value="0x30BF" name="EGL_CONTEXT_OPENGL_ROBUST_ACCESS_EXT"/>
>+    </enums>
>+
>+    <enums namespace="EGL" start="0x30C0-0x30CF" vendor="KHR">
>+        <enum value="0x30C0" name="EGL_FORMAT_RGB_565_EXACT_KHR"/>
>+        <enum value="0x30C1" name="EGL_FORMAT_RGB_565_KHR"/>
>+        <enum value="0x30C2" name="EGL_FORMAT_RGBA_8888_EXACT_KHR"/>
>+        <enum value="0x30C3" name="EGL_FORMAT_RGBA_8888_KHR"/>
>+        <enum value="0x30C4" name="EGL_MAP_PRESERVE_PIXELS_KHR"/>
>+        <enum value="0x30C5" name="EGL_LOCK_USAGE_HINT_KHR"/>
>+        <enum value="0x30C6" name="EGL_BITMAP_POINTER_KHR"/>
>+        <enum value="0x30C7" name="EGL_BITMAP_PITCH_KHR"/>
>+        <enum value="0x30C8" name="EGL_BITMAP_ORIGIN_KHR"/>
>+        <enum value="0x30C9" name="EGL_BITMAP_PIXEL_RED_OFFSET_KHR"/>
>+        <enum value="0x30CA" name="EGL_BITMAP_PIXEL_GREEN_OFFSET_KHR"/>
>+        <enum value="0x30CB" name="EGL_BITMAP_PIXEL_BLUE_OFFSET_KHR"/>
>+        <enum value="0x30CC" name="EGL_BITMAP_PIXEL_ALPHA_OFFSET_KHR"/>
>+        <enum value="0x30CD" name="EGL_BITMAP_PIXEL_LUMINANCE_OFFSET_KHR"/>
>+        <enum value="0x30CE" name="EGL_LOWER_LEFT_KHR"/>
>+        <enum value="0x30CF" name="EGL_UPPER_LEFT_KHR"/>
>+    </enums>
>+
>+    <enums namespace="EGL" start="0x30D0" end="0x30DF" vendor="Symbian" comment="Reserved for Robert Palmer (bug #2545)">
>+            <unused start="0x30D0" end="0x30D1"/>
>+        <enum value="0x30D2" name="EGL_IMAGE_PRESERVED"/>
>+        <enum value="0x30D2" name="EGL_IMAGE_PRESERVED_KHR"/>
>+            <unused start="0x30D3" end="0x30D9"/>
>+        <enum value="0x30DA" name="EGL_SHARED_IMAGE_NOK" comment="Unreleased extension"/>
>+            <unused start="0x30DB" end="0x30DF"/>
>+    </enums>
>+
>+    <enums namespace="EGL" start="0x30E0" end="0x30EF" vendor="NV" comment="Reserved for Russell Pflughaupt (bug #3314)">
>+        <enum value="0x30E0" name="EGL_COVERAGE_BUFFERS_NV"/>
>+        <enum value="0x30E1" name="EGL_COVERAGE_SAMPLES_NV"/>
>+        <enum value="0x30E2" name="EGL_DEPTH_ENCODING_NV"/>
>+        <enum value="0x30E3" name="EGL_DEPTH_ENCODING_NONLINEAR_NV"/>
>+            <unused start="0x30E4" end="0x30E5"/>
>+        <enum value="0x30E6" name="EGL_SYNC_PRIOR_COMMANDS_COMPLETE_NV"/>
>+        <enum value="0x30E7" name="EGL_SYNC_STATUS_NV"/>
>+        <enum value="0x30E8" name="EGL_SIGNALED_NV"/>
>+        <enum value="0x30E9" name="EGL_UNSIGNALED_NV"/>
>+        <enum value="0x30EA" name="EGL_ALREADY_SIGNALED_NV"/>
>+        <enum value="0x30EB" name="EGL_TIMEOUT_EXPIRED_NV"/>
>+        <enum value="0x30EC" name="EGL_CONDITION_SATISFIED_NV"/>
>+        <enum value="0x30ED" name="EGL_SYNC_TYPE_NV"/>
>+        <enum value="0x30EE" name="EGL_SYNC_CONDITION_NV"/>
>+        <enum value="0x30EF" name="EGL_SYNC_FENCE_NV"/>
>+    </enums>
>+
>+    <enums namespace="EGL" start="0x30F0" end="0x30FF" vendor="KHR">
>+        <enum value="0x30F0" name="EGL_SYNC_PRIOR_COMMANDS_COMPLETE"/>
>+        <enum value="0x30F0" name="EGL_SYNC_PRIOR_COMMANDS_COMPLETE_KHR" alias="EGL_SYNC_PRIOR_COMMANDS_COMPLETE"/>
>+        <enum value="0x30F1" name="EGL_SYNC_STATUS"/>
>+        <enum value="0x30F1" name="EGL_SYNC_STATUS_KHR" alias="EGL_SYNC_STATUS"/>
>+        <enum value="0x30F2" name="EGL_SIGNALED"/>
>+        <enum value="0x30F2" name="EGL_SIGNALED_KHR" alias="EGL_SIGNALED"/>
>+        <enum value="0x30F3" name="EGL_UNSIGNALED"/>
>+        <enum value="0x30F3" name="EGL_UNSIGNALED_KHR" alias="EGL_UNSIGNALED"/>
>+        <enum value="0x30F5" name="EGL_TIMEOUT_EXPIRED"/>
>+        <enum value="0x30F5" name="EGL_TIMEOUT_EXPIRED_KHR" alias="EGL_TIMEOUT_EXPIRED"/>
>+        <enum value="0x30F6" name="EGL_CONDITION_SATISFIED"/>
>+        <enum value="0x30F6" name="EGL_CONDITION_SATISFIED_KHR" alias="EGL_CONDITION_SATISFIED"/>
>+        <enum value="0x30F7" name="EGL_SYNC_TYPE"/>
>+        <enum value="0x30F7" name="EGL_SYNC_TYPE_KHR" alias="EGL_SYNC_TYPE"/>
>+        <enum value="0x30F8" name="EGL_SYNC_CONDITION"/>
>+        <enum value="0x30F8" name="EGL_SYNC_CONDITION_KHR" alias="EGL_SYNC_CONDITION"/>
>+        <enum value="0x30F9" name="EGL_SYNC_FENCE"/>
>+        <enum value="0x30F9" name="EGL_SYNC_FENCE_KHR" alias="EGL_SYNC_FENCE"/>
>+        <enum value="0x30FA" name="EGL_SYNC_REUSABLE_KHR"/>
>+        <enum value="0x30FB" name="EGL_CONTEXT_MINOR_VERSION"/>
>+        <enum value="0x30FB" name="EGL_CONTEXT_MINOR_VERSION_KHR" alias="EGL_CONTEXT_MINOR_VERSION"/>
>+        <enum value="0x30FC" name="EGL_CONTEXT_FLAGS_KHR"/>
>+        <enum value="0x30FD" name="EGL_CONTEXT_OPENGL_PROFILE_MASK"/>
>+        <enum value="0x30FD" name="EGL_CONTEXT_OPENGL_PROFILE_MASK_KHR" alias="EGL_CONTEXT_OPENGL_PROFILE_MASK"/>
>+        <enum value="0x30FE" name="EGL_SYNC_CL_EVENT"/>
>+        <enum value="0x30FE" name="EGL_SYNC_CL_EVENT_KHR" alias="EGL_SYNC_CL_EVENT"/>
>+        <enum value="0x30FF" name="EGL_SYNC_CL_EVENT_COMPLETE"/>
>+        <enum value="0x30FF" name="EGL_SYNC_CL_EVENT_COMPLETE_KHR" alias="EGL_SYNC_CL_EVENT_COMPLETE"/>
>+    </enums>
>+
>+    <enums namespace="EGL" start="0x3100" end="0x310F" vendor="IMG" comment="Reserved for Ben Bowman (Khronos bug 4748)">
>+        <enum value="0x3100" name="EGL_CONTEXT_PRIORITY_LEVEL_IMG"/>
>+        <enum value="0x3101" name="EGL_CONTEXT_PRIORITY_HIGH_IMG"/>
>+        <enum value="0x3102" name="EGL_CONTEXT_PRIORITY_MEDIUM_IMG"/>
>+        <enum value="0x3103" name="EGL_CONTEXT_PRIORITY_LOW_IMG"/>
>+            <unused start="0x3104"/>
>+        <enum value="0x3105" name="EGL_NATIVE_BUFFER_MULTIPLANE_SEPARATE_IMG"/>
>+        <enum value="0x3106" name="EGL_NATIVE_BUFFER_PLANE_OFFSET_IMG"/>
>+            <unused start="0x3107" end="0x310F"/>
>+    </enums>
>+
>+    <enums namespace="EGL" start="0x3110" end="0x311F" vendor="ATX" comment="Reserved for Tim Renouf, Antix (Khronos bug 4949)">
>+        <enum value="0x3110" name="EGL_BITMAP_PIXEL_SIZE_KHR"/>
>+            <unused start="0x3111" end="0x311F"/>
>+    </enums>
>+
>+    <enums namespace="EGL" start="0x3120" end="0x312F" vendor="AMD" comment="Reserved for David Garcia (Khronos bug 5149)">
>+            <unused start="0x3120" end="0x312F"/>
>+    </enums>
>+
>+    <enums namespace="EGL" start="0x3130" end="0x313F" vendor="NV" comment="Reserved for Greg Prisament (Khronos bug 5166)">
>+            <unused start="0x3130"/>
>+        <enum value="0x3131" name="EGL_COVERAGE_SAMPLE_RESOLVE_NV"/>
>+        <enum value="0x3132" name="EGL_COVERAGE_SAMPLE_RESOLVE_DEFAULT_NV"/>
>+        <enum value="0x3133" name="EGL_COVERAGE_SAMPLE_RESOLVE_NONE_NV"/>
>+        <enum value="0x3134" name="EGL_MULTIVIEW_VIEW_COUNT_EXT"/>
>+            <unused start="0x3135"/>
>+        <enum value="0x3136" name="EGL_AUTO_STEREO_NV"/>
>+            <unused start="0x3137"/>
>+        <enum value="0x3138" name="EGL_CONTEXT_OPENGL_RESET_NOTIFICATION_STRATEGY_EXT"/>
>+            <unused start="0x3139" end="0x313C"/>
>+        <enum value="0x313D" name="EGL_BUFFER_AGE_KHR"/>
>+        <enum value="0x313D" name="EGL_BUFFER_AGE_EXT" alias="EGL_BUFFER_AGE_KHR"/>
>+            <unused start="0x313E" end="0x313F"/>
>+        <enum value="0x313F" name="EGL_PLATFORM_DEVICE_EXT"/>
>+    </enums>
>+
>+    <enums namespace="EGL" start="0x3140" end="0x314F" vendor="Google" comment="Reserved for Mathias Agopian (Khronos bug 5199)">
>+        <enum value="0x3140" name="EGL_NATIVE_BUFFER_ANDROID"/>
>+        <enum value="0x3141" name="EGL_PLATFORM_ANDROID_KHR"/>
>+        <enum value="0x3142" name="EGL_RECORDABLE_ANDROID"/>
>+        <enum value="0x3143" name="EGL_NATIVE_BUFFER_USAGE_ANDROID"/>
>+        <enum value="0x3144" name="EGL_SYNC_NATIVE_FENCE_ANDROID"/>
>+        <enum value="0x3145" name="EGL_SYNC_NATIVE_FENCE_FD_ANDROID"/>
>+        <enum value="0x3146" name="EGL_SYNC_NATIVE_FENCE_SIGNALED_ANDROID"/>
>+        <enum value="0x3147" name="EGL_FRAMEBUFFER_TARGET_ANDROID"/>
>+            <unused start="0x3148" end="0x314B"/>
>+        <enum value="0x314C" name="EGL_FRONT_BUFFER_AUTO_REFRESH_ANDROID"/>
>+        <enum value="0x314D" name="EGL_GL_COLORSPACE_DEFAULT_EXT"/>
>+            <unused start="0x314E" end="0x314F"/>
>+    </enums>
>+
>+    <enums namespace="EGL" start="0x3150" end="0x315F" vendor="NOK" comment="Reserved for Robert Palmer (Khronos bug 5368)">
>+            <unused start="0x3150" end="0x315F"/>
>+    </enums>
>+
>+    <enums namespace="EGL" start="0x3160" end="0x316F" vendor="Seaweed" comment="Reserved for Sree Sridharan (Khronos public bug 198)">
>+            <unused start="0x3160" end="0x316F"/>
>+    </enums>
>+
>+    <enums namespace="EGL" start="0x3170" end="0x318F" vendor="QNX" comment="Reserved for Joel Pilon (Khronos bug 5834)">
>+            <unused start="0x3170" end="0x318F"/>
>+    </enums>
>+
>+    <enums namespace="EGL" start="0x3190" end="0x31AF" vendor="FSL" comment="Reserved for Brian Murray, Freescale (Khronos bug 5939)">
>+            <unused start="0x3190" end="0x31AF"/>
>+    </enums>
>+
>+    <enums namespace="EGL" start="0x31B0" end="0x31BF" vendor="KHR" comment="Reserved for Marcus Lorentzon (Khronos bug 6437)">
>+        <enum value="0x31B0" name="EGL_CONTEXT_OPENGL_DEBUG"/>
>+        <enum value="0x31B1" name="EGL_CONTEXT_OPENGL_FORWARD_COMPATIBLE"/>
>+        <enum value="0x31B2" name="EGL_CONTEXT_OPENGL_ROBUST_ACCESS"/>
>+        <enum value="0x31B3" name="EGL_CONTEXT_OPENGL_NO_ERROR_KHR"/>
>+            <unused start="0x31B4" end="0x31BC" comment="0x31B3-0x31BC formerly reserved for EGL_image_stream"/>
>+        <enum value="0x31BD" name="EGL_CONTEXT_OPENGL_RESET_NOTIFICATION_STRATEGY_KHR" alias="EGL_CONTEXT_OPENGL_RESET_NOTIFICATION_STRATEGY"/>
>+        <enum value="0x31BD" name="EGL_CONTEXT_OPENGL_RESET_NOTIFICATION_STRATEGY"/>
>+        <enum value="0x31BE" name="EGL_NO_RESET_NOTIFICATION"/>
>+        <enum value="0x31BE" name="EGL_NO_RESET_NOTIFICATION_KHR" alias="EGL_NO_RESET_NOTIFICATION"/>
>+        <enum value="0x31BE" name="EGL_NO_RESET_NOTIFICATION_EXT" alias="EGL_NO_RESET_NOTIFICATION"/>
>+        <enum value="0x31BF" name="EGL_LOSE_CONTEXT_ON_RESET"/>
>+        <enum value="0x31BF" name="EGL_LOSE_CONTEXT_ON_RESET_KHR" alias="EGL_LOSE_CONTEXT_ON_RESET"/>
>+        <enum value="0x31BF" name="EGL_LOSE_CONTEXT_ON_RESET_EXT" alias="EGL_LOSE_CONTEXT_ON_RESET"/>
>+    </enums>
>+
>+    <enums namespace="EGL" start="0x31C0" end="0x31CF" vendor="QCOM" comment="Reserved for Maurice Ribble (Khronos bug 6644) - EGL_QCOM_create_image spec TBD">
>+            <unused start="0x31C0" end="0x31CF"/>
>+    </enums>
>+
>+    <enums namespace="EGL" start="0x31D0" end="0x31DF" vendor="MESA" comment="Reserved for Kristian H&#248;gsberg (Khronos bug 6757)">
>+        <enum value="0x31D0" name="EGL_DRM_BUFFER_FORMAT_MESA"/>
>+        <enum value="0x31D1" name="EGL_DRM_BUFFER_USE_MESA"/>
>+        <enum value="0x31D2" name="EGL_DRM_BUFFER_FORMAT_ARGB32_MESA"/>
>+        <enum value="0x31D3" name="EGL_DRM_BUFFER_MESA"/>
>+        <enum value="0x31D4" name="EGL_DRM_BUFFER_STRIDE_MESA"/>
>+        <enum value="0x31D5" name="EGL_PLATFORM_X11_KHR"/>
>+        <enum value="0x31D5" name="EGL_PLATFORM_X11_EXT" alias="EGL_PLATFORM_X11_KHR"/>
>+        <enum value="0x31D6" name="EGL_PLATFORM_X11_SCREEN_KHR"/>
>+        <enum value="0x31D6" name="EGL_PLATFORM_X11_SCREEN_EXT" alias="EGL_PLATFORM_X11_SCREEN_KHR"/>
>+        <enum value="0x31D7" name="EGL_PLATFORM_GBM_KHR"/>
>+        <enum value="0x31D7" name="EGL_PLATFORM_GBM_MESA" alias="EGL_PLATFORM_GBM_KHR"/>
>+        <enum value="0x31D8" name="EGL_PLATFORM_WAYLAND_KHR"/>
>+        <enum value="0x31D8" name="EGL_PLATFORM_WAYLAND_EXT" alias="EGL_PLATFORM_WAYLAND_KHR"/>
>+            <unused start="0x31D9" end="0x31DC"/>
>+        <enum value="0x31DD" name="EGL_PLATFORM_SURFACELESS_MESA"/>
>+            <unused start="0x31DE" end="0x31DF"/>
>+    </enums>
>+
>+    <enums namespace="EGL" start="0x31E0" end="0x31EF" vendor="HI" comment="Reserved for Mark Callow (Khronos bug 6799)">
>+            <unused start="0x31E0" end="0x31EF"/>
>+    </enums>
>+
>+    <enums namespace="EGL" start="0x31F0" end="0x31FF" vendor="KHR">
>+            <unused start="0x31F0" end="0x31FB" comment="Placeholders for draft extensions follow"/>
>+        
>+        <enum value="0x31FC" name="EGL_STREAM_FIFO_LENGTH_KHR"/>
>+        <enum value="0x31FD" name="EGL_STREAM_TIME_NOW_KHR"/>
>+        <enum value="0x31FE" name="EGL_STREAM_TIME_CONSUMER_KHR"/>
>+        <enum value="0x31FF" name="EGL_STREAM_TIME_PRODUCER_KHR"/>
>+    </enums>
>+
>+    <enums namespace="EGL" start="0x3200" end="0x320F" vendor="ANGLE" comment="Reserved for Daniel Koch, ANGLE Project (Khronos bug 7139)">
>+        <enum value="0x3200" name="EGL_D3D_TEXTURE_2D_SHARE_HANDLE_ANGLE"/>
>+        <enum value="0x3201" name="EGL_FIXED_SIZE_ANGLE"/>
>+            <unused start="0x3202" end="0x320F"/>
>+    </enums>
>+
>+    <enums namespace="EGL" start="0x3210" end="0x321F" vendor="KHR">
>+        <enum value="0x3210" name="EGL_CONSUMER_LATENCY_USEC_KHR"/>
>+            <unused start="0x3211"/>
>+        <enum value="0x3212" name="EGL_PRODUCER_FRAME_KHR"/>
>+        <enum value="0x3213" name="EGL_CONSUMER_FRAME_KHR"/>
>+        <enum value="0x3214" name="EGL_STREAM_STATE_KHR"/>
>+        <enum value="0x3215" name="EGL_STREAM_STATE_CREATED_KHR"/>
>+        <enum value="0x3216" name="EGL_STREAM_STATE_CONNECTING_KHR"/>
>+        <enum value="0x3217" name="EGL_STREAM_STATE_EMPTY_KHR"/>
>+        <enum value="0x3218" name="EGL_STREAM_STATE_NEW_FRAME_AVAILABLE_KHR"/>
>+        <enum value="0x3219" name="EGL_STREAM_STATE_OLD_FRAME_AVAILABLE_KHR"/>
>+        <enum value="0x321A" name="EGL_STREAM_STATE_DISCONNECTED_KHR"/>
>+        <enum value="0x321B" name="EGL_BAD_STREAM_KHR"/>
>+        <enum value="0x321C" name="EGL_BAD_STATE_KHR"/>
>+        <enum value="0x321D" name="EGL_BUFFER_COUNT_NV" comment="From EGL_NV_stream_producer_eglsurface, which has no known specification and was replaced by a KHR extension"/>
>+        <enum value="0x321E" name="EGL_CONSUMER_ACQUIRE_TIMEOUT_USEC_KHR"/>
>+        <enum value="0x321F" name="EGL_SYNC_NEW_FRAME_NV"/>
>+    </enums>
>+
>+    <enums namespace="EGL" start="0x3220" end="0x325F" vendor="NV" comment="Reserved for Greg Roth (Bug 8220)">
>+            <unused start="0x3220" end="0x322A"/>
>+        <enum value="0x322B" name="EGL_BAD_DEVICE_EXT"/>
>+        <enum value="0x322C" name="EGL_DEVICE_EXT"/>
>+        <enum value="0x322D" name="EGL_BAD_OUTPUT_LAYER_EXT"/>
>+        <enum value="0x322E" name="EGL_BAD_OUTPUT_PORT_EXT"/>
>+        <enum value="0x322F" name="EGL_SWAP_INTERVAL_EXT"/>
>+            <unused start="0x3230" end="0x3232"/>
>+        <enum value="0x3233" name="EGL_DRM_DEVICE_FILE_EXT"/>
>+        <enum value="0x3234" name="EGL_DRM_CRTC_EXT"/>
>+        <enum value="0x3235" name="EGL_DRM_PLANE_EXT"/>
>+        <enum value="0x3236" name="EGL_DRM_CONNECTOR_EXT"/>
>+        <enum value="0x3237" name="EGL_OPENWF_DEVICE_ID_EXT"/>
>+        <enum value="0x3238" name="EGL_OPENWF_PIPELINE_ID_EXT"/>
>+        <enum value="0x3239" name="EGL_OPENWF_PORT_ID_EXT"/>
>+        <enum value="0x323A" name="EGL_CUDA_DEVICE_NV"/>
>+        <enum value="0x323B" name="EGL_CUDA_EVENT_HANDLE_NV"/>
>+        <enum value="0x323C" name="EGL_SYNC_CUDA_EVENT_NV"/>
>+        <enum value="0x323D" name="EGL_SYNC_CUDA_EVENT_COMPLETE_NV"/>
>+            <unused start="0x323E"/>
>+        <enum value="0x323F" name="EGL_STREAM_CROSS_PARTITION_NV"/>
>+        <enum value="0x3240" name="EGL_STREAM_STATE_INITIALIZING_NV"/>
>+        <enum value="0x3241" name="EGL_STREAM_TYPE_NV"/>
>+        <enum value="0x3242" name="EGL_STREAM_PROTOCOL_NV"/>
>+        <enum value="0x3243" name="EGL_STREAM_ENDPOINT_NV"/>
>+        <enum value="0x3244" name="EGL_STREAM_LOCAL_NV"/>
>+        <enum value="0x3245" name="EGL_STREAM_CROSS_PROCESS_NV"/>
>+        <enum value="0x3246" name="EGL_STREAM_PROTOCOL_FD_NV"/>
>+        <enum value="0x3247" name="EGL_STREAM_PRODUCER_NV"/>
>+        <enum value="0x3248" name="EGL_STREAM_CONSUMER_NV"/>
>+            <unused start="0x3239" end="0x324A"/>
>+        <enum value="0x324B" name="EGL_STREAM_PROTOCOL_SOCKET_NV"/>
>+        <enum value="0x324C" name="EGL_SOCKET_HANDLE_NV"/>
>+        <enum value="0x324D" name="EGL_SOCKET_TYPE_NV"/>
>+        <enum value="0x324E" name="EGL_SOCKET_TYPE_UNIX_NV"/>
>+        <enum value="0x324F" name="EGL_SOCKET_TYPE_INET_NV"/>
>+        <enum value="0x3250" name="EGL_MAX_STREAM_METADATA_BLOCKS_NV"/>
>+        <enum value="0x3251" name="EGL_MAX_STREAM_METADATA_BLOCK_SIZE_NV"/>
>+        <enum value="0x3252" name="EGL_MAX_STREAM_METADATA_TOTAL_SIZE_NV"/>
>+        <enum value="0x3253" name="EGL_PRODUCER_METADATA_NV"/>
>+        <enum value="0x3254" name="EGL_CONSUMER_METADATA_NV"/>
>+        <enum value="0x3255" name="EGL_METADATA0_SIZE_NV"/>
>+        <enum value="0x3256" name="EGL_METADATA1_SIZE_NV"/>
>+        <enum value="0x3257" name="EGL_METADATA2_SIZE_NV"/>
>+        <enum value="0x3258" name="EGL_METADATA3_SIZE_NV"/>
>+        <enum value="0x3259" name="EGL_METADATA0_TYPE_NV"/>
>+        <enum value="0x325A" name="EGL_METADATA1_TYPE_NV"/>
>+        <enum value="0x325B" name="EGL_METADATA2_TYPE_NV"/>
>+        <enum value="0x325C" name="EGL_METADATA3_TYPE_NV"/>
>+            <unused start="0x325D" end="0x325F"/>
>+    </enums>
>+
>+    <enums namespace="EGL" start="0x3260" end="0x326F" vendor="BCOM" comment="Reserved for Gary Sweet, Broadcom (Public bug 620)">
>+            <unused start="0x3260" end="0x326F"/>
>+    </enums>
>+
>+    <enums namespace="EGL" start="0x3270" end="0x328F" vendor="ARM" comment="Reserved for Tom Cooksey (Bug 9963)">
>+        <enum value="0x3270" name="EGL_LINUX_DMA_BUF_EXT"/>
>+        <enum value="0x3271" name="EGL_LINUX_DRM_FOURCC_EXT"/>
>+        <enum value="0x3272" name="EGL_DMA_BUF_PLANE0_FD_EXT"/>
>+        <enum value="0x3273" name="EGL_DMA_BUF_PLANE0_OFFSET_EXT"/>
>+        <enum value="0x3274" name="EGL_DMA_BUF_PLANE0_PITCH_EXT"/>
>+        <enum value="0x3275" name="EGL_DMA_BUF_PLANE1_FD_EXT"/>
>+        <enum value="0x3276" name="EGL_DMA_BUF_PLANE1_OFFSET_EXT"/>
>+        <enum value="0x3277" name="EGL_DMA_BUF_PLANE1_PITCH_EXT"/>
>+        <enum value="0x3278" name="EGL_DMA_BUF_PLANE2_FD_EXT"/>
>+        <enum value="0x3279" name="EGL_DMA_BUF_PLANE2_OFFSET_EXT"/>
>+        <enum value="0x327A" name="EGL_DMA_BUF_PLANE2_PITCH_EXT"/>
>+        <enum value="0x327B" name="EGL_YUV_COLOR_SPACE_HINT_EXT"/>
>+        <enum value="0x327C" name="EGL_SAMPLE_RANGE_HINT_EXT"/>
>+        <enum value="0x327D" name="EGL_YUV_CHROMA_HORIZONTAL_SITING_HINT_EXT"/>
>+        <enum value="0x327E" name="EGL_YUV_CHROMA_VERTICAL_SITING_HINT_EXT"/>
>+        <enum value="0x327F" name="EGL_ITU_REC601_EXT"/>
>+        <enum value="0x3280" name="EGL_ITU_REC709_EXT"/>
>+        <enum value="0x3281" name="EGL_ITU_REC2020_EXT"/>
>+        <enum value="0x3282" name="EGL_YUV_FULL_RANGE_EXT"/>
>+        <enum value="0x3283" name="EGL_YUV_NARROW_RANGE_EXT"/>
>+        <enum value="0x3284" name="EGL_YUV_CHROMA_SITING_0_EXT"/>
>+        <enum value="0x3285" name="EGL_YUV_CHROMA_SITING_0_5_EXT"/>
>+        <enum value="0x3286" name="EGL_DISCARD_SAMPLES_ARM"/>
>+            <unused start="0x3287" end="0x3289"/>
>+        <enum value="0x328A" name="EGL_SYNC_PRIOR_COMMANDS_IMPLICIT_EXTERNAL_ARM"/>
>+            <unused start="0x328B" end="0x328F"/>
>+    </enums>
>+
>+    <enums namespace="EGL" start="0x3290" end="0x329F" vendor="MESA" comment="Reserved for John K&#229;re Alsaker (Public bug 757)">
>+            <unused start="0x3290" end="0x329F"/>
>+    </enums>
>+
>+    <enums namespace="EGL" start="0x32A0" end="0x32AF" vendor="Samsung" comment="Reserved for Dongyeon Kim (Public bug 880)">
>+        <enum value="0x32A0" name="EGL_NATIVE_BUFFER_TIZEN"/>
>+        <enum value="0x32A1" name="EGL_NATIVE_SURFACE_TIZEN"/>
>+            <unused start="0x32A2" end="0x32AF"/>
>+    </enums>
>+
>+    <enums namespace="EGL" start="0x32B0" end="0x32BF" vendor="QCOM" comment="Reserved for Jeff Vigil (Bug 10663) - EGL_QCOM_lock_image spec TBD">
>+            <unused start="0x32B0" end="0x32BF"/>
>+    </enums>
>+
>+    <enums namespace="EGL" start="0x32C0" end="0x32CF" vendor="Vivante" comment="Reserved for Yanjun Zhang (Bug 11498)">
>+        <enum value="0x32C0" name="EGL_PROTECTED_CONTENT_EXT"/>
>+            <unused start="0x32C1" end="0x32CF"/>
>+    </enums>
>+
>+    <enums namespace="EGL" start="0x32D0" end="0x32EF" vendor="QCOM" comment="Reserved for Jeff Vigil (Bug 11735) - EGL_QCOM_gpu_perf spec TBD + Bug 12286 - EGL_QCOM_content_protection spec TBD">
>+            <unused start="0x32D0" end="0x32EF"/>
>+    </enums>
>+
>+    <enums namespace="EGL" start="0x32F0" end="0x32FF" vendor="BCOM" comment="Reserved for Gary Sweet, Broadcom (Bug 12870)">
>+            <unused start="0x32F0" end="0x32FF"/>
>+    </enums>
>+
>+    <enums namespace="EGL" start="0x3300" end="0x331F" vendor="QCOM" comment="Reserved for Jeff Vigil (Bugs 12973,12849) - EGL_EXT_yuv_surface spec TBD">
>+        <enum value="0x3300" name="EGL_YUV_BUFFER_EXT"/>
>+        <enum value="0x3301" name="EGL_YUV_ORDER_EXT"/>
>+        <enum value="0x3302" name="EGL_YUV_ORDER_YUV_EXT"/>
>+        <enum value="0x3303" name="EGL_YUV_ORDER_YVU_EXT"/>
>+        <enum value="0x3304" name="EGL_YUV_ORDER_YUYV_EXT"/>
>+        <enum value="0x3305" name="EGL_YUV_ORDER_UYVY_EXT"/>
>+        <enum value="0x3306" name="EGL_YUV_ORDER_YVYU_EXT"/>
>+        <enum value="0x3307" name="EGL_YUV_ORDER_VYUY_EXT"/>
>+        <enum value="0x3308" name="EGL_YUV_ORDER_AYUV_EXT"/>
>+            <unused start="0x3309"/>
>+        <enum value="0x330A" name="EGL_YUV_CSC_STANDARD_EXT"/>
>+        <enum value="0x330B" name="EGL_YUV_CSC_STANDARD_601_EXT"/>
>+        <enum value="0x330C" name="EGL_YUV_CSC_STANDARD_709_EXT"/>
>+        <enum value="0x330D" name="EGL_YUV_CSC_STANDARD_2020_EXT"/>
>+            <unused start="0x330E" end="0x3310"/>
>+        <enum value="0x3311" name="EGL_YUV_NUMBER_OF_PLANES_EXT"/>
>+        <enum value="0x3312" name="EGL_YUV_SUBSAMPLE_EXT"/>
>+        <enum value="0x3313" name="EGL_YUV_SUBSAMPLE_4_2_0_EXT"/>
>+        <enum value="0x3314" name="EGL_YUV_SUBSAMPLE_4_2_2_EXT"/>
>+        <enum value="0x3315" name="EGL_YUV_SUBSAMPLE_4_4_4_EXT"/>
>+            <unused start="0x3316"/>
>+        <enum value="0x3317" name="EGL_YUV_DEPTH_RANGE_EXT"/>
>+        <enum value="0x3318" name="EGL_YUV_DEPTH_RANGE_LIMITED_EXT"/>
>+        <enum value="0x3319" name="EGL_YUV_DEPTH_RANGE_FULL_EXT"/>
>+        <enum value="0x331A" name="EGL_YUV_PLANE_BPP_EXT"/>
>+        <enum value="0x331B" name="EGL_YUV_PLANE_BPP_0_EXT"/>
>+        <enum value="0x331C" name="EGL_YUV_PLANE_BPP_8_EXT"/>
>+        <enum value="0x331D" name="EGL_YUV_PLANE_BPP_10_EXT"/>
>+            <unused start="0x331E" end="0x331F"/>
>+    </enums>
>+
>+    <enums namespace="EGL" start="0x3320" end="0x339F" vendor="NV" comment="Reserved for James Jones (Bug 13209)">
>+            <unused start="0x3320" end="0x3327"/>
>+        <enum value="0x3328" name="EGL_PENDING_METADATA_NV"/>
>+        <enum value="0x3329" name="EGL_PENDING_FRAME_NV"/>
>+        <enum value="0x332A" name="EGL_STREAM_TIME_PENDING_NV"/>
>+            <unused start="0x332B"/>
>+        <enum value="0x332C" name="EGL_YUV_PLANE0_TEXTURE_UNIT_NV"/>
>+        <enum value="0x332D" name="EGL_YUV_PLANE1_TEXTURE_UNIT_NV"/>
>+        <enum value="0x332E" name="EGL_YUV_PLANE2_TEXTURE_UNIT_NV"/>
>+            <unused start="0x332F" end="0x3333"/>
>+        <enum value="0x3334" name="EGL_SUPPORT_RESET_NV"/>
>+        <enum value="0x3335" name="EGL_SUPPORT_REUSE_NV"/>
>+        <enum value="0x3336" name="EGL_STREAM_FIFO_SYNCHRONOUS_NV"/>
>+        <enum value="0x3337" name="EGL_PRODUCER_MAX_FRAME_HINT_NV"/>
>+        <enum value="0x3338" name="EGL_CONSUMER_MAX_FRAME_HINT_NV"/>
>+        <enum value="0x3339" name="EGL_COLOR_COMPONENT_TYPE_EXT"/>
>+        <enum value="0x333A" name="EGL_COLOR_COMPONENT_TYPE_FIXED_EXT"/>
>+        <enum value="0x333B" name="EGL_COLOR_COMPONENT_TYPE_FLOAT_EXT"/>
>+        <enum value="0x333C" name="EGL_DRM_MASTER_FD_EXT"/>
>+            <unused start="0x333D" end="0x333E"/>
>+        <enum value="0x333F" name="EGL_GL_COLORSPACE_BT2020_LINEAR_EXT"/>
>+        <enum value="0x3340" name="EGL_GL_COLORSPACE_BT2020_PQ_EXT"/>
>+        <enum value="0x3341" name="EGL_SMPTE2086_DISPLAY_PRIMARY_RX_EXT"/>
>+        <enum value="0x3342" name="EGL_SMPTE2086_DISPLAY_PRIMARY_RY_EXT"/>
>+        <enum value="0x3343" name="EGL_SMPTE2086_DISPLAY_PRIMARY_GX_EXT"/>
>+        <enum value="0x3344" name="EGL_SMPTE2086_DISPLAY_PRIMARY_GY_EXT"/>
>+        <enum value="0x3345" name="EGL_SMPTE2086_DISPLAY_PRIMARY_BX_EXT"/>
>+        <enum value="0x3346" name="EGL_SMPTE2086_DISPLAY_PRIMARY_BY_EXT"/>
>+        <enum value="0x3347" name="EGL_SMPTE2086_WHITE_POINT_X_EXT"/>
>+        <enum value="0x3348" name="EGL_SMPTE2086_WHITE_POINT_Y_EXT"/>
>+        <enum value="0x3349" name="EGL_SMPTE2086_MAX_LUMINANCE_EXT"/>
>+        <enum value="0x334A" name="EGL_SMPTE2086_MIN_LUMINANCE_EXT"/>
>+        <enum value="50000"  name="EGL_METADATA_SCALING_EXT"/>
>+            <unused start="0x334B"/>
>+        <enum value="0x334C" name="EGL_GENERATE_RESET_ON_VIDEO_MEMORY_PURGE_NV"/>
>+        <enum value="0x334D" name="EGL_STREAM_CROSS_OBJECT_NV"/>
>+        <enum value="0x334E" name="EGL_STREAM_CROSS_DISPLAY_NV"/>
>+        <enum value="0x334F" name="EGL_STREAM_CROSS_SYSTEM_NV"/>
>+        <enum value="0x3350" name="EGL_GL_COLORSPACE_SCRGB_LINEAR_EXT"/>
>+        <enum value="0x3351" name="EGL_GL_COLORSPACE_SCRGB_EXT"/>
>+        <enum value="0x3352" name="EGL_TRACK_REFERENCES_KHR"/>
>+            <unused start="0x3353" end="0x3356"/>
>+        <enum value="0x3357" name="EGL_CONTEXT_PRIORITY_REALTIME_NV"/>
>+            <unused start="0x3358" end="0x335F"/>
>+        <enum value="0x3360" name="EGL_CTA861_3_MAX_CONTENT_LIGHT_LEVEL_EXT"/>
>+        <enum value="0x3361" name="EGL_CTA861_3_MAX_FRAME_AVERAGE_LEVEL_EXT"/>
>+        <enum value="0x3362" name="EGL_GL_COLORSPACE_DISPLAY_P3_LINEAR_EXT"/>
>+        <enum value="0x3363" name="EGL_GL_COLORSPACE_DISPLAY_P3_EXT"/>
>+        <enum value="0x3364" name="EGL_SYNC_CLIENT_EXT"/>
>+        <enum value="0x3365" name="EGL_SYNC_CLIENT_SIGNAL_EXT"/>
>+            <unused start="0x3366" end="0x339F"/>
>+    </enums>
>+
>+    <enums namespace="EGL" start="0x33A0" end="0x33AF" vendor="ANGLE" comment="Reserved for Shannon Woods (Bug 13175)">
>+        <enum value="0x33A0" name="EGL_D3D9_DEVICE_ANGLE"/>
>+        <enum value="0x33A1" name="EGL_D3D11_DEVICE_ANGLE"/>
>+            <unused start="0x33A2" end="0x33AF"/>
>+    </enums>
>+
>+    <enums namespace="EGL" start="0x33B0" end="0x33BF" vendor="KHR" comment="Reserved for EGL_KHR_debug / Jeff Vigil (Bug 13357)">
>+        <enum value="0x33B0" name="EGL_OBJECT_THREAD_KHR"/>
>+        <enum value="0x33B1" name="EGL_OBJECT_DISPLAY_KHR"/>
>+        <enum value="0x33B2" name="EGL_OBJECT_CONTEXT_KHR"/>
>+        <enum value="0x33B3" name="EGL_OBJECT_SURFACE_KHR"/>
>+        <enum value="0x33B4" name="EGL_OBJECT_IMAGE_KHR"/>
>+        <enum value="0x33B5" name="EGL_OBJECT_SYNC_KHR"/>
>+        <enum value="0x33B6" name="EGL_OBJECT_STREAM_KHR"/>
>+            <unused start="0x33B7"/>
>+        <enum value="0x33B8" name="EGL_DEBUG_CALLBACK_KHR"/>
>+        <enum value="0x33B9" name="EGL_DEBUG_MSG_CRITICAL_KHR"/>
>+        <enum value="0x33BA" name="EGL_DEBUG_MSG_ERROR_KHR"/>
>+        <enum value="0x33BB" name="EGL_DEBUG_MSG_WARN_KHR"/>
>+        <enum value="0x33BC" name="EGL_DEBUG_MSG_INFO_KHR"/>
>+            <unused start="0x33BD" end="0x33BF"/>
>+    </enums>
>+
>+    <enums namespace="EGL" start="0x33C0" end="0x33DF" vendor="BCOM" comment="Reserved for Gary Sweet (Bug 12203)">
>+            <unused start="0x33C0" end="0x33DF"/>
>+    </enums>
>+
>+    <enums namespace="EGL" start="0x33E0" end="0x342F" vendor="QCOM" comment="Reserved for Jeff Vigil (Bugs 10663,13364)">
>+            <unused start="0x33E0" end="0x342F"/>
>+    </enums>
>+
>+    <enums namespace="EGL" start="0x3430" end="0x343F" vendor="ANDROID" comment="Reserved for Pablo Ceballos (Bug 15874)">
>+        <enum value="EGL_CAST(EGLnsecsANDROID,-2)" name="EGL_TIMESTAMP_PENDING_ANDROID"/>
>+        <enum value="EGL_CAST(EGLnsecsANDROID,-1)" name="EGL_TIMESTAMP_INVALID_ANDROID"/>
>+        <enum value="0x3430" name="EGL_TIMESTAMPS_ANDROID"/>
>+        <enum value="0x3431" name="EGL_COMPOSITE_DEADLINE_ANDROID"/>
>+        <enum value="0x3432" name="EGL_COMPOSITE_INTERVAL_ANDROID"/>
>+        <enum value="0x3433" name="EGL_COMPOSITE_TO_PRESENT_LATENCY_ANDROID"/>
>+        <enum value="0x3434" name="EGL_REQUESTED_PRESENT_TIME_ANDROID"/>
>+        <enum value="0x3435" name="EGL_RENDERING_COMPLETE_TIME_ANDROID"/>
>+        <enum value="0x3436" name="EGL_COMPOSITION_LATCH_TIME_ANDROID"/>
>+        <enum value="0x3437" name="EGL_FIRST_COMPOSITION_START_TIME_ANDROID"/>
>+        <enum value="0x3438" name="EGL_LAST_COMPOSITION_START_TIME_ANDROID"/>
>+        <enum value="0x3439" name="EGL_FIRST_COMPOSITION_GPU_FINISHED_TIME_ANDROID"/>
>+        <enum value="0x343A" name="EGL_DISPLAY_PRESENT_TIME_ANDROID"/>
>+        <enum value="0x343B" name="EGL_DEQUEUE_READY_TIME_ANDROID"/>
>+        <enum value="0x343C" name="EGL_READS_DONE_TIME_ANDROID"/>
>+            <unused start="0x343D" end="0x343F"/>
>+    </enums>
>+
>+    <enums namespace="EGL" start="0x3440" end="0x344F" vendor="ANDROID" comment="Reserved for Kristian Kristensen (Bug 16033)">
>+        <enum value="0x3440" name="EGL_DMA_BUF_PLANE3_FD_EXT"/>
>+        <enum value="0x3441" name="EGL_DMA_BUF_PLANE3_OFFSET_EXT"/>
>+        <enum value="0x3442" name="EGL_DMA_BUF_PLANE3_PITCH_EXT"/>
>+        <enum value="0x3443" name="EGL_DMA_BUF_PLANE0_MODIFIER_LO_EXT"/>
>+        <enum value="0x3444" name="EGL_DMA_BUF_PLANE0_MODIFIER_HI_EXT"/>
>+        <enum value="0x3445" name="EGL_DMA_BUF_PLANE1_MODIFIER_LO_EXT"/>
>+        <enum value="0x3446" name="EGL_DMA_BUF_PLANE1_MODIFIER_HI_EXT"/>
>+        <enum value="0x3447" name="EGL_DMA_BUF_PLANE2_MODIFIER_LO_EXT"/>
>+        <enum value="0x3448" name="EGL_DMA_BUF_PLANE2_MODIFIER_HI_EXT"/>
>+        <enum value="0x3449" name="EGL_DMA_BUF_PLANE3_MODIFIER_LO_EXT"/>
>+        <enum value="0x344A" name="EGL_DMA_BUF_PLANE3_MODIFIER_HI_EXT"/>
>+            <unused start="0x344B" end="0x344F"/>
>+    </enums>
>+
>+    <enums namespace="EGL" start="0x3450" end="0x345F" vendor="ANGLE" comment="Reserved for Shannon Woods (Bug 16106)">
>+            <unused start="0x3450" end="0x345F"/>
>+    </enums>
>+
>+    <enums namespace="EGL" start="0x3460" end="0x346F" vendor="COREAVI" comment="Reserved for Daniel Herring (Bug 16162)">
>+        <enum value="0x3460" name="EGL_PRIMARY_COMPOSITOR_CONTEXT_EXT"/>
>+        <enum value="0x3461" name="EGL_EXTERNAL_REF_ID_EXT"/>
>+        <enum value="0x3462" name="EGL_COMPOSITOR_DROP_NEWEST_FRAME_EXT"/>
>+        <enum value="0x3463" name="EGL_COMPOSITOR_KEEP_NEWEST_FRAME_EXT"/>
>+        <enum value="0x3464" name="EGL_FRONT_BUFFER_EXT"/>
>+        <unused start="0x3465" end="0x346F"/>
>+    </enums>
>+
>+    <enums namespace="EGL" start="0x3470" end="0x347F" vendor="EXT" comment="Reserved for Daniel Stone (PR 14)">
>+        <enum value="0x3470" name="EGL_IMPORT_SYNC_TYPE_EXT"/>
>+        <enum value="0x3471" name="EGL_IMPORT_IMPLICIT_SYNC_EXT"/>
>+        <enum value="0x3472" name="EGL_IMPORT_EXPLICIT_SYNC_EXT"/>
>+    </enums>
>+    <enums namespace="EGL" start="0x3480" end="0x348F" vendor="ANGLE" comment="Reserved for Courtney Goeltzenleuchter - ANGLE (gitlab EGL bug 7)">
>+            <unused start="0x3480" end="0x348F"/>
>+    </enums>
>+
>+
>+
>+
>+    <enums namespace="EGL" start="0x3490" end="0x3FFF" vendor="KHR" comment="Reserved for future use">
>+            <unused start="0x3490" end="0x3FFF"/>
>+    </enums>
>+
>+    <enums namespace="EGL" start="0x8F70" end="0x8F7F" vendor="HI" comment="For Mark Callow, Khronos bug 4055. Shared with GL.">
>+        <enum value="0x8F70" name="EGL_COLOR_FORMAT_HI"/>
>+        <enum value="0x8F71" name="EGL_COLOR_RGB_HI"/>
>+        <enum value="0x8F72" name="EGL_COLOR_RGBA_HI"/>
>+        <enum value="0x8F73" name="EGL_COLOR_ARGB_HI"/>
>+        <enum value="0x8F74" name="EGL_CLIENT_PIXMAP_POINTER_HI"/>
>+    </enums>
>+
>+    
>+    <commands namespace="EGL">
>+        <command>
>+            <proto><ptype>EGLBoolean</ptype> <name>eglBindAPI</name></proto>
>+            <param><ptype>EGLenum</ptype> <name>api</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>EGLBoolean</ptype> <name>eglBindTexImage</name></proto>
>+            <param><ptype>EGLDisplay</ptype> <name>dpy</name></param>
>+            <param><ptype>EGLSurface</ptype> <name>surface</name></param>
>+            <param><ptype>EGLint</ptype> <name>buffer</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>EGLBoolean</ptype> <name>eglChooseConfig</name></proto>
>+            <param><ptype>EGLDisplay</ptype> <name>dpy</name></param>
>+            <param>const <ptype>EGLint</ptype> *<name>attrib_list</name></param>
>+            <param><ptype>EGLConfig</ptype> *<name>configs</name></param>
>+            <param><ptype>EGLint</ptype> <name>config_size</name></param>
>+            <param><ptype>EGLint</ptype> *<name>num_config</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>EGLBoolean</ptype> <name>eglClientSignalSyncEXT</name></proto>
>+            <param><ptype>EGLDisplay</ptype> <name>dpy</name></param>
>+            <param><ptype>EGLSync</ptype> <name>sync</name></param>
>+            <param>const <ptype>EGLAttrib</ptype> *<name>attrib_list</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>EGLint</ptype> <name>eglClientWaitSync</name></proto>
>+            <param><ptype>EGLDisplay</ptype> <name>dpy</name></param>
>+            <param><ptype>EGLSync</ptype> <name>sync</name></param>
>+            <param><ptype>EGLint</ptype> <name>flags</name></param>
>+            <param><ptype>EGLTime</ptype> <name>timeout</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>EGLint</ptype> <name>eglClientWaitSyncKHR</name></proto>
>+            <param><ptype>EGLDisplay</ptype> <name>dpy</name></param>
>+            <param><ptype>EGLSyncKHR</ptype> <name>sync</name></param>
>+            <param><ptype>EGLint</ptype> <name>flags</name></param>
>+            <param><ptype>EGLTimeKHR</ptype> <name>timeout</name></param>
>+            <alias name="eglClientWaitSync"/>
>+        </command>
>+        <command>
>+            <proto><ptype>EGLint</ptype> <name>eglClientWaitSyncNV</name></proto>
>+            <param><ptype>EGLSyncNV</ptype> <name>sync</name></param>
>+            <param><ptype>EGLint</ptype> <name>flags</name></param>
>+            <param><ptype>EGLTimeNV</ptype> <name>timeout</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>EGLBoolean</ptype> <name>eglCopyBuffers</name></proto>
>+            <param><ptype>EGLDisplay</ptype> <name>dpy</name></param>
>+            <param><ptype>EGLSurface</ptype> <name>surface</name></param>
>+            <param><ptype>EGLNativePixmapType</ptype> <name>target</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>EGLContext</ptype> <name>eglCreateContext</name></proto>
>+            <param><ptype>EGLDisplay</ptype> <name>dpy</name></param>
>+            <param><ptype>EGLConfig</ptype> <name>config</name></param>
>+            <param><ptype>EGLContext</ptype> <name>share_context</name></param>
>+            <param>const <ptype>EGLint</ptype> *<name>attrib_list</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>EGLImageKHR</ptype> <name>eglCreateDRMImageMESA</name></proto>
>+            <param><ptype>EGLDisplay</ptype> <name>dpy</name></param>
>+            <param>const <ptype>EGLint</ptype> *<name>attrib_list</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>EGLSyncNV</ptype> <name>eglCreateFenceSyncNV</name></proto>
>+            <param><ptype>EGLDisplay</ptype> <name>dpy</name></param>
>+            <param><ptype>EGLenum</ptype> <name>condition</name></param>
>+            <param>const <ptype>EGLint</ptype> *<name>attrib_list</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>EGLImage</ptype> <name>eglCreateImage</name></proto>
>+            <param><ptype>EGLDisplay</ptype> <name>dpy</name></param>
>+            <param><ptype>EGLContext</ptype> <name>ctx</name></param>
>+            <param><ptype>EGLenum</ptype> <name>target</name></param>
>+            <param><ptype>EGLClientBuffer</ptype> <name>buffer</name></param>
>+            <param>const <ptype>EGLAttrib</ptype> *<name>attrib_list</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>EGLImageKHR</ptype> <name>eglCreateImageKHR</name></proto>
>+            <param><ptype>EGLDisplay</ptype> <name>dpy</name></param>
>+            <param><ptype>EGLContext</ptype> <name>ctx</name></param>
>+            <param><ptype>EGLenum</ptype> <name>target</name></param>
>+            <param><ptype>EGLClientBuffer</ptype> <name>buffer</name></param>
>+            <param>const <ptype>EGLint</ptype> *<name>attrib_list</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>EGLClientBuffer</ptype> <name>eglCreateNativeClientBufferANDROID</name></proto>
>+            <param>const <ptype>EGLint</ptype> *<name>attrib_list</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>EGLSurface</ptype> <name>eglCreatePbufferFromClientBuffer</name></proto>
>+            <param><ptype>EGLDisplay</ptype> <name>dpy</name></param>
>+            <param><ptype>EGLenum</ptype> <name>buftype</name></param>
>+            <param><ptype>EGLClientBuffer</ptype> <name>buffer</name></param>
>+            <param><ptype>EGLConfig</ptype> <name>config</name></param>
>+            <param>const <ptype>EGLint</ptype> *<name>attrib_list</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>EGLSurface</ptype> <name>eglCreatePbufferSurface</name></proto>
>+            <param><ptype>EGLDisplay</ptype> <name>dpy</name></param>
>+            <param><ptype>EGLConfig</ptype> <name>config</name></param>
>+            <param>const <ptype>EGLint</ptype> *<name>attrib_list</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>EGLSurface</ptype> <name>eglCreatePixmapSurface</name></proto>
>+            <param><ptype>EGLDisplay</ptype> <name>dpy</name></param>
>+            <param><ptype>EGLConfig</ptype> <name>config</name></param>
>+            <param><ptype>EGLNativePixmapType</ptype> <name>pixmap</name></param>
>+            <param>const <ptype>EGLint</ptype> *<name>attrib_list</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>EGLSurface</ptype> <name>eglCreatePixmapSurfaceHI</name></proto>
>+            <param><ptype>EGLDisplay</ptype> <name>dpy</name></param>
>+            <param><ptype>EGLConfig</ptype> <name>config</name></param>
>+            <param>struct <ptype>EGLClientPixmapHI</ptype> *<name>pixmap</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>EGLSurface</ptype> <name>eglCreatePlatformPixmapSurface</name></proto>
>+            <param><ptype>EGLDisplay</ptype> <name>dpy</name></param>
>+            <param><ptype>EGLConfig</ptype> <name>config</name></param>
>+            <param>void *<name>native_pixmap</name></param>
>+            <param>const <ptype>EGLAttrib</ptype> *<name>attrib_list</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>EGLSurface</ptype> <name>eglCreatePlatformPixmapSurfaceEXT</name></proto>
>+            <param><ptype>EGLDisplay</ptype> <name>dpy</name></param>
>+            <param><ptype>EGLConfig</ptype> <name>config</name></param>
>+            <param>void *<name>native_pixmap</name></param>
>+            <param>const <ptype>EGLint</ptype> *<name>attrib_list</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>EGLSurface</ptype> <name>eglCreatePlatformWindowSurface</name></proto>
>+            <param><ptype>EGLDisplay</ptype> <name>dpy</name></param>
>+            <param><ptype>EGLConfig</ptype> <name>config</name></param>
>+            <param>void *<name>native_window</name></param>
>+            <param>const <ptype>EGLAttrib</ptype> *<name>attrib_list</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>EGLSurface</ptype> <name>eglCreatePlatformWindowSurfaceEXT</name></proto>
>+            <param><ptype>EGLDisplay</ptype> <name>dpy</name></param>
>+            <param><ptype>EGLConfig</ptype> <name>config</name></param>
>+            <param>void *<name>native_window</name></param>
>+            <param>const <ptype>EGLint</ptype> *<name>attrib_list</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>EGLStreamKHR</ptype> <name>eglCreateStreamFromFileDescriptorKHR</name></proto>
>+            <param><ptype>EGLDisplay</ptype> <name>dpy</name></param>
>+            <param><ptype>EGLNativeFileDescriptorKHR</ptype> <name>file_descriptor</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>EGLStreamKHR</ptype> <name>eglCreateStreamKHR</name></proto>
>+            <param><ptype>EGLDisplay</ptype> <name>dpy</name></param>
>+            <param>const <ptype>EGLint</ptype> *<name>attrib_list</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>EGLStreamKHR</ptype> <name>eglCreateStreamAttribKHR</name></proto>
>+            <param><ptype>EGLDisplay</ptype> <name>dpy</name></param>
>+            <param>const <ptype>EGLAttrib</ptype> *<name>attrib_list</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>EGLSurface</ptype> <name>eglCreateStreamProducerSurfaceKHR</name></proto>
>+            <param><ptype>EGLDisplay</ptype> <name>dpy</name></param>
>+            <param><ptype>EGLConfig</ptype> <name>config</name></param>
>+            <param><ptype>EGLStreamKHR</ptype> <name>stream</name></param>
>+            <param>const <ptype>EGLint</ptype> *<name>attrib_list</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>EGLSyncKHR</ptype> <name>eglCreateStreamSyncNV</name></proto>
>+            <param><ptype>EGLDisplay</ptype> <name>dpy</name></param>
>+            <param><ptype>EGLStreamKHR</ptype> <name>stream</name></param>
>+            <param><ptype>EGLenum</ptype> <name>type</name></param>
>+            <param>const <ptype>EGLint</ptype> *<name>attrib_list</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>EGLSync</ptype> <name>eglCreateSync</name></proto>
>+            <param><ptype>EGLDisplay</ptype> <name>dpy</name></param>
>+            <param><ptype>EGLenum</ptype> <name>type</name></param>
>+            <param>const <ptype>EGLAttrib</ptype> *<name>attrib_list</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>EGLSyncKHR</ptype> <name>eglCreateSyncKHR</name></proto>
>+            <param><ptype>EGLDisplay</ptype> <name>dpy</name></param>
>+            <param><ptype>EGLenum</ptype> <name>type</name></param>
>+            <param>const <ptype>EGLint</ptype> *<name>attrib_list</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>EGLSyncKHR</ptype> <name>eglCreateSync64KHR</name></proto>
>+            <param><ptype>EGLDisplay</ptype> <name>dpy</name></param>
>+            <param><ptype>EGLenum</ptype> <name>type</name></param>
>+            <param>const <ptype>EGLAttribKHR</ptype> *<name>attrib_list</name></param>
>+            <alias name="eglCreateSync"/>
>+        </command>
>+        <command>
>+            <proto><ptype>EGLSurface</ptype> <name>eglCreateWindowSurface</name></proto>
>+            <param><ptype>EGLDisplay</ptype> <name>dpy</name></param>
>+            <param><ptype>EGLConfig</ptype> <name>config</name></param>
>+            <param><ptype>EGLNativeWindowType</ptype> <name>win</name></param>
>+            <param>const <ptype>EGLint</ptype> *<name>attrib_list</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>EGLint</ptype> <name>eglDebugMessageControlKHR</name></proto>
>+            <param><ptype>EGLDEBUGPROCKHR</ptype> <name>callback</name></param>
>+            <param>const <ptype>EGLAttrib</ptype> *<name>attrib_list</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>EGLBoolean</ptype> <name>eglDestroyContext</name></proto>
>+            <param><ptype>EGLDisplay</ptype> <name>dpy</name></param>
>+            <param><ptype>EGLContext</ptype> <name>ctx</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>EGLBoolean</ptype> <name>eglDestroyImage</name></proto>
>+            <param><ptype>EGLDisplay</ptype> <name>dpy</name></param>
>+            <param><ptype>EGLImage</ptype> <name>image</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>EGLBoolean</ptype> <name>eglDestroyImageKHR</name></proto>
>+            <param><ptype>EGLDisplay</ptype> <name>dpy</name></param>
>+            <param><ptype>EGLImageKHR</ptype> <name>image</name></param>
>+            <alias name="eglDestroyImage"/>
>+        </command>
>+        <command>
>+            <proto><ptype>EGLBoolean</ptype> <name>eglDestroyStreamKHR</name></proto>
>+            <param><ptype>EGLDisplay</ptype> <name>dpy</name></param>
>+            <param><ptype>EGLStreamKHR</ptype> <name>stream</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>EGLBoolean</ptype> <name>eglDestroySurface</name></proto>
>+            <param><ptype>EGLDisplay</ptype> <name>dpy</name></param>
>+            <param><ptype>EGLSurface</ptype> <name>surface</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>EGLBoolean</ptype> <name>eglDestroySync</name></proto>
>+            <param><ptype>EGLDisplay</ptype> <name>dpy</name></param>
>+            <param><ptype>EGLSync</ptype> <name>sync</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>EGLBoolean</ptype> <name>eglDestroySyncKHR</name></proto>
>+            <param><ptype>EGLDisplay</ptype> <name>dpy</name></param>
>+            <param><ptype>EGLSyncKHR</ptype> <name>sync</name></param>
>+            <alias name="eglDestroySync"/>
>+        </command>
>+        <command>
>+            <proto><ptype>EGLBoolean</ptype> <name>eglDestroySyncNV</name></proto>
>+            <param><ptype>EGLSyncNV</ptype> <name>sync</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>EGLint</ptype> <name>eglDupNativeFenceFDANDROID</name></proto>
>+            <param><ptype>EGLDisplay</ptype> <name>dpy</name></param>
>+            <param><ptype>EGLSyncKHR</ptype> <name>sync</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>EGLBoolean</ptype> <name>eglExportDMABUFImageMESA</name></proto>
>+            <param><ptype>EGLDisplay</ptype> <name>dpy</name></param>
>+            <param><ptype>EGLImageKHR</ptype> <name>image</name></param>
>+            <param>int *<name>fds</name></param>
>+            <param><ptype>EGLint</ptype> *<name>strides</name></param>
>+            <param><ptype>EGLint</ptype> *<name>offsets</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>EGLBoolean</ptype> <name>eglExportDMABUFImageQueryMESA</name></proto>
>+            <param><ptype>EGLDisplay</ptype> <name>dpy</name></param>
>+            <param><ptype>EGLImageKHR</ptype> <name>image</name></param>
>+            <param>int *<name>fourcc</name></param>
>+            <param>int *<name>num_planes</name></param>
>+            <param><ptype>EGLuint64KHR</ptype> *<name>modifiers</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>EGLBoolean</ptype> <name>eglExportDRMImageMESA</name></proto>
>+            <param><ptype>EGLDisplay</ptype> <name>dpy</name></param>
>+            <param><ptype>EGLImageKHR</ptype> <name>image</name></param>
>+            <param><ptype>EGLint</ptype> *<name>name</name></param>
>+            <param><ptype>EGLint</ptype> *<name>handle</name></param>
>+            <param><ptype>EGLint</ptype> *<name>stride</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>EGLBoolean</ptype> <name>eglFenceNV</name></proto>
>+            <param><ptype>EGLSyncNV</ptype> <name>sync</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>EGLBoolean</ptype> <name>eglGetConfigAttrib</name></proto>
>+            <param><ptype>EGLDisplay</ptype> <name>dpy</name></param>
>+            <param><ptype>EGLConfig</ptype> <name>config</name></param>
>+            <param><ptype>EGLint</ptype> <name>attribute</name></param>
>+            <param><ptype>EGLint</ptype> *<name>value</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>EGLBoolean</ptype> <name>eglGetConfigs</name></proto>
>+            <param><ptype>EGLDisplay</ptype> <name>dpy</name></param>
>+            <param><ptype>EGLConfig</ptype> *<name>configs</name></param>
>+            <param><ptype>EGLint</ptype> <name>config_size</name></param>
>+            <param><ptype>EGLint</ptype> *<name>num_config</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>EGLContext</ptype> <name>eglGetCurrentContext</name></proto>
>+        </command>
>+        <command>
>+            <proto><ptype>EGLDisplay</ptype> <name>eglGetCurrentDisplay</name></proto>
>+        </command>
>+        <command>
>+            <proto><ptype>EGLSurface</ptype> <name>eglGetCurrentSurface</name></proto>
>+            <param><ptype>EGLint</ptype> <name>readdraw</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>EGLDisplay</ptype> <name>eglGetDisplay</name></proto>
>+            <param><ptype>EGLNativeDisplayType</ptype> <name>display_id</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>EGLint</ptype> <name>eglGetError</name></proto>
>+        </command>
>+        <command>
>+            <proto><ptype>EGLClientBuffer</ptype> <name>eglGetNativeClientBufferANDROID</name></proto>
>+            <param>const struct <ptype>AHardwareBuffer</ptype> *<name>buffer</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>EGLBoolean</ptype> <name>eglGetOutputLayersEXT</name></proto>
>+            <param><ptype>EGLDisplay</ptype> <name>dpy</name></param>
>+            <param>const <ptype>EGLAttrib</ptype> *<name>attrib_list</name></param>
>+            <param><ptype>EGLOutputLayerEXT</ptype> *<name>layers</name></param>
>+            <param><ptype>EGLint</ptype> <name>max_layers</name></param>
>+            <param><ptype>EGLint</ptype> *<name>num_layers</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>EGLBoolean</ptype> <name>eglGetOutputPortsEXT</name></proto>
>+            <param><ptype>EGLDisplay</ptype> <name>dpy</name></param>
>+            <param>const <ptype>EGLAttrib</ptype> *<name>attrib_list</name></param>
>+            <param><ptype>EGLOutputPortEXT</ptype> *<name>ports</name></param>
>+            <param><ptype>EGLint</ptype> <name>max_ports</name></param>
>+            <param><ptype>EGLint</ptype> *<name>num_ports</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>EGLDisplay</ptype> <name>eglGetPlatformDisplay</name></proto>
>+            <param><ptype>EGLenum</ptype> <name>platform</name></param>
>+            <param>void *<name>native_display</name></param>
>+            <param>const <ptype>EGLAttrib</ptype> *<name>attrib_list</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>EGLDisplay</ptype> <name>eglGetPlatformDisplayEXT</name></proto>
>+            <param><ptype>EGLenum</ptype> <name>platform</name></param>
>+            <param>void *<name>native_display</name></param>
>+            <param>const <ptype>EGLint</ptype> *<name>attrib_list</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>__eglMustCastToProperFunctionPointerType</ptype> <name>eglGetProcAddress</name></proto>
>+            <param>const char *<name>procname</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>EGLNativeFileDescriptorKHR</ptype> <name>eglGetStreamFileDescriptorKHR</name></proto>
>+            <param><ptype>EGLDisplay</ptype> <name>dpy</name></param>
>+            <param><ptype>EGLStreamKHR</ptype> <name>stream</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>EGLBoolean</ptype> <name>eglGetSyncAttrib</name></proto>
>+            <param><ptype>EGLDisplay</ptype> <name>dpy</name></param>
>+            <param><ptype>EGLSync</ptype> <name>sync</name></param>
>+            <param><ptype>EGLint</ptype> <name>attribute</name></param>
>+            <param><ptype>EGLAttrib</ptype> *<name>value</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>EGLBoolean</ptype> <name>eglGetSyncAttribKHR</name></proto>
>+            <param><ptype>EGLDisplay</ptype> <name>dpy</name></param>
>+            <param><ptype>EGLSyncKHR</ptype> <name>sync</name></param>
>+            <param><ptype>EGLint</ptype> <name>attribute</name></param>
>+            <param><ptype>EGLint</ptype> *<name>value</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>EGLBoolean</ptype> <name>eglGetSyncAttribNV</name></proto>
>+            <param><ptype>EGLSyncNV</ptype> <name>sync</name></param>
>+            <param><ptype>EGLint</ptype> <name>attribute</name></param>
>+            <param><ptype>EGLint</ptype> *<name>value</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>EGLuint64NV</ptype> <name>eglGetSystemTimeFrequencyNV</name></proto>
>+        </command>
>+        <command>
>+            <proto><ptype>EGLuint64NV</ptype> <name>eglGetSystemTimeNV</name></proto>
>+        </command>
>+        <command>
>+            <proto><ptype>EGLBoolean</ptype> <name>eglInitialize</name></proto>
>+            <param><ptype>EGLDisplay</ptype> <name>dpy</name></param>
>+            <param><ptype>EGLint</ptype> *<name>major</name></param>
>+            <param><ptype>EGLint</ptype> *<name>minor</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>EGLint</ptype> <name>eglLabelObjectKHR</name></proto>
>+            <param><ptype>EGLDisplay</ptype> <name>display</name></param>
>+            <param><ptype>EGLenum</ptype> <name>objectType</name></param>
>+            <param><ptype>EGLObjectKHR</ptype> <name>object</name></param>
>+            <param><ptype>EGLLabelKHR</ptype> <name>label</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>EGLBoolean</ptype> <name>eglLockSurfaceKHR</name></proto>
>+            <param><ptype>EGLDisplay</ptype> <name>dpy</name></param>
>+            <param><ptype>EGLSurface</ptype> <name>surface</name></param>
>+            <param>const <ptype>EGLint</ptype> *<name>attrib_list</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>EGLBoolean</ptype> <name>eglMakeCurrent</name></proto>
>+            <param><ptype>EGLDisplay</ptype> <name>dpy</name></param>
>+            <param><ptype>EGLSurface</ptype> <name>draw</name></param>
>+            <param><ptype>EGLSurface</ptype> <name>read</name></param>
>+            <param><ptype>EGLContext</ptype> <name>ctx</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>EGLBoolean</ptype> <name>eglOutputLayerAttribEXT</name></proto>
>+            <param><ptype>EGLDisplay</ptype> <name>dpy</name></param>
>+            <param><ptype>EGLOutputLayerEXT</ptype> <name>layer</name></param>
>+            <param><ptype>EGLint</ptype> <name>attribute</name></param>
>+            <param><ptype>EGLAttrib</ptype> <name>value</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>EGLBoolean</ptype> <name>eglOutputPortAttribEXT</name></proto>
>+            <param><ptype>EGLDisplay</ptype> <name>dpy</name></param>
>+            <param><ptype>EGLOutputPortEXT</ptype> <name>port</name></param>
>+            <param><ptype>EGLint</ptype> <name>attribute</name></param>
>+            <param><ptype>EGLAttrib</ptype> <name>value</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>EGLBoolean</ptype> <name>eglPostSubBufferNV</name></proto>
>+            <param><ptype>EGLDisplay</ptype> <name>dpy</name></param>
>+            <param><ptype>EGLSurface</ptype> <name>surface</name></param>
>+            <param><ptype>EGLint</ptype> <name>x</name></param>
>+            <param><ptype>EGLint</ptype> <name>y</name></param>
>+            <param><ptype>EGLint</ptype> <name>width</name></param>
>+            <param><ptype>EGLint</ptype> <name>height</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>EGLBoolean</ptype> <name>eglPresentationTimeANDROID</name></proto>
>+            <param><ptype>EGLDisplay</ptype> <name>dpy</name></param>
>+            <param><ptype>EGLSurface</ptype> <name>surface</name></param>
>+            <param><ptype>EGLnsecsANDROID</ptype> <name>time</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>EGLBoolean</ptype> <name>eglGetCompositorTimingSupportedANDROID</name></proto>
>+            <param><ptype>EGLDisplay</ptype> <name>dpy</name></param>
>+            <param><ptype>EGLSurface</ptype> <name>surface</name></param>
>+            <param><ptype>EGLint</ptype> <name>name</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>EGLBoolean</ptype> <name>eglGetCompositorTimingANDROID</name></proto>
>+            <param><ptype>EGLDisplay</ptype> <name>dpy</name></param>
>+            <param><ptype>EGLSurface</ptype> <name>surface</name></param>
>+            <param><ptype>EGLint</ptype> <name>numTimestamps</name></param>
>+            <param> const <ptype>EGLint</ptype> *<name>names</name></param>
>+            <param><ptype>EGLnsecsANDROID</ptype> *<name>values</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>EGLBoolean</ptype> <name>eglGetNextFrameIdANDROID</name></proto>
>+            <param><ptype>EGLDisplay</ptype> <name>dpy</name></param>
>+            <param><ptype>EGLSurface</ptype> <name>surface</name></param>
>+            <param><ptype>EGLuint64KHR</ptype> *<name>frameId</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>EGLBoolean</ptype> <name>eglGetFrameTimestampSupportedANDROID</name></proto>
>+            <param><ptype>EGLDisplay</ptype> <name>dpy</name></param>
>+            <param><ptype>EGLSurface</ptype> <name>surface</name></param>
>+            <param><ptype>EGLint</ptype> <name>timestamp</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>EGLBoolean</ptype> <name>eglGetFrameTimestampsANDROID</name></proto>
>+            <param><ptype>EGLDisplay</ptype> <name>dpy</name></param>
>+            <param><ptype>EGLSurface</ptype> <name>surface</name></param>
>+            <param><ptype>EGLuint64KHR</ptype> <name>frameId</name></param>
>+            <param><ptype>EGLint</ptype> <name>numTimestamps</name></param>
>+            <param> const <ptype>EGLint</ptype> *<name>timestamps</name></param>
>+            <param><ptype>EGLnsecsANDROID</ptype> *<name>values</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>EGLenum</ptype> <name>eglQueryAPI</name></proto>
>+        </command>
>+        <command>
>+            <proto><ptype>EGLBoolean</ptype> <name>eglQueryContext</name></proto>
>+            <param><ptype>EGLDisplay</ptype> <name>dpy</name></param>
>+            <param><ptype>EGLContext</ptype> <name>ctx</name></param>
>+            <param><ptype>EGLint</ptype> <name>attribute</name></param>
>+            <param><ptype>EGLint</ptype> *<name>value</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>EGLBoolean</ptype> <name>eglQueryDebugKHR</name></proto>
>+            <param><ptype>EGLint</ptype> <name>attribute</name></param>
>+            <param><ptype>EGLAttrib</ptype> *<name>value</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>EGLBoolean</ptype> <name>eglQueryDeviceAttribEXT</name></proto>
>+            <param><ptype>EGLDeviceEXT</ptype> <name>device</name></param>
>+            <param><ptype>EGLint</ptype> <name>attribute</name></param>
>+            <param><ptype>EGLAttrib</ptype> *<name>value</name></param>
>+        </command>
>+        <command>
>+            <proto>const char *<name>eglQueryDeviceStringEXT</name></proto>
>+            <param><ptype>EGLDeviceEXT</ptype> <name>device</name></param>
>+            <param><ptype>EGLint</ptype> <name>name</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>EGLBoolean</ptype> <name>eglQueryDevicesEXT</name></proto>
>+            <param><ptype>EGLint</ptype> <name>max_devices</name></param>
>+            <param><ptype>EGLDeviceEXT</ptype> *<name>devices</name></param>
>+            <param><ptype>EGLint</ptype> *<name>num_devices</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>EGLBoolean</ptype> <name>eglQueryDisplayAttribEXT</name></proto>
>+            <param><ptype>EGLDisplay</ptype> <name>dpy</name></param>
>+            <param><ptype>EGLint</ptype> <name>attribute</name></param>
>+            <param><ptype>EGLAttrib</ptype> *<name>value</name></param>
>+            <alias name="eglQueryDisplayAttribKHR"/>
>+        </command>
>+        <command>
>+            <proto><ptype>EGLBoolean</ptype> <name>eglQueryDisplayAttribKHR</name></proto>
>+            <param><ptype>EGLDisplay</ptype> <name>dpy</name></param>
>+            <param><ptype>EGLint</ptype> <name>name</name></param>
>+            <param><ptype>EGLAttrib</ptype> *<name>value</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>EGLBoolean</ptype> <name>eglQueryDisplayAttribNV</name></proto>
>+            <param><ptype>EGLDisplay</ptype> <name>dpy</name></param>
>+            <param><ptype>EGLint</ptype> <name>attribute</name></param>
>+            <param><ptype>EGLAttrib</ptype> *<name>value</name></param>
>+            <alias name="eglQueryDisplayAttribKHR"/>
>+        </command>
>+        <command>
>+            <proto><ptype>EGLBoolean</ptype> <name>eglQueryDmaBufFormatsEXT</name></proto>
>+            <param><ptype>EGLDisplay</ptype> <name>dpy</name></param>
>+            <param><ptype>EGLint</ptype> <name>max_formats</name></param>
>+            <param><ptype>EGLint</ptype> *<name>formats</name></param>
>+            <param><ptype>EGLint</ptype> *<name>num_formats</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>EGLBoolean</ptype> <name>eglQueryDmaBufModifiersEXT</name></proto>
>+            <param><ptype>EGLDisplay</ptype> <name>dpy</name></param>
>+            <param><ptype>EGLint</ptype> <name>format</name></param>
>+            <param><ptype>EGLint</ptype> <name>max_modifiers</name></param>
>+            <param><ptype>EGLuint64KHR</ptype> *<name>modifiers</name></param>
>+            <param><ptype>EGLBoolean</ptype> *<name>external_only</name></param>
>+            <param><ptype>EGLint</ptype> *<name>num_modifiers</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>EGLBoolean</ptype> <name>eglQueryNativeDisplayNV</name></proto>
>+            <param><ptype>EGLDisplay</ptype> <name>dpy</name></param>
>+            <param><ptype>EGLNativeDisplayType</ptype> *<name>display_id</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>EGLBoolean</ptype> <name>eglQueryNativePixmapNV</name></proto>
>+            <param><ptype>EGLDisplay</ptype> <name>dpy</name></param>
>+            <param><ptype>EGLSurface</ptype> <name>surf</name></param>
>+            <param><ptype>EGLNativePixmapType</ptype> *<name>pixmap</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>EGLBoolean</ptype> <name>eglQueryNativeWindowNV</name></proto>
>+            <param><ptype>EGLDisplay</ptype> <name>dpy</name></param>
>+            <param><ptype>EGLSurface</ptype> <name>surf</name></param>
>+            <param><ptype>EGLNativeWindowType</ptype> *<name>window</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>EGLBoolean</ptype> <name>eglQueryOutputLayerAttribEXT</name></proto>
>+            <param><ptype>EGLDisplay</ptype> <name>dpy</name></param>
>+            <param><ptype>EGLOutputLayerEXT</ptype> <name>layer</name></param>
>+            <param><ptype>EGLint</ptype> <name>attribute</name></param>
>+            <param><ptype>EGLAttrib</ptype> *<name>value</name></param>
>+        </command>
>+        <command>
>+            <proto>const char *<name>eglQueryOutputLayerStringEXT</name></proto>
>+            <param><ptype>EGLDisplay</ptype> <name>dpy</name></param>
>+            <param><ptype>EGLOutputLayerEXT</ptype> <name>layer</name></param>
>+            <param><ptype>EGLint</ptype> <name>name</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>EGLBoolean</ptype> <name>eglQueryOutputPortAttribEXT</name></proto>
>+            <param><ptype>EGLDisplay</ptype> <name>dpy</name></param>
>+            <param><ptype>EGLOutputPortEXT</ptype> <name>port</name></param>
>+            <param><ptype>EGLint</ptype> <name>attribute</name></param>
>+            <param><ptype>EGLAttrib</ptype> *<name>value</name></param>
>+        </command>
>+        <command>
>+            <proto>const char *<name>eglQueryOutputPortStringEXT</name></proto>
>+            <param><ptype>EGLDisplay</ptype> <name>dpy</name></param>
>+            <param><ptype>EGLOutputPortEXT</ptype> <name>port</name></param>
>+            <param><ptype>EGLint</ptype> <name>name</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>EGLBoolean</ptype> <name>eglQueryStreamKHR</name></proto>
>+            <param><ptype>EGLDisplay</ptype> <name>dpy</name></param>
>+            <param><ptype>EGLStreamKHR</ptype> <name>stream</name></param>
>+            <param><ptype>EGLenum</ptype> <name>attribute</name></param>
>+            <param><ptype>EGLint</ptype> *<name>value</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>EGLBoolean</ptype> <name>eglQueryStreamAttribKHR</name></proto>
>+            <param><ptype>EGLDisplay</ptype> <name>dpy</name></param>
>+            <param><ptype>EGLStreamKHR</ptype> <name>stream</name></param>
>+            <param><ptype>EGLenum</ptype> <name>attribute</name></param>
>+            <param><ptype>EGLAttrib</ptype> *<name>value</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>EGLBoolean</ptype> <name>eglQueryStreamMetadataNV</name></proto>
>+            <param><ptype>EGLDisplay</ptype> <name>dpy</name></param>
>+            <param><ptype>EGLStreamKHR</ptype> <name>stream</name></param>
>+            <param><ptype>EGLenum</ptype> <name>name</name></param>
>+            <param><ptype>EGLint</ptype> <name>n</name></param>
>+            <param><ptype>EGLint</ptype> <name>offset</name></param>
>+            <param><ptype>EGLint</ptype> <name>size</name></param>
>+            <param>void *<name>data</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>EGLBoolean</ptype> <name>eglQueryStreamTimeKHR</name></proto>
>+            <param><ptype>EGLDisplay</ptype> <name>dpy</name></param>
>+            <param><ptype>EGLStreamKHR</ptype> <name>stream</name></param>
>+            <param><ptype>EGLenum</ptype> <name>attribute</name></param>
>+            <param><ptype>EGLTimeKHR</ptype> *<name>value</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>EGLBoolean</ptype> <name>eglQueryStreamu64KHR</name></proto>
>+            <param><ptype>EGLDisplay</ptype> <name>dpy</name></param>
>+            <param><ptype>EGLStreamKHR</ptype> <name>stream</name></param>
>+            <param><ptype>EGLenum</ptype> <name>attribute</name></param>
>+            <param><ptype>EGLuint64KHR</ptype> *<name>value</name></param>
>+        </command>
>+        <command>
>+            <proto>const char *<name>eglQueryString</name></proto>
>+            <param><ptype>EGLDisplay</ptype> <name>dpy</name></param>
>+            <param><ptype>EGLint</ptype> <name>name</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>EGLBoolean</ptype> <name>eglQuerySurface</name></proto>
>+            <param><ptype>EGLDisplay</ptype> <name>dpy</name></param>
>+            <param><ptype>EGLSurface</ptype> <name>surface</name></param>
>+            <param><ptype>EGLint</ptype> <name>attribute</name></param>
>+            <param><ptype>EGLint</ptype> *<name>value</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>EGLBoolean</ptype> <name>eglQuerySurface64KHR</name></proto>
>+            <param><ptype>EGLDisplay</ptype> <name>dpy</name></param>
>+            <param><ptype>EGLSurface</ptype> <name>surface</name></param>
>+            <param><ptype>EGLint</ptype> <name>attribute</name></param>
>+            <param><ptype>EGLAttribKHR</ptype> *<name>value</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>EGLBoolean</ptype> <name>eglQuerySurfacePointerANGLE</name></proto>
>+            <param><ptype>EGLDisplay</ptype> <name>dpy</name></param>
>+            <param><ptype>EGLSurface</ptype> <name>surface</name></param>
>+            <param><ptype>EGLint</ptype> <name>attribute</name></param>
>+            <param>void **<name>value</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>EGLBoolean</ptype> <name>eglReleaseTexImage</name></proto>
>+            <param><ptype>EGLDisplay</ptype> <name>dpy</name></param>
>+            <param><ptype>EGLSurface</ptype> <name>surface</name></param>
>+            <param><ptype>EGLint</ptype> <name>buffer</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>EGLBoolean</ptype> <name>eglReleaseThread</name></proto>
>+        </command>
>+        <command>
>+            <proto><ptype>EGLBoolean</ptype> <name>eglResetStreamNV</name></proto>
>+            <param><ptype>EGLDisplay</ptype> <name>dpy</name></param>
>+            <param><ptype>EGLStreamKHR</ptype> <name>stream</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>eglSetBlobCacheFuncsANDROID</name></proto>
>+            <param><ptype>EGLDisplay</ptype> <name>dpy</name></param>
>+            <param><ptype>EGLSetBlobFuncANDROID</ptype> <name>set</name></param>
>+            <param><ptype>EGLGetBlobFuncANDROID</ptype> <name>get</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>EGLBoolean</ptype> <name>eglSetDamageRegionKHR</name></proto>
>+            <param><ptype>EGLDisplay</ptype> <name>dpy</name></param>
>+            <param><ptype>EGLSurface</ptype> <name>surface</name></param>
>+            <param><ptype>EGLint</ptype> *<name>rects</name></param>
>+            <param><ptype>EGLint</ptype> <name>n_rects</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>EGLBoolean</ptype> <name>eglSetStreamAttribKHR</name></proto>
>+            <param><ptype>EGLDisplay</ptype> <name>dpy</name></param>
>+            <param><ptype>EGLStreamKHR</ptype> <name>stream</name></param>
>+            <param><ptype>EGLenum</ptype> <name>attribute</name></param>
>+            <param><ptype>EGLAttrib</ptype> <name>value</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>EGLBoolean</ptype> <name>eglSetStreamMetadataNV</name></proto>
>+            <param><ptype>EGLDisplay</ptype> <name>dpy</name></param>
>+            <param><ptype>EGLStreamKHR</ptype> <name>stream</name></param>
>+            <param><ptype>EGLint</ptype> <name>n</name></param>
>+            <param><ptype>EGLint</ptype> <name>offset</name></param>
>+            <param><ptype>EGLint</ptype> <name>size</name></param>
>+            <param>const void *<name>data</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>EGLBoolean</ptype> <name>eglSignalSyncKHR</name></proto>
>+            <param><ptype>EGLDisplay</ptype> <name>dpy</name></param>
>+            <param><ptype>EGLSyncKHR</ptype> <name>sync</name></param>
>+            <param><ptype>EGLenum</ptype> <name>mode</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>EGLBoolean</ptype> <name>eglSignalSyncNV</name></proto>
>+            <param><ptype>EGLSyncNV</ptype> <name>sync</name></param>
>+            <param><ptype>EGLenum</ptype> <name>mode</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>EGLBoolean</ptype> <name>eglStreamAttribKHR</name></proto>
>+            <param><ptype>EGLDisplay</ptype> <name>dpy</name></param>
>+            <param><ptype>EGLStreamKHR</ptype> <name>stream</name></param>
>+            <param><ptype>EGLenum</ptype> <name>attribute</name></param>
>+            <param><ptype>EGLint</ptype> <name>value</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>EGLBoolean</ptype> <name>eglStreamConsumerAcquireKHR</name></proto>
>+            <param><ptype>EGLDisplay</ptype> <name>dpy</name></param>
>+            <param><ptype>EGLStreamKHR</ptype> <name>stream</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>EGLBoolean</ptype> <name>eglStreamConsumerAcquireAttribKHR</name></proto>
>+            <param><ptype>EGLDisplay</ptype> <name>dpy</name></param>
>+            <param><ptype>EGLStreamKHR</ptype> <name>stream</name></param>
>+            <param>const <ptype>EGLAttrib</ptype> *<name>attrib_list</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>EGLBoolean</ptype> <name>eglStreamConsumerGLTextureExternalKHR</name></proto>
>+            <param><ptype>EGLDisplay</ptype> <name>dpy</name></param>
>+            <param><ptype>EGLStreamKHR</ptype> <name>stream</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>EGLBoolean</ptype> <name>eglStreamConsumerGLTextureExternalAttribsNV</name></proto>
>+            <param><ptype>EGLDisplay</ptype> <name>dpy</name></param>
>+            <param><ptype>EGLStreamKHR</ptype> <name>stream</name></param>
>+            <param>const <ptype>EGLAttrib</ptype> *<name>attrib_list</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>EGLBoolean</ptype> <name>eglStreamConsumerOutputEXT</name></proto>
>+            <param><ptype>EGLDisplay</ptype> <name>dpy</name></param>
>+            <param><ptype>EGLStreamKHR</ptype> <name>stream</name></param>
>+            <param><ptype>EGLOutputLayerEXT</ptype> <name>layer</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>EGLBoolean</ptype> <name>eglStreamConsumerReleaseKHR</name></proto>
>+            <param><ptype>EGLDisplay</ptype> <name>dpy</name></param>
>+            <param><ptype>EGLStreamKHR</ptype> <name>stream</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>EGLBoolean</ptype> <name>eglStreamConsumerReleaseAttribKHR</name></proto>
>+            <param><ptype>EGLDisplay</ptype> <name>dpy</name></param>
>+            <param><ptype>EGLStreamKHR</ptype> <name>stream</name></param>
>+            <param>const <ptype>EGLAttrib</ptype> *<name>attrib_list</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>EGLBoolean</ptype> <name>eglStreamFlushNV</name></proto>
>+            <param><ptype>EGLDisplay</ptype> <name>dpy</name></param>
>+            <param><ptype>EGLStreamKHR</ptype> <name>stream</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>EGLBoolean</ptype> <name>eglSurfaceAttrib</name></proto>
>+            <param><ptype>EGLDisplay</ptype> <name>dpy</name></param>
>+            <param><ptype>EGLSurface</ptype> <name>surface</name></param>
>+            <param><ptype>EGLint</ptype> <name>attribute</name></param>
>+            <param><ptype>EGLint</ptype> <name>value</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>EGLBoolean</ptype> <name>eglSwapBuffers</name></proto>
>+            <param><ptype>EGLDisplay</ptype> <name>dpy</name></param>
>+            <param><ptype>EGLSurface</ptype> <name>surface</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>EGLBoolean</ptype> <name>eglSwapBuffersWithDamageEXT</name></proto>
>+            <param><ptype>EGLDisplay</ptype> <name>dpy</name></param>
>+            <param><ptype>EGLSurface</ptype> <name>surface</name></param>
>+            <param><ptype>EGLint</ptype> *<name>rects</name></param>
>+            <param><ptype>EGLint</ptype> <name>n_rects</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>EGLBoolean</ptype> <name>eglSwapBuffersWithDamageKHR</name></proto>
>+            <param><ptype>EGLDisplay</ptype> <name>dpy</name></param>
>+            <param><ptype>EGLSurface</ptype> <name>surface</name></param>
>+            <param><ptype>EGLint</ptype> *<name>rects</name></param>
>+            <param><ptype>EGLint</ptype> <name>n_rects</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>EGLBoolean</ptype> <name>eglSwapBuffersRegionNOK</name></proto>
>+            <param><ptype>EGLDisplay</ptype> <name>dpy</name></param>
>+            <param><ptype>EGLSurface</ptype> <name>surface</name></param>
>+            <param><ptype>EGLint</ptype> <name>numRects</name></param>
>+            <param>const <ptype>EGLint</ptype> *<name>rects</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>EGLBoolean</ptype> <name>eglSwapBuffersRegion2NOK</name></proto>
>+            <param><ptype>EGLDisplay</ptype> <name>dpy</name></param>
>+            <param><ptype>EGLSurface</ptype> <name>surface</name></param>
>+            <param><ptype>EGLint</ptype> <name>numRects</name></param>
>+            <param>const <ptype>EGLint</ptype> *<name>rects</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>EGLBoolean</ptype> <name>eglSwapInterval</name></proto>
>+            <param><ptype>EGLDisplay</ptype> <name>dpy</name></param>
>+            <param><ptype>EGLint</ptype> <name>interval</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>EGLBoolean</ptype> <name>eglTerminate</name></proto>
>+            <param><ptype>EGLDisplay</ptype> <name>dpy</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>EGLBoolean</ptype> <name>eglUnlockSurfaceKHR</name></proto>
>+            <param><ptype>EGLDisplay</ptype> <name>dpy</name></param>
>+            <param><ptype>EGLSurface</ptype> <name>surface</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>EGLBoolean</ptype> <name>eglUnsignalSyncEXT</name></proto>
>+            <param><ptype>EGLDisplay</ptype> <name>dpy</name></param>
>+            <param><ptype>EGLSync</ptype> <name>sync</name></param>
>+            <param>const <ptype>EGLAttrib</ptype> *<name>attrib_list</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>EGLBoolean</ptype> <name>eglWaitClient</name></proto>
>+        </command>
>+        <command>
>+            <proto><ptype>EGLBoolean</ptype> <name>eglWaitGL</name></proto>
>+        </command>
>+        <command>
>+            <proto><ptype>EGLBoolean</ptype> <name>eglWaitNative</name></proto>
>+            <param><ptype>EGLint</ptype> <name>engine</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>EGLBoolean</ptype> <name>eglWaitSync</name></proto>
>+            <param><ptype>EGLDisplay</ptype> <name>dpy</name></param>
>+            <param><ptype>EGLSync</ptype> <name>sync</name></param>
>+            <param><ptype>EGLint</ptype> <name>flags</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>EGLint</ptype> <name>eglWaitSyncKHR</name></proto>
>+            <param><ptype>EGLDisplay</ptype> <name>dpy</name></param>
>+            <param><ptype>EGLSyncKHR</ptype> <name>sync</name></param>
>+            <param><ptype>EGLint</ptype> <name>flags</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>EGLBoolean</ptype> <name>eglCompositorSetContextListEXT</name></proto>
>+            <param>const <ptype>EGLint</ptype> *<name>external_ref_ids</name></param>
>+            <param><ptype>EGLint</ptype> <name>num_entries</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>EGLBoolean</ptype> <name>eglCompositorSetContextAttributesEXT</name></proto>
>+            <param><ptype>EGLint</ptype> <name>external_ref_id</name></param>
>+            <param>const <ptype>EGLint</ptype> *<name>context_attributes</name></param>
>+            <param><ptype>EGLint</ptype> <name>num_entries</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>EGLBoolean</ptype> <name>eglCompositorSetWindowListEXT</name></proto>
>+            <param><ptype>EGLint</ptype> <name>external_ref_id</name></param>
>+            <param>const <ptype>EGLint</ptype> *<name>external_win_ids</name></param>
>+            <param><ptype>EGLint</ptype> <name>num_entries</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>EGLBoolean</ptype> <name>eglCompositorSetWindowAttributesEXT</name></proto>
>+            <param><ptype>EGLint</ptype> <name>external_win_id</name></param>
>+            <param>const <ptype>EGLint</ptype> *<name>window_attributes</name></param>
>+            <param><ptype>EGLint</ptype> <name>num_entries</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>EGLBoolean</ptype> <name>eglCompositorBindTexWindowEXT</name></proto>
>+            <param><ptype>EGLint</ptype> <name>external_win_id</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>EGLBoolean</ptype> <name>eglCompositorSetSizeEXT</name></proto>
>+            <param><ptype>EGLint</ptype> <name>external_win_id</name></param>
>+            <param><ptype>EGLint</ptype> <name>width</name></param>
>+            <param><ptype>EGLint</ptype> <name>height</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>EGLBoolean</ptype> <name>eglCompositorSwapPolicyEXT</name></proto>
>+            <param><ptype>EGLint</ptype> <name>external_win_id</name></param>
>+            <param><ptype>EGLint</ptype> <name>policy</name></param>
>+        </command>
>+    </commands>
>+
>+    
>+    <feature api="egl" name="EGL_VERSION_1_0" number="1.0">
>+        <require>
>+            <enum name="EGL_ALPHA_SIZE"/>
>+            <enum name="EGL_BAD_ACCESS"/>
>+            <enum name="EGL_BAD_ALLOC"/>
>+            <enum name="EGL_BAD_ATTRIBUTE"/>
>+            <enum name="EGL_BAD_CONFIG"/>
>+            <enum name="EGL_BAD_CONTEXT"/>
>+            <enum name="EGL_BAD_CURRENT_SURFACE"/>
>+            <enum name="EGL_BAD_DISPLAY"/>
>+            <enum name="EGL_BAD_MATCH"/>
>+            <enum name="EGL_BAD_NATIVE_PIXMAP"/>
>+            <enum name="EGL_BAD_NATIVE_WINDOW"/>
>+            <enum name="EGL_BAD_PARAMETER"/>
>+            <enum name="EGL_BAD_SURFACE"/>
>+            <enum name="EGL_BLUE_SIZE"/>
>+            <enum name="EGL_BUFFER_SIZE"/>
>+            <enum name="EGL_CONFIG_CAVEAT"/>
>+            <enum name="EGL_CONFIG_ID"/>
>+            <enum name="EGL_CORE_NATIVE_ENGINE"/>
>+            <enum name="EGL_DEPTH_SIZE"/>
>+            <enum name="EGL_DONT_CARE"/>
>+            <enum name="EGL_DRAW"/>
>+            <enum name="EGL_EXTENSIONS"/>
>+            <enum name="EGL_FALSE"/>
>+            <enum name="EGL_GREEN_SIZE"/>
>+            <enum name="EGL_HEIGHT"/>
>+            <enum name="EGL_LARGEST_PBUFFER"/>
>+            <enum name="EGL_LEVEL"/>
>+            <enum name="EGL_MAX_PBUFFER_HEIGHT"/>
>+            <enum name="EGL_MAX_PBUFFER_PIXELS"/>
>+            <enum name="EGL_MAX_PBUFFER_WIDTH"/>
>+            <enum name="EGL_NATIVE_RENDERABLE"/>
>+            <enum name="EGL_NATIVE_VISUAL_ID"/>
>+            <enum name="EGL_NATIVE_VISUAL_TYPE"/>
>+            <enum name="EGL_NONE"/>
>+            <enum name="EGL_NON_CONFORMANT_CONFIG"/>
>+            <enum name="EGL_NOT_INITIALIZED"/>
>+            <enum name="EGL_NO_CONTEXT"/>
>+            <enum name="EGL_NO_DISPLAY"/>
>+            <enum name="EGL_NO_SURFACE"/>
>+            <enum name="EGL_PBUFFER_BIT"/>
>+            <enum name="EGL_PIXMAP_BIT"/>
>+            <enum name="EGL_READ"/>
>+            <enum name="EGL_RED_SIZE"/>
>+            <enum name="EGL_SAMPLES"/>
>+            <enum name="EGL_SAMPLE_BUFFERS"/>
>+            <enum name="EGL_SLOW_CONFIG"/>
>+            <enum name="EGL_STENCIL_SIZE"/>
>+            <enum name="EGL_SUCCESS"/>
>+            <enum name="EGL_SURFACE_TYPE"/>
>+            <enum name="EGL_TRANSPARENT_BLUE_VALUE"/>
>+            <enum name="EGL_TRANSPARENT_GREEN_VALUE"/>
>+            <enum name="EGL_TRANSPARENT_RED_VALUE"/>
>+            <enum name="EGL_TRANSPARENT_RGB"/>
>+            <enum name="EGL_TRANSPARENT_TYPE"/>
>+            <enum name="EGL_TRUE"/>
>+            <enum name="EGL_VENDOR"/>
>+            <enum name="EGL_VERSION"/>
>+            <enum name="EGL_WIDTH"/>
>+            <enum name="EGL_WINDOW_BIT"/>
>+            <command name="eglChooseConfig"/>
>+            <command name="eglCopyBuffers"/>
>+            <command name="eglCreateContext"/>
>+            <command name="eglCreatePbufferSurface"/>
>+            <command name="eglCreatePixmapSurface"/>
>+            <command name="eglCreateWindowSurface"/>
>+            <command name="eglDestroyContext"/>
>+            <command name="eglDestroySurface"/>
>+            <command name="eglGetConfigAttrib"/>
>+            <command name="eglGetConfigs"/>
>+            <command name="eglGetCurrentDisplay"/>
>+            <command name="eglGetCurrentSurface"/>
>+            <command name="eglGetDisplay"/>
>+            <command name="eglGetError"/>
>+            <command name="eglGetProcAddress"/>
>+            <command name="eglInitialize"/>
>+            <command name="eglMakeCurrent"/>
>+            <command name="eglQueryContext"/>
>+            <command name="eglQueryString"/>
>+            <command name="eglQuerySurface"/>
>+            <command name="eglSwapBuffers"/>
>+            <command name="eglTerminate"/>
>+            <command name="eglWaitGL"/>
>+            <command name="eglWaitNative"/>
>+        </require>
>+    </feature>
>+    <feature api="egl" name="EGL_VERSION_1_1" number="1.1">
>+        <require>
>+            <enum name="EGL_BACK_BUFFER"/>
>+            <enum name="EGL_BIND_TO_TEXTURE_RGB"/>
>+            <enum name="EGL_BIND_TO_TEXTURE_RGBA"/>
>+            <enum name="EGL_CONTEXT_LOST"/>
>+            <enum name="EGL_MIN_SWAP_INTERVAL"/>
>+            <enum name="EGL_MAX_SWAP_INTERVAL"/>
>+            <enum name="EGL_MIPMAP_TEXTURE"/>
>+            <enum name="EGL_MIPMAP_LEVEL"/>
>+            <enum name="EGL_NO_TEXTURE"/>
>+            <enum name="EGL_TEXTURE_2D"/>
>+            <enum name="EGL_TEXTURE_FORMAT"/>
>+            <enum name="EGL_TEXTURE_RGB"/>
>+            <enum name="EGL_TEXTURE_RGBA"/>
>+            <enum name="EGL_TEXTURE_TARGET"/>
>+            <command name="eglBindTexImage"/>
>+            <command name="eglReleaseTexImage"/>
>+            <command name="eglSurfaceAttrib"/>
>+            <command name="eglSwapInterval"/>
>+        </require>
>+    </feature>
>+    <feature api="egl" name="EGL_VERSION_1_2" number="1.2">
>+        <require>
>+            <enum name="EGL_ALPHA_FORMAT"/>
>+            <enum name="EGL_ALPHA_FORMAT_NONPRE"/>
>+            <enum name="EGL_ALPHA_FORMAT_PRE"/>
>+            <enum name="EGL_ALPHA_MASK_SIZE"/>
>+            <enum name="EGL_BUFFER_PRESERVED"/>
>+            <enum name="EGL_BUFFER_DESTROYED"/>
>+            <enum name="EGL_CLIENT_APIS"/>
>+            <enum name="EGL_COLORSPACE"/>
>+            <enum name="EGL_COLORSPACE_sRGB"/>
>+            <enum name="EGL_COLORSPACE_LINEAR"/>
>+            <enum name="EGL_COLOR_BUFFER_TYPE"/>
>+            <enum name="EGL_CONTEXT_CLIENT_TYPE"/>
>+            <enum name="EGL_DISPLAY_SCALING"/>
>+            <enum name="EGL_HORIZONTAL_RESOLUTION"/>
>+            <enum name="EGL_LUMINANCE_BUFFER"/>
>+            <enum name="EGL_LUMINANCE_SIZE"/>
>+            <enum name="EGL_OPENGL_ES_BIT"/>
>+            <enum name="EGL_OPENVG_BIT"/>
>+            <enum name="EGL_OPENGL_ES_API"/>
>+            <enum name="EGL_OPENVG_API"/>
>+            <enum name="EGL_OPENVG_IMAGE"/>
>+            <enum name="EGL_PIXEL_ASPECT_RATIO"/>
>+            <enum name="EGL_RENDERABLE_TYPE"/>
>+            <enum name="EGL_RENDER_BUFFER"/>
>+            <enum name="EGL_RGB_BUFFER"/>
>+            <enum name="EGL_SINGLE_BUFFER"/>
>+            <enum name="EGL_SWAP_BEHAVIOR"/>
>+            <enum name="EGL_UNKNOWN"/>
>+            <enum name="EGL_VERTICAL_RESOLUTION"/>
>+            <command name="eglBindAPI"/>
>+            <command name="eglQueryAPI"/>
>+            <command name="eglCreatePbufferFromClientBuffer"/>
>+            <command name="eglReleaseThread"/>
>+            <command name="eglWaitClient"/>
>+        </require>
>+    </feature>
>+    <feature api="egl" name="EGL_VERSION_1_3" number="1.3">
>+        <require>
>+            <enum name="EGL_CONFORMANT"/>
>+            <enum name="EGL_CONTEXT_CLIENT_VERSION"/>
>+            <enum name="EGL_MATCH_NATIVE_PIXMAP"/>
>+            <enum name="EGL_OPENGL_ES2_BIT"/>
>+            <enum name="EGL_VG_ALPHA_FORMAT"/>
>+            <enum name="EGL_VG_ALPHA_FORMAT_NONPRE"/>
>+            <enum name="EGL_VG_ALPHA_FORMAT_PRE"/>
>+            <enum name="EGL_VG_ALPHA_FORMAT_PRE_BIT"/>
>+            <enum name="EGL_VG_COLORSPACE"/>
>+            <enum name="EGL_VG_COLORSPACE_sRGB"/>
>+            <enum name="EGL_VG_COLORSPACE_LINEAR"/>
>+            <enum name="EGL_VG_COLORSPACE_LINEAR_BIT"/>
>+        </require>
>+    </feature>
>+    <feature api="egl" name="EGL_VERSION_1_4" number="1.4">
>+        <require>
>+            <enum name="EGL_DEFAULT_DISPLAY"/>
>+            <enum name="EGL_MULTISAMPLE_RESOLVE_BOX_BIT"/>
>+            <enum name="EGL_MULTISAMPLE_RESOLVE"/>
>+            <enum name="EGL_MULTISAMPLE_RESOLVE_DEFAULT"/>
>+            <enum name="EGL_MULTISAMPLE_RESOLVE_BOX"/>
>+            <enum name="EGL_OPENGL_API"/>
>+            <enum name="EGL_OPENGL_BIT"/>
>+            <enum name="EGL_SWAP_BEHAVIOR_PRESERVED_BIT"/>
>+            <command name="eglGetCurrentContext"/>
>+        </require>
>+    </feature>
>+    <feature api="egl" name="EGL_VERSION_1_5" number="1.5">
>+        <require comment="EGL_KHR_create_context features">
>+            <enum name="EGL_CONTEXT_MAJOR_VERSION"/>
>+            <enum name="EGL_CONTEXT_MINOR_VERSION"/>
>+            <enum name="EGL_CONTEXT_OPENGL_PROFILE_MASK"/>
>+            <enum name="EGL_CONTEXT_OPENGL_RESET_NOTIFICATION_STRATEGY"/>
>+            <enum name="EGL_NO_RESET_NOTIFICATION"/>
>+            <enum name="EGL_LOSE_CONTEXT_ON_RESET"/>
>+            <enum name="EGL_CONTEXT_OPENGL_CORE_PROFILE_BIT"/>
>+            <enum name="EGL_CONTEXT_OPENGL_COMPATIBILITY_PROFILE_BIT"/>
>+            <enum name="EGL_CONTEXT_OPENGL_DEBUG"/>
>+            <enum name="EGL_CONTEXT_OPENGL_FORWARD_COMPATIBLE"/>
>+            <enum name="EGL_CONTEXT_OPENGL_ROBUST_ACCESS"/>
>+            <enum name="EGL_OPENGL_ES3_BIT"/>
>+        </require>
>+        <require comment="EGL_EXT_create_context_robustness">
>+            <enum name="EGL_CONTEXT_OPENGL_ROBUST_ACCESS"/>
>+            <enum name="EGL_CONTEXT_OPENGL_RESET_NOTIFICATION_STRATEGY"/>
>+        </require>
>+        <require comment="EGL_EXT_client_extensions"/>
>+        <require comment="EGL_KHR_cl_event2">
>+            <enum name="EGL_CL_EVENT_HANDLE"/>
>+            <enum name="EGL_SYNC_CL_EVENT"/>
>+            <enum name="EGL_SYNC_CL_EVENT_COMPLETE"/>
>+        </require>
>+        <require comment="EGL_KHR_fence_sync">
>+            <enum name="EGL_SYNC_PRIOR_COMMANDS_COMPLETE"/>
>+            <enum name="EGL_SYNC_TYPE"/>
>+            <enum name="EGL_SYNC_STATUS"/>
>+            <enum name="EGL_SYNC_CONDITION"/>
>+            <enum name="EGL_SIGNALED"/>
>+            <enum name="EGL_UNSIGNALED"/>
>+            <enum name="EGL_SYNC_FLUSH_COMMANDS_BIT"/>
>+            <enum name="EGL_FOREVER"/>
>+            <enum name="EGL_TIMEOUT_EXPIRED"/>
>+            <enum name="EGL_CONDITION_SATISFIED"/>
>+            <enum name="EGL_NO_SYNC"/>
>+            <enum name="EGL_SYNC_FENCE"/>
>+            <command name="eglCreateSync"/>
>+            <command name="eglDestroySync"/>
>+            <command name="eglClientWaitSync"/>
>+            <command name="eglGetSyncAttrib"/>
>+        </require>
>+        <require comment="EGL_KHR_get_all_proc_addresses"/>
>+        <require comment="EGL_KHR_client_get_all_proc_addresses"/>
>+        <require comment="EGL_KHR_gl_colorspace">
>+            <enum name="EGL_GL_COLORSPACE"/>
>+            <enum name="EGL_GL_COLORSPACE_SRGB"/>
>+            <enum name="EGL_GL_COLORSPACE_LINEAR"/>
>+        </require>
>+        <require comment="EGL_KHR_gl_renderbuffer_image">
>+            <enum name="EGL_GL_RENDERBUFFER"/>
>+        </require>
>+        <require comment="EGL_KHR_gl_texture_2D_image">
>+            <enum name="EGL_GL_TEXTURE_2D"/>
>+            <enum name="EGL_GL_TEXTURE_LEVEL"/>
>+        </require>
>+        <require comment="EGL_KHR_gl_texture_3D_image">
>+            <enum name="EGL_GL_TEXTURE_3D"/>
>+            <enum name="EGL_GL_TEXTURE_ZOFFSET"/>
>+        </require>
>+        <require comment="EGL_KHR_gl_texture_cubemap_image">
>+            <enum name="EGL_GL_TEXTURE_CUBE_MAP_POSITIVE_X"/>
>+            <enum name="EGL_GL_TEXTURE_CUBE_MAP_NEGATIVE_X"/>
>+            <enum name="EGL_GL_TEXTURE_CUBE_MAP_POSITIVE_Y"/>
>+            <enum name="EGL_GL_TEXTURE_CUBE_MAP_NEGATIVE_Y"/>
>+            <enum name="EGL_GL_TEXTURE_CUBE_MAP_POSITIVE_Z"/>
>+            <enum name="EGL_GL_TEXTURE_CUBE_MAP_NEGATIVE_Z"/>
>+        </require>
>+        <require comment="EGL_KHR_image_base">
>+            <enum name="EGL_IMAGE_PRESERVED"/>
>+            <enum name="EGL_NO_IMAGE"/>
>+            <command name="eglCreateImage"/>
>+            <command name="eglDestroyImage"/>
>+        </require>
>+        <require comment="EGL_EXT_platform_base">
>+            <command name="eglGetPlatformDisplay"/>
>+            <command name="eglCreatePlatformWindowSurface"/>
>+            <command name="eglCreatePlatformPixmapSurface"/>
>+        </require>
>+        <require comment="EGL_KHR_surfaceless_context - just relaxes an error condition"/>
>+        <require comment="EGL_KHR_wait_sync">
>+            <command name="eglWaitSync"/>
>+        </require>
>+    </feature>
>+
>+    
>+    <extensions>
>+        <extension name="EGL_ANDROID_blob_cache" supported="egl">
>+            <require>
>+                <command name="eglSetBlobCacheFuncsANDROID"/>
>+            </require>
>+        </extension>
>+        <extension name="EGL_ANDROID_create_native_client_buffer" supported="egl">
>+            <require>
>+                <enum name="EGL_NATIVE_BUFFER_USAGE_ANDROID"/>
>+                <enum name="EGL_NATIVE_BUFFER_USAGE_PROTECTED_BIT_ANDROID"/>
>+                <enum name="EGL_NATIVE_BUFFER_USAGE_RENDERBUFFER_BIT_ANDROID"/>
>+                <enum name="EGL_NATIVE_BUFFER_USAGE_TEXTURE_BIT_ANDROID"/>
>+                <command name="eglCreateNativeClientBufferANDROID"/>
>+            </require>
>+        </extension>
>+        <extension name="EGL_ANDROID_framebuffer_target" supported="egl">
>+            <require>
>+                <enum name="EGL_FRAMEBUFFER_TARGET_ANDROID"/>
>+            </require>
>+        </extension>
>+        <extension name="EGL_ANDROID_get_native_client_buffer" supported="egl">
>+            <require>
>+                <command name="eglGetNativeClientBufferANDROID"/>
>+            </require>
>+        </extension>
>+        <extension name="EGL_ANDROID_front_buffer_auto_refresh" supported="egl">
>+            <require>
>+                <enum name="EGL_FRONT_BUFFER_AUTO_REFRESH_ANDROID"/>
>+            </require>
>+        </extension>
>+        <extension name="EGL_ANDROID_image_native_buffer" supported="egl">
>+            <require>
>+                <enum name="EGL_NATIVE_BUFFER_ANDROID"/>
>+            </require>
>+        </extension>
>+        <extension name="EGL_ANDROID_native_fence_sync" supported="egl">
>+            <require>
>+                <enum name="EGL_SYNC_NATIVE_FENCE_ANDROID"/>
>+                <enum name="EGL_SYNC_NATIVE_FENCE_FD_ANDROID"/>
>+                <enum name="EGL_SYNC_NATIVE_FENCE_SIGNALED_ANDROID"/>
>+                <enum name="EGL_NO_NATIVE_FENCE_FD_ANDROID"/>
>+                <command name="eglDupNativeFenceFDANDROID"/>
>+            </require>
>+        </extension>
>+        <extension name="EGL_ANDROID_presentation_time" supported="egl">
>+            <require>
>+                <command name="eglPresentationTimeANDROID"/>
>+            </require>
>+        </extension>
>+        <extension name="EGL_ANDROID_get_frame_timestamps" supported="egl">
>+            <require>
>+                <enum name="EGL_TIMESTAMP_PENDING_ANDROID"/>
>+                <enum name="EGL_TIMESTAMP_INVALID_ANDROID"/>
>+                <enum name="EGL_TIMESTAMPS_ANDROID"/>
>+                <enum name="EGL_COMPOSITE_DEADLINE_ANDROID"/>
>+                <enum name="EGL_COMPOSITE_INTERVAL_ANDROID"/>
>+                <enum name="EGL_COMPOSITE_TO_PRESENT_LATENCY_ANDROID"/>
>+                <enum name="EGL_REQUESTED_PRESENT_TIME_ANDROID"/>
>+                <enum name="EGL_RENDERING_COMPLETE_TIME_ANDROID"/>
>+                <enum name="EGL_COMPOSITION_LATCH_TIME_ANDROID"/>
>+                <enum name="EGL_FIRST_COMPOSITION_START_TIME_ANDROID"/>
>+                <enum name="EGL_LAST_COMPOSITION_START_TIME_ANDROID"/>
>+                <enum name="EGL_FIRST_COMPOSITION_GPU_FINISHED_TIME_ANDROID"/>
>+                <enum name="EGL_DISPLAY_PRESENT_TIME_ANDROID"/>
>+                <enum name="EGL_DEQUEUE_READY_TIME_ANDROID"/>
>+                <enum name="EGL_READS_DONE_TIME_ANDROID"/>
>+                <command name="eglGetCompositorTimingSupportedANDROID"/>
>+                <command name="eglGetCompositorTimingANDROID"/>
>+                <command name="eglGetNextFrameIdANDROID"/>
>+                <command name="eglGetFrameTimestampSupportedANDROID"/>
>+                <command name="eglGetFrameTimestampsANDROID"/>
>+            </require>
>+        </extension>
>+        <extension name="EGL_ANDROID_recordable" supported="egl">
>+            <require>
>+                <enum name="EGL_RECORDABLE_ANDROID"/>
>+            </require>
>+        </extension>
>+        <extension name="EGL_ANGLE_d3d_share_handle_client_buffer" supported="egl">
>+            <require>
>+                <enum name="EGL_D3D_TEXTURE_2D_SHARE_HANDLE_ANGLE"/>
>+            </require>
>+        </extension>
>+        <extension name="EGL_ANGLE_device_d3d" supported="egl">
>+            <require>
>+                <enum name="EGL_D3D9_DEVICE_ANGLE"/>
>+                <enum name="EGL_D3D11_DEVICE_ANGLE"/>
>+            </require>
>+        </extension>
>+        <extension name="EGL_ANGLE_query_surface_pointer" supported="egl">
>+            <require>
>+                <command name="eglQuerySurfacePointerANGLE"/>
>+            </require>
>+        </extension>
>+        <extension name="EGL_ANGLE_surface_d3d_texture_2d_share_handle" supported="egl">
>+            <require>
>+                <enum name="EGL_D3D_TEXTURE_2D_SHARE_HANDLE_ANGLE"/>
>+            </require>
>+        </extension>
>+        <extension name="EGL_ANGLE_window_fixed_size" supported="egl">
>+            <require>
>+                <enum name="EGL_FIXED_SIZE_ANGLE"/>
>+            </require>
>+        </extension>
>+        <extension name="EGL_ARM_implicit_external_sync" supported="egl">
>+            <require>
>+                <enum name="EGL_SYNC_PRIOR_COMMANDS_IMPLICIT_EXTERNAL_ARM"/>
>+            </require>
>+        </extension>
>+        <extension name="EGL_ARM_pixmap_multisample_discard" supported="egl">
>+            <require>
>+                <enum name="EGL_DISCARD_SAMPLES_ARM"/>
>+            </require>
>+        </extension>
>+        <extension name="EGL_EXT_buffer_age" supported="egl">
>+            <require>
>+                <enum name="EGL_BUFFER_AGE_EXT"/>
>+            </require>
>+        </extension>
>+        <extension name="EGL_EXT_client_extensions" supported="egl"/>
>+        <extension name="EGL_EXT_client_sync" supported="egl">
>+            <require>
>+                <enum name="EGL_SYNC_CLIENT_EXT"/>
>+                <enum name="EGL_SYNC_CLIENT_SIGNAL_EXT"/>
>+                <command name="eglClientSignalSyncEXT"/>
>+            </require>
>+        </extension>
>+        <extension name="EGL_EXT_create_context_robustness" supported="egl">
>+            <require>
>+                <enum name="EGL_CONTEXT_OPENGL_ROBUST_ACCESS_EXT"/>
>+                <enum name="EGL_CONTEXT_OPENGL_RESET_NOTIFICATION_STRATEGY_EXT"/>
>+                <enum name="EGL_NO_RESET_NOTIFICATION_EXT"/>
>+                <enum name="EGL_LOSE_CONTEXT_ON_RESET_EXT"/>
>+            </require>
>+        </extension>
>+        <extension name="EGL_EXT_device_base" supported="egl">
>+            <require>
>+                <enum name="EGL_NO_DEVICE_EXT"/>
>+                <enum name="EGL_BAD_DEVICE_EXT"/>
>+                <enum name="EGL_DEVICE_EXT"/>
>+                <command name="eglQueryDeviceAttribEXT"/>
>+                <command name="eglQueryDeviceStringEXT"/>
>+                <command name="eglQueryDevicesEXT"/>
>+                <command name="eglQueryDisplayAttribEXT"/>
>+            </require>
>+        </extension>
>+        <extension name="EGL_EXT_device_drm" supported="egl">
>+            <require>
>+                <enum name="EGL_DRM_DEVICE_FILE_EXT"/>
>+                <enum name="EGL_DRM_MASTER_FD_EXT"/>
>+            </require>
>+        </extension>
>+        <extension name="EGL_EXT_device_enumeration" supported="egl">
>+            <require>
>+                <command name="eglQueryDevicesEXT"/>
>+            </require>
>+        </extension>
>+        <extension name="EGL_EXT_device_openwf" supported="egl">
>+            <require>
>+                <enum name="EGL_OPENWF_DEVICE_ID_EXT"/>
>+            </require>
>+        </extension>
>+        <extension name="EGL_EXT_device_query" supported="egl">
>+            <require>
>+                <enum name="EGL_NO_DEVICE_EXT"/>
>+                <enum name="EGL_BAD_DEVICE_EXT"/>
>+                <enum name="EGL_DEVICE_EXT"/>
>+                <command name="eglQueryDeviceAttribEXT"/>
>+                <command name="eglQueryDeviceStringEXT"/>
>+                <command name="eglQueryDisplayAttribEXT"/>
>+            </require>
>+        </extension>
>+        <extension name="EGL_EXT_gl_colorspace_bt2020_linear" supported="egl">
>+            <require>
>+                <enum name="EGL_GL_COLORSPACE_BT2020_LINEAR_EXT"/>
>+            </require>
>+        </extension>
>+        <extension name="EGL_EXT_gl_colorspace_bt2020_pq" supported="egl">
>+            <require>
>+                <enum name="EGL_GL_COLORSPACE_BT2020_PQ_EXT"/>
>+            </require>
>+        </extension>
>+        <extension name="EGL_EXT_gl_colorspace_scrgb" supported="egl">
>+            <require>
>+                <enum name="EGL_GL_COLORSPACE_SCRGB_EXT"/>
>+            </require>
>+        </extension>
>+        <extension name="EGL_EXT_gl_colorspace_scrgb_linear" supported="egl">
>+            <require>
>+                <enum name="EGL_GL_COLORSPACE_SCRGB_LINEAR_EXT"/>
>+            </require>
>+        </extension>
>+        <extension name="EGL_EXT_gl_colorspace_display_p3_linear" supported="egl">
>+            <require>
>+                <enum name="EGL_GL_COLORSPACE_DISPLAY_P3_LINEAR_EXT"/>
>+            </require>
>+        </extension>
>+        <extension name="EGL_EXT_gl_colorspace_display_p3" supported="egl">
>+            <require>
>+                <enum name="EGL_GL_COLORSPACE_DISPLAY_P3_EXT"/>
>+            </require>
>+        </extension>
>+        <extension name="EGL_EXT_image_dma_buf_import" supported="egl">
>+            <require>
>+                <enum name="EGL_LINUX_DMA_BUF_EXT"/>
>+                <enum name="EGL_LINUX_DRM_FOURCC_EXT"/>
>+                <enum name="EGL_DMA_BUF_PLANE0_FD_EXT"/>
>+                <enum name="EGL_DMA_BUF_PLANE0_OFFSET_EXT"/>
>+                <enum name="EGL_DMA_BUF_PLANE0_PITCH_EXT"/>
>+                <enum name="EGL_DMA_BUF_PLANE1_FD_EXT"/>
>+                <enum name="EGL_DMA_BUF_PLANE1_OFFSET_EXT"/>
>+                <enum name="EGL_DMA_BUF_PLANE1_PITCH_EXT"/>
>+                <enum name="EGL_DMA_BUF_PLANE2_FD_EXT"/>
>+                <enum name="EGL_DMA_BUF_PLANE2_OFFSET_EXT"/>
>+                <enum name="EGL_DMA_BUF_PLANE2_PITCH_EXT"/>
>+                <enum name="EGL_YUV_COLOR_SPACE_HINT_EXT"/>
>+                <enum name="EGL_SAMPLE_RANGE_HINT_EXT"/>
>+                <enum name="EGL_YUV_CHROMA_HORIZONTAL_SITING_HINT_EXT"/>
>+                <enum name="EGL_YUV_CHROMA_VERTICAL_SITING_HINT_EXT"/>
>+                <enum name="EGL_ITU_REC601_EXT"/>
>+                <enum name="EGL_ITU_REC709_EXT"/>
>+                <enum name="EGL_ITU_REC2020_EXT"/>
>+                <enum name="EGL_YUV_FULL_RANGE_EXT"/>
>+                <enum name="EGL_YUV_NARROW_RANGE_EXT"/>
>+                <enum name="EGL_YUV_CHROMA_SITING_0_EXT"/>
>+                <enum name="EGL_YUV_CHROMA_SITING_0_5_EXT"/>
>+            </require>
>+        </extension>
>+        <extension name="EGL_EXT_image_dma_buf_import_modifiers" supported="egl">
>+            <require>
>+                <enum name="EGL_DMA_BUF_PLANE3_FD_EXT"/>
>+                <enum name="EGL_DMA_BUF_PLANE3_OFFSET_EXT"/>
>+                <enum name="EGL_DMA_BUF_PLANE3_PITCH_EXT"/>
>+                <enum name="EGL_DMA_BUF_PLANE0_MODIFIER_LO_EXT"/>
>+                <enum name="EGL_DMA_BUF_PLANE0_MODIFIER_HI_EXT"/>
>+                <enum name="EGL_DMA_BUF_PLANE1_MODIFIER_LO_EXT"/>
>+                <enum name="EGL_DMA_BUF_PLANE1_MODIFIER_HI_EXT"/>
>+                <enum name="EGL_DMA_BUF_PLANE2_MODIFIER_LO_EXT"/>
>+                <enum name="EGL_DMA_BUF_PLANE2_MODIFIER_HI_EXT"/>
>+                <enum name="EGL_DMA_BUF_PLANE3_MODIFIER_LO_EXT"/>
>+                <enum name="EGL_DMA_BUF_PLANE3_MODIFIER_HI_EXT"/>
>+                <command name="eglQueryDmaBufFormatsEXT"/>
>+                <command name="eglQueryDmaBufModifiersEXT"/>
>+            </require>
>+        </extension>
>+        <extension name="EGL_EXT_image_gl_colorspace" supported="egl">
>+            <require>
>+                <enum name="EGL_GL_COLORSPACE"/>
>+                <enum name="EGL_GL_COLORSPACE_DEFAULT_EXT"/>
>+            </require>
>+        </extension>
>+        <extension name="EGL_EXT_multiview_window" supported="egl">
>+            <require>
>+                <enum name="EGL_MULTIVIEW_VIEW_COUNT_EXT"/>
>+            </require>
>+        </extension>
>+        <extension name="EGL_EXT_output_base" supported="egl">
>+            <require>
>+                <type name="EGLOutputLayerEXT"/>
>+                <type name="EGLOutputPortEXT"/>
>+                <enum name="EGL_NO_OUTPUT_LAYER_EXT"/>
>+                <enum name="EGL_NO_OUTPUT_PORT_EXT"/>
>+                <enum name="EGL_BAD_OUTPUT_LAYER_EXT"/>
>+                <enum name="EGL_BAD_OUTPUT_PORT_EXT"/>
>+                <enum name="EGL_SWAP_INTERVAL_EXT"/>
>+                <command name="eglGetOutputLayersEXT"/>
>+                <command name="eglGetOutputPortsEXT"/>
>+                <command name="eglOutputLayerAttribEXT"/>
>+                <command name="eglQueryOutputLayerAttribEXT"/>
>+                <command name="eglQueryOutputLayerStringEXT"/>
>+                <command name="eglOutputPortAttribEXT"/>
>+                <command name="eglQueryOutputPortAttribEXT"/>
>+                <command name="eglQueryOutputPortStringEXT"/>
>+            </require>
>+        </extension>
>+        <extension name="EGL_EXT_output_drm" supported="egl">
>+            <require>
>+                <enum name="EGL_DRM_CRTC_EXT"/>
>+                <enum name="EGL_DRM_PLANE_EXT"/>
>+                <enum name="EGL_DRM_CONNECTOR_EXT"/>
>+            </require>
>+        </extension>
>+        <extension name="EGL_EXT_output_openwf" supported="egl">
>+            <require>
>+                <enum name="EGL_OPENWF_PIPELINE_ID_EXT"/>
>+                <enum name="EGL_OPENWF_PORT_ID_EXT"/>
>+            </require>
>+        </extension>
>+        <extension name="EGL_EXT_pixel_format_float" supported="egl">
>+            <require>
>+                <enum name="EGL_COLOR_COMPONENT_TYPE_EXT"/>
>+                <enum name="EGL_COLOR_COMPONENT_TYPE_FIXED_EXT"/>
>+                <enum name="EGL_COLOR_COMPONENT_TYPE_FLOAT_EXT"/>
>+            </require>
>+        </extension>
>+        <extension name="EGL_EXT_platform_base" supported="egl">
>+            <require>
>+                <command name="eglGetPlatformDisplayEXT"/>
>+                <command name="eglCreatePlatformWindowSurfaceEXT"/>
>+                <command name="eglCreatePlatformPixmapSurfaceEXT"/>
>+            </require>
>+        </extension>
>+        <extension name="EGL_EXT_platform_device" supported="egl">
>+            <require>
>+                <enum name="EGL_PLATFORM_DEVICE_EXT"/>
>+            </require>
>+        </extension>
>+        <extension name="EGL_EXT_platform_wayland" supported="egl">
>+            <require>
>+                <enum name="EGL_PLATFORM_WAYLAND_EXT"/>
>+            </require>
>+        </extension>
>+        <extension name="EGL_EXT_platform_x11" supported="egl">
>+            <require>
>+                <enum name="EGL_PLATFORM_X11_EXT"/>
>+                <enum name="EGL_PLATFORM_X11_SCREEN_EXT"/>
>+            </require>
>+        </extension>
>+        <extension name="EGL_EXT_protected_content" supported="egl">
>+            <require>
>+                <enum name="EGL_PROTECTED_CONTENT_EXT"/>
>+            </require>
>+        </extension>
>+        <extension name="EGL_EXT_protected_surface" supported="egl">
>+            <require>
>+                <enum name="EGL_PROTECTED_CONTENT_EXT"/>
>+            </require>
>+        </extension>
>+        <extension name="EGL_EXT_stream_consumer_egloutput" supported="egl">
>+            <require>
>+                <command name="eglStreamConsumerOutputEXT"/>
>+            </require>
>+        </extension>
>+        <extension name="EGL_EXT_surface_SMPTE2086_metadata" supported="egl">
>+            <require>
>+                <enum name="EGL_SMPTE2086_DISPLAY_PRIMARY_RX_EXT"/>
>+                <enum name="EGL_SMPTE2086_DISPLAY_PRIMARY_RY_EXT"/>
>+                <enum name="EGL_SMPTE2086_DISPLAY_PRIMARY_GX_EXT"/>
>+                <enum name="EGL_SMPTE2086_DISPLAY_PRIMARY_GY_EXT"/>
>+                <enum name="EGL_SMPTE2086_DISPLAY_PRIMARY_BX_EXT"/>
>+                <enum name="EGL_SMPTE2086_DISPLAY_PRIMARY_BY_EXT"/>
>+                <enum name="EGL_SMPTE2086_WHITE_POINT_X_EXT"/>
>+                <enum name="EGL_SMPTE2086_WHITE_POINT_Y_EXT"/>
>+                <enum name="EGL_SMPTE2086_MAX_LUMINANCE_EXT"/>
>+                <enum name="EGL_SMPTE2086_MIN_LUMINANCE_EXT"/>
>+                <enum name="EGL_METADATA_SCALING_EXT"/>
>+            </require>
>+        </extension>
>+        <extension name="EGL_EXT_swap_buffers_with_damage" supported="egl">
>+            <require>
>+                <command name="eglSwapBuffersWithDamageEXT"/>
>+            </require>
>+        </extension>
>+        <extension name="EGL_EXT_sync_reuse" supported="egl">
>+            <require>
>+                <command name="eglUnsignalSyncEXT"/>
>+            </require>
>+        </extension>
>+        <extension name="EGL_EXT_yuv_surface" supported="egl">
>+            <require>
>+                <enum name="EGL_YUV_ORDER_EXT"/>
>+                <enum name="EGL_YUV_NUMBER_OF_PLANES_EXT"/>
>+                <enum name="EGL_YUV_SUBSAMPLE_EXT"/>
>+                <enum name="EGL_YUV_DEPTH_RANGE_EXT"/>
>+                <enum name="EGL_YUV_CSC_STANDARD_EXT"/>
>+                <enum name="EGL_YUV_PLANE_BPP_EXT"/>
>+                <enum name="EGL_YUV_BUFFER_EXT"/>
>+                <enum name="EGL_YUV_ORDER_YUV_EXT"/>
>+                <enum name="EGL_YUV_ORDER_YVU_EXT"/>
>+                <enum name="EGL_YUV_ORDER_YUYV_EXT"/>
>+                <enum name="EGL_YUV_ORDER_UYVY_EXT"/>
>+                <enum name="EGL_YUV_ORDER_YVYU_EXT"/>
>+                <enum name="EGL_YUV_ORDER_VYUY_EXT"/>
>+                <enum name="EGL_YUV_ORDER_AYUV_EXT"/>
>+                <enum name="EGL_YUV_SUBSAMPLE_4_2_0_EXT"/>
>+                <enum name="EGL_YUV_SUBSAMPLE_4_2_2_EXT"/>
>+                <enum name="EGL_YUV_SUBSAMPLE_4_4_4_EXT"/>
>+                <enum name="EGL_YUV_DEPTH_RANGE_LIMITED_EXT"/>
>+                <enum name="EGL_YUV_DEPTH_RANGE_FULL_EXT"/>
>+                <enum name="EGL_YUV_CSC_STANDARD_601_EXT"/>
>+                <enum name="EGL_YUV_CSC_STANDARD_709_EXT"/>
>+                <enum name="EGL_YUV_CSC_STANDARD_2020_EXT"/>
>+                <enum name="EGL_YUV_PLANE_BPP_0_EXT"/>
>+                <enum name="EGL_YUV_PLANE_BPP_8_EXT"/>
>+                <enum name="EGL_YUV_PLANE_BPP_10_EXT"/>
>+            </require>
>+        </extension>
>+        <extension name="EGL_HI_clientpixmap" supported="egl">
>+            <require>
>+                <enum name="EGL_CLIENT_PIXMAP_POINTER_HI"/>
>+                <command name="eglCreatePixmapSurfaceHI"/>
>+            </require>
>+        </extension>
>+        <extension name="EGL_HI_colorformats" supported="egl">
>+            <require>
>+                <enum name="EGL_COLOR_FORMAT_HI"/>
>+                <enum name="EGL_COLOR_RGB_HI"/>
>+                <enum name="EGL_COLOR_RGBA_HI"/>
>+                <enum name="EGL_COLOR_ARGB_HI"/>
>+            </require>
>+        </extension>
>+        <extension name="EGL_IMG_context_priority" supported="egl">
>+            <require>
>+                <enum name="EGL_CONTEXT_PRIORITY_LEVEL_IMG"/>
>+                <enum name="EGL_CONTEXT_PRIORITY_HIGH_IMG"/>
>+                <enum name="EGL_CONTEXT_PRIORITY_MEDIUM_IMG"/>
>+                <enum name="EGL_CONTEXT_PRIORITY_LOW_IMG"/>
>+            </require>
>+        </extension>
>+        <extension name="EGL_IMG_image_plane_attribs" supported="egl">
>+            <require>
>+                <enum name="EGL_NATIVE_BUFFER_MULTIPLANE_SEPARATE_IMG"/>
>+                <enum name="EGL_NATIVE_BUFFER_PLANE_OFFSET_IMG"/>
>+            </require>
>+        </extension>
>+        <extension name="EGL_KHR_cl_event" supported="egl">
>+            <require>
>+                <enum name="EGL_CL_EVENT_HANDLE_KHR"/>
>+                <enum name="EGL_SYNC_CL_EVENT_KHR"/>
>+                <enum name="EGL_SYNC_CL_EVENT_COMPLETE_KHR"/>
>+            </require>
>+        </extension>
>+        <extension name="EGL_KHR_cl_event2" supported="egl">
>+            <require>
>+                <enum name="EGL_CL_EVENT_HANDLE_KHR"/>
>+                <enum name="EGL_SYNC_CL_EVENT_KHR"/>
>+                <enum name="EGL_SYNC_CL_EVENT_COMPLETE_KHR"/>
>+                <command name="eglCreateSync64KHR"/>
>+            </require>
>+        </extension>
>+        <extension name="EGL_KHR_config_attribs" supported="egl">
>+            <require>
>+                <enum name="EGL_CONFORMANT_KHR"/>
>+                <enum name="EGL_VG_COLORSPACE_LINEAR_BIT_KHR"/>
>+                <enum name="EGL_VG_ALPHA_FORMAT_PRE_BIT_KHR"/>
>+            </require>
>+        </extension>
>+        <extension name="EGL_KHR_client_get_all_proc_addresses" supported="egl" comment="Alias of EGL_KHR_get_all_proc_addresses"/>
>+        <extension name="EGL_KHR_context_flush_control" supported="egl">
>+            <require>
>+                <enum name="EGL_CONTEXT_RELEASE_BEHAVIOR_NONE_KHR"/>
>+                <enum name="EGL_CONTEXT_RELEASE_BEHAVIOR_KHR"/>
>+                <enum name="EGL_CONTEXT_RELEASE_BEHAVIOR_FLUSH_KHR"/>
>+            </require>
>+        </extension>
>+        <extension name="EGL_KHR_create_context" supported="egl">
>+            <require>
>+                <enum name="EGL_CONTEXT_MAJOR_VERSION_KHR"/>
>+                <enum name="EGL_CONTEXT_MINOR_VERSION_KHR"/>
>+                <enum name="EGL_CONTEXT_FLAGS_KHR"/>
>+                <enum name="EGL_CONTEXT_OPENGL_PROFILE_MASK_KHR"/>
>+                <enum name="EGL_CONTEXT_OPENGL_RESET_NOTIFICATION_STRATEGY_KHR"/>
>+                <enum name="EGL_NO_RESET_NOTIFICATION_KHR"/>
>+                <enum name="EGL_LOSE_CONTEXT_ON_RESET_KHR"/>
>+                <enum name="EGL_CONTEXT_OPENGL_DEBUG_BIT_KHR"/>
>+                <enum name="EGL_CONTEXT_OPENGL_FORWARD_COMPATIBLE_BIT_KHR"/>
>+                <enum name="EGL_CONTEXT_OPENGL_ROBUST_ACCESS_BIT_KHR"/>
>+                <enum name="EGL_CONTEXT_OPENGL_CORE_PROFILE_BIT_KHR"/>
>+                <enum name="EGL_CONTEXT_OPENGL_COMPATIBILITY_PROFILE_BIT_KHR"/>
>+                <enum name="EGL_OPENGL_ES3_BIT"/>
>+                <enum name="EGL_OPENGL_ES3_BIT_KHR"/>
>+            </require>
>+        </extension>
>+        <extension name="EGL_KHR_create_context_no_error" supported="egl">
>+            <require>
>+                <enum name="EGL_CONTEXT_OPENGL_NO_ERROR_KHR"/>
>+            </require>
>+        </extension>
>+        <extension name="EGL_KHR_debug" supported="egl">
>+            <require>
>+                    
>+                <type name="EGLLabelKHR"/>
>+                <type name="EGLObjectKHR"/>
>+                <enum name="EGL_OBJECT_THREAD_KHR"/>
>+                <enum name="EGL_OBJECT_DISPLAY_KHR"/>
>+                <enum name="EGL_OBJECT_CONTEXT_KHR"/>
>+                <enum name="EGL_OBJECT_SURFACE_KHR"/>
>+                <enum name="EGL_OBJECT_IMAGE_KHR"/>
>+                <enum name="EGL_OBJECT_SYNC_KHR"/>
>+                <enum name="EGL_OBJECT_STREAM_KHR"/>
>+                <enum name="EGL_DEBUG_MSG_CRITICAL_KHR"/>
>+                <enum name="EGL_DEBUG_MSG_ERROR_KHR"/>
>+                <enum name="EGL_DEBUG_MSG_WARN_KHR"/>
>+                <enum name="EGL_DEBUG_MSG_INFO_KHR"/>
>+                <enum name="EGL_DEBUG_CALLBACK_KHR"/>
>+                <command name="eglDebugMessageControlKHR"/>
>+                <command name="eglQueryDebugKHR"/>
>+                <command name="eglLabelObjectKHR"/>
>+            </require>
>+        </extension>
>+        <extension name="EGL_KHR_display_reference" supported="egl">
>+            <require>
>+                <enum name="EGL_TRACK_REFERENCES_KHR"/>
>+                <command name="eglQueryDisplayAttribKHR"/>
>+            </require>
>+        </extension>
>+        <extension name="EGL_KHR_fence_sync" protect="KHRONOS_SUPPORT_INT64" supported="egl">
>+            <require>
>+                
>+                <enum name="EGL_SYNC_PRIOR_COMMANDS_COMPLETE_KHR"/>
>+                <enum name="EGL_SYNC_CONDITION_KHR"/>
>+                <enum name="EGL_SYNC_FENCE_KHR"/>
>+                <command name="eglCreateSyncKHR"/>
>+                <command name="eglDestroySyncKHR"/>
>+                <command name="eglClientWaitSyncKHR"/>
>+                <command name="eglGetSyncAttribKHR"/>
>+            </require>
>+        </extension>
>+        <extension name="EGL_KHR_get_all_proc_addresses" supported="egl"/>
>+        <extension name="EGL_KHR_gl_colorspace" supported="egl">
>+            <require>
>+                <enum name="EGL_GL_COLORSPACE_KHR"/>
>+                <enum name="EGL_GL_COLORSPACE_SRGB_KHR"/>
>+                <enum name="EGL_GL_COLORSPACE_LINEAR_KHR"/>
>+            </require>
>+        </extension>
>+        <extension name="EGL_KHR_gl_renderbuffer_image" supported="egl">
>+            <require>
>+                <enum name="EGL_GL_RENDERBUFFER_KHR"/>
>+            </require>
>+        </extension>
>+        <extension name="EGL_KHR_gl_texture_2D_image" supported="egl">
>+            <require>
>+                <enum name="EGL_GL_TEXTURE_2D_KHR"/>
>+                <enum name="EGL_GL_TEXTURE_LEVEL_KHR"/>
>+            </require>
>+        </extension>
>+        <extension name="EGL_KHR_gl_texture_3D_image" supported="egl">
>+            <require>
>+                <enum name="EGL_GL_TEXTURE_3D_KHR"/>
>+                <enum name="EGL_GL_TEXTURE_ZOFFSET_KHR"/>
>+            </require>
>+        </extension>
>+        <extension name="EGL_KHR_gl_texture_cubemap_image" supported="egl">
>+            <require>
>+                <enum name="EGL_GL_TEXTURE_CUBE_MAP_POSITIVE_X_KHR"/>
>+                <enum name="EGL_GL_TEXTURE_CUBE_MAP_NEGATIVE_X_KHR"/>
>+                <enum name="EGL_GL_TEXTURE_CUBE_MAP_POSITIVE_Y_KHR"/>
>+                <enum name="EGL_GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_KHR"/>
>+                <enum name="EGL_GL_TEXTURE_CUBE_MAP_POSITIVE_Z_KHR"/>
>+                <enum name="EGL_GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_KHR"/>
>+            </require>
>+        </extension>
>+        <extension name="EGL_KHR_image" supported="egl">
>+            <require>
>+                <enum name="EGL_NATIVE_PIXMAP_KHR"/>
>+                <enum name="EGL_NO_IMAGE_KHR"/>
>+                <command name="eglCreateImageKHR"/>
>+                <command name="eglDestroyImageKHR"/>
>+            </require>
>+        </extension>
>+        <extension name="EGL_KHR_image_base" supported="egl">
>+            <require>
>+                <enum name="EGL_IMAGE_PRESERVED_KHR"/>
>+                <enum name="EGL_NO_IMAGE_KHR"/>
>+                <command name="eglCreateImageKHR"/>
>+                <command name="eglDestroyImageKHR"/>
>+            </require>
>+        </extension>
>+        <extension name="EGL_KHR_image_pixmap" supported="egl">
>+            <require>
>+                <enum name="EGL_NATIVE_PIXMAP_KHR"/>
>+            </require>
>+        </extension>
>+        <extension name="EGL_KHR_lock_surface" supported="egl">
>+            <require>
>+                <enum name="EGL_READ_SURFACE_BIT_KHR"/>
>+                <enum name="EGL_WRITE_SURFACE_BIT_KHR"/>
>+                <enum name="EGL_LOCK_SURFACE_BIT_KHR"/>
>+                <enum name="EGL_OPTIMAL_FORMAT_BIT_KHR"/>
>+                <enum name="EGL_MATCH_FORMAT_KHR"/>
>+                <enum name="EGL_FORMAT_RGB_565_EXACT_KHR"/>
>+                <enum name="EGL_FORMAT_RGB_565_KHR"/>
>+                <enum name="EGL_FORMAT_RGBA_8888_EXACT_KHR"/>
>+                <enum name="EGL_FORMAT_RGBA_8888_KHR"/>
>+                <enum name="EGL_MAP_PRESERVE_PIXELS_KHR"/>
>+                <enum name="EGL_LOCK_USAGE_HINT_KHR"/>
>+                <enum name="EGL_BITMAP_POINTER_KHR"/>
>+                <enum name="EGL_BITMAP_PITCH_KHR"/>
>+                <enum name="EGL_BITMAP_ORIGIN_KHR"/>
>+                <enum name="EGL_BITMAP_PIXEL_RED_OFFSET_KHR"/>
>+                <enum name="EGL_BITMAP_PIXEL_GREEN_OFFSET_KHR"/>
>+                <enum name="EGL_BITMAP_PIXEL_BLUE_OFFSET_KHR"/>
>+                <enum name="EGL_BITMAP_PIXEL_ALPHA_OFFSET_KHR"/>
>+                <enum name="EGL_BITMAP_PIXEL_LUMINANCE_OFFSET_KHR"/>
>+                <enum name="EGL_LOWER_LEFT_KHR"/>
>+                <enum name="EGL_UPPER_LEFT_KHR"/>
>+                <command name="eglLockSurfaceKHR"/>
>+                <command name="eglUnlockSurfaceKHR"/>
>+            </require>
>+        </extension>
>+        <extension name="EGL_KHR_lock_surface2" supported="egl">
>+            <require>
>+                <enum name="EGL_BITMAP_PIXEL_SIZE_KHR"/>
>+            </require>
>+        </extension>
>+        <extension name="EGL_KHR_lock_surface3" supported="egl">
>+            <require>
>+                <enum name="EGL_READ_SURFACE_BIT_KHR"/>
>+                <enum name="EGL_WRITE_SURFACE_BIT_KHR"/>
>+                <enum name="EGL_LOCK_SURFACE_BIT_KHR"/>
>+                <enum name="EGL_OPTIMAL_FORMAT_BIT_KHR"/>
>+                <enum name="EGL_MATCH_FORMAT_KHR"/>
>+                <enum name="EGL_FORMAT_RGB_565_EXACT_KHR"/>
>+                <enum name="EGL_FORMAT_RGB_565_KHR"/>
>+                <enum name="EGL_FORMAT_RGBA_8888_EXACT_KHR"/>
>+                <enum name="EGL_FORMAT_RGBA_8888_KHR"/>
>+                <enum name="EGL_MAP_PRESERVE_PIXELS_KHR"/>
>+                <enum name="EGL_LOCK_USAGE_HINT_KHR"/>
>+                <enum name="EGL_BITMAP_PITCH_KHR"/>
>+                <enum name="EGL_BITMAP_ORIGIN_KHR"/>
>+                <enum name="EGL_BITMAP_PIXEL_RED_OFFSET_KHR"/>
>+                <enum name="EGL_BITMAP_PIXEL_GREEN_OFFSET_KHR"/>
>+                <enum name="EGL_BITMAP_PIXEL_BLUE_OFFSET_KHR"/>
>+                <enum name="EGL_BITMAP_PIXEL_ALPHA_OFFSET_KHR"/>
>+                <enum name="EGL_BITMAP_PIXEL_LUMINANCE_OFFSET_KHR"/>
>+                <enum name="EGL_BITMAP_PIXEL_SIZE_KHR"/>
>+                <enum name="EGL_BITMAP_POINTER_KHR"/>
>+                <enum name="EGL_LOWER_LEFT_KHR"/>
>+                <enum name="EGL_UPPER_LEFT_KHR"/>
>+                <command name="eglLockSurfaceKHR"/>
>+                <command name="eglUnlockSurfaceKHR"/>
>+                <command name="eglQuerySurface64KHR"/>
>+            </require>
>+        </extension>
>+        <extension name="EGL_KHR_mutable_render_buffer" supported="egl">
>+            <require>
>+                <enum name="EGL_MUTABLE_RENDER_BUFFER_BIT_KHR"/>
>+            </require>
>+        </extension>
>+        <extension name="EGL_KHR_no_config_context" supported="egl">
>+            <require>
>+                <enum name="EGL_NO_CONFIG_KHR"/>
>+            </require>
>+        </extension>
>+        <extension name="EGL_KHR_partial_update" supported="egl">
>+            <require>
>+                <enum name="EGL_BUFFER_AGE_KHR"/>
>+                <command name="eglSetDamageRegionKHR"/>
>+            </require>
>+        </extension>
>+        <extension name="EGL_KHR_platform_android" supported="egl">
>+            <require>
>+                <enum name="EGL_PLATFORM_ANDROID_KHR"/>
>+            </require>
>+        </extension>
>+        <extension name="EGL_KHR_platform_gbm" supported="egl">
>+            <require>
>+                <enum name="EGL_PLATFORM_GBM_KHR"/>
>+            </require>
>+        </extension>
>+        <extension name="EGL_KHR_platform_wayland" supported="egl">
>+            <require>
>+                <enum name="EGL_PLATFORM_WAYLAND_KHR"/>
>+            </require>
>+        </extension>
>+        <extension name="EGL_KHR_platform_x11" supported="egl">
>+            <require>
>+                <enum name="EGL_PLATFORM_X11_KHR"/>
>+                <enum name="EGL_PLATFORM_X11_SCREEN_KHR"/>
>+            </require>
>+        </extension>
>+        <extension name="EGL_KHR_reusable_sync" protect="KHRONOS_SUPPORT_INT64" supported="egl">
>+            <require>
>+                <enum name="EGL_SYNC_STATUS_KHR"/>
>+                <enum name="EGL_SIGNALED_KHR"/>
>+                <enum name="EGL_UNSIGNALED_KHR"/>
>+                <enum name="EGL_TIMEOUT_EXPIRED_KHR"/>
>+                <enum name="EGL_CONDITION_SATISFIED_KHR"/>
>+                <enum name="EGL_SYNC_TYPE_KHR"/>
>+                <enum name="EGL_SYNC_REUSABLE_KHR"/>
>+                <enum name="EGL_SYNC_FLUSH_COMMANDS_BIT_KHR"/>
>+                <enum name="EGL_FOREVER_KHR"/>
>+                <enum name="EGL_NO_SYNC_KHR"/>
>+                <command name="eglCreateSyncKHR"/>
>+                <command name="eglDestroySyncKHR"/>
>+                <command name="eglClientWaitSyncKHR"/>
>+                <command name="eglSignalSyncKHR"/>
>+                <command name="eglGetSyncAttribKHR"/>
>+            </require>
>+        </extension>
>+        <extension name="EGL_KHR_stream" protect="KHRONOS_SUPPORT_INT64" supported="egl">
>+            <require>
>+                <enum name="EGL_NO_STREAM_KHR"/>
>+                <enum name="EGL_CONSUMER_LATENCY_USEC_KHR"/>
>+                <enum name="EGL_PRODUCER_FRAME_KHR"/>
>+                <enum name="EGL_CONSUMER_FRAME_KHR"/>
>+                <enum name="EGL_STREAM_STATE_KHR"/>
>+                <enum name="EGL_STREAM_STATE_CREATED_KHR"/>
>+                <enum name="EGL_STREAM_STATE_CONNECTING_KHR"/>
>+                <enum name="EGL_STREAM_STATE_EMPTY_KHR"/>
>+                <enum name="EGL_STREAM_STATE_NEW_FRAME_AVAILABLE_KHR"/>
>+                <enum name="EGL_STREAM_STATE_OLD_FRAME_AVAILABLE_KHR"/>
>+                <enum name="EGL_STREAM_STATE_DISCONNECTED_KHR"/>
>+                <enum name="EGL_BAD_STREAM_KHR"/>
>+                <enum name="EGL_BAD_STATE_KHR"/>
>+                <command name="eglCreateStreamKHR"/>
>+                <command name="eglDestroyStreamKHR"/>
>+                <command name="eglStreamAttribKHR"/>
>+                <command name="eglQueryStreamKHR"/>
>+                <command name="eglQueryStreamu64KHR"/>
>+            </require>
>+        </extension>
>+        <extension name="EGL_KHR_stream_attrib" protect="KHRONOS_SUPPORT_INT64" supported="egl">
>+            <require>
>+                <enum name="EGL_CONSUMER_LATENCY_USEC_KHR"/>
>+                <enum name="EGL_STREAM_STATE_KHR"/>
>+                <enum name="EGL_STREAM_STATE_CREATED_KHR"/>
>+                <enum name="EGL_STREAM_STATE_CONNECTING_KHR"/>
>+                <command name="eglCreateStreamAttribKHR"/>
>+                <command name="eglSetStreamAttribKHR"/>
>+                <command name="eglQueryStreamAttribKHR"/>
>+                <command name="eglStreamConsumerAcquireAttribKHR"/>
>+                <command name="eglStreamConsumerReleaseAttribKHR"/>
>+            </require>
>+        </extension>
>+        <extension name="EGL_KHR_stream_consumer_gltexture" protect="EGL_KHR_stream" supported="egl">
>+            <require>
>+                <enum name="EGL_CONSUMER_ACQUIRE_TIMEOUT_USEC_KHR"/>
>+                <command name="eglStreamConsumerGLTextureExternalKHR"/>
>+                <command name="eglStreamConsumerAcquireKHR"/>
>+                <command name="eglStreamConsumerReleaseKHR"/>
>+            </require>
>+        </extension>
>+        <extension name="EGL_KHR_stream_cross_process_fd" protect="EGL_KHR_stream" supported="egl">
>+            <require>
>+                <enum name="EGL_NO_FILE_DESCRIPTOR_KHR"/>
>+                <command name="eglGetStreamFileDescriptorKHR"/>
>+                <command name="eglCreateStreamFromFileDescriptorKHR"/>
>+            </require>
>+        </extension>
>+        <extension name="EGL_KHR_stream_fifo" protect="EGL_KHR_stream" supported="egl">
>+            <require>
>+                <enum name="EGL_STREAM_FIFO_LENGTH_KHR"/>
>+                <enum name="EGL_STREAM_TIME_NOW_KHR"/>
>+                <enum name="EGL_STREAM_TIME_CONSUMER_KHR"/>
>+                <enum name="EGL_STREAM_TIME_PRODUCER_KHR"/>
>+                <command name="eglQueryStreamTimeKHR"/>
>+            </require>
>+        </extension>
>+        <extension name="EGL_KHR_stream_producer_aldatalocator" protect="EGL_KHR_stream" supported="egl"/>
>+        <extension name="EGL_KHR_stream_producer_eglsurface" protect="EGL_KHR_stream" supported="egl">
>+            <require>
>+                <enum name="EGL_STREAM_BIT_KHR"/>
>+                <command name="eglCreateStreamProducerSurfaceKHR"/>
>+            </require>
>+        </extension>
>+        <extension name="EGL_KHR_surfaceless_context" supported="egl" comment="Just relaxes an error condition"/>
>+        <extension name="EGL_KHR_swap_buffers_with_damage" supported="egl">
>+            <require>
>+                <command name="eglSwapBuffersWithDamageKHR"/>
>+            </require>
>+        </extension>
>+        <extension name="EGL_KHR_vg_parent_image" supported="egl">
>+            <require>
>+                <enum name="EGL_VG_PARENT_IMAGE_KHR"/>
>+            </require>
>+        </extension>
>+        <extension name="EGL_KHR_wait_sync" supported="egl">
>+            <require>
>+                <command name="eglWaitSyncKHR"/>
>+            </require>
>+        </extension>
>+        <extension name="EGL_MESA_drm_image" supported="egl">
>+            <require>
>+                <enum name="EGL_DRM_BUFFER_FORMAT_MESA"/>
>+                <enum name="EGL_DRM_BUFFER_USE_MESA"/>
>+                <enum name="EGL_DRM_BUFFER_FORMAT_ARGB32_MESA"/>
>+                <enum name="EGL_DRM_BUFFER_MESA"/>
>+                <enum name="EGL_DRM_BUFFER_STRIDE_MESA"/>
>+                <enum name="EGL_DRM_BUFFER_USE_SCANOUT_MESA"/>
>+                <enum name="EGL_DRM_BUFFER_USE_SHARE_MESA"/>
>+                <enum name="EGL_DRM_BUFFER_USE_CURSOR_MESA"/>
>+                <command name="eglCreateDRMImageMESA"/>
>+                <command name="eglExportDRMImageMESA"/>
>+            </require>
>+        </extension>
>+        <extension name="EGL_MESA_image_dma_buf_export" supported="egl">
>+            <require>
>+                <type name="EGLuint64KHR"/>
>+                <command name="eglExportDMABUFImageQueryMESA"/>
>+                <command name="eglExportDMABUFImageMESA"/>
>+            </require>
>+        </extension>
>+        <extension name="EGL_MESA_platform_gbm" supported="egl">
>+            <require>
>+                <enum name="EGL_PLATFORM_GBM_MESA"/>
>+            </require>
>+        </extension>
>+        <extension name="EGL_MESA_platform_surfaceless" supported="egl">
>+            <require>
>+                <enum name="EGL_PLATFORM_SURFACELESS_MESA"/>
>+            </require>
>+        </extension>
>+        <extension name="EGL_NOK_swap_region" supported="egl">
>+            <require>
>+                <command name="eglSwapBuffersRegionNOK"/>
>+            </require>
>+        </extension>
>+        <extension name="EGL_NOK_swap_region2" supported="egl">
>+            <require>
>+                <command name="eglSwapBuffersRegion2NOK"/>
>+            </require>
>+        </extension>
>+        <extension name="EGL_NOK_texture_from_pixmap" supported="egl">
>+            <require>
>+                <enum name="EGL_Y_INVERTED_NOK"/>
>+            </require>
>+        </extension>
>+        <extension name="EGL_NV_3dvision_surface" supported="egl">
>+            <require>
>+                <enum name="EGL_AUTO_STEREO_NV"/>
>+            </require>
>+        </extension>
>+        <extension name="EGL_NV_coverage_sample" supported="egl">
>+            <require>
>+                <enum name="EGL_COVERAGE_BUFFERS_NV"/>
>+                <enum name="EGL_COVERAGE_SAMPLES_NV"/>
>+            </require>
>+        </extension>
>+        <extension name="EGL_NV_context_priority_realtime" supported="egl">
>+            <require>
>+                <enum name="EGL_CONTEXT_PRIORITY_REALTIME_NV"/>
>+            </require>
>+        </extension>
>+        <extension name="EGL_NV_coverage_sample_resolve" supported="egl">
>+            <require>
>+                <enum name="EGL_COVERAGE_SAMPLE_RESOLVE_NV"/>
>+                <enum name="EGL_COVERAGE_SAMPLE_RESOLVE_DEFAULT_NV"/>
>+                <enum name="EGL_COVERAGE_SAMPLE_RESOLVE_NONE_NV"/>
>+            </require>
>+        </extension>
>+        <extension name="EGL_NV_cuda_event" supported="egl">
>+            <require>
>+                <enum name="EGL_CUDA_EVENT_HANDLE_NV"/>
>+                <enum name="EGL_SYNC_CUDA_EVENT_NV"/>
>+                <enum name="EGL_SYNC_CUDA_EVENT_COMPLETE_NV"/>
>+            </require>
>+        </extension>
>+        <extension name="EGL_NV_depth_nonlinear" supported="egl">
>+            <require>
>+                <enum name="EGL_DEPTH_ENCODING_NV"/>
>+                <enum name="EGL_DEPTH_ENCODING_NONE_NV"/>
>+                <enum name="EGL_DEPTH_ENCODING_NONLINEAR_NV"/>
>+            </require>
>+        </extension>
>+        <extension name="EGL_NV_device_cuda" supported="egl">
>+            <require>
>+                <enum name="EGL_CUDA_DEVICE_NV"/>
>+            </require>
>+        </extension>
>+        <extension name="EGL_NV_native_query" supported="egl">
>+            <require>
>+                <command name="eglQueryNativeDisplayNV"/>
>+                <command name="eglQueryNativeWindowNV"/>
>+                <command name="eglQueryNativePixmapNV"/>
>+            </require>
>+        </extension>
>+        <extension name="EGL_NV_post_convert_rounding" supported="egl">
>+            <require>
>+            </require>
>+        </extension>
>+        <extension name="EGL_NV_post_sub_buffer" supported="egl">
>+            <require>
>+                <enum name="EGL_POST_SUB_BUFFER_SUPPORTED_NV"/>
>+                <command name="eglPostSubBufferNV"/>
>+            </require>
>+        </extension>
>+        <extension name="EGL_NV_robustness_video_memory_purge" supported="egl">
>+            <require>
>+                <enum name="EGL_GENERATE_RESET_ON_VIDEO_MEMORY_PURGE_NV"/>
>+            </require>
>+        </extension>
>+        <extension name="EGL_NV_stream_consumer_gltexture_yuv" supported="egl">
>+            <require>
>+                <enum name="EGL_YUV_PLANE0_TEXTURE_UNIT_NV"/>
>+                <enum name="EGL_YUV_PLANE1_TEXTURE_UNIT_NV"/>
>+                <enum name="EGL_YUV_PLANE2_TEXTURE_UNIT_NV"/>
>+                <enum name="EGL_YUV_NUMBER_OF_PLANES_EXT"/>
>+                <enum name="EGL_YUV_BUFFER_EXT"/>
>+                <command name="eglStreamConsumerGLTextureExternalAttribsNV"/>
>+            </require>
>+        </extension>
>+        <extension name="EGL_NV_stream_cross_object" supported="egl">
>+            <require>
>+                <enum name="EGL_STREAM_CROSS_OBJECT_NV"/>
>+            </require>
>+        </extension>
>+        <extension name="EGL_NV_stream_cross_display" supported="egl">
>+            <require>
>+                <enum name="EGL_STREAM_CROSS_DISPLAY_NV"/>
>+            </require>
>+        </extension>
>+        <extension name="EGL_NV_stream_cross_partition" supported="egl">
>+            <require>
>+                <enum name="EGL_STREAM_CROSS_PARTITION_NV"/>
>+            </require>
>+        </extension>
>+        <extension name="EGL_NV_stream_cross_process" supported="egl">
>+            <require>
>+                <enum name="EGL_STREAM_CROSS_PROCESS_NV"/>
>+            </require>
>+        </extension>
>+        <extension name="EGL_NV_stream_cross_system" supported="egl">
>+            <require>
>+                <enum name="EGL_STREAM_CROSS_SYSTEM_NV"/>
>+            </require>
>+        </extension>
>+        <extension name="EGL_NV_stream_fifo_next" supported="egl">
>+            <require>
>+                <enum name="EGL_PENDING_FRAME_NV"/>
>+                <enum name="EGL_STREAM_TIME_PENDING_NV"/>
>+            </require>
>+        </extension>
>+        <extension name="EGL_NV_stream_fifo_synchronous" supported="egl">
>+            <require>
>+                <enum name="EGL_STREAM_FIFO_SYNCHRONOUS_NV"/>
>+            </require>
>+        </extension>
>+        <extension name="EGL_NV_stream_flush" supported="egl">
>+            <require>
>+                <command name="eglStreamFlushNV"/>
>+            </require>
>+        </extension>
>+        <extension name="EGL_NV_stream_frame_limits" supported="egl">
>+            <require>
>+                <enum name="EGL_PRODUCER_MAX_FRAME_HINT_NV"/>
>+                <enum name="EGL_CONSUMER_MAX_FRAME_HINT_NV"/>
>+            </require>
>+        </extension>
>+        <extension name="EGL_NV_stream_metadata" supported="egl">
>+            <require>
>+                <enum name="EGL_MAX_STREAM_METADATA_BLOCKS_NV"/>
>+                <enum name="EGL_MAX_STREAM_METADATA_BLOCK_SIZE_NV"/>
>+                <enum name="EGL_MAX_STREAM_METADATA_TOTAL_SIZE_NV"/>
>+                <enum name="EGL_PRODUCER_METADATA_NV"/>
>+                <enum name="EGL_CONSUMER_METADATA_NV"/>
>+                <enum name="EGL_PENDING_METADATA_NV"/>
>+                <enum name="EGL_METADATA0_SIZE_NV"/>
>+                <enum name="EGL_METADATA1_SIZE_NV"/>
>+                <enum name="EGL_METADATA2_SIZE_NV"/>
>+                <enum name="EGL_METADATA3_SIZE_NV"/>
>+                <enum name="EGL_METADATA0_TYPE_NV"/>
>+                <enum name="EGL_METADATA1_TYPE_NV"/>
>+                <enum name="EGL_METADATA2_TYPE_NV"/>
>+                <enum name="EGL_METADATA3_TYPE_NV"/>
>+                <command name="eglQueryDisplayAttribNV"/>
>+                <command name="eglSetStreamMetadataNV"/>
>+                <command name="eglQueryStreamMetadataNV"/>
>+            </require>
>+        </extension>
>+        <extension name="EGL_NV_stream_reset" supported="egl">
>+            <require>
>+                <enum name="EGL_SUPPORT_RESET_NV"/>
>+                <enum name="EGL_SUPPORT_REUSE_NV"/>
>+                <command name="eglResetStreamNV"/>
>+            </require>
>+        </extension>
>+        <extension name="EGL_NV_stream_remote" supported="egl">
>+            <require>
>+                <enum name="EGL_STREAM_STATE_INITIALIZING_NV"/>
>+                <enum name="EGL_STREAM_TYPE_NV"/>
>+                <enum name="EGL_STREAM_PROTOCOL_NV"/>
>+                <enum name="EGL_STREAM_ENDPOINT_NV"/>
>+                <enum name="EGL_STREAM_LOCAL_NV"/>
>+                <enum name="EGL_STREAM_PRODUCER_NV"/>
>+                <enum name="EGL_STREAM_CONSUMER_NV"/>
>+            </require>
>+            <require comment="Supported only if EGL_KHR_stream_cross_process_fd is supported">
>+                <enum name="EGL_STREAM_PROTOCOL_FD_NV"/>
>+            </require>
>+        </extension>
>+        <extension name="EGL_NV_stream_socket" supported="egl">
>+            <require>
>+                <enum name="EGL_STREAM_PROTOCOL_SOCKET_NV"/>
>+                <enum name="EGL_SOCKET_HANDLE_NV"/>
>+                <enum name="EGL_SOCKET_TYPE_NV"/>
>+            </require>
>+        </extension>
>+        <extension name="EGL_NV_stream_socket_inet" supported="egl">
>+            <require>
>+                <enum name="EGL_SOCKET_TYPE_INET_NV"/>
>+            </require>
>+        </extension>
>+        <extension name="EGL_NV_stream_socket_unix" supported="egl">
>+            <require>
>+                <enum name="EGL_SOCKET_TYPE_UNIX_NV"/>
>+            </require>
>+        </extension>
>+        <extension name="EGL_NV_stream_sync" supported="egl">
>+            <require>
>+                <enum name="EGL_SYNC_TYPE_KHR"/>
>+                <enum name="EGL_SYNC_NEW_FRAME_NV"/>
>+                <command name="eglCreateStreamSyncNV"/>
>+            </require>
>+        </extension>
>+        <extension name="EGL_NV_sync" protect="KHRONOS_SUPPORT_INT64" supported="egl">
>+            <require>
>+                <enum name="EGL_SYNC_PRIOR_COMMANDS_COMPLETE_NV"/>
>+                <enum name="EGL_SYNC_STATUS_NV"/>
>+                <enum name="EGL_SIGNALED_NV"/>
>+                <enum name="EGL_UNSIGNALED_NV"/>
>+                <enum name="EGL_SYNC_FLUSH_COMMANDS_BIT_NV"/>
>+                <enum name="EGL_FOREVER_NV"/>
>+                <enum name="EGL_ALREADY_SIGNALED_NV"/>
>+                <enum name="EGL_TIMEOUT_EXPIRED_NV"/>
>+                <enum name="EGL_CONDITION_SATISFIED_NV"/>
>+                <enum name="EGL_SYNC_TYPE_NV"/>
>+                <enum name="EGL_SYNC_CONDITION_NV"/>
>+                <enum name="EGL_SYNC_FENCE_NV"/>
>+                <enum name="EGL_NO_SYNC_NV"/>
>+                <command name="eglCreateFenceSyncNV"/>
>+                <command name="eglDestroySyncNV"/>
>+                <command name="eglFenceNV"/>
>+                <command name="eglClientWaitSyncNV"/>
>+                <command name="eglSignalSyncNV"/>
>+                <command name="eglGetSyncAttribNV"/>
>+            </require>
>+        </extension>
>+        <extension name="EGL_NV_system_time" protect="KHRONOS_SUPPORT_INT64" supported="egl">
>+            <require>
>+                <command name="eglGetSystemTimeFrequencyNV"/>
>+                <command name="eglGetSystemTimeNV"/>
>+            </require>
>+        </extension>
>+        <extension name="EGL_TIZEN_image_native_buffer" supported="egl">
>+            <require>
>+                <enum name="EGL_NATIVE_BUFFER_TIZEN"/>
>+            </require>
>+        </extension>
>+        <extension name="EGL_TIZEN_image_native_surface" supported="egl">
>+            <require>
>+                <enum name="EGL_NATIVE_SURFACE_TIZEN"/>
>+            </require>
>+        </extension>
>+        <extension name="EGL_EXT_compositor" supported="egl">
>+            <require>
>+                <enum name="EGL_PRIMARY_COMPOSITOR_CONTEXT_EXT"/>
>+                <enum name="EGL_EXTERNAL_REF_ID_EXT"/>
>+                <enum name="EGL_COMPOSITOR_DROP_NEWEST_FRAME_EXT"/>
>+                <enum name="EGL_COMPOSITOR_KEEP_NEWEST_FRAME_EXT"/>
>+
>+                <command name="eglCompositorSetContextListEXT"/>
>+                <command name="eglCompositorSetContextAttributesEXT"/>
>+                <command name="eglCompositorSetWindowListEXT"/>
>+                <command name="eglCompositorSetWindowAttributesEXT"/>
>+                <command name="eglCompositorBindTexWindowEXT"/>
>+                <command name="eglCompositorSetSizeEXT"/>
>+                <command name="eglCompositorSwapPolicyEXT"/>
>+            </require>
>+        </extension>
>+        <extension name="EGL_EXT_surface_CTA861_3_metadata" supported="egl">
>+            <require>
>+                <enum name="EGL_CTA861_3_MAX_CONTENT_LIGHT_LEVEL_EXT"/>
>+                <enum name="EGL_CTA861_3_MAX_FRAME_AVERAGE_LEVEL_EXT"/>
>+            </require>
>+        </extension>
>+        <extension name="EGL_EXT_image_implicit_sync_control" supported="egl">
>+            <require>
>+                <enum name="EGL_IMPORT_SYNC_TYPE_EXT"/>
>+                <enum name="EGL_IMPORT_IMPLICIT_SYNC_EXT"/>
>+                <enum name="EGL_IMPORT_EXPLICIT_SYNC_EXT"/>
>+            </require>
>+        </extension>
>+        <extension name="EGL_EXT_bind_to_front" supported="egl">
>+            <require>
>+                <enum name="EGL_FRONT_BUFFER_EXT"/>
>+            </require>
>+        </extension>
>+    </extensions>
>+</registry>
>diff --git a/Source/ThirdParty/ANGLE/scripts/egl_angle_ext.xml b/Source/ThirdParty/ANGLE/scripts/egl_angle_ext.xml
>new file mode 100644
>index 00000000000..e1029bd0035
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/scripts/egl_angle_ext.xml
>@@ -0,0 +1,101 @@
>+<?xml version="1.0" encoding="UTF-8"?>
>+<registry>
>+    <comment>
>+    Copyright 2018 The ANGLE Project Authors. All rights reserved.
>+    Use of this source code is governed by a BSD-style license that can be
>+    found in the LICENSE file.
>+
>+    egl_angle_ext.xml
>+        Includes data used to auto-generate ANGLE classes.
>+    </comment>
>+    
>+    <commands namespace="EGL">
>+        <command>
>+            <proto><ptype>EGLDeviceEXT</ptype> <name>eglCreateDeviceANGLE</name></proto>
>+            <param><ptype>EGLint</ptype> <name>device_type</name></param>
>+            <param>void *<name>native_device</name></param>
>+            <param>const <ptype>EGLattrib</ptype> *<name>attrib_list</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>EGLBoolean</ptype> <name>eglReleaseDeviceANGLE</name></proto>
>+            <param><ptype>EGLDeviceEXT</ptype> <name>device</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>EGLBoolean</ptype> <name>eglCreateStreamProducerD3DTextureANGLE</name></proto>
>+            <param><ptype>EGLDisplay</ptype> <name>dpy</name></param>
>+            <param><ptype>EGLStreamKHR</ptype> <name>stream</name></param>
>+            <param>const <ptype>EGLAttrib</ptype> *<name>attrib_list</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>EGLBoolean</ptype> <name>eglStreamPostD3DTextureANGLE</name></proto>
>+            <param><ptype>EGLDisplay</ptype> <name>dpy</name></param>
>+            <param><ptype>EGLStreamKHR</ptype> <name>stream</name></param>
>+            <param>void *<name>texture</name></param>
>+            <param>const <ptype>EGLAttrib</ptype> *<name>attrib_list</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>EGLBoolean</ptype> <name>eglGetSyncValuesCHROMIUM</name></proto>
>+            <param><ptype>EGLDisplay</ptype> <name>dpy</name></param>
>+            <param><ptype>EGLSurface</ptype> <name>surface</name></param>
>+            <param><ptype>EGLuint64KHR</ptype> *<name>ust</name></param>
>+            <param><ptype>EGLuint64KHR</ptype> *<name>msc</name></param>
>+            <param><ptype>EGLuint64KHR</ptype> *<name>sbc</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>EGLint</ptype> <name>eglProgramCacheGetAttribANGLE</name></proto>
>+            <param><ptype>EGLDisplay</ptype> <name>dpy</name></param>
>+            <param><ptype>EGLenum</ptype> <name>attrib</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>eglProgramCacheQueryANGLE</name></proto>
>+            <param><ptype>EGLDisplay</ptype> <name>dpy</name></param>
>+            <param><ptype>EGLint</ptype> <name>index</name></param>
>+            <param>void *<name>key</name></param>
>+            <param><ptype>EGLint</ptype> *<name>keysize</name></param>
>+            <param>void *<name>binary</name></param>
>+            <param><ptype>EGLint</ptype> *<name>binarysize</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>eglProgramCachePopulateANGLE</name></proto>
>+            <param><ptype>EGLDisplay</ptype> <name>dpy</name></param>
>+            <param>const void *<name>key</name></param>
>+            <param><ptype>EGLint</ptype> <name>keysize</name></param>
>+            <param>const void *<name>binary</name></param>
>+            <param><ptype>EGLint</ptype> <name>binarysize</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>EGLint</ptype> <name>eglProgramCacheResizeANGLE</name></proto>
>+            <param><ptype>EGLDisplay</ptype> <name>dpy</name></param>
>+            <param><ptype>EGLint</ptype> <name>limit</name></param>
>+            <param><ptype>EGLint</ptype> <name>mode</name></param>
>+        </command>
>+    </commands>
>+    
>+    <extensions>
>+        <extension name="EGL_ANGLE_device_creation" supported="egl">
>+            <require>
>+                <command name="eglCreateDeviceANGLE"/>
>+                <command name="eglReleaseDeviceANGLE"/>
>+            </require>
>+        </extension>
>+        <extension name="EGL_ANGLE_stream_producer_d3d_texture" supported="egl">
>+            <require>
>+                <command name="eglCreateStreamProducerD3DTextureANGLE"/>
>+                <command name="eglStreamPostD3DTextureANGLE"/>
>+            </require>
>+        </extension>
>+        <extension name="EGL_CHROMIUM_get_sync_values" supported="egl">
>+            <require>
>+                <command name="eglGetSyncValuesCHROMIUM"/>
>+            </require>
>+        </extension>
>+        <extension name="EGL_ANGLE_program_cache_control" supported="egl">
>+            <require>
>+                <command name="eglProgramCacheGetAttribANGLE"/>
>+                <command name="eglProgramCacheQueryANGLE"/>
>+                <command name="eglProgramCachePopulateANGLE"/>
>+                <command name="eglProgramCacheResizeANGLE"/>
>+            </require>
>+        </extension>
>+    </extensions>
>+</registry>
>diff --git a/Source/ThirdParty/ANGLE/scripts/entry_point_packed_gl_enums.json b/Source/ThirdParty/ANGLE/scripts/entry_point_packed_gl_enums.json
>new file mode 100644
>index 00000000000..7c5fd6351dd
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/scripts/entry_point_packed_gl_enums.json
>@@ -0,0 +1,505 @@
>+{
>+    "glAlphaFunc": {
>+        "func": "AlphaTestFunc"
>+    },
>+    "glAlphaFuncx": {
>+        "func": "AlphaTestFunc"
>+    },
>+    "glBeginTransformFeedback": {
>+        "primitiveMode": "PrimitiveMode"
>+    },
>+    "glBeginQuery": {
>+        "target": "QueryType"
>+    },
>+    "glBeginQueryEXT": {
>+        "target": "QueryType"
>+    },
>+    "glBindBuffer": {
>+        "target": "BufferBinding"
>+    },
>+    "glBindBufferBase": {
>+        "target": "BufferBinding"
>+    },
>+    "glBindBufferRange": {
>+        "target": "BufferBinding"
>+    },
>+    "glBindTexture": {
>+        "target": "TextureType"
>+    },
>+    "glBufferData": {
>+        "target": "BufferBinding",
>+        "usage": "BufferUsage"
>+    },
>+    "glBufferSubData": {
>+        "target": "BufferBinding"
>+    },
>+    "glColorPointer": {
>+        "type": "VertexAttribType"
>+    },
>+    "glCompressedTexImage2D": {
>+        "target": "TextureTarget"
>+    },
>+    "glCompressedTexImage2DRobustANGLE": {
>+        "target": "TextureTarget"
>+    },
>+    "glCompressedTexImage3D": {
>+        "target": "TextureTarget"
>+    },
>+    "glCompressedTexImage3DRobustANGLE": {
>+        "target": "TextureTarget"
>+    },
>+    "glCompressedTexSubImage2D": {
>+        "target": "TextureTarget"
>+    },
>+    "glCompressedTexSubImage2DRobustANGLE": {
>+        "target": "TextureTarget"
>+    },
>+    "glCompressedTexSubImage3D": {
>+        "target": "TextureTarget"
>+    },
>+    "glCompressedTexSubImage3DRobustANGLE": {
>+        "target": "TextureTarget"
>+    },
>+    "glCopyTexImage2D": {
>+        "target": "TextureTarget"
>+    },
>+    "glCopyTexture3DANGLE": {
>+        "destTarget": "TextureTarget"
>+    },
>+    "glCopyTextureCHROMIUM": {
>+        "destTarget": "TextureTarget"
>+    },
>+    "glCopyTexSubImage2D": {
>+        "target": "TextureTarget"
>+    },
>+    "glCopyTexSubImage3D": {
>+        "target": "TextureTarget"
>+    },
>+    "glCopySubTexture3DANGLE": {
>+        "destTarget": "TextureTarget"
>+    },
>+    "glCopySubTextureCHROMIUM": {
>+        "destTarget": "TextureTarget"
>+    },
>+    "glCopyBufferSubData": {
>+        "readTarget": "BufferBinding",
>+        "writeTarget": "BufferBinding"
>+    },
>+    "glCreateShader": {
>+        "type": "ShaderType"
>+    },
>+    "glCreateShaderProgramv": {
>+        "type": "ShaderType"
>+    },
>+    "glCullFace": {
>+        "mode": "CullFaceMode"
>+    },
>+    "glDisableClientState": {
>+        "array": "ClientVertexArrayType"
>+    },
>+    "glDrawArrays": {
>+        "mode": "PrimitiveMode"
>+    },
>+    "glDrawArraysIndirect": {
>+        "mode": "PrimitiveMode"
>+    },
>+    "glDrawArraysInstanced": {
>+        "mode": "PrimitiveMode"
>+    },
>+    "glDrawArraysInstancedANGLE": {
>+        "mode": "PrimitiveMode"
>+    },
>+    "glDrawArraysInstancedEXT": {
>+        "mode": "PrimitiveMode"
>+    },
>+    "glDrawElements": {
>+        "mode": "PrimitiveMode",
>+        "type": "DrawElementsType"
>+    },
>+    "glDrawElementsIndirect": {
>+        "mode": "PrimitiveMode",
>+        "type": "DrawElementsType"
>+    },
>+    "glDrawElementsInstanced": {
>+        "mode": "PrimitiveMode",
>+        "type": "DrawElementsType"
>+    },
>+    "glDrawElementsInstancedANGLE": {
>+        "mode": "PrimitiveMode",
>+        "type": "DrawElementsType"
>+    },
>+    "glDrawElementsInstancedEXT": {
>+        "mode": "PrimitiveMode",
>+        "type": "DrawElementsType"
>+    },
>+    "glDrawRangeElements": {
>+        "mode": "PrimitiveMode",
>+        "type": "DrawElementsType"
>+    },
>+    "glEGLImageTargetTexture2DOES": {
>+        "target": "TextureType"
>+    },
>+    "glEnableClientState": {
>+        "array": "ClientVertexArrayType"
>+    },
>+    "glEndQuery": {
>+        "target": "QueryType"
>+    },
>+    "glEndQueryEXT": {
>+        "target": "QueryType"
>+    },
>+    "glFlushMappedBufferRange": {
>+        "target": "BufferBinding"
>+    },
>+    "glFlushMappedBufferRangeEXT": {
>+        "target": "BufferBinding"
>+    },
>+    "glFramebufferTexture2D": {
>+        "textarget": "TextureTarget"
>+    },
>+    "glFramebufferTexture2DOES": {
>+        "textarget": "TextureTarget"
>+    },
>+    "glGenerateMipmap": {
>+        "target": "TextureType"
>+    },
>+    "glGenerateMipmapOES": {
>+        "target": "TextureType"
>+    },
>+    "glGetBufferParameteriv": {
>+        "target": "BufferBinding"
>+    },
>+    "glGetBufferParameterivRobustANGLE": {
>+        "target": "BufferBinding"
>+    },
>+    "glGetBufferParameteri64v": {
>+        "target": "BufferBinding"
>+    },
>+    "glGetBufferParameteri64vRobustANGLE": {
>+        "target": "BufferBinding"
>+    },
>+    "glGetBufferPointerv": {
>+        "target": "BufferBinding"
>+    },
>+    "glGetBufferPointervOES": {
>+        "target": "BufferBinding"
>+    },
>+    "glGetBufferPointervRobustANGLE": {
>+        "target": "BufferBinding"
>+    },
>+    "glGetLightfv": {
>+        "pname" : "LightParameter"
>+    },
>+    "glGetLightxv": {
>+        "pname" : "LightParameter"
>+    },
>+    "glGetMaterialfv": {
>+        "pname" : "MaterialParameter"
>+    },
>+    "glGetMaterialxv": {
>+        "pname" : "MaterialParameter"
>+    },
>+    "glGetQueryiv": {
>+        "target": "QueryType"
>+    },
>+    "glGetQueryivEXT": {
>+        "target": "QueryType"
>+    },
>+    "glGetQueryivRobustANGLE": {
>+        "target": "QueryType"
>+    },
>+    "glGetTexEnvfv": {
>+        "target": "TextureEnvTarget",
>+        "pname": "TextureEnvParameter"
>+    },
>+    "glGetTexEnviv": {
>+        "target": "TextureEnvTarget",
>+        "pname": "TextureEnvParameter"
>+    },
>+    "glGetTexEnvxv": {
>+        "target": "TextureEnvTarget",
>+        "pname": "TextureEnvParameter"
>+    },
>+    "glGetTexLevelParameterfv": {
>+        "target": "TextureTarget"
>+    },
>+    "glGetTexLevelParameterfvRobustANGLE": {
>+        "target": "TextureTarget"
>+    },
>+    "glGetTexLevelParameterfvANGLE": {
>+        "target": "TextureTarget"
>+    },
>+    "glGetTexLevelParameteriv": {
>+        "target": "TextureTarget"
>+    },
>+    "glGetTexLevelParameterivRobustANGLE": {
>+        "target": "TextureTarget"
>+    },
>+    "glGetTexLevelParameterivANGLE": {
>+        "target": "TextureTarget"
>+    },
>+    "glGetTexParameterfv": {
>+        "target": "TextureType"
>+    },
>+    "glGetTexParameterfvRobustANGLE": {
>+        "target": "TextureType"
>+    },
>+    "glGetTexParameteriv": {
>+        "target": "TextureType"
>+    },
>+    "glGetTexParameterivRobustANGLE": {
>+        "target": "TextureType"
>+    },
>+    "glGetTexParameterIivRobustANGLE": {
>+        "target": "TextureType"
>+    },
>+    "glGetTexParameterIuivRobustANGLE": {
>+        "target": "TextureType"
>+    },
>+    "glGetTexParameterIivOES": {
>+        "target": "TextureType"
>+    },
>+    "glGetTexParameterIuivOES": {
>+        "target": "TextureType"
>+    },
>+    "glGetTexParameterxv": {
>+        "target": "TextureType"
>+    },
>+    "glImportMemoryFdEXT": {
>+        "handleType": "HandleType"
>+    },
>+    "glImportSemaphoreFdEXT": {
>+        "handleType": "HandleType"
>+    },
>+    "glLightf" : {
>+        "pname" : "LightParameter"
>+    },
>+    "glLightfv" : {
>+        "pname" : "LightParameter"
>+    },
>+    "glLightx" : {
>+        "pname" : "LightParameter"
>+    },
>+    "glLightxv" : {
>+        "pname" : "LightParameter"
>+    },
>+    "glLogicOp" : {
>+        "opcode" : "LogicalOperation"
>+    },
>+    "glLoseContextCHROMIUM" : {
>+        "current" : "GraphicsResetStatus",
>+        "other" : "GraphicsResetStatus"
>+    },
>+    "glMapBuffer": {
>+        "target": "BufferBinding"
>+    },
>+    "glMapBufferOES": {
>+        "target": "BufferBinding"
>+    },
>+    "glMapBufferRange": {
>+        "target": "BufferBinding"
>+    },
>+    "glMapBufferRangeEXT": {
>+        "target": "BufferBinding"
>+    },
>+    "glMaterialf": {
>+        "pname": "MaterialParameter"
>+    },
>+    "glMaterialfv": {
>+        "pname": "MaterialParameter"
>+    },
>+    "glMaterialx": {
>+        "pname": "MaterialParameter"
>+    },
>+    "glMaterialxv": {
>+        "pname": "MaterialParameter"
>+    },
>+    "glMatrixMode": {
>+        "mode": "MatrixType"
>+    },
>+    "glMultiDrawArraysANGLE": {
>+        "mode": "PrimitiveMode"
>+    },
>+    "glMultiDrawArraysInstancedANGLE": {
>+        "mode": "PrimitiveMode"
>+    },
>+    "glMultiDrawElementsANGLE": {
>+        "mode": "PrimitiveMode",
>+        "type": "DrawElementsType"
>+    },
>+    "glMultiDrawElementsInstancedANGLE": {
>+        "mode": "PrimitiveMode",
>+        "type": "DrawElementsType"
>+    },
>+    "glNormalPointer": {
>+        "type": "VertexAttribType"
>+    },
>+    "glPointParameterf": {
>+        "pname" : "PointParameter"
>+    },
>+    "glPointParameterfv": {
>+        "pname" : "PointParameter"
>+    },
>+    "glPointParameterx": {
>+        "pname" : "PointParameter"
>+    },
>+    "glPointParameterxv": {
>+        "pname" : "PointParameter"
>+    },
>+    "glPointSizePointerOES": {
>+        "type" : "VertexAttribType"
>+    },
>+    "glProvokingVertexANGLE": {
>+        "mode": "ProvokingVertex"
>+    },
>+    "glQueryCounterEXT": {
>+        "target": "QueryType"
>+    },
>+    "glShadeModel": {
>+        "mode": "ShadingModel"
>+    },
>+    "glTexCoordPointer": {
>+        "type": "VertexAttribType"
>+    },
>+    "glTexEnvf": {
>+        "target": "TextureEnvTarget",
>+        "pname": "TextureEnvParameter"
>+    },
>+    "glTexEnvfv": {
>+        "target": "TextureEnvTarget",
>+        "pname": "TextureEnvParameter"
>+    },
>+    "glTexEnvi": {
>+        "target": "TextureEnvTarget",
>+        "pname": "TextureEnvParameter"
>+    },
>+    "glTexEnviv": {
>+        "target": "TextureEnvTarget",
>+        "pname": "TextureEnvParameter"
>+    },
>+    "glTexEnvx": {
>+        "target": "TextureEnvTarget",
>+        "pname": "TextureEnvParameter"
>+    },
>+    "glTexEnvxv": {
>+        "target": "TextureEnvTarget",
>+        "pname": "TextureEnvParameter"
>+    },
>+    "glTexImage2D": {
>+        "target": "TextureTarget"
>+    },
>+    "glTexImage2DRobustANGLE": {
>+        "target": "TextureTarget"
>+    },
>+    "glTexImage3D": {
>+        "target": "TextureTarget"
>+    },
>+    "glTexImage3DRobustANGLE": {
>+        "target": "TextureTarget"
>+    },
>+    "glTexParameterf": {
>+        "target": "TextureType"
>+    },
>+    "glTexParameterfv": {
>+        "target": "TextureType"
>+    },
>+    "glTexParameterfvRobustANGLE": {
>+        "target": "TextureType"
>+    },
>+    "glTexParameteri": {
>+        "target": "TextureType"
>+    },
>+    "glTexParameteriv": {
>+        "target": "TextureType"
>+    },
>+    "glTexParameterivRobustANGLE": {
>+        "target": "TextureType"
>+    },
>+    "glTexParameterIivRobustANGLE": {
>+        "target": "TextureType"
>+    },
>+    "glTexParameterIuivRobustANGLE": {
>+        "target": "TextureType"
>+    },
>+    "glTexParameterIivOES": {
>+        "target": "TextureType"
>+    },
>+    "glTexParameterIuivOES": {
>+        "target": "TextureType"
>+    },
>+    "glTexParameterx": {
>+        "target": "TextureType"
>+    },
>+    "glTexParameterxv": {
>+        "target": "TextureType"
>+    },
>+    "glTexStorage2D": {
>+        "target": "TextureType"
>+    },
>+    "glTexStorage2DEXT": {
>+        "target": "TextureType"
>+    },
>+    "glTexStorage2DMultisample": {
>+        "target": "TextureType"
>+    },
>+    "glTexStorage2DMultisampleANGLE": {
>+        "target": "TextureType"
>+    },
>+    "glTexStorage3DMultisampleOES": {
>+        "target": "TextureType"
>+    },
>+    "glTexStorageMem2DEXT": {
>+        "target": "TextureType"
>+    },
>+    "glTexStorageMem2DMultisampleEXT": {
>+        "target": "TextureType"
>+    },
>+    "glTexStorageMem3DEXT": {
>+        "target": "TextureType"
>+    },
>+    "glTexStorageMem3DMultisampleEXT": {
>+        "target": "TextureType"
>+    },
>+    "glBufferStorageMemEXT": {
>+        "target": "TextureType"
>+    },
>+    "glTexStorage3D": {
>+        "target": "TextureType"
>+    },
>+    "glTexStorage3DEXT": {
>+        "target": "TextureType"
>+    },
>+    "glTexSubImage2D": {
>+        "target": "TextureTarget"
>+    },
>+    "glTexSubImage2DRobustANGLE": {
>+        "target": "TextureTarget"
>+    },
>+    "glTexSubImage3D": {
>+        "target": "TextureTarget"
>+    },
>+    "glTexSubImage3DRobustANGLE": {
>+        "target": "TextureTarget"
>+    },
>+    "glUnmapBuffer": {
>+        "target": "BufferBinding"
>+    },
>+    "glUnmapBufferOES": {
>+        "target": "BufferBinding"
>+    },
>+    "glVertexAttribFormat": {
>+        "type": "VertexAttribType"
>+    },
>+    "glVertexAttribIFormat": {
>+        "type": "VertexAttribType"
>+    },
>+    "glVertexAttribIPointer": {
>+        "type": "VertexAttribType"
>+    },
>+    "glVertexAttribPointer": {
>+        "type": "VertexAttribType"
>+    },
>+    "glVertexPointer": {
>+        "type": "VertexAttribType"
>+    }
>+}
>diff --git a/Source/ThirdParty/ANGLE/scripts/file_exists.py b/Source/ThirdParty/ANGLE/scripts/file_exists.py
>new file mode 100644
>index 00000000000..435cdf89f85
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/scripts/file_exists.py
>@@ -0,0 +1,24 @@
>+#!/usr/bin/python2
>+# Copyright 2019 The ANGLE Project Authors. All rights reserved.
>+# Use of this source code is governed by a BSD-style license that can be
>+# found in the LICENSE file.
>+#
>+# Simple helper for use in 'gn' files to check if a file exists.
>+
>+from __future__ import print_function
>+
>+import os, shutil, sys
>+
>+def main():
>+  if len(sys.argv) != 2:
>+    print("Usage: %s <path>" % sys.argv[0])
>+    sys.exit(1)
>+
>+  if os.path.exists(sys.argv[1]):
>+    print("true")
>+  else:
>+    print("false")
>+  sys.exit(0)
>+
>+if __name__ == '__main__':
>+  main()
>diff --git a/Source/ThirdParty/ANGLE/scripts/gen_angle_gn_info_json.py b/Source/ThirdParty/ANGLE/scripts/gen_angle_gn_info_json.py
>new file mode 100644
>index 00000000000..f79b373ca19
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/scripts/gen_angle_gn_info_json.py
>@@ -0,0 +1,116 @@
>+#!/usr/bin/env python
>+
>+#  Copyright 2018 The ANGLE Project Authors. All rights reserved.
>+#  Use of this source code is governed by a BSD-style license that can be
>+#  found in the LICENSE file.
>+
>+# This tool will create a json description of the GN build environment that
>+# can then be used by gen_angle_android_bp.py to build an Android.bp file for
>+# the Android Soong build system.
>+# The input to this tool is a list of GN labels for which to capture the build
>+# information in json:
>+#
>+# Generating angle.json needs to be done from within a Chromium build:
>+#   cd <chromium>/src
>+#   gen_angle_gn_info_json.py //third_party/angle:libGLESv2 //third_party/angle:libEGL
>+#
>+# This will output an angle.json that can be copied to the angle directory
>+# within Android.
>+#
>+# Optional arguments:
>+#  --gn_out <file>  GN output config to use (e.g., out/Default or out/Debug.)
>+#  --output <file>  json file to create, default is angle.json
>+#
>+
>+import argparse
>+import json
>+import logging
>+import subprocess
>+import sys
>+
>+
>+def get_json_description(gn_out, target_name):
>+    try:
>+        text_desc = subprocess.check_output(
>+            ['gn', 'desc', '--format=json', gn_out, target_name])
>+    except subprocess.CalledProcessError as e:
>+        logging.error("e.retcode = %s" % e.returncode)
>+        logging.error("e.cmd = %s" % e.cmd)
>+        logging.error("e.output = %s" % e.output)
>+    try:
>+        json_out = json.loads(text_desc)
>+    except ValueError:
>+        raise ValueError("Unable to decode JSON\ncmd: %s\noutput:\n%s" %
>+                         (subprocess.list2cmdline(['gn', 'desc', '--format=json',
>+                                                   gn_out, target_name]), text_desc))
>+
>+    return json_out
>+
>+def load_json_deps(desc, gn_out, target_name, all_desc, indent="  "):
>+    """Extracts dependencies from the given target json description
>+       and recursively extracts json descriptions.
>+
>+       desc: json description for target_name that includes dependencies
>+       gn_out: GN output file with configuration info
>+       target_name: name of target in desc to lookup deps
>+       all_desc: dependent descriptions added here
>+       indent: Print with indent to show recursion depth
>+    """
>+    target = desc[target_name]
>+    text_descriptions = []
>+    for dep in target.get('deps', []):
>+        if dep not in all_desc:
>+            logging.debug("dep: %s%s" % (indent,dep))
>+            new_desc = get_json_description(gn_out, dep)
>+            all_desc[dep] = new_desc[dep]
>+            load_json_deps(new_desc, gn_out, dep, all_desc, indent+"  ")
>+        else:
>+            logging.debug("dup: %s%s" % (indent,dep))
>+
>+def create_build_description(gn_out, targets):
>+    """Creates the JSON build description by running GN."""
>+
>+    logging.debug("targets = %s" % targets)
>+    json_descriptions = {}
>+    for target in targets:
>+        logging.debug("target: %s" % (target))
>+        target_desc = get_json_description(gn_out, target)
>+        if (target in target_desc and target not in json_descriptions):
>+            json_descriptions[target] = target_desc[target]
>+            load_json_deps(target_desc, gn_out, target, json_descriptions)
>+        else:
>+            logging.debug("Invalid target: %s" % target)
>+    return json_descriptions
>+
>+
>+def main():
>+    logging.basicConfig(stream=sys.stderr, level=logging.DEBUG)
>+    parser = argparse.ArgumentParser(
>+        description='Generate json build information from a GN description.')
>+    parser.add_argument(
>+        '--gn_out',
>+        help=
>+        'GN output config to use (e.g., out/Default or out/Debug.)',
>+        default='out/Default',
>+    )
>+    parser.add_argument(
>+        '--output',
>+        help='json file to create',
>+        default='angle.json',
>+    )
>+    parser.add_argument(
>+        'targets',
>+        nargs=argparse.REMAINDER,
>+        help='Targets to include in the json (e.g., "//libEGL")')
>+    args = parser.parse_args()
>+
>+    desc = create_build_description(args.gn_out, args.targets)
>+    fh = open(args.output,"w")
>+    fh.write(json.dumps(desc, indent=4, sort_keys=True))
>+    fh.close()
>+
>+    print("Output written to: %s" % args.output)
>+
>+
>+if __name__ == '__main__':
>+    sys.exit(main())
>diff --git a/Source/ThirdParty/ANGLE/scripts/generate_entry_points.py b/Source/ThirdParty/ANGLE/scripts/generate_entry_points.py
>new file mode 100644
>index 00000000000..032a8277ab7
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/scripts/generate_entry_points.py
>@@ -0,0 +1,930 @@
>+#!/usr/bin/python2
>+#
>+# Copyright 2017 The ANGLE Project Authors. All rights reserved.
>+# Use of this source code is governed by a BSD-style license that can be
>+# found in the LICENSE file.
>+#
>+# generate_entry_points.py:
>+#   Generates the OpenGL bindings and entry point layers for ANGLE.
>+#   NOTE: don't run this script directly. Run scripts/run_code_generation.py.
>+
>+import sys, os, pprint, json
>+from datetime import date
>+import registry_xml
>+
>+# List of GLES1 extensions for which we don't need to add Context.h decls.
>+gles1_no_context_decl_extensions = [
>+    "GL_OES_framebuffer_object",
>+]
>+
>+# List of GLES1 API calls that have had their semantics changed in later GLES versions, but the
>+# name was kept the same
>+gles1_overloaded = [
>+    "glGetPointerv",
>+]
>+
>+# This is a list of exceptions for entry points which don't want to have
>+# the EVENT macro. This is required for some debug marker entry points.
>+no_event_marker_exceptions_list = sorted([
>+    "glPushGroupMarkerEXT",
>+    "glPopGroupMarkerEXT",
>+    "glInsertEventMarkerEXT",
>+])
>+
>+# Strip these suffixes from Context entry point names. NV is excluded (for now).
>+strip_suffixes = ["ANGLE", "EXT", "KHR", "OES", "CHROMIUM", "OVR"]
>+
>+template_entry_point_header = """// GENERATED FILE - DO NOT EDIT.
>+// Generated by {script_name} using data from {data_source_name}.
>+//
>+// Copyright {year} The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// entry_points_gles_{annotation_lower}_autogen.h:
>+//   Defines the GLES {comment} entry points.
>+
>+#ifndef LIBGLESV2_ENTRY_POINTS_GLES_{annotation_upper}_AUTOGEN_H_
>+#define LIBGLESV2_ENTRY_POINTS_GLES_{annotation_upper}_AUTOGEN_H_
>+
>+{includes}
>+
>+namespace gl
>+{{
>+{entry_points}
>+}}  // namespace gl
>+
>+#endif  // LIBGLESV2_ENTRY_POINTS_GLES_{annotation_upper}_AUTOGEN_H_
>+"""
>+
>+template_entry_point_source = """// GENERATED FILE - DO NOT EDIT.
>+// Generated by {script_name} using data from {data_source_name}.
>+//
>+// Copyright {year} The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// entry_points_gles_{annotation_lower}_autogen.cpp:
>+//   Defines the GLES {comment} entry points.
>+
>+{includes}
>+
>+namespace gl
>+{{
>+{entry_points}}}  // namespace gl
>+"""
>+
>+template_entry_points_enum_header = """// GENERATED FILE - DO NOT EDIT.
>+// Generated by {script_name} using data from {data_source_name}.
>+//
>+// Copyright {year} The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// entry_points_enum_autogen.h:
>+//   Defines the GLES entry points enumeration.
>+
>+#ifndef LIBGLESV2_ENTRYPOINTSENUM_AUTOGEN_H_
>+#define LIBGLESV2_ENTRYPOINTSENUM_AUTOGEN_H_
>+
>+namespace gl
>+{{
>+enum class EntryPoint
>+{{
>+{entry_points_list}
>+}};
>+}}  // namespace gl
>+#endif  // LIBGLESV2_ENTRY_POINTS_ENUM_AUTOGEN_H_
>+"""
>+
>+template_libgles_entry_point_source = """// GENERATED FILE - DO NOT EDIT.
>+// Generated by {script_name} using data from {data_source_name}.
>+//
>+// Copyright {year} The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// libGLESv2.cpp: Implements the exported OpenGL ES functions.
>+
>+{includes}
>+extern "C" {{
>+{entry_points}
>+}} // extern "C"
>+"""
>+
>+template_entry_point_decl = """ANGLE_EXPORT {return_type}GL_APIENTRY {name}{explicit_context_suffix}({explicit_context_param}{explicit_context_comma}{params});"""
>+
>+template_entry_point_def = """{return_type}GL_APIENTRY {name}{explicit_context_suffix}({explicit_context_param}{explicit_context_comma}{params})
>+{{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    {event_comment}EVENT("({format_params})"{comma_if_needed}{pass_params});
>+
>+    Context *context = {context_getter};
>+    if (context)
>+    {{{assert_explicit_context}{packed_gl_enum_conversions}
>+        if (context->skipValidation() || Validate{name}({validate_params}))
>+        {{
>+            {return_if_needed}context->{name_lower_no_suffix}({internal_params});
>+        }}
>+    }}
>+{default_return_if_needed}}}
>+"""
>+
>+context_gles_header = """// GENERATED FILE - DO NOT EDIT.
>+// Generated by {script_name} using data from {data_source_name}.
>+//
>+// Copyright {year} The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// Context_gles_{annotation_lower}_autogen.h: Creates a macro for interfaces in Context.
>+
>+#ifndef ANGLE_CONTEXT_GLES_{annotation_upper}_AUTOGEN_H_
>+#define ANGLE_CONTEXT_GLES_{annotation_upper}_AUTOGEN_H_
>+
>+#define ANGLE_GLES1_CONTEXT_API \\
>+{interface}
>+
>+#endif // ANGLE_CONTEXT_API_{annotation_upper}_AUTOGEN_H_
>+"""
>+
>+context_gles_decl = """    {return_type} {name_lower_no_suffix}({internal_params}); \\"""
>+
>+libgles_entry_point_def = """{return_type}GL_APIENTRY gl{name}{explicit_context_suffix}({explicit_context_param}{explicit_context_comma}{params})
>+{{
>+    return gl::{name}{explicit_context_suffix}({explicit_context_internal_param}{explicit_context_comma}{internal_params});
>+}}
>+"""
>+
>+template_glext_explicit_context_inc = """// GENERATED FILE - DO NOT EDIT.
>+// Generated by {script_name} using data from {data_source_name}.
>+//
>+// Copyright {year} The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// gl{version}ext_explicit_context_autogen.inc:
>+//   Function declarations for the EGL_ANGLE_explicit_context extension
>+
>+{function_pointers}
>+#ifdef GL_GLEXT_PROTOTYPES
>+{function_prototypes}
>+#endif
>+"""
>+
>+template_glext_function_pointer = """typedef {return_type}(GL_APIENTRYP PFN{name_upper}{explicit_context_suffix_upper}PROC)({explicit_context_param}{explicit_context_comma}{params});"""
>+template_glext_function_prototype = """{apicall} {return_type}GL_APIENTRY {name}{explicit_context_suffix}({explicit_context_param}{explicit_context_comma}{params});"""
>+
>+template_validation_header = """// GENERATED FILE - DO NOT EDIT.
>+// Generated by {script_name} using data from {data_source_name}.
>+//
>+// Copyright {year} The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// validationES{annotation}_autogen.h:
>+//   Validation functions for the OpenGL ES {comment} entry points.
>+
>+#ifndef LIBANGLE_VALIDATION_ES{annotation}_AUTOGEN_H_
>+#define LIBANGLE_VALIDATION_ES{annotation}_AUTOGEN_H_
>+
>+#include "common/PackedEnums.h"
>+
>+namespace gl
>+{{
>+class Context;
>+
>+{prototypes}
>+}}  // namespace gl
>+
>+#endif  // LIBANGLE_VALIDATION_ES{annotation}_AUTOGEN_H_
>+"""
>+
>+static_cast_to_dict = {
>+    "GLintptr": "unsigned long long",
>+    "GLsizeiptr": "unsigned long long",
>+    "GLuint64": "unsigned long long",
>+}
>+
>+reinterpret_cast_to_dict = {
>+    "GLsync": "uintptr_t",
>+    "GLDEBUGPROC": "uintptr_t",
>+    "GLDEBUGPROCKHR": "uintptr_t",
>+    "GLeglImageOES": "uintptr_t",
>+}
>+
>+format_dict = {
>+    "GLbitfield": "0x%X",
>+    "GLboolean": "%u",
>+    "GLclampx": "0x%X",
>+    "GLenum": "0x%X",
>+    "GLfixed": "0x%X",
>+    "GLfloat": "%f",
>+    "GLint": "%d",
>+    "GLintptr": "%llu",
>+    "GLshort": "%d",
>+    "GLsizei": "%d",
>+    "GLsizeiptr": "%llu",
>+    "GLsync": "0x%016\" PRIxPTR \"",
>+    "GLubyte": "%d",
>+    "GLuint": "%u",
>+    "GLuint64": "%llu",
>+    "GLDEBUGPROC": "0x%016\" PRIxPTR \"",
>+    "GLDEBUGPROCKHR": "0x%016\" PRIxPTR \"",
>+    "GLeglImageOES": "0x%016\" PRIxPTR \"",
>+}
>+
>+template_header_includes = """#include <GLES{major}/gl{major}{minor}.h>
>+#include <export.h>"""
>+
>+template_sources_includes = """#include "libGLESv2/entry_points_gles_{}_autogen.h"
>+
>+#include "libANGLE/Context.h"
>+#include "libANGLE/Context.inl.h"
>+#include "libANGLE/validationES{}{}.h"
>+#include "libGLESv2/entry_points_utils.h"
>+#include "libGLESv2/global_state.h"
>+"""
>+
>+template_event_comment = """// Don't run an EVENT() macro on the EXT_debug_marker entry points.
>+    // It can interfere with the debug events being set by the caller.
>+    // """
>+
>+template_validation_proto = "bool Validate%s(%s);"
>+
>+template_windows_def_file = """; GENERATED FILE - DO NOT EDIT.
>+; Generated by {script_name} using data from {data_source_name}.
>+;
>+; Copyright {year} The ANGLE Project Authors. All rights reserved.
>+; Use of this source code is governed by a BSD-style license that can be
>+; found in the LICENSE file.
>+LIBRARY {lib}
>+EXPORTS
>+{exports}
>+"""
>+
>+def script_relative(path):
>+    return os.path.join(os.path.dirname(sys.argv[0]), path)
>+
>+with open(script_relative('entry_point_packed_gl_enums.json')) as f:
>+    cmd_packed_gl_enums = json.loads(f.read())
>+
>+def format_entry_point_decl(cmd_name, proto, params, is_explicit_context):
>+    comma_if_needed = ", " if len(params) > 0 else ""
>+    return template_entry_point_decl.format(
>+        name = cmd_name[2:],
>+        return_type = proto[:-len(cmd_name)],
>+        params = ", ".join(params),
>+        comma_if_needed = comma_if_needed,
>+        explicit_context_suffix = "ContextANGLE" if is_explicit_context else "",
>+        explicit_context_param = "GLeglContext ctx" if is_explicit_context else "",
>+        explicit_context_comma = ", " if is_explicit_context and len(params) > 0 else "")
>+
>+def type_name_sep_index(param):
>+    space = param.rfind(" ")
>+    pointer = param.rfind("*")
>+    return max(space, pointer)
>+
>+def just_the_type(param):
>+    if "*" in param:
>+        return param[:type_name_sep_index(param) + 1]
>+    return param[:type_name_sep_index(param)]
>+
>+def just_the_name(param):
>+    return param[type_name_sep_index(param)+1:]
>+
>+def make_param(param_type, param_name):
>+    return param_type + " " + param_name
>+
>+def just_the_type_packed(param, entry):
>+    name = just_the_name(param)
>+    if entry.has_key(name):
>+        return entry[name]
>+    else:
>+        return just_the_type(param)
>+
>+def just_the_name_packed(param, reserved_set):
>+    name = just_the_name(param)
>+    if name in reserved_set:
>+        return name + 'Packed'
>+    else:
>+        return name
>+
>+def param_print_argument(param):
>+    name_only = just_the_name(param)
>+    type_only = just_the_type(param)
>+
>+    if "*" in param:
>+        return "(uintptr_t)" + name_only
>+
>+    if type_only in reinterpret_cast_to_dict:
>+        return "(" + reinterpret_cast_to_dict[type_only] + ")" + name_only
>+
>+    if type_only in static_cast_to_dict:
>+        return "static_cast<" + static_cast_to_dict[type_only] + ">(" + name_only + ")"
>+
>+    return name_only
>+
>+def param_format_string(param):
>+    if "*" in param:
>+        return param + " = 0x%016\" PRIxPTR \""
>+    else:
>+        type_only = just_the_type(param)
>+        if type_only not in format_dict:
>+            raise Exception(type_only + " is not a known type in 'format_dict'")
>+
>+        return param + " = " + format_dict[type_only]
>+
>+def default_return_value(cmd_name, return_type):
>+    if return_type == "void":
>+        return ""
>+    return "GetDefaultReturnValue<EntryPoint::" + cmd_name[2:] + ", " + return_type + ">()"
>+
>+def get_context_getter_function(cmd_name, is_explicit_context):
>+    if is_explicit_context:
>+        return "static_cast<gl::Context *>(ctx)"
>+
>+    lost_context_acceptable_cmds = [
>+        "glGetError",
>+        "glGetSync",
>+        "glGetQueryObjecti",
>+        "glGetProgramiv",
>+        "glGetGraphicsResetStatus",
>+        "glGetShaderiv",
>+    ]
>+    for context_lost_entry_pont in lost_context_acceptable_cmds:
>+        if cmd_name.startswith(context_lost_entry_pont):
>+            return "GetGlobalContext()"
>+    return "GetValidGlobalContext()"
>+
>+def format_entry_point_def(cmd_name, proto, params, is_explicit_context):
>+    packed_gl_enums = cmd_packed_gl_enums.get(cmd_name, {})
>+    internal_params = [just_the_name_packed(param, packed_gl_enums) for param in params]
>+    packed_gl_enum_conversions = []
>+    for param in params:
>+        name = just_the_name(param)
>+        if name in packed_gl_enums:
>+            internal_name = name + "Packed"
>+            internal_type = packed_gl_enums[name]
>+            packed_gl_enum_conversions += ["\n        " + internal_type + " " + internal_name +" = FromGLenum<" +
>+                                          internal_type + ">(" + name + ");"]
>+
>+    pass_params = [param_print_argument(param) for param in params]
>+    format_params = [param_format_string(param) for param in params]
>+    return_type = proto[:-len(cmd_name)]
>+    default_return = default_return_value(cmd_name, return_type.strip())
>+    event_comment = template_event_comment if cmd_name in no_event_marker_exceptions_list else ""
>+    name_lower_no_suffix = cmd_name[2:3].lower() + cmd_name[3:]
>+
>+    for suffix in strip_suffixes:
>+        if name_lower_no_suffix.endswith(suffix):
>+            name_lower_no_suffix = name_lower_no_suffix[0:-len(suffix)]
>+
>+    return template_entry_point_def.format(
>+        name = cmd_name[2:],
>+        name_lower_no_suffix = name_lower_no_suffix,
>+        return_type = return_type,
>+        params = ", ".join(params),
>+        internal_params = ", ".join(internal_params),
>+        packed_gl_enum_conversions = "".join(packed_gl_enum_conversions),
>+        pass_params = ", ".join(pass_params),
>+        comma_if_needed = ", " if len(params) > 0 else "",
>+        validate_params = ", ".join(["context"] + internal_params),
>+        format_params = ", ".join(format_params),
>+        return_if_needed = "" if default_return == "" else "return ",
>+        default_return_if_needed = "" if default_return == "" else "\n    return " + default_return + ";\n",
>+        context_getter = get_context_getter_function(cmd_name, is_explicit_context),
>+        event_comment = event_comment,
>+        explicit_context_suffix = "ContextANGLE" if is_explicit_context else "",
>+        explicit_context_param = "GLeglContext ctx" if is_explicit_context else "",
>+        explicit_context_comma = ", " if is_explicit_context and len(params) > 0 else "",
>+        assert_explicit_context = "\nASSERT(context == GetValidGlobalContext());"
>+            if is_explicit_context else "")
>+
>+def get_internal_params(cmd_name, params):
>+    packed_gl_enums = cmd_packed_gl_enums.get(cmd_name, {})
>+    return ", ".join([make_param(just_the_type_packed(param, packed_gl_enums),
>+                                 just_the_name_packed(param, packed_gl_enums)) for param in params])
>+
>+def format_context_gles_decl(cmd_name, proto, params):
>+    internal_params = get_internal_params(cmd_name, params)
>+
>+    return_type = proto[:-len(cmd_name)]
>+    name_lower_no_suffix = cmd_name[2:3].lower() + cmd_name[3:]
>+
>+    for suffix in strip_suffixes:
>+        if name_lower_no_suffix.endswith(suffix):
>+            name_lower_no_suffix = name_lower_no_suffix[0:-len(suffix)]
>+
>+    return context_gles_decl.format(
>+        return_type = return_type,
>+        name_lower_no_suffix = name_lower_no_suffix,
>+        internal_params = internal_params)
>+
>+def format_libgles_entry_point_def(cmd_name, proto, params, is_explicit_context):
>+    internal_params = [just_the_name(param) for param in params]
>+    return_type = proto[:-len(cmd_name)]
>+
>+    return libgles_entry_point_def.format(
>+        name = cmd_name[2:],
>+        return_type = return_type,
>+        params = ", ".join(params),
>+        internal_params = ", ".join(internal_params),
>+        explicit_context_suffix = "ContextANGLE" if is_explicit_context else "",
>+        explicit_context_param = "GLeglContext ctx" if is_explicit_context else "",
>+        explicit_context_comma = ", " if is_explicit_context and len(params) > 0 else "",
>+        explicit_context_internal_param = "ctx" if is_explicit_context else "")
>+
>+def format_validation_proto(cmd_name, params):
>+    internal_params = get_internal_params(cmd_name, ["Context *context"] + params)
>+    return template_validation_proto % (cmd_name[2:], internal_params)
>+
>+def path_to(folder, file):
>+    return os.path.join(script_relative(".."), "src", folder, file)
>+
>+def get_entry_points(all_commands, gles_commands, is_explicit_context):
>+    decls = []
>+    defs = []
>+    export_defs = []
>+    validation_protos = []
>+
>+    for command in all_commands:
>+        proto = command.find('proto')
>+        cmd_name = proto.find('name').text
>+
>+        if cmd_name not in gles_commands:
>+            continue
>+
>+        param_text = ["".join(param.itertext()) for param in command.findall('param')]
>+        proto_text = "".join(proto.itertext())
>+        decls.append(format_entry_point_decl(cmd_name, proto_text, param_text,
>+            is_explicit_context))
>+        defs.append(format_entry_point_def(cmd_name, proto_text, param_text, is_explicit_context))
>+
>+        export_defs.append(format_libgles_entry_point_def(cmd_name, proto_text, param_text,
>+            is_explicit_context))
>+
>+        validation_protos.append(format_validation_proto(cmd_name, param_text))
>+
>+    return decls, defs, export_defs, validation_protos
>+
>+def get_gles1_decls(all_commands, gles_commands):
>+    decls = []
>+    for command in all_commands:
>+        proto = command.find('proto')
>+        cmd_name = proto.find('name').text
>+
>+        if cmd_name not in gles_commands:
>+            continue
>+
>+        if cmd_name in gles1_overloaded:
>+            continue
>+
>+        param_text = ["".join(param.itertext()) for param in command.findall('param')]
>+        proto_text = "".join(proto.itertext())
>+        decls.append(format_context_gles_decl(cmd_name, proto_text, param_text))
>+
>+    return decls
>+
>+def get_glext_decls(all_commands, gles_commands, version, is_explicit_context):
>+    glext_ptrs = []
>+    glext_protos = []
>+    is_gles1 = False
>+
>+    if(version == ""):
>+        is_gles1 = True
>+
>+    for command in all_commands:
>+        proto = command.find('proto')
>+        cmd_name = proto.find('name').text
>+
>+        if cmd_name not in gles_commands:
>+            continue
>+
>+        param_text = ["".join(param.itertext()) for param in command.findall('param')]
>+        proto_text = "".join(proto.itertext())
>+
>+        return_type = proto_text[:-len(cmd_name)]
>+        params = ", ".join(param_text)
>+
>+        format_params = {
>+            "apicall": "GL_API" if is_gles1 else "GL_APICALL",
>+            "name": cmd_name,
>+            "name_upper": cmd_name.upper(),
>+            "return_type": return_type,
>+            "params": params,
>+            "explicit_context_comma": ", " if is_explicit_context and len(params) > 0 else "",
>+            "explicit_context_suffix": "ContextANGLE" if is_explicit_context else "",
>+            "explicit_context_suffix_upper": "CONTEXTANGLE" if is_explicit_context else "",
>+            "explicit_context_param": "GLeglContext ctx" if is_explicit_context else ""}
>+
>+        glext_ptrs.append(template_glext_function_pointer.format(
>+            **format_params))
>+        glext_protos.append(template_glext_function_prototype.format(
>+            **format_params))
>+
>+    return glext_ptrs, glext_protos
>+
>+def write_file(annotation, comment, template, entry_points, suffix, includes, file):
>+    content = template.format(
>+        script_name = os.path.basename(sys.argv[0]),
>+        data_source_name = file,
>+        year = date.today().year,
>+        annotation_lower = annotation.lower(),
>+        annotation_upper = annotation.upper(),
>+        comment = comment,
>+        includes = includes,
>+        entry_points = entry_points)
>+
>+    path = path_to("libGLESv2", "entry_points_gles_{}_autogen.{}".format(
>+        annotation.lower(), suffix))
>+
>+    with open(path, "w") as out:
>+        out.write(content)
>+        out.close()
>+
>+def write_export_files(entry_points, includes):
>+    content = template_libgles_entry_point_source.format(
>+        script_name = os.path.basename(sys.argv[0]),
>+        data_source_name = "gl.xml and gl_angle_ext.xml",
>+        year = date.today().year,
>+        includes = includes,
>+        entry_points = entry_points)
>+
>+    path = path_to("libGLESv2", "libGLESv2_autogen.cpp")
>+
>+    with open(path, "w") as out:
>+        out.write(content)
>+        out.close()
>+
>+def write_context_api_decls(annotation, template, decls):
>+    interface_lines = []
>+
>+    for i in decls['core']:
>+        interface_lines.append(i)
>+
>+    for extname in sorted(decls['exts'].keys()):
>+        interface_lines.append("    /* " + extname + " */ \\")
>+        interface_lines.extend(decls['exts'][extname])
>+
>+    content = template.format(
>+        annotation_lower = annotation.lower(),
>+        annotation_upper = annotation.upper(),
>+        script_name = os.path.basename(sys.argv[0]),
>+        data_source_name = "gl.xml",
>+        year = date.today().year,
>+        interface = "\n".join(interface_lines))
>+
>+    path = path_to("libANGLE", "Context_gles_%s_autogen.h" % annotation.lower())
>+
>+    with open(path, "w") as out:
>+        out.write(content)
>+        out.close()
>+
>+def write_glext_explicit_context_inc(version, ptrs, protos):
>+    folder_version = version if version != "31" else "3"
>+
>+    content = template_glext_explicit_context_inc.format(
>+        script_name = os.path.basename(sys.argv[0]),
>+        data_source_name = "gl.xml and gl_angle_ext.xml",
>+        year = date.today().year,
>+        version = version,
>+        function_pointers = ptrs,
>+        function_prototypes = protos)
>+
>+    path = os.path.join(script_relative(".."), "include", "GLES{}".format(folder_version),
>+        "gl{}ext_explicit_context_autogen.inc".format(version))
>+
>+    with open(path, "w") as out:
>+        out.write(content)
>+        out.close()
>+
>+def write_validation_header(annotation, comment, protos):
>+    content = template_validation_header.format(
>+        script_name = os.path.basename(sys.argv[0]),
>+        data_source_name = "gl.xml and gl_angle_ext.xml",
>+        year = date.today().year,
>+        annotation = annotation,
>+        comment = comment,
>+        prototypes = "\n".join(protos))
>+
>+    path = path_to("libANGLE", "validationES%s_autogen.h" % annotation)
>+
>+    with open(path, "w") as out:
>+        out.write(content)
>+        out.close()
>+
>+def write_windows_def_file(data_source_name, lib, exports):
>+
>+    content = template_windows_def_file.format(
>+        script_name = os.path.basename(sys.argv[0]),
>+        data_source_name = data_source_name,
>+        exports = "\n".join(exports),
>+        year = date.today().year,
>+        lib = lib)
>+
>+    path = path_to(lib, "%s_autogen.def" % lib)
>+
>+    with open(path, "w") as out:
>+        out.write(content)
>+        out.close()
>+
>+def get_exports(commands, fmt = None):
>+    if fmt:
>+        return ["    %s" % fmt(cmd) for cmd in sorted(commands)]
>+    else:
>+        return ["    %s" % cmd for cmd in sorted(commands)]
>+
>+# Get EGL exports
>+def get_egl_exports():
>+
>+    egl = registry_xml.RegistryXML('egl.xml', 'egl_angle_ext.xml')
>+    exports = []
>+
>+    capser = lambda fn: "EGL_" + fn[3:]
>+
>+    for major, minor in [[1, 0], [1, 1], [1, 2], [1, 3], [1, 4], [1, 5]]:
>+        annotation = "{}_{}".format(major, minor)
>+        name_prefix = "EGL_VERSION_"
>+
>+        feature_name = "{}{}".format(name_prefix, annotation)
>+
>+        egl.AddCommands(feature_name, annotation)
>+
>+        commands = egl.commands[annotation]
>+
>+        if len(commands) == 0:
>+            continue
>+
>+        exports.append("\n    ; EGL %d.%d" % (major, minor))
>+        exports += get_exports(commands, capser)
>+
>+    egl.AddExtensionCommands(registry_xml.supported_egl_extensions, ['egl'])
>+
>+    for extension_name, ext_cmd_names in sorted(egl.ext_data.iteritems()):
>+
>+        if len(ext_cmd_names) == 0:
>+            continue
>+
>+        exports.append("\n    ; %s" % extension_name)
>+        exports += get_exports(ext_cmd_names, capser)
>+
>+    return exports
>+
>+def main():
>+
>+    # auto_script parameters.
>+    if len(sys.argv) > 1:
>+        inputs = [
>+            'egl.xml',
>+            'egl_angle_ext.xml',
>+            'entry_point_packed_gl_enums.json',
>+            'gl.xml',
>+            'gl_angle_ext.xml',
>+            'registry_xml.py',
>+        ]
>+        outputs = [
>+            '../src/libANGLE/Context_gles_1_0_autogen.h',
>+            '../src/libANGLE/validationES1_autogen.h',
>+            '../src/libANGLE/validationES2_autogen.h',
>+            '../src/libANGLE/validationES31_autogen.h',
>+            '../src/libANGLE/validationES3_autogen.h',
>+            '../src/libANGLE/validationESEXT_autogen.h',
>+            '../src/libGLESv2/entry_points_enum_autogen.h',
>+            '../src/libGLESv2/entry_points_gles_1_0_autogen.cpp',
>+            '../src/libGLESv2/entry_points_gles_1_0_autogen.h',
>+            '../src/libGLESv2/entry_points_gles_2_0_autogen.cpp',
>+            '../src/libGLESv2/entry_points_gles_2_0_autogen.h',
>+            '../src/libGLESv2/entry_points_gles_3_0_autogen.cpp',
>+            '../src/libGLESv2/entry_points_gles_3_0_autogen.h',
>+            '../src/libGLESv2/entry_points_gles_3_1_autogen.cpp',
>+            '../src/libGLESv2/entry_points_gles_3_1_autogen.h',
>+            '../src/libGLESv2/entry_points_gles_ext_autogen.cpp',
>+            '../src/libGLESv2/entry_points_gles_ext_autogen.h',
>+            '../src/libGLESv2/libGLESv2_autogen.cpp',
>+            '../src/libGLESv2/libGLESv2_autogen.def',
>+        ]
>+
>+        if sys.argv[1] == 'inputs':
>+            print ','.join(inputs)
>+        elif sys.argv[1] == 'outputs':
>+            print ','.join(outputs)
>+        else:
>+            print('Invalid script parameters')
>+            return 1
>+        return 0
>+
>+    gles1decls = {}
>+
>+    gles1decls['core'] = []
>+    gles1decls['exts'] = {}
>+
>+    libgles_ep_defs = []
>+    libgles_ep_exports = []
>+
>+    xml = registry_xml.RegistryXML('gl.xml', 'gl_angle_ext.xml')
>+
>+    # First run through the main GLES entry points.  Since ES2+ is the primary use
>+    # case, we go through those first and then add ES1-only APIs at the end.
>+    for major_version, minor_version in [[2, 0], [3, 0], [3, 1], [1, 0]]:
>+        annotation = "{}_{}".format(major_version, minor_version)
>+        name_prefix = "GL_ES_VERSION_"
>+
>+        is_gles1 = major_version == 1
>+        if is_gles1:
>+            name_prefix = "GL_VERSION_ES_CM_"
>+
>+        comment = annotation.replace("_", ".")
>+        feature_name = "{}{}".format(name_prefix, annotation)
>+
>+        xml.AddCommands(feature_name, annotation)
>+
>+        gles_commands = xml.commands[annotation]
>+        all_commands = xml.all_commands
>+
>+        decls, defs, libgles_defs, validation_protos = get_entry_points(
>+            all_commands, gles_commands, False)
>+
>+        # Write the version as a comment before the first EP.
>+        libgles_defs.insert(0, "\n// OpenGL ES %s" % comment)
>+        libgles_ep_exports.append("\n    ; OpenGL ES %s" % comment)
>+
>+        libgles_ep_defs += libgles_defs
>+        libgles_ep_exports += get_exports(gles_commands)
>+
>+        major_if_not_one = major_version if major_version != 1 else ""
>+        minor_if_not_zero = minor_version if minor_version != 0 else ""
>+
>+        header_includes = template_header_includes.format(
>+            major=major_if_not_one, minor=minor_if_not_zero)
>+
>+        # We include the platform.h header since it undefines the conflicting MemoryBarrier macro.
>+        if major_version == 3 and minor_version == 1:
>+            header_includes += "\n#include \"common/platform.h\"\n"
>+
>+        source_includes = template_sources_includes.format(
>+            annotation.lower(), major_version, minor_if_not_zero)
>+
>+        write_file(annotation, comment, template_entry_point_header,
>+                   "\n".join(decls), "h", header_includes, "gl.xml")
>+        write_file(annotation, comment, template_entry_point_source,
>+                   "\n".join(defs), "cpp", source_includes, "gl.xml")
>+        if is_gles1:
>+            gles1decls['core'] = get_gles1_decls(all_commands, gles_commands)
>+
>+        validation_annotation = "%s%s" % (major_version, minor_if_not_zero)
>+        write_validation_header(validation_annotation, comment, validation_protos)
>+
>+
>+    # After we finish with the main entry points, we process the extensions.
>+    extension_defs = []
>+    extension_decls = []
>+
>+    # Accumulated validation prototypes.
>+    ext_validation_protos = []
>+
>+    for gles1ext in registry_xml.gles1_extensions:
>+        gles1decls['exts'][gles1ext] = []
>+
>+    xml.AddExtensionCommands(registry_xml.supported_extensions, ['gles2', 'gles1'])
>+
>+    for extension_name, ext_cmd_names in sorted(xml.ext_data.iteritems()):
>+
>+        # Detect and filter duplicate extensions.
>+        decls, defs, libgles_defs, validation_protos = get_entry_points(
>+            xml.all_commands, ext_cmd_names, False)
>+
>+        # Avoid writing out entry points defined by a prior extension.
>+        for dupe in xml.ext_dupes[extension_name]:
>+            msg = "// {} is already defined.\n".format(dupe[2:])
>+            defs.append(msg)
>+
>+        # Write the extension name as a comment before the first EP.
>+        comment = "\n// {}".format(extension_name)
>+        defs.insert(0, comment)
>+        decls.insert(0, comment)
>+        libgles_defs.insert(0, comment)
>+        libgles_ep_exports.append("\n    ; %s" % extension_name)
>+
>+        extension_defs += defs
>+        extension_decls += decls
>+
>+        ext_validation_protos += [comment] + validation_protos
>+
>+        libgles_ep_defs += libgles_defs
>+        libgles_ep_exports += get_exports(ext_cmd_names)
>+
>+        if extension_name in registry_xml.gles1_extensions:
>+            if extension_name not in gles1_no_context_decl_extensions:
>+                gles1decls['exts'][extension_name] = get_gles1_decls(all_commands, ext_cmd_names)
>+
>+    # Special handling for EGL_ANGLE_explicit_context extension
>+    if registry_xml.support_EGL_ANGLE_explicit_context:
>+        comment = "\n// EGL_ANGLE_explicit_context"
>+        extension_defs.append(comment)
>+        extension_decls.append(comment)
>+        libgles_ep_defs.append(comment)
>+
>+        cmds = xml.all_cmd_names.get_all_commands()
>+
>+        # Get the explicit context entry points
>+        decls, defs, libgles_defs, validation_protos = get_entry_points(
>+            xml.all_commands, cmds, True)
>+
>+        # Append the explicit context entry points
>+        extension_decls += decls
>+        extension_defs += defs
>+        libgles_ep_defs += libgles_defs
>+
>+        libgles_ep_exports.append("\n    ; EGL_ANGLE_explicit_context")
>+        libgles_ep_exports += get_exports(cmds, lambda x: "%sContextANGLE" % x)
>+
>+        # Generate .inc files for extension function pointers and declarations
>+        for major, minor in [[2, 0], [3, 0], [3, 1], [1, 0]]:
>+            annotation = "{}_{}".format(major, minor)
>+
>+            major_if_not_one = major if major != 1 else ""
>+            minor_if_not_zero = minor if minor != 0 else ""
>+            version = "{}{}".format(major_if_not_one, minor_if_not_zero)
>+
>+            glext_ptrs, glext_protos = get_glext_decls(all_commands,
>+                xml.all_cmd_names.get_commands(annotation), version, True)
>+
>+            glext_ext_ptrs = []
>+            glext_ext_protos = []
>+
>+            # Append extensions for 1.0 and 2.0
>+            if(annotation == "1_0"):
>+                glext_ext_ptrs, glext_ext_protos = get_glext_decls(all_commands,
>+                    xml.all_cmd_names.get_commands("glext"), version, True)
>+            elif(annotation == "2_0"):
>+                glext_ext_ptrs, glext_ext_protos = get_glext_decls(all_commands,
>+                    xml.all_cmd_names.get_commands("gl2ext"), version, True)
>+
>+            glext_ptrs += glext_ext_ptrs
>+            glext_protos += glext_ext_protos
>+
>+            write_glext_explicit_context_inc(version, "\n".join(glext_ptrs), "\n".join(glext_protos))
>+
>+
>+    header_includes = template_header_includes.format(
>+        major="", minor="")
>+    header_includes += """
>+    #include <GLES/glext.h>
>+    #include <GLES2/gl2.h>
>+    #include <GLES2/gl2ext.h>
>+    """
>+
>+    source_includes = template_sources_includes.format("ext", "EXT", "")
>+    source_includes += """
>+    #include "libANGLE/validationES1.h"
>+    #include "libANGLE/validationES2.h"
>+    #include "libANGLE/validationES3.h"
>+    #include "libANGLE/validationES31.h"
>+    """
>+
>+    write_file("ext", "extension", template_entry_point_header,
>+               "\n".join([item for item in extension_decls]), "h", header_includes,
>+               "gl.xml and gl_angle_ext.xml")
>+    write_file("ext", "extension", template_entry_point_source,
>+               "\n".join([item for item in extension_defs]), "cpp", source_includes,
>+               "gl.xml and gl_angle_ext.xml")
>+
>+    write_validation_header("EXT", "extension", ext_validation_protos)
>+
>+    write_context_api_decls("1_0", context_gles_header, gles1decls)
>+
>+    sorted_cmd_names = ["Invalid"] + [cmd[2:] for cmd in sorted(xml.all_cmd_names.get_all_commands())]
>+
>+    entry_points_enum = template_entry_points_enum_header.format(
>+        script_name = os.path.basename(sys.argv[0]),
>+        data_source_name = "gl.xml and gl_angle_ext.xml",
>+        year = date.today().year,
>+        entry_points_list = ",\n".join(["    " + cmd for cmd in sorted_cmd_names]))
>+
>+    entry_points_enum_header_path = path_to("libGLESv2", "entry_points_enum_autogen.h")
>+    with open(entry_points_enum_header_path, "w") as out:
>+        out.write(entry_points_enum)
>+        out.close()
>+
>+    source_includes = """
>+    #include "angle_gl.h"
>+
>+    #include "libGLESv2/entry_points_gles_1_0_autogen.h"
>+    #include "libGLESv2/entry_points_gles_2_0_autogen.h"
>+    #include "libGLESv2/entry_points_gles_3_0_autogen.h"
>+    #include "libGLESv2/entry_points_gles_3_1_autogen.h"
>+    #include "libGLESv2/entry_points_gles_ext_autogen.h"
>+
>+    #include "common/event_tracer.h"
>+    """
>+
>+    write_export_files("\n".join([item for item in libgles_ep_defs]), source_includes)
>+
>+    libgles_ep_exports += get_egl_exports()
>+
>+    everything = "Khronos and ANGLE XML files"
>+    write_windows_def_file(everything, "libGLESv2", libgles_ep_exports)
>+
>+if __name__ == '__main__':
>+    sys.exit(main())
>diff --git a/Source/ThirdParty/ANGLE/scripts/generate_loader.py b/Source/ThirdParty/ANGLE/scripts/generate_loader.py
>new file mode 100644
>index 00000000000..a408dac4e63
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/scripts/generate_loader.py
>@@ -0,0 +1,279 @@
>+#!/usr/bin/python2
>+#
>+# Copyright 2018 The ANGLE Project Authors. All rights reserved.
>+# Use of this source code is governed by a BSD-style license that can be
>+# found in the LICENSE file.
>+#
>+# generate_loader.py:
>+#   Generates dynamic loaders for various binding interfaces.
>+#   NOTE: don't run this script directly. Run scripts/run_code_generation.py.
>+
>+import sys, os, pprint, json
>+from datetime import date
>+import registry_xml
>+
>+def write_header(data_source_name, all_cmds, api, preamble, path, lib, ns = "", prefix = None, export = ""):
>+    file_name = "%s_loader_autogen.h" % api
>+    header_path = registry_xml.path_to(path, file_name)
>+    def pre(cmd):
>+        if prefix == None:
>+            return cmd
>+        return prefix + cmd[len(api):]
>+    with open(header_path, "w") as out:
>+        var_protos = ["%sextern PFN%sPROC %s%s;" % (export, cmd.upper(), ns, pre(cmd)) for cmd in all_cmds]
>+        loader_header = template_loader_h.format(
>+            script_name = os.path.basename(sys.argv[0]),
>+            data_source_name = data_source_name,
>+            year = date.today().year,
>+            function_pointers = "\n".join(var_protos),
>+            api_upper = api.upper(),
>+            api_lower = api,
>+            preamble = preamble,
>+            export = export,
>+            lib = lib.upper())
>+
>+        out.write(loader_header)
>+        out.close()
>+
>+def write_source(data_source_name, all_cmds, api, path, ns = "", prefix = None, export = ""):
>+    file_name = "%s_loader_autogen.cpp" % api
>+    source_path = registry_xml.path_to(path, file_name)
>+    def pre(cmd):
>+        if prefix == None:
>+            return cmd
>+        return prefix + cmd[len(api):]
>+
>+    with open(source_path, "w") as out:
>+        var_defs = ["%sPFN%sPROC %s%s;" % (export, cmd.upper(), ns, pre(cmd)) for cmd in all_cmds]
>+
>+        setter = "    %s%s = reinterpret_cast<PFN%sPROC>(loadProc(\"%s\"));"
>+        setters = [setter % (ns, pre(cmd), cmd.upper(), pre(cmd)) for cmd in all_cmds]
>+
>+        loader_source = template_loader_cpp.format(
>+            script_name = os.path.basename(sys.argv[0]),
>+            data_source_name = data_source_name,
>+            year = date.today().year,
>+            function_pointers = "\n".join(var_defs),
>+            set_pointers = "\n".join(setters),
>+            api_upper = api.upper(),
>+            api_lower = api)
>+
>+        out.write(loader_source)
>+        out.close()
>+
>+def gen_libegl_loader():
>+
>+    data_source_name = "egl.xml and egl_angle_ext.xml"
>+    xml = registry_xml.RegistryXML("egl.xml", "egl_angle_ext.xml")
>+
>+    for major_version, minor_version in [[1, 0], [1, 1], [1, 2], [1, 3], [1, 4], [1, 5]]:
>+        annotation = "{}_{}".format(major_version, minor_version)
>+        name_prefix = "EGL_VERSION_"
>+
>+        feature_name = "{}{}".format(name_prefix, annotation)
>+
>+        xml.AddCommands(feature_name, annotation)
>+
>+    xml.AddExtensionCommands(registry_xml.supported_egl_extensions, ['egl'])
>+
>+    all_cmds = xml.all_cmd_names.get_all_commands()
>+
>+    path = os.path.join("..", "src", "libEGL")
>+    write_header(data_source_name, all_cmds, "egl", libegl_preamble, path, "LIBEGL", "", "EGL_")
>+    write_source(data_source_name, all_cmds, "egl", path, "", "EGL_")
>+
>+def gen_gl_loader():
>+
>+    data_source_name = "gl.xml and gl_angle_ext.xml"
>+    xml = registry_xml.RegistryXML("gl.xml", "gl_angle_ext.xml")
>+
>+    # First run through the main GLES entry points.  Since ES2+ is the primary use
>+    # case, we go through those first and then add ES1-only APIs at the end.
>+    for major_version, minor_version in [[2, 0], [3, 0], [3, 1], [1, 0]]:
>+        annotation = "{}_{}".format(major_version, minor_version)
>+        name_prefix = "GL_ES_VERSION_"
>+
>+        is_gles1 = major_version == 1
>+        if is_gles1:
>+            name_prefix = "GL_VERSION_ES_CM_"
>+
>+        feature_name = "{}{}".format(name_prefix, annotation)
>+
>+        xml.AddCommands(feature_name, annotation)
>+
>+    xml.AddExtensionCommands(registry_xml.supported_extensions, ['gles2', 'gles1'])
>+
>+    all_cmds = xml.all_cmd_names.get_all_commands()
>+
>+    if registry_xml.support_EGL_ANGLE_explicit_context:
>+        all_cmds += [cmd + "ContextANGLE" for cmd in xml.all_cmd_names.get_all_commands()]
>+
>+    path = os.path.join("..", "util")
>+    ex = "ANGLE_UTIL_EXPORT "
>+    write_header(data_source_name, all_cmds, "gles", util_gles_preamble, path, "UTIL", export=ex)
>+    write_source(data_source_name, all_cmds, "gles", path, export=ex)
>+
>+def gen_egl_loader():
>+
>+    data_source_name = "egl.xml and egl_angle_ext.xml"
>+    xml = registry_xml.RegistryXML("egl.xml", "egl_angle_ext.xml")
>+
>+    for major_version, minor_version in [[1, 0], [1, 1], [1, 2], [1, 3], [1, 4], [1, 5]]:
>+        annotation = "{}_{}".format(major_version, minor_version)
>+        name_prefix = "EGL_VERSION_"
>+
>+        feature_name = "{}{}".format(name_prefix, annotation)
>+
>+        xml.AddCommands(feature_name, annotation)
>+
>+    xml.AddExtensionCommands(registry_xml.supported_egl_extensions, ['egl'])
>+
>+    all_cmds = xml.all_cmd_names.get_all_commands()
>+
>+    path = os.path.join("..", "util")
>+    ex = "ANGLE_UTIL_EXPORT "
>+    write_header(data_source_name, all_cmds, "egl", util_egl_preamble, path, "UTIL", export=ex)
>+    write_source(data_source_name, all_cmds, "egl", path, export=ex)
>+
>+def gen_wgl_loader():
>+
>+    supported_wgl_extensions = [
>+        "WGL_ARB_create_context",
>+        "WGL_ARB_extensions_string",
>+        "WGL_EXT_swap_control",
>+    ]
>+
>+    source = "wgl.xml"
>+    xml = registry_xml.RegistryXML(source)
>+
>+    for major_version, minor_version in [[1, 0]]:
>+        annotation = "{}_{}".format(major_version, minor_version)
>+        name_prefix = "WGL_VERSION_"
>+
>+        feature_name = "{}{}".format(name_prefix, annotation)
>+
>+        xml.AddCommands(feature_name, annotation)
>+
>+    xml.AddExtensionCommands(supported_wgl_extensions, ['wgl'])
>+
>+    all_cmds = xml.all_cmd_names.get_all_commands()
>+
>+    path = os.path.join("..", "util", "windows")
>+    write_header(source, all_cmds, "wgl", util_wgl_preamble, path, "UTIL_WINDOWS", "_")
>+    write_source(source, all_cmds, "wgl", path, "_")
>+
>+def main():
>+
>+    # Handle inputs/outputs for run_code_generation.py's auto_script
>+    if len(sys.argv) > 1:
>+        inputs = [
>+            'egl.xml',
>+            'egl_angle_ext.xml',
>+            'registry_xml.py',
>+            'wgl.xml',
>+        ]
>+        outputs = [
>+            '../src/libEGL/egl_loader_autogen.cpp',
>+            '../src/libEGL/egl_loader_autogen.h',
>+            '../util/egl_loader_autogen.cpp',
>+            '../util/egl_loader_autogen.h',
>+            '../util/gles_loader_autogen.cpp',
>+            '../util/gles_loader_autogen.h',
>+            '../util/windows/wgl_loader_autogen.cpp',
>+            '../util/windows/wgl_loader_autogen.h',
>+        ]
>+
>+        if sys.argv[1] == 'inputs':
>+            print ','.join(inputs)
>+        elif sys.argv[1] == 'outputs':
>+            print ','.join(outputs)
>+        else:
>+            print('Invalid script parameters')
>+            return 1
>+        return 0
>+
>+    gen_libegl_loader()
>+    gen_gl_loader()
>+    gen_egl_loader()
>+    gen_wgl_loader()
>+    return 0
>+
>+
>+libegl_preamble = """#include <EGL/egl.h>
>+#include <EGL/eglext.h>
>+"""
>+
>+util_gles_preamble = """#if defined(GL_GLES_PROTOTYPES) && GL_GLES_PROTOTYPES
>+#error "Don't define GL prototypes if you want to use a loader!"
>+#endif  // defined(GL_GLES_PROTOTYPES)
>+
>+#include "angle_gl.h"
>+#include "util/util_export.h"
>+"""
>+
>+util_egl_preamble = """#include "util/util_export.h"
>+
>+#include <EGL/egl.h>
>+#include <EGL/eglext.h>
>+"""
>+
>+util_wgl_preamble = """
>+#include <WGL/wgl.h>
>+#include <GLES2/gl2.h>
>+
>+// We add an underscore before each function name to ensure common names like "ChoosePixelFormat"
>+// and "SwapBuffers" don't conflict with our function pointers. We can't use a namespace because
>+// some functions conflict with preprocessor definitions.
>+"""
>+
>+template_loader_h = """// GENERATED FILE - DO NOT EDIT.
>+// Generated by {script_name} using data from {data_source_name}.
>+//
>+// Copyright {year} The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// {api_lower}_loader_autogen.h:
>+//   Simple {api_upper} function loader.
>+
>+#ifndef {lib}_{api_upper}_LOADER_AUTOGEN_H_
>+#define {lib}_{api_upper}_LOADER_AUTOGEN_H_
>+
>+{preamble}
>+{function_pointers}
>+
>+namespace angle
>+{{
>+using GenericProc = void (*)();
>+using LoadProc = GenericProc (KHRONOS_APIENTRY *)(const char *);
>+{export}void Load{api_upper}(LoadProc loadProc);
>+}}  // namespace angle
>+    
>+#endif  // {lib}_{api_upper}_LOADER_AUTOGEN_H_
>+"""
>+
>+template_loader_cpp = """// GENERATED FILE - DO NOT EDIT.
>+// Generated by {script_name} using data from {data_source_name}.
>+//
>+// Copyright {year} The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// {api_lower}_loader_autogen.cpp:
>+//   Simple {api_upper} function loader.
>+
>+#include "{api_lower}_loader_autogen.h"
>+
>+{function_pointers}
>+
>+namespace angle
>+{{
>+void Load{api_upper}(LoadProc loadProc)
>+{{
>+{set_pointers}
>+}}
>+}}  // namespace angle
>+"""
>+
>+if __name__ == '__main__':
>+    sys.exit(main())
>diff --git a/Source/ThirdParty/ANGLE/scripts/generate_new_renderer.py b/Source/ThirdParty/ANGLE/scripts/generate_new_renderer.py
>new file mode 100644
>index 00000000000..73e5671f043
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/scripts/generate_new_renderer.py
>@@ -0,0 +1,281 @@
>+#!/usr/bin/python2
>+#
>+# Copyright (c) 2015 The ANGLE Project Authors. All rights reserved.
>+# Use of this source code is governed by a BSD-style license that can be
>+# found in the LICENSE file.
>+#
>+# generate_new_renderer.py:
>+#   Utility script to generate stubs for a new Renderer class.
>+#   Usage: generate_new_renderer.py <renderer name> <renderer suffix>
>+#     Renderer name is the folder for the renderer subdirectory
>+#     Renderer suffix is the abbreviation to append after the class names.
>+#
>+# The script is fairly robust but may not work for all new methods or
>+# other unexpected features. It expects that abstract methods are all
>+# grouped after the public destructor or after the private
>+# DISALLOW_COPY_AND_ASSIGN macro.
>+
>+import os, sys, re, string, datetime
>+
>+if len(sys.argv) < 3:
>+    print('Usage: ' + sys.argv[0] + ' <renderer dir name> <renderer class suffix>')
>+    sys.exit(1)
>+
>+renderer_name = sys.argv[1]
>+renderer_suffix = sys.argv[2]
>+
>+# change to the renderer directory
>+os.chdir(os.path.join(os.path.dirname(sys.argv[0]), "..", "src", "libANGLE", "renderer"))
>+
>+# ensure subdir exists
>+if not os.path.isdir(renderer_name):
>+    os.mkdir(renderer_name)
>+
>+impl_classes = [
>+    'Buffer',
>+    'Compiler',
>+    'Context',
>+    'Device',
>+    'Display',
>+    'FenceNV',
>+    'FenceSync',
>+    'Framebuffer',
>+    'Image',
>+    'Path',
>+    'Program',
>+    'Query',
>+    'Renderbuffer',
>+    'Sampler',
>+    'Shader',
>+    'Surface',
>+    'Texture',
>+    'TransformFeedback',
>+    'VertexArray',
>+]
>+
>+h_file_template = """//
>+// Copyright 2016 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// $TypedImpl.h:
>+//    Defines the class interface for $TypedImpl, implementing $BaseImpl.
>+//
>+
>+#ifndef LIBANGLE_RENDERER_${RendererNameCaps}_${TypedImplCaps}_H_
>+#define LIBANGLE_RENDERER_${RendererNameCaps}_${TypedImplCaps}_H_
>+
>+#include "libANGLE/renderer/$BaseImpl.h"
>+
>+namespace rx
>+{
>+
>+class $TypedImpl : public $BaseImpl
>+{
>+  public:
>+    $TypedImpl($ConstructorParams);
>+    ~$TypedImpl() override;
>+$ImplMethodDeclarations$PrivateImplMethodDeclarations};
>+
>+}  // namespace rx
>+
>+#endif  // LIBANGLE_RENDERER_${RendererNameCaps}_${TypedImplCaps}_H_
>+"""
>+
>+cpp_file_template = """//
>+// Copyright $Year The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// $TypedImpl.cpp:
>+//    Implements the class methods for $TypedImpl.
>+//
>+
>+#include "libANGLE/renderer/$RendererName/$TypedImpl.h"
>+
>+#include "common/debug.h"
>+
>+namespace rx
>+{
>+
>+$TypedImpl::$TypedImpl($ConstructorParams) : $BaseImpl($BaseContructorArgs)
>+{
>+}
>+
>+$TypedImpl::~$TypedImpl()
>+{
>+}
>+$ImplMethodDefinitions
>+}  // namespace rx
>+"""
>+
>+def generate_impl_declaration(impl_stub):
>+    # ensure the wrapped lines are aligned vertically
>+    temp = re.sub(r'\n        ', '\n', impl_stub)
>+    return temp + ' override;\n'
>+
>+def generate_impl_definition(impl_stub, typed_impl):
>+    function_signature = impl_stub.strip()
>+
>+    # strip comments
>+    function_signature = re.sub(r'\/\/[^\n]*\n', '', function_signature).strip()
>+
>+    prog = re.compile(r'^(.+[ \*\&])([^ \(\*\&]+\()')
>+    return_value = prog.match(function_signature).group(1)
>+
>+    # ensure the wrapped lines are aligned vertically
>+    spaces = ' ' * len(typed_impl)
>+    function_signature = re.sub(r'\n          ', '\n' + spaces, function_signature)
>+
>+    # add class scoping
>+    function_signature = prog.sub(r'\1' + typed_impl + r'::\2', function_signature)
>+    function_signature += '\n'
>+
>+    return_statement = ''
>+    return_type = return_value.strip()
>+
>+    if return_type != 'void':
>+        # specialized return values for Errors, pointers, etc
>+        if return_type == 'gl::Error':
>+            return_statement = '    return gl::InvalidOperation();\n'
>+        elif return_type == 'egl::Error':
>+            return_statement = '    return egl::EglBadAccess();\n'
>+        elif return_type == 'LinkResult':
>+            return_statement = '    return gl::InvalidOperation();\n'
>+        elif re.search(r'\*$', return_type):
>+            return_statement = '    return static_cast<' + return_type + '>(0);\n'
>+        elif re.search(r'const ([^ \&]+) \&$', return_type):
>+            obj_type = re.search(r'const ([^ \&]+) \&$', return_type).group(1)
>+            return_statement = '    static ' + obj_type + ' local;\n' + '    return local;\n'
>+        else:
>+            return_statement = '    return ' + return_type + '();\n'
>+
>+    body = '{\n' + '    UNIMPLEMENTED();\n' + return_statement +'}\n'
>+
>+    return '\n' + function_signature + body
>+
>+def get_constructor_args(constructor):
>+    params = re.search(r'$(.*)$', constructor).group(1)
>+    args = ', '.join(re.findall(r'[^\w]?(\w+)(?:\,|$)', params))
>+    return params, args
>+
>+def parse_impl_header(base_impl):
>+    impl_h_file_path = base_impl + '.h'
>+    impl_h_file = open(impl_h_file_path, 'r')
>+
>+    # extract impl stubs
>+    copy = False
>+    copy_private = False
>+    impl_stubs = ''
>+    private_impl_stubs = ''
>+    constructor = base_impl + '() {}'
>+    for line in impl_h_file:
>+        clean_line = line.strip()
>+
>+        match = re.search(r'^(?:explicit )?(' + base_impl + r'$[^$]*\))', clean_line);
>+        if match:
>+            constructor = match.group(1)
>+
>+        # begin capture when reading the destructor.
>+        # begin capture also in the private scope (a few special cases)
>+        # end capture when we reach a non-virtual function, or different scope.
>+        if '~' + base_impl in clean_line:
>+            copy = True
>+            copy_private = False
>+        elif 'private:' in clean_line:
>+            copy = False
>+            copy_private = True
>+        elif ';' in clean_line and ' = 0' not in clean_line:
>+            copy = False
>+            copy_private = False
>+        elif '}' in clean_line or 'protected:' in clean_line or 'private:' in clean_line:
>+            copy = False
>+            copy_private = False
>+        elif copy:
>+            impl_stubs += line
>+        elif copy_private:
>+            private_impl_stubs += line
>+
>+    impl_h_file.close()
>+
>+    return impl_stubs, private_impl_stubs, constructor
>+
>+def get_base_class(base_impl):
>+    impl_h_file_path = base_impl + '.h'
>+    with open(impl_h_file_path, 'r') as impl_h_file:
>+        for line in impl_h_file:
>+            match = re.search(r'^class ' + base_impl + r' : public (\w+)', line)
>+            if match:
>+                return match.group(1)
>+    return False
>+
>+for impl_class in impl_classes:
>+
>+    base_impl = impl_class + 'Impl'
>+    typed_impl = impl_class + renderer_suffix
>+
>+    h_file_path = os.path.join(renderer_name, typed_impl + '.h')
>+    cpp_file_path = os.path.join(renderer_name, typed_impl + '.cpp')
>+
>+    h_file = open(h_file_path, 'w')
>+    cpp_file = open(cpp_file_path, 'w')
>+
>+    # extract impl stubs
>+    impl_stubs, private_impl_stubs, constructor = parse_impl_header(base_impl)
>+
>+    # Handle base classes, skipping angle::NonCopyable.
>+    base_class = get_base_class(base_impl)
>+    if base_class and base_class != 'angle':
>+        base_impl_stubs, base_private_impl_stubs, base_constructor = parse_impl_header(base_class)
>+        impl_stubs += base_impl_stubs
>+        private_impl_stubs += base_private_impl_stubs
>+
>+    impl_method_declarations = ''
>+    impl_method_definitions = ''
>+    private_impl_method_declarations = ''
>+
>+    for impl_stub in impl_stubs.split(' = 0;\n'):
>+        # use 'virtual' to identify the strings with functions
>+        if 'virtual' in impl_stub:
>+            temp = re.sub(r'virtual ', '', impl_stub)
>+            impl_method_declarations += generate_impl_declaration(temp)
>+            impl_method_definitions += generate_impl_definition(temp, typed_impl)
>+
>+    for impl_stub in private_impl_stubs.split(' = 0;\n'):
>+        # use 'virtual' to identify the strings with functions
>+        if 'virtual' in impl_stub:
>+            temp = re.sub(r'virtual ', '', impl_stub)
>+            private_impl_method_declarations += generate_impl_declaration(temp)
>+            impl_method_definitions += generate_impl_definition(temp, typed_impl)
>+
>+    constructor_params, base_constructor_args = get_constructor_args(constructor)
>+
>+    if private_impl_method_declarations:
>+        private_impl_method_declarations = "\n  private:\n" + private_impl_method_declarations
>+
>+    substitutions = {
>+        'BaseImpl': base_impl,
>+        'TypedImpl': typed_impl,
>+        'TypedImplCaps': typed_impl.upper(),
>+        'RendererName': renderer_name,
>+        'RendererNameCaps': renderer_name.upper(),
>+        'ImplMethodDeclarations': impl_method_declarations,
>+        'ImplMethodDefinitions': impl_method_definitions,
>+        'ConstructorParams': constructor_params,
>+        'BaseContructorArgs': base_constructor_args,
>+        'PrivateImplMethodDeclarations': private_impl_method_declarations,
>+        'Year': datetime.datetime.now().year,
>+    }
>+
>+    h_file.write(string.Template(h_file_template).substitute(substitutions))
>+    cpp_file.write(string.Template(cpp_file_template).substitute(substitutions))
>+
>+    h_file.close()
>+    cpp_file.close()
>+
>+# Print a block of source files to add to the build
>+print("Generated files:")
>+for impl_class in impl_classes:
>+    path = "libANGLE/renderer/" + renderer_name + "/" + impl_class + renderer_suffix
>+    print('\'' + path + ".cpp\',")
>+    print('\'' + path + ".h\',")
>diff --git a/Source/ThirdParty/ANGLE/scripts/generate_stats.py b/Source/ThirdParty/ANGLE/scripts/generate_stats.py
>new file mode 100644
>index 00000000000..25dc5629af6
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/scripts/generate_stats.py
>@@ -0,0 +1,607 @@
>+#!/usr/bin/python
>+#
>+# Copyright 2019 The ANGLE Project Authors. All rights reserved.
>+# Use of this source code is governed by a BSD-style license that can be
>+# found in the LICENSE file.
>+#
>+# generate_deqp_stats.py:
>+#   Checks output of deqp testers and generates stats using the GDocs API
>+#
>+# prerequirements:
>+#   https://devsite.googleplex.com/sheets/api/quickstart/python
>+#   Follow the quickstart guide.
>+#
>+# usage: generate_deqp_stats.py [-h] [--auth_path [AUTH_PATH]] [--spreadsheet [SPREADSHEET]]
>+#                               [--verbosity [VERBOSITY]]
>+#
>+# optional arguments:
>+#   -h, --help            show this help message and exit
>+#   --auth_path [AUTH_PATH]
>+#                         path to directory containing authorization data (credentials.json and
>+#                         token.pickle). [default=<home>/.auth]
>+#   --spreadsheet [SPREADSHEET]
>+#                         ID of the spreadsheet to write stats to. [default
>+#                         ='1D6Yh7dAPP-aYLbX3HHQD8WubJV9XPuxvkKowmn2qhIw']
>+#   --verbosity [VERBOSITY]
>+#                         Verbosity of output. Valid options are [DEBUG, INFO, WARNING, ERROR].
>+#                         [default=INFO]
>+
>+import argparse
>+import datetime
>+import logging
>+import os
>+import pickle
>+import re
>+import subprocess
>+import sys
>+import urllib
>+try:
>+  from google.auth.transport.requests import Request
>+  from googleapiclient.discovery import build
>+  from google_auth_oauthlib.flow import InstalledAppFlow
>+except ImportError:
>+  print('ERROR: Missing prerequisites. Follow the quickstart guide:\n'
>+        'https://devsite.googleplex.com/sheets/api/quickstart/python')
>+  exit(1)
>+
>+####################
>+# Global Constants #
>+####################
>+
>+HOME_DIR = os.path.expanduser('~')
>+SCRIPT_DIR = sys.path[0]
>+ROOT_DIR = os.path.abspath(os.path.join(SCRIPT_DIR, '..'))
>+
>+LOGGER = logging.getLogger('generate_stats')
>+
>+SCOPES = ['https://www.googleapis.com/auth/spreadsheets']
>+
>+BOT_NAMES = [
>+    'Win10 FYI dEQP Release (NVIDIA)',
>+    'Win10 FYI dEQP Release (Intel HD 630)',
>+    'Win7 FYI dEQP Release (AMD)',
>+    'Win7 FYI x64 dEQP Release (NVIDIA)',
>+    'Mac FYI dEQP Release Intel',
>+    'Mac FYI dEQP Release AMD',
>+    'Linux FYI dEQP Release (Intel HD 630)',
>+    'Linux FYI dEQP Release (NVIDIA)',
>+    'Android FYI dEQP Release (Nexus 5X)',
>+    'Android FYI 32 dEQP Vk Release (Pixel XL)',
>+    'Android FYI 64 dEQP Vk Release (Pixel XL)',
>+    'Android FYI 32 dEQP Vk Release (Pixel 2)',
>+    'Android FYI 64 dEQP Vk Release (Pixel 2)',
>+]
>+BOT_NAME_PREFIX = 'chromium/ci/'
>+BUILD_LINK_PREFIX = 'https://ci.chromium.org/p/chromium/builders/ci/'
>+
>+REQUIRED_COLUMNS = ['build_link', 'time', 'date', 'revision', 'angle_revision']
>+
>+INFO_TAG = '*RESULT'
>+
>+######################
>+# Build Info Parsing #
>+######################
>+
>+
>+# Returns a struct with info about the latest successful build given a bot name. Info contains the
>+# build_name, time, date, angle_revision, and chrome revision.
>+# Uses: bb ls '<botname>' -n 1 -status success -A
>+def get_latest_success_build_info(bot_name):
>+  bb = subprocess.Popen(['bb', 'ls', bot_name, '-n', '1', '-status', 'success', '-A'],
>+                        stdout=subprocess.PIPE,
>+                        stderr=subprocess.PIPE)
>+  LOGGER.debug("Ran [bb ls '" + bot_name + "' -n 1 -status success -A]")
>+  out, err = bb.communicate()
>+  if err:
>+    raise ValueError("Unexpected error from bb ls: '" + err + "'")
>+  if not out:
>+    raise ValueError("Unexpected empty result from bb ls of bot '" + bot_name + "'")
>+  # Example output (line 1):
>+  # ci.chromium.org/b/8915280275579996928 SUCCESS   'chromium/ci/Win10 FYI dEQP Release (NVIDIA)/26877'
>+  # ...
>+  if 'SUCCESS' not in out:
>+    raise ValueError("Unexpected result from bb ls: '" + out + "'")
>+  info = {}
>+  for line in out.splitlines():
>+    # The first line holds the build name
>+    if 'build_name' not in info:
>+      info['build_name'] = line.strip().split("'")[1]
>+      # Remove the bot name and prepend the build link
>+      info['build_link'] = BUILD_LINK_PREFIX + urllib.quote(
>+          info['build_name'].split(BOT_NAME_PREFIX)[1])
>+    if 'Created' in line:
>+      # Example output of line with 'Created':
>+      # ...
>+      # Created today at 12:26:39, waited 2.056319s, started at 12:26:41, ran for 1h16m48.14963s, ended at 13:43:30
>+      # ...
>+      info['time'] = re.findall(r'[0-9]{1,2}:[0-9]{2}:[0-9]{2}', line.split(',', 1)[0])[0]
>+      # Format today's date in US format so Sheets can read it properly
>+      info['date'] = datetime.datetime.now().strftime('%m/%d/%y')
>+    if 'got_angle_revision' in line:
>+      # Example output of line with angle revision:
>+      # ...
>+      #   "parent_got_angle_revision": "8cbd321cafa92ffbf0495e6d0aeb9e1a97940fee",
>+      # ...
>+      info['angle_revision'] = filter(str.isalnum, line.split(':')[1])
>+    if '"revision"' in line:
>+      # Example output of line with chromium revision:
>+      # ...
>+      #   "revision": "3b68405a27f1f9590f83ae07757589dba862f141",
>+      # ...
>+      info['revision'] = filter(str.isalnum, line.split(':')[1])
>+  if 'build_name' not in info:
>+    raise ValueError("Could not find build_name from bot '" + bot_name + "'")
>+  return info
>+
>+
>+# Returns a list of step names that we're interested in given a build name. We are interested in
>+# step names starting with 'angle_'. May raise an exception.
>+# Uses: bb get '<build_name>' -steps
>+def get_step_names(build_name):
>+  bb = subprocess.Popen(['bb', 'get', build_name, '-steps'],
>+                        stdout=subprocess.PIPE,
>+                        stderr=subprocess.PIPE)
>+  LOGGER.debug("Ran [bb get '" + build_name + "' -steps]")
>+  out, err = bb.communicate()
>+  if err:
>+    raise ValueError("Unexpected error from bb get: '" + err + "'")
>+  step_names = []
>+  # Example output (relevant lines to a single step):
>+  # ...
>+  # Step "angle_deqp_egl_vulkan_tests on (nvidia-quadro-p400-win10-stable) GPU on Windows on Windows-10"                                      SUCCESS   4m12s     Logs: "stdout", "chromium_swarming.summary", "Merge script log", "Flaky failure: dEQP.EGL&#x2f;info_version (status CRASH,SUCCESS)", "step_metadata"
>+  # Run on OS: 'Windows-10'<br>Max shard duration: 0:04:07.309848 (shard \#1)<br>Min shard duration: 0:02:26.402128 (shard \#0)<br/>flaky failures [ignored]:<br/>dEQP.EGL/info\_version<br/>
>+  #  * [shard #0 isolated out](https://isolateserver.appspot.com/browse?namespace=default-gzip&hash=9a5999a59d332e55f54f495948d0c9f959e60ed2)
>+  #  * [shard #0 (128.3 sec)](https://chromium-swarm.appspot.com/user/task/446903ae365b8110)
>+  #  * [shard #1 isolated out](https://isolateserver.appspot.com/browse?namespace=default-gzip&hash=d71e1bdd91dee61b536b4057a9222e642bd3809f)
>+  #  * [shard #1 (229.3 sec)](https://chromium-swarm.appspot.com/user/task/446903b7b0d90210)
>+  #  * [shard #2 isolated out](https://isolateserver.appspot.com/browse?namespace=default-gzip&hash=ac9ba85b1cca77774061b87335c077980e1eef85)
>+  #  * [shard #2 (144.5 sec)](https://chromium-swarm.appspot.com/user/task/446903c18e15a010)
>+  #  * [shard #3 isolated out](https://isolateserver.appspot.com/browse?namespace=default-gzip&hash=976d586386864abecf53915fbac3e085f672e30f)
>+  #  * [shard #3 (138.4 sec)](https://chromium-swarm.appspot.com/user/task/446903cc8da0ad10)
>+  # ...
>+  for line in out.splitlines():
>+    if 'Step "angle_' not in line:
>+      continue
>+    step_names.append(line.split('"')[1])
>+  return step_names
>+
>+
>+# Performs some heuristic validation of the step_info struct returned from a single step log.
>+# Returns True if valid, False if invalid. May write to stderr
>+def validate_step_info(step_info, build_name, step_name):
>+  print_name = "'" + build_name + "': '" + step_name + "'"
>+  if not step_info:
>+    LOGGER.warning('Step info empty for ' + print_name + '\n')
>+    return False
>+
>+  if 'Total' in step_info:
>+    partial_sum_keys = ['Passed', 'Failed', 'Skipped', 'Not Supported', 'Exception', 'Crashed']
>+    partial_sum_values = [int(step_info[key]) for key in partial_sum_keys if key in step_info]
>+    computed_total = sum(partial_sum_values)
>+    if step_info['Total'] != computed_total:
>+      LOGGER.warning('Step info does not sum to total for ' + print_name + ' | Total: ' +
>+                     str(step_info['Total']) + ' - Computed total: ' + str(computed_total) + '\n')
>+  return True
>+
>+
>+# Returns a struct containing parsed info from a given step log. The info is parsed by looking for
>+# lines with the following format in stdout:
>+# '[TESTSTATS]: <key>: <value>''
>+# May write to stderr
>+# Uses: bb log '<build_name>' '<step_name>'
>+def get_step_info(build_name, step_name):
>+  bb = subprocess.Popen(['bb', 'log', build_name, step_name],
>+                        stdout=subprocess.PIPE,
>+                        stderr=subprocess.PIPE)
>+  LOGGER.debug("Ran [bb log '" + build_name + "' '" + step_name + "']")
>+  out, err = bb.communicate()
>+  if err:
>+    LOGGER.warning("Unexpected error from bb log '" + build_name + "' '" + step_name + "': '" +
>+                   err + "'")
>+    return None
>+  step_info = {}
>+  # Example output (relevant lines of stdout):
>+  # ...
>+  # *RESULT: Total: 155
>+  # *RESULT: Passed: 11
>+  # *RESULT: Failed: 0
>+  # *RESULT: Skipped: 12
>+  # *RESULT: Not Supported: 132
>+  # *RESULT: Exception: 0
>+  # *RESULT: Crashed: 0
>+  # *RESULT: Unexpected Passed: 12
>+  # ...
>+  append_errors = []
>+  for line in out.splitlines():
>+    if INFO_TAG not in line:
>+      continue
>+    found_stat = True
>+    line_columns = line.split(INFO_TAG, 1)[1].split(':')
>+    if len(line_columns) is not 3:
>+      LOGGER.warning("Line improperly formatted: '" + line + "'\n")
>+      continue
>+    key = line_columns[1].strip()
>+    # If the value is clearly an int, sum it. Otherwise, concatenate it as a string
>+    isInt = False
>+    intVal = 0
>+    try:
>+      intVal = int(line_columns[2])
>+      if intVal is not None:
>+        isInt = True
>+    except Exception as error:
>+      isInt = False
>+
>+    if isInt:
>+      if key not in step_info:
>+        step_info[key] = 0
>+      step_info[key] += intVal
>+    else:
>+      if key not in step_info:
>+        step_info[key] = line_columns[2].strip()
>+      else:
>+        append_string = '\n' + line_columns[2].strip()
>+        # Sheets has a limit of 50000 characters per cell, so make sure to stop appending below
>+        # this limit
>+        if len(step_info[key]) + len(append_string) < 50000:
>+          step_info[key] += append_string
>+        else:
>+          if key not in append_errors:
>+            append_errors.append(key)
>+            LOGGER.warning("Too many characters in column '" + key + "'. Output capped.")
>+
>+  if validate_step_info(step_info, build_name, step_name):
>+    return step_info
>+  return None
>+
>+
>+# Returns the info for each step run on a given bot_name.
>+def get_bot_info(bot_name):
>+  info = get_latest_success_build_info(bot_name)
>+  info['step_names'] = get_step_names(info['build_name'])
>+  for step_name in info['step_names']:
>+    LOGGER.info("Parsing step '" + step_name + "'...")
>+    info[step_name] = get_step_info(info['build_name'], step_name)
>+  return info
>+
>+
>+#####################
>+# Sheets Formatting #
>+#####################
>+
>+
>+# Get an individual spreadsheet based on the spreadsheet id. Returns the result of
>+# spreadsheets.get(), or throws an exception if the sheet could not open.
>+def get_spreadsheet(service, spreadsheet_id):
>+  LOGGER.debug("Called [spreadsheets.get(spreadsheetId='" + spreadsheet_id + "')]")
>+  request = service.get(spreadsheetId=spreadsheet_id)
>+  spreadsheet = request.execute()
>+  if not spreadsheet:
>+    raise Exception("Did not open spreadsheet '" + spreadsheet_id + "'")
>+  return spreadsheet
>+
>+
>+# Returns a nicely formatted string based on the bot_name and step_name
>+def format_sheet_name(bot_name, step_name):
>+  # Some tokens should be ignored for readability in the name
>+  unneccesary_tokens = ['FYI', 'Release', 'Vk', 'dEQP', '(', ')']
>+  for token in unneccesary_tokens:
>+    bot_name = bot_name.replace(token, '')
>+  bot_name = ' '.join(bot_name.strip().split())  # Remove extra spaces
>+  step_name = re.findall(r'angle\w*', step_name)[0]  # Separate test name
>+  # Test names are formatted as 'angle_deqp_<frontend>_<backend>_tests'
>+  new_step_name = ''
>+  # Put the frontend first
>+  if '_egl_' in step_name:
>+    new_step_name += ' EGL'
>+  if '_gles2_' in step_name:
>+    new_step_name += ' GLES 2.0 '
>+  if '_gles3_' in step_name:
>+    new_step_name += ' GLES 3.0 '
>+  if '_gles31_' in step_name:
>+    new_step_name += ' GLES 3.1 '
>+  # Put the backend second
>+  if '_d3d9_' in step_name:
>+    new_step_name += ' D3D9 '
>+  if '_d3d11' in step_name:
>+    new_step_name += ' D3D11 '
>+  if '_gl_' in step_name:
>+    new_step_name += ' Desktop OpenGL '
>+  if '_gles_' in step_name:
>+    new_step_name += ' OpenGLES '
>+  if '_vulkan_' in step_name:
>+    new_step_name += ' Vulkan '
>+  new_step_name = ' '.join(new_step_name.strip().split())  # Remove extra spaces
>+  return new_step_name + ' ' + bot_name
>+
>+
>+# Returns the full list of sheet names that should be populated based on the info struct
>+def get_sheet_names(info):
>+  sheet_names = []
>+  for bot_name in info:
>+    for step_name in info[bot_name]['step_names']:
>+      sheet_name = format_sheet_name(bot_name, step_name)
>+      sheet_names.append(sheet_name)
>+  return sheet_names
>+
>+
>+# Returns True if the sheet is found in the spreadsheets object
>+def sheet_exists(spreadsheet, step_name):
>+  for sheet in spreadsheet['sheets']:
>+    if sheet['properties']['title'] == step_name:
>+      return True
>+  return False
>+
>+
>+# Validates the spreadsheets object against the list of sheet names which should appear. Returns a
>+# list of sheets that need creation.
>+def validate_sheets(spreadsheet, sheet_names):
>+  create_sheets = []
>+  for sheet_name in sheet_names:
>+    if not sheet_exists(spreadsheet, sheet_name):
>+      create_sheets.append(sheet_name)
>+  return create_sheets
>+
>+
>+# Performs a batch update with a given service, spreadsheet id, and list <object(Request)> of
>+# updates to do.
>+def batch_update(service, spreadsheet_id, updates):
>+  batch_update_request_body = {
>+      'requests': updates,
>+  }
>+  LOGGER.debug("Called [spreadsheets.batchUpdate(spreadsheetId='" + spreadsheet_id + "', body=" +
>+               str(batch_update_request_body) + ')]')
>+  request = service.batchUpdate(spreadsheetId=spreadsheet_id, body=batch_update_request_body)
>+  request.execute()
>+
>+
>+# Creates sheets given a service and spreadsheed id based on a list of sheet names input
>+def create_sheets(service, spreadsheet_id, sheet_names):
>+  updates = [{'addSheet': {'properties': {'title': sheet_name,}}} for sheet_name in sheet_names]
>+  batch_update(service, spreadsheet_id, updates)
>+
>+
>+# Calls a values().batchGet() on the service to find the list of column names from each sheet in
>+# sheet_names. Returns a dictionary with one list per sheet_name.
>+def get_headers(service, spreadsheet_id, sheet_names):
>+  header_ranges = [sheet_name + '!A1:Z' for sheet_name in sheet_names]
>+  LOGGER.debug("Called [spreadsheets.values().batchGet(spreadsheetId='" + spreadsheet_id +
>+               ', ranges=' + str(header_ranges) + "')]")
>+  request = service.values().batchGet(spreadsheetId=spreadsheet_id, ranges=header_ranges)
>+  response = request.execute()
>+  headers = {}
>+  for k, sheet_name in enumerate(sheet_names):
>+    if 'values' in response['valueRanges'][k]:
>+      # Headers are in the first row of values
>+      headers[sheet_name] = response['valueRanges'][k]['values'][0]
>+    else:
>+      headers[sheet_name] = []
>+  return headers
>+
>+
>+# Calls values().batchUpdate() with supplied list of data <object(ValueRange)> to update on the
>+# service.
>+def batch_update_values(service, spreadsheet_id, data):
>+  batch_update_values_request_body = {
>+      'valueInputOption': 'USER_ENTERED',  # Helps with formatting of dates
>+      'data': data,
>+  }
>+  LOGGER.debug("Called [spreadsheets.values().batchUpdate(spreadsheetId='" + spreadsheet_id +
>+               "', body=" + str(batch_update_values_request_body) + ')]')
>+  request = service.values().batchUpdate(
>+      spreadsheetId=spreadsheet_id, body=batch_update_values_request_body)
>+  request.execute()
>+
>+
>+# Populates the headers with any missing/desired rows based on the info struct, and calls
>+# batch update to update the corresponding sheets if necessary.
>+def update_headers(service, spreadsheet_id, headers, info):
>+  data = []
>+  sheet_names = []
>+  for bot_name in info:
>+    for step_name in info[bot_name]['step_names']:
>+      sheet_name = format_sheet_name(bot_name, step_name)
>+      headers_stale = False
>+      # Headers should always contain the following columns
>+      for req in REQUIRED_COLUMNS:
>+        if req not in headers[sheet_name]:
>+          headers_stale = True
>+          headers[sheet_name].append(req)
>+      # Headers also must contain all the keys seen in this step
>+      for key in info[bot_name][step_name].keys():
>+        if key not in headers[sheet_name]:
>+          headers_stale = True
>+          headers[sheet_name].append(key)
>+      # Update the Gdoc headers if necessary
>+      if headers_stale:
>+        sheet_names.append(sheet_name)
>+        header_range = sheet_name + '!A1:Z'
>+        data.append({
>+            'range': header_range,
>+            'majorDimension': 'ROWS',
>+            'values': [headers[sheet_name]]
>+        })
>+  if data:
>+    LOGGER.info('Updating sheet headers...')
>+    batch_update_values(service, spreadsheet_id, data)
>+
>+
>+# Calls values().append() to append a list of values to a given sheet.
>+def append_values(service, spreadsheet_id, sheet_name, values):
>+  header_range = sheet_name + '!A1:Z'
>+  insert_data_option = 'INSERT_ROWS'
>+  value_input_option = 'USER_ENTERED'  # Helps with formatting of dates
>+  append_values_request_body = {
>+      'range': header_range,
>+      'majorDimension': 'ROWS',
>+      'values': [values],
>+  }
>+  LOGGER.debug("Called [spreadsheets.values().append(spreadsheetId='" + spreadsheet_id +
>+               "', body=" + str(append_values_request_body) + ", range='" + header_range +
>+               "', insertDataOption='" + insert_data_option + "', valueInputOption='" +
>+               value_input_option + "')]")
>+  request = service.values().append(
>+      spreadsheetId=spreadsheet_id,
>+      body=append_values_request_body,
>+      range=header_range,
>+      insertDataOption=insert_data_option,
>+      valueInputOption=value_input_option)
>+  request.execute()
>+
>+
>+# Uses the list of headers and the info struct to come up with a list of values for each step
>+# from the latest builds.
>+def update_values(service, spreadsheet_id, headers, info):
>+  data = []
>+  for bot_name in info:
>+    for step_name in info[bot_name]['step_names']:
>+      sheet_name = format_sheet_name(bot_name, step_name)
>+      values = []
>+      # For each key in the list of headers, either add the corresponding value or add a blank
>+      # value. It's necessary for the values to match the order of the headers
>+      for key in headers[sheet_name]:
>+        if key in info[bot_name] and key in REQUIRED_COLUMNS:
>+          values.append(info[bot_name][key])
>+        elif key in info[bot_name][step_name]:
>+          values.append(info[bot_name][step_name][key])
>+        else:
>+          values.append('')
>+      LOGGER.info("Appending new rows to sheet '" + sheet_name + "'...")
>+      try:
>+        append_values(service, spreadsheet_id, sheet_name, values)
>+      except Exception as error:
>+        LOGGER.warning('%s\n' % str(error))
>+
>+
>+# Updates the given spreadsheed_id with the info struct passed in.
>+def update_spreadsheet(service, spreadsheet_id, info):
>+  LOGGER.info('Opening spreadsheet...')
>+  spreadsheet = get_spreadsheet(service, spreadsheet_id)
>+  LOGGER.info('Parsing sheet names...')
>+  sheet_names = get_sheet_names(info)
>+  new_sheets = validate_sheets(spreadsheet, sheet_names)
>+  if new_sheets:
>+    LOGGER.info('Creating new sheets...')
>+    create_sheets(service, spreadsheet_id, new_sheets)
>+  LOGGER.info('Parsing sheet headers...')
>+  headers = get_headers(service, spreadsheet_id, sheet_names)
>+  update_headers(service, spreadsheet_id, headers, info)
>+  update_values(service, spreadsheet_id, headers, info)
>+
>+
>+#####################
>+# Main/helpers      #
>+#####################
>+
>+
>+# Loads or creates credentials and connects to the Sheets API. Returns a Spreadsheets object with
>+# an open connection.
>+def get_sheets_service(auth_path):
>+  credentials_path = auth_path + '/credentials.json'
>+  token_path = auth_path + '/token.pickle'
>+  creds = None
>+  if not os.path.exists(auth_path):
>+    LOGGER.info("Creating auth dir '" + auth_path + "'")
>+    os.makedirs(auth_path)
>+  if not os.path.exists(credentials_path):
>+    raise Exception('Missing credentials.json.\n'
>+                    'Go to: https://developers.google.com/sheets/api/quickstart/python\n'
>+                    "Under Step 1, click 'ENABLE THE GOOGLE SHEETS API'\n"
>+                    "Click 'DOWNLOAD CLIENT CONFIGURATION'\n"
>+                    'Save to your auth_path (' + auth_path + ') as credentials.json')
>+  if os.path.exists(token_path):
>+    with open(token_path, 'rb') as token:
>+      creds = pickle.load(token)
>+      LOGGER.info('Loaded credentials from ' + token_path)
>+  if not creds or not creds.valid:
>+    if creds and creds.expired and creds.refresh_token:
>+      LOGGER.info('Refreshing credentials...')
>+      creds.refresh(Request())
>+    else:
>+      LOGGER.info('Could not find credentials. Requesting new credentials.')
>+      flow = InstalledAppFlow.from_client_secrets_file(credentials_path, SCOPES)
>+      creds = flow.run_local_server()
>+    with open(token_path, 'wb') as token:
>+      pickle.dump(creds, token)
>+  service = build('sheets', 'v4', credentials=creds)
>+  sheets = service.spreadsheets()
>+  return sheets
>+
>+
>+# Parse the input to the script
>+def parse_args():
>+  parser = argparse.ArgumentParser(os.path.basename(sys.argv[0]))
>+  parser.add_argument(
>+      '--auth_path',
>+      default=HOME_DIR + '/.auth',
>+      nargs='?',
>+      help='path to directory containing authorization data '
>+      '(credentials.json and token.pickle). '
>+      '[default=<home>/.auth]')
>+  parser.add_argument(
>+      '--spreadsheet',
>+      default='1D6Yh7dAPP-aYLbX3HHQD8WubJV9XPuxvkKowmn2qhIw',
>+      nargs='?',
>+      help='ID of the spreadsheet to write stats to. '
>+      "[default='1D6Yh7dAPP-aYLbX3HHQD8WubJV9XPuxvkKowmn2qhIw']")
>+  parser.add_argument(
>+      '--verbosity',
>+      default='INFO',
>+      nargs='?',
>+      help='Verbosity of output. Valid options are '
>+      '[DEBUG, INFO, WARNING, ERROR]. '
>+      '[default=INFO]')
>+  return parser.parse_args()
>+
>+
>+# Set up the logging with the right verbosity and output.
>+def initialize_logging(verbosity):
>+  handler = logging.StreamHandler()
>+  formatter = logging.Formatter(fmt='%(levelname)s: %(message)s')
>+  handler.setFormatter(formatter)
>+  LOGGER.addHandler(handler)
>+  if 'DEBUG' in verbosity:
>+    LOGGER.setLevel(level=logging.DEBUG)
>+  elif 'INFO' in verbosity:
>+    LOGGER.setLevel(level=logging.INFO)
>+  elif 'WARNING' in verbosity:
>+    LOGGER.setLevel(level=logging.WARNING)
>+  elif 'ERROR' in verbosity:
>+    LOGGER.setLevel(level=logging.ERROR)
>+  else:
>+    LOGGER.setLevel(level=logging.INFO)
>+
>+
>+def main():
>+  os.chdir(ROOT_DIR)
>+  args = parse_args()
>+  verbosity = args.verbosity.strip().upper()
>+  initialize_logging(verbosity)
>+  auth_path = args.auth_path.replace('\\', '/')
>+  try:
>+    service = get_sheets_service(auth_path)
>+  except Exception as error:
>+    LOGGER.error('%s\n' % str(error))
>+    exit(1)
>+
>+  info = {}
>+  LOGGER.info('Building info struct...')
>+  for bot_name in BOT_NAMES:
>+    LOGGER.info("Parsing bot '" + bot_name + "'...")
>+    try:
>+      info[bot_name] = get_bot_info(BOT_NAME_PREFIX + bot_name)
>+    except Exception as error:
>+      LOGGER.error('%s\n' % str(error))
>+
>+  LOGGER.info('Updating sheets...')
>+  try:
>+    update_spreadsheet(service, args.spreadsheet, info)
>+  except Exception as error:
>+    LOGGER.error('%s\n' % str(error))
>+    quit(1)
>+
>+  LOGGER.info('Info was successfully parsed to sheet: https://docs.google.com/spreadsheets/d/' +
>+              args.spreadsheet)
>+
>+
>+if __name__ == '__main__':
>+  sys.exit(main())
>diff --git a/Source/ThirdParty/ANGLE/scripts/generate_vulkan_layers_json.py b/Source/ThirdParty/ANGLE/scripts/generate_vulkan_layers_json.py
>new file mode 100644
>index 00000000000..daa6d20544a
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/scripts/generate_vulkan_layers_json.py
>@@ -0,0 +1,116 @@
>+#!/usr/bin/env python
>+#
>+# Copyright 2016 The ANGLE Project Authors. All rights reserved.
>+# Use of this source code is governed by a BSD-style license that can be
>+# found in the LICENSE file.
>+
>+"""Generate copies of the Vulkan layers JSON files, with no paths, forcing
>+Vulkan to use the default search path to look for layers."""
>+
>+from __future__ import print_function
>+
>+import argparse
>+import glob
>+import json
>+import os
>+import platform
>+import sys
>+
>+
>+def glob_slash(dirname):
>+    """Like regular glob but replaces \ with / in returned paths."""
>+    return [s.replace('\\', '/') for s in glob.glob(dirname)]
>+
>+
>+def main():
>+    parser = argparse.ArgumentParser(description=__doc__)
>+    parser.add_argument('--icd', action='store_true')
>+    parser.add_argument('source_dir')
>+    parser.add_argument('target_dir')
>+    parser.add_argument('version_header', help='path to vulkan_core.h')
>+    parser.add_argument('json_files', nargs='*')
>+    args = parser.parse_args()
>+
>+    source_dir = args.source_dir
>+    target_dir = args.target_dir
>+
>+    json_files = [j for j in args.json_files if j.endswith('.json')]
>+    json_in_files = [j for j in args.json_files if j.endswith('.json.in')]
>+
>+    data_key = 'ICD' if args.icd else 'layer'
>+
>+    if not os.path.isdir(source_dir):
>+        print(source_dir + ' is not a directory.', file=sys.stderr)
>+        return 1
>+
>+    if not os.path.exists(target_dir):
>+        os.makedirs(target_dir)
>+
>+    # Copy the *.json files from source dir to target dir
>+    if (set(glob_slash(os.path.join(source_dir, '*.json'))) != set(json_files)):
>+        print(glob.glob(os.path.join(source_dir, '*.json')))
>+        print('.json list in gn file is out-of-date', file=sys.stderr)
>+        return 1
>+
>+    for json_fname in json_files:
>+        if not json_fname.endswith('.json'):
>+            continue
>+        with open(json_fname) as infile:
>+            data = json.load(infile)
>+
>+        # Update the path.
>+        if not data_key in data:
>+            raise Exception(
>+                "Could not find '%s' key in %s" % (data_key, json_fname))
>+
>+        # The standard validation layer has no library path.
>+        if 'library_path' in data[data_key]:
>+            prev_name = os.path.basename(data[data_key]['library_path'])
>+            data[data_key]['library_path'] = prev_name
>+
>+        target_fname = os.path.join(target_dir, os.path.basename(json_fname))
>+        with open(target_fname, 'wb') as outfile:
>+            json.dump(data, outfile)
>+
>+    # Get the Vulkan version from the vulkan_core.h file
>+    vk_header_filename = args.version_header
>+    vk_version = None
>+    with open(vk_header_filename) as vk_header_file:
>+        for line in vk_header_file:
>+            if line.startswith('#define VK_HEADER_VERSION'):
>+                vk_version = line.split()[-1]
>+                break
>+    if not vk_version:
>+        print('failed to extract vk_version', file=sys.stderr)
>+        return 1
>+
>+    # Set json file prefix and suffix for generating files, default to Linux.
>+    relative_path_prefix = '../lib'
>+    file_type_suffix = '.so'
>+    if platform.system() == 'Windows':
>+        relative_path_prefix = r'..\\'  # json-escaped, hence two backslashes.
>+        file_type_suffix = '.dll'
>+
>+    # For each *.json.in template files in source dir generate actual json file
>+    # in target dir
>+    if (set(glob_slash(os.path.join(source_dir, '*.json.in'))) !=
>+            set(json_in_files)):
>+        print('.json.in list in gn file is out-of-date', file=sys.stderr)
>+        return 1
>+    for json_in_name in json_in_files:
>+        if not json_in_name.endswith('.json.in'):
>+            continue
>+        json_in_fname = os.path.basename(json_in_name)
>+        layer_name = json_in_fname[:-len('.json.in')]
>+        layer_lib_name = layer_name + file_type_suffix
>+        json_out_fname = os.path.join(target_dir, json_in_fname[:-len('.in')])
>+        with open(json_out_fname,'w') as json_out_file, \
>+             open(json_in_name) as infile:
>+            for line in infile:
>+                line = line.replace('@RELATIVE_LAYER_BINARY@',
>+                                    relative_path_prefix + layer_lib_name)
>+                line = line.replace('@VK_VERSION@', '1.1.' + vk_version)
>+                json_out_file.write(line)
>+
>+if __name__ == '__main__':
>+    sys.exit(main())
>diff --git a/Source/ThirdParty/ANGLE/scripts/gl.xml b/Source/ThirdParty/ANGLE/scripts/gl.xml
>new file mode 100644
>index 00000000000..3466dd7061b
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/scripts/gl.xml
>@@ -0,0 +1,49607 @@
>+<?xml version="1.0" encoding="UTF-8"?>
>+<registry>
>+    <comment>
>+Copyright (c) 2013-2018 The Khronos Group Inc.
>+
>+Licensed under the Apache License, Version 2.0 (the "License");
>+you may not use this file except in compliance with the License.
>+You may obtain a copy of the License at
>+
>+    http://www.apache.org/licenses/LICENSE-2.0
>+
>+Unless required by applicable law or agreed to in writing, software
>+distributed under the License is distributed on an "AS IS" BASIS,
>+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
>+See the License for the specific language governing permissions and
>+limitations under the License.
>+
>+------------------------------------------------------------------------
>+
>+This file, gl.xml, is the OpenGL and OpenGL API Registry. The canonical
>+version of the registry, together with documentation, schema, and Python
>+generator scripts used to generate C header files for OpenGL and OpenGL ES,
>+can always be found in the Khronos Registry at
>+        https://github.com/KhronosGroup/OpenGL-Registry
>+    </comment>
>+
>+    
>+    <types>
>+            
>+        <type name="stddef">#include &lt;stddef.h&gt;</type>
>+        <type name="khrplatform">#include &lt;KHR/khrplatform.h&gt;</type>
>+        <type name="inttypes">#ifndef GLEXT_64_TYPES_DEFINED
>+/* This code block is duplicated in glxext.h, so must be protected */
>+#define GLEXT_64_TYPES_DEFINED
>+/* Define int32_t, int64_t, and uint64_t types for UST/MSC */
>+/* (as used in the GL_EXT_timer_query extension). */
>+#if defined(__STDC_VERSION__) &amp;&amp; __STDC_VERSION__ &gt;= 199901L
>+#include &lt;inttypes.h&gt;
>+#elif defined(__sun__) || defined(__digital__)
>+#include &lt;inttypes.h&gt;
>+#if defined(__STDC__)
>+#if defined(__arch64__) || defined(_LP64)
>+typedef long int int64_t;
>+typedef unsigned long int uint64_t;
>+#else
>+typedef long long int int64_t;
>+typedef unsigned long long int uint64_t;
>+#endif /* __arch64__ */
>+#endif /* __STDC__ */
>+#elif defined( __VMS ) || defined(__sgi)
>+#include &lt;inttypes.h&gt;
>+#elif defined(__SCO__) || defined(__USLC__)
>+#include &lt;stdint.h&gt;
>+#elif defined(__UNIXOS2__) || defined(__SOL64__)
>+typedef long int int32_t;
>+typedef long long int int64_t;
>+typedef unsigned long long int uint64_t;
>+#elif defined(_WIN32) &amp;&amp; defined(__GNUC__)
>+#include &lt;stdint.h&gt;
>+#elif defined(_WIN32)
>+typedef __int32 int32_t;
>+typedef __int64 int64_t;
>+typedef unsigned __int64 uint64_t;
>+#else
>+/* Fallback if nothing above works */
>+#include &lt;inttypes.h&gt;
>+#endif
>+#endif</type>
>+            
>+        <type>typedef unsigned int <name>GLenum</name>;</type>
>+        <type>typedef unsigned char <name>GLboolean</name>;</type>
>+        <type>typedef unsigned int <name>GLbitfield</name>;</type>
>+        <type comment="Not an actual GL type, though used in headers in the past">typedef void <name>GLvoid</name>;</type>
>+        <type>typedef signed char <name>GLbyte</name>;</type>
>+        <type>typedef short <name>GLshort</name>;</type>
>+        <type>typedef int <name>GLint</name>;</type>
>+        <type>typedef int <name>GLclampx</name>;</type>
>+        <type>typedef unsigned char <name>GLubyte</name>;</type>
>+        <type>typedef unsigned short <name>GLushort</name>;</type>
>+        <type>typedef unsigned int <name>GLuint</name>;</type>
>+        <type>typedef int <name>GLsizei</name>;</type>
>+        <type>typedef float <name>GLfloat</name>;</type>
>+        <type>typedef float <name>GLclampf</name>;</type>
>+        <type>typedef double <name>GLdouble</name>;</type>
>+        <type>typedef double <name>GLclampd</name>;</type>
>+        <type>typedef void *<name>GLeglClientBufferEXT</name>;</type>
>+        <type>typedef void *<name>GLeglImageOES</name>;</type>
>+        <type>typedef char <name>GLchar</name>;</type>
>+        <type>typedef char <name>GLcharARB</name>;</type>
>+        <type name="GLhandleARB">#ifdef __APPLE__
>+typedef void *GLhandleARB;
>+#else
>+typedef unsigned int GLhandleARB;
>+#endif</type>
>+        <type>typedef unsigned short <name>GLhalfARB</name>;</type>
>+        <type>typedef unsigned short <name>GLhalf</name>;</type>
>+        <type comment="Must be 32 bits">typedef GLint <name>GLfixed</name>;</type>
>+        <type requires="khrplatform">typedef khronos_intptr_t <name>GLintptr</name>;</type>
>+        <type requires="khrplatform">typedef khronos_ssize_t <name>GLsizeiptr</name>;</type>
>+        <type requires="inttypes">typedef int64_t <name>GLint64</name>;</type>
>+        <type requires="inttypes">typedef uint64_t <name>GLuint64</name>;</type>
>+        <type requires="stddef">typedef ptrdiff_t <name>GLintptrARB</name>;</type>
>+        <type requires="stddef">typedef ptrdiff_t <name>GLsizeiptrARB</name>;</type>
>+        <type requires="inttypes">typedef int64_t <name>GLint64EXT</name>;</type>
>+        <type requires="inttypes">typedef uint64_t <name>GLuint64EXT</name>;</type>
>+        <type>typedef struct __GLsync *<name>GLsync</name>;</type>
>+        <type comment="compatible with OpenCL cl_context"><name>struct _cl_context</name>;</type>
>+        <type comment="compatible with OpenCL cl_event"><name>struct _cl_event</name>;</type>
>+        <type>typedef void (<apientry/> *<name>GLDEBUGPROC</name>)(GLenum source,GLenum type,GLuint id,GLenum severity,GLsizei length,const GLchar *message,const void *userParam);</type>
>+        <type>typedef void (<apientry/> *<name>GLDEBUGPROCARB</name>)(GLenum source,GLenum type,GLuint id,GLenum severity,GLsizei length,const GLchar *message,const void *userParam);</type>
>+        <type>typedef void (<apientry/> *<name>GLDEBUGPROCKHR</name>)(GLenum source,GLenum type,GLuint id,GLenum severity,GLsizei length,const GLchar *message,const void *userParam);</type>
>+            
>+        <type api="gles1" requires="khrplatform">typedef khronos_int32_t <name>GLclampx</name>;</type>
>+            
>+        <type api="gles1" requires="khrplatform">typedef khronos_int8_t <name>GLbyte</name>;</type>
>+        <type api="gles1" requires="khrplatform">typedef khronos_uint8_t <name>GLubyte</name>;</type>
>+        <type api="gles1" requires="khrplatform">typedef khronos_float_t <name>GLfloat</name>;</type>
>+        <type api="gles1" requires="khrplatform">typedef khronos_float_t <name>GLclampf</name>;</type>
>+        <type api="gles1" requires="khrplatform">typedef khronos_int32_t <name>GLfixed</name>;</type>
>+        <type api="gles1" requires="khrplatform">typedef khronos_int64_t <name>GLint64</name>;</type>
>+        <type api="gles1" requires="khrplatform">typedef khronos_uint64_t <name>GLuint64</name>;</type>
>+        <type api="gles1" requires="khrplatform">typedef khronos_intptr_t <name>GLintptr</name>;</type>
>+        <type api="gles1" requires="khrplatform">typedef khronos_ssize_t <name>GLsizeiptr</name>;</type>
>+            
>+        <type api="gles2" requires="khrplatform">typedef khronos_int8_t <name>GLbyte</name>;</type>
>+        <type api="gles2" requires="khrplatform">typedef khronos_uint8_t <name>GLubyte</name>;</type>
>+        <type api="gles2" requires="khrplatform">typedef khronos_float_t <name>GLfloat</name>;</type>
>+        <type api="gles2" requires="khrplatform">typedef khronos_float_t <name>GLclampf</name>;</type>
>+        <type api="gles2" requires="khrplatform">typedef khronos_int32_t <name>GLfixed</name>;</type>
>+        <type api="gles2" requires="khrplatform">typedef khronos_int64_t <name>GLint64</name>;</type>
>+        <type api="gles2" requires="khrplatform">typedef khronos_uint64_t <name>GLuint64</name>;</type>
>+        <type api="gles2" requires="khrplatform">typedef khronos_int64_t <name>GLint64EXT</name>;</type>
>+        <type api="gles2" requires="khrplatform">typedef khronos_uint64_t <name>GLuint64EXT</name>;</type>
>+        <type api="gles2" requires="khrplatform">typedef khronos_intptr_t <name>GLintptr</name>;</type>
>+        <type api="gles2" requires="khrplatform">typedef khronos_ssize_t <name>GLsizeiptr</name>;</type>
>+            
>+            
>+        <type api="glsc2" requires="khrplatform">typedef khronos_uint8_t <name>GLubyte</name>;</type>
>+        <type api="glsc2" requires="khrplatform">typedef khronos_float_t <name>GLfloat</name>;</type>
>+        <type api="glsc2" requires="khrplatform">typedef khronos_intptr_t <name>GLintptr</name>;</type>
>+        <type api="glsc2" requires="khrplatform">typedef khronos_ssize_t <name>GLsizeiptr</name>;</type>
>+            
>+        <type>typedef void (<apientry/> *<name>GLDEBUGPROCAMD</name>)(GLuint id,GLenum category,GLenum severity,GLsizei length,const GLchar *message,void *userParam);</type>
>+        <type>typedef unsigned short <name>GLhalfNV</name>;</type>
>+        <type requires="GLintptr">typedef GLintptr <name>GLvdpauSurfaceNV</name>;</type>
>+        <type>typedef void (<apientry/> *<name>GLVULKANPROCNV</name>)(void);</type>
>+    </types>
>+
>+    
>+
>+    <groups>
>+        <group name="AccumOp">
>+            <enum name="GL_ACCUM"/>
>+            <enum name="GL_LOAD"/>
>+            <enum name="GL_RETURN"/>
>+            <enum name="GL_MULT"/>
>+            <enum name="GL_ADD"/>
>+        </group>
>+
>+        <group name="AttribMask">
>+            <enum name="GL_ACCUM_BUFFER_BIT"/>
>+            <enum name="GL_ALL_ATTRIB_BITS"/>
>+            <enum name="GL_COLOR_BUFFER_BIT"/>
>+            <enum name="GL_CURRENT_BIT"/>
>+            <enum name="GL_DEPTH_BUFFER_BIT"/>
>+            <enum name="GL_ENABLE_BIT"/>
>+            <enum name="GL_EVAL_BIT"/>
>+            <enum name="GL_FOG_BIT"/>
>+            <enum name="GL_HINT_BIT"/>
>+            <enum name="GL_LIGHTING_BIT"/>
>+            <enum name="GL_LINE_BIT"/>
>+            <enum name="GL_LIST_BIT"/>
>+            <enum name="GL_MULTISAMPLE_BIT"/>
>+            <enum name="GL_MULTISAMPLE_BIT_3DFX"/>
>+            <enum name="GL_MULTISAMPLE_BIT_ARB"/>
>+            <enum name="GL_MULTISAMPLE_BIT_EXT"/>
>+            <enum name="GL_PIXEL_MODE_BIT"/>
>+            <enum name="GL_POINT_BIT"/>
>+            <enum name="GL_POLYGON_BIT"/>
>+            <enum name="GL_POLYGON_STIPPLE_BIT"/>
>+            <enum name="GL_SCISSOR_BIT"/>
>+            <enum name="GL_STENCIL_BUFFER_BIT"/>
>+            <enum name="GL_TEXTURE_BIT"/>
>+            <enum name="GL_TRANSFORM_BIT"/>
>+            <enum name="GL_VIEWPORT_BIT"/>
>+        </group>
>+
>+        <group name="AlphaFunction">
>+            <enum name="GL_ALWAYS"/>
>+            <enum name="GL_EQUAL"/>
>+            <enum name="GL_GEQUAL"/>
>+            <enum name="GL_GREATER"/>
>+            <enum name="GL_LEQUAL"/>
>+            <enum name="GL_LESS"/>
>+            <enum name="GL_NEVER"/>
>+            <enum name="GL_NOTEQUAL"/>
>+        </group>
>+
>+        <group name="BlendEquationModeEXT">
>+            <enum name="GL_ALPHA_MAX_SGIX"/>
>+            <enum name="GL_ALPHA_MIN_SGIX"/>
>+            <enum name="GL_FUNC_ADD_EXT"/>
>+            <enum name="GL_FUNC_REVERSE_SUBTRACT_EXT"/>
>+            <enum name="GL_FUNC_SUBTRACT_EXT"/>
>+            <enum name="GL_LOGIC_OP"/>
>+            <enum name="GL_MAX_EXT"/>
>+            <enum name="GL_MIN_EXT"/>
>+            <enum name="GL_FUNC_ADD"/>
>+            <enum name="GL_FUNC_REVERSE_SUBTRACT"/>
>+            <enum name="GL_FUNC_SUBTRACT"/>
>+        </group>
>+
>+        <group name="Boolean">
>+            <enum name="GL_FALSE"/>
>+            <enum name="GL_TRUE"/>
>+        </group>
>+
>+        <group name="BufferBitQCOM">
>+            <enum name="GL_MULTISAMPLE_BUFFER_BIT7_QCOM"/>
>+            <enum name="GL_MULTISAMPLE_BUFFER_BIT6_QCOM"/>
>+            <enum name="GL_MULTISAMPLE_BUFFER_BIT5_QCOM"/>
>+            <enum name="GL_MULTISAMPLE_BUFFER_BIT4_QCOM"/>
>+            <enum name="GL_MULTISAMPLE_BUFFER_BIT3_QCOM"/>
>+            <enum name="GL_MULTISAMPLE_BUFFER_BIT2_QCOM"/>
>+            <enum name="GL_MULTISAMPLE_BUFFER_BIT1_QCOM"/>
>+            <enum name="GL_MULTISAMPLE_BUFFER_BIT0_QCOM"/>
>+            <enum name="GL_STENCIL_BUFFER_BIT7_QCOM"/>
>+            <enum name="GL_STENCIL_BUFFER_BIT6_QCOM"/>
>+            <enum name="GL_STENCIL_BUFFER_BIT5_QCOM"/>
>+            <enum name="GL_STENCIL_BUFFER_BIT4_QCOM"/>
>+            <enum name="GL_STENCIL_BUFFER_BIT3_QCOM"/>
>+            <enum name="GL_STENCIL_BUFFER_BIT2_QCOM"/>
>+            <enum name="GL_STENCIL_BUFFER_BIT1_QCOM"/>
>+            <enum name="GL_STENCIL_BUFFER_BIT0_QCOM"/>
>+            <enum name="GL_DEPTH_BUFFER_BIT7_QCOM"/>
>+            <enum name="GL_DEPTH_BUFFER_BIT6_QCOM"/>
>+            <enum name="GL_DEPTH_BUFFER_BIT5_QCOM"/>
>+            <enum name="GL_DEPTH_BUFFER_BIT4_QCOM"/>
>+            <enum name="GL_DEPTH_BUFFER_BIT3_QCOM"/>
>+            <enum name="GL_DEPTH_BUFFER_BIT2_QCOM"/>
>+            <enum name="GL_DEPTH_BUFFER_BIT1_QCOM"/>
>+            <enum name="GL_DEPTH_BUFFER_BIT0_QCOM"/>
>+            <enum name="GL_COLOR_BUFFER_BIT7_QCOM"/>
>+            <enum name="GL_COLOR_BUFFER_BIT6_QCOM"/>
>+            <enum name="GL_COLOR_BUFFER_BIT5_QCOM"/>
>+            <enum name="GL_COLOR_BUFFER_BIT4_QCOM"/>
>+            <enum name="GL_COLOR_BUFFER_BIT3_QCOM"/>
>+            <enum name="GL_COLOR_BUFFER_BIT2_QCOM"/>
>+            <enum name="GL_COLOR_BUFFER_BIT1_QCOM"/>
>+            <enum name="GL_COLOR_BUFFER_BIT0_QCOM"/>
>+        </group>
>+
>+        <group name="BufferTargetARB">
>+          <enum name="GL_ARRAY_BUFFER"/>
>+          <enum name="GL_ATOMIC_COUNTER_BUFFER" />
>+          <enum name="GL_COPY_READ_BUFFER" />
>+          <enum name="GL_COPY_WRITE_BUFFER" />
>+          <enum name="GL_DISPATCH_INDIRECT_BUFFER" />
>+          <enum name="GL_DRAW_INDIRECT_BUFFER" />
>+          <enum name="GL_ELEMENT_ARRAY_BUFFER" />
>+          <enum name="GL_PIXEL_PACK_BUFFER" />
>+          <enum name="GL_PIXEL_UNPACK_BUFFER" />
>+          <enum name="GL_QUERY_BUFFER" />
>+          <enum name="GL_SHADER_STORAGE_BUFFER" />
>+          <enum name="GL_TEXTURE_BUFFER" />
>+          <enum name="GL_TRANSFORM_FEEDBACK_BUFFER" />
>+          <enum name="GL_UNIFORM_BUFFER" />
>+        </group>
>+
>+        <group name="BufferUsageARB">
>+          <enum name="GL_STREAM_DRAW"/>
>+          <enum name="GL_STREAM_READ"/>
>+          <enum name="GL_STREAM_COPY"/>
>+          <enum name="GL_STATIC_DRAW"/>
>+          <enum name="GL_STATIC_READ"/>
>+          <enum name="GL_STATIC_COPY"/>
>+          <enum name="GL_DYNAMIC_DRAW"/>
>+          <enum name="GL_DYNAMIC_READ"/>
>+          <enum name="GL_DYNAMIC_COPY"/>
>+        </group>
>+
>+        <group name="BufferAccessARB">
>+          <enum name="GL_READ_ONLY"/>
>+          <enum name="GL_WRITE_ONLY"/>
>+          <enum name="GL_READ_WRITE"/>
>+        </group>
>+
>+        <group name="BufferAccessMask">
>+            <enum name="GL_MAP_COHERENT_BIT"/>
>+            <enum name="GL_MAP_COHERENT_BIT_EXT"/>
>+            <enum name="GL_MAP_FLUSH_EXPLICIT_BIT"/>
>+            <enum name="GL_MAP_FLUSH_EXPLICIT_BIT_EXT"/>
>+            <enum name="GL_MAP_INVALIDATE_BUFFER_BIT"/>
>+            <enum name="GL_MAP_INVALIDATE_BUFFER_BIT_EXT"/>
>+            <enum name="GL_MAP_INVALIDATE_RANGE_BIT"/>
>+            <enum name="GL_MAP_INVALIDATE_RANGE_BIT_EXT"/>
>+            <enum name="GL_MAP_PERSISTENT_BIT"/>
>+            <enum name="GL_MAP_PERSISTENT_BIT_EXT"/>
>+            <enum name="GL_MAP_READ_BIT"/>
>+            <enum name="GL_MAP_READ_BIT_EXT"/>
>+            <enum name="GL_MAP_UNSYNCHRONIZED_BIT"/>
>+            <enum name="GL_MAP_UNSYNCHRONIZED_BIT_EXT"/>
>+            <enum name="GL_MAP_WRITE_BIT"/>
>+            <enum name="GL_MAP_WRITE_BIT_EXT"/>
>+        </group>
>+
>+        <group name="ClearBufferMask">
>+            <enum name="GL_ACCUM_BUFFER_BIT"/>
>+            <enum name="GL_COLOR_BUFFER_BIT"/>
>+            <enum name="GL_COVERAGE_BUFFER_BIT_NV"/>
>+            <enum name="GL_DEPTH_BUFFER_BIT"/>
>+            <enum name="GL_STENCIL_BUFFER_BIT"/>
>+        </group>
>+
>+        <group name="ClientAttribMask">
>+            <enum name="GL_CLIENT_ALL_ATTRIB_BITS"/>
>+            <enum name="GL_CLIENT_PIXEL_STORE_BIT"/>
>+            <enum name="GL_CLIENT_VERTEX_ARRAY_BIT"/>
>+        </group>
>+
>+        <group name="ClipPlaneName">
>+            <enum name="GL_CLIP_DISTANCE0"/>
>+            <enum name="GL_CLIP_DISTANCE1"/>
>+            <enum name="GL_CLIP_DISTANCE2"/>
>+            <enum name="GL_CLIP_DISTANCE3"/>
>+            <enum name="GL_CLIP_DISTANCE4"/>
>+            <enum name="GL_CLIP_DISTANCE5"/>
>+            <enum name="GL_CLIP_DISTANCE6"/>
>+            <enum name="GL_CLIP_DISTANCE7"/>
>+            <enum name="GL_CLIP_PLANE0"/>
>+            <enum name="GL_CLIP_PLANE1"/>
>+            <enum name="GL_CLIP_PLANE2"/>
>+            <enum name="GL_CLIP_PLANE3"/>
>+            <enum name="GL_CLIP_PLANE4"/>
>+            <enum name="GL_CLIP_PLANE5"/>
>+        </group>
>+
>+        <group name="ColorMaterialFace">
>+            <enum name="GL_BACK"/>
>+            <enum name="GL_FRONT"/>
>+            <enum name="GL_FRONT_AND_BACK"/>
>+        </group>
>+
>+        <group name="ColorMaterialParameter">
>+            <enum name="GL_AMBIENT"/>
>+            <enum name="GL_AMBIENT_AND_DIFFUSE"/>
>+            <enum name="GL_DIFFUSE"/>
>+            <enum name="GL_EMISSION"/>
>+            <enum name="GL_SPECULAR"/>
>+        </group>
>+
>+        <group name="ColorPointerType">
>+            <enum name="GL_BYTE"/>
>+            <enum name="GL_DOUBLE"/>
>+            <enum name="GL_FLOAT"/>
>+            <enum name="GL_INT"/>
>+            <enum name="GL_SHORT"/>
>+            <enum name="GL_UNSIGNED_BYTE"/>
>+            <enum name="GL_UNSIGNED_INT"/>
>+            <enum name="GL_UNSIGNED_SHORT"/>
>+        </group>
>+
>+        <group name="ColorTableParameterPNameSGI">
>+            <enum name="GL_COLOR_TABLE_BIAS"/>
>+            <enum name="GL_COLOR_TABLE_BIAS_SGI"/>
>+            <enum name="GL_COLOR_TABLE_SCALE"/>
>+            <enum name="GL_COLOR_TABLE_SCALE_SGI"/>
>+        </group>
>+
>+        <group name="ColorTableTargetSGI">
>+            <enum name="GL_COLOR_TABLE"/>
>+            <enum name="GL_COLOR_TABLE_SGI"/>
>+            <enum name="GL_POST_COLOR_MATRIX_COLOR_TABLE"/>
>+            <enum name="GL_POST_COLOR_MATRIX_COLOR_TABLE_SGI"/>
>+            <enum name="GL_POST_CONVOLUTION_COLOR_TABLE"/>
>+            <enum name="GL_POST_CONVOLUTION_COLOR_TABLE_SGI"/>
>+            <enum name="GL_PROXY_COLOR_TABLE"/>
>+            <enum name="GL_PROXY_COLOR_TABLE_SGI"/>
>+            <enum name="GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE"/>
>+            <enum name="GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE_SGI"/>
>+            <enum name="GL_PROXY_POST_CONVOLUTION_COLOR_TABLE"/>
>+            <enum name="GL_PROXY_POST_CONVOLUTION_COLOR_TABLE_SGI"/>
>+            <enum name="GL_PROXY_TEXTURE_COLOR_TABLE_SGI"/>
>+            <enum name="GL_TEXTURE_COLOR_TABLE_SGI"/>
>+        </group>
>+
>+        <group name="ContextFlagMask">
>+            <enum name="GL_CONTEXT_FLAG_DEBUG_BIT"/>
>+            <enum name="GL_CONTEXT_FLAG_DEBUG_BIT_KHR"/>
>+            <enum name="GL_CONTEXT_FLAG_FORWARD_COMPATIBLE_BIT"/>
>+            <enum name="GL_CONTEXT_FLAG_ROBUST_ACCESS_BIT"/>
>+            <enum name="GL_CONTEXT_FLAG_ROBUST_ACCESS_BIT_ARB"/>
>+            <enum name="GL_CONTEXT_FLAG_PROTECTED_CONTENT_BIT_EXT"/>
>+            <enum name="GL_CONTEXT_FLAG_NO_ERROR_BIT"/>
>+            <enum name="GL_CONTEXT_FLAG_NO_ERROR_BIT_KHR"/>
>+        </group>
>+
>+        <group name="ContextProfileMask">
>+            <enum name="GL_CONTEXT_COMPATIBILITY_PROFILE_BIT"/>
>+            <enum name="GL_CONTEXT_CORE_PROFILE_BIT"/>
>+        </group>
>+
>+        <group name="ConvolutionBorderModeEXT">
>+            <enum name="GL_REDUCE"/>
>+            <enum name="GL_REDUCE_EXT"/>
>+        </group>
>+
>+        <group name="ConvolutionParameterEXT">
>+            <enum name="GL_CONVOLUTION_BORDER_MODE"/>
>+            <enum name="GL_CONVOLUTION_BORDER_MODE_EXT"/>
>+            <enum name="GL_CONVOLUTION_FILTER_BIAS"/>
>+            <enum name="GL_CONVOLUTION_FILTER_BIAS_EXT"/>
>+            <enum name="GL_CONVOLUTION_FILTER_SCALE"/>
>+            <enum name="GL_CONVOLUTION_FILTER_SCALE_EXT"/>
>+        </group>
>+
>+        <group name="ConvolutionTargetEXT">
>+            <enum name="GL_CONVOLUTION_1D"/>
>+            <enum name="GL_CONVOLUTION_1D_EXT"/>
>+            <enum name="GL_CONVOLUTION_2D"/>
>+            <enum name="GL_CONVOLUTION_2D_EXT"/>
>+        </group>
>+
>+        <group name="CullFaceMode">
>+            <enum name="GL_BACK"/>
>+            <enum name="GL_FRONT"/>
>+            <enum name="GL_FRONT_AND_BACK"/>
>+        </group>
>+
>+        <group name="DataType" comment="See enums block below"/>
>+
>+        <group name="DepthFunction">
>+            <enum name="GL_ALWAYS"/>
>+            <enum name="GL_EQUAL"/>
>+            <enum name="GL_GEQUAL"/>
>+            <enum name="GL_GREATER"/>
>+            <enum name="GL_LEQUAL"/>
>+            <enum name="GL_LESS"/>
>+            <enum name="GL_NEVER"/>
>+            <enum name="GL_NOTEQUAL"/>
>+        </group>
>+
>+        <group name="DrawBufferMode">
>+            <enum name="GL_AUX0"/>
>+            <enum name="GL_AUX1"/>
>+            <enum name="GL_AUX2"/>
>+            <enum name="GL_AUX3"/>
>+            <enum name="GL_BACK"/>
>+            <enum name="GL_BACK_LEFT"/>
>+            <enum name="GL_BACK_RIGHT"/>
>+            <enum name="GL_FRONT"/>
>+            <enum name="GL_FRONT_AND_BACK"/>
>+            <enum name="GL_FRONT_LEFT"/>
>+            <enum name="GL_FRONT_RIGHT"/>
>+            <enum name="GL_LEFT"/>
>+            <enum name="GL_NONE"/>
>+            <enum name="GL_NONE_OES"/>
>+            <enum name="GL_RIGHT"/>
>+        </group>
>+
>+        <group name="DrawElementsType">
>+            <enum name="GL_UNSIGNED_BYTE"/>
>+            <enum name="GL_UNSIGNED_SHORT"/>
>+            <enum name="GL_UNSIGNED_INT"/>
>+        </group>
>+
>+        <group name="EnableCap">
>+            <enum name="GL_ALPHA_TEST"/>
>+            <enum name="GL_ASYNC_DRAW_PIXELS_SGIX"/>
>+            <enum name="GL_ASYNC_HISTOGRAM_SGIX"/>
>+            <enum name="GL_ASYNC_READ_PIXELS_SGIX"/>
>+            <enum name="GL_ASYNC_TEX_IMAGE_SGIX"/>
>+            <enum name="GL_AUTO_NORMAL"/>
>+            <enum name="GL_BLEND"/>
>+            <enum name="GL_CALLIGRAPHIC_FRAGMENT_SGIX"/>
>+            <enum name="GL_CLIP_PLANE0"/>
>+            <enum name="GL_CLIP_PLANE1"/>
>+            <enum name="GL_CLIP_PLANE2"/>
>+            <enum name="GL_CLIP_PLANE3"/>
>+            <enum name="GL_CLIP_PLANE4"/>
>+            <enum name="GL_CLIP_PLANE5"/>
>+            <enum name="GL_COLOR_ARRAY"/>
>+            <enum name="GL_COLOR_LOGIC_OP"/>
>+            <enum name="GL_COLOR_MATERIAL"/>
>+            <enum name="GL_COLOR_TABLE_SGI"/>
>+            <enum name="GL_CONVOLUTION_1D_EXT"/>
>+            <enum name="GL_CONVOLUTION_2D_EXT"/>
>+            <enum name="GL_CULL_FACE"/>
>+            <enum name="GL_DEPTH_TEST"/>
>+            <enum name="GL_DITHER"/>
>+            <enum name="GL_EDGE_FLAG_ARRAY"/>
>+            <enum name="GL_FOG"/>
>+            <enum name="GL_FOG_OFFSET_SGIX"/>
>+            <enum name="GL_FRAGMENT_COLOR_MATERIAL_SGIX"/>
>+            <enum name="GL_FRAGMENT_LIGHT0_SGIX"/>
>+            <enum name="GL_FRAGMENT_LIGHT1_SGIX"/>
>+            <enum name="GL_FRAGMENT_LIGHT2_SGIX"/>
>+            <enum name="GL_FRAGMENT_LIGHT3_SGIX"/>
>+            <enum name="GL_FRAGMENT_LIGHT4_SGIX"/>
>+            <enum name="GL_FRAGMENT_LIGHT5_SGIX"/>
>+            <enum name="GL_FRAGMENT_LIGHT6_SGIX"/>
>+            <enum name="GL_FRAGMENT_LIGHT7_SGIX"/>
>+            <enum name="GL_FRAGMENT_LIGHTING_SGIX"/>
>+            <enum name="GL_FRAMEZOOM_SGIX"/>
>+            <enum name="GL_HISTOGRAM_EXT"/>
>+            <enum name="GL_INDEX_ARRAY"/>
>+            <enum name="GL_INDEX_LOGIC_OP"/>
>+            <enum name="GL_INTERLACE_SGIX"/>
>+            <enum name="GL_IR_INSTRUMENT1_SGIX"/>
>+            <enum name="GL_LIGHT0"/>
>+            <enum name="GL_LIGHT1"/>
>+            <enum name="GL_LIGHT2"/>
>+            <enum name="GL_LIGHT3"/>
>+            <enum name="GL_LIGHT4"/>
>+            <enum name="GL_LIGHT5"/>
>+            <enum name="GL_LIGHT6"/>
>+            <enum name="GL_LIGHT7"/>
>+            <enum name="GL_LIGHTING"/>
>+            <enum name="GL_LINE_SMOOTH"/>
>+            <enum name="GL_LINE_STIPPLE"/>
>+            <enum name="GL_MAP1_COLOR_4"/>
>+            <enum name="GL_MAP1_INDEX"/>
>+            <enum name="GL_MAP1_NORMAL"/>
>+            <enum name="GL_MAP1_TEXTURE_COORD_1"/>
>+            <enum name="GL_MAP1_TEXTURE_COORD_2"/>
>+            <enum name="GL_MAP1_TEXTURE_COORD_3"/>
>+            <enum name="GL_MAP1_TEXTURE_COORD_4"/>
>+            <enum name="GL_MAP1_VERTEX_3"/>
>+            <enum name="GL_MAP1_VERTEX_4"/>
>+            <enum name="GL_MAP2_COLOR_4"/>
>+            <enum name="GL_MAP2_INDEX"/>
>+            <enum name="GL_MAP2_NORMAL"/>
>+            <enum name="GL_MAP2_TEXTURE_COORD_1"/>
>+            <enum name="GL_MAP2_TEXTURE_COORD_2"/>
>+            <enum name="GL_MAP2_TEXTURE_COORD_3"/>
>+            <enum name="GL_MAP2_TEXTURE_COORD_4"/>
>+            <enum name="GL_MAP2_VERTEX_3"/>
>+            <enum name="GL_MAP2_VERTEX_4"/>
>+            <enum name="GL_MINMAX_EXT"/>
>+            <enum name="GL_MULTISAMPLE_SGIS"/>
>+            <enum name="GL_NORMALIZE"/>
>+            <enum name="GL_NORMAL_ARRAY"/>
>+            <enum name="GL_PIXEL_TEXTURE_SGIS"/>
>+            <enum name="GL_PIXEL_TEX_GEN_SGIX"/>
>+            <enum name="GL_POINT_SMOOTH"/>
>+            <enum name="GL_POLYGON_OFFSET_FILL"/>
>+            <enum name="GL_POLYGON_OFFSET_LINE"/>
>+            <enum name="GL_POLYGON_OFFSET_POINT"/>
>+            <enum name="GL_POLYGON_SMOOTH"/>
>+            <enum name="GL_POLYGON_STIPPLE"/>
>+            <enum name="GL_POST_COLOR_MATRIX_COLOR_TABLE_SGI"/>
>+            <enum name="GL_POST_CONVOLUTION_COLOR_TABLE_SGI"/>
>+            <enum name="GL_REFERENCE_PLANE_SGIX"/>
>+            <enum name="GL_RESCALE_NORMAL_EXT"/>
>+            <enum name="GL_SAMPLE_ALPHA_TO_MASK_SGIS"/>
>+            <enum name="GL_SAMPLE_ALPHA_TO_ONE_SGIS"/>
>+            <enum name="GL_SAMPLE_MASK_SGIS"/>
>+            <enum name="GL_SCISSOR_TEST"/>
>+            <enum name="GL_SEPARABLE_2D_EXT"/>
>+            <enum name="GL_SHARED_TEXTURE_PALETTE_EXT"/>
>+            <enum name="GL_SPRITE_SGIX"/>
>+            <enum name="GL_STENCIL_TEST"/>
>+            <enum name="GL_TEXTURE_1D"/>
>+            <enum name="GL_TEXTURE_2D"/>
>+            <enum name="GL_TEXTURE_3D_EXT"/>
>+            <enum name="GL_TEXTURE_4D_SGIS"/>
>+            <enum name="GL_TEXTURE_COLOR_TABLE_SGI"/>
>+            <enum name="GL_TEXTURE_COORD_ARRAY"/>
>+            <enum name="GL_TEXTURE_GEN_Q"/>
>+            <enum name="GL_TEXTURE_GEN_R"/>
>+            <enum name="GL_TEXTURE_GEN_S"/>
>+            <enum name="GL_TEXTURE_GEN_T"/>
>+            <enum name="GL_VERTEX_ARRAY"/>
>+        </group>
>+
>+        <group name="ErrorCode">
>+            <enum name="GL_INVALID_ENUM"/>
>+            <enum name="GL_INVALID_FRAMEBUFFER_OPERATION"/>
>+            <enum name="GL_INVALID_FRAMEBUFFER_OPERATION_EXT"/>
>+            <enum name="GL_INVALID_FRAMEBUFFER_OPERATION_OES"/>
>+            <enum name="GL_INVALID_OPERATION"/>
>+            <enum name="GL_INVALID_VALUE"/>
>+            <enum name="GL_NO_ERROR"/>
>+            <enum name="GL_OUT_OF_MEMORY"/>
>+            <enum name="GL_STACK_OVERFLOW"/>
>+            <enum name="GL_STACK_UNDERFLOW"/>
>+            <enum name="GL_TABLE_TOO_LARGE"/>
>+            <enum name="GL_TABLE_TOO_LARGE_EXT"/>
>+            <enum name="GL_TEXTURE_TOO_LARGE_EXT"/>
>+        </group>
>+
>+        <group name="ExternalHandleType">
>+            <enum name="GL_HANDLE_TYPE_OPAQUE_FD_EXT"/>
>+            <enum name="GL_HANDLE_TYPE_OPAQUE_WIN32_EXT"/>
>+            <enum name="GL_HANDLE_TYPE_OPAQUE_WIN32_KMT_EXT"/>
>+            <enum name="GL_HANDLE_TYPE_D3D12_TILEPOOL_EXT"/>
>+            <enum name="GL_HANDLE_TYPE_D3D12_RESOURCE_EXT"/>
>+            <enum name="GL_HANDLE_TYPE_D3D11_IMAGE_EXT"/>
>+            <enum name="GL_HANDLE_TYPE_D3D11_IMAGE_KMT_EXT"/>
>+            <enum name="GL_HANDLE_TYPE_D3D12_FENCE_EXT"/>
>+        </group>
>+
>+        <group name="FeedbackType">
>+            <enum name="GL_2D"/>
>+            <enum name="GL_3D"/>
>+            <enum name="GL_3D_COLOR"/>
>+            <enum name="GL_3D_COLOR_TEXTURE"/>
>+            <enum name="GL_4D_COLOR_TEXTURE"/>
>+        </group>
>+
>+        <group name="FeedBackToken">
>+            <enum name="GL_BITMAP_TOKEN"/>
>+            <enum name="GL_COPY_PIXEL_TOKEN"/>
>+            <enum name="GL_DRAW_PIXEL_TOKEN"/>
>+            <enum name="GL_LINE_RESET_TOKEN"/>
>+            <enum name="GL_LINE_TOKEN"/>
>+            <enum name="GL_PASS_THROUGH_TOKEN"/>
>+            <enum name="GL_POINT_TOKEN"/>
>+            <enum name="GL_POLYGON_TOKEN"/>
>+        </group>
>+
>+        <group name="FfdMaskSGIX" comment="See enums section below. Was SGIXFfdMask"/>
>+
>+        <group name="FfdTargetSGIX">
>+            <enum name="GL_GEOMETRY_DEFORMATION_SGIX"/>
>+            <enum name="GL_TEXTURE_DEFORMATION_SGIX"/>
>+        </group>
>+
>+        <group name="FogCoordinatePointerType">
>+            <enum name="GL_FLOAT"/>
>+            <enum name="GL_DOUBLE"/>
>+        </group>
>+
>+        <group name="FogMode">
>+            <enum name="GL_EXP"/>
>+            <enum name="GL_EXP2"/>
>+            <enum name="GL_FOG_FUNC_SGIS"/>
>+            <enum name="GL_LINEAR"/>
>+        </group>
>+
>+        <group name="FogParameter">
>+            <enum name="GL_FOG_COLOR"/>
>+            <enum name="GL_FOG_DENSITY"/>
>+            <enum name="GL_FOG_END"/>
>+            <enum name="GL_FOG_INDEX"/>
>+            <enum name="GL_FOG_MODE"/>
>+            <enum name="GL_FOG_OFFSET_VALUE_SGIX"/>
>+            <enum name="GL_FOG_START"/>
>+        </group>
>+
>+        <group name="FogPointerTypeEXT">
>+            <enum name="GL_FLOAT"/>
>+            <enum name="GL_DOUBLE"/>
>+        </group>
>+
>+        <group name="FogPointerTypeIBM">
>+            <enum name="GL_FLOAT"/>
>+            <enum name="GL_DOUBLE"/>
>+        </group>
>+
>+        <group name="FragmentLightModelParameterSGIX">
>+            <enum name="GL_FRAGMENT_LIGHT_MODEL_AMBIENT_SGIX"/>
>+            <enum name="GL_FRAGMENT_LIGHT_MODEL_LOCAL_VIEWER_SGIX"/>
>+            <enum name="GL_FRAGMENT_LIGHT_MODEL_NORMAL_INTERPOLATION_SGIX"/>
>+            <enum name="GL_FRAGMENT_LIGHT_MODEL_TWO_SIDE_SGIX"/>
>+        </group>
>+
>+        <group name="FramebufferFetchNoncoherent">
>+            <enum name="GL_FRAMEBUFFER_FETCH_NONCOHERENT_QCOM"/>
>+        </group>
>+
>+        <group name="FrontFaceDirection">
>+            <enum name="GL_CCW"/>
>+            <enum name="GL_CW"/>
>+        </group>
>+
>+        <group name="GetColorTableParameterPNameSGI">
>+            <enum name="GL_COLOR_TABLE_ALPHA_SIZE_SGI"/>
>+            <enum name="GL_COLOR_TABLE_BIAS_SGI"/>
>+            <enum name="GL_COLOR_TABLE_BLUE_SIZE_SGI"/>
>+            <enum name="GL_COLOR_TABLE_FORMAT_SGI"/>
>+            <enum name="GL_COLOR_TABLE_GREEN_SIZE_SGI"/>
>+            <enum name="GL_COLOR_TABLE_INTENSITY_SIZE_SGI"/>
>+            <enum name="GL_COLOR_TABLE_LUMINANCE_SIZE_SGI"/>
>+            <enum name="GL_COLOR_TABLE_RED_SIZE_SGI"/>
>+            <enum name="GL_COLOR_TABLE_SCALE_SGI"/>
>+            <enum name="GL_COLOR_TABLE_WIDTH_SGI"/>
>+            <enum name="GL_COLOR_TABLE_BIAS"/>
>+            <enum name="GL_COLOR_TABLE_SCALE"/>
>+            <enum name="GL_COLOR_TABLE_FORMAT"/>
>+            <enum name="GL_COLOR_TABLE_WIDTH"/>
>+            <enum name="GL_COLOR_TABLE_RED_SIZE"/>
>+            <enum name="GL_COLOR_TABLE_GREEN_SIZE"/>
>+            <enum name="GL_COLOR_TABLE_BLUE_SIZE"/>
>+            <enum name="GL_COLOR_TABLE_ALPHA_SIZE"/>
>+            <enum name="GL_COLOR_TABLE_LUMINANCE_SIZE"/>
>+            <enum name="GL_COLOR_TABLE_INTENSITY_SIZE"/>
>+        </group>
>+
>+        <group name="GetConvolutionParameter">
>+            <enum name="GL_CONVOLUTION_BORDER_MODE_EXT"/>
>+            <enum name="GL_CONVOLUTION_FILTER_BIAS_EXT"/>
>+            <enum name="GL_CONVOLUTION_FILTER_SCALE_EXT"/>
>+            <enum name="GL_CONVOLUTION_FORMAT_EXT"/>
>+            <enum name="GL_CONVOLUTION_HEIGHT_EXT"/>
>+            <enum name="GL_CONVOLUTION_WIDTH_EXT"/>
>+            <enum name="GL_MAX_CONVOLUTION_HEIGHT_EXT"/>
>+            <enum name="GL_MAX_CONVOLUTION_WIDTH_EXT"/>
>+            <enum name="GL_CONVOLUTION_BORDER_MODE"/>
>+            <enum name="GL_CONVOLUTION_BORDER_COLOR"/>
>+            <enum name="GL_CONVOLUTION_FILTER_SCALE"/>
>+            <enum name="GL_CONVOLUTION_FILTER_BIAS"/>
>+            <enum name="GL_CONVOLUTION_FORMAT"/>
>+            <enum name="GL_CONVOLUTION_WIDTH"/>
>+            <enum name="GL_CONVOLUTION_HEIGHT"/>
>+            <enum name="GL_MAX_CONVOLUTION_WIDTH"/>
>+            <enum name="GL_MAX_CONVOLUTION_HEIGHT"/>
>+        </group>
>+
>+        <group name="GetHistogramParameterPNameEXT">
>+            <enum name="GL_HISTOGRAM_ALPHA_SIZE_EXT"/>
>+            <enum name="GL_HISTOGRAM_BLUE_SIZE_EXT"/>
>+            <enum name="GL_HISTOGRAM_FORMAT_EXT"/>
>+            <enum name="GL_HISTOGRAM_GREEN_SIZE_EXT"/>
>+            <enum name="GL_HISTOGRAM_LUMINANCE_SIZE_EXT"/>
>+            <enum name="GL_HISTOGRAM_RED_SIZE_EXT"/>
>+            <enum name="GL_HISTOGRAM_SINK_EXT"/>
>+            <enum name="GL_HISTOGRAM_WIDTH_EXT"/>
>+            <enum name="GL_HISTOGRAM_WIDTH"/>
>+            <enum name="GL_HISTOGRAM_FORMAT"/>
>+            <enum name="GL_HISTOGRAM_RED_SIZE"/>
>+            <enum name="GL_HISTOGRAM_GREEN_SIZE"/>
>+            <enum name="GL_HISTOGRAM_BLUE_SIZE"/>
>+            <enum name="GL_HISTOGRAM_ALPHA_SIZE"/>
>+            <enum name="GL_HISTOGRAM_LUMINANCE_SIZE"/>
>+            <enum name="GL_HISTOGRAM_SINK"/>
>+            <enum name="GL_HISTOGRAM_ALPHA_SIZE_EXT"/>
>+            <enum name="GL_HISTOGRAM_BLUE_SIZE_EXT"/>
>+            <enum name="GL_HISTOGRAM_FORMAT_EXT"/>
>+            <enum name="GL_HISTOGRAM_GREEN_SIZE_EXT"/>
>+            <enum name="GL_HISTOGRAM_LUMINANCE_SIZE_EXT"/>
>+            <enum name="GL_HISTOGRAM_RED_SIZE_EXT"/>
>+            <enum name="GL_HISTOGRAM_SINK_EXT"/>
>+            <enum name="GL_HISTOGRAM_WIDTH_EXT"/>
>+        </group>
>+
>+        <group name="GetMapQuery">
>+            <enum name="GL_COEFF"/>
>+            <enum name="GL_DOMAIN"/>
>+            <enum name="GL_ORDER"/>
>+        </group>
>+
>+        <group name="GetMinmaxParameterPNameEXT">
>+            <enum name="GL_MINMAX_FORMAT"/>
>+            <enum name="GL_MINMAX_FORMAT_EXT"/>
>+            <enum name="GL_MINMAX_SINK"/>
>+            <enum name="GL_MINMAX_SINK_EXT"/>
>+            <enum name="GL_MINMAX_FORMAT"/>
>+            <enum name="GL_MINMAX_SINK"/>
>+        </group>
>+
>+        <group name="GetPixelMap">
>+            <enum name="GL_PIXEL_MAP_A_TO_A"/>
>+            <enum name="GL_PIXEL_MAP_B_TO_B"/>
>+            <enum name="GL_PIXEL_MAP_G_TO_G"/>
>+            <enum name="GL_PIXEL_MAP_I_TO_A"/>
>+            <enum name="GL_PIXEL_MAP_I_TO_B"/>
>+            <enum name="GL_PIXEL_MAP_I_TO_G"/>
>+            <enum name="GL_PIXEL_MAP_I_TO_I"/>
>+            <enum name="GL_PIXEL_MAP_I_TO_R"/>
>+            <enum name="GL_PIXEL_MAP_R_TO_R"/>
>+            <enum name="GL_PIXEL_MAP_S_TO_S"/>
>+        </group>
>+
>+        <group name="GetPName">
>+            <enum name="GL_ACCUM_ALPHA_BITS"/>
>+            <enum name="GL_ACCUM_BLUE_BITS"/>
>+            <enum name="GL_ACCUM_CLEAR_VALUE"/>
>+            <enum name="GL_ACCUM_GREEN_BITS"/>
>+            <enum name="GL_ACCUM_RED_BITS"/>
>+            <enum name="GL_ALIASED_LINE_WIDTH_RANGE"/>
>+            <enum name="GL_ALIASED_POINT_SIZE_RANGE"/>
>+            <enum name="GL_ALPHA_BIAS"/>
>+            <enum name="GL_ALPHA_BITS"/>
>+            <enum name="GL_ALPHA_SCALE"/>
>+            <enum name="GL_ALPHA_TEST"/>
>+            <enum name="GL_ALPHA_TEST_FUNC"/>
>+            <enum name="GL_ALPHA_TEST_FUNC_QCOM"/>
>+            <enum name="GL_ALPHA_TEST_QCOM"/>
>+            <enum name="GL_ALPHA_TEST_REF"/>
>+            <enum name="GL_ALPHA_TEST_REF_QCOM"/>
>+            <enum name="GL_ASYNC_DRAW_PIXELS_SGIX"/>
>+            <enum name="GL_ASYNC_HISTOGRAM_SGIX"/>
>+            <enum name="GL_ASYNC_MARKER_SGIX"/>
>+            <enum name="GL_ASYNC_READ_PIXELS_SGIX"/>
>+            <enum name="GL_ASYNC_TEX_IMAGE_SGIX"/>
>+            <enum name="GL_ATTRIB_STACK_DEPTH"/>
>+            <enum name="GL_AUTO_NORMAL"/>
>+            <enum name="GL_AUX_BUFFERS"/>
>+            <enum name="GL_BLEND"/>
>+            <enum name="GL_BLEND_COLOR_EXT"/>
>+            <enum name="GL_BLEND_DST"/>
>+            <enum name="GL_BLEND_EQUATION_EXT"/>
>+            <enum name="GL_BLEND_SRC"/>
>+            <enum name="GL_BLUE_BIAS"/>
>+            <enum name="GL_BLUE_BITS"/>
>+            <enum name="GL_BLUE_SCALE"/>
>+            <enum name="GL_CALLIGRAPHIC_FRAGMENT_SGIX"/>
>+            <enum name="GL_CLIENT_ATTRIB_STACK_DEPTH"/>
>+            <enum name="GL_CLIP_PLANE0"/>
>+            <enum name="GL_CLIP_PLANE1"/>
>+            <enum name="GL_CLIP_PLANE2"/>
>+            <enum name="GL_CLIP_PLANE3"/>
>+            <enum name="GL_CLIP_PLANE4"/>
>+            <enum name="GL_CLIP_PLANE5"/>
>+            <enum name="GL_COLOR_ARRAY"/>
>+            <enum name="GL_COLOR_ARRAY_COUNT_EXT"/>
>+            <enum name="GL_COLOR_ARRAY_SIZE"/>
>+            <enum name="GL_COLOR_ARRAY_STRIDE"/>
>+            <enum name="GL_COLOR_ARRAY_TYPE"/>
>+            <enum name="GL_COLOR_CLEAR_VALUE"/>
>+            <enum name="GL_COLOR_LOGIC_OP"/>
>+            <enum name="GL_COLOR_MATERIAL"/>
>+            <enum name="GL_COLOR_MATERIAL_FACE"/>
>+            <enum name="GL_COLOR_MATERIAL_PARAMETER"/>
>+            <enum name="GL_COLOR_MATRIX_SGI"/>
>+            <enum name="GL_COLOR_MATRIX_STACK_DEPTH_SGI"/>
>+            <enum name="GL_COLOR_TABLE_SGI"/>
>+            <enum name="GL_COLOR_WRITEMASK"/>
>+            <enum name="GL_CONVOLUTION_1D_EXT"/>
>+            <enum name="GL_CONVOLUTION_2D_EXT"/>
>+            <enum name="GL_CONVOLUTION_HINT_SGIX"/>
>+            <enum name="GL_CULL_FACE"/>
>+            <enum name="GL_CULL_FACE_MODE"/>
>+            <enum name="GL_CURRENT_COLOR"/>
>+            <enum name="GL_CURRENT_INDEX"/>
>+            <enum name="GL_CURRENT_NORMAL"/>
>+            <enum name="GL_CURRENT_RASTER_COLOR"/>
>+            <enum name="GL_CURRENT_RASTER_DISTANCE"/>
>+            <enum name="GL_CURRENT_RASTER_INDEX"/>
>+            <enum name="GL_CURRENT_RASTER_POSITION"/>
>+            <enum name="GL_CURRENT_RASTER_POSITION_VALID"/>
>+            <enum name="GL_CURRENT_RASTER_TEXTURE_COORDS"/>
>+            <enum name="GL_CURRENT_TEXTURE_COORDS"/>
>+            <enum name="GL_DEFORMATIONS_MASK_SGIX"/>
>+            <enum name="GL_DEPTH_BIAS"/>
>+            <enum name="GL_DEPTH_BITS"/>
>+            <enum name="GL_DEPTH_CLEAR_VALUE"/>
>+            <enum name="GL_DEPTH_FUNC"/>
>+            <enum name="GL_DEPTH_RANGE"/>
>+            <enum name="GL_DEPTH_SCALE"/>
>+            <enum name="GL_DEPTH_TEST"/>
>+            <enum name="GL_DEPTH_WRITEMASK"/>
>+            <enum name="GL_DETAIL_TEXTURE_2D_BINDING_SGIS"/>
>+            <enum name="GL_DEVICE_LUID_EXT"/>
>+            <enum name="GL_DEVICE_NODE_MASK_EXT"/>
>+            <enum name="GL_DEVICE_UUID_EXT"/>
>+            <enum name="GL_DISTANCE_ATTENUATION_SGIS"/>
>+            <enum name="GL_DITHER"/>
>+            <enum name="GL_DOUBLEBUFFER"/>
>+            <enum name="GL_DRAW_BUFFER"/>
>+            <enum name="GL_DRAW_BUFFER_EXT"/>
>+            <enum name="GL_DRIVER_UUID_EXT"/>
>+            <enum name="GL_EDGE_FLAG"/>
>+            <enum name="GL_EDGE_FLAG_ARRAY"/>
>+            <enum name="GL_EDGE_FLAG_ARRAY_COUNT_EXT"/>
>+            <enum name="GL_EDGE_FLAG_ARRAY_STRIDE"/>
>+            <enum name="GL_FEEDBACK_BUFFER_SIZE"/>
>+            <enum name="GL_FEEDBACK_BUFFER_TYPE"/>
>+            <enum name="GL_FOG"/>
>+            <enum name="GL_FOG_COLOR"/>
>+            <enum name="GL_FOG_DENSITY"/>
>+            <enum name="GL_FOG_END"/>
>+            <enum name="GL_FOG_FUNC_POINTS_SGIS"/>
>+            <enum name="GL_FOG_HINT"/>
>+            <enum name="GL_FOG_INDEX"/>
>+            <enum name="GL_FOG_MODE"/>
>+            <enum name="GL_FOG_OFFSET_SGIX"/>
>+            <enum name="GL_FOG_OFFSET_VALUE_SGIX"/>
>+            <enum name="GL_FOG_START"/>
>+            <enum name="GL_FRAGMENT_COLOR_MATERIAL_FACE_SGIX"/>
>+            <enum name="GL_FRAGMENT_COLOR_MATERIAL_PARAMETER_SGIX"/>
>+            <enum name="GL_FRAGMENT_COLOR_MATERIAL_SGIX"/>
>+            <enum name="GL_FRAGMENT_LIGHT0_SGIX"/>
>+            <enum name="GL_FRAGMENT_LIGHTING_SGIX"/>
>+            <enum name="GL_FRAGMENT_LIGHT_MODEL_AMBIENT_SGIX"/>
>+            <enum name="GL_FRAGMENT_LIGHT_MODEL_LOCAL_VIEWER_SGIX"/>
>+            <enum name="GL_FRAGMENT_LIGHT_MODEL_NORMAL_INTERPOLATION_SGIX"/>
>+            <enum name="GL_FRAGMENT_LIGHT_MODEL_TWO_SIDE_SGIX"/>
>+            <enum name="GL_FRAMEZOOM_FACTOR_SGIX"/>
>+            <enum name="GL_FRAMEZOOM_SGIX"/>
>+            <enum name="GL_FRONT_FACE"/>
>+            <enum name="GL_GENERATE_MIPMAP_HINT_SGIS"/>
>+            <enum name="GL_GREEN_BIAS"/>
>+            <enum name="GL_GREEN_BITS"/>
>+            <enum name="GL_GREEN_SCALE"/>
>+            <enum name="GL_HISTOGRAM_EXT"/>
>+            <enum name="GL_INDEX_ARRAY"/>
>+            <enum name="GL_INDEX_ARRAY_COUNT_EXT"/>
>+            <enum name="GL_INDEX_ARRAY_STRIDE"/>
>+            <enum name="GL_INDEX_ARRAY_TYPE"/>
>+            <enum name="GL_INDEX_BITS"/>
>+            <enum name="GL_INDEX_CLEAR_VALUE"/>
>+            <enum name="GL_INDEX_LOGIC_OP"/>
>+            <enum name="GL_INDEX_MODE"/>
>+            <enum name="GL_INDEX_OFFSET"/>
>+            <enum name="GL_INDEX_SHIFT"/>
>+            <enum name="GL_INDEX_WRITEMASK"/>
>+            <enum name="GL_INSTRUMENT_MEASUREMENTS_SGIX"/>
>+            <enum name="GL_INTERLACE_SGIX"/>
>+            <enum name="GL_IR_INSTRUMENT1_SGIX"/>
>+            <enum name="GL_LIGHT0"/>
>+            <enum name="GL_LIGHT1"/>
>+            <enum name="GL_LIGHT2"/>
>+            <enum name="GL_LIGHT3"/>
>+            <enum name="GL_LIGHT4"/>
>+            <enum name="GL_LIGHT5"/>
>+            <enum name="GL_LIGHT6"/>
>+            <enum name="GL_LIGHT7"/>
>+            <enum name="GL_LIGHTING"/>
>+            <enum name="GL_LIGHT_ENV_MODE_SGIX"/>
>+            <enum name="GL_LIGHT_MODEL_AMBIENT"/>
>+            <enum name="GL_LIGHT_MODEL_COLOR_CONTROL"/>
>+            <enum name="GL_LIGHT_MODEL_LOCAL_VIEWER"/>
>+            <enum name="GL_LIGHT_MODEL_TWO_SIDE"/>
>+            <enum name="GL_LINE_SMOOTH"/>
>+            <enum name="GL_LINE_SMOOTH_HINT"/>
>+            <enum name="GL_LINE_STIPPLE"/>
>+            <enum name="GL_LINE_STIPPLE_PATTERN"/>
>+            <enum name="GL_LINE_STIPPLE_REPEAT"/>
>+            <enum name="GL_LINE_WIDTH"/>
>+            <enum name="GL_LINE_WIDTH_GRANULARITY"/>
>+            <enum name="GL_LINE_WIDTH_RANGE"/>
>+            <enum name="GL_LIST_BASE"/>
>+            <enum name="GL_LIST_INDEX"/>
>+            <enum name="GL_LIST_MODE"/>
>+            <enum name="GL_LOGIC_OP"/>
>+            <enum name="GL_LOGIC_OP_MODE"/>
>+            <enum name="GL_MAP1_COLOR_4"/>
>+            <enum name="GL_MAP1_GRID_DOMAIN"/>
>+            <enum name="GL_MAP1_GRID_SEGMENTS"/>
>+            <enum name="GL_MAP1_INDEX"/>
>+            <enum name="GL_MAP1_NORMAL"/>
>+            <enum name="GL_MAP1_TEXTURE_COORD_1"/>
>+            <enum name="GL_MAP1_TEXTURE_COORD_2"/>
>+            <enum name="GL_MAP1_TEXTURE_COORD_3"/>
>+            <enum name="GL_MAP1_TEXTURE_COORD_4"/>
>+            <enum name="GL_MAP1_VERTEX_3"/>
>+            <enum name="GL_MAP1_VERTEX_4"/>
>+            <enum name="GL_MAP2_COLOR_4"/>
>+            <enum name="GL_MAP2_GRID_DOMAIN"/>
>+            <enum name="GL_MAP2_GRID_SEGMENTS"/>
>+            <enum name="GL_MAP2_INDEX"/>
>+            <enum name="GL_MAP2_NORMAL"/>
>+            <enum name="GL_MAP2_TEXTURE_COORD_1"/>
>+            <enum name="GL_MAP2_TEXTURE_COORD_2"/>
>+            <enum name="GL_MAP2_TEXTURE_COORD_3"/>
>+            <enum name="GL_MAP2_TEXTURE_COORD_4"/>
>+            <enum name="GL_MAP2_VERTEX_3"/>
>+            <enum name="GL_MAP2_VERTEX_4"/>
>+            <enum name="GL_MAP_COLOR"/>
>+            <enum name="GL_MAP_STENCIL"/>
>+            <enum name="GL_MATRIX_MODE"/>
>+            <enum name="GL_MAX_3D_TEXTURE_SIZE_EXT"/>
>+            <enum name="GL_MAX_4D_TEXTURE_SIZE_SGIS"/>
>+            <enum name="GL_MAX_ACTIVE_LIGHTS_SGIX"/>
>+            <enum name="GL_MAX_ASYNC_DRAW_PIXELS_SGIX"/>
>+            <enum name="GL_MAX_ASYNC_HISTOGRAM_SGIX"/>
>+            <enum name="GL_MAX_ASYNC_READ_PIXELS_SGIX"/>
>+            <enum name="GL_MAX_ASYNC_TEX_IMAGE_SGIX"/>
>+            <enum name="GL_MAX_ATTRIB_STACK_DEPTH"/>
>+            <enum name="GL_MAX_CLIENT_ATTRIB_STACK_DEPTH"/>
>+            <enum name="GL_MAX_CLIPMAP_DEPTH_SGIX"/>
>+            <enum name="GL_MAX_CLIPMAP_VIRTUAL_DEPTH_SGIX"/>
>+            <enum name="GL_MAX_CLIP_DISTANCES"/>
>+            <enum name="GL_MAX_CLIP_PLANES"/>
>+            <enum name="GL_MAX_COLOR_MATRIX_STACK_DEPTH_SGI"/>
>+            <enum name="GL_MAX_EVAL_ORDER"/>
>+            <enum name="GL_MAX_FOG_FUNC_POINTS_SGIS"/>
>+            <enum name="GL_MAX_FRAGMENT_LIGHTS_SGIX"/>
>+            <enum name="GL_MAX_FRAMEZOOM_FACTOR_SGIX"/>
>+            <enum name="GL_MAX_LIGHTS"/>
>+            <enum name="GL_MAX_LIST_NESTING"/>
>+            <enum name="GL_MAX_MODELVIEW_STACK_DEPTH"/>
>+            <enum name="GL_MAX_NAME_STACK_DEPTH"/>
>+            <enum name="GL_MAX_PIXEL_MAP_TABLE"/>
>+            <enum name="GL_MAX_PROJECTION_STACK_DEPTH"/>
>+            <enum name="GL_MAX_TEXTURE_SIZE"/>
>+            <enum name="GL_MAX_TEXTURE_STACK_DEPTH"/>
>+            <enum name="GL_MAX_VIEWPORT_DIMS"/>
>+            <enum name="GL_MINMAX_EXT"/>
>+            <enum name="GL_MODELVIEW0_MATRIX_EXT"/>
>+            <enum name="GL_MODELVIEW0_STACK_DEPTH_EXT"/>
>+            <enum name="GL_MODELVIEW_MATRIX"/>
>+            <enum name="GL_MODELVIEW_STACK_DEPTH"/>
>+            <enum name="GL_MULTISAMPLE_SGIS"/>
>+            <enum name="GL_NAME_STACK_DEPTH"/>
>+            <enum name="GL_NORMALIZE"/>
>+            <enum name="GL_NORMAL_ARRAY"/>
>+            <enum name="GL_NORMAL_ARRAY_COUNT_EXT"/>
>+            <enum name="GL_NORMAL_ARRAY_STRIDE"/>
>+            <enum name="GL_NORMAL_ARRAY_TYPE"/>
>+            <enum name="GL_NUM_DEVICE_UUIDS_EXT"/>
>+            <enum name="GL_PACK_ALIGNMENT"/>
>+            <enum name="GL_PACK_CMYK_HINT_EXT"/>
>+            <enum name="GL_PACK_IMAGE_DEPTH_SGIS"/>
>+            <enum name="GL_PACK_IMAGE_HEIGHT_EXT"/>
>+            <enum name="GL_PACK_LSB_FIRST"/>
>+            <enum name="GL_PACK_RESAMPLE_SGIX"/>
>+            <enum name="GL_PACK_ROW_LENGTH"/>
>+            <enum name="GL_PACK_SKIP_IMAGES_EXT"/>
>+            <enum name="GL_PACK_SKIP_PIXELS"/>
>+            <enum name="GL_PACK_SKIP_ROWS"/>
>+            <enum name="GL_PACK_SKIP_VOLUMES_SGIS"/>
>+            <enum name="GL_PACK_SUBSAMPLE_RATE_SGIX"/>
>+            <enum name="GL_PACK_SWAP_BYTES"/>
>+            <enum name="GL_PERSPECTIVE_CORRECTION_HINT"/>
>+            <enum name="GL_PIXEL_MAP_A_TO_A_SIZE"/>
>+            <enum name="GL_PIXEL_MAP_B_TO_B_SIZE"/>
>+            <enum name="GL_PIXEL_MAP_G_TO_G_SIZE"/>
>+            <enum name="GL_PIXEL_MAP_I_TO_A_SIZE"/>
>+            <enum name="GL_PIXEL_MAP_I_TO_B_SIZE"/>
>+            <enum name="GL_PIXEL_MAP_I_TO_G_SIZE"/>
>+            <enum name="GL_PIXEL_MAP_I_TO_I_SIZE"/>
>+            <enum name="GL_PIXEL_MAP_I_TO_R_SIZE"/>
>+            <enum name="GL_PIXEL_MAP_R_TO_R_SIZE"/>
>+            <enum name="GL_PIXEL_MAP_S_TO_S_SIZE"/>
>+            <enum name="GL_PIXEL_TEXTURE_SGIS"/>
>+            <enum name="GL_PIXEL_TEX_GEN_MODE_SGIX"/>
>+            <enum name="GL_PIXEL_TEX_GEN_SGIX"/>
>+            <enum name="GL_PIXEL_TILE_BEST_ALIGNMENT_SGIX"/>
>+            <enum name="GL_PIXEL_TILE_CACHE_INCREMENT_SGIX"/>
>+            <enum name="GL_PIXEL_TILE_CACHE_SIZE_SGIX"/>
>+            <enum name="GL_PIXEL_TILE_GRID_DEPTH_SGIX"/>
>+            <enum name="GL_PIXEL_TILE_GRID_HEIGHT_SGIX"/>
>+            <enum name="GL_PIXEL_TILE_GRID_WIDTH_SGIX"/>
>+            <enum name="GL_PIXEL_TILE_HEIGHT_SGIX"/>
>+            <enum name="GL_PIXEL_TILE_WIDTH_SGIX"/>
>+            <enum name="GL_POINT_FADE_THRESHOLD_SIZE_SGIS"/>
>+            <enum name="GL_POINT_SIZE"/>
>+            <enum name="GL_POINT_SIZE_GRANULARITY"/>
>+            <enum name="GL_POINT_SIZE_MAX_SGIS"/>
>+            <enum name="GL_POINT_SIZE_MIN_SGIS"/>
>+            <enum name="GL_POINT_SIZE_RANGE"/>
>+            <enum name="GL_POINT_SMOOTH"/>
>+            <enum name="GL_POINT_SMOOTH_HINT"/>
>+            <enum name="GL_POLYGON_MODE"/>
>+            <enum name="GL_POLYGON_OFFSET_BIAS_EXT"/>
>+            <enum name="GL_POLYGON_OFFSET_FACTOR"/>
>+            <enum name="GL_POLYGON_OFFSET_FILL"/>
>+            <enum name="GL_POLYGON_OFFSET_LINE"/>
>+            <enum name="GL_POLYGON_OFFSET_POINT"/>
>+            <enum name="GL_POLYGON_OFFSET_UNITS"/>
>+            <enum name="GL_POLYGON_SMOOTH"/>
>+            <enum name="GL_POLYGON_SMOOTH_HINT"/>
>+            <enum name="GL_POLYGON_STIPPLE"/>
>+            <enum name="GL_POST_COLOR_MATRIX_ALPHA_BIAS_SGI"/>
>+            <enum name="GL_POST_COLOR_MATRIX_ALPHA_SCALE_SGI"/>
>+            <enum name="GL_POST_COLOR_MATRIX_BLUE_BIAS_SGI"/>
>+            <enum name="GL_POST_COLOR_MATRIX_BLUE_SCALE_SGI"/>
>+            <enum name="GL_POST_COLOR_MATRIX_COLOR_TABLE_SGI"/>
>+            <enum name="GL_POST_COLOR_MATRIX_GREEN_BIAS_SGI"/>
>+            <enum name="GL_POST_COLOR_MATRIX_GREEN_SCALE_SGI"/>
>+            <enum name="GL_POST_COLOR_MATRIX_RED_BIAS_SGI"/>
>+            <enum name="GL_POST_COLOR_MATRIX_RED_SCALE_SGI"/>
>+            <enum name="GL_POST_CONVOLUTION_ALPHA_BIAS_EXT"/>
>+            <enum name="GL_POST_CONVOLUTION_ALPHA_SCALE_EXT"/>
>+            <enum name="GL_POST_CONVOLUTION_BLUE_BIAS_EXT"/>
>+            <enum name="GL_POST_CONVOLUTION_BLUE_SCALE_EXT"/>
>+            <enum name="GL_POST_CONVOLUTION_COLOR_TABLE_SGI"/>
>+            <enum name="GL_POST_CONVOLUTION_GREEN_BIAS_EXT"/>
>+            <enum name="GL_POST_CONVOLUTION_GREEN_SCALE_EXT"/>
>+            <enum name="GL_POST_CONVOLUTION_RED_BIAS_EXT"/>
>+            <enum name="GL_POST_CONVOLUTION_RED_SCALE_EXT"/>
>+            <enum name="GL_POST_TEXTURE_FILTER_BIAS_RANGE_SGIX"/>
>+            <enum name="GL_POST_TEXTURE_FILTER_SCALE_RANGE_SGIX"/>
>+            <enum name="GL_PROJECTION_MATRIX"/>
>+            <enum name="GL_PROJECTION_STACK_DEPTH"/>
>+            <enum name="GL_READ_BUFFER"/>
>+            <enum name="GL_READ_BUFFER_EXT"/>
>+            <enum name="GL_READ_BUFFER_NV"/>
>+            <enum name="GL_RED_BIAS"/>
>+            <enum name="GL_RED_BITS"/>
>+            <enum name="GL_RED_SCALE"/>
>+            <enum name="GL_REFERENCE_PLANE_EQUATION_SGIX"/>
>+            <enum name="GL_REFERENCE_PLANE_SGIX"/>
>+            <enum name="GL_RENDER_MODE"/>
>+            <enum name="GL_RESCALE_NORMAL_EXT"/>
>+            <enum name="GL_RGBA_MODE"/>
>+            <enum name="GL_SAMPLES_SGIS"/>
>+            <enum name="GL_SAMPLE_ALPHA_TO_MASK_SGIS"/>
>+            <enum name="GL_SAMPLE_ALPHA_TO_ONE_SGIS"/>
>+            <enum name="GL_SAMPLE_BUFFERS_SGIS"/>
>+            <enum name="GL_SAMPLE_MASK_INVERT_SGIS"/>
>+            <enum name="GL_SAMPLE_MASK_SGIS"/>
>+            <enum name="GL_SAMPLE_MASK_VALUE_SGIS"/>
>+            <enum name="GL_SAMPLE_PATTERN_SGIS"/>
>+            <enum name="GL_SCISSOR_BOX"/>
>+            <enum name="GL_SCISSOR_TEST"/>
>+            <enum name="GL_SELECTION_BUFFER_SIZE"/>
>+            <enum name="GL_SEPARABLE_2D_EXT"/>
>+            <enum name="GL_SHADE_MODEL"/>
>+            <enum name="GL_SHARED_TEXTURE_PALETTE_EXT"/>
>+            <enum name="GL_SMOOTH_LINE_WIDTH_GRANULARITY"/>
>+            <enum name="GL_SMOOTH_LINE_WIDTH_RANGE"/>
>+            <enum name="GL_SMOOTH_POINT_SIZE_GRANULARITY"/>
>+            <enum name="GL_SMOOTH_POINT_SIZE_RANGE"/>
>+            <enum name="GL_SPRITE_AXIS_SGIX"/>
>+            <enum name="GL_SPRITE_MODE_SGIX"/>
>+            <enum name="GL_SPRITE_SGIX"/>
>+            <enum name="GL_SPRITE_TRANSLATION_SGIX"/>
>+            <enum name="GL_STENCIL_BITS"/>
>+            <enum name="GL_STENCIL_CLEAR_VALUE"/>
>+            <enum name="GL_STENCIL_FAIL"/>
>+            <enum name="GL_STENCIL_FUNC"/>
>+            <enum name="GL_STENCIL_PASS_DEPTH_FAIL"/>
>+            <enum name="GL_STENCIL_PASS_DEPTH_PASS"/>
>+            <enum name="GL_STENCIL_REF"/>
>+            <enum name="GL_STENCIL_TEST"/>
>+            <enum name="GL_STENCIL_VALUE_MASK"/>
>+            <enum name="GL_STENCIL_WRITEMASK"/>
>+            <enum name="GL_STEREO"/>
>+            <enum name="GL_SUBPIXEL_BITS"/>
>+            <enum name="GL_TEXTURE_1D"/>
>+            <enum name="GL_TEXTURE_2D"/>
>+            <enum name="GL_TEXTURE_3D_BINDING_EXT"/>
>+            <enum name="GL_TEXTURE_3D_EXT"/>
>+            <enum name="GL_TEXTURE_4D_BINDING_SGIS"/>
>+            <enum name="GL_TEXTURE_4D_SGIS"/>
>+            <enum name="GL_TEXTURE_BINDING_1D"/>
>+            <enum name="GL_TEXTURE_BINDING_2D"/>
>+            <enum name="GL_TEXTURE_BINDING_3D"/>
>+            <enum name="GL_TEXTURE_COLOR_TABLE_SGI"/>
>+            <enum name="GL_TEXTURE_COORD_ARRAY"/>
>+            <enum name="GL_TEXTURE_COORD_ARRAY_COUNT_EXT"/>
>+            <enum name="GL_TEXTURE_COORD_ARRAY_SIZE"/>
>+            <enum name="GL_TEXTURE_COORD_ARRAY_STRIDE"/>
>+            <enum name="GL_TEXTURE_COORD_ARRAY_TYPE"/>
>+            <enum name="GL_TEXTURE_GEN_Q"/>
>+            <enum name="GL_TEXTURE_GEN_R"/>
>+            <enum name="GL_TEXTURE_GEN_S"/>
>+            <enum name="GL_TEXTURE_GEN_T"/>
>+            <enum name="GL_TEXTURE_MATRIX"/>
>+            <enum name="GL_TEXTURE_STACK_DEPTH"/>
>+            <enum name="GL_UNPACK_ALIGNMENT"/>
>+            <enum name="GL_UNPACK_CMYK_HINT_EXT"/>
>+            <enum name="GL_UNPACK_IMAGE_DEPTH_SGIS"/>
>+            <enum name="GL_UNPACK_IMAGE_HEIGHT_EXT"/>
>+            <enum name="GL_UNPACK_LSB_FIRST"/>
>+            <enum name="GL_UNPACK_RESAMPLE_SGIX"/>
>+            <enum name="GL_UNPACK_ROW_LENGTH"/>
>+            <enum name="GL_UNPACK_SKIP_IMAGES_EXT"/>
>+            <enum name="GL_UNPACK_SKIP_PIXELS"/>
>+            <enum name="GL_UNPACK_SKIP_ROWS"/>
>+            <enum name="GL_UNPACK_SKIP_VOLUMES_SGIS"/>
>+            <enum name="GL_UNPACK_SUBSAMPLE_RATE_SGIX"/>
>+            <enum name="GL_UNPACK_SWAP_BYTES"/>
>+            <enum name="GL_VERTEX_ARRAY"/>
>+            <enum name="GL_VERTEX_ARRAY_COUNT_EXT"/>
>+            <enum name="GL_VERTEX_ARRAY_SIZE"/>
>+            <enum name="GL_VERTEX_ARRAY_STRIDE"/>
>+            <enum name="GL_VERTEX_ARRAY_TYPE"/>
>+            <enum name="GL_VERTEX_PRECLIP_HINT_SGIX"/>
>+            <enum name="GL_VERTEX_PRECLIP_SGIX"/>
>+            <enum name="GL_VIEWPORT"/>
>+            <enum name="GL_ZOOM_X"/>
>+            <enum name="GL_ZOOM_Y"/>
>+        </group>
>+
>+        <group name="GetPointervPName">
>+            <enum name="GL_COLOR_ARRAY_POINTER"/>
>+            <enum name="GL_COLOR_ARRAY_POINTER_EXT"/>
>+            <enum name="GL_EDGE_FLAG_ARRAY_POINTER"/>
>+            <enum name="GL_EDGE_FLAG_ARRAY_POINTER_EXT"/>
>+            <enum name="GL_FEEDBACK_BUFFER_POINTER"/>
>+            <enum name="GL_INDEX_ARRAY_POINTER"/>
>+            <enum name="GL_INDEX_ARRAY_POINTER_EXT"/>
>+            <enum name="GL_INSTRUMENT_BUFFER_POINTER_SGIX"/>
>+            <enum name="GL_NORMAL_ARRAY_POINTER"/>
>+            <enum name="GL_NORMAL_ARRAY_POINTER_EXT"/>
>+            <enum name="GL_SELECTION_BUFFER_POINTER"/>
>+            <enum name="GL_TEXTURE_COORD_ARRAY_POINTER"/>
>+            <enum name="GL_TEXTURE_COORD_ARRAY_POINTER_EXT"/>
>+            <enum name="GL_VERTEX_ARRAY_POINTER"/>
>+            <enum name="GL_VERTEX_ARRAY_POINTER_EXT"/>
>+            <enum name="GL_DEBUG_CALLBACK_FUNCTION"/>
>+            <enum name="GL_DEBUG_CALLBACK_USER_PARAM"/>
>+        </group>
>+
>+        <group name="GetTextureParameter">
>+            <enum name="GL_DETAIL_TEXTURE_FUNC_POINTS_SGIS"/>
>+            <enum name="GL_DETAIL_TEXTURE_LEVEL_SGIS"/>
>+            <enum name="GL_DETAIL_TEXTURE_MODE_SGIS"/>
>+            <enum name="GL_DUAL_TEXTURE_SELECT_SGIS"/>
>+            <enum name="GL_GENERATE_MIPMAP_SGIS"/>
>+            <enum name="GL_POST_TEXTURE_FILTER_BIAS_SGIX"/>
>+            <enum name="GL_POST_TEXTURE_FILTER_SCALE_SGIX"/>
>+            <enum name="GL_QUAD_TEXTURE_SELECT_SGIS"/>
>+            <enum name="GL_SHADOW_AMBIENT_SGIX"/>
>+            <enum name="GL_SHARPEN_TEXTURE_FUNC_POINTS_SGIS"/>
>+            <enum name="GL_TEXTURE_4DSIZE_SGIS"/>
>+            <enum name="GL_TEXTURE_ALPHA_SIZE"/>
>+            <enum name="GL_TEXTURE_BASE_LEVEL_SGIS"/>
>+            <enum name="GL_TEXTURE_BLUE_SIZE"/>
>+            <enum name="GL_TEXTURE_BORDER"/>
>+            <enum name="GL_TEXTURE_BORDER_COLOR"/>
>+            <enum name="GL_TEXTURE_BORDER_COLOR_NV"/>
>+            <enum name="GL_TEXTURE_CLIPMAP_CENTER_SGIX"/>
>+            <enum name="GL_TEXTURE_CLIPMAP_DEPTH_SGIX"/>
>+            <enum name="GL_TEXTURE_CLIPMAP_FRAME_SGIX"/>
>+            <enum name="GL_TEXTURE_CLIPMAP_LOD_OFFSET_SGIX"/>
>+            <enum name="GL_TEXTURE_CLIPMAP_OFFSET_SGIX"/>
>+            <enum name="GL_TEXTURE_CLIPMAP_VIRTUAL_DEPTH_SGIX"/>
>+            <enum name="GL_TEXTURE_COMPARE_OPERATOR_SGIX"/>
>+            <enum name="GL_TEXTURE_COMPARE_SGIX"/>
>+            <enum name="GL_TEXTURE_COMPONENTS"/>
>+            <enum name="GL_TEXTURE_DEPTH_EXT"/>
>+            <enum name="GL_TEXTURE_FILTER4_SIZE_SGIS"/>
>+            <enum name="GL_TEXTURE_GEQUAL_R_SGIX"/>
>+            <enum name="GL_TEXTURE_GREEN_SIZE"/>
>+            <enum name="GL_TEXTURE_HEIGHT"/>
>+            <enum name="GL_TEXTURE_INTENSITY_SIZE"/>
>+            <enum name="GL_TEXTURE_INTERNAL_FORMAT"/>
>+            <enum name="GL_TEXTURE_LEQUAL_R_SGIX"/>
>+            <enum name="GL_TEXTURE_LOD_BIAS_R_SGIX"/>
>+            <enum name="GL_TEXTURE_LOD_BIAS_S_SGIX"/>
>+            <enum name="GL_TEXTURE_LOD_BIAS_T_SGIX"/>
>+            <enum name="GL_TEXTURE_LUMINANCE_SIZE"/>
>+            <enum name="GL_TEXTURE_MAG_FILTER"/>
>+            <enum name="GL_TEXTURE_MAX_CLAMP_R_SGIX"/>
>+            <enum name="GL_TEXTURE_MAX_CLAMP_S_SGIX"/>
>+            <enum name="GL_TEXTURE_MAX_CLAMP_T_SGIX"/>
>+            <enum name="GL_TEXTURE_MAX_LEVEL_SGIS"/>
>+            <enum name="GL_TEXTURE_MAX_LOD_SGIS"/>
>+            <enum name="GL_TEXTURE_MIN_FILTER"/>
>+            <enum name="GL_TEXTURE_MIN_LOD_SGIS"/>
>+            <enum name="GL_TEXTURE_PRIORITY"/>
>+            <enum name="GL_TEXTURE_RED_SIZE"/>
>+            <enum name="GL_TEXTURE_RESIDENT"/>
>+            <enum name="GL_TEXTURE_WIDTH"/>
>+            <enum name="GL_TEXTURE_WRAP_Q_SGIS"/>
>+            <enum name="GL_TEXTURE_WRAP_R_EXT"/>
>+            <enum name="GL_TEXTURE_WRAP_S"/>
>+            <enum name="GL_TEXTURE_WRAP_T"/>
>+        </group>
>+
>+        <group name="HintMode">
>+            <enum name="GL_DONT_CARE"/>
>+            <enum name="GL_FASTEST"/>
>+            <enum name="GL_NICEST"/>
>+        </group>
>+
>+        <group name="HintTarget">
>+            <enum name="GL_ALLOW_DRAW_FRG_HINT_PGI"/>
>+            <enum name="GL_ALLOW_DRAW_MEM_HINT_PGI"/>
>+            <enum name="GL_ALLOW_DRAW_OBJ_HINT_PGI"/>
>+            <enum name="GL_ALLOW_DRAW_WIN_HINT_PGI"/>
>+            <enum name="GL_ALWAYS_FAST_HINT_PGI"/>
>+            <enum name="GL_ALWAYS_SOFT_HINT_PGI"/>
>+            <enum name="GL_BACK_NORMALS_HINT_PGI"/>
>+            <enum name="GL_BINNING_CONTROL_HINT_QCOM"/>
>+            <enum name="GL_CLIP_FAR_HINT_PGI"/>
>+            <enum name="GL_CLIP_NEAR_HINT_PGI"/>
>+            <enum name="GL_CLIP_VOLUME_CLIPPING_HINT_EXT"/>
>+            <enum name="GL_CONSERVE_MEMORY_HINT_PGI"/>
>+            <enum name="GL_CONVOLUTION_HINT_SGIX"/>
>+            <enum name="GL_FOG_HINT"/>
>+            <enum name="GL_FRAGMENT_SHADER_DERIVATIVE_HINT"/>
>+            <enum name="GL_FRAGMENT_SHADER_DERIVATIVE_HINT_ARB"/>
>+            <enum name="GL_FRAGMENT_SHADER_DERIVATIVE_HINT_OES"/>
>+            <enum name="GL_FULL_STIPPLE_HINT_PGI"/>
>+            <enum name="GL_GENERATE_MIPMAP_HINT"/>
>+            <enum name="GL_GENERATE_MIPMAP_HINT_SGIS"/>
>+            <enum name="GL_LINE_QUALITY_HINT_SGIX"/>
>+            <enum name="GL_LINE_SMOOTH_HINT"/>
>+            <enum name="GL_MATERIAL_SIDE_HINT_PGI"/>
>+            <enum name="GL_MAX_VERTEX_HINT_PGI"/>
>+            <enum name="GL_MULTISAMPLE_FILTER_HINT_NV"/>
>+            <enum name="GL_NATIVE_GRAPHICS_BEGIN_HINT_PGI"/>
>+            <enum name="GL_NATIVE_GRAPHICS_END_HINT_PGI"/>
>+            <enum name="GL_PACK_CMYK_HINT_EXT"/>
>+            <enum name="GL_PERSPECTIVE_CORRECTION_HINT"/>
>+            <enum name="GL_PHONG_HINT_WIN"/>
>+            <enum name="GL_POINT_SMOOTH_HINT"/>
>+            <enum name="GL_POLYGON_SMOOTH_HINT"/>
>+            <enum name="GL_PREFER_DOUBLEBUFFER_HINT_PGI"/>
>+            <enum name="GL_PROGRAM_BINARY_RETRIEVABLE_HINT"/>
>+            <enum name="GL_RECLAIM_MEMORY_HINT_PGI"/>
>+            <enum name="GL_SCALEBIAS_HINT_SGIX"/>
>+            <enum name="GL_STRICT_DEPTHFUNC_HINT_PGI"/>
>+            <enum name="GL_STRICT_LIGHTING_HINT_PGI"/>
>+            <enum name="GL_STRICT_SCISSOR_HINT_PGI"/>
>+            <enum name="GL_TEXTURE_COMPRESSION_HINT"/>
>+            <enum name="GL_TEXTURE_COMPRESSION_HINT_ARB"/>
>+            <enum name="GL_TEXTURE_MULTI_BUFFER_HINT_SGIX"/>
>+            <enum name="GL_TEXTURE_STORAGE_HINT_APPLE"/>
>+            <enum name="GL_TRANSFORM_HINT_APPLE"/>
>+            <enum name="GL_UNPACK_CMYK_HINT_EXT"/>
>+            <enum name="GL_VERTEX_ARRAY_STORAGE_HINT_APPLE"/>
>+            <enum name="GL_VERTEX_CONSISTENT_HINT_PGI"/>
>+            <enum name="GL_VERTEX_DATA_HINT_PGI"/>
>+            <enum name="GL_VERTEX_PRECLIP_HINT_SGIX"/>
>+            <enum name="GL_VERTEX_PRECLIP_SGIX"/>
>+            <enum name="GL_WIDE_LINE_HINT_PGI"/>
>+        </group>
>+
>+        <group name="HistogramTargetEXT">
>+            <enum name="GL_HISTOGRAM"/>
>+            <enum name="GL_HISTOGRAM_EXT"/>
>+            <enum name="GL_PROXY_HISTOGRAM"/>
>+            <enum name="GL_PROXY_HISTOGRAM_EXT"/>
>+            <enum name="GL_HISTOGRAM"/>
>+            <enum name="GL_PROXY_HISTOGRAM"/>
>+        </group>
>+
>+        <group name="IndexPointerType">
>+            <enum name="GL_DOUBLE"/>
>+            <enum name="GL_FLOAT"/>
>+            <enum name="GL_INT"/>
>+            <enum name="GL_SHORT"/>
>+        </group>
>+
>+        <group name="InterleavedArrayFormat">
>+            <enum name="GL_C3F_V3F"/>
>+            <enum name="GL_C4F_N3F_V3F"/>
>+            <enum name="GL_C4UB_V2F"/>
>+            <enum name="GL_C4UB_V3F"/>
>+            <enum name="GL_N3F_V3F"/>
>+            <enum name="GL_T2F_C3F_V3F"/>
>+            <enum name="GL_T2F_C4F_N3F_V3F"/>
>+            <enum name="GL_T2F_C4UB_V3F"/>
>+            <enum name="GL_T2F_N3F_V3F"/>
>+            <enum name="GL_T2F_V3F"/>
>+            <enum name="GL_T4F_C4F_N3F_V4F"/>
>+            <enum name="GL_T4F_V4F"/>
>+            <enum name="GL_V2F"/>
>+            <enum name="GL_V3F"/>
>+        </group>
>+
>+        <group name="LightEnvModeSGIX">
>+            <enum name="GL_ADD"/>
>+            <enum name="GL_MODULATE"/>
>+            <enum name="GL_REPLACE"/>
>+        </group>
>+
>+        <group name="LightEnvParameterSGIX">
>+            <enum name="GL_LIGHT_ENV_MODE_SGIX"/>
>+        </group>
>+
>+        <group name="LightModelColorControl">
>+            <enum name="GL_SEPARATE_SPECULAR_COLOR"/>
>+            <enum name="GL_SEPARATE_SPECULAR_COLOR_EXT"/>
>+            <enum name="GL_SINGLE_COLOR"/>
>+            <enum name="GL_SINGLE_COLOR_EXT"/>
>+        </group>
>+
>+        <group name="LightModelParameter">
>+            <enum name="GL_LIGHT_MODEL_AMBIENT"/>
>+            <enum name="GL_LIGHT_MODEL_COLOR_CONTROL"/>
>+            <enum name="GL_LIGHT_MODEL_COLOR_CONTROL_EXT"/>
>+            <enum name="GL_LIGHT_MODEL_LOCAL_VIEWER"/>
>+            <enum name="GL_LIGHT_MODEL_TWO_SIDE"/>
>+        </group>
>+
>+        <group name="LightName">
>+            <enum name="GL_FRAGMENT_LIGHT0_SGIX"/>
>+            <enum name="GL_FRAGMENT_LIGHT1_SGIX"/>
>+            <enum name="GL_FRAGMENT_LIGHT2_SGIX"/>
>+            <enum name="GL_FRAGMENT_LIGHT3_SGIX"/>
>+            <enum name="GL_FRAGMENT_LIGHT4_SGIX"/>
>+            <enum name="GL_FRAGMENT_LIGHT5_SGIX"/>
>+            <enum name="GL_FRAGMENT_LIGHT6_SGIX"/>
>+            <enum name="GL_FRAGMENT_LIGHT7_SGIX"/>
>+            <enum name="GL_LIGHT0"/>
>+            <enum name="GL_LIGHT1"/>
>+            <enum name="GL_LIGHT2"/>
>+            <enum name="GL_LIGHT3"/>
>+            <enum name="GL_LIGHT4"/>
>+            <enum name="GL_LIGHT5"/>
>+            <enum name="GL_LIGHT6"/>
>+            <enum name="GL_LIGHT7"/>
>+        </group>
>+
>+        <group name="LightParameter">
>+            <enum name="GL_AMBIENT"/>
>+            <enum name="GL_CONSTANT_ATTENUATION"/>
>+            <enum name="GL_DIFFUSE"/>
>+            <enum name="GL_LINEAR_ATTENUATION"/>
>+            <enum name="GL_POSITION"/>
>+            <enum name="GL_QUADRATIC_ATTENUATION"/>
>+            <enum name="GL_SPECULAR"/>
>+            <enum name="GL_SPOT_CUTOFF"/>
>+            <enum name="GL_SPOT_DIRECTION"/>
>+            <enum name="GL_SPOT_EXPONENT"/>
>+        </group>
>+
>+        <group name="ListMode">
>+            <enum name="GL_COMPILE"/>
>+            <enum name="GL_COMPILE_AND_EXECUTE"/>
>+        </group>
>+
>+        <group name="ListNameType">
>+            <enum name="GL_2_BYTES"/>
>+            <enum name="GL_3_BYTES"/>
>+            <enum name="GL_4_BYTES"/>
>+            <enum name="GL_BYTE"/>
>+            <enum name="GL_FLOAT"/>
>+            <enum name="GL_INT"/>
>+            <enum name="GL_SHORT"/>
>+            <enum name="GL_UNSIGNED_BYTE"/>
>+            <enum name="GL_UNSIGNED_INT"/>
>+            <enum name="GL_UNSIGNED_SHORT"/>
>+        </group>
>+
>+        <group name="ListParameterName">
>+            <enum name="GL_LIST_PRIORITY_SGIX"/>
>+        </group>
>+
>+        <group name="LogicOp">
>+            <enum name="GL_AND"/>
>+            <enum name="GL_AND_INVERTED"/>
>+            <enum name="GL_AND_REVERSE"/>
>+            <enum name="GL_CLEAR"/>
>+            <enum name="GL_COPY"/>
>+            <enum name="GL_COPY_INVERTED"/>
>+            <enum name="GL_EQUIV"/>
>+            <enum name="GL_INVERT"/>
>+            <enum name="GL_NAND"/>
>+            <enum name="GL_NOOP"/>
>+            <enum name="GL_NOR"/>
>+            <enum name="GL_OR"/>
>+            <enum name="GL_OR_INVERTED"/>
>+            <enum name="GL_OR_REVERSE"/>
>+            <enum name="GL_SET"/>
>+            <enum name="GL_XOR"/>
>+        </group>
>+
>+        <group name="MapBufferUsageMask">
>+            <enum name="GL_CLIENT_STORAGE_BIT"/>
>+            <enum name="GL_CLIENT_STORAGE_BIT_EXT"/>
>+            <enum name="GL_DYNAMIC_STORAGE_BIT"/>
>+            <enum name="GL_DYNAMIC_STORAGE_BIT_EXT"/>
>+            <enum name="GL_MAP_COHERENT_BIT"/>
>+            <enum name="GL_MAP_COHERENT_BIT_EXT"/>
>+            <enum name="GL_MAP_FLUSH_EXPLICIT_BIT"/>
>+            <enum name="GL_MAP_FLUSH_EXPLICIT_BIT_EXT"/>
>+            <enum name="GL_MAP_INVALIDATE_BUFFER_BIT"/>
>+            <enum name="GL_MAP_INVALIDATE_BUFFER_BIT_EXT"/>
>+            <enum name="GL_MAP_INVALIDATE_RANGE_BIT"/>
>+            <enum name="GL_MAP_INVALIDATE_RANGE_BIT_EXT"/>
>+            <enum name="GL_MAP_PERSISTENT_BIT"/>
>+            <enum name="GL_MAP_PERSISTENT_BIT_EXT"/>
>+            <enum name="GL_MAP_READ_BIT"/>
>+            <enum name="GL_MAP_READ_BIT_EXT"/>
>+            <enum name="GL_MAP_UNSYNCHRONIZED_BIT"/>
>+            <enum name="GL_MAP_UNSYNCHRONIZED_BIT_EXT"/>
>+            <enum name="GL_MAP_WRITE_BIT"/>
>+            <enum name="GL_MAP_WRITE_BIT_EXT"/>
>+            <enum name="GL_SPARSE_STORAGE_BIT_ARB"/>
>+            <enum name="GL_LGPU_SEPARATE_STORAGE_BIT_NVX"/>
>+            <enum name="GL_PER_GPU_STORAGE_BIT_NV"/>
>+        </group>
>+
>+        <group name="MapTarget">
>+            <enum name="GL_GEOMETRY_DEFORMATION_SGIX"/>
>+            <enum name="GL_MAP1_COLOR_4"/>
>+            <enum name="GL_MAP1_INDEX"/>
>+            <enum name="GL_MAP1_NORMAL"/>
>+            <enum name="GL_MAP1_TEXTURE_COORD_1"/>
>+            <enum name="GL_MAP1_TEXTURE_COORD_2"/>
>+            <enum name="GL_MAP1_TEXTURE_COORD_3"/>
>+            <enum name="GL_MAP1_TEXTURE_COORD_4"/>
>+            <enum name="GL_MAP1_VERTEX_3"/>
>+            <enum name="GL_MAP1_VERTEX_4"/>
>+            <enum name="GL_MAP2_COLOR_4"/>
>+            <enum name="GL_MAP2_INDEX"/>
>+            <enum name="GL_MAP2_NORMAL"/>
>+            <enum name="GL_MAP2_TEXTURE_COORD_1"/>
>+            <enum name="GL_MAP2_TEXTURE_COORD_2"/>
>+            <enum name="GL_MAP2_TEXTURE_COORD_3"/>
>+            <enum name="GL_MAP2_TEXTURE_COORD_4"/>
>+            <enum name="GL_MAP2_VERTEX_3"/>
>+            <enum name="GL_MAP2_VERTEX_4"/>
>+            <enum name="GL_TEXTURE_DEFORMATION_SGIX"/>
>+        </group>
>+
>+        <group name="MapTextureFormatINTEL">
>+            <enum name="GL_LAYOUT_DEFAULT_INTEL"/>
>+            <enum name="GL_LAYOUT_LINEAR_CPU_CACHED_INTEL"/>
>+            <enum name="GL_LAYOUT_LINEAR_INTEL"/>
>+        </group>
>+
>+        <group name="MaterialFace">
>+            <enum name="GL_BACK"/>
>+            <enum name="GL_FRONT"/>
>+            <enum name="GL_FRONT_AND_BACK"/>
>+        </group>
>+
>+        <group name="MaterialParameter">
>+            <enum name="GL_AMBIENT"/>
>+            <enum name="GL_AMBIENT_AND_DIFFUSE"/>
>+            <enum name="GL_COLOR_INDEXES"/>
>+            <enum name="GL_DIFFUSE"/>
>+            <enum name="GL_EMISSION"/>
>+            <enum name="GL_SHININESS"/>
>+            <enum name="GL_SPECULAR"/>
>+        </group>
>+
>+        <group name="MatrixMode">
>+            <enum name="GL_MODELVIEW"/>
>+            <enum name="GL_MODELVIEW0_EXT"/>
>+            <enum name="GL_PROJECTION"/>
>+            <enum name="GL_TEXTURE"/>
>+        </group>
>+
>+        <group name="MemoryBarrierMask">
>+            <enum name="GL_ALL_BARRIER_BITS"/>
>+            <enum name="GL_ALL_BARRIER_BITS_EXT"/>
>+            <enum name="GL_ATOMIC_COUNTER_BARRIER_BIT"/>
>+            <enum name="GL_ATOMIC_COUNTER_BARRIER_BIT_EXT"/>
>+            <enum name="GL_BUFFER_UPDATE_BARRIER_BIT"/>
>+            <enum name="GL_BUFFER_UPDATE_BARRIER_BIT_EXT"/>
>+            <enum name="GL_CLIENT_MAPPED_BUFFER_BARRIER_BIT"/>
>+            <enum name="GL_CLIENT_MAPPED_BUFFER_BARRIER_BIT_EXT"/>
>+            <enum name="GL_COMMAND_BARRIER_BIT"/>
>+            <enum name="GL_COMMAND_BARRIER_BIT_EXT"/>
>+            <enum name="GL_ELEMENT_ARRAY_BARRIER_BIT"/>
>+            <enum name="GL_ELEMENT_ARRAY_BARRIER_BIT_EXT"/>
>+            <enum name="GL_FRAMEBUFFER_BARRIER_BIT"/>
>+            <enum name="GL_FRAMEBUFFER_BARRIER_BIT_EXT"/>
>+            <enum name="GL_PIXEL_BUFFER_BARRIER_BIT"/>
>+            <enum name="GL_PIXEL_BUFFER_BARRIER_BIT_EXT"/>
>+            <enum name="GL_QUERY_BUFFER_BARRIER_BIT"/>
>+            <enum name="GL_SHADER_GLOBAL_ACCESS_BARRIER_BIT_NV"/>
>+            <enum name="GL_SHADER_IMAGE_ACCESS_BARRIER_BIT"/>
>+            <enum name="GL_SHADER_IMAGE_ACCESS_BARRIER_BIT_EXT"/>
>+            <enum name="GL_SHADER_STORAGE_BARRIER_BIT"/>
>+            <enum name="GL_TEXTURE_FETCH_BARRIER_BIT"/>
>+            <enum name="GL_TEXTURE_FETCH_BARRIER_BIT_EXT"/>
>+            <enum name="GL_TEXTURE_UPDATE_BARRIER_BIT"/>
>+            <enum name="GL_TEXTURE_UPDATE_BARRIER_BIT_EXT"/>
>+            <enum name="GL_TRANSFORM_FEEDBACK_BARRIER_BIT"/>
>+            <enum name="GL_TRANSFORM_FEEDBACK_BARRIER_BIT_EXT"/>
>+            <enum name="GL_UNIFORM_BARRIER_BIT"/>
>+            <enum name="GL_UNIFORM_BARRIER_BIT_EXT"/>
>+            <enum name="GL_VERTEX_ATTRIB_ARRAY_BARRIER_BIT"/>
>+            <enum name="GL_VERTEX_ATTRIB_ARRAY_BARRIER_BIT_EXT"/>
>+        </group>
>+
>+        <group name="MemoryObjectParameterName">
>+            <enum name="GL_DEDICATED_MEMORY_OBJECT_EXT"/>
>+            <enum name="GL_PROTECTED_MEMORY_OBJECT_EXT"/>
>+        </group>
>+
>+        <group name="MeshMode1">
>+            <enum name="GL_LINE"/>
>+            <enum name="GL_POINT"/>
>+        </group>
>+
>+        <group name="MeshMode2">
>+            <enum name="GL_FILL"/>
>+            <enum name="GL_LINE"/>
>+            <enum name="GL_POINT"/>
>+        </group>
>+
>+        <group name="MinmaxTargetEXT">
>+            <enum name="GL_MINMAX"/>
>+            <enum name="GL_MINMAX_EXT"/>
>+        </group>
>+
>+        <group name="NormalPointerType">
>+            <enum name="GL_BYTE"/>
>+            <enum name="GL_DOUBLE"/>
>+            <enum name="GL_FLOAT"/>
>+            <enum name="GL_INT"/>
>+            <enum name="GL_SHORT"/>
>+        </group>
>+
>+        <group name="PixelCopyType">
>+            <enum name="GL_COLOR"/>
>+            <enum name="GL_COLOR_EXT"/>
>+            <enum name="GL_DEPTH"/>
>+            <enum name="GL_DEPTH_EXT"/>
>+            <enum name="GL_STENCIL"/>
>+            <enum name="GL_STENCIL_EXT"/>
>+        </group>
>+
>+        <group name="PixelFormat">
>+            <enum name="GL_ABGR_EXT"/>
>+            <enum name="GL_ALPHA"/>
>+            <enum name="GL_BLUE"/>
>+            <enum name="GL_CMYKA_EXT"/>
>+            <enum name="GL_CMYK_EXT"/>
>+            <enum name="GL_COLOR_INDEX"/>
>+            <enum name="GL_DEPTH_COMPONENT"/>
>+            <enum name="GL_GREEN"/>
>+            <enum name="GL_LUMINANCE"/>
>+            <enum name="GL_LUMINANCE_ALPHA"/>
>+            <enum name="GL_RED"/>
>+            <enum name="GL_RED_EXT"/>
>+            <enum name="GL_RGB"/>
>+            <enum name="GL_RGBA"/>
>+            <enum name="GL_STENCIL_INDEX"/>
>+            <enum name="GL_UNSIGNED_INT"/>
>+            <enum name="GL_UNSIGNED_SHORT"/>
>+            <enum name="GL_YCRCB_422_SGIX"/>
>+            <enum name="GL_YCRCB_444_SGIX"/>
>+        </group>
>+
>+        <group name="InternalFormat" comment="Was PixelInternalFormat">
>+            
>+            <enum name="GL_ALPHA12"/>
>+            <enum name="GL_ALPHA16"/>
>+            
>+            <enum name="GL_ALPHA4"/>
>+            <enum name="GL_ALPHA8"/>
>+            
>+            <enum name="GL_DUAL_ALPHA12_SGIS"/>
>+            <enum name="GL_DUAL_ALPHA16_SGIS"/>
>+            <enum name="GL_DUAL_ALPHA4_SGIS"/>
>+            <enum name="GL_DUAL_ALPHA8_SGIS"/>
>+            <enum name="GL_DUAL_INTENSITY12_SGIS"/>
>+            <enum name="GL_DUAL_INTENSITY16_SGIS"/>
>+            <enum name="GL_DUAL_INTENSITY4_SGIS"/>
>+            <enum name="GL_DUAL_INTENSITY8_SGIS"/>
>+            <enum name="GL_DUAL_LUMINANCE12_SGIS"/>
>+            <enum name="GL_DUAL_LUMINANCE16_SGIS"/>
>+            <enum name="GL_DUAL_LUMINANCE4_SGIS"/>
>+            <enum name="GL_DUAL_LUMINANCE8_SGIS"/>
>+            <enum name="GL_DUAL_LUMINANCE_ALPHA4_SGIS"/>
>+            <enum name="GL_DUAL_LUMINANCE_ALPHA8_SGIS"/>
>+            <enum name="GL_INTENSITY"/>
>+            <enum name="GL_INTENSITY12"/>
>+            <enum name="GL_INTENSITY16"/>
>+            
>+            <enum name="GL_INTENSITY4"/>
>+            <enum name="GL_INTENSITY8"/>
>+            
>+            <enum name="GL_LUMINANCE12"/>
>+            <enum name="GL_LUMINANCE12_ALPHA12"/>
>+            <enum name="GL_LUMINANCE12_ALPHA4"/>
>+            <enum name="GL_LUMINANCE16"/>
>+            <enum name="GL_LUMINANCE16_ALPHA16"/>
>+            
>+            
>+            <enum name="GL_LUMINANCE4"/>
>+            <enum name="GL_LUMINANCE4_ALPHA4"/>
>+            <enum name="GL_LUMINANCE6_ALPHA2"/>
>+            <enum name="GL_LUMINANCE8"/>
>+            <enum name="GL_LUMINANCE8_ALPHA8"/>
>+            
>+            
>+            <enum name="GL_QUAD_ALPHA4_SGIS"/>
>+            <enum name="GL_QUAD_ALPHA8_SGIS"/>
>+            <enum name="GL_QUAD_INTENSITY4_SGIS"/>
>+            <enum name="GL_QUAD_INTENSITY8_SGIS"/>
>+            <enum name="GL_QUAD_LUMINANCE4_SGIS"/>
>+            <enum name="GL_QUAD_LUMINANCE8_SGIS"/>
>+            
>+            
>+            
>+            
>+            
>+            <enum name="GL_RED"/>
>+            <enum name="GL_RED_EXT"/>
>+            <enum name="GL_R8"/>
>+            <enum name="GL_R8_EXT"/>
>+            <enum name="GL_R8_SNORM"/>
>+            <enum name="GL_R16"/>
>+            <enum name="GL_R16_EXT"/>
>+            <enum name="GL_R16_SNORM"/>
>+            <enum name="GL_R16_SNORM_EXT"/>
>+            
>+            
>+            <enum name="GL_R16F"/>
>+            <enum name="GL_R16F_EXT"/>
>+            <enum name="GL_R32F"/>
>+            <enum name="GL_R32F_EXT"/>
>+            <enum name="GL_R8I"/>
>+            <enum name="GL_R16I"/>
>+            <enum name="GL_R32I"/>
>+            <enum name="GL_R8UI"/>
>+            <enum name="GL_R16UI"/>
>+            <enum name="GL_R32UI"/>
>+            
>+            <enum name="GL_RG"/>
>+            <enum name="GL_RG8"/>
>+            <enum name="GL_RG8_EXT"/>
>+            <enum name="GL_RG8_SNORM"/>
>+            <enum name="GL_RG16"/>
>+            <enum name="GL_RG16_EXT"/>
>+            <enum name="GL_RG16_SNORM"/>
>+            <enum name="GL_RG16_SNORM_EXT"/>
>+            <enum name="GL_RG16F"/>
>+            <enum name="GL_RG16F_EXT"/>
>+            <enum name="GL_RG32F"/>
>+            <enum name="GL_RG32F_EXT"/>
>+            <enum name="GL_RG8I"/>
>+            <enum name="GL_RG16I"/>
>+            <enum name="GL_RG32I"/>
>+            <enum name="GL_RG8UI"/>
>+            <enum name="GL_RG16UI"/>
>+            <enum name="GL_RG32UI"/>
>+            
>+            <enum name="GL_RGB"/>
>+            
>+            <enum name="GL_RGB2_EXT"/>
>+            <enum name="GL_RGB4"/>
>+            <enum name="GL_RGB4_EXT"/>
>+            <enum name="GL_RGB5"/>
>+            <enum name="GL_RGB5_EXT"/>
>+            <enum name="GL_RGB8"/>
>+            <enum name="GL_RGB8_EXT"/>
>+            <enum name="GL_RGB8_OES"/>
>+            <enum name="GL_RGB8_SNORM"/>
>+            <enum name="GL_RGB10"/>
>+            <enum name="GL_RGB10_EXT"/>
>+            <enum name="GL_RGB12"/>
>+            <enum name="GL_RGB12_EXT"/>
>+            <enum name="GL_RGB16"/>
>+            <enum name="GL_RGB16_EXT"/>
>+            <enum name="GL_RGB16F"/>
>+            <enum name="GL_RGB16F_ARB"/>
>+            <enum name="GL_RGB16F_EXT"/>
>+            <enum name="GL_RGB16_SNORM"/>
>+            <enum name="GL_RGB16_SNORM_EXT"/>
>+            <enum name="GL_RGB8I"/>
>+            <enum name="GL_RGB16I"/>
>+            <enum name="GL_RGB32I"/>
>+            <enum name="GL_RGB8UI"/>
>+            <enum name="GL_RGB16UI"/>
>+            <enum name="GL_RGB32UI"/>
>+            <enum name="GL_SRGB"/>
>+            <enum name="GL_SRGB_EXT"/>
>+            <enum name="GL_SRGB_ALPHA"/>
>+            <enum name="GL_SRGB_ALPHA_EXT"/>
>+            <enum name="GL_SRGB8"/>
>+            <enum name="GL_SRGB8_EXT"/>
>+            <enum name="GL_SRGB8_NV"/>
>+            <enum name="GL_SRGB8_ALPHA8"/>
>+            <enum name="GL_SRGB8_ALPHA8_EXT"/>
>+            <enum name="GL_R3_G3_B2"/>
>+            <enum name="GL_R11F_G11F_B10F"/>
>+            <enum name="GL_R11F_G11F_B10F_APPLE"/>
>+            <enum name="GL_R11F_G11F_B10F_EXT"/>
>+            <enum name="GL_RGB9_E5"/>
>+            <enum name="GL_RGB9_E5_APPLE"/>
>+            <enum name="GL_RGB9_E5_EXT"/>
>+            
>+            <enum name="GL_RGBA"/>
>+            <enum name="GL_RGBA4"/>
>+            <enum name="GL_RGBA4_EXT"/>
>+            <enum name="GL_RGBA4_OES"/>
>+            <enum name="GL_RGB5_A1"/>
>+            <enum name="GL_RGB5_A1_EXT"/>
>+            <enum name="GL_RGB5_A1_OES"/>
>+            <enum name="GL_RGBA8"/>
>+            <enum name="GL_RGBA8_EXT"/>
>+            <enum name="GL_RGBA8_OES"/>
>+            <enum name="GL_RGBA8_SNORM"/>
>+            <enum name="GL_RGB10_A2"/>
>+            <enum name="GL_RGB10_A2_EXT"/>
>+            <enum name="GL_RGBA12"/>
>+            <enum name="GL_RGBA12_EXT"/>
>+            <enum name="GL_RGBA16"/>
>+            <enum name="GL_RGBA16_EXT"/>
>+            <enum name="GL_RGBA16F"/>
>+            <enum name="GL_RGBA16F_ARB"/>
>+            <enum name="GL_RGBA16F_EXT"/>
>+            <enum name="GL_RGBA32F"/>
>+            <enum name="GL_RGBA32F_ARB"/>
>+            <enum name="GL_RGBA32F_EXT"/>
>+            <enum name="GL_RGBA8I"/>
>+            <enum name="GL_RGBA16I"/>
>+            <enum name="GL_RGBA32I"/>
>+            <enum name="GL_RGBA8UI"/>
>+            <enum name="GL_RGBA16UI"/>
>+            <enum name="GL_RGBA32UI"/>
>+            <enum name="GL_RGB10_A2UI"/>
>+            
>+            <enum name="GL_DEPTH_COMPONENT"/>
>+            <enum name="GL_DEPTH_COMPONENT16"/>
>+            <enum name="GL_DEPTH_COMPONENT16_ARB"/>
>+            <enum name="GL_DEPTH_COMPONENT16_OES"/>
>+            <enum name="GL_DEPTH_COMPONENT16_SGIX"/>
>+            <enum name="GL_DEPTH_COMPONENT24_ARB"/>
>+            <enum name="GL_DEPTH_COMPONENT24_OES"/>
>+            <enum name="GL_DEPTH_COMPONENT24_SGIX"/>
>+            <enum name="GL_DEPTH_COMPONENT32_ARB"/>
>+            <enum name="GL_DEPTH_COMPONENT32_OES"/>
>+            <enum name="GL_DEPTH_COMPONENT32_SGIX"/>
>+            <enum name="GL_DEPTH_COMPONENT32F"/>
>+            <enum name="GL_DEPTH_COMPONENT32F_NV"/>
>+            <enum name="GL_DEPTH_COMPONENT32F_NV"/>
>+            
>+            <enum name="GL_DEPTH_STENCIL"/>
>+            <enum name="GL_DEPTH_STENCIL_EXT"/>
>+            <enum name="GL_DEPTH_STENCIL_MESA"/>
>+            <enum name="GL_DEPTH_STENCIL_NV"/>
>+            <enum name="GL_DEPTH_STENCIL_OES"/>
>+            <enum name="GL_DEPTH24_STENCIL8"/>
>+            <enum name="GL_DEPTH24_STENCIL8_EXT"/>
>+            <enum name="GL_DEPTH24_STENCIL8_OES"/>
>+            <enum name="GL_DEPTH32F_STENCIL8"/>
>+            <enum name="GL_DEPTH32F_STENCIL8_NV"/>
>+            
>+            <enum name="GL_COMPRESSED_RED"/>
>+            <enum name="GL_COMPRESSED_RG"/>
>+            <enum name="GL_COMPRESSED_RGB"/>
>+            <enum name="GL_COMPRESSED_RGBA"/>
>+            <enum name="GL_COMPRESSED_SRGB"/>
>+            <enum name="GL_COMPRESSED_SRGB_ALPHA"/>
>+            <enum name="GL_COMPRESSED_RED_RGTC1"/>
>+            <enum name="GL_COMPRESSED_RED_RGTC1_EXT"/>
>+            <enum name="GL_COMPRESSED_SIGNED_RED_RGTC1"/>
>+            <enum name="GL_COMPRESSED_SIGNED_RED_RGTC1_EXT"/>
>+            <enum name="GL_COMPRESSED_R11_EAC"/>
>+            <enum name="GL_COMPRESSED_SIGNED_R11_EAC"/>
>+            <enum name="GL_COMPRESSED_RG_RGTC2"/>
>+            <enum name="GL_COMPRESSED_SIGNED_RG_RGTC2"/>
>+            <enum name="GL_COMPRESSED_RGBA_BPTC_UNORM"/>
>+            <enum name="GL_COMPRESSED_SRGB_ALPHA_BPTC_UNORM"/>
>+            <enum name="GL_COMPRESSED_RGB_BPTC_SIGNED_FLOAT"/>
>+            <enum name="GL_COMPRESSED_RGB_BPTC_UNSIGNED_FLOAT"/>
>+            <enum name="GL_COMPRESSED_RGB8_ETC2"/>
>+            <enum name="GL_COMPRESSED_SRGB8_ETC2"/>
>+            <enum name="GL_COMPRESSED_RGB8_PUNCHTHROUGH_ALPHA1_ETC2"/>
>+            <enum name="GL_COMPRESSED_SRGB8_PUNCHTHROUGH_ALPHA1_ETC2"/>
>+            <enum name="GL_COMPRESSED_RGBA8_ETC2_EAC"/>
>+            <enum name="GL_COMPRESSED_SRGB8_ALPHA8_ETC2_EAC"/>
>+            <enum name="GL_COMPRESSED_RG11_EAC"/>
>+            <enum name="GL_COMPRESSED_SIGNED_RG11_EAC"/>
>+            <enum name="GL_COMPRESSED_RGB_S3TC_DXT1_EXT"/>
>+            <enum name="GL_COMPRESSED_SRGB_S3TC_DXT1_EXT"/>
>+            <enum name="GL_COMPRESSED_RGBA_S3TC_DXT1_EXT"/>
>+            <enum name="GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT1_EXT"/>
>+            <enum name="GL_COMPRESSED_RGBA_S3TC_DXT3_EXT"/>
>+            <enum name="GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT3_EXT"/>
>+            <enum name="GL_COMPRESSED_RGBA_S3TC_DXT5_EXT"/>
>+            <enum name="GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT5_EXT"/>
>+        </group>
>+
>+        <group name="PixelMap">
>+            <enum name="GL_PIXEL_MAP_A_TO_A"/>
>+            <enum name="GL_PIXEL_MAP_B_TO_B"/>
>+            <enum name="GL_PIXEL_MAP_G_TO_G"/>
>+            <enum name="GL_PIXEL_MAP_I_TO_A"/>
>+            <enum name="GL_PIXEL_MAP_I_TO_B"/>
>+            <enum name="GL_PIXEL_MAP_I_TO_G"/>
>+            <enum name="GL_PIXEL_MAP_I_TO_I"/>
>+            <enum name="GL_PIXEL_MAP_I_TO_R"/>
>+            <enum name="GL_PIXEL_MAP_R_TO_R"/>
>+            <enum name="GL_PIXEL_MAP_S_TO_S"/>
>+        </group>
>+
>+        <group name="PixelStoreParameter">
>+            <enum name="GL_PACK_ALIGNMENT"/>
>+            <enum name="GL_PACK_IMAGE_DEPTH_SGIS"/>
>+            <enum name="GL_PACK_IMAGE_HEIGHT"/>
>+            <enum name="GL_PACK_IMAGE_HEIGHT_EXT"/>
>+            <enum name="GL_PACK_LSB_FIRST"/>
>+            <enum name="GL_PACK_RESAMPLE_OML"/>
>+            <enum name="GL_PACK_RESAMPLE_SGIX"/>
>+            <enum name="GL_PACK_ROW_LENGTH"/>
>+            <enum name="GL_PACK_SKIP_IMAGES"/>
>+            <enum name="GL_PACK_SKIP_IMAGES_EXT"/>
>+            <enum name="GL_PACK_SKIP_PIXELS"/>
>+            <enum name="GL_PACK_SKIP_ROWS"/>
>+            <enum name="GL_PACK_SKIP_VOLUMES_SGIS"/>
>+            <enum name="GL_PACK_SUBSAMPLE_RATE_SGIX"/>
>+            <enum name="GL_PACK_SWAP_BYTES"/>
>+            <enum name="GL_PIXEL_TILE_CACHE_SIZE_SGIX"/>
>+            <enum name="GL_PIXEL_TILE_GRID_DEPTH_SGIX"/>
>+            <enum name="GL_PIXEL_TILE_GRID_HEIGHT_SGIX"/>
>+            <enum name="GL_PIXEL_TILE_GRID_WIDTH_SGIX"/>
>+            <enum name="GL_PIXEL_TILE_HEIGHT_SGIX"/>
>+            <enum name="GL_PIXEL_TILE_WIDTH_SGIX"/>
>+            <enum name="GL_UNPACK_ALIGNMENT"/>
>+            <enum name="GL_UNPACK_IMAGE_DEPTH_SGIS"/>
>+            <enum name="GL_UNPACK_IMAGE_HEIGHT"/>
>+            <enum name="GL_UNPACK_IMAGE_HEIGHT_EXT"/>
>+            <enum name="GL_UNPACK_LSB_FIRST"/>
>+            <enum name="GL_UNPACK_RESAMPLE_OML"/>
>+            <enum name="GL_UNPACK_RESAMPLE_SGIX"/>
>+            <enum name="GL_UNPACK_ROW_LENGTH"/>
>+            <enum name="GL_UNPACK_ROW_LENGTH_EXT"/>
>+            <enum name="GL_UNPACK_SKIP_IMAGES"/>
>+            <enum name="GL_UNPACK_SKIP_IMAGES_EXT"/>
>+            <enum name="GL_UNPACK_SKIP_PIXELS"/>
>+            <enum name="GL_UNPACK_SKIP_PIXELS_EXT"/>
>+            <enum name="GL_UNPACK_SKIP_ROWS"/>
>+            <enum name="GL_UNPACK_SKIP_ROWS_EXT"/>
>+            <enum name="GL_UNPACK_SKIP_VOLUMES_SGIS"/>
>+            <enum name="GL_UNPACK_SUBSAMPLE_RATE_SGIX"/>
>+            <enum name="GL_UNPACK_SWAP_BYTES"/>
>+        </group>
>+
>+        <group name="PixelStoreResampleMode">
>+            <enum name="GL_RESAMPLE_DECIMATE_SGIX"/>
>+            <enum name="GL_RESAMPLE_REPLICATE_SGIX"/>
>+            <enum name="GL_RESAMPLE_ZERO_FILL_SGIX"/>
>+        </group>
>+
>+        <group name="PixelStoreSubsampleRate">
>+            <enum name="GL_PIXEL_SUBSAMPLE_2424_SGIX"/>
>+            <enum name="GL_PIXEL_SUBSAMPLE_4242_SGIX"/>
>+            <enum name="GL_PIXEL_SUBSAMPLE_4444_SGIX"/>
>+        </group>
>+
>+        <group name="PixelTexGenMode">
>+            <enum name="GL_LUMINANCE"/>
>+            <enum name="GL_LUMINANCE_ALPHA"/>
>+            <enum name="GL_NONE"/>
>+            <enum name="GL_PIXEL_TEX_GEN_ALPHA_LS_SGIX"/>
>+            <enum name="GL_PIXEL_TEX_GEN_ALPHA_MS_SGIX"/>
>+            <enum name="GL_PIXEL_TEX_GEN_ALPHA_NO_REPLACE_SGIX"/>
>+            <enum name="GL_PIXEL_TEX_GEN_ALPHA_REPLACE_SGIX"/>
>+            <enum name="GL_RGB"/>
>+            <enum name="GL_RGBA"/>
>+        </group>
>+
>+        <group name="PixelTexGenParameterNameSGIS">
>+            <enum name="GL_PIXEL_FRAGMENT_ALPHA_SOURCE_SGIS"/>
>+            <enum name="GL_PIXEL_FRAGMENT_RGB_SOURCE_SGIS"/>
>+        </group>
>+
>+        <group name="PixelTransferParameter">
>+            <enum name="GL_ALPHA_BIAS"/>
>+            <enum name="GL_ALPHA_SCALE"/>
>+            <enum name="GL_BLUE_BIAS"/>
>+            <enum name="GL_BLUE_SCALE"/>
>+            <enum name="GL_DEPTH_BIAS"/>
>+            <enum name="GL_DEPTH_SCALE"/>
>+            <enum name="GL_GREEN_BIAS"/>
>+            <enum name="GL_GREEN_SCALE"/>
>+            <enum name="GL_INDEX_OFFSET"/>
>+            <enum name="GL_INDEX_SHIFT"/>
>+            <enum name="GL_MAP_COLOR"/>
>+            <enum name="GL_MAP_STENCIL"/>
>+            <enum name="GL_POST_COLOR_MATRIX_ALPHA_BIAS"/>
>+            <enum name="GL_POST_COLOR_MATRIX_ALPHA_BIAS_SGI"/>
>+            <enum name="GL_POST_COLOR_MATRIX_ALPHA_SCALE"/>
>+            <enum name="GL_POST_COLOR_MATRIX_ALPHA_SCALE_SGI"/>
>+            <enum name="GL_POST_COLOR_MATRIX_BLUE_BIAS"/>
>+            <enum name="GL_POST_COLOR_MATRIX_BLUE_BIAS_SGI"/>
>+            <enum name="GL_POST_COLOR_MATRIX_BLUE_SCALE"/>
>+            <enum name="GL_POST_COLOR_MATRIX_BLUE_SCALE_SGI"/>
>+            <enum name="GL_POST_COLOR_MATRIX_GREEN_BIAS"/>
>+            <enum name="GL_POST_COLOR_MATRIX_GREEN_BIAS_SGI"/>
>+            <enum name="GL_POST_COLOR_MATRIX_GREEN_SCALE"/>
>+            <enum name="GL_POST_COLOR_MATRIX_GREEN_SCALE_SGI"/>
>+            <enum name="GL_POST_COLOR_MATRIX_RED_BIAS"/>
>+            <enum name="GL_POST_COLOR_MATRIX_RED_BIAS_SGI"/>
>+            <enum name="GL_POST_COLOR_MATRIX_RED_SCALE"/>
>+            <enum name="GL_POST_COLOR_MATRIX_RED_SCALE_SGI"/>
>+            <enum name="GL_POST_CONVOLUTION_ALPHA_BIAS"/>
>+            <enum name="GL_POST_CONVOLUTION_ALPHA_BIAS_EXT"/>
>+            <enum name="GL_POST_CONVOLUTION_ALPHA_SCALE"/>
>+            <enum name="GL_POST_CONVOLUTION_ALPHA_SCALE_EXT"/>
>+            <enum name="GL_POST_CONVOLUTION_BLUE_BIAS"/>
>+            <enum name="GL_POST_CONVOLUTION_BLUE_BIAS_EXT"/>
>+            <enum name="GL_POST_CONVOLUTION_BLUE_SCALE"/>
>+            <enum name="GL_POST_CONVOLUTION_BLUE_SCALE_EXT"/>
>+            <enum name="GL_POST_CONVOLUTION_GREEN_BIAS"/>
>+            <enum name="GL_POST_CONVOLUTION_GREEN_BIAS_EXT"/>
>+            <enum name="GL_POST_CONVOLUTION_GREEN_SCALE"/>
>+            <enum name="GL_POST_CONVOLUTION_GREEN_SCALE_EXT"/>
>+            <enum name="GL_POST_CONVOLUTION_RED_BIAS"/>
>+            <enum name="GL_POST_CONVOLUTION_RED_BIAS_EXT"/>
>+            <enum name="GL_POST_CONVOLUTION_RED_SCALE"/>
>+            <enum name="GL_POST_CONVOLUTION_RED_SCALE_EXT"/>
>+            <enum name="GL_RED_BIAS"/>
>+            <enum name="GL_RED_SCALE"/>
>+        </group>
>+
>+        <group name="PixelType">
>+            <enum name="GL_BITMAP"/>
>+            <enum name="GL_BYTE"/>
>+            <enum name="GL_FLOAT"/>
>+            <enum name="GL_INT"/>
>+            <enum name="GL_SHORT"/>
>+            <enum name="GL_UNSIGNED_BYTE"/>
>+            <enum name="GL_UNSIGNED_BYTE_3_3_2"/>
>+            <enum name="GL_UNSIGNED_BYTE_3_3_2_EXT"/>
>+            <enum name="GL_UNSIGNED_INT"/>
>+            <enum name="GL_UNSIGNED_INT_10_10_10_2"/>
>+            <enum name="GL_UNSIGNED_INT_10_10_10_2_EXT"/>
>+            <enum name="GL_UNSIGNED_INT_8_8_8_8"/>
>+            <enum name="GL_UNSIGNED_INT_8_8_8_8_EXT"/>
>+            <enum name="GL_UNSIGNED_SHORT"/>
>+            <enum name="GL_UNSIGNED_SHORT_4_4_4_4"/>
>+            <enum name="GL_UNSIGNED_SHORT_4_4_4_4_EXT"/>
>+            <enum name="GL_UNSIGNED_SHORT_5_5_5_1"/>
>+            <enum name="GL_UNSIGNED_SHORT_5_5_5_1_EXT"/>
>+        </group>
>+
>+        <group name="PointParameterNameSGIS">
>+            <enum name="GL_DISTANCE_ATTENUATION_EXT"/>
>+            <enum name="GL_DISTANCE_ATTENUATION_SGIS"/>
>+            <enum name="GL_POINT_DISTANCE_ATTENUATION"/>
>+            <enum name="GL_POINT_DISTANCE_ATTENUATION_ARB"/>
>+            <enum name="GL_POINT_FADE_THRESHOLD_SIZE"/>
>+            <enum name="GL_POINT_FADE_THRESHOLD_SIZE_ARB"/>
>+            <enum name="GL_POINT_FADE_THRESHOLD_SIZE_EXT"/>
>+            <enum name="GL_POINT_FADE_THRESHOLD_SIZE_SGIS"/>
>+            <enum name="GL_POINT_SIZE_MAX"/>
>+            <enum name="GL_POINT_SIZE_MAX_ARB"/>
>+            <enum name="GL_POINT_SIZE_MAX_EXT"/>
>+            <enum name="GL_POINT_SIZE_MAX_SGIS"/>
>+            <enum name="GL_POINT_SIZE_MIN"/>
>+            <enum name="GL_POINT_SIZE_MIN_ARB"/>
>+            <enum name="GL_POINT_SIZE_MIN_EXT"/>
>+            <enum name="GL_POINT_SIZE_MIN_SGIS"/>
>+        </group>
>+
>+        <group name="PolygonMode">
>+            <enum name="GL_FILL"/>
>+            <enum name="GL_LINE"/>
>+            <enum name="GL_POINT"/>
>+        </group>
>+
>+        <group name="PrimitiveType">
>+            <enum name="GL_LINES"/>
>+            <enum name="GL_LINES_ADJACENCY"/>
>+            <enum name="GL_LINES_ADJACENCY_ARB"/>
>+            <enum name="GL_LINES_ADJACENCY_EXT"/>
>+            <enum name="GL_LINE_LOOP"/>
>+            <enum name="GL_LINE_STRIP"/>
>+            <enum name="GL_LINE_STRIP_ADJACENCY"/>
>+            <enum name="GL_LINE_STRIP_ADJACENCY_ARB"/>
>+            <enum name="GL_LINE_STRIP_ADJACENCY_EXT"/>
>+            <enum name="GL_PATCHES"/>
>+            <enum name="GL_PATCHES_EXT"/>
>+            <enum name="GL_POINTS"/>
>+            <enum name="GL_POLYGON"/>
>+            <enum name="GL_QUADS"/>
>+            <enum name="GL_QUADS_EXT"/>
>+            <enum name="GL_QUAD_STRIP"/>
>+            <enum name="GL_TRIANGLES"/>
>+            <enum name="GL_TRIANGLES_ADJACENCY"/>
>+            <enum name="GL_TRIANGLES_ADJACENCY_ARB"/>
>+            <enum name="GL_TRIANGLES_ADJACENCY_EXT"/>
>+            <enum name="GL_TRIANGLE_FAN"/>
>+            <enum name="GL_TRIANGLE_STRIP"/>
>+            <enum name="GL_TRIANGLE_STRIP_ADJACENCY"/>
>+            <enum name="GL_TRIANGLE_STRIP_ADJACENCY_ARB"/>
>+            <enum name="GL_TRIANGLE_STRIP_ADJACENCY_EXT"/>
>+        </group>
>+
>+        <group name="OcclusionQueryEventMaskAMD">
>+            <enum name="GL_QUERY_DEPTH_PASS_EVENT_BIT_AMD"/>
>+            <enum name="GL_QUERY_DEPTH_FAIL_EVENT_BIT_AMD"/>
>+            <enum name="GL_QUERY_STENCIL_FAIL_EVENT_BIT_AMD"/>
>+            <enum name="GL_QUERY_DEPTH_BOUNDS_FAIL_EVENT_BIT_AMD"/>
>+            <enum name="GL_QUERY_ALL_EVENT_BITS_AMD"/>
>+        </group>
>+
>+        <group name="ReadBufferMode">
>+            <enum name="GL_AUX0"/>
>+            <enum name="GL_AUX1"/>
>+            <enum name="GL_AUX2"/>
>+            <enum name="GL_AUX3"/>
>+            <enum name="GL_BACK"/>
>+            <enum name="GL_BACK_LEFT"/>
>+            <enum name="GL_BACK_RIGHT"/>
>+            <enum name="GL_FRONT"/>
>+            <enum name="GL_FRONT_LEFT"/>
>+            <enum name="GL_FRONT_RIGHT"/>
>+            <enum name="GL_LEFT"/>
>+            <enum name="GL_RIGHT"/>
>+        </group>
>+
>+        <group name="RenderingMode">
>+            <enum name="GL_FEEDBACK"/>
>+            <enum name="GL_RENDER"/>
>+            <enum name="GL_SELECT"/>
>+        </group>
>+
>+        <group name="SamplePatternSGIS">
>+            <enum name="GL_1PASS_EXT"/>
>+            <enum name="GL_1PASS_SGIS"/>
>+            <enum name="GL_2PASS_0_EXT"/>
>+            <enum name="GL_2PASS_0_SGIS"/>
>+            <enum name="GL_2PASS_1_EXT"/>
>+            <enum name="GL_2PASS_1_SGIS"/>
>+            <enum name="GL_4PASS_0_EXT"/>
>+            <enum name="GL_4PASS_0_SGIS"/>
>+            <enum name="GL_4PASS_1_EXT"/>
>+            <enum name="GL_4PASS_1_SGIS"/>
>+            <enum name="GL_4PASS_2_EXT"/>
>+            <enum name="GL_4PASS_2_SGIS"/>
>+            <enum name="GL_4PASS_3_EXT"/>
>+            <enum name="GL_4PASS_3_SGIS"/>
>+        </group>
>+
>+        <group name="SemaphoreParameterName">
>+            <enum name="GL_D3D12_FENCE_VALUE_EXT"/>
>+        </group>
>+
>+        <group name="SeparableTargetEXT">
>+            <enum name="GL_SEPARABLE_2D"/>
>+            <enum name="GL_SEPARABLE_2D_EXT"/>
>+        </group>
>+
>+        <group name="ShadingModel">
>+            <enum name="GL_FLAT"/>
>+            <enum name="GL_SMOOTH"/>
>+        </group>
>+
>+        <group name="StencilFaceDirection">
>+             <enum name="GL_FRONT"/>
>+             <enum name="GL_BACK"/>
>+             <enum name="GL_FRONT_AND_BACK"/>
>+        </group>
>+
>+        <group name="StencilFunction">
>+            <enum name="GL_ALWAYS"/>
>+            <enum name="GL_EQUAL"/>
>+            <enum name="GL_GEQUAL"/>
>+            <enum name="GL_GREATER"/>
>+            <enum name="GL_LEQUAL"/>
>+            <enum name="GL_LESS"/>
>+            <enum name="GL_NEVER"/>
>+            <enum name="GL_NOTEQUAL"/>
>+        </group>
>+
>+        <group name="StencilOp">
>+            <enum name="GL_DECR"/>
>+            <enum name="GL_INCR"/>
>+            <enum name="GL_INVERT"/>
>+            <enum name="GL_KEEP"/>
>+            <enum name="GL_REPLACE"/>
>+            <enum name="GL_ZERO"/>
>+        </group>
>+
>+        <group name="StringName">
>+            <enum name="GL_EXTENSIONS"/>
>+            <enum name="GL_RENDERER"/>
>+            <enum name="GL_VENDOR"/>
>+            <enum name="GL_VERSION"/>
>+            <enum name="GL_SHADING_LANGUAGE_VERSION"/>
>+        </group>
>+
>+        <group name="SyncObjectMask">
>+            <enum name="GL_SYNC_FLUSH_COMMANDS_BIT"/>
>+            <enum name="GL_SYNC_FLUSH_COMMANDS_BIT_APPLE"/>
>+        </group>
>+
>+        <group name="TexCoordPointerType">
>+            <enum name="GL_DOUBLE"/>
>+            <enum name="GL_FLOAT"/>
>+            <enum name="GL_INT"/>
>+            <enum name="GL_SHORT"/>
>+        </group>
>+
>+        <group name="TextureCoordName">
>+            <enum name="GL_S"/>
>+            <enum name="GL_T"/>
>+            <enum name="GL_R"/>
>+            <enum name="GL_Q"/>
>+        </group>
>+
>+        <group name="TextureEnvMode">
>+            <enum name="GL_ADD"/>
>+            <enum name="GL_BLEND"/>
>+            <enum name="GL_DECAL"/>
>+            <enum name="GL_MODULATE"/>
>+            <enum name="GL_REPLACE_EXT"/>
>+            <enum name="GL_TEXTURE_ENV_BIAS_SGIX"/>
>+        </group>
>+
>+        <group name="TextureEnvParameter">
>+            <enum name="GL_TEXTURE_ENV_COLOR"/>
>+            <enum name="GL_TEXTURE_ENV_MODE"/>
>+        </group>
>+
>+        <group name="TextureEnvTarget">
>+            <enum name="GL_TEXTURE_ENV"/>
>+        </group>
>+
>+        <group name="TextureFilterFuncSGIS">
>+            <enum name="GL_FILTER4_SGIS"/>
>+        </group>
>+
>+        <group name="TextureGenMode">
>+            <enum name="GL_EYE_DISTANCE_TO_LINE_SGIS"/>
>+            <enum name="GL_EYE_DISTANCE_TO_POINT_SGIS"/>
>+            <enum name="GL_EYE_LINEAR"/>
>+            <enum name="GL_OBJECT_DISTANCE_TO_LINE_SGIS"/>
>+            <enum name="GL_OBJECT_DISTANCE_TO_POINT_SGIS"/>
>+            <enum name="GL_OBJECT_LINEAR"/>
>+            <enum name="GL_SPHERE_MAP"/>
>+        </group>
>+
>+        <group name="TextureGenParameter">
>+            <enum name="GL_EYE_LINE_SGIS"/>
>+            <enum name="GL_EYE_PLANE"/>
>+            <enum name="GL_EYE_POINT_SGIS"/>
>+            <enum name="GL_OBJECT_LINE_SGIS"/>
>+            <enum name="GL_OBJECT_PLANE"/>
>+            <enum name="GL_OBJECT_POINT_SGIS"/>
>+            <enum name="GL_TEXTURE_GEN_MODE"/>
>+        </group>
>+
>+        <group name="TextureMagFilter">
>+            <enum name="GL_FILTER4_SGIS"/>
>+            <enum name="GL_LINEAR"/>
>+            <enum name="GL_LINEAR_DETAIL_ALPHA_SGIS"/>
>+            <enum name="GL_LINEAR_DETAIL_COLOR_SGIS"/>
>+            <enum name="GL_LINEAR_DETAIL_SGIS"/>
>+            <enum name="GL_LINEAR_SHARPEN_ALPHA_SGIS"/>
>+            <enum name="GL_LINEAR_SHARPEN_COLOR_SGIS"/>
>+            <enum name="GL_LINEAR_SHARPEN_SGIS"/>
>+            <enum name="GL_NEAREST"/>
>+            <enum name="GL_PIXEL_TEX_GEN_Q_CEILING_SGIX"/>
>+            <enum name="GL_PIXEL_TEX_GEN_Q_FLOOR_SGIX"/>
>+            <enum name="GL_PIXEL_TEX_GEN_Q_ROUND_SGIX"/>
>+        </group>
>+
>+        <group name="TextureMinFilter">
>+            <enum name="GL_FILTER4_SGIS"/>
>+            <enum name="GL_LINEAR"/>
>+            <enum name="GL_LINEAR_CLIPMAP_LINEAR_SGIX"/>
>+            <enum name="GL_LINEAR_CLIPMAP_NEAREST_SGIX"/>
>+            <enum name="GL_LINEAR_MIPMAP_LINEAR"/>
>+            <enum name="GL_LINEAR_MIPMAP_NEAREST"/>
>+            <enum name="GL_NEAREST"/>
>+            <enum name="GL_NEAREST_CLIPMAP_LINEAR_SGIX"/>
>+            <enum name="GL_NEAREST_CLIPMAP_NEAREST_SGIX"/>
>+            <enum name="GL_NEAREST_MIPMAP_LINEAR"/>
>+            <enum name="GL_NEAREST_MIPMAP_NEAREST"/>
>+            <enum name="GL_PIXEL_TEX_GEN_Q_CEILING_SGIX"/>
>+            <enum name="GL_PIXEL_TEX_GEN_Q_FLOOR_SGIX"/>
>+            <enum name="GL_PIXEL_TEX_GEN_Q_ROUND_SGIX"/>
>+        </group>
>+
>+        <group name="TextureParameterName">
>+            <enum name="GL_DETAIL_TEXTURE_LEVEL_SGIS"/>
>+            <enum name="GL_DETAIL_TEXTURE_MODE_SGIS"/>
>+            <enum name="GL_DUAL_TEXTURE_SELECT_SGIS"/>
>+            <enum name="GL_GENERATE_MIPMAP"/>
>+            <enum name="GL_GENERATE_MIPMAP_SGIS"/>
>+            <enum name="GL_POST_TEXTURE_FILTER_BIAS_SGIX"/>
>+            <enum name="GL_POST_TEXTURE_FILTER_SCALE_SGIX"/>
>+            <enum name="GL_QUAD_TEXTURE_SELECT_SGIS"/>
>+            <enum name="GL_SHADOW_AMBIENT_SGIX"/>
>+            <enum name="GL_TEXTURE_BORDER_COLOR"/>
>+            <enum name="GL_TEXTURE_CLIPMAP_CENTER_SGIX"/>
>+            <enum name="GL_TEXTURE_CLIPMAP_DEPTH_SGIX"/>
>+            <enum name="GL_TEXTURE_CLIPMAP_FRAME_SGIX"/>
>+            <enum name="GL_TEXTURE_CLIPMAP_LOD_OFFSET_SGIX"/>
>+            <enum name="GL_TEXTURE_CLIPMAP_OFFSET_SGIX"/>
>+            <enum name="GL_TEXTURE_CLIPMAP_VIRTUAL_DEPTH_SGIX"/>
>+            <enum name="GL_TEXTURE_COMPARE_SGIX"/>
>+            <enum name="GL_TEXTURE_LOD_BIAS_R_SGIX"/>
>+            <enum name="GL_TEXTURE_LOD_BIAS_S_SGIX"/>
>+            <enum name="GL_TEXTURE_LOD_BIAS_T_SGIX"/>
>+            <enum name="GL_TEXTURE_MAG_FILTER"/>
>+            <enum name="GL_TEXTURE_MAX_CLAMP_R_SGIX"/>
>+            <enum name="GL_TEXTURE_MAX_CLAMP_S_SGIX"/>
>+            <enum name="GL_TEXTURE_MAX_CLAMP_T_SGIX"/>
>+            <enum name="GL_TEXTURE_MIN_FILTER"/>
>+            <enum name="GL_TEXTURE_PRIORITY"/>
>+            <enum name="GL_TEXTURE_PRIORITY_EXT"/>
>+            <enum name="GL_TEXTURE_WRAP_Q_SGIS"/>
>+            <enum name="GL_TEXTURE_WRAP_R"/>
>+            <enum name="GL_TEXTURE_WRAP_R_EXT"/>
>+            <enum name="GL_TEXTURE_WRAP_R_OES"/>
>+            <enum name="GL_TEXTURE_WRAP_S"/>
>+            <enum name="GL_TEXTURE_WRAP_T"/>
>+            <enum name="GL_TEXTURE_BASE_LEVEL"/>
>+            <enum name="GL_TEXTURE_COMPARE_MODE"/>
>+            <enum name="GL_TEXTURE_COMPARE_FUNC"/>
>+            <enum name="GL_TEXTURE_LOD_BIAS"/>
>+            <enum name="GL_TEXTURE_MIN_LOD"/>
>+            <enum name="GL_TEXTURE_MAX_LOD"/>
>+            <enum name="GL_TEXTURE_MAX_LEVEL"/>
>+            <enum name="GL_TEXTURE_SWIZZLE_R"/>
>+            <enum name="GL_TEXTURE_SWIZZLE_G"/>
>+            <enum name="GL_TEXTURE_SWIZZLE_B"/>
>+            <enum name="GL_TEXTURE_SWIZZLE_A"/>
>+            <enum name="GL_TEXTURE_SWIZZLE_RGBA"/>
>+            <enum name="GL_TEXTURE_TILING_EXT"/>
>+            <enum name="GL_DEPTH_STENCIL_TEXTURE_MODE"/>
>+            <enum name="GL_DETAIL_TEXTURE_FUNC_POINTS_SGIS"/>
>+            <enum name="GL_SHARPEN_TEXTURE_FUNC_POINTS_SGIS"/>
>+            <enum name="GL_TEXTURE_4DSIZE_SGIS"/>
>+            <enum name="GL_TEXTURE_ALPHA_SIZE"/>
>+            <enum name="GL_TEXTURE_BASE_LEVEL_SGIS"/>
>+            <enum name="GL_TEXTURE_BLUE_SIZE"/>
>+            <enum name="GL_TEXTURE_BORDER"/>
>+            <enum name="GL_TEXTURE_BORDER_COLOR_NV"/>
>+            <enum name="GL_TEXTURE_COMPARE_OPERATOR_SGIX"/>
>+            <enum name="GL_TEXTURE_COMPONENTS"/>
>+            <enum name="GL_TEXTURE_DEPTH_EXT"/>
>+            <enum name="GL_TEXTURE_FILTER4_SIZE_SGIS"/>
>+            <enum name="GL_TEXTURE_GEQUAL_R_SGIX"/>
>+            <enum name="GL_TEXTURE_GREEN_SIZE"/>
>+            <enum name="GL_TEXTURE_HEIGHT"/>
>+            <enum name="GL_TEXTURE_INTENSITY_SIZE"/>
>+            <enum name="GL_TEXTURE_INTERNAL_FORMAT"/>
>+            <enum name="GL_TEXTURE_LEQUAL_R_SGIX"/>
>+            <enum name="GL_TEXTURE_LUMINANCE_SIZE"/>
>+            <enum name="GL_TEXTURE_MAX_LEVEL_SGIS"/>
>+            <enum name="GL_TEXTURE_MAX_LOD_SGIS"/>
>+            <enum name="GL_TEXTURE_MIN_LOD_SGIS"/>
>+            <enum name="GL_TEXTURE_RED_SIZE"/>
>+            <enum name="GL_TEXTURE_RESIDENT"/>
>+            <enum name="GL_TEXTURE_WIDTH"/>
>+        </group>
>+
>+        <group name="TextureStorageMaskAMD">
>+            <enum name="GL_TEXTURE_STORAGE_SPARSE_BIT_AMD"/>
>+        </group>
>+
>+        <group name="TextureTarget">
>+            <enum name="GL_DETAIL_TEXTURE_2D_SGIS"/>
>+            <enum name="GL_PROXY_TEXTURE_1D"/>
>+            <enum name="GL_PROXY_TEXTURE_1D_ARRAY"/>
>+            <enum name="GL_PROXY_TEXTURE_1D_ARRAY_EXT"/>
>+            <enum name="GL_PROXY_TEXTURE_1D_EXT"/>
>+            <enum name="GL_PROXY_TEXTURE_2D"/>
>+            <enum name="GL_PROXY_TEXTURE_2D_ARRAY"/>
>+            <enum name="GL_PROXY_TEXTURE_2D_ARRAY_EXT"/>
>+            <enum name="GL_PROXY_TEXTURE_2D_EXT"/>
>+            <enum name="GL_PROXY_TEXTURE_2D_MULTISAMPLE"/>
>+            <enum name="GL_PROXY_TEXTURE_2D_MULTISAMPLE_ARRAY"/>
>+            <enum name="GL_PROXY_TEXTURE_3D"/>
>+            <enum name="GL_PROXY_TEXTURE_3D_EXT"/>
>+            <enum name="GL_PROXY_TEXTURE_4D_SGIS"/>
>+            <enum name="GL_PROXY_TEXTURE_CUBE_MAP"/>
>+            <enum name="GL_PROXY_TEXTURE_CUBE_MAP_ARB"/>
>+            <enum name="GL_PROXY_TEXTURE_CUBE_MAP_EXT"/>
>+            <enum name="GL_PROXY_TEXTURE_CUBE_MAP_ARRAY"/>
>+            <enum name="GL_PROXY_TEXTURE_CUBE_MAP_ARRAY_ARB"/>
>+            <enum name="GL_PROXY_TEXTURE_RECTANGLE"/>
>+            <enum name="GL_PROXY_TEXTURE_RECTANGLE_ARB"/>
>+            <enum name="GL_PROXY_TEXTURE_RECTANGLE_NV"/>
>+            <enum name="GL_TEXTURE_1D"/>
>+            <enum name="GL_TEXTURE_2D"/>
>+            <enum name="GL_TEXTURE_3D"/>
>+            <enum name="GL_TEXTURE_3D_EXT"/>
>+            <enum name="GL_TEXTURE_3D_OES"/>
>+            <enum name="GL_TEXTURE_4D_SGIS"/>
>+            <enum name="GL_TEXTURE_RECTANGLE"/>
>+            <enum name="GL_TEXTURE_CUBE_MAP"/>
>+            <enum name="GL_TEXTURE_CUBE_MAP_POSITIVE_X"/>
>+            <enum name="GL_TEXTURE_CUBE_MAP_NEGATIVE_X"/>
>+            <enum name="GL_TEXTURE_CUBE_MAP_POSITIVE_Y"/>
>+            <enum name="GL_TEXTURE_CUBE_MAP_NEGATIVE_Y"/>
>+            <enum name="GL_TEXTURE_CUBE_MAP_POSITIVE_Z"/>
>+            <enum name="GL_TEXTURE_CUBE_MAP_NEGATIVE_Z"/>
>+            <enum name="GL_TEXTURE_CUBE_MAP_ARRAY"/>
>+            <enum name="GL_TEXTURE_CUBE_MAP_ARRAY_ARB"/>
>+            <enum name="GL_TEXTURE_CUBE_MAP_ARRAY_EXT"/>
>+            <enum name="GL_TEXTURE_CUBE_MAP_ARRAY_OES"/>
>+            <enum name="GL_TEXTURE_1D_ARRAY"/>
>+            <enum name="GL_TEXTURE_2D_ARRAY"/>
>+            <enum name="GL_TEXTURE_2D_MULTISAMPLE"/>
>+            <enum name="GL_TEXTURE_2D_MULTISAMPLE_ARRAY"/>
>+        </group>
>+
>+        <group name="TextureWrapMode">
>+            <enum name="GL_CLAMP"/>
>+            <enum name="GL_CLAMP_TO_BORDER"/>
>+            <enum name="GL_CLAMP_TO_BORDER_ARB"/>
>+            <enum name="GL_CLAMP_TO_BORDER_NV"/>
>+            <enum name="GL_CLAMP_TO_BORDER_SGIS"/>
>+            <enum name="GL_CLAMP_TO_EDGE"/>
>+            <enum name="GL_CLAMP_TO_EDGE_SGIS"/>
>+            <enum name="GL_REPEAT"/>
>+        </group>
>+
>+        <group name="UseProgramStageMask">
>+            <enum name="GL_VERTEX_SHADER_BIT"/>
>+            <enum name="GL_VERTEX_SHADER_BIT_EXT"/>
>+            <enum name="GL_FRAGMENT_SHADER_BIT"/>
>+            <enum name="GL_FRAGMENT_SHADER_BIT_EXT"/>
>+            <enum name="GL_GEOMETRY_SHADER_BIT"/>
>+            <enum name="GL_GEOMETRY_SHADER_BIT_EXT"/>
>+            <enum name="GL_GEOMETRY_SHADER_BIT_OES"/>
>+            <enum name="GL_TESS_CONTROL_SHADER_BIT"/>
>+            <enum name="GL_TESS_CONTROL_SHADER_BIT_EXT"/>
>+            <enum name="GL_TESS_CONTROL_SHADER_BIT_OES"/>
>+            <enum name="GL_TESS_EVALUATION_SHADER_BIT"/>
>+            <enum name="GL_TESS_EVALUATION_SHADER_BIT_EXT"/>
>+            <enum name="GL_TESS_EVALUATION_SHADER_BIT_OES"/>
>+            <enum name="GL_COMPUTE_SHADER_BIT"/>
>+            <enum name="GL_ALL_SHADER_BITS"/>
>+            <enum name="GL_ALL_SHADER_BITS_EXT"/>
>+        </group>
>+
>+        <group name="VertexPointerType">
>+            <enum name="GL_DOUBLE"/>
>+            <enum name="GL_FLOAT"/>
>+            <enum name="GL_INT"/>
>+            <enum name="GL_SHORT"/>
>+        </group>
>+
>+        <group name="FramebufferAttachment">
>+            <enum name="GL_MAX_COLOR_ATTACHMENTS"/>
>+            <enum name="GL_MAX_COLOR_ATTACHMENTS_EXT"/>
>+            <enum name="GL_MAX_COLOR_ATTACHMENTS_NV"/>
>+            <enum name="GL_COLOR_ATTACHMENT0"/>
>+            <enum name="GL_COLOR_ATTACHMENT0_EXT"/>
>+            <enum name="GL_COLOR_ATTACHMENT0_NV"/>
>+            <enum name="GL_COLOR_ATTACHMENT0_OES"/>
>+            <enum name="GL_COLOR_ATTACHMENT1"/>
>+            <enum name="GL_COLOR_ATTACHMENT1_EXT"/>
>+            <enum name="GL_COLOR_ATTACHMENT1_NV"/>
>+            <enum name="GL_COLOR_ATTACHMENT2"/>
>+            <enum name="GL_COLOR_ATTACHMENT2_EXT"/>
>+            <enum name="GL_COLOR_ATTACHMENT2_NV"/>
>+            <enum name="GL_COLOR_ATTACHMENT3"/>
>+            <enum name="GL_COLOR_ATTACHMENT3_EXT"/>
>+            <enum name="GL_COLOR_ATTACHMENT3_NV"/>
>+            <enum name="GL_COLOR_ATTACHMENT4"/>
>+            <enum name="GL_COLOR_ATTACHMENT4_EXT"/>
>+            <enum name="GL_COLOR_ATTACHMENT4_NV"/>
>+            <enum name="GL_COLOR_ATTACHMENT5"/>
>+            <enum name="GL_COLOR_ATTACHMENT5_EXT"/>
>+            <enum name="GL_COLOR_ATTACHMENT5_NV"/>
>+            <enum name="GL_COLOR_ATTACHMENT6"/>
>+            <enum name="GL_COLOR_ATTACHMENT6_EXT"/>
>+            <enum name="GL_COLOR_ATTACHMENT6_NV"/>
>+            <enum name="GL_COLOR_ATTACHMENT7"/>
>+            <enum name="GL_COLOR_ATTACHMENT7_EXT"/>
>+            <enum name="GL_COLOR_ATTACHMENT7_NV"/>
>+            <enum name="GL_COLOR_ATTACHMENT8"/>
>+            <enum name="GL_COLOR_ATTACHMENT8_EXT"/>
>+            <enum name="GL_COLOR_ATTACHMENT8_NV"/>
>+            <enum name="GL_COLOR_ATTACHMENT9"/>
>+            <enum name="GL_COLOR_ATTACHMENT9_EXT"/>
>+            <enum name="GL_COLOR_ATTACHMENT9_NV"/>
>+            <enum name="GL_COLOR_ATTACHMENT10"/>
>+            <enum name="GL_COLOR_ATTACHMENT10_EXT"/>
>+            <enum name="GL_COLOR_ATTACHMENT10_NV"/>
>+            <enum name="GL_COLOR_ATTACHMENT11"/>
>+            <enum name="GL_COLOR_ATTACHMENT11_EXT"/>
>+            <enum name="GL_COLOR_ATTACHMENT11_NV"/>
>+            <enum name="GL_COLOR_ATTACHMENT12"/>
>+            <enum name="GL_COLOR_ATTACHMENT12_EXT"/>
>+            <enum name="GL_COLOR_ATTACHMENT12_NV"/>
>+            <enum name="GL_COLOR_ATTACHMENT13"/>
>+            <enum name="GL_COLOR_ATTACHMENT13_EXT"/>
>+            <enum name="GL_COLOR_ATTACHMENT13_NV"/>
>+            <enum name="GL_COLOR_ATTACHMENT14"/>
>+            <enum name="GL_COLOR_ATTACHMENT14_EXT"/>
>+            <enum name="GL_COLOR_ATTACHMENT14_NV"/>
>+            <enum name="GL_COLOR_ATTACHMENT15"/>
>+            <enum name="GL_COLOR_ATTACHMENT15_EXT"/>
>+            <enum name="GL_COLOR_ATTACHMENT15_NV"/>
>+            <enum name="GL_COLOR_ATTACHMENT16"/>
>+            <enum name="GL_COLOR_ATTACHMENT17"/>
>+            <enum name="GL_COLOR_ATTACHMENT18"/>
>+            <enum name="GL_COLOR_ATTACHMENT19"/>
>+            <enum name="GL_COLOR_ATTACHMENT20"/>
>+            <enum name="GL_COLOR_ATTACHMENT21"/>
>+            <enum name="GL_COLOR_ATTACHMENT22"/>
>+            <enum name="GL_COLOR_ATTACHMENT23"/>
>+            <enum name="GL_COLOR_ATTACHMENT24"/>
>+            <enum name="GL_COLOR_ATTACHMENT25"/>
>+            <enum name="GL_COLOR_ATTACHMENT26"/>
>+            <enum name="GL_COLOR_ATTACHMENT27"/>
>+            <enum name="GL_COLOR_ATTACHMENT28"/>
>+            <enum name="GL_COLOR_ATTACHMENT29"/>
>+            <enum name="GL_COLOR_ATTACHMENT30"/>
>+            <enum name="GL_COLOR_ATTACHMENT31"/>
>+            <enum name="GL_DEPTH_ATTACHMENT"/>
>+            <enum name="GL_DEPTH_ATTACHMENT_EXT"/>
>+            <enum name="GL_DEPTH_ATTACHMENT_OES"/>
>+        </group>
>+
>+        <group name="RenderbufferTarget">
>+            <enum name="GL_RENDERBUFFER" />
>+        </group>
>+
>+        <group name="FramebufferTarget">
>+            <enum name="GL_FRAMEBUFFER" />
>+            <enum name="GL_DRAW_FRAMEBUFFER" />
>+            <enum name="GL_READ_FRAMEBUFFER" />
>+        </group>
>+
>+        <group name="TextureUnit">
>+            <enum name="GL_TEXTURE0"/>
>+            <enum name="GL_TEXTURE1"/>
>+            <enum name="GL_TEXTURE2"/>
>+            <enum name="GL_TEXTURE3"/>
>+            <enum name="GL_TEXTURE4"/>
>+            <enum name="GL_TEXTURE5"/>
>+            <enum name="GL_TEXTURE6"/>
>+            <enum name="GL_TEXTURE7"/>
>+            <enum name="GL_TEXTURE8"/>
>+            <enum name="GL_TEXTURE9"/>
>+            <enum name="GL_TEXTURE10"/>
>+            <enum name="GL_TEXTURE11"/>
>+            <enum name="GL_TEXTURE12"/>
>+            <enum name="GL_TEXTURE13"/>
>+            <enum name="GL_TEXTURE14"/>
>+            <enum name="GL_TEXTURE15"/>
>+            <enum name="GL_TEXTURE16"/>
>+            <enum name="GL_TEXTURE17"/>
>+            <enum name="GL_TEXTURE18"/>
>+            <enum name="GL_TEXTURE19"/>
>+            <enum name="GL_TEXTURE20"/>
>+            <enum name="GL_TEXTURE21"/>
>+            <enum name="GL_TEXTURE22"/>
>+            <enum name="GL_TEXTURE23"/>
>+            <enum name="GL_TEXTURE24"/>
>+            <enum name="GL_TEXTURE25"/>
>+            <enum name="GL_TEXTURE26"/>
>+            <enum name="GL_TEXTURE27"/>
>+            <enum name="GL_TEXTURE28"/>
>+            <enum name="GL_TEXTURE29"/>
>+            <enum name="GL_TEXTURE30"/>
>+            <enum name="GL_TEXTURE31"/>
>+        </group>
>+
>+        <group name="TypeEnum">
>+            <enum name="GL_QUERY_WAIT"/>
>+            <enum name="GL_QUERY_NO_WAIT"/>
>+            <enum name="GL_QUERY_BY_REGION_WAIT"/>
>+            <enum name="GL_QUERY_BY_REGION_NO_WAIT"/>
>+        </group>
>+
>+        <group name="FragmentOpATI">
>+            <enum name="GL_MOV_ATI"/>
>+            <enum name="GL_ADD_ATI"/>
>+            <enum name="GL_MUL_ATI"/>
>+            <enum name="GL_SUB_ATI"/>
>+            <enum name="GL_DOT3_ATI"/>
>+            <enum name="GL_DOT4_ATI"/>
>+            <enum name="GL_MAD_ATI"/>
>+            <enum name="GL_LERP_ATI"/>
>+            <enum name="GL_CND_ATI"/>
>+            <enum name="GL_CND0_ATI"/>
>+            <enum name="GL_DOT2_ADD_ATI"/>
>+        </group>
>+
>+        <group name="FramebufferStatus">
>+            <enum name="GL_FRAMEBUFFER_COMPLETE"/>
>+            <enum name="GL_FRAMEBUFFER_UNDEFINED"/>
>+            <enum name="GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT"/>
>+            <enum name="GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT"/>
>+            <enum name="GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER"/>
>+            <enum name="GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER"/>
>+            <enum name="GL_FRAMEBUFFER_UNSUPPORTED"/>
>+            <enum name="GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE"/>
>+            <enum name="GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE"/>
>+            <enum name="GL_FRAMEBUFFER_INCOMPLETE_LAYER_TARGETS"/>
>+        </group>
>+
>+        <group name="GraphicsResetStatus">
>+            <enum name="GL_NO_ERROR"/>
>+            <enum name="GL_GUILTY_CONTEXT_RESET"/>
>+            <enum name="GL_INNOCENT_CONTEXT_RESET"/>
>+            <enum name="GL_UNKNOWN_CONTEXT_RESET"/>
>+        </group>
>+
>+        <group name="SyncStatus">
>+            <enum name="GL_ALREADY_SIGNALED"/>
>+            <enum name="GL_TIMEOUT_EXPIRED"/>
>+            <enum name="GL_CONDITION_SATISFIED"/>
>+            <enum name="GL_WAIT_FAILED"/>
>+        </group>
>+
>+        <group name="QueryTarget">
>+            <enum name="GL_SAMPLES_PASSED"/>
>+            <enum name="GL_ANY_SAMPLES_PASSED"/>
>+            <enum name="GL_ANY_SAMPLES_PASSED_CONSERVATIVE"/>
>+            <enum name="GL_PRIMITIVES_GENERATED"/>
>+            <enum name="GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN"/>
>+            <enum name="GL_TIME_ELAPSED"/>
>+        </group>
>+
>+        <group name="ConvolutionTarget">
>+            <enum name="GL_CONVOLUTION_1D"/>
>+            <enum name="GL_CONVOLUTION_2D"/>
>+        </group>
>+
>+        <group name="PathFillMode">
>+            <enum name="GL_INVERT"/>
>+            <enum name="GL_COUNT_UP_NV"/>
>+            <enum name="GL_COUNT_DOWN_NV"/>
>+            <enum name="GL_PATH_FILL_MODE_NV"/>
>+        </group>
>+
>+        <group name="ColorTableTarget">
>+            <enum name="GL_COLOR_TABLE"/>
>+            <enum name="GL_POST_CONVOLUTION_COLOR_TABLE"/>
>+            <enum name="GL_POST_COLOR_MATRIX_COLOR_TABLE"/>
>+        </group>
>+
>+        <group name="VertexBufferObjectParameter">
>+            <enum name="GL_BUFFER_ACCESS"/>
>+            <enum name="GL_BUFFER_ACCESS_FLAGS"/>
>+            <enum name="GL_BUFFER_IMMUTABLE_STORAGE"/>
>+            <enum name="GL_BUFFER_MAPPED"/>
>+            <enum name="GL_BUFFER_MAP_LENGTH"/>
>+            <enum name="GL_BUFFER_MAP_OFFSET"/>
>+            <enum name="GL_BUFFER_SIZE"/>
>+            <enum name="GL_BUFFER_STORAGE_FLAGS"/>
>+            <enum name="GL_BUFFER_USAGE"/>
>+        </group>
>+
>+        <group name="RenderbufferParameterName">
>+            <enum name="GL_RENDERBUFFER_WIDTH"/>
>+            <enum name="GL_RENDERBUFFER_HEIGHT"/>
>+            <enum name="GL_RENDERBUFFER_INTERNAL_FORMAT"/>
>+            <enum name="GL_RENDERBUFFER_SAMPLES"/>
>+            <enum name="GL_RENDERBUFFER_RED_SIZE"/>
>+            <enum name="GL_RENDERBUFFER_GREEN_SIZE"/>
>+            <enum name="GL_RENDERBUFFER_BLUE_SIZE"/>
>+            <enum name="GL_RENDERBUFFER_ALPHA_SIZE"/>
>+            <enum name="GL_RENDERBUFFER_DEPTH_SIZE"/>
>+            <enum name="GL_RENDERBUFFER_STENCIL_SIZE"/>
>+        </group>
>+
>+        <group name="VertexBufferObjectUsage">
>+            <enum name="GL_STREAM_DRAW"/>
>+            <enum name="GL_STREAM_READ"/>
>+            <enum name="GL_STREAM_COPY"/>
>+            <enum name="GL_STATIC_DRAW"/>
>+            <enum name="GL_STATIC_READ"/>
>+            <enum name="GL_STATIC_COPY"/>
>+            <enum name="GL_DYNAMIC_DRAW"/>
>+            <enum name="GL_DYNAMIC_READ"/>
>+            <enum name="GL_DYNAMIC_COPY"/>
>+        </group>
>+
>+        <group name="FramebufferParameterName">
>+            <enum name="GL_FRAMEBUFFER_DEFAULT_WIDTH"/>
>+            <enum name="GL_FRAMEBUFFER_DEFAULT_HEIGHT"/>
>+            <enum name="GL_FRAMEBUFFER_DEFAULT_LAYERS"/>
>+            <enum name="GL_FRAMEBUFFER_DEFAULT_SAMPLES"/>
>+            <enum name="GL_FRAMEBUFFER_DEFAULT_FIXED_SAMPLE_LOCATIONS"/>
>+        </group>
>+
>+        <group name="ProgramParameterPName">
>+            <enum name="GL_PROGRAM_BINARY_RETRIEVABLE_HINT"/>
>+            <enum name="GL_PROGRAM_SEPARABLE"/>
>+        </group>
>+
>+        <group name="BlendingFactor">
>+            <enum name="GL_ZERO"/>
>+            <enum name="GL_ONE"/>
>+            <enum name="GL_SRC_COLOR"/>
>+            <enum name="GL_ONE_MINUS_SRC_COLOR"/>
>+            <enum name="GL_DST_COLOR"/>
>+            <enum name="GL_ONE_MINUS_DST_COLOR"/>
>+            <enum name="GL_SRC_ALPHA"/>
>+            <enum name="GL_ONE_MINUS_SRC_ALPHA"/>
>+            <enum name="GL_DST_ALPHA"/>
>+            <enum name="GL_ONE_MINUS_DST_ALPHA"/>
>+            <enum name="GL_CONSTANT_COLOR"/>
>+            <enum name="GL_ONE_MINUS_CONSTANT_COLOR"/>
>+            <enum name="GL_CONSTANT_ALPHA"/>
>+            <enum name="GL_ONE_MINUS_CONSTANT_ALPHA"/>
>+            <enum name="GL_SRC_ALPHA_SATURATE"/>
>+            <enum name="GL_SRC1_COLOR"/>
>+            <enum name="GL_ONE_MINUS_SRC1_COLOR"/>
>+            <enum name="GL_SRC1_ALPHA"/>
>+            <enum name="GL_ONE_MINUS_SRC1_ALPHA"/>
>+        </group>
>+
>+        <group name="BindTransformFeedbackTarget">
>+            <enum name="GL_TRANSFORM_FEEDBACK"/>
>+        </group>
>+
>+        <group name="BlitFramebufferFilter">
>+            <enum name="GL_NEAREST"/>
>+            <enum name="GL_LINEAR"/>
>+        </group>
>+
>+        <group name="BufferStorageTarget">
>+            <enum name="GL_ARRAY_BUFFER"/>
>+            <enum name="GL_ATOMIC_COUNTER_BUFFER"/>
>+            <enum name="GL_COPY_READ_BUFFER"/>
>+            <enum name="GL_COPY_WRITE_BUFFER"/>
>+            <enum name="GL_DISPATCH_INDIRECT_BUFFER"/>
>+            <enum name="GL_DRAW_INDIRECT_BUFFER"/>
>+            <enum name="GL_ELEMENT_ARRAY_BUFFER"/>
>+            <enum name="GL_PIXEL_PACK_BUFFER"/>
>+            <enum name="GL_PIXEL_UNPACK_BUFFER"/>
>+            <enum name="GL_QUERY_BUFFER"/>
>+            <enum name="GL_SHADER_STORAGE_BUFFER"/>
>+            <enum name="GL_TEXTURE_BUFFER"/>
>+            <enum name="GL_TRANSFORM_FEEDBACK_BUFFER"/>
>+            <enum name="GL_UNIFORM_BUFFER"/>
>+        </group>
>+
>+        <group name="CheckFramebufferStatusTarget">
>+            <enum name="GL_DRAW_FRAMEBUFFER"/>
>+            <enum name="GL_READ_FRAMEBUFFER"/>
>+            <enum name="GL_FRAMEBUFFER"/>
>+        </group>
>+
>+        <group name="Buffer">
>+            <enum name="GL_COLOR"/>
>+            <enum name="GL_DEPTH"/>
>+            <enum name="GL_STENCIL"/>
>+        </group>
>+
>+        <group name="ClipControlOrigin">
>+            <enum name="GL_LOWER_LEFT"/>
>+            <enum name="GL_UPPER_LEFT"/>
>+        </group>
>+
>+        <group name="ClipControlDepth">
>+            <enum name="GL_NEGATIVE_ONE_TO_ONE"/>
>+            <enum name="GL_ZERO_TO_ONE"/>
>+        </group>
>+
>+        <group name="CopyBufferSubDataTarget">
>+            <enum name="GL_ARRAY_BUFFER"/>
>+            <enum name="GL_ATOMIC_COUNTER_BUFFER"/>
>+            <enum name="GL_COPY_READ_BUFFER"/>
>+            <enum name="GL_COPY_WRITE_BUFFER"/>
>+            <enum name="GL_DISPATCH_INDIRECT_BUFFER"/>
>+            <enum name="GL_DRAW_INDIRECT_BUFFER"/>
>+            <enum name="GL_ELEMENT_ARRAY_BUFFER"/>
>+            <enum name="GL_PIXEL_PACK_BUFFER"/>
>+            <enum name="GL_PIXEL_UNPACK_BUFFER"/>
>+            <enum name="GL_QUERY_BUFFER"/>
>+            <enum name="GL_SHADER_STORAGE_BUFFER"/>
>+            <enum name="GL_TEXTURE_BUFFER"/>
>+            <enum name="GL_TRANSFORM_FEEDBACK_BUFFER"/>
>+            <enum name="GL_UNIFORM_BUFFER"/>
>+        </group>
>+
>+        <group name="ShaderType">
>+            <enum name="GL_COMPUTE_SHADER"/>
>+            <enum name="GL_VERTEX_SHADER"/>
>+            <enum name="GL_TESS_CONTROL_SHADER"/>
>+            <enum name="GL_TESS_EVALUATION_SHADER"/>
>+            <enum name="GL_GEOMETRY_SHADER"/>
>+            <enum name="GL_FRAGMENT_SHADER"/>
>+            <enum name="GL_FRAGMENT_SHADER_ARB"/>
>+            <enum name="GL_VERTEX_SHADER_ARB"/>
>+        </group>
>+
>+        <group name="DebugSource">
>+            <enum name="GL_DEBUG_SOURCE_API"/>
>+            <enum name="GL_DEBUG_SOURCE_WINDOW_SYSTEM"/>
>+            <enum name="GL_DEBUG_SOURCE_SHADER_COMPILER"/>
>+            <enum name="GL_DEBUG_SOURCE_THIRD_PARTY"/>
>+            <enum name="GL_DEBUG_SOURCE_APPLICATION"/>
>+            <enum name="GL_DEBUG_SOURCE_OTHER"/>
>+            <enum name="GL_DONT_CARE"/>
>+        </group>
>+
>+        <group name="DebugType">
>+            <enum name="GL_DEBUG_TYPE_ERROR"/>
>+            <enum name="GL_DEBUG_TYPE_DEPRECATED_BEHAVIOR"/>
>+            <enum name="GL_DEBUG_TYPE_UNDEFINED_BEHAVIOR"/>
>+            <enum name="GL_DEBUG_TYPE_PORTABILITY"/>
>+            <enum name="GL_DEBUG_TYPE_PERFORMANCE"/>
>+            <enum name="GL_DEBUG_TYPE_MARKER"/>
>+            <enum name="GL_DEBUG_TYPE_PUSH_GROUP"/>
>+            <enum name="GL_DEBUG_TYPE_POP_GROUP"/>
>+            <enum name="GL_DEBUG_TYPE_OTHER"/>
>+            <enum name="GL_DONT_CARE"/>
>+        </group>
>+
>+        <group name="DebugSeverity">
>+            <enum name="GL_DEBUG_SEVERITY_LOW"/>
>+            <enum name="GL_DEBUG_SEVERITY_MEDIUM"/>
>+            <enum name="GL_DEBUG_SEVERITY_HIGH"/>
>+            <enum name="GL_DONT_CARE"/>
>+        </group>
>+
>+        <group name="SyncCondition">
>+            <enum name="GL_SYNC_GPU_COMMANDS_COMPLETE"/>
>+        </group>
>+
>+        <group name="FogPName">
>+            <enum name="GL_FOG_MODE"/>
>+            <enum name="GL_FOG_DENSITY"/>
>+            <enum name="GL_FOG_START"/>
>+            <enum name="GL_FOG_END"/>
>+            <enum name="GL_FOG_INDEX"/>
>+            <enum name="GL_FOG_COORD_SRC"/>
>+        </group>
>+
>+        <group name="AtomicCounterBufferPName">
>+            <enum name="GL_ATOMIC_COUNTER_BUFFER_BINDING"/>
>+            <enum name="GL_ATOMIC_COUNTER_BUFFER_DATA_SIZE"/>
>+            <enum name="GL_ATOMIC_COUNTER_BUFFER_ACTIVE_ATOMIC_COUNTERS"/>
>+            <enum name="GL_ATOMIC_COUNTER_BUFFER_ACTIVE_ATOMIC_COUNTER_INDICES"/>
>+            <enum name="GL_ATOMIC_COUNTER_BUFFER_REFERENCED_BY_VERTEX_SHADER"/>
>+            <enum name="GL_ATOMIC_COUNTER_BUFFER_REFERENCED_BY_TESS_CONTROL_SHADER"/>
>+            <enum name="GL_ATOMIC_COUNTER_BUFFER_REFERENCED_BY_TESS_EVALUATION_SHADER"/>
>+            <enum name="GL_ATOMIC_COUNTER_BUFFER_REFERENCED_BY_GEOMETRY_SHADER"/>
>+            <enum name="GL_ATOMIC_COUNTER_BUFFER_REFERENCED_BY_FRAGMENT_SHADER"/>
>+            <enum name="GL_ATOMIC_COUNTER_BUFFER_REFERENCED_BY_COMPUTE_SHADER"/>
>+        </group>
>+
>+        <group name="UniformBlockPName">
>+            <enum name="GL_UNIFORM_BLOCK_BINDING"/>
>+            <enum name="GL_UNIFORM_BLOCK_DATA_SIZE"/>
>+            <enum name="GL_UNIFORM_BLOCK_NAME_LENGTH"/>
>+            <enum name="GL_UNIFORM_BLOCK_ACTIVE_UNIFORMS"/>
>+            <enum name="GL_UNIFORM_BLOCK_ACTIVE_UNIFORM_INDICES"/>
>+            <enum name="GL_UNIFORM_BLOCK_REFERENCED_BY_VERTEX_SHADER"/>
>+            <enum name="GL_UNIFORM_BLOCK_REFERENCED_BY_TESS_CONTROL_SHADER"/>
>+            <enum name="GL_UNIFORM_BLOCK_REFERENCED_BY_TESS_EVALUATION_SHADER"/>
>+            <enum name="GL_UNIFORM_BLOCK_REFERENCED_BY_GEOMETRY_SHADER"/>
>+            <enum name="GL_UNIFORM_BLOCK_REFERENCED_BY_FRAGMENT_SHADER"/>
>+            <enum name="GL_UNIFORM_BLOCK_REFERENCED_BY_COMPUTE_SHADER"/>
>+        </group>
>+
>+        <group name="UniformPName">
>+            <enum name="GL_UNIFORM_TYPE"/>
>+            <enum name="GL_UNIFORM_SIZE"/>
>+            <enum name="GL_UNIFORM_NAME_LENGTH"/>
>+            <enum name="GL_UNIFORM_BLOCK_INDEX"/>
>+            <enum name="GL_UNIFORM_OFFSET"/>
>+            <enum name="GL_UNIFORM_ARRAY_STRIDE"/>
>+            <enum name="GL_UNIFORM_MATRIX_STRIDE"/>
>+            <enum name="GL_UNIFORM_IS_ROW_MAJOR"/>
>+            <enum name="GL_UNIFORM_ATOMIC_COUNTER_BUFFER_INDEX"/>
>+        </group>
>+
>+        <group name="SamplerParameterName">
>+            <enum name="GL_TEXTURE_WRAP_S"/>
>+            <enum name="GL_TEXTURE_WRAP_T"/>
>+            <enum name="GL_TEXTURE_WRAP_R"/>
>+            <enum name="GL_TEXTURE_MIN_FILTER"/>
>+            <enum name="GL_TEXTURE_MAG_FILTER"/>
>+            <enum name="GL_TEXTURE_BORDER_COLOR"/>
>+            <enum name="GL_TEXTURE_MIN_LOD"/>
>+            <enum name="GL_TEXTURE_MAX_LOD"/>
>+            <enum name="GL_TEXTURE_COMPARE_MODE"/>
>+            <enum name="GL_TEXTURE_COMPARE_FUNC"/>
>+        </group>
>+
>+        <group name="VertexProvokingMode">
>+            <enum name="GL_FIRST_VERTEX_CONVENTION"/>
>+            <enum name="GL_LAST_VERTEX_CONVENTION"/>
>+        </group>
>+
>+        <group name="PatchParameterName">
>+            <enum name="GL_PATCH_VERTICES"/>
>+            <enum name="GL_PATCH_DEFAULT_OUTER_LEVEL"/>
>+            <enum name="GL_PATCH_DEFAULT_INNER_LEVEL"/>
>+        </group>
>+
>+        <group name="ObjectIdentifier">
>+            <enum name="GL_BUFFER"/>
>+            <enum name="GL_SHADER"/>
>+            <enum name="GL_PROGRAM"/>
>+            <enum name="GL_VERTEX_ARRAY"/>
>+            <enum name="GL_QUERY"/>
>+            <enum name="GL_PROGRAM_PIPELINE"/>
>+            <enum name="GL_TRANSFORM_FEEDBACK"/>
>+            <enum name="GL_SAMPLER"/>
>+            <enum name="GL_TEXTURE"/>
>+            <enum name="GL_RENDERBUFFER"/>
>+            <enum name="GL_FRAMEBUFFER"/>
>+        </group>
>+
>+        <group name="ColorBuffer">
>+            <enum name="GL_NONE"/>
>+            <enum name="GL_FRONT_LEFT"/>
>+            <enum name="GL_FRONT_RIGHT"/>
>+            <enum name="GL_BACK_LEFT"/>
>+            <enum name="GL_BACK_RIGHT"/>
>+            <enum name="GL_FRONT"/>
>+            <enum name="GL_BACK"/>
>+            <enum name="GL_LEFT"/>
>+            <enum name="GL_RIGHT"/>
>+            <enum name="GL_FRONT_AND_BACK"/>
>+            <enum name="GL_NONE"/>
>+            <enum name="GL_COLOR_ATTACHMENT0"/>
>+            <enum name="GL_COLOR_ATTACHMENT1"/>
>+            <enum name="GL_COLOR_ATTACHMENT2"/>
>+            <enum name="GL_COLOR_ATTACHMENT3"/>
>+            <enum name="GL_COLOR_ATTACHMENT4"/>
>+            <enum name="GL_COLOR_ATTACHMENT5"/>
>+            <enum name="GL_COLOR_ATTACHMENT6"/>
>+            <enum name="GL_COLOR_ATTACHMENT7"/>
>+            <enum name="GL_COLOR_ATTACHMENT8"/>
>+            <enum name="GL_COLOR_ATTACHMENT9"/>
>+            <enum name="GL_COLOR_ATTACHMENT10"/>
>+            <enum name="GL_COLOR_ATTACHMENT11"/>
>+            <enum name="GL_COLOR_ATTACHMENT12"/>
>+            <enum name="GL_COLOR_ATTACHMENT13"/>
>+            <enum name="GL_COLOR_ATTACHMENT14"/>
>+            <enum name="GL_COLOR_ATTACHMENT15"/>
>+            <enum name="GL_COLOR_ATTACHMENT16"/>
>+            <enum name="GL_COLOR_ATTACHMENT17"/>
>+            <enum name="GL_COLOR_ATTACHMENT18"/>
>+            <enum name="GL_COLOR_ATTACHMENT19"/>
>+            <enum name="GL_COLOR_ATTACHMENT20"/>
>+            <enum name="GL_COLOR_ATTACHMENT21"/>
>+            <enum name="GL_COLOR_ATTACHMENT22"/>
>+            <enum name="GL_COLOR_ATTACHMENT23"/>
>+            <enum name="GL_COLOR_ATTACHMENT24"/>
>+            <enum name="GL_COLOR_ATTACHMENT25"/>
>+            <enum name="GL_COLOR_ATTACHMENT26"/>
>+            <enum name="GL_COLOR_ATTACHMENT27"/>
>+            <enum name="GL_COLOR_ATTACHMENT28"/>
>+            <enum name="GL_COLOR_ATTACHMENT29"/>
>+            <enum name="GL_COLOR_ATTACHMENT30"/>
>+            <enum name="GL_COLOR_ATTACHMENT31"/>
>+        </group>
>+
>+        <group name="MapQuery">
>+            <enum name="GL_COEFF"/>
>+            <enum name="GL_ORDER"/>
>+            <enum name="GL_DOMAIN"/>
>+        </group>
>+
>+        <group name="VertexArrayPName">
>+            <enum name="GL_VERTEX_ATTRIB_ARRAY_ENABLED"/>
>+            <enum name="GL_VERTEX_ATTRIB_ARRAY_SIZE"/>
>+            <enum name="GL_VERTEX_ATTRIB_ARRAY_STRIDE"/>
>+            <enum name="GL_VERTEX_ATTRIB_ARRAY_TYPE"/>
>+            <enum name="GL_VERTEX_ATTRIB_ARRAY_NORMALIZED"/>
>+            <enum name="GL_VERTEX_ATTRIB_ARRAY_INTEGER"/>
>+            <enum name="GL_VERTEX_ATTRIB_ARRAY_LONG"/>
>+            <enum name="GL_VERTEX_ATTRIB_ARRAY_DIVISOR"/>
>+            <enum name="GL_VERTEX_ATTRIB_RELATIVE_OFFSET"/>
>+        </group>
>+
>+        <group name="TransformFeedbackPName">
>+            <enum name="GL_TRANSFORM_FEEDBACK_BUFFER_BINDING"/>
>+            <enum name="GL_TRANSFORM_FEEDBACK_BUFFER_START"/>
>+            <enum name="GL_TRANSFORM_FEEDBACK_BUFFER_SIZE"/>
>+            <enum name="GL_TRANSFORM_FEEDBACK_PAUSED"/>
>+            <enum name="GL_TRANSFORM_FEEDBACK_ACTIVE"/>
>+        </group>
>+
>+        <group name="SyncParameterName">
>+            <enum name="GL_OBJECT_TYPE"/>
>+            <enum name="GL_SYNC_STATUS"/>
>+            <enum name="GL_SYNC_CONDITION"/>
>+            <enum name="GL_SYNC_FLAGS"/>
>+        </group>
>+
>+        <group name="ShaderParameterName">
>+            <enum name="GL_SHADER_TYPE"/>
>+            <enum name="GL_DELETE_STATUS"/>
>+            <enum name="GL_COMPILE_STATUS"/>
>+            <enum name="GL_INFO_LOG_LENGTH"/>
>+            <enum name="GL_SHADER_SOURCE_LENGTH"/>
>+        </group>
>+
>+        <group name="QueryObjectParameterName">
>+            <enum name="GL_QUERY_RESULT_AVAILABLE"/>
>+            <enum name="GL_QUERY_RESULT"/>
>+            <enum name="GL_QUERY_RESULT_NO_WAIT"/>
>+            <enum name="GL_QUERY_TARGET"/>
>+        </group>
>+
>+        <group name="QueryParameterName">
>+            <enum name="GL_CURRENT_QUERY"/>
>+            <enum name="GL_QUERY_COUNTER_BITS"/>
>+        </group>
>+
>+        <group name="ProgramStagePName">
>+            <enum name="GL_ACTIVE_SUBROUTINE_UNIFORMS"/>
>+            <enum name="GL_ACTIVE_SUBROUTINE_UNIFORM_LOCATIONS"/>
>+            <enum name="GL_ACTIVE_SUBROUTINES"/>
>+            <enum name="GL_ACTIVE_SUBROUTINE_UNIFORM_MAX_LENGTH"/>
>+            <enum name="GL_ACTIVE_SUBROUTINE_MAX_LENGTH"/>
>+        </group>
>+
>+        <group name="PipelineParameterName">
>+            <enum name="GL_ACTIVE_PROGRAM"/>
>+            <enum name="GL_VERTEX_SHADER"/>
>+            <enum name="GL_TESS_CONTROL_SHADER"/>
>+            <enum name="GL_TESS_EVALUATION_SHADER"/>
>+            <enum name="GL_GEOMETRY_SHADER"/>
>+            <enum name="GL_FRAGMENT_SHADER"/>
>+            <enum name="GL_INFO_LOG_LENGTH"/>
>+        </group>
>+
>+        <group name="ProgramInterface">
>+            <enum name="GL_UNIFORM"/>
>+            <enum name="GL_UNIFORM_BLOCK"/>
>+            <enum name="GL_PROGRAM_INPUT"/>
>+            <enum name="GL_PROGRAM_OUTPUT"/>
>+            <enum name="GL_VERTEX_SUBROUTINE"/>
>+            <enum name="GL_TESS_CONTROL_SUBROUTINE"/>
>+            <enum name="GL_TESS_EVALUATION_SUBROUTINE"/>
>+            <enum name="GL_GEOMETRY_SUBROUTINE"/>
>+            <enum name="GL_FRAGMENT_SUBROUTINE"/>
>+            <enum name="GL_COMPUTE_SUBROUTINE"/>
>+            <enum name="GL_VERTEX_SUBROUTINE_UNIFORM"/>
>+            <enum name="GL_TESS_CONTROL_SUBROUTINE_UNIFORM"/>
>+            <enum name="GL_TESS_EVALUATION_SUBROUTINE_UNIFORM"/>
>+            <enum name="GL_GEOMETRY_SUBROUTINE_UNIFORM"/>
>+            <enum name="GL_FRAGMENT_SUBROUTINE_UNIFORM"/>
>+            <enum name="GL_COMPUTE_SUBROUTINE_UNIFORM"/>
>+            <enum name="GL_TRANSFORM_FEEDBACK_VARYING"/>
>+            <enum name="GL_TRANSFORM_FEEDBACK_BUFFER"/>
>+            <enum name="GL_BUFFER_VARIABLE"/>
>+            <enum name="GL_SHADER_STORAGE_BLOCK"/>
>+        </group>
>+
>+        <group name="VertexAttribEnum">
>+            <enum name="GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING"/>
>+            <enum name="GL_VERTEX_ATTRIB_ARRAY_ENABLED"/>
>+            <enum name="GL_VERTEX_ATTRIB_ARRAY_SIZE"/>
>+            <enum name="GL_VERTEX_ATTRIB_ARRAY_STRIDE"/>
>+            <enum name="GL_VERTEX_ATTRIB_ARRAY_TYPE"/>
>+            <enum name="GL_VERTEX_ATTRIB_ARRAY_NORMALIZED"/>
>+            <enum name="GL_VERTEX_ATTRIB_ARRAY_INTEGER"/>
>+            <enum name="GL_VERTEX_ATTRIB_ARRAY_DIVISOR"/>
>+            <enum name="GL_CURRENT_VERTEX_ATTRIB"/>
>+        </group>
>+
>+        <group name="VertexAttribType">
>+            <enum name="GL_BYTE"/>
>+            <enum name="GL_SHORT"/>
>+            <enum name="GL_INT"/>
>+            <enum name="GL_FIXED"/>
>+            <enum name="GL_FLOAT"/>
>+            <enum name="GL_HALF_FLOAT"/>
>+            <enum name="GL_DOUBLE"/>
>+            <enum name="GL_UNSIGNED_BYTE"/>
>+            <enum name="GL_UNSIGNED_SHORT"/>
>+            <enum name="GL_UNSIGNED_INT"/>
>+            <enum name="GL_INT_2_10_10_10_REV"/>
>+            <enum name="GL_UNSIGNED_INT_2_10_10_10_REV"/>
>+            <enum name="GL_UNSIGNED_INT_10F_11F_11F_REV"/>
>+        </group>
>+
>+        <group name="AttributeType">
>+            <enum name="GL_FLOAT_VEC2"/>
>+            <enum name="GL_FLOAT_VEC2_ARB"/>
>+            <enum name="GL_FLOAT_VEC3"/>
>+            <enum name="GL_FLOAT_VEC3_ARB"/>
>+            <enum name="GL_FLOAT_VEC4"/>
>+            <enum name="GL_FLOAT_VEC4_ARB"/>
>+            <enum name="GL_INT_VEC2"/>
>+            <enum name="GL_INT_VEC2_ARB"/>
>+            <enum name="GL_INT_VEC3"/>
>+            <enum name="GL_INT_VEC3_ARB"/>
>+            <enum name="GL_INT_VEC4"/>
>+            <enum name="GL_INT_VEC4_ARB"/>
>+            <enum name="GL_BOOL"/>
>+            <enum name="GL_BOOL_ARB"/>
>+            <enum name="GL_BOOL_VEC2"/>
>+            <enum name="GL_BOOL_VEC2_ARB"/>
>+            <enum name="GL_BOOL_VEC3"/>
>+            <enum name="GL_BOOL_VEC3_ARB"/>
>+            <enum name="GL_BOOL_VEC4"/>
>+            <enum name="GL_BOOL_VEC4_ARB"/>
>+            <enum name="GL_FLOAT_MAT2"/>
>+            <enum name="GL_FLOAT_MAT2_ARB"/>
>+            <enum name="GL_FLOAT_MAT3"/>
>+            <enum name="GL_FLOAT_MAT3_ARB"/>
>+            <enum name="GL_FLOAT_MAT4"/>
>+            <enum name="GL_FLOAT_MAT4_ARB"/>
>+            <enum name="GL_SAMPLER_1D"/>
>+            <enum name="GL_SAMPLER_1D_ARB"/>
>+            <enum name="GL_SAMPLER_2D"/>
>+            <enum name="GL_SAMPLER_2D_ARB"/>
>+            <enum name="GL_SAMPLER_3D"/>
>+            <enum name="GL_SAMPLER_3D_ARB"/>
>+            <enum name="GL_SAMPLER_3D_OES"/>
>+            <enum name="GL_SAMPLER_CUBE"/>
>+            <enum name="GL_SAMPLER_CUBE_ARB"/>
>+            <enum name="GL_SAMPLER_1D_SHADOW"/>
>+            <enum name="GL_SAMPLER_1D_SHADOW_ARB"/>
>+            <enum name="GL_SAMPLER_2D_SHADOW"/>
>+            <enum name="GL_SAMPLER_2D_SHADOW_ARB"/>
>+            <enum name="GL_SAMPLER_2D_SHADOW_EXT"/>
>+            <enum name="GL_SAMPLER_2D_RECT"/>
>+            <enum name="GL_SAMPLER_2D_RECT_ARB"/>
>+            <enum name="GL_SAMPLER_2D_RECT_SHADOW"/>
>+            <enum name="GL_SAMPLER_2D_RECT_SHADOW_ARB"/>
>+            <enum name="GL_FLOAT_MAT2x3"/>
>+            <enum name="GL_FLOAT_MAT2x3_NV"/>
>+            <enum name="GL_FLOAT_MAT2x4"/>
>+            <enum name="GL_FLOAT_MAT2x4_NV"/>
>+            <enum name="GL_FLOAT_MAT3x2"/>
>+            <enum name="GL_FLOAT_MAT3x2_NV"/>
>+            <enum name="GL_FLOAT_MAT3x4"/>
>+            <enum name="GL_FLOAT_MAT3x4_NV"/>
>+            <enum name="GL_FLOAT_MAT4x2"/>
>+            <enum name="GL_FLOAT_MAT4x2_NV"/>
>+            <enum name="GL_FLOAT_MAT4x3"/>
>+            <enum name="GL_FLOAT_MAT4x3_NV"/>
>+        </group>
>+
>+        <group name="InternalFormatPName">
>+            <enum name="GL_NUM_SAMPLE_COUNTS"/>
>+            <enum name="GL_SAMPLES"/>
>+            <enum name="GL_INTERNALFORMAT_SUPPORTED"/>
>+            <enum name="GL_INTERNALFORMAT_PREFERRED"/>
>+            <enum name="GL_INTERNALFORMAT_RED_SIZE"/>
>+            <enum name="GL_INTERNALFORMAT_GREEN_SIZE"/>
>+            <enum name="GL_INTERNALFORMAT_BLUE_SIZE"/>
>+            <enum name="GL_INTERNALFORMAT_ALPHA_SIZE"/>
>+            <enum name="GL_INTERNALFORMAT_DEPTH_SIZE"/>
>+            <enum name="GL_INTERNALFORMAT_STENCIL_SIZE"/>
>+            <enum name="GL_INTERNALFORMAT_SHARED_SIZE"/>
>+            <enum name="GL_INTERNALFORMAT_RED_TYPE"/>
>+            <enum name="GL_INTERNALFORMAT_GREEN_TYPE"/>
>+            <enum name="GL_INTERNALFORMAT_BLUE_TYPE"/>
>+            <enum name="GL_INTERNALFORMAT_ALPHA_TYPE"/>
>+            <enum name="GL_INTERNALFORMAT_DEPTH_TYPE"/>
>+            <enum name="GL_INTERNALFORMAT_STENCIL_TYPE"/>
>+            <enum name="GL_MAX_WIDTH"/>
>+            <enum name="GL_MAX_HEIGHT"/>
>+            <enum name="GL_MAX_DEPTH"/>
>+            <enum name="GL_MAX_LAYERS"/>
>+            <enum name="GL_COLOR_COMPONENTS"/>
>+            <enum name="GL_COLOR_RENDERABLE"/>
>+            <enum name="GL_DEPTH_RENDERABLE"/>
>+            <enum name="GL_STENCIL_RENDERABLE"/>
>+            <enum name="GL_FRAMEBUFFER_RENDERABLE"/>
>+            <enum name="GL_FRAMEBUFFER_RENDERABLE_LAYERED"/>
>+            <enum name="GL_FRAMEBUFFER_BLEND"/>
>+            <enum name="GL_READ_PIXELS"/>
>+            <enum name="GL_READ_PIXELS_FORMAT"/>
>+            <enum name="GL_READ_PIXELS_TYPE"/>
>+            <enum name="GL_TEXTURE_IMAGE_FORMAT"/>
>+            <enum name="GL_TEXTURE_IMAGE_TYPE"/>
>+            <enum name="GL_GET_TEXTURE_IMAGE_FORMAT"/>
>+            <enum name="GL_GET_TEXTURE_IMAGE_TYPE"/>
>+            <enum name="GL_MIPMAP"/>
>+            <enum name="GL_GENERATE_MIPMAP"/>
>+            <enum name="GL_AUTO_GENERATE_MIPMAP"/>
>+            <enum name="GL_COLOR_ENCODING"/>
>+            <enum name="GL_SRGB_READ"/>
>+            <enum name="GL_SRGB_WRITE"/>
>+            <enum name="GL_FILTER"/>
>+            <enum name="GL_VERTEX_TEXTURE"/>
>+            <enum name="GL_TESS_CONTROL_TEXTURE"/>
>+            <enum name="GL_TESS_EVALUATION_TEXTURE"/>
>+            <enum name="GL_GEOMETRY_TEXTURE"/>
>+            <enum name="GL_FRAGMENT_TEXTURE"/>
>+            <enum name="GL_COMPUTE_TEXTURE"/>
>+            <enum name="GL_TEXTURE_SHADOW"/>
>+            <enum name="GL_TEXTURE_GATHER"/>
>+            <enum name="GL_TEXTURE_GATHER_SHADOW"/>
>+            <enum name="GL_SHADER_IMAGE_LOAD"/>
>+            <enum name="GL_SHADER_IMAGE_STORE"/>
>+            <enum name="GL_SHADER_IMAGE_ATOMIC"/>
>+            <enum name="GL_IMAGE_TEXEL_SIZE"/>
>+            <enum name="GL_IMAGE_COMPATIBILITY_CLASS"/>
>+            <enum name="GL_IMAGE_PIXEL_FORMAT"/>
>+            <enum name="GL_IMAGE_PIXEL_TYPE"/>
>+            <enum name="GL_IMAGE_FORMAT_COMPATIBILITY_TYPE"/>
>+            <enum name="GL_SIMULTANEOUS_TEXTURE_AND_DEPTH_TEST"/>
>+            <enum name="GL_SIMULTANEOUS_TEXTURE_AND_STENCIL_TEST"/>
>+            <enum name="GL_SIMULTANEOUS_TEXTURE_AND_DEPTH_WRITE"/>
>+            <enum name="GL_SIMULTANEOUS_TEXTURE_AND_STENCIL_WRITE"/>
>+            <enum name="GL_TEXTURE_COMPRESSED"/>
>+            <enum name="GL_TEXTURE_COMPRESSED_BLOCK_WIDTH"/>
>+            <enum name="GL_TEXTURE_COMPRESSED_BLOCK_HEIGHT"/>
>+            <enum name="GL_TEXTURE_COMPRESSED_BLOCK_SIZE"/>
>+            <enum name="GL_CLEAR_BUFFER"/>
>+            <enum name="GL_TEXTURE_VIEW"/>
>+            <enum name="GL_VIEW_COMPATIBILITY_CLASS"/>
>+            <enum name="GL_CLEAR_TEXTURE"/>
>+        </group>
>+
>+        <group name="FramebufferAttachmentParameterName">
>+            <enum name="GL_FRAMEBUFFER_ATTACHMENT_RED_SIZE"/>
>+            <enum name="GL_FRAMEBUFFER_ATTACHMENT_GREEN_SIZE"/>
>+            <enum name="GL_FRAMEBUFFER_ATTACHMENT_BLUE_SIZE"/>
>+            <enum name="GL_FRAMEBUFFER_ATTACHMENT_ALPHA_SIZE"/>
>+            <enum name="GL_FRAMEBUFFER_ATTACHMENT_DEPTH_SIZE"/>
>+            <enum name="GL_FRAMEBUFFER_ATTACHMENT_STENCIL_SIZE"/>
>+            <enum name="GL_FRAMEBUFFER_ATTACHMENT_COMPONENT_TYPE"/>
>+            <enum name="GL_FRAMEBUFFER_ATTACHMENT_COLOR_ENCODING"/>
>+            <enum name="GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME"/>
>+            <enum name="GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME"/>
>+            <enum name="GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL"/>
>+            <enum name="GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE"/>
>+            <enum name="GL_FRAMEBUFFER_ATTACHMENT_LAYERED"/>
>+            <enum name="GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER"/>
>+        </group>
>+
>+        <group name="ProgramInterfacePName">
>+            <enum name="GL_ACTIVE_RESOURCES"/>
>+            <enum name="GL_MAX_NAME_LENGTH"/>
>+            <enum name="GL_MAX_NUM_ACTIVE_VARIABLES"/>
>+            <enum name="GL_MAX_NUM_COMPATIBLE_SUBROUTINES"/>
>+        </group>
>+
>+        <group name="PrecisionType">
>+            <enum name="GL_LOW_FLOAT"/>
>+            <enum name="GL_MEDIUM_FLOAT"/>
>+            <enum name="GL_HIGH_FLOAT"/>
>+            <enum name="GL_LOW_INT"/>
>+            <enum name="GL_MEDIUM_INT"/>
>+            <enum name="GL_HIGH_INT"/>
>+        </group>
>+
>+        <group name="VertexAttribPointerType">
>+            <enum name="GL_BYTE"/>
>+            <enum name="GL_UNSIGNED_BYTE"/>
>+            <enum name="GL_SHORT"/>
>+            <enum name="GL_UNSIGNED_SHORT"/>
>+            <enum name="GL_INT"/>
>+            <enum name="GL_UNSIGNED_INT"/>
>+            <enum name="GL_FLOAT"/>
>+            <enum name="GL_DOUBLE"/>
>+            <enum name="GL_HALF_FLOAT"/>
>+            <enum name="GL_FIXED"/>
>+            <enum name="GL_INT_2_10_10_10_REV"/>
>+            <enum name="GL_UNSIGNED_INT_2_10_10_10_REV"/>
>+            <enum name="GL_UNSIGNED_INT_10F_11F_11F_REV"/>
>+        </group>
>+
>+        <group name="SubroutineParameterName">
>+            <enum name="GL_NUM_COMPATIBLE_SUBROUTINES"/>
>+            <enum name="GL_COMPATIBLE_SUBROUTINES"/>
>+            <enum name="GL_UNIFORM_SIZE"/>
>+            <enum name="GL_UNIFORM_NAME_LENGTH"/>
>+        </group>
>+
>+        <group name="GetFramebufferParameter">
>+            <enum name="GL_FRAMEBUFFER_DEFAULT_WIDTH"/>
>+            <enum name="GL_FRAMEBUFFER_DEFAULT_HEIGHT"/>
>+            <enum name="GL_FRAMEBUFFER_DEFAULT_LAYERS"/>
>+            <enum name="GL_FRAMEBUFFER_DEFAULT_SAMPLES"/>
>+            <enum name="GL_FRAMEBUFFER_DEFAULT_FIXED_SAMPLE_LOCATIONS"/>
>+            <enum name="GL_DOUBLEBUFFER"/>
>+            <enum name="GL_IMPLEMENTATION_COLOR_READ_FORMAT"/>
>+            <enum name="GL_IMPLEMENTATION_COLOR_READ_TYPE"/>
>+            <enum name="GL_SAMPLES"/>
>+            <enum name="GL_SAMPLE_BUFFERS"/>
>+            <enum name="GL_STEREO"/>
>+        </group>
>+
>+        <group name="PathStringFormat">
>+            <enum name="GL_PATH_FORMAT_SVG_NV" />
>+            <enum name="GL_PATH_FORMAT_PS_NV" />
>+        </group>
>+
>+        <group name="PathFontTarget">
>+            <enum name="GL_STANDARD_FONT_NAME_NV" />
>+            <enum name="GL_SYSTEM_FONT_NAME_NV" />
>+            <enum name="GL_FILE_NAME_NV" />
>+        </group>
>+
>+        <group name="PathHandleMissingGlyphs">
>+            <enum name="GL_SKIP_MISSING_GLYPH_NV" />
>+            <enum name="GL_USE_MISSING_GLYPH_NV" />
>+        </group>
>+
>+        <group name="PathParameter">
>+            <enum name="GL_PATH_STROKE_WIDTH_NV" />
>+            <enum name="GL_PATH_INITIAL_END_CAP_NV" />
>+            <enum name="GL_PATH_TERMINAL_END_CAP_NV" />
>+            <enum name="GL_PATH_JOIN_STYLE_NV" />
>+            <enum name="GL_PATH_MITER_LIMIT_NV" />
>+            <enum name="GL_PATH_INITIAL_DASH_CAP_NV" />
>+            <enum name="GL_PATH_TERMINAL_DASH_CAP_NV" />
>+            <enum name="GL_PATH_DASH_OFFSET_NV" />
>+            <enum name="GL_PATH_CLIENT_LENGTH_NV" />
>+            <enum name="GL_PATH_DASH_OFFSET_RESET_NV" />
>+            <enum name="GL_PATH_FILL_MODE_NV" />
>+            <enum name="GL_PATH_FILL_MASK_NV" />
>+            <enum name="GL_PATH_FILL_COVER_MODE_NV" />
>+            <enum name="GL_PATH_STROKE_COVER_MODE_NV" />
>+            <enum name="GL_PATH_STROKE_MASK_NV" />
>+            
>+            <enum name="GL_PATH_END_CAPS_NV" />
>+            <enum name="GL_PATH_DASH_CAPS_NV" />
>+            <enum name="GL_PATH_COMMAND_COUNT_NV" />
>+            <enum name="GL_PATH_COORD_COUNT_NV" />
>+            <enum name="GL_PATH_DASH_ARRAY_COUNT_NV" />
>+            <enum name="GL_PATH_COMPUTED_LENGTH_NV" />
>+            <enum name="GL_PATH_OBJECT_BOUNDING_BOX_NV" />
>+            <enum name="GL_PATH_FILL_BOUNDING_BOX_NV" />
>+            <enum name="GL_PATH_STROKE_BOUNDING_BOX_NV" />
>+        </group>
>+
>+        <group name="PathColor">
>+            <enum name="GL_PRIMARY_COLOR" />
>+            <enum name="GL_PRIMARY_COLOR_NV" />
>+            <enum name="GL_SECONDARY_COLOR_NV" />
>+        </group>
>+
>+        <group name="PathGenMode">
>+            <enum name="GL_NONE" />
>+            <enum name="GL_EYE_LINEAR" />
>+            <enum name="GL_OBJECT_LINEAR" />
>+            <enum name="GL_PATH_OBJECT_BOUNDING_BOX_NV" />
>+            <enum name="GL_CONSTANT" />
>+        </group>
>+
>+        <group name="TextureLayout">
>+            <enum name="GL_LAYOUT_GENERAL_EXT"/>
>+            <enum name="GL_LAYOUT_COLOR_ATTACHMENT_EXT"/>
>+            <enum name="GL_LAYOUT_DEPTH_STENCIL_ATTACHMENT_EXT"/>
>+            <enum name="GL_LAYOUT_DEPTH_STENCIL_READ_ONLY_EXT"/>
>+            <enum name="GL_LAYOUT_SHADER_READ_ONLY_EXT"/>
>+            <enum name="GL_LAYOUT_TRANSFER_SRC_EXT"/>
>+            <enum name="GL_LAYOUT_TRANSFER_DST_EXT"/>
>+            <enum name="GL_LAYOUT_DEPTH_READ_ONLY_STENCIL_ATTACHMENT_EXT"/>
>+            <enum name="GL_LAYOUT_DEPTH_ATTACHMENT_STENCIL_READ_ONLY_EXT"/>
>+        </group>
>+
>+        <group name="PathTransformType">
>+            <enum name="GL_NONE" />
>+            <enum name="GL_TRANSLATE_X_NV" />
>+            <enum name="GL_TRANSLATE_Y_NV" />
>+            <enum name="GL_TRANSLATE_2D_NV" />
>+            <enum name="GL_TRANSLATE_3D_NV" />
>+            <enum name="GL_AFFINE_2D_NV" />
>+            <enum name="GL_AFFINE_3D_NV" />
>+            <enum name="GL_TRANSPOSE_AFFINE_2D_NV" />
>+            <enum name="GL_TRANSPOSE_AFFINE_3D_NV" />
>+        </group>
>+
>+        <group name="PathElementType">
>+            <enum name="GL_UTF8_NV" />
>+            <enum name="GL_UTF16_NV" />
>+        </group>
>+
>+        <group name="PathCoverMode">
>+            <enum name="GL_CONVEX_HULL_NV" />
>+            <enum name="GL_BOUNDING_BOX_NV" />
>+            <enum name="GL_BOUNDING_BOX_OF_BOUNDING_BOXES_NV" />
>+            <enum name="GL_PATH_FILL_COVER_MODE_NV" />
>+        </group>
>+
>+        <group name="PathFontStyle">
>+            <enum name="GL_NONE" />
>+            <enum name="GL_BOLD_BIT_NV" />
>+            <enum name="GL_ITALIC_BIT_NV" />
>+        </group>
>+
>+        <group name="PathMetricMask">
>+            <enum name="GL_GLYPH_WIDTH_BIT_NV" />
>+            <enum name="GL_GLYPH_HEIGHT_BIT_NV" />
>+            <enum name="GL_GLYPH_HORIZONTAL_BEARING_X_BIT_NV" />
>+            <enum name="GL_GLYPH_HORIZONTAL_BEARING_Y_BIT_NV" />
>+            <enum name="GL_GLYPH_HORIZONTAL_BEARING_ADVANCE_BIT_NV" />
>+            <enum name="GL_GLYPH_VERTICAL_BEARING_X_BIT_NV" />
>+            <enum name="GL_GLYPH_VERTICAL_BEARING_Y_BIT_NV" />
>+            <enum name="GL_GLYPH_VERTICAL_BEARING_ADVANCE_BIT_NV" />
>+            <enum name="GL_GLYPH_HAS_KERNING_BIT_NV" />
>+            <enum name="GL_FONT_X_MIN_BOUNDS_BIT_NV" />
>+            <enum name="GL_FONT_Y_MIN_BOUNDS_BIT_NV" />
>+            <enum name="GL_FONT_X_MAX_BOUNDS_BIT_NV" />
>+            <enum name="GL_FONT_Y_MAX_BOUNDS_BIT_NV" />
>+            <enum name="GL_FONT_UNITS_PER_EM_BIT_NV" />
>+            <enum name="GL_FONT_ASCENDER_BIT_NV" />
>+            <enum name="GL_FONT_DESCENDER_BIT_NV" />
>+            <enum name="GL_FONT_HEIGHT_BIT_NV" />
>+            <enum name="GL_FONT_MAX_ADVANCE_WIDTH_BIT_NV" />
>+            <enum name="GL_FONT_MAX_ADVANCE_HEIGHT_BIT_NV" />
>+            <enum name="GL_FONT_UNDERLINE_POSITION_BIT_NV" />
>+            <enum name="GL_FONT_UNDERLINE_THICKNESS_BIT_NV" />
>+            <enum name="GL_FONT_HAS_KERNING_BIT_NV" />
>+            <enum name="GL_FONT_NUM_GLYPH_INDICES_BIT_NV" />
>+        </group>
>+
>+        <group name="PathListMode">
>+            <enum name="GL_ACCUM_ADJACENT_PAIRS_NV" />
>+            <enum name="GL_ADJACENT_PAIRS_NV" />
>+            <enum name="GL_FIRST_TO_REST_NV" />
>+        </group>
>+
>+        <group name="ProgramPropertyARB">
>+            <enum name="GL_DELETE_STATUS" />
>+            <enum name="GL_LINK_STATUS" />
>+            <enum name="GL_VALIDATE_STATUS" />
>+            <enum name="GL_INFO_LOG_LENGTH" />
>+            <enum name="GL_ATTACHED_SHADERS" />
>+            <enum name="GL_ACTIVE_ATOMIC_COUNTER_BUFFERS" />
>+            <enum name="GL_ACTIVE_ATTRIBUTES" />
>+            <enum name="GL_ACTIVE_ATTRIBUTE_MAX_LENGTH" />
>+            <enum name="GL_ACTIVE_UNIFORMS" />
>+            <enum name="GL_ACTIVE_UNIFORM_BLOCKS" />
>+            <enum name="GL_ACTIVE_UNIFORM_BLOCK_MAX_NAME_LENGTH" />
>+            <enum name="GL_ACTIVE_UNIFORM_MAX_LENGTH" />
>+            <enum name="GL_COMPUTE_WORK_GROUP_SIZE" />
>+            <enum name="GL_PROGRAM_BINARY_LENGTH" />
>+            <enum name="GL_TRANSFORM_FEEDBACK_BUFFER_MODE" />
>+            <enum name="GL_TRANSFORM_FEEDBACK_VARYINGS" />
>+            <enum name="GL_TRANSFORM_FEEDBACK_VARYING_MAX_LENGTH" />
>+            <enum name="GL_GEOMETRY_VERTICES_OUT" />
>+            <enum name="GL_GEOMETRY_INPUT_TYPE" />
>+            <enum name="GL_GEOMETRY_OUTPUT_TYPE" />
>+        </group>
>+    </groups>
>+
>+    
>+
>+    
>+
>+    <enums namespace="GL" group="AttribMask" type="bitmask">
>+        <enum value="0x00000001" name="GL_CURRENT_BIT"/>
>+        <enum value="0x00000002" name="GL_POINT_BIT"/>
>+        <enum value="0x00000004" name="GL_LINE_BIT"/>
>+        <enum value="0x00000008" name="GL_POLYGON_BIT"/>
>+        <enum value="0x00000010" name="GL_POLYGON_STIPPLE_BIT"/>
>+        <enum value="0x00000020" name="GL_PIXEL_MODE_BIT"/>
>+        <enum value="0x00000040" name="GL_LIGHTING_BIT"/>
>+        <enum value="0x00000080" name="GL_FOG_BIT"/>
>+        <enum value="0x00000100" name="GL_DEPTH_BUFFER_BIT"/>
>+        <enum value="0x00000200" name="GL_ACCUM_BUFFER_BIT"/>
>+        <enum value="0x00000400" name="GL_STENCIL_BUFFER_BIT"/>
>+        <enum value="0x00000800" name="GL_VIEWPORT_BIT"/>
>+        <enum value="0x00001000" name="GL_TRANSFORM_BIT"/>
>+        <enum value="0x00002000" name="GL_ENABLE_BIT"/>
>+        <enum value="0x00004000" name="GL_COLOR_BUFFER_BIT"/>
>+        <enum value="0x00008000" name="GL_HINT_BIT"/>
>+        <enum value="0x00010000" name="GL_EVAL_BIT"/>
>+        <enum value="0x00020000" name="GL_LIST_BIT"/>
>+        <enum value="0x00040000" name="GL_TEXTURE_BIT"/>
>+        <enum value="0x00080000" name="GL_SCISSOR_BIT"/>
>+        <enum value="0x20000000" name="GL_MULTISAMPLE_BIT"/>
>+        <enum value="0x20000000" name="GL_MULTISAMPLE_BIT_ARB"/>
>+        <enum value="0x20000000" name="GL_MULTISAMPLE_BIT_EXT"/>
>+        <enum value="0x20000000" name="GL_MULTISAMPLE_BIT_3DFX"/>
>+        <enum value="0xFFFFFFFF" name="GL_ALL_ATTRIB_BITS" comment="Guaranteed to mark all attribute groups at once"/>
>+    </enums>
>+
>+    <enums namespace="GL" group="BufferAccessMask" type="bitmask" comment="GL_MAP_{COHERENT,FLUSH_EXPLICIT,INVALIDATE_BUFFER,INVALIDATE_RANGE,PERSISTENT,READ,UNSYNCHRONIZED,WRITE}_{BIT,BIT_EXT} also lie in this namespace">
>+      
>+    </enums>
>+
>+    <enums namespace="GL" group="ClearBufferMask" type="bitmask" comment="GL_{DEPTH,ACCUM,STENCIL,COLOR}_BUFFER_BIT also lie in this namespace">
>+        <enum value="0x00008000" name="GL_COVERAGE_BUFFER_BIT_NV" comment="Collides with AttribMask bit GL_HINT_BIT. OK since this token is for OpenGL ES 2, which doesn't have attribute groups."/>
>+            
>+    </enums>
>+
>+    <enums namespace="GL" group="ClientAttribMask" type="bitmask">
>+        <enum value="0x00000001" name="GL_CLIENT_PIXEL_STORE_BIT"/>
>+        <enum value="0x00000002" name="GL_CLIENT_VERTEX_ARRAY_BIT"/>
>+        <enum value="0xFFFFFFFF" name="GL_CLIENT_ALL_ATTRIB_BITS"/>
>+    </enums>
>+
>+    <enums namespace="GL" group="ContextFlagMask" type="bitmask" comment="Should be shared with WGL/GLX, but aren't since the FORWARD_COMPATIBLE and DEBUG values are swapped vs. WGL/GLX.">
>+        <enum value="0x00000001" name="GL_CONTEXT_FLAG_FORWARD_COMPATIBLE_BIT"/>
>+        <enum value="0x00000002" name="GL_CONTEXT_FLAG_DEBUG_BIT"/>
>+        <enum value="0x00000002" name="GL_CONTEXT_FLAG_DEBUG_BIT_KHR"/>
>+        <enum value="0x00000004" name="GL_CONTEXT_FLAG_ROBUST_ACCESS_BIT"/>
>+        <enum value="0x00000004" name="GL_CONTEXT_FLAG_ROBUST_ACCESS_BIT_ARB"/>
>+        <enum value="0x00000008" name="GL_CONTEXT_FLAG_NO_ERROR_BIT"/>
>+        <enum value="0x00000008" name="GL_CONTEXT_FLAG_NO_ERROR_BIT_KHR" alias="GL_CONTEXT_FLAG_NO_ERROR_BIT"/>
>+        <enum value="0x00000010" name="GL_CONTEXT_FLAG_PROTECTED_CONTENT_BIT_EXT"/>
>+    </enums>
>+
>+    <enums namespace="GL" group="ContextProfileMask" type="bitmask">
>+        <enum value="0x00000001" name="GL_CONTEXT_CORE_PROFILE_BIT"/>
>+        <enum value="0x00000002" name="GL_CONTEXT_COMPATIBILITY_PROFILE_BIT"/>
>+    </enums>
>+
>+    <enums namespace="GL" group="MapBufferUsageMask" type="bitmask">
>+        <enum value="0x0001" name="GL_MAP_READ_BIT"/>
>+        <enum value="0x0001" name="GL_MAP_READ_BIT_EXT"/>
>+        <enum value="0x0002" name="GL_MAP_WRITE_BIT"/>
>+        <enum value="0x0002" name="GL_MAP_WRITE_BIT_EXT"/>
>+        <enum value="0x0004" name="GL_MAP_INVALIDATE_RANGE_BIT"/>
>+        <enum value="0x0004" name="GL_MAP_INVALIDATE_RANGE_BIT_EXT"/>
>+        <enum value="0x0008" name="GL_MAP_INVALIDATE_BUFFER_BIT"/>
>+        <enum value="0x0008" name="GL_MAP_INVALIDATE_BUFFER_BIT_EXT"/>
>+        <enum value="0x0010" name="GL_MAP_FLUSH_EXPLICIT_BIT"/>
>+        <enum value="0x0010" name="GL_MAP_FLUSH_EXPLICIT_BIT_EXT"/>
>+        <enum value="0x0020" name="GL_MAP_UNSYNCHRONIZED_BIT"/>
>+        <enum value="0x0020" name="GL_MAP_UNSYNCHRONIZED_BIT_EXT"/>
>+        <enum value="0x0040" name="GL_MAP_PERSISTENT_BIT"/>
>+        <enum value="0x0040" name="GL_MAP_PERSISTENT_BIT_EXT"/>
>+        <enum value="0x0080" name="GL_MAP_COHERENT_BIT"/>
>+        <enum value="0x0080" name="GL_MAP_COHERENT_BIT_EXT"/>
>+        <enum value="0x0100" name="GL_DYNAMIC_STORAGE_BIT"/>
>+        <enum value="0x0100" name="GL_DYNAMIC_STORAGE_BIT_EXT"/>
>+        <enum value="0x0200" name="GL_CLIENT_STORAGE_BIT"/>
>+        <enum value="0x0200" name="GL_CLIENT_STORAGE_BIT_EXT"/>
>+        <enum value="0x0400" name="GL_SPARSE_STORAGE_BIT_ARB"/>
>+        <enum value="0x0800" name="GL_LGPU_SEPARATE_STORAGE_BIT_NVX"/>
>+        <enum value="0x0800" name="GL_PER_GPU_STORAGE_BIT_NV"/>
>+            <unused start="0x1000" end="0x1000" comment="Reserved for NVIDIA"/>
>+        <enum value="0x2000" name="GL_EXTERNAL_STORAGE_BIT_NVX"/>
>+    </enums>
>+
>+    <enums namespace="GL" group="MemoryBarrierMask" type="bitmask">
>+        <enum value="0x00000001" name="GL_VERTEX_ATTRIB_ARRAY_BARRIER_BIT"/>
>+        <enum value="0x00000001" name="GL_VERTEX_ATTRIB_ARRAY_BARRIER_BIT_EXT"/>
>+        <enum value="0x00000002" name="GL_ELEMENT_ARRAY_BARRIER_BIT"/>
>+        <enum value="0x00000002" name="GL_ELEMENT_ARRAY_BARRIER_BIT_EXT"/>
>+        <enum value="0x00000004" name="GL_UNIFORM_BARRIER_BIT"/>
>+        <enum value="0x00000004" name="GL_UNIFORM_BARRIER_BIT_EXT"/>
>+        <enum value="0x00000008" name="GL_TEXTURE_FETCH_BARRIER_BIT"/>
>+        <enum value="0x00000008" name="GL_TEXTURE_FETCH_BARRIER_BIT_EXT"/>
>+        <enum value="0x00000010" name="GL_SHADER_GLOBAL_ACCESS_BARRIER_BIT_NV"/>
>+        <enum value="0x00000020" name="GL_SHADER_IMAGE_ACCESS_BARRIER_BIT"/>
>+        <enum value="0x00000020" name="GL_SHADER_IMAGE_ACCESS_BARRIER_BIT_EXT"/>
>+        <enum value="0x00000040" name="GL_COMMAND_BARRIER_BIT"/>
>+        <enum value="0x00000040" name="GL_COMMAND_BARRIER_BIT_EXT"/>
>+        <enum value="0x00000080" name="GL_PIXEL_BUFFER_BARRIER_BIT"/>
>+        <enum value="0x00000080" name="GL_PIXEL_BUFFER_BARRIER_BIT_EXT"/>
>+        <enum value="0x00000100" name="GL_TEXTURE_UPDATE_BARRIER_BIT"/>
>+        <enum value="0x00000100" name="GL_TEXTURE_UPDATE_BARRIER_BIT_EXT"/>
>+        <enum value="0x00000200" name="GL_BUFFER_UPDATE_BARRIER_BIT"/>
>+        <enum value="0x00000200" name="GL_BUFFER_UPDATE_BARRIER_BIT_EXT"/>
>+        <enum value="0x00000400" name="GL_FRAMEBUFFER_BARRIER_BIT"/>
>+        <enum value="0x00000400" name="GL_FRAMEBUFFER_BARRIER_BIT_EXT"/>
>+        <enum value="0x00000800" name="GL_TRANSFORM_FEEDBACK_BARRIER_BIT"/>
>+        <enum value="0x00000800" name="GL_TRANSFORM_FEEDBACK_BARRIER_BIT_EXT"/>
>+        <enum value="0x00001000" name="GL_ATOMIC_COUNTER_BARRIER_BIT"/>
>+        <enum value="0x00001000" name="GL_ATOMIC_COUNTER_BARRIER_BIT_EXT"/>
>+        <enum value="0x00002000" name="GL_SHADER_STORAGE_BARRIER_BIT"/>
>+        <enum value="0x00004000" name="GL_CLIENT_MAPPED_BUFFER_BARRIER_BIT"/>
>+        <enum value="0x00004000" name="GL_CLIENT_MAPPED_BUFFER_BARRIER_BIT_EXT"/>
>+        <enum value="0x00008000" name="GL_QUERY_BUFFER_BARRIER_BIT"/>
>+        <enum value="0xFFFFFFFF" name="GL_ALL_BARRIER_BITS"/>
>+        <enum value="0xFFFFFFFF" name="GL_ALL_BARRIER_BITS_EXT"/>
>+    </enums>
>+
>+    <enums namespace="GL" group="OcclusionQueryEventMaskAMD" type="bitmask">
>+        <enum value="0x00000001" name="GL_QUERY_DEPTH_PASS_EVENT_BIT_AMD"/>
>+        <enum value="0x00000002" name="GL_QUERY_DEPTH_FAIL_EVENT_BIT_AMD"/>
>+        <enum value="0x00000004" name="GL_QUERY_STENCIL_FAIL_EVENT_BIT_AMD"/>
>+        <enum value="0x00000008" name="GL_QUERY_DEPTH_BOUNDS_FAIL_EVENT_BIT_AMD"/>
>+        <enum value="0xFFFFFFFF" name="GL_QUERY_ALL_EVENT_BITS_AMD"/>
>+    </enums>
>+
>+    <enums namespace="GL" group="SyncObjectMask" type="bitmask">
>+        <enum value="0x00000001" name="GL_SYNC_FLUSH_COMMANDS_BIT"/>
>+        <enum value="0x00000001" name="GL_SYNC_FLUSH_COMMANDS_BIT_APPLE"/>
>+    </enums>
>+
>+    <enums namespace="GL" group="UseProgramStageMask" type="bitmask">
>+        <enum value="0x00000001" name="GL_VERTEX_SHADER_BIT"/>
>+        <enum value="0x00000001" name="GL_VERTEX_SHADER_BIT_EXT"/>
>+        <enum value="0x00000002" name="GL_FRAGMENT_SHADER_BIT"/>
>+        <enum value="0x00000002" name="GL_FRAGMENT_SHADER_BIT_EXT"/>
>+        <enum value="0x00000004" name="GL_GEOMETRY_SHADER_BIT"/>
>+        <enum value="0x00000004" name="GL_GEOMETRY_SHADER_BIT_EXT"/>
>+        <enum value="0x00000004" name="GL_GEOMETRY_SHADER_BIT_OES"/>
>+        <enum value="0x00000008" name="GL_TESS_CONTROL_SHADER_BIT"/>
>+        <enum value="0x00000008" name="GL_TESS_CONTROL_SHADER_BIT_EXT"/>
>+        <enum value="0x00000008" name="GL_TESS_CONTROL_SHADER_BIT_OES"/>
>+        <enum value="0x00000010" name="GL_TESS_EVALUATION_SHADER_BIT"/>
>+        <enum value="0x00000010" name="GL_TESS_EVALUATION_SHADER_BIT_EXT"/>
>+        <enum value="0x00000010" name="GL_TESS_EVALUATION_SHADER_BIT_OES"/>
>+        <enum value="0x00000020" name="GL_COMPUTE_SHADER_BIT"/>
>+        <enum value="0xFFFFFFFF" name="GL_ALL_SHADER_BITS"/>
>+        <enum value="0xFFFFFFFF" name="GL_ALL_SHADER_BITS_EXT"/>
>+    </enums>
>+
>+    
>+
>+    <enums namespace="GL" group="TextureStorageMaskAMD" type="bitmask">
>+        <enum value="0x00000001" name="GL_TEXTURE_STORAGE_SPARSE_BIT_AMD"/>
>+    </enums>
>+
>+    <enums namespace="GL" group="FragmentShaderDestMaskATI" type="bitmask">
>+        <enum value="0x00000001" name="GL_RED_BIT_ATI"/>
>+        <enum value="0x00000002" name="GL_GREEN_BIT_ATI"/>
>+        <enum value="0x00000004" name="GL_BLUE_BIT_ATI"/>
>+    </enums>
>+
>+    <enums namespace="GL" group="FragmentShaderDestModMaskATI" type="bitmask">
>+        <enum value="0x00000001" name="GL_2X_BIT_ATI"/>
>+        <enum value="0x00000002" name="GL_4X_BIT_ATI"/>
>+        <enum value="0x00000004" name="GL_8X_BIT_ATI"/>
>+        <enum value="0x00000008" name="GL_HALF_BIT_ATI"/>
>+        <enum value="0x00000010" name="GL_QUARTER_BIT_ATI"/>
>+        <enum value="0x00000020" name="GL_EIGHTH_BIT_ATI"/>
>+        <enum value="0x00000040" name="GL_SATURATE_BIT_ATI"/>
>+    </enums>
>+
>+    <enums namespace="GL" group="FragmentShaderColorModMaskATI" type="bitmask">
>+            
>+        <enum value="0x00000002" name="GL_COMP_BIT_ATI"/>
>+        <enum value="0x00000004" name="GL_NEGATE_BIT_ATI"/>
>+        <enum value="0x00000008" name="GL_BIAS_BIT_ATI"/>
>+    </enums>
>+
>+    <enums namespace="GL" group="TraceMaskMESA" type="bitmask">
>+        <enum value="0x0001" name="GL_TRACE_OPERATIONS_BIT_MESA"/>
>+        <enum value="0x0002" name="GL_TRACE_PRIMITIVES_BIT_MESA"/>
>+        <enum value="0x0004" name="GL_TRACE_ARRAYS_BIT_MESA"/>
>+        <enum value="0x0008" name="GL_TRACE_TEXTURES_BIT_MESA"/>
>+        <enum value="0x0010" name="GL_TRACE_PIXELS_BIT_MESA"/>
>+        <enum value="0x0020" name="GL_TRACE_ERRORS_BIT_MESA"/>
>+        <enum value="0xFFFF" name="GL_TRACE_ALL_BITS_MESA"/>
>+    </enums>
>+
>+    <enums namespace="GL" group="PathRenderingMaskNV" type="bitmask">
>+        <enum value="0x01" name="GL_BOLD_BIT_NV"/>
>+        <enum value="0x02" name="GL_ITALIC_BIT_NV"/>
>+        <enum value="0x01" name="GL_GLYPH_WIDTH_BIT_NV"/>
>+        <enum value="0x02" name="GL_GLYPH_HEIGHT_BIT_NV"/>
>+        <enum value="0x04" name="GL_GLYPH_HORIZONTAL_BEARING_X_BIT_NV"/>
>+        <enum value="0x08" name="GL_GLYPH_HORIZONTAL_BEARING_Y_BIT_NV"/>
>+        <enum value="0x10" name="GL_GLYPH_HORIZONTAL_BEARING_ADVANCE_BIT_NV"/>
>+        <enum value="0x20" name="GL_GLYPH_VERTICAL_BEARING_X_BIT_NV"/>
>+        <enum value="0x40" name="GL_GLYPH_VERTICAL_BEARING_Y_BIT_NV"/>
>+        <enum value="0x80" name="GL_GLYPH_VERTICAL_BEARING_ADVANCE_BIT_NV"/>
>+        <enum value="0x100" name="GL_GLYPH_HAS_KERNING_BIT_NV"/>
>+        <enum value="0x00010000" name="GL_FONT_X_MIN_BOUNDS_BIT_NV"/>
>+        <enum value="0x00020000" name="GL_FONT_Y_MIN_BOUNDS_BIT_NV"/>
>+        <enum value="0x00040000" name="GL_FONT_X_MAX_BOUNDS_BIT_NV"/>
>+        <enum value="0x00080000" name="GL_FONT_Y_MAX_BOUNDS_BIT_NV"/>
>+        <enum value="0x00100000" name="GL_FONT_UNITS_PER_EM_BIT_NV"/>
>+        <enum value="0x00200000" name="GL_FONT_ASCENDER_BIT_NV"/>
>+        <enum value="0x00400000" name="GL_FONT_DESCENDER_BIT_NV"/>
>+        <enum value="0x00800000" name="GL_FONT_HEIGHT_BIT_NV"/>
>+        <enum value="0x01000000" name="GL_FONT_MAX_ADVANCE_WIDTH_BIT_NV"/>
>+        <enum value="0x02000000" name="GL_FONT_MAX_ADVANCE_HEIGHT_BIT_NV"/>
>+        <enum value="0x04000000" name="GL_FONT_UNDERLINE_POSITION_BIT_NV"/>
>+        <enum value="0x08000000" name="GL_FONT_UNDERLINE_THICKNESS_BIT_NV"/>
>+        <enum value="0x10000000" name="GL_FONT_HAS_KERNING_BIT_NV"/>
>+        <enum value="0x20000000" name="GL_FONT_NUM_GLYPH_INDICES_BIT_NV"/>
>+    </enums>
>+
>+    <enums namespace="GL" group="PerformanceQueryCapsMaskINTEL" type="bitmask">
>+        <enum value="0x00000000" name="GL_PERFQUERY_SINGLE_CONTEXT_INTEL"/>
>+        <enum value="0x00000001" name="GL_PERFQUERY_GLOBAL_CONTEXT_INTEL"/>
>+    </enums>
>+
>+    <enums namespace="GL" group="VertexHintsMaskPGI" type="bitmask">
>+        <enum value="0x00000004" name="GL_VERTEX23_BIT_PGI"/>
>+        <enum value="0x00000008" name="GL_VERTEX4_BIT_PGI"/>
>+        <enum value="0x00010000" name="GL_COLOR3_BIT_PGI"/>
>+        <enum value="0x00020000" name="GL_COLOR4_BIT_PGI"/>
>+        <enum value="0x00040000" name="GL_EDGEFLAG_BIT_PGI"/>
>+        <enum value="0x00080000" name="GL_INDEX_BIT_PGI"/>
>+        <enum value="0x00100000" name="GL_MAT_AMBIENT_BIT_PGI"/>
>+        <enum value="0x00200000" name="GL_MAT_AMBIENT_AND_DIFFUSE_BIT_PGI"/>
>+        <enum value="0x00400000" name="GL_MAT_DIFFUSE_BIT_PGI"/>
>+        <enum value="0x00800000" name="GL_MAT_EMISSION_BIT_PGI"/>
>+        <enum value="0x01000000" name="GL_MAT_COLOR_INDEXES_BIT_PGI"/>
>+        <enum value="0x02000000" name="GL_MAT_SHININESS_BIT_PGI"/>
>+        <enum value="0x04000000" name="GL_MAT_SPECULAR_BIT_PGI"/>
>+        <enum value="0x08000000" name="GL_NORMAL_BIT_PGI"/>
>+        <enum value="0x10000000" name="GL_TEXCOORD1_BIT_PGI"/>
>+        <enum value="0x20000000" name="GL_TEXCOORD2_BIT_PGI"/>
>+        <enum value="0x40000000" name="GL_TEXCOORD3_BIT_PGI"/>
>+        <enum value="0x80000000" name="GL_TEXCOORD4_BIT_PGI"/>
>+    </enums>
>+
>+    <enums namespace="GL" group="BufferBitQCOM" type="bitmask">
>+        <enum value="0x00000001" name="GL_COLOR_BUFFER_BIT0_QCOM"/>
>+        <enum value="0x00000002" name="GL_COLOR_BUFFER_BIT1_QCOM"/>
>+        <enum value="0x00000004" name="GL_COLOR_BUFFER_BIT2_QCOM"/>
>+        <enum value="0x00000008" name="GL_COLOR_BUFFER_BIT3_QCOM"/>
>+        <enum value="0x00000010" name="GL_COLOR_BUFFER_BIT4_QCOM"/>
>+        <enum value="0x00000020" name="GL_COLOR_BUFFER_BIT5_QCOM"/>
>+        <enum value="0x00000040" name="GL_COLOR_BUFFER_BIT6_QCOM"/>
>+        <enum value="0x00000080" name="GL_COLOR_BUFFER_BIT7_QCOM"/>
>+        <enum value="0x00000100" name="GL_DEPTH_BUFFER_BIT0_QCOM"/>
>+        <enum value="0x00000200" name="GL_DEPTH_BUFFER_BIT1_QCOM"/>
>+        <enum value="0x00000400" name="GL_DEPTH_BUFFER_BIT2_QCOM"/>
>+        <enum value="0x00000800" name="GL_DEPTH_BUFFER_BIT3_QCOM"/>
>+        <enum value="0x00001000" name="GL_DEPTH_BUFFER_BIT4_QCOM"/>
>+        <enum value="0x00002000" name="GL_DEPTH_BUFFER_BIT5_QCOM"/>
>+        <enum value="0x00004000" name="GL_DEPTH_BUFFER_BIT6_QCOM"/>
>+        <enum value="0x00008000" name="GL_DEPTH_BUFFER_BIT7_QCOM"/>
>+        <enum value="0x00010000" name="GL_STENCIL_BUFFER_BIT0_QCOM"/>
>+        <enum value="0x00020000" name="GL_STENCIL_BUFFER_BIT1_QCOM"/>
>+        <enum value="0x00040000" name="GL_STENCIL_BUFFER_BIT2_QCOM"/>
>+        <enum value="0x00080000" name="GL_STENCIL_BUFFER_BIT3_QCOM"/>
>+        <enum value="0x00100000" name="GL_STENCIL_BUFFER_BIT4_QCOM"/>
>+        <enum value="0x00200000" name="GL_STENCIL_BUFFER_BIT5_QCOM"/>
>+        <enum value="0x00400000" name="GL_STENCIL_BUFFER_BIT6_QCOM"/>
>+        <enum value="0x00800000" name="GL_STENCIL_BUFFER_BIT7_QCOM"/>
>+        <enum value="0x01000000" name="GL_MULTISAMPLE_BUFFER_BIT0_QCOM"/>
>+        <enum value="0x02000000" name="GL_MULTISAMPLE_BUFFER_BIT1_QCOM"/>
>+        <enum value="0x04000000" name="GL_MULTISAMPLE_BUFFER_BIT2_QCOM"/>
>+        <enum value="0x08000000" name="GL_MULTISAMPLE_BUFFER_BIT3_QCOM"/>
>+        <enum value="0x10000000" name="GL_MULTISAMPLE_BUFFER_BIT4_QCOM"/>
>+        <enum value="0x20000000" name="GL_MULTISAMPLE_BUFFER_BIT5_QCOM"/>
>+        <enum value="0x40000000" name="GL_MULTISAMPLE_BUFFER_BIT6_QCOM"/>
>+        <enum value="0x80000000" name="GL_MULTISAMPLE_BUFFER_BIT7_QCOM"/>
>+    </enums>
>+
>+    <enums namespace="GL" group="FoveationConfigBitQCOM" type="bitmask">
>+        <enum value="0x00000001" name="GL_FOVEATION_ENABLE_BIT_QCOM"/>
>+        <enum value="0x00000002" name="GL_FOVEATION_SCALED_BIN_METHOD_BIT_QCOM"/>
>+    </enums>
>+
>+    <enums namespace="GL" group="FfdMaskSGIX" type="bitmask">
>+        <enum value="0x00000001" name="GL_TEXTURE_DEFORMATION_BIT_SGIX"/>
>+        <enum value="0x00000002" name="GL_GEOMETRY_DEFORMATION_BIT_SGIX"/>
>+    </enums>
>+
>+
>+    
>+
>+    <enums namespace="GL" group="CommandOpcodesNV" vendor="NV" comment="For NV_command_list.">
>+        <enum value="0x0000" name="GL_TERMINATE_SEQUENCE_COMMAND_NV"/>
>+        <enum value="0x0001" name="GL_NOP_COMMAND_NV"/>
>+        <enum value="0x0002" name="GL_DRAW_ELEMENTS_COMMAND_NV"/>
>+        <enum value="0x0003" name="GL_DRAW_ARRAYS_COMMAND_NV"/>
>+        <enum value="0x0004" name="GL_DRAW_ELEMENTS_STRIP_COMMAND_NV"/>
>+        <enum value="0x0005" name="GL_DRAW_ARRAYS_STRIP_COMMAND_NV"/>
>+        <enum value="0x0006" name="GL_DRAW_ELEMENTS_INSTANCED_COMMAND_NV"/>
>+        <enum value="0x0007" name="GL_DRAW_ARRAYS_INSTANCED_COMMAND_NV"/>
>+        <enum value="0x0008" name="GL_ELEMENT_ADDRESS_COMMAND_NV"/>
>+        <enum value="0x0009" name="GL_ATTRIBUTE_ADDRESS_COMMAND_NV"/>
>+        <enum value="0x000A" name="GL_UNIFORM_ADDRESS_COMMAND_NV"/>
>+        <enum value="0x000B" name="GL_BLEND_COLOR_COMMAND_NV"/>
>+        <enum value="0x000C" name="GL_STENCIL_REF_COMMAND_NV"/>
>+        <enum value="0x000D" name="GL_LINE_WIDTH_COMMAND_NV"/>
>+        <enum value="0x000E" name="GL_POLYGON_OFFSET_COMMAND_NV"/>
>+        <enum value="0x000F" name="GL_ALPHA_REF_COMMAND_NV"/>
>+        <enum value="0x0010" name="GL_VIEWPORT_COMMAND_NV"/>
>+        <enum value="0x0011" name="GL_SCISSOR_COMMAND_NV"/>
>+        <enum value="0x0012" name="GL_FRONT_FACE_COMMAND_NV"/>
>+    </enums>
>+
>+    <enums namespace="GL" group="MapTextureFormatINTEL" vendor="INTEL" comment="Texture memory layouts for INTEL_map_texture">
>+        <enum value="0" name="GL_LAYOUT_DEFAULT_INTEL"/>
>+        <enum value="1" name="GL_LAYOUT_LINEAR_INTEL"/>
>+        <enum value="2" name="GL_LAYOUT_LINEAR_CPU_CACHED_INTEL"/>
>+    </enums>
>+
>+    <enums namespace="GL" group="PathRenderingTokenNV" vendor="NV">
>+        <enum value="0x00" name="GL_CLOSE_PATH_NV"/>
>+        <enum value="0x02" name="GL_MOVE_TO_NV"/>
>+        <enum value="0x03" name="GL_RELATIVE_MOVE_TO_NV"/>
>+        <enum value="0x04" name="GL_LINE_TO_NV"/>
>+        <enum value="0x05" name="GL_RELATIVE_LINE_TO_NV"/>
>+        <enum value="0x06" name="GL_HORIZONTAL_LINE_TO_NV"/>
>+        <enum value="0x07" name="GL_RELATIVE_HORIZONTAL_LINE_TO_NV"/>
>+        <enum value="0x08" name="GL_VERTICAL_LINE_TO_NV"/>
>+        <enum value="0x09" name="GL_RELATIVE_VERTICAL_LINE_TO_NV"/>
>+        <enum value="0x0A" name="GL_QUADRATIC_CURVE_TO_NV"/>
>+        <enum value="0x0B" name="GL_RELATIVE_QUADRATIC_CURVE_TO_NV"/>
>+        <enum value="0x0C" name="GL_CUBIC_CURVE_TO_NV"/>
>+        <enum value="0x0D" name="GL_RELATIVE_CUBIC_CURVE_TO_NV"/>
>+        <enum value="0x0E" name="GL_SMOOTH_QUADRATIC_CURVE_TO_NV"/>
>+        <enum value="0x0F" name="GL_RELATIVE_SMOOTH_QUADRATIC_CURVE_TO_NV"/>
>+        <enum value="0x10" name="GL_SMOOTH_CUBIC_CURVE_TO_NV"/>
>+        <enum value="0x11" name="GL_RELATIVE_SMOOTH_CUBIC_CURVE_TO_NV"/>
>+        <enum value="0x12" name="GL_SMALL_CCW_ARC_TO_NV"/>
>+        <enum value="0x13" name="GL_RELATIVE_SMALL_CCW_ARC_TO_NV"/>
>+        <enum value="0x14" name="GL_SMALL_CW_ARC_TO_NV"/>
>+        <enum value="0x15" name="GL_RELATIVE_SMALL_CW_ARC_TO_NV"/>
>+        <enum value="0x16" name="GL_LARGE_CCW_ARC_TO_NV"/>
>+        <enum value="0x17" name="GL_RELATIVE_LARGE_CCW_ARC_TO_NV"/>
>+        <enum value="0x18" name="GL_LARGE_CW_ARC_TO_NV"/>
>+        <enum value="0x19" name="GL_RELATIVE_LARGE_CW_ARC_TO_NV"/>
>+        <enum value="0x1A" name="GL_CONIC_CURVE_TO_NV"/>
>+        <enum value="0x1B" name="GL_RELATIVE_CONIC_CURVE_TO_NV"/>
>+            <unused start="0x1C" end="0xBF" comment="Unused for PathRenderingTokenNV"/>
>+        <enum value="0xC0" name="GL_SHARED_EDGE_NV"/>
>+            <unused start="0xC1" end="0xE7" comment="Unused for PathRenderingTokenNV"/>
>+        <enum value="0xE8" name="GL_ROUNDED_RECT_NV"/>
>+        <enum value="0xE9" name="GL_RELATIVE_ROUNDED_RECT_NV"/>
>+        <enum value="0xEA" name="GL_ROUNDED_RECT2_NV"/>
>+        <enum value="0xEB" name="GL_RELATIVE_ROUNDED_RECT2_NV"/>
>+        <enum value="0xEC" name="GL_ROUNDED_RECT4_NV"/>
>+        <enum value="0xED" name="GL_RELATIVE_ROUNDED_RECT4_NV"/>
>+        <enum value="0xEE" name="GL_ROUNDED_RECT8_NV"/>
>+        <enum value="0xEF" name="GL_RELATIVE_ROUNDED_RECT8_NV"/>
>+        <enum value="0xF0" name="GL_RESTART_PATH_NV"/>
>+        <enum value="0xF2" name="GL_DUP_FIRST_CUBIC_CURVE_TO_NV"/>
>+        <enum value="0xF4" name="GL_DUP_LAST_CUBIC_CURVE_TO_NV"/>
>+        <enum value="0xF6" name="GL_RECT_NV"/>
>+        <enum value="0xF7" name="GL_RELATIVE_RECT_NV"/>
>+        <enum value="0xF8" name="GL_CIRCULAR_CCW_ARC_TO_NV"/>
>+        <enum value="0xFA" name="GL_CIRCULAR_CW_ARC_TO_NV"/>
>+        <enum value="0xFC" name="GL_CIRCULAR_TANGENT_ARC_TO_NV"/>
>+        <enum value="0xFE" name="GL_ARC_TO_NV"/>
>+        <enum value="0xFF" name="GL_RELATIVE_ARC_TO_NV"/>
>+    </enums>
>+
>+    <enums namespace="GL" group="TransformFeedbackTokenNV" vendor="NV" comment="For NV_transform_feedback. No clue why small negative values are used">
>+        <enum value="-2" name="GL_NEXT_BUFFER_NV"/>
>+        <enum value="-3" name="GL_SKIP_COMPONENTS4_NV"/>
>+        <enum value="-4" name="GL_SKIP_COMPONENTS3_NV"/>
>+        <enum value="-5" name="GL_SKIP_COMPONENTS2_NV"/>
>+        <enum value="-6" name="GL_SKIP_COMPONENTS1_NV"/>
>+    </enums>
>+
>+    <enums namespace="GL" group="TriangleListSUN" vendor="SUN">
>+        <enum value="0x0001" name="GL_RESTART_SUN"/>
>+        <enum value="0x0002" name="GL_REPLACE_MIDDLE_SUN"/>
>+        <enum value="0x0003" name="GL_REPLACE_OLDEST_SUN"/>
>+    </enums>
>+
>+    
>+
>+    <enums namespace="GL" group="SpecialNumbers" vendor="ARB" comment="Tokens whose numeric value is intrinsically meaningful">
>+        <enum value="0" name="GL_FALSE"/>
>+        <enum value="0" name="GL_NO_ERROR"/>
>+        <enum value="0" name="GL_ZERO"/>
>+        <enum value="0" name="GL_NONE"/>
>+        <enum value="0" name="GL_NONE_OES"/>
>+        <enum value="1" name="GL_TRUE"/>
>+        <enum value="1" name="GL_ONE"/>
>+        <enum value="0xFFFFFFFF" name="GL_INVALID_INDEX" type="u" comment="Tagged as uint"/>
>+        <enum value="0xFFFFFFFF" name="GL_ALL_PIXELS_AMD"/>
>+        <enum value="0xFFFFFFFFFFFFFFFF" name="GL_TIMEOUT_IGNORED" type="ull" comment="Tagged as uint64"/>
>+        <enum value="0xFFFFFFFFFFFFFFFF" name="GL_TIMEOUT_IGNORED_APPLE" type="ull" comment="Tagged as uint64"/>
>+        <enum value="1" name="GL_VERSION_ES_CL_1_0" comment="Not an API enum. API definition macro for ES 1.0/1.1 headers"/>
>+        <enum value="1" name="GL_VERSION_ES_CM_1_1" comment="Not an API enum. API definition macro for ES 1.0/1.1 headers"/>
>+        <enum value="1" name="GL_VERSION_ES_CL_1_1" comment="Not an API enum. API definition macro for ES 1.0/1.1 headers"/>
>+        <enum value="16" name="GL_UUID_SIZE_EXT"/>
>+        <enum value="8" name="GL_LUID_SIZE_EXT"/>
>+    </enums>
>+
>+    <enums namespace="GL" start="0x0000" end="0x7FFF" vendor="ARB" comment="Mostly OpenGL 1.0/1.1 enum assignments. Unused ranges should generally remain unused.">
>+        <enum value="0x0000" name="GL_POINTS"/>
>+        <enum value="0x0001" name="GL_LINES"/>
>+        <enum value="0x0002" name="GL_LINE_LOOP"/>
>+        <enum value="0x0003" name="GL_LINE_STRIP"/>
>+        <enum value="0x0004" name="GL_TRIANGLES"/>
>+        <enum value="0x0005" name="GL_TRIANGLE_STRIP"/>
>+        <enum value="0x0006" name="GL_TRIANGLE_FAN"/>
>+        <enum value="0x0007" name="GL_QUADS"/>
>+        <enum value="0x0007" name="GL_QUADS_EXT"/>
>+        <enum value="0x0007" name="GL_QUADS_OES"/>
>+        <enum value="0x0008" name="GL_QUAD_STRIP"/>
>+        <enum value="0x0009" name="GL_POLYGON"/>
>+        <enum value="0x000A" name="GL_LINES_ADJACENCY"/>
>+        <enum value="0x000A" name="GL_LINES_ADJACENCY_ARB"/>
>+        <enum value="0x000A" name="GL_LINES_ADJACENCY_EXT"/>
>+        <enum value="0x000A" name="GL_LINES_ADJACENCY_OES"/>
>+        <enum value="0x000B" name="GL_LINE_STRIP_ADJACENCY"/>
>+        <enum value="0x000B" name="GL_LINE_STRIP_ADJACENCY_ARB"/>
>+        <enum value="0x000B" name="GL_LINE_STRIP_ADJACENCY_EXT"/>
>+        <enum value="0x000B" name="GL_LINE_STRIP_ADJACENCY_OES"/>
>+        <enum value="0x000C" name="GL_TRIANGLES_ADJACENCY"/>
>+        <enum value="0x000C" name="GL_TRIANGLES_ADJACENCY_ARB"/>
>+        <enum value="0x000C" name="GL_TRIANGLES_ADJACENCY_EXT"/>
>+        <enum value="0x000C" name="GL_TRIANGLES_ADJACENCY_OES"/>
>+        <enum value="0x000D" name="GL_TRIANGLE_STRIP_ADJACENCY"/>
>+        <enum value="0x000D" name="GL_TRIANGLE_STRIP_ADJACENCY_ARB"/>
>+        <enum value="0x000D" name="GL_TRIANGLE_STRIP_ADJACENCY_EXT"/>
>+        <enum value="0x000D" name="GL_TRIANGLE_STRIP_ADJACENCY_OES"/>
>+        <enum value="0x000E" name="GL_PATCHES"/>
>+        <enum value="0x000E" name="GL_PATCHES_EXT"/>
>+        <enum value="0x000E" name="GL_PATCHES_OES"/>
>+            <unused start="0x000F" end="0x00FF" comment="Unused for PrimitiveType"/>
>+        <enum value="0x0100" name="GL_ACCUM"/>
>+        <enum value="0x0101" name="GL_LOAD"/>
>+        <enum value="0x0102" name="GL_RETURN"/>
>+        <enum value="0x0103" name="GL_MULT"/>
>+        <enum value="0x0104" name="GL_ADD"/>
>+            <unused start="0x0105" end="0x01FF" comment="Unused for AccumOp"/>
>+        <enum value="0x0200" name="GL_NEVER"/>
>+        <enum value="0x0201" name="GL_LESS"/>
>+        <enum value="0x0202" name="GL_EQUAL"/>
>+        <enum value="0x0203" name="GL_LEQUAL"/>
>+        <enum value="0x0204" name="GL_GREATER"/>
>+        <enum value="0x0205" name="GL_NOTEQUAL"/>
>+        <enum value="0x0206" name="GL_GEQUAL"/>
>+        <enum value="0x0207" name="GL_ALWAYS"/>
>+            <unused start="0x0208" end="0x02FF" comment="Unused for AlphaFunction"/>
>+        <enum value="0x0300" name="GL_SRC_COLOR"/>
>+        <enum value="0x0301" name="GL_ONE_MINUS_SRC_COLOR"/>
>+        <enum value="0x0302" name="GL_SRC_ALPHA"/>
>+        <enum value="0x0303" name="GL_ONE_MINUS_SRC_ALPHA"/>
>+        <enum value="0x0304" name="GL_DST_ALPHA"/>
>+        <enum value="0x0305" name="GL_ONE_MINUS_DST_ALPHA"/>
>+        <enum value="0x0306" name="GL_DST_COLOR"/>
>+        <enum value="0x0307" name="GL_ONE_MINUS_DST_COLOR"/>
>+        <enum value="0x0308" name="GL_SRC_ALPHA_SATURATE"/>
>+        <enum value="0x0308" name="GL_SRC_ALPHA_SATURATE_EXT"/>
>+            <unused start="0x0309" end="0x03FF" comment="Unused for BlendingFactor"/>
>+        <enum value="0x0400" name="GL_FRONT_LEFT"/>
>+        <enum value="0x0401" name="GL_FRONT_RIGHT"/>
>+        <enum value="0x0402" name="GL_BACK_LEFT"/>
>+        <enum value="0x0403" name="GL_BACK_RIGHT"/>
>+        <enum value="0x0404" name="GL_FRONT"/>
>+        <enum value="0x0405" name="GL_BACK"/>
>+        <enum value="0x0406" name="GL_LEFT"/>
>+        <enum value="0x0407" name="GL_RIGHT"/>
>+        <enum value="0x0408" name="GL_FRONT_AND_BACK"/>
>+        <enum value="0x0409" name="GL_AUX0"/>
>+        <enum value="0x040A" name="GL_AUX1"/>
>+        <enum value="0x040B" name="GL_AUX2"/>
>+        <enum value="0x040C" name="GL_AUX3"/>
>+            <unused start="0x040D" end="0x04FF" comment="Unused for DrawBufferMode"/>
>+        <enum value="0x0500" name="GL_INVALID_ENUM"/>
>+        <enum value="0x0501" name="GL_INVALID_VALUE"/>
>+        <enum value="0x0502" name="GL_INVALID_OPERATION"/>
>+        <enum value="0x0503" name="GL_STACK_OVERFLOW"/>
>+        <enum value="0x0503" name="GL_STACK_OVERFLOW_KHR"/>
>+        <enum value="0x0504" name="GL_STACK_UNDERFLOW"/>
>+        <enum value="0x0504" name="GL_STACK_UNDERFLOW_KHR"/>
>+        <enum value="0x0505" name="GL_OUT_OF_MEMORY"/>
>+        <enum value="0x0506" name="GL_INVALID_FRAMEBUFFER_OPERATION"/>
>+        <enum value="0x0506" name="GL_INVALID_FRAMEBUFFER_OPERATION_EXT"/>
>+        <enum value="0x0506" name="GL_INVALID_FRAMEBUFFER_OPERATION_OES"/>
>+        <enum value="0x0507" name="GL_CONTEXT_LOST"/>
>+        <enum value="0x0507" name="GL_CONTEXT_LOST_KHR"/>
>+            <unused start="0x0508" end="0x05FF" comment="Unused for ErrorCode"/>
>+        <enum value="0x0600" name="GL_2D"/>
>+        <enum value="0x0601" name="GL_3D"/>
>+        <enum value="0x0602" name="GL_3D_COLOR"/>
>+        <enum value="0x0603" name="GL_3D_COLOR_TEXTURE"/>
>+        <enum value="0x0604" name="GL_4D_COLOR_TEXTURE"/>
>+            <unused start="0x0605" end="0x06FF" comment="Unused for FeedbackType"/>
>+        <enum value="0x0700" name="GL_PASS_THROUGH_TOKEN"/>
>+        <enum value="0x0701" name="GL_POINT_TOKEN"/>
>+        <enum value="0x0702" name="GL_LINE_TOKEN"/>
>+        <enum value="0x0703" name="GL_POLYGON_TOKEN"/>
>+        <enum value="0x0704" name="GL_BITMAP_TOKEN"/>
>+        <enum value="0x0705" name="GL_DRAW_PIXEL_TOKEN"/>
>+        <enum value="0x0706" name="GL_COPY_PIXEL_TOKEN"/>
>+        <enum value="0x0707" name="GL_LINE_RESET_TOKEN"/>
>+            <unused start="0x0708" end="0x07FF" comment="Unused for FeedbackToken"/>
>+        <enum value="0x0800" name="GL_EXP"/>
>+        <enum value="0x0801" name="GL_EXP2"/>
>+            <unused start="0x0802" end="0x08FF" comment="Unused for FogMode"/>
>+        <enum value="0x0900" name="GL_CW"/>
>+        <enum value="0x0901" name="GL_CCW"/>
>+            <unused start="0x0902" end="0x09FF" comment="Unused for FrontFaceDirection"/>
>+        <enum value="0x0A00" name="GL_COEFF"/>
>+        <enum value="0x0A01" name="GL_ORDER"/>
>+        <enum value="0x0A02" name="GL_DOMAIN"/>
>+            <unused start="0x0A03" end="0x0AFF" comment="Unused for GetMapQuery"/>
>+        <enum value="0x0B00" name="GL_CURRENT_COLOR"/>
>+        <enum value="0x0B01" name="GL_CURRENT_INDEX"/>
>+        <enum value="0x0B02" name="GL_CURRENT_NORMAL"/>
>+        <enum value="0x0B03" name="GL_CURRENT_TEXTURE_COORDS"/>
>+        <enum value="0x0B04" name="GL_CURRENT_RASTER_COLOR"/>
>+        <enum value="0x0B05" name="GL_CURRENT_RASTER_INDEX"/>
>+        <enum value="0x0B06" name="GL_CURRENT_RASTER_TEXTURE_COORDS"/>
>+        <enum value="0x0B07" name="GL_CURRENT_RASTER_POSITION"/>
>+        <enum value="0x0B08" name="GL_CURRENT_RASTER_POSITION_VALID"/>
>+        <enum value="0x0B09" name="GL_CURRENT_RASTER_DISTANCE"/>
>+
>+        <enum value="0x0B10" name="GL_POINT_SMOOTH"/>
>+        <enum value="0x0B11" name="GL_POINT_SIZE"/>
>+        <enum value="0x0B12" name="GL_POINT_SIZE_RANGE"/>
>+        <enum value="0x0B12" name="GL_SMOOTH_POINT_SIZE_RANGE" alias="GL_POINT_SIZE_RANGE"/>
>+        <enum value="0x0B13" name="GL_POINT_SIZE_GRANULARITY"/>
>+        <enum value="0x0B13" name="GL_SMOOTH_POINT_SIZE_GRANULARITY" alias="GL_POINT_SIZE_GRANULARITY"/>
>+
>+        <enum value="0x0B20" name="GL_LINE_SMOOTH"/>
>+        <enum value="0x0B21" name="GL_LINE_WIDTH"/>
>+        <enum value="0x0B22" name="GL_LINE_WIDTH_RANGE"/>
>+        <enum value="0x0B22" name="GL_SMOOTH_LINE_WIDTH_RANGE" alias="GL_LINE_WIDTH_RANGE"/>
>+        <enum value="0x0B23" name="GL_LINE_WIDTH_GRANULARITY"/>
>+        <enum value="0x0B23" name="GL_SMOOTH_LINE_WIDTH_GRANULARITY" alias="GL_LINE_WIDTH_GRANULARITY"/>
>+        <enum value="0x0B24" name="GL_LINE_STIPPLE"/>
>+        <enum value="0x0B25" name="GL_LINE_STIPPLE_PATTERN"/>
>+        <enum value="0x0B26" name="GL_LINE_STIPPLE_REPEAT"/>
>+
>+        <enum value="0x0B30" name="GL_LIST_MODE"/>
>+        <enum value="0x0B31" name="GL_MAX_LIST_NESTING"/>
>+        <enum value="0x0B32" name="GL_LIST_BASE"/>
>+        <enum value="0x0B33" name="GL_LIST_INDEX"/>
>+
>+        <enum value="0x0B40" name="GL_POLYGON_MODE"/>
>+        <enum value="0x0B40" name="GL_POLYGON_MODE_NV"/>
>+        <enum value="0x0B41" name="GL_POLYGON_SMOOTH"/>
>+        <enum value="0x0B42" name="GL_POLYGON_STIPPLE"/>
>+        <enum value="0x0B43" name="GL_EDGE_FLAG"/>
>+        <enum value="0x0B44" name="GL_CULL_FACE"/>
>+        <enum value="0x0B45" name="GL_CULL_FACE_MODE"/>
>+        <enum value="0x0B46" name="GL_FRONT_FACE"/>
>+
>+        <enum value="0x0B50" name="GL_LIGHTING"/>
>+        <enum value="0x0B51" name="GL_LIGHT_MODEL_LOCAL_VIEWER"/>
>+        <enum value="0x0B52" name="GL_LIGHT_MODEL_TWO_SIDE"/>
>+        <enum value="0x0B53" name="GL_LIGHT_MODEL_AMBIENT"/>
>+        <enum value="0x0B54" name="GL_SHADE_MODEL"/>
>+        <enum value="0x0B55" name="GL_COLOR_MATERIAL_FACE"/>
>+        <enum value="0x0B56" name="GL_COLOR_MATERIAL_PARAMETER"/>
>+        <enum value="0x0B57" name="GL_COLOR_MATERIAL"/>
>+
>+        <enum value="0x0B60" name="GL_FOG"/>
>+        <enum value="0x0B61" name="GL_FOG_INDEX"/>
>+        <enum value="0x0B62" name="GL_FOG_DENSITY"/>
>+        <enum value="0x0B63" name="GL_FOG_START"/>
>+        <enum value="0x0B64" name="GL_FOG_END"/>
>+        <enum value="0x0B65" name="GL_FOG_MODE"/>
>+        <enum value="0x0B66" name="GL_FOG_COLOR"/>
>+
>+        <enum value="0x0B70" name="GL_DEPTH_RANGE"/>
>+        <enum value="0x0B71" name="GL_DEPTH_TEST"/>
>+        <enum value="0x0B72" name="GL_DEPTH_WRITEMASK"/>
>+        <enum value="0x0B73" name="GL_DEPTH_CLEAR_VALUE"/>
>+        <enum value="0x0B74" name="GL_DEPTH_FUNC"/>
>+
>+        <enum value="0x0B80" name="GL_ACCUM_CLEAR_VALUE"/>
>+
>+        <enum value="0x0B90" name="GL_STENCIL_TEST"/>
>+        <enum value="0x0B91" name="GL_STENCIL_CLEAR_VALUE"/>
>+        <enum value="0x0B92" name="GL_STENCIL_FUNC"/>
>+        <enum value="0x0B93" name="GL_STENCIL_VALUE_MASK"/>
>+        <enum value="0x0B94" name="GL_STENCIL_FAIL"/>
>+        <enum value="0x0B95" name="GL_STENCIL_PASS_DEPTH_FAIL"/>
>+        <enum value="0x0B96" name="GL_STENCIL_PASS_DEPTH_PASS"/>
>+        <enum value="0x0B97" name="GL_STENCIL_REF"/>
>+        <enum value="0x0B98" name="GL_STENCIL_WRITEMASK"/>
>+
>+        <enum value="0x0BA0" name="GL_MATRIX_MODE"/>
>+        <enum value="0x0BA1" name="GL_NORMALIZE"/>
>+        <enum value="0x0BA2" name="GL_VIEWPORT"/>
>+        <enum value="0x0BA3" name="GL_MODELVIEW_STACK_DEPTH"/>
>+        <enum value="0x0BA3" name="GL_MODELVIEW0_STACK_DEPTH_EXT"/>
>+        <enum value="0x0BA3" name="GL_PATH_MODELVIEW_STACK_DEPTH_NV"/>
>+        <enum value="0x0BA4" name="GL_PROJECTION_STACK_DEPTH"/>
>+        <enum value="0x0BA4" name="GL_PATH_PROJECTION_STACK_DEPTH_NV"/>
>+        <enum value="0x0BA5" name="GL_TEXTURE_STACK_DEPTH"/>
>+        <enum value="0x0BA6" name="GL_MODELVIEW_MATRIX"/>
>+        <enum value="0x0BA6" name="GL_MODELVIEW0_MATRIX_EXT"/>
>+        <enum value="0x0BA6" name="GL_PATH_MODELVIEW_MATRIX_NV"/>
>+        <enum value="0x0BA7" name="GL_PROJECTION_MATRIX"/>
>+        <enum value="0x0BA7" name="GL_PATH_PROJECTION_MATRIX_NV"/>
>+        <enum value="0x0BA8" name="GL_TEXTURE_MATRIX"/>
>+
>+        <enum value="0x0BB0" name="GL_ATTRIB_STACK_DEPTH"/>
>+        <enum value="0x0BB1" name="GL_CLIENT_ATTRIB_STACK_DEPTH"/>
>+
>+        <enum value="0x0BC0" name="GL_ALPHA_TEST"/>
>+        <enum value="0x0BC0" name="GL_ALPHA_TEST_QCOM"/>
>+        <enum value="0x0BC1" name="GL_ALPHA_TEST_FUNC"/>
>+        <enum value="0x0BC1" name="GL_ALPHA_TEST_FUNC_QCOM"/>
>+        <enum value="0x0BC2" name="GL_ALPHA_TEST_REF"/>
>+        <enum value="0x0BC2" name="GL_ALPHA_TEST_REF_QCOM"/>
>+
>+        <enum value="0x0BD0" name="GL_DITHER"/>
>+
>+        <enum value="0x0BE0" name="GL_BLEND_DST"/>
>+        <enum value="0x0BE1" name="GL_BLEND_SRC"/>
>+        <enum value="0x0BE2" name="GL_BLEND"/>
>+
>+        <enum value="0x0BF0" name="GL_LOGIC_OP_MODE"/>
>+        <enum value="0x0BF1" name="GL_INDEX_LOGIC_OP"/>
>+        <enum value="0x0BF1" name="GL_LOGIC_OP"/>
>+        <enum value="0x0BF2" name="GL_COLOR_LOGIC_OP"/>
>+
>+        <enum value="0x0C00" name="GL_AUX_BUFFERS"/>
>+        <enum value="0x0C01" name="GL_DRAW_BUFFER"/>
>+        <enum value="0x0C01" name="GL_DRAW_BUFFER_EXT"/>
>+        <enum value="0x0C02" name="GL_READ_BUFFER"/>
>+        <enum value="0x0C02" name="GL_READ_BUFFER_EXT"/>
>+        <enum value="0x0C02" name="GL_READ_BUFFER_NV"/>
>+
>+        <enum value="0x0C10" name="GL_SCISSOR_BOX"/>
>+        <enum value="0x0C11" name="GL_SCISSOR_TEST"/>
>+
>+        <enum value="0x0C20" name="GL_INDEX_CLEAR_VALUE"/>
>+        <enum value="0x0C21" name="GL_INDEX_WRITEMASK"/>
>+        <enum value="0x0C22" name="GL_COLOR_CLEAR_VALUE"/>
>+        <enum value="0x0C23" name="GL_COLOR_WRITEMASK"/>
>+
>+        <enum value="0x0C30" name="GL_INDEX_MODE"/>
>+        <enum value="0x0C31" name="GL_RGBA_MODE"/>
>+        <enum value="0x0C32" name="GL_DOUBLEBUFFER"/>
>+        <enum value="0x0C33" name="GL_STEREO"/>
>+
>+        <enum value="0x0C40" name="GL_RENDER_MODE"/>
>+
>+        <enum value="0x0C50" name="GL_PERSPECTIVE_CORRECTION_HINT"/>
>+        <enum value="0x0C51" name="GL_POINT_SMOOTH_HINT"/>
>+        <enum value="0x0C52" name="GL_LINE_SMOOTH_HINT"/>
>+        <enum value="0x0C53" name="GL_POLYGON_SMOOTH_HINT"/>
>+        <enum value="0x0C54" name="GL_FOG_HINT"/>
>+
>+        <enum value="0x0C60" name="GL_TEXTURE_GEN_S"/>
>+        <enum value="0x0C61" name="GL_TEXTURE_GEN_T"/>
>+        <enum value="0x0C62" name="GL_TEXTURE_GEN_R"/>
>+        <enum value="0x0C63" name="GL_TEXTURE_GEN_Q"/>
>+
>+        <enum value="0x0C70" name="GL_PIXEL_MAP_I_TO_I"/>
>+        <enum value="0x0C71" name="GL_PIXEL_MAP_S_TO_S"/>
>+        <enum value="0x0C72" name="GL_PIXEL_MAP_I_TO_R"/>
>+        <enum value="0x0C73" name="GL_PIXEL_MAP_I_TO_G"/>
>+        <enum value="0x0C74" name="GL_PIXEL_MAP_I_TO_B"/>
>+        <enum value="0x0C75" name="GL_PIXEL_MAP_I_TO_A"/>
>+        <enum value="0x0C76" name="GL_PIXEL_MAP_R_TO_R"/>
>+        <enum value="0x0C77" name="GL_PIXEL_MAP_G_TO_G"/>
>+        <enum value="0x0C78" name="GL_PIXEL_MAP_B_TO_B"/>
>+        <enum value="0x0C79" name="GL_PIXEL_MAP_A_TO_A"/>
>+
>+        <enum value="0x0CB0" name="GL_PIXEL_MAP_I_TO_I_SIZE"/>
>+        <enum value="0x0CB1" name="GL_PIXEL_MAP_S_TO_S_SIZE"/>
>+        <enum value="0x0CB2" name="GL_PIXEL_MAP_I_TO_R_SIZE"/>
>+        <enum value="0x0CB3" name="GL_PIXEL_MAP_I_TO_G_SIZE"/>
>+        <enum value="0x0CB4" name="GL_PIXEL_MAP_I_TO_B_SIZE"/>
>+        <enum value="0x0CB5" name="GL_PIXEL_MAP_I_TO_A_SIZE"/>
>+        <enum value="0x0CB6" name="GL_PIXEL_MAP_R_TO_R_SIZE"/>
>+        <enum value="0x0CB7" name="GL_PIXEL_MAP_G_TO_G_SIZE"/>
>+        <enum value="0x0CB8" name="GL_PIXEL_MAP_B_TO_B_SIZE"/>
>+        <enum value="0x0CB9" name="GL_PIXEL_MAP_A_TO_A_SIZE"/>
>+
>+        <enum value="0x0CF0" name="GL_UNPACK_SWAP_BYTES"/>
>+        <enum value="0x0CF1" name="GL_UNPACK_LSB_FIRST"/>
>+        <enum value="0x0CF2" name="GL_UNPACK_ROW_LENGTH"/>
>+        <enum value="0x0CF2" name="GL_UNPACK_ROW_LENGTH_EXT"/>
>+        <enum value="0x0CF3" name="GL_UNPACK_SKIP_ROWS"/>
>+        <enum value="0x0CF3" name="GL_UNPACK_SKIP_ROWS_EXT"/>
>+        <enum value="0x0CF4" name="GL_UNPACK_SKIP_PIXELS"/>
>+        <enum value="0x0CF4" name="GL_UNPACK_SKIP_PIXELS_EXT"/>
>+        <enum value="0x0CF5" name="GL_UNPACK_ALIGNMENT"/>
>+
>+        <enum value="0x0D00" name="GL_PACK_SWAP_BYTES"/>
>+        <enum value="0x0D01" name="GL_PACK_LSB_FIRST"/>
>+        <enum value="0x0D02" name="GL_PACK_ROW_LENGTH"/>
>+        <enum value="0x0D03" name="GL_PACK_SKIP_ROWS"/>
>+        <enum value="0x0D04" name="GL_PACK_SKIP_PIXELS"/>
>+        <enum value="0x0D05" name="GL_PACK_ALIGNMENT"/>
>+
>+        <enum value="0x0D10" name="GL_MAP_COLOR"/>
>+        <enum value="0x0D11" name="GL_MAP_STENCIL"/>
>+        <enum value="0x0D12" name="GL_INDEX_SHIFT"/>
>+        <enum value="0x0D13" name="GL_INDEX_OFFSET"/>
>+        <enum value="0x0D14" name="GL_RED_SCALE"/>
>+        <enum value="0x0D15" name="GL_RED_BIAS"/>
>+        <enum value="0x0D16" name="GL_ZOOM_X"/>
>+        <enum value="0x0D17" name="GL_ZOOM_Y"/>
>+        <enum value="0x0D18" name="GL_GREEN_SCALE"/>
>+        <enum value="0x0D19" name="GL_GREEN_BIAS"/>
>+        <enum value="0x0D1A" name="GL_BLUE_SCALE"/>
>+        <enum value="0x0D1B" name="GL_BLUE_BIAS"/>
>+        <enum value="0x0D1C" name="GL_ALPHA_SCALE"/>
>+        <enum value="0x0D1D" name="GL_ALPHA_BIAS"/>
>+        <enum value="0x0D1E" name="GL_DEPTH_SCALE"/>
>+        <enum value="0x0D1F" name="GL_DEPTH_BIAS"/>
>+
>+        <enum value="0x0D30" name="GL_MAX_EVAL_ORDER"/>
>+        <enum value="0x0D31" name="GL_MAX_LIGHTS"/>
>+        <enum value="0x0D32" name="GL_MAX_CLIP_PLANES"/>
>+        <enum value="0x0D32" name="GL_MAX_CLIP_PLANES_IMG"/>
>+        <enum value="0x0D32" name="GL_MAX_CLIP_DISTANCES" alias="GL_MAX_CLIP_PLANES"/>
>+        <enum value="0x0D32" name="GL_MAX_CLIP_DISTANCES_EXT" alias="GL_MAX_CLIP_PLANES"/>
>+        <enum value="0x0D32" name="GL_MAX_CLIP_DISTANCES_APPLE"/>
>+        <enum value="0x0D33" name="GL_MAX_TEXTURE_SIZE"/>
>+        <enum value="0x0D34" name="GL_MAX_PIXEL_MAP_TABLE"/>
>+        <enum value="0x0D35" name="GL_MAX_ATTRIB_STACK_DEPTH"/>
>+        <enum value="0x0D36" name="GL_MAX_MODELVIEW_STACK_DEPTH"/>
>+        <enum value="0x0D36" name="GL_PATH_MAX_MODELVIEW_STACK_DEPTH_NV"/>
>+        <enum value="0x0D37" name="GL_MAX_NAME_STACK_DEPTH"/>
>+        <enum value="0x0D38" name="GL_MAX_PROJECTION_STACK_DEPTH"/>
>+        <enum value="0x0D38" name="GL_PATH_MAX_PROJECTION_STACK_DEPTH_NV"/>
>+        <enum value="0x0D39" name="GL_MAX_TEXTURE_STACK_DEPTH"/>
>+        <enum value="0x0D3A" name="GL_MAX_VIEWPORT_DIMS"/>
>+        <enum value="0x0D3B" name="GL_MAX_CLIENT_ATTRIB_STACK_DEPTH"/>
>+
>+        <enum value="0x0D50" name="GL_SUBPIXEL_BITS"/>
>+        <enum value="0x0D51" name="GL_INDEX_BITS"/>
>+        <enum value="0x0D52" name="GL_RED_BITS"/>
>+        <enum value="0x0D53" name="GL_GREEN_BITS"/>
>+        <enum value="0x0D54" name="GL_BLUE_BITS"/>
>+        <enum value="0x0D55" name="GL_ALPHA_BITS"/>
>+        <enum value="0x0D56" name="GL_DEPTH_BITS"/>
>+        <enum value="0x0D57" name="GL_STENCIL_BITS"/>
>+        <enum value="0x0D58" name="GL_ACCUM_RED_BITS"/>
>+        <enum value="0x0D59" name="GL_ACCUM_GREEN_BITS"/>
>+        <enum value="0x0D5A" name="GL_ACCUM_BLUE_BITS"/>
>+        <enum value="0x0D5B" name="GL_ACCUM_ALPHA_BITS"/>
>+
>+        <enum value="0x0D70" name="GL_NAME_STACK_DEPTH"/>
>+
>+        <enum value="0x0D80" name="GL_AUTO_NORMAL"/>
>+
>+        <enum value="0x0D90" name="GL_MAP1_COLOR_4"/>
>+        <enum value="0x0D91" name="GL_MAP1_INDEX"/>
>+        <enum value="0x0D92" name="GL_MAP1_NORMAL"/>
>+        <enum value="0x0D93" name="GL_MAP1_TEXTURE_COORD_1"/>
>+        <enum value="0x0D94" name="GL_MAP1_TEXTURE_COORD_2"/>
>+        <enum value="0x0D95" name="GL_MAP1_TEXTURE_COORD_3"/>
>+        <enum value="0x0D96" name="GL_MAP1_TEXTURE_COORD_4"/>
>+        <enum value="0x0D97" name="GL_MAP1_VERTEX_3"/>
>+        <enum value="0x0D98" name="GL_MAP1_VERTEX_4"/>
>+
>+        <enum value="0x0DB0" name="GL_MAP2_COLOR_4"/>
>+        <enum value="0x0DB1" name="GL_MAP2_INDEX"/>
>+        <enum value="0x0DB2" name="GL_MAP2_NORMAL"/>
>+        <enum value="0x0DB3" name="GL_MAP2_TEXTURE_COORD_1"/>
>+        <enum value="0x0DB4" name="GL_MAP2_TEXTURE_COORD_2"/>
>+        <enum value="0x0DB5" name="GL_MAP2_TEXTURE_COORD_3"/>
>+        <enum value="0x0DB6" name="GL_MAP2_TEXTURE_COORD_4"/>
>+        <enum value="0x0DB7" name="GL_MAP2_VERTEX_3"/>
>+        <enum value="0x0DB8" name="GL_MAP2_VERTEX_4"/>
>+
>+        <enum value="0x0DD0" name="GL_MAP1_GRID_DOMAIN"/>
>+        <enum value="0x0DD1" name="GL_MAP1_GRID_SEGMENTS"/>
>+        <enum value="0x0DD2" name="GL_MAP2_GRID_DOMAIN"/>
>+        <enum value="0x0DD3" name="GL_MAP2_GRID_SEGMENTS"/>
>+
>+        <enum value="0x0DE0" name="GL_TEXTURE_1D"/>
>+        <enum value="0x0DE1" name="GL_TEXTURE_2D"/>
>+
>+        <enum value="0x0DF0" name="GL_FEEDBACK_BUFFER_POINTER"/>
>+        <enum value="0x0DF1" name="GL_FEEDBACK_BUFFER_SIZE"/>
>+        <enum value="0x0DF2" name="GL_FEEDBACK_BUFFER_TYPE"/>
>+        <enum value="0x0DF3" name="GL_SELECTION_BUFFER_POINTER"/>
>+        <enum value="0x0DF4" name="GL_SELECTION_BUFFER_SIZE"/>
>+            <unused start="0x0DF5" end="0xFFFF" comment="Unused for GetPName"/>
>+        <enum value="0x1000" name="GL_TEXTURE_WIDTH"/>
>+        <enum value="0x1001" name="GL_TEXTURE_HEIGHT"/>
>+        <enum value="0x1003" name="GL_TEXTURE_INTERNAL_FORMAT"/>
>+        <enum value="0x1003" name="GL_TEXTURE_COMPONENTS"/>
>+        <enum value="0x1004" name="GL_TEXTURE_BORDER_COLOR"/>
>+        <enum value="0x1004" name="GL_TEXTURE_BORDER_COLOR_EXT"/>
>+        <enum value="0x1004" name="GL_TEXTURE_BORDER_COLOR_NV"/>
>+        <enum value="0x1004" name="GL_TEXTURE_BORDER_COLOR_OES"/>
>+        <enum value="0x1005" name="GL_TEXTURE_BORDER"/>
>+        <enum value="0x1006" name="GL_TEXTURE_TARGET"/>
>+            <unused start="0x1007" end="0x10FF" comment="Unused for GetTextureParameter"/>
>+        <enum value="0x1100" name="GL_DONT_CARE"/>
>+        <enum value="0x1101" name="GL_FASTEST"/>
>+        <enum value="0x1102" name="GL_NICEST"/>
>+            <unused start="0x1103" end="0x11FF" comment="Unused for HintMode"/>
>+        <enum value="0x1200" name="GL_AMBIENT"/>
>+        <enum value="0x1201" name="GL_DIFFUSE"/>
>+        <enum value="0x1202" name="GL_SPECULAR"/>
>+        <enum value="0x1203" name="GL_POSITION"/>
>+        <enum value="0x1204" name="GL_SPOT_DIRECTION"/>
>+        <enum value="0x1205" name="GL_SPOT_EXPONENT"/>
>+        <enum value="0x1206" name="GL_SPOT_CUTOFF"/>
>+        <enum value="0x1207" name="GL_CONSTANT_ATTENUATION"/>
>+        <enum value="0x1208" name="GL_LINEAR_ATTENUATION"/>
>+        <enum value="0x1209" name="GL_QUADRATIC_ATTENUATION"/>
>+            <unused start="0x1210" end="0x12FF" comment="Unused for LightParameter"/>
>+        <enum value="0x1300" name="GL_COMPILE"/>
>+        <enum value="0x1301" name="GL_COMPILE_AND_EXECUTE"/>
>+            <unused start="0x1302" end="0x13FF" comment="Unused for ListMode"/>
>+        <enum value="0x1400" name="GL_BYTE"/>
>+        <enum value="0x1401" name="GL_UNSIGNED_BYTE"/>
>+        <enum value="0x1402" name="GL_SHORT"/>
>+        <enum value="0x1403" name="GL_UNSIGNED_SHORT"/>
>+        <enum value="0x1404" name="GL_INT"/>
>+        <enum value="0x1405" name="GL_UNSIGNED_INT"/>
>+        <enum value="0x1406" name="GL_FLOAT"/>
>+        <enum value="0x1407" name="GL_2_BYTES"/>
>+        <enum value="0x1407" name="GL_2_BYTES_NV"/>
>+        <enum value="0x1408" name="GL_3_BYTES"/>
>+        <enum value="0x1408" name="GL_3_BYTES_NV"/>
>+        <enum value="0x1409" name="GL_4_BYTES"/>
>+        <enum value="0x1409" name="GL_4_BYTES_NV"/>
>+        <enum value="0x140A" name="GL_DOUBLE"/>
>+        <enum value="0x140A" name="GL_DOUBLE_EXT"/>
>+        <enum value="0x140B" name="GL_HALF_FLOAT"/>
>+        <enum value="0x140B" name="GL_HALF_FLOAT_ARB"/>
>+        <enum value="0x140B" name="GL_HALF_FLOAT_NV"/>
>+        <enum value="0x140B" name="GL_HALF_APPLE"/>
>+        <enum value="0x140C" name="GL_FIXED"/>
>+        <enum value="0x140C" name="GL_FIXED_OES"/>
>+            <unused start="0x140D" comment="Leave gap to preserve even/odd int/uint token values"/>
>+        <enum value="0x140E" name="GL_INT64_ARB"/>
>+        <enum value="0x140E" name="GL_INT64_NV"/>
>+        <enum value="0x140F" name="GL_UNSIGNED_INT64_ARB"/>
>+        <enum value="0x140F" name="GL_UNSIGNED_INT64_NV"/>
>+            <unused start="0x1410" end="0x14FF" comment="Unused for DataType"/>
>+        <enum value="0x1500" name="GL_CLEAR"/>
>+        <enum value="0x1501" name="GL_AND"/>
>+        <enum value="0x1502" name="GL_AND_REVERSE"/>
>+        <enum value="0x1503" name="GL_COPY"/>
>+        <enum value="0x1504" name="GL_AND_INVERTED"/>
>+        <enum value="0x1505" name="GL_NOOP"/>
>+        <enum value="0x1506" name="GL_XOR"/>
>+        <enum value="0x1506" name="GL_XOR_NV"/>
>+        <enum value="0x1507" name="GL_OR"/>
>+        <enum value="0x1508" name="GL_NOR"/>
>+        <enum value="0x1509" name="GL_EQUIV"/>
>+        <enum value="0x150A" name="GL_INVERT"/>
>+        <enum value="0x150B" name="GL_OR_REVERSE"/>
>+        <enum value="0x150C" name="GL_COPY_INVERTED"/>
>+        <enum value="0x150D" name="GL_OR_INVERTED"/>
>+        <enum value="0x150E" name="GL_NAND"/>
>+        <enum value="0x150F" name="GL_SET"/>
>+            <unused start="0x1510" end="0x15FF" comment="Unused for LogicOp"/>
>+        <enum value="0x1600" name="GL_EMISSION"/>
>+        <enum value="0x1601" name="GL_SHININESS"/>
>+        <enum value="0x1602" name="GL_AMBIENT_AND_DIFFUSE"/>
>+        <enum value="0x1603" name="GL_COLOR_INDEXES"/>
>+            <unused start="0x1604" end="0x16FF" comment="Unused for MaterialParameter"/>
>+        <enum value="0x1700" name="GL_MODELVIEW"/>
>+        <enum value="0x1700" name="GL_MODELVIEW0_ARB"/>
>+        <enum value="0x1700" name="GL_MODELVIEW0_EXT"/>
>+        <enum value="0x1700" name="GL_PATH_MODELVIEW_NV"/>
>+        <enum value="0x1701" name="GL_PROJECTION"/>
>+        <enum value="0x1701" name="GL_PATH_PROJECTION_NV"/>
>+        <enum value="0x1702" name="GL_TEXTURE"/>
>+            <unused start="0x1703" end="0x17FF" comment="Unused for MatrixMode"/>
>+        <enum value="0x1800" name="GL_COLOR"/>
>+        <enum value="0x1800" name="GL_COLOR_EXT"/>
>+        <enum value="0x1801" name="GL_DEPTH"/>
>+        <enum value="0x1801" name="GL_DEPTH_EXT"/>
>+        <enum value="0x1802" name="GL_STENCIL"/>
>+        <enum value="0x1802" name="GL_STENCIL_EXT"/>
>+            <unused start="0x1803" end="0x18FF" comment="Unused for PixelCopyType"/>
>+        <enum value="0x1900" name="GL_COLOR_INDEX"/>
>+        <enum value="0x1901" name="GL_STENCIL_INDEX"/>
>+        <enum value="0x1901" name="GL_STENCIL_INDEX_OES"/>
>+        <enum value="0x1902" name="GL_DEPTH_COMPONENT"/>
>+        <enum value="0x1903" name="GL_RED"/>
>+        <enum value="0x1903" name="GL_RED_EXT"/>
>+        <enum value="0x1903" name="GL_RED_NV"/>
>+        <enum value="0x1904" name="GL_GREEN"/>
>+        <enum value="0x1904" name="GL_GREEN_NV"/>
>+        <enum value="0x1905" name="GL_BLUE"/>
>+        <enum value="0x1905" name="GL_BLUE_NV"/>
>+        <enum value="0x1906" name="GL_ALPHA"/>
>+        <enum value="0x1907" name="GL_RGB"/>
>+        <enum value="0x1908" name="GL_RGBA"/>
>+        <enum value="0x1909" name="GL_LUMINANCE"/>
>+        <enum value="0x190A" name="GL_LUMINANCE_ALPHA"/>
>+            <unused start="0x1910" end="0x19FF" comment="Unused for PixelFormat"/>
>+        <enum value="0x1A00" name="GL_BITMAP"/>
>+            <unused start="0x1A01" end="0x1AFF" comment="Unused for PixelType"/>
>+        <enum value="0x1B00" name="GL_POINT"/>
>+        <enum value="0x1B00" name="GL_POINT_NV"/>
>+        <enum value="0x1B01" name="GL_LINE"/>
>+        <enum value="0x1B01" name="GL_LINE_NV"/>
>+        <enum value="0x1B02" name="GL_FILL"/>
>+        <enum value="0x1B02" name="GL_FILL_NV"/>
>+            <unused start="0x1B03" end="0x1BFF" comment="Unused for PolygonMode"/>
>+        <enum value="0x1C00" name="GL_RENDER"/>
>+        <enum value="0x1C01" name="GL_FEEDBACK"/>
>+        <enum value="0x1C02" name="GL_SELECT"/>
>+            <unused start="0x1C03" end="0x1CFF" comment="Unused for RenderingMode"/>
>+        <enum value="0x1D00" name="GL_FLAT"/>
>+        <enum value="0x1D01" name="GL_SMOOTH"/>
>+            <unused start="0x1D02" end="0x1DFF" comment="Unused for ShadingModel"/>
>+        <enum value="0x1E00" name="GL_KEEP"/>
>+        <enum value="0x1E01" name="GL_REPLACE"/>
>+        <enum value="0x1E02" name="GL_INCR"/>
>+        <enum value="0x1E03" name="GL_DECR"/>
>+            <unused start="0x1E04" end="0x1EFF" comment="Unused for StencilOp"/>
>+        <enum value="0x1F00" name="GL_VENDOR"/>
>+        <enum value="0x1F01" name="GL_RENDERER"/>
>+        <enum value="0x1F02" name="GL_VERSION"/>
>+        <enum value="0x1F03" name="GL_EXTENSIONS"/>
>+            <unused start="0x1F04" end="0x1FFF" comment="Unused for StringName"/>
>+        <enum value="0x2000" name="GL_S"/>
>+        <enum value="0x2001" name="GL_T"/>
>+        <enum value="0x2002" name="GL_R"/>
>+        <enum value="0x2003" name="GL_Q"/>
>+            <unused start="0x2004" end="0x20FF" comment="Unused for TextureCoordName"/>
>+        <enum value="0x2100" name="GL_MODULATE"/>
>+        <enum value="0x2101" name="GL_DECAL"/>
>+            <unused start="0x2102" end="0x21FF" comment="Unused for TextureEnvMode"/>
>+        <enum value="0x2200" name="GL_TEXTURE_ENV_MODE"/>
>+        <enum value="0x2201" name="GL_TEXTURE_ENV_COLOR"/>
>+            <unused start="0x2202" end="0x22FF" comment="Unused for TextureEnvParameter"/>
>+        <enum value="0x2300" name="GL_TEXTURE_ENV"/>
>+            <unused start="0x2301" end="0x23FF" comment="Unused for TextureEnvTarget"/>
>+        <enum value="0x2400" name="GL_EYE_LINEAR"/>
>+        <enum value="0x2400" name="GL_EYE_LINEAR_NV"/>
>+        <enum value="0x2401" name="GL_OBJECT_LINEAR"/>
>+        <enum value="0x2401" name="GL_OBJECT_LINEAR_NV"/>
>+        <enum value="0x2402" name="GL_SPHERE_MAP"/>
>+            <unused start="0x2403" end="0x24FF" comment="Unused for TextureGenMode"/>
>+        <enum value="0x2500" name="GL_TEXTURE_GEN_MODE"/>
>+        <enum value="0x2500" name="GL_TEXTURE_GEN_MODE_OES"/>
>+        <enum value="0x2501" name="GL_OBJECT_PLANE"/>
>+        <enum value="0x2502" name="GL_EYE_PLANE"/>
>+            <unused start="0x2503" end="0x25FF" comment="Unused for TextureGenParameter"/>
>+        <enum value="0x2600" name="GL_NEAREST"/>
>+        <enum value="0x2601" name="GL_LINEAR"/>
>+            <unused start="0x2602" end="0x26FF" comment="Unused for TextureMagFilter"/>
>+        <enum value="0x2700" name="GL_NEAREST_MIPMAP_NEAREST"/>
>+        <enum value="0x2701" name="GL_LINEAR_MIPMAP_NEAREST"/>
>+        <enum value="0x2702" name="GL_NEAREST_MIPMAP_LINEAR"/>
>+        <enum value="0x2703" name="GL_LINEAR_MIPMAP_LINEAR"/>
>+            <unused start="0x2704" end="0x27FF" comment="Unused for TextureMinFilter"/>
>+        <enum value="0x2800" name="GL_TEXTURE_MAG_FILTER"/>
>+        <enum value="0x2801" name="GL_TEXTURE_MIN_FILTER"/>
>+        <enum value="0x2802" name="GL_TEXTURE_WRAP_S"/>
>+        <enum value="0x2803" name="GL_TEXTURE_WRAP_T"/>
>+            <unused start="0x2804" end="0x28FF" comment="Unused for TextureParameterName"/>
>+        <enum value="0x2900" name="GL_CLAMP"/>
>+        <enum value="0x2901" name="GL_REPEAT"/>
>+            <unused start="0x2902" end="0x29FF" comment="Unused for TextureWrapMode"/>
>+        <enum value="0x2A00" name="GL_POLYGON_OFFSET_UNITS"/>
>+        <enum value="0x2A01" name="GL_POLYGON_OFFSET_POINT"/>
>+        <enum value="0x2A01" name="GL_POLYGON_OFFSET_POINT_NV"/>
>+        <enum value="0x2A02" name="GL_POLYGON_OFFSET_LINE"/>
>+        <enum value="0x2A02" name="GL_POLYGON_OFFSET_LINE_NV"/>
>+            <unused start="0x2A03" end="0x2A09" comment="Unused for PolygonOffset"/>
>+        <enum value="0x2A10" name="GL_R3_G3_B2"/>
>+            <unused start="0x2A11" end="0x2A1F" comment="Unused for InternalFormat"/>
>+        <enum value="0x2A20" name="GL_V2F"/>
>+        <enum value="0x2A21" name="GL_V3F"/>
>+        <enum value="0x2A22" name="GL_C4UB_V2F"/>
>+        <enum value="0x2A23" name="GL_C4UB_V3F"/>
>+        <enum value="0x2A24" name="GL_C3F_V3F"/>
>+        <enum value="0x2A25" name="GL_N3F_V3F"/>
>+        <enum value="0x2A26" name="GL_C4F_N3F_V3F"/>
>+        <enum value="0x2A27" name="GL_T2F_V3F"/>
>+        <enum value="0x2A28" name="GL_T4F_V4F"/>
>+        <enum value="0x2A29" name="GL_T2F_C4UB_V3F"/>
>+        <enum value="0x2A2A" name="GL_T2F_C3F_V3F"/>
>+        <enum value="0x2A2B" name="GL_T2F_N3F_V3F"/>
>+        <enum value="0x2A2C" name="GL_T2F_C4F_N3F_V3F"/>
>+        <enum value="0x2A2D" name="GL_T4F_C4F_N3F_V4F"/>
>+            <unused start="0x2A2E" end="0x2FFF" comment="Unused for InterleavedArrayFormat"/>
>+        <enum value="0x3000" name="GL_CLIP_PLANE0"/>
>+        <enum value="0x3000" name="GL_CLIP_PLANE0_IMG"/>
>+        <enum value="0x3000" name="GL_CLIP_DISTANCE0" alias="GL_CLIP_PLANE0"/>
>+        <enum value="0x3000" name="GL_CLIP_DISTANCE0_EXT" alias="GL_CLIP_PLANE0"/>
>+        <enum value="0x3000" name="GL_CLIP_DISTANCE0_APPLE"/>
>+        <enum value="0x3001" name="GL_CLIP_PLANE1"/>
>+        <enum value="0x3001" name="GL_CLIP_PLANE1_IMG"/>
>+        <enum value="0x3001" name="GL_CLIP_DISTANCE1" alias="GL_CLIP_PLANE1"/>
>+        <enum value="0x3001" name="GL_CLIP_DISTANCE1_EXT" alias="GL_CLIP_PLANE1"/>
>+        <enum value="0x3001" name="GL_CLIP_DISTANCE1_APPLE"/>
>+        <enum value="0x3002" name="GL_CLIP_PLANE2"/>
>+        <enum value="0x3002" name="GL_CLIP_PLANE2_IMG"/>
>+        <enum value="0x3002" name="GL_CLIP_DISTANCE2" alias="GL_CLIP_PLANE2"/>
>+        <enum value="0x3002" name="GL_CLIP_DISTANCE2_EXT" alias="GL_CLIP_PLANE2"/>
>+        <enum value="0x3002" name="GL_CLIP_DISTANCE2_APPLE"/>
>+        <enum value="0x3003" name="GL_CLIP_PLANE3"/>
>+        <enum value="0x3003" name="GL_CLIP_PLANE3_IMG"/>
>+        <enum value="0x3003" name="GL_CLIP_DISTANCE3" alias="GL_CLIP_PLANE3"/>
>+        <enum value="0x3003" name="GL_CLIP_DISTANCE3_EXT" alias="GL_CLIP_PLANE3"/>
>+        <enum value="0x3003" name="GL_CLIP_DISTANCE3_APPLE"/>
>+        <enum value="0x3004" name="GL_CLIP_PLANE4"/>
>+        <enum value="0x3004" name="GL_CLIP_PLANE4_IMG"/>
>+        <enum value="0x3004" name="GL_CLIP_DISTANCE4" alias="GL_CLIP_PLANE4"/>
>+        <enum value="0x3004" name="GL_CLIP_DISTANCE4_EXT" alias="GL_CLIP_PLANE4"/>
>+        <enum value="0x3004" name="GL_CLIP_DISTANCE4_APPLE"/>
>+        <enum value="0x3005" name="GL_CLIP_PLANE5"/>
>+        <enum value="0x3005" name="GL_CLIP_PLANE5_IMG"/>
>+        <enum value="0x3005" name="GL_CLIP_DISTANCE5" alias="GL_CLIP_PLANE5"/>
>+        <enum value="0x3005" name="GL_CLIP_DISTANCE5_EXT" alias="GL_CLIP_PLANE5"/>
>+        <enum value="0x3005" name="GL_CLIP_DISTANCE5_APPLE"/>
>+        <enum value="0x3006" name="GL_CLIP_DISTANCE6"/>
>+        <enum value="0x3006" name="GL_CLIP_DISTANCE6_EXT" alias="GL_CLIP_DISTANCE6"/>
>+        <enum value="0x3006" name="GL_CLIP_DISTANCE6_APPLE"/>
>+        <enum value="0x3007" name="GL_CLIP_DISTANCE7"/>
>+        <enum value="0x3007" name="GL_CLIP_DISTANCE7_EXT" alias="GL_CLIP_DISTANCE7"/>
>+        <enum value="0x3007" name="GL_CLIP_DISTANCE7_APPLE"/>
>+            <unused start="0x3008" end="0x3FFF" comment="Unused for ClipPlaneName"/>
>+        <enum value="0x4000" name="GL_LIGHT0"/>
>+        <enum value="0x4001" name="GL_LIGHT1"/>
>+        <enum value="0x4002" name="GL_LIGHT2"/>
>+        <enum value="0x4003" name="GL_LIGHT3"/>
>+        <enum value="0x4004" name="GL_LIGHT4"/>
>+        <enum value="0x4005" name="GL_LIGHT5"/>
>+        <enum value="0x4006" name="GL_LIGHT6"/>
>+        <enum value="0x4007" name="GL_LIGHT7"/>
>+            <unused start="0x4008" end="0x4FFF" comment="Unused for LightName"/>
>+            <unused start="0x5000" end="0x5FFF" comment="Unused. Do not use."/>
>+            <unused start="0x6000" end="0x6FFF" comment="Experimental (internal/test only) range. DO NOT SHIP VALUES IN THIS RANGE."/>
>+            <unused start="0x7000" end="0x7FFF" comment="Unused. Do not use."/>
>+    </enums>
>+
>+    <enums namespace="GL" start="0x8000" end="0x80BF" vendor="ARB" comment="The primary GL enumerant space begins here. All modern enum allocations are in this range. These enums are mostly assigned the default class since it's a great deal of not very useful work to be more specific">
>+        <enum value="0x8000" name="GL_ABGR_EXT"/>
>+        <enum value="0x8001" name="GL_CONSTANT_COLOR"/>
>+        <enum value="0x8001" name="GL_CONSTANT_COLOR_EXT"/>
>+        <enum value="0x8002" name="GL_ONE_MINUS_CONSTANT_COLOR"/>
>+        <enum value="0x8002" name="GL_ONE_MINUS_CONSTANT_COLOR_EXT"/>
>+        <enum value="0x8003" name="GL_CONSTANT_ALPHA"/>
>+        <enum value="0x8003" name="GL_CONSTANT_ALPHA_EXT"/>
>+        <enum value="0x8004" name="GL_ONE_MINUS_CONSTANT_ALPHA"/>
>+        <enum value="0x8004" name="GL_ONE_MINUS_CONSTANT_ALPHA_EXT"/>
>+        <enum value="0x8005" name="GL_BLEND_COLOR"/>
>+        <enum value="0x8005" name="GL_BLEND_COLOR_EXT"/>
>+        <enum value="0x8006" name="GL_FUNC_ADD"/>
>+        <enum value="0x8006" name="GL_FUNC_ADD_EXT"/>
>+        <enum value="0x8006" name="GL_FUNC_ADD_OES"/>
>+        <enum value="0x8007" name="GL_MIN"/>
>+        <enum value="0x8007" name="GL_MIN_EXT"/>
>+        <enum value="0x8008" name="GL_MAX"/>
>+        <enum value="0x8008" name="GL_MAX_EXT"/>
>+        <enum value="0x8009" name="GL_BLEND_EQUATION"/>
>+        <enum value="0x8009" name="GL_BLEND_EQUATION_EXT"/>
>+        <enum value="0x8009" name="GL_BLEND_EQUATION_OES"/>
>+        <enum value="0x8009" name="GL_BLEND_EQUATION_RGB"/>
>+        <enum value="0x8009" name="GL_BLEND_EQUATION_RGB_EXT"/>
>+        <enum value="0x8009" name="GL_BLEND_EQUATION_RGB_OES"/>
>+        <enum value="0x800A" name="GL_FUNC_SUBTRACT"/>
>+        <enum value="0x800A" name="GL_FUNC_SUBTRACT_EXT"/>
>+        <enum value="0x800A" name="GL_FUNC_SUBTRACT_OES"/>
>+        <enum value="0x800B" name="GL_FUNC_REVERSE_SUBTRACT"/>
>+        <enum value="0x800B" name="GL_FUNC_REVERSE_SUBTRACT_EXT"/>
>+        <enum value="0x800B" name="GL_FUNC_REVERSE_SUBTRACT_OES"/>
>+        <enum value="0x800C" name="GL_CMYK_EXT"/>
>+        <enum value="0x800D" name="GL_CMYKA_EXT"/>
>+        <enum value="0x800E" name="GL_PACK_CMYK_HINT_EXT"/>
>+        <enum value="0x800F" name="GL_UNPACK_CMYK_HINT_EXT"/>
>+        <enum value="0x8010" name="GL_CONVOLUTION_1D"/>
>+        <enum value="0x8010" name="GL_CONVOLUTION_1D_EXT"/>
>+        <enum value="0x8011" name="GL_CONVOLUTION_2D"/>
>+        <enum value="0x8011" name="GL_CONVOLUTION_2D_EXT"/>
>+        <enum value="0x8012" name="GL_SEPARABLE_2D"/>
>+        <enum value="0x8012" name="GL_SEPARABLE_2D_EXT"/>
>+        <enum value="0x8013" name="GL_CONVOLUTION_BORDER_MODE"/>
>+        <enum value="0x8013" name="GL_CONVOLUTION_BORDER_MODE_EXT"/>
>+        <enum value="0x8014" name="GL_CONVOLUTION_FILTER_SCALE"/>
>+        <enum value="0x8014" name="GL_CONVOLUTION_FILTER_SCALE_EXT"/>
>+        <enum value="0x8015" name="GL_CONVOLUTION_FILTER_BIAS"/>
>+        <enum value="0x8015" name="GL_CONVOLUTION_FILTER_BIAS_EXT"/>
>+        <enum value="0x8016" name="GL_REDUCE"/>
>+        <enum value="0x8016" name="GL_REDUCE_EXT"/>
>+        <enum value="0x8017" name="GL_CONVOLUTION_FORMAT"/>
>+        <enum value="0x8017" name="GL_CONVOLUTION_FORMAT_EXT"/>
>+        <enum value="0x8018" name="GL_CONVOLUTION_WIDTH"/>
>+        <enum value="0x8018" name="GL_CONVOLUTION_WIDTH_EXT"/>
>+        <enum value="0x8019" name="GL_CONVOLUTION_HEIGHT"/>
>+        <enum value="0x8019" name="GL_CONVOLUTION_HEIGHT_EXT"/>
>+        <enum value="0x801A" name="GL_MAX_CONVOLUTION_WIDTH"/>
>+        <enum value="0x801A" name="GL_MAX_CONVOLUTION_WIDTH_EXT"/>
>+        <enum value="0x801B" name="GL_MAX_CONVOLUTION_HEIGHT"/>
>+        <enum value="0x801B" name="GL_MAX_CONVOLUTION_HEIGHT_EXT"/>
>+        <enum value="0x801C" name="GL_POST_CONVOLUTION_RED_SCALE"/>
>+        <enum value="0x801C" name="GL_POST_CONVOLUTION_RED_SCALE_EXT"/>
>+        <enum value="0x801D" name="GL_POST_CONVOLUTION_GREEN_SCALE"/>
>+        <enum value="0x801D" name="GL_POST_CONVOLUTION_GREEN_SCALE_EXT"/>
>+        <enum value="0x801E" name="GL_POST_CONVOLUTION_BLUE_SCALE"/>
>+        <enum value="0x801E" name="GL_POST_CONVOLUTION_BLUE_SCALE_EXT"/>
>+        <enum value="0x801F" name="GL_POST_CONVOLUTION_ALPHA_SCALE"/>
>+        <enum value="0x801F" name="GL_POST_CONVOLUTION_ALPHA_SCALE_EXT"/>
>+        <enum value="0x8020" name="GL_POST_CONVOLUTION_RED_BIAS"/>
>+        <enum value="0x8020" name="GL_POST_CONVOLUTION_RED_BIAS_EXT"/>
>+        <enum value="0x8021" name="GL_POST_CONVOLUTION_GREEN_BIAS"/>
>+        <enum value="0x8021" name="GL_POST_CONVOLUTION_GREEN_BIAS_EXT"/>
>+        <enum value="0x8022" name="GL_POST_CONVOLUTION_BLUE_BIAS"/>
>+        <enum value="0x8022" name="GL_POST_CONVOLUTION_BLUE_BIAS_EXT"/>
>+        <enum value="0x8023" name="GL_POST_CONVOLUTION_ALPHA_BIAS"/>
>+        <enum value="0x8023" name="GL_POST_CONVOLUTION_ALPHA_BIAS_EXT"/>
>+        <enum value="0x8024" name="GL_HISTOGRAM"/>
>+        <enum value="0x8024" name="GL_HISTOGRAM_EXT"/>
>+        <enum value="0x8025" name="GL_PROXY_HISTOGRAM"/>
>+        <enum value="0x8025" name="GL_PROXY_HISTOGRAM_EXT"/>
>+        <enum value="0x8026" name="GL_HISTOGRAM_WIDTH"/>
>+        <enum value="0x8026" name="GL_HISTOGRAM_WIDTH_EXT"/>
>+        <enum value="0x8027" name="GL_HISTOGRAM_FORMAT"/>
>+        <enum value="0x8027" name="GL_HISTOGRAM_FORMAT_EXT"/>
>+        <enum value="0x8028" name="GL_HISTOGRAM_RED_SIZE"/>
>+        <enum value="0x8028" name="GL_HISTOGRAM_RED_SIZE_EXT"/>
>+        <enum value="0x8029" name="GL_HISTOGRAM_GREEN_SIZE"/>
>+        <enum value="0x8029" name="GL_HISTOGRAM_GREEN_SIZE_EXT"/>
>+        <enum value="0x802A" name="GL_HISTOGRAM_BLUE_SIZE"/>
>+        <enum value="0x802A" name="GL_HISTOGRAM_BLUE_SIZE_EXT"/>
>+        <enum value="0x802B" name="GL_HISTOGRAM_ALPHA_SIZE"/>
>+        <enum value="0x802B" name="GL_HISTOGRAM_ALPHA_SIZE_EXT"/>
>+        <enum value="0x802C" name="GL_HISTOGRAM_LUMINANCE_SIZE"/>
>+        <enum value="0x802C" name="GL_HISTOGRAM_LUMINANCE_SIZE_EXT"/>
>+        <enum value="0x802D" name="GL_HISTOGRAM_SINK"/>
>+        <enum value="0x802D" name="GL_HISTOGRAM_SINK_EXT"/>
>+        <enum value="0x802E" name="GL_MINMAX"/>
>+        <enum value="0x802E" name="GL_MINMAX_EXT"/>
>+        <enum value="0x802F" name="GL_MINMAX_FORMAT"/>
>+        <enum value="0x802F" name="GL_MINMAX_FORMAT_EXT"/>
>+        <enum value="0x8030" name="GL_MINMAX_SINK"/>
>+        <enum value="0x8030" name="GL_MINMAX_SINK_EXT"/>
>+        <enum value="0x8031" name="GL_TABLE_TOO_LARGE_EXT"/>
>+        <enum value="0x8031" name="GL_TABLE_TOO_LARGE"/>
>+        <enum value="0x8032" name="GL_UNSIGNED_BYTE_3_3_2"/>
>+        <enum value="0x8032" name="GL_UNSIGNED_BYTE_3_3_2_EXT"/>
>+        <enum value="0x8033" name="GL_UNSIGNED_SHORT_4_4_4_4"/>
>+        <enum value="0x8033" name="GL_UNSIGNED_SHORT_4_4_4_4_EXT"/>
>+        <enum value="0x8034" name="GL_UNSIGNED_SHORT_5_5_5_1"/>
>+        <enum value="0x8034" name="GL_UNSIGNED_SHORT_5_5_5_1_EXT"/>
>+        <enum value="0x8035" name="GL_UNSIGNED_INT_8_8_8_8"/>
>+        <enum value="0x8035" name="GL_UNSIGNED_INT_8_8_8_8_EXT"/>
>+        <enum value="0x8036" name="GL_UNSIGNED_INT_10_10_10_2"/>
>+        <enum value="0x8036" name="GL_UNSIGNED_INT_10_10_10_2_EXT"/>
>+        <enum value="0x8037" name="GL_POLYGON_OFFSET_EXT"/>
>+        <enum value="0x8037" name="GL_POLYGON_OFFSET_FILL"/>
>+        <enum value="0x8038" name="GL_POLYGON_OFFSET_FACTOR"/>
>+        <enum value="0x8038" name="GL_POLYGON_OFFSET_FACTOR_EXT"/>
>+        <enum value="0x8039" name="GL_POLYGON_OFFSET_BIAS_EXT"/>
>+        <enum value="0x803A" name="GL_RESCALE_NORMAL"/>
>+        <enum value="0x803A" name="GL_RESCALE_NORMAL_EXT"/>
>+        <enum value="0x803B" name="GL_ALPHA4"/>
>+        <enum value="0x803B" name="GL_ALPHA4_EXT"/>
>+        <enum value="0x803C" name="GL_ALPHA8"/>
>+        <enum value="0x803C" name="GL_ALPHA8_EXT"/>
>+        <enum value="0x803C" name="GL_ALPHA8_OES"/>
>+        <enum value="0x803D" name="GL_ALPHA12"/>
>+        <enum value="0x803D" name="GL_ALPHA12_EXT"/>
>+        <enum value="0x803E" name="GL_ALPHA16"/>
>+        <enum value="0x803E" name="GL_ALPHA16_EXT"/>
>+        <enum value="0x803F" name="GL_LUMINANCE4"/>
>+        <enum value="0x803F" name="GL_LUMINANCE4_EXT"/>
>+        <enum value="0x8040" name="GL_LUMINANCE8"/>
>+        <enum value="0x8040" name="GL_LUMINANCE8_EXT"/>
>+        <enum value="0x8040" name="GL_LUMINANCE8_OES"/>
>+        <enum value="0x8041" name="GL_LUMINANCE12"/>
>+        <enum value="0x8041" name="GL_LUMINANCE12_EXT"/>
>+        <enum value="0x8042" name="GL_LUMINANCE16"/>
>+        <enum value="0x8042" name="GL_LUMINANCE16_EXT"/>
>+        <enum value="0x8043" name="GL_LUMINANCE4_ALPHA4"/>
>+        <enum value="0x8043" name="GL_LUMINANCE4_ALPHA4_EXT"/>
>+        <enum value="0x8043" name="GL_LUMINANCE4_ALPHA4_OES"/>
>+        <enum value="0x8044" name="GL_LUMINANCE6_ALPHA2"/>
>+        <enum value="0x8044" name="GL_LUMINANCE6_ALPHA2_EXT"/>
>+        <enum value="0x8045" name="GL_LUMINANCE8_ALPHA8"/>
>+        <enum value="0x8045" name="GL_LUMINANCE8_ALPHA8_EXT"/>
>+        <enum value="0x8045" name="GL_LUMINANCE8_ALPHA8_OES"/>
>+        <enum value="0x8046" name="GL_LUMINANCE12_ALPHA4"/>
>+        <enum value="0x8046" name="GL_LUMINANCE12_ALPHA4_EXT"/>
>+        <enum value="0x8047" name="GL_LUMINANCE12_ALPHA12"/>
>+        <enum value="0x8047" name="GL_LUMINANCE12_ALPHA12_EXT"/>
>+        <enum value="0x8048" name="GL_LUMINANCE16_ALPHA16"/>
>+        <enum value="0x8048" name="GL_LUMINANCE16_ALPHA16_EXT"/>
>+        <enum value="0x8049" name="GL_INTENSITY"/>
>+        <enum value="0x8049" name="GL_INTENSITY_EXT"/>
>+        <enum value="0x804A" name="GL_INTENSITY4"/>
>+        <enum value="0x804A" name="GL_INTENSITY4_EXT"/>
>+        <enum value="0x804B" name="GL_INTENSITY8"/>
>+        <enum value="0x804B" name="GL_INTENSITY8_EXT"/>
>+        <enum value="0x804C" name="GL_INTENSITY12"/>
>+        <enum value="0x804C" name="GL_INTENSITY12_EXT"/>
>+        <enum value="0x804D" name="GL_INTENSITY16"/>
>+        <enum value="0x804D" name="GL_INTENSITY16_EXT"/>
>+        <enum value="0x804E" name="GL_RGB2_EXT"/>
>+        <enum value="0x804F" name="GL_RGB4"/>
>+        <enum value="0x804F" name="GL_RGB4_EXT"/>
>+        <enum value="0x8050" name="GL_RGB5"/>
>+        <enum value="0x8050" name="GL_RGB5_EXT"/>
>+        <enum value="0x8051" name="GL_RGB8"/>
>+        <enum value="0x8051" name="GL_RGB8_EXT"/>
>+        <enum value="0x8051" name="GL_RGB8_OES"/>
>+        <enum value="0x8052" name="GL_RGB10"/>
>+        <enum value="0x8052" name="GL_RGB10_EXT"/>
>+        <enum value="0x8053" name="GL_RGB12"/>
>+        <enum value="0x8053" name="GL_RGB12_EXT"/>
>+        <enum value="0x8054" name="GL_RGB16"/>
>+        <enum value="0x8054" name="GL_RGB16_EXT"/>
>+        <enum value="0x8055" name="GL_RGBA2"/>
>+        <enum value="0x8055" name="GL_RGBA2_EXT"/>
>+        <enum value="0x8056" name="GL_RGBA4"/>
>+        <enum value="0x8056" name="GL_RGBA4_EXT"/>
>+        <enum value="0x8056" name="GL_RGBA4_OES"/>
>+        <enum value="0x8057" name="GL_RGB5_A1"/>
>+        <enum value="0x8057" name="GL_RGB5_A1_EXT"/>
>+        <enum value="0x8057" name="GL_RGB5_A1_OES"/>
>+        <enum value="0x8058" name="GL_RGBA8"/>
>+        <enum value="0x8058" name="GL_RGBA8_EXT"/>
>+        <enum value="0x8058" name="GL_RGBA8_OES"/>
>+        <enum value="0x8059" name="GL_RGB10_A2"/>
>+        <enum value="0x8059" name="GL_RGB10_A2_EXT"/>
>+        <enum value="0x805A" name="GL_RGBA12"/>
>+        <enum value="0x805A" name="GL_RGBA12_EXT"/>
>+        <enum value="0x805B" name="GL_RGBA16"/>
>+        <enum value="0x805B" name="GL_RGBA16_EXT"/>
>+        <enum value="0x805C" name="GL_TEXTURE_RED_SIZE"/>
>+        <enum value="0x805C" name="GL_TEXTURE_RED_SIZE_EXT"/>
>+        <enum value="0x805D" name="GL_TEXTURE_GREEN_SIZE"/>
>+        <enum value="0x805D" name="GL_TEXTURE_GREEN_SIZE_EXT"/>
>+        <enum value="0x805E" name="GL_TEXTURE_BLUE_SIZE"/>
>+        <enum value="0x805E" name="GL_TEXTURE_BLUE_SIZE_EXT"/>
>+        <enum value="0x805F" name="GL_TEXTURE_ALPHA_SIZE"/>
>+        <enum value="0x805F" name="GL_TEXTURE_ALPHA_SIZE_EXT"/>
>+        <enum value="0x8060" name="GL_TEXTURE_LUMINANCE_SIZE"/>
>+        <enum value="0x8060" name="GL_TEXTURE_LUMINANCE_SIZE_EXT"/>
>+        <enum value="0x8061" name="GL_TEXTURE_INTENSITY_SIZE"/>
>+        <enum value="0x8061" name="GL_TEXTURE_INTENSITY_SIZE_EXT"/>
>+        <enum value="0x8062" name="GL_REPLACE_EXT"/>
>+        <enum value="0x8063" name="GL_PROXY_TEXTURE_1D"/>
>+        <enum value="0x8063" name="GL_PROXY_TEXTURE_1D_EXT"/>
>+        <enum value="0x8064" name="GL_PROXY_TEXTURE_2D"/>
>+        <enum value="0x8064" name="GL_PROXY_TEXTURE_2D_EXT"/>
>+        <enum value="0x8065" name="GL_TEXTURE_TOO_LARGE_EXT"/>
>+        <enum value="0x8066" name="GL_TEXTURE_PRIORITY"/>
>+        <enum value="0x8066" name="GL_TEXTURE_PRIORITY_EXT"/>
>+        <enum value="0x8067" name="GL_TEXTURE_RESIDENT"/>
>+        <enum value="0x8067" name="GL_TEXTURE_RESIDENT_EXT"/>
>+        <enum value="0x8068" name="GL_TEXTURE_1D_BINDING_EXT"/>
>+        <enum value="0x8068" name="GL_TEXTURE_BINDING_1D"/>
>+        <enum value="0x8069" name="GL_TEXTURE_2D_BINDING_EXT"/>
>+        <enum value="0x8069" name="GL_TEXTURE_BINDING_2D"/>
>+        <enum value="0x806A" name="GL_TEXTURE_3D_BINDING_EXT"/>
>+        <enum value="0x806A" name="GL_TEXTURE_3D_BINDING_OES"/>
>+        <enum value="0x806A" name="GL_TEXTURE_BINDING_3D"/>
>+        <enum value="0x806A" name="GL_TEXTURE_BINDING_3D_OES"/>
>+        <enum value="0x806B" name="GL_PACK_SKIP_IMAGES"/>
>+        <enum value="0x806B" name="GL_PACK_SKIP_IMAGES_EXT"/>
>+        <enum value="0x806C" name="GL_PACK_IMAGE_HEIGHT"/>
>+        <enum value="0x806C" name="GL_PACK_IMAGE_HEIGHT_EXT"/>
>+        <enum value="0x806D" name="GL_UNPACK_SKIP_IMAGES"/>
>+        <enum value="0x806D" name="GL_UNPACK_SKIP_IMAGES_EXT"/>
>+        <enum value="0x806E" name="GL_UNPACK_IMAGE_HEIGHT"/>
>+        <enum value="0x806E" name="GL_UNPACK_IMAGE_HEIGHT_EXT"/>
>+        <enum value="0x806F" name="GL_TEXTURE_3D"/>
>+        <enum value="0x806F" name="GL_TEXTURE_3D_EXT"/>
>+        <enum value="0x806F" name="GL_TEXTURE_3D_OES"/>
>+        <enum value="0x8070" name="GL_PROXY_TEXTURE_3D"/>
>+        <enum value="0x8070" name="GL_PROXY_TEXTURE_3D_EXT"/>
>+        <enum value="0x8071" name="GL_TEXTURE_DEPTH"/>
>+        <enum value="0x8071" name="GL_TEXTURE_DEPTH_EXT"/>
>+        <enum value="0x8072" name="GL_TEXTURE_WRAP_R"/>
>+        <enum value="0x8072" name="GL_TEXTURE_WRAP_R_EXT"/>
>+        <enum value="0x8072" name="GL_TEXTURE_WRAP_R_OES"/>
>+        <enum value="0x8073" name="GL_MAX_3D_TEXTURE_SIZE"/>
>+        <enum value="0x8073" name="GL_MAX_3D_TEXTURE_SIZE_EXT"/>
>+        <enum value="0x8073" name="GL_MAX_3D_TEXTURE_SIZE_OES"/>
>+        <enum value="0x8074" name="GL_VERTEX_ARRAY"/>
>+        <enum value="0x8074" name="GL_VERTEX_ARRAY_EXT"/>
>+        <enum value="0x8074" name="GL_VERTEX_ARRAY_KHR"/>
>+        <enum value="0x8075" name="GL_NORMAL_ARRAY"/>
>+        <enum value="0x8075" name="GL_NORMAL_ARRAY_EXT"/>
>+        <enum value="0x8076" name="GL_COLOR_ARRAY"/>
>+        <enum value="0x8076" name="GL_COLOR_ARRAY_EXT"/>
>+        <enum value="0x8077" name="GL_INDEX_ARRAY"/>
>+        <enum value="0x8077" name="GL_INDEX_ARRAY_EXT"/>
>+        <enum value="0x8078" name="GL_TEXTURE_COORD_ARRAY"/>
>+        <enum value="0x8078" name="GL_TEXTURE_COORD_ARRAY_EXT"/>
>+        <enum value="0x8079" name="GL_EDGE_FLAG_ARRAY"/>
>+        <enum value="0x8079" name="GL_EDGE_FLAG_ARRAY_EXT"/>
>+        <enum value="0x807A" name="GL_VERTEX_ARRAY_SIZE"/>
>+        <enum value="0x807A" name="GL_VERTEX_ARRAY_SIZE_EXT"/>
>+        <enum value="0x807B" name="GL_VERTEX_ARRAY_TYPE"/>
>+        <enum value="0x807B" name="GL_VERTEX_ARRAY_TYPE_EXT"/>
>+        <enum value="0x807C" name="GL_VERTEX_ARRAY_STRIDE"/>
>+        <enum value="0x807C" name="GL_VERTEX_ARRAY_STRIDE_EXT"/>
>+        <enum value="0x807D" name="GL_VERTEX_ARRAY_COUNT_EXT"/>
>+        <enum value="0x807E" name="GL_NORMAL_ARRAY_TYPE"/>
>+        <enum value="0x807E" name="GL_NORMAL_ARRAY_TYPE_EXT"/>
>+        <enum value="0x807F" name="GL_NORMAL_ARRAY_STRIDE"/>
>+        <enum value="0x807F" name="GL_NORMAL_ARRAY_STRIDE_EXT"/>
>+        <enum value="0x8080" name="GL_NORMAL_ARRAY_COUNT_EXT"/>
>+        <enum value="0x8081" name="GL_COLOR_ARRAY_SIZE"/>
>+        <enum value="0x8081" name="GL_COLOR_ARRAY_SIZE_EXT"/>
>+        <enum value="0x8082" name="GL_COLOR_ARRAY_TYPE"/>
>+        <enum value="0x8082" name="GL_COLOR_ARRAY_TYPE_EXT"/>
>+        <enum value="0x8083" name="GL_COLOR_ARRAY_STRIDE"/>
>+        <enum value="0x8083" name="GL_COLOR_ARRAY_STRIDE_EXT"/>
>+        <enum value="0x8084" name="GL_COLOR_ARRAY_COUNT_EXT"/>
>+        <enum value="0x8085" name="GL_INDEX_ARRAY_TYPE"/>
>+        <enum value="0x8085" name="GL_INDEX_ARRAY_TYPE_EXT"/>
>+        <enum value="0x8086" name="GL_INDEX_ARRAY_STRIDE"/>
>+        <enum value="0x8086" name="GL_INDEX_ARRAY_STRIDE_EXT"/>
>+        <enum value="0x8087" name="GL_INDEX_ARRAY_COUNT_EXT"/>
>+        <enum value="0x8088" name="GL_TEXTURE_COORD_ARRAY_SIZE"/>
>+        <enum value="0x8088" name="GL_TEXTURE_COORD_ARRAY_SIZE_EXT"/>
>+        <enum value="0x8089" name="GL_TEXTURE_COORD_ARRAY_TYPE"/>
>+        <enum value="0x8089" name="GL_TEXTURE_COORD_ARRAY_TYPE_EXT"/>
>+        <enum value="0x808A" name="GL_TEXTURE_COORD_ARRAY_STRIDE"/>
>+        <enum value="0x808A" name="GL_TEXTURE_COORD_ARRAY_STRIDE_EXT"/>
>+        <enum value="0x808B" name="GL_TEXTURE_COORD_ARRAY_COUNT_EXT"/>
>+        <enum value="0x808C" name="GL_EDGE_FLAG_ARRAY_STRIDE"/>
>+        <enum value="0x808C" name="GL_EDGE_FLAG_ARRAY_STRIDE_EXT"/>
>+        <enum value="0x808D" name="GL_EDGE_FLAG_ARRAY_COUNT_EXT"/>
>+        <enum value="0x808E" name="GL_VERTEX_ARRAY_POINTER"/>
>+        <enum value="0x808E" name="GL_VERTEX_ARRAY_POINTER_EXT"/>
>+        <enum value="0x808F" name="GL_NORMAL_ARRAY_POINTER"/>
>+        <enum value="0x808F" name="GL_NORMAL_ARRAY_POINTER_EXT"/>
>+        <enum value="0x8090" name="GL_COLOR_ARRAY_POINTER"/>
>+        <enum value="0x8090" name="GL_COLOR_ARRAY_POINTER_EXT"/>
>+        <enum value="0x8091" name="GL_INDEX_ARRAY_POINTER"/>
>+        <enum value="0x8091" name="GL_INDEX_ARRAY_POINTER_EXT"/>
>+        <enum value="0x8092" name="GL_TEXTURE_COORD_ARRAY_POINTER"/>
>+        <enum value="0x8092" name="GL_TEXTURE_COORD_ARRAY_POINTER_EXT"/>
>+        <enum value="0x8093" name="GL_EDGE_FLAG_ARRAY_POINTER"/>
>+        <enum value="0x8093" name="GL_EDGE_FLAG_ARRAY_POINTER_EXT"/>
>+        <enum value="0x8094" name="GL_INTERLACE_SGIX"/>
>+        <enum value="0x8095" name="GL_DETAIL_TEXTURE_2D_SGIS"/>
>+        <enum value="0x8096" name="GL_DETAIL_TEXTURE_2D_BINDING_SGIS"/>
>+        <enum value="0x8097" name="GL_LINEAR_DETAIL_SGIS"/>
>+        <enum value="0x8098" name="GL_LINEAR_DETAIL_ALPHA_SGIS"/>
>+        <enum value="0x8099" name="GL_LINEAR_DETAIL_COLOR_SGIS"/>
>+        <enum value="0x809A" name="GL_DETAIL_TEXTURE_LEVEL_SGIS"/>
>+        <enum value="0x809B" name="GL_DETAIL_TEXTURE_MODE_SGIS"/>
>+        <enum value="0x809C" name="GL_DETAIL_TEXTURE_FUNC_POINTS_SGIS"/>
>+        <enum value="0x809D" name="GL_MULTISAMPLE"/>
>+        <enum value="0x809D" name="GL_MULTISAMPLE_ARB"/>
>+        <enum value="0x809D" name="GL_MULTISAMPLE_EXT"/>
>+        <enum value="0x809D" name="GL_MULTISAMPLE_SGIS"/>
>+        <enum value="0x809E" name="GL_SAMPLE_ALPHA_TO_COVERAGE"/>
>+        <enum value="0x809E" name="GL_SAMPLE_ALPHA_TO_COVERAGE_ARB"/>
>+        <enum value="0x809E" name="GL_SAMPLE_ALPHA_TO_MASK_EXT"/>
>+        <enum value="0x809E" name="GL_SAMPLE_ALPHA_TO_MASK_SGIS"/>
>+        <enum value="0x809F" name="GL_SAMPLE_ALPHA_TO_ONE"/>
>+        <enum value="0x809F" name="GL_SAMPLE_ALPHA_TO_ONE_ARB"/>
>+        <enum value="0x809F" name="GL_SAMPLE_ALPHA_TO_ONE_EXT"/>
>+        <enum value="0x809F" name="GL_SAMPLE_ALPHA_TO_ONE_SGIS"/>
>+        <enum value="0x80A0" name="GL_SAMPLE_COVERAGE"/>
>+        <enum value="0x80A0" name="GL_SAMPLE_COVERAGE_ARB"/>
>+        <enum value="0x80A0" name="GL_SAMPLE_MASK_EXT"/>
>+        <enum value="0x80A0" name="GL_SAMPLE_MASK_SGIS"/>
>+        <enum value="0x80A1" name="GL_1PASS_EXT"/>
>+        <enum value="0x80A1" name="GL_1PASS_SGIS"/>
>+        <enum value="0x80A2" name="GL_2PASS_0_EXT"/>
>+        <enum value="0x80A2" name="GL_2PASS_0_SGIS"/>
>+        <enum value="0x80A3" name="GL_2PASS_1_EXT"/>
>+        <enum value="0x80A3" name="GL_2PASS_1_SGIS"/>
>+        <enum value="0x80A4" name="GL_4PASS_0_EXT"/>
>+        <enum value="0x80A4" name="GL_4PASS_0_SGIS"/>
>+        <enum value="0x80A5" name="GL_4PASS_1_EXT"/>
>+        <enum value="0x80A5" name="GL_4PASS_1_SGIS"/>
>+        <enum value="0x80A6" name="GL_4PASS_2_EXT"/>
>+        <enum value="0x80A6" name="GL_4PASS_2_SGIS"/>
>+        <enum value="0x80A7" name="GL_4PASS_3_EXT"/>
>+        <enum value="0x80A7" name="GL_4PASS_3_SGIS"/>
>+        <enum value="0x80A8" name="GL_SAMPLE_BUFFERS"/>
>+        <enum value="0x80A8" name="GL_SAMPLE_BUFFERS_ARB"/>
>+        <enum value="0x80A8" name="GL_SAMPLE_BUFFERS_EXT"/>
>+        <enum value="0x80A8" name="GL_SAMPLE_BUFFERS_SGIS"/>
>+        <enum value="0x80A9" name="GL_SAMPLES"/>
>+        <enum value="0x80A9" name="GL_SAMPLES_ARB"/>
>+        <enum value="0x80A9" name="GL_SAMPLES_EXT"/>
>+        <enum value="0x80A9" name="GL_SAMPLES_SGIS"/>
>+        <enum value="0x80AA" name="GL_SAMPLE_COVERAGE_VALUE"/>
>+        <enum value="0x80AA" name="GL_SAMPLE_COVERAGE_VALUE_ARB"/>
>+        <enum value="0x80AA" name="GL_SAMPLE_MASK_VALUE_EXT"/>
>+        <enum value="0x80AA" name="GL_SAMPLE_MASK_VALUE_SGIS"/>
>+        <enum value="0x80AB" name="GL_SAMPLE_COVERAGE_INVERT"/>
>+        <enum value="0x80AB" name="GL_SAMPLE_COVERAGE_INVERT_ARB"/>
>+        <enum value="0x80AB" name="GL_SAMPLE_MASK_INVERT_EXT"/>
>+        <enum value="0x80AB" name="GL_SAMPLE_MASK_INVERT_SGIS"/>
>+        <enum value="0x80AC" name="GL_SAMPLE_PATTERN_EXT"/>
>+        <enum value="0x80AC" name="GL_SAMPLE_PATTERN_SGIS"/>
>+        <enum value="0x80AD" name="GL_LINEAR_SHARPEN_SGIS"/>
>+        <enum value="0x80AE" name="GL_LINEAR_SHARPEN_ALPHA_SGIS"/>
>+        <enum value="0x80AF" name="GL_LINEAR_SHARPEN_COLOR_SGIS"/>
>+        <enum value="0x80B0" name="GL_SHARPEN_TEXTURE_FUNC_POINTS_SGIS"/>
>+        <enum value="0x80B1" name="GL_COLOR_MATRIX"/>
>+        <enum value="0x80B1" name="GL_COLOR_MATRIX_SGI"/>
>+        <enum value="0x80B2" name="GL_COLOR_MATRIX_STACK_DEPTH"/>
>+        <enum value="0x80B2" name="GL_COLOR_MATRIX_STACK_DEPTH_SGI"/>
>+        <enum value="0x80B3" name="GL_MAX_COLOR_MATRIX_STACK_DEPTH"/>
>+        <enum value="0x80B3" name="GL_MAX_COLOR_MATRIX_STACK_DEPTH_SGI"/>
>+        <enum value="0x80B4" name="GL_POST_COLOR_MATRIX_RED_SCALE"/>
>+        <enum value="0x80B4" name="GL_POST_COLOR_MATRIX_RED_SCALE_SGI"/>
>+        <enum value="0x80B5" name="GL_POST_COLOR_MATRIX_GREEN_SCALE"/>
>+        <enum value="0x80B5" name="GL_POST_COLOR_MATRIX_GREEN_SCALE_SGI"/>
>+        <enum value="0x80B6" name="GL_POST_COLOR_MATRIX_BLUE_SCALE"/>
>+        <enum value="0x80B6" name="GL_POST_COLOR_MATRIX_BLUE_SCALE_SGI"/>
>+        <enum value="0x80B7" name="GL_POST_COLOR_MATRIX_ALPHA_SCALE"/>
>+        <enum value="0x80B7" name="GL_POST_COLOR_MATRIX_ALPHA_SCALE_SGI"/>
>+        <enum value="0x80B8" name="GL_POST_COLOR_MATRIX_RED_BIAS"/>
>+        <enum value="0x80B8" name="GL_POST_COLOR_MATRIX_RED_BIAS_SGI"/>
>+        <enum value="0x80B9" name="GL_POST_COLOR_MATRIX_GREEN_BIAS"/>
>+        <enum value="0x80B9" name="GL_POST_COLOR_MATRIX_GREEN_BIAS_SGI"/>
>+        <enum value="0x80BA" name="GL_POST_COLOR_MATRIX_BLUE_BIAS"/>
>+        <enum value="0x80BA" name="GL_POST_COLOR_MATRIX_BLUE_BIAS_SGI"/>
>+        <enum value="0x80BB" name="GL_POST_COLOR_MATRIX_ALPHA_BIAS"/>
>+        <enum value="0x80BB" name="GL_POST_COLOR_MATRIX_ALPHA_BIAS_SGI"/>
>+        <enum value="0x80BC" name="GL_TEXTURE_COLOR_TABLE_SGI"/>
>+        <enum value="0x80BD" name="GL_PROXY_TEXTURE_COLOR_TABLE_SGI"/>
>+        <enum value="0x80BE" name="GL_TEXTURE_ENV_BIAS_SGIX"/>
>+        <enum value="0x80BF" name="GL_SHADOW_AMBIENT_SGIX"/>
>+        <enum value="0x80BF" name="GL_TEXTURE_COMPARE_FAIL_VALUE_ARB"/>
>+    </enums>
>+
>+    <enums namespace="GL" start="0x80C0" end="0x80CF" vendor="ZiiLabs">
>+            <unused start="0x80C0" end="0x80C7" vendor="ZiiLabs"/>
>+        <enum value="0x80C8" name="GL_BLEND_DST_RGB"/>
>+        <enum value="0x80C8" name="GL_BLEND_DST_RGB_EXT"/>
>+        <enum value="0x80C8" name="GL_BLEND_DST_RGB_OES"/>
>+        <enum value="0x80C9" name="GL_BLEND_SRC_RGB"/>
>+        <enum value="0x80C9" name="GL_BLEND_SRC_RGB_EXT"/>
>+        <enum value="0x80C9" name="GL_BLEND_SRC_RGB_OES"/>
>+        <enum value="0x80CA" name="GL_BLEND_DST_ALPHA"/>
>+        <enum value="0x80CA" name="GL_BLEND_DST_ALPHA_EXT"/>
>+        <enum value="0x80CA" name="GL_BLEND_DST_ALPHA_OES"/>
>+        <enum value="0x80CB" name="GL_BLEND_SRC_ALPHA"/>
>+        <enum value="0x80CB" name="GL_BLEND_SRC_ALPHA_EXT"/>
>+        <enum value="0x80CB" name="GL_BLEND_SRC_ALPHA_OES"/>
>+        <enum value="0x80CC" name="GL_422_EXT"/>
>+        <enum value="0x80CD" name="GL_422_REV_EXT"/>
>+        <enum value="0x80CE" name="GL_422_AVERAGE_EXT"/>
>+        <enum value="0x80CF" name="GL_422_REV_AVERAGE_EXT"/>
>+    </enums>
>+
>+    <enums namespace="GL" start="0x80D0" end="0x80DF" vendor="SGI">
>+        <enum value="0x80D0" name="GL_COLOR_TABLE"/>
>+        <enum value="0x80D0" name="GL_COLOR_TABLE_SGI"/>
>+        <enum value="0x80D1" name="GL_POST_CONVOLUTION_COLOR_TABLE"/>
>+        <enum value="0x80D1" name="GL_POST_CONVOLUTION_COLOR_TABLE_SGI"/>
>+        <enum value="0x80D2" name="GL_POST_COLOR_MATRIX_COLOR_TABLE"/>
>+        <enum value="0x80D2" name="GL_POST_COLOR_MATRIX_COLOR_TABLE_SGI"/>
>+        <enum value="0x80D3" name="GL_PROXY_COLOR_TABLE"/>
>+        <enum value="0x80D3" name="GL_PROXY_COLOR_TABLE_SGI"/>
>+        <enum value="0x80D4" name="GL_PROXY_POST_CONVOLUTION_COLOR_TABLE"/>
>+        <enum value="0x80D4" name="GL_PROXY_POST_CONVOLUTION_COLOR_TABLE_SGI"/>
>+        <enum value="0x80D5" name="GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE"/>
>+        <enum value="0x80D5" name="GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE_SGI"/>
>+        <enum value="0x80D6" name="GL_COLOR_TABLE_SCALE"/>
>+        <enum value="0x80D6" name="GL_COLOR_TABLE_SCALE_SGI"/>
>+        <enum value="0x80D7" name="GL_COLOR_TABLE_BIAS"/>
>+        <enum value="0x80D7" name="GL_COLOR_TABLE_BIAS_SGI"/>
>+        <enum value="0x80D8" name="GL_COLOR_TABLE_FORMAT"/>
>+        <enum value="0x80D8" name="GL_COLOR_TABLE_FORMAT_SGI"/>
>+        <enum value="0x80D9" name="GL_COLOR_TABLE_WIDTH"/>
>+        <enum value="0x80D9" name="GL_COLOR_TABLE_WIDTH_SGI"/>
>+        <enum value="0x80DA" name="GL_COLOR_TABLE_RED_SIZE"/>
>+        <enum value="0x80DA" name="GL_COLOR_TABLE_RED_SIZE_SGI"/>
>+        <enum value="0x80DB" name="GL_COLOR_TABLE_GREEN_SIZE"/>
>+        <enum value="0x80DB" name="GL_COLOR_TABLE_GREEN_SIZE_SGI"/>
>+        <enum value="0x80DC" name="GL_COLOR_TABLE_BLUE_SIZE"/>
>+        <enum value="0x80DC" name="GL_COLOR_TABLE_BLUE_SIZE_SGI"/>
>+        <enum value="0x80DD" name="GL_COLOR_TABLE_ALPHA_SIZE"/>
>+        <enum value="0x80DD" name="GL_COLOR_TABLE_ALPHA_SIZE_SGI"/>
>+        <enum value="0x80DE" name="GL_COLOR_TABLE_LUMINANCE_SIZE"/>
>+        <enum value="0x80DE" name="GL_COLOR_TABLE_LUMINANCE_SIZE_SGI"/>
>+        <enum value="0x80DF" name="GL_COLOR_TABLE_INTENSITY_SIZE"/>
>+        <enum value="0x80DF" name="GL_COLOR_TABLE_INTENSITY_SIZE_SGI"/>
>+    </enums>
>+
>+    <enums namespace="GL" start="0x80E0" end="0x810F" vendor="MS">
>+        <enum value="0x80E0" name="GL_BGR"/>
>+        <enum value="0x80E0" name="GL_BGR_EXT"/>
>+        <enum value="0x80E1" name="GL_BGRA"/>
>+        <enum value="0x80E1" name="GL_BGRA_EXT"/>
>+        <enum value="0x80E1" name="GL_BGRA_IMG"/>
>+        <enum value="0x80E2" name="GL_COLOR_INDEX1_EXT"/>
>+        <enum value="0x80E3" name="GL_COLOR_INDEX2_EXT"/>
>+        <enum value="0x80E4" name="GL_COLOR_INDEX4_EXT"/>
>+        <enum value="0x80E5" name="GL_COLOR_INDEX8_EXT"/>
>+        <enum value="0x80E6" name="GL_COLOR_INDEX12_EXT"/>
>+        <enum value="0x80E7" name="GL_COLOR_INDEX16_EXT"/>
>+        <enum value="0x80E8" name="GL_MAX_ELEMENTS_VERTICES"/>
>+        <enum value="0x80E8" name="GL_MAX_ELEMENTS_VERTICES_EXT"/>
>+        <enum value="0x80E9" name="GL_MAX_ELEMENTS_INDICES"/>
>+        <enum value="0x80E9" name="GL_MAX_ELEMENTS_INDICES_EXT"/>
>+        <enum value="0x80EA" name="GL_PHONG_WIN"/>
>+        <enum value="0x80EB" name="GL_PHONG_HINT_WIN"/>
>+        <enum value="0x80EC" name="GL_FOG_SPECULAR_TEXTURE_WIN"/>
>+        <enum value="0x80ED" name="GL_TEXTURE_INDEX_SIZE_EXT"/>
>+        <enum value="0x80EE" name="GL_PARAMETER_BUFFER"/>
>+        <enum value="0x80EE" name="GL_PARAMETER_BUFFER_ARB" alias="GL_PARAMETER_BUFFER"/>
>+        <enum value="0x80EF" name="GL_PARAMETER_BUFFER_BINDING"/>
>+        <enum value="0x80EF" name="GL_PARAMETER_BUFFER_BINDING_ARB" alias="GL_PARAMETER_BUFFER_BINDING"/>
>+        <enum value="0x80F0" name="GL_CLIP_VOLUME_CLIPPING_HINT_EXT"/>
>+            <unused start="0x80F1" end="0x810F" vendor="MS"/>
>+    </enums>
>+
>+    <enums namespace="GL" start="0x8110" end="0x814F" vendor="SGI">
>+        <enum value="0x8110" name="GL_DUAL_ALPHA4_SGIS"/>
>+        <enum value="0x8111" name="GL_DUAL_ALPHA8_SGIS"/>
>+        <enum value="0x8112" name="GL_DUAL_ALPHA12_SGIS"/>
>+        <enum value="0x8113" name="GL_DUAL_ALPHA16_SGIS"/>
>+        <enum value="0x8114" name="GL_DUAL_LUMINANCE4_SGIS"/>
>+        <enum value="0x8115" name="GL_DUAL_LUMINANCE8_SGIS"/>
>+        <enum value="0x8116" name="GL_DUAL_LUMINANCE12_SGIS"/>
>+        <enum value="0x8117" name="GL_DUAL_LUMINANCE16_SGIS"/>
>+        <enum value="0x8118" name="GL_DUAL_INTENSITY4_SGIS"/>
>+        <enum value="0x8119" name="GL_DUAL_INTENSITY8_SGIS"/>
>+        <enum value="0x811A" name="GL_DUAL_INTENSITY12_SGIS"/>
>+        <enum value="0x811B" name="GL_DUAL_INTENSITY16_SGIS"/>
>+        <enum value="0x811C" name="GL_DUAL_LUMINANCE_ALPHA4_SGIS"/>
>+        <enum value="0x811D" name="GL_DUAL_LUMINANCE_ALPHA8_SGIS"/>
>+        <enum value="0x811E" name="GL_QUAD_ALPHA4_SGIS"/>
>+        <enum value="0x811F" name="GL_QUAD_ALPHA8_SGIS"/>
>+        <enum value="0x8120" name="GL_QUAD_LUMINANCE4_SGIS"/>
>+        <enum value="0x8121" name="GL_QUAD_LUMINANCE8_SGIS"/>
>+        <enum value="0x8122" name="GL_QUAD_INTENSITY4_SGIS"/>
>+        <enum value="0x8123" name="GL_QUAD_INTENSITY8_SGIS"/>
>+        <enum value="0x8124" name="GL_DUAL_TEXTURE_SELECT_SGIS"/>
>+        <enum value="0x8125" name="GL_QUAD_TEXTURE_SELECT_SGIS"/>
>+        <enum value="0x8126" name="GL_POINT_SIZE_MIN"/>
>+        <enum value="0x8126" name="GL_POINT_SIZE_MIN_ARB"/>
>+        <enum value="0x8126" name="GL_POINT_SIZE_MIN_EXT"/>
>+        <enum value="0x8126" name="GL_POINT_SIZE_MIN_SGIS"/>
>+        <enum value="0x8127" name="GL_POINT_SIZE_MAX"/>
>+        <enum value="0x8127" name="GL_POINT_SIZE_MAX_ARB"/>
>+        <enum value="0x8127" name="GL_POINT_SIZE_MAX_EXT"/>
>+        <enum value="0x8127" name="GL_POINT_SIZE_MAX_SGIS"/>
>+        <enum value="0x8128" name="GL_POINT_FADE_THRESHOLD_SIZE"/>
>+        <enum value="0x8128" name="GL_POINT_FADE_THRESHOLD_SIZE_ARB"/>
>+        <enum value="0x8128" name="GL_POINT_FADE_THRESHOLD_SIZE_EXT"/>
>+        <enum value="0x8128" name="GL_POINT_FADE_THRESHOLD_SIZE_SGIS"/>
>+        <enum value="0x8129" name="GL_DISTANCE_ATTENUATION_EXT"/>
>+        <enum value="0x8129" name="GL_DISTANCE_ATTENUATION_SGIS"/>
>+        <enum value="0x8129" name="GL_POINT_DISTANCE_ATTENUATION"/>
>+        <enum value="0x8129" name="GL_POINT_DISTANCE_ATTENUATION_ARB"/>
>+        <enum value="0x812A" name="GL_FOG_FUNC_SGIS"/>
>+        <enum value="0x812B" name="GL_FOG_FUNC_POINTS_SGIS"/>
>+        <enum value="0x812C" name="GL_MAX_FOG_FUNC_POINTS_SGIS"/>
>+        <enum value="0x812D" name="GL_CLAMP_TO_BORDER"/>
>+        <enum value="0x812D" name="GL_CLAMP_TO_BORDER_ARB"/>
>+        <enum value="0x812D" name="GL_CLAMP_TO_BORDER_EXT"/>
>+        <enum value="0x812D" name="GL_CLAMP_TO_BORDER_NV"/>
>+        <enum value="0x812D" name="GL_CLAMP_TO_BORDER_SGIS"/>
>+        <enum value="0x812D" name="GL_CLAMP_TO_BORDER_OES"/>
>+        <enum value="0x812E" name="GL_TEXTURE_MULTI_BUFFER_HINT_SGIX"/>
>+        <enum value="0x812F" name="GL_CLAMP_TO_EDGE"/>
>+        <enum value="0x812F" name="GL_CLAMP_TO_EDGE_SGIS"/>
>+        <enum value="0x8130" name="GL_PACK_SKIP_VOLUMES_SGIS"/>
>+        <enum value="0x8131" name="GL_PACK_IMAGE_DEPTH_SGIS"/>
>+        <enum value="0x8132" name="GL_UNPACK_SKIP_VOLUMES_SGIS"/>
>+        <enum value="0x8133" name="GL_UNPACK_IMAGE_DEPTH_SGIS"/>
>+        <enum value="0x8134" name="GL_TEXTURE_4D_SGIS"/>
>+        <enum value="0x8135" name="GL_PROXY_TEXTURE_4D_SGIS"/>
>+        <enum value="0x8136" name="GL_TEXTURE_4DSIZE_SGIS"/>
>+        <enum value="0x8137" name="GL_TEXTURE_WRAP_Q_SGIS"/>
>+        <enum value="0x8138" name="GL_MAX_4D_TEXTURE_SIZE_SGIS"/>
>+        <enum value="0x8139" name="GL_PIXEL_TEX_GEN_SGIX"/>
>+        <enum value="0x813A" name="GL_TEXTURE_MIN_LOD"/>
>+        <enum value="0x813A" name="GL_TEXTURE_MIN_LOD_SGIS"/>
>+        <enum value="0x813B" name="GL_TEXTURE_MAX_LOD"/>
>+        <enum value="0x813B" name="GL_TEXTURE_MAX_LOD_SGIS"/>
>+        <enum value="0x813C" name="GL_TEXTURE_BASE_LEVEL"/>
>+        <enum value="0x813C" name="GL_TEXTURE_BASE_LEVEL_SGIS"/>
>+        <enum value="0x813D" name="GL_TEXTURE_MAX_LEVEL"/>
>+        <enum value="0x813D" name="GL_TEXTURE_MAX_LEVEL_APPLE"/>
>+        <enum value="0x813D" name="GL_TEXTURE_MAX_LEVEL_SGIS"/>
>+        <enum value="0x813E" name="GL_PIXEL_TILE_BEST_ALIGNMENT_SGIX"/>
>+        <enum value="0x813F" name="GL_PIXEL_TILE_CACHE_INCREMENT_SGIX"/>
>+        <enum value="0x8140" name="GL_PIXEL_TILE_WIDTH_SGIX"/>
>+        <enum value="0x8141" name="GL_PIXEL_TILE_HEIGHT_SGIX"/>
>+        <enum value="0x8142" name="GL_PIXEL_TILE_GRID_WIDTH_SGIX"/>
>+        <enum value="0x8143" name="GL_PIXEL_TILE_GRID_HEIGHT_SGIX"/>
>+        <enum value="0x8144" name="GL_PIXEL_TILE_GRID_DEPTH_SGIX"/>
>+        <enum value="0x8145" name="GL_PIXEL_TILE_CACHE_SIZE_SGIX"/>
>+        <enum value="0x8146" name="GL_FILTER4_SGIS"/>
>+        <enum value="0x8147" name="GL_TEXTURE_FILTER4_SIZE_SGIS"/>
>+        <enum value="0x8148" name="GL_SPRITE_SGIX"/>
>+        <enum value="0x8149" name="GL_SPRITE_MODE_SGIX"/>
>+        <enum value="0x814A" name="GL_SPRITE_AXIS_SGIX"/>
>+        <enum value="0x814B" name="GL_SPRITE_TRANSLATION_SGIX"/>
>+        <enum value="0x814C" name="GL_SPRITE_AXIAL_SGIX"/>
>+        <enum value="0x814D" name="GL_SPRITE_OBJECT_ALIGNED_SGIX"/>
>+        <enum value="0x814E" name="GL_SPRITE_EYE_ALIGNED_SGIX"/>
>+        <enum value="0x814F" name="GL_TEXTURE_4D_BINDING_SGIS"/>
>+    </enums>
>+
>+    <enums namespace="GL" start="0x8150" end="0x816F" vendor="HP">
>+        <enum value="0x8150" name="GL_IGNORE_BORDER_HP"/>
>+        <enum value="0x8151" name="GL_CONSTANT_BORDER"/>
>+        <enum value="0x8151" name="GL_CONSTANT_BORDER_HP"/>
>+            <unused start="0x8152" vendor="HP" comment="GL_WRAP_BORDER = 0x8152 was proposed, but not actually promoted to core"/>
>+        <enum value="0x8153" name="GL_REPLICATE_BORDER"/>
>+        <enum value="0x8153" name="GL_REPLICATE_BORDER_HP"/>
>+        <enum value="0x8154" name="GL_CONVOLUTION_BORDER_COLOR"/>
>+        <enum value="0x8154" name="GL_CONVOLUTION_BORDER_COLOR_HP"/>
>+        <enum value="0x8155" name="GL_IMAGE_SCALE_X_HP"/>
>+        <enum value="0x8156" name="GL_IMAGE_SCALE_Y_HP"/>
>+        <enum value="0x8157" name="GL_IMAGE_TRANSLATE_X_HP"/>
>+        <enum value="0x8158" name="GL_IMAGE_TRANSLATE_Y_HP"/>
>+        <enum value="0x8159" name="GL_IMAGE_ROTATE_ANGLE_HP"/>
>+        <enum value="0x815A" name="GL_IMAGE_ROTATE_ORIGIN_X_HP"/>
>+        <enum value="0x815B" name="GL_IMAGE_ROTATE_ORIGIN_Y_HP"/>
>+        <enum value="0x815C" name="GL_IMAGE_MAG_FILTER_HP"/>
>+        <enum value="0x815D" name="GL_IMAGE_MIN_FILTER_HP"/>
>+        <enum value="0x815E" name="GL_IMAGE_CUBIC_WEIGHT_HP"/>
>+        <enum value="0x815F" name="GL_CUBIC_HP"/>
>+        <enum value="0x8160" name="GL_AVERAGE_HP"/>
>+        <enum value="0x8161" name="GL_IMAGE_TRANSFORM_2D_HP"/>
>+        <enum value="0x8162" name="GL_POST_IMAGE_TRANSFORM_COLOR_TABLE_HP"/>
>+        <enum value="0x8163" name="GL_PROXY_POST_IMAGE_TRANSFORM_COLOR_TABLE_HP"/>
>+            <unused start="0x8164" vendor="HP"/>
>+        <enum value="0x8165" name="GL_OCCLUSION_TEST_HP"/>
>+        <enum value="0x8166" name="GL_OCCLUSION_TEST_RESULT_HP"/>
>+        <enum value="0x8167" name="GL_TEXTURE_LIGHTING_MODE_HP"/>
>+        <enum value="0x8168" name="GL_TEXTURE_POST_SPECULAR_HP"/>
>+        <enum value="0x8169" name="GL_TEXTURE_PRE_SPECULAR_HP"/>
>+            <unused start="0x816A" end="0x816F" vendor="HP"/>
>+    </enums>
>+
>+    <enums namespace="GL" start="0x8170" end="0x81CF" vendor="SGI">
>+        <enum value="0x8170" name="GL_LINEAR_CLIPMAP_LINEAR_SGIX"/>
>+        <enum value="0x8171" name="GL_TEXTURE_CLIPMAP_CENTER_SGIX"/>
>+        <enum value="0x8172" name="GL_TEXTURE_CLIPMAP_FRAME_SGIX"/>
>+        <enum value="0x8173" name="GL_TEXTURE_CLIPMAP_OFFSET_SGIX"/>
>+        <enum value="0x8174" name="GL_TEXTURE_CLIPMAP_VIRTUAL_DEPTH_SGIX"/>
>+        <enum value="0x8175" name="GL_TEXTURE_CLIPMAP_LOD_OFFSET_SGIX"/>
>+        <enum value="0x8176" name="GL_TEXTURE_CLIPMAP_DEPTH_SGIX"/>
>+        <enum value="0x8177" name="GL_MAX_CLIPMAP_DEPTH_SGIX"/>
>+        <enum value="0x8178" name="GL_MAX_CLIPMAP_VIRTUAL_DEPTH_SGIX"/>
>+        <enum value="0x8179" name="GL_POST_TEXTURE_FILTER_BIAS_SGIX"/>
>+        <enum value="0x817A" name="GL_POST_TEXTURE_FILTER_SCALE_SGIX"/>
>+        <enum value="0x817B" name="GL_POST_TEXTURE_FILTER_BIAS_RANGE_SGIX"/>
>+        <enum value="0x817C" name="GL_POST_TEXTURE_FILTER_SCALE_RANGE_SGIX"/>
>+        <enum value="0x817D" name="GL_REFERENCE_PLANE_SGIX"/>
>+        <enum value="0x817E" name="GL_REFERENCE_PLANE_EQUATION_SGIX"/>
>+        <enum value="0x817F" name="GL_IR_INSTRUMENT1_SGIX"/>
>+        <enum value="0x8180" name="GL_INSTRUMENT_BUFFER_POINTER_SGIX"/>
>+        <enum value="0x8181" name="GL_INSTRUMENT_MEASUREMENTS_SGIX"/>
>+        <enum value="0x8182" name="GL_LIST_PRIORITY_SGIX"/>
>+        <enum value="0x8183" name="GL_CALLIGRAPHIC_FRAGMENT_SGIX"/>
>+        <enum value="0x8184" name="GL_PIXEL_TEX_GEN_Q_CEILING_SGIX"/>
>+        <enum value="0x8185" name="GL_PIXEL_TEX_GEN_Q_ROUND_SGIX"/>
>+        <enum value="0x8186" name="GL_PIXEL_TEX_GEN_Q_FLOOR_SGIX"/>
>+        <enum value="0x8187" name="GL_PIXEL_TEX_GEN_ALPHA_REPLACE_SGIX"/>
>+        <enum value="0x8188" name="GL_PIXEL_TEX_GEN_ALPHA_NO_REPLACE_SGIX"/>
>+        <enum value="0x8189" name="GL_PIXEL_TEX_GEN_ALPHA_LS_SGIX"/>
>+        <enum value="0x818A" name="GL_PIXEL_TEX_GEN_ALPHA_MS_SGIX"/>
>+        <enum value="0x818B" name="GL_FRAMEZOOM_SGIX"/>
>+        <enum value="0x818C" name="GL_FRAMEZOOM_FACTOR_SGIX"/>
>+        <enum value="0x818D" name="GL_MAX_FRAMEZOOM_FACTOR_SGIX"/>
>+        <enum value="0x818E" name="GL_TEXTURE_LOD_BIAS_S_SGIX"/>
>+        <enum value="0x818F" name="GL_TEXTURE_LOD_BIAS_T_SGIX"/>
>+        <enum value="0x8190" name="GL_TEXTURE_LOD_BIAS_R_SGIX"/>
>+        <enum value="0x8191" name="GL_GENERATE_MIPMAP"/>
>+        <enum value="0x8191" name="GL_GENERATE_MIPMAP_SGIS"/>
>+        <enum value="0x8192" name="GL_GENERATE_MIPMAP_HINT"/>
>+        <enum value="0x8192" name="GL_GENERATE_MIPMAP_HINT_SGIS"/>
>+            <unused start="0x8193" end="0x8193" comment="Incomplete extension SGIX_spotlight_cutoff"/>
>+            
>+        <enum value="0x8194" name="GL_GEOMETRY_DEFORMATION_SGIX"/>
>+        <enum value="0x8195" name="GL_TEXTURE_DEFORMATION_SGIX"/>
>+        <enum value="0x8196" name="GL_DEFORMATIONS_MASK_SGIX"/>
>+        <enum value="0x8197" name="GL_MAX_DEFORMATION_ORDER_SGIX"/>
>+        <enum value="0x8198" name="GL_FOG_OFFSET_SGIX"/>
>+        <enum value="0x8199" name="GL_FOG_OFFSET_VALUE_SGIX"/>
>+        <enum value="0x819A" name="GL_TEXTURE_COMPARE_SGIX"/>
>+        <enum value="0x819B" name="GL_TEXTURE_COMPARE_OPERATOR_SGIX"/>
>+        <enum value="0x819C" name="GL_TEXTURE_LEQUAL_R_SGIX"/>
>+        <enum value="0x819D" name="GL_TEXTURE_GEQUAL_R_SGIX"/>
>+            <unused start="0x819E" end="0x81A4" comment="Private (internal) extension SGIX_igloo_interface"/>
>+            
>+            
>+            
>+            
>+            
>+            
>+            
>+        <enum value="0x81A5" name="GL_DEPTH_COMPONENT16"/>
>+        <enum value="0x81A5" name="GL_DEPTH_COMPONENT16_ARB"/>
>+        <enum value="0x81A5" name="GL_DEPTH_COMPONENT16_OES"/>
>+        <enum value="0x81A5" name="GL_DEPTH_COMPONENT16_SGIX"/>
>+        <enum value="0x81A6" name="GL_DEPTH_COMPONENT24"/>
>+        <enum value="0x81A6" name="GL_DEPTH_COMPONENT24_ARB"/>
>+        <enum value="0x81A6" name="GL_DEPTH_COMPONENT24_OES"/>
>+        <enum value="0x81A6" name="GL_DEPTH_COMPONENT24_SGIX"/>
>+        <enum value="0x81A7" name="GL_DEPTH_COMPONENT32"/>
>+        <enum value="0x81A7" name="GL_DEPTH_COMPONENT32_ARB"/>
>+        <enum value="0x81A7" name="GL_DEPTH_COMPONENT32_OES"/>
>+        <enum value="0x81A7" name="GL_DEPTH_COMPONENT32_SGIX"/>
>+        <enum value="0x81A8" name="GL_ARRAY_ELEMENT_LOCK_FIRST_EXT"/>
>+        <enum value="0x81A9" name="GL_ARRAY_ELEMENT_LOCK_COUNT_EXT"/>
>+        <enum value="0x81AA" name="GL_CULL_VERTEX_EXT"/>
>+        <enum value="0x81AB" name="GL_CULL_VERTEX_EYE_POSITION_EXT"/>
>+        <enum value="0x81AC" name="GL_CULL_VERTEX_OBJECT_POSITION_EXT"/>
>+        <enum value="0x81AD" name="GL_IUI_V2F_EXT"/>
>+        <enum value="0x81AE" name="GL_IUI_V3F_EXT"/>
>+        <enum value="0x81AF" name="GL_IUI_N3F_V2F_EXT"/>
>+        <enum value="0x81B0" name="GL_IUI_N3F_V3F_EXT"/>
>+        <enum value="0x81B1" name="GL_T2F_IUI_V2F_EXT"/>
>+        <enum value="0x81B2" name="GL_T2F_IUI_V3F_EXT"/>
>+        <enum value="0x81B3" name="GL_T2F_IUI_N3F_V2F_EXT"/>
>+        <enum value="0x81B4" name="GL_T2F_IUI_N3F_V3F_EXT"/>
>+        <enum value="0x81B5" name="GL_INDEX_TEST_EXT"/>
>+        <enum value="0x81B6" name="GL_INDEX_TEST_FUNC_EXT"/>
>+        <enum value="0x81B7" name="GL_INDEX_TEST_REF_EXT"/>
>+        <enum value="0x81B8" name="GL_INDEX_MATERIAL_EXT"/>
>+        <enum value="0x81B9" name="GL_INDEX_MATERIAL_PARAMETER_EXT"/>
>+        <enum value="0x81BA" name="GL_INDEX_MATERIAL_FACE_EXT"/>
>+        <enum value="0x81BB" name="GL_YCRCB_422_SGIX"/>
>+        <enum value="0x81BC" name="GL_YCRCB_444_SGIX"/>
>+            <unused start="0x81BD" end="0x81C3" comment="Incomplete extension SGI_complex_type"/>
>+            
>+            
>+            
>+            
>+            
>+            
>+            
>+            <unused start="0x81C4" end="0x81CA" comment="Incomplete extension SGI_fft"/>
>+            
>+            
>+            
>+            
>+            
>+            
>+            
>+            <unused start="0x81CB" end="0x81CF" comment="Incomplete extension SGIX_nurbs_eval"/>
>+            
>+            
>+            
>+            
>+            
>+    </enums>
>+
>+    <enums namespace="GL" start="0x81D0" end="0x81DF" vendor="SUN">
>+            <unused start="0x81D0" end="0x81D1" vendor="SUN"/>
>+            <unused start="0x81D2" end="0x81D3" comment="No extension spec SUNX_surface_hint"/>
>+            
>+            
>+        <enum value="0x81D4" name="GL_WRAP_BORDER_SUN"/>
>+        <enum value="0x81D5" name="GL_UNPACK_CONSTANT_DATA_SUNX"/>
>+        <enum value="0x81D6" name="GL_TEXTURE_CONSTANT_DATA_SUNX"/>
>+        <enum value="0x81D7" name="GL_TRIANGLE_LIST_SUN"/>
>+        <enum value="0x81D8" name="GL_REPLACEMENT_CODE_SUN"/>
>+        <enum value="0x81D9" name="GL_GLOBAL_ALPHA_SUN"/>
>+        <enum value="0x81DA" name="GL_GLOBAL_ALPHA_FACTOR_SUN"/>
>+            <unused start="0x81DB" end="0x81DF" vendor="SUN"/>
>+    </enums>
>+
>+    <enums namespace="GL" start="0x81E0" end="0x81FF" vendor="SGI">
>+            <unused start="0x81E0" end="0x81EE" comment="Incomplete extension SGIX_nurbs_eval"/>
>+            
>+            
>+            
>+            
>+            
>+            
>+            
>+            
>+            
>+            
>+            
>+            
>+            
>+            
>+            
>+        <enum value="0x81EF" name="GL_TEXTURE_COLOR_WRITEMASK_SGIS"/>
>+        <enum value="0x81F0" name="GL_EYE_DISTANCE_TO_POINT_SGIS"/>
>+        <enum value="0x81F1" name="GL_OBJECT_DISTANCE_TO_POINT_SGIS"/>
>+        <enum value="0x81F2" name="GL_EYE_DISTANCE_TO_LINE_SGIS"/>
>+        <enum value="0x81F3" name="GL_OBJECT_DISTANCE_TO_LINE_SGIS"/>
>+        <enum value="0x81F4" name="GL_EYE_POINT_SGIS"/>
>+        <enum value="0x81F5" name="GL_OBJECT_POINT_SGIS"/>
>+        <enum value="0x81F6" name="GL_EYE_LINE_SGIS"/>
>+        <enum value="0x81F7" name="GL_OBJECT_LINE_SGIS"/>
>+        <enum value="0x81F8" name="GL_LIGHT_MODEL_COLOR_CONTROL"/>
>+        <enum value="0x81F8" name="GL_LIGHT_MODEL_COLOR_CONTROL_EXT"/>
>+        <enum value="0x81F9" name="GL_SINGLE_COLOR"/>
>+        <enum value="0x81F9" name="GL_SINGLE_COLOR_EXT"/>
>+        <enum value="0x81FA" name="GL_SEPARATE_SPECULAR_COLOR"/>
>+        <enum value="0x81FA" name="GL_SEPARATE_SPECULAR_COLOR_EXT"/>
>+        <enum value="0x81FB" name="GL_SHARED_TEXTURE_PALETTE_EXT"/>
>+            <unused start="0x81FC" end="0x81FD" comment="Incomplete extension SGIX_fog_scale"/>
>+            
>+            
>+            <unused start="0x81FE" end="0x81FF" comment="Incomplete extension SGIX_fog_blend"/>
>+            
>+            
>+    </enums>
>+
>+    <enums namespace="GL" start="0x8200" end="0x820F" vendor="AMD" comment="Range released by MS 2002/9/16">
>+        <enum value="0x8200" name="GL_TEXT_FRAGMENT_SHADER_ATI"/>
>+            <unused start="0x8201" end="0x820F" vendor="AMD"/>
>+    </enums>
>+
>+    <enums namespace="GL" start="0x8210" end="0x823F" vendor="ARB">
>+        <enum value="0x8210" name="GL_FRAMEBUFFER_ATTACHMENT_COLOR_ENCODING"/>
>+        <enum value="0x8210" name="GL_FRAMEBUFFER_ATTACHMENT_COLOR_ENCODING_EXT"/>
>+        <enum value="0x8211" name="GL_FRAMEBUFFER_ATTACHMENT_COMPONENT_TYPE"/>
>+        <enum value="0x8211" name="GL_FRAMEBUFFER_ATTACHMENT_COMPONENT_TYPE_EXT"/>
>+        <enum value="0x8212" name="GL_FRAMEBUFFER_ATTACHMENT_RED_SIZE"/>
>+        <enum value="0x8213" name="GL_FRAMEBUFFER_ATTACHMENT_GREEN_SIZE"/>
>+        <enum value="0x8214" name="GL_FRAMEBUFFER_ATTACHMENT_BLUE_SIZE"/>
>+        <enum value="0x8215" name="GL_FRAMEBUFFER_ATTACHMENT_ALPHA_SIZE"/>
>+        <enum value="0x8216" name="GL_FRAMEBUFFER_ATTACHMENT_DEPTH_SIZE"/>
>+        <enum value="0x8217" name="GL_FRAMEBUFFER_ATTACHMENT_STENCIL_SIZE"/>
>+        <enum value="0x8218" name="GL_FRAMEBUFFER_DEFAULT"/>
>+        <enum value="0x8219" name="GL_FRAMEBUFFER_UNDEFINED"/>
>+        <enum value="0x8219" name="GL_FRAMEBUFFER_UNDEFINED_OES"/>
>+        <enum value="0x821A" name="GL_DEPTH_STENCIL_ATTACHMENT"/>
>+        <enum value="0x821B" name="GL_MAJOR_VERSION"/>
>+        <enum value="0x821C" name="GL_MINOR_VERSION"/>
>+        <enum value="0x821D" name="GL_NUM_EXTENSIONS"/>
>+        <enum value="0x821E" name="GL_CONTEXT_FLAGS"/>
>+        <enum value="0x821F" name="GL_BUFFER_IMMUTABLE_STORAGE"/>
>+        <enum value="0x821F" name="GL_BUFFER_IMMUTABLE_STORAGE_EXT"/>
>+        <enum value="0x8220" name="GL_BUFFER_STORAGE_FLAGS"/>
>+        <enum value="0x8220" name="GL_BUFFER_STORAGE_FLAGS_EXT"/>
>+        <enum value="0x8221" name="GL_PRIMITIVE_RESTART_FOR_PATCHES_SUPPORTED"/>
>+        <enum value="0x8221" name="GL_PRIMITIVE_RESTART_FOR_PATCHES_SUPPORTED_OES"/>
>+        <enum value="0x8222" name="GL_INDEX"/>
>+            <unused start="0x8223" vendor="ARB" comment="GL_DEPTH_BUFFER = 0x8223 not actually used in the API"/>
>+            <unused start="0x8224" vendor="ARB" comment="GL_STENCIL_BUFFER = 0x8224 not actually used in the API"/>
>+        <enum value="0x8225" name="GL_COMPRESSED_RED"/>
>+        <enum value="0x8226" name="GL_COMPRESSED_RG"/>
>+        <enum value="0x8227" name="GL_RG"/>
>+        <enum value="0x8227" name="GL_RG_EXT"/>
>+        <enum value="0x8228" name="GL_RG_INTEGER"/>
>+        <enum value="0x8229" name="GL_R8"/>
>+        <enum value="0x8229" name="GL_R8_EXT"/>
>+        <enum value="0x822A" name="GL_R16"/>
>+        <enum value="0x822A" name="GL_R16_EXT"/>
>+        <enum value="0x822B" name="GL_RG8"/>
>+        <enum value="0x822B" name="GL_RG8_EXT"/>
>+        <enum value="0x822C" name="GL_RG16"/>
>+        <enum value="0x822C" name="GL_RG16_EXT"/>
>+        <enum value="0x822D" name="GL_R16F"/>
>+        <enum value="0x822D" name="GL_R16F_EXT"/>
>+        <enum value="0x822E" name="GL_R32F"/>
>+        <enum value="0x822E" name="GL_R32F_EXT"/>
>+        <enum value="0x822F" name="GL_RG16F"/>
>+        <enum value="0x822F" name="GL_RG16F_EXT"/>
>+        <enum value="0x8230" name="GL_RG32F"/>
>+        <enum value="0x8230" name="GL_RG32F_EXT"/>
>+        <enum value="0x8231" name="GL_R8I"/>
>+        <enum value="0x8232" name="GL_R8UI"/>
>+        <enum value="0x8233" name="GL_R16I"/>
>+        <enum value="0x8234" name="GL_R16UI"/>
>+        <enum value="0x8235" name="GL_R32I"/>
>+        <enum value="0x8236" name="GL_R32UI"/>
>+        <enum value="0x8237" name="GL_RG8I"/>
>+        <enum value="0x8238" name="GL_RG8UI"/>
>+        <enum value="0x8239" name="GL_RG16I"/>
>+        <enum value="0x823A" name="GL_RG16UI"/>
>+        <enum value="0x823B" name="GL_RG32I"/>
>+        <enum value="0x823C" name="GL_RG32UI"/>
>+            <unused start="0x823D" end="0x823F" vendor="ARB"/>
>+    </enums>
>+
>+    <enums namespace="GL" start="0x8240" end="0x82AF" vendor="ARB" comment="Range released by MS on 2002/9/16">
>+        <enum value="0x8240" name="GL_SYNC_CL_EVENT_ARB"/>
>+        <enum value="0x8241" name="GL_SYNC_CL_EVENT_COMPLETE_ARB"/>
>+        <enum value="0x8242" name="GL_DEBUG_OUTPUT_SYNCHRONOUS"/>
>+        <enum value="0x8242" name="GL_DEBUG_OUTPUT_SYNCHRONOUS_ARB"/>
>+        <enum value="0x8242" name="GL_DEBUG_OUTPUT_SYNCHRONOUS_KHR"/>
>+        <enum value="0x8243" name="GL_DEBUG_NEXT_LOGGED_MESSAGE_LENGTH"/>
>+        <enum value="0x8243" name="GL_DEBUG_NEXT_LOGGED_MESSAGE_LENGTH_ARB"/>
>+        <enum value="0x8243" name="GL_DEBUG_NEXT_LOGGED_MESSAGE_LENGTH_KHR"/>
>+        <enum value="0x8244" name="GL_DEBUG_CALLBACK_FUNCTION"/>
>+        <enum value="0x8244" name="GL_DEBUG_CALLBACK_FUNCTION_ARB"/>
>+        <enum value="0x8244" name="GL_DEBUG_CALLBACK_FUNCTION_KHR"/>
>+        <enum value="0x8245" name="GL_DEBUG_CALLBACK_USER_PARAM"/>
>+        <enum value="0x8245" name="GL_DEBUG_CALLBACK_USER_PARAM_ARB"/>
>+        <enum value="0x8245" name="GL_DEBUG_CALLBACK_USER_PARAM_KHR"/>
>+        <enum value="0x8246" name="GL_DEBUG_SOURCE_API"/>
>+        <enum value="0x8246" name="GL_DEBUG_SOURCE_API_ARB"/>
>+        <enum value="0x8246" name="GL_DEBUG_SOURCE_API_KHR"/>
>+        <enum value="0x8247" name="GL_DEBUG_SOURCE_WINDOW_SYSTEM"/>
>+        <enum value="0x8247" name="GL_DEBUG_SOURCE_WINDOW_SYSTEM_ARB"/>
>+        <enum value="0x8247" name="GL_DEBUG_SOURCE_WINDOW_SYSTEM_KHR"/>
>+        <enum value="0x8248" name="GL_DEBUG_SOURCE_SHADER_COMPILER"/>
>+        <enum value="0x8248" name="GL_DEBUG_SOURCE_SHADER_COMPILER_ARB"/>
>+        <enum value="0x8248" name="GL_DEBUG_SOURCE_SHADER_COMPILER_KHR"/>
>+        <enum value="0x8249" name="GL_DEBUG_SOURCE_THIRD_PARTY"/>
>+        <enum value="0x8249" name="GL_DEBUG_SOURCE_THIRD_PARTY_ARB"/>
>+        <enum value="0x8249" name="GL_DEBUG_SOURCE_THIRD_PARTY_KHR"/>
>+        <enum value="0x824A" name="GL_DEBUG_SOURCE_APPLICATION"/>
>+        <enum value="0x824A" name="GL_DEBUG_SOURCE_APPLICATION_ARB"/>
>+        <enum value="0x824A" name="GL_DEBUG_SOURCE_APPLICATION_KHR"/>
>+        <enum value="0x824B" name="GL_DEBUG_SOURCE_OTHER"/>
>+        <enum value="0x824B" name="GL_DEBUG_SOURCE_OTHER_ARB"/>
>+        <enum value="0x824B" name="GL_DEBUG_SOURCE_OTHER_KHR"/>
>+        <enum value="0x824C" name="GL_DEBUG_TYPE_ERROR"/>
>+        <enum value="0x824C" name="GL_DEBUG_TYPE_ERROR_ARB"/>
>+        <enum value="0x824C" name="GL_DEBUG_TYPE_ERROR_KHR"/>
>+        <enum value="0x824D" name="GL_DEBUG_TYPE_DEPRECATED_BEHAVIOR"/>
>+        <enum value="0x824D" name="GL_DEBUG_TYPE_DEPRECATED_BEHAVIOR_ARB"/>
>+        <enum value="0x824D" name="GL_DEBUG_TYPE_DEPRECATED_BEHAVIOR_KHR"/>
>+        <enum value="0x824E" name="GL_DEBUG_TYPE_UNDEFINED_BEHAVIOR"/>
>+        <enum value="0x824E" name="GL_DEBUG_TYPE_UNDEFINED_BEHAVIOR_ARB"/>
>+        <enum value="0x824E" name="GL_DEBUG_TYPE_UNDEFINED_BEHAVIOR_KHR"/>
>+        <enum value="0x824F" name="GL_DEBUG_TYPE_PORTABILITY"/>
>+        <enum value="0x824F" name="GL_DEBUG_TYPE_PORTABILITY_ARB"/>
>+        <enum value="0x824F" name="GL_DEBUG_TYPE_PORTABILITY_KHR"/>
>+        <enum value="0x8250" name="GL_DEBUG_TYPE_PERFORMANCE"/>
>+        <enum value="0x8250" name="GL_DEBUG_TYPE_PERFORMANCE_ARB"/>
>+        <enum value="0x8250" name="GL_DEBUG_TYPE_PERFORMANCE_KHR"/>
>+        <enum value="0x8251" name="GL_DEBUG_TYPE_OTHER"/>
>+        <enum value="0x8251" name="GL_DEBUG_TYPE_OTHER_ARB"/>
>+        <enum value="0x8251" name="GL_DEBUG_TYPE_OTHER_KHR"/>
>+        <enum value="0x8252" name="GL_LOSE_CONTEXT_ON_RESET"/>
>+        <enum value="0x8252" name="GL_LOSE_CONTEXT_ON_RESET_ARB"/>
>+        <enum value="0x8252" name="GL_LOSE_CONTEXT_ON_RESET_EXT"/>
>+        <enum value="0x8252" name="GL_LOSE_CONTEXT_ON_RESET_KHR"/>
>+        <enum value="0x8253" name="GL_GUILTY_CONTEXT_RESET"/>
>+        <enum value="0x8253" name="GL_GUILTY_CONTEXT_RESET_ARB"/>
>+        <enum value="0x8253" name="GL_GUILTY_CONTEXT_RESET_EXT"/>
>+        <enum value="0x8253" name="GL_GUILTY_CONTEXT_RESET_KHR"/>
>+        <enum value="0x8254" name="GL_INNOCENT_CONTEXT_RESET"/>
>+        <enum value="0x8254" name="GL_INNOCENT_CONTEXT_RESET_ARB"/>
>+        <enum value="0x8254" name="GL_INNOCENT_CONTEXT_RESET_EXT"/>
>+        <enum value="0x8254" name="GL_INNOCENT_CONTEXT_RESET_KHR"/>
>+        <enum value="0x8255" name="GL_UNKNOWN_CONTEXT_RESET"/>
>+        <enum value="0x8255" name="GL_UNKNOWN_CONTEXT_RESET_ARB"/>
>+        <enum value="0x8255" name="GL_UNKNOWN_CONTEXT_RESET_EXT"/>
>+        <enum value="0x8255" name="GL_UNKNOWN_CONTEXT_RESET_KHR"/>
>+        <enum value="0x8256" name="GL_RESET_NOTIFICATION_STRATEGY"/>
>+        <enum value="0x8256" name="GL_RESET_NOTIFICATION_STRATEGY_ARB"/>
>+        <enum value="0x8256" name="GL_RESET_NOTIFICATION_STRATEGY_EXT"/>
>+        <enum value="0x8256" name="GL_RESET_NOTIFICATION_STRATEGY_KHR"/>
>+        <enum value="0x8257" name="GL_PROGRAM_BINARY_RETRIEVABLE_HINT"/>
>+        <enum value="0x8258" name="GL_PROGRAM_SEPARABLE"/>
>+        <enum value="0x8258" name="GL_PROGRAM_SEPARABLE_EXT"/>
>+        <enum value="0x8259" name="GL_ACTIVE_PROGRAM"/>
>+        <enum value="0x8259" api="gles2" name="GL_ACTIVE_PROGRAM_EXT" comment="For the OpenGL ES version of EXT_separate_shader_objects"/>
>+        <enum value="0x825A" name="GL_PROGRAM_PIPELINE_BINDING"/>
>+        <enum value="0x825A" name="GL_PROGRAM_PIPELINE_BINDING_EXT"/>
>+        <enum value="0x825B" name="GL_MAX_VIEWPORTS"/>
>+        <enum value="0x825B" name="GL_MAX_VIEWPORTS_NV"/>
>+        <enum value="0x825B" name="GL_MAX_VIEWPORTS_OES"/>
>+        <enum value="0x825C" name="GL_VIEWPORT_SUBPIXEL_BITS"/>
>+        <enum value="0x825C" name="GL_VIEWPORT_SUBPIXEL_BITS_EXT"/>
>+        <enum value="0x825C" name="GL_VIEWPORT_SUBPIXEL_BITS_NV"/>
>+        <enum value="0x825C" name="GL_VIEWPORT_SUBPIXEL_BITS_OES"/>
>+        <enum value="0x825D" name="GL_VIEWPORT_BOUNDS_RANGE"/>
>+        <enum value="0x825D" name="GL_VIEWPORT_BOUNDS_RANGE_EXT"/>
>+        <enum value="0x825D" name="GL_VIEWPORT_BOUNDS_RANGE_NV"/>
>+        <enum value="0x825D" name="GL_VIEWPORT_BOUNDS_RANGE_OES"/>
>+        <enum value="0x825E" name="GL_LAYER_PROVOKING_VERTEX"/>
>+        <enum value="0x825E" name="GL_LAYER_PROVOKING_VERTEX_EXT"/>
>+        <enum value="0x825E" name="GL_LAYER_PROVOKING_VERTEX_OES"/>
>+        <enum value="0x825F" name="GL_VIEWPORT_INDEX_PROVOKING_VERTEX"/>
>+        <enum value="0x825F" name="GL_VIEWPORT_INDEX_PROVOKING_VERTEX_EXT"/>
>+        <enum value="0x825F" name="GL_VIEWPORT_INDEX_PROVOKING_VERTEX_NV"/>
>+        <enum value="0x825F" name="GL_VIEWPORT_INDEX_PROVOKING_VERTEX_OES"/>
>+        <enum value="0x8260" name="GL_UNDEFINED_VERTEX"/>
>+        <enum value="0x8260" name="GL_UNDEFINED_VERTEX_EXT"/>
>+        <enum value="0x8260" name="GL_UNDEFINED_VERTEX_OES"/>
>+        <enum value="0x8261" name="GL_NO_RESET_NOTIFICATION"/>
>+        <enum value="0x8261" name="GL_NO_RESET_NOTIFICATION_ARB"/>
>+        <enum value="0x8261" name="GL_NO_RESET_NOTIFICATION_EXT"/>
>+        <enum value="0x8261" name="GL_NO_RESET_NOTIFICATION_KHR"/>
>+        <enum value="0x8262" name="GL_MAX_COMPUTE_SHARED_MEMORY_SIZE"/>
>+        <enum value="0x8263" name="GL_MAX_COMPUTE_UNIFORM_COMPONENTS"/>
>+        <enum value="0x8264" name="GL_MAX_COMPUTE_ATOMIC_COUNTER_BUFFERS"/>
>+        <enum value="0x8265" name="GL_MAX_COMPUTE_ATOMIC_COUNTERS"/>
>+        <enum value="0x8266" name="GL_MAX_COMBINED_COMPUTE_UNIFORM_COMPONENTS"/>
>+        <enum value="0x8267" name="GL_COMPUTE_WORK_GROUP_SIZE"/>
>+        <enum value="0x8268" name="GL_DEBUG_TYPE_MARKER"/>
>+        <enum value="0x8268" name="GL_DEBUG_TYPE_MARKER_KHR"/>
>+        <enum value="0x8269" name="GL_DEBUG_TYPE_PUSH_GROUP"/>
>+        <enum value="0x8269" name="GL_DEBUG_TYPE_PUSH_GROUP_KHR"/>
>+        <enum value="0x826A" name="GL_DEBUG_TYPE_POP_GROUP"/>
>+        <enum value="0x826A" name="GL_DEBUG_TYPE_POP_GROUP_KHR"/>
>+        <enum value="0x826B" name="GL_DEBUG_SEVERITY_NOTIFICATION"/>
>+        <enum value="0x826B" name="GL_DEBUG_SEVERITY_NOTIFICATION_KHR"/>
>+        <enum value="0x826C" name="GL_MAX_DEBUG_GROUP_STACK_DEPTH"/>
>+        <enum value="0x826C" name="GL_MAX_DEBUG_GROUP_STACK_DEPTH_KHR"/>
>+        <enum value="0x826D" name="GL_DEBUG_GROUP_STACK_DEPTH"/>
>+        <enum value="0x826D" name="GL_DEBUG_GROUP_STACK_DEPTH_KHR"/>
>+        <enum value="0x826E" name="GL_MAX_UNIFORM_LOCATIONS"/>
>+        <enum value="0x826F" name="GL_INTERNALFORMAT_SUPPORTED"/>
>+        <enum value="0x8270" name="GL_INTERNALFORMAT_PREFERRED"/>
>+        <enum value="0x8271" name="GL_INTERNALFORMAT_RED_SIZE"/>
>+        <enum value="0x8272" name="GL_INTERNALFORMAT_GREEN_SIZE"/>
>+        <enum value="0x8273" name="GL_INTERNALFORMAT_BLUE_SIZE"/>
>+        <enum value="0x8274" name="GL_INTERNALFORMAT_ALPHA_SIZE"/>
>+        <enum value="0x8275" name="GL_INTERNALFORMAT_DEPTH_SIZE"/>
>+        <enum value="0x8276" name="GL_INTERNALFORMAT_STENCIL_SIZE"/>
>+        <enum value="0x8277" name="GL_INTERNALFORMAT_SHARED_SIZE"/>
>+        <enum value="0x8278" name="GL_INTERNALFORMAT_RED_TYPE"/>
>+        <enum value="0x8279" name="GL_INTERNALFORMAT_GREEN_TYPE"/>
>+        <enum value="0x827A" name="GL_INTERNALFORMAT_BLUE_TYPE"/>
>+        <enum value="0x827B" name="GL_INTERNALFORMAT_ALPHA_TYPE"/>
>+        <enum value="0x827C" name="GL_INTERNALFORMAT_DEPTH_TYPE"/>
>+        <enum value="0x827D" name="GL_INTERNALFORMAT_STENCIL_TYPE"/>
>+        <enum value="0x827E" name="GL_MAX_WIDTH"/>
>+        <enum value="0x827F" name="GL_MAX_HEIGHT"/>
>+        <enum value="0x8280" name="GL_MAX_DEPTH"/>
>+        <enum value="0x8281" name="GL_MAX_LAYERS"/>
>+        <enum value="0x8282" name="GL_MAX_COMBINED_DIMENSIONS"/>
>+        <enum value="0x8283" name="GL_COLOR_COMPONENTS"/>
>+        <enum value="0x8284" name="GL_DEPTH_COMPONENTS"/>
>+        <enum value="0x8285" name="GL_STENCIL_COMPONENTS"/>
>+        <enum value="0x8286" name="GL_COLOR_RENDERABLE"/>
>+        <enum value="0x8287" name="GL_DEPTH_RENDERABLE"/>
>+        <enum value="0x8288" name="GL_STENCIL_RENDERABLE"/>
>+        <enum value="0x8289" name="GL_FRAMEBUFFER_RENDERABLE"/>
>+        <enum value="0x828A" name="GL_FRAMEBUFFER_RENDERABLE_LAYERED"/>
>+        <enum value="0x828B" name="GL_FRAMEBUFFER_BLEND"/>
>+        <enum value="0x828C" name="GL_READ_PIXELS"/>
>+        <enum value="0x828D" name="GL_READ_PIXELS_FORMAT"/>
>+        <enum value="0x828E" name="GL_READ_PIXELS_TYPE"/>
>+        <enum value="0x828F" name="GL_TEXTURE_IMAGE_FORMAT"/>
>+        <enum value="0x8290" name="GL_TEXTURE_IMAGE_TYPE"/>
>+        <enum value="0x8291" name="GL_GET_TEXTURE_IMAGE_FORMAT"/>
>+        <enum value="0x8292" name="GL_GET_TEXTURE_IMAGE_TYPE"/>
>+        <enum value="0x8293" name="GL_MIPMAP"/>
>+        <enum value="0x8294" name="GL_MANUAL_GENERATE_MIPMAP"/>
>+        <enum value="0x8295" name="GL_AUTO_GENERATE_MIPMAP" comment="Should be deprecated"/>
>+        <enum value="0x8296" name="GL_COLOR_ENCODING"/>
>+        <enum value="0x8297" name="GL_SRGB_READ"/>
>+        <enum value="0x8298" name="GL_SRGB_WRITE"/>
>+        <enum value="0x8299" name="GL_SRGB_DECODE_ARB"/>
>+        <enum value="0x829A" name="GL_FILTER"/>
>+        <enum value="0x829B" name="GL_VERTEX_TEXTURE"/>
>+        <enum value="0x829C" name="GL_TESS_CONTROL_TEXTURE"/>
>+        <enum value="0x829D" name="GL_TESS_EVALUATION_TEXTURE"/>
>+        <enum value="0x829E" name="GL_GEOMETRY_TEXTURE"/>
>+        <enum value="0x829F" name="GL_FRAGMENT_TEXTURE"/>
>+        <enum value="0x82A0" name="GL_COMPUTE_TEXTURE"/>
>+        <enum value="0x82A1" name="GL_TEXTURE_SHADOW"/>
>+        <enum value="0x82A2" name="GL_TEXTURE_GATHER"/>
>+        <enum value="0x82A3" name="GL_TEXTURE_GATHER_SHADOW"/>
>+        <enum value="0x82A4" name="GL_SHADER_IMAGE_LOAD"/>
>+        <enum value="0x82A5" name="GL_SHADER_IMAGE_STORE"/>
>+        <enum value="0x82A6" name="GL_SHADER_IMAGE_ATOMIC"/>
>+        <enum value="0x82A7" name="GL_IMAGE_TEXEL_SIZE"/>
>+        <enum value="0x82A8" name="GL_IMAGE_COMPATIBILITY_CLASS"/>
>+        <enum value="0x82A9" name="GL_IMAGE_PIXEL_FORMAT"/>
>+        <enum value="0x82AA" name="GL_IMAGE_PIXEL_TYPE"/>
>+            <unused start="0x82AB" vendor="ARB"/>
>+        <enum value="0x82AC" name="GL_SIMULTANEOUS_TEXTURE_AND_DEPTH_TEST"/>
>+        <enum value="0x82AD" name="GL_SIMULTANEOUS_TEXTURE_AND_STENCIL_TEST"/>
>+        <enum value="0x82AE" name="GL_SIMULTANEOUS_TEXTURE_AND_DEPTH_WRITE"/>
>+        <enum value="0x82AF" name="GL_SIMULTANEOUS_TEXTURE_AND_STENCIL_WRITE"/>
>+    </enums>
>+
>+    <enums namespace="GL" start="0x82B0" end="0x830F" vendor="ARB" comment="Range reclaimed from ADD on 2012/05/10">
>+            <unused start="0x82B0" vendor="ARB"/>
>+        <enum value="0x82B1" name="GL_TEXTURE_COMPRESSED_BLOCK_WIDTH"/>
>+        <enum value="0x82B2" name="GL_TEXTURE_COMPRESSED_BLOCK_HEIGHT"/>
>+        <enum value="0x82B3" name="GL_TEXTURE_COMPRESSED_BLOCK_SIZE"/>
>+        <enum value="0x82B4" name="GL_CLEAR_BUFFER"/>
>+        <enum value="0x82B5" name="GL_TEXTURE_VIEW"/>
>+        <enum value="0x82B6" name="GL_VIEW_COMPATIBILITY_CLASS"/>
>+        <enum value="0x82B7" name="GL_FULL_SUPPORT"/>
>+        <enum value="0x82B8" name="GL_CAVEAT_SUPPORT"/>
>+        <enum value="0x82B9" name="GL_IMAGE_CLASS_4_X_32"/>
>+        <enum value="0x82BA" name="GL_IMAGE_CLASS_2_X_32"/>
>+        <enum value="0x82BB" name="GL_IMAGE_CLASS_1_X_32"/>
>+        <enum value="0x82BC" name="GL_IMAGE_CLASS_4_X_16"/>
>+        <enum value="0x82BD" name="GL_IMAGE_CLASS_2_X_16"/>
>+        <enum value="0x82BE" name="GL_IMAGE_CLASS_1_X_16"/>
>+        <enum value="0x82BF" name="GL_IMAGE_CLASS_4_X_8"/>
>+        <enum value="0x82C0" name="GL_IMAGE_CLASS_2_X_8"/>
>+        <enum value="0x82C1" name="GL_IMAGE_CLASS_1_X_8"/>
>+        <enum value="0x82C2" name="GL_IMAGE_CLASS_11_11_10"/>
>+        <enum value="0x82C3" name="GL_IMAGE_CLASS_10_10_10_2"/>
>+        <enum value="0x82C4" name="GL_VIEW_CLASS_128_BITS"/>
>+        <enum value="0x82C5" name="GL_VIEW_CLASS_96_BITS"/>
>+        <enum value="0x82C6" name="GL_VIEW_CLASS_64_BITS"/>
>+        <enum value="0x82C7" name="GL_VIEW_CLASS_48_BITS"/>
>+        <enum value="0x82C8" name="GL_VIEW_CLASS_32_BITS"/>
>+        <enum value="0x82C9" name="GL_VIEW_CLASS_24_BITS"/>
>+        <enum value="0x82CA" name="GL_VIEW_CLASS_16_BITS"/>
>+        <enum value="0x82CB" name="GL_VIEW_CLASS_8_BITS"/>
>+        <enum value="0x82CC" name="GL_VIEW_CLASS_S3TC_DXT1_RGB"/>
>+        <enum value="0x82CD" name="GL_VIEW_CLASS_S3TC_DXT1_RGBA"/>
>+        <enum value="0x82CE" name="GL_VIEW_CLASS_S3TC_DXT3_RGBA"/>
>+        <enum value="0x82CF" name="GL_VIEW_CLASS_S3TC_DXT5_RGBA"/>
>+        <enum value="0x82D0" name="GL_VIEW_CLASS_RGTC1_RED"/>
>+        <enum value="0x82D1" name="GL_VIEW_CLASS_RGTC2_RG"/>
>+        <enum value="0x82D2" name="GL_VIEW_CLASS_BPTC_UNORM"/>
>+        <enum value="0x82D3" name="GL_VIEW_CLASS_BPTC_FLOAT"/>
>+        <enum value="0x82D4" name="GL_VERTEX_ATTRIB_BINDING"/>
>+        <enum value="0x82D5" name="GL_VERTEX_ATTRIB_RELATIVE_OFFSET"/>
>+        <enum value="0x82D6" name="GL_VERTEX_BINDING_DIVISOR"/>
>+        <enum value="0x82D7" name="GL_VERTEX_BINDING_OFFSET"/>
>+        <enum value="0x82D8" name="GL_VERTEX_BINDING_STRIDE"/>
>+        <enum value="0x82D9" name="GL_MAX_VERTEX_ATTRIB_RELATIVE_OFFSET"/>
>+        <enum value="0x82DA" name="GL_MAX_VERTEX_ATTRIB_BINDINGS"/>
>+        <enum value="0x82DB" name="GL_TEXTURE_VIEW_MIN_LEVEL"/>
>+        <enum value="0x82DB" name="GL_TEXTURE_VIEW_MIN_LEVEL_EXT"/>
>+        <enum value="0x82DB" name="GL_TEXTURE_VIEW_MIN_LEVEL_OES"/>
>+        <enum value="0x82DC" name="GL_TEXTURE_VIEW_NUM_LEVELS"/>
>+        <enum value="0x82DC" name="GL_TEXTURE_VIEW_NUM_LEVELS_EXT"/>
>+        <enum value="0x82DC" name="GL_TEXTURE_VIEW_NUM_LEVELS_OES"/>
>+        <enum value="0x82DD" name="GL_TEXTURE_VIEW_MIN_LAYER"/>
>+        <enum value="0x82DD" name="GL_TEXTURE_VIEW_MIN_LAYER_EXT"/>
>+        <enum value="0x82DD" name="GL_TEXTURE_VIEW_MIN_LAYER_OES"/>
>+        <enum value="0x82DE" name="GL_TEXTURE_VIEW_NUM_LAYERS"/>
>+        <enum value="0x82DE" name="GL_TEXTURE_VIEW_NUM_LAYERS_EXT"/>
>+        <enum value="0x82DE" name="GL_TEXTURE_VIEW_NUM_LAYERS_OES"/>
>+        <enum value="0x82DF" name="GL_TEXTURE_IMMUTABLE_LEVELS"/>
>+        <enum value="0x82E0" name="GL_BUFFER"/>
>+        <enum value="0x82E0" name="GL_BUFFER_KHR"/>
>+        <enum value="0x82E1" name="GL_SHADER"/>
>+        <enum value="0x82E1" name="GL_SHADER_KHR"/>
>+        <enum value="0x82E2" name="GL_PROGRAM"/>
>+        <enum value="0x82E2" name="GL_PROGRAM_KHR"/>
>+        <enum value="0x82E3" name="GL_QUERY"/>
>+        <enum value="0x82E3" name="GL_QUERY_KHR"/>
>+        <enum value="0x82E4" name="GL_PROGRAM_PIPELINE"/>
>+        <enum value="0x82E4" name="GL_PROGRAM_PIPELINE_KHR"/>
>+        <enum value="0x82E5" name="GL_MAX_VERTEX_ATTRIB_STRIDE"/>
>+        <enum value="0x82E6" name="GL_SAMPLER"/>
>+        <enum value="0x82E6" name="GL_SAMPLER_KHR"/>
>+        <enum value="0x82E7" name="GL_DISPLAY_LIST"/>
>+        <enum value="0x82E8" name="GL_MAX_LABEL_LENGTH"/>
>+        <enum value="0x82E8" name="GL_MAX_LABEL_LENGTH_KHR"/>
>+        <enum value="0x82E9" name="GL_NUM_SHADING_LANGUAGE_VERSIONS"/>
>+        <enum value="0x82EA" name="GL_QUERY_TARGET"/>
>+        
>+            <unused start="0x82EB" vendor="ARB" comment="Reserved. Formerly used for GL_TEXTURE_BINDING."/>
>+        <enum value="0x82EC" name="GL_TRANSFORM_FEEDBACK_OVERFLOW"/>
>+        <enum value="0x82EC" name="GL_TRANSFORM_FEEDBACK_OVERFLOW_ARB" alias="GL_TRANSFORM_FEEDBACK_OVERFLOW"/>
>+        <enum value="0x82ED" name="GL_TRANSFORM_FEEDBACK_STREAM_OVERFLOW"/>
>+        <enum value="0x82ED" name="GL_TRANSFORM_FEEDBACK_STREAM_OVERFLOW_ARB" alias="GL_TRANSFORM_FEEDBACK_STREAM_OVERFLOW"/>
>+        <enum value="0x82EE" name="GL_VERTICES_SUBMITTED"/>
>+        <enum value="0x82EE" name="GL_VERTICES_SUBMITTED_ARB" alias="GL_VERTICES_SUBMITTED"/>
>+        <enum value="0x82EF" name="GL_PRIMITIVES_SUBMITTED"/>
>+        <enum value="0x82EF" name="GL_PRIMITIVES_SUBMITTED_ARB" alias="GL_PRIMITIVES_SUBMITTED"/>
>+        <enum value="0x82F0" name="GL_VERTEX_SHADER_INVOCATIONS"/>
>+        <enum value="0x82F0" name="GL_VERTEX_SHADER_INVOCATIONS_ARB" alias="GL_VERTEX_SHADER_INVOCATIONS"/>
>+        <enum value="0x82F1" name="GL_TESS_CONTROL_SHADER_PATCHES"/>
>+        <enum value="0x82F1" name="GL_TESS_CONTROL_SHADER_PATCHES_ARB" alias="GL_TESS_CONTROL_SHADER_PATCHES"/>
>+        <enum value="0x82F2" name="GL_TESS_EVALUATION_SHADER_INVOCATIONS"/>
>+        <enum value="0x82F2" name="GL_TESS_EVALUATION_SHADER_INVOCATIONS_ARB" alias="GL_TESS_EVALUATION_SHADER_INVOCATIONS"/>
>+        <enum value="0x82F3" name="GL_GEOMETRY_SHADER_PRIMITIVES_EMITTED"/>
>+        <enum value="0x82F3" name="GL_GEOMETRY_SHADER_PRIMITIVES_EMITTED_ARB" alias="GL_GEOMETRY_SHADER_PRIMITIVES_EMITTED"/>
>+        <enum value="0x82F4" name="GL_FRAGMENT_SHADER_INVOCATIONS"/>
>+        <enum value="0x82F4" name="GL_FRAGMENT_SHADER_INVOCATIONS_ARB" alias="GL_FRAGMENT_SHADER_INVOCATIONS"/>
>+        <enum value="0x82F5" name="GL_COMPUTE_SHADER_INVOCATIONS"/>
>+        <enum value="0x82F5" name="GL_COMPUTE_SHADER_INVOCATIONS_ARB" alias="GL_COMPUTE_SHADER_INVOCATIONS"/>
>+        <enum value="0x82F6" name="GL_CLIPPING_INPUT_PRIMITIVES"/>
>+        <enum value="0x82F6" name="GL_CLIPPING_INPUT_PRIMITIVES_ARB" alias="GL_CLIPPING_INPUT_PRIMITIVES"/>
>+        <enum value="0x82F7" name="GL_CLIPPING_OUTPUT_PRIMITIVES"/>
>+        <enum value="0x82F7" name="GL_CLIPPING_OUTPUT_PRIMITIVES_ARB" alias="GL_CLIPPING_OUTPUT_PRIMITIVES"/>
>+        <enum value="0x82F8" name="GL_SPARSE_BUFFER_PAGE_SIZE_ARB"/>
>+        <enum value="0x82F9" name="GL_MAX_CULL_DISTANCES"/>
>+        <enum value="0x82F9" name="GL_MAX_CULL_DISTANCES_EXT" alias="GL_MAX_CULL_DISTANCES"/>
>+        <enum value="0x82FA" name="GL_MAX_COMBINED_CLIP_AND_CULL_DISTANCES"/>
>+        <enum value="0x82FA" name="GL_MAX_COMBINED_CLIP_AND_CULL_DISTANCES_EXT" alias="GL_MAX_COMBINED_CLIP_AND_CULL_DISTANCES"/>
>+        <enum value="0x82FB" name="GL_CONTEXT_RELEASE_BEHAVIOR"/>
>+        <enum value="0x82FB" name="GL_CONTEXT_RELEASE_BEHAVIOR_KHR"/>
>+        <enum value="0x82FC" name="GL_CONTEXT_RELEASE_BEHAVIOR_FLUSH"/>
>+        <enum value="0x82FC" name="GL_CONTEXT_RELEASE_BEHAVIOR_FLUSH_KHR"/>
>+        <enum value="0x82FD" name="GL_ROBUST_GPU_TIMEOUT_MS_KHR" comment="Reserved for future"/>
>+            <unused start="0x82FE" end="0x830F" vendor="ARB"/>
>+    </enums>
>+
>+    <enums namespace="GL" start="0x8310" end="0x832F" vendor="SGI">
>+        <enum value="0x8310" name="GL_DEPTH_PASS_INSTRUMENT_SGIX"/>
>+        <enum value="0x8311" name="GL_DEPTH_PASS_INSTRUMENT_COUNTERS_SGIX"/>
>+        <enum value="0x8312" name="GL_DEPTH_PASS_INSTRUMENT_MAX_SGIX"/>
>+        <enum value="0x8313" name="GL_FRAGMENTS_INSTRUMENT_SGIX"/>
>+        <enum value="0x8314" name="GL_FRAGMENTS_INSTRUMENT_COUNTERS_SGIX"/>
>+        <enum value="0x8315" name="GL_FRAGMENTS_INSTRUMENT_MAX_SGIX"/>
>+        <enum value="0x8316" name="GL_CONVOLUTION_HINT_SGIX"/>
>+            <unused start="0x8317" comment="Incomplete extension SGIX_color_matrix_accuracy"/>
>+            
>+        <enum value="0x8318" name="GL_YCRCB_SGIX"/>
>+        <enum value="0x8319" name="GL_YCRCBA_SGIX"/>
>+        <enum value="0x831A" name="GL_UNPACK_COMPRESSED_SIZE_SGIX"/>
>+        <enum value="0x831B" name="GL_PACK_MAX_COMPRESSED_SIZE_SGIX"/>
>+        <enum value="0x831C" name="GL_PACK_COMPRESSED_SIZE_SGIX"/>
>+        <enum value="0x831D" name="GL_SLIM8U_SGIX"/>
>+        <enum value="0x831E" name="GL_SLIM10U_SGIX"/>
>+        <enum value="0x831F" name="GL_SLIM12S_SGIX"/>
>+        <enum value="0x8320" name="GL_ALPHA_MIN_SGIX"/>
>+        <enum value="0x8321" name="GL_ALPHA_MAX_SGIX"/>
>+        <enum value="0x8322" name="GL_SCALEBIAS_HINT_SGIX"/>
>+            <unused start="0x8323" end="0x8328" comment="Incomplete extension SGIX_fog_layers"/>
>+            
>+            
>+            
>+            
>+            
>+            
>+        <enum value="0x8329" name="GL_ASYNC_MARKER_SGIX"/>
>+            <unused start="0x832A" comment="Incomplete extension SGIX_texture_phase"/>
>+            
>+        <enum value="0x832B" name="GL_PIXEL_TEX_GEN_MODE_SGIX"/>
>+        <enum value="0x832C" name="GL_ASYNC_HISTOGRAM_SGIX"/>
>+        <enum value="0x832D" name="GL_MAX_ASYNC_HISTOGRAM_SGIX"/>
>+            <unused start="0x832E" end="0x832F" comment="Incomplete extension SGIX_texture_mipmap_anisotropic"/>
>+            
>+            
>+    </enums>
>+
>+    <enums namespace="GL" start="0x8330" end="0x833F" vendor="SUN">
>+        <enum value="0x8330" name="GL_PIXEL_TRANSFORM_2D_EXT"/>
>+        <enum value="0x8331" name="GL_PIXEL_MAG_FILTER_EXT"/>
>+        <enum value="0x8332" name="GL_PIXEL_MIN_FILTER_EXT"/>
>+        <enum value="0x8333" name="GL_PIXEL_CUBIC_WEIGHT_EXT"/>
>+        <enum value="0x8334" name="GL_CUBIC_EXT"/>
>+        <enum value="0x8335" name="GL_AVERAGE_EXT"/>
>+        <enum value="0x8336" name="GL_PIXEL_TRANSFORM_2D_STACK_DEPTH_EXT"/>
>+        <enum value="0x8337" name="GL_MAX_PIXEL_TRANSFORM_2D_STACK_DEPTH_EXT"/>
>+        <enum value="0x8338" name="GL_PIXEL_TRANSFORM_2D_MATRIX_EXT"/>
>+            <unused start="0x8339" end="0x833F" vendor="SUN"/>
>+    </enums>
>+
>+    <enums namespace="GL" start="0x8340" end="0x836F" vendor="SGI">
>+            <unused start="0x8340" end="0x8348" comment="Incomplete extension SGIX_cube_map"/>
>+            
>+            
>+            
>+            
>+            
>+            
>+            
>+            
>+            
>+        <enum value="0x8349" name="GL_FRAGMENT_MATERIAL_EXT"/>
>+        <enum value="0x834A" name="GL_FRAGMENT_NORMAL_EXT"/>
>+            
>+        <enum value="0x834C" name="GL_FRAGMENT_COLOR_EXT"/>
>+        <enum value="0x834D" name="GL_ATTENUATION_EXT"/>
>+        <enum value="0x834E" name="GL_SHADOW_ATTENUATION_EXT"/>
>+        <enum value="0x834F" name="GL_TEXTURE_APPLICATION_MODE_EXT"/>
>+        <enum value="0x8350" name="GL_TEXTURE_LIGHT_EXT"/>
>+        <enum value="0x8351" name="GL_TEXTURE_MATERIAL_FACE_EXT"/>
>+        <enum value="0x8352" name="GL_TEXTURE_MATERIAL_PARAMETER_EXT"/>
>+        <enum value="0x8353" name="GL_PIXEL_TEXTURE_SGIS"/>
>+        <enum value="0x8354" name="GL_PIXEL_FRAGMENT_RGB_SOURCE_SGIS"/>
>+        <enum value="0x8355" name="GL_PIXEL_FRAGMENT_ALPHA_SOURCE_SGIS"/>
>+        <enum value="0x8356" name="GL_PIXEL_GROUP_COLOR_SGIS"/>
>+            <unused start="0x8357" end="0x8359" comment="Incomplete extension SGIX_pixel_texture_bits"/>
>+            
>+            
>+            
>+            <unused start="0x835A" comment="Incomplete extension SGIX_pixel_texture_lod"/>
>+            
>+        <enum value="0x835B" name="GL_LINE_QUALITY_HINT_SGIX"/>
>+        <enum value="0x835C" name="GL_ASYNC_TEX_IMAGE_SGIX"/>
>+        <enum value="0x835D" name="GL_ASYNC_DRAW_PIXELS_SGIX"/>
>+        <enum value="0x835E" name="GL_ASYNC_READ_PIXELS_SGIX"/>
>+        <enum value="0x835F" name="GL_MAX_ASYNC_TEX_IMAGE_SGIX"/>
>+        <enum value="0x8360" name="GL_MAX_ASYNC_DRAW_PIXELS_SGIX"/>
>+        <enum value="0x8361" name="GL_MAX_ASYNC_READ_PIXELS_SGIX"/>
>+        <enum value="0x8362" name="GL_UNSIGNED_BYTE_2_3_3_REV"/>
>+        <enum value="0x8362" name="GL_UNSIGNED_BYTE_2_3_3_REV_EXT"/>
>+        <enum value="0x8363" name="GL_UNSIGNED_SHORT_5_6_5"/>
>+        <enum value="0x8363" name="GL_UNSIGNED_SHORT_5_6_5_EXT"/>
>+        <enum value="0x8364" name="GL_UNSIGNED_SHORT_5_6_5_REV"/>
>+        <enum value="0x8364" name="GL_UNSIGNED_SHORT_5_6_5_REV_EXT"/>
>+        <enum value="0x8365" name="GL_UNSIGNED_SHORT_4_4_4_4_REV"/>
>+        <enum value="0x8365" name="GL_UNSIGNED_SHORT_4_4_4_4_REV_EXT"/>
>+        <enum value="0x8365" name="GL_UNSIGNED_SHORT_4_4_4_4_REV_IMG"/>
>+        <enum value="0x8366" name="GL_UNSIGNED_SHORT_1_5_5_5_REV"/>
>+        <enum value="0x8366" name="GL_UNSIGNED_SHORT_1_5_5_5_REV_EXT"/>
>+        <enum value="0x8367" name="GL_UNSIGNED_INT_8_8_8_8_REV"/>
>+        <enum value="0x8367" name="GL_UNSIGNED_INT_8_8_8_8_REV_EXT"/>
>+        <enum value="0x8368" name="GL_UNSIGNED_INT_2_10_10_10_REV"/>
>+        <enum value="0x8368" name="GL_UNSIGNED_INT_2_10_10_10_REV_EXT"/>
>+        <enum value="0x8369" name="GL_TEXTURE_MAX_CLAMP_S_SGIX"/>
>+        <enum value="0x836A" name="GL_TEXTURE_MAX_CLAMP_T_SGIX"/>
>+        <enum value="0x836B" name="GL_TEXTURE_MAX_CLAMP_R_SGIX"/>
>+            <unused start="0x836C" end="0x836E" comment="Incomplete extension SGIX_fog_texture"/>
>+            
>+            
>+            
>+            <unused start="0x836F" comment="Incomplete extension SGIX_fog_factor_to_alpha"/>
>+            
>+    </enums>
>+
>+    <enums namespace="GL" start="0x8370" end="0x837F" vendor="HP">
>+            
>+        <enum value="0x8370" name="GL_MIRRORED_REPEAT"/>
>+        <enum value="0x8370" name="GL_MIRRORED_REPEAT_ARB"/>
>+        <enum value="0x8370" name="GL_MIRRORED_REPEAT_IBM"/>
>+        <enum value="0x8370" name="GL_MIRRORED_REPEAT_OES"/>
>+            <unused start="0x8371" end="0x837F" vendor="HP"/>
>+    </enums>
>+
>+    <enums namespace="GL" start="0x8380" end="0x839F" vendor="IBM">
>+            <unused start="0x8380" end="0x839F" vendor="IBM"/>
>+    </enums>
>+
>+    <enums namespace="GL" start="0x83A0" end="0x83BF" vendor="S3">
>+        <enum value="0x83A0" name="GL_RGB_S3TC"/>
>+        <enum value="0x83A1" name="GL_RGB4_S3TC"/>
>+        <enum value="0x83A2" name="GL_RGBA_S3TC"/>
>+        <enum value="0x83A3" name="GL_RGBA4_S3TC"/>
>+        <enum value="0x83A4" name="GL_RGBA_DXT5_S3TC"/>
>+        <enum value="0x83A5" name="GL_RGBA4_DXT5_S3TC"/>
>+            <unused start="0x83A6" end="0x83BF" vendor="S3"/>
>+    </enums>
>+
>+    <enums namespace="GL" start="0x83C0" end="0x83EF" vendor="SGI" comment="Most of this could be reclaimed">
>+            <unused start="0x83C0" end="0x83CA" comment="Withdrawn extension SGIS_multitexture"/>
>+            
>+            
>+            
>+            
>+            
>+            
>+            
>+            
>+            
>+            
>+            
>+            <unused start="0x83CB" end="0x83E5" vendor="SGI"/>
>+            <unused start="0x83E6" end="0x83E9" comment="Incomplete extension SGIX_bali_g_instruments"/>
>+            
>+            
>+            
>+            
>+            <unused start="0x83EA" end="0x83EC" comment="Incomplete extension SGIX_bali_r_instruments"/>
>+            
>+            
>+            
>+            <unused start="0x83ED" comment="Incomplete extension SGIX_occlusion_instrument"/>
>+            
>+        <enum value="0x83EE" name="GL_VERTEX_PRECLIP_SGIX"/>
>+        <enum value="0x83EF" name="GL_VERTEX_PRECLIP_HINT_SGIX"/>
>+    </enums>
>+
>+    <enums namespace="GL" start="0x83F0" end="0x83FF" vendor="INTEL">
>+            
>+        <enum value="0x83F0" name="GL_COMPRESSED_RGB_S3TC_DXT1_EXT"/>
>+        <enum value="0x83F1" name="GL_COMPRESSED_RGBA_S3TC_DXT1_EXT"/>
>+        <enum value="0x83F2" name="GL_COMPRESSED_RGBA_S3TC_DXT3_ANGLE"/>
>+        <enum value="0x83F2" name="GL_COMPRESSED_RGBA_S3TC_DXT3_EXT"/>
>+        <enum value="0x83F3" name="GL_COMPRESSED_RGBA_S3TC_DXT5_ANGLE"/>
>+        <enum value="0x83F3" name="GL_COMPRESSED_RGBA_S3TC_DXT5_EXT"/>
>+        <enum value="0x83F4" name="GL_PARALLEL_ARRAYS_INTEL"/>
>+        <enum value="0x83F5" name="GL_VERTEX_ARRAY_PARALLEL_POINTERS_INTEL"/>
>+        <enum value="0x83F6" name="GL_NORMAL_ARRAY_PARALLEL_POINTERS_INTEL"/>
>+        <enum value="0x83F7" name="GL_COLOR_ARRAY_PARALLEL_POINTERS_INTEL"/>
>+        <enum value="0x83F8" name="GL_TEXTURE_COORD_ARRAY_PARALLEL_POINTERS_INTEL"/>
>+        <enum value="0x83F9" name="GL_PERFQUERY_DONOT_FLUSH_INTEL"/>
>+        <enum value="0x83FA" name="GL_PERFQUERY_FLUSH_INTEL"/>
>+        <enum value="0x83FB" name="GL_PERFQUERY_WAIT_INTEL"/>
>+        <enum value="0x83FC" name="GL_BLACKHOLE_RENDER_INTEL"/>
>+            <unused start="0x83FD" vendor="INTEL"/>
>+        <enum value="0x83FE" name="GL_CONSERVATIVE_RASTERIZATION_INTEL"/>
>+        <enum value="0x83FF" name="GL_TEXTURE_MEMORY_LAYOUT_INTEL"/>
>+    </enums>
>+
>+    <enums namespace="GL" start="0x8400" end="0x846F" vendor="SGI">
>+        <enum value="0x8400" name="GL_FRAGMENT_LIGHTING_SGIX"/>
>+        <enum value="0x8401" name="GL_FRAGMENT_COLOR_MATERIAL_SGIX"/>
>+        <enum value="0x8402" name="GL_FRAGMENT_COLOR_MATERIAL_FACE_SGIX"/>
>+        <enum value="0x8403" name="GL_FRAGMENT_COLOR_MATERIAL_PARAMETER_SGIX"/>
>+        <enum value="0x8404" name="GL_MAX_FRAGMENT_LIGHTS_SGIX"/>
>+        <enum value="0x8405" name="GL_MAX_ACTIVE_LIGHTS_SGIX"/>
>+        <enum value="0x8406" name="GL_CURRENT_RASTER_NORMAL_SGIX"/>
>+        <enum value="0x8407" name="GL_LIGHT_ENV_MODE_SGIX"/>
>+        <enum value="0x8408" name="GL_FRAGMENT_LIGHT_MODEL_LOCAL_VIEWER_SGIX"/>
>+        <enum value="0x8409" name="GL_FRAGMENT_LIGHT_MODEL_TWO_SIDE_SGIX"/>
>+        <enum value="0x840A" name="GL_FRAGMENT_LIGHT_MODEL_AMBIENT_SGIX"/>
>+        <enum value="0x840B" name="GL_FRAGMENT_LIGHT_MODEL_NORMAL_INTERPOLATION_SGIX"/>
>+        <enum value="0x840C" name="GL_FRAGMENT_LIGHT0_SGIX"/>
>+        <enum value="0x840D" name="GL_FRAGMENT_LIGHT1_SGIX"/>
>+        <enum value="0x840E" name="GL_FRAGMENT_LIGHT2_SGIX"/>
>+        <enum value="0x840F" name="GL_FRAGMENT_LIGHT3_SGIX"/>
>+        <enum value="0x8410" name="GL_FRAGMENT_LIGHT4_SGIX"/>
>+        <enum value="0x8411" name="GL_FRAGMENT_LIGHT5_SGIX"/>
>+        <enum value="0x8412" name="GL_FRAGMENT_LIGHT6_SGIX"/>
>+        <enum value="0x8413" name="GL_FRAGMENT_LIGHT7_SGIX"/>
>+            <unused start="0x8414" end="0x842D" vendor="SGI"/>
>+        <enum value="0x842E" name="GL_PACK_RESAMPLE_SGIX" comment="Formerly 0x842C in SGI specfile"/>
>+        <enum value="0x842F" name="GL_UNPACK_RESAMPLE_SGIX" comment="Formerly 0x842D in SGI specfile"/>
>+        <enum value="0x8430" name="GL_RESAMPLE_DECIMATE_SGIX" comment="Formerly 0x8430 in SGI specfile"/>
>+            <unused start="0x8431" end="0x8432" vendor="SGI"/>
>+        <enum value="0x8433" name="GL_RESAMPLE_REPLICATE_SGIX" comment="Formerly 0x842E in SGI specfile"/>
>+        <enum value="0x8434" name="GL_RESAMPLE_ZERO_FILL_SGIX" comment="Formerly 0x842F in SGI specfile"/>
>+            <unused start="0x8435" vendor="SGI"/>
>+            
>+            
>+            
>+            
>+            
>+            
>+            
>+            
>+            
>+            
>+            
>+            
>+            
>+            
>+            
>+            
>+            
>+            
>+            
>+            
>+            
>+        <enum value="0x8439" name="GL_TANGENT_ARRAY_EXT"/>
>+        <enum value="0x843A" name="GL_BINORMAL_ARRAY_EXT"/>
>+        <enum value="0x843B" name="GL_CURRENT_TANGENT_EXT"/>
>+        <enum value="0x843C" name="GL_CURRENT_BINORMAL_EXT"/>
>+            <unused start="0x844D" vendor="SGI"/>
>+        <enum value="0x843E" name="GL_TANGENT_ARRAY_TYPE_EXT"/>
>+        <enum value="0x843F" name="GL_TANGENT_ARRAY_STRIDE_EXT"/>
>+        <enum value="0x8440" name="GL_BINORMAL_ARRAY_TYPE_EXT"/>
>+        <enum value="0x8441" name="GL_BINORMAL_ARRAY_STRIDE_EXT"/>
>+        <enum value="0x8442" name="GL_TANGENT_ARRAY_POINTER_EXT"/>
>+        <enum value="0x8443" name="GL_BINORMAL_ARRAY_POINTER_EXT"/>
>+        <enum value="0x8444" name="GL_MAP1_TANGENT_EXT"/>
>+        <enum value="0x8445" name="GL_MAP2_TANGENT_EXT"/>
>+        <enum value="0x8446" name="GL_MAP1_BINORMAL_EXT"/>
>+        <enum value="0x8447" name="GL_MAP2_BINORMAL_EXT"/>
>+            <unused start="0x8448" end="0x8449" comment="Incomplete extension SGIX_fragment_lighting"/>
>+            <unused start="0x844A" end="0x844C" comment="Incomplete extension SGIX_bali_timer_instruments"/>
>+            
>+            
>+            
>+        <enum value="0x844D" name="GL_NEAREST_CLIPMAP_NEAREST_SGIX"/>
>+        <enum value="0x844E" name="GL_NEAREST_CLIPMAP_LINEAR_SGIX"/>
>+        <enum value="0x844F" name="GL_LINEAR_CLIPMAP_NEAREST_SGIX"/>
>+            
>+        <enum value="0x8450" name="GL_FOG_COORDINATE_SOURCE"/>
>+        <enum value="0x8450" name="GL_FOG_COORDINATE_SOURCE_EXT"/>
>+        <enum value="0x8450" name="GL_FOG_COORD_SRC" alias="GL_FOG_COORDINATE_SOURCE"/>
>+        <enum value="0x8451" name="GL_FOG_COORDINATE"/>
>+        <enum value="0x8451" name="GL_FOG_COORD" alias="GL_FOG_COORDINATE"/>
>+        <enum value="0x8451" name="GL_FOG_COORDINATE_EXT"/>
>+        <enum value="0x8452" name="GL_FRAGMENT_DEPTH"/>
>+        <enum value="0x8452" name="GL_FRAGMENT_DEPTH_EXT"/>
>+        <enum value="0x8453" name="GL_CURRENT_FOG_COORDINATE"/>
>+        <enum value="0x8453" name="GL_CURRENT_FOG_COORD" alias="GL_CURRENT_FOG_COORDINATE"/>
>+        <enum value="0x8453" name="GL_CURRENT_FOG_COORDINATE_EXT"/>
>+        <enum value="0x8454" name="GL_FOG_COORDINATE_ARRAY_TYPE"/>
>+        <enum value="0x8454" name="GL_FOG_COORDINATE_ARRAY_TYPE_EXT"/>
>+        <enum value="0x8454" name="GL_FOG_COORD_ARRAY_TYPE" alias="GL_FOG_COORDINATE_ARRAY_TYPE"/>
>+        <enum value="0x8455" name="GL_FOG_COORDINATE_ARRAY_STRIDE"/>
>+        <enum value="0x8455" name="GL_FOG_COORDINATE_ARRAY_STRIDE_EXT"/>
>+        <enum value="0x8455" name="GL_FOG_COORD_ARRAY_STRIDE" alias="GL_FOG_COORDINATE_ARRAY_STRIDE"/>
>+        <enum value="0x8456" name="GL_FOG_COORDINATE_ARRAY_POINTER"/>
>+        <enum value="0x8456" name="GL_FOG_COORDINATE_ARRAY_POINTER_EXT"/>
>+        <enum value="0x8456" name="GL_FOG_COORD_ARRAY_POINTER" alias="GL_FOG_COORDINATE_ARRAY_POINTER"/>
>+        <enum value="0x8457" name="GL_FOG_COORDINATE_ARRAY"/>
>+        <enum value="0x8457" name="GL_FOG_COORDINATE_ARRAY_EXT"/>
>+        <enum value="0x8457" name="GL_FOG_COORD_ARRAY" alias="GL_FOG_COORDINATE_ARRAY"/>
>+        <enum value="0x8458" name="GL_COLOR_SUM"/>
>+        <enum value="0x8458" name="GL_COLOR_SUM_ARB"/>
>+        <enum value="0x8458" name="GL_COLOR_SUM_EXT"/>
>+        <enum value="0x8459" name="GL_CURRENT_SECONDARY_COLOR"/>
>+        <enum value="0x8459" name="GL_CURRENT_SECONDARY_COLOR_EXT"/>
>+        <enum value="0x845A" name="GL_SECONDARY_COLOR_ARRAY_SIZE"/>
>+        <enum value="0x845A" name="GL_SECONDARY_COLOR_ARRAY_SIZE_EXT"/>
>+        <enum value="0x845B" name="GL_SECONDARY_COLOR_ARRAY_TYPE"/>
>+        <enum value="0x845B" name="GL_SECONDARY_COLOR_ARRAY_TYPE_EXT"/>
>+        <enum value="0x845C" name="GL_SECONDARY_COLOR_ARRAY_STRIDE"/>
>+        <enum value="0x845C" name="GL_SECONDARY_COLOR_ARRAY_STRIDE_EXT"/>
>+        <enum value="0x845D" name="GL_SECONDARY_COLOR_ARRAY_POINTER"/>
>+        <enum value="0x845D" name="GL_SECONDARY_COLOR_ARRAY_POINTER_EXT"/>
>+        <enum value="0x845E" name="GL_SECONDARY_COLOR_ARRAY"/>
>+        <enum value="0x845E" name="GL_SECONDARY_COLOR_ARRAY_EXT"/>
>+        <enum value="0x845F" name="GL_CURRENT_RASTER_SECONDARY_COLOR"/>
>+            <unused start="0x8460" end="0x846B" comment="Incomplete extension SGIX_icc_texture"/>
>+            
>+            
>+            
>+            
>+            
>+            
>+            
>+            
>+            
>+            
>+            
>+            
>+            <unused start="0x846C" vendor="SGI"/>
>+        <enum value="0x846D" name="GL_ALIASED_POINT_SIZE_RANGE"/>
>+        <enum value="0x846E" name="GL_ALIASED_LINE_WIDTH_RANGE"/>
>+            <unused start="0x846F" vendor="SGI"/>
>+    </enums>
>+
>+    <enums namespace="GL" start="0x8470" end="0x848F" vendor="AMD">
>+            <unused start="0x8470" end="0x848F" vendor="AMD"/>
>+    </enums>
>+
>+    <enums namespace="GL" start="0x8490" end="0x849F" vendor="REND">
>+        <enum value="0x8490" name="GL_SCREEN_COORDINATES_REND"/>
>+        <enum value="0x8491" name="GL_INVERTED_SCREEN_W_REND"/>
>+            <unused start="0x8492" end="0x849F" vendor="REND"/>
>+    </enums>
>+
>+    <enums namespace="GL" start="0x84A0" end="0x84BF" vendor="AMD">
>+            <unused start="0x84A0" end="0x84BF" vendor="AMD"/>
>+    </enums>
>+
>+    <enums namespace="GL" start="0x84C0" end="0x84EF" vendor="ARB">
>+        <enum value="0x84C0" name="GL_TEXTURE0"/>
>+        <enum value="0x84C0" name="GL_TEXTURE0_ARB"/>
>+        <enum value="0x84C1" name="GL_TEXTURE1"/>
>+        <enum value="0x84C1" name="GL_TEXTURE1_ARB"/>
>+        <enum value="0x84C2" name="GL_TEXTURE2"/>
>+        <enum value="0x84C2" name="GL_TEXTURE2_ARB"/>
>+        <enum value="0x84C3" name="GL_TEXTURE3"/>
>+        <enum value="0x84C3" name="GL_TEXTURE3_ARB"/>
>+        <enum value="0x84C4" name="GL_TEXTURE4"/>
>+        <enum value="0x84C4" name="GL_TEXTURE4_ARB"/>
>+        <enum value="0x84C5" name="GL_TEXTURE5"/>
>+        <enum value="0x84C5" name="GL_TEXTURE5_ARB"/>
>+        <enum value="0x84C6" name="GL_TEXTURE6"/>
>+        <enum value="0x84C6" name="GL_TEXTURE6_ARB"/>
>+        <enum value="0x84C7" name="GL_TEXTURE7"/>
>+        <enum value="0x84C7" name="GL_TEXTURE7_ARB"/>
>+        <enum value="0x84C8" name="GL_TEXTURE8"/>
>+        <enum value="0x84C8" name="GL_TEXTURE8_ARB"/>
>+        <enum value="0x84C9" name="GL_TEXTURE9"/>
>+        <enum value="0x84C9" name="GL_TEXTURE9_ARB"/>
>+        <enum value="0x84CA" name="GL_TEXTURE10"/>
>+        <enum value="0x84CA" name="GL_TEXTURE10_ARB"/>
>+        <enum value="0x84CB" name="GL_TEXTURE11"/>
>+        <enum value="0x84CB" name="GL_TEXTURE11_ARB"/>
>+        <enum value="0x84CC" name="GL_TEXTURE12"/>
>+        <enum value="0x84CC" name="GL_TEXTURE12_ARB"/>
>+        <enum value="0x84CD" name="GL_TEXTURE13"/>
>+        <enum value="0x84CD" name="GL_TEXTURE13_ARB"/>
>+        <enum value="0x84CE" name="GL_TEXTURE14"/>
>+        <enum value="0x84CE" name="GL_TEXTURE14_ARB"/>
>+        <enum value="0x84CF" name="GL_TEXTURE15"/>
>+        <enum value="0x84CF" name="GL_TEXTURE15_ARB"/>
>+        <enum value="0x84D0" name="GL_TEXTURE16"/>
>+        <enum value="0x84D0" name="GL_TEXTURE16_ARB"/>
>+        <enum value="0x84D1" name="GL_TEXTURE17"/>
>+        <enum value="0x84D1" name="GL_TEXTURE17_ARB"/>
>+        <enum value="0x84D2" name="GL_TEXTURE18"/>
>+        <enum value="0x84D2" name="GL_TEXTURE18_ARB"/>
>+        <enum value="0x84D3" name="GL_TEXTURE19"/>
>+        <enum value="0x84D3" name="GL_TEXTURE19_ARB"/>
>+        <enum value="0x84D4" name="GL_TEXTURE20"/>
>+        <enum value="0x84D4" name="GL_TEXTURE20_ARB"/>
>+        <enum value="0x84D5" name="GL_TEXTURE21"/>
>+        <enum value="0x84D5" name="GL_TEXTURE21_ARB"/>
>+        <enum value="0x84D6" name="GL_TEXTURE22"/>
>+        <enum value="0x84D6" name="GL_TEXTURE22_ARB"/>
>+        <enum value="0x84D7" name="GL_TEXTURE23"/>
>+        <enum value="0x84D7" name="GL_TEXTURE23_ARB"/>
>+        <enum value="0x84D8" name="GL_TEXTURE24"/>
>+        <enum value="0x84D8" name="GL_TEXTURE24_ARB"/>
>+        <enum value="0x84D9" name="GL_TEXTURE25"/>
>+        <enum value="0x84D9" name="GL_TEXTURE25_ARB"/>
>+        <enum value="0x84DA" name="GL_TEXTURE26"/>
>+        <enum value="0x84DA" name="GL_TEXTURE26_ARB"/>
>+        <enum value="0x84DB" name="GL_TEXTURE27"/>
>+        <enum value="0x84DB" name="GL_TEXTURE27_ARB"/>
>+        <enum value="0x84DC" name="GL_TEXTURE28"/>
>+        <enum value="0x84DC" name="GL_TEXTURE28_ARB"/>
>+        <enum value="0x84DD" name="GL_TEXTURE29"/>
>+        <enum value="0x84DD" name="GL_TEXTURE29_ARB"/>
>+        <enum value="0x84DE" name="GL_TEXTURE30"/>
>+        <enum value="0x84DE" name="GL_TEXTURE30_ARB"/>
>+        <enum value="0x84DF" name="GL_TEXTURE31"/>
>+        <enum value="0x84DF" name="GL_TEXTURE31_ARB"/>
>+        <enum value="0x84E0" name="GL_ACTIVE_TEXTURE"/>
>+        <enum value="0x84E0" name="GL_ACTIVE_TEXTURE_ARB"/>
>+        <enum value="0x84E1" name="GL_CLIENT_ACTIVE_TEXTURE"/>
>+        <enum value="0x84E1" name="GL_CLIENT_ACTIVE_TEXTURE_ARB"/>
>+        <enum value="0x84E2" name="GL_MAX_TEXTURE_UNITS"/>
>+        <enum value="0x84E2" name="GL_MAX_TEXTURE_UNITS_ARB"/>
>+        <enum value="0x84E3" name="GL_TRANSPOSE_MODELVIEW_MATRIX"/>
>+        <enum value="0x84E3" name="GL_TRANSPOSE_MODELVIEW_MATRIX_ARB"/>
>+        <enum value="0x84E3" name="GL_PATH_TRANSPOSE_MODELVIEW_MATRIX_NV"/>
>+        <enum value="0x84E4" name="GL_TRANSPOSE_PROJECTION_MATRIX"/>
>+        <enum value="0x84E4" name="GL_TRANSPOSE_PROJECTION_MATRIX_ARB"/>
>+        <enum value="0x84E4" name="GL_PATH_TRANSPOSE_PROJECTION_MATRIX_NV"/>
>+        <enum value="0x84E5" name="GL_TRANSPOSE_TEXTURE_MATRIX"/>
>+        <enum value="0x84E5" name="GL_TRANSPOSE_TEXTURE_MATRIX_ARB"/>
>+        <enum value="0x84E6" name="GL_TRANSPOSE_COLOR_MATRIX"/>
>+        <enum value="0x84E6" name="GL_TRANSPOSE_COLOR_MATRIX_ARB"/>
>+        <enum value="0x84E7" name="GL_SUBTRACT"/>
>+        <enum value="0x84E7" name="GL_SUBTRACT_ARB"/>
>+        <enum value="0x84E8" name="GL_MAX_RENDERBUFFER_SIZE"/>
>+        <enum value="0x84E8" name="GL_MAX_RENDERBUFFER_SIZE_EXT"/>
>+        <enum value="0x84E8" name="GL_MAX_RENDERBUFFER_SIZE_OES"/>
>+        <enum value="0x84E9" name="GL_COMPRESSED_ALPHA"/>
>+        <enum value="0x84E9" name="GL_COMPRESSED_ALPHA_ARB"/>
>+        <enum value="0x84EA" name="GL_COMPRESSED_LUMINANCE"/>
>+        <enum value="0x84EA" name="GL_COMPRESSED_LUMINANCE_ARB"/>
>+        <enum value="0x84EB" name="GL_COMPRESSED_LUMINANCE_ALPHA"/>
>+        <enum value="0x84EB" name="GL_COMPRESSED_LUMINANCE_ALPHA_ARB"/>
>+        <enum value="0x84EC" name="GL_COMPRESSED_INTENSITY"/>
>+        <enum value="0x84EC" name="GL_COMPRESSED_INTENSITY_ARB"/>
>+        <enum value="0x84ED" name="GL_COMPRESSED_RGB"/>
>+        <enum value="0x84ED" name="GL_COMPRESSED_RGB_ARB"/>
>+        <enum value="0x84EE" name="GL_COMPRESSED_RGBA"/>
>+        <enum value="0x84EE" name="GL_COMPRESSED_RGBA_ARB"/>
>+        <enum value="0x84EF" name="GL_TEXTURE_COMPRESSION_HINT"/>
>+        <enum value="0x84EF" name="GL_TEXTURE_COMPRESSION_HINT_ARB"/>
>+    </enums>
>+
>+    <enums namespace="GL" start="0x84F0" end="0x855F" vendor="NV">
>+        <enum value="0x84F0" name="GL_UNIFORM_BLOCK_REFERENCED_BY_TESS_CONTROL_SHADER"/>
>+        <enum value="0x84F1" name="GL_UNIFORM_BLOCK_REFERENCED_BY_TESS_EVALUATION_SHADER"/>
>+        <enum value="0x84F2" name="GL_ALL_COMPLETED_NV"/>
>+        <enum value="0x84F3" name="GL_FENCE_STATUS_NV"/>
>+        <enum value="0x84F4" name="GL_FENCE_CONDITION_NV"/>
>+        <enum value="0x84F5" name="GL_TEXTURE_RECTANGLE"/>
>+        <enum value="0x84F5" name="GL_TEXTURE_RECTANGLE_ARB"/>
>+        <enum value="0x84F5" name="GL_TEXTURE_RECTANGLE_NV"/>
>+        <enum value="0x84F6" name="GL_TEXTURE_BINDING_RECTANGLE"/>
>+        <enum value="0x84F6" name="GL_TEXTURE_BINDING_RECTANGLE_ARB"/>
>+        <enum value="0x84F6" name="GL_TEXTURE_BINDING_RECTANGLE_NV"/>
>+        <enum value="0x84F7" name="GL_PROXY_TEXTURE_RECTANGLE"/>
>+        <enum value="0x84F7" name="GL_PROXY_TEXTURE_RECTANGLE_ARB"/>
>+        <enum value="0x84F7" name="GL_PROXY_TEXTURE_RECTANGLE_NV"/>
>+        <enum value="0x84F8" name="GL_MAX_RECTANGLE_TEXTURE_SIZE"/>
>+        <enum value="0x84F8" name="GL_MAX_RECTANGLE_TEXTURE_SIZE_ARB"/>
>+        <enum value="0x84F8" name="GL_MAX_RECTANGLE_TEXTURE_SIZE_NV"/>
>+        <enum value="0x84F9" name="GL_DEPTH_STENCIL"/>
>+        <enum value="0x84F9" name="GL_DEPTH_STENCIL_EXT"/>
>+        <enum value="0x84F9" name="GL_DEPTH_STENCIL_NV"/>
>+        <enum value="0x84F9" name="GL_DEPTH_STENCIL_OES"/>
>+        <enum value="0x84FA" name="GL_UNSIGNED_INT_24_8"/>
>+        <enum value="0x84FA" name="GL_UNSIGNED_INT_24_8_EXT"/>
>+        <enum value="0x84FA" name="GL_UNSIGNED_INT_24_8_NV"/>
>+        <enum value="0x84FA" name="GL_UNSIGNED_INT_24_8_OES"/>
>+            <unused start="0x84FB" end="0x84FC" vendor="NV"/>
>+        <enum value="0x84FD" name="GL_MAX_TEXTURE_LOD_BIAS"/>
>+        <enum value="0x84FD" name="GL_MAX_TEXTURE_LOD_BIAS_EXT"/>
>+        <enum value="0x84FE" name="GL_TEXTURE_MAX_ANISOTROPY"/>
>+        <enum value="0x84FE" name="GL_TEXTURE_MAX_ANISOTROPY_EXT" alias="GL_TEXTURE_MAX_ANISOTROPY"/>
>+        <enum value="0x84FF" name="GL_MAX_TEXTURE_MAX_ANISOTROPY"/>
>+        <enum value="0x84FF" name="GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT" alias="GL_MAX_TEXTURE_MAX_ANISOTROPY"/>
>+        <enum value="0x8500" name="GL_TEXTURE_FILTER_CONTROL"/>
>+        <enum value="0x8500" name="GL_TEXTURE_FILTER_CONTROL_EXT"/>
>+        <enum value="0x8501" name="GL_TEXTURE_LOD_BIAS"/>
>+        <enum value="0x8501" name="GL_TEXTURE_LOD_BIAS_EXT"/>
>+        <enum value="0x8502" name="GL_MODELVIEW1_STACK_DEPTH_EXT"/>
>+        <enum value="0x8503" name="GL_COMBINE4_NV"/>
>+        <enum value="0x8504" name="GL_MAX_SHININESS_NV"/>
>+        <enum value="0x8505" name="GL_MAX_SPOT_EXPONENT_NV"/>
>+        <enum value="0x8506" name="GL_MODELVIEW1_MATRIX_EXT"/>
>+        <enum value="0x8507" name="GL_INCR_WRAP"/>
>+        <enum value="0x8507" name="GL_INCR_WRAP_EXT"/>
>+        <enum value="0x8507" name="GL_INCR_WRAP_OES"/>
>+        <enum value="0x8508" name="GL_DECR_WRAP"/>
>+        <enum value="0x8508" name="GL_DECR_WRAP_EXT"/>
>+        <enum value="0x8508" name="GL_DECR_WRAP_OES"/>
>+        <enum value="0x8509" name="GL_VERTEX_WEIGHTING_EXT"/>
>+        <enum value="0x850A" name="GL_MODELVIEW1_ARB"/>
>+        <enum value="0x850A" name="GL_MODELVIEW1_EXT"/>
>+        <enum value="0x850B" name="GL_CURRENT_VERTEX_WEIGHT_EXT"/>
>+        <enum value="0x850C" name="GL_VERTEX_WEIGHT_ARRAY_EXT"/>
>+        <enum value="0x850D" name="GL_VERTEX_WEIGHT_ARRAY_SIZE_EXT"/>
>+        <enum value="0x850E" name="GL_VERTEX_WEIGHT_ARRAY_TYPE_EXT"/>
>+        <enum value="0x850F" name="GL_VERTEX_WEIGHT_ARRAY_STRIDE_EXT"/>
>+        <enum value="0x8510" name="GL_VERTEX_WEIGHT_ARRAY_POINTER_EXT"/>
>+        <enum value="0x8511" name="GL_NORMAL_MAP"/>
>+        <enum value="0x8511" name="GL_NORMAL_MAP_ARB"/>
>+        <enum value="0x8511" name="GL_NORMAL_MAP_EXT"/>
>+        <enum value="0x8511" name="GL_NORMAL_MAP_NV"/>
>+        <enum value="0x8511" name="GL_NORMAL_MAP_OES"/>
>+        <enum value="0x8512" name="GL_REFLECTION_MAP"/>
>+        <enum value="0x8512" name="GL_REFLECTION_MAP_ARB"/>
>+        <enum value="0x8512" name="GL_REFLECTION_MAP_EXT"/>
>+        <enum value="0x8512" name="GL_REFLECTION_MAP_NV"/>
>+        <enum value="0x8512" name="GL_REFLECTION_MAP_OES"/>
>+        <enum value="0x8513" name="GL_TEXTURE_CUBE_MAP"/>
>+        <enum value="0x8513" name="GL_TEXTURE_CUBE_MAP_ARB"/>
>+        <enum value="0x8513" name="GL_TEXTURE_CUBE_MAP_EXT"/>
>+        <enum value="0x8513" name="GL_TEXTURE_CUBE_MAP_OES"/>
>+        <enum value="0x8514" name="GL_TEXTURE_BINDING_CUBE_MAP"/>
>+        <enum value="0x8514" name="GL_TEXTURE_BINDING_CUBE_MAP_ARB"/>
>+        <enum value="0x8514" name="GL_TEXTURE_BINDING_CUBE_MAP_EXT"/>
>+        <enum value="0x8514" name="GL_TEXTURE_BINDING_CUBE_MAP_OES"/>
>+        <enum value="0x8515" name="GL_TEXTURE_CUBE_MAP_POSITIVE_X"/>
>+        <enum value="0x8515" name="GL_TEXTURE_CUBE_MAP_POSITIVE_X_ARB"/>
>+        <enum value="0x8515" name="GL_TEXTURE_CUBE_MAP_POSITIVE_X_EXT"/>
>+        <enum value="0x8515" name="GL_TEXTURE_CUBE_MAP_POSITIVE_X_OES"/>
>+        <enum value="0x8516" name="GL_TEXTURE_CUBE_MAP_NEGATIVE_X"/>
>+        <enum value="0x8516" name="GL_TEXTURE_CUBE_MAP_NEGATIVE_X_ARB"/>
>+        <enum value="0x8516" name="GL_TEXTURE_CUBE_MAP_NEGATIVE_X_EXT"/>
>+        <enum value="0x8516" name="GL_TEXTURE_CUBE_MAP_NEGATIVE_X_OES"/>
>+        <enum value="0x8517" name="GL_TEXTURE_CUBE_MAP_POSITIVE_Y"/>
>+        <enum value="0x8517" name="GL_TEXTURE_CUBE_MAP_POSITIVE_Y_ARB"/>
>+        <enum value="0x8517" name="GL_TEXTURE_CUBE_MAP_POSITIVE_Y_EXT"/>
>+        <enum value="0x8517" name="GL_TEXTURE_CUBE_MAP_POSITIVE_Y_OES"/>
>+        <enum value="0x8518" name="GL_TEXTURE_CUBE_MAP_NEGATIVE_Y"/>
>+        <enum value="0x8518" name="GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_ARB"/>
>+        <enum value="0x8518" name="GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_EXT"/>
>+        <enum value="0x8518" name="GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_OES"/>
>+        <enum value="0x8519" name="GL_TEXTURE_CUBE_MAP_POSITIVE_Z"/>
>+        <enum value="0x8519" name="GL_TEXTURE_CUBE_MAP_POSITIVE_Z_ARB"/>
>+        <enum value="0x8519" name="GL_TEXTURE_CUBE_MAP_POSITIVE_Z_EXT"/>
>+        <enum value="0x8519" name="GL_TEXTURE_CUBE_MAP_POSITIVE_Z_OES"/>
>+        <enum value="0x851A" name="GL_TEXTURE_CUBE_MAP_NEGATIVE_Z"/>
>+        <enum value="0x851A" name="GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_ARB"/>
>+        <enum value="0x851A" name="GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_EXT"/>
>+        <enum value="0x851A" name="GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_OES"/>
>+        <enum value="0x851B" name="GL_PROXY_TEXTURE_CUBE_MAP"/>
>+        <enum value="0x851B" name="GL_PROXY_TEXTURE_CUBE_MAP_ARB"/>
>+        <enum value="0x851B" name="GL_PROXY_TEXTURE_CUBE_MAP_EXT"/>
>+        <enum value="0x851C" name="GL_MAX_CUBE_MAP_TEXTURE_SIZE"/>
>+        <enum value="0x851C" name="GL_MAX_CUBE_MAP_TEXTURE_SIZE_ARB"/>
>+        <enum value="0x851C" name="GL_MAX_CUBE_MAP_TEXTURE_SIZE_EXT"/>
>+        <enum value="0x851C" name="GL_MAX_CUBE_MAP_TEXTURE_SIZE_OES"/>
>+        <enum value="0x851D" name="GL_VERTEX_ARRAY_RANGE_APPLE"/>
>+        <enum value="0x851D" name="GL_VERTEX_ARRAY_RANGE_NV"/>
>+        <enum value="0x851E" name="GL_VERTEX_ARRAY_RANGE_LENGTH_APPLE"/>
>+        <enum value="0x851E" name="GL_VERTEX_ARRAY_RANGE_LENGTH_NV"/>
>+        <enum value="0x851F" name="GL_VERTEX_ARRAY_RANGE_VALID_NV"/>
>+        <enum value="0x851F" name="GL_VERTEX_ARRAY_STORAGE_HINT_APPLE"/>
>+        <enum value="0x8520" name="GL_MAX_VERTEX_ARRAY_RANGE_ELEMENT_NV"/>
>+        <enum value="0x8521" name="GL_VERTEX_ARRAY_RANGE_POINTER_APPLE"/>
>+        <enum value="0x8521" name="GL_VERTEX_ARRAY_RANGE_POINTER_NV"/>
>+        <enum value="0x8522" name="GL_REGISTER_COMBINERS_NV"/>
>+        <enum value="0x8523" name="GL_VARIABLE_A_NV"/>
>+        <enum value="0x8524" name="GL_VARIABLE_B_NV"/>
>+        <enum value="0x8525" name="GL_VARIABLE_C_NV"/>
>+        <enum value="0x8526" name="GL_VARIABLE_D_NV"/>
>+        <enum value="0x8527" name="GL_VARIABLE_E_NV"/>
>+        <enum value="0x8528" name="GL_VARIABLE_F_NV"/>
>+        <enum value="0x8529" name="GL_VARIABLE_G_NV"/>
>+        <enum value="0x852A" name="GL_CONSTANT_COLOR0_NV"/>
>+        <enum value="0x852B" name="GL_CONSTANT_COLOR1_NV"/>
>+        <enum value="0x852C" name="GL_PRIMARY_COLOR_NV"/>
>+        <enum value="0x852D" name="GL_SECONDARY_COLOR_NV"/>
>+        <enum value="0x852E" name="GL_SPARE0_NV"/>
>+        <enum value="0x852F" name="GL_SPARE1_NV"/>
>+        <enum value="0x8530" name="GL_DISCARD_NV"/>
>+        <enum value="0x8531" name="GL_E_TIMES_F_NV"/>
>+        <enum value="0x8532" name="GL_SPARE0_PLUS_SECONDARY_COLOR_NV"/>
>+        <enum value="0x8533" name="GL_VERTEX_ARRAY_RANGE_WITHOUT_FLUSH_NV"/>
>+        <enum value="0x8534" name="GL_MULTISAMPLE_FILTER_HINT_NV"/>
>+        <enum value="0x8535" name="GL_PER_STAGE_CONSTANTS_NV"/>
>+        <enum value="0x8536" name="GL_UNSIGNED_IDENTITY_NV"/>
>+        <enum value="0x8537" name="GL_UNSIGNED_INVERT_NV"/>
>+        <enum value="0x8538" name="GL_EXPAND_NORMAL_NV"/>
>+        <enum value="0x8539" name="GL_EXPAND_NEGATE_NV"/>
>+        <enum value="0x853A" name="GL_HALF_BIAS_NORMAL_NV"/>
>+        <enum value="0x853B" name="GL_HALF_BIAS_NEGATE_NV"/>
>+        <enum value="0x853C" name="GL_SIGNED_IDENTITY_NV"/>
>+        <enum value="0x853D" name="GL_SIGNED_NEGATE_NV"/>
>+        <enum value="0x853E" name="GL_SCALE_BY_TWO_NV"/>
>+        <enum value="0x853F" name="GL_SCALE_BY_FOUR_NV"/>
>+        <enum value="0x8540" name="GL_SCALE_BY_ONE_HALF_NV"/>
>+        <enum value="0x8541" name="GL_BIAS_BY_NEGATIVE_ONE_HALF_NV"/>
>+        <enum value="0x8542" name="GL_COMBINER_INPUT_NV"/>
>+        <enum value="0x8543" name="GL_COMBINER_MAPPING_NV"/>
>+        <enum value="0x8544" name="GL_COMBINER_COMPONENT_USAGE_NV"/>
>+        <enum value="0x8545" name="GL_COMBINER_AB_DOT_PRODUCT_NV"/>
>+        <enum value="0x8546" name="GL_COMBINER_CD_DOT_PRODUCT_NV"/>
>+        <enum value="0x8547" name="GL_COMBINER_MUX_SUM_NV"/>
>+        <enum value="0x8548" name="GL_COMBINER_SCALE_NV"/>
>+        <enum value="0x8549" name="GL_COMBINER_BIAS_NV"/>
>+        <enum value="0x854A" name="GL_COMBINER_AB_OUTPUT_NV"/>
>+        <enum value="0x854B" name="GL_COMBINER_CD_OUTPUT_NV"/>
>+        <enum value="0x854C" name="GL_COMBINER_SUM_OUTPUT_NV"/>
>+        <enum value="0x854D" name="GL_MAX_GENERAL_COMBINERS_NV"/>
>+        <enum value="0x854E" name="GL_NUM_GENERAL_COMBINERS_NV"/>
>+        <enum value="0x854F" name="GL_COLOR_SUM_CLAMP_NV"/>
>+        <enum value="0x8550" name="GL_COMBINER0_NV"/>
>+        <enum value="0x8551" name="GL_COMBINER1_NV"/>
>+        <enum value="0x8552" name="GL_COMBINER2_NV"/>
>+        <enum value="0x8553" name="GL_COMBINER3_NV"/>
>+        <enum value="0x8554" name="GL_COMBINER4_NV"/>
>+        <enum value="0x8555" name="GL_COMBINER5_NV"/>
>+        <enum value="0x8556" name="GL_COMBINER6_NV"/>
>+        <enum value="0x8557" name="GL_COMBINER7_NV"/>
>+        <enum value="0x8558" name="GL_PRIMITIVE_RESTART_NV"/>
>+        <enum value="0x8559" name="GL_PRIMITIVE_RESTART_INDEX_NV"/>
>+        <enum value="0x855A" name="GL_FOG_DISTANCE_MODE_NV"/>
>+        <enum value="0x855B" name="GL_EYE_RADIAL_NV"/>
>+        <enum value="0x855C" name="GL_EYE_PLANE_ABSOLUTE_NV"/>
>+        <enum value="0x855D" name="GL_EMBOSS_LIGHT_NV"/>
>+        <enum value="0x855E" name="GL_EMBOSS_CONSTANT_NV"/>
>+        <enum value="0x855F" name="GL_EMBOSS_MAP_NV"/>
>+    </enums>
>+
>+    <enums namespace="GL" start="0x8560" end="0x856F" vendor="ZiiLabs">
>+        <enum value="0x8560" name="GL_RED_MIN_CLAMP_INGR"/>
>+        <enum value="0x8561" name="GL_GREEN_MIN_CLAMP_INGR"/>
>+        <enum value="0x8562" name="GL_BLUE_MIN_CLAMP_INGR"/>
>+        <enum value="0x8563" name="GL_ALPHA_MIN_CLAMP_INGR"/>
>+        <enum value="0x8564" name="GL_RED_MAX_CLAMP_INGR"/>
>+        <enum value="0x8565" name="GL_GREEN_MAX_CLAMP_INGR"/>
>+        <enum value="0x8566" name="GL_BLUE_MAX_CLAMP_INGR"/>
>+        <enum value="0x8567" name="GL_ALPHA_MAX_CLAMP_INGR"/>
>+        <enum value="0x8568" name="GL_INTERLACE_READ_INGR"/>
>+            <unused start="0x8569" end="0x856F" vendor="ZiiLabs"/>
>+    </enums>
>+
>+    <enums namespace="GL" start="0x8570" end="0x859F" group="RegisterCombinerPname" vendor="AMD/NV">
>+        <enum value="0x8570" name="GL_COMBINE"/>
>+        <enum value="0x8570" name="GL_COMBINE_ARB"/>
>+        <enum value="0x8570" name="GL_COMBINE_EXT"/>
>+        <enum value="0x8571" name="GL_COMBINE_RGB"/>
>+        <enum value="0x8571" name="GL_COMBINE_RGB_ARB"/>
>+        <enum value="0x8571" name="GL_COMBINE_RGB_EXT"/>
>+        <enum value="0x8572" name="GL_COMBINE_ALPHA"/>
>+        <enum value="0x8572" name="GL_COMBINE_ALPHA_ARB"/>
>+        <enum value="0x8572" name="GL_COMBINE_ALPHA_EXT"/>
>+        <enum value="0x8573" name="GL_RGB_SCALE"/>
>+        <enum value="0x8573" name="GL_RGB_SCALE_ARB"/>
>+        <enum value="0x8573" name="GL_RGB_SCALE_EXT"/>
>+        <enum value="0x8574" name="GL_ADD_SIGNED"/>
>+        <enum value="0x8574" name="GL_ADD_SIGNED_ARB"/>
>+        <enum value="0x8574" name="GL_ADD_SIGNED_EXT"/>
>+        <enum value="0x8575" name="GL_INTERPOLATE"/>
>+        <enum value="0x8575" name="GL_INTERPOLATE_ARB"/>
>+        <enum value="0x8575" name="GL_INTERPOLATE_EXT"/>
>+        <enum value="0x8576" name="GL_CONSTANT"/>
>+        <enum value="0x8576" name="GL_CONSTANT_ARB"/>
>+        <enum value="0x8576" name="GL_CONSTANT_EXT"/>
>+        <enum value="0x8576" name="GL_CONSTANT_NV"/>
>+        <enum value="0x8577" name="GL_PRIMARY_COLOR"/>
>+        <enum value="0x8577" name="GL_PRIMARY_COLOR_ARB"/>
>+        <enum value="0x8577" name="GL_PRIMARY_COLOR_EXT"/>
>+        <enum value="0x8578" name="GL_PREVIOUS"/>
>+        <enum value="0x8578" name="GL_PREVIOUS_ARB"/>
>+        <enum value="0x8578" name="GL_PREVIOUS_EXT"/>
>+            <unused start="0x8579" end="0x857F" comment="Additional combiner enums only"/>
>+        <enum value="0x8580" name="GL_SOURCE0_RGB"/>
>+        <enum value="0x8580" name="GL_SOURCE0_RGB_ARB"/>
>+        <enum value="0x8580" name="GL_SOURCE0_RGB_EXT"/>
>+        <enum value="0x8580" name="GL_SRC0_RGB" alias="GL_SOURCE0_RGB"/>
>+        <enum value="0x8581" name="GL_SOURCE1_RGB"/>
>+        <enum value="0x8581" name="GL_SOURCE1_RGB_ARB"/>
>+        <enum value="0x8581" name="GL_SOURCE1_RGB_EXT"/>
>+        <enum value="0x8581" name="GL_SRC1_RGB" alias="GL_SOURCE1_RGB"/>
>+        <enum value="0x8582" name="GL_SOURCE2_RGB"/>
>+        <enum value="0x8582" name="GL_SOURCE2_RGB_ARB"/>
>+        <enum value="0x8582" name="GL_SOURCE2_RGB_EXT"/>
>+        <enum value="0x8582" name="GL_SRC2_RGB" alias="GL_SOURCE2_RGB"/>
>+        <enum value="0x8583" name="GL_SOURCE3_RGB_NV"/>
>+            <unused start="0x8584" end="0x8587" comment="Additional combiner enums only"/>
>+        <enum value="0x8588" name="GL_SOURCE0_ALPHA"/>
>+        <enum value="0x8588" name="GL_SOURCE0_ALPHA_ARB"/>
>+        <enum value="0x8588" name="GL_SOURCE0_ALPHA_EXT"/>
>+        <enum value="0x8588" name="GL_SRC0_ALPHA" alias="GL_SOURCE0_ALPHA"/>
>+        <enum value="0x8589" name="GL_SOURCE1_ALPHA"/>
>+        <enum value="0x8589" name="GL_SOURCE1_ALPHA_ARB"/>
>+        <enum value="0x8589" name="GL_SOURCE1_ALPHA_EXT"/>
>+        <enum value="0x8589" name="GL_SRC1_ALPHA" alias="GL_SOURCE1_ALPHA"/>
>+        <enum value="0x8589" name="GL_SRC1_ALPHA_EXT"/>
>+        <enum value="0x858A" name="GL_SOURCE2_ALPHA"/>
>+        <enum value="0x858A" name="GL_SOURCE2_ALPHA_ARB"/>
>+        <enum value="0x858A" name="GL_SOURCE2_ALPHA_EXT"/>
>+        <enum value="0x858A" name="GL_SRC2_ALPHA" alias="GL_SOURCE2_ALPHA"/>
>+        <enum value="0x858B" name="GL_SOURCE3_ALPHA_NV"/>
>+            <unused start="0x858C" end="0x858F" comment="Additional combiner enums only"/>
>+        <enum value="0x8590" name="GL_OPERAND0_RGB"/>
>+        <enum value="0x8590" name="GL_OPERAND0_RGB_ARB"/>
>+        <enum value="0x8590" name="GL_OPERAND0_RGB_EXT"/>
>+        <enum value="0x8591" name="GL_OPERAND1_RGB"/>
>+        <enum value="0x8591" name="GL_OPERAND1_RGB_ARB"/>
>+        <enum value="0x8591" name="GL_OPERAND1_RGB_EXT"/>
>+        <enum value="0x8592" name="GL_OPERAND2_RGB"/>
>+        <enum value="0x8592" name="GL_OPERAND2_RGB_ARB"/>
>+        <enum value="0x8592" name="GL_OPERAND2_RGB_EXT"/>
>+        <enum value="0x8593" name="GL_OPERAND3_RGB_NV"/>
>+            <unused start="0x8594" end="0x8597" comment="Additional combiner enums only"/>
>+        <enum value="0x8598" name="GL_OPERAND0_ALPHA"/>
>+        <enum value="0x8598" name="GL_OPERAND0_ALPHA_ARB"/>
>+        <enum value="0x8598" name="GL_OPERAND0_ALPHA_EXT"/>
>+        <enum value="0x8599" name="GL_OPERAND1_ALPHA"/>
>+        <enum value="0x8599" name="GL_OPERAND1_ALPHA_ARB"/>
>+        <enum value="0x8599" name="GL_OPERAND1_ALPHA_EXT"/>
>+        <enum value="0x859A" name="GL_OPERAND2_ALPHA"/>
>+        <enum value="0x859A" name="GL_OPERAND2_ALPHA_ARB"/>
>+        <enum value="0x859A" name="GL_OPERAND2_ALPHA_EXT"/>
>+        <enum value="0x859B" name="GL_OPERAND3_ALPHA_NV"/>
>+            <unused start="0x859C" end="0x859F" comment="Additional combiner enums only"/>
>+    </enums>
>+
>+    <enums namespace="GL" start="0x85A0" end="0x85AF" vendor="SGI">
>+        <enum value="0x85A0" name="GL_PACK_SUBSAMPLE_RATE_SGIX"/>
>+        <enum value="0x85A1" name="GL_UNPACK_SUBSAMPLE_RATE_SGIX"/>
>+        <enum value="0x85A2" name="GL_PIXEL_SUBSAMPLE_4444_SGIX"/>
>+        <enum value="0x85A3" name="GL_PIXEL_SUBSAMPLE_2424_SGIX"/>
>+        <enum value="0x85A4" name="GL_PIXEL_SUBSAMPLE_4242_SGIX"/>
>+            <unused start="0x85A5" end="0x85AD" comment="Incomplete extension SGIS_color_range"/>
>+            
>+            
>+            
>+            
>+            
>+            
>+            
>+            
>+            
>+        <enum value="0x85AE" name="GL_PERTURB_EXT"/>
>+        <enum value="0x85AF" name="GL_TEXTURE_NORMAL_EXT"/>
>+    </enums>
>+
>+    <enums namespace="GL" start="0x85B0" end="0x85BF" vendor="APPLE">
>+        <enum value="0x85B0" name="GL_LIGHT_MODEL_SPECULAR_VECTOR_APPLE"/>
>+        <enum value="0x85B1" name="GL_TRANSFORM_HINT_APPLE"/>
>+        <enum value="0x85B2" name="GL_UNPACK_CLIENT_STORAGE_APPLE"/>
>+        <enum value="0x85B3" name="GL_BUFFER_OBJECT_APPLE"/>
>+        <enum value="0x85B4" name="GL_STORAGE_CLIENT_APPLE"/>
>+        <enum value="0x85B5" name="GL_VERTEX_ARRAY_BINDING"/>
>+        <enum value="0x85B5" name="GL_VERTEX_ARRAY_BINDING_APPLE"/>
>+        <enum value="0x85B5" name="GL_VERTEX_ARRAY_BINDING_OES"/>
>+            <unused start="0x85B6" vendor="APPLE" comment="Unknown extension (Khronos bug 632)"/>
>+            
>+        <enum value="0x85B7" name="GL_TEXTURE_RANGE_LENGTH_APPLE"/>
>+        <enum value="0x85B8" name="GL_TEXTURE_RANGE_POINTER_APPLE"/>
>+        <enum value="0x85B9" name="GL_YCBCR_422_APPLE"/>
>+        <enum value="0x85BA" name="GL_UNSIGNED_SHORT_8_8_APPLE"/>
>+        <enum value="0x85BA" name="GL_UNSIGNED_SHORT_8_8_MESA"/>
>+        <enum value="0x85BB" name="GL_UNSIGNED_SHORT_8_8_REV_APPLE"/>
>+        <enum value="0x85BB" name="GL_UNSIGNED_SHORT_8_8_REV_MESA"/>
>+        <enum value="0x85BC" name="GL_TEXTURE_STORAGE_HINT_APPLE"/>
>+        <enum value="0x85BD" name="GL_STORAGE_PRIVATE_APPLE"/>
>+        <enum value="0x85BE" name="GL_STORAGE_CACHED_APPLE"/>
>+        <enum value="0x85BF" name="GL_STORAGE_SHARED_APPLE"/>
>+    </enums>
>+
>+    <enums namespace="GL" start="0x85C0" end="0x85CF" vendor="SUN">
>+        <enum value="0x85C0" name="GL_REPLACEMENT_CODE_ARRAY_SUN"/>
>+        <enum value="0x85C1" name="GL_REPLACEMENT_CODE_ARRAY_TYPE_SUN"/>
>+        <enum value="0x85C2" name="GL_REPLACEMENT_CODE_ARRAY_STRIDE_SUN"/>
>+        <enum value="0x85C3" name="GL_REPLACEMENT_CODE_ARRAY_POINTER_SUN"/>
>+        <enum value="0x85C4" name="GL_R1UI_V3F_SUN"/>
>+        <enum value="0x85C5" name="GL_R1UI_C4UB_V3F_SUN"/>
>+        <enum value="0x85C6" name="GL_R1UI_C3F_V3F_SUN"/>
>+        <enum value="0x85C7" name="GL_R1UI_N3F_V3F_SUN"/>
>+        <enum value="0x85C8" name="GL_R1UI_C4F_N3F_V3F_SUN"/>
>+        <enum value="0x85C9" name="GL_R1UI_T2F_V3F_SUN"/>
>+        <enum value="0x85CA" name="GL_R1UI_T2F_N3F_V3F_SUN"/>
>+        <enum value="0x85CB" name="GL_R1UI_T2F_C4F_N3F_V3F_SUN"/>
>+        <enum value="0x85CC" name="GL_SLICE_ACCUM_SUN"/>
>+            <unused start="0x85CD" end="0x85CF" vendor="SUN"/>
>+    </enums>
>+
>+    <enums namespace="GL" start="0x85D0" end="0x85DF" vendor="ZiiLabs" comment="3Dlabs private extension for Autodesk">
>+            <unused start="0x85D0" end="0x85D1" comment="Unknown 3Dlabs private extension for Autodesk (but we know the enum values)"/>
>+            
>+            
>+            <unused start="0x85D2" end="0x85DF" vendor="ZiiLabs"/>
>+    </enums>
>+
>+    <enums namespace="GL" start="0x85E0" end="0x85FF" vendor="SGI">
>+            <unused start="0x85E0" end="0x85FB" comment="Incomplete extension SGIX_texture_range"/>
>+            
>+            
>+            
>+            
>+            
>+            
>+            
>+            
>+            
>+            
>+            
>+            
>+            
>+            
>+            
>+            
>+            
>+            
>+            
>+            
>+            
>+            
>+            
>+            
>+            
>+            
>+            
>+            
>+            <unused start="0x85FC" end="0x85FF" vendor="SGI"/>
>+    </enums>
>+
>+    <enums namespace="GL" start="0x8600" end="0x861F" vendor="SUN">
>+            <unused start="0x8600" end="0x8613" vendor="SUN"/>
>+        <enum value="0x8614" name="GL_QUAD_MESH_SUN"/>
>+        <enum value="0x8615" name="GL_TRIANGLE_MESH_SUN"/>
>+            <unused start="0x8614" end="0x861F" vendor="SUN"/>
>+    </enums>
>+
>+    <enums namespace="GL" start="0x8620" end="0x867F" vendor="NV">
>+        <enum value="0x8620" name="GL_VERTEX_PROGRAM_ARB"/>
>+        <enum value="0x8620" name="GL_VERTEX_PROGRAM_NV"/>
>+        <enum value="0x8621" name="GL_VERTEX_STATE_PROGRAM_NV"/>
>+        <enum value="0x8622" name="GL_VERTEX_ATTRIB_ARRAY_ENABLED"/>
>+        <enum value="0x8622" name="GL_VERTEX_ATTRIB_ARRAY_ENABLED_ARB"/>
>+        <enum value="0x8623" name="GL_ATTRIB_ARRAY_SIZE_NV"/>
>+        <enum value="0x8623" name="GL_VERTEX_ATTRIB_ARRAY_SIZE"/>
>+        <enum value="0x8623" name="GL_VERTEX_ATTRIB_ARRAY_SIZE_ARB"/>
>+        <enum value="0x8624" name="GL_ATTRIB_ARRAY_STRIDE_NV"/>
>+        <enum value="0x8624" name="GL_VERTEX_ATTRIB_ARRAY_STRIDE"/>
>+        <enum value="0x8624" name="GL_VERTEX_ATTRIB_ARRAY_STRIDE_ARB"/>
>+        <enum value="0x8625" name="GL_ATTRIB_ARRAY_TYPE_NV"/>
>+        <enum value="0x8625" name="GL_VERTEX_ATTRIB_ARRAY_TYPE"/>
>+        <enum value="0x8625" name="GL_VERTEX_ATTRIB_ARRAY_TYPE_ARB"/>
>+        <enum value="0x8626" name="GL_CURRENT_ATTRIB_NV"/>
>+        <enum value="0x8626" name="GL_CURRENT_VERTEX_ATTRIB"/>
>+        <enum value="0x8626" name="GL_CURRENT_VERTEX_ATTRIB_ARB"/>
>+        <enum value="0x8627" name="GL_PROGRAM_LENGTH_ARB"/>
>+        <enum value="0x8627" name="GL_PROGRAM_LENGTH_NV"/>
>+        <enum value="0x8628" name="GL_PROGRAM_STRING_ARB"/>
>+        <enum value="0x8628" name="GL_PROGRAM_STRING_NV"/>
>+        <enum value="0x8629" name="GL_MODELVIEW_PROJECTION_NV"/>
>+        <enum value="0x862A" name="GL_IDENTITY_NV"/>
>+        <enum value="0x862B" name="GL_INVERSE_NV"/>
>+        <enum value="0x862C" name="GL_TRANSPOSE_NV"/>
>+        <enum value="0x862D" name="GL_INVERSE_TRANSPOSE_NV"/>
>+        <enum value="0x862E" name="GL_MAX_PROGRAM_MATRIX_STACK_DEPTH_ARB"/>
>+        <enum value="0x862E" name="GL_MAX_TRACK_MATRIX_STACK_DEPTH_NV"/>
>+        <enum value="0x862F" name="GL_MAX_PROGRAM_MATRICES_ARB"/>
>+        <enum value="0x862F" name="GL_MAX_TRACK_MATRICES_NV"/>
>+        <enum value="0x8630" name="GL_MATRIX0_NV"/>
>+        <enum value="0x8631" name="GL_MATRIX1_NV"/>
>+        <enum value="0x8632" name="GL_MATRIX2_NV"/>
>+        <enum value="0x8633" name="GL_MATRIX3_NV"/>
>+        <enum value="0x8634" name="GL_MATRIX4_NV"/>
>+        <enum value="0x8635" name="GL_MATRIX5_NV"/>
>+        <enum value="0x8636" name="GL_MATRIX6_NV"/>
>+        <enum value="0x8637" name="GL_MATRIX7_NV"/>
>+            <unused start="0x8638" end="0x863F" comment="Reserved for MATRIX{8-15}_NV"/>
>+            
>+            
>+            
>+            
>+            
>+            
>+            
>+            
>+        <enum value="0x8640" name="GL_CURRENT_MATRIX_STACK_DEPTH_ARB"/>
>+        <enum value="0x8640" name="GL_CURRENT_MATRIX_STACK_DEPTH_NV"/>
>+        <enum value="0x8641" name="GL_CURRENT_MATRIX_ARB"/>
>+        <enum value="0x8641" name="GL_CURRENT_MATRIX_NV"/>
>+        <enum value="0x8642" name="GL_VERTEX_PROGRAM_POINT_SIZE"/>
>+        <enum value="0x8642" name="GL_VERTEX_PROGRAM_POINT_SIZE_ARB"/>
>+        <enum value="0x8642" name="GL_VERTEX_PROGRAM_POINT_SIZE_NV"/>
>+        <enum value="0x8642" name="GL_PROGRAM_POINT_SIZE" alias="GL_VERTEX_PROGRAM_POINT_SIZE"/>
>+        <enum value="0x8642" name="GL_PROGRAM_POINT_SIZE_ARB"/>
>+        <enum value="0x8642" name="GL_PROGRAM_POINT_SIZE_EXT"/>
>+        <enum value="0x8643" name="GL_VERTEX_PROGRAM_TWO_SIDE"/>
>+        <enum value="0x8643" name="GL_VERTEX_PROGRAM_TWO_SIDE_ARB"/>
>+        <enum value="0x8643" name="GL_VERTEX_PROGRAM_TWO_SIDE_NV"/>
>+        <enum value="0x8644" name="GL_PROGRAM_PARAMETER_NV"/>
>+        <enum value="0x8645" name="GL_ATTRIB_ARRAY_POINTER_NV"/>
>+        <enum value="0x8645" name="GL_VERTEX_ATTRIB_ARRAY_POINTER"/>
>+        <enum value="0x8645" name="GL_VERTEX_ATTRIB_ARRAY_POINTER_ARB"/>
>+        <enum value="0x8646" name="GL_PROGRAM_TARGET_NV"/>
>+        <enum value="0x8647" name="GL_PROGRAM_RESIDENT_NV"/>
>+        <enum value="0x8648" name="GL_TRACK_MATRIX_NV"/>
>+        <enum value="0x8649" name="GL_TRACK_MATRIX_TRANSFORM_NV"/>
>+        <enum value="0x864A" name="GL_VERTEX_PROGRAM_BINDING_NV"/>
>+        <enum value="0x864B" name="GL_PROGRAM_ERROR_POSITION_ARB"/>
>+        <enum value="0x864B" name="GL_PROGRAM_ERROR_POSITION_NV"/>
>+        <enum value="0x864C" name="GL_OFFSET_TEXTURE_RECTANGLE_NV"/>
>+        <enum value="0x864D" name="GL_OFFSET_TEXTURE_RECTANGLE_SCALE_NV"/>
>+        <enum value="0x864E" name="GL_DOT_PRODUCT_TEXTURE_RECTANGLE_NV"/>
>+        <enum value="0x864F" name="GL_DEPTH_CLAMP"/>
>+        <enum value="0x864F" name="GL_DEPTH_CLAMP_NV"/>
>+        <enum value="0x8650" name="GL_VERTEX_ATTRIB_ARRAY0_NV"/>
>+        <enum value="0x8651" name="GL_VERTEX_ATTRIB_ARRAY1_NV"/>
>+        <enum value="0x8652" name="GL_VERTEX_ATTRIB_ARRAY2_NV"/>
>+        <enum value="0x8653" name="GL_VERTEX_ATTRIB_ARRAY3_NV"/>
>+        <enum value="0x8654" name="GL_VERTEX_ATTRIB_ARRAY4_NV"/>
>+        <enum value="0x8655" name="GL_VERTEX_ATTRIB_ARRAY5_NV"/>
>+        <enum value="0x8656" name="GL_VERTEX_ATTRIB_ARRAY6_NV"/>
>+        <enum value="0x8657" name="GL_VERTEX_ATTRIB_ARRAY7_NV"/>
>+        <enum value="0x8658" name="GL_VERTEX_ATTRIB_ARRAY8_NV"/>
>+        <enum value="0x8659" name="GL_VERTEX_ATTRIB_ARRAY9_NV"/>
>+        <enum value="0x865A" name="GL_VERTEX_ATTRIB_ARRAY10_NV"/>
>+        <enum value="0x865B" name="GL_VERTEX_ATTRIB_ARRAY11_NV"/>
>+        <enum value="0x865C" name="GL_VERTEX_ATTRIB_ARRAY12_NV"/>
>+        <enum value="0x865D" name="GL_VERTEX_ATTRIB_ARRAY13_NV"/>
>+        <enum value="0x865E" name="GL_VERTEX_ATTRIB_ARRAY14_NV"/>
>+        <enum value="0x865F" name="GL_VERTEX_ATTRIB_ARRAY15_NV"/>
>+        <enum value="0x8660" name="GL_MAP1_VERTEX_ATTRIB0_4_NV"/>
>+        <enum value="0x8661" name="GL_MAP1_VERTEX_ATTRIB1_4_NV"/>
>+        <enum value="0x8662" name="GL_MAP1_VERTEX_ATTRIB2_4_NV"/>
>+        <enum value="0x8663" name="GL_MAP1_VERTEX_ATTRIB3_4_NV"/>
>+        <enum value="0x8664" name="GL_MAP1_VERTEX_ATTRIB4_4_NV"/>
>+        <enum value="0x8665" name="GL_MAP1_VERTEX_ATTRIB5_4_NV"/>
>+        <enum value="0x8666" name="GL_MAP1_VERTEX_ATTRIB6_4_NV"/>
>+        <enum value="0x8667" name="GL_MAP1_VERTEX_ATTRIB7_4_NV"/>
>+        <enum value="0x8668" name="GL_MAP1_VERTEX_ATTRIB8_4_NV"/>
>+        <enum value="0x8669" name="GL_MAP1_VERTEX_ATTRIB9_4_NV"/>
>+        <enum value="0x866A" name="GL_MAP1_VERTEX_ATTRIB10_4_NV"/>
>+        <enum value="0x866B" name="GL_MAP1_VERTEX_ATTRIB11_4_NV"/>
>+        <enum value="0x866C" name="GL_MAP1_VERTEX_ATTRIB12_4_NV"/>
>+        <enum value="0x866D" name="GL_MAP1_VERTEX_ATTRIB13_4_NV"/>
>+        <enum value="0x866E" name="GL_MAP1_VERTEX_ATTRIB14_4_NV"/>
>+        <enum value="0x866F" name="GL_MAP1_VERTEX_ATTRIB15_4_NV"/>
>+        <enum value="0x8670" name="GL_MAP2_VERTEX_ATTRIB0_4_NV"/>
>+        <enum value="0x8671" name="GL_MAP2_VERTEX_ATTRIB1_4_NV"/>
>+        <enum value="0x8672" name="GL_MAP2_VERTEX_ATTRIB2_4_NV"/>
>+        <enum value="0x8673" name="GL_MAP2_VERTEX_ATTRIB3_4_NV"/>
>+        <enum value="0x8674" name="GL_MAP2_VERTEX_ATTRIB4_4_NV"/>
>+        <enum value="0x8675" name="GL_MAP2_VERTEX_ATTRIB5_4_NV"/>
>+        <enum value="0x8676" name="GL_MAP2_VERTEX_ATTRIB6_4_NV"/>
>+        <enum value="0x8677" name="GL_MAP2_VERTEX_ATTRIB7_4_NV"/>
>+        <enum value="0x8677" name="GL_PROGRAM_BINDING_ARB" comment="NOT an alias. Accidental reuse of GL_MAP2_VERTEX_ATTRIB7_4_NV"/>
>+        <enum value="0x8678" name="GL_MAP2_VERTEX_ATTRIB8_4_NV"/>
>+        <enum value="0x8679" name="GL_MAP2_VERTEX_ATTRIB9_4_NV"/>
>+        <enum value="0x867A" name="GL_MAP2_VERTEX_ATTRIB10_4_NV"/>
>+        <enum value="0x867B" name="GL_MAP2_VERTEX_ATTRIB11_4_NV"/>
>+        <enum value="0x867C" name="GL_MAP2_VERTEX_ATTRIB12_4_NV"/>
>+        <enum value="0x867D" name="GL_MAP2_VERTEX_ATTRIB13_4_NV"/>
>+        <enum value="0x867E" name="GL_MAP2_VERTEX_ATTRIB14_4_NV"/>
>+        <enum value="0x867F" name="GL_MAP2_VERTEX_ATTRIB15_4_NV"/>
>+    </enums>
>+
>+    <enums namespace="GL" start="0x8680" end="0x869F" vendor="Pixelfusion">
>+            <unused start="0x8680" end="0x869F" vendor="Pixelfusion"/>
>+    </enums>
>+
>+    <enums namespace="GL" start="0x86A0" end="0x86AF" vendor="ARB">
>+        <enum value="0x86A0" name="GL_TEXTURE_COMPRESSED_IMAGE_SIZE"/>
>+        <enum value="0x86A0" name="GL_TEXTURE_COMPRESSED_IMAGE_SIZE_ARB"/>
>+        <enum value="0x86A1" name="GL_TEXTURE_COMPRESSED"/>
>+        <enum value="0x86A1" name="GL_TEXTURE_COMPRESSED_ARB"/>
>+        <enum value="0x86A2" name="GL_NUM_COMPRESSED_TEXTURE_FORMATS"/>
>+        <enum value="0x86A2" name="GL_NUM_COMPRESSED_TEXTURE_FORMATS_ARB"/>
>+        <enum value="0x86A3" name="GL_COMPRESSED_TEXTURE_FORMATS"/>
>+        <enum value="0x86A3" name="GL_COMPRESSED_TEXTURE_FORMATS_ARB"/>
>+        <enum value="0x86A4" name="GL_MAX_VERTEX_UNITS_ARB"/>
>+        <enum value="0x86A4" name="GL_MAX_VERTEX_UNITS_OES"/>
>+        <enum value="0x86A5" name="GL_ACTIVE_VERTEX_UNITS_ARB"/>
>+        <enum value="0x86A6" name="GL_WEIGHT_SUM_UNITY_ARB"/>
>+        <enum value="0x86A7" name="GL_VERTEX_BLEND_ARB"/>
>+        <enum value="0x86A8" name="GL_CURRENT_WEIGHT_ARB"/>
>+        <enum value="0x86A9" name="GL_WEIGHT_ARRAY_TYPE_ARB"/>
>+        <enum value="0x86A9" name="GL_WEIGHT_ARRAY_TYPE_OES"/>
>+        <enum value="0x86AA" name="GL_WEIGHT_ARRAY_STRIDE_ARB"/>
>+        <enum value="0x86AA" name="GL_WEIGHT_ARRAY_STRIDE_OES"/>
>+        <enum value="0x86AB" name="GL_WEIGHT_ARRAY_SIZE_ARB"/>
>+        <enum value="0x86AB" name="GL_WEIGHT_ARRAY_SIZE_OES"/>
>+        <enum value="0x86AC" name="GL_WEIGHT_ARRAY_POINTER_ARB"/>
>+        <enum value="0x86AC" name="GL_WEIGHT_ARRAY_POINTER_OES"/>
>+        <enum value="0x86AD" name="GL_WEIGHT_ARRAY_ARB"/>
>+        <enum value="0x86AD" name="GL_WEIGHT_ARRAY_OES"/>
>+        <enum value="0x86AE" name="GL_DOT3_RGB"/>
>+        <enum value="0x86AE" name="GL_DOT3_RGB_ARB"/>
>+        <enum value="0x86AF" name="GL_DOT3_RGBA"/>
>+        <enum value="0x86AF" name="GL_DOT3_RGBA_ARB"/>
>+        <enum value="0x86AF" name="GL_DOT3_RGBA_IMG"/>
>+    </enums>
>+
>+    <enums namespace="GL" start="0x86B0" end="0x86BF" vendor="3DFX">
>+        <enum value="0x86B0" name="GL_COMPRESSED_RGB_FXT1_3DFX"/>
>+        <enum value="0x86B1" name="GL_COMPRESSED_RGBA_FXT1_3DFX"/>
>+        <enum value="0x86B2" name="GL_MULTISAMPLE_3DFX"/>
>+        <enum value="0x86B3" name="GL_SAMPLE_BUFFERS_3DFX"/>
>+        <enum value="0x86B4" name="GL_SAMPLES_3DFX"/>
>+            <unused start="0x86B5" end="0x86BF" vendor="3DFX"/>
>+    </enums>
>+
>+    <enums namespace="GL" start="0x86C0" end="0x871F" vendor="NV">
>+        <enum value="0x86C0" name="GL_EVAL_2D_NV"/>
>+        <enum value="0x86C1" name="GL_EVAL_TRIANGULAR_2D_NV"/>
>+        <enum value="0x86C2" name="GL_MAP_TESSELLATION_NV"/>
>+        <enum value="0x86C3" name="GL_MAP_ATTRIB_U_ORDER_NV"/>
>+        <enum value="0x86C4" name="GL_MAP_ATTRIB_V_ORDER_NV"/>
>+        <enum value="0x86C5" name="GL_EVAL_FRACTIONAL_TESSELLATION_NV"/>
>+        <enum value="0x86C6" name="GL_EVAL_VERTEX_ATTRIB0_NV"/>
>+        <enum value="0x86C7" name="GL_EVAL_VERTEX_ATTRIB1_NV"/>
>+        <enum value="0x86C8" name="GL_EVAL_VERTEX_ATTRIB2_NV"/>
>+        <enum value="0x86C9" name="GL_EVAL_VERTEX_ATTRIB3_NV"/>
>+        <enum value="0x86CA" name="GL_EVAL_VERTEX_ATTRIB4_NV"/>
>+        <enum value="0x86CB" name="GL_EVAL_VERTEX_ATTRIB5_NV"/>
>+        <enum value="0x86CC" name="GL_EVAL_VERTEX_ATTRIB6_NV"/>
>+        <enum value="0x86CD" name="GL_EVAL_VERTEX_ATTRIB7_NV"/>
>+        <enum value="0x86CE" name="GL_EVAL_VERTEX_ATTRIB8_NV"/>
>+        <enum value="0x86CF" name="GL_EVAL_VERTEX_ATTRIB9_NV"/>
>+        <enum value="0x86D0" name="GL_EVAL_VERTEX_ATTRIB10_NV"/>
>+        <enum value="0x86D1" name="GL_EVAL_VERTEX_ATTRIB11_NV"/>
>+        <enum value="0x86D2" name="GL_EVAL_VERTEX_ATTRIB12_NV"/>
>+        <enum value="0x86D3" name="GL_EVAL_VERTEX_ATTRIB13_NV"/>
>+        <enum value="0x86D4" name="GL_EVAL_VERTEX_ATTRIB14_NV"/>
>+        <enum value="0x86D5" name="GL_EVAL_VERTEX_ATTRIB15_NV"/>
>+        <enum value="0x86D6" name="GL_MAX_MAP_TESSELLATION_NV"/>
>+        <enum value="0x86D7" name="GL_MAX_RATIONAL_EVAL_ORDER_NV"/>
>+        <enum value="0x86D8" name="GL_MAX_PROGRAM_PATCH_ATTRIBS_NV"/>
>+        <enum value="0x86D9" name="GL_RGBA_UNSIGNED_DOT_PRODUCT_MAPPING_NV"/>
>+        <enum value="0x86DA" name="GL_UNSIGNED_INT_S8_S8_8_8_NV"/>
>+        <enum value="0x86DB" name="GL_UNSIGNED_INT_8_8_S8_S8_REV_NV"/>
>+        <enum value="0x86DC" name="GL_DSDT_MAG_INTENSITY_NV"/>
>+        <enum value="0x86DD" name="GL_SHADER_CONSISTENT_NV"/>
>+        <enum value="0x86DE" name="GL_TEXTURE_SHADER_NV"/>
>+        <enum value="0x86DF" name="GL_SHADER_OPERATION_NV"/>
>+        <enum value="0x86E0" name="GL_CULL_MODES_NV"/>
>+        <enum value="0x86E1" name="GL_OFFSET_TEXTURE_MATRIX_NV"/>
>+        <enum value="0x86E1" name="GL_OFFSET_TEXTURE_2D_MATRIX_NV" alias="GL_OFFSET_TEXTURE_MATRIX_NV"/>
>+        <enum value="0x86E2" name="GL_OFFSET_TEXTURE_SCALE_NV"/>
>+        <enum value="0x86E2" name="GL_OFFSET_TEXTURE_2D_SCALE_NV" alias="GL_OFFSET_TEXTURE_SCALE_NV"/>
>+        <enum value="0x86E3" name="GL_OFFSET_TEXTURE_BIAS_NV"/>
>+        <enum value="0x86E3" name="GL_OFFSET_TEXTURE_2D_BIAS_NV" alias="GL_OFFSET_TEXTURE_BIAS_NV"/>
>+        <enum value="0x86E4" name="GL_PREVIOUS_TEXTURE_INPUT_NV"/>
>+        <enum value="0x86E5" name="GL_CONST_EYE_NV"/>
>+        <enum value="0x86E6" name="GL_PASS_THROUGH_NV"/>
>+        <enum value="0x86E7" name="GL_CULL_FRAGMENT_NV"/>
>+        <enum value="0x86E8" name="GL_OFFSET_TEXTURE_2D_NV"/>
>+        <enum value="0x86E9" name="GL_DEPENDENT_AR_TEXTURE_2D_NV"/>
>+        <enum value="0x86EA" name="GL_DEPENDENT_GB_TEXTURE_2D_NV"/>
>+        <enum value="0x86EB" name="GL_SURFACE_STATE_NV"/>
>+        <enum value="0x86EC" name="GL_DOT_PRODUCT_NV"/>
>+        <enum value="0x86ED" name="GL_DOT_PRODUCT_DEPTH_REPLACE_NV"/>
>+        <enum value="0x86EE" name="GL_DOT_PRODUCT_TEXTURE_2D_NV"/>
>+        <enum value="0x86EF" name="GL_DOT_PRODUCT_TEXTURE_3D_NV"/>
>+        <enum value="0x86F0" name="GL_DOT_PRODUCT_TEXTURE_CUBE_MAP_NV"/>
>+        <enum value="0x86F1" name="GL_DOT_PRODUCT_DIFFUSE_CUBE_MAP_NV"/>
>+        <enum value="0x86F2" name="GL_DOT_PRODUCT_REFLECT_CUBE_MAP_NV"/>
>+        <enum value="0x86F3" name="GL_DOT_PRODUCT_CONST_EYE_REFLECT_CUBE_MAP_NV"/>
>+        <enum value="0x86F4" name="GL_HILO_NV"/>
>+        <enum value="0x86F5" name="GL_DSDT_NV"/>
>+        <enum value="0x86F6" name="GL_DSDT_MAG_NV"/>
>+        <enum value="0x86F7" name="GL_DSDT_MAG_VIB_NV"/>
>+        <enum value="0x86F8" name="GL_HILO16_NV"/>
>+        <enum value="0x86F9" name="GL_SIGNED_HILO_NV"/>
>+        <enum value="0x86FA" name="GL_SIGNED_HILO16_NV"/>
>+        <enum value="0x86FB" name="GL_SIGNED_RGBA_NV"/>
>+        <enum value="0x86FC" name="GL_SIGNED_RGBA8_NV"/>
>+        <enum value="0x86FD" name="GL_SURFACE_REGISTERED_NV"/>
>+        <enum value="0x86FE" name="GL_SIGNED_RGB_NV"/>
>+        <enum value="0x86FF" name="GL_SIGNED_RGB8_NV"/>
>+        <enum value="0x8700" name="GL_SURFACE_MAPPED_NV"/>
>+        <enum value="0x8701" name="GL_SIGNED_LUMINANCE_NV"/>
>+        <enum value="0x8702" name="GL_SIGNED_LUMINANCE8_NV"/>
>+        <enum value="0x8703" name="GL_SIGNED_LUMINANCE_ALPHA_NV"/>
>+        <enum value="0x8704" name="GL_SIGNED_LUMINANCE8_ALPHA8_NV"/>
>+        <enum value="0x8705" name="GL_SIGNED_ALPHA_NV"/>
>+        <enum value="0x8706" name="GL_SIGNED_ALPHA8_NV"/>
>+        <enum value="0x8707" name="GL_SIGNED_INTENSITY_NV"/>
>+        <enum value="0x8708" name="GL_SIGNED_INTENSITY8_NV"/>
>+        <enum value="0x8709" name="GL_DSDT8_NV"/>
>+        <enum value="0x870A" name="GL_DSDT8_MAG8_NV"/>
>+        <enum value="0x870B" name="GL_DSDT8_MAG8_INTENSITY8_NV"/>
>+        <enum value="0x870C" name="GL_SIGNED_RGB_UNSIGNED_ALPHA_NV"/>
>+        <enum value="0x870D" name="GL_SIGNED_RGB8_UNSIGNED_ALPHA8_NV"/>
>+        <enum value="0x870E" name="GL_HI_SCALE_NV"/>
>+        <enum value="0x870F" name="GL_LO_SCALE_NV"/>
>+        <enum value="0x8710" name="GL_DS_SCALE_NV"/>
>+        <enum value="0x8711" name="GL_DT_SCALE_NV"/>
>+        <enum value="0x8712" name="GL_MAGNITUDE_SCALE_NV"/>
>+        <enum value="0x8713" name="GL_VIBRANCE_SCALE_NV"/>
>+        <enum value="0x8714" name="GL_HI_BIAS_NV"/>
>+        <enum value="0x8715" name="GL_LO_BIAS_NV"/>
>+        <enum value="0x8716" name="GL_DS_BIAS_NV"/>
>+        <enum value="0x8717" name="GL_DT_BIAS_NV"/>
>+        <enum value="0x8718" name="GL_MAGNITUDE_BIAS_NV"/>
>+        <enum value="0x8719" name="GL_VIBRANCE_BIAS_NV"/>
>+        <enum value="0x871A" name="GL_TEXTURE_BORDER_VALUES_NV"/>
>+        <enum value="0x871B" name="GL_TEXTURE_HI_SIZE_NV"/>
>+        <enum value="0x871C" name="GL_TEXTURE_LO_SIZE_NV"/>
>+        <enum value="0x871D" name="GL_TEXTURE_DS_SIZE_NV"/>
>+        <enum value="0x871E" name="GL_TEXTURE_DT_SIZE_NV"/>
>+        <enum value="0x871F" name="GL_TEXTURE_MAG_SIZE_NV"/>
>+    </enums>
>+
>+    <enums namespace="GL" start="0x8720" end="0x873F" vendor="ARB">
>+            <unused start="0x8720" end="0x8721" comment="MODELVIEW0/1 already exist"/>
>+        <enum value="0x8722" name="GL_MODELVIEW2_ARB"/>
>+        <enum value="0x8723" name="GL_MODELVIEW3_ARB"/>
>+        <enum value="0x8724" name="GL_MODELVIEW4_ARB"/>
>+        <enum value="0x8725" name="GL_MODELVIEW5_ARB"/>
>+        <enum value="0x8726" name="GL_MODELVIEW6_ARB"/>
>+        <enum value="0x8727" name="GL_MODELVIEW7_ARB"/>
>+        <enum value="0x8728" name="GL_MODELVIEW8_ARB"/>
>+        <enum value="0x8729" name="GL_MODELVIEW9_ARB"/>
>+        <enum value="0x872A" name="GL_MODELVIEW10_ARB"/>
>+        <enum value="0x872B" name="GL_MODELVIEW11_ARB"/>
>+        <enum value="0x872C" name="GL_MODELVIEW12_ARB"/>
>+        <enum value="0x872D" name="GL_MODELVIEW13_ARB"/>
>+        <enum value="0x872E" name="GL_MODELVIEW14_ARB"/>
>+        <enum value="0x872F" name="GL_MODELVIEW15_ARB"/>
>+        <enum value="0x8730" name="GL_MODELVIEW16_ARB"/>
>+        <enum value="0x8731" name="GL_MODELVIEW17_ARB"/>
>+        <enum value="0x8732" name="GL_MODELVIEW18_ARB"/>
>+        <enum value="0x8733" name="GL_MODELVIEW19_ARB"/>
>+        <enum value="0x8734" name="GL_MODELVIEW20_ARB"/>
>+        <enum value="0x8735" name="GL_MODELVIEW21_ARB"/>
>+        <enum value="0x8736" name="GL_MODELVIEW22_ARB"/>
>+        <enum value="0x8737" name="GL_MODELVIEW23_ARB"/>
>+        <enum value="0x8738" name="GL_MODELVIEW24_ARB"/>
>+        <enum value="0x8739" name="GL_MODELVIEW25_ARB"/>
>+        <enum value="0x873A" name="GL_MODELVIEW26_ARB"/>
>+        <enum value="0x873B" name="GL_MODELVIEW27_ARB"/>
>+        <enum value="0x873C" name="GL_MODELVIEW28_ARB"/>
>+        <enum value="0x873D" name="GL_MODELVIEW29_ARB"/>
>+        <enum value="0x873E" name="GL_MODELVIEW30_ARB"/>
>+        <enum value="0x873F" name="GL_MODELVIEW31_ARB"/>
>+    </enums>
>+
>+    <enums namespace="GL" start="0x8740" end="0x874F" vendor="AMD">
>+        <enum value="0x8740" name="GL_DOT3_RGB_EXT"/>
>+        <enum value="0x8740" name="GL_Z400_BINARY_AMD" comment="NOT an alias. Accidental reuse of GL_DOT3_RGB_EXT"/>
>+        <enum value="0x8741" name="GL_DOT3_RGBA_EXT"/>
>+        <enum value="0x8741" name="GL_PROGRAM_BINARY_LENGTH_OES" comment="NOT an alias. Accidental reuse of GL_DOT3_RGBA_EXT"/>
>+        <enum value="0x8741" name="GL_PROGRAM_BINARY_LENGTH"/>
>+        <enum value="0x8742" name="GL_MIRROR_CLAMP_ATI"/>
>+        <enum value="0x8742" name="GL_MIRROR_CLAMP_EXT"/>
>+        <enum value="0x8743" name="GL_MIRROR_CLAMP_TO_EDGE"/>
>+        <enum value="0x8743" name="GL_MIRROR_CLAMP_TO_EDGE_ATI"/>
>+        <enum value="0x8743" name="GL_MIRROR_CLAMP_TO_EDGE_EXT"/>
>+        <enum value="0x8744" name="GL_MODULATE_ADD_ATI"/>
>+        <enum value="0x8745" name="GL_MODULATE_SIGNED_ADD_ATI"/>
>+        <enum value="0x8746" name="GL_MODULATE_SUBTRACT_ATI"/>
>+            <unused start="0x8747" end="0x8749" vendor="AMD"/>
>+        <enum value="0x874A" name="GL_SET_AMD"/>
>+        <enum value="0x874B" name="GL_REPLACE_VALUE_AMD"/>
>+        <enum value="0x874C" name="GL_STENCIL_OP_VALUE_AMD"/>
>+        <enum value="0x874D" name="GL_STENCIL_BACK_OP_VALUE_AMD"/>
>+        <enum value="0x874E" name="GL_VERTEX_ATTRIB_ARRAY_LONG"/>
>+        <enum value="0x874F" name="GL_OCCLUSION_QUERY_EVENT_MASK_AMD"/>
>+    </enums>
>+
>+    <enums namespace="GL" start="0x8750" end="0x875F" vendor="MESA">
>+        <enum value="0x8750" name="GL_DEPTH_STENCIL_MESA"/>
>+        <enum value="0x8751" name="GL_UNSIGNED_INT_24_8_MESA"/>
>+        <enum value="0x8752" name="GL_UNSIGNED_INT_8_24_REV_MESA"/>
>+        <enum value="0x8753" name="GL_UNSIGNED_SHORT_15_1_MESA"/>
>+        <enum value="0x8754" name="GL_UNSIGNED_SHORT_1_15_REV_MESA"/>
>+        <enum value="0x8755" name="GL_TRACE_MASK_MESA"/>
>+        <enum value="0x8756" name="GL_TRACE_NAME_MESA"/>
>+        <enum value="0x8757" name="GL_YCBCR_MESA"/>
>+        <enum value="0x8758" name="GL_PACK_INVERT_MESA"/>
>+        <enum value="0x8759" name="GL_DEBUG_OBJECT_MESA" comment="NOT an alias. Accidental reuse of GL_TEXTURE_1D_STACK_MESAX"/>
>+        <enum value="0x8759" name="GL_TEXTURE_1D_STACK_MESAX"/>
>+        <enum value="0x875A" name="GL_DEBUG_PRINT_MESA" comment="NOT an alias. Accidental reuse of GL_TEXTURE_2D_STACK_MESAX"/>
>+        <enum value="0x875A" name="GL_TEXTURE_2D_STACK_MESAX"/>
>+        <enum value="0x875B" name="GL_DEBUG_ASSERT_MESA" comment="NOT an alias. Accidental reuse of GL_PROXY_TEXTURE_1D_STACK_MESAX"/>
>+        <enum value="0x875B" name="GL_PROXY_TEXTURE_1D_STACK_MESAX"/>
>+        <enum value="0x875C" name="GL_PROXY_TEXTURE_2D_STACK_MESAX"/>
>+        <enum value="0x875D" name="GL_TEXTURE_1D_STACK_BINDING_MESAX"/>
>+        <enum value="0x875E" name="GL_TEXTURE_2D_STACK_BINDING_MESAX"/>
>+        <enum value="0x875F" name="GL_PROGRAM_BINARY_FORMAT_MESA"/>
>+    </enums>
>+
>+    <enums namespace="GL" start="0x8760" end="0x883F" vendor="AMD">
>+        <enum value="0x8760" name="GL_STATIC_ATI"/>
>+        <enum value="0x8761" name="GL_DYNAMIC_ATI"/>
>+        <enum value="0x8762" name="GL_PRESERVE_ATI"/>
>+        <enum value="0x8763" name="GL_DISCARD_ATI"/>
>+        <enum value="0x8764" name="GL_BUFFER_SIZE"/>
>+        <enum value="0x8764" name="GL_BUFFER_SIZE_ARB"/>
>+        <enum value="0x8764" name="GL_OBJECT_BUFFER_SIZE_ATI"/>
>+        <enum value="0x8765" name="GL_BUFFER_USAGE"/>
>+        <enum value="0x8765" name="GL_BUFFER_USAGE_ARB"/>
>+        <enum value="0x8765" name="GL_OBJECT_BUFFER_USAGE_ATI"/>
>+        <enum value="0x8766" name="GL_ARRAY_OBJECT_BUFFER_ATI"/>
>+        <enum value="0x8767" name="GL_ARRAY_OBJECT_OFFSET_ATI"/>
>+        <enum value="0x8768" name="GL_ELEMENT_ARRAY_ATI"/>
>+        <enum value="0x8769" name="GL_ELEMENT_ARRAY_TYPE_ATI"/>
>+        <enum value="0x876A" name="GL_ELEMENT_ARRAY_POINTER_ATI"/>
>+        <enum value="0x876B" name="GL_MAX_VERTEX_STREAMS_ATI"/>
>+        <enum value="0x876C" name="GL_VERTEX_STREAM0_ATI"/>
>+        <enum value="0x876D" name="GL_VERTEX_STREAM1_ATI"/>
>+        <enum value="0x876E" name="GL_VERTEX_STREAM2_ATI"/>
>+        <enum value="0x876F" name="GL_VERTEX_STREAM3_ATI"/>
>+        <enum value="0x8770" name="GL_VERTEX_STREAM4_ATI"/>
>+        <enum value="0x8771" name="GL_VERTEX_STREAM5_ATI"/>
>+        <enum value="0x8772" name="GL_VERTEX_STREAM6_ATI"/>
>+        <enum value="0x8773" name="GL_VERTEX_STREAM7_ATI"/>
>+        <enum value="0x8774" name="GL_VERTEX_SOURCE_ATI"/>
>+        <enum value="0x8775" name="GL_BUMP_ROT_MATRIX_ATI"/>
>+        <enum value="0x8776" name="GL_BUMP_ROT_MATRIX_SIZE_ATI"/>
>+        <enum value="0x8777" name="GL_BUMP_NUM_TEX_UNITS_ATI"/>
>+        <enum value="0x8778" name="GL_BUMP_TEX_UNITS_ATI"/>
>+        <enum value="0x8779" name="GL_DUDV_ATI"/>
>+        <enum value="0x877A" name="GL_DU8DV8_ATI"/>
>+        <enum value="0x877B" name="GL_BUMP_ENVMAP_ATI"/>
>+        <enum value="0x877C" name="GL_BUMP_TARGET_ATI"/>
>+            <unused start="0x877D" end="0x877F" vendor="AMD"/>
>+        <enum value="0x8780" name="GL_VERTEX_SHADER_EXT"/>
>+        <enum value="0x8781" name="GL_VERTEX_SHADER_BINDING_EXT"/>
>+        <enum value="0x8782" name="GL_OP_INDEX_EXT"/>
>+        <enum value="0x8783" name="GL_OP_NEGATE_EXT"/>
>+        <enum value="0x8784" name="GL_OP_DOT3_EXT"/>
>+        <enum value="0x8785" name="GL_OP_DOT4_EXT"/>
>+        <enum value="0x8786" name="GL_OP_MUL_EXT"/>
>+        <enum value="0x8787" name="GL_OP_ADD_EXT"/>
>+        <enum value="0x8788" name="GL_OP_MADD_EXT"/>
>+        <enum value="0x8789" name="GL_OP_FRAC_EXT"/>
>+        <enum value="0x878A" name="GL_OP_MAX_EXT"/>
>+        <enum value="0x878B" name="GL_OP_MIN_EXT"/>
>+        <enum value="0x878C" name="GL_OP_SET_GE_EXT"/>
>+        <enum value="0x878D" name="GL_OP_SET_LT_EXT"/>
>+        <enum value="0x878E" name="GL_OP_CLAMP_EXT"/>
>+        <enum value="0x878F" name="GL_OP_FLOOR_EXT"/>
>+        <enum value="0x8790" name="GL_OP_ROUND_EXT"/>
>+        <enum value="0x8791" name="GL_OP_EXP_BASE_2_EXT"/>
>+        <enum value="0x8792" name="GL_OP_LOG_BASE_2_EXT"/>
>+        <enum value="0x8793" name="GL_OP_POWER_EXT"/>
>+        <enum value="0x8794" name="GL_OP_RECIP_EXT"/>
>+        <enum value="0x8795" name="GL_OP_RECIP_SQRT_EXT"/>
>+        <enum value="0x8796" name="GL_OP_SUB_EXT"/>
>+        <enum value="0x8797" name="GL_OP_CROSS_PRODUCT_EXT"/>
>+        <enum value="0x8798" name="GL_OP_MULTIPLY_MATRIX_EXT"/>
>+        <enum value="0x8799" name="GL_OP_MOV_EXT"/>
>+        <enum value="0x879A" name="GL_OUTPUT_VERTEX_EXT"/>
>+        <enum value="0x879B" name="GL_OUTPUT_COLOR0_EXT"/>
>+        <enum value="0x879C" name="GL_OUTPUT_COLOR1_EXT"/>
>+        <enum value="0x879D" name="GL_OUTPUT_TEXTURE_COORD0_EXT"/>
>+        <enum value="0x879E" name="GL_OUTPUT_TEXTURE_COORD1_EXT"/>
>+        <enum value="0x879F" name="GL_OUTPUT_TEXTURE_COORD2_EXT"/>
>+        <enum value="0x87A0" name="GL_OUTPUT_TEXTURE_COORD3_EXT"/>
>+        <enum value="0x87A1" name="GL_OUTPUT_TEXTURE_COORD4_EXT"/>
>+        <enum value="0x87A2" name="GL_OUTPUT_TEXTURE_COORD5_EXT"/>
>+        <enum value="0x87A3" name="GL_OUTPUT_TEXTURE_COORD6_EXT"/>
>+        <enum value="0x87A4" name="GL_OUTPUT_TEXTURE_COORD7_EXT"/>
>+        <enum value="0x87A5" name="GL_OUTPUT_TEXTURE_COORD8_EXT"/>
>+        <enum value="0x87A6" name="GL_OUTPUT_TEXTURE_COORD9_EXT"/>
>+        <enum value="0x87A7" name="GL_OUTPUT_TEXTURE_COORD10_EXT"/>
>+        <enum value="0x87A8" name="GL_OUTPUT_TEXTURE_COORD11_EXT"/>
>+        <enum value="0x87A9" name="GL_OUTPUT_TEXTURE_COORD12_EXT"/>
>+        <enum value="0x87AA" name="GL_OUTPUT_TEXTURE_COORD13_EXT"/>
>+        <enum value="0x87AB" name="GL_OUTPUT_TEXTURE_COORD14_EXT"/>
>+        <enum value="0x87AC" name="GL_OUTPUT_TEXTURE_COORD15_EXT"/>
>+        <enum value="0x87AD" name="GL_OUTPUT_TEXTURE_COORD16_EXT"/>
>+        <enum value="0x87AE" name="GL_OUTPUT_TEXTURE_COORD17_EXT"/>
>+        <enum value="0x87AF" name="GL_OUTPUT_TEXTURE_COORD18_EXT"/>
>+        <enum value="0x87B0" name="GL_OUTPUT_TEXTURE_COORD19_EXT"/>
>+        <enum value="0x87B1" name="GL_OUTPUT_TEXTURE_COORD20_EXT"/>
>+        <enum value="0x87B2" name="GL_OUTPUT_TEXTURE_COORD21_EXT"/>
>+        <enum value="0x87B3" name="GL_OUTPUT_TEXTURE_COORD22_EXT"/>
>+        <enum value="0x87B4" name="GL_OUTPUT_TEXTURE_COORD23_EXT"/>
>+        <enum value="0x87B5" name="GL_OUTPUT_TEXTURE_COORD24_EXT"/>
>+        <enum value="0x87B6" name="GL_OUTPUT_TEXTURE_COORD25_EXT"/>
>+        <enum value="0x87B7" name="GL_OUTPUT_TEXTURE_COORD26_EXT"/>
>+        <enum value="0x87B8" name="GL_OUTPUT_TEXTURE_COORD27_EXT"/>
>+        <enum value="0x87B9" name="GL_OUTPUT_TEXTURE_COORD28_EXT"/>
>+        <enum value="0x87BA" name="GL_OUTPUT_TEXTURE_COORD29_EXT"/>
>+        <enum value="0x87BB" name="GL_OUTPUT_TEXTURE_COORD30_EXT"/>
>+        <enum value="0x87BC" name="GL_OUTPUT_TEXTURE_COORD31_EXT"/>
>+        <enum value="0x87BD" name="GL_OUTPUT_FOG_EXT"/>
>+        <enum value="0x87BE" name="GL_SCALAR_EXT"/>
>+        <enum value="0x87BF" name="GL_VECTOR_EXT"/>
>+        <enum value="0x87C0" name="GL_MATRIX_EXT"/>
>+        <enum value="0x87C1" name="GL_VARIANT_EXT"/>
>+        <enum value="0x87C2" name="GL_INVARIANT_EXT"/>
>+        <enum value="0x87C3" name="GL_LOCAL_CONSTANT_EXT"/>
>+        <enum value="0x87C4" name="GL_LOCAL_EXT"/>
>+        <enum value="0x87C5" name="GL_MAX_VERTEX_SHADER_INSTRUCTIONS_EXT"/>
>+        <enum value="0x87C6" name="GL_MAX_VERTEX_SHADER_VARIANTS_EXT"/>
>+        <enum value="0x87C7" name="GL_MAX_VERTEX_SHADER_INVARIANTS_EXT"/>
>+        <enum value="0x87C8" name="GL_MAX_VERTEX_SHADER_LOCAL_CONSTANTS_EXT"/>
>+        <enum value="0x87C9" name="GL_MAX_VERTEX_SHADER_LOCALS_EXT"/>
>+        <enum value="0x87CA" name="GL_MAX_OPTIMIZED_VERTEX_SHADER_INSTRUCTIONS_EXT"/>
>+        <enum value="0x87CB" name="GL_MAX_OPTIMIZED_VERTEX_SHADER_VARIANTS_EXT"/>
>+        <enum value="0x87CC" name="GL_MAX_OPTIMIZED_VERTEX_SHADER_LOCAL_CONSTANTS_EXT"/>
>+        <enum value="0x87CD" name="GL_MAX_OPTIMIZED_VERTEX_SHADER_INVARIANTS_EXT"/>
>+        <enum value="0x87CE" name="GL_MAX_OPTIMIZED_VERTEX_SHADER_LOCALS_EXT"/>
>+        <enum value="0x87CF" name="GL_VERTEX_SHADER_INSTRUCTIONS_EXT"/>
>+        <enum value="0x87D0" name="GL_VERTEX_SHADER_VARIANTS_EXT"/>
>+        <enum value="0x87D1" name="GL_VERTEX_SHADER_INVARIANTS_EXT"/>
>+        <enum value="0x87D2" name="GL_VERTEX_SHADER_LOCAL_CONSTANTS_EXT"/>
>+        <enum value="0x87D3" name="GL_VERTEX_SHADER_LOCALS_EXT"/>
>+        <enum value="0x87D4" name="GL_VERTEX_SHADER_OPTIMIZED_EXT"/>
>+        <enum value="0x87D5" name="GL_X_EXT"/>
>+        <enum value="0x87D6" name="GL_Y_EXT"/>
>+        <enum value="0x87D7" name="GL_Z_EXT"/>
>+        <enum value="0x87D8" name="GL_W_EXT"/>
>+        <enum value="0x87D9" name="GL_NEGATIVE_X_EXT"/>
>+        <enum value="0x87DA" name="GL_NEGATIVE_Y_EXT"/>
>+        <enum value="0x87DB" name="GL_NEGATIVE_Z_EXT"/>
>+        <enum value="0x87DC" name="GL_NEGATIVE_W_EXT"/>
>+        <enum value="0x87DD" name="GL_ZERO_EXT"/>
>+        <enum value="0x87DE" name="GL_ONE_EXT"/>
>+        <enum value="0x87DF" name="GL_NEGATIVE_ONE_EXT"/>
>+        <enum value="0x87E0" name="GL_NORMALIZED_RANGE_EXT"/>
>+        <enum value="0x87E1" name="GL_FULL_RANGE_EXT"/>
>+        <enum value="0x87E2" name="GL_CURRENT_VERTEX_EXT"/>
>+        <enum value="0x87E3" name="GL_MVP_MATRIX_EXT"/>
>+        <enum value="0x87E4" name="GL_VARIANT_VALUE_EXT"/>
>+        <enum value="0x87E5" name="GL_VARIANT_DATATYPE_EXT"/>
>+        <enum value="0x87E6" name="GL_VARIANT_ARRAY_STRIDE_EXT"/>
>+        <enum value="0x87E7" name="GL_VARIANT_ARRAY_TYPE_EXT"/>
>+        <enum value="0x87E8" name="GL_VARIANT_ARRAY_EXT"/>
>+        <enum value="0x87E9" name="GL_VARIANT_ARRAY_POINTER_EXT"/>
>+        <enum value="0x87EA" name="GL_INVARIANT_VALUE_EXT"/>
>+        <enum value="0x87EB" name="GL_INVARIANT_DATATYPE_EXT"/>
>+        <enum value="0x87EC" name="GL_LOCAL_CONSTANT_VALUE_EXT"/>
>+        <enum value="0x87ED" name="GL_LOCAL_CONSTANT_DATATYPE_EXT"/>
>+        <enum value="0x87EE" name="GL_ATC_RGBA_INTERPOLATED_ALPHA_AMD"/>
>+        <enum value="0x87F0" name="GL_PN_TRIANGLES_ATI"/>
>+        <enum value="0x87F1" name="GL_MAX_PN_TRIANGLES_TESSELATION_LEVEL_ATI"/>
>+        <enum value="0x87F2" name="GL_PN_TRIANGLES_POINT_MODE_ATI"/>
>+        <enum value="0x87F3" name="GL_PN_TRIANGLES_NORMAL_MODE_ATI"/>
>+        <enum value="0x87F4" name="GL_PN_TRIANGLES_TESSELATION_LEVEL_ATI"/>
>+        <enum value="0x87F5" name="GL_PN_TRIANGLES_POINT_MODE_LINEAR_ATI"/>
>+        <enum value="0x87F6" name="GL_PN_TRIANGLES_POINT_MODE_CUBIC_ATI"/>
>+        <enum value="0x87F7" name="GL_PN_TRIANGLES_NORMAL_MODE_LINEAR_ATI"/>
>+        <enum value="0x87F8" name="GL_PN_TRIANGLES_NORMAL_MODE_QUADRATIC_ATI"/>
>+        <enum value="0x87F9" name="GL_3DC_X_AMD"/>
>+        <enum value="0x87FA" name="GL_3DC_XY_AMD"/>
>+        <enum value="0x87FB" name="GL_VBO_FREE_MEMORY_ATI"/>
>+        <enum value="0x87FC" name="GL_TEXTURE_FREE_MEMORY_ATI"/>
>+        <enum value="0x87FD" name="GL_RENDERBUFFER_FREE_MEMORY_ATI"/>
>+        <enum value="0x87FE" name="GL_NUM_PROGRAM_BINARY_FORMATS"/>
>+        <enum value="0x87FE" name="GL_NUM_PROGRAM_BINARY_FORMATS_OES"/>
>+        <enum value="0x87FF" name="GL_PROGRAM_BINARY_FORMATS"/>
>+        <enum value="0x87FF" name="GL_PROGRAM_BINARY_FORMATS_OES"/>
>+        <enum value="0x8800" name="GL_STENCIL_BACK_FUNC"/>
>+        <enum value="0x8800" name="GL_STENCIL_BACK_FUNC_ATI"/>
>+        <enum value="0x8801" name="GL_STENCIL_BACK_FAIL"/>
>+        <enum value="0x8801" name="GL_STENCIL_BACK_FAIL_ATI"/>
>+        <enum value="0x8802" name="GL_STENCIL_BACK_PASS_DEPTH_FAIL"/>
>+        <enum value="0x8802" name="GL_STENCIL_BACK_PASS_DEPTH_FAIL_ATI"/>
>+        <enum value="0x8803" name="GL_STENCIL_BACK_PASS_DEPTH_PASS"/>
>+        <enum value="0x8803" name="GL_STENCIL_BACK_PASS_DEPTH_PASS_ATI"/>
>+        <enum value="0x8804" name="GL_FRAGMENT_PROGRAM_ARB"/>
>+        <enum value="0x8805" name="GL_PROGRAM_ALU_INSTRUCTIONS_ARB"/>
>+        <enum value="0x8806" name="GL_PROGRAM_TEX_INSTRUCTIONS_ARB"/>
>+        <enum value="0x8807" name="GL_PROGRAM_TEX_INDIRECTIONS_ARB"/>
>+        <enum value="0x8808" name="GL_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB"/>
>+        <enum value="0x8809" name="GL_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB"/>
>+        <enum value="0x880A" name="GL_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB"/>
>+        <enum value="0x880B" name="GL_MAX_PROGRAM_ALU_INSTRUCTIONS_ARB"/>
>+        <enum value="0x880C" name="GL_MAX_PROGRAM_TEX_INSTRUCTIONS_ARB"/>
>+        <enum value="0x880D" name="GL_MAX_PROGRAM_TEX_INDIRECTIONS_ARB"/>
>+        <enum value="0x880E" name="GL_MAX_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB"/>
>+        <enum value="0x880F" name="GL_MAX_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB"/>
>+        <enum value="0x8810" name="GL_MAX_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB"/>
>+            <unused start="0x8811" end="0x8813" vendor="AMD"/>
>+        <enum value="0x8814" name="GL_RGBA32F"/>
>+        <enum value="0x8814" name="GL_RGBA32F_ARB"/>
>+        <enum value="0x8814" name="GL_RGBA32F_EXT"/>
>+        <enum value="0x8814" name="GL_RGBA_FLOAT32_APPLE"/>
>+        <enum value="0x8814" name="GL_RGBA_FLOAT32_ATI"/>
>+        <enum value="0x8815" name="GL_RGB32F"/>
>+        <enum value="0x8815" name="GL_RGB32F_ARB"/>
>+        <enum value="0x8815" name="GL_RGB32F_EXT"/>
>+        <enum value="0x8815" name="GL_RGB_FLOAT32_APPLE"/>
>+        <enum value="0x8815" name="GL_RGB_FLOAT32_ATI"/>
>+        <enum value="0x8816" name="GL_ALPHA32F_ARB"/>
>+        <enum value="0x8816" name="GL_ALPHA32F_EXT"/>
>+        <enum value="0x8816" name="GL_ALPHA_FLOAT32_APPLE"/>
>+        <enum value="0x8816" name="GL_ALPHA_FLOAT32_ATI"/>
>+        <enum value="0x8817" name="GL_INTENSITY32F_ARB"/>
>+        <enum value="0x8817" name="GL_INTENSITY_FLOAT32_APPLE"/>
>+        <enum value="0x8817" name="GL_INTENSITY_FLOAT32_ATI"/>
>+        <enum value="0x8818" name="GL_LUMINANCE32F_ARB"/>
>+        <enum value="0x8818" name="GL_LUMINANCE32F_EXT"/>
>+        <enum value="0x8818" name="GL_LUMINANCE_FLOAT32_APPLE"/>
>+        <enum value="0x8818" name="GL_LUMINANCE_FLOAT32_ATI"/>
>+        <enum value="0x8819" name="GL_LUMINANCE_ALPHA32F_ARB"/>
>+        <enum value="0x8819" name="GL_LUMINANCE_ALPHA32F_EXT"/>
>+        <enum value="0x8819" name="GL_LUMINANCE_ALPHA_FLOAT32_APPLE"/>
>+        <enum value="0x8819" name="GL_LUMINANCE_ALPHA_FLOAT32_ATI"/>
>+        <enum value="0x881A" name="GL_RGBA16F"/>
>+        <enum value="0x881A" name="GL_RGBA16F_ARB"/>
>+        <enum value="0x881A" name="GL_RGBA16F_EXT"/>
>+        <enum value="0x881A" name="GL_RGBA_FLOAT16_APPLE"/>
>+        <enum value="0x881A" name="GL_RGBA_FLOAT16_ATI"/>
>+        <enum value="0x881B" name="GL_RGB16F"/>
>+        <enum value="0x881B" name="GL_RGB16F_ARB"/>
>+        <enum value="0x881B" name="GL_RGB16F_EXT"/>
>+        <enum value="0x881B" name="GL_RGB_FLOAT16_APPLE"/>
>+        <enum value="0x881B" name="GL_RGB_FLOAT16_ATI"/>
>+        <enum value="0x881C" name="GL_ALPHA16F_ARB"/>
>+        <enum value="0x881C" name="GL_ALPHA16F_EXT"/>
>+        <enum value="0x881C" name="GL_ALPHA_FLOAT16_APPLE"/>
>+        <enum value="0x881C" name="GL_ALPHA_FLOAT16_ATI"/>
>+        <enum value="0x881D" name="GL_INTENSITY16F_ARB"/>
>+        <enum value="0x881D" name="GL_INTENSITY_FLOAT16_APPLE"/>
>+        <enum value="0x881D" name="GL_INTENSITY_FLOAT16_ATI"/>
>+        <enum value="0x881E" name="GL_LUMINANCE16F_ARB"/>
>+        <enum value="0x881E" name="GL_LUMINANCE16F_EXT"/>
>+        <enum value="0x881E" name="GL_LUMINANCE_FLOAT16_APPLE"/>
>+        <enum value="0x881E" name="GL_LUMINANCE_FLOAT16_ATI"/>
>+        <enum value="0x881F" name="GL_LUMINANCE_ALPHA16F_ARB"/>
>+        <enum value="0x881F" name="GL_LUMINANCE_ALPHA16F_EXT"/>
>+        <enum value="0x881F" name="GL_LUMINANCE_ALPHA_FLOAT16_APPLE"/>
>+        <enum value="0x881F" name="GL_LUMINANCE_ALPHA_FLOAT16_ATI"/>
>+            
>+        <enum value="0x8820" name="GL_RGBA_FLOAT_MODE_ARB"/>
>+        <enum value="0x8820" name="GL_RGBA_FLOAT_MODE_ATI"/>
>+            <unused start="0x8821" end="0x8822" vendor="AMD"/>
>+        <enum value="0x8823" name="GL_WRITEONLY_RENDERING_QCOM"/>
>+        <enum value="0x8824" name="GL_MAX_DRAW_BUFFERS"/>
>+        <enum value="0x8824" name="GL_MAX_DRAW_BUFFERS_ARB"/>
>+        <enum value="0x8824" name="GL_MAX_DRAW_BUFFERS_ATI"/>
>+        <enum value="0x8824" name="GL_MAX_DRAW_BUFFERS_EXT"/>
>+        <enum value="0x8824" name="GL_MAX_DRAW_BUFFERS_NV"/>
>+        <enum value="0x8825" name="GL_DRAW_BUFFER0"/>
>+        <enum value="0x8825" name="GL_DRAW_BUFFER0_ARB"/>
>+        <enum value="0x8825" name="GL_DRAW_BUFFER0_ATI"/>
>+        <enum value="0x8825" name="GL_DRAW_BUFFER0_EXT"/>
>+        <enum value="0x8825" name="GL_DRAW_BUFFER0_NV"/>
>+        <enum value="0x8826" name="GL_DRAW_BUFFER1"/>
>+        <enum value="0x8826" name="GL_DRAW_BUFFER1_ARB"/>
>+        <enum value="0x8826" name="GL_DRAW_BUFFER1_ATI"/>
>+        <enum value="0x8826" name="GL_DRAW_BUFFER1_EXT"/>
>+        <enum value="0x8826" name="GL_DRAW_BUFFER1_NV"/>
>+        <enum value="0x8827" name="GL_DRAW_BUFFER2"/>
>+        <enum value="0x8827" name="GL_DRAW_BUFFER2_ARB"/>
>+        <enum value="0x8827" name="GL_DRAW_BUFFER2_ATI"/>
>+        <enum value="0x8827" name="GL_DRAW_BUFFER2_EXT"/>
>+        <enum value="0x8827" name="GL_DRAW_BUFFER2_NV"/>
>+        <enum value="0x8828" name="GL_DRAW_BUFFER3"/>
>+        <enum value="0x8828" name="GL_DRAW_BUFFER3_ARB"/>
>+        <enum value="0x8828" name="GL_DRAW_BUFFER3_ATI"/>
>+        <enum value="0x8828" name="GL_DRAW_BUFFER3_EXT"/>
>+        <enum value="0x8828" name="GL_DRAW_BUFFER3_NV"/>
>+        <enum value="0x8829" name="GL_DRAW_BUFFER4"/>
>+        <enum value="0x8829" name="GL_DRAW_BUFFER4_ARB"/>
>+        <enum value="0x8829" name="GL_DRAW_BUFFER4_ATI"/>
>+        <enum value="0x8829" name="GL_DRAW_BUFFER4_EXT"/>
>+        <enum value="0x8829" name="GL_DRAW_BUFFER4_NV"/>
>+        <enum value="0x882A" name="GL_DRAW_BUFFER5"/>
>+        <enum value="0x882A" name="GL_DRAW_BUFFER5_ARB"/>
>+        <enum value="0x882A" name="GL_DRAW_BUFFER5_ATI"/>
>+        <enum value="0x882A" name="GL_DRAW_BUFFER5_EXT"/>
>+        <enum value="0x882A" name="GL_DRAW_BUFFER5_NV"/>
>+        <enum value="0x882B" name="GL_DRAW_BUFFER6"/>
>+        <enum value="0x882B" name="GL_DRAW_BUFFER6_ARB"/>
>+        <enum value="0x882B" name="GL_DRAW_BUFFER6_ATI"/>
>+        <enum value="0x882B" name="GL_DRAW_BUFFER6_EXT"/>
>+        <enum value="0x882B" name="GL_DRAW_BUFFER6_NV"/>
>+        <enum value="0x882C" name="GL_DRAW_BUFFER7"/>
>+        <enum value="0x882C" name="GL_DRAW_BUFFER7_ARB"/>
>+        <enum value="0x882C" name="GL_DRAW_BUFFER7_ATI"/>
>+        <enum value="0x882C" name="GL_DRAW_BUFFER7_EXT"/>
>+        <enum value="0x882C" name="GL_DRAW_BUFFER7_NV"/>
>+        <enum value="0x882D" name="GL_DRAW_BUFFER8"/>
>+        <enum value="0x882D" name="GL_DRAW_BUFFER8_ARB"/>
>+        <enum value="0x882D" name="GL_DRAW_BUFFER8_ATI"/>
>+        <enum value="0x882D" name="GL_DRAW_BUFFER8_EXT"/>
>+        <enum value="0x882D" name="GL_DRAW_BUFFER8_NV"/>
>+        <enum value="0x882E" name="GL_DRAW_BUFFER9"/>
>+        <enum value="0x882E" name="GL_DRAW_BUFFER9_ARB"/>
>+        <enum value="0x882E" name="GL_DRAW_BUFFER9_ATI"/>
>+        <enum value="0x882E" name="GL_DRAW_BUFFER9_EXT"/>
>+        <enum value="0x882E" name="GL_DRAW_BUFFER9_NV"/>
>+        <enum value="0x882F" name="GL_DRAW_BUFFER10"/>
>+        <enum value="0x882F" name="GL_DRAW_BUFFER10_ARB"/>
>+        <enum value="0x882F" name="GL_DRAW_BUFFER10_ATI"/>
>+        <enum value="0x882F" name="GL_DRAW_BUFFER10_EXT"/>
>+        <enum value="0x882F" name="GL_DRAW_BUFFER10_NV"/>
>+        <enum value="0x8830" name="GL_DRAW_BUFFER11"/>
>+        <enum value="0x8830" name="GL_DRAW_BUFFER11_ARB"/>
>+        <enum value="0x8830" name="GL_DRAW_BUFFER11_ATI"/>
>+        <enum value="0x8830" name="GL_DRAW_BUFFER11_EXT"/>
>+        <enum value="0x8830" name="GL_DRAW_BUFFER11_NV"/>
>+        <enum value="0x8831" name="GL_DRAW_BUFFER12"/>
>+        <enum value="0x8831" name="GL_DRAW_BUFFER12_ARB"/>
>+        <enum value="0x8831" name="GL_DRAW_BUFFER12_ATI"/>
>+        <enum value="0x8831" name="GL_DRAW_BUFFER12_EXT"/>
>+        <enum value="0x8831" name="GL_DRAW_BUFFER12_NV"/>
>+        <enum value="0x8832" name="GL_DRAW_BUFFER13"/>
>+        <enum value="0x8832" name="GL_DRAW_BUFFER13_ARB"/>
>+        <enum value="0x8832" name="GL_DRAW_BUFFER13_ATI"/>
>+        <enum value="0x8832" name="GL_DRAW_BUFFER13_EXT"/>
>+        <enum value="0x8832" name="GL_DRAW_BUFFER13_NV"/>
>+        <enum value="0x8833" name="GL_DRAW_BUFFER14"/>
>+        <enum value="0x8833" name="GL_DRAW_BUFFER14_ARB"/>
>+        <enum value="0x8833" name="GL_DRAW_BUFFER14_ATI"/>
>+        <enum value="0x8833" name="GL_DRAW_BUFFER14_EXT"/>
>+        <enum value="0x8833" name="GL_DRAW_BUFFER14_NV"/>
>+        <enum value="0x8834" name="GL_DRAW_BUFFER15"/>
>+        <enum value="0x8834" name="GL_DRAW_BUFFER15_ARB"/>
>+        <enum value="0x8834" name="GL_DRAW_BUFFER15_ATI"/>
>+        <enum value="0x8834" name="GL_DRAW_BUFFER15_EXT"/>
>+        <enum value="0x8834" name="GL_DRAW_BUFFER15_NV"/>
>+        <enum value="0x8835" name="GL_COLOR_CLEAR_UNCLAMPED_VALUE_ATI"/>
>+            <unused start="0x8836" vendor="AMD"/>
>+        <enum value="0x8837" name="GL_COMPRESSED_LUMINANCE_ALPHA_3DC_ATI" comment="Defined by Mesa but not ATI"/>
>+            <unused start="0x8838" end="0x883C" vendor="AMD"/>
>+        <enum value="0x883D" name="GL_BLEND_EQUATION_ALPHA"/>
>+        <enum value="0x883D" name="GL_BLEND_EQUATION_ALPHA_EXT"/>
>+        <enum value="0x883D" name="GL_BLEND_EQUATION_ALPHA_OES"/>
>+            <unused start="0x883E" vendor="AMD"/>
>+        <enum value="0x883F" name="GL_SUBSAMPLE_DISTANCE_AMD"/>
>+    </enums>
>+
>+    <enums namespace="GL" start="0x8840" end="0x884F" vendor="ARB">
>+        <enum value="0x8840" name="GL_MATRIX_PALETTE_ARB"/>
>+        <enum value="0x8840" name="GL_MATRIX_PALETTE_OES"/>
>+        <enum value="0x8841" name="GL_MAX_MATRIX_PALETTE_STACK_DEPTH_ARB"/>
>+        <enum value="0x8842" name="GL_MAX_PALETTE_MATRICES_ARB"/>
>+        <enum value="0x8842" name="GL_MAX_PALETTE_MATRICES_OES"/>
>+        <enum value="0x8843" name="GL_CURRENT_PALETTE_MATRIX_ARB"/>
>+        <enum value="0x8843" name="GL_CURRENT_PALETTE_MATRIX_OES"/>
>+        <enum value="0x8844" name="GL_MATRIX_INDEX_ARRAY_ARB"/>
>+        <enum value="0x8844" name="GL_MATRIX_INDEX_ARRAY_OES"/>
>+        <enum value="0x8845" name="GL_CURRENT_MATRIX_INDEX_ARB"/>
>+        <enum value="0x8846" name="GL_MATRIX_INDEX_ARRAY_SIZE_ARB"/>
>+        <enum value="0x8846" name="GL_MATRIX_INDEX_ARRAY_SIZE_OES"/>
>+        <enum value="0x8847" name="GL_MATRIX_INDEX_ARRAY_TYPE_ARB"/>
>+        <enum value="0x8847" name="GL_MATRIX_INDEX_ARRAY_TYPE_OES"/>
>+        <enum value="0x8848" name="GL_MATRIX_INDEX_ARRAY_STRIDE_ARB"/>
>+        <enum value="0x8848" name="GL_MATRIX_INDEX_ARRAY_STRIDE_OES"/>
>+        <enum value="0x8849" name="GL_MATRIX_INDEX_ARRAY_POINTER_ARB"/>
>+        <enum value="0x8849" name="GL_MATRIX_INDEX_ARRAY_POINTER_OES"/>
>+        <enum value="0x884A" name="GL_TEXTURE_DEPTH_SIZE"/>
>+        <enum value="0x884A" name="GL_TEXTURE_DEPTH_SIZE_ARB"/>
>+        <enum value="0x884B" name="GL_DEPTH_TEXTURE_MODE"/>
>+        <enum value="0x884B" name="GL_DEPTH_TEXTURE_MODE_ARB"/>
>+        <enum value="0x884C" name="GL_TEXTURE_COMPARE_MODE"/>
>+        <enum value="0x884C" name="GL_TEXTURE_COMPARE_MODE_ARB"/>
>+        <enum value="0x884C" name="GL_TEXTURE_COMPARE_MODE_EXT"/>
>+        <enum value="0x884D" name="GL_TEXTURE_COMPARE_FUNC"/>
>+        <enum value="0x884D" name="GL_TEXTURE_COMPARE_FUNC_ARB"/>
>+        <enum value="0x884D" name="GL_TEXTURE_COMPARE_FUNC_EXT"/>
>+        <enum value="0x884E" name="GL_COMPARE_R_TO_TEXTURE"/>
>+        <enum value="0x884E" name="GL_COMPARE_R_TO_TEXTURE_ARB"/>
>+        <enum value="0x884E" name="GL_COMPARE_REF_DEPTH_TO_TEXTURE_EXT"/>
>+        <enum value="0x884E" name="GL_COMPARE_REF_TO_TEXTURE" alias="GL_COMPARE_R_TO_TEXTURE"/>
>+        <enum value="0x884E" name="GL_COMPARE_REF_TO_TEXTURE_EXT"/>
>+        <enum value="0x884F" name="GL_TEXTURE_CUBE_MAP_SEAMLESS"/>
>+    </enums>
>+
>+    <enums namespace="GL" start="0x8850" end="0x891F" vendor="NV">
>+        <enum value="0x8850" name="GL_OFFSET_PROJECTIVE_TEXTURE_2D_NV"/>
>+        <enum value="0x8851" name="GL_OFFSET_PROJECTIVE_TEXTURE_2D_SCALE_NV"/>
>+        <enum value="0x8852" name="GL_OFFSET_PROJECTIVE_TEXTURE_RECTANGLE_NV"/>
>+        <enum value="0x8853" name="GL_OFFSET_PROJECTIVE_TEXTURE_RECTANGLE_SCALE_NV"/>
>+        <enum value="0x8854" name="GL_OFFSET_HILO_TEXTURE_2D_NV"/>
>+        <enum value="0x8855" name="GL_OFFSET_HILO_TEXTURE_RECTANGLE_NV"/>
>+        <enum value="0x8856" name="GL_OFFSET_HILO_PROJECTIVE_TEXTURE_2D_NV"/>
>+        <enum value="0x8857" name="GL_OFFSET_HILO_PROJECTIVE_TEXTURE_RECTANGLE_NV"/>
>+        <enum value="0x8858" name="GL_DEPENDENT_HILO_TEXTURE_2D_NV"/>
>+        <enum value="0x8859" name="GL_DEPENDENT_RGB_TEXTURE_3D_NV"/>
>+        <enum value="0x885A" name="GL_DEPENDENT_RGB_TEXTURE_CUBE_MAP_NV"/>
>+        <enum value="0x885B" name="GL_DOT_PRODUCT_PASS_THROUGH_NV"/>
>+        <enum value="0x885C" name="GL_DOT_PRODUCT_TEXTURE_1D_NV"/>
>+        <enum value="0x885D" name="GL_DOT_PRODUCT_AFFINE_DEPTH_REPLACE_NV"/>
>+        <enum value="0x885E" name="GL_HILO8_NV"/>
>+        <enum value="0x885F" name="GL_SIGNED_HILO8_NV"/>
>+        <enum value="0x8860" name="GL_FORCE_BLUE_TO_ONE_NV"/>
>+        <enum value="0x8861" name="GL_POINT_SPRITE"/>
>+        <enum value="0x8861" name="GL_POINT_SPRITE_ARB"/>
>+        <enum value="0x8861" name="GL_POINT_SPRITE_NV"/>
>+        <enum value="0x8861" name="GL_POINT_SPRITE_OES"/>
>+        <enum value="0x8862" name="GL_COORD_REPLACE"/>
>+        <enum value="0x8862" name="GL_COORD_REPLACE_ARB"/>
>+        <enum value="0x8862" name="GL_COORD_REPLACE_NV"/>
>+        <enum value="0x8862" name="GL_COORD_REPLACE_OES"/>
>+        <enum value="0x8863" name="GL_POINT_SPRITE_R_MODE_NV"/>
>+        <enum value="0x8864" name="GL_PIXEL_COUNTER_BITS_NV"/>
>+        <enum value="0x8864" name="GL_QUERY_COUNTER_BITS"/>
>+        <enum value="0x8864" name="GL_QUERY_COUNTER_BITS_ARB"/>
>+        <enum value="0x8864" name="GL_QUERY_COUNTER_BITS_EXT"/>
>+        <enum value="0x8865" name="GL_CURRENT_OCCLUSION_QUERY_ID_NV"/>
>+        <enum value="0x8865" name="GL_CURRENT_QUERY"/>
>+        <enum value="0x8865" name="GL_CURRENT_QUERY_ARB"/>
>+        <enum value="0x8865" name="GL_CURRENT_QUERY_EXT"/>
>+        <enum value="0x8866" name="GL_PIXEL_COUNT_NV"/>
>+        <enum value="0x8866" name="GL_QUERY_RESULT"/>
>+        <enum value="0x8866" name="GL_QUERY_RESULT_ARB"/>
>+        <enum value="0x8866" name="GL_QUERY_RESULT_EXT"/>
>+        <enum value="0x8867" name="GL_PIXEL_COUNT_AVAILABLE_NV"/>
>+        <enum value="0x8867" name="GL_QUERY_RESULT_AVAILABLE"/>
>+        <enum value="0x8867" name="GL_QUERY_RESULT_AVAILABLE_ARB"/>
>+        <enum value="0x8867" name="GL_QUERY_RESULT_AVAILABLE_EXT"/>
>+        <enum value="0x8868" name="GL_MAX_FRAGMENT_PROGRAM_LOCAL_PARAMETERS_NV"/>
>+        <enum value="0x8869" name="GL_MAX_VERTEX_ATTRIBS"/>
>+        <enum value="0x8869" name="GL_MAX_VERTEX_ATTRIBS_ARB"/>
>+        <enum value="0x886A" name="GL_VERTEX_ATTRIB_ARRAY_NORMALIZED"/>
>+        <enum value="0x886A" name="GL_VERTEX_ATTRIB_ARRAY_NORMALIZED_ARB"/>
>+            <unused start="0x886B" vendor="NV"/>
>+        <enum value="0x886C" name="GL_MAX_TESS_CONTROL_INPUT_COMPONENTS"/>
>+        <enum value="0x886C" name="GL_MAX_TESS_CONTROL_INPUT_COMPONENTS_EXT"/>
>+        <enum value="0x886C" name="GL_MAX_TESS_CONTROL_INPUT_COMPONENTS_OES"/>
>+        <enum value="0x886D" name="GL_MAX_TESS_EVALUATION_INPUT_COMPONENTS"/>
>+        <enum value="0x886D" name="GL_MAX_TESS_EVALUATION_INPUT_COMPONENTS_EXT"/>
>+        <enum value="0x886D" name="GL_MAX_TESS_EVALUATION_INPUT_COMPONENTS_OES"/>
>+        <enum value="0x886E" name="GL_DEPTH_STENCIL_TO_RGBA_NV"/>
>+        <enum value="0x886F" name="GL_DEPTH_STENCIL_TO_BGRA_NV"/>
>+        <enum value="0x8870" name="GL_FRAGMENT_PROGRAM_NV"/>
>+        <enum value="0x8871" name="GL_MAX_TEXTURE_COORDS"/>
>+        <enum value="0x8871" name="GL_MAX_TEXTURE_COORDS_ARB"/>
>+        <enum value="0x8871" name="GL_MAX_TEXTURE_COORDS_NV"/>
>+        <enum value="0x8872" name="GL_MAX_TEXTURE_IMAGE_UNITS"/>
>+        <enum value="0x8872" name="GL_MAX_TEXTURE_IMAGE_UNITS_ARB"/>
>+        <enum value="0x8872" name="GL_MAX_TEXTURE_IMAGE_UNITS_NV"/>
>+        <enum value="0x8873" name="GL_FRAGMENT_PROGRAM_BINDING_NV"/>
>+        <enum value="0x8874" name="GL_PROGRAM_ERROR_STRING_ARB"/>
>+        <enum value="0x8874" name="GL_PROGRAM_ERROR_STRING_NV"/>
>+        <enum value="0x8875" name="GL_PROGRAM_FORMAT_ASCII_ARB"/>
>+        <enum value="0x8876" name="GL_PROGRAM_FORMAT_ARB"/>
>+            <unused start="0x8877" vendor="NV" comment="Should have been assigned to PROGRAM_BINDING_ARB"/>
>+        <enum value="0x8878" name="GL_WRITE_PIXEL_DATA_RANGE_NV"/>
>+        <enum value="0x8879" name="GL_READ_PIXEL_DATA_RANGE_NV"/>
>+        <enum value="0x887A" name="GL_WRITE_PIXEL_DATA_RANGE_LENGTH_NV"/>
>+        <enum value="0x887B" name="GL_READ_PIXEL_DATA_RANGE_LENGTH_NV"/>
>+        <enum value="0x887C" name="GL_WRITE_PIXEL_DATA_RANGE_POINTER_NV"/>
>+        <enum value="0x887D" name="GL_READ_PIXEL_DATA_RANGE_POINTER_NV"/>
>+            <unused start="0x887E" vendor="NV"/>
>+        <enum value="0x887F" name="GL_GEOMETRY_SHADER_INVOCATIONS"/>
>+        <enum value="0x887F" name="GL_GEOMETRY_SHADER_INVOCATIONS_EXT"/>
>+        <enum value="0x887F" name="GL_GEOMETRY_SHADER_INVOCATIONS_OES"/>
>+        <enum value="0x8880" name="GL_FLOAT_R_NV"/>
>+        <enum value="0x8881" name="GL_FLOAT_RG_NV"/>
>+        <enum value="0x8882" name="GL_FLOAT_RGB_NV"/>
>+        <enum value="0x8883" name="GL_FLOAT_RGBA_NV"/>
>+        <enum value="0x8884" name="GL_FLOAT_R16_NV"/>
>+        <enum value="0x8885" name="GL_FLOAT_R32_NV"/>
>+        <enum value="0x8886" name="GL_FLOAT_RG16_NV"/>
>+        <enum value="0x8887" name="GL_FLOAT_RG32_NV"/>
>+        <enum value="0x8888" name="GL_FLOAT_RGB16_NV"/>
>+        <enum value="0x8889" name="GL_FLOAT_RGB32_NV"/>
>+        <enum value="0x888A" name="GL_FLOAT_RGBA16_NV"/>
>+        <enum value="0x888B" name="GL_FLOAT_RGBA32_NV"/>
>+        <enum value="0x888C" name="GL_TEXTURE_FLOAT_COMPONENTS_NV"/>
>+        <enum value="0x888D" name="GL_FLOAT_CLEAR_COLOR_VALUE_NV"/>
>+        <enum value="0x888E" name="GL_FLOAT_RGBA_MODE_NV"/>
>+        <enum value="0x888F" name="GL_TEXTURE_UNSIGNED_REMAP_MODE_NV"/>
>+        <enum value="0x8890" name="GL_DEPTH_BOUNDS_TEST_EXT"/>
>+        <enum value="0x8891" name="GL_DEPTH_BOUNDS_EXT"/>
>+        <enum value="0x8892" name="GL_ARRAY_BUFFER"/>
>+        <enum value="0x8892" name="GL_ARRAY_BUFFER_ARB"/>
>+        <enum value="0x8893" name="GL_ELEMENT_ARRAY_BUFFER"/>
>+        <enum value="0x8893" name="GL_ELEMENT_ARRAY_BUFFER_ARB"/>
>+        <enum value="0x8894" name="GL_ARRAY_BUFFER_BINDING"/>
>+        <enum value="0x8894" name="GL_ARRAY_BUFFER_BINDING_ARB"/>
>+        <enum value="0x8895" name="GL_ELEMENT_ARRAY_BUFFER_BINDING"/>
>+        <enum value="0x8895" name="GL_ELEMENT_ARRAY_BUFFER_BINDING_ARB"/>
>+        <enum value="0x8896" name="GL_VERTEX_ARRAY_BUFFER_BINDING"/>
>+        <enum value="0x8896" name="GL_VERTEX_ARRAY_BUFFER_BINDING_ARB"/>
>+        <enum value="0x8897" name="GL_NORMAL_ARRAY_BUFFER_BINDING"/>
>+        <enum value="0x8897" name="GL_NORMAL_ARRAY_BUFFER_BINDING_ARB"/>
>+        <enum value="0x8898" name="GL_COLOR_ARRAY_BUFFER_BINDING"/>
>+        <enum value="0x8898" name="GL_COLOR_ARRAY_BUFFER_BINDING_ARB"/>
>+        <enum value="0x8899" name="GL_INDEX_ARRAY_BUFFER_BINDING"/>
>+        <enum value="0x8899" name="GL_INDEX_ARRAY_BUFFER_BINDING_ARB"/>
>+        <enum value="0x889A" name="GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING"/>
>+        <enum value="0x889A" name="GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING_ARB"/>
>+        <enum value="0x889B" name="GL_EDGE_FLAG_ARRAY_BUFFER_BINDING"/>
>+        <enum value="0x889B" name="GL_EDGE_FLAG_ARRAY_BUFFER_BINDING_ARB"/>
>+        <enum value="0x889C" name="GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING"/>
>+        <enum value="0x889C" name="GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING_ARB"/>
>+        <enum value="0x889D" name="GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING_ARB"/>
>+        <enum value="0x889D" name="GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING"/>
>+        <enum value="0x889D" name="GL_FOG_COORD_ARRAY_BUFFER_BINDING" alias="GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING"/>
>+        <enum value="0x889E" name="GL_WEIGHT_ARRAY_BUFFER_BINDING"/>
>+        <enum value="0x889E" name="GL_WEIGHT_ARRAY_BUFFER_BINDING_ARB"/>
>+        <enum value="0x889E" name="GL_WEIGHT_ARRAY_BUFFER_BINDING_OES"/>
>+        <enum value="0x889F" name="GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING"/>
>+        <enum value="0x889F" name="GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING_ARB"/>
>+        <enum value="0x88A0" name="GL_PROGRAM_INSTRUCTIONS_ARB"/>
>+        <enum value="0x88A1" name="GL_MAX_PROGRAM_INSTRUCTIONS_ARB"/>
>+        <enum value="0x88A2" name="GL_PROGRAM_NATIVE_INSTRUCTIONS_ARB"/>
>+        <enum value="0x88A3" name="GL_MAX_PROGRAM_NATIVE_INSTRUCTIONS_ARB"/>
>+        <enum value="0x88A4" name="GL_PROGRAM_TEMPORARIES_ARB"/>
>+        <enum value="0x88A5" name="GL_MAX_PROGRAM_TEMPORARIES_ARB"/>
>+        <enum value="0x88A6" name="GL_PROGRAM_NATIVE_TEMPORARIES_ARB"/>
>+        <enum value="0x88A7" name="GL_MAX_PROGRAM_NATIVE_TEMPORARIES_ARB"/>
>+        <enum value="0x88A8" name="GL_PROGRAM_PARAMETERS_ARB"/>
>+        <enum value="0x88A9" name="GL_MAX_PROGRAM_PARAMETERS_ARB"/>
>+        <enum value="0x88AA" name="GL_PROGRAM_NATIVE_PARAMETERS_ARB"/>
>+        <enum value="0x88AB" name="GL_MAX_PROGRAM_NATIVE_PARAMETERS_ARB"/>
>+        <enum value="0x88AC" name="GL_PROGRAM_ATTRIBS_ARB"/>
>+        <enum value="0x88AD" name="GL_MAX_PROGRAM_ATTRIBS_ARB"/>
>+        <enum value="0x88AE" name="GL_PROGRAM_NATIVE_ATTRIBS_ARB"/>
>+        <enum value="0x88AF" name="GL_MAX_PROGRAM_NATIVE_ATTRIBS_ARB"/>
>+        <enum value="0x88B0" name="GL_PROGRAM_ADDRESS_REGISTERS_ARB"/>
>+        <enum value="0x88B1" name="GL_MAX_PROGRAM_ADDRESS_REGISTERS_ARB"/>
>+        <enum value="0x88B2" name="GL_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB"/>
>+        <enum value="0x88B3" name="GL_MAX_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB"/>
>+        <enum value="0x88B4" name="GL_MAX_PROGRAM_LOCAL_PARAMETERS_ARB"/>
>+        <enum value="0x88B5" name="GL_MAX_PROGRAM_ENV_PARAMETERS_ARB"/>
>+        <enum value="0x88B6" name="GL_PROGRAM_UNDER_NATIVE_LIMITS_ARB"/>
>+        <enum value="0x88B7" name="GL_TRANSPOSE_CURRENT_MATRIX_ARB"/>
>+        <enum value="0x88B8" name="GL_READ_ONLY"/>
>+        <enum value="0x88B8" name="GL_READ_ONLY_ARB"/>
>+        <enum value="0x88B9" name="GL_WRITE_ONLY"/>
>+        <enum value="0x88B9" name="GL_WRITE_ONLY_ARB"/>
>+        <enum value="0x88B9" name="GL_WRITE_ONLY_OES"/>
>+        <enum value="0x88BA" name="GL_READ_WRITE"/>
>+        <enum value="0x88BA" name="GL_READ_WRITE_ARB"/>
>+        <enum value="0x88BB" name="GL_BUFFER_ACCESS"/>
>+        <enum value="0x88BB" name="GL_BUFFER_ACCESS_ARB"/>
>+        <enum value="0x88BB" name="GL_BUFFER_ACCESS_OES"/>
>+        <enum value="0x88BC" name="GL_BUFFER_MAPPED"/>
>+        <enum value="0x88BC" name="GL_BUFFER_MAPPED_ARB"/>
>+        <enum value="0x88BC" name="GL_BUFFER_MAPPED_OES"/>
>+        <enum value="0x88BD" name="GL_BUFFER_MAP_POINTER"/>
>+        <enum value="0x88BD" name="GL_BUFFER_MAP_POINTER_ARB"/>
>+        <enum value="0x88BD" name="GL_BUFFER_MAP_POINTER_OES"/>
>+        <enum value="0x88BE" name="GL_WRITE_DISCARD_NV"/>
>+        <enum value="0x88BF" name="GL_TIME_ELAPSED"/>
>+        <enum value="0x88BF" name="GL_TIME_ELAPSED_EXT"/>
>+        <enum value="0x88C0" name="GL_MATRIX0_ARB"/>
>+        <enum value="0x88C1" name="GL_MATRIX1_ARB"/>
>+        <enum value="0x88C2" name="GL_MATRIX2_ARB"/>
>+        <enum value="0x88C3" name="GL_MATRIX3_ARB"/>
>+        <enum value="0x88C4" name="GL_MATRIX4_ARB"/>
>+        <enum value="0x88C5" name="GL_MATRIX5_ARB"/>
>+        <enum value="0x88C6" name="GL_MATRIX6_ARB"/>
>+        <enum value="0x88C7" name="GL_MATRIX7_ARB"/>
>+        <enum value="0x88C8" name="GL_MATRIX8_ARB"/>
>+        <enum value="0x88C9" name="GL_MATRIX9_ARB"/>
>+        <enum value="0x88CA" name="GL_MATRIX10_ARB"/>
>+        <enum value="0x88CB" name="GL_MATRIX11_ARB"/>
>+        <enum value="0x88CC" name="GL_MATRIX12_ARB"/>
>+        <enum value="0x88CD" name="GL_MATRIX13_ARB"/>
>+        <enum value="0x88CE" name="GL_MATRIX14_ARB"/>
>+        <enum value="0x88CF" name="GL_MATRIX15_ARB"/>
>+        <enum value="0x88D0" name="GL_MATRIX16_ARB"/>
>+        <enum value="0x88D1" name="GL_MATRIX17_ARB"/>
>+        <enum value="0x88D2" name="GL_MATRIX18_ARB"/>
>+        <enum value="0x88D3" name="GL_MATRIX19_ARB"/>
>+        <enum value="0x88D4" name="GL_MATRIX20_ARB"/>
>+        <enum value="0x88D5" name="GL_MATRIX21_ARB"/>
>+        <enum value="0x88D6" name="GL_MATRIX22_ARB"/>
>+        <enum value="0x88D7" name="GL_MATRIX23_ARB"/>
>+        <enum value="0x88D8" name="GL_MATRIX24_ARB"/>
>+        <enum value="0x88D9" name="GL_MATRIX25_ARB"/>
>+        <enum value="0x88DA" name="GL_MATRIX26_ARB"/>
>+        <enum value="0x88DB" name="GL_MATRIX27_ARB"/>
>+        <enum value="0x88DC" name="GL_MATRIX28_ARB"/>
>+        <enum value="0x88DD" name="GL_MATRIX29_ARB"/>
>+        <enum value="0x88DE" name="GL_MATRIX30_ARB"/>
>+        <enum value="0x88DF" name="GL_MATRIX31_ARB"/>
>+        <enum value="0x88E0" name="GL_STREAM_DRAW"/>
>+        <enum value="0x88E0" name="GL_STREAM_DRAW_ARB"/>
>+        <enum value="0x88E1" name="GL_STREAM_READ"/>
>+        <enum value="0x88E1" name="GL_STREAM_READ_ARB"/>
>+        <enum value="0x88E2" name="GL_STREAM_COPY"/>
>+        <enum value="0x88E2" name="GL_STREAM_COPY_ARB"/>
>+            <unused start="0x88E3" vendor="NV" comment="To extend ARB_vbo"/>
>+        <enum value="0x88E4" name="GL_STATIC_DRAW"/>
>+        <enum value="0x88E4" name="GL_STATIC_DRAW_ARB"/>
>+        <enum value="0x88E5" name="GL_STATIC_READ"/>
>+        <enum value="0x88E5" name="GL_STATIC_READ_ARB"/>
>+        <enum value="0x88E6" name="GL_STATIC_COPY"/>
>+        <enum value="0x88E6" name="GL_STATIC_COPY_ARB"/>
>+            <unused start="0x88E7" vendor="NV" comment="To extend ARB_vbo"/>
>+        <enum value="0x88E8" name="GL_DYNAMIC_DRAW"/>
>+        <enum value="0x88E8" name="GL_DYNAMIC_DRAW_ARB"/>
>+        <enum value="0x88E9" name="GL_DYNAMIC_READ"/>
>+        <enum value="0x88E9" name="GL_DYNAMIC_READ_ARB"/>
>+        <enum value="0x88EA" name="GL_DYNAMIC_COPY"/>
>+        <enum value="0x88EA" name="GL_DYNAMIC_COPY_ARB"/>
>+        <enum value="0x88EB" name="GL_PIXEL_PACK_BUFFER"/>
>+        <enum value="0x88EB" name="GL_PIXEL_PACK_BUFFER_ARB"/>
>+        <enum value="0x88EB" name="GL_PIXEL_PACK_BUFFER_EXT"/>
>+        <enum value="0x88EB" name="GL_PIXEL_PACK_BUFFER_NV"/>
>+        <enum value="0x88EC" name="GL_PIXEL_UNPACK_BUFFER"/>
>+        <enum value="0x88EC" name="GL_PIXEL_UNPACK_BUFFER_ARB"/>
>+        <enum value="0x88EC" name="GL_PIXEL_UNPACK_BUFFER_EXT"/>
>+        <enum value="0x88EC" name="GL_PIXEL_UNPACK_BUFFER_NV"/>
>+        <enum value="0x88ED" name="GL_PIXEL_PACK_BUFFER_BINDING"/>
>+        <enum value="0x88ED" name="GL_PIXEL_PACK_BUFFER_BINDING_ARB"/>
>+        <enum value="0x88ED" name="GL_PIXEL_PACK_BUFFER_BINDING_EXT"/>
>+        <enum value="0x88ED" name="GL_PIXEL_PACK_BUFFER_BINDING_NV"/>
>+        <enum value="0x88EE" name="GL_ETC1_SRGB8_NV"/>
>+        <enum value="0x88EF" name="GL_PIXEL_UNPACK_BUFFER_BINDING"/>
>+        <enum value="0x88EF" name="GL_PIXEL_UNPACK_BUFFER_BINDING_ARB"/>
>+        <enum value="0x88EF" name="GL_PIXEL_UNPACK_BUFFER_BINDING_EXT"/>
>+        <enum value="0x88EF" name="GL_PIXEL_UNPACK_BUFFER_BINDING_NV"/>
>+        <enum value="0x88F0" name="GL_DEPTH24_STENCIL8"/>
>+        <enum value="0x88F0" name="GL_DEPTH24_STENCIL8_EXT"/>
>+        <enum value="0x88F0" name="GL_DEPTH24_STENCIL8_OES"/>
>+        <enum value="0x88F1" name="GL_TEXTURE_STENCIL_SIZE"/>
>+        <enum value="0x88F1" name="GL_TEXTURE_STENCIL_SIZE_EXT"/>
>+        <enum value="0x88F2" name="GL_STENCIL_TAG_BITS_EXT"/>
>+        <enum value="0x88F3" name="GL_STENCIL_CLEAR_TAG_VALUE_EXT"/>
>+        <enum value="0x88F4" name="GL_MAX_PROGRAM_EXEC_INSTRUCTIONS_NV"/>
>+        <enum value="0x88F5" name="GL_MAX_PROGRAM_CALL_DEPTH_NV"/>
>+        <enum value="0x88F6" name="GL_MAX_PROGRAM_IF_DEPTH_NV"/>
>+        <enum value="0x88F7" name="GL_MAX_PROGRAM_LOOP_DEPTH_NV"/>
>+        <enum value="0x88F8" name="GL_MAX_PROGRAM_LOOP_COUNT_NV"/>
>+        <enum value="0x88F9" name="GL_SRC1_COLOR"/>
>+        <enum value="0x88F9" name="GL_SRC1_COLOR_EXT"/>
>+        <enum value="0x88FA" name="GL_ONE_MINUS_SRC1_COLOR"/>
>+        <enum value="0x88FA" name="GL_ONE_MINUS_SRC1_COLOR_EXT"/>
>+        <enum value="0x88FB" name="GL_ONE_MINUS_SRC1_ALPHA"/>
>+        <enum value="0x88FB" name="GL_ONE_MINUS_SRC1_ALPHA_EXT"/>
>+        <enum value="0x88FC" name="GL_MAX_DUAL_SOURCE_DRAW_BUFFERS"/>
>+        <enum value="0x88FC" name="GL_MAX_DUAL_SOURCE_DRAW_BUFFERS_EXT"/>
>+        <enum value="0x88FD" name="GL_VERTEX_ATTRIB_ARRAY_INTEGER"/>
>+        <enum value="0x88FD" name="GL_VERTEX_ATTRIB_ARRAY_INTEGER_EXT"/>
>+        <enum value="0x88FD" name="GL_VERTEX_ATTRIB_ARRAY_INTEGER_NV"/>
>+        <enum value="0x88FE" name="GL_VERTEX_ATTRIB_ARRAY_DIVISOR"/>
>+        <enum value="0x88FE" name="GL_VERTEX_ATTRIB_ARRAY_DIVISOR_ANGLE"/>
>+        <enum value="0x88FE" name="GL_VERTEX_ATTRIB_ARRAY_DIVISOR_ARB"/>
>+        <enum value="0x88FE" name="GL_VERTEX_ATTRIB_ARRAY_DIVISOR_EXT"/>
>+        <enum value="0x88FE" name="GL_VERTEX_ATTRIB_ARRAY_DIVISOR_NV"/>
>+        <enum value="0x88FF" name="GL_MAX_ARRAY_TEXTURE_LAYERS"/>
>+        <enum value="0x88FF" name="GL_MAX_ARRAY_TEXTURE_LAYERS_EXT"/>
>+        <enum value="0x8904" name="GL_MIN_PROGRAM_TEXEL_OFFSET"/>
>+        <enum value="0x8904" name="GL_MIN_PROGRAM_TEXEL_OFFSET_EXT"/>
>+        <enum value="0x8904" name="GL_MIN_PROGRAM_TEXEL_OFFSET_NV"/>
>+        <enum value="0x8905" name="GL_MAX_PROGRAM_TEXEL_OFFSET"/>
>+        <enum value="0x8905" name="GL_MAX_PROGRAM_TEXEL_OFFSET_EXT"/>
>+        <enum value="0x8905" name="GL_MAX_PROGRAM_TEXEL_OFFSET_NV"/>
>+        <enum value="0x8906" name="GL_PROGRAM_ATTRIB_COMPONENTS_NV"/>
>+        <enum value="0x8907" name="GL_PROGRAM_RESULT_COMPONENTS_NV"/>
>+        <enum value="0x8908" name="GL_MAX_PROGRAM_ATTRIB_COMPONENTS_NV"/>
>+        <enum value="0x8909" name="GL_MAX_PROGRAM_RESULT_COMPONENTS_NV"/>
>+        <enum value="0x8910" name="GL_STENCIL_TEST_TWO_SIDE_EXT"/>
>+        <enum value="0x8911" name="GL_ACTIVE_STENCIL_FACE_EXT"/>
>+        <enum value="0x8912" name="GL_MIRROR_CLAMP_TO_BORDER_EXT"/>
>+            <unused start="0x8913" vendor="NV"/>
>+        <enum value="0x8914" name="GL_SAMPLES_PASSED"/>
>+        <enum value="0x8914" name="GL_SAMPLES_PASSED_ARB"/>
>+            <unused start="0x8915" vendor="NV"/>
>+        <enum value="0x8916" name="GL_GEOMETRY_VERTICES_OUT"/>
>+        <enum value="0x8916" name="GL_GEOMETRY_LINKED_VERTICES_OUT_EXT"/>
>+        <enum value="0x8916" name="GL_GEOMETRY_LINKED_VERTICES_OUT_OES"/>
>+        <enum value="0x8917" name="GL_GEOMETRY_INPUT_TYPE"/>
>+        <enum value="0x8917" name="GL_GEOMETRY_LINKED_INPUT_TYPE_EXT"/>
>+        <enum value="0x8917" name="GL_GEOMETRY_LINKED_INPUT_TYPE_OES"/>
>+        <enum value="0x8918" name="GL_GEOMETRY_OUTPUT_TYPE"/>
>+        <enum value="0x8918" name="GL_GEOMETRY_LINKED_OUTPUT_TYPE_EXT"/>
>+        <enum value="0x8918" name="GL_GEOMETRY_LINKED_OUTPUT_TYPE_OES"/>
>+        <enum value="0x8919" name="GL_SAMPLER_BINDING"/>
>+        <enum value="0x891A" name="GL_CLAMP_VERTEX_COLOR"/>
>+        <enum value="0x891A" name="GL_CLAMP_VERTEX_COLOR_ARB"/>
>+        <enum value="0x891B" name="GL_CLAMP_FRAGMENT_COLOR"/>
>+        <enum value="0x891B" name="GL_CLAMP_FRAGMENT_COLOR_ARB"/>
>+        <enum value="0x891C" name="GL_CLAMP_READ_COLOR"/>
>+        <enum value="0x891C" name="GL_CLAMP_READ_COLOR_ARB"/>
>+        <enum value="0x891D" name="GL_FIXED_ONLY"/>
>+        <enum value="0x891D" name="GL_FIXED_ONLY_ARB"/>
>+        <enum value="0x891E" name="GL_TESS_CONTROL_PROGRAM_NV"/>
>+        <enum value="0x891F" name="GL_TESS_EVALUATION_PROGRAM_NV"/>
>+    </enums>
>+
>+    <enums namespace="GL" start="0x8920" end="0x897F" vendor="AMD">
>+        <enum value="0x8920" name="GL_FRAGMENT_SHADER_ATI"/>
>+        <enum value="0x8921" name="GL_REG_0_ATI"/>
>+        <enum value="0x8922" name="GL_REG_1_ATI"/>
>+        <enum value="0x8923" name="GL_REG_2_ATI"/>
>+        <enum value="0x8924" name="GL_REG_3_ATI"/>
>+        <enum value="0x8925" name="GL_REG_4_ATI"/>
>+        <enum value="0x8926" name="GL_REG_5_ATI"/>
>+        <enum value="0x8927" name="GL_REG_6_ATI"/>
>+        <enum value="0x8928" name="GL_REG_7_ATI"/>
>+        <enum value="0x8929" name="GL_REG_8_ATI"/>
>+        <enum value="0x892A" name="GL_REG_9_ATI"/>
>+        <enum value="0x892B" name="GL_REG_10_ATI"/>
>+        <enum value="0x892C" name="GL_REG_11_ATI"/>
>+        <enum value="0x892D" name="GL_REG_12_ATI"/>
>+        <enum value="0x892E" name="GL_REG_13_ATI"/>
>+        <enum value="0x892F" name="GL_REG_14_ATI"/>
>+        <enum value="0x8930" name="GL_REG_15_ATI"/>
>+        <enum value="0x8931" name="GL_REG_16_ATI"/>
>+        <enum value="0x8932" name="GL_REG_17_ATI"/>
>+        <enum value="0x8933" name="GL_REG_18_ATI"/>
>+        <enum value="0x8934" name="GL_REG_19_ATI"/>
>+        <enum value="0x8935" name="GL_REG_20_ATI"/>
>+        <enum value="0x8936" name="GL_REG_21_ATI"/>
>+        <enum value="0x8937" name="GL_REG_22_ATI"/>
>+        <enum value="0x8938" name="GL_REG_23_ATI"/>
>+        <enum value="0x8939" name="GL_REG_24_ATI"/>
>+        <enum value="0x893A" name="GL_REG_25_ATI"/>
>+        <enum value="0x893B" name="GL_REG_26_ATI"/>
>+        <enum value="0x893C" name="GL_REG_27_ATI"/>
>+        <enum value="0x893D" name="GL_REG_28_ATI"/>
>+        <enum value="0x893E" name="GL_REG_29_ATI"/>
>+        <enum value="0x893F" name="GL_REG_30_ATI"/>
>+        <enum value="0x8940" name="GL_REG_31_ATI"/>
>+        <enum value="0x8941" name="GL_CON_0_ATI"/>
>+        <enum value="0x8942" name="GL_CON_1_ATI"/>
>+        <enum value="0x8943" name="GL_CON_2_ATI"/>
>+        <enum value="0x8944" name="GL_CON_3_ATI"/>
>+        <enum value="0x8945" name="GL_CON_4_ATI"/>
>+        <enum value="0x8946" name="GL_CON_5_ATI"/>
>+        <enum value="0x8947" name="GL_CON_6_ATI"/>
>+        <enum value="0x8948" name="GL_CON_7_ATI"/>
>+        <enum value="0x8949" name="GL_CON_8_ATI"/>
>+        <enum value="0x894A" name="GL_CON_9_ATI"/>
>+        <enum value="0x894B" name="GL_CON_10_ATI"/>
>+        <enum value="0x894C" name="GL_CON_11_ATI"/>
>+        <enum value="0x894D" name="GL_CON_12_ATI"/>
>+        <enum value="0x894E" name="GL_CON_13_ATI"/>
>+        <enum value="0x894F" name="GL_CON_14_ATI"/>
>+        <enum value="0x8950" name="GL_CON_15_ATI"/>
>+        <enum value="0x8951" name="GL_CON_16_ATI"/>
>+        <enum value="0x8952" name="GL_CON_17_ATI"/>
>+        <enum value="0x8953" name="GL_CON_18_ATI"/>
>+        <enum value="0x8954" name="GL_CON_19_ATI"/>
>+        <enum value="0x8955" name="GL_CON_20_ATI"/>
>+        <enum value="0x8956" name="GL_CON_21_ATI"/>
>+        <enum value="0x8957" name="GL_CON_22_ATI"/>
>+        <enum value="0x8958" name="GL_CON_23_ATI"/>
>+        <enum value="0x8959" name="GL_CON_24_ATI"/>
>+        <enum value="0x895A" name="GL_CON_25_ATI"/>
>+        <enum value="0x895B" name="GL_CON_26_ATI"/>
>+        <enum value="0x895C" name="GL_CON_27_ATI"/>
>+        <enum value="0x895D" name="GL_CON_28_ATI"/>
>+        <enum value="0x895E" name="GL_CON_29_ATI"/>
>+        <enum value="0x895F" name="GL_CON_30_ATI"/>
>+        <enum value="0x8960" name="GL_CON_31_ATI"/>
>+        <enum value="0x8961" name="GL_MOV_ATI"/>
>+        <enum value="0x8963" name="GL_ADD_ATI"/>
>+        <enum value="0x8964" name="GL_MUL_ATI"/>
>+        <enum value="0x8965" name="GL_SUB_ATI"/>
>+        <enum value="0x8966" name="GL_DOT3_ATI"/>
>+        <enum value="0x8967" name="GL_DOT4_ATI"/>
>+        <enum value="0x8968" name="GL_MAD_ATI"/>
>+        <enum value="0x8969" name="GL_LERP_ATI"/>
>+        <enum value="0x896A" name="GL_CND_ATI"/>
>+        <enum value="0x896B" name="GL_CND0_ATI"/>
>+        <enum value="0x896C" name="GL_DOT2_ADD_ATI"/>
>+        <enum value="0x896D" name="GL_SECONDARY_INTERPOLATOR_ATI"/>
>+        <enum value="0x896E" name="GL_NUM_FRAGMENT_REGISTERS_ATI"/>
>+        <enum value="0x896F" name="GL_NUM_FRAGMENT_CONSTANTS_ATI"/>
>+        <enum value="0x8970" name="GL_NUM_PASSES_ATI"/>
>+        <enum value="0x8971" name="GL_NUM_INSTRUCTIONS_PER_PASS_ATI"/>
>+        <enum value="0x8972" name="GL_NUM_INSTRUCTIONS_TOTAL_ATI"/>
>+        <enum value="0x8973" name="GL_NUM_INPUT_INTERPOLATOR_COMPONENTS_ATI"/>
>+        <enum value="0x8974" name="GL_NUM_LOOPBACK_COMPONENTS_ATI"/>
>+        <enum value="0x8975" name="GL_COLOR_ALPHA_PAIRING_ATI"/>
>+        <enum value="0x8976" name="GL_SWIZZLE_STR_ATI"/>
>+        <enum value="0x8977" name="GL_SWIZZLE_STQ_ATI"/>
>+        <enum value="0x8978" name="GL_SWIZZLE_STR_DR_ATI"/>
>+        <enum value="0x8979" name="GL_SWIZZLE_STQ_DQ_ATI"/>
>+        <enum value="0x897A" name="GL_SWIZZLE_STRQ_ATI"/>
>+        <enum value="0x897B" name="GL_SWIZZLE_STRQ_DQ_ATI"/>
>+            <unused start="0x897C" end="0x897F" vendor="AMD"/>
>+    </enums>
>+
>+    <enums namespace="GL" start="0x8980" end="0x898F" vendor="OML">
>+        <enum value="0x8980" name="GL_INTERLACE_OML"/>
>+        <enum value="0x8981" name="GL_INTERLACE_READ_OML"/>
>+        <enum value="0x8982" name="GL_FORMAT_SUBSAMPLE_24_24_OML"/>
>+        <enum value="0x8983" name="GL_FORMAT_SUBSAMPLE_244_244_OML"/>
>+        <enum value="0x8984" name="GL_PACK_RESAMPLE_OML"/>
>+        <enum value="0x8985" name="GL_UNPACK_RESAMPLE_OML"/>
>+        <enum value="0x8986" name="GL_RESAMPLE_REPLICATE_OML"/>
>+        <enum value="0x8987" name="GL_RESAMPLE_ZERO_FILL_OML"/>
>+        <enum value="0x8988" name="GL_RESAMPLE_AVERAGE_OML"/>
>+        <enum value="0x8989" name="GL_RESAMPLE_DECIMATE_OML"/>
>+        <enum value="0x898A" name="GL_POINT_SIZE_ARRAY_TYPE_OES"/>
>+        <enum value="0x898B" name="GL_POINT_SIZE_ARRAY_STRIDE_OES"/>
>+        <enum value="0x898C" name="GL_POINT_SIZE_ARRAY_POINTER_OES"/>
>+        <enum value="0x898D" name="GL_MODELVIEW_MATRIX_FLOAT_AS_INT_BITS_OES"/>
>+        <enum value="0x898E" name="GL_PROJECTION_MATRIX_FLOAT_AS_INT_BITS_OES"/>
>+        <enum value="0x898F" name="GL_TEXTURE_MATRIX_FLOAT_AS_INT_BITS_OES"/>
>+    </enums>
>+
>+    <enums namespace="GL" start="0x8990" end="0x899F" vendor="ZiiLabs">
>+            <unused start="0x8990" end="0x899F" vendor="ZiiLabs"/>
>+    </enums>
>+
>+    <enums namespace="GL" start="0x89A0" end="0x89FF" vendor="Matrox">
>+            <unused start="0x89A0" end="0x89FF" vendor="Matrox"/>
>+    </enums>
>+
>+    <enums namespace="GL" start="0x8A00" end="0x8A7F" vendor="APPLE">
>+        <enum value="0x8A00" name="GL_VERTEX_ATTRIB_MAP1_APPLE"/>
>+        <enum value="0x8A01" name="GL_VERTEX_ATTRIB_MAP2_APPLE"/>
>+        <enum value="0x8A02" name="GL_VERTEX_ATTRIB_MAP1_SIZE_APPLE"/>
>+        <enum value="0x8A03" name="GL_VERTEX_ATTRIB_MAP1_COEFF_APPLE"/>
>+        <enum value="0x8A04" name="GL_VERTEX_ATTRIB_MAP1_ORDER_APPLE"/>
>+        <enum value="0x8A05" name="GL_VERTEX_ATTRIB_MAP1_DOMAIN_APPLE"/>
>+        <enum value="0x8A06" name="GL_VERTEX_ATTRIB_MAP2_SIZE_APPLE"/>
>+        <enum value="0x8A07" name="GL_VERTEX_ATTRIB_MAP2_COEFF_APPLE"/>
>+        <enum value="0x8A08" name="GL_VERTEX_ATTRIB_MAP2_ORDER_APPLE"/>
>+        <enum value="0x8A09" name="GL_VERTEX_ATTRIB_MAP2_DOMAIN_APPLE"/>
>+        <enum value="0x8A0A" name="GL_DRAW_PIXELS_APPLE"/>
>+        <enum value="0x8A0B" name="GL_FENCE_APPLE"/>
>+        <enum value="0x8A0C" name="GL_ELEMENT_ARRAY_APPLE"/>
>+        <enum value="0x8A0D" name="GL_ELEMENT_ARRAY_TYPE_APPLE"/>
>+        <enum value="0x8A0E" name="GL_ELEMENT_ARRAY_POINTER_APPLE"/>
>+        <enum value="0x8A0F" name="GL_COLOR_FLOAT_APPLE"/>
>+            <unused start="0x8A10" vendor="APPLE" comment="Unknown extension (Khronos bug 632)"/>
>+            
>+        <enum value="0x8A11" name="GL_UNIFORM_BUFFER"/>
>+        <enum value="0x8A12" name="GL_BUFFER_SERIALIZED_MODIFY_APPLE"/>
>+        <enum value="0x8A13" name="GL_BUFFER_FLUSHING_UNMAP_APPLE"/>
>+        <enum value="0x8A14" name="GL_AUX_DEPTH_STENCIL_APPLE"/>
>+        <enum value="0x8A15" name="GL_PACK_ROW_BYTES_APPLE"/>
>+        <enum value="0x8A16" name="GL_UNPACK_ROW_BYTES_APPLE"/>
>+            <unused start="0x8A17" end="0x8A18" vendor="APPLE"/>
>+        <enum value="0x8A19" name="GL_RELEASED_APPLE"/>
>+        <enum value="0x8A1A" name="GL_VOLATILE_APPLE"/>
>+        <enum value="0x8A1B" name="GL_RETAINED_APPLE"/>
>+        <enum value="0x8A1C" name="GL_UNDEFINED_APPLE"/>
>+        <enum value="0x8A1D" name="GL_PURGEABLE_APPLE"/>
>+            <unused start="0x8A1E" vendor="APPLE"/>
>+        <enum value="0x8A1F" name="GL_RGB_422_APPLE"/>
>+            <unused start="0x8A20" end="0x8A27" vendor="APPLE"/>
>+        <enum value="0x8A28" name="GL_UNIFORM_BUFFER_BINDING"/>
>+        <enum value="0x8A29" name="GL_UNIFORM_BUFFER_START"/>
>+        <enum value="0x8A2A" name="GL_UNIFORM_BUFFER_SIZE"/>
>+        <enum value="0x8A2B" name="GL_MAX_VERTEX_UNIFORM_BLOCKS"/>
>+        <enum value="0x8A2C" name="GL_MAX_GEOMETRY_UNIFORM_BLOCKS"/>
>+        <enum value="0x8A2C" name="GL_MAX_GEOMETRY_UNIFORM_BLOCKS_EXT"/>
>+        <enum value="0x8A2C" name="GL_MAX_GEOMETRY_UNIFORM_BLOCKS_OES"/>
>+        <enum value="0x8A2D" name="GL_MAX_FRAGMENT_UNIFORM_BLOCKS"/>
>+        <enum value="0x8A2E" name="GL_MAX_COMBINED_UNIFORM_BLOCKS"/>
>+        <enum value="0x8A2F" name="GL_MAX_UNIFORM_BUFFER_BINDINGS"/>
>+        <enum value="0x8A30" name="GL_MAX_UNIFORM_BLOCK_SIZE"/>
>+        <enum value="0x8A31" name="GL_MAX_COMBINED_VERTEX_UNIFORM_COMPONENTS"/>
>+        <enum value="0x8A32" name="GL_MAX_COMBINED_GEOMETRY_UNIFORM_COMPONENTS"/>
>+        <enum value="0x8A32" name="GL_MAX_COMBINED_GEOMETRY_UNIFORM_COMPONENTS_EXT"/>
>+        <enum value="0x8A32" name="GL_MAX_COMBINED_GEOMETRY_UNIFORM_COMPONENTS_OES"/>
>+        <enum value="0x8A33" name="GL_MAX_COMBINED_FRAGMENT_UNIFORM_COMPONENTS"/>
>+        <enum value="0x8A34" name="GL_UNIFORM_BUFFER_OFFSET_ALIGNMENT"/>
>+        <enum value="0x8A35" name="GL_ACTIVE_UNIFORM_BLOCK_MAX_NAME_LENGTH"/>
>+        <enum value="0x8A36" name="GL_ACTIVE_UNIFORM_BLOCKS"/>
>+        <enum value="0x8A37" name="GL_UNIFORM_TYPE"/>
>+        <enum value="0x8A38" name="GL_UNIFORM_SIZE"/>
>+        <enum value="0x8A39" name="GL_UNIFORM_NAME_LENGTH"/>
>+        <enum value="0x8A3A" name="GL_UNIFORM_BLOCK_INDEX"/>
>+        <enum value="0x8A3B" name="GL_UNIFORM_OFFSET"/>
>+        <enum value="0x8A3C" name="GL_UNIFORM_ARRAY_STRIDE"/>
>+        <enum value="0x8A3D" name="GL_UNIFORM_MATRIX_STRIDE"/>
>+        <enum value="0x8A3E" name="GL_UNIFORM_IS_ROW_MAJOR"/>
>+        <enum value="0x8A3F" name="GL_UNIFORM_BLOCK_BINDING"/>
>+        <enum value="0x8A40" name="GL_UNIFORM_BLOCK_DATA_SIZE"/>
>+        <enum value="0x8A41" name="GL_UNIFORM_BLOCK_NAME_LENGTH"/>
>+        <enum value="0x8A42" name="GL_UNIFORM_BLOCK_ACTIVE_UNIFORMS"/>
>+        <enum value="0x8A43" name="GL_UNIFORM_BLOCK_ACTIVE_UNIFORM_INDICES"/>
>+        <enum value="0x8A44" name="GL_UNIFORM_BLOCK_REFERENCED_BY_VERTEX_SHADER"/>
>+        <enum value="0x8A45" name="GL_UNIFORM_BLOCK_REFERENCED_BY_GEOMETRY_SHADER"/>
>+        <enum value="0x8A46" name="GL_UNIFORM_BLOCK_REFERENCED_BY_FRAGMENT_SHADER"/>
>+            <unused start="0x8A47" vendor="APPLE"/>
>+        <enum value="0x8A48" name="GL_TEXTURE_SRGB_DECODE_EXT"/>
>+        <enum value="0x8A49" name="GL_DECODE_EXT"/>
>+        <enum value="0x8A4A" name="GL_SKIP_DECODE_EXT"/>
>+            <unused start="0x8A4B" end="0x8A4E" vendor="APPLE"/>
>+        <enum value="0x8A4F" name="GL_PROGRAM_PIPELINE_OBJECT_EXT"/>
>+            <unused start="0x8A50" vendor="APPLE"/>
>+        <enum value="0x8A51" name="GL_RGB_RAW_422_APPLE"/>
>+        <enum value="0x8A52" name="GL_FRAGMENT_SHADER_DISCARDS_SAMPLES_EXT"/>
>+        <enum value="0x8A53" name="GL_SYNC_OBJECT_APPLE"/>
>+        <enum value="0x8A54" name="GL_COMPRESSED_SRGB_PVRTC_2BPPV1_EXT"/>
>+        <enum value="0x8A55" name="GL_COMPRESSED_SRGB_PVRTC_4BPPV1_EXT"/>
>+        <enum value="0x8A56" name="GL_COMPRESSED_SRGB_ALPHA_PVRTC_2BPPV1_EXT"/>
>+        <enum value="0x8A57" name="GL_COMPRESSED_SRGB_ALPHA_PVRTC_4BPPV1_EXT"/>
>+            <unused start="0x8A58" end="0x8A7F" vendor="APPLE"/>
>+    </enums>
>+
>+    <enums namespace="GL" start="0x8A80" end="0x8AEF" vendor="Matrox">
>+            <unused start="0x8A80" end="0x8AEF" vendor="Matrox"/>
>+    </enums>
>+
>+    <enums namespace="GL" start="0x8AF0" end="0x8B2F" vendor="Chromium" comment="For Brian Paul">
>+            <unused start="0x8AF0" end="0x8B2F" vendor="Chromium"/>
>+    </enums>
>+
>+    <enums namespace="GL" start="0x8B30" end="0x8B3F" group="ShaderType" vendor="ARB">
>+        <enum value="0x8B30" name="GL_FRAGMENT_SHADER"/>
>+        <enum value="0x8B30" name="GL_FRAGMENT_SHADER_ARB"/>
>+        <enum value="0x8B31" name="GL_VERTEX_SHADER"/>
>+        <enum value="0x8B31" name="GL_VERTEX_SHADER_ARB"/>
>+            <unused start="0x8B32" end="0x8B3F" comment="For shader types"/>
>+    </enums>
>+
>+    <enums namespace="GL" start="0x8B40" end="0x8B47" group="ContainerType" vendor="ARB">
>+        <enum value="0x8B40" name="GL_PROGRAM_OBJECT_ARB"/>
>+        <enum value="0x8B40" name="GL_PROGRAM_OBJECT_EXT"/>
>+            <unused start="0x8B41" end="0x8B47" comment="For container types"/>
>+    </enums>
>+
>+    <enums namespace="GL" start="0x8B48" end="0x8B4F" vendor="ARB">
>+        <enum value="0x8B48" name="GL_SHADER_OBJECT_ARB"/>
>+        <enum value="0x8B48" name="GL_SHADER_OBJECT_EXT"/>
>+        <enum value="0x8B49" name="GL_MAX_FRAGMENT_UNIFORM_COMPONENTS"/>
>+        <enum value="0x8B49" name="GL_MAX_FRAGMENT_UNIFORM_COMPONENTS_ARB"/>
>+        <enum value="0x8B4A" name="GL_MAX_VERTEX_UNIFORM_COMPONENTS"/>
>+        <enum value="0x8B4A" name="GL_MAX_VERTEX_UNIFORM_COMPONENTS_ARB"/>
>+        <enum value="0x8B4B" name="GL_MAX_VARYING_FLOATS"/>
>+        <enum value="0x8B4B" name="GL_MAX_VARYING_COMPONENTS" alias="MAX_VARYING_FLOATS"/>
>+        <enum value="0x8B4B" name="GL_MAX_VARYING_COMPONENTS_EXT"/>
>+        <enum value="0x8B4B" name="GL_MAX_VARYING_FLOATS_ARB"/>
>+        <enum value="0x8B4C" name="GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS"/>
>+        <enum value="0x8B4C" name="GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS_ARB"/>
>+        <enum value="0x8B4D" name="GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS"/>
>+        <enum value="0x8B4D" name="GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS_ARB"/>
>+        <enum value="0x8B4E" name="GL_OBJECT_TYPE_ARB"/>
>+        <enum value="0x8B4F" name="GL_SHADER_TYPE"/>
>+        <enum value="0x8B4F" name="GL_OBJECT_SUBTYPE_ARB"/>
>+    </enums>
>+
>+    <enums namespace="GL" start="0x8B50" end="0x8B7F" group="AttributeType" vendor="ARB">
>+        <enum value="0x8B50" name="GL_FLOAT_VEC2"/>
>+        <enum value="0x8B50" name="GL_FLOAT_VEC2_ARB"/>
>+        <enum value="0x8B51" name="GL_FLOAT_VEC3"/>
>+        <enum value="0x8B51" name="GL_FLOAT_VEC3_ARB"/>
>+        <enum value="0x8B52" name="GL_FLOAT_VEC4"/>
>+        <enum value="0x8B52" name="GL_FLOAT_VEC4_ARB"/>
>+        <enum value="0x8B53" name="GL_INT_VEC2"/>
>+        <enum value="0x8B53" name="GL_INT_VEC2_ARB"/>
>+        <enum value="0x8B54" name="GL_INT_VEC3"/>
>+        <enum value="0x8B54" name="GL_INT_VEC3_ARB"/>
>+        <enum value="0x8B55" name="GL_INT_VEC4"/>
>+        <enum value="0x8B55" name="GL_INT_VEC4_ARB"/>
>+        <enum value="0x8B56" name="GL_BOOL"/>
>+        <enum value="0x8B56" name="GL_BOOL_ARB"/>
>+        <enum value="0x8B57" name="GL_BOOL_VEC2"/>
>+        <enum value="0x8B57" name="GL_BOOL_VEC2_ARB"/>
>+        <enum value="0x8B58" name="GL_BOOL_VEC3"/>
>+        <enum value="0x8B58" name="GL_BOOL_VEC3_ARB"/>
>+        <enum value="0x8B59" name="GL_BOOL_VEC4"/>
>+        <enum value="0x8B59" name="GL_BOOL_VEC4_ARB"/>
>+        <enum value="0x8B5A" name="GL_FLOAT_MAT2"/>
>+        <enum value="0x8B5A" name="GL_FLOAT_MAT2_ARB"/>
>+        <enum value="0x8B5B" name="GL_FLOAT_MAT3"/>
>+        <enum value="0x8B5B" name="GL_FLOAT_MAT3_ARB"/>
>+        <enum value="0x8B5C" name="GL_FLOAT_MAT4"/>
>+        <enum value="0x8B5C" name="GL_FLOAT_MAT4_ARB"/>
>+        <enum value="0x8B5D" name="GL_SAMPLER_1D"/>
>+        <enum value="0x8B5D" name="GL_SAMPLER_1D_ARB"/>
>+        <enum value="0x8B5E" name="GL_SAMPLER_2D"/>
>+        <enum value="0x8B5E" name="GL_SAMPLER_2D_ARB"/>
>+        <enum value="0x8B5F" name="GL_SAMPLER_3D"/>
>+        <enum value="0x8B5F" name="GL_SAMPLER_3D_ARB"/>
>+        <enum value="0x8B5F" name="GL_SAMPLER_3D_OES"/>
>+        <enum value="0x8B60" name="GL_SAMPLER_CUBE"/>
>+        <enum value="0x8B60" name="GL_SAMPLER_CUBE_ARB"/>
>+        <enum value="0x8B61" name="GL_SAMPLER_1D_SHADOW"/>
>+        <enum value="0x8B61" name="GL_SAMPLER_1D_SHADOW_ARB"/>
>+        <enum value="0x8B62" name="GL_SAMPLER_2D_SHADOW"/>
>+        <enum value="0x8B62" name="GL_SAMPLER_2D_SHADOW_ARB"/>
>+        <enum value="0x8B62" name="GL_SAMPLER_2D_SHADOW_EXT"/>
>+        <enum value="0x8B63" name="GL_SAMPLER_2D_RECT"/>
>+        <enum value="0x8B63" name="GL_SAMPLER_2D_RECT_ARB"/>
>+        <enum value="0x8B64" name="GL_SAMPLER_2D_RECT_SHADOW"/>
>+        <enum value="0x8B64" name="GL_SAMPLER_2D_RECT_SHADOW_ARB"/>
>+        <enum value="0x8B65" name="GL_FLOAT_MAT2x3"/>
>+        <enum value="0x8B65" name="GL_FLOAT_MAT2x3_NV"/>
>+        <enum value="0x8B66" name="GL_FLOAT_MAT2x4"/>
>+        <enum value="0x8B66" name="GL_FLOAT_MAT2x4_NV"/>
>+        <enum value="0x8B67" name="GL_FLOAT_MAT3x2"/>
>+        <enum value="0x8B67" name="GL_FLOAT_MAT3x2_NV"/>
>+        <enum value="0x8B68" name="GL_FLOAT_MAT3x4"/>
>+        <enum value="0x8B68" name="GL_FLOAT_MAT3x4_NV"/>
>+        <enum value="0x8B69" name="GL_FLOAT_MAT4x2"/>
>+        <enum value="0x8B69" name="GL_FLOAT_MAT4x2_NV"/>
>+        <enum value="0x8B6A" name="GL_FLOAT_MAT4x3"/>
>+        <enum value="0x8B6A" name="GL_FLOAT_MAT4x3_NV"/>
>+            <unused start="0x8B6B" end="0x8B7F" comment="For attribute types"/>
>+    </enums>
>+
>+    <enums namespace="GL" start="0x8B80" end="0x8B8F" vendor="ARB">
>+        <enum value="0x8B80" name="GL_DELETE_STATUS"/>
>+        <enum value="0x8B80" name="GL_OBJECT_DELETE_STATUS_ARB"/>
>+        <enum value="0x8B81" name="GL_COMPILE_STATUS"/>
>+        <enum value="0x8B81" name="GL_OBJECT_COMPILE_STATUS_ARB"/>
>+        <enum value="0x8B82" name="GL_LINK_STATUS"/>
>+        <enum value="0x8B82" name="GL_OBJECT_LINK_STATUS_ARB"/>
>+        <enum value="0x8B83" name="GL_VALIDATE_STATUS"/>
>+        <enum value="0x8B83" name="GL_OBJECT_VALIDATE_STATUS_ARB"/>
>+        <enum value="0x8B84" name="GL_INFO_LOG_LENGTH"/>
>+        <enum value="0x8B84" name="GL_OBJECT_INFO_LOG_LENGTH_ARB"/>
>+        <enum value="0x8B85" name="GL_ATTACHED_SHADERS"/>
>+        <enum value="0x8B85" name="GL_OBJECT_ATTACHED_OBJECTS_ARB"/>
>+        <enum value="0x8B86" name="GL_ACTIVE_UNIFORMS"/>
>+        <enum value="0x8B86" name="GL_OBJECT_ACTIVE_UNIFORMS_ARB"/>
>+        <enum value="0x8B87" name="GL_ACTIVE_UNIFORM_MAX_LENGTH"/>
>+        <enum value="0x8B87" name="GL_OBJECT_ACTIVE_UNIFORM_MAX_LENGTH_ARB"/>
>+        <enum value="0x8B88" name="GL_SHADER_SOURCE_LENGTH"/>
>+        <enum value="0x8B88" name="GL_OBJECT_SHADER_SOURCE_LENGTH_ARB"/>
>+        <enum value="0x8B89" name="GL_ACTIVE_ATTRIBUTES"/>
>+        <enum value="0x8B89" name="GL_OBJECT_ACTIVE_ATTRIBUTES_ARB"/>
>+        <enum value="0x8B8A" name="GL_ACTIVE_ATTRIBUTE_MAX_LENGTH"/>
>+        <enum value="0x8B8A" name="GL_OBJECT_ACTIVE_ATTRIBUTE_MAX_LENGTH_ARB"/>
>+        <enum value="0x8B8B" name="GL_FRAGMENT_SHADER_DERIVATIVE_HINT"/>
>+        <enum value="0x8B8B" name="GL_FRAGMENT_SHADER_DERIVATIVE_HINT_ARB"/>
>+        <enum value="0x8B8B" name="GL_FRAGMENT_SHADER_DERIVATIVE_HINT_OES"/>
>+        <enum value="0x8B8C" name="GL_SHADING_LANGUAGE_VERSION"/>
>+        <enum value="0x8B8C" name="GL_SHADING_LANGUAGE_VERSION_ARB"/>
>+        <enum value="0x8B8D" name="GL_CURRENT_PROGRAM"/>
>+        <enum value="0x8B8D" api="gl" name="GL_ACTIVE_PROGRAM_EXT" alias="GL_CURRENT_PROGRAM" comment="For the OpenGL version of EXT_separate_shader_objects"/>
>+            <unused start="0x8B8E" end="0x8B8F" vendor="ARB"/>
>+    </enums>
>+
>+    <enums namespace="GL" start="0x8B90" end="0x8B9F" vendor="OES">
>+        <enum value="0x8B90" name="GL_PALETTE4_RGB8_OES"/>
>+        <enum value="0x8B91" name="GL_PALETTE4_RGBA8_OES"/>
>+        <enum value="0x8B92" name="GL_PALETTE4_R5_G6_B5_OES"/>
>+        <enum value="0x8B93" name="GL_PALETTE4_RGBA4_OES"/>
>+        <enum value="0x8B94" name="GL_PALETTE4_RGB5_A1_OES"/>
>+        <enum value="0x8B95" name="GL_PALETTE8_RGB8_OES"/>
>+        <enum value="0x8B96" name="GL_PALETTE8_RGBA8_OES"/>
>+        <enum value="0x8B97" name="GL_PALETTE8_R5_G6_B5_OES"/>
>+        <enum value="0x8B98" name="GL_PALETTE8_RGBA4_OES"/>
>+        <enum value="0x8B99" name="GL_PALETTE8_RGB5_A1_OES"/>
>+        <enum value="0x8B9A" name="GL_IMPLEMENTATION_COLOR_READ_TYPE"/>
>+        <enum value="0x8B9A" name="GL_IMPLEMENTATION_COLOR_READ_TYPE_OES"/>
>+        <enum value="0x8B9B" name="GL_IMPLEMENTATION_COLOR_READ_FORMAT"/>
>+        <enum value="0x8B9B" name="GL_IMPLEMENTATION_COLOR_READ_FORMAT_OES"/>
>+        <enum value="0x8B9C" name="GL_POINT_SIZE_ARRAY_OES"/>
>+        <enum value="0x8B9D" name="GL_TEXTURE_CROP_RECT_OES"/>
>+        <enum value="0x8B9E" name="GL_MATRIX_INDEX_ARRAY_BUFFER_BINDING_OES"/>
>+        <enum value="0x8B9F" name="GL_POINT_SIZE_ARRAY_BUFFER_BINDING_OES"/>
>+    </enums>
>+
>+    <enums namespace="GL" start="0x8BA0" end="0x8BAF" vendor="Seaweed">
>+            <unused start="0x8BA0" end="0x8BAF" vendor="Seaweed"/>
>+    </enums>
>+
>+    <enums namespace="GL" start="0x8BB0" end="0x8BBF" vendor="MESA">
>+        <enum value="0x8BB0" name="GL_FRAGMENT_PROGRAM_POSITION_MESA"/>
>+        <enum value="0x8BB1" name="GL_FRAGMENT_PROGRAM_CALLBACK_MESA"/>
>+        <enum value="0x8BB2" name="GL_FRAGMENT_PROGRAM_CALLBACK_FUNC_MESA"/>
>+        <enum value="0x8BB3" name="GL_FRAGMENT_PROGRAM_CALLBACK_DATA_MESA"/>
>+        <enum value="0x8BB4" name="GL_VERTEX_PROGRAM_POSITION_MESA"/>
>+        <enum value="0x8BB5" name="GL_VERTEX_PROGRAM_CALLBACK_MESA"/>
>+        <enum value="0x8BB6" name="GL_VERTEX_PROGRAM_CALLBACK_FUNC_MESA"/>
>+        <enum value="0x8BB7" name="GL_VERTEX_PROGRAM_CALLBACK_DATA_MESA"/>
>+        <enum value="0x8BB8" name="GL_TILE_RASTER_ORDER_FIXED_MESA"/>
>+        <enum value="0x8BB9" name="GL_TILE_RASTER_ORDER_INCREASING_X_MESA"/>
>+        <enum value="0x8BBA" name="GL_TILE_RASTER_ORDER_INCREASING_Y_MESA"/>
>+    </enums>
>+
>+    <enums namespace="GL" start="0x8BC0" end="0x8BFF" vendor="QCOM" comment="Reassigned from AMD to QCOM">
>+        <enum value="0x8BC0" name="GL_COUNTER_TYPE_AMD"/>
>+        <enum value="0x8BC1" name="GL_COUNTER_RANGE_AMD"/>
>+        <enum value="0x8BC2" name="GL_UNSIGNED_INT64_AMD"/>
>+        <enum value="0x8BC3" name="GL_PERCENTAGE_AMD"/>
>+        <enum value="0x8BC4" name="GL_PERFMON_RESULT_AVAILABLE_AMD"/>
>+        <enum value="0x8BC5" name="GL_PERFMON_RESULT_SIZE_AMD"/>
>+        <enum value="0x8BC6" name="GL_PERFMON_RESULT_AMD"/>
>+            <unused start="0x8BC7" end="0x8BD1" vendor="QCOM"/>
>+        <enum value="0x8BD2" name="GL_TEXTURE_WIDTH_QCOM"/>
>+        <enum value="0x8BD3" name="GL_TEXTURE_HEIGHT_QCOM"/>
>+        <enum value="0x8BD4" name="GL_TEXTURE_DEPTH_QCOM"/>
>+        <enum value="0x8BD5" name="GL_TEXTURE_INTERNAL_FORMAT_QCOM"/>
>+        <enum value="0x8BD6" name="GL_TEXTURE_FORMAT_QCOM"/>
>+        <enum value="0x8BD7" name="GL_TEXTURE_TYPE_QCOM"/>
>+        <enum value="0x8BD8" name="GL_TEXTURE_IMAGE_VALID_QCOM"/>
>+        <enum value="0x8BD9" name="GL_TEXTURE_NUM_LEVELS_QCOM"/>
>+        <enum value="0x8BDA" name="GL_TEXTURE_TARGET_QCOM"/>
>+        <enum value="0x8BDB" name="GL_TEXTURE_OBJECT_VALID_QCOM"/>
>+        <enum value="0x8BDC" name="GL_STATE_RESTORE"/>
>+            <unused start="0x8BDD" end="0x8BE6" vendor="QCOM"/>
>+        <enum value="0x8BE7" name="GL_SAMPLER_EXTERNAL_2D_Y2Y_EXT"/>
>+            <unused start="0x8BE8" end="0x8BEF" vendor="QCOM"/>
>+        <enum value="0x8BFA" name="GL_TEXTURE_PROTECTED_EXT"/>
>+        <enum value="0x8BFB" name="GL_TEXTURE_FOVEATED_FEATURE_BITS_QCOM"/>
>+        <enum value="0x8BFC" name="GL_TEXTURE_FOVEATED_MIN_PIXEL_DENSITY_QCOM"/>
>+        <enum value="0x8BFD" name="GL_TEXTURE_FOVEATED_FEATURE_QUERY_QCOM"/>
>+        <enum value="0x8BFE" name="GL_TEXTURE_FOVEATED_NUM_FOCAL_POINTS_QUERY_QCOM"/>
>+        <enum value="0x8BFF" name="GL_FRAMEBUFFER_INCOMPLETE_FOVEATION_QCOM"/>
>+    </enums>
>+
>+    <enums namespace="GL" start="0x8C00" end="0x8C0F" vendor="IMG">
>+        <enum value="0x8C00" name="GL_COMPRESSED_RGB_PVRTC_4BPPV1_IMG"/>
>+        <enum value="0x8C01" name="GL_COMPRESSED_RGB_PVRTC_2BPPV1_IMG"/>
>+        <enum value="0x8C02" name="GL_COMPRESSED_RGBA_PVRTC_4BPPV1_IMG"/>
>+        <enum value="0x8C03" name="GL_COMPRESSED_RGBA_PVRTC_2BPPV1_IMG"/>
>+        <enum value="0x8C04" name="GL_MODULATE_COLOR_IMG"/>
>+        <enum value="0x8C05" name="GL_RECIP_ADD_SIGNED_ALPHA_IMG"/>
>+        <enum value="0x8C06" name="GL_TEXTURE_ALPHA_MODULATE_IMG"/>
>+        <enum value="0x8C07" name="GL_FACTOR_ALPHA_MODULATE_IMG"/>
>+        <enum value="0x8C08" name="GL_FRAGMENT_ALPHA_MODULATE_IMG"/>
>+        <enum value="0x8C09" name="GL_ADD_BLEND_IMG"/>
>+        <enum value="0x8C0A" name="GL_SGX_BINARY_IMG"/>
>+            <unused start="0x8C0B" end="0x8C0F" vendor="IMG"/>
>+    </enums>
>+
>+    <enums namespace="GL" start="0x8C10" end="0x8C8F" vendor="NV" comment="For Pat Brown">
>+        <enum value="0x8C10" name="GL_TEXTURE_RED_TYPE"/>
>+        <enum value="0x8C10" name="GL_TEXTURE_RED_TYPE_ARB"/>
>+        <enum value="0x8C11" name="GL_TEXTURE_GREEN_TYPE"/>
>+        <enum value="0x8C11" name="GL_TEXTURE_GREEN_TYPE_ARB"/>
>+        <enum value="0x8C12" name="GL_TEXTURE_BLUE_TYPE"/>
>+        <enum value="0x8C12" name="GL_TEXTURE_BLUE_TYPE_ARB"/>
>+        <enum value="0x8C13" name="GL_TEXTURE_ALPHA_TYPE"/>
>+        <enum value="0x8C13" name="GL_TEXTURE_ALPHA_TYPE_ARB"/>
>+        <enum value="0x8C14" name="GL_TEXTURE_LUMINANCE_TYPE"/>
>+        <enum value="0x8C14" name="GL_TEXTURE_LUMINANCE_TYPE_ARB"/>
>+        <enum value="0x8C15" name="GL_TEXTURE_INTENSITY_TYPE"/>
>+        <enum value="0x8C15" name="GL_TEXTURE_INTENSITY_TYPE_ARB"/>
>+        <enum value="0x8C16" name="GL_TEXTURE_DEPTH_TYPE"/>
>+        <enum value="0x8C16" name="GL_TEXTURE_DEPTH_TYPE_ARB"/>
>+        <enum value="0x8C17" name="GL_UNSIGNED_NORMALIZED"/>
>+        <enum value="0x8C17" name="GL_UNSIGNED_NORMALIZED_ARB"/>
>+        <enum value="0x8C17" name="GL_UNSIGNED_NORMALIZED_EXT"/>
>+        <enum value="0x8C18" name="GL_TEXTURE_1D_ARRAY"/>
>+        <enum value="0x8C18" name="GL_TEXTURE_1D_ARRAY_EXT"/>
>+        <enum value="0x8C19" name="GL_PROXY_TEXTURE_1D_ARRAY"/>
>+        <enum value="0x8C19" name="GL_PROXY_TEXTURE_1D_ARRAY_EXT"/>
>+        <enum value="0x8C1A" name="GL_TEXTURE_2D_ARRAY"/>
>+        <enum value="0x8C1A" name="GL_TEXTURE_2D_ARRAY_EXT"/>
>+        <enum value="0x8C1B" name="GL_PROXY_TEXTURE_2D_ARRAY"/>
>+        <enum value="0x8C1B" name="GL_PROXY_TEXTURE_2D_ARRAY_EXT"/>
>+        <enum value="0x8C1C" name="GL_TEXTURE_BINDING_1D_ARRAY"/>
>+        <enum value="0x8C1C" name="GL_TEXTURE_BINDING_1D_ARRAY_EXT"/>
>+        <enum value="0x8C1D" name="GL_TEXTURE_BINDING_2D_ARRAY"/>
>+        <enum value="0x8C1D" name="GL_TEXTURE_BINDING_2D_ARRAY_EXT"/>
>+            <unused start="0x8C1E" end="0x8C25" vendor="NV"/>
>+        <enum value="0x8C26" name="GL_GEOMETRY_PROGRAM_NV"/>
>+        <enum value="0x8C27" name="GL_MAX_PROGRAM_OUTPUT_VERTICES_NV"/>
>+        <enum value="0x8C28" name="GL_MAX_PROGRAM_TOTAL_OUTPUT_COMPONENTS_NV"/>
>+        <enum value="0x8C29" name="GL_MAX_GEOMETRY_TEXTURE_IMAGE_UNITS"/>
>+        <enum value="0x8C29" name="GL_MAX_GEOMETRY_TEXTURE_IMAGE_UNITS_ARB"/>
>+        <enum value="0x8C29" name="GL_MAX_GEOMETRY_TEXTURE_IMAGE_UNITS_EXT"/>
>+        <enum value="0x8C29" name="GL_MAX_GEOMETRY_TEXTURE_IMAGE_UNITS_OES"/>
>+        <enum value="0x8C2A" name="GL_TEXTURE_BUFFER"/>
>+        <enum value="0x8C2A" name="GL_TEXTURE_BUFFER_ARB"/>
>+        <enum value="0x8C2A" name="GL_TEXTURE_BUFFER_EXT"/>
>+        <enum value="0x8C2A" name="GL_TEXTURE_BUFFER_OES"/>
>+        <enum value="0x8C2A" name="GL_TEXTURE_BUFFER_BINDING" comment="Equivalent to GL_TEXTURE_BUFFER_ARB query, but named more consistently"/>
>+        <enum value="0x8C2A" name="GL_TEXTURE_BUFFER_BINDING_EXT"/>
>+        <enum value="0x8C2A" name="GL_TEXTURE_BUFFER_BINDING_OES"/>
>+        <enum value="0x8C2B" name="GL_MAX_TEXTURE_BUFFER_SIZE"/>
>+        <enum value="0x8C2B" name="GL_MAX_TEXTURE_BUFFER_SIZE_ARB"/>
>+        <enum value="0x8C2B" name="GL_MAX_TEXTURE_BUFFER_SIZE_EXT"/>
>+        <enum value="0x8C2B" name="GL_MAX_TEXTURE_BUFFER_SIZE_OES"/>
>+        <enum value="0x8C2C" name="GL_TEXTURE_BINDING_BUFFER"/>
>+        <enum value="0x8C2C" name="GL_TEXTURE_BINDING_BUFFER_ARB"/>
>+        <enum value="0x8C2C" name="GL_TEXTURE_BINDING_BUFFER_EXT"/>
>+        <enum value="0x8C2C" name="GL_TEXTURE_BINDING_BUFFER_OES"/>
>+        <enum value="0x8C2D" name="GL_TEXTURE_BUFFER_DATA_STORE_BINDING"/>
>+        <enum value="0x8C2D" name="GL_TEXTURE_BUFFER_DATA_STORE_BINDING_ARB"/>
>+        <enum value="0x8C2D" name="GL_TEXTURE_BUFFER_DATA_STORE_BINDING_EXT"/>
>+        <enum value="0x8C2D" name="GL_TEXTURE_BUFFER_DATA_STORE_BINDING_OES"/>
>+        <enum value="0x8C2E" name="GL_TEXTURE_BUFFER_FORMAT_ARB"/>
>+        <enum value="0x8C2E" name="GL_TEXTURE_BUFFER_FORMAT_EXT"/>
>+        <enum value="0x8C2F" name="GL_ANY_SAMPLES_PASSED"/>
>+        <enum value="0x8C2F" name="GL_ANY_SAMPLES_PASSED_EXT"/>
>+            <unused start="0x8C30" end="0x8C35" vendor="NV"/>
>+        <enum value="0x8C36" name="GL_SAMPLE_SHADING"/>
>+        <enum value="0x8C36" name="GL_SAMPLE_SHADING_ARB"/>
>+        <enum value="0x8C36" name="GL_SAMPLE_SHADING_OES"/>
>+        <enum value="0x8C37" name="GL_MIN_SAMPLE_SHADING_VALUE"/>
>+        <enum value="0x8C37" name="GL_MIN_SAMPLE_SHADING_VALUE_ARB"/>
>+        <enum value="0x8C37" name="GL_MIN_SAMPLE_SHADING_VALUE_OES"/>
>+            <unused start="0x8C38" end="0x8C39" vendor="NV"/>
>+        <enum value="0x8C3A" name="GL_R11F_G11F_B10F"/>
>+        <enum value="0x8C3A" name="GL_R11F_G11F_B10F_APPLE"/>
>+        <enum value="0x8C3A" name="GL_R11F_G11F_B10F_EXT"/>
>+        <enum value="0x8C3B" name="GL_UNSIGNED_INT_10F_11F_11F_REV"/>
>+        <enum value="0x8C3B" name="GL_UNSIGNED_INT_10F_11F_11F_REV_APPLE"/>
>+        <enum value="0x8C3B" name="GL_UNSIGNED_INT_10F_11F_11F_REV_EXT"/>
>+        <enum value="0x8C3C" name="GL_RGBA_SIGNED_COMPONENTS_EXT"/>
>+        <enum value="0x8C3D" name="GL_RGB9_E5"/>
>+        <enum value="0x8C3D" name="GL_RGB9_E5_APPLE"/>
>+        <enum value="0x8C3D" name="GL_RGB9_E5_EXT"/>
>+        <enum value="0x8C3E" name="GL_UNSIGNED_INT_5_9_9_9_REV"/>
>+        <enum value="0x8C3E" name="GL_UNSIGNED_INT_5_9_9_9_REV_APPLE"/>
>+        <enum value="0x8C3E" name="GL_UNSIGNED_INT_5_9_9_9_REV_EXT"/>
>+        <enum value="0x8C3F" name="GL_TEXTURE_SHARED_SIZE"/>
>+        <enum value="0x8C3F" name="GL_TEXTURE_SHARED_SIZE_EXT"/>
>+        <enum value="0x8C40" name="GL_SRGB"/>
>+        <enum value="0x8C40" name="GL_SRGB_EXT"/>
>+        <enum value="0x8C41" name="GL_SRGB8"/>
>+        <enum value="0x8C41" name="GL_SRGB8_EXT"/>
>+        <enum value="0x8C41" name="GL_SRGB8_NV"/>
>+        <enum value="0x8C42" name="GL_SRGB_ALPHA"/>
>+        <enum value="0x8C42" name="GL_SRGB_ALPHA_EXT"/>
>+        <enum value="0x8C43" name="GL_SRGB8_ALPHA8"/>
>+        <enum value="0x8C43" name="GL_SRGB8_ALPHA8_EXT"/>
>+        <enum value="0x8C44" name="GL_SLUMINANCE_ALPHA"/>
>+        <enum value="0x8C44" name="GL_SLUMINANCE_ALPHA_EXT"/>
>+        <enum value="0x8C44" name="GL_SLUMINANCE_ALPHA_NV"/>
>+        <enum value="0x8C45" name="GL_SLUMINANCE8_ALPHA8"/>
>+        <enum value="0x8C45" name="GL_SLUMINANCE8_ALPHA8_EXT"/>
>+        <enum value="0x8C45" name="GL_SLUMINANCE8_ALPHA8_NV"/>
>+        <enum value="0x8C46" name="GL_SLUMINANCE"/>
>+        <enum value="0x8C46" name="GL_SLUMINANCE_EXT"/>
>+        <enum value="0x8C46" name="GL_SLUMINANCE_NV"/>
>+        <enum value="0x8C47" name="GL_SLUMINANCE8"/>
>+        <enum value="0x8C47" name="GL_SLUMINANCE8_EXT"/>
>+        <enum value="0x8C47" name="GL_SLUMINANCE8_NV"/>
>+        <enum value="0x8C48" name="GL_COMPRESSED_SRGB"/>
>+        <enum value="0x8C48" name="GL_COMPRESSED_SRGB_EXT"/>
>+        <enum value="0x8C49" name="GL_COMPRESSED_SRGB_ALPHA"/>
>+        <enum value="0x8C49" name="GL_COMPRESSED_SRGB_ALPHA_EXT"/>
>+        <enum value="0x8C4A" name="GL_COMPRESSED_SLUMINANCE"/>
>+        <enum value="0x8C4A" name="GL_COMPRESSED_SLUMINANCE_EXT"/>
>+        <enum value="0x8C4B" name="GL_COMPRESSED_SLUMINANCE_ALPHA"/>
>+        <enum value="0x8C4B" name="GL_COMPRESSED_SLUMINANCE_ALPHA_EXT"/>
>+        <enum value="0x8C4C" name="GL_COMPRESSED_SRGB_S3TC_DXT1_EXT"/>
>+        <enum value="0x8C4C" name="GL_COMPRESSED_SRGB_S3TC_DXT1_NV"/>
>+        <enum value="0x8C4D" name="GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT1_EXT"/>
>+        <enum value="0x8C4D" name="GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT1_NV"/>
>+        <enum value="0x8C4E" name="GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT3_EXT"/>
>+        <enum value="0x8C4E" name="GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT3_NV"/>
>+        <enum value="0x8C4F" name="GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT5_EXT"/>
>+        <enum value="0x8C4F" name="GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT5_NV"/>
>+            <unused start="0x8C50" end="0x8C6F" vendor="NV"/>
>+        <enum value="0x8C70" name="GL_COMPRESSED_LUMINANCE_LATC1_EXT"/>
>+        <enum value="0x8C71" name="GL_COMPRESSED_SIGNED_LUMINANCE_LATC1_EXT"/>
>+        <enum value="0x8C72" name="GL_COMPRESSED_LUMINANCE_ALPHA_LATC2_EXT"/>
>+        <enum value="0x8C73" name="GL_COMPRESSED_SIGNED_LUMINANCE_ALPHA_LATC2_EXT"/>
>+        <enum value="0x8C74" name="GL_TESS_CONTROL_PROGRAM_PARAMETER_BUFFER_NV"/>
>+        <enum value="0x8C75" name="GL_TESS_EVALUATION_PROGRAM_PARAMETER_BUFFER_NV"/>
>+        <enum value="0x8C76" name="GL_TRANSFORM_FEEDBACK_VARYING_MAX_LENGTH"/>
>+        <enum value="0x8C76" name="GL_TRANSFORM_FEEDBACK_VARYING_MAX_LENGTH_EXT"/>
>+        <enum value="0x8C77" name="GL_BACK_PRIMARY_COLOR_NV"/>
>+        <enum value="0x8C78" name="GL_BACK_SECONDARY_COLOR_NV"/>
>+        <enum value="0x8C79" name="GL_TEXTURE_COORD_NV"/>
>+        <enum value="0x8C7A" name="GL_CLIP_DISTANCE_NV"/>
>+        <enum value="0x8C7B" name="GL_VERTEX_ID_NV"/>
>+        <enum value="0x8C7C" name="GL_PRIMITIVE_ID_NV"/>
>+        <enum value="0x8C7D" name="GL_GENERIC_ATTRIB_NV"/>
>+        <enum value="0x8C7E" name="GL_TRANSFORM_FEEDBACK_ATTRIBS_NV"/>
>+        <enum value="0x8C7F" name="GL_TRANSFORM_FEEDBACK_BUFFER_MODE"/>
>+        <enum value="0x8C7F" name="GL_TRANSFORM_FEEDBACK_BUFFER_MODE_EXT"/>
>+        <enum value="0x8C7F" name="GL_TRANSFORM_FEEDBACK_BUFFER_MODE_NV"/>
>+        <enum value="0x8C80" name="GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_COMPONENTS"/>
>+        <enum value="0x8C80" name="GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_COMPONENTS_EXT"/>
>+        <enum value="0x8C80" name="GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_COMPONENTS_NV"/>
>+        <enum value="0x8C81" name="GL_ACTIVE_VARYINGS_NV"/>
>+        <enum value="0x8C82" name="GL_ACTIVE_VARYING_MAX_LENGTH_NV"/>
>+        <enum value="0x8C83" name="GL_TRANSFORM_FEEDBACK_VARYINGS"/>
>+        <enum value="0x8C83" name="GL_TRANSFORM_FEEDBACK_VARYINGS_EXT"/>
>+        <enum value="0x8C83" name="GL_TRANSFORM_FEEDBACK_VARYINGS_NV"/>
>+        <enum value="0x8C84" name="GL_TRANSFORM_FEEDBACK_BUFFER_START"/>
>+        <enum value="0x8C84" name="GL_TRANSFORM_FEEDBACK_BUFFER_START_EXT"/>
>+        <enum value="0x8C84" name="GL_TRANSFORM_FEEDBACK_BUFFER_START_NV"/>
>+        <enum value="0x8C85" name="GL_TRANSFORM_FEEDBACK_BUFFER_SIZE"/>
>+        <enum value="0x8C85" name="GL_TRANSFORM_FEEDBACK_BUFFER_SIZE_EXT"/>
>+        <enum value="0x8C85" name="GL_TRANSFORM_FEEDBACK_BUFFER_SIZE_NV"/>
>+        <enum value="0x8C86" name="GL_TRANSFORM_FEEDBACK_RECORD_NV"/>
>+        <enum value="0x8C87" name="GL_PRIMITIVES_GENERATED"/>
>+        <enum value="0x8C87" name="GL_PRIMITIVES_GENERATED_EXT"/>
>+        <enum value="0x8C87" name="GL_PRIMITIVES_GENERATED_NV"/>
>+        <enum value="0x8C87" name="GL_PRIMITIVES_GENERATED_OES"/>
>+        <enum value="0x8C88" name="GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN"/>
>+        <enum value="0x8C88" name="GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN_EXT"/>
>+        <enum value="0x8C88" name="GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN_NV"/>
>+        <enum value="0x8C89" name="GL_RASTERIZER_DISCARD"/>
>+        <enum value="0x8C89" name="GL_RASTERIZER_DISCARD_EXT"/>
>+        <enum value="0x8C89" name="GL_RASTERIZER_DISCARD_NV"/>
>+        <enum value="0x8C8A" name="GL_MAX_TRANSFORM_FEEDBACK_INTERLEAVED_COMPONENTS"/>
>+        <enum value="0x8C8A" name="GL_MAX_TRANSFORM_FEEDBACK_INTERLEAVED_COMPONENTS_EXT"/>
>+        <enum value="0x8C8A" name="GL_MAX_TRANSFORM_FEEDBACK_INTERLEAVED_COMPONENTS_NV"/>
>+        <enum value="0x8C8B" name="GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_ATTRIBS"/>
>+        <enum value="0x8C8B" name="GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_ATTRIBS_EXT"/>
>+        <enum value="0x8C8B" name="GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_ATTRIBS_NV"/>
>+        <enum value="0x8C8C" name="GL_INTERLEAVED_ATTRIBS"/>
>+        <enum value="0x8C8C" name="GL_INTERLEAVED_ATTRIBS_EXT"/>
>+        <enum value="0x8C8C" name="GL_INTERLEAVED_ATTRIBS_NV"/>
>+        <enum value="0x8C8D" name="GL_SEPARATE_ATTRIBS"/>
>+        <enum value="0x8C8D" name="GL_SEPARATE_ATTRIBS_EXT"/>
>+        <enum value="0x8C8D" name="GL_SEPARATE_ATTRIBS_NV"/>
>+        <enum value="0x8C8E" name="GL_TRANSFORM_FEEDBACK_BUFFER"/>
>+        <enum value="0x8C8E" name="GL_TRANSFORM_FEEDBACK_BUFFER_EXT"/>
>+        <enum value="0x8C8E" name="GL_TRANSFORM_FEEDBACK_BUFFER_NV"/>
>+        <enum value="0x8C8F" name="GL_TRANSFORM_FEEDBACK_BUFFER_BINDING"/>
>+        <enum value="0x8C8F" name="GL_TRANSFORM_FEEDBACK_BUFFER_BINDING_EXT"/>
>+        <enum value="0x8C8F" name="GL_TRANSFORM_FEEDBACK_BUFFER_BINDING_NV"/>
>+    </enums>
>+
>+    <enums namespace="GL" start="0x8C90" end="0x8C9F" vendor="QCOM" comment="For Affie Munshi. Reassigned from AMD to QCOM (bug 5874)">
>+            <unused start="0x8C90" end="0x8C91" vendor="QCOM"/>
>+        <enum value="0x8C92" name="GL_ATC_RGB_AMD"/>
>+        <enum value="0x8C93" name="GL_ATC_RGBA_EXPLICIT_ALPHA_AMD"/>
>+            <unused start="0x8C94" end="0x8C9F" vendor="QCOM"/>
>+    </enums>
>+    <enums namespace="GL" start="0x8CA0" end="0x8CAF" vendor="ARB">
>+        <enum value="0x8CA0" name="GL_POINT_SPRITE_COORD_ORIGIN"/>
>+        <enum value="0x8CA1" name="GL_LOWER_LEFT"/>
>+        <enum value="0x8CA1" name="GL_LOWER_LEFT_EXT" alias="GL_LOWER_LEFT"/>
>+        <enum value="0x8CA2" name="GL_UPPER_LEFT"/>
>+        <enum value="0x8CA2" name="GL_UPPER_LEFT_EXT" alias="GL_UPPER_LEFT"/>
>+        <enum value="0x8CA3" name="GL_STENCIL_BACK_REF"/>
>+        <enum value="0x8CA4" name="GL_STENCIL_BACK_VALUE_MASK"/>
>+        <enum value="0x8CA5" name="GL_STENCIL_BACK_WRITEMASK"/>
>+        <enum value="0x8CA6" name="GL_DRAW_FRAMEBUFFER_BINDING"/>
>+        <enum value="0x8CA6" name="GL_DRAW_FRAMEBUFFER_BINDING_ANGLE"/>
>+        <enum value="0x8CA6" name="GL_DRAW_FRAMEBUFFER_BINDING_APPLE"/>
>+        <enum value="0x8CA6" name="GL_DRAW_FRAMEBUFFER_BINDING_EXT"/>
>+        <enum value="0x8CA6" name="GL_DRAW_FRAMEBUFFER_BINDING_NV"/>
>+        <enum value="0x8CA6" name="GL_FRAMEBUFFER_BINDING"/>
>+        <enum value="0x8CA6" name="GL_FRAMEBUFFER_BINDING_ANGLE"/>
>+        <enum value="0x8CA6" name="GL_FRAMEBUFFER_BINDING_EXT"/>
>+        <enum value="0x8CA6" name="GL_FRAMEBUFFER_BINDING_OES"/>
>+        <enum value="0x8CA7" name="GL_RENDERBUFFER_BINDING"/>
>+        <enum value="0x8CA7" name="GL_RENDERBUFFER_BINDING_ANGLE"/>
>+        <enum value="0x8CA7" name="GL_RENDERBUFFER_BINDING_EXT"/>
>+        <enum value="0x8CA7" name="GL_RENDERBUFFER_BINDING_OES"/>
>+        <enum value="0x8CA8" name="GL_READ_FRAMEBUFFER"/>
>+        <enum value="0x8CA8" name="GL_READ_FRAMEBUFFER_ANGLE"/>
>+        <enum value="0x8CA8" name="GL_READ_FRAMEBUFFER_APPLE"/>
>+        <enum value="0x8CA8" name="GL_READ_FRAMEBUFFER_EXT"/>
>+        <enum value="0x8CA8" name="GL_READ_FRAMEBUFFER_NV"/>
>+        <enum value="0x8CA9" name="GL_DRAW_FRAMEBUFFER"/>
>+        <enum value="0x8CA9" name="GL_DRAW_FRAMEBUFFER_ANGLE"/>
>+        <enum value="0x8CA9" name="GL_DRAW_FRAMEBUFFER_APPLE"/>
>+        <enum value="0x8CA9" name="GL_DRAW_FRAMEBUFFER_EXT"/>
>+        <enum value="0x8CA9" name="GL_DRAW_FRAMEBUFFER_NV"/>
>+        <enum value="0x8CAA" name="GL_READ_FRAMEBUFFER_BINDING"/>
>+        <enum value="0x8CAA" name="GL_READ_FRAMEBUFFER_BINDING_ANGLE"/>
>+        <enum value="0x8CAA" name="GL_READ_FRAMEBUFFER_BINDING_APPLE"/>
>+        <enum value="0x8CAA" name="GL_READ_FRAMEBUFFER_BINDING_EXT"/>
>+        <enum value="0x8CAA" name="GL_READ_FRAMEBUFFER_BINDING_NV"/>
>+        <enum value="0x8CAB" name="GL_RENDERBUFFER_COVERAGE_SAMPLES_NV"/>
>+        <enum value="0x8CAB" name="GL_RENDERBUFFER_SAMPLES"/>
>+        <enum value="0x8CAB" name="GL_RENDERBUFFER_SAMPLES_ANGLE"/>
>+        <enum value="0x8CAB" name="GL_RENDERBUFFER_SAMPLES_APPLE"/>
>+        <enum value="0x8CAB" name="GL_RENDERBUFFER_SAMPLES_EXT"/>
>+        <enum value="0x8CAB" name="GL_RENDERBUFFER_SAMPLES_NV"/>
>+        <enum value="0x8CAC" name="GL_DEPTH_COMPONENT32F"/>
>+        <enum value="0x8CAD" name="GL_DEPTH32F_STENCIL8"/>
>+            <unused start="0x8CAE" end="0x8CAF" vendor="ARB"/>
>+    </enums>
>+
>+    <enums namespace="GL" start="0x8CB0" end="0x8CCF" vendor="ZiiLabs" comment="For Barthold Lichtenbelt 2004/12/1">
>+            <unused start="0x8CB0" end="0x8CCF" vendor="ZiiLabs"/>
>+    </enums>
>+
>+    <enums namespace="GL" start="0x8CD0" end="0x8D5F" vendor="ARB" comment="Framebuffer object specification + headroom">
>+        <enum value="0x8CD0" name="GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE"/>
>+        <enum value="0x8CD0" name="GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE_EXT"/>
>+        <enum value="0x8CD0" name="GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE_OES"/>
>+        <enum value="0x8CD1" name="GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME"/>
>+        <enum value="0x8CD1" name="GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME_EXT"/>
>+        <enum value="0x8CD1" name="GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME_OES"/>
>+        <enum value="0x8CD2" name="GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL"/>
>+        <enum value="0x8CD2" name="GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL_EXT"/>
>+        <enum value="0x8CD2" name="GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL_OES"/>
>+        <enum value="0x8CD3" name="GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE"/>
>+        <enum value="0x8CD3" name="GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE_EXT"/>
>+        <enum value="0x8CD3" name="GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE_OES"/>
>+        <enum value="0x8CD4" name="GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_3D_ZOFFSET_EXT"/>
>+        <enum value="0x8CD4" name="GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_3D_ZOFFSET_OES"/>
>+        <enum value="0x8CD4" name="GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER"/>
>+        <enum value="0x8CD4" name="GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER_EXT"/>
>+        <enum value="0x8CD5" name="GL_FRAMEBUFFER_COMPLETE"/>
>+        <enum value="0x8CD5" name="GL_FRAMEBUFFER_COMPLETE_EXT"/>
>+        <enum value="0x8CD5" name="GL_FRAMEBUFFER_COMPLETE_OES"/>
>+        <enum value="0x8CD6" name="GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT"/>
>+        <enum value="0x8CD6" name="GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT_EXT"/>
>+        <enum value="0x8CD6" name="GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT_OES"/>
>+        <enum value="0x8CD7" name="GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT"/>
>+        <enum value="0x8CD7" name="GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT_EXT"/>
>+        <enum value="0x8CD7" name="GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT_OES"/>
>+            <unused start="0x8CD8" vendor="ARB" comment="Removed 2005/09/26 in revision #117 of the FBO extension spec"/>
>+            
>+        <enum value="0x8CD9" name="GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS"/>
>+        <enum value="0x8CD9" name="GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS_EXT"/>
>+        <enum value="0x8CD9" name="GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS_OES"/>
>+        <enum value="0x8CDA" name="GL_FRAMEBUFFER_INCOMPLETE_FORMATS_EXT"/>
>+        <enum value="0x8CDA" name="GL_FRAMEBUFFER_INCOMPLETE_FORMATS_OES"/>
>+        <enum value="0x8CDB" name="GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER"/>
>+        <enum value="0x8CDB" name="GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER_EXT"/>
>+        <enum value="0x8CDB" name="GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER_OES"/>
>+        <enum value="0x8CDC" name="GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER"/>
>+        <enum value="0x8CDC" name="GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER_EXT"/>
>+        <enum value="0x8CDC" name="GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER_OES"/>
>+        <enum value="0x8CDD" name="GL_FRAMEBUFFER_UNSUPPORTED"/>
>+        <enum value="0x8CDD" name="GL_FRAMEBUFFER_UNSUPPORTED_EXT"/>
>+        <enum value="0x8CDD" name="GL_FRAMEBUFFER_UNSUPPORTED_OES"/>
>+            <unused start="0x8CDE" vendor="ARB" comment="Removed 2005/05/31 in revision #113 of the FBO extension spec"/>
>+            
>+        <enum value="0x8CDF" name="GL_MAX_COLOR_ATTACHMENTS"/>
>+        <enum value="0x8CDF" name="GL_MAX_COLOR_ATTACHMENTS_EXT"/>
>+        <enum value="0x8CDF" name="GL_MAX_COLOR_ATTACHMENTS_NV"/>
>+        <enum value="0x8CE0" name="GL_COLOR_ATTACHMENT0"/>
>+        <enum value="0x8CE0" name="GL_COLOR_ATTACHMENT0_EXT"/>
>+        <enum value="0x8CE0" name="GL_COLOR_ATTACHMENT0_NV"/>
>+        <enum value="0x8CE0" name="GL_COLOR_ATTACHMENT0_OES"/>
>+        <enum value="0x8CE1" name="GL_COLOR_ATTACHMENT1"/>
>+        <enum value="0x8CE1" name="GL_COLOR_ATTACHMENT1_EXT"/>
>+        <enum value="0x8CE1" name="GL_COLOR_ATTACHMENT1_NV"/>
>+        <enum value="0x8CE2" name="GL_COLOR_ATTACHMENT2"/>
>+        <enum value="0x8CE2" name="GL_COLOR_ATTACHMENT2_EXT"/>
>+        <enum value="0x8CE2" name="GL_COLOR_ATTACHMENT2_NV"/>
>+        <enum value="0x8CE3" name="GL_COLOR_ATTACHMENT3"/>
>+        <enum value="0x8CE3" name="GL_COLOR_ATTACHMENT3_EXT"/>
>+        <enum value="0x8CE3" name="GL_COLOR_ATTACHMENT3_NV"/>
>+        <enum value="0x8CE4" name="GL_COLOR_ATTACHMENT4"/>
>+        <enum value="0x8CE4" name="GL_COLOR_ATTACHMENT4_EXT"/>
>+        <enum value="0x8CE4" name="GL_COLOR_ATTACHMENT4_NV"/>
>+        <enum value="0x8CE5" name="GL_COLOR_ATTACHMENT5"/>
>+        <enum value="0x8CE5" name="GL_COLOR_ATTACHMENT5_EXT"/>
>+        <enum value="0x8CE5" name="GL_COLOR_ATTACHMENT5_NV"/>
>+        <enum value="0x8CE6" name="GL_COLOR_ATTACHMENT6"/>
>+        <enum value="0x8CE6" name="GL_COLOR_ATTACHMENT6_EXT"/>
>+        <enum value="0x8CE6" name="GL_COLOR_ATTACHMENT6_NV"/>
>+        <enum value="0x8CE7" name="GL_COLOR_ATTACHMENT7"/>
>+        <enum value="0x8CE7" name="GL_COLOR_ATTACHMENT7_EXT"/>
>+        <enum value="0x8CE7" name="GL_COLOR_ATTACHMENT7_NV"/>
>+        <enum value="0x8CE8" name="GL_COLOR_ATTACHMENT8"/>
>+        <enum value="0x8CE8" name="GL_COLOR_ATTACHMENT8_EXT"/>
>+        <enum value="0x8CE8" name="GL_COLOR_ATTACHMENT8_NV"/>
>+        <enum value="0x8CE9" name="GL_COLOR_ATTACHMENT9"/>
>+        <enum value="0x8CE9" name="GL_COLOR_ATTACHMENT9_EXT"/>
>+        <enum value="0x8CE9" name="GL_COLOR_ATTACHMENT9_NV"/>
>+        <enum value="0x8CEA" name="GL_COLOR_ATTACHMENT10"/>
>+        <enum value="0x8CEA" name="GL_COLOR_ATTACHMENT10_EXT"/>
>+        <enum value="0x8CEA" name="GL_COLOR_ATTACHMENT10_NV"/>
>+        <enum value="0x8CEB" name="GL_COLOR_ATTACHMENT11"/>
>+        <enum value="0x8CEB" name="GL_COLOR_ATTACHMENT11_EXT"/>
>+        <enum value="0x8CEB" name="GL_COLOR_ATTACHMENT11_NV"/>
>+        <enum value="0x8CEC" name="GL_COLOR_ATTACHMENT12"/>
>+        <enum value="0x8CEC" name="GL_COLOR_ATTACHMENT12_EXT"/>
>+        <enum value="0x8CEC" name="GL_COLOR_ATTACHMENT12_NV"/>
>+        <enum value="0x8CED" name="GL_COLOR_ATTACHMENT13"/>
>+        <enum value="0x8CED" name="GL_COLOR_ATTACHMENT13_EXT"/>
>+        <enum value="0x8CED" name="GL_COLOR_ATTACHMENT13_NV"/>
>+        <enum value="0x8CEE" name="GL_COLOR_ATTACHMENT14"/>
>+        <enum value="0x8CEE" name="GL_COLOR_ATTACHMENT14_EXT"/>
>+        <enum value="0x8CEE" name="GL_COLOR_ATTACHMENT14_NV"/>
>+        <enum value="0x8CEF" name="GL_COLOR_ATTACHMENT15"/>
>+        <enum value="0x8CEF" name="GL_COLOR_ATTACHMENT15_EXT"/>
>+        <enum value="0x8CEF" name="GL_COLOR_ATTACHMENT15_NV"/>
>+        <enum value="0x8CF0" name="GL_COLOR_ATTACHMENT16"/>
>+        <enum value="0x8CF1" name="GL_COLOR_ATTACHMENT17"/>
>+        <enum value="0x8CF2" name="GL_COLOR_ATTACHMENT18"/>
>+        <enum value="0x8CF3" name="GL_COLOR_ATTACHMENT19"/>
>+        <enum value="0x8CF4" name="GL_COLOR_ATTACHMENT20"/>
>+        <enum value="0x8CF5" name="GL_COLOR_ATTACHMENT21"/>
>+        <enum value="0x8CF6" name="GL_COLOR_ATTACHMENT22"/>
>+        <enum value="0x8CF7" name="GL_COLOR_ATTACHMENT23"/>
>+        <enum value="0x8CF8" name="GL_COLOR_ATTACHMENT24"/>
>+        <enum value="0x8CF9" name="GL_COLOR_ATTACHMENT25"/>
>+        <enum value="0x8CFA" name="GL_COLOR_ATTACHMENT26"/>
>+        <enum value="0x8CFB" name="GL_COLOR_ATTACHMENT27"/>
>+        <enum value="0x8CFC" name="GL_COLOR_ATTACHMENT28"/>
>+        <enum value="0x8CFD" name="GL_COLOR_ATTACHMENT29"/>
>+        <enum value="0x8CFE" name="GL_COLOR_ATTACHMENT30"/>
>+        <enum value="0x8CFF" name="GL_COLOR_ATTACHMENT31"/>
>+        <enum value="0x8D00" name="GL_DEPTH_ATTACHMENT"/>
>+        <enum value="0x8D00" name="GL_DEPTH_ATTACHMENT_EXT"/>
>+        <enum value="0x8D00" name="GL_DEPTH_ATTACHMENT_OES"/>
>+            <unused start="0x8D01" end="0x8D1F" vendor="ARB" comment="For depth attachments 16-31"/>
>+        <enum value="0x8D20" name="GL_STENCIL_ATTACHMENT"/>
>+        <enum value="0x8D20" name="GL_STENCIL_ATTACHMENT_EXT"/>
>+        <enum value="0x8D20" name="GL_STENCIL_ATTACHMENT_OES"/>
>+            <unused start="0x8D21" end="0x8D3F" vendor="ARB" comment="For stencil attachments 16-31"/>
>+        <enum value="0x8D40" name="GL_FRAMEBUFFER"/>
>+        <enum value="0x8D40" name="GL_FRAMEBUFFER_EXT"/>
>+        <enum value="0x8D40" name="GL_FRAMEBUFFER_OES"/>
>+        <enum value="0x8D41" name="GL_RENDERBUFFER"/>
>+        <enum value="0x8D41" name="GL_RENDERBUFFER_EXT"/>
>+        <enum value="0x8D41" name="GL_RENDERBUFFER_OES"/>
>+        <enum value="0x8D42" name="GL_RENDERBUFFER_WIDTH"/>
>+        <enum value="0x8D42" name="GL_RENDERBUFFER_WIDTH_EXT"/>
>+        <enum value="0x8D42" name="GL_RENDERBUFFER_WIDTH_OES"/>
>+        <enum value="0x8D43" name="GL_RENDERBUFFER_HEIGHT"/>
>+        <enum value="0x8D43" name="GL_RENDERBUFFER_HEIGHT_EXT"/>
>+        <enum value="0x8D43" name="GL_RENDERBUFFER_HEIGHT_OES"/>
>+        <enum value="0x8D44" name="GL_RENDERBUFFER_INTERNAL_FORMAT"/>
>+        <enum value="0x8D44" name="GL_RENDERBUFFER_INTERNAL_FORMAT_EXT"/>
>+        <enum value="0x8D44" name="GL_RENDERBUFFER_INTERNAL_FORMAT_OES"/>
>+            <unused start="0x8D45" vendor="ARB" comment="Was for GL_STENCIL_INDEX_EXT, but now use core STENCIL_INDEX instead"/>
>+        <enum value="0x8D46" name="GL_STENCIL_INDEX1"/>
>+        <enum value="0x8D46" name="GL_STENCIL_INDEX1_EXT"/>
>+        <enum value="0x8D46" name="GL_STENCIL_INDEX1_OES"/>
>+        <enum value="0x8D47" name="GL_STENCIL_INDEX4"/>
>+        <enum value="0x8D47" name="GL_STENCIL_INDEX4_EXT"/>
>+        <enum value="0x8D47" name="GL_STENCIL_INDEX4_OES"/>
>+        <enum value="0x8D48" name="GL_STENCIL_INDEX8"/>
>+        <enum value="0x8D48" name="GL_STENCIL_INDEX8_EXT"/>
>+        <enum value="0x8D48" name="GL_STENCIL_INDEX8_OES"/>
>+        <enum value="0x8D49" name="GL_STENCIL_INDEX16"/>
>+        <enum value="0x8D49" name="GL_STENCIL_INDEX16_EXT"/>
>+            <unused start="0x8D4A" end="0x8D4F" vendor="ARB" comment="For additional stencil formats"/>
>+        <enum value="0x8D50" name="GL_RENDERBUFFER_RED_SIZE"/>
>+        <enum value="0x8D50" name="GL_RENDERBUFFER_RED_SIZE_EXT"/>
>+        <enum value="0x8D50" name="GL_RENDERBUFFER_RED_SIZE_OES"/>
>+        <enum value="0x8D51" name="GL_RENDERBUFFER_GREEN_SIZE"/>
>+        <enum value="0x8D51" name="GL_RENDERBUFFER_GREEN_SIZE_EXT"/>
>+        <enum value="0x8D51" name="GL_RENDERBUFFER_GREEN_SIZE_OES"/>
>+        <enum value="0x8D52" name="GL_RENDERBUFFER_BLUE_SIZE"/>
>+        <enum value="0x8D52" name="GL_RENDERBUFFER_BLUE_SIZE_EXT"/>
>+        <enum value="0x8D52" name="GL_RENDERBUFFER_BLUE_SIZE_OES"/>
>+        <enum value="0x8D53" name="GL_RENDERBUFFER_ALPHA_SIZE"/>
>+        <enum value="0x8D53" name="GL_RENDERBUFFER_ALPHA_SIZE_EXT"/>
>+        <enum value="0x8D53" name="GL_RENDERBUFFER_ALPHA_SIZE_OES"/>
>+        <enum value="0x8D54" name="GL_RENDERBUFFER_DEPTH_SIZE"/>
>+        <enum value="0x8D54" name="GL_RENDERBUFFER_DEPTH_SIZE_EXT"/>
>+        <enum value="0x8D54" name="GL_RENDERBUFFER_DEPTH_SIZE_OES"/>
>+        <enum value="0x8D55" name="GL_RENDERBUFFER_STENCIL_SIZE"/>
>+        <enum value="0x8D55" name="GL_RENDERBUFFER_STENCIL_SIZE_EXT"/>
>+        <enum value="0x8D55" name="GL_RENDERBUFFER_STENCIL_SIZE_OES"/>
>+        <enum value="0x8D56" name="GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE"/>
>+        <enum value="0x8D56" name="GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE_ANGLE"/>
>+        <enum value="0x8D56" name="GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE_APPLE"/>
>+        <enum value="0x8D56" name="GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE_EXT"/>
>+        <enum value="0x8D56" name="GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE_NV"/>
>+        <enum value="0x8D57" name="GL_MAX_SAMPLES"/>
>+        <enum value="0x8D57" name="GL_MAX_SAMPLES_ANGLE"/>
>+        <enum value="0x8D57" name="GL_MAX_SAMPLES_APPLE"/>
>+        <enum value="0x8D57" name="GL_MAX_SAMPLES_EXT"/>
>+        <enum value="0x8D57" name="GL_MAX_SAMPLES_NV"/>
>+            <unused start="0x8D58" end="0x8D5F" vendor="ARB"/>
>+    </enums>
>+
>+    <enums namespace="GL" start="0x8D60" end="0x8D6F" vendor="OES">
>+        <enum value="0x8D60" name="GL_TEXTURE_GEN_STR_OES"/>
>+        <enum value="0x8D61" name="GL_HALF_FLOAT_OES"/>
>+        <enum value="0x8D62" name="GL_RGB565_OES"/>
>+        <enum value="0x8D62" name="GL_RGB565"/>
>+            <unused start="0x8D63" vendor="OES" comment="Was GL_TEXTURE_IMMUTABLE_LEVELS in draft ES 3.0 spec"/>
>+        <enum value="0x8D64" name="GL_ETC1_RGB8_OES"/>
>+        <enum value="0x8D65" name="GL_TEXTURE_EXTERNAL_OES"/>
>+        <enum value="0x8D66" name="GL_SAMPLER_EXTERNAL_OES"/>
>+        <enum value="0x8D67" name="GL_TEXTURE_BINDING_EXTERNAL_OES"/>
>+        <enum value="0x8D68" name="GL_REQUIRED_TEXTURE_IMAGE_UNITS_OES"/>
>+        <enum value="0x8D69" name="GL_PRIMITIVE_RESTART_FIXED_INDEX"/>
>+        <enum value="0x8D6A" name="GL_ANY_SAMPLES_PASSED_CONSERVATIVE"/>
>+        <enum value="0x8D6A" name="GL_ANY_SAMPLES_PASSED_CONSERVATIVE_EXT"/>
>+        <enum value="0x8D6B" name="GL_MAX_ELEMENT_INDEX"/>
>+        <enum value="0x8D6C" name="GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_SAMPLES_EXT"/>
>+            <unused start="0x8D6D" end="0x8D6F" vendor="OES"/>
>+    </enums>
>+
>+    <enums namespace="GL" start="0x8D70" end="0x8DEF" vendor="NV" comment="For Pat Brown 2005/10/13">
>+        <enum value="0x8D70" name="GL_RGBA32UI"/>
>+        <enum value="0x8D70" name="GL_RGBA32UI_EXT"/>
>+        <enum value="0x8D71" name="GL_RGB32UI"/>
>+        <enum value="0x8D71" name="GL_RGB32UI_EXT"/>
>+        <enum value="0x8D72" name="GL_ALPHA32UI_EXT"/>
>+        <enum value="0x8D73" name="GL_INTENSITY32UI_EXT"/>
>+        <enum value="0x8D74" name="GL_LUMINANCE32UI_EXT"/>
>+        <enum value="0x8D75" name="GL_LUMINANCE_ALPHA32UI_EXT"/>
>+        <enum value="0x8D76" name="GL_RGBA16UI"/>
>+        <enum value="0x8D76" name="GL_RGBA16UI_EXT"/>
>+        <enum value="0x8D77" name="GL_RGB16UI"/>
>+        <enum value="0x8D77" name="GL_RGB16UI_EXT"/>
>+        <enum value="0x8D78" name="GL_ALPHA16UI_EXT"/>
>+        <enum value="0x8D79" name="GL_INTENSITY16UI_EXT"/>
>+        <enum value="0x8D7A" name="GL_LUMINANCE16UI_EXT"/>
>+        <enum value="0x8D7B" name="GL_LUMINANCE_ALPHA16UI_EXT"/>
>+        <enum value="0x8D7C" name="GL_RGBA8UI"/>
>+        <enum value="0x8D7C" name="GL_RGBA8UI_EXT"/>
>+        <enum value="0x8D7D" name="GL_RGB8UI"/>
>+        <enum value="0x8D7D" name="GL_RGB8UI_EXT"/>
>+        <enum value="0x8D7E" name="GL_ALPHA8UI_EXT"/>
>+        <enum value="0x8D7F" name="GL_INTENSITY8UI_EXT"/>
>+        <enum value="0x8D80" name="GL_LUMINANCE8UI_EXT"/>
>+        <enum value="0x8D81" name="GL_LUMINANCE_ALPHA8UI_EXT"/>
>+        <enum value="0x8D82" name="GL_RGBA32I"/>
>+        <enum value="0x8D82" name="GL_RGBA32I_EXT"/>
>+        <enum value="0x8D83" name="GL_RGB32I"/>
>+        <enum value="0x8D83" name="GL_RGB32I_EXT"/>
>+        <enum value="0x8D84" name="GL_ALPHA32I_EXT"/>
>+        <enum value="0x8D85" name="GL_INTENSITY32I_EXT"/>
>+        <enum value="0x8D86" name="GL_LUMINANCE32I_EXT"/>
>+        <enum value="0x8D87" name="GL_LUMINANCE_ALPHA32I_EXT"/>
>+        <enum value="0x8D88" name="GL_RGBA16I"/>
>+        <enum value="0x8D88" name="GL_RGBA16I_EXT"/>
>+        <enum value="0x8D89" name="GL_RGB16I"/>
>+        <enum value="0x8D89" name="GL_RGB16I_EXT"/>
>+        <enum value="0x8D8A" name="GL_ALPHA16I_EXT"/>
>+        <enum value="0x8D8B" name="GL_INTENSITY16I_EXT"/>
>+        <enum value="0x8D8C" name="GL_LUMINANCE16I_EXT"/>
>+        <enum value="0x8D8D" name="GL_LUMINANCE_ALPHA16I_EXT"/>
>+        <enum value="0x8D8E" name="GL_RGBA8I"/>
>+        <enum value="0x8D8E" name="GL_RGBA8I_EXT"/>
>+        <enum value="0x8D8F" name="GL_RGB8I"/>
>+        <enum value="0x8D8F" name="GL_RGB8I_EXT"/>
>+        <enum value="0x8D90" name="GL_ALPHA8I_EXT"/>
>+        <enum value="0x8D91" name="GL_INTENSITY8I_EXT"/>
>+        <enum value="0x8D92" name="GL_LUMINANCE8I_EXT"/>
>+        <enum value="0x8D93" name="GL_LUMINANCE_ALPHA8I_EXT"/>
>+        <enum value="0x8D94" name="GL_RED_INTEGER"/>
>+        <enum value="0x8D94" name="GL_RED_INTEGER_EXT"/>
>+        <enum value="0x8D95" name="GL_GREEN_INTEGER"/>
>+        <enum value="0x8D95" name="GL_GREEN_INTEGER_EXT"/>
>+        <enum value="0x8D96" name="GL_BLUE_INTEGER"/>
>+        <enum value="0x8D96" name="GL_BLUE_INTEGER_EXT"/>
>+        <enum value="0x8D97" name="GL_ALPHA_INTEGER"/>
>+        <enum value="0x8D97" name="GL_ALPHA_INTEGER_EXT"/>
>+        <enum value="0x8D98" name="GL_RGB_INTEGER"/>
>+        <enum value="0x8D98" name="GL_RGB_INTEGER_EXT"/>
>+        <enum value="0x8D99" name="GL_RGBA_INTEGER"/>
>+        <enum value="0x8D99" name="GL_RGBA_INTEGER_EXT"/>
>+        <enum value="0x8D9A" name="GL_BGR_INTEGER"/>
>+        <enum value="0x8D9A" name="GL_BGR_INTEGER_EXT"/>
>+        <enum value="0x8D9B" name="GL_BGRA_INTEGER"/>
>+        <enum value="0x8D9B" name="GL_BGRA_INTEGER_EXT"/>
>+        <enum value="0x8D9C" name="GL_LUMINANCE_INTEGER_EXT"/>
>+        <enum value="0x8D9D" name="GL_LUMINANCE_ALPHA_INTEGER_EXT"/>
>+        <enum value="0x8D9E" name="GL_RGBA_INTEGER_MODE_EXT"/>
>+        <enum value="0x8D9F" name="GL_INT_2_10_10_10_REV"/>
>+        <enum value="0x8DA0" name="GL_MAX_PROGRAM_PARAMETER_BUFFER_BINDINGS_NV"/>
>+        <enum value="0x8DA1" name="GL_MAX_PROGRAM_PARAMETER_BUFFER_SIZE_NV"/>
>+        <enum value="0x8DA2" name="GL_VERTEX_PROGRAM_PARAMETER_BUFFER_NV"/>
>+        <enum value="0x8DA3" name="GL_GEOMETRY_PROGRAM_PARAMETER_BUFFER_NV"/>
>+        <enum value="0x8DA4" name="GL_FRAGMENT_PROGRAM_PARAMETER_BUFFER_NV"/>
>+        <enum value="0x8DA5" name="GL_MAX_PROGRAM_GENERIC_ATTRIBS_NV"/>
>+        <enum value="0x8DA6" name="GL_MAX_PROGRAM_GENERIC_RESULTS_NV"/>
>+        <enum value="0x8DA7" name="GL_FRAMEBUFFER_ATTACHMENT_LAYERED"/>
>+        <enum value="0x8DA7" name="GL_FRAMEBUFFER_ATTACHMENT_LAYERED_ARB"/>
>+        <enum value="0x8DA7" name="GL_FRAMEBUFFER_ATTACHMENT_LAYERED_EXT"/>
>+        <enum value="0x8DA7" name="GL_FRAMEBUFFER_ATTACHMENT_LAYERED_OES"/>
>+        <enum value="0x8DA8" name="GL_FRAMEBUFFER_INCOMPLETE_LAYER_TARGETS"/>
>+        <enum value="0x8DA8" name="GL_FRAMEBUFFER_INCOMPLETE_LAYER_TARGETS_ARB"/>
>+        <enum value="0x8DA8" name="GL_FRAMEBUFFER_INCOMPLETE_LAYER_TARGETS_EXT"/>
>+        <enum value="0x8DA8" name="GL_FRAMEBUFFER_INCOMPLETE_LAYER_TARGETS_OES"/>
>+        <enum value="0x8DA9" name="GL_FRAMEBUFFER_INCOMPLETE_LAYER_COUNT_ARB"/>
>+        <enum value="0x8DA9" name="GL_FRAMEBUFFER_INCOMPLETE_LAYER_COUNT_EXT"/>
>+            
>+        <enum value="0x8DAA" name="GL_LAYER_NV"/>
>+        <enum value="0x8DAB" name="GL_DEPTH_COMPONENT32F_NV"/>
>+        <enum value="0x8DAC" name="GL_DEPTH32F_STENCIL8_NV"/>
>+        <enum value="0x8DAD" name="GL_FLOAT_32_UNSIGNED_INT_24_8_REV"/>
>+        <enum value="0x8DAD" name="GL_FLOAT_32_UNSIGNED_INT_24_8_REV_NV"/>
>+        <enum value="0x8DAE" name="GL_SHADER_INCLUDE_ARB"/>
>+        <enum value="0x8DAF" name="GL_DEPTH_BUFFER_FLOAT_MODE_NV"/>
>+            <unused start="0x8DB0" end="0x8DB8" vendor="NV"/>
>+        <enum value="0x8DB9" name="GL_FRAMEBUFFER_SRGB"/>
>+        <enum value="0x8DB9" name="GL_FRAMEBUFFER_SRGB_EXT"/>
>+        <enum value="0x8DBA" name="GL_FRAMEBUFFER_SRGB_CAPABLE_EXT"/>
>+        <enum value="0x8DBB" name="GL_COMPRESSED_RED_RGTC1"/>
>+        <enum value="0x8DBB" name="GL_COMPRESSED_RED_RGTC1_EXT"/>
>+        <enum value="0x8DBC" name="GL_COMPRESSED_SIGNED_RED_RGTC1"/>
>+        <enum value="0x8DBC" name="GL_COMPRESSED_SIGNED_RED_RGTC1_EXT"/>
>+        <enum value="0x8DBD" name="GL_COMPRESSED_RED_GREEN_RGTC2_EXT"/>
>+        <enum value="0x8DBD" name="GL_COMPRESSED_RG_RGTC2"/>
>+        <enum value="0x8DBE" name="GL_COMPRESSED_SIGNED_RED_GREEN_RGTC2_EXT"/>
>+        <enum value="0x8DBE" name="GL_COMPRESSED_SIGNED_RG_RGTC2"/>
>+        <enum value="0x8DC0" name="GL_SAMPLER_1D_ARRAY"/>
>+        <enum value="0x8DC0" name="GL_SAMPLER_1D_ARRAY_EXT"/>
>+        <enum value="0x8DC1" name="GL_SAMPLER_2D_ARRAY"/>
>+        <enum value="0x8DC1" name="GL_SAMPLER_2D_ARRAY_EXT"/>
>+        <enum value="0x8DC2" name="GL_SAMPLER_BUFFER"/>
>+        <enum value="0x8DC2" name="GL_SAMPLER_BUFFER_EXT"/>
>+        <enum value="0x8DC2" name="GL_SAMPLER_BUFFER_OES"/>
>+        <enum value="0x8DC3" name="GL_SAMPLER_1D_ARRAY_SHADOW"/>
>+        <enum value="0x8DC3" name="GL_SAMPLER_1D_ARRAY_SHADOW_EXT"/>
>+        <enum value="0x8DC4" name="GL_SAMPLER_2D_ARRAY_SHADOW"/>
>+        <enum value="0x8DC4" name="GL_SAMPLER_2D_ARRAY_SHADOW_EXT"/>
>+        <enum value="0x8DC4" name="GL_SAMPLER_2D_ARRAY_SHADOW_NV"/>
>+        <enum value="0x8DC5" name="GL_SAMPLER_CUBE_SHADOW"/>
>+        <enum value="0x8DC5" name="GL_SAMPLER_CUBE_SHADOW_EXT"/>
>+        <enum value="0x8DC5" name="GL_SAMPLER_CUBE_SHADOW_NV"/>
>+        <enum value="0x8DC6" name="GL_UNSIGNED_INT_VEC2"/>
>+        <enum value="0x8DC6" name="GL_UNSIGNED_INT_VEC2_EXT"/>
>+        <enum value="0x8DC7" name="GL_UNSIGNED_INT_VEC3"/>
>+        <enum value="0x8DC7" name="GL_UNSIGNED_INT_VEC3_EXT"/>
>+        <enum value="0x8DC8" name="GL_UNSIGNED_INT_VEC4"/>
>+        <enum value="0x8DC8" name="GL_UNSIGNED_INT_VEC4_EXT"/>
>+        <enum value="0x8DC9" name="GL_INT_SAMPLER_1D"/>
>+        <enum value="0x8DC9" name="GL_INT_SAMPLER_1D_EXT"/>
>+        <enum value="0x8DCA" name="GL_INT_SAMPLER_2D"/>
>+        <enum value="0x8DCA" name="GL_INT_SAMPLER_2D_EXT"/>
>+        <enum value="0x8DCB" name="GL_INT_SAMPLER_3D"/>
>+        <enum value="0x8DCB" name="GL_INT_SAMPLER_3D_EXT"/>
>+        <enum value="0x8DCC" name="GL_INT_SAMPLER_CUBE"/>
>+        <enum value="0x8DCC" name="GL_INT_SAMPLER_CUBE_EXT"/>
>+        <enum value="0x8DCD" name="GL_INT_SAMPLER_2D_RECT"/>
>+        <enum value="0x8DCD" name="GL_INT_SAMPLER_2D_RECT_EXT"/>
>+        <enum value="0x8DCE" name="GL_INT_SAMPLER_1D_ARRAY"/>
>+        <enum value="0x8DCE" name="GL_INT_SAMPLER_1D_ARRAY_EXT"/>
>+        <enum value="0x8DCF" name="GL_INT_SAMPLER_2D_ARRAY"/>
>+        <enum value="0x8DCF" name="GL_INT_SAMPLER_2D_ARRAY_EXT"/>
>+        <enum value="0x8DD0" name="GL_INT_SAMPLER_BUFFER"/>
>+        <enum value="0x8DD0" name="GL_INT_SAMPLER_BUFFER_EXT"/>
>+        <enum value="0x8DD0" name="GL_INT_SAMPLER_BUFFER_OES"/>
>+        <enum value="0x8DD1" name="GL_UNSIGNED_INT_SAMPLER_1D"/>
>+        <enum value="0x8DD1" name="GL_UNSIGNED_INT_SAMPLER_1D_EXT"/>
>+        <enum value="0x8DD2" name="GL_UNSIGNED_INT_SAMPLER_2D"/>
>+        <enum value="0x8DD2" name="GL_UNSIGNED_INT_SAMPLER_2D_EXT"/>
>+        <enum value="0x8DD3" name="GL_UNSIGNED_INT_SAMPLER_3D"/>
>+        <enum value="0x8DD3" name="GL_UNSIGNED_INT_SAMPLER_3D_EXT"/>
>+        <enum value="0x8DD4" name="GL_UNSIGNED_INT_SAMPLER_CUBE"/>
>+        <enum value="0x8DD4" name="GL_UNSIGNED_INT_SAMPLER_CUBE_EXT"/>
>+        <enum value="0x8DD5" name="GL_UNSIGNED_INT_SAMPLER_2D_RECT"/>
>+        <enum value="0x8DD5" name="GL_UNSIGNED_INT_SAMPLER_2D_RECT_EXT"/>
>+        <enum value="0x8DD6" name="GL_UNSIGNED_INT_SAMPLER_1D_ARRAY"/>
>+        <enum value="0x8DD6" name="GL_UNSIGNED_INT_SAMPLER_1D_ARRAY_EXT"/>
>+        <enum value="0x8DD7" name="GL_UNSIGNED_INT_SAMPLER_2D_ARRAY"/>
>+        <enum value="0x8DD7" name="GL_UNSIGNED_INT_SAMPLER_2D_ARRAY_EXT"/>
>+        <enum value="0x8DD8" name="GL_UNSIGNED_INT_SAMPLER_BUFFER"/>
>+        <enum value="0x8DD8" name="GL_UNSIGNED_INT_SAMPLER_BUFFER_EXT"/>
>+        <enum value="0x8DD8" name="GL_UNSIGNED_INT_SAMPLER_BUFFER_OES"/>
>+        <enum value="0x8DD9" name="GL_GEOMETRY_SHADER"/>
>+        <enum value="0x8DD9" name="GL_GEOMETRY_SHADER_ARB"/>
>+        <enum value="0x8DD9" name="GL_GEOMETRY_SHADER_EXT"/>
>+        <enum value="0x8DD9" name="GL_GEOMETRY_SHADER_OES"/>
>+        <enum value="0x8DDA" name="GL_GEOMETRY_VERTICES_OUT_ARB"/>
>+        <enum value="0x8DDA" name="GL_GEOMETRY_VERTICES_OUT_EXT"/>
>+        <enum value="0x8DDB" name="GL_GEOMETRY_INPUT_TYPE_ARB"/>
>+        <enum value="0x8DDB" name="GL_GEOMETRY_INPUT_TYPE_EXT"/>
>+        <enum value="0x8DDC" name="GL_GEOMETRY_OUTPUT_TYPE_ARB"/>
>+        <enum value="0x8DDC" name="GL_GEOMETRY_OUTPUT_TYPE_EXT"/>
>+        <enum value="0x8DDD" name="GL_MAX_GEOMETRY_VARYING_COMPONENTS_ARB"/>
>+        <enum value="0x8DDD" name="GL_MAX_GEOMETRY_VARYING_COMPONENTS_EXT"/>
>+        <enum value="0x8DDE" name="GL_MAX_VERTEX_VARYING_COMPONENTS_ARB"/>
>+        <enum value="0x8DDE" name="GL_MAX_VERTEX_VARYING_COMPONENTS_EXT"/>
>+        <enum value="0x8DDF" name="GL_MAX_GEOMETRY_UNIFORM_COMPONENTS"/>
>+        <enum value="0x8DDF" name="GL_MAX_GEOMETRY_UNIFORM_COMPONENTS_ARB"/>
>+        <enum value="0x8DDF" name="GL_MAX_GEOMETRY_UNIFORM_COMPONENTS_EXT"/>
>+        <enum value="0x8DDF" name="GL_MAX_GEOMETRY_UNIFORM_COMPONENTS_OES"/>
>+        <enum value="0x8DE0" name="GL_MAX_GEOMETRY_OUTPUT_VERTICES"/>
>+        <enum value="0x8DE0" name="GL_MAX_GEOMETRY_OUTPUT_VERTICES_ARB"/>
>+        <enum value="0x8DE0" name="GL_MAX_GEOMETRY_OUTPUT_VERTICES_EXT"/>
>+        <enum value="0x8DE0" name="GL_MAX_GEOMETRY_OUTPUT_VERTICES_OES"/>
>+        <enum value="0x8DE1" name="GL_MAX_GEOMETRY_TOTAL_OUTPUT_COMPONENTS"/>
>+        <enum value="0x8DE1" name="GL_MAX_GEOMETRY_TOTAL_OUTPUT_COMPONENTS_ARB"/>
>+        <enum value="0x8DE1" name="GL_MAX_GEOMETRY_TOTAL_OUTPUT_COMPONENTS_EXT"/>
>+        <enum value="0x8DE1" name="GL_MAX_GEOMETRY_TOTAL_OUTPUT_COMPONENTS_OES"/>
>+        <enum value="0x8DE2" name="GL_MAX_VERTEX_BINDABLE_UNIFORMS_EXT"/>
>+        <enum value="0x8DE3" name="GL_MAX_FRAGMENT_BINDABLE_UNIFORMS_EXT"/>
>+        <enum value="0x8DE4" name="GL_MAX_GEOMETRY_BINDABLE_UNIFORMS_EXT"/>
>+        <enum value="0x8DE5" name="GL_ACTIVE_SUBROUTINES"/>
>+        <enum value="0x8DE6" name="GL_ACTIVE_SUBROUTINE_UNIFORMS"/>
>+        <enum value="0x8DE7" name="GL_MAX_SUBROUTINES"/>
>+        <enum value="0x8DE8" name="GL_MAX_SUBROUTINE_UNIFORM_LOCATIONS"/>
>+        <enum value="0x8DE9" name="GL_NAMED_STRING_LENGTH_ARB"/>
>+        <enum value="0x8DEA" name="GL_NAMED_STRING_TYPE_ARB"/>
>+            <unused start="0x8DEB" end="0x8DEC" vendor="NV"/>
>+        <enum value="0x8DED" name="GL_MAX_BINDABLE_UNIFORM_SIZE_EXT"/>
>+        <enum value="0x8DEE" name="GL_UNIFORM_BUFFER_EXT"/>
>+        <enum value="0x8DEF" name="GL_UNIFORM_BUFFER_BINDING_EXT"/>
>+    </enums>
>+
>+    <enums namespace="GL" start="0x8DF0" end="0x8E0F" vendor="OES">
>+        <enum value="0x8DF0" name="GL_LOW_FLOAT"/>
>+        <enum value="0x8DF1" name="GL_MEDIUM_FLOAT"/>
>+        <enum value="0x8DF2" name="GL_HIGH_FLOAT"/>
>+        <enum value="0x8DF3" name="GL_LOW_INT"/>
>+        <enum value="0x8DF4" name="GL_MEDIUM_INT"/>
>+        <enum value="0x8DF5" name="GL_HIGH_INT"/>
>+        <enum value="0x8DF6" name="GL_UNSIGNED_INT_10_10_10_2_OES"/>
>+        <enum value="0x8DF7" name="GL_INT_10_10_10_2_OES"/>
>+        <enum value="0x8DF8" name="GL_SHADER_BINARY_FORMATS"/>
>+        <enum value="0x8DF9" name="GL_NUM_SHADER_BINARY_FORMATS"/>
>+        <enum value="0x8DFA" name="GL_SHADER_COMPILER"/>
>+        <enum value="0x8DFB" name="GL_MAX_VERTEX_UNIFORM_VECTORS"/>
>+        <enum value="0x8DFC" name="GL_MAX_VARYING_VECTORS"/>
>+        <enum value="0x8DFD" name="GL_MAX_FRAGMENT_UNIFORM_VECTORS"/>
>+            <unused start="0x8DFE" end="0x8E0F" vendor="OES"/>
>+    </enums>
>+
>+    <enums namespace="GL" start="0x8E10" end="0x8E8F" vendor="NV" comment="For Michael Gold 2006/08/07">
>+        <enum value="0x8E10" name="GL_RENDERBUFFER_COLOR_SAMPLES_NV"/>
>+        <enum value="0x8E11" name="GL_MAX_MULTISAMPLE_COVERAGE_MODES_NV"/>
>+        <enum value="0x8E12" name="GL_MULTISAMPLE_COVERAGE_MODES_NV"/>
>+        <enum value="0x8E13" name="GL_QUERY_WAIT"/>
>+        <enum value="0x8E13" name="GL_QUERY_WAIT_NV"/>
>+        <enum value="0x8E14" name="GL_QUERY_NO_WAIT"/>
>+        <enum value="0x8E14" name="GL_QUERY_NO_WAIT_NV"/>
>+        <enum value="0x8E15" name="GL_QUERY_BY_REGION_WAIT"/>
>+        <enum value="0x8E15" name="GL_QUERY_BY_REGION_WAIT_NV"/>
>+        <enum value="0x8E16" name="GL_QUERY_BY_REGION_NO_WAIT"/>
>+        <enum value="0x8E16" name="GL_QUERY_BY_REGION_NO_WAIT_NV"/>
>+        <enum value="0x8E17" name="GL_QUERY_WAIT_INVERTED"/>
>+        <enum value="0x8E18" name="GL_QUERY_NO_WAIT_INVERTED"/>
>+        <enum value="0x8E19" name="GL_QUERY_BY_REGION_WAIT_INVERTED"/>
>+        <enum value="0x8E1A" name="GL_QUERY_BY_REGION_NO_WAIT_INVERTED"/>
>+        <enum value="0x8E1B" name="GL_POLYGON_OFFSET_CLAMP"/>
>+        <enum value="0x8E1B" name="GL_POLYGON_OFFSET_CLAMP_EXT" alias="GL_POLYGON_OFFSET_CLAMP"/>
>+            <unused start="0x8E1C" end="0x8E1D" vendor="NV"/>
>+        <enum value="0x8E1E" name="GL_MAX_COMBINED_TESS_CONTROL_UNIFORM_COMPONENTS"/>
>+        <enum value="0x8E1E" name="GL_MAX_COMBINED_TESS_CONTROL_UNIFORM_COMPONENTS_EXT"/>
>+        <enum value="0x8E1E" name="GL_MAX_COMBINED_TESS_CONTROL_UNIFORM_COMPONENTS_OES"/>
>+        <enum value="0x8E1F" name="GL_MAX_COMBINED_TESS_EVALUATION_UNIFORM_COMPONENTS"/>
>+        <enum value="0x8E1F" name="GL_MAX_COMBINED_TESS_EVALUATION_UNIFORM_COMPONENTS_EXT"/>
>+        <enum value="0x8E1F" name="GL_MAX_COMBINED_TESS_EVALUATION_UNIFORM_COMPONENTS_OES"/>
>+        <enum value="0x8E20" name="GL_COLOR_SAMPLES_NV"/>
>+            <unused start="0x8E21" vendor="NV"/>
>+        <enum value="0x8E22" name="GL_TRANSFORM_FEEDBACK"/>
>+        <enum value="0x8E22" name="GL_TRANSFORM_FEEDBACK_NV"/>
>+        <enum value="0x8E23" name="GL_TRANSFORM_FEEDBACK_BUFFER_PAUSED"/>
>+        <enum value="0x8E23" name="GL_TRANSFORM_FEEDBACK_PAUSED" alias="GL_TRANSFORM_FEEDBACK_BUFFER_PAUSED"/>
>+        <enum value="0x8E23" name="GL_TRANSFORM_FEEDBACK_BUFFER_PAUSED_NV"/>
>+        <enum value="0x8E24" name="GL_TRANSFORM_FEEDBACK_BUFFER_ACTIVE"/>
>+        <enum value="0x8E24" name="GL_TRANSFORM_FEEDBACK_ACTIVE" alias="GL_TRANSFORM_FEEDBACK_BUFFER_ACTIVE"/>
>+        <enum value="0x8E24" name="GL_TRANSFORM_FEEDBACK_BUFFER_ACTIVE_NV"/>
>+        <enum value="0x8E25" name="GL_TRANSFORM_FEEDBACK_BINDING"/>
>+        <enum value="0x8E25" name="GL_TRANSFORM_FEEDBACK_BINDING_NV"/>
>+        <enum value="0x8E26" name="GL_FRAME_NV"/>
>+        <enum value="0x8E27" name="GL_FIELDS_NV"/>
>+        <enum value="0x8E28" name="GL_CURRENT_TIME_NV"/>
>+        <enum value="0x8E28" name="GL_TIMESTAMP"/>
>+        <enum value="0x8E28" name="GL_TIMESTAMP_EXT"/>
>+        <enum value="0x8E29" name="GL_NUM_FILL_STREAMS_NV"/>
>+        <enum value="0x8E2A" name="GL_PRESENT_TIME_NV"/>
>+        <enum value="0x8E2B" name="GL_PRESENT_DURATION_NV"/>
>+        <enum value="0x8E2C" name="GL_DEPTH_COMPONENT16_NONLINEAR_NV"/>
>+        <enum value="0x8E2D" name="GL_PROGRAM_MATRIX_EXT"/>
>+        <enum value="0x8E2E" name="GL_TRANSPOSE_PROGRAM_MATRIX_EXT"/>
>+        <enum value="0x8E2F" name="GL_PROGRAM_MATRIX_STACK_DEPTH_EXT"/>
>+            <unused start="0x8E30" end="0x8E41" vendor="NV"/>
>+        <enum value="0x8E42" name="GL_TEXTURE_SWIZZLE_R"/>
>+        <enum value="0x8E42" name="GL_TEXTURE_SWIZZLE_R_EXT"/>
>+        <enum value="0x8E43" name="GL_TEXTURE_SWIZZLE_G"/>
>+        <enum value="0x8E43" name="GL_TEXTURE_SWIZZLE_G_EXT"/>
>+        <enum value="0x8E44" name="GL_TEXTURE_SWIZZLE_B"/>
>+        <enum value="0x8E44" name="GL_TEXTURE_SWIZZLE_B_EXT"/>
>+        <enum value="0x8E45" name="GL_TEXTURE_SWIZZLE_A"/>
>+        <enum value="0x8E45" name="GL_TEXTURE_SWIZZLE_A_EXT"/>
>+        <enum value="0x8E46" name="GL_TEXTURE_SWIZZLE_RGBA"/>
>+        <enum value="0x8E46" name="GL_TEXTURE_SWIZZLE_RGBA_EXT"/>
>+        <enum value="0x8E47" name="GL_ACTIVE_SUBROUTINE_UNIFORM_LOCATIONS"/>
>+        <enum value="0x8E48" name="GL_ACTIVE_SUBROUTINE_MAX_LENGTH"/>
>+        <enum value="0x8E49" name="GL_ACTIVE_SUBROUTINE_UNIFORM_MAX_LENGTH"/>
>+        <enum value="0x8E4A" name="GL_NUM_COMPATIBLE_SUBROUTINES"/>
>+        <enum value="0x8E4B" name="GL_COMPATIBLE_SUBROUTINES"/>
>+        <enum value="0x8E4C" name="GL_QUADS_FOLLOW_PROVOKING_VERTEX_CONVENTION"/>
>+        <enum value="0x8E4C" name="GL_QUADS_FOLLOW_PROVOKING_VERTEX_CONVENTION_EXT"/>
>+        <enum value="0x8E4D" name="GL_FIRST_VERTEX_CONVENTION"/>
>+        <enum value="0x8E4D" name="GL_FIRST_VERTEX_CONVENTION_EXT"/>
>+        <enum value="0x8E4D" name="GL_FIRST_VERTEX_CONVENTION_OES"/>
>+        <enum value="0x8E4E" name="GL_LAST_VERTEX_CONVENTION"/>
>+        <enum value="0x8E4E" name="GL_LAST_VERTEX_CONVENTION_EXT"/>
>+        <enum value="0x8E4E" name="GL_LAST_VERTEX_CONVENTION_OES"/>
>+        <enum value="0x8E4F" name="GL_PROVOKING_VERTEX"/>
>+        <enum value="0x8E4F" name="GL_PROVOKING_VERTEX_EXT"/>
>+        <enum value="0x8E50" name="GL_SAMPLE_POSITION"/>
>+        <enum value="0x8E50" name="GL_SAMPLE_POSITION_NV"/>
>+        <enum value="0x8E50" name="GL_SAMPLE_LOCATION_ARB" alias="GL_SAMPLE_POSITION"/>
>+        <enum value="0x8E50" name="GL_SAMPLE_LOCATION_NV" alias="GL_SAMPLE_POSITION_NV"/>
>+        <enum value="0x8E51" name="GL_SAMPLE_MASK"/>
>+        <enum value="0x8E51" name="GL_SAMPLE_MASK_NV"/>
>+        <enum value="0x8E52" name="GL_SAMPLE_MASK_VALUE"/>
>+        <enum value="0x8E52" name="GL_SAMPLE_MASK_VALUE_NV"/>
>+        <enum value="0x8E53" name="GL_TEXTURE_BINDING_RENDERBUFFER_NV"/>
>+        <enum value="0x8E54" name="GL_TEXTURE_RENDERBUFFER_DATA_STORE_BINDING_NV"/>
>+        <enum value="0x8E55" name="GL_TEXTURE_RENDERBUFFER_NV"/>
>+        <enum value="0x8E56" name="GL_SAMPLER_RENDERBUFFER_NV"/>
>+        <enum value="0x8E57" name="GL_INT_SAMPLER_RENDERBUFFER_NV"/>
>+        <enum value="0x8E58" name="GL_UNSIGNED_INT_SAMPLER_RENDERBUFFER_NV"/>
>+        <enum value="0x8E59" name="GL_MAX_SAMPLE_MASK_WORDS"/>
>+        <enum value="0x8E59" name="GL_MAX_SAMPLE_MASK_WORDS_NV"/>
>+        <enum value="0x8E5A" name="GL_MAX_GEOMETRY_PROGRAM_INVOCATIONS_NV"/>
>+        <enum value="0x8E5A" name="GL_MAX_GEOMETRY_SHADER_INVOCATIONS"/>
>+        <enum value="0x8E5A" name="GL_MAX_GEOMETRY_SHADER_INVOCATIONS_EXT"/>
>+        <enum value="0x8E5A" name="GL_MAX_GEOMETRY_SHADER_INVOCATIONS_OES"/>
>+        <enum value="0x8E5B" name="GL_MIN_FRAGMENT_INTERPOLATION_OFFSET"/>
>+        <enum value="0x8E5B" name="GL_MIN_FRAGMENT_INTERPOLATION_OFFSET_OES"/>
>+        <enum value="0x8E5B" name="GL_MIN_FRAGMENT_INTERPOLATION_OFFSET_NV"/>
>+        <enum value="0x8E5C" name="GL_MAX_FRAGMENT_INTERPOLATION_OFFSET"/>
>+        <enum value="0x8E5C" name="GL_MAX_FRAGMENT_INTERPOLATION_OFFSET_OES"/>
>+        <enum value="0x8E5C" name="GL_MAX_FRAGMENT_INTERPOLATION_OFFSET_NV"/>
>+        <enum value="0x8E5D" name="GL_FRAGMENT_INTERPOLATION_OFFSET_BITS"/>
>+        <enum value="0x8E5D" name="GL_FRAGMENT_INTERPOLATION_OFFSET_BITS_OES"/>
>+        <enum value="0x8E5D" name="GL_FRAGMENT_PROGRAM_INTERPOLATION_OFFSET_BITS_NV"/>
>+        <enum value="0x8E5E" name="GL_MIN_PROGRAM_TEXTURE_GATHER_OFFSET"/>
>+        <enum value="0x8E5E" name="GL_MIN_PROGRAM_TEXTURE_GATHER_OFFSET_ARB"/>
>+        <enum value="0x8E5E" name="GL_MIN_PROGRAM_TEXTURE_GATHER_OFFSET_NV"/>
>+        <enum value="0x8E5F" name="GL_MAX_PROGRAM_TEXTURE_GATHER_OFFSET"/>
>+        <enum value="0x8E5F" name="GL_MAX_PROGRAM_TEXTURE_GATHER_OFFSET_ARB"/>
>+        <enum value="0x8E5F" name="GL_MAX_PROGRAM_TEXTURE_GATHER_OFFSET_NV"/>
>+            <unused start="0x8E60" end="0x8E6F" vendor="NV"/>
>+        <enum value="0x8E70" name="GL_MAX_TRANSFORM_FEEDBACK_BUFFERS"/>
>+        <enum value="0x8E71" name="GL_MAX_VERTEX_STREAMS"/>
>+        <enum value="0x8E72" name="GL_PATCH_VERTICES"/>
>+        <enum value="0x8E72" name="GL_PATCH_VERTICES_EXT"/>
>+        <enum value="0x8E72" name="GL_PATCH_VERTICES_OES"/>
>+        <enum value="0x8E73" name="GL_PATCH_DEFAULT_INNER_LEVEL"/>
>+        <enum value="0x8E73" name="GL_PATCH_DEFAULT_INNER_LEVEL_EXT"/>
>+        <enum value="0x8E74" name="GL_PATCH_DEFAULT_OUTER_LEVEL"/>
>+        <enum value="0x8E74" name="GL_PATCH_DEFAULT_OUTER_LEVEL_EXT"/>
>+        <enum value="0x8E75" name="GL_TESS_CONTROL_OUTPUT_VERTICES"/>
>+        <enum value="0x8E75" name="GL_TESS_CONTROL_OUTPUT_VERTICES_EXT"/>
>+        <enum value="0x8E75" name="GL_TESS_CONTROL_OUTPUT_VERTICES_OES"/>
>+        <enum value="0x8E76" name="GL_TESS_GEN_MODE"/>
>+        <enum value="0x8E76" name="GL_TESS_GEN_MODE_EXT"/>
>+        <enum value="0x8E76" name="GL_TESS_GEN_MODE_OES"/>
>+        <enum value="0x8E77" name="GL_TESS_GEN_SPACING"/>
>+        <enum value="0x8E77" name="GL_TESS_GEN_SPACING_EXT"/>
>+        <enum value="0x8E77" name="GL_TESS_GEN_SPACING_OES"/>
>+        <enum value="0x8E78" name="GL_TESS_GEN_VERTEX_ORDER"/>
>+        <enum value="0x8E78" name="GL_TESS_GEN_VERTEX_ORDER_EXT"/>
>+        <enum value="0x8E78" name="GL_TESS_GEN_VERTEX_ORDER_OES"/>
>+        <enum value="0x8E79" name="GL_TESS_GEN_POINT_MODE"/>
>+        <enum value="0x8E79" name="GL_TESS_GEN_POINT_MODE_EXT"/>
>+        <enum value="0x8E79" name="GL_TESS_GEN_POINT_MODE_OES"/>
>+        <enum value="0x8E7A" name="GL_ISOLINES"/>
>+        <enum value="0x8E7A" name="GL_ISOLINES_EXT"/>
>+        <enum value="0x8E7A" name="GL_ISOLINES_OES"/>
>+        <enum value="0x8E7B" name="GL_FRACTIONAL_ODD"/>
>+        <enum value="0x8E7B" name="GL_FRACTIONAL_ODD_EXT"/>
>+        <enum value="0x8E7B" name="GL_FRACTIONAL_ODD_OES"/>
>+        <enum value="0x8E7C" name="GL_FRACTIONAL_EVEN"/>
>+        <enum value="0x8E7C" name="GL_FRACTIONAL_EVEN_EXT"/>
>+        <enum value="0x8E7C" name="GL_FRACTIONAL_EVEN_OES"/>
>+        <enum value="0x8E7D" name="GL_MAX_PATCH_VERTICES"/>
>+        <enum value="0x8E7D" name="GL_MAX_PATCH_VERTICES_EXT"/>
>+        <enum value="0x8E7D" name="GL_MAX_PATCH_VERTICES_OES"/>
>+        <enum value="0x8E7E" name="GL_MAX_TESS_GEN_LEVEL"/>
>+        <enum value="0x8E7E" name="GL_MAX_TESS_GEN_LEVEL_EXT"/>
>+        <enum value="0x8E7E" name="GL_MAX_TESS_GEN_LEVEL_OES"/>
>+        <enum value="0x8E7F" name="GL_MAX_TESS_CONTROL_UNIFORM_COMPONENTS"/>
>+        <enum value="0x8E7F" name="GL_MAX_TESS_CONTROL_UNIFORM_COMPONENTS_EXT"/>
>+        <enum value="0x8E7F" name="GL_MAX_TESS_CONTROL_UNIFORM_COMPONENTS_OES"/>
>+        <enum value="0x8E80" name="GL_MAX_TESS_EVALUATION_UNIFORM_COMPONENTS"/>
>+        <enum value="0x8E80" name="GL_MAX_TESS_EVALUATION_UNIFORM_COMPONENTS_EXT"/>
>+        <enum value="0x8E80" name="GL_MAX_TESS_EVALUATION_UNIFORM_COMPONENTS_OES"/>
>+        <enum value="0x8E81" name="GL_MAX_TESS_CONTROL_TEXTURE_IMAGE_UNITS"/>
>+        <enum value="0x8E81" name="GL_MAX_TESS_CONTROL_TEXTURE_IMAGE_UNITS_EXT"/>
>+        <enum value="0x8E81" name="GL_MAX_TESS_CONTROL_TEXTURE_IMAGE_UNITS_OES"/>
>+        <enum value="0x8E82" name="GL_MAX_TESS_EVALUATION_TEXTURE_IMAGE_UNITS"/>
>+        <enum value="0x8E82" name="GL_MAX_TESS_EVALUATION_TEXTURE_IMAGE_UNITS_EXT"/>
>+        <enum value="0x8E82" name="GL_MAX_TESS_EVALUATION_TEXTURE_IMAGE_UNITS_OES"/>
>+        <enum value="0x8E83" name="GL_MAX_TESS_CONTROL_OUTPUT_COMPONENTS"/>
>+        <enum value="0x8E83" name="GL_MAX_TESS_CONTROL_OUTPUT_COMPONENTS_EXT"/>
>+        <enum value="0x8E83" name="GL_MAX_TESS_CONTROL_OUTPUT_COMPONENTS_OES"/>
>+        <enum value="0x8E84" name="GL_MAX_TESS_PATCH_COMPONENTS"/>
>+        <enum value="0x8E84" name="GL_MAX_TESS_PATCH_COMPONENTS_EXT"/>
>+        <enum value="0x8E84" name="GL_MAX_TESS_PATCH_COMPONENTS_OES"/>
>+        <enum value="0x8E85" name="GL_MAX_TESS_CONTROL_TOTAL_OUTPUT_COMPONENTS"/>
>+        <enum value="0x8E85" name="GL_MAX_TESS_CONTROL_TOTAL_OUTPUT_COMPONENTS_EXT"/>
>+        <enum value="0x8E85" name="GL_MAX_TESS_CONTROL_TOTAL_OUTPUT_COMPONENTS_OES"/>
>+        <enum value="0x8E86" name="GL_MAX_TESS_EVALUATION_OUTPUT_COMPONENTS"/>
>+        <enum value="0x8E86" name="GL_MAX_TESS_EVALUATION_OUTPUT_COMPONENTS_EXT"/>
>+        <enum value="0x8E86" name="GL_MAX_TESS_EVALUATION_OUTPUT_COMPONENTS_OES"/>
>+        <enum value="0x8E87" name="GL_TESS_EVALUATION_SHADER"/>
>+        <enum value="0x8E87" name="GL_TESS_EVALUATION_SHADER_EXT"/>
>+        <enum value="0x8E87" name="GL_TESS_EVALUATION_SHADER_OES"/>
>+        <enum value="0x8E88" name="GL_TESS_CONTROL_SHADER"/>
>+        <enum value="0x8E88" name="GL_TESS_CONTROL_SHADER_EXT"/>
>+        <enum value="0x8E88" name="GL_TESS_CONTROL_SHADER_OES"/>
>+        <enum value="0x8E89" name="GL_MAX_TESS_CONTROL_UNIFORM_BLOCKS"/>
>+        <enum value="0x8E89" name="GL_MAX_TESS_CONTROL_UNIFORM_BLOCKS_EXT"/>
>+        <enum value="0x8E89" name="GL_MAX_TESS_CONTROL_UNIFORM_BLOCKS_OES"/>
>+        <enum value="0x8E8A" name="GL_MAX_TESS_EVALUATION_UNIFORM_BLOCKS"/>
>+        <enum value="0x8E8A" name="GL_MAX_TESS_EVALUATION_UNIFORM_BLOCKS_EXT"/>
>+        <enum value="0x8E8A" name="GL_MAX_TESS_EVALUATION_UNIFORM_BLOCKS_OES"/>
>+            <unused start="0x8E8B" vendor="NV"/>
>+        <enum value="0x8E8C" name="GL_COMPRESSED_RGBA_BPTC_UNORM"/>
>+        <enum value="0x8E8C" name="GL_COMPRESSED_RGBA_BPTC_UNORM_ARB"/>
>+        <enum value="0x8E8C" name="GL_COMPRESSED_RGBA_BPTC_UNORM_EXT"/>
>+        <enum value="0x8E8D" name="GL_COMPRESSED_SRGB_ALPHA_BPTC_UNORM"/>
>+        <enum value="0x8E8D" name="GL_COMPRESSED_SRGB_ALPHA_BPTC_UNORM_ARB"/>
>+        <enum value="0x8E8D" name="GL_COMPRESSED_SRGB_ALPHA_BPTC_UNORM_EXT"/>
>+        <enum value="0x8E8E" name="GL_COMPRESSED_RGB_BPTC_SIGNED_FLOAT"/>
>+        <enum value="0x8E8E" name="GL_COMPRESSED_RGB_BPTC_SIGNED_FLOAT_ARB"/>
>+        <enum value="0x8E8E" name="GL_COMPRESSED_RGB_BPTC_SIGNED_FLOAT_EXT"/>
>+        <enum value="0x8E8F" name="GL_COMPRESSED_RGB_BPTC_UNSIGNED_FLOAT"/>
>+        <enum value="0x8E8F" name="GL_COMPRESSED_RGB_BPTC_UNSIGNED_FLOAT_ARB"/>
>+        <enum value="0x8E8F" name="GL_COMPRESSED_RGB_BPTC_UNSIGNED_FLOAT_EXT"/>
>+    </enums>
>+
>+    <enums namespace="GL" start="0x8E90" end="0x8E9F" vendor="QNX" comment="For QNX_texture_tiling, QNX_complex_polygon, QNX_stippled_lines (Khronos bug 696)">
>+            <unused start="0x8E90" end="0x8E9F" vendor="QNX"/>
>+    </enums>
>+
>+    <enums namespace="GL" start="0x8EA0" end="0x8EAF" vendor="IMG">
>+            <unused start="0x8EA0" end="0x8EAF" vendor="IMG"/>
>+    </enums>
>+
>+    <enums namespace="GL" start="0x8EB0" end="0x8EBF" vendor="OES" comment="For Affie Munshi 2007/07/20">
>+            <unused start="0x8EB0" end="0x8EBF" vendor="OES"/>
>+    </enums>
>+
>+    <enums namespace="GL" start="0x8EC0" end="0x8ECF" vendor="Vincent">
>+            <unused start="0x8EC0" end="0x8ECF" vendor="Vincent"/>
>+    </enums>
>+
>+    <enums namespace="GL" start="0x8ED0" end="0x8F4F" vendor="NV" comment="For Pat Brown, Khronos bug 3191">
>+        <enum value="0x8ED0" name="GL_COVERAGE_COMPONENT_NV"/>
>+        <enum value="0x8ED1" name="GL_COVERAGE_COMPONENT4_NV"/>
>+        <enum value="0x8ED2" name="GL_COVERAGE_ATTACHMENT_NV"/>
>+        <enum value="0x8ED3" name="GL_COVERAGE_BUFFERS_NV"/>
>+        <enum value="0x8ED4" name="GL_COVERAGE_SAMPLES_NV"/>
>+        <enum value="0x8ED5" name="GL_COVERAGE_ALL_FRAGMENTS_NV"/>
>+        <enum value="0x8ED6" name="GL_COVERAGE_EDGE_FRAGMENTS_NV"/>
>+        <enum value="0x8ED7" name="GL_COVERAGE_AUTOMATIC_NV"/>
>+            <unused start="0x8ED8" end="0x8F0F" vendor="NV"/>
>+        <enum value="0x8F10" name="GL_INCLUSIVE_EXT"/>
>+        <enum value="0x8F11" name="GL_EXCLUSIVE_EXT"/>
>+        <enum value="0x8F12" name="GL_WINDOW_RECTANGLE_EXT"/>
>+        <enum value="0x8F13" name="GL_WINDOW_RECTANGLE_MODE_EXT"/>
>+        <enum value="0x8F14" name="GL_MAX_WINDOW_RECTANGLES_EXT"/>
>+        <enum value="0x8F15" name="GL_NUM_WINDOW_RECTANGLES_EXT"/>
>+            <unused start="0x8F16" end="0x8F1C" vendor="NV"/>
>+        <enum value="0x8F1D" name="GL_BUFFER_GPU_ADDRESS_NV"/>
>+        <enum value="0x8F1E" name="GL_VERTEX_ATTRIB_ARRAY_UNIFIED_NV"/>
>+        <enum value="0x8F1F" name="GL_ELEMENT_ARRAY_UNIFIED_NV"/>
>+        <enum value="0x8F20" name="GL_VERTEX_ATTRIB_ARRAY_ADDRESS_NV"/>
>+        <enum value="0x8F21" name="GL_VERTEX_ARRAY_ADDRESS_NV"/>
>+        <enum value="0x8F22" name="GL_NORMAL_ARRAY_ADDRESS_NV"/>
>+        <enum value="0x8F23" name="GL_COLOR_ARRAY_ADDRESS_NV"/>
>+        <enum value="0x8F24" name="GL_INDEX_ARRAY_ADDRESS_NV"/>
>+        <enum value="0x8F25" name="GL_TEXTURE_COORD_ARRAY_ADDRESS_NV"/>
>+        <enum value="0x8F26" name="GL_EDGE_FLAG_ARRAY_ADDRESS_NV"/>
>+        <enum value="0x8F27" name="GL_SECONDARY_COLOR_ARRAY_ADDRESS_NV"/>
>+        <enum value="0x8F28" name="GL_FOG_COORD_ARRAY_ADDRESS_NV"/>
>+        <enum value="0x8F29" name="GL_ELEMENT_ARRAY_ADDRESS_NV"/>
>+        <enum value="0x8F2A" name="GL_VERTEX_ATTRIB_ARRAY_LENGTH_NV"/>
>+        <enum value="0x8F2B" name="GL_VERTEX_ARRAY_LENGTH_NV"/>
>+        <enum value="0x8F2C" name="GL_NORMAL_ARRAY_LENGTH_NV"/>
>+        <enum value="0x8F2D" name="GL_COLOR_ARRAY_LENGTH_NV"/>
>+        <enum value="0x8F2E" name="GL_INDEX_ARRAY_LENGTH_NV"/>
>+        <enum value="0x8F2F" name="GL_TEXTURE_COORD_ARRAY_LENGTH_NV"/>
>+        <enum value="0x8F30" name="GL_EDGE_FLAG_ARRAY_LENGTH_NV"/>
>+        <enum value="0x8F31" name="GL_SECONDARY_COLOR_ARRAY_LENGTH_NV"/>
>+        <enum value="0x8F32" name="GL_FOG_COORD_ARRAY_LENGTH_NV"/>
>+        <enum value="0x8F33" name="GL_ELEMENT_ARRAY_LENGTH_NV"/>
>+        <enum value="0x8F34" name="GL_GPU_ADDRESS_NV"/>
>+        <enum value="0x8F35" name="GL_MAX_SHADER_BUFFER_ADDRESS_NV"/>
>+        <enum value="0x8F36" name="GL_COPY_READ_BUFFER"/>
>+        <enum value="0x8F36" name="GL_COPY_READ_BUFFER_NV"/>
>+        <enum value="0x8F36" name="GL_COPY_READ_BUFFER_BINDING" alias="GL_COPY_READ_BUFFER"/>
>+        <enum value="0x8F37" name="GL_COPY_WRITE_BUFFER"/>
>+        <enum value="0x8F37" name="GL_COPY_WRITE_BUFFER_NV"/>
>+        <enum value="0x8F37" name="GL_COPY_WRITE_BUFFER_BINDING" alias="GL_COPY_WRITE_BUFFER"/>
>+        <enum value="0x8F38" name="GL_MAX_IMAGE_UNITS"/>
>+        <enum value="0x8F38" name="GL_MAX_IMAGE_UNITS_EXT"/>
>+        <enum value="0x8F39" name="GL_MAX_COMBINED_IMAGE_UNITS_AND_FRAGMENT_OUTPUTS"/>
>+        <enum value="0x8F39" name="GL_MAX_COMBINED_IMAGE_UNITS_AND_FRAGMENT_OUTPUTS_EXT"/>
>+        <enum value="0x8F39" name="GL_MAX_COMBINED_SHADER_OUTPUT_RESOURCES" alias="GL_MAX_COMBINED_IMAGE_UNITS_AND_FRAGMENT_OUTPUTS"/>
>+        <enum value="0x8F3A" name="GL_IMAGE_BINDING_NAME"/>
>+        <enum value="0x8F3A" name="GL_IMAGE_BINDING_NAME_EXT"/>
>+        <enum value="0x8F3B" name="GL_IMAGE_BINDING_LEVEL"/>
>+        <enum value="0x8F3B" name="GL_IMAGE_BINDING_LEVEL_EXT"/>
>+        <enum value="0x8F3C" name="GL_IMAGE_BINDING_LAYERED"/>
>+        <enum value="0x8F3C" name="GL_IMAGE_BINDING_LAYERED_EXT"/>
>+        <enum value="0x8F3D" name="GL_IMAGE_BINDING_LAYER"/>
>+        <enum value="0x8F3D" name="GL_IMAGE_BINDING_LAYER_EXT"/>
>+        <enum value="0x8F3E" name="GL_IMAGE_BINDING_ACCESS"/>
>+        <enum value="0x8F3E" name="GL_IMAGE_BINDING_ACCESS_EXT"/>
>+        <enum value="0x8F3F" name="GL_DRAW_INDIRECT_BUFFER"/>
>+        <enum value="0x8F40" name="GL_DRAW_INDIRECT_UNIFIED_NV"/>
>+        <enum value="0x8F41" name="GL_DRAW_INDIRECT_ADDRESS_NV"/>
>+        <enum value="0x8F42" name="GL_DRAW_INDIRECT_LENGTH_NV"/>
>+        <enum value="0x8F43" name="GL_DRAW_INDIRECT_BUFFER_BINDING"/>
>+        <enum value="0x8F44" name="GL_MAX_PROGRAM_SUBROUTINE_PARAMETERS_NV"/>
>+        <enum value="0x8F45" name="GL_MAX_PROGRAM_SUBROUTINE_NUM_NV"/>
>+        <enum value="0x8F46" name="GL_DOUBLE_MAT2"/>
>+        <enum value="0x8F46" name="GL_DOUBLE_MAT2_EXT"/>
>+        <enum value="0x8F47" name="GL_DOUBLE_MAT3"/>
>+        <enum value="0x8F47" name="GL_DOUBLE_MAT3_EXT"/>
>+        <enum value="0x8F48" name="GL_DOUBLE_MAT4"/>
>+        <enum value="0x8F48" name="GL_DOUBLE_MAT4_EXT"/>
>+        <enum value="0x8F49" name="GL_DOUBLE_MAT2x3"/>
>+        <enum value="0x8F49" name="GL_DOUBLE_MAT2x3_EXT"/>
>+        <enum value="0x8F4A" name="GL_DOUBLE_MAT2x4"/>
>+        <enum value="0x8F4A" name="GL_DOUBLE_MAT2x4_EXT"/>
>+        <enum value="0x8F4B" name="GL_DOUBLE_MAT3x2"/>
>+        <enum value="0x8F4B" name="GL_DOUBLE_MAT3x2_EXT"/>
>+        <enum value="0x8F4C" name="GL_DOUBLE_MAT3x4"/>
>+        <enum value="0x8F4C" name="GL_DOUBLE_MAT3x4_EXT"/>
>+        <enum value="0x8F4D" name="GL_DOUBLE_MAT4x2"/>
>+        <enum value="0x8F4D" name="GL_DOUBLE_MAT4x2_EXT"/>
>+        <enum value="0x8F4E" name="GL_DOUBLE_MAT4x3"/>
>+        <enum value="0x8F4E" name="GL_DOUBLE_MAT4x3_EXT"/>
>+        <enum value="0x8F4F" name="GL_VERTEX_BINDING_BUFFER"/>
>+    </enums>
>+
>+    <enums namespace="GL" start="0x8F50" end="0x8F5F" vendor="ZiiLabs" comment="For Jon Kennedy, Khronos public bug 75">
>+            <unused start="0x8F50" end="0x8F5F" vendor="ZiiLabs"/>
>+    </enums>
>+
>+    <enums namespace="GL" start="0x8F60" end="0x8F6F" vendor="ARM" comment="For Remi Pedersen, Khronos bug 3745">
>+        <enum value="0x8F60" name="GL_MALI_SHADER_BINARY_ARM"/>
>+        <enum value="0x8F61" name="GL_MALI_PROGRAM_BINARY_ARM"/>
>+            <unused start="0x8F62" vendor="ARM"/>
>+        <enum value="0x8F63" name="GL_MAX_SHADER_PIXEL_LOCAL_STORAGE_FAST_SIZE_EXT"/>
>+        <enum value="0x8F64" name="GL_SHADER_PIXEL_LOCAL_STORAGE_EXT"/>
>+        <enum value="0x8F65" name="GL_FETCH_PER_SAMPLE_ARM"/>
>+        <enum value="0x8F66" name="GL_FRAGMENT_SHADER_FRAMEBUFFER_FETCH_MRT_ARM"/>
>+        <enum value="0x8F67" name="GL_MAX_SHADER_PIXEL_LOCAL_STORAGE_SIZE_EXT"/>
>+            <unused start="0x8F68" vendor="ARM"/>
>+        <enum value="0x8F69" name="GL_TEXTURE_ASTC_DECODE_PRECISION_EXT"/>
>+            <unused start="0x8F6A" end="0x8F6F" vendor="ARM"/>
>+    </enums>
>+
>+    <enums namespace="GL" start="0x8F70" end="0x8F7F" vendor="HI" comment="For Mark Callow, Khronos bug 4055. Shared with EGL.">
>+            <unused start="0x8F70" end="0x8F7F" vendor="HI"/>
>+    </enums>
>+
>+    <enums namespace="GL" start="0x8F80" end="0x8F8F" vendor="Zebra" comment="For Mike Weiblen, public bug 910">
>+            <unused start="0x8F80" end="0x8F8F" vendor="Zebra"/>
>+    </enums>
>+
>+    <enums namespace="GL" start="0x8F90" end="0x8F9F" vendor="ARB">
>+        <enum value="0x8F90" name="GL_RED_SNORM"/>
>+        <enum value="0x8F91" name="GL_RG_SNORM"/>
>+        <enum value="0x8F92" name="GL_RGB_SNORM"/>
>+        <enum value="0x8F93" name="GL_RGBA_SNORM"/>
>+        <enum value="0x8F94" name="GL_R8_SNORM"/>
>+        <enum value="0x8F95" name="GL_RG8_SNORM"/>
>+        <enum value="0x8F96" name="GL_RGB8_SNORM"/>
>+        <enum value="0x8F97" name="GL_RGBA8_SNORM"/>
>+        <enum value="0x8F98" name="GL_R16_SNORM"/>
>+        <enum value="0x8F98" name="GL_R16_SNORM_EXT"/>
>+        <enum value="0x8F99" name="GL_RG16_SNORM"/>
>+        <enum value="0x8F99" name="GL_RG16_SNORM_EXT"/>
>+        <enum value="0x8F9A" name="GL_RGB16_SNORM"/>
>+        <enum value="0x8F9A" name="GL_RGB16_SNORM_EXT"/>
>+        <enum value="0x8F9B" name="GL_RGBA16_SNORM"/>
>+        <enum value="0x8F9B" name="GL_RGBA16_SNORM_EXT"/>
>+        <enum value="0x8F9C" name="GL_SIGNED_NORMALIZED"/>
>+        <enum value="0x8F9D" name="GL_PRIMITIVE_RESTART"/>
>+        <enum value="0x8F9E" name="GL_PRIMITIVE_RESTART_INDEX"/>
>+        <enum value="0x8F9F" name="GL_MAX_PROGRAM_TEXTURE_GATHER_COMPONENTS_ARB"/>
>+    </enums>
>+
>+    <enums namespace="GL" start="0x8FA0" end="0x8FBF" vendor="QCOM" comment="For Maurice Ribble, bug 4512">
>+        <enum value="0x8FA0" name="GL_PERFMON_GLOBAL_MODE_QCOM"/>
>+            <unused start="0x8FA1" end="0x8FAF" vendor="QCOM"/>
>+        <enum value="0x8FB0" name="GL_BINNING_CONTROL_HINT_QCOM"/>
>+        <enum value="0x8FB1" name="GL_CPU_OPTIMIZED_QCOM"/>
>+        <enum value="0x8FB2" name="GL_GPU_OPTIMIZED_QCOM"/>
>+        <enum value="0x8FB3" name="GL_RENDER_DIRECT_TO_FRAMEBUFFER_QCOM"/>
>+            <unused start="0x8FB4" end="0x8FBA" vendor="QCOM"/>
>+        <enum value="0x8FBB" name="GL_GPU_DISJOINT_EXT"/>
>+            <unused start="0x8FBC" vendor="QCOM"/>
>+        <enum value="0x8FBD" name="GL_SR8_EXT"/>
>+        <enum value="0x8FBE" name="GL_SRG8_EXT"/>
>+        <enum value="0x8FBF" name="GL_TEXTURE_FORMAT_SRGB_OVERRIDE_EXT"/>
>+    </enums>
>+
>+    <enums namespace="GL" start="0x8FC0" end="0x8FDF" vendor="VIV" comment="For Frido Garritsen, bug 4526">
>+        <enum value="0x8FC4" name="GL_SHADER_BINARY_VIV"/>
>+    </enums>
>+
>+    <enums namespace="GL" start="0x8FE0" end="0x8FFF" vendor="NV" comment="For Pat Brown, bug 4935">
>+        <enum value="0x8FE0" name="GL_INT8_NV"/>
>+        <enum value="0x8FE1" name="GL_INT8_VEC2_NV"/>
>+        <enum value="0x8FE2" name="GL_INT8_VEC3_NV"/>
>+        <enum value="0x8FE3" name="GL_INT8_VEC4_NV"/>
>+        <enum value="0x8FE4" name="GL_INT16_NV"/>
>+        <enum value="0x8FE5" name="GL_INT16_VEC2_NV"/>
>+        <enum value="0x8FE6" name="GL_INT16_VEC3_NV"/>
>+        <enum value="0x8FE7" name="GL_INT16_VEC4_NV"/>
>+        <enum value="0x8FE9" name="GL_INT64_VEC2_ARB"/>
>+        <enum value="0x8FE9" name="GL_INT64_VEC2_NV"/>
>+        <enum value="0x8FEA" name="GL_INT64_VEC3_ARB"/>
>+        <enum value="0x8FEA" name="GL_INT64_VEC3_NV"/>
>+        <enum value="0x8FEB" name="GL_INT64_VEC4_ARB"/>
>+        <enum value="0x8FEB" name="GL_INT64_VEC4_NV"/>
>+        <enum value="0x8FEC" name="GL_UNSIGNED_INT8_NV"/>
>+        <enum value="0x8FED" name="GL_UNSIGNED_INT8_VEC2_NV"/>
>+        <enum value="0x8FEE" name="GL_UNSIGNED_INT8_VEC3_NV"/>
>+        <enum value="0x8FEF" name="GL_UNSIGNED_INT8_VEC4_NV"/>
>+        <enum value="0x8FF0" name="GL_UNSIGNED_INT16_NV"/>
>+        <enum value="0x8FF1" name="GL_UNSIGNED_INT16_VEC2_NV"/>
>+        <enum value="0x8FF2" name="GL_UNSIGNED_INT16_VEC3_NV"/>
>+        <enum value="0x8FF3" name="GL_UNSIGNED_INT16_VEC4_NV"/>
>+        <enum value="0x8FF5" name="GL_UNSIGNED_INT64_VEC2_ARB"/>
>+        <enum value="0x8FF5" name="GL_UNSIGNED_INT64_VEC2_NV"/>
>+        <enum value="0x8FF6" name="GL_UNSIGNED_INT64_VEC3_ARB"/>
>+        <enum value="0x8FF6" name="GL_UNSIGNED_INT64_VEC3_NV"/>
>+        <enum value="0x8FF7" name="GL_UNSIGNED_INT64_VEC4_ARB"/>
>+        <enum value="0x8FF7" name="GL_UNSIGNED_INT64_VEC4_NV"/>
>+        <enum value="0x8FF8" name="GL_FLOAT16_NV"/>
>+        <enum value="0x8FF9" name="GL_FLOAT16_VEC2_NV"/>
>+        <enum value="0x8FFA" name="GL_FLOAT16_VEC3_NV"/>
>+        <enum value="0x8FFB" name="GL_FLOAT16_VEC4_NV"/>
>+        <enum value="0x8FFC" name="GL_DOUBLE_VEC2"/>
>+        <enum value="0x8FFC" name="GL_DOUBLE_VEC2_EXT"/>
>+        <enum value="0x8FFD" name="GL_DOUBLE_VEC3"/>
>+        <enum value="0x8FFD" name="GL_DOUBLE_VEC3_EXT"/>
>+        <enum value="0x8FFE" name="GL_DOUBLE_VEC4"/>
>+        <enum value="0x8FFE" name="GL_DOUBLE_VEC4_EXT"/>
>+            <unused start="0x8FFF" vendor="NV"/>
>+    </enums>
>+
>+    <enums namespace="GL" start="0x9000" end="0x901F" vendor="AMD" comment="For Bill Licea-Kane">
>+        <enum value="0x9001" name="GL_SAMPLER_BUFFER_AMD"/>
>+        <enum value="0x9002" name="GL_INT_SAMPLER_BUFFER_AMD"/>
>+        <enum value="0x9003" name="GL_UNSIGNED_INT_SAMPLER_BUFFER_AMD"/>
>+        <enum value="0x9004" name="GL_TESSELLATION_MODE_AMD"/>
>+        <enum value="0x9005" name="GL_TESSELLATION_FACTOR_AMD"/>
>+        <enum value="0x9006" name="GL_DISCRETE_AMD"/>
>+        <enum value="0x9007" name="GL_CONTINUOUS_AMD"/>
>+            <unused start="0x9008" vendor="AMD"/>
>+        <enum value="0x9009" name="GL_TEXTURE_CUBE_MAP_ARRAY"/>
>+        <enum value="0x9009" name="GL_TEXTURE_CUBE_MAP_ARRAY_ARB"/>
>+        <enum value="0x9009" name="GL_TEXTURE_CUBE_MAP_ARRAY_EXT"/>
>+        <enum value="0x9009" name="GL_TEXTURE_CUBE_MAP_ARRAY_OES"/>
>+        <enum value="0x900A" name="GL_TEXTURE_BINDING_CUBE_MAP_ARRAY"/>
>+        <enum value="0x900A" name="GL_TEXTURE_BINDING_CUBE_MAP_ARRAY_ARB"/>
>+        <enum value="0x900A" name="GL_TEXTURE_BINDING_CUBE_MAP_ARRAY_EXT"/>
>+        <enum value="0x900A" name="GL_TEXTURE_BINDING_CUBE_MAP_ARRAY_OES"/>
>+        <enum value="0x900B" name="GL_PROXY_TEXTURE_CUBE_MAP_ARRAY"/>
>+        <enum value="0x900B" name="GL_PROXY_TEXTURE_CUBE_MAP_ARRAY_ARB"/>
>+        <enum value="0x900C" name="GL_SAMPLER_CUBE_MAP_ARRAY"/>
>+        <enum value="0x900C" name="GL_SAMPLER_CUBE_MAP_ARRAY_ARB"/>
>+        <enum value="0x900C" name="GL_SAMPLER_CUBE_MAP_ARRAY_EXT"/>
>+        <enum value="0x900C" name="GL_SAMPLER_CUBE_MAP_ARRAY_OES"/>
>+        <enum value="0x900D" name="GL_SAMPLER_CUBE_MAP_ARRAY_SHADOW"/>
>+        <enum value="0x900D" name="GL_SAMPLER_CUBE_MAP_ARRAY_SHADOW_ARB"/>
>+        <enum value="0x900D" name="GL_SAMPLER_CUBE_MAP_ARRAY_SHADOW_EXT"/>
>+        <enum value="0x900D" name="GL_SAMPLER_CUBE_MAP_ARRAY_SHADOW_OES"/>
>+        <enum value="0x900E" name="GL_INT_SAMPLER_CUBE_MAP_ARRAY"/>
>+        <enum value="0x900E" name="GL_INT_SAMPLER_CUBE_MAP_ARRAY_ARB"/>
>+        <enum value="0x900E" name="GL_INT_SAMPLER_CUBE_MAP_ARRAY_EXT"/>
>+        <enum value="0x900E" name="GL_INT_SAMPLER_CUBE_MAP_ARRAY_OES"/>
>+        <enum value="0x900F" name="GL_UNSIGNED_INT_SAMPLER_CUBE_MAP_ARRAY"/>
>+        <enum value="0x900F" name="GL_UNSIGNED_INT_SAMPLER_CUBE_MAP_ARRAY_ARB"/>
>+        <enum value="0x900F" name="GL_UNSIGNED_INT_SAMPLER_CUBE_MAP_ARRAY_EXT"/>
>+        <enum value="0x900F" name="GL_UNSIGNED_INT_SAMPLER_CUBE_MAP_ARRAY_OES"/>
>+        <enum value="0x9010" name="GL_ALPHA_SNORM"/>
>+        <enum value="0x9011" name="GL_LUMINANCE_SNORM"/>
>+        <enum value="0x9012" name="GL_LUMINANCE_ALPHA_SNORM"/>
>+        <enum value="0x9013" name="GL_INTENSITY_SNORM"/>
>+        <enum value="0x9014" name="GL_ALPHA8_SNORM"/>
>+        <enum value="0x9015" name="GL_LUMINANCE8_SNORM"/>
>+        <enum value="0x9016" name="GL_LUMINANCE8_ALPHA8_SNORM"/>
>+        <enum value="0x9017" name="GL_INTENSITY8_SNORM"/>
>+        <enum value="0x9018" name="GL_ALPHA16_SNORM"/>
>+        <enum value="0x9019" name="GL_LUMINANCE16_SNORM"/>
>+        <enum value="0x901A" name="GL_LUMINANCE16_ALPHA16_SNORM"/>
>+        <enum value="0x901B" name="GL_INTENSITY16_SNORM"/>
>+        <enum value="0x901C" name="GL_FACTOR_MIN_AMD"/>
>+        <enum value="0x901D" name="GL_FACTOR_MAX_AMD"/>
>+        <enum value="0x901E" name="GL_DEPTH_CLAMP_NEAR_AMD"/>
>+        <enum value="0x901F" name="GL_DEPTH_CLAMP_FAR_AMD"/>
>+    </enums>
>+
>+    <enums namespace="GL" start="0x9020" end="0x90FF" vendor="NV" comment="For Pat Brown, bug 4935">
>+        <enum value="0x9020" name="GL_VIDEO_BUFFER_NV"/>
>+        <enum value="0x9021" name="GL_VIDEO_BUFFER_BINDING_NV"/>
>+        <enum value="0x9022" name="GL_FIELD_UPPER_NV"/>
>+        <enum value="0x9023" name="GL_FIELD_LOWER_NV"/>
>+        <enum value="0x9024" name="GL_NUM_VIDEO_CAPTURE_STREAMS_NV"/>
>+        <enum value="0x9025" name="GL_NEXT_VIDEO_CAPTURE_BUFFER_STATUS_NV"/>
>+        <enum value="0x9026" name="GL_VIDEO_CAPTURE_TO_422_SUPPORTED_NV"/>
>+        <enum value="0x9027" name="GL_LAST_VIDEO_CAPTURE_STATUS_NV"/>
>+        <enum value="0x9028" name="GL_VIDEO_BUFFER_PITCH_NV"/>
>+        <enum value="0x9029" name="GL_VIDEO_COLOR_CONVERSION_MATRIX_NV"/>
>+        <enum value="0x902A" name="GL_VIDEO_COLOR_CONVERSION_MAX_NV"/>
>+        <enum value="0x902B" name="GL_VIDEO_COLOR_CONVERSION_MIN_NV"/>
>+        <enum value="0x902C" name="GL_VIDEO_COLOR_CONVERSION_OFFSET_NV"/>
>+        <enum value="0x902D" name="GL_VIDEO_BUFFER_INTERNAL_FORMAT_NV"/>
>+        <enum value="0x902E" name="GL_PARTIAL_SUCCESS_NV"/>
>+        <enum value="0x902F" name="GL_SUCCESS_NV"/>
>+        <enum value="0x9030" name="GL_FAILURE_NV"/>
>+        <enum value="0x9031" name="GL_YCBYCR8_422_NV"/>
>+        <enum value="0x9032" name="GL_YCBAYCR8A_4224_NV"/>
>+        <enum value="0x9033" name="GL_Z6Y10Z6CB10Z6Y10Z6CR10_422_NV"/>
>+        <enum value="0x9034" name="GL_Z6Y10Z6CB10Z6A10Z6Y10Z6CR10Z6A10_4224_NV"/>
>+        <enum value="0x9035" name="GL_Z4Y12Z4CB12Z4Y12Z4CR12_422_NV"/>
>+        <enum value="0x9036" name="GL_Z4Y12Z4CB12Z4A12Z4Y12Z4CR12Z4A12_4224_NV"/>
>+        <enum value="0x9037" name="GL_Z4Y12Z4CB12Z4CR12_444_NV"/>
>+        <enum value="0x9038" name="GL_VIDEO_CAPTURE_FRAME_WIDTH_NV"/>
>+        <enum value="0x9039" name="GL_VIDEO_CAPTURE_FRAME_HEIGHT_NV"/>
>+        <enum value="0x903A" name="GL_VIDEO_CAPTURE_FIELD_UPPER_HEIGHT_NV"/>
>+        <enum value="0x903B" name="GL_VIDEO_CAPTURE_FIELD_LOWER_HEIGHT_NV"/>
>+        <enum value="0x903C" name="GL_VIDEO_CAPTURE_SURFACE_ORIGIN_NV"/>
>+            <unused start="0x903D" end="0x9044" vendor="NV"/>
>+        <enum value="0x9045" name="GL_TEXTURE_COVERAGE_SAMPLES_NV"/>
>+        <enum value="0x9046" name="GL_TEXTURE_COLOR_SAMPLES_NV"/>
>+        <enum value="0x9047" name="GL_GPU_MEMORY_INFO_DEDICATED_VIDMEM_NVX"/>
>+        <enum value="0x9048" name="GL_GPU_MEMORY_INFO_TOTAL_AVAILABLE_MEMORY_NVX"/>
>+        <enum value="0x9049" name="GL_GPU_MEMORY_INFO_CURRENT_AVAILABLE_VIDMEM_NVX"/>
>+        <enum value="0x904A" name="GL_GPU_MEMORY_INFO_EVICTION_COUNT_NVX"/>
>+        <enum value="0x904B" name="GL_GPU_MEMORY_INFO_EVICTED_MEMORY_NVX"/>
>+        <enum value="0x904C" name="GL_IMAGE_1D"/>
>+        <enum value="0x904C" name="GL_IMAGE_1D_EXT"/>
>+        <enum value="0x904D" name="GL_IMAGE_2D"/>
>+        <enum value="0x904D" name="GL_IMAGE_2D_EXT"/>
>+        <enum value="0x904E" name="GL_IMAGE_3D"/>
>+        <enum value="0x904E" name="GL_IMAGE_3D_EXT"/>
>+        <enum value="0x904F" name="GL_IMAGE_2D_RECT"/>
>+        <enum value="0x904F" name="GL_IMAGE_2D_RECT_EXT"/>
>+        <enum value="0x9050" name="GL_IMAGE_CUBE"/>
>+        <enum value="0x9050" name="GL_IMAGE_CUBE_EXT"/>
>+        <enum value="0x9051" name="GL_IMAGE_BUFFER"/>
>+        <enum value="0x9051" name="GL_IMAGE_BUFFER_EXT"/>
>+        <enum value="0x9051" name="GL_IMAGE_BUFFER_OES"/>
>+        <enum value="0x9052" name="GL_IMAGE_1D_ARRAY"/>
>+        <enum value="0x9052" name="GL_IMAGE_1D_ARRAY_EXT"/>
>+        <enum value="0x9053" name="GL_IMAGE_2D_ARRAY"/>
>+        <enum value="0x9053" name="GL_IMAGE_2D_ARRAY_EXT"/>
>+        <enum value="0x9054" name="GL_IMAGE_CUBE_MAP_ARRAY"/>
>+        <enum value="0x9054" name="GL_IMAGE_CUBE_MAP_ARRAY_EXT"/>
>+        <enum value="0x9054" name="GL_IMAGE_CUBE_MAP_ARRAY_OES"/>
>+        <enum value="0x9055" name="GL_IMAGE_2D_MULTISAMPLE"/>
>+        <enum value="0x9055" name="GL_IMAGE_2D_MULTISAMPLE_EXT"/>
>+        <enum value="0x9056" name="GL_IMAGE_2D_MULTISAMPLE_ARRAY"/>
>+        <enum value="0x9056" name="GL_IMAGE_2D_MULTISAMPLE_ARRAY_EXT"/>
>+        <enum value="0x9057" name="GL_INT_IMAGE_1D"/>
>+        <enum value="0x9057" name="GL_INT_IMAGE_1D_EXT"/>
>+        <enum value="0x9058" name="GL_INT_IMAGE_2D"/>
>+        <enum value="0x9058" name="GL_INT_IMAGE_2D_EXT"/>
>+        <enum value="0x9059" name="GL_INT_IMAGE_3D"/>
>+        <enum value="0x9059" name="GL_INT_IMAGE_3D_EXT"/>
>+        <enum value="0x905A" name="GL_INT_IMAGE_2D_RECT"/>
>+        <enum value="0x905A" name="GL_INT_IMAGE_2D_RECT_EXT"/>
>+        <enum value="0x905B" name="GL_INT_IMAGE_CUBE"/>
>+        <enum value="0x905B" name="GL_INT_IMAGE_CUBE_EXT"/>
>+        <enum value="0x905C" name="GL_INT_IMAGE_BUFFER"/>
>+        <enum value="0x905C" name="GL_INT_IMAGE_BUFFER_EXT"/>
>+        <enum value="0x905C" name="GL_INT_IMAGE_BUFFER_OES"/>
>+        <enum value="0x905D" name="GL_INT_IMAGE_1D_ARRAY"/>
>+        <enum value="0x905D" name="GL_INT_IMAGE_1D_ARRAY_EXT"/>
>+        <enum value="0x905E" name="GL_INT_IMAGE_2D_ARRAY"/>
>+        <enum value="0x905E" name="GL_INT_IMAGE_2D_ARRAY_EXT"/>
>+        <enum value="0x905F" name="GL_INT_IMAGE_CUBE_MAP_ARRAY"/>
>+        <enum value="0x905F" name="GL_INT_IMAGE_CUBE_MAP_ARRAY_EXT"/>
>+        <enum value="0x905F" name="GL_INT_IMAGE_CUBE_MAP_ARRAY_OES"/>
>+        <enum value="0x9060" name="GL_INT_IMAGE_2D_MULTISAMPLE"/>
>+        <enum value="0x9060" name="GL_INT_IMAGE_2D_MULTISAMPLE_EXT"/>
>+        <enum value="0x9061" name="GL_INT_IMAGE_2D_MULTISAMPLE_ARRAY"/>
>+        <enum value="0x9061" name="GL_INT_IMAGE_2D_MULTISAMPLE_ARRAY_EXT"/>
>+        <enum value="0x9062" name="GL_UNSIGNED_INT_IMAGE_1D"/>
>+        <enum value="0x9062" name="GL_UNSIGNED_INT_IMAGE_1D_EXT"/>
>+        <enum value="0x9063" name="GL_UNSIGNED_INT_IMAGE_2D"/>
>+        <enum value="0x9063" name="GL_UNSIGNED_INT_IMAGE_2D_EXT"/>
>+        <enum value="0x9064" name="GL_UNSIGNED_INT_IMAGE_3D"/>
>+        <enum value="0x9064" name="GL_UNSIGNED_INT_IMAGE_3D_EXT"/>
>+        <enum value="0x9065" name="GL_UNSIGNED_INT_IMAGE_2D_RECT"/>
>+        <enum value="0x9065" name="GL_UNSIGNED_INT_IMAGE_2D_RECT_EXT"/>
>+        <enum value="0x9066" name="GL_UNSIGNED_INT_IMAGE_CUBE"/>
>+        <enum value="0x9066" name="GL_UNSIGNED_INT_IMAGE_CUBE_EXT"/>
>+        <enum value="0x9067" name="GL_UNSIGNED_INT_IMAGE_BUFFER"/>
>+        <enum value="0x9067" name="GL_UNSIGNED_INT_IMAGE_BUFFER_EXT"/>
>+        <enum value="0x9067" name="GL_UNSIGNED_INT_IMAGE_BUFFER_OES"/>
>+        <enum value="0x9068" name="GL_UNSIGNED_INT_IMAGE_1D_ARRAY"/>
>+        <enum value="0x9068" name="GL_UNSIGNED_INT_IMAGE_1D_ARRAY_EXT"/>
>+        <enum value="0x9069" name="GL_UNSIGNED_INT_IMAGE_2D_ARRAY"/>
>+        <enum value="0x9069" name="GL_UNSIGNED_INT_IMAGE_2D_ARRAY_EXT"/>
>+        <enum value="0x906A" name="GL_UNSIGNED_INT_IMAGE_CUBE_MAP_ARRAY"/>
>+        <enum value="0x906A" name="GL_UNSIGNED_INT_IMAGE_CUBE_MAP_ARRAY_EXT"/>
>+        <enum value="0x906A" name="GL_UNSIGNED_INT_IMAGE_CUBE_MAP_ARRAY_OES"/>
>+        <enum value="0x906B" name="GL_UNSIGNED_INT_IMAGE_2D_MULTISAMPLE"/>
>+        <enum value="0x906B" name="GL_UNSIGNED_INT_IMAGE_2D_MULTISAMPLE_EXT"/>
>+        <enum value="0x906C" name="GL_UNSIGNED_INT_IMAGE_2D_MULTISAMPLE_ARRAY"/>
>+        <enum value="0x906C" name="GL_UNSIGNED_INT_IMAGE_2D_MULTISAMPLE_ARRAY_EXT"/>
>+        <enum value="0x906D" name="GL_MAX_IMAGE_SAMPLES"/>
>+        <enum value="0x906D" name="GL_MAX_IMAGE_SAMPLES_EXT"/>
>+        <enum value="0x906E" name="GL_IMAGE_BINDING_FORMAT"/>
>+        <enum value="0x906E" name="GL_IMAGE_BINDING_FORMAT_EXT"/>
>+        <enum value="0x906F" name="GL_RGB10_A2UI"/>
>+        <enum value="0x9070" name="GL_PATH_FORMAT_SVG_NV"/>
>+        <enum value="0x9071" name="GL_PATH_FORMAT_PS_NV"/>
>+        <enum value="0x9072" name="GL_STANDARD_FONT_NAME_NV"/>
>+        <enum value="0x9073" name="GL_SYSTEM_FONT_NAME_NV"/>
>+        <enum value="0x9074" name="GL_FILE_NAME_NV"/>
>+        <enum value="0x9075" name="GL_PATH_STROKE_WIDTH_NV"/>
>+        <enum value="0x9076" name="GL_PATH_END_CAPS_NV"/>
>+        <enum value="0x9077" name="GL_PATH_INITIAL_END_CAP_NV"/>
>+        <enum value="0x9078" name="GL_PATH_TERMINAL_END_CAP_NV"/>
>+        <enum value="0x9079" name="GL_PATH_JOIN_STYLE_NV"/>
>+        <enum value="0x907A" name="GL_PATH_MITER_LIMIT_NV"/>
>+        <enum value="0x907B" name="GL_PATH_DASH_CAPS_NV"/>
>+        <enum value="0x907C" name="GL_PATH_INITIAL_DASH_CAP_NV"/>
>+        <enum value="0x907D" name="GL_PATH_TERMINAL_DASH_CAP_NV"/>
>+        <enum value="0x907E" name="GL_PATH_DASH_OFFSET_NV"/>
>+        <enum value="0x907F" name="GL_PATH_CLIENT_LENGTH_NV"/>
>+        <enum value="0x9080" name="GL_PATH_FILL_MODE_NV"/>
>+        <enum value="0x9081" name="GL_PATH_FILL_MASK_NV"/>
>+        <enum value="0x9082" name="GL_PATH_FILL_COVER_MODE_NV"/>
>+        <enum value="0x9083" name="GL_PATH_STROKE_COVER_MODE_NV"/>
>+        <enum value="0x9084" name="GL_PATH_STROKE_MASK_NV"/>
>+            
>+            
>+            
>+        <enum value="0x9088" name="GL_COUNT_UP_NV"/>
>+        <enum value="0x9089" name="GL_COUNT_DOWN_NV"/>
>+        <enum value="0x908A" name="GL_PATH_OBJECT_BOUNDING_BOX_NV"/>
>+        <enum value="0x908B" name="GL_CONVEX_HULL_NV"/>
>+            
>+        <enum value="0x908D" name="GL_BOUNDING_BOX_NV"/>
>+        <enum value="0x908E" name="GL_TRANSLATE_X_NV"/>
>+        <enum value="0x908F" name="GL_TRANSLATE_Y_NV"/>
>+        <enum value="0x9090" name="GL_TRANSLATE_2D_NV"/>
>+        <enum value="0x9091" name="GL_TRANSLATE_3D_NV"/>
>+        <enum value="0x9092" name="GL_AFFINE_2D_NV"/>
>+            
>+        <enum value="0x9094" name="GL_AFFINE_3D_NV"/>
>+            
>+        <enum value="0x9096" name="GL_TRANSPOSE_AFFINE_2D_NV"/>
>+            
>+        <enum value="0x9098" name="GL_TRANSPOSE_AFFINE_3D_NV"/>
>+            
>+        <enum value="0x909A" name="GL_UTF8_NV"/>
>+        <enum value="0x909B" name="GL_UTF16_NV"/>
>+        <enum value="0x909C" name="GL_BOUNDING_BOX_OF_BOUNDING_BOXES_NV"/>
>+        <enum value="0x909D" name="GL_PATH_COMMAND_COUNT_NV"/>
>+        <enum value="0x909E" name="GL_PATH_COORD_COUNT_NV"/>
>+        <enum value="0x909F" name="GL_PATH_DASH_ARRAY_COUNT_NV"/>
>+        <enum value="0x90A0" name="GL_PATH_COMPUTED_LENGTH_NV"/>
>+        <enum value="0x90A1" name="GL_PATH_FILL_BOUNDING_BOX_NV"/>
>+        <enum value="0x90A2" name="GL_PATH_STROKE_BOUNDING_BOX_NV"/>
>+        <enum value="0x90A3" name="GL_SQUARE_NV"/>
>+        <enum value="0x90A4" name="GL_ROUND_NV"/>
>+        <enum value="0x90A5" name="GL_TRIANGULAR_NV"/>
>+        <enum value="0x90A6" name="GL_BEVEL_NV"/>
>+        <enum value="0x90A7" name="GL_MITER_REVERT_NV"/>
>+        <enum value="0x90A8" name="GL_MITER_TRUNCATE_NV"/>
>+        <enum value="0x90A9" name="GL_SKIP_MISSING_GLYPH_NV"/>
>+        <enum value="0x90AA" name="GL_USE_MISSING_GLYPH_NV"/>
>+        <enum value="0x90AB" name="GL_PATH_ERROR_POSITION_NV"/>
>+        <enum value="0x90AC" name="GL_PATH_FOG_GEN_MODE_NV"/>
>+        <enum value="0x90AD" name="GL_ACCUM_ADJACENT_PAIRS_NV"/>
>+        <enum value="0x90AE" name="GL_ADJACENT_PAIRS_NV"/>
>+        <enum value="0x90AF" name="GL_FIRST_TO_REST_NV"/>
>+        <enum value="0x90B0" name="GL_PATH_GEN_MODE_NV"/>
>+        <enum value="0x90B1" name="GL_PATH_GEN_COEFF_NV"/>
>+        <enum value="0x90B2" name="GL_PATH_GEN_COLOR_FORMAT_NV"/>
>+        <enum value="0x90B3" name="GL_PATH_GEN_COMPONENTS_NV"/>
>+        <enum value="0x90B4" name="GL_PATH_DASH_OFFSET_RESET_NV"/>
>+        <enum value="0x90B5" name="GL_MOVE_TO_RESETS_NV"/>
>+        <enum value="0x90B6" name="GL_MOVE_TO_CONTINUES_NV"/>
>+        <enum value="0x90B7" name="GL_PATH_STENCIL_FUNC_NV"/>
>+        <enum value="0x90B8" name="GL_PATH_STENCIL_REF_NV"/>
>+        <enum value="0x90B9" name="GL_PATH_STENCIL_VALUE_MASK_NV"/>
>+        <enum value="0x90BA" name="GL_SCALED_RESOLVE_FASTEST_EXT"/>
>+        <enum value="0x90BB" name="GL_SCALED_RESOLVE_NICEST_EXT"/>
>+        <enum value="0x90BC" name="GL_MIN_MAP_BUFFER_ALIGNMENT"/>
>+        <enum value="0x90BD" name="GL_PATH_STENCIL_DEPTH_OFFSET_FACTOR_NV"/>
>+        <enum value="0x90BE" name="GL_PATH_STENCIL_DEPTH_OFFSET_UNITS_NV"/>
>+        <enum value="0x90BF" name="GL_PATH_COVER_DEPTH_FUNC_NV"/>
>+            <unused start="0x90C0" end="0x90C6" vendor="NV"/>
>+        <enum value="0x90C7" name="GL_IMAGE_FORMAT_COMPATIBILITY_TYPE"/>
>+        <enum value="0x90C8" name="GL_IMAGE_FORMAT_COMPATIBILITY_BY_SIZE"/>
>+        <enum value="0x90C9" name="GL_IMAGE_FORMAT_COMPATIBILITY_BY_CLASS"/>
>+        <enum value="0x90CA" name="GL_MAX_VERTEX_IMAGE_UNIFORMS"/>
>+        <enum value="0x90CB" name="GL_MAX_TESS_CONTROL_IMAGE_UNIFORMS"/>
>+        <enum value="0x90CB" name="GL_MAX_TESS_CONTROL_IMAGE_UNIFORMS_EXT"/>
>+        <enum value="0x90CB" name="GL_MAX_TESS_CONTROL_IMAGE_UNIFORMS_OES"/>
>+        <enum value="0x90CC" name="GL_MAX_TESS_EVALUATION_IMAGE_UNIFORMS"/>
>+        <enum value="0x90CC" name="GL_MAX_TESS_EVALUATION_IMAGE_UNIFORMS_EXT"/>
>+        <enum value="0x90CC" name="GL_MAX_TESS_EVALUATION_IMAGE_UNIFORMS_OES"/>
>+        <enum value="0x90CD" name="GL_MAX_GEOMETRY_IMAGE_UNIFORMS"/>
>+        <enum value="0x90CD" name="GL_MAX_GEOMETRY_IMAGE_UNIFORMS_EXT"/>
>+        <enum value="0x90CD" name="GL_MAX_GEOMETRY_IMAGE_UNIFORMS_OES"/>
>+        <enum value="0x90CE" name="GL_MAX_FRAGMENT_IMAGE_UNIFORMS"/>
>+        <enum value="0x90CF" name="GL_MAX_COMBINED_IMAGE_UNIFORMS"/>
>+        <enum value="0x90D0" name="GL_MAX_DEEP_3D_TEXTURE_WIDTH_HEIGHT_NV"/>
>+        <enum value="0x90D1" name="GL_MAX_DEEP_3D_TEXTURE_DEPTH_NV"/>
>+        <enum value="0x90D2" name="GL_SHADER_STORAGE_BUFFER"/>
>+        <enum value="0x90D3" name="GL_SHADER_STORAGE_BUFFER_BINDING"/>
>+        <enum value="0x90D4" name="GL_SHADER_STORAGE_BUFFER_START"/>
>+        <enum value="0x90D5" name="GL_SHADER_STORAGE_BUFFER_SIZE"/>
>+        <enum value="0x90D6" name="GL_MAX_VERTEX_SHADER_STORAGE_BLOCKS"/>
>+        <enum value="0x90D7" name="GL_MAX_GEOMETRY_SHADER_STORAGE_BLOCKS"/>
>+        <enum value="0x90D7" name="GL_MAX_GEOMETRY_SHADER_STORAGE_BLOCKS_EXT"/>
>+        <enum value="0x90D7" name="GL_MAX_GEOMETRY_SHADER_STORAGE_BLOCKS_OES"/>
>+        <enum value="0x90D8" name="GL_MAX_TESS_CONTROL_SHADER_STORAGE_BLOCKS"/>
>+        <enum value="0x90D8" name="GL_MAX_TESS_CONTROL_SHADER_STORAGE_BLOCKS_EXT"/>
>+        <enum value="0x90D8" name="GL_MAX_TESS_CONTROL_SHADER_STORAGE_BLOCKS_OES"/>
>+        <enum value="0x90D9" name="GL_MAX_TESS_EVALUATION_SHADER_STORAGE_BLOCKS"/>
>+        <enum value="0x90D9" name="GL_MAX_TESS_EVALUATION_SHADER_STORAGE_BLOCKS_EXT"/>
>+        <enum value="0x90D9" name="GL_MAX_TESS_EVALUATION_SHADER_STORAGE_BLOCKS_OES"/>
>+        <enum value="0x90DA" name="GL_MAX_FRAGMENT_SHADER_STORAGE_BLOCKS"/>
>+        <enum value="0x90DB" name="GL_MAX_COMPUTE_SHADER_STORAGE_BLOCKS"/>
>+        <enum value="0x90DC" name="GL_MAX_COMBINED_SHADER_STORAGE_BLOCKS"/>
>+        <enum value="0x90DD" name="GL_MAX_SHADER_STORAGE_BUFFER_BINDINGS"/>
>+        <enum value="0x90DE" name="GL_MAX_SHADER_STORAGE_BLOCK_SIZE"/>
>+        <enum value="0x90DF" name="GL_SHADER_STORAGE_BUFFER_OFFSET_ALIGNMENT"/>
>+            <unused start="0x90E0" vendor="NV"/>
>+        <enum value="0x90E1" name="GL_SYNC_X11_FENCE_EXT"/>
>+            <unused start="0x90E2" end="0x90E9" vendor="NV"/>
>+        <enum value="0x90EA" name="GL_DEPTH_STENCIL_TEXTURE_MODE"/>
>+        <enum value="0x90EB" name="GL_MAX_COMPUTE_WORK_GROUP_INVOCATIONS"/>
>+        <enum value="0x90EB" name="GL_MAX_COMPUTE_FIXED_GROUP_INVOCATIONS_ARB" alias="GL_MAX_COMPUTE_WORK_GROUP_INVOCATIONS"/>
>+        <enum value="0x90EC" name="GL_UNIFORM_BLOCK_REFERENCED_BY_COMPUTE_SHADER"/>
>+        <enum value="0x90ED" name="GL_ATOMIC_COUNTER_BUFFER_REFERENCED_BY_COMPUTE_SHADER"/>
>+        <enum value="0x90EE" name="GL_DISPATCH_INDIRECT_BUFFER"/>
>+        <enum value="0x90EF" name="GL_DISPATCH_INDIRECT_BUFFER_BINDING"/>
>+        <enum value="0x90F0" name="GL_COLOR_ATTACHMENT_EXT"/>
>+        <enum value="0x90F1" name="GL_MULTIVIEW_EXT"/>
>+        <enum value="0x90F2" name="GL_MAX_MULTIVIEW_BUFFERS_EXT"/>
>+        <enum value="0x90F3" name="GL_CONTEXT_ROBUST_ACCESS"/>
>+        <enum value="0x90F3" name="GL_CONTEXT_ROBUST_ACCESS_EXT"/>
>+        <enum value="0x90F3" name="GL_CONTEXT_ROBUST_ACCESS_KHR"/>
>+            <unused start="0x90F4" end="0x90FA" vendor="NV"/>
>+        <enum value="0x90FB" name="GL_COMPUTE_PROGRAM_NV"/>
>+        <enum value="0x90FC" name="GL_COMPUTE_PROGRAM_PARAMETER_BUFFER_NV"/>
>+            <unused start="0x90FD" end="0x90FF" vendor="NV"/>
>+    </enums>
>+
>+    <enums namespace="GL" start="0x9100" end="0x912F" vendor="ARB">
>+        <enum value="0x9100" name="GL_TEXTURE_2D_MULTISAMPLE"/>
>+        <enum value="0x9101" name="GL_PROXY_TEXTURE_2D_MULTISAMPLE"/>
>+        <enum value="0x9102" name="GL_TEXTURE_2D_MULTISAMPLE_ARRAY"/>
>+        <enum value="0x9102" name="GL_TEXTURE_2D_MULTISAMPLE_ARRAY_OES"/>
>+        <enum value="0x9103" name="GL_PROXY_TEXTURE_2D_MULTISAMPLE_ARRAY"/>
>+        <enum value="0x9104" name="GL_TEXTURE_BINDING_2D_MULTISAMPLE"/>
>+        <enum value="0x9105" name="GL_TEXTURE_BINDING_2D_MULTISAMPLE_ARRAY"/>
>+        <enum value="0x9105" name="GL_TEXTURE_BINDING_2D_MULTISAMPLE_ARRAY_OES"/>
>+        <enum value="0x9106" name="GL_TEXTURE_SAMPLES"/>
>+        <enum value="0x9107" name="GL_TEXTURE_FIXED_SAMPLE_LOCATIONS"/>
>+        <enum value="0x9108" name="GL_SAMPLER_2D_MULTISAMPLE"/>
>+        <enum value="0x9109" name="GL_INT_SAMPLER_2D_MULTISAMPLE"/>
>+        <enum value="0x910A" name="GL_UNSIGNED_INT_SAMPLER_2D_MULTISAMPLE"/>
>+        <enum value="0x910B" name="GL_SAMPLER_2D_MULTISAMPLE_ARRAY"/>
>+        <enum value="0x910B" name="GL_SAMPLER_2D_MULTISAMPLE_ARRAY_OES"/>
>+        <enum value="0x910C" name="GL_INT_SAMPLER_2D_MULTISAMPLE_ARRAY"/>
>+        <enum value="0x910C" name="GL_INT_SAMPLER_2D_MULTISAMPLE_ARRAY_OES"/>
>+        <enum value="0x910D" name="GL_UNSIGNED_INT_SAMPLER_2D_MULTISAMPLE_ARRAY"/>
>+        <enum value="0x910D" name="GL_UNSIGNED_INT_SAMPLER_2D_MULTISAMPLE_ARRAY_OES"/>
>+        <enum value="0x910E" name="GL_MAX_COLOR_TEXTURE_SAMPLES"/>
>+        <enum value="0x910F" name="GL_MAX_DEPTH_TEXTURE_SAMPLES"/>
>+        <enum value="0x9110" name="GL_MAX_INTEGER_SAMPLES"/>
>+        <enum value="0x9111" name="GL_MAX_SERVER_WAIT_TIMEOUT"/>
>+        <enum value="0x9111" name="GL_MAX_SERVER_WAIT_TIMEOUT_APPLE"/>
>+        <enum value="0x9112" name="GL_OBJECT_TYPE"/>
>+        <enum value="0x9112" name="GL_OBJECT_TYPE_APPLE"/>
>+        <enum value="0x9113" name="GL_SYNC_CONDITION"/>
>+        <enum value="0x9113" name="GL_SYNC_CONDITION_APPLE"/>
>+        <enum value="0x9114" name="GL_SYNC_STATUS"/>
>+        <enum value="0x9114" name="GL_SYNC_STATUS_APPLE"/>
>+        <enum value="0x9115" name="GL_SYNC_FLAGS"/>
>+        <enum value="0x9115" name="GL_SYNC_FLAGS_APPLE"/>
>+        <enum value="0x9116" name="GL_SYNC_FENCE"/>
>+        <enum value="0x9116" name="GL_SYNC_FENCE_APPLE"/>
>+        <enum value="0x9117" name="GL_SYNC_GPU_COMMANDS_COMPLETE"/>
>+        <enum value="0x9117" name="GL_SYNC_GPU_COMMANDS_COMPLETE_APPLE"/>
>+        <enum value="0x9118" name="GL_UNSIGNALED"/>
>+        <enum value="0x9118" name="GL_UNSIGNALED_APPLE"/>
>+        <enum value="0x9119" name="GL_SIGNALED"/>
>+        <enum value="0x9119" name="GL_SIGNALED_APPLE"/>
>+        <enum value="0x911A" name="GL_ALREADY_SIGNALED"/>
>+        <enum value="0x911A" name="GL_ALREADY_SIGNALED_APPLE"/>
>+        <enum value="0x911B" name="GL_TIMEOUT_EXPIRED"/>
>+        <enum value="0x911B" name="GL_TIMEOUT_EXPIRED_APPLE"/>
>+        <enum value="0x911C" name="GL_CONDITION_SATISFIED"/>
>+        <enum value="0x911C" name="GL_CONDITION_SATISFIED_APPLE"/>
>+        <enum value="0x911D" name="GL_WAIT_FAILED"/>
>+        <enum value="0x911D" name="GL_WAIT_FAILED_APPLE"/>
>+        <enum value="0x911F" name="GL_BUFFER_ACCESS_FLAGS"/>
>+        <enum value="0x9120" name="GL_BUFFER_MAP_LENGTH"/>
>+        <enum value="0x9121" name="GL_BUFFER_MAP_OFFSET"/>
>+        <enum value="0x9122" name="GL_MAX_VERTEX_OUTPUT_COMPONENTS"/>
>+        <enum value="0x9123" name="GL_MAX_GEOMETRY_INPUT_COMPONENTS"/>
>+        <enum value="0x9123" name="GL_MAX_GEOMETRY_INPUT_COMPONENTS_EXT"/>
>+        <enum value="0x9123" name="GL_MAX_GEOMETRY_INPUT_COMPONENTS_OES"/>
>+        <enum value="0x9124" name="GL_MAX_GEOMETRY_OUTPUT_COMPONENTS"/>
>+        <enum value="0x9124" name="GL_MAX_GEOMETRY_OUTPUT_COMPONENTS_EXT"/>
>+        <enum value="0x9124" name="GL_MAX_GEOMETRY_OUTPUT_COMPONENTS_OES"/>
>+        <enum value="0x9125" name="GL_MAX_FRAGMENT_INPUT_COMPONENTS"/>
>+        <enum value="0x9126" name="GL_CONTEXT_PROFILE_MASK"/>
>+        <enum value="0x9127" name="GL_UNPACK_COMPRESSED_BLOCK_WIDTH"/>
>+        <enum value="0x9128" name="GL_UNPACK_COMPRESSED_BLOCK_HEIGHT"/>
>+        <enum value="0x9129" name="GL_UNPACK_COMPRESSED_BLOCK_DEPTH"/>
>+        <enum value="0x912A" name="GL_UNPACK_COMPRESSED_BLOCK_SIZE"/>
>+        <enum value="0x912B" name="GL_PACK_COMPRESSED_BLOCK_WIDTH"/>
>+        <enum value="0x912C" name="GL_PACK_COMPRESSED_BLOCK_HEIGHT"/>
>+        <enum value="0x912D" name="GL_PACK_COMPRESSED_BLOCK_DEPTH"/>
>+        <enum value="0x912E" name="GL_PACK_COMPRESSED_BLOCK_SIZE"/>
>+        <enum value="0x912F" name="GL_TEXTURE_IMMUTABLE_FORMAT"/>
>+        <enum value="0x912F" name="GL_TEXTURE_IMMUTABLE_FORMAT_EXT"/>
>+    </enums>
>+
>+    <enums namespace="GL" start="0x9130" end="0x913F" vendor="IMG" comment="Khronos bug 882">
>+        <enum value="0x9130" name="GL_SGX_PROGRAM_BINARY_IMG"/>
>+            <unused start="0x9131" end="0x9132" vendor="IMG"/>
>+        <enum value="0x9133" name="GL_RENDERBUFFER_SAMPLES_IMG"/>
>+        <enum value="0x9134" name="GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE_IMG"/>
>+        <enum value="0x9135" name="GL_MAX_SAMPLES_IMG"/>
>+        <enum value="0x9136" name="GL_TEXTURE_SAMPLES_IMG"/>
>+        <enum value="0x9137" name="GL_COMPRESSED_RGBA_PVRTC_2BPPV2_IMG"/>
>+        <enum value="0x9138" name="GL_COMPRESSED_RGBA_PVRTC_4BPPV2_IMG"/>
>+        <enum value="0x9139" name="GL_CUBIC_IMG"/>
>+        <enum value="0x913A" name="GL_CUBIC_MIPMAP_NEAREST_IMG"/>
>+        <enum value="0x913B" name="GL_CUBIC_MIPMAP_LINEAR_IMG"/>
>+        <enum value="0x913C" name="GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE_AND_DOWNSAMPLE_IMG"/>
>+        <enum value="0x913D" name="GL_NUM_DOWNSAMPLE_SCALES_IMG"/>
>+        <enum value="0x913E" name="GL_DOWNSAMPLE_SCALES_IMG"/>
>+        <enum value="0x913F" name="GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_SCALE_IMG"/>
>+    </enums>
>+
>+    <enums namespace="GL" start="0x9140" end="0x923F" vendor="AMD" comment="Khronos bugs 5899, 6004">
>+            <unused start="0x9140" end="0x9142" vendor="AMD"/>
>+        <enum value="0x9143" name="GL_MAX_DEBUG_MESSAGE_LENGTH"/>
>+        <enum value="0x9143" name="GL_MAX_DEBUG_MESSAGE_LENGTH_AMD"/>
>+        <enum value="0x9143" name="GL_MAX_DEBUG_MESSAGE_LENGTH_ARB"/>
>+        <enum value="0x9143" name="GL_MAX_DEBUG_MESSAGE_LENGTH_KHR"/>
>+        <enum value="0x9144" name="GL_MAX_DEBUG_LOGGED_MESSAGES"/>
>+        <enum value="0x9144" name="GL_MAX_DEBUG_LOGGED_MESSAGES_AMD"/>
>+        <enum value="0x9144" name="GL_MAX_DEBUG_LOGGED_MESSAGES_ARB"/>
>+        <enum value="0x9144" name="GL_MAX_DEBUG_LOGGED_MESSAGES_KHR"/>
>+        <enum value="0x9145" name="GL_DEBUG_LOGGED_MESSAGES"/>
>+        <enum value="0x9145" name="GL_DEBUG_LOGGED_MESSAGES_AMD"/>
>+        <enum value="0x9145" name="GL_DEBUG_LOGGED_MESSAGES_ARB"/>
>+        <enum value="0x9145" name="GL_DEBUG_LOGGED_MESSAGES_KHR"/>
>+        <enum value="0x9146" name="GL_DEBUG_SEVERITY_HIGH"/>
>+        <enum value="0x9146" name="GL_DEBUG_SEVERITY_HIGH_AMD"/>
>+        <enum value="0x9146" name="GL_DEBUG_SEVERITY_HIGH_ARB"/>
>+        <enum value="0x9146" name="GL_DEBUG_SEVERITY_HIGH_KHR"/>
>+        <enum value="0x9147" name="GL_DEBUG_SEVERITY_MEDIUM"/>
>+        <enum value="0x9147" name="GL_DEBUG_SEVERITY_MEDIUM_AMD"/>
>+        <enum value="0x9147" name="GL_DEBUG_SEVERITY_MEDIUM_ARB"/>
>+        <enum value="0x9147" name="GL_DEBUG_SEVERITY_MEDIUM_KHR"/>
>+        <enum value="0x9148" name="GL_DEBUG_SEVERITY_LOW"/>
>+        <enum value="0x9148" name="GL_DEBUG_SEVERITY_LOW_AMD"/>
>+        <enum value="0x9148" name="GL_DEBUG_SEVERITY_LOW_ARB"/>
>+        <enum value="0x9148" name="GL_DEBUG_SEVERITY_LOW_KHR"/>
>+        <enum value="0x9149" name="GL_DEBUG_CATEGORY_API_ERROR_AMD"/>
>+        <enum value="0x914A" name="GL_DEBUG_CATEGORY_WINDOW_SYSTEM_AMD"/>
>+        <enum value="0x914B" name="GL_DEBUG_CATEGORY_DEPRECATION_AMD"/>
>+        <enum value="0x914C" name="GL_DEBUG_CATEGORY_UNDEFINED_BEHAVIOR_AMD"/>
>+        <enum value="0x914D" name="GL_DEBUG_CATEGORY_PERFORMANCE_AMD"/>
>+        <enum value="0x914E" name="GL_DEBUG_CATEGORY_SHADER_COMPILER_AMD"/>
>+        <enum value="0x914F" name="GL_DEBUG_CATEGORY_APPLICATION_AMD"/>
>+        <enum value="0x9150" name="GL_DEBUG_CATEGORY_OTHER_AMD"/>
>+        <enum value="0x9151" name="GL_BUFFER_OBJECT_EXT"/>
>+        <enum value="0x9151" name="GL_DATA_BUFFER_AMD"/>
>+        <enum value="0x9152" name="GL_PERFORMANCE_MONITOR_AMD"/>
>+        <enum value="0x9153" name="GL_QUERY_OBJECT_AMD"/>
>+        <enum value="0x9153" name="GL_QUERY_OBJECT_EXT"/>
>+        <enum value="0x9154" name="GL_VERTEX_ARRAY_OBJECT_AMD"/>
>+        <enum value="0x9154" name="GL_VERTEX_ARRAY_OBJECT_EXT"/>
>+        <enum value="0x9155" name="GL_SAMPLER_OBJECT_AMD"/>
>+            <unused start="0x9156" end="0x915F" vendor="AMD"/>
>+        <enum value="0x9160" name="GL_EXTERNAL_VIRTUAL_MEMORY_BUFFER_AMD"/>
>+            <unused start="0x9161" vendor="AMD"/>
>+        <enum value="0x9192" name="GL_QUERY_BUFFER"/>
>+        <enum value="0x9192" name="GL_QUERY_BUFFER_AMD"/>
>+        <enum value="0x9193" name="GL_QUERY_BUFFER_BINDING"/>
>+        <enum value="0x9193" name="GL_QUERY_BUFFER_BINDING_AMD"/>
>+        <enum value="0x9194" name="GL_QUERY_RESULT_NO_WAIT"/>
>+        <enum value="0x9194" name="GL_QUERY_RESULT_NO_WAIT_AMD"/>
>+        <enum value="0x9195" name="GL_VIRTUAL_PAGE_SIZE_X_ARB"/>
>+        <enum value="0x9195" name="GL_VIRTUAL_PAGE_SIZE_X_EXT"/>
>+        <enum value="0x9195" name="GL_VIRTUAL_PAGE_SIZE_X_AMD"/>
>+        <enum value="0x9196" name="GL_VIRTUAL_PAGE_SIZE_Y_ARB"/>
>+        <enum value="0x9196" name="GL_VIRTUAL_PAGE_SIZE_Y_EXT"/>
>+        <enum value="0x9196" name="GL_VIRTUAL_PAGE_SIZE_Y_AMD"/>
>+        <enum value="0x9197" name="GL_VIRTUAL_PAGE_SIZE_Z_ARB"/>
>+        <enum value="0x9197" name="GL_VIRTUAL_PAGE_SIZE_Z_EXT"/>
>+        <enum value="0x9197" name="GL_VIRTUAL_PAGE_SIZE_Z_AMD"/>
>+        <enum value="0x9198" name="GL_MAX_SPARSE_TEXTURE_SIZE_ARB"/>
>+        <enum value="0x9198" name="GL_MAX_SPARSE_TEXTURE_SIZE_EXT"/>
>+        <enum value="0x9198" name="GL_MAX_SPARSE_TEXTURE_SIZE_AMD"/>
>+        <enum value="0x9199" name="GL_MAX_SPARSE_3D_TEXTURE_SIZE_ARB"/>
>+        <enum value="0x9199" name="GL_MAX_SPARSE_3D_TEXTURE_SIZE_EXT"/>
>+        <enum value="0x9199" name="GL_MAX_SPARSE_3D_TEXTURE_SIZE_AMD"/>
>+        <enum value="0x919A" name="GL_MAX_SPARSE_ARRAY_TEXTURE_LAYERS"/>
>+        <enum value="0x919A" name="GL_MAX_SPARSE_ARRAY_TEXTURE_LAYERS_ARB"/>
>+        <enum value="0x919A" name="GL_MAX_SPARSE_ARRAY_TEXTURE_LAYERS_EXT"/>
>+        <enum value="0x919B" name="GL_MIN_SPARSE_LEVEL_AMD"/>
>+        <enum value="0x919C" name="GL_MIN_LOD_WARNING_AMD"/>
>+        <enum value="0x919D" name="GL_TEXTURE_BUFFER_OFFSET"/>
>+        <enum value="0x919D" name="GL_TEXTURE_BUFFER_OFFSET_EXT"/>
>+        <enum value="0x919D" name="GL_TEXTURE_BUFFER_OFFSET_OES"/>
>+        <enum value="0x919E" name="GL_TEXTURE_BUFFER_SIZE"/>
>+        <enum value="0x919E" name="GL_TEXTURE_BUFFER_SIZE_EXT"/>
>+        <enum value="0x919E" name="GL_TEXTURE_BUFFER_SIZE_OES"/>
>+        <enum value="0x919F" name="GL_TEXTURE_BUFFER_OFFSET_ALIGNMENT"/>
>+        <enum value="0x919F" name="GL_TEXTURE_BUFFER_OFFSET_ALIGNMENT_EXT"/>
>+        <enum value="0x919F" name="GL_TEXTURE_BUFFER_OFFSET_ALIGNMENT_OES"/>
>+        <enum value="0x91A0" name="GL_STREAM_RASTERIZATION_AMD"/>
>+            <unused start="0x91A1" end="0x91A3" vendor="AMD"/>
>+        <enum value="0x91A4" name="GL_VERTEX_ELEMENT_SWIZZLE_AMD"/>
>+        <enum value="0x91A5" name="GL_VERTEX_ID_SWIZZLE_AMD"/>
>+        <enum value="0x91A6" name="GL_TEXTURE_SPARSE_ARB"/>
>+        <enum value="0x91A6" name="GL_TEXTURE_SPARSE_EXT"/>
>+        <enum value="0x91A7" name="GL_VIRTUAL_PAGE_SIZE_INDEX_ARB"/>
>+        <enum value="0x91A7" name="GL_VIRTUAL_PAGE_SIZE_INDEX_EXT"/>
>+        <enum value="0x91A8" name="GL_NUM_VIRTUAL_PAGE_SIZES_ARB"/>
>+        <enum value="0x91A8" name="GL_NUM_VIRTUAL_PAGE_SIZES_EXT"/>
>+        <enum value="0x91A9" name="GL_SPARSE_TEXTURE_FULL_ARRAY_CUBE_MIPMAPS_ARB"/>
>+        <enum value="0x91A9" name="GL_SPARSE_TEXTURE_FULL_ARRAY_CUBE_MIPMAPS_EXT"/>
>+        <enum value="0x91AA" name="GL_NUM_SPARSE_LEVELS_ARB"/>
>+        <enum value="0x91AA" name="GL_NUM_SPARSE_LEVELS_EXT"/>
>+            <unused start="0x91AB" end="0x91AD" vendor="AMD"/>
>+        <enum value="0x91AE" name="GL_PIXELS_PER_SAMPLE_PATTERN_X_AMD"/>
>+        <enum value="0x91AF" name="GL_PIXELS_PER_SAMPLE_PATTERN_Y_AMD"/>
>+        <enum value="0x91B0" name="GL_MAX_SHADER_COMPILER_THREADS_KHR"/>
>+        <enum value="0x91B0" name="GL_MAX_SHADER_COMPILER_THREADS_ARB" alias="GL_MAX_SHADER_COMPILER_THREADS_KHR"/>
>+        <enum value="0x91B1" name="GL_COMPLETION_STATUS_KHR"/>
>+        <enum value="0x91B1" name="GL_COMPLETION_STATUS_ARB" alias="GL_COMPLETION_STATUS_KHR"/>
>+            <unused start="0x91B2" end="0x91B8" vendor="AMD"/>
>+        <enum value="0x91B9" name="GL_COMPUTE_SHADER"/>
>+            <unused start="0x91BA" vendor="AMD"/>
>+        <enum value="0x91BB" name="GL_MAX_COMPUTE_UNIFORM_BLOCKS"/>
>+        <enum value="0x91BC" name="GL_MAX_COMPUTE_TEXTURE_IMAGE_UNITS"/>
>+        <enum value="0x91BD" name="GL_MAX_COMPUTE_IMAGE_UNIFORMS"/>
>+        <enum value="0x91BE" name="GL_MAX_COMPUTE_WORK_GROUP_COUNT"/>
>+        <enum value="0x91BF" name="GL_MAX_COMPUTE_WORK_GROUP_SIZE"/>
>+        <enum value="0x91BF" name="GL_MAX_COMPUTE_FIXED_GROUP_SIZE_ARB" alias="GL_MAX_COMPUTE_WORK_GROUP_SIZE"/>
>+            <unused start="0x91C0" end="0x91C4" vendor="AMD"/>
>+        <enum value="0x91C5" name="GL_FLOAT16_MAT2_AMD"/>
>+        <enum value="0x91C6" name="GL_FLOAT16_MAT3_AMD"/>
>+        <enum value="0x91C7" name="GL_FLOAT16_MAT4_AMD"/>
>+        <enum value="0x91C8" name="GL_FLOAT16_MAT2x3_AMD"/>
>+        <enum value="0x91C9" name="GL_FLOAT16_MAT2x4_AMD"/>
>+        <enum value="0x91CA" name="GL_FLOAT16_MAT3x2_AMD"/>
>+        <enum value="0x91CB" name="GL_FLOAT16_MAT3x4_AMD"/>
>+        <enum value="0x91CC" name="GL_FLOAT16_MAT4x2_AMD"/>
>+        <enum value="0x91CD" name="GL_FLOAT16_MAT4x3_AMD"/>
>+            <unused start="0x91CE" end="0x923F" vendor="AMD"/>
>+    </enums>
>+
>+    <enums namespace="GL" start="0x9240" end="0x924F" vendor="WEBGL" comment="Khronos bug 6473,6884">
>+        <enum value="0x9240" name="GL_UNPACK_FLIP_Y_WEBGL"/>
>+        <enum value="0x9241" name="GL_UNPACK_PREMULTIPLY_ALPHA_WEBGL"/>
>+        <enum value="0x9242" name="GL_CONTEXT_LOST_WEBGL"/>
>+        <enum value="0x9243" name="GL_UNPACK_COLORSPACE_CONVERSION_WEBGL"/>
>+        <enum value="0x9244" name="GL_BROWSER_DEFAULT_WEBGL"/>
>+            <unused start="0x9245" end="0x924F" vendor="WEBGL"/>
>+    </enums>
>+
>+    <enums namespace="GL" start="0x9250" end="0x925F" vendor="DMP" comment="For Eisaku Ohbuchi via email">
>+        <enum value="0x9250" name="GL_SHADER_BINARY_DMP"/>
>+        <enum value="0x9251" name="GL_SMAPHS30_PROGRAM_BINARY_DMP"/>
>+        <enum value="0x9252" name="GL_SMAPHS_PROGRAM_BINARY_DMP"/>
>+        <enum value="0x9253" name="GL_DMP_PROGRAM_BINARY_DMP"/>
>+            <unused start="0x9254" end="0x925F" vendor="DMP"/>
>+    </enums>
>+
>+    <enums namespace="GL" start="0x9260" end="0x926F" vendor="FJ" comment="Khronos bug 7486">
>+        <enum value="0x9260" name="GL_GCCSO_SHADER_BINARY_FJ"/>
>+            <unused start="0x9261" end="0x926F" vendor="FJ"/>
>+    </enums>
>+
>+    <enums namespace="GL" start="0x9270" end="0x927F" vendor="OES" comment="Khronos bug 7625">
>+        <enum value="0x9270" name="GL_COMPRESSED_R11_EAC"/>
>+        <enum value="0x9270" name="GL_COMPRESSED_R11_EAC_OES"/>
>+        <enum value="0x9271" name="GL_COMPRESSED_SIGNED_R11_EAC"/>
>+        <enum value="0x9271" name="GL_COMPRESSED_SIGNED_R11_EAC_OES"/>
>+        <enum value="0x9272" name="GL_COMPRESSED_RG11_EAC"/>
>+        <enum value="0x9272" name="GL_COMPRESSED_RG11_EAC_OES"/>
>+        <enum value="0x9273" name="GL_COMPRESSED_SIGNED_RG11_EAC"/>
>+        <enum value="0x9273" name="GL_COMPRESSED_SIGNED_RG11_EAC_OES"/>
>+        <enum value="0x9274" name="GL_COMPRESSED_RGB8_ETC2"/>
>+        <enum value="0x9274" name="GL_COMPRESSED_RGB8_ETC2_OES"/>
>+        <enum value="0x9275" name="GL_COMPRESSED_SRGB8_ETC2"/>
>+        <enum value="0x9275" name="GL_COMPRESSED_SRGB8_ETC2_OES"/>
>+        <enum value="0x9276" name="GL_COMPRESSED_RGB8_PUNCHTHROUGH_ALPHA1_ETC2"/>
>+        <enum value="0x9276" name="GL_COMPRESSED_RGB8_PUNCHTHROUGH_ALPHA1_ETC2_OES"/>
>+        <enum value="0x9277" name="GL_COMPRESSED_SRGB8_PUNCHTHROUGH_ALPHA1_ETC2"/>
>+        <enum value="0x9277" name="GL_COMPRESSED_SRGB8_PUNCHTHROUGH_ALPHA1_ETC2_OES"/>
>+        <enum value="0x9278" name="GL_COMPRESSED_RGBA8_ETC2_EAC"/>
>+        <enum value="0x9278" name="GL_COMPRESSED_RGBA8_ETC2_EAC_OES"/>
>+        <enum value="0x9279" name="GL_COMPRESSED_SRGB8_ALPHA8_ETC2_EAC"/>
>+        <enum value="0x9279" name="GL_COMPRESSED_SRGB8_ALPHA8_ETC2_EAC_OES"/>
>+            <unused start="0x927A" end="0x927F" vendor="OES"/>
>+    </enums>
>+
>+    <enums namespace="GL" start="0x9280" end="0x937F" vendor="NV" comment="Khronos bug 7658">
>+        <enum value="0x9280" name="GL_BLEND_PREMULTIPLIED_SRC_NV"/>
>+        <enum value="0x9281" name="GL_BLEND_OVERLAP_NV"/>
>+        <enum value="0x9282" name="GL_UNCORRELATED_NV"/>
>+        <enum value="0x9283" name="GL_DISJOINT_NV"/>
>+        <enum value="0x9284" name="GL_CONJOINT_NV"/>
>+        <enum value="0x9285" name="GL_BLEND_ADVANCED_COHERENT_KHR"/>
>+        <enum value="0x9285" name="GL_BLEND_ADVANCED_COHERENT_NV"/>
>+        <enum value="0x9286" name="GL_SRC_NV"/>
>+        <enum value="0x9287" name="GL_DST_NV"/>
>+        <enum value="0x9288" name="GL_SRC_OVER_NV"/>
>+        <enum value="0x9289" name="GL_DST_OVER_NV"/>
>+        <enum value="0x928A" name="GL_SRC_IN_NV"/>
>+        <enum value="0x928B" name="GL_DST_IN_NV"/>
>+        <enum value="0x928C" name="GL_SRC_OUT_NV"/>
>+        <enum value="0x928D" name="GL_DST_OUT_NV"/>
>+        <enum value="0x928E" name="GL_SRC_ATOP_NV"/>
>+        <enum value="0x928F" name="GL_DST_ATOP_NV"/>
>+            <unused start="0x9290" vendor="NV"/>
>+        <enum value="0x9291" name="GL_PLUS_NV"/>
>+        <enum value="0x9292" name="GL_PLUS_DARKER_NV"/>
>+            <unused start="0x9293" vendor="NV"/>
>+        <enum value="0x9294" name="GL_MULTIPLY"/>
>+        <enum value="0x9294" name="GL_MULTIPLY_KHR"/>
>+        <enum value="0x9294" name="GL_MULTIPLY_NV"/>
>+        <enum value="0x9295" name="GL_SCREEN"/>
>+        <enum value="0x9295" name="GL_SCREEN_KHR"/>
>+        <enum value="0x9295" name="GL_SCREEN_NV"/>
>+        <enum value="0x9296" name="GL_OVERLAY"/>
>+        <enum value="0x9296" name="GL_OVERLAY_KHR"/>
>+        <enum value="0x9296" name="GL_OVERLAY_NV"/>
>+        <enum value="0x9297" name="GL_DARKEN"/>
>+        <enum value="0x9297" name="GL_DARKEN_KHR"/>
>+        <enum value="0x9297" name="GL_DARKEN_NV"/>
>+        <enum value="0x9298" name="GL_LIGHTEN"/>
>+        <enum value="0x9298" name="GL_LIGHTEN_KHR"/>
>+        <enum value="0x9298" name="GL_LIGHTEN_NV"/>
>+        <enum value="0x9299" name="GL_COLORDODGE"/>
>+        <enum value="0x9299" name="GL_COLORDODGE_KHR"/>
>+        <enum value="0x9299" name="GL_COLORDODGE_NV"/>
>+        <enum value="0x929A" name="GL_COLORBURN"/>
>+        <enum value="0x929A" name="GL_COLORBURN_KHR"/>
>+        <enum value="0x929A" name="GL_COLORBURN_NV"/>
>+        <enum value="0x929B" name="GL_HARDLIGHT"/>
>+        <enum value="0x929B" name="GL_HARDLIGHT_KHR"/>
>+        <enum value="0x929B" name="GL_HARDLIGHT_NV"/>
>+        <enum value="0x929C" name="GL_SOFTLIGHT"/>
>+        <enum value="0x929C" name="GL_SOFTLIGHT_KHR"/>
>+        <enum value="0x929C" name="GL_SOFTLIGHT_NV"/>
>+            <unused start="0x929D" vendor="NV"/>
>+        <enum value="0x929E" name="GL_DIFFERENCE"/>
>+        <enum value="0x929E" name="GL_DIFFERENCE_KHR"/>
>+        <enum value="0x929E" name="GL_DIFFERENCE_NV"/>
>+        <enum value="0x929F" name="GL_MINUS_NV"/>
>+        <enum value="0x92A0" name="GL_EXCLUSION"/>
>+        <enum value="0x92A0" name="GL_EXCLUSION_KHR"/>
>+        <enum value="0x92A0" name="GL_EXCLUSION_NV"/>
>+        <enum value="0x92A1" name="GL_CONTRAST_NV"/>
>+            <unused start="0x92A2" vendor="NV"/>
>+        <enum value="0x92A3" name="GL_INVERT_RGB_NV"/>
>+        <enum value="0x92A4" name="GL_LINEARDODGE_NV"/>
>+        <enum value="0x92A5" name="GL_LINEARBURN_NV"/>
>+        <enum value="0x92A6" name="GL_VIVIDLIGHT_NV"/>
>+        <enum value="0x92A7" name="GL_LINEARLIGHT_NV"/>
>+        <enum value="0x92A8" name="GL_PINLIGHT_NV"/>
>+        <enum value="0x92A9" name="GL_HARDMIX_NV"/>
>+            <unused start="0x92AA" end="0x92AC" vendor="NV"/>
>+        <enum value="0x92AD" name="GL_HSL_HUE"/>
>+        <enum value="0x92AD" name="GL_HSL_HUE_KHR"/>
>+        <enum value="0x92AD" name="GL_HSL_HUE_NV"/>
>+        <enum value="0x92AE" name="GL_HSL_SATURATION"/>
>+        <enum value="0x92AE" name="GL_HSL_SATURATION_KHR"/>
>+        <enum value="0x92AE" name="GL_HSL_SATURATION_NV"/>
>+        <enum value="0x92AF" name="GL_HSL_COLOR"/>
>+        <enum value="0x92AF" name="GL_HSL_COLOR_KHR"/>
>+        <enum value="0x92AF" name="GL_HSL_COLOR_NV"/>
>+        <enum value="0x92B0" name="GL_HSL_LUMINOSITY"/>
>+        <enum value="0x92B0" name="GL_HSL_LUMINOSITY_KHR"/>
>+        <enum value="0x92B0" name="GL_HSL_LUMINOSITY_NV"/>
>+        <enum value="0x92B1" name="GL_PLUS_CLAMPED_NV"/>
>+        <enum value="0x92B2" name="GL_PLUS_CLAMPED_ALPHA_NV"/>
>+        <enum value="0x92B3" name="GL_MINUS_CLAMPED_NV"/>
>+        <enum value="0x92B4" name="GL_INVERT_OVG_NV"/>
>+            <unused start="0x92B5" end="0x92B9" vendor="NV"/>
>+        <enum value="0x92BA" name="GL_MAX_LGPU_GPUS_NVX"/>
>+        <enum value="0x92BA" name="GL_MULTICAST_GPUS_NV"/>
>+        <enum value="0x92BB" name="GL_PURGED_CONTEXT_RESET_NV"/>
>+            <unused start="0x92BC" end="0x92BD" vendor="NV"/>
>+        <enum value="0x92BE" name="GL_PRIMITIVE_BOUNDING_BOX_ARB"/>
>+        <enum value="0x92BE" name="GL_PRIMITIVE_BOUNDING_BOX"/>
>+        <enum value="0x92BE" name="GL_PRIMITIVE_BOUNDING_BOX_EXT"/>
>+        <enum value="0x92BE" name="GL_PRIMITIVE_BOUNDING_BOX_OES"/>
>+        <enum value="0x92BF" name="GL_ALPHA_TO_COVERAGE_DITHER_MODE_NV"/>
>+        <enum value="0x92C0" name="GL_ATOMIC_COUNTER_BUFFER"/>
>+        <enum value="0x92C1" name="GL_ATOMIC_COUNTER_BUFFER_BINDING"/>
>+        <enum value="0x92C2" name="GL_ATOMIC_COUNTER_BUFFER_START"/>
>+        <enum value="0x92C3" name="GL_ATOMIC_COUNTER_BUFFER_SIZE"/>
>+        <enum value="0x92C4" name="GL_ATOMIC_COUNTER_BUFFER_DATA_SIZE"/>
>+        <enum value="0x92C5" name="GL_ATOMIC_COUNTER_BUFFER_ACTIVE_ATOMIC_COUNTERS"/>
>+        <enum value="0x92C6" name="GL_ATOMIC_COUNTER_BUFFER_ACTIVE_ATOMIC_COUNTER_INDICES"/>
>+        <enum value="0x92C7" name="GL_ATOMIC_COUNTER_BUFFER_REFERENCED_BY_VERTEX_SHADER"/>
>+        <enum value="0x92C8" name="GL_ATOMIC_COUNTER_BUFFER_REFERENCED_BY_TESS_CONTROL_SHADER"/>
>+        <enum value="0x92C9" name="GL_ATOMIC_COUNTER_BUFFER_REFERENCED_BY_TESS_EVALUATION_SHADER"/>
>+        <enum value="0x92CA" name="GL_ATOMIC_COUNTER_BUFFER_REFERENCED_BY_GEOMETRY_SHADER"/>
>+        <enum value="0x92CB" name="GL_ATOMIC_COUNTER_BUFFER_REFERENCED_BY_FRAGMENT_SHADER"/>
>+        <enum value="0x92CC" name="GL_MAX_VERTEX_ATOMIC_COUNTER_BUFFERS"/>
>+        <enum value="0x92CD" name="GL_MAX_TESS_CONTROL_ATOMIC_COUNTER_BUFFERS"/>
>+        <enum value="0x92CD" name="GL_MAX_TESS_CONTROL_ATOMIC_COUNTER_BUFFERS_EXT"/>
>+        <enum value="0x92CD" name="GL_MAX_TESS_CONTROL_ATOMIC_COUNTER_BUFFERS_OES"/>
>+        <enum value="0x92CE" name="GL_MAX_TESS_EVALUATION_ATOMIC_COUNTER_BUFFERS"/>
>+        <enum value="0x92CE" name="GL_MAX_TESS_EVALUATION_ATOMIC_COUNTER_BUFFERS_EXT"/>
>+        <enum value="0x92CE" name="GL_MAX_TESS_EVALUATION_ATOMIC_COUNTER_BUFFERS_OES"/>
>+        <enum value="0x92CF" name="GL_MAX_GEOMETRY_ATOMIC_COUNTER_BUFFERS"/>
>+        <enum value="0x92CF" name="GL_MAX_GEOMETRY_ATOMIC_COUNTER_BUFFERS_EXT"/>
>+        <enum value="0x92CF" name="GL_MAX_GEOMETRY_ATOMIC_COUNTER_BUFFERS_OES"/>
>+        <enum value="0x92D0" name="GL_MAX_FRAGMENT_ATOMIC_COUNTER_BUFFERS"/>
>+        <enum value="0x92D1" name="GL_MAX_COMBINED_ATOMIC_COUNTER_BUFFERS"/>
>+        <enum value="0x92D2" name="GL_MAX_VERTEX_ATOMIC_COUNTERS"/>
>+        <enum value="0x92D3" name="GL_MAX_TESS_CONTROL_ATOMIC_COUNTERS"/>
>+        <enum value="0x92D3" name="GL_MAX_TESS_CONTROL_ATOMIC_COUNTERS_EXT"/>
>+        <enum value="0x92D3" name="GL_MAX_TESS_CONTROL_ATOMIC_COUNTERS_OES"/>
>+        <enum value="0x92D4" name="GL_MAX_TESS_EVALUATION_ATOMIC_COUNTERS"/>
>+        <enum value="0x92D4" name="GL_MAX_TESS_EVALUATION_ATOMIC_COUNTERS_EXT"/>
>+        <enum value="0x92D4" name="GL_MAX_TESS_EVALUATION_ATOMIC_COUNTERS_OES"/>
>+        <enum value="0x92D5" name="GL_MAX_GEOMETRY_ATOMIC_COUNTERS"/>
>+        <enum value="0x92D5" name="GL_MAX_GEOMETRY_ATOMIC_COUNTERS_EXT"/>
>+        <enum value="0x92D5" name="GL_MAX_GEOMETRY_ATOMIC_COUNTERS_OES"/>
>+        <enum value="0x92D6" name="GL_MAX_FRAGMENT_ATOMIC_COUNTERS"/>
>+        <enum value="0x92D7" name="GL_MAX_COMBINED_ATOMIC_COUNTERS"/>
>+        <enum value="0x92D8" name="GL_MAX_ATOMIC_COUNTER_BUFFER_SIZE"/>
>+        <enum value="0x92D9" name="GL_ACTIVE_ATOMIC_COUNTER_BUFFERS"/>
>+        <enum value="0x92DA" name="GL_UNIFORM_ATOMIC_COUNTER_BUFFER_INDEX"/>
>+        <enum value="0x92DB" name="GL_UNSIGNED_INT_ATOMIC_COUNTER"/>
>+        <enum value="0x92DC" name="GL_MAX_ATOMIC_COUNTER_BUFFER_BINDINGS"/>
>+        <enum value="0x92DD" name="GL_FRAGMENT_COVERAGE_TO_COLOR_NV"/>
>+        <enum value="0x92DE" name="GL_FRAGMENT_COVERAGE_COLOR_NV"/>
>+            <unused start="0x92DF" end="0x92DF" vendor="NV"/>
>+        <enum value="0x92E0" name="GL_DEBUG_OUTPUT"/>
>+        <enum value="0x92E0" name="GL_DEBUG_OUTPUT_KHR"/>
>+        <enum value="0x92E1" name="GL_UNIFORM"/>
>+        <enum value="0x92E2" name="GL_UNIFORM_BLOCK"/>
>+        <enum value="0x92E3" name="GL_PROGRAM_INPUT"/>
>+        <enum value="0x92E4" name="GL_PROGRAM_OUTPUT"/>
>+        <enum value="0x92E5" name="GL_BUFFER_VARIABLE"/>
>+        <enum value="0x92E6" name="GL_SHADER_STORAGE_BLOCK"/>
>+        <enum value="0x92E7" name="GL_IS_PER_PATCH"/>
>+        <enum value="0x92E7" name="GL_IS_PER_PATCH_EXT"/>
>+        <enum value="0x92E7" name="GL_IS_PER_PATCH_OES"/>
>+        <enum value="0x92E8" name="GL_VERTEX_SUBROUTINE"/>
>+        <enum value="0x92E9" name="GL_TESS_CONTROL_SUBROUTINE"/>
>+        <enum value="0x92EA" name="GL_TESS_EVALUATION_SUBROUTINE"/>
>+        <enum value="0x92EB" name="GL_GEOMETRY_SUBROUTINE"/>
>+        <enum value="0x92EC" name="GL_FRAGMENT_SUBROUTINE"/>
>+        <enum value="0x92ED" name="GL_COMPUTE_SUBROUTINE"/>
>+        <enum value="0x92EE" name="GL_VERTEX_SUBROUTINE_UNIFORM"/>
>+        <enum value="0x92EF" name="GL_TESS_CONTROL_SUBROUTINE_UNIFORM"/>
>+        <enum value="0x92F0" name="GL_TESS_EVALUATION_SUBROUTINE_UNIFORM"/>
>+        <enum value="0x92F1" name="GL_GEOMETRY_SUBROUTINE_UNIFORM"/>
>+        <enum value="0x92F2" name="GL_FRAGMENT_SUBROUTINE_UNIFORM"/>
>+        <enum value="0x92F3" name="GL_COMPUTE_SUBROUTINE_UNIFORM"/>
>+        <enum value="0x92F4" name="GL_TRANSFORM_FEEDBACK_VARYING"/>
>+        <enum value="0x92F5" name="GL_ACTIVE_RESOURCES"/>
>+        <enum value="0x92F6" name="GL_MAX_NAME_LENGTH"/>
>+        <enum value="0x92F7" name="GL_MAX_NUM_ACTIVE_VARIABLES"/>
>+        <enum value="0x92F8" name="GL_MAX_NUM_COMPATIBLE_SUBROUTINES"/>
>+        <enum value="0x92F9" name="GL_NAME_LENGTH"/>
>+        <enum value="0x92FA" name="GL_TYPE"/>
>+        <enum value="0x92FB" name="GL_ARRAY_SIZE"/>
>+        <enum value="0x92FC" name="GL_OFFSET"/>
>+        <enum value="0x92FD" name="GL_BLOCK_INDEX"/>
>+        <enum value="0x92FE" name="GL_ARRAY_STRIDE"/>
>+        <enum value="0x92FF" name="GL_MATRIX_STRIDE"/>
>+        <enum value="0x9300" name="GL_IS_ROW_MAJOR"/>
>+        <enum value="0x9301" name="GL_ATOMIC_COUNTER_BUFFER_INDEX"/>
>+        <enum value="0x9302" name="GL_BUFFER_BINDING"/>
>+        <enum value="0x9303" name="GL_BUFFER_DATA_SIZE"/>
>+        <enum value="0x9304" name="GL_NUM_ACTIVE_VARIABLES"/>
>+        <enum value="0x9305" name="GL_ACTIVE_VARIABLES"/>
>+        <enum value="0x9306" name="GL_REFERENCED_BY_VERTEX_SHADER"/>
>+        <enum value="0x9307" name="GL_REFERENCED_BY_TESS_CONTROL_SHADER"/>
>+        <enum value="0x9307" name="GL_REFERENCED_BY_TESS_CONTROL_SHADER_EXT"/>
>+        <enum value="0x9307" name="GL_REFERENCED_BY_TESS_CONTROL_SHADER_OES"/>
>+        <enum value="0x9308" name="GL_REFERENCED_BY_TESS_EVALUATION_SHADER"/>
>+        <enum value="0x9308" name="GL_REFERENCED_BY_TESS_EVALUATION_SHADER_EXT"/>
>+        <enum value="0x9308" name="GL_REFERENCED_BY_TESS_EVALUATION_SHADER_OES"/>
>+        <enum value="0x9309" name="GL_REFERENCED_BY_GEOMETRY_SHADER"/>
>+        <enum value="0x9309" name="GL_REFERENCED_BY_GEOMETRY_SHADER_EXT"/>
>+        <enum value="0x9309" name="GL_REFERENCED_BY_GEOMETRY_SHADER_OES"/>
>+        <enum value="0x930A" name="GL_REFERENCED_BY_FRAGMENT_SHADER"/>
>+        <enum value="0x930B" name="GL_REFERENCED_BY_COMPUTE_SHADER"/>
>+        <enum value="0x930C" name="GL_TOP_LEVEL_ARRAY_SIZE"/>
>+        <enum value="0x930D" name="GL_TOP_LEVEL_ARRAY_STRIDE"/>
>+        <enum value="0x930E" name="GL_LOCATION"/>
>+        <enum value="0x930F" name="GL_LOCATION_INDEX"/>
>+        <enum value="0x930F" name="GL_LOCATION_INDEX_EXT"/>
>+        <enum value="0x9310" name="GL_FRAMEBUFFER_DEFAULT_WIDTH"/>
>+        <enum value="0x9311" name="GL_FRAMEBUFFER_DEFAULT_HEIGHT"/>
>+        <enum value="0x9312" name="GL_FRAMEBUFFER_DEFAULT_LAYERS"/>
>+        <enum value="0x9312" name="GL_FRAMEBUFFER_DEFAULT_LAYERS_EXT"/>
>+        <enum value="0x9312" name="GL_FRAMEBUFFER_DEFAULT_LAYERS_OES"/>
>+        <enum value="0x9313" name="GL_FRAMEBUFFER_DEFAULT_SAMPLES"/>
>+        <enum value="0x9314" name="GL_FRAMEBUFFER_DEFAULT_FIXED_SAMPLE_LOCATIONS"/>
>+        <enum value="0x9315" name="GL_MAX_FRAMEBUFFER_WIDTH"/>
>+        <enum value="0x9316" name="GL_MAX_FRAMEBUFFER_HEIGHT"/>
>+        <enum value="0x9317" name="GL_MAX_FRAMEBUFFER_LAYERS"/>
>+        <enum value="0x9317" name="GL_MAX_FRAMEBUFFER_LAYERS_EXT"/>
>+        <enum value="0x9317" name="GL_MAX_FRAMEBUFFER_LAYERS_OES"/>
>+        <enum value="0x9318" name="GL_MAX_FRAMEBUFFER_SAMPLES"/>
>+            <unused start="0x9319" end="0x9326" vendor="NV"/>
>+        <enum value="0x9327" name="GL_RASTER_MULTISAMPLE_EXT"/>
>+        <enum value="0x9328" name="GL_RASTER_SAMPLES_EXT"/>
>+        <enum value="0x9329" name="GL_MAX_RASTER_SAMPLES_EXT"/>
>+        <enum value="0x932A" name="GL_RASTER_FIXED_SAMPLE_LOCATIONS_EXT"/>
>+        <enum value="0x932B" name="GL_MULTISAMPLE_RASTERIZATION_ALLOWED_EXT"/>
>+        <enum value="0x932C" name="GL_EFFECTIVE_RASTER_SAMPLES_EXT"/>
>+        <enum value="0x932D" name="GL_DEPTH_SAMPLES_NV"/>
>+        <enum value="0x932E" name="GL_STENCIL_SAMPLES_NV"/>
>+        <enum value="0x932F" name="GL_MIXED_DEPTH_SAMPLES_SUPPORTED_NV"/>
>+        <enum value="0x9330" name="GL_MIXED_STENCIL_SAMPLES_SUPPORTED_NV"/>
>+        <enum value="0x9331" name="GL_COVERAGE_MODULATION_TABLE_NV"/>
>+        <enum value="0x9332" name="GL_COVERAGE_MODULATION_NV"/>
>+        <enum value="0x9333" name="GL_COVERAGE_MODULATION_TABLE_SIZE_NV"/>
>+            <unused start="0x9334" end="0x9338" vendor="NV"/>
>+        <enum value="0x9339" name="GL_WARP_SIZE_NV"/>
>+        <enum value="0x933A" name="GL_WARPS_PER_SM_NV"/>
>+        <enum value="0x933B" name="GL_SM_COUNT_NV"/>
>+        <enum value="0x933C" name="GL_FILL_RECTANGLE_NV"/>
>+        <enum value="0x933D" name="GL_SAMPLE_LOCATION_SUBPIXEL_BITS_ARB"/>
>+        <enum value="0x933D" name="GL_SAMPLE_LOCATION_SUBPIXEL_BITS_NV"/>
>+        <enum value="0x933E" name="GL_SAMPLE_LOCATION_PIXEL_GRID_WIDTH_ARB"/>
>+        <enum value="0x933E" name="GL_SAMPLE_LOCATION_PIXEL_GRID_WIDTH_NV"/>
>+        <enum value="0x933F" name="GL_SAMPLE_LOCATION_PIXEL_GRID_HEIGHT_ARB"/>
>+        <enum value="0x933F" name="GL_SAMPLE_LOCATION_PIXEL_GRID_HEIGHT_NV"/>
>+        <enum value="0x9340" name="GL_PROGRAMMABLE_SAMPLE_LOCATION_TABLE_SIZE_ARB"/>
>+        <enum value="0x9340" name="GL_PROGRAMMABLE_SAMPLE_LOCATION_TABLE_SIZE_NV"/>
>+        <enum value="0x9341" name="GL_PROGRAMMABLE_SAMPLE_LOCATION_ARB"/>
>+        <enum value="0x9341" name="GL_PROGRAMMABLE_SAMPLE_LOCATION_NV"/>
>+        <enum value="0x9342" name="GL_FRAMEBUFFER_PROGRAMMABLE_SAMPLE_LOCATIONS_ARB"/>
>+        <enum value="0x9342" name="GL_FRAMEBUFFER_PROGRAMMABLE_SAMPLE_LOCATIONS_NV"/>
>+        <enum value="0x9343" name="GL_FRAMEBUFFER_SAMPLE_LOCATION_PIXEL_GRID_ARB"/>
>+        <enum value="0x9343" name="GL_FRAMEBUFFER_SAMPLE_LOCATION_PIXEL_GRID_NV"/>
>+        <enum value="0x9344" name="GL_MAX_COMPUTE_VARIABLE_GROUP_INVOCATIONS_ARB"/>
>+        <enum value="0x9345" name="GL_MAX_COMPUTE_VARIABLE_GROUP_SIZE_ARB"/>
>+        <enum value="0x9346" name="GL_CONSERVATIVE_RASTERIZATION_NV"/>
>+        <enum value="0x9347" name="GL_SUBPIXEL_PRECISION_BIAS_X_BITS_NV"/>
>+        <enum value="0x9348" name="GL_SUBPIXEL_PRECISION_BIAS_Y_BITS_NV"/>
>+        <enum value="0x9349" name="GL_MAX_SUBPIXEL_PRECISION_BIAS_BITS_NV"/>
>+        <enum value="0x934A" name="GL_LOCATION_COMPONENT"/>
>+        <enum value="0x934B" name="GL_TRANSFORM_FEEDBACK_BUFFER_INDEX"/>
>+        <enum value="0x934C" name="GL_TRANSFORM_FEEDBACK_BUFFER_STRIDE"/>
>+        <enum value="0x934D" name="GL_ALPHA_TO_COVERAGE_DITHER_DEFAULT_NV"/>
>+        <enum value="0x934E" name="GL_ALPHA_TO_COVERAGE_DITHER_ENABLE_NV"/>
>+        <enum value="0x934F" name="GL_ALPHA_TO_COVERAGE_DITHER_DISABLE_NV"/>
>+        <enum value="0x9350" name="GL_VIEWPORT_SWIZZLE_POSITIVE_X_NV"/>
>+        <enum value="0x9351" name="GL_VIEWPORT_SWIZZLE_NEGATIVE_X_NV"/>
>+        <enum value="0x9352" name="GL_VIEWPORT_SWIZZLE_POSITIVE_Y_NV"/>
>+        <enum value="0x9353" name="GL_VIEWPORT_SWIZZLE_NEGATIVE_Y_NV"/>
>+        <enum value="0x9354" name="GL_VIEWPORT_SWIZZLE_POSITIVE_Z_NV"/>
>+        <enum value="0x9355" name="GL_VIEWPORT_SWIZZLE_NEGATIVE_Z_NV"/>
>+        <enum value="0x9356" name="GL_VIEWPORT_SWIZZLE_POSITIVE_W_NV"/>
>+        <enum value="0x9357" name="GL_VIEWPORT_SWIZZLE_NEGATIVE_W_NV"/>
>+        <enum value="0x9358" name="GL_VIEWPORT_SWIZZLE_X_NV"/>
>+        <enum value="0x9359" name="GL_VIEWPORT_SWIZZLE_Y_NV"/>
>+        <enum value="0x935A" name="GL_VIEWPORT_SWIZZLE_Z_NV"/>
>+        <enum value="0x935B" name="GL_VIEWPORT_SWIZZLE_W_NV"/>
>+        <enum value="0x935C" name="GL_CLIP_ORIGIN"/>
>+        <enum value="0x935C" name="GL_CLIP_ORIGIN_EXT" alias="GL_CLIP_ORIGIN"/>
>+        <enum value="0x935D" name="GL_CLIP_DEPTH_MODE"/>
>+        <enum value="0x935D" name="GL_CLIP_DEPTH_MODE_EXT" alias="GL_CLIP_DEPTH_MODE"/>
>+        <enum value="0x935E" name="GL_NEGATIVE_ONE_TO_ONE"/>
>+        <enum value="0x935E" name="GL_NEGATIVE_ONE_TO_ONE_EXT" alias="GL_NEGATIVE_ONE_TO_ONE"/>
>+        <enum value="0x935F" name="GL_ZERO_TO_ONE"/>
>+        <enum value="0x935F" name="GL_ZERO_TO_ONE_EXT" alias="GL_ZERO_TO_ONE"/>
>+            <unused start="0x9360" end="0x9364" vendor="NV"/>
>+        <enum value="0x9365" name="GL_CLEAR_TEXTURE"/>
>+        <enum value="0x9366" name="GL_TEXTURE_REDUCTION_MODE_ARB"/>
>+        <enum value="0x9366" name="GL_TEXTURE_REDUCTION_MODE_EXT" alias="GL_TEXTURE_REDUCTION_MODE_ARB"/>
>+        <enum value="0x9367" name="GL_WEIGHTED_AVERAGE_ARB"/>
>+        <enum value="0x9367" name="GL_WEIGHTED_AVERAGE_EXT" alias="GL_WEIGHTED_AVERAGE_ARB"/>
>+        <enum value="0x9368" name="GL_FONT_GLYPHS_AVAILABLE_NV"/>
>+        <enum value="0x9369" name="GL_FONT_TARGET_UNAVAILABLE_NV"/>
>+        <enum value="0x936A" name="GL_FONT_UNAVAILABLE_NV"/>
>+        <enum value="0x936B" name="GL_FONT_UNINTELLIGIBLE_NV"/>
>+        <enum value="0x936C" name="GL_STANDARD_FONT_FORMAT_NV"/>
>+        <enum value="0x936D" name="GL_FRAGMENT_INPUT_NV"/>
>+        <enum value="0x936E" name="GL_UNIFORM_BUFFER_UNIFIED_NV"/>
>+        <enum value="0x936F" name="GL_UNIFORM_BUFFER_ADDRESS_NV"/>
>+        <enum value="0x9370" name="GL_UNIFORM_BUFFER_LENGTH_NV"/>
>+        <enum value="0x9371" name="GL_MULTISAMPLES_NV"/>
>+        <enum value="0x9372" name="GL_SUPERSAMPLE_SCALE_X_NV"/>
>+        <enum value="0x9373" name="GL_SUPERSAMPLE_SCALE_Y_NV"/>
>+        <enum value="0x9374" name="GL_CONFORMANT_NV"/>
>+            <unused start="0x9375" end="0x9378" vendor="NV"/>
>+        <enum value="0x9379" name="GL_CONSERVATIVE_RASTER_DILATE_NV"/>
>+        <enum value="0x937A" name="GL_CONSERVATIVE_RASTER_DILATE_RANGE_NV"/>
>+        <enum value="0x937B" name="GL_CONSERVATIVE_RASTER_DILATE_GRANULARITY_NV"/>
>+        <enum value="0x937C" name="GL_VIEWPORT_POSITION_W_SCALE_NV"/>
>+        <enum value="0x937D" name="GL_VIEWPORT_POSITION_W_SCALE_X_COEFF_NV"/>
>+        <enum value="0x937E" name="GL_VIEWPORT_POSITION_W_SCALE_Y_COEFF_NV"/>
>+            <unused start="0x937F" vendor="NV"/>
>+    </enums>
>+
>+    <enums namespace="GL" start="0x9380" end="0x939F" vendor="ARB">
>+        <enum value="0x9380" name="GL_NUM_SAMPLE_COUNTS"/>
>+        <enum value="0x9381" name="GL_MULTISAMPLE_LINE_WIDTH_RANGE_ARB"/>
>+        <enum value="0x9381" name="GL_MULTISAMPLE_LINE_WIDTH_RANGE"/>
>+        <enum value="0x9382" name="GL_MULTISAMPLE_LINE_WIDTH_GRANULARITY_ARB"/>
>+        <enum value="0x9382" name="GL_MULTISAMPLE_LINE_WIDTH_GRANULARITY"/>
>+            <unused start="0x9383" end="0x939F" vendor="ARB"/>
>+    </enums>
>+
>+    <enums namespace="GL" start="0x93A0" end="0x93AF" vendor="ANGLE" comment="Khronos bug 8100">
>+        <enum value="0x93A0" name="GL_TRANSLATED_SHADER_SOURCE_LENGTH_ANGLE"/>
>+        <enum value="0x93A1" name="GL_BGRA8_EXT"/>
>+        <enum value="0x93A2" name="GL_TEXTURE_USAGE_ANGLE"/>
>+        <enum value="0x93A3" name="GL_FRAMEBUFFER_ATTACHMENT_ANGLE"/>
>+        <enum value="0x93A4" name="GL_PACK_REVERSE_ROW_ORDER_ANGLE"/>
>+            <unused start="0x93A5" vendor="ANGLE"/>
>+        <enum value="0x93A6" name="GL_PROGRAM_BINARY_ANGLE"/>
>+            <unused start="0x93A7" end="0x93AF" vendor="ANGLE"/>
>+    </enums>
>+
>+    <enums namespace="GL" start="0x93B0" end="0x93EF" vendor="OES" comment="Khronos bug 8853">
>+        <enum value="0x93B0" name="GL_COMPRESSED_RGBA_ASTC_4x4"/>
>+        <enum value="0x93B0" name="GL_COMPRESSED_RGBA_ASTC_4x4_KHR"/>
>+        <enum value="0x93B1" name="GL_COMPRESSED_RGBA_ASTC_5x4"/>
>+        <enum value="0x93B1" name="GL_COMPRESSED_RGBA_ASTC_5x4_KHR"/>
>+        <enum value="0x93B2" name="GL_COMPRESSED_RGBA_ASTC_5x5"/>
>+        <enum value="0x93B2" name="GL_COMPRESSED_RGBA_ASTC_5x5_KHR"/>
>+        <enum value="0x93B3" name="GL_COMPRESSED_RGBA_ASTC_6x5"/>
>+        <enum value="0x93B3" name="GL_COMPRESSED_RGBA_ASTC_6x5_KHR"/>
>+        <enum value="0x93B4" name="GL_COMPRESSED_RGBA_ASTC_6x6"/>
>+        <enum value="0x93B4" name="GL_COMPRESSED_RGBA_ASTC_6x6_KHR"/>
>+        <enum value="0x93B5" name="GL_COMPRESSED_RGBA_ASTC_8x5"/>
>+        <enum value="0x93B5" name="GL_COMPRESSED_RGBA_ASTC_8x5_KHR"/>
>+        <enum value="0x93B6" name="GL_COMPRESSED_RGBA_ASTC_8x6"/>
>+        <enum value="0x93B6" name="GL_COMPRESSED_RGBA_ASTC_8x6_KHR"/>
>+        <enum value="0x93B7" name="GL_COMPRESSED_RGBA_ASTC_8x8"/>
>+        <enum value="0x93B7" name="GL_COMPRESSED_RGBA_ASTC_8x8_KHR"/>
>+        <enum value="0x93B8" name="GL_COMPRESSED_RGBA_ASTC_10x5"/>
>+        <enum value="0x93B8" name="GL_COMPRESSED_RGBA_ASTC_10x5_KHR"/>
>+        <enum value="0x93B9" name="GL_COMPRESSED_RGBA_ASTC_10x6"/>
>+        <enum value="0x93B9" name="GL_COMPRESSED_RGBA_ASTC_10x6_KHR"/>
>+        <enum value="0x93BA" name="GL_COMPRESSED_RGBA_ASTC_10x8"/>
>+        <enum value="0x93BA" name="GL_COMPRESSED_RGBA_ASTC_10x8_KHR"/>
>+        <enum value="0x93BB" name="GL_COMPRESSED_RGBA_ASTC_10x10"/>
>+        <enum value="0x93BB" name="GL_COMPRESSED_RGBA_ASTC_10x10_KHR"/>
>+        <enum value="0x93BC" name="GL_COMPRESSED_RGBA_ASTC_12x10"/>
>+        <enum value="0x93BC" name="GL_COMPRESSED_RGBA_ASTC_12x10_KHR"/>
>+        <enum value="0x93BD" name="GL_COMPRESSED_RGBA_ASTC_12x12"/>
>+        <enum value="0x93BD" name="GL_COMPRESSED_RGBA_ASTC_12x12_KHR"/>
>+            <unused start="0x93BE" end="0x93BF" vendor="OES"/>
>+        <enum value="0x93C0" name="GL_COMPRESSED_RGBA_ASTC_3x3x3_OES"/>
>+        <enum value="0x93C1" name="GL_COMPRESSED_RGBA_ASTC_4x3x3_OES"/>
>+        <enum value="0x93C2" name="GL_COMPRESSED_RGBA_ASTC_4x4x3_OES"/>
>+        <enum value="0x93C3" name="GL_COMPRESSED_RGBA_ASTC_4x4x4_OES"/>
>+        <enum value="0x93C4" name="GL_COMPRESSED_RGBA_ASTC_5x4x4_OES"/>
>+        <enum value="0x93C5" name="GL_COMPRESSED_RGBA_ASTC_5x5x4_OES"/>
>+        <enum value="0x93C6" name="GL_COMPRESSED_RGBA_ASTC_5x5x5_OES"/>
>+        <enum value="0x93C7" name="GL_COMPRESSED_RGBA_ASTC_6x5x5_OES"/>
>+        <enum value="0x93C8" name="GL_COMPRESSED_RGBA_ASTC_6x6x5_OES"/>
>+        <enum value="0x93C9" name="GL_COMPRESSED_RGBA_ASTC_6x6x6_OES"/>
>+            <unused start="0x93CA" end="0x93CF" vendor="OES"/>
>+        <enum value="0x93D0" name="GL_COMPRESSED_SRGB8_ALPHA8_ASTC_4x4"/>
>+        <enum value="0x93D0" name="GL_COMPRESSED_SRGB8_ALPHA8_ASTC_4x4_KHR"/>
>+        <enum value="0x93D1" name="GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x4"/>
>+        <enum value="0x93D1" name="GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x4_KHR"/>
>+        <enum value="0x93D2" name="GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x5"/>
>+        <enum value="0x93D2" name="GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x5_KHR"/>
>+        <enum value="0x93D3" name="GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x5"/>
>+        <enum value="0x93D3" name="GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x5_KHR"/>
>+        <enum value="0x93D4" name="GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x6"/>
>+        <enum value="0x93D4" name="GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x6_KHR"/>
>+        <enum value="0x93D5" name="GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x5"/>
>+        <enum value="0x93D5" name="GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x5_KHR"/>
>+        <enum value="0x93D6" name="GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x6"/>
>+        <enum value="0x93D6" name="GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x6_KHR"/>
>+        <enum value="0x93D7" name="GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x8"/>
>+        <enum value="0x93D7" name="GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x8_KHR"/>
>+        <enum value="0x93D8" name="GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x5"/>
>+        <enum value="0x93D8" name="GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x5_KHR"/>
>+        <enum value="0x93D9" name="GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x6"/>
>+        <enum value="0x93D9" name="GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x6_KHR"/>
>+        <enum value="0x93DA" name="GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x8"/>
>+        <enum value="0x93DA" name="GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x8_KHR"/>
>+        <enum value="0x93DB" name="GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x10"/>
>+        <enum value="0x93DB" name="GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x10_KHR"/>
>+        <enum value="0x93DC" name="GL_COMPRESSED_SRGB8_ALPHA8_ASTC_12x10"/>
>+        <enum value="0x93DC" name="GL_COMPRESSED_SRGB8_ALPHA8_ASTC_12x10_KHR"/>
>+        <enum value="0x93DD" name="GL_COMPRESSED_SRGB8_ALPHA8_ASTC_12x12"/>
>+        <enum value="0x93DD" name="GL_COMPRESSED_SRGB8_ALPHA8_ASTC_12x12_KHR"/>
>+            <unused start="0x93DE" end="0x93DF" vendor="OES"/>
>+        <enum value="0x93E0" name="GL_COMPRESSED_SRGB8_ALPHA8_ASTC_3x3x3_OES"/>
>+        <enum value="0x93E1" name="GL_COMPRESSED_SRGB8_ALPHA8_ASTC_4x3x3_OES"/>
>+        <enum value="0x93E2" name="GL_COMPRESSED_SRGB8_ALPHA8_ASTC_4x4x3_OES"/>
>+        <enum value="0x93E3" name="GL_COMPRESSED_SRGB8_ALPHA8_ASTC_4x4x4_OES"/>
>+        <enum value="0x93E4" name="GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x4x4_OES"/>
>+        <enum value="0x93E5" name="GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x5x4_OES"/>
>+        <enum value="0x93E6" name="GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x5x5_OES"/>
>+        <enum value="0x93E7" name="GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x5x5_OES"/>
>+        <enum value="0x93E8" name="GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x6x5_OES"/>
>+        <enum value="0x93E9" name="GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x6x6_OES"/>
>+            <unused start="0x93EA" end="0x93EF" vendor="OES"/>
>+    </enums>
>+
>+    <enums namespace="GL" start="0x93F0" end="0x94EF" vendor="APPLE" comment="Khronos bug 10233">
>+        <enum value="0x93F0" name="GL_COMPRESSED_SRGB_ALPHA_PVRTC_2BPPV2_IMG"/>
>+        <enum value="0x93F1" name="GL_COMPRESSED_SRGB_ALPHA_PVRTC_4BPPV2_IMG"/>
>+            <unused start="0x93F2" end="0x94EF" vendor="APPLE"/>
>+    </enums>
>+
>+    <enums namespace="GL" start="0x94F0" end="0x950F" vendor="INTEL" comment="Khronos bug 11345">
>+        <enum value="0x94F0" name="GL_PERFQUERY_COUNTER_EVENT_INTEL"/>
>+        <enum value="0x94F1" name="GL_PERFQUERY_COUNTER_DURATION_NORM_INTEL"/>
>+        <enum value="0x94F2" name="GL_PERFQUERY_COUNTER_DURATION_RAW_INTEL"/>
>+        <enum value="0x94F3" name="GL_PERFQUERY_COUNTER_THROUGHPUT_INTEL"/>
>+        <enum value="0x94F4" name="GL_PERFQUERY_COUNTER_RAW_INTEL"/>
>+        <enum value="0x94F5" name="GL_PERFQUERY_COUNTER_TIMESTAMP_INTEL"/>
>+            <unused start="0x94F6" end="0x94F7" vendor="INTEL"/>
>+        <enum value="0x94F8" name="GL_PERFQUERY_COUNTER_DATA_UINT32_INTEL"/>
>+        <enum value="0x94F9" name="GL_PERFQUERY_COUNTER_DATA_UINT64_INTEL"/>
>+        <enum value="0x94FA" name="GL_PERFQUERY_COUNTER_DATA_FLOAT_INTEL"/>
>+        <enum value="0x94FB" name="GL_PERFQUERY_COUNTER_DATA_DOUBLE_INTEL"/>
>+        <enum value="0x94FC" name="GL_PERFQUERY_COUNTER_DATA_BOOL32_INTEL"/>
>+        <enum value="0x94FD" name="GL_PERFQUERY_QUERY_NAME_LENGTH_MAX_INTEL"/>
>+        <enum value="0x94FE" name="GL_PERFQUERY_COUNTER_NAME_LENGTH_MAX_INTEL"/>
>+        <enum value="0x94FF" name="GL_PERFQUERY_COUNTER_DESC_LENGTH_MAX_INTEL"/>
>+        <enum value="0x9500" name="GL_PERFQUERY_GPA_EXTENDED_COUNTERS_INTEL"/>
>+            <unused start="0x9501" end="0x950F" vendor="INTEL"/>
>+    </enums>
>+
>+    <enums namespace="GL" start="0x9510" end="0x952F" vendor="Broadcom" comment="Khronos bug 12203">
>+            <unused start="0x9510" end="0x952F" vendor="Broadcom"/>
>+    </enums>
>+
>+    <enums namespace="GL" start="0x9530" end="0x962F" vendor="NV" comment="Khronos bug 12977">
>+        <enum value="0x9530" name="GL_LAYOUT_DEPTH_READ_ONLY_STENCIL_ATTACHMENT_EXT"/>
>+        <enum value="0x9531" name="GL_LAYOUT_DEPTH_ATTACHMENT_STENCIL_READ_ONLY_EXT"/>
>+            <unused start="0x9532" end="0x953F" vendor="NV"/>
>+        <enum value="0x9540" name="GL_QUERY_RESOURCE_TYPE_VIDMEM_ALLOC_NV"/>
>+            <unused start="0x9541" vendor="NV"/>
>+        <enum value="0x9542" name="GL_QUERY_RESOURCE_MEMTYPE_VIDMEM_NV"/>
>+            <unused start="0x9543" vendor="NV"/>
>+        <enum value="0x9544" name="GL_QUERY_RESOURCE_SYS_RESERVED_NV"/>
>+        <enum value="0x9545" name="GL_QUERY_RESOURCE_TEXTURE_NV"/>
>+        <enum value="0x9546" name="GL_QUERY_RESOURCE_RENDERBUFFER_NV"/>
>+        <enum value="0x9547" name="GL_QUERY_RESOURCE_BUFFEROBJECT_NV"/>
>+        <enum value="0x9548" name="GL_PER_GPU_STORAGE_NV"/>
>+        <enum value="0x9549" name="GL_MULTICAST_PROGRAMMABLE_SAMPLE_LOCATION_NV"/>
>+            <unused start="0x954A" end="0x954C" vendor="NV"/>
>+        <enum value="0x954D" name="GL_CONSERVATIVE_RASTER_MODE_NV"/>
>+        <enum value="0x954E" name="GL_CONSERVATIVE_RASTER_MODE_POST_SNAP_NV"/>
>+        <enum value="0x954F" name="GL_CONSERVATIVE_RASTER_MODE_PRE_SNAP_TRIANGLES_NV"/>
>+        <enum value="0x9550" name="GL_CONSERVATIVE_RASTER_MODE_PRE_SNAP_NV"/>
>+        <enum value="0x9551" name="GL_SHADER_BINARY_FORMAT_SPIR_V"/>
>+        <enum value="0x9551" name="GL_SHADER_BINARY_FORMAT_SPIR_V_ARB" alias="GL_SHADER_BINARY_FORMAT_SPIR_V"/>
>+        <enum value="0x9552" name="GL_SPIR_V_BINARY"/>
>+        <enum value="0x9552" name="GL_SPIR_V_BINARY_ARB" alias="GL_SPIR_V_BINARY"/>
>+        <enum value="0x9553" name="GL_SPIR_V_EXTENSIONS"/>
>+        <enum value="0x9554" name="GL_NUM_SPIR_V_EXTENSIONS"/>
>+            <unused start="0x9555" end="0x9557" vendor="NV"/>
>+        <enum value="0x9558" name="GL_RENDER_GPU_MASK_NV"/>
>+            <unused start="0x9559" end="0x957F" vendor="NV"/>
>+        <enum value="0x9580" name="GL_TEXTURE_TILING_EXT"/>
>+        <enum value="0x9581" name="GL_DEDICATED_MEMORY_OBJECT_EXT"/>
>+        <enum value="0x9582" name="GL_NUM_TILING_TYPES_EXT"/>
>+        <enum value="0x9583" name="GL_TILING_TYPES_EXT"/>
>+        <enum value="0x9584" name="GL_OPTIMAL_TILING_EXT"/>
>+        <enum value="0x9585" name="GL_LINEAR_TILING_EXT"/>
>+        <enum value="0x9586" name="GL_HANDLE_TYPE_OPAQUE_FD_EXT"/>
>+        <enum value="0x9587" name="GL_HANDLE_TYPE_OPAQUE_WIN32_EXT"/>
>+        <enum value="0x9588" name="GL_HANDLE_TYPE_OPAQUE_WIN32_KMT_EXT"/>
>+        <enum value="0x9589" name="GL_HANDLE_TYPE_D3D12_TILEPOOL_EXT"/>
>+        <enum value="0x958A" name="GL_HANDLE_TYPE_D3D12_RESOURCE_EXT"/>
>+        <enum value="0x958B" name="GL_HANDLE_TYPE_D3D11_IMAGE_EXT"/>
>+        <enum value="0x958C" name="GL_HANDLE_TYPE_D3D11_IMAGE_KMT_EXT"/>
>+        <enum value="0x958D" name="GL_LAYOUT_GENERAL_EXT"/>
>+        <enum value="0x958E" name="GL_LAYOUT_COLOR_ATTACHMENT_EXT"/>
>+        <enum value="0x958F" name="GL_LAYOUT_DEPTH_STENCIL_ATTACHMENT_EXT"/>
>+        <enum value="0x9590" name="GL_LAYOUT_DEPTH_STENCIL_READ_ONLY_EXT"/>
>+        <enum value="0x9591" name="GL_LAYOUT_SHADER_READ_ONLY_EXT"/>
>+        <enum value="0x9592" name="GL_LAYOUT_TRANSFER_SRC_EXT"/>
>+        <enum value="0x9593" name="GL_LAYOUT_TRANSFER_DST_EXT"/>
>+        <enum value="0x9594" name="GL_HANDLE_TYPE_D3D12_FENCE_EXT"/>
>+        <enum value="0x9595" name="GL_D3D12_FENCE_VALUE_EXT"/>
>+        <enum value="0x9596" name="GL_NUM_DEVICE_UUIDS_EXT"/>
>+        <enum value="0x9597" name="GL_DEVICE_UUID_EXT"/>
>+        <enum value="0x9598" name="GL_DRIVER_UUID_EXT"/>
>+        <enum value="0x9599" name="GL_DEVICE_LUID_EXT"/>
>+        <enum value="0x959A" name="GL_DEVICE_NODE_MASK_EXT"/>
>+        <enum value="0x959B" name="GL_PROTECTED_MEMORY_OBJECT_EXT"/>
>+            <unused start="0x959C" end="0x962F" vendor="NV"/>
>+    </enums>
>+
>+    <enums namespace="GL" start="0x9630" end="0x963F" vendor="Oculus" comment="Email from Cass Everitt">
>+        <enum value="0x9630" name="GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_NUM_VIEWS_OVR"/>
>+        <enum value="0x9631" name="GL_MAX_VIEWS_OVR"/>
>+        <enum value="0x9632" name="GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_BASE_VIEW_INDEX_OVR"/>
>+        <enum value="0x9633" name="GL_FRAMEBUFFER_INCOMPLETE_VIEW_TARGETS_OVR"/>
>+            <unused start="0x9634" end="0x963F" vendor="Oculus"/>
>+    </enums>
>+
>+    <enums namespace="GL" start="0x9640" end="0x964F" vendor="Mediatek" comment="Khronos bug 14294">
>+        <enum value="0x9640" name="GL_GS_SHADER_BINARY_MTK"/>
>+        <enum value="0x9641" name="GL_GS_PROGRAM_BINARY_MTK"/>
>+            <unused start="0x9642" end="0x964F" vendor="Mediatek"/>
>+    </enums>
>+
>+    <enums namespace="GL" start="0x9650" end="0x968F" vendor="IMG" comment="Khronos bug 14977">
>+        <enum value="0x9650" name="GL_MAX_SHADER_COMBINED_LOCAL_STORAGE_FAST_SIZE_EXT"/>
>+        <enum value="0x9651" name="GL_MAX_SHADER_COMBINED_LOCAL_STORAGE_SIZE_EXT"/>
>+        <enum value="0x9652" name="GL_FRAMEBUFFER_INCOMPLETE_INSUFFICIENT_SHADER_COMBINED_LOCAL_STORAGE_EXT"/>
>+            <unused start="0x9653" end="0x968F" vendor="IMG"/>
>+    </enums>
>+
>+    <enums namespace="GL" start="0x9690" end="0x969F" vendor="ANGLE" comment="Khronos bug 15423">
>+            <unused start="0x9690" end="0x969F" vendor="ANGLE"/>
>+    </enums>
>+
>+    <enums namespace="GL" start="0x96A0" end="0x96AF" vendor="Qualcomm" comment="contact Maurice Ribble">
>+            <unused start="0x96A0" end="0x96A1" vendor="Qualcomm"/>
>+        <enum value="0x96A2" name="GL_FRAMEBUFFER_FETCH_NONCOHERENT_QCOM"/>
>+            <unused start="0x96A3" end="0x96AF" vendor="Qualcomm"/>
>+    </enums>
>+
>+
>+
>+    <enums namespace="GL" start="0x96B0" end="99999" vendor="ARB" comment="RESERVED FOR FUTURE ALLOCATIONS BY KHRONOS">
>+        <unused start="0x96B0" end="99999" comment="RESERVED"/>
>+    </enums>
>+
>+
>+    <enums namespace="GL" start="100000" end="100999" vendor="ARB" comment="GLU enums"/>
>+    <enums namespace="GL" start="101000" end="101999" vendor="ARB" comment="Conformance test enums"/>
>+    <enums namespace="GL" start="102000" end="102999" vendor="ARB" comment="Unused, unlikely to ever be used"/>
>+
>+    <enums namespace="GL" start="103000" end="103999" vendor="IBM" comment="IBM is out of the graphics hardware business. Most of this range will remain unused.">
>+        <enum value="0x19262" name="GL_RASTER_POSITION_UNCLIPPED_IBM"/>
>+        <enum value="103050" name="GL_CULL_VERTEX_IBM"/>
>+        <enum value="103060" name="GL_ALL_STATIC_DATA_IBM"/>
>+        <enum value="103061" name="GL_STATIC_VERTEX_ARRAY_IBM"/>
>+        <enum value="103070" name="GL_VERTEX_ARRAY_LIST_IBM"/>
>+        <enum value="103071" name="GL_NORMAL_ARRAY_LIST_IBM"/>
>+        <enum value="103072" name="GL_COLOR_ARRAY_LIST_IBM"/>
>+        <enum value="103073" name="GL_INDEX_ARRAY_LIST_IBM"/>
>+        <enum value="103074" name="GL_TEXTURE_COORD_ARRAY_LIST_IBM"/>
>+        <enum value="103075" name="GL_EDGE_FLAG_ARRAY_LIST_IBM"/>
>+        <enum value="103076" name="GL_FOG_COORDINATE_ARRAY_LIST_IBM"/>
>+        <enum value="103077" name="GL_SECONDARY_COLOR_ARRAY_LIST_IBM"/>
>+        <enum value="103080" name="GL_VERTEX_ARRAY_LIST_STRIDE_IBM"/>
>+        <enum value="103081" name="GL_NORMAL_ARRAY_LIST_STRIDE_IBM"/>
>+        <enum value="103082" name="GL_COLOR_ARRAY_LIST_STRIDE_IBM"/>
>+        <enum value="103083" name="GL_INDEX_ARRAY_LIST_STRIDE_IBM"/>
>+        <enum value="103084" name="GL_TEXTURE_COORD_ARRAY_LIST_STRIDE_IBM"/>
>+        <enum value="103085" name="GL_EDGE_FLAG_ARRAY_LIST_STRIDE_IBM"/>
>+        <enum value="103086" name="GL_FOG_COORDINATE_ARRAY_LIST_STRIDE_IBM"/>
>+        <enum value="103087" name="GL_SECONDARY_COLOR_ARRAY_LIST_STRIDE_IBM"/>
>+    </enums>
>+
>+    <enums namespace="GL" start="104000" end="104999" vendor="NEC" comment="NEC may be out of the graphics hardware business?"/>
>+    <enums namespace="GL" start="105000" end="105999" vendor="Compaq" comment="Compaq was acquired by HP"/>
>+    <enums namespace="GL" start="106000" end="106999" vendor="KPC" comment="Kubota Pacific is out of business"/>
>+    <enums namespace="GL" start="107000" end="107999" vendor="PGI" comment="Portland Graphics was acquired by Template Graphics, which is out of business">
>+            
>+        <enum value="0x1A1F8" name="GL_PREFER_DOUBLEBUFFER_HINT_PGI"/>
>+        <enum value="0x1A1FD" name="GL_CONSERVE_MEMORY_HINT_PGI"/>
>+        <enum value="0x1A1FE" name="GL_RECLAIM_MEMORY_HINT_PGI"/>
>+        <enum value="0x1A202" name="GL_NATIVE_GRAPHICS_HANDLE_PGI"/>
>+        <enum value="0x1A203" name="GL_NATIVE_GRAPHICS_BEGIN_HINT_PGI"/>
>+        <enum value="0x1A204" name="GL_NATIVE_GRAPHICS_END_HINT_PGI"/>
>+        <enum value="0x1A20C" name="GL_ALWAYS_FAST_HINT_PGI"/>
>+        <enum value="0x1A20D" name="GL_ALWAYS_SOFT_HINT_PGI"/>
>+        <enum value="0x1A20E" name="GL_ALLOW_DRAW_OBJ_HINT_PGI"/>
>+        <enum value="0x1A20F" name="GL_ALLOW_DRAW_WIN_HINT_PGI"/>
>+        <enum value="0x1A210" name="GL_ALLOW_DRAW_FRG_HINT_PGI"/>
>+        <enum value="0x1A211" name="GL_ALLOW_DRAW_MEM_HINT_PGI"/>
>+        <enum value="0x1A216" name="GL_STRICT_DEPTHFUNC_HINT_PGI"/>
>+        <enum value="0x1A217" name="GL_STRICT_LIGHTING_HINT_PGI"/>
>+        <enum value="0x1A218" name="GL_STRICT_SCISSOR_HINT_PGI"/>
>+        <enum value="0x1A219" name="GL_FULL_STIPPLE_HINT_PGI"/>
>+        <enum value="0x1A220" name="GL_CLIP_NEAR_HINT_PGI"/>
>+        <enum value="0x1A221" name="GL_CLIP_FAR_HINT_PGI"/>
>+        <enum value="0x1A222" name="GL_WIDE_LINE_HINT_PGI"/>
>+        <enum value="0x1A223" name="GL_BACK_NORMALS_HINT_PGI"/>
>+        <enum value="0x1A22A" name="GL_VERTEX_DATA_HINT_PGI"/>
>+        <enum value="0x1A22B" name="GL_VERTEX_CONSISTENT_HINT_PGI"/>
>+        <enum value="0x1A22C" name="GL_MATERIAL_SIDE_HINT_PGI"/>
>+        <enum value="0x1A22D" name="GL_MAX_VERTEX_HINT_PGI"/>
>+    </enums>
>+
>+    <enums namespace="GL" start="108000" end="108999" vendor="ES" comment="Evans and Sutherland is out of the graphics hardware business"/>
>+
>+    
>+    <commands namespace="GL">
>+        <command>
>+            <proto>void <name>glAccum</name></proto>
>+            <param group="AccumOp"><ptype>GLenum</ptype> <name>op</name></param>
>+            <param group="CoordF"><ptype>GLfloat</ptype> <name>value</name></param>
>+            <glx type="render" opcode="137"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glAccumxOES</name></proto>
>+            <param><ptype>GLenum</ptype> <name>op</name></param>
>+            <param><ptype>GLfixed</ptype> <name>value</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glActiveProgramEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glActiveShaderProgram</name></proto>
>+            <param><ptype>GLuint</ptype> <name>pipeline</name></param>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glActiveShaderProgramEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>pipeline</name></param>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glActiveStencilFaceEXT</name></proto>
>+            <param group="StencilFaceDirection"><ptype>GLenum</ptype> <name>face</name></param>
>+            <glx type="render" opcode="4220"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glActiveTexture</name></proto>
>+            <param group="TextureUnit"><ptype>GLenum</ptype> <name>texture</name></param>
>+            <glx type="render" opcode="197"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glActiveTextureARB</name></proto>
>+            <param group="TextureUnit"><ptype>GLenum</ptype> <name>texture</name></param>
>+            <alias name="glActiveTexture"/>
>+            <glx type="render" opcode="197"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glActiveVaryingNV</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param len="COMPSIZE(name)">const <ptype>GLchar</ptype> *<name>name</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glAlphaFragmentOp1ATI</name></proto>
>+            <param group="FragmentOpATI"><ptype>GLenum</ptype> <name>op</name></param>
>+            <param><ptype>GLuint</ptype> <name>dst</name></param>
>+            <param><ptype>GLuint</ptype> <name>dstMod</name></param>
>+            <param><ptype>GLuint</ptype> <name>arg1</name></param>
>+            <param><ptype>GLuint</ptype> <name>arg1Rep</name></param>
>+            <param><ptype>GLuint</ptype> <name>arg1Mod</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glAlphaFragmentOp2ATI</name></proto>
>+            <param group="FragmentOpATI"><ptype>GLenum</ptype> <name>op</name></param>
>+            <param><ptype>GLuint</ptype> <name>dst</name></param>
>+            <param><ptype>GLuint</ptype> <name>dstMod</name></param>
>+            <param><ptype>GLuint</ptype> <name>arg1</name></param>
>+            <param><ptype>GLuint</ptype> <name>arg1Rep</name></param>
>+            <param><ptype>GLuint</ptype> <name>arg1Mod</name></param>
>+            <param><ptype>GLuint</ptype> <name>arg2</name></param>
>+            <param><ptype>GLuint</ptype> <name>arg2Rep</name></param>
>+            <param><ptype>GLuint</ptype> <name>arg2Mod</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glAlphaFragmentOp3ATI</name></proto>
>+            <param group="FragmentOpATI"><ptype>GLenum</ptype> <name>op</name></param>
>+            <param><ptype>GLuint</ptype> <name>dst</name></param>
>+            <param><ptype>GLuint</ptype> <name>dstMod</name></param>
>+            <param><ptype>GLuint</ptype> <name>arg1</name></param>
>+            <param><ptype>GLuint</ptype> <name>arg1Rep</name></param>
>+            <param><ptype>GLuint</ptype> <name>arg1Mod</name></param>
>+            <param><ptype>GLuint</ptype> <name>arg2</name></param>
>+            <param><ptype>GLuint</ptype> <name>arg2Rep</name></param>
>+            <param><ptype>GLuint</ptype> <name>arg2Mod</name></param>
>+            <param><ptype>GLuint</ptype> <name>arg3</name></param>
>+            <param><ptype>GLuint</ptype> <name>arg3Rep</name></param>
>+            <param><ptype>GLuint</ptype> <name>arg3Mod</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glAlphaFunc</name></proto>
>+            <param group="AlphaFunction"><ptype>GLenum</ptype> <name>func</name></param>
>+            <param><ptype>GLfloat</ptype> <name>ref</name></param>
>+            <glx type="render" opcode="159"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glAlphaFuncQCOM</name></proto>
>+            <param><ptype>GLenum</ptype> <name>func</name></param>
>+            <param><ptype>GLclampf</ptype> <name>ref</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glAlphaFuncx</name></proto>
>+            <param group="AlphaFunction"><ptype>GLenum</ptype> <name>func</name></param>
>+            <param><ptype>GLfixed</ptype> <name>ref</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glAlphaFuncxOES</name></proto>
>+            <param group="AlphaFunction"><ptype>GLenum</ptype> <name>func</name></param>
>+            <param group="ClampedFixed"><ptype>GLfixed</ptype> <name>ref</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glAlphaToCoverageDitherControlNV</name></proto>
>+            <param><ptype>GLenum</ptype> <name>mode</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glApplyFramebufferAttachmentCMAAINTEL</name></proto>
>+        </command>
>+        <command>
>+            <proto>void <name>glApplyTextureEXT</name></proto>
>+            <param group="LightTextureModeEXT"><ptype>GLenum</ptype> <name>mode</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>GLboolean</ptype> <name>glAcquireKeyedMutexWin32EXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>memory</name></param>
>+            <param><ptype>GLuint64</ptype> <name>key</name></param>
>+            <param><ptype>GLuint</ptype> <name>timeout</name></param>
>+        </command>
>+        <command>
>+            <proto group="Boolean"><ptype>GLboolean</ptype> <name>glAreProgramsResidentNV</name></proto>
>+            <param><ptype>GLsizei</ptype> <name>n</name></param>
>+            <param len="n">const <ptype>GLuint</ptype> *<name>programs</name></param>
>+            <param group="Boolean" len="n"><ptype>GLboolean</ptype> *<name>residences</name></param>
>+            <glx type="vendor" opcode="1293"/>
>+        </command>
>+        <command>
>+            <proto group="Boolean"><ptype>GLboolean</ptype> <name>glAreTexturesResident</name></proto>
>+            <param><ptype>GLsizei</ptype> <name>n</name></param>
>+            <param group="Texture" len="n">const <ptype>GLuint</ptype> *<name>textures</name></param>
>+            <param group="Boolean" len="n"><ptype>GLboolean</ptype> *<name>residences</name></param>
>+            <glx type="single" opcode="143"/>
>+        </command>
>+        <command>
>+            <proto group="Boolean"><ptype>GLboolean</ptype> <name>glAreTexturesResidentEXT</name></proto>
>+            <param><ptype>GLsizei</ptype> <name>n</name></param>
>+            <param group="Texture" len="n">const <ptype>GLuint</ptype> *<name>textures</name></param>
>+            <param group="Boolean" len="n"><ptype>GLboolean</ptype> *<name>residences</name></param>
>+            <glx type="vendor" opcode="11"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glArrayElement</name></proto>
>+            <param><ptype>GLint</ptype> <name>i</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glArrayElementEXT</name></proto>
>+            <param><ptype>GLint</ptype> <name>i</name></param>
>+            <alias name="glArrayElement"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glArrayObjectATI</name></proto>
>+            <param group="EnableCap"><ptype>GLenum</ptype> <name>array</name></param>
>+            <param><ptype>GLint</ptype> <name>size</name></param>
>+            <param group="ScalarType"><ptype>GLenum</ptype> <name>type</name></param>
>+            <param><ptype>GLsizei</ptype> <name>stride</name></param>
>+            <param><ptype>GLuint</ptype> <name>buffer</name></param>
>+            <param><ptype>GLuint</ptype> <name>offset</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glAsyncMarkerSGIX</name></proto>
>+            <param><ptype>GLuint</ptype> <name>marker</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glAttachObjectARB</name></proto>
>+            <param group="handleARB"><ptype>GLhandleARB</ptype> <name>containerObj</name></param>
>+            <param group="handleARB"><ptype>GLhandleARB</ptype> <name>obj</name></param>
>+            <alias name="glAttachShader"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glAttachShader</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param><ptype>GLuint</ptype> <name>shader</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glBegin</name></proto>
>+            <param group="PrimitiveType"><ptype>GLenum</ptype> <name>mode</name></param>
>+            <glx type="render" opcode="4"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glBeginConditionalRender</name></proto>
>+            <param><ptype>GLuint</ptype> <name>id</name></param>
>+            <param group="TypeEnum"><ptype>GLenum</ptype> <name>mode</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glBeginConditionalRenderNV</name></proto>
>+            <param><ptype>GLuint</ptype> <name>id</name></param>
>+            <param group="TypeEnum"><ptype>GLenum</ptype> <name>mode</name></param>
>+            <alias name="glBeginConditionalRender"/>
>+            <glx type="render" opcode="348"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glBeginConditionalRenderNVX</name></proto>
>+            <param><ptype>GLuint</ptype> <name>id</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glBeginFragmentShaderATI</name></proto>
>+        </command>
>+        <command>
>+            <proto>void <name>glBeginOcclusionQueryNV</name></proto>
>+            <param><ptype>GLuint</ptype> <name>id</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glBeginPerfMonitorAMD</name></proto>
>+            <param><ptype>GLuint</ptype> <name>monitor</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glBeginPerfQueryINTEL</name></proto>
>+            <param><ptype>GLuint</ptype> <name>queryHandle</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glBeginQuery</name></proto>
>+            <param group="QueryTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param><ptype>GLuint</ptype> <name>id</name></param>
>+            <glx type="render" opcode="231"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glBeginQueryARB</name></proto>
>+            <param><ptype>GLenum</ptype> <name>target</name></param>
>+            <param><ptype>GLuint</ptype> <name>id</name></param>
>+            <alias name="glBeginQuery"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glBeginQueryEXT</name></proto>
>+            <param group="QueryTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param><ptype>GLuint</ptype> <name>id</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glBeginQueryIndexed</name></proto>
>+            <param group="QueryTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param><ptype>GLuint</ptype> <name>id</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glBeginTransformFeedback</name></proto>
>+            <param group="PrimitiveType"><ptype>GLenum</ptype> <name>primitiveMode</name></param>
>+            <glx type="render" opcode="357"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glBeginTransformFeedbackEXT</name></proto>
>+            <param group="PrimitiveType"><ptype>GLenum</ptype> <name>primitiveMode</name></param>
>+            <alias name="glBeginTransformFeedback"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glBeginTransformFeedbackNV</name></proto>
>+            <param group="PrimitiveType"><ptype>GLenum</ptype> <name>primitiveMode</name></param>
>+            <alias name="glBeginTransformFeedback"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glBeginVertexShaderEXT</name></proto>
>+        </command>
>+        <command>
>+            <proto>void <name>glBeginVideoCaptureNV</name></proto>
>+            <param><ptype>GLuint</ptype> <name>video_capture_slot</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glBindAttribLocation</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param>const <ptype>GLchar</ptype> *<name>name</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glBindAttribLocationARB</name></proto>
>+            <param group="handleARB"><ptype>GLhandleARB</ptype> <name>programObj</name></param>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param>const <ptype>GLcharARB</ptype> *<name>name</name></param>
>+            <alias name="glBindAttribLocation"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glBindBuffer</name></proto>
>+            <param group="BufferTargetARB"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param><ptype>GLuint</ptype> <name>buffer</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glBindBufferARB</name></proto>
>+            <param group="BufferTargetARB"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param><ptype>GLuint</ptype> <name>buffer</name></param>
>+            <alias name="glBindBuffer"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glBindBufferBase</name></proto>
>+            <param group="BufferTargetARB"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param><ptype>GLuint</ptype> <name>buffer</name></param>
>+            <glx type="render" opcode="356"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glBindBufferBaseEXT</name></proto>
>+            <param group="BufferTargetARB"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param><ptype>GLuint</ptype> <name>buffer</name></param>
>+            <alias name="glBindBufferBase"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glBindBufferBaseNV</name></proto>
>+            <param group="BufferTargetARB"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param><ptype>GLuint</ptype> <name>buffer</name></param>
>+            <alias name="glBindBufferBase"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glBindBufferOffsetEXT</name></proto>
>+            <param group="BufferTargetARB"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param><ptype>GLuint</ptype> <name>buffer</name></param>
>+            <param group="BufferOffset"><ptype>GLintptr</ptype> <name>offset</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glBindBufferOffsetNV</name></proto>
>+            <param group="BufferTargetARB"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param><ptype>GLuint</ptype> <name>buffer</name></param>
>+            <param group="BufferOffset"><ptype>GLintptr</ptype> <name>offset</name></param>
>+            <alias name="glBindBufferOffsetEXT"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glBindBufferRange</name></proto>
>+            <param group="BufferTargetARB"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param><ptype>GLuint</ptype> <name>buffer</name></param>
>+            <param group="BufferOffset"><ptype>GLintptr</ptype> <name>offset</name></param>
>+            <param group="BufferSize"><ptype>GLsizeiptr</ptype> <name>size</name></param>
>+            <glx type="render" opcode="355"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glBindBufferRangeEXT</name></proto>
>+            <param group="BufferTargetARB"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param><ptype>GLuint</ptype> <name>buffer</name></param>
>+            <param group="BufferOffset"><ptype>GLintptr</ptype> <name>offset</name></param>
>+            <param group="BufferSize"><ptype>GLsizeiptr</ptype> <name>size</name></param>
>+            <alias name="glBindBufferRange"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glBindBufferRangeNV</name></proto>
>+            <param group="BufferTargetARB"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param><ptype>GLuint</ptype> <name>buffer</name></param>
>+            <param group="BufferOffset"><ptype>GLintptr</ptype> <name>offset</name></param>
>+            <param group="BufferSize"><ptype>GLsizeiptr</ptype> <name>size</name></param>
>+            <alias name="glBindBufferRange"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glBindBuffersBase</name></proto>
>+            <param group="BufferTargetARB"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param><ptype>GLuint</ptype> <name>first</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param len="count">const <ptype>GLuint</ptype> *<name>buffers</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glBindBuffersRange</name></proto>
>+            <param group="BufferTargetARB"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param><ptype>GLuint</ptype> <name>first</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param len="count">const <ptype>GLuint</ptype> *<name>buffers</name></param>
>+            <param len="count">const <ptype>GLintptr</ptype> *<name>offsets</name></param>
>+            <param len="count">const <ptype>GLsizeiptr</ptype> *<name>sizes</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glBindFragDataLocation</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param><ptype>GLuint</ptype> <name>color</name></param>
>+            <param len="COMPSIZE(name)">const <ptype>GLchar</ptype> *<name>name</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glBindFragDataLocationEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param><ptype>GLuint</ptype> <name>color</name></param>
>+            <param len="COMPSIZE(name)">const <ptype>GLchar</ptype> *<name>name</name></param>
>+            <alias name="glBindFragDataLocation"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glBindFragDataLocationIndexed</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param><ptype>GLuint</ptype> <name>colorNumber</name></param>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param>const <ptype>GLchar</ptype> *<name>name</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glBindFragDataLocationIndexedEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param><ptype>GLuint</ptype> <name>colorNumber</name></param>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param>const <ptype>GLchar</ptype> *<name>name</name></param>
>+            <alias name="glBindFragDataLocationIndexed"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glBindFragmentShaderATI</name></proto>
>+            <param><ptype>GLuint</ptype> <name>id</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glBindFramebuffer</name></proto>
>+            <param group="FramebufferTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param><ptype>GLuint</ptype> <name>framebuffer</name></param>
>+            <glx type="render" opcode="236"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glBindFramebufferEXT</name></proto>
>+            <param group="FramebufferTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param><ptype>GLuint</ptype> <name>framebuffer</name></param>
>+            <glx type="render" opcode="4319"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glBindFramebufferOES</name></proto>
>+            <param group="FramebufferTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param><ptype>GLuint</ptype> <name>framebuffer</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glBindImageTexture</name></proto>
>+            <param><ptype>GLuint</ptype> <name>unit</name></param>
>+            <param><ptype>GLuint</ptype> <name>texture</name></param>
>+            <param><ptype>GLint</ptype> <name>level</name></param>
>+            <param group="Boolean"><ptype>GLboolean</ptype> <name>layered</name></param>
>+            <param><ptype>GLint</ptype> <name>layer</name></param>
>+            <param group="BufferAccessARB"><ptype>GLenum</ptype> <name>access</name></param>
>+            <param group="InternalFormat"><ptype>GLenum</ptype> <name>format</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glBindImageTextureEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param><ptype>GLuint</ptype> <name>texture</name></param>
>+            <param><ptype>GLint</ptype> <name>level</name></param>
>+            <param group="Boolean"><ptype>GLboolean</ptype> <name>layered</name></param>
>+            <param><ptype>GLint</ptype> <name>layer</name></param>
>+            <param group="BufferAccessARB"><ptype>GLenum</ptype> <name>access</name></param>
>+            <param><ptype>GLint</ptype> <name>format</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glBindImageTextures</name></proto>
>+            <param><ptype>GLuint</ptype> <name>first</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param len="count">const <ptype>GLuint</ptype> *<name>textures</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>GLuint</ptype> <name>glBindLightParameterEXT</name></proto>
>+            <param group="LightName"><ptype>GLenum</ptype> <name>light</name></param>
>+            <param group="LightParameter"><ptype>GLenum</ptype> <name>value</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>GLuint</ptype> <name>glBindMaterialParameterEXT</name></proto>
>+            <param group="MaterialFace"><ptype>GLenum</ptype> <name>face</name></param>
>+            <param group="MaterialParameter"><ptype>GLenum</ptype> <name>value</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glBindMultiTextureEXT</name></proto>
>+            <param group="TextureUnit"><ptype>GLenum</ptype> <name>texunit</name></param>
>+            <param group="TextureTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="Texture"><ptype>GLuint</ptype> <name>texture</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>GLuint</ptype> <name>glBindParameterEXT</name></proto>
>+            <param group="VertexShaderParameterEXT"><ptype>GLenum</ptype> <name>value</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glBindProgramARB</name></proto>
>+            <param group="ProgramTargetARB"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <glx type="render" opcode="4180"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glBindProgramNV</name></proto>
>+            <param group="VertexAttribEnumNV"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param><ptype>GLuint</ptype> <name>id</name></param>
>+            <alias name="glBindProgramARB"/>
>+            <glx type="render" opcode="4180"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glBindProgramPipeline</name></proto>
>+            <param><ptype>GLuint</ptype> <name>pipeline</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glBindProgramPipelineEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>pipeline</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glBindRenderbuffer</name></proto>
>+            <param group="RenderbufferTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param><ptype>GLuint</ptype> <name>renderbuffer</name></param>
>+            <glx type="render" opcode="235"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glBindRenderbufferEXT</name></proto>
>+            <param group="RenderbufferTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param><ptype>GLuint</ptype> <name>renderbuffer</name></param>
>+            <glx type="render" opcode="4316"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glBindRenderbufferOES</name></proto>
>+            <param group="RenderbufferTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param><ptype>GLuint</ptype> <name>renderbuffer</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glBindSampler</name></proto>
>+            <param><ptype>GLuint</ptype> <name>unit</name></param>
>+            <param><ptype>GLuint</ptype> <name>sampler</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glBindSamplers</name></proto>
>+            <param><ptype>GLuint</ptype> <name>first</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param len="count">const <ptype>GLuint</ptype> *<name>samplers</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>GLuint</ptype> <name>glBindTexGenParameterEXT</name></proto>
>+            <param group="TextureUnit"><ptype>GLenum</ptype> <name>unit</name></param>
>+            <param group="TextureCoordName"><ptype>GLenum</ptype> <name>coord</name></param>
>+            <param group="TextureGenParameter"><ptype>GLenum</ptype> <name>value</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glBindTexture</name></proto>
>+            <param group="TextureTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="Texture"><ptype>GLuint</ptype> <name>texture</name></param>
>+            <glx type="render" opcode="4117"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glBindTextureEXT</name></proto>
>+            <param group="TextureTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="Texture"><ptype>GLuint</ptype> <name>texture</name></param>
>+            <alias name="glBindTexture"/>
>+            <glx type="render" opcode="4117"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glBindTextureUnit</name></proto>
>+            <param><ptype>GLuint</ptype> <name>unit</name></param>
>+            <param><ptype>GLuint</ptype> <name>texture</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>GLuint</ptype> <name>glBindTextureUnitParameterEXT</name></proto>
>+            <param group="TextureUnit"><ptype>GLenum</ptype> <name>unit</name></param>
>+            <param group="VertexShaderTextureUnitParameter"><ptype>GLenum</ptype> <name>value</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glBindTextures</name></proto>
>+            <param><ptype>GLuint</ptype> <name>first</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param len="count">const <ptype>GLuint</ptype> *<name>textures</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glBindTransformFeedback</name></proto>
>+            <param group="BindTransformFeedbackTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param><ptype>GLuint</ptype> <name>id</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glBindTransformFeedbackNV</name></proto>
>+            <param group="BufferTargetARB"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param><ptype>GLuint</ptype> <name>id</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glBindVertexArray</name></proto>
>+            <param><ptype>GLuint</ptype> <name>array</name></param>
>+            <glx type="render" opcode="350"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glBindVertexArrayAPPLE</name></proto>
>+            <param><ptype>GLuint</ptype> <name>array</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glBindVertexArrayOES</name></proto>
>+            <param><ptype>GLuint</ptype> <name>array</name></param>
>+            <alias name="glBindVertexArray"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glBindVertexBuffer</name></proto>
>+            <param><ptype>GLuint</ptype> <name>bindingindex</name></param>
>+            <param><ptype>GLuint</ptype> <name>buffer</name></param>
>+            <param group="BufferOffset"><ptype>GLintptr</ptype> <name>offset</name></param>
>+            <param><ptype>GLsizei</ptype> <name>stride</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glBindVertexBuffers</name></proto>
>+            <param><ptype>GLuint</ptype> <name>first</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param len="count">const <ptype>GLuint</ptype> *<name>buffers</name></param>
>+            <param len="count">const <ptype>GLintptr</ptype> *<name>offsets</name></param>
>+            <param len="count">const <ptype>GLsizei</ptype> *<name>strides</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glBindVertexShaderEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>id</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glBindVideoCaptureStreamBufferNV</name></proto>
>+            <param><ptype>GLuint</ptype> <name>video_capture_slot</name></param>
>+            <param><ptype>GLuint</ptype> <name>stream</name></param>
>+            <param><ptype>GLenum</ptype> <name>frame_region</name></param>
>+            <param group="BufferOffsetARB"><ptype>GLintptrARB</ptype> <name>offset</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glBindVideoCaptureStreamTextureNV</name></proto>
>+            <param><ptype>GLuint</ptype> <name>video_capture_slot</name></param>
>+            <param><ptype>GLuint</ptype> <name>stream</name></param>
>+            <param><ptype>GLenum</ptype> <name>frame_region</name></param>
>+            <param><ptype>GLenum</ptype> <name>target</name></param>
>+            <param><ptype>GLuint</ptype> <name>texture</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glBinormal3bEXT</name></proto>
>+            <param><ptype>GLbyte</ptype> <name>bx</name></param>
>+            <param><ptype>GLbyte</ptype> <name>by</name></param>
>+            <param><ptype>GLbyte</ptype> <name>bz</name></param>
>+            <vecequiv name="glBinormal3bvEXT"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glBinormal3bvEXT</name></proto>
>+            <param len="3">const <ptype>GLbyte</ptype> *<name>v</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glBinormal3dEXT</name></proto>
>+            <param group="CoordD"><ptype>GLdouble</ptype> <name>bx</name></param>
>+            <param group="CoordD"><ptype>GLdouble</ptype> <name>by</name></param>
>+            <param group="CoordD"><ptype>GLdouble</ptype> <name>bz</name></param>
>+            <vecequiv name="glBinormal3dvEXT"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glBinormal3dvEXT</name></proto>
>+            <param group="CoordD" len="3">const <ptype>GLdouble</ptype> *<name>v</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glBinormal3fEXT</name></proto>
>+            <param group="CoordF"><ptype>GLfloat</ptype> <name>bx</name></param>
>+            <param group="CoordF"><ptype>GLfloat</ptype> <name>by</name></param>
>+            <param group="CoordF"><ptype>GLfloat</ptype> <name>bz</name></param>
>+            <vecequiv name="glBinormal3fvEXT"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glBinormal3fvEXT</name></proto>
>+            <param group="CoordF" len="3">const <ptype>GLfloat</ptype> *<name>v</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glBinormal3iEXT</name></proto>
>+            <param><ptype>GLint</ptype> <name>bx</name></param>
>+            <param><ptype>GLint</ptype> <name>by</name></param>
>+            <param><ptype>GLint</ptype> <name>bz</name></param>
>+            <vecequiv name="glBinormal3ivEXT"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glBinormal3ivEXT</name></proto>
>+            <param len="3">const <ptype>GLint</ptype> *<name>v</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glBinormal3sEXT</name></proto>
>+            <param><ptype>GLshort</ptype> <name>bx</name></param>
>+            <param><ptype>GLshort</ptype> <name>by</name></param>
>+            <param><ptype>GLshort</ptype> <name>bz</name></param>
>+            <vecequiv name="glBinormal3svEXT"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glBinormal3svEXT</name></proto>
>+            <param len="3">const <ptype>GLshort</ptype> *<name>v</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glBinormalPointerEXT</name></proto>
>+            <param group="BinormalPointerTypeEXT"><ptype>GLenum</ptype> <name>type</name></param>
>+            <param><ptype>GLsizei</ptype> <name>stride</name></param>
>+            <param len="COMPSIZE(type,stride)">const void *<name>pointer</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glBitmap</name></proto>
>+            <param><ptype>GLsizei</ptype> <name>width</name></param>
>+            <param><ptype>GLsizei</ptype> <name>height</name></param>
>+            <param group="CoordF"><ptype>GLfloat</ptype> <name>xorig</name></param>
>+            <param group="CoordF"><ptype>GLfloat</ptype> <name>yorig</name></param>
>+            <param group="CoordF"><ptype>GLfloat</ptype> <name>xmove</name></param>
>+            <param group="CoordF"><ptype>GLfloat</ptype> <name>ymove</name></param>
>+            <param len="COMPSIZE(width,height)">const <ptype>GLubyte</ptype> *<name>bitmap</name></param>
>+            <glx type="render" opcode="5"/>
>+            <glx type="render" opcode="311" name="glBitmapPBO" comment="PBO protocol"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glBitmapxOES</name></proto>
>+            <param><ptype>GLsizei</ptype> <name>width</name></param>
>+            <param><ptype>GLsizei</ptype> <name>height</name></param>
>+            <param><ptype>GLfixed</ptype> <name>xorig</name></param>
>+            <param><ptype>GLfixed</ptype> <name>yorig</name></param>
>+            <param><ptype>GLfixed</ptype> <name>xmove</name></param>
>+            <param><ptype>GLfixed</ptype> <name>ymove</name></param>
>+            <param len="COMPSIZE(width,height)">const <ptype>GLubyte</ptype> *<name>bitmap</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glBlendBarrier</name></proto>
>+        </command>
>+        <command>
>+            <proto>void <name>glBlendBarrierKHR</name></proto>
>+            <alias name="glBlendBarrier"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glBlendBarrierNV</name></proto>
>+            <alias name="glBlendBarrier"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glBlendColor</name></proto>
>+            <param group="ColorF"><ptype>GLfloat</ptype> <name>red</name></param>
>+            <param group="ColorF"><ptype>GLfloat</ptype> <name>green</name></param>
>+            <param group="ColorF"><ptype>GLfloat</ptype> <name>blue</name></param>
>+            <param group="ColorF"><ptype>GLfloat</ptype> <name>alpha</name></param>
>+            <glx type="render" opcode="4096"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glBlendColorEXT</name></proto>
>+            <param group="ColorF"><ptype>GLfloat</ptype> <name>red</name></param>
>+            <param group="ColorF"><ptype>GLfloat</ptype> <name>green</name></param>
>+            <param group="ColorF"><ptype>GLfloat</ptype> <name>blue</name></param>
>+            <param group="ColorF"><ptype>GLfloat</ptype> <name>alpha</name></param>
>+            <alias name="glBlendColor"/>
>+            <glx type="render" opcode="4096"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glBlendColorxOES</name></proto>
>+            <param group="ClampedFixed"><ptype>GLfixed</ptype> <name>red</name></param>
>+            <param group="ClampedFixed"><ptype>GLfixed</ptype> <name>green</name></param>
>+            <param group="ClampedFixed"><ptype>GLfixed</ptype> <name>blue</name></param>
>+            <param group="ClampedFixed"><ptype>GLfixed</ptype> <name>alpha</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glBlendEquation</name></proto>
>+            <param group="BlendEquationModeEXT"><ptype>GLenum</ptype> <name>mode</name></param>
>+            <glx type="render" opcode="4097"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glBlendEquationEXT</name></proto>
>+            <param group="BlendEquationModeEXT"><ptype>GLenum</ptype> <name>mode</name></param>
>+            <alias name="glBlendEquation"/>
>+            <glx type="render" opcode="4097"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glBlendEquationIndexedAMD</name></proto>
>+            <param><ptype>GLuint</ptype> <name>buf</name></param>
>+            <param group="BlendEquationModeEXT"><ptype>GLenum</ptype> <name>mode</name></param>
>+            <alias name="glBlendEquationi"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glBlendEquationOES</name></proto>
>+            <param group="BlendEquationModeEXT"><ptype>GLenum</ptype> <name>mode</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glBlendEquationSeparate</name></proto>
>+            <param group="BlendEquationModeEXT"><ptype>GLenum</ptype> <name>modeRGB</name></param>
>+            <param group="BlendEquationModeEXT"><ptype>GLenum</ptype> <name>modeAlpha</name></param>
>+            <glx type="render" opcode="4228"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glBlendEquationSeparateEXT</name></proto>
>+            <param group="BlendEquationModeEXT"><ptype>GLenum</ptype> <name>modeRGB</name></param>
>+            <param group="BlendEquationModeEXT"><ptype>GLenum</ptype> <name>modeAlpha</name></param>
>+            <alias name="glBlendEquationSeparate"/>
>+            <glx type="render" opcode="4228"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glBlendEquationSeparateIndexedAMD</name></proto>
>+            <param><ptype>GLuint</ptype> <name>buf</name></param>
>+            <param group="BlendEquationModeEXT"><ptype>GLenum</ptype> <name>modeRGB</name></param>
>+            <param group="BlendEquationModeEXT"><ptype>GLenum</ptype> <name>modeAlpha</name></param>
>+            <alias name="glBlendEquationSeparatei"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glBlendEquationSeparateOES</name></proto>
>+            <param group="BlendEquationModeEXT"><ptype>GLenum</ptype> <name>modeRGB</name></param>
>+            <param group="BlendEquationModeEXT"><ptype>GLenum</ptype> <name>modeAlpha</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glBlendEquationSeparatei</name></proto>
>+            <param><ptype>GLuint</ptype> <name>buf</name></param>
>+            <param group="BlendEquationModeEXT"><ptype>GLenum</ptype> <name>modeRGB</name></param>
>+            <param group="BlendEquationModeEXT"><ptype>GLenum</ptype> <name>modeAlpha</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glBlendEquationSeparateiARB</name></proto>
>+            <param><ptype>GLuint</ptype> <name>buf</name></param>
>+            <param group="BlendEquationModeEXT"><ptype>GLenum</ptype> <name>modeRGB</name></param>
>+            <param group="BlendEquationModeEXT"><ptype>GLenum</ptype> <name>modeAlpha</name></param>
>+            <alias name="glBlendEquationSeparatei"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glBlendEquationSeparateiEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>buf</name></param>
>+            <param group="BlendEquationModeEXT"><ptype>GLenum</ptype> <name>modeRGB</name></param>
>+            <param group="BlendEquationModeEXT"><ptype>GLenum</ptype> <name>modeAlpha</name></param>
>+            <alias name="glBlendEquationSeparatei"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glBlendEquationSeparateiOES</name></proto>
>+            <param><ptype>GLuint</ptype> <name>buf</name></param>
>+            <param group="BlendEquationModeEXT"><ptype>GLenum</ptype> <name>modeRGB</name></param>
>+            <param group="BlendEquationModeEXT"><ptype>GLenum</ptype> <name>modeAlpha</name></param>
>+            <alias name="glBlendEquationSeparatei"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glBlendEquationi</name></proto>
>+            <param><ptype>GLuint</ptype> <name>buf</name></param>
>+            <param group="BlendEquationModeEXT"><ptype>GLenum</ptype> <name>mode</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glBlendEquationiARB</name></proto>
>+            <param><ptype>GLuint</ptype> <name>buf</name></param>
>+            <param group="BlendEquationModeEXT"><ptype>GLenum</ptype> <name>mode</name></param>
>+            <alias name="glBlendEquationi"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glBlendEquationiEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>buf</name></param>
>+            <param group="BlendEquationModeEXT"><ptype>GLenum</ptype> <name>mode</name></param>
>+            <alias name="glBlendEquationi"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glBlendEquationiOES</name></proto>
>+            <param><ptype>GLuint</ptype> <name>buf</name></param>
>+            <param group="BlendEquationModeEXT"><ptype>GLenum</ptype> <name>mode</name></param>
>+            <alias name="glBlendEquationi"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glBlendFunc</name></proto>
>+            <param group="BlendingFactor"><ptype>GLenum</ptype> <name>sfactor</name></param>
>+            <param group="BlendingFactor"><ptype>GLenum</ptype> <name>dfactor</name></param>
>+            <glx type="render" opcode="160"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glBlendFuncIndexedAMD</name></proto>
>+            <param><ptype>GLuint</ptype> <name>buf</name></param>
>+            <param><ptype>GLenum</ptype> <name>src</name></param>
>+            <param><ptype>GLenum</ptype> <name>dst</name></param>
>+            <alias name="glBlendFunci"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glBlendFuncSeparate</name></proto>
>+            <param group="BlendingFactor"><ptype>GLenum</ptype> <name>sfactorRGB</name></param>
>+            <param group="BlendingFactor"><ptype>GLenum</ptype> <name>dfactorRGB</name></param>
>+            <param group="BlendingFactor"><ptype>GLenum</ptype> <name>sfactorAlpha</name></param>
>+            <param group="BlendingFactor"><ptype>GLenum</ptype> <name>dfactorAlpha</name></param>
>+            <glx type="render" opcode="4134"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glBlendFuncSeparateEXT</name></proto>
>+            <param group="BlendingFactor"><ptype>GLenum</ptype> <name>sfactorRGB</name></param>
>+            <param group="BlendingFactor"><ptype>GLenum</ptype> <name>dfactorRGB</name></param>
>+            <param group="BlendingFactor"><ptype>GLenum</ptype> <name>sfactorAlpha</name></param>
>+            <param group="BlendingFactor"><ptype>GLenum</ptype> <name>dfactorAlpha</name></param>
>+            <alias name="glBlendFuncSeparate"/>
>+            <glx type="render" opcode="4134"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glBlendFuncSeparateINGR</name></proto>
>+            <param group="BlendingFactor"><ptype>GLenum</ptype> <name>sfactorRGB</name></param>
>+            <param group="BlendingFactor"><ptype>GLenum</ptype> <name>dfactorRGB</name></param>
>+            <param group="BlendingFactor"><ptype>GLenum</ptype> <name>sfactorAlpha</name></param>
>+            <param group="BlendingFactor"><ptype>GLenum</ptype> <name>dfactorAlpha</name></param>
>+            <alias name="glBlendFuncSeparate"/>
>+            <glx type="render" opcode="4134"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glBlendFuncSeparateIndexedAMD</name></proto>
>+            <param><ptype>GLuint</ptype> <name>buf</name></param>
>+            <param group="BlendingFactor"><ptype>GLenum</ptype> <name>srcRGB</name></param>
>+            <param group="BlendingFactor"><ptype>GLenum</ptype> <name>dstRGB</name></param>
>+            <param group="BlendingFactor"><ptype>GLenum</ptype> <name>srcAlpha</name></param>
>+            <param group="BlendingFactor"><ptype>GLenum</ptype> <name>dstAlpha</name></param>
>+            <alias name="glBlendFuncSeparatei"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glBlendFuncSeparateOES</name></proto>
>+            <param group="BlendingFactor"><ptype>GLenum</ptype> <name>srcRGB</name></param>
>+            <param group="BlendingFactor"><ptype>GLenum</ptype> <name>dstRGB</name></param>
>+            <param group="BlendingFactor"><ptype>GLenum</ptype> <name>srcAlpha</name></param>
>+            <param group="BlendingFactor"><ptype>GLenum</ptype> <name>dstAlpha</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glBlendFuncSeparatei</name></proto>
>+            <param><ptype>GLuint</ptype> <name>buf</name></param>
>+            <param group="BlendingFactor"><ptype>GLenum</ptype> <name>srcRGB</name></param>
>+            <param group="BlendingFactor"><ptype>GLenum</ptype> <name>dstRGB</name></param>
>+            <param group="BlendingFactor"><ptype>GLenum</ptype> <name>srcAlpha</name></param>
>+            <param group="BlendingFactor"><ptype>GLenum</ptype> <name>dstAlpha</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glBlendFuncSeparateiARB</name></proto>
>+            <param><ptype>GLuint</ptype> <name>buf</name></param>
>+            <param group="BlendingFactor"><ptype>GLenum</ptype> <name>srcRGB</name></param>
>+            <param group="BlendingFactor"><ptype>GLenum</ptype> <name>dstRGB</name></param>
>+            <param group="BlendingFactor"><ptype>GLenum</ptype> <name>srcAlpha</name></param>
>+            <param group="BlendingFactor"><ptype>GLenum</ptype> <name>dstAlpha</name></param>
>+            <alias name="glBlendFuncSeparatei"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glBlendFuncSeparateiEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>buf</name></param>
>+            <param group="BlendingFactor"><ptype>GLenum</ptype> <name>srcRGB</name></param>
>+            <param group="BlendingFactor"><ptype>GLenum</ptype> <name>dstRGB</name></param>
>+            <param group="BlendingFactor"><ptype>GLenum</ptype> <name>srcAlpha</name></param>
>+            <param group="BlendingFactor"><ptype>GLenum</ptype> <name>dstAlpha</name></param>
>+            <alias name="glBlendFuncSeparatei"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glBlendFuncSeparateiOES</name></proto>
>+            <param><ptype>GLuint</ptype> <name>buf</name></param>
>+            <param group="BlendingFactor"><ptype>GLenum</ptype> <name>srcRGB</name></param>
>+            <param group="BlendingFactor"><ptype>GLenum</ptype> <name>dstRGB</name></param>
>+            <param group="BlendingFactor"><ptype>GLenum</ptype> <name>srcAlpha</name></param>
>+            <param group="BlendingFactor"><ptype>GLenum</ptype> <name>dstAlpha</name></param>
>+            <alias name="glBlendFuncSeparatei"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glBlendFunci</name></proto>
>+            <param><ptype>GLuint</ptype> <name>buf</name></param>
>+            <param group="BlendingFactor"><ptype>GLenum</ptype> <name>src</name></param>
>+            <param group="BlendingFactor"><ptype>GLenum</ptype> <name>dst</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glBlendFunciARB</name></proto>
>+            <param><ptype>GLuint</ptype> <name>buf</name></param>
>+            <param group="BlendingFactor"><ptype>GLenum</ptype> <name>src</name></param>
>+            <param group="BlendingFactor"><ptype>GLenum</ptype> <name>dst</name></param>
>+            <alias name="glBlendFunci"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glBlendFunciEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>buf</name></param>
>+            <param group="BlendingFactor"><ptype>GLenum</ptype> <name>src</name></param>
>+            <param group="BlendingFactor"><ptype>GLenum</ptype> <name>dst</name></param>
>+            <alias name="glBlendFunci"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glBlendFunciOES</name></proto>
>+            <param><ptype>GLuint</ptype> <name>buf</name></param>
>+            <param group="BlendingFactor"><ptype>GLenum</ptype> <name>src</name></param>
>+            <param group="BlendingFactor"><ptype>GLenum</ptype> <name>dst</name></param>
>+            <alias name="glBlendFunci"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glBlendParameteriNV</name></proto>
>+            <param><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param><ptype>GLint</ptype> <name>value</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glBlitFramebuffer</name></proto>
>+            <param><ptype>GLint</ptype> <name>srcX0</name></param>
>+            <param><ptype>GLint</ptype> <name>srcY0</name></param>
>+            <param><ptype>GLint</ptype> <name>srcX1</name></param>
>+            <param><ptype>GLint</ptype> <name>srcY1</name></param>
>+            <param><ptype>GLint</ptype> <name>dstX0</name></param>
>+            <param><ptype>GLint</ptype> <name>dstY0</name></param>
>+            <param><ptype>GLint</ptype> <name>dstX1</name></param>
>+            <param><ptype>GLint</ptype> <name>dstY1</name></param>
>+            <param group="ClearBufferMask"><ptype>GLbitfield</ptype> <name>mask</name></param>
>+            <param group="BlitFramebufferFilter"><ptype>GLenum</ptype> <name>filter</name></param>
>+            <glx type="render" opcode="4330"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glBlitFramebufferANGLE</name></proto>
>+            <param><ptype>GLint</ptype> <name>srcX0</name></param>
>+            <param><ptype>GLint</ptype> <name>srcY0</name></param>
>+            <param><ptype>GLint</ptype> <name>srcX1</name></param>
>+            <param><ptype>GLint</ptype> <name>srcY1</name></param>
>+            <param><ptype>GLint</ptype> <name>dstX0</name></param>
>+            <param><ptype>GLint</ptype> <name>dstY0</name></param>
>+            <param><ptype>GLint</ptype> <name>dstX1</name></param>
>+            <param><ptype>GLint</ptype> <name>dstY1</name></param>
>+            <param group="ClearBufferMask"><ptype>GLbitfield</ptype> <name>mask</name></param>
>+            <param group="BlitFramebufferFilter"><ptype>GLenum</ptype> <name>filter</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glBlitFramebufferEXT</name></proto>
>+            <param><ptype>GLint</ptype> <name>srcX0</name></param>
>+            <param><ptype>GLint</ptype> <name>srcY0</name></param>
>+            <param><ptype>GLint</ptype> <name>srcX1</name></param>
>+            <param><ptype>GLint</ptype> <name>srcY1</name></param>
>+            <param><ptype>GLint</ptype> <name>dstX0</name></param>
>+            <param><ptype>GLint</ptype> <name>dstY0</name></param>
>+            <param><ptype>GLint</ptype> <name>dstX1</name></param>
>+            <param><ptype>GLint</ptype> <name>dstY1</name></param>
>+            <param group="ClearBufferMask"><ptype>GLbitfield</ptype> <name>mask</name></param>
>+            <param group="BlitFramebufferFilter"><ptype>GLenum</ptype> <name>filter</name></param>
>+            <alias name="glBlitFramebuffer"/>
>+            <glx type="render" opcode="4330"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glBlitFramebufferNV</name></proto>
>+            <param><ptype>GLint</ptype> <name>srcX0</name></param>
>+            <param><ptype>GLint</ptype> <name>srcY0</name></param>
>+            <param><ptype>GLint</ptype> <name>srcX1</name></param>
>+            <param><ptype>GLint</ptype> <name>srcY1</name></param>
>+            <param><ptype>GLint</ptype> <name>dstX0</name></param>
>+            <param><ptype>GLint</ptype> <name>dstY0</name></param>
>+            <param><ptype>GLint</ptype> <name>dstX1</name></param>
>+            <param><ptype>GLint</ptype> <name>dstY1</name></param>
>+            <param group="ClearBufferMask"><ptype>GLbitfield</ptype> <name>mask</name></param>
>+            <param group="BlitFramebufferFilter"><ptype>GLenum</ptype> <name>filter</name></param>
>+            <alias name="glBlitFramebuffer"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glBlitNamedFramebuffer</name></proto>
>+            <param><ptype>GLuint</ptype> <name>readFramebuffer</name></param>
>+            <param><ptype>GLuint</ptype> <name>drawFramebuffer</name></param>
>+            <param><ptype>GLint</ptype> <name>srcX0</name></param>
>+            <param><ptype>GLint</ptype> <name>srcY0</name></param>
>+            <param><ptype>GLint</ptype> <name>srcX1</name></param>
>+            <param><ptype>GLint</ptype> <name>srcY1</name></param>
>+            <param><ptype>GLint</ptype> <name>dstX0</name></param>
>+            <param><ptype>GLint</ptype> <name>dstY0</name></param>
>+            <param><ptype>GLint</ptype> <name>dstX1</name></param>
>+            <param><ptype>GLint</ptype> <name>dstY1</name></param>
>+            <param group="ClearBufferMask"><ptype>GLbitfield</ptype> <name>mask</name></param>
>+            <param group="BlitFramebufferFilter"><ptype>GLenum</ptype> <name>filter</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glBufferAddressRangeNV</name></proto>
>+            <param><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param><ptype>GLuint64EXT</ptype> <name>address</name></param>
>+            <param group="BufferSize"><ptype>GLsizeiptr</ptype> <name>length</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glBufferData</name></proto>
>+            <param group="BufferTargetARB"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="BufferSize"><ptype>GLsizeiptr</ptype> <name>size</name></param>
>+            <param len="size">const void *<name>data</name></param>
>+            <param group="BufferUsageARB"><ptype>GLenum</ptype> <name>usage</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glBufferDataARB</name></proto>
>+            <param group="BufferTargetARB"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="BufferSizeARB"><ptype>GLsizeiptrARB</ptype> <name>size</name></param>
>+            <param len="size">const void *<name>data</name></param>
>+            <param group="BufferUsageARB"><ptype>GLenum</ptype> <name>usage</name></param>
>+            <alias name="glBufferData"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glBufferPageCommitmentARB</name></proto>
>+            <param><ptype>GLenum</ptype> <name>target</name></param>
>+            <param><ptype>GLintptr</ptype> <name>offset</name></param>
>+            <param><ptype>GLsizeiptr</ptype> <name>size</name></param>
>+            <param><ptype>GLboolean</ptype> <name>commit</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glBufferParameteriAPPLE</name></proto>
>+            <param><ptype>GLenum</ptype> <name>target</name></param>
>+            <param><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param><ptype>GLint</ptype> <name>param</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glBufferStorage</name></proto>
>+            <param group="BufferStorageTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param><ptype>GLsizeiptr</ptype> <name>size</name></param>
>+            <param len="size">const void *<name>data</name></param>
>+            <param group="MapBufferUsageMask"><ptype>GLbitfield</ptype> <name>flags</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glBufferStorageEXT</name></proto>
>+            <param group="BufferStorageTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param><ptype>GLsizeiptr</ptype> <name>size</name></param>
>+            <param len="size">const void *<name>data</name></param>
>+            <param group="MapBufferUsageMask"><ptype>GLbitfield</ptype> <name>flags</name></param>
>+            <alias name="glBufferStorage"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glBufferStorageExternalEXT</name></proto>
>+            <param><ptype>GLenum</ptype> <name>target</name></param>
>+            <param><ptype>GLintptr</ptype> <name>offset</name></param>
>+            <param><ptype>GLsizeiptr</ptype> <name>size</name></param>
>+            <param><ptype>GLeglClientBufferEXT</ptype> <name>clientBuffer</name></param>
>+            <param group="MapBufferUsageMask"><ptype>GLbitfield</ptype> <name>flags</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glBufferStorageMemEXT</name></proto>
>+            <param group="BufferTargetARB"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="BufferSize"><ptype>GLsizeiptr</ptype> <name>size</name></param>
>+            <param><ptype>GLuint</ptype> <name>memory</name></param>
>+            <param><ptype>GLuint64</ptype> <name>offset</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glBufferSubData</name></proto>
>+            <param group="BufferTargetARB"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="BufferOffset"><ptype>GLintptr</ptype> <name>offset</name></param>
>+            <param group="BufferSize"><ptype>GLsizeiptr</ptype> <name>size</name></param>
>+            <param len="size">const void *<name>data</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glBufferSubDataARB</name></proto>
>+            <param group="BufferTargetARB"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="BufferOffsetARB"><ptype>GLintptrARB</ptype> <name>offset</name></param>
>+            <param group="BufferSizeARB"><ptype>GLsizeiptrARB</ptype> <name>size</name></param>
>+            <param len="size">const void *<name>data</name></param>
>+            <alias name="glBufferSubData"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glCallCommandListNV</name></proto>
>+            <param><ptype>GLuint</ptype> <name>list</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glCallList</name></proto>
>+            <param group="List"><ptype>GLuint</ptype> <name>list</name></param>
>+            <glx type="render" opcode="1"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glCallLists</name></proto>
>+            <param><ptype>GLsizei</ptype> <name>n</name></param>
>+            <param group="ListNameType"><ptype>GLenum</ptype> <name>type</name></param>
>+            <param len="COMPSIZE(n,type)">const void *<name>lists</name></param>
>+            <glx type="render" opcode="2"/>
>+        </command>
>+        <command>
>+            <proto group="FramebufferStatus"><ptype>GLenum</ptype> <name>glCheckFramebufferStatus</name></proto>
>+            <param group="FramebufferTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <glx type="vendor" opcode="1427"/>
>+        </command>
>+        <command>
>+            <proto group="FramebufferStatus"><ptype>GLenum</ptype> <name>glCheckFramebufferStatusEXT</name></proto>
>+            <param group="FramebufferTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <alias name="glCheckFramebufferStatus"/>
>+            <glx type="vendor" opcode="1427"/>
>+        </command>
>+        <command>
>+            <proto group="FramebufferStatus"><ptype>GLenum</ptype> <name>glCheckFramebufferStatusOES</name></proto>
>+            <param group="FramebufferTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+        </command>
>+        <command>
>+            <proto group="FramebufferStatus"><ptype>GLenum</ptype> <name>glCheckNamedFramebufferStatus</name></proto>
>+            <param><ptype>GLuint</ptype> <name>framebuffer</name></param>
>+            <param group="FramebufferTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+        </command>
>+        <command>
>+            <proto group="FramebufferStatus"><ptype>GLenum</ptype> <name>glCheckNamedFramebufferStatusEXT</name></proto>
>+            <param group="Framebuffer"><ptype>GLuint</ptype> <name>framebuffer</name></param>
>+            <param group="FramebufferTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glClampColor</name></proto>
>+            <param group="ClampColorTargetARB"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="ClampColorModeARB"><ptype>GLenum</ptype> <name>clamp</name></param>
>+            <glx type="render" opcode="234"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glClampColorARB</name></proto>
>+            <param group="ClampColorTargetARB"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="ClampColorModeARB"><ptype>GLenum</ptype> <name>clamp</name></param>
>+            <alias name="glClampColor"/>
>+            <glx type="render" opcode="234"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glClear</name></proto>
>+            <param group="ClearBufferMask"><ptype>GLbitfield</ptype> <name>mask</name></param>
>+            <glx type="render" opcode="127"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glClearAccum</name></proto>
>+            <param><ptype>GLfloat</ptype> <name>red</name></param>
>+            <param><ptype>GLfloat</ptype> <name>green</name></param>
>+            <param><ptype>GLfloat</ptype> <name>blue</name></param>
>+            <param><ptype>GLfloat</ptype> <name>alpha</name></param>
>+            <glx type="render" opcode="128"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glClearAccumxOES</name></proto>
>+            <param group="ClampedFixed"><ptype>GLfixed</ptype> <name>red</name></param>
>+            <param group="ClampedFixed"><ptype>GLfixed</ptype> <name>green</name></param>
>+            <param group="ClampedFixed"><ptype>GLfixed</ptype> <name>blue</name></param>
>+            <param group="ClampedFixed"><ptype>GLfixed</ptype> <name>alpha</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glClearBufferData</name></proto>
>+            <param group="BufferStorageTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="InternalFormat"><ptype>GLenum</ptype> <name>internalformat</name></param>
>+            <param group="PixelFormat"><ptype>GLenum</ptype> <name>format</name></param>
>+            <param group="PixelType"><ptype>GLenum</ptype> <name>type</name></param>
>+            <param len="COMPSIZE(format,type)">const void *<name>data</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glClearBufferSubData</name></proto>
>+            <param><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="InternalFormat"><ptype>GLenum</ptype> <name>internalformat</name></param>
>+            <param group="BufferOffset"><ptype>GLintptr</ptype> <name>offset</name></param>
>+            <param group="BufferSize"><ptype>GLsizeiptr</ptype> <name>size</name></param>
>+            <param group="PixelFormat"><ptype>GLenum</ptype> <name>format</name></param>
>+            <param group="PixelType"><ptype>GLenum</ptype> <name>type</name></param>
>+            <param len="COMPSIZE(format,type)">const void *<name>data</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glClearBufferfi</name></proto>
>+            <param group="Buffer"><ptype>GLenum</ptype> <name>buffer</name></param>
>+            <param group="DrawBufferName"><ptype>GLint</ptype> <name>drawbuffer</name></param>
>+            <param><ptype>GLfloat</ptype> <name>depth</name></param>
>+            <param><ptype>GLint</ptype> <name>stencil</name></param>
>+            <glx type="render" opcode="360"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glClearBufferfv</name></proto>
>+            <param group="Buffer"><ptype>GLenum</ptype> <name>buffer</name></param>
>+            <param group="DrawBufferName"><ptype>GLint</ptype> <name>drawbuffer</name></param>
>+            <param len="COMPSIZE(buffer)">const <ptype>GLfloat</ptype> *<name>value</name></param>
>+            <glx type="render" opcode="361"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glClearBufferiv</name></proto>
>+            <param group="Buffer"><ptype>GLenum</ptype> <name>buffer</name></param>
>+            <param group="DrawBufferName"><ptype>GLint</ptype> <name>drawbuffer</name></param>
>+            <param len="COMPSIZE(buffer)">const <ptype>GLint</ptype> *<name>value</name></param>
>+            <glx type="render" opcode="362"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glClearBufferuiv</name></proto>
>+            <param group="Buffer"><ptype>GLenum</ptype> <name>buffer</name></param>
>+            <param group="DrawBufferName"><ptype>GLint</ptype> <name>drawbuffer</name></param>
>+            <param len="COMPSIZE(buffer)">const <ptype>GLuint</ptype> *<name>value</name></param>
>+            <glx type="render" opcode="363"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glClearColor</name></proto>
>+            <param group="ColorF"><ptype>GLfloat</ptype> <name>red</name></param>
>+            <param group="ColorF"><ptype>GLfloat</ptype> <name>green</name></param>
>+            <param group="ColorF"><ptype>GLfloat</ptype> <name>blue</name></param>
>+            <param group="ColorF"><ptype>GLfloat</ptype> <name>alpha</name></param>
>+            <glx type="render" opcode="130"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glClearColorIiEXT</name></proto>
>+            <param><ptype>GLint</ptype> <name>red</name></param>
>+            <param><ptype>GLint</ptype> <name>green</name></param>
>+            <param><ptype>GLint</ptype> <name>blue</name></param>
>+            <param><ptype>GLint</ptype> <name>alpha</name></param>
>+            <glx type="render" opcode="4292"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glClearColorIuiEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>red</name></param>
>+            <param><ptype>GLuint</ptype> <name>green</name></param>
>+            <param><ptype>GLuint</ptype> <name>blue</name></param>
>+            <param><ptype>GLuint</ptype> <name>alpha</name></param>
>+            <glx type="render" opcode="4293"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glClearColorx</name></proto>
>+            <param><ptype>GLfixed</ptype> <name>red</name></param>
>+            <param><ptype>GLfixed</ptype> <name>green</name></param>
>+            <param><ptype>GLfixed</ptype> <name>blue</name></param>
>+            <param><ptype>GLfixed</ptype> <name>alpha</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glClearColorxOES</name></proto>
>+            <param group="ClampedFixed"><ptype>GLfixed</ptype> <name>red</name></param>
>+            <param group="ClampedFixed"><ptype>GLfixed</ptype> <name>green</name></param>
>+            <param group="ClampedFixed"><ptype>GLfixed</ptype> <name>blue</name></param>
>+            <param group="ClampedFixed"><ptype>GLfixed</ptype> <name>alpha</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glClearDepth</name></proto>
>+            <param><ptype>GLdouble</ptype> <name>depth</name></param>
>+            <glx type="render" opcode="132"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glClearDepthdNV</name></proto>
>+            <param><ptype>GLdouble</ptype> <name>depth</name></param>
>+            <glx type="render" opcode="4284"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glClearDepthf</name></proto>
>+            <param><ptype>GLfloat</ptype> <name>d</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glClearDepthfOES</name></proto>
>+            <param group="ClampedFloat32"><ptype>GLclampf</ptype> <name>depth</name></param>
>+            <glx type="render" opcode="4308"/>
>+            <alias name="glClearDepthf"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glClearDepthx</name></proto>
>+            <param><ptype>GLfixed</ptype> <name>depth</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glClearDepthxOES</name></proto>
>+            <param group="ClampedFixed"><ptype>GLfixed</ptype> <name>depth</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glClearIndex</name></proto>
>+            <param group="MaskedColorIndexValueF"><ptype>GLfloat</ptype> <name>c</name></param>
>+            <glx type="render" opcode="129"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glClearNamedBufferData</name></proto>
>+            <param><ptype>GLuint</ptype> <name>buffer</name></param>
>+            <param group="InternalFormat"><ptype>GLenum</ptype> <name>internalformat</name></param>
>+            <param group="PixelFormat"><ptype>GLenum</ptype> <name>format</name></param>
>+            <param group="PixelType"><ptype>GLenum</ptype> <name>type</name></param>
>+            <param>const void *<name>data</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glClearNamedBufferDataEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>buffer</name></param>
>+            <param group="InternalFormat"><ptype>GLenum</ptype> <name>internalformat</name></param>
>+            <param group="PixelFormat"><ptype>GLenum</ptype> <name>format</name></param>
>+            <param group="PixelType"><ptype>GLenum</ptype> <name>type</name></param>
>+            <param len="COMPSIZE(format,type)">const void *<name>data</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glClearNamedBufferSubData</name></proto>
>+            <param><ptype>GLuint</ptype> <name>buffer</name></param>
>+            <param group="InternalFormat"><ptype>GLenum</ptype> <name>internalformat</name></param>
>+            <param><ptype>GLintptr</ptype> <name>offset</name></param>
>+            <param group="BufferSize"><ptype>GLsizeiptr</ptype> <name>size</name></param>
>+            <param group="PixelFormat"><ptype>GLenum</ptype> <name>format</name></param>
>+            <param group="PixelType"><ptype>GLenum</ptype> <name>type</name></param>
>+            <param>const void *<name>data</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glClearNamedBufferSubDataEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>buffer</name></param>
>+            <param><ptype>GLenum</ptype> <name>internalformat</name></param>
>+            <param group="BufferSize"><ptype>GLsizeiptr</ptype> <name>offset</name></param>
>+            <param group="BufferSize"><ptype>GLsizeiptr</ptype> <name>size</name></param>
>+            <param group="PixelFormat"><ptype>GLenum</ptype> <name>format</name></param>
>+            <param group="PixelType"><ptype>GLenum</ptype> <name>type</name></param>
>+            <param len="COMPSIZE(format,type)">const void *<name>data</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glClearNamedFramebufferfi</name></proto>
>+            <param><ptype>GLuint</ptype> <name>framebuffer</name></param>
>+            <param group="Buffer"><ptype>GLenum</ptype> <name>buffer</name></param>
>+            <param><ptype>GLint</ptype> <name>drawbuffer</name></param>
>+            <param><ptype>GLfloat</ptype> <name>depth</name></param>
>+            <param><ptype>GLint</ptype> <name>stencil</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glClearNamedFramebufferfv</name></proto>
>+            <param><ptype>GLuint</ptype> <name>framebuffer</name></param>
>+            <param group="Buffer"><ptype>GLenum</ptype> <name>buffer</name></param>
>+            <param><ptype>GLint</ptype> <name>drawbuffer</name></param>
>+            <param>const <ptype>GLfloat</ptype> *<name>value</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glClearNamedFramebufferiv</name></proto>
>+            <param><ptype>GLuint</ptype> <name>framebuffer</name></param>
>+            <param group="Buffer"><ptype>GLenum</ptype> <name>buffer</name></param>
>+            <param><ptype>GLint</ptype> <name>drawbuffer</name></param>
>+            <param>const <ptype>GLint</ptype> *<name>value</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glClearNamedFramebufferuiv</name></proto>
>+            <param><ptype>GLuint</ptype> <name>framebuffer</name></param>
>+            <param group="Buffer"><ptype>GLenum</ptype> <name>buffer</name></param>
>+            <param><ptype>GLint</ptype> <name>drawbuffer</name></param>
>+            <param>const <ptype>GLuint</ptype> *<name>value</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glClearPixelLocalStorageuiEXT</name></proto>
>+            <param><ptype>GLsizei</ptype> <name>offset</name></param>
>+            <param><ptype>GLsizei</ptype> <name>n</name></param>
>+            <param len="n">const <ptype>GLuint</ptype> *<name>values</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glClearStencil</name></proto>
>+            <param group="StencilValue"><ptype>GLint</ptype> <name>s</name></param>
>+            <glx type="render" opcode="131"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glClearTexImage</name></proto>
>+            <param><ptype>GLuint</ptype> <name>texture</name></param>
>+            <param><ptype>GLint</ptype> <name>level</name></param>
>+            <param group="PixelFormat"><ptype>GLenum</ptype> <name>format</name></param>
>+            <param group="PixelType"><ptype>GLenum</ptype> <name>type</name></param>
>+            <param len="COMPSIZE(format,type)">const void *<name>data</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glClearTexImageEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>texture</name></param>
>+            <param><ptype>GLint</ptype> <name>level</name></param>
>+            <param group="PixelFormat"><ptype>GLenum</ptype> <name>format</name></param>
>+            <param group="PixelType"><ptype>GLenum</ptype> <name>type</name></param>
>+            <param len="COMPSIZE(format,type)">const void *<name>data</name></param>
>+            <alias name="glClearTexImage"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glClearTexSubImage</name></proto>
>+            <param><ptype>GLuint</ptype> <name>texture</name></param>
>+            <param><ptype>GLint</ptype> <name>level</name></param>
>+            <param><ptype>GLint</ptype> <name>xoffset</name></param>
>+            <param><ptype>GLint</ptype> <name>yoffset</name></param>
>+            <param><ptype>GLint</ptype> <name>zoffset</name></param>
>+            <param><ptype>GLsizei</ptype> <name>width</name></param>
>+            <param><ptype>GLsizei</ptype> <name>height</name></param>
>+            <param><ptype>GLsizei</ptype> <name>depth</name></param>
>+            <param group="PixelFormat"><ptype>GLenum</ptype> <name>format</name></param>
>+            <param group="PixelType"><ptype>GLenum</ptype> <name>type</name></param>
>+            <param len="COMPSIZE(format,type)">const void *<name>data</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glClearTexSubImageEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>texture</name></param>
>+            <param><ptype>GLint</ptype> <name>level</name></param>
>+            <param><ptype>GLint</ptype> <name>xoffset</name></param>
>+            <param><ptype>GLint</ptype> <name>yoffset</name></param>
>+            <param><ptype>GLint</ptype> <name>zoffset</name></param>
>+            <param><ptype>GLsizei</ptype> <name>width</name></param>
>+            <param><ptype>GLsizei</ptype> <name>height</name></param>
>+            <param><ptype>GLsizei</ptype> <name>depth</name></param>
>+            <param group="PixelFormat"><ptype>GLenum</ptype> <name>format</name></param>
>+            <param group="PixelType"><ptype>GLenum</ptype> <name>type</name></param>
>+            <param len="COMPSIZE(format,type)">const void *<name>data</name></param>
>+            <alias name="glClearTexSubImage"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glClientActiveTexture</name></proto>
>+            <param group="TextureUnit"><ptype>GLenum</ptype> <name>texture</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glClientActiveTextureARB</name></proto>
>+            <param group="TextureUnit"><ptype>GLenum</ptype> <name>texture</name></param>
>+            <alias name="glClientActiveTexture"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glClientActiveVertexStreamATI</name></proto>
>+            <param group="VertexStreamATI"><ptype>GLenum</ptype> <name>stream</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glClientAttribDefaultEXT</name></proto>
>+            <param group="ClientAttribMask"><ptype>GLbitfield</ptype> <name>mask</name></param>
>+        </command>
>+        <command>
>+            <proto group="SyncStatus"><ptype>GLenum</ptype> <name>glClientWaitSync</name></proto>
>+            <param group="sync"><ptype>GLsync</ptype> <name>sync</name></param>
>+            <param group="SyncObjectMask"><ptype>GLbitfield</ptype> <name>flags</name></param>
>+            <param><ptype>GLuint64</ptype> <name>timeout</name></param>
>+        </command>
>+        <command>
>+            <proto group="SyncStatus"><ptype>GLenum</ptype> <name>glClientWaitSyncAPPLE</name></proto>
>+            <param><ptype>GLsync</ptype> <name>sync</name></param>
>+            <param group="SyncObjectMask"><ptype>GLbitfield</ptype> <name>flags</name></param>
>+            <param><ptype>GLuint64</ptype> <name>timeout</name></param>
>+            <alias name="glClientWaitSync"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glClipControl</name></proto>
>+            <param group="ClipControlOrigin"><ptype>GLenum</ptype> <name>origin</name></param>
>+            <param group="ClipControlDepth"><ptype>GLenum</ptype> <name>depth</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glClipControlEXT</name></proto>
>+            <param><ptype>GLenum</ptype> <name>origin</name></param>
>+            <param><ptype>GLenum</ptype> <name>depth</name></param>
>+            <alias name="glClipControl"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glClipPlane</name></proto>
>+            <param group="ClipPlaneName"><ptype>GLenum</ptype> <name>plane</name></param>
>+            <param len="4">const <ptype>GLdouble</ptype> *<name>equation</name></param>
>+            <glx type="render" opcode="77"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glClipPlanef</name></proto>
>+            <param group="ClipPlaneName"><ptype>GLenum</ptype> <name>p</name></param>
>+            <param len="4">const <ptype>GLfloat</ptype> *<name>eqn</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glClipPlanefIMG</name></proto>
>+            <param group="ClipPlaneName"><ptype>GLenum</ptype> <name>p</name></param>
>+            <param len="4">const <ptype>GLfloat</ptype> *<name>eqn</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glClipPlanefOES</name></proto>
>+            <param group="ClipPlaneName"><ptype>GLenum</ptype> <name>plane</name></param>
>+            <param len="4">const <ptype>GLfloat</ptype> *<name>equation</name></param>
>+            <glx type="render" opcode="4312"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glClipPlanex</name></proto>
>+            <param group="ClipPlaneName"><ptype>GLenum</ptype> <name>plane</name></param>
>+            <param len="4">const <ptype>GLfixed</ptype> *<name>equation</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glClipPlanexIMG</name></proto>
>+            <param group="ClipPlaneName"><ptype>GLenum</ptype> <name>p</name></param>
>+            <param len="4">const <ptype>GLfixed</ptype> *<name>eqn</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glClipPlanexOES</name></proto>
>+            <param group="ClipPlaneName"><ptype>GLenum</ptype> <name>plane</name></param>
>+            <param len="4">const <ptype>GLfixed</ptype> *<name>equation</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glColor3b</name></proto>
>+            <param group="ColorB"><ptype>GLbyte</ptype> <name>red</name></param>
>+            <param group="ColorB"><ptype>GLbyte</ptype> <name>green</name></param>
>+            <param group="ColorB"><ptype>GLbyte</ptype> <name>blue</name></param>
>+            <vecequiv name="glColor3bv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glColor3bv</name></proto>
>+            <param group="ColorB" len="3">const <ptype>GLbyte</ptype> *<name>v</name></param>
>+            <glx type="render" opcode="6"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glColor3d</name></proto>
>+            <param group="ColorD"><ptype>GLdouble</ptype> <name>red</name></param>
>+            <param group="ColorD"><ptype>GLdouble</ptype> <name>green</name></param>
>+            <param group="ColorD"><ptype>GLdouble</ptype> <name>blue</name></param>
>+            <vecequiv name="glColor3dv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glColor3dv</name></proto>
>+            <param group="ColorD" len="3">const <ptype>GLdouble</ptype> *<name>v</name></param>
>+            <glx type="render" opcode="7"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glColor3f</name></proto>
>+            <param group="ColorF"><ptype>GLfloat</ptype> <name>red</name></param>
>+            <param group="ColorF"><ptype>GLfloat</ptype> <name>green</name></param>
>+            <param group="ColorF"><ptype>GLfloat</ptype> <name>blue</name></param>
>+            <vecequiv name="glColor3fv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glColor3fVertex3fSUN</name></proto>
>+            <param><ptype>GLfloat</ptype> <name>r</name></param>
>+            <param><ptype>GLfloat</ptype> <name>g</name></param>
>+            <param><ptype>GLfloat</ptype> <name>b</name></param>
>+            <param><ptype>GLfloat</ptype> <name>x</name></param>
>+            <param><ptype>GLfloat</ptype> <name>y</name></param>
>+            <param><ptype>GLfloat</ptype> <name>z</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glColor3fVertex3fvSUN</name></proto>
>+            <param len="3">const <ptype>GLfloat</ptype> *<name>c</name></param>
>+            <param len="3">const <ptype>GLfloat</ptype> *<name>v</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glColor3fv</name></proto>
>+            <param group="ColorF" len="3">const <ptype>GLfloat</ptype> *<name>v</name></param>
>+            <glx type="render" opcode="8"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glColor3hNV</name></proto>
>+            <param group="Half16NV"><ptype>GLhalfNV</ptype> <name>red</name></param>
>+            <param group="Half16NV"><ptype>GLhalfNV</ptype> <name>green</name></param>
>+            <param group="Half16NV"><ptype>GLhalfNV</ptype> <name>blue</name></param>
>+            <vecequiv name="glColor3hvNV"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glColor3hvNV</name></proto>
>+            <param group="Half16NV" len="3">const <ptype>GLhalfNV</ptype> *<name>v</name></param>
>+            <glx type="render" opcode="4244"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glColor3i</name></proto>
>+            <param group="ColorI"><ptype>GLint</ptype> <name>red</name></param>
>+            <param group="ColorI"><ptype>GLint</ptype> <name>green</name></param>
>+            <param group="ColorI"><ptype>GLint</ptype> <name>blue</name></param>
>+            <vecequiv name="glColor3iv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glColor3iv</name></proto>
>+            <param group="ColorI" len="3">const <ptype>GLint</ptype> *<name>v</name></param>
>+            <glx type="render" opcode="9"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glColor3s</name></proto>
>+            <param group="ColorS"><ptype>GLshort</ptype> <name>red</name></param>
>+            <param group="ColorS"><ptype>GLshort</ptype> <name>green</name></param>
>+            <param group="ColorS"><ptype>GLshort</ptype> <name>blue</name></param>
>+            <vecequiv name="glColor3sv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glColor3sv</name></proto>
>+            <param group="ColorS" len="3">const <ptype>GLshort</ptype> *<name>v</name></param>
>+            <glx type="render" opcode="10"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glColor3ub</name></proto>
>+            <param group="ColorUB"><ptype>GLubyte</ptype> <name>red</name></param>
>+            <param group="ColorUB"><ptype>GLubyte</ptype> <name>green</name></param>
>+            <param group="ColorUB"><ptype>GLubyte</ptype> <name>blue</name></param>
>+            <vecequiv name="glColor3ubv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glColor3ubv</name></proto>
>+            <param group="ColorUB" len="3">const <ptype>GLubyte</ptype> *<name>v</name></param>
>+            <glx type="render" opcode="11"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glColor3ui</name></proto>
>+            <param group="ColorUI"><ptype>GLuint</ptype> <name>red</name></param>
>+            <param group="ColorUI"><ptype>GLuint</ptype> <name>green</name></param>
>+            <param group="ColorUI"><ptype>GLuint</ptype> <name>blue</name></param>
>+            <vecequiv name="glColor3uiv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glColor3uiv</name></proto>
>+            <param group="ColorUI" len="3">const <ptype>GLuint</ptype> *<name>v</name></param>
>+            <glx type="render" opcode="12"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glColor3us</name></proto>
>+            <param group="ColorUS"><ptype>GLushort</ptype> <name>red</name></param>
>+            <param group="ColorUS"><ptype>GLushort</ptype> <name>green</name></param>
>+            <param group="ColorUS"><ptype>GLushort</ptype> <name>blue</name></param>
>+            <vecequiv name="glColor3usv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glColor3usv</name></proto>
>+            <param group="ColorUS" len="3">const <ptype>GLushort</ptype> *<name>v</name></param>
>+            <glx type="render" opcode="13"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glColor3xOES</name></proto>
>+            <param><ptype>GLfixed</ptype> <name>red</name></param>
>+            <param><ptype>GLfixed</ptype> <name>green</name></param>
>+            <param><ptype>GLfixed</ptype> <name>blue</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glColor3xvOES</name></proto>
>+            <param len="3">const <ptype>GLfixed</ptype> *<name>components</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glColor4b</name></proto>
>+            <param group="ColorB"><ptype>GLbyte</ptype> <name>red</name></param>
>+            <param group="ColorB"><ptype>GLbyte</ptype> <name>green</name></param>
>+            <param group="ColorB"><ptype>GLbyte</ptype> <name>blue</name></param>
>+            <param group="ColorB"><ptype>GLbyte</ptype> <name>alpha</name></param>
>+            <vecequiv name="glColor4bv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glColor4bv</name></proto>
>+            <param group="ColorB" len="4">const <ptype>GLbyte</ptype> *<name>v</name></param>
>+            <glx type="render" opcode="14"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glColor4d</name></proto>
>+            <param group="ColorD"><ptype>GLdouble</ptype> <name>red</name></param>
>+            <param group="ColorD"><ptype>GLdouble</ptype> <name>green</name></param>
>+            <param group="ColorD"><ptype>GLdouble</ptype> <name>blue</name></param>
>+            <param group="ColorD"><ptype>GLdouble</ptype> <name>alpha</name></param>
>+            <vecequiv name="glColor4dv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glColor4dv</name></proto>
>+            <param group="ColorD" len="4">const <ptype>GLdouble</ptype> *<name>v</name></param>
>+            <glx type="render" opcode="15"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glColor4f</name></proto>
>+            <param group="ColorF"><ptype>GLfloat</ptype> <name>red</name></param>
>+            <param group="ColorF"><ptype>GLfloat</ptype> <name>green</name></param>
>+            <param group="ColorF"><ptype>GLfloat</ptype> <name>blue</name></param>
>+            <param group="ColorF"><ptype>GLfloat</ptype> <name>alpha</name></param>
>+            <vecequiv name="glColor4fv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glColor4fNormal3fVertex3fSUN</name></proto>
>+            <param><ptype>GLfloat</ptype> <name>r</name></param>
>+            <param><ptype>GLfloat</ptype> <name>g</name></param>
>+            <param><ptype>GLfloat</ptype> <name>b</name></param>
>+            <param><ptype>GLfloat</ptype> <name>a</name></param>
>+            <param><ptype>GLfloat</ptype> <name>nx</name></param>
>+            <param><ptype>GLfloat</ptype> <name>ny</name></param>
>+            <param><ptype>GLfloat</ptype> <name>nz</name></param>
>+            <param><ptype>GLfloat</ptype> <name>x</name></param>
>+            <param><ptype>GLfloat</ptype> <name>y</name></param>
>+            <param><ptype>GLfloat</ptype> <name>z</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glColor4fNormal3fVertex3fvSUN</name></proto>
>+            <param len="4">const <ptype>GLfloat</ptype> *<name>c</name></param>
>+            <param len="3">const <ptype>GLfloat</ptype> *<name>n</name></param>
>+            <param len="3">const <ptype>GLfloat</ptype> *<name>v</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glColor4fv</name></proto>
>+            <param group="ColorF" len="4">const <ptype>GLfloat</ptype> *<name>v</name></param>
>+            <glx type="render" opcode="16"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glColor4hNV</name></proto>
>+            <param group="Half16NV"><ptype>GLhalfNV</ptype> <name>red</name></param>
>+            <param group="Half16NV"><ptype>GLhalfNV</ptype> <name>green</name></param>
>+            <param group="Half16NV"><ptype>GLhalfNV</ptype> <name>blue</name></param>
>+            <param group="Half16NV"><ptype>GLhalfNV</ptype> <name>alpha</name></param>
>+            <vecequiv name="glColor4hvNV"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glColor4hvNV</name></proto>
>+            <param group="Half16NV" len="4">const <ptype>GLhalfNV</ptype> *<name>v</name></param>
>+            <glx type="render" opcode="4245"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glColor4i</name></proto>
>+            <param group="ColorI"><ptype>GLint</ptype> <name>red</name></param>
>+            <param group="ColorI"><ptype>GLint</ptype> <name>green</name></param>
>+            <param group="ColorI"><ptype>GLint</ptype> <name>blue</name></param>
>+            <param group="ColorI"><ptype>GLint</ptype> <name>alpha</name></param>
>+            <vecequiv name="glColor4iv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glColor4iv</name></proto>
>+            <param group="ColorI" len="4">const <ptype>GLint</ptype> *<name>v</name></param>
>+            <glx type="render" opcode="17"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glColor4s</name></proto>
>+            <param group="ColorS"><ptype>GLshort</ptype> <name>red</name></param>
>+            <param group="ColorS"><ptype>GLshort</ptype> <name>green</name></param>
>+            <param group="ColorS"><ptype>GLshort</ptype> <name>blue</name></param>
>+            <param group="ColorS"><ptype>GLshort</ptype> <name>alpha</name></param>
>+            <vecequiv name="glColor4sv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glColor4sv</name></proto>
>+            <param group="ColorS" len="4">const <ptype>GLshort</ptype> *<name>v</name></param>
>+            <glx type="render" opcode="18"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glColor4ub</name></proto>
>+            <param group="ColorUB"><ptype>GLubyte</ptype> <name>red</name></param>
>+            <param group="ColorUB"><ptype>GLubyte</ptype> <name>green</name></param>
>+            <param group="ColorUB"><ptype>GLubyte</ptype> <name>blue</name></param>
>+            <param group="ColorUB"><ptype>GLubyte</ptype> <name>alpha</name></param>
>+            <vecequiv name="glColor4ubv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glColor4ubVertex2fSUN</name></proto>
>+            <param><ptype>GLubyte</ptype> <name>r</name></param>
>+            <param><ptype>GLubyte</ptype> <name>g</name></param>
>+            <param><ptype>GLubyte</ptype> <name>b</name></param>
>+            <param><ptype>GLubyte</ptype> <name>a</name></param>
>+            <param><ptype>GLfloat</ptype> <name>x</name></param>
>+            <param><ptype>GLfloat</ptype> <name>y</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glColor4ubVertex2fvSUN</name></proto>
>+            <param len="4">const <ptype>GLubyte</ptype> *<name>c</name></param>
>+            <param len="2">const <ptype>GLfloat</ptype> *<name>v</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glColor4ubVertex3fSUN</name></proto>
>+            <param><ptype>GLubyte</ptype> <name>r</name></param>
>+            <param><ptype>GLubyte</ptype> <name>g</name></param>
>+            <param><ptype>GLubyte</ptype> <name>b</name></param>
>+            <param><ptype>GLubyte</ptype> <name>a</name></param>
>+            <param><ptype>GLfloat</ptype> <name>x</name></param>
>+            <param><ptype>GLfloat</ptype> <name>y</name></param>
>+            <param><ptype>GLfloat</ptype> <name>z</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glColor4ubVertex3fvSUN</name></proto>
>+            <param len="4">const <ptype>GLubyte</ptype> *<name>c</name></param>
>+            <param len="3">const <ptype>GLfloat</ptype> *<name>v</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glColor4ubv</name></proto>
>+            <param group="ColorUB" len="4">const <ptype>GLubyte</ptype> *<name>v</name></param>
>+            <glx type="render" opcode="19"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glColor4ui</name></proto>
>+            <param group="ColorUI"><ptype>GLuint</ptype> <name>red</name></param>
>+            <param group="ColorUI"><ptype>GLuint</ptype> <name>green</name></param>
>+            <param group="ColorUI"><ptype>GLuint</ptype> <name>blue</name></param>
>+            <param group="ColorUI"><ptype>GLuint</ptype> <name>alpha</name></param>
>+            <vecequiv name="glColor4uiv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glColor4uiv</name></proto>
>+            <param group="ColorUI" len="4">const <ptype>GLuint</ptype> *<name>v</name></param>
>+            <glx type="render" opcode="20"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glColor4us</name></proto>
>+            <param group="ColorUS"><ptype>GLushort</ptype> <name>red</name></param>
>+            <param group="ColorUS"><ptype>GLushort</ptype> <name>green</name></param>
>+            <param group="ColorUS"><ptype>GLushort</ptype> <name>blue</name></param>
>+            <param group="ColorUS"><ptype>GLushort</ptype> <name>alpha</name></param>
>+            <vecequiv name="glColor4usv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glColor4usv</name></proto>
>+            <param group="ColorUS" len="4">const <ptype>GLushort</ptype> *<name>v</name></param>
>+            <glx type="render" opcode="21"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glColor4x</name></proto>
>+            <param><ptype>GLfixed</ptype> <name>red</name></param>
>+            <param><ptype>GLfixed</ptype> <name>green</name></param>
>+            <param><ptype>GLfixed</ptype> <name>blue</name></param>
>+            <param><ptype>GLfixed</ptype> <name>alpha</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glColor4xOES</name></proto>
>+            <param><ptype>GLfixed</ptype> <name>red</name></param>
>+            <param><ptype>GLfixed</ptype> <name>green</name></param>
>+            <param><ptype>GLfixed</ptype> <name>blue</name></param>
>+            <param><ptype>GLfixed</ptype> <name>alpha</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glColor4xvOES</name></proto>
>+            <param len="4">const <ptype>GLfixed</ptype> *<name>components</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glColorFormatNV</name></proto>
>+            <param><ptype>GLint</ptype> <name>size</name></param>
>+            <param><ptype>GLenum</ptype> <name>type</name></param>
>+            <param><ptype>GLsizei</ptype> <name>stride</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glColorFragmentOp1ATI</name></proto>
>+            <param group="FragmentOpATI"><ptype>GLenum</ptype> <name>op</name></param>
>+            <param><ptype>GLuint</ptype> <name>dst</name></param>
>+            <param><ptype>GLuint</ptype> <name>dstMask</name></param>
>+            <param><ptype>GLuint</ptype> <name>dstMod</name></param>
>+            <param><ptype>GLuint</ptype> <name>arg1</name></param>
>+            <param><ptype>GLuint</ptype> <name>arg1Rep</name></param>
>+            <param><ptype>GLuint</ptype> <name>arg1Mod</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glColorFragmentOp2ATI</name></proto>
>+            <param group="FragmentOpATI"><ptype>GLenum</ptype> <name>op</name></param>
>+            <param><ptype>GLuint</ptype> <name>dst</name></param>
>+            <param><ptype>GLuint</ptype> <name>dstMask</name></param>
>+            <param><ptype>GLuint</ptype> <name>dstMod</name></param>
>+            <param><ptype>GLuint</ptype> <name>arg1</name></param>
>+            <param><ptype>GLuint</ptype> <name>arg1Rep</name></param>
>+            <param><ptype>GLuint</ptype> <name>arg1Mod</name></param>
>+            <param><ptype>GLuint</ptype> <name>arg2</name></param>
>+            <param><ptype>GLuint</ptype> <name>arg2Rep</name></param>
>+            <param><ptype>GLuint</ptype> <name>arg2Mod</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glColorFragmentOp3ATI</name></proto>
>+            <param group="FragmentOpATI"><ptype>GLenum</ptype> <name>op</name></param>
>+            <param><ptype>GLuint</ptype> <name>dst</name></param>
>+            <param><ptype>GLuint</ptype> <name>dstMask</name></param>
>+            <param><ptype>GLuint</ptype> <name>dstMod</name></param>
>+            <param><ptype>GLuint</ptype> <name>arg1</name></param>
>+            <param><ptype>GLuint</ptype> <name>arg1Rep</name></param>
>+            <param><ptype>GLuint</ptype> <name>arg1Mod</name></param>
>+            <param><ptype>GLuint</ptype> <name>arg2</name></param>
>+            <param><ptype>GLuint</ptype> <name>arg2Rep</name></param>
>+            <param><ptype>GLuint</ptype> <name>arg2Mod</name></param>
>+            <param><ptype>GLuint</ptype> <name>arg3</name></param>
>+            <param><ptype>GLuint</ptype> <name>arg3Rep</name></param>
>+            <param><ptype>GLuint</ptype> <name>arg3Mod</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glColorMask</name></proto>
>+            <param group="Boolean"><ptype>GLboolean</ptype> <name>red</name></param>
>+            <param group="Boolean"><ptype>GLboolean</ptype> <name>green</name></param>
>+            <param group="Boolean"><ptype>GLboolean</ptype> <name>blue</name></param>
>+            <param group="Boolean"><ptype>GLboolean</ptype> <name>alpha</name></param>
>+            <glx type="render" opcode="134"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glColorMaskIndexedEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param group="Boolean"><ptype>GLboolean</ptype> <name>r</name></param>
>+            <param group="Boolean"><ptype>GLboolean</ptype> <name>g</name></param>
>+            <param group="Boolean"><ptype>GLboolean</ptype> <name>b</name></param>
>+            <param group="Boolean"><ptype>GLboolean</ptype> <name>a</name></param>
>+            <alias name="glColorMaski"/>
>+            <glx type="render" opcode="352"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glColorMaski</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param group="Boolean"><ptype>GLboolean</ptype> <name>r</name></param>
>+            <param group="Boolean"><ptype>GLboolean</ptype> <name>g</name></param>
>+            <param group="Boolean"><ptype>GLboolean</ptype> <name>b</name></param>
>+            <param group="Boolean"><ptype>GLboolean</ptype> <name>a</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glColorMaskiEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param group="Boolean"><ptype>GLboolean</ptype> <name>r</name></param>
>+            <param group="Boolean"><ptype>GLboolean</ptype> <name>g</name></param>
>+            <param group="Boolean"><ptype>GLboolean</ptype> <name>b</name></param>
>+            <param group="Boolean"><ptype>GLboolean</ptype> <name>a</name></param>
>+            <alias name="glColorMaski"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glColorMaskiOES</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param group="Boolean"><ptype>GLboolean</ptype> <name>r</name></param>
>+            <param group="Boolean"><ptype>GLboolean</ptype> <name>g</name></param>
>+            <param group="Boolean"><ptype>GLboolean</ptype> <name>b</name></param>
>+            <param group="Boolean"><ptype>GLboolean</ptype> <name>a</name></param>
>+            <alias name="glColorMaski"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glColorMaterial</name></proto>
>+            <param group="MaterialFace"><ptype>GLenum</ptype> <name>face</name></param>
>+            <param group="ColorMaterialParameter"><ptype>GLenum</ptype> <name>mode</name></param>
>+            <glx type="render" opcode="78"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glColorP3ui</name></proto>
>+            <param group="ColorPointerType"><ptype>GLenum</ptype> <name>type</name></param>
>+            <param><ptype>GLuint</ptype> <name>color</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glColorP3uiv</name></proto>
>+            <param group="ColorPointerType"><ptype>GLenum</ptype> <name>type</name></param>
>+            <param len="1">const <ptype>GLuint</ptype> *<name>color</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glColorP4ui</name></proto>
>+            <param group="ColorPointerType"><ptype>GLenum</ptype> <name>type</name></param>
>+            <param><ptype>GLuint</ptype> <name>color</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glColorP4uiv</name></proto>
>+            <param group="ColorPointerType"><ptype>GLenum</ptype> <name>type</name></param>
>+            <param len="1">const <ptype>GLuint</ptype> *<name>color</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glColorPointer</name></proto>
>+            <param><ptype>GLint</ptype> <name>size</name></param>
>+            <param group="ColorPointerType"><ptype>GLenum</ptype> <name>type</name></param>
>+            <param><ptype>GLsizei</ptype> <name>stride</name></param>
>+            <param len="COMPSIZE(size,type,stride)">const void *<name>pointer</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glColorPointerEXT</name></proto>
>+            <param><ptype>GLint</ptype> <name>size</name></param>
>+            <param group="ColorPointerType"><ptype>GLenum</ptype> <name>type</name></param>
>+            <param><ptype>GLsizei</ptype> <name>stride</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param len="COMPSIZE(size,type,stride,count)">const void *<name>pointer</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glColorPointerListIBM</name></proto>
>+            <param><ptype>GLint</ptype> <name>size</name></param>
>+            <param group="ColorPointerType"><ptype>GLenum</ptype> <name>type</name></param>
>+            <param><ptype>GLint</ptype> <name>stride</name></param>
>+            <param len="COMPSIZE(size,type,stride)">const void **<name>pointer</name></param>
>+            <param><ptype>GLint</ptype> <name>ptrstride</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glColorPointervINTEL</name></proto>
>+            <param><ptype>GLint</ptype> <name>size</name></param>
>+            <param group="VertexPointerType"><ptype>GLenum</ptype> <name>type</name></param>
>+            <param len="4">const void **<name>pointer</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glColorSubTable</name></proto>
>+            <param group="ColorTableTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param><ptype>GLsizei</ptype> <name>start</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param group="PixelFormat"><ptype>GLenum</ptype> <name>format</name></param>
>+            <param group="PixelType"><ptype>GLenum</ptype> <name>type</name></param>
>+            <param len="COMPSIZE(format,type,count)">const void *<name>data</name></param>
>+            <glx type="render" opcode="195"/>
>+            <glx type="render" opcode="312" name="glColorSubTablePBO" comment="PBO protocol"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glColorSubTableEXT</name></proto>
>+            <param group="ColorTableTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param><ptype>GLsizei</ptype> <name>start</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param group="PixelFormat"><ptype>GLenum</ptype> <name>format</name></param>
>+            <param group="PixelType"><ptype>GLenum</ptype> <name>type</name></param>
>+            <param len="COMPSIZE(format,type,count)">const void *<name>data</name></param>
>+            <alias name="glColorSubTable"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glColorTable</name></proto>
>+            <param group="ColorTableTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="InternalFormat"><ptype>GLenum</ptype> <name>internalformat</name></param>
>+            <param><ptype>GLsizei</ptype> <name>width</name></param>
>+            <param group="PixelFormat"><ptype>GLenum</ptype> <name>format</name></param>
>+            <param group="PixelType"><ptype>GLenum</ptype> <name>type</name></param>
>+            <param len="COMPSIZE(format,type,width)">const void *<name>table</name></param>
>+            <glx type="render" opcode="2053"/>
>+            <glx type="render" opcode="313" name="glColorTablePBO" comment="PBO protocol"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glColorTableEXT</name></proto>
>+            <param group="ColorTableTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="InternalFormat"><ptype>GLenum</ptype> <name>internalFormat</name></param>
>+            <param><ptype>GLsizei</ptype> <name>width</name></param>
>+            <param group="PixelFormat"><ptype>GLenum</ptype> <name>format</name></param>
>+            <param group="PixelType"><ptype>GLenum</ptype> <name>type</name></param>
>+            <param len="COMPSIZE(format,type,width)">const void *<name>table</name></param>
>+            <alias name="glColorTable"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glColorTableParameterfv</name></proto>
>+            <param group="ColorTableTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="ColorTableParameterPNameSGI"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param group="CheckedFloat32" len="COMPSIZE(pname)">const <ptype>GLfloat</ptype> *<name>params</name></param>
>+            <glx type="render" opcode="2054"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glColorTableParameterfvSGI</name></proto>
>+            <param group="ColorTableTargetSGI"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="ColorTableParameterPNameSGI"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param group="CheckedFloat32" len="COMPSIZE(pname)">const <ptype>GLfloat</ptype> *<name>params</name></param>
>+            <alias name="glColorTableParameterfv"/>
>+            <glx type="render" opcode="2054"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glColorTableParameteriv</name></proto>
>+            <param group="ColorTableTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="ColorTableParameterPNameSGI"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param group="CheckedInt32" len="COMPSIZE(pname)">const <ptype>GLint</ptype> *<name>params</name></param>
>+            <glx type="render" opcode="2055"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glColorTableParameterivSGI</name></proto>
>+            <param group="ColorTableTargetSGI"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="ColorTableParameterPNameSGI"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param group="CheckedInt32" len="COMPSIZE(pname)">const <ptype>GLint</ptype> *<name>params</name></param>
>+            <alias name="glColorTableParameteriv"/>
>+            <glx type="render" opcode="2055"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glColorTableSGI</name></proto>
>+            <param group="ColorTableTargetSGI"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="InternalFormat"><ptype>GLenum</ptype> <name>internalformat</name></param>
>+            <param><ptype>GLsizei</ptype> <name>width</name></param>
>+            <param group="PixelFormat"><ptype>GLenum</ptype> <name>format</name></param>
>+            <param group="PixelType"><ptype>GLenum</ptype> <name>type</name></param>
>+            <param len="COMPSIZE(format,type,width)">const void *<name>table</name></param>
>+            <alias name="glColorTable"/>
>+            <glx type="render" opcode="2053"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glCombinerInputNV</name></proto>
>+            <param group="CombinerStageNV"><ptype>GLenum</ptype> <name>stage</name></param>
>+            <param group="CombinerPortionNV"><ptype>GLenum</ptype> <name>portion</name></param>
>+            <param group="CombinerVariableNV"><ptype>GLenum</ptype> <name>variable</name></param>
>+            <param group="CombinerRegisterNV"><ptype>GLenum</ptype> <name>input</name></param>
>+            <param group="CombinerMappingNV"><ptype>GLenum</ptype> <name>mapping</name></param>
>+            <param group="CombinerComponentUsageNV"><ptype>GLenum</ptype> <name>componentUsage</name></param>
>+            <glx type="render" opcode="4140"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glCombinerOutputNV</name></proto>
>+            <param group="CombinerStageNV"><ptype>GLenum</ptype> <name>stage</name></param>
>+            <param group="CombinerPortionNV"><ptype>GLenum</ptype> <name>portion</name></param>
>+            <param group="CombinerRegisterNV"><ptype>GLenum</ptype> <name>abOutput</name></param>
>+            <param group="CombinerRegisterNV"><ptype>GLenum</ptype> <name>cdOutput</name></param>
>+            <param group="CombinerRegisterNV"><ptype>GLenum</ptype> <name>sumOutput</name></param>
>+            <param group="CombinerScaleNV"><ptype>GLenum</ptype> <name>scale</name></param>
>+            <param group="CombinerBiasNV"><ptype>GLenum</ptype> <name>bias</name></param>
>+            <param group="Boolean"><ptype>GLboolean</ptype> <name>abDotProduct</name></param>
>+            <param group="Boolean"><ptype>GLboolean</ptype> <name>cdDotProduct</name></param>
>+            <param group="Boolean"><ptype>GLboolean</ptype> <name>muxSum</name></param>
>+            <glx type="render" opcode="4141"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glCombinerParameterfNV</name></proto>
>+            <param group="CombinerParameterNV"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param><ptype>GLfloat</ptype> <name>param</name></param>
>+            <glx type="render" opcode="4136"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glCombinerParameterfvNV</name></proto>
>+            <param group="CombinerParameterNV"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param group="CheckedFloat32" len="COMPSIZE(pname)">const <ptype>GLfloat</ptype> *<name>params</name></param>
>+            <glx type="render" opcode="4137"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glCombinerParameteriNV</name></proto>
>+            <param group="CombinerParameterNV"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param><ptype>GLint</ptype> <name>param</name></param>
>+            <glx type="render" opcode="4138"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glCombinerParameterivNV</name></proto>
>+            <param group="CombinerParameterNV"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param group="CheckedInt32" len="COMPSIZE(pname)">const <ptype>GLint</ptype> *<name>params</name></param>
>+            <glx type="render" opcode="4139"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glCombinerStageParameterfvNV</name></proto>
>+            <param group="CombinerStageNV"><ptype>GLenum</ptype> <name>stage</name></param>
>+            <param group="CombinerParameterNV"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param group="CheckedFloat32" len="COMPSIZE(pname)">const <ptype>GLfloat</ptype> *<name>params</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glCommandListSegmentsNV</name></proto>
>+            <param><ptype>GLuint</ptype> <name>list</name></param>
>+            <param><ptype>GLuint</ptype> <name>segments</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glCompileCommandListNV</name></proto>
>+            <param><ptype>GLuint</ptype> <name>list</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glCompileShader</name></proto>
>+            <param><ptype>GLuint</ptype> <name>shader</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glCompileShaderARB</name></proto>
>+            <param group="handleARB"><ptype>GLhandleARB</ptype> <name>shaderObj</name></param>
>+            <alias name="glCompileShader"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glCompileShaderIncludeARB</name></proto>
>+            <param><ptype>GLuint</ptype> <name>shader</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param len="count">const <ptype>GLchar</ptype> *const*<name>path</name></param>
>+            <param len="count">const <ptype>GLint</ptype> *<name>length</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glCompressedMultiTexImage1DEXT</name></proto>
>+            <param group="TextureUnit"><ptype>GLenum</ptype> <name>texunit</name></param>
>+            <param group="TextureTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>level</name></param>
>+            <param group="InternalFormat"><ptype>GLenum</ptype> <name>internalformat</name></param>
>+            <param><ptype>GLsizei</ptype> <name>width</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>border</name></param>
>+            <param><ptype>GLsizei</ptype> <name>imageSize</name></param>
>+            <param len="imageSize">const void *<name>bits</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glCompressedMultiTexImage2DEXT</name></proto>
>+            <param group="TextureUnit"><ptype>GLenum</ptype> <name>texunit</name></param>
>+            <param group="TextureTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>level</name></param>
>+            <param group="InternalFormat"><ptype>GLenum</ptype> <name>internalformat</name></param>
>+            <param><ptype>GLsizei</ptype> <name>width</name></param>
>+            <param><ptype>GLsizei</ptype> <name>height</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>border</name></param>
>+            <param><ptype>GLsizei</ptype> <name>imageSize</name></param>
>+            <param len="imageSize">const void *<name>bits</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glCompressedMultiTexImage3DEXT</name></proto>
>+            <param group="TextureUnit"><ptype>GLenum</ptype> <name>texunit</name></param>
>+            <param group="TextureTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>level</name></param>
>+            <param group="InternalFormat"><ptype>GLenum</ptype> <name>internalformat</name></param>
>+            <param><ptype>GLsizei</ptype> <name>width</name></param>
>+            <param><ptype>GLsizei</ptype> <name>height</name></param>
>+            <param><ptype>GLsizei</ptype> <name>depth</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>border</name></param>
>+            <param><ptype>GLsizei</ptype> <name>imageSize</name></param>
>+            <param len="imageSize">const void *<name>bits</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glCompressedMultiTexSubImage1DEXT</name></proto>
>+            <param group="TextureUnit"><ptype>GLenum</ptype> <name>texunit</name></param>
>+            <param group="TextureTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>level</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>xoffset</name></param>
>+            <param><ptype>GLsizei</ptype> <name>width</name></param>
>+            <param group="PixelFormat"><ptype>GLenum</ptype> <name>format</name></param>
>+            <param><ptype>GLsizei</ptype> <name>imageSize</name></param>
>+            <param len="imageSize">const void *<name>bits</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glCompressedMultiTexSubImage2DEXT</name></proto>
>+            <param group="TextureUnit"><ptype>GLenum</ptype> <name>texunit</name></param>
>+            <param group="TextureTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>level</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>xoffset</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>yoffset</name></param>
>+            <param><ptype>GLsizei</ptype> <name>width</name></param>
>+            <param><ptype>GLsizei</ptype> <name>height</name></param>
>+            <param group="PixelFormat"><ptype>GLenum</ptype> <name>format</name></param>
>+            <param><ptype>GLsizei</ptype> <name>imageSize</name></param>
>+            <param len="imageSize">const void *<name>bits</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glCompressedMultiTexSubImage3DEXT</name></proto>
>+            <param group="TextureUnit"><ptype>GLenum</ptype> <name>texunit</name></param>
>+            <param group="TextureTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>level</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>xoffset</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>yoffset</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>zoffset</name></param>
>+            <param><ptype>GLsizei</ptype> <name>width</name></param>
>+            <param><ptype>GLsizei</ptype> <name>height</name></param>
>+            <param><ptype>GLsizei</ptype> <name>depth</name></param>
>+            <param group="PixelFormat"><ptype>GLenum</ptype> <name>format</name></param>
>+            <param><ptype>GLsizei</ptype> <name>imageSize</name></param>
>+            <param len="imageSize">const void *<name>bits</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glCompressedTexImage1D</name></proto>
>+            <param group="TextureTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>level</name></param>
>+            <param group="InternalFormat"><ptype>GLenum</ptype> <name>internalformat</name></param>
>+            <param><ptype>GLsizei</ptype> <name>width</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>border</name></param>
>+            <param><ptype>GLsizei</ptype> <name>imageSize</name></param>
>+            <param group="CompressedTextureARB" len="imageSize">const void *<name>data</name></param>
>+            <glx type="render" opcode="214"/>
>+            <glx type="render" opcode="314" name="glCompressedTexImage1DPBO" comment="PBO protocol"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glCompressedTexImage1DARB</name></proto>
>+            <param group="TextureTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>level</name></param>
>+            <param group="InternalFormat"><ptype>GLenum</ptype> <name>internalformat</name></param>
>+            <param><ptype>GLsizei</ptype> <name>width</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>border</name></param>
>+            <param><ptype>GLsizei</ptype> <name>imageSize</name></param>
>+            <param group="CompressedTextureARB" len="imageSize">const void *<name>data</name></param>
>+            <alias name="glCompressedTexImage1D"/>
>+            <glx type="render" opcode="214"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glCompressedTexImage2D</name></proto>
>+            <param group="TextureTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>level</name></param>
>+            <param group="InternalFormat"><ptype>GLenum</ptype> <name>internalformat</name></param>
>+            <param><ptype>GLsizei</ptype> <name>width</name></param>
>+            <param><ptype>GLsizei</ptype> <name>height</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>border</name></param>
>+            <param><ptype>GLsizei</ptype> <name>imageSize</name></param>
>+            <param group="CompressedTextureARB" len="imageSize">const void *<name>data</name></param>
>+            <glx type="render" opcode="215"/>
>+            <glx type="render" opcode="315" name="glCompressedTexImage2DPBO" comment="PBO protocol"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glCompressedTexImage2DARB</name></proto>
>+            <param group="TextureTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>level</name></param>
>+            <param group="InternalFormat"><ptype>GLenum</ptype> <name>internalformat</name></param>
>+            <param><ptype>GLsizei</ptype> <name>width</name></param>
>+            <param><ptype>GLsizei</ptype> <name>height</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>border</name></param>
>+            <param><ptype>GLsizei</ptype> <name>imageSize</name></param>
>+            <param group="CompressedTextureARB" len="imageSize">const void *<name>data</name></param>
>+            <alias name="glCompressedTexImage2D"/>
>+            <glx type="render" opcode="215"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glCompressedTexImage3D</name></proto>
>+            <param group="TextureTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>level</name></param>
>+            <param group="InternalFormat"><ptype>GLenum</ptype> <name>internalformat</name></param>
>+            <param><ptype>GLsizei</ptype> <name>width</name></param>
>+            <param><ptype>GLsizei</ptype> <name>height</name></param>
>+            <param><ptype>GLsizei</ptype> <name>depth</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>border</name></param>
>+            <param><ptype>GLsizei</ptype> <name>imageSize</name></param>
>+            <param group="CompressedTextureARB" len="imageSize">const void *<name>data</name></param>
>+            <glx type="render" opcode="216"/>
>+            <glx type="render" opcode="316" name="glCompressedTexImage3DPBO" comment="PBO protocol"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glCompressedTexImage3DARB</name></proto>
>+            <param group="TextureTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>level</name></param>
>+            <param group="InternalFormat"><ptype>GLenum</ptype> <name>internalformat</name></param>
>+            <param><ptype>GLsizei</ptype> <name>width</name></param>
>+            <param><ptype>GLsizei</ptype> <name>height</name></param>
>+            <param><ptype>GLsizei</ptype> <name>depth</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>border</name></param>
>+            <param><ptype>GLsizei</ptype> <name>imageSize</name></param>
>+            <param group="CompressedTextureARB" len="imageSize">const void *<name>data</name></param>
>+            <alias name="glCompressedTexImage3D"/>
>+            <glx type="render" opcode="216"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glCompressedTexImage3DOES</name></proto>
>+            <param group="TextureTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param><ptype>GLint</ptype> <name>level</name></param>
>+            <param group="InternalFormat"><ptype>GLenum</ptype> <name>internalformat</name></param>
>+            <param><ptype>GLsizei</ptype> <name>width</name></param>
>+            <param><ptype>GLsizei</ptype> <name>height</name></param>
>+            <param><ptype>GLsizei</ptype> <name>depth</name></param>
>+            <param><ptype>GLint</ptype> <name>border</name></param>
>+            <param><ptype>GLsizei</ptype> <name>imageSize</name></param>
>+            <param len="imageSize">const void *<name>data</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glCompressedTexSubImage1D</name></proto>
>+            <param group="TextureTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>level</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>xoffset</name></param>
>+            <param><ptype>GLsizei</ptype> <name>width</name></param>
>+            <param group="PixelFormat"><ptype>GLenum</ptype> <name>format</name></param>
>+            <param><ptype>GLsizei</ptype> <name>imageSize</name></param>
>+            <param group="CompressedTextureARB" len="imageSize">const void *<name>data</name></param>
>+            <glx type="render" opcode="217"/>
>+            <glx type="render" opcode="317" name="glCompressedTexSubImage1DPBO" comment="PBO protocol"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glCompressedTexSubImage1DARB</name></proto>
>+            <param group="TextureTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>level</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>xoffset</name></param>
>+            <param><ptype>GLsizei</ptype> <name>width</name></param>
>+            <param group="PixelFormat"><ptype>GLenum</ptype> <name>format</name></param>
>+            <param><ptype>GLsizei</ptype> <name>imageSize</name></param>
>+            <param group="CompressedTextureARB" len="imageSize">const void *<name>data</name></param>
>+            <alias name="glCompressedTexSubImage1D"/>
>+            <glx type="render" opcode="217"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glCompressedTexSubImage2D</name></proto>
>+            <param group="TextureTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>level</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>xoffset</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>yoffset</name></param>
>+            <param><ptype>GLsizei</ptype> <name>width</name></param>
>+            <param><ptype>GLsizei</ptype> <name>height</name></param>
>+            <param group="PixelFormat"><ptype>GLenum</ptype> <name>format</name></param>
>+            <param><ptype>GLsizei</ptype> <name>imageSize</name></param>
>+            <param group="CompressedTextureARB" len="imageSize">const void *<name>data</name></param>
>+            <glx type="render" opcode="218"/>
>+            <glx type="render" opcode="318" name="glCompressedTexSubImage2DPBO" comment="PBO protocol"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glCompressedTexSubImage2DARB</name></proto>
>+            <param group="TextureTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>level</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>xoffset</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>yoffset</name></param>
>+            <param><ptype>GLsizei</ptype> <name>width</name></param>
>+            <param><ptype>GLsizei</ptype> <name>height</name></param>
>+            <param group="PixelFormat"><ptype>GLenum</ptype> <name>format</name></param>
>+            <param><ptype>GLsizei</ptype> <name>imageSize</name></param>
>+            <param group="CompressedTextureARB" len="imageSize">const void *<name>data</name></param>
>+            <alias name="glCompressedTexSubImage2D"/>
>+            <glx type="render" opcode="218"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glCompressedTexSubImage3D</name></proto>
>+            <param group="TextureTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>level</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>xoffset</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>yoffset</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>zoffset</name></param>
>+            <param><ptype>GLsizei</ptype> <name>width</name></param>
>+            <param><ptype>GLsizei</ptype> <name>height</name></param>
>+            <param><ptype>GLsizei</ptype> <name>depth</name></param>
>+            <param group="PixelFormat"><ptype>GLenum</ptype> <name>format</name></param>
>+            <param><ptype>GLsizei</ptype> <name>imageSize</name></param>
>+            <param group="CompressedTextureARB" len="imageSize">const void *<name>data</name></param>
>+            <glx type="render" opcode="219"/>
>+            <glx type="render" opcode="319" name="glCompressedTexSubImage3DPBO" comment="PBO protocol"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glCompressedTexSubImage3DARB</name></proto>
>+            <param group="TextureTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>level</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>xoffset</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>yoffset</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>zoffset</name></param>
>+            <param><ptype>GLsizei</ptype> <name>width</name></param>
>+            <param><ptype>GLsizei</ptype> <name>height</name></param>
>+            <param><ptype>GLsizei</ptype> <name>depth</name></param>
>+            <param group="PixelFormat"><ptype>GLenum</ptype> <name>format</name></param>
>+            <param><ptype>GLsizei</ptype> <name>imageSize</name></param>
>+            <param group="CompressedTextureARB" len="imageSize">const void *<name>data</name></param>
>+            <alias name="glCompressedTexSubImage3D"/>
>+            <glx type="render" opcode="219"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glCompressedTexSubImage3DOES</name></proto>
>+            <param group="TextureTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param><ptype>GLint</ptype> <name>level</name></param>
>+            <param><ptype>GLint</ptype> <name>xoffset</name></param>
>+            <param><ptype>GLint</ptype> <name>yoffset</name></param>
>+            <param><ptype>GLint</ptype> <name>zoffset</name></param>
>+            <param><ptype>GLsizei</ptype> <name>width</name></param>
>+            <param><ptype>GLsizei</ptype> <name>height</name></param>
>+            <param><ptype>GLsizei</ptype> <name>depth</name></param>
>+            <param group="PixelFormat"><ptype>GLenum</ptype> <name>format</name></param>
>+            <param><ptype>GLsizei</ptype> <name>imageSize</name></param>
>+            <param len="imageSize">const void *<name>data</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glCompressedTextureImage1DEXT</name></proto>
>+            <param group="Texture"><ptype>GLuint</ptype> <name>texture</name></param>
>+            <param group="TextureTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>level</name></param>
>+            <param group="InternalFormat"><ptype>GLenum</ptype> <name>internalformat</name></param>
>+            <param><ptype>GLsizei</ptype> <name>width</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>border</name></param>
>+            <param><ptype>GLsizei</ptype> <name>imageSize</name></param>
>+            <param len="imageSize">const void *<name>bits</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glCompressedTextureImage2DEXT</name></proto>
>+            <param group="Texture"><ptype>GLuint</ptype> <name>texture</name></param>
>+            <param group="TextureTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>level</name></param>
>+            <param group="InternalFormat"><ptype>GLenum</ptype> <name>internalformat</name></param>
>+            <param><ptype>GLsizei</ptype> <name>width</name></param>
>+            <param><ptype>GLsizei</ptype> <name>height</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>border</name></param>
>+            <param><ptype>GLsizei</ptype> <name>imageSize</name></param>
>+            <param len="imageSize">const void *<name>bits</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glCompressedTextureImage3DEXT</name></proto>
>+            <param group="Texture"><ptype>GLuint</ptype> <name>texture</name></param>
>+            <param group="TextureTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>level</name></param>
>+            <param group="InternalFormat"><ptype>GLenum</ptype> <name>internalformat</name></param>
>+            <param><ptype>GLsizei</ptype> <name>width</name></param>
>+            <param><ptype>GLsizei</ptype> <name>height</name></param>
>+            <param><ptype>GLsizei</ptype> <name>depth</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>border</name></param>
>+            <param><ptype>GLsizei</ptype> <name>imageSize</name></param>
>+            <param len="imageSize">const void *<name>bits</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glCompressedTextureSubImage1D</name></proto>
>+            <param><ptype>GLuint</ptype> <name>texture</name></param>
>+            <param><ptype>GLint</ptype> <name>level</name></param>
>+            <param><ptype>GLint</ptype> <name>xoffset</name></param>
>+            <param><ptype>GLsizei</ptype> <name>width</name></param>
>+            <param group="PixelFormat"><ptype>GLenum</ptype> <name>format</name></param>
>+            <param><ptype>GLsizei</ptype> <name>imageSize</name></param>
>+            <param>const void *<name>data</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glCompressedTextureSubImage1DEXT</name></proto>
>+            <param group="Texture"><ptype>GLuint</ptype> <name>texture</name></param>
>+            <param group="TextureTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>level</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>xoffset</name></param>
>+            <param><ptype>GLsizei</ptype> <name>width</name></param>
>+            <param group="PixelFormat"><ptype>GLenum</ptype> <name>format</name></param>
>+            <param><ptype>GLsizei</ptype> <name>imageSize</name></param>
>+            <param len="imageSize">const void *<name>bits</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glCompressedTextureSubImage2D</name></proto>
>+            <param><ptype>GLuint</ptype> <name>texture</name></param>
>+            <param><ptype>GLint</ptype> <name>level</name></param>
>+            <param><ptype>GLint</ptype> <name>xoffset</name></param>
>+            <param><ptype>GLint</ptype> <name>yoffset</name></param>
>+            <param><ptype>GLsizei</ptype> <name>width</name></param>
>+            <param><ptype>GLsizei</ptype> <name>height</name></param>
>+            <param group="PixelFormat"><ptype>GLenum</ptype> <name>format</name></param>
>+            <param><ptype>GLsizei</ptype> <name>imageSize</name></param>
>+            <param>const void *<name>data</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glCompressedTextureSubImage2DEXT</name></proto>
>+            <param group="Texture"><ptype>GLuint</ptype> <name>texture</name></param>
>+            <param group="TextureTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>level</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>xoffset</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>yoffset</name></param>
>+            <param><ptype>GLsizei</ptype> <name>width</name></param>
>+            <param><ptype>GLsizei</ptype> <name>height</name></param>
>+            <param group="PixelFormat"><ptype>GLenum</ptype> <name>format</name></param>
>+            <param><ptype>GLsizei</ptype> <name>imageSize</name></param>
>+            <param len="imageSize">const void *<name>bits</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glCompressedTextureSubImage3D</name></proto>
>+            <param><ptype>GLuint</ptype> <name>texture</name></param>
>+            <param><ptype>GLint</ptype> <name>level</name></param>
>+            <param><ptype>GLint</ptype> <name>xoffset</name></param>
>+            <param><ptype>GLint</ptype> <name>yoffset</name></param>
>+            <param><ptype>GLint</ptype> <name>zoffset</name></param>
>+            <param><ptype>GLsizei</ptype> <name>width</name></param>
>+            <param><ptype>GLsizei</ptype> <name>height</name></param>
>+            <param><ptype>GLsizei</ptype> <name>depth</name></param>
>+            <param group="PixelFormat"><ptype>GLenum</ptype> <name>format</name></param>
>+            <param><ptype>GLsizei</ptype> <name>imageSize</name></param>
>+            <param>const void *<name>data</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glCompressedTextureSubImage3DEXT</name></proto>
>+            <param group="Texture"><ptype>GLuint</ptype> <name>texture</name></param>
>+            <param group="TextureTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>level</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>xoffset</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>yoffset</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>zoffset</name></param>
>+            <param><ptype>GLsizei</ptype> <name>width</name></param>
>+            <param><ptype>GLsizei</ptype> <name>height</name></param>
>+            <param><ptype>GLsizei</ptype> <name>depth</name></param>
>+            <param group="PixelFormat"><ptype>GLenum</ptype> <name>format</name></param>
>+            <param><ptype>GLsizei</ptype> <name>imageSize</name></param>
>+            <param len="imageSize">const void *<name>bits</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glConservativeRasterParameterfNV</name></proto>
>+            <param><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param><ptype>GLfloat</ptype> <name>value</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glConservativeRasterParameteriNV</name></proto>
>+            <param><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param><ptype>GLint</ptype> <name>param</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glConvolutionFilter1D</name></proto>
>+            <param group="ConvolutionTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="InternalFormat"><ptype>GLenum</ptype> <name>internalformat</name></param>
>+            <param><ptype>GLsizei</ptype> <name>width</name></param>
>+            <param group="PixelFormat"><ptype>GLenum</ptype> <name>format</name></param>
>+            <param group="PixelType"><ptype>GLenum</ptype> <name>type</name></param>
>+            <param len="COMPSIZE(format,type,width)">const void *<name>image</name></param>
>+            <glx type="render" opcode="4101"/>
>+            <glx type="render" opcode="320" name="glConvolutionFilter1DPBO" comment="PBO protocol"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glConvolutionFilter1DEXT</name></proto>
>+            <param group="ConvolutionTargetEXT"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="InternalFormat"><ptype>GLenum</ptype> <name>internalformat</name></param>
>+            <param><ptype>GLsizei</ptype> <name>width</name></param>
>+            <param group="PixelFormat"><ptype>GLenum</ptype> <name>format</name></param>
>+            <param group="PixelType"><ptype>GLenum</ptype> <name>type</name></param>
>+            <param len="COMPSIZE(format,type,width)">const void *<name>image</name></param>
>+            <alias name="glConvolutionFilter1D"/>
>+            <glx type="render" opcode="4101"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glConvolutionFilter2D</name></proto>
>+            <param group="ConvolutionTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="InternalFormat"><ptype>GLenum</ptype> <name>internalformat</name></param>
>+            <param><ptype>GLsizei</ptype> <name>width</name></param>
>+            <param><ptype>GLsizei</ptype> <name>height</name></param>
>+            <param group="PixelFormat"><ptype>GLenum</ptype> <name>format</name></param>
>+            <param group="PixelType"><ptype>GLenum</ptype> <name>type</name></param>
>+            <param len="COMPSIZE(format,type,width,height)">const void *<name>image</name></param>
>+            <glx type="render" opcode="4102"/>
>+            <glx type="render" opcode="321" name="glConvolutionFilter2DPBO" comment="PBO protocol"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glConvolutionFilter2DEXT</name></proto>
>+            <param group="ConvolutionTargetEXT"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="InternalFormat"><ptype>GLenum</ptype> <name>internalformat</name></param>
>+            <param><ptype>GLsizei</ptype> <name>width</name></param>
>+            <param><ptype>GLsizei</ptype> <name>height</name></param>
>+            <param group="PixelFormat"><ptype>GLenum</ptype> <name>format</name></param>
>+            <param group="PixelType"><ptype>GLenum</ptype> <name>type</name></param>
>+            <param len="COMPSIZE(format,type,width,height)">const void *<name>image</name></param>
>+            <alias name="glConvolutionFilter2D"/>
>+            <glx type="render" opcode="4102"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glConvolutionParameterf</name></proto>
>+            <param group="ConvolutionTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="ConvolutionParameterEXT"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param group="CheckedFloat32"><ptype>GLfloat</ptype> <name>params</name></param>
>+            <glx type="render" opcode="4103"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glConvolutionParameterfEXT</name></proto>
>+            <param group="ConvolutionTargetEXT"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="ConvolutionParameterEXT"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param group="CheckedFloat32"><ptype>GLfloat</ptype> <name>params</name></param>
>+            <alias name="glConvolutionParameterf"/>
>+            <glx type="render" opcode="4103"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glConvolutionParameterfv</name></proto>
>+            <param group="ConvolutionTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="ConvolutionParameterEXT"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param group="CheckedFloat32" len="COMPSIZE(pname)">const <ptype>GLfloat</ptype> *<name>params</name></param>
>+            <glx type="render" opcode="4104"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glConvolutionParameterfvEXT</name></proto>
>+            <param group="ConvolutionTargetEXT"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="ConvolutionParameterEXT"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param group="CheckedFloat32" len="COMPSIZE(pname)">const <ptype>GLfloat</ptype> *<name>params</name></param>
>+            <alias name="glConvolutionParameterfv"/>
>+            <glx type="render" opcode="4104"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glConvolutionParameteri</name></proto>
>+            <param group="ConvolutionTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="ConvolutionParameterEXT"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>params</name></param>
>+            <glx type="render" opcode="4105"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glConvolutionParameteriEXT</name></proto>
>+            <param group="ConvolutionTargetEXT"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="ConvolutionParameterEXT"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>params</name></param>
>+            <alias name="glConvolutionParameteri"/>
>+            <glx type="render" opcode="4105"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glConvolutionParameteriv</name></proto>
>+            <param group="ConvolutionTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="ConvolutionParameterEXT"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param group="CheckedInt32" len="COMPSIZE(pname)">const <ptype>GLint</ptype> *<name>params</name></param>
>+            <glx type="render" opcode="4106"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glConvolutionParameterivEXT</name></proto>
>+            <param group="ConvolutionTargetEXT"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="ConvolutionParameterEXT"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param group="CheckedInt32" len="COMPSIZE(pname)">const <ptype>GLint</ptype> *<name>params</name></param>
>+            <alias name="glConvolutionParameteriv"/>
>+            <glx type="render" opcode="4106"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glConvolutionParameterxOES</name></proto>
>+            <param group="ConvolutionTargetEXT"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="ConvolutionParameterEXT"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param><ptype>GLfixed</ptype> <name>param</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glConvolutionParameterxvOES</name></proto>
>+            <param group="ConvolutionTargetEXT"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="ConvolutionParameterEXT"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="COMPSIZE(pname)">const <ptype>GLfixed</ptype> *<name>params</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glCopyBufferSubData</name></proto>
>+            <param group="CopyBufferSubDataTarget"><ptype>GLenum</ptype> <name>readTarget</name></param>
>+            <param group="CopyBufferSubDataTarget"><ptype>GLenum</ptype> <name>writeTarget</name></param>
>+            <param group="BufferOffset"><ptype>GLintptr</ptype> <name>readOffset</name></param>
>+            <param group="BufferOffset"><ptype>GLintptr</ptype> <name>writeOffset</name></param>
>+            <param group="BufferSize"><ptype>GLsizeiptr</ptype> <name>size</name></param>
>+            <glx type="single" opcode="221"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glCopyBufferSubDataNV</name></proto>
>+            <param group="CopyBufferSubDataTarget"><ptype>GLenum</ptype> <name>readTarget</name></param>
>+            <param group="CopyBufferSubDataTarget"><ptype>GLenum</ptype> <name>writeTarget</name></param>
>+            <param group="BufferOffset"><ptype>GLintptr</ptype> <name>readOffset</name></param>
>+            <param group="BufferOffset"><ptype>GLintptr</ptype> <name>writeOffset</name></param>
>+            <param group="BufferSize"><ptype>GLsizeiptr</ptype> <name>size</name></param>
>+            <alias name="glCopyBufferSubData"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glCopyColorSubTable</name></proto>
>+            <param group="ColorTableTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param><ptype>GLsizei</ptype> <name>start</name></param>
>+            <param group="WinCoord"><ptype>GLint</ptype> <name>x</name></param>
>+            <param group="WinCoord"><ptype>GLint</ptype> <name>y</name></param>
>+            <param><ptype>GLsizei</ptype> <name>width</name></param>
>+            <glx type="render" opcode="196"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glCopyColorSubTableEXT</name></proto>
>+            <param group="ColorTableTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param><ptype>GLsizei</ptype> <name>start</name></param>
>+            <param group="WinCoord"><ptype>GLint</ptype> <name>x</name></param>
>+            <param group="WinCoord"><ptype>GLint</ptype> <name>y</name></param>
>+            <param><ptype>GLsizei</ptype> <name>width</name></param>
>+            <alias name="glCopyColorSubTable"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glCopyColorTable</name></proto>
>+            <param group="ColorTableTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="InternalFormat"><ptype>GLenum</ptype> <name>internalformat</name></param>
>+            <param group="WinCoord"><ptype>GLint</ptype> <name>x</name></param>
>+            <param group="WinCoord"><ptype>GLint</ptype> <name>y</name></param>
>+            <param><ptype>GLsizei</ptype> <name>width</name></param>
>+            <glx type="render" opcode="2056"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glCopyColorTableSGI</name></proto>
>+            <param group="ColorTableTargetSGI"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="InternalFormat"><ptype>GLenum</ptype> <name>internalformat</name></param>
>+            <param group="WinCoord"><ptype>GLint</ptype> <name>x</name></param>
>+            <param group="WinCoord"><ptype>GLint</ptype> <name>y</name></param>
>+            <param><ptype>GLsizei</ptype> <name>width</name></param>
>+            <alias name="glCopyColorTable"/>
>+            <glx type="render" opcode="2056"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glCopyConvolutionFilter1D</name></proto>
>+            <param group="ConvolutionTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="InternalFormat"><ptype>GLenum</ptype> <name>internalformat</name></param>
>+            <param group="WinCoord"><ptype>GLint</ptype> <name>x</name></param>
>+            <param group="WinCoord"><ptype>GLint</ptype> <name>y</name></param>
>+            <param><ptype>GLsizei</ptype> <name>width</name></param>
>+            <glx type="render" opcode="4107"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glCopyConvolutionFilter1DEXT</name></proto>
>+            <param group="ConvolutionTargetEXT"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="InternalFormat"><ptype>GLenum</ptype> <name>internalformat</name></param>
>+            <param group="WinCoord"><ptype>GLint</ptype> <name>x</name></param>
>+            <param group="WinCoord"><ptype>GLint</ptype> <name>y</name></param>
>+            <param><ptype>GLsizei</ptype> <name>width</name></param>
>+            <alias name="glCopyConvolutionFilter1D"/>
>+            <glx type="render" opcode="4107"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glCopyConvolutionFilter2D</name></proto>
>+            <param group="ConvolutionTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="InternalFormat"><ptype>GLenum</ptype> <name>internalformat</name></param>
>+            <param group="WinCoord"><ptype>GLint</ptype> <name>x</name></param>
>+            <param group="WinCoord"><ptype>GLint</ptype> <name>y</name></param>
>+            <param><ptype>GLsizei</ptype> <name>width</name></param>
>+            <param><ptype>GLsizei</ptype> <name>height</name></param>
>+            <glx type="render" opcode="4108"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glCopyConvolutionFilter2DEXT</name></proto>
>+            <param group="ConvolutionTargetEXT"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="InternalFormat"><ptype>GLenum</ptype> <name>internalformat</name></param>
>+            <param group="WinCoord"><ptype>GLint</ptype> <name>x</name></param>
>+            <param group="WinCoord"><ptype>GLint</ptype> <name>y</name></param>
>+            <param><ptype>GLsizei</ptype> <name>width</name></param>
>+            <param><ptype>GLsizei</ptype> <name>height</name></param>
>+            <alias name="glCopyConvolutionFilter2D"/>
>+            <glx type="render" opcode="4108"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glCopyImageSubData</name></proto>
>+            <param><ptype>GLuint</ptype> <name>srcName</name></param>
>+            <param group="CopyBufferSubDataTarget"><ptype>GLenum</ptype> <name>srcTarget</name></param>
>+            <param><ptype>GLint</ptype> <name>srcLevel</name></param>
>+            <param><ptype>GLint</ptype> <name>srcX</name></param>
>+            <param><ptype>GLint</ptype> <name>srcY</name></param>
>+            <param><ptype>GLint</ptype> <name>srcZ</name></param>
>+            <param><ptype>GLuint</ptype> <name>dstName</name></param>
>+            <param group="CopyBufferSubDataTarget"><ptype>GLenum</ptype> <name>dstTarget</name></param>
>+            <param><ptype>GLint</ptype> <name>dstLevel</name></param>
>+            <param><ptype>GLint</ptype> <name>dstX</name></param>
>+            <param><ptype>GLint</ptype> <name>dstY</name></param>
>+            <param><ptype>GLint</ptype> <name>dstZ</name></param>
>+            <param><ptype>GLsizei</ptype> <name>srcWidth</name></param>
>+            <param><ptype>GLsizei</ptype> <name>srcHeight</name></param>
>+            <param><ptype>GLsizei</ptype> <name>srcDepth</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glCopyImageSubDataEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>srcName</name></param>
>+            <param group="CopyBufferSubDataTarget"><ptype>GLenum</ptype> <name>srcTarget</name></param>
>+            <param><ptype>GLint</ptype> <name>srcLevel</name></param>
>+            <param><ptype>GLint</ptype> <name>srcX</name></param>
>+            <param><ptype>GLint</ptype> <name>srcY</name></param>
>+            <param><ptype>GLint</ptype> <name>srcZ</name></param>
>+            <param><ptype>GLuint</ptype> <name>dstName</name></param>
>+            <param group="CopyBufferSubDataTarget"><ptype>GLenum</ptype> <name>dstTarget</name></param>
>+            <param><ptype>GLint</ptype> <name>dstLevel</name></param>
>+            <param><ptype>GLint</ptype> <name>dstX</name></param>
>+            <param><ptype>GLint</ptype> <name>dstY</name></param>
>+            <param><ptype>GLint</ptype> <name>dstZ</name></param>
>+            <param><ptype>GLsizei</ptype> <name>srcWidth</name></param>
>+            <param><ptype>GLsizei</ptype> <name>srcHeight</name></param>
>+            <param><ptype>GLsizei</ptype> <name>srcDepth</name></param>
>+            <alias name="glCopyImageSubData"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glCopyImageSubDataNV</name></proto>
>+            <param><ptype>GLuint</ptype> <name>srcName</name></param>
>+            <param group="CopyBufferSubDataTarget"><ptype>GLenum</ptype> <name>srcTarget</name></param>
>+            <param><ptype>GLint</ptype> <name>srcLevel</name></param>
>+            <param><ptype>GLint</ptype> <name>srcX</name></param>
>+            <param><ptype>GLint</ptype> <name>srcY</name></param>
>+            <param><ptype>GLint</ptype> <name>srcZ</name></param>
>+            <param><ptype>GLuint</ptype> <name>dstName</name></param>
>+            <param group="CopyBufferSubDataTarget"><ptype>GLenum</ptype> <name>dstTarget</name></param>
>+            <param><ptype>GLint</ptype> <name>dstLevel</name></param>
>+            <param><ptype>GLint</ptype> <name>dstX</name></param>
>+            <param><ptype>GLint</ptype> <name>dstY</name></param>
>+            <param><ptype>GLint</ptype> <name>dstZ</name></param>
>+            <param><ptype>GLsizei</ptype> <name>width</name></param>
>+            <param><ptype>GLsizei</ptype> <name>height</name></param>
>+            <param><ptype>GLsizei</ptype> <name>depth</name></param>
>+            <glx type="render" opcode="4291"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glCopyImageSubDataOES</name></proto>
>+            <param><ptype>GLuint</ptype> <name>srcName</name></param>
>+            <param group="CopyBufferSubDataTarget"><ptype>GLenum</ptype> <name>srcTarget</name></param>
>+            <param><ptype>GLint</ptype> <name>srcLevel</name></param>
>+            <param><ptype>GLint</ptype> <name>srcX</name></param>
>+            <param><ptype>GLint</ptype> <name>srcY</name></param>
>+            <param><ptype>GLint</ptype> <name>srcZ</name></param>
>+            <param><ptype>GLuint</ptype> <name>dstName</name></param>
>+            <param group="CopyBufferSubDataTarget"><ptype>GLenum</ptype> <name>dstTarget</name></param>
>+            <param><ptype>GLint</ptype> <name>dstLevel</name></param>
>+            <param><ptype>GLint</ptype> <name>dstX</name></param>
>+            <param><ptype>GLint</ptype> <name>dstY</name></param>
>+            <param><ptype>GLint</ptype> <name>dstZ</name></param>
>+            <param><ptype>GLsizei</ptype> <name>srcWidth</name></param>
>+            <param><ptype>GLsizei</ptype> <name>srcHeight</name></param>
>+            <param><ptype>GLsizei</ptype> <name>srcDepth</name></param>
>+            <alias name="glCopyImageSubData"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glCopyMultiTexImage1DEXT</name></proto>
>+            <param group="TextureUnit"><ptype>GLenum</ptype> <name>texunit</name></param>
>+            <param group="TextureTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>level</name></param>
>+            <param group="InternalFormat"><ptype>GLenum</ptype> <name>internalformat</name></param>
>+            <param group="WinCoord"><ptype>GLint</ptype> <name>x</name></param>
>+            <param group="WinCoord"><ptype>GLint</ptype> <name>y</name></param>
>+            <param><ptype>GLsizei</ptype> <name>width</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>border</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glCopyMultiTexImage2DEXT</name></proto>
>+            <param group="TextureUnit"><ptype>GLenum</ptype> <name>texunit</name></param>
>+            <param group="TextureTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>level</name></param>
>+            <param group="InternalFormat"><ptype>GLenum</ptype> <name>internalformat</name></param>
>+            <param group="WinCoord"><ptype>GLint</ptype> <name>x</name></param>
>+            <param group="WinCoord"><ptype>GLint</ptype> <name>y</name></param>
>+            <param><ptype>GLsizei</ptype> <name>width</name></param>
>+            <param><ptype>GLsizei</ptype> <name>height</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>border</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glCopyMultiTexSubImage1DEXT</name></proto>
>+            <param group="TextureUnit"><ptype>GLenum</ptype> <name>texunit</name></param>
>+            <param group="TextureTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>level</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>xoffset</name></param>
>+            <param group="WinCoord"><ptype>GLint</ptype> <name>x</name></param>
>+            <param group="WinCoord"><ptype>GLint</ptype> <name>y</name></param>
>+            <param><ptype>GLsizei</ptype> <name>width</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glCopyMultiTexSubImage2DEXT</name></proto>
>+            <param group="TextureUnit"><ptype>GLenum</ptype> <name>texunit</name></param>
>+            <param group="TextureTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>level</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>xoffset</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>yoffset</name></param>
>+            <param group="WinCoord"><ptype>GLint</ptype> <name>x</name></param>
>+            <param group="WinCoord"><ptype>GLint</ptype> <name>y</name></param>
>+            <param><ptype>GLsizei</ptype> <name>width</name></param>
>+            <param><ptype>GLsizei</ptype> <name>height</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glCopyMultiTexSubImage3DEXT</name></proto>
>+            <param group="TextureUnit"><ptype>GLenum</ptype> <name>texunit</name></param>
>+            <param group="TextureTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>level</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>xoffset</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>yoffset</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>zoffset</name></param>
>+            <param group="WinCoord"><ptype>GLint</ptype> <name>x</name></param>
>+            <param group="WinCoord"><ptype>GLint</ptype> <name>y</name></param>
>+            <param><ptype>GLsizei</ptype> <name>width</name></param>
>+            <param><ptype>GLsizei</ptype> <name>height</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glCopyNamedBufferSubData</name></proto>
>+            <param><ptype>GLuint</ptype> <name>readBuffer</name></param>
>+            <param><ptype>GLuint</ptype> <name>writeBuffer</name></param>
>+            <param><ptype>GLintptr</ptype> <name>readOffset</name></param>
>+            <param><ptype>GLintptr</ptype> <name>writeOffset</name></param>
>+            <param group="BufferSize"><ptype>GLsizeiptr</ptype> <name>size</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glCopyPathNV</name></proto>
>+            <param group="Path"><ptype>GLuint</ptype> <name>resultPath</name></param>
>+            <param group="Path"><ptype>GLuint</ptype> <name>srcPath</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glCopyPixels</name></proto>
>+            <param group="WinCoord"><ptype>GLint</ptype> <name>x</name></param>
>+            <param group="WinCoord"><ptype>GLint</ptype> <name>y</name></param>
>+            <param><ptype>GLsizei</ptype> <name>width</name></param>
>+            <param><ptype>GLsizei</ptype> <name>height</name></param>
>+            <param group="PixelCopyType"><ptype>GLenum</ptype> <name>type</name></param>
>+            <glx type="render" opcode="172"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glCopyTexImage1D</name></proto>
>+            <param group="TextureTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>level</name></param>
>+            <param group="InternalFormat"><ptype>GLenum</ptype> <name>internalformat</name></param>
>+            <param group="WinCoord"><ptype>GLint</ptype> <name>x</name></param>
>+            <param group="WinCoord"><ptype>GLint</ptype> <name>y</name></param>
>+            <param><ptype>GLsizei</ptype> <name>width</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>border</name></param>
>+            <glx type="render" opcode="4119"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glCopyTexImage1DEXT</name></proto>
>+            <param group="TextureTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>level</name></param>
>+            <param group="InternalFormat"><ptype>GLenum</ptype> <name>internalformat</name></param>
>+            <param group="WinCoord"><ptype>GLint</ptype> <name>x</name></param>
>+            <param group="WinCoord"><ptype>GLint</ptype> <name>y</name></param>
>+            <param><ptype>GLsizei</ptype> <name>width</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>border</name></param>
>+            <alias name="glCopyTexImage1D"/>
>+            <glx type="render" opcode="4119"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glCopyTexImage2D</name></proto>
>+            <param group="TextureTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>level</name></param>
>+            <param group="InternalFormat"><ptype>GLenum</ptype> <name>internalformat</name></param>
>+            <param group="WinCoord"><ptype>GLint</ptype> <name>x</name></param>
>+            <param group="WinCoord"><ptype>GLint</ptype> <name>y</name></param>
>+            <param><ptype>GLsizei</ptype> <name>width</name></param>
>+            <param><ptype>GLsizei</ptype> <name>height</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>border</name></param>
>+            <glx type="render" opcode="4120"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glCopyTexImage2DEXT</name></proto>
>+            <param group="TextureTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>level</name></param>
>+            <param group="InternalFormat"><ptype>GLenum</ptype> <name>internalformat</name></param>
>+            <param group="WinCoord"><ptype>GLint</ptype> <name>x</name></param>
>+            <param group="WinCoord"><ptype>GLint</ptype> <name>y</name></param>
>+            <param><ptype>GLsizei</ptype> <name>width</name></param>
>+            <param><ptype>GLsizei</ptype> <name>height</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>border</name></param>
>+            <alias name="glCopyTexImage2D"/>
>+            <glx type="render" opcode="4120"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glCopyTexSubImage1D</name></proto>
>+            <param group="TextureTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>level</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>xoffset</name></param>
>+            <param group="WinCoord"><ptype>GLint</ptype> <name>x</name></param>
>+            <param group="WinCoord"><ptype>GLint</ptype> <name>y</name></param>
>+            <param><ptype>GLsizei</ptype> <name>width</name></param>
>+            <glx type="render" opcode="4121"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glCopyTexSubImage1DEXT</name></proto>
>+            <param group="TextureTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>level</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>xoffset</name></param>
>+            <param group="WinCoord"><ptype>GLint</ptype> <name>x</name></param>
>+            <param group="WinCoord"><ptype>GLint</ptype> <name>y</name></param>
>+            <param><ptype>GLsizei</ptype> <name>width</name></param>
>+            <alias name="glCopyTexSubImage1D"/>
>+            <glx type="render" opcode="4121"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glCopyTexSubImage2D</name></proto>
>+            <param group="TextureTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>level</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>xoffset</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>yoffset</name></param>
>+            <param group="WinCoord"><ptype>GLint</ptype> <name>x</name></param>
>+            <param group="WinCoord"><ptype>GLint</ptype> <name>y</name></param>
>+            <param><ptype>GLsizei</ptype> <name>width</name></param>
>+            <param><ptype>GLsizei</ptype> <name>height</name></param>
>+            <glx type="render" opcode="4122"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glCopyTexSubImage2DEXT</name></proto>
>+            <param group="TextureTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>level</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>xoffset</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>yoffset</name></param>
>+            <param group="WinCoord"><ptype>GLint</ptype> <name>x</name></param>
>+            <param group="WinCoord"><ptype>GLint</ptype> <name>y</name></param>
>+            <param><ptype>GLsizei</ptype> <name>width</name></param>
>+            <param><ptype>GLsizei</ptype> <name>height</name></param>
>+            <alias name="glCopyTexSubImage2D"/>
>+            <glx type="render" opcode="4122"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glCopyTexSubImage3D</name></proto>
>+            <param group="TextureTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>level</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>xoffset</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>yoffset</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>zoffset</name></param>
>+            <param group="WinCoord"><ptype>GLint</ptype> <name>x</name></param>
>+            <param group="WinCoord"><ptype>GLint</ptype> <name>y</name></param>
>+            <param><ptype>GLsizei</ptype> <name>width</name></param>
>+            <param><ptype>GLsizei</ptype> <name>height</name></param>
>+            <glx type="render" opcode="4123"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glCopyTexSubImage3DEXT</name></proto>
>+            <param group="TextureTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>level</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>xoffset</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>yoffset</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>zoffset</name></param>
>+            <param group="WinCoord"><ptype>GLint</ptype> <name>x</name></param>
>+            <param group="WinCoord"><ptype>GLint</ptype> <name>y</name></param>
>+            <param><ptype>GLsizei</ptype> <name>width</name></param>
>+            <param><ptype>GLsizei</ptype> <name>height</name></param>
>+            <alias name="glCopyTexSubImage3D"/>
>+            <glx type="render" opcode="4123"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glCopyTexSubImage3DOES</name></proto>
>+            <param><ptype>GLenum</ptype> <name>target</name></param>
>+            <param><ptype>GLint</ptype> <name>level</name></param>
>+            <param><ptype>GLint</ptype> <name>xoffset</name></param>
>+            <param><ptype>GLint</ptype> <name>yoffset</name></param>
>+            <param><ptype>GLint</ptype> <name>zoffset</name></param>
>+            <param><ptype>GLint</ptype> <name>x</name></param>
>+            <param><ptype>GLint</ptype> <name>y</name></param>
>+            <param><ptype>GLsizei</ptype> <name>width</name></param>
>+            <param><ptype>GLsizei</ptype> <name>height</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glCopyTextureImage1DEXT</name></proto>
>+            <param group="Texture"><ptype>GLuint</ptype> <name>texture</name></param>
>+            <param group="TextureTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>level</name></param>
>+            <param group="InternalFormat"><ptype>GLenum</ptype> <name>internalformat</name></param>
>+            <param group="WinCoord"><ptype>GLint</ptype> <name>x</name></param>
>+            <param group="WinCoord"><ptype>GLint</ptype> <name>y</name></param>
>+            <param><ptype>GLsizei</ptype> <name>width</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>border</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glCopyTextureImage2DEXT</name></proto>
>+            <param group="Texture"><ptype>GLuint</ptype> <name>texture</name></param>
>+            <param group="TextureTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>level</name></param>
>+            <param group="InternalFormat"><ptype>GLenum</ptype> <name>internalformat</name></param>
>+            <param group="WinCoord"><ptype>GLint</ptype> <name>x</name></param>
>+            <param group="WinCoord"><ptype>GLint</ptype> <name>y</name></param>
>+            <param><ptype>GLsizei</ptype> <name>width</name></param>
>+            <param><ptype>GLsizei</ptype> <name>height</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>border</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glCopyTextureLevelsAPPLE</name></proto>
>+            <param><ptype>GLuint</ptype> <name>destinationTexture</name></param>
>+            <param><ptype>GLuint</ptype> <name>sourceTexture</name></param>
>+            <param><ptype>GLint</ptype> <name>sourceBaseLevel</name></param>
>+            <param><ptype>GLsizei</ptype> <name>sourceLevelCount</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glCopyTextureSubImage1D</name></proto>
>+            <param><ptype>GLuint</ptype> <name>texture</name></param>
>+            <param><ptype>GLint</ptype> <name>level</name></param>
>+            <param><ptype>GLint</ptype> <name>xoffset</name></param>
>+            <param><ptype>GLint</ptype> <name>x</name></param>
>+            <param><ptype>GLint</ptype> <name>y</name></param>
>+            <param><ptype>GLsizei</ptype> <name>width</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glCopyTextureSubImage1DEXT</name></proto>
>+            <param group="Texture"><ptype>GLuint</ptype> <name>texture</name></param>
>+            <param group="TextureTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>level</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>xoffset</name></param>
>+            <param group="WinCoord"><ptype>GLint</ptype> <name>x</name></param>
>+            <param group="WinCoord"><ptype>GLint</ptype> <name>y</name></param>
>+            <param><ptype>GLsizei</ptype> <name>width</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glCopyTextureSubImage2D</name></proto>
>+            <param><ptype>GLuint</ptype> <name>texture</name></param>
>+            <param><ptype>GLint</ptype> <name>level</name></param>
>+            <param><ptype>GLint</ptype> <name>xoffset</name></param>
>+            <param><ptype>GLint</ptype> <name>yoffset</name></param>
>+            <param><ptype>GLint</ptype> <name>x</name></param>
>+            <param><ptype>GLint</ptype> <name>y</name></param>
>+            <param><ptype>GLsizei</ptype> <name>width</name></param>
>+            <param><ptype>GLsizei</ptype> <name>height</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glCopyTextureSubImage2DEXT</name></proto>
>+            <param group="Texture"><ptype>GLuint</ptype> <name>texture</name></param>
>+            <param group="TextureTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>level</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>xoffset</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>yoffset</name></param>
>+            <param group="WinCoord"><ptype>GLint</ptype> <name>x</name></param>
>+            <param group="WinCoord"><ptype>GLint</ptype> <name>y</name></param>
>+            <param><ptype>GLsizei</ptype> <name>width</name></param>
>+            <param><ptype>GLsizei</ptype> <name>height</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glCopyTextureSubImage3D</name></proto>
>+            <param><ptype>GLuint</ptype> <name>texture</name></param>
>+            <param><ptype>GLint</ptype> <name>level</name></param>
>+            <param><ptype>GLint</ptype> <name>xoffset</name></param>
>+            <param><ptype>GLint</ptype> <name>yoffset</name></param>
>+            <param><ptype>GLint</ptype> <name>zoffset</name></param>
>+            <param><ptype>GLint</ptype> <name>x</name></param>
>+            <param><ptype>GLint</ptype> <name>y</name></param>
>+            <param><ptype>GLsizei</ptype> <name>width</name></param>
>+            <param><ptype>GLsizei</ptype> <name>height</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glCopyTextureSubImage3DEXT</name></proto>
>+            <param group="Texture"><ptype>GLuint</ptype> <name>texture</name></param>
>+            <param group="TextureTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>level</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>xoffset</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>yoffset</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>zoffset</name></param>
>+            <param group="WinCoord"><ptype>GLint</ptype> <name>x</name></param>
>+            <param group="WinCoord"><ptype>GLint</ptype> <name>y</name></param>
>+            <param><ptype>GLsizei</ptype> <name>width</name></param>
>+            <param><ptype>GLsizei</ptype> <name>height</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glCoverFillPathInstancedNV</name></proto>
>+            <param><ptype>GLsizei</ptype> <name>numPaths</name></param>
>+            <param group="PathElementType"><ptype>GLenum</ptype> <name>pathNameType</name></param>
>+            <param group="PathElement" len="COMPSIZE(numPaths,pathNameType,paths)">const void *<name>paths</name></param>
>+            <param group="Path"><ptype>GLuint</ptype> <name>pathBase</name></param>
>+            <param group="PathCoverMode"><ptype>GLenum</ptype> <name>coverMode</name></param>
>+            <param group="PathTransformType"><ptype>GLenum</ptype> <name>transformType</name></param>
>+            <param len="COMPSIZE(numPaths,transformType)">const <ptype>GLfloat</ptype> *<name>transformValues</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glCoverFillPathNV</name></proto>
>+            <param group="Path"><ptype>GLuint</ptype> <name>path</name></param>
>+            <param group="PathCoverMode"><ptype>GLenum</ptype> <name>coverMode</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glCoverStrokePathInstancedNV</name></proto>
>+            <param><ptype>GLsizei</ptype> <name>numPaths</name></param>
>+            <param group="PathElementType"><ptype>GLenum</ptype> <name>pathNameType</name></param>
>+            <param group="PathElement" len="COMPSIZE(numPaths,pathNameType,paths)">const void *<name>paths</name></param>
>+            <param group="Path"><ptype>GLuint</ptype> <name>pathBase</name></param>
>+            <param group="PathCoverMode"><ptype>GLenum</ptype> <name>coverMode</name></param>
>+            <param group="PathTransformType"><ptype>GLenum</ptype> <name>transformType</name></param>
>+            <param len="COMPSIZE(numPaths,transformType)">const <ptype>GLfloat</ptype> *<name>transformValues</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glCoverStrokePathNV</name></proto>
>+            <param group="Path"><ptype>GLuint</ptype> <name>path</name></param>
>+            <param group="PathCoverMode"><ptype>GLenum</ptype> <name>coverMode</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glCoverageMaskNV</name></proto>
>+            <param><ptype>GLboolean</ptype> <name>mask</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glCoverageModulationNV</name></proto>
>+            <param><ptype>GLenum</ptype> <name>components</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glCoverageModulationTableNV</name></proto>
>+            <param><ptype>GLsizei</ptype> <name>n</name></param>
>+            <param len="n">const <ptype>GLfloat</ptype> *<name>v</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glCoverageOperationNV</name></proto>
>+            <param><ptype>GLenum</ptype> <name>operation</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glCreateBuffers</name></proto>
>+            <param><ptype>GLsizei</ptype> <name>n</name></param>
>+            <param len="n"><ptype>GLuint</ptype> *<name>buffers</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glCreateCommandListsNV</name></proto>
>+            <param><ptype>GLsizei</ptype> <name>n</name></param>
>+            <param len="n"><ptype>GLuint</ptype> *<name>lists</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glCreateFramebuffers</name></proto>
>+            <param><ptype>GLsizei</ptype> <name>n</name></param>
>+            <param len="n"><ptype>GLuint</ptype> *<name>framebuffers</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glCreateMemoryObjectsEXT</name></proto>
>+            <param><ptype>GLsizei</ptype> <name>n</name></param>
>+            <param><ptype>GLuint</ptype> *<name>memoryObjects</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glCreatePerfQueryINTEL</name></proto>
>+            <param><ptype>GLuint</ptype> <name>queryId</name></param>
>+            <param><ptype>GLuint</ptype> *<name>queryHandle</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>GLuint</ptype> <name>glCreateProgram</name></proto>
>+        </command>
>+        <command>
>+            <proto group="handleARB"><ptype>GLhandleARB</ptype> <name>glCreateProgramObjectARB</name></proto>
>+            <alias name="glCreateProgram"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glCreateProgramPipelines</name></proto>
>+            <param><ptype>GLsizei</ptype> <name>n</name></param>
>+            <param len="n"><ptype>GLuint</ptype> *<name>pipelines</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glCreateQueries</name></proto>
>+            <param group="QueryTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param><ptype>GLsizei</ptype> <name>n</name></param>
>+            <param len="n"><ptype>GLuint</ptype> *<name>ids</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glCreateRenderbuffers</name></proto>
>+            <param><ptype>GLsizei</ptype> <name>n</name></param>
>+            <param len="n"><ptype>GLuint</ptype> *<name>renderbuffers</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glCreateSamplers</name></proto>
>+            <param><ptype>GLsizei</ptype> <name>n</name></param>
>+            <param len="n"><ptype>GLuint</ptype> *<name>samplers</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>GLuint</ptype> <name>glCreateShader</name></proto>
>+            <param group="ShaderType"><ptype>GLenum</ptype> <name>type</name></param>
>+        </command>
>+        <command>
>+            <proto group="handleARB"><ptype>GLhandleARB</ptype> <name>glCreateShaderObjectARB</name></proto>
>+            <param group="ShaderType"><ptype>GLenum</ptype> <name>shaderType</name></param>
>+            <alias name="glCreateShader"/>
>+        </command>
>+        <command>
>+            <proto><ptype>GLuint</ptype> <name>glCreateShaderProgramEXT</name></proto>
>+            <param group="ShaderType"><ptype>GLenum</ptype> <name>type</name></param>
>+            <param>const <ptype>GLchar</ptype> *<name>string</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>GLuint</ptype> <name>glCreateShaderProgramv</name></proto>
>+            <param group="ShaderType"><ptype>GLenum</ptype> <name>type</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param len="count">const <ptype>GLchar</ptype> *const*<name>strings</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>GLuint</ptype> <name>glCreateShaderProgramvEXT</name></proto>
>+            <param group="ShaderType"><ptype>GLenum</ptype> <name>type</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param len="count">const <ptype>GLchar</ptype> **<name>strings</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glCreateStatesNV</name></proto>
>+            <param><ptype>GLsizei</ptype> <name>n</name></param>
>+            <param len="n"><ptype>GLuint</ptype> *<name>states</name></param>
>+        </command>
>+        <command>
>+            <proto group="sync"><ptype>GLsync</ptype> <name>glCreateSyncFromCLeventARB</name></proto>
>+            <param group="cl_context"><ptype>struct _cl_context</ptype> *<name>context</name></param>
>+            <param group="cl_event"><ptype>struct _cl_event</ptype> *<name>event</name></param>
>+            <param><ptype>GLbitfield</ptype> <name>flags</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glCreateTextures</name></proto>
>+            <param group="TextureTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param><ptype>GLsizei</ptype> <name>n</name></param>
>+            <param len="n"><ptype>GLuint</ptype> *<name>textures</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glCreateTransformFeedbacks</name></proto>
>+            <param><ptype>GLsizei</ptype> <name>n</name></param>
>+            <param len="n"><ptype>GLuint</ptype> *<name>ids</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glCreateVertexArrays</name></proto>
>+            <param><ptype>GLsizei</ptype> <name>n</name></param>
>+            <param len="n"><ptype>GLuint</ptype> *<name>arrays</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glCullFace</name></proto>
>+            <param group="CullFaceMode"><ptype>GLenum</ptype> <name>mode</name></param>
>+            <glx type="render" opcode="79"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glCullParameterdvEXT</name></proto>
>+            <param group="CullParameterEXT"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="4"><ptype>GLdouble</ptype> *<name>params</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glCullParameterfvEXT</name></proto>
>+            <param group="CullParameterEXT"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="4"><ptype>GLfloat</ptype> *<name>params</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glCurrentPaletteMatrixARB</name></proto>
>+            <param><ptype>GLint</ptype> <name>index</name></param>
>+            <glx type="render" opcode="4329"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glCurrentPaletteMatrixOES</name></proto>
>+            <param><ptype>GLuint</ptype> <name>matrixpaletteindex</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glDebugMessageCallback</name></proto>
>+            <param><ptype>GLDEBUGPROC</ptype> <name>callback</name></param>
>+            <param>const void *<name>userParam</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glDebugMessageCallbackAMD</name></proto>
>+            <param><ptype>GLDEBUGPROCAMD</ptype> <name>callback</name></param>
>+            <param>void *<name>userParam</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glDebugMessageCallbackARB</name></proto>
>+            <param><ptype>GLDEBUGPROCARB</ptype> <name>callback</name></param>
>+            <param len="COMPSIZE(callback)">const void *<name>userParam</name></param>
>+            <alias name="glDebugMessageCallback"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glDebugMessageCallbackKHR</name></proto>
>+            <param><ptype>GLDEBUGPROCKHR</ptype> <name>callback</name></param>
>+            <param>const void *<name>userParam</name></param>
>+            <alias name="glDebugMessageCallback"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glDebugMessageControl</name></proto>
>+            <param group="DebugSource"><ptype>GLenum</ptype> <name>source</name></param>
>+            <param group="DebugType"><ptype>GLenum</ptype> <name>type</name></param>
>+            <param group="DebugSeverity"><ptype>GLenum</ptype> <name>severity</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param len="count">const <ptype>GLuint</ptype> *<name>ids</name></param>
>+            <param group="Boolean"><ptype>GLboolean</ptype> <name>enabled</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glDebugMessageControlARB</name></proto>
>+            <param group="DebugSource"><ptype>GLenum</ptype> <name>source</name></param>
>+            <param group="DebugType"><ptype>GLenum</ptype> <name>type</name></param>
>+            <param group="DebugSeverity"><ptype>GLenum</ptype> <name>severity</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param len="count">const <ptype>GLuint</ptype> *<name>ids</name></param>
>+            <param group="Boolean"><ptype>GLboolean</ptype> <name>enabled</name></param>
>+            <alias name="glDebugMessageControl"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glDebugMessageControlKHR</name></proto>
>+            <param group="DebugSource"><ptype>GLenum</ptype> <name>source</name></param>
>+            <param group="DebugType"><ptype>GLenum</ptype> <name>type</name></param>
>+            <param group="DebugSeverity"><ptype>GLenum</ptype> <name>severity</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param>const <ptype>GLuint</ptype> *<name>ids</name></param>
>+            <param><ptype>GLboolean</ptype> <name>enabled</name></param>
>+            <alias name="glDebugMessageControl"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glDebugMessageEnableAMD</name></proto>
>+            <param><ptype>GLenum</ptype> <name>category</name></param>
>+            <param group="DebugSeverity"><ptype>GLenum</ptype> <name>severity</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param len="count">const <ptype>GLuint</ptype> *<name>ids</name></param>
>+            <param group="Boolean"><ptype>GLboolean</ptype> <name>enabled</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glDebugMessageInsert</name></proto>
>+            <param group="DebugSource"><ptype>GLenum</ptype> <name>source</name></param>
>+            <param group="DebugType"><ptype>GLenum</ptype> <name>type</name></param>
>+            <param><ptype>GLuint</ptype> <name>id</name></param>
>+            <param group="DebugSeverity"><ptype>GLenum</ptype> <name>severity</name></param>
>+            <param><ptype>GLsizei</ptype> <name>length</name></param>
>+            <param len="COMPSIZE(buf,length)">const <ptype>GLchar</ptype> *<name>buf</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glDebugMessageInsertAMD</name></proto>
>+            <param><ptype>GLenum</ptype> <name>category</name></param>
>+            <param group="DebugSeverity"><ptype>GLenum</ptype> <name>severity</name></param>
>+            <param><ptype>GLuint</ptype> <name>id</name></param>
>+            <param><ptype>GLsizei</ptype> <name>length</name></param>
>+            <param len="length">const <ptype>GLchar</ptype> *<name>buf</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glDebugMessageInsertARB</name></proto>
>+            <param group="DebugSource"><ptype>GLenum</ptype> <name>source</name></param>
>+            <param group="DebugType"><ptype>GLenum</ptype> <name>type</name></param>
>+            <param><ptype>GLuint</ptype> <name>id</name></param>
>+            <param group="DebugSeverity"><ptype>GLenum</ptype> <name>severity</name></param>
>+            <param><ptype>GLsizei</ptype> <name>length</name></param>
>+            <param len="length">const <ptype>GLchar</ptype> *<name>buf</name></param>
>+            <alias name="glDebugMessageInsert"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glDebugMessageInsertKHR</name></proto>
>+            <param group="DebugSource"><ptype>GLenum</ptype> <name>source</name></param>
>+            <param group="DebugType"><ptype>GLenum</ptype> <name>type</name></param>
>+            <param><ptype>GLuint</ptype> <name>id</name></param>
>+            <param group="DebugSeverity"><ptype>GLenum</ptype> <name>severity</name></param>
>+            <param><ptype>GLsizei</ptype> <name>length</name></param>
>+            <param>const <ptype>GLchar</ptype> *<name>buf</name></param>
>+            <alias name="glDebugMessageInsert"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glDeformSGIX</name></proto>
>+            <param group="FfdMaskSGIX"><ptype>GLbitfield</ptype> <name>mask</name></param>
>+            <glx type="render" opcode="2075"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glDeformationMap3dSGIX</name></proto>
>+            <param group="FfdTargetSGIX"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="CoordD"><ptype>GLdouble</ptype> <name>u1</name></param>
>+            <param group="CoordD"><ptype>GLdouble</ptype> <name>u2</name></param>
>+            <param><ptype>GLint</ptype> <name>ustride</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>uorder</name></param>
>+            <param group="CoordD"><ptype>GLdouble</ptype> <name>v1</name></param>
>+            <param group="CoordD"><ptype>GLdouble</ptype> <name>v2</name></param>
>+            <param><ptype>GLint</ptype> <name>vstride</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>vorder</name></param>
>+            <param group="CoordD"><ptype>GLdouble</ptype> <name>w1</name></param>
>+            <param group="CoordD"><ptype>GLdouble</ptype> <name>w2</name></param>
>+            <param><ptype>GLint</ptype> <name>wstride</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>worder</name></param>
>+            <param group="CoordD" len="COMPSIZE(target,ustride,uorder,vstride,vorder,wstride,worder)">const <ptype>GLdouble</ptype> *<name>points</name></param>
>+            <glx type="render" opcode="2073"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glDeformationMap3fSGIX</name></proto>
>+            <param group="FfdTargetSGIX"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="CoordF"><ptype>GLfloat</ptype> <name>u1</name></param>
>+            <param group="CoordF"><ptype>GLfloat</ptype> <name>u2</name></param>
>+            <param><ptype>GLint</ptype> <name>ustride</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>uorder</name></param>
>+            <param group="CoordF"><ptype>GLfloat</ptype> <name>v1</name></param>
>+            <param group="CoordF"><ptype>GLfloat</ptype> <name>v2</name></param>
>+            <param><ptype>GLint</ptype> <name>vstride</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>vorder</name></param>
>+            <param group="CoordF"><ptype>GLfloat</ptype> <name>w1</name></param>
>+            <param group="CoordF"><ptype>GLfloat</ptype> <name>w2</name></param>
>+            <param><ptype>GLint</ptype> <name>wstride</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>worder</name></param>
>+            <param group="CoordF" len="COMPSIZE(target,ustride,uorder,vstride,vorder,wstride,worder)">const <ptype>GLfloat</ptype> *<name>points</name></param>
>+            <glx type="render" opcode="2074"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glDeleteAsyncMarkersSGIX</name></proto>
>+            <param><ptype>GLuint</ptype> <name>marker</name></param>
>+            <param><ptype>GLsizei</ptype> <name>range</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glDeleteBuffers</name></proto>
>+            <param><ptype>GLsizei</ptype> <name>n</name></param>
>+            <param len="n">const <ptype>GLuint</ptype> *<name>buffers</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glDeleteBuffersARB</name></proto>
>+            <param><ptype>GLsizei</ptype> <name>n</name></param>
>+            <param len="n">const <ptype>GLuint</ptype> *<name>buffers</name></param>
>+            <alias name="glDeleteBuffers"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glDeleteCommandListsNV</name></proto>
>+            <param><ptype>GLsizei</ptype> <name>n</name></param>
>+            <param len="n">const <ptype>GLuint</ptype> *<name>lists</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glDeleteFencesAPPLE</name></proto>
>+            <param><ptype>GLsizei</ptype> <name>n</name></param>
>+            <param group="FenceNV" len="n">const <ptype>GLuint</ptype> *<name>fences</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glDeleteFencesNV</name></proto>
>+            <param><ptype>GLsizei</ptype> <name>n</name></param>
>+            <param group="FenceNV" len="n">const <ptype>GLuint</ptype> *<name>fences</name></param>
>+            <glx type="vendor" opcode="1276"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glDeleteFragmentShaderATI</name></proto>
>+            <param><ptype>GLuint</ptype> <name>id</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glDeleteFramebuffers</name></proto>
>+            <param><ptype>GLsizei</ptype> <name>n</name></param>
>+            <param len="n">const <ptype>GLuint</ptype> *<name>framebuffers</name></param>
>+            <glx type="render" opcode="4320"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glDeleteFramebuffersEXT</name></proto>
>+            <param><ptype>GLsizei</ptype> <name>n</name></param>
>+            <param len="n">const <ptype>GLuint</ptype> *<name>framebuffers</name></param>
>+            <alias name="glDeleteFramebuffers"/>
>+            <glx type="render" opcode="4320"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glDeleteFramebuffersOES</name></proto>
>+            <param><ptype>GLsizei</ptype> <name>n</name></param>
>+            <param len="n">const <ptype>GLuint</ptype> *<name>framebuffers</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glDeleteLists</name></proto>
>+            <param group="List"><ptype>GLuint</ptype> <name>list</name></param>
>+            <param><ptype>GLsizei</ptype> <name>range</name></param>
>+            <glx type="single" opcode="103"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glDeleteMemoryObjectsEXT</name></proto>
>+            <param><ptype>GLsizei</ptype> <name>n</name></param>
>+            <param len="n">const <ptype>GLuint</ptype> *<name>memoryObjects</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glDeleteNamedStringARB</name></proto>
>+            <param><ptype>GLint</ptype> <name>namelen</name></param>
>+            <param len="namelen">const <ptype>GLchar</ptype> *<name>name</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glDeleteNamesAMD</name></proto>
>+            <param><ptype>GLenum</ptype> <name>identifier</name></param>
>+            <param><ptype>GLuint</ptype> <name>num</name></param>
>+            <param len="num">const <ptype>GLuint</ptype> *<name>names</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glDeleteObjectARB</name></proto>
>+            <param group="handleARB"><ptype>GLhandleARB</ptype> <name>obj</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glDeleteOcclusionQueriesNV</name></proto>
>+            <param><ptype>GLsizei</ptype> <name>n</name></param>
>+            <param len="n">const <ptype>GLuint</ptype> *<name>ids</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glDeletePathsNV</name></proto>
>+            <param group="Path"><ptype>GLuint</ptype> <name>path</name></param>
>+            <param><ptype>GLsizei</ptype> <name>range</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glDeletePerfMonitorsAMD</name></proto>
>+            <param><ptype>GLsizei</ptype> <name>n</name></param>
>+            <param len="n"><ptype>GLuint</ptype> *<name>monitors</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glDeletePerfQueryINTEL</name></proto>
>+            <param><ptype>GLuint</ptype> <name>queryHandle</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glDeleteProgram</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <glx type="single" opcode="202"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glDeleteProgramPipelines</name></proto>
>+            <param><ptype>GLsizei</ptype> <name>n</name></param>
>+            <param len="n">const <ptype>GLuint</ptype> *<name>pipelines</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glDeleteProgramPipelinesEXT</name></proto>
>+            <param><ptype>GLsizei</ptype> <name>n</name></param>
>+            <param len="n">const <ptype>GLuint</ptype> *<name>pipelines</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glDeleteProgramsARB</name></proto>
>+            <param><ptype>GLsizei</ptype> <name>n</name></param>
>+            <param len="n">const <ptype>GLuint</ptype> *<name>programs</name></param>
>+            <glx type="vendor" opcode="1294"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glDeleteProgramsNV</name></proto>
>+            <param><ptype>GLsizei</ptype> <name>n</name></param>
>+            <param len="n">const <ptype>GLuint</ptype> *<name>programs</name></param>
>+            <alias name="glDeleteProgramsARB"/>
>+            <glx type="vendor" opcode="1294"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glDeleteQueries</name></proto>
>+            <param><ptype>GLsizei</ptype> <name>n</name></param>
>+            <param len="n">const <ptype>GLuint</ptype> *<name>ids</name></param>
>+            <glx type="single" opcode="161"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glDeleteQueriesARB</name></proto>
>+            <param><ptype>GLsizei</ptype> <name>n</name></param>
>+            <param len="n">const <ptype>GLuint</ptype> *<name>ids</name></param>
>+            <alias name="glDeleteQueries"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glDeleteQueriesEXT</name></proto>
>+            <param><ptype>GLsizei</ptype> <name>n</name></param>
>+            <param len="n">const <ptype>GLuint</ptype> *<name>ids</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glDeleteQueryResourceTagNV</name></proto>
>+            <param><ptype>GLsizei</ptype> <name>n</name></param>
>+            <param len="n">const <ptype>GLint</ptype> *<name>tagIds</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glDeleteRenderbuffers</name></proto>
>+            <param><ptype>GLsizei</ptype> <name>n</name></param>
>+            <param len="n">const <ptype>GLuint</ptype> *<name>renderbuffers</name></param>
>+            <glx type="render" opcode="4317"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glDeleteRenderbuffersEXT</name></proto>
>+            <param><ptype>GLsizei</ptype> <name>n</name></param>
>+            <param len="n">const <ptype>GLuint</ptype> *<name>renderbuffers</name></param>
>+            <alias name="glDeleteRenderbuffers"/>
>+            <glx type="render" opcode="4317"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glDeleteRenderbuffersOES</name></proto>
>+            <param><ptype>GLsizei</ptype> <name>n</name></param>
>+            <param len="n">const <ptype>GLuint</ptype> *<name>renderbuffers</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glDeleteSamplers</name></proto>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param len="count">const <ptype>GLuint</ptype> *<name>samplers</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glDeleteSemaphoresEXT</name></proto>
>+            <param><ptype>GLsizei</ptype> <name>n</name></param>
>+            <param len="n">const <ptype>GLuint</ptype> *<name>semaphores</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glDeleteShader</name></proto>
>+            <param><ptype>GLuint</ptype> <name>shader</name></param>
>+            <glx type="single" opcode="195"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glDeleteStatesNV</name></proto>
>+            <param><ptype>GLsizei</ptype> <name>n</name></param>
>+            <param len="n">const <ptype>GLuint</ptype> *<name>states</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glDeleteSync</name></proto>
>+            <param group="sync"><ptype>GLsync</ptype> <name>sync</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glDeleteSyncAPPLE</name></proto>
>+            <param><ptype>GLsync</ptype> <name>sync</name></param>
>+            <alias name="glDeleteSync"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glDeleteTextures</name></proto>
>+            <param><ptype>GLsizei</ptype> <name>n</name></param>
>+            <param group="Texture" len="n">const <ptype>GLuint</ptype> *<name>textures</name></param>
>+            <glx type="single" opcode="144"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glDeleteTexturesEXT</name></proto>
>+            <param><ptype>GLsizei</ptype> <name>n</name></param>
>+            <param group="Texture" len="n">const <ptype>GLuint</ptype> *<name>textures</name></param>
>+            <glx type="vendor" opcode="12"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glDeleteTransformFeedbacks</name></proto>
>+            <param><ptype>GLsizei</ptype> <name>n</name></param>
>+            <param len="n">const <ptype>GLuint</ptype> *<name>ids</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glDeleteTransformFeedbacksNV</name></proto>
>+            <param><ptype>GLsizei</ptype> <name>n</name></param>
>+            <param len="n">const <ptype>GLuint</ptype> *<name>ids</name></param>
>+            <alias name="glDeleteTransformFeedbacks"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glDeleteVertexArrays</name></proto>
>+            <param><ptype>GLsizei</ptype> <name>n</name></param>
>+            <param len="n">const <ptype>GLuint</ptype> *<name>arrays</name></param>
>+            <glx type="render" opcode="351"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glDeleteVertexArraysAPPLE</name></proto>
>+            <param><ptype>GLsizei</ptype> <name>n</name></param>
>+            <param len="n">const <ptype>GLuint</ptype> *<name>arrays</name></param>
>+            <alias name="glDeleteVertexArrays"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glDeleteVertexArraysOES</name></proto>
>+            <param><ptype>GLsizei</ptype> <name>n</name></param>
>+            <param len="n">const <ptype>GLuint</ptype> *<name>arrays</name></param>
>+            <alias name="glDeleteVertexArrays"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glDeleteVertexShaderEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>id</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glDepthBoundsEXT</name></proto>
>+            <param group="ClampedFloat64"><ptype>GLclampd</ptype> <name>zmin</name></param>
>+            <param group="ClampedFloat64"><ptype>GLclampd</ptype> <name>zmax</name></param>
>+            <glx type="render" opcode="4229"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glDepthBoundsdNV</name></proto>
>+            <param><ptype>GLdouble</ptype> <name>zmin</name></param>
>+            <param><ptype>GLdouble</ptype> <name>zmax</name></param>
>+            <glx type="render" opcode="4285"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glDepthFunc</name></proto>
>+            <param group="DepthFunction"><ptype>GLenum</ptype> <name>func</name></param>
>+            <glx type="render" opcode="164"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glDepthMask</name></proto>
>+            <param group="Boolean"><ptype>GLboolean</ptype> <name>flag</name></param>
>+            <glx type="render" opcode="135"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glDepthRange</name></proto>
>+            <param><ptype>GLdouble</ptype> <name>n</name></param>
>+            <param><ptype>GLdouble</ptype> <name>f</name></param>
>+            <glx type="render" opcode="174"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glDepthRangeArrayfvNV</name></proto>
>+            <param><ptype>GLuint</ptype> <name>first</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param>const <ptype>GLfloat</ptype> *<name>v</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glDepthRangeArrayfvOES</name></proto>
>+            <param><ptype>GLuint</ptype> <name>first</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param>const <ptype>GLfloat</ptype> *<name>v</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glDepthRangeArrayv</name></proto>
>+            <param><ptype>GLuint</ptype> <name>first</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param len="COMPSIZE(count)">const <ptype>GLdouble</ptype> *<name>v</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glDepthRangeIndexed</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param><ptype>GLdouble</ptype> <name>n</name></param>
>+            <param><ptype>GLdouble</ptype> <name>f</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glDepthRangeIndexedfNV</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param><ptype>GLfloat</ptype> <name>n</name></param>
>+            <param><ptype>GLfloat</ptype> <name>f</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glDepthRangeIndexedfOES</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param><ptype>GLfloat</ptype> <name>n</name></param>
>+            <param><ptype>GLfloat</ptype> <name>f</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glDepthRangedNV</name></proto>
>+            <param><ptype>GLdouble</ptype> <name>zNear</name></param>
>+            <param><ptype>GLdouble</ptype> <name>zFar</name></param>
>+            <glx type="render" opcode="4283"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glDepthRangef</name></proto>
>+            <param><ptype>GLfloat</ptype> <name>n</name></param>
>+            <param><ptype>GLfloat</ptype> <name>f</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glDepthRangefOES</name></proto>
>+            <param group="ClampedFloat32"><ptype>GLclampf</ptype> <name>n</name></param>
>+            <param group="ClampedFloat32"><ptype>GLclampf</ptype> <name>f</name></param>
>+            <glx type="render" opcode="4309"/>
>+            <alias name="glDepthRangef"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glDepthRangex</name></proto>
>+            <param><ptype>GLfixed</ptype> <name>n</name></param>
>+            <param><ptype>GLfixed</ptype> <name>f</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glDepthRangexOES</name></proto>
>+            <param group="ClampedFixed"><ptype>GLfixed</ptype> <name>n</name></param>
>+            <param group="ClampedFixed"><ptype>GLfixed</ptype> <name>f</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glDetachObjectARB</name></proto>
>+            <param group="handleARB"><ptype>GLhandleARB</ptype> <name>containerObj</name></param>
>+            <param group="handleARB"><ptype>GLhandleARB</ptype> <name>attachedObj</name></param>
>+            <alias name="glDetachShader"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glDetachShader</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param><ptype>GLuint</ptype> <name>shader</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glDetailTexFuncSGIS</name></proto>
>+            <param group="TextureTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param><ptype>GLsizei</ptype> <name>n</name></param>
>+            <param len="n*2">const <ptype>GLfloat</ptype> *<name>points</name></param>
>+            <glx type="render" opcode="2051"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glDisable</name></proto>
>+            <param group="EnableCap"><ptype>GLenum</ptype> <name>cap</name></param>
>+            <glx type="render" opcode="138"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glDisableClientState</name></proto>
>+            <param group="EnableCap"><ptype>GLenum</ptype> <name>array</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glDisableClientStateIndexedEXT</name></proto>
>+            <param group="EnableCap"><ptype>GLenum</ptype> <name>array</name></param>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glDisableClientStateiEXT</name></proto>
>+            <param group="EnableCap"><ptype>GLenum</ptype> <name>array</name></param>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glDisableDriverControlQCOM</name></proto>
>+            <param><ptype>GLuint</ptype> <name>driverControl</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glDisableIndexedEXT</name></proto>
>+            <param group="EnableCap"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <alias name="glDisablei"/>
>+            <glx type="render" opcode="354"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glDisableVariantClientStateEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>id</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glDisableVertexArrayAttrib</name></proto>
>+            <param><ptype>GLuint</ptype> <name>vaobj</name></param>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glDisableVertexArrayAttribEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>vaobj</name></param>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glDisableVertexArrayEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>vaobj</name></param>
>+            <param group="EnableCap"><ptype>GLenum</ptype> <name>array</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glDisableVertexAttribAPPLE</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param><ptype>GLenum</ptype> <name>pname</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glDisableVertexAttribArray</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glDisableVertexAttribArrayARB</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <alias name="glDisableVertexAttribArray"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glDisablei</name></proto>
>+            <param group="EnableCap"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glDisableiEXT</name></proto>
>+            <param group="EnableCap"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <alias name="glDisablei"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glDisableiNV</name></proto>
>+            <param group="EnableCap"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <alias name="glDisablei"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glDisableiOES</name></proto>
>+            <param group="EnableCap"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <alias name="glDisablei"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glDiscardFramebufferEXT</name></proto>
>+            <param><ptype>GLenum</ptype> <name>target</name></param>
>+            <param><ptype>GLsizei</ptype> <name>numAttachments</name></param>
>+            <param len="numAttachments">const <ptype>GLenum</ptype> *<name>attachments</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glDispatchCompute</name></proto>
>+            <param><ptype>GLuint</ptype> <name>num_groups_x</name></param>
>+            <param><ptype>GLuint</ptype> <name>num_groups_y</name></param>
>+            <param><ptype>GLuint</ptype> <name>num_groups_z</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glDispatchComputeGroupSizeARB</name></proto>
>+            <param><ptype>GLuint</ptype> <name>num_groups_x</name></param>
>+            <param><ptype>GLuint</ptype> <name>num_groups_y</name></param>
>+            <param><ptype>GLuint</ptype> <name>num_groups_z</name></param>
>+            <param><ptype>GLuint</ptype> <name>group_size_x</name></param>
>+            <param><ptype>GLuint</ptype> <name>group_size_y</name></param>
>+            <param><ptype>GLuint</ptype> <name>group_size_z</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glDispatchComputeIndirect</name></proto>
>+            <param group="BufferOffset"><ptype>GLintptr</ptype> <name>indirect</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glDrawArrays</name></proto>
>+            <param group="PrimitiveType"><ptype>GLenum</ptype> <name>mode</name></param>
>+            <param><ptype>GLint</ptype> <name>first</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <glx type="render" opcode="193"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glDrawArraysEXT</name></proto>
>+            <param group="PrimitiveType"><ptype>GLenum</ptype> <name>mode</name></param>
>+            <param><ptype>GLint</ptype> <name>first</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <alias name="glDrawArrays"/>
>+            <glx type="render" opcode="4116"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glDrawArraysIndirect</name></proto>
>+            <param group="PrimitiveType"><ptype>GLenum</ptype> <name>mode</name></param>
>+            <param>const void *<name>indirect</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glDrawArraysInstanced</name></proto>
>+            <param group="PrimitiveType"><ptype>GLenum</ptype> <name>mode</name></param>
>+            <param><ptype>GLint</ptype> <name>first</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param><ptype>GLsizei</ptype> <name>instancecount</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glDrawArraysInstancedANGLE</name></proto>
>+            <param group="PrimitiveType"><ptype>GLenum</ptype> <name>mode</name></param>
>+            <param><ptype>GLint</ptype> <name>first</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param><ptype>GLsizei</ptype> <name>primcount</name></param>
>+            <alias name="glDrawArraysInstanced"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glDrawArraysInstancedARB</name></proto>
>+            <param group="PrimitiveType"><ptype>GLenum</ptype> <name>mode</name></param>
>+            <param><ptype>GLint</ptype> <name>first</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param><ptype>GLsizei</ptype> <name>primcount</name></param>
>+            <alias name="glDrawArraysInstanced"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glDrawArraysInstancedBaseInstance</name></proto>
>+            <param group="PrimitiveType"><ptype>GLenum</ptype> <name>mode</name></param>
>+            <param><ptype>GLint</ptype> <name>first</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param><ptype>GLsizei</ptype> <name>instancecount</name></param>
>+            <param><ptype>GLuint</ptype> <name>baseinstance</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glDrawArraysInstancedBaseInstanceEXT</name></proto>
>+            <param group="PrimitiveType"><ptype>GLenum</ptype> <name>mode</name></param>
>+            <param><ptype>GLint</ptype> <name>first</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param><ptype>GLsizei</ptype> <name>instancecount</name></param>
>+            <param><ptype>GLuint</ptype> <name>baseinstance</name></param>
>+            <alias name="glDrawArraysInstancedBaseInstance"/>
>+        </command>
>+        <command comment="primcount should be renamed to instanceCount for OpenGL ES">
>+            <proto>void <name>glDrawArraysInstancedEXT</name></proto>
>+            <param group="PrimitiveType"><ptype>GLenum</ptype> <name>mode</name></param>
>+            <param><ptype>GLint</ptype> <name>start</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param><ptype>GLsizei</ptype> <name>primcount</name></param>
>+            <alias name="glDrawArraysInstanced"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glDrawArraysInstancedNV</name></proto>
>+            <param group="PrimitiveType"><ptype>GLenum</ptype> <name>mode</name></param>
>+            <param><ptype>GLint</ptype> <name>first</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param><ptype>GLsizei</ptype> <name>primcount</name></param>
>+            <alias name="glDrawArraysInstanced"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glDrawBuffer</name></proto>
>+            <param group="DrawBufferMode"><ptype>GLenum</ptype> <name>buf</name></param>
>+            <glx type="render" opcode="126"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glDrawBuffers</name></proto>
>+            <param><ptype>GLsizei</ptype> <name>n</name></param>
>+            <param group="DrawBufferModeATI" len="n">const <ptype>GLenum</ptype> *<name>bufs</name></param>
>+            <glx type="render" opcode="233"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glDrawBuffersARB</name></proto>
>+            <param><ptype>GLsizei</ptype> <name>n</name></param>
>+            <param group="DrawBufferModeATI" len="n">const <ptype>GLenum</ptype> *<name>bufs</name></param>
>+            <alias name="glDrawBuffers"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glDrawBuffersATI</name></proto>
>+            <param><ptype>GLsizei</ptype> <name>n</name></param>
>+            <param group="DrawBufferModeATI" len="n">const <ptype>GLenum</ptype> *<name>bufs</name></param>
>+            <alias name="glDrawBuffers"/>
>+            <glx type="render" opcode="233"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glDrawBuffersEXT</name></proto>
>+            <param><ptype>GLsizei</ptype> <name>n</name></param>
>+            <param len="n">const <ptype>GLenum</ptype> *<name>bufs</name></param>
>+            <alias name="glDrawBuffers"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glDrawBuffersIndexedEXT</name></proto>
>+            <param><ptype>GLint</ptype> <name>n</name></param>
>+            <param len="n">const <ptype>GLenum</ptype> *<name>location</name></param>
>+            <param len="n">const <ptype>GLint</ptype> *<name>indices</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glDrawBuffersNV</name></proto>
>+            <param><ptype>GLsizei</ptype> <name>n</name></param>
>+            <param len="n">const <ptype>GLenum</ptype> *<name>bufs</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glDrawCommandsAddressNV</name></proto>
>+            <param><ptype>GLenum</ptype> <name>primitiveMode</name></param>
>+            <param>const <ptype>GLuint64</ptype> *<name>indirects</name></param>
>+            <param>const <ptype>GLsizei</ptype> *<name>sizes</name></param>
>+            <param><ptype>GLuint</ptype> <name>count</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glDrawCommandsNV</name></proto>
>+            <param><ptype>GLenum</ptype> <name>primitiveMode</name></param>
>+            <param><ptype>GLuint</ptype> <name>buffer</name></param>
>+            <param>const <ptype>GLintptr</ptype> *<name>indirects</name></param>
>+            <param>const <ptype>GLsizei</ptype> *<name>sizes</name></param>
>+            <param><ptype>GLuint</ptype> <name>count</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glDrawCommandsStatesAddressNV</name></proto>
>+            <param>const <ptype>GLuint64</ptype> *<name>indirects</name></param>
>+            <param>const <ptype>GLsizei</ptype> *<name>sizes</name></param>
>+            <param>const <ptype>GLuint</ptype> *<name>states</name></param>
>+            <param>const <ptype>GLuint</ptype> *<name>fbos</name></param>
>+            <param><ptype>GLuint</ptype> <name>count</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glDrawCommandsStatesNV</name></proto>
>+            <param><ptype>GLuint</ptype> <name>buffer</name></param>
>+            <param>const <ptype>GLintptr</ptype> *<name>indirects</name></param>
>+            <param>const <ptype>GLsizei</ptype> *<name>sizes</name></param>
>+            <param>const <ptype>GLuint</ptype> *<name>states</name></param>
>+            <param>const <ptype>GLuint</ptype> *<name>fbos</name></param>
>+            <param><ptype>GLuint</ptype> <name>count</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glDrawElementArrayAPPLE</name></proto>
>+            <param group="PrimitiveType"><ptype>GLenum</ptype> <name>mode</name></param>
>+            <param><ptype>GLint</ptype> <name>first</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glDrawElementArrayATI</name></proto>
>+            <param group="PrimitiveType"><ptype>GLenum</ptype> <name>mode</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glDrawElements</name></proto>
>+            <param group="PrimitiveType"><ptype>GLenum</ptype> <name>mode</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param group="DrawElementsType"><ptype>GLenum</ptype> <name>type</name></param>
>+            <param len="COMPSIZE(count,type)">const void *<name>indices</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glDrawElementsBaseVertex</name></proto>
>+            <param group="PrimitiveType"><ptype>GLenum</ptype> <name>mode</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param group="DrawElementsType"><ptype>GLenum</ptype> <name>type</name></param>
>+            <param len="COMPSIZE(count,type)">const void *<name>indices</name></param>
>+            <param><ptype>GLint</ptype> <name>basevertex</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glDrawElementsBaseVertexEXT</name></proto>
>+            <param group="PrimitiveType"><ptype>GLenum</ptype> <name>mode</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param group="DrawElementsType"><ptype>GLenum</ptype> <name>type</name></param>
>+            <param len="COMPSIZE(count,type)">const void *<name>indices</name></param>
>+            <param><ptype>GLint</ptype> <name>basevertex</name></param>
>+            <alias name="glDrawElementsBaseVertex"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glDrawElementsBaseVertexOES</name></proto>
>+            <param group="PrimitiveType"><ptype>GLenum</ptype> <name>mode</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param group="DrawElementsType"><ptype>GLenum</ptype> <name>type</name></param>
>+            <param len="COMPSIZE(count,type)">const void *<name>indices</name></param>
>+            <param><ptype>GLint</ptype> <name>basevertex</name></param>
>+            <alias name="glDrawElementsBaseVertex"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glDrawElementsIndirect</name></proto>
>+            <param group="PrimitiveType"><ptype>GLenum</ptype> <name>mode</name></param>
>+            <param group="DrawElementsType"><ptype>GLenum</ptype> <name>type</name></param>
>+            <param>const void *<name>indirect</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glDrawElementsInstanced</name></proto>
>+            <param group="PrimitiveType"><ptype>GLenum</ptype> <name>mode</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param group="DrawElementsType"><ptype>GLenum</ptype> <name>type</name></param>
>+            <param len="COMPSIZE(count,type)">const void *<name>indices</name></param>
>+            <param><ptype>GLsizei</ptype> <name>instancecount</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glDrawElementsInstancedANGLE</name></proto>
>+            <param group="PrimitiveType"><ptype>GLenum</ptype> <name>mode</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param group="PrimitiveType"><ptype>GLenum</ptype> <name>type</name></param>
>+            <param len="COMPSIZE(count,type)">const void *<name>indices</name></param>
>+            <param><ptype>GLsizei</ptype> <name>primcount</name></param>
>+            <alias name="glDrawElementsInstanced"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glDrawElementsInstancedARB</name></proto>
>+            <param group="PrimitiveType"><ptype>GLenum</ptype> <name>mode</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param group="DrawElementsType"><ptype>GLenum</ptype> <name>type</name></param>
>+            <param len="COMPSIZE(count,type)">const void *<name>indices</name></param>
>+            <param><ptype>GLsizei</ptype> <name>primcount</name></param>
>+            <alias name="glDrawElementsInstanced"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glDrawElementsInstancedBaseInstance</name></proto>
>+            <param group="PrimitiveType"><ptype>GLenum</ptype> <name>mode</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param group="PrimitiveType"><ptype>GLenum</ptype> <name>type</name></param>
>+            <param len="count">const void *<name>indices</name></param>
>+            <param><ptype>GLsizei</ptype> <name>instancecount</name></param>
>+            <param><ptype>GLuint</ptype> <name>baseinstance</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glDrawElementsInstancedBaseInstanceEXT</name></proto>
>+            <param group="PrimitiveType"><ptype>GLenum</ptype> <name>mode</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param group="PrimitiveType"><ptype>GLenum</ptype> <name>type</name></param>
>+            <param len="count">const void *<name>indices</name></param>
>+            <param><ptype>GLsizei</ptype> <name>instancecount</name></param>
>+            <param><ptype>GLuint</ptype> <name>baseinstance</name></param>
>+            <alias name="glDrawElementsInstancedBaseInstance"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glDrawElementsInstancedBaseVertex</name></proto>
>+            <param group="PrimitiveType"><ptype>GLenum</ptype> <name>mode</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param group="DrawElementsType"><ptype>GLenum</ptype> <name>type</name></param>
>+            <param len="COMPSIZE(count,type)">const void *<name>indices</name></param>
>+            <param><ptype>GLsizei</ptype> <name>instancecount</name></param>
>+            <param><ptype>GLint</ptype> <name>basevertex</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glDrawElementsInstancedBaseVertexBaseInstance</name></proto>
>+            <param group="PrimitiveType"><ptype>GLenum</ptype> <name>mode</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param group="PrimitiveType"><ptype>GLenum</ptype> <name>type</name></param>
>+            <param len="count">const void *<name>indices</name></param>
>+            <param><ptype>GLsizei</ptype> <name>instancecount</name></param>
>+            <param><ptype>GLint</ptype> <name>basevertex</name></param>
>+            <param><ptype>GLuint</ptype> <name>baseinstance</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glDrawElementsInstancedBaseVertexBaseInstanceEXT</name></proto>
>+            <param group="PrimitiveType"><ptype>GLenum</ptype> <name>mode</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param group="PrimitiveType"><ptype>GLenum</ptype> <name>type</name></param>
>+            <param len="count">const void *<name>indices</name></param>
>+            <param><ptype>GLsizei</ptype> <name>instancecount</name></param>
>+            <param><ptype>GLint</ptype> <name>basevertex</name></param>
>+            <param><ptype>GLuint</ptype> <name>baseinstance</name></param>
>+            <alias name="glDrawElementsInstancedBaseVertexBaseInstance"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glDrawElementsInstancedBaseVertexEXT</name></proto>
>+            <param group="PrimitiveType"><ptype>GLenum</ptype> <name>mode</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param group="DrawElementsType"><ptype>GLenum</ptype> <name>type</name></param>
>+            <param len="COMPSIZE(count,type)">const void *<name>indices</name></param>
>+            <param><ptype>GLsizei</ptype> <name>instancecount</name></param>
>+            <param><ptype>GLint</ptype> <name>basevertex</name></param>
>+            <alias name="glDrawElementsInstancedBaseVertex"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glDrawElementsInstancedBaseVertexOES</name></proto>
>+            <param group="PrimitiveType"><ptype>GLenum</ptype> <name>mode</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param group="DrawElementsType"><ptype>GLenum</ptype> <name>type</name></param>
>+            <param len="COMPSIZE(count,type)">const void *<name>indices</name></param>
>+            <param><ptype>GLsizei</ptype> <name>instancecount</name></param>
>+            <param><ptype>GLint</ptype> <name>basevertex</name></param>
>+            <alias name="glDrawElementsInstancedBaseVertex"/>
>+        </command>
>+        <command comment="primcount should be renamed to instanceCount for OpenGL ES">
>+            <proto>void <name>glDrawElementsInstancedEXT</name></proto>
>+            <param group="PrimitiveType"><ptype>GLenum</ptype> <name>mode</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param group="DrawElementsType"><ptype>GLenum</ptype> <name>type</name></param>
>+            <param len="COMPSIZE(count,type)">const void *<name>indices</name></param>
>+            <param><ptype>GLsizei</ptype> <name>primcount</name></param>
>+            <alias name="glDrawElementsInstanced"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glDrawElementsInstancedNV</name></proto>
>+            <param group="PrimitiveType"><ptype>GLenum</ptype> <name>mode</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param group="PrimitiveType"><ptype>GLenum</ptype> <name>type</name></param>
>+            <param len="COMPSIZE(count,type)">const void *<name>indices</name></param>
>+            <param><ptype>GLsizei</ptype> <name>primcount</name></param>
>+            <alias name="glDrawElementsInstanced"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glDrawMeshArraysSUN</name></proto>
>+            <param group="PrimitiveType"><ptype>GLenum</ptype> <name>mode</name></param>
>+            <param><ptype>GLint</ptype> <name>first</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param><ptype>GLsizei</ptype> <name>width</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glDrawPixels</name></proto>
>+            <param><ptype>GLsizei</ptype> <name>width</name></param>
>+            <param><ptype>GLsizei</ptype> <name>height</name></param>
>+            <param group="PixelFormat"><ptype>GLenum</ptype> <name>format</name></param>
>+            <param group="PixelType"><ptype>GLenum</ptype> <name>type</name></param>
>+            <param len="COMPSIZE(format,type,width,height)">const void *<name>pixels</name></param>
>+            <glx type="render" opcode="173"/>
>+            <glx type="render" opcode="322" name="glDrawPixelsPBO" comment="PBO protocol"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glDrawRangeElementArrayAPPLE</name></proto>
>+            <param group="PrimitiveType"><ptype>GLenum</ptype> <name>mode</name></param>
>+            <param><ptype>GLuint</ptype> <name>start</name></param>
>+            <param><ptype>GLuint</ptype> <name>end</name></param>
>+            <param><ptype>GLint</ptype> <name>first</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glDrawRangeElementArrayATI</name></proto>
>+            <param group="PrimitiveType"><ptype>GLenum</ptype> <name>mode</name></param>
>+            <param><ptype>GLuint</ptype> <name>start</name></param>
>+            <param><ptype>GLuint</ptype> <name>end</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glDrawRangeElements</name></proto>
>+            <param group="PrimitiveType"><ptype>GLenum</ptype> <name>mode</name></param>
>+            <param><ptype>GLuint</ptype> <name>start</name></param>
>+            <param><ptype>GLuint</ptype> <name>end</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param group="DrawElementsType"><ptype>GLenum</ptype> <name>type</name></param>
>+            <param len="COMPSIZE(count,type)">const void *<name>indices</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glDrawRangeElementsBaseVertex</name></proto>
>+            <param group="PrimitiveType"><ptype>GLenum</ptype> <name>mode</name></param>
>+            <param><ptype>GLuint</ptype> <name>start</name></param>
>+            <param><ptype>GLuint</ptype> <name>end</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param group="DrawElementsType"><ptype>GLenum</ptype> <name>type</name></param>
>+            <param len="COMPSIZE(count,type)">const void *<name>indices</name></param>
>+            <param><ptype>GLint</ptype> <name>basevertex</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glDrawRangeElementsBaseVertexEXT</name></proto>
>+            <param group="PrimitiveType"><ptype>GLenum</ptype> <name>mode</name></param>
>+            <param><ptype>GLuint</ptype> <name>start</name></param>
>+            <param><ptype>GLuint</ptype> <name>end</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param group="DrawElementsType"><ptype>GLenum</ptype> <name>type</name></param>
>+            <param len="COMPSIZE(count,type)">const void *<name>indices</name></param>
>+            <param><ptype>GLint</ptype> <name>basevertex</name></param>
>+            <alias name="glDrawRangeElementsBaseVertex"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glDrawRangeElementsBaseVertexOES</name></proto>
>+            <param group="PrimitiveType"><ptype>GLenum</ptype> <name>mode</name></param>
>+            <param><ptype>GLuint</ptype> <name>start</name></param>
>+            <param><ptype>GLuint</ptype> <name>end</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param group="DrawElementsType"><ptype>GLenum</ptype> <name>type</name></param>
>+            <param len="COMPSIZE(count,type)">const void *<name>indices</name></param>
>+            <param><ptype>GLint</ptype> <name>basevertex</name></param>
>+            <alias name="glDrawRangeElementsBaseVertex"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glDrawRangeElementsEXT</name></proto>
>+            <param group="PrimitiveType"><ptype>GLenum</ptype> <name>mode</name></param>
>+            <param><ptype>GLuint</ptype> <name>start</name></param>
>+            <param><ptype>GLuint</ptype> <name>end</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param group="DrawElementsType"><ptype>GLenum</ptype> <name>type</name></param>
>+            <param len="COMPSIZE(count,type)">const void *<name>indices</name></param>
>+            <alias name="glDrawRangeElements"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glDrawTexfOES</name></proto>
>+            <param><ptype>GLfloat</ptype> <name>x</name></param>
>+            <param><ptype>GLfloat</ptype> <name>y</name></param>
>+            <param><ptype>GLfloat</ptype> <name>z</name></param>
>+            <param><ptype>GLfloat</ptype> <name>width</name></param>
>+            <param><ptype>GLfloat</ptype> <name>height</name></param>
>+            <vecequiv name="glDrawTexfvOES"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glDrawTexfvOES</name></proto>
>+            <param len="5">const <ptype>GLfloat</ptype> *<name>coords</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glDrawTexiOES</name></proto>
>+            <param><ptype>GLint</ptype> <name>x</name></param>
>+            <param><ptype>GLint</ptype> <name>y</name></param>
>+            <param><ptype>GLint</ptype> <name>z</name></param>
>+            <param><ptype>GLint</ptype> <name>width</name></param>
>+            <param><ptype>GLint</ptype> <name>height</name></param>
>+            <vecequiv name="glDrawTexivOES"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glDrawTexivOES</name></proto>
>+            <param len="5">const <ptype>GLint</ptype> *<name>coords</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glDrawTexsOES</name></proto>
>+            <param><ptype>GLshort</ptype> <name>x</name></param>
>+            <param><ptype>GLshort</ptype> <name>y</name></param>
>+            <param><ptype>GLshort</ptype> <name>z</name></param>
>+            <param><ptype>GLshort</ptype> <name>width</name></param>
>+            <param><ptype>GLshort</ptype> <name>height</name></param>
>+            <vecequiv name="glDrawTexsvOES"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glDrawTexsvOES</name></proto>
>+            <param len="5">const <ptype>GLshort</ptype> *<name>coords</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glDrawTextureNV</name></proto>
>+            <param><ptype>GLuint</ptype> <name>texture</name></param>
>+            <param><ptype>GLuint</ptype> <name>sampler</name></param>
>+            <param><ptype>GLfloat</ptype> <name>x0</name></param>
>+            <param><ptype>GLfloat</ptype> <name>y0</name></param>
>+            <param><ptype>GLfloat</ptype> <name>x1</name></param>
>+            <param><ptype>GLfloat</ptype> <name>y1</name></param>
>+            <param><ptype>GLfloat</ptype> <name>z</name></param>
>+            <param><ptype>GLfloat</ptype> <name>s0</name></param>
>+            <param><ptype>GLfloat</ptype> <name>t0</name></param>
>+            <param><ptype>GLfloat</ptype> <name>s1</name></param>
>+            <param><ptype>GLfloat</ptype> <name>t1</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glDrawTexxOES</name></proto>
>+            <param><ptype>GLfixed</ptype> <name>x</name></param>
>+            <param><ptype>GLfixed</ptype> <name>y</name></param>
>+            <param><ptype>GLfixed</ptype> <name>z</name></param>
>+            <param><ptype>GLfixed</ptype> <name>width</name></param>
>+            <param><ptype>GLfixed</ptype> <name>height</name></param>
>+            <vecequiv name="glDrawTexxvOES"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glDrawTexxvOES</name></proto>
>+            <param len="5">const <ptype>GLfixed</ptype> *<name>coords</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glDrawTransformFeedback</name></proto>
>+            <param group="PrimitiveType"><ptype>GLenum</ptype> <name>mode</name></param>
>+            <param><ptype>GLuint</ptype> <name>id</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glDrawTransformFeedbackEXT</name></proto>
>+            <param group="PrimitiveType"><ptype>GLenum</ptype> <name>mode</name></param>
>+            <param><ptype>GLuint</ptype> <name>id</name></param>
>+            <alias name="glDrawTransformFeedback"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glDrawTransformFeedbackInstanced</name></proto>
>+            <param group="PrimitiveType"><ptype>GLenum</ptype> <name>mode</name></param>
>+            <param><ptype>GLuint</ptype> <name>id</name></param>
>+            <param><ptype>GLsizei</ptype> <name>instancecount</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glDrawTransformFeedbackInstancedEXT</name></proto>
>+            <param group="PrimitiveType"><ptype>GLenum</ptype> <name>mode</name></param>
>+            <param><ptype>GLuint</ptype> <name>id</name></param>
>+            <param><ptype>GLsizei</ptype> <name>instancecount</name></param>
>+            <alias name="glDrawTransformFeedbackInstanced"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glDrawTransformFeedbackNV</name></proto>
>+            <param group="PrimitiveType"><ptype>GLenum</ptype> <name>mode</name></param>
>+            <param><ptype>GLuint</ptype> <name>id</name></param>
>+            <alias name="glDrawTransformFeedback"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glDrawTransformFeedbackStream</name></proto>
>+            <param group="PrimitiveType"><ptype>GLenum</ptype> <name>mode</name></param>
>+            <param><ptype>GLuint</ptype> <name>id</name></param>
>+            <param><ptype>GLuint</ptype> <name>stream</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glDrawTransformFeedbackStreamInstanced</name></proto>
>+            <param group="PrimitiveType"><ptype>GLenum</ptype> <name>mode</name></param>
>+            <param><ptype>GLuint</ptype> <name>id</name></param>
>+            <param><ptype>GLuint</ptype> <name>stream</name></param>
>+            <param><ptype>GLsizei</ptype> <name>instancecount</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glEGLImageTargetRenderbufferStorageOES</name></proto>
>+            <param><ptype>GLenum</ptype> <name>target</name></param>
>+            <param><ptype>GLeglImageOES</ptype> <name>image</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glEGLImageTargetTexStorageEXT</name></proto>
>+            <param><ptype>GLenum</ptype> <name>target</name></param>
>+            <param><ptype>GLeglImageOES</ptype> <name>image</name></param>
>+            <param>const <ptype>GLint</ptype>* <name>attrib_list</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glEGLImageTargetTexture2DOES</name></proto>
>+            <param><ptype>GLenum</ptype> <name>target</name></param>
>+            <param><ptype>GLeglImageOES</ptype> <name>image</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glEGLImageTargetTextureStorageEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>texture</name></param>
>+            <param><ptype>GLeglImageOES</ptype> <name>image</name></param>
>+            <param>const <ptype>GLint</ptype>* <name>attrib_list</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glEdgeFlag</name></proto>
>+            <param group="Boolean"><ptype>GLboolean</ptype> <name>flag</name></param>
>+            <vecequiv name="glEdgeFlagv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glEdgeFlagFormatNV</name></proto>
>+            <param><ptype>GLsizei</ptype> <name>stride</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glEdgeFlagPointer</name></proto>
>+            <param><ptype>GLsizei</ptype> <name>stride</name></param>
>+            <param len="COMPSIZE(stride)">const void *<name>pointer</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glEdgeFlagPointerEXT</name></proto>
>+            <param><ptype>GLsizei</ptype> <name>stride</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param group="Boolean" len="COMPSIZE(stride,count)">const <ptype>GLboolean</ptype> *<name>pointer</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glEdgeFlagPointerListIBM</name></proto>
>+            <param><ptype>GLint</ptype> <name>stride</name></param>
>+            <param group="BooleanPointer" len="COMPSIZE(stride)">const <ptype>GLboolean</ptype> **<name>pointer</name></param>
>+            <param><ptype>GLint</ptype> <name>ptrstride</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glEdgeFlagv</name></proto>
>+            <param group="Boolean" len="1">const <ptype>GLboolean</ptype> *<name>flag</name></param>
>+            <glx type="render" opcode="22"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glElementPointerAPPLE</name></proto>
>+            <param group="ElementPointerTypeATI"><ptype>GLenum</ptype> <name>type</name></param>
>+            <param len="COMPSIZE(type)">const void *<name>pointer</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glElementPointerATI</name></proto>
>+            <param group="ElementPointerTypeATI"><ptype>GLenum</ptype> <name>type</name></param>
>+            <param len="COMPSIZE(type)">const void *<name>pointer</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glEnable</name></proto>
>+            <param group="EnableCap"><ptype>GLenum</ptype> <name>cap</name></param>
>+            <glx type="render" opcode="139"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glEnableClientState</name></proto>
>+            <param group="EnableCap"><ptype>GLenum</ptype> <name>array</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glEnableClientStateIndexedEXT</name></proto>
>+            <param group="EnableCap"><ptype>GLenum</ptype> <name>array</name></param>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glEnableClientStateiEXT</name></proto>
>+            <param group="EnableCap"><ptype>GLenum</ptype> <name>array</name></param>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glEnableDriverControlQCOM</name></proto>
>+            <param><ptype>GLuint</ptype> <name>driverControl</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glEnableIndexedEXT</name></proto>
>+            <param group="EnableCap"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <alias name="glEnablei"/>
>+            <glx type="render" opcode="353"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glEnableVariantClientStateEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>id</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glEnableVertexArrayAttrib</name></proto>
>+            <param><ptype>GLuint</ptype> <name>vaobj</name></param>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glEnableVertexArrayAttribEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>vaobj</name></param>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glEnableVertexArrayEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>vaobj</name></param>
>+            <param group="EnableCap"><ptype>GLenum</ptype> <name>array</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glEnableVertexAttribAPPLE</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param><ptype>GLenum</ptype> <name>pname</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glEnableVertexAttribArray</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glEnableVertexAttribArrayARB</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <alias name="glEnableVertexAttribArray"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glEnablei</name></proto>
>+            <param group="EnableCap"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glEnableiEXT</name></proto>
>+            <param group="EnableCap"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <alias name="glEnablei"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glEnableiNV</name></proto>
>+            <param group="EnableCap"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <alias name="glEnablei"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glEnableiOES</name></proto>
>+            <param group="EnableCap"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <alias name="glEnablei"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glEnd</name></proto>
>+            <glx type="render" opcode="23"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glEndConditionalRender</name></proto>
>+            <glx type="render" opcode="349"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glEndConditionalRenderNV</name></proto>
>+            <alias name="glEndConditionalRender"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glEndConditionalRenderNVX</name></proto>
>+            <alias name="glEndConditionalRender"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glEndFragmentShaderATI</name></proto>
>+        </command>
>+        <command>
>+            <proto>void <name>glEndList</name></proto>
>+            <glx type="single" opcode="102"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glEndOcclusionQueryNV</name></proto>
>+        </command>
>+        <command>
>+            <proto>void <name>glEndPerfMonitorAMD</name></proto>
>+            <param><ptype>GLuint</ptype> <name>monitor</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glEndPerfQueryINTEL</name></proto>
>+            <param><ptype>GLuint</ptype> <name>queryHandle</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glEndQuery</name></proto>
>+            <param group="QueryTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <glx type="render" opcode="232"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glEndQueryARB</name></proto>
>+            <param group="QueryTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <alias name="glEndQuery"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glEndQueryEXT</name></proto>
>+            <param group="QueryTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glEndQueryIndexed</name></proto>
>+            <param group="QueryTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glEndTilingQCOM</name></proto>
>+            <param group="BufferBitQCOM"><ptype>GLbitfield</ptype> <name>preserveMask</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glEndTransformFeedback</name></proto>
>+            <glx type="render" opcode="358"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glEndTransformFeedbackEXT</name></proto>
>+            <alias name="glEndTransformFeedback"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glEndTransformFeedbackNV</name></proto>
>+            <alias name="glEndTransformFeedback"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glEndVertexShaderEXT</name></proto>
>+        </command>
>+        <command>
>+            <proto>void <name>glEndVideoCaptureNV</name></proto>
>+            <param><ptype>GLuint</ptype> <name>video_capture_slot</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glEvalCoord1d</name></proto>
>+            <param group="CoordD"><ptype>GLdouble</ptype> <name>u</name></param>
>+            <vecequiv name="glEvalCoord1dv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glEvalCoord1dv</name></proto>
>+            <param group="CoordD" len="1">const <ptype>GLdouble</ptype> *<name>u</name></param>
>+            <glx type="render" opcode="151"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glEvalCoord1f</name></proto>
>+            <param group="CoordF"><ptype>GLfloat</ptype> <name>u</name></param>
>+            <vecequiv name="glEvalCoord1fv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glEvalCoord1fv</name></proto>
>+            <param group="CoordF" len="1">const <ptype>GLfloat</ptype> *<name>u</name></param>
>+            <glx type="render" opcode="152"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glEvalCoord1xOES</name></proto>
>+            <param><ptype>GLfixed</ptype> <name>u</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glEvalCoord1xvOES</name></proto>
>+            <param len="1">const <ptype>GLfixed</ptype> *<name>coords</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glEvalCoord2d</name></proto>
>+            <param group="CoordD"><ptype>GLdouble</ptype> <name>u</name></param>
>+            <param group="CoordD"><ptype>GLdouble</ptype> <name>v</name></param>
>+            <vecequiv name="glEvalCoord2dv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glEvalCoord2dv</name></proto>
>+            <param group="CoordD" len="2">const <ptype>GLdouble</ptype> *<name>u</name></param>
>+            <glx type="render" opcode="153"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glEvalCoord2f</name></proto>
>+            <param group="CoordF"><ptype>GLfloat</ptype> <name>u</name></param>
>+            <param group="CoordF"><ptype>GLfloat</ptype> <name>v</name></param>
>+            <vecequiv name="glEvalCoord2fv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glEvalCoord2fv</name></proto>
>+            <param group="CoordF" len="2">const <ptype>GLfloat</ptype> *<name>u</name></param>
>+            <glx type="render" opcode="154"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glEvalCoord2xOES</name></proto>
>+            <param><ptype>GLfixed</ptype> <name>u</name></param>
>+            <param><ptype>GLfixed</ptype> <name>v</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glEvalCoord2xvOES</name></proto>
>+            <param len="2">const <ptype>GLfixed</ptype> *<name>coords</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glEvalMapsNV</name></proto>
>+            <param group="EvalTargetNV"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="EvalMapsModeNV"><ptype>GLenum</ptype> <name>mode</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glEvalMesh1</name></proto>
>+            <param group="MeshMode1"><ptype>GLenum</ptype> <name>mode</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>i1</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>i2</name></param>
>+            <glx type="render" opcode="155"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glEvalMesh2</name></proto>
>+            <param group="MeshMode2"><ptype>GLenum</ptype> <name>mode</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>i1</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>i2</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>j1</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>j2</name></param>
>+            <glx type="render" opcode="157"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glEvalPoint1</name></proto>
>+            <param><ptype>GLint</ptype> <name>i</name></param>
>+            <glx type="render" opcode="156"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glEvalPoint2</name></proto>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>i</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>j</name></param>
>+            <glx type="render" opcode="158"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glEvaluateDepthValuesARB</name></proto>
>+        </command>
>+        <command>
>+            <proto>void <name>glExecuteProgramNV</name></proto>
>+            <param group="VertexAttribEnumNV"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param><ptype>GLuint</ptype> <name>id</name></param>
>+            <param len="4">const <ptype>GLfloat</ptype> *<name>params</name></param>
>+            <glx type="render" opcode="4181"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glExtGetBufferPointervQCOM</name></proto>
>+            <param><ptype>GLenum</ptype> <name>target</name></param>
>+            <param>void **<name>params</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glExtGetBuffersQCOM</name></proto>
>+            <param len="maxBuffers"><ptype>GLuint</ptype> *<name>buffers</name></param>
>+            <param><ptype>GLint</ptype> <name>maxBuffers</name></param>
>+            <param len="1"><ptype>GLint</ptype> *<name>numBuffers</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glExtGetFramebuffersQCOM</name></proto>
>+            <param len="maxFramebuffers"><ptype>GLuint</ptype> *<name>framebuffers</name></param>
>+            <param><ptype>GLint</ptype> <name>maxFramebuffers</name></param>
>+            <param len="1"><ptype>GLint</ptype> *<name>numFramebuffers</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glExtGetProgramBinarySourceQCOM</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param group="ShaderType"><ptype>GLenum</ptype> <name>shadertype</name></param>
>+            <param><ptype>GLchar</ptype> *<name>source</name></param>
>+            <param><ptype>GLint</ptype> *<name>length</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glExtGetProgramsQCOM</name></proto>
>+            <param len="maxPrograms"><ptype>GLuint</ptype> *<name>programs</name></param>
>+            <param><ptype>GLint</ptype> <name>maxPrograms</name></param>
>+            <param len="1"><ptype>GLint</ptype> *<name>numPrograms</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glExtGetRenderbuffersQCOM</name></proto>
>+            <param len="maxRenderbuffers"><ptype>GLuint</ptype> *<name>renderbuffers</name></param>
>+            <param><ptype>GLint</ptype> <name>maxRenderbuffers</name></param>
>+            <param len="1"><ptype>GLint</ptype> *<name>numRenderbuffers</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glExtGetShadersQCOM</name></proto>
>+            <param len="maxShaders"><ptype>GLuint</ptype> *<name>shaders</name></param>
>+            <param><ptype>GLint</ptype> <name>maxShaders</name></param>
>+            <param len="1"><ptype>GLint</ptype> *<name>numShaders</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glExtGetTexLevelParameterivQCOM</name></proto>
>+            <param><ptype>GLuint</ptype> <name>texture</name></param>
>+            <param><ptype>GLenum</ptype> <name>face</name></param>
>+            <param><ptype>GLint</ptype> <name>level</name></param>
>+            <param><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param><ptype>GLint</ptype> *<name>params</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glExtGetTexSubImageQCOM</name></proto>
>+            <param><ptype>GLenum</ptype> <name>target</name></param>
>+            <param><ptype>GLint</ptype> <name>level</name></param>
>+            <param><ptype>GLint</ptype> <name>xoffset</name></param>
>+            <param><ptype>GLint</ptype> <name>yoffset</name></param>
>+            <param><ptype>GLint</ptype> <name>zoffset</name></param>
>+            <param><ptype>GLsizei</ptype> <name>width</name></param>
>+            <param><ptype>GLsizei</ptype> <name>height</name></param>
>+            <param><ptype>GLsizei</ptype> <name>depth</name></param>
>+            <param group="PixelFormat"><ptype>GLenum</ptype> <name>format</name></param>
>+            <param group="PixelType"><ptype>GLenum</ptype> <name>type</name></param>
>+            <param>void *<name>texels</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glExtGetTexturesQCOM</name></proto>
>+            <param><ptype>GLuint</ptype> *<name>textures</name></param>
>+            <param><ptype>GLint</ptype> <name>maxTextures</name></param>
>+            <param><ptype>GLint</ptype> *<name>numTextures</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>GLboolean</ptype> <name>glExtIsProgramBinaryQCOM</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glExtTexObjectStateOverrideiQCOM</name></proto>
>+            <param><ptype>GLenum</ptype> <name>target</name></param>
>+            <param><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param><ptype>GLint</ptype> <name>param</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glExtractComponentEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>res</name></param>
>+            <param><ptype>GLuint</ptype> <name>src</name></param>
>+            <param><ptype>GLuint</ptype> <name>num</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glFeedbackBuffer</name></proto>
>+            <param><ptype>GLsizei</ptype> <name>size</name></param>
>+            <param group="FeedbackType"><ptype>GLenum</ptype> <name>type</name></param>
>+            <param group="FeedbackElement" len="size"><ptype>GLfloat</ptype> *<name>buffer</name></param>
>+            <glx type="single" opcode="105"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glFeedbackBufferxOES</name></proto>
>+            <param><ptype>GLsizei</ptype> <name>n</name></param>
>+            <param><ptype>GLenum</ptype> <name>type</name></param>
>+            <param len="n">const <ptype>GLfixed</ptype> *<name>buffer</name></param>
>+        </command>
>+        <command>
>+            <proto group="sync"><ptype>GLsync</ptype> <name>glFenceSync</name></proto>
>+            <param group="SyncCondition"><ptype>GLenum</ptype> <name>condition</name></param>
>+            <param><ptype>GLbitfield</ptype> <name>flags</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>GLsync</ptype> <name>glFenceSyncAPPLE</name></proto>
>+            <param group="SyncCondition"><ptype>GLenum</ptype> <name>condition</name></param>
>+            <param><ptype>GLbitfield</ptype> <name>flags</name></param>
>+            <alias name="glFenceSync"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glFinalCombinerInputNV</name></proto>
>+            <param group="CombinerVariableNV"><ptype>GLenum</ptype> <name>variable</name></param>
>+            <param group="CombinerRegisterNV"><ptype>GLenum</ptype> <name>input</name></param>
>+            <param group="CombinerMappingNV"><ptype>GLenum</ptype> <name>mapping</name></param>
>+            <param group="CombinerComponentUsageNV"><ptype>GLenum</ptype> <name>componentUsage</name></param>
>+            <glx type="render" opcode="4142"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glFinish</name></proto>
>+            <glx type="single" opcode="108"/>
>+        </command>
>+        <command>
>+            <proto><ptype>GLint</ptype> <name>glFinishAsyncSGIX</name></proto>
>+            <param len="1"><ptype>GLuint</ptype> *<name>markerp</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glFinishFenceAPPLE</name></proto>
>+            <param group="FenceNV"><ptype>GLuint</ptype> <name>fence</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glFinishFenceNV</name></proto>
>+            <param group="FenceNV"><ptype>GLuint</ptype> <name>fence</name></param>
>+            <glx type="vendor" opcode="1312"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glFinishObjectAPPLE</name></proto>
>+            <param group="ObjectTypeAPPLE"><ptype>GLenum</ptype> <name>object</name></param>
>+            <param><ptype>GLint</ptype> <name>name</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glFinishTextureSUNX</name></proto>
>+        </command>
>+        <command>
>+            <proto>void <name>glFlush</name></proto>
>+            <glx type="single" opcode="142"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glFlushMappedBufferRange</name></proto>
>+            <param group="BufferTargetARB"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="BufferOffset"><ptype>GLintptr</ptype> <name>offset</name></param>
>+            <param group="BufferSize"><ptype>GLsizeiptr</ptype> <name>length</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glFlushMappedBufferRangeAPPLE</name></proto>
>+            <param group="BufferTargetARB"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="BufferOffset"><ptype>GLintptr</ptype> <name>offset</name></param>
>+            <param group="BufferSize"><ptype>GLsizeiptr</ptype> <name>size</name></param>
>+            <alias name="glFlushMappedBufferRange"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glFlushMappedBufferRangeEXT</name></proto>
>+            <param group="BufferTargetARB"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param><ptype>GLintptr</ptype> <name>offset</name></param>
>+            <param><ptype>GLsizeiptr</ptype> <name>length</name></param>
>+            <alias name="glFlushMappedBufferRange"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glFlushMappedNamedBufferRange</name></proto>
>+            <param><ptype>GLuint</ptype> <name>buffer</name></param>
>+            <param><ptype>GLintptr</ptype> <name>offset</name></param>
>+            <param group="BufferSize"><ptype>GLsizeiptr</ptype> <name>length</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glFlushMappedNamedBufferRangeEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>buffer</name></param>
>+            <param><ptype>GLintptr</ptype> <name>offset</name></param>
>+            <param><ptype>GLsizeiptr</ptype> <name>length</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glFlushPixelDataRangeNV</name></proto>
>+            <param group="PixelDataRangeTargetNV"><ptype>GLenum</ptype> <name>target</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glFlushRasterSGIX</name></proto>
>+            <glx type="vendor" opcode="4105"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glFlushStaticDataIBM</name></proto>
>+            <param><ptype>GLenum</ptype> <name>target</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glFlushVertexArrayRangeAPPLE</name></proto>
>+            <param><ptype>GLsizei</ptype> <name>length</name></param>
>+            <param len="length">void *<name>pointer</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glFlushVertexArrayRangeNV</name></proto>
>+        </command>
>+        <command>
>+            <proto>void <name>glFogCoordFormatNV</name></proto>
>+            <param><ptype>GLenum</ptype> <name>type</name></param>
>+            <param><ptype>GLsizei</ptype> <name>stride</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glFogCoordPointer</name></proto>
>+            <param group="FogPointerTypeEXT"><ptype>GLenum</ptype> <name>type</name></param>
>+            <param><ptype>GLsizei</ptype> <name>stride</name></param>
>+            <param len="COMPSIZE(type,stride)">const void *<name>pointer</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glFogCoordPointerEXT</name></proto>
>+            <param group="FogPointerTypeEXT"><ptype>GLenum</ptype> <name>type</name></param>
>+            <param><ptype>GLsizei</ptype> <name>stride</name></param>
>+            <param len="COMPSIZE(type,stride)">const void *<name>pointer</name></param>
>+            <alias name="glFogCoordPointer"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glFogCoordPointerListIBM</name></proto>
>+            <param group="FogPointerTypeIBM"><ptype>GLenum</ptype> <name>type</name></param>
>+            <param><ptype>GLint</ptype> <name>stride</name></param>
>+            <param len="COMPSIZE(type,stride)">const void **<name>pointer</name></param>
>+            <param><ptype>GLint</ptype> <name>ptrstride</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glFogCoordd</name></proto>
>+            <param group="CoordD"><ptype>GLdouble</ptype> <name>coord</name></param>
>+            <vecequiv name="glFogCoorddv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glFogCoorddEXT</name></proto>
>+            <param group="CoordD"><ptype>GLdouble</ptype> <name>coord</name></param>
>+            <alias name="glFogCoordd"/>
>+            <vecequiv name="glFogCoorddvEXT"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glFogCoorddv</name></proto>
>+            <param group="CoordD" len="1">const <ptype>GLdouble</ptype> *<name>coord</name></param>
>+            <glx type="render" opcode="4125"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glFogCoorddvEXT</name></proto>
>+            <param group="CoordD" len="1">const <ptype>GLdouble</ptype> *<name>coord</name></param>
>+            <alias name="glFogCoorddv"/>
>+            <glx type="render" opcode="4125"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glFogCoordf</name></proto>
>+            <param group="CoordF"><ptype>GLfloat</ptype> <name>coord</name></param>
>+            <vecequiv name="glFogCoordfv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glFogCoordfEXT</name></proto>
>+            <param group="CoordF"><ptype>GLfloat</ptype> <name>coord</name></param>
>+            <alias name="glFogCoordf"/>
>+            <vecequiv name="glFogCoordfvEXT"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glFogCoordfv</name></proto>
>+            <param group="CoordF" len="1">const <ptype>GLfloat</ptype> *<name>coord</name></param>
>+            <glx type="render" opcode="4124"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glFogCoordfvEXT</name></proto>
>+            <param group="CoordF" len="1">const <ptype>GLfloat</ptype> *<name>coord</name></param>
>+            <alias name="glFogCoordfv"/>
>+            <glx type="render" opcode="4124"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glFogCoordhNV</name></proto>
>+            <param group="Half16NV"><ptype>GLhalfNV</ptype> <name>fog</name></param>
>+            <vecequiv name="glFogCoordhvNV"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glFogCoordhvNV</name></proto>
>+            <param group="Half16NV" len="1">const <ptype>GLhalfNV</ptype> *<name>fog</name></param>
>+            <glx type="render" opcode="4254"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glFogFuncSGIS</name></proto>
>+            <param><ptype>GLsizei</ptype> <name>n</name></param>
>+            <param len="n*2">const <ptype>GLfloat</ptype> *<name>points</name></param>
>+            <glx type="render" opcode="2067"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glFogf</name></proto>
>+            <param group="FogParameter"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param group="CheckedFloat32"><ptype>GLfloat</ptype> <name>param</name></param>
>+            <glx type="render" opcode="80"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glFogfv</name></proto>
>+            <param group="FogParameter"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param group="CheckedFloat32" len="COMPSIZE(pname)">const <ptype>GLfloat</ptype> *<name>params</name></param>
>+            <glx type="render" opcode="81"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glFogi</name></proto>
>+            <param group="FogParameter"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>param</name></param>
>+            <glx type="render" opcode="82"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glFogiv</name></proto>
>+            <param group="FogParameter"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param group="CheckedInt32" len="COMPSIZE(pname)">const <ptype>GLint</ptype> *<name>params</name></param>
>+            <glx type="render" opcode="83"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glFogx</name></proto>
>+            <param group="FogPName"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param><ptype>GLfixed</ptype> <name>param</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glFogxOES</name></proto>
>+            <param group="FogPName"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param><ptype>GLfixed</ptype> <name>param</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glFogxv</name></proto>
>+            <param group="FogPName"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="COMPSIZE(pname)">const <ptype>GLfixed</ptype> *<name>param</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glFogxvOES</name></proto>
>+            <param group="FogPName"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="COMPSIZE(pname)">const <ptype>GLfixed</ptype> *<name>param</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glFragmentColorMaterialSGIX</name></proto>
>+            <param group="MaterialFace"><ptype>GLenum</ptype> <name>face</name></param>
>+            <param group="MaterialParameter"><ptype>GLenum</ptype> <name>mode</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glFragmentCoverageColorNV</name></proto>
>+            <param><ptype>GLuint</ptype> <name>color</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glFragmentLightModelfSGIX</name></proto>
>+            <param group="FragmentLightModelParameterSGIX"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param group="CheckedFloat32"><ptype>GLfloat</ptype> <name>param</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glFragmentLightModelfvSGIX</name></proto>
>+            <param group="FragmentLightModelParameterSGIX"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param group="CheckedFloat32" len="COMPSIZE(pname)">const <ptype>GLfloat</ptype> *<name>params</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glFragmentLightModeliSGIX</name></proto>
>+            <param group="FragmentLightModelParameterSGIX"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>param</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glFragmentLightModelivSGIX</name></proto>
>+            <param group="FragmentLightModelParameterSGIX"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param group="CheckedInt32" len="COMPSIZE(pname)">const <ptype>GLint</ptype> *<name>params</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glFragmentLightfSGIX</name></proto>
>+            <param group="FragmentLightNameSGIX"><ptype>GLenum</ptype> <name>light</name></param>
>+            <param group="FragmentLightParameterSGIX"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param group="CheckedFloat32"><ptype>GLfloat</ptype> <name>param</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glFragmentLightfvSGIX</name></proto>
>+            <param group="FragmentLightNameSGIX"><ptype>GLenum</ptype> <name>light</name></param>
>+            <param group="FragmentLightParameterSGIX"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param group="CheckedFloat32" len="COMPSIZE(pname)">const <ptype>GLfloat</ptype> *<name>params</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glFragmentLightiSGIX</name></proto>
>+            <param group="FragmentLightNameSGIX"><ptype>GLenum</ptype> <name>light</name></param>
>+            <param group="FragmentLightParameterSGIX"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>param</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glFragmentLightivSGIX</name></proto>
>+            <param group="FragmentLightNameSGIX"><ptype>GLenum</ptype> <name>light</name></param>
>+            <param group="FragmentLightParameterSGIX"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param group="CheckedInt32" len="COMPSIZE(pname)">const <ptype>GLint</ptype> *<name>params</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glFragmentMaterialfSGIX</name></proto>
>+            <param group="MaterialFace"><ptype>GLenum</ptype> <name>face</name></param>
>+            <param group="MaterialParameter"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param group="CheckedFloat32"><ptype>GLfloat</ptype> <name>param</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glFragmentMaterialfvSGIX</name></proto>
>+            <param group="MaterialFace"><ptype>GLenum</ptype> <name>face</name></param>
>+            <param group="MaterialParameter"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param group="CheckedFloat32" len="COMPSIZE(pname)">const <ptype>GLfloat</ptype> *<name>params</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glFragmentMaterialiSGIX</name></proto>
>+            <param group="MaterialFace"><ptype>GLenum</ptype> <name>face</name></param>
>+            <param group="MaterialParameter"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>param</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glFragmentMaterialivSGIX</name></proto>
>+            <param group="MaterialFace"><ptype>GLenum</ptype> <name>face</name></param>
>+            <param group="MaterialParameter"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param group="CheckedInt32" len="COMPSIZE(pname)">const <ptype>GLint</ptype> *<name>params</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glFrameTerminatorGREMEDY</name></proto>
>+        </command>
>+        <command>
>+            <proto>void <name>glFrameZoomSGIX</name></proto>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>factor</name></param>
>+            <glx type="render" opcode="2072"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glFramebufferDrawBufferEXT</name></proto>
>+            <param group="Framebuffer"><ptype>GLuint</ptype> <name>framebuffer</name></param>
>+            <param group="DrawBufferMode"><ptype>GLenum</ptype> <name>mode</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glFramebufferDrawBuffersEXT</name></proto>
>+            <param group="Framebuffer"><ptype>GLuint</ptype> <name>framebuffer</name></param>
>+            <param><ptype>GLsizei</ptype> <name>n</name></param>
>+            <param group="DrawBufferMode" len="n">const <ptype>GLenum</ptype> *<name>bufs</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glFramebufferFetchBarrierEXT</name></proto>
>+        </command>
>+        <command>
>+            <proto>void <name>glFramebufferFetchBarrierQCOM</name></proto>
>+        </command>
>+        <command>
>+            <proto>void <name>glFramebufferFoveationConfigQCOM</name></proto>
>+            <param group="Framebuffer"><ptype>GLuint</ptype> <name>framebuffer</name></param>
>+            <param><ptype>GLuint</ptype> <name>numLayers</name></param>
>+            <param><ptype>GLuint</ptype> <name>focalPointsPerLayer</name></param>
>+            <param><ptype>GLuint</ptype> <name>requestedFeatures</name></param>
>+            <param len="1"><ptype>GLuint</ptype> *<name>providedFeatures</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glFramebufferFoveationParametersQCOM</name></proto>
>+            <param group="Framebuffer"><ptype>GLuint</ptype> <name>framebuffer</name></param>
>+            <param><ptype>GLuint</ptype> <name>layer</name></param>
>+            <param><ptype>GLuint</ptype> <name>focalPoint</name></param>
>+            <param group="CheckedFloat32"><ptype>GLfloat</ptype> <name>focalX</name></param>
>+            <param group="CheckedFloat32"><ptype>GLfloat</ptype> <name>focalY</name></param>
>+            <param group="CheckedFloat32"><ptype>GLfloat</ptype> <name>gainX</name></param>
>+            <param group="CheckedFloat32"><ptype>GLfloat</ptype> <name>gainY</name></param>
>+            <param group="CheckedFloat32"><ptype>GLfloat</ptype> <name>foveaArea</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glFramebufferParameteri</name></proto>
>+            <param group="FramebufferTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="FramebufferParameterName"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param><ptype>GLint</ptype> <name>param</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glFramebufferPixelLocalStorageSizeEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>target</name></param>
>+            <param><ptype>GLsizei</ptype> <name>size</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glFramebufferReadBufferEXT</name></proto>
>+            <param group="Framebuffer"><ptype>GLuint</ptype> <name>framebuffer</name></param>
>+            <param group="ReadBufferMode"><ptype>GLenum</ptype> <name>mode</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glFramebufferRenderbuffer</name></proto>
>+            <param group="FramebufferTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="FramebufferAttachment"><ptype>GLenum</ptype> <name>attachment</name></param>
>+            <param group="RenderbufferTarget"><ptype>GLenum</ptype> <name>renderbuffertarget</name></param>
>+            <param><ptype>GLuint</ptype> <name>renderbuffer</name></param>
>+            <glx type="render" opcode="4324"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glFramebufferRenderbufferEXT</name></proto>
>+            <param group="FramebufferTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="FramebufferAttachment"><ptype>GLenum</ptype> <name>attachment</name></param>
>+            <param group="RenderbufferTarget"><ptype>GLenum</ptype> <name>renderbuffertarget</name></param>
>+            <param><ptype>GLuint</ptype> <name>renderbuffer</name></param>
>+            <alias name="glFramebufferRenderbuffer"/>
>+            <glx type="render" opcode="4324"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glFramebufferRenderbufferOES</name></proto>
>+            <param group="FramebufferTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="FramebufferAttachment"><ptype>GLenum</ptype> <name>attachment</name></param>
>+            <param group="RenderbufferTarget"><ptype>GLenum</ptype> <name>renderbuffertarget</name></param>
>+            <param><ptype>GLuint</ptype> <name>renderbuffer</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glFramebufferSampleLocationsfvARB</name></proto>
>+            <param group="FramebufferTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param><ptype>GLuint</ptype> <name>start</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param>const <ptype>GLfloat</ptype> *<name>v</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glFramebufferSampleLocationsfvNV</name></proto>
>+            <param group="FramebufferTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param><ptype>GLuint</ptype> <name>start</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param>const <ptype>GLfloat</ptype> *<name>v</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glFramebufferSamplePositionsfvAMD</name></proto>
>+            <param group="FramebufferTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param><ptype>GLuint</ptype> <name>numsamples</name></param>
>+            <param><ptype>GLuint</ptype> <name>pixelindex</name></param>
>+            <param>const <ptype>GLfloat</ptype> *<name>values</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glFramebufferTexture</name></proto>
>+            <param group="FramebufferTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="FramebufferAttachment"><ptype>GLenum</ptype> <name>attachment</name></param>
>+            <param><ptype>GLuint</ptype> <name>texture</name></param>
>+            <param><ptype>GLint</ptype> <name>level</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glFramebufferTexture1D</name></proto>
>+            <param group="FramebufferTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="FramebufferAttachment"><ptype>GLenum</ptype> <name>attachment</name></param>
>+            <param group="TextureTarget"><ptype>GLenum</ptype> <name>textarget</name></param>
>+            <param><ptype>GLuint</ptype> <name>texture</name></param>
>+            <param><ptype>GLint</ptype> <name>level</name></param>
>+            <glx type="render" opcode="4321"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glFramebufferTexture1DEXT</name></proto>
>+            <param group="FramebufferTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="FramebufferAttachment"><ptype>GLenum</ptype> <name>attachment</name></param>
>+            <param group="TextureTarget"><ptype>GLenum</ptype> <name>textarget</name></param>
>+            <param><ptype>GLuint</ptype> <name>texture</name></param>
>+            <param><ptype>GLint</ptype> <name>level</name></param>
>+            <alias name="glFramebufferTexture1D"/>
>+            <glx type="render" opcode="4321"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glFramebufferTexture2D</name></proto>
>+            <param group="FramebufferTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="FramebufferAttachment"><ptype>GLenum</ptype> <name>attachment</name></param>
>+            <param group="TextureTarget"><ptype>GLenum</ptype> <name>textarget</name></param>
>+            <param><ptype>GLuint</ptype> <name>texture</name></param>
>+            <param><ptype>GLint</ptype> <name>level</name></param>
>+            <glx type="render" opcode="4322"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glFramebufferTexture2DEXT</name></proto>
>+            <param group="FramebufferTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="FramebufferAttachment"><ptype>GLenum</ptype> <name>attachment</name></param>
>+            <param group="TextureTarget"><ptype>GLenum</ptype> <name>textarget</name></param>
>+            <param><ptype>GLuint</ptype> <name>texture</name></param>
>+            <param><ptype>GLint</ptype> <name>level</name></param>
>+            <alias name="glFramebufferTexture2D"/>
>+            <glx type="render" opcode="4322"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glFramebufferTexture2DDownsampleIMG</name></proto>
>+            <param group="FramebufferTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="FramebufferAttachment"><ptype>GLenum</ptype> <name>attachment</name></param>
>+            <param group="TextureTarget"><ptype>GLenum</ptype> <name>textarget</name></param>
>+            <param><ptype>GLuint</ptype> <name>texture</name></param>
>+            <param><ptype>GLint</ptype> <name>level</name></param>
>+            <param><ptype>GLint</ptype> <name>xscale</name></param>
>+            <param><ptype>GLint</ptype> <name>yscale</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glFramebufferTexture2DMultisampleEXT</name></proto>
>+            <param group="FramebufferTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="FramebufferAttachment"><ptype>GLenum</ptype> <name>attachment</name></param>
>+            <param group="TextureTarget"><ptype>GLenum</ptype> <name>textarget</name></param>
>+            <param><ptype>GLuint</ptype> <name>texture</name></param>
>+            <param><ptype>GLint</ptype> <name>level</name></param>
>+            <param><ptype>GLsizei</ptype> <name>samples</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glFramebufferTexture2DMultisampleIMG</name></proto>
>+            <param group="FramebufferTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="FramebufferAttachment"><ptype>GLenum</ptype> <name>attachment</name></param>
>+            <param group="TextureTarget"><ptype>GLenum</ptype> <name>textarget</name></param>
>+            <param><ptype>GLuint</ptype> <name>texture</name></param>
>+            <param><ptype>GLint</ptype> <name>level</name></param>
>+            <param><ptype>GLsizei</ptype> <name>samples</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glFramebufferTexture2DOES</name></proto>
>+            <param group="FramebufferTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="FramebufferAttachment"><ptype>GLenum</ptype> <name>attachment</name></param>
>+            <param group="TextureTarget"><ptype>GLenum</ptype> <name>textarget</name></param>
>+            <param><ptype>GLuint</ptype> <name>texture</name></param>
>+            <param><ptype>GLint</ptype> <name>level</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glFramebufferTexture3D</name></proto>
>+            <param group="FramebufferTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="FramebufferAttachment"><ptype>GLenum</ptype> <name>attachment</name></param>
>+            <param group="TextureTarget"><ptype>GLenum</ptype> <name>textarget</name></param>
>+            <param><ptype>GLuint</ptype> <name>texture</name></param>
>+            <param><ptype>GLint</ptype> <name>level</name></param>
>+            <param><ptype>GLint</ptype> <name>zoffset</name></param>
>+            <glx type="render" opcode="4323"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glFramebufferTexture3DEXT</name></proto>
>+            <param group="FramebufferTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="FramebufferAttachment"><ptype>GLenum</ptype> <name>attachment</name></param>
>+            <param group="TextureTarget"><ptype>GLenum</ptype> <name>textarget</name></param>
>+            <param><ptype>GLuint</ptype> <name>texture</name></param>
>+            <param><ptype>GLint</ptype> <name>level</name></param>
>+            <param><ptype>GLint</ptype> <name>zoffset</name></param>
>+            <alias name="glFramebufferTexture3D"/>
>+            <glx type="render" opcode="4323"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glFramebufferTexture3DOES</name></proto>
>+            <param group="FramebufferTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="FramebufferAttachment"><ptype>GLenum</ptype> <name>attachment</name></param>
>+            <param group="TextureTarget"><ptype>GLenum</ptype> <name>textarget</name></param>
>+            <param><ptype>GLuint</ptype> <name>texture</name></param>
>+            <param><ptype>GLint</ptype> <name>level</name></param>
>+            <param><ptype>GLint</ptype> <name>zoffset</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glFramebufferTextureARB</name></proto>
>+            <param group="FramebufferTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="FramebufferAttachment"><ptype>GLenum</ptype> <name>attachment</name></param>
>+            <param group="Texture"><ptype>GLuint</ptype> <name>texture</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>level</name></param>
>+            <alias name="glFramebufferTexture"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glFramebufferTextureEXT</name></proto>
>+            <param group="FramebufferTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="FramebufferAttachment"><ptype>GLenum</ptype> <name>attachment</name></param>
>+            <param group="Texture"><ptype>GLuint</ptype> <name>texture</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>level</name></param>
>+            <alias name="glFramebufferTexture"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glFramebufferTextureFaceARB</name></proto>
>+            <param group="FramebufferTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="FramebufferAttachment"><ptype>GLenum</ptype> <name>attachment</name></param>
>+            <param group="Texture"><ptype>GLuint</ptype> <name>texture</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>level</name></param>
>+            <param group="TextureTarget"><ptype>GLenum</ptype> <name>face</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glFramebufferTextureFaceEXT</name></proto>
>+            <param group="FramebufferTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="FramebufferAttachment"><ptype>GLenum</ptype> <name>attachment</name></param>
>+            <param group="Texture"><ptype>GLuint</ptype> <name>texture</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>level</name></param>
>+            <param group="TextureTarget"><ptype>GLenum</ptype> <name>face</name></param>
>+            <alias name="glFramebufferTextureFaceARB"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glFramebufferTextureLayer</name></proto>
>+            <param group="FramebufferTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="FramebufferAttachment"><ptype>GLenum</ptype> <name>attachment</name></param>
>+            <param group="Texture"><ptype>GLuint</ptype> <name>texture</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>level</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>layer</name></param>
>+            <glx type="render" opcode="237"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glFramebufferTextureLayerARB</name></proto>
>+            <param group="FramebufferTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="FramebufferAttachment"><ptype>GLenum</ptype> <name>attachment</name></param>
>+            <param group="Texture"><ptype>GLuint</ptype> <name>texture</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>level</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>layer</name></param>
>+            <alias name="glFramebufferTextureLayer"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glFramebufferTextureLayerEXT</name></proto>
>+            <param group="FramebufferTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="FramebufferAttachment"><ptype>GLenum</ptype> <name>attachment</name></param>
>+            <param group="Texture"><ptype>GLuint</ptype> <name>texture</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>level</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>layer</name></param>
>+            <alias name="glFramebufferTextureLayer"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glFramebufferTextureLayerDownsampleIMG</name></proto>
>+            <param group="FramebufferTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="FramebufferAttachment"><ptype>GLenum</ptype> <name>attachment</name></param>
>+            <param group="Texture"><ptype>GLuint</ptype> <name>texture</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>level</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>layer</name></param>
>+            <param><ptype>GLint</ptype> <name>xscale</name></param>
>+            <param><ptype>GLint</ptype> <name>yscale</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glFramebufferTextureMultisampleMultiviewOVR</name></proto>
>+            <param group="FramebufferTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="FramebufferAttachment"><ptype>GLenum</ptype> <name>attachment</name></param>
>+            <param group="Texture"><ptype>GLuint</ptype> <name>texture</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>level</name></param>
>+            <param><ptype>GLsizei</ptype> <name>samples</name></param>
>+            <param><ptype>GLint</ptype> <name>baseViewIndex</name></param>
>+            <param><ptype>GLsizei</ptype> <name>numViews</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glFramebufferTextureMultiviewOVR</name></proto>
>+            <param group="FramebufferTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="FramebufferAttachment"><ptype>GLenum</ptype> <name>attachment</name></param>
>+            <param group="Texture"><ptype>GLuint</ptype> <name>texture</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>level</name></param>
>+            <param><ptype>GLint</ptype> <name>baseViewIndex</name></param>
>+            <param><ptype>GLsizei</ptype> <name>numViews</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glFramebufferTextureOES</name></proto>
>+            <param group="FramebufferTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="FramebufferAttachment"><ptype>GLenum</ptype> <name>attachment</name></param>
>+            <param group="Texture"><ptype>GLuint</ptype> <name>texture</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>level</name></param>
>+            <alias name="glFramebufferTexture"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glFreeObjectBufferATI</name></proto>
>+            <param><ptype>GLuint</ptype> <name>buffer</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glFrontFace</name></proto>
>+            <param group="FrontFaceDirection"><ptype>GLenum</ptype> <name>mode</name></param>
>+            <glx type="render" opcode="84"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glFrustum</name></proto>
>+            <param><ptype>GLdouble</ptype> <name>left</name></param>
>+            <param><ptype>GLdouble</ptype> <name>right</name></param>
>+            <param><ptype>GLdouble</ptype> <name>bottom</name></param>
>+            <param><ptype>GLdouble</ptype> <name>top</name></param>
>+            <param><ptype>GLdouble</ptype> <name>zNear</name></param>
>+            <param><ptype>GLdouble</ptype> <name>zFar</name></param>
>+            <glx type="render" opcode="175"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glFrustumf</name></proto>
>+            <param><ptype>GLfloat</ptype> <name>l</name></param>
>+            <param><ptype>GLfloat</ptype> <name>r</name></param>
>+            <param><ptype>GLfloat</ptype> <name>b</name></param>
>+            <param><ptype>GLfloat</ptype> <name>t</name></param>
>+            <param><ptype>GLfloat</ptype> <name>n</name></param>
>+            <param><ptype>GLfloat</ptype> <name>f</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glFrustumfOES</name></proto>
>+            <param><ptype>GLfloat</ptype> <name>l</name></param>
>+            <param><ptype>GLfloat</ptype> <name>r</name></param>
>+            <param><ptype>GLfloat</ptype> <name>b</name></param>
>+            <param><ptype>GLfloat</ptype> <name>t</name></param>
>+            <param><ptype>GLfloat</ptype> <name>n</name></param>
>+            <param><ptype>GLfloat</ptype> <name>f</name></param>
>+            <glx type="render" opcode="4310"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glFrustumx</name></proto>
>+            <param><ptype>GLfixed</ptype> <name>l</name></param>
>+            <param><ptype>GLfixed</ptype> <name>r</name></param>
>+            <param><ptype>GLfixed</ptype> <name>b</name></param>
>+            <param><ptype>GLfixed</ptype> <name>t</name></param>
>+            <param><ptype>GLfixed</ptype> <name>n</name></param>
>+            <param><ptype>GLfixed</ptype> <name>f</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glFrustumxOES</name></proto>
>+            <param><ptype>GLfixed</ptype> <name>l</name></param>
>+            <param><ptype>GLfixed</ptype> <name>r</name></param>
>+            <param><ptype>GLfixed</ptype> <name>b</name></param>
>+            <param><ptype>GLfixed</ptype> <name>t</name></param>
>+            <param><ptype>GLfixed</ptype> <name>n</name></param>
>+            <param><ptype>GLfixed</ptype> <name>f</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>GLuint</ptype> <name>glGenAsyncMarkersSGIX</name></proto>
>+            <param><ptype>GLsizei</ptype> <name>range</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGenBuffers</name></proto>
>+            <param><ptype>GLsizei</ptype> <name>n</name></param>
>+            <param len="n"><ptype>GLuint</ptype> *<name>buffers</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGenBuffersARB</name></proto>
>+            <param><ptype>GLsizei</ptype> <name>n</name></param>
>+            <param len="n"><ptype>GLuint</ptype> *<name>buffers</name></param>
>+            <alias name="glGenBuffers"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glGenFencesAPPLE</name></proto>
>+            <param><ptype>GLsizei</ptype> <name>n</name></param>
>+            <param group="FenceNV" len="n"><ptype>GLuint</ptype> *<name>fences</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGenFencesNV</name></proto>
>+            <param><ptype>GLsizei</ptype> <name>n</name></param>
>+            <param group="FenceNV" len="n"><ptype>GLuint</ptype> *<name>fences</name></param>
>+            <glx type="vendor" opcode="1277"/>
>+        </command>
>+        <command>
>+            <proto><ptype>GLuint</ptype> <name>glGenFragmentShadersATI</name></proto>
>+            <param><ptype>GLuint</ptype> <name>range</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGenFramebuffers</name></proto>
>+            <param><ptype>GLsizei</ptype> <name>n</name></param>
>+            <param len="n"><ptype>GLuint</ptype> *<name>framebuffers</name></param>
>+            <glx type="vendor" opcode="1426"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glGenFramebuffersEXT</name></proto>
>+            <param><ptype>GLsizei</ptype> <name>n</name></param>
>+            <param len="n"><ptype>GLuint</ptype> *<name>framebuffers</name></param>
>+            <alias name="glGenFramebuffers"/>
>+            <glx type="vendor" opcode="1426"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glGenFramebuffersOES</name></proto>
>+            <param><ptype>GLsizei</ptype> <name>n</name></param>
>+            <param len="n"><ptype>GLuint</ptype> *<name>framebuffers</name></param>
>+        </command>
>+        <command>
>+            <proto group="List"><ptype>GLuint</ptype> <name>glGenLists</name></proto>
>+            <param><ptype>GLsizei</ptype> <name>range</name></param>
>+            <glx type="single" opcode="104"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glGenNamesAMD</name></proto>
>+            <param><ptype>GLenum</ptype> <name>identifier</name></param>
>+            <param><ptype>GLuint</ptype> <name>num</name></param>
>+            <param len="num"><ptype>GLuint</ptype> *<name>names</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGenOcclusionQueriesNV</name></proto>
>+            <param><ptype>GLsizei</ptype> <name>n</name></param>
>+            <param len="n"><ptype>GLuint</ptype> *<name>ids</name></param>
>+        </command>
>+        <command>
>+            <proto group="Path"><ptype>GLuint</ptype> <name>glGenPathsNV</name></proto>
>+            <param><ptype>GLsizei</ptype> <name>range</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGenPerfMonitorsAMD</name></proto>
>+            <param><ptype>GLsizei</ptype> <name>n</name></param>
>+            <param len="n"><ptype>GLuint</ptype> *<name>monitors</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGenProgramPipelines</name></proto>
>+            <param><ptype>GLsizei</ptype> <name>n</name></param>
>+            <param len="n"><ptype>GLuint</ptype> *<name>pipelines</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGenProgramPipelinesEXT</name></proto>
>+            <param><ptype>GLsizei</ptype> <name>n</name></param>
>+            <param len="n"><ptype>GLuint</ptype> *<name>pipelines</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGenProgramsARB</name></proto>
>+            <param><ptype>GLsizei</ptype> <name>n</name></param>
>+            <param len="n"><ptype>GLuint</ptype> *<name>programs</name></param>
>+            <glx type="vendor" opcode="1295"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glGenProgramsNV</name></proto>
>+            <param><ptype>GLsizei</ptype> <name>n</name></param>
>+            <param len="n"><ptype>GLuint</ptype> *<name>programs</name></param>
>+            <alias name="glGenProgramsARB"/>
>+            <glx type="vendor" opcode="1295"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glGenQueries</name></proto>
>+            <param><ptype>GLsizei</ptype> <name>n</name></param>
>+            <param len="n"><ptype>GLuint</ptype> *<name>ids</name></param>
>+            <glx type="single" opcode="162"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glGenQueriesARB</name></proto>
>+            <param><ptype>GLsizei</ptype> <name>n</name></param>
>+            <param len="n"><ptype>GLuint</ptype> *<name>ids</name></param>
>+            <alias name="glGenQueries"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glGenQueriesEXT</name></proto>
>+            <param><ptype>GLsizei</ptype> <name>n</name></param>
>+            <param len="n"><ptype>GLuint</ptype> *<name>ids</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGenQueryResourceTagNV</name></proto>
>+            <param><ptype>GLsizei</ptype> <name>n</name></param>
>+            <param len="n"><ptype>GLint</ptype> *<name>tagIds</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGenRenderbuffers</name></proto>
>+            <param><ptype>GLsizei</ptype> <name>n</name></param>
>+            <param len="n"><ptype>GLuint</ptype> *<name>renderbuffers</name></param>
>+            <glx type="vendor" opcode="1423"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glGenRenderbuffersEXT</name></proto>
>+            <param><ptype>GLsizei</ptype> <name>n</name></param>
>+            <param len="n"><ptype>GLuint</ptype> *<name>renderbuffers</name></param>
>+            <alias name="glGenRenderbuffers"/>
>+            <glx type="vendor" opcode="1423"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glGenRenderbuffersOES</name></proto>
>+            <param><ptype>GLsizei</ptype> <name>n</name></param>
>+            <param len="n"><ptype>GLuint</ptype> *<name>renderbuffers</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGenSamplers</name></proto>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param len="count"><ptype>GLuint</ptype> *<name>samplers</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGenSemaphoresEXT</name></proto>
>+            <param><ptype>GLsizei</ptype> <name>n</name></param>
>+            <param len="n"><ptype>GLuint</ptype> *<name>semaphores</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>GLuint</ptype> <name>glGenSymbolsEXT</name></proto>
>+            <param group="DataTypeEXT"><ptype>GLenum</ptype> <name>datatype</name></param>
>+            <param group="VertexShaderStorageTypeEXT"><ptype>GLenum</ptype> <name>storagetype</name></param>
>+            <param group="ParameterRangeEXT"><ptype>GLenum</ptype> <name>range</name></param>
>+            <param><ptype>GLuint</ptype> <name>components</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGenTextures</name></proto>
>+            <param><ptype>GLsizei</ptype> <name>n</name></param>
>+            <param group="Texture" len="n"><ptype>GLuint</ptype> *<name>textures</name></param>
>+            <glx type="single" opcode="145"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glGenTexturesEXT</name></proto>
>+            <param><ptype>GLsizei</ptype> <name>n</name></param>
>+            <param group="Texture" len="n"><ptype>GLuint</ptype> *<name>textures</name></param>
>+            <glx type="vendor" opcode="13"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glGenTransformFeedbacks</name></proto>
>+            <param><ptype>GLsizei</ptype> <name>n</name></param>
>+            <param len="n"><ptype>GLuint</ptype> *<name>ids</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGenTransformFeedbacksNV</name></proto>
>+            <param><ptype>GLsizei</ptype> <name>n</name></param>
>+            <param len="n"><ptype>GLuint</ptype> *<name>ids</name></param>
>+            <alias name="glGenTransformFeedbacks"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glGenVertexArrays</name></proto>
>+            <param><ptype>GLsizei</ptype> <name>n</name></param>
>+            <param len="n"><ptype>GLuint</ptype> *<name>arrays</name></param>
>+            <glx type="single" opcode="206"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glGenVertexArraysAPPLE</name></proto>
>+            <param><ptype>GLsizei</ptype> <name>n</name></param>
>+            <param len="n"><ptype>GLuint</ptype> *<name>arrays</name></param>
>+            <alias name="glGenVertexArrays"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glGenVertexArraysOES</name></proto>
>+            <param><ptype>GLsizei</ptype> <name>n</name></param>
>+            <param len="n"><ptype>GLuint</ptype> *<name>arrays</name></param>
>+            <alias name="glGenVertexArrays"/>
>+        </command>
>+        <command>
>+            <proto><ptype>GLuint</ptype> <name>glGenVertexShadersEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>range</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGenerateMipmap</name></proto>
>+            <param group="TextureTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <glx type="render" opcode="4325"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glGenerateMipmapEXT</name></proto>
>+            <param group="TextureTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <alias name="glGenerateMipmap"/>
>+            <glx type="render" opcode="4325"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glGenerateMipmapOES</name></proto>
>+            <param group="TextureTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGenerateMultiTexMipmapEXT</name></proto>
>+            <param group="TextureUnit"><ptype>GLenum</ptype> <name>texunit</name></param>
>+            <param group="TextureTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGenerateTextureMipmap</name></proto>
>+            <param><ptype>GLuint</ptype> <name>texture</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGenerateTextureMipmapEXT</name></proto>
>+            <param group="Texture"><ptype>GLuint</ptype> <name>texture</name></param>
>+            <param group="TextureTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetActiveAtomicCounterBufferiv</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param><ptype>GLuint</ptype> <name>bufferIndex</name></param>
>+            <param group="AtomicCounterBufferPName"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="COMPSIZE(pname)"><ptype>GLint</ptype> *<name>params</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetActiveAttrib</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param><ptype>GLsizei</ptype> <name>bufSize</name></param>
>+            <param len="1"><ptype>GLsizei</ptype> *<name>length</name></param>
>+            <param len="1"><ptype>GLint</ptype> *<name>size</name></param>
>+            <param group="AttributeType" len="1"><ptype>GLenum</ptype> *<name>type</name></param>
>+            <param len="bufSize"><ptype>GLchar</ptype> *<name>name</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetActiveAttribARB</name></proto>
>+            <param group="handleARB"><ptype>GLhandleARB</ptype> <name>programObj</name></param>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param><ptype>GLsizei</ptype> <name>maxLength</name></param>
>+            <param len="1"><ptype>GLsizei</ptype> *<name>length</name></param>
>+            <param len="1"><ptype>GLint</ptype> *<name>size</name></param>
>+            <param len="1" group="AttributeType"><ptype>GLenum</ptype> *<name>type</name></param>
>+            <param len="maxLength"><ptype>GLcharARB</ptype> *<name>name</name></param>
>+            <alias name="glGetActiveAttrib"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetActiveSubroutineName</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param group="ShaderType"><ptype>GLenum</ptype> <name>shadertype</name></param>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param><ptype>GLsizei</ptype> <name>bufsize</name></param>
>+            <param len="1"><ptype>GLsizei</ptype> *<name>length</name></param>
>+            <param len="bufsize"><ptype>GLchar</ptype> *<name>name</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetActiveSubroutineUniformName</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param group="ShaderType"><ptype>GLenum</ptype> <name>shadertype</name></param>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param><ptype>GLsizei</ptype> <name>bufsize</name></param>
>+            <param len="1"><ptype>GLsizei</ptype> *<name>length</name></param>
>+            <param len="bufsize"><ptype>GLchar</ptype> *<name>name</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetActiveSubroutineUniformiv</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param group="ShaderType"><ptype>GLenum</ptype> <name>shadertype</name></param>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param group="SubroutineParameterName"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="COMPSIZE(pname)"><ptype>GLint</ptype> *<name>values</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetActiveUniform</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param><ptype>GLsizei</ptype> <name>bufSize</name></param>
>+            <param len="1"><ptype>GLsizei</ptype> *<name>length</name></param>
>+            <param len="1"><ptype>GLint</ptype> *<name>size</name></param>
>+            <param len="1" group="AttributeType"><ptype>GLenum</ptype> *<name>type</name></param>
>+            <param len="bufSize"><ptype>GLchar</ptype> *<name>name</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetActiveUniformARB</name></proto>
>+            <param group="handleARB"><ptype>GLhandleARB</ptype> <name>programObj</name></param>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param><ptype>GLsizei</ptype> <name>maxLength</name></param>
>+            <param len="1"><ptype>GLsizei</ptype> *<name>length</name></param>
>+            <param len="1"><ptype>GLint</ptype> *<name>size</name></param>
>+            <param len="1" group="AttributeType"><ptype>GLenum</ptype> *<name>type</name></param>
>+            <param len="maxLength"><ptype>GLcharARB</ptype> *<name>name</name></param>
>+            <alias name="glGetActiveUniform"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetActiveUniformBlockName</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param><ptype>GLuint</ptype> <name>uniformBlockIndex</name></param>
>+            <param><ptype>GLsizei</ptype> <name>bufSize</name></param>
>+            <param len="1"><ptype>GLsizei</ptype> *<name>length</name></param>
>+            <param len="bufSize"><ptype>GLchar</ptype> *<name>uniformBlockName</name></param>
>+            <glx type="single" opcode="220"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetActiveUniformBlockiv</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param><ptype>GLuint</ptype> <name>uniformBlockIndex</name></param>
>+            <param group="UniformBlockPName"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="COMPSIZE(program,uniformBlockIndex,pname)"><ptype>GLint</ptype> *<name>params</name></param>
>+            <glx type="single" opcode="219"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetActiveUniformName</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param><ptype>GLuint</ptype> <name>uniformIndex</name></param>
>+            <param><ptype>GLsizei</ptype> <name>bufSize</name></param>
>+            <param len="1"><ptype>GLsizei</ptype> *<name>length</name></param>
>+            <param len="bufSize"><ptype>GLchar</ptype> *<name>uniformName</name></param>
>+            <glx type="single" opcode="217"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetActiveUniformsiv</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param><ptype>GLsizei</ptype> <name>uniformCount</name></param>
>+            <param len="uniformCount">const <ptype>GLuint</ptype> *<name>uniformIndices</name></param>
>+            <param group="UniformPName"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="COMPSIZE(uniformCount,pname)"><ptype>GLint</ptype> *<name>params</name></param>
>+            <glx type="single" opcode="216"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetActiveVaryingNV</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param><ptype>GLsizei</ptype> <name>bufSize</name></param>
>+            <param len="1"><ptype>GLsizei</ptype> *<name>length</name></param>
>+            <param len="1"><ptype>GLsizei</ptype> *<name>size</name></param>
>+            <param len="1"><ptype>GLenum</ptype> *<name>type</name></param>
>+            <param len="COMPSIZE(program,index,bufSize)"><ptype>GLchar</ptype> *<name>name</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetArrayObjectfvATI</name></proto>
>+            <param group="EnableCap"><ptype>GLenum</ptype> <name>array</name></param>
>+            <param group="ArrayObjectPNameATI"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="1"><ptype>GLfloat</ptype> *<name>params</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetArrayObjectivATI</name></proto>
>+            <param group="EnableCap"><ptype>GLenum</ptype> <name>array</name></param>
>+            <param group="ArrayObjectPNameATI"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="1"><ptype>GLint</ptype> *<name>params</name></param>
>+        </command>
>+        <command comment="Could be an alias of glGetAttachedShaders except that GLhandleARB is different on MacOS X">
>+            <proto>void <name>glGetAttachedObjectsARB</name></proto>
>+            <param group="handleARB"><ptype>GLhandleARB</ptype> <name>containerObj</name></param>
>+            <param><ptype>GLsizei</ptype> <name>maxCount</name></param>
>+            <param len="1"><ptype>GLsizei</ptype> *<name>count</name></param>
>+            <param group="handleARB" len="maxCount"><ptype>GLhandleARB</ptype> *<name>obj</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetAttachedShaders</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param><ptype>GLsizei</ptype> <name>maxCount</name></param>
>+            <param len="1"><ptype>GLsizei</ptype> *<name>count</name></param>
>+            <param len="maxCount"><ptype>GLuint</ptype> *<name>shaders</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>GLint</ptype> <name>glGetAttribLocation</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param>const <ptype>GLchar</ptype> *<name>name</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>GLint</ptype> <name>glGetAttribLocationARB</name></proto>
>+            <param group="handleARB"><ptype>GLhandleARB</ptype> <name>programObj</name></param>
>+            <param>const <ptype>GLcharARB</ptype> *<name>name</name></param>
>+            <alias name="glGetAttribLocation"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetBooleanIndexedvEXT</name></proto>
>+            <param group="BufferTargetARB"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param group="Boolean" len="COMPSIZE(target)"><ptype>GLboolean</ptype> *<name>data</name></param>
>+            <alias name="glGetBooleani_v"/>
>+            <glx type="single" opcode="210"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetBooleani_v</name></proto>
>+            <param group="BufferTargetARB"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param group="Boolean" len="COMPSIZE(target)"><ptype>GLboolean</ptype> *<name>data</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetBooleanv</name></proto>
>+            <param group="GetPName"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param group="Boolean" len="COMPSIZE(pname)"><ptype>GLboolean</ptype> *<name>data</name></param>
>+            <glx type="single" opcode="112"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetBufferParameteri64v</name></proto>
>+            <param group="BufferTargetARB"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="BufferPNameARB"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="COMPSIZE(pname)"><ptype>GLint64</ptype> *<name>params</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetBufferParameteriv</name></proto>
>+            <param group="BufferTargetARB"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="BufferPNameARB"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="COMPSIZE(pname)"><ptype>GLint</ptype> *<name>params</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetBufferParameterivARB</name></proto>
>+            <param group="BufferTargetARB"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="BufferPNameARB"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="COMPSIZE(pname)"><ptype>GLint</ptype> *<name>params</name></param>
>+            <alias name="glGetBufferParameteriv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetBufferParameterui64vNV</name></proto>
>+            <param group="BufferTargetARB"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="COMPSIZE(pname)"><ptype>GLuint64EXT</ptype> *<name>params</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetBufferPointerv</name></proto>
>+            <param group="BufferTargetARB"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="BufferPointerNameARB"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="1">void **<name>params</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetBufferPointervARB</name></proto>
>+            <param group="BufferTargetARB"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="BufferPointerNameARB"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="1">void **<name>params</name></param>
>+            <alias name="glGetBufferPointerv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetBufferPointervOES</name></proto>
>+            <param group="BufferTargetARB"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="BufferPointerNameARB"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param>void **<name>params</name></param>
>+            <alias name="glGetBufferPointerv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetBufferSubData</name></proto>
>+            <param group="BufferTargetARB"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="BufferOffset"><ptype>GLintptr</ptype> <name>offset</name></param>
>+            <param group="BufferSize"><ptype>GLsizeiptr</ptype> <name>size</name></param>
>+            <param len="size">void *<name>data</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetBufferSubDataARB</name></proto>
>+            <param group="BufferTargetARB"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="BufferOffsetARB"><ptype>GLintptrARB</ptype> <name>offset</name></param>
>+            <param group="BufferSizeARB"><ptype>GLsizeiptrARB</ptype> <name>size</name></param>
>+            <param len="size">void *<name>data</name></param>
>+            <alias name="glGetBufferSubData"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetClipPlane</name></proto>
>+            <param group="ClipPlaneName"><ptype>GLenum</ptype> <name>plane</name></param>
>+            <param len="4"><ptype>GLdouble</ptype> *<name>equation</name></param>
>+            <glx type="single" opcode="113"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetClipPlanef</name></proto>
>+            <param group="ClipPlaneName"><ptype>GLenum</ptype> <name>plane</name></param>
>+            <param len="4"><ptype>GLfloat</ptype> *<name>equation</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetClipPlanefOES</name></proto>
>+            <param group="ClipPlaneName"><ptype>GLenum</ptype> <name>plane</name></param>
>+            <param len="4"><ptype>GLfloat</ptype> *<name>equation</name></param>
>+            <glx type="vendor" opcode="1421"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetClipPlanex</name></proto>
>+            <param group="ClipPlaneName"><ptype>GLenum</ptype> <name>plane</name></param>
>+            <param len="4"><ptype>GLfixed</ptype> *<name>equation</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetClipPlanexOES</name></proto>
>+            <param group="ClipPlaneName"><ptype>GLenum</ptype> <name>plane</name></param>
>+            <param len="4"><ptype>GLfixed</ptype> *<name>equation</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetColorTable</name></proto>
>+            <param group="ColorTableTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="PixelFormat"><ptype>GLenum</ptype> <name>format</name></param>
>+            <param group="PixelType"><ptype>GLenum</ptype> <name>type</name></param>
>+            <param len="COMPSIZE(target,format,type)">void *<name>table</name></param>
>+            <glx type="single" opcode="147"/>
>+            <glx type="render" opcode="334" name="glGetColorTablePBO" comment="PBO protocol"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetColorTableEXT</name></proto>
>+            <param group="ColorTableTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="PixelFormat"><ptype>GLenum</ptype> <name>format</name></param>
>+            <param group="PixelType"><ptype>GLenum</ptype> <name>type</name></param>
>+            <param len="COMPSIZE(target,format,type)">void *<name>data</name></param>
>+            <alias name="glGetColorTable"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetColorTableParameterfv</name></proto>
>+            <param group="ColorTableTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="GetColorTableParameterPNameSGI"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="COMPSIZE(pname)"><ptype>GLfloat</ptype> *<name>params</name></param>
>+            <glx type="single" opcode="148"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetColorTableParameterfvEXT</name></proto>
>+            <param group="ColorTableTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="GetColorTableParameterPNameSGI"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="COMPSIZE(pname)"><ptype>GLfloat</ptype> *<name>params</name></param>
>+            <alias name="glGetColorTableParameterfv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetColorTableParameterfvSGI</name></proto>
>+            <param group="ColorTableTargetSGI"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="GetColorTableParameterPNameSGI"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="COMPSIZE(pname)"><ptype>GLfloat</ptype> *<name>params</name></param>
>+            <glx type="vendor" opcode="4099"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetColorTableParameteriv</name></proto>
>+            <param group="ColorTableTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="GetColorTableParameterPNameSGI"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="COMPSIZE(pname)"><ptype>GLint</ptype> *<name>params</name></param>
>+            <glx type="single" opcode="149"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetColorTableParameterivEXT</name></proto>
>+            <param group="ColorTableTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="GetColorTableParameterPNameSGI"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="COMPSIZE(pname)"><ptype>GLint</ptype> *<name>params</name></param>
>+            <alias name="glGetColorTableParameteriv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetColorTableParameterivSGI</name></proto>
>+            <param group="ColorTableTargetSGI"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="GetColorTableParameterPNameSGI"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="COMPSIZE(pname)"><ptype>GLint</ptype> *<name>params</name></param>
>+            <glx type="vendor" opcode="4100"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetColorTableSGI</name></proto>
>+            <param group="ColorTableTargetSGI"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="PixelFormat"><ptype>GLenum</ptype> <name>format</name></param>
>+            <param group="PixelType"><ptype>GLenum</ptype> <name>type</name></param>
>+            <param len="COMPSIZE(target,format,type)">void *<name>table</name></param>
>+            <glx type="vendor" opcode="4098"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetCombinerInputParameterfvNV</name></proto>
>+            <param group="CombinerStageNV"><ptype>GLenum</ptype> <name>stage</name></param>
>+            <param group="CombinerPortionNV"><ptype>GLenum</ptype> <name>portion</name></param>
>+            <param group="CombinerVariableNV"><ptype>GLenum</ptype> <name>variable</name></param>
>+            <param group="CombinerParameterNV"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="COMPSIZE(pname)"><ptype>GLfloat</ptype> *<name>params</name></param>
>+            <glx type="vendor" opcode="1270"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetCombinerInputParameterivNV</name></proto>
>+            <param group="CombinerStageNV"><ptype>GLenum</ptype> <name>stage</name></param>
>+            <param group="CombinerPortionNV"><ptype>GLenum</ptype> <name>portion</name></param>
>+            <param group="CombinerVariableNV"><ptype>GLenum</ptype> <name>variable</name></param>
>+            <param group="CombinerParameterNV"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="COMPSIZE(pname)"><ptype>GLint</ptype> *<name>params</name></param>
>+            <glx type="vendor" opcode="1271"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetCombinerOutputParameterfvNV</name></proto>
>+            <param group="CombinerStageNV"><ptype>GLenum</ptype> <name>stage</name></param>
>+            <param group="CombinerPortionNV"><ptype>GLenum</ptype> <name>portion</name></param>
>+            <param group="CombinerParameterNV"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="COMPSIZE(pname)"><ptype>GLfloat</ptype> *<name>params</name></param>
>+            <glx type="vendor" opcode="1272"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetCombinerOutputParameterivNV</name></proto>
>+            <param group="CombinerStageNV"><ptype>GLenum</ptype> <name>stage</name></param>
>+            <param group="CombinerPortionNV"><ptype>GLenum</ptype> <name>portion</name></param>
>+            <param group="CombinerParameterNV"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="COMPSIZE(pname)"><ptype>GLint</ptype> *<name>params</name></param>
>+            <glx type="vendor" opcode="1273"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetCombinerStageParameterfvNV</name></proto>
>+            <param group="CombinerStageNV"><ptype>GLenum</ptype> <name>stage</name></param>
>+            <param group="CombinerParameterNV"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="COMPSIZE(pname)"><ptype>GLfloat</ptype> *<name>params</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>GLuint</ptype> <name>glGetCommandHeaderNV</name></proto>
>+            <param><ptype>GLenum</ptype> <name>tokenID</name></param>
>+            <param><ptype>GLuint</ptype> <name>size</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetCompressedMultiTexImageEXT</name></proto>
>+            <param group="TextureUnit"><ptype>GLenum</ptype> <name>texunit</name></param>
>+            <param group="TextureTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>lod</name></param>
>+            <param len="COMPSIZE(target,lod)">void *<name>img</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetCompressedTexImage</name></proto>
>+            <param group="TextureTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>level</name></param>
>+            <param group="CompressedTextureARB" len="COMPSIZE(target,level)">void *<name>img</name></param>
>+            <glx type="single" opcode="160"/>
>+            <glx type="render" opcode="335" name="glGetCompressedTexImagePBO" comment="PBO protocol"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetCompressedTexImageARB</name></proto>
>+            <param group="TextureTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>level</name></param>
>+            <param group="CompressedTextureARB" len="COMPSIZE(target,level)">void *<name>img</name></param>
>+            <alias name="glGetCompressedTexImage"/>
>+            <glx type="single" opcode="160"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetCompressedTextureImage</name></proto>
>+            <param><ptype>GLuint</ptype> <name>texture</name></param>
>+            <param><ptype>GLint</ptype> <name>level</name></param>
>+            <param><ptype>GLsizei</ptype> <name>bufSize</name></param>
>+            <param>void *<name>pixels</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetCompressedTextureImageEXT</name></proto>
>+            <param group="Texture"><ptype>GLuint</ptype> <name>texture</name></param>
>+            <param group="TextureTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>lod</name></param>
>+            <param len="COMPSIZE(target,lod)">void *<name>img</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetCompressedTextureSubImage</name></proto>
>+            <param><ptype>GLuint</ptype> <name>texture</name></param>
>+            <param><ptype>GLint</ptype> <name>level</name></param>
>+            <param><ptype>GLint</ptype> <name>xoffset</name></param>
>+            <param><ptype>GLint</ptype> <name>yoffset</name></param>
>+            <param><ptype>GLint</ptype> <name>zoffset</name></param>
>+            <param><ptype>GLsizei</ptype> <name>width</name></param>
>+            <param><ptype>GLsizei</ptype> <name>height</name></param>
>+            <param><ptype>GLsizei</ptype> <name>depth</name></param>
>+            <param><ptype>GLsizei</ptype> <name>bufSize</name></param>
>+            <param>void *<name>pixels</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetConvolutionFilter</name></proto>
>+            <param group="ConvolutionTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="PixelFormat"><ptype>GLenum</ptype> <name>format</name></param>
>+            <param group="PixelType"><ptype>GLenum</ptype> <name>type</name></param>
>+            <param len="COMPSIZE(target,format,type)">void *<name>image</name></param>
>+            <glx type="single" opcode="150"/>
>+            <glx type="render" opcode="336" name="glGetConvolutionFilterPBO" comment="PBO protocol"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetConvolutionFilterEXT</name></proto>
>+            <param group="ConvolutionTargetEXT"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="PixelFormat"><ptype>GLenum</ptype> <name>format</name></param>
>+            <param group="PixelType"><ptype>GLenum</ptype> <name>type</name></param>
>+            <param len="COMPSIZE(target,format,type)">void *<name>image</name></param>
>+            <glx type="vendor" opcode="1"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetConvolutionParameterfv</name></proto>
>+            <param group="ConvolutionTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="ConvolutionParameterEXT"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="COMPSIZE(pname)"><ptype>GLfloat</ptype> *<name>params</name></param>
>+            <glx type="single" opcode="151"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetConvolutionParameterfvEXT</name></proto>
>+            <param group="ConvolutionTargetEXT"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="ConvolutionParameterEXT"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="COMPSIZE(pname)"><ptype>GLfloat</ptype> *<name>params</name></param>
>+            <glx type="vendor" opcode="2"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetConvolutionParameteriv</name></proto>
>+            <param group="ConvolutionTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="ConvolutionParameterEXT"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="COMPSIZE(pname)"><ptype>GLint</ptype> *<name>params</name></param>
>+            <glx type="single" opcode="152"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetConvolutionParameterivEXT</name></proto>
>+            <param group="ConvolutionTargetEXT"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="ConvolutionParameterEXT"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="COMPSIZE(pname)"><ptype>GLint</ptype> *<name>params</name></param>
>+            <glx type="vendor" opcode="3"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetConvolutionParameterxvOES</name></proto>
>+            <param><ptype>GLenum</ptype> <name>target</name></param>
>+            <param><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="COMPSIZE(pname)"><ptype>GLfixed</ptype> *<name>params</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetCoverageModulationTableNV</name></proto>
>+            <param><ptype>GLsizei</ptype> <name>bufsize</name></param>
>+            <param><ptype>GLfloat</ptype> *<name>v</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>GLuint</ptype> <name>glGetDebugMessageLog</name></proto>
>+            <param><ptype>GLuint</ptype> <name>count</name></param>
>+            <param><ptype>GLsizei</ptype> <name>bufSize</name></param>
>+            <param len="count" group="DebugSource"><ptype>GLenum</ptype> *<name>sources</name></param>
>+            <param len="count" group="DebugType"><ptype>GLenum</ptype> *<name>types</name></param>
>+            <param len="count"><ptype>GLuint</ptype> *<name>ids</name></param>
>+            <param len="count" group="DebugSeverity"><ptype>GLenum</ptype> *<name>severities</name></param>
>+            <param len="count"><ptype>GLsizei</ptype> *<name>lengths</name></param>
>+            <param len="bufSize"><ptype>GLchar</ptype> *<name>messageLog</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>GLuint</ptype> <name>glGetDebugMessageLogAMD</name></proto>
>+            <param><ptype>GLuint</ptype> <name>count</name></param>
>+            <param><ptype>GLsizei</ptype> <name>bufsize</name></param>
>+            <param len="count"><ptype>GLenum</ptype> *<name>categories</name></param>
>+            <param len="count" group="DebugSeverity"><ptype>GLuint</ptype> *<name>severities</name></param>
>+            <param len="count"><ptype>GLuint</ptype> *<name>ids</name></param>
>+            <param len="count"><ptype>GLsizei</ptype> *<name>lengths</name></param>
>+            <param len="bufsize"><ptype>GLchar</ptype> *<name>message</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>GLuint</ptype> <name>glGetDebugMessageLogARB</name></proto>
>+            <param><ptype>GLuint</ptype> <name>count</name></param>
>+            <param><ptype>GLsizei</ptype> <name>bufSize</name></param>
>+            <param len="count" group="DebugSource"><ptype>GLenum</ptype> *<name>sources</name></param>
>+            <param len="count" group="DebugType"><ptype>GLenum</ptype> *<name>types</name></param>
>+            <param len="count"><ptype>GLuint</ptype> *<name>ids</name></param>
>+            <param len="count" group="DebugSeverity"><ptype>GLenum</ptype> *<name>severities</name></param>
>+            <param len="count"><ptype>GLsizei</ptype> *<name>lengths</name></param>
>+            <param len="bufSize"><ptype>GLchar</ptype> *<name>messageLog</name></param>
>+            <alias name="glGetDebugMessageLog"/>
>+        </command>
>+        <command>
>+            <proto><ptype>GLuint</ptype> <name>glGetDebugMessageLogKHR</name></proto>
>+            <param><ptype>GLuint</ptype> <name>count</name></param>
>+            <param><ptype>GLsizei</ptype> <name>bufSize</name></param>
>+            <param len="count" group="DebugSource"><ptype>GLenum</ptype> *<name>sources</name></param>
>+            <param len="count" group="DebugType"><ptype>GLenum</ptype> *<name>types</name></param>
>+            <param len="count"><ptype>GLuint</ptype> *<name>ids</name></param>
>+            <param len="count" group="DebugSeverity"><ptype>GLenum</ptype> *<name>severities</name></param>
>+            <param len="count"><ptype>GLsizei</ptype> *<name>lengths</name></param>
>+            <param len="bufSize"><ptype>GLchar</ptype> *<name>messageLog</name></param>
>+            <alias name="glGetDebugMessageLog"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetDetailTexFuncSGIS</name></proto>
>+            <param group="TextureTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param len="COMPSIZE(target)"><ptype>GLfloat</ptype> *<name>points</name></param>
>+            <glx type="vendor" opcode="4096"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetDoubleIndexedvEXT</name></proto>
>+            <param group="TypeEnum"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param len="COMPSIZE(target)"><ptype>GLdouble</ptype> *<name>data</name></param>
>+            <alias name="glGetDoublei_v"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetDoublei_v</name></proto>
>+            <param group="TypeEnum"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param len="COMPSIZE(target)"><ptype>GLdouble</ptype> *<name>data</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetDoublei_vEXT</name></proto>
>+            <param group="TypeEnum"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param len="COMPSIZE(pname)"><ptype>GLdouble</ptype> *<name>params</name></param>
>+            <alias name="glGetDoublei_v"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetDoublev</name></proto>
>+            <param group="GetPName"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="COMPSIZE(pname)"><ptype>GLdouble</ptype> *<name>data</name></param>
>+            <glx type="single" opcode="114"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetDriverControlStringQCOM</name></proto>
>+            <param><ptype>GLuint</ptype> <name>driverControl</name></param>
>+            <param><ptype>GLsizei</ptype> <name>bufSize</name></param>
>+            <param><ptype>GLsizei</ptype> *<name>length</name></param>
>+            <param len="bufSize"><ptype>GLchar</ptype> *<name>driverControlString</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetDriverControlsQCOM</name></proto>
>+            <param><ptype>GLint</ptype> *<name>num</name></param>
>+            <param><ptype>GLsizei</ptype> <name>size</name></param>
>+            <param len="size"><ptype>GLuint</ptype> *<name>driverControls</name></param>
>+        </command>
>+        <command>
>+            <proto group="ErrorCode"><ptype>GLenum</ptype> <name>glGetError</name></proto>
>+            <glx type="single" opcode="115"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetFenceivNV</name></proto>
>+            <param group="FenceNV"><ptype>GLuint</ptype> <name>fence</name></param>
>+            <param group="FenceParameterNameNV"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="COMPSIZE(pname)"><ptype>GLint</ptype> *<name>params</name></param>
>+            <glx type="vendor" opcode="1280"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetFinalCombinerInputParameterfvNV</name></proto>
>+            <param group="CombinerVariableNV"><ptype>GLenum</ptype> <name>variable</name></param>
>+            <param group="CombinerParameterNV"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="COMPSIZE(pname)"><ptype>GLfloat</ptype> *<name>params</name></param>
>+            <glx type="vendor" opcode="1274"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetFinalCombinerInputParameterivNV</name></proto>
>+            <param group="CombinerVariableNV"><ptype>GLenum</ptype> <name>variable</name></param>
>+            <param group="CombinerParameterNV"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="COMPSIZE(pname)"><ptype>GLint</ptype> *<name>params</name></param>
>+            <glx type="vendor" opcode="1275"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetFirstPerfQueryIdINTEL</name></proto>
>+            <param><ptype>GLuint</ptype> *<name>queryId</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetFixedv</name></proto>
>+            <param group="GetPName"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param><ptype>GLfixed</ptype> *<name>params</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetFixedvOES</name></proto>
>+            <param group="GetPName"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="COMPSIZE(pname)"><ptype>GLfixed</ptype> *<name>params</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetFloatIndexedvEXT</name></proto>
>+            <param group="TypeEnum"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param len="COMPSIZE(target)"><ptype>GLfloat</ptype> *<name>data</name></param>
>+            <alias name="glGetFloati_v"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetFloati_v</name></proto>
>+            <param group="TypeEnum"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param len="COMPSIZE(target)"><ptype>GLfloat</ptype> *<name>data</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetFloati_vEXT</name></proto>
>+            <param group="TypeEnum"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param len="COMPSIZE(pname)"><ptype>GLfloat</ptype> *<name>params</name></param>
>+            <alias name="glGetFloati_v"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetFloati_vNV</name></proto>
>+            <param group="TypeEnum"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param len="COMPSIZE(target)"><ptype>GLfloat</ptype> *<name>data</name></param>
>+            <alias name="glGetFloati_v"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetFloati_vOES</name></proto>
>+            <param group="TypeEnum"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param len="COMPSIZE(target)"><ptype>GLfloat</ptype> *<name>data</name></param>
>+            <alias name="glGetFloati_v"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetFloatv</name></proto>
>+            <param group="GetPName"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="COMPSIZE(pname)"><ptype>GLfloat</ptype> *<name>data</name></param>
>+            <glx type="single" opcode="116"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetFogFuncSGIS</name></proto>
>+            <param len="COMPSIZE()"><ptype>GLfloat</ptype> *<name>points</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>GLint</ptype> <name>glGetFragDataIndex</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param>const <ptype>GLchar</ptype> *<name>name</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>GLint</ptype> <name>glGetFragDataIndexEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param>const <ptype>GLchar</ptype> *<name>name</name></param>
>+            <alias name="glGetFragDataIndex"/>
>+        </command>
>+        <command>
>+            <proto><ptype>GLint</ptype> <name>glGetFragDataLocation</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param len="COMPSIZE(name)">const <ptype>GLchar</ptype> *<name>name</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>GLint</ptype> <name>glGetFragDataLocationEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param len="COMPSIZE(name)">const <ptype>GLchar</ptype> *<name>name</name></param>
>+            <alias name="glGetFragDataLocation"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetFragmentLightfvSGIX</name></proto>
>+            <param group="FragmentLightNameSGIX"><ptype>GLenum</ptype> <name>light</name></param>
>+            <param group="FragmentLightParameterSGIX"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="COMPSIZE(pname)"><ptype>GLfloat</ptype> *<name>params</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetFragmentLightivSGIX</name></proto>
>+            <param group="FragmentLightNameSGIX"><ptype>GLenum</ptype> <name>light</name></param>
>+            <param group="FragmentLightParameterSGIX"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="COMPSIZE(pname)"><ptype>GLint</ptype> *<name>params</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetFragmentMaterialfvSGIX</name></proto>
>+            <param group="MaterialFace"><ptype>GLenum</ptype> <name>face</name></param>
>+            <param group="MaterialParameter"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="COMPSIZE(pname)"><ptype>GLfloat</ptype> *<name>params</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetFragmentMaterialivSGIX</name></proto>
>+            <param group="MaterialFace"><ptype>GLenum</ptype> <name>face</name></param>
>+            <param group="MaterialParameter"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="COMPSIZE(pname)"><ptype>GLint</ptype> *<name>params</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetFramebufferAttachmentParameteriv</name></proto>
>+            <param group="FramebufferTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="FramebufferAttachment"><ptype>GLenum</ptype> <name>attachment</name></param>
>+            <param group="FramebufferAttachmentParameterName"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="COMPSIZE(pname)"><ptype>GLint</ptype> *<name>params</name></param>
>+            <glx type="vendor" opcode="1428"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetFramebufferAttachmentParameterivEXT</name></proto>
>+            <param group="FramebufferTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="FramebufferAttachment"><ptype>GLenum</ptype> <name>attachment</name></param>
>+            <param group="FramebufferAttachmentParameterName"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="COMPSIZE(pname)"><ptype>GLint</ptype> *<name>params</name></param>
>+            <alias name="glGetFramebufferAttachmentParameteriv"/>
>+            <glx type="vendor" opcode="1428"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetFramebufferAttachmentParameterivOES</name></proto>
>+            <param group="FramebufferTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="FramebufferAttachment"><ptype>GLenum</ptype> <name>attachment</name></param>
>+            <param group="FramebufferAttachmentParameterName"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="COMPSIZE(pname)"><ptype>GLint</ptype> *<name>params</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetFramebufferParameterfvAMD</name></proto>
>+            <param group="FramebufferTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="FramebufferAttachmentParameterName"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param><ptype>GLuint</ptype> <name>numsamples</name></param>
>+            <param><ptype>GLuint</ptype> <name>pixelindex</name></param>
>+            <param><ptype>GLsizei</ptype> <name>size</name></param>
>+            <param><ptype>GLfloat</ptype> *<name>values</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetFramebufferParameteriv</name></proto>
>+            <param group="FramebufferTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="FramebufferAttachmentParameterName"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="COMPSIZE(pname)"><ptype>GLint</ptype> *<name>params</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetFramebufferParameterivEXT</name></proto>
>+            <param group="Framebuffer"><ptype>GLuint</ptype> <name>framebuffer</name></param>
>+            <param group="GetFramebufferParameter"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="COMPSIZE(pname)"><ptype>GLint</ptype> *<name>params</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>GLsizei</ptype> <name>glGetFramebufferPixelLocalStorageSizeEXT</name></proto>
>+            <param group="FramebufferTarget"><ptype>GLuint</ptype> <name>target</name></param>
>+        </command>
>+        <command>
>+            <proto group="GraphicsResetStatus"><ptype>GLenum</ptype> <name>glGetGraphicsResetStatus</name></proto>
>+        </command>
>+        <command>
>+            <proto group="GraphicsResetStatus"><ptype>GLenum</ptype> <name>glGetGraphicsResetStatusARB</name></proto>
>+        </command>
>+        <command>
>+            <proto group="GraphicsResetStatus"><ptype>GLenum</ptype> <name>glGetGraphicsResetStatusEXT</name></proto>
>+        </command>
>+        <command>
>+            <proto group="GraphicsResetStatus"><ptype>GLenum</ptype> <name>glGetGraphicsResetStatusKHR</name></proto>
>+            <alias name="glGetGraphicsResetStatus"/>
>+        </command>
>+        <command>
>+            <proto group="handleARB"><ptype>GLhandleARB</ptype> <name>glGetHandleARB</name></proto>
>+            <param><ptype>GLenum</ptype> <name>pname</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetHistogram</name></proto>
>+            <param group="HistogramTargetEXT"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="Boolean"><ptype>GLboolean</ptype> <name>reset</name></param>
>+            <param group="PixelFormat"><ptype>GLenum</ptype> <name>format</name></param>
>+            <param group="PixelType"><ptype>GLenum</ptype> <name>type</name></param>
>+            <param len="COMPSIZE(target,format,type)">void *<name>values</name></param>
>+            <glx type="single" opcode="154"/>
>+            <glx type="render" opcode="337" name="glGetHistogramPBO" comment="PBO protocol"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetHistogramEXT</name></proto>
>+            <param group="HistogramTargetEXT"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="Boolean"><ptype>GLboolean</ptype> <name>reset</name></param>
>+            <param group="PixelFormat"><ptype>GLenum</ptype> <name>format</name></param>
>+            <param group="PixelType"><ptype>GLenum</ptype> <name>type</name></param>
>+            <param len="COMPSIZE(target,format,type)">void *<name>values</name></param>
>+            <glx type="vendor" opcode="5"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetHistogramParameterfv</name></proto>
>+            <param group="HistogramTargetEXT"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="GetHistogramParameterPNameEXT"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="COMPSIZE(pname)"><ptype>GLfloat</ptype> *<name>params</name></param>
>+            <glx type="single" opcode="155"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetHistogramParameterfvEXT</name></proto>
>+            <param group="HistogramTargetEXT"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="GetHistogramParameterPNameEXT"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="COMPSIZE(pname)"><ptype>GLfloat</ptype> *<name>params</name></param>
>+            <glx type="vendor" opcode="6"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetHistogramParameteriv</name></proto>
>+            <param group="HistogramTargetEXT"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="GetHistogramParameterPNameEXT"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="COMPSIZE(pname)"><ptype>GLint</ptype> *<name>params</name></param>
>+            <glx type="single" opcode="156"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetHistogramParameterivEXT</name></proto>
>+            <param group="HistogramTargetEXT"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="GetHistogramParameterPNameEXT"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="COMPSIZE(pname)"><ptype>GLint</ptype> *<name>params</name></param>
>+            <glx type="vendor" opcode="7"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetHistogramParameterxvOES</name></proto>
>+            <param group="HistogramTargetEXT"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="GetHistogramParameterPNameEXT"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="COMPSIZE(pname)"><ptype>GLfixed</ptype> *<name>params</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>GLuint64</ptype> <name>glGetImageHandleARB</name></proto>
>+            <param><ptype>GLuint</ptype> <name>texture</name></param>
>+            <param><ptype>GLint</ptype> <name>level</name></param>
>+            <param><ptype>GLboolean</ptype> <name>layered</name></param>
>+            <param><ptype>GLint</ptype> <name>layer</name></param>
>+            <param group="PixelFormat"><ptype>GLenum</ptype> <name>format</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>GLuint64</ptype> <name>glGetImageHandleNV</name></proto>
>+            <param><ptype>GLuint</ptype> <name>texture</name></param>
>+            <param><ptype>GLint</ptype> <name>level</name></param>
>+            <param group="Boolean"><ptype>GLboolean</ptype> <name>layered</name></param>
>+            <param><ptype>GLint</ptype> <name>layer</name></param>
>+            <param group="PixelFormat"><ptype>GLenum</ptype> <name>format</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetImageTransformParameterfvHP</name></proto>
>+            <param group="ImageTransformTargetHP"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="ImageTransformPNameHP"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="COMPSIZE(pname)"><ptype>GLfloat</ptype> *<name>params</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetImageTransformParameterivHP</name></proto>
>+            <param group="ImageTransformTargetHP"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="ImageTransformPNameHP"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="COMPSIZE(pname)"><ptype>GLint</ptype> *<name>params</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetInfoLogARB</name></proto>
>+            <param group="handleARB"><ptype>GLhandleARB</ptype> <name>obj</name></param>
>+            <param><ptype>GLsizei</ptype> <name>maxLength</name></param>
>+            <param len="1"><ptype>GLsizei</ptype> *<name>length</name></param>
>+            <param len="maxLength"><ptype>GLcharARB</ptype> *<name>infoLog</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>GLint</ptype> <name>glGetInstrumentsSGIX</name></proto>
>+            <glx type="vendor" opcode="4102"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetInteger64i_v</name></proto>
>+            <param group="TypeEnum"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param len="COMPSIZE(target)"><ptype>GLint64</ptype> *<name>data</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetInteger64v</name></proto>
>+            <param group="GetPName"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="COMPSIZE(pname)"><ptype>GLint64</ptype> *<name>data</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetInteger64vAPPLE</name></proto>
>+            <param group="GetPName"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param><ptype>GLint64</ptype> *<name>params</name></param>
>+            <alias name="glGetInteger64v"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetIntegerIndexedvEXT</name></proto>
>+            <param><ptype>GLenum</ptype> <name>target</name></param>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param len="COMPSIZE(target)"><ptype>GLint</ptype> *<name>data</name></param>
>+            <alias name="glGetIntegeri_v"/>
>+            <glx type="single" opcode="211"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetIntegeri_v</name></proto>
>+            <param group="TypeEnum"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param len="COMPSIZE(target)"><ptype>GLint</ptype> *<name>data</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetIntegeri_vEXT</name></proto>
>+            <param group="TypeEnum"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param><ptype>GLint</ptype> *<name>data</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetIntegerui64i_vNV</name></proto>
>+            <param><ptype>GLenum</ptype> <name>value</name></param>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param len="COMPSIZE(value)"><ptype>GLuint64EXT</ptype> *<name>result</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetIntegerui64vNV</name></proto>
>+            <param><ptype>GLenum</ptype> <name>value</name></param>
>+            <param len="COMPSIZE(value)"><ptype>GLuint64EXT</ptype> *<name>result</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetIntegerv</name></proto>
>+            <param group="GetPName"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="COMPSIZE(pname)"><ptype>GLint</ptype> *<name>data</name></param>
>+            <glx type="single" opcode="117"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetInternalformatSampleivNV</name></proto>
>+            <param group="TextureTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="InternalFormat"><ptype>GLenum</ptype> <name>internalformat</name></param>
>+            <param><ptype>GLsizei</ptype> <name>samples</name></param>
>+            <param group="InternalFormatPName"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param><ptype>GLsizei</ptype> <name>bufSize</name></param>
>+            <param len="bufSize"><ptype>GLint</ptype> *<name>params</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetInternalformati64v</name></proto>
>+            <param group="TextureTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="InternalFormat"><ptype>GLenum</ptype> <name>internalformat</name></param>
>+            <param group="InternalFormatPName"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param><ptype>GLsizei</ptype> <name>bufSize</name></param>
>+            <param len="bufSize"><ptype>GLint64</ptype> *<name>params</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetInternalformativ</name></proto>
>+            <param group="TextureTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="InternalFormat"><ptype>GLenum</ptype> <name>internalformat</name></param>
>+            <param group="InternalFormatPName"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param><ptype>GLsizei</ptype> <name>bufSize</name></param>
>+            <param len="bufSize"><ptype>GLint</ptype> *<name>params</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetInvariantBooleanvEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>id</name></param>
>+            <param group="GetVariantValueEXT"><ptype>GLenum</ptype> <name>value</name></param>
>+            <param group="Boolean" len="COMPSIZE(id)"><ptype>GLboolean</ptype> *<name>data</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetInvariantFloatvEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>id</name></param>
>+            <param group="GetVariantValueEXT"><ptype>GLenum</ptype> <name>value</name></param>
>+            <param len="COMPSIZE(id)"><ptype>GLfloat</ptype> *<name>data</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetInvariantIntegervEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>id</name></param>
>+            <param group="GetVariantValueEXT"><ptype>GLenum</ptype> <name>value</name></param>
>+            <param len="COMPSIZE(id)"><ptype>GLint</ptype> *<name>data</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetLightfv</name></proto>
>+            <param group="LightName"><ptype>GLenum</ptype> <name>light</name></param>
>+            <param group="LightParameter"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="COMPSIZE(pname)"><ptype>GLfloat</ptype> *<name>params</name></param>
>+            <glx type="single" opcode="118"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetLightiv</name></proto>
>+            <param group="LightName"><ptype>GLenum</ptype> <name>light</name></param>
>+            <param group="LightParameter"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="COMPSIZE(pname)"><ptype>GLint</ptype> *<name>params</name></param>
>+            <glx type="single" opcode="119"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetLightxOES</name></proto>
>+            <param group="LightName"><ptype>GLenum</ptype> <name>light</name></param>
>+            <param group="LightParameter"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="COMPSIZE(pname)"><ptype>GLfixed</ptype> *<name>params</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetLightxv</name></proto>
>+            <param group="LightName"><ptype>GLenum</ptype> <name>light</name></param>
>+            <param group="LightParameter"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="COMPSIZE(pname)"><ptype>GLfixed</ptype> *<name>params</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetLightxvOES</name></proto>
>+            <param group="LightName"><ptype>GLenum</ptype> <name>light</name></param>
>+            <param group="LightParameter"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="COMPSIZE(pname)"><ptype>GLfixed</ptype> *<name>params</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetListParameterfvSGIX</name></proto>
>+            <param group="List"><ptype>GLuint</ptype> <name>list</name></param>
>+            <param group="ListParameterName"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param group="CheckedFloat32" len="COMPSIZE(pname)"><ptype>GLfloat</ptype> *<name>params</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetListParameterivSGIX</name></proto>
>+            <param group="List"><ptype>GLuint</ptype> <name>list</name></param>
>+            <param group="ListParameterName"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param group="CheckedInt32" len="COMPSIZE(pname)"><ptype>GLint</ptype> *<name>params</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetLocalConstantBooleanvEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>id</name></param>
>+            <param group="GetVariantValueEXT"><ptype>GLenum</ptype> <name>value</name></param>
>+            <param group="Boolean" len="COMPSIZE(id)"><ptype>GLboolean</ptype> *<name>data</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetLocalConstantFloatvEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>id</name></param>
>+            <param group="GetVariantValueEXT"><ptype>GLenum</ptype> <name>value</name></param>
>+            <param len="COMPSIZE(id)"><ptype>GLfloat</ptype> *<name>data</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetLocalConstantIntegervEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>id</name></param>
>+            <param group="GetVariantValueEXT"><ptype>GLenum</ptype> <name>value</name></param>
>+            <param len="COMPSIZE(id)"><ptype>GLint</ptype> *<name>data</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetMapAttribParameterfvNV</name></proto>
>+            <param group="EvalTargetNV"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param group="MapAttribParameterNV"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="COMPSIZE(pname)"><ptype>GLfloat</ptype> *<name>params</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetMapAttribParameterivNV</name></proto>
>+            <param group="EvalTargetNV"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param group="MapAttribParameterNV"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="COMPSIZE(pname)"><ptype>GLint</ptype> *<name>params</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetMapControlPointsNV</name></proto>
>+            <param group="EvalTargetNV"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param group="MapTypeNV"><ptype>GLenum</ptype> <name>type</name></param>
>+            <param><ptype>GLsizei</ptype> <name>ustride</name></param>
>+            <param><ptype>GLsizei</ptype> <name>vstride</name></param>
>+            <param group="Boolean"><ptype>GLboolean</ptype> <name>packed</name></param>
>+            <param len="COMPSIZE(target)">void *<name>points</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetMapParameterfvNV</name></proto>
>+            <param group="EvalTargetNV"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="MapParameterNV"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="COMPSIZE(target,pname)"><ptype>GLfloat</ptype> *<name>params</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetMapParameterivNV</name></proto>
>+            <param group="EvalTargetNV"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="MapParameterNV"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="COMPSIZE(target,pname)"><ptype>GLint</ptype> *<name>params</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetMapdv</name></proto>
>+            <param group="MapTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="GetMapQuery"><ptype>GLenum</ptype> <name>query</name></param>
>+            <param len="COMPSIZE(target,query)"><ptype>GLdouble</ptype> *<name>v</name></param>
>+            <glx type="single" opcode="120"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetMapfv</name></proto>
>+            <param group="MapTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="GetMapQuery"><ptype>GLenum</ptype> <name>query</name></param>
>+            <param len="COMPSIZE(target,query)"><ptype>GLfloat</ptype> *<name>v</name></param>
>+            <glx type="single" opcode="121"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetMapiv</name></proto>
>+            <param group="MapTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="GetMapQuery"><ptype>GLenum</ptype> <name>query</name></param>
>+            <param len="COMPSIZE(target,query)"><ptype>GLint</ptype> *<name>v</name></param>
>+            <glx type="single" opcode="122"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetMapxvOES</name></proto>
>+            <param group="MapTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="GetMapQuery"><ptype>GLenum</ptype> <name>query</name></param>
>+            <param len="COMPSIZE(query)"><ptype>GLfixed</ptype> *<name>v</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetMaterialfv</name></proto>
>+            <param group="MaterialFace"><ptype>GLenum</ptype> <name>face</name></param>
>+            <param group="MaterialParameter"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="COMPSIZE(pname)"><ptype>GLfloat</ptype> *<name>params</name></param>
>+            <glx type="single" opcode="123"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetMaterialiv</name></proto>
>+            <param group="MaterialFace"><ptype>GLenum</ptype> <name>face</name></param>
>+            <param group="MaterialParameter"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="COMPSIZE(pname)"><ptype>GLint</ptype> *<name>params</name></param>
>+            <glx type="single" opcode="124"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetMaterialxOES</name></proto>
>+            <param group="MaterialFace"><ptype>GLenum</ptype> <name>face</name></param>
>+            <param group="MaterialParameter"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param><ptype>GLfixed</ptype> <name>param</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetMaterialxv</name></proto>
>+            <param group="MaterialFace"><ptype>GLenum</ptype> <name>face</name></param>
>+            <param group="MaterialParameter"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="COMPSIZE(pname)"><ptype>GLfixed</ptype> *<name>params</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetMaterialxvOES</name></proto>
>+            <param group="MaterialFace"><ptype>GLenum</ptype> <name>face</name></param>
>+            <param group="MaterialParameter"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="COMPSIZE(pname)"><ptype>GLfixed</ptype> *<name>params</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetMemoryObjectParameterivEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>memoryObject</name></param>
>+            <param group="MemoryObjectParameterName"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param><ptype>GLint</ptype> *<name>params</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetMinmax</name></proto>
>+            <param group="MinmaxTargetEXT"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="Boolean"><ptype>GLboolean</ptype> <name>reset</name></param>
>+            <param group="PixelFormat"><ptype>GLenum</ptype> <name>format</name></param>
>+            <param group="PixelType"><ptype>GLenum</ptype> <name>type</name></param>
>+            <param len="COMPSIZE(target,format,type)">void *<name>values</name></param>
>+            <glx type="single" opcode="157"/>
>+            <glx type="render" opcode="338" name="glGetMinmaxPBO" comment="PBO protocol"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetMinmaxEXT</name></proto>
>+            <param group="MinmaxTargetEXT"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="Boolean"><ptype>GLboolean</ptype> <name>reset</name></param>
>+            <param group="PixelFormat"><ptype>GLenum</ptype> <name>format</name></param>
>+            <param group="PixelType"><ptype>GLenum</ptype> <name>type</name></param>
>+            <param len="COMPSIZE(target,format,type)">void *<name>values</name></param>
>+            <glx type="vendor" opcode="8"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetMinmaxParameterfv</name></proto>
>+            <param group="MinmaxTargetEXT"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="GetMinmaxParameterPNameEXT"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="COMPSIZE(pname)"><ptype>GLfloat</ptype> *<name>params</name></param>
>+            <glx type="single" opcode="158"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetMinmaxParameterfvEXT</name></proto>
>+            <param group="MinmaxTargetEXT"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="GetMinmaxParameterPNameEXT"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="COMPSIZE(pname)"><ptype>GLfloat</ptype> *<name>params</name></param>
>+            <glx type="vendor" opcode="9"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetMinmaxParameteriv</name></proto>
>+            <param group="MinmaxTargetEXT"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="GetMinmaxParameterPNameEXT"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="COMPSIZE(pname)"><ptype>GLint</ptype> *<name>params</name></param>
>+            <glx type="single" opcode="159"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetMinmaxParameterivEXT</name></proto>
>+            <param group="MinmaxTargetEXT"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="GetMinmaxParameterPNameEXT"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="COMPSIZE(pname)"><ptype>GLint</ptype> *<name>params</name></param>
>+            <glx type="vendor" opcode="10"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetMultiTexEnvfvEXT</name></proto>
>+            <param group="TextureUnit"><ptype>GLenum</ptype> <name>texunit</name></param>
>+            <param group="TextureEnvTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="TextureEnvParameter"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="COMPSIZE(pname)"><ptype>GLfloat</ptype> *<name>params</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetMultiTexEnvivEXT</name></proto>
>+            <param group="TextureUnit"><ptype>GLenum</ptype> <name>texunit</name></param>
>+            <param group="TextureEnvTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="TextureEnvParameter"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="COMPSIZE(pname)"><ptype>GLint</ptype> *<name>params</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetMultiTexGendvEXT</name></proto>
>+            <param group="TextureUnit"><ptype>GLenum</ptype> <name>texunit</name></param>
>+            <param group="TextureCoordName"><ptype>GLenum</ptype> <name>coord</name></param>
>+            <param group="TextureGenParameter"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="COMPSIZE(pname)"><ptype>GLdouble</ptype> *<name>params</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetMultiTexGenfvEXT</name></proto>
>+            <param group="TextureUnit"><ptype>GLenum</ptype> <name>texunit</name></param>
>+            <param group="TextureCoordName"><ptype>GLenum</ptype> <name>coord</name></param>
>+            <param group="TextureGenParameter"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="COMPSIZE(pname)"><ptype>GLfloat</ptype> *<name>params</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetMultiTexGenivEXT</name></proto>
>+            <param group="TextureUnit"><ptype>GLenum</ptype> <name>texunit</name></param>
>+            <param group="TextureCoordName"><ptype>GLenum</ptype> <name>coord</name></param>
>+            <param group="TextureGenParameter"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="COMPSIZE(pname)"><ptype>GLint</ptype> *<name>params</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetMultiTexImageEXT</name></proto>
>+            <param group="TextureUnit"><ptype>GLenum</ptype> <name>texunit</name></param>
>+            <param group="TextureTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>level</name></param>
>+            <param group="PixelFormat"><ptype>GLenum</ptype> <name>format</name></param>
>+            <param group="PixelType"><ptype>GLenum</ptype> <name>type</name></param>
>+            <param len="COMPSIZE(target,level,format,type)">void *<name>pixels</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetMultiTexLevelParameterfvEXT</name></proto>
>+            <param group="TextureUnit"><ptype>GLenum</ptype> <name>texunit</name></param>
>+            <param group="TextureTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>level</name></param>
>+            <param group="GetTextureParameter"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="COMPSIZE(pname)"><ptype>GLfloat</ptype> *<name>params</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetMultiTexLevelParameterivEXT</name></proto>
>+            <param group="TextureUnit"><ptype>GLenum</ptype> <name>texunit</name></param>
>+            <param group="TextureTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>level</name></param>
>+            <param group="GetTextureParameter"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="COMPSIZE(pname)"><ptype>GLint</ptype> *<name>params</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetMultiTexParameterIivEXT</name></proto>
>+            <param group="TextureUnit"><ptype>GLenum</ptype> <name>texunit</name></param>
>+            <param group="TextureTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="GetTextureParameter"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="COMPSIZE(pname)"><ptype>GLint</ptype> *<name>params</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetMultiTexParameterIuivEXT</name></proto>
>+            <param group="TextureUnit"><ptype>GLenum</ptype> <name>texunit</name></param>
>+            <param group="TextureTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="GetTextureParameter"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="COMPSIZE(pname)"><ptype>GLuint</ptype> *<name>params</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetMultiTexParameterfvEXT</name></proto>
>+            <param group="TextureUnit"><ptype>GLenum</ptype> <name>texunit</name></param>
>+            <param group="TextureTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="GetTextureParameter"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="COMPSIZE(pname)"><ptype>GLfloat</ptype> *<name>params</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetMultiTexParameterivEXT</name></proto>
>+            <param group="TextureUnit"><ptype>GLenum</ptype> <name>texunit</name></param>
>+            <param group="TextureTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="GetTextureParameter"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="COMPSIZE(pname)"><ptype>GLint</ptype> *<name>params</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetMultisamplefv</name></proto>
>+            <param group="GetMultisamplePNameNV"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param len="COMPSIZE(pname)"><ptype>GLfloat</ptype> *<name>val</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetMultisamplefvNV</name></proto>
>+            <param group="GetMultisamplePNameNV"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param len="2"><ptype>GLfloat</ptype> *<name>val</name></param>
>+            <alias name="glGetMultisamplefv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetNamedBufferParameteri64v</name></proto>
>+            <param><ptype>GLuint</ptype> <name>buffer</name></param>
>+            <param group="VertexBufferObjectParameter"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param><ptype>GLint64</ptype> *<name>params</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetNamedBufferParameteriv</name></proto>
>+            <param><ptype>GLuint</ptype> <name>buffer</name></param>
>+            <param group="VertexBufferObjectParameter"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param><ptype>GLint</ptype> *<name>params</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetNamedBufferParameterivEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>buffer</name></param>
>+            <param group="VertexBufferObjectParameter"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="COMPSIZE(pname)"><ptype>GLint</ptype> *<name>params</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetNamedBufferParameterui64vNV</name></proto>
>+            <param><ptype>GLuint</ptype> <name>buffer</name></param>
>+            <param group="VertexBufferObjectParameter"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="COMPSIZE(pname)"><ptype>GLuint64EXT</ptype> *<name>params</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetNamedBufferPointerv</name></proto>
>+            <param><ptype>GLuint</ptype> <name>buffer</name></param>
>+            <param group="VertexBufferObjectParameter"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param>void **<name>params</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetNamedBufferPointervEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>buffer</name></param>
>+            <param group="VertexBufferObjectParameter"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="1">void **<name>params</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetNamedBufferSubData</name></proto>
>+            <param><ptype>GLuint</ptype> <name>buffer</name></param>
>+            <param><ptype>GLintptr</ptype> <name>offset</name></param>
>+            <param group="BufferSize"><ptype>GLsizeiptr</ptype> <name>size</name></param>
>+            <param>void *<name>data</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetNamedBufferSubDataEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>buffer</name></param>
>+            <param><ptype>GLintptr</ptype> <name>offset</name></param>
>+            <param><ptype>GLsizeiptr</ptype> <name>size</name></param>
>+            <param len="COMPSIZE(size)">void *<name>data</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetNamedFramebufferParameterfvAMD</name></proto>
>+            <param><ptype>GLuint</ptype> <name>framebuffer</name></param>
>+            <param><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param><ptype>GLuint</ptype> <name>numsamples</name></param>
>+            <param><ptype>GLuint</ptype> <name>pixelindex</name></param>
>+            <param><ptype>GLsizei</ptype> <name>size</name></param>
>+            <param><ptype>GLfloat</ptype> *<name>values</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetNamedFramebufferAttachmentParameteriv</name></proto>
>+            <param><ptype>GLuint</ptype> <name>framebuffer</name></param>
>+            <param group="FramebufferAttachment"><ptype>GLenum</ptype> <name>attachment</name></param>
>+            <param group="FramebufferAttachmentParameterName"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param><ptype>GLint</ptype> *<name>params</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetNamedFramebufferAttachmentParameterivEXT</name></proto>
>+            <param group="Framebuffer"><ptype>GLuint</ptype> <name>framebuffer</name></param>
>+            <param group="FramebufferAttachment"><ptype>GLenum</ptype> <name>attachment</name></param>
>+            <param group="FramebufferAttachmentParameterName"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="COMPSIZE(pname)"><ptype>GLint</ptype> *<name>params</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetNamedFramebufferParameteriv</name></proto>
>+            <param><ptype>GLuint</ptype> <name>framebuffer</name></param>
>+            <param group="GetFramebufferParameter"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param><ptype>GLint</ptype> *<name>param</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetNamedFramebufferParameterivEXT</name></proto>
>+            <param group="Framebuffer"><ptype>GLuint</ptype> <name>framebuffer</name></param>
>+            <param group="GetFramebufferParameter"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="COMPSIZE(pname)"><ptype>GLint</ptype> *<name>params</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetNamedProgramLocalParameterIivEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param group="ProgramTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param len="4"><ptype>GLint</ptype> *<name>params</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetNamedProgramLocalParameterIuivEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param group="ProgramTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param len="4"><ptype>GLuint</ptype> *<name>params</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetNamedProgramLocalParameterdvEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param group="ProgramTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param len="4"><ptype>GLdouble</ptype> *<name>params</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetNamedProgramLocalParameterfvEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param group="ProgramTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param len="4"><ptype>GLfloat</ptype> *<name>params</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetNamedProgramStringEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param group="ProgramTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="ProgramStringProperty"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="COMPSIZE(program,pname)">void *<name>string</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetNamedProgramivEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param group="ProgramTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="ProgramPropertyARB"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="1"><ptype>GLint</ptype> *<name>params</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetNamedRenderbufferParameteriv</name></proto>
>+            <param><ptype>GLuint</ptype> <name>renderbuffer</name></param>
>+            <param group="RenderbufferParameterName"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param><ptype>GLint</ptype> *<name>params</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetNamedRenderbufferParameterivEXT</name></proto>
>+            <param group="Renderbuffer"><ptype>GLuint</ptype> <name>renderbuffer</name></param>
>+            <param group="RenderbufferParameterName"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="COMPSIZE(pname)"><ptype>GLint</ptype> *<name>params</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetNamedStringARB</name></proto>
>+            <param><ptype>GLint</ptype> <name>namelen</name></param>
>+            <param len="namelen">const <ptype>GLchar</ptype> *<name>name</name></param>
>+            <param><ptype>GLsizei</ptype> <name>bufSize</name></param>
>+            <param len="1"><ptype>GLint</ptype> *<name>stringlen</name></param>
>+            <param len="bufSize"><ptype>GLchar</ptype> *<name>string</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetNamedStringivARB</name></proto>
>+            <param><ptype>GLint</ptype> <name>namelen</name></param>
>+            <param len="namelen">const <ptype>GLchar</ptype> *<name>name</name></param>
>+            <param><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="COMPSIZE(pname)"><ptype>GLint</ptype> *<name>params</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetNextPerfQueryIdINTEL</name></proto>
>+            <param><ptype>GLuint</ptype> <name>queryId</name></param>
>+            <param><ptype>GLuint</ptype> *<name>nextQueryId</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetObjectBufferfvATI</name></proto>
>+            <param><ptype>GLuint</ptype> <name>buffer</name></param>
>+            <param group="ArrayObjectPNameATI"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="1"><ptype>GLfloat</ptype> *<name>params</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetObjectBufferivATI</name></proto>
>+            <param><ptype>GLuint</ptype> <name>buffer</name></param>
>+            <param group="ArrayObjectPNameATI"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="1"><ptype>GLint</ptype> *<name>params</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetObjectLabel</name></proto>
>+            <param><ptype>GLenum</ptype> <name>identifier</name></param>
>+            <param><ptype>GLuint</ptype> <name>name</name></param>
>+            <param><ptype>GLsizei</ptype> <name>bufSize</name></param>
>+            <param len="1"><ptype>GLsizei</ptype> *<name>length</name></param>
>+            <param len="bufSize"><ptype>GLchar</ptype> *<name>label</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetObjectLabelEXT</name></proto>
>+            <param><ptype>GLenum</ptype> <name>type</name></param>
>+            <param><ptype>GLuint</ptype> <name>object</name></param>
>+            <param><ptype>GLsizei</ptype> <name>bufSize</name></param>
>+            <param len="1"><ptype>GLsizei</ptype> *<name>length</name></param>
>+            <param len="bufSize"><ptype>GLchar</ptype> *<name>label</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetObjectLabelKHR</name></proto>
>+            <param><ptype>GLenum</ptype> <name>identifier</name></param>
>+            <param><ptype>GLuint</ptype> <name>name</name></param>
>+            <param><ptype>GLsizei</ptype> <name>bufSize</name></param>
>+            <param><ptype>GLsizei</ptype> *<name>length</name></param>
>+            <param len="bufSize"><ptype>GLchar</ptype> *<name>label</name></param>
>+            <alias name="glGetObjectLabel"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetObjectParameterfvARB</name></proto>
>+            <param group="handleARB"><ptype>GLhandleARB</ptype> <name>obj</name></param>
>+            <param><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="COMPSIZE(pname)"><ptype>GLfloat</ptype> *<name>params</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetObjectParameterivAPPLE</name></proto>
>+            <param><ptype>GLenum</ptype> <name>objectType</name></param>
>+            <param><ptype>GLuint</ptype> <name>name</name></param>
>+            <param><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="COMPSIZE(pname)"><ptype>GLint</ptype> *<name>params</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetObjectParameterivARB</name></proto>
>+            <param group="handleARB"><ptype>GLhandleARB</ptype> <name>obj</name></param>
>+            <param><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="COMPSIZE(pname)"><ptype>GLint</ptype> *<name>params</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetObjectPtrLabel</name></proto>
>+            <param>const void *<name>ptr</name></param>
>+            <param><ptype>GLsizei</ptype> <name>bufSize</name></param>
>+            <param len="1"><ptype>GLsizei</ptype> *<name>length</name></param>
>+            <param len="bufSize"><ptype>GLchar</ptype> *<name>label</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetObjectPtrLabelKHR</name></proto>
>+            <param>const void *<name>ptr</name></param>
>+            <param><ptype>GLsizei</ptype> <name>bufSize</name></param>
>+            <param len="1"><ptype>GLsizei</ptype> *<name>length</name></param>
>+            <param len="bufSize"><ptype>GLchar</ptype> *<name>label</name></param>
>+            <alias name="glGetObjectPtrLabel"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetOcclusionQueryivNV</name></proto>
>+            <param><ptype>GLuint</ptype> <name>id</name></param>
>+            <param group="OcclusionQueryParameterNameNV"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="COMPSIZE(pname)"><ptype>GLint</ptype> *<name>params</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetOcclusionQueryuivNV</name></proto>
>+            <param><ptype>GLuint</ptype> <name>id</name></param>
>+            <param group="OcclusionQueryParameterNameNV"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="COMPSIZE(pname)"><ptype>GLuint</ptype> *<name>params</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetPathColorGenfvNV</name></proto>
>+            <param group="PathColor"><ptype>GLenum</ptype> <name>color</name></param>
>+            <param group="PathGenMode"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="COMPSIZE(pname)"><ptype>GLfloat</ptype> *<name>value</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetPathColorGenivNV</name></proto>
>+            <param group="PathColor"><ptype>GLenum</ptype> <name>color</name></param>
>+            <param group="PathGenMode"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="COMPSIZE(pname)"><ptype>GLint</ptype> *<name>value</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetPathCommandsNV</name></proto>
>+            <param group="Path"><ptype>GLuint</ptype> <name>path</name></param>
>+            <param group="PathCommand" len="COMPSIZE(path)"><ptype>GLubyte</ptype> *<name>commands</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetPathCoordsNV</name></proto>
>+            <param group="Path"><ptype>GLuint</ptype> <name>path</name></param>
>+            <param len="COMPSIZE(path)"><ptype>GLfloat</ptype> *<name>coords</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetPathDashArrayNV</name></proto>
>+            <param group="Path"><ptype>GLuint</ptype> <name>path</name></param>
>+            <param len="COMPSIZE(path)"><ptype>GLfloat</ptype> *<name>dashArray</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>GLfloat</ptype> <name>glGetPathLengthNV</name></proto>
>+            <param group="Path"><ptype>GLuint</ptype> <name>path</name></param>
>+            <param><ptype>GLsizei</ptype> <name>startSegment</name></param>
>+            <param><ptype>GLsizei</ptype> <name>numSegments</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetPathMetricRangeNV</name></proto>
>+            <param group="PathMetricMask"><ptype>GLbitfield</ptype> <name>metricQueryMask</name></param>
>+            <param group="Path"><ptype>GLuint</ptype> <name>firstPathName</name></param>
>+            <param><ptype>GLsizei</ptype> <name>numPaths</name></param>
>+            <param><ptype>GLsizei</ptype> <name>stride</name></param>
>+            <param len="COMPSIZE(metricQueryMask,numPaths,stride)"><ptype>GLfloat</ptype> *<name>metrics</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetPathMetricsNV</name></proto>
>+            <param group="PathMetricMask"><ptype>GLbitfield</ptype> <name>metricQueryMask</name></param>
>+            <param><ptype>GLsizei</ptype> <name>numPaths</name></param>
>+            <param group="PathElementType"><ptype>GLenum</ptype> <name>pathNameType</name></param>
>+            <param group="PathElement" len="COMPSIZE(numPaths,pathNameType,paths)">const void *<name>paths</name></param>
>+            <param group="Path"><ptype>GLuint</ptype> <name>pathBase</name></param>
>+            <param><ptype>GLsizei</ptype> <name>stride</name></param>
>+            <param len="COMPSIZE(metricQueryMask,numPaths,stride)"><ptype>GLfloat</ptype> *<name>metrics</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetPathParameterfvNV</name></proto>
>+            <param group="Path"><ptype>GLuint</ptype> <name>path</name></param>
>+            <param group="PathParameter"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="4"><ptype>GLfloat</ptype> *<name>value</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetPathParameterivNV</name></proto>
>+            <param group="Path"><ptype>GLuint</ptype> <name>path</name></param>
>+            <param group="PathParameter"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="4"><ptype>GLint</ptype> *<name>value</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetPathSpacingNV</name></proto>
>+            <param group="PathListMode"><ptype>GLenum</ptype> <name>pathListMode</name></param>
>+            <param><ptype>GLsizei</ptype> <name>numPaths</name></param>
>+            <param group="PathElementType"><ptype>GLenum</ptype> <name>pathNameType</name></param>
>+            <param group="PathElement" len="COMPSIZE(numPaths,pathNameType,paths)">const void *<name>paths</name></param>
>+            <param group="Path"><ptype>GLuint</ptype> <name>pathBase</name></param>
>+            <param><ptype>GLfloat</ptype> <name>advanceScale</name></param>
>+            <param><ptype>GLfloat</ptype> <name>kerningScale</name></param>
>+            <param group="PathTransformType"><ptype>GLenum</ptype> <name>transformType</name></param>
>+            <param len="COMPSIZE(pathListMode,numPaths)"><ptype>GLfloat</ptype> *<name>returnedSpacing</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetPathTexGenfvNV</name></proto>
>+            <param group="TextureUnit"><ptype>GLenum</ptype> <name>texCoordSet</name></param>
>+            <param group="PathGenMode"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="COMPSIZE(pname)"><ptype>GLfloat</ptype> *<name>value</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetPathTexGenivNV</name></proto>
>+            <param group="TextureUnit"><ptype>GLenum</ptype> <name>texCoordSet</name></param>
>+            <param group="PathGenMode"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="COMPSIZE(pname)"><ptype>GLint</ptype> *<name>value</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetPerfCounterInfoINTEL</name></proto>
>+            <param><ptype>GLuint</ptype> <name>queryId</name></param>
>+            <param><ptype>GLuint</ptype> <name>counterId</name></param>
>+            <param><ptype>GLuint</ptype> <name>counterNameLength</name></param>
>+            <param><ptype>GLchar</ptype> *<name>counterName</name></param>
>+            <param><ptype>GLuint</ptype> <name>counterDescLength</name></param>
>+            <param><ptype>GLchar</ptype> *<name>counterDesc</name></param>
>+            <param><ptype>GLuint</ptype> *<name>counterOffset</name></param>
>+            <param><ptype>GLuint</ptype> *<name>counterDataSize</name></param>
>+            <param><ptype>GLuint</ptype> *<name>counterTypeEnum</name></param>
>+            <param><ptype>GLuint</ptype> *<name>counterDataTypeEnum</name></param>
>+            <param><ptype>GLuint64</ptype> *<name>rawCounterMaxValue</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetPerfMonitorCounterDataAMD</name></proto>
>+            <param><ptype>GLuint</ptype> <name>monitor</name></param>
>+            <param><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param><ptype>GLsizei</ptype> <name>dataSize</name></param>
>+            <param len="dataSize"><ptype>GLuint</ptype> *<name>data</name></param>
>+            <param len="1"><ptype>GLint</ptype> *<name>bytesWritten</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetPerfMonitorCounterInfoAMD</name></proto>
>+            <param><ptype>GLuint</ptype> <name>group</name></param>
>+            <param><ptype>GLuint</ptype> <name>counter</name></param>
>+            <param><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="COMPSIZE(pname)">void *<name>data</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetPerfMonitorCounterStringAMD</name></proto>
>+            <param><ptype>GLuint</ptype> <name>group</name></param>
>+            <param><ptype>GLuint</ptype> <name>counter</name></param>
>+            <param><ptype>GLsizei</ptype> <name>bufSize</name></param>
>+            <param len="1"><ptype>GLsizei</ptype> *<name>length</name></param>
>+            <param len="bufSize"><ptype>GLchar</ptype> *<name>counterString</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetPerfMonitorCountersAMD</name></proto>
>+            <param><ptype>GLuint</ptype> <name>group</name></param>
>+            <param len="1"><ptype>GLint</ptype> *<name>numCounters</name></param>
>+            <param len="1"><ptype>GLint</ptype> *<name>maxActiveCounters</name></param>
>+            <param><ptype>GLsizei</ptype> <name>counterSize</name></param>
>+            <param len="counterSize"><ptype>GLuint</ptype> *<name>counters</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetPerfMonitorGroupStringAMD</name></proto>
>+            <param><ptype>GLuint</ptype> <name>group</name></param>
>+            <param><ptype>GLsizei</ptype> <name>bufSize</name></param>
>+            <param len="1"><ptype>GLsizei</ptype> *<name>length</name></param>
>+            <param len="bufSize"><ptype>GLchar</ptype> *<name>groupString</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetPerfMonitorGroupsAMD</name></proto>
>+            <param len="1"><ptype>GLint</ptype> *<name>numGroups</name></param>
>+            <param><ptype>GLsizei</ptype> <name>groupsSize</name></param>
>+            <param len="groupsSize"><ptype>GLuint</ptype> *<name>groups</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetPerfQueryDataINTEL</name></proto>
>+            <param><ptype>GLuint</ptype> <name>queryHandle</name></param>
>+            <param><ptype>GLuint</ptype> <name>flags</name></param>
>+            <param><ptype>GLsizei</ptype> <name>dataSize</name></param>
>+            <param>void *<name>data</name></param>
>+            <param><ptype>GLuint</ptype> *<name>bytesWritten</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetPerfQueryIdByNameINTEL</name></proto>
>+            <param><ptype>GLchar</ptype> *<name>queryName</name></param>
>+            <param><ptype>GLuint</ptype> *<name>queryId</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetPerfQueryInfoINTEL</name></proto>
>+            <param><ptype>GLuint</ptype> <name>queryId</name></param>
>+            <param><ptype>GLuint</ptype> <name>queryNameLength</name></param>
>+            <param><ptype>GLchar</ptype> *<name>queryName</name></param>
>+            <param><ptype>GLuint</ptype> *<name>dataSize</name></param>
>+            <param><ptype>GLuint</ptype> *<name>noCounters</name></param>
>+            <param><ptype>GLuint</ptype> *<name>noInstances</name></param>
>+            <param><ptype>GLuint</ptype> *<name>capsMask</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetPixelMapfv</name></proto>
>+            <param group="PixelMap"><ptype>GLenum</ptype> <name>map</name></param>
>+            <param len="COMPSIZE(map)"><ptype>GLfloat</ptype> *<name>values</name></param>
>+            <glx type="single" opcode="125"/>
>+            <glx type="render" opcode="339" name="glGetPixelMapfvPBO" comment="PBO protocol"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetPixelMapuiv</name></proto>
>+            <param group="PixelMap"><ptype>GLenum</ptype> <name>map</name></param>
>+            <param len="COMPSIZE(map)"><ptype>GLuint</ptype> *<name>values</name></param>
>+            <glx type="single" opcode="126"/>
>+            <glx type="render" opcode="340" name="glGetPixelMapuivPBO" comment="PBO protocol"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetPixelMapusv</name></proto>
>+            <param group="PixelMap"><ptype>GLenum</ptype> <name>map</name></param>
>+            <param len="COMPSIZE(map)"><ptype>GLushort</ptype> *<name>values</name></param>
>+            <glx type="single" opcode="127"/>
>+            <glx type="render" opcode="341" name="glGetPixelMapusvPBO" comment="PBO protocol"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetPixelMapxv</name></proto>
>+            <param group="PixelMap"><ptype>GLenum</ptype> <name>map</name></param>
>+            <param><ptype>GLint</ptype> <name>size</name></param>
>+            <param len="size"><ptype>GLfixed</ptype> *<name>values</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetPixelTexGenParameterfvSGIS</name></proto>
>+            <param group="PixelTexGenParameterNameSGIS"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param group="CheckedFloat32" len="COMPSIZE(pname)"><ptype>GLfloat</ptype> *<name>params</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetPixelTexGenParameterivSGIS</name></proto>
>+            <param group="PixelTexGenParameterNameSGIS"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param group="CheckedInt32" len="COMPSIZE(pname)"><ptype>GLint</ptype> *<name>params</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetPixelTransformParameterfvEXT</name></proto>
>+            <param group="TypeEnum"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="COMPSIZE(pname)"><ptype>GLfloat</ptype> *<name>params</name></param>
>+            <glx type="vendor" opcode="2051"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetPixelTransformParameterivEXT</name></proto>
>+            <param group="TypeEnum"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="COMPSIZE(pname)"><ptype>GLint</ptype> *<name>params</name></param>
>+            <glx type="vendor" opcode="2052"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetPointerIndexedvEXT</name></proto>
>+            <param group="TypeEnum"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param len="1">void **<name>data</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetPointeri_vEXT</name></proto>
>+            <param group="TypeEnum"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param len="1">void **<name>params</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetPointerv</name></proto>
>+            <param group="GetPointervPName"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="1">void **<name>params</name></param>
>+            <glx type="single" opcode="208"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetPointervEXT</name></proto>
>+            <param group="GetPointervPName"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="1">void **<name>params</name></param>
>+            <alias name="glGetPointerv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetPointervKHR</name></proto>
>+            <param><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param>void **<name>params</name></param>
>+            <alias name="glGetPointerv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetPolygonStipple</name></proto>
>+            <param len="COMPSIZE()"><ptype>GLubyte</ptype> *<name>mask</name></param>
>+            <glx type="single" opcode="128"/>
>+            <glx type="render" opcode="342" name="glGetPolygonStipplePBO" comment="PBO protocol"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetProgramBinary</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param><ptype>GLsizei</ptype> <name>bufSize</name></param>
>+            <param len="1"><ptype>GLsizei</ptype> *<name>length</name></param>
>+            <param len="1"><ptype>GLenum</ptype> *<name>binaryFormat</name></param>
>+            <param len="bufSize">void *<name>binary</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetProgramBinaryOES</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param><ptype>GLsizei</ptype> <name>bufSize</name></param>
>+            <param len="1"><ptype>GLsizei</ptype> *<name>length</name></param>
>+            <param len="1"><ptype>GLenum</ptype> *<name>binaryFormat</name></param>
>+            <param len="bufSize">void *<name>binary</name></param>
>+            <alias name="glGetProgramBinary"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetProgramEnvParameterIivNV</name></proto>
>+            <param group="ProgramTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param len="4"><ptype>GLint</ptype> *<name>params</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetProgramEnvParameterIuivNV</name></proto>
>+            <param group="ProgramTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param len="4"><ptype>GLuint</ptype> *<name>params</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetProgramEnvParameterdvARB</name></proto>
>+            <param group="ProgramTargetARB"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param len="4"><ptype>GLdouble</ptype> *<name>params</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetProgramEnvParameterfvARB</name></proto>
>+            <param group="ProgramTargetARB"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param len="4"><ptype>GLfloat</ptype> *<name>params</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetProgramInfoLog</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param><ptype>GLsizei</ptype> <name>bufSize</name></param>
>+            <param len="1"><ptype>GLsizei</ptype> *<name>length</name></param>
>+            <param len="bufSize"><ptype>GLchar</ptype> *<name>infoLog</name></param>
>+            <glx type="single" opcode="201"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetProgramInterfaceiv</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param group="ProgramInterface"><ptype>GLenum</ptype> <name>programInterface</name></param>
>+            <param group="ProgramInterfacePName"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="COMPSIZE(pname)"><ptype>GLint</ptype> *<name>params</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetProgramLocalParameterIivNV</name></proto>
>+            <param group="ProgramTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param len="4"><ptype>GLint</ptype> *<name>params</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetProgramLocalParameterIuivNV</name></proto>
>+            <param group="ProgramTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param len="4"><ptype>GLuint</ptype> *<name>params</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetProgramLocalParameterdvARB</name></proto>
>+            <param group="ProgramTargetARB"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param len="4"><ptype>GLdouble</ptype> *<name>params</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetProgramLocalParameterfvARB</name></proto>
>+            <param group="ProgramTargetARB"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param len="4"><ptype>GLfloat</ptype> *<name>params</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetProgramNamedParameterdvNV</name></proto>
>+            <param><ptype>GLuint</ptype> <name>id</name></param>
>+            <param><ptype>GLsizei</ptype> <name>len</name></param>
>+            <param len="1">const <ptype>GLubyte</ptype> *<name>name</name></param>
>+            <param len="4"><ptype>GLdouble</ptype> *<name>params</name></param>
>+            <glx type="vendor" opcode="1311"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetProgramNamedParameterfvNV</name></proto>
>+            <param><ptype>GLuint</ptype> <name>id</name></param>
>+            <param><ptype>GLsizei</ptype> <name>len</name></param>
>+            <param len="1">const <ptype>GLubyte</ptype> *<name>name</name></param>
>+            <param len="4"><ptype>GLfloat</ptype> *<name>params</name></param>
>+            <glx type="vendor" opcode="1310"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetProgramParameterdvNV</name></proto>
>+            <param group="VertexAttribEnumNV"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param group="VertexAttribEnumNV"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="4"><ptype>GLdouble</ptype> *<name>params</name></param>
>+            <glx type="vendor" opcode="1297"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetProgramParameterfvNV</name></proto>
>+            <param group="VertexAttribEnumNV"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param group="VertexAttribEnumNV"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="4"><ptype>GLfloat</ptype> *<name>params</name></param>
>+            <glx type="vendor" opcode="1296"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetProgramPipelineInfoLog</name></proto>
>+            <param><ptype>GLuint</ptype> <name>pipeline</name></param>
>+            <param><ptype>GLsizei</ptype> <name>bufSize</name></param>
>+            <param len="1"><ptype>GLsizei</ptype> *<name>length</name></param>
>+            <param len="bufSize"><ptype>GLchar</ptype> *<name>infoLog</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetProgramPipelineInfoLogEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>pipeline</name></param>
>+            <param><ptype>GLsizei</ptype> <name>bufSize</name></param>
>+            <param len="1"><ptype>GLsizei</ptype> *<name>length</name></param>
>+            <param len="bufSize"><ptype>GLchar</ptype> *<name>infoLog</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetProgramPipelineiv</name></proto>
>+            <param><ptype>GLuint</ptype> <name>pipeline</name></param>
>+            <param group="PipelineParameterName"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="COMPSIZE(pname)"><ptype>GLint</ptype> *<name>params</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetProgramPipelineivEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>pipeline</name></param>
>+            <param group="PipelineParameterName"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param><ptype>GLint</ptype> *<name>params</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>GLuint</ptype> <name>glGetProgramResourceIndex</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param group="ProgramInterface"><ptype>GLenum</ptype> <name>programInterface</name></param>
>+            <param len="COMPSIZE(name)">const <ptype>GLchar</ptype> *<name>name</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>GLint</ptype> <name>glGetProgramResourceLocation</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param group="ProgramInterface"><ptype>GLenum</ptype> <name>programInterface</name></param>
>+            <param len="COMPSIZE(name)">const <ptype>GLchar</ptype> *<name>name</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>GLint</ptype> <name>glGetProgramResourceLocationIndex</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param group="ProgramInterface"><ptype>GLenum</ptype> <name>programInterface</name></param>
>+            <param len="COMPSIZE(name)">const <ptype>GLchar</ptype> *<name>name</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>GLint</ptype> <name>glGetProgramResourceLocationIndexEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param group="ProgramInterface"><ptype>GLenum</ptype> <name>programInterface</name></param>
>+            <param len="COMPSIZE(name)">const <ptype>GLchar</ptype> *<name>name</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetProgramResourceName</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param group="ProgramInterface"><ptype>GLenum</ptype> <name>programInterface</name></param>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param><ptype>GLsizei</ptype> <name>bufSize</name></param>
>+            <param len="1"><ptype>GLsizei</ptype> *<name>length</name></param>
>+            <param len="bufSize"><ptype>GLchar</ptype> *<name>name</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetProgramResourcefvNV</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param group="ProgramInterface"><ptype>GLenum</ptype> <name>programInterface</name></param>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param><ptype>GLsizei</ptype> <name>propCount</name></param>
>+            <param>const <ptype>GLenum</ptype> *<name>props</name></param>
>+            <param><ptype>GLsizei</ptype> <name>bufSize</name></param>
>+            <param><ptype>GLsizei</ptype> *<name>length</name></param>
>+            <param><ptype>GLfloat</ptype> *<name>params</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetProgramResourceiv</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param group="ProgramInterface"><ptype>GLenum</ptype> <name>programInterface</name></param>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param><ptype>GLsizei</ptype> <name>propCount</name></param>
>+            <param len="propCount">const <ptype>GLenum</ptype> *<name>props</name></param>
>+            <param><ptype>GLsizei</ptype> <name>bufSize</name></param>
>+            <param len="1"><ptype>GLsizei</ptype> *<name>length</name></param>
>+            <param len="bufSize"><ptype>GLint</ptype> *<name>params</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetProgramStageiv</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param group="ShaderType"><ptype>GLenum</ptype> <name>shadertype</name></param>
>+            <param group="ProgramStagePName"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="1"><ptype>GLint</ptype> *<name>values</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetProgramStringARB</name></proto>
>+            <param group="ProgramTargetARB"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="ProgramStringPropertyARB"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="COMPSIZE(target,pname)">void *<name>string</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetProgramStringNV</name></proto>
>+            <param><ptype>GLuint</ptype> <name>id</name></param>
>+            <param group="VertexAttribEnumNV"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param group="ProgramCharacterNV" len="COMPSIZE(id,pname)"><ptype>GLubyte</ptype> *<name>program</name></param>
>+            <glx type="vendor" opcode="1299"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetProgramSubroutineParameteruivNV</name></proto>
>+            <param><ptype>GLenum</ptype> <name>target</name></param>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param len="COMPSIZE(target)"><ptype>GLuint</ptype> *<name>param</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetProgramiv</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param group="ProgramPropertyARB"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="COMPSIZE(pname)"><ptype>GLint</ptype> *<name>params</name></param>
>+            <glx type="single" opcode="199"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetProgramivARB</name></proto>
>+            <param group="ProgramTargetARB"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="ProgramPropertyARB"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="1"><ptype>GLint</ptype> *<name>params</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetProgramivNV</name></proto>
>+            <param><ptype>GLuint</ptype> <name>id</name></param>
>+            <param group="VertexAttribEnumNV"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="4"><ptype>GLint</ptype> *<name>params</name></param>
>+            <glx type="vendor" opcode="1298"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetQueryBufferObjecti64v</name></proto>
>+            <param><ptype>GLuint</ptype> <name>id</name></param>
>+            <param><ptype>GLuint</ptype> <name>buffer</name></param>
>+            <param group="QueryObjectParameterName"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param><ptype>GLintptr</ptype> <name>offset</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetQueryBufferObjectiv</name></proto>
>+            <param><ptype>GLuint</ptype> <name>id</name></param>
>+            <param><ptype>GLuint</ptype> <name>buffer</name></param>
>+            <param group="QueryObjectParameterName"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param><ptype>GLintptr</ptype> <name>offset</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetQueryBufferObjectui64v</name></proto>
>+            <param><ptype>GLuint</ptype> <name>id</name></param>
>+            <param><ptype>GLuint</ptype> <name>buffer</name></param>
>+            <param group="QueryObjectParameterName"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param><ptype>GLintptr</ptype> <name>offset</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetQueryBufferObjectuiv</name></proto>
>+            <param><ptype>GLuint</ptype> <name>id</name></param>
>+            <param><ptype>GLuint</ptype> <name>buffer</name></param>
>+            <param group="QueryObjectParameterName"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param><ptype>GLintptr</ptype> <name>offset</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetQueryIndexediv</name></proto>
>+            <param><ptype>GLenum</ptype> <name>target</name></param>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param group="QueryParameterName"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="COMPSIZE(pname)"><ptype>GLint</ptype> *<name>params</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetQueryObjecti64v</name></proto>
>+            <param><ptype>GLuint</ptype> <name>id</name></param>
>+            <param group="QueryObjectParameterName"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="COMPSIZE(pname)"><ptype>GLint64</ptype> *<name>params</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetQueryObjecti64vEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>id</name></param>
>+            <param group="QueryObjectParameterName"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="COMPSIZE(pname)"><ptype>GLint64</ptype> *<name>params</name></param>
>+            <glx type="vendor" opcode="1328"/>
>+            <alias name="glGetQueryObjecti64v"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetQueryObjectiv</name></proto>
>+            <param><ptype>GLuint</ptype> <name>id</name></param>
>+            <param group="QueryObjectParameterName"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="COMPSIZE(pname)"><ptype>GLint</ptype> *<name>params</name></param>
>+            <glx type="single" opcode="165"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetQueryObjectivARB</name></proto>
>+            <param><ptype>GLuint</ptype> <name>id</name></param>
>+            <param group="QueryObjectParameterName"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="COMPSIZE(pname)"><ptype>GLint</ptype> *<name>params</name></param>
>+            <alias name="glGetQueryObjectiv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetQueryObjectivEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>id</name></param>
>+            <param group="QueryObjectParameterName"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="COMPSIZE(pname)"><ptype>GLint</ptype> *<name>params</name></param>
>+            <alias name="glGetQueryObjectiv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetQueryObjectui64v</name></proto>
>+            <param><ptype>GLuint</ptype> <name>id</name></param>
>+            <param group="QueryObjectParameterName"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="COMPSIZE(pname)"><ptype>GLuint64</ptype> *<name>params</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetQueryObjectui64vEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>id</name></param>
>+            <param group="QueryObjectParameterName"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="COMPSIZE(pname)"><ptype>GLuint64</ptype> *<name>params</name></param>
>+            <glx type="vendor" opcode="1329"/>
>+            <alias name="glGetQueryObjectui64v"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetQueryObjectuiv</name></proto>
>+            <param><ptype>GLuint</ptype> <name>id</name></param>
>+            <param group="QueryObjectParameterName"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="COMPSIZE(pname)"><ptype>GLuint</ptype> *<name>params</name></param>
>+            <glx type="single" opcode="166"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetQueryObjectuivARB</name></proto>
>+            <param><ptype>GLuint</ptype> <name>id</name></param>
>+            <param group="QueryObjectParameterName"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="COMPSIZE(pname)"><ptype>GLuint</ptype> *<name>params</name></param>
>+            <alias name="glGetQueryObjectuiv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetQueryObjectuivEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>id</name></param>
>+            <param group="QueryObjectParameterName"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="COMPSIZE(pname)"><ptype>GLuint</ptype> *<name>params</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetQueryiv</name></proto>
>+            <param group="QueryTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="QueryParameterName"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="COMPSIZE(pname)"><ptype>GLint</ptype> *<name>params</name></param>
>+            <glx type="single" opcode="164"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetQueryivARB</name></proto>
>+            <param group="QueryTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="QueryParameterName"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="COMPSIZE(pname)"><ptype>GLint</ptype> *<name>params</name></param>
>+            <alias name="glGetQueryiv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetQueryivEXT</name></proto>
>+            <param group="QueryTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="QueryParameterName"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="COMPSIZE(pname)"><ptype>GLint</ptype> *<name>params</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetRenderbufferParameteriv</name></proto>
>+            <param group="RenderbufferTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="RenderbufferParameterName"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="COMPSIZE(pname)"><ptype>GLint</ptype> *<name>params</name></param>
>+            <glx type="vendor" opcode="1424"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetRenderbufferParameterivEXT</name></proto>
>+            <param group="RenderbufferTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="RenderbufferParameterName"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="COMPSIZE(pname)"><ptype>GLint</ptype> *<name>params</name></param>
>+            <alias name="glGetRenderbufferParameteriv"/>
>+            <glx type="vendor" opcode="1424"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetRenderbufferParameterivOES</name></proto>
>+            <param group="RenderbufferTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="RenderbufferParameterName"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="COMPSIZE(pname)"><ptype>GLint</ptype> *<name>params</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetSamplerParameterIiv</name></proto>
>+            <param><ptype>GLuint</ptype> <name>sampler</name></param>
>+            <param group="SamplerParameterName"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="COMPSIZE(pname)"><ptype>GLint</ptype> *<name>params</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetSamplerParameterIivEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>sampler</name></param>
>+            <param group="SamplerParameterName"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="COMPSIZE(pname)"><ptype>GLint</ptype> *<name>params</name></param>
>+            <alias name="glGetSamplerParameterIiv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetSamplerParameterIivOES</name></proto>
>+            <param><ptype>GLuint</ptype> <name>sampler</name></param>
>+            <param group="SamplerParameterName"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="COMPSIZE(pname)"><ptype>GLint</ptype> *<name>params</name></param>
>+            <alias name="glGetSamplerParameterIiv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetSamplerParameterIuiv</name></proto>
>+            <param><ptype>GLuint</ptype> <name>sampler</name></param>
>+            <param group="SamplerParameterName"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="COMPSIZE(pname)"><ptype>GLuint</ptype> *<name>params</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetSamplerParameterIuivEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>sampler</name></param>
>+            <param group="SamplerParameterName"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="COMPSIZE(pname)"><ptype>GLuint</ptype> *<name>params</name></param>
>+            <alias name="glGetSamplerParameterIuiv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetSamplerParameterIuivOES</name></proto>
>+            <param><ptype>GLuint</ptype> <name>sampler</name></param>
>+            <param group="SamplerParameterName"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="COMPSIZE(pname)"><ptype>GLuint</ptype> *<name>params</name></param>
>+            <alias name="glGetSamplerParameterIuiv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetSamplerParameterfv</name></proto>
>+            <param><ptype>GLuint</ptype> <name>sampler</name></param>
>+            <param group="SamplerParameterName"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="COMPSIZE(pname)"><ptype>GLfloat</ptype> *<name>params</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetSamplerParameteriv</name></proto>
>+            <param><ptype>GLuint</ptype> <name>sampler</name></param>
>+            <param group="SamplerParameterName"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="COMPSIZE(pname)"><ptype>GLint</ptype> *<name>params</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetSemaphoreParameterui64vEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>semaphore</name></param>
>+            <param group="SemaphoreParameterName"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param><ptype>GLuint64</ptype> *<name>params</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetSeparableFilter</name></proto>
>+            <param group="SeparableTargetEXT"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="PixelFormat"><ptype>GLenum</ptype> <name>format</name></param>
>+            <param group="PixelType"><ptype>GLenum</ptype> <name>type</name></param>
>+            <param len="COMPSIZE(target,format,type)">void *<name>row</name></param>
>+            <param len="COMPSIZE(target,format,type)">void *<name>column</name></param>
>+            <param len="COMPSIZE(target,format,type)">void *<name>span</name></param>
>+            <glx type="single" opcode="153"/>
>+            <glx type="render" opcode="343" name="glGetSeparableFilterPBO" comment="PBO protocol"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetSeparableFilterEXT</name></proto>
>+            <param group="SeparableTargetEXT"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="PixelFormat"><ptype>GLenum</ptype> <name>format</name></param>
>+            <param group="PixelType"><ptype>GLenum</ptype> <name>type</name></param>
>+            <param len="COMPSIZE(target,format,type)">void *<name>row</name></param>
>+            <param len="COMPSIZE(target,format,type)">void *<name>column</name></param>
>+            <param len="COMPSIZE(target,format,type)">void *<name>span</name></param>
>+            <glx type="vendor" opcode="4"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetShaderInfoLog</name></proto>
>+            <param><ptype>GLuint</ptype> <name>shader</name></param>
>+            <param><ptype>GLsizei</ptype> <name>bufSize</name></param>
>+            <param len="1"><ptype>GLsizei</ptype> *<name>length</name></param>
>+            <param len="bufSize"><ptype>GLchar</ptype> *<name>infoLog</name></param>
>+            <glx type="single" opcode="200"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetShaderPrecisionFormat</name></proto>
>+            <param group="ShaderType"><ptype>GLenum</ptype> <name>shadertype</name></param>
>+            <param group="PrecisionType"><ptype>GLenum</ptype> <name>precisiontype</name></param>
>+            <param len="2"><ptype>GLint</ptype> *<name>range</name></param>
>+            <param len="1"><ptype>GLint</ptype> *<name>precision</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetShaderSource</name></proto>
>+            <param><ptype>GLuint</ptype> <name>shader</name></param>
>+            <param><ptype>GLsizei</ptype> <name>bufSize</name></param>
>+            <param len="1"><ptype>GLsizei</ptype> *<name>length</name></param>
>+            <param len="bufSize"><ptype>GLchar</ptype> *<name>source</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetShaderSourceARB</name></proto>
>+            <param group="handleARB"><ptype>GLhandleARB</ptype> <name>obj</name></param>
>+            <param><ptype>GLsizei</ptype> <name>maxLength</name></param>
>+            <param len="1"><ptype>GLsizei</ptype> *<name>length</name></param>
>+            <param len="maxLength"><ptype>GLcharARB</ptype> *<name>source</name></param>
>+            <alias name="glGetShaderSource"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetShaderiv</name></proto>
>+            <param><ptype>GLuint</ptype> <name>shader</name></param>
>+            <param group="ShaderParameterName"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="COMPSIZE(pname)"><ptype>GLint</ptype> *<name>params</name></param>
>+            <glx type="single" opcode="198"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetSharpenTexFuncSGIS</name></proto>
>+            <param group="TextureTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param len="COMPSIZE(target)"><ptype>GLfloat</ptype> *<name>points</name></param>
>+            <glx type="vendor" opcode="4097"/>
>+        </command>
>+        <command>
>+            <proto><ptype>GLushort</ptype> <name>glGetStageIndexNV</name></proto>
>+            <param group="ShaderType"><ptype>GLenum</ptype> <name>shadertype</name></param>
>+        </command>
>+        <command>
>+            <proto group="String">const <ptype>GLubyte</ptype> *<name>glGetString</name></proto>
>+            <param group="StringName"><ptype>GLenum</ptype> <name>name</name></param>
>+            <glx type="single" opcode="129"/>
>+        </command>
>+        <command>
>+            <proto group="String">const <ptype>GLubyte</ptype> *<name>glGetStringi</name></proto>
>+            <param group="StringName"><ptype>GLenum</ptype> <name>name</name></param>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <glx type="single" opcode="214"/>
>+        </command>
>+        <command>
>+            <proto><ptype>GLuint</ptype> <name>glGetSubroutineIndex</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param group="ShaderType"><ptype>GLenum</ptype> <name>shadertype</name></param>
>+            <param>const <ptype>GLchar</ptype> *<name>name</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>GLint</ptype> <name>glGetSubroutineUniformLocation</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param group="ShaderType"><ptype>GLenum</ptype> <name>shadertype</name></param>
>+            <param>const <ptype>GLchar</ptype> *<name>name</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetSynciv</name></proto>
>+            <param group="sync"><ptype>GLsync</ptype> <name>sync</name></param>
>+            <param group="SyncParameterName"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param><ptype>GLsizei</ptype> <name>bufSize</name></param>
>+            <param len="1"><ptype>GLsizei</ptype> *<name>length</name></param>
>+            <param len="bufSize"><ptype>GLint</ptype> *<name>values</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetSyncivAPPLE</name></proto>
>+            <param><ptype>GLsync</ptype> <name>sync</name></param>
>+            <param group="SyncParameterName"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param><ptype>GLsizei</ptype> <name>bufSize</name></param>
>+            <param><ptype>GLsizei</ptype> *<name>length</name></param>
>+            <param len="bufSize"><ptype>GLint</ptype> *<name>values</name></param>
>+            <alias name="glGetSynciv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetTexBumpParameterfvATI</name></proto>
>+            <param group="GetTexBumpParameterATI"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="COMPSIZE(pname)"><ptype>GLfloat</ptype> *<name>param</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetTexBumpParameterivATI</name></proto>
>+            <param group="GetTexBumpParameterATI"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="COMPSIZE(pname)"><ptype>GLint</ptype> *<name>param</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetTexEnvfv</name></proto>
>+            <param group="TextureEnvTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="TextureEnvParameter"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="COMPSIZE(pname)"><ptype>GLfloat</ptype> *<name>params</name></param>
>+            <glx type="single" opcode="130"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetTexEnviv</name></proto>
>+            <param group="TextureEnvTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="TextureEnvParameter"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="COMPSIZE(pname)"><ptype>GLint</ptype> *<name>params</name></param>
>+            <glx type="single" opcode="131"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetTexEnvxv</name></proto>
>+            <param group="TextureEnvTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="TextureEnvParameter"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="COMPSIZE(pname)"><ptype>GLfixed</ptype> *<name>params</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetTexEnvxvOES</name></proto>
>+            <param group="TextureEnvTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="TextureEnvParameter"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="COMPSIZE(pname)"><ptype>GLfixed</ptype> *<name>params</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetTexFilterFuncSGIS</name></proto>
>+            <param group="TextureTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="TextureFilterSGIS"><ptype>GLenum</ptype> <name>filter</name></param>
>+            <param len="COMPSIZE(target,filter)"><ptype>GLfloat</ptype> *<name>weights</name></param>
>+            <glx type="vendor" opcode="4101"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetTexGendv</name></proto>
>+            <param group="TextureCoordName"><ptype>GLenum</ptype> <name>coord</name></param>
>+            <param group="TextureGenParameter"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="COMPSIZE(pname)"><ptype>GLdouble</ptype> *<name>params</name></param>
>+            <glx type="single" opcode="132"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetTexGenfv</name></proto>
>+            <param group="TextureCoordName"><ptype>GLenum</ptype> <name>coord</name></param>
>+            <param group="TextureGenParameter"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="COMPSIZE(pname)"><ptype>GLfloat</ptype> *<name>params</name></param>
>+            <glx type="single" opcode="133"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetTexGenfvOES</name></proto>
>+            <param group="TextureCoordName"><ptype>GLenum</ptype> <name>coord</name></param>
>+            <param group="TextureGenParameter"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="COMPSIZE(pname)"><ptype>GLfloat</ptype> *<name>params</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetTexGeniv</name></proto>
>+            <param group="TextureCoordName"><ptype>GLenum</ptype> <name>coord</name></param>
>+            <param group="TextureGenParameter"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="COMPSIZE(pname)"><ptype>GLint</ptype> *<name>params</name></param>
>+            <glx type="single" opcode="134"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetTexGenivOES</name></proto>
>+            <param group="TextureCoordName"><ptype>GLenum</ptype> <name>coord</name></param>
>+            <param group="TextureGenParameter"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="COMPSIZE(pname)"><ptype>GLint</ptype> *<name>params</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetTexGenxvOES</name></proto>
>+            <param group="TextureCoordName"><ptype>GLenum</ptype> <name>coord</name></param>
>+            <param group="TextureGenParameter"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="COMPSIZE(pname)"><ptype>GLfixed</ptype> *<name>params</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetTexImage</name></proto>
>+            <param group="TextureTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>level</name></param>
>+            <param group="PixelFormat"><ptype>GLenum</ptype> <name>format</name></param>
>+            <param group="PixelType"><ptype>GLenum</ptype> <name>type</name></param>
>+            <param len="COMPSIZE(target,level,format,type)">void *<name>pixels</name></param>
>+            <glx type="single" opcode="135"/>
>+            <glx type="render" opcode="344" name="glGetTexImagePBO" comment="PBO protocol"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetTexLevelParameterfv</name></proto>
>+            <param group="TextureTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>level</name></param>
>+            <param group="GetTextureParameter"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="COMPSIZE(pname)"><ptype>GLfloat</ptype> *<name>params</name></param>
>+            <glx type="single" opcode="138"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetTexLevelParameteriv</name></proto>
>+            <param group="TextureTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>level</name></param>
>+            <param group="GetTextureParameter"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="COMPSIZE(pname)"><ptype>GLint</ptype> *<name>params</name></param>
>+            <glx type="single" opcode="139"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetTexLevelParameterxvOES</name></proto>
>+            <param group="TextureTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param><ptype>GLint</ptype> <name>level</name></param>
>+            <param group="GetTextureParameter"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="COMPSIZE(pname)"><ptype>GLfixed</ptype> *<name>params</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetTexParameterIiv</name></proto>
>+            <param group="TextureTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="GetTextureParameter"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="COMPSIZE(pname)"><ptype>GLint</ptype> *<name>params</name></param>
>+            <glx type="single" opcode="203"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetTexParameterIivEXT</name></proto>
>+            <param group="TextureTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="GetTextureParameter"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="COMPSIZE(pname)"><ptype>GLint</ptype> *<name>params</name></param>
>+            <alias name="glGetTexParameterIiv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetTexParameterIivOES</name></proto>
>+            <param group="TextureTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="GetTextureParameter"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="COMPSIZE(pname)"><ptype>GLint</ptype> *<name>params</name></param>
>+            <alias name="glGetTexParameterIiv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetTexParameterIuiv</name></proto>
>+            <param group="TextureTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="GetTextureParameter"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="COMPSIZE(pname)"><ptype>GLuint</ptype> *<name>params</name></param>
>+            <glx type="single" opcode="204"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetTexParameterIuivEXT</name></proto>
>+            <param group="TextureTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="GetTextureParameter"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="COMPSIZE(pname)"><ptype>GLuint</ptype> *<name>params</name></param>
>+            <alias name="glGetTexParameterIuiv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetTexParameterIuivOES</name></proto>
>+            <param group="TextureTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="GetTextureParameter"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="COMPSIZE(pname)"><ptype>GLuint</ptype> *<name>params</name></param>
>+            <alias name="glGetTexParameterIuiv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetTexParameterPointervAPPLE</name></proto>
>+            <param><ptype>GLenum</ptype> <name>target</name></param>
>+            <param><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="1">void **<name>params</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetTexParameterfv</name></proto>
>+            <param group="TextureTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="GetTextureParameter"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="COMPSIZE(pname)"><ptype>GLfloat</ptype> *<name>params</name></param>
>+            <glx type="single" opcode="136"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetTexParameteriv</name></proto>
>+            <param group="TextureTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="GetTextureParameter"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="COMPSIZE(pname)"><ptype>GLint</ptype> *<name>params</name></param>
>+            <glx type="single" opcode="137"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetTexParameterxv</name></proto>
>+            <param group="TextureTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="GetTextureParameter"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="COMPSIZE(pname)"><ptype>GLfixed</ptype> *<name>params</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetTexParameterxvOES</name></proto>
>+            <param group="TextureTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="GetTextureParameter"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="COMPSIZE(pname)"><ptype>GLfixed</ptype> *<name>params</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>GLuint64</ptype> <name>glGetTextureHandleARB</name></proto>
>+            <param><ptype>GLuint</ptype> <name>texture</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>GLuint64</ptype> <name>glGetTextureHandleIMG</name></proto>
>+            <param><ptype>GLuint</ptype> <name>texture</name></param>
>+            <alias name="glGetTextureHandleARB"/>
>+        </command>
>+        <command>
>+            <proto><ptype>GLuint64</ptype> <name>glGetTextureHandleNV</name></proto>
>+            <param><ptype>GLuint</ptype> <name>texture</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetTextureImage</name></proto>
>+            <param><ptype>GLuint</ptype> <name>texture</name></param>
>+            <param><ptype>GLint</ptype> <name>level</name></param>
>+            <param group="PixelFormat"><ptype>GLenum</ptype> <name>format</name></param>
>+            <param group="PixelType"><ptype>GLenum</ptype> <name>type</name></param>
>+            <param><ptype>GLsizei</ptype> <name>bufSize</name></param>
>+            <param>void *<name>pixels</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetTextureImageEXT</name></proto>
>+            <param group="Texture"><ptype>GLuint</ptype> <name>texture</name></param>
>+            <param group="TextureTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>level</name></param>
>+            <param group="PixelFormat"><ptype>GLenum</ptype> <name>format</name></param>
>+            <param group="PixelType"><ptype>GLenum</ptype> <name>type</name></param>
>+            <param len="COMPSIZE(target,level,format,type)">void *<name>pixels</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetTextureLevelParameterfv</name></proto>
>+            <param><ptype>GLuint</ptype> <name>texture</name></param>
>+            <param><ptype>GLint</ptype> <name>level</name></param>
>+            <param group="GetTextureParameter"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param><ptype>GLfloat</ptype> *<name>params</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetTextureLevelParameterfvEXT</name></proto>
>+            <param group="Texture"><ptype>GLuint</ptype> <name>texture</name></param>
>+            <param group="TextureTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>level</name></param>
>+            <param group="GetTextureParameter"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="COMPSIZE(pname)"><ptype>GLfloat</ptype> *<name>params</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetTextureLevelParameteriv</name></proto>
>+            <param><ptype>GLuint</ptype> <name>texture</name></param>
>+            <param><ptype>GLint</ptype> <name>level</name></param>
>+            <param group="GetTextureParameter"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param><ptype>GLint</ptype> *<name>params</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetTextureLevelParameterivEXT</name></proto>
>+            <param group="Texture"><ptype>GLuint</ptype> <name>texture</name></param>
>+            <param group="TextureTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>level</name></param>
>+            <param group="GetTextureParameter"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="COMPSIZE(pname)"><ptype>GLint</ptype> *<name>params</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetTextureParameterIiv</name></proto>
>+            <param><ptype>GLuint</ptype> <name>texture</name></param>
>+            <param group="GetTextureParameter"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param><ptype>GLint</ptype> *<name>params</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetTextureParameterIivEXT</name></proto>
>+            <param group="Texture"><ptype>GLuint</ptype> <name>texture</name></param>
>+            <param group="TextureTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="GetTextureParameter"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="COMPSIZE(pname)"><ptype>GLint</ptype> *<name>params</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetTextureParameterIuiv</name></proto>
>+            <param><ptype>GLuint</ptype> <name>texture</name></param>
>+            <param group="GetTextureParameter"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param><ptype>GLuint</ptype> *<name>params</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetTextureParameterIuivEXT</name></proto>
>+            <param group="Texture"><ptype>GLuint</ptype> <name>texture</name></param>
>+            <param group="TextureTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="GetTextureParameter"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="COMPSIZE(pname)"><ptype>GLuint</ptype> *<name>params</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetTextureParameterfv</name></proto>
>+            <param><ptype>GLuint</ptype> <name>texture</name></param>
>+            <param group="GetTextureParameter"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param><ptype>GLfloat</ptype> *<name>params</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetTextureParameterfvEXT</name></proto>
>+            <param group="Texture"><ptype>GLuint</ptype> <name>texture</name></param>
>+            <param group="TextureTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="GetTextureParameter"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="COMPSIZE(pname)"><ptype>GLfloat</ptype> *<name>params</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetTextureParameteriv</name></proto>
>+            <param><ptype>GLuint</ptype> <name>texture</name></param>
>+            <param group="GetTextureParameter"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param><ptype>GLint</ptype> *<name>params</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetTextureParameterivEXT</name></proto>
>+            <param group="Texture"><ptype>GLuint</ptype> <name>texture</name></param>
>+            <param group="TextureTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="GetTextureParameter"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="COMPSIZE(pname)"><ptype>GLint</ptype> *<name>params</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>GLuint64</ptype> <name>glGetTextureSamplerHandleARB</name></proto>
>+            <param><ptype>GLuint</ptype> <name>texture</name></param>
>+            <param><ptype>GLuint</ptype> <name>sampler</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>GLuint64</ptype> <name>glGetTextureSamplerHandleIMG</name></proto>
>+            <param><ptype>GLuint</ptype> <name>texture</name></param>
>+            <param><ptype>GLuint</ptype> <name>sampler</name></param>
>+            <alias name="glGetTextureSamplerHandleARB"/>
>+        </command>
>+        <command>
>+            <proto><ptype>GLuint64</ptype> <name>glGetTextureSamplerHandleNV</name></proto>
>+            <param><ptype>GLuint</ptype> <name>texture</name></param>
>+            <param><ptype>GLuint</ptype> <name>sampler</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetTextureSubImage</name></proto>
>+            <param><ptype>GLuint</ptype> <name>texture</name></param>
>+            <param><ptype>GLint</ptype> <name>level</name></param>
>+            <param><ptype>GLint</ptype> <name>xoffset</name></param>
>+            <param><ptype>GLint</ptype> <name>yoffset</name></param>
>+            <param><ptype>GLint</ptype> <name>zoffset</name></param>
>+            <param><ptype>GLsizei</ptype> <name>width</name></param>
>+            <param><ptype>GLsizei</ptype> <name>height</name></param>
>+            <param><ptype>GLsizei</ptype> <name>depth</name></param>
>+            <param group="PixelFormat"><ptype>GLenum</ptype> <name>format</name></param>
>+            <param group="PixelType"><ptype>GLenum</ptype> <name>type</name></param>
>+            <param><ptype>GLsizei</ptype> <name>bufSize</name></param>
>+            <param>void *<name>pixels</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetTrackMatrixivNV</name></proto>
>+            <param group="VertexAttribEnumNV"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param><ptype>GLuint</ptype> <name>address</name></param>
>+            <param group="VertexAttribEnumNV"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="1"><ptype>GLint</ptype> *<name>params</name></param>
>+            <glx type="vendor" opcode="1300"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetTransformFeedbackVarying</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param><ptype>GLsizei</ptype> <name>bufSize</name></param>
>+            <param len="1"><ptype>GLsizei</ptype> *<name>length</name></param>
>+            <param len="1"><ptype>GLsizei</ptype> *<name>size</name></param>
>+            <param len="1"><ptype>GLenum</ptype> *<name>type</name></param>
>+            <param len="bufSize"><ptype>GLchar</ptype> *<name>name</name></param>
>+            <glx type="single" opcode="213"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetTransformFeedbackVaryingEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param><ptype>GLsizei</ptype> <name>bufSize</name></param>
>+            <param len="1"><ptype>GLsizei</ptype> *<name>length</name></param>
>+            <param len="1"><ptype>GLsizei</ptype> *<name>size</name></param>
>+            <param len="1"><ptype>GLenum</ptype> *<name>type</name></param>
>+            <param len="bufSize"><ptype>GLchar</ptype> *<name>name</name></param>
>+            <alias name="glGetTransformFeedbackVarying"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetTransformFeedbackVaryingNV</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param len="1"><ptype>GLint</ptype> *<name>location</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetTransformFeedbacki64_v</name></proto>
>+            <param><ptype>GLuint</ptype> <name>xfb</name></param>
>+            <param group="TransformFeedbackPName"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param><ptype>GLint64</ptype> *<name>param</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetTransformFeedbacki_v</name></proto>
>+            <param><ptype>GLuint</ptype> <name>xfb</name></param>
>+            <param group="TransformFeedbackPName"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param><ptype>GLint</ptype> *<name>param</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetTransformFeedbackiv</name></proto>
>+            <param><ptype>GLuint</ptype> <name>xfb</name></param>
>+            <param group="TransformFeedbackPName"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param><ptype>GLint</ptype> *<name>param</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetTranslatedShaderSourceANGLE</name></proto>
>+            <param><ptype>GLuint</ptype> <name>shader</name></param>
>+            <param><ptype>GLsizei</ptype> <name>bufsize</name></param>
>+            <param len="1"><ptype>GLsizei</ptype> *<name>length</name></param>
>+            <param><ptype>GLchar</ptype> *<name>source</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>GLuint</ptype> <name>glGetUniformBlockIndex</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param len="COMPSIZE()">const <ptype>GLchar</ptype> *<name>uniformBlockName</name></param>
>+            <glx type="single" opcode="218"/>
>+        </command>
>+        <command>
>+            <proto><ptype>GLint</ptype> <name>glGetUniformBufferSizeEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetUniformIndices</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param><ptype>GLsizei</ptype> <name>uniformCount</name></param>
>+            <param len="COMPSIZE(uniformCount)">const <ptype>GLchar</ptype> *const*<name>uniformNames</name></param>
>+            <param len="COMPSIZE(uniformCount)"><ptype>GLuint</ptype> *<name>uniformIndices</name></param>
>+            <glx type="single" opcode="215"/>
>+        </command>
>+        <command>
>+            <proto><ptype>GLint</ptype> <name>glGetUniformLocation</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param>const <ptype>GLchar</ptype> *<name>name</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>GLint</ptype> <name>glGetUniformLocationARB</name></proto>
>+            <param group="handleARB"><ptype>GLhandleARB</ptype> <name>programObj</name></param>
>+            <param>const <ptype>GLcharARB</ptype> *<name>name</name></param>
>+            <alias name="glGetUniformLocation"/>
>+        </command>
>+        <command>
>+            <proto group="BufferOffset"><ptype>GLintptr</ptype> <name>glGetUniformOffsetEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetUniformSubroutineuiv</name></proto>
>+            <param group="ShaderType"><ptype>GLenum</ptype> <name>shadertype</name></param>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param len="1"><ptype>GLuint</ptype> *<name>params</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetUniformdv</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param len="COMPSIZE(program,location)"><ptype>GLdouble</ptype> *<name>params</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetUniformfv</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param len="COMPSIZE(program,location)"><ptype>GLfloat</ptype> *<name>params</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetUniformfvARB</name></proto>
>+            <param group="handleARB"><ptype>GLhandleARB</ptype> <name>programObj</name></param>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param len="COMPSIZE(programObj,location)"><ptype>GLfloat</ptype> *<name>params</name></param>
>+            <alias name="glGetUniformfv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetUniformi64vARB</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param len="COMPSIZE(program,location)"><ptype>GLint64</ptype> *<name>params</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetUniformi64vNV</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param len="COMPSIZE(program,location)"><ptype>GLint64EXT</ptype> *<name>params</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetUniformiv</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param len="COMPSIZE(program,location)"><ptype>GLint</ptype> *<name>params</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetUniformivARB</name></proto>
>+            <param group="handleARB"><ptype>GLhandleARB</ptype> <name>programObj</name></param>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param len="COMPSIZE(programObj,location)"><ptype>GLint</ptype> *<name>params</name></param>
>+            <alias name="glGetUniformiv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetUniformui64vARB</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param len="COMPSIZE(program,location)"><ptype>GLuint64</ptype> *<name>params</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetUniformui64vNV</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param len="COMPSIZE(program,location)"><ptype>GLuint64EXT</ptype> *<name>params</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetUniformuiv</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param len="COMPSIZE(program,location)"><ptype>GLuint</ptype> *<name>params</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetUniformuivEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param len="COMPSIZE(program,location)"><ptype>GLuint</ptype> *<name>params</name></param>
>+            <alias name="glGetUniformuiv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetUnsignedBytevEXT</name></proto>
>+            <param group="GetPName"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="COMPSIZE(pname)"><ptype>GLubyte</ptype> *<name>data</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetUnsignedBytei_vEXT</name></proto>
>+            <param><ptype>GLenum</ptype> <name>target</name></param>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param len="COMPSIZE(target)"><ptype>GLubyte</ptype> *<name>data</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetVariantArrayObjectfvATI</name></proto>
>+            <param><ptype>GLuint</ptype> <name>id</name></param>
>+            <param group="ArrayObjectPNameATI"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="1"><ptype>GLfloat</ptype> *<name>params</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetVariantArrayObjectivATI</name></proto>
>+            <param><ptype>GLuint</ptype> <name>id</name></param>
>+            <param group="ArrayObjectPNameATI"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="1"><ptype>GLint</ptype> *<name>params</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetVariantBooleanvEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>id</name></param>
>+            <param group="GetVariantValueEXT"><ptype>GLenum</ptype> <name>value</name></param>
>+            <param group="Boolean" len="COMPSIZE(id)"><ptype>GLboolean</ptype> *<name>data</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetVariantFloatvEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>id</name></param>
>+            <param group="GetVariantValueEXT"><ptype>GLenum</ptype> <name>value</name></param>
>+            <param len="COMPSIZE(id)"><ptype>GLfloat</ptype> *<name>data</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetVariantIntegervEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>id</name></param>
>+            <param group="GetVariantValueEXT"><ptype>GLenum</ptype> <name>value</name></param>
>+            <param len="COMPSIZE(id)"><ptype>GLint</ptype> *<name>data</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetVariantPointervEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>id</name></param>
>+            <param group="GetVariantValueEXT"><ptype>GLenum</ptype> <name>value</name></param>
>+            <param len="COMPSIZE(id)">void **<name>data</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>GLint</ptype> <name>glGetVaryingLocationNV</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param len="COMPSIZE(name)">const <ptype>GLchar</ptype> *<name>name</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetVertexArrayIndexed64iv</name></proto>
>+            <param><ptype>GLuint</ptype> <name>vaobj</name></param>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param group="VertexArrayPName"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param><ptype>GLint64</ptype> *<name>param</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetVertexArrayIndexediv</name></proto>
>+            <param><ptype>GLuint</ptype> <name>vaobj</name></param>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param group="VertexArrayPName"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param><ptype>GLint</ptype> *<name>param</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetVertexArrayIntegeri_vEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>vaobj</name></param>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param group="VertexArrayPName"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param><ptype>GLint</ptype> *<name>param</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetVertexArrayIntegervEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>vaobj</name></param>
>+            <param group="VertexArrayPName"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param><ptype>GLint</ptype> *<name>param</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetVertexArrayPointeri_vEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>vaobj</name></param>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param group="VertexArrayPName"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param>void **<name>param</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetVertexArrayPointervEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>vaobj</name></param>
>+            <param group="VertexArrayPName"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="1">void **<name>param</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetVertexArrayiv</name></proto>
>+            <param><ptype>GLuint</ptype> <name>vaobj</name></param>
>+            <param group="VertexArrayPName"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param><ptype>GLint</ptype> *<name>param</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetVertexAttribArrayObjectfvATI</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param group="ArrayObjectPNameATI"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="COMPSIZE(pname)"><ptype>GLfloat</ptype> *<name>params</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetVertexAttribArrayObjectivATI</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param group="ArrayObjectPNameATI"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="COMPSIZE(pname)"><ptype>GLint</ptype> *<name>params</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetVertexAttribIiv</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param group="VertexAttribEnum"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="1"><ptype>GLint</ptype> *<name>params</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetVertexAttribIivEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param group="VertexAttribEnum"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="1"><ptype>GLint</ptype> *<name>params</name></param>
>+            <alias name="glGetVertexAttribIiv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetVertexAttribIuiv</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param group="VertexAttribEnum"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="1"><ptype>GLuint</ptype> *<name>params</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetVertexAttribIuivEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param group="VertexAttribEnum"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="1"><ptype>GLuint</ptype> *<name>params</name></param>
>+            <alias name="glGetVertexAttribIuiv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetVertexAttribLdv</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param group="VertexAttribEnum"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="COMPSIZE(pname)"><ptype>GLdouble</ptype> *<name>params</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetVertexAttribLdvEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param group="VertexAttribEnum"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="COMPSIZE(pname)"><ptype>GLdouble</ptype> *<name>params</name></param>
>+            <alias name="glGetVertexAttribLdv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetVertexAttribLi64vNV</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param group="VertexAttribEnum"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="COMPSIZE(pname)"><ptype>GLint64EXT</ptype> *<name>params</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetVertexAttribLui64vARB</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param group="VertexAttribEnum"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param><ptype>GLuint64EXT</ptype> *<name>params</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetVertexAttribLui64vNV</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param group="VertexAttribEnum"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="COMPSIZE(pname)"><ptype>GLuint64EXT</ptype> *<name>params</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetVertexAttribPointerv</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param group="VertexAttribPointerPropertyARB"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="1">void **<name>pointer</name></param>
>+            <glx type="single" opcode="209"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetVertexAttribPointervARB</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param group="VertexAttribPointerPropertyARB"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="1">void **<name>pointer</name></param>
>+            <alias name="glGetVertexAttribPointerv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetVertexAttribPointervNV</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param group="VertexAttribEnumNV"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="1">void **<name>pointer</name></param>
>+            <alias name="glGetVertexAttribPointerv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetVertexAttribdv</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param group="VertexAttribPropertyARB"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="4"><ptype>GLdouble</ptype> *<name>params</name></param>
>+            <glx type="vendor" opcode="1301"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetVertexAttribdvARB</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param group="VertexAttribPropertyARB"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="4"><ptype>GLdouble</ptype> *<name>params</name></param>
>+            <alias name="glGetVertexAttribdv"/>
>+            <glx type="vendor" opcode="1301"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetVertexAttribdvNV</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param group="VertexAttribEnumNV"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="1"><ptype>GLdouble</ptype> *<name>params</name></param>
>+            <alias name="glGetVertexAttribdv"/>
>+            <glx type="vendor" opcode="1301"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetVertexAttribfv</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param group="VertexAttribPropertyARB"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="4"><ptype>GLfloat</ptype> *<name>params</name></param>
>+            <glx type="vendor" opcode="1302"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetVertexAttribfvARB</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param group="VertexAttribPropertyARB"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="4"><ptype>GLfloat</ptype> *<name>params</name></param>
>+            <alias name="glGetVertexAttribfv"/>
>+            <glx type="vendor" opcode="1302"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetVertexAttribfvNV</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param group="VertexAttribEnumNV"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="1"><ptype>GLfloat</ptype> *<name>params</name></param>
>+            <alias name="glGetVertexAttribfv"/>
>+            <glx type="vendor" opcode="1302"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetVertexAttribiv</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param group="VertexAttribPropertyARB"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="4"><ptype>GLint</ptype> *<name>params</name></param>
>+            <glx type="vendor" opcode="1303"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetVertexAttribivARB</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param group="VertexAttribPropertyARB"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="4"><ptype>GLint</ptype> *<name>params</name></param>
>+            <alias name="glGetVertexAttribiv"/>
>+            <glx type="vendor" opcode="1303"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetVertexAttribivNV</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param group="VertexAttribEnumNV"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="1"><ptype>GLint</ptype> *<name>params</name></param>
>+            <alias name="glGetVertexAttribiv"/>
>+            <glx type="vendor" opcode="1303"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetVideoCaptureStreamdvNV</name></proto>
>+            <param><ptype>GLuint</ptype> <name>video_capture_slot</name></param>
>+            <param><ptype>GLuint</ptype> <name>stream</name></param>
>+            <param><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="COMPSIZE(pname)"><ptype>GLdouble</ptype> *<name>params</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetVideoCaptureStreamfvNV</name></proto>
>+            <param><ptype>GLuint</ptype> <name>video_capture_slot</name></param>
>+            <param><ptype>GLuint</ptype> <name>stream</name></param>
>+            <param><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="COMPSIZE(pname)"><ptype>GLfloat</ptype> *<name>params</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetVideoCaptureStreamivNV</name></proto>
>+            <param><ptype>GLuint</ptype> <name>video_capture_slot</name></param>
>+            <param><ptype>GLuint</ptype> <name>stream</name></param>
>+            <param><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="COMPSIZE(pname)"><ptype>GLint</ptype> *<name>params</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetVideoCaptureivNV</name></proto>
>+            <param><ptype>GLuint</ptype> <name>video_capture_slot</name></param>
>+            <param><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="COMPSIZE(pname)"><ptype>GLint</ptype> *<name>params</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetVideoi64vNV</name></proto>
>+            <param><ptype>GLuint</ptype> <name>video_slot</name></param>
>+            <param><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="COMPSIZE(pname)"><ptype>GLint64EXT</ptype> *<name>params</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetVideoivNV</name></proto>
>+            <param><ptype>GLuint</ptype> <name>video_slot</name></param>
>+            <param><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="COMPSIZE(pname)"><ptype>GLint</ptype> *<name>params</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetVideoui64vNV</name></proto>
>+            <param><ptype>GLuint</ptype> <name>video_slot</name></param>
>+            <param><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="COMPSIZE(pname)"><ptype>GLuint64EXT</ptype> *<name>params</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetVideouivNV</name></proto>
>+            <param><ptype>GLuint</ptype> <name>video_slot</name></param>
>+            <param><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="COMPSIZE(pname)"><ptype>GLuint</ptype> *<name>params</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetnColorTable</name></proto>
>+            <param group="ColorTableTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="PixelFormat"><ptype>GLenum</ptype> <name>format</name></param>
>+            <param group="PixelType"><ptype>GLenum</ptype> <name>type</name></param>
>+            <param><ptype>GLsizei</ptype> <name>bufSize</name></param>
>+            <param>void *<name>table</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetnColorTableARB</name></proto>
>+            <param group="ColorTableTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="PixelFormat"><ptype>GLenum</ptype> <name>format</name></param>
>+            <param group="PixelType"><ptype>GLenum</ptype> <name>type</name></param>
>+            <param><ptype>GLsizei</ptype> <name>bufSize</name></param>
>+            <param len="bufSize">void *<name>table</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetnCompressedTexImage</name></proto>
>+            <param group="TextureTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param><ptype>GLint</ptype> <name>lod</name></param>
>+            <param><ptype>GLsizei</ptype> <name>bufSize</name></param>
>+            <param>void *<name>pixels</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetnCompressedTexImageARB</name></proto>
>+            <param group="TextureTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param><ptype>GLint</ptype> <name>lod</name></param>
>+            <param><ptype>GLsizei</ptype> <name>bufSize</name></param>
>+            <param len="bufSize">void *<name>img</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetnConvolutionFilter</name></proto>
>+            <param group="ConvolutionTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="PixelFormat"><ptype>GLenum</ptype> <name>format</name></param>
>+            <param group="PixelType"><ptype>GLenum</ptype> <name>type</name></param>
>+            <param><ptype>GLsizei</ptype> <name>bufSize</name></param>
>+            <param>void *<name>image</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetnConvolutionFilterARB</name></proto>
>+            <param group="ConvolutionTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="PixelFormat"><ptype>GLenum</ptype> <name>format</name></param>
>+            <param group="PixelType"><ptype>GLenum</ptype> <name>type</name></param>
>+            <param><ptype>GLsizei</ptype> <name>bufSize</name></param>
>+            <param len="bufSize">void *<name>image</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetnHistogram</name></proto>
>+            <param group="HistogramTargetEXT"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param><ptype>GLboolean</ptype> <name>reset</name></param>
>+            <param group="PixelFormat"><ptype>GLenum</ptype> <name>format</name></param>
>+            <param group="PixelType"><ptype>GLenum</ptype> <name>type</name></param>
>+            <param><ptype>GLsizei</ptype> <name>bufSize</name></param>
>+            <param>void *<name>values</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetnHistogramARB</name></proto>
>+            <param group="HistogramTargetEXT"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="Boolean"><ptype>GLboolean</ptype> <name>reset</name></param>
>+            <param group="PixelFormat"><ptype>GLenum</ptype> <name>format</name></param>
>+            <param group="PixelType"><ptype>GLenum</ptype> <name>type</name></param>
>+            <param><ptype>GLsizei</ptype> <name>bufSize</name></param>
>+            <param len="bufSize">void *<name>values</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetnMapdv</name></proto>
>+            <param group="MapTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="MapQuery"><ptype>GLenum</ptype> <name>query</name></param>
>+            <param><ptype>GLsizei</ptype> <name>bufSize</name></param>
>+            <param><ptype>GLdouble</ptype> *<name>v</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetnMapdvARB</name></proto>
>+            <param group="MapTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="MapQuery"><ptype>GLenum</ptype> <name>query</name></param>
>+            <param><ptype>GLsizei</ptype> <name>bufSize</name></param>
>+            <param len="bufSize"><ptype>GLdouble</ptype> *<name>v</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetnMapfv</name></proto>
>+            <param group="MapTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="MapQuery"><ptype>GLenum</ptype> <name>query</name></param>
>+            <param><ptype>GLsizei</ptype> <name>bufSize</name></param>
>+            <param><ptype>GLfloat</ptype> *<name>v</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetnMapfvARB</name></proto>
>+            <param group="MapTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="MapQuery"><ptype>GLenum</ptype> <name>query</name></param>
>+            <param><ptype>GLsizei</ptype> <name>bufSize</name></param>
>+            <param len="bufSize"><ptype>GLfloat</ptype> *<name>v</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetnMapiv</name></proto>
>+            <param group="MapTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="MapQuery"><ptype>GLenum</ptype> <name>query</name></param>
>+            <param><ptype>GLsizei</ptype> <name>bufSize</name></param>
>+            <param><ptype>GLint</ptype> *<name>v</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetnMapivARB</name></proto>
>+            <param group="MapTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="MapQuery"><ptype>GLenum</ptype> <name>query</name></param>
>+            <param><ptype>GLsizei</ptype> <name>bufSize</name></param>
>+            <param len="bufSize"><ptype>GLint</ptype> *<name>v</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetnMinmax</name></proto>
>+            <param group="MinmaxTargetEXT"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param><ptype>GLboolean</ptype> <name>reset</name></param>
>+            <param group="PixelFormat"><ptype>GLenum</ptype> <name>format</name></param>
>+            <param group="PixelType"><ptype>GLenum</ptype> <name>type</name></param>
>+            <param><ptype>GLsizei</ptype> <name>bufSize</name></param>
>+            <param>void *<name>values</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetnMinmaxARB</name></proto>
>+            <param group="MinmaxTargetEXT"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="Boolean"><ptype>GLboolean</ptype> <name>reset</name></param>
>+            <param group="PixelFormat"><ptype>GLenum</ptype> <name>format</name></param>
>+            <param group="PixelType"><ptype>GLenum</ptype> <name>type</name></param>
>+            <param><ptype>GLsizei</ptype> <name>bufSize</name></param>
>+            <param len="bufSize">void *<name>values</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetnPixelMapfv</name></proto>
>+            <param group="PixelMap"><ptype>GLenum</ptype> <name>map</name></param>
>+            <param><ptype>GLsizei</ptype> <name>bufSize</name></param>
>+            <param><ptype>GLfloat</ptype> *<name>values</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetnPixelMapfvARB</name></proto>
>+            <param group="PixelMap"><ptype>GLenum</ptype> <name>map</name></param>
>+            <param><ptype>GLsizei</ptype> <name>bufSize</name></param>
>+            <param len="bufSize"><ptype>GLfloat</ptype> *<name>values</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetnPixelMapuiv</name></proto>
>+            <param group="PixelMap"><ptype>GLenum</ptype> <name>map</name></param>
>+            <param><ptype>GLsizei</ptype> <name>bufSize</name></param>
>+            <param><ptype>GLuint</ptype> *<name>values</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetnPixelMapuivARB</name></proto>
>+            <param group="PixelMap"><ptype>GLenum</ptype> <name>map</name></param>
>+            <param><ptype>GLsizei</ptype> <name>bufSize</name></param>
>+            <param len="bufSize"><ptype>GLuint</ptype> *<name>values</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetnPixelMapusv</name></proto>
>+            <param group="PixelMap"><ptype>GLenum</ptype> <name>map</name></param>
>+            <param><ptype>GLsizei</ptype> <name>bufSize</name></param>
>+            <param><ptype>GLushort</ptype> *<name>values</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetnPixelMapusvARB</name></proto>
>+            <param group="PixelMap"><ptype>GLenum</ptype> <name>map</name></param>
>+            <param><ptype>GLsizei</ptype> <name>bufSize</name></param>
>+            <param len="bufSize"><ptype>GLushort</ptype> *<name>values</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetnPolygonStipple</name></proto>
>+            <param><ptype>GLsizei</ptype> <name>bufSize</name></param>
>+            <param><ptype>GLubyte</ptype> *<name>pattern</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetnPolygonStippleARB</name></proto>
>+            <param><ptype>GLsizei</ptype> <name>bufSize</name></param>
>+            <param len="bufSize"><ptype>GLubyte</ptype> *<name>pattern</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetnSeparableFilter</name></proto>
>+            <param group="SeparableTargetEXT"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="PixelFormat"><ptype>GLenum</ptype> <name>format</name></param>
>+            <param group="PixelType"><ptype>GLenum</ptype> <name>type</name></param>
>+            <param><ptype>GLsizei</ptype> <name>rowBufSize</name></param>
>+            <param>void *<name>row</name></param>
>+            <param><ptype>GLsizei</ptype> <name>columnBufSize</name></param>
>+            <param>void *<name>column</name></param>
>+            <param>void *<name>span</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetnSeparableFilterARB</name></proto>
>+            <param group="SeparableTargetEXT"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="PixelFormat"><ptype>GLenum</ptype> <name>format</name></param>
>+            <param group="PixelType"><ptype>GLenum</ptype> <name>type</name></param>
>+            <param><ptype>GLsizei</ptype> <name>rowBufSize</name></param>
>+            <param len="rowBufSize">void *<name>row</name></param>
>+            <param><ptype>GLsizei</ptype> <name>columnBufSize</name></param>
>+            <param len="columnBufSize">void *<name>column</name></param>
>+            <param len="0">void *<name>span</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetnTexImage</name></proto>
>+            <param group="TextureTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param><ptype>GLint</ptype> <name>level</name></param>
>+            <param group="PixelFormat"><ptype>GLenum</ptype> <name>format</name></param>
>+            <param group="PixelType"><ptype>GLenum</ptype> <name>type</name></param>
>+            <param><ptype>GLsizei</ptype> <name>bufSize</name></param>
>+            <param len="bufSize">void *<name>pixels</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetnTexImageARB</name></proto>
>+            <param group="TextureTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param><ptype>GLint</ptype> <name>level</name></param>
>+            <param group="PixelFormat"><ptype>GLenum</ptype> <name>format</name></param>
>+            <param group="PixelType"><ptype>GLenum</ptype> <name>type</name></param>
>+            <param><ptype>GLsizei</ptype> <name>bufSize</name></param>
>+            <param len="bufSize">void *<name>img</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetnUniformdv</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLsizei</ptype> <name>bufSize</name></param>
>+            <param len="bufSize"><ptype>GLdouble</ptype> *<name>params</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetnUniformdvARB</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLsizei</ptype> <name>bufSize</name></param>
>+            <param len="bufSize"><ptype>GLdouble</ptype> *<name>params</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetnUniformfv</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLsizei</ptype> <name>bufSize</name></param>
>+            <param len="bufSize"><ptype>GLfloat</ptype> *<name>params</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetnUniformfvARB</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLsizei</ptype> <name>bufSize</name></param>
>+            <param len="bufSize"><ptype>GLfloat</ptype> *<name>params</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetnUniformfvEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLsizei</ptype> <name>bufSize</name></param>
>+            <param len="bufSize"><ptype>GLfloat</ptype> *<name>params</name></param>
>+            <alias name="glGetnUniformfv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetnUniformfvKHR</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLsizei</ptype> <name>bufSize</name></param>
>+            <param len="bufSize"><ptype>GLfloat</ptype> *<name>params</name></param>
>+            <alias name="glGetnUniformfv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetnUniformi64vARB</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLsizei</ptype> <name>bufSize</name></param>
>+            <param len="bufSize"><ptype>GLint64</ptype> *<name>params</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetnUniformiv</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLsizei</ptype> <name>bufSize</name></param>
>+            <param len="bufSize"><ptype>GLint</ptype> *<name>params</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetnUniformivARB</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLsizei</ptype> <name>bufSize</name></param>
>+            <param len="bufSize"><ptype>GLint</ptype> *<name>params</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetnUniformivEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLsizei</ptype> <name>bufSize</name></param>
>+            <param len="bufSize"><ptype>GLint</ptype> *<name>params</name></param>
>+            <alias name="glGetnUniformiv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetnUniformivKHR</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLsizei</ptype> <name>bufSize</name></param>
>+            <param len="bufSize"><ptype>GLint</ptype> *<name>params</name></param>
>+            <alias name="glGetnUniformiv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetnUniformui64vARB</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLsizei</ptype> <name>bufSize</name></param>
>+            <param len="bufSize"><ptype>GLuint64</ptype> *<name>params</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetnUniformuiv</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLsizei</ptype> <name>bufSize</name></param>
>+            <param len="bufSize"><ptype>GLuint</ptype> *<name>params</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetnUniformuivARB</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLsizei</ptype> <name>bufSize</name></param>
>+            <param len="bufSize"><ptype>GLuint</ptype> *<name>params</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGetnUniformuivKHR</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLsizei</ptype> <name>bufSize</name></param>
>+            <param len="bufSize"><ptype>GLuint</ptype> *<name>params</name></param>
>+            <alias name="glGetnUniformuiv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glGlobalAlphaFactorbSUN</name></proto>
>+            <param><ptype>GLbyte</ptype> <name>factor</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGlobalAlphaFactordSUN</name></proto>
>+            <param><ptype>GLdouble</ptype> <name>factor</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGlobalAlphaFactorfSUN</name></proto>
>+            <param><ptype>GLfloat</ptype> <name>factor</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGlobalAlphaFactoriSUN</name></proto>
>+            <param><ptype>GLint</ptype> <name>factor</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGlobalAlphaFactorsSUN</name></proto>
>+            <param><ptype>GLshort</ptype> <name>factor</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGlobalAlphaFactorubSUN</name></proto>
>+            <param><ptype>GLubyte</ptype> <name>factor</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGlobalAlphaFactoruiSUN</name></proto>
>+            <param><ptype>GLuint</ptype> <name>factor</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glGlobalAlphaFactorusSUN</name></proto>
>+            <param><ptype>GLushort</ptype> <name>factor</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glHint</name></proto>
>+            <param group="HintTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="HintMode"><ptype>GLenum</ptype> <name>mode</name></param>
>+            <glx type="render" opcode="85"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glHintPGI</name></proto>
>+            <param group="HintTargetPGI"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param><ptype>GLint</ptype> <name>mode</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glHistogram</name></proto>
>+            <param group="HistogramTargetEXT"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param><ptype>GLsizei</ptype> <name>width</name></param>
>+            <param group="InternalFormat"><ptype>GLenum</ptype> <name>internalformat</name></param>
>+            <param group="Boolean"><ptype>GLboolean</ptype> <name>sink</name></param>
>+            <glx type="render" opcode="4110"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glHistogramEXT</name></proto>
>+            <param group="HistogramTargetEXT"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param><ptype>GLsizei</ptype> <name>width</name></param>
>+            <param group="InternalFormat"><ptype>GLenum</ptype> <name>internalformat</name></param>
>+            <param group="Boolean"><ptype>GLboolean</ptype> <name>sink</name></param>
>+            <alias name="glHistogram"/>
>+            <glx type="render" opcode="4110"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glIglooInterfaceSGIX</name></proto>
>+            <param group="IglooFunctionSelectSGIX"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param group="IglooParameterSGIX" len="COMPSIZE(pname)">const void *<name>params</name></param>
>+            <glx type="render" opcode="200"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glImageTransformParameterfHP</name></proto>
>+            <param group="ImageTransformTargetHP"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="ImageTransformPNameHP"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param><ptype>GLfloat</ptype> <name>param</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glImageTransformParameterfvHP</name></proto>
>+            <param group="ImageTransformTargetHP"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="ImageTransformPNameHP"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="COMPSIZE(pname)">const <ptype>GLfloat</ptype> *<name>params</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glImageTransformParameteriHP</name></proto>
>+            <param group="ImageTransformTargetHP"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="ImageTransformPNameHP"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param><ptype>GLint</ptype> <name>param</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glImageTransformParameterivHP</name></proto>
>+            <param group="ImageTransformTargetHP"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="ImageTransformPNameHP"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="COMPSIZE(pname)">const <ptype>GLint</ptype> *<name>params</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glImportMemoryFdEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>memory</name></param>
>+            <param><ptype>GLuint64</ptype> <name>size</name></param>
>+            <param group="ExternalHandleType"><ptype>GLenum</ptype> <name>handleType</name></param>
>+            <param><ptype>GLint</ptype> <name>fd</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glImportMemoryWin32HandleEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>memory</name></param>
>+            <param><ptype>GLuint64</ptype> <name>size</name></param>
>+            <param group="ExternalHandleType"><ptype>GLenum</ptype> <name>handleType</name></param>
>+            <param>void *<name>handle</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glImportMemoryWin32NameEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>memory</name></param>
>+            <param><ptype>GLuint64</ptype> <name>size</name></param>
>+            <param group="ExternalHandleType"><ptype>GLenum</ptype> <name>handleType</name></param>
>+            <param>const void *<name>name</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glImportSemaphoreFdEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>semaphore</name></param>
>+            <param group="ExternalHandleType"><ptype>GLenum</ptype> <name>handleType</name></param>
>+            <param><ptype>GLint</ptype> <name>fd</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glImportSemaphoreWin32HandleEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>semaphore</name></param>
>+            <param group="ExternalHandleType"><ptype>GLenum</ptype> <name>handleType</name></param>
>+            <param>void *<name>handle</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glImportSemaphoreWin32NameEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>semaphore</name></param>
>+            <param group="ExternalHandleType"><ptype>GLenum</ptype> <name>handleType</name></param>
>+            <param>const void *<name>name</name></param>
>+        </command>
>+        <command>
>+            <proto group="sync"><ptype>GLsync</ptype> <name>glImportSyncEXT</name></proto>
>+            <param><ptype>GLenum</ptype> <name>external_sync_type</name></param>
>+            <param><ptype>GLintptr</ptype> <name>external_sync</name></param>
>+            <param><ptype>GLbitfield</ptype> <name>flags</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glIndexFormatNV</name></proto>
>+            <param><ptype>GLenum</ptype> <name>type</name></param>
>+            <param><ptype>GLsizei</ptype> <name>stride</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glIndexFuncEXT</name></proto>
>+            <param group="IndexFunctionEXT"><ptype>GLenum</ptype> <name>func</name></param>
>+            <param group="ClampedFloat32"><ptype>GLclampf</ptype> <name>ref</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glIndexMask</name></proto>
>+            <param group="MaskedColorIndexValueI"><ptype>GLuint</ptype> <name>mask</name></param>
>+            <glx type="render" opcode="136"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glIndexMaterialEXT</name></proto>
>+            <param group="MaterialFace"><ptype>GLenum</ptype> <name>face</name></param>
>+            <param group="IndexMaterialParameterEXT"><ptype>GLenum</ptype> <name>mode</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glIndexPointer</name></proto>
>+            <param group="IndexPointerType"><ptype>GLenum</ptype> <name>type</name></param>
>+            <param><ptype>GLsizei</ptype> <name>stride</name></param>
>+            <param len="COMPSIZE(type,stride)">const void *<name>pointer</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glIndexPointerEXT</name></proto>
>+            <param group="IndexPointerType"><ptype>GLenum</ptype> <name>type</name></param>
>+            <param><ptype>GLsizei</ptype> <name>stride</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param len="COMPSIZE(type,stride,count)">const void *<name>pointer</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glIndexPointerListIBM</name></proto>
>+            <param group="IndexPointerType"><ptype>GLenum</ptype> <name>type</name></param>
>+            <param><ptype>GLint</ptype> <name>stride</name></param>
>+            <param len="COMPSIZE(type,stride)">const void **<name>pointer</name></param>
>+            <param><ptype>GLint</ptype> <name>ptrstride</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glIndexd</name></proto>
>+            <param group="ColorIndexValueD"><ptype>GLdouble</ptype> <name>c</name></param>
>+            <vecequiv name="glIndexdv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glIndexdv</name></proto>
>+            <param group="ColorIndexValueD" len="1">const <ptype>GLdouble</ptype> *<name>c</name></param>
>+            <glx type="render" opcode="24"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glIndexf</name></proto>
>+            <param group="ColorIndexValueF"><ptype>GLfloat</ptype> <name>c</name></param>
>+            <vecequiv name="glIndexfv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glIndexfv</name></proto>
>+            <param group="ColorIndexValueF" len="1">const <ptype>GLfloat</ptype> *<name>c</name></param>
>+            <glx type="render" opcode="25"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glIndexi</name></proto>
>+            <param group="ColorIndexValueI"><ptype>GLint</ptype> <name>c</name></param>
>+            <vecequiv name="glIndexiv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glIndexiv</name></proto>
>+            <param group="ColorIndexValueI" len="1">const <ptype>GLint</ptype> *<name>c</name></param>
>+            <glx type="render" opcode="26"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glIndexs</name></proto>
>+            <param group="ColorIndexValueS"><ptype>GLshort</ptype> <name>c</name></param>
>+            <vecequiv name="glIndexsv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glIndexsv</name></proto>
>+            <param group="ColorIndexValueS" len="1">const <ptype>GLshort</ptype> *<name>c</name></param>
>+            <glx type="render" opcode="27"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glIndexub</name></proto>
>+            <param group="ColorIndexValueUB"><ptype>GLubyte</ptype> <name>c</name></param>
>+            <vecequiv name="glIndexubv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glIndexubv</name></proto>
>+            <param group="ColorIndexValueUB" len="1">const <ptype>GLubyte</ptype> *<name>c</name></param>
>+            <glx type="render" opcode="194"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glIndexxOES</name></proto>
>+            <param><ptype>GLfixed</ptype> <name>component</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glIndexxvOES</name></proto>
>+            <param len="1">const <ptype>GLfixed</ptype> *<name>component</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glInitNames</name></proto>
>+            <glx type="render" opcode="121"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glInsertComponentEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>res</name></param>
>+            <param><ptype>GLuint</ptype> <name>src</name></param>
>+            <param><ptype>GLuint</ptype> <name>num</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glInsertEventMarkerEXT</name></proto>
>+            <param><ptype>GLsizei</ptype> <name>length</name></param>
>+            <param>const <ptype>GLchar</ptype> *<name>marker</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glInstrumentsBufferSGIX</name></proto>
>+            <param><ptype>GLsizei</ptype> <name>size</name></param>
>+            <param len="size"><ptype>GLint</ptype> *<name>buffer</name></param>
>+            <glx type="vendor" opcode="4103"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glInterleavedArrays</name></proto>
>+            <param group="InterleavedArrayFormat"><ptype>GLenum</ptype> <name>format</name></param>
>+            <param><ptype>GLsizei</ptype> <name>stride</name></param>
>+            <param len="COMPSIZE(format,stride)">const void *<name>pointer</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glInterpolatePathsNV</name></proto>
>+            <param group="Path"><ptype>GLuint</ptype> <name>resultPath</name></param>
>+            <param group="Path"><ptype>GLuint</ptype> <name>pathA</name></param>
>+            <param group="Path"><ptype>GLuint</ptype> <name>pathB</name></param>
>+            <param><ptype>GLfloat</ptype> <name>weight</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glInvalidateBufferData</name></proto>
>+            <param><ptype>GLuint</ptype> <name>buffer</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glInvalidateBufferSubData</name></proto>
>+            <param><ptype>GLuint</ptype> <name>buffer</name></param>
>+            <param group="BufferOffset"><ptype>GLintptr</ptype> <name>offset</name></param>
>+            <param group="BufferSize"><ptype>GLsizeiptr</ptype> <name>length</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glInvalidateFramebuffer</name></proto>
>+            <param group="FramebufferTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param><ptype>GLsizei</ptype> <name>numAttachments</name></param>
>+            <param len="numAttachments">const <ptype>GLenum</ptype> *<name>attachments</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glInvalidateNamedFramebufferData</name></proto>
>+            <param><ptype>GLuint</ptype> <name>framebuffer</name></param>
>+            <param><ptype>GLsizei</ptype> <name>numAttachments</name></param>
>+            <param group="FramebufferAttachment">const <ptype>GLenum</ptype> *<name>attachments</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glInvalidateNamedFramebufferSubData</name></proto>
>+            <param><ptype>GLuint</ptype> <name>framebuffer</name></param>
>+            <param><ptype>GLsizei</ptype> <name>numAttachments</name></param>
>+            <param group="FramebufferAttachment">const <ptype>GLenum</ptype> *<name>attachments</name></param>
>+            <param><ptype>GLint</ptype> <name>x</name></param>
>+            <param><ptype>GLint</ptype> <name>y</name></param>
>+            <param><ptype>GLsizei</ptype> <name>width</name></param>
>+            <param><ptype>GLsizei</ptype> <name>height</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glInvalidateSubFramebuffer</name></proto>
>+            <param><ptype>GLenum</ptype> <name>target</name></param>
>+            <param><ptype>GLsizei</ptype> <name>numAttachments</name></param>
>+            <param len="numAttachments" group="FramebufferAttachment">const <ptype>GLenum</ptype> *<name>attachments</name></param>
>+            <param><ptype>GLint</ptype> <name>x</name></param>
>+            <param><ptype>GLint</ptype> <name>y</name></param>
>+            <param><ptype>GLsizei</ptype> <name>width</name></param>
>+            <param><ptype>GLsizei</ptype> <name>height</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glInvalidateTexImage</name></proto>
>+            <param><ptype>GLuint</ptype> <name>texture</name></param>
>+            <param><ptype>GLint</ptype> <name>level</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glInvalidateTexSubImage</name></proto>
>+            <param><ptype>GLuint</ptype> <name>texture</name></param>
>+            <param><ptype>GLint</ptype> <name>level</name></param>
>+            <param><ptype>GLint</ptype> <name>xoffset</name></param>
>+            <param><ptype>GLint</ptype> <name>yoffset</name></param>
>+            <param><ptype>GLint</ptype> <name>zoffset</name></param>
>+            <param><ptype>GLsizei</ptype> <name>width</name></param>
>+            <param><ptype>GLsizei</ptype> <name>height</name></param>
>+            <param><ptype>GLsizei</ptype> <name>depth</name></param>
>+        </command>
>+        <command>
>+            <proto group="Boolean"><ptype>GLboolean</ptype> <name>glIsAsyncMarkerSGIX</name></proto>
>+            <param><ptype>GLuint</ptype> <name>marker</name></param>
>+        </command>
>+        <command>
>+            <proto group="Boolean"><ptype>GLboolean</ptype> <name>glIsBuffer</name></proto>
>+            <param><ptype>GLuint</ptype> <name>buffer</name></param>
>+        </command>
>+        <command>
>+            <proto group="Boolean"><ptype>GLboolean</ptype> <name>glIsBufferARB</name></proto>
>+            <param><ptype>GLuint</ptype> <name>buffer</name></param>
>+            <alias name="glIsBuffer"/>
>+        </command>
>+        <command>
>+            <proto group="Boolean"><ptype>GLboolean</ptype> <name>glIsBufferResidentNV</name></proto>
>+            <param><ptype>GLenum</ptype> <name>target</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>GLboolean</ptype> <name>glIsCommandListNV</name></proto>
>+            <param><ptype>GLuint</ptype> <name>list</name></param>
>+        </command>
>+        <command>
>+            <proto group="Boolean"><ptype>GLboolean</ptype> <name>glIsEnabled</name></proto>
>+            <param group="EnableCap"><ptype>GLenum</ptype> <name>cap</name></param>
>+            <glx type="single" opcode="140"/>
>+        </command>
>+        <command>
>+            <proto group="Boolean"><ptype>GLboolean</ptype> <name>glIsEnabledIndexedEXT</name></proto>
>+            <param group="EnableCap"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <alias name="glIsEnabledi"/>
>+            <glx type="single" opcode="212"/>
>+        </command>
>+        <command>
>+            <proto group="Boolean"><ptype>GLboolean</ptype> <name>glIsEnabledi</name></proto>
>+            <param group="EnableCap"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+        </command>
>+        <command>
>+            <proto group="Boolean"><ptype>GLboolean</ptype> <name>glIsEnablediEXT</name></proto>
>+            <param group="EnableCap"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <alias name="glIsEnabledi"/>
>+        </command>
>+        <command>
>+            <proto group="Boolean"><ptype>GLboolean</ptype> <name>glIsEnablediNV</name></proto>
>+            <param group="EnableCap"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <alias name="glIsEnabledi"/>
>+        </command>
>+        <command>
>+            <proto group="Boolean"><ptype>GLboolean</ptype> <name>glIsEnablediOES</name></proto>
>+            <param group="EnableCap"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <alias name="glIsEnabledi"/>
>+        </command>
>+        <command>
>+            <proto group="Boolean"><ptype>GLboolean</ptype> <name>glIsFenceAPPLE</name></proto>
>+            <param group="FenceNV"><ptype>GLuint</ptype> <name>fence</name></param>
>+        </command>
>+        <command>
>+            <proto group="Boolean"><ptype>GLboolean</ptype> <name>glIsFenceNV</name></proto>
>+            <param group="FenceNV"><ptype>GLuint</ptype> <name>fence</name></param>
>+            <glx type="vendor" opcode="1278"/>
>+        </command>
>+        <command>
>+            <proto group="Boolean"><ptype>GLboolean</ptype> <name>glIsFramebuffer</name></proto>
>+            <param><ptype>GLuint</ptype> <name>framebuffer</name></param>
>+            <glx type="vendor" opcode="1425"/>
>+        </command>
>+        <command>
>+            <proto group="Boolean"><ptype>GLboolean</ptype> <name>glIsFramebufferEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>framebuffer</name></param>
>+            <alias name="glIsFramebuffer"/>
>+            <glx type="vendor" opcode="1425"/>
>+        </command>
>+        <command>
>+            <proto><ptype>GLboolean</ptype> <name>glIsFramebufferOES</name></proto>
>+            <param><ptype>GLuint</ptype> <name>framebuffer</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>GLboolean</ptype> <name>glIsImageHandleResidentARB</name></proto>
>+            <param><ptype>GLuint64</ptype> <name>handle</name></param>
>+        </command>
>+        <command>
>+            <proto group="Boolean"><ptype>GLboolean</ptype> <name>glIsImageHandleResidentNV</name></proto>
>+            <param><ptype>GLuint64</ptype> <name>handle</name></param>
>+        </command>
>+        <command>
>+            <proto group="Boolean"><ptype>GLboolean</ptype> <name>glIsList</name></proto>
>+            <param group="List"><ptype>GLuint</ptype> <name>list</name></param>
>+            <glx type="single" opcode="141"/>
>+        </command>
>+        <command>
>+            <proto group="Boolean"><ptype>GLboolean</ptype> <name>glIsMemoryObjectEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>memoryObject</name></param>
>+        </command>
>+        <command>
>+            <proto group="Boolean"><ptype>GLboolean</ptype> <name>glIsNameAMD</name></proto>
>+            <param><ptype>GLenum</ptype> <name>identifier</name></param>
>+            <param><ptype>GLuint</ptype> <name>name</name></param>
>+        </command>
>+        <command>
>+            <proto group="Boolean"><ptype>GLboolean</ptype> <name>glIsNamedBufferResidentNV</name></proto>
>+            <param><ptype>GLuint</ptype> <name>buffer</name></param>
>+        </command>
>+        <command>
>+            <proto group="Boolean"><ptype>GLboolean</ptype> <name>glIsNamedStringARB</name></proto>
>+            <param><ptype>GLint</ptype> <name>namelen</name></param>
>+            <param len="namelen">const <ptype>GLchar</ptype> *<name>name</name></param>
>+        </command>
>+        <command>
>+            <proto group="Boolean"><ptype>GLboolean</ptype> <name>glIsObjectBufferATI</name></proto>
>+            <param><ptype>GLuint</ptype> <name>buffer</name></param>
>+        </command>
>+        <command>
>+            <proto group="Boolean"><ptype>GLboolean</ptype> <name>glIsOcclusionQueryNV</name></proto>
>+            <param><ptype>GLuint</ptype> <name>id</name></param>
>+        </command>
>+        <command>
>+            <proto group="Boolean"><ptype>GLboolean</ptype> <name>glIsPathNV</name></proto>
>+            <param group="Path"><ptype>GLuint</ptype> <name>path</name></param>
>+        </command>
>+        <command>
>+            <proto group="Boolean"><ptype>GLboolean</ptype> <name>glIsPointInFillPathNV</name></proto>
>+            <param group="Path"><ptype>GLuint</ptype> <name>path</name></param>
>+            <param group="MaskedStencilValue"><ptype>GLuint</ptype> <name>mask</name></param>
>+            <param><ptype>GLfloat</ptype> <name>x</name></param>
>+            <param><ptype>GLfloat</ptype> <name>y</name></param>
>+        </command>
>+        <command>
>+            <proto group="Boolean"><ptype>GLboolean</ptype> <name>glIsPointInStrokePathNV</name></proto>
>+            <param group="Path"><ptype>GLuint</ptype> <name>path</name></param>
>+            <param><ptype>GLfloat</ptype> <name>x</name></param>
>+            <param><ptype>GLfloat</ptype> <name>y</name></param>
>+        </command>
>+        <command>
>+            <proto group="Boolean"><ptype>GLboolean</ptype> <name>glIsProgram</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <glx type="single" opcode="197"/>
>+        </command>
>+        <command>
>+            <proto group="Boolean"><ptype>GLboolean</ptype> <name>glIsProgramARB</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <glx type="vendor" opcode="1304"/>
>+        </command>
>+        <command>
>+            <proto group="Boolean"><ptype>GLboolean</ptype> <name>glIsProgramNV</name></proto>
>+            <param><ptype>GLuint</ptype> <name>id</name></param>
>+            <alias name="glIsProgramARB"/>
>+            <glx type="vendor" opcode="1304"/>
>+        </command>
>+        <command>
>+            <proto group="Boolean"><ptype>GLboolean</ptype> <name>glIsProgramPipeline</name></proto>
>+            <param><ptype>GLuint</ptype> <name>pipeline</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>GLboolean</ptype> <name>glIsProgramPipelineEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>pipeline</name></param>
>+        </command>
>+        <command>
>+            <proto group="Boolean"><ptype>GLboolean</ptype> <name>glIsQuery</name></proto>
>+            <param><ptype>GLuint</ptype> <name>id</name></param>
>+            <glx type="single" opcode="163"/>
>+        </command>
>+        <command>
>+            <proto group="Boolean"><ptype>GLboolean</ptype> <name>glIsQueryARB</name></proto>
>+            <param><ptype>GLuint</ptype> <name>id</name></param>
>+            <alias name="glIsQuery"/>
>+        </command>
>+        <command>
>+            <proto><ptype>GLboolean</ptype> <name>glIsQueryEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>id</name></param>
>+        </command>
>+        <command>
>+            <proto group="Boolean"><ptype>GLboolean</ptype> <name>glIsRenderbuffer</name></proto>
>+            <param><ptype>GLuint</ptype> <name>renderbuffer</name></param>
>+            <glx type="vendor" opcode="1422"/>
>+        </command>
>+        <command>
>+            <proto group="Boolean"><ptype>GLboolean</ptype> <name>glIsRenderbufferEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>renderbuffer</name></param>
>+            <alias name="glIsRenderbuffer"/>
>+            <glx type="vendor" opcode="1422"/>
>+        </command>
>+        <command>
>+            <proto><ptype>GLboolean</ptype> <name>glIsRenderbufferOES</name></proto>
>+            <param><ptype>GLuint</ptype> <name>renderbuffer</name></param>
>+        </command>
>+        <command>
>+            <proto group="Boolean"><ptype>GLboolean</ptype> <name>glIsSemaphoreEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>semaphore</name></param>
>+        </command>
>+        <command>
>+            <proto group="Boolean"><ptype>GLboolean</ptype> <name>glIsSampler</name></proto>
>+            <param><ptype>GLuint</ptype> <name>sampler</name></param>
>+        </command>
>+        <command>
>+            <proto group="Boolean"><ptype>GLboolean</ptype> <name>glIsShader</name></proto>
>+            <param><ptype>GLuint</ptype> <name>shader</name></param>
>+            <glx type="single" opcode="196"/>
>+        </command>
>+        <command>
>+            <proto><ptype>GLboolean</ptype> <name>glIsStateNV</name></proto>
>+            <param><ptype>GLuint</ptype> <name>state</name></param>
>+        </command>
>+        <command>
>+            <proto group="Boolean"><ptype>GLboolean</ptype> <name>glIsSync</name></proto>
>+            <param group="sync"><ptype>GLsync</ptype> <name>sync</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>GLboolean</ptype> <name>glIsSyncAPPLE</name></proto>
>+            <param><ptype>GLsync</ptype> <name>sync</name></param>
>+            <alias name="glIsSync"/>
>+        </command>
>+        <command>
>+            <proto group="Boolean"><ptype>GLboolean</ptype> <name>glIsTexture</name></proto>
>+            <param group="Texture"><ptype>GLuint</ptype> <name>texture</name></param>
>+            <glx type="single" opcode="146"/>
>+        </command>
>+        <command>
>+            <proto group="Boolean"><ptype>GLboolean</ptype> <name>glIsTextureEXT</name></proto>
>+            <param group="Texture"><ptype>GLuint</ptype> <name>texture</name></param>
>+            <glx type="vendor" opcode="14"/>
>+        </command>
>+        <command>
>+            <proto><ptype>GLboolean</ptype> <name>glIsTextureHandleResidentARB</name></proto>
>+            <param><ptype>GLuint64</ptype> <name>handle</name></param>
>+        </command>
>+        <command>
>+            <proto group="Boolean"><ptype>GLboolean</ptype> <name>glIsTextureHandleResidentNV</name></proto>
>+            <param><ptype>GLuint64</ptype> <name>handle</name></param>
>+        </command>
>+        <command>
>+            <proto group="Boolean"><ptype>GLboolean</ptype> <name>glIsTransformFeedback</name></proto>
>+            <param><ptype>GLuint</ptype> <name>id</name></param>
>+        </command>
>+        <command>
>+            <proto group="Boolean"><ptype>GLboolean</ptype> <name>glIsTransformFeedbackNV</name></proto>
>+            <param><ptype>GLuint</ptype> <name>id</name></param>
>+            <alias name="glIsTransformFeedback"/>
>+        </command>
>+        <command>
>+            <proto group="Boolean"><ptype>GLboolean</ptype> <name>glIsVariantEnabledEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>id</name></param>
>+            <param group="VariantCapEXT"><ptype>GLenum</ptype> <name>cap</name></param>
>+        </command>
>+        <command>
>+            <proto group="Boolean"><ptype>GLboolean</ptype> <name>glIsVertexArray</name></proto>
>+            <param><ptype>GLuint</ptype> <name>array</name></param>
>+            <glx type="single" opcode="207"/>
>+        </command>
>+        <command>
>+            <proto group="Boolean"><ptype>GLboolean</ptype> <name>glIsVertexArrayAPPLE</name></proto>
>+            <param><ptype>GLuint</ptype> <name>array</name></param>
>+            <alias name="glIsVertexArray"/>
>+        </command>
>+        <command>
>+            <proto><ptype>GLboolean</ptype> <name>glIsVertexArrayOES</name></proto>
>+            <param><ptype>GLuint</ptype> <name>array</name></param>
>+            <alias name="glIsVertexArray"/>
>+        </command>
>+        <command>
>+            <proto group="Boolean"><ptype>GLboolean</ptype> <name>glIsVertexAttribEnabledAPPLE</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param><ptype>GLenum</ptype> <name>pname</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glLGPUCopyImageSubDataNVX</name></proto>
>+            <param><ptype>GLuint</ptype> <name>sourceGpu</name></param>
>+            <param><ptype>GLbitfield</ptype> <name>destinationGpuMask</name></param>
>+            <param><ptype>GLuint</ptype> <name>srcName</name></param>
>+            <param><ptype>GLenum</ptype> <name>srcTarget</name></param>
>+            <param><ptype>GLint</ptype> <name>srcLevel</name></param>
>+            <param><ptype>GLint</ptype> <name>srcX</name></param>
>+            <param><ptype>GLint</ptype> <name>srxY</name></param>
>+            <param><ptype>GLint</ptype> <name>srcZ</name></param>
>+            <param><ptype>GLuint</ptype> <name>dstName</name></param>
>+            <param><ptype>GLenum</ptype> <name>dstTarget</name></param>
>+            <param><ptype>GLint</ptype> <name>dstLevel</name></param>
>+            <param><ptype>GLint</ptype> <name>dstX</name></param>
>+            <param><ptype>GLint</ptype> <name>dstY</name></param>
>+            <param><ptype>GLint</ptype> <name>dstZ</name></param>
>+            <param><ptype>GLsizei</ptype> <name>width</name></param>
>+            <param><ptype>GLsizei</ptype> <name>height</name></param>
>+            <param><ptype>GLsizei</ptype> <name>depth</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glLGPUInterlockNVX</name></proto>
>+        </command>
>+        <command>
>+            <proto>void <name>glLGPUNamedBufferSubDataNVX</name></proto>
>+            <param><ptype>GLbitfield</ptype> <name>gpuMask</name></param>
>+            <param><ptype>GLuint</ptype> <name>buffer</name></param>
>+            <param><ptype>GLintptr</ptype> <name>offset</name></param>
>+            <param><ptype>GLsizeiptr</ptype> <name>size</name></param>
>+            <param>const void *<name>data</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glLabelObjectEXT</name></proto>
>+            <param><ptype>GLenum</ptype> <name>type</name></param>
>+            <param><ptype>GLuint</ptype> <name>object</name></param>
>+            <param><ptype>GLsizei</ptype> <name>length</name></param>
>+            <param>const <ptype>GLchar</ptype> *<name>label</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glLightEnviSGIX</name></proto>
>+            <param group="LightEnvParameterSGIX"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>param</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glLightModelf</name></proto>
>+            <param group="LightModelParameter"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param><ptype>GLfloat</ptype> <name>param</name></param>
>+            <glx type="render" opcode="90"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glLightModelfv</name></proto>
>+            <param group="LightModelParameter"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="COMPSIZE(pname)">const <ptype>GLfloat</ptype> *<name>params</name></param>
>+            <glx type="render" opcode="91"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glLightModeli</name></proto>
>+            <param group="LightModelParameter"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param><ptype>GLint</ptype> <name>param</name></param>
>+            <glx type="render" opcode="92"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glLightModeliv</name></proto>
>+            <param group="LightModelParameter"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="COMPSIZE(pname)">const <ptype>GLint</ptype> *<name>params</name></param>
>+            <glx type="render" opcode="93"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glLightModelx</name></proto>
>+            <param group="LightModelParameter"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param><ptype>GLfixed</ptype> <name>param</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glLightModelxOES</name></proto>
>+            <param group="LightModelParameter"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param><ptype>GLfixed</ptype> <name>param</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glLightModelxv</name></proto>
>+            <param group="LightModelParameter"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="COMPSIZE(pname)">const <ptype>GLfixed</ptype> *<name>param</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glLightModelxvOES</name></proto>
>+            <param group="LightModelParameter"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="COMPSIZE(pname)">const <ptype>GLfixed</ptype> *<name>param</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glLightf</name></proto>
>+            <param group="LightName"><ptype>GLenum</ptype> <name>light</name></param>
>+            <param group="LightParameter"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param group="CheckedFloat32"><ptype>GLfloat</ptype> <name>param</name></param>
>+            <glx type="render" opcode="86"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glLightfv</name></proto>
>+            <param group="LightName"><ptype>GLenum</ptype> <name>light</name></param>
>+            <param group="LightParameter"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param group="CheckedFloat32" len="COMPSIZE(pname)">const <ptype>GLfloat</ptype> *<name>params</name></param>
>+            <glx type="render" opcode="87"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glLighti</name></proto>
>+            <param group="LightName"><ptype>GLenum</ptype> <name>light</name></param>
>+            <param group="LightParameter"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>param</name></param>
>+            <glx type="render" opcode="88"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glLightiv</name></proto>
>+            <param group="LightName"><ptype>GLenum</ptype> <name>light</name></param>
>+            <param group="LightParameter"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param group="CheckedInt32" len="COMPSIZE(pname)">const <ptype>GLint</ptype> *<name>params</name></param>
>+            <glx type="render" opcode="89"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glLightx</name></proto>
>+            <param group="LightName"><ptype>GLenum</ptype> <name>light</name></param>
>+            <param group="LightParameter"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param><ptype>GLfixed</ptype> <name>param</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glLightxOES</name></proto>
>+            <param group="LightName"><ptype>GLenum</ptype> <name>light</name></param>
>+            <param group="LightParameter"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param><ptype>GLfixed</ptype> <name>param</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glLightxv</name></proto>
>+            <param group="LightName"><ptype>GLenum</ptype> <name>light</name></param>
>+            <param group="LightParameter"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="COMPSIZE(pname)">const <ptype>GLfixed</ptype> *<name>params</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glLightxvOES</name></proto>
>+            <param group="LightName"><ptype>GLenum</ptype> <name>light</name></param>
>+            <param group="LightParameter"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="COMPSIZE(pname)">const <ptype>GLfixed</ptype> *<name>params</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glLineStipple</name></proto>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>factor</name></param>
>+            <param group="LineStipple"><ptype>GLushort</ptype> <name>pattern</name></param>
>+            <glx type="render" opcode="94"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glLineWidth</name></proto>
>+            <param group="CheckedFloat32"><ptype>GLfloat</ptype> <name>width</name></param>
>+            <glx type="render" opcode="95"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glLineWidthx</name></proto>
>+            <param><ptype>GLfixed</ptype> <name>width</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glLineWidthxOES</name></proto>
>+            <param><ptype>GLfixed</ptype> <name>width</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glLinkProgram</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glLinkProgramARB</name></proto>
>+            <param group="handleARB"><ptype>GLhandleARB</ptype> <name>programObj</name></param>
>+            <alias name="glLinkProgram"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glListBase</name></proto>
>+            <param group="List"><ptype>GLuint</ptype> <name>base</name></param>
>+            <glx type="render" opcode="3"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glListDrawCommandsStatesClientNV</name></proto>
>+            <param><ptype>GLuint</ptype> <name>list</name></param>
>+            <param><ptype>GLuint</ptype> <name>segment</name></param>
>+            <param>const void **<name>indirects</name></param>
>+            <param>const <ptype>GLsizei</ptype> *<name>sizes</name></param>
>+            <param>const <ptype>GLuint</ptype> *<name>states</name></param>
>+            <param>const <ptype>GLuint</ptype> *<name>fbos</name></param>
>+            <param><ptype>GLuint</ptype> <name>count</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glListParameterfSGIX</name></proto>
>+            <param group="List"><ptype>GLuint</ptype> <name>list</name></param>
>+            <param group="ListParameterName"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param group="CheckedFloat32"><ptype>GLfloat</ptype> <name>param</name></param>
>+            <glx type="render" opcode="2078"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glListParameterfvSGIX</name></proto>
>+            <param group="List"><ptype>GLuint</ptype> <name>list</name></param>
>+            <param group="ListParameterName"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param group="CheckedFloat32" len="COMPSIZE(pname)">const <ptype>GLfloat</ptype> *<name>params</name></param>
>+            <glx type="render" opcode="2079"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glListParameteriSGIX</name></proto>
>+            <param group="List"><ptype>GLuint</ptype> <name>list</name></param>
>+            <param group="ListParameterName"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>param</name></param>
>+            <glx type="render" opcode="2080"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glListParameterivSGIX</name></proto>
>+            <param group="List"><ptype>GLuint</ptype> <name>list</name></param>
>+            <param group="ListParameterName"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param group="CheckedInt32" len="COMPSIZE(pname)">const <ptype>GLint</ptype> *<name>params</name></param>
>+            <glx type="render" opcode="2081"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glLoadIdentity</name></proto>
>+            <glx type="render" opcode="176"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glLoadIdentityDeformationMapSGIX</name></proto>
>+            <param group="FfdMaskSGIX"><ptype>GLbitfield</ptype> <name>mask</name></param>
>+            <glx type="render" opcode="2076"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glLoadMatrixd</name></proto>
>+            <param len="16">const <ptype>GLdouble</ptype> *<name>m</name></param>
>+            <glx type="render" opcode="178"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glLoadMatrixf</name></proto>
>+            <param len="16">const <ptype>GLfloat</ptype> *<name>m</name></param>
>+            <glx type="render" opcode="177"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glLoadMatrixx</name></proto>
>+            <param len="16">const <ptype>GLfixed</ptype> *<name>m</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glLoadMatrixxOES</name></proto>
>+            <param len="16">const <ptype>GLfixed</ptype> *<name>m</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glLoadName</name></proto>
>+            <param group="SelectName"><ptype>GLuint</ptype> <name>name</name></param>
>+            <glx type="render" opcode="122"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glLoadPaletteFromModelViewMatrixOES</name></proto>
>+        </command>
>+        <command>
>+            <proto>void <name>glLoadProgramNV</name></proto>
>+            <param group="VertexAttribEnumNV"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param><ptype>GLuint</ptype> <name>id</name></param>
>+            <param><ptype>GLsizei</ptype> <name>len</name></param>
>+            <param len="len">const <ptype>GLubyte</ptype> *<name>program</name></param>
>+            <glx type="render" opcode="4183"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glLoadTransposeMatrixd</name></proto>
>+            <param len="16">const <ptype>GLdouble</ptype> *<name>m</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glLoadTransposeMatrixdARB</name></proto>
>+            <param len="16">const <ptype>GLdouble</ptype> *<name>m</name></param>
>+            <alias name="glLoadTransposeMatrixd"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glLoadTransposeMatrixf</name></proto>
>+            <param len="16">const <ptype>GLfloat</ptype> *<name>m</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glLoadTransposeMatrixfARB</name></proto>
>+            <param len="16">const <ptype>GLfloat</ptype> *<name>m</name></param>
>+            <alias name="glLoadTransposeMatrixf"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glLoadTransposeMatrixxOES</name></proto>
>+            <param len="16">const <ptype>GLfixed</ptype> *<name>m</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glLockArraysEXT</name></proto>
>+            <param><ptype>GLint</ptype> <name>first</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glLogicOp</name></proto>
>+            <param group="LogicOp"><ptype>GLenum</ptype> <name>opcode</name></param>
>+            <glx type="render" opcode="161"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glMakeBufferNonResidentNV</name></proto>
>+            <param><ptype>GLenum</ptype> <name>target</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glMakeBufferResidentNV</name></proto>
>+            <param><ptype>GLenum</ptype> <name>target</name></param>
>+            <param><ptype>GLenum</ptype> <name>access</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glMakeImageHandleNonResidentARB</name></proto>
>+            <param><ptype>GLuint64</ptype> <name>handle</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glMakeImageHandleNonResidentNV</name></proto>
>+            <param><ptype>GLuint64</ptype> <name>handle</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glMakeImageHandleResidentARB</name></proto>
>+            <param><ptype>GLuint64</ptype> <name>handle</name></param>
>+            <param><ptype>GLenum</ptype> <name>access</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glMakeImageHandleResidentNV</name></proto>
>+            <param><ptype>GLuint64</ptype> <name>handle</name></param>
>+            <param><ptype>GLenum</ptype> <name>access</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glMakeNamedBufferNonResidentNV</name></proto>
>+            <param><ptype>GLuint</ptype> <name>buffer</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glMakeNamedBufferResidentNV</name></proto>
>+            <param><ptype>GLuint</ptype> <name>buffer</name></param>
>+            <param><ptype>GLenum</ptype> <name>access</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glMakeTextureHandleNonResidentARB</name></proto>
>+            <param><ptype>GLuint64</ptype> <name>handle</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glMakeTextureHandleNonResidentNV</name></proto>
>+            <param><ptype>GLuint64</ptype> <name>handle</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glMakeTextureHandleResidentARB</name></proto>
>+            <param><ptype>GLuint64</ptype> <name>handle</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glMakeTextureHandleResidentNV</name></proto>
>+            <param><ptype>GLuint64</ptype> <name>handle</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glMap1d</name></proto>
>+            <param group="MapTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="CoordD"><ptype>GLdouble</ptype> <name>u1</name></param>
>+            <param group="CoordD"><ptype>GLdouble</ptype> <name>u2</name></param>
>+            <param><ptype>GLint</ptype> <name>stride</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>order</name></param>
>+            <param group="CoordD" len="COMPSIZE(target,stride,order)">const <ptype>GLdouble</ptype> *<name>points</name></param>
>+            <glx type="render" opcode="143"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glMap1f</name></proto>
>+            <param group="MapTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="CoordF"><ptype>GLfloat</ptype> <name>u1</name></param>
>+            <param group="CoordF"><ptype>GLfloat</ptype> <name>u2</name></param>
>+            <param><ptype>GLint</ptype> <name>stride</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>order</name></param>
>+            <param group="CoordF" len="COMPSIZE(target,stride,order)">const <ptype>GLfloat</ptype> *<name>points</name></param>
>+            <glx type="render" opcode="144"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glMap1xOES</name></proto>
>+            <param group="MapTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param><ptype>GLfixed</ptype> <name>u1</name></param>
>+            <param><ptype>GLfixed</ptype> <name>u2</name></param>
>+            <param><ptype>GLint</ptype> <name>stride</name></param>
>+            <param><ptype>GLint</ptype> <name>order</name></param>
>+            <param><ptype>GLfixed</ptype> <name>points</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glMap2d</name></proto>
>+            <param group="MapTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="CoordD"><ptype>GLdouble</ptype> <name>u1</name></param>
>+            <param group="CoordD"><ptype>GLdouble</ptype> <name>u2</name></param>
>+            <param><ptype>GLint</ptype> <name>ustride</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>uorder</name></param>
>+            <param group="CoordD"><ptype>GLdouble</ptype> <name>v1</name></param>
>+            <param group="CoordD"><ptype>GLdouble</ptype> <name>v2</name></param>
>+            <param><ptype>GLint</ptype> <name>vstride</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>vorder</name></param>
>+            <param group="CoordD" len="COMPSIZE(target,ustride,uorder,vstride,vorder)">const <ptype>GLdouble</ptype> *<name>points</name></param>
>+            <glx type="render" opcode="145"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glMap2f</name></proto>
>+            <param group="MapTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="CoordF"><ptype>GLfloat</ptype> <name>u1</name></param>
>+            <param group="CoordF"><ptype>GLfloat</ptype> <name>u2</name></param>
>+            <param><ptype>GLint</ptype> <name>ustride</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>uorder</name></param>
>+            <param group="CoordF"><ptype>GLfloat</ptype> <name>v1</name></param>
>+            <param group="CoordF"><ptype>GLfloat</ptype> <name>v2</name></param>
>+            <param><ptype>GLint</ptype> <name>vstride</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>vorder</name></param>
>+            <param group="CoordF" len="COMPSIZE(target,ustride,uorder,vstride,vorder)">const <ptype>GLfloat</ptype> *<name>points</name></param>
>+            <glx type="render" opcode="146"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glMap2xOES</name></proto>
>+            <param group="MapTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param><ptype>GLfixed</ptype> <name>u1</name></param>
>+            <param><ptype>GLfixed</ptype> <name>u2</name></param>
>+            <param><ptype>GLint</ptype> <name>ustride</name></param>
>+            <param><ptype>GLint</ptype> <name>uorder</name></param>
>+            <param><ptype>GLfixed</ptype> <name>v1</name></param>
>+            <param><ptype>GLfixed</ptype> <name>v2</name></param>
>+            <param><ptype>GLint</ptype> <name>vstride</name></param>
>+            <param><ptype>GLint</ptype> <name>vorder</name></param>
>+            <param><ptype>GLfixed</ptype> <name>points</name></param>
>+        </command>
>+        <command>
>+            <proto>void *<name>glMapBuffer</name></proto>
>+            <param group="BufferTargetARB"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="BufferAccessARB"><ptype>GLenum</ptype> <name>access</name></param>
>+        </command>
>+        <command>
>+            <proto>void *<name>glMapBufferARB</name></proto>
>+            <param group="BufferTargetARB"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="BufferAccessARB"><ptype>GLenum</ptype> <name>access</name></param>
>+            <alias name="glMapBuffer"/>
>+        </command>
>+        <command>
>+            <proto>void *<name>glMapBufferOES</name></proto>
>+            <param group="BufferTargetARB"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="BufferAccessARB"><ptype>GLenum</ptype> <name>access</name></param>
>+            <alias name="glMapBuffer"/>
>+        </command>
>+        <command>
>+            <proto>void *<name>glMapBufferRange</name></proto>
>+            <param group="BufferTargetARB"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="BufferOffset"><ptype>GLintptr</ptype> <name>offset</name></param>
>+            <param group="BufferSize"><ptype>GLsizeiptr</ptype> <name>length</name></param>
>+            <param group="BufferAccessMask"><ptype>GLbitfield</ptype> <name>access</name></param>
>+            <glx type="single" opcode="205"/>
>+        </command>
>+        <command>
>+            <proto>void *<name>glMapBufferRangeEXT</name></proto>
>+            <param group="BufferTargetARB"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param><ptype>GLintptr</ptype> <name>offset</name></param>
>+            <param><ptype>GLsizeiptr</ptype> <name>length</name></param>
>+            <param group="BufferAccessMask"><ptype>GLbitfield</ptype> <name>access</name></param>
>+            <alias name="glMapBufferRange"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glMapControlPointsNV</name></proto>
>+            <param group="EvalTargetNV"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param group="MapTypeNV"><ptype>GLenum</ptype> <name>type</name></param>
>+            <param><ptype>GLsizei</ptype> <name>ustride</name></param>
>+            <param><ptype>GLsizei</ptype> <name>vstride</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>uorder</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>vorder</name></param>
>+            <param group="Boolean"><ptype>GLboolean</ptype> <name>packed</name></param>
>+            <param len="COMPSIZE(target,uorder,vorder)">const void *<name>points</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glMapGrid1d</name></proto>
>+            <param><ptype>GLint</ptype> <name>un</name></param>
>+            <param group="CoordD"><ptype>GLdouble</ptype> <name>u1</name></param>
>+            <param group="CoordD"><ptype>GLdouble</ptype> <name>u2</name></param>
>+            <glx type="render" opcode="147"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glMapGrid1f</name></proto>
>+            <param><ptype>GLint</ptype> <name>un</name></param>
>+            <param group="CoordF"><ptype>GLfloat</ptype> <name>u1</name></param>
>+            <param group="CoordF"><ptype>GLfloat</ptype> <name>u2</name></param>
>+            <glx type="render" opcode="148"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glMapGrid1xOES</name></proto>
>+            <param><ptype>GLint</ptype> <name>n</name></param>
>+            <param><ptype>GLfixed</ptype> <name>u1</name></param>
>+            <param><ptype>GLfixed</ptype> <name>u2</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glMapGrid2d</name></proto>
>+            <param><ptype>GLint</ptype> <name>un</name></param>
>+            <param group="CoordD"><ptype>GLdouble</ptype> <name>u1</name></param>
>+            <param group="CoordD"><ptype>GLdouble</ptype> <name>u2</name></param>
>+            <param><ptype>GLint</ptype> <name>vn</name></param>
>+            <param group="CoordD"><ptype>GLdouble</ptype> <name>v1</name></param>
>+            <param group="CoordD"><ptype>GLdouble</ptype> <name>v2</name></param>
>+            <glx type="render" opcode="149"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glMapGrid2f</name></proto>
>+            <param><ptype>GLint</ptype> <name>un</name></param>
>+            <param group="CoordF"><ptype>GLfloat</ptype> <name>u1</name></param>
>+            <param group="CoordF"><ptype>GLfloat</ptype> <name>u2</name></param>
>+            <param><ptype>GLint</ptype> <name>vn</name></param>
>+            <param group="CoordF"><ptype>GLfloat</ptype> <name>v1</name></param>
>+            <param group="CoordF"><ptype>GLfloat</ptype> <name>v2</name></param>
>+            <glx type="render" opcode="150"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glMapGrid2xOES</name></proto>
>+            <param><ptype>GLint</ptype> <name>n</name></param>
>+            <param><ptype>GLfixed</ptype> <name>u1</name></param>
>+            <param><ptype>GLfixed</ptype> <name>u2</name></param>
>+            <param><ptype>GLfixed</ptype> <name>v1</name></param>
>+            <param><ptype>GLfixed</ptype> <name>v2</name></param>
>+        </command>
>+        <command>
>+            <proto>void *<name>glMapNamedBuffer</name></proto>
>+            <param><ptype>GLuint</ptype> <name>buffer</name></param>
>+            <param group="BufferAccessARB"><ptype>GLenum</ptype> <name>access</name></param>
>+        </command>
>+        <command>
>+            <proto>void *<name>glMapNamedBufferEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>buffer</name></param>
>+            <param group="BufferAccessARB"><ptype>GLenum</ptype> <name>access</name></param>
>+        </command>
>+        <command>
>+            <proto>void *<name>glMapNamedBufferRange</name></proto>
>+            <param><ptype>GLuint</ptype> <name>buffer</name></param>
>+            <param><ptype>GLintptr</ptype> <name>offset</name></param>
>+            <param group="BufferSize"><ptype>GLsizeiptr</ptype> <name>length</name></param>
>+            <param group="BufferAccessMask"><ptype>GLbitfield</ptype> <name>access</name></param>
>+        </command>
>+        <command>
>+            <proto>void *<name>glMapNamedBufferRangeEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>buffer</name></param>
>+            <param><ptype>GLintptr</ptype> <name>offset</name></param>
>+            <param><ptype>GLsizeiptr</ptype> <name>length</name></param>
>+            <param group="BufferAccessMask"><ptype>GLbitfield</ptype> <name>access</name></param>
>+        </command>
>+        <command>
>+            <proto>void *<name>glMapObjectBufferATI</name></proto>
>+            <param><ptype>GLuint</ptype> <name>buffer</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glMapParameterfvNV</name></proto>
>+            <param group="EvalTargetNV"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="MapParameterNV"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param group="CheckedFloat32" len="COMPSIZE(target,pname)">const <ptype>GLfloat</ptype> *<name>params</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glMapParameterivNV</name></proto>
>+            <param group="EvalTargetNV"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="MapParameterNV"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param group="CheckedInt32" len="COMPSIZE(target,pname)">const <ptype>GLint</ptype> *<name>params</name></param>
>+        </command>
>+        <command>
>+            <proto>void *<name>glMapTexture2DINTEL</name></proto>
>+            <param><ptype>GLuint</ptype> <name>texture</name></param>
>+            <param><ptype>GLint</ptype> <name>level</name></param>
>+            <param><ptype>GLbitfield</ptype> <name>access</name></param>
>+            <param len="1"><ptype>GLint</ptype> *<name>stride</name></param>
>+            <param len="1"><ptype>GLenum</ptype> *<name>layout</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glMapVertexAttrib1dAPPLE</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param><ptype>GLuint</ptype> <name>size</name></param>
>+            <param group="CoordD"><ptype>GLdouble</ptype> <name>u1</name></param>
>+            <param group="CoordD"><ptype>GLdouble</ptype> <name>u2</name></param>
>+            <param><ptype>GLint</ptype> <name>stride</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>order</name></param>
>+            <param group="CoordD" len="COMPSIZE(size,stride,order)">const <ptype>GLdouble</ptype> *<name>points</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glMapVertexAttrib1fAPPLE</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param><ptype>GLuint</ptype> <name>size</name></param>
>+            <param group="CoordF"><ptype>GLfloat</ptype> <name>u1</name></param>
>+            <param group="CoordF"><ptype>GLfloat</ptype> <name>u2</name></param>
>+            <param><ptype>GLint</ptype> <name>stride</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>order</name></param>
>+            <param group="CoordF" len="COMPSIZE(size,stride,order)">const <ptype>GLfloat</ptype> *<name>points</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glMapVertexAttrib2dAPPLE</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param><ptype>GLuint</ptype> <name>size</name></param>
>+            <param group="CoordD"><ptype>GLdouble</ptype> <name>u1</name></param>
>+            <param group="CoordD"><ptype>GLdouble</ptype> <name>u2</name></param>
>+            <param><ptype>GLint</ptype> <name>ustride</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>uorder</name></param>
>+            <param group="CoordD"><ptype>GLdouble</ptype> <name>v1</name></param>
>+            <param group="CoordD"><ptype>GLdouble</ptype> <name>v2</name></param>
>+            <param><ptype>GLint</ptype> <name>vstride</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>vorder</name></param>
>+            <param group="CoordD" len="COMPSIZE(size,ustride,uorder,vstride,vorder)">const <ptype>GLdouble</ptype> *<name>points</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glMapVertexAttrib2fAPPLE</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param><ptype>GLuint</ptype> <name>size</name></param>
>+            <param group="CoordF"><ptype>GLfloat</ptype> <name>u1</name></param>
>+            <param group="CoordF"><ptype>GLfloat</ptype> <name>u2</name></param>
>+            <param><ptype>GLint</ptype> <name>ustride</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>uorder</name></param>
>+            <param group="CoordF"><ptype>GLfloat</ptype> <name>v1</name></param>
>+            <param group="CoordF"><ptype>GLfloat</ptype> <name>v2</name></param>
>+            <param><ptype>GLint</ptype> <name>vstride</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>vorder</name></param>
>+            <param group="CoordF" len="COMPSIZE(size,ustride,uorder,vstride,vorder)">const <ptype>GLfloat</ptype> *<name>points</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glMaterialf</name></proto>
>+            <param group="MaterialFace"><ptype>GLenum</ptype> <name>face</name></param>
>+            <param group="MaterialParameter"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param group="CheckedFloat32"><ptype>GLfloat</ptype> <name>param</name></param>
>+            <glx type="render" opcode="96"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glMaterialfv</name></proto>
>+            <param group="MaterialFace"><ptype>GLenum</ptype> <name>face</name></param>
>+            <param group="MaterialParameter"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param group="CheckedFloat32" len="COMPSIZE(pname)">const <ptype>GLfloat</ptype> *<name>params</name></param>
>+            <glx type="render" opcode="97"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glMateriali</name></proto>
>+            <param group="MaterialFace"><ptype>GLenum</ptype> <name>face</name></param>
>+            <param group="MaterialParameter"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>param</name></param>
>+            <glx type="render" opcode="98"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glMaterialiv</name></proto>
>+            <param group="MaterialFace"><ptype>GLenum</ptype> <name>face</name></param>
>+            <param group="MaterialParameter"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param group="CheckedInt32" len="COMPSIZE(pname)">const <ptype>GLint</ptype> *<name>params</name></param>
>+            <glx type="render" opcode="99"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glMaterialx</name></proto>
>+            <param group="MaterialFace"><ptype>GLenum</ptype> <name>face</name></param>
>+            <param group="MaterialParameter"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param><ptype>GLfixed</ptype> <name>param</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glMaterialxOES</name></proto>
>+            <param group="MaterialFace"><ptype>GLenum</ptype> <name>face</name></param>
>+            <param group="MaterialParameter"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param><ptype>GLfixed</ptype> <name>param</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glMaterialxv</name></proto>
>+            <param group="MaterialFace"><ptype>GLenum</ptype> <name>face</name></param>
>+            <param group="MaterialParameter"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="COMPSIZE(pname)">const <ptype>GLfixed</ptype> *<name>param</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glMaterialxvOES</name></proto>
>+            <param group="MaterialFace"><ptype>GLenum</ptype> <name>face</name></param>
>+            <param group="MaterialParameter"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="COMPSIZE(pname)">const <ptype>GLfixed</ptype> *<name>param</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glMatrixFrustumEXT</name></proto>
>+            <param group="MatrixMode"><ptype>GLenum</ptype> <name>mode</name></param>
>+            <param><ptype>GLdouble</ptype> <name>left</name></param>
>+            <param><ptype>GLdouble</ptype> <name>right</name></param>
>+            <param><ptype>GLdouble</ptype> <name>bottom</name></param>
>+            <param><ptype>GLdouble</ptype> <name>top</name></param>
>+            <param><ptype>GLdouble</ptype> <name>zNear</name></param>
>+            <param><ptype>GLdouble</ptype> <name>zFar</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glMatrixIndexPointerARB</name></proto>
>+            <param><ptype>GLint</ptype> <name>size</name></param>
>+            <param group="MatrixIndexPointerTypeARB"><ptype>GLenum</ptype> <name>type</name></param>
>+            <param><ptype>GLsizei</ptype> <name>stride</name></param>
>+            <param len="COMPSIZE(size,type,stride)">const void *<name>pointer</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glMatrixIndexPointerOES</name></proto>
>+            <param><ptype>GLint</ptype> <name>size</name></param>
>+            <param group="MatrixIndexPointerTypeARB"><ptype>GLenum</ptype> <name>type</name></param>
>+            <param><ptype>GLsizei</ptype> <name>stride</name></param>
>+            <param len="COMPSIZE(size,type,stride)">const void *<name>pointer</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glMatrixIndexubvARB</name></proto>
>+            <param><ptype>GLint</ptype> <name>size</name></param>
>+            <param len="size">const <ptype>GLubyte</ptype> *<name>indices</name></param>
>+            <glx type="render" opcode="4326"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glMatrixIndexuivARB</name></proto>
>+            <param><ptype>GLint</ptype> <name>size</name></param>
>+            <param len="size">const <ptype>GLuint</ptype> *<name>indices</name></param>
>+            <glx type="render" opcode="4328"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glMatrixIndexusvARB</name></proto>
>+            <param><ptype>GLint</ptype> <name>size</name></param>
>+            <param len="size">const <ptype>GLushort</ptype> *<name>indices</name></param>
>+            <glx type="render" opcode="4327"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glMatrixLoad3x2fNV</name></proto>
>+            <param><ptype>GLenum</ptype> <name>matrixMode</name></param>
>+            <param>const <ptype>GLfloat</ptype> *<name>m</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glMatrixLoad3x3fNV</name></proto>
>+            <param><ptype>GLenum</ptype> <name>matrixMode</name></param>
>+            <param>const <ptype>GLfloat</ptype> *<name>m</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glMatrixLoadIdentityEXT</name></proto>
>+            <param group="MatrixMode"><ptype>GLenum</ptype> <name>mode</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glMatrixLoadTranspose3x3fNV</name></proto>
>+            <param><ptype>GLenum</ptype> <name>matrixMode</name></param>
>+            <param>const <ptype>GLfloat</ptype> *<name>m</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glMatrixLoadTransposedEXT</name></proto>
>+            <param group="MatrixMode"><ptype>GLenum</ptype> <name>mode</name></param>
>+            <param len="16">const <ptype>GLdouble</ptype> *<name>m</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glMatrixLoadTransposefEXT</name></proto>
>+            <param group="MatrixMode"><ptype>GLenum</ptype> <name>mode</name></param>
>+            <param len="16">const <ptype>GLfloat</ptype> *<name>m</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glMatrixLoaddEXT</name></proto>
>+            <param group="MatrixMode"><ptype>GLenum</ptype> <name>mode</name></param>
>+            <param len="16">const <ptype>GLdouble</ptype> *<name>m</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glMatrixLoadfEXT</name></proto>
>+            <param group="MatrixMode"><ptype>GLenum</ptype> <name>mode</name></param>
>+            <param len="16">const <ptype>GLfloat</ptype> *<name>m</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glMatrixMode</name></proto>
>+            <param group="MatrixMode"><ptype>GLenum</ptype> <name>mode</name></param>
>+            <glx type="render" opcode="179"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glMatrixMult3x2fNV</name></proto>
>+            <param><ptype>GLenum</ptype> <name>matrixMode</name></param>
>+            <param>const <ptype>GLfloat</ptype> *<name>m</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glMatrixMult3x3fNV</name></proto>
>+            <param><ptype>GLenum</ptype> <name>matrixMode</name></param>
>+            <param>const <ptype>GLfloat</ptype> *<name>m</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glMatrixMultTranspose3x3fNV</name></proto>
>+            <param><ptype>GLenum</ptype> <name>matrixMode</name></param>
>+            <param>const <ptype>GLfloat</ptype> *<name>m</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glMatrixMultTransposedEXT</name></proto>
>+            <param group="MatrixMode"><ptype>GLenum</ptype> <name>mode</name></param>
>+            <param len="16">const <ptype>GLdouble</ptype> *<name>m</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glMatrixMultTransposefEXT</name></proto>
>+            <param group="MatrixMode"><ptype>GLenum</ptype> <name>mode</name></param>
>+            <param len="16">const <ptype>GLfloat</ptype> *<name>m</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glMatrixMultdEXT</name></proto>
>+            <param group="MatrixMode"><ptype>GLenum</ptype> <name>mode</name></param>
>+            <param len="16">const <ptype>GLdouble</ptype> *<name>m</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glMatrixMultfEXT</name></proto>
>+            <param group="MatrixMode"><ptype>GLenum</ptype> <name>mode</name></param>
>+            <param len="16">const <ptype>GLfloat</ptype> *<name>m</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glMatrixOrthoEXT</name></proto>
>+            <param group="MatrixMode"><ptype>GLenum</ptype> <name>mode</name></param>
>+            <param><ptype>GLdouble</ptype> <name>left</name></param>
>+            <param><ptype>GLdouble</ptype> <name>right</name></param>
>+            <param><ptype>GLdouble</ptype> <name>bottom</name></param>
>+            <param><ptype>GLdouble</ptype> <name>top</name></param>
>+            <param><ptype>GLdouble</ptype> <name>zNear</name></param>
>+            <param><ptype>GLdouble</ptype> <name>zFar</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glMatrixPopEXT</name></proto>
>+            <param group="MatrixMode"><ptype>GLenum</ptype> <name>mode</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glMatrixPushEXT</name></proto>
>+            <param group="MatrixMode"><ptype>GLenum</ptype> <name>mode</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glMatrixRotatedEXT</name></proto>
>+            <param group="MatrixMode"><ptype>GLenum</ptype> <name>mode</name></param>
>+            <param><ptype>GLdouble</ptype> <name>angle</name></param>
>+            <param><ptype>GLdouble</ptype> <name>x</name></param>
>+            <param><ptype>GLdouble</ptype> <name>y</name></param>
>+            <param><ptype>GLdouble</ptype> <name>z</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glMatrixRotatefEXT</name></proto>
>+            <param group="MatrixMode"><ptype>GLenum</ptype> <name>mode</name></param>
>+            <param><ptype>GLfloat</ptype> <name>angle</name></param>
>+            <param><ptype>GLfloat</ptype> <name>x</name></param>
>+            <param><ptype>GLfloat</ptype> <name>y</name></param>
>+            <param><ptype>GLfloat</ptype> <name>z</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glMatrixScaledEXT</name></proto>
>+            <param group="MatrixMode"><ptype>GLenum</ptype> <name>mode</name></param>
>+            <param><ptype>GLdouble</ptype> <name>x</name></param>
>+            <param><ptype>GLdouble</ptype> <name>y</name></param>
>+            <param><ptype>GLdouble</ptype> <name>z</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glMatrixScalefEXT</name></proto>
>+            <param group="MatrixMode"><ptype>GLenum</ptype> <name>mode</name></param>
>+            <param><ptype>GLfloat</ptype> <name>x</name></param>
>+            <param><ptype>GLfloat</ptype> <name>y</name></param>
>+            <param><ptype>GLfloat</ptype> <name>z</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glMatrixTranslatedEXT</name></proto>
>+            <param group="MatrixMode"><ptype>GLenum</ptype> <name>mode</name></param>
>+            <param><ptype>GLdouble</ptype> <name>x</name></param>
>+            <param><ptype>GLdouble</ptype> <name>y</name></param>
>+            <param><ptype>GLdouble</ptype> <name>z</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glMatrixTranslatefEXT</name></proto>
>+            <param group="MatrixMode"><ptype>GLenum</ptype> <name>mode</name></param>
>+            <param><ptype>GLfloat</ptype> <name>x</name></param>
>+            <param><ptype>GLfloat</ptype> <name>y</name></param>
>+            <param><ptype>GLfloat</ptype> <name>z</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glMaxShaderCompilerThreadsKHR</name></proto>
>+            <param><ptype>GLuint</ptype> <name>count</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glMaxShaderCompilerThreadsARB</name></proto>
>+            <param><ptype>GLuint</ptype> <name>count</name></param>
>+            <alias name="glMaxShaderCompilerThreadsKHR"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glMemoryBarrier</name></proto>
>+            <param group="MemoryBarrierMask"><ptype>GLbitfield</ptype> <name>barriers</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glMemoryBarrierByRegion</name></proto>
>+            <param group="MemoryBarrierMask"><ptype>GLbitfield</ptype> <name>barriers</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glMemoryBarrierEXT</name></proto>
>+            <param group="MemoryBarrierMask"><ptype>GLbitfield</ptype> <name>barriers</name></param>
>+            <alias name="glMemoryBarrier"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glMemoryObjectParameterivEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>memoryObject</name></param>
>+            <param group="MemoryObjectParameterName"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param>const <ptype>GLint</ptype> *<name>params</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glMinSampleShading</name></proto>
>+            <param group="ColorF"><ptype>GLfloat</ptype> <name>value</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glMinSampleShadingARB</name></proto>
>+            <param group="ColorF"><ptype>GLfloat</ptype> <name>value</name></param>
>+            <alias name="glMinSampleShading"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glMinSampleShadingOES</name></proto>
>+            <param group="ColorF"><ptype>GLfloat</ptype> <name>value</name></param>
>+            <alias name="glMinSampleShading"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glMinmax</name></proto>
>+            <param group="MinmaxTargetEXT"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="InternalFormat"><ptype>GLenum</ptype> <name>internalformat</name></param>
>+            <param group="Boolean"><ptype>GLboolean</ptype> <name>sink</name></param>
>+            <glx type="render" opcode="4111"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glMinmaxEXT</name></proto>
>+            <param group="MinmaxTargetEXT"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="InternalFormat"><ptype>GLenum</ptype> <name>internalformat</name></param>
>+            <param group="Boolean"><ptype>GLboolean</ptype> <name>sink</name></param>
>+            <alias name="glMinmax"/>
>+            <glx type="render" opcode="4111"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glMultMatrixd</name></proto>
>+            <param len="16">const <ptype>GLdouble</ptype> *<name>m</name></param>
>+            <glx type="render" opcode="181"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glMultMatrixf</name></proto>
>+            <param len="16">const <ptype>GLfloat</ptype> *<name>m</name></param>
>+            <glx type="render" opcode="180"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glMultMatrixx</name></proto>
>+            <param len="16">const <ptype>GLfixed</ptype> *<name>m</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glMultMatrixxOES</name></proto>
>+            <param len="16">const <ptype>GLfixed</ptype> *<name>m</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glMultTransposeMatrixd</name></proto>
>+            <param len="16">const <ptype>GLdouble</ptype> *<name>m</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glMultTransposeMatrixdARB</name></proto>
>+            <param len="16">const <ptype>GLdouble</ptype> *<name>m</name></param>
>+            <alias name="glMultTransposeMatrixd"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glMultTransposeMatrixf</name></proto>
>+            <param len="16">const <ptype>GLfloat</ptype> *<name>m</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glMultTransposeMatrixfARB</name></proto>
>+            <param len="16">const <ptype>GLfloat</ptype> *<name>m</name></param>
>+            <alias name="glMultTransposeMatrixf"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glMultTransposeMatrixxOES</name></proto>
>+            <param len="16">const <ptype>GLfixed</ptype> *<name>m</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glMultiDrawArrays</name></proto>
>+            <param group="PrimitiveType"><ptype>GLenum</ptype> <name>mode</name></param>
>+            <param len="COMPSIZE(count)">const <ptype>GLint</ptype> *<name>first</name></param>
>+            <param len="COMPSIZE(drawcount)">const <ptype>GLsizei</ptype> *<name>count</name></param>
>+            <param><ptype>GLsizei</ptype> <name>drawcount</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glMultiDrawArraysEXT</name></proto>
>+            <param group="PrimitiveType"><ptype>GLenum</ptype> <name>mode</name></param>
>+            <param len="COMPSIZE(primcount)">const <ptype>GLint</ptype> *<name>first</name></param>
>+            <param len="COMPSIZE(primcount)">const <ptype>GLsizei</ptype> *<name>count</name></param>
>+            <param><ptype>GLsizei</ptype> <name>primcount</name></param>
>+            <alias name="glMultiDrawArrays"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glMultiDrawArraysIndirect</name></proto>
>+            <param group="PrimitiveType"><ptype>GLenum</ptype> <name>mode</name></param>
>+            <param len="COMPSIZE(drawcount,stride)">const void *<name>indirect</name></param>
>+            <param><ptype>GLsizei</ptype> <name>drawcount</name></param>
>+            <param><ptype>GLsizei</ptype> <name>stride</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glMultiDrawArraysIndirectAMD</name></proto>
>+            <param group="PrimitiveType"><ptype>GLenum</ptype> <name>mode</name></param>
>+            <param>const void *<name>indirect</name></param>
>+            <param><ptype>GLsizei</ptype> <name>primcount</name></param>
>+            <param><ptype>GLsizei</ptype> <name>stride</name></param>
>+            <alias name="glMultiDrawArraysIndirect"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glMultiDrawArraysIndirectBindlessCountNV</name></proto>
>+            <param group="PrimitiveType"><ptype>GLenum</ptype> <name>mode</name></param>
>+            <param>const void *<name>indirect</name></param>
>+            <param><ptype>GLsizei</ptype> <name>drawCount</name></param>
>+            <param><ptype>GLsizei</ptype> <name>maxDrawCount</name></param>
>+            <param><ptype>GLsizei</ptype> <name>stride</name></param>
>+            <param><ptype>GLint</ptype> <name>vertexBufferCount</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glMultiDrawArraysIndirectBindlessNV</name></proto>
>+            <param group="PrimitiveType"><ptype>GLenum</ptype> <name>mode</name></param>
>+            <param>const void *<name>indirect</name></param>
>+            <param><ptype>GLsizei</ptype> <name>drawCount</name></param>
>+            <param><ptype>GLsizei</ptype> <name>stride</name></param>
>+            <param><ptype>GLint</ptype> <name>vertexBufferCount</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glMultiDrawArraysIndirectCount</name></proto>
>+            <param group="PrimitiveType"><ptype>GLenum</ptype> <name>mode</name></param>
>+            <param>const void *<name>indirect</name></param>
>+            <param><ptype>GLintptr</ptype> <name>drawcount</name></param>
>+            <param><ptype>GLsizei</ptype> <name>maxdrawcount</name></param>
>+            <param><ptype>GLsizei</ptype> <name>stride</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glMultiDrawArraysIndirectCountARB</name></proto>
>+            <param group="PrimitiveType"><ptype>GLenum</ptype> <name>mode</name></param>
>+            <param>const void *<name>indirect</name></param>
>+            <param><ptype>GLintptr</ptype> <name>drawcount</name></param>
>+            <param><ptype>GLsizei</ptype> <name>maxdrawcount</name></param>
>+            <param><ptype>GLsizei</ptype> <name>stride</name></param>
>+            <alias name="glMultiDrawArraysIndirectCount"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glMultiDrawArraysIndirectEXT</name></proto>
>+            <param group="PrimitiveType"><ptype>GLenum</ptype> <name>mode</name></param>
>+            <param len="COMPSIZE(drawcount,stride)">const void *<name>indirect</name></param>
>+            <param><ptype>GLsizei</ptype> <name>drawcount</name></param>
>+            <param><ptype>GLsizei</ptype> <name>stride</name></param>
>+            <alias name="glMultiDrawArraysIndirect"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glMultiDrawElementArrayAPPLE</name></proto>
>+            <param group="PrimitiveType"><ptype>GLenum</ptype> <name>mode</name></param>
>+            <param len="primcount">const <ptype>GLint</ptype> *<name>first</name></param>
>+            <param len="primcount">const <ptype>GLsizei</ptype> *<name>count</name></param>
>+            <param><ptype>GLsizei</ptype> <name>primcount</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glMultiDrawElements</name></proto>
>+            <param group="PrimitiveType"><ptype>GLenum</ptype> <name>mode</name></param>
>+            <param len="COMPSIZE(drawcount)">const <ptype>GLsizei</ptype> *<name>count</name></param>
>+            <param group="DrawElementsType"><ptype>GLenum</ptype> <name>type</name></param>
>+            <param len="COMPSIZE(drawcount)">const void *const*<name>indices</name></param>
>+            <param><ptype>GLsizei</ptype> <name>drawcount</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glMultiDrawElementsBaseVertex</name></proto>
>+            <param group="PrimitiveType"><ptype>GLenum</ptype> <name>mode</name></param>
>+            <param len="COMPSIZE(drawcount)">const <ptype>GLsizei</ptype> *<name>count</name></param>
>+            <param group="DrawElementsType"><ptype>GLenum</ptype> <name>type</name></param>
>+            <param len="COMPSIZE(drawcount)">const void *const*<name>indices</name></param>
>+            <param><ptype>GLsizei</ptype> <name>drawcount</name></param>
>+            <param len="COMPSIZE(drawcount)">const <ptype>GLint</ptype> *<name>basevertex</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glMultiDrawElementsBaseVertexEXT</name></proto>
>+            <param group="PrimitiveType"><ptype>GLenum</ptype> <name>mode</name></param>
>+            <param len="COMPSIZE(drawcount)">const <ptype>GLsizei</ptype> *<name>count</name></param>
>+            <param group="DrawElementsType"><ptype>GLenum</ptype> <name>type</name></param>
>+            <param len="COMPSIZE(drawcount)">const void *const*<name>indices</name></param>
>+            <param><ptype>GLsizei</ptype> <name>primcount</name></param>
>+            <param len="COMPSIZE(drawcount)">const <ptype>GLint</ptype> *<name>basevertex</name></param>
>+            <alias name="glMultiDrawElementsBaseVertex"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glMultiDrawElementsEXT</name></proto>
>+            <param group="PrimitiveType"><ptype>GLenum</ptype> <name>mode</name></param>
>+            <param len="COMPSIZE(primcount)">const <ptype>GLsizei</ptype> *<name>count</name></param>
>+            <param group="DrawElementsType"><ptype>GLenum</ptype> <name>type</name></param>
>+            <param len="COMPSIZE(primcount)">const void *const*<name>indices</name></param>
>+            <param><ptype>GLsizei</ptype> <name>primcount</name></param>
>+            <alias name="glMultiDrawElements"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glMultiDrawElementsIndirect</name></proto>
>+            <param group="PrimitiveType"><ptype>GLenum</ptype> <name>mode</name></param>
>+            <param group="DrawElementsType"><ptype>GLenum</ptype> <name>type</name></param>
>+            <param len="COMPSIZE(drawcount,stride)">const void *<name>indirect</name></param>
>+            <param><ptype>GLsizei</ptype> <name>drawcount</name></param>
>+            <param><ptype>GLsizei</ptype> <name>stride</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glMultiDrawElementsIndirectAMD</name></proto>
>+            <param group="PrimitiveType"><ptype>GLenum</ptype> <name>mode</name></param>
>+            <param group="DrawElementsType"><ptype>GLenum</ptype> <name>type</name></param>
>+            <param>const void *<name>indirect</name></param>
>+            <param><ptype>GLsizei</ptype> <name>primcount</name></param>
>+            <param><ptype>GLsizei</ptype> <name>stride</name></param>
>+            <alias name="glMultiDrawElementsIndirect"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glMultiDrawElementsIndirectBindlessCountNV</name></proto>
>+            <param group="PrimitiveType"><ptype>GLenum</ptype> <name>mode</name></param>
>+            <param group="DrawElementsType"><ptype>GLenum</ptype> <name>type</name></param>
>+            <param>const void *<name>indirect</name></param>
>+            <param><ptype>GLsizei</ptype> <name>drawCount</name></param>
>+            <param><ptype>GLsizei</ptype> <name>maxDrawCount</name></param>
>+            <param><ptype>GLsizei</ptype> <name>stride</name></param>
>+            <param><ptype>GLint</ptype> <name>vertexBufferCount</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glMultiDrawElementsIndirectBindlessNV</name></proto>
>+            <param group="PrimitiveType"><ptype>GLenum</ptype> <name>mode</name></param>
>+            <param group="DrawElementsType"><ptype>GLenum</ptype> <name>type</name></param>
>+            <param>const void *<name>indirect</name></param>
>+            <param><ptype>GLsizei</ptype> <name>drawCount</name></param>
>+            <param><ptype>GLsizei</ptype> <name>stride</name></param>
>+            <param><ptype>GLint</ptype> <name>vertexBufferCount</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glMultiDrawElementsIndirectCount</name></proto>
>+            <param group="PrimitiveType"><ptype>GLenum</ptype> <name>mode</name></param>
>+            <param><ptype>GLenum</ptype> <name>type</name></param>
>+            <param>const void *<name>indirect</name></param>
>+            <param><ptype>GLintptr</ptype> <name>drawcount</name></param>
>+            <param><ptype>GLsizei</ptype> <name>maxdrawcount</name></param>
>+            <param><ptype>GLsizei</ptype> <name>stride</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glMultiDrawElementsIndirectCountARB</name></proto>
>+            <param group="PrimitiveType"><ptype>GLenum</ptype> <name>mode</name></param>
>+            <param group="DrawElementsType"><ptype>GLenum</ptype> <name>type</name></param>
>+            <param>const void *<name>indirect</name></param>
>+            <param><ptype>GLintptr</ptype> <name>drawcount</name></param>
>+            <param><ptype>GLsizei</ptype> <name>maxdrawcount</name></param>
>+            <param><ptype>GLsizei</ptype> <name>stride</name></param>
>+            <alias name="glMultiDrawElementsIndirectCount"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glMultiDrawElementsIndirectEXT</name></proto>
>+            <param group="PrimitiveType"><ptype>GLenum</ptype> <name>mode</name></param>
>+            <param group="DrawElementsType"><ptype>GLenum</ptype> <name>type</name></param>
>+            <param len="COMPSIZE(drawcount,stride)">const void *<name>indirect</name></param>
>+            <param><ptype>GLsizei</ptype> <name>drawcount</name></param>
>+            <param><ptype>GLsizei</ptype> <name>stride</name></param>
>+            <alias name="glMultiDrawElementsIndirect"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glMultiDrawRangeElementArrayAPPLE</name></proto>
>+            <param group="PrimitiveType"><ptype>GLenum</ptype> <name>mode</name></param>
>+            <param><ptype>GLuint</ptype> <name>start</name></param>
>+            <param><ptype>GLuint</ptype> <name>end</name></param>
>+            <param len="primcount">const <ptype>GLint</ptype> *<name>first</name></param>
>+            <param len="primcount">const <ptype>GLsizei</ptype> *<name>count</name></param>
>+            <param><ptype>GLsizei</ptype> <name>primcount</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glMultiModeDrawArraysIBM</name></proto>
>+            <param group="PrimitiveType" len="COMPSIZE(primcount)">const <ptype>GLenum</ptype> *<name>mode</name></param>
>+            <param len="COMPSIZE(primcount)">const <ptype>GLint</ptype> *<name>first</name></param>
>+            <param len="COMPSIZE(primcount)">const <ptype>GLsizei</ptype> *<name>count</name></param>
>+            <param><ptype>GLsizei</ptype> <name>primcount</name></param>
>+            <param><ptype>GLint</ptype> <name>modestride</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glMultiModeDrawElementsIBM</name></proto>
>+            <param group="PrimitiveType" len="COMPSIZE(primcount)">const <ptype>GLenum</ptype> *<name>mode</name></param>
>+            <param len="COMPSIZE(primcount)">const <ptype>GLsizei</ptype> *<name>count</name></param>
>+            <param group="DrawElementsType"><ptype>GLenum</ptype> <name>type</name></param>
>+            <param len="COMPSIZE(primcount)">const void *const*<name>indices</name></param>
>+            <param><ptype>GLsizei</ptype> <name>primcount</name></param>
>+            <param><ptype>GLint</ptype> <name>modestride</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glMultiTexBufferEXT</name></proto>
>+            <param group="TextureUnit"><ptype>GLenum</ptype> <name>texunit</name></param>
>+            <param group="TextureTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="TypeEnum"><ptype>GLenum</ptype> <name>internalformat</name></param>
>+            <param><ptype>GLuint</ptype> <name>buffer</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glMultiTexCoord1bOES</name></proto>
>+            <param group="TextureUnit"><ptype>GLenum</ptype> <name>texture</name></param>
>+            <param><ptype>GLbyte</ptype> <name>s</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glMultiTexCoord1bvOES</name></proto>
>+            <param group="TextureUnit"><ptype>GLenum</ptype> <name>texture</name></param>
>+            <param len="1">const <ptype>GLbyte</ptype> *<name>coords</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glMultiTexCoord1d</name></proto>
>+            <param group="TextureUnit"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="CoordD"><ptype>GLdouble</ptype> <name>s</name></param>
>+            <vecequiv name="glMultiTexCoord1dv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glMultiTexCoord1dARB</name></proto>
>+            <param group="TextureUnit"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="CoordD"><ptype>GLdouble</ptype> <name>s</name></param>
>+            <vecequiv name="glMultiTexCoord1dv"/>
>+            <alias name="glMultiTexCoord1d"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glMultiTexCoord1dv</name></proto>
>+            <param group="TextureUnit"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="CoordD" len="1">const <ptype>GLdouble</ptype> *<name>v</name></param>
>+            <glx type="render" opcode="198"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glMultiTexCoord1dvARB</name></proto>
>+            <param group="TextureUnit"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="CoordD" len="1">const <ptype>GLdouble</ptype> *<name>v</name></param>
>+            <alias name="glMultiTexCoord1dv"/>
>+            <glx type="render" opcode="198"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glMultiTexCoord1f</name></proto>
>+            <param group="TextureUnit"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="CoordF"><ptype>GLfloat</ptype> <name>s</name></param>
>+            <vecequiv name="glMultiTexCoord1fv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glMultiTexCoord1fARB</name></proto>
>+            <param group="TextureUnit"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="CoordF"><ptype>GLfloat</ptype> <name>s</name></param>
>+            <vecequiv name="glMultiTexCoord1fv"/>
>+            <alias name="glMultiTexCoord1f"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glMultiTexCoord1fv</name></proto>
>+            <param group="TextureUnit"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="CoordF" len="1">const <ptype>GLfloat</ptype> *<name>v</name></param>
>+            <glx type="render" opcode="199"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glMultiTexCoord1fvARB</name></proto>
>+            <param group="TextureUnit"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="CoordF" len="1">const <ptype>GLfloat</ptype> *<name>v</name></param>
>+            <alias name="glMultiTexCoord1fv"/>
>+            <glx type="render" opcode="199"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glMultiTexCoord1hNV</name></proto>
>+            <param group="TextureUnit"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="Half16NV"><ptype>GLhalfNV</ptype> <name>s</name></param>
>+            <vecequiv name="glMultiTexCoord1hvNV"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glMultiTexCoord1hvNV</name></proto>
>+            <param group="TextureUnit"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="Half16NV" len="1">const <ptype>GLhalfNV</ptype> *<name>v</name></param>
>+            <glx type="render" opcode="4250"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glMultiTexCoord1i</name></proto>
>+            <param group="TextureUnit"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="CoordI"><ptype>GLint</ptype> <name>s</name></param>
>+            <vecequiv name="glMultiTexCoord1iv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glMultiTexCoord1iARB</name></proto>
>+            <param group="TextureUnit"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="CoordI"><ptype>GLint</ptype> <name>s</name></param>
>+            <vecequiv name="glMultiTexCoord1iv"/>
>+            <alias name="glMultiTexCoord1i"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glMultiTexCoord1iv</name></proto>
>+            <param group="TextureUnit"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="CoordI" len="1">const <ptype>GLint</ptype> *<name>v</name></param>
>+            <glx type="render" opcode="200"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glMultiTexCoord1ivARB</name></proto>
>+            <param group="TextureUnit"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="CoordI" len="1">const <ptype>GLint</ptype> *<name>v</name></param>
>+            <alias name="glMultiTexCoord1iv"/>
>+            <glx type="render" opcode="200"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glMultiTexCoord1s</name></proto>
>+            <param group="TextureUnit"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="CoordS"><ptype>GLshort</ptype> <name>s</name></param>
>+            <vecequiv name="glMultiTexCoord1sv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glMultiTexCoord1sARB</name></proto>
>+            <param group="TextureUnit"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="CoordS"><ptype>GLshort</ptype> <name>s</name></param>
>+            <vecequiv name="glMultiTexCoord1sv"/>
>+            <alias name="glMultiTexCoord1s"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glMultiTexCoord1sv</name></proto>
>+            <param group="TextureUnit"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="CoordS" len="1">const <ptype>GLshort</ptype> *<name>v</name></param>
>+            <glx type="render" opcode="201"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glMultiTexCoord1svARB</name></proto>
>+            <param group="TextureUnit"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="CoordS" len="1">const <ptype>GLshort</ptype> *<name>v</name></param>
>+            <alias name="glMultiTexCoord1sv"/>
>+            <glx type="render" opcode="201"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glMultiTexCoord1xOES</name></proto>
>+            <param group="TextureUnit"><ptype>GLenum</ptype> <name>texture</name></param>
>+            <param><ptype>GLfixed</ptype> <name>s</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glMultiTexCoord1xvOES</name></proto>
>+            <param group="TextureUnit"><ptype>GLenum</ptype> <name>texture</name></param>
>+            <param len="1">const <ptype>GLfixed</ptype> *<name>coords</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glMultiTexCoord2bOES</name></proto>
>+            <param group="TextureUnit"><ptype>GLenum</ptype> <name>texture</name></param>
>+            <param><ptype>GLbyte</ptype> <name>s</name></param>
>+            <param><ptype>GLbyte</ptype> <name>t</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glMultiTexCoord2bvOES</name></proto>
>+            <param group="TextureUnit"><ptype>GLenum</ptype> <name>texture</name></param>
>+            <param len="2">const <ptype>GLbyte</ptype> *<name>coords</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glMultiTexCoord2d</name></proto>
>+            <param group="TextureUnit"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="CoordD"><ptype>GLdouble</ptype> <name>s</name></param>
>+            <param group="CoordD"><ptype>GLdouble</ptype> <name>t</name></param>
>+            <vecequiv name="glMultiTexCoord2dv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glMultiTexCoord2dARB</name></proto>
>+            <param group="TextureUnit"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="CoordD"><ptype>GLdouble</ptype> <name>s</name></param>
>+            <param group="CoordD"><ptype>GLdouble</ptype> <name>t</name></param>
>+            <vecequiv name="glMultiTexCoord2dv"/>
>+            <alias name="glMultiTexCoord2d"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glMultiTexCoord2dv</name></proto>
>+            <param group="TextureUnit"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="CoordD" len="2">const <ptype>GLdouble</ptype> *<name>v</name></param>
>+            <glx type="render" opcode="202"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glMultiTexCoord2dvARB</name></proto>
>+            <param group="TextureUnit"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="CoordD" len="2">const <ptype>GLdouble</ptype> *<name>v</name></param>
>+            <alias name="glMultiTexCoord2dv"/>
>+            <glx type="render" opcode="202"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glMultiTexCoord2f</name></proto>
>+            <param group="TextureUnit"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="CoordF"><ptype>GLfloat</ptype> <name>s</name></param>
>+            <param group="CoordF"><ptype>GLfloat</ptype> <name>t</name></param>
>+            <vecequiv name="glMultiTexCoord2fv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glMultiTexCoord2fARB</name></proto>
>+            <param group="TextureUnit"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="CoordF"><ptype>GLfloat</ptype> <name>s</name></param>
>+            <param group="CoordF"><ptype>GLfloat</ptype> <name>t</name></param>
>+            <vecequiv name="glMultiTexCoord2fv"/>
>+            <alias name="glMultiTexCoord2f"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glMultiTexCoord2fv</name></proto>
>+            <param group="TextureUnit"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="CoordF" len="2">const <ptype>GLfloat</ptype> *<name>v</name></param>
>+            <glx type="render" opcode="203"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glMultiTexCoord2fvARB</name></proto>
>+            <param group="TextureUnit"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="CoordF" len="2">const <ptype>GLfloat</ptype> *<name>v</name></param>
>+            <alias name="glMultiTexCoord2fv"/>
>+            <glx type="render" opcode="203"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glMultiTexCoord2hNV</name></proto>
>+            <param group="TextureUnit"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="Half16NV"><ptype>GLhalfNV</ptype> <name>s</name></param>
>+            <param group="Half16NV"><ptype>GLhalfNV</ptype> <name>t</name></param>
>+            <vecequiv name="glMultiTexCoord2hvNV"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glMultiTexCoord2hvNV</name></proto>
>+            <param group="TextureUnit"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="Half16NV" len="2">const <ptype>GLhalfNV</ptype> *<name>v</name></param>
>+            <glx type="render" opcode="4251"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glMultiTexCoord2i</name></proto>
>+            <param group="TextureUnit"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="CoordI"><ptype>GLint</ptype> <name>s</name></param>
>+            <param group="CoordI"><ptype>GLint</ptype> <name>t</name></param>
>+            <vecequiv name="glMultiTexCoord2iv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glMultiTexCoord2iARB</name></proto>
>+            <param group="TextureUnit"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="CoordI"><ptype>GLint</ptype> <name>s</name></param>
>+            <param group="CoordI"><ptype>GLint</ptype> <name>t</name></param>
>+            <vecequiv name="glMultiTexCoord2iv"/>
>+            <alias name="glMultiTexCoord2i"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glMultiTexCoord2iv</name></proto>
>+            <param group="TextureUnit"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="CoordI" len="2">const <ptype>GLint</ptype> *<name>v</name></param>
>+            <glx type="render" opcode="204"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glMultiTexCoord2ivARB</name></proto>
>+            <param group="TextureUnit"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="CoordI" len="2">const <ptype>GLint</ptype> *<name>v</name></param>
>+            <alias name="glMultiTexCoord2iv"/>
>+            <glx type="render" opcode="204"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glMultiTexCoord2s</name></proto>
>+            <param group="TextureUnit"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="CoordS"><ptype>GLshort</ptype> <name>s</name></param>
>+            <param group="CoordS"><ptype>GLshort</ptype> <name>t</name></param>
>+            <vecequiv name="glMultiTexCoord2sv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glMultiTexCoord2sARB</name></proto>
>+            <param group="TextureUnit"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="CoordS"><ptype>GLshort</ptype> <name>s</name></param>
>+            <param group="CoordS"><ptype>GLshort</ptype> <name>t</name></param>
>+            <vecequiv name="glMultiTexCoord2sv"/>
>+            <alias name="glMultiTexCoord2s"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glMultiTexCoord2sv</name></proto>
>+            <param group="TextureUnit"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="CoordS" len="2">const <ptype>GLshort</ptype> *<name>v</name></param>
>+            <glx type="render" opcode="205"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glMultiTexCoord2svARB</name></proto>
>+            <param group="TextureUnit"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="CoordS" len="2">const <ptype>GLshort</ptype> *<name>v</name></param>
>+            <alias name="glMultiTexCoord2sv"/>
>+            <glx type="render" opcode="205"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glMultiTexCoord2xOES</name></proto>
>+            <param group="TextureUnit"><ptype>GLenum</ptype> <name>texture</name></param>
>+            <param><ptype>GLfixed</ptype> <name>s</name></param>
>+            <param><ptype>GLfixed</ptype> <name>t</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glMultiTexCoord2xvOES</name></proto>
>+            <param group="TextureUnit"><ptype>GLenum</ptype> <name>texture</name></param>
>+            <param len="2">const <ptype>GLfixed</ptype> *<name>coords</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glMultiTexCoord3bOES</name></proto>
>+            <param group="TextureUnit"><ptype>GLenum</ptype> <name>texture</name></param>
>+            <param><ptype>GLbyte</ptype> <name>s</name></param>
>+            <param><ptype>GLbyte</ptype> <name>t</name></param>
>+            <param><ptype>GLbyte</ptype> <name>r</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glMultiTexCoord3bvOES</name></proto>
>+            <param group="TextureUnit"><ptype>GLenum</ptype> <name>texture</name></param>
>+            <param len="3">const <ptype>GLbyte</ptype> *<name>coords</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glMultiTexCoord3d</name></proto>
>+            <param group="TextureUnit"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="CoordD"><ptype>GLdouble</ptype> <name>s</name></param>
>+            <param group="CoordD"><ptype>GLdouble</ptype> <name>t</name></param>
>+            <param group="CoordD"><ptype>GLdouble</ptype> <name>r</name></param>
>+            <vecequiv name="glMultiTexCoord3dv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glMultiTexCoord3dARB</name></proto>
>+            <param group="TextureUnit"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="CoordD"><ptype>GLdouble</ptype> <name>s</name></param>
>+            <param group="CoordD"><ptype>GLdouble</ptype> <name>t</name></param>
>+            <param group="CoordD"><ptype>GLdouble</ptype> <name>r</name></param>
>+            <vecequiv name="glMultiTexCoord3dv"/>
>+            <alias name="glMultiTexCoord3d"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glMultiTexCoord3dv</name></proto>
>+            <param group="TextureUnit"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="CoordD" len="3">const <ptype>GLdouble</ptype> *<name>v</name></param>
>+            <glx type="render" opcode="206"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glMultiTexCoord3dvARB</name></proto>
>+            <param group="TextureUnit"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="CoordD" len="3">const <ptype>GLdouble</ptype> *<name>v</name></param>
>+            <alias name="glMultiTexCoord3dv"/>
>+            <glx type="render" opcode="206"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glMultiTexCoord3f</name></proto>
>+            <param group="TextureUnit"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="CoordF"><ptype>GLfloat</ptype> <name>s</name></param>
>+            <param group="CoordF"><ptype>GLfloat</ptype> <name>t</name></param>
>+            <param group="CoordF"><ptype>GLfloat</ptype> <name>r</name></param>
>+            <vecequiv name="glMultiTexCoord3fv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glMultiTexCoord3fARB</name></proto>
>+            <param group="TextureUnit"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="CoordF"><ptype>GLfloat</ptype> <name>s</name></param>
>+            <param group="CoordF"><ptype>GLfloat</ptype> <name>t</name></param>
>+            <param group="CoordF"><ptype>GLfloat</ptype> <name>r</name></param>
>+            <vecequiv name="glMultiTexCoord3fv"/>
>+            <alias name="glMultiTexCoord3f"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glMultiTexCoord3fv</name></proto>
>+            <param group="TextureUnit"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="CoordF" len="3">const <ptype>GLfloat</ptype> *<name>v</name></param>
>+            <glx type="render" opcode="207"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glMultiTexCoord3fvARB</name></proto>
>+            <param group="TextureUnit"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="CoordF" len="3">const <ptype>GLfloat</ptype> *<name>v</name></param>
>+            <alias name="glMultiTexCoord3fv"/>
>+            <glx type="render" opcode="207"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glMultiTexCoord3hNV</name></proto>
>+            <param group="TextureUnit"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="Half16NV"><ptype>GLhalfNV</ptype> <name>s</name></param>
>+            <param group="Half16NV"><ptype>GLhalfNV</ptype> <name>t</name></param>
>+            <param group="Half16NV"><ptype>GLhalfNV</ptype> <name>r</name></param>
>+            <vecequiv name="glMultiTexCoord3hvNV"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glMultiTexCoord3hvNV</name></proto>
>+            <param group="TextureUnit"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="Half16NV" len="3">const <ptype>GLhalfNV</ptype> *<name>v</name></param>
>+            <glx type="render" opcode="4252"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glMultiTexCoord3i</name></proto>
>+            <param group="TextureUnit"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="CoordI"><ptype>GLint</ptype> <name>s</name></param>
>+            <param group="CoordI"><ptype>GLint</ptype> <name>t</name></param>
>+            <param group="CoordI"><ptype>GLint</ptype> <name>r</name></param>
>+            <vecequiv name="glMultiTexCoord3iv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glMultiTexCoord3iARB</name></proto>
>+            <param group="TextureUnit"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="CoordI"><ptype>GLint</ptype> <name>s</name></param>
>+            <param group="CoordI"><ptype>GLint</ptype> <name>t</name></param>
>+            <param group="CoordI"><ptype>GLint</ptype> <name>r</name></param>
>+            <vecequiv name="glMultiTexCoord3iv"/>
>+            <alias name="glMultiTexCoord3i"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glMultiTexCoord3iv</name></proto>
>+            <param group="TextureUnit"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="CoordI" len="3">const <ptype>GLint</ptype> *<name>v</name></param>
>+            <glx type="render" opcode="208"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glMultiTexCoord3ivARB</name></proto>
>+            <param group="TextureUnit"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="CoordI" len="3">const <ptype>GLint</ptype> *<name>v</name></param>
>+            <alias name="glMultiTexCoord3iv"/>
>+            <glx type="render" opcode="208"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glMultiTexCoord3s</name></proto>
>+            <param group="TextureUnit"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="CoordS"><ptype>GLshort</ptype> <name>s</name></param>
>+            <param group="CoordS"><ptype>GLshort</ptype> <name>t</name></param>
>+            <param group="CoordS"><ptype>GLshort</ptype> <name>r</name></param>
>+            <vecequiv name="glMultiTexCoord3sv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glMultiTexCoord3sARB</name></proto>
>+            <param group="TextureUnit"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="CoordS"><ptype>GLshort</ptype> <name>s</name></param>
>+            <param group="CoordS"><ptype>GLshort</ptype> <name>t</name></param>
>+            <param group="CoordS"><ptype>GLshort</ptype> <name>r</name></param>
>+            <vecequiv name="glMultiTexCoord3sv"/>
>+            <alias name="glMultiTexCoord3s"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glMultiTexCoord3sv</name></proto>
>+            <param group="TextureUnit"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="CoordS" len="3">const <ptype>GLshort</ptype> *<name>v</name></param>
>+            <glx type="render" opcode="209"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glMultiTexCoord3svARB</name></proto>
>+            <param group="TextureUnit"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="CoordS" len="3">const <ptype>GLshort</ptype> *<name>v</name></param>
>+            <alias name="glMultiTexCoord3sv"/>
>+            <glx type="render" opcode="209"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glMultiTexCoord3xOES</name></proto>
>+            <param group="TextureUnit"><ptype>GLenum</ptype> <name>texture</name></param>
>+            <param><ptype>GLfixed</ptype> <name>s</name></param>
>+            <param><ptype>GLfixed</ptype> <name>t</name></param>
>+            <param><ptype>GLfixed</ptype> <name>r</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glMultiTexCoord3xvOES</name></proto>
>+            <param group="TextureUnit"><ptype>GLenum</ptype> <name>texture</name></param>
>+            <param len="3">const <ptype>GLfixed</ptype> *<name>coords</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glMultiTexCoord4bOES</name></proto>
>+            <param group="TextureUnit"><ptype>GLenum</ptype> <name>texture</name></param>
>+            <param><ptype>GLbyte</ptype> <name>s</name></param>
>+            <param><ptype>GLbyte</ptype> <name>t</name></param>
>+            <param><ptype>GLbyte</ptype> <name>r</name></param>
>+            <param><ptype>GLbyte</ptype> <name>q</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glMultiTexCoord4bvOES</name></proto>
>+            <param group="TextureUnit"><ptype>GLenum</ptype> <name>texture</name></param>
>+            <param len="4">const <ptype>GLbyte</ptype> *<name>coords</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glMultiTexCoord4d</name></proto>
>+            <param group="TextureUnit"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="CoordD"><ptype>GLdouble</ptype> <name>s</name></param>
>+            <param group="CoordD"><ptype>GLdouble</ptype> <name>t</name></param>
>+            <param group="CoordD"><ptype>GLdouble</ptype> <name>r</name></param>
>+            <param group="CoordD"><ptype>GLdouble</ptype> <name>q</name></param>
>+            <vecequiv name="glMultiTexCoord4dv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glMultiTexCoord4dARB</name></proto>
>+            <param group="TextureUnit"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="CoordD"><ptype>GLdouble</ptype> <name>s</name></param>
>+            <param group="CoordD"><ptype>GLdouble</ptype> <name>t</name></param>
>+            <param group="CoordD"><ptype>GLdouble</ptype> <name>r</name></param>
>+            <param group="CoordD"><ptype>GLdouble</ptype> <name>q</name></param>
>+            <vecequiv name="glMultiTexCoord4dv"/>
>+            <alias name="glMultiTexCoord4d"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glMultiTexCoord4dv</name></proto>
>+            <param group="TextureUnit"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="CoordD" len="4">const <ptype>GLdouble</ptype> *<name>v</name></param>
>+            <glx type="render" opcode="210"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glMultiTexCoord4dvARB</name></proto>
>+            <param group="TextureUnit"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="CoordD" len="4">const <ptype>GLdouble</ptype> *<name>v</name></param>
>+            <alias name="glMultiTexCoord4dv"/>
>+            <glx type="render" opcode="210"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glMultiTexCoord4f</name></proto>
>+            <param group="TextureUnit"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="CoordF"><ptype>GLfloat</ptype> <name>s</name></param>
>+            <param group="CoordF"><ptype>GLfloat</ptype> <name>t</name></param>
>+            <param group="CoordF"><ptype>GLfloat</ptype> <name>r</name></param>
>+            <param group="CoordF"><ptype>GLfloat</ptype> <name>q</name></param>
>+            <vecequiv name="glMultiTexCoord4fv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glMultiTexCoord4fARB</name></proto>
>+            <param group="TextureUnit"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="CoordF"><ptype>GLfloat</ptype> <name>s</name></param>
>+            <param group="CoordF"><ptype>GLfloat</ptype> <name>t</name></param>
>+            <param group="CoordF"><ptype>GLfloat</ptype> <name>r</name></param>
>+            <param group="CoordF"><ptype>GLfloat</ptype> <name>q</name></param>
>+            <vecequiv name="glMultiTexCoord4fv"/>
>+            <alias name="glMultiTexCoord4f"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glMultiTexCoord4fv</name></proto>
>+            <param group="TextureUnit"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="CoordF" len="4">const <ptype>GLfloat</ptype> *<name>v</name></param>
>+            <glx type="render" opcode="211"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glMultiTexCoord4fvARB</name></proto>
>+            <param group="TextureUnit"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="CoordF" len="4">const <ptype>GLfloat</ptype> *<name>v</name></param>
>+            <alias name="glMultiTexCoord4fv"/>
>+            <glx type="render" opcode="211"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glMultiTexCoord4hNV</name></proto>
>+            <param group="TextureUnit"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="Half16NV"><ptype>GLhalfNV</ptype> <name>s</name></param>
>+            <param group="Half16NV"><ptype>GLhalfNV</ptype> <name>t</name></param>
>+            <param group="Half16NV"><ptype>GLhalfNV</ptype> <name>r</name></param>
>+            <param group="Half16NV"><ptype>GLhalfNV</ptype> <name>q</name></param>
>+            <vecequiv name="glMultiTexCoord4hvNV"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glMultiTexCoord4hvNV</name></proto>
>+            <param group="TextureUnit"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="Half16NV" len="4">const <ptype>GLhalfNV</ptype> *<name>v</name></param>
>+            <glx type="render" opcode="4253"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glMultiTexCoord4i</name></proto>
>+            <param group="TextureUnit"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="CoordI"><ptype>GLint</ptype> <name>s</name></param>
>+            <param group="CoordI"><ptype>GLint</ptype> <name>t</name></param>
>+            <param group="CoordI"><ptype>GLint</ptype> <name>r</name></param>
>+            <param group="CoordI"><ptype>GLint</ptype> <name>q</name></param>
>+            <vecequiv name="glMultiTexCoord4iv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glMultiTexCoord4iARB</name></proto>
>+            <param group="TextureUnit"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="CoordI"><ptype>GLint</ptype> <name>s</name></param>
>+            <param group="CoordI"><ptype>GLint</ptype> <name>t</name></param>
>+            <param group="CoordI"><ptype>GLint</ptype> <name>r</name></param>
>+            <param group="CoordI"><ptype>GLint</ptype> <name>q</name></param>
>+            <vecequiv name="glMultiTexCoord4iv"/>
>+            <alias name="glMultiTexCoord4i"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glMultiTexCoord4iv</name></proto>
>+            <param group="TextureUnit"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="CoordI" len="4">const <ptype>GLint</ptype> *<name>v</name></param>
>+            <glx type="render" opcode="212"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glMultiTexCoord4ivARB</name></proto>
>+            <param group="TextureUnit"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="CoordI" len="4">const <ptype>GLint</ptype> *<name>v</name></param>
>+            <alias name="glMultiTexCoord4iv"/>
>+            <glx type="render" opcode="212"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glMultiTexCoord4s</name></proto>
>+            <param group="TextureUnit"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="CoordS"><ptype>GLshort</ptype> <name>s</name></param>
>+            <param group="CoordS"><ptype>GLshort</ptype> <name>t</name></param>
>+            <param group="CoordS"><ptype>GLshort</ptype> <name>r</name></param>
>+            <param group="CoordS"><ptype>GLshort</ptype> <name>q</name></param>
>+            <vecequiv name="glMultiTexCoord4sv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glMultiTexCoord4sARB</name></proto>
>+            <param group="TextureUnit"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="CoordS"><ptype>GLshort</ptype> <name>s</name></param>
>+            <param group="CoordS"><ptype>GLshort</ptype> <name>t</name></param>
>+            <param group="CoordS"><ptype>GLshort</ptype> <name>r</name></param>
>+            <param group="CoordS"><ptype>GLshort</ptype> <name>q</name></param>
>+            <vecequiv name="glMultiTexCoord4sv"/>
>+            <alias name="glMultiTexCoord4s"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glMultiTexCoord4sv</name></proto>
>+            <param group="TextureUnit"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="CoordS" len="4">const <ptype>GLshort</ptype> *<name>v</name></param>
>+            <glx type="render" opcode="213"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glMultiTexCoord4svARB</name></proto>
>+            <param group="TextureUnit"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="CoordS" len="4">const <ptype>GLshort</ptype> *<name>v</name></param>
>+            <alias name="glMultiTexCoord4sv"/>
>+            <glx type="render" opcode="213"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glMultiTexCoord4x</name></proto>
>+            <param group="TextureUnit"><ptype>GLenum</ptype> <name>texture</name></param>
>+            <param><ptype>GLfixed</ptype> <name>s</name></param>
>+            <param><ptype>GLfixed</ptype> <name>t</name></param>
>+            <param><ptype>GLfixed</ptype> <name>r</name></param>
>+            <param><ptype>GLfixed</ptype> <name>q</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glMultiTexCoord4xOES</name></proto>
>+            <param group="TextureUnit"><ptype>GLenum</ptype> <name>texture</name></param>
>+            <param><ptype>GLfixed</ptype> <name>s</name></param>
>+            <param><ptype>GLfixed</ptype> <name>t</name></param>
>+            <param><ptype>GLfixed</ptype> <name>r</name></param>
>+            <param><ptype>GLfixed</ptype> <name>q</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glMultiTexCoord4xvOES</name></proto>
>+            <param group="TextureUnit"><ptype>GLenum</ptype> <name>texture</name></param>
>+            <param len="4">const <ptype>GLfixed</ptype> *<name>coords</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glMultiTexCoordP1ui</name></proto>
>+            <param group="TextureUnit"><ptype>GLenum</ptype> <name>texture</name></param>
>+            <param group="TexCoordPointerType"><ptype>GLenum</ptype> <name>type</name></param>
>+            <param><ptype>GLuint</ptype> <name>coords</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glMultiTexCoordP1uiv</name></proto>
>+            <param group="TextureUnit"><ptype>GLenum</ptype> <name>texture</name></param>
>+            <param group="TexCoordPointerType"><ptype>GLenum</ptype> <name>type</name></param>
>+            <param len="1">const <ptype>GLuint</ptype> *<name>coords</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glMultiTexCoordP2ui</name></proto>
>+            <param group="TextureUnit"><ptype>GLenum</ptype> <name>texture</name></param>
>+            <param group="TexCoordPointerType"><ptype>GLenum</ptype> <name>type</name></param>
>+            <param><ptype>GLuint</ptype> <name>coords</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glMultiTexCoordP2uiv</name></proto>
>+            <param group="TextureUnit"><ptype>GLenum</ptype> <name>texture</name></param>
>+            <param group="TexCoordPointerType"><ptype>GLenum</ptype> <name>type</name></param>
>+            <param len="1">const <ptype>GLuint</ptype> *<name>coords</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glMultiTexCoordP3ui</name></proto>
>+            <param group="TextureUnit"><ptype>GLenum</ptype> <name>texture</name></param>
>+            <param group="TexCoordPointerType"><ptype>GLenum</ptype> <name>type</name></param>
>+            <param><ptype>GLuint</ptype> <name>coords</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glMultiTexCoordP3uiv</name></proto>
>+            <param group="TextureUnit"><ptype>GLenum</ptype> <name>texture</name></param>
>+            <param group="TexCoordPointerType"><ptype>GLenum</ptype> <name>type</name></param>
>+            <param len="1">const <ptype>GLuint</ptype> *<name>coords</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glMultiTexCoordP4ui</name></proto>
>+            <param group="TextureUnit"><ptype>GLenum</ptype> <name>texture</name></param>
>+            <param group="TexCoordPointerType"><ptype>GLenum</ptype> <name>type</name></param>
>+            <param><ptype>GLuint</ptype> <name>coords</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glMultiTexCoordP4uiv</name></proto>
>+            <param group="TextureUnit"><ptype>GLenum</ptype> <name>texture</name></param>
>+            <param group="TexCoordPointerType"><ptype>GLenum</ptype> <name>type</name></param>
>+            <param len="1">const <ptype>GLuint</ptype> *<name>coords</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glMultiTexCoordPointerEXT</name></proto>
>+            <param group="TextureUnit"><ptype>GLenum</ptype> <name>texunit</name></param>
>+            <param><ptype>GLint</ptype> <name>size</name></param>
>+            <param group="TexCoordPointerType"><ptype>GLenum</ptype> <name>type</name></param>
>+            <param><ptype>GLsizei</ptype> <name>stride</name></param>
>+            <param len="COMPSIZE(size,type,stride)">const void *<name>pointer</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glMultiTexEnvfEXT</name></proto>
>+            <param group="TextureUnit"><ptype>GLenum</ptype> <name>texunit</name></param>
>+            <param group="TextureEnvTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="TextureEnvParameter"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param group="CheckedFloat32"><ptype>GLfloat</ptype> <name>param</name></param>
>+            <vecequiv name="glMultiTexEnvfvEXT"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glMultiTexEnvfvEXT</name></proto>
>+            <param group="TextureUnit"><ptype>GLenum</ptype> <name>texunit</name></param>
>+            <param group="TextureEnvTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="TextureEnvParameter"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param group="CheckedFloat32" len="COMPSIZE(pname)">const <ptype>GLfloat</ptype> *<name>params</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glMultiTexEnviEXT</name></proto>
>+            <param group="TextureUnit"><ptype>GLenum</ptype> <name>texunit</name></param>
>+            <param group="TextureEnvTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="TextureEnvParameter"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>param</name></param>
>+            <vecequiv name="glMultiTexEnvivEXT"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glMultiTexEnvivEXT</name></proto>
>+            <param group="TextureUnit"><ptype>GLenum</ptype> <name>texunit</name></param>
>+            <param group="TextureEnvTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="TextureEnvParameter"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param group="CheckedInt32" len="COMPSIZE(pname)">const <ptype>GLint</ptype> *<name>params</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glMultiTexGendEXT</name></proto>
>+            <param group="TextureUnit"><ptype>GLenum</ptype> <name>texunit</name></param>
>+            <param group="TextureCoordName"><ptype>GLenum</ptype> <name>coord</name></param>
>+            <param group="TextureGenParameter"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param><ptype>GLdouble</ptype> <name>param</name></param>
>+            <vecequiv name="glMultiTexGendvEXT"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glMultiTexGendvEXT</name></proto>
>+            <param group="TextureUnit"><ptype>GLenum</ptype> <name>texunit</name></param>
>+            <param group="TextureCoordName"><ptype>GLenum</ptype> <name>coord</name></param>
>+            <param group="TextureGenParameter"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="COMPSIZE(pname)">const <ptype>GLdouble</ptype> *<name>params</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glMultiTexGenfEXT</name></proto>
>+            <param group="TextureUnit"><ptype>GLenum</ptype> <name>texunit</name></param>
>+            <param group="TextureCoordName"><ptype>GLenum</ptype> <name>coord</name></param>
>+            <param group="TextureGenParameter"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param group="CheckedFloat32"><ptype>GLfloat</ptype> <name>param</name></param>
>+            <vecequiv name="glMultiTexGenfvEXT"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glMultiTexGenfvEXT</name></proto>
>+            <param group="TextureUnit"><ptype>GLenum</ptype> <name>texunit</name></param>
>+            <param group="TextureCoordName"><ptype>GLenum</ptype> <name>coord</name></param>
>+            <param group="TextureGenParameter"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param group="CheckedFloat32" len="COMPSIZE(pname)">const <ptype>GLfloat</ptype> *<name>params</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glMultiTexGeniEXT</name></proto>
>+            <param group="TextureUnit"><ptype>GLenum</ptype> <name>texunit</name></param>
>+            <param group="TextureCoordName"><ptype>GLenum</ptype> <name>coord</name></param>
>+            <param group="TextureGenParameter"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>param</name></param>
>+            <vecequiv name="glMultiTexGenivEXT"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glMultiTexGenivEXT</name></proto>
>+            <param group="TextureUnit"><ptype>GLenum</ptype> <name>texunit</name></param>
>+            <param group="TextureCoordName"><ptype>GLenum</ptype> <name>coord</name></param>
>+            <param group="TextureGenParameter"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param group="CheckedInt32" len="COMPSIZE(pname)">const <ptype>GLint</ptype> *<name>params</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glMultiTexImage1DEXT</name></proto>
>+            <param group="TextureUnit"><ptype>GLenum</ptype> <name>texunit</name></param>
>+            <param group="TextureTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>level</name></param>
>+            <param group="InternalFormat"><ptype>GLint</ptype> <name>internalformat</name></param>
>+            <param><ptype>GLsizei</ptype> <name>width</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>border</name></param>
>+            <param group="PixelFormat"><ptype>GLenum</ptype> <name>format</name></param>
>+            <param group="PixelType"><ptype>GLenum</ptype> <name>type</name></param>
>+            <param len="COMPSIZE(format,type,width)">const void *<name>pixels</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glMultiTexImage2DEXT</name></proto>
>+            <param group="TextureUnit"><ptype>GLenum</ptype> <name>texunit</name></param>
>+            <param group="TextureTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>level</name></param>
>+            <param group="InternalFormat"><ptype>GLint</ptype> <name>internalformat</name></param>
>+            <param><ptype>GLsizei</ptype> <name>width</name></param>
>+            <param><ptype>GLsizei</ptype> <name>height</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>border</name></param>
>+            <param group="PixelFormat"><ptype>GLenum</ptype> <name>format</name></param>
>+            <param group="PixelType"><ptype>GLenum</ptype> <name>type</name></param>
>+            <param len="COMPSIZE(format,type,width,height)">const void *<name>pixels</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glMultiTexImage3DEXT</name></proto>
>+            <param group="TextureUnit"><ptype>GLenum</ptype> <name>texunit</name></param>
>+            <param group="TextureTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>level</name></param>
>+            <param group="InternalFormat"><ptype>GLint</ptype> <name>internalformat</name></param>
>+            <param><ptype>GLsizei</ptype> <name>width</name></param>
>+            <param><ptype>GLsizei</ptype> <name>height</name></param>
>+            <param><ptype>GLsizei</ptype> <name>depth</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>border</name></param>
>+            <param group="PixelFormat"><ptype>GLenum</ptype> <name>format</name></param>
>+            <param group="PixelType"><ptype>GLenum</ptype> <name>type</name></param>
>+            <param len="COMPSIZE(format,type,width,height,depth)">const void *<name>pixels</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glMultiTexParameterIivEXT</name></proto>
>+            <param group="TextureUnit"><ptype>GLenum</ptype> <name>texunit</name></param>
>+            <param group="TextureTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="TextureParameterName"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param group="CheckedInt32" len="COMPSIZE(pname)">const <ptype>GLint</ptype> *<name>params</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glMultiTexParameterIuivEXT</name></proto>
>+            <param group="TextureUnit"><ptype>GLenum</ptype> <name>texunit</name></param>
>+            <param group="TextureTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="TextureParameterName"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="COMPSIZE(pname)">const <ptype>GLuint</ptype> *<name>params</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glMultiTexParameterfEXT</name></proto>
>+            <param group="TextureUnit"><ptype>GLenum</ptype> <name>texunit</name></param>
>+            <param group="TextureTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="TextureParameterName"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param group="CheckedFloat32"><ptype>GLfloat</ptype> <name>param</name></param>
>+            <vecequiv name="glMultiTexParameterfvEXT"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glMultiTexParameterfvEXT</name></proto>
>+            <param group="TextureUnit"><ptype>GLenum</ptype> <name>texunit</name></param>
>+            <param group="TextureTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="TextureParameterName"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param group="CheckedFloat32" len="COMPSIZE(pname)">const <ptype>GLfloat</ptype> *<name>params</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glMultiTexParameteriEXT</name></proto>
>+            <param group="TextureUnit"><ptype>GLenum</ptype> <name>texunit</name></param>
>+            <param group="TextureTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="TextureParameterName"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>param</name></param>
>+            <vecequiv name="glMultiTexParameterivEXT"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glMultiTexParameterivEXT</name></proto>
>+            <param group="TextureUnit"><ptype>GLenum</ptype> <name>texunit</name></param>
>+            <param group="TextureTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="TextureParameterName"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param group="CheckedInt32" len="COMPSIZE(pname)">const <ptype>GLint</ptype> *<name>params</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glMultiTexRenderbufferEXT</name></proto>
>+            <param group="TextureUnit"><ptype>GLenum</ptype> <name>texunit</name></param>
>+            <param group="TextureTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param><ptype>GLuint</ptype> <name>renderbuffer</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glMultiTexSubImage1DEXT</name></proto>
>+            <param group="TextureUnit"><ptype>GLenum</ptype> <name>texunit</name></param>
>+            <param group="TextureTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>level</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>xoffset</name></param>
>+            <param><ptype>GLsizei</ptype> <name>width</name></param>
>+            <param group="PixelFormat"><ptype>GLenum</ptype> <name>format</name></param>
>+            <param group="PixelType"><ptype>GLenum</ptype> <name>type</name></param>
>+            <param len="COMPSIZE(format,type,width)">const void *<name>pixels</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glMultiTexSubImage2DEXT</name></proto>
>+            <param group="TextureUnit"><ptype>GLenum</ptype> <name>texunit</name></param>
>+            <param group="TextureTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>level</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>xoffset</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>yoffset</name></param>
>+            <param><ptype>GLsizei</ptype> <name>width</name></param>
>+            <param><ptype>GLsizei</ptype> <name>height</name></param>
>+            <param group="PixelFormat"><ptype>GLenum</ptype> <name>format</name></param>
>+            <param group="PixelType"><ptype>GLenum</ptype> <name>type</name></param>
>+            <param len="COMPSIZE(format,type,width,height)">const void *<name>pixels</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glMultiTexSubImage3DEXT</name></proto>
>+            <param group="TextureUnit"><ptype>GLenum</ptype> <name>texunit</name></param>
>+            <param group="TextureTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>level</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>xoffset</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>yoffset</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>zoffset</name></param>
>+            <param><ptype>GLsizei</ptype> <name>width</name></param>
>+            <param><ptype>GLsizei</ptype> <name>height</name></param>
>+            <param><ptype>GLsizei</ptype> <name>depth</name></param>
>+            <param group="PixelFormat"><ptype>GLenum</ptype> <name>format</name></param>
>+            <param group="PixelType"><ptype>GLenum</ptype> <name>type</name></param>
>+            <param len="COMPSIZE(format,type,width,height,depth)">const void *<name>pixels</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glMulticastBarrierNV</name></proto>
>+        </command>
>+        <command>
>+            <proto>void <name>glMulticastBlitFramebufferNV</name></proto>
>+            <param><ptype>GLuint</ptype> <name>srcGpu</name></param>
>+            <param><ptype>GLuint</ptype> <name>dstGpu</name></param>
>+            <param><ptype>GLint</ptype> <name>srcX0</name></param>
>+            <param><ptype>GLint</ptype> <name>srcY0</name></param>
>+            <param><ptype>GLint</ptype> <name>srcX1</name></param>
>+            <param><ptype>GLint</ptype> <name>srcY1</name></param>
>+            <param><ptype>GLint</ptype> <name>dstX0</name></param>
>+            <param><ptype>GLint</ptype> <name>dstY0</name></param>
>+            <param><ptype>GLint</ptype> <name>dstX1</name></param>
>+            <param><ptype>GLint</ptype> <name>dstY1</name></param>
>+            <param group="ClearBufferMask"><ptype>GLbitfield</ptype> <name>mask</name></param>
>+            <param><ptype>GLenum</ptype> <name>filter</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glMulticastBufferSubDataNV</name></proto>
>+            <param><ptype>GLbitfield</ptype> <name>gpuMask</name></param>
>+            <param><ptype>GLuint</ptype> <name>buffer</name></param>
>+            <param><ptype>GLintptr</ptype> <name>offset</name></param>
>+            <param><ptype>GLsizeiptr</ptype> <name>size</name></param>
>+            <param>const void *<name>data</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glMulticastCopyBufferSubDataNV</name></proto>
>+            <param><ptype>GLuint</ptype> <name>readGpu</name></param>
>+            <param><ptype>GLbitfield</ptype> <name>writeGpuMask</name></param>
>+            <param><ptype>GLuint</ptype> <name>readBuffer</name></param>
>+            <param><ptype>GLuint</ptype> <name>writeBuffer</name></param>
>+            <param><ptype>GLintptr</ptype> <name>readOffset</name></param>
>+            <param><ptype>GLintptr</ptype> <name>writeOffset</name></param>
>+            <param><ptype>GLsizeiptr</ptype> <name>size</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glMulticastCopyImageSubDataNV</name></proto>
>+            <param><ptype>GLuint</ptype> <name>srcGpu</name></param>
>+            <param><ptype>GLbitfield</ptype> <name>dstGpuMask</name></param>
>+            <param><ptype>GLuint</ptype> <name>srcName</name></param>
>+            <param><ptype>GLenum</ptype> <name>srcTarget</name></param>
>+            <param><ptype>GLint</ptype> <name>srcLevel</name></param>
>+            <param><ptype>GLint</ptype> <name>srcX</name></param>
>+            <param><ptype>GLint</ptype> <name>srcY</name></param>
>+            <param><ptype>GLint</ptype> <name>srcZ</name></param>
>+            <param><ptype>GLuint</ptype> <name>dstName</name></param>
>+            <param><ptype>GLenum</ptype> <name>dstTarget</name></param>
>+            <param><ptype>GLint</ptype> <name>dstLevel</name></param>
>+            <param><ptype>GLint</ptype> <name>dstX</name></param>
>+            <param><ptype>GLint</ptype> <name>dstY</name></param>
>+            <param><ptype>GLint</ptype> <name>dstZ</name></param>
>+            <param><ptype>GLsizei</ptype> <name>srcWidth</name></param>
>+            <param><ptype>GLsizei</ptype> <name>srcHeight</name></param>
>+            <param><ptype>GLsizei</ptype> <name>srcDepth</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glMulticastFramebufferSampleLocationsfvNV</name></proto>
>+            <param><ptype>GLuint</ptype> <name>gpu</name></param>
>+            <param><ptype>GLuint</ptype> <name>framebuffer</name></param>
>+            <param><ptype>GLuint</ptype> <name>start</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param>const <ptype>GLfloat</ptype> *<name>v</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glMulticastGetQueryObjecti64vNV</name></proto>
>+            <param><ptype>GLuint</ptype> <name>gpu</name></param>
>+            <param><ptype>GLuint</ptype> <name>id</name></param>
>+            <param><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param><ptype>GLint64</ptype> *<name>params</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glMulticastGetQueryObjectivNV</name></proto>
>+            <param><ptype>GLuint</ptype> <name>gpu</name></param>
>+            <param><ptype>GLuint</ptype> <name>id</name></param>
>+            <param><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param><ptype>GLint</ptype> *<name>params</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glMulticastGetQueryObjectui64vNV</name></proto>
>+            <param><ptype>GLuint</ptype> <name>gpu</name></param>
>+            <param><ptype>GLuint</ptype> <name>id</name></param>
>+            <param><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param><ptype>GLuint64</ptype> *<name>params</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glMulticastGetQueryObjectuivNV</name></proto>
>+            <param><ptype>GLuint</ptype> <name>gpu</name></param>
>+            <param><ptype>GLuint</ptype> <name>id</name></param>
>+            <param><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param><ptype>GLuint</ptype> *<name>params</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glMulticastWaitSyncNV</name></proto>
>+            <param><ptype>GLuint</ptype> <name>signalGpu</name></param>
>+            <param><ptype>GLbitfield</ptype> <name>waitGpuMask</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glNamedBufferData</name></proto>
>+            <param><ptype>GLuint</ptype> <name>buffer</name></param>
>+            <param group="BufferSize"><ptype>GLsizeiptr</ptype> <name>size</name></param>
>+            <param>const void *<name>data</name></param>
>+            <param group="VertexBufferObjectUsage"><ptype>GLenum</ptype> <name>usage</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glNamedBufferDataEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>buffer</name></param>
>+            <param><ptype>GLsizeiptr</ptype> <name>size</name></param>
>+            <param len="COMPSIZE(size)">const void *<name>data</name></param>
>+            <param group="VertexBufferObjectUsage"><ptype>GLenum</ptype> <name>usage</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glNamedBufferPageCommitmentARB</name></proto>
>+            <param><ptype>GLuint</ptype> <name>buffer</name></param>
>+            <param><ptype>GLintptr</ptype> <name>offset</name></param>
>+            <param><ptype>GLsizeiptr</ptype> <name>size</name></param>
>+            <param><ptype>GLboolean</ptype> <name>commit</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glNamedBufferPageCommitmentEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>buffer</name></param>
>+            <param><ptype>GLintptr</ptype> <name>offset</name></param>
>+            <param><ptype>GLsizeiptr</ptype> <name>size</name></param>
>+            <param><ptype>GLboolean</ptype> <name>commit</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glNamedBufferStorage</name></proto>
>+            <param><ptype>GLuint</ptype> <name>buffer</name></param>
>+            <param group="BufferSize"><ptype>GLsizeiptr</ptype> <name>size</name></param>
>+            <param len="size">const void *<name>data</name></param>
>+            <param group="MapBufferUsageMask"><ptype>GLbitfield</ptype> <name>flags</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glNamedBufferStorageExternalEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>buffer</name></param>
>+            <param><ptype>GLintptr</ptype> <name>offset</name></param>
>+            <param><ptype>GLsizeiptr</ptype> <name>size</name></param>
>+            <param><ptype>GLeglClientBufferEXT</ptype> <name>clientBuffer</name></param>
>+            <param group="MapBufferUsageMask"><ptype>GLbitfield</ptype> <name>flags</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glNamedBufferStorageEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>buffer</name></param>
>+            <param group="BufferSize"><ptype>GLsizeiptr</ptype> <name>size</name></param>
>+            <param len="size">const void *<name>data</name></param>
>+            <param group="MapBufferUsageMask"><ptype>GLbitfield</ptype> <name>flags</name></param>
>+            <alias name="glNamedBufferStorage"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glNamedBufferStorageMemEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>buffer</name></param>
>+            <param group="BufferSize"><ptype>GLsizeiptr</ptype> <name>size</name></param>
>+            <param><ptype>GLuint</ptype> <name>memory</name></param>
>+            <param><ptype>GLuint64</ptype> <name>offset</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glNamedBufferSubData</name></proto>
>+            <param><ptype>GLuint</ptype> <name>buffer</name></param>
>+            <param><ptype>GLintptr</ptype> <name>offset</name></param>
>+            <param group="BufferSize"><ptype>GLsizeiptr</ptype> <name>size</name></param>
>+            <param len="COMPSIZE(size)">const void *<name>data</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glNamedBufferSubDataEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>buffer</name></param>
>+            <param><ptype>GLintptr</ptype> <name>offset</name></param>
>+            <param group="BufferSize"><ptype>GLsizeiptr</ptype> <name>size</name></param>
>+            <param len="COMPSIZE(size)">const void *<name>data</name></param>
>+            <alias name="glNamedBufferSubData"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glNamedCopyBufferSubDataEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>readBuffer</name></param>
>+            <param><ptype>GLuint</ptype> <name>writeBuffer</name></param>
>+            <param><ptype>GLintptr</ptype> <name>readOffset</name></param>
>+            <param><ptype>GLintptr</ptype> <name>writeOffset</name></param>
>+            <param><ptype>GLsizeiptr</ptype> <name>size</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glNamedFramebufferDrawBuffer</name></proto>
>+            <param><ptype>GLuint</ptype> <name>framebuffer</name></param>
>+            <param group="ColorBuffer"><ptype>GLenum</ptype> <name>buf</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glNamedFramebufferDrawBuffers</name></proto>
>+            <param><ptype>GLuint</ptype> <name>framebuffer</name></param>
>+            <param><ptype>GLsizei</ptype> <name>n</name></param>
>+            <param group="ColorBuffer">const <ptype>GLenum</ptype> *<name>bufs</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glNamedFramebufferParameteri</name></proto>
>+            <param><ptype>GLuint</ptype> <name>framebuffer</name></param>
>+            <param group="FramebufferParameterName"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param><ptype>GLint</ptype> <name>param</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glNamedFramebufferParameteriEXT</name></proto>
>+            <param group="Framebuffer"><ptype>GLuint</ptype> <name>framebuffer</name></param>
>+            <param group="FramebufferParameterName"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param><ptype>GLint</ptype> <name>param</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glNamedFramebufferReadBuffer</name></proto>
>+            <param><ptype>GLuint</ptype> <name>framebuffer</name></param>
>+            <param group="ColorBuffer"><ptype>GLenum</ptype> <name>src</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glNamedFramebufferRenderbuffer</name></proto>
>+            <param><ptype>GLuint</ptype> <name>framebuffer</name></param>
>+            <param group="FramebufferAttachment"><ptype>GLenum</ptype> <name>attachment</name></param>
>+            <param group="RenderbufferTarget"><ptype>GLenum</ptype> <name>renderbuffertarget</name></param>
>+            <param><ptype>GLuint</ptype> <name>renderbuffer</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glNamedFramebufferRenderbufferEXT</name></proto>
>+            <param group="Framebuffer"><ptype>GLuint</ptype> <name>framebuffer</name></param>
>+            <param group="FramebufferAttachment"><ptype>GLenum</ptype> <name>attachment</name></param>
>+            <param group="RenderbufferTarget"><ptype>GLenum</ptype> <name>renderbuffertarget</name></param>
>+            <param group="Renderbuffer"><ptype>GLuint</ptype> <name>renderbuffer</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glNamedFramebufferSampleLocationsfvARB</name></proto>
>+            <param><ptype>GLuint</ptype> <name>framebuffer</name></param>
>+            <param><ptype>GLuint</ptype> <name>start</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param>const <ptype>GLfloat</ptype> *<name>v</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glNamedFramebufferSampleLocationsfvNV</name></proto>
>+            <param><ptype>GLuint</ptype> <name>framebuffer</name></param>
>+            <param><ptype>GLuint</ptype> <name>start</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param>const <ptype>GLfloat</ptype> *<name>v</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glNamedFramebufferTexture</name></proto>
>+            <param><ptype>GLuint</ptype> <name>framebuffer</name></param>
>+            <param group="FramebufferAttachment"><ptype>GLenum</ptype> <name>attachment</name></param>
>+            <param><ptype>GLuint</ptype> <name>texture</name></param>
>+            <param><ptype>GLint</ptype> <name>level</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glNamedFramebufferSamplePositionsfvAMD</name></proto>
>+            <param><ptype>GLuint</ptype> <name>framebuffer</name></param>
>+            <param><ptype>GLuint</ptype> <name>numsamples</name></param>
>+            <param><ptype>GLuint</ptype> <name>pixelindex</name></param>
>+            <param>const <ptype>GLfloat</ptype> *<name>values</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glNamedFramebufferTexture1DEXT</name></proto>
>+            <param group="Framebuffer"><ptype>GLuint</ptype> <name>framebuffer</name></param>
>+            <param group="FramebufferAttachment"><ptype>GLenum</ptype> <name>attachment</name></param>
>+            <param group="TextureTarget"><ptype>GLenum</ptype> <name>textarget</name></param>
>+            <param group="Texture"><ptype>GLuint</ptype> <name>texture</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>level</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glNamedFramebufferTexture2DEXT</name></proto>
>+            <param group="Framebuffer"><ptype>GLuint</ptype> <name>framebuffer</name></param>
>+            <param group="FramebufferAttachment"><ptype>GLenum</ptype> <name>attachment</name></param>
>+            <param group="TextureTarget"><ptype>GLenum</ptype> <name>textarget</name></param>
>+            <param group="Texture"><ptype>GLuint</ptype> <name>texture</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>level</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glNamedFramebufferTexture3DEXT</name></proto>
>+            <param group="Framebuffer"><ptype>GLuint</ptype> <name>framebuffer</name></param>
>+            <param group="FramebufferAttachment"><ptype>GLenum</ptype> <name>attachment</name></param>
>+            <param group="TextureTarget"><ptype>GLenum</ptype> <name>textarget</name></param>
>+            <param group="Texture"><ptype>GLuint</ptype> <name>texture</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>level</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>zoffset</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glNamedFramebufferTextureEXT</name></proto>
>+            <param group="Framebuffer"><ptype>GLuint</ptype> <name>framebuffer</name></param>
>+            <param group="FramebufferAttachment"><ptype>GLenum</ptype> <name>attachment</name></param>
>+            <param group="Texture"><ptype>GLuint</ptype> <name>texture</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>level</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glNamedFramebufferTextureFaceEXT</name></proto>
>+            <param group="Framebuffer"><ptype>GLuint</ptype> <name>framebuffer</name></param>
>+            <param group="FramebufferAttachment"><ptype>GLenum</ptype> <name>attachment</name></param>
>+            <param group="Texture"><ptype>GLuint</ptype> <name>texture</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>level</name></param>
>+            <param group="TextureTarget"><ptype>GLenum</ptype> <name>face</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glNamedFramebufferTextureLayer</name></proto>
>+            <param><ptype>GLuint</ptype> <name>framebuffer</name></param>
>+            <param group="FramebufferAttachment"><ptype>GLenum</ptype> <name>attachment</name></param>
>+            <param><ptype>GLuint</ptype> <name>texture</name></param>
>+            <param><ptype>GLint</ptype> <name>level</name></param>
>+            <param><ptype>GLint</ptype> <name>layer</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glNamedFramebufferTextureLayerEXT</name></proto>
>+            <param group="Framebuffer"><ptype>GLuint</ptype> <name>framebuffer</name></param>
>+            <param group="FramebufferAttachment"><ptype>GLenum</ptype> <name>attachment</name></param>
>+            <param group="Texture"><ptype>GLuint</ptype> <name>texture</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>level</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>layer</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glNamedProgramLocalParameter4dEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param group="ProgramTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param><ptype>GLdouble</ptype> <name>x</name></param>
>+            <param><ptype>GLdouble</ptype> <name>y</name></param>
>+            <param><ptype>GLdouble</ptype> <name>z</name></param>
>+            <param><ptype>GLdouble</ptype> <name>w</name></param>
>+            <vecequiv name="glNamedProgramLocalParameter4dvEXT"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glNamedProgramLocalParameter4dvEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param group="ProgramTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param len="4">const <ptype>GLdouble</ptype> *<name>params</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glNamedProgramLocalParameter4fEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param group="ProgramTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param><ptype>GLfloat</ptype> <name>x</name></param>
>+            <param><ptype>GLfloat</ptype> <name>y</name></param>
>+            <param><ptype>GLfloat</ptype> <name>z</name></param>
>+            <param><ptype>GLfloat</ptype> <name>w</name></param>
>+            <vecequiv name="glNamedProgramLocalParameter4fvEXT"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glNamedProgramLocalParameter4fvEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param group="ProgramTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param len="4">const <ptype>GLfloat</ptype> *<name>params</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glNamedProgramLocalParameterI4iEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param group="ProgramTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param><ptype>GLint</ptype> <name>x</name></param>
>+            <param><ptype>GLint</ptype> <name>y</name></param>
>+            <param><ptype>GLint</ptype> <name>z</name></param>
>+            <param><ptype>GLint</ptype> <name>w</name></param>
>+            <vecequiv name="glNamedProgramLocalParameterI4ivEXT"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glNamedProgramLocalParameterI4ivEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param group="ProgramTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param len="4">const <ptype>GLint</ptype> *<name>params</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glNamedProgramLocalParameterI4uiEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param group="ProgramTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param><ptype>GLuint</ptype> <name>x</name></param>
>+            <param><ptype>GLuint</ptype> <name>y</name></param>
>+            <param><ptype>GLuint</ptype> <name>z</name></param>
>+            <param><ptype>GLuint</ptype> <name>w</name></param>
>+            <vecequiv name="glNamedProgramLocalParameterI4uivEXT"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glNamedProgramLocalParameterI4uivEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param group="ProgramTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param len="4">const <ptype>GLuint</ptype> *<name>params</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glNamedProgramLocalParameters4fvEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param group="ProgramTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param len="count*4">const <ptype>GLfloat</ptype> *<name>params</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glNamedProgramLocalParametersI4ivEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param group="ProgramTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param len="count*4">const <ptype>GLint</ptype> *<name>params</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glNamedProgramLocalParametersI4uivEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param group="ProgramTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param len="count*4">const <ptype>GLuint</ptype> *<name>params</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glNamedProgramStringEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param group="ProgramTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="ProgramFormat"><ptype>GLenum</ptype> <name>format</name></param>
>+            <param><ptype>GLsizei</ptype> <name>len</name></param>
>+            <param len="len">const void *<name>string</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glNamedRenderbufferStorage</name></proto>
>+            <param><ptype>GLuint</ptype> <name>renderbuffer</name></param>
>+            <param group="InternalFormat"><ptype>GLenum</ptype> <name>internalformat</name></param>
>+            <param><ptype>GLsizei</ptype> <name>width</name></param>
>+            <param><ptype>GLsizei</ptype> <name>height</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glNamedRenderbufferStorageEXT</name></proto>
>+            <param group="Renderbuffer"><ptype>GLuint</ptype> <name>renderbuffer</name></param>
>+            <param group="InternalFormat"><ptype>GLenum</ptype> <name>internalformat</name></param>
>+            <param><ptype>GLsizei</ptype> <name>width</name></param>
>+            <param><ptype>GLsizei</ptype> <name>height</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glNamedRenderbufferStorageMultisample</name></proto>
>+            <param><ptype>GLuint</ptype> <name>renderbuffer</name></param>
>+            <param><ptype>GLsizei</ptype> <name>samples</name></param>
>+            <param group="InternalFormat"><ptype>GLenum</ptype> <name>internalformat</name></param>
>+            <param><ptype>GLsizei</ptype> <name>width</name></param>
>+            <param><ptype>GLsizei</ptype> <name>height</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glNamedRenderbufferStorageMultisampleCoverageEXT</name></proto>
>+            <param group="Renderbuffer"><ptype>GLuint</ptype> <name>renderbuffer</name></param>
>+            <param><ptype>GLsizei</ptype> <name>coverageSamples</name></param>
>+            <param><ptype>GLsizei</ptype> <name>colorSamples</name></param>
>+            <param group="InternalFormat"><ptype>GLenum</ptype> <name>internalformat</name></param>
>+            <param><ptype>GLsizei</ptype> <name>width</name></param>
>+            <param><ptype>GLsizei</ptype> <name>height</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glNamedRenderbufferStorageMultisampleEXT</name></proto>
>+            <param group="Renderbuffer"><ptype>GLuint</ptype> <name>renderbuffer</name></param>
>+            <param><ptype>GLsizei</ptype> <name>samples</name></param>
>+            <param group="InternalFormat"><ptype>GLenum</ptype> <name>internalformat</name></param>
>+            <param><ptype>GLsizei</ptype> <name>width</name></param>
>+            <param><ptype>GLsizei</ptype> <name>height</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glNamedStringARB</name></proto>
>+            <param><ptype>GLenum</ptype> <name>type</name></param>
>+            <param><ptype>GLint</ptype> <name>namelen</name></param>
>+            <param len="namelen">const <ptype>GLchar</ptype> *<name>name</name></param>
>+            <param><ptype>GLint</ptype> <name>stringlen</name></param>
>+            <param len="stringlen">const <ptype>GLchar</ptype> *<name>string</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glNewList</name></proto>
>+            <param group="List"><ptype>GLuint</ptype> <name>list</name></param>
>+            <param group="ListMode"><ptype>GLenum</ptype> <name>mode</name></param>
>+            <glx type="single" opcode="101"/>
>+        </command>
>+        <command>
>+            <proto><ptype>GLuint</ptype> <name>glNewObjectBufferATI</name></proto>
>+            <param><ptype>GLsizei</ptype> <name>size</name></param>
>+            <param len="size">const void *<name>pointer</name></param>
>+            <param group="ArrayObjectUsageATI"><ptype>GLenum</ptype> <name>usage</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glNormal3b</name></proto>
>+            <param><ptype>GLbyte</ptype> <name>nx</name></param>
>+            <param><ptype>GLbyte</ptype> <name>ny</name></param>
>+            <param><ptype>GLbyte</ptype> <name>nz</name></param>
>+            <vecequiv name="glNormal3bv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glNormal3bv</name></proto>
>+            <param len="3">const <ptype>GLbyte</ptype> *<name>v</name></param>
>+            <glx type="render" opcode="28"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glNormal3d</name></proto>
>+            <param group="CoordD"><ptype>GLdouble</ptype> <name>nx</name></param>
>+            <param group="CoordD"><ptype>GLdouble</ptype> <name>ny</name></param>
>+            <param group="CoordD"><ptype>GLdouble</ptype> <name>nz</name></param>
>+            <vecequiv name="glNormal3dv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glNormal3dv</name></proto>
>+            <param group="CoordD" len="3">const <ptype>GLdouble</ptype> *<name>v</name></param>
>+            <glx type="render" opcode="29"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glNormal3f</name></proto>
>+            <param group="CoordF"><ptype>GLfloat</ptype> <name>nx</name></param>
>+            <param group="CoordF"><ptype>GLfloat</ptype> <name>ny</name></param>
>+            <param group="CoordF"><ptype>GLfloat</ptype> <name>nz</name></param>
>+            <vecequiv name="glNormal3fv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glNormal3fVertex3fSUN</name></proto>
>+            <param><ptype>GLfloat</ptype> <name>nx</name></param>
>+            <param><ptype>GLfloat</ptype> <name>ny</name></param>
>+            <param><ptype>GLfloat</ptype> <name>nz</name></param>
>+            <param><ptype>GLfloat</ptype> <name>x</name></param>
>+            <param><ptype>GLfloat</ptype> <name>y</name></param>
>+            <param><ptype>GLfloat</ptype> <name>z</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glNormal3fVertex3fvSUN</name></proto>
>+            <param len="3">const <ptype>GLfloat</ptype> *<name>n</name></param>
>+            <param len="3">const <ptype>GLfloat</ptype> *<name>v</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glNormal3fv</name></proto>
>+            <param group="CoordF" len="3">const <ptype>GLfloat</ptype> *<name>v</name></param>
>+            <glx type="render" opcode="30"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glNormal3hNV</name></proto>
>+            <param group="Half16NV"><ptype>GLhalfNV</ptype> <name>nx</name></param>
>+            <param group="Half16NV"><ptype>GLhalfNV</ptype> <name>ny</name></param>
>+            <param group="Half16NV"><ptype>GLhalfNV</ptype> <name>nz</name></param>
>+            <vecequiv name="glNormal3hvNV"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glNormal3hvNV</name></proto>
>+            <param group="Half16NV" len="3">const <ptype>GLhalfNV</ptype> *<name>v</name></param>
>+            <glx type="render" opcode="4243"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glNormal3i</name></proto>
>+            <param><ptype>GLint</ptype> <name>nx</name></param>
>+            <param><ptype>GLint</ptype> <name>ny</name></param>
>+            <param><ptype>GLint</ptype> <name>nz</name></param>
>+            <vecequiv name="glNormal3iv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glNormal3iv</name></proto>
>+            <param len="3">const <ptype>GLint</ptype> *<name>v</name></param>
>+            <glx type="render" opcode="31"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glNormal3s</name></proto>
>+            <param><ptype>GLshort</ptype> <name>nx</name></param>
>+            <param><ptype>GLshort</ptype> <name>ny</name></param>
>+            <param><ptype>GLshort</ptype> <name>nz</name></param>
>+            <vecequiv name="glNormal3sv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glNormal3sv</name></proto>
>+            <param len="3">const <ptype>GLshort</ptype> *<name>v</name></param>
>+            <glx type="render" opcode="32"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glNormal3x</name></proto>
>+            <param><ptype>GLfixed</ptype> <name>nx</name></param>
>+            <param><ptype>GLfixed</ptype> <name>ny</name></param>
>+            <param><ptype>GLfixed</ptype> <name>nz</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glNormal3xOES</name></proto>
>+            <param><ptype>GLfixed</ptype> <name>nx</name></param>
>+            <param><ptype>GLfixed</ptype> <name>ny</name></param>
>+            <param><ptype>GLfixed</ptype> <name>nz</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glNormal3xvOES</name></proto>
>+            <param len="3">const <ptype>GLfixed</ptype> *<name>coords</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glNormalFormatNV</name></proto>
>+            <param><ptype>GLenum</ptype> <name>type</name></param>
>+            <param><ptype>GLsizei</ptype> <name>stride</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glNormalP3ui</name></proto>
>+            <param group="NormalPointerType"><ptype>GLenum</ptype> <name>type</name></param>
>+            <param><ptype>GLuint</ptype> <name>coords</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glNormalP3uiv</name></proto>
>+            <param group="NormalPointerType"><ptype>GLenum</ptype> <name>type</name></param>
>+            <param len="1">const <ptype>GLuint</ptype> *<name>coords</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glNormalPointer</name></proto>
>+            <param group="NormalPointerType"><ptype>GLenum</ptype> <name>type</name></param>
>+            <param><ptype>GLsizei</ptype> <name>stride</name></param>
>+            <param len="COMPSIZE(type,stride)">const void *<name>pointer</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glNormalPointerEXT</name></proto>
>+            <param group="NormalPointerType"><ptype>GLenum</ptype> <name>type</name></param>
>+            <param><ptype>GLsizei</ptype> <name>stride</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param len="COMPSIZE(type,stride,count)">const void *<name>pointer</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glNormalPointerListIBM</name></proto>
>+            <param group="NormalPointerType"><ptype>GLenum</ptype> <name>type</name></param>
>+            <param><ptype>GLint</ptype> <name>stride</name></param>
>+            <param len="COMPSIZE(type,stride)">const void **<name>pointer</name></param>
>+            <param><ptype>GLint</ptype> <name>ptrstride</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glNormalPointervINTEL</name></proto>
>+            <param group="NormalPointerType"><ptype>GLenum</ptype> <name>type</name></param>
>+            <param len="4">const void **<name>pointer</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glNormalStream3bATI</name></proto>
>+            <param group="VertexStreamATI"><ptype>GLenum</ptype> <name>stream</name></param>
>+            <param><ptype>GLbyte</ptype> <name>nx</name></param>
>+            <param><ptype>GLbyte</ptype> <name>ny</name></param>
>+            <param><ptype>GLbyte</ptype> <name>nz</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glNormalStream3bvATI</name></proto>
>+            <param group="VertexStreamATI"><ptype>GLenum</ptype> <name>stream</name></param>
>+            <param len="3">const <ptype>GLbyte</ptype> *<name>coords</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glNormalStream3dATI</name></proto>
>+            <param group="VertexStreamATI"><ptype>GLenum</ptype> <name>stream</name></param>
>+            <param><ptype>GLdouble</ptype> <name>nx</name></param>
>+            <param><ptype>GLdouble</ptype> <name>ny</name></param>
>+            <param><ptype>GLdouble</ptype> <name>nz</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glNormalStream3dvATI</name></proto>
>+            <param group="VertexStreamATI"><ptype>GLenum</ptype> <name>stream</name></param>
>+            <param len="3">const <ptype>GLdouble</ptype> *<name>coords</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glNormalStream3fATI</name></proto>
>+            <param group="VertexStreamATI"><ptype>GLenum</ptype> <name>stream</name></param>
>+            <param><ptype>GLfloat</ptype> <name>nx</name></param>
>+            <param><ptype>GLfloat</ptype> <name>ny</name></param>
>+            <param><ptype>GLfloat</ptype> <name>nz</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glNormalStream3fvATI</name></proto>
>+            <param group="VertexStreamATI"><ptype>GLenum</ptype> <name>stream</name></param>
>+            <param len="3">const <ptype>GLfloat</ptype> *<name>coords</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glNormalStream3iATI</name></proto>
>+            <param group="VertexStreamATI"><ptype>GLenum</ptype> <name>stream</name></param>
>+            <param><ptype>GLint</ptype> <name>nx</name></param>
>+            <param><ptype>GLint</ptype> <name>ny</name></param>
>+            <param><ptype>GLint</ptype> <name>nz</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glNormalStream3ivATI</name></proto>
>+            <param group="VertexStreamATI"><ptype>GLenum</ptype> <name>stream</name></param>
>+            <param len="3">const <ptype>GLint</ptype> *<name>coords</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glNormalStream3sATI</name></proto>
>+            <param group="VertexStreamATI"><ptype>GLenum</ptype> <name>stream</name></param>
>+            <param><ptype>GLshort</ptype> <name>nx</name></param>
>+            <param><ptype>GLshort</ptype> <name>ny</name></param>
>+            <param><ptype>GLshort</ptype> <name>nz</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glNormalStream3svATI</name></proto>
>+            <param group="VertexStreamATI"><ptype>GLenum</ptype> <name>stream</name></param>
>+            <param len="3">const <ptype>GLshort</ptype> *<name>coords</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glObjectLabel</name></proto>
>+            <param group="ObjectIdentifier"><ptype>GLenum</ptype> <name>identifier</name></param>
>+            <param><ptype>GLuint</ptype> <name>name</name></param>
>+            <param><ptype>GLsizei</ptype> <name>length</name></param>
>+            <param len="COMPSIZE(label,length)">const <ptype>GLchar</ptype> *<name>label</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glObjectLabelKHR</name></proto>
>+            <param group="ObjectIdentifier"><ptype>GLenum</ptype> <name>identifier</name></param>
>+            <param><ptype>GLuint</ptype> <name>name</name></param>
>+            <param><ptype>GLsizei</ptype> <name>length</name></param>
>+            <param>const <ptype>GLchar</ptype> *<name>label</name></param>
>+            <alias name="glObjectLabel"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glObjectPtrLabel</name></proto>
>+            <param>const void *<name>ptr</name></param>
>+            <param><ptype>GLsizei</ptype> <name>length</name></param>
>+            <param len="COMPSIZE(label,length)">const <ptype>GLchar</ptype> *<name>label</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glObjectPtrLabelKHR</name></proto>
>+            <param>const void *<name>ptr</name></param>
>+            <param><ptype>GLsizei</ptype> <name>length</name></param>
>+            <param>const <ptype>GLchar</ptype> *<name>label</name></param>
>+            <alias name="glObjectPtrLabel"/>
>+        </command>
>+        <command>
>+            <proto><ptype>GLenum</ptype> <name>glObjectPurgeableAPPLE</name></proto>
>+            <param><ptype>GLenum</ptype> <name>objectType</name></param>
>+            <param><ptype>GLuint</ptype> <name>name</name></param>
>+            <param><ptype>GLenum</ptype> <name>option</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>GLenum</ptype> <name>glObjectUnpurgeableAPPLE</name></proto>
>+            <param><ptype>GLenum</ptype> <name>objectType</name></param>
>+            <param><ptype>GLuint</ptype> <name>name</name></param>
>+            <param><ptype>GLenum</ptype> <name>option</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glOrtho</name></proto>
>+            <param><ptype>GLdouble</ptype> <name>left</name></param>
>+            <param><ptype>GLdouble</ptype> <name>right</name></param>
>+            <param><ptype>GLdouble</ptype> <name>bottom</name></param>
>+            <param><ptype>GLdouble</ptype> <name>top</name></param>
>+            <param><ptype>GLdouble</ptype> <name>zNear</name></param>
>+            <param><ptype>GLdouble</ptype> <name>zFar</name></param>
>+            <glx type="render" opcode="182"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glOrthof</name></proto>
>+            <param><ptype>GLfloat</ptype> <name>l</name></param>
>+            <param><ptype>GLfloat</ptype> <name>r</name></param>
>+            <param><ptype>GLfloat</ptype> <name>b</name></param>
>+            <param><ptype>GLfloat</ptype> <name>t</name></param>
>+            <param><ptype>GLfloat</ptype> <name>n</name></param>
>+            <param><ptype>GLfloat</ptype> <name>f</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glOrthofOES</name></proto>
>+            <param><ptype>GLfloat</ptype> <name>l</name></param>
>+            <param><ptype>GLfloat</ptype> <name>r</name></param>
>+            <param><ptype>GLfloat</ptype> <name>b</name></param>
>+            <param><ptype>GLfloat</ptype> <name>t</name></param>
>+            <param><ptype>GLfloat</ptype> <name>n</name></param>
>+            <param><ptype>GLfloat</ptype> <name>f</name></param>
>+            <glx type="render" opcode="4311"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glOrthox</name></proto>
>+            <param><ptype>GLfixed</ptype> <name>l</name></param>
>+            <param><ptype>GLfixed</ptype> <name>r</name></param>
>+            <param><ptype>GLfixed</ptype> <name>b</name></param>
>+            <param><ptype>GLfixed</ptype> <name>t</name></param>
>+            <param><ptype>GLfixed</ptype> <name>n</name></param>
>+            <param><ptype>GLfixed</ptype> <name>f</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glOrthoxOES</name></proto>
>+            <param><ptype>GLfixed</ptype> <name>l</name></param>
>+            <param><ptype>GLfixed</ptype> <name>r</name></param>
>+            <param><ptype>GLfixed</ptype> <name>b</name></param>
>+            <param><ptype>GLfixed</ptype> <name>t</name></param>
>+            <param><ptype>GLfixed</ptype> <name>n</name></param>
>+            <param><ptype>GLfixed</ptype> <name>f</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glPNTrianglesfATI</name></proto>
>+            <param group="PNTrianglesPNameATI"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param><ptype>GLfloat</ptype> <name>param</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glPNTrianglesiATI</name></proto>
>+            <param group="PNTrianglesPNameATI"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param><ptype>GLint</ptype> <name>param</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glPassTexCoordATI</name></proto>
>+            <param><ptype>GLuint</ptype> <name>dst</name></param>
>+            <param><ptype>GLuint</ptype> <name>coord</name></param>
>+            <param group="SwizzleOpATI"><ptype>GLenum</ptype> <name>swizzle</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glPassThrough</name></proto>
>+            <param group="FeedbackElement"><ptype>GLfloat</ptype> <name>token</name></param>
>+            <glx type="render" opcode="123"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glPassThroughxOES</name></proto>
>+            <param><ptype>GLfixed</ptype> <name>token</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glPatchParameterfv</name></proto>
>+            <param group="PatchParameterName"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="COMPSIZE(pname)">const <ptype>GLfloat</ptype> *<name>values</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glPatchParameteri</name></proto>
>+            <param group="PatchParameterName"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param><ptype>GLint</ptype> <name>value</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glPatchParameteriEXT</name></proto>
>+            <param group="PatchParameterName"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param><ptype>GLint</ptype> <name>value</name></param>
>+            <alias name="glPatchParameteri"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glPatchParameteriOES</name></proto>
>+            <param group="PatchParameterName"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param><ptype>GLint</ptype> <name>value</name></param>
>+            <alias name="glPatchParameteri"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glPathColorGenNV</name></proto>
>+            <param group="PathColor"><ptype>GLenum</ptype> <name>color</name></param>
>+            <param group="PathGenMode"><ptype>GLenum</ptype> <name>genMode</name></param>
>+            <param group="PathColorFormat"><ptype>GLenum</ptype> <name>colorFormat</name></param>
>+            <param len="COMPSIZE(genMode,colorFormat)">const <ptype>GLfloat</ptype> *<name>coeffs</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glPathCommandsNV</name></proto>
>+            <param group="Path"><ptype>GLuint</ptype> <name>path</name></param>
>+            <param><ptype>GLsizei</ptype> <name>numCommands</name></param>
>+            <param group="PathCommand" len="numCommands">const <ptype>GLubyte</ptype> *<name>commands</name></param>
>+            <param><ptype>GLsizei</ptype> <name>numCoords</name></param>
>+            <param group="PathCoordType"><ptype>GLenum</ptype> <name>coordType</name></param>
>+            <param len="COMPSIZE(numCoords,coordType)">const void *<name>coords</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glPathCoordsNV</name></proto>
>+            <param group="Path"><ptype>GLuint</ptype> <name>path</name></param>
>+            <param><ptype>GLsizei</ptype> <name>numCoords</name></param>
>+            <param group="PathCoordType"><ptype>GLenum</ptype> <name>coordType</name></param>
>+            <param len="COMPSIZE(numCoords,coordType)">const void *<name>coords</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glPathCoverDepthFuncNV</name></proto>
>+            <param group="DepthFunction"><ptype>GLenum</ptype> <name>func</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glPathDashArrayNV</name></proto>
>+            <param group="Path"><ptype>GLuint</ptype> <name>path</name></param>
>+            <param><ptype>GLsizei</ptype> <name>dashCount</name></param>
>+            <param len="dashCount">const <ptype>GLfloat</ptype> *<name>dashArray</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glPathFogGenNV</name></proto>
>+            <param group="PathGenMode"><ptype>GLenum</ptype> <name>genMode</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>GLenum</ptype> <name>glPathGlyphIndexArrayNV</name></proto>
>+            <param><ptype>GLuint</ptype> <name>firstPathName</name></param>
>+            <param><ptype>GLenum</ptype> <name>fontTarget</name></param>
>+            <param>const void *<name>fontName</name></param>
>+            <param group="PathFontStyle"><ptype>GLbitfield</ptype> <name>fontStyle</name></param>
>+            <param><ptype>GLuint</ptype> <name>firstGlyphIndex</name></param>
>+            <param><ptype>GLsizei</ptype> <name>numGlyphs</name></param>
>+            <param><ptype>GLuint</ptype> <name>pathParameterTemplate</name></param>
>+            <param><ptype>GLfloat</ptype> <name>emScale</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>GLenum</ptype> <name>glPathGlyphIndexRangeNV</name></proto>
>+            <param><ptype>GLenum</ptype> <name>fontTarget</name></param>
>+            <param>const void *<name>fontName</name></param>
>+            <param group="PathFontStyle"><ptype>GLbitfield</ptype> <name>fontStyle</name></param>
>+            <param><ptype>GLuint</ptype> <name>pathParameterTemplate</name></param>
>+            <param><ptype>GLfloat</ptype> <name>emScale</name></param>
>+            <param><ptype>GLuint</ptype> <name>baseAndCount</name>[2]</param>
>+        </command>
>+        <command>
>+            <proto>void <name>glPathGlyphRangeNV</name></proto>
>+            <param group="Path"><ptype>GLuint</ptype> <name>firstPathName</name></param>
>+            <param group="PathFontTarget"><ptype>GLenum</ptype> <name>fontTarget</name></param>
>+            <param len="COMPSIZE(fontTarget,fontName)">const void *<name>fontName</name></param>
>+            <param group="PathFontStyle"><ptype>GLbitfield</ptype> <name>fontStyle</name></param>
>+            <param><ptype>GLuint</ptype> <name>firstGlyph</name></param>
>+            <param><ptype>GLsizei</ptype> <name>numGlyphs</name></param>
>+            <param group="PathHandleMissingGlyphs"><ptype>GLenum</ptype> <name>handleMissingGlyphs</name></param>
>+            <param group="Path"><ptype>GLuint</ptype> <name>pathParameterTemplate</name></param>
>+            <param><ptype>GLfloat</ptype> <name>emScale</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glPathGlyphsNV</name></proto>
>+            <param group="Path"><ptype>GLuint</ptype> <name>firstPathName</name></param>
>+            <param group="PathFontTarget"><ptype>GLenum</ptype> <name>fontTarget</name></param>
>+            <param len="COMPSIZE(fontTarget,fontName)">const void *<name>fontName</name></param>
>+            <param group="PathFontStyle"><ptype>GLbitfield</ptype> <name>fontStyle</name></param>
>+            <param><ptype>GLsizei</ptype> <name>numGlyphs</name></param>
>+            <param group="PathElementType"><ptype>GLenum</ptype> <name>type</name></param>
>+            <param len="COMPSIZE(numGlyphs,type,charcodes)">const void *<name>charcodes</name></param>
>+            <param group="PathHandleMissingGlyphs"><ptype>GLenum</ptype> <name>handleMissingGlyphs</name></param>
>+            <param group="Path"><ptype>GLuint</ptype> <name>pathParameterTemplate</name></param>
>+            <param><ptype>GLfloat</ptype> <name>emScale</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>GLenum</ptype> <name>glPathMemoryGlyphIndexArrayNV</name></proto>
>+            <param><ptype>GLuint</ptype> <name>firstPathName</name></param>
>+            <param><ptype>GLenum</ptype> <name>fontTarget</name></param>
>+            <param><ptype>GLsizeiptr</ptype> <name>fontSize</name></param>
>+            <param>const void *<name>fontData</name></param>
>+            <param><ptype>GLsizei</ptype> <name>faceIndex</name></param>
>+            <param><ptype>GLuint</ptype> <name>firstGlyphIndex</name></param>
>+            <param><ptype>GLsizei</ptype> <name>numGlyphs</name></param>
>+            <param><ptype>GLuint</ptype> <name>pathParameterTemplate</name></param>
>+            <param><ptype>GLfloat</ptype> <name>emScale</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glPathParameterfNV</name></proto>
>+            <param group="Path"><ptype>GLuint</ptype> <name>path</name></param>
>+            <param group="PathParameter"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param><ptype>GLfloat</ptype> <name>value</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glPathParameterfvNV</name></proto>
>+            <param group="Path"><ptype>GLuint</ptype> <name>path</name></param>
>+            <param group="PathParameter"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="COMPSIZE(pname)">const <ptype>GLfloat</ptype> *<name>value</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glPathParameteriNV</name></proto>
>+            <param group="Path"><ptype>GLuint</ptype> <name>path</name></param>
>+            <param group="PathParameter"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param><ptype>GLint</ptype> <name>value</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glPathParameterivNV</name></proto>
>+            <param group="Path"><ptype>GLuint</ptype> <name>path</name></param>
>+            <param group="PathParameter"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="COMPSIZE(pname)">const <ptype>GLint</ptype> *<name>value</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glPathStencilDepthOffsetNV</name></proto>
>+            <param><ptype>GLfloat</ptype> <name>factor</name></param>
>+            <param><ptype>GLfloat</ptype> <name>units</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glPathStencilFuncNV</name></proto>
>+            <param group="StencilFunction"><ptype>GLenum</ptype> <name>func</name></param>
>+            <param group="ClampedStencilValue"><ptype>GLint</ptype> <name>ref</name></param>
>+            <param group="MaskedStencilValue"><ptype>GLuint</ptype> <name>mask</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glPathStringNV</name></proto>
>+            <param group="Path"><ptype>GLuint</ptype> <name>path</name></param>
>+            <param group="PathStringFormat"><ptype>GLenum</ptype> <name>format</name></param>
>+            <param><ptype>GLsizei</ptype> <name>length</name></param>
>+            <param len="length">const void *<name>pathString</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glPathSubCommandsNV</name></proto>
>+            <param group="Path"><ptype>GLuint</ptype> <name>path</name></param>
>+            <param><ptype>GLsizei</ptype> <name>commandStart</name></param>
>+            <param><ptype>GLsizei</ptype> <name>commandsToDelete</name></param>
>+            <param><ptype>GLsizei</ptype> <name>numCommands</name></param>
>+            <param group="PathCommand" len="numCommands">const <ptype>GLubyte</ptype> *<name>commands</name></param>
>+            <param><ptype>GLsizei</ptype> <name>numCoords</name></param>
>+            <param group="PathCoordType"><ptype>GLenum</ptype> <name>coordType</name></param>
>+            <param len="COMPSIZE(numCoords,coordType)">const void *<name>coords</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glPathSubCoordsNV</name></proto>
>+            <param group="Path"><ptype>GLuint</ptype> <name>path</name></param>
>+            <param><ptype>GLsizei</ptype> <name>coordStart</name></param>
>+            <param><ptype>GLsizei</ptype> <name>numCoords</name></param>
>+            <param group="PathCoordType"><ptype>GLenum</ptype> <name>coordType</name></param>
>+            <param len="COMPSIZE(numCoords,coordType)">const void *<name>coords</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glPathTexGenNV</name></proto>
>+            <param group="PathColor"><ptype>GLenum</ptype> <name>texCoordSet</name></param>
>+            <param group="PathGenMode"><ptype>GLenum</ptype> <name>genMode</name></param>
>+            <param><ptype>GLint</ptype> <name>components</name></param>
>+            <param len="COMPSIZE(genMode,components)">const <ptype>GLfloat</ptype> *<name>coeffs</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glPauseTransformFeedback</name></proto>
>+        </command>
>+        <command>
>+            <proto>void <name>glPauseTransformFeedbackNV</name></proto>
>+            <alias name="glPauseTransformFeedback"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glPixelDataRangeNV</name></proto>
>+            <param group="PixelDataRangeTargetNV"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param><ptype>GLsizei</ptype> <name>length</name></param>
>+            <param len="length">const void *<name>pointer</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glPixelMapfv</name></proto>
>+            <param group="PixelMap"><ptype>GLenum</ptype> <name>map</name></param>
>+            <param group="CheckedInt32"><ptype>GLsizei</ptype> <name>mapsize</name></param>
>+            <param len="mapsize">const <ptype>GLfloat</ptype> *<name>values</name></param>
>+            <glx type="render" opcode="168"/>
>+            <glx type="render" opcode="323" name="glPixelMapfvPBO" comment="PBO protocol"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glPixelMapuiv</name></proto>
>+            <param group="PixelMap"><ptype>GLenum</ptype> <name>map</name></param>
>+            <param group="CheckedInt32"><ptype>GLsizei</ptype> <name>mapsize</name></param>
>+            <param len="mapsize">const <ptype>GLuint</ptype> *<name>values</name></param>
>+            <glx type="render" opcode="169"/>
>+            <glx type="render" opcode="324" name="glPixelMapuivPBO" comment="PBO protocol"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glPixelMapusv</name></proto>
>+            <param group="PixelMap"><ptype>GLenum</ptype> <name>map</name></param>
>+            <param group="CheckedInt32"><ptype>GLsizei</ptype> <name>mapsize</name></param>
>+            <param len="mapsize">const <ptype>GLushort</ptype> *<name>values</name></param>
>+            <glx type="render" opcode="170"/>
>+            <glx type="render" opcode="325" name="glPixelMapusvPBO" comment="PBO protocol"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glPixelMapx</name></proto>
>+            <param group="PixelMap"><ptype>GLenum</ptype> <name>map</name></param>
>+            <param><ptype>GLint</ptype> <name>size</name></param>
>+            <param len="size">const <ptype>GLfixed</ptype> *<name>values</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glPixelStoref</name></proto>
>+            <param group="PixelStoreParameter"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param group="CheckedFloat32"><ptype>GLfloat</ptype> <name>param</name></param>
>+            <glx type="single" opcode="109"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glPixelStorei</name></proto>
>+            <param group="PixelStoreParameter"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>param</name></param>
>+            <glx type="single" opcode="110"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glPixelStorex</name></proto>
>+            <param group="PixelStoreParameter"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param><ptype>GLfixed</ptype> <name>param</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glPixelTexGenParameterfSGIS</name></proto>
>+            <param group="PixelTexGenParameterNameSGIS"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param group="CheckedFloat32"><ptype>GLfloat</ptype> <name>param</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glPixelTexGenParameterfvSGIS</name></proto>
>+            <param group="PixelTexGenParameterNameSGIS"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param group="CheckedFloat32" len="COMPSIZE(pname)">const <ptype>GLfloat</ptype> *<name>params</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glPixelTexGenParameteriSGIS</name></proto>
>+            <param group="PixelTexGenParameterNameSGIS"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>param</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glPixelTexGenParameterivSGIS</name></proto>
>+            <param group="PixelTexGenParameterNameSGIS"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param group="CheckedInt32" len="COMPSIZE(pname)">const <ptype>GLint</ptype> *<name>params</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glPixelTexGenSGIX</name></proto>
>+            <param group="PixelTexGenModeSGIX"><ptype>GLenum</ptype> <name>mode</name></param>
>+            <glx type="render" opcode="2059"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glPixelTransferf</name></proto>
>+            <param group="PixelTransferParameter"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param group="CheckedFloat32"><ptype>GLfloat</ptype> <name>param</name></param>
>+            <glx type="render" opcode="166"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glPixelTransferi</name></proto>
>+            <param group="PixelTransferParameter"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>param</name></param>
>+            <glx type="render" opcode="167"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glPixelTransferxOES</name></proto>
>+            <param group="PixelTransferParameter"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param><ptype>GLfixed</ptype> <name>param</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glPixelTransformParameterfEXT</name></proto>
>+            <param group="PixelTransformTargetEXT"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="PixelTransformPNameEXT"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param><ptype>GLfloat</ptype> <name>param</name></param>
>+            <glx type="render" opcode="16385"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glPixelTransformParameterfvEXT</name></proto>
>+            <param group="PixelTransformTargetEXT"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="PixelTransformPNameEXT"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="1">const <ptype>GLfloat</ptype> *<name>params</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glPixelTransformParameteriEXT</name></proto>
>+            <param group="PixelTransformTargetEXT"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="PixelTransformPNameEXT"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param><ptype>GLint</ptype> <name>param</name></param>
>+            <glx type="render" opcode="16386"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glPixelTransformParameterivEXT</name></proto>
>+            <param group="PixelTransformTargetEXT"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="PixelTransformPNameEXT"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="1">const <ptype>GLint</ptype> *<name>params</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glPixelZoom</name></proto>
>+            <param><ptype>GLfloat</ptype> <name>xfactor</name></param>
>+            <param><ptype>GLfloat</ptype> <name>yfactor</name></param>
>+            <glx type="render" opcode="165"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glPixelZoomxOES</name></proto>
>+            <param><ptype>GLfixed</ptype> <name>xfactor</name></param>
>+            <param><ptype>GLfixed</ptype> <name>yfactor</name></param>
>+        </command>
>+        <command>
>+            <proto group="Boolean"><ptype>GLboolean</ptype> <name>glPointAlongPathNV</name></proto>
>+            <param group="Path"><ptype>GLuint</ptype> <name>path</name></param>
>+            <param><ptype>GLsizei</ptype> <name>startSegment</name></param>
>+            <param><ptype>GLsizei</ptype> <name>numSegments</name></param>
>+            <param><ptype>GLfloat</ptype> <name>distance</name></param>
>+            <param len="1"><ptype>GLfloat</ptype> *<name>x</name></param>
>+            <param len="1"><ptype>GLfloat</ptype> *<name>y</name></param>
>+            <param len="1"><ptype>GLfloat</ptype> *<name>tangentX</name></param>
>+            <param len="1"><ptype>GLfloat</ptype> *<name>tangentY</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glPointParameterf</name></proto>
>+            <param group="PointParameterNameARB"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param group="CheckedFloat32"><ptype>GLfloat</ptype> <name>param</name></param>
>+            <glx type="render" opcode="2065"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glPointParameterfARB</name></proto>
>+            <param group="PointParameterNameARB"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param group="CheckedFloat32"><ptype>GLfloat</ptype> <name>param</name></param>
>+            <alias name="glPointParameterf"/>
>+            <glx type="render" opcode="2065"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glPointParameterfEXT</name></proto>
>+            <param group="PointParameterNameARB"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param group="CheckedFloat32"><ptype>GLfloat</ptype> <name>param</name></param>
>+            <alias name="glPointParameterf"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glPointParameterfSGIS</name></proto>
>+            <param group="PointParameterNameARB"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param group="CheckedFloat32"><ptype>GLfloat</ptype> <name>param</name></param>
>+            <alias name="glPointParameterf"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glPointParameterfv</name></proto>
>+            <param group="PointParameterNameARB"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param group="CheckedFloat32" len="COMPSIZE(pname)">const <ptype>GLfloat</ptype> *<name>params</name></param>
>+            <glx type="render" opcode="2066"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glPointParameterfvARB</name></proto>
>+            <param group="PointParameterNameARB"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param group="CheckedFloat32" len="COMPSIZE(pname)">const <ptype>GLfloat</ptype> *<name>params</name></param>
>+            <alias name="glPointParameterfv"/>
>+            <glx type="render" opcode="2066"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glPointParameterfvEXT</name></proto>
>+            <param group="PointParameterNameARB"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param group="CheckedFloat32" len="COMPSIZE(pname)">const <ptype>GLfloat</ptype> *<name>params</name></param>
>+            <alias name="glPointParameterfv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glPointParameterfvSGIS</name></proto>
>+            <param group="PointParameterNameARB"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param group="CheckedFloat32" len="COMPSIZE(pname)">const <ptype>GLfloat</ptype> *<name>params</name></param>
>+            <alias name="glPointParameterfv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glPointParameteri</name></proto>
>+            <param group="PointParameterNameARB"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param><ptype>GLint</ptype> <name>param</name></param>
>+            <glx type="render" opcode="4221"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glPointParameteriNV</name></proto>
>+            <param group="PointParameterNameARB"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param><ptype>GLint</ptype> <name>param</name></param>
>+            <alias name="glPointParameteri"/>
>+            <glx type="render" opcode="4221"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glPointParameteriv</name></proto>
>+            <param group="PointParameterNameARB"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="COMPSIZE(pname)">const <ptype>GLint</ptype> *<name>params</name></param>
>+            <glx type="render" opcode="4222"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glPointParameterivNV</name></proto>
>+            <param group="PointParameterNameARB"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="COMPSIZE(pname)">const <ptype>GLint</ptype> *<name>params</name></param>
>+            <alias name="glPointParameteriv"/>
>+            <glx type="render" opcode="4222"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glPointParameterx</name></proto>
>+            <param group="PointParameterNameARB"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param><ptype>GLfixed</ptype> <name>param</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glPointParameterxOES</name></proto>
>+            <param group="PointParameterNameARB"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param><ptype>GLfixed</ptype> <name>param</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glPointParameterxv</name></proto>
>+            <param group="PointParameterNameARB"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="COMPSIZE(pname)">const <ptype>GLfixed</ptype> *<name>params</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glPointParameterxvOES</name></proto>
>+            <param group="PointParameterNameARB"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="COMPSIZE(pname)">const <ptype>GLfixed</ptype> *<name>params</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glPointSize</name></proto>
>+            <param group="CheckedFloat32"><ptype>GLfloat</ptype> <name>size</name></param>
>+            <glx type="render" opcode="100"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glPointSizePointerOES</name></proto>
>+            <param><ptype>GLenum</ptype> <name>type</name></param>
>+            <param><ptype>GLsizei</ptype> <name>stride</name></param>
>+            <param len="COMPSIZE(type,stride)">const void *<name>pointer</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glPointSizex</name></proto>
>+            <param><ptype>GLfixed</ptype> <name>size</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glPointSizexOES</name></proto>
>+            <param><ptype>GLfixed</ptype> <name>size</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>GLint</ptype> <name>glPollAsyncSGIX</name></proto>
>+            <param len="1"><ptype>GLuint</ptype> *<name>markerp</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>GLint</ptype> <name>glPollInstrumentsSGIX</name></proto>
>+            <param len="1"><ptype>GLint</ptype> *<name>marker_p</name></param>
>+            <glx type="vendor" opcode="4104"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glPolygonMode</name></proto>
>+            <param group="MaterialFace"><ptype>GLenum</ptype> <name>face</name></param>
>+            <param group="PolygonMode"><ptype>GLenum</ptype> <name>mode</name></param>
>+            <glx type="render" opcode="101"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glPolygonModeNV</name></proto>
>+            <param group="MaterialFace"><ptype>GLenum</ptype> <name>face</name></param>
>+            <param group="PolygonMode"><ptype>GLenum</ptype> <name>mode</name></param>
>+            <alias name="glPolygonMode"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glPolygonOffset</name></proto>
>+            <param><ptype>GLfloat</ptype> <name>factor</name></param>
>+            <param><ptype>GLfloat</ptype> <name>units</name></param>
>+            <glx type="render" opcode="192"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glPolygonOffsetClamp</name></proto>
>+            <param><ptype>GLfloat</ptype> <name>factor</name></param>
>+            <param><ptype>GLfloat</ptype> <name>units</name></param>
>+            <param><ptype>GLfloat</ptype> <name>clamp</name></param>
>+            <glx type="render" opcode="4225"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glPolygonOffsetClampEXT</name></proto>
>+            <param><ptype>GLfloat</ptype> <name>factor</name></param>
>+            <param><ptype>GLfloat</ptype> <name>units</name></param>
>+            <param><ptype>GLfloat</ptype> <name>clamp</name></param>
>+            <alias name="glPolygonOffsetClamp"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glPolygonOffsetEXT</name></proto>
>+            <param><ptype>GLfloat</ptype> <name>factor</name></param>
>+            <param><ptype>GLfloat</ptype> <name>bias</name></param>
>+            <glx type="render" opcode="4098"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glPolygonOffsetx</name></proto>
>+            <param><ptype>GLfixed</ptype> <name>factor</name></param>
>+            <param><ptype>GLfixed</ptype> <name>units</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glPolygonOffsetxOES</name></proto>
>+            <param><ptype>GLfixed</ptype> <name>factor</name></param>
>+            <param><ptype>GLfixed</ptype> <name>units</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glPolygonStipple</name></proto>
>+            <param len="COMPSIZE()">const <ptype>GLubyte</ptype> *<name>mask</name></param>
>+            <glx type="render" opcode="102"/>
>+            <glx type="render" opcode="326" name="glPolygonStipplePBO" comment="PBO protocol"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glPopAttrib</name></proto>
>+            <glx type="render" opcode="141"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glPopClientAttrib</name></proto>
>+        </command>
>+        <command>
>+            <proto>void <name>glPopDebugGroup</name></proto>
>+        </command>
>+        <command>
>+            <proto>void <name>glPopDebugGroupKHR</name></proto>
>+            <alias name="glPopDebugGroup"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glPopGroupMarkerEXT</name></proto>
>+        </command>
>+        <command>
>+            <proto>void <name>glPopMatrix</name></proto>
>+            <glx type="render" opcode="183"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glPopName</name></proto>
>+            <glx type="render" opcode="124"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glPresentFrameDualFillNV</name></proto>
>+            <param><ptype>GLuint</ptype> <name>video_slot</name></param>
>+            <param><ptype>GLuint64EXT</ptype> <name>minPresentTime</name></param>
>+            <param><ptype>GLuint</ptype> <name>beginPresentTimeId</name></param>
>+            <param><ptype>GLuint</ptype> <name>presentDurationId</name></param>
>+            <param><ptype>GLenum</ptype> <name>type</name></param>
>+            <param><ptype>GLenum</ptype> <name>target0</name></param>
>+            <param><ptype>GLuint</ptype> <name>fill0</name></param>
>+            <param><ptype>GLenum</ptype> <name>target1</name></param>
>+            <param><ptype>GLuint</ptype> <name>fill1</name></param>
>+            <param><ptype>GLenum</ptype> <name>target2</name></param>
>+            <param><ptype>GLuint</ptype> <name>fill2</name></param>
>+            <param><ptype>GLenum</ptype> <name>target3</name></param>
>+            <param><ptype>GLuint</ptype> <name>fill3</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glPresentFrameKeyedNV</name></proto>
>+            <param><ptype>GLuint</ptype> <name>video_slot</name></param>
>+            <param><ptype>GLuint64EXT</ptype> <name>minPresentTime</name></param>
>+            <param><ptype>GLuint</ptype> <name>beginPresentTimeId</name></param>
>+            <param><ptype>GLuint</ptype> <name>presentDurationId</name></param>
>+            <param><ptype>GLenum</ptype> <name>type</name></param>
>+            <param><ptype>GLenum</ptype> <name>target0</name></param>
>+            <param><ptype>GLuint</ptype> <name>fill0</name></param>
>+            <param><ptype>GLuint</ptype> <name>key0</name></param>
>+            <param><ptype>GLenum</ptype> <name>target1</name></param>
>+            <param><ptype>GLuint</ptype> <name>fill1</name></param>
>+            <param><ptype>GLuint</ptype> <name>key1</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glPrimitiveBoundingBox</name></proto>
>+            <param><ptype>GLfloat</ptype> <name>minX</name></param>
>+            <param><ptype>GLfloat</ptype> <name>minY</name></param>
>+            <param><ptype>GLfloat</ptype> <name>minZ</name></param>
>+            <param><ptype>GLfloat</ptype> <name>minW</name></param>
>+            <param><ptype>GLfloat</ptype> <name>maxX</name></param>
>+            <param><ptype>GLfloat</ptype> <name>maxY</name></param>
>+            <param><ptype>GLfloat</ptype> <name>maxZ</name></param>
>+            <param><ptype>GLfloat</ptype> <name>maxW</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glPrimitiveBoundingBoxARB</name></proto>
>+            <param><ptype>GLfloat</ptype> <name>minX</name></param>
>+            <param><ptype>GLfloat</ptype> <name>minY</name></param>
>+            <param><ptype>GLfloat</ptype> <name>minZ</name></param>
>+            <param><ptype>GLfloat</ptype> <name>minW</name></param>
>+            <param><ptype>GLfloat</ptype> <name>maxX</name></param>
>+            <param><ptype>GLfloat</ptype> <name>maxY</name></param>
>+            <param><ptype>GLfloat</ptype> <name>maxZ</name></param>
>+            <param><ptype>GLfloat</ptype> <name>maxW</name></param>
>+            <alias name="glPrimitiveBoundingBox"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glPrimitiveBoundingBoxEXT</name></proto>
>+            <param><ptype>GLfloat</ptype> <name>minX</name></param>
>+            <param><ptype>GLfloat</ptype> <name>minY</name></param>
>+            <param><ptype>GLfloat</ptype> <name>minZ</name></param>
>+            <param><ptype>GLfloat</ptype> <name>minW</name></param>
>+            <param><ptype>GLfloat</ptype> <name>maxX</name></param>
>+            <param><ptype>GLfloat</ptype> <name>maxY</name></param>
>+            <param><ptype>GLfloat</ptype> <name>maxZ</name></param>
>+            <param><ptype>GLfloat</ptype> <name>maxW</name></param>
>+            <alias name="glPrimitiveBoundingBox"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glPrimitiveBoundingBoxOES</name></proto>
>+            <param><ptype>GLfloat</ptype> <name>minX</name></param>
>+            <param><ptype>GLfloat</ptype> <name>minY</name></param>
>+            <param><ptype>GLfloat</ptype> <name>minZ</name></param>
>+            <param><ptype>GLfloat</ptype> <name>minW</name></param>
>+            <param><ptype>GLfloat</ptype> <name>maxX</name></param>
>+            <param><ptype>GLfloat</ptype> <name>maxY</name></param>
>+            <param><ptype>GLfloat</ptype> <name>maxZ</name></param>
>+            <param><ptype>GLfloat</ptype> <name>maxW</name></param>
>+            <alias name="glPrimitiveBoundingBox"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glPrimitiveRestartIndex</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glPrimitiveRestartIndexNV</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <glx type="render" opcode="365"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glPrimitiveRestartNV</name></proto>
>+            <glx type="render" opcode="364"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glPrioritizeTextures</name></proto>
>+            <param><ptype>GLsizei</ptype> <name>n</name></param>
>+            <param group="Texture" len="n">const <ptype>GLuint</ptype> *<name>textures</name></param>
>+            <param len="n">const <ptype>GLfloat</ptype> *<name>priorities</name></param>
>+            <glx type="render" opcode="4118"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glPrioritizeTexturesEXT</name></proto>
>+            <param><ptype>GLsizei</ptype> <name>n</name></param>
>+            <param group="Texture" len="n">const <ptype>GLuint</ptype> *<name>textures</name></param>
>+            <param group="ClampedFloat32" len="n">const <ptype>GLclampf</ptype> *<name>priorities</name></param>
>+            <alias name="glPrioritizeTextures"/>
>+            <glx type="render" opcode="4118"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glPrioritizeTexturesxOES</name></proto>
>+            <param><ptype>GLsizei</ptype> <name>n</name></param>
>+            <param len="n">const <ptype>GLuint</ptype> *<name>textures</name></param>
>+            <param group="ClampedFixed" len="n">const <ptype>GLfixed</ptype> *<name>priorities</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glProgramBinary</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param><ptype>GLenum</ptype> <name>binaryFormat</name></param>
>+            <param len="length">const void *<name>binary</name></param>
>+            <param><ptype>GLsizei</ptype> <name>length</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glProgramBinaryOES</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param><ptype>GLenum</ptype> <name>binaryFormat</name></param>
>+            <param len="length">const void *<name>binary</name></param>
>+            <param><ptype>GLint</ptype> <name>length</name></param>
>+            <alias name="glProgramBinary"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glProgramBufferParametersIivNV</name></proto>
>+            <param group="ProgramTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param><ptype>GLuint</ptype> <name>bindingIndex</name></param>
>+            <param><ptype>GLuint</ptype> <name>wordIndex</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param len="count">const <ptype>GLint</ptype> *<name>params</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glProgramBufferParametersIuivNV</name></proto>
>+            <param group="ProgramTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param><ptype>GLuint</ptype> <name>bindingIndex</name></param>
>+            <param><ptype>GLuint</ptype> <name>wordIndex</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param len="count">const <ptype>GLuint</ptype> *<name>params</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glProgramBufferParametersfvNV</name></proto>
>+            <param group="ProgramTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param><ptype>GLuint</ptype> <name>bindingIndex</name></param>
>+            <param><ptype>GLuint</ptype> <name>wordIndex</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param len="count">const <ptype>GLfloat</ptype> *<name>params</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glProgramEnvParameter4dARB</name></proto>
>+            <param group="ProgramTargetARB"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param><ptype>GLdouble</ptype> <name>x</name></param>
>+            <param><ptype>GLdouble</ptype> <name>y</name></param>
>+            <param><ptype>GLdouble</ptype> <name>z</name></param>
>+            <param><ptype>GLdouble</ptype> <name>w</name></param>
>+            <vecequiv name="glProgramEnvParameter4dvARB"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glProgramEnvParameter4dvARB</name></proto>
>+            <param group="ProgramTargetARB"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param len="4">const <ptype>GLdouble</ptype> *<name>params</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glProgramEnvParameter4fARB</name></proto>
>+            <param group="ProgramTargetARB"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param><ptype>GLfloat</ptype> <name>x</name></param>
>+            <param><ptype>GLfloat</ptype> <name>y</name></param>
>+            <param><ptype>GLfloat</ptype> <name>z</name></param>
>+            <param><ptype>GLfloat</ptype> <name>w</name></param>
>+            <vecequiv name="glProgramEnvParameter4fvARB"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glProgramEnvParameter4fvARB</name></proto>
>+            <param group="ProgramTargetARB"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param len="4">const <ptype>GLfloat</ptype> *<name>params</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glProgramEnvParameterI4iNV</name></proto>
>+            <param group="ProgramTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param><ptype>GLint</ptype> <name>x</name></param>
>+            <param><ptype>GLint</ptype> <name>y</name></param>
>+            <param><ptype>GLint</ptype> <name>z</name></param>
>+            <param><ptype>GLint</ptype> <name>w</name></param>
>+            <vecequiv name="glProgramEnvParameterI4ivNV"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glProgramEnvParameterI4ivNV</name></proto>
>+            <param group="ProgramTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param len="4">const <ptype>GLint</ptype> *<name>params</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glProgramEnvParameterI4uiNV</name></proto>
>+            <param group="ProgramTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param><ptype>GLuint</ptype> <name>x</name></param>
>+            <param><ptype>GLuint</ptype> <name>y</name></param>
>+            <param><ptype>GLuint</ptype> <name>z</name></param>
>+            <param><ptype>GLuint</ptype> <name>w</name></param>
>+            <vecequiv name="glProgramEnvParameterI4uivNV"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glProgramEnvParameterI4uivNV</name></proto>
>+            <param group="ProgramTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param len="4">const <ptype>GLuint</ptype> *<name>params</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glProgramEnvParameters4fvEXT</name></proto>
>+            <param group="ProgramTargetARB"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param len="count*4">const <ptype>GLfloat</ptype> *<name>params</name></param>
>+            <glx type="render" opcode="4281"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glProgramEnvParametersI4ivNV</name></proto>
>+            <param group="ProgramTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param len="count*4">const <ptype>GLint</ptype> *<name>params</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glProgramEnvParametersI4uivNV</name></proto>
>+            <param group="ProgramTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param len="count*4">const <ptype>GLuint</ptype> *<name>params</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glProgramLocalParameter4dARB</name></proto>
>+            <param group="ProgramTargetARB"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param><ptype>GLdouble</ptype> <name>x</name></param>
>+            <param><ptype>GLdouble</ptype> <name>y</name></param>
>+            <param><ptype>GLdouble</ptype> <name>z</name></param>
>+            <param><ptype>GLdouble</ptype> <name>w</name></param>
>+            <vecequiv name="glProgramLocalParameter4dvARB"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glProgramLocalParameter4dvARB</name></proto>
>+            <param group="ProgramTargetARB"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param len="4">const <ptype>GLdouble</ptype> *<name>params</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glProgramLocalParameter4fARB</name></proto>
>+            <param group="ProgramTargetARB"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param><ptype>GLfloat</ptype> <name>x</name></param>
>+            <param><ptype>GLfloat</ptype> <name>y</name></param>
>+            <param><ptype>GLfloat</ptype> <name>z</name></param>
>+            <param><ptype>GLfloat</ptype> <name>w</name></param>
>+            <vecequiv name="glProgramLocalParameter4fvARB"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glProgramLocalParameter4fvARB</name></proto>
>+            <param group="ProgramTargetARB"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param len="4">const <ptype>GLfloat</ptype> *<name>params</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glProgramLocalParameterI4iNV</name></proto>
>+            <param group="ProgramTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param><ptype>GLint</ptype> <name>x</name></param>
>+            <param><ptype>GLint</ptype> <name>y</name></param>
>+            <param><ptype>GLint</ptype> <name>z</name></param>
>+            <param><ptype>GLint</ptype> <name>w</name></param>
>+            <vecequiv name="glProgramLocalParameterI4ivNV"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glProgramLocalParameterI4ivNV</name></proto>
>+            <param group="ProgramTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param len="4">const <ptype>GLint</ptype> *<name>params</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glProgramLocalParameterI4uiNV</name></proto>
>+            <param group="ProgramTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param><ptype>GLuint</ptype> <name>x</name></param>
>+            <param><ptype>GLuint</ptype> <name>y</name></param>
>+            <param><ptype>GLuint</ptype> <name>z</name></param>
>+            <param><ptype>GLuint</ptype> <name>w</name></param>
>+            <vecequiv name="glProgramLocalParameterI4uivNV"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glProgramLocalParameterI4uivNV</name></proto>
>+            <param group="ProgramTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param len="4">const <ptype>GLuint</ptype> *<name>params</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glProgramLocalParameters4fvEXT</name></proto>
>+            <param group="ProgramTargetARB"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param len="count*4">const <ptype>GLfloat</ptype> *<name>params</name></param>
>+            <glx type="render" opcode="4282"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glProgramLocalParametersI4ivNV</name></proto>
>+            <param group="ProgramTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param len="count*4">const <ptype>GLint</ptype> *<name>params</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glProgramLocalParametersI4uivNV</name></proto>
>+            <param group="ProgramTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param len="count*4">const <ptype>GLuint</ptype> *<name>params</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glProgramNamedParameter4dNV</name></proto>
>+            <param><ptype>GLuint</ptype> <name>id</name></param>
>+            <param><ptype>GLsizei</ptype> <name>len</name></param>
>+            <param len="1">const <ptype>GLubyte</ptype> *<name>name</name></param>
>+            <param><ptype>GLdouble</ptype> <name>x</name></param>
>+            <param><ptype>GLdouble</ptype> <name>y</name></param>
>+            <param><ptype>GLdouble</ptype> <name>z</name></param>
>+            <param><ptype>GLdouble</ptype> <name>w</name></param>
>+            <vecequiv name="glProgramNamedParameter4dvNV"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glProgramNamedParameter4dvNV</name></proto>
>+            <param><ptype>GLuint</ptype> <name>id</name></param>
>+            <param><ptype>GLsizei</ptype> <name>len</name></param>
>+            <param len="1">const <ptype>GLubyte</ptype> *<name>name</name></param>
>+            <param len="4">const <ptype>GLdouble</ptype> *<name>v</name></param>
>+            <glx type="render" opcode="4219"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glProgramNamedParameter4fNV</name></proto>
>+            <param><ptype>GLuint</ptype> <name>id</name></param>
>+            <param><ptype>GLsizei</ptype> <name>len</name></param>
>+            <param len="1">const <ptype>GLubyte</ptype> *<name>name</name></param>
>+            <param><ptype>GLfloat</ptype> <name>x</name></param>
>+            <param><ptype>GLfloat</ptype> <name>y</name></param>
>+            <param><ptype>GLfloat</ptype> <name>z</name></param>
>+            <param><ptype>GLfloat</ptype> <name>w</name></param>
>+            <vecequiv name="glProgramNamedParameter4fvNV"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glProgramNamedParameter4fvNV</name></proto>
>+            <param><ptype>GLuint</ptype> <name>id</name></param>
>+            <param><ptype>GLsizei</ptype> <name>len</name></param>
>+            <param len="1">const <ptype>GLubyte</ptype> *<name>name</name></param>
>+            <param len="4">const <ptype>GLfloat</ptype> *<name>v</name></param>
>+            <glx type="render" opcode="4218"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glProgramParameter4dNV</name></proto>
>+            <param group="VertexAttribEnumNV"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param><ptype>GLdouble</ptype> <name>x</name></param>
>+            <param><ptype>GLdouble</ptype> <name>y</name></param>
>+            <param><ptype>GLdouble</ptype> <name>z</name></param>
>+            <param><ptype>GLdouble</ptype> <name>w</name></param>
>+            <vecequiv name="glProgramParameter4dvNV"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glProgramParameter4dvNV</name></proto>
>+            <param group="VertexAttribEnumNV"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param len="4">const <ptype>GLdouble</ptype> *<name>v</name></param>
>+            <glx type="render" opcode="4185"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glProgramParameter4fNV</name></proto>
>+            <param group="VertexAttribEnumNV"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param><ptype>GLfloat</ptype> <name>x</name></param>
>+            <param><ptype>GLfloat</ptype> <name>y</name></param>
>+            <param><ptype>GLfloat</ptype> <name>z</name></param>
>+            <param><ptype>GLfloat</ptype> <name>w</name></param>
>+            <vecequiv name="glProgramParameter4fvNV"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glProgramParameter4fvNV</name></proto>
>+            <param group="VertexAttribEnumNV"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param len="4">const <ptype>GLfloat</ptype> *<name>v</name></param>
>+            <glx type="render" opcode="4184"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glProgramParameteri</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param group="ProgramParameterPName"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param><ptype>GLint</ptype> <name>value</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glProgramParameteriARB</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param group="ProgramParameterPName"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param><ptype>GLint</ptype> <name>value</name></param>
>+            <alias name="glProgramParameteri"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glProgramParameteriEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param group="ProgramParameterPName"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param><ptype>GLint</ptype> <name>value</name></param>
>+            <alias name="glProgramParameteri"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glProgramParameters4dvNV</name></proto>
>+            <param group="VertexAttribEnumNV"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param len="count*4">const <ptype>GLdouble</ptype> *<name>v</name></param>
>+            <glx type="render" opcode="4187"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glProgramParameters4fvNV</name></proto>
>+            <param group="VertexAttribEnumNV"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param len="count*4">const <ptype>GLfloat</ptype> *<name>v</name></param>
>+            <glx type="render" opcode="4186"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glProgramPathFragmentInputGenNV</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLenum</ptype> <name>genMode</name></param>
>+            <param><ptype>GLint</ptype> <name>components</name></param>
>+            <param>const <ptype>GLfloat</ptype> *<name>coeffs</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glProgramStringARB</name></proto>
>+            <param group="ProgramTargetARB"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="ProgramFormatARB"><ptype>GLenum</ptype> <name>format</name></param>
>+            <param><ptype>GLsizei</ptype> <name>len</name></param>
>+            <param len="len">const void *<name>string</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glProgramSubroutineParametersuivNV</name></proto>
>+            <param><ptype>GLenum</ptype> <name>target</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param len="count">const <ptype>GLuint</ptype> *<name>params</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glProgramUniform1d</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLdouble</ptype> <name>v0</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glProgramUniform1dEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLdouble</ptype> <name>x</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glProgramUniform1dv</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param len="count">const <ptype>GLdouble</ptype> *<name>value</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glProgramUniform1dvEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param len="count">const <ptype>GLdouble</ptype> *<name>value</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glProgramUniform1f</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLfloat</ptype> <name>v0</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glProgramUniform1fEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLfloat</ptype> <name>v0</name></param>
>+            <alias name="glProgramUniform1f"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glProgramUniform1fv</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param len="count">const <ptype>GLfloat</ptype> *<name>value</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glProgramUniform1fvEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param len="count">const <ptype>GLfloat</ptype> *<name>value</name></param>
>+            <alias name="glProgramUniform1fv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glProgramUniform1i</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLint</ptype> <name>v0</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glProgramUniform1i64ARB</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLint64</ptype> <name>x</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glProgramUniform1i64NV</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLint64EXT</ptype> <name>x</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glProgramUniform1i64vARB</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param len="count">const <ptype>GLint64</ptype> *<name>value</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glProgramUniform1i64vNV</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param len="count">const <ptype>GLint64EXT</ptype> *<name>value</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glProgramUniform1iEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLint</ptype> <name>v0</name></param>
>+            <alias name="glProgramUniform1i"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glProgramUniform1iv</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param len="count">const <ptype>GLint</ptype> *<name>value</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glProgramUniform1ivEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param len="count">const <ptype>GLint</ptype> *<name>value</name></param>
>+            <alias name="glProgramUniform1iv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glProgramUniform1ui</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLuint</ptype> <name>v0</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glProgramUniform1ui64ARB</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLuint64</ptype> <name>x</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glProgramUniform1ui64NV</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLuint64EXT</ptype> <name>x</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glProgramUniform1ui64vARB</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param len="count">const <ptype>GLuint64</ptype> *<name>value</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glProgramUniform1ui64vNV</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param len="count">const <ptype>GLuint64EXT</ptype> *<name>value</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glProgramUniform1uiEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLuint</ptype> <name>v0</name></param>
>+            <alias name="glProgramUniform1ui"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glProgramUniform1uiv</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param len="count">const <ptype>GLuint</ptype> *<name>value</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glProgramUniform1uivEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param len="count">const <ptype>GLuint</ptype> *<name>value</name></param>
>+            <alias name="glProgramUniform1uiv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glProgramUniform2d</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLdouble</ptype> <name>v0</name></param>
>+            <param><ptype>GLdouble</ptype> <name>v1</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glProgramUniform2dEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLdouble</ptype> <name>x</name></param>
>+            <param><ptype>GLdouble</ptype> <name>y</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glProgramUniform2dv</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param len="count*2">const <ptype>GLdouble</ptype> *<name>value</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glProgramUniform2dvEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param len="count*2">const <ptype>GLdouble</ptype> *<name>value</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glProgramUniform2f</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLfloat</ptype> <name>v0</name></param>
>+            <param><ptype>GLfloat</ptype> <name>v1</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glProgramUniform2fEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLfloat</ptype> <name>v0</name></param>
>+            <param><ptype>GLfloat</ptype> <name>v1</name></param>
>+            <alias name="glProgramUniform2f"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glProgramUniform2fv</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param len="count*2">const <ptype>GLfloat</ptype> *<name>value</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glProgramUniform2fvEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param len="count*2">const <ptype>GLfloat</ptype> *<name>value</name></param>
>+            <alias name="glProgramUniform2fv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glProgramUniform2i</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLint</ptype> <name>v0</name></param>
>+            <param><ptype>GLint</ptype> <name>v1</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glProgramUniform2i64ARB</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLint64</ptype> <name>x</name></param>
>+            <param><ptype>GLint64</ptype> <name>y</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glProgramUniform2i64NV</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLint64EXT</ptype> <name>x</name></param>
>+            <param><ptype>GLint64EXT</ptype> <name>y</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glProgramUniform2i64vARB</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param len="count*2">const <ptype>GLint64</ptype> *<name>value</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glProgramUniform2i64vNV</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param len="count*2">const <ptype>GLint64EXT</ptype> *<name>value</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glProgramUniform2iEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLint</ptype> <name>v0</name></param>
>+            <param><ptype>GLint</ptype> <name>v1</name></param>
>+            <alias name="glProgramUniform2i"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glProgramUniform2iv</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param len="count*2">const <ptype>GLint</ptype> *<name>value</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glProgramUniform2ivEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param len="count*2">const <ptype>GLint</ptype> *<name>value</name></param>
>+            <alias name="glProgramUniform2iv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glProgramUniform2ui</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLuint</ptype> <name>v0</name></param>
>+            <param><ptype>GLuint</ptype> <name>v1</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glProgramUniform2ui64ARB</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLuint64</ptype> <name>x</name></param>
>+            <param><ptype>GLuint64</ptype> <name>y</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glProgramUniform2ui64NV</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLuint64EXT</ptype> <name>x</name></param>
>+            <param><ptype>GLuint64EXT</ptype> <name>y</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glProgramUniform2ui64vARB</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param len="count*2">const <ptype>GLuint64</ptype> *<name>value</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glProgramUniform2ui64vNV</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param len="count*2">const <ptype>GLuint64EXT</ptype> *<name>value</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glProgramUniform2uiEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLuint</ptype> <name>v0</name></param>
>+            <param><ptype>GLuint</ptype> <name>v1</name></param>
>+            <alias name="glProgramUniform2ui"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glProgramUniform2uiv</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param len="count*2">const <ptype>GLuint</ptype> *<name>value</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glProgramUniform2uivEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param len="count*2">const <ptype>GLuint</ptype> *<name>value</name></param>
>+            <alias name="glProgramUniform2uiv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glProgramUniform3d</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLdouble</ptype> <name>v0</name></param>
>+            <param><ptype>GLdouble</ptype> <name>v1</name></param>
>+            <param><ptype>GLdouble</ptype> <name>v2</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glProgramUniform3dEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLdouble</ptype> <name>x</name></param>
>+            <param><ptype>GLdouble</ptype> <name>y</name></param>
>+            <param><ptype>GLdouble</ptype> <name>z</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glProgramUniform3dv</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param len="count*3">const <ptype>GLdouble</ptype> *<name>value</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glProgramUniform3dvEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param len="count*3">const <ptype>GLdouble</ptype> *<name>value</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glProgramUniform3f</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLfloat</ptype> <name>v0</name></param>
>+            <param><ptype>GLfloat</ptype> <name>v1</name></param>
>+            <param><ptype>GLfloat</ptype> <name>v2</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glProgramUniform3fEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLfloat</ptype> <name>v0</name></param>
>+            <param><ptype>GLfloat</ptype> <name>v1</name></param>
>+            <param><ptype>GLfloat</ptype> <name>v2</name></param>
>+            <alias name="glProgramUniform3f"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glProgramUniform3fv</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param len="count*3">const <ptype>GLfloat</ptype> *<name>value</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glProgramUniform3fvEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param len="count*3">const <ptype>GLfloat</ptype> *<name>value</name></param>
>+            <alias name="glProgramUniform3fv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glProgramUniform3i</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLint</ptype> <name>v0</name></param>
>+            <param><ptype>GLint</ptype> <name>v1</name></param>
>+            <param><ptype>GLint</ptype> <name>v2</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glProgramUniform3i64ARB</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLint64</ptype> <name>x</name></param>
>+            <param><ptype>GLint64</ptype> <name>y</name></param>
>+            <param><ptype>GLint64</ptype> <name>z</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glProgramUniform3i64NV</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLint64EXT</ptype> <name>x</name></param>
>+            <param><ptype>GLint64EXT</ptype> <name>y</name></param>
>+            <param><ptype>GLint64EXT</ptype> <name>z</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glProgramUniform3i64vARB</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param len="count*3">const <ptype>GLint64</ptype> *<name>value</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glProgramUniform3i64vNV</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param len="count*3">const <ptype>GLint64EXT</ptype> *<name>value</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glProgramUniform3iEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLint</ptype> <name>v0</name></param>
>+            <param><ptype>GLint</ptype> <name>v1</name></param>
>+            <param><ptype>GLint</ptype> <name>v2</name></param>
>+            <alias name="glProgramUniform3i"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glProgramUniform3iv</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param len="count*3">const <ptype>GLint</ptype> *<name>value</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glProgramUniform3ivEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param len="count*3">const <ptype>GLint</ptype> *<name>value</name></param>
>+            <alias name="glProgramUniform3iv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glProgramUniform3ui</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLuint</ptype> <name>v0</name></param>
>+            <param><ptype>GLuint</ptype> <name>v1</name></param>
>+            <param><ptype>GLuint</ptype> <name>v2</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glProgramUniform3ui64ARB</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLuint64</ptype> <name>x</name></param>
>+            <param><ptype>GLuint64</ptype> <name>y</name></param>
>+            <param><ptype>GLuint64</ptype> <name>z</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glProgramUniform3ui64NV</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLuint64EXT</ptype> <name>x</name></param>
>+            <param><ptype>GLuint64EXT</ptype> <name>y</name></param>
>+            <param><ptype>GLuint64EXT</ptype> <name>z</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glProgramUniform3ui64vARB</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param len="count*3">const <ptype>GLuint64</ptype> *<name>value</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glProgramUniform3ui64vNV</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param len="count*3">const <ptype>GLuint64EXT</ptype> *<name>value</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glProgramUniform3uiEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLuint</ptype> <name>v0</name></param>
>+            <param><ptype>GLuint</ptype> <name>v1</name></param>
>+            <param><ptype>GLuint</ptype> <name>v2</name></param>
>+            <alias name="glProgramUniform3ui"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glProgramUniform3uiv</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param len="count*3">const <ptype>GLuint</ptype> *<name>value</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glProgramUniform3uivEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param len="count*3">const <ptype>GLuint</ptype> *<name>value</name></param>
>+            <alias name="glProgramUniform3uiv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glProgramUniform4d</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLdouble</ptype> <name>v0</name></param>
>+            <param><ptype>GLdouble</ptype> <name>v1</name></param>
>+            <param><ptype>GLdouble</ptype> <name>v2</name></param>
>+            <param><ptype>GLdouble</ptype> <name>v3</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glProgramUniform4dEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLdouble</ptype> <name>x</name></param>
>+            <param><ptype>GLdouble</ptype> <name>y</name></param>
>+            <param><ptype>GLdouble</ptype> <name>z</name></param>
>+            <param><ptype>GLdouble</ptype> <name>w</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glProgramUniform4dv</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param len="count*4">const <ptype>GLdouble</ptype> *<name>value</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glProgramUniform4dvEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param len="count*4">const <ptype>GLdouble</ptype> *<name>value</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glProgramUniform4f</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLfloat</ptype> <name>v0</name></param>
>+            <param><ptype>GLfloat</ptype> <name>v1</name></param>
>+            <param><ptype>GLfloat</ptype> <name>v2</name></param>
>+            <param><ptype>GLfloat</ptype> <name>v3</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glProgramUniform4fEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLfloat</ptype> <name>v0</name></param>
>+            <param><ptype>GLfloat</ptype> <name>v1</name></param>
>+            <param><ptype>GLfloat</ptype> <name>v2</name></param>
>+            <param><ptype>GLfloat</ptype> <name>v3</name></param>
>+            <alias name="glProgramUniform4f"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glProgramUniform4fv</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param len="count*4">const <ptype>GLfloat</ptype> *<name>value</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glProgramUniform4fvEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param len="count*4">const <ptype>GLfloat</ptype> *<name>value</name></param>
>+            <alias name="glProgramUniform4fv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glProgramUniform4i</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLint</ptype> <name>v0</name></param>
>+            <param><ptype>GLint</ptype> <name>v1</name></param>
>+            <param><ptype>GLint</ptype> <name>v2</name></param>
>+            <param><ptype>GLint</ptype> <name>v3</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glProgramUniform4i64ARB</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLint64</ptype> <name>x</name></param>
>+            <param><ptype>GLint64</ptype> <name>y</name></param>
>+            <param><ptype>GLint64</ptype> <name>z</name></param>
>+            <param><ptype>GLint64</ptype> <name>w</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glProgramUniform4i64NV</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLint64EXT</ptype> <name>x</name></param>
>+            <param><ptype>GLint64EXT</ptype> <name>y</name></param>
>+            <param><ptype>GLint64EXT</ptype> <name>z</name></param>
>+            <param><ptype>GLint64EXT</ptype> <name>w</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glProgramUniform4i64vARB</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param len="count*4">const <ptype>GLint64</ptype> *<name>value</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glProgramUniform4i64vNV</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param len="count*4">const <ptype>GLint64EXT</ptype> *<name>value</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glProgramUniform4iEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLint</ptype> <name>v0</name></param>
>+            <param><ptype>GLint</ptype> <name>v1</name></param>
>+            <param><ptype>GLint</ptype> <name>v2</name></param>
>+            <param><ptype>GLint</ptype> <name>v3</name></param>
>+            <alias name="glProgramUniform4i"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glProgramUniform4iv</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param len="count*4">const <ptype>GLint</ptype> *<name>value</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glProgramUniform4ivEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param len="count*4">const <ptype>GLint</ptype> *<name>value</name></param>
>+            <alias name="glProgramUniform4iv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glProgramUniform4ui</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLuint</ptype> <name>v0</name></param>
>+            <param><ptype>GLuint</ptype> <name>v1</name></param>
>+            <param><ptype>GLuint</ptype> <name>v2</name></param>
>+            <param><ptype>GLuint</ptype> <name>v3</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glProgramUniform4ui64ARB</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLuint64</ptype> <name>x</name></param>
>+            <param><ptype>GLuint64</ptype> <name>y</name></param>
>+            <param><ptype>GLuint64</ptype> <name>z</name></param>
>+            <param><ptype>GLuint64</ptype> <name>w</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glProgramUniform4ui64NV</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLuint64EXT</ptype> <name>x</name></param>
>+            <param><ptype>GLuint64EXT</ptype> <name>y</name></param>
>+            <param><ptype>GLuint64EXT</ptype> <name>z</name></param>
>+            <param><ptype>GLuint64EXT</ptype> <name>w</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glProgramUniform4ui64vARB</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param len="count*4">const <ptype>GLuint64</ptype> *<name>value</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glProgramUniform4ui64vNV</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param len="count*4">const <ptype>GLuint64EXT</ptype> *<name>value</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glProgramUniform4uiEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLuint</ptype> <name>v0</name></param>
>+            <param><ptype>GLuint</ptype> <name>v1</name></param>
>+            <param><ptype>GLuint</ptype> <name>v2</name></param>
>+            <param><ptype>GLuint</ptype> <name>v3</name></param>
>+            <alias name="glProgramUniform4ui"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glProgramUniform4uiv</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param len="count*4">const <ptype>GLuint</ptype> *<name>value</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glProgramUniform4uivEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param len="count*4">const <ptype>GLuint</ptype> *<name>value</name></param>
>+            <alias name="glProgramUniform4uiv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glProgramUniformHandleui64ARB</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLuint64</ptype> <name>value</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glProgramUniformHandleui64IMG</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLuint64</ptype> <name>value</name></param>
>+            <alias name="glProgramUniformHandleui64ARB"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glProgramUniformHandleui64NV</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLuint64</ptype> <name>value</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glProgramUniformHandleui64vARB</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param len="count">const <ptype>GLuint64</ptype> *<name>values</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glProgramUniformHandleui64vIMG</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param len="count">const <ptype>GLuint64</ptype> *<name>values</name></param>
>+            <alias name="glProgramUniformHandleui64vARB"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glProgramUniformHandleui64vNV</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param len="count">const <ptype>GLuint64</ptype> *<name>values</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glProgramUniformMatrix2dv</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param group="Boolean"><ptype>GLboolean</ptype> <name>transpose</name></param>
>+            <param len="count*4">const <ptype>GLdouble</ptype> *<name>value</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glProgramUniformMatrix2dvEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param group="Boolean"><ptype>GLboolean</ptype> <name>transpose</name></param>
>+            <param len="count*4">const <ptype>GLdouble</ptype> *<name>value</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glProgramUniformMatrix2fv</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param group="Boolean"><ptype>GLboolean</ptype> <name>transpose</name></param>
>+            <param len="count*4">const <ptype>GLfloat</ptype> *<name>value</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glProgramUniformMatrix2fvEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param group="Boolean"><ptype>GLboolean</ptype> <name>transpose</name></param>
>+            <param len="count*4">const <ptype>GLfloat</ptype> *<name>value</name></param>
>+            <alias name="glProgramUniformMatrix2fv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glProgramUniformMatrix2x3dv</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param group="Boolean"><ptype>GLboolean</ptype> <name>transpose</name></param>
>+            <param len="count*6">const <ptype>GLdouble</ptype> *<name>value</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glProgramUniformMatrix2x3dvEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param group="Boolean"><ptype>GLboolean</ptype> <name>transpose</name></param>
>+            <param len="count*6">const <ptype>GLdouble</ptype> *<name>value</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glProgramUniformMatrix2x3fv</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param group="Boolean"><ptype>GLboolean</ptype> <name>transpose</name></param>
>+            <param len="count*6">const <ptype>GLfloat</ptype> *<name>value</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glProgramUniformMatrix2x3fvEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param group="Boolean"><ptype>GLboolean</ptype> <name>transpose</name></param>
>+            <param len="count*6">const <ptype>GLfloat</ptype> *<name>value</name></param>
>+            <alias name="glProgramUniformMatrix2x3fv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glProgramUniformMatrix2x4dv</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param group="Boolean"><ptype>GLboolean</ptype> <name>transpose</name></param>
>+            <param len="count*8">const <ptype>GLdouble</ptype> *<name>value</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glProgramUniformMatrix2x4dvEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param group="Boolean"><ptype>GLboolean</ptype> <name>transpose</name></param>
>+            <param len="count*8">const <ptype>GLdouble</ptype> *<name>value</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glProgramUniformMatrix2x4fv</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param group="Boolean"><ptype>GLboolean</ptype> <name>transpose</name></param>
>+            <param len="count*8">const <ptype>GLfloat</ptype> *<name>value</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glProgramUniformMatrix2x4fvEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param group="Boolean"><ptype>GLboolean</ptype> <name>transpose</name></param>
>+            <param len="count*8">const <ptype>GLfloat</ptype> *<name>value</name></param>
>+            <alias name="glProgramUniformMatrix2x4fv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glProgramUniformMatrix3dv</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param group="Boolean"><ptype>GLboolean</ptype> <name>transpose</name></param>
>+            <param len="count*9">const <ptype>GLdouble</ptype> *<name>value</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glProgramUniformMatrix3dvEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param group="Boolean"><ptype>GLboolean</ptype> <name>transpose</name></param>
>+            <param len="count*9">const <ptype>GLdouble</ptype> *<name>value</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glProgramUniformMatrix3fv</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param group="Boolean"><ptype>GLboolean</ptype> <name>transpose</name></param>
>+            <param len="count*9">const <ptype>GLfloat</ptype> *<name>value</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glProgramUniformMatrix3fvEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param group="Boolean"><ptype>GLboolean</ptype> <name>transpose</name></param>
>+            <param len="count*9">const <ptype>GLfloat</ptype> *<name>value</name></param>
>+            <alias name="glProgramUniformMatrix3fv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glProgramUniformMatrix3x2dv</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param group="Boolean"><ptype>GLboolean</ptype> <name>transpose</name></param>
>+            <param len="count*6">const <ptype>GLdouble</ptype> *<name>value</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glProgramUniformMatrix3x2dvEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param group="Boolean"><ptype>GLboolean</ptype> <name>transpose</name></param>
>+            <param len="count*6">const <ptype>GLdouble</ptype> *<name>value</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glProgramUniformMatrix3x2fv</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param group="Boolean"><ptype>GLboolean</ptype> <name>transpose</name></param>
>+            <param len="count*6">const <ptype>GLfloat</ptype> *<name>value</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glProgramUniformMatrix3x2fvEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param group="Boolean"><ptype>GLboolean</ptype> <name>transpose</name></param>
>+            <param len="count*6">const <ptype>GLfloat</ptype> *<name>value</name></param>
>+            <alias name="glProgramUniformMatrix3x2fv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glProgramUniformMatrix3x4dv</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param group="Boolean"><ptype>GLboolean</ptype> <name>transpose</name></param>
>+            <param len="count*12">const <ptype>GLdouble</ptype> *<name>value</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glProgramUniformMatrix3x4dvEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param group="Boolean"><ptype>GLboolean</ptype> <name>transpose</name></param>
>+            <param len="count*12">const <ptype>GLdouble</ptype> *<name>value</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glProgramUniformMatrix3x4fv</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param group="Boolean"><ptype>GLboolean</ptype> <name>transpose</name></param>
>+            <param len="count*12">const <ptype>GLfloat</ptype> *<name>value</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glProgramUniformMatrix3x4fvEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param group="Boolean"><ptype>GLboolean</ptype> <name>transpose</name></param>
>+            <param len="count*12">const <ptype>GLfloat</ptype> *<name>value</name></param>
>+            <alias name="glProgramUniformMatrix3x4fv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glProgramUniformMatrix4dv</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param group="Boolean"><ptype>GLboolean</ptype> <name>transpose</name></param>
>+            <param len="count*16">const <ptype>GLdouble</ptype> *<name>value</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glProgramUniformMatrix4dvEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param group="Boolean"><ptype>GLboolean</ptype> <name>transpose</name></param>
>+            <param len="count*16">const <ptype>GLdouble</ptype> *<name>value</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glProgramUniformMatrix4fv</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param group="Boolean"><ptype>GLboolean</ptype> <name>transpose</name></param>
>+            <param len="count*16">const <ptype>GLfloat</ptype> *<name>value</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glProgramUniformMatrix4fvEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param group="Boolean"><ptype>GLboolean</ptype> <name>transpose</name></param>
>+            <param len="count*16">const <ptype>GLfloat</ptype> *<name>value</name></param>
>+            <alias name="glProgramUniformMatrix4fv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glProgramUniformMatrix4x2dv</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param group="Boolean"><ptype>GLboolean</ptype> <name>transpose</name></param>
>+            <param len="count*8">const <ptype>GLdouble</ptype> *<name>value</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glProgramUniformMatrix4x2dvEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param group="Boolean"><ptype>GLboolean</ptype> <name>transpose</name></param>
>+            <param len="count*8">const <ptype>GLdouble</ptype> *<name>value</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glProgramUniformMatrix4x2fv</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param group="Boolean"><ptype>GLboolean</ptype> <name>transpose</name></param>
>+            <param len="count*8">const <ptype>GLfloat</ptype> *<name>value</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glProgramUniformMatrix4x2fvEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param group="Boolean"><ptype>GLboolean</ptype> <name>transpose</name></param>
>+            <param len="count*8">const <ptype>GLfloat</ptype> *<name>value</name></param>
>+            <alias name="glProgramUniformMatrix4x2fv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glProgramUniformMatrix4x3dv</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param group="Boolean"><ptype>GLboolean</ptype> <name>transpose</name></param>
>+            <param len="count*12">const <ptype>GLdouble</ptype> *<name>value</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glProgramUniformMatrix4x3dvEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param group="Boolean"><ptype>GLboolean</ptype> <name>transpose</name></param>
>+            <param len="count*12">const <ptype>GLdouble</ptype> *<name>value</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glProgramUniformMatrix4x3fv</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param group="Boolean"><ptype>GLboolean</ptype> <name>transpose</name></param>
>+            <param len="count*12">const <ptype>GLfloat</ptype> *<name>value</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glProgramUniformMatrix4x3fvEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param group="Boolean"><ptype>GLboolean</ptype> <name>transpose</name></param>
>+            <param len="count*12">const <ptype>GLfloat</ptype> *<name>value</name></param>
>+            <alias name="glProgramUniformMatrix4x3fv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glProgramUniformui64NV</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLuint64EXT</ptype> <name>value</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glProgramUniformui64vNV</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param len="count">const <ptype>GLuint64EXT</ptype> *<name>value</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glProgramVertexLimitNV</name></proto>
>+            <param group="ProgramTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param><ptype>GLint</ptype> <name>limit</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glProvokingVertex</name></proto>
>+            <param group="VertexProvokingMode"><ptype>GLenum</ptype> <name>mode</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glProvokingVertexEXT</name></proto>
>+            <param group="VertexProvokingMode"><ptype>GLenum</ptype> <name>mode</name></param>
>+            <alias name="glProvokingVertex"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glPushAttrib</name></proto>
>+            <param group="AttribMask"><ptype>GLbitfield</ptype> <name>mask</name></param>
>+            <glx type="render" opcode="142"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glPushClientAttrib</name></proto>
>+            <param group="ClientAttribMask"><ptype>GLbitfield</ptype> <name>mask</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glPushClientAttribDefaultEXT</name></proto>
>+            <param group="ClientAttribMask"><ptype>GLbitfield</ptype> <name>mask</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glPushDebugGroup</name></proto>
>+            <param group="DebugSource"><ptype>GLenum</ptype> <name>source</name></param>
>+            <param><ptype>GLuint</ptype> <name>id</name></param>
>+            <param><ptype>GLsizei</ptype> <name>length</name></param>
>+            <param len="COMPSIZE(message,length)">const <ptype>GLchar</ptype> *<name>message</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glPushDebugGroupKHR</name></proto>
>+            <param group="DebugSource"><ptype>GLenum</ptype> <name>source</name></param>
>+            <param><ptype>GLuint</ptype> <name>id</name></param>
>+            <param><ptype>GLsizei</ptype> <name>length</name></param>
>+            <param>const <ptype>GLchar</ptype> *<name>message</name></param>
>+            <alias name="glPushDebugGroup"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glPushGroupMarkerEXT</name></proto>
>+            <param><ptype>GLsizei</ptype> <name>length</name></param>
>+            <param>const <ptype>GLchar</ptype> *<name>marker</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glPushMatrix</name></proto>
>+            <glx type="render" opcode="184"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glPushName</name></proto>
>+            <param group="SelectName"><ptype>GLuint</ptype> <name>name</name></param>
>+            <glx type="render" opcode="125"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glQueryCounter</name></proto>
>+            <param><ptype>GLuint</ptype> <name>id</name></param>
>+            <param group="QueryTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glQueryCounterEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>id</name></param>
>+            <param group="QueryTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <alias name="glQueryCounter"/>
>+        </command>
>+        <command>
>+            <proto><ptype>GLbitfield</ptype> <name>glQueryMatrixxOES</name></proto>
>+            <param len="16"><ptype>GLfixed</ptype> *<name>mantissa</name></param>
>+            <param len="16"><ptype>GLint</ptype> *<name>exponent</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glQueryObjectParameteruiAMD</name></proto>
>+            <param group="QueryTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param><ptype>GLuint</ptype> <name>id</name></param>
>+            <param><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param group="OcclusionQueryEventMaskAMD"><ptype>GLuint</ptype> <name>param</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>GLint</ptype> <name>glQueryResourceNV</name></proto>
>+            <param><ptype>GLenum</ptype> <name>queryType</name></param>
>+            <param><ptype>GLint</ptype> <name>tagId</name></param>
>+            <param><ptype>GLuint</ptype> <name>bufSize</name></param>
>+            <param><ptype>GLint</ptype> *<name>buffer</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glQueryResourceTagNV</name></proto>
>+            <param><ptype>GLint</ptype> <name>tagId</name></param>
>+            <param>const <ptype>GLchar</ptype> *<name>tagString</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glRasterPos2d</name></proto>
>+            <param group="CoordD"><ptype>GLdouble</ptype> <name>x</name></param>
>+            <param group="CoordD"><ptype>GLdouble</ptype> <name>y</name></param>
>+            <vecequiv name="glRasterPos2dv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glRasterPos2dv</name></proto>
>+            <param group="CoordD" len="2">const <ptype>GLdouble</ptype> *<name>v</name></param>
>+            <glx type="render" opcode="33"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glRasterPos2f</name></proto>
>+            <param group="CoordF"><ptype>GLfloat</ptype> <name>x</name></param>
>+            <param group="CoordF"><ptype>GLfloat</ptype> <name>y</name></param>
>+            <vecequiv name="glRasterPos2fv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glRasterPos2fv</name></proto>
>+            <param group="CoordF" len="2">const <ptype>GLfloat</ptype> *<name>v</name></param>
>+            <glx type="render" opcode="34"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glRasterPos2i</name></proto>
>+            <param group="CoordI"><ptype>GLint</ptype> <name>x</name></param>
>+            <param group="CoordI"><ptype>GLint</ptype> <name>y</name></param>
>+            <vecequiv name="glRasterPos2iv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glRasterPos2iv</name></proto>
>+            <param group="CoordI" len="2">const <ptype>GLint</ptype> *<name>v</name></param>
>+            <glx type="render" opcode="35"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glRasterPos2s</name></proto>
>+            <param group="CoordS"><ptype>GLshort</ptype> <name>x</name></param>
>+            <param group="CoordS"><ptype>GLshort</ptype> <name>y</name></param>
>+            <vecequiv name="glRasterPos2sv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glRasterPos2sv</name></proto>
>+            <param group="CoordS" len="2">const <ptype>GLshort</ptype> *<name>v</name></param>
>+            <glx type="render" opcode="36"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glRasterPos2xOES</name></proto>
>+            <param><ptype>GLfixed</ptype> <name>x</name></param>
>+            <param><ptype>GLfixed</ptype> <name>y</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glRasterPos2xvOES</name></proto>
>+            <param len="2">const <ptype>GLfixed</ptype> *<name>coords</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glRasterPos3d</name></proto>
>+            <param group="CoordD"><ptype>GLdouble</ptype> <name>x</name></param>
>+            <param group="CoordD"><ptype>GLdouble</ptype> <name>y</name></param>
>+            <param group="CoordD"><ptype>GLdouble</ptype> <name>z</name></param>
>+            <vecequiv name="glRasterPos3dv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glRasterPos3dv</name></proto>
>+            <param group="CoordD" len="3">const <ptype>GLdouble</ptype> *<name>v</name></param>
>+            <glx type="render" opcode="37"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glRasterPos3f</name></proto>
>+            <param group="CoordF"><ptype>GLfloat</ptype> <name>x</name></param>
>+            <param group="CoordF"><ptype>GLfloat</ptype> <name>y</name></param>
>+            <param group="CoordF"><ptype>GLfloat</ptype> <name>z</name></param>
>+            <vecequiv name="glRasterPos3fv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glRasterPos3fv</name></proto>
>+            <param group="CoordF" len="3">const <ptype>GLfloat</ptype> *<name>v</name></param>
>+            <glx type="render" opcode="38"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glRasterPos3i</name></proto>
>+            <param group="CoordI"><ptype>GLint</ptype> <name>x</name></param>
>+            <param group="CoordI"><ptype>GLint</ptype> <name>y</name></param>
>+            <param group="CoordI"><ptype>GLint</ptype> <name>z</name></param>
>+            <vecequiv name="glRasterPos3iv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glRasterPos3iv</name></proto>
>+            <param group="CoordI" len="3">const <ptype>GLint</ptype> *<name>v</name></param>
>+            <glx type="render" opcode="39"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glRasterPos3s</name></proto>
>+            <param group="CoordS"><ptype>GLshort</ptype> <name>x</name></param>
>+            <param group="CoordS"><ptype>GLshort</ptype> <name>y</name></param>
>+            <param group="CoordS"><ptype>GLshort</ptype> <name>z</name></param>
>+            <vecequiv name="glRasterPos3sv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glRasterPos3sv</name></proto>
>+            <param group="CoordS" len="3">const <ptype>GLshort</ptype> *<name>v</name></param>
>+            <glx type="render" opcode="40"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glRasterPos3xOES</name></proto>
>+            <param><ptype>GLfixed</ptype> <name>x</name></param>
>+            <param><ptype>GLfixed</ptype> <name>y</name></param>
>+            <param><ptype>GLfixed</ptype> <name>z</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glRasterPos3xvOES</name></proto>
>+            <param len="3">const <ptype>GLfixed</ptype> *<name>coords</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glRasterPos4d</name></proto>
>+            <param group="CoordD"><ptype>GLdouble</ptype> <name>x</name></param>
>+            <param group="CoordD"><ptype>GLdouble</ptype> <name>y</name></param>
>+            <param group="CoordD"><ptype>GLdouble</ptype> <name>z</name></param>
>+            <param group="CoordD"><ptype>GLdouble</ptype> <name>w</name></param>
>+            <vecequiv name="glRasterPos4dv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glRasterPos4dv</name></proto>
>+            <param group="CoordD" len="4">const <ptype>GLdouble</ptype> *<name>v</name></param>
>+            <glx type="render" opcode="41"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glRasterPos4f</name></proto>
>+            <param group="CoordF"><ptype>GLfloat</ptype> <name>x</name></param>
>+            <param group="CoordF"><ptype>GLfloat</ptype> <name>y</name></param>
>+            <param group="CoordF"><ptype>GLfloat</ptype> <name>z</name></param>
>+            <param group="CoordF"><ptype>GLfloat</ptype> <name>w</name></param>
>+            <vecequiv name="glRasterPos4fv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glRasterPos4fv</name></proto>
>+            <param group="CoordF" len="4">const <ptype>GLfloat</ptype> *<name>v</name></param>
>+            <glx type="render" opcode="42"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glRasterPos4i</name></proto>
>+            <param group="CoordI"><ptype>GLint</ptype> <name>x</name></param>
>+            <param group="CoordI"><ptype>GLint</ptype> <name>y</name></param>
>+            <param group="CoordI"><ptype>GLint</ptype> <name>z</name></param>
>+            <param group="CoordI"><ptype>GLint</ptype> <name>w</name></param>
>+            <vecequiv name="glRasterPos4iv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glRasterPos4iv</name></proto>
>+            <param group="CoordI" len="4">const <ptype>GLint</ptype> *<name>v</name></param>
>+            <glx type="render" opcode="43"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glRasterPos4s</name></proto>
>+            <param group="CoordS"><ptype>GLshort</ptype> <name>x</name></param>
>+            <param group="CoordS"><ptype>GLshort</ptype> <name>y</name></param>
>+            <param group="CoordS"><ptype>GLshort</ptype> <name>z</name></param>
>+            <param group="CoordS"><ptype>GLshort</ptype> <name>w</name></param>
>+            <vecequiv name="glRasterPos4sv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glRasterPos4sv</name></proto>
>+            <param group="CoordS" len="4">const <ptype>GLshort</ptype> *<name>v</name></param>
>+            <glx type="render" opcode="44"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glRasterPos4xOES</name></proto>
>+            <param><ptype>GLfixed</ptype> <name>x</name></param>
>+            <param><ptype>GLfixed</ptype> <name>y</name></param>
>+            <param><ptype>GLfixed</ptype> <name>z</name></param>
>+            <param><ptype>GLfixed</ptype> <name>w</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glRasterPos4xvOES</name></proto>
>+            <param len="4">const <ptype>GLfixed</ptype> *<name>coords</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glRasterSamplesEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>samples</name></param>
>+            <param><ptype>GLboolean</ptype> <name>fixedsamplelocations</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glReadBuffer</name></proto>
>+            <param group="ReadBufferMode"><ptype>GLenum</ptype> <name>src</name></param>
>+            <glx type="render" opcode="171"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glReadBufferIndexedEXT</name></proto>
>+            <param group="ReadBufferMode"><ptype>GLenum</ptype> <name>src</name></param>
>+            <param><ptype>GLint</ptype> <name>index</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glReadBufferNV</name></proto>
>+            <param><ptype>GLenum</ptype> <name>mode</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glReadInstrumentsSGIX</name></proto>
>+            <param><ptype>GLint</ptype> <name>marker</name></param>
>+            <glx type="render" opcode="2077"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glReadPixels</name></proto>
>+            <param group="WinCoord"><ptype>GLint</ptype> <name>x</name></param>
>+            <param group="WinCoord"><ptype>GLint</ptype> <name>y</name></param>
>+            <param><ptype>GLsizei</ptype> <name>width</name></param>
>+            <param><ptype>GLsizei</ptype> <name>height</name></param>
>+            <param group="PixelFormat"><ptype>GLenum</ptype> <name>format</name></param>
>+            <param group="PixelType"><ptype>GLenum</ptype> <name>type</name></param>
>+            <param len="COMPSIZE(format,type,width,height)">void *<name>pixels</name></param>
>+            <glx type="single" opcode="111"/>
>+            <glx type="render" opcode="345" name="glReadPixelsPBO" comment="PBO protocol"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glReadnPixels</name></proto>
>+            <param><ptype>GLint</ptype> <name>x</name></param>
>+            <param><ptype>GLint</ptype> <name>y</name></param>
>+            <param><ptype>GLsizei</ptype> <name>width</name></param>
>+            <param><ptype>GLsizei</ptype> <name>height</name></param>
>+            <param group="PixelFormat"><ptype>GLenum</ptype> <name>format</name></param>
>+            <param group="PixelType"><ptype>GLenum</ptype> <name>type</name></param>
>+            <param><ptype>GLsizei</ptype> <name>bufSize</name></param>
>+            <param len="bufSize">void *<name>data</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glReadnPixelsARB</name></proto>
>+            <param><ptype>GLint</ptype> <name>x</name></param>
>+            <param><ptype>GLint</ptype> <name>y</name></param>
>+            <param><ptype>GLsizei</ptype> <name>width</name></param>
>+            <param><ptype>GLsizei</ptype> <name>height</name></param>
>+            <param group="PixelFormat"><ptype>GLenum</ptype> <name>format</name></param>
>+            <param group="PixelType"><ptype>GLenum</ptype> <name>type</name></param>
>+            <param><ptype>GLsizei</ptype> <name>bufSize</name></param>
>+            <param len="bufSize">void *<name>data</name></param>
>+            <alias name="glReadnPixels"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glReadnPixelsEXT</name></proto>
>+            <param><ptype>GLint</ptype> <name>x</name></param>
>+            <param><ptype>GLint</ptype> <name>y</name></param>
>+            <param><ptype>GLsizei</ptype> <name>width</name></param>
>+            <param><ptype>GLsizei</ptype> <name>height</name></param>
>+            <param group="PixelFormat"><ptype>GLenum</ptype> <name>format</name></param>
>+            <param group="PixelType"><ptype>GLenum</ptype> <name>type</name></param>
>+            <param><ptype>GLsizei</ptype> <name>bufSize</name></param>
>+            <param len="bufSize">void *<name>data</name></param>
>+            <alias name="glReadnPixels"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glReadnPixelsKHR</name></proto>
>+            <param group="WinCoord"><ptype>GLint</ptype> <name>x</name></param>
>+            <param group="WinCoord"><ptype>GLint</ptype> <name>y</name></param>
>+            <param><ptype>GLsizei</ptype> <name>width</name></param>
>+            <param><ptype>GLsizei</ptype> <name>height</name></param>
>+            <param group="PixelFormat"><ptype>GLenum</ptype> <name>format</name></param>
>+            <param group="PixelType"><ptype>GLenum</ptype> <name>type</name></param>
>+            <param><ptype>GLsizei</ptype> <name>bufSize</name></param>
>+            <param len="bufSize">void *<name>data</name></param>
>+            <alias name="glReadnPixels"/>
>+        </command>
>+        <command>
>+            <proto><ptype>GLboolean</ptype> <name>glReleaseKeyedMutexWin32EXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>memory</name></param>
>+            <param><ptype>GLuint64</ptype> <name>key</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glRectd</name></proto>
>+            <param group="CoordD"><ptype>GLdouble</ptype> <name>x1</name></param>
>+            <param group="CoordD"><ptype>GLdouble</ptype> <name>y1</name></param>
>+            <param group="CoordD"><ptype>GLdouble</ptype> <name>x2</name></param>
>+            <param group="CoordD"><ptype>GLdouble</ptype> <name>y2</name></param>
>+            <vecequiv name="glRectdv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glRectdv</name></proto>
>+            <param group="CoordD" len="2">const <ptype>GLdouble</ptype> *<name>v1</name></param>
>+            <param group="CoordD" len="2">const <ptype>GLdouble</ptype> *<name>v2</name></param>
>+            <glx type="render" opcode="45"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glRectf</name></proto>
>+            <param group="CoordF"><ptype>GLfloat</ptype> <name>x1</name></param>
>+            <param group="CoordF"><ptype>GLfloat</ptype> <name>y1</name></param>
>+            <param group="CoordF"><ptype>GLfloat</ptype> <name>x2</name></param>
>+            <param group="CoordF"><ptype>GLfloat</ptype> <name>y2</name></param>
>+            <vecequiv name="glRectfv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glRectfv</name></proto>
>+            <param group="CoordF" len="2">const <ptype>GLfloat</ptype> *<name>v1</name></param>
>+            <param group="CoordF" len="2">const <ptype>GLfloat</ptype> *<name>v2</name></param>
>+            <glx type="render" opcode="46"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glRecti</name></proto>
>+            <param group="CoordI"><ptype>GLint</ptype> <name>x1</name></param>
>+            <param group="CoordI"><ptype>GLint</ptype> <name>y1</name></param>
>+            <param group="CoordI"><ptype>GLint</ptype> <name>x2</name></param>
>+            <param group="CoordI"><ptype>GLint</ptype> <name>y2</name></param>
>+            <vecequiv name="glRectiv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glRectiv</name></proto>
>+            <param group="CoordI" len="2">const <ptype>GLint</ptype> *<name>v1</name></param>
>+            <param group="CoordI" len="2">const <ptype>GLint</ptype> *<name>v2</name></param>
>+            <glx type="render" opcode="47"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glRects</name></proto>
>+            <param group="CoordS"><ptype>GLshort</ptype> <name>x1</name></param>
>+            <param group="CoordS"><ptype>GLshort</ptype> <name>y1</name></param>
>+            <param group="CoordS"><ptype>GLshort</ptype> <name>x2</name></param>
>+            <param group="CoordS"><ptype>GLshort</ptype> <name>y2</name></param>
>+            <vecequiv name="glRectsv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glRectsv</name></proto>
>+            <param group="CoordS" len="2">const <ptype>GLshort</ptype> *<name>v1</name></param>
>+            <param group="CoordS" len="2">const <ptype>GLshort</ptype> *<name>v2</name></param>
>+            <glx type="render" opcode="48"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glRectxOES</name></proto>
>+            <param><ptype>GLfixed</ptype> <name>x1</name></param>
>+            <param><ptype>GLfixed</ptype> <name>y1</name></param>
>+            <param><ptype>GLfixed</ptype> <name>x2</name></param>
>+            <param><ptype>GLfixed</ptype> <name>y2</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glRectxvOES</name></proto>
>+            <param len="2">const <ptype>GLfixed</ptype> *<name>v1</name></param>
>+            <param len="2">const <ptype>GLfixed</ptype> *<name>v2</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glReferencePlaneSGIX</name></proto>
>+            <param len="4">const <ptype>GLdouble</ptype> *<name>equation</name></param>
>+            <glx type="render" opcode="2071"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glReleaseShaderCompiler</name></proto>
>+        </command>
>+        <command>
>+            <proto>void <name>glRenderGpuMaskNV</name></proto>
>+            <param><ptype>GLbitfield</ptype> <name>mask</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>GLint</ptype> <name>glRenderMode</name></proto>
>+            <param group="RenderingMode"><ptype>GLenum</ptype> <name>mode</name></param>
>+            <glx type="single" opcode="107"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glRenderbufferStorage</name></proto>
>+            <param group="RenderbufferTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="InternalFormat"><ptype>GLenum</ptype> <name>internalformat</name></param>
>+            <param><ptype>GLsizei</ptype> <name>width</name></param>
>+            <param><ptype>GLsizei</ptype> <name>height</name></param>
>+            <glx type="render" opcode="4318"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glRenderbufferStorageEXT</name></proto>
>+            <param group="RenderbufferTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="InternalFormat"><ptype>GLenum</ptype> <name>internalformat</name></param>
>+            <param><ptype>GLsizei</ptype> <name>width</name></param>
>+            <param><ptype>GLsizei</ptype> <name>height</name></param>
>+            <alias name="glRenderbufferStorage"/>
>+            <glx type="render" opcode="4318"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glRenderbufferStorageMultisample</name></proto>
>+            <param group="RenderbufferTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param><ptype>GLsizei</ptype> <name>samples</name></param>
>+            <param group="InternalFormat"><ptype>GLenum</ptype> <name>internalformat</name></param>
>+            <param><ptype>GLsizei</ptype> <name>width</name></param>
>+            <param><ptype>GLsizei</ptype> <name>height</name></param>
>+            <glx type="render" opcode="4331"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glRenderbufferStorageMultisampleANGLE</name></proto>
>+            <param group="RenderbufferTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param><ptype>GLsizei</ptype> <name>samples</name></param>
>+            <param group="InternalFormat"><ptype>GLenum</ptype> <name>internalformat</name></param>
>+            <param><ptype>GLsizei</ptype> <name>width</name></param>
>+            <param><ptype>GLsizei</ptype> <name>height</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glRenderbufferStorageMultisampleAPPLE</name></proto>
>+            <param group="RenderbufferTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param><ptype>GLsizei</ptype> <name>samples</name></param>
>+            <param group="InternalFormat"><ptype>GLenum</ptype> <name>internalformat</name></param>
>+            <param><ptype>GLsizei</ptype> <name>width</name></param>
>+            <param><ptype>GLsizei</ptype> <name>height</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glRenderbufferStorageMultisampleCoverageNV</name></proto>
>+            <param group="RenderbufferTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param><ptype>GLsizei</ptype> <name>coverageSamples</name></param>
>+            <param><ptype>GLsizei</ptype> <name>colorSamples</name></param>
>+            <param group="InternalFormat"><ptype>GLenum</ptype> <name>internalformat</name></param>
>+            <param><ptype>GLsizei</ptype> <name>width</name></param>
>+            <param><ptype>GLsizei</ptype> <name>height</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glRenderbufferStorageMultisampleEXT</name></proto>
>+            <param group="RenderbufferTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param><ptype>GLsizei</ptype> <name>samples</name></param>
>+            <param group="InternalFormat"><ptype>GLenum</ptype> <name>internalformat</name></param>
>+            <param><ptype>GLsizei</ptype> <name>width</name></param>
>+            <param><ptype>GLsizei</ptype> <name>height</name></param>
>+            <alias name="glRenderbufferStorageMultisample"/>
>+            <glx type="render" opcode="4331"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glRenderbufferStorageMultisampleIMG</name></proto>
>+            <param group="RenderbufferTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param><ptype>GLsizei</ptype> <name>samples</name></param>
>+            <param group="InternalFormat"><ptype>GLenum</ptype> <name>internalformat</name></param>
>+            <param><ptype>GLsizei</ptype> <name>width</name></param>
>+            <param><ptype>GLsizei</ptype> <name>height</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glRenderbufferStorageMultisampleNV</name></proto>
>+            <param group="RenderbufferTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param><ptype>GLsizei</ptype> <name>samples</name></param>
>+            <param group="InternalFormat"><ptype>GLenum</ptype> <name>internalformat</name></param>
>+            <param><ptype>GLsizei</ptype> <name>width</name></param>
>+            <param><ptype>GLsizei</ptype> <name>height</name></param>
>+            <alias name="glRenderbufferStorageMultisample"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glRenderbufferStorageOES</name></proto>
>+            <param group="RenderbufferTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="InternalFormat"><ptype>GLenum</ptype> <name>internalformat</name></param>
>+            <param><ptype>GLsizei</ptype> <name>width</name></param>
>+            <param><ptype>GLsizei</ptype> <name>height</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glReplacementCodePointerSUN</name></proto>
>+            <param group="ReplacementCodeTypeSUN"><ptype>GLenum</ptype> <name>type</name></param>
>+            <param><ptype>GLsizei</ptype> <name>stride</name></param>
>+            <param len="COMPSIZE(type,stride)">const void **<name>pointer</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glReplacementCodeubSUN</name></proto>
>+            <param><ptype>GLubyte</ptype> <name>code</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glReplacementCodeubvSUN</name></proto>
>+            <param len="COMPSIZE()">const <ptype>GLubyte</ptype> *<name>code</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glReplacementCodeuiColor3fVertex3fSUN</name></proto>
>+            <param group="ReplacementCodeSUN"><ptype>GLuint</ptype> <name>rc</name></param>
>+            <param><ptype>GLfloat</ptype> <name>r</name></param>
>+            <param><ptype>GLfloat</ptype> <name>g</name></param>
>+            <param><ptype>GLfloat</ptype> <name>b</name></param>
>+            <param><ptype>GLfloat</ptype> <name>x</name></param>
>+            <param><ptype>GLfloat</ptype> <name>y</name></param>
>+            <param><ptype>GLfloat</ptype> <name>z</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glReplacementCodeuiColor3fVertex3fvSUN</name></proto>
>+            <param group="ReplacementCodeSUN" len="1">const <ptype>GLuint</ptype> *<name>rc</name></param>
>+            <param len="3">const <ptype>GLfloat</ptype> *<name>c</name></param>
>+            <param len="3">const <ptype>GLfloat</ptype> *<name>v</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glReplacementCodeuiColor4fNormal3fVertex3fSUN</name></proto>
>+            <param group="ReplacementCodeSUN"><ptype>GLuint</ptype> <name>rc</name></param>
>+            <param><ptype>GLfloat</ptype> <name>r</name></param>
>+            <param><ptype>GLfloat</ptype> <name>g</name></param>
>+            <param><ptype>GLfloat</ptype> <name>b</name></param>
>+            <param><ptype>GLfloat</ptype> <name>a</name></param>
>+            <param><ptype>GLfloat</ptype> <name>nx</name></param>
>+            <param><ptype>GLfloat</ptype> <name>ny</name></param>
>+            <param><ptype>GLfloat</ptype> <name>nz</name></param>
>+            <param><ptype>GLfloat</ptype> <name>x</name></param>
>+            <param><ptype>GLfloat</ptype> <name>y</name></param>
>+            <param><ptype>GLfloat</ptype> <name>z</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glReplacementCodeuiColor4fNormal3fVertex3fvSUN</name></proto>
>+            <param group="ReplacementCodeSUN" len="1">const <ptype>GLuint</ptype> *<name>rc</name></param>
>+            <param len="4">const <ptype>GLfloat</ptype> *<name>c</name></param>
>+            <param len="3">const <ptype>GLfloat</ptype> *<name>n</name></param>
>+            <param len="3">const <ptype>GLfloat</ptype> *<name>v</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glReplacementCodeuiColor4ubVertex3fSUN</name></proto>
>+            <param group="ReplacementCodeSUN"><ptype>GLuint</ptype> <name>rc</name></param>
>+            <param><ptype>GLubyte</ptype> <name>r</name></param>
>+            <param><ptype>GLubyte</ptype> <name>g</name></param>
>+            <param><ptype>GLubyte</ptype> <name>b</name></param>
>+            <param><ptype>GLubyte</ptype> <name>a</name></param>
>+            <param><ptype>GLfloat</ptype> <name>x</name></param>
>+            <param><ptype>GLfloat</ptype> <name>y</name></param>
>+            <param><ptype>GLfloat</ptype> <name>z</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glReplacementCodeuiColor4ubVertex3fvSUN</name></proto>
>+            <param group="ReplacementCodeSUN" len="1">const <ptype>GLuint</ptype> *<name>rc</name></param>
>+            <param len="4">const <ptype>GLubyte</ptype> *<name>c</name></param>
>+            <param len="3">const <ptype>GLfloat</ptype> *<name>v</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glReplacementCodeuiNormal3fVertex3fSUN</name></proto>
>+            <param group="ReplacementCodeSUN"><ptype>GLuint</ptype> <name>rc</name></param>
>+            <param><ptype>GLfloat</ptype> <name>nx</name></param>
>+            <param><ptype>GLfloat</ptype> <name>ny</name></param>
>+            <param><ptype>GLfloat</ptype> <name>nz</name></param>
>+            <param><ptype>GLfloat</ptype> <name>x</name></param>
>+            <param><ptype>GLfloat</ptype> <name>y</name></param>
>+            <param><ptype>GLfloat</ptype> <name>z</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glReplacementCodeuiNormal3fVertex3fvSUN</name></proto>
>+            <param group="ReplacementCodeSUN" len="1">const <ptype>GLuint</ptype> *<name>rc</name></param>
>+            <param len="3">const <ptype>GLfloat</ptype> *<name>n</name></param>
>+            <param len="3">const <ptype>GLfloat</ptype> *<name>v</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glReplacementCodeuiSUN</name></proto>
>+            <param><ptype>GLuint</ptype> <name>code</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fSUN</name></proto>
>+            <param group="ReplacementCodeSUN"><ptype>GLuint</ptype> <name>rc</name></param>
>+            <param><ptype>GLfloat</ptype> <name>s</name></param>
>+            <param><ptype>GLfloat</ptype> <name>t</name></param>
>+            <param><ptype>GLfloat</ptype> <name>r</name></param>
>+            <param><ptype>GLfloat</ptype> <name>g</name></param>
>+            <param><ptype>GLfloat</ptype> <name>b</name></param>
>+            <param><ptype>GLfloat</ptype> <name>a</name></param>
>+            <param><ptype>GLfloat</ptype> <name>nx</name></param>
>+            <param><ptype>GLfloat</ptype> <name>ny</name></param>
>+            <param><ptype>GLfloat</ptype> <name>nz</name></param>
>+            <param><ptype>GLfloat</ptype> <name>x</name></param>
>+            <param><ptype>GLfloat</ptype> <name>y</name></param>
>+            <param><ptype>GLfloat</ptype> <name>z</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fvSUN</name></proto>
>+            <param group="ReplacementCodeSUN" len="1">const <ptype>GLuint</ptype> *<name>rc</name></param>
>+            <param len="2">const <ptype>GLfloat</ptype> *<name>tc</name></param>
>+            <param len="4">const <ptype>GLfloat</ptype> *<name>c</name></param>
>+            <param len="3">const <ptype>GLfloat</ptype> *<name>n</name></param>
>+            <param len="3">const <ptype>GLfloat</ptype> *<name>v</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glReplacementCodeuiTexCoord2fNormal3fVertex3fSUN</name></proto>
>+            <param group="ReplacementCodeSUN"><ptype>GLuint</ptype> <name>rc</name></param>
>+            <param><ptype>GLfloat</ptype> <name>s</name></param>
>+            <param><ptype>GLfloat</ptype> <name>t</name></param>
>+            <param><ptype>GLfloat</ptype> <name>nx</name></param>
>+            <param><ptype>GLfloat</ptype> <name>ny</name></param>
>+            <param><ptype>GLfloat</ptype> <name>nz</name></param>
>+            <param><ptype>GLfloat</ptype> <name>x</name></param>
>+            <param><ptype>GLfloat</ptype> <name>y</name></param>
>+            <param><ptype>GLfloat</ptype> <name>z</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glReplacementCodeuiTexCoord2fNormal3fVertex3fvSUN</name></proto>
>+            <param group="ReplacementCodeSUN" len="1">const <ptype>GLuint</ptype> *<name>rc</name></param>
>+            <param len="2">const <ptype>GLfloat</ptype> *<name>tc</name></param>
>+            <param len="3">const <ptype>GLfloat</ptype> *<name>n</name></param>
>+            <param len="3">const <ptype>GLfloat</ptype> *<name>v</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glReplacementCodeuiTexCoord2fVertex3fSUN</name></proto>
>+            <param group="ReplacementCodeSUN"><ptype>GLuint</ptype> <name>rc</name></param>
>+            <param><ptype>GLfloat</ptype> <name>s</name></param>
>+            <param><ptype>GLfloat</ptype> <name>t</name></param>
>+            <param><ptype>GLfloat</ptype> <name>x</name></param>
>+            <param><ptype>GLfloat</ptype> <name>y</name></param>
>+            <param><ptype>GLfloat</ptype> <name>z</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glReplacementCodeuiTexCoord2fVertex3fvSUN</name></proto>
>+            <param group="ReplacementCodeSUN" len="1">const <ptype>GLuint</ptype> *<name>rc</name></param>
>+            <param len="2">const <ptype>GLfloat</ptype> *<name>tc</name></param>
>+            <param len="3">const <ptype>GLfloat</ptype> *<name>v</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glReplacementCodeuiVertex3fSUN</name></proto>
>+            <param group="ReplacementCodeSUN"><ptype>GLuint</ptype> <name>rc</name></param>
>+            <param><ptype>GLfloat</ptype> <name>x</name></param>
>+            <param><ptype>GLfloat</ptype> <name>y</name></param>
>+            <param><ptype>GLfloat</ptype> <name>z</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glReplacementCodeuiVertex3fvSUN</name></proto>
>+            <param group="ReplacementCodeSUN" len="1">const <ptype>GLuint</ptype> *<name>rc</name></param>
>+            <param len="3">const <ptype>GLfloat</ptype> *<name>v</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glReplacementCodeuivSUN</name></proto>
>+            <param len="COMPSIZE()">const <ptype>GLuint</ptype> *<name>code</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glReplacementCodeusSUN</name></proto>
>+            <param><ptype>GLushort</ptype> <name>code</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glReplacementCodeusvSUN</name></proto>
>+            <param len="COMPSIZE()">const <ptype>GLushort</ptype> *<name>code</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glRequestResidentProgramsNV</name></proto>
>+            <param><ptype>GLsizei</ptype> <name>n</name></param>
>+            <param len="n">const <ptype>GLuint</ptype> *<name>programs</name></param>
>+            <glx type="render" opcode="4182"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glResetHistogram</name></proto>
>+            <param group="HistogramTargetEXT"><ptype>GLenum</ptype> <name>target</name></param>
>+            <glx type="render" opcode="4112"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glResetHistogramEXT</name></proto>
>+            <param group="HistogramTargetEXT"><ptype>GLenum</ptype> <name>target</name></param>
>+            <alias name="glResetHistogram"/>
>+            <glx type="render" opcode="4112"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glResetMinmax</name></proto>
>+            <param group="MinmaxTargetEXT"><ptype>GLenum</ptype> <name>target</name></param>
>+            <glx type="render" opcode="4113"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glResetMinmaxEXT</name></proto>
>+            <param group="MinmaxTargetEXT"><ptype>GLenum</ptype> <name>target</name></param>
>+            <alias name="glResetMinmax"/>
>+            <glx type="render" opcode="4113"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glResizeBuffersMESA</name></proto>
>+        </command>
>+        <command>
>+            <proto>void <name>glResolveDepthValuesNV</name></proto>
>+        </command>
>+        <command>
>+            <proto>void <name>glResolveMultisampleFramebufferAPPLE</name></proto>
>+        </command>
>+        <command>
>+            <proto>void <name>glResumeTransformFeedback</name></proto>
>+        </command>
>+        <command>
>+            <proto>void <name>glResumeTransformFeedbackNV</name></proto>
>+            <alias name="glResumeTransformFeedback"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glRotated</name></proto>
>+            <param><ptype>GLdouble</ptype> <name>angle</name></param>
>+            <param><ptype>GLdouble</ptype> <name>x</name></param>
>+            <param><ptype>GLdouble</ptype> <name>y</name></param>
>+            <param><ptype>GLdouble</ptype> <name>z</name></param>
>+            <glx type="render" opcode="185"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glRotatef</name></proto>
>+            <param><ptype>GLfloat</ptype> <name>angle</name></param>
>+            <param><ptype>GLfloat</ptype> <name>x</name></param>
>+            <param><ptype>GLfloat</ptype> <name>y</name></param>
>+            <param><ptype>GLfloat</ptype> <name>z</name></param>
>+            <glx type="render" opcode="186"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glRotatex</name></proto>
>+            <param><ptype>GLfixed</ptype> <name>angle</name></param>
>+            <param><ptype>GLfixed</ptype> <name>x</name></param>
>+            <param><ptype>GLfixed</ptype> <name>y</name></param>
>+            <param><ptype>GLfixed</ptype> <name>z</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glRotatexOES</name></proto>
>+            <param><ptype>GLfixed</ptype> <name>angle</name></param>
>+            <param><ptype>GLfixed</ptype> <name>x</name></param>
>+            <param><ptype>GLfixed</ptype> <name>y</name></param>
>+            <param><ptype>GLfixed</ptype> <name>z</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glSampleCoverage</name></proto>
>+            <param><ptype>GLfloat</ptype> <name>value</name></param>
>+            <param group="Boolean"><ptype>GLboolean</ptype> <name>invert</name></param>
>+            <glx type="render" opcode="229"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glSampleCoverageARB</name></proto>
>+            <param><ptype>GLfloat</ptype> <name>value</name></param>
>+            <param group="Boolean"><ptype>GLboolean</ptype> <name>invert</name></param>
>+            <alias name="glSampleCoverage"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glSampleCoveragex</name></proto>
>+            <param><ptype>GLclampx</ptype> <name>value</name></param>
>+            <param><ptype>GLboolean</ptype> <name>invert</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glSampleCoveragexOES</name></proto>
>+            <param><ptype>GLclampx</ptype> <name>value</name></param>
>+            <param><ptype>GLboolean</ptype> <name>invert</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glSampleMapATI</name></proto>
>+            <param><ptype>GLuint</ptype> <name>dst</name></param>
>+            <param><ptype>GLuint</ptype> <name>interp</name></param>
>+            <param group="SwizzleOpATI"><ptype>GLenum</ptype> <name>swizzle</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glSampleMaskEXT</name></proto>
>+            <param group="ClampedFloat32"><ptype>GLclampf</ptype> <name>value</name></param>
>+            <param group="Boolean"><ptype>GLboolean</ptype> <name>invert</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glSampleMaskIndexedNV</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param group="SampleMaskNV"><ptype>GLbitfield</ptype> <name>mask</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glSampleMaskSGIS</name></proto>
>+            <param group="ClampedFloat32"><ptype>GLclampf</ptype> <name>value</name></param>
>+            <param group="Boolean"><ptype>GLboolean</ptype> <name>invert</name></param>
>+            <alias name="glSampleMaskEXT"/>
>+            <glx type="render" opcode="2048"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glSampleMaski</name></proto>
>+            <param><ptype>GLuint</ptype> <name>maskNumber</name></param>
>+            <param><ptype>GLbitfield</ptype> <name>mask</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glSamplePatternEXT</name></proto>
>+            <param group="SamplePatternEXT"><ptype>GLenum</ptype> <name>pattern</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glSamplePatternSGIS</name></proto>
>+            <param group="SamplePatternSGIS"><ptype>GLenum</ptype> <name>pattern</name></param>
>+            <alias name="glSamplePatternEXT"/>
>+            <glx type="render" opcode="2049"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glSamplerParameterIiv</name></proto>
>+            <param><ptype>GLuint</ptype> <name>sampler</name></param>
>+            <param group="SamplerParameterName"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="COMPSIZE(pname)">const <ptype>GLint</ptype> *<name>param</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glSamplerParameterIivEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>sampler</name></param>
>+            <param group="SamplerParameterName"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="COMPSIZE(pname)">const <ptype>GLint</ptype> *<name>param</name></param>
>+            <alias name="glSamplerParameterIiv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glSamplerParameterIivOES</name></proto>
>+            <param><ptype>GLuint</ptype> <name>sampler</name></param>
>+            <param group="SamplerParameterName"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="COMPSIZE(pname)">const <ptype>GLint</ptype> *<name>param</name></param>
>+            <alias name="glSamplerParameterIiv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glSamplerParameterIuiv</name></proto>
>+            <param><ptype>GLuint</ptype> <name>sampler</name></param>
>+            <param group="SamplerParameterName"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="COMPSIZE(pname)">const <ptype>GLuint</ptype> *<name>param</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glSamplerParameterIuivEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>sampler</name></param>
>+            <param group="SamplerParameterName"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="COMPSIZE(pname)">const <ptype>GLuint</ptype> *<name>param</name></param>
>+            <alias name="glSamplerParameterIuiv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glSamplerParameterIuivOES</name></proto>
>+            <param><ptype>GLuint</ptype> <name>sampler</name></param>
>+            <param group="SamplerParameterName"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="COMPSIZE(pname)">const <ptype>GLuint</ptype> *<name>param</name></param>
>+            <alias name="glSamplerParameterIuiv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glSamplerParameterf</name></proto>
>+            <param><ptype>GLuint</ptype> <name>sampler</name></param>
>+            <param group="SamplerParameterName"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param><ptype>GLfloat</ptype> <name>param</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glSamplerParameterfv</name></proto>
>+            <param><ptype>GLuint</ptype> <name>sampler</name></param>
>+            <param group="SamplerParameterName"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="COMPSIZE(pname)">const <ptype>GLfloat</ptype> *<name>param</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glSamplerParameteri</name></proto>
>+            <param><ptype>GLuint</ptype> <name>sampler</name></param>
>+            <param group="SamplerParameterName"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param><ptype>GLint</ptype> <name>param</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glSamplerParameteriv</name></proto>
>+            <param><ptype>GLuint</ptype> <name>sampler</name></param>
>+            <param group="SamplerParameterName"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="COMPSIZE(pname)">const <ptype>GLint</ptype> *<name>param</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glScaled</name></proto>
>+            <param><ptype>GLdouble</ptype> <name>x</name></param>
>+            <param><ptype>GLdouble</ptype> <name>y</name></param>
>+            <param><ptype>GLdouble</ptype> <name>z</name></param>
>+            <glx type="render" opcode="187"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glScalef</name></proto>
>+            <param><ptype>GLfloat</ptype> <name>x</name></param>
>+            <param><ptype>GLfloat</ptype> <name>y</name></param>
>+            <param><ptype>GLfloat</ptype> <name>z</name></param>
>+            <glx type="render" opcode="188"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glScalex</name></proto>
>+            <param><ptype>GLfixed</ptype> <name>x</name></param>
>+            <param><ptype>GLfixed</ptype> <name>y</name></param>
>+            <param><ptype>GLfixed</ptype> <name>z</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glScalexOES</name></proto>
>+            <param><ptype>GLfixed</ptype> <name>x</name></param>
>+            <param><ptype>GLfixed</ptype> <name>y</name></param>
>+            <param><ptype>GLfixed</ptype> <name>z</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glScissor</name></proto>
>+            <param group="WinCoord"><ptype>GLint</ptype> <name>x</name></param>
>+            <param group="WinCoord"><ptype>GLint</ptype> <name>y</name></param>
>+            <param><ptype>GLsizei</ptype> <name>width</name></param>
>+            <param><ptype>GLsizei</ptype> <name>height</name></param>
>+            <glx type="render" opcode="103"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glScissorArrayv</name></proto>
>+            <param><ptype>GLuint</ptype> <name>first</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param len="COMPSIZE(count)">const <ptype>GLint</ptype> *<name>v</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glScissorArrayvNV</name></proto>
>+            <param><ptype>GLuint</ptype> <name>first</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param len="COMPSIZE(count)">const <ptype>GLint</ptype> *<name>v</name></param>
>+            <alias name="glScissorArrayv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glScissorArrayvOES</name></proto>
>+            <param><ptype>GLuint</ptype> <name>first</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param len="COMPSIZE(count)">const <ptype>GLint</ptype> *<name>v</name></param>
>+            <alias name="glScissorArrayv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glScissorIndexed</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param><ptype>GLint</ptype> <name>left</name></param>
>+            <param><ptype>GLint</ptype> <name>bottom</name></param>
>+            <param><ptype>GLsizei</ptype> <name>width</name></param>
>+            <param><ptype>GLsizei</ptype> <name>height</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glScissorIndexedNV</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param><ptype>GLint</ptype> <name>left</name></param>
>+            <param><ptype>GLint</ptype> <name>bottom</name></param>
>+            <param><ptype>GLsizei</ptype> <name>width</name></param>
>+            <param><ptype>GLsizei</ptype> <name>height</name></param>
>+            <alias name="glScissorIndexed"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glScissorIndexedOES</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param><ptype>GLint</ptype> <name>left</name></param>
>+            <param><ptype>GLint</ptype> <name>bottom</name></param>
>+            <param><ptype>GLsizei</ptype> <name>width</name></param>
>+            <param><ptype>GLsizei</ptype> <name>height</name></param>
>+            <alias name="glScissorIndexed"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glScissorIndexedv</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param len="4">const <ptype>GLint</ptype> *<name>v</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glScissorIndexedvNV</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param len="4">const <ptype>GLint</ptype> *<name>v</name></param>
>+            <alias name="glScissorIndexedv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glScissorIndexedvOES</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param len="4">const <ptype>GLint</ptype> *<name>v</name></param>
>+            <alias name="glScissorIndexedv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glSecondaryColor3b</name></proto>
>+            <param group="ColorB"><ptype>GLbyte</ptype> <name>red</name></param>
>+            <param group="ColorB"><ptype>GLbyte</ptype> <name>green</name></param>
>+            <param group="ColorB"><ptype>GLbyte</ptype> <name>blue</name></param>
>+            <vecequiv name="glSecondaryColor3bv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glSecondaryColor3bEXT</name></proto>
>+            <param group="ColorB"><ptype>GLbyte</ptype> <name>red</name></param>
>+            <param group="ColorB"><ptype>GLbyte</ptype> <name>green</name></param>
>+            <param group="ColorB"><ptype>GLbyte</ptype> <name>blue</name></param>
>+            <alias name="glSecondaryColor3b"/>
>+            <vecequiv name="glSecondaryColor3bvEXT"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glSecondaryColor3bv</name></proto>
>+            <param group="ColorB" len="3">const <ptype>GLbyte</ptype> *<name>v</name></param>
>+            <glx type="render" opcode="4126"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glSecondaryColor3bvEXT</name></proto>
>+            <param group="ColorB" len="3">const <ptype>GLbyte</ptype> *<name>v</name></param>
>+            <alias name="glSecondaryColor3bv"/>
>+            <glx type="render" opcode="4126"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glSecondaryColor3d</name></proto>
>+            <param group="ColorD"><ptype>GLdouble</ptype> <name>red</name></param>
>+            <param group="ColorD"><ptype>GLdouble</ptype> <name>green</name></param>
>+            <param group="ColorD"><ptype>GLdouble</ptype> <name>blue</name></param>
>+            <vecequiv name="glSecondaryColor3dv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glSecondaryColor3dEXT</name></proto>
>+            <param group="ColorD"><ptype>GLdouble</ptype> <name>red</name></param>
>+            <param group="ColorD"><ptype>GLdouble</ptype> <name>green</name></param>
>+            <param group="ColorD"><ptype>GLdouble</ptype> <name>blue</name></param>
>+            <alias name="glSecondaryColor3d"/>
>+            <vecequiv name="glSecondaryColor3dvEXT"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glSecondaryColor3dv</name></proto>
>+            <param group="ColorD" len="3">const <ptype>GLdouble</ptype> *<name>v</name></param>
>+            <glx type="render" opcode="4130"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glSecondaryColor3dvEXT</name></proto>
>+            <param group="ColorD" len="3">const <ptype>GLdouble</ptype> *<name>v</name></param>
>+            <alias name="glSecondaryColor3dv"/>
>+            <glx type="render" opcode="4130"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glSecondaryColor3f</name></proto>
>+            <param group="ColorF"><ptype>GLfloat</ptype> <name>red</name></param>
>+            <param group="ColorF"><ptype>GLfloat</ptype> <name>green</name></param>
>+            <param group="ColorF"><ptype>GLfloat</ptype> <name>blue</name></param>
>+            <vecequiv name="glSecondaryColor3fv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glSecondaryColor3fEXT</name></proto>
>+            <param group="ColorF"><ptype>GLfloat</ptype> <name>red</name></param>
>+            <param group="ColorF"><ptype>GLfloat</ptype> <name>green</name></param>
>+            <param group="ColorF"><ptype>GLfloat</ptype> <name>blue</name></param>
>+            <alias name="glSecondaryColor3f"/>
>+            <vecequiv name="glSecondaryColor3fvEXT"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glSecondaryColor3fv</name></proto>
>+            <param group="ColorF" len="3">const <ptype>GLfloat</ptype> *<name>v</name></param>
>+            <glx type="render" opcode="4129"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glSecondaryColor3fvEXT</name></proto>
>+            <param group="ColorF" len="3">const <ptype>GLfloat</ptype> *<name>v</name></param>
>+            <alias name="glSecondaryColor3fv"/>
>+            <glx type="render" opcode="4129"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glSecondaryColor3hNV</name></proto>
>+            <param group="Half16NV"><ptype>GLhalfNV</ptype> <name>red</name></param>
>+            <param group="Half16NV"><ptype>GLhalfNV</ptype> <name>green</name></param>
>+            <param group="Half16NV"><ptype>GLhalfNV</ptype> <name>blue</name></param>
>+            <vecequiv name="glSecondaryColor3hvNV"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glSecondaryColor3hvNV</name></proto>
>+            <param group="Half16NV" len="3">const <ptype>GLhalfNV</ptype> *<name>v</name></param>
>+            <glx type="render" opcode="4255"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glSecondaryColor3i</name></proto>
>+            <param group="ColorI"><ptype>GLint</ptype> <name>red</name></param>
>+            <param group="ColorI"><ptype>GLint</ptype> <name>green</name></param>
>+            <param group="ColorI"><ptype>GLint</ptype> <name>blue</name></param>
>+            <vecequiv name="glSecondaryColor3iv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glSecondaryColor3iEXT</name></proto>
>+            <param group="ColorI"><ptype>GLint</ptype> <name>red</name></param>
>+            <param group="ColorI"><ptype>GLint</ptype> <name>green</name></param>
>+            <param group="ColorI"><ptype>GLint</ptype> <name>blue</name></param>
>+            <alias name="glSecondaryColor3i"/>
>+            <vecequiv name="glSecondaryColor3ivEXT"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glSecondaryColor3iv</name></proto>
>+            <param group="ColorI" len="3">const <ptype>GLint</ptype> *<name>v</name></param>
>+            <glx type="render" opcode="4128"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glSecondaryColor3ivEXT</name></proto>
>+            <param group="ColorI" len="3">const <ptype>GLint</ptype> *<name>v</name></param>
>+            <alias name="glSecondaryColor3iv"/>
>+            <glx type="render" opcode="4128"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glSecondaryColor3s</name></proto>
>+            <param group="ColorS"><ptype>GLshort</ptype> <name>red</name></param>
>+            <param group="ColorS"><ptype>GLshort</ptype> <name>green</name></param>
>+            <param group="ColorS"><ptype>GLshort</ptype> <name>blue</name></param>
>+            <vecequiv name="glSecondaryColor3sv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glSecondaryColor3sEXT</name></proto>
>+            <param group="ColorS"><ptype>GLshort</ptype> <name>red</name></param>
>+            <param group="ColorS"><ptype>GLshort</ptype> <name>green</name></param>
>+            <param group="ColorS"><ptype>GLshort</ptype> <name>blue</name></param>
>+            <alias name="glSecondaryColor3s"/>
>+            <vecequiv name="glSecondaryColor3svEXT"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glSecondaryColor3sv</name></proto>
>+            <param group="ColorS" len="3">const <ptype>GLshort</ptype> *<name>v</name></param>
>+            <glx type="render" opcode="4127"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glSecondaryColor3svEXT</name></proto>
>+            <param group="ColorS" len="3">const <ptype>GLshort</ptype> *<name>v</name></param>
>+            <alias name="glSecondaryColor3sv"/>
>+            <glx type="render" opcode="4127"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glSecondaryColor3ub</name></proto>
>+            <param group="ColorUB"><ptype>GLubyte</ptype> <name>red</name></param>
>+            <param group="ColorUB"><ptype>GLubyte</ptype> <name>green</name></param>
>+            <param group="ColorUB"><ptype>GLubyte</ptype> <name>blue</name></param>
>+            <vecequiv name="glSecondaryColor3ubv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glSecondaryColor3ubEXT</name></proto>
>+            <param group="ColorUB"><ptype>GLubyte</ptype> <name>red</name></param>
>+            <param group="ColorUB"><ptype>GLubyte</ptype> <name>green</name></param>
>+            <param group="ColorUB"><ptype>GLubyte</ptype> <name>blue</name></param>
>+            <alias name="glSecondaryColor3ub"/>
>+            <vecequiv name="glSecondaryColor3ubvEXT"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glSecondaryColor3ubv</name></proto>
>+            <param group="ColorUB" len="3">const <ptype>GLubyte</ptype> *<name>v</name></param>
>+            <glx type="render" opcode="4131"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glSecondaryColor3ubvEXT</name></proto>
>+            <param group="ColorUB" len="3">const <ptype>GLubyte</ptype> *<name>v</name></param>
>+            <alias name="glSecondaryColor3ubv"/>
>+            <glx type="render" opcode="4131"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glSecondaryColor3ui</name></proto>
>+            <param group="ColorUI"><ptype>GLuint</ptype> <name>red</name></param>
>+            <param group="ColorUI"><ptype>GLuint</ptype> <name>green</name></param>
>+            <param group="ColorUI"><ptype>GLuint</ptype> <name>blue</name></param>
>+            <vecequiv name="glSecondaryColor3uiv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glSecondaryColor3uiEXT</name></proto>
>+            <param group="ColorUI"><ptype>GLuint</ptype> <name>red</name></param>
>+            <param group="ColorUI"><ptype>GLuint</ptype> <name>green</name></param>
>+            <param group="ColorUI"><ptype>GLuint</ptype> <name>blue</name></param>
>+            <alias name="glSecondaryColor3ui"/>
>+            <vecequiv name="glSecondaryColor3uivEXT"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glSecondaryColor3uiv</name></proto>
>+            <param group="ColorUI" len="3">const <ptype>GLuint</ptype> *<name>v</name></param>
>+            <glx type="render" opcode="4133"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glSecondaryColor3uivEXT</name></proto>
>+            <param group="ColorUI" len="3">const <ptype>GLuint</ptype> *<name>v</name></param>
>+            <alias name="glSecondaryColor3uiv"/>
>+            <glx type="render" opcode="4133"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glSecondaryColor3us</name></proto>
>+            <param group="ColorUS"><ptype>GLushort</ptype> <name>red</name></param>
>+            <param group="ColorUS"><ptype>GLushort</ptype> <name>green</name></param>
>+            <param group="ColorUS"><ptype>GLushort</ptype> <name>blue</name></param>
>+            <vecequiv name="glSecondaryColor3usv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glSecondaryColor3usEXT</name></proto>
>+            <param group="ColorUS"><ptype>GLushort</ptype> <name>red</name></param>
>+            <param group="ColorUS"><ptype>GLushort</ptype> <name>green</name></param>
>+            <param group="ColorUS"><ptype>GLushort</ptype> <name>blue</name></param>
>+            <alias name="glSecondaryColor3us"/>
>+            <vecequiv name="glSecondaryColor3usvEXT"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glSecondaryColor3usv</name></proto>
>+            <param group="ColorUS" len="3">const <ptype>GLushort</ptype> *<name>v</name></param>
>+            <glx type="render" opcode="4132"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glSecondaryColor3usvEXT</name></proto>
>+            <param group="ColorUS" len="3">const <ptype>GLushort</ptype> *<name>v</name></param>
>+            <alias name="glSecondaryColor3usv"/>
>+            <glx type="render" opcode="4132"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glSecondaryColorFormatNV</name></proto>
>+            <param><ptype>GLint</ptype> <name>size</name></param>
>+            <param group="ColorPointerType"><ptype>GLenum</ptype> <name>type</name></param>
>+            <param><ptype>GLsizei</ptype> <name>stride</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glSecondaryColorP3ui</name></proto>
>+            <param group="ColorPointerType"><ptype>GLenum</ptype> <name>type</name></param>
>+            <param><ptype>GLuint</ptype> <name>color</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glSecondaryColorP3uiv</name></proto>
>+            <param group="ColorPointerType"><ptype>GLenum</ptype> <name>type</name></param>
>+            <param len="1">const <ptype>GLuint</ptype> *<name>color</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glSecondaryColorPointer</name></proto>
>+            <param><ptype>GLint</ptype> <name>size</name></param>
>+            <param group="ColorPointerType"><ptype>GLenum</ptype> <name>type</name></param>
>+            <param><ptype>GLsizei</ptype> <name>stride</name></param>
>+            <param len="COMPSIZE(size,type,stride)">const void *<name>pointer</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glSecondaryColorPointerEXT</name></proto>
>+            <param><ptype>GLint</ptype> <name>size</name></param>
>+            <param group="ColorPointerType"><ptype>GLenum</ptype> <name>type</name></param>
>+            <param><ptype>GLsizei</ptype> <name>stride</name></param>
>+            <param len="COMPSIZE(size,type,stride)">const void *<name>pointer</name></param>
>+            <alias name="glSecondaryColorPointer"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glSecondaryColorPointerListIBM</name></proto>
>+            <param><ptype>GLint</ptype> <name>size</name></param>
>+            <param group="SecondaryColorPointerTypeIBM"><ptype>GLenum</ptype> <name>type</name></param>
>+            <param><ptype>GLint</ptype> <name>stride</name></param>
>+            <param len="COMPSIZE(size,type,stride)">const void **<name>pointer</name></param>
>+            <param><ptype>GLint</ptype> <name>ptrstride</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glSelectBuffer</name></proto>
>+            <param><ptype>GLsizei</ptype> <name>size</name></param>
>+            <param group="SelectName" len="size"><ptype>GLuint</ptype> *<name>buffer</name></param>
>+            <glx type="single" opcode="106"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glSelectPerfMonitorCountersAMD</name></proto>
>+            <param><ptype>GLuint</ptype> <name>monitor</name></param>
>+            <param group="Boolean"><ptype>GLboolean</ptype> <name>enable</name></param>
>+            <param><ptype>GLuint</ptype> <name>group</name></param>
>+            <param><ptype>GLint</ptype> <name>numCounters</name></param>
>+            <param len="numCounters"><ptype>GLuint</ptype> *<name>counterList</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glSemaphoreParameterui64vEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>semaphore</name></param>
>+            <param group="SemaphoreParameterName"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param>const <ptype>GLuint64</ptype> *<name>params</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glSeparableFilter2D</name></proto>
>+            <param group="SeparableTargetEXT"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="InternalFormat"><ptype>GLenum</ptype> <name>internalformat</name></param>
>+            <param><ptype>GLsizei</ptype> <name>width</name></param>
>+            <param><ptype>GLsizei</ptype> <name>height</name></param>
>+            <param group="PixelFormat"><ptype>GLenum</ptype> <name>format</name></param>
>+            <param group="PixelType"><ptype>GLenum</ptype> <name>type</name></param>
>+            <param len="COMPSIZE(target,format,type,width)">const void *<name>row</name></param>
>+            <param len="COMPSIZE(target,format,type,height)">const void *<name>column</name></param>
>+            <glx type="render" opcode="4109"/>
>+            <glx type="render" opcode="327" name="glSeparableFilter2DPBO" comment="PBO protocol"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glSeparableFilter2DEXT</name></proto>
>+            <param group="SeparableTargetEXT"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="InternalFormat"><ptype>GLenum</ptype> <name>internalformat</name></param>
>+            <param><ptype>GLsizei</ptype> <name>width</name></param>
>+            <param><ptype>GLsizei</ptype> <name>height</name></param>
>+            <param group="PixelFormat"><ptype>GLenum</ptype> <name>format</name></param>
>+            <param group="PixelType"><ptype>GLenum</ptype> <name>type</name></param>
>+            <param len="COMPSIZE(target,format,type,width)">const void *<name>row</name></param>
>+            <param len="COMPSIZE(target,format,type,height)">const void *<name>column</name></param>
>+            <alias name="glSeparableFilter2D"/>
>+            <glx type="render" opcode="4109"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glSetFenceAPPLE</name></proto>
>+            <param group="FenceNV"><ptype>GLuint</ptype> <name>fence</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glSetFenceNV</name></proto>
>+            <param group="FenceNV"><ptype>GLuint</ptype> <name>fence</name></param>
>+            <param group="FenceConditionNV"><ptype>GLenum</ptype> <name>condition</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glSetFragmentShaderConstantATI</name></proto>
>+            <param><ptype>GLuint</ptype> <name>dst</name></param>
>+            <param len="4">const <ptype>GLfloat</ptype> *<name>value</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glSetInvariantEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>id</name></param>
>+            <param group="ScalarType"><ptype>GLenum</ptype> <name>type</name></param>
>+            <param len="COMPSIZE(id,type)">const void *<name>addr</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glSetLocalConstantEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>id</name></param>
>+            <param group="ScalarType"><ptype>GLenum</ptype> <name>type</name></param>
>+            <param len="COMPSIZE(id,type)">const void *<name>addr</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glSetMultisamplefvAMD</name></proto>
>+            <param><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param len="2">const <ptype>GLfloat</ptype> *<name>val</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glShadeModel</name></proto>
>+            <param group="ShadingModel"><ptype>GLenum</ptype> <name>mode</name></param>
>+            <glx type="render" opcode="104"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glShaderBinary</name></proto>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param len="count">const <ptype>GLuint</ptype> *<name>shaders</name></param>
>+            <param><ptype>GLenum</ptype> <name>binaryformat</name></param>
>+            <param len="length">const void *<name>binary</name></param>
>+            <param><ptype>GLsizei</ptype> <name>length</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glShaderOp1EXT</name></proto>
>+            <param group="VertexShaderOpEXT"><ptype>GLenum</ptype> <name>op</name></param>
>+            <param><ptype>GLuint</ptype> <name>res</name></param>
>+            <param><ptype>GLuint</ptype> <name>arg1</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glShaderOp2EXT</name></proto>
>+            <param group="VertexShaderOpEXT"><ptype>GLenum</ptype> <name>op</name></param>
>+            <param><ptype>GLuint</ptype> <name>res</name></param>
>+            <param><ptype>GLuint</ptype> <name>arg1</name></param>
>+            <param><ptype>GLuint</ptype> <name>arg2</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glShaderOp3EXT</name></proto>
>+            <param group="VertexShaderOpEXT"><ptype>GLenum</ptype> <name>op</name></param>
>+            <param><ptype>GLuint</ptype> <name>res</name></param>
>+            <param><ptype>GLuint</ptype> <name>arg1</name></param>
>+            <param><ptype>GLuint</ptype> <name>arg2</name></param>
>+            <param><ptype>GLuint</ptype> <name>arg3</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glShaderSource</name></proto>
>+            <param><ptype>GLuint</ptype> <name>shader</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param len="count">const <ptype>GLchar</ptype> *const*<name>string</name></param>
>+            <param len="count">const <ptype>GLint</ptype> *<name>length</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glShaderSourceARB</name></proto>
>+            <param group="handleARB"><ptype>GLhandleARB</ptype> <name>shaderObj</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param len="count">const <ptype>GLcharARB</ptype> **<name>string</name></param>
>+            <param len="count">const <ptype>GLint</ptype> *<name>length</name></param>
>+            <alias name="glShaderSource"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glShaderStorageBlockBinding</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param><ptype>GLuint</ptype> <name>storageBlockIndex</name></param>
>+            <param><ptype>GLuint</ptype> <name>storageBlockBinding</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glSharpenTexFuncSGIS</name></proto>
>+            <param group="TextureTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param><ptype>GLsizei</ptype> <name>n</name></param>
>+            <param len="n*2">const <ptype>GLfloat</ptype> *<name>points</name></param>
>+            <glx type="render" opcode="2052"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glSignalSemaphoreEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>semaphore</name></param>
>+            <param><ptype>GLuint</ptype> <name>numBufferBarriers</name></param>
>+            <param len="COMPSIZE(numBufferBarriers)">const <ptype>GLuint</ptype> *<name>buffers</name></param>
>+            <param><ptype>GLuint</ptype> <name>numTextureBarriers</name></param>
>+            <param len="COMPSIZE(numTextureBarriers)">const <ptype>GLuint</ptype> *<name>textures</name></param>
>+            <param group="TextureLayout" len="COMPSIZE(numTextureBarriers)">const <ptype>GLenum</ptype> *<name>dstLayouts</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glSpecializeShader</name></proto>
>+            <param><ptype>GLuint</ptype> <name>shader</name></param>
>+            <param>const <ptype>GLchar</ptype> *<name>pEntryPoint</name></param>
>+            <param><ptype>GLuint</ptype> <name>numSpecializationConstants</name></param>
>+            <param>const <ptype>GLuint</ptype> *<name>pConstantIndex</name></param>
>+            <param>const <ptype>GLuint</ptype> *<name>pConstantValue</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glSpecializeShaderARB</name></proto>
>+            <param><ptype>GLuint</ptype> <name>shader</name></param>
>+            <param>const <ptype>GLchar</ptype> *<name>pEntryPoint</name></param>
>+            <param><ptype>GLuint</ptype> <name>numSpecializationConstants</name></param>
>+            <param>const <ptype>GLuint</ptype> *<name>pConstantIndex</name></param>
>+            <param>const <ptype>GLuint</ptype> *<name>pConstantValue</name></param>
>+            <alias name="glSpecializeShader"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glSpriteParameterfSGIX</name></proto>
>+            <param group="SpriteParameterNameSGIX"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param group="CheckedFloat32"><ptype>GLfloat</ptype> <name>param</name></param>
>+            <glx type="render" opcode="2060"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glSpriteParameterfvSGIX</name></proto>
>+            <param group="SpriteParameterNameSGIX"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param group="CheckedFloat32" len="COMPSIZE(pname)">const <ptype>GLfloat</ptype> *<name>params</name></param>
>+            <glx type="render" opcode="2061"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glSpriteParameteriSGIX</name></proto>
>+            <param group="SpriteParameterNameSGIX"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>param</name></param>
>+            <glx type="render" opcode="2062"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glSpriteParameterivSGIX</name></proto>
>+            <param group="SpriteParameterNameSGIX"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param group="CheckedInt32" len="COMPSIZE(pname)">const <ptype>GLint</ptype> *<name>params</name></param>
>+            <glx type="render" opcode="2063"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glStartInstrumentsSGIX</name></proto>
>+            <glx type="render" opcode="2069"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glStartTilingQCOM</name></proto>
>+            <param><ptype>GLuint</ptype> <name>x</name></param>
>+            <param><ptype>GLuint</ptype> <name>y</name></param>
>+            <param><ptype>GLuint</ptype> <name>width</name></param>
>+            <param><ptype>GLuint</ptype> <name>height</name></param>
>+            <param group="BufferBitQCOM"><ptype>GLbitfield</ptype> <name>preserveMask</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glStateCaptureNV</name></proto>
>+            <param><ptype>GLuint</ptype> <name>state</name></param>
>+            <param><ptype>GLenum</ptype> <name>mode</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glStencilClearTagEXT</name></proto>
>+            <param><ptype>GLsizei</ptype> <name>stencilTagBits</name></param>
>+            <param><ptype>GLuint</ptype> <name>stencilClearTag</name></param>
>+            <glx type="render" opcode="4223"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glStencilFillPathInstancedNV</name></proto>
>+            <param><ptype>GLsizei</ptype> <name>numPaths</name></param>
>+            <param group="PathElementType"><ptype>GLenum</ptype> <name>pathNameType</name></param>
>+            <param group="PathElement" len="COMPSIZE(numPaths,pathNameType,paths)">const void *<name>paths</name></param>
>+            <param group="Path"><ptype>GLuint</ptype> <name>pathBase</name></param>
>+            <param group="PathFillMode"><ptype>GLenum</ptype> <name>fillMode</name></param>
>+            <param group="MaskedStencilValue"><ptype>GLuint</ptype> <name>mask</name></param>
>+            <param group="PathTransformType"><ptype>GLenum</ptype> <name>transformType</name></param>
>+            <param len="COMPSIZE(numPaths,transformType)">const <ptype>GLfloat</ptype> *<name>transformValues</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glStencilFillPathNV</name></proto>
>+            <param group="Path"><ptype>GLuint</ptype> <name>path</name></param>
>+            <param group="PathFillMode"><ptype>GLenum</ptype> <name>fillMode</name></param>
>+            <param group="MaskedStencilValue"><ptype>GLuint</ptype> <name>mask</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glStencilFunc</name></proto>
>+            <param group="StencilFunction"><ptype>GLenum</ptype> <name>func</name></param>
>+            <param group="StencilValue"><ptype>GLint</ptype> <name>ref</name></param>
>+            <param group="MaskedStencilValue"><ptype>GLuint</ptype> <name>mask</name></param>
>+            <glx type="render" opcode="162"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glStencilFuncSeparate</name></proto>
>+            <param group="StencilFaceDirection"><ptype>GLenum</ptype> <name>face</name></param>
>+            <param group="StencilFunction"><ptype>GLenum</ptype> <name>func</name></param>
>+            <param group="StencilValue"><ptype>GLint</ptype> <name>ref</name></param>
>+            <param group="MaskedStencilValue"><ptype>GLuint</ptype> <name>mask</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glStencilFuncSeparateATI</name></proto>
>+            <param group="StencilFunction"><ptype>GLenum</ptype> <name>frontfunc</name></param>
>+            <param group="StencilFunction"><ptype>GLenum</ptype> <name>backfunc</name></param>
>+            <param group="ClampedStencilValue"><ptype>GLint</ptype> <name>ref</name></param>
>+            <param group="MaskedStencilValue"><ptype>GLuint</ptype> <name>mask</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glStencilMask</name></proto>
>+            <param group="MaskedStencilValue"><ptype>GLuint</ptype> <name>mask</name></param>
>+            <glx type="render" opcode="133"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glStencilMaskSeparate</name></proto>
>+            <param group="StencilFaceDirection"><ptype>GLenum</ptype> <name>face</name></param>
>+            <param group="MaskedStencilValue"><ptype>GLuint</ptype> <name>mask</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glStencilOp</name></proto>
>+            <param group="StencilOp"><ptype>GLenum</ptype> <name>fail</name></param>
>+            <param group="StencilOp"><ptype>GLenum</ptype> <name>zfail</name></param>
>+            <param group="StencilOp"><ptype>GLenum</ptype> <name>zpass</name></param>
>+            <glx type="render" opcode="163"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glStencilOpSeparate</name></proto>
>+            <param group="StencilFaceDirection"><ptype>GLenum</ptype> <name>face</name></param>
>+            <param group="StencilOp"><ptype>GLenum</ptype> <name>sfail</name></param>
>+            <param group="StencilOp"><ptype>GLenum</ptype> <name>dpfail</name></param>
>+            <param group="StencilOp"><ptype>GLenum</ptype> <name>dppass</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glStencilOpSeparateATI</name></proto>
>+            <param group="StencilFaceDirection"><ptype>GLenum</ptype> <name>face</name></param>
>+            <param group="StencilOp"><ptype>GLenum</ptype> <name>sfail</name></param>
>+            <param group="StencilOp"><ptype>GLenum</ptype> <name>dpfail</name></param>
>+            <param group="StencilOp"><ptype>GLenum</ptype> <name>dppass</name></param>
>+            <alias name="glStencilOpSeparate"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glStencilOpValueAMD</name></proto>
>+            <param group="StencilFaceDirection"><ptype>GLenum</ptype> <name>face</name></param>
>+            <param><ptype>GLuint</ptype> <name>value</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glStencilStrokePathInstancedNV</name></proto>
>+            <param><ptype>GLsizei</ptype> <name>numPaths</name></param>
>+            <param group="PathElementType"><ptype>GLenum</ptype> <name>pathNameType</name></param>
>+            <param group="PathElement" len="COMPSIZE(numPaths,pathNameType,paths)">const void *<name>paths</name></param>
>+            <param group="Path"><ptype>GLuint</ptype> <name>pathBase</name></param>
>+            <param group="StencilValue"><ptype>GLint</ptype> <name>reference</name></param>
>+            <param group="MaskedStencilValue"><ptype>GLuint</ptype> <name>mask</name></param>
>+            <param group="PathTransformType"><ptype>GLenum</ptype> <name>transformType</name></param>
>+            <param len="COMPSIZE(numPaths,transformType)">const <ptype>GLfloat</ptype> *<name>transformValues</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glStencilStrokePathNV</name></proto>
>+            <param group="Path"><ptype>GLuint</ptype> <name>path</name></param>
>+            <param group="StencilValue"><ptype>GLint</ptype> <name>reference</name></param>
>+            <param group="MaskedStencilValue"><ptype>GLuint</ptype> <name>mask</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glStencilThenCoverFillPathInstancedNV</name></proto>
>+            <param><ptype>GLsizei</ptype> <name>numPaths</name></param>
>+            <param><ptype>GLenum</ptype> <name>pathNameType</name></param>
>+            <param>const void *<name>paths</name></param>
>+            <param><ptype>GLuint</ptype> <name>pathBase</name></param>
>+            <param><ptype>GLenum</ptype> <name>fillMode</name></param>
>+            <param><ptype>GLuint</ptype> <name>mask</name></param>
>+            <param><ptype>GLenum</ptype> <name>coverMode</name></param>
>+            <param><ptype>GLenum</ptype> <name>transformType</name></param>
>+            <param>const <ptype>GLfloat</ptype> *<name>transformValues</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glStencilThenCoverFillPathNV</name></proto>
>+            <param><ptype>GLuint</ptype> <name>path</name></param>
>+            <param><ptype>GLenum</ptype> <name>fillMode</name></param>
>+            <param><ptype>GLuint</ptype> <name>mask</name></param>
>+            <param><ptype>GLenum</ptype> <name>coverMode</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glStencilThenCoverStrokePathInstancedNV</name></proto>
>+            <param><ptype>GLsizei</ptype> <name>numPaths</name></param>
>+            <param><ptype>GLenum</ptype> <name>pathNameType</name></param>
>+            <param>const void *<name>paths</name></param>
>+            <param><ptype>GLuint</ptype> <name>pathBase</name></param>
>+            <param><ptype>GLint</ptype> <name>reference</name></param>
>+            <param><ptype>GLuint</ptype> <name>mask</name></param>
>+            <param><ptype>GLenum</ptype> <name>coverMode</name></param>
>+            <param><ptype>GLenum</ptype> <name>transformType</name></param>
>+            <param>const <ptype>GLfloat</ptype> *<name>transformValues</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glStencilThenCoverStrokePathNV</name></proto>
>+            <param><ptype>GLuint</ptype> <name>path</name></param>
>+            <param><ptype>GLint</ptype> <name>reference</name></param>
>+            <param><ptype>GLuint</ptype> <name>mask</name></param>
>+            <param><ptype>GLenum</ptype> <name>coverMode</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glStopInstrumentsSGIX</name></proto>
>+            <param><ptype>GLint</ptype> <name>marker</name></param>
>+            <glx type="render" opcode="2070"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glStringMarkerGREMEDY</name></proto>
>+            <param><ptype>GLsizei</ptype> <name>len</name></param>
>+            <param len="len">const void *<name>string</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glSubpixelPrecisionBiasNV</name></proto>
>+            <param><ptype>GLuint</ptype> <name>xbits</name></param>
>+            <param><ptype>GLuint</ptype> <name>ybits</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glSwizzleEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>res</name></param>
>+            <param><ptype>GLuint</ptype> <name>in</name></param>
>+            <param group="VertexShaderCoordOutEXT"><ptype>GLenum</ptype> <name>outX</name></param>
>+            <param group="VertexShaderCoordOutEXT"><ptype>GLenum</ptype> <name>outY</name></param>
>+            <param group="VertexShaderCoordOutEXT"><ptype>GLenum</ptype> <name>outZ</name></param>
>+            <param group="VertexShaderCoordOutEXT"><ptype>GLenum</ptype> <name>outW</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glSyncTextureINTEL</name></proto>
>+            <param><ptype>GLuint</ptype> <name>texture</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glTagSampleBufferSGIX</name></proto>
>+            <glx type="render" opcode="2050"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glTangent3bEXT</name></proto>
>+            <param><ptype>GLbyte</ptype> <name>tx</name></param>
>+            <param><ptype>GLbyte</ptype> <name>ty</name></param>
>+            <param><ptype>GLbyte</ptype> <name>tz</name></param>
>+            <vecequiv name="glTangent3bvEXT"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glTangent3bvEXT</name></proto>
>+            <param len="3">const <ptype>GLbyte</ptype> *<name>v</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glTangent3dEXT</name></proto>
>+            <param group="CoordD"><ptype>GLdouble</ptype> <name>tx</name></param>
>+            <param group="CoordD"><ptype>GLdouble</ptype> <name>ty</name></param>
>+            <param group="CoordD"><ptype>GLdouble</ptype> <name>tz</name></param>
>+            <vecequiv name="glTangent3dvEXT"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glTangent3dvEXT</name></proto>
>+            <param group="CoordD" len="3">const <ptype>GLdouble</ptype> *<name>v</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glTangent3fEXT</name></proto>
>+            <param group="CoordF"><ptype>GLfloat</ptype> <name>tx</name></param>
>+            <param group="CoordF"><ptype>GLfloat</ptype> <name>ty</name></param>
>+            <param group="CoordF"><ptype>GLfloat</ptype> <name>tz</name></param>
>+            <vecequiv name="glTangent3fvEXT"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glTangent3fvEXT</name></proto>
>+            <param group="CoordF" len="3">const <ptype>GLfloat</ptype> *<name>v</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glTangent3iEXT</name></proto>
>+            <param><ptype>GLint</ptype> <name>tx</name></param>
>+            <param><ptype>GLint</ptype> <name>ty</name></param>
>+            <param><ptype>GLint</ptype> <name>tz</name></param>
>+            <vecequiv name="glTangent3ivEXT"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glTangent3ivEXT</name></proto>
>+            <param len="3">const <ptype>GLint</ptype> *<name>v</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glTangent3sEXT</name></proto>
>+            <param><ptype>GLshort</ptype> <name>tx</name></param>
>+            <param><ptype>GLshort</ptype> <name>ty</name></param>
>+            <param><ptype>GLshort</ptype> <name>tz</name></param>
>+            <vecequiv name="glTangent3svEXT"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glTangent3svEXT</name></proto>
>+            <param len="3">const <ptype>GLshort</ptype> *<name>v</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glTangentPointerEXT</name></proto>
>+            <param group="TangentPointerTypeEXT"><ptype>GLenum</ptype> <name>type</name></param>
>+            <param><ptype>GLsizei</ptype> <name>stride</name></param>
>+            <param len="COMPSIZE(type,stride)">const void *<name>pointer</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glTbufferMask3DFX</name></proto>
>+            <param><ptype>GLuint</ptype> <name>mask</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glTessellationFactorAMD</name></proto>
>+            <param><ptype>GLfloat</ptype> <name>factor</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glTessellationModeAMD</name></proto>
>+            <param><ptype>GLenum</ptype> <name>mode</name></param>
>+        </command>
>+        <command>
>+            <proto group="Boolean"><ptype>GLboolean</ptype> <name>glTestFenceAPPLE</name></proto>
>+            <param group="FenceNV"><ptype>GLuint</ptype> <name>fence</name></param>
>+        </command>
>+        <command>
>+            <proto group="Boolean"><ptype>GLboolean</ptype> <name>glTestFenceNV</name></proto>
>+            <param group="FenceNV"><ptype>GLuint</ptype> <name>fence</name></param>
>+            <glx type="vendor" opcode="1279"/>
>+        </command>
>+        <command>
>+            <proto group="Boolean"><ptype>GLboolean</ptype> <name>glTestObjectAPPLE</name></proto>
>+            <param group="ObjectTypeAPPLE"><ptype>GLenum</ptype> <name>object</name></param>
>+            <param><ptype>GLuint</ptype> <name>name</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glTexBuffer</name></proto>
>+            <param group="TextureTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="InternalFormat"><ptype>GLenum</ptype> <name>internalformat</name></param>
>+            <param><ptype>GLuint</ptype> <name>buffer</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glTexBufferARB</name></proto>
>+            <param group="TextureTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="InternalFormat"><ptype>GLenum</ptype> <name>internalformat</name></param>
>+            <param><ptype>GLuint</ptype> <name>buffer</name></param>
>+            <alias name="glTexBuffer"/>
>+            <glx type="render" opcode="367"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glTexBufferEXT</name></proto>
>+            <param group="TextureTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="InternalFormat"><ptype>GLenum</ptype> <name>internalformat</name></param>
>+            <param><ptype>GLuint</ptype> <name>buffer</name></param>
>+            <alias name="glTexBuffer"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glTexBufferOES</name></proto>
>+            <param group="TextureTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="InternalFormat"><ptype>GLenum</ptype> <name>internalformat</name></param>
>+            <param><ptype>GLuint</ptype> <name>buffer</name></param>
>+            <alias name="glTexBuffer"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glTexBufferRange</name></proto>
>+            <param group="TextureTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="InternalFormat"><ptype>GLenum</ptype> <name>internalformat</name></param>
>+            <param><ptype>GLuint</ptype> <name>buffer</name></param>
>+            <param group="BufferOffset"><ptype>GLintptr</ptype> <name>offset</name></param>
>+            <param group="BufferSize"><ptype>GLsizeiptr</ptype> <name>size</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glTexBufferRangeEXT</name></proto>
>+            <param group="TextureTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="InternalFormat"><ptype>GLenum</ptype> <name>internalformat</name></param>
>+            <param><ptype>GLuint</ptype> <name>buffer</name></param>
>+            <param group="BufferOffset"><ptype>GLintptr</ptype> <name>offset</name></param>
>+            <param group="BufferSize"><ptype>GLsizeiptr</ptype> <name>size</name></param>
>+            <alias name="glTexBufferRange"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glTexBufferRangeOES</name></proto>
>+            <param group="TextureTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="InternalFormat"><ptype>GLenum</ptype> <name>internalformat</name></param>
>+            <param><ptype>GLuint</ptype> <name>buffer</name></param>
>+            <param group="BufferOffset"><ptype>GLintptr</ptype> <name>offset</name></param>
>+            <param group="BufferSize"><ptype>GLsizeiptr</ptype> <name>size</name></param>
>+            <alias name="glTexBufferRange"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glTexBumpParameterfvATI</name></proto>
>+            <param group="TexBumpParameterATI"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="COMPSIZE(pname)">const <ptype>GLfloat</ptype> *<name>param</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glTexBumpParameterivATI</name></proto>
>+            <param group="TexBumpParameterATI"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="COMPSIZE(pname)">const <ptype>GLint</ptype> *<name>param</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glTexCoord1bOES</name></proto>
>+            <param><ptype>GLbyte</ptype> <name>s</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glTexCoord1bvOES</name></proto>
>+            <param len="1">const <ptype>GLbyte</ptype> *<name>coords</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glTexCoord1d</name></proto>
>+            <param group="CoordD"><ptype>GLdouble</ptype> <name>s</name></param>
>+            <vecequiv name="glTexCoord1dv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glTexCoord1dv</name></proto>
>+            <param group="CoordD" len="1">const <ptype>GLdouble</ptype> *<name>v</name></param>
>+            <glx type="render" opcode="49"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glTexCoord1f</name></proto>
>+            <param group="CoordF"><ptype>GLfloat</ptype> <name>s</name></param>
>+            <vecequiv name="glTexCoord1fv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glTexCoord1fv</name></proto>
>+            <param group="CoordF" len="1">const <ptype>GLfloat</ptype> *<name>v</name></param>
>+            <glx type="render" opcode="50"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glTexCoord1hNV</name></proto>
>+            <param group="Half16NV"><ptype>GLhalfNV</ptype> <name>s</name></param>
>+            <vecequiv name="glTexCoord1hvNV"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glTexCoord1hvNV</name></proto>
>+            <param group="Half16NV" len="1">const <ptype>GLhalfNV</ptype> *<name>v</name></param>
>+            <glx type="render" opcode="4246"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glTexCoord1i</name></proto>
>+            <param group="CoordI"><ptype>GLint</ptype> <name>s</name></param>
>+            <vecequiv name="glTexCoord1iv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glTexCoord1iv</name></proto>
>+            <param group="CoordI" len="1">const <ptype>GLint</ptype> *<name>v</name></param>
>+            <glx type="render" opcode="51"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glTexCoord1s</name></proto>
>+            <param group="CoordS"><ptype>GLshort</ptype> <name>s</name></param>
>+            <vecequiv name="glTexCoord1sv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glTexCoord1sv</name></proto>
>+            <param group="CoordS" len="1">const <ptype>GLshort</ptype> *<name>v</name></param>
>+            <glx type="render" opcode="52"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glTexCoord1xOES</name></proto>
>+            <param><ptype>GLfixed</ptype> <name>s</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glTexCoord1xvOES</name></proto>
>+            <param len="1">const <ptype>GLfixed</ptype> *<name>coords</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glTexCoord2bOES</name></proto>
>+            <param><ptype>GLbyte</ptype> <name>s</name></param>
>+            <param><ptype>GLbyte</ptype> <name>t</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glTexCoord2bvOES</name></proto>
>+            <param len="2">const <ptype>GLbyte</ptype> *<name>coords</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glTexCoord2d</name></proto>
>+            <param group="CoordD"><ptype>GLdouble</ptype> <name>s</name></param>
>+            <param group="CoordD"><ptype>GLdouble</ptype> <name>t</name></param>
>+            <vecequiv name="glTexCoord2dv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glTexCoord2dv</name></proto>
>+            <param group="CoordD" len="2">const <ptype>GLdouble</ptype> *<name>v</name></param>
>+            <glx type="render" opcode="53"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glTexCoord2f</name></proto>
>+            <param group="CoordF"><ptype>GLfloat</ptype> <name>s</name></param>
>+            <param group="CoordF"><ptype>GLfloat</ptype> <name>t</name></param>
>+            <vecequiv name="glTexCoord2fv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glTexCoord2fColor3fVertex3fSUN</name></proto>
>+            <param><ptype>GLfloat</ptype> <name>s</name></param>
>+            <param><ptype>GLfloat</ptype> <name>t</name></param>
>+            <param><ptype>GLfloat</ptype> <name>r</name></param>
>+            <param><ptype>GLfloat</ptype> <name>g</name></param>
>+            <param><ptype>GLfloat</ptype> <name>b</name></param>
>+            <param><ptype>GLfloat</ptype> <name>x</name></param>
>+            <param><ptype>GLfloat</ptype> <name>y</name></param>
>+            <param><ptype>GLfloat</ptype> <name>z</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glTexCoord2fColor3fVertex3fvSUN</name></proto>
>+            <param len="2">const <ptype>GLfloat</ptype> *<name>tc</name></param>
>+            <param len="3">const <ptype>GLfloat</ptype> *<name>c</name></param>
>+            <param len="3">const <ptype>GLfloat</ptype> *<name>v</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glTexCoord2fColor4fNormal3fVertex3fSUN</name></proto>
>+            <param><ptype>GLfloat</ptype> <name>s</name></param>
>+            <param><ptype>GLfloat</ptype> <name>t</name></param>
>+            <param><ptype>GLfloat</ptype> <name>r</name></param>
>+            <param><ptype>GLfloat</ptype> <name>g</name></param>
>+            <param><ptype>GLfloat</ptype> <name>b</name></param>
>+            <param><ptype>GLfloat</ptype> <name>a</name></param>
>+            <param><ptype>GLfloat</ptype> <name>nx</name></param>
>+            <param><ptype>GLfloat</ptype> <name>ny</name></param>
>+            <param><ptype>GLfloat</ptype> <name>nz</name></param>
>+            <param><ptype>GLfloat</ptype> <name>x</name></param>
>+            <param><ptype>GLfloat</ptype> <name>y</name></param>
>+            <param><ptype>GLfloat</ptype> <name>z</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glTexCoord2fColor4fNormal3fVertex3fvSUN</name></proto>
>+            <param len="2">const <ptype>GLfloat</ptype> *<name>tc</name></param>
>+            <param len="4">const <ptype>GLfloat</ptype> *<name>c</name></param>
>+            <param len="3">const <ptype>GLfloat</ptype> *<name>n</name></param>
>+            <param len="3">const <ptype>GLfloat</ptype> *<name>v</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glTexCoord2fColor4ubVertex3fSUN</name></proto>
>+            <param><ptype>GLfloat</ptype> <name>s</name></param>
>+            <param><ptype>GLfloat</ptype> <name>t</name></param>
>+            <param><ptype>GLubyte</ptype> <name>r</name></param>
>+            <param><ptype>GLubyte</ptype> <name>g</name></param>
>+            <param><ptype>GLubyte</ptype> <name>b</name></param>
>+            <param><ptype>GLubyte</ptype> <name>a</name></param>
>+            <param><ptype>GLfloat</ptype> <name>x</name></param>
>+            <param><ptype>GLfloat</ptype> <name>y</name></param>
>+            <param><ptype>GLfloat</ptype> <name>z</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glTexCoord2fColor4ubVertex3fvSUN</name></proto>
>+            <param len="2">const <ptype>GLfloat</ptype> *<name>tc</name></param>
>+            <param len="4">const <ptype>GLubyte</ptype> *<name>c</name></param>
>+            <param len="3">const <ptype>GLfloat</ptype> *<name>v</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glTexCoord2fNormal3fVertex3fSUN</name></proto>
>+            <param><ptype>GLfloat</ptype> <name>s</name></param>
>+            <param><ptype>GLfloat</ptype> <name>t</name></param>
>+            <param><ptype>GLfloat</ptype> <name>nx</name></param>
>+            <param><ptype>GLfloat</ptype> <name>ny</name></param>
>+            <param><ptype>GLfloat</ptype> <name>nz</name></param>
>+            <param><ptype>GLfloat</ptype> <name>x</name></param>
>+            <param><ptype>GLfloat</ptype> <name>y</name></param>
>+            <param><ptype>GLfloat</ptype> <name>z</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glTexCoord2fNormal3fVertex3fvSUN</name></proto>
>+            <param len="2">const <ptype>GLfloat</ptype> *<name>tc</name></param>
>+            <param len="3">const <ptype>GLfloat</ptype> *<name>n</name></param>
>+            <param len="3">const <ptype>GLfloat</ptype> *<name>v</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glTexCoord2fVertex3fSUN</name></proto>
>+            <param><ptype>GLfloat</ptype> <name>s</name></param>
>+            <param><ptype>GLfloat</ptype> <name>t</name></param>
>+            <param><ptype>GLfloat</ptype> <name>x</name></param>
>+            <param><ptype>GLfloat</ptype> <name>y</name></param>
>+            <param><ptype>GLfloat</ptype> <name>z</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glTexCoord2fVertex3fvSUN</name></proto>
>+            <param len="2">const <ptype>GLfloat</ptype> *<name>tc</name></param>
>+            <param len="3">const <ptype>GLfloat</ptype> *<name>v</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glTexCoord2fv</name></proto>
>+            <param group="CoordF" len="2">const <ptype>GLfloat</ptype> *<name>v</name></param>
>+            <glx type="render" opcode="54"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glTexCoord2hNV</name></proto>
>+            <param group="Half16NV"><ptype>GLhalfNV</ptype> <name>s</name></param>
>+            <param group="Half16NV"><ptype>GLhalfNV</ptype> <name>t</name></param>
>+            <vecequiv name="glTexCoord2hvNV"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glTexCoord2hvNV</name></proto>
>+            <param group="Half16NV" len="2">const <ptype>GLhalfNV</ptype> *<name>v</name></param>
>+            <glx type="render" opcode="4247"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glTexCoord2i</name></proto>
>+            <param group="CoordI"><ptype>GLint</ptype> <name>s</name></param>
>+            <param group="CoordI"><ptype>GLint</ptype> <name>t</name></param>
>+            <vecequiv name="glTexCoord2iv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glTexCoord2iv</name></proto>
>+            <param group="CoordI" len="2">const <ptype>GLint</ptype> *<name>v</name></param>
>+            <glx type="render" opcode="55"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glTexCoord2s</name></proto>
>+            <param group="CoordS"><ptype>GLshort</ptype> <name>s</name></param>
>+            <param group="CoordS"><ptype>GLshort</ptype> <name>t</name></param>
>+            <vecequiv name="glTexCoord2sv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glTexCoord2sv</name></proto>
>+            <param group="CoordS" len="2">const <ptype>GLshort</ptype> *<name>v</name></param>
>+            <glx type="render" opcode="56"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glTexCoord2xOES</name></proto>
>+            <param><ptype>GLfixed</ptype> <name>s</name></param>
>+            <param><ptype>GLfixed</ptype> <name>t</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glTexCoord2xvOES</name></proto>
>+            <param len="2">const <ptype>GLfixed</ptype> *<name>coords</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glTexCoord3bOES</name></proto>
>+            <param><ptype>GLbyte</ptype> <name>s</name></param>
>+            <param><ptype>GLbyte</ptype> <name>t</name></param>
>+            <param><ptype>GLbyte</ptype> <name>r</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glTexCoord3bvOES</name></proto>
>+            <param len="3">const <ptype>GLbyte</ptype> *<name>coords</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glTexCoord3d</name></proto>
>+            <param group="CoordD"><ptype>GLdouble</ptype> <name>s</name></param>
>+            <param group="CoordD"><ptype>GLdouble</ptype> <name>t</name></param>
>+            <param group="CoordD"><ptype>GLdouble</ptype> <name>r</name></param>
>+            <vecequiv name="glTexCoord3dv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glTexCoord3dv</name></proto>
>+            <param group="CoordD" len="3">const <ptype>GLdouble</ptype> *<name>v</name></param>
>+            <glx type="render" opcode="57"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glTexCoord3f</name></proto>
>+            <param group="CoordF"><ptype>GLfloat</ptype> <name>s</name></param>
>+            <param group="CoordF"><ptype>GLfloat</ptype> <name>t</name></param>
>+            <param group="CoordF"><ptype>GLfloat</ptype> <name>r</name></param>
>+            <vecequiv name="glTexCoord3fv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glTexCoord3fv</name></proto>
>+            <param group="CoordF" len="3">const <ptype>GLfloat</ptype> *<name>v</name></param>
>+            <glx type="render" opcode="58"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glTexCoord3hNV</name></proto>
>+            <param group="Half16NV"><ptype>GLhalfNV</ptype> <name>s</name></param>
>+            <param group="Half16NV"><ptype>GLhalfNV</ptype> <name>t</name></param>
>+            <param group="Half16NV"><ptype>GLhalfNV</ptype> <name>r</name></param>
>+            <vecequiv name="glTexCoord3hvNV"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glTexCoord3hvNV</name></proto>
>+            <param group="Half16NV" len="3">const <ptype>GLhalfNV</ptype> *<name>v</name></param>
>+            <glx type="render" opcode="4248"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glTexCoord3i</name></proto>
>+            <param group="CoordI"><ptype>GLint</ptype> <name>s</name></param>
>+            <param group="CoordI"><ptype>GLint</ptype> <name>t</name></param>
>+            <param group="CoordI"><ptype>GLint</ptype> <name>r</name></param>
>+            <vecequiv name="glTexCoord3iv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glTexCoord3iv</name></proto>
>+            <param group="CoordI" len="3">const <ptype>GLint</ptype> *<name>v</name></param>
>+            <glx type="render" opcode="59"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glTexCoord3s</name></proto>
>+            <param group="CoordS"><ptype>GLshort</ptype> <name>s</name></param>
>+            <param group="CoordS"><ptype>GLshort</ptype> <name>t</name></param>
>+            <param group="CoordS"><ptype>GLshort</ptype> <name>r</name></param>
>+            <vecequiv name="glTexCoord3sv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glTexCoord3sv</name></proto>
>+            <param group="CoordS" len="3">const <ptype>GLshort</ptype> *<name>v</name></param>
>+            <glx type="render" opcode="60"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glTexCoord3xOES</name></proto>
>+            <param><ptype>GLfixed</ptype> <name>s</name></param>
>+            <param><ptype>GLfixed</ptype> <name>t</name></param>
>+            <param><ptype>GLfixed</ptype> <name>r</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glTexCoord3xvOES</name></proto>
>+            <param len="3">const <ptype>GLfixed</ptype> *<name>coords</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glTexCoord4bOES</name></proto>
>+            <param><ptype>GLbyte</ptype> <name>s</name></param>
>+            <param><ptype>GLbyte</ptype> <name>t</name></param>
>+            <param><ptype>GLbyte</ptype> <name>r</name></param>
>+            <param><ptype>GLbyte</ptype> <name>q</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glTexCoord4bvOES</name></proto>
>+            <param len="4">const <ptype>GLbyte</ptype> *<name>coords</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glTexCoord4d</name></proto>
>+            <param group="CoordD"><ptype>GLdouble</ptype> <name>s</name></param>
>+            <param group="CoordD"><ptype>GLdouble</ptype> <name>t</name></param>
>+            <param group="CoordD"><ptype>GLdouble</ptype> <name>r</name></param>
>+            <param group="CoordD"><ptype>GLdouble</ptype> <name>q</name></param>
>+            <vecequiv name="glTexCoord4dv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glTexCoord4dv</name></proto>
>+            <param group="CoordD" len="4">const <ptype>GLdouble</ptype> *<name>v</name></param>
>+            <glx type="render" opcode="61"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glTexCoord4f</name></proto>
>+            <param group="CoordF"><ptype>GLfloat</ptype> <name>s</name></param>
>+            <param group="CoordF"><ptype>GLfloat</ptype> <name>t</name></param>
>+            <param group="CoordF"><ptype>GLfloat</ptype> <name>r</name></param>
>+            <param group="CoordF"><ptype>GLfloat</ptype> <name>q</name></param>
>+            <vecequiv name="glTexCoord4fv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glTexCoord4fColor4fNormal3fVertex4fSUN</name></proto>
>+            <param><ptype>GLfloat</ptype> <name>s</name></param>
>+            <param><ptype>GLfloat</ptype> <name>t</name></param>
>+            <param><ptype>GLfloat</ptype> <name>p</name></param>
>+            <param><ptype>GLfloat</ptype> <name>q</name></param>
>+            <param><ptype>GLfloat</ptype> <name>r</name></param>
>+            <param><ptype>GLfloat</ptype> <name>g</name></param>
>+            <param><ptype>GLfloat</ptype> <name>b</name></param>
>+            <param><ptype>GLfloat</ptype> <name>a</name></param>
>+            <param><ptype>GLfloat</ptype> <name>nx</name></param>
>+            <param><ptype>GLfloat</ptype> <name>ny</name></param>
>+            <param><ptype>GLfloat</ptype> <name>nz</name></param>
>+            <param><ptype>GLfloat</ptype> <name>x</name></param>
>+            <param><ptype>GLfloat</ptype> <name>y</name></param>
>+            <param><ptype>GLfloat</ptype> <name>z</name></param>
>+            <param><ptype>GLfloat</ptype> <name>w</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glTexCoord4fColor4fNormal3fVertex4fvSUN</name></proto>
>+            <param len="4">const <ptype>GLfloat</ptype> *<name>tc</name></param>
>+            <param len="4">const <ptype>GLfloat</ptype> *<name>c</name></param>
>+            <param len="3">const <ptype>GLfloat</ptype> *<name>n</name></param>
>+            <param len="4">const <ptype>GLfloat</ptype> *<name>v</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glTexCoord4fVertex4fSUN</name></proto>
>+            <param><ptype>GLfloat</ptype> <name>s</name></param>
>+            <param><ptype>GLfloat</ptype> <name>t</name></param>
>+            <param><ptype>GLfloat</ptype> <name>p</name></param>
>+            <param><ptype>GLfloat</ptype> <name>q</name></param>
>+            <param><ptype>GLfloat</ptype> <name>x</name></param>
>+            <param><ptype>GLfloat</ptype> <name>y</name></param>
>+            <param><ptype>GLfloat</ptype> <name>z</name></param>
>+            <param><ptype>GLfloat</ptype> <name>w</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glTexCoord4fVertex4fvSUN</name></proto>
>+            <param len="4">const <ptype>GLfloat</ptype> *<name>tc</name></param>
>+            <param len="4">const <ptype>GLfloat</ptype> *<name>v</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glTexCoord4fv</name></proto>
>+            <param group="CoordF" len="4">const <ptype>GLfloat</ptype> *<name>v</name></param>
>+            <glx type="render" opcode="62"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glTexCoord4hNV</name></proto>
>+            <param group="Half16NV"><ptype>GLhalfNV</ptype> <name>s</name></param>
>+            <param group="Half16NV"><ptype>GLhalfNV</ptype> <name>t</name></param>
>+            <param group="Half16NV"><ptype>GLhalfNV</ptype> <name>r</name></param>
>+            <param group="Half16NV"><ptype>GLhalfNV</ptype> <name>q</name></param>
>+            <vecequiv name="glTexCoord4hvNV"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glTexCoord4hvNV</name></proto>
>+            <param group="Half16NV" len="4">const <ptype>GLhalfNV</ptype> *<name>v</name></param>
>+            <glx type="render" opcode="4249"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glTexCoord4i</name></proto>
>+            <param group="CoordI"><ptype>GLint</ptype> <name>s</name></param>
>+            <param group="CoordI"><ptype>GLint</ptype> <name>t</name></param>
>+            <param group="CoordI"><ptype>GLint</ptype> <name>r</name></param>
>+            <param group="CoordI"><ptype>GLint</ptype> <name>q</name></param>
>+            <vecequiv name="glTexCoord4iv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glTexCoord4iv</name></proto>
>+            <param group="CoordI" len="4">const <ptype>GLint</ptype> *<name>v</name></param>
>+            <glx type="render" opcode="63"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glTexCoord4s</name></proto>
>+            <param group="CoordS"><ptype>GLshort</ptype> <name>s</name></param>
>+            <param group="CoordS"><ptype>GLshort</ptype> <name>t</name></param>
>+            <param group="CoordS"><ptype>GLshort</ptype> <name>r</name></param>
>+            <param group="CoordS"><ptype>GLshort</ptype> <name>q</name></param>
>+            <vecequiv name="glTexCoord4sv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glTexCoord4sv</name></proto>
>+            <param group="CoordS" len="4">const <ptype>GLshort</ptype> *<name>v</name></param>
>+            <glx type="render" opcode="64"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glTexCoord4xOES</name></proto>
>+            <param><ptype>GLfixed</ptype> <name>s</name></param>
>+            <param><ptype>GLfixed</ptype> <name>t</name></param>
>+            <param><ptype>GLfixed</ptype> <name>r</name></param>
>+            <param><ptype>GLfixed</ptype> <name>q</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glTexCoord4xvOES</name></proto>
>+            <param len="4">const <ptype>GLfixed</ptype> *<name>coords</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glTexCoordFormatNV</name></proto>
>+            <param><ptype>GLint</ptype> <name>size</name></param>
>+            <param><ptype>GLenum</ptype> <name>type</name></param>
>+            <param><ptype>GLsizei</ptype> <name>stride</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glTexCoordP1ui</name></proto>
>+            <param group="TexCoordPointerType"><ptype>GLenum</ptype> <name>type</name></param>
>+            <param><ptype>GLuint</ptype> <name>coords</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glTexCoordP1uiv</name></proto>
>+            <param group="TexCoordPointerType"><ptype>GLenum</ptype> <name>type</name></param>
>+            <param len="1">const <ptype>GLuint</ptype> *<name>coords</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glTexCoordP2ui</name></proto>
>+            <param group="TexCoordPointerType"><ptype>GLenum</ptype> <name>type</name></param>
>+            <param><ptype>GLuint</ptype> <name>coords</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glTexCoordP2uiv</name></proto>
>+            <param group="TexCoordPointerType"><ptype>GLenum</ptype> <name>type</name></param>
>+            <param len="1">const <ptype>GLuint</ptype> *<name>coords</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glTexCoordP3ui</name></proto>
>+            <param group="TexCoordPointerType"><ptype>GLenum</ptype> <name>type</name></param>
>+            <param><ptype>GLuint</ptype> <name>coords</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glTexCoordP3uiv</name></proto>
>+            <param group="TexCoordPointerType"><ptype>GLenum</ptype> <name>type</name></param>
>+            <param len="1">const <ptype>GLuint</ptype> *<name>coords</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glTexCoordP4ui</name></proto>
>+            <param group="TexCoordPointerType"><ptype>GLenum</ptype> <name>type</name></param>
>+            <param><ptype>GLuint</ptype> <name>coords</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glTexCoordP4uiv</name></proto>
>+            <param group="TexCoordPointerType"><ptype>GLenum</ptype> <name>type</name></param>
>+            <param len="1">const <ptype>GLuint</ptype> *<name>coords</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glTexCoordPointer</name></proto>
>+            <param><ptype>GLint</ptype> <name>size</name></param>
>+            <param group="TexCoordPointerType"><ptype>GLenum</ptype> <name>type</name></param>
>+            <param><ptype>GLsizei</ptype> <name>stride</name></param>
>+            <param len="COMPSIZE(size,type,stride)">const void *<name>pointer</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glTexCoordPointerEXT</name></proto>
>+            <param><ptype>GLint</ptype> <name>size</name></param>
>+            <param group="TexCoordPointerType"><ptype>GLenum</ptype> <name>type</name></param>
>+            <param><ptype>GLsizei</ptype> <name>stride</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param len="COMPSIZE(size,type,stride,count)">const void *<name>pointer</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glTexCoordPointerListIBM</name></proto>
>+            <param><ptype>GLint</ptype> <name>size</name></param>
>+            <param group="TexCoordPointerType"><ptype>GLenum</ptype> <name>type</name></param>
>+            <param><ptype>GLint</ptype> <name>stride</name></param>
>+            <param len="COMPSIZE(size,type,stride)">const void **<name>pointer</name></param>
>+            <param><ptype>GLint</ptype> <name>ptrstride</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glTexCoordPointervINTEL</name></proto>
>+            <param><ptype>GLint</ptype> <name>size</name></param>
>+            <param group="VertexPointerType"><ptype>GLenum</ptype> <name>type</name></param>
>+            <param len="4">const void **<name>pointer</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glTexEnvf</name></proto>
>+            <param group="TextureEnvTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="TextureEnvParameter"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param group="CheckedFloat32"><ptype>GLfloat</ptype> <name>param</name></param>
>+            <glx type="render" opcode="111"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glTexEnvfv</name></proto>
>+            <param group="TextureEnvTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="TextureEnvParameter"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param group="CheckedFloat32" len="COMPSIZE(pname)">const <ptype>GLfloat</ptype> *<name>params</name></param>
>+            <glx type="render" opcode="112"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glTexEnvi</name></proto>
>+            <param group="TextureEnvTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="TextureEnvParameter"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>param</name></param>
>+            <glx type="render" opcode="113"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glTexEnviv</name></proto>
>+            <param group="TextureEnvTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="TextureEnvParameter"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param group="CheckedInt32" len="COMPSIZE(pname)">const <ptype>GLint</ptype> *<name>params</name></param>
>+            <glx type="render" opcode="114"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glTexEnvx</name></proto>
>+            <param group="TextureEnvTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="TextureEnvParameter"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param><ptype>GLfixed</ptype> <name>param</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glTexEnvxOES</name></proto>
>+            <param group="TextureEnvTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="TextureEnvParameter"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param><ptype>GLfixed</ptype> <name>param</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glTexEnvxv</name></proto>
>+            <param group="TextureEnvTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="TextureEnvParameter"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="COMPSIZE(pname)">const <ptype>GLfixed</ptype> *<name>params</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glTexEnvxvOES</name></proto>
>+            <param group="TextureEnvTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="TextureEnvParameter"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="COMPSIZE(pname)">const <ptype>GLfixed</ptype> *<name>params</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glTexFilterFuncSGIS</name></proto>
>+            <param group="TextureTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="TextureFilterSGIS"><ptype>GLenum</ptype> <name>filter</name></param>
>+            <param><ptype>GLsizei</ptype> <name>n</name></param>
>+            <param len="n">const <ptype>GLfloat</ptype> *<name>weights</name></param>
>+            <glx type="render" opcode="2064"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glTexGend</name></proto>
>+            <param group="TextureCoordName"><ptype>GLenum</ptype> <name>coord</name></param>
>+            <param group="TextureGenParameter"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param><ptype>GLdouble</ptype> <name>param</name></param>
>+            <glx type="render" opcode="115"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glTexGendv</name></proto>
>+            <param group="TextureCoordName"><ptype>GLenum</ptype> <name>coord</name></param>
>+            <param group="TextureGenParameter"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="COMPSIZE(pname)">const <ptype>GLdouble</ptype> *<name>params</name></param>
>+            <glx type="render" opcode="116"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glTexGenf</name></proto>
>+            <param group="TextureCoordName"><ptype>GLenum</ptype> <name>coord</name></param>
>+            <param group="TextureGenParameter"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param group="CheckedFloat32"><ptype>GLfloat</ptype> <name>param</name></param>
>+            <glx type="render" opcode="117"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glTexGenfOES</name></proto>
>+            <param group="TextureCoordName"><ptype>GLenum</ptype> <name>coord</name></param>
>+            <param group="TextureGenParameter"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param><ptype>GLfloat</ptype> <name>param</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glTexGenfv</name></proto>
>+            <param group="TextureCoordName"><ptype>GLenum</ptype> <name>coord</name></param>
>+            <param group="TextureGenParameter"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param group="CheckedFloat32" len="COMPSIZE(pname)">const <ptype>GLfloat</ptype> *<name>params</name></param>
>+            <glx type="render" opcode="118"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glTexGenfvOES</name></proto>
>+            <param group="TextureCoordName"><ptype>GLenum</ptype> <name>coord</name></param>
>+            <param group="TextureGenParameter"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="COMPSIZE(pname)">const <ptype>GLfloat</ptype> *<name>params</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glTexGeni</name></proto>
>+            <param group="TextureCoordName"><ptype>GLenum</ptype> <name>coord</name></param>
>+            <param group="TextureGenParameter"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>param</name></param>
>+            <glx type="render" opcode="119"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glTexGeniOES</name></proto>
>+            <param group="TextureCoordName"><ptype>GLenum</ptype> <name>coord</name></param>
>+            <param group="TextureGenParameter"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param><ptype>GLint</ptype> <name>param</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glTexGeniv</name></proto>
>+            <param group="TextureCoordName"><ptype>GLenum</ptype> <name>coord</name></param>
>+            <param group="TextureGenParameter"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param group="CheckedInt32" len="COMPSIZE(pname)">const <ptype>GLint</ptype> *<name>params</name></param>
>+            <glx type="render" opcode="120"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glTexGenivOES</name></proto>
>+            <param group="TextureCoordName"><ptype>GLenum</ptype> <name>coord</name></param>
>+            <param group="TextureGenParameter"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="COMPSIZE(pname)">const <ptype>GLint</ptype> *<name>params</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glTexGenxOES</name></proto>
>+            <param group="TextureCoordName"><ptype>GLenum</ptype> <name>coord</name></param>
>+            <param group="TextureGenParameter"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param><ptype>GLfixed</ptype> <name>param</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glTexGenxvOES</name></proto>
>+            <param group="TextureCoordName"><ptype>GLenum</ptype> <name>coord</name></param>
>+            <param group="TextureGenParameter"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="COMPSIZE(pname)">const <ptype>GLfixed</ptype> *<name>params</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glTexImage1D</name></proto>
>+            <param group="TextureTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>level</name></param>
>+            <param group="InternalFormat"><ptype>GLint</ptype> <name>internalformat</name></param>
>+            <param><ptype>GLsizei</ptype> <name>width</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>border</name></param>
>+            <param group="PixelFormat"><ptype>GLenum</ptype> <name>format</name></param>
>+            <param group="PixelType"><ptype>GLenum</ptype> <name>type</name></param>
>+            <param len="COMPSIZE(format,type,width)">const void *<name>pixels</name></param>
>+            <glx type="render" opcode="109"/>
>+            <glx type="render" opcode="328" name="glTexImage1DPBO" comment="PBO protocol"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glTexImage2D</name></proto>
>+            <param group="TextureTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>level</name></param>
>+            <param group="InternalFormat"><ptype>GLint</ptype> <name>internalformat</name></param>
>+            <param><ptype>GLsizei</ptype> <name>width</name></param>
>+            <param><ptype>GLsizei</ptype> <name>height</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>border</name></param>
>+            <param group="PixelFormat"><ptype>GLenum</ptype> <name>format</name></param>
>+            <param group="PixelType"><ptype>GLenum</ptype> <name>type</name></param>
>+            <param len="COMPSIZE(format,type,width,height)">const void *<name>pixels</name></param>
>+            <glx type="render" opcode="110"/>
>+            <glx type="render" opcode="329" name="glTexImage2DPBO" comment="PBO protocol"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glTexImage2DMultisample</name></proto>
>+            <param group="TextureTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param><ptype>GLsizei</ptype> <name>samples</name></param>
>+            <param group="InternalFormat"><ptype>GLenum</ptype> <name>internalformat</name></param>
>+            <param><ptype>GLsizei</ptype> <name>width</name></param>
>+            <param><ptype>GLsizei</ptype> <name>height</name></param>
>+            <param group="Boolean"><ptype>GLboolean</ptype> <name>fixedsamplelocations</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glTexImage2DMultisampleCoverageNV</name></proto>
>+            <param group="TextureTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param><ptype>GLsizei</ptype> <name>coverageSamples</name></param>
>+            <param><ptype>GLsizei</ptype> <name>colorSamples</name></param>
>+            <param><ptype>GLint</ptype> <name>internalFormat</name></param>
>+            <param><ptype>GLsizei</ptype> <name>width</name></param>
>+            <param><ptype>GLsizei</ptype> <name>height</name></param>
>+            <param group="Boolean"><ptype>GLboolean</ptype> <name>fixedSampleLocations</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glTexImage3D</name></proto>
>+            <param group="TextureTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>level</name></param>
>+            <param group="InternalFormat"><ptype>GLint</ptype> <name>internalformat</name></param>
>+            <param><ptype>GLsizei</ptype> <name>width</name></param>
>+            <param><ptype>GLsizei</ptype> <name>height</name></param>
>+            <param><ptype>GLsizei</ptype> <name>depth</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>border</name></param>
>+            <param group="PixelFormat"><ptype>GLenum</ptype> <name>format</name></param>
>+            <param group="PixelType"><ptype>GLenum</ptype> <name>type</name></param>
>+            <param len="COMPSIZE(format,type,width,height,depth)">const void *<name>pixels</name></param>
>+            <glx type="render" opcode="4114"/>
>+            <glx type="render" opcode="330" name="glTexImage3DPBO" comment="PBO protocol"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glTexImage3DEXT</name></proto>
>+            <param group="TextureTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>level</name></param>
>+            <param group="InternalFormat"><ptype>GLenum</ptype> <name>internalformat</name></param>
>+            <param><ptype>GLsizei</ptype> <name>width</name></param>
>+            <param><ptype>GLsizei</ptype> <name>height</name></param>
>+            <param><ptype>GLsizei</ptype> <name>depth</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>border</name></param>
>+            <param group="PixelFormat"><ptype>GLenum</ptype> <name>format</name></param>
>+            <param group="PixelType"><ptype>GLenum</ptype> <name>type</name></param>
>+            <param len="COMPSIZE(format,type,width,height,depth)">const void *<name>pixels</name></param>
>+            <alias name="glTexImage3D"/>
>+            <glx type="render" opcode="4114"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glTexImage3DMultisample</name></proto>
>+            <param group="TextureTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param><ptype>GLsizei</ptype> <name>samples</name></param>
>+            <param group="InternalFormat"><ptype>GLenum</ptype> <name>internalformat</name></param>
>+            <param><ptype>GLsizei</ptype> <name>width</name></param>
>+            <param><ptype>GLsizei</ptype> <name>height</name></param>
>+            <param><ptype>GLsizei</ptype> <name>depth</name></param>
>+            <param group="Boolean"><ptype>GLboolean</ptype> <name>fixedsamplelocations</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glTexImage3DMultisampleCoverageNV</name></proto>
>+            <param group="TextureTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param><ptype>GLsizei</ptype> <name>coverageSamples</name></param>
>+            <param><ptype>GLsizei</ptype> <name>colorSamples</name></param>
>+            <param><ptype>GLint</ptype> <name>internalFormat</name></param>
>+            <param><ptype>GLsizei</ptype> <name>width</name></param>
>+            <param><ptype>GLsizei</ptype> <name>height</name></param>
>+            <param><ptype>GLsizei</ptype> <name>depth</name></param>
>+            <param group="Boolean"><ptype>GLboolean</ptype> <name>fixedSampleLocations</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glTexImage3DOES</name></proto>
>+            <param group="TextureTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param><ptype>GLint</ptype> <name>level</name></param>
>+            <param group="InternalFormat"><ptype>GLenum</ptype> <name>internalformat</name></param>
>+            <param><ptype>GLsizei</ptype> <name>width</name></param>
>+            <param><ptype>GLsizei</ptype> <name>height</name></param>
>+            <param><ptype>GLsizei</ptype> <name>depth</name></param>
>+            <param><ptype>GLint</ptype> <name>border</name></param>
>+            <param group="PixelFormat"><ptype>GLenum</ptype> <name>format</name></param>
>+            <param group="PixelType"><ptype>GLenum</ptype> <name>type</name></param>
>+            <param len="COMPSIZE(format,type,width,height,depth)">const void *<name>pixels</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glTexImage4DSGIS</name></proto>
>+            <param group="TextureTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>level</name></param>
>+            <param group="InternalFormat"><ptype>GLenum</ptype> <name>internalformat</name></param>
>+            <param><ptype>GLsizei</ptype> <name>width</name></param>
>+            <param><ptype>GLsizei</ptype> <name>height</name></param>
>+            <param><ptype>GLsizei</ptype> <name>depth</name></param>
>+            <param><ptype>GLsizei</ptype> <name>size4d</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>border</name></param>
>+            <param group="PixelFormat"><ptype>GLenum</ptype> <name>format</name></param>
>+            <param group="PixelType"><ptype>GLenum</ptype> <name>type</name></param>
>+            <param len="COMPSIZE(format,type,width,height,depth,size4d)">const void *<name>pixels</name></param>
>+            <glx type="render" opcode="2057"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glTexPageCommitmentARB</name></proto>
>+            <param><ptype>GLenum</ptype> <name>target</name></param>
>+            <param><ptype>GLint</ptype> <name>level</name></param>
>+            <param><ptype>GLint</ptype> <name>xoffset</name></param>
>+            <param><ptype>GLint</ptype> <name>yoffset</name></param>
>+            <param><ptype>GLint</ptype> <name>zoffset</name></param>
>+            <param><ptype>GLsizei</ptype> <name>width</name></param>
>+            <param><ptype>GLsizei</ptype> <name>height</name></param>
>+            <param><ptype>GLsizei</ptype> <name>depth</name></param>
>+            <param><ptype>GLboolean</ptype> <name>commit</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glTexPageCommitmentEXT</name></proto>
>+            <param><ptype>GLenum</ptype> <name>target</name></param>
>+            <param><ptype>GLint</ptype> <name>level</name></param>
>+            <param><ptype>GLint</ptype> <name>xoffset</name></param>
>+            <param><ptype>GLint</ptype> <name>yoffset</name></param>
>+            <param><ptype>GLint</ptype> <name>zoffset</name></param>
>+            <param><ptype>GLsizei</ptype> <name>width</name></param>
>+            <param><ptype>GLsizei</ptype> <name>height</name></param>
>+            <param><ptype>GLsizei</ptype> <name>depth</name></param>
>+            <param><ptype>GLboolean</ptype> <name>commit</name></param>
>+            <alias name="glTexPageCommitmentARB"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glTexParameterIiv</name></proto>
>+            <param group="TextureTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="TextureParameterName"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="COMPSIZE(pname)">const <ptype>GLint</ptype> *<name>params</name></param>
>+            <glx type="render" opcode="346"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glTexParameterIivEXT</name></proto>
>+            <param group="TextureTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="TextureParameterName"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="COMPSIZE(pname)">const <ptype>GLint</ptype> *<name>params</name></param>
>+            <alias name="glTexParameterIiv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glTexParameterIivOES</name></proto>
>+            <param group="TextureTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="TextureParameterName"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="COMPSIZE(pname)">const <ptype>GLint</ptype> *<name>params</name></param>
>+            <alias name="glTexParameterIiv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glTexParameterIuiv</name></proto>
>+            <param group="TextureTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="TextureParameterName"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="COMPSIZE(pname)">const <ptype>GLuint</ptype> *<name>params</name></param>
>+            <glx type="render" opcode="347"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glTexParameterIuivEXT</name></proto>
>+            <param group="TextureTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="TextureParameterName"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="COMPSIZE(pname)">const <ptype>GLuint</ptype> *<name>params</name></param>
>+            <alias name="glTexParameterIuiv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glTexParameterIuivOES</name></proto>
>+            <param group="TextureTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="TextureParameterName"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="COMPSIZE(pname)">const <ptype>GLuint</ptype> *<name>params</name></param>
>+            <alias name="glTexParameterIuiv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glTexParameterf</name></proto>
>+            <param group="TextureTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="TextureParameterName"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param group="CheckedFloat32"><ptype>GLfloat</ptype> <name>param</name></param>
>+            <glx type="render" opcode="105"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glTexParameterfv</name></proto>
>+            <param group="TextureTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="TextureParameterName"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param group="CheckedFloat32" len="COMPSIZE(pname)">const <ptype>GLfloat</ptype> *<name>params</name></param>
>+            <glx type="render" opcode="106"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glTexParameteri</name></proto>
>+            <param group="TextureTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="TextureParameterName"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>param</name></param>
>+            <glx type="render" opcode="107"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glTexParameteriv</name></proto>
>+            <param group="TextureTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="TextureParameterName"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param group="CheckedInt32" len="COMPSIZE(pname)">const <ptype>GLint</ptype> *<name>params</name></param>
>+            <glx type="render" opcode="108"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glTexParameterx</name></proto>
>+            <param group="TextureTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="GetTextureParameter"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param><ptype>GLfixed</ptype> <name>param</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glTexParameterxOES</name></proto>
>+            <param group="TextureTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="GetTextureParameter"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param><ptype>GLfixed</ptype> <name>param</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glTexParameterxv</name></proto>
>+            <param group="TextureTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="GetTextureParameter"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="COMPSIZE(pname)">const <ptype>GLfixed</ptype> *<name>params</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glTexParameterxvOES</name></proto>
>+            <param group="TextureTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="GetTextureParameter"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="COMPSIZE(pname)">const <ptype>GLfixed</ptype> *<name>params</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glTexRenderbufferNV</name></proto>
>+            <param group="TextureTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param><ptype>GLuint</ptype> <name>renderbuffer</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glTexStorage1D</name></proto>
>+            <param group="TextureTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param><ptype>GLsizei</ptype> <name>levels</name></param>
>+            <param group="InternalFormat"><ptype>GLenum</ptype> <name>internalformat</name></param>
>+            <param><ptype>GLsizei</ptype> <name>width</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glTexStorage1DEXT</name></proto>
>+            <param group="TextureTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param><ptype>GLsizei</ptype> <name>levels</name></param>
>+            <param group="InternalFormat"><ptype>GLenum</ptype> <name>internalformat</name></param>
>+            <param><ptype>GLsizei</ptype> <name>width</name></param>
>+            <alias name="glTexStorage1D"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glTexStorage2D</name></proto>
>+            <param group="TextureTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param><ptype>GLsizei</ptype> <name>levels</name></param>
>+            <param group="InternalFormat"><ptype>GLenum</ptype> <name>internalformat</name></param>
>+            <param><ptype>GLsizei</ptype> <name>width</name></param>
>+            <param><ptype>GLsizei</ptype> <name>height</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glTexStorage2DEXT</name></proto>
>+            <param group="TextureTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param><ptype>GLsizei</ptype> <name>levels</name></param>
>+            <param group="InternalFormat"><ptype>GLenum</ptype> <name>internalformat</name></param>
>+            <param><ptype>GLsizei</ptype> <name>width</name></param>
>+            <param><ptype>GLsizei</ptype> <name>height</name></param>
>+            <alias name="glTexStorage2D"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glTexStorage2DMultisample</name></proto>
>+            <param group="TextureTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param><ptype>GLsizei</ptype> <name>samples</name></param>
>+            <param group="InternalFormat"><ptype>GLenum</ptype> <name>internalformat</name></param>
>+            <param><ptype>GLsizei</ptype> <name>width</name></param>
>+            <param><ptype>GLsizei</ptype> <name>height</name></param>
>+            <param group="Boolean"><ptype>GLboolean</ptype> <name>fixedsamplelocations</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glTexStorage3D</name></proto>
>+            <param group="TextureTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param><ptype>GLsizei</ptype> <name>levels</name></param>
>+            <param group="InternalFormat"><ptype>GLenum</ptype> <name>internalformat</name></param>
>+            <param><ptype>GLsizei</ptype> <name>width</name></param>
>+            <param><ptype>GLsizei</ptype> <name>height</name></param>
>+            <param><ptype>GLsizei</ptype> <name>depth</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glTexStorage3DEXT</name></proto>
>+            <param group="TextureTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param><ptype>GLsizei</ptype> <name>levels</name></param>
>+            <param group="InternalFormat"><ptype>GLenum</ptype> <name>internalformat</name></param>
>+            <param><ptype>GLsizei</ptype> <name>width</name></param>
>+            <param><ptype>GLsizei</ptype> <name>height</name></param>
>+            <param><ptype>GLsizei</ptype> <name>depth</name></param>
>+            <alias name="glTexStorage3D"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glTexStorage3DMultisample</name></proto>
>+            <param group="TextureTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param><ptype>GLsizei</ptype> <name>samples</name></param>
>+            <param group="InternalFormat"><ptype>GLenum</ptype> <name>internalformat</name></param>
>+            <param><ptype>GLsizei</ptype> <name>width</name></param>
>+            <param><ptype>GLsizei</ptype> <name>height</name></param>
>+            <param><ptype>GLsizei</ptype> <name>depth</name></param>
>+            <param group="Boolean"><ptype>GLboolean</ptype> <name>fixedsamplelocations</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glTexStorage3DMultisampleOES</name></proto>
>+            <param group="TextureTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param><ptype>GLsizei</ptype> <name>samples</name></param>
>+            <param group="InternalFormat"><ptype>GLenum</ptype> <name>internalformat</name></param>
>+            <param><ptype>GLsizei</ptype> <name>width</name></param>
>+            <param><ptype>GLsizei</ptype> <name>height</name></param>
>+            <param><ptype>GLsizei</ptype> <name>depth</name></param>
>+            <param group="Boolean"><ptype>GLboolean</ptype> <name>fixedsamplelocations</name></param>
>+            <alias name="glTexStorage3DMultisample"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glTexStorageMem1DEXT</name></proto>
>+            <param group="TextureTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param><ptype>GLsizei</ptype> <name>levels</name></param>
>+            <param><ptype>GLenum</ptype> <name>internalFormat</name></param>
>+            <param><ptype>GLsizei</ptype> <name>width</name></param>
>+            <param><ptype>GLuint</ptype> <name>memory</name></param>
>+            <param><ptype>GLuint64</ptype> <name>offset</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glTexStorageMem2DEXT</name></proto>
>+            <param group="TextureTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param><ptype>GLsizei</ptype> <name>levels</name></param>
>+            <param><ptype>GLenum</ptype> <name>internalFormat</name></param>
>+            <param><ptype>GLsizei</ptype> <name>width</name></param>
>+            <param><ptype>GLsizei</ptype> <name>height</name></param>
>+            <param><ptype>GLuint</ptype> <name>memory</name></param>
>+            <param><ptype>GLuint64</ptype> <name>offset</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glTexStorageMem2DMultisampleEXT</name></proto>
>+            <param group="TextureTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param><ptype>GLsizei</ptype> <name>samples</name></param>
>+            <param><ptype>GLenum</ptype> <name>internalFormat</name></param>
>+            <param><ptype>GLsizei</ptype> <name>width</name></param>
>+            <param><ptype>GLsizei</ptype> <name>height</name></param>
>+            <param><ptype>GLboolean</ptype> <name>fixedSampleLocations</name></param>
>+            <param><ptype>GLuint</ptype> <name>memory</name></param>
>+            <param><ptype>GLuint64</ptype> <name>offset</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glTexStorageMem3DEXT</name></proto>
>+            <param group="TextureTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param><ptype>GLsizei</ptype> <name>levels</name></param>
>+            <param><ptype>GLenum</ptype> <name>internalFormat</name></param>
>+            <param><ptype>GLsizei</ptype> <name>width</name></param>
>+            <param><ptype>GLsizei</ptype> <name>height</name></param>
>+            <param><ptype>GLsizei</ptype> <name>depth</name></param>
>+            <param><ptype>GLuint</ptype> <name>memory</name></param>
>+            <param><ptype>GLuint64</ptype> <name>offset</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glTexStorageMem3DMultisampleEXT</name></proto>
>+            <param group="TextureTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param><ptype>GLsizei</ptype> <name>samples</name></param>
>+            <param><ptype>GLenum</ptype> <name>internalFormat</name></param>
>+            <param><ptype>GLsizei</ptype> <name>width</name></param>
>+            <param><ptype>GLsizei</ptype> <name>height</name></param>
>+            <param><ptype>GLsizei</ptype> <name>depth</name></param>
>+            <param><ptype>GLboolean</ptype> <name>fixedSampleLocations</name></param>
>+            <param><ptype>GLuint</ptype> <name>memory</name></param>
>+            <param><ptype>GLuint64</ptype> <name>offset</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glTexStorageSparseAMD</name></proto>
>+            <param group="TextureTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="InternalFormat"><ptype>GLenum</ptype> <name>internalFormat</name></param>
>+            <param><ptype>GLsizei</ptype> <name>width</name></param>
>+            <param><ptype>GLsizei</ptype> <name>height</name></param>
>+            <param><ptype>GLsizei</ptype> <name>depth</name></param>
>+            <param><ptype>GLsizei</ptype> <name>layers</name></param>
>+            <param group="TextureStorageMaskAMD"><ptype>GLbitfield</ptype> <name>flags</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glTexSubImage1D</name></proto>
>+            <param group="TextureTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>level</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>xoffset</name></param>
>+            <param><ptype>GLsizei</ptype> <name>width</name></param>
>+            <param group="PixelFormat"><ptype>GLenum</ptype> <name>format</name></param>
>+            <param group="PixelType"><ptype>GLenum</ptype> <name>type</name></param>
>+            <param len="COMPSIZE(format,type,width)">const void *<name>pixels</name></param>
>+            <glx type="render" opcode="4099"/>
>+            <glx type="render" opcode="331" name="glTexSubImage1DPBO" comment="PBO protocol"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glTexSubImage1DEXT</name></proto>
>+            <param group="TextureTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>level</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>xoffset</name></param>
>+            <param><ptype>GLsizei</ptype> <name>width</name></param>
>+            <param group="PixelFormat"><ptype>GLenum</ptype> <name>format</name></param>
>+            <param group="PixelType"><ptype>GLenum</ptype> <name>type</name></param>
>+            <param len="COMPSIZE(format,type,width)">const void *<name>pixels</name></param>
>+            <alias name="glTexSubImage1D"/>
>+            <glx type="render" opcode="4099"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glTexSubImage2D</name></proto>
>+            <param group="TextureTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>level</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>xoffset</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>yoffset</name></param>
>+            <param><ptype>GLsizei</ptype> <name>width</name></param>
>+            <param><ptype>GLsizei</ptype> <name>height</name></param>
>+            <param group="PixelFormat"><ptype>GLenum</ptype> <name>format</name></param>
>+            <param group="PixelType"><ptype>GLenum</ptype> <name>type</name></param>
>+            <param len="COMPSIZE(format,type,width,height)">const void *<name>pixels</name></param>
>+            <glx type="render" opcode="4100"/>
>+            <glx type="render" opcode="332" name="glTexSubImage2DPBO" comment="PBO protocol"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glTexSubImage2DEXT</name></proto>
>+            <param group="TextureTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>level</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>xoffset</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>yoffset</name></param>
>+            <param><ptype>GLsizei</ptype> <name>width</name></param>
>+            <param><ptype>GLsizei</ptype> <name>height</name></param>
>+            <param group="PixelFormat"><ptype>GLenum</ptype> <name>format</name></param>
>+            <param group="PixelType"><ptype>GLenum</ptype> <name>type</name></param>
>+            <param len="COMPSIZE(format,type,width,height)">const void *<name>pixels</name></param>
>+            <alias name="glTexSubImage2D"/>
>+            <glx type="render" opcode="4100"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glTexSubImage3D</name></proto>
>+            <param group="TextureTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>level</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>xoffset</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>yoffset</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>zoffset</name></param>
>+            <param><ptype>GLsizei</ptype> <name>width</name></param>
>+            <param><ptype>GLsizei</ptype> <name>height</name></param>
>+            <param><ptype>GLsizei</ptype> <name>depth</name></param>
>+            <param group="PixelFormat"><ptype>GLenum</ptype> <name>format</name></param>
>+            <param group="PixelType"><ptype>GLenum</ptype> <name>type</name></param>
>+            <param len="COMPSIZE(format,type,width,height,depth)">const void *<name>pixels</name></param>
>+            <glx type="render" opcode="4115"/>
>+            <glx type="render" opcode="333" name="glTexSubImage3DPBO" comment="PBO protocol"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glTexSubImage3DEXT</name></proto>
>+            <param group="TextureTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>level</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>xoffset</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>yoffset</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>zoffset</name></param>
>+            <param><ptype>GLsizei</ptype> <name>width</name></param>
>+            <param><ptype>GLsizei</ptype> <name>height</name></param>
>+            <param><ptype>GLsizei</ptype> <name>depth</name></param>
>+            <param group="PixelFormat"><ptype>GLenum</ptype> <name>format</name></param>
>+            <param group="PixelType"><ptype>GLenum</ptype> <name>type</name></param>
>+            <param len="COMPSIZE(format,type,width,height,depth)">const void *<name>pixels</name></param>
>+            <alias name="glTexSubImage3D"/>
>+            <glx type="render" opcode="4115"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glTexSubImage3DOES</name></proto>
>+            <param group="TextureTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param><ptype>GLint</ptype> <name>level</name></param>
>+            <param><ptype>GLint</ptype> <name>xoffset</name></param>
>+            <param><ptype>GLint</ptype> <name>yoffset</name></param>
>+            <param><ptype>GLint</ptype> <name>zoffset</name></param>
>+            <param><ptype>GLsizei</ptype> <name>width</name></param>
>+            <param><ptype>GLsizei</ptype> <name>height</name></param>
>+            <param><ptype>GLsizei</ptype> <name>depth</name></param>
>+            <param group="PixelFormat"><ptype>GLenum</ptype> <name>format</name></param>
>+            <param group="PixelType"><ptype>GLenum</ptype> <name>type</name></param>
>+            <param len="COMPSIZE(format,type,width,height,depth)">const void *<name>pixels</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glTexSubImage4DSGIS</name></proto>
>+            <param group="TextureTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>level</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>xoffset</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>yoffset</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>zoffset</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>woffset</name></param>
>+            <param><ptype>GLsizei</ptype> <name>width</name></param>
>+            <param><ptype>GLsizei</ptype> <name>height</name></param>
>+            <param><ptype>GLsizei</ptype> <name>depth</name></param>
>+            <param><ptype>GLsizei</ptype> <name>size4d</name></param>
>+            <param group="PixelFormat"><ptype>GLenum</ptype> <name>format</name></param>
>+            <param group="PixelType"><ptype>GLenum</ptype> <name>type</name></param>
>+            <param len="COMPSIZE(format,type,width,height,depth,size4d)">const void *<name>pixels</name></param>
>+            <glx type="render" opcode="2058"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glTextureBarrier</name></proto>
>+        </command>
>+        <command>
>+            <proto>void <name>glTextureBarrierNV</name></proto>
>+            <glx type="render" opcode="4348"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glTextureBuffer</name></proto>
>+            <param><ptype>GLuint</ptype> <name>texture</name></param>
>+            <param group="InternalFormat"><ptype>GLenum</ptype> <name>internalformat</name></param>
>+            <param><ptype>GLuint</ptype> <name>buffer</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glTextureBufferEXT</name></proto>
>+            <param group="Texture"><ptype>GLuint</ptype> <name>texture</name></param>
>+            <param group="TextureTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="InternalFormat"><ptype>GLenum</ptype> <name>internalformat</name></param>
>+            <param><ptype>GLuint</ptype> <name>buffer</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glTextureBufferRange</name></proto>
>+            <param><ptype>GLuint</ptype> <name>texture</name></param>
>+            <param group="InternalFormat"><ptype>GLenum</ptype> <name>internalformat</name></param>
>+            <param><ptype>GLuint</ptype> <name>buffer</name></param>
>+            <param><ptype>GLintptr</ptype> <name>offset</name></param>
>+            <param group="BufferSize"><ptype>GLsizeiptr</ptype> <name>size</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glTextureBufferRangeEXT</name></proto>
>+            <param group="Texture"><ptype>GLuint</ptype> <name>texture</name></param>
>+            <param group="TextureTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="InternalFormat"><ptype>GLenum</ptype> <name>internalformat</name></param>
>+            <param><ptype>GLuint</ptype> <name>buffer</name></param>
>+            <param group="BufferOffset"><ptype>GLintptr</ptype> <name>offset</name></param>
>+            <param group="BufferSize"><ptype>GLsizeiptr</ptype> <name>size</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glTextureColorMaskSGIS</name></proto>
>+            <param group="Boolean"><ptype>GLboolean</ptype> <name>red</name></param>
>+            <param group="Boolean"><ptype>GLboolean</ptype> <name>green</name></param>
>+            <param group="Boolean"><ptype>GLboolean</ptype> <name>blue</name></param>
>+            <param group="Boolean"><ptype>GLboolean</ptype> <name>alpha</name></param>
>+            <glx type="render" opcode="2082"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glTextureFoveationParametersQCOM</name></proto>
>+            <param group="Texture"><ptype>GLuint</ptype> <name>texture</name></param>
>+            <param><ptype>GLuint</ptype> <name>layer</name></param>
>+            <param><ptype>GLuint</ptype> <name>focalPoint</name></param>
>+            <param group="CheckedFloat32"><ptype>GLfloat</ptype> <name>focalX</name></param>
>+            <param group="CheckedFloat32"><ptype>GLfloat</ptype> <name>focalY</name></param>
>+            <param group="CheckedFloat32"><ptype>GLfloat</ptype> <name>gainX</name></param>
>+            <param group="CheckedFloat32"><ptype>GLfloat</ptype> <name>gainY</name></param>
>+            <param group="CheckedFloat32"><ptype>GLfloat</ptype> <name>foveaArea</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glTextureImage1DEXT</name></proto>
>+            <param group="Texture"><ptype>GLuint</ptype> <name>texture</name></param>
>+            <param group="TextureTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>level</name></param>
>+            <param group="InternalFormat"><ptype>GLint</ptype> <name>internalformat</name></param>
>+            <param><ptype>GLsizei</ptype> <name>width</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>border</name></param>
>+            <param group="PixelFormat"><ptype>GLenum</ptype> <name>format</name></param>
>+            <param group="PixelType"><ptype>GLenum</ptype> <name>type</name></param>
>+            <param len="COMPSIZE(format,type,width)">const void *<name>pixels</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glTextureImage2DEXT</name></proto>
>+            <param group="Texture"><ptype>GLuint</ptype> <name>texture</name></param>
>+            <param group="TextureTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>level</name></param>
>+            <param group="InternalFormat"><ptype>GLint</ptype> <name>internalformat</name></param>
>+            <param><ptype>GLsizei</ptype> <name>width</name></param>
>+            <param><ptype>GLsizei</ptype> <name>height</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>border</name></param>
>+            <param group="PixelFormat"><ptype>GLenum</ptype> <name>format</name></param>
>+            <param group="PixelType"><ptype>GLenum</ptype> <name>type</name></param>
>+            <param len="COMPSIZE(format,type,width,height)">const void *<name>pixels</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glTextureImage2DMultisampleCoverageNV</name></proto>
>+            <param><ptype>GLuint</ptype> <name>texture</name></param>
>+            <param group="TextureTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param><ptype>GLsizei</ptype> <name>coverageSamples</name></param>
>+            <param><ptype>GLsizei</ptype> <name>colorSamples</name></param>
>+            <param><ptype>GLint</ptype> <name>internalFormat</name></param>
>+            <param><ptype>GLsizei</ptype> <name>width</name></param>
>+            <param><ptype>GLsizei</ptype> <name>height</name></param>
>+            <param group="Boolean"><ptype>GLboolean</ptype> <name>fixedSampleLocations</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glTextureImage2DMultisampleNV</name></proto>
>+            <param><ptype>GLuint</ptype> <name>texture</name></param>
>+            <param group="TextureTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param><ptype>GLsizei</ptype> <name>samples</name></param>
>+            <param><ptype>GLint</ptype> <name>internalFormat</name></param>
>+            <param><ptype>GLsizei</ptype> <name>width</name></param>
>+            <param><ptype>GLsizei</ptype> <name>height</name></param>
>+            <param group="Boolean"><ptype>GLboolean</ptype> <name>fixedSampleLocations</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glTextureImage3DEXT</name></proto>
>+            <param group="Texture"><ptype>GLuint</ptype> <name>texture</name></param>
>+            <param group="TextureTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>level</name></param>
>+            <param group="InternalFormat"><ptype>GLint</ptype> <name>internalformat</name></param>
>+            <param><ptype>GLsizei</ptype> <name>width</name></param>
>+            <param><ptype>GLsizei</ptype> <name>height</name></param>
>+            <param><ptype>GLsizei</ptype> <name>depth</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>border</name></param>
>+            <param group="PixelFormat"><ptype>GLenum</ptype> <name>format</name></param>
>+            <param group="PixelType"><ptype>GLenum</ptype> <name>type</name></param>
>+            <param len="COMPSIZE(format,type,width,height,depth)">const void *<name>pixels</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glTextureImage3DMultisampleCoverageNV</name></proto>
>+            <param><ptype>GLuint</ptype> <name>texture</name></param>
>+            <param group="TextureTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param><ptype>GLsizei</ptype> <name>coverageSamples</name></param>
>+            <param><ptype>GLsizei</ptype> <name>colorSamples</name></param>
>+            <param><ptype>GLint</ptype> <name>internalFormat</name></param>
>+            <param><ptype>GLsizei</ptype> <name>width</name></param>
>+            <param><ptype>GLsizei</ptype> <name>height</name></param>
>+            <param><ptype>GLsizei</ptype> <name>depth</name></param>
>+            <param group="Boolean"><ptype>GLboolean</ptype> <name>fixedSampleLocations</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glTextureImage3DMultisampleNV</name></proto>
>+            <param><ptype>GLuint</ptype> <name>texture</name></param>
>+            <param group="TextureTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param><ptype>GLsizei</ptype> <name>samples</name></param>
>+            <param><ptype>GLint</ptype> <name>internalFormat</name></param>
>+            <param><ptype>GLsizei</ptype> <name>width</name></param>
>+            <param><ptype>GLsizei</ptype> <name>height</name></param>
>+            <param><ptype>GLsizei</ptype> <name>depth</name></param>
>+            <param group="Boolean"><ptype>GLboolean</ptype> <name>fixedSampleLocations</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glTextureLightEXT</name></proto>
>+            <param group="LightTexturePNameEXT"><ptype>GLenum</ptype> <name>pname</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glTextureMaterialEXT</name></proto>
>+            <param group="MaterialFace"><ptype>GLenum</ptype> <name>face</name></param>
>+            <param group="MaterialParameter"><ptype>GLenum</ptype> <name>mode</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glTextureNormalEXT</name></proto>
>+            <param group="TextureNormalModeEXT"><ptype>GLenum</ptype> <name>mode</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glTexturePageCommitmentEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>texture</name></param>
>+            <param><ptype>GLint</ptype> <name>level</name></param>
>+            <param><ptype>GLint</ptype> <name>xoffset</name></param>
>+            <param><ptype>GLint</ptype> <name>yoffset</name></param>
>+            <param><ptype>GLint</ptype> <name>zoffset</name></param>
>+            <param><ptype>GLsizei</ptype> <name>width</name></param>
>+            <param><ptype>GLsizei</ptype> <name>height</name></param>
>+            <param><ptype>GLsizei</ptype> <name>depth</name></param>
>+            <param><ptype>GLboolean</ptype> <name>commit</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glTextureParameterIiv</name></proto>
>+            <param><ptype>GLuint</ptype> <name>texture</name></param>
>+            <param group="TextureParameterName"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param>const <ptype>GLint</ptype> *<name>params</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glTextureParameterIivEXT</name></proto>
>+            <param group="Texture"><ptype>GLuint</ptype> <name>texture</name></param>
>+            <param group="TextureTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="TextureParameterName"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param group="CheckedInt32" len="COMPSIZE(pname)">const <ptype>GLint</ptype> *<name>params</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glTextureParameterIuiv</name></proto>
>+            <param><ptype>GLuint</ptype> <name>texture</name></param>
>+            <param group="TextureParameterName"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param>const <ptype>GLuint</ptype> *<name>params</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glTextureParameterIuivEXT</name></proto>
>+            <param group="Texture"><ptype>GLuint</ptype> <name>texture</name></param>
>+            <param group="TextureTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="TextureParameterName"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="COMPSIZE(pname)">const <ptype>GLuint</ptype> *<name>params</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glTextureParameterf</name></proto>
>+            <param><ptype>GLuint</ptype> <name>texture</name></param>
>+            <param group="TextureParameterName"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param><ptype>GLfloat</ptype> <name>param</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glTextureParameterfEXT</name></proto>
>+            <param group="Texture"><ptype>GLuint</ptype> <name>texture</name></param>
>+            <param group="TextureTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="TextureParameterName"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param group="CheckedFloat32"><ptype>GLfloat</ptype> <name>param</name></param>
>+            <vecequiv name="glTextureParameterfvEXT"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glTextureParameterfv</name></proto>
>+            <param><ptype>GLuint</ptype> <name>texture</name></param>
>+            <param group="TextureParameterName"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param>const <ptype>GLfloat</ptype> *<name>param</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glTextureParameterfvEXT</name></proto>
>+            <param group="Texture"><ptype>GLuint</ptype> <name>texture</name></param>
>+            <param group="TextureTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="TextureParameterName"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param group="CheckedFloat32" len="COMPSIZE(pname)">const <ptype>GLfloat</ptype> *<name>params</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glTextureParameteri</name></proto>
>+            <param><ptype>GLuint</ptype> <name>texture</name></param>
>+            <param group="TextureParameterName"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param><ptype>GLint</ptype> <name>param</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glTextureParameteriEXT</name></proto>
>+            <param group="Texture"><ptype>GLuint</ptype> <name>texture</name></param>
>+            <param group="TextureTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="TextureParameterName"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>param</name></param>
>+            <vecequiv name="glTextureParameterivEXT"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glTextureParameteriv</name></proto>
>+            <param><ptype>GLuint</ptype> <name>texture</name></param>
>+            <param group="TextureParameterName"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param>const <ptype>GLint</ptype> *<name>param</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glTextureParameterivEXT</name></proto>
>+            <param group="Texture"><ptype>GLuint</ptype> <name>texture</name></param>
>+            <param group="TextureTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="TextureParameterName"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param group="CheckedInt32" len="COMPSIZE(pname)">const <ptype>GLint</ptype> *<name>params</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glTextureRangeAPPLE</name></proto>
>+            <param><ptype>GLenum</ptype> <name>target</name></param>
>+            <param><ptype>GLsizei</ptype> <name>length</name></param>
>+            <param len="length">const void *<name>pointer</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glTextureRenderbufferEXT</name></proto>
>+            <param group="Texture"><ptype>GLuint</ptype> <name>texture</name></param>
>+            <param group="TextureTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param><ptype>GLuint</ptype> <name>renderbuffer</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glTextureStorage1D</name></proto>
>+            <param><ptype>GLuint</ptype> <name>texture</name></param>
>+            <param><ptype>GLsizei</ptype> <name>levels</name></param>
>+            <param group="InternalFormat"><ptype>GLenum</ptype> <name>internalformat</name></param>
>+            <param><ptype>GLsizei</ptype> <name>width</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glTextureStorage1DEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>texture</name></param>
>+            <param><ptype>GLenum</ptype> <name>target</name></param>
>+            <param><ptype>GLsizei</ptype> <name>levels</name></param>
>+            <param group="InternalFormat"><ptype>GLenum</ptype> <name>internalformat</name></param>
>+            <param><ptype>GLsizei</ptype> <name>width</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glTextureStorage2D</name></proto>
>+            <param><ptype>GLuint</ptype> <name>texture</name></param>
>+            <param><ptype>GLsizei</ptype> <name>levels</name></param>
>+            <param group="InternalFormat"><ptype>GLenum</ptype> <name>internalformat</name></param>
>+            <param><ptype>GLsizei</ptype> <name>width</name></param>
>+            <param><ptype>GLsizei</ptype> <name>height</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glTextureStorage2DEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>texture</name></param>
>+            <param><ptype>GLenum</ptype> <name>target</name></param>
>+            <param><ptype>GLsizei</ptype> <name>levels</name></param>
>+            <param group="InternalFormat"><ptype>GLenum</ptype> <name>internalformat</name></param>
>+            <param><ptype>GLsizei</ptype> <name>width</name></param>
>+            <param><ptype>GLsizei</ptype> <name>height</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glTextureStorage2DMultisample</name></proto>
>+            <param><ptype>GLuint</ptype> <name>texture</name></param>
>+            <param><ptype>GLsizei</ptype> <name>samples</name></param>
>+            <param group="InternalFormat"><ptype>GLenum</ptype> <name>internalformat</name></param>
>+            <param><ptype>GLsizei</ptype> <name>width</name></param>
>+            <param><ptype>GLsizei</ptype> <name>height</name></param>
>+            <param><ptype>GLboolean</ptype> <name>fixedsamplelocations</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glTextureStorage2DMultisampleEXT</name></proto>
>+            <param group="Texture"><ptype>GLuint</ptype> <name>texture</name></param>
>+            <param group="TextureTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param><ptype>GLsizei</ptype> <name>samples</name></param>
>+            <param group="InternalFormat"><ptype>GLenum</ptype> <name>internalformat</name></param>
>+            <param><ptype>GLsizei</ptype> <name>width</name></param>
>+            <param><ptype>GLsizei</ptype> <name>height</name></param>
>+            <param group="Boolean"><ptype>GLboolean</ptype> <name>fixedsamplelocations</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glTextureStorage3D</name></proto>
>+            <param><ptype>GLuint</ptype> <name>texture</name></param>
>+            <param><ptype>GLsizei</ptype> <name>levels</name></param>
>+            <param group="InternalFormat"><ptype>GLenum</ptype> <name>internalformat</name></param>
>+            <param><ptype>GLsizei</ptype> <name>width</name></param>
>+            <param><ptype>GLsizei</ptype> <name>height</name></param>
>+            <param><ptype>GLsizei</ptype> <name>depth</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glTextureStorage3DEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>texture</name></param>
>+            <param><ptype>GLenum</ptype> <name>target</name></param>
>+            <param><ptype>GLsizei</ptype> <name>levels</name></param>
>+            <param group="InternalFormat"><ptype>GLenum</ptype> <name>internalformat</name></param>
>+            <param><ptype>GLsizei</ptype> <name>width</name></param>
>+            <param><ptype>GLsizei</ptype> <name>height</name></param>
>+            <param><ptype>GLsizei</ptype> <name>depth</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glTextureStorage3DMultisample</name></proto>
>+            <param><ptype>GLuint</ptype> <name>texture</name></param>
>+            <param><ptype>GLsizei</ptype> <name>samples</name></param>
>+            <param group="InternalFormat"><ptype>GLenum</ptype> <name>internalformat</name></param>
>+            <param><ptype>GLsizei</ptype> <name>width</name></param>
>+            <param><ptype>GLsizei</ptype> <name>height</name></param>
>+            <param><ptype>GLsizei</ptype> <name>depth</name></param>
>+            <param><ptype>GLboolean</ptype> <name>fixedsamplelocations</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glTextureStorage3DMultisampleEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>texture</name></param>
>+            <param><ptype>GLenum</ptype> <name>target</name></param>
>+            <param><ptype>GLsizei</ptype> <name>samples</name></param>
>+            <param group="InternalFormat"><ptype>GLenum</ptype> <name>internalformat</name></param>
>+            <param><ptype>GLsizei</ptype> <name>width</name></param>
>+            <param><ptype>GLsizei</ptype> <name>height</name></param>
>+            <param><ptype>GLsizei</ptype> <name>depth</name></param>
>+            <param group="Boolean"><ptype>GLboolean</ptype> <name>fixedsamplelocations</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glTextureStorageMem1DEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>texture</name></param>
>+            <param><ptype>GLsizei</ptype> <name>levels</name></param>
>+            <param><ptype>GLenum</ptype> <name>internalFormat</name></param>
>+            <param><ptype>GLsizei</ptype> <name>width</name></param>
>+            <param><ptype>GLuint</ptype> <name>memory</name></param>
>+            <param><ptype>GLuint64</ptype> <name>offset</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glTextureStorageMem2DEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>texture</name></param>
>+            <param><ptype>GLsizei</ptype> <name>levels</name></param>
>+            <param><ptype>GLenum</ptype> <name>internalFormat</name></param>
>+            <param><ptype>GLsizei</ptype> <name>width</name></param>
>+            <param><ptype>GLsizei</ptype> <name>height</name></param>
>+            <param><ptype>GLuint</ptype> <name>memory</name></param>
>+            <param><ptype>GLuint64</ptype> <name>offset</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glTextureStorageMem2DMultisampleEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>texture</name></param>
>+            <param><ptype>GLsizei</ptype> <name>samples</name></param>
>+            <param><ptype>GLenum</ptype> <name>internalFormat</name></param>
>+            <param><ptype>GLsizei</ptype> <name>width</name></param>
>+            <param><ptype>GLsizei</ptype> <name>height</name></param>
>+            <param><ptype>GLboolean</ptype> <name>fixedSampleLocations</name></param>
>+            <param><ptype>GLuint</ptype> <name>memory</name></param>
>+            <param><ptype>GLuint64</ptype> <name>offset</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glTextureStorageMem3DEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>texture</name></param>
>+            <param><ptype>GLsizei</ptype> <name>levels</name></param>
>+            <param><ptype>GLenum</ptype> <name>internalFormat</name></param>
>+            <param><ptype>GLsizei</ptype> <name>width</name></param>
>+            <param><ptype>GLsizei</ptype> <name>height</name></param>
>+            <param><ptype>GLsizei</ptype> <name>depth</name></param>
>+            <param><ptype>GLuint</ptype> <name>memory</name></param>
>+            <param><ptype>GLuint64</ptype> <name>offset</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glTextureStorageMem3DMultisampleEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>texture</name></param>
>+            <param><ptype>GLsizei</ptype> <name>samples</name></param>
>+            <param><ptype>GLenum</ptype> <name>internalFormat</name></param>
>+            <param><ptype>GLsizei</ptype> <name>width</name></param>
>+            <param><ptype>GLsizei</ptype> <name>height</name></param>
>+            <param><ptype>GLsizei</ptype> <name>depth</name></param>
>+            <param><ptype>GLboolean</ptype> <name>fixedSampleLocations</name></param>
>+            <param><ptype>GLuint</ptype> <name>memory</name></param>
>+            <param><ptype>GLuint64</ptype> <name>offset</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glTextureStorageSparseAMD</name></proto>
>+            <param><ptype>GLuint</ptype> <name>texture</name></param>
>+            <param><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="InternalFormat"><ptype>GLenum</ptype> <name>internalFormat</name></param>
>+            <param><ptype>GLsizei</ptype> <name>width</name></param>
>+            <param><ptype>GLsizei</ptype> <name>height</name></param>
>+            <param><ptype>GLsizei</ptype> <name>depth</name></param>
>+            <param><ptype>GLsizei</ptype> <name>layers</name></param>
>+            <param group="TextureStorageMaskAMD"><ptype>GLbitfield</ptype> <name>flags</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glTextureSubImage1D</name></proto>
>+            <param><ptype>GLuint</ptype> <name>texture</name></param>
>+            <param><ptype>GLint</ptype> <name>level</name></param>
>+            <param><ptype>GLint</ptype> <name>xoffset</name></param>
>+            <param><ptype>GLsizei</ptype> <name>width</name></param>
>+            <param group="PixelFormat"><ptype>GLenum</ptype> <name>format</name></param>
>+            <param group="PixelType"><ptype>GLenum</ptype> <name>type</name></param>
>+            <param>const void *<name>pixels</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glTextureSubImage1DEXT</name></proto>
>+            <param group="Texture"><ptype>GLuint</ptype> <name>texture</name></param>
>+            <param group="TextureTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>level</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>xoffset</name></param>
>+            <param><ptype>GLsizei</ptype> <name>width</name></param>
>+            <param group="PixelFormat"><ptype>GLenum</ptype> <name>format</name></param>
>+            <param group="PixelType"><ptype>GLenum</ptype> <name>type</name></param>
>+            <param len="COMPSIZE(format,type,width)">const void *<name>pixels</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glTextureSubImage2D</name></proto>
>+            <param><ptype>GLuint</ptype> <name>texture</name></param>
>+            <param><ptype>GLint</ptype> <name>level</name></param>
>+            <param><ptype>GLint</ptype> <name>xoffset</name></param>
>+            <param><ptype>GLint</ptype> <name>yoffset</name></param>
>+            <param><ptype>GLsizei</ptype> <name>width</name></param>
>+            <param><ptype>GLsizei</ptype> <name>height</name></param>
>+            <param group="PixelFormat"><ptype>GLenum</ptype> <name>format</name></param>
>+            <param group="PixelType"><ptype>GLenum</ptype> <name>type</name></param>
>+            <param>const void *<name>pixels</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glTextureSubImage2DEXT</name></proto>
>+            <param group="Texture"><ptype>GLuint</ptype> <name>texture</name></param>
>+            <param group="TextureTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>level</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>xoffset</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>yoffset</name></param>
>+            <param><ptype>GLsizei</ptype> <name>width</name></param>
>+            <param><ptype>GLsizei</ptype> <name>height</name></param>
>+            <param group="PixelFormat"><ptype>GLenum</ptype> <name>format</name></param>
>+            <param group="PixelType"><ptype>GLenum</ptype> <name>type</name></param>
>+            <param len="COMPSIZE(format,type,width,height)">const void *<name>pixels</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glTextureSubImage3D</name></proto>
>+            <param><ptype>GLuint</ptype> <name>texture</name></param>
>+            <param><ptype>GLint</ptype> <name>level</name></param>
>+            <param><ptype>GLint</ptype> <name>xoffset</name></param>
>+            <param><ptype>GLint</ptype> <name>yoffset</name></param>
>+            <param><ptype>GLint</ptype> <name>zoffset</name></param>
>+            <param><ptype>GLsizei</ptype> <name>width</name></param>
>+            <param><ptype>GLsizei</ptype> <name>height</name></param>
>+            <param><ptype>GLsizei</ptype> <name>depth</name></param>
>+            <param group="PixelFormat"><ptype>GLenum</ptype> <name>format</name></param>
>+            <param group="PixelType"><ptype>GLenum</ptype> <name>type</name></param>
>+            <param>const void *<name>pixels</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glTextureSubImage3DEXT</name></proto>
>+            <param group="Texture"><ptype>GLuint</ptype> <name>texture</name></param>
>+            <param group="TextureTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>level</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>xoffset</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>yoffset</name></param>
>+            <param group="CheckedInt32"><ptype>GLint</ptype> <name>zoffset</name></param>
>+            <param><ptype>GLsizei</ptype> <name>width</name></param>
>+            <param><ptype>GLsizei</ptype> <name>height</name></param>
>+            <param><ptype>GLsizei</ptype> <name>depth</name></param>
>+            <param group="PixelFormat"><ptype>GLenum</ptype> <name>format</name></param>
>+            <param group="PixelType"><ptype>GLenum</ptype> <name>type</name></param>
>+            <param len="COMPSIZE(format,type,width,height,depth)">const void *<name>pixels</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glTextureView</name></proto>
>+            <param><ptype>GLuint</ptype> <name>texture</name></param>
>+            <param group="TextureTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param><ptype>GLuint</ptype> <name>origtexture</name></param>
>+            <param group="InternalFormat"><ptype>GLenum</ptype> <name>internalformat</name></param>
>+            <param><ptype>GLuint</ptype> <name>minlevel</name></param>
>+            <param><ptype>GLuint</ptype> <name>numlevels</name></param>
>+            <param><ptype>GLuint</ptype> <name>minlayer</name></param>
>+            <param><ptype>GLuint</ptype> <name>numlayers</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glTextureViewEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>texture</name></param>
>+            <param group="TextureTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param><ptype>GLuint</ptype> <name>origtexture</name></param>
>+            <param group="InternalFormat"><ptype>GLenum</ptype> <name>internalformat</name></param>
>+            <param><ptype>GLuint</ptype> <name>minlevel</name></param>
>+            <param><ptype>GLuint</ptype> <name>numlevels</name></param>
>+            <param><ptype>GLuint</ptype> <name>minlayer</name></param>
>+            <param><ptype>GLuint</ptype> <name>numlayers</name></param>
>+            <alias name="glTextureView"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glTextureViewOES</name></proto>
>+            <param><ptype>GLuint</ptype> <name>texture</name></param>
>+            <param group="TextureTarget"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param><ptype>GLuint</ptype> <name>origtexture</name></param>
>+            <param group="InternalFormat"><ptype>GLenum</ptype> <name>internalformat</name></param>
>+            <param><ptype>GLuint</ptype> <name>minlevel</name></param>
>+            <param><ptype>GLuint</ptype> <name>numlevels</name></param>
>+            <param><ptype>GLuint</ptype> <name>minlayer</name></param>
>+            <param><ptype>GLuint</ptype> <name>numlayers</name></param>
>+            <alias name="glTextureView"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glTrackMatrixNV</name></proto>
>+            <param group="VertexAttribEnumNV"><ptype>GLenum</ptype> <name>target</name></param>
>+            <param><ptype>GLuint</ptype> <name>address</name></param>
>+            <param group="VertexAttribEnumNV"><ptype>GLenum</ptype> <name>matrix</name></param>
>+            <param group="VertexAttribEnumNV"><ptype>GLenum</ptype> <name>transform</name></param>
>+            <glx type="render" opcode="4188"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glTransformFeedbackAttribsNV</name></proto>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param len="COMPSIZE(count)">const <ptype>GLint</ptype> *<name>attribs</name></param>
>+            <param><ptype>GLenum</ptype> <name>bufferMode</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glTransformFeedbackBufferBase</name></proto>
>+            <param><ptype>GLuint</ptype> <name>xfb</name></param>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param><ptype>GLuint</ptype> <name>buffer</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glTransformFeedbackBufferRange</name></proto>
>+            <param><ptype>GLuint</ptype> <name>xfb</name></param>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param><ptype>GLuint</ptype> <name>buffer</name></param>
>+            <param><ptype>GLintptr</ptype> <name>offset</name></param>
>+            <param group="BufferSize"><ptype>GLsizeiptr</ptype> <name>size</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glTransformFeedbackStreamAttribsNV</name></proto>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param len="count">const <ptype>GLint</ptype> *<name>attribs</name></param>
>+            <param><ptype>GLsizei</ptype> <name>nbuffers</name></param>
>+            <param len="nbuffers">const <ptype>GLint</ptype> *<name>bufstreams</name></param>
>+            <param><ptype>GLenum</ptype> <name>bufferMode</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glTransformFeedbackVaryings</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param len="count">const <ptype>GLchar</ptype> *const*<name>varyings</name></param>
>+            <param><ptype>GLenum</ptype> <name>bufferMode</name></param>
>+            <glx type="render" opcode="359"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glTransformFeedbackVaryingsEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param len="count">const <ptype>GLchar</ptype> *const*<name>varyings</name></param>
>+            <param><ptype>GLenum</ptype> <name>bufferMode</name></param>
>+            <alias name="glTransformFeedbackVaryings"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glTransformFeedbackVaryingsNV</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param len="count">const <ptype>GLint</ptype> *<name>locations</name></param>
>+            <param><ptype>GLenum</ptype> <name>bufferMode</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glTransformPathNV</name></proto>
>+            <param group="Path"><ptype>GLuint</ptype> <name>resultPath</name></param>
>+            <param group="Path"><ptype>GLuint</ptype> <name>srcPath</name></param>
>+            <param group="PathTransformType"><ptype>GLenum</ptype> <name>transformType</name></param>
>+            <param len="COMPSIZE(transformType)">const <ptype>GLfloat</ptype> *<name>transformValues</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glTranslated</name></proto>
>+            <param><ptype>GLdouble</ptype> <name>x</name></param>
>+            <param><ptype>GLdouble</ptype> <name>y</name></param>
>+            <param><ptype>GLdouble</ptype> <name>z</name></param>
>+            <glx type="render" opcode="189"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glTranslatef</name></proto>
>+            <param><ptype>GLfloat</ptype> <name>x</name></param>
>+            <param><ptype>GLfloat</ptype> <name>y</name></param>
>+            <param><ptype>GLfloat</ptype> <name>z</name></param>
>+            <glx type="render" opcode="190"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glTranslatex</name></proto>
>+            <param><ptype>GLfixed</ptype> <name>x</name></param>
>+            <param><ptype>GLfixed</ptype> <name>y</name></param>
>+            <param><ptype>GLfixed</ptype> <name>z</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glTranslatexOES</name></proto>
>+            <param><ptype>GLfixed</ptype> <name>x</name></param>
>+            <param><ptype>GLfixed</ptype> <name>y</name></param>
>+            <param><ptype>GLfixed</ptype> <name>z</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glUniform1d</name></proto>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLdouble</ptype> <name>x</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glUniform1dv</name></proto>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param len="count*1">const <ptype>GLdouble</ptype> *<name>value</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glUniform1f</name></proto>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLfloat</ptype> <name>v0</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glUniform1fARB</name></proto>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLfloat</ptype> <name>v0</name></param>
>+            <alias name="glUniform1f"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glUniform1fv</name></proto>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param len="count*1">const <ptype>GLfloat</ptype> *<name>value</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glUniform1fvARB</name></proto>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param len="count*1">const <ptype>GLfloat</ptype> *<name>value</name></param>
>+            <alias name="glUniform1fv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glUniform1i</name></proto>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLint</ptype> <name>v0</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glUniform1i64ARB</name></proto>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLint64</ptype> <name>x</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glUniform1i64NV</name></proto>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLint64EXT</ptype> <name>x</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glUniform1i64vARB</name></proto>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param len="count*1">const <ptype>GLint64</ptype> *<name>value</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glUniform1i64vNV</name></proto>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param len="count*1">const <ptype>GLint64EXT</ptype> *<name>value</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glUniform1iARB</name></proto>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLint</ptype> <name>v0</name></param>
>+            <alias name="glUniform1i"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glUniform1iv</name></proto>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param len="count*1">const <ptype>GLint</ptype> *<name>value</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glUniform1ivARB</name></proto>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param len="count*1">const <ptype>GLint</ptype> *<name>value</name></param>
>+            <alias name="glUniform1iv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glUniform1ui</name></proto>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLuint</ptype> <name>v0</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glUniform1ui64ARB</name></proto>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLuint64</ptype> <name>x</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glUniform1ui64NV</name></proto>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLuint64EXT</ptype> <name>x</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glUniform1ui64vARB</name></proto>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param len="count*1">const <ptype>GLuint64</ptype> *<name>value</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glUniform1ui64vNV</name></proto>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param len="count*1">const <ptype>GLuint64EXT</ptype> *<name>value</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glUniform1uiEXT</name></proto>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLuint</ptype> <name>v0</name></param>
>+            <alias name="glUniform1ui"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glUniform1uiv</name></proto>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param len="count*1">const <ptype>GLuint</ptype> *<name>value</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glUniform1uivEXT</name></proto>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param len="count*1">const <ptype>GLuint</ptype> *<name>value</name></param>
>+            <alias name="glUniform1uiv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glUniform2d</name></proto>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLdouble</ptype> <name>x</name></param>
>+            <param><ptype>GLdouble</ptype> <name>y</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glUniform2dv</name></proto>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param len="count*2">const <ptype>GLdouble</ptype> *<name>value</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glUniform2f</name></proto>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLfloat</ptype> <name>v0</name></param>
>+            <param><ptype>GLfloat</ptype> <name>v1</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glUniform2fARB</name></proto>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLfloat</ptype> <name>v0</name></param>
>+            <param><ptype>GLfloat</ptype> <name>v1</name></param>
>+            <alias name="glUniform2f"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glUniform2fv</name></proto>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param len="count*2">const <ptype>GLfloat</ptype> *<name>value</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glUniform2fvARB</name></proto>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param len="count*2">const <ptype>GLfloat</ptype> *<name>value</name></param>
>+            <alias name="glUniform2fv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glUniform2i</name></proto>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLint</ptype> <name>v0</name></param>
>+            <param><ptype>GLint</ptype> <name>v1</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glUniform2i64ARB</name></proto>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLint64</ptype> <name>x</name></param>
>+            <param><ptype>GLint64</ptype> <name>y</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glUniform2i64NV</name></proto>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLint64EXT</ptype> <name>x</name></param>
>+            <param><ptype>GLint64EXT</ptype> <name>y</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glUniform2i64vARB</name></proto>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param len="count*2">const <ptype>GLint64</ptype> *<name>value</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glUniform2i64vNV</name></proto>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param len="count*2">const <ptype>GLint64EXT</ptype> *<name>value</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glUniform2iARB</name></proto>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLint</ptype> <name>v0</name></param>
>+            <param><ptype>GLint</ptype> <name>v1</name></param>
>+            <alias name="glUniform2i"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glUniform2iv</name></proto>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param len="count*2">const <ptype>GLint</ptype> *<name>value</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glUniform2ivARB</name></proto>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param len="count*2">const <ptype>GLint</ptype> *<name>value</name></param>
>+            <alias name="glUniform2iv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glUniform2ui</name></proto>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLuint</ptype> <name>v0</name></param>
>+            <param><ptype>GLuint</ptype> <name>v1</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glUniform2ui64ARB</name></proto>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLuint64</ptype> <name>x</name></param>
>+            <param><ptype>GLuint64</ptype> <name>y</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glUniform2ui64NV</name></proto>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLuint64EXT</ptype> <name>x</name></param>
>+            <param><ptype>GLuint64EXT</ptype> <name>y</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glUniform2ui64vARB</name></proto>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param len="count*2">const <ptype>GLuint64</ptype> *<name>value</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glUniform2ui64vNV</name></proto>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param len="count*2">const <ptype>GLuint64EXT</ptype> *<name>value</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glUniform2uiEXT</name></proto>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLuint</ptype> <name>v0</name></param>
>+            <param><ptype>GLuint</ptype> <name>v1</name></param>
>+            <alias name="glUniform2ui"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glUniform2uiv</name></proto>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param len="count*2">const <ptype>GLuint</ptype> *<name>value</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glUniform2uivEXT</name></proto>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param len="count*2">const <ptype>GLuint</ptype> *<name>value</name></param>
>+            <alias name="glUniform2uiv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glUniform3d</name></proto>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLdouble</ptype> <name>x</name></param>
>+            <param><ptype>GLdouble</ptype> <name>y</name></param>
>+            <param><ptype>GLdouble</ptype> <name>z</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glUniform3dv</name></proto>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param len="count*3">const <ptype>GLdouble</ptype> *<name>value</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glUniform3f</name></proto>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLfloat</ptype> <name>v0</name></param>
>+            <param><ptype>GLfloat</ptype> <name>v1</name></param>
>+            <param><ptype>GLfloat</ptype> <name>v2</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glUniform3fARB</name></proto>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLfloat</ptype> <name>v0</name></param>
>+            <param><ptype>GLfloat</ptype> <name>v1</name></param>
>+            <param><ptype>GLfloat</ptype> <name>v2</name></param>
>+            <alias name="glUniform3f"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glUniform3fv</name></proto>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param len="count*3">const <ptype>GLfloat</ptype> *<name>value</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glUniform3fvARB</name></proto>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param len="count*3">const <ptype>GLfloat</ptype> *<name>value</name></param>
>+            <alias name="glUniform3fv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glUniform3i</name></proto>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLint</ptype> <name>v0</name></param>
>+            <param><ptype>GLint</ptype> <name>v1</name></param>
>+            <param><ptype>GLint</ptype> <name>v2</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glUniform3i64ARB</name></proto>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLint64</ptype> <name>x</name></param>
>+            <param><ptype>GLint64</ptype> <name>y</name></param>
>+            <param><ptype>GLint64</ptype> <name>z</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glUniform3i64NV</name></proto>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLint64EXT</ptype> <name>x</name></param>
>+            <param><ptype>GLint64EXT</ptype> <name>y</name></param>
>+            <param><ptype>GLint64EXT</ptype> <name>z</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glUniform3i64vARB</name></proto>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param len="count*3">const <ptype>GLint64</ptype> *<name>value</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glUniform3i64vNV</name></proto>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param len="count*3">const <ptype>GLint64EXT</ptype> *<name>value</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glUniform3iARB</name></proto>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLint</ptype> <name>v0</name></param>
>+            <param><ptype>GLint</ptype> <name>v1</name></param>
>+            <param><ptype>GLint</ptype> <name>v2</name></param>
>+            <alias name="glUniform3i"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glUniform3iv</name></proto>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param len="count*3">const <ptype>GLint</ptype> *<name>value</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glUniform3ivARB</name></proto>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param len="count*3">const <ptype>GLint</ptype> *<name>value</name></param>
>+            <alias name="glUniform3iv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glUniform3ui</name></proto>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLuint</ptype> <name>v0</name></param>
>+            <param><ptype>GLuint</ptype> <name>v1</name></param>
>+            <param><ptype>GLuint</ptype> <name>v2</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glUniform3ui64ARB</name></proto>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLuint64</ptype> <name>x</name></param>
>+            <param><ptype>GLuint64</ptype> <name>y</name></param>
>+            <param><ptype>GLuint64</ptype> <name>z</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glUniform3ui64NV</name></proto>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLuint64EXT</ptype> <name>x</name></param>
>+            <param><ptype>GLuint64EXT</ptype> <name>y</name></param>
>+            <param><ptype>GLuint64EXT</ptype> <name>z</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glUniform3ui64vARB</name></proto>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param len="count*3">const <ptype>GLuint64</ptype> *<name>value</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glUniform3ui64vNV</name></proto>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param len="count*3">const <ptype>GLuint64EXT</ptype> *<name>value</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glUniform3uiEXT</name></proto>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLuint</ptype> <name>v0</name></param>
>+            <param><ptype>GLuint</ptype> <name>v1</name></param>
>+            <param><ptype>GLuint</ptype> <name>v2</name></param>
>+            <alias name="glUniform3ui"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glUniform3uiv</name></proto>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param len="count*3">const <ptype>GLuint</ptype> *<name>value</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glUniform3uivEXT</name></proto>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param len="count*3">const <ptype>GLuint</ptype> *<name>value</name></param>
>+            <alias name="glUniform3uiv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glUniform4d</name></proto>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLdouble</ptype> <name>x</name></param>
>+            <param><ptype>GLdouble</ptype> <name>y</name></param>
>+            <param><ptype>GLdouble</ptype> <name>z</name></param>
>+            <param><ptype>GLdouble</ptype> <name>w</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glUniform4dv</name></proto>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param len="count*4">const <ptype>GLdouble</ptype> *<name>value</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glUniform4f</name></proto>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLfloat</ptype> <name>v0</name></param>
>+            <param><ptype>GLfloat</ptype> <name>v1</name></param>
>+            <param><ptype>GLfloat</ptype> <name>v2</name></param>
>+            <param><ptype>GLfloat</ptype> <name>v3</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glUniform4fARB</name></proto>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLfloat</ptype> <name>v0</name></param>
>+            <param><ptype>GLfloat</ptype> <name>v1</name></param>
>+            <param><ptype>GLfloat</ptype> <name>v2</name></param>
>+            <param><ptype>GLfloat</ptype> <name>v3</name></param>
>+            <alias name="glUniform4f"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glUniform4fv</name></proto>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param len="count*4">const <ptype>GLfloat</ptype> *<name>value</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glUniform4fvARB</name></proto>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param len="count*4">const <ptype>GLfloat</ptype> *<name>value</name></param>
>+            <alias name="glUniform4fv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glUniform4i</name></proto>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLint</ptype> <name>v0</name></param>
>+            <param><ptype>GLint</ptype> <name>v1</name></param>
>+            <param><ptype>GLint</ptype> <name>v2</name></param>
>+            <param><ptype>GLint</ptype> <name>v3</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glUniform4i64ARB</name></proto>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLint64</ptype> <name>x</name></param>
>+            <param><ptype>GLint64</ptype> <name>y</name></param>
>+            <param><ptype>GLint64</ptype> <name>z</name></param>
>+            <param><ptype>GLint64</ptype> <name>w</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glUniform4i64NV</name></proto>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLint64EXT</ptype> <name>x</name></param>
>+            <param><ptype>GLint64EXT</ptype> <name>y</name></param>
>+            <param><ptype>GLint64EXT</ptype> <name>z</name></param>
>+            <param><ptype>GLint64EXT</ptype> <name>w</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glUniform4i64vARB</name></proto>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param len="count*4">const <ptype>GLint64</ptype> *<name>value</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glUniform4i64vNV</name></proto>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param len="count*4">const <ptype>GLint64EXT</ptype> *<name>value</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glUniform4iARB</name></proto>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLint</ptype> <name>v0</name></param>
>+            <param><ptype>GLint</ptype> <name>v1</name></param>
>+            <param><ptype>GLint</ptype> <name>v2</name></param>
>+            <param><ptype>GLint</ptype> <name>v3</name></param>
>+            <alias name="glUniform4i"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glUniform4iv</name></proto>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param len="count*4">const <ptype>GLint</ptype> *<name>value</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glUniform4ivARB</name></proto>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param len="count*4">const <ptype>GLint</ptype> *<name>value</name></param>
>+            <alias name="glUniform4iv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glUniform4ui</name></proto>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLuint</ptype> <name>v0</name></param>
>+            <param><ptype>GLuint</ptype> <name>v1</name></param>
>+            <param><ptype>GLuint</ptype> <name>v2</name></param>
>+            <param><ptype>GLuint</ptype> <name>v3</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glUniform4ui64ARB</name></proto>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLuint64</ptype> <name>x</name></param>
>+            <param><ptype>GLuint64</ptype> <name>y</name></param>
>+            <param><ptype>GLuint64</ptype> <name>z</name></param>
>+            <param><ptype>GLuint64</ptype> <name>w</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glUniform4ui64NV</name></proto>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLuint64EXT</ptype> <name>x</name></param>
>+            <param><ptype>GLuint64EXT</ptype> <name>y</name></param>
>+            <param><ptype>GLuint64EXT</ptype> <name>z</name></param>
>+            <param><ptype>GLuint64EXT</ptype> <name>w</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glUniform4ui64vARB</name></proto>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param len="count*4">const <ptype>GLuint64</ptype> *<name>value</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glUniform4ui64vNV</name></proto>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param len="count*4">const <ptype>GLuint64EXT</ptype> *<name>value</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glUniform4uiEXT</name></proto>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLuint</ptype> <name>v0</name></param>
>+            <param><ptype>GLuint</ptype> <name>v1</name></param>
>+            <param><ptype>GLuint</ptype> <name>v2</name></param>
>+            <param><ptype>GLuint</ptype> <name>v3</name></param>
>+            <alias name="glUniform4ui"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glUniform4uiv</name></proto>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param len="count*4">const <ptype>GLuint</ptype> *<name>value</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glUniform4uivEXT</name></proto>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param len="count*4">const <ptype>GLuint</ptype> *<name>value</name></param>
>+            <alias name="glUniform4uiv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glUniformBlockBinding</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param><ptype>GLuint</ptype> <name>uniformBlockIndex</name></param>
>+            <param><ptype>GLuint</ptype> <name>uniformBlockBinding</name></param>
>+            <glx type="render" opcode="366"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glUniformBufferEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLuint</ptype> <name>buffer</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glUniformHandleui64ARB</name></proto>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLuint64</ptype> <name>value</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glUniformHandleui64IMG</name></proto>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLuint64</ptype> <name>value</name></param>
>+            <alias name="glUniformHandleui64ARB"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glUniformHandleui64NV</name></proto>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLuint64</ptype> <name>value</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glUniformHandleui64vARB</name></proto>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param len="count">const <ptype>GLuint64</ptype> *<name>value</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glUniformHandleui64vIMG</name></proto>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param len="count">const <ptype>GLuint64</ptype> *<name>value</name></param>
>+            <alias name="glUniformHandleui64vARB"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glUniformHandleui64vNV</name></proto>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param len="count">const <ptype>GLuint64</ptype> *<name>value</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glUniformMatrix2dv</name></proto>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param group="Boolean"><ptype>GLboolean</ptype> <name>transpose</name></param>
>+            <param len="count*4">const <ptype>GLdouble</ptype> *<name>value</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glUniformMatrix2fv</name></proto>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param group="Boolean"><ptype>GLboolean</ptype> <name>transpose</name></param>
>+            <param len="count*4">const <ptype>GLfloat</ptype> *<name>value</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glUniformMatrix2fvARB</name></proto>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param group="Boolean"><ptype>GLboolean</ptype> <name>transpose</name></param>
>+            <param len="count*4">const <ptype>GLfloat</ptype> *<name>value</name></param>
>+            <alias name="glUniformMatrix2fv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glUniformMatrix2x3dv</name></proto>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param group="Boolean"><ptype>GLboolean</ptype> <name>transpose</name></param>
>+            <param len="count*6">const <ptype>GLdouble</ptype> *<name>value</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glUniformMatrix2x3fv</name></proto>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param group="Boolean"><ptype>GLboolean</ptype> <name>transpose</name></param>
>+            <param len="count*6">const <ptype>GLfloat</ptype> *<name>value</name></param>
>+            <glx type="render" opcode="305"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glUniformMatrix2x3fvNV</name></proto>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param group="Boolean"><ptype>GLboolean</ptype> <name>transpose</name></param>
>+            <param len="count*6">const <ptype>GLfloat</ptype> *<name>value</name></param>
>+            <alias name="glUniformMatrix2x3fv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glUniformMatrix2x4dv</name></proto>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param group="Boolean"><ptype>GLboolean</ptype> <name>transpose</name></param>
>+            <param len="count*8">const <ptype>GLdouble</ptype> *<name>value</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glUniformMatrix2x4fv</name></proto>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param group="Boolean"><ptype>GLboolean</ptype> <name>transpose</name></param>
>+            <param len="count*8">const <ptype>GLfloat</ptype> *<name>value</name></param>
>+            <glx type="render" opcode="307"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glUniformMatrix2x4fvNV</name></proto>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param group="Boolean"><ptype>GLboolean</ptype> <name>transpose</name></param>
>+            <param len="count*8">const <ptype>GLfloat</ptype> *<name>value</name></param>
>+            <alias name="glUniformMatrix2x4fv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glUniformMatrix3dv</name></proto>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param group="Boolean"><ptype>GLboolean</ptype> <name>transpose</name></param>
>+            <param len="count*9">const <ptype>GLdouble</ptype> *<name>value</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glUniformMatrix3fv</name></proto>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param group="Boolean"><ptype>GLboolean</ptype> <name>transpose</name></param>
>+            <param len="count*9">const <ptype>GLfloat</ptype> *<name>value</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glUniformMatrix3fvARB</name></proto>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param group="Boolean"><ptype>GLboolean</ptype> <name>transpose</name></param>
>+            <param len="count*9">const <ptype>GLfloat</ptype> *<name>value</name></param>
>+            <alias name="glUniformMatrix3fv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glUniformMatrix3x2dv</name></proto>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param group="Boolean"><ptype>GLboolean</ptype> <name>transpose</name></param>
>+            <param len="count*6">const <ptype>GLdouble</ptype> *<name>value</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glUniformMatrix3x2fv</name></proto>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param group="Boolean"><ptype>GLboolean</ptype> <name>transpose</name></param>
>+            <param len="count*6">const <ptype>GLfloat</ptype> *<name>value</name></param>
>+            <glx type="render" opcode="306"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glUniformMatrix3x2fvNV</name></proto>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param group="Boolean"><ptype>GLboolean</ptype> <name>transpose</name></param>
>+            <param len="count*6">const <ptype>GLfloat</ptype> *<name>value</name></param>
>+            <alias name="glUniformMatrix3x2fv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glUniformMatrix3x4dv</name></proto>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param group="Boolean"><ptype>GLboolean</ptype> <name>transpose</name></param>
>+            <param len="count*12">const <ptype>GLdouble</ptype> *<name>value</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glUniformMatrix3x4fv</name></proto>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param group="Boolean"><ptype>GLboolean</ptype> <name>transpose</name></param>
>+            <param len="count*12">const <ptype>GLfloat</ptype> *<name>value</name></param>
>+            <glx type="render" opcode="309"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glUniformMatrix3x4fvNV</name></proto>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param group="Boolean"><ptype>GLboolean</ptype> <name>transpose</name></param>
>+            <param len="count*12">const <ptype>GLfloat</ptype> *<name>value</name></param>
>+            <alias name="glUniformMatrix3x4fv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glUniformMatrix4dv</name></proto>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param group="Boolean"><ptype>GLboolean</ptype> <name>transpose</name></param>
>+            <param len="count*16">const <ptype>GLdouble</ptype> *<name>value</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glUniformMatrix4fv</name></proto>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param group="Boolean"><ptype>GLboolean</ptype> <name>transpose</name></param>
>+            <param len="count*16">const <ptype>GLfloat</ptype> *<name>value</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glUniformMatrix4fvARB</name></proto>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param group="Boolean"><ptype>GLboolean</ptype> <name>transpose</name></param>
>+            <param len="count*16">const <ptype>GLfloat</ptype> *<name>value</name></param>
>+            <alias name="glUniformMatrix4fv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glUniformMatrix4x2dv</name></proto>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param group="Boolean"><ptype>GLboolean</ptype> <name>transpose</name></param>
>+            <param len="count*8">const <ptype>GLdouble</ptype> *<name>value</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glUniformMatrix4x2fv</name></proto>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param group="Boolean"><ptype>GLboolean</ptype> <name>transpose</name></param>
>+            <param len="count*8">const <ptype>GLfloat</ptype> *<name>value</name></param>
>+            <glx type="render" opcode="308"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glUniformMatrix4x2fvNV</name></proto>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param group="Boolean"><ptype>GLboolean</ptype> <name>transpose</name></param>
>+            <param len="count*8">const <ptype>GLfloat</ptype> *<name>value</name></param>
>+            <alias name="glUniformMatrix4x2fv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glUniformMatrix4x3dv</name></proto>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param group="Boolean"><ptype>GLboolean</ptype> <name>transpose</name></param>
>+            <param len="count*12">const <ptype>GLdouble</ptype> *<name>value</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glUniformMatrix4x3fv</name></proto>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param group="Boolean"><ptype>GLboolean</ptype> <name>transpose</name></param>
>+            <param len="count*12">const <ptype>GLfloat</ptype> *<name>value</name></param>
>+            <glx type="render" opcode="310"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glUniformMatrix4x3fvNV</name></proto>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param group="Boolean"><ptype>GLboolean</ptype> <name>transpose</name></param>
>+            <param len="count*12">const <ptype>GLfloat</ptype> *<name>value</name></param>
>+            <alias name="glUniformMatrix4x3fv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glUniformSubroutinesuiv</name></proto>
>+            <param group="ShaderType"><ptype>GLenum</ptype> <name>shadertype</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param len="count">const <ptype>GLuint</ptype> *<name>indices</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glUniformui64NV</name></proto>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLuint64EXT</ptype> <name>value</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glUniformui64vNV</name></proto>
>+            <param><ptype>GLint</ptype> <name>location</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param len="count*1">const <ptype>GLuint64EXT</ptype> *<name>value</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glUnlockArraysEXT</name></proto>
>+        </command>
>+        <command>
>+            <proto group="Boolean"><ptype>GLboolean</ptype> <name>glUnmapBuffer</name></proto>
>+            <param group="BufferTargetARB"><ptype>GLenum</ptype> <name>target</name></param>
>+        </command>
>+        <command>
>+            <proto group="Boolean"><ptype>GLboolean</ptype> <name>glUnmapBufferARB</name></proto>
>+            <param group="BufferTargetARB"><ptype>GLenum</ptype> <name>target</name></param>
>+            <alias name="glUnmapBuffer"/>
>+        </command>
>+        <command>
>+            <proto><ptype>GLboolean</ptype> <name>glUnmapBufferOES</name></proto>
>+            <param><ptype>GLenum</ptype> <name>target</name></param>
>+            <alias name="glUnmapBuffer"/>
>+        </command>
>+        <command>
>+            <proto><ptype>GLboolean</ptype> <name>glUnmapNamedBuffer</name></proto>
>+            <param><ptype>GLuint</ptype> <name>buffer</name></param>
>+        </command>
>+        <command>
>+            <proto group="Boolean"><ptype>GLboolean</ptype> <name>glUnmapNamedBufferEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>buffer</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glUnmapObjectBufferATI</name></proto>
>+            <param><ptype>GLuint</ptype> <name>buffer</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glUnmapTexture2DINTEL</name></proto>
>+            <param><ptype>GLuint</ptype> <name>texture</name></param>
>+            <param><ptype>GLint</ptype> <name>level</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glUpdateObjectBufferATI</name></proto>
>+            <param><ptype>GLuint</ptype> <name>buffer</name></param>
>+            <param><ptype>GLuint</ptype> <name>offset</name></param>
>+            <param><ptype>GLsizei</ptype> <name>size</name></param>
>+            <param len="size">const void *<name>pointer</name></param>
>+            <param group="PreserveModeATI"><ptype>GLenum</ptype> <name>preserve</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glUseProgram</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glUseProgramObjectARB</name></proto>
>+            <param group="handleARB"><ptype>GLhandleARB</ptype> <name>programObj</name></param>
>+            <alias name="glUseProgram"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glUseProgramStages</name></proto>
>+            <param><ptype>GLuint</ptype> <name>pipeline</name></param>
>+            <param group="UseProgramStageMask"><ptype>GLbitfield</ptype> <name>stages</name></param>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glUseProgramStagesEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>pipeline</name></param>
>+            <param group="UseProgramStageMask"><ptype>GLbitfield</ptype> <name>stages</name></param>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glUseShaderProgramEXT</name></proto>
>+            <param><ptype>GLenum</ptype> <name>type</name></param>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glVDPAUFiniNV</name></proto>
>+        </command>
>+        <command>
>+            <proto>void <name>glVDPAUGetSurfaceivNV</name></proto>
>+            <param group="vdpauSurfaceNV"><ptype>GLvdpauSurfaceNV</ptype> <name>surface</name></param>
>+            <param><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param><ptype>GLsizei</ptype> <name>bufSize</name></param>
>+            <param><ptype>GLsizei</ptype> *<name>length</name></param>
>+            <param len="bufSize"><ptype>GLint</ptype> *<name>values</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glVDPAUInitNV</name></proto>
>+            <param>const void *<name>vdpDevice</name></param>
>+            <param>const void *<name>getProcAddress</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>GLboolean</ptype> <name>glVDPAUIsSurfaceNV</name></proto>
>+            <param group="vdpauSurfaceNV"><ptype>GLvdpauSurfaceNV</ptype> <name>surface</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glVDPAUMapSurfacesNV</name></proto>
>+            <param><ptype>GLsizei</ptype> <name>numSurfaces</name></param>
>+            <param group="vdpauSurfaceNV" len="numSurfaces">const <ptype>GLvdpauSurfaceNV</ptype> *<name>surfaces</name></param>
>+        </command>
>+        <command>
>+            <proto group="vdpauSurfaceNV"><ptype>GLvdpauSurfaceNV</ptype> <name>glVDPAURegisterOutputSurfaceNV</name></proto>
>+            <param>const void *<name>vdpSurface</name></param>
>+            <param><ptype>GLenum</ptype> <name>target</name></param>
>+            <param><ptype>GLsizei</ptype> <name>numTextureNames</name></param>
>+            <param len="numTextureNames">const <ptype>GLuint</ptype> *<name>textureNames</name></param>
>+        </command>
>+        <command>
>+            <proto group="vdpauSurfaceNV"><ptype>GLvdpauSurfaceNV</ptype> <name>glVDPAURegisterVideoSurfaceNV</name></proto>
>+            <param>const void *<name>vdpSurface</name></param>
>+            <param><ptype>GLenum</ptype> <name>target</name></param>
>+            <param><ptype>GLsizei</ptype> <name>numTextureNames</name></param>
>+            <param len="numTextureNames">const <ptype>GLuint</ptype> *<name>textureNames</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glVDPAUSurfaceAccessNV</name></proto>
>+            <param group="vdpauSurfaceNV"><ptype>GLvdpauSurfaceNV</ptype> <name>surface</name></param>
>+            <param><ptype>GLenum</ptype> <name>access</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glVDPAUUnmapSurfacesNV</name></proto>
>+            <param><ptype>GLsizei</ptype> <name>numSurface</name></param>
>+            <param group="vdpauSurfaceNV" len="numSurface">const <ptype>GLvdpauSurfaceNV</ptype> *<name>surfaces</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glVDPAUUnregisterSurfaceNV</name></proto>
>+            <param group="vdpauSurfaceNV"><ptype>GLvdpauSurfaceNV</ptype> <name>surface</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glValidateProgram</name></proto>
>+            <param><ptype>GLuint</ptype> <name>program</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glValidateProgramARB</name></proto>
>+            <param group="handleARB"><ptype>GLhandleARB</ptype> <name>programObj</name></param>
>+            <alias name="glValidateProgram"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glValidateProgramPipeline</name></proto>
>+            <param><ptype>GLuint</ptype> <name>pipeline</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glValidateProgramPipelineEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>pipeline</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glVariantArrayObjectATI</name></proto>
>+            <param><ptype>GLuint</ptype> <name>id</name></param>
>+            <param group="ScalarType"><ptype>GLenum</ptype> <name>type</name></param>
>+            <param><ptype>GLsizei</ptype> <name>stride</name></param>
>+            <param><ptype>GLuint</ptype> <name>buffer</name></param>
>+            <param><ptype>GLuint</ptype> <name>offset</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glVariantPointerEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>id</name></param>
>+            <param group="ScalarType"><ptype>GLenum</ptype> <name>type</name></param>
>+            <param><ptype>GLuint</ptype> <name>stride</name></param>
>+            <param len="COMPSIZE(id,type,stride)">const void *<name>addr</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glVariantbvEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>id</name></param>
>+            <param len="COMPSIZE(id)">const <ptype>GLbyte</ptype> *<name>addr</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glVariantdvEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>id</name></param>
>+            <param len="COMPSIZE(id)">const <ptype>GLdouble</ptype> *<name>addr</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glVariantfvEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>id</name></param>
>+            <param len="COMPSIZE(id)">const <ptype>GLfloat</ptype> *<name>addr</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glVariantivEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>id</name></param>
>+            <param len="COMPSIZE(id)">const <ptype>GLint</ptype> *<name>addr</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glVariantsvEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>id</name></param>
>+            <param len="COMPSIZE(id)">const <ptype>GLshort</ptype> *<name>addr</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glVariantubvEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>id</name></param>
>+            <param len="COMPSIZE(id)">const <ptype>GLubyte</ptype> *<name>addr</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glVariantuivEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>id</name></param>
>+            <param len="COMPSIZE(id)">const <ptype>GLuint</ptype> *<name>addr</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glVariantusvEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>id</name></param>
>+            <param len="COMPSIZE(id)">const <ptype>GLushort</ptype> *<name>addr</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertex2bOES</name></proto>
>+            <param><ptype>GLbyte</ptype> <name>x</name></param>
>+            <param><ptype>GLbyte</ptype> <name>y</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertex2bvOES</name></proto>
>+            <param len="2">const <ptype>GLbyte</ptype> *<name>coords</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertex2d</name></proto>
>+            <param group="CoordD"><ptype>GLdouble</ptype> <name>x</name></param>
>+            <param group="CoordD"><ptype>GLdouble</ptype> <name>y</name></param>
>+            <vecequiv name="glVertex2dv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertex2dv</name></proto>
>+            <param group="CoordD" len="2">const <ptype>GLdouble</ptype> *<name>v</name></param>
>+            <glx type="render" opcode="65"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertex2f</name></proto>
>+            <param group="CoordF"><ptype>GLfloat</ptype> <name>x</name></param>
>+            <param group="CoordF"><ptype>GLfloat</ptype> <name>y</name></param>
>+            <vecequiv name="glVertex2fv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertex2fv</name></proto>
>+            <param group="CoordF" len="2">const <ptype>GLfloat</ptype> *<name>v</name></param>
>+            <glx type="render" opcode="66"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertex2hNV</name></proto>
>+            <param group="Half16NV"><ptype>GLhalfNV</ptype> <name>x</name></param>
>+            <param group="Half16NV"><ptype>GLhalfNV</ptype> <name>y</name></param>
>+            <vecequiv name="glVertex2hvNV"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertex2hvNV</name></proto>
>+            <param group="Half16NV" len="2">const <ptype>GLhalfNV</ptype> *<name>v</name></param>
>+            <glx type="render" opcode="4240"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertex2i</name></proto>
>+            <param group="CoordI"><ptype>GLint</ptype> <name>x</name></param>
>+            <param group="CoordI"><ptype>GLint</ptype> <name>y</name></param>
>+            <vecequiv name="glVertex2iv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertex2iv</name></proto>
>+            <param group="CoordI" len="2">const <ptype>GLint</ptype> *<name>v</name></param>
>+            <glx type="render" opcode="67"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertex2s</name></proto>
>+            <param group="CoordS"><ptype>GLshort</ptype> <name>x</name></param>
>+            <param group="CoordS"><ptype>GLshort</ptype> <name>y</name></param>
>+            <vecequiv name="glVertex2sv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertex2sv</name></proto>
>+            <param group="CoordS" len="2">const <ptype>GLshort</ptype> *<name>v</name></param>
>+            <glx type="render" opcode="68"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertex2xOES</name></proto>
>+            <param><ptype>GLfixed</ptype> <name>x</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertex2xvOES</name></proto>
>+            <param len="2">const <ptype>GLfixed</ptype> *<name>coords</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertex3bOES</name></proto>
>+            <param><ptype>GLbyte</ptype> <name>x</name></param>
>+            <param><ptype>GLbyte</ptype> <name>y</name></param>
>+            <param><ptype>GLbyte</ptype> <name>z</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertex3bvOES</name></proto>
>+            <param len="3">const <ptype>GLbyte</ptype> *<name>coords</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertex3d</name></proto>
>+            <param group="CoordD"><ptype>GLdouble</ptype> <name>x</name></param>
>+            <param group="CoordD"><ptype>GLdouble</ptype> <name>y</name></param>
>+            <param group="CoordD"><ptype>GLdouble</ptype> <name>z</name></param>
>+            <vecequiv name="glVertex3dv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertex3dv</name></proto>
>+            <param group="CoordD" len="3">const <ptype>GLdouble</ptype> *<name>v</name></param>
>+            <glx type="render" opcode="69"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertex3f</name></proto>
>+            <param group="CoordF"><ptype>GLfloat</ptype> <name>x</name></param>
>+            <param group="CoordF"><ptype>GLfloat</ptype> <name>y</name></param>
>+            <param group="CoordF"><ptype>GLfloat</ptype> <name>z</name></param>
>+            <vecequiv name="glVertex3fv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertex3fv</name></proto>
>+            <param group="CoordF" len="3">const <ptype>GLfloat</ptype> *<name>v</name></param>
>+            <glx type="render" opcode="70"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertex3hNV</name></proto>
>+            <param group="Half16NV"><ptype>GLhalfNV</ptype> <name>x</name></param>
>+            <param group="Half16NV"><ptype>GLhalfNV</ptype> <name>y</name></param>
>+            <param group="Half16NV"><ptype>GLhalfNV</ptype> <name>z</name></param>
>+            <vecequiv name="glVertex3hvNV"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertex3hvNV</name></proto>
>+            <param group="Half16NV" len="3">const <ptype>GLhalfNV</ptype> *<name>v</name></param>
>+            <glx type="render" opcode="4241"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertex3i</name></proto>
>+            <param group="CoordI"><ptype>GLint</ptype> <name>x</name></param>
>+            <param group="CoordI"><ptype>GLint</ptype> <name>y</name></param>
>+            <param group="CoordI"><ptype>GLint</ptype> <name>z</name></param>
>+            <vecequiv name="glVertex3iv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertex3iv</name></proto>
>+            <param group="CoordI" len="3">const <ptype>GLint</ptype> *<name>v</name></param>
>+            <glx type="render" opcode="71"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertex3s</name></proto>
>+            <param group="CoordS"><ptype>GLshort</ptype> <name>x</name></param>
>+            <param group="CoordS"><ptype>GLshort</ptype> <name>y</name></param>
>+            <param group="CoordS"><ptype>GLshort</ptype> <name>z</name></param>
>+            <vecequiv name="glVertex3sv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertex3sv</name></proto>
>+            <param group="CoordS" len="3">const <ptype>GLshort</ptype> *<name>v</name></param>
>+            <glx type="render" opcode="72"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertex3xOES</name></proto>
>+            <param><ptype>GLfixed</ptype> <name>x</name></param>
>+            <param><ptype>GLfixed</ptype> <name>y</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertex3xvOES</name></proto>
>+            <param len="3">const <ptype>GLfixed</ptype> *<name>coords</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertex4bOES</name></proto>
>+            <param><ptype>GLbyte</ptype> <name>x</name></param>
>+            <param><ptype>GLbyte</ptype> <name>y</name></param>
>+            <param><ptype>GLbyte</ptype> <name>z</name></param>
>+            <param><ptype>GLbyte</ptype> <name>w</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertex4bvOES</name></proto>
>+            <param len="4">const <ptype>GLbyte</ptype> *<name>coords</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertex4d</name></proto>
>+            <param group="CoordD"><ptype>GLdouble</ptype> <name>x</name></param>
>+            <param group="CoordD"><ptype>GLdouble</ptype> <name>y</name></param>
>+            <param group="CoordD"><ptype>GLdouble</ptype> <name>z</name></param>
>+            <param group="CoordD"><ptype>GLdouble</ptype> <name>w</name></param>
>+            <vecequiv name="glVertex4dv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertex4dv</name></proto>
>+            <param group="CoordD" len="4">const <ptype>GLdouble</ptype> *<name>v</name></param>
>+            <glx type="render" opcode="73"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertex4f</name></proto>
>+            <param group="CoordF"><ptype>GLfloat</ptype> <name>x</name></param>
>+            <param group="CoordF"><ptype>GLfloat</ptype> <name>y</name></param>
>+            <param group="CoordF"><ptype>GLfloat</ptype> <name>z</name></param>
>+            <param group="CoordF"><ptype>GLfloat</ptype> <name>w</name></param>
>+            <vecequiv name="glVertex4fv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertex4fv</name></proto>
>+            <param group="CoordF" len="4">const <ptype>GLfloat</ptype> *<name>v</name></param>
>+            <glx type="render" opcode="74"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertex4hNV</name></proto>
>+            <param group="Half16NV"><ptype>GLhalfNV</ptype> <name>x</name></param>
>+            <param group="Half16NV"><ptype>GLhalfNV</ptype> <name>y</name></param>
>+            <param group="Half16NV"><ptype>GLhalfNV</ptype> <name>z</name></param>
>+            <param group="Half16NV"><ptype>GLhalfNV</ptype> <name>w</name></param>
>+            <vecequiv name="glVertex4hvNV"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertex4hvNV</name></proto>
>+            <param group="Half16NV" len="4">const <ptype>GLhalfNV</ptype> *<name>v</name></param>
>+            <glx type="render" opcode="4242"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertex4i</name></proto>
>+            <param group="CoordI"><ptype>GLint</ptype> <name>x</name></param>
>+            <param group="CoordI"><ptype>GLint</ptype> <name>y</name></param>
>+            <param group="CoordI"><ptype>GLint</ptype> <name>z</name></param>
>+            <param group="CoordI"><ptype>GLint</ptype> <name>w</name></param>
>+            <vecequiv name="glVertex4iv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertex4iv</name></proto>
>+            <param group="CoordI" len="4">const <ptype>GLint</ptype> *<name>v</name></param>
>+            <glx type="render" opcode="75"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertex4s</name></proto>
>+            <param group="CoordS"><ptype>GLshort</ptype> <name>x</name></param>
>+            <param group="CoordS"><ptype>GLshort</ptype> <name>y</name></param>
>+            <param group="CoordS"><ptype>GLshort</ptype> <name>z</name></param>
>+            <param group="CoordS"><ptype>GLshort</ptype> <name>w</name></param>
>+            <vecequiv name="glVertex4sv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertex4sv</name></proto>
>+            <param group="CoordS" len="4">const <ptype>GLshort</ptype> *<name>v</name></param>
>+            <glx type="render" opcode="76"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertex4xOES</name></proto>
>+            <param><ptype>GLfixed</ptype> <name>x</name></param>
>+            <param><ptype>GLfixed</ptype> <name>y</name></param>
>+            <param><ptype>GLfixed</ptype> <name>z</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertex4xvOES</name></proto>
>+            <param len="4">const <ptype>GLfixed</ptype> *<name>coords</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexArrayAttribBinding</name></proto>
>+            <param><ptype>GLuint</ptype> <name>vaobj</name></param>
>+            <param><ptype>GLuint</ptype> <name>attribindex</name></param>
>+            <param><ptype>GLuint</ptype> <name>bindingindex</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexArrayAttribFormat</name></proto>
>+            <param><ptype>GLuint</ptype> <name>vaobj</name></param>
>+            <param><ptype>GLuint</ptype> <name>attribindex</name></param>
>+            <param><ptype>GLint</ptype> <name>size</name></param>
>+            <param group="VertexAttribType"><ptype>GLenum</ptype> <name>type</name></param>
>+            <param><ptype>GLboolean</ptype> <name>normalized</name></param>
>+            <param><ptype>GLuint</ptype> <name>relativeoffset</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexArrayAttribIFormat</name></proto>
>+            <param><ptype>GLuint</ptype> <name>vaobj</name></param>
>+            <param><ptype>GLuint</ptype> <name>attribindex</name></param>
>+            <param><ptype>GLint</ptype> <name>size</name></param>
>+            <param group="VertexAttribType"><ptype>GLenum</ptype> <name>type</name></param>
>+            <param><ptype>GLuint</ptype> <name>relativeoffset</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexArrayAttribLFormat</name></proto>
>+            <param><ptype>GLuint</ptype> <name>vaobj</name></param>
>+            <param><ptype>GLuint</ptype> <name>attribindex</name></param>
>+            <param><ptype>GLint</ptype> <name>size</name></param>
>+            <param group="VertexAttribType"><ptype>GLenum</ptype> <name>type</name></param>
>+            <param><ptype>GLuint</ptype> <name>relativeoffset</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexArrayBindVertexBufferEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>vaobj</name></param>
>+            <param><ptype>GLuint</ptype> <name>bindingindex</name></param>
>+            <param><ptype>GLuint</ptype> <name>buffer</name></param>
>+            <param group="BufferOffset"><ptype>GLintptr</ptype> <name>offset</name></param>
>+            <param><ptype>GLsizei</ptype> <name>stride</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexArrayBindingDivisor</name></proto>
>+            <param><ptype>GLuint</ptype> <name>vaobj</name></param>
>+            <param><ptype>GLuint</ptype> <name>bindingindex</name></param>
>+            <param><ptype>GLuint</ptype> <name>divisor</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexArrayColorOffsetEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>vaobj</name></param>
>+            <param><ptype>GLuint</ptype> <name>buffer</name></param>
>+            <param><ptype>GLint</ptype> <name>size</name></param>
>+            <param group="ColorPointerType"><ptype>GLenum</ptype> <name>type</name></param>
>+            <param><ptype>GLsizei</ptype> <name>stride</name></param>
>+            <param><ptype>GLintptr</ptype> <name>offset</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexArrayEdgeFlagOffsetEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>vaobj</name></param>
>+            <param><ptype>GLuint</ptype> <name>buffer</name></param>
>+            <param><ptype>GLsizei</ptype> <name>stride</name></param>
>+            <param><ptype>GLintptr</ptype> <name>offset</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexArrayElementBuffer</name></proto>
>+            <param><ptype>GLuint</ptype> <name>vaobj</name></param>
>+            <param><ptype>GLuint</ptype> <name>buffer</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexArrayFogCoordOffsetEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>vaobj</name></param>
>+            <param><ptype>GLuint</ptype> <name>buffer</name></param>
>+            <param group="FogCoordinatePointerType"><ptype>GLenum</ptype> <name>type</name></param>
>+            <param><ptype>GLsizei</ptype> <name>stride</name></param>
>+            <param><ptype>GLintptr</ptype> <name>offset</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexArrayIndexOffsetEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>vaobj</name></param>
>+            <param><ptype>GLuint</ptype> <name>buffer</name></param>
>+            <param group="IndexPointerType"><ptype>GLenum</ptype> <name>type</name></param>
>+            <param><ptype>GLsizei</ptype> <name>stride</name></param>
>+            <param><ptype>GLintptr</ptype> <name>offset</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexArrayMultiTexCoordOffsetEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>vaobj</name></param>
>+            <param><ptype>GLuint</ptype> <name>buffer</name></param>
>+            <param><ptype>GLenum</ptype> <name>texunit</name></param>
>+            <param><ptype>GLint</ptype> <name>size</name></param>
>+            <param group="TexCoordPointerType"><ptype>GLenum</ptype> <name>type</name></param>
>+            <param><ptype>GLsizei</ptype> <name>stride</name></param>
>+            <param><ptype>GLintptr</ptype> <name>offset</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexArrayNormalOffsetEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>vaobj</name></param>
>+            <param><ptype>GLuint</ptype> <name>buffer</name></param>
>+            <param group="NormalPointerType"><ptype>GLenum</ptype> <name>type</name></param>
>+            <param><ptype>GLsizei</ptype> <name>stride</name></param>
>+            <param><ptype>GLintptr</ptype> <name>offset</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexArrayParameteriAPPLE</name></proto>
>+            <param group="VertexArrayPNameAPPLE"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param><ptype>GLint</ptype> <name>param</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexArrayRangeAPPLE</name></proto>
>+            <param><ptype>GLsizei</ptype> <name>length</name></param>
>+            <param len="length">void *<name>pointer</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexArrayRangeNV</name></proto>
>+            <param><ptype>GLsizei</ptype> <name>length</name></param>
>+            <param len="COMPSIZE(length)">const void *<name>pointer</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexArraySecondaryColorOffsetEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>vaobj</name></param>
>+            <param><ptype>GLuint</ptype> <name>buffer</name></param>
>+            <param><ptype>GLint</ptype> <name>size</name></param>
>+            <param group="ColorPointerType"><ptype>GLenum</ptype> <name>type</name></param>
>+            <param><ptype>GLsizei</ptype> <name>stride</name></param>
>+            <param><ptype>GLintptr</ptype> <name>offset</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexArrayTexCoordOffsetEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>vaobj</name></param>
>+            <param><ptype>GLuint</ptype> <name>buffer</name></param>
>+            <param><ptype>GLint</ptype> <name>size</name></param>
>+            <param group="TexCoordPointerType"><ptype>GLenum</ptype> <name>type</name></param>
>+            <param><ptype>GLsizei</ptype> <name>stride</name></param>
>+            <param><ptype>GLintptr</ptype> <name>offset</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexArrayVertexAttribBindingEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>vaobj</name></param>
>+            <param><ptype>GLuint</ptype> <name>attribindex</name></param>
>+            <param><ptype>GLuint</ptype> <name>bindingindex</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexArrayVertexAttribDivisorEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>vaobj</name></param>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param><ptype>GLuint</ptype> <name>divisor</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexArrayVertexAttribFormatEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>vaobj</name></param>
>+            <param><ptype>GLuint</ptype> <name>attribindex</name></param>
>+            <param><ptype>GLint</ptype> <name>size</name></param>
>+            <param><ptype>GLenum</ptype> <name>type</name></param>
>+            <param group="Boolean"><ptype>GLboolean</ptype> <name>normalized</name></param>
>+            <param><ptype>GLuint</ptype> <name>relativeoffset</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexArrayVertexAttribIFormatEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>vaobj</name></param>
>+            <param><ptype>GLuint</ptype> <name>attribindex</name></param>
>+            <param><ptype>GLint</ptype> <name>size</name></param>
>+            <param><ptype>GLenum</ptype> <name>type</name></param>
>+            <param><ptype>GLuint</ptype> <name>relativeoffset</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexArrayVertexAttribIOffsetEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>vaobj</name></param>
>+            <param><ptype>GLuint</ptype> <name>buffer</name></param>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param><ptype>GLint</ptype> <name>size</name></param>
>+            <param group="VertexAttribEnum"><ptype>GLenum</ptype> <name>type</name></param>
>+            <param><ptype>GLsizei</ptype> <name>stride</name></param>
>+            <param><ptype>GLintptr</ptype> <name>offset</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexArrayVertexAttribLFormatEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>vaobj</name></param>
>+            <param><ptype>GLuint</ptype> <name>attribindex</name></param>
>+            <param><ptype>GLint</ptype> <name>size</name></param>
>+            <param><ptype>GLenum</ptype> <name>type</name></param>
>+            <param><ptype>GLuint</ptype> <name>relativeoffset</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexArrayVertexAttribLOffsetEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>vaobj</name></param>
>+            <param><ptype>GLuint</ptype> <name>buffer</name></param>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param><ptype>GLint</ptype> <name>size</name></param>
>+            <param><ptype>GLenum</ptype> <name>type</name></param>
>+            <param><ptype>GLsizei</ptype> <name>stride</name></param>
>+            <param group="BufferOffset"><ptype>GLintptr</ptype> <name>offset</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexArrayVertexAttribOffsetEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>vaobj</name></param>
>+            <param><ptype>GLuint</ptype> <name>buffer</name></param>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param><ptype>GLint</ptype> <name>size</name></param>
>+            <param group="VertexAttribPointerType"><ptype>GLenum</ptype> <name>type</name></param>
>+            <param><ptype>GLboolean</ptype> <name>normalized</name></param>
>+            <param><ptype>GLsizei</ptype> <name>stride</name></param>
>+            <param><ptype>GLintptr</ptype> <name>offset</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexArrayVertexBindingDivisorEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>vaobj</name></param>
>+            <param><ptype>GLuint</ptype> <name>bindingindex</name></param>
>+            <param><ptype>GLuint</ptype> <name>divisor</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexArrayVertexBuffer</name></proto>
>+            <param><ptype>GLuint</ptype> <name>vaobj</name></param>
>+            <param><ptype>GLuint</ptype> <name>bindingindex</name></param>
>+            <param><ptype>GLuint</ptype> <name>buffer</name></param>
>+            <param><ptype>GLintptr</ptype> <name>offset</name></param>
>+            <param><ptype>GLsizei</ptype> <name>stride</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexArrayVertexBuffers</name></proto>
>+            <param><ptype>GLuint</ptype> <name>vaobj</name></param>
>+            <param><ptype>GLuint</ptype> <name>first</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param>const <ptype>GLuint</ptype> *<name>buffers</name></param>
>+            <param>const <ptype>GLintptr</ptype> *<name>offsets</name></param>
>+            <param>const <ptype>GLsizei</ptype> *<name>strides</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexArrayVertexOffsetEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>vaobj</name></param>
>+            <param><ptype>GLuint</ptype> <name>buffer</name></param>
>+            <param><ptype>GLint</ptype> <name>size</name></param>
>+            <param group="VertexPointerType"><ptype>GLenum</ptype> <name>type</name></param>
>+            <param><ptype>GLsizei</ptype> <name>stride</name></param>
>+            <param><ptype>GLintptr</ptype> <name>offset</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexAttrib1d</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param><ptype>GLdouble</ptype> <name>x</name></param>
>+            <vecequiv name="glVertexAttrib1dv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexAttrib1dARB</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param><ptype>GLdouble</ptype> <name>x</name></param>
>+            <alias name="glVertexAttrib1d"/>
>+            <vecequiv name="glVertexAttrib1dvARB"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexAttrib1dNV</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param><ptype>GLdouble</ptype> <name>x</name></param>
>+            <alias name="glVertexAttrib1d"/>
>+            <vecequiv name="glVertexAttrib1dvNV"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexAttrib1dv</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param len="1">const <ptype>GLdouble</ptype> *<name>v</name></param>
>+            <glx type="render" opcode="4197"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexAttrib1dvARB</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param len="1">const <ptype>GLdouble</ptype> *<name>v</name></param>
>+            <alias name="glVertexAttrib1dv"/>
>+            <glx type="render" opcode="4197"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexAttrib1dvNV</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param len="1">const <ptype>GLdouble</ptype> *<name>v</name></param>
>+            <alias name="glVertexAttrib1dv"/>
>+            <glx type="render" opcode="4197"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexAttrib1f</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param><ptype>GLfloat</ptype> <name>x</name></param>
>+            <vecequiv name="glVertexAttrib1fv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexAttrib1fARB</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param><ptype>GLfloat</ptype> <name>x</name></param>
>+            <alias name="glVertexAttrib1f"/>
>+            <vecequiv name="glVertexAttrib1fvARB"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexAttrib1fNV</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param><ptype>GLfloat</ptype> <name>x</name></param>
>+            <alias name="glVertexAttrib1f"/>
>+            <vecequiv name="glVertexAttrib1fvNV"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexAttrib1fv</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param len="1">const <ptype>GLfloat</ptype> *<name>v</name></param>
>+            <glx type="render" opcode="4193"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexAttrib1fvARB</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param len="1">const <ptype>GLfloat</ptype> *<name>v</name></param>
>+            <alias name="glVertexAttrib1fv"/>
>+            <glx type="render" opcode="4193"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexAttrib1fvNV</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param len="1">const <ptype>GLfloat</ptype> *<name>v</name></param>
>+            <alias name="glVertexAttrib1fv"/>
>+            <glx type="render" opcode="4193"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexAttrib1hNV</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param group="Half16NV"><ptype>GLhalfNV</ptype> <name>x</name></param>
>+            <vecequiv name="glVertexAttrib1hvNV"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexAttrib1hvNV</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param group="Half16NV" len="1">const <ptype>GLhalfNV</ptype> *<name>v</name></param>
>+            <glx type="render" opcode="4257"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexAttrib1s</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param><ptype>GLshort</ptype> <name>x</name></param>
>+            <vecequiv name="glVertexAttrib1sv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexAttrib1sARB</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param><ptype>GLshort</ptype> <name>x</name></param>
>+            <alias name="glVertexAttrib1s"/>
>+            <vecequiv name="glVertexAttrib1svARB"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexAttrib1sNV</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param><ptype>GLshort</ptype> <name>x</name></param>
>+            <alias name="glVertexAttrib1s"/>
>+            <vecequiv name="glVertexAttrib1svNV"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexAttrib1sv</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param len="1">const <ptype>GLshort</ptype> *<name>v</name></param>
>+            <glx type="render" opcode="4189"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexAttrib1svARB</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param len="1">const <ptype>GLshort</ptype> *<name>v</name></param>
>+            <alias name="glVertexAttrib1sv"/>
>+            <glx type="render" opcode="4189"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexAttrib1svNV</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param len="1">const <ptype>GLshort</ptype> *<name>v</name></param>
>+            <alias name="glVertexAttrib1sv"/>
>+            <glx type="render" opcode="4189"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexAttrib2d</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param><ptype>GLdouble</ptype> <name>x</name></param>
>+            <param><ptype>GLdouble</ptype> <name>y</name></param>
>+            <vecequiv name="glVertexAttrib2dv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexAttrib2dARB</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param><ptype>GLdouble</ptype> <name>x</name></param>
>+            <param><ptype>GLdouble</ptype> <name>y</name></param>
>+            <alias name="glVertexAttrib2d"/>
>+            <vecequiv name="glVertexAttrib2dvARB"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexAttrib2dNV</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param><ptype>GLdouble</ptype> <name>x</name></param>
>+            <param><ptype>GLdouble</ptype> <name>y</name></param>
>+            <alias name="glVertexAttrib2d"/>
>+            <vecequiv name="glVertexAttrib2dvNV"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexAttrib2dv</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param len="2">const <ptype>GLdouble</ptype> *<name>v</name></param>
>+            <glx type="render" opcode="4198"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexAttrib2dvARB</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param len="2">const <ptype>GLdouble</ptype> *<name>v</name></param>
>+            <alias name="glVertexAttrib2dv"/>
>+            <glx type="render" opcode="4198"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexAttrib2dvNV</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param len="2">const <ptype>GLdouble</ptype> *<name>v</name></param>
>+            <alias name="glVertexAttrib2dv"/>
>+            <glx type="render" opcode="4198"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexAttrib2f</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param><ptype>GLfloat</ptype> <name>x</name></param>
>+            <param><ptype>GLfloat</ptype> <name>y</name></param>
>+            <vecequiv name="glVertexAttrib2fv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexAttrib2fARB</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param><ptype>GLfloat</ptype> <name>x</name></param>
>+            <param><ptype>GLfloat</ptype> <name>y</name></param>
>+            <alias name="glVertexAttrib2f"/>
>+            <vecequiv name="glVertexAttrib2fvARB"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexAttrib2fNV</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param><ptype>GLfloat</ptype> <name>x</name></param>
>+            <param><ptype>GLfloat</ptype> <name>y</name></param>
>+            <alias name="glVertexAttrib2f"/>
>+            <vecequiv name="glVertexAttrib2fvNV"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexAttrib2fv</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param len="2">const <ptype>GLfloat</ptype> *<name>v</name></param>
>+            <glx type="render" opcode="4194"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexAttrib2fvARB</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param len="2">const <ptype>GLfloat</ptype> *<name>v</name></param>
>+            <alias name="glVertexAttrib2fv"/>
>+            <glx type="render" opcode="4194"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexAttrib2fvNV</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param len="2">const <ptype>GLfloat</ptype> *<name>v</name></param>
>+            <alias name="glVertexAttrib2fv"/>
>+            <glx type="render" opcode="4194"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexAttrib2hNV</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param group="Half16NV"><ptype>GLhalfNV</ptype> <name>x</name></param>
>+            <param group="Half16NV"><ptype>GLhalfNV</ptype> <name>y</name></param>
>+            <vecequiv name="glVertexAttrib2hvNV"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexAttrib2hvNV</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param group="Half16NV" len="2">const <ptype>GLhalfNV</ptype> *<name>v</name></param>
>+            <glx type="render" opcode="4258"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexAttrib2s</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param><ptype>GLshort</ptype> <name>x</name></param>
>+            <param><ptype>GLshort</ptype> <name>y</name></param>
>+            <vecequiv name="glVertexAttrib2sv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexAttrib2sARB</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param><ptype>GLshort</ptype> <name>x</name></param>
>+            <param><ptype>GLshort</ptype> <name>y</name></param>
>+            <alias name="glVertexAttrib2s"/>
>+            <vecequiv name="glVertexAttrib2svARB"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexAttrib2sNV</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param><ptype>GLshort</ptype> <name>x</name></param>
>+            <param><ptype>GLshort</ptype> <name>y</name></param>
>+            <alias name="glVertexAttrib2s"/>
>+            <vecequiv name="glVertexAttrib2svNV"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexAttrib2sv</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param len="2">const <ptype>GLshort</ptype> *<name>v</name></param>
>+            <glx type="render" opcode="4190"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexAttrib2svARB</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param len="2">const <ptype>GLshort</ptype> *<name>v</name></param>
>+            <alias name="glVertexAttrib2sv"/>
>+            <glx type="render" opcode="4190"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexAttrib2svNV</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param len="2">const <ptype>GLshort</ptype> *<name>v</name></param>
>+            <alias name="glVertexAttrib2sv"/>
>+            <glx type="render" opcode="4190"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexAttrib3d</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param><ptype>GLdouble</ptype> <name>x</name></param>
>+            <param><ptype>GLdouble</ptype> <name>y</name></param>
>+            <param><ptype>GLdouble</ptype> <name>z</name></param>
>+            <vecequiv name="glVertexAttrib3dv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexAttrib3dARB</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param><ptype>GLdouble</ptype> <name>x</name></param>
>+            <param><ptype>GLdouble</ptype> <name>y</name></param>
>+            <param><ptype>GLdouble</ptype> <name>z</name></param>
>+            <alias name="glVertexAttrib3d"/>
>+            <vecequiv name="glVertexAttrib3dvARB"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexAttrib3dNV</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param><ptype>GLdouble</ptype> <name>x</name></param>
>+            <param><ptype>GLdouble</ptype> <name>y</name></param>
>+            <param><ptype>GLdouble</ptype> <name>z</name></param>
>+            <alias name="glVertexAttrib3d"/>
>+            <vecequiv name="glVertexAttrib3dvNV"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexAttrib3dv</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param len="3">const <ptype>GLdouble</ptype> *<name>v</name></param>
>+            <glx type="render" opcode="4199"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexAttrib3dvARB</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param len="3">const <ptype>GLdouble</ptype> *<name>v</name></param>
>+            <alias name="glVertexAttrib3dv"/>
>+            <glx type="render" opcode="4199"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexAttrib3dvNV</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param len="3">const <ptype>GLdouble</ptype> *<name>v</name></param>
>+            <alias name="glVertexAttrib3dv"/>
>+            <glx type="render" opcode="4199"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexAttrib3f</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param><ptype>GLfloat</ptype> <name>x</name></param>
>+            <param><ptype>GLfloat</ptype> <name>y</name></param>
>+            <param><ptype>GLfloat</ptype> <name>z</name></param>
>+            <vecequiv name="glVertexAttrib3fv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexAttrib3fARB</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param><ptype>GLfloat</ptype> <name>x</name></param>
>+            <param><ptype>GLfloat</ptype> <name>y</name></param>
>+            <param><ptype>GLfloat</ptype> <name>z</name></param>
>+            <alias name="glVertexAttrib3f"/>
>+            <vecequiv name="glVertexAttrib3fvARB"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexAttrib3fNV</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param><ptype>GLfloat</ptype> <name>x</name></param>
>+            <param><ptype>GLfloat</ptype> <name>y</name></param>
>+            <param><ptype>GLfloat</ptype> <name>z</name></param>
>+            <alias name="glVertexAttrib3f"/>
>+            <vecequiv name="glVertexAttrib3fvNV"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexAttrib3fv</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param len="3">const <ptype>GLfloat</ptype> *<name>v</name></param>
>+            <glx type="render" opcode="4195"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexAttrib3fvARB</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param len="3">const <ptype>GLfloat</ptype> *<name>v</name></param>
>+            <alias name="glVertexAttrib3fv"/>
>+            <glx type="render" opcode="4195"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexAttrib3fvNV</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param len="3">const <ptype>GLfloat</ptype> *<name>v</name></param>
>+            <alias name="glVertexAttrib3fv"/>
>+            <glx type="render" opcode="4195"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexAttrib3hNV</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param group="Half16NV"><ptype>GLhalfNV</ptype> <name>x</name></param>
>+            <param group="Half16NV"><ptype>GLhalfNV</ptype> <name>y</name></param>
>+            <param group="Half16NV"><ptype>GLhalfNV</ptype> <name>z</name></param>
>+            <vecequiv name="glVertexAttrib3hvNV"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexAttrib3hvNV</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param group="Half16NV" len="3">const <ptype>GLhalfNV</ptype> *<name>v</name></param>
>+            <glx type="render" opcode="4259"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexAttrib3s</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param><ptype>GLshort</ptype> <name>x</name></param>
>+            <param><ptype>GLshort</ptype> <name>y</name></param>
>+            <param><ptype>GLshort</ptype> <name>z</name></param>
>+            <vecequiv name="glVertexAttrib3sv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexAttrib3sARB</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param><ptype>GLshort</ptype> <name>x</name></param>
>+            <param><ptype>GLshort</ptype> <name>y</name></param>
>+            <param><ptype>GLshort</ptype> <name>z</name></param>
>+            <alias name="glVertexAttrib3s"/>
>+            <vecequiv name="glVertexAttrib3svARB"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexAttrib3sNV</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param><ptype>GLshort</ptype> <name>x</name></param>
>+            <param><ptype>GLshort</ptype> <name>y</name></param>
>+            <param><ptype>GLshort</ptype> <name>z</name></param>
>+            <alias name="glVertexAttrib3s"/>
>+            <vecequiv name="glVertexAttrib3svNV"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexAttrib3sv</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param len="3">const <ptype>GLshort</ptype> *<name>v</name></param>
>+            <glx type="render" opcode="4191"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexAttrib3svARB</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param len="3">const <ptype>GLshort</ptype> *<name>v</name></param>
>+            <alias name="glVertexAttrib3sv"/>
>+            <glx type="render" opcode="4191"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexAttrib3svNV</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param len="3">const <ptype>GLshort</ptype> *<name>v</name></param>
>+            <alias name="glVertexAttrib3sv"/>
>+            <glx type="render" opcode="4191"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexAttrib4Nbv</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param len="4">const <ptype>GLbyte</ptype> *<name>v</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexAttrib4NbvARB</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param len="4">const <ptype>GLbyte</ptype> *<name>v</name></param>
>+            <alias name="glVertexAttrib4Nbv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexAttrib4Niv</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param len="4">const <ptype>GLint</ptype> *<name>v</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexAttrib4NivARB</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param len="4">const <ptype>GLint</ptype> *<name>v</name></param>
>+            <alias name="glVertexAttrib4Niv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexAttrib4Nsv</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param len="4">const <ptype>GLshort</ptype> *<name>v</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexAttrib4NsvARB</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param len="4">const <ptype>GLshort</ptype> *<name>v</name></param>
>+            <alias name="glVertexAttrib4Nsv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexAttrib4Nub</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param><ptype>GLubyte</ptype> <name>x</name></param>
>+            <param><ptype>GLubyte</ptype> <name>y</name></param>
>+            <param><ptype>GLubyte</ptype> <name>z</name></param>
>+            <param><ptype>GLubyte</ptype> <name>w</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexAttrib4NubARB</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param><ptype>GLubyte</ptype> <name>x</name></param>
>+            <param><ptype>GLubyte</ptype> <name>y</name></param>
>+            <param><ptype>GLubyte</ptype> <name>z</name></param>
>+            <param><ptype>GLubyte</ptype> <name>w</name></param>
>+            <alias name="glVertexAttrib4Nub"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexAttrib4Nubv</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param len="4">const <ptype>GLubyte</ptype> *<name>v</name></param>
>+            <glx type="render" opcode="4201"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexAttrib4NubvARB</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param len="4">const <ptype>GLubyte</ptype> *<name>v</name></param>
>+            <alias name="glVertexAttrib4Nubv"/>
>+            <glx type="render" opcode="4201"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexAttrib4Nuiv</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param len="4">const <ptype>GLuint</ptype> *<name>v</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexAttrib4NuivARB</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param len="4">const <ptype>GLuint</ptype> *<name>v</name></param>
>+            <alias name="glVertexAttrib4Nuiv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexAttrib4Nusv</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param len="4">const <ptype>GLushort</ptype> *<name>v</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexAttrib4NusvARB</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param len="4">const <ptype>GLushort</ptype> *<name>v</name></param>
>+            <alias name="glVertexAttrib4Nusv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexAttrib4bv</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param len="4">const <ptype>GLbyte</ptype> *<name>v</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexAttrib4bvARB</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param len="4">const <ptype>GLbyte</ptype> *<name>v</name></param>
>+            <alias name="glVertexAttrib4bv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexAttrib4d</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param><ptype>GLdouble</ptype> <name>x</name></param>
>+            <param><ptype>GLdouble</ptype> <name>y</name></param>
>+            <param><ptype>GLdouble</ptype> <name>z</name></param>
>+            <param><ptype>GLdouble</ptype> <name>w</name></param>
>+            <vecequiv name="glVertexAttrib4dv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexAttrib4dARB</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param><ptype>GLdouble</ptype> <name>x</name></param>
>+            <param><ptype>GLdouble</ptype> <name>y</name></param>
>+            <param><ptype>GLdouble</ptype> <name>z</name></param>
>+            <param><ptype>GLdouble</ptype> <name>w</name></param>
>+            <alias name="glVertexAttrib4d"/>
>+            <vecequiv name="glVertexAttrib4dvARB"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexAttrib4dNV</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param><ptype>GLdouble</ptype> <name>x</name></param>
>+            <param><ptype>GLdouble</ptype> <name>y</name></param>
>+            <param><ptype>GLdouble</ptype> <name>z</name></param>
>+            <param><ptype>GLdouble</ptype> <name>w</name></param>
>+            <alias name="glVertexAttrib4d"/>
>+            <vecequiv name="glVertexAttrib4dvNV"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexAttrib4dv</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param len="4">const <ptype>GLdouble</ptype> *<name>v</name></param>
>+            <glx type="render" opcode="4200"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexAttrib4dvARB</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param len="4">const <ptype>GLdouble</ptype> *<name>v</name></param>
>+            <alias name="glVertexAttrib4dv"/>
>+            <glx type="render" opcode="4200"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexAttrib4dvNV</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param len="4">const <ptype>GLdouble</ptype> *<name>v</name></param>
>+            <alias name="glVertexAttrib4dv"/>
>+            <glx type="render" opcode="4200"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexAttrib4f</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param><ptype>GLfloat</ptype> <name>x</name></param>
>+            <param><ptype>GLfloat</ptype> <name>y</name></param>
>+            <param><ptype>GLfloat</ptype> <name>z</name></param>
>+            <param><ptype>GLfloat</ptype> <name>w</name></param>
>+            <vecequiv name="glVertexAttrib4fv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexAttrib4fARB</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param><ptype>GLfloat</ptype> <name>x</name></param>
>+            <param><ptype>GLfloat</ptype> <name>y</name></param>
>+            <param><ptype>GLfloat</ptype> <name>z</name></param>
>+            <param><ptype>GLfloat</ptype> <name>w</name></param>
>+            <alias name="glVertexAttrib4f"/>
>+            <vecequiv name="glVertexAttrib4fvARB"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexAttrib4fNV</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param><ptype>GLfloat</ptype> <name>x</name></param>
>+            <param><ptype>GLfloat</ptype> <name>y</name></param>
>+            <param><ptype>GLfloat</ptype> <name>z</name></param>
>+            <param><ptype>GLfloat</ptype> <name>w</name></param>
>+            <alias name="glVertexAttrib4f"/>
>+            <vecequiv name="glVertexAttrib4fvNV"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexAttrib4fv</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param len="4">const <ptype>GLfloat</ptype> *<name>v</name></param>
>+            <glx type="render" opcode="4196"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexAttrib4fvARB</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param len="4">const <ptype>GLfloat</ptype> *<name>v</name></param>
>+            <alias name="glVertexAttrib4fv"/>
>+            <glx type="render" opcode="4196"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexAttrib4fvNV</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param len="4">const <ptype>GLfloat</ptype> *<name>v</name></param>
>+            <alias name="glVertexAttrib4fv"/>
>+            <glx type="render" opcode="4196"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexAttrib4hNV</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param group="Half16NV"><ptype>GLhalfNV</ptype> <name>x</name></param>
>+            <param group="Half16NV"><ptype>GLhalfNV</ptype> <name>y</name></param>
>+            <param group="Half16NV"><ptype>GLhalfNV</ptype> <name>z</name></param>
>+            <param group="Half16NV"><ptype>GLhalfNV</ptype> <name>w</name></param>
>+            <vecequiv name="glVertexAttrib4hvNV"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexAttrib4hvNV</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param group="Half16NV" len="4">const <ptype>GLhalfNV</ptype> *<name>v</name></param>
>+            <glx type="render" opcode="4260"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexAttrib4iv</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param len="4">const <ptype>GLint</ptype> *<name>v</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexAttrib4ivARB</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param len="4">const <ptype>GLint</ptype> *<name>v</name></param>
>+            <alias name="glVertexAttrib4iv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexAttrib4s</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param><ptype>GLshort</ptype> <name>x</name></param>
>+            <param><ptype>GLshort</ptype> <name>y</name></param>
>+            <param><ptype>GLshort</ptype> <name>z</name></param>
>+            <param><ptype>GLshort</ptype> <name>w</name></param>
>+            <vecequiv name="glVertexAttrib4sv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexAttrib4sARB</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param><ptype>GLshort</ptype> <name>x</name></param>
>+            <param><ptype>GLshort</ptype> <name>y</name></param>
>+            <param><ptype>GLshort</ptype> <name>z</name></param>
>+            <param><ptype>GLshort</ptype> <name>w</name></param>
>+            <alias name="glVertexAttrib4s"/>
>+            <vecequiv name="glVertexAttrib4svARB"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexAttrib4sNV</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param><ptype>GLshort</ptype> <name>x</name></param>
>+            <param><ptype>GLshort</ptype> <name>y</name></param>
>+            <param><ptype>GLshort</ptype> <name>z</name></param>
>+            <param><ptype>GLshort</ptype> <name>w</name></param>
>+            <alias name="glVertexAttrib4s"/>
>+            <vecequiv name="glVertexAttrib4svNV"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexAttrib4sv</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param len="4">const <ptype>GLshort</ptype> *<name>v</name></param>
>+            <glx type="render" opcode="4192"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexAttrib4svARB</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param len="4">const <ptype>GLshort</ptype> *<name>v</name></param>
>+            <alias name="glVertexAttrib4sv"/>
>+            <glx type="render" opcode="4192"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexAttrib4svNV</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param len="4">const <ptype>GLshort</ptype> *<name>v</name></param>
>+            <alias name="glVertexAttrib4sv"/>
>+            <glx type="render" opcode="4192"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexAttrib4ubNV</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param group="ColorUB"><ptype>GLubyte</ptype> <name>x</name></param>
>+            <param group="ColorUB"><ptype>GLubyte</ptype> <name>y</name></param>
>+            <param group="ColorUB"><ptype>GLubyte</ptype> <name>z</name></param>
>+            <param group="ColorUB"><ptype>GLubyte</ptype> <name>w</name></param>
>+            <alias name="glVertexAttrib4Nub"/>
>+            <vecequiv name="glVertexAttrib4ubvNV"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexAttrib4ubv</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param len="4">const <ptype>GLubyte</ptype> *<name>v</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexAttrib4ubvARB</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param len="4">const <ptype>GLubyte</ptype> *<name>v</name></param>
>+            <alias name="glVertexAttrib4ubv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexAttrib4ubvNV</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param group="ColorUB" len="4">const <ptype>GLubyte</ptype> *<name>v</name></param>
>+            <alias name="glVertexAttrib4Nubv"/>
>+            <glx type="render" opcode="4201"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexAttrib4uiv</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param len="4">const <ptype>GLuint</ptype> *<name>v</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexAttrib4uivARB</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param len="4">const <ptype>GLuint</ptype> *<name>v</name></param>
>+            <alias name="glVertexAttrib4uiv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexAttrib4usv</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param len="4">const <ptype>GLushort</ptype> *<name>v</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexAttrib4usvARB</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param len="4">const <ptype>GLushort</ptype> *<name>v</name></param>
>+            <alias name="glVertexAttrib4usv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexAttribArrayObjectATI</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param><ptype>GLint</ptype> <name>size</name></param>
>+            <param group="VertexAttribPointerType"><ptype>GLenum</ptype> <name>type</name></param>
>+            <param group="Boolean"><ptype>GLboolean</ptype> <name>normalized</name></param>
>+            <param><ptype>GLsizei</ptype> <name>stride</name></param>
>+            <param><ptype>GLuint</ptype> <name>buffer</name></param>
>+            <param><ptype>GLuint</ptype> <name>offset</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexAttribBinding</name></proto>
>+            <param><ptype>GLuint</ptype> <name>attribindex</name></param>
>+            <param><ptype>GLuint</ptype> <name>bindingindex</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexAttribDivisor</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param><ptype>GLuint</ptype> <name>divisor</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexAttribDivisorANGLE</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param><ptype>GLuint</ptype> <name>divisor</name></param>
>+            <alias name="glVertexAttribDivisor"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexAttribDivisorARB</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param><ptype>GLuint</ptype> <name>divisor</name></param>
>+            <alias name="glVertexAttribDivisor"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexAttribDivisorEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param><ptype>GLuint</ptype> <name>divisor</name></param>
>+            <alias name="glVertexAttribDivisor"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexAttribDivisorNV</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param><ptype>GLuint</ptype> <name>divisor</name></param>
>+            <alias name="glVertexAttribDivisor"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexAttribFormat</name></proto>
>+            <param><ptype>GLuint</ptype> <name>attribindex</name></param>
>+            <param><ptype>GLint</ptype> <name>size</name></param>
>+            <param><ptype>GLenum</ptype> <name>type</name></param>
>+            <param group="Boolean"><ptype>GLboolean</ptype> <name>normalized</name></param>
>+            <param><ptype>GLuint</ptype> <name>relativeoffset</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexAttribFormatNV</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param><ptype>GLint</ptype> <name>size</name></param>
>+            <param><ptype>GLenum</ptype> <name>type</name></param>
>+            <param group="Boolean"><ptype>GLboolean</ptype> <name>normalized</name></param>
>+            <param><ptype>GLsizei</ptype> <name>stride</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexAttribI1i</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param><ptype>GLint</ptype> <name>x</name></param>
>+            <vecequiv name="glVertexAttribI1iv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexAttribI1iEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param><ptype>GLint</ptype> <name>x</name></param>
>+            <alias name="glVertexAttribI1i"/>
>+            <vecequiv name="glVertexAttribI1ivEXT"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexAttribI1iv</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param len="1">const <ptype>GLint</ptype> *<name>v</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexAttribI1ivEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param len="1">const <ptype>GLint</ptype> *<name>v</name></param>
>+            <alias name="glVertexAttribI1iv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexAttribI1ui</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param><ptype>GLuint</ptype> <name>x</name></param>
>+            <vecequiv name="glVertexAttribI1uiv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexAttribI1uiEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param><ptype>GLuint</ptype> <name>x</name></param>
>+            <alias name="glVertexAttribI1ui"/>
>+            <vecequiv name="glVertexAttribI1uivEXT"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexAttribI1uiv</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param len="1">const <ptype>GLuint</ptype> *<name>v</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexAttribI1uivEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param len="1">const <ptype>GLuint</ptype> *<name>v</name></param>
>+            <alias name="glVertexAttribI1uiv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexAttribI2i</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param><ptype>GLint</ptype> <name>x</name></param>
>+            <param><ptype>GLint</ptype> <name>y</name></param>
>+            <vecequiv name="glVertexAttribI2iv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexAttribI2iEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param><ptype>GLint</ptype> <name>x</name></param>
>+            <param><ptype>GLint</ptype> <name>y</name></param>
>+            <alias name="glVertexAttribI2i"/>
>+            <vecequiv name="glVertexAttribI2ivEXT"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexAttribI2iv</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param len="2">const <ptype>GLint</ptype> *<name>v</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexAttribI2ivEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param len="2">const <ptype>GLint</ptype> *<name>v</name></param>
>+            <alias name="glVertexAttribI2iv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexAttribI2ui</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param><ptype>GLuint</ptype> <name>x</name></param>
>+            <param><ptype>GLuint</ptype> <name>y</name></param>
>+            <vecequiv name="glVertexAttribI2uiv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexAttribI2uiEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param><ptype>GLuint</ptype> <name>x</name></param>
>+            <param><ptype>GLuint</ptype> <name>y</name></param>
>+            <alias name="glVertexAttribI2ui"/>
>+            <vecequiv name="glVertexAttribI2uivEXT"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexAttribI2uiv</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param len="2">const <ptype>GLuint</ptype> *<name>v</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexAttribI2uivEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param len="2">const <ptype>GLuint</ptype> *<name>v</name></param>
>+            <alias name="glVertexAttribI2uiv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexAttribI3i</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param><ptype>GLint</ptype> <name>x</name></param>
>+            <param><ptype>GLint</ptype> <name>y</name></param>
>+            <param><ptype>GLint</ptype> <name>z</name></param>
>+            <vecequiv name="glVertexAttribI3iv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexAttribI3iEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param><ptype>GLint</ptype> <name>x</name></param>
>+            <param><ptype>GLint</ptype> <name>y</name></param>
>+            <param><ptype>GLint</ptype> <name>z</name></param>
>+            <alias name="glVertexAttribI3i"/>
>+            <vecequiv name="glVertexAttribI3ivEXT"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexAttribI3iv</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param len="3">const <ptype>GLint</ptype> *<name>v</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexAttribI3ivEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param len="3">const <ptype>GLint</ptype> *<name>v</name></param>
>+            <alias name="glVertexAttribI3iv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexAttribI3ui</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param><ptype>GLuint</ptype> <name>x</name></param>
>+            <param><ptype>GLuint</ptype> <name>y</name></param>
>+            <param><ptype>GLuint</ptype> <name>z</name></param>
>+            <vecequiv name="glVertexAttribI3uiv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexAttribI3uiEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param><ptype>GLuint</ptype> <name>x</name></param>
>+            <param><ptype>GLuint</ptype> <name>y</name></param>
>+            <param><ptype>GLuint</ptype> <name>z</name></param>
>+            <alias name="glVertexAttribI3ui"/>
>+            <vecequiv name="glVertexAttribI3uivEXT"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexAttribI3uiv</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param len="3">const <ptype>GLuint</ptype> *<name>v</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexAttribI3uivEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param len="3">const <ptype>GLuint</ptype> *<name>v</name></param>
>+            <alias name="glVertexAttribI3uiv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexAttribI4bv</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param len="4">const <ptype>GLbyte</ptype> *<name>v</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexAttribI4bvEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param len="4">const <ptype>GLbyte</ptype> *<name>v</name></param>
>+            <alias name="glVertexAttribI4bv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexAttribI4i</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param><ptype>GLint</ptype> <name>x</name></param>
>+            <param><ptype>GLint</ptype> <name>y</name></param>
>+            <param><ptype>GLint</ptype> <name>z</name></param>
>+            <param><ptype>GLint</ptype> <name>w</name></param>
>+            <vecequiv name="glVertexAttribI4iv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexAttribI4iEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param><ptype>GLint</ptype> <name>x</name></param>
>+            <param><ptype>GLint</ptype> <name>y</name></param>
>+            <param><ptype>GLint</ptype> <name>z</name></param>
>+            <param><ptype>GLint</ptype> <name>w</name></param>
>+            <alias name="glVertexAttribI4i"/>
>+            <vecequiv name="glVertexAttribI4ivEXT"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexAttribI4iv</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param len="4">const <ptype>GLint</ptype> *<name>v</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexAttribI4ivEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param len="4">const <ptype>GLint</ptype> *<name>v</name></param>
>+            <alias name="glVertexAttribI4iv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexAttribI4sv</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param len="4">const <ptype>GLshort</ptype> *<name>v</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexAttribI4svEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param len="4">const <ptype>GLshort</ptype> *<name>v</name></param>
>+            <alias name="glVertexAttribI4sv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexAttribI4ubv</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param len="4">const <ptype>GLubyte</ptype> *<name>v</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexAttribI4ubvEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param len="4">const <ptype>GLubyte</ptype> *<name>v</name></param>
>+            <alias name="glVertexAttribI4ubv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexAttribI4ui</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param><ptype>GLuint</ptype> <name>x</name></param>
>+            <param><ptype>GLuint</ptype> <name>y</name></param>
>+            <param><ptype>GLuint</ptype> <name>z</name></param>
>+            <param><ptype>GLuint</ptype> <name>w</name></param>
>+            <vecequiv name="glVertexAttribI4uiv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexAttribI4uiEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param><ptype>GLuint</ptype> <name>x</name></param>
>+            <param><ptype>GLuint</ptype> <name>y</name></param>
>+            <param><ptype>GLuint</ptype> <name>z</name></param>
>+            <param><ptype>GLuint</ptype> <name>w</name></param>
>+            <alias name="glVertexAttribI4ui"/>
>+            <vecequiv name="glVertexAttribI4uivEXT"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexAttribI4uiv</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param len="4">const <ptype>GLuint</ptype> *<name>v</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexAttribI4uivEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param len="4">const <ptype>GLuint</ptype> *<name>v</name></param>
>+            <alias name="glVertexAttribI4uiv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexAttribI4usv</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param len="4">const <ptype>GLushort</ptype> *<name>v</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexAttribI4usvEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param len="4">const <ptype>GLushort</ptype> *<name>v</name></param>
>+            <alias name="glVertexAttribI4usv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexAttribIFormat</name></proto>
>+            <param><ptype>GLuint</ptype> <name>attribindex</name></param>
>+            <param><ptype>GLint</ptype> <name>size</name></param>
>+            <param><ptype>GLenum</ptype> <name>type</name></param>
>+            <param><ptype>GLuint</ptype> <name>relativeoffset</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexAttribIFormatNV</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param><ptype>GLint</ptype> <name>size</name></param>
>+            <param><ptype>GLenum</ptype> <name>type</name></param>
>+            <param><ptype>GLsizei</ptype> <name>stride</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexAttribIPointer</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param><ptype>GLint</ptype> <name>size</name></param>
>+            <param group="VertexAttribPointerType"><ptype>GLenum</ptype> <name>type</name></param>
>+            <param><ptype>GLsizei</ptype> <name>stride</name></param>
>+            <param len="COMPSIZE(size,type,stride)">const void *<name>pointer</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexAttribIPointerEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param><ptype>GLint</ptype> <name>size</name></param>
>+            <param group="VertexAttribPointerType"><ptype>GLenum</ptype> <name>type</name></param>
>+            <param><ptype>GLsizei</ptype> <name>stride</name></param>
>+            <param len="COMPSIZE(size,type,stride)">const void *<name>pointer</name></param>
>+            <alias name="glVertexAttribIPointer"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexAttribL1d</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param><ptype>GLdouble</ptype> <name>x</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexAttribL1dEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param><ptype>GLdouble</ptype> <name>x</name></param>
>+            <alias name="glVertexAttribL1d"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexAttribL1dv</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param len="1">const <ptype>GLdouble</ptype> *<name>v</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexAttribL1dvEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param len="1">const <ptype>GLdouble</ptype> *<name>v</name></param>
>+            <alias name="glVertexAttribL1dv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexAttribL1i64NV</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param><ptype>GLint64EXT</ptype> <name>x</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexAttribL1i64vNV</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param len="1">const <ptype>GLint64EXT</ptype> *<name>v</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexAttribL1ui64ARB</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param><ptype>GLuint64EXT</ptype> <name>x</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexAttribL1ui64NV</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param><ptype>GLuint64EXT</ptype> <name>x</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexAttribL1ui64vARB</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param>const <ptype>GLuint64EXT</ptype> *<name>v</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexAttribL1ui64vNV</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param len="1">const <ptype>GLuint64EXT</ptype> *<name>v</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexAttribL2d</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param><ptype>GLdouble</ptype> <name>x</name></param>
>+            <param><ptype>GLdouble</ptype> <name>y</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexAttribL2dEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param><ptype>GLdouble</ptype> <name>x</name></param>
>+            <param><ptype>GLdouble</ptype> <name>y</name></param>
>+            <alias name="glVertexAttribL2d"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexAttribL2dv</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param len="2">const <ptype>GLdouble</ptype> *<name>v</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexAttribL2dvEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param len="2">const <ptype>GLdouble</ptype> *<name>v</name></param>
>+            <alias name="glVertexAttribL2dv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexAttribL2i64NV</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param><ptype>GLint64EXT</ptype> <name>x</name></param>
>+            <param><ptype>GLint64EXT</ptype> <name>y</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexAttribL2i64vNV</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param len="2">const <ptype>GLint64EXT</ptype> *<name>v</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexAttribL2ui64NV</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param><ptype>GLuint64EXT</ptype> <name>x</name></param>
>+            <param><ptype>GLuint64EXT</ptype> <name>y</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexAttribL2ui64vNV</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param len="2">const <ptype>GLuint64EXT</ptype> *<name>v</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexAttribL3d</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param><ptype>GLdouble</ptype> <name>x</name></param>
>+            <param><ptype>GLdouble</ptype> <name>y</name></param>
>+            <param><ptype>GLdouble</ptype> <name>z</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexAttribL3dEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param><ptype>GLdouble</ptype> <name>x</name></param>
>+            <param><ptype>GLdouble</ptype> <name>y</name></param>
>+            <param><ptype>GLdouble</ptype> <name>z</name></param>
>+            <alias name="glVertexAttribL3d"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexAttribL3dv</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param len="3">const <ptype>GLdouble</ptype> *<name>v</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexAttribL3dvEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param len="3">const <ptype>GLdouble</ptype> *<name>v</name></param>
>+            <alias name="glVertexAttribL3dv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexAttribL3i64NV</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param><ptype>GLint64EXT</ptype> <name>x</name></param>
>+            <param><ptype>GLint64EXT</ptype> <name>y</name></param>
>+            <param><ptype>GLint64EXT</ptype> <name>z</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexAttribL3i64vNV</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param len="3">const <ptype>GLint64EXT</ptype> *<name>v</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexAttribL3ui64NV</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param><ptype>GLuint64EXT</ptype> <name>x</name></param>
>+            <param><ptype>GLuint64EXT</ptype> <name>y</name></param>
>+            <param><ptype>GLuint64EXT</ptype> <name>z</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexAttribL3ui64vNV</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param len="3">const <ptype>GLuint64EXT</ptype> *<name>v</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexAttribL4d</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param><ptype>GLdouble</ptype> <name>x</name></param>
>+            <param><ptype>GLdouble</ptype> <name>y</name></param>
>+            <param><ptype>GLdouble</ptype> <name>z</name></param>
>+            <param><ptype>GLdouble</ptype> <name>w</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexAttribL4dEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param><ptype>GLdouble</ptype> <name>x</name></param>
>+            <param><ptype>GLdouble</ptype> <name>y</name></param>
>+            <param><ptype>GLdouble</ptype> <name>z</name></param>
>+            <param><ptype>GLdouble</ptype> <name>w</name></param>
>+            <alias name="glVertexAttribL4d"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexAttribL4dv</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param len="4">const <ptype>GLdouble</ptype> *<name>v</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexAttribL4dvEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param len="4">const <ptype>GLdouble</ptype> *<name>v</name></param>
>+            <alias name="glVertexAttribL4dv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexAttribL4i64NV</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param><ptype>GLint64EXT</ptype> <name>x</name></param>
>+            <param><ptype>GLint64EXT</ptype> <name>y</name></param>
>+            <param><ptype>GLint64EXT</ptype> <name>z</name></param>
>+            <param><ptype>GLint64EXT</ptype> <name>w</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexAttribL4i64vNV</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param len="4">const <ptype>GLint64EXT</ptype> *<name>v</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexAttribL4ui64NV</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param><ptype>GLuint64EXT</ptype> <name>x</name></param>
>+            <param><ptype>GLuint64EXT</ptype> <name>y</name></param>
>+            <param><ptype>GLuint64EXT</ptype> <name>z</name></param>
>+            <param><ptype>GLuint64EXT</ptype> <name>w</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexAttribL4ui64vNV</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param len="4">const <ptype>GLuint64EXT</ptype> *<name>v</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexAttribLFormat</name></proto>
>+            <param><ptype>GLuint</ptype> <name>attribindex</name></param>
>+            <param><ptype>GLint</ptype> <name>size</name></param>
>+            <param group="VertexAttribType"><ptype>GLenum</ptype> <name>type</name></param>
>+            <param><ptype>GLuint</ptype> <name>relativeoffset</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexAttribLFormatNV</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param><ptype>GLint</ptype> <name>size</name></param>
>+            <param group="VertexAttribType"><ptype>GLenum</ptype> <name>type</name></param>
>+            <param><ptype>GLsizei</ptype> <name>stride</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexAttribLPointer</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param><ptype>GLint</ptype> <name>size</name></param>
>+            <param group="VertexAttribPointerType"><ptype>GLenum</ptype> <name>type</name></param>
>+            <param><ptype>GLsizei</ptype> <name>stride</name></param>
>+            <param len="size">const void *<name>pointer</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexAttribLPointerEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param><ptype>GLint</ptype> <name>size</name></param>
>+            <param group="VertexAttribPointerType"><ptype>GLenum</ptype> <name>type</name></param>
>+            <param><ptype>GLsizei</ptype> <name>stride</name></param>
>+            <param len="size">const void *<name>pointer</name></param>
>+            <alias name="glVertexAttribLPointer"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexAttribP1ui</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param group="VertexAttribPointerType"><ptype>GLenum</ptype> <name>type</name></param>
>+            <param group="Boolean"><ptype>GLboolean</ptype> <name>normalized</name></param>
>+            <param><ptype>GLuint</ptype> <name>value</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexAttribP1uiv</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param group="VertexAttribPointerType"><ptype>GLenum</ptype> <name>type</name></param>
>+            <param group="Boolean"><ptype>GLboolean</ptype> <name>normalized</name></param>
>+            <param len="1">const <ptype>GLuint</ptype> *<name>value</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexAttribP2ui</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param group="VertexAttribPointerType"><ptype>GLenum</ptype> <name>type</name></param>
>+            <param group="Boolean"><ptype>GLboolean</ptype> <name>normalized</name></param>
>+            <param><ptype>GLuint</ptype> <name>value</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexAttribP2uiv</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param group="VertexAttribPointerType"><ptype>GLenum</ptype> <name>type</name></param>
>+            <param group="Boolean"><ptype>GLboolean</ptype> <name>normalized</name></param>
>+            <param len="1">const <ptype>GLuint</ptype> *<name>value</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexAttribP3ui</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param group="VertexAttribPointerType"><ptype>GLenum</ptype> <name>type</name></param>
>+            <param group="Boolean"><ptype>GLboolean</ptype> <name>normalized</name></param>
>+            <param><ptype>GLuint</ptype> <name>value</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexAttribP3uiv</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param group="VertexAttribPointerType"><ptype>GLenum</ptype> <name>type</name></param>
>+            <param group="Boolean"><ptype>GLboolean</ptype> <name>normalized</name></param>
>+            <param len="1">const <ptype>GLuint</ptype> *<name>value</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexAttribP4ui</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param group="VertexAttribPointerType"><ptype>GLenum</ptype> <name>type</name></param>
>+            <param group="Boolean"><ptype>GLboolean</ptype> <name>normalized</name></param>
>+            <param><ptype>GLuint</ptype> <name>value</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexAttribP4uiv</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param group="VertexAttribPointerType"><ptype>GLenum</ptype> <name>type</name></param>
>+            <param group="Boolean"><ptype>GLboolean</ptype> <name>normalized</name></param>
>+            <param len="1">const <ptype>GLuint</ptype> *<name>value</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexAttribParameteriAMD</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param><ptype>GLint</ptype> <name>param</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexAttribPointer</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param><ptype>GLint</ptype> <name>size</name></param>
>+            <param group="VertexAttribPointerType"><ptype>GLenum</ptype> <name>type</name></param>
>+            <param group="Boolean"><ptype>GLboolean</ptype> <name>normalized</name></param>
>+            <param><ptype>GLsizei</ptype> <name>stride</name></param>
>+            <param len="COMPSIZE(size,type,stride)">const void *<name>pointer</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexAttribPointerARB</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param><ptype>GLint</ptype> <name>size</name></param>
>+            <param group="VertexAttribPointerType"><ptype>GLenum</ptype> <name>type</name></param>
>+            <param group="Boolean"><ptype>GLboolean</ptype> <name>normalized</name></param>
>+            <param><ptype>GLsizei</ptype> <name>stride</name></param>
>+            <param len="COMPSIZE(size,type,stride)">const void *<name>pointer</name></param>
>+            <alias name="glVertexAttribPointer"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexAttribPointerNV</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param><ptype>GLint</ptype> <name>fsize</name></param>
>+            <param group="VertexAttribEnumNV"><ptype>GLenum</ptype> <name>type</name></param>
>+            <param><ptype>GLsizei</ptype> <name>stride</name></param>
>+            <param len="COMPSIZE(fsize,type,stride)">const void *<name>pointer</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexAttribs1dvNV</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param len="count">const <ptype>GLdouble</ptype> *<name>v</name></param>
>+            <glx type="render" opcode="4210"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexAttribs1fvNV</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param len="count">const <ptype>GLfloat</ptype> *<name>v</name></param>
>+            <glx type="render" opcode="4206"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexAttribs1hvNV</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param><ptype>GLsizei</ptype> <name>n</name></param>
>+            <param group="Half16NV" len="n">const <ptype>GLhalfNV</ptype> *<name>v</name></param>
>+            <glx type="render" opcode="4261"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexAttribs1svNV</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param len="count">const <ptype>GLshort</ptype> *<name>v</name></param>
>+            <glx type="render" opcode="4202"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexAttribs2dvNV</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param len="count*2">const <ptype>GLdouble</ptype> *<name>v</name></param>
>+            <glx type="render" opcode="4211"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexAttribs2fvNV</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param len="count*2">const <ptype>GLfloat</ptype> *<name>v</name></param>
>+            <glx type="render" opcode="4207"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexAttribs2hvNV</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param><ptype>GLsizei</ptype> <name>n</name></param>
>+            <param group="Half16NV" len="n">const <ptype>GLhalfNV</ptype> *<name>v</name></param>
>+            <glx type="render" opcode="4262"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexAttribs2svNV</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param len="count*2">const <ptype>GLshort</ptype> *<name>v</name></param>
>+            <glx type="render" opcode="4203"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexAttribs3dvNV</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param len="count*3">const <ptype>GLdouble</ptype> *<name>v</name></param>
>+            <glx type="render" opcode="4212"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexAttribs3fvNV</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param len="count*3">const <ptype>GLfloat</ptype> *<name>v</name></param>
>+            <glx type="render" opcode="4208"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexAttribs3hvNV</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param><ptype>GLsizei</ptype> <name>n</name></param>
>+            <param group="Half16NV" len="n">const <ptype>GLhalfNV</ptype> *<name>v</name></param>
>+            <glx type="render" opcode="4263"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexAttribs3svNV</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param len="count*3">const <ptype>GLshort</ptype> *<name>v</name></param>
>+            <glx type="render" opcode="4204"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexAttribs4dvNV</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param len="count*4">const <ptype>GLdouble</ptype> *<name>v</name></param>
>+            <glx type="render" opcode="4213"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexAttribs4fvNV</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param len="count*4">const <ptype>GLfloat</ptype> *<name>v</name></param>
>+            <glx type="render" opcode="4209"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexAttribs4hvNV</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param><ptype>GLsizei</ptype> <name>n</name></param>
>+            <param group="Half16NV" len="n">const <ptype>GLhalfNV</ptype> *<name>v</name></param>
>+            <glx type="render" opcode="4264"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexAttribs4svNV</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param len="count*4">const <ptype>GLshort</ptype> *<name>v</name></param>
>+            <glx type="render" opcode="4205"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexAttribs4ubvNV</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param group="ColorUB" len="count*4">const <ptype>GLubyte</ptype> *<name>v</name></param>
>+            <glx type="render" opcode="4214"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexBindingDivisor</name></proto>
>+            <param><ptype>GLuint</ptype> <name>bindingindex</name></param>
>+            <param><ptype>GLuint</ptype> <name>divisor</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexBlendARB</name></proto>
>+            <param><ptype>GLint</ptype> <name>count</name></param>
>+            <glx type="render" opcode="226"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexBlendEnvfATI</name></proto>
>+            <param group="VertexStreamATI"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param><ptype>GLfloat</ptype> <name>param</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexBlendEnviATI</name></proto>
>+            <param group="VertexStreamATI"><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param><ptype>GLint</ptype> <name>param</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexFormatNV</name></proto>
>+            <param><ptype>GLint</ptype> <name>size</name></param>
>+            <param group="VertexPointerType"><ptype>GLenum</ptype> <name>type</name></param>
>+            <param><ptype>GLsizei</ptype> <name>stride</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexP2ui</name></proto>
>+            <param group="VertexPointerType"><ptype>GLenum</ptype> <name>type</name></param>
>+            <param><ptype>GLuint</ptype> <name>value</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexP2uiv</name></proto>
>+            <param group="VertexPointerType"><ptype>GLenum</ptype> <name>type</name></param>
>+            <param len="1">const <ptype>GLuint</ptype> *<name>value</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexP3ui</name></proto>
>+            <param group="VertexPointerType"><ptype>GLenum</ptype> <name>type</name></param>
>+            <param><ptype>GLuint</ptype> <name>value</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexP3uiv</name></proto>
>+            <param group="VertexPointerType"><ptype>GLenum</ptype> <name>type</name></param>
>+            <param len="1">const <ptype>GLuint</ptype> *<name>value</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexP4ui</name></proto>
>+            <param group="VertexPointerType"><ptype>GLenum</ptype> <name>type</name></param>
>+            <param><ptype>GLuint</ptype> <name>value</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexP4uiv</name></proto>
>+            <param group="VertexPointerType"><ptype>GLenum</ptype> <name>type</name></param>
>+            <param len="1">const <ptype>GLuint</ptype> *<name>value</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexPointer</name></proto>
>+            <param><ptype>GLint</ptype> <name>size</name></param>
>+            <param group="VertexPointerType"><ptype>GLenum</ptype> <name>type</name></param>
>+            <param><ptype>GLsizei</ptype> <name>stride</name></param>
>+            <param len="COMPSIZE(size,type,stride)">const void *<name>pointer</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexPointerEXT</name></proto>
>+            <param><ptype>GLint</ptype> <name>size</name></param>
>+            <param group="VertexPointerType"><ptype>GLenum</ptype> <name>type</name></param>
>+            <param><ptype>GLsizei</ptype> <name>stride</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param len="COMPSIZE(size,type,stride,count)">const void *<name>pointer</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexPointerListIBM</name></proto>
>+            <param><ptype>GLint</ptype> <name>size</name></param>
>+            <param group="VertexPointerType"><ptype>GLenum</ptype> <name>type</name></param>
>+            <param><ptype>GLint</ptype> <name>stride</name></param>
>+            <param len="COMPSIZE(size,type,stride)">const void **<name>pointer</name></param>
>+            <param><ptype>GLint</ptype> <name>ptrstride</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexPointervINTEL</name></proto>
>+            <param><ptype>GLint</ptype> <name>size</name></param>
>+            <param group="VertexPointerType"><ptype>GLenum</ptype> <name>type</name></param>
>+            <param len="4">const void **<name>pointer</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexStream1dATI</name></proto>
>+            <param group="VertexStreamATI"><ptype>GLenum</ptype> <name>stream</name></param>
>+            <param><ptype>GLdouble</ptype> <name>x</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexStream1dvATI</name></proto>
>+            <param group="VertexStreamATI"><ptype>GLenum</ptype> <name>stream</name></param>
>+            <param len="1">const <ptype>GLdouble</ptype> *<name>coords</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexStream1fATI</name></proto>
>+            <param group="VertexStreamATI"><ptype>GLenum</ptype> <name>stream</name></param>
>+            <param><ptype>GLfloat</ptype> <name>x</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexStream1fvATI</name></proto>
>+            <param group="VertexStreamATI"><ptype>GLenum</ptype> <name>stream</name></param>
>+            <param len="1">const <ptype>GLfloat</ptype> *<name>coords</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexStream1iATI</name></proto>
>+            <param group="VertexStreamATI"><ptype>GLenum</ptype> <name>stream</name></param>
>+            <param><ptype>GLint</ptype> <name>x</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexStream1ivATI</name></proto>
>+            <param group="VertexStreamATI"><ptype>GLenum</ptype> <name>stream</name></param>
>+            <param len="1">const <ptype>GLint</ptype> *<name>coords</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexStream1sATI</name></proto>
>+            <param group="VertexStreamATI"><ptype>GLenum</ptype> <name>stream</name></param>
>+            <param><ptype>GLshort</ptype> <name>x</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexStream1svATI</name></proto>
>+            <param group="VertexStreamATI"><ptype>GLenum</ptype> <name>stream</name></param>
>+            <param len="1">const <ptype>GLshort</ptype> *<name>coords</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexStream2dATI</name></proto>
>+            <param group="VertexStreamATI"><ptype>GLenum</ptype> <name>stream</name></param>
>+            <param><ptype>GLdouble</ptype> <name>x</name></param>
>+            <param><ptype>GLdouble</ptype> <name>y</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexStream2dvATI</name></proto>
>+            <param group="VertexStreamATI"><ptype>GLenum</ptype> <name>stream</name></param>
>+            <param len="2">const <ptype>GLdouble</ptype> *<name>coords</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexStream2fATI</name></proto>
>+            <param group="VertexStreamATI"><ptype>GLenum</ptype> <name>stream</name></param>
>+            <param><ptype>GLfloat</ptype> <name>x</name></param>
>+            <param><ptype>GLfloat</ptype> <name>y</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexStream2fvATI</name></proto>
>+            <param group="VertexStreamATI"><ptype>GLenum</ptype> <name>stream</name></param>
>+            <param len="2">const <ptype>GLfloat</ptype> *<name>coords</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexStream2iATI</name></proto>
>+            <param group="VertexStreamATI"><ptype>GLenum</ptype> <name>stream</name></param>
>+            <param><ptype>GLint</ptype> <name>x</name></param>
>+            <param><ptype>GLint</ptype> <name>y</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexStream2ivATI</name></proto>
>+            <param group="VertexStreamATI"><ptype>GLenum</ptype> <name>stream</name></param>
>+            <param len="2">const <ptype>GLint</ptype> *<name>coords</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexStream2sATI</name></proto>
>+            <param group="VertexStreamATI"><ptype>GLenum</ptype> <name>stream</name></param>
>+            <param><ptype>GLshort</ptype> <name>x</name></param>
>+            <param><ptype>GLshort</ptype> <name>y</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexStream2svATI</name></proto>
>+            <param group="VertexStreamATI"><ptype>GLenum</ptype> <name>stream</name></param>
>+            <param len="2">const <ptype>GLshort</ptype> *<name>coords</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexStream3dATI</name></proto>
>+            <param group="VertexStreamATI"><ptype>GLenum</ptype> <name>stream</name></param>
>+            <param><ptype>GLdouble</ptype> <name>x</name></param>
>+            <param><ptype>GLdouble</ptype> <name>y</name></param>
>+            <param><ptype>GLdouble</ptype> <name>z</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexStream3dvATI</name></proto>
>+            <param group="VertexStreamATI"><ptype>GLenum</ptype> <name>stream</name></param>
>+            <param len="3">const <ptype>GLdouble</ptype> *<name>coords</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexStream3fATI</name></proto>
>+            <param group="VertexStreamATI"><ptype>GLenum</ptype> <name>stream</name></param>
>+            <param><ptype>GLfloat</ptype> <name>x</name></param>
>+            <param><ptype>GLfloat</ptype> <name>y</name></param>
>+            <param><ptype>GLfloat</ptype> <name>z</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexStream3fvATI</name></proto>
>+            <param group="VertexStreamATI"><ptype>GLenum</ptype> <name>stream</name></param>
>+            <param len="3">const <ptype>GLfloat</ptype> *<name>coords</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexStream3iATI</name></proto>
>+            <param group="VertexStreamATI"><ptype>GLenum</ptype> <name>stream</name></param>
>+            <param><ptype>GLint</ptype> <name>x</name></param>
>+            <param><ptype>GLint</ptype> <name>y</name></param>
>+            <param><ptype>GLint</ptype> <name>z</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexStream3ivATI</name></proto>
>+            <param group="VertexStreamATI"><ptype>GLenum</ptype> <name>stream</name></param>
>+            <param len="3">const <ptype>GLint</ptype> *<name>coords</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexStream3sATI</name></proto>
>+            <param group="VertexStreamATI"><ptype>GLenum</ptype> <name>stream</name></param>
>+            <param><ptype>GLshort</ptype> <name>x</name></param>
>+            <param><ptype>GLshort</ptype> <name>y</name></param>
>+            <param><ptype>GLshort</ptype> <name>z</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexStream3svATI</name></proto>
>+            <param group="VertexStreamATI"><ptype>GLenum</ptype> <name>stream</name></param>
>+            <param len="3">const <ptype>GLshort</ptype> *<name>coords</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexStream4dATI</name></proto>
>+            <param group="VertexStreamATI"><ptype>GLenum</ptype> <name>stream</name></param>
>+            <param><ptype>GLdouble</ptype> <name>x</name></param>
>+            <param><ptype>GLdouble</ptype> <name>y</name></param>
>+            <param><ptype>GLdouble</ptype> <name>z</name></param>
>+            <param><ptype>GLdouble</ptype> <name>w</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexStream4dvATI</name></proto>
>+            <param group="VertexStreamATI"><ptype>GLenum</ptype> <name>stream</name></param>
>+            <param len="4">const <ptype>GLdouble</ptype> *<name>coords</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexStream4fATI</name></proto>
>+            <param group="VertexStreamATI"><ptype>GLenum</ptype> <name>stream</name></param>
>+            <param><ptype>GLfloat</ptype> <name>x</name></param>
>+            <param><ptype>GLfloat</ptype> <name>y</name></param>
>+            <param><ptype>GLfloat</ptype> <name>z</name></param>
>+            <param><ptype>GLfloat</ptype> <name>w</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexStream4fvATI</name></proto>
>+            <param group="VertexStreamATI"><ptype>GLenum</ptype> <name>stream</name></param>
>+            <param len="4">const <ptype>GLfloat</ptype> *<name>coords</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexStream4iATI</name></proto>
>+            <param group="VertexStreamATI"><ptype>GLenum</ptype> <name>stream</name></param>
>+            <param><ptype>GLint</ptype> <name>x</name></param>
>+            <param><ptype>GLint</ptype> <name>y</name></param>
>+            <param><ptype>GLint</ptype> <name>z</name></param>
>+            <param><ptype>GLint</ptype> <name>w</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexStream4ivATI</name></proto>
>+            <param group="VertexStreamATI"><ptype>GLenum</ptype> <name>stream</name></param>
>+            <param len="4">const <ptype>GLint</ptype> *<name>coords</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexStream4sATI</name></proto>
>+            <param group="VertexStreamATI"><ptype>GLenum</ptype> <name>stream</name></param>
>+            <param><ptype>GLshort</ptype> <name>x</name></param>
>+            <param><ptype>GLshort</ptype> <name>y</name></param>
>+            <param><ptype>GLshort</ptype> <name>z</name></param>
>+            <param><ptype>GLshort</ptype> <name>w</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexStream4svATI</name></proto>
>+            <param group="VertexStreamATI"><ptype>GLenum</ptype> <name>stream</name></param>
>+            <param len="4">const <ptype>GLshort</ptype> *<name>coords</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexWeightPointerEXT</name></proto>
>+            <param><ptype>GLint</ptype> <name>size</name></param>
>+            <param group="VertexWeightPointerTypeEXT"><ptype>GLenum</ptype> <name>type</name></param>
>+            <param><ptype>GLsizei</ptype> <name>stride</name></param>
>+            <param len="COMPSIZE(type,stride)">const void *<name>pointer</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexWeightfEXT</name></proto>
>+            <param><ptype>GLfloat</ptype> <name>weight</name></param>
>+            <vecequiv name="glVertexWeightfvEXT"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexWeightfvEXT</name></proto>
>+            <param len="1">const <ptype>GLfloat</ptype> *<name>weight</name></param>
>+            <glx type="render" opcode="4135"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexWeighthNV</name></proto>
>+            <param group="Half16NV"><ptype>GLhalfNV</ptype> <name>weight</name></param>
>+            <vecequiv name="glVertexWeighthvNV"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glVertexWeighthvNV</name></proto>
>+            <param group="Half16NV" len="1">const <ptype>GLhalfNV</ptype> *<name>weight</name></param>
>+            <glx type="render" opcode="4256"/>
>+        </command>
>+        <command>
>+            <proto><ptype>GLenum</ptype> <name>glVideoCaptureNV</name></proto>
>+            <param><ptype>GLuint</ptype> <name>video_capture_slot</name></param>
>+            <param><ptype>GLuint</ptype> *<name>sequence_num</name></param>
>+            <param><ptype>GLuint64EXT</ptype> *<name>capture_time</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glVideoCaptureStreamParameterdvNV</name></proto>
>+            <param><ptype>GLuint</ptype> <name>video_capture_slot</name></param>
>+            <param><ptype>GLuint</ptype> <name>stream</name></param>
>+            <param><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="COMPSIZE(pname)">const <ptype>GLdouble</ptype> *<name>params</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glVideoCaptureStreamParameterfvNV</name></proto>
>+            <param><ptype>GLuint</ptype> <name>video_capture_slot</name></param>
>+            <param><ptype>GLuint</ptype> <name>stream</name></param>
>+            <param><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="COMPSIZE(pname)">const <ptype>GLfloat</ptype> *<name>params</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glVideoCaptureStreamParameterivNV</name></proto>
>+            <param><ptype>GLuint</ptype> <name>video_capture_slot</name></param>
>+            <param><ptype>GLuint</ptype> <name>stream</name></param>
>+            <param><ptype>GLenum</ptype> <name>pname</name></param>
>+            <param len="COMPSIZE(pname)">const <ptype>GLint</ptype> *<name>params</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glViewport</name></proto>
>+            <param group="WinCoord"><ptype>GLint</ptype> <name>x</name></param>
>+            <param group="WinCoord"><ptype>GLint</ptype> <name>y</name></param>
>+            <param><ptype>GLsizei</ptype> <name>width</name></param>
>+            <param><ptype>GLsizei</ptype> <name>height</name></param>
>+            <glx type="render" opcode="191"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glViewportArrayv</name></proto>
>+            <param><ptype>GLuint</ptype> <name>first</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param len="COMPSIZE(count)">const <ptype>GLfloat</ptype> *<name>v</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glViewportArrayvNV</name></proto>
>+            <param><ptype>GLuint</ptype> <name>first</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param len="COMPSIZE(count)">const <ptype>GLfloat</ptype> *<name>v</name></param>
>+            <alias name="glViewportArrayv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glViewportArrayvOES</name></proto>
>+            <param><ptype>GLuint</ptype> <name>first</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param len="COMPSIZE(count)">const <ptype>GLfloat</ptype> *<name>v</name></param>
>+            <alias name="glViewportArrayv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glViewportIndexedf</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param><ptype>GLfloat</ptype> <name>x</name></param>
>+            <param><ptype>GLfloat</ptype> <name>y</name></param>
>+            <param><ptype>GLfloat</ptype> <name>w</name></param>
>+            <param><ptype>GLfloat</ptype> <name>h</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glViewportIndexedfOES</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param><ptype>GLfloat</ptype> <name>x</name></param>
>+            <param><ptype>GLfloat</ptype> <name>y</name></param>
>+            <param><ptype>GLfloat</ptype> <name>w</name></param>
>+            <param><ptype>GLfloat</ptype> <name>h</name></param>
>+            <alias name="glViewportIndexedf"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glViewportIndexedfNV</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param><ptype>GLfloat</ptype> <name>x</name></param>
>+            <param><ptype>GLfloat</ptype> <name>y</name></param>
>+            <param><ptype>GLfloat</ptype> <name>w</name></param>
>+            <param><ptype>GLfloat</ptype> <name>h</name></param>
>+            <alias name="glViewportIndexedf"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glViewportIndexedfv</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param len="4">const <ptype>GLfloat</ptype> *<name>v</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glViewportIndexedfvOES</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param len="4">const <ptype>GLfloat</ptype> *<name>v</name></param>
>+            <alias name="glViewportIndexedfv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glViewportIndexedfvNV</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param len="4">const <ptype>GLfloat</ptype> *<name>v</name></param>
>+            <alias name="glViewportIndexedfv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glViewportPositionWScaleNV</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param><ptype>GLfloat</ptype> <name>xcoeff</name></param>
>+            <param><ptype>GLfloat</ptype> <name>ycoeff</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glViewportSwizzleNV</name></proto>
>+            <param><ptype>GLuint</ptype> <name>index</name></param>
>+            <param><ptype>GLenum</ptype> <name>swizzlex</name></param>
>+            <param><ptype>GLenum</ptype> <name>swizzley</name></param>
>+            <param><ptype>GLenum</ptype> <name>swizzlez</name></param>
>+            <param><ptype>GLenum</ptype> <name>swizzlew</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glWaitSemaphoreEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>semaphore</name></param>
>+            <param><ptype>GLuint</ptype> <name>numBufferBarriers</name></param>
>+            <param len="COMPSIZE(numBufferBarriers)">const <ptype>GLuint</ptype> *<name>buffers</name></param>
>+            <param><ptype>GLuint</ptype> <name>numTextureBarriers</name></param>
>+            <param len="COMPSIZE(numTextureBarriers)">const <ptype>GLuint</ptype> *<name>textures</name></param>
>+            <param group="TextureLayout" len="COMPSIZE(numTextureBarriers)">const <ptype>GLenum</ptype> *<name>srcLayouts</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glWaitSync</name></proto>
>+            <param group="sync"><ptype>GLsync</ptype> <name>sync</name></param>
>+            <param><ptype>GLbitfield</ptype> <name>flags</name></param>
>+            <param><ptype>GLuint64</ptype> <name>timeout</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glWaitSyncAPPLE</name></proto>
>+            <param><ptype>GLsync</ptype> <name>sync</name></param>
>+            <param><ptype>GLbitfield</ptype> <name>flags</name></param>
>+            <param><ptype>GLuint64</ptype> <name>timeout</name></param>
>+            <alias name="glWaitSync"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glWeightPathsNV</name></proto>
>+            <param group="Path"><ptype>GLuint</ptype> <name>resultPath</name></param>
>+            <param><ptype>GLsizei</ptype> <name>numPaths</name></param>
>+            <param group="Path" len="numPaths">const <ptype>GLuint</ptype> *<name>paths</name></param>
>+            <param len="numPaths">const <ptype>GLfloat</ptype> *<name>weights</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glWeightPointerARB</name></proto>
>+            <param><ptype>GLint</ptype> <name>size</name></param>
>+            <param group="WeightPointerTypeARB"><ptype>GLenum</ptype> <name>type</name></param>
>+            <param><ptype>GLsizei</ptype> <name>stride</name></param>
>+            <param len="COMPSIZE(type,stride)">const void *<name>pointer</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glWeightPointerOES</name></proto>
>+            <param><ptype>GLint</ptype> <name>size</name></param>
>+            <param><ptype>GLenum</ptype> <name>type</name></param>
>+            <param><ptype>GLsizei</ptype> <name>stride</name></param>
>+            <param len="COMPSIZE(type,stride)">const void *<name>pointer</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glWeightbvARB</name></proto>
>+            <param><ptype>GLint</ptype> <name>size</name></param>
>+            <param len="size">const <ptype>GLbyte</ptype> *<name>weights</name></param>
>+            <glx type="render" opcode="220"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glWeightdvARB</name></proto>
>+            <param><ptype>GLint</ptype> <name>size</name></param>
>+            <param len="size">const <ptype>GLdouble</ptype> *<name>weights</name></param>
>+            <glx type="render" opcode="228"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glWeightfvARB</name></proto>
>+            <param><ptype>GLint</ptype> <name>size</name></param>
>+            <param len="size">const <ptype>GLfloat</ptype> *<name>weights</name></param>
>+            <glx type="render" opcode="227"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glWeightivARB</name></proto>
>+            <param><ptype>GLint</ptype> <name>size</name></param>
>+            <param len="size">const <ptype>GLint</ptype> *<name>weights</name></param>
>+            <glx type="render" opcode="224"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glWeightsvARB</name></proto>
>+            <param><ptype>GLint</ptype> <name>size</name></param>
>+            <param len="size">const <ptype>GLshort</ptype> *<name>weights</name></param>
>+            <glx type="render" opcode="222"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glWeightubvARB</name></proto>
>+            <param><ptype>GLint</ptype> <name>size</name></param>
>+            <param len="size">const <ptype>GLubyte</ptype> *<name>weights</name></param>
>+            <glx type="render" opcode="221"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glWeightuivARB</name></proto>
>+            <param><ptype>GLint</ptype> <name>size</name></param>
>+            <param len="size">const <ptype>GLuint</ptype> *<name>weights</name></param>
>+            <glx type="render" opcode="225"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glWeightusvARB</name></proto>
>+            <param><ptype>GLint</ptype> <name>size</name></param>
>+            <param len="size">const <ptype>GLushort</ptype> *<name>weights</name></param>
>+            <glx type="render" opcode="223"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glWindowPos2d</name></proto>
>+            <param group="CoordD"><ptype>GLdouble</ptype> <name>x</name></param>
>+            <param group="CoordD"><ptype>GLdouble</ptype> <name>y</name></param>
>+            <vecequiv name="glWindowPos2dv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glWindowPos2dARB</name></proto>
>+            <param group="CoordD"><ptype>GLdouble</ptype> <name>x</name></param>
>+            <param group="CoordD"><ptype>GLdouble</ptype> <name>y</name></param>
>+            <alias name="glWindowPos2d"/>
>+            <vecequiv name="glWindowPos2dvARB"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glWindowPos2dMESA</name></proto>
>+            <param group="CoordD"><ptype>GLdouble</ptype> <name>x</name></param>
>+            <param group="CoordD"><ptype>GLdouble</ptype> <name>y</name></param>
>+            <alias name="glWindowPos2d"/>
>+            <vecequiv name="glWindowPos2dvMESA"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glWindowPos2dv</name></proto>
>+            <param group="CoordD" len="2">const <ptype>GLdouble</ptype> *<name>v</name></param>
>+            <glx type="render" opcode="230"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glWindowPos2dvARB</name></proto>
>+            <param group="CoordD" len="2">const <ptype>GLdouble</ptype> *<name>v</name></param>
>+            <alias name="glWindowPos2dv"/>
>+            <glx type="render" opcode="230"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glWindowPos2dvMESA</name></proto>
>+            <param group="CoordD" len="2">const <ptype>GLdouble</ptype> *<name>v</name></param>
>+            <alias name="glWindowPos2dv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glWindowPos2f</name></proto>
>+            <param group="CoordF"><ptype>GLfloat</ptype> <name>x</name></param>
>+            <param group="CoordF"><ptype>GLfloat</ptype> <name>y</name></param>
>+            <vecequiv name="glWindowPos2fv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glWindowPos2fARB</name></proto>
>+            <param group="CoordF"><ptype>GLfloat</ptype> <name>x</name></param>
>+            <param group="CoordF"><ptype>GLfloat</ptype> <name>y</name></param>
>+            <alias name="glWindowPos2f"/>
>+            <vecequiv name="glWindowPos2fvARB"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glWindowPos2fMESA</name></proto>
>+            <param group="CoordF"><ptype>GLfloat</ptype> <name>x</name></param>
>+            <param group="CoordF"><ptype>GLfloat</ptype> <name>y</name></param>
>+            <alias name="glWindowPos2f"/>
>+            <vecequiv name="glWindowPos2fvMESA"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glWindowPos2fv</name></proto>
>+            <param group="CoordF" len="2">const <ptype>GLfloat</ptype> *<name>v</name></param>
>+            <glx type="render" opcode="230"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glWindowPos2fvARB</name></proto>
>+            <param group="CoordF" len="2">const <ptype>GLfloat</ptype> *<name>v</name></param>
>+            <alias name="glWindowPos2fv"/>
>+            <glx type="render" opcode="230"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glWindowPos2fvMESA</name></proto>
>+            <param group="CoordF" len="2">const <ptype>GLfloat</ptype> *<name>v</name></param>
>+            <alias name="glWindowPos2fv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glWindowPos2i</name></proto>
>+            <param group="CoordI"><ptype>GLint</ptype> <name>x</name></param>
>+            <param group="CoordI"><ptype>GLint</ptype> <name>y</name></param>
>+            <vecequiv name="glWindowPos2iv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glWindowPos2iARB</name></proto>
>+            <param group="CoordI"><ptype>GLint</ptype> <name>x</name></param>
>+            <param group="CoordI"><ptype>GLint</ptype> <name>y</name></param>
>+            <alias name="glWindowPos2i"/>
>+            <vecequiv name="glWindowPos2ivARB"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glWindowPos2iMESA</name></proto>
>+            <param group="CoordI"><ptype>GLint</ptype> <name>x</name></param>
>+            <param group="CoordI"><ptype>GLint</ptype> <name>y</name></param>
>+            <alias name="glWindowPos2i"/>
>+            <vecequiv name="glWindowPos2ivMESA"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glWindowPos2iv</name></proto>
>+            <param group="CoordI" len="2">const <ptype>GLint</ptype> *<name>v</name></param>
>+            <glx type="render" opcode="230"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glWindowPos2ivARB</name></proto>
>+            <param group="CoordI" len="2">const <ptype>GLint</ptype> *<name>v</name></param>
>+            <alias name="glWindowPos2iv"/>
>+            <glx type="render" opcode="230"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glWindowPos2ivMESA</name></proto>
>+            <param group="CoordI" len="2">const <ptype>GLint</ptype> *<name>v</name></param>
>+            <alias name="glWindowPos2iv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glWindowPos2s</name></proto>
>+            <param group="CoordS"><ptype>GLshort</ptype> <name>x</name></param>
>+            <param group="CoordS"><ptype>GLshort</ptype> <name>y</name></param>
>+            <vecequiv name="glWindowPos2sv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glWindowPos2sARB</name></proto>
>+            <param group="CoordS"><ptype>GLshort</ptype> <name>x</name></param>
>+            <param group="CoordS"><ptype>GLshort</ptype> <name>y</name></param>
>+            <alias name="glWindowPos2s"/>
>+            <vecequiv name="glWindowPos2svARB"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glWindowPos2sMESA</name></proto>
>+            <param group="CoordS"><ptype>GLshort</ptype> <name>x</name></param>
>+            <param group="CoordS"><ptype>GLshort</ptype> <name>y</name></param>
>+            <alias name="glWindowPos2s"/>
>+            <vecequiv name="glWindowPos2svMESA"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glWindowPos2sv</name></proto>
>+            <param group="CoordS" len="2">const <ptype>GLshort</ptype> *<name>v</name></param>
>+            <glx type="render" opcode="230"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glWindowPos2svARB</name></proto>
>+            <param group="CoordS" len="2">const <ptype>GLshort</ptype> *<name>v</name></param>
>+            <alias name="glWindowPos2sv"/>
>+            <glx type="render" opcode="230"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glWindowPos2svMESA</name></proto>
>+            <param group="CoordS" len="2">const <ptype>GLshort</ptype> *<name>v</name></param>
>+            <alias name="glWindowPos2sv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glWindowPos3d</name></proto>
>+            <param group="CoordD"><ptype>GLdouble</ptype> <name>x</name></param>
>+            <param group="CoordD"><ptype>GLdouble</ptype> <name>y</name></param>
>+            <param group="CoordD"><ptype>GLdouble</ptype> <name>z</name></param>
>+            <vecequiv name="glWindowPos3dv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glWindowPos3dARB</name></proto>
>+            <param group="CoordD"><ptype>GLdouble</ptype> <name>x</name></param>
>+            <param group="CoordD"><ptype>GLdouble</ptype> <name>y</name></param>
>+            <param group="CoordD"><ptype>GLdouble</ptype> <name>z</name></param>
>+            <alias name="glWindowPos3d"/>
>+            <vecequiv name="glWindowPos3dvARB"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glWindowPos3dMESA</name></proto>
>+            <param group="CoordD"><ptype>GLdouble</ptype> <name>x</name></param>
>+            <param group="CoordD"><ptype>GLdouble</ptype> <name>y</name></param>
>+            <param group="CoordD"><ptype>GLdouble</ptype> <name>z</name></param>
>+            <alias name="glWindowPos3d"/>
>+            <vecequiv name="glWindowPos3dvMESA"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glWindowPos3dv</name></proto>
>+            <param group="CoordD" len="3">const <ptype>GLdouble</ptype> *<name>v</name></param>
>+            <glx type="render" opcode="230"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glWindowPos3dvARB</name></proto>
>+            <param group="CoordD" len="3">const <ptype>GLdouble</ptype> *<name>v</name></param>
>+            <alias name="glWindowPos3dv"/>
>+            <glx type="render" opcode="230"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glWindowPos3dvMESA</name></proto>
>+            <param group="CoordD" len="3">const <ptype>GLdouble</ptype> *<name>v</name></param>
>+            <alias name="glWindowPos3dv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glWindowPos3f</name></proto>
>+            <param group="CoordF"><ptype>GLfloat</ptype> <name>x</name></param>
>+            <param group="CoordF"><ptype>GLfloat</ptype> <name>y</name></param>
>+            <param group="CoordF"><ptype>GLfloat</ptype> <name>z</name></param>
>+            <vecequiv name="glWindowPos3fv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glWindowPos3fARB</name></proto>
>+            <param group="CoordF"><ptype>GLfloat</ptype> <name>x</name></param>
>+            <param group="CoordF"><ptype>GLfloat</ptype> <name>y</name></param>
>+            <param group="CoordF"><ptype>GLfloat</ptype> <name>z</name></param>
>+            <alias name="glWindowPos3f"/>
>+            <vecequiv name="glWindowPos3fvARB"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glWindowPos3fMESA</name></proto>
>+            <param group="CoordF"><ptype>GLfloat</ptype> <name>x</name></param>
>+            <param group="CoordF"><ptype>GLfloat</ptype> <name>y</name></param>
>+            <param group="CoordF"><ptype>GLfloat</ptype> <name>z</name></param>
>+            <alias name="glWindowPos3f"/>
>+            <vecequiv name="glWindowPos3fvMESA"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glWindowPos3fv</name></proto>
>+            <param group="CoordF" len="3">const <ptype>GLfloat</ptype> *<name>v</name></param>
>+            <glx type="render" opcode="230"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glWindowPos3fvARB</name></proto>
>+            <param group="CoordF" len="3">const <ptype>GLfloat</ptype> *<name>v</name></param>
>+            <alias name="glWindowPos3fv"/>
>+            <glx type="render" opcode="230"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glWindowPos3fvMESA</name></proto>
>+            <param group="CoordF" len="3">const <ptype>GLfloat</ptype> *<name>v</name></param>
>+            <alias name="glWindowPos3fv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glWindowPos3i</name></proto>
>+            <param group="CoordI"><ptype>GLint</ptype> <name>x</name></param>
>+            <param group="CoordI"><ptype>GLint</ptype> <name>y</name></param>
>+            <param group="CoordI"><ptype>GLint</ptype> <name>z</name></param>
>+            <vecequiv name="glWindowPos3iv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glWindowPos3iARB</name></proto>
>+            <param group="CoordI"><ptype>GLint</ptype> <name>x</name></param>
>+            <param group="CoordI"><ptype>GLint</ptype> <name>y</name></param>
>+            <param group="CoordI"><ptype>GLint</ptype> <name>z</name></param>
>+            <alias name="glWindowPos3i"/>
>+            <vecequiv name="glWindowPos3ivARB"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glWindowPos3iMESA</name></proto>
>+            <param group="CoordI"><ptype>GLint</ptype> <name>x</name></param>
>+            <param group="CoordI"><ptype>GLint</ptype> <name>y</name></param>
>+            <param group="CoordI"><ptype>GLint</ptype> <name>z</name></param>
>+            <alias name="glWindowPos3i"/>
>+            <vecequiv name="glWindowPos3ivMESA"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glWindowPos3iv</name></proto>
>+            <param group="CoordI" len="3">const <ptype>GLint</ptype> *<name>v</name></param>
>+            <glx type="render" opcode="230"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glWindowPos3ivARB</name></proto>
>+            <param group="CoordI" len="3">const <ptype>GLint</ptype> *<name>v</name></param>
>+            <alias name="glWindowPos3iv"/>
>+            <glx type="render" opcode="230"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glWindowPos3ivMESA</name></proto>
>+            <param group="CoordI" len="3">const <ptype>GLint</ptype> *<name>v</name></param>
>+            <alias name="glWindowPos3iv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glWindowPos3s</name></proto>
>+            <param group="CoordS"><ptype>GLshort</ptype> <name>x</name></param>
>+            <param group="CoordS"><ptype>GLshort</ptype> <name>y</name></param>
>+            <param group="CoordS"><ptype>GLshort</ptype> <name>z</name></param>
>+            <vecequiv name="glWindowPos3sv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glWindowPos3sARB</name></proto>
>+            <param group="CoordS"><ptype>GLshort</ptype> <name>x</name></param>
>+            <param group="CoordS"><ptype>GLshort</ptype> <name>y</name></param>
>+            <param group="CoordS"><ptype>GLshort</ptype> <name>z</name></param>
>+            <alias name="glWindowPos3s"/>
>+            <vecequiv name="glWindowPos3svARB"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glWindowPos3sMESA</name></proto>
>+            <param group="CoordS"><ptype>GLshort</ptype> <name>x</name></param>
>+            <param group="CoordS"><ptype>GLshort</ptype> <name>y</name></param>
>+            <param group="CoordS"><ptype>GLshort</ptype> <name>z</name></param>
>+            <alias name="glWindowPos3s"/>
>+            <vecequiv name="glWindowPos3svMESA"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glWindowPos3sv</name></proto>
>+            <param group="CoordS" len="3">const <ptype>GLshort</ptype> *<name>v</name></param>
>+            <glx type="render" opcode="230"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glWindowPos3svARB</name></proto>
>+            <param group="CoordS" len="3">const <ptype>GLshort</ptype> *<name>v</name></param>
>+            <alias name="glWindowPos3sv"/>
>+            <glx type="render" opcode="230"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glWindowPos3svMESA</name></proto>
>+            <param group="CoordS" len="3">const <ptype>GLshort</ptype> *<name>v</name></param>
>+            <alias name="glWindowPos3sv"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glWindowPos4dMESA</name></proto>
>+            <param group="CoordD"><ptype>GLdouble</ptype> <name>x</name></param>
>+            <param group="CoordD"><ptype>GLdouble</ptype> <name>y</name></param>
>+            <param group="CoordD"><ptype>GLdouble</ptype> <name>z</name></param>
>+            <param group="CoordD"><ptype>GLdouble</ptype> <name>w</name></param>
>+            <vecequiv name="glWindowPos4dvMESA"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glWindowPos4dvMESA</name></proto>
>+            <param group="CoordD" len="4">const <ptype>GLdouble</ptype> *<name>v</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glWindowPos4fMESA</name></proto>
>+            <param group="CoordF"><ptype>GLfloat</ptype> <name>x</name></param>
>+            <param group="CoordF"><ptype>GLfloat</ptype> <name>y</name></param>
>+            <param group="CoordF"><ptype>GLfloat</ptype> <name>z</name></param>
>+            <param group="CoordF"><ptype>GLfloat</ptype> <name>w</name></param>
>+            <vecequiv name="glWindowPos4fvMESA"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glWindowPos4fvMESA</name></proto>
>+            <param group="CoordF" len="4">const <ptype>GLfloat</ptype> *<name>v</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glWindowPos4iMESA</name></proto>
>+            <param group="CoordI"><ptype>GLint</ptype> <name>x</name></param>
>+            <param group="CoordI"><ptype>GLint</ptype> <name>y</name></param>
>+            <param group="CoordI"><ptype>GLint</ptype> <name>z</name></param>
>+            <param group="CoordI"><ptype>GLint</ptype> <name>w</name></param>
>+            <vecequiv name="glWindowPos4ivMESA"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glWindowPos4ivMESA</name></proto>
>+            <param group="CoordI" len="4">const <ptype>GLint</ptype> *<name>v</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glWindowPos4sMESA</name></proto>
>+            <param group="CoordS"><ptype>GLshort</ptype> <name>x</name></param>
>+            <param group="CoordS"><ptype>GLshort</ptype> <name>y</name></param>
>+            <param group="CoordS"><ptype>GLshort</ptype> <name>z</name></param>
>+            <param group="CoordS"><ptype>GLshort</ptype> <name>w</name></param>
>+            <vecequiv name="glWindowPos4svMESA"/>
>+        </command>
>+        <command>
>+            <proto>void <name>glWindowPos4svMESA</name></proto>
>+            <param group="CoordS" len="4">const <ptype>GLshort</ptype> *<name>v</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glWindowRectanglesEXT</name></proto>
>+            <param><ptype>GLenum</ptype> <name>mode</name></param>
>+            <param><ptype>GLsizei</ptype> <name>count</name></param>
>+            <param len="COMPSIZE(count)">const <ptype>GLint</ptype> *<name>box</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glWriteMaskEXT</name></proto>
>+            <param><ptype>GLuint</ptype> <name>res</name></param>
>+            <param><ptype>GLuint</ptype> <name>in</name></param>
>+            <param group="VertexShaderWriteMaskEXT"><ptype>GLenum</ptype> <name>outX</name></param>
>+            <param group="VertexShaderWriteMaskEXT"><ptype>GLenum</ptype> <name>outY</name></param>
>+            <param group="VertexShaderWriteMaskEXT"><ptype>GLenum</ptype> <name>outZ</name></param>
>+            <param group="VertexShaderWriteMaskEXT"><ptype>GLenum</ptype> <name>outW</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glDrawVkImageNV</name></proto>
>+            <param><ptype>GLuint64</ptype> <name>vkImage</name></param>
>+            <param><ptype>GLuint</ptype> <name>sampler</name></param>
>+            <param><ptype>GLfloat</ptype> <name>x0</name></param>
>+            <param><ptype>GLfloat</ptype> <name>y0</name></param>
>+            <param><ptype>GLfloat</ptype> <name>x1</name></param>
>+            <param><ptype>GLfloat</ptype> <name>y1</name></param>
>+            <param><ptype>GLfloat</ptype> <name>z</name></param>
>+            <param><ptype>GLfloat</ptype> <name>s0</name></param>
>+            <param><ptype>GLfloat</ptype> <name>t0</name></param>
>+            <param><ptype>GLfloat</ptype> <name>s1</name></param>
>+            <param><ptype>GLfloat</ptype> <name>t1</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>GLVULKANPROCNV</ptype> <name>glGetVkProcAddrNV</name></proto>
>+            <param len="COMPSIZE(name)">const <ptype>GLchar</ptype> *<name>name</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glWaitVkSemaphoreNV</name></proto>
>+            <param><ptype>GLuint64</ptype> <name>vkSemaphore</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glSignalVkSemaphoreNV</name></proto>
>+            <param><ptype>GLuint64</ptype> <name>vkSemaphore</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>glSignalVkFenceNV</name></proto>
>+            <param><ptype>GLuint64</ptype> <name>vkFence</name></param>
>+        </command>
>+
>+    </commands>
>+
>+    
>+    <feature api="gl" name="GL_VERSION_1_0" number="1.0">
>+        <require>
>+            <type name="GLvoid" comment="No longer used in headers"/>
>+            <enum name="GL_DEPTH_BUFFER_BIT"/>
>+            <enum name="GL_STENCIL_BUFFER_BIT"/>
>+            <enum name="GL_COLOR_BUFFER_BIT"/>
>+            <enum name="GL_FALSE"/>
>+            <enum name="GL_TRUE"/>
>+            <enum name="GL_POINTS"/>
>+            <enum name="GL_LINES"/>
>+            <enum name="GL_LINE_LOOP"/>
>+            <enum name="GL_LINE_STRIP"/>
>+            <enum name="GL_TRIANGLES"/>
>+            <enum name="GL_TRIANGLE_STRIP"/>
>+            <enum name="GL_TRIANGLE_FAN"/>
>+            <enum name="GL_QUADS"/>
>+            <enum name="GL_NEVER"/>
>+            <enum name="GL_LESS"/>
>+            <enum name="GL_EQUAL"/>
>+            <enum name="GL_LEQUAL"/>
>+            <enum name="GL_GREATER"/>
>+            <enum name="GL_NOTEQUAL"/>
>+            <enum name="GL_GEQUAL"/>
>+            <enum name="GL_ALWAYS"/>
>+            <enum name="GL_ZERO"/>
>+            <enum name="GL_ONE"/>
>+            <enum name="GL_SRC_COLOR"/>
>+            <enum name="GL_ONE_MINUS_SRC_COLOR"/>
>+            <enum name="GL_SRC_ALPHA"/>
>+            <enum name="GL_ONE_MINUS_SRC_ALPHA"/>
>+            <enum name="GL_DST_ALPHA"/>
>+            <enum name="GL_ONE_MINUS_DST_ALPHA"/>
>+            <enum name="GL_DST_COLOR"/>
>+            <enum name="GL_ONE_MINUS_DST_COLOR"/>
>+            <enum name="GL_SRC_ALPHA_SATURATE"/>
>+            <enum name="GL_NONE"/>
>+            <enum name="GL_FRONT_LEFT"/>
>+            <enum name="GL_FRONT_RIGHT"/>
>+            <enum name="GL_BACK_LEFT"/>
>+            <enum name="GL_BACK_RIGHT"/>
>+            <enum name="GL_FRONT"/>
>+            <enum name="GL_BACK"/>
>+            <enum name="GL_LEFT"/>
>+            <enum name="GL_RIGHT"/>
>+            <enum name="GL_FRONT_AND_BACK"/>
>+            <enum name="GL_NO_ERROR"/>
>+            <enum name="GL_INVALID_ENUM"/>
>+            <enum name="GL_INVALID_VALUE"/>
>+            <enum name="GL_INVALID_OPERATION"/>
>+            <enum name="GL_OUT_OF_MEMORY"/>
>+            <enum name="GL_CW"/>
>+            <enum name="GL_CCW"/>
>+            <enum name="GL_POINT_SIZE"/>
>+            <enum name="GL_POINT_SIZE_RANGE"/>
>+            <enum name="GL_POINT_SIZE_GRANULARITY"/>
>+            <enum name="GL_LINE_SMOOTH"/>
>+            <enum name="GL_LINE_WIDTH"/>
>+            <enum name="GL_LINE_WIDTH_RANGE"/>
>+            <enum name="GL_LINE_WIDTH_GRANULARITY"/>
>+            <enum name="GL_POLYGON_MODE"/>
>+            <enum name="GL_POLYGON_SMOOTH"/>
>+            <enum name="GL_CULL_FACE"/>
>+            <enum name="GL_CULL_FACE_MODE"/>
>+            <enum name="GL_FRONT_FACE"/>
>+            <enum name="GL_DEPTH_RANGE"/>
>+            <enum name="GL_DEPTH_TEST"/>
>+            <enum name="GL_DEPTH_WRITEMASK"/>
>+            <enum name="GL_DEPTH_CLEAR_VALUE"/>
>+            <enum name="GL_DEPTH_FUNC"/>
>+            <enum name="GL_STENCIL_TEST"/>
>+            <enum name="GL_STENCIL_CLEAR_VALUE"/>
>+            <enum name="GL_STENCIL_FUNC"/>
>+            <enum name="GL_STENCIL_VALUE_MASK"/>
>+            <enum name="GL_STENCIL_FAIL"/>
>+            <enum name="GL_STENCIL_PASS_DEPTH_FAIL"/>
>+            <enum name="GL_STENCIL_PASS_DEPTH_PASS"/>
>+            <enum name="GL_STENCIL_REF"/>
>+            <enum name="GL_STENCIL_WRITEMASK"/>
>+            <enum name="GL_VIEWPORT"/>
>+            <enum name="GL_DITHER"/>
>+            <enum name="GL_BLEND_DST"/>
>+            <enum name="GL_BLEND_SRC"/>
>+            <enum name="GL_BLEND"/>
>+            <enum name="GL_LOGIC_OP_MODE"/>
>+            <enum name="GL_DRAW_BUFFER"/>
>+            <enum name="GL_READ_BUFFER"/>
>+            <enum name="GL_SCISSOR_BOX"/>
>+            <enum name="GL_SCISSOR_TEST"/>
>+            <enum name="GL_COLOR_CLEAR_VALUE"/>
>+            <enum name="GL_COLOR_WRITEMASK"/>
>+            <enum name="GL_DOUBLEBUFFER"/>
>+            <enum name="GL_STEREO"/>
>+            <enum name="GL_LINE_SMOOTH_HINT"/>
>+            <enum name="GL_POLYGON_SMOOTH_HINT"/>
>+            <enum name="GL_UNPACK_SWAP_BYTES"/>
>+            <enum name="GL_UNPACK_LSB_FIRST"/>
>+            <enum name="GL_UNPACK_ROW_LENGTH"/>
>+            <enum name="GL_UNPACK_SKIP_ROWS"/>
>+            <enum name="GL_UNPACK_SKIP_PIXELS"/>
>+            <enum name="GL_UNPACK_ALIGNMENT"/>
>+            <enum name="GL_PACK_SWAP_BYTES"/>
>+            <enum name="GL_PACK_LSB_FIRST"/>
>+            <enum name="GL_PACK_ROW_LENGTH"/>
>+            <enum name="GL_PACK_SKIP_ROWS"/>
>+            <enum name="GL_PACK_SKIP_PIXELS"/>
>+            <enum name="GL_PACK_ALIGNMENT"/>
>+            <enum name="GL_MAX_TEXTURE_SIZE"/>
>+            <enum name="GL_MAX_VIEWPORT_DIMS"/>
>+            <enum name="GL_SUBPIXEL_BITS"/>
>+            <enum name="GL_TEXTURE_1D"/>
>+            <enum name="GL_TEXTURE_2D"/>
>+            <enum name="GL_TEXTURE_WIDTH"/>
>+            <enum name="GL_TEXTURE_HEIGHT"/>
>+            <enum name="GL_TEXTURE_BORDER_COLOR"/>
>+            <enum name="GL_DONT_CARE"/>
>+            <enum name="GL_FASTEST"/>
>+            <enum name="GL_NICEST"/>
>+            <enum name="GL_BYTE"/>
>+            <enum name="GL_UNSIGNED_BYTE"/>
>+            <enum name="GL_SHORT"/>
>+            <enum name="GL_UNSIGNED_SHORT"/>
>+            <enum name="GL_INT"/>
>+            <enum name="GL_UNSIGNED_INT"/>
>+            <enum name="GL_FLOAT"/>
>+            <enum name="GL_STACK_OVERFLOW"/>
>+            <enum name="GL_STACK_UNDERFLOW"/>
>+            <enum name="GL_CLEAR"/>
>+            <enum name="GL_AND"/>
>+            <enum name="GL_AND_REVERSE"/>
>+            <enum name="GL_COPY"/>
>+            <enum name="GL_AND_INVERTED"/>
>+            <enum name="GL_NOOP"/>
>+            <enum name="GL_XOR"/>
>+            <enum name="GL_OR"/>
>+            <enum name="GL_NOR"/>
>+            <enum name="GL_EQUIV"/>
>+            <enum name="GL_INVERT"/>
>+            <enum name="GL_OR_REVERSE"/>
>+            <enum name="GL_COPY_INVERTED"/>
>+            <enum name="GL_OR_INVERTED"/>
>+            <enum name="GL_NAND"/>
>+            <enum name="GL_SET"/>
>+            <enum name="GL_TEXTURE"/>
>+            <enum name="GL_COLOR"/>
>+            <enum name="GL_DEPTH"/>
>+            <enum name="GL_STENCIL"/>
>+            <enum name="GL_STENCIL_INDEX"/>
>+            <enum name="GL_DEPTH_COMPONENT"/>
>+            <enum name="GL_RED"/>
>+            <enum name="GL_GREEN"/>
>+            <enum name="GL_BLUE"/>
>+            <enum name="GL_ALPHA"/>
>+            <enum name="GL_RGB"/>
>+            <enum name="GL_RGBA"/>
>+            <enum name="GL_POINT"/>
>+            <enum name="GL_LINE"/>
>+            <enum name="GL_FILL"/>
>+            <enum name="GL_KEEP"/>
>+            <enum name="GL_REPLACE"/>
>+            <enum name="GL_INCR"/>
>+            <enum name="GL_DECR"/>
>+            <enum name="GL_VENDOR"/>
>+            <enum name="GL_RENDERER"/>
>+            <enum name="GL_VERSION"/>
>+            <enum name="GL_EXTENSIONS"/>
>+            <enum name="GL_NEAREST"/>
>+            <enum name="GL_LINEAR"/>
>+            <enum name="GL_NEAREST_MIPMAP_NEAREST"/>
>+            <enum name="GL_LINEAR_MIPMAP_NEAREST"/>
>+            <enum name="GL_NEAREST_MIPMAP_LINEAR"/>
>+            <enum name="GL_LINEAR_MIPMAP_LINEAR"/>
>+            <enum name="GL_TEXTURE_MAG_FILTER"/>
>+            <enum name="GL_TEXTURE_MIN_FILTER"/>
>+            <enum name="GL_TEXTURE_WRAP_S"/>
>+            <enum name="GL_TEXTURE_WRAP_T"/>
>+            <enum name="GL_REPEAT"/>
>+            <enum name="GL_CURRENT_BIT"/>
>+            <enum name="GL_POINT_BIT"/>
>+            <enum name="GL_LINE_BIT"/>
>+            <enum name="GL_POLYGON_BIT"/>
>+            <enum name="GL_POLYGON_STIPPLE_BIT"/>
>+            <enum name="GL_PIXEL_MODE_BIT"/>
>+            <enum name="GL_LIGHTING_BIT"/>
>+            <enum name="GL_FOG_BIT"/>
>+            <enum name="GL_ACCUM_BUFFER_BIT"/>
>+            <enum name="GL_VIEWPORT_BIT"/>
>+            <enum name="GL_TRANSFORM_BIT"/>
>+            <enum name="GL_ENABLE_BIT"/>
>+            <enum name="GL_HINT_BIT"/>
>+            <enum name="GL_EVAL_BIT"/>
>+            <enum name="GL_LIST_BIT"/>
>+            <enum name="GL_TEXTURE_BIT"/>
>+            <enum name="GL_SCISSOR_BIT"/>
>+            <enum name="GL_ALL_ATTRIB_BITS"/>
>+            <enum name="GL_QUAD_STRIP"/>
>+            <enum name="GL_POLYGON"/>
>+            <enum name="GL_ACCUM"/>
>+            <enum name="GL_LOAD"/>
>+            <enum name="GL_RETURN"/>
>+            <enum name="GL_MULT"/>
>+            <enum name="GL_ADD"/>
>+            <enum name="GL_AUX0"/>
>+            <enum name="GL_AUX1"/>
>+            <enum name="GL_AUX2"/>
>+            <enum name="GL_AUX3"/>
>+            <enum name="GL_2D"/>
>+            <enum name="GL_3D"/>
>+            <enum name="GL_3D_COLOR"/>
>+            <enum name="GL_3D_COLOR_TEXTURE"/>
>+            <enum name="GL_4D_COLOR_TEXTURE"/>
>+            <enum name="GL_PASS_THROUGH_TOKEN"/>
>+            <enum name="GL_POINT_TOKEN"/>
>+            <enum name="GL_LINE_TOKEN"/>
>+            <enum name="GL_POLYGON_TOKEN"/>
>+            <enum name="GL_BITMAP_TOKEN"/>
>+            <enum name="GL_DRAW_PIXEL_TOKEN"/>
>+            <enum name="GL_COPY_PIXEL_TOKEN"/>
>+            <enum name="GL_LINE_RESET_TOKEN"/>
>+            <enum name="GL_EXP"/>
>+            <enum name="GL_EXP2"/>
>+            <enum name="GL_COEFF"/>
>+            <enum name="GL_ORDER"/>
>+            <enum name="GL_DOMAIN"/>
>+            <enum name="GL_PIXEL_MAP_I_TO_I"/>
>+            <enum name="GL_PIXEL_MAP_S_TO_S"/>
>+            <enum name="GL_PIXEL_MAP_I_TO_R"/>
>+            <enum name="GL_PIXEL_MAP_I_TO_G"/>
>+            <enum name="GL_PIXEL_MAP_I_TO_B"/>
>+            <enum name="GL_PIXEL_MAP_I_TO_A"/>
>+            <enum name="GL_PIXEL_MAP_R_TO_R"/>
>+            <enum name="GL_PIXEL_MAP_G_TO_G"/>
>+            <enum name="GL_PIXEL_MAP_B_TO_B"/>
>+            <enum name="GL_PIXEL_MAP_A_TO_A"/>
>+            <enum name="GL_CURRENT_COLOR"/>
>+            <enum name="GL_CURRENT_INDEX"/>
>+            <enum name="GL_CURRENT_NORMAL"/>
>+            <enum name="GL_CURRENT_TEXTURE_COORDS"/>
>+            <enum name="GL_CURRENT_RASTER_COLOR"/>
>+            <enum name="GL_CURRENT_RASTER_INDEX"/>
>+            <enum name="GL_CURRENT_RASTER_TEXTURE_COORDS"/>
>+            <enum name="GL_CURRENT_RASTER_POSITION"/>
>+            <enum name="GL_CURRENT_RASTER_POSITION_VALID"/>
>+            <enum name="GL_CURRENT_RASTER_DISTANCE"/>
>+            <enum name="GL_POINT_SMOOTH"/>
>+            <enum name="GL_LINE_STIPPLE"/>
>+            <enum name="GL_LINE_STIPPLE_PATTERN"/>
>+            <enum name="GL_LINE_STIPPLE_REPEAT"/>
>+            <enum name="GL_LIST_MODE"/>
>+            <enum name="GL_MAX_LIST_NESTING"/>
>+            <enum name="GL_LIST_BASE"/>
>+            <enum name="GL_LIST_INDEX"/>
>+            <enum name="GL_POLYGON_STIPPLE"/>
>+            <enum name="GL_EDGE_FLAG"/>
>+            <enum name="GL_LIGHTING"/>
>+            <enum name="GL_LIGHT_MODEL_LOCAL_VIEWER"/>
>+            <enum name="GL_LIGHT_MODEL_TWO_SIDE"/>
>+            <enum name="GL_LIGHT_MODEL_AMBIENT"/>
>+            <enum name="GL_SHADE_MODEL"/>
>+            <enum name="GL_COLOR_MATERIAL_FACE"/>
>+            <enum name="GL_COLOR_MATERIAL_PARAMETER"/>
>+            <enum name="GL_COLOR_MATERIAL"/>
>+            <enum name="GL_FOG"/>
>+            <enum name="GL_FOG_INDEX"/>
>+            <enum name="GL_FOG_DENSITY"/>
>+            <enum name="GL_FOG_START"/>
>+            <enum name="GL_FOG_END"/>
>+            <enum name="GL_FOG_MODE"/>
>+            <enum name="GL_FOG_COLOR"/>
>+            <enum name="GL_ACCUM_CLEAR_VALUE"/>
>+            <enum name="GL_MATRIX_MODE"/>
>+            <enum name="GL_NORMALIZE"/>
>+            <enum name="GL_MODELVIEW_STACK_DEPTH"/>
>+            <enum name="GL_PROJECTION_STACK_DEPTH"/>
>+            <enum name="GL_TEXTURE_STACK_DEPTH"/>
>+            <enum name="GL_MODELVIEW_MATRIX"/>
>+            <enum name="GL_PROJECTION_MATRIX"/>
>+            <enum name="GL_TEXTURE_MATRIX"/>
>+            <enum name="GL_ATTRIB_STACK_DEPTH"/>
>+            <enum name="GL_ALPHA_TEST"/>
>+            <enum name="GL_ALPHA_TEST_FUNC"/>
>+            <enum name="GL_ALPHA_TEST_REF"/>
>+            <enum name="GL_LOGIC_OP"/>
>+            <enum name="GL_AUX_BUFFERS"/>
>+            <enum name="GL_INDEX_CLEAR_VALUE"/>
>+            <enum name="GL_INDEX_WRITEMASK"/>
>+            <enum name="GL_INDEX_MODE"/>
>+            <enum name="GL_RGBA_MODE"/>
>+            <enum name="GL_RENDER_MODE"/>
>+            <enum name="GL_PERSPECTIVE_CORRECTION_HINT"/>
>+            <enum name="GL_POINT_SMOOTH_HINT"/>
>+            <enum name="GL_FOG_HINT"/>
>+            <enum name="GL_TEXTURE_GEN_S"/>
>+            <enum name="GL_TEXTURE_GEN_T"/>
>+            <enum name="GL_TEXTURE_GEN_R"/>
>+            <enum name="GL_TEXTURE_GEN_Q"/>
>+            <enum name="GL_PIXEL_MAP_I_TO_I_SIZE"/>
>+            <enum name="GL_PIXEL_MAP_S_TO_S_SIZE"/>
>+            <enum name="GL_PIXEL_MAP_I_TO_R_SIZE"/>
>+            <enum name="GL_PIXEL_MAP_I_TO_G_SIZE"/>
>+            <enum name="GL_PIXEL_MAP_I_TO_B_SIZE"/>
>+            <enum name="GL_PIXEL_MAP_I_TO_A_SIZE"/>
>+            <enum name="GL_PIXEL_MAP_R_TO_R_SIZE"/>
>+            <enum name="GL_PIXEL_MAP_G_TO_G_SIZE"/>
>+            <enum name="GL_PIXEL_MAP_B_TO_B_SIZE"/>
>+            <enum name="GL_PIXEL_MAP_A_TO_A_SIZE"/>
>+            <enum name="GL_MAP_COLOR"/>
>+            <enum name="GL_MAP_STENCIL"/>
>+            <enum name="GL_INDEX_SHIFT"/>
>+            <enum name="GL_INDEX_OFFSET"/>
>+            <enum name="GL_RED_SCALE"/>
>+            <enum name="GL_RED_BIAS"/>
>+            <enum name="GL_ZOOM_X"/>
>+            <enum name="GL_ZOOM_Y"/>
>+            <enum name="GL_GREEN_SCALE"/>
>+            <enum name="GL_GREEN_BIAS"/>
>+            <enum name="GL_BLUE_SCALE"/>
>+            <enum name="GL_BLUE_BIAS"/>
>+            <enum name="GL_ALPHA_SCALE"/>
>+            <enum name="GL_ALPHA_BIAS"/>
>+            <enum name="GL_DEPTH_SCALE"/>
>+            <enum name="GL_DEPTH_BIAS"/>
>+            <enum name="GL_MAX_EVAL_ORDER"/>
>+            <enum name="GL_MAX_LIGHTS"/>
>+            <enum name="GL_MAX_CLIP_PLANES"/>
>+            <enum name="GL_MAX_PIXEL_MAP_TABLE"/>
>+            <enum name="GL_MAX_ATTRIB_STACK_DEPTH"/>
>+            <enum name="GL_MAX_MODELVIEW_STACK_DEPTH"/>
>+            <enum name="GL_MAX_NAME_STACK_DEPTH"/>
>+            <enum name="GL_MAX_PROJECTION_STACK_DEPTH"/>
>+            <enum name="GL_MAX_TEXTURE_STACK_DEPTH"/>
>+            <enum name="GL_INDEX_BITS"/>
>+            <enum name="GL_RED_BITS"/>
>+            <enum name="GL_GREEN_BITS"/>
>+            <enum name="GL_BLUE_BITS"/>
>+            <enum name="GL_ALPHA_BITS"/>
>+            <enum name="GL_DEPTH_BITS"/>
>+            <enum name="GL_STENCIL_BITS"/>
>+            <enum name="GL_ACCUM_RED_BITS"/>
>+            <enum name="GL_ACCUM_GREEN_BITS"/>
>+            <enum name="GL_ACCUM_BLUE_BITS"/>
>+            <enum name="GL_ACCUM_ALPHA_BITS"/>
>+            <enum name="GL_NAME_STACK_DEPTH"/>
>+            <enum name="GL_AUTO_NORMAL"/>
>+            <enum name="GL_MAP1_COLOR_4"/>
>+            <enum name="GL_MAP1_INDEX"/>
>+            <enum name="GL_MAP1_NORMAL"/>
>+            <enum name="GL_MAP1_TEXTURE_COORD_1"/>
>+            <enum name="GL_MAP1_TEXTURE_COORD_2"/>
>+            <enum name="GL_MAP1_TEXTURE_COORD_3"/>
>+            <enum name="GL_MAP1_TEXTURE_COORD_4"/>
>+            <enum name="GL_MAP1_VERTEX_3"/>
>+            <enum name="GL_MAP1_VERTEX_4"/>
>+            <enum name="GL_MAP2_COLOR_4"/>
>+            <enum name="GL_MAP2_INDEX"/>
>+            <enum name="GL_MAP2_NORMAL"/>
>+            <enum name="GL_MAP2_TEXTURE_COORD_1"/>
>+            <enum name="GL_MAP2_TEXTURE_COORD_2"/>
>+            <enum name="GL_MAP2_TEXTURE_COORD_3"/>
>+            <enum name="GL_MAP2_TEXTURE_COORD_4"/>
>+            <enum name="GL_MAP2_VERTEX_3"/>
>+            <enum name="GL_MAP2_VERTEX_4"/>
>+            <enum name="GL_MAP1_GRID_DOMAIN"/>
>+            <enum name="GL_MAP1_GRID_SEGMENTS"/>
>+            <enum name="GL_MAP2_GRID_DOMAIN"/>
>+            <enum name="GL_MAP2_GRID_SEGMENTS"/>
>+            <enum name="GL_TEXTURE_COMPONENTS"/>
>+            <enum name="GL_TEXTURE_BORDER"/>
>+            <enum name="GL_AMBIENT"/>
>+            <enum name="GL_DIFFUSE"/>
>+            <enum name="GL_SPECULAR"/>
>+            <enum name="GL_POSITION"/>
>+            <enum name="GL_SPOT_DIRECTION"/>
>+            <enum name="GL_SPOT_EXPONENT"/>
>+            <enum name="GL_SPOT_CUTOFF"/>
>+            <enum name="GL_CONSTANT_ATTENUATION"/>
>+            <enum name="GL_LINEAR_ATTENUATION"/>
>+            <enum name="GL_QUADRATIC_ATTENUATION"/>
>+            <enum name="GL_COMPILE"/>
>+            <enum name="GL_COMPILE_AND_EXECUTE"/>
>+            <enum name="GL_2_BYTES"/>
>+            <enum name="GL_3_BYTES"/>
>+            <enum name="GL_4_BYTES"/>
>+            <enum name="GL_EMISSION"/>
>+            <enum name="GL_SHININESS"/>
>+            <enum name="GL_AMBIENT_AND_DIFFUSE"/>
>+            <enum name="GL_COLOR_INDEXES"/>
>+            <enum name="GL_MODELVIEW"/>
>+            <enum name="GL_PROJECTION"/>
>+            <enum name="GL_COLOR_INDEX"/>
>+            <enum name="GL_LUMINANCE"/>
>+            <enum name="GL_LUMINANCE_ALPHA"/>
>+            <enum name="GL_BITMAP"/>
>+            <enum name="GL_RENDER"/>
>+            <enum name="GL_FEEDBACK"/>
>+            <enum name="GL_SELECT"/>
>+            <enum name="GL_FLAT"/>
>+            <enum name="GL_SMOOTH"/>
>+            <enum name="GL_S"/>
>+            <enum name="GL_T"/>
>+            <enum name="GL_R"/>
>+            <enum name="GL_Q"/>
>+            <enum name="GL_MODULATE"/>
>+            <enum name="GL_DECAL"/>
>+            <enum name="GL_TEXTURE_ENV_MODE"/>
>+            <enum name="GL_TEXTURE_ENV_COLOR"/>
>+            <enum name="GL_TEXTURE_ENV"/>
>+            <enum name="GL_EYE_LINEAR"/>
>+            <enum name="GL_OBJECT_LINEAR"/>
>+            <enum name="GL_SPHERE_MAP"/>
>+            <enum name="GL_TEXTURE_GEN_MODE"/>
>+            <enum name="GL_OBJECT_PLANE"/>
>+            <enum name="GL_EYE_PLANE"/>
>+            <enum name="GL_CLAMP"/>
>+            <enum name="GL_CLIP_PLANE0"/>
>+            <enum name="GL_CLIP_PLANE1"/>
>+            <enum name="GL_CLIP_PLANE2"/>
>+            <enum name="GL_CLIP_PLANE3"/>
>+            <enum name="GL_CLIP_PLANE4"/>
>+            <enum name="GL_CLIP_PLANE5"/>
>+            <enum name="GL_LIGHT0"/>
>+            <enum name="GL_LIGHT1"/>
>+            <enum name="GL_LIGHT2"/>
>+            <enum name="GL_LIGHT3"/>
>+            <enum name="GL_LIGHT4"/>
>+            <enum name="GL_LIGHT5"/>
>+            <enum name="GL_LIGHT6"/>
>+            <enum name="GL_LIGHT7"/>
>+            <command name="glCullFace"/>
>+            <command name="glFrontFace"/>
>+            <command name="glHint"/>
>+            <command name="glLineWidth"/>
>+            <command name="glPointSize"/>
>+            <command name="glPolygonMode"/>
>+            <command name="glScissor"/>
>+            <command name="glTexParameterf"/>
>+            <command name="glTexParameterfv"/>
>+            <command name="glTexParameteri"/>
>+            <command name="glTexParameteriv"/>
>+            <command name="glTexImage1D"/>
>+            <command name="glTexImage2D"/>
>+            <command name="glDrawBuffer"/>
>+            <command name="glClear"/>
>+            <command name="glClearColor"/>
>+            <command name="glClearStencil"/>
>+            <command name="glClearDepth"/>
>+            <command name="glStencilMask"/>
>+            <command name="glColorMask"/>
>+            <command name="glDepthMask"/>
>+            <command name="glDisable"/>
>+            <command name="glEnable"/>
>+            <command name="glFinish"/>
>+            <command name="glFlush"/>
>+            <command name="glBlendFunc"/>
>+            <command name="glLogicOp"/>
>+            <command name="glStencilFunc"/>
>+            <command name="glStencilOp"/>
>+            <command name="glDepthFunc"/>
>+            <command name="glPixelStoref"/>
>+            <command name="glPixelStorei"/>
>+            <command name="glReadBuffer"/>
>+            <command name="glReadPixels"/>
>+            <command name="glGetBooleanv"/>
>+            <command name="glGetDoublev"/>
>+            <command name="glGetError"/>
>+            <command name="glGetFloatv"/>
>+            <command name="glGetIntegerv"/>
>+            <command name="glGetString"/>
>+            <command name="glGetTexImage"/>
>+            <command name="glGetTexParameterfv"/>
>+            <command name="glGetTexParameteriv"/>
>+            <command name="glGetTexLevelParameterfv"/>
>+            <command name="glGetTexLevelParameteriv"/>
>+            <command name="glIsEnabled"/>
>+            <command name="glDepthRange"/>
>+            <command name="glViewport"/>
>+            <command name="glNewList"/>
>+            <command name="glEndList"/>
>+            <command name="glCallList"/>
>+            <command name="glCallLists"/>
>+            <command name="glDeleteLists"/>
>+            <command name="glGenLists"/>
>+            <command name="glListBase"/>
>+            <command name="glBegin"/>
>+            <command name="glBitmap"/>
>+            <command name="glColor3b"/>
>+            <command name="glColor3bv"/>
>+            <command name="glColor3d"/>
>+            <command name="glColor3dv"/>
>+            <command name="glColor3f"/>
>+            <command name="glColor3fv"/>
>+            <command name="glColor3i"/>
>+            <command name="glColor3iv"/>
>+            <command name="glColor3s"/>
>+            <command name="glColor3sv"/>
>+            <command name="glColor3ub"/>
>+            <command name="glColor3ubv"/>
>+            <command name="glColor3ui"/>
>+            <command name="glColor3uiv"/>
>+            <command name="glColor3us"/>
>+            <command name="glColor3usv"/>
>+            <command name="glColor4b"/>
>+            <command name="glColor4bv"/>
>+            <command name="glColor4d"/>
>+            <command name="glColor4dv"/>
>+            <command name="glColor4f"/>
>+            <command name="glColor4fv"/>
>+            <command name="glColor4i"/>
>+            <command name="glColor4iv"/>
>+            <command name="glColor4s"/>
>+            <command name="glColor4sv"/>
>+            <command name="glColor4ub"/>
>+            <command name="glColor4ubv"/>
>+            <command name="glColor4ui"/>
>+            <command name="glColor4uiv"/>
>+            <command name="glColor4us"/>
>+            <command name="glColor4usv"/>
>+            <command name="glEdgeFlag"/>
>+            <command name="glEdgeFlagv"/>
>+            <command name="glEnd"/>
>+            <command name="glIndexd"/>
>+            <command name="glIndexdv"/>
>+            <command name="glIndexf"/>
>+            <command name="glIndexfv"/>
>+            <command name="glIndexi"/>
>+            <command name="glIndexiv"/>
>+            <command name="glIndexs"/>
>+            <command name="glIndexsv"/>
>+            <command name="glNormal3b"/>
>+            <command name="glNormal3bv"/>
>+            <command name="glNormal3d"/>
>+            <command name="glNormal3dv"/>
>+            <command name="glNormal3f"/>
>+            <command name="glNormal3fv"/>
>+            <command name="glNormal3i"/>
>+            <command name="glNormal3iv"/>
>+            <command name="glNormal3s"/>
>+            <command name="glNormal3sv"/>
>+            <command name="glRasterPos2d"/>
>+            <command name="glRasterPos2dv"/>
>+            <command name="glRasterPos2f"/>
>+            <command name="glRasterPos2fv"/>
>+            <command name="glRasterPos2i"/>
>+            <command name="glRasterPos2iv"/>
>+            <command name="glRasterPos2s"/>
>+            <command name="glRasterPos2sv"/>
>+            <command name="glRasterPos3d"/>
>+            <command name="glRasterPos3dv"/>
>+            <command name="glRasterPos3f"/>
>+            <command name="glRasterPos3fv"/>
>+            <command name="glRasterPos3i"/>
>+            <command name="glRasterPos3iv"/>
>+            <command name="glRasterPos3s"/>
>+            <command name="glRasterPos3sv"/>
>+            <command name="glRasterPos4d"/>
>+            <command name="glRasterPos4dv"/>
>+            <command name="glRasterPos4f"/>
>+            <command name="glRasterPos4fv"/>
>+            <command name="glRasterPos4i"/>
>+            <command name="glRasterPos4iv"/>
>+            <command name="glRasterPos4s"/>
>+            <command name="glRasterPos4sv"/>
>+            <command name="glRectd"/>
>+            <command name="glRectdv"/>
>+            <command name="glRectf"/>
>+            <command name="glRectfv"/>
>+            <command name="glRecti"/>
>+            <command name="glRectiv"/>
>+            <command name="glRects"/>
>+            <command name="glRectsv"/>
>+            <command name="glTexCoord1d"/>
>+            <command name="glTexCoord1dv"/>
>+            <command name="glTexCoord1f"/>
>+            <command name="glTexCoord1fv"/>
>+            <command name="glTexCoord1i"/>
>+            <command name="glTexCoord1iv"/>
>+            <command name="glTexCoord1s"/>
>+            <command name="glTexCoord1sv"/>
>+            <command name="glTexCoord2d"/>
>+            <command name="glTexCoord2dv"/>
>+            <command name="glTexCoord2f"/>
>+            <command name="glTexCoord2fv"/>
>+            <command name="glTexCoord2i"/>
>+            <command name="glTexCoord2iv"/>
>+            <command name="glTexCoord2s"/>
>+            <command name="glTexCoord2sv"/>
>+            <command name="glTexCoord3d"/>
>+            <command name="glTexCoord3dv"/>
>+            <command name="glTexCoord3f"/>
>+            <command name="glTexCoord3fv"/>
>+            <command name="glTexCoord3i"/>
>+            <command name="glTexCoord3iv"/>
>+            <command name="glTexCoord3s"/>
>+            <command name="glTexCoord3sv"/>
>+            <command name="glTexCoord4d"/>
>+            <command name="glTexCoord4dv"/>
>+            <command name="glTexCoord4f"/>
>+            <command name="glTexCoord4fv"/>
>+            <command name="glTexCoord4i"/>
>+            <command name="glTexCoord4iv"/>
>+            <command name="glTexCoord4s"/>
>+            <command name="glTexCoord4sv"/>
>+            <command name="glVertex2d"/>
>+            <command name="glVertex2dv"/>
>+            <command name="glVertex2f"/>
>+            <command name="glVertex2fv"/>
>+            <command name="glVertex2i"/>
>+            <command name="glVertex2iv"/>
>+            <command name="glVertex2s"/>
>+            <command name="glVertex2sv"/>
>+            <command name="glVertex3d"/>
>+            <command name="glVertex3dv"/>
>+            <command name="glVertex3f"/>
>+            <command name="glVertex3fv"/>
>+            <command name="glVertex3i"/>
>+            <command name="glVertex3iv"/>
>+            <command name="glVertex3s"/>
>+            <command name="glVertex3sv"/>
>+            <command name="glVertex4d"/>
>+            <command name="glVertex4dv"/>
>+            <command name="glVertex4f"/>
>+            <command name="glVertex4fv"/>
>+            <command name="glVertex4i"/>
>+            <command name="glVertex4iv"/>
>+            <command name="glVertex4s"/>
>+            <command name="glVertex4sv"/>
>+            <command name="glClipPlane"/>
>+            <command name="glColorMaterial"/>
>+            <command name="glFogf"/>
>+            <command name="glFogfv"/>
>+            <command name="glFogi"/>
>+            <command name="glFogiv"/>
>+            <command name="glLightf"/>
>+            <command name="glLightfv"/>
>+            <command name="glLighti"/>
>+            <command name="glLightiv"/>
>+            <command name="glLightModelf"/>
>+            <command name="glLightModelfv"/>
>+            <command name="glLightModeli"/>
>+            <command name="glLightModeliv"/>
>+            <command name="glLineStipple"/>
>+            <command name="glMaterialf"/>
>+            <command name="glMaterialfv"/>
>+            <command name="glMateriali"/>
>+            <command name="glMaterialiv"/>
>+            <command name="glPolygonStipple"/>
>+            <command name="glShadeModel"/>
>+            <command name="glTexEnvf"/>
>+            <command name="glTexEnvfv"/>
>+            <command name="glTexEnvi"/>
>+            <command name="glTexEnviv"/>
>+            <command name="glTexGend"/>
>+            <command name="glTexGendv"/>
>+            <command name="glTexGenf"/>
>+            <command name="glTexGenfv"/>
>+            <command name="glTexGeni"/>
>+            <command name="glTexGeniv"/>
>+            <command name="glFeedbackBuffer"/>
>+            <command name="glSelectBuffer"/>
>+            <command name="glRenderMode"/>
>+            <command name="glInitNames"/>
>+            <command name="glLoadName"/>
>+            <command name="glPassThrough"/>
>+            <command name="glPopName"/>
>+            <command name="glPushName"/>
>+            <command name="glClearAccum"/>
>+            <command name="glClearIndex"/>
>+            <command name="glIndexMask"/>
>+            <command name="glAccum"/>
>+            <command name="glPopAttrib"/>
>+            <command name="glPushAttrib"/>
>+            <command name="glMap1d"/>
>+            <command name="glMap1f"/>
>+            <command name="glMap2d"/>
>+            <command name="glMap2f"/>
>+            <command name="glMapGrid1d"/>
>+            <command name="glMapGrid1f"/>
>+            <command name="glMapGrid2d"/>
>+            <command name="glMapGrid2f"/>
>+            <command name="glEvalCoord1d"/>
>+            <command name="glEvalCoord1dv"/>
>+            <command name="glEvalCoord1f"/>
>+            <command name="glEvalCoord1fv"/>
>+            <command name="glEvalCoord2d"/>
>+            <command name="glEvalCoord2dv"/>
>+            <command name="glEvalCoord2f"/>
>+            <command name="glEvalCoord2fv"/>
>+            <command name="glEvalMesh1"/>
>+            <command name="glEvalPoint1"/>
>+            <command name="glEvalMesh2"/>
>+            <command name="glEvalPoint2"/>
>+            <command name="glAlphaFunc"/>
>+            <command name="glPixelZoom"/>
>+            <command name="glPixelTransferf"/>
>+            <command name="glPixelTransferi"/>
>+            <command name="glPixelMapfv"/>
>+            <command name="glPixelMapuiv"/>
>+            <command name="glPixelMapusv"/>
>+            <command name="glCopyPixels"/>
>+            <command name="glDrawPixels"/>
>+            <command name="glGetClipPlane"/>
>+            <command name="glGetLightfv"/>
>+            <command name="glGetLightiv"/>
>+            <command name="glGetMapdv"/>
>+            <command name="glGetMapfv"/>
>+            <command name="glGetMapiv"/>
>+            <command name="glGetMaterialfv"/>
>+            <command name="glGetMaterialiv"/>
>+            <command name="glGetPixelMapfv"/>
>+            <command name="glGetPixelMapuiv"/>
>+            <command name="glGetPixelMapusv"/>
>+            <command name="glGetPolygonStipple"/>
>+            <command name="glGetTexEnvfv"/>
>+            <command name="glGetTexEnviv"/>
>+            <command name="glGetTexGendv"/>
>+            <command name="glGetTexGenfv"/>
>+            <command name="glGetTexGeniv"/>
>+            <command name="glIsList"/>
>+            <command name="glFrustum"/>
>+            <command name="glLoadIdentity"/>
>+            <command name="glLoadMatrixf"/>
>+            <command name="glLoadMatrixd"/>
>+            <command name="glMatrixMode"/>
>+            <command name="glMultMatrixf"/>
>+            <command name="glMultMatrixd"/>
>+            <command name="glOrtho"/>
>+            <command name="glPopMatrix"/>
>+            <command name="glPushMatrix"/>
>+            <command name="glRotated"/>
>+            <command name="glRotatef"/>
>+            <command name="glScaled"/>
>+            <command name="glScalef"/>
>+            <command name="glTranslated"/>
>+            <command name="glTranslatef"/>
>+        </require>
>+    </feature>
>+    <feature api="gl" name="GL_VERSION_1_1" number="1.1">
>+        <require>
>+            <type name="GLclampf" comment="No longer used in GL 1.1, but still defined in Mesa gl.h"/>
>+            <type name="GLclampd" comment="No longer used in GL 1.1, but still defined in Mesa gl.h"/>
>+            <enum name="GL_COLOR_LOGIC_OP"/>
>+            <enum name="GL_POLYGON_OFFSET_UNITS"/>
>+            <enum name="GL_POLYGON_OFFSET_POINT"/>
>+            <enum name="GL_POLYGON_OFFSET_LINE"/>
>+            <enum name="GL_POLYGON_OFFSET_FILL"/>
>+            <enum name="GL_POLYGON_OFFSET_FACTOR"/>
>+            <enum name="GL_TEXTURE_BINDING_1D"/>
>+            <enum name="GL_TEXTURE_BINDING_2D"/>
>+            <enum name="GL_TEXTURE_INTERNAL_FORMAT"/>
>+            <enum name="GL_TEXTURE_RED_SIZE"/>
>+            <enum name="GL_TEXTURE_GREEN_SIZE"/>
>+            <enum name="GL_TEXTURE_BLUE_SIZE"/>
>+            <enum name="GL_TEXTURE_ALPHA_SIZE"/>
>+            <enum name="GL_DOUBLE"/>
>+            <enum name="GL_PROXY_TEXTURE_1D"/>
>+            <enum name="GL_PROXY_TEXTURE_2D"/>
>+            <enum name="GL_R3_G3_B2"/>
>+            <enum name="GL_RGB4"/>
>+            <enum name="GL_RGB5"/>
>+            <enum name="GL_RGB8"/>
>+            <enum name="GL_RGB10"/>
>+            <enum name="GL_RGB12"/>
>+            <enum name="GL_RGB16"/>
>+            <enum name="GL_RGBA2"/>
>+            <enum name="GL_RGBA4"/>
>+            <enum name="GL_RGB5_A1"/>
>+            <enum name="GL_RGBA8"/>
>+            <enum name="GL_RGB10_A2"/>
>+            <enum name="GL_RGBA12"/>
>+            <enum name="GL_RGBA16"/>
>+            <enum name="GL_CLIENT_PIXEL_STORE_BIT"/>
>+            <enum name="GL_CLIENT_VERTEX_ARRAY_BIT"/>
>+            <enum name="GL_CLIENT_ALL_ATTRIB_BITS"/>
>+            <enum name="GL_VERTEX_ARRAY_POINTER"/>
>+            <enum name="GL_NORMAL_ARRAY_POINTER"/>
>+            <enum name="GL_COLOR_ARRAY_POINTER"/>
>+            <enum name="GL_INDEX_ARRAY_POINTER"/>
>+            <enum name="GL_TEXTURE_COORD_ARRAY_POINTER"/>
>+            <enum name="GL_EDGE_FLAG_ARRAY_POINTER"/>
>+            <enum name="GL_FEEDBACK_BUFFER_POINTER"/>
>+            <enum name="GL_SELECTION_BUFFER_POINTER"/>
>+            <enum name="GL_CLIENT_ATTRIB_STACK_DEPTH"/>
>+            <enum name="GL_INDEX_LOGIC_OP"/>
>+            <enum name="GL_MAX_CLIENT_ATTRIB_STACK_DEPTH"/>
>+            <enum name="GL_FEEDBACK_BUFFER_SIZE"/>
>+            <enum name="GL_FEEDBACK_BUFFER_TYPE"/>
>+            <enum name="GL_SELECTION_BUFFER_SIZE"/>
>+            <enum name="GL_VERTEX_ARRAY"/>
>+            <enum name="GL_NORMAL_ARRAY"/>
>+            <enum name="GL_COLOR_ARRAY"/>
>+            <enum name="GL_INDEX_ARRAY"/>
>+            <enum name="GL_TEXTURE_COORD_ARRAY"/>
>+            <enum name="GL_EDGE_FLAG_ARRAY"/>
>+            <enum name="GL_VERTEX_ARRAY_SIZE"/>
>+            <enum name="GL_VERTEX_ARRAY_TYPE"/>
>+            <enum name="GL_VERTEX_ARRAY_STRIDE"/>
>+            <enum name="GL_NORMAL_ARRAY_TYPE"/>
>+            <enum name="GL_NORMAL_ARRAY_STRIDE"/>
>+            <enum name="GL_COLOR_ARRAY_SIZE"/>
>+            <enum name="GL_COLOR_ARRAY_TYPE"/>
>+            <enum name="GL_COLOR_ARRAY_STRIDE"/>
>+            <enum name="GL_INDEX_ARRAY_TYPE"/>
>+            <enum name="GL_INDEX_ARRAY_STRIDE"/>
>+            <enum name="GL_TEXTURE_COORD_ARRAY_SIZE"/>
>+            <enum name="GL_TEXTURE_COORD_ARRAY_TYPE"/>
>+            <enum name="GL_TEXTURE_COORD_ARRAY_STRIDE"/>
>+            <enum name="GL_EDGE_FLAG_ARRAY_STRIDE"/>
>+            <enum name="GL_TEXTURE_LUMINANCE_SIZE"/>
>+            <enum name="GL_TEXTURE_INTENSITY_SIZE"/>
>+            <enum name="GL_TEXTURE_PRIORITY"/>
>+            <enum name="GL_TEXTURE_RESIDENT"/>
>+            <enum name="GL_ALPHA4"/>
>+            <enum name="GL_ALPHA8"/>
>+            <enum name="GL_ALPHA12"/>
>+            <enum name="GL_ALPHA16"/>
>+            <enum name="GL_LUMINANCE4"/>
>+            <enum name="GL_LUMINANCE8"/>
>+            <enum name="GL_LUMINANCE12"/>
>+            <enum name="GL_LUMINANCE16"/>
>+            <enum name="GL_LUMINANCE4_ALPHA4"/>
>+            <enum name="GL_LUMINANCE6_ALPHA2"/>
>+            <enum name="GL_LUMINANCE8_ALPHA8"/>
>+            <enum name="GL_LUMINANCE12_ALPHA4"/>
>+            <enum name="GL_LUMINANCE12_ALPHA12"/>
>+            <enum name="GL_LUMINANCE16_ALPHA16"/>
>+            <enum name="GL_INTENSITY"/>
>+            <enum name="GL_INTENSITY4"/>
>+            <enum name="GL_INTENSITY8"/>
>+            <enum name="GL_INTENSITY12"/>
>+            <enum name="GL_INTENSITY16"/>
>+            <enum name="GL_V2F"/>
>+            <enum name="GL_V3F"/>
>+            <enum name="GL_C4UB_V2F"/>
>+            <enum name="GL_C4UB_V3F"/>
>+            <enum name="GL_C3F_V3F"/>
>+            <enum name="GL_N3F_V3F"/>
>+            <enum name="GL_C4F_N3F_V3F"/>
>+            <enum name="GL_T2F_V3F"/>
>+            <enum name="GL_T4F_V4F"/>
>+            <enum name="GL_T2F_C4UB_V3F"/>
>+            <enum name="GL_T2F_C3F_V3F"/>
>+            <enum name="GL_T2F_N3F_V3F"/>
>+            <enum name="GL_T2F_C4F_N3F_V3F"/>
>+            <enum name="GL_T4F_C4F_N3F_V4F"/>
>+            <command name="glDrawArrays"/>
>+            <command name="glDrawElements"/>
>+            <command name="glGetPointerv"/>
>+            <command name="glPolygonOffset"/>
>+            <command name="glCopyTexImage1D"/>
>+            <command name="glCopyTexImage2D"/>
>+            <command name="glCopyTexSubImage1D"/>
>+            <command name="glCopyTexSubImage2D"/>
>+            <command name="glTexSubImage1D"/>
>+            <command name="glTexSubImage2D"/>
>+            <command name="glBindTexture"/>
>+            <command name="glDeleteTextures"/>
>+            <command name="glGenTextures"/>
>+            <command name="glIsTexture"/>
>+            <command name="glArrayElement"/>
>+            <command name="glColorPointer"/>
>+            <command name="glDisableClientState"/>
>+            <command name="glEdgeFlagPointer"/>
>+            <command name="glEnableClientState"/>
>+            <command name="glIndexPointer"/>
>+            <command name="glInterleavedArrays"/>
>+            <command name="glNormalPointer"/>
>+            <command name="glTexCoordPointer"/>
>+            <command name="glVertexPointer"/>
>+            <command name="glAreTexturesResident"/>
>+            <command name="glPrioritizeTextures"/>
>+            <command name="glIndexub"/>
>+            <command name="glIndexubv"/>
>+            <command name="glPopClientAttrib"/>
>+            <command name="glPushClientAttrib"/>
>+        </require>
>+    </feature>
>+    <feature api="gl" name="GL_VERSION_1_2" number="1.2">
>+        <require>
>+            <enum name="GL_UNSIGNED_BYTE_3_3_2"/>
>+            <enum name="GL_UNSIGNED_SHORT_4_4_4_4"/>
>+            <enum name="GL_UNSIGNED_SHORT_5_5_5_1"/>
>+            <enum name="GL_UNSIGNED_INT_8_8_8_8"/>
>+            <enum name="GL_UNSIGNED_INT_10_10_10_2"/>
>+            <enum name="GL_TEXTURE_BINDING_3D"/>
>+            <enum name="GL_PACK_SKIP_IMAGES"/>
>+            <enum name="GL_PACK_IMAGE_HEIGHT"/>
>+            <enum name="GL_UNPACK_SKIP_IMAGES"/>
>+            <enum name="GL_UNPACK_IMAGE_HEIGHT"/>
>+            <enum name="GL_TEXTURE_3D"/>
>+            <enum name="GL_PROXY_TEXTURE_3D"/>
>+            <enum name="GL_TEXTURE_DEPTH"/>
>+            <enum name="GL_TEXTURE_WRAP_R"/>
>+            <enum name="GL_MAX_3D_TEXTURE_SIZE"/>
>+            <enum name="GL_UNSIGNED_BYTE_2_3_3_REV"/>
>+            <enum name="GL_UNSIGNED_SHORT_5_6_5"/>
>+            <enum name="GL_UNSIGNED_SHORT_5_6_5_REV"/>
>+            <enum name="GL_UNSIGNED_SHORT_4_4_4_4_REV"/>
>+            <enum name="GL_UNSIGNED_SHORT_1_5_5_5_REV"/>
>+            <enum name="GL_UNSIGNED_INT_8_8_8_8_REV"/>
>+            <enum name="GL_UNSIGNED_INT_2_10_10_10_REV"/>
>+            <enum name="GL_BGR"/>
>+            <enum name="GL_BGRA"/>
>+            <enum name="GL_MAX_ELEMENTS_VERTICES"/>
>+            <enum name="GL_MAX_ELEMENTS_INDICES"/>
>+            <enum name="GL_CLAMP_TO_EDGE"/>
>+            <enum name="GL_TEXTURE_MIN_LOD"/>
>+            <enum name="GL_TEXTURE_MAX_LOD"/>
>+            <enum name="GL_TEXTURE_BASE_LEVEL"/>
>+            <enum name="GL_TEXTURE_MAX_LEVEL"/>
>+            <enum name="GL_SMOOTH_POINT_SIZE_RANGE"/>
>+            <enum name="GL_SMOOTH_POINT_SIZE_GRANULARITY"/>
>+            <enum name="GL_SMOOTH_LINE_WIDTH_RANGE"/>
>+            <enum name="GL_SMOOTH_LINE_WIDTH_GRANULARITY"/>
>+            <enum name="GL_ALIASED_LINE_WIDTH_RANGE"/>
>+            <enum name="GL_RESCALE_NORMAL"/>
>+            <enum name="GL_LIGHT_MODEL_COLOR_CONTROL"/>
>+            <enum name="GL_SINGLE_COLOR"/>
>+            <enum name="GL_SEPARATE_SPECULAR_COLOR"/>
>+            <enum name="GL_ALIASED_POINT_SIZE_RANGE"/>
>+            <command name="glDrawRangeElements"/>
>+            <command name="glTexImage3D"/>
>+            <command name="glTexSubImage3D"/>
>+            <command name="glCopyTexSubImage3D"/>
>+        </require>
>+    </feature>
>+    <feature api="gl" name="GL_VERSION_1_3" number="1.3">
>+        <require>
>+            <enum name="GL_TEXTURE0"/>
>+            <enum name="GL_TEXTURE1"/>
>+            <enum name="GL_TEXTURE2"/>
>+            <enum name="GL_TEXTURE3"/>
>+            <enum name="GL_TEXTURE4"/>
>+            <enum name="GL_TEXTURE5"/>
>+            <enum name="GL_TEXTURE6"/>
>+            <enum name="GL_TEXTURE7"/>
>+            <enum name="GL_TEXTURE8"/>
>+            <enum name="GL_TEXTURE9"/>
>+            <enum name="GL_TEXTURE10"/>
>+            <enum name="GL_TEXTURE11"/>
>+            <enum name="GL_TEXTURE12"/>
>+            <enum name="GL_TEXTURE13"/>
>+            <enum name="GL_TEXTURE14"/>
>+            <enum name="GL_TEXTURE15"/>
>+            <enum name="GL_TEXTURE16"/>
>+            <enum name="GL_TEXTURE17"/>
>+            <enum name="GL_TEXTURE18"/>
>+            <enum name="GL_TEXTURE19"/>
>+            <enum name="GL_TEXTURE20"/>
>+            <enum name="GL_TEXTURE21"/>
>+            <enum name="GL_TEXTURE22"/>
>+            <enum name="GL_TEXTURE23"/>
>+            <enum name="GL_TEXTURE24"/>
>+            <enum name="GL_TEXTURE25"/>
>+            <enum name="GL_TEXTURE26"/>
>+            <enum name="GL_TEXTURE27"/>
>+            <enum name="GL_TEXTURE28"/>
>+            <enum name="GL_TEXTURE29"/>
>+            <enum name="GL_TEXTURE30"/>
>+            <enum name="GL_TEXTURE31"/>
>+            <enum name="GL_ACTIVE_TEXTURE"/>
>+            <enum name="GL_MULTISAMPLE"/>
>+            <enum name="GL_SAMPLE_ALPHA_TO_COVERAGE"/>
>+            <enum name="GL_SAMPLE_ALPHA_TO_ONE"/>
>+            <enum name="GL_SAMPLE_COVERAGE"/>
>+            <enum name="GL_SAMPLE_BUFFERS"/>
>+            <enum name="GL_SAMPLES"/>
>+            <enum name="GL_SAMPLE_COVERAGE_VALUE"/>
>+            <enum name="GL_SAMPLE_COVERAGE_INVERT"/>
>+            <enum name="GL_TEXTURE_CUBE_MAP"/>
>+            <enum name="GL_TEXTURE_BINDING_CUBE_MAP"/>
>+            <enum name="GL_TEXTURE_CUBE_MAP_POSITIVE_X"/>
>+            <enum name="GL_TEXTURE_CUBE_MAP_NEGATIVE_X"/>
>+            <enum name="GL_TEXTURE_CUBE_MAP_POSITIVE_Y"/>
>+            <enum name="GL_TEXTURE_CUBE_MAP_NEGATIVE_Y"/>
>+            <enum name="GL_TEXTURE_CUBE_MAP_POSITIVE_Z"/>
>+            <enum name="GL_TEXTURE_CUBE_MAP_NEGATIVE_Z"/>
>+            <enum name="GL_PROXY_TEXTURE_CUBE_MAP"/>
>+            <enum name="GL_MAX_CUBE_MAP_TEXTURE_SIZE"/>
>+            <enum name="GL_COMPRESSED_RGB"/>
>+            <enum name="GL_COMPRESSED_RGBA"/>
>+            <enum name="GL_TEXTURE_COMPRESSION_HINT"/>
>+            <enum name="GL_TEXTURE_COMPRESSED_IMAGE_SIZE"/>
>+            <enum name="GL_TEXTURE_COMPRESSED"/>
>+            <enum name="GL_NUM_COMPRESSED_TEXTURE_FORMATS"/>
>+            <enum name="GL_COMPRESSED_TEXTURE_FORMATS"/>
>+            <enum name="GL_CLAMP_TO_BORDER"/>
>+            <enum name="GL_CLIENT_ACTIVE_TEXTURE"/>
>+            <enum name="GL_MAX_TEXTURE_UNITS"/>
>+            <enum name="GL_TRANSPOSE_MODELVIEW_MATRIX"/>
>+            <enum name="GL_TRANSPOSE_PROJECTION_MATRIX"/>
>+            <enum name="GL_TRANSPOSE_TEXTURE_MATRIX"/>
>+            <enum name="GL_TRANSPOSE_COLOR_MATRIX"/>
>+            <enum name="GL_MULTISAMPLE_BIT"/>
>+            <enum name="GL_NORMAL_MAP"/>
>+            <enum name="GL_REFLECTION_MAP"/>
>+            <enum name="GL_COMPRESSED_ALPHA"/>
>+            <enum name="GL_COMPRESSED_LUMINANCE"/>
>+            <enum name="GL_COMPRESSED_LUMINANCE_ALPHA"/>
>+            <enum name="GL_COMPRESSED_INTENSITY"/>
>+            <enum name="GL_COMBINE"/>
>+            <enum name="GL_COMBINE_RGB"/>
>+            <enum name="GL_COMBINE_ALPHA"/>
>+            <enum name="GL_SOURCE0_RGB"/>
>+            <enum name="GL_SOURCE1_RGB"/>
>+            <enum name="GL_SOURCE2_RGB"/>
>+            <enum name="GL_SOURCE0_ALPHA"/>
>+            <enum name="GL_SOURCE1_ALPHA"/>
>+            <enum name="GL_SOURCE2_ALPHA"/>
>+            <enum name="GL_OPERAND0_RGB"/>
>+            <enum name="GL_OPERAND1_RGB"/>
>+            <enum name="GL_OPERAND2_RGB"/>
>+            <enum name="GL_OPERAND0_ALPHA"/>
>+            <enum name="GL_OPERAND1_ALPHA"/>
>+            <enum name="GL_OPERAND2_ALPHA"/>
>+            <enum name="GL_RGB_SCALE"/>
>+            <enum name="GL_ADD_SIGNED"/>
>+            <enum name="GL_INTERPOLATE"/>
>+            <enum name="GL_SUBTRACT"/>
>+            <enum name="GL_CONSTANT"/>
>+            <enum name="GL_PRIMARY_COLOR"/>
>+            <enum name="GL_PREVIOUS"/>
>+            <enum name="GL_DOT3_RGB"/>
>+            <enum name="GL_DOT3_RGBA"/>
>+            <command name="glActiveTexture"/>
>+            <command name="glSampleCoverage"/>
>+            <command name="glCompressedTexImage3D"/>
>+            <command name="glCompressedTexImage2D"/>
>+            <command name="glCompressedTexImage1D"/>
>+            <command name="glCompressedTexSubImage3D"/>
>+            <command name="glCompressedTexSubImage2D"/>
>+            <command name="glCompressedTexSubImage1D"/>
>+            <command name="glGetCompressedTexImage"/>
>+            <command name="glClientActiveTexture"/>
>+            <command name="glMultiTexCoord1d"/>
>+            <command name="glMultiTexCoord1dv"/>
>+            <command name="glMultiTexCoord1f"/>
>+            <command name="glMultiTexCoord1fv"/>
>+            <command name="glMultiTexCoord1i"/>
>+            <command name="glMultiTexCoord1iv"/>
>+            <command name="glMultiTexCoord1s"/>
>+            <command name="glMultiTexCoord1sv"/>
>+            <command name="glMultiTexCoord2d"/>
>+            <command name="glMultiTexCoord2dv"/>
>+            <command name="glMultiTexCoord2f"/>
>+            <command name="glMultiTexCoord2fv"/>
>+            <command name="glMultiTexCoord2i"/>
>+            <command name="glMultiTexCoord2iv"/>
>+            <command name="glMultiTexCoord2s"/>
>+            <command name="glMultiTexCoord2sv"/>
>+            <command name="glMultiTexCoord3d"/>
>+            <command name="glMultiTexCoord3dv"/>
>+            <command name="glMultiTexCoord3f"/>
>+            <command name="glMultiTexCoord3fv"/>
>+            <command name="glMultiTexCoord3i"/>
>+            <command name="glMultiTexCoord3iv"/>
>+            <command name="glMultiTexCoord3s"/>
>+            <command name="glMultiTexCoord3sv"/>
>+            <command name="glMultiTexCoord4d"/>
>+            <command name="glMultiTexCoord4dv"/>
>+            <command name="glMultiTexCoord4f"/>
>+            <command name="glMultiTexCoord4fv"/>
>+            <command name="glMultiTexCoord4i"/>
>+            <command name="glMultiTexCoord4iv"/>
>+            <command name="glMultiTexCoord4s"/>
>+            <command name="glMultiTexCoord4sv"/>
>+            <command name="glLoadTransposeMatrixf"/>
>+            <command name="glLoadTransposeMatrixd"/>
>+            <command name="glMultTransposeMatrixf"/>
>+            <command name="glMultTransposeMatrixd"/>
>+        </require>
>+    </feature>
>+    <feature api="gl" name="GL_VERSION_1_4" number="1.4">
>+        <require>
>+            <enum name="GL_BLEND_DST_RGB"/>
>+            <enum name="GL_BLEND_SRC_RGB"/>
>+            <enum name="GL_BLEND_DST_ALPHA"/>
>+            <enum name="GL_BLEND_SRC_ALPHA"/>
>+            <enum name="GL_POINT_FADE_THRESHOLD_SIZE"/>
>+            <enum name="GL_DEPTH_COMPONENT16"/>
>+            <enum name="GL_DEPTH_COMPONENT24"/>
>+            <enum name="GL_DEPTH_COMPONENT32"/>
>+            <enum name="GL_MIRRORED_REPEAT"/>
>+            <enum name="GL_MAX_TEXTURE_LOD_BIAS"/>
>+            <enum name="GL_TEXTURE_LOD_BIAS"/>
>+            <enum name="GL_INCR_WRAP"/>
>+            <enum name="GL_DECR_WRAP"/>
>+            <enum name="GL_TEXTURE_DEPTH_SIZE"/>
>+            <enum name="GL_TEXTURE_COMPARE_MODE"/>
>+            <enum name="GL_TEXTURE_COMPARE_FUNC"/>
>+            <enum name="GL_POINT_SIZE_MIN"/>
>+            <enum name="GL_POINT_SIZE_MAX"/>
>+            <enum name="GL_POINT_DISTANCE_ATTENUATION"/>
>+            <enum name="GL_GENERATE_MIPMAP"/>
>+            <enum name="GL_GENERATE_MIPMAP_HINT"/>
>+            <enum name="GL_FOG_COORDINATE_SOURCE"/>
>+            <enum name="GL_FOG_COORDINATE"/>
>+            <enum name="GL_FRAGMENT_DEPTH"/>
>+            <enum name="GL_CURRENT_FOG_COORDINATE"/>
>+            <enum name="GL_FOG_COORDINATE_ARRAY_TYPE"/>
>+            <enum name="GL_FOG_COORDINATE_ARRAY_STRIDE"/>
>+            <enum name="GL_FOG_COORDINATE_ARRAY_POINTER"/>
>+            <enum name="GL_FOG_COORDINATE_ARRAY"/>
>+            <enum name="GL_COLOR_SUM"/>
>+            <enum name="GL_CURRENT_SECONDARY_COLOR"/>
>+            <enum name="GL_SECONDARY_COLOR_ARRAY_SIZE"/>
>+            <enum name="GL_SECONDARY_COLOR_ARRAY_TYPE"/>
>+            <enum name="GL_SECONDARY_COLOR_ARRAY_STRIDE"/>
>+            <enum name="GL_SECONDARY_COLOR_ARRAY_POINTER"/>
>+            <enum name="GL_SECONDARY_COLOR_ARRAY"/>
>+            <enum name="GL_TEXTURE_FILTER_CONTROL"/>
>+            <enum name="GL_DEPTH_TEXTURE_MODE"/>
>+            <enum name="GL_COMPARE_R_TO_TEXTURE"/>
>+            <command name="glBlendFuncSeparate"/>
>+            <command name="glMultiDrawArrays"/>
>+            <command name="glMultiDrawElements"/>
>+            <command name="glPointParameterf"/>
>+            <command name="glPointParameterfv"/>
>+            <command name="glPointParameteri"/>
>+            <command name="glPointParameteriv"/>
>+            <command name="glFogCoordf"/>
>+            <command name="glFogCoordfv"/>
>+            <command name="glFogCoordd"/>
>+            <command name="glFogCoorddv"/>
>+            <command name="glFogCoordPointer"/>
>+            <command name="glSecondaryColor3b"/>
>+            <command name="glSecondaryColor3bv"/>
>+            <command name="glSecondaryColor3d"/>
>+            <command name="glSecondaryColor3dv"/>
>+            <command name="glSecondaryColor3f"/>
>+            <command name="glSecondaryColor3fv"/>
>+            <command name="glSecondaryColor3i"/>
>+            <command name="glSecondaryColor3iv"/>
>+            <command name="glSecondaryColor3s"/>
>+            <command name="glSecondaryColor3sv"/>
>+            <command name="glSecondaryColor3ub"/>
>+            <command name="glSecondaryColor3ubv"/>
>+            <command name="glSecondaryColor3ui"/>
>+            <command name="glSecondaryColor3uiv"/>
>+            <command name="glSecondaryColor3us"/>
>+            <command name="glSecondaryColor3usv"/>
>+            <command name="glSecondaryColorPointer"/>
>+            <command name="glWindowPos2d"/>
>+            <command name="glWindowPos2dv"/>
>+            <command name="glWindowPos2f"/>
>+            <command name="glWindowPos2fv"/>
>+            <command name="glWindowPos2i"/>
>+            <command name="glWindowPos2iv"/>
>+            <command name="glWindowPos2s"/>
>+            <command name="glWindowPos2sv"/>
>+            <command name="glWindowPos3d"/>
>+            <command name="glWindowPos3dv"/>
>+            <command name="glWindowPos3f"/>
>+            <command name="glWindowPos3fv"/>
>+            <command name="glWindowPos3i"/>
>+            <command name="glWindowPos3iv"/>
>+            <command name="glWindowPos3s"/>
>+            <command name="glWindowPos3sv"/>
>+        </require>
>+        <require comment="Promoted from ARB_imaging subset to core">
>+            <enum name="GL_BLEND_COLOR"/>
>+            <enum name="GL_BLEND_EQUATION"/>
>+            <enum name="GL_CONSTANT_COLOR"/>
>+            <enum name="GL_ONE_MINUS_CONSTANT_COLOR"/>
>+            <enum name="GL_CONSTANT_ALPHA"/>
>+            <enum name="GL_ONE_MINUS_CONSTANT_ALPHA"/>
>+            <enum name="GL_FUNC_ADD"/>
>+            <enum name="GL_FUNC_REVERSE_SUBTRACT"/>
>+            <enum name="GL_FUNC_SUBTRACT"/>
>+            <enum name="GL_MIN"/>
>+            <enum name="GL_MAX"/>
>+            <command name="glBlendColor"/>
>+            <command name="glBlendEquation"/>
>+        </require>
>+    </feature>
>+    <feature api="gl" name="GL_VERSION_1_5" number="1.5">
>+        <require>
>+            <enum name="GL_BUFFER_SIZE"/>
>+            <enum name="GL_BUFFER_USAGE"/>
>+            <enum name="GL_QUERY_COUNTER_BITS"/>
>+            <enum name="GL_CURRENT_QUERY"/>
>+            <enum name="GL_QUERY_RESULT"/>
>+            <enum name="GL_QUERY_RESULT_AVAILABLE"/>
>+            <enum name="GL_ARRAY_BUFFER"/>
>+            <enum name="GL_ELEMENT_ARRAY_BUFFER"/>
>+            <enum name="GL_ARRAY_BUFFER_BINDING"/>
>+            <enum name="GL_ELEMENT_ARRAY_BUFFER_BINDING"/>
>+            <enum name="GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING"/>
>+            <enum name="GL_READ_ONLY"/>
>+            <enum name="GL_WRITE_ONLY"/>
>+            <enum name="GL_READ_WRITE"/>
>+            <enum name="GL_BUFFER_ACCESS"/>
>+            <enum name="GL_BUFFER_MAPPED"/>
>+            <enum name="GL_BUFFER_MAP_POINTER"/>
>+            <enum name="GL_STREAM_DRAW"/>
>+            <enum name="GL_STREAM_READ"/>
>+            <enum name="GL_STREAM_COPY"/>
>+            <enum name="GL_STATIC_DRAW"/>
>+            <enum name="GL_STATIC_READ"/>
>+            <enum name="GL_STATIC_COPY"/>
>+            <enum name="GL_DYNAMIC_DRAW"/>
>+            <enum name="GL_DYNAMIC_READ"/>
>+            <enum name="GL_DYNAMIC_COPY"/>
>+            <enum name="GL_SAMPLES_PASSED"/>
>+            <enum name="GL_SRC1_ALPHA"/>
>+            <enum name="GL_VERTEX_ARRAY_BUFFER_BINDING"/>
>+            <enum name="GL_NORMAL_ARRAY_BUFFER_BINDING"/>
>+            <enum name="GL_COLOR_ARRAY_BUFFER_BINDING"/>
>+            <enum name="GL_INDEX_ARRAY_BUFFER_BINDING"/>
>+            <enum name="GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING"/>
>+            <enum name="GL_EDGE_FLAG_ARRAY_BUFFER_BINDING"/>
>+            <enum name="GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING"/>
>+            <enum name="GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING"/>
>+            <enum name="GL_WEIGHT_ARRAY_BUFFER_BINDING"/>
>+            <enum name="GL_FOG_COORD_SRC"/>
>+            <enum name="GL_FOG_COORD"/>
>+            <enum name="GL_CURRENT_FOG_COORD"/>
>+            <enum name="GL_FOG_COORD_ARRAY_TYPE"/>
>+            <enum name="GL_FOG_COORD_ARRAY_STRIDE"/>
>+            <enum name="GL_FOG_COORD_ARRAY_POINTER"/>
>+            <enum name="GL_FOG_COORD_ARRAY"/>
>+            <enum name="GL_FOG_COORD_ARRAY_BUFFER_BINDING"/>
>+            <enum name="GL_SRC0_RGB"/>
>+            <enum name="GL_SRC1_RGB"/>
>+            <enum name="GL_SRC2_RGB"/>
>+            <enum name="GL_SRC0_ALPHA"/>
>+            <enum name="GL_SRC2_ALPHA"/>
>+            <command name="glGenQueries"/>
>+            <command name="glDeleteQueries"/>
>+            <command name="glIsQuery"/>
>+            <command name="glBeginQuery"/>
>+            <command name="glEndQuery"/>
>+            <command name="glGetQueryiv"/>
>+            <command name="glGetQueryObjectiv"/>
>+            <command name="glGetQueryObjectuiv"/>
>+            <command name="glBindBuffer"/>
>+            <command name="glDeleteBuffers"/>
>+            <command name="glGenBuffers"/>
>+            <command name="glIsBuffer"/>
>+            <command name="glBufferData"/>
>+            <command name="glBufferSubData"/>
>+            <command name="glGetBufferSubData"/>
>+            <command name="glMapBuffer"/>
>+            <command name="glUnmapBuffer"/>
>+            <command name="glGetBufferParameteriv"/>
>+            <command name="glGetBufferPointerv"/>
>+        </require>
>+    </feature>
>+    <feature api="gl" name="GL_VERSION_2_0" number="2.0">
>+        <require>
>+            <enum name="GL_BLEND_EQUATION_RGB"/>
>+            <enum name="GL_VERTEX_ATTRIB_ARRAY_ENABLED"/>
>+            <enum name="GL_VERTEX_ATTRIB_ARRAY_SIZE"/>
>+            <enum name="GL_VERTEX_ATTRIB_ARRAY_STRIDE"/>
>+            <enum name="GL_VERTEX_ATTRIB_ARRAY_TYPE"/>
>+            <enum name="GL_CURRENT_VERTEX_ATTRIB"/>
>+            <enum name="GL_VERTEX_PROGRAM_POINT_SIZE"/>
>+            <enum name="GL_VERTEX_ATTRIB_ARRAY_POINTER"/>
>+            <enum name="GL_STENCIL_BACK_FUNC"/>
>+            <enum name="GL_STENCIL_BACK_FAIL"/>
>+            <enum name="GL_STENCIL_BACK_PASS_DEPTH_FAIL"/>
>+            <enum name="GL_STENCIL_BACK_PASS_DEPTH_PASS"/>
>+            <enum name="GL_MAX_DRAW_BUFFERS"/>
>+            <enum name="GL_DRAW_BUFFER0"/>
>+            <enum name="GL_DRAW_BUFFER1"/>
>+            <enum name="GL_DRAW_BUFFER2"/>
>+            <enum name="GL_DRAW_BUFFER3"/>
>+            <enum name="GL_DRAW_BUFFER4"/>
>+            <enum name="GL_DRAW_BUFFER5"/>
>+            <enum name="GL_DRAW_BUFFER6"/>
>+            <enum name="GL_DRAW_BUFFER7"/>
>+            <enum name="GL_DRAW_BUFFER8"/>
>+            <enum name="GL_DRAW_BUFFER9"/>
>+            <enum name="GL_DRAW_BUFFER10"/>
>+            <enum name="GL_DRAW_BUFFER11"/>
>+            <enum name="GL_DRAW_BUFFER12"/>
>+            <enum name="GL_DRAW_BUFFER13"/>
>+            <enum name="GL_DRAW_BUFFER14"/>
>+            <enum name="GL_DRAW_BUFFER15"/>
>+            <enum name="GL_BLEND_EQUATION_ALPHA"/>
>+            <enum name="GL_MAX_VERTEX_ATTRIBS"/>
>+            <enum name="GL_VERTEX_ATTRIB_ARRAY_NORMALIZED"/>
>+            <enum name="GL_MAX_TEXTURE_IMAGE_UNITS"/>
>+            <enum name="GL_FRAGMENT_SHADER"/>
>+            <enum name="GL_VERTEX_SHADER"/>
>+            <enum name="GL_MAX_FRAGMENT_UNIFORM_COMPONENTS"/>
>+            <enum name="GL_MAX_VERTEX_UNIFORM_COMPONENTS"/>
>+            <enum name="GL_MAX_VARYING_FLOATS"/>
>+            <enum name="GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS"/>
>+            <enum name="GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS"/>
>+            <enum name="GL_SHADER_TYPE"/>
>+            <enum name="GL_FLOAT_VEC2"/>
>+            <enum name="GL_FLOAT_VEC3"/>
>+            <enum name="GL_FLOAT_VEC4"/>
>+            <enum name="GL_INT_VEC2"/>
>+            <enum name="GL_INT_VEC3"/>
>+            <enum name="GL_INT_VEC4"/>
>+            <enum name="GL_BOOL"/>
>+            <enum name="GL_BOOL_VEC2"/>
>+            <enum name="GL_BOOL_VEC3"/>
>+            <enum name="GL_BOOL_VEC4"/>
>+            <enum name="GL_FLOAT_MAT2"/>
>+            <enum name="GL_FLOAT_MAT3"/>
>+            <enum name="GL_FLOAT_MAT4"/>
>+            <enum name="GL_SAMPLER_1D"/>
>+            <enum name="GL_SAMPLER_2D"/>
>+            <enum name="GL_SAMPLER_3D"/>
>+            <enum name="GL_SAMPLER_CUBE"/>
>+            <enum name="GL_SAMPLER_1D_SHADOW"/>
>+            <enum name="GL_SAMPLER_2D_SHADOW"/>
>+            <enum name="GL_DELETE_STATUS"/>
>+            <enum name="GL_COMPILE_STATUS"/>
>+            <enum name="GL_LINK_STATUS"/>
>+            <enum name="GL_VALIDATE_STATUS"/>
>+            <enum name="GL_INFO_LOG_LENGTH"/>
>+            <enum name="GL_ATTACHED_SHADERS"/>
>+            <enum name="GL_ACTIVE_UNIFORMS"/>
>+            <enum name="GL_ACTIVE_UNIFORM_MAX_LENGTH"/>
>+            <enum name="GL_SHADER_SOURCE_LENGTH"/>
>+            <enum name="GL_ACTIVE_ATTRIBUTES"/>
>+            <enum name="GL_ACTIVE_ATTRIBUTE_MAX_LENGTH"/>
>+            <enum name="GL_FRAGMENT_SHADER_DERIVATIVE_HINT"/>
>+            <enum name="GL_SHADING_LANGUAGE_VERSION"/>
>+            <enum name="GL_CURRENT_PROGRAM"/>
>+            <enum name="GL_POINT_SPRITE_COORD_ORIGIN"/>
>+            <enum name="GL_LOWER_LEFT"/>
>+            <enum name="GL_UPPER_LEFT"/>
>+            <enum name="GL_STENCIL_BACK_REF"/>
>+            <enum name="GL_STENCIL_BACK_VALUE_MASK"/>
>+            <enum name="GL_STENCIL_BACK_WRITEMASK"/>
>+            <enum name="GL_VERTEX_PROGRAM_TWO_SIDE"/>
>+            <enum name="GL_POINT_SPRITE"/>
>+            <enum name="GL_COORD_REPLACE"/>
>+            <enum name="GL_MAX_TEXTURE_COORDS"/>
>+            <command name="glBlendEquationSeparate"/>
>+            <command name="glDrawBuffers"/>
>+            <command name="glStencilOpSeparate"/>
>+            <command name="glStencilFuncSeparate"/>
>+            <command name="glStencilMaskSeparate"/>
>+            <command name="glAttachShader"/>
>+            <command name="glBindAttribLocation"/>
>+            <command name="glCompileShader"/>
>+            <command name="glCreateProgram"/>
>+            <command name="glCreateShader"/>
>+            <command name="glDeleteProgram"/>
>+            <command name="glDeleteShader"/>
>+            <command name="glDetachShader"/>
>+            <command name="glDisableVertexAttribArray"/>
>+            <command name="glEnableVertexAttribArray"/>
>+            <command name="glGetActiveAttrib"/>
>+            <command name="glGetActiveUniform"/>
>+            <command name="glGetAttachedShaders"/>
>+            <command name="glGetAttribLocation"/>
>+            <command name="glGetProgramiv"/>
>+            <command name="glGetProgramInfoLog"/>
>+            <command name="glGetShaderiv"/>
>+            <command name="glGetShaderInfoLog"/>
>+            <command name="glGetShaderSource"/>
>+            <command name="glGetUniformLocation"/>
>+            <command name="glGetUniformfv"/>
>+            <command name="glGetUniformiv"/>
>+            <command name="glGetVertexAttribdv"/>
>+            <command name="glGetVertexAttribfv"/>
>+            <command name="glGetVertexAttribiv"/>
>+            <command name="glGetVertexAttribPointerv"/>
>+            <command name="glIsProgram"/>
>+            <command name="glIsShader"/>
>+            <command name="glLinkProgram"/>
>+            <command name="glShaderSource"/>
>+            <command name="glUseProgram"/>
>+            <command name="glUniform1f"/>
>+            <command name="glUniform2f"/>
>+            <command name="glUniform3f"/>
>+            <command name="glUniform4f"/>
>+            <command name="glUniform1i"/>
>+            <command name="glUniform2i"/>
>+            <command name="glUniform3i"/>
>+            <command name="glUniform4i"/>
>+            <command name="glUniform1fv"/>
>+            <command name="glUniform2fv"/>
>+            <command name="glUniform3fv"/>
>+            <command name="glUniform4fv"/>
>+            <command name="glUniform1iv"/>
>+            <command name="glUniform2iv"/>
>+            <command name="glUniform3iv"/>
>+            <command name="glUniform4iv"/>
>+            <command name="glUniformMatrix2fv"/>
>+            <command name="glUniformMatrix3fv"/>
>+            <command name="glUniformMatrix4fv"/>
>+            <command name="glValidateProgram"/>
>+            <command name="glVertexAttrib1d"/>
>+            <command name="glVertexAttrib1dv"/>
>+            <command name="glVertexAttrib1f"/>
>+            <command name="glVertexAttrib1fv"/>
>+            <command name="glVertexAttrib1s"/>
>+            <command name="glVertexAttrib1sv"/>
>+            <command name="glVertexAttrib2d"/>
>+            <command name="glVertexAttrib2dv"/>
>+            <command name="glVertexAttrib2f"/>
>+            <command name="glVertexAttrib2fv"/>
>+            <command name="glVertexAttrib2s"/>
>+            <command name="glVertexAttrib2sv"/>
>+            <command name="glVertexAttrib3d"/>
>+            <command name="glVertexAttrib3dv"/>
>+            <command name="glVertexAttrib3f"/>
>+            <command name="glVertexAttrib3fv"/>
>+            <command name="glVertexAttrib3s"/>
>+            <command name="glVertexAttrib3sv"/>
>+            <command name="glVertexAttrib4Nbv"/>
>+            <command name="glVertexAttrib4Niv"/>
>+            <command name="glVertexAttrib4Nsv"/>
>+            <command name="glVertexAttrib4Nub"/>
>+            <command name="glVertexAttrib4Nubv"/>
>+            <command name="glVertexAttrib4Nuiv"/>
>+            <command name="glVertexAttrib4Nusv"/>
>+            <command name="glVertexAttrib4bv"/>
>+            <command name="glVertexAttrib4d"/>
>+            <command name="glVertexAttrib4dv"/>
>+            <command name="glVertexAttrib4f"/>
>+            <command name="glVertexAttrib4fv"/>
>+            <command name="glVertexAttrib4iv"/>
>+            <command name="glVertexAttrib4s"/>
>+            <command name="glVertexAttrib4sv"/>
>+            <command name="glVertexAttrib4ubv"/>
>+            <command name="glVertexAttrib4uiv"/>
>+            <command name="glVertexAttrib4usv"/>
>+            <command name="glVertexAttribPointer"/>
>+        </require>
>+    </feature>
>+    <feature api="gl" name="GL_VERSION_2_1" number="2.1">
>+        <require>
>+            <enum name="GL_PIXEL_PACK_BUFFER"/>
>+            <enum name="GL_PIXEL_UNPACK_BUFFER"/>
>+            <enum name="GL_PIXEL_PACK_BUFFER_BINDING"/>
>+            <enum name="GL_PIXEL_UNPACK_BUFFER_BINDING"/>
>+            <enum name="GL_FLOAT_MAT2x3"/>
>+            <enum name="GL_FLOAT_MAT2x4"/>
>+            <enum name="GL_FLOAT_MAT3x2"/>
>+            <enum name="GL_FLOAT_MAT3x4"/>
>+            <enum name="GL_FLOAT_MAT4x2"/>
>+            <enum name="GL_FLOAT_MAT4x3"/>
>+            <enum name="GL_SRGB"/>
>+            <enum name="GL_SRGB8"/>
>+            <enum name="GL_SRGB_ALPHA"/>
>+            <enum name="GL_SRGB8_ALPHA8"/>
>+            <enum name="GL_COMPRESSED_SRGB"/>
>+            <enum name="GL_COMPRESSED_SRGB_ALPHA"/>
>+            <enum name="GL_CURRENT_RASTER_SECONDARY_COLOR"/>
>+            <enum name="GL_SLUMINANCE_ALPHA"/>
>+            <enum name="GL_SLUMINANCE8_ALPHA8"/>
>+            <enum name="GL_SLUMINANCE"/>
>+            <enum name="GL_SLUMINANCE8"/>
>+            <enum name="GL_COMPRESSED_SLUMINANCE"/>
>+            <enum name="GL_COMPRESSED_SLUMINANCE_ALPHA"/>
>+            <command name="glUniformMatrix2x3fv"/>
>+            <command name="glUniformMatrix3x2fv"/>
>+            <command name="glUniformMatrix2x4fv"/>
>+            <command name="glUniformMatrix4x2fv"/>
>+            <command name="glUniformMatrix3x4fv"/>
>+            <command name="glUniformMatrix4x3fv"/>
>+        </require>
>+    </feature>
>+    <feature api="gl" name="GL_VERSION_3_0" number="3.0">
>+        <require>
>+            <enum name="GL_COMPARE_REF_TO_TEXTURE"/>
>+            <enum name="GL_CLIP_DISTANCE0"/>
>+            <enum name="GL_CLIP_DISTANCE1"/>
>+            <enum name="GL_CLIP_DISTANCE2"/>
>+            <enum name="GL_CLIP_DISTANCE3"/>
>+            <enum name="GL_CLIP_DISTANCE4"/>
>+            <enum name="GL_CLIP_DISTANCE5"/>
>+            <enum name="GL_CLIP_DISTANCE6"/>
>+            <enum name="GL_CLIP_DISTANCE7"/>
>+            <enum name="GL_MAX_CLIP_DISTANCES"/>
>+            <enum name="GL_MAJOR_VERSION"/>
>+            <enum name="GL_MINOR_VERSION"/>
>+            <enum name="GL_NUM_EXTENSIONS"/>
>+            <enum name="GL_CONTEXT_FLAGS"/>
>+            <enum name="GL_COMPRESSED_RED"/>
>+            <enum name="GL_COMPRESSED_RG"/>
>+            <enum name="GL_CONTEXT_FLAG_FORWARD_COMPATIBLE_BIT"/>
>+            <enum name="GL_RGBA32F"/>
>+            <enum name="GL_RGB32F"/>
>+            <enum name="GL_RGBA16F"/>
>+            <enum name="GL_RGB16F"/>
>+            <enum name="GL_VERTEX_ATTRIB_ARRAY_INTEGER"/>
>+            <enum name="GL_MAX_ARRAY_TEXTURE_LAYERS"/>
>+            <enum name="GL_MIN_PROGRAM_TEXEL_OFFSET"/>
>+            <enum name="GL_MAX_PROGRAM_TEXEL_OFFSET"/>
>+            <enum name="GL_CLAMP_READ_COLOR"/>
>+            <enum name="GL_FIXED_ONLY"/>
>+            <enum name="GL_MAX_VARYING_COMPONENTS"/>
>+            <enum name="GL_TEXTURE_1D_ARRAY"/>
>+            <enum name="GL_PROXY_TEXTURE_1D_ARRAY"/>
>+            <enum name="GL_TEXTURE_2D_ARRAY"/>
>+            <enum name="GL_PROXY_TEXTURE_2D_ARRAY"/>
>+            <enum name="GL_TEXTURE_BINDING_1D_ARRAY"/>
>+            <enum name="GL_TEXTURE_BINDING_2D_ARRAY"/>
>+            <enum name="GL_R11F_G11F_B10F"/>
>+            <enum name="GL_UNSIGNED_INT_10F_11F_11F_REV"/>
>+            <enum name="GL_RGB9_E5"/>
>+            <enum name="GL_UNSIGNED_INT_5_9_9_9_REV"/>
>+            <enum name="GL_TEXTURE_SHARED_SIZE"/>
>+            <enum name="GL_TRANSFORM_FEEDBACK_VARYING_MAX_LENGTH"/>
>+            <enum name="GL_TRANSFORM_FEEDBACK_BUFFER_MODE"/>
>+            <enum name="GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_COMPONENTS"/>
>+            <enum name="GL_TRANSFORM_FEEDBACK_VARYINGS"/>
>+            <enum name="GL_TRANSFORM_FEEDBACK_BUFFER_START"/>
>+            <enum name="GL_TRANSFORM_FEEDBACK_BUFFER_SIZE"/>
>+            <enum name="GL_PRIMITIVES_GENERATED"/>
>+            <enum name="GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN"/>
>+            <enum name="GL_RASTERIZER_DISCARD"/>
>+            <enum name="GL_MAX_TRANSFORM_FEEDBACK_INTERLEAVED_COMPONENTS"/>
>+            <enum name="GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_ATTRIBS"/>
>+            <enum name="GL_INTERLEAVED_ATTRIBS"/>
>+            <enum name="GL_SEPARATE_ATTRIBS"/>
>+            <enum name="GL_TRANSFORM_FEEDBACK_BUFFER"/>
>+            <enum name="GL_TRANSFORM_FEEDBACK_BUFFER_BINDING"/>
>+            <enum name="GL_RGBA32UI"/>
>+            <enum name="GL_RGB32UI"/>
>+            <enum name="GL_RGBA16UI"/>
>+            <enum name="GL_RGB16UI"/>
>+            <enum name="GL_RGBA8UI"/>
>+            <enum name="GL_RGB8UI"/>
>+            <enum name="GL_RGBA32I"/>
>+            <enum name="GL_RGB32I"/>
>+            <enum name="GL_RGBA16I"/>
>+            <enum name="GL_RGB16I"/>
>+            <enum name="GL_RGBA8I"/>
>+            <enum name="GL_RGB8I"/>
>+            <enum name="GL_RED_INTEGER"/>
>+            <enum name="GL_GREEN_INTEGER"/>
>+            <enum name="GL_BLUE_INTEGER"/>
>+            <enum name="GL_RGB_INTEGER"/>
>+            <enum name="GL_RGBA_INTEGER"/>
>+            <enum name="GL_BGR_INTEGER"/>
>+            <enum name="GL_BGRA_INTEGER"/>
>+            <enum name="GL_SAMPLER_1D_ARRAY"/>
>+            <enum name="GL_SAMPLER_2D_ARRAY"/>
>+            <enum name="GL_SAMPLER_1D_ARRAY_SHADOW"/>
>+            <enum name="GL_SAMPLER_2D_ARRAY_SHADOW"/>
>+            <enum name="GL_SAMPLER_CUBE_SHADOW"/>
>+            <enum name="GL_UNSIGNED_INT_VEC2"/>
>+            <enum name="GL_UNSIGNED_INT_VEC3"/>
>+            <enum name="GL_UNSIGNED_INT_VEC4"/>
>+            <enum name="GL_INT_SAMPLER_1D"/>
>+            <enum name="GL_INT_SAMPLER_2D"/>
>+            <enum name="GL_INT_SAMPLER_3D"/>
>+            <enum name="GL_INT_SAMPLER_CUBE"/>
>+            <enum name="GL_INT_SAMPLER_1D_ARRAY"/>
>+            <enum name="GL_INT_SAMPLER_2D_ARRAY"/>
>+            <enum name="GL_UNSIGNED_INT_SAMPLER_1D"/>
>+            <enum name="GL_UNSIGNED_INT_SAMPLER_2D"/>
>+            <enum name="GL_UNSIGNED_INT_SAMPLER_3D"/>
>+            <enum name="GL_UNSIGNED_INT_SAMPLER_CUBE"/>
>+            <enum name="GL_UNSIGNED_INT_SAMPLER_1D_ARRAY"/>
>+            <enum name="GL_UNSIGNED_INT_SAMPLER_2D_ARRAY"/>
>+            <enum name="GL_QUERY_WAIT"/>
>+            <enum name="GL_QUERY_NO_WAIT"/>
>+            <enum name="GL_QUERY_BY_REGION_WAIT"/>
>+            <enum name="GL_QUERY_BY_REGION_NO_WAIT"/>
>+            <enum name="GL_BUFFER_ACCESS_FLAGS"/>
>+            <enum name="GL_BUFFER_MAP_LENGTH"/>
>+            <enum name="GL_BUFFER_MAP_OFFSET"/>
>+            <command name="glColorMaski"/>
>+            <command name="glGetBooleani_v"/>
>+            <command name="glGetIntegeri_v"/>
>+            <command name="glEnablei"/>
>+            <command name="glDisablei"/>
>+            <command name="glIsEnabledi"/>
>+            <command name="glBeginTransformFeedback"/>
>+            <command name="glEndTransformFeedback"/>
>+            <command name="glBindBufferRange"/>
>+            <command name="glBindBufferBase"/>
>+            <command name="glTransformFeedbackVaryings"/>
>+            <command name="glGetTransformFeedbackVarying"/>
>+            <command name="glClampColor"/>
>+            <command name="glBeginConditionalRender"/>
>+            <command name="glEndConditionalRender"/>
>+            <command name="glVertexAttribIPointer"/>
>+            <command name="glGetVertexAttribIiv"/>
>+            <command name="glGetVertexAttribIuiv"/>
>+            <command name="glVertexAttribI1i"/>
>+            <command name="glVertexAttribI2i"/>
>+            <command name="glVertexAttribI3i"/>
>+            <command name="glVertexAttribI4i"/>
>+            <command name="glVertexAttribI1ui"/>
>+            <command name="glVertexAttribI2ui"/>
>+            <command name="glVertexAttribI3ui"/>
>+            <command name="glVertexAttribI4ui"/>
>+            <command name="glVertexAttribI1iv"/>
>+            <command name="glVertexAttribI2iv"/>
>+            <command name="glVertexAttribI3iv"/>
>+            <command name="glVertexAttribI4iv"/>
>+            <command name="glVertexAttribI1uiv"/>
>+            <command name="glVertexAttribI2uiv"/>
>+            <command name="glVertexAttribI3uiv"/>
>+            <command name="glVertexAttribI4uiv"/>
>+            <command name="glVertexAttribI4bv"/>
>+            <command name="glVertexAttribI4sv"/>
>+            <command name="glVertexAttribI4ubv"/>
>+            <command name="glVertexAttribI4usv"/>
>+            <command name="glGetUniformuiv"/>
>+            <command name="glBindFragDataLocation"/>
>+            <command name="glGetFragDataLocation"/>
>+            <command name="glUniform1ui"/>
>+            <command name="glUniform2ui"/>
>+            <command name="glUniform3ui"/>
>+            <command name="glUniform4ui"/>
>+            <command name="glUniform1uiv"/>
>+            <command name="glUniform2uiv"/>
>+            <command name="glUniform3uiv"/>
>+            <command name="glUniform4uiv"/>
>+            <command name="glTexParameterIiv"/>
>+            <command name="glTexParameterIuiv"/>
>+            <command name="glGetTexParameterIiv"/>
>+            <command name="glGetTexParameterIuiv"/>
>+            <command name="glClearBufferiv"/>
>+            <command name="glClearBufferuiv"/>
>+            <command name="glClearBufferfv"/>
>+            <command name="glClearBufferfi"/>
>+            <command name="glGetStringi"/>
>+        </require>
>+        <require comment="Reuse ARB_depth_buffer_float">
>+            <enum name="GL_DEPTH_COMPONENT32F"/>
>+            <enum name="GL_DEPTH32F_STENCIL8"/>
>+            <enum name="GL_FLOAT_32_UNSIGNED_INT_24_8_REV"/>
>+        </require>
>+        <require comment="Reuse ARB_framebuffer_object">
>+            <enum name="GL_INVALID_FRAMEBUFFER_OPERATION"/>
>+            <enum name="GL_FRAMEBUFFER_ATTACHMENT_COLOR_ENCODING"/>
>+            <enum name="GL_FRAMEBUFFER_ATTACHMENT_COMPONENT_TYPE"/>
>+            <enum name="GL_FRAMEBUFFER_ATTACHMENT_RED_SIZE"/>
>+            <enum name="GL_FRAMEBUFFER_ATTACHMENT_GREEN_SIZE"/>
>+            <enum name="GL_FRAMEBUFFER_ATTACHMENT_BLUE_SIZE"/>
>+            <enum name="GL_FRAMEBUFFER_ATTACHMENT_ALPHA_SIZE"/>
>+            <enum name="GL_FRAMEBUFFER_ATTACHMENT_DEPTH_SIZE"/>
>+            <enum name="GL_FRAMEBUFFER_ATTACHMENT_STENCIL_SIZE"/>
>+            <enum name="GL_FRAMEBUFFER_DEFAULT"/>
>+            <enum name="GL_FRAMEBUFFER_UNDEFINED"/>
>+            <enum name="GL_DEPTH_STENCIL_ATTACHMENT"/>
>+            <enum name="GL_MAX_RENDERBUFFER_SIZE"/>
>+            <enum name="GL_DEPTH_STENCIL"/>
>+            <enum name="GL_UNSIGNED_INT_24_8"/>
>+            <enum name="GL_DEPTH24_STENCIL8"/>
>+            <enum name="GL_TEXTURE_STENCIL_SIZE"/>
>+            <enum name="GL_TEXTURE_RED_TYPE"/>
>+            <enum name="GL_TEXTURE_GREEN_TYPE"/>
>+            <enum name="GL_TEXTURE_BLUE_TYPE"/>
>+            <enum name="GL_TEXTURE_ALPHA_TYPE"/>
>+            <enum name="GL_TEXTURE_DEPTH_TYPE"/>
>+            <enum name="GL_UNSIGNED_NORMALIZED"/>
>+            <enum name="GL_FRAMEBUFFER_BINDING"/>
>+            <enum name="GL_DRAW_FRAMEBUFFER_BINDING"/>
>+            <enum name="GL_RENDERBUFFER_BINDING"/>
>+            <enum name="GL_READ_FRAMEBUFFER"/>
>+            <enum name="GL_DRAW_FRAMEBUFFER"/>
>+            <enum name="GL_READ_FRAMEBUFFER_BINDING"/>
>+            <enum name="GL_RENDERBUFFER_SAMPLES"/>
>+            <enum name="GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE"/>
>+            <enum name="GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME"/>
>+            <enum name="GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL"/>
>+            <enum name="GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE"/>
>+            <enum name="GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER"/>
>+            <enum name="GL_FRAMEBUFFER_COMPLETE"/>
>+            <enum name="GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT"/>
>+            <enum name="GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT"/>
>+            <enum name="GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER"/>
>+            <enum name="GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER"/>
>+            <enum name="GL_FRAMEBUFFER_UNSUPPORTED"/>
>+            <enum name="GL_MAX_COLOR_ATTACHMENTS"/>
>+            <enum name="GL_COLOR_ATTACHMENT0"/>
>+            <enum name="GL_COLOR_ATTACHMENT1"/>
>+            <enum name="GL_COLOR_ATTACHMENT2"/>
>+            <enum name="GL_COLOR_ATTACHMENT3"/>
>+            <enum name="GL_COLOR_ATTACHMENT4"/>
>+            <enum name="GL_COLOR_ATTACHMENT5"/>
>+            <enum name="GL_COLOR_ATTACHMENT6"/>
>+            <enum name="GL_COLOR_ATTACHMENT7"/>
>+            <enum name="GL_COLOR_ATTACHMENT8"/>
>+            <enum name="GL_COLOR_ATTACHMENT9"/>
>+            <enum name="GL_COLOR_ATTACHMENT10"/>
>+            <enum name="GL_COLOR_ATTACHMENT11"/>
>+            <enum name="GL_COLOR_ATTACHMENT12"/>
>+            <enum name="GL_COLOR_ATTACHMENT13"/>
>+            <enum name="GL_COLOR_ATTACHMENT14"/>
>+            <enum name="GL_COLOR_ATTACHMENT15"/>
>+            <enum name="GL_COLOR_ATTACHMENT16"/>
>+            <enum name="GL_COLOR_ATTACHMENT17"/>
>+            <enum name="GL_COLOR_ATTACHMENT18"/>
>+            <enum name="GL_COLOR_ATTACHMENT19"/>
>+            <enum name="GL_COLOR_ATTACHMENT20"/>
>+            <enum name="GL_COLOR_ATTACHMENT21"/>
>+            <enum name="GL_COLOR_ATTACHMENT22"/>
>+            <enum name="GL_COLOR_ATTACHMENT23"/>
>+            <enum name="GL_COLOR_ATTACHMENT24"/>
>+            <enum name="GL_COLOR_ATTACHMENT25"/>
>+            <enum name="GL_COLOR_ATTACHMENT26"/>
>+            <enum name="GL_COLOR_ATTACHMENT27"/>
>+            <enum name="GL_COLOR_ATTACHMENT28"/>
>+            <enum name="GL_COLOR_ATTACHMENT29"/>
>+            <enum name="GL_COLOR_ATTACHMENT30"/>
>+            <enum name="GL_COLOR_ATTACHMENT31"/>
>+            <enum name="GL_DEPTH_ATTACHMENT"/>
>+            <enum name="GL_STENCIL_ATTACHMENT"/>
>+            <enum name="GL_FRAMEBUFFER"/>
>+            <enum name="GL_RENDERBUFFER"/>
>+            <enum name="GL_RENDERBUFFER_WIDTH"/>
>+            <enum name="GL_RENDERBUFFER_HEIGHT"/>
>+            <enum name="GL_RENDERBUFFER_INTERNAL_FORMAT"/>
>+            <enum name="GL_STENCIL_INDEX1"/>
>+            <enum name="GL_STENCIL_INDEX4"/>
>+            <enum name="GL_STENCIL_INDEX8"/>
>+            <enum name="GL_STENCIL_INDEX16"/>
>+            <enum name="GL_RENDERBUFFER_RED_SIZE"/>
>+            <enum name="GL_RENDERBUFFER_GREEN_SIZE"/>
>+            <enum name="GL_RENDERBUFFER_BLUE_SIZE"/>
>+            <enum name="GL_RENDERBUFFER_ALPHA_SIZE"/>
>+            <enum name="GL_RENDERBUFFER_DEPTH_SIZE"/>
>+            <enum name="GL_RENDERBUFFER_STENCIL_SIZE"/>
>+            <enum name="GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE"/>
>+            <enum name="GL_MAX_SAMPLES"/>
>+            <command name="glIsRenderbuffer"/>
>+            <command name="glBindRenderbuffer"/>
>+            <command name="glDeleteRenderbuffers"/>
>+            <command name="glGenRenderbuffers"/>
>+            <command name="glRenderbufferStorage"/>
>+            <command name="glGetRenderbufferParameteriv"/>
>+            <command name="glIsFramebuffer"/>
>+            <command name="glBindFramebuffer"/>
>+            <command name="glDeleteFramebuffers"/>
>+            <command name="glGenFramebuffers"/>
>+            <command name="glCheckFramebufferStatus"/>
>+            <command name="glFramebufferTexture1D"/>
>+            <command name="glFramebufferTexture2D"/>
>+            <command name="glFramebufferTexture3D"/>
>+            <command name="glFramebufferRenderbuffer"/>
>+            <command name="glGetFramebufferAttachmentParameteriv"/>
>+            <command name="glGenerateMipmap"/>
>+            <command name="glBlitFramebuffer"/>
>+            <command name="glRenderbufferStorageMultisample"/>
>+            <command name="glFramebufferTextureLayer"/>
>+        </require>
>+        <require profile="compatibility" comment="Reuse ARB_framebuffer_object compatibility profile">
>+            <enum name="GL_INDEX"/>
>+            <enum name="GL_TEXTURE_LUMINANCE_TYPE"/>
>+            <enum name="GL_TEXTURE_INTENSITY_TYPE"/>
>+        </require>
>+        <require comment="Reuse ARB_framebuffer_sRGB">
>+            <enum name="GL_FRAMEBUFFER_SRGB"/>
>+        </require>
>+        <require comment="Reuse ARB_half_float_vertex">
>+            <type name="GLhalf"/>
>+            <enum name="GL_HALF_FLOAT"/>
>+        </require>
>+        <require comment="Reuse ARB_map_buffer_range">
>+            <enum name="GL_MAP_READ_BIT"/>
>+            <enum name="GL_MAP_WRITE_BIT"/>
>+            <enum name="GL_MAP_INVALIDATE_RANGE_BIT"/>
>+            <enum name="GL_MAP_INVALIDATE_BUFFER_BIT"/>
>+            <enum name="GL_MAP_FLUSH_EXPLICIT_BIT"/>
>+            <enum name="GL_MAP_UNSYNCHRONIZED_BIT"/>
>+            <command name="glMapBufferRange"/>
>+            <command name="glFlushMappedBufferRange"/>
>+        </require>
>+        <require comment="Reuse ARB_texture_compression_rgtc">
>+            <enum name="GL_COMPRESSED_RED_RGTC1"/>
>+            <enum name="GL_COMPRESSED_SIGNED_RED_RGTC1"/>
>+            <enum name="GL_COMPRESSED_RG_RGTC2"/>
>+            <enum name="GL_COMPRESSED_SIGNED_RG_RGTC2"/>
>+        </require>
>+        <require comment="Reuse ARB_texture_rg">
>+            <enum name="GL_RG"/>
>+            <enum name="GL_RG_INTEGER"/>
>+            <enum name="GL_R8"/>
>+            <enum name="GL_R16"/>
>+            <enum name="GL_RG8"/>
>+            <enum name="GL_RG16"/>
>+            <enum name="GL_R16F"/>
>+            <enum name="GL_R32F"/>
>+            <enum name="GL_RG16F"/>
>+            <enum name="GL_RG32F"/>
>+            <enum name="GL_R8I"/>
>+            <enum name="GL_R8UI"/>
>+            <enum name="GL_R16I"/>
>+            <enum name="GL_R16UI"/>
>+            <enum name="GL_R32I"/>
>+            <enum name="GL_R32UI"/>
>+            <enum name="GL_RG8I"/>
>+            <enum name="GL_RG8UI"/>
>+            <enum name="GL_RG16I"/>
>+            <enum name="GL_RG16UI"/>
>+            <enum name="GL_RG32I"/>
>+            <enum name="GL_RG32UI"/>
>+        </require>
>+        <require comment="Reuse ARB_vertex_array_object">
>+            <enum name="GL_VERTEX_ARRAY_BINDING"/>
>+            <enum name="GL_CLAMP_VERTEX_COLOR"/>
>+            <enum name="GL_CLAMP_FRAGMENT_COLOR"/>
>+            <enum name="GL_ALPHA_INTEGER"/>
>+            <command name="glBindVertexArray"/>
>+            <command name="glDeleteVertexArrays"/>
>+            <command name="glGenVertexArrays"/>
>+            <command name="glIsVertexArray"/>
>+        </require>
>+    </feature>
>+    <feature api="gl" name="GL_VERSION_3_1" number="3.1">
>+        <require>
>+            <enum name="GL_SAMPLER_2D_RECT"/>
>+            <enum name="GL_SAMPLER_2D_RECT_SHADOW"/>
>+            <enum name="GL_SAMPLER_BUFFER"/>
>+            <enum name="GL_INT_SAMPLER_2D_RECT"/>
>+            <enum name="GL_INT_SAMPLER_BUFFER"/>
>+            <enum name="GL_UNSIGNED_INT_SAMPLER_2D_RECT"/>
>+            <enum name="GL_UNSIGNED_INT_SAMPLER_BUFFER"/>
>+            <enum name="GL_TEXTURE_BUFFER"/>
>+            <enum name="GL_MAX_TEXTURE_BUFFER_SIZE"/>
>+            <enum name="GL_TEXTURE_BINDING_BUFFER"/>
>+            <enum name="GL_TEXTURE_BUFFER_DATA_STORE_BINDING"/>
>+            <enum name="GL_TEXTURE_RECTANGLE"/>
>+            <enum name="GL_TEXTURE_BINDING_RECTANGLE"/>
>+            <enum name="GL_PROXY_TEXTURE_RECTANGLE"/>
>+            <enum name="GL_MAX_RECTANGLE_TEXTURE_SIZE"/>
>+            <enum name="GL_R8_SNORM"/>
>+            <enum name="GL_RG8_SNORM"/>
>+            <enum name="GL_RGB8_SNORM"/>
>+            <enum name="GL_RGBA8_SNORM"/>
>+            <enum name="GL_R16_SNORM"/>
>+            <enum name="GL_RG16_SNORM"/>
>+            <enum name="GL_RGB16_SNORM"/>
>+            <enum name="GL_RGBA16_SNORM"/>
>+            <enum name="GL_SIGNED_NORMALIZED"/>
>+            <enum name="GL_PRIMITIVE_RESTART"/>
>+            <enum name="GL_PRIMITIVE_RESTART_INDEX"/>
>+            <command name="glDrawArraysInstanced"/>
>+            <command name="glDrawElementsInstanced"/>
>+            <command name="glTexBuffer"/>
>+            <command name="glPrimitiveRestartIndex"/>
>+        </require>
>+        <require comment="Reuse ARB_copy_buffer">
>+            <enum name="GL_COPY_READ_BUFFER"/>
>+            <enum name="GL_COPY_WRITE_BUFFER"/>
>+            <command name="glCopyBufferSubData"/>
>+        </require>
>+        <require comment="Reuse ARB_uniform_buffer_object">
>+            <enum name="GL_UNIFORM_BUFFER"/>
>+            <enum name="GL_UNIFORM_BUFFER_BINDING"/>
>+            <enum name="GL_UNIFORM_BUFFER_START"/>
>+            <enum name="GL_UNIFORM_BUFFER_SIZE"/>
>+            <enum name="GL_MAX_VERTEX_UNIFORM_BLOCKS"/>
>+            <enum name="GL_MAX_GEOMETRY_UNIFORM_BLOCKS"/>
>+            <enum name="GL_MAX_FRAGMENT_UNIFORM_BLOCKS"/>
>+            <enum name="GL_MAX_COMBINED_UNIFORM_BLOCKS"/>
>+            <enum name="GL_MAX_UNIFORM_BUFFER_BINDINGS"/>
>+            <enum name="GL_MAX_UNIFORM_BLOCK_SIZE"/>
>+            <enum name="GL_MAX_COMBINED_VERTEX_UNIFORM_COMPONENTS"/>
>+            <enum name="GL_MAX_COMBINED_GEOMETRY_UNIFORM_COMPONENTS"/>
>+            <enum name="GL_MAX_COMBINED_FRAGMENT_UNIFORM_COMPONENTS"/>
>+            <enum name="GL_UNIFORM_BUFFER_OFFSET_ALIGNMENT"/>
>+            <enum name="GL_ACTIVE_UNIFORM_BLOCK_MAX_NAME_LENGTH"/>
>+            <enum name="GL_ACTIVE_UNIFORM_BLOCKS"/>
>+            <enum name="GL_UNIFORM_TYPE"/>
>+            <enum name="GL_UNIFORM_SIZE"/>
>+            <enum name="GL_UNIFORM_NAME_LENGTH"/>
>+            <enum name="GL_UNIFORM_BLOCK_INDEX"/>
>+            <enum name="GL_UNIFORM_OFFSET"/>
>+            <enum name="GL_UNIFORM_ARRAY_STRIDE"/>
>+            <enum name="GL_UNIFORM_MATRIX_STRIDE"/>
>+            <enum name="GL_UNIFORM_IS_ROW_MAJOR"/>
>+            <enum name="GL_UNIFORM_BLOCK_BINDING"/>
>+            <enum name="GL_UNIFORM_BLOCK_DATA_SIZE"/>
>+            <enum name="GL_UNIFORM_BLOCK_NAME_LENGTH"/>
>+            <enum name="GL_UNIFORM_BLOCK_ACTIVE_UNIFORMS"/>
>+            <enum name="GL_UNIFORM_BLOCK_ACTIVE_UNIFORM_INDICES"/>
>+            <enum name="GL_UNIFORM_BLOCK_REFERENCED_BY_VERTEX_SHADER"/>
>+            <enum name="GL_UNIFORM_BLOCK_REFERENCED_BY_GEOMETRY_SHADER"/>
>+            <enum name="GL_UNIFORM_BLOCK_REFERENCED_BY_FRAGMENT_SHADER"/>
>+            <enum name="GL_INVALID_INDEX"/>
>+            <command name="glGetUniformIndices"/>
>+            <command name="glGetActiveUniformsiv"/>
>+            <command name="glGetActiveUniformName"/>
>+            <command name="glGetUniformBlockIndex"/>
>+            <command name="glGetActiveUniformBlockiv"/>
>+            <command name="glGetActiveUniformBlockName"/>
>+            <command name="glUniformBlockBinding"/>
>+            <command name="glBindBufferRange"/>
>+            <command name="glBindBufferBase"/>
>+            <command name="glGetIntegeri_v"/>
>+        </require>
>+    </feature>
>+    <feature api="gl" name="GL_VERSION_3_2" number="3.2">
>+        <require>
>+            <enum name="GL_CONTEXT_CORE_PROFILE_BIT"/>
>+            <enum name="GL_CONTEXT_COMPATIBILITY_PROFILE_BIT"/>
>+            <enum name="GL_LINES_ADJACENCY"/>
>+            <enum name="GL_LINE_STRIP_ADJACENCY"/>
>+            <enum name="GL_TRIANGLES_ADJACENCY"/>
>+            <enum name="GL_TRIANGLE_STRIP_ADJACENCY"/>
>+            <enum name="GL_PROGRAM_POINT_SIZE"/>
>+            <enum name="GL_MAX_GEOMETRY_TEXTURE_IMAGE_UNITS"/>
>+            <enum name="GL_FRAMEBUFFER_ATTACHMENT_LAYERED"/>
>+            <enum name="GL_FRAMEBUFFER_INCOMPLETE_LAYER_TARGETS"/>
>+            <enum name="GL_GEOMETRY_SHADER"/>
>+            <enum name="GL_GEOMETRY_VERTICES_OUT"/>
>+            <enum name="GL_GEOMETRY_INPUT_TYPE"/>
>+            <enum name="GL_GEOMETRY_OUTPUT_TYPE"/>
>+            <enum name="GL_MAX_GEOMETRY_UNIFORM_COMPONENTS"/>
>+            <enum name="GL_MAX_GEOMETRY_OUTPUT_VERTICES"/>
>+            <enum name="GL_MAX_GEOMETRY_TOTAL_OUTPUT_COMPONENTS"/>
>+            <enum name="GL_MAX_VERTEX_OUTPUT_COMPONENTS"/>
>+            <enum name="GL_MAX_GEOMETRY_INPUT_COMPONENTS"/>
>+            <enum name="GL_MAX_GEOMETRY_OUTPUT_COMPONENTS"/>
>+            <enum name="GL_MAX_FRAGMENT_INPUT_COMPONENTS"/>
>+            <enum name="GL_CONTEXT_PROFILE_MASK"/>
>+        </require>
>+        <require comment="Reuse ARB_depth_clamp">
>+            <enum name="GL_DEPTH_CLAMP"/>
>+        </require>
>+        <require comment="Reuse ARB_draw_elements_base_vertex">
>+            <command name="glDrawElementsBaseVertex"/>
>+            <command name="glDrawRangeElementsBaseVertex"/>
>+            <command name="glDrawElementsInstancedBaseVertex"/>
>+            <command name="glMultiDrawElementsBaseVertex"/>
>+        </require>
>+        <require comment="Reuse ARB_fragment_coord_conventions (none)">
>+        </require>
>+        <require comment="Reuse ARB_provoking_vertex">
>+            <enum name="GL_QUADS_FOLLOW_PROVOKING_VERTEX_CONVENTION"/>
>+            <enum name="GL_FIRST_VERTEX_CONVENTION"/>
>+            <enum name="GL_LAST_VERTEX_CONVENTION"/>
>+            <enum name="GL_PROVOKING_VERTEX"/>
>+            <command name="glProvokingVertex"/>
>+        </require>
>+        <require comment="Reuse ARB_seamless_cube_map">
>+            <enum name="GL_TEXTURE_CUBE_MAP_SEAMLESS"/>
>+        </require>
>+        <require comment="Reuse ARB_sync">
>+            <enum name="GL_MAX_SERVER_WAIT_TIMEOUT"/>
>+            <enum name="GL_OBJECT_TYPE"/>
>+            <enum name="GL_SYNC_CONDITION"/>
>+            <enum name="GL_SYNC_STATUS"/>
>+            <enum name="GL_SYNC_FLAGS"/>
>+            <enum name="GL_SYNC_FENCE"/>
>+            <enum name="GL_SYNC_GPU_COMMANDS_COMPLETE"/>
>+            <enum name="GL_UNSIGNALED"/>
>+            <enum name="GL_SIGNALED"/>
>+            <enum name="GL_ALREADY_SIGNALED"/>
>+            <enum name="GL_TIMEOUT_EXPIRED"/>
>+            <enum name="GL_CONDITION_SATISFIED"/>
>+            <enum name="GL_WAIT_FAILED"/>
>+            <enum name="GL_TIMEOUT_IGNORED"/>
>+            <enum name="GL_SYNC_FLUSH_COMMANDS_BIT"/>
>+            <command name="glFenceSync"/>
>+            <command name="glIsSync"/>
>+            <command name="glDeleteSync"/>
>+            <command name="glClientWaitSync"/>
>+            <command name="glWaitSync"/>
>+            <command name="glGetInteger64v"/>
>+            <command name="glGetSynciv"/>
>+        </require>
>+        <require comment="Reuse ARB_texture_multisample">
>+            <enum name="GL_SAMPLE_POSITION"/>
>+            <enum name="GL_SAMPLE_MASK"/>
>+            <enum name="GL_SAMPLE_MASK_VALUE"/>
>+            <enum name="GL_MAX_SAMPLE_MASK_WORDS"/>
>+            <enum name="GL_TEXTURE_2D_MULTISAMPLE"/>
>+            <enum name="GL_PROXY_TEXTURE_2D_MULTISAMPLE"/>
>+            <enum name="GL_TEXTURE_2D_MULTISAMPLE_ARRAY"/>
>+            <enum name="GL_PROXY_TEXTURE_2D_MULTISAMPLE_ARRAY"/>
>+            <enum name="GL_TEXTURE_BINDING_2D_MULTISAMPLE"/>
>+            <enum name="GL_TEXTURE_BINDING_2D_MULTISAMPLE_ARRAY"/>
>+            <enum name="GL_TEXTURE_SAMPLES"/>
>+            <enum name="GL_TEXTURE_FIXED_SAMPLE_LOCATIONS"/>
>+            <enum name="GL_SAMPLER_2D_MULTISAMPLE"/>
>+            <enum name="GL_INT_SAMPLER_2D_MULTISAMPLE"/>
>+            <enum name="GL_UNSIGNED_INT_SAMPLER_2D_MULTISAMPLE"/>
>+            <enum name="GL_SAMPLER_2D_MULTISAMPLE_ARRAY"/>
>+            <enum name="GL_INT_SAMPLER_2D_MULTISAMPLE_ARRAY"/>
>+            <enum name="GL_UNSIGNED_INT_SAMPLER_2D_MULTISAMPLE_ARRAY"/>
>+            <enum name="GL_MAX_COLOR_TEXTURE_SAMPLES"/>
>+            <enum name="GL_MAX_DEPTH_TEXTURE_SAMPLES"/>
>+            <enum name="GL_MAX_INTEGER_SAMPLES"/>
>+            
>+            <command name="glGetInteger64i_v"/>
>+            <command name="glGetBufferParameteri64v"/>
>+            <command name="glFramebufferTexture"/>
>+            <command name="glTexImage2DMultisample"/>
>+            <command name="glTexImage3DMultisample"/>
>+            <command name="glGetMultisamplefv"/>
>+            <command name="glSampleMaski"/>
>+        </require>
>+        
>+        <remove profile="core" comment="Compatibility-only GL 1.0 features removed from GL 3.2">
>+            <command name="glNewList"/>
>+            <command name="glEndList"/>
>+            <command name="glCallList"/>
>+            <command name="glCallLists"/>
>+            <command name="glDeleteLists"/>
>+            <command name="glGenLists"/>
>+            <command name="glListBase"/>
>+            <command name="glBegin"/>
>+            <command name="glBitmap"/>
>+            <command name="glColor3b"/>
>+            <command name="glColor3bv"/>
>+            <command name="glColor3d"/>
>+            <command name="glColor3dv"/>
>+            <command name="glColor3f"/>
>+            <command name="glColor3fv"/>
>+            <command name="glColor3i"/>
>+            <command name="glColor3iv"/>
>+            <command name="glColor3s"/>
>+            <command name="glColor3sv"/>
>+            <command name="glColor3ub"/>
>+            <command name="glColor3ubv"/>
>+            <command name="glColor3ui"/>
>+            <command name="glColor3uiv"/>
>+            <command name="glColor3us"/>
>+            <command name="glColor3usv"/>
>+            <command name="glColor4b"/>
>+            <command name="glColor4bv"/>
>+            <command name="glColor4d"/>
>+            <command name="glColor4dv"/>
>+            <command name="glColor4f"/>
>+            <command name="glColor4fv"/>
>+            <command name="glColor4i"/>
>+            <command name="glColor4iv"/>
>+            <command name="glColor4s"/>
>+            <command name="glColor4sv"/>
>+            <command name="glColor4ub"/>
>+            <command name="glColor4ubv"/>
>+            <command name="glColor4ui"/>
>+            <command name="glColor4uiv"/>
>+            <command name="glColor4us"/>
>+            <command name="glColor4usv"/>
>+            <command name="glEdgeFlag"/>
>+            <command name="glEdgeFlagv"/>
>+            <command name="glEnd"/>
>+            <command name="glIndexd"/>
>+            <command name="glIndexdv"/>
>+            <command name="glIndexf"/>
>+            <command name="glIndexfv"/>
>+            <command name="glIndexi"/>
>+            <command name="glIndexiv"/>
>+            <command name="glIndexs"/>
>+            <command name="glIndexsv"/>
>+            <command name="glNormal3b"/>
>+            <command name="glNormal3bv"/>
>+            <command name="glNormal3d"/>
>+            <command name="glNormal3dv"/>
>+            <command name="glNormal3f"/>
>+            <command name="glNormal3fv"/>
>+            <command name="glNormal3i"/>
>+            <command name="glNormal3iv"/>
>+            <command name="glNormal3s"/>
>+            <command name="glNormal3sv"/>
>+            <command name="glRasterPos2d"/>
>+            <command name="glRasterPos2dv"/>
>+            <command name="glRasterPos2f"/>
>+            <command name="glRasterPos2fv"/>
>+            <command name="glRasterPos2i"/>
>+            <command name="glRasterPos2iv"/>
>+            <command name="glRasterPos2s"/>
>+            <command name="glRasterPos2sv"/>
>+            <command name="glRasterPos3d"/>
>+            <command name="glRasterPos3dv"/>
>+            <command name="glRasterPos3f"/>
>+            <command name="glRasterPos3fv"/>
>+            <command name="glRasterPos3i"/>
>+            <command name="glRasterPos3iv"/>
>+            <command name="glRasterPos3s"/>
>+            <command name="glRasterPos3sv"/>
>+            <command name="glRasterPos4d"/>
>+            <command name="glRasterPos4dv"/>
>+            <command name="glRasterPos4f"/>
>+            <command name="glRasterPos4fv"/>
>+            <command name="glRasterPos4i"/>
>+            <command name="glRasterPos4iv"/>
>+            <command name="glRasterPos4s"/>
>+            <command name="glRasterPos4sv"/>
>+            <command name="glRectd"/>
>+            <command name="glRectdv"/>
>+            <command name="glRectf"/>
>+            <command name="glRectfv"/>
>+            <command name="glRecti"/>
>+            <command name="glRectiv"/>
>+            <command name="glRects"/>
>+            <command name="glRectsv"/>
>+            <command name="glTexCoord1d"/>
>+            <command name="glTexCoord1dv"/>
>+            <command name="glTexCoord1f"/>
>+            <command name="glTexCoord1fv"/>
>+            <command name="glTexCoord1i"/>
>+            <command name="glTexCoord1iv"/>
>+            <command name="glTexCoord1s"/>
>+            <command name="glTexCoord1sv"/>
>+            <command name="glTexCoord2d"/>
>+            <command name="glTexCoord2dv"/>
>+            <command name="glTexCoord2f"/>
>+            <command name="glTexCoord2fv"/>
>+            <command name="glTexCoord2i"/>
>+            <command name="glTexCoord2iv"/>
>+            <command name="glTexCoord2s"/>
>+            <command name="glTexCoord2sv"/>
>+            <command name="glTexCoord3d"/>
>+            <command name="glTexCoord3dv"/>
>+            <command name="glTexCoord3f"/>
>+            <command name="glTexCoord3fv"/>
>+            <command name="glTexCoord3i"/>
>+            <command name="glTexCoord3iv"/>
>+            <command name="glTexCoord3s"/>
>+            <command name="glTexCoord3sv"/>
>+            <command name="glTexCoord4d"/>
>+            <command name="glTexCoord4dv"/>
>+            <command name="glTexCoord4f"/>
>+            <command name="glTexCoord4fv"/>
>+            <command name="glTexCoord4i"/>
>+            <command name="glTexCoord4iv"/>
>+            <command name="glTexCoord4s"/>
>+            <command name="glTexCoord4sv"/>
>+            <command name="glVertex2d"/>
>+            <command name="glVertex2dv"/>
>+            <command name="glVertex2f"/>
>+            <command name="glVertex2fv"/>
>+            <command name="glVertex2i"/>
>+            <command name="glVertex2iv"/>
>+            <command name="glVertex2s"/>
>+            <command name="glVertex2sv"/>
>+            <command name="glVertex3d"/>
>+            <command name="glVertex3dv"/>
>+            <command name="glVertex3f"/>
>+            <command name="glVertex3fv"/>
>+            <command name="glVertex3i"/>
>+            <command name="glVertex3iv"/>
>+            <command name="glVertex3s"/>
>+            <command name="glVertex3sv"/>
>+            <command name="glVertex4d"/>
>+            <command name="glVertex4dv"/>
>+            <command name="glVertex4f"/>
>+            <command name="glVertex4fv"/>
>+            <command name="glVertex4i"/>
>+            <command name="glVertex4iv"/>
>+            <command name="glVertex4s"/>
>+            <command name="glVertex4sv"/>
>+            <command name="glClipPlane"/>
>+            <command name="glColorMaterial"/>
>+            <command name="glFogf"/>
>+            <command name="glFogfv"/>
>+            <command name="glFogi"/>
>+            <command name="glFogiv"/>
>+            <command name="glLightf"/>
>+            <command name="glLightfv"/>
>+            <command name="glLighti"/>
>+            <command name="glLightiv"/>
>+            <command name="glLightModelf"/>
>+            <command name="glLightModelfv"/>
>+            <command name="glLightModeli"/>
>+            <command name="glLightModeliv"/>
>+            <command name="glLineStipple"/>
>+            <command name="glMaterialf"/>
>+            <command name="glMaterialfv"/>
>+            <command name="glMateriali"/>
>+            <command name="glMaterialiv"/>
>+            <command name="glPolygonStipple"/>
>+            <command name="glShadeModel"/>
>+            <command name="glTexEnvf"/>
>+            <command name="glTexEnvfv"/>
>+            <command name="glTexEnvi"/>
>+            <command name="glTexEnviv"/>
>+            <command name="glTexGend"/>
>+            <command name="glTexGendv"/>
>+            <command name="glTexGenf"/>
>+            <command name="glTexGenfv"/>
>+            <command name="glTexGeni"/>
>+            <command name="glTexGeniv"/>
>+            <command name="glFeedbackBuffer"/>
>+            <command name="glSelectBuffer"/>
>+            <command name="glRenderMode"/>
>+            <command name="glInitNames"/>
>+            <command name="glLoadName"/>
>+            <command name="glPassThrough"/>
>+            <command name="glPopName"/>
>+            <command name="glPushName"/>
>+            <command name="glClearAccum"/>
>+            <command name="glClearIndex"/>
>+            <command name="glIndexMask"/>
>+            <command name="glAccum"/>
>+            <command name="glPopAttrib"/>
>+            <command name="glPushAttrib"/>
>+            <command name="glMap1d"/>
>+            <command name="glMap1f"/>
>+            <command name="glMap2d"/>
>+            <command name="glMap2f"/>
>+            <command name="glMapGrid1d"/>
>+            <command name="glMapGrid1f"/>
>+            <command name="glMapGrid2d"/>
>+            <command name="glMapGrid2f"/>
>+            <command name="glEvalCoord1d"/>
>+            <command name="glEvalCoord1dv"/>
>+            <command name="glEvalCoord1f"/>
>+            <command name="glEvalCoord1fv"/>
>+            <command name="glEvalCoord2d"/>
>+            <command name="glEvalCoord2dv"/>
>+            <command name="glEvalCoord2f"/>
>+            <command name="glEvalCoord2fv"/>
>+            <command name="glEvalMesh1"/>
>+            <command name="glEvalPoint1"/>
>+            <command name="glEvalMesh2"/>
>+            <command name="glEvalPoint2"/>
>+            <command name="glAlphaFunc"/>
>+            <command name="glPixelZoom"/>
>+            <command name="glPixelTransferf"/>
>+            <command name="glPixelTransferi"/>
>+            <command name="glPixelMapfv"/>
>+            <command name="glPixelMapuiv"/>
>+            <command name="glPixelMapusv"/>
>+            <command name="glCopyPixels"/>
>+            <command name="glDrawPixels"/>
>+            <command name="glGetClipPlane"/>
>+            <command name="glGetLightfv"/>
>+            <command name="glGetLightiv"/>
>+            <command name="glGetMapdv"/>
>+            <command name="glGetMapfv"/>
>+            <command name="glGetMapiv"/>
>+            <command name="glGetMaterialfv"/>
>+            <command name="glGetMaterialiv"/>
>+            <command name="glGetPixelMapfv"/>
>+            <command name="glGetPixelMapuiv"/>
>+            <command name="glGetPixelMapusv"/>
>+            <command name="glGetPolygonStipple"/>
>+            <command name="glGetTexEnvfv"/>
>+            <command name="glGetTexEnviv"/>
>+            <command name="glGetTexGendv"/>
>+            <command name="glGetTexGenfv"/>
>+            <command name="glGetTexGeniv"/>
>+            <command name="glIsList"/>
>+            <command name="glFrustum"/>
>+            <command name="glLoadIdentity"/>
>+            <command name="glLoadMatrixf"/>
>+            <command name="glLoadMatrixd"/>
>+            <command name="glMatrixMode"/>
>+            <command name="glMultMatrixf"/>
>+            <command name="glMultMatrixd"/>
>+            <command name="glOrtho"/>
>+            <command name="glPopMatrix"/>
>+            <command name="glPushMatrix"/>
>+            <command name="glRotated"/>
>+            <command name="glRotatef"/>
>+            <command name="glScaled"/>
>+            <command name="glScalef"/>
>+            <command name="glTranslated"/>
>+            <command name="glTranslatef"/>
>+        </remove>
>+        <remove profile="core" comment="Compatibility-only GL 1.1 features removed from GL 3.2">
>+            <enum name="GL_CURRENT_BIT"/>
>+            <enum name="GL_POINT_BIT"/>
>+            <enum name="GL_LINE_BIT"/>
>+            <enum name="GL_POLYGON_BIT"/>
>+            <enum name="GL_POLYGON_STIPPLE_BIT"/>
>+            <enum name="GL_PIXEL_MODE_BIT"/>
>+            <enum name="GL_LIGHTING_BIT"/>
>+            <enum name="GL_FOG_BIT"/>
>+            <enum name="GL_ACCUM_BUFFER_BIT"/>
>+            <enum name="GL_VIEWPORT_BIT"/>
>+            <enum name="GL_TRANSFORM_BIT"/>
>+            <enum name="GL_ENABLE_BIT"/>
>+            <enum name="GL_HINT_BIT"/>
>+            <enum name="GL_EVAL_BIT"/>
>+            <enum name="GL_LIST_BIT"/>
>+            <enum name="GL_TEXTURE_BIT"/>
>+            <enum name="GL_SCISSOR_BIT"/>
>+            <enum name="GL_ALL_ATTRIB_BITS"/>
>+            <enum name="GL_CLIENT_PIXEL_STORE_BIT"/>
>+            <enum name="GL_CLIENT_VERTEX_ARRAY_BIT"/>
>+            <enum name="GL_CLIENT_ALL_ATTRIB_BITS"/>
>+            <enum name="GL_QUAD_STRIP"/>
>+            <enum name="GL_QUADS"/>
>+            <enum name="GL_POLYGON"/>
>+            <enum name="GL_ACCUM"/>
>+            <enum name="GL_LOAD"/>
>+            <enum name="GL_RETURN"/>
>+            <enum name="GL_MULT"/>
>+            <enum name="GL_ADD"/>
>+            <enum name="GL_STACK_OVERFLOW"/>
>+            <enum name="GL_STACK_UNDERFLOW"/>
>+            <enum name="GL_AUX0"/>
>+            <enum name="GL_AUX1"/>
>+            <enum name="GL_AUX2"/>
>+            <enum name="GL_AUX3"/>
>+            <enum name="GL_2D"/>
>+            <enum name="GL_3D"/>
>+            <enum name="GL_3D_COLOR"/>
>+            <enum name="GL_3D_COLOR_TEXTURE"/>
>+            <enum name="GL_4D_COLOR_TEXTURE"/>
>+            <enum name="GL_PASS_THROUGH_TOKEN"/>
>+            <enum name="GL_POINT_TOKEN"/>
>+            <enum name="GL_LINE_TOKEN"/>
>+            <enum name="GL_POLYGON_TOKEN"/>
>+            <enum name="GL_BITMAP_TOKEN"/>
>+            <enum name="GL_DRAW_PIXEL_TOKEN"/>
>+            <enum name="GL_COPY_PIXEL_TOKEN"/>
>+            <enum name="GL_LINE_RESET_TOKEN"/>
>+            <enum name="GL_EXP"/>
>+            <enum name="GL_EXP2"/>
>+            <enum name="GL_COEFF"/>
>+            <enum name="GL_ORDER"/>
>+            <enum name="GL_DOMAIN"/>
>+            <enum name="GL_PIXEL_MAP_I_TO_I"/>
>+            <enum name="GL_PIXEL_MAP_S_TO_S"/>
>+            <enum name="GL_PIXEL_MAP_I_TO_R"/>
>+            <enum name="GL_PIXEL_MAP_I_TO_G"/>
>+            <enum name="GL_PIXEL_MAP_I_TO_B"/>
>+            <enum name="GL_PIXEL_MAP_I_TO_A"/>
>+            <enum name="GL_PIXEL_MAP_R_TO_R"/>
>+            <enum name="GL_PIXEL_MAP_G_TO_G"/>
>+            <enum name="GL_PIXEL_MAP_B_TO_B"/>
>+            <enum name="GL_PIXEL_MAP_A_TO_A"/>
>+            <enum name="GL_VERTEX_ARRAY_POINTER"/>
>+            <enum name="GL_NORMAL_ARRAY_POINTER"/>
>+            <enum name="GL_COLOR_ARRAY_POINTER"/>
>+            <enum name="GL_INDEX_ARRAY_POINTER"/>
>+            <enum name="GL_TEXTURE_COORD_ARRAY_POINTER"/>
>+            <enum name="GL_EDGE_FLAG_ARRAY_POINTER"/>
>+            <enum name="GL_FEEDBACK_BUFFER_POINTER"/>
>+            <enum name="GL_SELECTION_BUFFER_POINTER"/>
>+            <enum name="GL_CURRENT_COLOR"/>
>+            <enum name="GL_CURRENT_INDEX"/>
>+            <enum name="GL_CURRENT_NORMAL"/>
>+            <enum name="GL_CURRENT_TEXTURE_COORDS"/>
>+            <enum name="GL_CURRENT_RASTER_COLOR"/>
>+            <enum name="GL_CURRENT_RASTER_INDEX"/>
>+            <enum name="GL_CURRENT_RASTER_TEXTURE_COORDS"/>
>+            <enum name="GL_CURRENT_RASTER_POSITION"/>
>+            <enum name="GL_CURRENT_RASTER_POSITION_VALID"/>
>+            <enum name="GL_CURRENT_RASTER_DISTANCE"/>
>+            <enum name="GL_POINT_SMOOTH"/>
>+            <enum name="GL_LINE_STIPPLE"/>
>+            <enum name="GL_LINE_STIPPLE_PATTERN"/>
>+            <enum name="GL_LINE_STIPPLE_REPEAT"/>
>+            <enum name="GL_LIST_MODE"/>
>+            <enum name="GL_MAX_LIST_NESTING"/>
>+            <enum name="GL_LIST_BASE"/>
>+            <enum name="GL_LIST_INDEX"/>
>+            <enum name="GL_POLYGON_STIPPLE"/>
>+            <enum name="GL_EDGE_FLAG"/>
>+            <enum name="GL_LIGHTING"/>
>+            <enum name="GL_LIGHT_MODEL_LOCAL_VIEWER"/>
>+            <enum name="GL_LIGHT_MODEL_TWO_SIDE"/>
>+            <enum name="GL_LIGHT_MODEL_AMBIENT"/>
>+            <enum name="GL_SHADE_MODEL"/>
>+            <enum name="GL_COLOR_MATERIAL_FACE"/>
>+            <enum name="GL_COLOR_MATERIAL_PARAMETER"/>
>+            <enum name="GL_COLOR_MATERIAL"/>
>+            <enum name="GL_FOG"/>
>+            <enum name="GL_FOG_INDEX"/>
>+            <enum name="GL_FOG_DENSITY"/>
>+            <enum name="GL_FOG_START"/>
>+            <enum name="GL_FOG_END"/>
>+            <enum name="GL_FOG_MODE"/>
>+            <enum name="GL_FOG_COLOR"/>
>+            <enum name="GL_ACCUM_CLEAR_VALUE"/>
>+            <enum name="GL_MATRIX_MODE"/>
>+            <enum name="GL_NORMALIZE"/>
>+            <enum name="GL_MODELVIEW_STACK_DEPTH"/>
>+            <enum name="GL_PROJECTION_STACK_DEPTH"/>
>+            <enum name="GL_TEXTURE_STACK_DEPTH"/>
>+            <enum name="GL_MODELVIEW_MATRIX"/>
>+            <enum name="GL_PROJECTION_MATRIX"/>
>+            <enum name="GL_TEXTURE_MATRIX"/>
>+            <enum name="GL_ATTRIB_STACK_DEPTH"/>
>+            <enum name="GL_CLIENT_ATTRIB_STACK_DEPTH"/>
>+            <enum name="GL_ALPHA_TEST"/>
>+            <enum name="GL_ALPHA_TEST_FUNC"/>
>+            <enum name="GL_ALPHA_TEST_REF"/>
>+            <enum name="GL_INDEX_LOGIC_OP"/>
>+            <enum name="GL_LOGIC_OP"/>
>+            <enum name="GL_AUX_BUFFERS"/>
>+            <enum name="GL_INDEX_CLEAR_VALUE"/>
>+            <enum name="GL_INDEX_WRITEMASK"/>
>+            <enum name="GL_INDEX_MODE"/>
>+            <enum name="GL_RGBA_MODE"/>
>+            <enum name="GL_RENDER_MODE"/>
>+            <enum name="GL_PERSPECTIVE_CORRECTION_HINT"/>
>+            <enum name="GL_POINT_SMOOTH_HINT"/>
>+            <enum name="GL_FOG_HINT"/>
>+            <enum name="GL_TEXTURE_GEN_S"/>
>+            <enum name="GL_TEXTURE_GEN_T"/>
>+            <enum name="GL_TEXTURE_GEN_R"/>
>+            <enum name="GL_TEXTURE_GEN_Q"/>
>+            <enum name="GL_PIXEL_MAP_I_TO_I_SIZE"/>
>+            <enum name="GL_PIXEL_MAP_S_TO_S_SIZE"/>
>+            <enum name="GL_PIXEL_MAP_I_TO_R_SIZE"/>
>+            <enum name="GL_PIXEL_MAP_I_TO_G_SIZE"/>
>+            <enum name="GL_PIXEL_MAP_I_TO_B_SIZE"/>
>+            <enum name="GL_PIXEL_MAP_I_TO_A_SIZE"/>
>+            <enum name="GL_PIXEL_MAP_R_TO_R_SIZE"/>
>+            <enum name="GL_PIXEL_MAP_G_TO_G_SIZE"/>
>+            <enum name="GL_PIXEL_MAP_B_TO_B_SIZE"/>
>+            <enum name="GL_PIXEL_MAP_A_TO_A_SIZE"/>
>+            <enum name="GL_MAP_COLOR"/>
>+            <enum name="GL_MAP_STENCIL"/>
>+            <enum name="GL_INDEX_SHIFT"/>
>+            <enum name="GL_INDEX_OFFSET"/>
>+            <enum name="GL_RED_SCALE"/>
>+            <enum name="GL_RED_BIAS"/>
>+            <enum name="GL_ZOOM_X"/>
>+            <enum name="GL_ZOOM_Y"/>
>+            <enum name="GL_GREEN_SCALE"/>
>+            <enum name="GL_GREEN_BIAS"/>
>+            <enum name="GL_BLUE_SCALE"/>
>+            <enum name="GL_BLUE_BIAS"/>
>+            <enum name="GL_ALPHA_SCALE"/>
>+            <enum name="GL_ALPHA_BIAS"/>
>+            <enum name="GL_DEPTH_SCALE"/>
>+            <enum name="GL_DEPTH_BIAS"/>
>+            <enum name="GL_MAX_EVAL_ORDER"/>
>+            <enum name="GL_MAX_LIGHTS"/>
>+            <enum name="GL_MAX_CLIP_PLANES"/>
>+            <enum name="GL_MAX_PIXEL_MAP_TABLE"/>
>+            <enum name="GL_MAX_ATTRIB_STACK_DEPTH"/>
>+            <enum name="GL_MAX_MODELVIEW_STACK_DEPTH"/>
>+            <enum name="GL_MAX_NAME_STACK_DEPTH"/>
>+            <enum name="GL_MAX_PROJECTION_STACK_DEPTH"/>
>+            <enum name="GL_MAX_TEXTURE_STACK_DEPTH"/>
>+            <enum name="GL_MAX_CLIENT_ATTRIB_STACK_DEPTH"/>
>+            <enum name="GL_INDEX_BITS"/>
>+            <enum name="GL_RED_BITS"/>
>+            <enum name="GL_GREEN_BITS"/>
>+            <enum name="GL_BLUE_BITS"/>
>+            <enum name="GL_ALPHA_BITS"/>
>+            <enum name="GL_DEPTH_BITS"/>
>+            <enum name="GL_STENCIL_BITS"/>
>+            <enum name="GL_ACCUM_RED_BITS"/>
>+            <enum name="GL_ACCUM_GREEN_BITS"/>
>+            <enum name="GL_ACCUM_BLUE_BITS"/>
>+            <enum name="GL_ACCUM_ALPHA_BITS"/>
>+            <enum name="GL_NAME_STACK_DEPTH"/>
>+            <enum name="GL_AUTO_NORMAL"/>
>+            <enum name="GL_MAP1_COLOR_4"/>
>+            <enum name="GL_MAP1_INDEX"/>
>+            <enum name="GL_MAP1_NORMAL"/>
>+            <enum name="GL_MAP1_TEXTURE_COORD_1"/>
>+            <enum name="GL_MAP1_TEXTURE_COORD_2"/>
>+            <enum name="GL_MAP1_TEXTURE_COORD_3"/>
>+            <enum name="GL_MAP1_TEXTURE_COORD_4"/>
>+            <enum name="GL_MAP1_VERTEX_3"/>
>+            <enum name="GL_MAP1_VERTEX_4"/>
>+            <enum name="GL_MAP2_COLOR_4"/>
>+            <enum name="GL_MAP2_INDEX"/>
>+            <enum name="GL_MAP2_NORMAL"/>
>+            <enum name="GL_MAP2_TEXTURE_COORD_1"/>
>+            <enum name="GL_MAP2_TEXTURE_COORD_2"/>
>+            <enum name="GL_MAP2_TEXTURE_COORD_3"/>
>+            <enum name="GL_MAP2_TEXTURE_COORD_4"/>
>+            <enum name="GL_MAP2_VERTEX_3"/>
>+            <enum name="GL_MAP2_VERTEX_4"/>
>+            <enum name="GL_MAP1_GRID_DOMAIN"/>
>+            <enum name="GL_MAP1_GRID_SEGMENTS"/>
>+            <enum name="GL_MAP2_GRID_DOMAIN"/>
>+            <enum name="GL_MAP2_GRID_SEGMENTS"/>
>+            <enum name="GL_FEEDBACK_BUFFER_SIZE"/>
>+            <enum name="GL_FEEDBACK_BUFFER_TYPE"/>
>+            <enum name="GL_SELECTION_BUFFER_SIZE"/>
>+            <enum name="GL_VERTEX_ARRAY"/>
>+            <enum name="GL_NORMAL_ARRAY"/>
>+            <enum name="GL_COLOR_ARRAY"/>
>+            <enum name="GL_INDEX_ARRAY"/>
>+            <enum name="GL_TEXTURE_COORD_ARRAY"/>
>+            <enum name="GL_EDGE_FLAG_ARRAY"/>
>+            <enum name="GL_VERTEX_ARRAY_SIZE"/>
>+            <enum name="GL_VERTEX_ARRAY_TYPE"/>
>+            <enum name="GL_VERTEX_ARRAY_STRIDE"/>
>+            <enum name="GL_NORMAL_ARRAY_TYPE"/>
>+            <enum name="GL_NORMAL_ARRAY_STRIDE"/>
>+            <enum name="GL_COLOR_ARRAY_SIZE"/>
>+            <enum name="GL_COLOR_ARRAY_TYPE"/>
>+            <enum name="GL_COLOR_ARRAY_STRIDE"/>
>+            <enum name="GL_INDEX_ARRAY_TYPE"/>
>+            <enum name="GL_INDEX_ARRAY_STRIDE"/>
>+            <enum name="GL_TEXTURE_COORD_ARRAY_SIZE"/>
>+            <enum name="GL_TEXTURE_COORD_ARRAY_TYPE"/>
>+            <enum name="GL_TEXTURE_COORD_ARRAY_STRIDE"/>
>+            <enum name="GL_EDGE_FLAG_ARRAY_STRIDE"/>
>+            <enum name="GL_TEXTURE_COMPONENTS"/>
>+            <enum name="GL_TEXTURE_BORDER"/>
>+            <enum name="GL_TEXTURE_LUMINANCE_SIZE"/>
>+            <enum name="GL_TEXTURE_INTENSITY_SIZE"/>
>+            <enum name="GL_TEXTURE_PRIORITY"/>
>+            <enum name="GL_TEXTURE_RESIDENT"/>
>+            <enum name="GL_AMBIENT"/>
>+            <enum name="GL_DIFFUSE"/>
>+            <enum name="GL_SPECULAR"/>
>+            <enum name="GL_POSITION"/>
>+            <enum name="GL_SPOT_DIRECTION"/>
>+            <enum name="GL_SPOT_EXPONENT"/>
>+            <enum name="GL_SPOT_CUTOFF"/>
>+            <enum name="GL_CONSTANT_ATTENUATION"/>
>+            <enum name="GL_LINEAR_ATTENUATION"/>
>+            <enum name="GL_QUADRATIC_ATTENUATION"/>
>+            <enum name="GL_COMPILE"/>
>+            <enum name="GL_COMPILE_AND_EXECUTE"/>
>+            <enum name="GL_2_BYTES"/>
>+            <enum name="GL_3_BYTES"/>
>+            <enum name="GL_4_BYTES"/>
>+            <enum name="GL_EMISSION"/>
>+            <enum name="GL_SHININESS"/>
>+            <enum name="GL_AMBIENT_AND_DIFFUSE"/>
>+            <enum name="GL_COLOR_INDEXES"/>
>+            <enum name="GL_MODELVIEW"/>
>+            <enum name="GL_PROJECTION"/>
>+            <enum name="GL_COLOR_INDEX"/>
>+            <enum name="GL_LUMINANCE"/>
>+            <enum name="GL_LUMINANCE_ALPHA"/>
>+            <enum name="GL_BITMAP"/>
>+            <enum name="GL_RENDER"/>
>+            <enum name="GL_FEEDBACK"/>
>+            <enum name="GL_SELECT"/>
>+            <enum name="GL_FLAT"/>
>+            <enum name="GL_SMOOTH"/>
>+            <enum name="GL_S"/>
>+            <enum name="GL_T"/>
>+            <enum name="GL_R"/>
>+            <enum name="GL_Q"/>
>+            <enum name="GL_MODULATE"/>
>+            <enum name="GL_DECAL"/>
>+            <enum name="GL_TEXTURE_ENV_MODE"/>
>+            <enum name="GL_TEXTURE_ENV_COLOR"/>
>+            <enum name="GL_TEXTURE_ENV"/>
>+            <enum name="GL_EYE_LINEAR"/>
>+            <enum name="GL_OBJECT_LINEAR"/>
>+            <enum name="GL_SPHERE_MAP"/>
>+            <enum name="GL_TEXTURE_GEN_MODE"/>
>+            <enum name="GL_OBJECT_PLANE"/>
>+            <enum name="GL_EYE_PLANE"/>
>+            <enum name="GL_CLAMP"/>
>+            <enum name="GL_ALPHA4"/>
>+            <enum name="GL_ALPHA8"/>
>+            <enum name="GL_ALPHA12"/>
>+            <enum name="GL_ALPHA16"/>
>+            <enum name="GL_LUMINANCE4"/>
>+            <enum name="GL_LUMINANCE8"/>
>+            <enum name="GL_LUMINANCE12"/>
>+            <enum name="GL_LUMINANCE16"/>
>+            <enum name="GL_LUMINANCE4_ALPHA4"/>
>+            <enum name="GL_LUMINANCE6_ALPHA2"/>
>+            <enum name="GL_LUMINANCE8_ALPHA8"/>
>+            <enum name="GL_LUMINANCE12_ALPHA4"/>
>+            <enum name="GL_LUMINANCE12_ALPHA12"/>
>+            <enum name="GL_LUMINANCE16_ALPHA16"/>
>+            <enum name="GL_INTENSITY"/>
>+            <enum name="GL_INTENSITY4"/>
>+            <enum name="GL_INTENSITY8"/>
>+            <enum name="GL_INTENSITY12"/>
>+            <enum name="GL_INTENSITY16"/>
>+            <enum name="GL_V2F"/>
>+            <enum name="GL_V3F"/>
>+            <enum name="GL_C4UB_V2F"/>
>+            <enum name="GL_C4UB_V3F"/>
>+            <enum name="GL_C3F_V3F"/>
>+            <enum name="GL_N3F_V3F"/>
>+            <enum name="GL_C4F_N3F_V3F"/>
>+            <enum name="GL_T2F_V3F"/>
>+            <enum name="GL_T4F_V4F"/>
>+            <enum name="GL_T2F_C4UB_V3F"/>
>+            <enum name="GL_T2F_C3F_V3F"/>
>+            <enum name="GL_T2F_N3F_V3F"/>
>+            <enum name="GL_T2F_C4F_N3F_V3F"/>
>+            <enum name="GL_T4F_C4F_N3F_V4F"/>
>+            <enum name="GL_CLIP_PLANE0"/>
>+            <enum name="GL_CLIP_PLANE1"/>
>+            <enum name="GL_CLIP_PLANE2"/>
>+            <enum name="GL_CLIP_PLANE3"/>
>+            <enum name="GL_CLIP_PLANE4"/>
>+            <enum name="GL_CLIP_PLANE5"/>
>+            <enum name="GL_LIGHT0"/>
>+            <enum name="GL_LIGHT1"/>
>+            <enum name="GL_LIGHT2"/>
>+            <enum name="GL_LIGHT3"/>
>+            <enum name="GL_LIGHT4"/>
>+            <enum name="GL_LIGHT5"/>
>+            <enum name="GL_LIGHT6"/>
>+            <enum name="GL_LIGHT7"/>
>+            <command name="glArrayElement"/>
>+            <command name="glColorPointer"/>
>+            <command name="glDisableClientState"/>
>+            <command name="glEdgeFlagPointer"/>
>+            <command name="glEnableClientState"/>
>+            <command name="glIndexPointer"/>
>+            <command name="glGetPointerv"/>
>+            <command name="glInterleavedArrays"/>
>+            <command name="glNormalPointer"/>
>+            <command name="glTexCoordPointer"/>
>+            <command name="glVertexPointer"/>
>+            <command name="glAreTexturesResident"/>
>+            <command name="glPrioritizeTextures"/>
>+            <command name="glIndexub"/>
>+            <command name="glIndexubv"/>
>+            <command name="glPopClientAttrib"/>
>+            <command name="glPushClientAttrib"/>
>+        </remove>
>+        <remove profile="core" comment="Compatibility-only GL 1.2 features removed from GL 3.2">
>+            <enum name="GL_RESCALE_NORMAL"/>
>+            <enum name="GL_LIGHT_MODEL_COLOR_CONTROL"/>
>+            <enum name="GL_SINGLE_COLOR"/>
>+            <enum name="GL_SEPARATE_SPECULAR_COLOR"/>
>+            <enum name="GL_ALIASED_POINT_SIZE_RANGE"/>
>+        </remove>
>+        <remove profile="core" comment="Compatibility-only GL 1.3 features removed from GL 3.2">
>+            <enum name="GL_CLIENT_ACTIVE_TEXTURE"/>
>+            <enum name="GL_MAX_TEXTURE_UNITS"/>
>+            <enum name="GL_TRANSPOSE_MODELVIEW_MATRIX"/>
>+            <enum name="GL_TRANSPOSE_PROJECTION_MATRIX"/>
>+            <enum name="GL_TRANSPOSE_TEXTURE_MATRIX"/>
>+            <enum name="GL_TRANSPOSE_COLOR_MATRIX"/>
>+            <enum name="GL_MULTISAMPLE_BIT"/>
>+            <enum name="GL_NORMAL_MAP"/>
>+            <enum name="GL_REFLECTION_MAP"/>
>+            <enum name="GL_COMPRESSED_ALPHA"/>
>+            <enum name="GL_COMPRESSED_LUMINANCE"/>
>+            <enum name="GL_COMPRESSED_LUMINANCE_ALPHA"/>
>+            <enum name="GL_COMPRESSED_INTENSITY"/>
>+            <enum name="GL_COMBINE"/>
>+            <enum name="GL_COMBINE_RGB"/>
>+            <enum name="GL_COMBINE_ALPHA"/>
>+            <enum name="GL_SOURCE0_RGB"/>
>+            <enum name="GL_SOURCE1_RGB"/>
>+            <enum name="GL_SOURCE2_RGB"/>
>+            <enum name="GL_SOURCE0_ALPHA"/>
>+            <enum name="GL_SOURCE1_ALPHA"/>
>+            <enum name="GL_SOURCE2_ALPHA"/>
>+            <enum name="GL_OPERAND0_RGB"/>
>+            <enum name="GL_OPERAND1_RGB"/>
>+            <enum name="GL_OPERAND2_RGB"/>
>+            <enum name="GL_OPERAND0_ALPHA"/>
>+            <enum name="GL_OPERAND1_ALPHA"/>
>+            <enum name="GL_OPERAND2_ALPHA"/>
>+            <enum name="GL_RGB_SCALE"/>
>+            <enum name="GL_ADD_SIGNED"/>
>+            <enum name="GL_INTERPOLATE"/>
>+            <enum name="GL_SUBTRACT"/>
>+            <enum name="GL_CONSTANT"/>
>+            <enum name="GL_PRIMARY_COLOR"/>
>+            <enum name="GL_PREVIOUS"/>
>+            <enum name="GL_DOT3_RGB"/>
>+            <enum name="GL_DOT3_RGBA"/>
>+            <command name="glClientActiveTexture"/>
>+            <command name="glMultiTexCoord1d"/>
>+            <command name="glMultiTexCoord1dv"/>
>+            <command name="glMultiTexCoord1f"/>
>+            <command name="glMultiTexCoord1fv"/>
>+            <command name="glMultiTexCoord1i"/>
>+            <command name="glMultiTexCoord1iv"/>
>+            <command name="glMultiTexCoord1s"/>
>+            <command name="glMultiTexCoord1sv"/>
>+            <command name="glMultiTexCoord2d"/>
>+            <command name="glMultiTexCoord2dv"/>
>+            <command name="glMultiTexCoord2f"/>
>+            <command name="glMultiTexCoord2fv"/>
>+            <command name="glMultiTexCoord2i"/>
>+            <command name="glMultiTexCoord2iv"/>
>+            <command name="glMultiTexCoord2s"/>
>+            <command name="glMultiTexCoord2sv"/>
>+            <command name="glMultiTexCoord3d"/>
>+            <command name="glMultiTexCoord3dv"/>
>+            <command name="glMultiTexCoord3f"/>
>+            <command name="glMultiTexCoord3fv"/>
>+            <command name="glMultiTexCoord3i"/>
>+            <command name="glMultiTexCoord3iv"/>
>+            <command name="glMultiTexCoord3s"/>
>+            <command name="glMultiTexCoord3sv"/>
>+            <command name="glMultiTexCoord4d"/>
>+            <command name="glMultiTexCoord4dv"/>
>+            <command name="glMultiTexCoord4f"/>
>+            <command name="glMultiTexCoord4fv"/>
>+            <command name="glMultiTexCoord4i"/>
>+            <command name="glMultiTexCoord4iv"/>
>+            <command name="glMultiTexCoord4s"/>
>+            <command name="glMultiTexCoord4sv"/>
>+            <command name="glLoadTransposeMatrixf"/>
>+            <command name="glLoadTransposeMatrixd"/>
>+            <command name="glMultTransposeMatrixf"/>
>+            <command name="glMultTransposeMatrixd"/>
>+        </remove>
>+        <remove profile="core" comment="Compatibility-only GL 1.4 features removed from GL 3.2">
>+            <enum name="GL_POINT_SIZE_MIN"/>
>+            <enum name="GL_POINT_SIZE_MAX"/>
>+            <enum name="GL_POINT_DISTANCE_ATTENUATION"/>
>+            <enum name="GL_GENERATE_MIPMAP"/>
>+            <enum name="GL_GENERATE_MIPMAP_HINT"/>
>+            <enum name="GL_FOG_COORDINATE_SOURCE"/>
>+            <enum name="GL_FOG_COORDINATE"/>
>+            <enum name="GL_FRAGMENT_DEPTH"/>
>+            <enum name="GL_CURRENT_FOG_COORDINATE"/>
>+            <enum name="GL_FOG_COORDINATE_ARRAY_TYPE"/>
>+            <enum name="GL_FOG_COORDINATE_ARRAY_STRIDE"/>
>+            <enum name="GL_FOG_COORDINATE_ARRAY_POINTER"/>
>+            <enum name="GL_FOG_COORDINATE_ARRAY"/>
>+            <enum name="GL_COLOR_SUM"/>
>+            <enum name="GL_CURRENT_SECONDARY_COLOR"/>
>+            <enum name="GL_SECONDARY_COLOR_ARRAY_SIZE"/>
>+            <enum name="GL_SECONDARY_COLOR_ARRAY_TYPE"/>
>+            <enum name="GL_SECONDARY_COLOR_ARRAY_STRIDE"/>
>+            <enum name="GL_SECONDARY_COLOR_ARRAY_POINTER"/>
>+            <enum name="GL_SECONDARY_COLOR_ARRAY"/>
>+            <enum name="GL_TEXTURE_FILTER_CONTROL"/>
>+            <enum name="GL_DEPTH_TEXTURE_MODE"/>
>+            <enum name="GL_COMPARE_R_TO_TEXTURE"/>
>+            <command name="glFogCoordf"/>
>+            <command name="glFogCoordfv"/>
>+            <command name="glFogCoordd"/>
>+            <command name="glFogCoorddv"/>
>+            <command name="glFogCoordPointer"/>
>+            <command name="glSecondaryColor3b"/>
>+            <command name="glSecondaryColor3bv"/>
>+            <command name="glSecondaryColor3d"/>
>+            <command name="glSecondaryColor3dv"/>
>+            <command name="glSecondaryColor3f"/>
>+            <command name="glSecondaryColor3fv"/>
>+            <command name="glSecondaryColor3i"/>
>+            <command name="glSecondaryColor3iv"/>
>+            <command name="glSecondaryColor3s"/>
>+            <command name="glSecondaryColor3sv"/>
>+            <command name="glSecondaryColor3ub"/>
>+            <command name="glSecondaryColor3ubv"/>
>+            <command name="glSecondaryColor3ui"/>
>+            <command name="glSecondaryColor3uiv"/>
>+            <command name="glSecondaryColor3us"/>
>+            <command name="glSecondaryColor3usv"/>
>+            <command name="glSecondaryColorPointer"/>
>+            <command name="glWindowPos2d"/>
>+            <command name="glWindowPos2dv"/>
>+            <command name="glWindowPos2f"/>
>+            <command name="glWindowPos2fv"/>
>+            <command name="glWindowPos2i"/>
>+            <command name="glWindowPos2iv"/>
>+            <command name="glWindowPos2s"/>
>+            <command name="glWindowPos2sv"/>
>+            <command name="glWindowPos3d"/>
>+            <command name="glWindowPos3dv"/>
>+            <command name="glWindowPos3f"/>
>+            <command name="glWindowPos3fv"/>
>+            <command name="glWindowPos3i"/>
>+            <command name="glWindowPos3iv"/>
>+            <command name="glWindowPos3s"/>
>+            <command name="glWindowPos3sv"/>
>+        </remove>
>+        <remove profile="core" comment="Compatibility-only GL 1.5 features removed from GL 3.2">
>+            <enum name="GL_VERTEX_ARRAY_BUFFER_BINDING"/>
>+            <enum name="GL_NORMAL_ARRAY_BUFFER_BINDING"/>
>+            <enum name="GL_COLOR_ARRAY_BUFFER_BINDING"/>
>+            <enum name="GL_INDEX_ARRAY_BUFFER_BINDING"/>
>+            <enum name="GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING"/>
>+            <enum name="GL_EDGE_FLAG_ARRAY_BUFFER_BINDING"/>
>+            <enum name="GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING"/>
>+            <enum name="GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING"/>
>+            <enum name="GL_WEIGHT_ARRAY_BUFFER_BINDING"/>
>+            <enum name="GL_FOG_COORD_SRC"/>
>+            <enum name="GL_FOG_COORD"/>
>+            <enum name="GL_CURRENT_FOG_COORD"/>
>+            <enum name="GL_FOG_COORD_ARRAY_TYPE"/>
>+            <enum name="GL_FOG_COORD_ARRAY_STRIDE"/>
>+            <enum name="GL_FOG_COORD_ARRAY_POINTER"/>
>+            <enum name="GL_FOG_COORD_ARRAY"/>
>+            <enum name="GL_FOG_COORD_ARRAY_BUFFER_BINDING"/>
>+            <enum name="GL_SRC0_RGB"/>
>+            <enum name="GL_SRC1_RGB"/>
>+            <enum name="GL_SRC2_RGB"/>
>+            <enum name="GL_SRC0_ALPHA"/>
>+            <enum name="GL_SRC2_ALPHA"/>
>+        </remove>
>+        <remove profile="core" comment="Compatibility-only GL 2.0 features removed from GL 3.2">
>+            <enum name="GL_VERTEX_PROGRAM_TWO_SIDE"/>
>+            <enum name="GL_POINT_SPRITE"/>
>+            <enum name="GL_COORD_REPLACE"/>
>+            <enum name="GL_MAX_TEXTURE_COORDS"/>
>+        </remove>
>+        <remove profile="core" comment="Compatibility-only GL 2.1 features removed from GL 3.2">
>+            <enum name="GL_CURRENT_RASTER_SECONDARY_COLOR"/>
>+            <enum name="GL_SLUMINANCE_ALPHA"/>
>+            <enum name="GL_SLUMINANCE8_ALPHA8"/>
>+            <enum name="GL_SLUMINANCE"/>
>+            <enum name="GL_SLUMINANCE8"/>
>+            <enum name="GL_COMPRESSED_SLUMINANCE"/>
>+            <enum name="GL_COMPRESSED_SLUMINANCE_ALPHA"/>
>+        </remove>
>+        <remove profile="core" comment="Compatibility-only GL 3.0 features removed from GL 3.2">
>+            <enum name="GL_CLAMP_VERTEX_COLOR"/>
>+            <enum name="GL_CLAMP_FRAGMENT_COLOR"/>
>+            <enum name="GL_ALPHA_INTEGER"/>
>+            <enum name="GL_TEXTURE_LUMINANCE_TYPE"/>
>+            <enum name="GL_TEXTURE_INTENSITY_TYPE"/>
>+        </remove>
>+        
>+    </feature>
>+    <feature api="gl" name="GL_VERSION_3_3" number="3.3">
>+        <require>
>+            <enum name="GL_VERTEX_ATTRIB_ARRAY_DIVISOR"/>
>+        </require>
>+        <require comment="Reuse ARB_blend_func_extended">
>+            <enum name="GL_SRC1_COLOR"/>
>+            <enum name="GL_ONE_MINUS_SRC1_COLOR"/>
>+            <enum name="GL_ONE_MINUS_SRC1_ALPHA"/>
>+            <enum name="GL_MAX_DUAL_SOURCE_DRAW_BUFFERS"/>
>+            <command name="glBindFragDataLocationIndexed"/>
>+            <command name="glGetFragDataIndex"/>
>+        </require>
>+        <require comment="Reuse ARB_explicit_attrib_location (none)">
>+        </require>
>+        <require comment="Reuse ARB_occlusion_query2">
>+            <enum name="GL_ANY_SAMPLES_PASSED"/>
>+        </require>
>+        <require comment="Reuse ARB_sampler_objects">
>+            <enum name="GL_SAMPLER_BINDING"/>
>+            <command name="glGenSamplers"/>
>+            <command name="glDeleteSamplers"/>
>+            <command name="glIsSampler"/>
>+            <command name="glBindSampler"/>
>+            <command name="glSamplerParameteri"/>
>+            <command name="glSamplerParameteriv"/>
>+            <command name="glSamplerParameterf"/>
>+            <command name="glSamplerParameterfv"/>
>+            <command name="glSamplerParameterIiv"/>
>+            <command name="glSamplerParameterIuiv"/>
>+            <command name="glGetSamplerParameteriv"/>
>+            <command name="glGetSamplerParameterIiv"/>
>+            <command name="glGetSamplerParameterfv"/>
>+            <command name="glGetSamplerParameterIuiv"/>
>+        </require>
>+        <require comment="Reuse ARB_shader_bit_encoding (none)">
>+        </require>
>+        <require comment="Reuse ARB_texture_rgb10_a2ui">
>+            <enum name="GL_RGB10_A2UI"/>
>+        </require>
>+        <require comment="Reuse ARB_texture_swizzle">
>+            <enum name="GL_TEXTURE_SWIZZLE_R"/>
>+            <enum name="GL_TEXTURE_SWIZZLE_G"/>
>+            <enum name="GL_TEXTURE_SWIZZLE_B"/>
>+            <enum name="GL_TEXTURE_SWIZZLE_A"/>
>+            <enum name="GL_TEXTURE_SWIZZLE_RGBA"/>
>+        </require>
>+        <require comment="Reuse ARB_timer_query">
>+            <enum name="GL_TIME_ELAPSED"/>
>+            <enum name="GL_TIMESTAMP"/>
>+            <command name="glQueryCounter"/>
>+            <command name="glGetQueryObjecti64v"/>
>+            <command name="glGetQueryObjectui64v"/>
>+        </require>
>+        <require comment="Reuse ARB_vertex_type_2_10_10_10_rev">
>+            <enum name="GL_INT_2_10_10_10_REV"/>
>+            <command name="glVertexAttribDivisor"/>
>+            <command name="glVertexAttribP1ui"/>
>+            <command name="glVertexAttribP1uiv"/>
>+            <command name="glVertexAttribP2ui"/>
>+            <command name="glVertexAttribP2uiv"/>
>+            <command name="glVertexAttribP3ui"/>
>+            <command name="glVertexAttribP3uiv"/>
>+            <command name="glVertexAttribP4ui"/>
>+            <command name="glVertexAttribP4uiv"/>
>+        </require>
>+        <require profile="compatibility" comment="Reuse ARB_vertex_type_2_10_10_10_rev compatibility profile">
>+            <command name="glVertexP2ui"/>
>+            <command name="glVertexP2uiv"/>
>+            <command name="glVertexP3ui"/>
>+            <command name="glVertexP3uiv"/>
>+            <command name="glVertexP4ui"/>
>+            <command name="glVertexP4uiv"/>
>+            <command name="glTexCoordP1ui"/>
>+            <command name="glTexCoordP1uiv"/>
>+            <command name="glTexCoordP2ui"/>
>+            <command name="glTexCoordP2uiv"/>
>+            <command name="glTexCoordP3ui"/>
>+            <command name="glTexCoordP3uiv"/>
>+            <command name="glTexCoordP4ui"/>
>+            <command name="glTexCoordP4uiv"/>
>+            <command name="glMultiTexCoordP1ui"/>
>+            <command name="glMultiTexCoordP1uiv"/>
>+            <command name="glMultiTexCoordP2ui"/>
>+            <command name="glMultiTexCoordP2uiv"/>
>+            <command name="glMultiTexCoordP3ui"/>
>+            <command name="glMultiTexCoordP3uiv"/>
>+            <command name="glMultiTexCoordP4ui"/>
>+            <command name="glMultiTexCoordP4uiv"/>
>+            <command name="glNormalP3ui"/>
>+            <command name="glNormalP3uiv"/>
>+            <command name="glColorP3ui"/>
>+            <command name="glColorP3uiv"/>
>+            <command name="glColorP4ui"/>
>+            <command name="glColorP4uiv"/>
>+            <command name="glSecondaryColorP3ui"/>
>+            <command name="glSecondaryColorP3uiv"/>
>+        </require>
>+    </feature>
>+    <feature api="gl" name="GL_VERSION_4_0" number="4.0">
>+        <require>
>+            <enum name="GL_SAMPLE_SHADING"/>
>+            <enum name="GL_MIN_SAMPLE_SHADING_VALUE"/>
>+            <enum name="GL_MIN_PROGRAM_TEXTURE_GATHER_OFFSET"/>
>+            <enum name="GL_MAX_PROGRAM_TEXTURE_GATHER_OFFSET"/>
>+            <enum name="GL_TEXTURE_CUBE_MAP_ARRAY"/>
>+            <enum name="GL_TEXTURE_BINDING_CUBE_MAP_ARRAY"/>
>+            <enum name="GL_PROXY_TEXTURE_CUBE_MAP_ARRAY"/>
>+            <enum name="GL_SAMPLER_CUBE_MAP_ARRAY"/>
>+            <enum name="GL_SAMPLER_CUBE_MAP_ARRAY_SHADOW"/>
>+            <enum name="GL_INT_SAMPLER_CUBE_MAP_ARRAY"/>
>+            <enum name="GL_UNSIGNED_INT_SAMPLER_CUBE_MAP_ARRAY"/>
>+            <command name="glMinSampleShading"/>
>+            <command name="glBlendEquationi"/>
>+            <command name="glBlendEquationSeparatei"/>
>+            <command name="glBlendFunci"/>
>+            <command name="glBlendFuncSeparatei"/>
>+        </require>
>+        <require comment="Reuse ARB_draw_buffers_blend (none)">
>+        </require>
>+        <require comment="Reuse ARB_draw_indirect">
>+            <enum name="GL_DRAW_INDIRECT_BUFFER"/>
>+            <enum name="GL_DRAW_INDIRECT_BUFFER_BINDING"/>
>+            <command name="glDrawArraysIndirect"/>
>+            <command name="glDrawElementsIndirect"/>
>+        </require>
>+        <require comment="Reuse ARB_gpu_shader5">
>+            <enum name="GL_GEOMETRY_SHADER_INVOCATIONS"/>
>+            <enum name="GL_MAX_GEOMETRY_SHADER_INVOCATIONS"/>
>+            <enum name="GL_MIN_FRAGMENT_INTERPOLATION_OFFSET"/>
>+            <enum name="GL_MAX_FRAGMENT_INTERPOLATION_OFFSET"/>
>+            <enum name="GL_FRAGMENT_INTERPOLATION_OFFSET_BITS"/>
>+            <enum name="GL_MAX_VERTEX_STREAMS"/>
>+        </require>
>+        <require comment="Reuse ARB_gpu_shader_fp64">
>+            <enum name="GL_DOUBLE_VEC2"/>
>+            <enum name="GL_DOUBLE_VEC3"/>
>+            <enum name="GL_DOUBLE_VEC4"/>
>+            <enum name="GL_DOUBLE_MAT2"/>
>+            <enum name="GL_DOUBLE_MAT3"/>
>+            <enum name="GL_DOUBLE_MAT4"/>
>+            <enum name="GL_DOUBLE_MAT2x3"/>
>+            <enum name="GL_DOUBLE_MAT2x4"/>
>+            <enum name="GL_DOUBLE_MAT3x2"/>
>+            <enum name="GL_DOUBLE_MAT3x4"/>
>+            <enum name="GL_DOUBLE_MAT4x2"/>
>+            <enum name="GL_DOUBLE_MAT4x3"/>
>+            <command name="glUniform1d"/>
>+            <command name="glUniform2d"/>
>+            <command name="glUniform3d"/>
>+            <command name="glUniform4d"/>
>+            <command name="glUniform1dv"/>
>+            <command name="glUniform2dv"/>
>+            <command name="glUniform3dv"/>
>+            <command name="glUniform4dv"/>
>+            <command name="glUniformMatrix2dv"/>
>+            <command name="glUniformMatrix3dv"/>
>+            <command name="glUniformMatrix4dv"/>
>+            <command name="glUniformMatrix2x3dv"/>
>+            <command name="glUniformMatrix2x4dv"/>
>+            <command name="glUniformMatrix3x2dv"/>
>+            <command name="glUniformMatrix3x4dv"/>
>+            <command name="glUniformMatrix4x2dv"/>
>+            <command name="glUniformMatrix4x3dv"/>
>+            <command name="glGetUniformdv"/>
>+        </require>
>+        <require comment="Reuse ARB_shader_subroutine">
>+            <enum name="GL_ACTIVE_SUBROUTINES"/>
>+            <enum name="GL_ACTIVE_SUBROUTINE_UNIFORMS"/>
>+            <enum name="GL_ACTIVE_SUBROUTINE_UNIFORM_LOCATIONS"/>
>+            <enum name="GL_ACTIVE_SUBROUTINE_MAX_LENGTH"/>
>+            <enum name="GL_ACTIVE_SUBROUTINE_UNIFORM_MAX_LENGTH"/>
>+            <enum name="GL_MAX_SUBROUTINES"/>
>+            <enum name="GL_MAX_SUBROUTINE_UNIFORM_LOCATIONS"/>
>+            <enum name="GL_NUM_COMPATIBLE_SUBROUTINES"/>
>+            <enum name="GL_COMPATIBLE_SUBROUTINES"/>
>+            <command name="glGetSubroutineUniformLocation"/>
>+            <command name="glGetSubroutineIndex"/>
>+            <command name="glGetActiveSubroutineUniformiv"/>
>+            <command name="glGetActiveSubroutineUniformName"/>
>+            <command name="glGetActiveSubroutineName"/>
>+            <command name="glUniformSubroutinesuiv"/>
>+            <command name="glGetUniformSubroutineuiv"/>
>+            <command name="glGetProgramStageiv"/>
>+        </require>
>+        <require comment="Reuse ARB_tessellation_shader">
>+            <enum name="GL_PATCHES"/>
>+            <enum name="GL_PATCH_VERTICES"/>
>+            <enum name="GL_PATCH_DEFAULT_INNER_LEVEL"/>
>+            <enum name="GL_PATCH_DEFAULT_OUTER_LEVEL"/>
>+            <enum name="GL_TESS_CONTROL_OUTPUT_VERTICES"/>
>+            <enum name="GL_TESS_GEN_MODE"/>
>+            <enum name="GL_TESS_GEN_SPACING"/>
>+            <enum name="GL_TESS_GEN_VERTEX_ORDER"/>
>+            <enum name="GL_TESS_GEN_POINT_MODE"/>
>+            <enum name="GL_ISOLINES"/>
>+            <enum name="GL_QUADS"/>
>+            <enum name="GL_FRACTIONAL_ODD"/>
>+            <enum name="GL_FRACTIONAL_EVEN"/>
>+            <enum name="GL_MAX_PATCH_VERTICES"/>
>+            <enum name="GL_MAX_TESS_GEN_LEVEL"/>
>+            <enum name="GL_MAX_TESS_CONTROL_UNIFORM_COMPONENTS"/>
>+            <enum name="GL_MAX_TESS_EVALUATION_UNIFORM_COMPONENTS"/>
>+            <enum name="GL_MAX_TESS_CONTROL_TEXTURE_IMAGE_UNITS"/>
>+            <enum name="GL_MAX_TESS_EVALUATION_TEXTURE_IMAGE_UNITS"/>
>+            <enum name="GL_MAX_TESS_CONTROL_OUTPUT_COMPONENTS"/>
>+            <enum name="GL_MAX_TESS_PATCH_COMPONENTS"/>
>+            <enum name="GL_MAX_TESS_CONTROL_TOTAL_OUTPUT_COMPONENTS"/>
>+            <enum name="GL_MAX_TESS_EVALUATION_OUTPUT_COMPONENTS"/>
>+            <enum name="GL_MAX_TESS_CONTROL_UNIFORM_BLOCKS"/>
>+            <enum name="GL_MAX_TESS_EVALUATION_UNIFORM_BLOCKS"/>
>+            <enum name="GL_MAX_TESS_CONTROL_INPUT_COMPONENTS"/>
>+            <enum name="GL_MAX_TESS_EVALUATION_INPUT_COMPONENTS"/>
>+            <enum name="GL_MAX_COMBINED_TESS_CONTROL_UNIFORM_COMPONENTS"/>
>+            <enum name="GL_MAX_COMBINED_TESS_EVALUATION_UNIFORM_COMPONENTS"/>
>+            <enum name="GL_UNIFORM_BLOCK_REFERENCED_BY_TESS_CONTROL_SHADER"/>
>+            <enum name="GL_UNIFORM_BLOCK_REFERENCED_BY_TESS_EVALUATION_SHADER"/>
>+            <enum name="GL_TESS_EVALUATION_SHADER"/>
>+            <enum name="GL_TESS_CONTROL_SHADER"/>
>+            <command name="glPatchParameteri"/>
>+            <command name="glPatchParameterfv"/>
>+        </require>
>+        <require comment="Reuse ARB_texture_buffer_object_rgb32 (none)">
>+        </require>
>+        <require comment="Reuse ARB_texture_cube_map_array (none)">
>+        </require>
>+        <require comment="Reuse ARB_texture_gather (none)">
>+        </require>
>+        <require comment="Reuse ARB_texture_query_lod (none)">
>+        </require>
>+        <require comment="Reuse ARB_transform_feedback2">
>+            <enum name="GL_TRANSFORM_FEEDBACK"/>
>+            <enum name="GL_TRANSFORM_FEEDBACK_BUFFER_PAUSED"/>
>+            <enum name="GL_TRANSFORM_FEEDBACK_BUFFER_ACTIVE"/>
>+            <enum name="GL_TRANSFORM_FEEDBACK_BINDING"/>
>+            <command name="glBindTransformFeedback"/>
>+            <command name="glDeleteTransformFeedbacks"/>
>+            <command name="glGenTransformFeedbacks"/>
>+            <command name="glIsTransformFeedback"/>
>+            <command name="glPauseTransformFeedback"/>
>+            <command name="glResumeTransformFeedback"/>
>+            <command name="glDrawTransformFeedback"/>
>+        </require>
>+        <require comment="Reuse ARB_transform_feedback3">
>+            <enum name="GL_MAX_TRANSFORM_FEEDBACK_BUFFERS"/>
>+            <enum name="GL_MAX_VERTEX_STREAMS"/>
>+            <command name="glDrawTransformFeedbackStream"/>
>+            <command name="glBeginQueryIndexed"/>
>+            <command name="glEndQueryIndexed"/>
>+            <command name="glGetQueryIndexediv"/>
>+        </require>
>+    </feature>
>+    <feature api="gl" name="GL_VERSION_4_1" number="4.1">
>+        <require comment="Reuse tokens from ARB_ES2_compatibility">
>+            <enum name="GL_FIXED"/>
>+            <enum name="GL_IMPLEMENTATION_COLOR_READ_TYPE"/>
>+            <enum name="GL_IMPLEMENTATION_COLOR_READ_FORMAT"/>
>+            <enum name="GL_LOW_FLOAT"/>
>+            <enum name="GL_MEDIUM_FLOAT"/>
>+            <enum name="GL_HIGH_FLOAT"/>
>+            <enum name="GL_LOW_INT"/>
>+            <enum name="GL_MEDIUM_INT"/>
>+            <enum name="GL_HIGH_INT"/>
>+            <enum name="GL_SHADER_COMPILER"/>
>+            <enum name="GL_SHADER_BINARY_FORMATS"/>
>+            <enum name="GL_NUM_SHADER_BINARY_FORMATS"/>
>+            <enum name="GL_MAX_VERTEX_UNIFORM_VECTORS"/>
>+            <enum name="GL_MAX_VARYING_VECTORS"/>
>+            <enum name="GL_MAX_FRAGMENT_UNIFORM_VECTORS"/>
>+            <enum name="GL_RGB565"/>
>+        </require>
>+        <require comment="Reuse tokens from ARB_get_program_binary">
>+            <enum name="GL_PROGRAM_BINARY_RETRIEVABLE_HINT"/>
>+            <enum name="GL_PROGRAM_BINARY_LENGTH"/>
>+            <enum name="GL_NUM_PROGRAM_BINARY_FORMATS"/>
>+            <enum name="GL_PROGRAM_BINARY_FORMATS"/>
>+        </require>
>+        <require comment="Reuse tokens from ARB_separate_shader_objects">
>+            <enum name="GL_VERTEX_SHADER_BIT"/>
>+            <enum name="GL_FRAGMENT_SHADER_BIT"/>
>+            <enum name="GL_GEOMETRY_SHADER_BIT"/>
>+            <enum name="GL_TESS_CONTROL_SHADER_BIT"/>
>+            <enum name="GL_TESS_EVALUATION_SHADER_BIT"/>
>+            <enum name="GL_ALL_SHADER_BITS"/>
>+            <enum name="GL_PROGRAM_SEPARABLE"/>
>+            <enum name="GL_ACTIVE_PROGRAM"/>
>+            <enum name="GL_PROGRAM_PIPELINE_BINDING"/>
>+        </require>
>+        <require comment="Reuse tokens from ARB_shader_precision (none)">
>+        </require>
>+        <require comment="Reuse tokens from ARB_vertex_attrib_64bit - all are in GL 3.0 and 4.0 already">
>+        </require>
>+        <require comment="Reuse tokens from ARB_viewport_array - some are in GL 1.1 and ARB_provoking_vertex already">
>+            <enum name="GL_MAX_VIEWPORTS"/>
>+            <enum name="GL_VIEWPORT_SUBPIXEL_BITS"/>
>+            <enum name="GL_VIEWPORT_BOUNDS_RANGE"/>
>+            <enum name="GL_LAYER_PROVOKING_VERTEX"/>
>+            <enum name="GL_VIEWPORT_INDEX_PROVOKING_VERTEX"/>
>+            <enum name="GL_UNDEFINED_VERTEX"/>
>+        </require>
>+        <require comment="Reuse commands from ARB_ES2_compatibility">
>+            <command name="glReleaseShaderCompiler"/>
>+            <command name="glShaderBinary"/>
>+            <command name="glGetShaderPrecisionFormat"/>
>+            <command name="glDepthRangef"/>
>+            <command name="glClearDepthf"/>
>+        </require>
>+        <require comment="Reuse commands from ARB_get_program_binary">
>+            <command name="glGetProgramBinary"/>
>+            <command name="glProgramBinary"/>
>+            <command name="glProgramParameteri"/>
>+        </require>
>+        <require comment="Reuse commands from ARB_separate_shader_objects">
>+            <command name="glUseProgramStages"/>
>+            <command name="glActiveShaderProgram"/>
>+            <command name="glCreateShaderProgramv"/>
>+            <command name="glBindProgramPipeline"/>
>+            <command name="glDeleteProgramPipelines"/>
>+            <command name="glGenProgramPipelines"/>
>+            <command name="glIsProgramPipeline"/>
>+            <command name="glGetProgramPipelineiv"/>
>+            <command name="glProgramParameteri"/>
>+            <command name="glProgramUniform1i"/>
>+            <command name="glProgramUniform1iv"/>
>+            <command name="glProgramUniform1f"/>
>+            <command name="glProgramUniform1fv"/>
>+            <command name="glProgramUniform1d"/>
>+            <command name="glProgramUniform1dv"/>
>+            <command name="glProgramUniform1ui"/>
>+            <command name="glProgramUniform1uiv"/>
>+            <command name="glProgramUniform2i"/>
>+            <command name="glProgramUniform2iv"/>
>+            <command name="glProgramUniform2f"/>
>+            <command name="glProgramUniform2fv"/>
>+            <command name="glProgramUniform2d"/>
>+            <command name="glProgramUniform2dv"/>
>+            <command name="glProgramUniform2ui"/>
>+            <command name="glProgramUniform2uiv"/>
>+            <command name="glProgramUniform3i"/>
>+            <command name="glProgramUniform3iv"/>
>+            <command name="glProgramUniform3f"/>
>+            <command name="glProgramUniform3fv"/>
>+            <command name="glProgramUniform3d"/>
>+            <command name="glProgramUniform3dv"/>
>+            <command name="glProgramUniform3ui"/>
>+            <command name="glProgramUniform3uiv"/>
>+            <command name="glProgramUniform4i"/>
>+            <command name="glProgramUniform4iv"/>
>+            <command name="glProgramUniform4f"/>
>+            <command name="glProgramUniform4fv"/>
>+            <command name="glProgramUniform4d"/>
>+            <command name="glProgramUniform4dv"/>
>+            <command name="glProgramUniform4ui"/>
>+            <command name="glProgramUniform4uiv"/>
>+            <command name="glProgramUniformMatrix2fv"/>
>+            <command name="glProgramUniformMatrix3fv"/>
>+            <command name="glProgramUniformMatrix4fv"/>
>+            <command name="glProgramUniformMatrix2dv"/>
>+            <command name="glProgramUniformMatrix3dv"/>
>+            <command name="glProgramUniformMatrix4dv"/>
>+            <command name="glProgramUniformMatrix2x3fv"/>
>+            <command name="glProgramUniformMatrix3x2fv"/>
>+            <command name="glProgramUniformMatrix2x4fv"/>
>+            <command name="glProgramUniformMatrix4x2fv"/>
>+            <command name="glProgramUniformMatrix3x4fv"/>
>+            <command name="glProgramUniformMatrix4x3fv"/>
>+            <command name="glProgramUniformMatrix2x3dv"/>
>+            <command name="glProgramUniformMatrix3x2dv"/>
>+            <command name="glProgramUniformMatrix2x4dv"/>
>+            <command name="glProgramUniformMatrix4x2dv"/>
>+            <command name="glProgramUniformMatrix3x4dv"/>
>+            <command name="glProgramUniformMatrix4x3dv"/>
>+            <command name="glValidateProgramPipeline"/>
>+            <command name="glGetProgramPipelineInfoLog"/>
>+        </require>
>+        <require comment="Reuse commands from ARB_shader_precision (none)">
>+        </require>
>+        <require comment="Reuse commands from ARB_vertex_attrib_64bit">
>+            <command name="glVertexAttribL1d"/>
>+            <command name="glVertexAttribL2d"/>
>+            <command name="glVertexAttribL3d"/>
>+            <command name="glVertexAttribL4d"/>
>+            <command name="glVertexAttribL1dv"/>
>+            <command name="glVertexAttribL2dv"/>
>+            <command name="glVertexAttribL3dv"/>
>+            <command name="glVertexAttribL4dv"/>
>+            <command name="glVertexAttribLPointer"/>
>+            <command name="glGetVertexAttribLdv"/>
>+        </require>
>+        <require comment="Reuse commands from ARB_viewport_array">
>+            <command name="glViewportArrayv"/>
>+            <command name="glViewportIndexedf"/>
>+            <command name="glViewportIndexedfv"/>
>+            <command name="glScissorArrayv"/>
>+            <command name="glScissorIndexed"/>
>+            <command name="glScissorIndexedv"/>
>+            <command name="glDepthRangeArrayv"/>
>+            <command name="glDepthRangeIndexed"/>
>+            <command name="glGetFloati_v"/>
>+            <command name="glGetDoublei_v"/>
>+        </require>
>+    </feature>
>+    <feature api="gl" name="GL_VERSION_4_2" number="4.2">
>+        <require comment="New aliases for old tokens">
>+            <enum name="GL_COPY_READ_BUFFER_BINDING"/>
>+            <enum name="GL_COPY_WRITE_BUFFER_BINDING"/>
>+            <enum name="GL_TRANSFORM_FEEDBACK_ACTIVE"/>
>+            <enum name="GL_TRANSFORM_FEEDBACK_PAUSED"/>
>+        </require>
>+        <require comment="Reuse tokens from ARB_base_instance (none)">
>+        </require>
>+        <require comment="Reuse tokens from ARB_shading_language_420pack (none)">
>+        </require>
>+        <require comment="Reuse tokens from ARB_transform_feedback_instanced (none)">
>+        </require>
>+        <require comment="Reuse tokens from ARB_compressed_texture_pixel_storage">
>+            <enum name="GL_UNPACK_COMPRESSED_BLOCK_WIDTH"/>
>+            <enum name="GL_UNPACK_COMPRESSED_BLOCK_HEIGHT"/>
>+            <enum name="GL_UNPACK_COMPRESSED_BLOCK_DEPTH"/>
>+            <enum name="GL_UNPACK_COMPRESSED_BLOCK_SIZE"/>
>+            <enum name="GL_PACK_COMPRESSED_BLOCK_WIDTH"/>
>+            <enum name="GL_PACK_COMPRESSED_BLOCK_HEIGHT"/>
>+            <enum name="GL_PACK_COMPRESSED_BLOCK_DEPTH"/>
>+            <enum name="GL_PACK_COMPRESSED_BLOCK_SIZE"/>
>+        </require>
>+        <require comment="Reuse tokens from ARB_conservative_depth (none)">
>+        </require>
>+        <require comment="Reuse tokens from ARB_internalformat_query">
>+            <enum name="GL_NUM_SAMPLE_COUNTS"/>
>+        </require>
>+        <require comment="Reuse tokens from ARB_map_buffer_alignment">
>+            <enum name="GL_MIN_MAP_BUFFER_ALIGNMENT"/>
>+        </require>
>+        <require comment="Reuse tokens from ARB_shader_atomic_counters">
>+            <enum name="GL_ATOMIC_COUNTER_BUFFER"/>
>+            <enum name="GL_ATOMIC_COUNTER_BUFFER_BINDING"/>
>+            <enum name="GL_ATOMIC_COUNTER_BUFFER_START"/>
>+            <enum name="GL_ATOMIC_COUNTER_BUFFER_SIZE"/>
>+            <enum name="GL_ATOMIC_COUNTER_BUFFER_DATA_SIZE"/>
>+            <enum name="GL_ATOMIC_COUNTER_BUFFER_ACTIVE_ATOMIC_COUNTERS"/>
>+            <enum name="GL_ATOMIC_COUNTER_BUFFER_ACTIVE_ATOMIC_COUNTER_INDICES"/>
>+            <enum name="GL_ATOMIC_COUNTER_BUFFER_REFERENCED_BY_VERTEX_SHADER"/>
>+            <enum name="GL_ATOMIC_COUNTER_BUFFER_REFERENCED_BY_TESS_CONTROL_SHADER"/>
>+            <enum name="GL_ATOMIC_COUNTER_BUFFER_REFERENCED_BY_TESS_EVALUATION_SHADER"/>
>+            <enum name="GL_ATOMIC_COUNTER_BUFFER_REFERENCED_BY_GEOMETRY_SHADER"/>
>+            <enum name="GL_ATOMIC_COUNTER_BUFFER_REFERENCED_BY_FRAGMENT_SHADER"/>
>+            <enum name="GL_MAX_VERTEX_ATOMIC_COUNTER_BUFFERS"/>
>+            <enum name="GL_MAX_TESS_CONTROL_ATOMIC_COUNTER_BUFFERS"/>
>+            <enum name="GL_MAX_TESS_EVALUATION_ATOMIC_COUNTER_BUFFERS"/>
>+            <enum name="GL_MAX_GEOMETRY_ATOMIC_COUNTER_BUFFERS"/>
>+            <enum name="GL_MAX_FRAGMENT_ATOMIC_COUNTER_BUFFERS"/>
>+            <enum name="GL_MAX_COMBINED_ATOMIC_COUNTER_BUFFERS"/>
>+            <enum name="GL_MAX_VERTEX_ATOMIC_COUNTERS"/>
>+            <enum name="GL_MAX_TESS_CONTROL_ATOMIC_COUNTERS"/>
>+            <enum name="GL_MAX_TESS_EVALUATION_ATOMIC_COUNTERS"/>
>+            <enum name="GL_MAX_GEOMETRY_ATOMIC_COUNTERS"/>
>+            <enum name="GL_MAX_FRAGMENT_ATOMIC_COUNTERS"/>
>+            <enum name="GL_MAX_COMBINED_ATOMIC_COUNTERS"/>
>+            <enum name="GL_MAX_ATOMIC_COUNTER_BUFFER_SIZE"/>
>+            <enum name="GL_MAX_ATOMIC_COUNTER_BUFFER_BINDINGS"/>
>+            <enum name="GL_ACTIVE_ATOMIC_COUNTER_BUFFERS"/>
>+            <enum name="GL_UNIFORM_ATOMIC_COUNTER_BUFFER_INDEX"/>
>+            <enum name="GL_UNSIGNED_INT_ATOMIC_COUNTER"/>
>+        </require>
>+        <require comment="Reuse tokens from ARB_shader_image_load_store">
>+            <enum name="GL_VERTEX_ATTRIB_ARRAY_BARRIER_BIT"/>
>+            <enum name="GL_ELEMENT_ARRAY_BARRIER_BIT"/>
>+            <enum name="GL_UNIFORM_BARRIER_BIT"/>
>+            <enum name="GL_TEXTURE_FETCH_BARRIER_BIT"/>
>+            <enum name="GL_SHADER_IMAGE_ACCESS_BARRIER_BIT"/>
>+            <enum name="GL_COMMAND_BARRIER_BIT"/>
>+            <enum name="GL_PIXEL_BUFFER_BARRIER_BIT"/>
>+            <enum name="GL_TEXTURE_UPDATE_BARRIER_BIT"/>
>+            <enum name="GL_BUFFER_UPDATE_BARRIER_BIT"/>
>+            <enum name="GL_FRAMEBUFFER_BARRIER_BIT"/>
>+            <enum name="GL_TRANSFORM_FEEDBACK_BARRIER_BIT"/>
>+            <enum name="GL_ATOMIC_COUNTER_BARRIER_BIT"/>
>+            <enum name="GL_ALL_BARRIER_BITS"/>
>+            <enum name="GL_MAX_IMAGE_UNITS"/>
>+            <enum name="GL_MAX_COMBINED_IMAGE_UNITS_AND_FRAGMENT_OUTPUTS"/>
>+            <enum name="GL_IMAGE_BINDING_NAME"/>
>+            <enum name="GL_IMAGE_BINDING_LEVEL"/>
>+            <enum name="GL_IMAGE_BINDING_LAYERED"/>
>+            <enum name="GL_IMAGE_BINDING_LAYER"/>
>+            <enum name="GL_IMAGE_BINDING_ACCESS"/>
>+            <enum name="GL_IMAGE_1D"/>
>+            <enum name="GL_IMAGE_2D"/>
>+            <enum name="GL_IMAGE_3D"/>
>+            <enum name="GL_IMAGE_2D_RECT"/>
>+            <enum name="GL_IMAGE_CUBE"/>
>+            <enum name="GL_IMAGE_BUFFER"/>
>+            <enum name="GL_IMAGE_1D_ARRAY"/>
>+            <enum name="GL_IMAGE_2D_ARRAY"/>
>+            <enum name="GL_IMAGE_CUBE_MAP_ARRAY"/>
>+            <enum name="GL_IMAGE_2D_MULTISAMPLE"/>
>+            <enum name="GL_IMAGE_2D_MULTISAMPLE_ARRAY"/>
>+            <enum name="GL_INT_IMAGE_1D"/>
>+            <enum name="GL_INT_IMAGE_2D"/>
>+            <enum name="GL_INT_IMAGE_3D"/>
>+            <enum name="GL_INT_IMAGE_2D_RECT"/>
>+            <enum name="GL_INT_IMAGE_CUBE"/>
>+            <enum name="GL_INT_IMAGE_BUFFER"/>
>+            <enum name="GL_INT_IMAGE_1D_ARRAY"/>
>+            <enum name="GL_INT_IMAGE_2D_ARRAY"/>
>+            <enum name="GL_INT_IMAGE_CUBE_MAP_ARRAY"/>
>+            <enum name="GL_INT_IMAGE_2D_MULTISAMPLE"/>
>+            <enum name="GL_INT_IMAGE_2D_MULTISAMPLE_ARRAY"/>
>+            <enum name="GL_UNSIGNED_INT_IMAGE_1D"/>
>+            <enum name="GL_UNSIGNED_INT_IMAGE_2D"/>
>+            <enum name="GL_UNSIGNED_INT_IMAGE_3D"/>
>+            <enum name="GL_UNSIGNED_INT_IMAGE_2D_RECT"/>
>+            <enum name="GL_UNSIGNED_INT_IMAGE_CUBE"/>
>+            <enum name="GL_UNSIGNED_INT_IMAGE_BUFFER"/>
>+            <enum name="GL_UNSIGNED_INT_IMAGE_1D_ARRAY"/>
>+            <enum name="GL_UNSIGNED_INT_IMAGE_2D_ARRAY"/>
>+            <enum name="GL_UNSIGNED_INT_IMAGE_CUBE_MAP_ARRAY"/>
>+            <enum name="GL_UNSIGNED_INT_IMAGE_2D_MULTISAMPLE"/>
>+            <enum name="GL_UNSIGNED_INT_IMAGE_2D_MULTISAMPLE_ARRAY"/>
>+            <enum name="GL_MAX_IMAGE_SAMPLES"/>
>+            <enum name="GL_IMAGE_BINDING_FORMAT"/>
>+            <enum name="GL_IMAGE_FORMAT_COMPATIBILITY_TYPE"/>
>+            <enum name="GL_IMAGE_FORMAT_COMPATIBILITY_BY_SIZE"/>
>+            <enum name="GL_IMAGE_FORMAT_COMPATIBILITY_BY_CLASS"/>
>+            <enum name="GL_MAX_VERTEX_IMAGE_UNIFORMS"/>
>+            <enum name="GL_MAX_TESS_CONTROL_IMAGE_UNIFORMS"/>
>+            <enum name="GL_MAX_TESS_EVALUATION_IMAGE_UNIFORMS"/>
>+            <enum name="GL_MAX_GEOMETRY_IMAGE_UNIFORMS"/>
>+            <enum name="GL_MAX_FRAGMENT_IMAGE_UNIFORMS"/>
>+            <enum name="GL_MAX_COMBINED_IMAGE_UNIFORMS"/>
>+        </require>
>+        <require comment="Reuse tokens from ARB_shading_language_packing (none)">
>+        </require>
>+        <require comment="Reuse tokens from ARB_texture_compression_bptc">
>+            <enum name="GL_COMPRESSED_RGBA_BPTC_UNORM"/>
>+            <enum name="GL_COMPRESSED_SRGB_ALPHA_BPTC_UNORM"/>
>+            <enum name="GL_COMPRESSED_RGB_BPTC_SIGNED_FLOAT"/>
>+            <enum name="GL_COMPRESSED_RGB_BPTC_UNSIGNED_FLOAT"/>
>+        </require>
>+        <require comment="Reuse tokens from ARB_texture_storage">
>+            <enum name="GL_TEXTURE_IMMUTABLE_FORMAT"/>
>+        </require>
>+        <require comment="Reuse commands from ARB_base_instance">
>+            <command name="glDrawArraysInstancedBaseInstance"/>
>+            <command name="glDrawElementsInstancedBaseInstance"/>
>+            <command name="glDrawElementsInstancedBaseVertexBaseInstance"/>
>+        </require>
>+        <require comment="Reuse commands from ARB_compressed_texture_pixel_storage (none)">
>+        </require>
>+        <require comment="Reuse commands from ARB_conservative_depth (none)">
>+        </require>
>+        <require comment="Reuse commands from ARB_internalformat_query">
>+            <command name="glGetInternalformativ"/>
>+        </require>
>+        <require comment="Reuse commands from ARB_map_buffer_alignment (none)">
>+        </require>
>+        <require comment="Reuse commands from ARB_shader_atomic_counters">
>+            <command name="glGetActiveAtomicCounterBufferiv"/>
>+        </require>
>+        <require comment="Reuse commands from ARB_shader_image_load_store">
>+            <command name="glBindImageTexture"/>
>+            <command name="glMemoryBarrier"/>
>+        </require>
>+        <require comment="Reuse commands from ARB_shading_language_420pack (none)">
>+        </require>
>+        <require comment="Reuse commands from ARB_shading_language_packing (none)">
>+        </require>
>+        <require comment="Reuse commands from ARB_texture_storage">
>+            <command name="glTexStorage1D"/>
>+            <command name="glTexStorage2D"/>
>+            <command name="glTexStorage3D"/>
>+        </require>
>+        <require comment="Reuse commands from ARB_transform_feedback_instanced">
>+            <command name="glDrawTransformFeedbackInstanced"/>
>+            <command name="glDrawTransformFeedbackStreamInstanced"/>
>+        </require>
>+        
>+    </feature>
>+    <feature api="gl" name="GL_VERSION_4_3" number="4.3">
>+        <require>
>+            <enum name="GL_NUM_SHADING_LANGUAGE_VERSIONS"/>
>+            <enum name="GL_VERTEX_ATTRIB_ARRAY_LONG"/>
>+        </require>
>+        <require comment="Reuse tokens from ARB_arrays_of_arrays (none, GLSL only)">
>+        </require>
>+        <require comment="Reuse tokens from ARB_fragment_layer_viewport (none, GLSL only)">
>+        </require>
>+        <require comment="Reuse tokens from ARB_shader_image_size (none, GLSL only)">
>+        </require>
>+        <require comment="Reuse tokens from ARB_ES3_compatibility">
>+            <enum name="GL_COMPRESSED_RGB8_ETC2"/>
>+            <enum name="GL_COMPRESSED_SRGB8_ETC2"/>
>+            <enum name="GL_COMPRESSED_RGB8_PUNCHTHROUGH_ALPHA1_ETC2"/>
>+            <enum name="GL_COMPRESSED_SRGB8_PUNCHTHROUGH_ALPHA1_ETC2"/>
>+            <enum name="GL_COMPRESSED_RGBA8_ETC2_EAC"/>
>+            <enum name="GL_COMPRESSED_SRGB8_ALPHA8_ETC2_EAC"/>
>+            <enum name="GL_COMPRESSED_R11_EAC"/>
>+            <enum name="GL_COMPRESSED_SIGNED_R11_EAC"/>
>+            <enum name="GL_COMPRESSED_RG11_EAC"/>
>+            <enum name="GL_COMPRESSED_SIGNED_RG11_EAC"/>
>+            <enum name="GL_PRIMITIVE_RESTART_FIXED_INDEX"/>
>+            <enum name="GL_ANY_SAMPLES_PASSED_CONSERVATIVE"/>
>+            <enum name="GL_MAX_ELEMENT_INDEX"/>
>+        </require>
>+        <require comment="Reuse tokens from ARB_clear_buffer_object (none)">
>+        </require>
>+        <require comment="Reuse tokens from ARB_compute_shader">
>+            <enum name="GL_COMPUTE_SHADER"/>
>+            <enum name="GL_MAX_COMPUTE_UNIFORM_BLOCKS"/>
>+            <enum name="GL_MAX_COMPUTE_TEXTURE_IMAGE_UNITS"/>
>+            <enum name="GL_MAX_COMPUTE_IMAGE_UNIFORMS"/>
>+            <enum name="GL_MAX_COMPUTE_SHARED_MEMORY_SIZE"/>
>+            <enum name="GL_MAX_COMPUTE_UNIFORM_COMPONENTS"/>
>+            <enum name="GL_MAX_COMPUTE_ATOMIC_COUNTER_BUFFERS"/>
>+            <enum name="GL_MAX_COMPUTE_ATOMIC_COUNTERS"/>
>+            <enum name="GL_MAX_COMBINED_COMPUTE_UNIFORM_COMPONENTS"/>
>+            <enum name="GL_MAX_COMPUTE_WORK_GROUP_INVOCATIONS"/>
>+            <enum name="GL_MAX_COMPUTE_WORK_GROUP_COUNT"/>
>+            <enum name="GL_MAX_COMPUTE_WORK_GROUP_SIZE"/>
>+            <enum name="GL_COMPUTE_WORK_GROUP_SIZE"/>
>+            <enum name="GL_UNIFORM_BLOCK_REFERENCED_BY_COMPUTE_SHADER"/>
>+            <enum name="GL_ATOMIC_COUNTER_BUFFER_REFERENCED_BY_COMPUTE_SHADER"/>
>+            <enum name="GL_DISPATCH_INDIRECT_BUFFER"/>
>+            <enum name="GL_DISPATCH_INDIRECT_BUFFER_BINDING"/>
>+            <enum name="GL_COMPUTE_SHADER_BIT"/>
>+        </require>
>+        <require comment="Reuse tokens from ARB_copy_image (none)">
>+        </require>
>+        <require comment="Reuse tokens from KHR_debug">
>+            <enum name="GL_DEBUG_OUTPUT_SYNCHRONOUS"/>
>+            <enum name="GL_DEBUG_NEXT_LOGGED_MESSAGE_LENGTH"/>
>+            <enum name="GL_DEBUG_CALLBACK_FUNCTION"/>
>+            <enum name="GL_DEBUG_CALLBACK_USER_PARAM"/>
>+            <enum name="GL_DEBUG_SOURCE_API"/>
>+            <enum name="GL_DEBUG_SOURCE_WINDOW_SYSTEM"/>
>+            <enum name="GL_DEBUG_SOURCE_SHADER_COMPILER"/>
>+            <enum name="GL_DEBUG_SOURCE_THIRD_PARTY"/>
>+            <enum name="GL_DEBUG_SOURCE_APPLICATION"/>
>+            <enum name="GL_DEBUG_SOURCE_OTHER"/>
>+            <enum name="GL_DEBUG_TYPE_ERROR"/>
>+            <enum name="GL_DEBUG_TYPE_DEPRECATED_BEHAVIOR"/>
>+            <enum name="GL_DEBUG_TYPE_UNDEFINED_BEHAVIOR"/>
>+            <enum name="GL_DEBUG_TYPE_PORTABILITY"/>
>+            <enum name="GL_DEBUG_TYPE_PERFORMANCE"/>
>+            <enum name="GL_DEBUG_TYPE_OTHER"/>
>+            <enum name="GL_MAX_DEBUG_MESSAGE_LENGTH"/>
>+            <enum name="GL_MAX_DEBUG_LOGGED_MESSAGES"/>
>+            <enum name="GL_DEBUG_LOGGED_MESSAGES"/>
>+            <enum name="GL_DEBUG_SEVERITY_HIGH"/>
>+            <enum name="GL_DEBUG_SEVERITY_MEDIUM"/>
>+            <enum name="GL_DEBUG_SEVERITY_LOW"/>
>+            <enum name="GL_DEBUG_TYPE_MARKER"/>
>+            <enum name="GL_DEBUG_TYPE_PUSH_GROUP"/>
>+            <enum name="GL_DEBUG_TYPE_POP_GROUP"/>
>+            <enum name="GL_DEBUG_SEVERITY_NOTIFICATION"/>
>+            <enum name="GL_MAX_DEBUG_GROUP_STACK_DEPTH"/>
>+            <enum name="GL_DEBUG_GROUP_STACK_DEPTH"/>
>+            <enum name="GL_BUFFER"/>
>+            <enum name="GL_SHADER"/>
>+            <enum name="GL_PROGRAM"/>
>+            <enum name="GL_VERTEX_ARRAY"/>
>+            <enum name="GL_QUERY"/>
>+            <enum name="GL_PROGRAM_PIPELINE"/>
>+            <enum name="GL_SAMPLER"/>
>+            <enum name="GL_MAX_LABEL_LENGTH"/>
>+            <enum name="GL_DEBUG_OUTPUT"/>
>+            <enum name="GL_CONTEXT_FLAG_DEBUG_BIT"/>
>+        </require>
>+        <require comment="Reuse tokens from ARB_explicit_uniform_location">
>+            <enum name="GL_MAX_UNIFORM_LOCATIONS"/>
>+        </require>
>+        <require comment="Reuse tokens from ARB_framebuffer_no_attachments">
>+            <enum name="GL_FRAMEBUFFER_DEFAULT_WIDTH"/>
>+            <enum name="GL_FRAMEBUFFER_DEFAULT_HEIGHT"/>
>+            <enum name="GL_FRAMEBUFFER_DEFAULT_LAYERS"/>
>+            <enum name="GL_FRAMEBUFFER_DEFAULT_SAMPLES"/>
>+            <enum name="GL_FRAMEBUFFER_DEFAULT_FIXED_SAMPLE_LOCATIONS"/>
>+            <enum name="GL_MAX_FRAMEBUFFER_WIDTH"/>
>+            <enum name="GL_MAX_FRAMEBUFFER_HEIGHT"/>
>+            <enum name="GL_MAX_FRAMEBUFFER_LAYERS"/>
>+            <enum name="GL_MAX_FRAMEBUFFER_SAMPLES"/>
>+        </require>
>+        <require comment="Reuse tokens from ARB_internalformat_query2">
>+            <enum name="GL_INTERNALFORMAT_SUPPORTED"/>
>+            <enum name="GL_INTERNALFORMAT_PREFERRED"/>
>+            <enum name="GL_INTERNALFORMAT_RED_SIZE"/>
>+            <enum name="GL_INTERNALFORMAT_GREEN_SIZE"/>
>+            <enum name="GL_INTERNALFORMAT_BLUE_SIZE"/>
>+            <enum name="GL_INTERNALFORMAT_ALPHA_SIZE"/>
>+            <enum name="GL_INTERNALFORMAT_DEPTH_SIZE"/>
>+            <enum name="GL_INTERNALFORMAT_STENCIL_SIZE"/>
>+            <enum name="GL_INTERNALFORMAT_SHARED_SIZE"/>
>+            <enum name="GL_INTERNALFORMAT_RED_TYPE"/>
>+            <enum name="GL_INTERNALFORMAT_GREEN_TYPE"/>
>+            <enum name="GL_INTERNALFORMAT_BLUE_TYPE"/>
>+            <enum name="GL_INTERNALFORMAT_ALPHA_TYPE"/>
>+            <enum name="GL_INTERNALFORMAT_DEPTH_TYPE"/>
>+            <enum name="GL_INTERNALFORMAT_STENCIL_TYPE"/>
>+            <enum name="GL_MAX_WIDTH"/>
>+            <enum name="GL_MAX_HEIGHT"/>
>+            <enum name="GL_MAX_DEPTH"/>
>+            <enum name="GL_MAX_LAYERS"/>
>+            <enum name="GL_MAX_COMBINED_DIMENSIONS"/>
>+            <enum name="GL_COLOR_COMPONENTS"/>
>+            <enum name="GL_DEPTH_COMPONENTS"/>
>+            <enum name="GL_STENCIL_COMPONENTS"/>
>+            <enum name="GL_COLOR_RENDERABLE"/>
>+            <enum name="GL_DEPTH_RENDERABLE"/>
>+            <enum name="GL_STENCIL_RENDERABLE"/>
>+            <enum name="GL_FRAMEBUFFER_RENDERABLE"/>
>+            <enum name="GL_FRAMEBUFFER_RENDERABLE_LAYERED"/>
>+            <enum name="GL_FRAMEBUFFER_BLEND"/>
>+            <enum name="GL_READ_PIXELS"/>
>+            <enum name="GL_READ_PIXELS_FORMAT"/>
>+            <enum name="GL_READ_PIXELS_TYPE"/>
>+            <enum name="GL_TEXTURE_IMAGE_FORMAT"/>
>+            <enum name="GL_TEXTURE_IMAGE_TYPE"/>
>+            <enum name="GL_GET_TEXTURE_IMAGE_FORMAT"/>
>+            <enum name="GL_GET_TEXTURE_IMAGE_TYPE"/>
>+            <enum name="GL_MIPMAP"/>
>+            <enum name="GL_MANUAL_GENERATE_MIPMAP"/>
>+            <enum name="GL_AUTO_GENERATE_MIPMAP"/>
>+            <enum name="GL_COLOR_ENCODING"/>
>+            <enum name="GL_SRGB_READ"/>
>+            <enum name="GL_SRGB_WRITE"/>
>+            <enum name="GL_FILTER"/>
>+            <enum name="GL_VERTEX_TEXTURE"/>
>+            <enum name="GL_TESS_CONTROL_TEXTURE"/>
>+            <enum name="GL_TESS_EVALUATION_TEXTURE"/>
>+            <enum name="GL_GEOMETRY_TEXTURE"/>
>+            <enum name="GL_FRAGMENT_TEXTURE"/>
>+            <enum name="GL_COMPUTE_TEXTURE"/>
>+            <enum name="GL_TEXTURE_SHADOW"/>
>+            <enum name="GL_TEXTURE_GATHER"/>
>+            <enum name="GL_TEXTURE_GATHER_SHADOW"/>
>+            <enum name="GL_SHADER_IMAGE_LOAD"/>
>+            <enum name="GL_SHADER_IMAGE_STORE"/>
>+            <enum name="GL_SHADER_IMAGE_ATOMIC"/>
>+            <enum name="GL_IMAGE_TEXEL_SIZE"/>
>+            <enum name="GL_IMAGE_COMPATIBILITY_CLASS"/>
>+            <enum name="GL_IMAGE_PIXEL_FORMAT"/>
>+            <enum name="GL_IMAGE_PIXEL_TYPE"/>
>+            <enum name="GL_SIMULTANEOUS_TEXTURE_AND_DEPTH_TEST"/>
>+            <enum name="GL_SIMULTANEOUS_TEXTURE_AND_STENCIL_TEST"/>
>+            <enum name="GL_SIMULTANEOUS_TEXTURE_AND_DEPTH_WRITE"/>
>+            <enum name="GL_SIMULTANEOUS_TEXTURE_AND_STENCIL_WRITE"/>
>+            <enum name="GL_TEXTURE_COMPRESSED_BLOCK_WIDTH"/>
>+            <enum name="GL_TEXTURE_COMPRESSED_BLOCK_HEIGHT"/>
>+            <enum name="GL_TEXTURE_COMPRESSED_BLOCK_SIZE"/>
>+            <enum name="GL_CLEAR_BUFFER"/>
>+            <enum name="GL_TEXTURE_VIEW"/>
>+            <enum name="GL_VIEW_COMPATIBILITY_CLASS"/>
>+            <enum name="GL_FULL_SUPPORT"/>
>+            <enum name="GL_CAVEAT_SUPPORT"/>
>+            <enum name="GL_IMAGE_CLASS_4_X_32"/>
>+            <enum name="GL_IMAGE_CLASS_2_X_32"/>
>+            <enum name="GL_IMAGE_CLASS_1_X_32"/>
>+            <enum name="GL_IMAGE_CLASS_4_X_16"/>
>+            <enum name="GL_IMAGE_CLASS_2_X_16"/>
>+            <enum name="GL_IMAGE_CLASS_1_X_16"/>
>+            <enum name="GL_IMAGE_CLASS_4_X_8"/>
>+            <enum name="GL_IMAGE_CLASS_2_X_8"/>
>+            <enum name="GL_IMAGE_CLASS_1_X_8"/>
>+            <enum name="GL_IMAGE_CLASS_11_11_10"/>
>+            <enum name="GL_IMAGE_CLASS_10_10_10_2"/>
>+            <enum name="GL_VIEW_CLASS_128_BITS"/>
>+            <enum name="GL_VIEW_CLASS_96_BITS"/>
>+            <enum name="GL_VIEW_CLASS_64_BITS"/>
>+            <enum name="GL_VIEW_CLASS_48_BITS"/>
>+            <enum name="GL_VIEW_CLASS_32_BITS"/>
>+            <enum name="GL_VIEW_CLASS_24_BITS"/>
>+            <enum name="GL_VIEW_CLASS_16_BITS"/>
>+            <enum name="GL_VIEW_CLASS_8_BITS"/>
>+            <enum name="GL_VIEW_CLASS_S3TC_DXT1_RGB"/>
>+            <enum name="GL_VIEW_CLASS_S3TC_DXT1_RGBA"/>
>+            <enum name="GL_VIEW_CLASS_S3TC_DXT3_RGBA"/>
>+            <enum name="GL_VIEW_CLASS_S3TC_DXT5_RGBA"/>
>+            <enum name="GL_VIEW_CLASS_RGTC1_RED"/>
>+            <enum name="GL_VIEW_CLASS_RGTC2_RG"/>
>+            <enum name="GL_VIEW_CLASS_BPTC_UNORM"/>
>+            <enum name="GL_VIEW_CLASS_BPTC_FLOAT"/>
>+        </require>
>+        <require comment="Reuse tokens from ARB_invalidate_subdata (none)">
>+        </require>
>+        <require comment="Reuse tokens from ARB_multi_draw_indirect (none)">
>+        </require>
>+        <require comment="Reuse tokens from ARB_program_interface_query">
>+            <enum name="GL_UNIFORM"/>
>+            <enum name="GL_UNIFORM_BLOCK"/>
>+            <enum name="GL_PROGRAM_INPUT"/>
>+            <enum name="GL_PROGRAM_OUTPUT"/>
>+            <enum name="GL_BUFFER_VARIABLE"/>
>+            <enum name="GL_SHADER_STORAGE_BLOCK"/>
>+            <enum name="GL_VERTEX_SUBROUTINE"/>
>+            <enum name="GL_TESS_CONTROL_SUBROUTINE"/>
>+            <enum name="GL_TESS_EVALUATION_SUBROUTINE"/>
>+            <enum name="GL_GEOMETRY_SUBROUTINE"/>
>+            <enum name="GL_FRAGMENT_SUBROUTINE"/>
>+            <enum name="GL_COMPUTE_SUBROUTINE"/>
>+            <enum name="GL_VERTEX_SUBROUTINE_UNIFORM"/>
>+            <enum name="GL_TESS_CONTROL_SUBROUTINE_UNIFORM"/>
>+            <enum name="GL_TESS_EVALUATION_SUBROUTINE_UNIFORM"/>
>+            <enum name="GL_GEOMETRY_SUBROUTINE_UNIFORM"/>
>+            <enum name="GL_FRAGMENT_SUBROUTINE_UNIFORM"/>
>+            <enum name="GL_COMPUTE_SUBROUTINE_UNIFORM"/>
>+            <enum name="GL_TRANSFORM_FEEDBACK_VARYING"/>
>+            <enum name="GL_ACTIVE_RESOURCES"/>
>+            <enum name="GL_MAX_NAME_LENGTH"/>
>+            <enum name="GL_MAX_NUM_ACTIVE_VARIABLES"/>
>+            <enum name="GL_MAX_NUM_COMPATIBLE_SUBROUTINES"/>
>+            <enum name="GL_NAME_LENGTH"/>
>+            <enum name="GL_TYPE"/>
>+            <enum name="GL_ARRAY_SIZE"/>
>+            <enum name="GL_OFFSET"/>
>+            <enum name="GL_BLOCK_INDEX"/>
>+            <enum name="GL_ARRAY_STRIDE"/>
>+            <enum name="GL_MATRIX_STRIDE"/>
>+            <enum name="GL_IS_ROW_MAJOR"/>
>+            <enum name="GL_ATOMIC_COUNTER_BUFFER_INDEX"/>
>+            <enum name="GL_BUFFER_BINDING"/>
>+            <enum name="GL_BUFFER_DATA_SIZE"/>
>+            <enum name="GL_NUM_ACTIVE_VARIABLES"/>
>+            <enum name="GL_ACTIVE_VARIABLES"/>
>+            <enum name="GL_REFERENCED_BY_VERTEX_SHADER"/>
>+            <enum name="GL_REFERENCED_BY_TESS_CONTROL_SHADER"/>
>+            <enum name="GL_REFERENCED_BY_TESS_EVALUATION_SHADER"/>
>+            <enum name="GL_REFERENCED_BY_GEOMETRY_SHADER"/>
>+            <enum name="GL_REFERENCED_BY_FRAGMENT_SHADER"/>
>+            <enum name="GL_REFERENCED_BY_COMPUTE_SHADER"/>
>+            <enum name="GL_TOP_LEVEL_ARRAY_SIZE"/>
>+            <enum name="GL_TOP_LEVEL_ARRAY_STRIDE"/>
>+            <enum name="GL_LOCATION"/>
>+            <enum name="GL_LOCATION_INDEX"/>
>+            <enum name="GL_IS_PER_PATCH"/>
>+        </require>
>+        <require comment="Reuse tokens from ARB_robust_buffer_access_behavior (none)">
>+        </require>
>+        <require comment="Reuse tokens from ARB_shader_storage_buffer_object">
>+            <enum name="GL_SHADER_STORAGE_BUFFER"/>
>+            <enum name="GL_SHADER_STORAGE_BUFFER_BINDING"/>
>+            <enum name="GL_SHADER_STORAGE_BUFFER_START"/>
>+            <enum name="GL_SHADER_STORAGE_BUFFER_SIZE"/>
>+            <enum name="GL_MAX_VERTEX_SHADER_STORAGE_BLOCKS"/>
>+            <enum name="GL_MAX_GEOMETRY_SHADER_STORAGE_BLOCKS"/>
>+            <enum name="GL_MAX_TESS_CONTROL_SHADER_STORAGE_BLOCKS"/>
>+            <enum name="GL_MAX_TESS_EVALUATION_SHADER_STORAGE_BLOCKS"/>
>+            <enum name="GL_MAX_FRAGMENT_SHADER_STORAGE_BLOCKS"/>
>+            <enum name="GL_MAX_COMPUTE_SHADER_STORAGE_BLOCKS"/>
>+            <enum name="GL_MAX_COMBINED_SHADER_STORAGE_BLOCKS"/>
>+            <enum name="GL_MAX_SHADER_STORAGE_BUFFER_BINDINGS"/>
>+            <enum name="GL_MAX_SHADER_STORAGE_BLOCK_SIZE"/>
>+            <enum name="GL_SHADER_STORAGE_BUFFER_OFFSET_ALIGNMENT"/>
>+            <enum name="GL_SHADER_STORAGE_BARRIER_BIT"/>
>+            <enum name="GL_MAX_COMBINED_SHADER_OUTPUT_RESOURCES"/>
>+        </require>
>+        <require comment="Reuse tokens from ARB_stencil_texturing">
>+            <enum name="GL_DEPTH_STENCIL_TEXTURE_MODE"/>
>+        </require>
>+        <require comment="Reuse tokens from ARB_texture_buffer_range">
>+            <enum name="GL_TEXTURE_BUFFER_OFFSET"/>
>+            <enum name="GL_TEXTURE_BUFFER_SIZE"/>
>+            <enum name="GL_TEXTURE_BUFFER_OFFSET_ALIGNMENT"/>
>+        </require>
>+        <require comment="Reuse tokens from ARB_texture_query_levels (none)">
>+        </require>
>+        <require comment="Reuse tokens from ARB_texture_storage_multisample (none)">
>+        </require>
>+        <require comment="Reuse tokens from ARB_texture_view">
>+            <enum name="GL_TEXTURE_VIEW_MIN_LEVEL"/>
>+            <enum name="GL_TEXTURE_VIEW_NUM_LEVELS"/>
>+            <enum name="GL_TEXTURE_VIEW_MIN_LAYER"/>
>+            <enum name="GL_TEXTURE_VIEW_NUM_LAYERS"/>
>+            <enum name="GL_TEXTURE_IMMUTABLE_LEVELS"/>
>+        </require>
>+        <require comment="Reuse tokens from ARB_vertex_attrib_binding">
>+            <enum name="GL_VERTEX_ATTRIB_BINDING"/>
>+            <enum name="GL_VERTEX_ATTRIB_RELATIVE_OFFSET"/>
>+            <enum name="GL_VERTEX_BINDING_DIVISOR"/>
>+            <enum name="GL_VERTEX_BINDING_OFFSET"/>
>+            <enum name="GL_VERTEX_BINDING_STRIDE"/>
>+            <enum name="GL_MAX_VERTEX_ATTRIB_RELATIVE_OFFSET"/>
>+            <enum name="GL_MAX_VERTEX_ATTRIB_BINDINGS"/>
>+            <enum name="GL_VERTEX_BINDING_BUFFER" comment="Added in 2013/10/22 update to the spec"/>
>+        </require>
>+        <require comment="Reuse commands from ARB_arrays_of_arrays (none, GLSL only)">
>+        </require>
>+        <require comment="Reuse commands from ARB_clear_buffer_object">
>+            <command name="glClearBufferData"/>
>+            <command name="glClearBufferSubData"/>
>+        </require>
>+        <require comment="Reuse commands from ARB_compute_shader">
>+            <command name="glDispatchCompute"/>
>+            <command name="glDispatchComputeIndirect"/>
>+        </require>
>+        <require comment="Reuse commands from ARB_copy_image">
>+            <command name="glCopyImageSubData"/>
>+        </require>
>+        <require comment="Reuse commands from ARB_ES3_compatibility (none)">
>+        </require>
>+        <require comment="Reuse commands from ARB_explicit_uniform_location (none)">
>+        </require>
>+        <require comment="Reuse commands from ARB_fragment_layer_viewport (none, GLSL only)">
>+        </require>
>+        <require comment="Reuse commands from ARB_framebuffer_no_attachments">
>+            <command name="glFramebufferParameteri"/>
>+            <command name="glGetFramebufferParameteriv"/>
>+        </require>
>+        <require comment="Reuse commands from ARB_internalformat_query2">
>+            <command name="glGetInternalformati64v"/>
>+        </require>
>+        <require comment="Reuse commands from ARB_invalidate_subdata">
>+            <command name="glInvalidateTexSubImage"/>
>+            <command name="glInvalidateTexImage"/>
>+            <command name="glInvalidateBufferSubData"/>
>+            <command name="glInvalidateBufferData"/>
>+            <command name="glInvalidateFramebuffer"/>
>+            <command name="glInvalidateSubFramebuffer"/>
>+        </require>
>+        <require comment="Reuse commands from ARB_multi_draw_indirect">
>+            <command name="glMultiDrawArraysIndirect"/>
>+            <command name="glMultiDrawElementsIndirect"/>
>+        </require>
>+        <require comment="Reuse commands from ARB_program_interface_query">
>+            <command name="glGetProgramInterfaceiv"/>
>+            <command name="glGetProgramResourceIndex"/>
>+            <command name="glGetProgramResourceName"/>
>+            <command name="glGetProgramResourceiv"/>
>+            <command name="glGetProgramResourceLocation"/>
>+            <command name="glGetProgramResourceLocationIndex"/>
>+        </require>
>+        <require comment="Reuse commands from ARB_robust_buffer_access_behavior (none)">
>+        </require>
>+        <require comment="Reuse commands from ARB_shader_image_size (none, GLSL only)">
>+        </require>
>+        <require comment="Reuse commands from ARB_shader_storage_buffer_object">
>+            <command name="glShaderStorageBlockBinding"/>
>+        </require>
>+        <require comment="Reuse commands from ARB_stencil_texturing (none)">
>+        </require>
>+        <require comment="Reuse commands from ARB_texture_buffer_range">
>+            <command name="glTexBufferRange"/>
>+        </require>
>+        <require comment="Reuse commands from ARB_texture_query_levels (none)">
>+        </require>
>+        <require comment="Reuse commands from ARB_texture_storage_multisample">
>+            <command name="glTexStorage2DMultisample"/>
>+            <command name="glTexStorage3DMultisample"/>
>+        </require>
>+        <require comment="Reuse commands from ARB_texture_view">
>+            <command name="glTextureView"/>
>+        </require>
>+        <require comment="Reuse commands from ARB_vertex_attrib_binding">
>+            <command name="glBindVertexBuffer"/>
>+            <command name="glVertexAttribFormat"/>
>+            <command name="glVertexAttribIFormat"/>
>+            <command name="glVertexAttribLFormat"/>
>+            <command name="glVertexAttribBinding"/>
>+            <command name="glVertexBindingDivisor"/>
>+        </require>
>+        <require comment="Reuse commands from KHR_debug (includes ARB_debug_output commands promoted to KHR without suffixes)">
>+            <command name="glDebugMessageControl"/>
>+            <command name="glDebugMessageInsert"/>
>+            <command name="glDebugMessageCallback"/>
>+            <command name="glGetDebugMessageLog"/>
>+            <command name="glPushDebugGroup"/>
>+            <command name="glPopDebugGroup"/>
>+            <command name="glObjectLabel"/>
>+            <command name="glGetObjectLabel"/>
>+            <command name="glObjectPtrLabel"/>
>+            <command name="glGetObjectPtrLabel"/>
>+            <command name="glGetPointerv"/>
>+        </require>
>+        <require profile="compatibility" comment="KHR_debug functionality not supported in core profile">
>+            <enum name="GL_DISPLAY_LIST"/>
>+        </require>
>+        <require profile="core" comment="Restore functionality removed in GL 3.2 core to GL 4.3. Needed for debug interface.">
>+            <enum name="GL_STACK_UNDERFLOW"/>
>+            <enum name="GL_STACK_OVERFLOW"/>
>+        </require>
>+        
>+    </feature>
>+    <feature api="gl" name="GL_VERSION_4_4" number="4.4">
>+        <require>
>+            <enum name="GL_MAX_VERTEX_ATTRIB_STRIDE"/>
>+            <enum name="GL_PRIMITIVE_RESTART_FOR_PATCHES_SUPPORTED"/>
>+            <enum name="GL_TEXTURE_BUFFER_BINDING"/>
>+        </require>
>+        <require comment="Reuse GL_ARB_buffer_storage">
>+            <enum name="GL_MAP_READ_BIT"/>
>+            <enum name="GL_MAP_WRITE_BIT"/>
>+            <enum name="GL_MAP_PERSISTENT_BIT"/>
>+            <enum name="GL_MAP_COHERENT_BIT"/>
>+            <enum name="GL_DYNAMIC_STORAGE_BIT"/>
>+            <enum name="GL_CLIENT_STORAGE_BIT"/>
>+            <enum name="GL_CLIENT_MAPPED_BUFFER_BARRIER_BIT"/>
>+            <enum name="GL_BUFFER_IMMUTABLE_STORAGE"/>
>+            <enum name="GL_BUFFER_STORAGE_FLAGS"/>
>+            <command name="glBufferStorage"/>
>+        </require>
>+        <require comment="Reuse GL_ARB_clear_texture">
>+            <enum name="GL_CLEAR_TEXTURE"/>
>+            <command name="glClearTexImage"/>
>+            <command name="glClearTexSubImage"/>
>+        </require>
>+        <require comment="Reuse GL_ARB_enhanced_layouts">
>+            <enum name="GL_LOCATION_COMPONENT"/>
>+            <enum name="GL_TRANSFORM_FEEDBACK_BUFFER"/>
>+            <enum name="GL_TRANSFORM_FEEDBACK_BUFFER_INDEX"/>
>+            <enum name="GL_TRANSFORM_FEEDBACK_BUFFER_STRIDE"/>
>+        </require>
>+        <require comment="Reuse GL_ARB_multi_bind (none)">
>+            <command name="glBindBuffersBase"/>
>+            <command name="glBindBuffersRange"/>
>+            <command name="glBindTextures"/>
>+            <command name="glBindSamplers"/>
>+            <command name="glBindImageTextures"/>
>+            <command name="glBindVertexBuffers"/>
>+        </require>
>+        <require comment="Reuse GL_ARB_query_buffer_object">
>+            <enum name="GL_QUERY_BUFFER"/>
>+            <enum name="GL_QUERY_BUFFER_BARRIER_BIT"/>
>+            <enum name="GL_QUERY_BUFFER_BINDING"/>
>+            <enum name="GL_QUERY_RESULT_NO_WAIT"/>
>+        </require>
>+        <require comment="Reuse GL_ARB_texture_mirror_clamp_to_edge">
>+            <enum name="GL_MIRROR_CLAMP_TO_EDGE"/>
>+        </require>
>+        <require comment="Reuse GL_ARB_texture_stencil8">
>+            <enum name="GL_STENCIL_INDEX"/>
>+            <enum name="GL_STENCIL_INDEX8"/>
>+        </require>
>+        <require comment="Reuse GL_ARB_vertex_type_10f_11f_11f_rev">
>+            <enum name="GL_UNSIGNED_INT_10F_11F_11F_REV"/>
>+        </require>
>+    </feature>
>+    <feature api="gl" name="GL_VERSION_4_5" number="4.5">
>+        <require comment="Added robustness functionality">
>+            <enum name="GL_CONTEXT_LOST"/>
>+        </require>
>+        <require comment="Reuse GL_ARB_clip_control">
>+            <command name="glClipControl"/>
>+            <enum name="GL_LOWER_LEFT"/>
>+            <enum name="GL_UPPER_LEFT"/>
>+            <enum name="GL_NEGATIVE_ONE_TO_ONE"/>
>+            <enum name="GL_ZERO_TO_ONE"/>
>+            <enum name="GL_CLIP_ORIGIN"/>
>+            <enum name="GL_CLIP_DEPTH_MODE"/>
>+        </require>
>+        <require comment="Reuse GL_ARB_conditional_render_inverted">
>+            <enum name="GL_QUERY_WAIT_INVERTED"/>
>+            <enum name="GL_QUERY_NO_WAIT_INVERTED"/>
>+            <enum name="GL_QUERY_BY_REGION_WAIT_INVERTED"/>
>+            <enum name="GL_QUERY_BY_REGION_NO_WAIT_INVERTED"/>
>+        </require>
>+        <require comment="Reuse GL_ARB_cull_distance">
>+            <enum name="GL_MAX_CULL_DISTANCES"/>
>+            <enum name="GL_MAX_COMBINED_CLIP_AND_CULL_DISTANCES"/>
>+        </require>
>+        <require comment="Reuse GL_ARB_direct_state_access">
>+            <enum name="GL_TEXTURE_TARGET"/>
>+            <enum name="GL_QUERY_TARGET"/>
>+            <enum name="GL_TEXTURE_BINDING_1D"/>
>+            <enum name="GL_TEXTURE_BINDING_1D_ARRAY"/>
>+            <enum name="GL_TEXTURE_BINDING_2D"/>
>+            <enum name="GL_TEXTURE_BINDING_2D_ARRAY"/>
>+            <enum name="GL_TEXTURE_BINDING_2D_MULTISAMPLE"/>
>+            <enum name="GL_TEXTURE_BINDING_2D_MULTISAMPLE_ARRAY"/>
>+            <enum name="GL_TEXTURE_BINDING_3D"/>
>+            <enum name="GL_TEXTURE_BINDING_BUFFER"/>
>+            <enum name="GL_TEXTURE_BINDING_CUBE_MAP"/>
>+            <enum name="GL_TEXTURE_BINDING_CUBE_MAP_ARRAY"/>
>+            <enum name="GL_TEXTURE_BINDING_RECTANGLE"/>
>+            <command name="glCreateTransformFeedbacks"/>
>+            <command name="glTransformFeedbackBufferBase"/>
>+            <command name="glTransformFeedbackBufferRange"/>
>+            <command name="glGetTransformFeedbackiv"/>
>+            <command name="glGetTransformFeedbacki_v"/>
>+            <command name="glGetTransformFeedbacki64_v"/>
>+            <command name="glCreateBuffers"/>
>+            <command name="glNamedBufferStorage"/>
>+            <command name="glNamedBufferData"/>
>+            <command name="glNamedBufferSubData"/>
>+            <command name="glCopyNamedBufferSubData"/>
>+            <command name="glClearNamedBufferData"/>
>+            <command name="glClearNamedBufferSubData"/>
>+            <command name="glMapNamedBuffer"/>
>+            <command name="glMapNamedBufferRange"/>
>+            <command name="glUnmapNamedBuffer"/>
>+            <command name="glFlushMappedNamedBufferRange"/>
>+            <command name="glGetNamedBufferParameteriv"/>
>+            <command name="glGetNamedBufferParameteri64v"/>
>+            <command name="glGetNamedBufferPointerv"/>
>+            <command name="glGetNamedBufferSubData"/>
>+            <command name="glCreateFramebuffers"/>
>+            <command name="glNamedFramebufferRenderbuffer"/>
>+            <command name="glNamedFramebufferParameteri"/>
>+            <command name="glNamedFramebufferTexture"/>
>+            <command name="glNamedFramebufferTextureLayer"/>
>+            <command name="glNamedFramebufferDrawBuffer"/>
>+            <command name="glNamedFramebufferDrawBuffers"/>
>+            <command name="glNamedFramebufferReadBuffer"/>
>+            <command name="glInvalidateNamedFramebufferData"/>
>+            <command name="glInvalidateNamedFramebufferSubData"/>
>+            <command name="glClearNamedFramebufferiv"/>
>+            <command name="glClearNamedFramebufferuiv"/>
>+            <command name="glClearNamedFramebufferfv"/>
>+            <command name="glClearNamedFramebufferfi"/>
>+            <command name="glBlitNamedFramebuffer"/>
>+            <command name="glCheckNamedFramebufferStatus"/>
>+            <command name="glGetNamedFramebufferParameteriv"/>
>+            <command name="glGetNamedFramebufferAttachmentParameteriv"/>
>+            <command name="glCreateRenderbuffers"/>
>+            <command name="glNamedRenderbufferStorage"/>
>+            <command name="glNamedRenderbufferStorageMultisample"/>
>+            <command name="glGetNamedRenderbufferParameteriv"/>
>+            <command name="glCreateTextures"/>
>+            <command name="glTextureBuffer"/>
>+            <command name="glTextureBufferRange"/>
>+            <command name="glTextureStorage1D"/>
>+            <command name="glTextureStorage2D"/>
>+            <command name="glTextureStorage3D"/>
>+            <command name="glTextureStorage2DMultisample"/>
>+            <command name="glTextureStorage3DMultisample"/>
>+            <command name="glTextureSubImage1D"/>
>+            <command name="glTextureSubImage2D"/>
>+            <command name="glTextureSubImage3D"/>
>+            <command name="glCompressedTextureSubImage1D"/>
>+            <command name="glCompressedTextureSubImage2D"/>
>+            <command name="glCompressedTextureSubImage3D"/>
>+            <command name="glCopyTextureSubImage1D"/>
>+            <command name="glCopyTextureSubImage2D"/>
>+            <command name="glCopyTextureSubImage3D"/>
>+            <command name="glTextureParameterf"/>
>+            <command name="glTextureParameterfv"/>
>+            <command name="glTextureParameteri"/>
>+            <command name="glTextureParameterIiv"/>
>+            <command name="glTextureParameterIuiv"/>
>+            <command name="glTextureParameteriv"/>
>+            <command name="glGenerateTextureMipmap"/>
>+            <command name="glBindTextureUnit"/>
>+            <command name="glGetTextureImage"/>
>+            <command name="glGetCompressedTextureImage"/>
>+            <command name="glGetTextureLevelParameterfv"/>
>+            <command name="glGetTextureLevelParameteriv"/>
>+            <command name="glGetTextureParameterfv"/>
>+            <command name="glGetTextureParameterIiv"/>
>+            <command name="glGetTextureParameterIuiv"/>
>+            <command name="glGetTextureParameteriv"/>
>+            <command name="glCreateVertexArrays"/>
>+            <command name="glDisableVertexArrayAttrib"/>
>+            <command name="glEnableVertexArrayAttrib"/>
>+            <command name="glVertexArrayElementBuffer"/>
>+            <command name="glVertexArrayVertexBuffer"/>
>+            <command name="glVertexArrayVertexBuffers"/>
>+            <command name="glVertexArrayAttribBinding"/>
>+            <command name="glVertexArrayAttribFormat"/>
>+            <command name="glVertexArrayAttribIFormat"/>
>+            <command name="glVertexArrayAttribLFormat"/>
>+            <command name="glVertexArrayBindingDivisor"/>
>+            <command name="glGetVertexArrayiv"/>
>+            <command name="glGetVertexArrayIndexediv"/>
>+            <command name="glGetVertexArrayIndexed64iv"/>
>+            <command name="glCreateSamplers"/>
>+            <command name="glCreateProgramPipelines"/>
>+            <command name="glCreateQueries"/>
>+            <command name="glGetQueryBufferObjecti64v"/>
>+            <command name="glGetQueryBufferObjectiv"/>
>+            <command name="glGetQueryBufferObjectui64v"/>
>+            <command name="glGetQueryBufferObjectuiv"/>
>+        </require>
>+        <require comment="Reuse GL_ARB_ES3_1_compatibility">
>+            <enum name="GL_BACK"/>
>+            <command name="glMemoryBarrierByRegion"/>
>+        </require>
>+        <require comment="Reuse GL_ARB_get_texture_sub_image">
>+            <command name="glGetTextureSubImage"/>
>+            <command name="glGetCompressedTextureSubImage"/>
>+        </require>
>+        <require comment="Reuse GL_ARB_robustness">
>+            <enum name="GL_NO_ERROR"/>
>+            <enum name="GL_GUILTY_CONTEXT_RESET"/>
>+            <enum name="GL_INNOCENT_CONTEXT_RESET"/>
>+            <enum name="GL_UNKNOWN_CONTEXT_RESET"/>
>+            <enum name="GL_RESET_NOTIFICATION_STRATEGY"/>
>+            <enum name="GL_LOSE_CONTEXT_ON_RESET"/>
>+            <enum name="GL_NO_RESET_NOTIFICATION"/>
>+            <enum name="GL_CONTEXT_FLAG_ROBUST_ACCESS_BIT"/>
>+            <enum name="GL_CONTEXT_LOST"/>
>+            <command name="glGetGraphicsResetStatus"/>
>+            <command name="glGetnCompressedTexImage"/>
>+            <command name="glGetnTexImage"/>
>+            <command name="glGetnUniformdv"/>
>+            <command name="glGetnUniformfv"/>
>+            <command name="glGetnUniformiv"/>
>+            <command name="glGetnUniformuiv"/>
>+            <command name="glReadnPixels"/>
>+        </require>
>+        <require profile="compatibility" comment="Reuse GL_ARB_robustness">
>+            <command name="glGetnMapdv"/>
>+            <command name="glGetnMapfv"/>
>+            <command name="glGetnMapiv"/>
>+            <command name="glGetnPixelMapfv"/>
>+            <command name="glGetnPixelMapuiv"/>
>+            <command name="glGetnPixelMapusv"/>
>+            <command name="glGetnPolygonStipple"/>
>+            <command name="glGetnColorTable"/>
>+            <command name="glGetnConvolutionFilter"/>
>+            <command name="glGetnSeparableFilter"/>
>+            <command name="glGetnHistogram"/>
>+            <command name="glGetnMinmax"/>
>+        </require>
>+        <require comment="Reuse GL_ARB_texture_barrier">
>+            <command name="glTextureBarrier"/>
>+        </require>
>+        <require comment="Reuse GL_KHR_context_flush_control">
>+            <enum name="GL_CONTEXT_RELEASE_BEHAVIOR"/>
>+            <enum name="GL_NONE"/>
>+            <enum name="GL_CONTEXT_RELEASE_BEHAVIOR_FLUSH"/>
>+        </require>
>+    </feature>
>+    <feature api="gl" name="GL_VERSION_4_6" number="4.6">
>+        <require comment="Reuse GL_KHR_context_flush_control">
>+            <enum name="GL_CONTEXT_RELEASE_BEHAVIOR"/>
>+            <enum name="GL_NONE"/>
>+            <enum name="GL_CONTEXT_RELEASE_BEHAVIOR_FLUSH"/>
>+        </require>
>+        <require comment="Reuse GL_ARB_gl_spirv">
>+            <enum name="GL_SHADER_BINARY_FORMAT_SPIR_V"/>
>+            <enum name="GL_SPIR_V_BINARY"/>
>+            <command name="glSpecializeShader"/>
>+        </require>
>+        <require comment="Reuse GL_ARB_indirect_parameters">
>+            <enum name="GL_PARAMETER_BUFFER"/>
>+            <enum name="GL_PARAMETER_BUFFER_BINDING"/>
>+            <command name="glMultiDrawArraysIndirectCount"/>
>+            <command name="glMultiDrawElementsIndirectCount"/>
>+        </require>
>+        <require comment="Reuse GL_KHR_no_error">
>+            <enum name="GL_CONTEXT_FLAG_NO_ERROR_BIT"/>
>+        </require>
>+        <require comment="Reuse GL_ARB_pipeline_statistics_query">
>+            <enum name="GL_VERTICES_SUBMITTED"/>
>+            <enum name="GL_PRIMITIVES_SUBMITTED"/>
>+            <enum name="GL_VERTEX_SHADER_INVOCATIONS"/>
>+            <enum name="GL_TESS_CONTROL_SHADER_PATCHES"/>
>+            <enum name="GL_TESS_EVALUATION_SHADER_INVOCATIONS"/>
>+            <enum name="GL_GEOMETRY_SHADER_INVOCATIONS"/>
>+            <enum name="GL_GEOMETRY_SHADER_PRIMITIVES_EMITTED"/>
>+            <enum name="GL_FRAGMENT_SHADER_INVOCATIONS"/>
>+            <enum name="GL_COMPUTE_SHADER_INVOCATIONS"/>
>+            <enum name="GL_CLIPPING_INPUT_PRIMITIVES"/>
>+            <enum name="GL_CLIPPING_OUTPUT_PRIMITIVES"/>
>+        </require>
>+        <require comment="Reuse GL_ARB_polygon_offset_clamp">
>+            <enum name="GL_POLYGON_OFFSET_CLAMP"/>
>+            <command name="glPolygonOffsetClamp"/>
>+        </require>
>+        <require comment="Reuse GL_ARB_shader_atomic_counter_ops (none)"/>
>+        <require comment="Reuse GL_ARB_shader_draw_parameters (none)"/>
>+        <require comment="Reuse GL_ARB_shader_group_vote (none)"/>
>+        <require comment="Reuse GL_ARB_spirv_extensions">
>+            <enum name="GL_SPIR_V_EXTENSIONS"/>
>+            <enum name="GL_NUM_SPIR_V_EXTENSIONS"/>
>+        </require>
>+        <require comment="Reuse GL_ARB_texture_filter_anisotropic">
>+            <enum name="GL_TEXTURE_MAX_ANISOTROPY"/>
>+            <enum name="GL_MAX_TEXTURE_MAX_ANISOTROPY"/>
>+        </require>
>+        <require comment="Reuse GL_ARB_transform_feedback_overflow_query">
>+            <enum name="GL_TRANSFORM_FEEDBACK_OVERFLOW"/>
>+            <enum name="GL_TRANSFORM_FEEDBACK_STREAM_OVERFLOW"/>
>+        </require>
>+    </feature>
>+
>+
>+    
>+    <feature api="gles1" name="GL_VERSION_ES_CM_1_0" number="1.0">
>+        <require comment="Not used by the API, for compatibility with old gl.h">
>+            <type name="GLbyte"/>
>+            <type name="GLclampf"/>
>+            <type name="GLshort"/>
>+            <type name="GLushort"/>
>+        </require>
>+        <require>
>+            
>+            <enum name="GL_VERSION_ES_CL_1_0"/>
>+            <enum name="GL_VERSION_ES_CM_1_1"/>
>+            <enum name="GL_VERSION_ES_CL_1_1"/>
>+            <type name="GLvoid" comment="No longer used in headers"/>
>+            <enum name="GL_DEPTH_BUFFER_BIT"/>
>+            <enum name="GL_STENCIL_BUFFER_BIT"/>
>+            <enum name="GL_COLOR_BUFFER_BIT"/>
>+            <enum name="GL_FALSE"/>
>+            <enum name="GL_TRUE"/>
>+            <enum name="GL_POINTS"/>
>+            <enum name="GL_LINES"/>
>+            <enum name="GL_LINE_LOOP"/>
>+            <enum name="GL_LINE_STRIP"/>
>+            <enum name="GL_TRIANGLES"/>
>+            <enum name="GL_TRIANGLE_STRIP"/>
>+            <enum name="GL_TRIANGLE_FAN"/>
>+            <enum name="GL_NEVER"/>
>+            <enum name="GL_LESS"/>
>+            <enum name="GL_EQUAL"/>
>+            <enum name="GL_LEQUAL"/>
>+            <enum name="GL_GREATER"/>
>+            <enum name="GL_NOTEQUAL"/>
>+            <enum name="GL_GEQUAL"/>
>+            <enum name="GL_ALWAYS"/>
>+            <enum name="GL_ZERO"/>
>+            <enum name="GL_ONE"/>
>+            <enum name="GL_SRC_COLOR"/>
>+            <enum name="GL_ONE_MINUS_SRC_COLOR"/>
>+            <enum name="GL_SRC_ALPHA"/>
>+            <enum name="GL_ONE_MINUS_SRC_ALPHA"/>
>+            <enum name="GL_DST_ALPHA"/>
>+            <enum name="GL_ONE_MINUS_DST_ALPHA"/>
>+            <enum name="GL_DST_COLOR"/>
>+            <enum name="GL_ONE_MINUS_DST_COLOR"/>
>+            <enum name="GL_SRC_ALPHA_SATURATE"/>
>+            <enum name="GL_CLIP_PLANE0"/>
>+            <enum name="GL_CLIP_PLANE1"/>
>+            <enum name="GL_CLIP_PLANE2"/>
>+            <enum name="GL_CLIP_PLANE3"/>
>+            <enum name="GL_CLIP_PLANE4"/>
>+            <enum name="GL_CLIP_PLANE5"/>
>+            <enum name="GL_FRONT"/>
>+            <enum name="GL_BACK"/>
>+            <enum name="GL_FRONT_AND_BACK"/>
>+            <enum name="GL_FOG"/>
>+            <enum name="GL_LIGHTING"/>
>+            <enum name="GL_TEXTURE_2D"/>
>+            <enum name="GL_CULL_FACE"/>
>+            <enum name="GL_ALPHA_TEST"/>
>+            <enum name="GL_BLEND"/>
>+            <enum name="GL_COLOR_LOGIC_OP"/>
>+            <enum name="GL_DITHER"/>
>+            <enum name="GL_STENCIL_TEST"/>
>+            <enum name="GL_DEPTH_TEST"/>
>+            <enum name="GL_POINT_SMOOTH"/>
>+            <enum name="GL_LINE_SMOOTH"/>
>+            <enum name="GL_SCISSOR_TEST"/>
>+            <enum name="GL_COLOR_MATERIAL"/>
>+            <enum name="GL_NORMALIZE"/>
>+            <enum name="GL_RESCALE_NORMAL"/>
>+            <enum name="GL_VERTEX_ARRAY"/>
>+            <enum name="GL_NORMAL_ARRAY"/>
>+            <enum name="GL_COLOR_ARRAY"/>
>+            <enum name="GL_TEXTURE_COORD_ARRAY"/>
>+            <enum name="GL_MULTISAMPLE"/>
>+            <enum name="GL_SAMPLE_ALPHA_TO_COVERAGE"/>
>+            <enum name="GL_SAMPLE_ALPHA_TO_ONE"/>
>+            <enum name="GL_SAMPLE_COVERAGE"/>
>+            <enum name="GL_NO_ERROR"/>
>+            <enum name="GL_INVALID_ENUM"/>
>+            <enum name="GL_INVALID_VALUE"/>
>+            <enum name="GL_INVALID_OPERATION"/>
>+            <enum name="GL_STACK_OVERFLOW"/>
>+            <enum name="GL_STACK_UNDERFLOW"/>
>+            <enum name="GL_OUT_OF_MEMORY"/>
>+            <enum name="GL_EXP"/>
>+            <enum name="GL_EXP2"/>
>+            <enum name="GL_FOG_DENSITY"/>
>+            <enum name="GL_FOG_START"/>
>+            <enum name="GL_FOG_END"/>
>+            <enum name="GL_FOG_MODE"/>
>+            <enum name="GL_FOG_COLOR"/>
>+            <enum name="GL_CW"/>
>+            <enum name="GL_CCW"/>
>+            <enum name="GL_CURRENT_COLOR"/>
>+            <enum name="GL_CURRENT_NORMAL"/>
>+            <enum name="GL_CURRENT_TEXTURE_COORDS"/>
>+            <enum name="GL_POINT_SIZE"/>
>+            <enum name="GL_POINT_SIZE_MIN"/>
>+            <enum name="GL_POINT_SIZE_MAX"/>
>+            <enum name="GL_POINT_FADE_THRESHOLD_SIZE"/>
>+            <enum name="GL_POINT_DISTANCE_ATTENUATION"/>
>+            <enum name="GL_SMOOTH_POINT_SIZE_RANGE"/>
>+            <enum name="GL_LINE_WIDTH"/>
>+            <enum name="GL_SMOOTH_LINE_WIDTH_RANGE"/>
>+            <enum name="GL_ALIASED_POINT_SIZE_RANGE"/>
>+            <enum name="GL_ALIASED_LINE_WIDTH_RANGE"/>
>+            <enum name="GL_CULL_FACE_MODE"/>
>+            <enum name="GL_FRONT_FACE"/>
>+            <enum name="GL_SHADE_MODEL"/>
>+            <enum name="GL_DEPTH_RANGE"/>
>+            <enum name="GL_DEPTH_WRITEMASK"/>
>+            <enum name="GL_DEPTH_CLEAR_VALUE"/>
>+            <enum name="GL_DEPTH_FUNC"/>
>+            <enum name="GL_STENCIL_CLEAR_VALUE"/>
>+            <enum name="GL_STENCIL_FUNC"/>
>+            <enum name="GL_STENCIL_VALUE_MASK"/>
>+            <enum name="GL_STENCIL_FAIL"/>
>+            <enum name="GL_STENCIL_PASS_DEPTH_FAIL"/>
>+            <enum name="GL_STENCIL_PASS_DEPTH_PASS"/>
>+            <enum name="GL_STENCIL_REF"/>
>+            <enum name="GL_STENCIL_WRITEMASK"/>
>+            <enum name="GL_MATRIX_MODE"/>
>+            <enum name="GL_VIEWPORT"/>
>+            <enum name="GL_MODELVIEW_STACK_DEPTH"/>
>+            <enum name="GL_PROJECTION_STACK_DEPTH"/>
>+            <enum name="GL_TEXTURE_STACK_DEPTH"/>
>+            <enum name="GL_MODELVIEW_MATRIX"/>
>+            <enum name="GL_PROJECTION_MATRIX"/>
>+            <enum name="GL_TEXTURE_MATRIX"/>
>+            <enum name="GL_ALPHA_TEST_FUNC"/>
>+            <enum name="GL_ALPHA_TEST_REF"/>
>+            <enum name="GL_BLEND_DST"/>
>+            <enum name="GL_BLEND_SRC"/>
>+            <enum name="GL_LOGIC_OP_MODE"/>
>+            <enum name="GL_SCISSOR_BOX"/>
>+            <enum name="GL_COLOR_CLEAR_VALUE"/>
>+            <enum name="GL_COLOR_WRITEMASK"/>
>+            <enum name="GL_MAX_LIGHTS"/>
>+            <enum name="GL_MAX_CLIP_PLANES"/>
>+            <enum name="GL_MAX_TEXTURE_SIZE"/>
>+            <enum name="GL_MAX_MODELVIEW_STACK_DEPTH"/>
>+            <enum name="GL_MAX_PROJECTION_STACK_DEPTH"/>
>+            <enum name="GL_MAX_TEXTURE_STACK_DEPTH"/>
>+            <enum name="GL_MAX_VIEWPORT_DIMS"/>
>+            <enum name="GL_MAX_TEXTURE_UNITS"/>
>+            <enum name="GL_SUBPIXEL_BITS"/>
>+            <enum name="GL_RED_BITS"/>
>+            <enum name="GL_GREEN_BITS"/>
>+            <enum name="GL_BLUE_BITS"/>
>+            <enum name="GL_ALPHA_BITS"/>
>+            <enum name="GL_DEPTH_BITS"/>
>+            <enum name="GL_STENCIL_BITS"/>
>+            <enum name="GL_POLYGON_OFFSET_UNITS"/>
>+            <enum name="GL_POLYGON_OFFSET_FILL"/>
>+            <enum name="GL_POLYGON_OFFSET_FACTOR"/>
>+            <enum name="GL_TEXTURE_BINDING_2D"/>
>+            <enum name="GL_VERTEX_ARRAY_SIZE"/>
>+            <enum name="GL_VERTEX_ARRAY_TYPE"/>
>+            <enum name="GL_VERTEX_ARRAY_STRIDE"/>
>+            <enum name="GL_NORMAL_ARRAY_TYPE"/>
>+            <enum name="GL_NORMAL_ARRAY_STRIDE"/>
>+            <enum name="GL_COLOR_ARRAY_SIZE"/>
>+            <enum name="GL_COLOR_ARRAY_TYPE"/>
>+            <enum name="GL_COLOR_ARRAY_STRIDE"/>
>+            <enum name="GL_TEXTURE_COORD_ARRAY_SIZE"/>
>+            <enum name="GL_TEXTURE_COORD_ARRAY_TYPE"/>
>+            <enum name="GL_TEXTURE_COORD_ARRAY_STRIDE"/>
>+            <enum name="GL_VERTEX_ARRAY_POINTER"/>
>+            <enum name="GL_NORMAL_ARRAY_POINTER"/>
>+            <enum name="GL_COLOR_ARRAY_POINTER"/>
>+            <enum name="GL_TEXTURE_COORD_ARRAY_POINTER"/>
>+            <enum name="GL_SAMPLE_BUFFERS"/>
>+            <enum name="GL_SAMPLES"/>
>+            <enum name="GL_SAMPLE_COVERAGE_VALUE"/>
>+            <enum name="GL_SAMPLE_COVERAGE_INVERT"/>
>+            <enum name="GL_NUM_COMPRESSED_TEXTURE_FORMATS"/>
>+            <enum name="GL_COMPRESSED_TEXTURE_FORMATS"/>
>+            <enum name="GL_DONT_CARE"/>
>+            <enum name="GL_FASTEST"/>
>+            <enum name="GL_NICEST"/>
>+            <enum name="GL_PERSPECTIVE_CORRECTION_HINT"/>
>+            <enum name="GL_POINT_SMOOTH_HINT"/>
>+            <enum name="GL_LINE_SMOOTH_HINT"/>
>+            <enum name="GL_FOG_HINT"/>
>+            <enum name="GL_GENERATE_MIPMAP_HINT"/>
>+            <enum name="GL_LIGHT_MODEL_AMBIENT"/>
>+            <enum name="GL_LIGHT_MODEL_TWO_SIDE"/>
>+            <enum name="GL_AMBIENT"/>
>+            <enum name="GL_DIFFUSE"/>
>+            <enum name="GL_SPECULAR"/>
>+            <enum name="GL_POSITION"/>
>+            <enum name="GL_SPOT_DIRECTION"/>
>+            <enum name="GL_SPOT_EXPONENT"/>
>+            <enum name="GL_SPOT_CUTOFF"/>
>+            <enum name="GL_CONSTANT_ATTENUATION"/>
>+            <enum name="GL_LINEAR_ATTENUATION"/>
>+            <enum name="GL_QUADRATIC_ATTENUATION"/>
>+            <enum name="GL_BYTE"/>
>+            <enum name="GL_UNSIGNED_BYTE"/>
>+            <enum name="GL_SHORT"/>
>+            <enum name="GL_UNSIGNED_SHORT"/>
>+            <enum name="GL_FLOAT"/>
>+            <enum name="GL_FIXED"/>
>+            <enum name="GL_CLEAR"/>
>+            <enum name="GL_AND"/>
>+            <enum name="GL_AND_REVERSE"/>
>+            <enum name="GL_COPY"/>
>+            <enum name="GL_AND_INVERTED"/>
>+            <enum name="GL_NOOP"/>
>+            <enum name="GL_XOR"/>
>+            <enum name="GL_OR"/>
>+            <enum name="GL_NOR"/>
>+            <enum name="GL_EQUIV"/>
>+            <enum name="GL_INVERT"/>
>+            <enum name="GL_OR_REVERSE"/>
>+            <enum name="GL_COPY_INVERTED"/>
>+            <enum name="GL_OR_INVERTED"/>
>+            <enum name="GL_NAND"/>
>+            <enum name="GL_SET"/>
>+            <enum name="GL_EMISSION"/>
>+            <enum name="GL_SHININESS"/>
>+            <enum name="GL_AMBIENT_AND_DIFFUSE"/>
>+            <enum name="GL_MODELVIEW"/>
>+            <enum name="GL_PROJECTION"/>
>+            <enum name="GL_TEXTURE"/>
>+            <enum name="GL_ALPHA"/>
>+            <enum name="GL_RGB"/>
>+            <enum name="GL_RGBA"/>
>+            <enum name="GL_LUMINANCE"/>
>+            <enum name="GL_LUMINANCE_ALPHA"/>
>+            <enum name="GL_UNPACK_ALIGNMENT"/>
>+            <enum name="GL_PACK_ALIGNMENT"/>
>+            <enum name="GL_UNSIGNED_SHORT_4_4_4_4"/>
>+            <enum name="GL_UNSIGNED_SHORT_5_5_5_1"/>
>+            <enum name="GL_UNSIGNED_SHORT_5_6_5"/>
>+            <enum name="GL_FLAT"/>
>+            <enum name="GL_SMOOTH"/>
>+            <enum name="GL_KEEP"/>
>+            <enum name="GL_REPLACE"/>
>+            <enum name="GL_INCR"/>
>+            <enum name="GL_DECR"/>
>+            <enum name="GL_VENDOR"/>
>+            <enum name="GL_RENDERER"/>
>+            <enum name="GL_VERSION"/>
>+            <enum name="GL_EXTENSIONS"/>
>+            <enum name="GL_MODULATE"/>
>+            <enum name="GL_DECAL"/>
>+            <enum name="GL_ADD"/>
>+            <enum name="GL_TEXTURE_ENV_MODE"/>
>+            <enum name="GL_TEXTURE_ENV_COLOR"/>
>+            <enum name="GL_TEXTURE_ENV"/>
>+            <enum name="GL_NEAREST"/>
>+            <enum name="GL_LINEAR"/>
>+            <enum name="GL_NEAREST_MIPMAP_NEAREST"/>
>+            <enum name="GL_LINEAR_MIPMAP_NEAREST"/>
>+            <enum name="GL_NEAREST_MIPMAP_LINEAR"/>
>+            <enum name="GL_LINEAR_MIPMAP_LINEAR"/>
>+            <enum name="GL_TEXTURE_MAG_FILTER"/>
>+            <enum name="GL_TEXTURE_MIN_FILTER"/>
>+            <enum name="GL_TEXTURE_WRAP_S"/>
>+            <enum name="GL_TEXTURE_WRAP_T"/>
>+            <enum name="GL_GENERATE_MIPMAP"/>
>+            <enum name="GL_TEXTURE0"/>
>+            <enum name="GL_TEXTURE1"/>
>+            <enum name="GL_TEXTURE2"/>
>+            <enum name="GL_TEXTURE3"/>
>+            <enum name="GL_TEXTURE4"/>
>+            <enum name="GL_TEXTURE5"/>
>+            <enum name="GL_TEXTURE6"/>
>+            <enum name="GL_TEXTURE7"/>
>+            <enum name="GL_TEXTURE8"/>
>+            <enum name="GL_TEXTURE9"/>
>+            <enum name="GL_TEXTURE10"/>
>+            <enum name="GL_TEXTURE11"/>
>+            <enum name="GL_TEXTURE12"/>
>+            <enum name="GL_TEXTURE13"/>
>+            <enum name="GL_TEXTURE14"/>
>+            <enum name="GL_TEXTURE15"/>
>+            <enum name="GL_TEXTURE16"/>
>+            <enum name="GL_TEXTURE17"/>
>+            <enum name="GL_TEXTURE18"/>
>+            <enum name="GL_TEXTURE19"/>
>+            <enum name="GL_TEXTURE20"/>
>+            <enum name="GL_TEXTURE21"/>
>+            <enum name="GL_TEXTURE22"/>
>+            <enum name="GL_TEXTURE23"/>
>+            <enum name="GL_TEXTURE24"/>
>+            <enum name="GL_TEXTURE25"/>
>+            <enum name="GL_TEXTURE26"/>
>+            <enum name="GL_TEXTURE27"/>
>+            <enum name="GL_TEXTURE28"/>
>+            <enum name="GL_TEXTURE29"/>
>+            <enum name="GL_TEXTURE30"/>
>+            <enum name="GL_TEXTURE31"/>
>+            <enum name="GL_ACTIVE_TEXTURE"/>
>+            <enum name="GL_CLIENT_ACTIVE_TEXTURE"/>
>+            <enum name="GL_REPEAT"/>
>+            <enum name="GL_CLAMP_TO_EDGE"/>
>+            <enum name="GL_LIGHT0"/>
>+            <enum name="GL_LIGHT1"/>
>+            <enum name="GL_LIGHT2"/>
>+            <enum name="GL_LIGHT3"/>
>+            <enum name="GL_LIGHT4"/>
>+            <enum name="GL_LIGHT5"/>
>+            <enum name="GL_LIGHT6"/>
>+            <enum name="GL_LIGHT7"/>
>+            <enum name="GL_ARRAY_BUFFER"/>
>+            <enum name="GL_ELEMENT_ARRAY_BUFFER"/>
>+            <enum name="GL_ARRAY_BUFFER_BINDING"/>
>+            <enum name="GL_ELEMENT_ARRAY_BUFFER_BINDING"/>
>+            <enum name="GL_VERTEX_ARRAY_BUFFER_BINDING"/>
>+            <enum name="GL_NORMAL_ARRAY_BUFFER_BINDING"/>
>+            <enum name="GL_COLOR_ARRAY_BUFFER_BINDING"/>
>+            <enum name="GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING"/>
>+            <enum name="GL_STATIC_DRAW"/>
>+            <enum name="GL_DYNAMIC_DRAW"/>
>+            <enum name="GL_BUFFER_SIZE"/>
>+            <enum name="GL_BUFFER_USAGE"/>
>+            <enum name="GL_SUBTRACT"/>
>+            <enum name="GL_COMBINE"/>
>+            <enum name="GL_COMBINE_RGB"/>
>+            <enum name="GL_COMBINE_ALPHA"/>
>+            <enum name="GL_RGB_SCALE"/>
>+            <enum name="GL_ADD_SIGNED"/>
>+            <enum name="GL_INTERPOLATE"/>
>+            <enum name="GL_CONSTANT"/>
>+            <enum name="GL_PRIMARY_COLOR"/>
>+            <enum name="GL_PREVIOUS"/>
>+            <enum name="GL_OPERAND0_RGB"/>
>+            <enum name="GL_OPERAND1_RGB"/>
>+            <enum name="GL_OPERAND2_RGB"/>
>+            <enum name="GL_OPERAND0_ALPHA"/>
>+            <enum name="GL_OPERAND1_ALPHA"/>
>+            <enum name="GL_OPERAND2_ALPHA"/>
>+            <enum name="GL_ALPHA_SCALE"/>
>+            <enum name="GL_SRC0_RGB"/>
>+            <enum name="GL_SRC1_RGB"/>
>+            <enum name="GL_SRC2_RGB"/>
>+            <enum name="GL_SRC0_ALPHA"/>
>+            <enum name="GL_SRC1_ALPHA"/>
>+            <enum name="GL_SRC2_ALPHA"/>
>+            <enum name="GL_DOT3_RGB"/>
>+            <enum name="GL_DOT3_RGBA"/>
>+        </require>
>+        <require profile="common">
>+            <command name="glAlphaFunc"/>
>+            <command name="glClearColor"/>
>+            <command name="glClearDepthf"/>
>+            <command name="glClipPlanef"/>
>+            <command name="glColor4f"/>
>+            <command name="glDepthRangef"/>
>+            <command name="glFogf"/>
>+            <command name="glFogfv"/>
>+            <command name="glFrustumf"/>
>+            <command name="glGetClipPlanef"/>
>+            <command name="glGetFloatv"/>
>+            <command name="glGetLightfv"/>
>+            <command name="glGetMaterialfv"/>
>+            <command name="glGetTexEnvfv"/>
>+            <command name="glGetTexParameterfv"/>
>+            <command name="glLightModelf"/>
>+            <command name="glLightModelfv"/>
>+            <command name="glLightf"/>
>+            <command name="glLightfv"/>
>+            <command name="glLineWidth"/>
>+            <command name="glLoadMatrixf"/>
>+            <command name="glMaterialf"/>
>+            <command name="glMaterialfv"/>
>+            <command name="glMultMatrixf"/>
>+            <command name="glMultiTexCoord4f"/>
>+            <command name="glNormal3f"/>
>+            <command name="glOrthof"/>
>+            <command name="glPointParameterf"/>
>+            <command name="glPointParameterfv"/>
>+            <command name="glPointSize"/>
>+            <command name="glPolygonOffset"/>
>+            <command name="glRotatef"/>
>+            <command name="glScalef"/>
>+            <command name="glTexEnvf"/>
>+            <command name="glTexEnvfv"/>
>+            <command name="glTexParameterf"/>
>+            <command name="glTexParameterfv"/>
>+            <command name="glTranslatef"/>
>+        </require>
>+        <require>
>+            <command name="glActiveTexture"/>
>+            <command name="glAlphaFuncx"/>
>+            <command name="glBindBuffer"/>
>+            <command name="glBindTexture"/>
>+            <command name="glBlendFunc"/>
>+            <command name="glBufferData"/>
>+            <command name="glBufferSubData"/>
>+            <command name="glClear"/>
>+            <command name="glClearColorx"/>
>+            <command name="glClearDepthx"/>
>+            <command name="glClearStencil"/>
>+            <command name="glClientActiveTexture"/>
>+            <command name="glClipPlanex"/>
>+            <command name="glColor4ub"/>
>+            <command name="glColor4x"/>
>+            <command name="glColorMask"/>
>+            <command name="glColorPointer"/>
>+            <command name="glCompressedTexImage2D"/>
>+            <command name="glCompressedTexSubImage2D"/>
>+            <command name="glCopyTexImage2D"/>
>+            <command name="glCopyTexSubImage2D"/>
>+            <command name="glCullFace"/>
>+            <command name="glDeleteBuffers"/>
>+            <command name="glDeleteTextures"/>
>+            <command name="glDepthFunc"/>
>+            <command name="glDepthMask"/>
>+            <command name="glDepthRangex"/>
>+            <command name="glDisable"/>
>+            <command name="glDisableClientState"/>
>+            <command name="glDrawArrays"/>
>+            <command name="glDrawElements"/>
>+            <command name="glEnable"/>
>+            <command name="glEnableClientState"/>
>+            <command name="glFinish"/>
>+            <command name="glFlush"/>
>+            <command name="glFogx"/>
>+            <command name="glFogxv"/>
>+            <command name="glFrontFace"/>
>+            <command name="glFrustumx"/>
>+            <command name="glGetBooleanv"/>
>+            <command name="glGetBufferParameteriv"/>
>+            <command name="glGetClipPlanex"/>
>+            <command name="glGenBuffers"/>
>+            <command name="glGenTextures"/>
>+            <command name="glGetError"/>
>+            <command name="glGetFixedv"/>
>+            <command name="glGetIntegerv"/>
>+            <command name="glGetLightxv"/>
>+            <command name="glGetMaterialxv"/>
>+            <command name="glGetPointerv"/>
>+            <command name="glGetString"/>
>+            <command name="glGetTexEnviv"/>
>+            <command name="glGetTexEnvxv"/>
>+            <command name="glGetTexParameteriv"/>
>+            <command name="glGetTexParameterxv"/>
>+            <command name="glHint"/>
>+            <command name="glIsBuffer"/>
>+            <command name="glIsEnabled"/>
>+            <command name="glIsTexture"/>
>+            <command name="glLightModelx"/>
>+            <command name="glLightModelxv"/>
>+            <command name="glLightx"/>
>+            <command name="glLightxv"/>
>+            <command name="glLineWidthx"/>
>+            <command name="glLoadIdentity"/>
>+            <command name="glLoadMatrixx"/>
>+            <command name="glLogicOp"/>
>+            <command name="glMaterialx"/>
>+            <command name="glMaterialxv"/>
>+            <command name="glMatrixMode"/>
>+            <command name="glMultMatrixx"/>
>+            <command name="glMultiTexCoord4x"/>
>+            <command name="glNormal3x"/>
>+            <command name="glNormalPointer"/>
>+            <command name="glOrthox"/>
>+            <command name="glPixelStorei"/>
>+            <command name="glPointParameterx"/>
>+            <command name="glPointParameterxv"/>
>+            <command name="glPointSizex"/>
>+            <command name="glPolygonOffsetx"/>
>+            <command name="glPopMatrix"/>
>+            <command name="glPushMatrix"/>
>+            <command name="glReadPixels"/>
>+            <command name="glRotatex"/>
>+            <command name="glSampleCoverage"/>
>+            <command name="glSampleCoveragex"/>
>+            <command name="glScalex"/>
>+            <command name="glScissor"/>
>+            <command name="glShadeModel"/>
>+            <command name="glStencilFunc"/>
>+            <command name="glStencilMask"/>
>+            <command name="glStencilOp"/>
>+            <command name="glTexCoordPointer"/>
>+            <command name="glTexEnvi"/>
>+            <command name="glTexEnvx"/>
>+            <command name="glTexEnviv"/>
>+            <command name="glTexEnvxv"/>
>+            <command name="glTexImage2D"/>
>+            <command name="glTexParameteri"/>
>+            <command name="glTexParameterx"/>
>+            <command name="glTexParameteriv"/>
>+            <command name="glTexParameterxv"/>
>+            <command name="glTexSubImage2D"/>
>+            <command name="glTranslatex"/>
>+            <command name="glVertexPointer"/>
>+            <command name="glViewport"/>
>+        </require>
>+    </feature>
>+    <feature api="gles2" name="GL_ES_VERSION_2_0" number="2.0">
>+        <require comment="Not used by the API, for compatibility with old gl2.h">
>+            <type name="GLbyte"/>
>+            <type name="GLclampf"/>
>+            <type name="GLfixed"/>
>+            <type name="GLshort"/>
>+            <type name="GLushort"/>
>+            <type name="GLvoid" comment="No longer used in headers"/>
>+        </require>
>+        <require comment="Not used by the API; put here so this type doesn't need to be declared in gl2ext.h">
>+            <type name="GLsync"/>
>+            <type name="GLint64"/>
>+            <type name="GLuint64"/>
>+        </require>
>+        <require>
>+            <enum name="GL_DEPTH_BUFFER_BIT"/>
>+            <enum name="GL_STENCIL_BUFFER_BIT"/>
>+            <enum name="GL_COLOR_BUFFER_BIT"/>
>+            <enum name="GL_FALSE"/>
>+            <enum name="GL_TRUE"/>
>+            <enum name="GL_POINTS"/>
>+            <enum name="GL_LINES"/>
>+            <enum name="GL_LINE_LOOP"/>
>+            <enum name="GL_LINE_STRIP"/>
>+            <enum name="GL_TRIANGLES"/>
>+            <enum name="GL_TRIANGLE_STRIP"/>
>+            <enum name="GL_TRIANGLE_FAN"/>
>+            <enum name="GL_ZERO"/>
>+            <enum name="GL_ONE"/>
>+            <enum name="GL_SRC_COLOR"/>
>+            <enum name="GL_ONE_MINUS_SRC_COLOR"/>
>+            <enum name="GL_SRC_ALPHA"/>
>+            <enum name="GL_ONE_MINUS_SRC_ALPHA"/>
>+            <enum name="GL_DST_ALPHA"/>
>+            <enum name="GL_ONE_MINUS_DST_ALPHA"/>
>+            <enum name="GL_DST_COLOR"/>
>+            <enum name="GL_ONE_MINUS_DST_COLOR"/>
>+            <enum name="GL_SRC_ALPHA_SATURATE"/>
>+            <enum name="GL_FUNC_ADD"/>
>+            <enum name="GL_BLEND_EQUATION"/>
>+            <enum name="GL_BLEND_EQUATION_RGB"/>
>+            <enum name="GL_BLEND_EQUATION_ALPHA"/>
>+            <enum name="GL_FUNC_SUBTRACT"/>
>+            <enum name="GL_FUNC_REVERSE_SUBTRACT"/>
>+            <enum name="GL_BLEND_DST_RGB"/>
>+            <enum name="GL_BLEND_SRC_RGB"/>
>+            <enum name="GL_BLEND_DST_ALPHA"/>
>+            <enum name="GL_BLEND_SRC_ALPHA"/>
>+            <enum name="GL_CONSTANT_COLOR"/>
>+            <enum name="GL_ONE_MINUS_CONSTANT_COLOR"/>
>+            <enum name="GL_CONSTANT_ALPHA"/>
>+            <enum name="GL_ONE_MINUS_CONSTANT_ALPHA"/>
>+            <enum name="GL_BLEND_COLOR"/>
>+            <enum name="GL_ARRAY_BUFFER"/>
>+            <enum name="GL_ELEMENT_ARRAY_BUFFER"/>
>+            <enum name="GL_ARRAY_BUFFER_BINDING"/>
>+            <enum name="GL_ELEMENT_ARRAY_BUFFER_BINDING"/>
>+            <enum name="GL_STREAM_DRAW"/>
>+            <enum name="GL_STATIC_DRAW"/>
>+            <enum name="GL_DYNAMIC_DRAW"/>
>+            <enum name="GL_BUFFER_SIZE"/>
>+            <enum name="GL_BUFFER_USAGE"/>
>+            <enum name="GL_CURRENT_VERTEX_ATTRIB"/>
>+            <enum name="GL_FRONT"/>
>+            <enum name="GL_BACK"/>
>+            <enum name="GL_FRONT_AND_BACK"/>
>+            <enum name="GL_TEXTURE_2D"/>
>+            <enum name="GL_CULL_FACE"/>
>+            <enum name="GL_BLEND"/>
>+            <enum name="GL_DITHER"/>
>+            <enum name="GL_STENCIL_TEST"/>
>+            <enum name="GL_DEPTH_TEST"/>
>+            <enum name="GL_SCISSOR_TEST"/>
>+            <enum name="GL_POLYGON_OFFSET_FILL"/>
>+            <enum name="GL_SAMPLE_ALPHA_TO_COVERAGE"/>
>+            <enum name="GL_SAMPLE_COVERAGE"/>
>+            <enum name="GL_NO_ERROR"/>
>+            <enum name="GL_INVALID_ENUM"/>
>+            <enum name="GL_INVALID_VALUE"/>
>+            <enum name="GL_INVALID_OPERATION"/>
>+            <enum name="GL_OUT_OF_MEMORY"/>
>+            <enum name="GL_CW"/>
>+            <enum name="GL_CCW"/>
>+            <enum name="GL_LINE_WIDTH"/>
>+            <enum name="GL_ALIASED_POINT_SIZE_RANGE"/>
>+            <enum name="GL_ALIASED_LINE_WIDTH_RANGE"/>
>+            <enum name="GL_CULL_FACE_MODE"/>
>+            <enum name="GL_FRONT_FACE"/>
>+            <enum name="GL_DEPTH_RANGE"/>
>+            <enum name="GL_DEPTH_WRITEMASK"/>
>+            <enum name="GL_DEPTH_CLEAR_VALUE"/>
>+            <enum name="GL_DEPTH_FUNC"/>
>+            <enum name="GL_STENCIL_CLEAR_VALUE"/>
>+            <enum name="GL_STENCIL_FUNC"/>
>+            <enum name="GL_STENCIL_FAIL"/>
>+            <enum name="GL_STENCIL_PASS_DEPTH_FAIL"/>
>+            <enum name="GL_STENCIL_PASS_DEPTH_PASS"/>
>+            <enum name="GL_STENCIL_REF"/>
>+            <enum name="GL_STENCIL_VALUE_MASK"/>
>+            <enum name="GL_STENCIL_WRITEMASK"/>
>+            <enum name="GL_STENCIL_BACK_FUNC"/>
>+            <enum name="GL_STENCIL_BACK_FAIL"/>
>+            <enum name="GL_STENCIL_BACK_PASS_DEPTH_FAIL"/>
>+            <enum name="GL_STENCIL_BACK_PASS_DEPTH_PASS"/>
>+            <enum name="GL_STENCIL_BACK_REF"/>
>+            <enum name="GL_STENCIL_BACK_VALUE_MASK"/>
>+            <enum name="GL_STENCIL_BACK_WRITEMASK"/>
>+            <enum name="GL_VIEWPORT"/>
>+            <enum name="GL_SCISSOR_BOX"/>
>+            <enum name="GL_COLOR_CLEAR_VALUE"/>
>+            <enum name="GL_COLOR_WRITEMASK"/>
>+            <enum name="GL_UNPACK_ALIGNMENT"/>
>+            <enum name="GL_PACK_ALIGNMENT"/>
>+            <enum name="GL_MAX_TEXTURE_SIZE"/>
>+            <enum name="GL_MAX_VIEWPORT_DIMS"/>
>+            <enum name="GL_SUBPIXEL_BITS"/>
>+            <enum name="GL_RED_BITS"/>
>+            <enum name="GL_GREEN_BITS"/>
>+            <enum name="GL_BLUE_BITS"/>
>+            <enum name="GL_ALPHA_BITS"/>
>+            <enum name="GL_DEPTH_BITS"/>
>+            <enum name="GL_STENCIL_BITS"/>
>+            <enum name="GL_POLYGON_OFFSET_UNITS"/>
>+            <enum name="GL_POLYGON_OFFSET_FACTOR"/>
>+            <enum name="GL_TEXTURE_BINDING_2D"/>
>+            <enum name="GL_SAMPLE_BUFFERS"/>
>+            <enum name="GL_SAMPLES"/>
>+            <enum name="GL_SAMPLE_COVERAGE_VALUE"/>
>+            <enum name="GL_SAMPLE_COVERAGE_INVERT"/>
>+            <enum name="GL_NUM_COMPRESSED_TEXTURE_FORMATS"/>
>+            <enum name="GL_COMPRESSED_TEXTURE_FORMATS"/>
>+            <enum name="GL_DONT_CARE"/>
>+            <enum name="GL_FASTEST"/>
>+            <enum name="GL_NICEST"/>
>+            <enum name="GL_GENERATE_MIPMAP_HINT"/>
>+            <enum name="GL_BYTE"/>
>+            <enum name="GL_UNSIGNED_BYTE"/>
>+            <enum name="GL_SHORT"/>
>+            <enum name="GL_UNSIGNED_SHORT"/>
>+            <enum name="GL_INT"/>
>+            <enum name="GL_UNSIGNED_INT"/>
>+            <enum name="GL_FLOAT"/>
>+            <enum name="GL_FIXED"/>
>+            <enum name="GL_DEPTH_COMPONENT"/>
>+            <enum name="GL_ALPHA"/>
>+            <enum name="GL_RGB"/>
>+            <enum name="GL_RGBA"/>
>+            <enum name="GL_LUMINANCE"/>
>+            <enum name="GL_LUMINANCE_ALPHA"/>
>+            <enum name="GL_UNSIGNED_SHORT_4_4_4_4"/>
>+            <enum name="GL_UNSIGNED_SHORT_5_5_5_1"/>
>+            <enum name="GL_UNSIGNED_SHORT_5_6_5"/>
>+            <enum name="GL_FRAGMENT_SHADER"/>
>+            <enum name="GL_VERTEX_SHADER"/>
>+            <enum name="GL_MAX_VERTEX_ATTRIBS"/>
>+            <enum name="GL_MAX_VERTEX_UNIFORM_VECTORS"/>
>+            <enum name="GL_MAX_VARYING_VECTORS"/>
>+            <enum name="GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS"/>
>+            <enum name="GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS"/>
>+            <enum name="GL_MAX_TEXTURE_IMAGE_UNITS"/>
>+            <enum name="GL_MAX_FRAGMENT_UNIFORM_VECTORS"/>
>+            <enum name="GL_SHADER_TYPE"/>
>+            <enum name="GL_DELETE_STATUS"/>
>+            <enum name="GL_LINK_STATUS"/>
>+            <enum name="GL_VALIDATE_STATUS"/>
>+            <enum name="GL_ATTACHED_SHADERS"/>
>+            <enum name="GL_ACTIVE_UNIFORMS"/>
>+            <enum name="GL_ACTIVE_UNIFORM_MAX_LENGTH"/>
>+            <enum name="GL_ACTIVE_ATTRIBUTES"/>
>+            <enum name="GL_ACTIVE_ATTRIBUTE_MAX_LENGTH"/>
>+            <enum name="GL_SHADING_LANGUAGE_VERSION"/>
>+            <enum name="GL_CURRENT_PROGRAM"/>
>+            <enum name="GL_NEVER"/>
>+            <enum name="GL_LESS"/>
>+            <enum name="GL_EQUAL"/>
>+            <enum name="GL_LEQUAL"/>
>+            <enum name="GL_GREATER"/>
>+            <enum name="GL_NOTEQUAL"/>
>+            <enum name="GL_GEQUAL"/>
>+            <enum name="GL_ALWAYS"/>
>+            <enum name="GL_KEEP"/>
>+            <enum name="GL_REPLACE"/>
>+            <enum name="GL_INCR"/>
>+            <enum name="GL_DECR"/>
>+            <enum name="GL_INVERT"/>
>+            <enum name="GL_INCR_WRAP"/>
>+            <enum name="GL_DECR_WRAP"/>
>+            <enum name="GL_VENDOR"/>
>+            <enum name="GL_RENDERER"/>
>+            <enum name="GL_VERSION"/>
>+            <enum name="GL_EXTENSIONS"/>
>+            <enum name="GL_NEAREST"/>
>+            <enum name="GL_LINEAR"/>
>+            <enum name="GL_NEAREST_MIPMAP_NEAREST"/>
>+            <enum name="GL_LINEAR_MIPMAP_NEAREST"/>
>+            <enum name="GL_NEAREST_MIPMAP_LINEAR"/>
>+            <enum name="GL_LINEAR_MIPMAP_LINEAR"/>
>+            <enum name="GL_TEXTURE_MAG_FILTER"/>
>+            <enum name="GL_TEXTURE_MIN_FILTER"/>
>+            <enum name="GL_TEXTURE_WRAP_S"/>
>+            <enum name="GL_TEXTURE_WRAP_T"/>
>+            <enum name="GL_TEXTURE"/>
>+            <enum name="GL_TEXTURE_CUBE_MAP"/>
>+            <enum name="GL_TEXTURE_BINDING_CUBE_MAP"/>
>+            <enum name="GL_TEXTURE_CUBE_MAP_POSITIVE_X"/>
>+            <enum name="GL_TEXTURE_CUBE_MAP_NEGATIVE_X"/>
>+            <enum name="GL_TEXTURE_CUBE_MAP_POSITIVE_Y"/>
>+            <enum name="GL_TEXTURE_CUBE_MAP_NEGATIVE_Y"/>
>+            <enum name="GL_TEXTURE_CUBE_MAP_POSITIVE_Z"/>
>+            <enum name="GL_TEXTURE_CUBE_MAP_NEGATIVE_Z"/>
>+            <enum name="GL_MAX_CUBE_MAP_TEXTURE_SIZE"/>
>+            <enum name="GL_TEXTURE0"/>
>+            <enum name="GL_TEXTURE1"/>
>+            <enum name="GL_TEXTURE2"/>
>+            <enum name="GL_TEXTURE3"/>
>+            <enum name="GL_TEXTURE4"/>
>+            <enum name="GL_TEXTURE5"/>
>+            <enum name="GL_TEXTURE6"/>
>+            <enum name="GL_TEXTURE7"/>
>+            <enum name="GL_TEXTURE8"/>
>+            <enum name="GL_TEXTURE9"/>
>+            <enum name="GL_TEXTURE10"/>
>+            <enum name="GL_TEXTURE11"/>
>+            <enum name="GL_TEXTURE12"/>
>+            <enum name="GL_TEXTURE13"/>
>+            <enum name="GL_TEXTURE14"/>
>+            <enum name="GL_TEXTURE15"/>
>+            <enum name="GL_TEXTURE16"/>
>+            <enum name="GL_TEXTURE17"/>
>+            <enum name="GL_TEXTURE18"/>
>+            <enum name="GL_TEXTURE19"/>
>+            <enum name="GL_TEXTURE20"/>
>+            <enum name="GL_TEXTURE21"/>
>+            <enum name="GL_TEXTURE22"/>
>+            <enum name="GL_TEXTURE23"/>
>+            <enum name="GL_TEXTURE24"/>
>+            <enum name="GL_TEXTURE25"/>
>+            <enum name="GL_TEXTURE26"/>
>+            <enum name="GL_TEXTURE27"/>
>+            <enum name="GL_TEXTURE28"/>
>+            <enum name="GL_TEXTURE29"/>
>+            <enum name="GL_TEXTURE30"/>
>+            <enum name="GL_TEXTURE31"/>
>+            <enum name="GL_ACTIVE_TEXTURE"/>
>+            <enum name="GL_REPEAT"/>
>+            <enum name="GL_CLAMP_TO_EDGE"/>
>+            <enum name="GL_MIRRORED_REPEAT"/>
>+            <enum name="GL_FLOAT_VEC2"/>
>+            <enum name="GL_FLOAT_VEC3"/>
>+            <enum name="GL_FLOAT_VEC4"/>
>+            <enum name="GL_INT_VEC2"/>
>+            <enum name="GL_INT_VEC3"/>
>+            <enum name="GL_INT_VEC4"/>
>+            <enum name="GL_BOOL"/>
>+            <enum name="GL_BOOL_VEC2"/>
>+            <enum name="GL_BOOL_VEC3"/>
>+            <enum name="GL_BOOL_VEC4"/>
>+            <enum name="GL_FLOAT_MAT2"/>
>+            <enum name="GL_FLOAT_MAT3"/>
>+            <enum name="GL_FLOAT_MAT4"/>
>+            <enum name="GL_SAMPLER_2D"/>
>+            <enum name="GL_SAMPLER_CUBE"/>
>+            <enum name="GL_VERTEX_ATTRIB_ARRAY_ENABLED"/>
>+            <enum name="GL_VERTEX_ATTRIB_ARRAY_SIZE"/>
>+            <enum name="GL_VERTEX_ATTRIB_ARRAY_STRIDE"/>
>+            <enum name="GL_VERTEX_ATTRIB_ARRAY_TYPE"/>
>+            <enum name="GL_VERTEX_ATTRIB_ARRAY_NORMALIZED"/>
>+            <enum name="GL_VERTEX_ATTRIB_ARRAY_POINTER"/>
>+            <enum name="GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING"/>
>+            <enum name="GL_IMPLEMENTATION_COLOR_READ_TYPE"/>
>+            <enum name="GL_IMPLEMENTATION_COLOR_READ_FORMAT"/>
>+            <enum name="GL_COMPILE_STATUS"/>
>+            <enum name="GL_INFO_LOG_LENGTH"/>
>+            <enum name="GL_SHADER_SOURCE_LENGTH"/>
>+            <enum name="GL_SHADER_COMPILER"/>
>+            <enum name="GL_SHADER_BINARY_FORMATS"/>
>+            <enum name="GL_NUM_SHADER_BINARY_FORMATS"/>
>+            <enum name="GL_LOW_FLOAT"/>
>+            <enum name="GL_MEDIUM_FLOAT"/>
>+            <enum name="GL_HIGH_FLOAT"/>
>+            <enum name="GL_LOW_INT"/>
>+            <enum name="GL_MEDIUM_INT"/>
>+            <enum name="GL_HIGH_INT"/>
>+            <enum name="GL_FRAMEBUFFER"/>
>+            <enum name="GL_RENDERBUFFER"/>
>+            <enum name="GL_RGBA4"/>
>+            <enum name="GL_RGB5_A1"/>
>+            <enum name="GL_RGB565"/>
>+            <enum name="GL_DEPTH_COMPONENT16"/>
>+            <enum name="GL_STENCIL_INDEX8"/>
>+            <enum name="GL_RENDERBUFFER_WIDTH"/>
>+            <enum name="GL_RENDERBUFFER_HEIGHT"/>
>+            <enum name="GL_RENDERBUFFER_INTERNAL_FORMAT"/>
>+            <enum name="GL_RENDERBUFFER_RED_SIZE"/>
>+            <enum name="GL_RENDERBUFFER_GREEN_SIZE"/>
>+            <enum name="GL_RENDERBUFFER_BLUE_SIZE"/>
>+            <enum name="GL_RENDERBUFFER_ALPHA_SIZE"/>
>+            <enum name="GL_RENDERBUFFER_DEPTH_SIZE"/>
>+            <enum name="GL_RENDERBUFFER_STENCIL_SIZE"/>
>+            <enum name="GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE"/>
>+            <enum name="GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME"/>
>+            <enum name="GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL"/>
>+            <enum name="GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE"/>
>+            <enum name="GL_COLOR_ATTACHMENT0"/>
>+            <enum name="GL_DEPTH_ATTACHMENT"/>
>+            <enum name="GL_STENCIL_ATTACHMENT"/>
>+            <enum name="GL_NONE"/>
>+            <enum name="GL_FRAMEBUFFER_COMPLETE"/>
>+            <enum name="GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT"/>
>+            <enum name="GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT"/>
>+            <enum name="GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS"/>
>+            <enum name="GL_FRAMEBUFFER_UNSUPPORTED"/>
>+            <enum name="GL_FRAMEBUFFER_BINDING"/>
>+            <enum name="GL_RENDERBUFFER_BINDING"/>
>+            <enum name="GL_MAX_RENDERBUFFER_SIZE"/>
>+            <enum name="GL_INVALID_FRAMEBUFFER_OPERATION"/>
>+            <command name="glActiveTexture"/>
>+            <command name="glAttachShader"/>
>+            <command name="glBindAttribLocation"/>
>+            <command name="glBindBuffer"/>
>+            <command name="glBindFramebuffer"/>
>+            <command name="glBindRenderbuffer"/>
>+            <command name="glBindTexture"/>
>+            <command name="glBlendColor"/>
>+            <command name="glBlendEquation"/>
>+            <command name="glBlendEquationSeparate"/>
>+            <command name="glBlendFunc"/>
>+            <command name="glBlendFuncSeparate"/>
>+            <command name="glBufferData"/>
>+            <command name="glBufferSubData"/>
>+            <command name="glCheckFramebufferStatus"/>
>+            <command name="glClear"/>
>+            <command name="glClearColor"/>
>+            <command name="glClearDepthf"/>
>+            <command name="glClearStencil"/>
>+            <command name="glColorMask"/>
>+            <command name="glCompileShader"/>
>+            <command name="glCompressedTexImage2D"/>
>+            <command name="glCompressedTexSubImage2D"/>
>+            <command name="glCopyTexImage2D"/>
>+            <command name="glCopyTexSubImage2D"/>
>+            <command name="glCreateProgram"/>
>+            <command name="glCreateShader"/>
>+            <command name="glCullFace"/>
>+            <command name="glDeleteBuffers"/>
>+            <command name="glDeleteFramebuffers"/>
>+            <command name="glDeleteProgram"/>
>+            <command name="glDeleteRenderbuffers"/>
>+            <command name="glDeleteShader"/>
>+            <command name="glDeleteTextures"/>
>+            <command name="glDepthFunc"/>
>+            <command name="glDepthMask"/>
>+            <command name="glDepthRangef"/>
>+            <command name="glDetachShader"/>
>+            <command name="glDisable"/>
>+            <command name="glDisableVertexAttribArray"/>
>+            <command name="glDrawArrays"/>
>+            <command name="glDrawElements"/>
>+            <command name="glEnable"/>
>+            <command name="glEnableVertexAttribArray"/>
>+            <command name="glFinish"/>
>+            <command name="glFlush"/>
>+            <command name="glFramebufferRenderbuffer"/>
>+            <command name="glFramebufferTexture2D"/>
>+            <command name="glFrontFace"/>
>+            <command name="glGenBuffers"/>
>+            <command name="glGenerateMipmap"/>
>+            <command name="glGenFramebuffers"/>
>+            <command name="glGenRenderbuffers"/>
>+            <command name="glGenTextures"/>
>+            <command name="glGetActiveAttrib"/>
>+            <command name="glGetActiveUniform"/>
>+            <command name="glGetAttachedShaders"/>
>+            <command name="glGetAttribLocation"/>
>+            <command name="glGetBooleanv"/>
>+            <command name="glGetBufferParameteriv"/>
>+            <command name="glGetError"/>
>+            <command name="glGetFloatv"/>
>+            <command name="glGetFramebufferAttachmentParameteriv"/>
>+            <command name="glGetIntegerv"/>
>+            <command name="glGetProgramiv"/>
>+            <command name="glGetProgramInfoLog"/>
>+            <command name="glGetRenderbufferParameteriv"/>
>+            <command name="glGetShaderiv"/>
>+            <command name="glGetShaderInfoLog"/>
>+            <command name="glGetShaderPrecisionFormat"/>
>+            <command name="glGetShaderSource"/>
>+            <command name="glGetString"/>
>+            <command name="glGetTexParameterfv"/>
>+            <command name="glGetTexParameteriv"/>
>+            <command name="glGetUniformfv"/>
>+            <command name="glGetUniformiv"/>
>+            <command name="glGetUniformLocation"/>
>+            <command name="glGetVertexAttribfv"/>
>+            <command name="glGetVertexAttribiv"/>
>+            <command name="glGetVertexAttribPointerv"/>
>+            <command name="glHint"/>
>+            <command name="glIsBuffer"/>
>+            <command name="glIsEnabled"/>
>+            <command name="glIsFramebuffer"/>
>+            <command name="glIsProgram"/>
>+            <command name="glIsRenderbuffer"/>
>+            <command name="glIsShader"/>
>+            <command name="glIsTexture"/>
>+            <command name="glLineWidth"/>
>+            <command name="glLinkProgram"/>
>+            <command name="glPixelStorei"/>
>+            <command name="glPolygonOffset"/>
>+            <command name="glReadPixels"/>
>+            <command name="glReleaseShaderCompiler"/>
>+            <command name="glRenderbufferStorage"/>
>+            <command name="glSampleCoverage"/>
>+            <command name="glScissor"/>
>+            <command name="glShaderBinary"/>
>+            <command name="glShaderSource"/>
>+            <command name="glStencilFunc"/>
>+            <command name="glStencilFuncSeparate"/>
>+            <command name="glStencilMask"/>
>+            <command name="glStencilMaskSeparate"/>
>+            <command name="glStencilOp"/>
>+            <command name="glStencilOpSeparate"/>
>+            <command name="glTexImage2D"/>
>+            <command name="glTexParameterf"/>
>+            <command name="glTexParameterfv"/>
>+            <command name="glTexParameteri"/>
>+            <command name="glTexParameteriv"/>
>+            <command name="glTexSubImage2D"/>
>+            <command name="glUniform1f"/>
>+            <command name="glUniform1fv"/>
>+            <command name="glUniform1i"/>
>+            <command name="glUniform1iv"/>
>+            <command name="glUniform2f"/>
>+            <command name="glUniform2fv"/>
>+            <command name="glUniform2i"/>
>+            <command name="glUniform2iv"/>
>+            <command name="glUniform3f"/>
>+            <command name="glUniform3fv"/>
>+            <command name="glUniform3i"/>
>+            <command name="glUniform3iv"/>
>+            <command name="glUniform4f"/>
>+            <command name="glUniform4fv"/>
>+            <command name="glUniform4i"/>
>+            <command name="glUniform4iv"/>
>+            <command name="glUniformMatrix2fv"/>
>+            <command name="glUniformMatrix3fv"/>
>+            <command name="glUniformMatrix4fv"/>
>+            <command name="glUseProgram"/>
>+            <command name="glValidateProgram"/>
>+            <command name="glVertexAttrib1f"/>
>+            <command name="glVertexAttrib1fv"/>
>+            <command name="glVertexAttrib2f"/>
>+            <command name="glVertexAttrib2fv"/>
>+            <command name="glVertexAttrib3f"/>
>+            <command name="glVertexAttrib3fv"/>
>+            <command name="glVertexAttrib4f"/>
>+            <command name="glVertexAttrib4fv"/>
>+            <command name="glVertexAttribPointer"/>
>+            <command name="glViewport"/>
>+        </require>
>+    </feature>
>+    <feature api="gles2" name="GL_ES_VERSION_3_0" number="3.0">
>+        <require comment="Not used by the API, for compatibility with old gl2.h">
>+            <type name="GLhalf"/>
>+        </require>
>+        <require>
>+            <enum name="GL_READ_BUFFER"/>
>+            <enum name="GL_UNPACK_ROW_LENGTH"/>
>+            <enum name="GL_UNPACK_SKIP_ROWS"/>
>+            <enum name="GL_UNPACK_SKIP_PIXELS"/>
>+            <enum name="GL_PACK_ROW_LENGTH"/>
>+            <enum name="GL_PACK_SKIP_ROWS"/>
>+            <enum name="GL_PACK_SKIP_PIXELS"/>
>+            <enum name="GL_COLOR"/>
>+            <enum name="GL_DEPTH"/>
>+            <enum name="GL_STENCIL"/>
>+            <enum name="GL_RED"/>
>+            <enum name="GL_RGB8"/>
>+            <enum name="GL_RGBA8"/>
>+            <enum name="GL_RGB10_A2"/>
>+            <enum name="GL_TEXTURE_BINDING_3D"/>
>+            <enum name="GL_UNPACK_SKIP_IMAGES"/>
>+            <enum name="GL_UNPACK_IMAGE_HEIGHT"/>
>+            <enum name="GL_TEXTURE_3D"/>
>+            <enum name="GL_TEXTURE_WRAP_R"/>
>+            <enum name="GL_MAX_3D_TEXTURE_SIZE"/>
>+            <enum name="GL_UNSIGNED_INT_2_10_10_10_REV"/>
>+            <enum name="GL_MAX_ELEMENTS_VERTICES"/>
>+            <enum name="GL_MAX_ELEMENTS_INDICES"/>
>+            <enum name="GL_TEXTURE_MIN_LOD"/>
>+            <enum name="GL_TEXTURE_MAX_LOD"/>
>+            <enum name="GL_TEXTURE_BASE_LEVEL"/>
>+            <enum name="GL_TEXTURE_MAX_LEVEL"/>
>+            <enum name="GL_MIN"/>
>+            <enum name="GL_MAX"/>
>+            <enum name="GL_DEPTH_COMPONENT24"/>
>+            <enum name="GL_MAX_TEXTURE_LOD_BIAS"/>
>+            <enum name="GL_TEXTURE_COMPARE_MODE"/>
>+            <enum name="GL_TEXTURE_COMPARE_FUNC"/>
>+            <enum name="GL_CURRENT_QUERY"/>
>+            <enum name="GL_QUERY_RESULT"/>
>+            <enum name="GL_QUERY_RESULT_AVAILABLE"/>
>+            <enum name="GL_BUFFER_MAPPED"/>
>+            <enum name="GL_BUFFER_MAP_POINTER"/>
>+            <enum name="GL_STREAM_READ"/>
>+            <enum name="GL_STREAM_COPY"/>
>+            <enum name="GL_STATIC_READ"/>
>+            <enum name="GL_STATIC_COPY"/>
>+            <enum name="GL_DYNAMIC_READ"/>
>+            <enum name="GL_DYNAMIC_COPY"/>
>+            <enum name="GL_MAX_DRAW_BUFFERS"/>
>+            <enum name="GL_DRAW_BUFFER0"/>
>+            <enum name="GL_DRAW_BUFFER1"/>
>+            <enum name="GL_DRAW_BUFFER2"/>
>+            <enum name="GL_DRAW_BUFFER3"/>
>+            <enum name="GL_DRAW_BUFFER4"/>
>+            <enum name="GL_DRAW_BUFFER5"/>
>+            <enum name="GL_DRAW_BUFFER6"/>
>+            <enum name="GL_DRAW_BUFFER7"/>
>+            <enum name="GL_DRAW_BUFFER8"/>
>+            <enum name="GL_DRAW_BUFFER9"/>
>+            <enum name="GL_DRAW_BUFFER10"/>
>+            <enum name="GL_DRAW_BUFFER11"/>
>+            <enum name="GL_DRAW_BUFFER12"/>
>+            <enum name="GL_DRAW_BUFFER13"/>
>+            <enum name="GL_DRAW_BUFFER14"/>
>+            <enum name="GL_DRAW_BUFFER15"/>
>+            <enum name="GL_MAX_FRAGMENT_UNIFORM_COMPONENTS"/>
>+            <enum name="GL_MAX_VERTEX_UNIFORM_COMPONENTS"/>
>+            <enum name="GL_SAMPLER_3D"/>
>+            <enum name="GL_SAMPLER_2D_SHADOW"/>
>+            <enum name="GL_FRAGMENT_SHADER_DERIVATIVE_HINT"/>
>+            <enum name="GL_PIXEL_PACK_BUFFER"/>
>+            <enum name="GL_PIXEL_UNPACK_BUFFER"/>
>+            <enum name="GL_PIXEL_PACK_BUFFER_BINDING"/>
>+            <enum name="GL_PIXEL_UNPACK_BUFFER_BINDING"/>
>+            <enum name="GL_FLOAT_MAT2x3"/>
>+            <enum name="GL_FLOAT_MAT2x4"/>
>+            <enum name="GL_FLOAT_MAT3x2"/>
>+            <enum name="GL_FLOAT_MAT3x4"/>
>+            <enum name="GL_FLOAT_MAT4x2"/>
>+            <enum name="GL_FLOAT_MAT4x3"/>
>+            <enum name="GL_SRGB"/>
>+            <enum name="GL_SRGB8"/>
>+            <enum name="GL_SRGB8_ALPHA8"/>
>+            <enum name="GL_COMPARE_REF_TO_TEXTURE"/>
>+            <enum name="GL_MAJOR_VERSION"/>
>+            <enum name="GL_MINOR_VERSION"/>
>+            <enum name="GL_NUM_EXTENSIONS"/>
>+            <enum name="GL_RGBA32F"/>
>+            <enum name="GL_RGB32F"/>
>+            <enum name="GL_RGBA16F"/>
>+            <enum name="GL_RGB16F"/>
>+            <enum name="GL_VERTEX_ATTRIB_ARRAY_INTEGER"/>
>+            <enum name="GL_MAX_ARRAY_TEXTURE_LAYERS"/>
>+            <enum name="GL_MIN_PROGRAM_TEXEL_OFFSET"/>
>+            <enum name="GL_MAX_PROGRAM_TEXEL_OFFSET"/>
>+            <enum name="GL_MAX_VARYING_COMPONENTS"/>
>+            <enum name="GL_TEXTURE_2D_ARRAY"/>
>+            <enum name="GL_TEXTURE_BINDING_2D_ARRAY"/>
>+            <enum name="GL_R11F_G11F_B10F"/>
>+            <enum name="GL_UNSIGNED_INT_10F_11F_11F_REV"/>
>+            <enum name="GL_RGB9_E5"/>
>+            <enum name="GL_UNSIGNED_INT_5_9_9_9_REV"/>
>+            <enum name="GL_TRANSFORM_FEEDBACK_VARYING_MAX_LENGTH"/>
>+            <enum name="GL_TRANSFORM_FEEDBACK_BUFFER_MODE"/>
>+            <enum name="GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_COMPONENTS"/>
>+            <enum name="GL_TRANSFORM_FEEDBACK_VARYINGS"/>
>+            <enum name="GL_TRANSFORM_FEEDBACK_BUFFER_START"/>
>+            <enum name="GL_TRANSFORM_FEEDBACK_BUFFER_SIZE"/>
>+            <enum name="GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN"/>
>+            <enum name="GL_RASTERIZER_DISCARD"/>
>+            <enum name="GL_MAX_TRANSFORM_FEEDBACK_INTERLEAVED_COMPONENTS"/>
>+            <enum name="GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_ATTRIBS"/>
>+            <enum name="GL_INTERLEAVED_ATTRIBS"/>
>+            <enum name="GL_SEPARATE_ATTRIBS"/>
>+            <enum name="GL_TRANSFORM_FEEDBACK_BUFFER"/>
>+            <enum name="GL_TRANSFORM_FEEDBACK_BUFFER_BINDING"/>
>+            <enum name="GL_RGBA32UI"/>
>+            <enum name="GL_RGB32UI"/>
>+            <enum name="GL_RGBA16UI"/>
>+            <enum name="GL_RGB16UI"/>
>+            <enum name="GL_RGBA8UI"/>
>+            <enum name="GL_RGB8UI"/>
>+            <enum name="GL_RGBA32I"/>
>+            <enum name="GL_RGB32I"/>
>+            <enum name="GL_RGBA16I"/>
>+            <enum name="GL_RGB16I"/>
>+            <enum name="GL_RGBA8I"/>
>+            <enum name="GL_RGB8I"/>
>+            <enum name="GL_RED_INTEGER"/>
>+            <enum name="GL_RGB_INTEGER"/>
>+            <enum name="GL_RGBA_INTEGER"/>
>+            <enum name="GL_SAMPLER_2D_ARRAY"/>
>+            <enum name="GL_SAMPLER_2D_ARRAY_SHADOW"/>
>+            <enum name="GL_SAMPLER_CUBE_SHADOW"/>
>+            <enum name="GL_UNSIGNED_INT_VEC2"/>
>+            <enum name="GL_UNSIGNED_INT_VEC3"/>
>+            <enum name="GL_UNSIGNED_INT_VEC4"/>
>+            <enum name="GL_INT_SAMPLER_2D"/>
>+            <enum name="GL_INT_SAMPLER_3D"/>
>+            <enum name="GL_INT_SAMPLER_CUBE"/>
>+            <enum name="GL_INT_SAMPLER_2D_ARRAY"/>
>+            <enum name="GL_UNSIGNED_INT_SAMPLER_2D"/>
>+            <enum name="GL_UNSIGNED_INT_SAMPLER_3D"/>
>+            <enum name="GL_UNSIGNED_INT_SAMPLER_CUBE"/>
>+            <enum name="GL_UNSIGNED_INT_SAMPLER_2D_ARRAY"/>
>+            <enum name="GL_BUFFER_ACCESS_FLAGS"/>
>+            <enum name="GL_BUFFER_MAP_LENGTH"/>
>+            <enum name="GL_BUFFER_MAP_OFFSET"/>
>+            <enum name="GL_DEPTH_COMPONENT32F"/>
>+            <enum name="GL_DEPTH32F_STENCIL8"/>
>+            <enum name="GL_FLOAT_32_UNSIGNED_INT_24_8_REV"/>
>+            <enum name="GL_FRAMEBUFFER_ATTACHMENT_COLOR_ENCODING"/>
>+            <enum name="GL_FRAMEBUFFER_ATTACHMENT_COMPONENT_TYPE"/>
>+            <enum name="GL_FRAMEBUFFER_ATTACHMENT_RED_SIZE"/>
>+            <enum name="GL_FRAMEBUFFER_ATTACHMENT_GREEN_SIZE"/>
>+            <enum name="GL_FRAMEBUFFER_ATTACHMENT_BLUE_SIZE"/>
>+            <enum name="GL_FRAMEBUFFER_ATTACHMENT_ALPHA_SIZE"/>
>+            <enum name="GL_FRAMEBUFFER_ATTACHMENT_DEPTH_SIZE"/>
>+            <enum name="GL_FRAMEBUFFER_ATTACHMENT_STENCIL_SIZE"/>
>+            <enum name="GL_FRAMEBUFFER_DEFAULT"/>
>+            <enum name="GL_FRAMEBUFFER_UNDEFINED"/>
>+            <enum name="GL_DEPTH_STENCIL_ATTACHMENT"/>
>+            <enum name="GL_DEPTH_STENCIL"/>
>+            <enum name="GL_UNSIGNED_INT_24_8"/>
>+            <enum name="GL_DEPTH24_STENCIL8"/>
>+            <enum name="GL_UNSIGNED_NORMALIZED"/>
>+            <enum name="GL_DRAW_FRAMEBUFFER_BINDING"/>
>+            <enum name="GL_READ_FRAMEBUFFER"/>
>+            <enum name="GL_DRAW_FRAMEBUFFER"/>
>+            <enum name="GL_READ_FRAMEBUFFER_BINDING"/>
>+            <enum name="GL_RENDERBUFFER_SAMPLES"/>
>+            <enum name="GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER"/>
>+            <enum name="GL_MAX_COLOR_ATTACHMENTS"/>
>+            <enum name="GL_COLOR_ATTACHMENT1"/>
>+            <enum name="GL_COLOR_ATTACHMENT2"/>
>+            <enum name="GL_COLOR_ATTACHMENT3"/>
>+            <enum name="GL_COLOR_ATTACHMENT4"/>
>+            <enum name="GL_COLOR_ATTACHMENT5"/>
>+            <enum name="GL_COLOR_ATTACHMENT6"/>
>+            <enum name="GL_COLOR_ATTACHMENT7"/>
>+            <enum name="GL_COLOR_ATTACHMENT8"/>
>+            <enum name="GL_COLOR_ATTACHMENT9"/>
>+            <enum name="GL_COLOR_ATTACHMENT10"/>
>+            <enum name="GL_COLOR_ATTACHMENT11"/>
>+            <enum name="GL_COLOR_ATTACHMENT12"/>
>+            <enum name="GL_COLOR_ATTACHMENT13"/>
>+            <enum name="GL_COLOR_ATTACHMENT14"/>
>+            <enum name="GL_COLOR_ATTACHMENT15"/>
>+            <enum name="GL_COLOR_ATTACHMENT16"/>
>+            <enum name="GL_COLOR_ATTACHMENT17"/>
>+            <enum name="GL_COLOR_ATTACHMENT18"/>
>+            <enum name="GL_COLOR_ATTACHMENT19"/>
>+            <enum name="GL_COLOR_ATTACHMENT20"/>
>+            <enum name="GL_COLOR_ATTACHMENT21"/>
>+            <enum name="GL_COLOR_ATTACHMENT22"/>
>+            <enum name="GL_COLOR_ATTACHMENT23"/>
>+            <enum name="GL_COLOR_ATTACHMENT24"/>
>+            <enum name="GL_COLOR_ATTACHMENT25"/>
>+            <enum name="GL_COLOR_ATTACHMENT26"/>
>+            <enum name="GL_COLOR_ATTACHMENT27"/>
>+            <enum name="GL_COLOR_ATTACHMENT28"/>
>+            <enum name="GL_COLOR_ATTACHMENT29"/>
>+            <enum name="GL_COLOR_ATTACHMENT30"/>
>+            <enum name="GL_COLOR_ATTACHMENT31"/>
>+            <enum name="GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE"/>
>+            <enum name="GL_MAX_SAMPLES"/>
>+            <enum name="GL_HALF_FLOAT"/>
>+            <enum name="GL_MAP_READ_BIT"/>
>+            <enum name="GL_MAP_WRITE_BIT"/>
>+            <enum name="GL_MAP_INVALIDATE_RANGE_BIT"/>
>+            <enum name="GL_MAP_INVALIDATE_BUFFER_BIT"/>
>+            <enum name="GL_MAP_FLUSH_EXPLICIT_BIT"/>
>+            <enum name="GL_MAP_UNSYNCHRONIZED_BIT"/>
>+            <enum name="GL_RG"/>
>+            <enum name="GL_RG_INTEGER"/>
>+            <enum name="GL_R8"/>
>+            <enum name="GL_RG8"/>
>+            <enum name="GL_R16F"/>
>+            <enum name="GL_R32F"/>
>+            <enum name="GL_RG16F"/>
>+            <enum name="GL_RG32F"/>
>+            <enum name="GL_R8I"/>
>+            <enum name="GL_R8UI"/>
>+            <enum name="GL_R16I"/>
>+            <enum name="GL_R16UI"/>
>+            <enum name="GL_R32I"/>
>+            <enum name="GL_R32UI"/>
>+            <enum name="GL_RG8I"/>
>+            <enum name="GL_RG8UI"/>
>+            <enum name="GL_RG16I"/>
>+            <enum name="GL_RG16UI"/>
>+            <enum name="GL_RG32I"/>
>+            <enum name="GL_RG32UI"/>
>+            <enum name="GL_VERTEX_ARRAY_BINDING"/>
>+            <enum name="GL_R8_SNORM"/>
>+            <enum name="GL_RG8_SNORM"/>
>+            <enum name="GL_RGB8_SNORM"/>
>+            <enum name="GL_RGBA8_SNORM"/>
>+            <enum name="GL_SIGNED_NORMALIZED"/>
>+            <enum name="GL_PRIMITIVE_RESTART_FIXED_INDEX"/>
>+            <enum name="GL_COPY_READ_BUFFER"/>
>+            <enum name="GL_COPY_WRITE_BUFFER"/>
>+            <enum name="GL_COPY_READ_BUFFER_BINDING"/>
>+            <enum name="GL_COPY_WRITE_BUFFER_BINDING"/>
>+            <enum name="GL_UNIFORM_BUFFER"/>
>+            <enum name="GL_UNIFORM_BUFFER_BINDING"/>
>+            <enum name="GL_UNIFORM_BUFFER_START"/>
>+            <enum name="GL_UNIFORM_BUFFER_SIZE"/>
>+            <enum name="GL_MAX_VERTEX_UNIFORM_BLOCKS"/>
>+            <enum name="GL_MAX_FRAGMENT_UNIFORM_BLOCKS"/>
>+            <enum name="GL_MAX_COMBINED_UNIFORM_BLOCKS"/>
>+            <enum name="GL_MAX_UNIFORM_BUFFER_BINDINGS"/>
>+            <enum name="GL_MAX_UNIFORM_BLOCK_SIZE"/>
>+            <enum name="GL_MAX_COMBINED_VERTEX_UNIFORM_COMPONENTS"/>
>+            <enum name="GL_MAX_COMBINED_FRAGMENT_UNIFORM_COMPONENTS"/>
>+            <enum name="GL_UNIFORM_BUFFER_OFFSET_ALIGNMENT"/>
>+            <enum name="GL_ACTIVE_UNIFORM_BLOCK_MAX_NAME_LENGTH"/>
>+            <enum name="GL_ACTIVE_UNIFORM_BLOCKS"/>
>+            <enum name="GL_UNIFORM_TYPE"/>
>+            <enum name="GL_UNIFORM_SIZE"/>
>+            <enum name="GL_UNIFORM_NAME_LENGTH"/>
>+            <enum name="GL_UNIFORM_BLOCK_INDEX"/>
>+            <enum name="GL_UNIFORM_OFFSET"/>
>+            <enum name="GL_UNIFORM_ARRAY_STRIDE"/>
>+            <enum name="GL_UNIFORM_MATRIX_STRIDE"/>
>+            <enum name="GL_UNIFORM_IS_ROW_MAJOR"/>
>+            <enum name="GL_UNIFORM_BLOCK_BINDING"/>
>+            <enum name="GL_UNIFORM_BLOCK_DATA_SIZE"/>
>+            <enum name="GL_UNIFORM_BLOCK_NAME_LENGTH"/>
>+            <enum name="GL_UNIFORM_BLOCK_ACTIVE_UNIFORMS"/>
>+            <enum name="GL_UNIFORM_BLOCK_ACTIVE_UNIFORM_INDICES"/>
>+            <enum name="GL_UNIFORM_BLOCK_REFERENCED_BY_VERTEX_SHADER"/>
>+            <enum name="GL_UNIFORM_BLOCK_REFERENCED_BY_FRAGMENT_SHADER"/>
>+            <enum name="GL_INVALID_INDEX"/>
>+            <enum name="GL_MAX_VERTEX_OUTPUT_COMPONENTS"/>
>+            <enum name="GL_MAX_FRAGMENT_INPUT_COMPONENTS"/>
>+            <enum name="GL_MAX_SERVER_WAIT_TIMEOUT"/>
>+            <enum name="GL_OBJECT_TYPE"/>
>+            <enum name="GL_SYNC_CONDITION"/>
>+            <enum name="GL_SYNC_STATUS"/>
>+            <enum name="GL_SYNC_FLAGS"/>
>+            <enum name="GL_SYNC_FENCE"/>
>+            <enum name="GL_SYNC_GPU_COMMANDS_COMPLETE"/>
>+            <enum name="GL_UNSIGNALED"/>
>+            <enum name="GL_SIGNALED"/>
>+            <enum name="GL_ALREADY_SIGNALED"/>
>+            <enum name="GL_TIMEOUT_EXPIRED"/>
>+            <enum name="GL_CONDITION_SATISFIED"/>
>+            <enum name="GL_WAIT_FAILED"/>
>+            <enum name="GL_SYNC_FLUSH_COMMANDS_BIT"/>
>+            <enum name="GL_TIMEOUT_IGNORED"/>
>+            <enum name="GL_VERTEX_ATTRIB_ARRAY_DIVISOR"/>
>+            <enum name="GL_ANY_SAMPLES_PASSED"/>
>+            <enum name="GL_ANY_SAMPLES_PASSED_CONSERVATIVE"/>
>+            <enum name="GL_SAMPLER_BINDING"/>
>+            <enum name="GL_RGB10_A2UI"/>
>+            <enum name="GL_TEXTURE_SWIZZLE_R"/>
>+            <enum name="GL_TEXTURE_SWIZZLE_G"/>
>+            <enum name="GL_TEXTURE_SWIZZLE_B"/>
>+            <enum name="GL_TEXTURE_SWIZZLE_A"/>
>+            <enum name="GL_GREEN"/>
>+            <enum name="GL_BLUE"/>
>+            <enum name="GL_INT_2_10_10_10_REV"/>
>+            <enum name="GL_TRANSFORM_FEEDBACK"/>
>+            <enum name="GL_TRANSFORM_FEEDBACK_PAUSED"/>
>+            <enum name="GL_TRANSFORM_FEEDBACK_ACTIVE"/>
>+            <enum name="GL_TRANSFORM_FEEDBACK_BINDING"/>
>+            <enum name="GL_PROGRAM_BINARY_RETRIEVABLE_HINT"/>
>+            <enum name="GL_PROGRAM_BINARY_LENGTH"/>
>+            <enum name="GL_NUM_PROGRAM_BINARY_FORMATS"/>
>+            <enum name="GL_PROGRAM_BINARY_FORMATS"/>
>+            <enum name="GL_COMPRESSED_R11_EAC"/>
>+            <enum name="GL_COMPRESSED_SIGNED_R11_EAC"/>
>+            <enum name="GL_COMPRESSED_RG11_EAC"/>
>+            <enum name="GL_COMPRESSED_SIGNED_RG11_EAC"/>
>+            <enum name="GL_COMPRESSED_RGB8_ETC2"/>
>+            <enum name="GL_COMPRESSED_SRGB8_ETC2"/>
>+            <enum name="GL_COMPRESSED_RGB8_PUNCHTHROUGH_ALPHA1_ETC2"/>
>+            <enum name="GL_COMPRESSED_SRGB8_PUNCHTHROUGH_ALPHA1_ETC2"/>
>+            <enum name="GL_COMPRESSED_RGBA8_ETC2_EAC"/>
>+            <enum name="GL_COMPRESSED_SRGB8_ALPHA8_ETC2_EAC"/>
>+            <enum name="GL_TEXTURE_IMMUTABLE_FORMAT"/>
>+            <enum name="GL_MAX_ELEMENT_INDEX"/>
>+            <enum name="GL_NUM_SAMPLE_COUNTS"/>
>+            <enum name="GL_TEXTURE_IMMUTABLE_LEVELS"/>
>+            <command name="glReadBuffer"/>
>+            <command name="glDrawRangeElements"/>
>+            <command name="glTexImage3D"/>
>+            <command name="glTexSubImage3D"/>
>+            <command name="glCopyTexSubImage3D"/>
>+            <command name="glCompressedTexImage3D"/>
>+            <command name="glCompressedTexSubImage3D"/>
>+            <command name="glGenQueries"/>
>+            <command name="glDeleteQueries"/>
>+            <command name="glIsQuery"/>
>+            <command name="glBeginQuery"/>
>+            <command name="glEndQuery"/>
>+            <command name="glGetQueryiv"/>
>+            <command name="glGetQueryObjectuiv"/>
>+            <command name="glUnmapBuffer"/>
>+            <command name="glGetBufferPointerv"/>
>+            <command name="glDrawBuffers"/>
>+            <command name="glUniformMatrix2x3fv"/>
>+            <command name="glUniformMatrix3x2fv"/>
>+            <command name="glUniformMatrix2x4fv"/>
>+            <command name="glUniformMatrix4x2fv"/>
>+            <command name="glUniformMatrix3x4fv"/>
>+            <command name="glUniformMatrix4x3fv"/>
>+            <command name="glBlitFramebuffer"/>
>+            <command name="glRenderbufferStorageMultisample"/>
>+            <command name="glFramebufferTextureLayer"/>
>+            <command name="glMapBufferRange"/>
>+            <command name="glFlushMappedBufferRange"/>
>+            <command name="glBindVertexArray"/>
>+            <command name="glDeleteVertexArrays"/>
>+            <command name="glGenVertexArrays"/>
>+            <command name="glIsVertexArray"/>
>+            <command name="glGetIntegeri_v"/>
>+            <command name="glBeginTransformFeedback"/>
>+            <command name="glEndTransformFeedback"/>
>+            <command name="glBindBufferRange"/>
>+            <command name="glBindBufferBase"/>
>+            <command name="glTransformFeedbackVaryings"/>
>+            <command name="glGetTransformFeedbackVarying"/>
>+            <command name="glVertexAttribIPointer"/>
>+            <command name="glGetVertexAttribIiv"/>
>+            <command name="glGetVertexAttribIuiv"/>
>+            <command name="glVertexAttribI4i"/>
>+            <command name="glVertexAttribI4ui"/>
>+            <command name="glVertexAttribI4iv"/>
>+            <command name="glVertexAttribI4uiv"/>
>+            <command name="glGetUniformuiv"/>
>+            <command name="glGetFragDataLocation"/>
>+            <command name="glUniform1ui"/>
>+            <command name="glUniform2ui"/>
>+            <command name="glUniform3ui"/>
>+            <command name="glUniform4ui"/>
>+            <command name="glUniform1uiv"/>
>+            <command name="glUniform2uiv"/>
>+            <command name="glUniform3uiv"/>
>+            <command name="glUniform4uiv"/>
>+            <command name="glClearBufferiv"/>
>+            <command name="glClearBufferuiv"/>
>+            <command name="glClearBufferfv"/>
>+            <command name="glClearBufferfi"/>
>+            <command name="glGetStringi"/>
>+            <command name="glCopyBufferSubData"/>
>+            <command name="glGetUniformIndices"/>
>+            <command name="glGetActiveUniformsiv"/>
>+            <command name="glGetUniformBlockIndex"/>
>+            <command name="glGetActiveUniformBlockiv"/>
>+            <command name="glGetActiveUniformBlockName"/>
>+            <command name="glUniformBlockBinding"/>
>+            <command name="glDrawArraysInstanced"/>
>+            <command name="glDrawElementsInstanced"/>
>+            <command name="glFenceSync"/>
>+            <command name="glIsSync"/>
>+            <command name="glDeleteSync"/>
>+            <command name="glClientWaitSync"/>
>+            <command name="glWaitSync"/>
>+            <command name="glGetInteger64v"/>
>+            <command name="glGetSynciv"/>
>+            <command name="glGetInteger64i_v"/>
>+            <command name="glGetBufferParameteri64v"/>
>+            <command name="glGenSamplers"/>
>+            <command name="glDeleteSamplers"/>
>+            <command name="glIsSampler"/>
>+            <command name="glBindSampler"/>
>+            <command name="glSamplerParameteri"/>
>+            <command name="glSamplerParameteriv"/>
>+            <command name="glSamplerParameterf"/>
>+            <command name="glSamplerParameterfv"/>
>+            <command name="glGetSamplerParameteriv"/>
>+            <command name="glGetSamplerParameterfv"/>
>+            <command name="glVertexAttribDivisor"/>
>+            <command name="glBindTransformFeedback"/>
>+            <command name="glDeleteTransformFeedbacks"/>
>+            <command name="glGenTransformFeedbacks"/>
>+            <command name="glIsTransformFeedback"/>
>+            <command name="glPauseTransformFeedback"/>
>+            <command name="glResumeTransformFeedback"/>
>+            <command name="glGetProgramBinary"/>
>+            <command name="glProgramBinary"/>
>+            <command name="glProgramParameteri"/>
>+            <command name="glInvalidateFramebuffer"/>
>+            <command name="glInvalidateSubFramebuffer"/>
>+            <command name="glTexStorage2D"/>
>+            <command name="glTexStorage3D"/>
>+            <command name="glGetInternalformativ"/>
>+        </require>
>+    </feature>
>+    <feature api="gles2" name="GL_ES_VERSION_3_1" number="3.1">
>+        
>+        <require/>
>+        
>+        <require>
>+            <command name="glDispatchCompute"/>
>+            <command name="glDispatchComputeIndirect"/>
>+            <enum name="GL_COMPUTE_SHADER"/>
>+            <enum name="GL_MAX_COMPUTE_UNIFORM_BLOCKS"/>
>+            <enum name="GL_MAX_COMPUTE_TEXTURE_IMAGE_UNITS"/>
>+            <enum name="GL_MAX_COMPUTE_IMAGE_UNIFORMS"/>
>+            <enum name="GL_MAX_COMPUTE_SHARED_MEMORY_SIZE"/>
>+            <enum name="GL_MAX_COMPUTE_UNIFORM_COMPONENTS"/>
>+            <enum name="GL_MAX_COMPUTE_ATOMIC_COUNTER_BUFFERS"/>
>+            <enum name="GL_MAX_COMPUTE_ATOMIC_COUNTERS"/>
>+            <enum name="GL_MAX_COMBINED_COMPUTE_UNIFORM_COMPONENTS"/>
>+            <enum name="GL_MAX_COMPUTE_WORK_GROUP_INVOCATIONS"/>
>+            <enum name="GL_MAX_COMPUTE_WORK_GROUP_COUNT"/>
>+            <enum name="GL_MAX_COMPUTE_WORK_GROUP_SIZE"/>
>+            <enum name="GL_COMPUTE_WORK_GROUP_SIZE"/>
>+            <enum name="GL_DISPATCH_INDIRECT_BUFFER"/>
>+            <enum name="GL_DISPATCH_INDIRECT_BUFFER_BINDING"/>
>+            <enum name="GL_COMPUTE_SHADER_BIT"/>
>+        </require>
>+        
>+        <require>
>+            <command name="glDrawArraysIndirect"/>
>+            <command name="glDrawElementsIndirect"/>
>+            <enum name="GL_DRAW_INDIRECT_BUFFER"/>
>+            <enum name="GL_DRAW_INDIRECT_BUFFER_BINDING"/>
>+        </require>
>+        
>+        <require>
>+            <enum name="GL_MAX_UNIFORM_LOCATIONS"/>
>+        </require>
>+        
>+        <require>
>+            <command name="glFramebufferParameteri"/>
>+            <command name="glGetFramebufferParameteriv"/>
>+            <enum name="GL_FRAMEBUFFER_DEFAULT_WIDTH"/>
>+            <enum name="GL_FRAMEBUFFER_DEFAULT_HEIGHT"/>
>+            <enum name="GL_FRAMEBUFFER_DEFAULT_SAMPLES"/>
>+            <enum name="GL_FRAMEBUFFER_DEFAULT_FIXED_SAMPLE_LOCATIONS"/>
>+            <enum name="GL_MAX_FRAMEBUFFER_WIDTH"/>
>+            <enum name="GL_MAX_FRAMEBUFFER_HEIGHT"/>
>+            <enum name="GL_MAX_FRAMEBUFFER_SAMPLES"/>
>+        </require>
>+        
>+        <require>
>+            <command name="glGetProgramInterfaceiv"/>
>+            <command name="glGetProgramResourceIndex"/>
>+            <command name="glGetProgramResourceName"/>
>+            <command name="glGetProgramResourceiv"/>
>+            <command name="glGetProgramResourceLocation"/>
>+            <enum name="GL_UNIFORM"/>
>+            <enum name="GL_UNIFORM_BLOCK"/>
>+            <enum name="GL_PROGRAM_INPUT"/>
>+            <enum name="GL_PROGRAM_OUTPUT"/>
>+            <enum name="GL_BUFFER_VARIABLE"/>
>+            <enum name="GL_SHADER_STORAGE_BLOCK"/>
>+            <enum name="GL_ATOMIC_COUNTER_BUFFER"/>
>+            <enum name="GL_TRANSFORM_FEEDBACK_VARYING"/>
>+            <enum name="GL_ACTIVE_RESOURCES"/>
>+            <enum name="GL_MAX_NAME_LENGTH"/>
>+            <enum name="GL_MAX_NUM_ACTIVE_VARIABLES"/>
>+            <enum name="GL_NAME_LENGTH"/>
>+            <enum name="GL_TYPE"/>
>+            <enum name="GL_ARRAY_SIZE"/>
>+            <enum name="GL_OFFSET"/>
>+            <enum name="GL_BLOCK_INDEX"/>
>+            <enum name="GL_ARRAY_STRIDE"/>
>+            <enum name="GL_MATRIX_STRIDE"/>
>+            <enum name="GL_IS_ROW_MAJOR"/>
>+            <enum name="GL_ATOMIC_COUNTER_BUFFER_INDEX"/>
>+            <enum name="GL_BUFFER_BINDING"/>
>+            <enum name="GL_BUFFER_DATA_SIZE"/>
>+            <enum name="GL_NUM_ACTIVE_VARIABLES"/>
>+            <enum name="GL_ACTIVE_VARIABLES"/>
>+            <enum name="GL_REFERENCED_BY_VERTEX_SHADER"/>
>+            <enum name="GL_REFERENCED_BY_FRAGMENT_SHADER"/>
>+            <enum name="GL_REFERENCED_BY_COMPUTE_SHADER"/>
>+            <enum name="GL_TOP_LEVEL_ARRAY_SIZE"/>
>+            <enum name="GL_TOP_LEVEL_ARRAY_STRIDE"/>
>+            <enum name="GL_LOCATION"/>
>+        </require>
>+        
>+        <require>
>+            <command name="glUseProgramStages"/>
>+            <command name="glActiveShaderProgram"/>
>+            <command name="glCreateShaderProgramv"/>
>+            <command name="glBindProgramPipeline"/>
>+            <command name="glDeleteProgramPipelines"/>
>+            <command name="glGenProgramPipelines"/>
>+            <command name="glIsProgramPipeline"/>
>+            <command name="glGetProgramPipelineiv"/>
>+            <command name="glProgramUniform1i"/>
>+            <command name="glProgramUniform2i"/>
>+            <command name="glProgramUniform3i"/>
>+            <command name="glProgramUniform4i"/>
>+            <command name="glProgramUniform1ui"/>
>+            <command name="glProgramUniform2ui"/>
>+            <command name="glProgramUniform3ui"/>
>+            <command name="glProgramUniform4ui"/>
>+            <command name="glProgramUniform1f"/>
>+            <command name="glProgramUniform2f"/>
>+            <command name="glProgramUniform3f"/>
>+            <command name="glProgramUniform4f"/>
>+            <command name="glProgramUniform1iv"/>
>+            <command name="glProgramUniform2iv"/>
>+            <command name="glProgramUniform3iv"/>
>+            <command name="glProgramUniform4iv"/>
>+            <command name="glProgramUniform1uiv"/>
>+            <command name="glProgramUniform2uiv"/>
>+            <command name="glProgramUniform3uiv"/>
>+            <command name="glProgramUniform4uiv"/>
>+            <command name="glProgramUniform1fv"/>
>+            <command name="glProgramUniform2fv"/>
>+            <command name="glProgramUniform3fv"/>
>+            <command name="glProgramUniform4fv"/>
>+            <command name="glProgramUniformMatrix2fv"/>
>+            <command name="glProgramUniformMatrix3fv"/>
>+            <command name="glProgramUniformMatrix4fv"/>
>+            <command name="glProgramUniformMatrix2x3fv"/>
>+            <command name="glProgramUniformMatrix3x2fv"/>
>+            <command name="glProgramUniformMatrix2x4fv"/>
>+            <command name="glProgramUniformMatrix4x2fv"/>
>+            <command name="glProgramUniformMatrix3x4fv"/>
>+            <command name="glProgramUniformMatrix4x3fv"/>
>+            <command name="glValidateProgramPipeline"/>
>+            <command name="glGetProgramPipelineInfoLog"/>
>+            <enum name="GL_VERTEX_SHADER_BIT"/>
>+            <enum name="GL_FRAGMENT_SHADER_BIT"/>
>+            <enum name="GL_ALL_SHADER_BITS"/>
>+            <enum name="GL_PROGRAM_SEPARABLE"/>
>+            <enum name="GL_ACTIVE_PROGRAM"/>
>+            <enum name="GL_PROGRAM_PIPELINE_BINDING"/>
>+        </require>
>+        
>+        <require>
>+            <enum name="GL_ATOMIC_COUNTER_BUFFER"/>
>+            <enum name="GL_ATOMIC_COUNTER_BUFFER_BINDING"/>
>+            <enum name="GL_ATOMIC_COUNTER_BUFFER_START"/>
>+            <enum name="GL_ATOMIC_COUNTER_BUFFER_SIZE"/>
>+            <enum name="GL_MAX_VERTEX_ATOMIC_COUNTER_BUFFERS"/>
>+            <enum name="GL_MAX_FRAGMENT_ATOMIC_COUNTER_BUFFERS"/>
>+            <enum name="GL_MAX_COMPUTE_ATOMIC_COUNTER_BUFFERS"/>
>+            <enum name="GL_MAX_COMBINED_ATOMIC_COUNTER_BUFFERS"/>
>+            <enum name="GL_MAX_VERTEX_ATOMIC_COUNTERS"/>
>+            <enum name="GL_MAX_FRAGMENT_ATOMIC_COUNTERS"/>
>+            <enum name="GL_MAX_COMPUTE_ATOMIC_COUNTERS"/>
>+            <enum name="GL_MAX_COMBINED_ATOMIC_COUNTERS"/>
>+            <enum name="GL_MAX_ATOMIC_COUNTER_BUFFER_SIZE"/>
>+            <enum name="GL_MAX_ATOMIC_COUNTER_BUFFER_BINDINGS"/>
>+            <enum name="GL_ACTIVE_ATOMIC_COUNTER_BUFFERS"/>
>+            <enum name="GL_UNSIGNED_INT_ATOMIC_COUNTER"/>
>+        </require>
>+        
>+        <require/>
>+        
>+        <require>
>+            <command name="glBindImageTexture"/>
>+            <command name="glGetBooleani_v"/>
>+            <command name="glMemoryBarrier"/>
>+            <command name="glMemoryBarrierByRegion"/>
>+            <enum name="GL_MAX_IMAGE_UNITS"/>
>+            <enum name="GL_MAX_VERTEX_IMAGE_UNIFORMS"/>
>+            <enum name="GL_MAX_FRAGMENT_IMAGE_UNIFORMS"/>
>+            <enum name="GL_MAX_COMPUTE_IMAGE_UNIFORMS"/>
>+            <enum name="GL_MAX_COMBINED_IMAGE_UNIFORMS"/>
>+            <enum name="GL_IMAGE_BINDING_NAME"/>
>+            <enum name="GL_IMAGE_BINDING_LEVEL"/>
>+            <enum name="GL_IMAGE_BINDING_LAYERED"/>
>+            <enum name="GL_IMAGE_BINDING_LAYER"/>
>+            <enum name="GL_IMAGE_BINDING_ACCESS"/>
>+            <enum name="GL_IMAGE_BINDING_FORMAT"/>
>+            <enum name="GL_VERTEX_ATTRIB_ARRAY_BARRIER_BIT"/>
>+            <enum name="GL_ELEMENT_ARRAY_BARRIER_BIT"/>
>+            <enum name="GL_UNIFORM_BARRIER_BIT"/>
>+            <enum name="GL_TEXTURE_FETCH_BARRIER_BIT"/>
>+            <enum name="GL_SHADER_IMAGE_ACCESS_BARRIER_BIT"/>
>+            <enum name="GL_COMMAND_BARRIER_BIT"/>
>+            <enum name="GL_PIXEL_BUFFER_BARRIER_BIT"/>
>+            <enum name="GL_TEXTURE_UPDATE_BARRIER_BIT"/>
>+            <enum name="GL_BUFFER_UPDATE_BARRIER_BIT"/>
>+            <enum name="GL_FRAMEBUFFER_BARRIER_BIT"/>
>+            <enum name="GL_TRANSFORM_FEEDBACK_BARRIER_BIT"/>
>+            <enum name="GL_ATOMIC_COUNTER_BARRIER_BIT"/>
>+            <enum name="GL_ALL_BARRIER_BITS"/>
>+            <enum name="GL_IMAGE_2D"/>
>+            <enum name="GL_IMAGE_3D"/>
>+            <enum name="GL_IMAGE_CUBE"/>
>+            <enum name="GL_IMAGE_2D_ARRAY"/>
>+            <enum name="GL_INT_IMAGE_2D"/>
>+            <enum name="GL_INT_IMAGE_3D"/>
>+            <enum name="GL_INT_IMAGE_CUBE"/>
>+            <enum name="GL_INT_IMAGE_2D_ARRAY"/>
>+            <enum name="GL_UNSIGNED_INT_IMAGE_2D"/>
>+            <enum name="GL_UNSIGNED_INT_IMAGE_3D"/>
>+            <enum name="GL_UNSIGNED_INT_IMAGE_CUBE"/>
>+            <enum name="GL_UNSIGNED_INT_IMAGE_2D_ARRAY"/>
>+            <enum name="GL_IMAGE_FORMAT_COMPATIBILITY_TYPE"/>
>+            <enum name="GL_IMAGE_FORMAT_COMPATIBILITY_BY_SIZE"/>
>+            <enum name="GL_IMAGE_FORMAT_COMPATIBILITY_BY_CLASS"/>
>+            <enum name="GL_READ_ONLY"/>
>+            <enum name="GL_WRITE_ONLY"/>
>+            <enum name="GL_READ_WRITE"/>
>+        </require>
>+        
>+        <require/>
>+        
>+        <require>
>+            <enum name="GL_SHADER_STORAGE_BUFFER"/>
>+            <enum name="GL_SHADER_STORAGE_BUFFER_BINDING"/>
>+            <enum name="GL_SHADER_STORAGE_BUFFER_START"/>
>+            <enum name="GL_SHADER_STORAGE_BUFFER_SIZE"/>
>+            <enum name="GL_MAX_VERTEX_SHADER_STORAGE_BLOCKS"/>
>+            <enum name="GL_MAX_FRAGMENT_SHADER_STORAGE_BLOCKS"/>
>+            <enum name="GL_MAX_COMPUTE_SHADER_STORAGE_BLOCKS"/>
>+            <enum name="GL_MAX_COMBINED_SHADER_STORAGE_BLOCKS"/>
>+            <enum name="GL_MAX_SHADER_STORAGE_BUFFER_BINDINGS"/>
>+            <enum name="GL_MAX_SHADER_STORAGE_BLOCK_SIZE"/>
>+            <enum name="GL_SHADER_STORAGE_BUFFER_OFFSET_ALIGNMENT"/>
>+            <enum name="GL_SHADER_STORAGE_BARRIER_BIT"/>
>+            <enum name="GL_MAX_COMBINED_SHADER_OUTPUT_RESOURCES"/>
>+        </require>
>+        
>+        <require>
>+            <enum name="GL_DEPTH_STENCIL_TEXTURE_MODE"/>
>+            <enum name="GL_STENCIL_INDEX"/>
>+        </require>
>+        
>+        <require>
>+            <enum name="GL_MIN_PROGRAM_TEXTURE_GATHER_OFFSET"/>
>+            <enum name="GL_MAX_PROGRAM_TEXTURE_GATHER_OFFSET"/>
>+        </require>
>+        
>+        <require>
>+            <command name="glTexStorage2DMultisample"/>
>+            <command name="glGetMultisamplefv"/>
>+            <command name="glSampleMaski"/>
>+            <command name="glGetTexLevelParameteriv"/>
>+            <command name="glGetTexLevelParameterfv"/>
>+            <enum name="GL_SAMPLE_POSITION"/>
>+            <enum name="GL_SAMPLE_MASK"/>
>+            <enum name="GL_SAMPLE_MASK_VALUE"/>
>+            <enum name="GL_TEXTURE_2D_MULTISAMPLE"/>
>+            <enum name="GL_MAX_SAMPLE_MASK_WORDS"/>
>+            <enum name="GL_MAX_COLOR_TEXTURE_SAMPLES"/>
>+            <enum name="GL_MAX_DEPTH_TEXTURE_SAMPLES"/>
>+            <enum name="GL_MAX_INTEGER_SAMPLES"/>
>+            <enum name="GL_TEXTURE_BINDING_2D_MULTISAMPLE"/>
>+            <enum name="GL_TEXTURE_SAMPLES"/>
>+            <enum name="GL_TEXTURE_FIXED_SAMPLE_LOCATIONS"/>
>+            <enum name="GL_TEXTURE_WIDTH"/>
>+            <enum name="GL_TEXTURE_HEIGHT"/>
>+            <enum name="GL_TEXTURE_DEPTH"/>
>+            <enum name="GL_TEXTURE_INTERNAL_FORMAT"/>
>+            <enum name="GL_TEXTURE_RED_SIZE"/>
>+            <enum name="GL_TEXTURE_GREEN_SIZE"/>
>+            <enum name="GL_TEXTURE_BLUE_SIZE"/>
>+            <enum name="GL_TEXTURE_ALPHA_SIZE"/>
>+            <enum name="GL_TEXTURE_DEPTH_SIZE"/>
>+            <enum name="GL_TEXTURE_STENCIL_SIZE"/>
>+            <enum name="GL_TEXTURE_SHARED_SIZE"/>
>+            <enum name="GL_TEXTURE_RED_TYPE"/>
>+            <enum name="GL_TEXTURE_GREEN_TYPE"/>
>+            <enum name="GL_TEXTURE_BLUE_TYPE"/>
>+            <enum name="GL_TEXTURE_ALPHA_TYPE"/>
>+            <enum name="GL_TEXTURE_DEPTH_TYPE"/>
>+            <enum name="GL_TEXTURE_COMPRESSED"/>
>+            <enum name="GL_SAMPLER_2D_MULTISAMPLE"/>
>+            <enum name="GL_INT_SAMPLER_2D_MULTISAMPLE"/>
>+            <enum name="GL_UNSIGNED_INT_SAMPLER_2D_MULTISAMPLE"/>
>+        </require>
>+        
>+        <require>
>+            <command name="glBindVertexBuffer"/>
>+            <command name="glVertexAttribFormat"/>
>+            <command name="glVertexAttribIFormat"/>
>+            <command name="glVertexAttribBinding"/>
>+            <command name="glVertexBindingDivisor"/>
>+            <enum name="GL_VERTEX_ATTRIB_BINDING"/>
>+            <enum name="GL_VERTEX_ATTRIB_RELATIVE_OFFSET"/>
>+            <enum name="GL_VERTEX_BINDING_DIVISOR"/>
>+            <enum name="GL_VERTEX_BINDING_OFFSET"/>
>+            <enum name="GL_VERTEX_BINDING_STRIDE"/>
>+            <enum name="GL_VERTEX_BINDING_BUFFER"/>
>+            <enum name="GL_MAX_VERTEX_ATTRIB_RELATIVE_OFFSET"/>
>+            <enum name="GL_MAX_VERTEX_ATTRIB_BINDINGS"/>
>+            <enum name="GL_MAX_VERTEX_ATTRIB_STRIDE"/>
>+        </require>
>+    </feature>
>+    <feature api="gles2" name="GL_ES_VERSION_3_2" number="3.2">
>+        
>+        <require>
>+            <enum name="GL_MULTISAMPLE_LINE_WIDTH_RANGE"/>
>+            <enum name="GL_MULTISAMPLE_LINE_WIDTH_GRANULARITY"/>
>+        </require>
>+        
>+        <require/>
>+        
>+        <require>
>+            <enum name="GL_MULTIPLY"/>
>+            <enum name="GL_SCREEN"/>
>+            <enum name="GL_OVERLAY"/>
>+            <enum name="GL_DARKEN"/>
>+            <enum name="GL_LIGHTEN"/>
>+            <enum name="GL_COLORDODGE"/>
>+            <enum name="GL_COLORBURN"/>
>+            <enum name="GL_HARDLIGHT"/>
>+            <enum name="GL_SOFTLIGHT"/>
>+            <enum name="GL_DIFFERENCE"/>
>+            <enum name="GL_EXCLUSION"/>
>+            <enum name="GL_HSL_HUE"/>
>+            <enum name="GL_HSL_SATURATION"/>
>+            <enum name="GL_HSL_COLOR"/>
>+            <enum name="GL_HSL_LUMINOSITY"/>
>+            <command name="glBlendBarrier"/>
>+        </require>
>+        
>+        <require/>
>+        
>+        <require>
>+            <command name="glCopyImageSubData"/>
>+        </require>
>+        
>+        <require>
>+            <enum name="GL_DEBUG_OUTPUT_SYNCHRONOUS"/>
>+            <enum name="GL_DEBUG_NEXT_LOGGED_MESSAGE_LENGTH"/>
>+            <enum name="GL_DEBUG_CALLBACK_FUNCTION"/>
>+            <enum name="GL_DEBUG_CALLBACK_USER_PARAM"/>
>+            <enum name="GL_DEBUG_SOURCE_API"/>
>+            <enum name="GL_DEBUG_SOURCE_WINDOW_SYSTEM"/>
>+            <enum name="GL_DEBUG_SOURCE_SHADER_COMPILER"/>
>+            <enum name="GL_DEBUG_SOURCE_THIRD_PARTY"/>
>+            <enum name="GL_DEBUG_SOURCE_APPLICATION"/>
>+            <enum name="GL_DEBUG_SOURCE_OTHER"/>
>+            <enum name="GL_DEBUG_TYPE_ERROR"/>
>+            <enum name="GL_DEBUG_TYPE_DEPRECATED_BEHAVIOR"/>
>+            <enum name="GL_DEBUG_TYPE_UNDEFINED_BEHAVIOR"/>
>+            <enum name="GL_DEBUG_TYPE_PORTABILITY"/>
>+            <enum name="GL_DEBUG_TYPE_PERFORMANCE"/>
>+            <enum name="GL_DEBUG_TYPE_OTHER"/>
>+            <enum name="GL_DEBUG_TYPE_MARKER"/>
>+            <enum name="GL_DEBUG_TYPE_PUSH_GROUP"/>
>+            <enum name="GL_DEBUG_TYPE_POP_GROUP"/>
>+            <enum name="GL_DEBUG_SEVERITY_NOTIFICATION"/>
>+            <enum name="GL_MAX_DEBUG_GROUP_STACK_DEPTH"/>
>+            <enum name="GL_DEBUG_GROUP_STACK_DEPTH"/>
>+            <enum name="GL_BUFFER"/>
>+            <enum name="GL_SHADER"/>
>+            <enum name="GL_PROGRAM"/>
>+            <enum name="GL_VERTEX_ARRAY"/>
>+            <enum name="GL_QUERY"/>
>+            <enum name="GL_PROGRAM_PIPELINE"/>
>+            <enum name="GL_SAMPLER"/>
>+            <enum name="GL_MAX_LABEL_LENGTH"/>
>+            <enum name="GL_MAX_DEBUG_MESSAGE_LENGTH"/>
>+            <enum name="GL_MAX_DEBUG_LOGGED_MESSAGES"/>
>+            <enum name="GL_DEBUG_LOGGED_MESSAGES"/>
>+            <enum name="GL_DEBUG_SEVERITY_HIGH"/>
>+            <enum name="GL_DEBUG_SEVERITY_MEDIUM"/>
>+            <enum name="GL_DEBUG_SEVERITY_LOW"/>
>+            <enum name="GL_DEBUG_OUTPUT"/>
>+            <enum name="GL_CONTEXT_FLAG_DEBUG_BIT"/>
>+            <enum name="GL_STACK_OVERFLOW"/>
>+            <enum name="GL_STACK_UNDERFLOW"/>
>+            <command name="glDebugMessageControl"/>
>+            <command name="glDebugMessageInsert"/>
>+            <command name="glDebugMessageCallback"/>
>+            <command name="glGetDebugMessageLog"/>
>+            <command name="glPushDebugGroup"/>
>+            <command name="glPopDebugGroup"/>
>+            <command name="glObjectLabel"/>
>+            <command name="glGetObjectLabel"/>
>+            <command name="glObjectPtrLabel"/>
>+            <command name="glGetObjectPtrLabel"/>
>+            <command name="glGetPointerv"/>
>+        </require>
>+        
>+        <require>
>+            
>+            <command name="glEnablei"/>
>+            <command name="glDisablei"/>
>+            <command name="glBlendEquationi"/>
>+            <command name="glBlendEquationSeparatei"/>
>+            <command name="glBlendFunci"/>
>+            <command name="glBlendFuncSeparatei"/>
>+            <command name="glColorMaski"/>
>+            <command name="glIsEnabledi"/>
>+        </require>
>+        
>+        <require>
>+            <command name="glDrawElementsBaseVertex"/>
>+            <command name="glDrawRangeElementsBaseVertex"/>
>+            <command name="glDrawElementsInstancedBaseVertex"/>
>+        </require>
>+        
>+        <require>
>+            <enum name="GL_GEOMETRY_SHADER"/>
>+            <enum name="GL_GEOMETRY_SHADER_BIT"/>
>+            <enum name="GL_GEOMETRY_VERTICES_OUT"/>
>+            <enum name="GL_GEOMETRY_INPUT_TYPE"/>
>+            <enum name="GL_GEOMETRY_OUTPUT_TYPE"/>
>+            <enum name="GL_GEOMETRY_SHADER_INVOCATIONS"/>
>+            <enum name="GL_LAYER_PROVOKING_VERTEX"/>
>+            <enum name="GL_LINES_ADJACENCY"/>
>+            <enum name="GL_LINE_STRIP_ADJACENCY"/>
>+            <enum name="GL_TRIANGLES_ADJACENCY"/>
>+            <enum name="GL_TRIANGLE_STRIP_ADJACENCY"/>
>+            <enum name="GL_MAX_GEOMETRY_UNIFORM_COMPONENTS"/>
>+            <enum name="GL_MAX_GEOMETRY_UNIFORM_BLOCKS"/>
>+            <enum name="GL_MAX_COMBINED_GEOMETRY_UNIFORM_COMPONENTS"/>
>+            <enum name="GL_MAX_GEOMETRY_INPUT_COMPONENTS"/>
>+            <enum name="GL_MAX_GEOMETRY_OUTPUT_COMPONENTS"/>
>+            <enum name="GL_MAX_GEOMETRY_OUTPUT_VERTICES"/>
>+            <enum name="GL_MAX_GEOMETRY_TOTAL_OUTPUT_COMPONENTS"/>
>+            <enum name="GL_MAX_GEOMETRY_SHADER_INVOCATIONS"/>
>+            <enum name="GL_MAX_GEOMETRY_TEXTURE_IMAGE_UNITS"/>
>+            <enum name="GL_MAX_GEOMETRY_ATOMIC_COUNTER_BUFFERS"/>
>+            <enum name="GL_MAX_GEOMETRY_ATOMIC_COUNTERS"/>
>+            <enum name="GL_MAX_GEOMETRY_IMAGE_UNIFORMS"/>
>+            <enum name="GL_MAX_GEOMETRY_SHADER_STORAGE_BLOCKS"/>
>+            <enum name="GL_FIRST_VERTEX_CONVENTION"/>
>+            <enum name="GL_LAST_VERTEX_CONVENTION"/>
>+            <enum name="GL_UNDEFINED_VERTEX"/>
>+            <enum name="GL_PRIMITIVES_GENERATED"/>
>+            <enum name="GL_FRAMEBUFFER_DEFAULT_LAYERS"/>
>+            <enum name="GL_MAX_FRAMEBUFFER_LAYERS"/>
>+            <enum name="GL_FRAMEBUFFER_INCOMPLETE_LAYER_TARGETS"/>
>+            <enum name="GL_FRAMEBUFFER_ATTACHMENT_LAYERED"/>
>+            <enum name="GL_REFERENCED_BY_GEOMETRY_SHADER"/>
>+            <command name="glFramebufferTexture"/>
>+        </require>
>+        
>+        <require/>
>+        
>+        <require>
>+            <enum name="GL_PRIMITIVE_BOUNDING_BOX"/>
>+            <command name="glPrimitiveBoundingBox"/>
>+        </require>
>+        
>+        <require>
>+            <enum name="GL_NO_ERROR"/>
>+            <enum name="GL_CONTEXT_FLAG_ROBUST_ACCESS_BIT"/>
>+            <enum name="GL_CONTEXT_FLAGS"/>
>+            <enum name="GL_LOSE_CONTEXT_ON_RESET"/>
>+            <enum name="GL_GUILTY_CONTEXT_RESET"/>
>+            <enum name="GL_INNOCENT_CONTEXT_RESET"/>
>+            <enum name="GL_UNKNOWN_CONTEXT_RESET"/>
>+            <enum name="GL_RESET_NOTIFICATION_STRATEGY"/>
>+            <enum name="GL_NO_RESET_NOTIFICATION"/>
>+            <enum name="GL_CONTEXT_LOST"/>
>+            <command name="glGetGraphicsResetStatus"/>
>+            <command name="glReadnPixels"/>
>+            <command name="glGetnUniformfv"/>
>+            <command name="glGetnUniformiv"/>
>+            <command name="glGetnUniformuiv"/>
>+        </require>
>+        
>+        <require>
>+            <command name="glMinSampleShading"/>
>+            <enum name="GL_SAMPLE_SHADING"/>
>+            <enum name="GL_MIN_SAMPLE_SHADING_VALUE"/>
>+        </require>
>+        
>+        <require/>
>+        
>+        <require/>
>+        
>+        <require/>
>+        
>+        <require>
>+            <enum name="GL_MIN_FRAGMENT_INTERPOLATION_OFFSET"/>
>+            <enum name="GL_MAX_FRAGMENT_INTERPOLATION_OFFSET"/>
>+            <enum name="GL_FRAGMENT_INTERPOLATION_OFFSET_BITS"/>
>+        </require>
>+        
>+        <require>
>+            <enum name="GL_PATCHES"/>
>+            <enum name="GL_PATCH_VERTICES"/>
>+            <enum name="GL_TESS_CONTROL_OUTPUT_VERTICES"/>
>+            <enum name="GL_TESS_GEN_MODE"/>
>+            <enum name="GL_TESS_GEN_SPACING"/>
>+            <enum name="GL_TESS_GEN_VERTEX_ORDER"/>
>+            <enum name="GL_TESS_GEN_POINT_MODE"/>
>+            <enum name="GL_TRIANGLES"/>
>+            <enum name="GL_ISOLINES"/>
>+            <enum name="GL_QUADS"/>
>+            <enum name="GL_EQUAL"/>
>+            <enum name="GL_FRACTIONAL_ODD"/>
>+            <enum name="GL_FRACTIONAL_EVEN"/>
>+            <enum name="GL_CCW"/>
>+            <enum name="GL_CW"/>
>+            <enum name="GL_MAX_PATCH_VERTICES"/>
>+            <enum name="GL_MAX_TESS_GEN_LEVEL"/>
>+            <enum name="GL_MAX_TESS_CONTROL_UNIFORM_COMPONENTS"/>
>+            <enum name="GL_MAX_TESS_EVALUATION_UNIFORM_COMPONENTS"/>
>+            <enum name="GL_MAX_TESS_CONTROL_TEXTURE_IMAGE_UNITS"/>
>+            <enum name="GL_MAX_TESS_EVALUATION_TEXTURE_IMAGE_UNITS"/>
>+            <enum name="GL_MAX_TESS_CONTROL_OUTPUT_COMPONENTS"/>
>+            <enum name="GL_MAX_TESS_PATCH_COMPONENTS"/>
>+            <enum name="GL_MAX_TESS_CONTROL_TOTAL_OUTPUT_COMPONENTS"/>
>+            <enum name="GL_MAX_TESS_EVALUATION_OUTPUT_COMPONENTS"/>
>+            <enum name="GL_MAX_TESS_CONTROL_UNIFORM_BLOCKS"/>
>+            <enum name="GL_MAX_TESS_EVALUATION_UNIFORM_BLOCKS"/>
>+            <enum name="GL_MAX_TESS_CONTROL_INPUT_COMPONENTS"/>
>+            <enum name="GL_MAX_TESS_EVALUATION_INPUT_COMPONENTS"/>
>+            <enum name="GL_MAX_COMBINED_TESS_CONTROL_UNIFORM_COMPONENTS"/>
>+            <enum name="GL_MAX_COMBINED_TESS_EVALUATION_UNIFORM_COMPONENTS"/>
>+            <enum name="GL_MAX_TESS_CONTROL_ATOMIC_COUNTER_BUFFERS"/>
>+            <enum name="GL_MAX_TESS_EVALUATION_ATOMIC_COUNTER_BUFFERS"/>
>+            <enum name="GL_MAX_TESS_CONTROL_ATOMIC_COUNTERS"/>
>+            <enum name="GL_MAX_TESS_EVALUATION_ATOMIC_COUNTERS"/>
>+            <enum name="GL_MAX_TESS_CONTROL_IMAGE_UNIFORMS"/>
>+            <enum name="GL_MAX_TESS_EVALUATION_IMAGE_UNIFORMS"/>
>+            <enum name="GL_MAX_TESS_CONTROL_SHADER_STORAGE_BLOCKS"/>
>+            <enum name="GL_MAX_TESS_EVALUATION_SHADER_STORAGE_BLOCKS"/>
>+            <enum name="GL_PRIMITIVE_RESTART_FOR_PATCHES_SUPPORTED"/>
>+            <enum name="GL_IS_PER_PATCH"/>
>+            <enum name="GL_REFERENCED_BY_TESS_CONTROL_SHADER"/>
>+            <enum name="GL_REFERENCED_BY_TESS_EVALUATION_SHADER"/>
>+            <enum name="GL_TESS_CONTROL_SHADER"/>
>+            <enum name="GL_TESS_EVALUATION_SHADER"/>
>+            <enum name="GL_TESS_CONTROL_SHADER_BIT"/>
>+            <enum name="GL_TESS_EVALUATION_SHADER_BIT"/>
>+            <command name="glPatchParameteri"/>
>+        </require>
>+        
>+        <require>
>+            <enum name="GL_TEXTURE_BORDER_COLOR"/>
>+            <enum name="GL_CLAMP_TO_BORDER"/>
>+            <command name="glTexParameterIiv"/>
>+            <command name="glTexParameterIuiv"/>
>+            <command name="glGetTexParameterIiv"/>
>+            <command name="glGetTexParameterIuiv"/>
>+            <command name="glSamplerParameterIiv"/>
>+            <command name="glSamplerParameterIuiv"/>
>+            <command name="glGetSamplerParameterIiv"/>
>+            <command name="glGetSamplerParameterIuiv"/>
>+        </require>
>+        
>+        <require>
>+            <enum name="GL_TEXTURE_BUFFER"/>
>+            <enum name="GL_TEXTURE_BUFFER_BINDING"/>
>+            <enum name="GL_MAX_TEXTURE_BUFFER_SIZE"/>
>+            <enum name="GL_TEXTURE_BINDING_BUFFER"/>
>+            <enum name="GL_TEXTURE_BUFFER_DATA_STORE_BINDING"/>
>+            <enum name="GL_TEXTURE_BUFFER_OFFSET_ALIGNMENT"/>
>+            <enum name="GL_SAMPLER_BUFFER"/>
>+            <enum name="GL_INT_SAMPLER_BUFFER"/>
>+            <enum name="GL_UNSIGNED_INT_SAMPLER_BUFFER"/>
>+            <enum name="GL_IMAGE_BUFFER"/>
>+            <enum name="GL_INT_IMAGE_BUFFER"/>
>+            <enum name="GL_UNSIGNED_INT_IMAGE_BUFFER"/>
>+            <enum name="GL_TEXTURE_BUFFER_OFFSET"/>
>+            <enum name="GL_TEXTURE_BUFFER_SIZE"/>
>+            <command name="glTexBuffer"/>
>+            <command name="glTexBufferRange"/>
>+        </require>
>+        
>+        <require>
>+            <enum name="GL_COMPRESSED_RGBA_ASTC_4x4"/>
>+            <enum name="GL_COMPRESSED_RGBA_ASTC_5x4"/>
>+            <enum name="GL_COMPRESSED_RGBA_ASTC_5x5"/>
>+            <enum name="GL_COMPRESSED_RGBA_ASTC_6x5"/>
>+            <enum name="GL_COMPRESSED_RGBA_ASTC_6x6"/>
>+            <enum name="GL_COMPRESSED_RGBA_ASTC_8x5"/>
>+            <enum name="GL_COMPRESSED_RGBA_ASTC_8x6"/>
>+            <enum name="GL_COMPRESSED_RGBA_ASTC_8x8"/>
>+            <enum name="GL_COMPRESSED_RGBA_ASTC_10x5"/>
>+            <enum name="GL_COMPRESSED_RGBA_ASTC_10x6"/>
>+            <enum name="GL_COMPRESSED_RGBA_ASTC_10x8"/>
>+            <enum name="GL_COMPRESSED_RGBA_ASTC_10x10"/>
>+            <enum name="GL_COMPRESSED_RGBA_ASTC_12x10"/>
>+            <enum name="GL_COMPRESSED_RGBA_ASTC_12x12"/>
>+            <enum name="GL_COMPRESSED_SRGB8_ALPHA8_ASTC_4x4"/>
>+            <enum name="GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x4"/>
>+            <enum name="GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x5"/>
>+            <enum name="GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x5"/>
>+            <enum name="GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x6"/>
>+            <enum name="GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x5"/>
>+            <enum name="GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x6"/>
>+            <enum name="GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x8"/>
>+            <enum name="GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x5"/>
>+            <enum name="GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x6"/>
>+            <enum name="GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x8"/>
>+            <enum name="GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x10"/>
>+            <enum name="GL_COMPRESSED_SRGB8_ALPHA8_ASTC_12x10"/>
>+            <enum name="GL_COMPRESSED_SRGB8_ALPHA8_ASTC_12x12"/>
>+        </require>
>+        
>+        <require>
>+            <enum name="GL_TEXTURE_CUBE_MAP_ARRAY"/>
>+            <enum name="GL_TEXTURE_BINDING_CUBE_MAP_ARRAY"/>
>+            <enum name="GL_SAMPLER_CUBE_MAP_ARRAY"/>
>+            <enum name="GL_SAMPLER_CUBE_MAP_ARRAY_SHADOW"/>
>+            <enum name="GL_INT_SAMPLER_CUBE_MAP_ARRAY"/>
>+            <enum name="GL_UNSIGNED_INT_SAMPLER_CUBE_MAP_ARRAY"/>
>+            <enum name="GL_IMAGE_CUBE_MAP_ARRAY"/>
>+            <enum name="GL_INT_IMAGE_CUBE_MAP_ARRAY"/>
>+            <enum name="GL_UNSIGNED_INT_IMAGE_CUBE_MAP_ARRAY"/>
>+        </require>
>+        
>+        <require>
>+            <enum name="GL_STENCIL_INDEX"/>
>+            <enum name="GL_STENCIL_INDEX8"/>
>+        </require>
>+        
>+        <require>
>+            <enum name="GL_TEXTURE_2D_MULTISAMPLE_ARRAY"/>
>+            <enum name="GL_TEXTURE_BINDING_2D_MULTISAMPLE_ARRAY"/>
>+            <enum name="GL_SAMPLER_2D_MULTISAMPLE_ARRAY"/>
>+            <enum name="GL_INT_SAMPLER_2D_MULTISAMPLE_ARRAY"/>
>+            <enum name="GL_UNSIGNED_INT_SAMPLER_2D_MULTISAMPLE_ARRAY"/>
>+            <command name="glTexStorage3DMultisample"/>
>+        </require>
>+    </feature>
>+    <feature api="glsc2" name="GL_SC_VERSION_2_0" number="2.0">
>+        <require comment="Not used by the API, but could be used by applications">
>+            <type name="GLbyte" comment="Used to define GL_BYTE data"/>
>+            <type name="GLshort" comment="Used to define GL_SHORT data"/>
>+            <type name="GLushort" comment="Used to define GL_UNSIGNED_SHORT data"/>
>+        </require>
>+        <require>
>+            <enum name="GL_DEPTH_BUFFER_BIT"/>
>+            <enum name="GL_STENCIL_BUFFER_BIT"/>
>+            <enum name="GL_COLOR_BUFFER_BIT"/>
>+            <enum name="GL_FALSE"/>
>+            <enum name="GL_TRUE"/>
>+            <enum name="GL_POINTS"/>
>+            <enum name="GL_LINES"/>
>+            <enum name="GL_LINE_LOOP"/>
>+            <enum name="GL_LINE_STRIP"/>
>+            <enum name="GL_TRIANGLES"/>
>+            <enum name="GL_TRIANGLE_STRIP"/>
>+            <enum name="GL_TRIANGLE_FAN"/>
>+            <enum name="GL_ZERO"/>
>+            <enum name="GL_ONE"/>
>+            <enum name="GL_SRC_COLOR"/>
>+            <enum name="GL_ONE_MINUS_SRC_COLOR"/>
>+            <enum name="GL_SRC_ALPHA"/>
>+            <enum name="GL_ONE_MINUS_SRC_ALPHA"/>
>+            <enum name="GL_DST_ALPHA"/>
>+            <enum name="GL_ONE_MINUS_DST_ALPHA"/>
>+            <enum name="GL_DST_COLOR"/>
>+            <enum name="GL_ONE_MINUS_DST_COLOR"/>
>+            <enum name="GL_SRC_ALPHA_SATURATE"/>
>+            <enum name="GL_FUNC_ADD"/>
>+            <enum name="GL_BLEND_EQUATION"/>
>+            <enum name="GL_BLEND_EQUATION_RGB"/>
>+            <enum name="GL_BLEND_EQUATION_ALPHA"/>
>+            <enum name="GL_FUNC_SUBTRACT"/>
>+            <enum name="GL_FUNC_REVERSE_SUBTRACT"/>
>+            <enum name="GL_BLEND_DST_RGB"/>
>+            <enum name="GL_BLEND_SRC_RGB"/>
>+            <enum name="GL_BLEND_DST_ALPHA"/>
>+            <enum name="GL_BLEND_SRC_ALPHA"/>
>+            <enum name="GL_CONSTANT_COLOR"/>
>+            <enum name="GL_ONE_MINUS_CONSTANT_COLOR"/>
>+            <enum name="GL_CONSTANT_ALPHA"/>
>+            <enum name="GL_ONE_MINUS_CONSTANT_ALPHA"/>
>+            <enum name="GL_BLEND_COLOR"/>
>+            <enum name="GL_ARRAY_BUFFER"/>
>+            <enum name="GL_ELEMENT_ARRAY_BUFFER"/>
>+            <enum name="GL_ARRAY_BUFFER_BINDING"/>
>+            <enum name="GL_ELEMENT_ARRAY_BUFFER_BINDING"/>
>+            <enum name="GL_STREAM_DRAW"/>
>+            <enum name="GL_STATIC_DRAW"/>
>+            <enum name="GL_DYNAMIC_DRAW"/>
>+            <enum name="GL_BUFFER_SIZE"/>
>+            <enum name="GL_BUFFER_USAGE"/>
>+            <enum name="GL_CURRENT_VERTEX_ATTRIB"/>
>+            <enum name="GL_FRONT"/>
>+            <enum name="GL_BACK"/>
>+            <enum name="GL_FRONT_AND_BACK"/>
>+            <enum name="GL_TEXTURE_2D"/>
>+            <enum name="GL_CULL_FACE"/>
>+            <enum name="GL_BLEND"/>
>+            <enum name="GL_DITHER"/>
>+            <enum name="GL_STENCIL_TEST"/>
>+            <enum name="GL_DEPTH_TEST"/>
>+            <enum name="GL_SCISSOR_TEST"/>
>+            <enum name="GL_POLYGON_OFFSET_FILL"/>
>+            <enum name="GL_SAMPLE_ALPHA_TO_COVERAGE"/>
>+            <enum name="GL_SAMPLE_COVERAGE"/>
>+            <enum name="GL_NO_ERROR"/>
>+            <enum name="GL_INVALID_ENUM"/>
>+            <enum name="GL_INVALID_VALUE"/>
>+            <enum name="GL_INVALID_OPERATION"/>
>+            <enum name="GL_OUT_OF_MEMORY"/>
>+            <enum name="GL_INVALID_FRAMEBUFFER_OPERATION"/>
>+            <enum name="GL_CONTEXT_LOST"/>
>+            <enum name="GL_CW"/>
>+            <enum name="GL_CCW"/>
>+            <enum name="GL_LINE_WIDTH"/>
>+            <enum name="GL_ALIASED_POINT_SIZE_RANGE"/>
>+            <enum name="GL_ALIASED_LINE_WIDTH_RANGE"/>
>+            <enum name="GL_CULL_FACE_MODE"/>
>+            <enum name="GL_FRONT_FACE"/>
>+            <enum name="GL_DEPTH_RANGE"/>
>+            <enum name="GL_DEPTH_WRITEMASK"/>
>+            <enum name="GL_DEPTH_CLEAR_VALUE"/>
>+            <enum name="GL_DEPTH_FUNC"/>
>+            <enum name="GL_STENCIL_CLEAR_VALUE"/>
>+            <enum name="GL_STENCIL_FUNC"/>
>+            <enum name="GL_STENCIL_FAIL"/>
>+            <enum name="GL_STENCIL_PASS_DEPTH_FAIL"/>
>+            <enum name="GL_STENCIL_PASS_DEPTH_PASS"/>
>+            <enum name="GL_STENCIL_REF"/>
>+            <enum name="GL_STENCIL_VALUE_MASK"/>
>+            <enum name="GL_STENCIL_WRITEMASK"/>
>+            <enum name="GL_STENCIL_BACK_FUNC"/>
>+            <enum name="GL_STENCIL_BACK_FAIL"/>
>+            <enum name="GL_STENCIL_BACK_PASS_DEPTH_FAIL"/>
>+            <enum name="GL_STENCIL_BACK_PASS_DEPTH_PASS"/>
>+            <enum name="GL_STENCIL_BACK_REF"/>
>+            <enum name="GL_STENCIL_BACK_VALUE_MASK"/>
>+            <enum name="GL_STENCIL_BACK_WRITEMASK"/>
>+            <enum name="GL_VIEWPORT"/>
>+            <enum name="GL_SCISSOR_BOX"/>
>+            <enum name="GL_COLOR_CLEAR_VALUE"/>
>+            <enum name="GL_COLOR_WRITEMASK"/>
>+            <enum name="GL_UNPACK_ALIGNMENT"/>
>+            <enum name="GL_PACK_ALIGNMENT"/>
>+            <enum name="GL_MAX_TEXTURE_SIZE"/>
>+            <enum name="GL_MAX_VIEWPORT_DIMS"/>
>+            <enum name="GL_SUBPIXEL_BITS"/>
>+            <enum name="GL_RED_BITS"/>
>+            <enum name="GL_GREEN_BITS"/>
>+            <enum name="GL_BLUE_BITS"/>
>+            <enum name="GL_ALPHA_BITS"/>
>+            <enum name="GL_DEPTH_BITS"/>
>+            <enum name="GL_STENCIL_BITS"/>
>+            <enum name="GL_POLYGON_OFFSET_UNITS"/>
>+            <enum name="GL_POLYGON_OFFSET_FACTOR"/>
>+            <enum name="GL_TEXTURE_BINDING_2D"/>
>+            <enum name="GL_SAMPLE_BUFFERS"/>
>+            <enum name="GL_SAMPLES"/>
>+            <enum name="GL_SAMPLE_COVERAGE_VALUE"/>
>+            <enum name="GL_SAMPLE_COVERAGE_INVERT"/>
>+            <enum name="GL_NUM_COMPRESSED_TEXTURE_FORMATS"/>
>+            <enum name="GL_COMPRESSED_TEXTURE_FORMATS"/>
>+            <enum name="GL_DONT_CARE"/>
>+            <enum name="GL_FASTEST"/>
>+            <enum name="GL_NICEST"/>
>+            <enum name="GL_GENERATE_MIPMAP_HINT"/>
>+            <enum name="GL_BYTE"/>
>+            <enum name="GL_UNSIGNED_BYTE"/>
>+            <enum name="GL_SHORT"/>
>+            <enum name="GL_UNSIGNED_SHORT"/>
>+            <enum name="GL_INT"/>
>+            <enum name="GL_UNSIGNED_INT"/>
>+            <enum name="GL_FLOAT"/>
>+            <enum name="GL_RED"/>
>+            <enum name="GL_RG"/>
>+            <enum name="GL_RGB"/>
>+            <enum name="GL_RGBA"/>
>+            <enum name="GL_UNSIGNED_SHORT_4_4_4_4"/>
>+            <enum name="GL_UNSIGNED_SHORT_5_5_5_1"/>
>+            <enum name="GL_UNSIGNED_SHORT_5_6_5"/>
>+            <enum name="GL_MAX_VERTEX_ATTRIBS"/>
>+            <enum name="GL_MAX_VERTEX_UNIFORM_VECTORS"/>
>+            <enum name="GL_MAX_VARYING_VECTORS"/>
>+            <enum name="GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS"/>
>+            <enum name="GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS"/>
>+            <enum name="GL_MAX_TEXTURE_IMAGE_UNITS"/>
>+            <enum name="GL_MAX_FRAGMENT_UNIFORM_VECTORS"/>
>+            <enum name="GL_LINK_STATUS"/>
>+            <enum name="GL_SHADING_LANGUAGE_VERSION"/>
>+            <enum name="GL_CURRENT_PROGRAM"/>
>+            <enum name="GL_NEVER"/>
>+            <enum name="GL_LESS"/>
>+            <enum name="GL_EQUAL"/>
>+            <enum name="GL_LEQUAL"/>
>+            <enum name="GL_GREATER"/>
>+            <enum name="GL_NOTEQUAL"/>
>+            <enum name="GL_GEQUAL"/>
>+            <enum name="GL_ALWAYS"/>
>+            <enum name="GL_KEEP"/>
>+            <enum name="GL_REPLACE"/>
>+            <enum name="GL_INCR"/>
>+            <enum name="GL_DECR"/>
>+            <enum name="GL_INVERT"/>
>+            <enum name="GL_INCR_WRAP"/>
>+            <enum name="GL_DECR_WRAP"/>
>+            <enum name="GL_VENDOR"/>
>+            <enum name="GL_RENDERER"/>
>+            <enum name="GL_VERSION"/>
>+            <enum name="GL_EXTENSIONS"/>
>+            <enum name="GL_NEAREST"/>
>+            <enum name="GL_LINEAR"/>
>+            <enum name="GL_NEAREST_MIPMAP_NEAREST"/>
>+            <enum name="GL_LINEAR_MIPMAP_NEAREST"/>
>+            <enum name="GL_NEAREST_MIPMAP_LINEAR"/>
>+            <enum name="GL_LINEAR_MIPMAP_LINEAR"/>
>+            <enum name="GL_TEXTURE_MAG_FILTER"/>
>+            <enum name="GL_TEXTURE_MIN_FILTER"/>
>+            <enum name="GL_TEXTURE_WRAP_S"/>
>+            <enum name="GL_TEXTURE_WRAP_T"/>
>+            <enum name="GL_TEXTURE_IMMUTABLE_FORMAT"/>
>+            <enum name="GL_TEXTURE"/>
>+            <enum name="GL_TEXTURE0"/>
>+            <enum name="GL_TEXTURE1"/>
>+            <enum name="GL_TEXTURE2"/>
>+            <enum name="GL_TEXTURE3"/>
>+            <enum name="GL_TEXTURE4"/>
>+            <enum name="GL_TEXTURE5"/>
>+            <enum name="GL_TEXTURE6"/>
>+            <enum name="GL_TEXTURE7"/>
>+            <enum name="GL_TEXTURE8"/>
>+            <enum name="GL_TEXTURE9"/>
>+            <enum name="GL_TEXTURE10"/>
>+            <enum name="GL_TEXTURE11"/>
>+            <enum name="GL_TEXTURE12"/>
>+            <enum name="GL_TEXTURE13"/>
>+            <enum name="GL_TEXTURE14"/>
>+            <enum name="GL_TEXTURE15"/>
>+            <enum name="GL_TEXTURE16"/>
>+            <enum name="GL_TEXTURE17"/>
>+            <enum name="GL_TEXTURE18"/>
>+            <enum name="GL_TEXTURE19"/>
>+            <enum name="GL_TEXTURE20"/>
>+            <enum name="GL_TEXTURE21"/>
>+            <enum name="GL_TEXTURE22"/>
>+            <enum name="GL_TEXTURE23"/>
>+            <enum name="GL_TEXTURE24"/>
>+            <enum name="GL_TEXTURE25"/>
>+            <enum name="GL_TEXTURE26"/>
>+            <enum name="GL_TEXTURE27"/>
>+            <enum name="GL_TEXTURE28"/>
>+            <enum name="GL_TEXTURE29"/>
>+            <enum name="GL_TEXTURE30"/>
>+            <enum name="GL_TEXTURE31"/>
>+            <enum name="GL_ACTIVE_TEXTURE"/>
>+            <enum name="GL_REPEAT"/>
>+            <enum name="GL_CLAMP_TO_EDGE"/>
>+            <enum name="GL_MIRRORED_REPEAT"/>
>+            <enum name="GL_SAMPLER_2D"/>
>+            <enum name="GL_VERTEX_ATTRIB_ARRAY_ENABLED"/>
>+            <enum name="GL_VERTEX_ATTRIB_ARRAY_SIZE"/>
>+            <enum name="GL_VERTEX_ATTRIB_ARRAY_STRIDE"/>
>+            <enum name="GL_VERTEX_ATTRIB_ARRAY_TYPE"/>
>+            <enum name="GL_VERTEX_ATTRIB_ARRAY_NORMALIZED"/>
>+            <enum name="GL_VERTEX_ATTRIB_ARRAY_POINTER"/>
>+            <enum name="GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING"/>
>+            <enum name="GL_IMPLEMENTATION_COLOR_READ_TYPE"/>
>+            <enum name="GL_IMPLEMENTATION_COLOR_READ_FORMAT"/>
>+            <enum name="GL_NUM_PROGRAM_BINARY_FORMATS"/>
>+            <enum name="GL_PROGRAM_BINARY_FORMATS"/>
>+            <enum name="GL_LOW_FLOAT"/>
>+            <enum name="GL_MEDIUM_FLOAT"/>
>+            <enum name="GL_HIGH_FLOAT"/>
>+            <enum name="GL_LOW_INT"/>
>+            <enum name="GL_MEDIUM_INT"/>
>+            <enum name="GL_HIGH_INT"/>
>+            <enum name="GL_FRAMEBUFFER"/>
>+            <enum name="GL_RENDERBUFFER"/>
>+            <enum name="GL_R8"/>
>+            <enum name="GL_RG8"/>
>+            <enum name="GL_RGB8"/>
>+            <enum name="GL_RGBA8"/>
>+            <enum name="GL_RGBA4"/>
>+            <enum name="GL_RGB5_A1"/>
>+            <enum name="GL_RGB565"/>
>+            <enum name="GL_DEPTH_COMPONENT16"/>
>+            <enum name="GL_STENCIL_INDEX8"/>
>+            <enum name="GL_RENDERBUFFER_WIDTH"/>
>+            <enum name="GL_RENDERBUFFER_HEIGHT"/>
>+            <enum name="GL_RENDERBUFFER_INTERNAL_FORMAT"/>
>+            <enum name="GL_RENDERBUFFER_RED_SIZE"/>
>+            <enum name="GL_RENDERBUFFER_GREEN_SIZE"/>
>+            <enum name="GL_RENDERBUFFER_BLUE_SIZE"/>
>+            <enum name="GL_RENDERBUFFER_ALPHA_SIZE"/>
>+            <enum name="GL_RENDERBUFFER_DEPTH_SIZE"/>
>+            <enum name="GL_RENDERBUFFER_STENCIL_SIZE"/>
>+            <enum name="GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE"/>
>+            <enum name="GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME"/>
>+            <enum name="GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL"/>
>+            <enum name="GL_COLOR_ATTACHMENT0"/>
>+            <enum name="GL_DEPTH_ATTACHMENT"/>
>+            <enum name="GL_STENCIL_ATTACHMENT"/>
>+            <enum name="GL_NONE"/>
>+            <enum name="GL_FRAMEBUFFER_COMPLETE"/>
>+            <enum name="GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT"/>
>+            <enum name="GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT"/>
>+            <enum name="GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS"/>
>+            <enum name="GL_FRAMEBUFFER_UNSUPPORTED"/>
>+            <enum name="GL_FRAMEBUFFER_UNDEFINED"/>
>+            <enum name="GL_FRAMEBUFFER_BINDING"/>
>+            <enum name="GL_RENDERBUFFER_BINDING"/>
>+            <enum name="GL_MAX_RENDERBUFFER_SIZE"/>
>+            <enum name="GL_NO_ERROR"/>
>+            <enum name="GL_GUILTY_CONTEXT_RESET"/>
>+            <enum name="GL_INNOCENT_CONTEXT_RESET"/>
>+            <enum name="GL_UNKNOWN_CONTEXT_RESET"/>
>+            <enum name="GL_CONTEXT_ROBUST_ACCESS"/>
>+            <enum name="GL_RESET_NOTIFICATION_STRATEGY"/>
>+            <enum name="GL_LOSE_CONTEXT_ON_RESET"/>
>+            <command name="glActiveTexture"/>
>+            <command name="glBindBuffer"/>
>+            <command name="glBindFramebuffer"/>
>+            <command name="glBindRenderbuffer"/>
>+            <command name="glBindTexture"/>
>+            <command name="glBlendColor"/>
>+            <command name="glBlendEquation"/>
>+            <command name="glBlendEquationSeparate"/>
>+            <command name="glBlendFunc"/>
>+            <command name="glBlendFuncSeparate"/>
>+            <command name="glBufferData"/>
>+            <command name="glBufferSubData"/>
>+            <command name="glCheckFramebufferStatus"/>
>+            <command name="glClear"/>
>+            <command name="glClearColor"/>
>+            <command name="glClearDepthf"/>
>+            <command name="glClearStencil"/>
>+            <command name="glColorMask"/>
>+            <command name="glCompressedTexSubImage2D"/>
>+            <command name="glCreateProgram"/>
>+            <command name="glCullFace"/>
>+            <command name="glDepthFunc"/>
>+            <command name="glDepthMask"/>
>+            <command name="glDepthRangef"/>
>+            <command name="glDisable"/>
>+            <command name="glDisableVertexAttribArray"/>
>+            <command name="glDrawArrays"/>
>+            <command name="glDrawRangeElements"/>
>+            <command name="glEnable"/>
>+            <command name="glEnableVertexAttribArray"/>
>+            <command name="glFinish"/>
>+            <command name="glFlush"/>
>+            <command name="glFramebufferRenderbuffer"/>
>+            <command name="glFramebufferTexture2D"/>
>+            <command name="glFrontFace"/>
>+            <command name="glGenBuffers"/>
>+            <command name="glGenerateMipmap"/>
>+            <command name="glGenFramebuffers"/>
>+            <command name="glGenRenderbuffers"/>
>+            <command name="glGenTextures"/>
>+            <command name="glGetAttribLocation"/>
>+            <command name="glGetBooleanv"/>
>+            <command name="glGetBufferParameteriv"/>
>+            <command name="glGetError"/>
>+            <command name="glGetFloatv"/>
>+            <command name="glGetFramebufferAttachmentParameteriv"/>
>+            <command name="glGetGraphicsResetStatus"/>
>+            <command name="glGetIntegerv"/>
>+            <command name="glGetProgramiv"/>
>+            <command name="glGetRenderbufferParameteriv"/>
>+            <command name="glGetString"/>
>+            <command name="glGetTexParameterfv"/>
>+            <command name="glGetTexParameteriv"/>
>+            <command name="glGetnUniformfv"/>
>+            <command name="glGetnUniformiv"/>
>+            <command name="glGetUniformLocation"/>
>+            <command name="glGetVertexAttribfv"/>
>+            <command name="glGetVertexAttribiv"/>
>+            <command name="glGetVertexAttribPointerv"/>
>+            <command name="glHint"/>
>+            <command name="glIsEnabled"/>
>+            <command name="glLineWidth"/>
>+            <command name="glPixelStorei"/>
>+            <command name="glPolygonOffset"/>
>+            <command name="glProgramBinary"/>
>+            <command name="glReadnPixels"/>
>+            <command name="glRenderbufferStorage"/>
>+            <command name="glSampleCoverage"/>
>+            <command name="glScissor"/>
>+            <command name="glStencilFunc"/>
>+            <command name="glStencilFuncSeparate"/>
>+            <command name="glStencilMask"/>
>+            <command name="glStencilMaskSeparate"/>
>+            <command name="glStencilOp"/>
>+            <command name="glStencilOpSeparate"/>
>+            <command name="glTexStorage2D"/>
>+            <command name="glTexParameterf"/>
>+            <command name="glTexParameterfv"/>
>+            <command name="glTexParameteri"/>
>+            <command name="glTexParameteriv"/>
>+            <command name="glTexSubImage2D"/>
>+            <command name="glUniform1f"/>
>+            <command name="glUniform1fv"/>
>+            <command name="glUniform1i"/>
>+            <command name="glUniform1iv"/>
>+            <command name="glUniform2f"/>
>+            <command name="glUniform2fv"/>
>+            <command name="glUniform2i"/>
>+            <command name="glUniform2iv"/>
>+            <command name="glUniform3f"/>
>+            <command name="glUniform3fv"/>
>+            <command name="glUniform3i"/>
>+            <command name="glUniform3iv"/>
>+            <command name="glUniform4f"/>
>+            <command name="glUniform4fv"/>
>+            <command name="glUniform4i"/>
>+            <command name="glUniform4iv"/>
>+            <command name="glUniformMatrix2fv"/>
>+            <command name="glUniformMatrix3fv"/>
>+            <command name="glUniformMatrix4fv"/>
>+            <command name="glUseProgram"/>
>+            <command name="glVertexAttrib1f"/>
>+            <command name="glVertexAttrib1fv"/>
>+            <command name="glVertexAttrib2f"/>
>+            <command name="glVertexAttrib2fv"/>
>+            <command name="glVertexAttrib3f"/>
>+            <command name="glVertexAttrib3fv"/>
>+            <command name="glVertexAttrib4f"/>
>+            <command name="glVertexAttrib4fv"/>
>+            <command name="glVertexAttribPointer"/>
>+            <command name="glViewport"/>
>+        </require>
>+    </feature>
>+
>+    
>+    <extensions>
>+        <extension name="GL_3DFX_multisample" supported="gl">
>+            <require>
>+                <enum name="GL_MULTISAMPLE_3DFX"/>
>+                <enum name="GL_SAMPLE_BUFFERS_3DFX"/>
>+                <enum name="GL_SAMPLES_3DFX"/>
>+                <enum name="GL_MULTISAMPLE_BIT_3DFX"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_3DFX_tbuffer" supported="gl">
>+            <require>
>+                <command name="glTbufferMask3DFX"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_3DFX_texture_compression_FXT1" supported="gl">
>+            <require>
>+                <enum name="GL_COMPRESSED_RGB_FXT1_3DFX"/>
>+                <enum name="GL_COMPRESSED_RGBA_FXT1_3DFX"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_AMD_blend_minmax_factor" supported="gl">
>+            <require>
>+                <enum name="GL_FACTOR_MIN_AMD"/>
>+                <enum name="GL_FACTOR_MAX_AMD"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_AMD_compressed_3DC_texture" supported="gles1|gles2">
>+            <require>
>+                <enum name="GL_3DC_X_AMD"/>
>+                <enum name="GL_3DC_XY_AMD"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_AMD_compressed_ATC_texture" supported="gles1|gles2">
>+            <require>
>+                <enum name="GL_ATC_RGB_AMD"/>
>+                <enum name="GL_ATC_RGBA_EXPLICIT_ALPHA_AMD"/>
>+                <enum name="GL_ATC_RGBA_INTERPOLATED_ALPHA_AMD"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_AMD_conservative_depth" supported="gl"/>
>+        <extension name="GL_AMD_debug_output" supported="gl">
>+            <require>
>+                <enum name="GL_MAX_DEBUG_MESSAGE_LENGTH_AMD"/>
>+                <enum name="GL_MAX_DEBUG_LOGGED_MESSAGES_AMD"/>
>+                <enum name="GL_DEBUG_LOGGED_MESSAGES_AMD"/>
>+                <enum name="GL_DEBUG_SEVERITY_HIGH_AMD"/>
>+                <enum name="GL_DEBUG_SEVERITY_MEDIUM_AMD"/>
>+                <enum name="GL_DEBUG_SEVERITY_LOW_AMD"/>
>+                <enum name="GL_DEBUG_CATEGORY_API_ERROR_AMD"/>
>+                <enum name="GL_DEBUG_CATEGORY_WINDOW_SYSTEM_AMD"/>
>+                <enum name="GL_DEBUG_CATEGORY_DEPRECATION_AMD"/>
>+                <enum name="GL_DEBUG_CATEGORY_UNDEFINED_BEHAVIOR_AMD"/>
>+                <enum name="GL_DEBUG_CATEGORY_PERFORMANCE_AMD"/>
>+                <enum name="GL_DEBUG_CATEGORY_SHADER_COMPILER_AMD"/>
>+                <enum name="GL_DEBUG_CATEGORY_APPLICATION_AMD"/>
>+                <enum name="GL_DEBUG_CATEGORY_OTHER_AMD"/>
>+                <command name="glDebugMessageEnableAMD"/>
>+                <command name="glDebugMessageInsertAMD"/>
>+                <command name="glDebugMessageCallbackAMD"/>
>+                <command name="glGetDebugMessageLogAMD"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_AMD_depth_clamp_separate" supported="gl">
>+            <require>
>+                <enum name="GL_DEPTH_CLAMP_NEAR_AMD"/>
>+                <enum name="GL_DEPTH_CLAMP_FAR_AMD"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_AMD_draw_buffers_blend" supported="gl">
>+            <require>
>+                <command name="glBlendFuncIndexedAMD"/>
>+                <command name="glBlendFuncSeparateIndexedAMD"/>
>+                <command name="glBlendEquationIndexedAMD"/>
>+                <command name="glBlendEquationSeparateIndexedAMD"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_AMD_framebuffer_sample_positions" supported="gl">
>+            <require>
>+                <enum name="GL_SUBSAMPLE_DISTANCE_AMD"/>
>+                <enum name="GL_PIXELS_PER_SAMPLE_PATTERN_X_AMD"/>
>+                <enum name="GL_PIXELS_PER_SAMPLE_PATTERN_Y_AMD"/>
>+                <enum name="GL_ALL_PIXELS_AMD"/>
>+                <command name="glFramebufferSamplePositionsfvAMD"/>
>+                <command name="glNamedFramebufferSamplePositionsfvAMD"/>
>+                <command name="glGetFramebufferParameterfvAMD"/>
>+                <command name="glGetNamedFramebufferParameterfvAMD"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_AMD_gcn_shader" supported="gl"/>
>+        <extension name="GL_AMD_gpu_shader_half_float" supported="gl">
>+            <require>
>+                <enum name="GL_FLOAT16_NV"/>
>+                <enum name="GL_FLOAT16_VEC2_NV"/>
>+                <enum name="GL_FLOAT16_VEC3_NV"/>
>+                <enum name="GL_FLOAT16_VEC4_NV"/>
>+                <enum name="GL_FLOAT16_MAT2_AMD"/>
>+                <enum name="GL_FLOAT16_MAT3_AMD"/>
>+                <enum name="GL_FLOAT16_MAT4_AMD"/>
>+                <enum name="GL_FLOAT16_MAT2x3_AMD"/>
>+                <enum name="GL_FLOAT16_MAT2x4_AMD"/>
>+                <enum name="GL_FLOAT16_MAT3x2_AMD"/>
>+                <enum name="GL_FLOAT16_MAT3x4_AMD"/>
>+                <enum name="GL_FLOAT16_MAT4x2_AMD"/>
>+                <enum name="GL_FLOAT16_MAT4x3_AMD"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_AMD_gpu_shader_int16" supported="gl"/>
>+        <extension name="GL_AMD_gpu_shader_int64" supported="gl">
>+            <require>
>+                <enum name="GL_INT64_NV"/>
>+                <enum name="GL_UNSIGNED_INT64_NV"/>
>+                <enum name="GL_INT8_NV"/>
>+                <enum name="GL_INT8_VEC2_NV"/>
>+                <enum name="GL_INT8_VEC3_NV"/>
>+                <enum name="GL_INT8_VEC4_NV"/>
>+                <enum name="GL_INT16_NV"/>
>+                <enum name="GL_INT16_VEC2_NV"/>
>+                <enum name="GL_INT16_VEC3_NV"/>
>+                <enum name="GL_INT16_VEC4_NV"/>
>+                <enum name="GL_INT64_VEC2_NV"/>
>+                <enum name="GL_INT64_VEC3_NV"/>
>+                <enum name="GL_INT64_VEC4_NV"/>
>+                <enum name="GL_UNSIGNED_INT8_NV"/>
>+                <enum name="GL_UNSIGNED_INT8_VEC2_NV"/>
>+                <enum name="GL_UNSIGNED_INT8_VEC3_NV"/>
>+                <enum name="GL_UNSIGNED_INT8_VEC4_NV"/>
>+                <enum name="GL_UNSIGNED_INT16_NV"/>
>+                <enum name="GL_UNSIGNED_INT16_VEC2_NV"/>
>+                <enum name="GL_UNSIGNED_INT16_VEC3_NV"/>
>+                <enum name="GL_UNSIGNED_INT16_VEC4_NV"/>
>+                <enum name="GL_UNSIGNED_INT64_VEC2_NV"/>
>+                <enum name="GL_UNSIGNED_INT64_VEC3_NV"/>
>+                <enum name="GL_UNSIGNED_INT64_VEC4_NV"/>
>+                <enum name="GL_FLOAT16_NV"/>
>+                <enum name="GL_FLOAT16_VEC2_NV"/>
>+                <enum name="GL_FLOAT16_VEC3_NV"/>
>+                <enum name="GL_FLOAT16_VEC4_NV"/>
>+                <command name="glUniform1i64NV"/>
>+                <command name="glUniform2i64NV"/>
>+                <command name="glUniform3i64NV"/>
>+                <command name="glUniform4i64NV"/>
>+                <command name="glUniform1i64vNV"/>
>+                <command name="glUniform2i64vNV"/>
>+                <command name="glUniform3i64vNV"/>
>+                <command name="glUniform4i64vNV"/>
>+                <command name="glUniform1ui64NV"/>
>+                <command name="glUniform2ui64NV"/>
>+                <command name="glUniform3ui64NV"/>
>+                <command name="glUniform4ui64NV"/>
>+                <command name="glUniform1ui64vNV"/>
>+                <command name="glUniform2ui64vNV"/>
>+                <command name="glUniform3ui64vNV"/>
>+                <command name="glUniform4ui64vNV"/>
>+                <command name="glGetUniformi64vNV"/>
>+                <command name="glGetUniformui64vNV"/>
>+            </require>
>+            <require comment="Supported only if GL_EXT_direct_state_access is supported">
>+                <command name="glProgramUniform1i64NV"/>
>+                <command name="glProgramUniform2i64NV"/>
>+                <command name="glProgramUniform3i64NV"/>
>+                <command name="glProgramUniform4i64NV"/>
>+                <command name="glProgramUniform1i64vNV"/>
>+                <command name="glProgramUniform2i64vNV"/>
>+                <command name="glProgramUniform3i64vNV"/>
>+                <command name="glProgramUniform4i64vNV"/>
>+                <command name="glProgramUniform1ui64NV"/>
>+                <command name="glProgramUniform2ui64NV"/>
>+                <command name="glProgramUniform3ui64NV"/>
>+                <command name="glProgramUniform4ui64NV"/>
>+                <command name="glProgramUniform1ui64vNV"/>
>+                <command name="glProgramUniform2ui64vNV"/>
>+                <command name="glProgramUniform3ui64vNV"/>
>+                <command name="glProgramUniform4ui64vNV"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_AMD_interleaved_elements" supported="gl">
>+            <require>
>+                <enum name="GL_VERTEX_ELEMENT_SWIZZLE_AMD"/>
>+                <enum name="GL_VERTEX_ID_SWIZZLE_AMD"/>
>+                <enum name="GL_RED"/>
>+                <enum name="GL_GREEN"/>
>+                <enum name="GL_BLUE"/>
>+                <enum name="GL_ALPHA"/>
>+                <enum name="GL_RG8UI"/>
>+                <enum name="GL_RG16UI"/>
>+                <enum name="GL_RGBA8UI"/>
>+                <command name="glVertexAttribParameteriAMD"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_AMD_multi_draw_indirect" supported="gl">
>+            <require>
>+                <command name="glMultiDrawArraysIndirectAMD"/>
>+                <command name="glMultiDrawElementsIndirectAMD"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_AMD_name_gen_delete" supported="gl">
>+            <require>
>+                <enum name="GL_DATA_BUFFER_AMD"/>
>+                <enum name="GL_PERFORMANCE_MONITOR_AMD"/>
>+                <enum name="GL_QUERY_OBJECT_AMD"/>
>+                <enum name="GL_VERTEX_ARRAY_OBJECT_AMD"/>
>+                <enum name="GL_SAMPLER_OBJECT_AMD"/>
>+                <command name="glGenNamesAMD"/>
>+                <command name="glDeleteNamesAMD"/>
>+                <command name="glIsNameAMD"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_AMD_occlusion_query_event" supported="gl">
>+            <require>
>+                <enum name="GL_OCCLUSION_QUERY_EVENT_MASK_AMD"/>
>+                <enum name="GL_QUERY_DEPTH_PASS_EVENT_BIT_AMD"/>
>+                <enum name="GL_QUERY_DEPTH_FAIL_EVENT_BIT_AMD"/>
>+                <enum name="GL_QUERY_STENCIL_FAIL_EVENT_BIT_AMD"/>
>+                <enum name="GL_QUERY_DEPTH_BOUNDS_FAIL_EVENT_BIT_AMD"/>
>+                <enum name="GL_QUERY_ALL_EVENT_BITS_AMD"/>
>+                <command name="glQueryObjectParameteruiAMD"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_AMD_performance_monitor" supported="gl|glcore|gles2">
>+            <require>
>+                <enum name="GL_COUNTER_TYPE_AMD"/>
>+                <enum name="GL_COUNTER_RANGE_AMD"/>
>+                <enum name="GL_UNSIGNED_INT64_AMD"/>
>+                <enum name="GL_PERCENTAGE_AMD"/>
>+                <enum name="GL_PERFMON_RESULT_AVAILABLE_AMD"/>
>+                <enum name="GL_PERFMON_RESULT_SIZE_AMD"/>
>+                <enum name="GL_PERFMON_RESULT_AMD"/>
>+                <command name="glGetPerfMonitorGroupsAMD"/>
>+                <command name="glGetPerfMonitorCountersAMD"/>
>+                <command name="glGetPerfMonitorGroupStringAMD"/>
>+                <command name="glGetPerfMonitorCounterStringAMD"/>
>+                <command name="glGetPerfMonitorCounterInfoAMD"/>
>+                <command name="glGenPerfMonitorsAMD"/>
>+                <command name="glDeletePerfMonitorsAMD"/>
>+                <command name="glSelectPerfMonitorCountersAMD"/>
>+                <command name="glBeginPerfMonitorAMD"/>
>+                <command name="glEndPerfMonitorAMD"/>
>+                <command name="glGetPerfMonitorCounterDataAMD"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_AMD_pinned_memory" supported="gl">
>+            <require>
>+                <enum name="GL_EXTERNAL_VIRTUAL_MEMORY_BUFFER_AMD"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_AMD_program_binary_Z400" supported="gles2">
>+            <require>
>+                <enum name="GL_Z400_BINARY_AMD"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_AMD_query_buffer_object" supported="gl">
>+            <require>
>+                <enum name="GL_QUERY_BUFFER_AMD"/>
>+                <enum name="GL_QUERY_BUFFER_BINDING_AMD"/>
>+                <enum name="GL_QUERY_RESULT_NO_WAIT_AMD"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_AMD_sample_positions" supported="gl">
>+            <require>
>+                <enum name="GL_SUBSAMPLE_DISTANCE_AMD"/>
>+                <command name="glSetMultisamplefvAMD"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_AMD_seamless_cubemap_per_texture" supported="gl">
>+            <require>
>+                <enum name="GL_TEXTURE_CUBE_MAP_SEAMLESS"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_AMD_shader_atomic_counter_ops" supported="gl"/>
>+        <extension name="GL_AMD_shader_ballot" supported="gl"/>
>+        <extension name="GL_AMD_shader_gpu_shader_half_float_fetch" supported="gl"/>
>+        <extension name="GL_AMD_shader_image_load_store_lod" supported="gl"/>
>+        <extension name="GL_AMD_shader_stencil_export" supported="gl"/>
>+        <extension name="GL_AMD_shader_trinary_minmax" supported="gl"/>
>+        <extension name="GL_AMD_shader_explicit_vertex_parameter" supported="gl"/>
>+        <extension name="GL_AMD_sparse_texture" supported="gl">
>+            <require>
>+                <enum name="GL_VIRTUAL_PAGE_SIZE_X_AMD"/>
>+                <enum name="GL_VIRTUAL_PAGE_SIZE_Y_AMD"/>
>+                <enum name="GL_VIRTUAL_PAGE_SIZE_Z_AMD"/>
>+                <enum name="GL_MAX_SPARSE_TEXTURE_SIZE_AMD"/>
>+                <enum name="GL_MAX_SPARSE_3D_TEXTURE_SIZE_AMD"/>
>+                <enum name="GL_MAX_SPARSE_ARRAY_TEXTURE_LAYERS" comment="Should have an AMD suffix, but probably too late now"/>
>+                <enum name="GL_MIN_SPARSE_LEVEL_AMD"/>
>+                <enum name="GL_MIN_LOD_WARNING_AMD"/>
>+                <enum name="GL_TEXTURE_STORAGE_SPARSE_BIT_AMD"/>
>+                <command name="glTexStorageSparseAMD"/>
>+                <command name="glTextureStorageSparseAMD"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_AMD_stencil_operation_extended" supported="gl">
>+            <require>
>+                <enum name="GL_SET_AMD"/>
>+                <enum name="GL_REPLACE_VALUE_AMD"/>
>+                <enum name="GL_STENCIL_OP_VALUE_AMD"/>
>+                <enum name="GL_STENCIL_BACK_OP_VALUE_AMD"/>
>+                <command name="glStencilOpValueAMD"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_AMD_texture_gather_bias_lod" supported="gl"/>
>+        <extension name="GL_AMD_texture_texture4" supported="gl"/>
>+        <extension name="GL_AMD_transform_feedback3_lines_triangles" supported="gl"/>
>+        <extension name="GL_AMD_transform_feedback4" supported="gl">
>+            <require>
>+                <enum name="GL_STREAM_RASTERIZATION_AMD"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_AMD_vertex_shader_layer" supported="gl"/>
>+        <extension name="GL_AMD_vertex_shader_tessellator" supported="gl">
>+            <require>
>+                <enum name="GL_SAMPLER_BUFFER_AMD"/>
>+                <enum name="GL_INT_SAMPLER_BUFFER_AMD"/>
>+                <enum name="GL_UNSIGNED_INT_SAMPLER_BUFFER_AMD"/>
>+                <enum name="GL_TESSELLATION_MODE_AMD"/>
>+                <enum name="GL_TESSELLATION_FACTOR_AMD"/>
>+                <enum name="GL_DISCRETE_AMD"/>
>+                <enum name="GL_CONTINUOUS_AMD"/>
>+                <command name="glTessellationFactorAMD"/>
>+                <command name="glTessellationModeAMD"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_AMD_vertex_shader_viewport_index" supported="gl"/>
>+        <extension name="GL_ANDROID_extension_pack_es31a" supported="gles2">
>+            <require comment="This is an alias for the following extensions. At present gl.xml doesn't actually replicate all their interfaces here.">
>+                
>+            </require>
>+        </extension>
>+        <extension name="GL_ANGLE_depth_texture" supported="gles2">
>+            <require>
>+                <enum name="GL_DEPTH_COMPONENT"/>
>+                <enum name="GL_DEPTH_STENCIL_OES"/>
>+                <enum name="GL_UNSIGNED_SHORT"/>
>+                <enum name="GL_UNSIGNED_INT"/>
>+                <enum name="GL_UNSIGNED_INT_24_8_OES"/>
>+                <enum name="GL_DEPTH_COMPONENT16"/>
>+                <enum name="GL_DEPTH_COMPONENT32_OES"/>
>+                <enum name="GL_DEPTH24_STENCIL8_OES"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_ANGLE_framebuffer_blit" supported="gles2">
>+            <require>
>+                <enum name="GL_READ_FRAMEBUFFER_ANGLE"/>
>+                <enum name="GL_DRAW_FRAMEBUFFER_ANGLE"/>
>+                <enum name="GL_DRAW_FRAMEBUFFER_BINDING_ANGLE"/>
>+                <enum name="GL_READ_FRAMEBUFFER_BINDING_ANGLE"/>
>+                <command name="glBlitFramebufferANGLE"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_ANGLE_framebuffer_multisample" supported="gles2">
>+            <require>
>+                <enum name="GL_RENDERBUFFER_SAMPLES_ANGLE"/>
>+                <enum name="GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE_ANGLE"/>
>+                <enum name="GL_MAX_SAMPLES_ANGLE"/>
>+                <command name="glRenderbufferStorageMultisampleANGLE"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_ANGLE_instanced_arrays" supported="gles2">
>+            <require>
>+                <enum name="GL_VERTEX_ATTRIB_ARRAY_DIVISOR_ANGLE"/>
>+                <command name="glDrawArraysInstancedANGLE"/>
>+                <command name="glDrawElementsInstancedANGLE"/>
>+                <command name="glVertexAttribDivisorANGLE"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_ANGLE_pack_reverse_row_order" supported="gles2">
>+            <require>
>+                <enum name="GL_PACK_REVERSE_ROW_ORDER_ANGLE"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_ANGLE_program_binary" supported="gles2">
>+            <require>
>+                <enum name="GL_PROGRAM_BINARY_ANGLE"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_ANGLE_texture_compression_dxt3" supported="gles2">
>+            <require>
>+                <enum name="GL_COMPRESSED_RGBA_S3TC_DXT3_ANGLE"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_ANGLE_texture_compression_dxt5" supported="gles2">
>+            <require>
>+                <enum name="GL_COMPRESSED_RGBA_S3TC_DXT5_ANGLE"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_ANGLE_texture_usage" supported="gles2">
>+            <require>
>+                <enum name="GL_TEXTURE_USAGE_ANGLE"/>
>+                <enum name="GL_FRAMEBUFFER_ATTACHMENT_ANGLE"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_ANGLE_translated_shader_source" supported="gles2">
>+            <require>
>+                <enum name="GL_TRANSLATED_SHADER_SOURCE_LENGTH_ANGLE"/>
>+                <command name="glGetTranslatedShaderSourceANGLE"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_APPLE_aux_depth_stencil" supported="gl">
>+            <require>
>+                <enum name="GL_AUX_DEPTH_STENCIL_APPLE"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_APPLE_client_storage" supported="gl">
>+            <require>
>+                <enum name="GL_UNPACK_CLIENT_STORAGE_APPLE"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_APPLE_clip_distance" supported="gles2">
>+            <require>
>+                <enum name="GL_MAX_CLIP_DISTANCES_APPLE"/>
>+                <enum name="GL_CLIP_DISTANCE0_APPLE"/>
>+                <enum name="GL_CLIP_DISTANCE1_APPLE"/>
>+                <enum name="GL_CLIP_DISTANCE2_APPLE"/>
>+                <enum name="GL_CLIP_DISTANCE3_APPLE"/>
>+                <enum name="GL_CLIP_DISTANCE4_APPLE"/>
>+                <enum name="GL_CLIP_DISTANCE5_APPLE"/>
>+                <enum name="GL_CLIP_DISTANCE6_APPLE"/>
>+                <enum name="GL_CLIP_DISTANCE7_APPLE"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_APPLE_color_buffer_packed_float" supported="gles2"/>
>+        <extension name="GL_APPLE_copy_texture_levels" supported="gles1|gles2">
>+            <require>
>+                <command name="glCopyTextureLevelsAPPLE"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_APPLE_element_array" supported="gl">
>+            <require>
>+                <enum name="GL_ELEMENT_ARRAY_APPLE"/>
>+                <enum name="GL_ELEMENT_ARRAY_TYPE_APPLE"/>
>+                <enum name="GL_ELEMENT_ARRAY_POINTER_APPLE"/>
>+                <command name="glElementPointerAPPLE"/>
>+                <command name="glDrawElementArrayAPPLE"/>
>+                <command name="glDrawRangeElementArrayAPPLE"/>
>+                <command name="glMultiDrawElementArrayAPPLE"/>
>+                <command name="glMultiDrawRangeElementArrayAPPLE"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_APPLE_fence" supported="gl">
>+            <require>
>+                <enum name="GL_DRAW_PIXELS_APPLE"/>
>+                <enum name="GL_FENCE_APPLE"/>
>+                <command name="glGenFencesAPPLE"/>
>+                <command name="glDeleteFencesAPPLE"/>
>+                <command name="glSetFenceAPPLE"/>
>+                <command name="glIsFenceAPPLE"/>
>+                <command name="glTestFenceAPPLE"/>
>+                <command name="glFinishFenceAPPLE"/>
>+                <command name="glTestObjectAPPLE"/>
>+                <command name="glFinishObjectAPPLE"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_APPLE_float_pixels" supported="gl">
>+            <require>
>+                <enum name="GL_HALF_APPLE"/>
>+                <enum name="GL_RGBA_FLOAT32_APPLE"/>
>+                <enum name="GL_RGB_FLOAT32_APPLE"/>
>+                <enum name="GL_ALPHA_FLOAT32_APPLE"/>
>+                <enum name="GL_INTENSITY_FLOAT32_APPLE"/>
>+                <enum name="GL_LUMINANCE_FLOAT32_APPLE"/>
>+                <enum name="GL_LUMINANCE_ALPHA_FLOAT32_APPLE"/>
>+                <enum name="GL_RGBA_FLOAT16_APPLE"/>
>+                <enum name="GL_RGB_FLOAT16_APPLE"/>
>+                <enum name="GL_ALPHA_FLOAT16_APPLE"/>
>+                <enum name="GL_INTENSITY_FLOAT16_APPLE"/>
>+                <enum name="GL_LUMINANCE_FLOAT16_APPLE"/>
>+                <enum name="GL_LUMINANCE_ALPHA_FLOAT16_APPLE"/>
>+                <enum name="GL_COLOR_FLOAT_APPLE"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_APPLE_flush_buffer_range" supported="gl">
>+            <require>
>+                <enum name="GL_BUFFER_SERIALIZED_MODIFY_APPLE"/>
>+                <enum name="GL_BUFFER_FLUSHING_UNMAP_APPLE"/>
>+                <command name="glBufferParameteriAPPLE"/>
>+                <command name="glFlushMappedBufferRangeAPPLE"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_APPLE_framebuffer_multisample" supported="gles1|gles2">
>+            <require>
>+                <enum name="GL_RENDERBUFFER_SAMPLES_APPLE"/>
>+                <enum name="GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE_APPLE"/>
>+                <enum name="GL_MAX_SAMPLES_APPLE"/>
>+                <enum name="GL_READ_FRAMEBUFFER_APPLE"/>
>+                <enum name="GL_DRAW_FRAMEBUFFER_APPLE"/>
>+                <enum name="GL_DRAW_FRAMEBUFFER_BINDING_APPLE"/>
>+                <enum name="GL_READ_FRAMEBUFFER_BINDING_APPLE"/>
>+                <command name="glRenderbufferStorageMultisampleAPPLE"/>
>+                <command name="glResolveMultisampleFramebufferAPPLE"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_APPLE_object_purgeable" supported="gl">
>+            <require>
>+                <enum name="GL_BUFFER_OBJECT_APPLE"/>
>+                <enum name="GL_RELEASED_APPLE"/>
>+                <enum name="GL_VOLATILE_APPLE"/>
>+                <enum name="GL_RETAINED_APPLE"/>
>+                <enum name="GL_UNDEFINED_APPLE"/>
>+                <enum name="GL_PURGEABLE_APPLE"/>
>+                <command name="glObjectPurgeableAPPLE"/>
>+                <command name="glObjectUnpurgeableAPPLE"/>
>+                <command name="glGetObjectParameterivAPPLE"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_APPLE_rgb_422" supported="gl|glcore|gles2">
>+            <require>
>+                <enum name="GL_RGB_422_APPLE"/>
>+                <enum name="GL_UNSIGNED_SHORT_8_8_APPLE"/>
>+                <enum name="GL_UNSIGNED_SHORT_8_8_REV_APPLE"/>
>+            </require>
>+            <require comment="Depends on TexStorage* (EXT_texture_storage / ES 3.0 / GL 4.4 / etc.)">
>+                <enum name="GL_RGB_RAW_422_APPLE"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_APPLE_row_bytes" supported="gl">
>+            <require>
>+                <enum name="GL_PACK_ROW_BYTES_APPLE"/>
>+                <enum name="GL_UNPACK_ROW_BYTES_APPLE"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_APPLE_specular_vector" supported="gl">
>+            <require>
>+                <enum name="GL_LIGHT_MODEL_SPECULAR_VECTOR_APPLE"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_APPLE_sync" supported="gles1|gles2">
>+            <require>
>+                <enum name="GL_SYNC_OBJECT_APPLE"/>
>+                <enum name="GL_MAX_SERVER_WAIT_TIMEOUT_APPLE"/>
>+                <enum name="GL_OBJECT_TYPE_APPLE"/>
>+                <enum name="GL_SYNC_CONDITION_APPLE"/>
>+                <enum name="GL_SYNC_STATUS_APPLE"/>
>+                <enum name="GL_SYNC_FLAGS_APPLE"/>
>+                <enum name="GL_SYNC_FENCE_APPLE"/>
>+                <enum name="GL_SYNC_GPU_COMMANDS_COMPLETE_APPLE"/>
>+                <enum name="GL_UNSIGNALED_APPLE"/>
>+                <enum name="GL_SIGNALED_APPLE"/>
>+                <enum name="GL_ALREADY_SIGNALED_APPLE"/>
>+                <enum name="GL_TIMEOUT_EXPIRED_APPLE"/>
>+                <enum name="GL_CONDITION_SATISFIED_APPLE"/>
>+                <enum name="GL_WAIT_FAILED_APPLE"/>
>+                <enum name="GL_SYNC_FLUSH_COMMANDS_BIT_APPLE"/>
>+                <enum name="GL_TIMEOUT_IGNORED_APPLE"/>
>+                <command name="glFenceSyncAPPLE"/>
>+                <command name="glIsSyncAPPLE"/>
>+                <command name="glDeleteSyncAPPLE"/>
>+                <command name="glClientWaitSyncAPPLE"/>
>+                <command name="glWaitSyncAPPLE"/>
>+                <command name="glGetInteger64vAPPLE"/>
>+                <command name="glGetSyncivAPPLE"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_APPLE_texture_2D_limited_npot" supported="gles1"/>
>+        <extension name="GL_APPLE_texture_format_BGRA8888" supported="gles1|gles2">
>+            <require>
>+                <enum name="GL_BGRA_EXT"/>
>+            </require>
>+            <require comment="Depends on TexStorage* (EXT_texture_storage / ES 3.0 / GL 4.4 / etc.)">
>+                <enum name="GL_BGRA8_EXT"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_APPLE_texture_max_level" supported="gles1|gles2">
>+            <require>
>+                <enum name="GL_TEXTURE_MAX_LEVEL_APPLE"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_APPLE_texture_packed_float" supported="gles2">
>+            <require>
>+                <enum name="GL_UNSIGNED_INT_10F_11F_11F_REV_APPLE"/>
>+                <enum name="GL_UNSIGNED_INT_5_9_9_9_REV_APPLE"/>
>+                <enum name="GL_R11F_G11F_B10F_APPLE"/>
>+                <enum name="GL_RGB9_E5_APPLE"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_APPLE_texture_range" supported="gl">
>+            <require>
>+                <enum name="GL_TEXTURE_RANGE_LENGTH_APPLE"/>
>+                <enum name="GL_TEXTURE_RANGE_POINTER_APPLE"/>
>+                <enum name="GL_TEXTURE_STORAGE_HINT_APPLE"/>
>+                <enum name="GL_STORAGE_PRIVATE_APPLE"/>
>+                <enum name="GL_STORAGE_CACHED_APPLE"/>
>+                <enum name="GL_STORAGE_SHARED_APPLE"/>
>+                <command name="glTextureRangeAPPLE"/>
>+                <command name="glGetTexParameterPointervAPPLE"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_APPLE_transform_hint" supported="gl">
>+            <require>
>+                <enum name="GL_TRANSFORM_HINT_APPLE"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_APPLE_vertex_array_object" supported="gl">
>+            <require>
>+                <enum name="GL_VERTEX_ARRAY_BINDING_APPLE"/>
>+                <command name="glBindVertexArrayAPPLE"/>
>+                <command name="glDeleteVertexArraysAPPLE"/>
>+                <command name="glGenVertexArraysAPPLE"/>
>+                <command name="glIsVertexArrayAPPLE"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_APPLE_vertex_array_range" supported="gl">
>+            <require>
>+                <enum name="GL_VERTEX_ARRAY_RANGE_APPLE"/>
>+                <enum name="GL_VERTEX_ARRAY_RANGE_LENGTH_APPLE"/>
>+                <enum name="GL_VERTEX_ARRAY_STORAGE_HINT_APPLE"/>
>+                <enum name="GL_VERTEX_ARRAY_RANGE_POINTER_APPLE"/>
>+                <enum name="GL_STORAGE_CLIENT_APPLE"/>
>+                <enum name="GL_STORAGE_CACHED_APPLE"/>
>+                <enum name="GL_STORAGE_SHARED_APPLE"/>
>+                <command name="glVertexArrayRangeAPPLE"/>
>+                <command name="glFlushVertexArrayRangeAPPLE"/>
>+                <command name="glVertexArrayParameteriAPPLE"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_APPLE_vertex_program_evaluators" supported="gl">
>+            <require>
>+                <enum name="GL_VERTEX_ATTRIB_MAP1_APPLE"/>
>+                <enum name="GL_VERTEX_ATTRIB_MAP2_APPLE"/>
>+                <enum name="GL_VERTEX_ATTRIB_MAP1_SIZE_APPLE"/>
>+                <enum name="GL_VERTEX_ATTRIB_MAP1_COEFF_APPLE"/>
>+                <enum name="GL_VERTEX_ATTRIB_MAP1_ORDER_APPLE"/>
>+                <enum name="GL_VERTEX_ATTRIB_MAP1_DOMAIN_APPLE"/>
>+                <enum name="GL_VERTEX_ATTRIB_MAP2_SIZE_APPLE"/>
>+                <enum name="GL_VERTEX_ATTRIB_MAP2_COEFF_APPLE"/>
>+                <enum name="GL_VERTEX_ATTRIB_MAP2_ORDER_APPLE"/>
>+                <enum name="GL_VERTEX_ATTRIB_MAP2_DOMAIN_APPLE"/>
>+                <command name="glEnableVertexAttribAPPLE"/>
>+                <command name="glDisableVertexAttribAPPLE"/>
>+                <command name="glIsVertexAttribEnabledAPPLE"/>
>+                <command name="glMapVertexAttrib1dAPPLE"/>
>+                <command name="glMapVertexAttrib1fAPPLE"/>
>+                <command name="glMapVertexAttrib2dAPPLE"/>
>+                <command name="glMapVertexAttrib2fAPPLE"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_APPLE_ycbcr_422" supported="gl">
>+            <require>
>+                <enum name="GL_YCBCR_422_APPLE"/>
>+                <enum name="GL_UNSIGNED_SHORT_8_8_APPLE"/>
>+                <enum name="GL_UNSIGNED_SHORT_8_8_REV_APPLE"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_ARB_ES2_compatibility" supported="gl|glcore">
>+            <require>
>+                <enum name="GL_FIXED"/>
>+                <enum name="GL_IMPLEMENTATION_COLOR_READ_TYPE"/>
>+                <enum name="GL_IMPLEMENTATION_COLOR_READ_FORMAT"/>
>+                <enum name="GL_LOW_FLOAT"/>
>+                <enum name="GL_MEDIUM_FLOAT"/>
>+                <enum name="GL_HIGH_FLOAT"/>
>+                <enum name="GL_LOW_INT"/>
>+                <enum name="GL_MEDIUM_INT"/>
>+                <enum name="GL_HIGH_INT"/>
>+                <enum name="GL_SHADER_COMPILER"/>
>+                <enum name="GL_SHADER_BINARY_FORMATS"/>
>+                <enum name="GL_NUM_SHADER_BINARY_FORMATS"/>
>+                <enum name="GL_MAX_VERTEX_UNIFORM_VECTORS"/>
>+                <enum name="GL_MAX_VARYING_VECTORS"/>
>+                <enum name="GL_MAX_FRAGMENT_UNIFORM_VECTORS"/>
>+                <enum name="GL_RGB565"/>
>+                <command name="glReleaseShaderCompiler"/>
>+                <command name="glShaderBinary"/>
>+                <command name="glGetShaderPrecisionFormat"/>
>+                <command name="glDepthRangef"/>
>+                <command name="glClearDepthf"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_ARB_ES3_1_compatibility" supported="gl|glcore">
>+            <require>
>+                <enum name="GL_BACK"/>
>+                <command name="glMemoryBarrierByRegion"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_ARB_ES3_2_compatibility" supported="gl|glcore">
>+            <require>
>+                <enum name="GL_PRIMITIVE_BOUNDING_BOX_ARB"/>
>+                <enum name="GL_MULTISAMPLE_LINE_WIDTH_RANGE_ARB"/>
>+                <enum name="GL_MULTISAMPLE_LINE_WIDTH_GRANULARITY_ARB"/>
>+                <command name="glPrimitiveBoundingBoxARB"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_ARB_ES3_compatibility" supported="gl|glcore">
>+            <require>
>+                <enum name="GL_COMPRESSED_RGB8_ETC2"/>
>+                <enum name="GL_COMPRESSED_SRGB8_ETC2"/>
>+                <enum name="GL_COMPRESSED_RGB8_PUNCHTHROUGH_ALPHA1_ETC2"/>
>+                <enum name="GL_COMPRESSED_SRGB8_PUNCHTHROUGH_ALPHA1_ETC2"/>
>+                <enum name="GL_COMPRESSED_RGBA8_ETC2_EAC"/>
>+                <enum name="GL_COMPRESSED_SRGB8_ALPHA8_ETC2_EAC"/>
>+                <enum name="GL_COMPRESSED_R11_EAC"/>
>+                <enum name="GL_COMPRESSED_SIGNED_R11_EAC"/>
>+                <enum name="GL_COMPRESSED_RG11_EAC"/>
>+                <enum name="GL_COMPRESSED_SIGNED_RG11_EAC"/>
>+                <enum name="GL_PRIMITIVE_RESTART_FIXED_INDEX"/>
>+                <enum name="GL_ANY_SAMPLES_PASSED_CONSERVATIVE"/>
>+                <enum name="GL_MAX_ELEMENT_INDEX"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_ARB_arrays_of_arrays" supported="gl|glcore"/>
>+        <extension name="GL_ARB_base_instance" supported="gl|glcore">
>+            <require>
>+                <command name="glDrawArraysInstancedBaseInstance"/>
>+                <command name="glDrawElementsInstancedBaseInstance"/>
>+                <command name="glDrawElementsInstancedBaseVertexBaseInstance"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_ARB_bindless_texture" supported="gl|glcore">
>+            <require>
>+                <enum name="GL_UNSIGNED_INT64_ARB"/>
>+                <command name="glGetTextureHandleARB"/>
>+                <command name="glGetTextureSamplerHandleARB"/>
>+                <command name="glMakeTextureHandleResidentARB"/>
>+                <command name="glMakeTextureHandleNonResidentARB"/>
>+                <command name="glGetImageHandleARB"/>
>+                <command name="glMakeImageHandleResidentARB"/>
>+                <command name="glMakeImageHandleNonResidentARB"/>
>+                <command name="glUniformHandleui64ARB"/>
>+                <command name="glUniformHandleui64vARB"/>
>+                <command name="glProgramUniformHandleui64ARB"/>
>+                <command name="glProgramUniformHandleui64vARB"/>
>+                <command name="glIsTextureHandleResidentARB"/>
>+                <command name="glIsImageHandleResidentARB"/>
>+                <command name="glVertexAttribL1ui64ARB"/>
>+                <command name="glVertexAttribL1ui64vARB"/>
>+                <command name="glGetVertexAttribLui64vARB"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_ARB_blend_func_extended" supported="gl|glcore">
>+            <require>
>+                <enum name="GL_SRC1_COLOR"/>
>+                <enum name="GL_SRC1_ALPHA"/>
>+                <enum name="GL_ONE_MINUS_SRC1_COLOR"/>
>+                <enum name="GL_ONE_MINUS_SRC1_ALPHA"/>
>+                <enum name="GL_MAX_DUAL_SOURCE_DRAW_BUFFERS"/>
>+                <command name="glBindFragDataLocationIndexed"/>
>+                <command name="glGetFragDataIndex"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_ARB_buffer_storage" supported="gl|glcore">
>+            <require>
>+                <enum name="GL_MAP_READ_BIT"/>
>+                <enum name="GL_MAP_WRITE_BIT"/>
>+                <enum name="GL_MAP_PERSISTENT_BIT"/>
>+                <enum name="GL_MAP_COHERENT_BIT"/>
>+                <enum name="GL_DYNAMIC_STORAGE_BIT"/>
>+                <enum name="GL_CLIENT_STORAGE_BIT"/>
>+                <enum name="GL_CLIENT_MAPPED_BUFFER_BARRIER_BIT"/>
>+                <enum name="GL_BUFFER_IMMUTABLE_STORAGE"/>
>+                <enum name="GL_BUFFER_STORAGE_FLAGS"/>
>+                <command name="glBufferStorage"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_ARB_cl_event" supported="gl|glcore">
>+            <require>
>+                <enum name="GL_SYNC_CL_EVENT_ARB"/>
>+                <enum name="GL_SYNC_CL_EVENT_COMPLETE_ARB"/>
>+                <command name="glCreateSyncFromCLeventARB"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_ARB_clear_buffer_object" supported="gl|glcore">
>+            <require>
>+                <command name="glClearBufferData"/>
>+                <command name="glClearBufferSubData"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_ARB_clear_texture" supported="gl|glcore">
>+            <require>
>+                <enum name="GL_CLEAR_TEXTURE"/>
>+                <command name="glClearTexImage"/>
>+                <command name="glClearTexSubImage"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_ARB_clip_control" supported="gl|glcore">
>+            <require>
>+                <command name="glClipControl"/>
>+                <enum name="GL_LOWER_LEFT"/>
>+                <enum name="GL_UPPER_LEFT"/>
>+                <enum name="GL_NEGATIVE_ONE_TO_ONE"/>
>+                <enum name="GL_ZERO_TO_ONE"/>
>+                <enum name="GL_CLIP_ORIGIN"/>
>+                <enum name="GL_CLIP_DEPTH_MODE"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_ARB_color_buffer_float" supported="gl">
>+            <require>
>+                <enum name="GL_RGBA_FLOAT_MODE_ARB"/>
>+                <enum name="GL_CLAMP_VERTEX_COLOR_ARB"/>
>+                <enum name="GL_CLAMP_FRAGMENT_COLOR_ARB"/>
>+                <enum name="GL_CLAMP_READ_COLOR_ARB"/>
>+                <enum name="GL_FIXED_ONLY_ARB"/>
>+                <command name="glClampColorARB"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_ARB_compatibility" supported="gl">
>+            <require comment="Defines features from OpenGL 3.0 that were removed in OpenGL 3.1 - not enumerated here yet">
>+            </require>
>+        </extension>
>+        <extension name="GL_ARB_compressed_texture_pixel_storage" supported="gl|glcore">
>+            <require>
>+                <enum name="GL_UNPACK_COMPRESSED_BLOCK_WIDTH"/>
>+                <enum name="GL_UNPACK_COMPRESSED_BLOCK_HEIGHT"/>
>+                <enum name="GL_UNPACK_COMPRESSED_BLOCK_DEPTH"/>
>+                <enum name="GL_UNPACK_COMPRESSED_BLOCK_SIZE"/>
>+                <enum name="GL_PACK_COMPRESSED_BLOCK_WIDTH"/>
>+                <enum name="GL_PACK_COMPRESSED_BLOCK_HEIGHT"/>
>+                <enum name="GL_PACK_COMPRESSED_BLOCK_DEPTH"/>
>+                <enum name="GL_PACK_COMPRESSED_BLOCK_SIZE"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_ARB_compute_shader" supported="gl|glcore">
>+            <require>
>+                <enum name="GL_COMPUTE_SHADER"/>
>+                <enum name="GL_MAX_COMPUTE_UNIFORM_BLOCKS"/>
>+                <enum name="GL_MAX_COMPUTE_TEXTURE_IMAGE_UNITS"/>
>+                <enum name="GL_MAX_COMPUTE_IMAGE_UNIFORMS"/>
>+                <enum name="GL_MAX_COMPUTE_SHARED_MEMORY_SIZE"/>
>+                <enum name="GL_MAX_COMPUTE_UNIFORM_COMPONENTS"/>
>+                <enum name="GL_MAX_COMPUTE_ATOMIC_COUNTER_BUFFERS"/>
>+                <enum name="GL_MAX_COMPUTE_ATOMIC_COUNTERS"/>
>+                <enum name="GL_MAX_COMBINED_COMPUTE_UNIFORM_COMPONENTS"/>
>+                <enum name="GL_MAX_COMPUTE_WORK_GROUP_INVOCATIONS"/>
>+                <enum name="GL_MAX_COMPUTE_WORK_GROUP_COUNT"/>
>+                <enum name="GL_MAX_COMPUTE_WORK_GROUP_SIZE"/>
>+                <enum name="GL_COMPUTE_WORK_GROUP_SIZE"/>
>+                <enum name="GL_UNIFORM_BLOCK_REFERENCED_BY_COMPUTE_SHADER"/>
>+                <enum name="GL_ATOMIC_COUNTER_BUFFER_REFERENCED_BY_COMPUTE_SHADER"/>
>+                <enum name="GL_DISPATCH_INDIRECT_BUFFER"/>
>+                <enum name="GL_DISPATCH_INDIRECT_BUFFER_BINDING"/>
>+                <enum name="GL_COMPUTE_SHADER_BIT"/>
>+                <command name="glDispatchCompute"/>
>+                <command name="glDispatchComputeIndirect"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_ARB_compute_variable_group_size" supported="gl|glcore">
>+            <require>
>+                <enum name="GL_MAX_COMPUTE_VARIABLE_GROUP_INVOCATIONS_ARB"/>
>+                <enum name="GL_MAX_COMPUTE_FIXED_GROUP_INVOCATIONS_ARB"/>
>+                <enum name="GL_MAX_COMPUTE_VARIABLE_GROUP_SIZE_ARB"/>
>+                <enum name="GL_MAX_COMPUTE_FIXED_GROUP_SIZE_ARB"/>
>+                <command name="glDispatchComputeGroupSizeARB"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_ARB_conditional_render_inverted" supported="gl|glcore">
>+            <require>
>+                <enum name="GL_QUERY_WAIT_INVERTED"/>
>+                <enum name="GL_QUERY_NO_WAIT_INVERTED"/>
>+                <enum name="GL_QUERY_BY_REGION_WAIT_INVERTED"/>
>+                <enum name="GL_QUERY_BY_REGION_NO_WAIT_INVERTED"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_ARB_conservative_depth" supported="gl|glcore"/>
>+        <extension name="GL_ARB_copy_buffer" supported="gl|glcore">
>+            <require>
>+                <enum name="GL_COPY_READ_BUFFER"/>
>+                <enum name="GL_COPY_WRITE_BUFFER"/>
>+                <command name="glCopyBufferSubData"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_ARB_copy_image" supported="gl|glcore">
>+            <require>
>+                <command name="glCopyImageSubData"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_ARB_cull_distance" supported="gl|glcore">
>+            <require>
>+                <enum name="GL_MAX_CULL_DISTANCES"/>
>+                <enum name="GL_MAX_COMBINED_CLIP_AND_CULL_DISTANCES"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_ARB_debug_output" supported="gl|glcore">
>+            <require>
>+                <enum name="GL_DEBUG_OUTPUT_SYNCHRONOUS_ARB"/>
>+                <enum name="GL_DEBUG_NEXT_LOGGED_MESSAGE_LENGTH_ARB"/>
>+                <enum name="GL_DEBUG_CALLBACK_FUNCTION_ARB"/>
>+                <enum name="GL_DEBUG_CALLBACK_USER_PARAM_ARB"/>
>+                <enum name="GL_DEBUG_SOURCE_API_ARB"/>
>+                <enum name="GL_DEBUG_SOURCE_WINDOW_SYSTEM_ARB"/>
>+                <enum name="GL_DEBUG_SOURCE_SHADER_COMPILER_ARB"/>
>+                <enum name="GL_DEBUG_SOURCE_THIRD_PARTY_ARB"/>
>+                <enum name="GL_DEBUG_SOURCE_APPLICATION_ARB"/>
>+                <enum name="GL_DEBUG_SOURCE_OTHER_ARB"/>
>+                <enum name="GL_DEBUG_TYPE_ERROR_ARB"/>
>+                <enum name="GL_DEBUG_TYPE_DEPRECATED_BEHAVIOR_ARB"/>
>+                <enum name="GL_DEBUG_TYPE_UNDEFINED_BEHAVIOR_ARB"/>
>+                <enum name="GL_DEBUG_TYPE_PORTABILITY_ARB"/>
>+                <enum name="GL_DEBUG_TYPE_PERFORMANCE_ARB"/>
>+                <enum name="GL_DEBUG_TYPE_OTHER_ARB"/>
>+                <enum name="GL_MAX_DEBUG_MESSAGE_LENGTH_ARB"/>
>+                <enum name="GL_MAX_DEBUG_LOGGED_MESSAGES_ARB"/>
>+                <enum name="GL_DEBUG_LOGGED_MESSAGES_ARB"/>
>+                <enum name="GL_DEBUG_SEVERITY_HIGH_ARB"/>
>+                <enum name="GL_DEBUG_SEVERITY_MEDIUM_ARB"/>
>+                <enum name="GL_DEBUG_SEVERITY_LOW_ARB"/>
>+                <command name="glDebugMessageControlARB"/>
>+                <command name="glDebugMessageInsertARB"/>
>+                <command name="glDebugMessageCallbackARB"/>
>+                <command name="glGetDebugMessageLogARB"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_ARB_depth_buffer_float" supported="gl|glcore">
>+            <require>
>+                <enum name="GL_DEPTH_COMPONENT32F"/>
>+                <enum name="GL_DEPTH32F_STENCIL8"/>
>+                <enum name="GL_FLOAT_32_UNSIGNED_INT_24_8_REV"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_ARB_depth_clamp" supported="gl|glcore">
>+            <require>
>+                <enum name="GL_DEPTH_CLAMP"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_ARB_depth_texture" supported="gl">
>+            <require>
>+                <enum name="GL_DEPTH_COMPONENT16_ARB"/>
>+                <enum name="GL_DEPTH_COMPONENT24_ARB"/>
>+                <enum name="GL_DEPTH_COMPONENT32_ARB"/>
>+                <enum name="GL_TEXTURE_DEPTH_SIZE_ARB"/>
>+                <enum name="GL_DEPTH_TEXTURE_MODE_ARB"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_ARB_derivative_control" supported="gl|glcore"/>
>+        <extension name="GL_ARB_direct_state_access" supported="gl|glcore">
>+            <require>
>+                <enum name="GL_TEXTURE_TARGET"/>
>+                <enum name="GL_QUERY_TARGET"/>
>+                <enum name="GL_TEXTURE_BINDING_1D"/>
>+                <enum name="GL_TEXTURE_BINDING_1D_ARRAY"/>
>+                <enum name="GL_TEXTURE_BINDING_2D"/>
>+                <enum name="GL_TEXTURE_BINDING_2D_ARRAY"/>
>+                <enum name="GL_TEXTURE_BINDING_2D_MULTISAMPLE"/>
>+                <enum name="GL_TEXTURE_BINDING_2D_MULTISAMPLE_ARRAY"/>
>+                <enum name="GL_TEXTURE_BINDING_3D"/>
>+                <enum name="GL_TEXTURE_BINDING_BUFFER"/>
>+                <enum name="GL_TEXTURE_BINDING_CUBE_MAP"/>
>+                <enum name="GL_TEXTURE_BINDING_CUBE_MAP_ARRAY"/>
>+                <enum name="GL_TEXTURE_BINDING_RECTANGLE"/>
>+            </require>
>+            <require comment="Transform Feedback object functions">
>+                <command name="glCreateTransformFeedbacks"/>
>+                <command name="glTransformFeedbackBufferBase"/>
>+                <command name="glTransformFeedbackBufferRange"/>
>+                <command name="glGetTransformFeedbackiv"/>
>+                <command name="glGetTransformFeedbacki_v"/>
>+                <command name="glGetTransformFeedbacki64_v"/>
>+            </require>
>+            <require comment="Buffer object functions">
>+                <command name="glCreateBuffers"/>
>+                <command name="glNamedBufferStorage"/>
>+                <command name="glNamedBufferData"/>
>+                <command name="glNamedBufferSubData"/>
>+                <command name="glCopyNamedBufferSubData"/>
>+                <command name="glClearNamedBufferData"/>
>+                <command name="glClearNamedBufferSubData"/>
>+                <command name="glMapNamedBuffer"/>
>+                <command name="glMapNamedBufferRange"/>
>+                <command name="glUnmapNamedBuffer"/>
>+                <command name="glFlushMappedNamedBufferRange"/>
>+                <command name="glGetNamedBufferParameteriv"/>
>+                <command name="glGetNamedBufferParameteri64v"/>
>+                <command name="glGetNamedBufferPointerv"/>
>+                <command name="glGetNamedBufferSubData"/>
>+            </require>
>+            <require comment="Framebuffer object functions">
>+                <command name="glCreateFramebuffers"/>
>+                <command name="glNamedFramebufferRenderbuffer"/>
>+                <command name="glNamedFramebufferParameteri"/>
>+                <command name="glNamedFramebufferTexture"/>
>+                <command name="glNamedFramebufferTextureLayer"/>
>+                <command name="glNamedFramebufferDrawBuffer"/>
>+                <command name="glNamedFramebufferDrawBuffers"/>
>+                <command name="glNamedFramebufferReadBuffer"/>
>+                <command name="glInvalidateNamedFramebufferData"/>
>+                <command name="glInvalidateNamedFramebufferSubData"/>
>+                <command name="glClearNamedFramebufferiv"/>
>+                <command name="glClearNamedFramebufferuiv"/>
>+                <command name="glClearNamedFramebufferfv"/>
>+                <command name="glClearNamedFramebufferfi"/>
>+                <command name="glBlitNamedFramebuffer"/>
>+                <command name="glCheckNamedFramebufferStatus"/>
>+                <command name="glGetNamedFramebufferParameteriv"/>
>+                <command name="glGetNamedFramebufferAttachmentParameteriv"/>
>+            </require>
>+            <require comment="Renderbuffer object functions">
>+                <command name="glCreateRenderbuffers"/>
>+                <command name="glNamedRenderbufferStorage"/>
>+                <command name="glNamedRenderbufferStorageMultisample"/>
>+                <command name="glGetNamedRenderbufferParameteriv"/>
>+            </require>
>+            <require comment="Texture object functions">
>+                <command name="glCreateTextures"/>
>+                <command name="glTextureBuffer"/>
>+                <command name="glTextureBufferRange"/>
>+                <command name="glTextureStorage1D"/>
>+                <command name="glTextureStorage2D"/>
>+                <command name="glTextureStorage3D"/>
>+                <command name="glTextureStorage2DMultisample"/>
>+                <command name="glTextureStorage3DMultisample"/>
>+                <command name="glTextureSubImage1D"/>
>+                <command name="glTextureSubImage2D"/>
>+                <command name="glTextureSubImage3D"/>
>+                <command name="glCompressedTextureSubImage1D"/>
>+                <command name="glCompressedTextureSubImage2D"/>
>+                <command name="glCompressedTextureSubImage3D"/>
>+                <command name="glCopyTextureSubImage1D"/>
>+                <command name="glCopyTextureSubImage2D"/>
>+                <command name="glCopyTextureSubImage3D"/>
>+                <command name="glTextureParameterf"/>
>+                <command name="glTextureParameterfv"/>
>+                <command name="glTextureParameteri"/>
>+                <command name="glTextureParameterIiv"/>
>+                <command name="glTextureParameterIuiv"/>
>+                <command name="glTextureParameteriv"/>
>+                <command name="glGenerateTextureMipmap"/>
>+                <command name="glBindTextureUnit"/>
>+                <command name="glGetTextureImage"/>
>+                <command name="glGetCompressedTextureImage"/>
>+                <command name="glGetTextureLevelParameterfv"/>
>+                <command name="glGetTextureLevelParameteriv"/>
>+                <command name="glGetTextureParameterfv"/>
>+                <command name="glGetTextureParameterIiv"/>
>+                <command name="glGetTextureParameterIuiv"/>
>+                <command name="glGetTextureParameteriv"/>
>+            </require>
>+            <require comment="Vertex Array object functions">
>+                <command name="glCreateVertexArrays"/>
>+                <command name="glDisableVertexArrayAttrib"/>
>+                <command name="glEnableVertexArrayAttrib"/>
>+                <command name="glVertexArrayElementBuffer"/>
>+                <command name="glVertexArrayVertexBuffer"/>
>+                <command name="glVertexArrayVertexBuffers"/>
>+                <command name="glVertexArrayAttribBinding"/>
>+                <command name="glVertexArrayAttribFormat"/>
>+                <command name="glVertexArrayAttribIFormat"/>
>+                <command name="glVertexArrayAttribLFormat"/>
>+                <command name="glVertexArrayBindingDivisor"/>
>+                <command name="glGetVertexArrayiv"/>
>+                <command name="glGetVertexArrayIndexediv"/>
>+                <command name="glGetVertexArrayIndexed64iv"/>
>+            </require>
>+            <require comment="Sampler object functions">
>+                <command name="glCreateSamplers"/>
>+            </require>
>+            <require comment="Program Pipeline object functions">
>+                <command name="glCreateProgramPipelines"/>
>+            </require>
>+            <require comment="Query object functions">
>+                <command name="glCreateQueries"/>
>+                <command name="glGetQueryBufferObjecti64v"/>
>+                <command name="glGetQueryBufferObjectiv"/>
>+                <command name="glGetQueryBufferObjectui64v"/>
>+                <command name="glGetQueryBufferObjectuiv"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_ARB_draw_buffers" supported="gl">
>+            <require>
>+                <enum name="GL_MAX_DRAW_BUFFERS_ARB"/>
>+                <enum name="GL_DRAW_BUFFER0_ARB"/>
>+                <enum name="GL_DRAW_BUFFER1_ARB"/>
>+                <enum name="GL_DRAW_BUFFER2_ARB"/>
>+                <enum name="GL_DRAW_BUFFER3_ARB"/>
>+                <enum name="GL_DRAW_BUFFER4_ARB"/>
>+                <enum name="GL_DRAW_BUFFER5_ARB"/>
>+                <enum name="GL_DRAW_BUFFER6_ARB"/>
>+                <enum name="GL_DRAW_BUFFER7_ARB"/>
>+                <enum name="GL_DRAW_BUFFER8_ARB"/>
>+                <enum name="GL_DRAW_BUFFER9_ARB"/>
>+                <enum name="GL_DRAW_BUFFER10_ARB"/>
>+                <enum name="GL_DRAW_BUFFER11_ARB"/>
>+                <enum name="GL_DRAW_BUFFER12_ARB"/>
>+                <enum name="GL_DRAW_BUFFER13_ARB"/>
>+                <enum name="GL_DRAW_BUFFER14_ARB"/>
>+                <enum name="GL_DRAW_BUFFER15_ARB"/>
>+                <command name="glDrawBuffersARB"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_ARB_draw_buffers_blend" supported="gl|glcore">
>+            <require>
>+                <command name="glBlendEquationiARB"/>
>+                <command name="glBlendEquationSeparateiARB"/>
>+                <command name="glBlendFunciARB"/>
>+                <command name="glBlendFuncSeparateiARB"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_ARB_draw_elements_base_vertex" supported="gl|glcore">
>+            <require>
>+                <command name="glDrawElementsBaseVertex"/>
>+                <command name="glDrawRangeElementsBaseVertex"/>
>+                <command name="glDrawElementsInstancedBaseVertex"/>
>+                <command name="glMultiDrawElementsBaseVertex"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_ARB_draw_indirect" supported="gl|glcore">
>+            <require>
>+                <enum name="GL_DRAW_INDIRECT_BUFFER"/>
>+                <enum name="GL_DRAW_INDIRECT_BUFFER_BINDING"/>
>+                <command name="glDrawArraysIndirect"/>
>+                <command name="glDrawElementsIndirect"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_ARB_draw_instanced" supported="gl|glcore">
>+            <require>
>+                <command name="glDrawArraysInstancedARB"/>
>+                <command name="glDrawElementsInstancedARB"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_ARB_enhanced_layouts" supported="gl|glcore">
>+            <require>
>+                <enum name="GL_LOCATION_COMPONENT"/>
>+                <enum name="GL_TRANSFORM_FEEDBACK_BUFFER"/>
>+                <enum name="GL_TRANSFORM_FEEDBACK_BUFFER_INDEX"/>
>+                <enum name="GL_TRANSFORM_FEEDBACK_BUFFER_STRIDE"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_ARB_explicit_attrib_location" supported="gl|glcore"/>
>+        <extension name="GL_ARB_explicit_uniform_location" supported="gl|glcore">
>+            <require>
>+                <enum name="GL_MAX_UNIFORM_LOCATIONS"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_ARB_fragment_coord_conventions" supported="gl|glcore"/>
>+        <extension name="GL_ARB_fragment_layer_viewport" supported="gl|glcore"/>
>+        <extension name="GL_ARB_fragment_program" supported="gl">
>+            <require>
>+                <enum name="GL_FRAGMENT_PROGRAM_ARB"/>
>+                <enum name="GL_PROGRAM_FORMAT_ASCII_ARB"/>
>+                <enum name="GL_PROGRAM_LENGTH_ARB"/>
>+                <enum name="GL_PROGRAM_FORMAT_ARB"/>
>+                <enum name="GL_PROGRAM_BINDING_ARB"/>
>+                <enum name="GL_PROGRAM_INSTRUCTIONS_ARB"/>
>+                <enum name="GL_MAX_PROGRAM_INSTRUCTIONS_ARB"/>
>+                <enum name="GL_PROGRAM_NATIVE_INSTRUCTIONS_ARB"/>
>+                <enum name="GL_MAX_PROGRAM_NATIVE_INSTRUCTIONS_ARB"/>
>+                <enum name="GL_PROGRAM_TEMPORARIES_ARB"/>
>+                <enum name="GL_MAX_PROGRAM_TEMPORARIES_ARB"/>
>+                <enum name="GL_PROGRAM_NATIVE_TEMPORARIES_ARB"/>
>+                <enum name="GL_MAX_PROGRAM_NATIVE_TEMPORARIES_ARB"/>
>+                <enum name="GL_PROGRAM_PARAMETERS_ARB"/>
>+                <enum name="GL_MAX_PROGRAM_PARAMETERS_ARB"/>
>+                <enum name="GL_PROGRAM_NATIVE_PARAMETERS_ARB"/>
>+                <enum name="GL_MAX_PROGRAM_NATIVE_PARAMETERS_ARB"/>
>+                <enum name="GL_PROGRAM_ATTRIBS_ARB"/>
>+                <enum name="GL_MAX_PROGRAM_ATTRIBS_ARB"/>
>+                <enum name="GL_PROGRAM_NATIVE_ATTRIBS_ARB"/>
>+                <enum name="GL_MAX_PROGRAM_NATIVE_ATTRIBS_ARB"/>
>+                <enum name="GL_MAX_PROGRAM_LOCAL_PARAMETERS_ARB"/>
>+                <enum name="GL_MAX_PROGRAM_ENV_PARAMETERS_ARB"/>
>+                <enum name="GL_PROGRAM_UNDER_NATIVE_LIMITS_ARB"/>
>+                <enum name="GL_PROGRAM_ALU_INSTRUCTIONS_ARB"/>
>+                <enum name="GL_PROGRAM_TEX_INSTRUCTIONS_ARB"/>
>+                <enum name="GL_PROGRAM_TEX_INDIRECTIONS_ARB"/>
>+                <enum name="GL_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB"/>
>+                <enum name="GL_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB"/>
>+                <enum name="GL_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB"/>
>+                <enum name="GL_MAX_PROGRAM_ALU_INSTRUCTIONS_ARB"/>
>+                <enum name="GL_MAX_PROGRAM_TEX_INSTRUCTIONS_ARB"/>
>+                <enum name="GL_MAX_PROGRAM_TEX_INDIRECTIONS_ARB"/>
>+                <enum name="GL_MAX_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB"/>
>+                <enum name="GL_MAX_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB"/>
>+                <enum name="GL_MAX_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB"/>
>+                <enum name="GL_PROGRAM_STRING_ARB"/>
>+                <enum name="GL_PROGRAM_ERROR_POSITION_ARB"/>
>+                <enum name="GL_CURRENT_MATRIX_ARB"/>
>+                <enum name="GL_TRANSPOSE_CURRENT_MATRIX_ARB"/>
>+                <enum name="GL_CURRENT_MATRIX_STACK_DEPTH_ARB"/>
>+                <enum name="GL_MAX_PROGRAM_MATRICES_ARB"/>
>+                <enum name="GL_MAX_PROGRAM_MATRIX_STACK_DEPTH_ARB"/>
>+                <enum name="GL_MAX_TEXTURE_COORDS_ARB"/>
>+                <enum name="GL_MAX_TEXTURE_IMAGE_UNITS_ARB"/>
>+                <enum name="GL_PROGRAM_ERROR_STRING_ARB"/>
>+                <enum name="GL_MATRIX0_ARB"/>
>+                <enum name="GL_MATRIX1_ARB"/>
>+                <enum name="GL_MATRIX2_ARB"/>
>+                <enum name="GL_MATRIX3_ARB"/>
>+                <enum name="GL_MATRIX4_ARB"/>
>+                <enum name="GL_MATRIX5_ARB"/>
>+                <enum name="GL_MATRIX6_ARB"/>
>+                <enum name="GL_MATRIX7_ARB"/>
>+                <enum name="GL_MATRIX8_ARB"/>
>+                <enum name="GL_MATRIX9_ARB"/>
>+                <enum name="GL_MATRIX10_ARB"/>
>+                <enum name="GL_MATRIX11_ARB"/>
>+                <enum name="GL_MATRIX12_ARB"/>
>+                <enum name="GL_MATRIX13_ARB"/>
>+                <enum name="GL_MATRIX14_ARB"/>
>+                <enum name="GL_MATRIX15_ARB"/>
>+                <enum name="GL_MATRIX16_ARB"/>
>+                <enum name="GL_MATRIX17_ARB"/>
>+                <enum name="GL_MATRIX18_ARB"/>
>+                <enum name="GL_MATRIX19_ARB"/>
>+                <enum name="GL_MATRIX20_ARB"/>
>+                <enum name="GL_MATRIX21_ARB"/>
>+                <enum name="GL_MATRIX22_ARB"/>
>+                <enum name="GL_MATRIX23_ARB"/>
>+                <enum name="GL_MATRIX24_ARB"/>
>+                <enum name="GL_MATRIX25_ARB"/>
>+                <enum name="GL_MATRIX26_ARB"/>
>+                <enum name="GL_MATRIX27_ARB"/>
>+                <enum name="GL_MATRIX28_ARB"/>
>+                <enum name="GL_MATRIX29_ARB"/>
>+                <enum name="GL_MATRIX30_ARB"/>
>+                <enum name="GL_MATRIX31_ARB"/>
>+            </require>
>+            <require comment="Shared with ARB_vertex_program">
>+                <command name="glProgramStringARB"/>
>+                <command name="glBindProgramARB"/>
>+                <command name="glDeleteProgramsARB"/>
>+                <command name="glGenProgramsARB"/>
>+                <command name="glProgramEnvParameter4dARB"/>
>+                <command name="glProgramEnvParameter4dvARB"/>
>+                <command name="glProgramEnvParameter4fARB"/>
>+                <command name="glProgramEnvParameter4fvARB"/>
>+                <command name="glProgramLocalParameter4dARB"/>
>+                <command name="glProgramLocalParameter4dvARB"/>
>+                <command name="glProgramLocalParameter4fARB"/>
>+                <command name="glProgramLocalParameter4fvARB"/>
>+                <command name="glGetProgramEnvParameterdvARB"/>
>+                <command name="glGetProgramEnvParameterfvARB"/>
>+                <command name="glGetProgramLocalParameterdvARB"/>
>+                <command name="glGetProgramLocalParameterfvARB"/>
>+                <command name="glGetProgramivARB"/>
>+                <command name="glGetProgramStringARB"/>
>+                <command name="glIsProgramARB"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_ARB_fragment_program_shadow" supported="gl"/>
>+        <extension name="GL_ARB_fragment_shader" supported="gl">
>+            <require>
>+                <enum name="GL_FRAGMENT_SHADER_ARB"/>
>+                <enum name="GL_MAX_FRAGMENT_UNIFORM_COMPONENTS_ARB"/>
>+                <enum name="GL_FRAGMENT_SHADER_DERIVATIVE_HINT_ARB"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_ARB_fragment_shader_interlock" supported="gl|glcore"/>
>+        <extension name="GL_ARB_framebuffer_no_attachments" supported="gl|glcore">
>+            <require>
>+                <enum name="GL_FRAMEBUFFER_DEFAULT_WIDTH"/>
>+                <enum name="GL_FRAMEBUFFER_DEFAULT_HEIGHT"/>
>+                <enum name="GL_FRAMEBUFFER_DEFAULT_LAYERS"/>
>+                <enum name="GL_FRAMEBUFFER_DEFAULT_SAMPLES"/>
>+                <enum name="GL_FRAMEBUFFER_DEFAULT_FIXED_SAMPLE_LOCATIONS"/>
>+                <enum name="GL_MAX_FRAMEBUFFER_WIDTH"/>
>+                <enum name="GL_MAX_FRAMEBUFFER_HEIGHT"/>
>+                <enum name="GL_MAX_FRAMEBUFFER_LAYERS"/>
>+                <enum name="GL_MAX_FRAMEBUFFER_SAMPLES"/>
>+                <command name="glFramebufferParameteri"/>
>+                <command name="glGetFramebufferParameteriv"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_ARB_framebuffer_object" supported="gl|glcore">
>+            <require>
>+                <enum name="GL_INVALID_FRAMEBUFFER_OPERATION"/>
>+                <enum name="GL_FRAMEBUFFER_ATTACHMENT_COLOR_ENCODING"/>
>+                <enum name="GL_FRAMEBUFFER_ATTACHMENT_COMPONENT_TYPE"/>
>+                <enum name="GL_FRAMEBUFFER_ATTACHMENT_RED_SIZE"/>
>+                <enum name="GL_FRAMEBUFFER_ATTACHMENT_GREEN_SIZE"/>
>+                <enum name="GL_FRAMEBUFFER_ATTACHMENT_BLUE_SIZE"/>
>+                <enum name="GL_FRAMEBUFFER_ATTACHMENT_ALPHA_SIZE"/>
>+                <enum name="GL_FRAMEBUFFER_ATTACHMENT_DEPTH_SIZE"/>
>+                <enum name="GL_FRAMEBUFFER_ATTACHMENT_STENCIL_SIZE"/>
>+                <enum name="GL_FRAMEBUFFER_DEFAULT"/>
>+                <enum name="GL_FRAMEBUFFER_UNDEFINED"/>
>+                <enum name="GL_DEPTH_STENCIL_ATTACHMENT"/>
>+                <enum name="GL_MAX_RENDERBUFFER_SIZE"/>
>+                <enum name="GL_DEPTH_STENCIL"/>
>+                <enum name="GL_UNSIGNED_INT_24_8"/>
>+                <enum name="GL_DEPTH24_STENCIL8"/>
>+                <enum name="GL_TEXTURE_STENCIL_SIZE"/>
>+                <enum name="GL_UNSIGNED_NORMALIZED"/>
>+                <enum name="GL_FRAMEBUFFER_BINDING"/>
>+                <enum name="GL_DRAW_FRAMEBUFFER_BINDING"/>
>+                <enum name="GL_RENDERBUFFER_BINDING"/>
>+                <enum name="GL_READ_FRAMEBUFFER"/>
>+                <enum name="GL_DRAW_FRAMEBUFFER"/>
>+                <enum name="GL_READ_FRAMEBUFFER_BINDING"/>
>+                <enum name="GL_RENDERBUFFER_SAMPLES"/>
>+                <enum name="GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE"/>
>+                <enum name="GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME"/>
>+                <enum name="GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL"/>
>+                <enum name="GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE"/>
>+                <enum name="GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER"/>
>+                <enum name="GL_FRAMEBUFFER_COMPLETE"/>
>+                <enum name="GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT"/>
>+                <enum name="GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT"/>
>+                <enum name="GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER"/>
>+                <enum name="GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER"/>
>+                <enum name="GL_FRAMEBUFFER_UNSUPPORTED"/>
>+                <enum name="GL_MAX_COLOR_ATTACHMENTS"/>
>+                <enum name="GL_COLOR_ATTACHMENT0"/>
>+                <enum name="GL_COLOR_ATTACHMENT1"/>
>+                <enum name="GL_COLOR_ATTACHMENT2"/>
>+                <enum name="GL_COLOR_ATTACHMENT3"/>
>+                <enum name="GL_COLOR_ATTACHMENT4"/>
>+                <enum name="GL_COLOR_ATTACHMENT5"/>
>+                <enum name="GL_COLOR_ATTACHMENT6"/>
>+                <enum name="GL_COLOR_ATTACHMENT7"/>
>+                <enum name="GL_COLOR_ATTACHMENT8"/>
>+                <enum name="GL_COLOR_ATTACHMENT9"/>
>+                <enum name="GL_COLOR_ATTACHMENT10"/>
>+                <enum name="GL_COLOR_ATTACHMENT11"/>
>+                <enum name="GL_COLOR_ATTACHMENT12"/>
>+                <enum name="GL_COLOR_ATTACHMENT13"/>
>+                <enum name="GL_COLOR_ATTACHMENT14"/>
>+                <enum name="GL_COLOR_ATTACHMENT15"/>
>+                <enum name="GL_DEPTH_ATTACHMENT"/>
>+                <enum name="GL_STENCIL_ATTACHMENT"/>
>+                <enum name="GL_FRAMEBUFFER"/>
>+                <enum name="GL_RENDERBUFFER"/>
>+                <enum name="GL_RENDERBUFFER_WIDTH"/>
>+                <enum name="GL_RENDERBUFFER_HEIGHT"/>
>+                <enum name="GL_RENDERBUFFER_INTERNAL_FORMAT"/>
>+                <enum name="GL_STENCIL_INDEX1"/>
>+                <enum name="GL_STENCIL_INDEX4"/>
>+                <enum name="GL_STENCIL_INDEX8"/>
>+                <enum name="GL_STENCIL_INDEX16"/>
>+                <enum name="GL_RENDERBUFFER_RED_SIZE"/>
>+                <enum name="GL_RENDERBUFFER_GREEN_SIZE"/>
>+                <enum name="GL_RENDERBUFFER_BLUE_SIZE"/>
>+                <enum name="GL_RENDERBUFFER_ALPHA_SIZE"/>
>+                <enum name="GL_RENDERBUFFER_DEPTH_SIZE"/>
>+                <enum name="GL_RENDERBUFFER_STENCIL_SIZE"/>
>+                <enum name="GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE"/>
>+                <enum name="GL_MAX_SAMPLES"/>
>+                <command name="glIsRenderbuffer"/>
>+                <command name="glBindRenderbuffer"/>
>+                <command name="glDeleteRenderbuffers"/>
>+                <command name="glGenRenderbuffers"/>
>+                <command name="glRenderbufferStorage"/>
>+                <command name="glGetRenderbufferParameteriv"/>
>+                <command name="glIsFramebuffer"/>
>+                <command name="glBindFramebuffer"/>
>+                <command name="glDeleteFramebuffers"/>
>+                <command name="glGenFramebuffers"/>
>+                <command name="glCheckFramebufferStatus"/>
>+                <command name="glFramebufferTexture1D"/>
>+                <command name="glFramebufferTexture2D"/>
>+                <command name="glFramebufferTexture3D"/>
>+                <command name="glFramebufferRenderbuffer"/>
>+                <command name="glGetFramebufferAttachmentParameteriv"/>
>+                <command name="glGenerateMipmap"/>
>+                <command name="glBlitFramebuffer"/>
>+                <command name="glRenderbufferStorageMultisample"/>
>+                <command name="glFramebufferTextureLayer"/>
>+            </require>
>+            <require api="gl" profile="compatibility">
>+                <enum name="GL_INDEX"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_ARB_framebuffer_sRGB" supported="gl|glcore">
>+            <require>
>+                <enum name="GL_FRAMEBUFFER_SRGB"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_ARB_geometry_shader4" supported="gl|glcore">
>+            <require>
>+                <enum name="GL_LINES_ADJACENCY_ARB"/>
>+                <enum name="GL_LINE_STRIP_ADJACENCY_ARB"/>
>+                <enum name="GL_TRIANGLES_ADJACENCY_ARB"/>
>+                <enum name="GL_TRIANGLE_STRIP_ADJACENCY_ARB"/>
>+                <enum name="GL_PROGRAM_POINT_SIZE_ARB"/>
>+                <enum name="GL_MAX_GEOMETRY_TEXTURE_IMAGE_UNITS_ARB"/>
>+                <enum name="GL_FRAMEBUFFER_ATTACHMENT_LAYERED_ARB"/>
>+                <enum name="GL_FRAMEBUFFER_INCOMPLETE_LAYER_TARGETS_ARB"/>
>+                <enum name="GL_FRAMEBUFFER_INCOMPLETE_LAYER_COUNT_ARB"/>
>+                <enum name="GL_GEOMETRY_SHADER_ARB"/>
>+                <enum name="GL_GEOMETRY_VERTICES_OUT_ARB"/>
>+                <enum name="GL_GEOMETRY_INPUT_TYPE_ARB"/>
>+                <enum name="GL_GEOMETRY_OUTPUT_TYPE_ARB"/>
>+                <enum name="GL_MAX_GEOMETRY_VARYING_COMPONENTS_ARB"/>
>+                <enum name="GL_MAX_VERTEX_VARYING_COMPONENTS_ARB"/>
>+                <enum name="GL_MAX_GEOMETRY_UNIFORM_COMPONENTS_ARB"/>
>+                <enum name="GL_MAX_GEOMETRY_OUTPUT_VERTICES_ARB"/>
>+                <enum name="GL_MAX_GEOMETRY_TOTAL_OUTPUT_COMPONENTS_ARB"/>
>+                <enum name="GL_MAX_VARYING_COMPONENTS"/>
>+                <enum name="GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER"/>
>+                <command name="glProgramParameteriARB"/>
>+                <command name="glFramebufferTextureARB"/>
>+                <command name="glFramebufferTextureLayerARB"/>
>+                <command name="glFramebufferTextureFaceARB"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_ARB_get_program_binary" supported="gl|glcore">
>+            <require>
>+                <enum name="GL_PROGRAM_BINARY_RETRIEVABLE_HINT"/>
>+                <enum name="GL_PROGRAM_BINARY_LENGTH"/>
>+                <enum name="GL_NUM_PROGRAM_BINARY_FORMATS"/>
>+                <enum name="GL_PROGRAM_BINARY_FORMATS"/>
>+                <command name="glGetProgramBinary"/>
>+                <command name="glProgramBinary"/>
>+                <command name="glProgramParameteri"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_ARB_get_texture_sub_image" supported="gl|glcore">
>+            <require>
>+                <command name="glGetTextureSubImage"/>
>+                <command name="glGetCompressedTextureSubImage"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_ARB_gl_spirv" supported="gl|glcore">
>+            <require>
>+                <enum name="GL_SHADER_BINARY_FORMAT_SPIR_V_ARB"/>
>+                <enum name="GL_SPIR_V_BINARY_ARB"/>
>+                <command name="glSpecializeShaderARB"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_ARB_gpu_shader5" supported="gl|glcore">
>+            <require>
>+                <enum name="GL_GEOMETRY_SHADER_INVOCATIONS"/>
>+                <enum name="GL_MAX_GEOMETRY_SHADER_INVOCATIONS"/>
>+                <enum name="GL_MIN_FRAGMENT_INTERPOLATION_OFFSET"/>
>+                <enum name="GL_MAX_FRAGMENT_INTERPOLATION_OFFSET"/>
>+                <enum name="GL_FRAGMENT_INTERPOLATION_OFFSET_BITS"/>
>+                <enum name="GL_MAX_VERTEX_STREAMS"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_ARB_gpu_shader_fp64" supported="gl|glcore">
>+            <require>
>+                <enum name="GL_DOUBLE"/>
>+                <enum name="GL_DOUBLE_VEC2"/>
>+                <enum name="GL_DOUBLE_VEC3"/>
>+                <enum name="GL_DOUBLE_VEC4"/>
>+                <enum name="GL_DOUBLE_MAT2"/>
>+                <enum name="GL_DOUBLE_MAT3"/>
>+                <enum name="GL_DOUBLE_MAT4"/>
>+                <enum name="GL_DOUBLE_MAT2x3"/>
>+                <enum name="GL_DOUBLE_MAT2x4"/>
>+                <enum name="GL_DOUBLE_MAT3x2"/>
>+                <enum name="GL_DOUBLE_MAT3x4"/>
>+                <enum name="GL_DOUBLE_MAT4x2"/>
>+                <enum name="GL_DOUBLE_MAT4x3"/>
>+                <command name="glUniform1d"/>
>+                <command name="glUniform2d"/>
>+                <command name="glUniform3d"/>
>+                <command name="glUniform4d"/>
>+                <command name="glUniform1dv"/>
>+                <command name="glUniform2dv"/>
>+                <command name="glUniform3dv"/>
>+                <command name="glUniform4dv"/>
>+                <command name="glUniformMatrix2dv"/>
>+                <command name="glUniformMatrix3dv"/>
>+                <command name="glUniformMatrix4dv"/>
>+                <command name="glUniformMatrix2x3dv"/>
>+                <command name="glUniformMatrix2x4dv"/>
>+                <command name="glUniformMatrix3x2dv"/>
>+                <command name="glUniformMatrix3x4dv"/>
>+                <command name="glUniformMatrix4x2dv"/>
>+                <command name="glUniformMatrix4x3dv"/>
>+                <command name="glGetUniformdv"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_ARB_gpu_shader_int64" supported="gl|glcore">
>+            <require>
>+                <enum name="GL_INT64_ARB"/>
>+                <enum name="GL_UNSIGNED_INT64_ARB"/>
>+                <enum name="GL_INT64_VEC2_ARB"/>
>+                <enum name="GL_INT64_VEC3_ARB"/>
>+                <enum name="GL_INT64_VEC4_ARB"/>
>+                <enum name="GL_UNSIGNED_INT64_VEC2_ARB"/>
>+                <enum name="GL_UNSIGNED_INT64_VEC3_ARB"/>
>+                <enum name="GL_UNSIGNED_INT64_VEC4_ARB"/>
>+                <command name="glUniform1i64ARB"/>
>+                <command name="glUniform2i64ARB"/>
>+                <command name="glUniform3i64ARB"/>
>+                <command name="glUniform4i64ARB"/>
>+                <command name="glUniform1i64vARB"/>
>+                <command name="glUniform2i64vARB"/>
>+                <command name="glUniform3i64vARB"/>
>+                <command name="glUniform4i64vARB"/>
>+                <command name="glUniform1ui64ARB"/>
>+                <command name="glUniform2ui64ARB"/>
>+                <command name="glUniform3ui64ARB"/>
>+                <command name="glUniform4ui64ARB"/>
>+                <command name="glUniform1ui64vARB"/>
>+                <command name="glUniform2ui64vARB"/>
>+                <command name="glUniform3ui64vARB"/>
>+                <command name="glUniform4ui64vARB"/>
>+                <command name="glGetUniformi64vARB"/>
>+                <command name="glGetUniformui64vARB"/>
>+                <command name="glGetnUniformi64vARB"/>
>+                <command name="glGetnUniformui64vARB"/>
>+                <command name="glProgramUniform1i64ARB"/>
>+                <command name="glProgramUniform2i64ARB"/>
>+                <command name="glProgramUniform3i64ARB"/>
>+                <command name="glProgramUniform4i64ARB"/>
>+                <command name="glProgramUniform1i64vARB"/>
>+                <command name="glProgramUniform2i64vARB"/>
>+                <command name="glProgramUniform3i64vARB"/>
>+                <command name="glProgramUniform4i64vARB"/>
>+                <command name="glProgramUniform1ui64ARB"/>
>+                <command name="glProgramUniform2ui64ARB"/>
>+                <command name="glProgramUniform3ui64ARB"/>
>+                <command name="glProgramUniform4ui64ARB"/>
>+                <command name="glProgramUniform1ui64vARB"/>
>+                <command name="glProgramUniform2ui64vARB"/>
>+                <command name="glProgramUniform3ui64vARB"/>
>+                <command name="glProgramUniform4ui64vARB"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_ARB_half_float_pixel" supported="gl">
>+            <require>
>+                <type name="GLhalfARB"/>
>+                <enum name="GL_HALF_FLOAT_ARB"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_ARB_half_float_vertex" supported="gl|glcore">
>+            <require>
>+                <type name="GLhalf"/>
>+                <enum name="GL_HALF_FLOAT"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_ARB_imaging" supported="gl|glcore" comment="Now treating ARB_imaging as an extension, not a GL API version">
>+            <require>
>+                <enum name="GL_BLEND_COLOR"/>
>+                <enum name="GL_BLEND_EQUATION"/>
>+                <enum name="GL_CONSTANT_COLOR"/>
>+                <enum name="GL_ONE_MINUS_CONSTANT_COLOR"/>
>+                <enum name="GL_CONSTANT_ALPHA"/>
>+                <enum name="GL_ONE_MINUS_CONSTANT_ALPHA"/>
>+                <enum name="GL_FUNC_ADD"/>
>+                <enum name="GL_FUNC_REVERSE_SUBTRACT"/>
>+                <enum name="GL_FUNC_SUBTRACT"/>
>+                <enum name="GL_MIN"/>
>+                <enum name="GL_MAX"/>
>+                <command name="glBlendColor"/>
>+                <command name="glBlendEquation"/>
>+            </require>
>+            <require api="gl" profile="compatibility">
>+                <enum name="GL_CONVOLUTION_1D"/>
>+                <enum name="GL_CONVOLUTION_2D"/>
>+                <enum name="GL_SEPARABLE_2D"/>
>+                <enum name="GL_CONVOLUTION_BORDER_MODE"/>
>+                <enum name="GL_CONVOLUTION_FILTER_SCALE"/>
>+                <enum name="GL_CONVOLUTION_FILTER_BIAS"/>
>+                <enum name="GL_REDUCE"/>
>+                <enum name="GL_CONVOLUTION_FORMAT"/>
>+                <enum name="GL_CONVOLUTION_WIDTH"/>
>+                <enum name="GL_CONVOLUTION_HEIGHT"/>
>+                <enum name="GL_MAX_CONVOLUTION_WIDTH"/>
>+                <enum name="GL_MAX_CONVOLUTION_HEIGHT"/>
>+                <enum name="GL_POST_CONVOLUTION_RED_SCALE"/>
>+                <enum name="GL_POST_CONVOLUTION_GREEN_SCALE"/>
>+                <enum name="GL_POST_CONVOLUTION_BLUE_SCALE"/>
>+                <enum name="GL_POST_CONVOLUTION_ALPHA_SCALE"/>
>+                <enum name="GL_POST_CONVOLUTION_RED_BIAS"/>
>+                <enum name="GL_POST_CONVOLUTION_GREEN_BIAS"/>
>+                <enum name="GL_POST_CONVOLUTION_BLUE_BIAS"/>
>+                <enum name="GL_POST_CONVOLUTION_ALPHA_BIAS"/>
>+                <enum name="GL_HISTOGRAM"/>
>+                <enum name="GL_PROXY_HISTOGRAM"/>
>+                <enum name="GL_HISTOGRAM_WIDTH"/>
>+                <enum name="GL_HISTOGRAM_FORMAT"/>
>+                <enum name="GL_HISTOGRAM_RED_SIZE"/>
>+                <enum name="GL_HISTOGRAM_GREEN_SIZE"/>
>+                <enum name="GL_HISTOGRAM_BLUE_SIZE"/>
>+                <enum name="GL_HISTOGRAM_ALPHA_SIZE"/>
>+                <enum name="GL_HISTOGRAM_LUMINANCE_SIZE"/>
>+                <enum name="GL_HISTOGRAM_SINK"/>
>+                <enum name="GL_MINMAX"/>
>+                <enum name="GL_MINMAX_FORMAT"/>
>+                <enum name="GL_MINMAX_SINK"/>
>+                <enum name="GL_TABLE_TOO_LARGE"/>
>+                <enum name="GL_COLOR_MATRIX"/>
>+                <enum name="GL_COLOR_MATRIX_STACK_DEPTH"/>
>+                <enum name="GL_MAX_COLOR_MATRIX_STACK_DEPTH"/>
>+                <enum name="GL_POST_COLOR_MATRIX_RED_SCALE"/>
>+                <enum name="GL_POST_COLOR_MATRIX_GREEN_SCALE"/>
>+                <enum name="GL_POST_COLOR_MATRIX_BLUE_SCALE"/>
>+                <enum name="GL_POST_COLOR_MATRIX_ALPHA_SCALE"/>
>+                <enum name="GL_POST_COLOR_MATRIX_RED_BIAS"/>
>+                <enum name="GL_POST_COLOR_MATRIX_GREEN_BIAS"/>
>+                <enum name="GL_POST_COLOR_MATRIX_BLUE_BIAS"/>
>+                <enum name="GL_POST_COLOR_MATRIX_ALPHA_BIAS"/>
>+                <enum name="GL_COLOR_TABLE"/>
>+                <enum name="GL_POST_CONVOLUTION_COLOR_TABLE"/>
>+                <enum name="GL_POST_COLOR_MATRIX_COLOR_TABLE"/>
>+                <enum name="GL_PROXY_COLOR_TABLE"/>
>+                <enum name="GL_PROXY_POST_CONVOLUTION_COLOR_TABLE"/>
>+                <enum name="GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE"/>
>+                <enum name="GL_COLOR_TABLE_SCALE"/>
>+                <enum name="GL_COLOR_TABLE_BIAS"/>
>+                <enum name="GL_COLOR_TABLE_FORMAT"/>
>+                <enum name="GL_COLOR_TABLE_WIDTH"/>
>+                <enum name="GL_COLOR_TABLE_RED_SIZE"/>
>+                <enum name="GL_COLOR_TABLE_GREEN_SIZE"/>
>+                <enum name="GL_COLOR_TABLE_BLUE_SIZE"/>
>+                <enum name="GL_COLOR_TABLE_ALPHA_SIZE"/>
>+                <enum name="GL_COLOR_TABLE_LUMINANCE_SIZE"/>
>+                <enum name="GL_COLOR_TABLE_INTENSITY_SIZE"/>
>+                <enum name="GL_CONSTANT_BORDER"/>
>+                <enum name="GL_REPLICATE_BORDER"/>
>+                <enum name="GL_CONVOLUTION_BORDER_COLOR"/>
>+                <command name="glColorTable"/>
>+                <command name="glColorTableParameterfv"/>
>+                <command name="glColorTableParameteriv"/>
>+                <command name="glCopyColorTable"/>
>+                <command name="glGetColorTable"/>
>+                <command name="glGetColorTableParameterfv"/>
>+                <command name="glGetColorTableParameteriv"/>
>+                <command name="glColorSubTable"/>
>+                <command name="glCopyColorSubTable"/>
>+                <command name="glConvolutionFilter1D"/>
>+                <command name="glConvolutionFilter2D"/>
>+                <command name="glConvolutionParameterf"/>
>+                <command name="glConvolutionParameterfv"/>
>+                <command name="glConvolutionParameteri"/>
>+                <command name="glConvolutionParameteriv"/>
>+                <command name="glCopyConvolutionFilter1D"/>
>+                <command name="glCopyConvolutionFilter2D"/>
>+                <command name="glGetConvolutionFilter"/>
>+                <command name="glGetConvolutionParameterfv"/>
>+                <command name="glGetConvolutionParameteriv"/>
>+                <command name="glGetSeparableFilter"/>
>+                <command name="glSeparableFilter2D"/>
>+                <command name="glGetHistogram"/>
>+                <command name="glGetHistogramParameterfv"/>
>+                <command name="glGetHistogramParameteriv"/>
>+                <command name="glGetMinmax"/>
>+                <command name="glGetMinmaxParameterfv"/>
>+                <command name="glGetMinmaxParameteriv"/>
>+                <command name="glHistogram"/>
>+                <command name="glMinmax"/>
>+                <command name="glResetHistogram"/>
>+                <command name="glResetMinmax"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_ARB_indirect_parameters" supported="gl|glcore">
>+            <require>
>+                <enum name="GL_PARAMETER_BUFFER_ARB"/>
>+                <enum name="GL_PARAMETER_BUFFER_BINDING_ARB"/>
>+                <command name="glMultiDrawArraysIndirectCountARB"/>
>+                <command name="glMultiDrawElementsIndirectCountARB"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_ARB_instanced_arrays" supported="gl|glcore">
>+            <require>
>+                <enum name="GL_VERTEX_ATTRIB_ARRAY_DIVISOR_ARB"/>
>+                <command name="glVertexAttribDivisorARB"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_ARB_internalformat_query" supported="gl|glcore">
>+            <require>
>+                <enum name="GL_NUM_SAMPLE_COUNTS"/>
>+                <command name="glGetInternalformativ"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_ARB_internalformat_query2" supported="gl|glcore">
>+            <require>
>+                <enum name="GL_IMAGE_FORMAT_COMPATIBILITY_TYPE"/>
>+                <enum name="GL_NUM_SAMPLE_COUNTS"/>
>+                <enum name="GL_RENDERBUFFER"/>
>+                <enum name="GL_SAMPLES"/>
>+                <enum name="GL_TEXTURE_1D"/>
>+                <enum name="GL_TEXTURE_1D_ARRAY"/>
>+                <enum name="GL_TEXTURE_2D"/>
>+                <enum name="GL_TEXTURE_2D_ARRAY"/>
>+                <enum name="GL_TEXTURE_3D"/>
>+                <enum name="GL_TEXTURE_CUBE_MAP"/>
>+                <enum name="GL_TEXTURE_CUBE_MAP_ARRAY"/>
>+                <enum name="GL_TEXTURE_RECTANGLE"/>
>+                <enum name="GL_TEXTURE_BUFFER"/>
>+                <enum name="GL_TEXTURE_2D_MULTISAMPLE"/>
>+                <enum name="GL_TEXTURE_2D_MULTISAMPLE_ARRAY"/>
>+                <enum name="GL_TEXTURE_COMPRESSED"/>
>+                <enum name="GL_INTERNALFORMAT_SUPPORTED"/>
>+                <enum name="GL_INTERNALFORMAT_PREFERRED"/>
>+                <enum name="GL_INTERNALFORMAT_RED_SIZE"/>
>+                <enum name="GL_INTERNALFORMAT_GREEN_SIZE"/>
>+                <enum name="GL_INTERNALFORMAT_BLUE_SIZE"/>
>+                <enum name="GL_INTERNALFORMAT_ALPHA_SIZE"/>
>+                <enum name="GL_INTERNALFORMAT_DEPTH_SIZE"/>
>+                <enum name="GL_INTERNALFORMAT_STENCIL_SIZE"/>
>+                <enum name="GL_INTERNALFORMAT_SHARED_SIZE"/>
>+                <enum name="GL_INTERNALFORMAT_RED_TYPE"/>
>+                <enum name="GL_INTERNALFORMAT_GREEN_TYPE"/>
>+                <enum name="GL_INTERNALFORMAT_BLUE_TYPE"/>
>+                <enum name="GL_INTERNALFORMAT_ALPHA_TYPE"/>
>+                <enum name="GL_INTERNALFORMAT_DEPTH_TYPE"/>
>+                <enum name="GL_INTERNALFORMAT_STENCIL_TYPE"/>
>+                <enum name="GL_MAX_WIDTH"/>
>+                <enum name="GL_MAX_HEIGHT"/>
>+                <enum name="GL_MAX_DEPTH"/>
>+                <enum name="GL_MAX_LAYERS"/>
>+                <enum name="GL_MAX_COMBINED_DIMENSIONS"/>
>+                <enum name="GL_COLOR_COMPONENTS"/>
>+                <enum name="GL_DEPTH_COMPONENTS"/>
>+                <enum name="GL_STENCIL_COMPONENTS"/>
>+                <enum name="GL_COLOR_RENDERABLE"/>
>+                <enum name="GL_DEPTH_RENDERABLE"/>
>+                <enum name="GL_STENCIL_RENDERABLE"/>
>+                <enum name="GL_FRAMEBUFFER_RENDERABLE"/>
>+                <enum name="GL_FRAMEBUFFER_RENDERABLE_LAYERED"/>
>+                <enum name="GL_FRAMEBUFFER_BLEND"/>
>+                <enum name="GL_READ_PIXELS"/>
>+                <enum name="GL_READ_PIXELS_FORMAT"/>
>+                <enum name="GL_READ_PIXELS_TYPE"/>
>+                <enum name="GL_TEXTURE_IMAGE_FORMAT"/>
>+                <enum name="GL_TEXTURE_IMAGE_TYPE"/>
>+                <enum name="GL_GET_TEXTURE_IMAGE_FORMAT"/>
>+                <enum name="GL_GET_TEXTURE_IMAGE_TYPE"/>
>+                <enum name="GL_MIPMAP"/>
>+                <enum name="GL_MANUAL_GENERATE_MIPMAP"/>
>+                <enum name="GL_AUTO_GENERATE_MIPMAP"/>
>+                <enum name="GL_COLOR_ENCODING"/>
>+                <enum name="GL_SRGB_READ"/>
>+                <enum name="GL_SRGB_WRITE"/>
>+                <enum name="GL_SRGB_DECODE_ARB"/>
>+                <enum name="GL_FILTER"/>
>+                <enum name="GL_VERTEX_TEXTURE"/>
>+                <enum name="GL_TESS_CONTROL_TEXTURE"/>
>+                <enum name="GL_TESS_EVALUATION_TEXTURE"/>
>+                <enum name="GL_GEOMETRY_TEXTURE"/>
>+                <enum name="GL_FRAGMENT_TEXTURE"/>
>+                <enum name="GL_COMPUTE_TEXTURE"/>
>+                <enum name="GL_TEXTURE_SHADOW"/>
>+                <enum name="GL_TEXTURE_GATHER"/>
>+                <enum name="GL_TEXTURE_GATHER_SHADOW"/>
>+                <enum name="GL_SHADER_IMAGE_LOAD"/>
>+                <enum name="GL_SHADER_IMAGE_STORE"/>
>+                <enum name="GL_SHADER_IMAGE_ATOMIC"/>
>+                <enum name="GL_IMAGE_TEXEL_SIZE"/>
>+                <enum name="GL_IMAGE_COMPATIBILITY_CLASS"/>
>+                <enum name="GL_IMAGE_PIXEL_FORMAT"/>
>+                <enum name="GL_IMAGE_PIXEL_TYPE"/>
>+                <enum name="GL_SIMULTANEOUS_TEXTURE_AND_DEPTH_TEST"/>
>+                <enum name="GL_SIMULTANEOUS_TEXTURE_AND_STENCIL_TEST"/>
>+                <enum name="GL_SIMULTANEOUS_TEXTURE_AND_DEPTH_WRITE"/>
>+                <enum name="GL_SIMULTANEOUS_TEXTURE_AND_STENCIL_WRITE"/>
>+                <enum name="GL_TEXTURE_COMPRESSED_BLOCK_WIDTH"/>
>+                <enum name="GL_TEXTURE_COMPRESSED_BLOCK_HEIGHT"/>
>+                <enum name="GL_TEXTURE_COMPRESSED_BLOCK_SIZE"/>
>+                <enum name="GL_CLEAR_BUFFER"/>
>+                <enum name="GL_TEXTURE_VIEW"/>
>+                <enum name="GL_VIEW_COMPATIBILITY_CLASS"/>
>+                <enum name="GL_FULL_SUPPORT"/>
>+                <enum name="GL_CAVEAT_SUPPORT"/>
>+                <enum name="GL_IMAGE_CLASS_4_X_32"/>
>+                <enum name="GL_IMAGE_CLASS_2_X_32"/>
>+                <enum name="GL_IMAGE_CLASS_1_X_32"/>
>+                <enum name="GL_IMAGE_CLASS_4_X_16"/>
>+                <enum name="GL_IMAGE_CLASS_2_X_16"/>
>+                <enum name="GL_IMAGE_CLASS_1_X_16"/>
>+                <enum name="GL_IMAGE_CLASS_4_X_8"/>
>+                <enum name="GL_IMAGE_CLASS_2_X_8"/>
>+                <enum name="GL_IMAGE_CLASS_1_X_8"/>
>+                <enum name="GL_IMAGE_CLASS_11_11_10"/>
>+                <enum name="GL_IMAGE_CLASS_10_10_10_2"/>
>+                <enum name="GL_VIEW_CLASS_128_BITS"/>
>+                <enum name="GL_VIEW_CLASS_96_BITS"/>
>+                <enum name="GL_VIEW_CLASS_64_BITS"/>
>+                <enum name="GL_VIEW_CLASS_48_BITS"/>
>+                <enum name="GL_VIEW_CLASS_32_BITS"/>
>+                <enum name="GL_VIEW_CLASS_24_BITS"/>
>+                <enum name="GL_VIEW_CLASS_16_BITS"/>
>+                <enum name="GL_VIEW_CLASS_8_BITS"/>
>+                <enum name="GL_VIEW_CLASS_S3TC_DXT1_RGB"/>
>+                <enum name="GL_VIEW_CLASS_S3TC_DXT1_RGBA"/>
>+                <enum name="GL_VIEW_CLASS_S3TC_DXT3_RGBA"/>
>+                <enum name="GL_VIEW_CLASS_S3TC_DXT5_RGBA"/>
>+                <enum name="GL_VIEW_CLASS_RGTC1_RED"/>
>+                <enum name="GL_VIEW_CLASS_RGTC2_RG"/>
>+                <enum name="GL_VIEW_CLASS_BPTC_UNORM"/>
>+                <enum name="GL_VIEW_CLASS_BPTC_FLOAT"/>
>+                <command name="glGetInternalformati64v"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_ARB_invalidate_subdata" supported="gl|glcore">
>+            <require>
>+                <command name="glInvalidateTexSubImage"/>
>+                <command name="glInvalidateTexImage"/>
>+                <command name="glInvalidateBufferSubData"/>
>+                <command name="glInvalidateBufferData"/>
>+                <command name="glInvalidateFramebuffer"/>
>+                <command name="glInvalidateSubFramebuffer"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_ARB_map_buffer_alignment" supported="gl|glcore">
>+            <require>
>+                <enum name="GL_MIN_MAP_BUFFER_ALIGNMENT"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_ARB_map_buffer_range" supported="gl|glcore">
>+            <require>
>+                <enum name="GL_MAP_READ_BIT"/>
>+                <enum name="GL_MAP_WRITE_BIT"/>
>+                <enum name="GL_MAP_INVALIDATE_RANGE_BIT"/>
>+                <enum name="GL_MAP_INVALIDATE_BUFFER_BIT"/>
>+                <enum name="GL_MAP_FLUSH_EXPLICIT_BIT"/>
>+                <enum name="GL_MAP_UNSYNCHRONIZED_BIT"/>
>+                <command name="glMapBufferRange"/>
>+                <command name="glFlushMappedBufferRange"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_ARB_matrix_palette" supported="gl">
>+            <require>
>+                <enum name="GL_MATRIX_PALETTE_ARB"/>
>+                <enum name="GL_MAX_MATRIX_PALETTE_STACK_DEPTH_ARB"/>
>+                <enum name="GL_MAX_PALETTE_MATRICES_ARB"/>
>+                <enum name="GL_CURRENT_PALETTE_MATRIX_ARB"/>
>+                <enum name="GL_MATRIX_INDEX_ARRAY_ARB"/>
>+                <enum name="GL_CURRENT_MATRIX_INDEX_ARB"/>
>+                <enum name="GL_MATRIX_INDEX_ARRAY_SIZE_ARB"/>
>+                <enum name="GL_MATRIX_INDEX_ARRAY_TYPE_ARB"/>
>+                <enum name="GL_MATRIX_INDEX_ARRAY_STRIDE_ARB"/>
>+                <enum name="GL_MATRIX_INDEX_ARRAY_POINTER_ARB"/>
>+                <command name="glCurrentPaletteMatrixARB"/>
>+                <command name="glMatrixIndexubvARB"/>
>+                <command name="glMatrixIndexusvARB"/>
>+                <command name="glMatrixIndexuivARB"/>
>+                <command name="glMatrixIndexPointerARB"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_ARB_multi_bind" supported="gl|glcore">
>+            <require>
>+                <command name="glBindBuffersBase"/>
>+                <command name="glBindBuffersRange"/>
>+                <command name="glBindTextures"/>
>+                <command name="glBindSamplers"/>
>+                <command name="glBindImageTextures"/>
>+                <command name="glBindVertexBuffers"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_ARB_multi_draw_indirect" supported="gl|glcore">
>+            <require>
>+                <command name="glMultiDrawArraysIndirect"/>
>+                <command name="glMultiDrawElementsIndirect"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_ARB_multisample" supported="gl">
>+            <require>
>+                <enum name="GL_MULTISAMPLE_ARB"/>
>+                <enum name="GL_SAMPLE_ALPHA_TO_COVERAGE_ARB"/>
>+                <enum name="GL_SAMPLE_ALPHA_TO_ONE_ARB"/>
>+                <enum name="GL_SAMPLE_COVERAGE_ARB"/>
>+                <enum name="GL_SAMPLE_BUFFERS_ARB"/>
>+                <enum name="GL_SAMPLES_ARB"/>
>+                <enum name="GL_SAMPLE_COVERAGE_VALUE_ARB"/>
>+                <enum name="GL_SAMPLE_COVERAGE_INVERT_ARB"/>
>+                <enum name="GL_MULTISAMPLE_BIT_ARB"/>
>+                <command name="glSampleCoverageARB"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_ARB_multitexture" supported="gl">
>+            <require>
>+                <enum name="GL_TEXTURE0_ARB"/>
>+                <enum name="GL_TEXTURE1_ARB"/>
>+                <enum name="GL_TEXTURE2_ARB"/>
>+                <enum name="GL_TEXTURE3_ARB"/>
>+                <enum name="GL_TEXTURE4_ARB"/>
>+                <enum name="GL_TEXTURE5_ARB"/>
>+                <enum name="GL_TEXTURE6_ARB"/>
>+                <enum name="GL_TEXTURE7_ARB"/>
>+                <enum name="GL_TEXTURE8_ARB"/>
>+                <enum name="GL_TEXTURE9_ARB"/>
>+                <enum name="GL_TEXTURE10_ARB"/>
>+                <enum name="GL_TEXTURE11_ARB"/>
>+                <enum name="GL_TEXTURE12_ARB"/>
>+                <enum name="GL_TEXTURE13_ARB"/>
>+                <enum name="GL_TEXTURE14_ARB"/>
>+                <enum name="GL_TEXTURE15_ARB"/>
>+                <enum name="GL_TEXTURE16_ARB"/>
>+                <enum name="GL_TEXTURE17_ARB"/>
>+                <enum name="GL_TEXTURE18_ARB"/>
>+                <enum name="GL_TEXTURE19_ARB"/>
>+                <enum name="GL_TEXTURE20_ARB"/>
>+                <enum name="GL_TEXTURE21_ARB"/>
>+                <enum name="GL_TEXTURE22_ARB"/>
>+                <enum name="GL_TEXTURE23_ARB"/>
>+                <enum name="GL_TEXTURE24_ARB"/>
>+                <enum name="GL_TEXTURE25_ARB"/>
>+                <enum name="GL_TEXTURE26_ARB"/>
>+                <enum name="GL_TEXTURE27_ARB"/>
>+                <enum name="GL_TEXTURE28_ARB"/>
>+                <enum name="GL_TEXTURE29_ARB"/>
>+                <enum name="GL_TEXTURE30_ARB"/>
>+                <enum name="GL_TEXTURE31_ARB"/>
>+                <enum name="GL_ACTIVE_TEXTURE_ARB"/>
>+                <enum name="GL_CLIENT_ACTIVE_TEXTURE_ARB"/>
>+                <enum name="GL_MAX_TEXTURE_UNITS_ARB"/>
>+                <command name="glActiveTextureARB"/>
>+                <command name="glClientActiveTextureARB"/>
>+                <command name="glMultiTexCoord1dARB"/>
>+                <command name="glMultiTexCoord1dvARB"/>
>+                <command name="glMultiTexCoord1fARB"/>
>+                <command name="glMultiTexCoord1fvARB"/>
>+                <command name="glMultiTexCoord1iARB"/>
>+                <command name="glMultiTexCoord1ivARB"/>
>+                <command name="glMultiTexCoord1sARB"/>
>+                <command name="glMultiTexCoord1svARB"/>
>+                <command name="glMultiTexCoord2dARB"/>
>+                <command name="glMultiTexCoord2dvARB"/>
>+                <command name="glMultiTexCoord2fARB"/>
>+                <command name="glMultiTexCoord2fvARB"/>
>+                <command name="glMultiTexCoord2iARB"/>
>+                <command name="glMultiTexCoord2ivARB"/>
>+                <command name="glMultiTexCoord2sARB"/>
>+                <command name="glMultiTexCoord2svARB"/>
>+                <command name="glMultiTexCoord3dARB"/>
>+                <command name="glMultiTexCoord3dvARB"/>
>+                <command name="glMultiTexCoord3fARB"/>
>+                <command name="glMultiTexCoord3fvARB"/>
>+                <command name="glMultiTexCoord3iARB"/>
>+                <command name="glMultiTexCoord3ivARB"/>
>+                <command name="glMultiTexCoord3sARB"/>
>+                <command name="glMultiTexCoord3svARB"/>
>+                <command name="glMultiTexCoord4dARB"/>
>+                <command name="glMultiTexCoord4dvARB"/>
>+                <command name="glMultiTexCoord4fARB"/>
>+                <command name="glMultiTexCoord4fvARB"/>
>+                <command name="glMultiTexCoord4iARB"/>
>+                <command name="glMultiTexCoord4ivARB"/>
>+                <command name="glMultiTexCoord4sARB"/>
>+                <command name="glMultiTexCoord4svARB"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_ARB_occlusion_query" supported="gl">
>+            <require>
>+                <enum name="GL_QUERY_COUNTER_BITS_ARB"/>
>+                <enum name="GL_CURRENT_QUERY_ARB"/>
>+                <enum name="GL_QUERY_RESULT_ARB"/>
>+                <enum name="GL_QUERY_RESULT_AVAILABLE_ARB"/>
>+                <enum name="GL_SAMPLES_PASSED_ARB"/>
>+                <command name="glGenQueriesARB"/>
>+                <command name="glDeleteQueriesARB"/>
>+                <command name="glIsQueryARB"/>
>+                <command name="glBeginQueryARB"/>
>+                <command name="glEndQueryARB"/>
>+                <command name="glGetQueryivARB"/>
>+                <command name="glGetQueryObjectivARB"/>
>+                <command name="glGetQueryObjectuivARB"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_ARB_occlusion_query2" supported="gl|glcore">
>+            <require>
>+                <enum name="GL_ANY_SAMPLES_PASSED"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_ARB_parallel_shader_compile" supported="gl|glcore">
>+            <require>
>+                <enum name="GL_MAX_SHADER_COMPILER_THREADS_ARB"/>
>+                <enum name="GL_COMPLETION_STATUS_ARB"/>
>+                <command name="glMaxShaderCompilerThreadsARB"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_ARB_pipeline_statistics_query" supported="gl|glcore">
>+            <require>
>+                <enum name="GL_VERTICES_SUBMITTED_ARB"/>
>+                <enum name="GL_PRIMITIVES_SUBMITTED_ARB"/>
>+                <enum name="GL_VERTEX_SHADER_INVOCATIONS_ARB"/>
>+                <enum name="GL_TESS_CONTROL_SHADER_PATCHES_ARB"/>
>+                <enum name="GL_TESS_EVALUATION_SHADER_INVOCATIONS_ARB"/>
>+                <enum name="GL_GEOMETRY_SHADER_INVOCATIONS"/>
>+                <enum name="GL_GEOMETRY_SHADER_PRIMITIVES_EMITTED_ARB"/>
>+                <enum name="GL_FRAGMENT_SHADER_INVOCATIONS_ARB"/>
>+                <enum name="GL_COMPUTE_SHADER_INVOCATIONS_ARB"/>
>+                <enum name="GL_CLIPPING_INPUT_PRIMITIVES_ARB"/>
>+                <enum name="GL_CLIPPING_OUTPUT_PRIMITIVES_ARB"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_ARB_pixel_buffer_object" supported="gl|glcore">
>+            <require>
>+                <enum name="GL_PIXEL_PACK_BUFFER_ARB"/>
>+                <enum name="GL_PIXEL_UNPACK_BUFFER_ARB"/>
>+                <enum name="GL_PIXEL_PACK_BUFFER_BINDING_ARB"/>
>+                <enum name="GL_PIXEL_UNPACK_BUFFER_BINDING_ARB"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_ARB_point_parameters" supported="gl">
>+            <require>
>+                <enum name="GL_POINT_SIZE_MIN_ARB"/>
>+                <enum name="GL_POINT_SIZE_MAX_ARB"/>
>+                <enum name="GL_POINT_FADE_THRESHOLD_SIZE_ARB"/>
>+                <enum name="GL_POINT_DISTANCE_ATTENUATION_ARB"/>
>+                <command name="glPointParameterfARB"/>
>+                <command name="glPointParameterfvARB"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_ARB_point_sprite" supported="gl">
>+            <require>
>+                <enum name="GL_POINT_SPRITE_ARB"/>
>+                <enum name="GL_COORD_REPLACE_ARB"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_ARB_polygon_offset_clamp" supported="gl|glcore">
>+            <require>
>+                <enum name="GL_POLYGON_OFFSET_CLAMP"/>
>+                <command name="glPolygonOffsetClamp"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_ARB_post_depth_coverage" supported="gl|glcore"/>
>+        <extension name="GL_ARB_program_interface_query" supported="gl|glcore">
>+            <require>
>+                <enum name="GL_UNIFORM"/>
>+                <enum name="GL_UNIFORM_BLOCK"/>
>+                <enum name="GL_PROGRAM_INPUT"/>
>+                <enum name="GL_PROGRAM_OUTPUT"/>
>+                <enum name="GL_BUFFER_VARIABLE"/>
>+                <enum name="GL_SHADER_STORAGE_BLOCK"/>
>+                <enum name="GL_ATOMIC_COUNTER_BUFFER"/>
>+                <enum name="GL_VERTEX_SUBROUTINE"/>
>+                <enum name="GL_TESS_CONTROL_SUBROUTINE"/>
>+                <enum name="GL_TESS_EVALUATION_SUBROUTINE"/>
>+                <enum name="GL_GEOMETRY_SUBROUTINE"/>
>+                <enum name="GL_FRAGMENT_SUBROUTINE"/>
>+                <enum name="GL_COMPUTE_SUBROUTINE"/>
>+                <enum name="GL_VERTEX_SUBROUTINE_UNIFORM"/>
>+                <enum name="GL_TESS_CONTROL_SUBROUTINE_UNIFORM"/>
>+                <enum name="GL_TESS_EVALUATION_SUBROUTINE_UNIFORM"/>
>+                <enum name="GL_GEOMETRY_SUBROUTINE_UNIFORM"/>
>+                <enum name="GL_FRAGMENT_SUBROUTINE_UNIFORM"/>
>+                <enum name="GL_COMPUTE_SUBROUTINE_UNIFORM"/>
>+                <enum name="GL_TRANSFORM_FEEDBACK_VARYING"/>
>+                <enum name="GL_ACTIVE_RESOURCES"/>
>+                <enum name="GL_MAX_NAME_LENGTH"/>
>+                <enum name="GL_MAX_NUM_ACTIVE_VARIABLES"/>
>+                <enum name="GL_MAX_NUM_COMPATIBLE_SUBROUTINES"/>
>+                <enum name="GL_NAME_LENGTH"/>
>+                <enum name="GL_TYPE"/>
>+                <enum name="GL_ARRAY_SIZE"/>
>+                <enum name="GL_OFFSET"/>
>+                <enum name="GL_BLOCK_INDEX"/>
>+                <enum name="GL_ARRAY_STRIDE"/>
>+                <enum name="GL_MATRIX_STRIDE"/>
>+                <enum name="GL_IS_ROW_MAJOR"/>
>+                <enum name="GL_ATOMIC_COUNTER_BUFFER_INDEX"/>
>+                <enum name="GL_BUFFER_BINDING"/>
>+                <enum name="GL_BUFFER_DATA_SIZE"/>
>+                <enum name="GL_NUM_ACTIVE_VARIABLES"/>
>+                <enum name="GL_ACTIVE_VARIABLES"/>
>+                <enum name="GL_REFERENCED_BY_VERTEX_SHADER"/>
>+                <enum name="GL_REFERENCED_BY_TESS_CONTROL_SHADER"/>
>+                <enum name="GL_REFERENCED_BY_TESS_EVALUATION_SHADER"/>
>+                <enum name="GL_REFERENCED_BY_GEOMETRY_SHADER"/>
>+                <enum name="GL_REFERENCED_BY_FRAGMENT_SHADER"/>
>+                <enum name="GL_REFERENCED_BY_COMPUTE_SHADER"/>
>+                <enum name="GL_TOP_LEVEL_ARRAY_SIZE"/>
>+                <enum name="GL_TOP_LEVEL_ARRAY_STRIDE"/>
>+                <enum name="GL_LOCATION"/>
>+                <enum name="GL_LOCATION_INDEX"/>
>+                <enum name="GL_IS_PER_PATCH"/>
>+                <enum name="GL_NUM_COMPATIBLE_SUBROUTINES"/>
>+                <enum name="GL_COMPATIBLE_SUBROUTINES"/>
>+                <command name="glGetProgramInterfaceiv"/>
>+                <command name="glGetProgramResourceIndex"/>
>+                <command name="glGetProgramResourceName"/>
>+                <command name="glGetProgramResourceiv"/>
>+                <command name="glGetProgramResourceLocation"/>
>+                <command name="glGetProgramResourceLocationIndex"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_ARB_provoking_vertex" supported="gl|glcore">
>+            <require>
>+                <enum name="GL_QUADS_FOLLOW_PROVOKING_VERTEX_CONVENTION"/>
>+                <enum name="GL_FIRST_VERTEX_CONVENTION"/>
>+                <enum name="GL_LAST_VERTEX_CONVENTION"/>
>+                <enum name="GL_PROVOKING_VERTEX"/>
>+                <command name="glProvokingVertex"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_ARB_query_buffer_object" supported="gl|glcore">
>+            <require>
>+                <enum name="GL_QUERY_BUFFER"/>
>+                <enum name="GL_QUERY_BUFFER_BARRIER_BIT"/>
>+                <enum name="GL_QUERY_BUFFER_BINDING"/>
>+                <enum name="GL_QUERY_RESULT_NO_WAIT"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_ARB_robust_buffer_access_behavior" supported="gl|glcore"/>
>+        <extension name="GL_ARB_robustness" supported="gl|glcore">
>+            <require>
>+                <enum name="GL_NO_ERROR"/>
>+                <enum name="GL_CONTEXT_FLAG_ROBUST_ACCESS_BIT_ARB"/>
>+                <enum name="GL_LOSE_CONTEXT_ON_RESET_ARB"/>
>+                <enum name="GL_GUILTY_CONTEXT_RESET_ARB"/>
>+                <enum name="GL_INNOCENT_CONTEXT_RESET_ARB"/>
>+                <enum name="GL_UNKNOWN_CONTEXT_RESET_ARB"/>
>+                <enum name="GL_RESET_NOTIFICATION_STRATEGY_ARB"/>
>+                <enum name="GL_NO_RESET_NOTIFICATION_ARB"/>
>+                <command name="glGetGraphicsResetStatusARB"/>
>+                <command name="glGetnTexImageARB"/>
>+                <command name="glReadnPixelsARB"/>
>+                <command name="glGetnCompressedTexImageARB"/>
>+                <command name="glGetnUniformfvARB"/>
>+                <command name="glGetnUniformivARB"/>
>+                <command name="glGetnUniformuivARB"/>
>+                <command name="glGetnUniformdvARB"/>
>+            </require>
>+            <require api="gl" profile="compatibility">
>+                <command name="glGetnMapdvARB"/>
>+                <command name="glGetnMapfvARB"/>
>+                <command name="glGetnMapivARB"/>
>+                <command name="glGetnPixelMapfvARB"/>
>+                <command name="glGetnPixelMapuivARB"/>
>+                <command name="glGetnPixelMapusvARB"/>
>+                <command name="glGetnPolygonStippleARB"/>
>+                <command name="glGetnColorTableARB"/>
>+                <command name="glGetnConvolutionFilterARB"/>
>+                <command name="glGetnSeparableFilterARB"/>
>+                <command name="glGetnHistogramARB"/>
>+                <command name="glGetnMinmaxARB"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_ARB_robustness_isolation" supported="gl|glcore"/>
>+        <extension name="GL_ARB_sample_locations" supported="gl|glcore">
>+            <require>
>+                <enum name="GL_SAMPLE_LOCATION_SUBPIXEL_BITS_ARB"/>
>+                <enum name="GL_SAMPLE_LOCATION_PIXEL_GRID_WIDTH_ARB"/>
>+                <enum name="GL_SAMPLE_LOCATION_PIXEL_GRID_HEIGHT_ARB"/>
>+                <enum name="GL_PROGRAMMABLE_SAMPLE_LOCATION_TABLE_SIZE_ARB"/>
>+                <enum name="GL_SAMPLE_LOCATION_ARB"/>
>+                <enum name="GL_PROGRAMMABLE_SAMPLE_LOCATION_ARB"/>
>+                <enum name="GL_FRAMEBUFFER_PROGRAMMABLE_SAMPLE_LOCATIONS_ARB"/>
>+                <enum name="GL_FRAMEBUFFER_SAMPLE_LOCATION_PIXEL_GRID_ARB"/>
>+                <command name="glFramebufferSampleLocationsfvARB"/>
>+                <command name="glNamedFramebufferSampleLocationsfvARB"/>
>+                <command name="glEvaluateDepthValuesARB"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_ARB_sample_shading" supported="gl|glcore">
>+            <require>
>+                <enum name="GL_SAMPLE_SHADING_ARB"/>
>+                <enum name="GL_MIN_SAMPLE_SHADING_VALUE_ARB"/>
>+                <command name="glMinSampleShadingARB"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_ARB_sampler_objects" supported="gl|glcore">
>+            <require>
>+                <enum name="GL_SAMPLER_BINDING"/>
>+                <command name="glGenSamplers"/>
>+                <command name="glDeleteSamplers"/>
>+                <command name="glIsSampler"/>
>+                <command name="glBindSampler"/>
>+                <command name="glSamplerParameteri"/>
>+                <command name="glSamplerParameteriv"/>
>+                <command name="glSamplerParameterf"/>
>+                <command name="glSamplerParameterfv"/>
>+                <command name="glSamplerParameterIiv"/>
>+                <command name="glSamplerParameterIuiv"/>
>+                <command name="glGetSamplerParameteriv"/>
>+                <command name="glGetSamplerParameterIiv"/>
>+                <command name="glGetSamplerParameterfv"/>
>+                <command name="glGetSamplerParameterIuiv"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_ARB_seamless_cube_map" supported="gl|glcore">
>+            <require>
>+                <enum name="GL_TEXTURE_CUBE_MAP_SEAMLESS"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_ARB_seamless_cubemap_per_texture" supported="gl|glcore">
>+            <require>
>+                <enum name="GL_TEXTURE_CUBE_MAP_SEAMLESS"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_ARB_separate_shader_objects" supported="gl|glcore">
>+            <require>
>+                <enum name="GL_VERTEX_SHADER_BIT"/>
>+                <enum name="GL_FRAGMENT_SHADER_BIT"/>
>+                <enum name="GL_GEOMETRY_SHADER_BIT"/>
>+                <enum name="GL_TESS_CONTROL_SHADER_BIT"/>
>+                <enum name="GL_TESS_EVALUATION_SHADER_BIT"/>
>+                <enum name="GL_ALL_SHADER_BITS"/>
>+                <enum name="GL_PROGRAM_SEPARABLE"/>
>+                <enum name="GL_ACTIVE_PROGRAM"/>
>+                <enum name="GL_PROGRAM_PIPELINE_BINDING"/>
>+                <command name="glUseProgramStages"/>
>+                <command name="glActiveShaderProgram"/>
>+                <command name="glCreateShaderProgramv"/>
>+                <command name="glBindProgramPipeline"/>
>+                <command name="glDeleteProgramPipelines"/>
>+                <command name="glGenProgramPipelines"/>
>+                <command name="glIsProgramPipeline"/>
>+                <command name="glGetProgramPipelineiv"/>
>+                <command name="glProgramParameteri"/>
>+                <command name="glProgramUniform1i"/>
>+                <command name="glProgramUniform1iv"/>
>+                <command name="glProgramUniform1f"/>
>+                <command name="glProgramUniform1fv"/>
>+                <command name="glProgramUniform1d"/>
>+                <command name="glProgramUniform1dv"/>
>+                <command name="glProgramUniform1ui"/>
>+                <command name="glProgramUniform1uiv"/>
>+                <command name="glProgramUniform2i"/>
>+                <command name="glProgramUniform2iv"/>
>+                <command name="glProgramUniform2f"/>
>+                <command name="glProgramUniform2fv"/>
>+                <command name="glProgramUniform2d"/>
>+                <command name="glProgramUniform2dv"/>
>+                <command name="glProgramUniform2ui"/>
>+                <command name="glProgramUniform2uiv"/>
>+                <command name="glProgramUniform3i"/>
>+                <command name="glProgramUniform3iv"/>
>+                <command name="glProgramUniform3f"/>
>+                <command name="glProgramUniform3fv"/>
>+                <command name="glProgramUniform3d"/>
>+                <command name="glProgramUniform3dv"/>
>+                <command name="glProgramUniform3ui"/>
>+                <command name="glProgramUniform3uiv"/>
>+                <command name="glProgramUniform4i"/>
>+                <command name="glProgramUniform4iv"/>
>+                <command name="glProgramUniform4f"/>
>+                <command name="glProgramUniform4fv"/>
>+                <command name="glProgramUniform4d"/>
>+                <command name="glProgramUniform4dv"/>
>+                <command name="glProgramUniform4ui"/>
>+                <command name="glProgramUniform4uiv"/>
>+                <command name="glProgramUniformMatrix2fv"/>
>+                <command name="glProgramUniformMatrix3fv"/>
>+                <command name="glProgramUniformMatrix4fv"/>
>+                <command name="glProgramUniformMatrix2dv"/>
>+                <command name="glProgramUniformMatrix3dv"/>
>+                <command name="glProgramUniformMatrix4dv"/>
>+                <command name="glProgramUniformMatrix2x3fv"/>
>+                <command name="glProgramUniformMatrix3x2fv"/>
>+                <command name="glProgramUniformMatrix2x4fv"/>
>+                <command name="glProgramUniformMatrix4x2fv"/>
>+                <command name="glProgramUniformMatrix3x4fv"/>
>+                <command name="glProgramUniformMatrix4x3fv"/>
>+                <command name="glProgramUniformMatrix2x3dv"/>
>+                <command name="glProgramUniformMatrix3x2dv"/>
>+                <command name="glProgramUniformMatrix2x4dv"/>
>+                <command name="glProgramUniformMatrix4x2dv"/>
>+                <command name="glProgramUniformMatrix3x4dv"/>
>+                <command name="glProgramUniformMatrix4x3dv"/>
>+                <command name="glValidateProgramPipeline"/>
>+                <command name="glGetProgramPipelineInfoLog"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_ARB_shader_atomic_counter_ops" supported="gl|glcore"/>
>+        <extension name="GL_ARB_shader_atomic_counters" supported="gl|glcore">
>+            <require>
>+                <enum name="GL_ATOMIC_COUNTER_BUFFER"/>
>+                <enum name="GL_ATOMIC_COUNTER_BUFFER_BINDING"/>
>+                <enum name="GL_ATOMIC_COUNTER_BUFFER_START"/>
>+                <enum name="GL_ATOMIC_COUNTER_BUFFER_SIZE"/>
>+                <enum name="GL_ATOMIC_COUNTER_BUFFER_DATA_SIZE"/>
>+                <enum name="GL_ATOMIC_COUNTER_BUFFER_ACTIVE_ATOMIC_COUNTERS"/>
>+                <enum name="GL_ATOMIC_COUNTER_BUFFER_ACTIVE_ATOMIC_COUNTER_INDICES"/>
>+                <enum name="GL_ATOMIC_COUNTER_BUFFER_REFERENCED_BY_VERTEX_SHADER"/>
>+                <enum name="GL_ATOMIC_COUNTER_BUFFER_REFERENCED_BY_TESS_CONTROL_SHADER"/>
>+                <enum name="GL_ATOMIC_COUNTER_BUFFER_REFERENCED_BY_TESS_EVALUATION_SHADER"/>
>+                <enum name="GL_ATOMIC_COUNTER_BUFFER_REFERENCED_BY_GEOMETRY_SHADER"/>
>+                <enum name="GL_ATOMIC_COUNTER_BUFFER_REFERENCED_BY_FRAGMENT_SHADER"/>
>+                <enum name="GL_MAX_VERTEX_ATOMIC_COUNTER_BUFFERS"/>
>+                <enum name="GL_MAX_TESS_CONTROL_ATOMIC_COUNTER_BUFFERS"/>
>+                <enum name="GL_MAX_TESS_EVALUATION_ATOMIC_COUNTER_BUFFERS"/>
>+                <enum name="GL_MAX_GEOMETRY_ATOMIC_COUNTER_BUFFERS"/>
>+                <enum name="GL_MAX_FRAGMENT_ATOMIC_COUNTER_BUFFERS"/>
>+                <enum name="GL_MAX_COMBINED_ATOMIC_COUNTER_BUFFERS"/>
>+                <enum name="GL_MAX_VERTEX_ATOMIC_COUNTERS"/>
>+                <enum name="GL_MAX_TESS_CONTROL_ATOMIC_COUNTERS"/>
>+                <enum name="GL_MAX_TESS_EVALUATION_ATOMIC_COUNTERS"/>
>+                <enum name="GL_MAX_GEOMETRY_ATOMIC_COUNTERS"/>
>+                <enum name="GL_MAX_FRAGMENT_ATOMIC_COUNTERS"/>
>+                <enum name="GL_MAX_COMBINED_ATOMIC_COUNTERS"/>
>+                <enum name="GL_MAX_ATOMIC_COUNTER_BUFFER_SIZE"/>
>+                <enum name="GL_MAX_ATOMIC_COUNTER_BUFFER_BINDINGS"/>
>+                <enum name="GL_ACTIVE_ATOMIC_COUNTER_BUFFERS"/>
>+                <enum name="GL_UNIFORM_ATOMIC_COUNTER_BUFFER_INDEX"/>
>+                <enum name="GL_UNSIGNED_INT_ATOMIC_COUNTER"/>
>+                <command name="glGetActiveAtomicCounterBufferiv"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_ARB_shader_ballot" supported="gl|glcore"/>
>+        <extension name="GL_ARB_shader_bit_encoding" supported="gl|glcore"/>
>+        <extension name="GL_ARB_shader_clock" supported="gl|glcore"/>
>+        <extension name="GL_ARB_shader_draw_parameters" supported="gl|glcore"/>
>+        <extension name="GL_ARB_shader_group_vote" supported="gl|glcore"/>
>+        <extension name="GL_ARB_shader_image_load_store" supported="gl|glcore">
>+            <require>
>+                <enum name="GL_VERTEX_ATTRIB_ARRAY_BARRIER_BIT"/>
>+                <enum name="GL_ELEMENT_ARRAY_BARRIER_BIT"/>
>+                <enum name="GL_UNIFORM_BARRIER_BIT"/>
>+                <enum name="GL_TEXTURE_FETCH_BARRIER_BIT"/>
>+                <enum name="GL_SHADER_IMAGE_ACCESS_BARRIER_BIT"/>
>+                <enum name="GL_COMMAND_BARRIER_BIT"/>
>+                <enum name="GL_PIXEL_BUFFER_BARRIER_BIT"/>
>+                <enum name="GL_TEXTURE_UPDATE_BARRIER_BIT"/>
>+                <enum name="GL_BUFFER_UPDATE_BARRIER_BIT"/>
>+                <enum name="GL_FRAMEBUFFER_BARRIER_BIT"/>
>+                <enum name="GL_TRANSFORM_FEEDBACK_BARRIER_BIT"/>
>+                <enum name="GL_ATOMIC_COUNTER_BARRIER_BIT"/>
>+                <enum name="GL_ALL_BARRIER_BITS"/>
>+                <enum name="GL_MAX_IMAGE_UNITS"/>
>+                <enum name="GL_MAX_COMBINED_IMAGE_UNITS_AND_FRAGMENT_OUTPUTS"/>
>+                <enum name="GL_IMAGE_BINDING_NAME"/>
>+                <enum name="GL_IMAGE_BINDING_LEVEL"/>
>+                <enum name="GL_IMAGE_BINDING_LAYERED"/>
>+                <enum name="GL_IMAGE_BINDING_LAYER"/>
>+                <enum name="GL_IMAGE_BINDING_ACCESS"/>
>+                <enum name="GL_IMAGE_1D"/>
>+                <enum name="GL_IMAGE_2D"/>
>+                <enum name="GL_IMAGE_3D"/>
>+                <enum name="GL_IMAGE_2D_RECT"/>
>+                <enum name="GL_IMAGE_CUBE"/>
>+                <enum name="GL_IMAGE_BUFFER"/>
>+                <enum name="GL_IMAGE_1D_ARRAY"/>
>+                <enum name="GL_IMAGE_2D_ARRAY"/>
>+                <enum name="GL_IMAGE_CUBE_MAP_ARRAY"/>
>+                <enum name="GL_IMAGE_2D_MULTISAMPLE"/>
>+                <enum name="GL_IMAGE_2D_MULTISAMPLE_ARRAY"/>
>+                <enum name="GL_INT_IMAGE_1D"/>
>+                <enum name="GL_INT_IMAGE_2D"/>
>+                <enum name="GL_INT_IMAGE_3D"/>
>+                <enum name="GL_INT_IMAGE_2D_RECT"/>
>+                <enum name="GL_INT_IMAGE_CUBE"/>
>+                <enum name="GL_INT_IMAGE_BUFFER"/>
>+                <enum name="GL_INT_IMAGE_1D_ARRAY"/>
>+                <enum name="GL_INT_IMAGE_2D_ARRAY"/>
>+                <enum name="GL_INT_IMAGE_CUBE_MAP_ARRAY"/>
>+                <enum name="GL_INT_IMAGE_2D_MULTISAMPLE"/>
>+                <enum name="GL_INT_IMAGE_2D_MULTISAMPLE_ARRAY"/>
>+                <enum name="GL_UNSIGNED_INT_IMAGE_1D"/>
>+                <enum name="GL_UNSIGNED_INT_IMAGE_2D"/>
>+                <enum name="GL_UNSIGNED_INT_IMAGE_3D"/>
>+                <enum name="GL_UNSIGNED_INT_IMAGE_2D_RECT"/>
>+                <enum name="GL_UNSIGNED_INT_IMAGE_CUBE"/>
>+                <enum name="GL_UNSIGNED_INT_IMAGE_BUFFER"/>
>+                <enum name="GL_UNSIGNED_INT_IMAGE_1D_ARRAY"/>
>+                <enum name="GL_UNSIGNED_INT_IMAGE_2D_ARRAY"/>
>+                <enum name="GL_UNSIGNED_INT_IMAGE_CUBE_MAP_ARRAY"/>
>+                <enum name="GL_UNSIGNED_INT_IMAGE_2D_MULTISAMPLE"/>
>+                <enum name="GL_UNSIGNED_INT_IMAGE_2D_MULTISAMPLE_ARRAY"/>
>+                <enum name="GL_MAX_IMAGE_SAMPLES"/>
>+                <enum name="GL_IMAGE_BINDING_FORMAT"/>
>+                <enum name="GL_IMAGE_FORMAT_COMPATIBILITY_TYPE"/>
>+                <enum name="GL_IMAGE_FORMAT_COMPATIBILITY_BY_SIZE"/>
>+                <enum name="GL_IMAGE_FORMAT_COMPATIBILITY_BY_CLASS"/>
>+                <enum name="GL_MAX_VERTEX_IMAGE_UNIFORMS"/>
>+                <enum name="GL_MAX_TESS_CONTROL_IMAGE_UNIFORMS"/>
>+                <enum name="GL_MAX_TESS_EVALUATION_IMAGE_UNIFORMS"/>
>+                <enum name="GL_MAX_GEOMETRY_IMAGE_UNIFORMS"/>
>+                <enum name="GL_MAX_FRAGMENT_IMAGE_UNIFORMS"/>
>+                <enum name="GL_MAX_COMBINED_IMAGE_UNIFORMS"/>
>+                <command name="glBindImageTexture"/>
>+                <command name="glMemoryBarrier"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_ARB_shader_image_size" supported="gl|glcore"/>
>+        <extension name="GL_ARB_shader_objects" supported="gl">
>+            <require>
>+                <enum name="GL_PROGRAM_OBJECT_ARB"/>
>+                <enum name="GL_SHADER_OBJECT_ARB"/>
>+                <enum name="GL_OBJECT_TYPE_ARB"/>
>+                <enum name="GL_OBJECT_SUBTYPE_ARB"/>
>+                <enum name="GL_FLOAT_VEC2_ARB"/>
>+                <enum name="GL_FLOAT_VEC3_ARB"/>
>+                <enum name="GL_FLOAT_VEC4_ARB"/>
>+                <enum name="GL_INT_VEC2_ARB"/>
>+                <enum name="GL_INT_VEC3_ARB"/>
>+                <enum name="GL_INT_VEC4_ARB"/>
>+                <enum name="GL_BOOL_ARB"/>
>+                <enum name="GL_BOOL_VEC2_ARB"/>
>+                <enum name="GL_BOOL_VEC3_ARB"/>
>+                <enum name="GL_BOOL_VEC4_ARB"/>
>+                <enum name="GL_FLOAT_MAT2_ARB"/>
>+                <enum name="GL_FLOAT_MAT3_ARB"/>
>+                <enum name="GL_FLOAT_MAT4_ARB"/>
>+                <enum name="GL_SAMPLER_1D_ARB"/>
>+                <enum name="GL_SAMPLER_2D_ARB"/>
>+                <enum name="GL_SAMPLER_3D_ARB"/>
>+                <enum name="GL_SAMPLER_CUBE_ARB"/>
>+                <enum name="GL_SAMPLER_1D_SHADOW_ARB"/>
>+                <enum name="GL_SAMPLER_2D_SHADOW_ARB"/>
>+                <enum name="GL_SAMPLER_2D_RECT_ARB"/>
>+                <enum name="GL_SAMPLER_2D_RECT_SHADOW_ARB"/>
>+                <enum name="GL_OBJECT_DELETE_STATUS_ARB"/>
>+                <enum name="GL_OBJECT_COMPILE_STATUS_ARB"/>
>+                <enum name="GL_OBJECT_LINK_STATUS_ARB"/>
>+                <enum name="GL_OBJECT_VALIDATE_STATUS_ARB"/>
>+                <enum name="GL_OBJECT_INFO_LOG_LENGTH_ARB"/>
>+                <enum name="GL_OBJECT_ATTACHED_OBJECTS_ARB"/>
>+                <enum name="GL_OBJECT_ACTIVE_UNIFORMS_ARB"/>
>+                <enum name="GL_OBJECT_ACTIVE_UNIFORM_MAX_LENGTH_ARB"/>
>+                <enum name="GL_OBJECT_SHADER_SOURCE_LENGTH_ARB"/>
>+                <command name="glDeleteObjectARB"/>
>+                <command name="glGetHandleARB"/>
>+                <command name="glDetachObjectARB"/>
>+                <command name="glCreateShaderObjectARB"/>
>+                <command name="glShaderSourceARB"/>
>+                <command name="glCompileShaderARB"/>
>+                <command name="glCreateProgramObjectARB"/>
>+                <command name="glAttachObjectARB"/>
>+                <command name="glLinkProgramARB"/>
>+                <command name="glUseProgramObjectARB"/>
>+                <command name="glValidateProgramARB"/>
>+                <command name="glUniform1fARB"/>
>+                <command name="glUniform2fARB"/>
>+                <command name="glUniform3fARB"/>
>+                <command name="glUniform4fARB"/>
>+                <command name="glUniform1iARB"/>
>+                <command name="glUniform2iARB"/>
>+                <command name="glUniform3iARB"/>
>+                <command name="glUniform4iARB"/>
>+                <command name="glUniform1fvARB"/>
>+                <command name="glUniform2fvARB"/>
>+                <command name="glUniform3fvARB"/>
>+                <command name="glUniform4fvARB"/>
>+                <command name="glUniform1ivARB"/>
>+                <command name="glUniform2ivARB"/>
>+                <command name="glUniform3ivARB"/>
>+                <command name="glUniform4ivARB"/>
>+                <command name="glUniformMatrix2fvARB"/>
>+                <command name="glUniformMatrix3fvARB"/>
>+                <command name="glUniformMatrix4fvARB"/>
>+                <command name="glGetObjectParameterfvARB"/>
>+                <command name="glGetObjectParameterivARB"/>
>+                <command name="glGetInfoLogARB"/>
>+                <command name="glGetAttachedObjectsARB"/>
>+                <command name="glGetUniformLocationARB"/>
>+                <command name="glGetActiveUniformARB"/>
>+                <command name="glGetUniformfvARB"/>
>+                <command name="glGetUniformivARB"/>
>+                <command name="glGetShaderSourceARB"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_ARB_shader_precision" supported="gl|glcore"/>
>+        <extension name="GL_ARB_shader_stencil_export" supported="gl|glcore"/>
>+        <extension name="GL_ARB_shader_storage_buffer_object" supported="gl|glcore">
>+            <require>
>+                <enum name="GL_SHADER_STORAGE_BUFFER"/>
>+                <enum name="GL_SHADER_STORAGE_BUFFER_BINDING"/>
>+                <enum name="GL_SHADER_STORAGE_BUFFER_START"/>
>+                <enum name="GL_SHADER_STORAGE_BUFFER_SIZE"/>
>+                <enum name="GL_MAX_VERTEX_SHADER_STORAGE_BLOCKS"/>
>+                <enum name="GL_MAX_GEOMETRY_SHADER_STORAGE_BLOCKS"/>
>+                <enum name="GL_MAX_TESS_CONTROL_SHADER_STORAGE_BLOCKS"/>
>+                <enum name="GL_MAX_TESS_EVALUATION_SHADER_STORAGE_BLOCKS"/>
>+                <enum name="GL_MAX_FRAGMENT_SHADER_STORAGE_BLOCKS"/>
>+                <enum name="GL_MAX_COMPUTE_SHADER_STORAGE_BLOCKS"/>
>+                <enum name="GL_MAX_COMBINED_SHADER_STORAGE_BLOCKS"/>
>+                <enum name="GL_MAX_SHADER_STORAGE_BUFFER_BINDINGS"/>
>+                <enum name="GL_MAX_SHADER_STORAGE_BLOCK_SIZE"/>
>+                <enum name="GL_SHADER_STORAGE_BUFFER_OFFSET_ALIGNMENT"/>
>+                <enum name="GL_SHADER_STORAGE_BARRIER_BIT"/>
>+                <enum name="GL_MAX_COMBINED_SHADER_OUTPUT_RESOURCES"/>
>+                <enum name="GL_MAX_COMBINED_IMAGE_UNITS_AND_FRAGMENT_OUTPUTS"/>
>+                <command name="glShaderStorageBlockBinding"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_ARB_shader_subroutine" supported="gl|glcore">
>+            <require>
>+                <enum name="GL_ACTIVE_SUBROUTINES"/>
>+                <enum name="GL_ACTIVE_SUBROUTINE_UNIFORMS"/>
>+                <enum name="GL_ACTIVE_SUBROUTINE_UNIFORM_LOCATIONS"/>
>+                <enum name="GL_ACTIVE_SUBROUTINE_MAX_LENGTH"/>
>+                <enum name="GL_ACTIVE_SUBROUTINE_UNIFORM_MAX_LENGTH"/>
>+                <enum name="GL_MAX_SUBROUTINES"/>
>+                <enum name="GL_MAX_SUBROUTINE_UNIFORM_LOCATIONS"/>
>+                <enum name="GL_NUM_COMPATIBLE_SUBROUTINES"/>
>+                <enum name="GL_COMPATIBLE_SUBROUTINES"/>
>+                <enum name="GL_UNIFORM_SIZE"/>
>+                <enum name="GL_UNIFORM_NAME_LENGTH"/>
>+                <command name="glGetSubroutineUniformLocation"/>
>+                <command name="glGetSubroutineIndex"/>
>+                <command name="glGetActiveSubroutineUniformiv"/>
>+                <command name="glGetActiveSubroutineUniformName"/>
>+                <command name="glGetActiveSubroutineName"/>
>+                <command name="glUniformSubroutinesuiv"/>
>+                <command name="glGetUniformSubroutineuiv"/>
>+                <command name="glGetProgramStageiv"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_ARB_shader_texture_image_samples" supported="gl|glcore"/>
>+        <extension name="GL_ARB_shader_texture_lod" supported="gl"/>
>+        <extension name="GL_ARB_shader_viewport_layer_array" supported="gl|glcore"/>
>+        <extension name="GL_ARB_shading_language_100" supported="gl">
>+            <require>
>+                <enum name="GL_SHADING_LANGUAGE_VERSION_ARB"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_ARB_shading_language_420pack" supported="gl|glcore"/>
>+        <extension name="GL_ARB_shading_language_include" supported="gl|glcore">
>+            <require>
>+                <enum name="GL_SHADER_INCLUDE_ARB"/>
>+                <enum name="GL_NAMED_STRING_LENGTH_ARB"/>
>+                <enum name="GL_NAMED_STRING_TYPE_ARB"/>
>+                <command name="glNamedStringARB"/>
>+                <command name="glDeleteNamedStringARB"/>
>+                <command name="glCompileShaderIncludeARB"/>
>+                <command name="glIsNamedStringARB"/>
>+                <command name="glGetNamedStringARB"/>
>+                <command name="glGetNamedStringivARB"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_ARB_shading_language_packing" supported="gl|glcore"/>
>+        <extension name="GL_ARB_shadow" supported="gl">
>+            <require>
>+                <enum name="GL_TEXTURE_COMPARE_MODE_ARB"/>
>+                <enum name="GL_TEXTURE_COMPARE_FUNC_ARB"/>
>+                <enum name="GL_COMPARE_R_TO_TEXTURE_ARB"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_ARB_shadow_ambient" supported="gl">
>+            <require>
>+                <enum name="GL_TEXTURE_COMPARE_FAIL_VALUE_ARB"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_ARB_sparse_buffer" supported="gl|glcore">
>+            <require>
>+                <enum name="GL_SPARSE_STORAGE_BIT_ARB"/>
>+                <enum name="GL_SPARSE_BUFFER_PAGE_SIZE_ARB"/>
>+                <command name="glBufferPageCommitmentARB"/>
>+            </require>
>+            <require comment="Supported only if GL_EXT_direct_state_access is supported">
>+                <command name="glNamedBufferPageCommitmentEXT"/>
>+            </require>
>+            <require comment="Supported only if GL_ARb_direct_state_access or GL 4.5 is supported">
>+                <command name="glNamedBufferPageCommitmentARB"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_ARB_sparse_texture" supported="gl|glcore">
>+            <require>
>+                <enum name="GL_TEXTURE_SPARSE_ARB"/>
>+                <enum name="GL_VIRTUAL_PAGE_SIZE_INDEX_ARB"/>
>+                <enum name="GL_NUM_SPARSE_LEVELS_ARB"/>
>+                <enum name="GL_NUM_VIRTUAL_PAGE_SIZES_ARB"/>
>+                <enum name="GL_VIRTUAL_PAGE_SIZE_X_ARB"/>
>+                <enum name="GL_VIRTUAL_PAGE_SIZE_Y_ARB"/>
>+                <enum name="GL_VIRTUAL_PAGE_SIZE_Z_ARB"/>
>+                <enum name="GL_MAX_SPARSE_TEXTURE_SIZE_ARB"/>
>+                <enum name="GL_MAX_SPARSE_3D_TEXTURE_SIZE_ARB"/>
>+                <enum name="GL_MAX_SPARSE_ARRAY_TEXTURE_LAYERS_ARB"/>
>+                <enum name="GL_SPARSE_TEXTURE_FULL_ARRAY_CUBE_MIPMAPS_ARB"/>
>+                <command name="glTexPageCommitmentARB"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_ARB_sparse_texture2" supported="gl|glcore"/>
>+        <extension name="GL_ARB_sparse_texture_clamp" supported="gl|glcore"/>
>+        <extension name="GL_ARB_spirv_extensions" supported="gl|glcore">
>+            <require>
>+                <enum name="GL_SPIR_V_EXTENSIONS"/>
>+                <enum name="GL_NUM_SPIR_V_EXTENSIONS"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_ARB_stencil_texturing" supported="gl|glcore">
>+            <require>
>+                <enum name="GL_DEPTH_STENCIL_TEXTURE_MODE"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_ARB_sync" supported="gl|glcore">
>+            <require>
>+                <enum name="GL_MAX_SERVER_WAIT_TIMEOUT"/>
>+                <enum name="GL_OBJECT_TYPE"/>
>+                <enum name="GL_SYNC_CONDITION"/>
>+                <enum name="GL_SYNC_STATUS"/>
>+                <enum name="GL_SYNC_FLAGS"/>
>+                <enum name="GL_SYNC_FENCE"/>
>+                <enum name="GL_SYNC_GPU_COMMANDS_COMPLETE"/>
>+                <enum name="GL_UNSIGNALED"/>
>+                <enum name="GL_SIGNALED"/>
>+                <enum name="GL_ALREADY_SIGNALED"/>
>+                <enum name="GL_TIMEOUT_EXPIRED"/>
>+                <enum name="GL_CONDITION_SATISFIED"/>
>+                <enum name="GL_WAIT_FAILED"/>
>+                <enum name="GL_SYNC_FLUSH_COMMANDS_BIT"/>
>+                <enum name="GL_TIMEOUT_IGNORED"/>
>+                <command name="glFenceSync"/>
>+                <command name="glIsSync"/>
>+                <command name="glDeleteSync"/>
>+                <command name="glClientWaitSync"/>
>+                <command name="glWaitSync"/>
>+                <command name="glGetInteger64v"/>
>+                <command name="glGetSynciv"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_ARB_tessellation_shader" supported="gl|glcore">
>+            <require>
>+                <enum name="GL_PATCHES"/>
>+                <enum name="GL_PATCH_VERTICES"/>
>+                <enum name="GL_PATCH_DEFAULT_INNER_LEVEL"/>
>+                <enum name="GL_PATCH_DEFAULT_OUTER_LEVEL"/>
>+                <enum name="GL_TESS_CONTROL_OUTPUT_VERTICES"/>
>+                <enum name="GL_TESS_GEN_MODE"/>
>+                <enum name="GL_TESS_GEN_SPACING"/>
>+                <enum name="GL_TESS_GEN_VERTEX_ORDER"/>
>+                <enum name="GL_TESS_GEN_POINT_MODE"/>
>+                <enum name="GL_TRIANGLES"/>
>+                <enum name="GL_ISOLINES"/>
>+                <enum name="GL_QUADS"/>
>+                <enum name="GL_EQUAL"/>
>+                <enum name="GL_FRACTIONAL_ODD"/>
>+                <enum name="GL_FRACTIONAL_EVEN"/>
>+                <enum name="GL_CCW"/>
>+                <enum name="GL_CW"/>
>+                <enum name="GL_MAX_PATCH_VERTICES"/>
>+                <enum name="GL_MAX_TESS_GEN_LEVEL"/>
>+                <enum name="GL_MAX_TESS_CONTROL_UNIFORM_COMPONENTS"/>
>+                <enum name="GL_MAX_TESS_EVALUATION_UNIFORM_COMPONENTS"/>
>+                <enum name="GL_MAX_TESS_CONTROL_TEXTURE_IMAGE_UNITS"/>
>+                <enum name="GL_MAX_TESS_EVALUATION_TEXTURE_IMAGE_UNITS"/>
>+                <enum name="GL_MAX_TESS_CONTROL_OUTPUT_COMPONENTS"/>
>+                <enum name="GL_MAX_TESS_PATCH_COMPONENTS"/>
>+                <enum name="GL_MAX_TESS_CONTROL_TOTAL_OUTPUT_COMPONENTS"/>
>+                <enum name="GL_MAX_TESS_EVALUATION_OUTPUT_COMPONENTS"/>
>+                <enum name="GL_MAX_TESS_CONTROL_UNIFORM_BLOCKS"/>
>+                <enum name="GL_MAX_TESS_EVALUATION_UNIFORM_BLOCKS"/>
>+                <enum name="GL_MAX_TESS_CONTROL_INPUT_COMPONENTS"/>
>+                <enum name="GL_MAX_TESS_EVALUATION_INPUT_COMPONENTS"/>
>+                <enum name="GL_MAX_COMBINED_TESS_CONTROL_UNIFORM_COMPONENTS"/>
>+                <enum name="GL_MAX_COMBINED_TESS_EVALUATION_UNIFORM_COMPONENTS"/>
>+                <enum name="GL_UNIFORM_BLOCK_REFERENCED_BY_TESS_CONTROL_SHADER"/>
>+                <enum name="GL_UNIFORM_BLOCK_REFERENCED_BY_TESS_EVALUATION_SHADER"/>
>+                <enum name="GL_TESS_EVALUATION_SHADER"/>
>+                <enum name="GL_TESS_CONTROL_SHADER"/>
>+                <command name="glPatchParameteri"/>
>+                <command name="glPatchParameterfv"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_ARB_texture_barrier" supported="gl|glcore">
>+            <require>
>+                <command name="glTextureBarrier"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_ARB_texture_border_clamp" supported="gl|glcore">
>+            <require>
>+                <enum name="GL_CLAMP_TO_BORDER_ARB"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_ARB_texture_buffer_object" supported="gl|glcore">
>+            <require>
>+                <enum name="GL_TEXTURE_BUFFER_ARB"/>
>+                <enum name="GL_MAX_TEXTURE_BUFFER_SIZE_ARB"/>
>+                <enum name="GL_TEXTURE_BINDING_BUFFER_ARB"/>
>+                <enum name="GL_TEXTURE_BUFFER_DATA_STORE_BINDING_ARB"/>
>+                <enum name="GL_TEXTURE_BUFFER_FORMAT_ARB"/>
>+                <command name="glTexBufferARB"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_ARB_texture_buffer_object_rgb32" supported="gl|glcore">
>+            <require>
>+                <enum name="GL_RGB32F"/>
>+                <enum name="GL_RGB32UI"/>
>+                <enum name="GL_RGB32I"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_ARB_texture_buffer_range" supported="gl|glcore">
>+            <require>
>+                <enum name="GL_TEXTURE_BUFFER_OFFSET"/>
>+                <enum name="GL_TEXTURE_BUFFER_SIZE"/>
>+                <enum name="GL_TEXTURE_BUFFER_OFFSET_ALIGNMENT"/>
>+                <command name="glTexBufferRange"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_ARB_texture_compression" supported="gl">
>+            <require>
>+                <enum name="GL_COMPRESSED_ALPHA_ARB"/>
>+                <enum name="GL_COMPRESSED_LUMINANCE_ARB"/>
>+                <enum name="GL_COMPRESSED_LUMINANCE_ALPHA_ARB"/>
>+                <enum name="GL_COMPRESSED_INTENSITY_ARB"/>
>+                <enum name="GL_COMPRESSED_RGB_ARB"/>
>+                <enum name="GL_COMPRESSED_RGBA_ARB"/>
>+                <enum name="GL_TEXTURE_COMPRESSION_HINT_ARB"/>
>+                <enum name="GL_TEXTURE_COMPRESSED_IMAGE_SIZE_ARB"/>
>+                <enum name="GL_TEXTURE_COMPRESSED_ARB"/>
>+                <enum name="GL_NUM_COMPRESSED_TEXTURE_FORMATS_ARB"/>
>+                <enum name="GL_COMPRESSED_TEXTURE_FORMATS_ARB"/>
>+                <command name="glCompressedTexImage3DARB"/>
>+                <command name="glCompressedTexImage2DARB"/>
>+                <command name="glCompressedTexImage1DARB"/>
>+                <command name="glCompressedTexSubImage3DARB"/>
>+                <command name="glCompressedTexSubImage2DARB"/>
>+                <command name="glCompressedTexSubImage1DARB"/>
>+                <command name="glGetCompressedTexImageARB"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_ARB_texture_compression_bptc" supported="gl|glcore">
>+            <require>
>+                <enum name="GL_COMPRESSED_RGBA_BPTC_UNORM_ARB"/>
>+                <enum name="GL_COMPRESSED_SRGB_ALPHA_BPTC_UNORM_ARB"/>
>+                <enum name="GL_COMPRESSED_RGB_BPTC_SIGNED_FLOAT_ARB"/>
>+                <enum name="GL_COMPRESSED_RGB_BPTC_UNSIGNED_FLOAT_ARB"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_ARB_texture_compression_rgtc" supported="gl|glcore">
>+            <require>
>+                <enum name="GL_COMPRESSED_RED_RGTC1"/>
>+                <enum name="GL_COMPRESSED_SIGNED_RED_RGTC1"/>
>+                <enum name="GL_COMPRESSED_RG_RGTC2"/>
>+                <enum name="GL_COMPRESSED_SIGNED_RG_RGTC2"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_ARB_texture_cube_map" supported="gl">
>+            <require>
>+                <enum name="GL_NORMAL_MAP_ARB"/>
>+                <enum name="GL_REFLECTION_MAP_ARB"/>
>+                <enum name="GL_TEXTURE_CUBE_MAP_ARB"/>
>+                <enum name="GL_TEXTURE_BINDING_CUBE_MAP_ARB"/>
>+                <enum name="GL_TEXTURE_CUBE_MAP_POSITIVE_X_ARB"/>
>+                <enum name="GL_TEXTURE_CUBE_MAP_NEGATIVE_X_ARB"/>
>+                <enum name="GL_TEXTURE_CUBE_MAP_POSITIVE_Y_ARB"/>
>+                <enum name="GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_ARB"/>
>+                <enum name="GL_TEXTURE_CUBE_MAP_POSITIVE_Z_ARB"/>
>+                <enum name="GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_ARB"/>
>+                <enum name="GL_PROXY_TEXTURE_CUBE_MAP_ARB"/>
>+                <enum name="GL_MAX_CUBE_MAP_TEXTURE_SIZE_ARB"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_ARB_texture_cube_map_array" supported="gl|glcore">
>+            <require>
>+                <enum name="GL_TEXTURE_CUBE_MAP_ARRAY_ARB"/>
>+                <enum name="GL_TEXTURE_BINDING_CUBE_MAP_ARRAY_ARB"/>
>+                <enum name="GL_PROXY_TEXTURE_CUBE_MAP_ARRAY_ARB"/>
>+                <enum name="GL_SAMPLER_CUBE_MAP_ARRAY_ARB"/>
>+                <enum name="GL_SAMPLER_CUBE_MAP_ARRAY_SHADOW_ARB"/>
>+                <enum name="GL_INT_SAMPLER_CUBE_MAP_ARRAY_ARB"/>
>+                <enum name="GL_UNSIGNED_INT_SAMPLER_CUBE_MAP_ARRAY_ARB"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_ARB_texture_env_add" supported="gl"/>
>+        <extension name="GL_ARB_texture_env_combine" supported="gl">
>+            <require>
>+                <enum name="GL_COMBINE_ARB"/>
>+                <enum name="GL_COMBINE_RGB_ARB"/>
>+                <enum name="GL_COMBINE_ALPHA_ARB"/>
>+                <enum name="GL_SOURCE0_RGB_ARB"/>
>+                <enum name="GL_SOURCE1_RGB_ARB"/>
>+                <enum name="GL_SOURCE2_RGB_ARB"/>
>+                <enum name="GL_SOURCE0_ALPHA_ARB"/>
>+                <enum name="GL_SOURCE1_ALPHA_ARB"/>
>+                <enum name="GL_SOURCE2_ALPHA_ARB"/>
>+                <enum name="GL_OPERAND0_RGB_ARB"/>
>+                <enum name="GL_OPERAND1_RGB_ARB"/>
>+                <enum name="GL_OPERAND2_RGB_ARB"/>
>+                <enum name="GL_OPERAND0_ALPHA_ARB"/>
>+                <enum name="GL_OPERAND1_ALPHA_ARB"/>
>+                <enum name="GL_OPERAND2_ALPHA_ARB"/>
>+                <enum name="GL_RGB_SCALE_ARB"/>
>+                <enum name="GL_ADD_SIGNED_ARB"/>
>+                <enum name="GL_INTERPOLATE_ARB"/>
>+                <enum name="GL_SUBTRACT_ARB"/>
>+                <enum name="GL_CONSTANT_ARB"/>
>+                <enum name="GL_PRIMARY_COLOR_ARB"/>
>+                <enum name="GL_PREVIOUS_ARB"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_ARB_texture_env_crossbar" supported="gl"/>
>+        <extension name="GL_ARB_texture_env_dot3" supported="gl">
>+            <require>
>+                <enum name="GL_DOT3_RGB_ARB"/>
>+                <enum name="GL_DOT3_RGBA_ARB"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_ARB_texture_filter_anisotropic" supported="gl|glcore">
>+            <require>
>+                <enum name="GL_TEXTURE_MAX_ANISOTROPY"/>
>+                <enum name="GL_MAX_TEXTURE_MAX_ANISOTROPY"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_ARB_texture_filter_minmax" supported="gl|glcore">
>+            <require>
>+                <enum name="GL_TEXTURE_REDUCTION_MODE_ARB"/>
>+                <enum name="GL_WEIGHTED_AVERAGE_ARB"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_ARB_texture_float" supported="gl">
>+            <require>
>+                <enum name="GL_TEXTURE_RED_TYPE_ARB"/>
>+                <enum name="GL_TEXTURE_GREEN_TYPE_ARB"/>
>+                <enum name="GL_TEXTURE_BLUE_TYPE_ARB"/>
>+                <enum name="GL_TEXTURE_ALPHA_TYPE_ARB"/>
>+                <enum name="GL_TEXTURE_LUMINANCE_TYPE_ARB"/>
>+                <enum name="GL_TEXTURE_INTENSITY_TYPE_ARB"/>
>+                <enum name="GL_TEXTURE_DEPTH_TYPE_ARB"/>
>+                <enum name="GL_UNSIGNED_NORMALIZED_ARB"/>
>+                <enum name="GL_RGBA32F_ARB"/>
>+                <enum name="GL_RGB32F_ARB"/>
>+                <enum name="GL_ALPHA32F_ARB"/>
>+                <enum name="GL_INTENSITY32F_ARB"/>
>+                <enum name="GL_LUMINANCE32F_ARB"/>
>+                <enum name="GL_LUMINANCE_ALPHA32F_ARB"/>
>+                <enum name="GL_RGBA16F_ARB"/>
>+                <enum name="GL_RGB16F_ARB"/>
>+                <enum name="GL_ALPHA16F_ARB"/>
>+                <enum name="GL_INTENSITY16F_ARB"/>
>+                <enum name="GL_LUMINANCE16F_ARB"/>
>+                <enum name="GL_LUMINANCE_ALPHA16F_ARB"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_ARB_texture_gather" supported="gl|glcore">
>+            <require>
>+                <enum name="GL_MIN_PROGRAM_TEXTURE_GATHER_OFFSET_ARB"/>
>+                <enum name="GL_MAX_PROGRAM_TEXTURE_GATHER_OFFSET_ARB"/>
>+                <enum name="GL_MAX_PROGRAM_TEXTURE_GATHER_COMPONENTS_ARB"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_ARB_texture_mirror_clamp_to_edge" supported="gl|glcore">
>+            <require>
>+                <enum name="GL_MIRROR_CLAMP_TO_EDGE"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_ARB_texture_mirrored_repeat" supported="gl|glcore">
>+            <require>
>+                <enum name="GL_MIRRORED_REPEAT_ARB"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_ARB_texture_multisample" supported="gl|glcore">
>+            <require>
>+                <enum name="GL_SAMPLE_POSITION"/>
>+                <enum name="GL_SAMPLE_MASK"/>
>+                <enum name="GL_SAMPLE_MASK_VALUE"/>
>+                <enum name="GL_MAX_SAMPLE_MASK_WORDS"/>
>+                <enum name="GL_TEXTURE_2D_MULTISAMPLE"/>
>+                <enum name="GL_PROXY_TEXTURE_2D_MULTISAMPLE"/>
>+                <enum name="GL_TEXTURE_2D_MULTISAMPLE_ARRAY"/>
>+                <enum name="GL_PROXY_TEXTURE_2D_MULTISAMPLE_ARRAY"/>
>+                <enum name="GL_TEXTURE_BINDING_2D_MULTISAMPLE"/>
>+                <enum name="GL_TEXTURE_BINDING_2D_MULTISAMPLE_ARRAY"/>
>+                <enum name="GL_TEXTURE_SAMPLES"/>
>+                <enum name="GL_TEXTURE_FIXED_SAMPLE_LOCATIONS"/>
>+                <enum name="GL_SAMPLER_2D_MULTISAMPLE"/>
>+                <enum name="GL_INT_SAMPLER_2D_MULTISAMPLE"/>
>+                <enum name="GL_UNSIGNED_INT_SAMPLER_2D_MULTISAMPLE"/>
>+                <enum name="GL_SAMPLER_2D_MULTISAMPLE_ARRAY"/>
>+                <enum name="GL_INT_SAMPLER_2D_MULTISAMPLE_ARRAY"/>
>+                <enum name="GL_UNSIGNED_INT_SAMPLER_2D_MULTISAMPLE_ARRAY"/>
>+                <enum name="GL_MAX_COLOR_TEXTURE_SAMPLES"/>
>+                <enum name="GL_MAX_DEPTH_TEXTURE_SAMPLES"/>
>+                <enum name="GL_MAX_INTEGER_SAMPLES"/>
>+                <command name="glTexImage2DMultisample"/>
>+                <command name="glTexImage3DMultisample"/>
>+                <command name="glGetMultisamplefv"/>
>+                <command name="glSampleMaski"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_ARB_texture_non_power_of_two" supported="gl|glcore"/>
>+        <extension name="GL_ARB_texture_query_levels" supported="gl|glcore"/>
>+        <extension name="GL_ARB_texture_query_lod" supported="gl|glcore"/>
>+        <extension name="GL_ARB_texture_rectangle" supported="gl">
>+            <require>
>+                <enum name="GL_TEXTURE_RECTANGLE_ARB"/>
>+                <enum name="GL_TEXTURE_BINDING_RECTANGLE_ARB"/>
>+                <enum name="GL_PROXY_TEXTURE_RECTANGLE_ARB"/>
>+                <enum name="GL_MAX_RECTANGLE_TEXTURE_SIZE_ARB"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_ARB_texture_rg" supported="gl|glcore">
>+            <require>
>+                <enum name="GL_RG"/>
>+                <enum name="GL_RG_INTEGER"/>
>+                <enum name="GL_R8"/>
>+                <enum name="GL_R16"/>
>+                <enum name="GL_RG8"/>
>+                <enum name="GL_RG16"/>
>+                <enum name="GL_R16F"/>
>+                <enum name="GL_R32F"/>
>+                <enum name="GL_RG16F"/>
>+                <enum name="GL_RG32F"/>
>+                <enum name="GL_R8I"/>
>+                <enum name="GL_R8UI"/>
>+                <enum name="GL_R16I"/>
>+                <enum name="GL_R16UI"/>
>+                <enum name="GL_R32I"/>
>+                <enum name="GL_R32UI"/>
>+                <enum name="GL_RG8I"/>
>+                <enum name="GL_RG8UI"/>
>+                <enum name="GL_RG16I"/>
>+                <enum name="GL_RG16UI"/>
>+                <enum name="GL_RG32I"/>
>+                <enum name="GL_RG32UI"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_ARB_texture_rgb10_a2ui" supported="gl|glcore">
>+            <require>
>+                <enum name="GL_RGB10_A2UI"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_ARB_texture_stencil8" supported="gl|glcore">
>+            <require>
>+                <enum name="GL_STENCIL_INDEX"/>
>+                <enum name="GL_STENCIL_INDEX8"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_ARB_texture_storage" supported="gl|glcore">
>+            <require>
>+                <enum name="GL_TEXTURE_IMMUTABLE_FORMAT"/>
>+                <command name="glTexStorage1D"/>
>+                <command name="glTexStorage2D"/>
>+                <command name="glTexStorage3D"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_ARB_texture_storage_multisample" supported="gl|glcore">
>+            <require>
>+                <command name="glTexStorage2DMultisample"/>
>+                <command name="glTexStorage3DMultisample"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_ARB_texture_swizzle" supported="gl|glcore">
>+            <require>
>+                <enum name="GL_TEXTURE_SWIZZLE_R"/>
>+                <enum name="GL_TEXTURE_SWIZZLE_G"/>
>+                <enum name="GL_TEXTURE_SWIZZLE_B"/>
>+                <enum name="GL_TEXTURE_SWIZZLE_A"/>
>+                <enum name="GL_TEXTURE_SWIZZLE_RGBA"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_ARB_texture_view" supported="gl|glcore">
>+            <require>
>+                <enum name="GL_TEXTURE_VIEW_MIN_LEVEL"/>
>+                <enum name="GL_TEXTURE_VIEW_NUM_LEVELS"/>
>+                <enum name="GL_TEXTURE_VIEW_MIN_LAYER"/>
>+                <enum name="GL_TEXTURE_VIEW_NUM_LAYERS"/>
>+                <enum name="GL_TEXTURE_IMMUTABLE_LEVELS"/>
>+                <command name="glTextureView"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_ARB_timer_query" supported="gl|glcore">
>+            <require>
>+                <enum name="GL_TIME_ELAPSED"/>
>+                <enum name="GL_TIMESTAMP"/>
>+                <command name="glQueryCounter"/>
>+                <command name="glGetQueryObjecti64v"/>
>+                <command name="glGetQueryObjectui64v"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_ARB_transform_feedback2" supported="gl|glcore">
>+            <require>
>+                <enum name="GL_TRANSFORM_FEEDBACK"/>
>+                <enum name="GL_TRANSFORM_FEEDBACK_BUFFER_PAUSED"/>
>+                <enum name="GL_TRANSFORM_FEEDBACK_BUFFER_ACTIVE"/>
>+                <enum name="GL_TRANSFORM_FEEDBACK_BINDING"/>
>+                <command name="glBindTransformFeedback"/>
>+                <command name="glDeleteTransformFeedbacks"/>
>+                <command name="glGenTransformFeedbacks"/>
>+                <command name="glIsTransformFeedback"/>
>+                <command name="glPauseTransformFeedback"/>
>+                <command name="glResumeTransformFeedback"/>
>+                <command name="glDrawTransformFeedback"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_ARB_transform_feedback3" supported="gl|glcore">
>+            <require>
>+                <enum name="GL_MAX_TRANSFORM_FEEDBACK_BUFFERS"/>
>+                <enum name="GL_MAX_VERTEX_STREAMS"/>
>+                <command name="glDrawTransformFeedbackStream"/>
>+                <command name="glBeginQueryIndexed"/>
>+                <command name="glEndQueryIndexed"/>
>+                <command name="glGetQueryIndexediv"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_ARB_transform_feedback_instanced" supported="gl|glcore">
>+            <require>
>+                <command name="glDrawTransformFeedbackInstanced"/>
>+                <command name="glDrawTransformFeedbackStreamInstanced"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_ARB_transform_feedback_overflow_query" supported="gl|glcore">
>+            <require>
>+                <enum name="GL_TRANSFORM_FEEDBACK_OVERFLOW_ARB"/>
>+                <enum name="GL_TRANSFORM_FEEDBACK_STREAM_OVERFLOW_ARB"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_ARB_transpose_matrix" supported="gl">
>+            <require>
>+                <enum name="GL_TRANSPOSE_MODELVIEW_MATRIX_ARB"/>
>+                <enum name="GL_TRANSPOSE_PROJECTION_MATRIX_ARB"/>
>+                <enum name="GL_TRANSPOSE_TEXTURE_MATRIX_ARB"/>
>+                <enum name="GL_TRANSPOSE_COLOR_MATRIX_ARB"/>
>+                <command name="glLoadTransposeMatrixfARB"/>
>+                <command name="glLoadTransposeMatrixdARB"/>
>+                <command name="glMultTransposeMatrixfARB"/>
>+                <command name="glMultTransposeMatrixdARB"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_ARB_uniform_buffer_object" supported="gl|glcore">
>+            <require>
>+                <enum name="GL_UNIFORM_BUFFER"/>
>+                <enum name="GL_UNIFORM_BUFFER_BINDING"/>
>+                <enum name="GL_UNIFORM_BUFFER_START"/>
>+                <enum name="GL_UNIFORM_BUFFER_SIZE"/>
>+                <enum name="GL_MAX_VERTEX_UNIFORM_BLOCKS"/>
>+                <enum name="GL_MAX_GEOMETRY_UNIFORM_BLOCKS"/>
>+                <enum name="GL_MAX_FRAGMENT_UNIFORM_BLOCKS"/>
>+                <enum name="GL_MAX_COMBINED_UNIFORM_BLOCKS"/>
>+                <enum name="GL_MAX_UNIFORM_BUFFER_BINDINGS"/>
>+                <enum name="GL_MAX_UNIFORM_BLOCK_SIZE"/>
>+                <enum name="GL_MAX_COMBINED_VERTEX_UNIFORM_COMPONENTS"/>
>+                <enum name="GL_MAX_COMBINED_GEOMETRY_UNIFORM_COMPONENTS"/>
>+                <enum name="GL_MAX_COMBINED_FRAGMENT_UNIFORM_COMPONENTS"/>
>+                <enum name="GL_UNIFORM_BUFFER_OFFSET_ALIGNMENT"/>
>+                <enum name="GL_ACTIVE_UNIFORM_BLOCK_MAX_NAME_LENGTH"/>
>+                <enum name="GL_ACTIVE_UNIFORM_BLOCKS"/>
>+                <enum name="GL_UNIFORM_TYPE"/>
>+                <enum name="GL_UNIFORM_SIZE"/>
>+                <enum name="GL_UNIFORM_NAME_LENGTH"/>
>+                <enum name="GL_UNIFORM_BLOCK_INDEX"/>
>+                <enum name="GL_UNIFORM_OFFSET"/>
>+                <enum name="GL_UNIFORM_ARRAY_STRIDE"/>
>+                <enum name="GL_UNIFORM_MATRIX_STRIDE"/>
>+                <enum name="GL_UNIFORM_IS_ROW_MAJOR"/>
>+                <enum name="GL_UNIFORM_BLOCK_BINDING"/>
>+                <enum name="GL_UNIFORM_BLOCK_DATA_SIZE"/>
>+                <enum name="GL_UNIFORM_BLOCK_NAME_LENGTH"/>
>+                <enum name="GL_UNIFORM_BLOCK_ACTIVE_UNIFORMS"/>
>+                <enum name="GL_UNIFORM_BLOCK_ACTIVE_UNIFORM_INDICES"/>
>+                <enum name="GL_UNIFORM_BLOCK_REFERENCED_BY_VERTEX_SHADER"/>
>+                <enum name="GL_UNIFORM_BLOCK_REFERENCED_BY_GEOMETRY_SHADER"/>
>+                <enum name="GL_UNIFORM_BLOCK_REFERENCED_BY_FRAGMENT_SHADER"/>
>+                <enum name="GL_INVALID_INDEX"/>
>+                <command name="glGetUniformIndices"/>
>+                <command name="glGetActiveUniformsiv"/>
>+                <command name="glGetActiveUniformName"/>
>+                <command name="glGetUniformBlockIndex"/>
>+                <command name="glGetActiveUniformBlockiv"/>
>+                <command name="glGetActiveUniformBlockName"/>
>+                <command name="glUniformBlockBinding"/>
>+                <command name="glBindBufferRange"/>
>+                <command name="glBindBufferBase"/>
>+                <command name="glGetIntegeri_v"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_ARB_vertex_array_bgra" supported="gl|glcore">
>+            <require>
>+                <enum name="GL_BGRA"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_ARB_vertex_array_object" supported="gl|glcore">
>+            <require>
>+                <enum name="GL_VERTEX_ARRAY_BINDING"/>
>+                <command name="glBindVertexArray"/>
>+                <command name="glDeleteVertexArrays"/>
>+                <command name="glGenVertexArrays"/>
>+                <command name="glIsVertexArray"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_ARB_vertex_attrib_64bit" supported="gl|glcore">
>+            <require>
>+                <enum name="GL_RGB32I"/>
>+                <enum name="GL_DOUBLE_VEC2"/>
>+                <enum name="GL_DOUBLE_VEC3"/>
>+                <enum name="GL_DOUBLE_VEC4"/>
>+                <enum name="GL_DOUBLE_MAT2"/>
>+                <enum name="GL_DOUBLE_MAT3"/>
>+                <enum name="GL_DOUBLE_MAT4"/>
>+                <enum name="GL_DOUBLE_MAT2x3"/>
>+                <enum name="GL_DOUBLE_MAT2x4"/>
>+                <enum name="GL_DOUBLE_MAT3x2"/>
>+                <enum name="GL_DOUBLE_MAT3x4"/>
>+                <enum name="GL_DOUBLE_MAT4x2"/>
>+                <enum name="GL_DOUBLE_MAT4x3"/>
>+                <command name="glVertexAttribL1d"/>
>+                <command name="glVertexAttribL2d"/>
>+                <command name="glVertexAttribL3d"/>
>+                <command name="glVertexAttribL4d"/>
>+                <command name="glVertexAttribL1dv"/>
>+                <command name="glVertexAttribL2dv"/>
>+                <command name="glVertexAttribL3dv"/>
>+                <command name="glVertexAttribL4dv"/>
>+                <command name="glVertexAttribLPointer"/>
>+                <command name="glGetVertexAttribLdv"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_ARB_vertex_attrib_binding" supported="gl|glcore">
>+            <require>
>+                <enum name="GL_VERTEX_ATTRIB_BINDING"/>
>+                <enum name="GL_VERTEX_ATTRIB_RELATIVE_OFFSET"/>
>+                <enum name="GL_VERTEX_BINDING_DIVISOR"/>
>+                <enum name="GL_VERTEX_BINDING_OFFSET"/>
>+                <enum name="GL_VERTEX_BINDING_STRIDE"/>
>+                <enum name="GL_MAX_VERTEX_ATTRIB_RELATIVE_OFFSET"/>
>+                <enum name="GL_MAX_VERTEX_ATTRIB_BINDINGS"/>
>+                <command name="glBindVertexBuffer"/>
>+                <command name="glVertexAttribFormat"/>
>+                <command name="glVertexAttribIFormat"/>
>+                <command name="glVertexAttribLFormat"/>
>+                <command name="glVertexAttribBinding"/>
>+                <command name="glVertexBindingDivisor"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_ARB_vertex_blend" supported="gl">
>+            <require>
>+                <enum name="GL_MAX_VERTEX_UNITS_ARB"/>
>+                <enum name="GL_ACTIVE_VERTEX_UNITS_ARB"/>
>+                <enum name="GL_WEIGHT_SUM_UNITY_ARB"/>
>+                <enum name="GL_VERTEX_BLEND_ARB"/>
>+                <enum name="GL_CURRENT_WEIGHT_ARB"/>
>+                <enum name="GL_WEIGHT_ARRAY_TYPE_ARB"/>
>+                <enum name="GL_WEIGHT_ARRAY_STRIDE_ARB"/>
>+                <enum name="GL_WEIGHT_ARRAY_SIZE_ARB"/>
>+                <enum name="GL_WEIGHT_ARRAY_POINTER_ARB"/>
>+                <enum name="GL_WEIGHT_ARRAY_ARB"/>
>+                <enum name="GL_MODELVIEW0_ARB"/>
>+                <enum name="GL_MODELVIEW1_ARB"/>
>+                <enum name="GL_MODELVIEW2_ARB"/>
>+                <enum name="GL_MODELVIEW3_ARB"/>
>+                <enum name="GL_MODELVIEW4_ARB"/>
>+                <enum name="GL_MODELVIEW5_ARB"/>
>+                <enum name="GL_MODELVIEW6_ARB"/>
>+                <enum name="GL_MODELVIEW7_ARB"/>
>+                <enum name="GL_MODELVIEW8_ARB"/>
>+                <enum name="GL_MODELVIEW9_ARB"/>
>+                <enum name="GL_MODELVIEW10_ARB"/>
>+                <enum name="GL_MODELVIEW11_ARB"/>
>+                <enum name="GL_MODELVIEW12_ARB"/>
>+                <enum name="GL_MODELVIEW13_ARB"/>
>+                <enum name="GL_MODELVIEW14_ARB"/>
>+                <enum name="GL_MODELVIEW15_ARB"/>
>+                <enum name="GL_MODELVIEW16_ARB"/>
>+                <enum name="GL_MODELVIEW17_ARB"/>
>+                <enum name="GL_MODELVIEW18_ARB"/>
>+                <enum name="GL_MODELVIEW19_ARB"/>
>+                <enum name="GL_MODELVIEW20_ARB"/>
>+                <enum name="GL_MODELVIEW21_ARB"/>
>+                <enum name="GL_MODELVIEW22_ARB"/>
>+                <enum name="GL_MODELVIEW23_ARB"/>
>+                <enum name="GL_MODELVIEW24_ARB"/>
>+                <enum name="GL_MODELVIEW25_ARB"/>
>+                <enum name="GL_MODELVIEW26_ARB"/>
>+                <enum name="GL_MODELVIEW27_ARB"/>
>+                <enum name="GL_MODELVIEW28_ARB"/>
>+                <enum name="GL_MODELVIEW29_ARB"/>
>+                <enum name="GL_MODELVIEW30_ARB"/>
>+                <enum name="GL_MODELVIEW31_ARB"/>
>+                <command name="glWeightbvARB"/>
>+                <command name="glWeightsvARB"/>
>+                <command name="glWeightivARB"/>
>+                <command name="glWeightfvARB"/>
>+                <command name="glWeightdvARB"/>
>+                <command name="glWeightubvARB"/>
>+                <command name="glWeightusvARB"/>
>+                <command name="glWeightuivARB"/>
>+                <command name="glWeightPointerARB"/>
>+                <command name="glVertexBlendARB"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_ARB_vertex_buffer_object" supported="gl">
>+            <require>
>+                <enum name="GL_BUFFER_SIZE_ARB"/>
>+                <enum name="GL_BUFFER_USAGE_ARB"/>
>+                <enum name="GL_ARRAY_BUFFER_ARB"/>
>+                <enum name="GL_ELEMENT_ARRAY_BUFFER_ARB"/>
>+                <enum name="GL_ARRAY_BUFFER_BINDING_ARB"/>
>+                <enum name="GL_ELEMENT_ARRAY_BUFFER_BINDING_ARB"/>
>+                <enum name="GL_VERTEX_ARRAY_BUFFER_BINDING_ARB"/>
>+                <enum name="GL_NORMAL_ARRAY_BUFFER_BINDING_ARB"/>
>+                <enum name="GL_COLOR_ARRAY_BUFFER_BINDING_ARB"/>
>+                <enum name="GL_INDEX_ARRAY_BUFFER_BINDING_ARB"/>
>+                <enum name="GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING_ARB"/>
>+                <enum name="GL_EDGE_FLAG_ARRAY_BUFFER_BINDING_ARB"/>
>+                <enum name="GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING_ARB"/>
>+                <enum name="GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING_ARB"/>
>+                <enum name="GL_WEIGHT_ARRAY_BUFFER_BINDING_ARB"/>
>+                <enum name="GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING_ARB"/>
>+                <enum name="GL_READ_ONLY_ARB"/>
>+                <enum name="GL_WRITE_ONLY_ARB"/>
>+                <enum name="GL_READ_WRITE_ARB"/>
>+                <enum name="GL_BUFFER_ACCESS_ARB"/>
>+                <enum name="GL_BUFFER_MAPPED_ARB"/>
>+                <enum name="GL_BUFFER_MAP_POINTER_ARB"/>
>+                <enum name="GL_STREAM_DRAW_ARB"/>
>+                <enum name="GL_STREAM_READ_ARB"/>
>+                <enum name="GL_STREAM_COPY_ARB"/>
>+                <enum name="GL_STATIC_DRAW_ARB"/>
>+                <enum name="GL_STATIC_READ_ARB"/>
>+                <enum name="GL_STATIC_COPY_ARB"/>
>+                <enum name="GL_DYNAMIC_DRAW_ARB"/>
>+                <enum name="GL_DYNAMIC_READ_ARB"/>
>+                <enum name="GL_DYNAMIC_COPY_ARB"/>
>+                <command name="glBindBufferARB"/>
>+                <command name="glDeleteBuffersARB"/>
>+                <command name="glGenBuffersARB"/>
>+                <command name="glIsBufferARB"/>
>+                <command name="glBufferDataARB"/>
>+                <command name="glBufferSubDataARB"/>
>+                <command name="glGetBufferSubDataARB"/>
>+                <command name="glMapBufferARB"/>
>+                <command name="glUnmapBufferARB"/>
>+                <command name="glGetBufferParameterivARB"/>
>+                <command name="glGetBufferPointervARB"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_ARB_vertex_program" supported="gl">
>+            <require>
>+                <enum name="GL_COLOR_SUM_ARB"/>
>+                <enum name="GL_VERTEX_PROGRAM_ARB"/>
>+                <enum name="GL_VERTEX_ATTRIB_ARRAY_ENABLED_ARB"/>
>+                <enum name="GL_VERTEX_ATTRIB_ARRAY_SIZE_ARB"/>
>+                <enum name="GL_VERTEX_ATTRIB_ARRAY_STRIDE_ARB"/>
>+                <enum name="GL_VERTEX_ATTRIB_ARRAY_TYPE_ARB"/>
>+                <enum name="GL_CURRENT_VERTEX_ATTRIB_ARB"/>
>+                <enum name="GL_PROGRAM_LENGTH_ARB"/>
>+                <enum name="GL_PROGRAM_STRING_ARB"/>
>+                <enum name="GL_MAX_PROGRAM_MATRIX_STACK_DEPTH_ARB"/>
>+                <enum name="GL_MAX_PROGRAM_MATRICES_ARB"/>
>+                <enum name="GL_CURRENT_MATRIX_STACK_DEPTH_ARB"/>
>+                <enum name="GL_CURRENT_MATRIX_ARB"/>
>+                <enum name="GL_VERTEX_PROGRAM_POINT_SIZE_ARB"/>
>+                <enum name="GL_VERTEX_PROGRAM_TWO_SIDE_ARB"/>
>+                <enum name="GL_VERTEX_ATTRIB_ARRAY_POINTER_ARB"/>
>+                <enum name="GL_PROGRAM_ERROR_POSITION_ARB"/>
>+                <enum name="GL_PROGRAM_BINDING_ARB"/>
>+                <enum name="GL_MAX_VERTEX_ATTRIBS_ARB"/>
>+                <enum name="GL_VERTEX_ATTRIB_ARRAY_NORMALIZED_ARB"/>
>+                <enum name="GL_PROGRAM_ERROR_STRING_ARB"/>
>+                <enum name="GL_PROGRAM_FORMAT_ASCII_ARB"/>
>+                <enum name="GL_PROGRAM_FORMAT_ARB"/>
>+                <enum name="GL_PROGRAM_INSTRUCTIONS_ARB"/>
>+                <enum name="GL_MAX_PROGRAM_INSTRUCTIONS_ARB"/>
>+                <enum name="GL_PROGRAM_NATIVE_INSTRUCTIONS_ARB"/>
>+                <enum name="GL_MAX_PROGRAM_NATIVE_INSTRUCTIONS_ARB"/>
>+                <enum name="GL_PROGRAM_TEMPORARIES_ARB"/>
>+                <enum name="GL_MAX_PROGRAM_TEMPORARIES_ARB"/>
>+                <enum name="GL_PROGRAM_NATIVE_TEMPORARIES_ARB"/>
>+                <enum name="GL_MAX_PROGRAM_NATIVE_TEMPORARIES_ARB"/>
>+                <enum name="GL_PROGRAM_PARAMETERS_ARB"/>
>+                <enum name="GL_MAX_PROGRAM_PARAMETERS_ARB"/>
>+                <enum name="GL_PROGRAM_NATIVE_PARAMETERS_ARB"/>
>+                <enum name="GL_MAX_PROGRAM_NATIVE_PARAMETERS_ARB"/>
>+                <enum name="GL_PROGRAM_ATTRIBS_ARB"/>
>+                <enum name="GL_MAX_PROGRAM_ATTRIBS_ARB"/>
>+                <enum name="GL_PROGRAM_NATIVE_ATTRIBS_ARB"/>
>+                <enum name="GL_MAX_PROGRAM_NATIVE_ATTRIBS_ARB"/>
>+                <enum name="GL_PROGRAM_ADDRESS_REGISTERS_ARB"/>
>+                <enum name="GL_MAX_PROGRAM_ADDRESS_REGISTERS_ARB"/>
>+                <enum name="GL_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB"/>
>+                <enum name="GL_MAX_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB"/>
>+                <enum name="GL_MAX_PROGRAM_LOCAL_PARAMETERS_ARB"/>
>+                <enum name="GL_MAX_PROGRAM_ENV_PARAMETERS_ARB"/>
>+                <enum name="GL_PROGRAM_UNDER_NATIVE_LIMITS_ARB"/>
>+                <enum name="GL_TRANSPOSE_CURRENT_MATRIX_ARB"/>
>+                <enum name="GL_MATRIX0_ARB"/>
>+                <enum name="GL_MATRIX1_ARB"/>
>+                <enum name="GL_MATRIX2_ARB"/>
>+                <enum name="GL_MATRIX3_ARB"/>
>+                <enum name="GL_MATRIX4_ARB"/>
>+                <enum name="GL_MATRIX5_ARB"/>
>+                <enum name="GL_MATRIX6_ARB"/>
>+                <enum name="GL_MATRIX7_ARB"/>
>+                <enum name="GL_MATRIX8_ARB"/>
>+                <enum name="GL_MATRIX9_ARB"/>
>+                <enum name="GL_MATRIX10_ARB"/>
>+                <enum name="GL_MATRIX11_ARB"/>
>+                <enum name="GL_MATRIX12_ARB"/>
>+                <enum name="GL_MATRIX13_ARB"/>
>+                <enum name="GL_MATRIX14_ARB"/>
>+                <enum name="GL_MATRIX15_ARB"/>
>+                <enum name="GL_MATRIX16_ARB"/>
>+                <enum name="GL_MATRIX17_ARB"/>
>+                <enum name="GL_MATRIX18_ARB"/>
>+                <enum name="GL_MATRIX19_ARB"/>
>+                <enum name="GL_MATRIX20_ARB"/>
>+                <enum name="GL_MATRIX21_ARB"/>
>+                <enum name="GL_MATRIX22_ARB"/>
>+                <enum name="GL_MATRIX23_ARB"/>
>+                <enum name="GL_MATRIX24_ARB"/>
>+                <enum name="GL_MATRIX25_ARB"/>
>+                <enum name="GL_MATRIX26_ARB"/>
>+                <enum name="GL_MATRIX27_ARB"/>
>+                <enum name="GL_MATRIX28_ARB"/>
>+                <enum name="GL_MATRIX29_ARB"/>
>+                <enum name="GL_MATRIX30_ARB"/>
>+                <enum name="GL_MATRIX31_ARB"/>
>+                <command name="glVertexAttrib1dARB"/>
>+                <command name="glVertexAttrib1dvARB"/>
>+                <command name="glVertexAttrib1fARB"/>
>+                <command name="glVertexAttrib1fvARB"/>
>+                <command name="glVertexAttrib1sARB"/>
>+                <command name="glVertexAttrib1svARB"/>
>+                <command name="glVertexAttrib2dARB"/>
>+                <command name="glVertexAttrib2dvARB"/>
>+                <command name="glVertexAttrib2fARB"/>
>+                <command name="glVertexAttrib2fvARB"/>
>+                <command name="glVertexAttrib2sARB"/>
>+                <command name="glVertexAttrib2svARB"/>
>+                <command name="glVertexAttrib3dARB"/>
>+                <command name="glVertexAttrib3dvARB"/>
>+                <command name="glVertexAttrib3fARB"/>
>+                <command name="glVertexAttrib3fvARB"/>
>+                <command name="glVertexAttrib3sARB"/>
>+                <command name="glVertexAttrib3svARB"/>
>+                <command name="glVertexAttrib4NbvARB"/>
>+                <command name="glVertexAttrib4NivARB"/>
>+                <command name="glVertexAttrib4NsvARB"/>
>+                <command name="glVertexAttrib4NubARB"/>
>+                <command name="glVertexAttrib4NubvARB"/>
>+                <command name="glVertexAttrib4NuivARB"/>
>+                <command name="glVertexAttrib4NusvARB"/>
>+                <command name="glVertexAttrib4bvARB"/>
>+                <command name="glVertexAttrib4dARB"/>
>+                <command name="glVertexAttrib4dvARB"/>
>+                <command name="glVertexAttrib4fARB"/>
>+                <command name="glVertexAttrib4fvARB"/>
>+                <command name="glVertexAttrib4ivARB"/>
>+                <command name="glVertexAttrib4sARB"/>
>+                <command name="glVertexAttrib4svARB"/>
>+                <command name="glVertexAttrib4ubvARB"/>
>+                <command name="glVertexAttrib4uivARB"/>
>+                <command name="glVertexAttrib4usvARB"/>
>+                <command name="glVertexAttribPointerARB"/>
>+                <command name="glEnableVertexAttribArrayARB"/>
>+                <command name="glDisableVertexAttribArrayARB"/>
>+                <command name="glProgramStringARB"/>
>+                <command name="glBindProgramARB"/>
>+                <command name="glDeleteProgramsARB"/>
>+                <command name="glGenProgramsARB"/>
>+                <command name="glProgramEnvParameter4dARB"/>
>+                <command name="glProgramEnvParameter4dvARB"/>
>+                <command name="glProgramEnvParameter4fARB"/>
>+                <command name="glProgramEnvParameter4fvARB"/>
>+                <command name="glProgramLocalParameter4dARB"/>
>+                <command name="glProgramLocalParameter4dvARB"/>
>+                <command name="glProgramLocalParameter4fARB"/>
>+                <command name="glProgramLocalParameter4fvARB"/>
>+                <command name="glGetProgramEnvParameterdvARB"/>
>+                <command name="glGetProgramEnvParameterfvARB"/>
>+                <command name="glGetProgramLocalParameterdvARB"/>
>+                <command name="glGetProgramLocalParameterfvARB"/>
>+                <command name="glGetProgramivARB"/>
>+                <command name="glGetProgramStringARB"/>
>+                <command name="glGetVertexAttribdvARB"/>
>+                <command name="glGetVertexAttribfvARB"/>
>+                <command name="glGetVertexAttribivARB"/>
>+                <command name="glGetVertexAttribPointervARB"/>
>+                <command name="glIsProgramARB"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_ARB_vertex_shader" supported="gl">
>+            <require>
>+                <enum name="GL_VERTEX_SHADER_ARB"/>
>+                <enum name="GL_MAX_VERTEX_UNIFORM_COMPONENTS_ARB"/>
>+                <enum name="GL_MAX_VARYING_FLOATS_ARB"/>
>+                <enum name="GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS_ARB"/>
>+                <enum name="GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS_ARB"/>
>+                <enum name="GL_OBJECT_ACTIVE_ATTRIBUTES_ARB"/>
>+                <enum name="GL_OBJECT_ACTIVE_ATTRIBUTE_MAX_LENGTH_ARB"/>
>+                <enum name="GL_MAX_VERTEX_ATTRIBS_ARB"/>
>+                <enum name="GL_MAX_TEXTURE_IMAGE_UNITS_ARB"/>
>+                <enum name="GL_MAX_TEXTURE_COORDS_ARB"/>
>+                <enum name="GL_VERTEX_PROGRAM_POINT_SIZE_ARB"/>
>+                <enum name="GL_VERTEX_PROGRAM_TWO_SIDE_ARB"/>
>+                <enum name="GL_VERTEX_ATTRIB_ARRAY_ENABLED_ARB"/>
>+                <enum name="GL_VERTEX_ATTRIB_ARRAY_SIZE_ARB"/>
>+                <enum name="GL_VERTEX_ATTRIB_ARRAY_STRIDE_ARB"/>
>+                <enum name="GL_VERTEX_ATTRIB_ARRAY_TYPE_ARB"/>
>+                <enum name="GL_VERTEX_ATTRIB_ARRAY_NORMALIZED_ARB"/>
>+                <enum name="GL_CURRENT_VERTEX_ATTRIB_ARB"/>
>+                <enum name="GL_VERTEX_ATTRIB_ARRAY_POINTER_ARB"/>
>+                <enum name="GL_FLOAT"/>
>+                <enum name="GL_FLOAT_VEC2_ARB"/>
>+                <enum name="GL_FLOAT_VEC3_ARB"/>
>+                <enum name="GL_FLOAT_VEC4_ARB"/>
>+                <enum name="GL_FLOAT_MAT2_ARB"/>
>+                <enum name="GL_FLOAT_MAT3_ARB"/>
>+                <enum name="GL_FLOAT_MAT4_ARB"/>
>+                <command name="glVertexAttrib1fARB"/>
>+                <command name="glVertexAttrib1sARB"/>
>+                <command name="glVertexAttrib1dARB"/>
>+                <command name="glVertexAttrib2fARB"/>
>+                <command name="glVertexAttrib2sARB"/>
>+                <command name="glVertexAttrib2dARB"/>
>+                <command name="glVertexAttrib3fARB"/>
>+                <command name="glVertexAttrib3sARB"/>
>+                <command name="glVertexAttrib3dARB"/>
>+                <command name="glVertexAttrib4fARB"/>
>+                <command name="glVertexAttrib4sARB"/>
>+                <command name="glVertexAttrib4dARB"/>
>+                <command name="glVertexAttrib4NubARB"/>
>+                <command name="glVertexAttrib1fvARB"/>
>+                <command name="glVertexAttrib1svARB"/>
>+                <command name="glVertexAttrib1dvARB"/>
>+                <command name="glVertexAttrib2fvARB"/>
>+                <command name="glVertexAttrib2svARB"/>
>+                <command name="glVertexAttrib2dvARB"/>
>+                <command name="glVertexAttrib3fvARB"/>
>+                <command name="glVertexAttrib3svARB"/>
>+                <command name="glVertexAttrib3dvARB"/>
>+                <command name="glVertexAttrib4fvARB"/>
>+                <command name="glVertexAttrib4svARB"/>
>+                <command name="glVertexAttrib4dvARB"/>
>+                <command name="glVertexAttrib4ivARB"/>
>+                <command name="glVertexAttrib4bvARB"/>
>+                <command name="glVertexAttrib4ubvARB"/>
>+                <command name="glVertexAttrib4usvARB"/>
>+                <command name="glVertexAttrib4uivARB"/>
>+                <command name="glVertexAttrib4NbvARB"/>
>+                <command name="glVertexAttrib4NsvARB"/>
>+                <command name="glVertexAttrib4NivARB"/>
>+                <command name="glVertexAttrib4NubvARB"/>
>+                <command name="glVertexAttrib4NusvARB"/>
>+                <command name="glVertexAttrib4NuivARB"/>
>+                <command name="glVertexAttribPointerARB"/>
>+                <command name="glEnableVertexAttribArrayARB"/>
>+                <command name="glDisableVertexAttribArrayARB"/>
>+                <command name="glBindAttribLocationARB"/>
>+                <command name="glGetActiveAttribARB"/>
>+                <command name="glGetAttribLocationARB"/>
>+                <command name="glGetVertexAttribdvARB"/>
>+                <command name="glGetVertexAttribfvARB"/>
>+                <command name="glGetVertexAttribivARB"/>
>+                <command name="glGetVertexAttribPointervARB"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_ARB_vertex_type_10f_11f_11f_rev" supported="gl|glcore">
>+            <require>
>+                <enum name="GL_UNSIGNED_INT_10F_11F_11F_REV"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_ARB_vertex_type_2_10_10_10_rev" supported="gl|glcore">
>+            <require>
>+                <enum name="GL_UNSIGNED_INT_2_10_10_10_REV"/>
>+                <enum name="GL_INT_2_10_10_10_REV"/>
>+                <command name="glVertexAttribP1ui"/>
>+                <command name="glVertexAttribP1uiv"/>
>+                <command name="glVertexAttribP2ui"/>
>+                <command name="glVertexAttribP2uiv"/>
>+                <command name="glVertexAttribP3ui"/>
>+                <command name="glVertexAttribP3uiv"/>
>+                <command name="glVertexAttribP4ui"/>
>+                <command name="glVertexAttribP4uiv"/>
>+            </require>
>+            <require api="gl" profile="compatibility">
>+                <command name="glVertexP2ui"/>
>+                <command name="glVertexP2uiv"/>
>+                <command name="glVertexP3ui"/>
>+                <command name="glVertexP3uiv"/>
>+                <command name="glVertexP4ui"/>
>+                <command name="glVertexP4uiv"/>
>+                <command name="glTexCoordP1ui"/>
>+                <command name="glTexCoordP1uiv"/>
>+                <command name="glTexCoordP2ui"/>
>+                <command name="glTexCoordP2uiv"/>
>+                <command name="glTexCoordP3ui"/>
>+                <command name="glTexCoordP3uiv"/>
>+                <command name="glTexCoordP4ui"/>
>+                <command name="glTexCoordP4uiv"/>
>+                <command name="glMultiTexCoordP1ui"/>
>+                <command name="glMultiTexCoordP1uiv"/>
>+                <command name="glMultiTexCoordP2ui"/>
>+                <command name="glMultiTexCoordP2uiv"/>
>+                <command name="glMultiTexCoordP3ui"/>
>+                <command name="glMultiTexCoordP3uiv"/>
>+                <command name="glMultiTexCoordP4ui"/>
>+                <command name="glMultiTexCoordP4uiv"/>
>+                <command name="glNormalP3ui"/>
>+                <command name="glNormalP3uiv"/>
>+                <command name="glColorP3ui"/>
>+                <command name="glColorP3uiv"/>
>+                <command name="glColorP4ui"/>
>+                <command name="glColorP4uiv"/>
>+                <command name="glSecondaryColorP3ui"/>
>+                <command name="glSecondaryColorP3uiv"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_ARB_viewport_array" supported="gl|glcore">
>+            <require>
>+                <enum name="GL_SCISSOR_BOX"/>
>+                <enum name="GL_VIEWPORT"/>
>+                <enum name="GL_DEPTH_RANGE"/>
>+                <enum name="GL_SCISSOR_TEST"/>
>+                <enum name="GL_MAX_VIEWPORTS"/>
>+                <enum name="GL_VIEWPORT_SUBPIXEL_BITS"/>
>+                <enum name="GL_VIEWPORT_BOUNDS_RANGE"/>
>+                <enum name="GL_LAYER_PROVOKING_VERTEX"/>
>+                <enum name="GL_VIEWPORT_INDEX_PROVOKING_VERTEX"/>
>+                <enum name="GL_UNDEFINED_VERTEX"/>
>+                <enum name="GL_FIRST_VERTEX_CONVENTION"/>
>+                <enum name="GL_LAST_VERTEX_CONVENTION"/>
>+                <enum name="GL_PROVOKING_VERTEX"/>
>+                <command name="glViewportArrayv"/>
>+                <command name="glViewportIndexedf"/>
>+                <command name="glViewportIndexedfv"/>
>+                <command name="glScissorArrayv"/>
>+                <command name="glScissorIndexed"/>
>+                <command name="glScissorIndexedv"/>
>+                <command name="glDepthRangeArrayv"/>
>+                <command name="glDepthRangeIndexed"/>
>+                <command name="glGetFloati_v"/>
>+                <command name="glGetDoublei_v"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_ARB_window_pos" supported="gl">
>+            <require>
>+                <command name="glWindowPos2dARB"/>
>+                <command name="glWindowPos2dvARB"/>
>+                <command name="glWindowPos2fARB"/>
>+                <command name="glWindowPos2fvARB"/>
>+                <command name="glWindowPos2iARB"/>
>+                <command name="glWindowPos2ivARB"/>
>+                <command name="glWindowPos2sARB"/>
>+                <command name="glWindowPos2svARB"/>
>+                <command name="glWindowPos3dARB"/>
>+                <command name="glWindowPos3dvARB"/>
>+                <command name="glWindowPos3fARB"/>
>+                <command name="glWindowPos3fvARB"/>
>+                <command name="glWindowPos3iARB"/>
>+                <command name="glWindowPos3ivARB"/>
>+                <command name="glWindowPos3sARB"/>
>+                <command name="glWindowPos3svARB"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_ARM_mali_program_binary" supported="gles2">
>+            <require>
>+                <enum name="GL_MALI_PROGRAM_BINARY_ARM"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_ARM_mali_shader_binary" supported="gles2">
>+            <require>
>+                <enum name="GL_MALI_SHADER_BINARY_ARM"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_ARM_rgba8" supported="gles1|gles2"/>
>+        <extension name="GL_ARM_shader_framebuffer_fetch" supported="gles2">
>+            <require>
>+                <enum name="GL_FETCH_PER_SAMPLE_ARM"/>
>+                <enum name="GL_FRAGMENT_SHADER_FRAMEBUFFER_FETCH_MRT_ARM"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_ARM_shader_framebuffer_fetch_depth_stencil" supported="gles2"/>
>+        <extension name="GL_ATI_draw_buffers" supported="gl">
>+            <require>
>+                <enum name="GL_MAX_DRAW_BUFFERS_ATI"/>
>+                <enum name="GL_DRAW_BUFFER0_ATI"/>
>+                <enum name="GL_DRAW_BUFFER1_ATI"/>
>+                <enum name="GL_DRAW_BUFFER2_ATI"/>
>+                <enum name="GL_DRAW_BUFFER3_ATI"/>
>+                <enum name="GL_DRAW_BUFFER4_ATI"/>
>+                <enum name="GL_DRAW_BUFFER5_ATI"/>
>+                <enum name="GL_DRAW_BUFFER6_ATI"/>
>+                <enum name="GL_DRAW_BUFFER7_ATI"/>
>+                <enum name="GL_DRAW_BUFFER8_ATI"/>
>+                <enum name="GL_DRAW_BUFFER9_ATI"/>
>+                <enum name="GL_DRAW_BUFFER10_ATI"/>
>+                <enum name="GL_DRAW_BUFFER11_ATI"/>
>+                <enum name="GL_DRAW_BUFFER12_ATI"/>
>+                <enum name="GL_DRAW_BUFFER13_ATI"/>
>+                <enum name="GL_DRAW_BUFFER14_ATI"/>
>+                <enum name="GL_DRAW_BUFFER15_ATI"/>
>+                <command name="glDrawBuffersATI"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_ATI_element_array" supported="gl">
>+            <require>
>+                <enum name="GL_ELEMENT_ARRAY_ATI"/>
>+                <enum name="GL_ELEMENT_ARRAY_TYPE_ATI"/>
>+                <enum name="GL_ELEMENT_ARRAY_POINTER_ATI"/>
>+                <command name="glElementPointerATI"/>
>+                <command name="glDrawElementArrayATI"/>
>+                <command name="glDrawRangeElementArrayATI"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_ATI_envmap_bumpmap" supported="gl">
>+            <require>
>+                <enum name="GL_BUMP_ROT_MATRIX_ATI"/>
>+                <enum name="GL_BUMP_ROT_MATRIX_SIZE_ATI"/>
>+                <enum name="GL_BUMP_NUM_TEX_UNITS_ATI"/>
>+                <enum name="GL_BUMP_TEX_UNITS_ATI"/>
>+                <enum name="GL_DUDV_ATI"/>
>+                <enum name="GL_DU8DV8_ATI"/>
>+                <enum name="GL_BUMP_ENVMAP_ATI"/>
>+                <enum name="GL_BUMP_TARGET_ATI"/>
>+                <command name="glTexBumpParameterivATI"/>
>+                <command name="glTexBumpParameterfvATI"/>
>+                <command name="glGetTexBumpParameterivATI"/>
>+                <command name="glGetTexBumpParameterfvATI"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_ATI_fragment_shader" supported="gl">
>+            <require>
>+                <enum name="GL_FRAGMENT_SHADER_ATI"/>
>+                <enum name="GL_REG_0_ATI"/>
>+                <enum name="GL_REG_1_ATI"/>
>+                <enum name="GL_REG_2_ATI"/>
>+                <enum name="GL_REG_3_ATI"/>
>+                <enum name="GL_REG_4_ATI"/>
>+                <enum name="GL_REG_5_ATI"/>
>+                <enum name="GL_REG_6_ATI"/>
>+                <enum name="GL_REG_7_ATI"/>
>+                <enum name="GL_REG_8_ATI"/>
>+                <enum name="GL_REG_9_ATI"/>
>+                <enum name="GL_REG_10_ATI"/>
>+                <enum name="GL_REG_11_ATI"/>
>+                <enum name="GL_REG_12_ATI"/>
>+                <enum name="GL_REG_13_ATI"/>
>+                <enum name="GL_REG_14_ATI"/>
>+                <enum name="GL_REG_15_ATI"/>
>+                <enum name="GL_REG_16_ATI"/>
>+                <enum name="GL_REG_17_ATI"/>
>+                <enum name="GL_REG_18_ATI"/>
>+                <enum name="GL_REG_19_ATI"/>
>+                <enum name="GL_REG_20_ATI"/>
>+                <enum name="GL_REG_21_ATI"/>
>+                <enum name="GL_REG_22_ATI"/>
>+                <enum name="GL_REG_23_ATI"/>
>+                <enum name="GL_REG_24_ATI"/>
>+                <enum name="GL_REG_25_ATI"/>
>+                <enum name="GL_REG_26_ATI"/>
>+                <enum name="GL_REG_27_ATI"/>
>+                <enum name="GL_REG_28_ATI"/>
>+                <enum name="GL_REG_29_ATI"/>
>+                <enum name="GL_REG_30_ATI"/>
>+                <enum name="GL_REG_31_ATI"/>
>+                <enum name="GL_CON_0_ATI"/>
>+                <enum name="GL_CON_1_ATI"/>
>+                <enum name="GL_CON_2_ATI"/>
>+                <enum name="GL_CON_3_ATI"/>
>+                <enum name="GL_CON_4_ATI"/>
>+                <enum name="GL_CON_5_ATI"/>
>+                <enum name="GL_CON_6_ATI"/>
>+                <enum name="GL_CON_7_ATI"/>
>+                <enum name="GL_CON_8_ATI"/>
>+                <enum name="GL_CON_9_ATI"/>
>+                <enum name="GL_CON_10_ATI"/>
>+                <enum name="GL_CON_11_ATI"/>
>+                <enum name="GL_CON_12_ATI"/>
>+                <enum name="GL_CON_13_ATI"/>
>+                <enum name="GL_CON_14_ATI"/>
>+                <enum name="GL_CON_15_ATI"/>
>+                <enum name="GL_CON_16_ATI"/>
>+                <enum name="GL_CON_17_ATI"/>
>+                <enum name="GL_CON_18_ATI"/>
>+                <enum name="GL_CON_19_ATI"/>
>+                <enum name="GL_CON_20_ATI"/>
>+                <enum name="GL_CON_21_ATI"/>
>+                <enum name="GL_CON_22_ATI"/>
>+                <enum name="GL_CON_23_ATI"/>
>+                <enum name="GL_CON_24_ATI"/>
>+                <enum name="GL_CON_25_ATI"/>
>+                <enum name="GL_CON_26_ATI"/>
>+                <enum name="GL_CON_27_ATI"/>
>+                <enum name="GL_CON_28_ATI"/>
>+                <enum name="GL_CON_29_ATI"/>
>+                <enum name="GL_CON_30_ATI"/>
>+                <enum name="GL_CON_31_ATI"/>
>+                <enum name="GL_MOV_ATI"/>
>+                <enum name="GL_ADD_ATI"/>
>+                <enum name="GL_MUL_ATI"/>
>+                <enum name="GL_SUB_ATI"/>
>+                <enum name="GL_DOT3_ATI"/>
>+                <enum name="GL_DOT4_ATI"/>
>+                <enum name="GL_MAD_ATI"/>
>+                <enum name="GL_LERP_ATI"/>
>+                <enum name="GL_CND_ATI"/>
>+                <enum name="GL_CND0_ATI"/>
>+                <enum name="GL_DOT2_ADD_ATI"/>
>+                <enum name="GL_SECONDARY_INTERPOLATOR_ATI"/>
>+                <enum name="GL_NUM_FRAGMENT_REGISTERS_ATI"/>
>+                <enum name="GL_NUM_FRAGMENT_CONSTANTS_ATI"/>
>+                <enum name="GL_NUM_PASSES_ATI"/>
>+                <enum name="GL_NUM_INSTRUCTIONS_PER_PASS_ATI"/>
>+                <enum name="GL_NUM_INSTRUCTIONS_TOTAL_ATI"/>
>+                <enum name="GL_NUM_INPUT_INTERPOLATOR_COMPONENTS_ATI"/>
>+                <enum name="GL_NUM_LOOPBACK_COMPONENTS_ATI"/>
>+                <enum name="GL_COLOR_ALPHA_PAIRING_ATI"/>
>+                <enum name="GL_SWIZZLE_STR_ATI"/>
>+                <enum name="GL_SWIZZLE_STQ_ATI"/>
>+                <enum name="GL_SWIZZLE_STR_DR_ATI"/>
>+                <enum name="GL_SWIZZLE_STQ_DQ_ATI"/>
>+                <enum name="GL_SWIZZLE_STRQ_ATI"/>
>+                <enum name="GL_SWIZZLE_STRQ_DQ_ATI"/>
>+                <enum name="GL_RED_BIT_ATI"/>
>+                <enum name="GL_GREEN_BIT_ATI"/>
>+                <enum name="GL_BLUE_BIT_ATI"/>
>+                <enum name="GL_2X_BIT_ATI"/>
>+                <enum name="GL_4X_BIT_ATI"/>
>+                <enum name="GL_8X_BIT_ATI"/>
>+                <enum name="GL_HALF_BIT_ATI"/>
>+                <enum name="GL_QUARTER_BIT_ATI"/>
>+                <enum name="GL_EIGHTH_BIT_ATI"/>
>+                <enum name="GL_SATURATE_BIT_ATI"/>
>+                <enum name="GL_COMP_BIT_ATI"/>
>+                <enum name="GL_NEGATE_BIT_ATI"/>
>+                <enum name="GL_BIAS_BIT_ATI"/>
>+                <command name="glGenFragmentShadersATI"/>
>+                <command name="glBindFragmentShaderATI"/>
>+                <command name="glDeleteFragmentShaderATI"/>
>+                <command name="glBeginFragmentShaderATI"/>
>+                <command name="glEndFragmentShaderATI"/>
>+                <command name="glPassTexCoordATI"/>
>+                <command name="glSampleMapATI"/>
>+                <command name="glColorFragmentOp1ATI"/>
>+                <command name="glColorFragmentOp2ATI"/>
>+                <command name="glColorFragmentOp3ATI"/>
>+                <command name="glAlphaFragmentOp1ATI"/>
>+                <command name="glAlphaFragmentOp2ATI"/>
>+                <command name="glAlphaFragmentOp3ATI"/>
>+                <command name="glSetFragmentShaderConstantATI"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_ATI_map_object_buffer" supported="gl">
>+            <require>
>+                <command name="glMapObjectBufferATI"/>
>+                <command name="glUnmapObjectBufferATI"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_ATI_meminfo" supported="gl">
>+            <require>
>+                <enum name="GL_VBO_FREE_MEMORY_ATI"/>
>+                <enum name="GL_TEXTURE_FREE_MEMORY_ATI"/>
>+                <enum name="GL_RENDERBUFFER_FREE_MEMORY_ATI"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_ATI_pixel_format_float" supported="gl" comment="WGL extension defining some associated GL enums. ATI does not export this extension.">
>+            <require>
>+                <enum name="GL_RGBA_FLOAT_MODE_ATI"/>
>+                <enum name="GL_COLOR_CLEAR_UNCLAMPED_VALUE_ATI"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_ATI_pn_triangles" supported="gl">
>+            <require>
>+                <enum name="GL_PN_TRIANGLES_ATI"/>
>+                <enum name="GL_MAX_PN_TRIANGLES_TESSELATION_LEVEL_ATI"/>
>+                <enum name="GL_PN_TRIANGLES_POINT_MODE_ATI"/>
>+                <enum name="GL_PN_TRIANGLES_NORMAL_MODE_ATI"/>
>+                <enum name="GL_PN_TRIANGLES_TESSELATION_LEVEL_ATI"/>
>+                <enum name="GL_PN_TRIANGLES_POINT_MODE_LINEAR_ATI"/>
>+                <enum name="GL_PN_TRIANGLES_POINT_MODE_CUBIC_ATI"/>
>+                <enum name="GL_PN_TRIANGLES_NORMAL_MODE_LINEAR_ATI"/>
>+                <enum name="GL_PN_TRIANGLES_NORMAL_MODE_QUADRATIC_ATI"/>
>+                <command name="glPNTrianglesiATI"/>
>+                <command name="glPNTrianglesfATI"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_ATI_separate_stencil" supported="gl">
>+            <require>
>+                <enum name="GL_STENCIL_BACK_FUNC_ATI"/>
>+                <enum name="GL_STENCIL_BACK_FAIL_ATI"/>
>+                <enum name="GL_STENCIL_BACK_PASS_DEPTH_FAIL_ATI"/>
>+                <enum name="GL_STENCIL_BACK_PASS_DEPTH_PASS_ATI"/>
>+                <command name="glStencilOpSeparateATI"/>
>+                <command name="glStencilFuncSeparateATI"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_ATI_text_fragment_shader" supported="gl">
>+            <require>
>+                <enum name="GL_TEXT_FRAGMENT_SHADER_ATI"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_ATI_texture_env_combine3" supported="gl">
>+            <require>
>+                <enum name="GL_MODULATE_ADD_ATI"/>
>+                <enum name="GL_MODULATE_SIGNED_ADD_ATI"/>
>+                <enum name="GL_MODULATE_SUBTRACT_ATI"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_ATI_texture_float" supported="gl">
>+            <require>
>+                <enum name="GL_RGBA_FLOAT32_ATI"/>
>+                <enum name="GL_RGB_FLOAT32_ATI"/>
>+                <enum name="GL_ALPHA_FLOAT32_ATI"/>
>+                <enum name="GL_INTENSITY_FLOAT32_ATI"/>
>+                <enum name="GL_LUMINANCE_FLOAT32_ATI"/>
>+                <enum name="GL_LUMINANCE_ALPHA_FLOAT32_ATI"/>
>+                <enum name="GL_RGBA_FLOAT16_ATI"/>
>+                <enum name="GL_RGB_FLOAT16_ATI"/>
>+                <enum name="GL_ALPHA_FLOAT16_ATI"/>
>+                <enum name="GL_INTENSITY_FLOAT16_ATI"/>
>+                <enum name="GL_LUMINANCE_FLOAT16_ATI"/>
>+                <enum name="GL_LUMINANCE_ALPHA_FLOAT16_ATI"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_ATI_texture_mirror_once" supported="gl">
>+            <require>
>+                <enum name="GL_MIRROR_CLAMP_ATI"/>
>+                <enum name="GL_MIRROR_CLAMP_TO_EDGE_ATI"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_ATI_vertex_array_object" supported="gl">
>+            <require>
>+                <enum name="GL_STATIC_ATI"/>
>+                <enum name="GL_DYNAMIC_ATI"/>
>+                <enum name="GL_PRESERVE_ATI"/>
>+                <enum name="GL_DISCARD_ATI"/>
>+                <enum name="GL_OBJECT_BUFFER_SIZE_ATI"/>
>+                <enum name="GL_OBJECT_BUFFER_USAGE_ATI"/>
>+                <enum name="GL_ARRAY_OBJECT_BUFFER_ATI"/>
>+                <enum name="GL_ARRAY_OBJECT_OFFSET_ATI"/>
>+                <command name="glNewObjectBufferATI"/>
>+                <command name="glIsObjectBufferATI"/>
>+                <command name="glUpdateObjectBufferATI"/>
>+                <command name="glGetObjectBufferfvATI"/>
>+                <command name="glGetObjectBufferivATI"/>
>+                <command name="glFreeObjectBufferATI"/>
>+                <command name="glArrayObjectATI"/>
>+                <command name="glGetArrayObjectfvATI"/>
>+                <command name="glGetArrayObjectivATI"/>
>+                <command name="glVariantArrayObjectATI"/>
>+                <command name="glGetVariantArrayObjectfvATI"/>
>+                <command name="glGetVariantArrayObjectivATI"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_ATI_vertex_attrib_array_object" supported="gl">
>+            <require>
>+                <command name="glVertexAttribArrayObjectATI"/>
>+                <command name="glGetVertexAttribArrayObjectfvATI"/>
>+                <command name="glGetVertexAttribArrayObjectivATI"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_ATI_vertex_streams" supported="gl">
>+            <require>
>+                <enum name="GL_MAX_VERTEX_STREAMS_ATI"/>
>+                <enum name="GL_VERTEX_STREAM0_ATI"/>
>+                <enum name="GL_VERTEX_STREAM1_ATI"/>
>+                <enum name="GL_VERTEX_STREAM2_ATI"/>
>+                <enum name="GL_VERTEX_STREAM3_ATI"/>
>+                <enum name="GL_VERTEX_STREAM4_ATI"/>
>+                <enum name="GL_VERTEX_STREAM5_ATI"/>
>+                <enum name="GL_VERTEX_STREAM6_ATI"/>
>+                <enum name="GL_VERTEX_STREAM7_ATI"/>
>+                <enum name="GL_VERTEX_SOURCE_ATI"/>
>+                <command name="glVertexStream1sATI"/>
>+                <command name="glVertexStream1svATI"/>
>+                <command name="glVertexStream1iATI"/>
>+                <command name="glVertexStream1ivATI"/>
>+                <command name="glVertexStream1fATI"/>
>+                <command name="glVertexStream1fvATI"/>
>+                <command name="glVertexStream1dATI"/>
>+                <command name="glVertexStream1dvATI"/>
>+                <command name="glVertexStream2sATI"/>
>+                <command name="glVertexStream2svATI"/>
>+                <command name="glVertexStream2iATI"/>
>+                <command name="glVertexStream2ivATI"/>
>+                <command name="glVertexStream2fATI"/>
>+                <command name="glVertexStream2fvATI"/>
>+                <command name="glVertexStream2dATI"/>
>+                <command name="glVertexStream2dvATI"/>
>+                <command name="glVertexStream3sATI"/>
>+                <command name="glVertexStream3svATI"/>
>+                <command name="glVertexStream3iATI"/>
>+                <command name="glVertexStream3ivATI"/>
>+                <command name="glVertexStream3fATI"/>
>+                <command name="glVertexStream3fvATI"/>
>+                <command name="glVertexStream3dATI"/>
>+                <command name="glVertexStream3dvATI"/>
>+                <command name="glVertexStream4sATI"/>
>+                <command name="glVertexStream4svATI"/>
>+                <command name="glVertexStream4iATI"/>
>+                <command name="glVertexStream4ivATI"/>
>+                <command name="glVertexStream4fATI"/>
>+                <command name="glVertexStream4fvATI"/>
>+                <command name="glVertexStream4dATI"/>
>+                <command name="glVertexStream4dvATI"/>
>+                <command name="glNormalStream3bATI"/>
>+                <command name="glNormalStream3bvATI"/>
>+                <command name="glNormalStream3sATI"/>
>+                <command name="glNormalStream3svATI"/>
>+                <command name="glNormalStream3iATI"/>
>+                <command name="glNormalStream3ivATI"/>
>+                <command name="glNormalStream3fATI"/>
>+                <command name="glNormalStream3fvATI"/>
>+                <command name="glNormalStream3dATI"/>
>+                <command name="glNormalStream3dvATI"/>
>+                <command name="glClientActiveVertexStreamATI"/>
>+                <command name="glVertexBlendEnviATI"/>
>+                <command name="glVertexBlendEnvfATI"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_DMP_program_binary" supported="gles2">
>+            <require>
>+                <enum name="GL_SMAPHS30_PROGRAM_BINARY_DMP"/>
>+                <enum name="GL_SMAPHS_PROGRAM_BINARY_DMP"/>
>+                <enum name="GL_DMP_PROGRAM_BINARY_DMP"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_DMP_shader_binary" supported="gles2">
>+            <require>
>+                <enum name="GL_SHADER_BINARY_DMP"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_EXT_422_pixels" supported="gl">
>+            <require>
>+                <enum name="GL_422_EXT"/>
>+                <enum name="GL_422_REV_EXT"/>
>+                <enum name="GL_422_AVERAGE_EXT"/>
>+                <enum name="GL_422_REV_AVERAGE_EXT"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_EXT_EGL_image_array" supported="gles2">
>+        </extension>
>+        <extension name="GL_EXT_EGL_image_storage" supported="gl|glcore|gles2">
>+            <require>
>+                <type name="GLeglImageOES"/>
>+                <command name="glEGLImageTargetTexStorageEXT"/>
>+            </require>
>+            <require comment="Supported only if GL_EXT_direct_state_access, ARB_direct_state_access, or OpenGL 4.5 are supported">
>+                <command name="glEGLImageTargetTextureStorageEXT"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_EXT_YUV_target" supported="gles2">
>+            <require>
>+                <enum name="GL_SAMPLER_EXTERNAL_2D_Y2Y_EXT"/>
>+                <enum name="GL_TEXTURE_EXTERNAL_OES"/>
>+                <enum name="GL_TEXTURE_BINDING_EXTERNAL_OES"/>
>+                <enum name="GL_REQUIRED_TEXTURE_IMAGE_UNITS_OES"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_EXT_abgr" supported="gl">
>+            <require>
>+                <enum name="GL_ABGR_EXT"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_EXT_base_instance" supported="gles2">
>+            <require>
>+                <command name="glDrawArraysInstancedBaseInstanceEXT"/>
>+                <command name="glDrawElementsInstancedBaseInstanceEXT"/>
>+                <command name="glDrawElementsInstancedBaseVertexBaseInstanceEXT"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_EXT_bgra" supported="gl">
>+            <require>
>+                <enum name="GL_BGR_EXT"/>
>+                <enum name="GL_BGRA_EXT"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_EXT_bindable_uniform" supported="gl">
>+            <require>
>+                <enum name="GL_MAX_VERTEX_BINDABLE_UNIFORMS_EXT"/>
>+                <enum name="GL_MAX_FRAGMENT_BINDABLE_UNIFORMS_EXT"/>
>+                <enum name="GL_MAX_GEOMETRY_BINDABLE_UNIFORMS_EXT"/>
>+                <enum name="GL_MAX_BINDABLE_UNIFORM_SIZE_EXT"/>
>+                <enum name="GL_UNIFORM_BUFFER_EXT"/>
>+                <enum name="GL_UNIFORM_BUFFER_BINDING_EXT"/>
>+                <command name="glUniformBufferEXT"/>
>+                <command name="glGetUniformBufferSizeEXT"/>
>+                <command name="glGetUniformOffsetEXT"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_EXT_blend_color" supported="gl">
>+            <require>
>+                <enum name="GL_CONSTANT_COLOR_EXT"/>
>+                <enum name="GL_ONE_MINUS_CONSTANT_COLOR_EXT"/>
>+                <enum name="GL_CONSTANT_ALPHA_EXT"/>
>+                <enum name="GL_ONE_MINUS_CONSTANT_ALPHA_EXT"/>
>+                <enum name="GL_BLEND_COLOR_EXT"/>
>+                <command name="glBlendColorEXT"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_EXT_blend_equation_separate" supported="gl">
>+            <require>
>+                <enum name="GL_BLEND_EQUATION_RGB_EXT"/>
>+                <enum name="GL_BLEND_EQUATION_ALPHA_EXT"/>
>+                <command name="glBlendEquationSeparateEXT"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_EXT_blend_func_extended" supported="gles2">
>+            <require>
>+                <enum name="GL_SRC1_COLOR_EXT"/>
>+                <enum name="GL_SRC1_ALPHA_EXT"/>
>+                <enum name="GL_ONE_MINUS_SRC1_COLOR_EXT"/>
>+                <enum name="GL_ONE_MINUS_SRC1_ALPHA_EXT"/>
>+                <enum name="GL_SRC_ALPHA_SATURATE_EXT"/>
>+                <enum name="GL_LOCATION_INDEX_EXT"/>
>+                <enum name="GL_MAX_DUAL_SOURCE_DRAW_BUFFERS_EXT"/>
>+                <command name="glBindFragDataLocationIndexedEXT"/>
>+                <command name="glBindFragDataLocationEXT"/>
>+                <command name="glGetProgramResourceLocationIndexEXT"/>
>+                <command name="glGetFragDataIndexEXT"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_EXT_blend_func_separate" supported="gl">
>+            <require>
>+                <enum name="GL_BLEND_DST_RGB_EXT"/>
>+                <enum name="GL_BLEND_SRC_RGB_EXT"/>
>+                <enum name="GL_BLEND_DST_ALPHA_EXT"/>
>+                <enum name="GL_BLEND_SRC_ALPHA_EXT"/>
>+                <command name="glBlendFuncSeparateEXT"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_EXT_blend_logic_op" supported="gl"/>
>+        <extension name="GL_EXT_blend_minmax" supported="gl|gles1|gles2">
>+            <require>
>+                <enum name="GL_MIN_EXT"/>
>+                <enum name="GL_MAX_EXT"/>
>+            </require>
>+            <require api="gl">
>+                <enum name="GL_FUNC_ADD_EXT"/>
>+                <enum name="GL_BLEND_EQUATION_EXT"/>
>+                <command name="glBlendEquationEXT"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_EXT_blend_subtract" supported="gl">
>+            <require>
>+                <enum name="GL_FUNC_SUBTRACT_EXT"/>
>+                <enum name="GL_FUNC_REVERSE_SUBTRACT_EXT"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_EXT_buffer_storage" supported="gles2">
>+            <require>
>+                <enum name="GL_MAP_READ_BIT"/>
>+                <enum name="GL_MAP_WRITE_BIT"/>
>+                <enum name="GL_MAP_PERSISTENT_BIT_EXT"/>
>+                <enum name="GL_MAP_COHERENT_BIT_EXT"/>
>+                <enum name="GL_DYNAMIC_STORAGE_BIT_EXT"/>
>+                <enum name="GL_CLIENT_STORAGE_BIT_EXT"/>
>+                <enum name="GL_CLIENT_MAPPED_BUFFER_BARRIER_BIT_EXT"/>
>+                <enum name="GL_BUFFER_IMMUTABLE_STORAGE_EXT"/>
>+                <enum name="GL_BUFFER_STORAGE_FLAGS_EXT"/>
>+                <command name="glBufferStorageEXT"/>
>+                
>+            </require>
>+        </extension>
>+        <extension name="GL_EXT_clear_texture" supported="gles2">
>+            <require>
>+                <command name="glClearTexImageEXT"/>
>+                <command name="glClearTexSubImageEXT"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_EXT_clip_control" supported="gles2">
>+            <require comment="Port of GL_ARB_clip_control">
>+                <command name="glClipControlEXT"/>
>+                <enum name="GL_LOWER_LEFT_EXT"/>
>+                <enum name="GL_UPPER_LEFT_EXT"/>
>+                <enum name="GL_NEGATIVE_ONE_TO_ONE_EXT"/>
>+                <enum name="GL_ZERO_TO_ONE_EXT"/>
>+                <enum name="GL_CLIP_ORIGIN_EXT"/>
>+                <enum name="GL_CLIP_DEPTH_MODE_EXT"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_EXT_clip_cull_distance" supported="gles2">
>+            <require>
>+                <enum name="GL_MAX_CLIP_DISTANCES_EXT"/>
>+                <enum name="GL_MAX_CULL_DISTANCES_EXT"/>
>+                <enum name="GL_MAX_COMBINED_CLIP_AND_CULL_DISTANCES_EXT"/>
>+                <enum name="GL_CLIP_DISTANCE0_EXT"/>
>+                <enum name="GL_CLIP_DISTANCE1_EXT"/>
>+                <enum name="GL_CLIP_DISTANCE2_EXT"/>
>+                <enum name="GL_CLIP_DISTANCE3_EXT"/>
>+                <enum name="GL_CLIP_DISTANCE4_EXT"/>
>+                <enum name="GL_CLIP_DISTANCE5_EXT"/>
>+                <enum name="GL_CLIP_DISTANCE6_EXT"/>
>+                <enum name="GL_CLIP_DISTANCE7_EXT"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_EXT_clip_volume_hint" supported="gl">
>+            <require>
>+                <enum name="GL_CLIP_VOLUME_CLIPPING_HINT_EXT"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_EXT_cmyka" supported="gl">
>+            <require>
>+                <enum name="GL_CMYK_EXT"/>
>+                <enum name="GL_CMYKA_EXT"/>
>+                <enum name="GL_PACK_CMYK_HINT_EXT"/>
>+                <enum name="GL_UNPACK_CMYK_HINT_EXT"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_EXT_color_buffer_float" supported="gles2"/>
>+        <extension name="GL_EXT_color_buffer_half_float" supported="gles2">
>+            <require>
>+                <enum name="GL_RGBA16F_EXT"/>
>+                <enum name="GL_RGB16F_EXT"/>
>+                <enum name="GL_RG16F_EXT"/>
>+                <enum name="GL_R16F_EXT"/>
>+                <enum name="GL_FRAMEBUFFER_ATTACHMENT_COMPONENT_TYPE_EXT"/>
>+                <enum name="GL_UNSIGNED_NORMALIZED_EXT"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_EXT_color_subtable" supported="gl">
>+            <require>
>+                <command name="glColorSubTableEXT"/>
>+                <command name="glCopyColorSubTableEXT"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_EXT_compiled_vertex_array" supported="gl">
>+            <require>
>+                <enum name="GL_ARRAY_ELEMENT_LOCK_FIRST_EXT"/>
>+                <enum name="GL_ARRAY_ELEMENT_LOCK_COUNT_EXT"/>
>+                <command name="glLockArraysEXT"/>
>+                <command name="glUnlockArraysEXT"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_EXT_conservative_depth" supported="gles2"/>
>+        <extension name="GL_EXT_convolution" supported="gl">
>+            <require>
>+                <enum name="GL_CONVOLUTION_1D_EXT"/>
>+                <enum name="GL_CONVOLUTION_2D_EXT"/>
>+                <enum name="GL_SEPARABLE_2D_EXT"/>
>+                <enum name="GL_CONVOLUTION_BORDER_MODE_EXT"/>
>+                <enum name="GL_CONVOLUTION_FILTER_SCALE_EXT"/>
>+                <enum name="GL_CONVOLUTION_FILTER_BIAS_EXT"/>
>+                <enum name="GL_REDUCE_EXT"/>
>+                <enum name="GL_CONVOLUTION_FORMAT_EXT"/>
>+                <enum name="GL_CONVOLUTION_WIDTH_EXT"/>
>+                <enum name="GL_CONVOLUTION_HEIGHT_EXT"/>
>+                <enum name="GL_MAX_CONVOLUTION_WIDTH_EXT"/>
>+                <enum name="GL_MAX_CONVOLUTION_HEIGHT_EXT"/>
>+                <enum name="GL_POST_CONVOLUTION_RED_SCALE_EXT"/>
>+                <enum name="GL_POST_CONVOLUTION_GREEN_SCALE_EXT"/>
>+                <enum name="GL_POST_CONVOLUTION_BLUE_SCALE_EXT"/>
>+                <enum name="GL_POST_CONVOLUTION_ALPHA_SCALE_EXT"/>
>+                <enum name="GL_POST_CONVOLUTION_RED_BIAS_EXT"/>
>+                <enum name="GL_POST_CONVOLUTION_GREEN_BIAS_EXT"/>
>+                <enum name="GL_POST_CONVOLUTION_BLUE_BIAS_EXT"/>
>+                <enum name="GL_POST_CONVOLUTION_ALPHA_BIAS_EXT"/>
>+                <command name="glConvolutionFilter1DEXT"/>
>+                <command name="glConvolutionFilter2DEXT"/>
>+                <command name="glConvolutionParameterfEXT"/>
>+                <command name="glConvolutionParameterfvEXT"/>
>+                <command name="glConvolutionParameteriEXT"/>
>+                <command name="glConvolutionParameterivEXT"/>
>+                <command name="glCopyConvolutionFilter1DEXT"/>
>+                <command name="glCopyConvolutionFilter2DEXT"/>
>+                <command name="glGetConvolutionFilterEXT"/>
>+                <command name="glGetConvolutionParameterfvEXT"/>
>+                <command name="glGetConvolutionParameterivEXT"/>
>+                <command name="glGetSeparableFilterEXT"/>
>+                <command name="glSeparableFilter2DEXT"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_EXT_coordinate_frame" supported="gl">
>+            <require>
>+                <enum name="GL_TANGENT_ARRAY_EXT"/>
>+                <enum name="GL_BINORMAL_ARRAY_EXT"/>
>+                <enum name="GL_CURRENT_TANGENT_EXT"/>
>+                <enum name="GL_CURRENT_BINORMAL_EXT"/>
>+                <enum name="GL_TANGENT_ARRAY_TYPE_EXT"/>
>+                <enum name="GL_TANGENT_ARRAY_STRIDE_EXT"/>
>+                <enum name="GL_BINORMAL_ARRAY_TYPE_EXT"/>
>+                <enum name="GL_BINORMAL_ARRAY_STRIDE_EXT"/>
>+                <enum name="GL_TANGENT_ARRAY_POINTER_EXT"/>
>+                <enum name="GL_BINORMAL_ARRAY_POINTER_EXT"/>
>+                <enum name="GL_MAP1_TANGENT_EXT"/>
>+                <enum name="GL_MAP2_TANGENT_EXT"/>
>+                <enum name="GL_MAP1_BINORMAL_EXT"/>
>+                <enum name="GL_MAP2_BINORMAL_EXT"/>
>+                <command name="glTangent3bEXT"/>
>+                <command name="glTangent3bvEXT"/>
>+                <command name="glTangent3dEXT"/>
>+                <command name="glTangent3dvEXT"/>
>+                <command name="glTangent3fEXT"/>
>+                <command name="glTangent3fvEXT"/>
>+                <command name="glTangent3iEXT"/>
>+                <command name="glTangent3ivEXT"/>
>+                <command name="glTangent3sEXT"/>
>+                <command name="glTangent3svEXT"/>
>+                <command name="glBinormal3bEXT"/>
>+                <command name="glBinormal3bvEXT"/>
>+                <command name="glBinormal3dEXT"/>
>+                <command name="glBinormal3dvEXT"/>
>+                <command name="glBinormal3fEXT"/>
>+                <command name="glBinormal3fvEXT"/>
>+                <command name="glBinormal3iEXT"/>
>+                <command name="glBinormal3ivEXT"/>
>+                <command name="glBinormal3sEXT"/>
>+                <command name="glBinormal3svEXT"/>
>+                <command name="glTangentPointerEXT"/>
>+                <command name="glBinormalPointerEXT"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_EXT_copy_image" supported="gles2">
>+            <require>
>+                <command name="glCopyImageSubDataEXT"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_EXT_copy_texture" supported="gl">
>+            <require>
>+                <command name="glCopyTexImage1DEXT"/>
>+                <command name="glCopyTexImage2DEXT"/>
>+                <command name="glCopyTexSubImage1DEXT"/>
>+                <command name="glCopyTexSubImage2DEXT"/>
>+                <command name="glCopyTexSubImage3DEXT"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_EXT_cull_vertex" supported="gl">
>+            <require>
>+                <enum name="GL_CULL_VERTEX_EXT"/>
>+                <enum name="GL_CULL_VERTEX_EYE_POSITION_EXT"/>
>+                <enum name="GL_CULL_VERTEX_OBJECT_POSITION_EXT"/>
>+                <command name="glCullParameterdvEXT"/>
>+                <command name="glCullParameterfvEXT"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_EXT_debug_label" supported="gl|glcore|gles2">
>+            <require>
>+                <enum name="GL_PROGRAM_PIPELINE_OBJECT_EXT"/>
>+                <enum name="GL_PROGRAM_OBJECT_EXT"/>
>+                <enum name="GL_SHADER_OBJECT_EXT"/>
>+                <enum name="GL_BUFFER_OBJECT_EXT"/>
>+                <enum name="GL_QUERY_OBJECT_EXT"/>
>+                <enum name="GL_VERTEX_ARRAY_OBJECT_EXT"/>
>+                <command name="glLabelObjectEXT"/>
>+                <command name="glGetObjectLabelEXT"/>
>+            </require>
>+            <require comment="Depends on OpenGL ES 3.0">
>+                <enum name="GL_SAMPLER"/>
>+                <enum name="GL_TRANSFORM_FEEDBACK"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_EXT_debug_marker" supported="gl|glcore|gles1|gles2">
>+            <require>
>+                <command name="glInsertEventMarkerEXT"/>
>+                <command name="glPushGroupMarkerEXT"/>
>+                <command name="glPopGroupMarkerEXT"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_EXT_depth_bounds_test" supported="gl">
>+            <require>
>+                <enum name="GL_DEPTH_BOUNDS_TEST_EXT"/>
>+                <enum name="GL_DEPTH_BOUNDS_EXT"/>
>+                <command name="glDepthBoundsEXT"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_EXT_direct_state_access" supported="gl|glcore" comment="DSA extension doesn't identify which interfaces are core profile and keeps getting expanded. This is in sync with revision 34, 2010/09/07">
>+            <require>
>+                <enum name="GL_PROGRAM_MATRIX_EXT"/>
>+                <enum name="GL_TRANSPOSE_PROGRAM_MATRIX_EXT"/>
>+                <enum name="GL_PROGRAM_MATRIX_STACK_DEPTH_EXT"/>
>+            </require>
>+            <require comment="OpenGL 1.0: New matrix commands">
>+                <command name="glMatrixLoadfEXT"/>
>+                <command name="glMatrixLoaddEXT"/>
>+                <command name="glMatrixMultfEXT"/>
>+                <command name="glMatrixMultdEXT"/>
>+                <command name="glMatrixLoadIdentityEXT"/>
>+                <command name="glMatrixRotatefEXT"/>
>+                <command name="glMatrixRotatedEXT"/>
>+                <command name="glMatrixScalefEXT"/>
>+                <command name="glMatrixScaledEXT"/>
>+                <command name="glMatrixTranslatefEXT"/>
>+                <command name="glMatrixTranslatedEXT"/>
>+                <command name="glMatrixFrustumEXT"/>
>+                <command name="glMatrixOrthoEXT"/>
>+                <command name="glMatrixPopEXT"/>
>+                <command name="glMatrixPushEXT"/>
>+            </require>
>+            <require comment="OpenGL 1.1: New client commands">
>+                <command name="glClientAttribDefaultEXT"/>
>+                <command name="glPushClientAttribDefaultEXT"/>
>+            </require>
>+            <require comment="OpenGL 1.1: New texture object commands">
>+                <command name="glTextureParameterfEXT"/>
>+                <command name="glTextureParameterfvEXT"/>
>+                <command name="glTextureParameteriEXT"/>
>+                <command name="glTextureParameterivEXT"/>
>+                <command name="glTextureImage1DEXT"/>
>+                <command name="glTextureImage2DEXT"/>
>+                <command name="glTextureSubImage1DEXT"/>
>+                <command name="glTextureSubImage2DEXT"/>
>+                <command name="glCopyTextureImage1DEXT"/>
>+                <command name="glCopyTextureImage2DEXT"/>
>+                <command name="glCopyTextureSubImage1DEXT"/>
>+                <command name="glCopyTextureSubImage2DEXT"/>
>+                <command name="glGetTextureImageEXT"/>
>+                <command name="glGetTextureParameterfvEXT"/>
>+                <command name="glGetTextureParameterivEXT"/>
>+                <command name="glGetTextureLevelParameterfvEXT"/>
>+                <command name="glGetTextureLevelParameterivEXT"/>
>+            </require>
>+            <require comment="OpenGL 1.2: New 3D texture object commands">
>+                <command name="glTextureImage3DEXT"/>
>+                <command name="glTextureSubImage3DEXT"/>
>+                <command name="glCopyTextureSubImage3DEXT"/>
>+            </require>
>+            <require comment="OpenGL 1.2.1: New multitexture commands">
>+                <command name="glBindMultiTextureEXT"/>
>+                <command name="glMultiTexCoordPointerEXT"/>
>+                <command name="glMultiTexEnvfEXT"/>
>+                <command name="glMultiTexEnvfvEXT"/>
>+                <command name="glMultiTexEnviEXT"/>
>+                <command name="glMultiTexEnvivEXT"/>
>+                <command name="glMultiTexGendEXT"/>
>+                <command name="glMultiTexGendvEXT"/>
>+                <command name="glMultiTexGenfEXT"/>
>+                <command name="glMultiTexGenfvEXT"/>
>+                <command name="glMultiTexGeniEXT"/>
>+                <command name="glMultiTexGenivEXT"/>
>+                <command name="glGetMultiTexEnvfvEXT"/>
>+                <command name="glGetMultiTexEnvivEXT"/>
>+                <command name="glGetMultiTexGendvEXT"/>
>+                <command name="glGetMultiTexGenfvEXT"/>
>+                <command name="glGetMultiTexGenivEXT"/>
>+                <command name="glMultiTexParameteriEXT"/>
>+                <command name="glMultiTexParameterivEXT"/>
>+                <command name="glMultiTexParameterfEXT"/>
>+                <command name="glMultiTexParameterfvEXT"/>
>+                <command name="glMultiTexImage1DEXT"/>
>+                <command name="glMultiTexImage2DEXT"/>
>+                <command name="glMultiTexSubImage1DEXT"/>
>+                <command name="glMultiTexSubImage2DEXT"/>
>+                <command name="glCopyMultiTexImage1DEXT"/>
>+                <command name="glCopyMultiTexImage2DEXT"/>
>+                <command name="glCopyMultiTexSubImage1DEXT"/>
>+                <command name="glCopyMultiTexSubImage2DEXT"/>
>+                <command name="glGetMultiTexImageEXT"/>
>+                <command name="glGetMultiTexParameterfvEXT"/>
>+                <command name="glGetMultiTexParameterivEXT"/>
>+                <command name="glGetMultiTexLevelParameterfvEXT"/>
>+                <command name="glGetMultiTexLevelParameterivEXT"/>
>+                <command name="glMultiTexImage3DEXT"/>
>+                <command name="glMultiTexSubImage3DEXT"/>
>+                <command name="glCopyMultiTexSubImage3DEXT"/>
>+            </require>
>+            <require comment="OpenGL 1.2.1: New indexed texture commands">
>+                <command name="glEnableClientStateIndexedEXT"/>
>+                <command name="glDisableClientStateIndexedEXT"/>
>+            </require>
>+            <require comment="OpenGL 1.2.1: New indexed generic queries">
>+                <command name="glGetFloatIndexedvEXT"/>
>+                <command name="glGetDoubleIndexedvEXT"/>
>+                <command name="glGetPointerIndexedvEXT"/>
>+            </require>
>+            <require comment="OpenGL 1.2.1: Extend EXT_draw_buffers2 commands">
>+                <command name="glEnableIndexedEXT"/>
>+                <command name="glDisableIndexedEXT"/>
>+                <command name="glIsEnabledIndexedEXT"/>
>+                <command name="glGetIntegerIndexedvEXT"/>
>+                <command name="glGetBooleanIndexedvEXT"/>
>+            </require>
>+            <require comment="OpenGL 1.3: New compressed texture object commands">
>+                <command name="glCompressedTextureImage3DEXT"/>
>+                <command name="glCompressedTextureImage2DEXT"/>
>+                <command name="glCompressedTextureImage1DEXT"/>
>+                <command name="glCompressedTextureSubImage3DEXT"/>
>+                <command name="glCompressedTextureSubImage2DEXT"/>
>+                <command name="glCompressedTextureSubImage1DEXT"/>
>+                <command name="glGetCompressedTextureImageEXT"/>
>+            </require>
>+            <require comment="OpenGL 1.3: New multitexture compressed texture commands">
>+                <command name="glCompressedMultiTexImage3DEXT"/>
>+                <command name="glCompressedMultiTexImage2DEXT"/>
>+                <command name="glCompressedMultiTexImage1DEXT"/>
>+                <command name="glCompressedMultiTexSubImage3DEXT"/>
>+                <command name="glCompressedMultiTexSubImage2DEXT"/>
>+                <command name="glCompressedMultiTexSubImage1DEXT"/>
>+                <command name="glGetCompressedMultiTexImageEXT"/>
>+            </require>
>+            <require comment="OpenGL 1.3: New transpose matrix commands">
>+                <command name="glMatrixLoadTransposefEXT"/>
>+                <command name="glMatrixLoadTransposedEXT"/>
>+                <command name="glMatrixMultTransposefEXT"/>
>+                <command name="glMatrixMultTransposedEXT"/>
>+            </require>
>+            <require comment="OpenGL 1.5: New buffer commands">
>+                <command name="glNamedBufferDataEXT"/>
>+                <command name="glNamedBufferSubDataEXT"/>
>+                <command name="glMapNamedBufferEXT"/>
>+                <command name="glUnmapNamedBufferEXT"/>
>+                <command name="glGetNamedBufferParameterivEXT"/>
>+                <command name="glGetNamedBufferPointervEXT"/>
>+                <command name="glGetNamedBufferSubDataEXT"/>
>+            </require>
>+            <require comment="OpenGL 2.0: New uniform commands">
>+                <command name="glProgramUniform1fEXT"/>
>+                <command name="glProgramUniform2fEXT"/>
>+                <command name="glProgramUniform3fEXT"/>
>+                <command name="glProgramUniform4fEXT"/>
>+                <command name="glProgramUniform1iEXT"/>
>+                <command name="glProgramUniform2iEXT"/>
>+                <command name="glProgramUniform3iEXT"/>
>+                <command name="glProgramUniform4iEXT"/>
>+                <command name="glProgramUniform1fvEXT"/>
>+                <command name="glProgramUniform2fvEXT"/>
>+                <command name="glProgramUniform3fvEXT"/>
>+                <command name="glProgramUniform4fvEXT"/>
>+                <command name="glProgramUniform1ivEXT"/>
>+                <command name="glProgramUniform2ivEXT"/>
>+                <command name="glProgramUniform3ivEXT"/>
>+                <command name="glProgramUniform4ivEXT"/>
>+                <command name="glProgramUniformMatrix2fvEXT"/>
>+                <command name="glProgramUniformMatrix3fvEXT"/>
>+                <command name="glProgramUniformMatrix4fvEXT"/>
>+            </require>
>+            <require comment="OpenGL 2.1: New uniform matrix commands">
>+                <command name="glProgramUniformMatrix2x3fvEXT"/>
>+                <command name="glProgramUniformMatrix3x2fvEXT"/>
>+                <command name="glProgramUniformMatrix2x4fvEXT"/>
>+                <command name="glProgramUniformMatrix4x2fvEXT"/>
>+                <command name="glProgramUniformMatrix3x4fvEXT"/>
>+                <command name="glProgramUniformMatrix4x3fvEXT"/>
>+            </require>
>+            <require comment="Extend EXT_texture_buffer_object commands">
>+                <command name="glTextureBufferEXT"/>
>+                <command name="glMultiTexBufferEXT"/>
>+            </require>
>+            <require comment="Extend EXT_texture_integer commands">
>+                <command name="glTextureParameterIivEXT"/>
>+                <command name="glTextureParameterIuivEXT"/>
>+                <command name="glGetTextureParameterIivEXT"/>
>+                <command name="glGetTextureParameterIuivEXT"/>
>+                <command name="glMultiTexParameterIivEXT"/>
>+                <command name="glMultiTexParameterIuivEXT"/>
>+                <command name="glGetMultiTexParameterIivEXT"/>
>+                <command name="glGetMultiTexParameterIuivEXT"/>
>+            </require>
>+            <require comment="Extend EXT_gpu_shader4 commands">
>+                <command name="glProgramUniform1uiEXT"/>
>+                <command name="glProgramUniform2uiEXT"/>
>+                <command name="glProgramUniform3uiEXT"/>
>+                <command name="glProgramUniform4uiEXT"/>
>+                <command name="glProgramUniform1uivEXT"/>
>+                <command name="glProgramUniform2uivEXT"/>
>+                <command name="glProgramUniform3uivEXT"/>
>+                <command name="glProgramUniform4uivEXT"/>
>+            </require>
>+            <require comment="Extend EXT_gpu_program_parameters commands">
>+                <command name="glNamedProgramLocalParameters4fvEXT"/>
>+            </require>
>+            <require comment="Extend NV_gpu_program4 commands">
>+                <command name="glNamedProgramLocalParameterI4iEXT"/>
>+                <command name="glNamedProgramLocalParameterI4ivEXT"/>
>+                <command name="glNamedProgramLocalParametersI4ivEXT"/>
>+                <command name="glNamedProgramLocalParameterI4uiEXT"/>
>+                <command name="glNamedProgramLocalParameterI4uivEXT"/>
>+                <command name="glNamedProgramLocalParametersI4uivEXT"/>
>+                <command name="glGetNamedProgramLocalParameterIivEXT"/>
>+                <command name="glGetNamedProgramLocalParameterIuivEXT"/>
>+            </require>
>+            <require comment="OpenGL 3.0: New indexed texture commands">
>+                <command name="glEnableClientStateiEXT"/>
>+                <command name="glDisableClientStateiEXT"/>
>+            </require>
>+            <require comment="OpenGL 3.0: New indexed generic queries">
>+                <command name="glGetFloati_vEXT"/>
>+                <command name="glGetDoublei_vEXT"/>
>+                <command name="glGetPointeri_vEXT"/>
>+            </require>
>+            <require comment="Extend GL_ARB_vertex_program commands">
>+                <command name="glNamedProgramStringEXT"/>
>+                <command name="glNamedProgramLocalParameter4dEXT"/>
>+                <command name="glNamedProgramLocalParameter4dvEXT"/>
>+                <command name="glNamedProgramLocalParameter4fEXT"/>
>+                <command name="glNamedProgramLocalParameter4fvEXT"/>
>+                <command name="glGetNamedProgramLocalParameterdvEXT"/>
>+                <command name="glGetNamedProgramLocalParameterfvEXT"/>
>+                <command name="glGetNamedProgramivEXT"/>
>+                <command name="glGetNamedProgramStringEXT"/>
>+            </require>
>+            <require comment="OpenGL 3.0: New renderbuffer commands">
>+                <command name="glNamedRenderbufferStorageEXT"/>
>+                <command name="glGetNamedRenderbufferParameterivEXT"/>
>+                <command name="glNamedRenderbufferStorageMultisampleEXT"/>
>+            </require>
>+            <require comment="Extend NV_framebuffer_multisample_coverage">
>+                <command name="glNamedRenderbufferStorageMultisampleCoverageEXT"/>
>+            </require>
>+            <require comment="OpenGL 3.0: New framebuffer commands">
>+                <command name="glCheckNamedFramebufferStatusEXT"/>
>+                <command name="glNamedFramebufferTexture1DEXT"/>
>+                <command name="glNamedFramebufferTexture2DEXT"/>
>+                <command name="glNamedFramebufferTexture3DEXT"/>
>+                <command name="glNamedFramebufferRenderbufferEXT"/>
>+                <command name="glGetNamedFramebufferAttachmentParameterivEXT"/>
>+            </require>
>+            <require comment="OpenGL 3.0: New texture commands">
>+                <command name="glGenerateTextureMipmapEXT"/>
>+                <command name="glGenerateMultiTexMipmapEXT"/>
>+            </require>
>+            <require comment="OpenGL 3.0: New framebuffer commands">
>+                <command name="glFramebufferDrawBufferEXT"/>
>+                <command name="glFramebufferDrawBuffersEXT"/>
>+                <command name="glFramebufferReadBufferEXT"/>
>+                <command name="glGetFramebufferParameterivEXT"/>
>+            </require>
>+            <require comment="OpenGL 3.0: New buffer data copy command">
>+                <command name="glNamedCopyBufferSubDataEXT"/>
>+            </require>
>+            <require comment="Extend EXT_geometry_shader4 or NV_gpu_program4">
>+                <command name="glNamedFramebufferTextureEXT"/>
>+                <command name="glNamedFramebufferTextureLayerEXT"/>
>+                <command name="glNamedFramebufferTextureFaceEXT"/>
>+            </require>
>+            <require comment="Extend NV_explicit_multisample">
>+                <command name="glTextureRenderbufferEXT"/>
>+                <command name="glMultiTexRenderbufferEXT"/>
>+            </require>
>+            <require comment="OpenGL 3.0: New vertex array specification commands for VAO">
>+                <command name="glVertexArrayVertexOffsetEXT"/>
>+                <command name="glVertexArrayColorOffsetEXT"/>
>+                <command name="glVertexArrayEdgeFlagOffsetEXT"/>
>+                <command name="glVertexArrayIndexOffsetEXT"/>
>+                <command name="glVertexArrayNormalOffsetEXT"/>
>+                <command name="glVertexArrayTexCoordOffsetEXT"/>
>+                <command name="glVertexArrayMultiTexCoordOffsetEXT"/>
>+                <command name="glVertexArrayFogCoordOffsetEXT"/>
>+                <command name="glVertexArraySecondaryColorOffsetEXT"/>
>+                <command name="glVertexArrayVertexAttribOffsetEXT"/>
>+                <command name="glVertexArrayVertexAttribIOffsetEXT"/>
>+            </require>
>+            <require comment="OpenGL 3.0: New vertex array enable commands for VAO">
>+                <command name="glEnableVertexArrayEXT"/>
>+                <command name="glDisableVertexArrayEXT"/>
>+            </require>
>+            <require comment="OpenGL 3.0: New vertex attrib array enable commands for VAO">
>+                <command name="glEnableVertexArrayAttribEXT"/>
>+                <command name="glDisableVertexArrayAttribEXT"/>
>+            </require>
>+            <require comment="OpenGL 3.0: New queries for VAO">
>+                <command name="glGetVertexArrayIntegervEXT"/>
>+                <command name="glGetVertexArrayPointervEXT"/>
>+                <command name="glGetVertexArrayIntegeri_vEXT"/>
>+                <command name="glGetVertexArrayPointeri_vEXT"/>
>+            </require>
>+            <require comment="OpenGL 3.0: New buffer commands">
>+                <command name="glMapNamedBufferRangeEXT"/>
>+                <command name="glFlushMappedNamedBufferRangeEXT"/>
>+            </require>
>+            <require comment="Extended by GL_ARB_buffer_storage">
>+                <command name="glNamedBufferStorageEXT"/>
>+            </require>
>+            <require comment="Extended by GL_ARB_clear_buffer_object">
>+                <command name="glClearNamedBufferDataEXT"/>
>+                <command name="glClearNamedBufferSubDataEXT"/>
>+            </require>
>+            <require comment="Extended by GL_ARB_framebuffer_no_attachments">
>+                <command name="glNamedFramebufferParameteriEXT"/>
>+                <command name="glGetNamedFramebufferParameterivEXT"/>
>+            </require>
>+            <require comment="Extended by GL_ARB_gpu_shader_fp64">
>+                <command name="glProgramUniform1dEXT"/>
>+                <command name="glProgramUniform2dEXT"/>
>+                <command name="glProgramUniform3dEXT"/>
>+                <command name="glProgramUniform4dEXT"/>
>+                <command name="glProgramUniform1dvEXT"/>
>+                <command name="glProgramUniform2dvEXT"/>
>+                <command name="glProgramUniform3dvEXT"/>
>+                <command name="glProgramUniform4dvEXT"/>
>+                <command name="glProgramUniformMatrix2dvEXT"/>
>+                <command name="glProgramUniformMatrix3dvEXT"/>
>+                <command name="glProgramUniformMatrix4dvEXT"/>
>+                <command name="glProgramUniformMatrix2x3dvEXT"/>
>+                <command name="glProgramUniformMatrix2x4dvEXT"/>
>+                <command name="glProgramUniformMatrix3x2dvEXT"/>
>+                <command name="glProgramUniformMatrix3x4dvEXT"/>
>+                <command name="glProgramUniformMatrix4x2dvEXT"/>
>+                <command name="glProgramUniformMatrix4x3dvEXT"/>
>+            </require>
>+            <require comment="Extended by GL_ARB_texture_buffer_range">
>+                <command name="glTextureBufferRangeEXT"/>
>+            </require>
>+            <require comment="Extended by GL_ARB_texture_storage">
>+                <command name="glTextureStorage1DEXT"/>
>+                <command name="glTextureStorage2DEXT"/>
>+                <command name="glTextureStorage3DEXT"/>
>+            </require>
>+            <require comment="Extended by GL_ARB_texture_storage_multisample">
>+                <command name="glTextureStorage2DMultisampleEXT"/>
>+                <command name="glTextureStorage3DMultisampleEXT"/>
>+            </require>
>+            <require comment="Extended by GL_ARB_vertex_attrib_binding">
>+                <command name="glVertexArrayBindVertexBufferEXT"/>
>+                <command name="glVertexArrayVertexAttribFormatEXT"/>
>+                <command name="glVertexArrayVertexAttribIFormatEXT"/>
>+                <command name="glVertexArrayVertexAttribLFormatEXT"/>
>+                <command name="glVertexArrayVertexAttribBindingEXT"/>
>+                <command name="glVertexArrayVertexBindingDivisorEXT"/>
>+            </require>
>+            <require comment="Extended by GL_EXT_vertex_attrib_64bit">
>+                <command name="glVertexArrayVertexAttribLOffsetEXT"/>
>+            </require>
>+            <require comment="Extended by GL_ARB_sparse_texture">
>+                <command name="glTexturePageCommitmentEXT"/>
>+            </require>
>+            <require comment="Extended by GL_ARB_instanced_arrays">
>+                <command name="glVertexArrayVertexAttribDivisorEXT"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_EXT_discard_framebuffer" supported="gles1|gles2">
>+            <require>
>+                <enum name="GL_COLOR_EXT"/>
>+                <enum name="GL_DEPTH_EXT"/>
>+                <enum name="GL_STENCIL_EXT"/>
>+                <command name="glDiscardFramebufferEXT"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_EXT_disjoint_timer_query" supported="gles2">
>+            <require>
>+                <enum name="GL_QUERY_COUNTER_BITS_EXT"/>
>+                <enum name="GL_CURRENT_QUERY_EXT"/>
>+                <enum name="GL_QUERY_RESULT_EXT"/>
>+                <enum name="GL_QUERY_RESULT_AVAILABLE_EXT"/>
>+                <enum name="GL_TIME_ELAPSED_EXT"/>
>+                <enum name="GL_TIMESTAMP_EXT"/>
>+                <enum name="GL_GPU_DISJOINT_EXT"/>
>+                <command name="glGenQueriesEXT"/>
>+                <command name="glDeleteQueriesEXT"/>
>+                <command name="glIsQueryEXT"/>
>+                <command name="glBeginQueryEXT"/>
>+                <command name="glEndQueryEXT"/>
>+                <command name="glQueryCounterEXT"/>
>+                <command name="glGetQueryivEXT"/>
>+                <command name="glGetQueryObjectivEXT"/>
>+                <command name="glGetQueryObjectuivEXT"/>
>+                <command name="glGetQueryObjecti64vEXT"/>
>+                <command name="glGetQueryObjectui64vEXT"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_EXT_draw_buffers" supported="gles2">
>+            <require>
>+                <enum name="GL_MAX_COLOR_ATTACHMENTS_EXT"/>
>+                <enum name="GL_MAX_DRAW_BUFFERS_EXT"/>
>+                <enum name="GL_DRAW_BUFFER0_EXT"/>
>+                <enum name="GL_DRAW_BUFFER1_EXT"/>
>+                <enum name="GL_DRAW_BUFFER2_EXT"/>
>+                <enum name="GL_DRAW_BUFFER3_EXT"/>
>+                <enum name="GL_DRAW_BUFFER4_EXT"/>
>+                <enum name="GL_DRAW_BUFFER5_EXT"/>
>+                <enum name="GL_DRAW_BUFFER6_EXT"/>
>+                <enum name="GL_DRAW_BUFFER7_EXT"/>
>+                <enum name="GL_DRAW_BUFFER8_EXT"/>
>+                <enum name="GL_DRAW_BUFFER9_EXT"/>
>+                <enum name="GL_DRAW_BUFFER10_EXT"/>
>+                <enum name="GL_DRAW_BUFFER11_EXT"/>
>+                <enum name="GL_DRAW_BUFFER12_EXT"/>
>+                <enum name="GL_DRAW_BUFFER13_EXT"/>
>+                <enum name="GL_DRAW_BUFFER14_EXT"/>
>+                <enum name="GL_DRAW_BUFFER15_EXT"/>
>+                <enum name="GL_COLOR_ATTACHMENT0_EXT"/>
>+                <enum name="GL_COLOR_ATTACHMENT1_EXT"/>
>+                <enum name="GL_COLOR_ATTACHMENT2_EXT"/>
>+                <enum name="GL_COLOR_ATTACHMENT3_EXT"/>
>+                <enum name="GL_COLOR_ATTACHMENT4_EXT"/>
>+                <enum name="GL_COLOR_ATTACHMENT5_EXT"/>
>+                <enum name="GL_COLOR_ATTACHMENT6_EXT"/>
>+                <enum name="GL_COLOR_ATTACHMENT7_EXT"/>
>+                <enum name="GL_COLOR_ATTACHMENT8_EXT"/>
>+                <enum name="GL_COLOR_ATTACHMENT9_EXT"/>
>+                <enum name="GL_COLOR_ATTACHMENT10_EXT"/>
>+                <enum name="GL_COLOR_ATTACHMENT11_EXT"/>
>+                <enum name="GL_COLOR_ATTACHMENT12_EXT"/>
>+                <enum name="GL_COLOR_ATTACHMENT13_EXT"/>
>+                <enum name="GL_COLOR_ATTACHMENT14_EXT"/>
>+                <enum name="GL_COLOR_ATTACHMENT15_EXT"/>
>+                <command name="glDrawBuffersEXT"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_EXT_draw_buffers2" supported="gl">
>+            <require>
>+                <command name="glColorMaskIndexedEXT"/>
>+                <command name="glGetBooleanIndexedvEXT"/>
>+                <command name="glGetIntegerIndexedvEXT"/>
>+                <command name="glEnableIndexedEXT"/>
>+                <command name="glDisableIndexedEXT"/>
>+                <command name="glIsEnabledIndexedEXT"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_EXT_draw_buffers_indexed" supported="gles2">
>+            <require>
>+                <enum name="GL_BLEND_EQUATION_RGB"/>
>+                <enum name="GL_BLEND_EQUATION_ALPHA"/>
>+                <enum name="GL_BLEND_SRC_RGB"/>
>+                <enum name="GL_BLEND_SRC_ALPHA"/>
>+                <enum name="GL_BLEND_DST_RGB"/>
>+                <enum name="GL_BLEND_DST_ALPHA"/>
>+                <enum name="GL_COLOR_WRITEMASK"/>
>+                <enum name="GL_BLEND"/>
>+                <enum name="GL_FUNC_ADD"/>
>+                <enum name="GL_FUNC_SUBTRACT"/>
>+                <enum name="GL_FUNC_REVERSE_SUBTRACT"/>
>+                <enum name="GL_MIN"/>
>+                <enum name="GL_MAX"/>
>+                <enum name="GL_ZERO"/>
>+                <enum name="GL_ONE"/>
>+                <enum name="GL_SRC_COLOR"/>
>+                <enum name="GL_ONE_MINUS_SRC_COLOR"/>
>+                <enum name="GL_DST_COLOR"/>
>+                <enum name="GL_ONE_MINUS_DST_COLOR"/>
>+                <enum name="GL_SRC_ALPHA"/>
>+                <enum name="GL_ONE_MINUS_SRC_ALPHA"/>
>+                <enum name="GL_DST_ALPHA"/>
>+                <enum name="GL_ONE_MINUS_DST_ALPHA"/>
>+                <enum name="GL_CONSTANT_COLOR"/>
>+                <enum name="GL_ONE_MINUS_CONSTANT_COLOR"/>
>+                <enum name="GL_CONSTANT_ALPHA"/>
>+                <enum name="GL_ONE_MINUS_CONSTANT_ALPHA"/>
>+                <enum name="GL_SRC_ALPHA_SATURATE"/>
>+                <command name="glEnableiEXT"/>
>+                <command name="glDisableiEXT"/>
>+                <command name="glBlendEquationiEXT"/>
>+                <command name="glBlendEquationSeparateiEXT"/>
>+                <command name="glBlendFunciEXT"/>
>+                <command name="glBlendFuncSeparateiEXT"/>
>+                <command name="glColorMaskiEXT"/>
>+                <command name="glIsEnablediEXT"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_EXT_draw_elements_base_vertex" supported="gles2">
>+            <require>
>+                <command name="glDrawElementsBaseVertexEXT"/>
>+                <command name="glDrawRangeElementsBaseVertexEXT" comment="Supported only if OpenGL ES 3.0 is supported"/>
>+                <command name="glDrawElementsInstancedBaseVertexEXT" comment="Supported only if OpenGL ES 3.0 is supported"/>
>+                <command name="glMultiDrawElementsBaseVertexEXT" comment="Supported only if GL_EXT_multi_draw_arrays is supported"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_EXT_draw_instanced" supported="gl|glcore|gles2">
>+            <require>
>+                <command name="glDrawArraysInstancedEXT"/>
>+                <command name="glDrawElementsInstancedEXT"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_EXT_draw_range_elements" supported="gl">
>+            <require>
>+                <enum name="GL_MAX_ELEMENTS_VERTICES_EXT"/>
>+                <enum name="GL_MAX_ELEMENTS_INDICES_EXT"/>
>+                <command name="glDrawRangeElementsEXT"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_EXT_draw_transform_feedback" supported="gles2">
>+            <require>
>+                <command name="glDrawTransformFeedbackEXT"/>
>+                <command name="glDrawTransformFeedbackInstancedEXT"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_EXT_external_buffer" supported="gl|gles2">
>+            <require>
>+                <command name="glBufferStorageExternalEXT"/>
>+                <command name="glNamedBufferStorageExternalEXT"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_EXT_float_blend" supported="gles2"/>
>+        <extension name="GL_EXT_fog_coord" supported="gl">
>+            <require>
>+                <enum name="GL_FOG_COORDINATE_SOURCE_EXT"/>
>+                <enum name="GL_FOG_COORDINATE_EXT"/>
>+                <enum name="GL_FRAGMENT_DEPTH_EXT"/>
>+                <enum name="GL_CURRENT_FOG_COORDINATE_EXT"/>
>+                <enum name="GL_FOG_COORDINATE_ARRAY_TYPE_EXT"/>
>+                <enum name="GL_FOG_COORDINATE_ARRAY_STRIDE_EXT"/>
>+                <enum name="GL_FOG_COORDINATE_ARRAY_POINTER_EXT"/>
>+                <enum name="GL_FOG_COORDINATE_ARRAY_EXT"/>
>+                <command name="glFogCoordfEXT"/>
>+                <command name="glFogCoordfvEXT"/>
>+                <command name="glFogCoorddEXT"/>
>+                <command name="glFogCoorddvEXT"/>
>+                <command name="glFogCoordPointerEXT"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_EXT_framebuffer_blit" supported="gl">
>+            <require>
>+                <enum name="GL_READ_FRAMEBUFFER_EXT"/>
>+                <enum name="GL_DRAW_FRAMEBUFFER_EXT"/>
>+                <enum name="GL_DRAW_FRAMEBUFFER_BINDING_EXT"/>
>+                <enum name="GL_READ_FRAMEBUFFER_BINDING_EXT"/>
>+                <command name="glBlitFramebufferEXT"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_EXT_framebuffer_multisample" supported="gl">
>+            <require>
>+                <enum name="GL_RENDERBUFFER_SAMPLES_EXT"/>
>+                <enum name="GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE_EXT"/>
>+                <enum name="GL_MAX_SAMPLES_EXT"/>
>+                <command name="glRenderbufferStorageMultisampleEXT"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_EXT_framebuffer_multisample_blit_scaled" supported="gl">
>+            <require>
>+                <enum name="GL_SCALED_RESOLVE_FASTEST_EXT"/>
>+                <enum name="GL_SCALED_RESOLVE_NICEST_EXT"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_EXT_framebuffer_object" supported="gl">
>+            <require>
>+                <enum name="GL_INVALID_FRAMEBUFFER_OPERATION_EXT"/>
>+                <enum name="GL_MAX_RENDERBUFFER_SIZE_EXT"/>
>+                <enum name="GL_FRAMEBUFFER_BINDING_EXT"/>
>+                <enum name="GL_RENDERBUFFER_BINDING_EXT"/>
>+                <enum name="GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE_EXT"/>
>+                <enum name="GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME_EXT"/>
>+                <enum name="GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL_EXT"/>
>+                <enum name="GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE_EXT"/>
>+                <enum name="GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_3D_ZOFFSET_EXT"/>
>+                <enum name="GL_FRAMEBUFFER_COMPLETE_EXT"/>
>+                <enum name="GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT_EXT"/>
>+                <enum name="GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT_EXT"/>
>+                <enum name="GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS_EXT"/>
>+                <enum name="GL_FRAMEBUFFER_INCOMPLETE_FORMATS_EXT"/>
>+                <enum name="GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER_EXT"/>
>+                <enum name="GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER_EXT"/>
>+                <enum name="GL_FRAMEBUFFER_UNSUPPORTED_EXT"/>
>+                <enum name="GL_MAX_COLOR_ATTACHMENTS_EXT"/>
>+                <enum name="GL_COLOR_ATTACHMENT0_EXT"/>
>+                <enum name="GL_COLOR_ATTACHMENT1_EXT"/>
>+                <enum name="GL_COLOR_ATTACHMENT2_EXT"/>
>+                <enum name="GL_COLOR_ATTACHMENT3_EXT"/>
>+                <enum name="GL_COLOR_ATTACHMENT4_EXT"/>
>+                <enum name="GL_COLOR_ATTACHMENT5_EXT"/>
>+                <enum name="GL_COLOR_ATTACHMENT6_EXT"/>
>+                <enum name="GL_COLOR_ATTACHMENT7_EXT"/>
>+                <enum name="GL_COLOR_ATTACHMENT8_EXT"/>
>+                <enum name="GL_COLOR_ATTACHMENT9_EXT"/>
>+                <enum name="GL_COLOR_ATTACHMENT10_EXT"/>
>+                <enum name="GL_COLOR_ATTACHMENT11_EXT"/>
>+                <enum name="GL_COLOR_ATTACHMENT12_EXT"/>
>+                <enum name="GL_COLOR_ATTACHMENT13_EXT"/>
>+                <enum name="GL_COLOR_ATTACHMENT14_EXT"/>
>+                <enum name="GL_COLOR_ATTACHMENT15_EXT"/>
>+                <enum name="GL_DEPTH_ATTACHMENT_EXT"/>
>+                <enum name="GL_STENCIL_ATTACHMENT_EXT"/>
>+                <enum name="GL_FRAMEBUFFER_EXT"/>
>+                <enum name="GL_RENDERBUFFER_EXT"/>
>+                <enum name="GL_RENDERBUFFER_WIDTH_EXT"/>
>+                <enum name="GL_RENDERBUFFER_HEIGHT_EXT"/>
>+                <enum name="GL_RENDERBUFFER_INTERNAL_FORMAT_EXT"/>
>+                <enum name="GL_STENCIL_INDEX1_EXT"/>
>+                <enum name="GL_STENCIL_INDEX4_EXT"/>
>+                <enum name="GL_STENCIL_INDEX8_EXT"/>
>+                <enum name="GL_STENCIL_INDEX16_EXT"/>
>+                <enum name="GL_RENDERBUFFER_RED_SIZE_EXT"/>
>+                <enum name="GL_RENDERBUFFER_GREEN_SIZE_EXT"/>
>+                <enum name="GL_RENDERBUFFER_BLUE_SIZE_EXT"/>
>+                <enum name="GL_RENDERBUFFER_ALPHA_SIZE_EXT"/>
>+                <enum name="GL_RENDERBUFFER_DEPTH_SIZE_EXT"/>
>+                <enum name="GL_RENDERBUFFER_STENCIL_SIZE_EXT"/>
>+                <command name="glIsRenderbufferEXT"/>
>+                <command name="glBindRenderbufferEXT"/>
>+                <command name="glDeleteRenderbuffersEXT"/>
>+                <command name="glGenRenderbuffersEXT"/>
>+                <command name="glRenderbufferStorageEXT"/>
>+                <command name="glGetRenderbufferParameterivEXT"/>
>+                <command name="glIsFramebufferEXT"/>
>+                <command name="glBindFramebufferEXT"/>
>+                <command name="glDeleteFramebuffersEXT"/>
>+                <command name="glGenFramebuffersEXT"/>
>+                <command name="glCheckFramebufferStatusEXT"/>
>+                <command name="glFramebufferTexture1DEXT"/>
>+                <command name="glFramebufferTexture2DEXT"/>
>+                <command name="glFramebufferTexture3DEXT"/>
>+                <command name="glFramebufferRenderbufferEXT"/>
>+                <command name="glGetFramebufferAttachmentParameterivEXT"/>
>+                <command name="glGenerateMipmapEXT"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_EXT_framebuffer_sRGB" supported="gl">
>+            <require>
>+                <enum name="GL_FRAMEBUFFER_SRGB_EXT"/>
>+                <enum name="GL_FRAMEBUFFER_SRGB_CAPABLE_EXT"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_EXT_geometry_point_size" supported="gles2"/>
>+        <extension name="GL_EXT_geometry_shader" supported="gles2">
>+            <require>
>+                <enum name="GL_GEOMETRY_SHADER_EXT"/>
>+                <enum name="GL_GEOMETRY_SHADER_BIT_EXT"/>
>+                <enum name="GL_GEOMETRY_LINKED_VERTICES_OUT_EXT"/>
>+                <enum name="GL_GEOMETRY_LINKED_INPUT_TYPE_EXT"/>
>+                <enum name="GL_GEOMETRY_LINKED_OUTPUT_TYPE_EXT"/>
>+                <enum name="GL_GEOMETRY_SHADER_INVOCATIONS_EXT"/>
>+                <enum name="GL_LAYER_PROVOKING_VERTEX_EXT"/>
>+                <enum name="GL_LINES_ADJACENCY_EXT"/>
>+                <enum name="GL_LINE_STRIP_ADJACENCY_EXT"/>
>+                <enum name="GL_TRIANGLES_ADJACENCY_EXT"/>
>+                <enum name="GL_TRIANGLE_STRIP_ADJACENCY_EXT"/>
>+                <enum name="GL_MAX_GEOMETRY_UNIFORM_COMPONENTS_EXT"/>
>+                <enum name="GL_MAX_GEOMETRY_UNIFORM_BLOCKS_EXT"/>
>+                <enum name="GL_MAX_COMBINED_GEOMETRY_UNIFORM_COMPONENTS_EXT"/>
>+                <enum name="GL_MAX_GEOMETRY_INPUT_COMPONENTS_EXT"/>
>+                <enum name="GL_MAX_GEOMETRY_OUTPUT_COMPONENTS_EXT"/>
>+                <enum name="GL_MAX_GEOMETRY_OUTPUT_VERTICES_EXT"/>
>+                <enum name="GL_MAX_GEOMETRY_TOTAL_OUTPUT_COMPONENTS_EXT"/>
>+                <enum name="GL_MAX_GEOMETRY_SHADER_INVOCATIONS_EXT"/>
>+                <enum name="GL_MAX_GEOMETRY_TEXTURE_IMAGE_UNITS_EXT"/>
>+                <enum name="GL_MAX_GEOMETRY_ATOMIC_COUNTER_BUFFERS_EXT"/>
>+                <enum name="GL_MAX_GEOMETRY_ATOMIC_COUNTERS_EXT"/>
>+                <enum name="GL_MAX_GEOMETRY_IMAGE_UNIFORMS_EXT"/>
>+                <enum name="GL_MAX_GEOMETRY_SHADER_STORAGE_BLOCKS_EXT"/>
>+                <enum name="GL_FIRST_VERTEX_CONVENTION_EXT"/>
>+                <enum name="GL_LAST_VERTEX_CONVENTION_EXT"/>
>+                <enum name="GL_UNDEFINED_VERTEX_EXT"/>
>+                <enum name="GL_PRIMITIVES_GENERATED_EXT"/>
>+                <enum name="GL_FRAMEBUFFER_DEFAULT_LAYERS_EXT"/>
>+                <enum name="GL_MAX_FRAMEBUFFER_LAYERS_EXT"/>
>+                <enum name="GL_FRAMEBUFFER_INCOMPLETE_LAYER_TARGETS_EXT"/>
>+                <enum name="GL_FRAMEBUFFER_ATTACHMENT_LAYERED_EXT"/>
>+                <enum name="GL_REFERENCED_BY_GEOMETRY_SHADER_EXT"/>
>+                <command name="glFramebufferTextureEXT"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_EXT_geometry_shader4" supported="gl">
>+            <require>
>+                <enum name="GL_GEOMETRY_SHADER_EXT"/>
>+                <enum name="GL_GEOMETRY_VERTICES_OUT_EXT"/>
>+                <enum name="GL_GEOMETRY_INPUT_TYPE_EXT"/>
>+                <enum name="GL_GEOMETRY_OUTPUT_TYPE_EXT"/>
>+                <enum name="GL_MAX_GEOMETRY_TEXTURE_IMAGE_UNITS_EXT"/>
>+                <enum name="GL_MAX_GEOMETRY_VARYING_COMPONENTS_EXT"/>
>+                <enum name="GL_MAX_VERTEX_VARYING_COMPONENTS_EXT"/>
>+                <enum name="GL_MAX_VARYING_COMPONENTS_EXT"/>
>+                <enum name="GL_MAX_GEOMETRY_UNIFORM_COMPONENTS_EXT"/>
>+                <enum name="GL_MAX_GEOMETRY_OUTPUT_VERTICES_EXT"/>
>+                <enum name="GL_MAX_GEOMETRY_TOTAL_OUTPUT_COMPONENTS_EXT"/>
>+                <enum name="GL_LINES_ADJACENCY_EXT"/>
>+                <enum name="GL_LINE_STRIP_ADJACENCY_EXT"/>
>+                <enum name="GL_TRIANGLES_ADJACENCY_EXT"/>
>+                <enum name="GL_TRIANGLE_STRIP_ADJACENCY_EXT"/>
>+                <enum name="GL_FRAMEBUFFER_INCOMPLETE_LAYER_TARGETS_EXT"/>
>+                <enum name="GL_FRAMEBUFFER_INCOMPLETE_LAYER_COUNT_EXT"/>
>+                <enum name="GL_FRAMEBUFFER_ATTACHMENT_LAYERED_EXT"/>
>+                <enum name="GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER_EXT"/>
>+                <enum name="GL_PROGRAM_POINT_SIZE_EXT"/>
>+                <command name="glProgramParameteriEXT"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_EXT_gpu_program_parameters" supported="gl">
>+            <require>
>+                <command name="glProgramEnvParameters4fvEXT"/>
>+                <command name="glProgramLocalParameters4fvEXT"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_EXT_gpu_shader4" supported="gl">
>+            <require>
>+                <enum name="GL_VERTEX_ATTRIB_ARRAY_INTEGER_EXT"/>
>+                <enum name="GL_SAMPLER_1D_ARRAY_EXT"/>
>+                <enum name="GL_SAMPLER_2D_ARRAY_EXT"/>
>+                <enum name="GL_SAMPLER_BUFFER_EXT"/>
>+                <enum name="GL_SAMPLER_1D_ARRAY_SHADOW_EXT"/>
>+                <enum name="GL_SAMPLER_2D_ARRAY_SHADOW_EXT"/>
>+                <enum name="GL_SAMPLER_CUBE_SHADOW_EXT"/>
>+                <enum name="GL_UNSIGNED_INT_VEC2_EXT"/>
>+                <enum name="GL_UNSIGNED_INT_VEC3_EXT"/>
>+                <enum name="GL_UNSIGNED_INT_VEC4_EXT"/>
>+                <enum name="GL_INT_SAMPLER_1D_EXT"/>
>+                <enum name="GL_INT_SAMPLER_2D_EXT"/>
>+                <enum name="GL_INT_SAMPLER_3D_EXT"/>
>+                <enum name="GL_INT_SAMPLER_CUBE_EXT"/>
>+                <enum name="GL_INT_SAMPLER_2D_RECT_EXT"/>
>+                <enum name="GL_INT_SAMPLER_1D_ARRAY_EXT"/>
>+                <enum name="GL_INT_SAMPLER_2D_ARRAY_EXT"/>
>+                <enum name="GL_INT_SAMPLER_BUFFER_EXT"/>
>+                <enum name="GL_UNSIGNED_INT_SAMPLER_1D_EXT"/>
>+                <enum name="GL_UNSIGNED_INT_SAMPLER_2D_EXT"/>
>+                <enum name="GL_UNSIGNED_INT_SAMPLER_3D_EXT"/>
>+                <enum name="GL_UNSIGNED_INT_SAMPLER_CUBE_EXT"/>
>+                <enum name="GL_UNSIGNED_INT_SAMPLER_2D_RECT_EXT"/>
>+                <enum name="GL_UNSIGNED_INT_SAMPLER_1D_ARRAY_EXT"/>
>+                <enum name="GL_UNSIGNED_INT_SAMPLER_2D_ARRAY_EXT"/>
>+                <enum name="GL_UNSIGNED_INT_SAMPLER_BUFFER_EXT"/>
>+                <enum name="GL_MIN_PROGRAM_TEXEL_OFFSET_EXT"/>
>+                <enum name="GL_MAX_PROGRAM_TEXEL_OFFSET_EXT"/>
>+                <command name="glGetUniformuivEXT"/>
>+                <command name="glBindFragDataLocationEXT"/>
>+                <command name="glGetFragDataLocationEXT"/>
>+                <command name="glUniform1uiEXT"/>
>+                <command name="glUniform2uiEXT"/>
>+                <command name="glUniform3uiEXT"/>
>+                <command name="glUniform4uiEXT"/>
>+                <command name="glUniform1uivEXT"/>
>+                <command name="glUniform2uivEXT"/>
>+                <command name="glUniform3uivEXT"/>
>+                <command name="glUniform4uivEXT"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_EXT_gpu_shader5" supported="gles2"/>
>+        <extension name="GL_EXT_histogram" supported="gl">
>+            <require>
>+                <enum name="GL_HISTOGRAM_EXT"/>
>+                <enum name="GL_PROXY_HISTOGRAM_EXT"/>
>+                <enum name="GL_HISTOGRAM_WIDTH_EXT"/>
>+                <enum name="GL_HISTOGRAM_FORMAT_EXT"/>
>+                <enum name="GL_HISTOGRAM_RED_SIZE_EXT"/>
>+                <enum name="GL_HISTOGRAM_GREEN_SIZE_EXT"/>
>+                <enum name="GL_HISTOGRAM_BLUE_SIZE_EXT"/>
>+                <enum name="GL_HISTOGRAM_ALPHA_SIZE_EXT"/>
>+                <enum name="GL_HISTOGRAM_LUMINANCE_SIZE_EXT"/>
>+                <enum name="GL_HISTOGRAM_SINK_EXT"/>
>+                <enum name="GL_MINMAX_EXT"/>
>+                <enum name="GL_MINMAX_FORMAT_EXT"/>
>+                <enum name="GL_MINMAX_SINK_EXT"/>
>+                <enum name="GL_TABLE_TOO_LARGE_EXT"/>
>+                <command name="glGetHistogramEXT"/>
>+                <command name="glGetHistogramParameterfvEXT"/>
>+                <command name="glGetHistogramParameterivEXT"/>
>+                <command name="glGetMinmaxEXT"/>
>+                <command name="glGetMinmaxParameterfvEXT"/>
>+                <command name="glGetMinmaxParameterivEXT"/>
>+                <command name="glHistogramEXT"/>
>+                <command name="glMinmaxEXT"/>
>+                <command name="glResetHistogramEXT"/>
>+                <command name="glResetMinmaxEXT"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_EXT_index_array_formats" supported="gl">
>+            <require>
>+                <enum name="GL_IUI_V2F_EXT"/>
>+                <enum name="GL_IUI_V3F_EXT"/>
>+                <enum name="GL_IUI_N3F_V2F_EXT"/>
>+                <enum name="GL_IUI_N3F_V3F_EXT"/>
>+                <enum name="GL_T2F_IUI_V2F_EXT"/>
>+                <enum name="GL_T2F_IUI_V3F_EXT"/>
>+                <enum name="GL_T2F_IUI_N3F_V2F_EXT"/>
>+                <enum name="GL_T2F_IUI_N3F_V3F_EXT"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_EXT_index_func" supported="gl">
>+            <require>
>+                <enum name="GL_INDEX_TEST_EXT"/>
>+                <enum name="GL_INDEX_TEST_FUNC_EXT"/>
>+                <enum name="GL_INDEX_TEST_REF_EXT"/>
>+                <command name="glIndexFuncEXT"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_EXT_index_material" supported="gl">
>+            <require>
>+                <enum name="GL_INDEX_MATERIAL_EXT"/>
>+                <enum name="GL_INDEX_MATERIAL_PARAMETER_EXT"/>
>+                <enum name="GL_INDEX_MATERIAL_FACE_EXT"/>
>+                <command name="glIndexMaterialEXT"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_EXT_index_texture" supported="gl"/>
>+        <extension name="GL_EXT_instanced_arrays" supported="gles2">
>+            <require>
>+                <enum name="GL_VERTEX_ATTRIB_ARRAY_DIVISOR_EXT"/>
>+                <command name="glDrawArraysInstancedEXT"/>
>+                <command name="glDrawElementsInstancedEXT"/>
>+                <command name="glVertexAttribDivisorEXT"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_EXT_light_texture" supported="gl">
>+            <require>
>+                <enum name="GL_FRAGMENT_MATERIAL_EXT"/>
>+                <enum name="GL_FRAGMENT_NORMAL_EXT"/>
>+                <enum name="GL_FRAGMENT_COLOR_EXT"/>
>+                <enum name="GL_ATTENUATION_EXT"/>
>+                <enum name="GL_SHADOW_ATTENUATION_EXT"/>
>+                <enum name="GL_TEXTURE_APPLICATION_MODE_EXT"/>
>+                <enum name="GL_TEXTURE_LIGHT_EXT"/>
>+                <enum name="GL_TEXTURE_MATERIAL_FACE_EXT"/>
>+                <enum name="GL_TEXTURE_MATERIAL_PARAMETER_EXT"/>
>+                <enum name="GL_FRAGMENT_DEPTH_EXT"/>
>+                <command name="glApplyTextureEXT"/>
>+                <command name="glTextureLightEXT"/>
>+                <command name="glTextureMaterialEXT"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_EXT_map_buffer_range" supported="gles1|gles2">
>+            <require>
>+                <enum name="GL_MAP_READ_BIT_EXT"/>
>+                <enum name="GL_MAP_WRITE_BIT_EXT"/>
>+                <enum name="GL_MAP_INVALIDATE_RANGE_BIT_EXT"/>
>+                <enum name="GL_MAP_INVALIDATE_BUFFER_BIT_EXT"/>
>+                <enum name="GL_MAP_FLUSH_EXPLICIT_BIT_EXT"/>
>+                <enum name="GL_MAP_UNSYNCHRONIZED_BIT_EXT"/>
>+                <command name="glMapBufferRangeEXT"/>
>+                <command name="glFlushMappedBufferRangeEXT"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_EXT_memory_object" supported="gl|gles2">
>+            <require>
>+                <enum name="GL_TEXTURE_TILING_EXT"/>
>+                <enum name="GL_DEDICATED_MEMORY_OBJECT_EXT"/>
>+                <enum name="GL_PROTECTED_MEMORY_OBJECT_EXT"/>
>+                <enum name="GL_NUM_TILING_TYPES_EXT"/>
>+                <enum name="GL_TILING_TYPES_EXT"/>
>+                <enum name="GL_OPTIMAL_TILING_EXT"/>
>+                <enum name="GL_LINEAR_TILING_EXT"/>
>+                <enum name="GL_NUM_DEVICE_UUIDS_EXT"/>
>+                <enum name="GL_DEVICE_UUID_EXT"/>
>+                <enum name="GL_DRIVER_UUID_EXT"/>
>+                <enum name="GL_UUID_SIZE_EXT"/>
>+                <command name="glGetUnsignedBytevEXT"/>
>+                <command name="glGetUnsignedBytei_vEXT"/>
>+                <command name="glDeleteMemoryObjectsEXT"/>
>+                <command name="glIsMemoryObjectEXT"/>
>+                <command name="glCreateMemoryObjectsEXT"/>
>+                <command name="glMemoryObjectParameterivEXT"/>
>+                <command name="glGetMemoryObjectParameterivEXT"/>
>+                <command name="glTexStorageMem2DEXT"/>
>+                <command name="glTexStorageMem2DMultisampleEXT"/>
>+                <command name="glTexStorageMem3DEXT"/>
>+                <command name="glTexStorageMem3DMultisampleEXT"/>
>+                <command name="glBufferStorageMemEXT"/>
>+            </require>
>+            <require comment="Supported only if GL_EXT_direct_state_access is supported">
>+                <command name="glTextureStorageMem2DEXT"/>
>+                <command name="glTextureStorageMem2DMultisampleEXT"/>
>+                <command name="glTextureStorageMem3DEXT"/>
>+                <command name="glTextureStorageMem3DMultisampleEXT"/>
>+                <command name="glNamedBufferStorageMemEXT"/>
>+            </require>
>+            <require api="gl">
>+                <command name="glTexStorageMem1DEXT"/>
>+            </require>
>+            <require api="gl" comment="Supported only if GL_EXT_direct_state_access is supported">
>+                <command name="glTextureStorageMem1DEXT"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_EXT_memory_object_fd" supported="gl|gles2">
>+            <require>
>+                <enum name="GL_HANDLE_TYPE_OPAQUE_FD_EXT"/>
>+                <command name="glImportMemoryFdEXT"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_EXT_memory_object_win32" supported="gl|gles2">
>+            <require>
>+                <enum name="GL_HANDLE_TYPE_OPAQUE_WIN32_EXT"/>
>+                <enum name="GL_HANDLE_TYPE_OPAQUE_WIN32_KMT_EXT"/>
>+                <enum name="GL_DEVICE_LUID_EXT"/>
>+                <enum name="GL_DEVICE_NODE_MASK_EXT"/>
>+                <enum name="GL_LUID_SIZE_EXT"/>
>+                <enum name="GL_HANDLE_TYPE_D3D12_TILEPOOL_EXT"/>
>+                <enum name="GL_HANDLE_TYPE_D3D12_RESOURCE_EXT"/>
>+                <enum name="GL_HANDLE_TYPE_D3D11_IMAGE_EXT"/>
>+                <enum name="GL_HANDLE_TYPE_D3D11_IMAGE_KMT_EXT"/>
>+                <command name="glImportMemoryWin32HandleEXT"/>
>+                <command name="glImportMemoryWin32NameEXT"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_EXT_misc_attribute" supported="gl"/>
>+        <extension name="GL_EXT_multi_draw_arrays" supported="gl|gles1|gles2">
>+            <require>
>+                <command name="glMultiDrawArraysEXT"/>
>+                <command name="glMultiDrawElementsEXT"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_EXT_multi_draw_indirect" supported="gles2">
>+            <require>
>+                <command name="glMultiDrawArraysIndirectEXT"/>
>+                <command name="glMultiDrawElementsIndirectEXT"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_EXT_multisample" supported="gl">
>+            <require>
>+                <enum name="GL_MULTISAMPLE_EXT"/>
>+                <enum name="GL_SAMPLE_ALPHA_TO_MASK_EXT"/>
>+                <enum name="GL_SAMPLE_ALPHA_TO_ONE_EXT"/>
>+                <enum name="GL_SAMPLE_MASK_EXT"/>
>+                <enum name="GL_1PASS_EXT"/>
>+                <enum name="GL_2PASS_0_EXT"/>
>+                <enum name="GL_2PASS_1_EXT"/>
>+                <enum name="GL_4PASS_0_EXT"/>
>+                <enum name="GL_4PASS_1_EXT"/>
>+                <enum name="GL_4PASS_2_EXT"/>
>+                <enum name="GL_4PASS_3_EXT"/>
>+                <enum name="GL_SAMPLE_BUFFERS_EXT"/>
>+                <enum name="GL_SAMPLES_EXT"/>
>+                <enum name="GL_SAMPLE_MASK_VALUE_EXT"/>
>+                <enum name="GL_SAMPLE_MASK_INVERT_EXT"/>
>+                <enum name="GL_SAMPLE_PATTERN_EXT"/>
>+                <enum name="GL_MULTISAMPLE_BIT_EXT"/>
>+                <command name="glSampleMaskEXT"/>
>+                <command name="glSamplePatternEXT"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_EXT_multisampled_compatibility" supported="gles2">
>+            <require>
>+                <enum name="GL_MULTISAMPLE_EXT"/>
>+                <enum name="GL_SAMPLE_ALPHA_TO_ONE_EXT"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_EXT_multisampled_render_to_texture" supported="gles1|gles2">
>+            <require>
>+                <enum name="GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_SAMPLES_EXT"/>
>+                <enum name="GL_RENDERBUFFER_SAMPLES_EXT"/>
>+                <enum name="GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE_EXT"/>
>+                <enum name="GL_MAX_SAMPLES_EXT"/>
>+                <command name="glRenderbufferStorageMultisampleEXT"/>
>+                <command name="glFramebufferTexture2DMultisampleEXT"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_EXT_multiview_draw_buffers" supported="gles2">
>+            <require>
>+                <enum name="GL_COLOR_ATTACHMENT_EXT"/>
>+                <enum name="GL_MULTIVIEW_EXT"/>
>+                <enum name="GL_DRAW_BUFFER_EXT"/>
>+                <enum name="GL_READ_BUFFER_EXT"/>
>+                <enum name="GL_MAX_MULTIVIEW_BUFFERS_EXT"/>
>+                <command name="glReadBufferIndexedEXT"/>
>+                <command name="glDrawBuffersIndexedEXT"/>
>+                <command name="glGetIntegeri_vEXT"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_EXT_occlusion_query_boolean" supported="gles2">
>+            <require>
>+                <enum name="GL_ANY_SAMPLES_PASSED_EXT"/>
>+                <enum name="GL_ANY_SAMPLES_PASSED_CONSERVATIVE_EXT"/>
>+                <enum name="GL_CURRENT_QUERY_EXT"/>
>+                <enum name="GL_QUERY_RESULT_EXT"/>
>+                <enum name="GL_QUERY_RESULT_AVAILABLE_EXT"/>
>+                <command name="glGenQueriesEXT"/>
>+                <command name="glDeleteQueriesEXT"/>
>+                <command name="glIsQueryEXT"/>
>+                <command name="glBeginQueryEXT"/>
>+                <command name="glEndQueryEXT"/>
>+                <command name="glGetQueryivEXT"/>
>+                <command name="glGetQueryObjectuivEXT"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_EXT_packed_depth_stencil" supported="gl">
>+            <require>
>+                <enum name="GL_DEPTH_STENCIL_EXT"/>
>+                <enum name="GL_UNSIGNED_INT_24_8_EXT"/>
>+                <enum name="GL_DEPTH24_STENCIL8_EXT"/>
>+                <enum name="GL_TEXTURE_STENCIL_SIZE_EXT"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_EXT_packed_float" supported="gl">
>+            <require>
>+                <enum name="GL_R11F_G11F_B10F_EXT"/>
>+                <enum name="GL_UNSIGNED_INT_10F_11F_11F_REV_EXT"/>
>+                <enum name="GL_RGBA_SIGNED_COMPONENTS_EXT"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_EXT_packed_pixels" supported="gl">
>+            <require>
>+                <enum name="GL_UNSIGNED_BYTE_3_3_2_EXT"/>
>+                <enum name="GL_UNSIGNED_SHORT_4_4_4_4_EXT"/>
>+                <enum name="GL_UNSIGNED_SHORT_5_5_5_1_EXT"/>
>+                <enum name="GL_UNSIGNED_INT_8_8_8_8_EXT"/>
>+                <enum name="GL_UNSIGNED_INT_10_10_10_2_EXT"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_EXT_paletted_texture" supported="gl">
>+            <require>
>+                <enum name="GL_COLOR_INDEX1_EXT"/>
>+                <enum name="GL_COLOR_INDEX2_EXT"/>
>+                <enum name="GL_COLOR_INDEX4_EXT"/>
>+                <enum name="GL_COLOR_INDEX8_EXT"/>
>+                <enum name="GL_COLOR_INDEX12_EXT"/>
>+                <enum name="GL_COLOR_INDEX16_EXT"/>
>+                <enum name="GL_TEXTURE_INDEX_SIZE_EXT"/>
>+                <command name="glColorTableEXT"/>
>+                <command name="glGetColorTableEXT"/>
>+                <command name="glGetColorTableParameterivEXT"/>
>+                <command name="glGetColorTableParameterfvEXT"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_EXT_pixel_buffer_object" supported="gl">
>+            <require>
>+                <enum name="GL_PIXEL_PACK_BUFFER_EXT"/>
>+                <enum name="GL_PIXEL_UNPACK_BUFFER_EXT"/>
>+                <enum name="GL_PIXEL_PACK_BUFFER_BINDING_EXT"/>
>+                <enum name="GL_PIXEL_UNPACK_BUFFER_BINDING_EXT"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_EXT_pixel_transform" supported="gl">
>+            <require>
>+                <enum name="GL_PIXEL_TRANSFORM_2D_EXT"/>
>+                <enum name="GL_PIXEL_MAG_FILTER_EXT"/>
>+                <enum name="GL_PIXEL_MIN_FILTER_EXT"/>
>+                <enum name="GL_PIXEL_CUBIC_WEIGHT_EXT"/>
>+                <enum name="GL_CUBIC_EXT"/>
>+                <enum name="GL_AVERAGE_EXT"/>
>+                <enum name="GL_PIXEL_TRANSFORM_2D_STACK_DEPTH_EXT"/>
>+                <enum name="GL_MAX_PIXEL_TRANSFORM_2D_STACK_DEPTH_EXT"/>
>+                <enum name="GL_PIXEL_TRANSFORM_2D_MATRIX_EXT"/>
>+                <command name="glPixelTransformParameteriEXT"/>
>+                <command name="glPixelTransformParameterfEXT"/>
>+                <command name="glPixelTransformParameterivEXT"/>
>+                <command name="glPixelTransformParameterfvEXT"/>
>+                <command name="glGetPixelTransformParameterivEXT"/>
>+                <command name="glGetPixelTransformParameterfvEXT"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_EXT_pixel_transform_color_table" supported="gl"/>
>+        <extension name="GL_EXT_point_parameters" supported="gl">
>+            <require>
>+                <enum name="GL_POINT_SIZE_MIN_EXT"/>
>+                <enum name="GL_POINT_SIZE_MAX_EXT"/>
>+                <enum name="GL_POINT_FADE_THRESHOLD_SIZE_EXT"/>
>+                <enum name="GL_DISTANCE_ATTENUATION_EXT"/>
>+                <command name="glPointParameterfEXT"/>
>+                <command name="glPointParameterfvEXT"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_EXT_polygon_offset" supported="gl">
>+            <require>
>+                <enum name="GL_POLYGON_OFFSET_EXT"/>
>+                <enum name="GL_POLYGON_OFFSET_FACTOR_EXT"/>
>+                <enum name="GL_POLYGON_OFFSET_BIAS_EXT"/>
>+                <command name="glPolygonOffsetEXT"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_EXT_polygon_offset_clamp" supported="gl|glcore|gles2">
>+            <require>
>+                <enum name="GL_POLYGON_OFFSET_CLAMP_EXT"/>
>+                <command name="glPolygonOffsetClampEXT"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_EXT_post_depth_coverage" supported="gl|glcore|gles2"/>
>+        <extension name="GL_EXT_primitive_bounding_box" supported="gles2">
>+            <require>
>+                <enum name="GL_PRIMITIVE_BOUNDING_BOX_EXT"/>
>+                <command name="glPrimitiveBoundingBoxEXT"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_EXT_protected_textures" supported="gles2">
>+            <require>
>+                <enum name="GL_CONTEXT_FLAG_PROTECTED_CONTENT_BIT_EXT"/>
>+                <enum name="GL_TEXTURE_PROTECTED_EXT"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_EXT_provoking_vertex" supported="gl">
>+            <require>
>+                <enum name="GL_QUADS_FOLLOW_PROVOKING_VERTEX_CONVENTION_EXT"/>
>+                <enum name="GL_FIRST_VERTEX_CONVENTION_EXT"/>
>+                <enum name="GL_LAST_VERTEX_CONVENTION_EXT"/>
>+                <enum name="GL_PROVOKING_VERTEX_EXT"/>
>+                <command name="glProvokingVertexEXT"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_EXT_pvrtc_sRGB" supported="gles2">
>+            <require>
>+                <enum name="GL_COMPRESSED_SRGB_PVRTC_2BPPV1_EXT"/>
>+                <enum name="GL_COMPRESSED_SRGB_PVRTC_4BPPV1_EXT"/>
>+                <enum name="GL_COMPRESSED_SRGB_ALPHA_PVRTC_2BPPV1_EXT"/>
>+                <enum name="GL_COMPRESSED_SRGB_ALPHA_PVRTC_4BPPV1_EXT"/>
>+                <enum name="GL_COMPRESSED_SRGB_ALPHA_PVRTC_2BPPV2_IMG"/>
>+                <enum name="GL_COMPRESSED_SRGB_ALPHA_PVRTC_4BPPV2_IMG"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_EXT_raster_multisample" supported="gl|glcore|gles2">
>+            <require>
>+                <enum name="GL_RASTER_MULTISAMPLE_EXT"/>
>+                <enum name="GL_RASTER_SAMPLES_EXT"/>
>+                <enum name="GL_MAX_RASTER_SAMPLES_EXT"/>
>+                <enum name="GL_RASTER_FIXED_SAMPLE_LOCATIONS_EXT"/>
>+                <enum name="GL_MULTISAMPLE_RASTERIZATION_ALLOWED_EXT"/>
>+                <enum name="GL_EFFECTIVE_RASTER_SAMPLES_EXT"/>
>+                <command name="glRasterSamplesEXT"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_EXT_read_format_bgra" supported="gles1|gles2">
>+            <require>
>+                <enum name="GL_BGRA_EXT"/>
>+                <enum name="GL_UNSIGNED_SHORT_4_4_4_4_REV_EXT"/>
>+                <enum name="GL_UNSIGNED_SHORT_1_5_5_5_REV_EXT"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_EXT_render_snorm" supported="gles2">
>+            <require>
>+                <enum name="GL_BYTE"/>
>+                <enum name="GL_SHORT"/>
>+                <enum name="GL_R8_SNORM"/>
>+                <enum name="GL_RG8_SNORM"/>
>+                <enum name="GL_RGBA8_SNORM"/>
>+                <enum name="GL_R16_SNORM_EXT"/>
>+                <enum name="GL_RG16_SNORM_EXT"/>
>+                <enum name="GL_RGBA16_SNORM_EXT"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_EXT_rescale_normal" supported="gl">
>+            <require>
>+                <enum name="GL_RESCALE_NORMAL_EXT"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_EXT_robustness" supported="gles1|gles2">
>+            <require>
>+                <enum name="GL_NO_ERROR"/>
>+                <enum name="GL_GUILTY_CONTEXT_RESET_EXT"/>
>+                <enum name="GL_INNOCENT_CONTEXT_RESET_EXT"/>
>+                <enum name="GL_UNKNOWN_CONTEXT_RESET_EXT"/>
>+                <enum name="GL_CONTEXT_ROBUST_ACCESS_EXT"/>
>+                <enum name="GL_RESET_NOTIFICATION_STRATEGY_EXT"/>
>+                <enum name="GL_LOSE_CONTEXT_ON_RESET_EXT"/>
>+                <enum name="GL_NO_RESET_NOTIFICATION_EXT"/>
>+                <command name="glGetGraphicsResetStatusEXT"/>
>+                <command name="glReadnPixelsEXT"/>
>+                <command name="glGetnUniformfvEXT"/>
>+                <command name="glGetnUniformivEXT"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_EXT_semaphore" supported="gl|gles2">
>+            <require>
>+                <enum name="GL_NUM_DEVICE_UUIDS_EXT"/>
>+                <enum name="GL_DEVICE_UUID_EXT"/>
>+                <enum name="GL_DRIVER_UUID_EXT"/>
>+                <enum name="GL_UUID_SIZE_EXT"/>
>+                <enum name="GL_LAYOUT_GENERAL_EXT"/>
>+                <enum name="GL_LAYOUT_COLOR_ATTACHMENT_EXT"/>
>+                <enum name="GL_LAYOUT_DEPTH_STENCIL_ATTACHMENT_EXT"/>
>+                <enum name="GL_LAYOUT_DEPTH_STENCIL_READ_ONLY_EXT"/>
>+                <enum name="GL_LAYOUT_SHADER_READ_ONLY_EXT"/>
>+                <enum name="GL_LAYOUT_TRANSFER_SRC_EXT"/>
>+                <enum name="GL_LAYOUT_TRANSFER_DST_EXT"/>
>+                <enum name="GL_LAYOUT_DEPTH_READ_ONLY_STENCIL_ATTACHMENT_EXT"/>
>+                <enum name="GL_LAYOUT_DEPTH_ATTACHMENT_STENCIL_READ_ONLY_EXT"/>
>+                <command name="glGetUnsignedBytevEXT"/>
>+                <command name="glGetUnsignedBytei_vEXT"/>
>+                <command name="glGenSemaphoresEXT"/>
>+                <command name="glDeleteSemaphoresEXT"/>
>+                <command name="glIsSemaphoreEXT"/>
>+                <command name="glSemaphoreParameterui64vEXT"/>
>+                <command name="glGetSemaphoreParameterui64vEXT"/>
>+                <command name="glWaitSemaphoreEXT"/>
>+                <command name="glSignalSemaphoreEXT"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_EXT_semaphore_fd" supported="gl|gles2">
>+            <require>
>+                <enum name="GL_HANDLE_TYPE_OPAQUE_FD_EXT"/>
>+                <command name="glImportSemaphoreFdEXT"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_EXT_semaphore_win32" supported="gl|gles2">
>+            <require>
>+                <enum name="GL_HANDLE_TYPE_OPAQUE_WIN32_EXT"/>
>+                <enum name="GL_HANDLE_TYPE_OPAQUE_WIN32_KMT_EXT"/>
>+                <enum name="GL_DEVICE_LUID_EXT"/>
>+                <enum name="GL_DEVICE_NODE_MASK_EXT"/>
>+                <enum name="GL_LUID_SIZE_EXT"/>
>+                <enum name="GL_HANDLE_TYPE_D3D12_FENCE_EXT"/>
>+                <enum name="GL_D3D12_FENCE_VALUE_EXT"/>
>+                <command name="glImportSemaphoreWin32HandleEXT"/>
>+                <command name="glImportSemaphoreWin32NameEXT"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_EXT_sRGB" supported="gles1|gles2">
>+            <require>
>+                <enum name="GL_SRGB_EXT"/>
>+                <enum name="GL_SRGB_ALPHA_EXT"/>
>+                <enum name="GL_SRGB8_ALPHA8_EXT"/>
>+                <enum name="GL_FRAMEBUFFER_ATTACHMENT_COLOR_ENCODING_EXT"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_EXT_sRGB_write_control" supported="gles2">
>+            <require>
>+                <enum name="GL_FRAMEBUFFER_SRGB_EXT"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_EXT_secondary_color" supported="gl">
>+            <require>
>+                <enum name="GL_COLOR_SUM_EXT"/>
>+                <enum name="GL_CURRENT_SECONDARY_COLOR_EXT"/>
>+                <enum name="GL_SECONDARY_COLOR_ARRAY_SIZE_EXT"/>
>+                <enum name="GL_SECONDARY_COLOR_ARRAY_TYPE_EXT"/>
>+                <enum name="GL_SECONDARY_COLOR_ARRAY_STRIDE_EXT"/>
>+                <enum name="GL_SECONDARY_COLOR_ARRAY_POINTER_EXT"/>
>+                <enum name="GL_SECONDARY_COLOR_ARRAY_EXT"/>
>+                <command name="glSecondaryColor3bEXT"/>
>+                <command name="glSecondaryColor3bvEXT"/>
>+                <command name="glSecondaryColor3dEXT"/>
>+                <command name="glSecondaryColor3dvEXT"/>
>+                <command name="glSecondaryColor3fEXT"/>
>+                <command name="glSecondaryColor3fvEXT"/>
>+                <command name="glSecondaryColor3iEXT"/>
>+                <command name="glSecondaryColor3ivEXT"/>
>+                <command name="glSecondaryColor3sEXT"/>
>+                <command name="glSecondaryColor3svEXT"/>
>+                <command name="glSecondaryColor3ubEXT"/>
>+                <command name="glSecondaryColor3ubvEXT"/>
>+                <command name="glSecondaryColor3uiEXT"/>
>+                <command name="glSecondaryColor3uivEXT"/>
>+                <command name="glSecondaryColor3usEXT"/>
>+                <command name="glSecondaryColor3usvEXT"/>
>+                <command name="glSecondaryColorPointerEXT"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_EXT_separate_shader_objects" supported="gl|glcore|gles2">
>+            <require api="gl" comment="The OpenGL version of this extension is completely unrelated to the OpenGL ES version">
>+                <enum name="GL_ACTIVE_PROGRAM_EXT"/>
>+                <command name="glUseShaderProgramEXT"/>
>+                <command name="glActiveProgramEXT"/>
>+                <command name="glCreateShaderProgramEXT"/>
>+            </require>
>+            <require api="gles2" comment="The OpenGL ES version of this extension is completely unrelated to the OpenGL version">
>+                <enum name="GL_VERTEX_SHADER_BIT_EXT"/>
>+                <enum name="GL_FRAGMENT_SHADER_BIT_EXT"/>
>+                <enum name="GL_ALL_SHADER_BITS_EXT"/>
>+                <enum name="GL_PROGRAM_SEPARABLE_EXT"/>
>+                <enum name="GL_ACTIVE_PROGRAM_EXT"/>
>+                <enum name="GL_PROGRAM_PIPELINE_BINDING_EXT"/>
>+                <command name="glActiveShaderProgramEXT"/>
>+                <command name="glBindProgramPipelineEXT"/>
>+                <command name="glCreateShaderProgramvEXT"/>
>+                <command name="glDeleteProgramPipelinesEXT"/>
>+                <command name="glGenProgramPipelinesEXT"/>
>+                <command name="glGetProgramPipelineInfoLogEXT"/>
>+                <command name="glGetProgramPipelineivEXT"/>
>+                <command name="glIsProgramPipelineEXT"/>
>+                <command name="glProgramParameteriEXT"/>
>+                <command name="glProgramUniform1fEXT"/>
>+                <command name="glProgramUniform1fvEXT"/>
>+                <command name="glProgramUniform1iEXT"/>
>+                <command name="glProgramUniform1ivEXT"/>
>+                <command name="glProgramUniform2fEXT"/>
>+                <command name="glProgramUniform2fvEXT"/>
>+                <command name="glProgramUniform2iEXT"/>
>+                <command name="glProgramUniform2ivEXT"/>
>+                <command name="glProgramUniform3fEXT"/>
>+                <command name="glProgramUniform3fvEXT"/>
>+                <command name="glProgramUniform3iEXT"/>
>+                <command name="glProgramUniform3ivEXT"/>
>+                <command name="glProgramUniform4fEXT"/>
>+                <command name="glProgramUniform4fvEXT"/>
>+                <command name="glProgramUniform4iEXT"/>
>+                <command name="glProgramUniform4ivEXT"/>
>+                <command name="glProgramUniformMatrix2fvEXT"/>
>+                <command name="glProgramUniformMatrix3fvEXT"/>
>+                <command name="glProgramUniformMatrix4fvEXT"/>
>+                <command name="glUseProgramStagesEXT"/>
>+                <command name="glValidateProgramPipelineEXT"/>
>+            </require>
>+            <require api="gles2" comment="Depends on OpenGL ES 3.0 or GL_NV_non_square_matrices">
>+                <command name="glProgramUniform1uiEXT"/>
>+                <command name="glProgramUniform2uiEXT"/>
>+                <command name="glProgramUniform3uiEXT"/>
>+                <command name="glProgramUniform4uiEXT"/>
>+                <command name="glProgramUniform1uivEXT"/>
>+                <command name="glProgramUniform2uivEXT"/>
>+                <command name="glProgramUniform3uivEXT"/>
>+                <command name="glProgramUniform4uivEXT"/>
>+                <command name="glProgramUniformMatrix4fvEXT"/>
>+                <command name="glProgramUniformMatrix2x3fvEXT"/>
>+                <command name="glProgramUniformMatrix3x2fvEXT"/>
>+                <command name="glProgramUniformMatrix2x4fvEXT"/>
>+                <command name="glProgramUniformMatrix4x2fvEXT"/>
>+                <command name="glProgramUniformMatrix3x4fvEXT"/>
>+                <command name="glProgramUniformMatrix4x3fvEXT"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_EXT_separate_specular_color" supported="gl">
>+            <require>
>+                <enum name="GL_LIGHT_MODEL_COLOR_CONTROL_EXT"/>
>+                <enum name="GL_SINGLE_COLOR_EXT"/>
>+                <enum name="GL_SEPARATE_SPECULAR_COLOR_EXT"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_EXT_shader_framebuffer_fetch" supported="gl|glcore|gles2">
>+            <require>
>+                <enum name="GL_FRAGMENT_SHADER_DISCARDS_SAMPLES_EXT"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_EXT_shader_framebuffer_fetch_non_coherent" supported="gl|glcore|gles2">
>+            <require>
>+                <enum name="GL_FRAGMENT_SHADER_DISCARDS_SAMPLES_EXT"/>
>+                <command name="glFramebufferFetchBarrierEXT"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_EXT_shader_group_vote" supported="gles2"/>
>+        <extension name="GL_EXT_shader_image_load_formatted" supported="gl"/>
>+        <extension name="GL_EXT_shader_image_load_store" supported="gl">
>+            <require>
>+                <enum name="GL_MAX_IMAGE_UNITS_EXT"/>
>+                <enum name="GL_MAX_COMBINED_IMAGE_UNITS_AND_FRAGMENT_OUTPUTS_EXT"/>
>+                <enum name="GL_IMAGE_BINDING_NAME_EXT"/>
>+                <enum name="GL_IMAGE_BINDING_LEVEL_EXT"/>
>+                <enum name="GL_IMAGE_BINDING_LAYERED_EXT"/>
>+                <enum name="GL_IMAGE_BINDING_LAYER_EXT"/>
>+                <enum name="GL_IMAGE_BINDING_ACCESS_EXT"/>
>+                <enum name="GL_IMAGE_1D_EXT"/>
>+                <enum name="GL_IMAGE_2D_EXT"/>
>+                <enum name="GL_IMAGE_3D_EXT"/>
>+                <enum name="GL_IMAGE_2D_RECT_EXT"/>
>+                <enum name="GL_IMAGE_CUBE_EXT"/>
>+                <enum name="GL_IMAGE_BUFFER_EXT"/>
>+                <enum name="GL_IMAGE_1D_ARRAY_EXT"/>
>+                <enum name="GL_IMAGE_2D_ARRAY_EXT"/>
>+                <enum name="GL_IMAGE_CUBE_MAP_ARRAY_EXT"/>
>+                <enum name="GL_IMAGE_2D_MULTISAMPLE_EXT"/>
>+                <enum name="GL_IMAGE_2D_MULTISAMPLE_ARRAY_EXT"/>
>+                <enum name="GL_INT_IMAGE_1D_EXT"/>
>+                <enum name="GL_INT_IMAGE_2D_EXT"/>
>+                <enum name="GL_INT_IMAGE_3D_EXT"/>
>+                <enum name="GL_INT_IMAGE_2D_RECT_EXT"/>
>+                <enum name="GL_INT_IMAGE_CUBE_EXT"/>
>+                <enum name="GL_INT_IMAGE_BUFFER_EXT"/>
>+                <enum name="GL_INT_IMAGE_1D_ARRAY_EXT"/>
>+                <enum name="GL_INT_IMAGE_2D_ARRAY_EXT"/>
>+                <enum name="GL_INT_IMAGE_CUBE_MAP_ARRAY_EXT"/>
>+                <enum name="GL_INT_IMAGE_2D_MULTISAMPLE_EXT"/>
>+                <enum name="GL_INT_IMAGE_2D_MULTISAMPLE_ARRAY_EXT"/>
>+                <enum name="GL_UNSIGNED_INT_IMAGE_1D_EXT"/>
>+                <enum name="GL_UNSIGNED_INT_IMAGE_2D_EXT"/>
>+                <enum name="GL_UNSIGNED_INT_IMAGE_3D_EXT"/>
>+                <enum name="GL_UNSIGNED_INT_IMAGE_2D_RECT_EXT"/>
>+                <enum name="GL_UNSIGNED_INT_IMAGE_CUBE_EXT"/>
>+                <enum name="GL_UNSIGNED_INT_IMAGE_BUFFER_EXT"/>
>+                <enum name="GL_UNSIGNED_INT_IMAGE_1D_ARRAY_EXT"/>
>+                <enum name="GL_UNSIGNED_INT_IMAGE_2D_ARRAY_EXT"/>
>+                <enum name="GL_UNSIGNED_INT_IMAGE_CUBE_MAP_ARRAY_EXT"/>
>+                <enum name="GL_UNSIGNED_INT_IMAGE_2D_MULTISAMPLE_EXT"/>
>+                <enum name="GL_UNSIGNED_INT_IMAGE_2D_MULTISAMPLE_ARRAY_EXT"/>
>+                <enum name="GL_MAX_IMAGE_SAMPLES_EXT"/>
>+                <enum name="GL_IMAGE_BINDING_FORMAT_EXT"/>
>+                <enum name="GL_VERTEX_ATTRIB_ARRAY_BARRIER_BIT_EXT"/>
>+                <enum name="GL_ELEMENT_ARRAY_BARRIER_BIT_EXT"/>
>+                <enum name="GL_UNIFORM_BARRIER_BIT_EXT"/>
>+                <enum name="GL_TEXTURE_FETCH_BARRIER_BIT_EXT"/>
>+                <enum name="GL_SHADER_IMAGE_ACCESS_BARRIER_BIT_EXT"/>
>+                <enum name="GL_COMMAND_BARRIER_BIT_EXT"/>
>+                <enum name="GL_PIXEL_BUFFER_BARRIER_BIT_EXT"/>
>+                <enum name="GL_TEXTURE_UPDATE_BARRIER_BIT_EXT"/>
>+                <enum name="GL_BUFFER_UPDATE_BARRIER_BIT_EXT"/>
>+                <enum name="GL_FRAMEBUFFER_BARRIER_BIT_EXT"/>
>+                <enum name="GL_TRANSFORM_FEEDBACK_BARRIER_BIT_EXT"/>
>+                <enum name="GL_ATOMIC_COUNTER_BARRIER_BIT_EXT"/>
>+                <enum name="GL_ALL_BARRIER_BITS_EXT"/>
>+                <command name="glBindImageTextureEXT"/>
>+                <command name="glMemoryBarrierEXT"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_EXT_shader_implicit_conversions" supported="gles2"/>
>+        <extension name="GL_EXT_shader_integer_mix" supported="gl|glcore|gles2"/>
>+        <extension name="GL_EXT_shader_io_blocks" supported="gles2"/>
>+        <extension name="GL_EXT_shader_non_constant_global_initializers" supported="gles2"/>
>+        <extension name="GL_EXT_shader_pixel_local_storage" supported="gles2">
>+            <require>
>+                <enum name="GL_MAX_SHADER_PIXEL_LOCAL_STORAGE_FAST_SIZE_EXT"/>
>+                <enum name="GL_MAX_SHADER_PIXEL_LOCAL_STORAGE_SIZE_EXT"/>
>+                <enum name="GL_SHADER_PIXEL_LOCAL_STORAGE_EXT"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_EXT_shader_pixel_local_storage2" supported="gles2">
>+            <require>
>+                <enum name="GL_MAX_SHADER_COMBINED_LOCAL_STORAGE_FAST_SIZE_EXT"/>
>+                <enum name="GL_MAX_SHADER_COMBINED_LOCAL_STORAGE_SIZE_EXT"/>
>+                <enum name="GL_FRAMEBUFFER_INCOMPLETE_INSUFFICIENT_SHADER_COMBINED_LOCAL_STORAGE_EXT"/>
>+                <command name="glFramebufferPixelLocalStorageSizeEXT"/>
>+                <command name="glGetFramebufferPixelLocalStorageSizeEXT"/>
>+                <command name="glClearPixelLocalStorageuiEXT"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_EXT_shader_texture_lod" supported="gles2"/>
>+        <extension name="GL_EXT_shadow_funcs" supported="gl"/>
>+        <extension name="GL_EXT_shadow_samplers" supported="gles2">
>+            <require>
>+                <enum name="GL_TEXTURE_COMPARE_MODE_EXT"/>
>+                <enum name="GL_TEXTURE_COMPARE_FUNC_EXT"/>
>+                <enum name="GL_COMPARE_REF_TO_TEXTURE_EXT"/>
>+                <enum name="GL_SAMPLER_2D_SHADOW_EXT"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_EXT_shared_texture_palette" supported="gl">
>+            <require>
>+                <enum name="GL_SHARED_TEXTURE_PALETTE_EXT"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_EXT_sparse_texture" supported="gles2">
>+            <require>
>+                <enum name="GL_TEXTURE_SPARSE_EXT"/>
>+                <enum name="GL_VIRTUAL_PAGE_SIZE_INDEX_EXT"/>
>+                <enum name="GL_NUM_SPARSE_LEVELS_EXT"/>
>+                <enum name="GL_NUM_VIRTUAL_PAGE_SIZES_EXT"/>
>+                <enum name="GL_VIRTUAL_PAGE_SIZE_X_EXT"/>
>+                <enum name="GL_VIRTUAL_PAGE_SIZE_Y_EXT"/>
>+                <enum name="GL_VIRTUAL_PAGE_SIZE_Z_EXT"/>
>+                <enum name="GL_TEXTURE_2D"/>
>+                <enum name="GL_TEXTURE_2D_ARRAY"/>
>+                <enum name="GL_TEXTURE_CUBE_MAP"/>
>+                <enum name="GL_TEXTURE_CUBE_MAP_ARRAY_OES"/>
>+                <enum name="GL_TEXTURE_3D"/>
>+                <enum name="GL_MAX_SPARSE_TEXTURE_SIZE_EXT"/>
>+                <enum name="GL_MAX_SPARSE_3D_TEXTURE_SIZE_EXT"/>
>+                <enum name="GL_MAX_SPARSE_ARRAY_TEXTURE_LAYERS_EXT"/>
>+                <enum name="GL_SPARSE_TEXTURE_FULL_ARRAY_CUBE_MIPMAPS_EXT"/>
>+                <command name="glTexPageCommitmentEXT"/>
>+                
>+            </require>
>+        </extension>
>+        <extension name="GL_EXT_sparse_texture2" supported="gl|gles2"/>
>+        <extension name="GL_EXT_stencil_clear_tag" supported="gl">
>+            <require>
>+                <enum name="GL_STENCIL_TAG_BITS_EXT"/>
>+                <enum name="GL_STENCIL_CLEAR_TAG_VALUE_EXT"/>
>+                <command name="glStencilClearTagEXT"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_EXT_stencil_two_side" supported="gl">
>+            <require>
>+                <enum name="GL_STENCIL_TEST_TWO_SIDE_EXT"/>
>+                <enum name="GL_ACTIVE_STENCIL_FACE_EXT"/>
>+                <command name="glActiveStencilFaceEXT"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_EXT_stencil_wrap" supported="gl">
>+            <require>
>+                <enum name="GL_INCR_WRAP_EXT"/>
>+                <enum name="GL_DECR_WRAP_EXT"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_EXT_subtexture" supported="gl">
>+            <require>
>+                <command name="glTexSubImage1DEXT"/>
>+                <command name="glTexSubImage2DEXT"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_EXT_tessellation_point_size" supported="gles2"/>
>+        <extension name="GL_EXT_tessellation_shader" supported="gles2">
>+            <require>
>+                <enum name="GL_PATCHES_EXT"/>
>+                <enum name="GL_PATCH_VERTICES_EXT"/>
>+                <enum name="GL_TESS_CONTROL_OUTPUT_VERTICES_EXT"/>
>+                <enum name="GL_TESS_GEN_MODE_EXT"/>
>+                <enum name="GL_TESS_GEN_SPACING_EXT"/>
>+                <enum name="GL_TESS_GEN_VERTEX_ORDER_EXT"/>
>+                <enum name="GL_TESS_GEN_POINT_MODE_EXT"/>
>+                <enum name="GL_TRIANGLES"/>
>+                <enum name="GL_ISOLINES_EXT"/>
>+                <enum name="GL_QUADS_EXT"/>
>+                <enum name="GL_EQUAL"/>
>+                <enum name="GL_FRACTIONAL_ODD_EXT"/>
>+                <enum name="GL_FRACTIONAL_EVEN_EXT"/>
>+                <enum name="GL_CCW"/>
>+                <enum name="GL_CW"/>
>+                <enum name="GL_MAX_PATCH_VERTICES_EXT"/>
>+                <enum name="GL_MAX_TESS_GEN_LEVEL_EXT"/>
>+                <enum name="GL_MAX_TESS_CONTROL_UNIFORM_COMPONENTS_EXT"/>
>+                <enum name="GL_MAX_TESS_EVALUATION_UNIFORM_COMPONENTS_EXT"/>
>+                <enum name="GL_MAX_TESS_CONTROL_TEXTURE_IMAGE_UNITS_EXT"/>
>+                <enum name="GL_MAX_TESS_EVALUATION_TEXTURE_IMAGE_UNITS_EXT"/>
>+                <enum name="GL_MAX_TESS_CONTROL_OUTPUT_COMPONENTS_EXT"/>
>+                <enum name="GL_MAX_TESS_PATCH_COMPONENTS_EXT"/>
>+                <enum name="GL_MAX_TESS_CONTROL_TOTAL_OUTPUT_COMPONENTS_EXT"/>
>+                <enum name="GL_MAX_TESS_EVALUATION_OUTPUT_COMPONENTS_EXT"/>
>+                <enum name="GL_MAX_TESS_CONTROL_UNIFORM_BLOCKS_EXT"/>
>+                <enum name="GL_MAX_TESS_EVALUATION_UNIFORM_BLOCKS_EXT"/>
>+                <enum name="GL_MAX_TESS_CONTROL_INPUT_COMPONENTS_EXT"/>
>+                <enum name="GL_MAX_TESS_EVALUATION_INPUT_COMPONENTS_EXT"/>
>+                <enum name="GL_MAX_COMBINED_TESS_CONTROL_UNIFORM_COMPONENTS_EXT"/>
>+                <enum name="GL_MAX_COMBINED_TESS_EVALUATION_UNIFORM_COMPONENTS_EXT"/>
>+                <enum name="GL_MAX_TESS_CONTROL_ATOMIC_COUNTER_BUFFERS_EXT"/>
>+                <enum name="GL_MAX_TESS_EVALUATION_ATOMIC_COUNTER_BUFFERS_EXT"/>
>+                <enum name="GL_MAX_TESS_CONTROL_ATOMIC_COUNTERS_EXT"/>
>+                <enum name="GL_MAX_TESS_EVALUATION_ATOMIC_COUNTERS_EXT"/>
>+                <enum name="GL_MAX_TESS_CONTROL_IMAGE_UNIFORMS_EXT"/>
>+                <enum name="GL_MAX_TESS_EVALUATION_IMAGE_UNIFORMS_EXT"/>
>+                <enum name="GL_MAX_TESS_CONTROL_SHADER_STORAGE_BLOCKS_EXT"/>
>+                <enum name="GL_MAX_TESS_EVALUATION_SHADER_STORAGE_BLOCKS_EXT"/>
>+                <enum name="GL_PRIMITIVE_RESTART_FOR_PATCHES_SUPPORTED"/>
>+                <enum name="GL_IS_PER_PATCH_EXT"/>
>+                <enum name="GL_REFERENCED_BY_TESS_CONTROL_SHADER_EXT"/>
>+                <enum name="GL_REFERENCED_BY_TESS_EVALUATION_SHADER_EXT"/>
>+                <enum name="GL_TESS_CONTROL_SHADER_EXT"/>
>+                <enum name="GL_TESS_EVALUATION_SHADER_EXT"/>
>+                <enum name="GL_TESS_CONTROL_SHADER_BIT_EXT"/>
>+                <enum name="GL_TESS_EVALUATION_SHADER_BIT_EXT"/>
>+                <command name="glPatchParameteriEXT"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_EXT_texture" supported="gl">
>+            <require>
>+                <enum name="GL_ALPHA4_EXT"/>
>+                <enum name="GL_ALPHA8_EXT"/>
>+                <enum name="GL_ALPHA12_EXT"/>
>+                <enum name="GL_ALPHA16_EXT"/>
>+                <enum name="GL_LUMINANCE4_EXT"/>
>+                <enum name="GL_LUMINANCE8_EXT"/>
>+                <enum name="GL_LUMINANCE12_EXT"/>
>+                <enum name="GL_LUMINANCE16_EXT"/>
>+                <enum name="GL_LUMINANCE4_ALPHA4_EXT"/>
>+                <enum name="GL_LUMINANCE6_ALPHA2_EXT"/>
>+                <enum name="GL_LUMINANCE8_ALPHA8_EXT"/>
>+                <enum name="GL_LUMINANCE12_ALPHA4_EXT"/>
>+                <enum name="GL_LUMINANCE12_ALPHA12_EXT"/>
>+                <enum name="GL_LUMINANCE16_ALPHA16_EXT"/>
>+                <enum name="GL_INTENSITY_EXT"/>
>+                <enum name="GL_INTENSITY4_EXT"/>
>+                <enum name="GL_INTENSITY8_EXT"/>
>+                <enum name="GL_INTENSITY12_EXT"/>
>+                <enum name="GL_INTENSITY16_EXT"/>
>+                <enum name="GL_RGB2_EXT"/>
>+                <enum name="GL_RGB4_EXT"/>
>+                <enum name="GL_RGB5_EXT"/>
>+                <enum name="GL_RGB8_EXT"/>
>+                <enum name="GL_RGB10_EXT"/>
>+                <enum name="GL_RGB12_EXT"/>
>+                <enum name="GL_RGB16_EXT"/>
>+                <enum name="GL_RGBA2_EXT"/>
>+                <enum name="GL_RGBA4_EXT"/>
>+                <enum name="GL_RGB5_A1_EXT"/>
>+                <enum name="GL_RGBA8_EXT"/>
>+                <enum name="GL_RGB10_A2_EXT"/>
>+                <enum name="GL_RGBA12_EXT"/>
>+                <enum name="GL_RGBA16_EXT"/>
>+                <enum name="GL_TEXTURE_RED_SIZE_EXT"/>
>+                <enum name="GL_TEXTURE_GREEN_SIZE_EXT"/>
>+                <enum name="GL_TEXTURE_BLUE_SIZE_EXT"/>
>+                <enum name="GL_TEXTURE_ALPHA_SIZE_EXT"/>
>+                <enum name="GL_TEXTURE_LUMINANCE_SIZE_EXT"/>
>+                <enum name="GL_TEXTURE_INTENSITY_SIZE_EXT"/>
>+                <enum name="GL_REPLACE_EXT"/>
>+                <enum name="GL_PROXY_TEXTURE_1D_EXT"/>
>+                <enum name="GL_PROXY_TEXTURE_2D_EXT"/>
>+                <enum name="GL_TEXTURE_TOO_LARGE_EXT"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_EXT_texture3D" supported="gl">
>+            <require>
>+                <enum name="GL_PACK_SKIP_IMAGES_EXT"/>
>+                <enum name="GL_PACK_IMAGE_HEIGHT_EXT"/>
>+                <enum name="GL_UNPACK_SKIP_IMAGES_EXT"/>
>+                <enum name="GL_UNPACK_IMAGE_HEIGHT_EXT"/>
>+                <enum name="GL_TEXTURE_3D_EXT"/>
>+                <enum name="GL_PROXY_TEXTURE_3D_EXT"/>
>+                <enum name="GL_TEXTURE_DEPTH_EXT"/>
>+                <enum name="GL_TEXTURE_WRAP_R_EXT"/>
>+                <enum name="GL_MAX_3D_TEXTURE_SIZE_EXT"/>
>+                <command name="glTexImage3DEXT"/>
>+                <command name="glTexSubImage3DEXT"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_EXT_texture_array" supported="gl">
>+            <require>
>+                <enum name="GL_TEXTURE_1D_ARRAY_EXT"/>
>+                <enum name="GL_PROXY_TEXTURE_1D_ARRAY_EXT"/>
>+                <enum name="GL_TEXTURE_2D_ARRAY_EXT"/>
>+                <enum name="GL_PROXY_TEXTURE_2D_ARRAY_EXT"/>
>+                <enum name="GL_TEXTURE_BINDING_1D_ARRAY_EXT"/>
>+                <enum name="GL_TEXTURE_BINDING_2D_ARRAY_EXT"/>
>+                <enum name="GL_MAX_ARRAY_TEXTURE_LAYERS_EXT"/>
>+                <enum name="GL_COMPARE_REF_DEPTH_TO_TEXTURE_EXT"/>
>+                <enum name="GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER_EXT"/>
>+                <command name="glFramebufferTextureLayerEXT"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_EXT_texture_border_clamp" supported="gles2">
>+            <require>
>+                <enum name="GL_TEXTURE_BORDER_COLOR_EXT"/>
>+                <enum name="GL_CLAMP_TO_BORDER_EXT"/>
>+                <command name="glTexParameterIivEXT"/>
>+                <command name="glTexParameterIuivEXT"/>
>+                <command name="glGetTexParameterIivEXT"/>
>+                <command name="glGetTexParameterIuivEXT"/>
>+                <command name="glSamplerParameterIivEXT"/>
>+                <command name="glSamplerParameterIuivEXT"/>
>+                <command name="glGetSamplerParameterIivEXT"/>
>+                <command name="glGetSamplerParameterIuivEXT"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_EXT_texture_buffer" supported="gles2">
>+            <require>
>+                <enum name="GL_TEXTURE_BUFFER_EXT"/>
>+                <enum name="GL_TEXTURE_BUFFER_BINDING_EXT"/>
>+                <enum name="GL_MAX_TEXTURE_BUFFER_SIZE_EXT"/>
>+                <enum name="GL_TEXTURE_BINDING_BUFFER_EXT"/>
>+                <enum name="GL_TEXTURE_BUFFER_DATA_STORE_BINDING_EXT"/>
>+                <enum name="GL_TEXTURE_BUFFER_OFFSET_ALIGNMENT_EXT"/>
>+                <enum name="GL_SAMPLER_BUFFER_EXT"/>
>+                <enum name="GL_INT_SAMPLER_BUFFER_EXT"/>
>+                <enum name="GL_UNSIGNED_INT_SAMPLER_BUFFER_EXT"/>
>+                <enum name="GL_IMAGE_BUFFER_EXT"/>
>+                <enum name="GL_INT_IMAGE_BUFFER_EXT"/>
>+                <enum name="GL_UNSIGNED_INT_IMAGE_BUFFER_EXT"/>
>+                <enum name="GL_TEXTURE_BUFFER_OFFSET_EXT"/>
>+                <enum name="GL_TEXTURE_BUFFER_SIZE_EXT"/>
>+                <command name="glTexBufferEXT"/>
>+                <command name="glTexBufferRangeEXT"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_EXT_texture_buffer_object" supported="gl">
>+            <require>
>+                <enum name="GL_TEXTURE_BUFFER_EXT"/>
>+                <enum name="GL_MAX_TEXTURE_BUFFER_SIZE_EXT"/>
>+                <enum name="GL_TEXTURE_BINDING_BUFFER_EXT"/>
>+                <enum name="GL_TEXTURE_BUFFER_DATA_STORE_BINDING_EXT"/>
>+                <enum name="GL_TEXTURE_BUFFER_FORMAT_EXT"/>
>+                <command name="glTexBufferEXT"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_EXT_texture_compression_astc_decode_mode" supported="gles2">
>+            <require>
>+                <enum name="GL_TEXTURE_ASTC_DECODE_PRECISION_EXT"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_EXT_texture_compression_bptc" supported="gles2">
>+            <require>
>+                <enum name="GL_COMPRESSED_RGBA_BPTC_UNORM_EXT"/>
>+                <enum name="GL_COMPRESSED_SRGB_ALPHA_BPTC_UNORM_EXT"/>
>+                <enum name="GL_COMPRESSED_RGB_BPTC_SIGNED_FLOAT_EXT"/>
>+                <enum name="GL_COMPRESSED_RGB_BPTC_UNSIGNED_FLOAT_EXT"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_EXT_texture_compression_dxt1" supported="gles1|gles2">
>+            <require>
>+                <enum name="GL_COMPRESSED_RGB_S3TC_DXT1_EXT"/>
>+                <enum name="GL_COMPRESSED_RGBA_S3TC_DXT1_EXT"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_EXT_texture_compression_latc" supported="gl">
>+            <require>
>+                <enum name="GL_COMPRESSED_LUMINANCE_LATC1_EXT"/>
>+                <enum name="GL_COMPRESSED_SIGNED_LUMINANCE_LATC1_EXT"/>
>+                <enum name="GL_COMPRESSED_LUMINANCE_ALPHA_LATC2_EXT"/>
>+                <enum name="GL_COMPRESSED_SIGNED_LUMINANCE_ALPHA_LATC2_EXT"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_EXT_texture_compression_rgtc" supported="gl|gles2">
>+            <require>
>+                <enum name="GL_COMPRESSED_RED_RGTC1_EXT"/>
>+                <enum name="GL_COMPRESSED_SIGNED_RED_RGTC1_EXT"/>
>+                <enum name="GL_COMPRESSED_RED_GREEN_RGTC2_EXT"/>
>+                <enum name="GL_COMPRESSED_SIGNED_RED_GREEN_RGTC2_EXT"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_EXT_texture_compression_s3tc" supported="gl|glcore|gles2|glsc2">
>+            <require>
>+                <enum name="GL_COMPRESSED_RGB_S3TC_DXT1_EXT"/>
>+                <enum name="GL_COMPRESSED_RGBA_S3TC_DXT1_EXT"/>
>+                <enum name="GL_COMPRESSED_RGBA_S3TC_DXT3_EXT"/>
>+                <enum name="GL_COMPRESSED_RGBA_S3TC_DXT5_EXT"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_EXT_texture_compression_s3tc_srgb" supported="gles2">
>+            <require>
>+                <enum name="GL_COMPRESSED_SRGB_S3TC_DXT1_EXT"/>
>+                <enum name="GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT1_EXT"/>
>+                <enum name="GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT3_EXT"/>
>+                <enum name="GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT5_EXT"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_EXT_texture_cube_map" supported="gl" comment="Replaced by ARB_texture_cube_map, but was apparently shipped anyway?">
>+            <require>
>+                <enum name="GL_NORMAL_MAP_EXT"/>
>+                <enum name="GL_REFLECTION_MAP_EXT"/>
>+                <enum name="GL_TEXTURE_CUBE_MAP_EXT"/>
>+                <enum name="GL_TEXTURE_BINDING_CUBE_MAP_EXT"/>
>+                <enum name="GL_TEXTURE_CUBE_MAP_POSITIVE_X_EXT"/>
>+                <enum name="GL_TEXTURE_CUBE_MAP_NEGATIVE_X_EXT"/>
>+                <enum name="GL_TEXTURE_CUBE_MAP_POSITIVE_Y_EXT"/>
>+                <enum name="GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_EXT"/>
>+                <enum name="GL_TEXTURE_CUBE_MAP_POSITIVE_Z_EXT"/>
>+                <enum name="GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_EXT"/>
>+                <enum name="GL_PROXY_TEXTURE_CUBE_MAP_EXT"/>
>+                <enum name="GL_MAX_CUBE_MAP_TEXTURE_SIZE_EXT"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_EXT_texture_cube_map_array" supported="gles2">
>+            <require>
>+                <enum name="GL_TEXTURE_CUBE_MAP_ARRAY_EXT"/>
>+                <enum name="GL_TEXTURE_BINDING_CUBE_MAP_ARRAY_EXT"/>
>+                <enum name="GL_SAMPLER_CUBE_MAP_ARRAY_EXT"/>
>+                <enum name="GL_SAMPLER_CUBE_MAP_ARRAY_SHADOW_EXT"/>
>+                <enum name="GL_INT_SAMPLER_CUBE_MAP_ARRAY_EXT"/>
>+                <enum name="GL_UNSIGNED_INT_SAMPLER_CUBE_MAP_ARRAY_EXT"/>
>+                <enum name="GL_IMAGE_CUBE_MAP_ARRAY_EXT"/>
>+                <enum name="GL_INT_IMAGE_CUBE_MAP_ARRAY_EXT"/>
>+                <enum name="GL_UNSIGNED_INT_IMAGE_CUBE_MAP_ARRAY_EXT"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_EXT_texture_env_add" supported="gl"/>
>+        <extension name="GL_EXT_texture_env_combine" supported="gl">
>+            <require>
>+                <enum name="GL_COMBINE_EXT"/>
>+                <enum name="GL_COMBINE_RGB_EXT"/>
>+                <enum name="GL_COMBINE_ALPHA_EXT"/>
>+                <enum name="GL_RGB_SCALE_EXT"/>
>+                <enum name="GL_ADD_SIGNED_EXT"/>
>+                <enum name="GL_INTERPOLATE_EXT"/>
>+                <enum name="GL_CONSTANT_EXT"/>
>+                <enum name="GL_PRIMARY_COLOR_EXT"/>
>+                <enum name="GL_PREVIOUS_EXT"/>
>+                <enum name="GL_SOURCE0_RGB_EXT"/>
>+                <enum name="GL_SOURCE1_RGB_EXT"/>
>+                <enum name="GL_SOURCE2_RGB_EXT"/>
>+                <enum name="GL_SOURCE0_ALPHA_EXT"/>
>+                <enum name="GL_SOURCE1_ALPHA_EXT"/>
>+                <enum name="GL_SOURCE2_ALPHA_EXT"/>
>+                <enum name="GL_OPERAND0_RGB_EXT"/>
>+                <enum name="GL_OPERAND1_RGB_EXT"/>
>+                <enum name="GL_OPERAND2_RGB_EXT"/>
>+                <enum name="GL_OPERAND0_ALPHA_EXT"/>
>+                <enum name="GL_OPERAND1_ALPHA_EXT"/>
>+                <enum name="GL_OPERAND2_ALPHA_EXT"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_EXT_texture_env_dot3" supported="gl">
>+            <require>
>+                <enum name="GL_DOT3_RGB_EXT"/>
>+                <enum name="GL_DOT3_RGBA_EXT"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_EXT_texture_filter_anisotropic" supported="gl|gles1|gles2">
>+            <require>
>+                <enum name="GL_TEXTURE_MAX_ANISOTROPY_EXT"/>
>+                <enum name="GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_EXT_texture_filter_minmax" supported="gl|glcore|gles2">
>+            <require>
>+                <enum name="GL_TEXTURE_REDUCTION_MODE_EXT"/>
>+                <enum name="GL_WEIGHTED_AVERAGE_EXT"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_EXT_texture_format_BGRA8888" supported="gles1|gles2">
>+            <require>
>+                <enum name="GL_BGRA_EXT"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_EXT_texture_format_sRGB_override" supported="gles2">
>+            <require>
>+                <enum name="GL_TEXTURE_FORMAT_SRGB_OVERRIDE_EXT"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_EXT_texture_integer" supported="gl">
>+            <require>
>+                <enum name="GL_RGBA32UI_EXT"/>
>+                <enum name="GL_RGB32UI_EXT"/>
>+                <enum name="GL_ALPHA32UI_EXT"/>
>+                <enum name="GL_INTENSITY32UI_EXT"/>
>+                <enum name="GL_LUMINANCE32UI_EXT"/>
>+                <enum name="GL_LUMINANCE_ALPHA32UI_EXT"/>
>+                <enum name="GL_RGBA16UI_EXT"/>
>+                <enum name="GL_RGB16UI_EXT"/>
>+                <enum name="GL_ALPHA16UI_EXT"/>
>+                <enum name="GL_INTENSITY16UI_EXT"/>
>+                <enum name="GL_LUMINANCE16UI_EXT"/>
>+                <enum name="GL_LUMINANCE_ALPHA16UI_EXT"/>
>+                <enum name="GL_RGBA8UI_EXT"/>
>+                <enum name="GL_RGB8UI_EXT"/>
>+                <enum name="GL_ALPHA8UI_EXT"/>
>+                <enum name="GL_INTENSITY8UI_EXT"/>
>+                <enum name="GL_LUMINANCE8UI_EXT"/>
>+                <enum name="GL_LUMINANCE_ALPHA8UI_EXT"/>
>+                <enum name="GL_RGBA32I_EXT"/>
>+                <enum name="GL_RGB32I_EXT"/>
>+                <enum name="GL_ALPHA32I_EXT"/>
>+                <enum name="GL_INTENSITY32I_EXT"/>
>+                <enum name="GL_LUMINANCE32I_EXT"/>
>+                <enum name="GL_LUMINANCE_ALPHA32I_EXT"/>
>+                <enum name="GL_RGBA16I_EXT"/>
>+                <enum name="GL_RGB16I_EXT"/>
>+                <enum name="GL_ALPHA16I_EXT"/>
>+                <enum name="GL_INTENSITY16I_EXT"/>
>+                <enum name="GL_LUMINANCE16I_EXT"/>
>+                <enum name="GL_LUMINANCE_ALPHA16I_EXT"/>
>+                <enum name="GL_RGBA8I_EXT"/>
>+                <enum name="GL_RGB8I_EXT"/>
>+                <enum name="GL_ALPHA8I_EXT"/>
>+                <enum name="GL_INTENSITY8I_EXT"/>
>+                <enum name="GL_LUMINANCE8I_EXT"/>
>+                <enum name="GL_LUMINANCE_ALPHA8I_EXT"/>
>+                <enum name="GL_RED_INTEGER_EXT"/>
>+                <enum name="GL_GREEN_INTEGER_EXT"/>
>+                <enum name="GL_BLUE_INTEGER_EXT"/>
>+                <enum name="GL_ALPHA_INTEGER_EXT"/>
>+                <enum name="GL_RGB_INTEGER_EXT"/>
>+                <enum name="GL_RGBA_INTEGER_EXT"/>
>+                <enum name="GL_BGR_INTEGER_EXT"/>
>+                <enum name="GL_BGRA_INTEGER_EXT"/>
>+                <enum name="GL_LUMINANCE_INTEGER_EXT"/>
>+                <enum name="GL_LUMINANCE_ALPHA_INTEGER_EXT"/>
>+                <enum name="GL_RGBA_INTEGER_MODE_EXT"/>
>+                <command name="glTexParameterIivEXT"/>
>+                <command name="glTexParameterIuivEXT"/>
>+                <command name="glGetTexParameterIivEXT"/>
>+                <command name="glGetTexParameterIuivEXT"/>
>+                <command name="glClearColorIiEXT"/>
>+                <command name="glClearColorIuiEXT"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_EXT_texture_lod_bias" supported="gl|gles1">
>+            <require>
>+                <enum name="GL_MAX_TEXTURE_LOD_BIAS_EXT"/>
>+                <enum name="GL_TEXTURE_FILTER_CONTROL_EXT"/>
>+                <enum name="GL_TEXTURE_LOD_BIAS_EXT"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_EXT_texture_mirror_clamp" supported="gl">
>+            <require>
>+                <enum name="GL_MIRROR_CLAMP_EXT"/>
>+                <enum name="GL_MIRROR_CLAMP_TO_EDGE_EXT"/>
>+                <enum name="GL_MIRROR_CLAMP_TO_BORDER_EXT"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_EXT_texture_mirror_clamp_to_edge" supported="gles2">
>+            <require>
>+                <enum name="GL_MIRROR_CLAMP_TO_EDGE_EXT"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_EXT_texture_norm16" supported="gles2">
>+            <require>
>+                <enum name="GL_R16_EXT"/>
>+                <enum name="GL_RG16_EXT"/>
>+                <enum name="GL_RGBA16_EXT"/>
>+                <enum name="GL_RGB16_EXT"/>
>+                <enum name="GL_R16_SNORM_EXT"/>
>+                <enum name="GL_RG16_SNORM_EXT"/>
>+                <enum name="GL_RGB16_SNORM_EXT"/>
>+                <enum name="GL_RGBA16_SNORM_EXT"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_EXT_texture_object" supported="gl">
>+            <require>
>+                <enum name="GL_TEXTURE_PRIORITY_EXT"/>
>+                <enum name="GL_TEXTURE_RESIDENT_EXT"/>
>+                <enum name="GL_TEXTURE_1D_BINDING_EXT"/>
>+                <enum name="GL_TEXTURE_2D_BINDING_EXT"/>
>+                <enum name="GL_TEXTURE_3D_BINDING_EXT"/>
>+                <command name="glAreTexturesResidentEXT"/>
>+                <command name="glBindTextureEXT"/>
>+                <command name="glDeleteTexturesEXT"/>
>+                <command name="glGenTexturesEXT"/>
>+                <command name="glIsTextureEXT"/>
>+                <command name="glPrioritizeTexturesEXT"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_EXT_texture_perturb_normal" supported="gl">
>+            <require>
>+                <enum name="GL_PERTURB_EXT"/>
>+                <enum name="GL_TEXTURE_NORMAL_EXT"/>
>+                <command name="glTextureNormalEXT"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_EXT_texture_rg" supported="gles2">
>+            <require>
>+                <enum name="GL_RED_EXT"/>
>+                <enum name="GL_RG_EXT"/>
>+                <enum name="GL_R8_EXT"/>
>+                <enum name="GL_RG8_EXT"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_EXT_texture_sRGB" supported="gl">
>+            <require>
>+                <enum name="GL_SRGB_EXT"/>
>+                <enum name="GL_SRGB8_EXT"/>
>+                <enum name="GL_SRGB_ALPHA_EXT"/>
>+                <enum name="GL_SRGB8_ALPHA8_EXT"/>
>+                <enum name="GL_SLUMINANCE_ALPHA_EXT"/>
>+                <enum name="GL_SLUMINANCE8_ALPHA8_EXT"/>
>+                <enum name="GL_SLUMINANCE_EXT"/>
>+                <enum name="GL_SLUMINANCE8_EXT"/>
>+                <enum name="GL_COMPRESSED_SRGB_EXT"/>
>+                <enum name="GL_COMPRESSED_SRGB_ALPHA_EXT"/>
>+                <enum name="GL_COMPRESSED_SLUMINANCE_EXT"/>
>+                <enum name="GL_COMPRESSED_SLUMINANCE_ALPHA_EXT"/>
>+                <enum name="GL_COMPRESSED_SRGB_S3TC_DXT1_EXT"/>
>+                <enum name="GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT1_EXT"/>
>+                <enum name="GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT3_EXT"/>
>+                <enum name="GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT5_EXT"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_EXT_texture_sRGB_R8" supported="gles2">
>+            <require>
>+                <enum name="GL_SR8_EXT"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_EXT_texture_sRGB_RG8" supported="gles2">
>+            <require>
>+                <enum name="GL_SRG8_EXT"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_EXT_texture_sRGB_decode" supported="gl|glcore|gles2">
>+            <require>
>+                <enum name="GL_TEXTURE_SRGB_DECODE_EXT"/>
>+                <enum name="GL_DECODE_EXT"/>
>+                <enum name="GL_SKIP_DECODE_EXT"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_EXT_texture_shared_exponent" supported="gl">
>+            <require>
>+                <enum name="GL_RGB9_E5_EXT"/>
>+                <enum name="GL_UNSIGNED_INT_5_9_9_9_REV_EXT"/>
>+                <enum name="GL_TEXTURE_SHARED_SIZE_EXT"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_EXT_texture_snorm" supported="gl">
>+            <require>
>+                <enum name="GL_ALPHA_SNORM"/>
>+                <enum name="GL_LUMINANCE_SNORM"/>
>+                <enum name="GL_LUMINANCE_ALPHA_SNORM"/>
>+                <enum name="GL_INTENSITY_SNORM"/>
>+                <enum name="GL_ALPHA8_SNORM"/>
>+                <enum name="GL_LUMINANCE8_SNORM"/>
>+                <enum name="GL_LUMINANCE8_ALPHA8_SNORM"/>
>+                <enum name="GL_INTENSITY8_SNORM"/>
>+                <enum name="GL_ALPHA16_SNORM"/>
>+                <enum name="GL_LUMINANCE16_SNORM"/>
>+                <enum name="GL_LUMINANCE16_ALPHA16_SNORM"/>
>+                <enum name="GL_INTENSITY16_SNORM"/>
>+                <enum name="GL_RED_SNORM"/>
>+                <enum name="GL_RG_SNORM"/>
>+                <enum name="GL_RGB_SNORM"/>
>+                <enum name="GL_RGBA_SNORM"/>
>+                <enum name="GL_R8_SNORM"/>
>+                <enum name="GL_RG8_SNORM"/>
>+                <enum name="GL_RGB8_SNORM"/>
>+                <enum name="GL_RGBA8_SNORM"/>
>+                <enum name="GL_R16_SNORM"/>
>+                <enum name="GL_RG16_SNORM"/>
>+                <enum name="GL_RGB16_SNORM"/>
>+                <enum name="GL_RGBA16_SNORM"/>
>+                <enum name="GL_SIGNED_NORMALIZED"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_EXT_texture_storage" supported="gles1|gles2">
>+            <require comment="Not clear all of these enums should be here for OpenGL ES. Many are only defined if other extensions also requiring them are supported">
>+                <enum name="GL_TEXTURE_IMMUTABLE_FORMAT_EXT"/>
>+                <enum name="GL_ALPHA8_EXT"/>
>+                <enum name="GL_LUMINANCE8_EXT"/>
>+                <enum name="GL_LUMINANCE8_ALPHA8_EXT"/>
>+                <enum name="GL_RGBA32F_EXT"/>
>+                <enum name="GL_RGB32F_EXT"/>
>+                <enum name="GL_ALPHA32F_EXT"/>
>+                <enum name="GL_LUMINANCE32F_EXT"/>
>+                <enum name="GL_LUMINANCE_ALPHA32F_EXT"/>
>+                <enum name="GL_RGBA16F_EXT"/>
>+                <enum name="GL_RGB16F_EXT"/>
>+                <enum name="GL_ALPHA16F_EXT"/>
>+                <enum name="GL_LUMINANCE16F_EXT"/>
>+                <enum name="GL_LUMINANCE_ALPHA16F_EXT"/>
>+                <enum name="GL_RGB10_A2_EXT"/>
>+                <enum name="GL_RGB10_EXT"/>
>+                <enum name="GL_BGRA8_EXT"/>
>+                <enum name="GL_R8_EXT"/>
>+                <enum name="GL_RG8_EXT"/>
>+                <enum name="GL_R32F_EXT"/>
>+                <enum name="GL_RG32F_EXT"/>
>+                <enum name="GL_R16F_EXT"/>
>+                <enum name="GL_RG16F_EXT"/>
>+                <command name="glTexStorage1DEXT"/>
>+                <command name="glTexStorage2DEXT"/>
>+                <command name="glTexStorage3DEXT"/>
>+            </require>
>+            <require comment="Supported only if GL_EXT_direct_state_access is supported">
>+                <command name="glTextureStorage1DEXT"/>
>+                <command name="glTextureStorage2DEXT"/>
>+                <command name="glTextureStorage3DEXT"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_EXT_texture_swizzle" supported="gl">
>+            <require>
>+                <enum name="GL_TEXTURE_SWIZZLE_R_EXT"/>
>+                <enum name="GL_TEXTURE_SWIZZLE_G_EXT"/>
>+                <enum name="GL_TEXTURE_SWIZZLE_B_EXT"/>
>+                <enum name="GL_TEXTURE_SWIZZLE_A_EXT"/>
>+                <enum name="GL_TEXTURE_SWIZZLE_RGBA_EXT"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_EXT_texture_type_2_10_10_10_REV" supported="gles2">
>+            <require>
>+                <enum name="GL_UNSIGNED_INT_2_10_10_10_REV_EXT"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_EXT_texture_view" supported="gles2">
>+            <require>
>+                <enum name="GL_TEXTURE_VIEW_MIN_LEVEL_EXT"/>
>+                <enum name="GL_TEXTURE_VIEW_NUM_LEVELS_EXT"/>
>+                <enum name="GL_TEXTURE_VIEW_MIN_LAYER_EXT"/>
>+                <enum name="GL_TEXTURE_VIEW_NUM_LAYERS_EXT"/>
>+                <enum name="GL_TEXTURE_IMMUTABLE_LEVELS"/>
>+                <command name="glTextureViewEXT"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_EXT_timer_query" supported="gl">
>+            <require>
>+                <enum name="GL_TIME_ELAPSED_EXT"/>
>+                <command name="glGetQueryObjecti64vEXT"/>
>+                <command name="glGetQueryObjectui64vEXT"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_EXT_transform_feedback" supported="gl">
>+            <require>
>+                <enum name="GL_TRANSFORM_FEEDBACK_BUFFER_EXT"/>
>+                <enum name="GL_TRANSFORM_FEEDBACK_BUFFER_START_EXT"/>
>+                <enum name="GL_TRANSFORM_FEEDBACK_BUFFER_SIZE_EXT"/>
>+                <enum name="GL_TRANSFORM_FEEDBACK_BUFFER_BINDING_EXT"/>
>+                <enum name="GL_INTERLEAVED_ATTRIBS_EXT"/>
>+                <enum name="GL_SEPARATE_ATTRIBS_EXT"/>
>+                <enum name="GL_PRIMITIVES_GENERATED_EXT"/>
>+                <enum name="GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN_EXT"/>
>+                <enum name="GL_RASTERIZER_DISCARD_EXT"/>
>+                <enum name="GL_MAX_TRANSFORM_FEEDBACK_INTERLEAVED_COMPONENTS_EXT"/>
>+                <enum name="GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_ATTRIBS_EXT"/>
>+                <enum name="GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_COMPONENTS_EXT"/>
>+                <enum name="GL_TRANSFORM_FEEDBACK_VARYINGS_EXT"/>
>+                <enum name="GL_TRANSFORM_FEEDBACK_BUFFER_MODE_EXT"/>
>+                <enum name="GL_TRANSFORM_FEEDBACK_VARYING_MAX_LENGTH_EXT"/>
>+                <command name="glBeginTransformFeedbackEXT"/>
>+                <command name="glEndTransformFeedbackEXT"/>
>+                <command name="glBindBufferRangeEXT"/>
>+                <command name="glBindBufferOffsetEXT"/>
>+                <command name="glBindBufferBaseEXT"/>
>+                <command name="glTransformFeedbackVaryingsEXT"/>
>+                <command name="glGetTransformFeedbackVaryingEXT"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_EXT_unpack_subimage" supported="gles2">
>+            <require>
>+                <enum name="GL_UNPACK_ROW_LENGTH_EXT"/>
>+                <enum name="GL_UNPACK_SKIP_ROWS_EXT"/>
>+                <enum name="GL_UNPACK_SKIP_PIXELS_EXT"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_EXT_vertex_array" supported="gl">
>+            <require>
>+                <enum name="GL_VERTEX_ARRAY_EXT"/>
>+                <enum name="GL_NORMAL_ARRAY_EXT"/>
>+                <enum name="GL_COLOR_ARRAY_EXT"/>
>+                <enum name="GL_INDEX_ARRAY_EXT"/>
>+                <enum name="GL_TEXTURE_COORD_ARRAY_EXT"/>
>+                <enum name="GL_EDGE_FLAG_ARRAY_EXT"/>
>+                <enum name="GL_VERTEX_ARRAY_SIZE_EXT"/>
>+                <enum name="GL_VERTEX_ARRAY_TYPE_EXT"/>
>+                <enum name="GL_VERTEX_ARRAY_STRIDE_EXT"/>
>+                <enum name="GL_VERTEX_ARRAY_COUNT_EXT"/>
>+                <enum name="GL_NORMAL_ARRAY_TYPE_EXT"/>
>+                <enum name="GL_NORMAL_ARRAY_STRIDE_EXT"/>
>+                <enum name="GL_NORMAL_ARRAY_COUNT_EXT"/>
>+                <enum name="GL_COLOR_ARRAY_SIZE_EXT"/>
>+                <enum name="GL_COLOR_ARRAY_TYPE_EXT"/>
>+                <enum name="GL_COLOR_ARRAY_STRIDE_EXT"/>
>+                <enum name="GL_COLOR_ARRAY_COUNT_EXT"/>
>+                <enum name="GL_INDEX_ARRAY_TYPE_EXT"/>
>+                <enum name="GL_INDEX_ARRAY_STRIDE_EXT"/>
>+                <enum name="GL_INDEX_ARRAY_COUNT_EXT"/>
>+                <enum name="GL_TEXTURE_COORD_ARRAY_SIZE_EXT"/>
>+                <enum name="GL_TEXTURE_COORD_ARRAY_TYPE_EXT"/>
>+                <enum name="GL_TEXTURE_COORD_ARRAY_STRIDE_EXT"/>
>+                <enum name="GL_TEXTURE_COORD_ARRAY_COUNT_EXT"/>
>+                <enum name="GL_EDGE_FLAG_ARRAY_STRIDE_EXT"/>
>+                <enum name="GL_EDGE_FLAG_ARRAY_COUNT_EXT"/>
>+                <enum name="GL_VERTEX_ARRAY_POINTER_EXT"/>
>+                <enum name="GL_NORMAL_ARRAY_POINTER_EXT"/>
>+                <enum name="GL_COLOR_ARRAY_POINTER_EXT"/>
>+                <enum name="GL_INDEX_ARRAY_POINTER_EXT"/>
>+                <enum name="GL_TEXTURE_COORD_ARRAY_POINTER_EXT"/>
>+                <enum name="GL_EDGE_FLAG_ARRAY_POINTER_EXT"/>
>+                <command name="glArrayElementEXT"/>
>+                <command name="glColorPointerEXT"/>
>+                <command name="glDrawArraysEXT"/>
>+                <command name="glEdgeFlagPointerEXT"/>
>+                <command name="glGetPointervEXT"/>
>+                <command name="glIndexPointerEXT"/>
>+                <command name="glNormalPointerEXT"/>
>+                <command name="glTexCoordPointerEXT"/>
>+                <command name="glVertexPointerEXT"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_EXT_vertex_array_bgra" supported="gl">
>+            <require>
>+                <enum name="GL_BGRA"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_EXT_vertex_attrib_64bit" supported="gl">
>+            <require>
>+                <enum name="GL_DOUBLE"/>
>+                <enum name="GL_DOUBLE_VEC2_EXT"/>
>+                <enum name="GL_DOUBLE_VEC3_EXT"/>
>+                <enum name="GL_DOUBLE_VEC4_EXT"/>
>+                <enum name="GL_DOUBLE_MAT2_EXT"/>
>+                <enum name="GL_DOUBLE_MAT3_EXT"/>
>+                <enum name="GL_DOUBLE_MAT4_EXT"/>
>+                <enum name="GL_DOUBLE_MAT2x3_EXT"/>
>+                <enum name="GL_DOUBLE_MAT2x4_EXT"/>
>+                <enum name="GL_DOUBLE_MAT3x2_EXT"/>
>+                <enum name="GL_DOUBLE_MAT3x4_EXT"/>
>+                <enum name="GL_DOUBLE_MAT4x2_EXT"/>
>+                <enum name="GL_DOUBLE_MAT4x3_EXT"/>
>+                <command name="glVertexAttribL1dEXT"/>
>+                <command name="glVertexAttribL2dEXT"/>
>+                <command name="glVertexAttribL3dEXT"/>
>+                <command name="glVertexAttribL4dEXT"/>
>+                <command name="glVertexAttribL1dvEXT"/>
>+                <command name="glVertexAttribL2dvEXT"/>
>+                <command name="glVertexAttribL3dvEXT"/>
>+                <command name="glVertexAttribL4dvEXT"/>
>+                <command name="glVertexAttribLPointerEXT"/>
>+                <command name="glGetVertexAttribLdvEXT"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_EXT_vertex_shader" supported="gl">
>+            <require>
>+                <enum name="GL_VERTEX_SHADER_EXT"/>
>+                <enum name="GL_VERTEX_SHADER_BINDING_EXT"/>
>+                <enum name="GL_OP_INDEX_EXT"/>
>+                <enum name="GL_OP_NEGATE_EXT"/>
>+                <enum name="GL_OP_DOT3_EXT"/>
>+                <enum name="GL_OP_DOT4_EXT"/>
>+                <enum name="GL_OP_MUL_EXT"/>
>+                <enum name="GL_OP_ADD_EXT"/>
>+                <enum name="GL_OP_MADD_EXT"/>
>+                <enum name="GL_OP_FRAC_EXT"/>
>+                <enum name="GL_OP_MAX_EXT"/>
>+                <enum name="GL_OP_MIN_EXT"/>
>+                <enum name="GL_OP_SET_GE_EXT"/>
>+                <enum name="GL_OP_SET_LT_EXT"/>
>+                <enum name="GL_OP_CLAMP_EXT"/>
>+                <enum name="GL_OP_FLOOR_EXT"/>
>+                <enum name="GL_OP_ROUND_EXT"/>
>+                <enum name="GL_OP_EXP_BASE_2_EXT"/>
>+                <enum name="GL_OP_LOG_BASE_2_EXT"/>
>+                <enum name="GL_OP_POWER_EXT"/>
>+                <enum name="GL_OP_RECIP_EXT"/>
>+                <enum name="GL_OP_RECIP_SQRT_EXT"/>
>+                <enum name="GL_OP_SUB_EXT"/>
>+                <enum name="GL_OP_CROSS_PRODUCT_EXT"/>
>+                <enum name="GL_OP_MULTIPLY_MATRIX_EXT"/>
>+                <enum name="GL_OP_MOV_EXT"/>
>+                <enum name="GL_OUTPUT_VERTEX_EXT"/>
>+                <enum name="GL_OUTPUT_COLOR0_EXT"/>
>+                <enum name="GL_OUTPUT_COLOR1_EXT"/>
>+                <enum name="GL_OUTPUT_TEXTURE_COORD0_EXT"/>
>+                <enum name="GL_OUTPUT_TEXTURE_COORD1_EXT"/>
>+                <enum name="GL_OUTPUT_TEXTURE_COORD2_EXT"/>
>+                <enum name="GL_OUTPUT_TEXTURE_COORD3_EXT"/>
>+                <enum name="GL_OUTPUT_TEXTURE_COORD4_EXT"/>
>+                <enum name="GL_OUTPUT_TEXTURE_COORD5_EXT"/>
>+                <enum name="GL_OUTPUT_TEXTURE_COORD6_EXT"/>
>+                <enum name="GL_OUTPUT_TEXTURE_COORD7_EXT"/>
>+                <enum name="GL_OUTPUT_TEXTURE_COORD8_EXT"/>
>+                <enum name="GL_OUTPUT_TEXTURE_COORD9_EXT"/>
>+                <enum name="GL_OUTPUT_TEXTURE_COORD10_EXT"/>
>+                <enum name="GL_OUTPUT_TEXTURE_COORD11_EXT"/>
>+                <enum name="GL_OUTPUT_TEXTURE_COORD12_EXT"/>
>+                <enum name="GL_OUTPUT_TEXTURE_COORD13_EXT"/>
>+                <enum name="GL_OUTPUT_TEXTURE_COORD14_EXT"/>
>+                <enum name="GL_OUTPUT_TEXTURE_COORD15_EXT"/>
>+                <enum name="GL_OUTPUT_TEXTURE_COORD16_EXT"/>
>+                <enum name="GL_OUTPUT_TEXTURE_COORD17_EXT"/>
>+                <enum name="GL_OUTPUT_TEXTURE_COORD18_EXT"/>
>+                <enum name="GL_OUTPUT_TEXTURE_COORD19_EXT"/>
>+                <enum name="GL_OUTPUT_TEXTURE_COORD20_EXT"/>
>+                <enum name="GL_OUTPUT_TEXTURE_COORD21_EXT"/>
>+                <enum name="GL_OUTPUT_TEXTURE_COORD22_EXT"/>
>+                <enum name="GL_OUTPUT_TEXTURE_COORD23_EXT"/>
>+                <enum name="GL_OUTPUT_TEXTURE_COORD24_EXT"/>
>+                <enum name="GL_OUTPUT_TEXTURE_COORD25_EXT"/>
>+                <enum name="GL_OUTPUT_TEXTURE_COORD26_EXT"/>
>+                <enum name="GL_OUTPUT_TEXTURE_COORD27_EXT"/>
>+                <enum name="GL_OUTPUT_TEXTURE_COORD28_EXT"/>
>+                <enum name="GL_OUTPUT_TEXTURE_COORD29_EXT"/>
>+                <enum name="GL_OUTPUT_TEXTURE_COORD30_EXT"/>
>+                <enum name="GL_OUTPUT_TEXTURE_COORD31_EXT"/>
>+                <enum name="GL_OUTPUT_FOG_EXT"/>
>+                <enum name="GL_SCALAR_EXT"/>
>+                <enum name="GL_VECTOR_EXT"/>
>+                <enum name="GL_MATRIX_EXT"/>
>+                <enum name="GL_VARIANT_EXT"/>
>+                <enum name="GL_INVARIANT_EXT"/>
>+                <enum name="GL_LOCAL_CONSTANT_EXT"/>
>+                <enum name="GL_LOCAL_EXT"/>
>+                <enum name="GL_MAX_VERTEX_SHADER_INSTRUCTIONS_EXT"/>
>+                <enum name="GL_MAX_VERTEX_SHADER_VARIANTS_EXT"/>
>+                <enum name="GL_MAX_VERTEX_SHADER_INVARIANTS_EXT"/>
>+                <enum name="GL_MAX_VERTEX_SHADER_LOCAL_CONSTANTS_EXT"/>
>+                <enum name="GL_MAX_VERTEX_SHADER_LOCALS_EXT"/>
>+                <enum name="GL_MAX_OPTIMIZED_VERTEX_SHADER_INSTRUCTIONS_EXT"/>
>+                <enum name="GL_MAX_OPTIMIZED_VERTEX_SHADER_VARIANTS_EXT"/>
>+                <enum name="GL_MAX_OPTIMIZED_VERTEX_SHADER_LOCAL_CONSTANTS_EXT"/>
>+                <enum name="GL_MAX_OPTIMIZED_VERTEX_SHADER_INVARIANTS_EXT"/>
>+                <enum name="GL_MAX_OPTIMIZED_VERTEX_SHADER_LOCALS_EXT"/>
>+                <enum name="GL_VERTEX_SHADER_INSTRUCTIONS_EXT"/>
>+                <enum name="GL_VERTEX_SHADER_VARIANTS_EXT"/>
>+                <enum name="GL_VERTEX_SHADER_INVARIANTS_EXT"/>
>+                <enum name="GL_VERTEX_SHADER_LOCAL_CONSTANTS_EXT"/>
>+                <enum name="GL_VERTEX_SHADER_LOCALS_EXT"/>
>+                <enum name="GL_VERTEX_SHADER_OPTIMIZED_EXT"/>
>+                <enum name="GL_X_EXT"/>
>+                <enum name="GL_Y_EXT"/>
>+                <enum name="GL_Z_EXT"/>
>+                <enum name="GL_W_EXT"/>
>+                <enum name="GL_NEGATIVE_X_EXT"/>
>+                <enum name="GL_NEGATIVE_Y_EXT"/>
>+                <enum name="GL_NEGATIVE_Z_EXT"/>
>+                <enum name="GL_NEGATIVE_W_EXT"/>
>+                <enum name="GL_ZERO_EXT"/>
>+                <enum name="GL_ONE_EXT"/>
>+                <enum name="GL_NEGATIVE_ONE_EXT"/>
>+                <enum name="GL_NORMALIZED_RANGE_EXT"/>
>+                <enum name="GL_FULL_RANGE_EXT"/>
>+                <enum name="GL_CURRENT_VERTEX_EXT"/>
>+                <enum name="GL_MVP_MATRIX_EXT"/>
>+                <enum name="GL_VARIANT_VALUE_EXT"/>
>+                <enum name="GL_VARIANT_DATATYPE_EXT"/>
>+                <enum name="GL_VARIANT_ARRAY_STRIDE_EXT"/>
>+                <enum name="GL_VARIANT_ARRAY_TYPE_EXT"/>
>+                <enum name="GL_VARIANT_ARRAY_EXT"/>
>+                <enum name="GL_VARIANT_ARRAY_POINTER_EXT"/>
>+                <enum name="GL_INVARIANT_VALUE_EXT"/>
>+                <enum name="GL_INVARIANT_DATATYPE_EXT"/>
>+                <enum name="GL_LOCAL_CONSTANT_VALUE_EXT"/>
>+                <enum name="GL_LOCAL_CONSTANT_DATATYPE_EXT"/>
>+                <command name="glBeginVertexShaderEXT"/>
>+                <command name="glEndVertexShaderEXT"/>
>+                <command name="glBindVertexShaderEXT"/>
>+                <command name="glGenVertexShadersEXT"/>
>+                <command name="glDeleteVertexShaderEXT"/>
>+                <command name="glShaderOp1EXT"/>
>+                <command name="glShaderOp2EXT"/>
>+                <command name="glShaderOp3EXT"/>
>+                <command name="glSwizzleEXT"/>
>+                <command name="glWriteMaskEXT"/>
>+                <command name="glInsertComponentEXT"/>
>+                <command name="glExtractComponentEXT"/>
>+                <command name="glGenSymbolsEXT"/>
>+                <command name="glSetInvariantEXT"/>
>+                <command name="glSetLocalConstantEXT"/>
>+                <command name="glVariantbvEXT"/>
>+                <command name="glVariantsvEXT"/>
>+                <command name="glVariantivEXT"/>
>+                <command name="glVariantfvEXT"/>
>+                <command name="glVariantdvEXT"/>
>+                <command name="glVariantubvEXT"/>
>+                <command name="glVariantusvEXT"/>
>+                <command name="glVariantuivEXT"/>
>+                <command name="glVariantPointerEXT"/>
>+                <command name="glEnableVariantClientStateEXT"/>
>+                <command name="glDisableVariantClientStateEXT"/>
>+                <command name="glBindLightParameterEXT"/>
>+                <command name="glBindMaterialParameterEXT"/>
>+                <command name="glBindTexGenParameterEXT"/>
>+                <command name="glBindTextureUnitParameterEXT"/>
>+                <command name="glBindParameterEXT"/>
>+                <command name="glIsVariantEnabledEXT"/>
>+                <command name="glGetVariantBooleanvEXT"/>
>+                <command name="glGetVariantIntegervEXT"/>
>+                <command name="glGetVariantFloatvEXT"/>
>+                <command name="glGetVariantPointervEXT"/>
>+                <command name="glGetInvariantBooleanvEXT"/>
>+                <command name="glGetInvariantIntegervEXT"/>
>+                <command name="glGetInvariantFloatvEXT"/>
>+                <command name="glGetLocalConstantBooleanvEXT"/>
>+                <command name="glGetLocalConstantIntegervEXT"/>
>+                <command name="glGetLocalConstantFloatvEXT"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_EXT_vertex_weighting" supported="gl">
>+            <require>
>+                <enum name="GL_MODELVIEW0_STACK_DEPTH_EXT"/>
>+                <enum name="GL_MODELVIEW1_STACK_DEPTH_EXT"/>
>+                <enum name="GL_MODELVIEW0_MATRIX_EXT"/>
>+                <enum name="GL_MODELVIEW1_MATRIX_EXT"/>
>+                <enum name="GL_VERTEX_WEIGHTING_EXT"/>
>+                <enum name="GL_MODELVIEW0_EXT"/>
>+                <enum name="GL_MODELVIEW1_EXT"/>
>+                <enum name="GL_CURRENT_VERTEX_WEIGHT_EXT"/>
>+                <enum name="GL_VERTEX_WEIGHT_ARRAY_EXT"/>
>+                <enum name="GL_VERTEX_WEIGHT_ARRAY_SIZE_EXT"/>
>+                <enum name="GL_VERTEX_WEIGHT_ARRAY_TYPE_EXT"/>
>+                <enum name="GL_VERTEX_WEIGHT_ARRAY_STRIDE_EXT"/>
>+                <enum name="GL_VERTEX_WEIGHT_ARRAY_POINTER_EXT"/>
>+                <command name="glVertexWeightfEXT"/>
>+                <command name="glVertexWeightfvEXT"/>
>+                <command name="glVertexWeightPointerEXT"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_EXT_win32_keyed_mutex" supported="gl|gles2">
>+            <require>
>+                <command name="glAcquireKeyedMutexWin32EXT"/>
>+                <command name="glReleaseKeyedMutexWin32EXT"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_EXT_window_rectangles" supported="gl|glcore|gles2">
>+            <require>
>+                <enum name="GL_INCLUSIVE_EXT"/>
>+                <enum name="GL_EXCLUSIVE_EXT"/>
>+                <enum name="GL_WINDOW_RECTANGLE_EXT"/>
>+                <enum name="GL_WINDOW_RECTANGLE_MODE_EXT"/>
>+                <enum name="GL_MAX_WINDOW_RECTANGLES_EXT"/>
>+                <enum name="GL_NUM_WINDOW_RECTANGLES_EXT"/>
>+                <command name="glWindowRectanglesEXT"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_EXT_x11_sync_object" supported="gl">
>+            <require>
>+                <enum name="GL_SYNC_X11_FENCE_EXT"/>
>+                <command name="glImportSyncEXT"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_FJ_shader_binary_GCCSO" supported="gles2">
>+            <require>
>+                <enum name="GL_GCCSO_SHADER_BINARY_FJ"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_GREMEDY_frame_terminator" supported="gl">
>+            <require>
>+                <command name="glFrameTerminatorGREMEDY"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_GREMEDY_string_marker" supported="gl">
>+            <require>
>+                <command name="glStringMarkerGREMEDY"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_HP_convolution_border_modes" supported="gl">
>+            <require>
>+                <enum name="GL_IGNORE_BORDER_HP"/>
>+                <enum name="GL_CONSTANT_BORDER_HP"/>
>+                <enum name="GL_REPLICATE_BORDER_HP"/>
>+                <enum name="GL_CONVOLUTION_BORDER_COLOR_HP"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_HP_image_transform" supported="gl">
>+            <require>
>+                <enum name="GL_IMAGE_SCALE_X_HP"/>
>+                <enum name="GL_IMAGE_SCALE_Y_HP"/>
>+                <enum name="GL_IMAGE_TRANSLATE_X_HP"/>
>+                <enum name="GL_IMAGE_TRANSLATE_Y_HP"/>
>+                <enum name="GL_IMAGE_ROTATE_ANGLE_HP"/>
>+                <enum name="GL_IMAGE_ROTATE_ORIGIN_X_HP"/>
>+                <enum name="GL_IMAGE_ROTATE_ORIGIN_Y_HP"/>
>+                <enum name="GL_IMAGE_MAG_FILTER_HP"/>
>+                <enum name="GL_IMAGE_MIN_FILTER_HP"/>
>+                <enum name="GL_IMAGE_CUBIC_WEIGHT_HP"/>
>+                <enum name="GL_CUBIC_HP"/>
>+                <enum name="GL_AVERAGE_HP"/>
>+                <enum name="GL_IMAGE_TRANSFORM_2D_HP"/>
>+                <enum name="GL_POST_IMAGE_TRANSFORM_COLOR_TABLE_HP"/>
>+                <enum name="GL_PROXY_POST_IMAGE_TRANSFORM_COLOR_TABLE_HP"/>
>+                <command name="glImageTransformParameteriHP"/>
>+                <command name="glImageTransformParameterfHP"/>
>+                <command name="glImageTransformParameterivHP"/>
>+                <command name="glImageTransformParameterfvHP"/>
>+                <command name="glGetImageTransformParameterivHP"/>
>+                <command name="glGetImageTransformParameterfvHP"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_HP_occlusion_test" supported="gl">
>+            <require>
>+                <enum name="GL_OCCLUSION_TEST_HP"/>
>+                <enum name="GL_OCCLUSION_TEST_RESULT_HP"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_HP_texture_lighting" supported="gl">
>+            <require>
>+                <enum name="GL_TEXTURE_LIGHTING_MODE_HP"/>
>+                <enum name="GL_TEXTURE_POST_SPECULAR_HP"/>
>+                <enum name="GL_TEXTURE_PRE_SPECULAR_HP"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_IBM_cull_vertex" supported="gl">
>+            <require>
>+                <enum name="GL_CULL_VERTEX_IBM"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_IBM_multimode_draw_arrays" supported="gl">
>+            <require>
>+                <command name="glMultiModeDrawArraysIBM"/>
>+                <command name="glMultiModeDrawElementsIBM"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_IBM_rasterpos_clip" supported="gl">
>+            <require>
>+                <enum name="GL_RASTER_POSITION_UNCLIPPED_IBM"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_IBM_static_data" supported="gl">
>+            <require>
>+                <enum name="GL_ALL_STATIC_DATA_IBM"/>
>+                <enum name="GL_STATIC_VERTEX_ARRAY_IBM"/>
>+                <command name="glFlushStaticDataIBM"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_IBM_texture_mirrored_repeat" supported="gl">
>+            <require>
>+                <enum name="GL_MIRRORED_REPEAT_IBM"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_IBM_vertex_array_lists" supported="gl">
>+            <require>
>+                <enum name="GL_VERTEX_ARRAY_LIST_IBM"/>
>+                <enum name="GL_NORMAL_ARRAY_LIST_IBM"/>
>+                <enum name="GL_COLOR_ARRAY_LIST_IBM"/>
>+                <enum name="GL_INDEX_ARRAY_LIST_IBM"/>
>+                <enum name="GL_TEXTURE_COORD_ARRAY_LIST_IBM"/>
>+                <enum name="GL_EDGE_FLAG_ARRAY_LIST_IBM"/>
>+                <enum name="GL_FOG_COORDINATE_ARRAY_LIST_IBM"/>
>+                <enum name="GL_SECONDARY_COLOR_ARRAY_LIST_IBM"/>
>+                <enum name="GL_VERTEX_ARRAY_LIST_STRIDE_IBM"/>
>+                <enum name="GL_NORMAL_ARRAY_LIST_STRIDE_IBM"/>
>+                <enum name="GL_COLOR_ARRAY_LIST_STRIDE_IBM"/>
>+                <enum name="GL_INDEX_ARRAY_LIST_STRIDE_IBM"/>
>+                <enum name="GL_TEXTURE_COORD_ARRAY_LIST_STRIDE_IBM"/>
>+                <enum name="GL_EDGE_FLAG_ARRAY_LIST_STRIDE_IBM"/>
>+                <enum name="GL_FOG_COORDINATE_ARRAY_LIST_STRIDE_IBM"/>
>+                <enum name="GL_SECONDARY_COLOR_ARRAY_LIST_STRIDE_IBM"/>
>+                <command name="glColorPointerListIBM"/>
>+                <command name="glSecondaryColorPointerListIBM"/>
>+                <command name="glEdgeFlagPointerListIBM"/>
>+                <command name="glFogCoordPointerListIBM"/>
>+                <command name="glIndexPointerListIBM"/>
>+                <command name="glNormalPointerListIBM"/>
>+                <command name="glTexCoordPointerListIBM"/>
>+                <command name="glVertexPointerListIBM"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_IMG_bindless_texture" supported="gles2">
>+            <require>
>+                <command name="glGetTextureHandleIMG"/>
>+                <command name="glGetTextureSamplerHandleIMG"/>
>+                <command name="glUniformHandleui64IMG"/>
>+                <command name="glUniformHandleui64vIMG"/>
>+                <command name="glProgramUniformHandleui64IMG"/>
>+                <command name="glProgramUniformHandleui64vIMG"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_IMG_framebuffer_downsample" supported="gles2">
>+            <require>
>+                <enum name="GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE_AND_DOWNSAMPLE_IMG"/>
>+                <enum name="GL_NUM_DOWNSAMPLE_SCALES_IMG"/>
>+                <enum name="GL_DOWNSAMPLE_SCALES_IMG"/>
>+                <enum name="GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_SCALE_IMG"/>
>+                <command name="glFramebufferTexture2DDownsampleIMG"/>
>+                <command name="glFramebufferTextureLayerDownsampleIMG"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_IMG_multisampled_render_to_texture" supported="gles1|gles2">
>+            <require>
>+                <enum name="GL_RENDERBUFFER_SAMPLES_IMG"/>
>+                <enum name="GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE_IMG"/>
>+                <enum name="GL_MAX_SAMPLES_IMG"/>
>+                <enum name="GL_TEXTURE_SAMPLES_IMG"/>
>+                <command name="glRenderbufferStorageMultisampleIMG"/>
>+                <command name="glFramebufferTexture2DMultisampleIMG"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_IMG_program_binary" supported="gles2">
>+            <require>
>+                <enum name="GL_SGX_PROGRAM_BINARY_IMG"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_IMG_read_format" supported="gles1|gles2">
>+            <require>
>+                <enum name="GL_BGRA_IMG"/>
>+                <enum name="GL_UNSIGNED_SHORT_4_4_4_4_REV_IMG"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_IMG_shader_binary" supported="gles2">
>+            <require>
>+                <enum name="GL_SGX_BINARY_IMG"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_IMG_texture_compression_pvrtc" supported="gles1|gles2">
>+            <require>
>+                <enum name="GL_COMPRESSED_RGB_PVRTC_4BPPV1_IMG"/>
>+                <enum name="GL_COMPRESSED_RGB_PVRTC_2BPPV1_IMG"/>
>+                <enum name="GL_COMPRESSED_RGBA_PVRTC_4BPPV1_IMG"/>
>+                <enum name="GL_COMPRESSED_RGBA_PVRTC_2BPPV1_IMG"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_IMG_texture_compression_pvrtc2" supported="gles2">
>+            <require>
>+                <enum name="GL_COMPRESSED_RGBA_PVRTC_2BPPV2_IMG"/>
>+                <enum name="GL_COMPRESSED_RGBA_PVRTC_4BPPV2_IMG"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_IMG_texture_env_enhanced_fixed_function" supported="gles1">
>+            <require>
>+                <enum name="GL_MODULATE_COLOR_IMG"/>
>+                <enum name="GL_RECIP_ADD_SIGNED_ALPHA_IMG"/>
>+                <enum name="GL_TEXTURE_ALPHA_MODULATE_IMG"/>
>+                <enum name="GL_FACTOR_ALPHA_MODULATE_IMG"/>
>+                <enum name="GL_FRAGMENT_ALPHA_MODULATE_IMG"/>
>+                <enum name="GL_ADD_BLEND_IMG"/>
>+                <enum name="GL_DOT3_RGBA_IMG"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_IMG_texture_filter_cubic" supported="gles2">
>+            <require>
>+                <enum name="GL_CUBIC_IMG"/>
>+                <enum name="GL_CUBIC_MIPMAP_NEAREST_IMG"/>
>+                <enum name="GL_CUBIC_MIPMAP_LINEAR_IMG"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_IMG_user_clip_plane" supported="gles1">
>+            <require>
>+                <enum name="GL_CLIP_PLANE0_IMG"/>
>+                <enum name="GL_CLIP_PLANE1_IMG"/>
>+                <enum name="GL_CLIP_PLANE2_IMG"/>
>+                <enum name="GL_CLIP_PLANE3_IMG"/>
>+                <enum name="GL_CLIP_PLANE4_IMG"/>
>+                <enum name="GL_CLIP_PLANE5_IMG"/>
>+                <enum name="GL_MAX_CLIP_PLANES_IMG"/>
>+                <command name="glClipPlanefIMG"/>
>+                <command name="glClipPlanexIMG"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_INGR_blend_func_separate" supported="gl">
>+            <require>
>+                <command name="glBlendFuncSeparateINGR"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_INGR_color_clamp" supported="gl">
>+            <require>
>+                <enum name="GL_RED_MIN_CLAMP_INGR"/>
>+                <enum name="GL_GREEN_MIN_CLAMP_INGR"/>
>+                <enum name="GL_BLUE_MIN_CLAMP_INGR"/>
>+                <enum name="GL_ALPHA_MIN_CLAMP_INGR"/>
>+                <enum name="GL_RED_MAX_CLAMP_INGR"/>
>+                <enum name="GL_GREEN_MAX_CLAMP_INGR"/>
>+                <enum name="GL_BLUE_MAX_CLAMP_INGR"/>
>+                <enum name="GL_ALPHA_MAX_CLAMP_INGR"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_INGR_interlace_read" supported="gl">
>+            <require>
>+                <enum name="GL_INTERLACE_READ_INGR"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_INTEL_conservative_rasterization" supported="gl|glcore|gles2">
>+            <require>
>+                <enum name="GL_CONSERVATIVE_RASTERIZATION_INTEL"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_INTEL_fragment_shader_ordering" supported="gl"/>
>+        <extension name="GL_INTEL_framebuffer_CMAA" supported="gl|glcore|gles2">
>+            <require>
>+                <command name="glApplyFramebufferAttachmentCMAAINTEL"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_INTEL_map_texture" supported="gl">
>+            <require>
>+                <enum name="GL_TEXTURE_MEMORY_LAYOUT_INTEL"/>
>+                <enum name="GL_LAYOUT_DEFAULT_INTEL"/>
>+                <enum name="GL_LAYOUT_LINEAR_INTEL"/>
>+                <enum name="GL_LAYOUT_LINEAR_CPU_CACHED_INTEL"/>
>+                <command name="glSyncTextureINTEL"/>
>+                <command name="glUnmapTexture2DINTEL"/>
>+                <command name="glMapTexture2DINTEL"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_INTEL_blackhole_render" supported="gl|glcore|gles2">
>+            <require>
>+                <enum name="GL_BLACKHOLE_RENDER_INTEL"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_INTEL_parallel_arrays" supported="gl">
>+            <require>
>+                <enum name="GL_PARALLEL_ARRAYS_INTEL"/>
>+                <enum name="GL_VERTEX_ARRAY_PARALLEL_POINTERS_INTEL"/>
>+                <enum name="GL_NORMAL_ARRAY_PARALLEL_POINTERS_INTEL"/>
>+                <enum name="GL_COLOR_ARRAY_PARALLEL_POINTERS_INTEL"/>
>+                <enum name="GL_TEXTURE_COORD_ARRAY_PARALLEL_POINTERS_INTEL"/>
>+                <command name="glVertexPointervINTEL"/>
>+                <command name="glNormalPointervINTEL"/>
>+                <command name="glColorPointervINTEL"/>
>+                <command name="glTexCoordPointervINTEL"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_INTEL_performance_query" supported="gl|glcore|gles2">
>+            <require>
>+                <enum name="GL_PERFQUERY_SINGLE_CONTEXT_INTEL"/>
>+                <enum name="GL_PERFQUERY_GLOBAL_CONTEXT_INTEL"/>
>+                <enum name="GL_PERFQUERY_WAIT_INTEL"/>
>+                <enum name="GL_PERFQUERY_FLUSH_INTEL"/>
>+                <enum name="GL_PERFQUERY_DONOT_FLUSH_INTEL"/>
>+                <enum name="GL_PERFQUERY_COUNTER_EVENT_INTEL"/>
>+                <enum name="GL_PERFQUERY_COUNTER_DURATION_NORM_INTEL"/>
>+                <enum name="GL_PERFQUERY_COUNTER_DURATION_RAW_INTEL"/>
>+                <enum name="GL_PERFQUERY_COUNTER_THROUGHPUT_INTEL"/>
>+                <enum name="GL_PERFQUERY_COUNTER_RAW_INTEL"/>
>+                <enum name="GL_PERFQUERY_COUNTER_TIMESTAMP_INTEL"/>
>+                <enum name="GL_PERFQUERY_COUNTER_DATA_UINT32_INTEL"/>
>+                <enum name="GL_PERFQUERY_COUNTER_DATA_UINT64_INTEL"/>
>+                <enum name="GL_PERFQUERY_COUNTER_DATA_FLOAT_INTEL"/>
>+                <enum name="GL_PERFQUERY_COUNTER_DATA_DOUBLE_INTEL"/>
>+                <enum name="GL_PERFQUERY_COUNTER_DATA_BOOL32_INTEL"/>
>+                <enum name="GL_PERFQUERY_QUERY_NAME_LENGTH_MAX_INTEL"/>
>+                <enum name="GL_PERFQUERY_COUNTER_NAME_LENGTH_MAX_INTEL"/>
>+                <enum name="GL_PERFQUERY_COUNTER_DESC_LENGTH_MAX_INTEL"/>
>+                <enum name="GL_PERFQUERY_GPA_EXTENDED_COUNTERS_INTEL"/>
>+                <command name="glBeginPerfQueryINTEL"/>
>+                <command name="glCreatePerfQueryINTEL"/>
>+                <command name="glDeletePerfQueryINTEL"/>
>+                <command name="glEndPerfQueryINTEL"/>
>+                <command name="glGetFirstPerfQueryIdINTEL"/>
>+                <command name="glGetNextPerfQueryIdINTEL"/>
>+                <command name="glGetPerfCounterInfoINTEL"/>
>+                <command name="glGetPerfQueryDataINTEL"/>
>+                <command name="glGetPerfQueryIdByNameINTEL"/>
>+                <command name="glGetPerfQueryInfoINTEL"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_KHR_blend_equation_advanced" supported="gl|glcore|gles2">
>+            <require>
>+                <enum name="GL_MULTIPLY_KHR"/>
>+                <enum name="GL_SCREEN_KHR"/>
>+                <enum name="GL_OVERLAY_KHR"/>
>+                <enum name="GL_DARKEN_KHR"/>
>+                <enum name="GL_LIGHTEN_KHR"/>
>+                <enum name="GL_COLORDODGE_KHR"/>
>+                <enum name="GL_COLORBURN_KHR"/>
>+                <enum name="GL_HARDLIGHT_KHR"/>
>+                <enum name="GL_SOFTLIGHT_KHR"/>
>+                <enum name="GL_DIFFERENCE_KHR"/>
>+                <enum name="GL_EXCLUSION_KHR"/>
>+                <enum name="GL_HSL_HUE_KHR"/>
>+                <enum name="GL_HSL_SATURATION_KHR"/>
>+                <enum name="GL_HSL_COLOR_KHR"/>
>+                <enum name="GL_HSL_LUMINOSITY_KHR"/>
>+                <command name="glBlendBarrierKHR"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_KHR_blend_equation_advanced_coherent" supported="gl|glcore|gles2">
>+            <require comment="Otherwise identical to GL_KHR_blend_equation_advanced, just different semantic behavior">
>+                <enum name="GL_BLEND_ADVANCED_COHERENT_KHR"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_KHR_context_flush_control" supported="gl|glcore|gles2">
>+            <require api="gl" comment="KHR extensions *mandate* suffixes for ES, unlike for GL">
>+                <enum name="GL_CONTEXT_RELEASE_BEHAVIOR"/>
>+                <enum name="GL_CONTEXT_RELEASE_BEHAVIOR_FLUSH"/>
>+                <enum name="GL_NONE"/>
>+            </require>
>+            <require api="gles2">
>+                <enum name="GL_CONTEXT_RELEASE_BEHAVIOR_KHR"/>
>+                <enum name="GL_CONTEXT_RELEASE_BEHAVIOR_FLUSH_KHR"/>
>+                <enum name="GL_NONE"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_KHR_debug" supported="gl|glcore|gles1|gles2">
>+            <require api="gl" comment="KHR extensions *mandate* suffixes for ES, unlike for GL">
>+                <enum name="GL_DEBUG_OUTPUT_SYNCHRONOUS"/>
>+                <enum name="GL_DEBUG_NEXT_LOGGED_MESSAGE_LENGTH"/>
>+                <enum name="GL_DEBUG_CALLBACK_FUNCTION"/>
>+                <enum name="GL_DEBUG_CALLBACK_USER_PARAM"/>
>+                <enum name="GL_DEBUG_SOURCE_API"/>
>+                <enum name="GL_DEBUG_SOURCE_WINDOW_SYSTEM"/>
>+                <enum name="GL_DEBUG_SOURCE_SHADER_COMPILER"/>
>+                <enum name="GL_DEBUG_SOURCE_THIRD_PARTY"/>
>+                <enum name="GL_DEBUG_SOURCE_APPLICATION"/>
>+                <enum name="GL_DEBUG_SOURCE_OTHER"/>
>+                <enum name="GL_DEBUG_TYPE_ERROR"/>
>+                <enum name="GL_DEBUG_TYPE_DEPRECATED_BEHAVIOR"/>
>+                <enum name="GL_DEBUG_TYPE_UNDEFINED_BEHAVIOR"/>
>+                <enum name="GL_DEBUG_TYPE_PORTABILITY"/>
>+                <enum name="GL_DEBUG_TYPE_PERFORMANCE"/>
>+                <enum name="GL_DEBUG_TYPE_OTHER"/>
>+                <enum name="GL_DEBUG_TYPE_MARKER"/>
>+                <enum name="GL_DEBUG_TYPE_PUSH_GROUP"/>
>+                <enum name="GL_DEBUG_TYPE_POP_GROUP"/>
>+                <enum name="GL_DEBUG_SEVERITY_NOTIFICATION"/>
>+                <enum name="GL_MAX_DEBUG_GROUP_STACK_DEPTH"/>
>+                <enum name="GL_DEBUG_GROUP_STACK_DEPTH"/>
>+                <enum name="GL_BUFFER"/>
>+                <enum name="GL_SHADER"/>
>+                <enum name="GL_PROGRAM"/>
>+                <enum name="GL_VERTEX_ARRAY"/>
>+                <enum name="GL_QUERY"/>
>+                <enum name="GL_PROGRAM_PIPELINE"/>
>+                <enum name="GL_SAMPLER"/>
>+                <enum name="GL_MAX_LABEL_LENGTH"/>
>+                <enum name="GL_MAX_DEBUG_MESSAGE_LENGTH"/>
>+                <enum name="GL_MAX_DEBUG_LOGGED_MESSAGES"/>
>+                <enum name="GL_DEBUG_LOGGED_MESSAGES"/>
>+                <enum name="GL_DEBUG_SEVERITY_HIGH"/>
>+                <enum name="GL_DEBUG_SEVERITY_MEDIUM"/>
>+                <enum name="GL_DEBUG_SEVERITY_LOW"/>
>+                <enum name="GL_DEBUG_OUTPUT"/>
>+                <enum name="GL_CONTEXT_FLAG_DEBUG_BIT"/>
>+                <enum name="GL_STACK_OVERFLOW"/>
>+                <enum name="GL_STACK_UNDERFLOW"/>
>+                <command name="glDebugMessageControl"/>
>+                <command name="glDebugMessageInsert"/>
>+                <command name="glDebugMessageCallback"/>
>+                <command name="glGetDebugMessageLog"/>
>+                <command name="glPushDebugGroup"/>
>+                <command name="glPopDebugGroup"/>
>+                <command name="glObjectLabel"/>
>+                <command name="glGetObjectLabel"/>
>+                <command name="glObjectPtrLabel"/>
>+                <command name="glGetObjectPtrLabel"/>
>+                <command name="glGetPointerv"/>
>+            </require>
>+            <require api="gles2">
>+                <enum name="GL_DEBUG_OUTPUT_SYNCHRONOUS_KHR"/>
>+                <enum name="GL_DEBUG_NEXT_LOGGED_MESSAGE_LENGTH_KHR"/>
>+                <enum name="GL_DEBUG_CALLBACK_FUNCTION_KHR"/>
>+                <enum name="GL_DEBUG_CALLBACK_USER_PARAM_KHR"/>
>+                <enum name="GL_DEBUG_SOURCE_API_KHR"/>
>+                <enum name="GL_DEBUG_SOURCE_WINDOW_SYSTEM_KHR"/>
>+                <enum name="GL_DEBUG_SOURCE_SHADER_COMPILER_KHR"/>
>+                <enum name="GL_DEBUG_SOURCE_THIRD_PARTY_KHR"/>
>+                <enum name="GL_DEBUG_SOURCE_APPLICATION_KHR"/>
>+                <enum name="GL_DEBUG_SOURCE_OTHER_KHR"/>
>+                <enum name="GL_DEBUG_TYPE_ERROR_KHR"/>
>+                <enum name="GL_DEBUG_TYPE_DEPRECATED_BEHAVIOR_KHR"/>
>+                <enum name="GL_DEBUG_TYPE_UNDEFINED_BEHAVIOR_KHR"/>
>+                <enum name="GL_DEBUG_TYPE_PORTABILITY_KHR"/>
>+                <enum name="GL_DEBUG_TYPE_PERFORMANCE_KHR"/>
>+                <enum name="GL_DEBUG_TYPE_OTHER_KHR"/>
>+                <enum name="GL_DEBUG_TYPE_MARKER_KHR"/>
>+                <enum name="GL_DEBUG_TYPE_PUSH_GROUP_KHR"/>
>+                <enum name="GL_DEBUG_TYPE_POP_GROUP_KHR"/>
>+                <enum name="GL_DEBUG_SEVERITY_NOTIFICATION_KHR"/>
>+                <enum name="GL_MAX_DEBUG_GROUP_STACK_DEPTH_KHR"/>
>+                <enum name="GL_DEBUG_GROUP_STACK_DEPTH_KHR"/>
>+                <enum name="GL_BUFFER_KHR"/>
>+                <enum name="GL_SHADER_KHR"/>
>+                <enum name="GL_PROGRAM_KHR"/>
>+                <enum name="GL_VERTEX_ARRAY_KHR"/>
>+                <enum name="GL_QUERY_KHR"/>
>+                <enum name="GL_PROGRAM_PIPELINE_KHR"/>
>+                <enum name="GL_SAMPLER_KHR"/>
>+                <enum name="GL_MAX_LABEL_LENGTH_KHR"/>
>+                <enum name="GL_MAX_DEBUG_MESSAGE_LENGTH_KHR"/>
>+                <enum name="GL_MAX_DEBUG_LOGGED_MESSAGES_KHR"/>
>+                <enum name="GL_DEBUG_LOGGED_MESSAGES_KHR"/>
>+                <enum name="GL_DEBUG_SEVERITY_HIGH_KHR"/>
>+                <enum name="GL_DEBUG_SEVERITY_MEDIUM_KHR"/>
>+                <enum name="GL_DEBUG_SEVERITY_LOW_KHR"/>
>+                <enum name="GL_DEBUG_OUTPUT_KHR"/>
>+                <enum name="GL_CONTEXT_FLAG_DEBUG_BIT_KHR"/>
>+                <enum name="GL_STACK_OVERFLOW_KHR"/>
>+                <enum name="GL_STACK_UNDERFLOW_KHR"/>
>+                <command name="glDebugMessageControlKHR"/>
>+                <command name="glDebugMessageInsertKHR"/>
>+                <command name="glDebugMessageCallbackKHR"/>
>+                <command name="glGetDebugMessageLogKHR"/>
>+                <command name="glPushDebugGroupKHR"/>
>+                <command name="glPopDebugGroupKHR"/>
>+                <command name="glObjectLabelKHR"/>
>+                <command name="glGetObjectLabelKHR"/>
>+                <command name="glObjectPtrLabelKHR"/>
>+                <command name="glGetObjectPtrLabelKHR"/>
>+                <command name="glGetPointervKHR"/>
>+            </require>
>+            <require api="gl" profile="compatibility">
>+                <enum name="GL_DISPLAY_LIST"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_KHR_no_error" supported="gl|glcore|gles2">
>+            <require>
>+                <enum name="GL_CONTEXT_FLAG_NO_ERROR_BIT_KHR"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_KHR_robust_buffer_access_behavior" supported="gl|glcore|gles2"/>
>+        <extension name="GL_KHR_robustness" supported="gl|glcore|gles2">
>+            <require api="gl" comment="KHR extensions *mandate* suffixes for ES, unlike for GL">
>+                <enum name="GL_NO_ERROR"/>
>+                <enum name="GL_CONTEXT_ROBUST_ACCESS"/>
>+                <enum name="GL_LOSE_CONTEXT_ON_RESET"/>
>+                <enum name="GL_GUILTY_CONTEXT_RESET"/>
>+                <enum name="GL_INNOCENT_CONTEXT_RESET"/>
>+                <enum name="GL_UNKNOWN_CONTEXT_RESET"/>
>+                <enum name="GL_RESET_NOTIFICATION_STRATEGY"/>
>+                <enum name="GL_NO_RESET_NOTIFICATION"/>
>+                <enum name="GL_CONTEXT_LOST"/>
>+                <command name="glGetGraphicsResetStatus"/>
>+                <command name="glReadnPixels"/>
>+                <command name="glGetnUniformfv"/>
>+                <command name="glGetnUniformiv"/>
>+                <command name="glGetnUniformuiv"/>
>+            </require>
>+            <require api="gles2">
>+                <enum name="GL_NO_ERROR"/>
>+                <enum name="GL_CONTEXT_ROBUST_ACCESS_KHR"/>
>+                <enum name="GL_LOSE_CONTEXT_ON_RESET_KHR"/>
>+                <enum name="GL_GUILTY_CONTEXT_RESET_KHR"/>
>+                <enum name="GL_INNOCENT_CONTEXT_RESET_KHR"/>
>+                <enum name="GL_UNKNOWN_CONTEXT_RESET_KHR"/>
>+                <enum name="GL_RESET_NOTIFICATION_STRATEGY_KHR"/>
>+                <enum name="GL_NO_RESET_NOTIFICATION_KHR"/>
>+                <enum name="GL_CONTEXT_LOST_KHR"/>
>+                <command name="glGetGraphicsResetStatusKHR"/>
>+                <command name="glReadnPixelsKHR"/>
>+                <command name="glGetnUniformfvKHR"/>
>+                <command name="glGetnUniformivKHR"/>
>+                <command name="glGetnUniformuivKHR"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_KHR_texture_compression_astc_hdr" supported="gl|glcore|gles2">
>+            <require>
>+                <enum name="GL_COMPRESSED_RGBA_ASTC_4x4_KHR"/>
>+                <enum name="GL_COMPRESSED_RGBA_ASTC_5x4_KHR"/>
>+                <enum name="GL_COMPRESSED_RGBA_ASTC_5x5_KHR"/>
>+                <enum name="GL_COMPRESSED_RGBA_ASTC_6x5_KHR"/>
>+                <enum name="GL_COMPRESSED_RGBA_ASTC_6x6_KHR"/>
>+                <enum name="GL_COMPRESSED_RGBA_ASTC_8x5_KHR"/>
>+                <enum name="GL_COMPRESSED_RGBA_ASTC_8x6_KHR"/>
>+                <enum name="GL_COMPRESSED_RGBA_ASTC_8x8_KHR"/>
>+                <enum name="GL_COMPRESSED_RGBA_ASTC_10x5_KHR"/>
>+                <enum name="GL_COMPRESSED_RGBA_ASTC_10x6_KHR"/>
>+                <enum name="GL_COMPRESSED_RGBA_ASTC_10x8_KHR"/>
>+                <enum name="GL_COMPRESSED_RGBA_ASTC_10x10_KHR"/>
>+                <enum name="GL_COMPRESSED_RGBA_ASTC_12x10_KHR"/>
>+                <enum name="GL_COMPRESSED_RGBA_ASTC_12x12_KHR"/>
>+                <enum name="GL_COMPRESSED_SRGB8_ALPHA8_ASTC_4x4_KHR"/>
>+                <enum name="GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x4_KHR"/>
>+                <enum name="GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x5_KHR"/>
>+                <enum name="GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x5_KHR"/>
>+                <enum name="GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x6_KHR"/>
>+                <enum name="GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x5_KHR"/>
>+                <enum name="GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x6_KHR"/>
>+                <enum name="GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x8_KHR"/>
>+                <enum name="GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x5_KHR"/>
>+                <enum name="GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x6_KHR"/>
>+                <enum name="GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x8_KHR"/>
>+                <enum name="GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x10_KHR"/>
>+                <enum name="GL_COMPRESSED_SRGB8_ALPHA8_ASTC_12x10_KHR"/>
>+                <enum name="GL_COMPRESSED_SRGB8_ALPHA8_ASTC_12x12_KHR"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_KHR_texture_compression_astc_ldr" supported="gl|glcore|gles2" comment="API is identical to GL_KHR_texture_compression_astc_hdr extension">
>+            <require>
>+                <enum name="GL_COMPRESSED_RGBA_ASTC_4x4_KHR"/>
>+                <enum name="GL_COMPRESSED_RGBA_ASTC_5x4_KHR"/>
>+                <enum name="GL_COMPRESSED_RGBA_ASTC_5x5_KHR"/>
>+                <enum name="GL_COMPRESSED_RGBA_ASTC_6x5_KHR"/>
>+                <enum name="GL_COMPRESSED_RGBA_ASTC_6x6_KHR"/>
>+                <enum name="GL_COMPRESSED_RGBA_ASTC_8x5_KHR"/>
>+                <enum name="GL_COMPRESSED_RGBA_ASTC_8x6_KHR"/>
>+                <enum name="GL_COMPRESSED_RGBA_ASTC_8x8_KHR"/>
>+                <enum name="GL_COMPRESSED_RGBA_ASTC_10x5_KHR"/>
>+                <enum name="GL_COMPRESSED_RGBA_ASTC_10x6_KHR"/>
>+                <enum name="GL_COMPRESSED_RGBA_ASTC_10x8_KHR"/>
>+                <enum name="GL_COMPRESSED_RGBA_ASTC_10x10_KHR"/>
>+                <enum name="GL_COMPRESSED_RGBA_ASTC_12x10_KHR"/>
>+                <enum name="GL_COMPRESSED_RGBA_ASTC_12x12_KHR"/>
>+                <enum name="GL_COMPRESSED_SRGB8_ALPHA8_ASTC_4x4_KHR"/>
>+                <enum name="GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x4_KHR"/>
>+                <enum name="GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x5_KHR"/>
>+                <enum name="GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x5_KHR"/>
>+                <enum name="GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x6_KHR"/>
>+                <enum name="GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x5_KHR"/>
>+                <enum name="GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x6_KHR"/>
>+                <enum name="GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x8_KHR"/>
>+                <enum name="GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x5_KHR"/>
>+                <enum name="GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x6_KHR"/>
>+                <enum name="GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x8_KHR"/>
>+                <enum name="GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x10_KHR"/>
>+                <enum name="GL_COMPRESSED_SRGB8_ALPHA8_ASTC_12x10_KHR"/>
>+                <enum name="GL_COMPRESSED_SRGB8_ALPHA8_ASTC_12x12_KHR"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_KHR_texture_compression_astc_sliced_3d" supported="gl|glcore|gles2"/>
>+        <extension name="GL_KHR_parallel_shader_compile" supported="gl|glcore|gles2">
>+            <require>
>+                <enum name="GL_MAX_SHADER_COMPILER_THREADS_KHR"/>
>+                <enum name="GL_COMPLETION_STATUS_KHR"/>
>+                <command name="glMaxShaderCompilerThreadsKHR"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_MESAX_texture_stack" supported="gl">
>+            <require>
>+                <enum name="GL_TEXTURE_1D_STACK_MESAX"/>
>+                <enum name="GL_TEXTURE_2D_STACK_MESAX"/>
>+                <enum name="GL_PROXY_TEXTURE_1D_STACK_MESAX"/>
>+                <enum name="GL_PROXY_TEXTURE_2D_STACK_MESAX"/>
>+                <enum name="GL_TEXTURE_1D_STACK_BINDING_MESAX"/>
>+                <enum name="GL_TEXTURE_2D_STACK_BINDING_MESAX"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_MESA_pack_invert" supported="gl">
>+            <require>
>+                <enum name="GL_PACK_INVERT_MESA"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_MESA_program_binary_formats" supported="gl|gles2">
>+            <require>
>+                <enum name="GL_PROGRAM_BINARY_FORMAT_MESA"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_MESA_resize_buffers" supported="gl">
>+            <require>
>+                <command name="glResizeBuffersMESA"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_MESA_shader_integer_functions" supported="gl|gles2"/>
>+        <extension name="GL_MESA_tile_raster_order" supported="gl">
>+            <require>
>+                <enum name="GL_TILE_RASTER_ORDER_FIXED_MESA"/>
>+                <enum name="GL_TILE_RASTER_ORDER_INCREASING_X_MESA"/>
>+                <enum name="GL_TILE_RASTER_ORDER_INCREASING_Y_MESA"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_MESA_window_pos" supported="gl">
>+            <require>
>+                <command name="glWindowPos2dMESA"/>
>+                <command name="glWindowPos2dvMESA"/>
>+                <command name="glWindowPos2fMESA"/>
>+                <command name="glWindowPos2fvMESA"/>
>+                <command name="glWindowPos2iMESA"/>
>+                <command name="glWindowPos2ivMESA"/>
>+                <command name="glWindowPos2sMESA"/>
>+                <command name="glWindowPos2svMESA"/>
>+                <command name="glWindowPos3dMESA"/>
>+                <command name="glWindowPos3dvMESA"/>
>+                <command name="glWindowPos3fMESA"/>
>+                <command name="glWindowPos3fvMESA"/>
>+                <command name="glWindowPos3iMESA"/>
>+                <command name="glWindowPos3ivMESA"/>
>+                <command name="glWindowPos3sMESA"/>
>+                <command name="glWindowPos3svMESA"/>
>+                <command name="glWindowPos4dMESA"/>
>+                <command name="glWindowPos4dvMESA"/>
>+                <command name="glWindowPos4fMESA"/>
>+                <command name="glWindowPos4fvMESA"/>
>+                <command name="glWindowPos4iMESA"/>
>+                <command name="glWindowPos4ivMESA"/>
>+                <command name="glWindowPos4sMESA"/>
>+                <command name="glWindowPos4svMESA"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_MESA_ycbcr_texture" supported="gl">
>+            <require>
>+                <enum name="GL_UNSIGNED_SHORT_8_8_MESA"/>
>+                <enum name="GL_UNSIGNED_SHORT_8_8_REV_MESA"/>
>+                <enum name="GL_YCBCR_MESA"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_NVX_blend_equation_advanced_multi_draw_buffers" supported="gl|gles2"/>
>+        <extension name="GL_NVX_cross_process_interop" supported="disabled">
>+            <require comment="unpublished experimental extension">
>+                <enum name="GL_EXTERNAL_STORAGE_BIT_NVX"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_NVX_conditional_render" supported="gl">
>+            <require>
>+                <command name="glBeginConditionalRenderNVX"/>
>+                <command name="glEndConditionalRenderNVX"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_NVX_gpu_memory_info" supported="gl">
>+            <require>
>+                <enum name="GL_GPU_MEMORY_INFO_DEDICATED_VIDMEM_NVX"/>
>+                <enum name="GL_GPU_MEMORY_INFO_TOTAL_AVAILABLE_MEMORY_NVX"/>
>+                <enum name="GL_GPU_MEMORY_INFO_CURRENT_AVAILABLE_VIDMEM_NVX"/>
>+                <enum name="GL_GPU_MEMORY_INFO_EVICTION_COUNT_NVX"/>
>+                <enum name="GL_GPU_MEMORY_INFO_EVICTED_MEMORY_NVX"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_NVX_linked_gpu_multicast" supported="gl">
>+            <require>
>+                <enum name="GL_LGPU_SEPARATE_STORAGE_BIT_NVX"/>
>+                <enum name="GL_MAX_LGPU_GPUS_NVX"/>
>+                <command name="glLGPUNamedBufferSubDataNVX"/>
>+                <command name="glLGPUCopyImageSubDataNVX"/>
>+                <command name="glLGPUInterlockNVX"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_NV_alpha_to_coverage_dither_control" supported="gl">
>+            <require>
>+                <enum name="GL_ALPHA_TO_COVERAGE_DITHER_DEFAULT_NV"/>
>+                <enum name="GL_ALPHA_TO_COVERAGE_DITHER_ENABLE_NV"/>
>+                <enum name="GL_ALPHA_TO_COVERAGE_DITHER_DISABLE_NV"/>
>+                <enum name="GL_ALPHA_TO_COVERAGE_DITHER_MODE_NV"/>
>+                <command name="glAlphaToCoverageDitherControlNV"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_NV_bindless_multi_draw_indirect" supported="gl|glcore">
>+            <require>
>+                <command name="glMultiDrawArraysIndirectBindlessNV"/>
>+                <command name="glMultiDrawElementsIndirectBindlessNV"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_NV_bindless_multi_draw_indirect_count" supported="gl|glcore">
>+            <require>
>+                <command name="glMultiDrawArraysIndirectBindlessCountNV"/>
>+                <command name="glMultiDrawElementsIndirectBindlessCountNV"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_NV_bindless_texture" supported="gl|glcore|gles2">
>+            <require>
>+                <command name="glGetTextureHandleNV"/>
>+                <command name="glGetTextureSamplerHandleNV"/>
>+                <command name="glMakeTextureHandleResidentNV"/>
>+                <command name="glMakeTextureHandleNonResidentNV"/>
>+                <command name="glGetImageHandleNV"/>
>+                <command name="glMakeImageHandleResidentNV"/>
>+                <command name="glMakeImageHandleNonResidentNV"/>
>+                <command name="glUniformHandleui64NV"/>
>+                <command name="glUniformHandleui64vNV"/>
>+                <command name="glProgramUniformHandleui64NV"/>
>+                <command name="glProgramUniformHandleui64vNV"/>
>+                <command name="glIsTextureHandleResidentNV"/>
>+                <command name="glIsImageHandleResidentNV"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_NV_blend_equation_advanced" supported="gl|glcore|gles2">
>+            <require>
>+                <enum name="GL_BLEND_OVERLAP_NV"/>
>+                <enum name="GL_BLEND_PREMULTIPLIED_SRC_NV"/>
>+                <enum name="GL_BLUE_NV"/>
>+                <enum name="GL_COLORBURN_NV"/>
>+                <enum name="GL_COLORDODGE_NV"/>
>+                <enum name="GL_CONJOINT_NV"/>
>+                <enum name="GL_CONTRAST_NV"/>
>+                <enum name="GL_DARKEN_NV"/>
>+                <enum name="GL_DIFFERENCE_NV"/>
>+                <enum name="GL_DISJOINT_NV"/>
>+                <enum name="GL_DST_ATOP_NV"/>
>+                <enum name="GL_DST_IN_NV"/>
>+                <enum name="GL_DST_NV"/>
>+                <enum name="GL_DST_OUT_NV"/>
>+                <enum name="GL_DST_OVER_NV"/>
>+                <enum name="GL_EXCLUSION_NV"/>
>+                <enum name="GL_GREEN_NV"/>
>+                <enum name="GL_HARDLIGHT_NV"/>
>+                <enum name="GL_HARDMIX_NV"/>
>+                <enum name="GL_HSL_COLOR_NV"/>
>+                <enum name="GL_HSL_HUE_NV"/>
>+                <enum name="GL_HSL_LUMINOSITY_NV"/>
>+                <enum name="GL_HSL_SATURATION_NV"/>
>+                <enum name="GL_INVERT"/>
>+                <enum name="GL_INVERT_OVG_NV"/>
>+                <enum name="GL_INVERT_RGB_NV"/>
>+                <enum name="GL_LIGHTEN_NV"/>
>+                <enum name="GL_LINEARBURN_NV"/>
>+                <enum name="GL_LINEARDODGE_NV"/>
>+                <enum name="GL_LINEARLIGHT_NV"/>
>+                <enum name="GL_MINUS_CLAMPED_NV"/>
>+                <enum name="GL_MINUS_NV"/>
>+                <enum name="GL_MULTIPLY_NV"/>
>+                <enum name="GL_OVERLAY_NV"/>
>+                <enum name="GL_PINLIGHT_NV"/>
>+                <enum name="GL_PLUS_CLAMPED_ALPHA_NV"/>
>+                <enum name="GL_PLUS_CLAMPED_NV"/>
>+                <enum name="GL_PLUS_DARKER_NV"/>
>+                <enum name="GL_PLUS_NV"/>
>+                <enum name="GL_RED_NV"/>
>+                <enum name="GL_SCREEN_NV"/>
>+                <enum name="GL_SOFTLIGHT_NV"/>
>+                <enum name="GL_SRC_ATOP_NV"/>
>+                <enum name="GL_SRC_IN_NV"/>
>+                <enum name="GL_SRC_NV"/>
>+                <enum name="GL_SRC_OUT_NV"/>
>+                <enum name="GL_SRC_OVER_NV"/>
>+                <enum name="GL_UNCORRELATED_NV"/>
>+                <enum name="GL_VIVIDLIGHT_NV"/>
>+                <enum name="GL_XOR_NV"/>
>+                <enum name="GL_ZERO"/>
>+                <command name="glBlendParameteriNV"/>
>+                <command name="glBlendBarrierNV"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_NV_blend_equation_advanced_coherent" supported="gl|glcore|gles2">
>+            <require comment="Otherwise identical to GL_NV_blend_equation_advanced, just different semantic behavior">
>+                <enum name="GL_BLEND_ADVANCED_COHERENT_NV"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_NV_blend_minmax_factor" supported="gl|glcore|gles2">
>+            <require>
>+                <enum name="GL_FACTOR_MIN_AMD"/>
>+                <enum name="GL_FACTOR_MAX_AMD"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_NV_blend_square" supported="gl"/>
>+        <extension name="GL_NV_clip_space_w_scaling" supported="gl|glcore|gles2">
>+            <require>
>+                <enum name="GL_VIEWPORT_POSITION_W_SCALE_NV"/>
>+                <enum name="GL_VIEWPORT_POSITION_W_SCALE_X_COEFF_NV"/>
>+                <enum name="GL_VIEWPORT_POSITION_W_SCALE_Y_COEFF_NV"/>
>+                <command name="glViewportPositionWScaleNV"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_NV_command_list" supported="gl|glcore">
>+            <require>
>+                <enum name="GL_TERMINATE_SEQUENCE_COMMAND_NV"/>
>+                <enum name="GL_NOP_COMMAND_NV"/>
>+                <enum name="GL_DRAW_ELEMENTS_COMMAND_NV"/>
>+                <enum name="GL_DRAW_ARRAYS_COMMAND_NV"/>
>+                <enum name="GL_DRAW_ELEMENTS_STRIP_COMMAND_NV"/>
>+                <enum name="GL_DRAW_ARRAYS_STRIP_COMMAND_NV"/>
>+                <enum name="GL_DRAW_ELEMENTS_INSTANCED_COMMAND_NV"/>
>+                <enum name="GL_DRAW_ARRAYS_INSTANCED_COMMAND_NV"/>
>+                <enum name="GL_ELEMENT_ADDRESS_COMMAND_NV"/>
>+                <enum name="GL_ATTRIBUTE_ADDRESS_COMMAND_NV"/>
>+                <enum name="GL_UNIFORM_ADDRESS_COMMAND_NV"/>
>+                <enum name="GL_BLEND_COLOR_COMMAND_NV"/>
>+                <enum name="GL_STENCIL_REF_COMMAND_NV"/>
>+                <enum name="GL_LINE_WIDTH_COMMAND_NV"/>
>+                <enum name="GL_POLYGON_OFFSET_COMMAND_NV"/>
>+                <enum name="GL_ALPHA_REF_COMMAND_NV"/>
>+                <enum name="GL_VIEWPORT_COMMAND_NV"/>
>+                <enum name="GL_SCISSOR_COMMAND_NV"/>
>+                <enum name="GL_FRONT_FACE_COMMAND_NV"/>
>+                <command name="glCreateStatesNV"/>
>+                <command name="glDeleteStatesNV"/>
>+                <command name="glIsStateNV"/>
>+                <command name="glStateCaptureNV"/>
>+                <command name="glGetCommandHeaderNV"/>
>+                <command name="glGetStageIndexNV"/>
>+                <command name="glDrawCommandsNV"/>
>+                <command name="glDrawCommandsAddressNV"/>
>+                <command name="glDrawCommandsStatesNV"/>
>+                <command name="glDrawCommandsStatesAddressNV"/>
>+                <command name="glCreateCommandListsNV"/>
>+                <command name="glDeleteCommandListsNV"/>
>+                <command name="glIsCommandListNV"/>
>+                <command name="glListDrawCommandsStatesClientNV"/>
>+                <command name="glCommandListSegmentsNV"/>
>+                <command name="glCompileCommandListNV"/>
>+                <command name="glCallCommandListNV"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_NV_compute_program5" supported="gl">
>+            <require>
>+                <enum name="GL_COMPUTE_PROGRAM_NV"/>
>+                <enum name="GL_COMPUTE_PROGRAM_PARAMETER_BUFFER_NV"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_NV_conditional_render" supported="gl|glcore|gles2">
>+            <require>
>+                <enum name="GL_QUERY_WAIT_NV"/>
>+                <enum name="GL_QUERY_NO_WAIT_NV"/>
>+                <enum name="GL_QUERY_BY_REGION_WAIT_NV"/>
>+                <enum name="GL_QUERY_BY_REGION_NO_WAIT_NV"/>
>+                <command name="glBeginConditionalRenderNV"/>
>+                <command name="glEndConditionalRenderNV"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_NV_conservative_raster" supported="gl|glcore|gles2">
>+            <require>
>+                <enum name="GL_CONSERVATIVE_RASTERIZATION_NV"/>
>+                <enum name="GL_SUBPIXEL_PRECISION_BIAS_X_BITS_NV"/>
>+                <enum name="GL_SUBPIXEL_PRECISION_BIAS_Y_BITS_NV"/>
>+                <enum name="GL_MAX_SUBPIXEL_PRECISION_BIAS_BITS_NV"/>
>+                <command name="glSubpixelPrecisionBiasNV"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_NV_conservative_raster_dilate" supported="gl|glcore">
>+            <require>
>+                <enum name="GL_CONSERVATIVE_RASTER_DILATE_NV"/>
>+                <enum name="GL_CONSERVATIVE_RASTER_DILATE_RANGE_NV"/>
>+                <enum name="GL_CONSERVATIVE_RASTER_DILATE_GRANULARITY_NV"/>
>+                <command name="glConservativeRasterParameterfNV"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_NV_conservative_raster_pre_snap" supported="gl|glcore|gles2">
>+            <require>
>+                <enum name="GL_CONSERVATIVE_RASTER_MODE_PRE_SNAP_NV"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_NV_conservative_raster_pre_snap_triangles" supported="gl|glcore|gles2">
>+            <require>
>+                <enum name="GL_CONSERVATIVE_RASTER_MODE_NV"/>
>+                <enum name="GL_CONSERVATIVE_RASTER_MODE_POST_SNAP_NV"/>
>+                <enum name="GL_CONSERVATIVE_RASTER_MODE_PRE_SNAP_TRIANGLES_NV"/>
>+                <enum name="GL_CONSERVATIVE_RASTER_MODE_NV"/>
>+                <command name="glConservativeRasterParameteriNV"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_NV_conservative_raster_underestimation" supported="gl|glcore"/>
>+        <extension name="GL_NV_copy_buffer" supported="gles2">
>+            <require>
>+                <enum name="GL_COPY_READ_BUFFER_NV"/>
>+                <enum name="GL_COPY_WRITE_BUFFER_NV"/>
>+                <command name="glCopyBufferSubDataNV"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_NV_copy_depth_to_color" supported="gl">
>+            <require>
>+                <enum name="GL_DEPTH_STENCIL_TO_RGBA_NV"/>
>+                <enum name="GL_DEPTH_STENCIL_TO_BGRA_NV"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_NV_copy_image" supported="gl">
>+            <require>
>+                <command name="glCopyImageSubDataNV"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_NV_coverage_sample" supported="gles2">
>+            <require>
>+                <enum name="GL_COVERAGE_COMPONENT_NV"/>
>+                <enum name="GL_COVERAGE_COMPONENT4_NV"/>
>+                <enum name="GL_COVERAGE_ATTACHMENT_NV"/>
>+                <enum name="GL_COVERAGE_BUFFERS_NV"/>
>+                <enum name="GL_COVERAGE_SAMPLES_NV"/>
>+                <enum name="GL_COVERAGE_ALL_FRAGMENTS_NV"/>
>+                <enum name="GL_COVERAGE_EDGE_FRAGMENTS_NV"/>
>+                <enum name="GL_COVERAGE_AUTOMATIC_NV"/>
>+                <enum name="GL_COVERAGE_BUFFER_BIT_NV"/>
>+                <command name="glCoverageMaskNV"/>
>+                <command name="glCoverageOperationNV"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_NV_deep_texture3D" supported="gl">
>+            <require>
>+                <enum name="GL_MAX_DEEP_3D_TEXTURE_WIDTH_HEIGHT_NV"/>
>+                <enum name="GL_MAX_DEEP_3D_TEXTURE_DEPTH_NV"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_NV_depth_buffer_float" supported="gl">
>+            <require>
>+                <enum name="GL_DEPTH_COMPONENT32F_NV"/>
>+                <enum name="GL_DEPTH32F_STENCIL8_NV"/>
>+                <enum name="GL_FLOAT_32_UNSIGNED_INT_24_8_REV_NV"/>
>+                <enum name="GL_DEPTH_BUFFER_FLOAT_MODE_NV"/>
>+                <command name="glDepthRangedNV"/>
>+                <command name="glClearDepthdNV"/>
>+                <command name="glDepthBoundsdNV"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_NV_depth_clamp" supported="gl">
>+            <require>
>+                <enum name="GL_DEPTH_CLAMP_NV"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_NV_depth_nonlinear" supported="gles2">
>+            <require>
>+                <enum name="GL_DEPTH_COMPONENT16_NONLINEAR_NV"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_NV_draw_buffers" supported="gles2">
>+            <require>
>+                <enum name="GL_MAX_DRAW_BUFFERS_NV"/>
>+                <enum name="GL_DRAW_BUFFER0_NV"/>
>+                <enum name="GL_DRAW_BUFFER1_NV"/>
>+                <enum name="GL_DRAW_BUFFER2_NV"/>
>+                <enum name="GL_DRAW_BUFFER3_NV"/>
>+                <enum name="GL_DRAW_BUFFER4_NV"/>
>+                <enum name="GL_DRAW_BUFFER5_NV"/>
>+                <enum name="GL_DRAW_BUFFER6_NV"/>
>+                <enum name="GL_DRAW_BUFFER7_NV"/>
>+                <enum name="GL_DRAW_BUFFER8_NV"/>
>+                <enum name="GL_DRAW_BUFFER9_NV"/>
>+                <enum name="GL_DRAW_BUFFER10_NV"/>
>+                <enum name="GL_DRAW_BUFFER11_NV"/>
>+                <enum name="GL_DRAW_BUFFER12_NV"/>
>+                <enum name="GL_DRAW_BUFFER13_NV"/>
>+                <enum name="GL_DRAW_BUFFER14_NV"/>
>+                <enum name="GL_DRAW_BUFFER15_NV"/>
>+                <enum name="GL_COLOR_ATTACHMENT0_NV"/>
>+                <enum name="GL_COLOR_ATTACHMENT1_NV"/>
>+                <enum name="GL_COLOR_ATTACHMENT2_NV"/>
>+                <enum name="GL_COLOR_ATTACHMENT3_NV"/>
>+                <enum name="GL_COLOR_ATTACHMENT4_NV"/>
>+                <enum name="GL_COLOR_ATTACHMENT5_NV"/>
>+                <enum name="GL_COLOR_ATTACHMENT6_NV"/>
>+                <enum name="GL_COLOR_ATTACHMENT7_NV"/>
>+                <enum name="GL_COLOR_ATTACHMENT8_NV"/>
>+                <enum name="GL_COLOR_ATTACHMENT9_NV"/>
>+                <enum name="GL_COLOR_ATTACHMENT10_NV"/>
>+                <enum name="GL_COLOR_ATTACHMENT11_NV"/>
>+                <enum name="GL_COLOR_ATTACHMENT12_NV"/>
>+                <enum name="GL_COLOR_ATTACHMENT13_NV"/>
>+                <enum name="GL_COLOR_ATTACHMENT14_NV"/>
>+                <enum name="GL_COLOR_ATTACHMENT15_NV"/>
>+                <command name="glDrawBuffersNV"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_NV_draw_instanced" supported="gles2">
>+            <require>
>+                <command name="glDrawArraysInstancedNV"/>
>+                <command name="glDrawElementsInstancedNV"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_NV_draw_texture" supported="gl">
>+            <require>
>+                <command name="glDrawTextureNV"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_NV_draw_vulkan_image" supported="gl|glcore|gles2">
>+            <require>
>+                <command name="glDrawVkImageNV"/>
>+                <command name="glGetVkProcAddrNV"/>
>+                <command name="glWaitVkSemaphoreNV"/>
>+                <command name="glSignalVkSemaphoreNV"/>
>+                <command name="glSignalVkFenceNV"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_NV_evaluators" supported="gl">
>+            <require>
>+                <enum name="GL_EVAL_2D_NV"/>
>+                <enum name="GL_EVAL_TRIANGULAR_2D_NV"/>
>+                <enum name="GL_MAP_TESSELLATION_NV"/>
>+                <enum name="GL_MAP_ATTRIB_U_ORDER_NV"/>
>+                <enum name="GL_MAP_ATTRIB_V_ORDER_NV"/>
>+                <enum name="GL_EVAL_FRACTIONAL_TESSELLATION_NV"/>
>+                <enum name="GL_EVAL_VERTEX_ATTRIB0_NV"/>
>+                <enum name="GL_EVAL_VERTEX_ATTRIB1_NV"/>
>+                <enum name="GL_EVAL_VERTEX_ATTRIB2_NV"/>
>+                <enum name="GL_EVAL_VERTEX_ATTRIB3_NV"/>
>+                <enum name="GL_EVAL_VERTEX_ATTRIB4_NV"/>
>+                <enum name="GL_EVAL_VERTEX_ATTRIB5_NV"/>
>+                <enum name="GL_EVAL_VERTEX_ATTRIB6_NV"/>
>+                <enum name="GL_EVAL_VERTEX_ATTRIB7_NV"/>
>+                <enum name="GL_EVAL_VERTEX_ATTRIB8_NV"/>
>+                <enum name="GL_EVAL_VERTEX_ATTRIB9_NV"/>
>+                <enum name="GL_EVAL_VERTEX_ATTRIB10_NV"/>
>+                <enum name="GL_EVAL_VERTEX_ATTRIB11_NV"/>
>+                <enum name="GL_EVAL_VERTEX_ATTRIB12_NV"/>
>+                <enum name="GL_EVAL_VERTEX_ATTRIB13_NV"/>
>+                <enum name="GL_EVAL_VERTEX_ATTRIB14_NV"/>
>+                <enum name="GL_EVAL_VERTEX_ATTRIB15_NV"/>
>+                <enum name="GL_MAX_MAP_TESSELLATION_NV"/>
>+                <enum name="GL_MAX_RATIONAL_EVAL_ORDER_NV"/>
>+                <command name="glMapControlPointsNV"/>
>+                <command name="glMapParameterivNV"/>
>+                <command name="glMapParameterfvNV"/>
>+                <command name="glGetMapControlPointsNV"/>
>+                <command name="glGetMapParameterivNV"/>
>+                <command name="glGetMapParameterfvNV"/>
>+                <command name="glGetMapAttribParameterivNV"/>
>+                <command name="glGetMapAttribParameterfvNV"/>
>+                <command name="glEvalMapsNV"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_NV_explicit_attrib_location" supported="gles2"/>
>+        <extension name="GL_NV_explicit_multisample" supported="gl">
>+            <require>
>+                <enum name="GL_SAMPLE_POSITION_NV"/>
>+                <enum name="GL_SAMPLE_MASK_NV"/>
>+                <enum name="GL_SAMPLE_MASK_VALUE_NV"/>
>+                <enum name="GL_TEXTURE_BINDING_RENDERBUFFER_NV"/>
>+                <enum name="GL_TEXTURE_RENDERBUFFER_DATA_STORE_BINDING_NV"/>
>+                <enum name="GL_TEXTURE_RENDERBUFFER_NV"/>
>+                <enum name="GL_SAMPLER_RENDERBUFFER_NV"/>
>+                <enum name="GL_INT_SAMPLER_RENDERBUFFER_NV"/>
>+                <enum name="GL_UNSIGNED_INT_SAMPLER_RENDERBUFFER_NV"/>
>+                <enum name="GL_MAX_SAMPLE_MASK_WORDS_NV"/>
>+                <command name="glGetMultisamplefvNV"/>
>+                <command name="glSampleMaskIndexedNV"/>
>+                <command name="glTexRenderbufferNV"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_NV_fbo_color_attachments" supported="gles2">
>+            <require>
>+                <enum name="GL_MAX_COLOR_ATTACHMENTS_NV"/>
>+                <enum name="GL_COLOR_ATTACHMENT0_NV"/>
>+                <enum name="GL_COLOR_ATTACHMENT1_NV"/>
>+                <enum name="GL_COLOR_ATTACHMENT2_NV"/>
>+                <enum name="GL_COLOR_ATTACHMENT3_NV"/>
>+                <enum name="GL_COLOR_ATTACHMENT4_NV"/>
>+                <enum name="GL_COLOR_ATTACHMENT5_NV"/>
>+                <enum name="GL_COLOR_ATTACHMENT6_NV"/>
>+                <enum name="GL_COLOR_ATTACHMENT7_NV"/>
>+                <enum name="GL_COLOR_ATTACHMENT8_NV"/>
>+                <enum name="GL_COLOR_ATTACHMENT9_NV"/>
>+                <enum name="GL_COLOR_ATTACHMENT10_NV"/>
>+                <enum name="GL_COLOR_ATTACHMENT11_NV"/>
>+                <enum name="GL_COLOR_ATTACHMENT12_NV"/>
>+                <enum name="GL_COLOR_ATTACHMENT13_NV"/>
>+                <enum name="GL_COLOR_ATTACHMENT14_NV"/>
>+                <enum name="GL_COLOR_ATTACHMENT15_NV"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_NV_fence" supported="gl|gles1|gles2">
>+            <require>
>+                <enum name="GL_ALL_COMPLETED_NV"/>
>+                <enum name="GL_FENCE_STATUS_NV"/>
>+                <enum name="GL_FENCE_CONDITION_NV"/>
>+                <command name="glDeleteFencesNV"/>
>+                <command name="glGenFencesNV"/>
>+                <command name="glIsFenceNV"/>
>+                <command name="glTestFenceNV"/>
>+                <command name="glGetFenceivNV"/>
>+                <command name="glFinishFenceNV"/>
>+                <command name="glSetFenceNV"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_NV_fill_rectangle" supported="gl|glcore|gles2">
>+            <require>
>+                <enum name="GL_FILL_RECTANGLE_NV"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_NV_float_buffer" supported="gl">
>+            <require>
>+                <enum name="GL_FLOAT_R_NV"/>
>+                <enum name="GL_FLOAT_RG_NV"/>
>+                <enum name="GL_FLOAT_RGB_NV"/>
>+                <enum name="GL_FLOAT_RGBA_NV"/>
>+                <enum name="GL_FLOAT_R16_NV"/>
>+                <enum name="GL_FLOAT_R32_NV"/>
>+                <enum name="GL_FLOAT_RG16_NV"/>
>+                <enum name="GL_FLOAT_RG32_NV"/>
>+                <enum name="GL_FLOAT_RGB16_NV"/>
>+                <enum name="GL_FLOAT_RGB32_NV"/>
>+                <enum name="GL_FLOAT_RGBA16_NV"/>
>+                <enum name="GL_FLOAT_RGBA32_NV"/>
>+                <enum name="GL_TEXTURE_FLOAT_COMPONENTS_NV"/>
>+                <enum name="GL_FLOAT_CLEAR_COLOR_VALUE_NV"/>
>+                <enum name="GL_FLOAT_RGBA_MODE_NV"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_NV_fog_distance" supported="gl">
>+            <require>
>+                <enum name="GL_FOG_DISTANCE_MODE_NV"/>
>+                <enum name="GL_EYE_RADIAL_NV"/>
>+                <enum name="GL_EYE_PLANE_ABSOLUTE_NV"/>
>+                <enum name="GL_EYE_PLANE"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_NV_fragment_coverage_to_color" supported="gl|glcore|gles2">
>+            <require>
>+                <enum name="GL_FRAGMENT_COVERAGE_TO_COLOR_NV"/>
>+                <enum name="GL_FRAGMENT_COVERAGE_COLOR_NV"/>
>+                <command name="glFragmentCoverageColorNV"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_NV_fragment_program" supported="gl">
>+            <require>
>+                <enum name="GL_MAX_FRAGMENT_PROGRAM_LOCAL_PARAMETERS_NV"/>
>+                <enum name="GL_FRAGMENT_PROGRAM_NV"/>
>+                <enum name="GL_MAX_TEXTURE_COORDS_NV"/>
>+                <enum name="GL_MAX_TEXTURE_IMAGE_UNITS_NV"/>
>+                <enum name="GL_FRAGMENT_PROGRAM_BINDING_NV"/>
>+                <enum name="GL_PROGRAM_ERROR_STRING_NV"/>
>+            </require>
>+            <require comment="Some NV_fragment_program entry points are shared with ARB_vertex_program">
>+                <command name="glProgramNamedParameter4fNV"/>
>+                <command name="glProgramNamedParameter4fvNV"/>
>+                <command name="glProgramNamedParameter4dNV"/>
>+                <command name="glProgramNamedParameter4dvNV"/>
>+                <command name="glGetProgramNamedParameterfvNV"/>
>+                <command name="glGetProgramNamedParameterdvNV"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_NV_fragment_program2" supported="gl">
>+            <require>
>+                <enum name="GL_MAX_PROGRAM_EXEC_INSTRUCTIONS_NV"/>
>+                <enum name="GL_MAX_PROGRAM_CALL_DEPTH_NV"/>
>+                <enum name="GL_MAX_PROGRAM_IF_DEPTH_NV"/>
>+                <enum name="GL_MAX_PROGRAM_LOOP_DEPTH_NV"/>
>+                <enum name="GL_MAX_PROGRAM_LOOP_COUNT_NV"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_NV_fragment_program4" supported="gl"/>
>+        <extension name="GL_NV_fragment_program_option" supported="gl"/>
>+        <extension name="GL_NV_fragment_shader_interlock" supported="gl|glcore|gles2"/>
>+        <extension name="GL_NV_framebuffer_blit" supported="gles2">
>+            <require>
>+                <enum name="GL_READ_FRAMEBUFFER_NV"/>
>+                <enum name="GL_DRAW_FRAMEBUFFER_NV"/>
>+                <enum name="GL_DRAW_FRAMEBUFFER_BINDING_NV"/>
>+                <enum name="GL_READ_FRAMEBUFFER_BINDING_NV"/>
>+                <command name="glBlitFramebufferNV"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_NV_framebuffer_mixed_samples" supported="gl|glcore|gles2">
>+            <require>
>+                <enum name="GL_RASTER_MULTISAMPLE_EXT"/>
>+                <enum name="GL_COVERAGE_MODULATION_TABLE_NV"/>
>+                <enum name="GL_RASTER_SAMPLES_EXT"/>
>+                <enum name="GL_MAX_RASTER_SAMPLES_EXT"/>
>+                <enum name="GL_RASTER_FIXED_SAMPLE_LOCATIONS_EXT"/>
>+                <enum name="GL_MULTISAMPLE_RASTERIZATION_ALLOWED_EXT"/>
>+                <enum name="GL_EFFECTIVE_RASTER_SAMPLES_EXT"/>
>+                <enum name="GL_COLOR_SAMPLES_NV"/>
>+                <enum name="GL_DEPTH_SAMPLES_NV"/>
>+                <enum name="GL_STENCIL_SAMPLES_NV"/>
>+                <enum name="GL_MIXED_DEPTH_SAMPLES_SUPPORTED_NV"/>
>+                <enum name="GL_MIXED_STENCIL_SAMPLES_SUPPORTED_NV"/>
>+                <enum name="GL_COVERAGE_MODULATION_NV"/>
>+                <enum name="GL_COVERAGE_MODULATION_TABLE_SIZE_NV"/>
>+                <command name="glRasterSamplesEXT"/>
>+                <command name="glCoverageModulationTableNV"/>
>+                <command name="glGetCoverageModulationTableNV"/>
>+                <command name="glCoverageModulationNV"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_NV_framebuffer_multisample" supported="gles2">
>+            <require>
>+                <enum name="GL_RENDERBUFFER_SAMPLES_NV"/>
>+                <enum name="GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE_NV"/>
>+                <enum name="GL_MAX_SAMPLES_NV"/>
>+                <command name="glRenderbufferStorageMultisampleNV"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_NV_framebuffer_multisample_coverage" supported="gl|glcore">
>+            <require>
>+                <enum name="GL_RENDERBUFFER_COVERAGE_SAMPLES_NV"/>
>+                <enum name="GL_RENDERBUFFER_COLOR_SAMPLES_NV"/>
>+                <enum name="GL_MAX_MULTISAMPLE_COVERAGE_MODES_NV"/>
>+                <enum name="GL_MULTISAMPLE_COVERAGE_MODES_NV"/>
>+                <command name="glRenderbufferStorageMultisampleCoverageNV"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_NV_generate_mipmap_sRGB" supported="gles2"/>
>+        <extension name="GL_NV_geometry_program4" supported="gl">
>+            <require>
>+                <enum name="GL_LINES_ADJACENCY_EXT"/>
>+                <enum name="GL_LINE_STRIP_ADJACENCY_EXT"/>
>+                <enum name="GL_TRIANGLES_ADJACENCY_EXT"/>
>+                <enum name="GL_TRIANGLE_STRIP_ADJACENCY_EXT"/>
>+                <enum name="GL_GEOMETRY_PROGRAM_NV"/>
>+                <enum name="GL_MAX_PROGRAM_OUTPUT_VERTICES_NV"/>
>+                <enum name="GL_MAX_PROGRAM_TOTAL_OUTPUT_COMPONENTS_NV"/>
>+                <enum name="GL_GEOMETRY_VERTICES_OUT_EXT"/>
>+                <enum name="GL_GEOMETRY_INPUT_TYPE_EXT"/>
>+                <enum name="GL_GEOMETRY_OUTPUT_TYPE_EXT"/>
>+                <enum name="GL_MAX_GEOMETRY_TEXTURE_IMAGE_UNITS_EXT"/>
>+                <enum name="GL_FRAMEBUFFER_ATTACHMENT_LAYERED_EXT"/>
>+                <enum name="GL_FRAMEBUFFER_INCOMPLETE_LAYER_TARGETS_EXT"/>
>+                <enum name="GL_FRAMEBUFFER_INCOMPLETE_LAYER_COUNT_EXT"/>
>+                <enum name="GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER_EXT"/>
>+                <enum name="GL_PROGRAM_POINT_SIZE_EXT"/>
>+                <command name="glProgramVertexLimitNV"/>
>+                <command name="glFramebufferTextureEXT"/>
>+                <command name="glFramebufferTextureLayerEXT"/>
>+                <command name="glFramebufferTextureFaceEXT"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_NV_geometry_shader4" supported="gl"/>
>+        <extension name="GL_NV_geometry_shader_passthrough" supported="gl|glcore|gles2"/>
>+        <extension name="GL_NV_gpu_program4" supported="gl">
>+            <require>
>+                <enum name="GL_MIN_PROGRAM_TEXEL_OFFSET_NV"/>
>+                <enum name="GL_MAX_PROGRAM_TEXEL_OFFSET_NV"/>
>+                <enum name="GL_PROGRAM_ATTRIB_COMPONENTS_NV"/>
>+                <enum name="GL_PROGRAM_RESULT_COMPONENTS_NV"/>
>+                <enum name="GL_MAX_PROGRAM_ATTRIB_COMPONENTS_NV"/>
>+                <enum name="GL_MAX_PROGRAM_RESULT_COMPONENTS_NV"/>
>+                <enum name="GL_MAX_PROGRAM_GENERIC_ATTRIBS_NV"/>
>+                <enum name="GL_MAX_PROGRAM_GENERIC_RESULTS_NV"/>
>+                <command name="glProgramLocalParameterI4iNV"/>
>+                <command name="glProgramLocalParameterI4ivNV"/>
>+                <command name="glProgramLocalParametersI4ivNV"/>
>+                <command name="glProgramLocalParameterI4uiNV"/>
>+                <command name="glProgramLocalParameterI4uivNV"/>
>+                <command name="glProgramLocalParametersI4uivNV"/>
>+                <command name="glProgramEnvParameterI4iNV"/>
>+                <command name="glProgramEnvParameterI4ivNV"/>
>+                <command name="glProgramEnvParametersI4ivNV"/>
>+                <command name="glProgramEnvParameterI4uiNV"/>
>+                <command name="glProgramEnvParameterI4uivNV"/>
>+                <command name="glProgramEnvParametersI4uivNV"/>
>+                <command name="glGetProgramLocalParameterIivNV"/>
>+                <command name="glGetProgramLocalParameterIuivNV"/>
>+                <command name="glGetProgramEnvParameterIivNV"/>
>+                <command name="glGetProgramEnvParameterIuivNV"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_NV_gpu_program5" supported="gl">
>+            <require>
>+                <enum name="GL_MAX_GEOMETRY_PROGRAM_INVOCATIONS_NV"/>
>+                <enum name="GL_MIN_FRAGMENT_INTERPOLATION_OFFSET_NV"/>
>+                <enum name="GL_MAX_FRAGMENT_INTERPOLATION_OFFSET_NV"/>
>+                <enum name="GL_FRAGMENT_PROGRAM_INTERPOLATION_OFFSET_BITS_NV"/>
>+                <enum name="GL_MIN_PROGRAM_TEXTURE_GATHER_OFFSET_NV"/>
>+                <enum name="GL_MAX_PROGRAM_TEXTURE_GATHER_OFFSET_NV"/>
>+                <enum name="GL_MAX_PROGRAM_SUBROUTINE_PARAMETERS_NV"/>
>+                <enum name="GL_MAX_PROGRAM_SUBROUTINE_NUM_NV"/>
>+                <command name="glProgramSubroutineParametersuivNV"/>
>+                <command name="glGetProgramSubroutineParameteruivNV"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_NV_gpu_program5_mem_extended" supported="gl"/>
>+        <extension name="GL_NV_gpu_shader5" supported="gl|glcore|gles2">
>+            <require>
>+                <enum name="GL_INT64_NV"/>
>+                <enum name="GL_UNSIGNED_INT64_NV"/>
>+                <enum name="GL_INT8_NV"/>
>+                <enum name="GL_INT8_VEC2_NV"/>
>+                <enum name="GL_INT8_VEC3_NV"/>
>+                <enum name="GL_INT8_VEC4_NV"/>
>+                <enum name="GL_INT16_NV"/>
>+                <enum name="GL_INT16_VEC2_NV"/>
>+                <enum name="GL_INT16_VEC3_NV"/>
>+                <enum name="GL_INT16_VEC4_NV"/>
>+                <enum name="GL_INT64_VEC2_NV"/>
>+                <enum name="GL_INT64_VEC3_NV"/>
>+                <enum name="GL_INT64_VEC4_NV"/>
>+                <enum name="GL_UNSIGNED_INT8_NV"/>
>+                <enum name="GL_UNSIGNED_INT8_VEC2_NV"/>
>+                <enum name="GL_UNSIGNED_INT8_VEC3_NV"/>
>+                <enum name="GL_UNSIGNED_INT8_VEC4_NV"/>
>+                <enum name="GL_UNSIGNED_INT16_NV"/>
>+                <enum name="GL_UNSIGNED_INT16_VEC2_NV"/>
>+                <enum name="GL_UNSIGNED_INT16_VEC3_NV"/>
>+                <enum name="GL_UNSIGNED_INT16_VEC4_NV"/>
>+                <enum name="GL_UNSIGNED_INT64_VEC2_NV"/>
>+                <enum name="GL_UNSIGNED_INT64_VEC3_NV"/>
>+                <enum name="GL_UNSIGNED_INT64_VEC4_NV"/>
>+                <enum name="GL_FLOAT16_NV"/>
>+                <enum name="GL_FLOAT16_VEC2_NV"/>
>+                <enum name="GL_FLOAT16_VEC3_NV"/>
>+                <enum name="GL_FLOAT16_VEC4_NV"/>
>+                <enum name="GL_PATCHES"/>
>+                <command name="glUniform1i64NV"/>
>+                <command name="glUniform2i64NV"/>
>+                <command name="glUniform3i64NV"/>
>+                <command name="glUniform4i64NV"/>
>+                <command name="glUniform1i64vNV"/>
>+                <command name="glUniform2i64vNV"/>
>+                <command name="glUniform3i64vNV"/>
>+                <command name="glUniform4i64vNV"/>
>+                <command name="glUniform1ui64NV"/>
>+                <command name="glUniform2ui64NV"/>
>+                <command name="glUniform3ui64NV"/>
>+                <command name="glUniform4ui64NV"/>
>+                <command name="glUniform1ui64vNV"/>
>+                <command name="glUniform2ui64vNV"/>
>+                <command name="glUniform3ui64vNV"/>
>+                <command name="glUniform4ui64vNV"/>
>+                <command name="glGetUniformi64vNV"/>
>+            </require>
>+            <require comment="Supported only if GL_EXT_direct_state_access is supported">
>+                <command name="glProgramUniform1i64NV"/>
>+                <command name="glProgramUniform2i64NV"/>
>+                <command name="glProgramUniform3i64NV"/>
>+                <command name="glProgramUniform4i64NV"/>
>+                <command name="glProgramUniform1i64vNV"/>
>+                <command name="glProgramUniform2i64vNV"/>
>+                <command name="glProgramUniform3i64vNV"/>
>+                <command name="glProgramUniform4i64vNV"/>
>+                <command name="glProgramUniform1ui64NV"/>
>+                <command name="glProgramUniform2ui64NV"/>
>+                <command name="glProgramUniform3ui64NV"/>
>+                <command name="glProgramUniform4ui64NV"/>
>+                <command name="glProgramUniform1ui64vNV"/>
>+                <command name="glProgramUniform2ui64vNV"/>
>+                <command name="glProgramUniform3ui64vNV"/>
>+                <command name="glProgramUniform4ui64vNV"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_NV_half_float" supported="gl">
>+            <require>
>+                <enum name="GL_HALF_FLOAT_NV"/>
>+                <command name="glVertex2hNV"/>
>+                <command name="glVertex2hvNV"/>
>+                <command name="glVertex3hNV"/>
>+                <command name="glVertex3hvNV"/>
>+                <command name="glVertex4hNV"/>
>+                <command name="glVertex4hvNV"/>
>+                <command name="glNormal3hNV"/>
>+                <command name="glNormal3hvNV"/>
>+                <command name="glColor3hNV"/>
>+                <command name="glColor3hvNV"/>
>+                <command name="glColor4hNV"/>
>+                <command name="glColor4hvNV"/>
>+                <command name="glTexCoord1hNV"/>
>+                <command name="glTexCoord1hvNV"/>
>+                <command name="glTexCoord2hNV"/>
>+                <command name="glTexCoord2hvNV"/>
>+                <command name="glTexCoord3hNV"/>
>+                <command name="glTexCoord3hvNV"/>
>+                <command name="glTexCoord4hNV"/>
>+                <command name="glTexCoord4hvNV"/>
>+                <command name="glMultiTexCoord1hNV"/>
>+                <command name="glMultiTexCoord1hvNV"/>
>+                <command name="glMultiTexCoord2hNV"/>
>+                <command name="glMultiTexCoord2hvNV"/>
>+                <command name="glMultiTexCoord3hNV"/>
>+                <command name="glMultiTexCoord3hvNV"/>
>+                <command name="glMultiTexCoord4hNV"/>
>+                <command name="glMultiTexCoord4hvNV"/>
>+                <command name="glFogCoordhNV"/>
>+                <command name="glFogCoordhvNV"/>
>+                <command name="glSecondaryColor3hNV"/>
>+                <command name="glSecondaryColor3hvNV"/>
>+                <command name="glVertexWeighthNV"/>
>+                <command name="glVertexWeighthvNV"/>
>+                <command name="glVertexAttrib1hNV"/>
>+                <command name="glVertexAttrib1hvNV"/>
>+                <command name="glVertexAttrib2hNV"/>
>+                <command name="glVertexAttrib2hvNV"/>
>+                <command name="glVertexAttrib3hNV"/>
>+                <command name="glVertexAttrib3hvNV"/>
>+                <command name="glVertexAttrib4hNV"/>
>+                <command name="glVertexAttrib4hvNV"/>
>+                <command name="glVertexAttribs1hvNV"/>
>+                <command name="glVertexAttribs2hvNV"/>
>+                <command name="glVertexAttribs3hvNV"/>
>+                <command name="glVertexAttribs4hvNV"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_NV_image_formats" supported="gles2"/>
>+        <extension name="GL_NV_instanced_arrays" supported="gles2">
>+            <require>
>+                <enum name="GL_VERTEX_ATTRIB_ARRAY_DIVISOR_NV"/>
>+                <command name="glVertexAttribDivisorNV"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_NV_internalformat_sample_query" supported="gl|glcore|gles2">
>+            <require>
>+                <enum name="GL_RENDERBUFFER"/>
>+                <enum name="GL_TEXTURE_2D_MULTISAMPLE"/>
>+                <enum name="GL_TEXTURE_2D_MULTISAMPLE_ARRAY"/>
>+                <enum name="GL_MULTISAMPLES_NV"/>
>+                <enum name="GL_SUPERSAMPLE_SCALE_X_NV"/>
>+                <enum name="GL_SUPERSAMPLE_SCALE_Y_NV"/>
>+                <enum name="GL_CONFORMANT_NV"/>
>+                <command name="glGetInternalformatSampleivNV"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_NV_light_max_exponent" supported="gl">
>+            <require>
>+                <enum name="GL_MAX_SHININESS_NV"/>
>+                <enum name="GL_MAX_SPOT_EXPONENT_NV"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_NV_gpu_multicast" supported="gl">
>+            <require>
>+                <enum name="GL_PER_GPU_STORAGE_BIT_NV"/>
>+                <enum name="GL_MULTICAST_GPUS_NV"/>
>+                <enum name="GL_RENDER_GPU_MASK_NV"/>
>+                <enum name="GL_PER_GPU_STORAGE_NV"/>
>+                <enum name="GL_MULTICAST_PROGRAMMABLE_SAMPLE_LOCATION_NV"/>
>+                <command name="glRenderGpuMaskNV"/>
>+                <command name="glMulticastBufferSubDataNV"/>
>+                <command name="glMulticastCopyBufferSubDataNV"/>
>+                <command name="glMulticastCopyImageSubDataNV"/>
>+                <command name="glMulticastBlitFramebufferNV"/>
>+                <command name="glMulticastFramebufferSampleLocationsfvNV"/>
>+                <command name="glMulticastBarrierNV"/>
>+                <command name="glMulticastWaitSyncNV"/>
>+                <command name="glMulticastGetQueryObjectivNV"/>
>+                <command name="glMulticastGetQueryObjectuivNV"/>
>+                <command name="glMulticastGetQueryObjecti64vNV"/>
>+                <command name="glMulticastGetQueryObjectui64vNV"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_NV_multisample_coverage" supported="gl">
>+            <require>
>+                <enum name="GL_SAMPLES_ARB"/>
>+                <enum name="GL_COLOR_SAMPLES_NV"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_NV_multisample_filter_hint" supported="gl">
>+            <require>
>+                <enum name="GL_MULTISAMPLE_FILTER_HINT_NV"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_NV_non_square_matrices" supported="gles2">
>+            <require>
>+                <enum name="GL_FLOAT_MAT2x3_NV"/>
>+                <enum name="GL_FLOAT_MAT2x4_NV"/>
>+                <enum name="GL_FLOAT_MAT3x2_NV"/>
>+                <enum name="GL_FLOAT_MAT3x4_NV"/>
>+                <enum name="GL_FLOAT_MAT4x2_NV"/>
>+                <enum name="GL_FLOAT_MAT4x3_NV"/>
>+                <command name="glUniformMatrix2x3fvNV"/>
>+                <command name="glUniformMatrix3x2fvNV"/>
>+                <command name="glUniformMatrix2x4fvNV"/>
>+                <command name="glUniformMatrix4x2fvNV"/>
>+                <command name="glUniformMatrix3x4fvNV"/>
>+                <command name="glUniformMatrix4x3fvNV"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_NV_occlusion_query" supported="gl">
>+            <require>
>+                <enum name="GL_PIXEL_COUNTER_BITS_NV"/>
>+                <enum name="GL_CURRENT_OCCLUSION_QUERY_ID_NV"/>
>+                <enum name="GL_PIXEL_COUNT_NV"/>
>+                <enum name="GL_PIXEL_COUNT_AVAILABLE_NV"/>
>+                <command name="glGenOcclusionQueriesNV"/>
>+                <command name="glDeleteOcclusionQueriesNV"/>
>+                <command name="glIsOcclusionQueryNV"/>
>+                <command name="glBeginOcclusionQueryNV"/>
>+                <command name="glEndOcclusionQueryNV"/>
>+                <command name="glGetOcclusionQueryivNV"/>
>+                <command name="glGetOcclusionQueryuivNV"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_NV_packed_depth_stencil" supported="gl">
>+            <require>
>+                <enum name="GL_DEPTH_STENCIL_NV"/>
>+                <enum name="GL_UNSIGNED_INT_24_8_NV"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_NV_parameter_buffer_object" supported="gl">
>+            <require>
>+                <enum name="GL_MAX_PROGRAM_PARAMETER_BUFFER_BINDINGS_NV"/>
>+                <enum name="GL_MAX_PROGRAM_PARAMETER_BUFFER_SIZE_NV"/>
>+                <enum name="GL_VERTEX_PROGRAM_PARAMETER_BUFFER_NV"/>
>+                <enum name="GL_GEOMETRY_PROGRAM_PARAMETER_BUFFER_NV"/>
>+                <enum name="GL_FRAGMENT_PROGRAM_PARAMETER_BUFFER_NV"/>
>+                <command name="glProgramBufferParametersfvNV"/>
>+                <command name="glProgramBufferParametersIivNV"/>
>+                <command name="glProgramBufferParametersIuivNV"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_NV_parameter_buffer_object2" supported="gl"/>
>+        <extension name="GL_NV_path_rendering" supported="gl|glcore|gles2">
>+            <require>
>+                <enum name="GL_PATH_FORMAT_SVG_NV"/>
>+                <enum name="GL_PATH_FORMAT_PS_NV"/>
>+                <enum name="GL_STANDARD_FONT_NAME_NV"/>
>+                <enum name="GL_SYSTEM_FONT_NAME_NV"/>
>+                <enum name="GL_FILE_NAME_NV"/>
>+                <enum name="GL_PATH_STROKE_WIDTH_NV"/>
>+                <enum name="GL_PATH_END_CAPS_NV"/>
>+                <enum name="GL_PATH_INITIAL_END_CAP_NV"/>
>+                <enum name="GL_PATH_TERMINAL_END_CAP_NV"/>
>+                <enum name="GL_PATH_JOIN_STYLE_NV"/>
>+                <enum name="GL_PATH_MITER_LIMIT_NV"/>
>+                <enum name="GL_PATH_DASH_CAPS_NV"/>
>+                <enum name="GL_PATH_INITIAL_DASH_CAP_NV"/>
>+                <enum name="GL_PATH_TERMINAL_DASH_CAP_NV"/>
>+                <enum name="GL_PATH_DASH_OFFSET_NV"/>
>+                <enum name="GL_PATH_CLIENT_LENGTH_NV"/>
>+                <enum name="GL_PATH_FILL_MODE_NV"/>
>+                <enum name="GL_PATH_FILL_MASK_NV"/>
>+                <enum name="GL_PATH_FILL_COVER_MODE_NV"/>
>+                <enum name="GL_PATH_STROKE_COVER_MODE_NV"/>
>+                <enum name="GL_PATH_STROKE_MASK_NV"/>
>+                <enum name="GL_COUNT_UP_NV"/>
>+                <enum name="GL_COUNT_DOWN_NV"/>
>+                <enum name="GL_PATH_OBJECT_BOUNDING_BOX_NV"/>
>+                <enum name="GL_CONVEX_HULL_NV"/>
>+                <enum name="GL_BOUNDING_BOX_NV"/>
>+                <enum name="GL_TRANSLATE_X_NV"/>
>+                <enum name="GL_TRANSLATE_Y_NV"/>
>+                <enum name="GL_TRANSLATE_2D_NV"/>
>+                <enum name="GL_TRANSLATE_3D_NV"/>
>+                <enum name="GL_AFFINE_2D_NV"/>
>+                <enum name="GL_AFFINE_3D_NV"/>
>+                <enum name="GL_TRANSPOSE_AFFINE_2D_NV"/>
>+                <enum name="GL_TRANSPOSE_AFFINE_3D_NV"/>
>+                <enum name="GL_UTF8_NV"/>
>+                <enum name="GL_UTF16_NV"/>
>+                <enum name="GL_BOUNDING_BOX_OF_BOUNDING_BOXES_NV"/>
>+                <enum name="GL_PATH_COMMAND_COUNT_NV"/>
>+                <enum name="GL_PATH_COORD_COUNT_NV"/>
>+                <enum name="GL_PATH_DASH_ARRAY_COUNT_NV"/>
>+                <enum name="GL_PATH_COMPUTED_LENGTH_NV"/>
>+                <enum name="GL_PATH_FILL_BOUNDING_BOX_NV"/>
>+                <enum name="GL_PATH_STROKE_BOUNDING_BOX_NV"/>
>+                <enum name="GL_SQUARE_NV"/>
>+                <enum name="GL_ROUND_NV"/>
>+                <enum name="GL_TRIANGULAR_NV"/>
>+                <enum name="GL_BEVEL_NV"/>
>+                <enum name="GL_MITER_REVERT_NV"/>
>+                <enum name="GL_MITER_TRUNCATE_NV"/>
>+                <enum name="GL_SKIP_MISSING_GLYPH_NV"/>
>+                <enum name="GL_USE_MISSING_GLYPH_NV"/>
>+                <enum name="GL_PATH_ERROR_POSITION_NV"/>
>+                <enum name="GL_ACCUM_ADJACENT_PAIRS_NV"/>
>+                <enum name="GL_ADJACENT_PAIRS_NV"/>
>+                <enum name="GL_FIRST_TO_REST_NV"/>
>+                <enum name="GL_PATH_GEN_MODE_NV"/>
>+                <enum name="GL_PATH_GEN_COEFF_NV"/>
>+                <enum name="GL_PATH_GEN_COMPONENTS_NV"/>
>+                <enum name="GL_PATH_STENCIL_FUNC_NV"/>
>+                <enum name="GL_PATH_STENCIL_REF_NV"/>
>+                <enum name="GL_PATH_STENCIL_VALUE_MASK_NV"/>
>+                <enum name="GL_PATH_STENCIL_DEPTH_OFFSET_FACTOR_NV"/>
>+                <enum name="GL_PATH_STENCIL_DEPTH_OFFSET_UNITS_NV"/>
>+                <enum name="GL_PATH_COVER_DEPTH_FUNC_NV"/>
>+                <enum name="GL_PATH_DASH_OFFSET_RESET_NV"/>
>+                <enum name="GL_MOVE_TO_RESETS_NV"/>
>+                <enum name="GL_MOVE_TO_CONTINUES_NV"/>
>+                <enum name="GL_CLOSE_PATH_NV"/>
>+                <enum name="GL_MOVE_TO_NV"/>
>+                <enum name="GL_RELATIVE_MOVE_TO_NV"/>
>+                <enum name="GL_LINE_TO_NV"/>
>+                <enum name="GL_RELATIVE_LINE_TO_NV"/>
>+                <enum name="GL_HORIZONTAL_LINE_TO_NV"/>
>+                <enum name="GL_RELATIVE_HORIZONTAL_LINE_TO_NV"/>
>+                <enum name="GL_VERTICAL_LINE_TO_NV"/>
>+                <enum name="GL_RELATIVE_VERTICAL_LINE_TO_NV"/>
>+                <enum name="GL_QUADRATIC_CURVE_TO_NV"/>
>+                <enum name="GL_RELATIVE_QUADRATIC_CURVE_TO_NV"/>
>+                <enum name="GL_CUBIC_CURVE_TO_NV"/>
>+                <enum name="GL_RELATIVE_CUBIC_CURVE_TO_NV"/>
>+                <enum name="GL_SMOOTH_QUADRATIC_CURVE_TO_NV"/>
>+                <enum name="GL_RELATIVE_SMOOTH_QUADRATIC_CURVE_TO_NV"/>
>+                <enum name="GL_SMOOTH_CUBIC_CURVE_TO_NV"/>
>+                <enum name="GL_RELATIVE_SMOOTH_CUBIC_CURVE_TO_NV"/>
>+                <enum name="GL_SMALL_CCW_ARC_TO_NV"/>
>+                <enum name="GL_RELATIVE_SMALL_CCW_ARC_TO_NV"/>
>+                <enum name="GL_SMALL_CW_ARC_TO_NV"/>
>+                <enum name="GL_RELATIVE_SMALL_CW_ARC_TO_NV"/>
>+                <enum name="GL_LARGE_CCW_ARC_TO_NV"/>
>+                <enum name="GL_RELATIVE_LARGE_CCW_ARC_TO_NV"/>
>+                <enum name="GL_LARGE_CW_ARC_TO_NV"/>
>+                <enum name="GL_RELATIVE_LARGE_CW_ARC_TO_NV"/>
>+                <enum name="GL_RESTART_PATH_NV"/>
>+                <enum name="GL_DUP_FIRST_CUBIC_CURVE_TO_NV"/>
>+                <enum name="GL_DUP_LAST_CUBIC_CURVE_TO_NV"/>
>+                <enum name="GL_RECT_NV"/>
>+                <enum name="GL_CIRCULAR_CCW_ARC_TO_NV"/>
>+                <enum name="GL_CIRCULAR_CW_ARC_TO_NV"/>
>+                <enum name="GL_CIRCULAR_TANGENT_ARC_TO_NV"/>
>+                <enum name="GL_ARC_TO_NV"/>
>+                <enum name="GL_RELATIVE_ARC_TO_NV"/>
>+                <enum name="GL_BOLD_BIT_NV"/>
>+                <enum name="GL_ITALIC_BIT_NV"/>
>+                <enum name="GL_GLYPH_WIDTH_BIT_NV"/>
>+                <enum name="GL_GLYPH_HEIGHT_BIT_NV"/>
>+                <enum name="GL_GLYPH_HORIZONTAL_BEARING_X_BIT_NV"/>
>+                <enum name="GL_GLYPH_HORIZONTAL_BEARING_Y_BIT_NV"/>
>+                <enum name="GL_GLYPH_HORIZONTAL_BEARING_ADVANCE_BIT_NV"/>
>+                <enum name="GL_GLYPH_VERTICAL_BEARING_X_BIT_NV"/>
>+                <enum name="GL_GLYPH_VERTICAL_BEARING_Y_BIT_NV"/>
>+                <enum name="GL_GLYPH_VERTICAL_BEARING_ADVANCE_BIT_NV"/>
>+                <enum name="GL_GLYPH_HAS_KERNING_BIT_NV"/>
>+                <enum name="GL_FONT_X_MIN_BOUNDS_BIT_NV"/>
>+                <enum name="GL_FONT_Y_MIN_BOUNDS_BIT_NV"/>
>+                <enum name="GL_FONT_X_MAX_BOUNDS_BIT_NV"/>
>+                <enum name="GL_FONT_Y_MAX_BOUNDS_BIT_NV"/>
>+                <enum name="GL_FONT_UNITS_PER_EM_BIT_NV"/>
>+                <enum name="GL_FONT_ASCENDER_BIT_NV"/>
>+                <enum name="GL_FONT_DESCENDER_BIT_NV"/>
>+                <enum name="GL_FONT_HEIGHT_BIT_NV"/>
>+                <enum name="GL_FONT_MAX_ADVANCE_WIDTH_BIT_NV"/>
>+                <enum name="GL_FONT_MAX_ADVANCE_HEIGHT_BIT_NV"/>
>+                <enum name="GL_FONT_UNDERLINE_POSITION_BIT_NV"/>
>+                <enum name="GL_FONT_UNDERLINE_THICKNESS_BIT_NV"/>
>+                <enum name="GL_FONT_HAS_KERNING_BIT_NV"/>
>+                <command name="glGenPathsNV"/>
>+                <command name="glDeletePathsNV"/>
>+                <command name="glIsPathNV"/>
>+                <command name="glPathCommandsNV"/>
>+                <command name="glPathCoordsNV"/>
>+                <command name="glPathSubCommandsNV"/>
>+                <command name="glPathSubCoordsNV"/>
>+                <command name="glPathStringNV"/>
>+                <command name="glPathGlyphsNV"/>
>+                <command name="glPathGlyphRangeNV"/>
>+                <command name="glWeightPathsNV"/>
>+                <command name="glCopyPathNV"/>
>+                <command name="glInterpolatePathsNV"/>
>+                <command name="glTransformPathNV"/>
>+                <command name="glPathParameterivNV"/>
>+                <command name="glPathParameteriNV"/>
>+                <command name="glPathParameterfvNV"/>
>+                <command name="glPathParameterfNV"/>
>+                <command name="glPathDashArrayNV"/>
>+                <command name="glPathStencilFuncNV"/>
>+                <command name="glPathStencilDepthOffsetNV"/>
>+                <command name="glStencilFillPathNV"/>
>+                <command name="glStencilStrokePathNV"/>
>+                <command name="glStencilFillPathInstancedNV"/>
>+                <command name="glStencilStrokePathInstancedNV"/>
>+                <command name="glPathCoverDepthFuncNV"/>
>+                <command name="glCoverFillPathNV"/>
>+                <command name="glCoverStrokePathNV"/>
>+                <command name="glCoverFillPathInstancedNV"/>
>+                <command name="glCoverStrokePathInstancedNV"/>
>+                <command name="glGetPathParameterivNV"/>
>+                <command name="glGetPathParameterfvNV"/>
>+                <command name="glGetPathCommandsNV"/>
>+                <command name="glGetPathCoordsNV"/>
>+                <command name="glGetPathDashArrayNV"/>
>+                <command name="glGetPathMetricsNV"/>
>+                <command name="glGetPathMetricRangeNV"/>
>+                <command name="glGetPathSpacingNV"/>
>+                <command name="glIsPointInFillPathNV"/>
>+                <command name="glIsPointInStrokePathNV"/>
>+                <command name="glGetPathLengthNV"/>
>+		<command name="glPointAlongPathNV"/>
>+            </require>
>+            <require comment="API revision 1.2">
>+                <enum name="GL_ROUNDED_RECT_NV"/>
>+                <enum name="GL_RELATIVE_ROUNDED_RECT_NV"/>
>+                <enum name="GL_ROUNDED_RECT2_NV"/>
>+                <enum name="GL_RELATIVE_ROUNDED_RECT2_NV"/>
>+                <enum name="GL_ROUNDED_RECT4_NV"/>
>+                <enum name="GL_RELATIVE_ROUNDED_RECT4_NV"/>
>+                <enum name="GL_ROUNDED_RECT8_NV"/>
>+                <enum name="GL_RELATIVE_ROUNDED_RECT8_NV"/>
>+                <enum name="GL_RELATIVE_RECT_NV"/>
>+                <enum name="GL_FONT_GLYPHS_AVAILABLE_NV"/>
>+                <enum name="GL_FONT_TARGET_UNAVAILABLE_NV"/>
>+                <enum name="GL_FONT_UNAVAILABLE_NV"/>
>+                <enum name="GL_FONT_UNINTELLIGIBLE_NV"/>
>+                <command name="glMatrixLoad3x2fNV"/>
>+                <command name="glMatrixLoad3x3fNV"/>
>+                <command name="glMatrixLoadTranspose3x3fNV"/>
>+                <command name="glMatrixMult3x2fNV"/>
>+                <command name="glMatrixMult3x3fNV"/>
>+                <command name="glMatrixMultTranspose3x3fNV"/>
>+                <command name="glStencilThenCoverFillPathNV"/>
>+                <command name="glStencilThenCoverStrokePathNV"/>
>+                <command name="glStencilThenCoverFillPathInstancedNV"/>
>+                <command name="glStencilThenCoverStrokePathInstancedNV"/>
>+                <command name="glPathGlyphIndexRangeNV"/>
>+            </require>
>+            <require comment="API revision 1.3">
>+                <enum name="GL_CONIC_CURVE_TO_NV"/>
>+                <enum name="GL_RELATIVE_CONIC_CURVE_TO_NV"/>
>+                <enum name="GL_FONT_NUM_GLYPH_INDICES_BIT_NV"/>
>+                <enum name="GL_STANDARD_FONT_FORMAT_NV"/>
>+                <command name="glPathGlyphIndexArrayNV"/>
>+                <command name="glPathMemoryGlyphIndexArrayNV"/>
>+                <command name="glProgramPathFragmentInputGenNV"/>
>+                <command name="glGetProgramResourcefvNV"/>
>+            </require>
>+            <require api="gl" profile="compatibility">
>+                <enum name="GL_2_BYTES_NV"/>
>+                <enum name="GL_3_BYTES_NV"/>
>+                <enum name="GL_4_BYTES_NV"/>
>+                <enum name="GL_EYE_LINEAR_NV"/>
>+                <enum name="GL_OBJECT_LINEAR_NV"/>
>+                <enum name="GL_CONSTANT_NV"/>
>+                <enum name="GL_PATH_FOG_GEN_MODE_NV"/>
>+                <enum name="GL_PRIMARY_COLOR"/>
>+                <enum name="GL_PRIMARY_COLOR_NV"/>
>+                <enum name="GL_SECONDARY_COLOR_NV"/>
>+                <enum name="GL_PATH_GEN_COLOR_FORMAT_NV"/>
>+                <command name="glPathColorGenNV"/>
>+                <command name="glPathTexGenNV"/>
>+                <command name="glPathFogGenNV"/>
>+                <command name="glGetPathColorGenivNV"/>
>+                <command name="glGetPathColorGenfvNV"/>
>+                <command name="glGetPathTexGenivNV"/>
>+                <command name="glGetPathTexGenfvNV"/>
>+            </require>
>+            <require comment="Other API additions of unknown history">
>+                <enum name="GL_PATH_PROJECTION_NV"/>
>+                <enum name="GL_PATH_MODELVIEW_NV"/>
>+                <enum name="GL_PATH_MODELVIEW_STACK_DEPTH_NV"/>
>+                <enum name="GL_PATH_MODELVIEW_MATRIX_NV"/>
>+                <enum name="GL_PATH_MAX_MODELVIEW_STACK_DEPTH_NV"/>
>+                <enum name="GL_PATH_TRANSPOSE_MODELVIEW_MATRIX_NV"/>
>+                <enum name="GL_PATH_PROJECTION_STACK_DEPTH_NV"/>
>+                <enum name="GL_PATH_PROJECTION_MATRIX_NV"/>
>+                <enum name="GL_PATH_MAX_PROJECTION_STACK_DEPTH_NV"/>
>+                <enum name="GL_PATH_TRANSPOSE_PROJECTION_MATRIX_NV"/>
>+                <enum name="GL_FRAGMENT_INPUT_NV"/>
>+                <command name="glMatrixFrustumEXT"/>
>+                <command name="glMatrixLoadIdentityEXT"/>
>+                <command name="glMatrixLoadTransposefEXT"/>
>+                <command name="glMatrixLoadTransposedEXT"/>
>+                <command name="glMatrixLoadfEXT"/>
>+                <command name="glMatrixLoaddEXT"/>
>+                <command name="glMatrixMultTransposefEXT"/>
>+                <command name="glMatrixMultTransposedEXT"/>
>+                <command name="glMatrixMultfEXT"/>
>+                <command name="glMatrixMultdEXT"/>
>+                <command name="glMatrixOrthoEXT"/>
>+                <command name="glMatrixPopEXT"/>
>+                <command name="glMatrixPushEXT"/>
>+                <command name="glMatrixRotatefEXT"/>
>+                <command name="glMatrixRotatedEXT"/>
>+                <command name="glMatrixScalefEXT"/>
>+                <command name="glMatrixScaledEXT"/>
>+                <command name="glMatrixTranslatefEXT"/>
>+                <command name="glMatrixTranslatedEXT"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_NV_path_rendering_shared_edge" supported="gl|glcore|gles2">
>+            <require>
>+                <enum name="GL_SHARED_EDGE_NV"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_NV_pixel_data_range" supported="gl">
>+            <require>
>+                <enum name="GL_WRITE_PIXEL_DATA_RANGE_NV"/>
>+                <enum name="GL_READ_PIXEL_DATA_RANGE_NV"/>
>+                <enum name="GL_WRITE_PIXEL_DATA_RANGE_LENGTH_NV"/>
>+                <enum name="GL_READ_PIXEL_DATA_RANGE_LENGTH_NV"/>
>+                <enum name="GL_WRITE_PIXEL_DATA_RANGE_POINTER_NV"/>
>+                <enum name="GL_READ_PIXEL_DATA_RANGE_POINTER_NV"/>
>+                <command name="glPixelDataRangeNV"/>
>+                <command name="glFlushPixelDataRangeNV"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_NV_pixel_buffer_object" supported="gles2">
>+            <require>
>+                <enum name="GL_PIXEL_PACK_BUFFER_NV"/>
>+                <enum name="GL_PIXEL_UNPACK_BUFFER_NV"/>
>+                <enum name="GL_PIXEL_PACK_BUFFER_BINDING_NV"/>
>+                <enum name="GL_PIXEL_UNPACK_BUFFER_BINDING_NV"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_NV_point_sprite" supported="gl">
>+            <require>
>+                <enum name="GL_POINT_SPRITE_NV"/>
>+                <enum name="GL_COORD_REPLACE_NV"/>
>+                <enum name="GL_POINT_SPRITE_R_MODE_NV"/>
>+                <command name="glPointParameteriNV"/>
>+                <command name="glPointParameterivNV"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_NV_polygon_mode" supported="gles2">
>+            <require>
>+                <enum name="GL_POLYGON_MODE_NV"/>
>+                <enum name="GL_POLYGON_OFFSET_POINT_NV"/>
>+                <enum name="GL_POLYGON_OFFSET_LINE_NV"/>
>+                <enum name="GL_POINT_NV"/>
>+                <enum name="GL_LINE_NV"/>
>+                <enum name="GL_FILL_NV"/>
>+                <command name="glPolygonModeNV"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_NV_present_video" supported="gl">
>+            <require>
>+                <enum name="GL_FRAME_NV"/>
>+                <enum name="GL_FIELDS_NV"/>
>+                <enum name="GL_CURRENT_TIME_NV"/>
>+                <enum name="GL_NUM_FILL_STREAMS_NV"/>
>+                <enum name="GL_PRESENT_TIME_NV"/>
>+                <enum name="GL_PRESENT_DURATION_NV"/>
>+                <command name="glPresentFrameKeyedNV"/>
>+                <command name="glPresentFrameDualFillNV"/>
>+                <command name="glGetVideoivNV"/>
>+                <command name="glGetVideouivNV"/>
>+                <command name="glGetVideoi64vNV"/>
>+                <command name="glGetVideoui64vNV"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_NV_primitive_restart" supported="gl">
>+            <require>
>+                <enum name="GL_PRIMITIVE_RESTART_NV"/>
>+                <enum name="GL_PRIMITIVE_RESTART_INDEX_NV"/>
>+                <command name="glPrimitiveRestartNV"/>
>+                <command name="glPrimitiveRestartIndexNV"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_NV_query_resource" supported="gl">
>+            <require>
>+                <enum name="GL_QUERY_RESOURCE_TYPE_VIDMEM_ALLOC_NV"/>
>+                <enum name="GL_QUERY_RESOURCE_MEMTYPE_VIDMEM_NV"/>
>+                <enum name="GL_QUERY_RESOURCE_SYS_RESERVED_NV"/>
>+                <enum name="GL_QUERY_RESOURCE_TEXTURE_NV"/>
>+                <enum name="GL_QUERY_RESOURCE_RENDERBUFFER_NV"/>
>+                <enum name="GL_QUERY_RESOURCE_BUFFEROBJECT_NV"/>
>+                <command name="glQueryResourceNV"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_NV_query_resource_tag" supported="gl">
>+            <require>
>+                <command name="glGenQueryResourceTagNV"/>
>+                <command name="glDeleteQueryResourceTagNV"/>
>+                <command name="glQueryResourceTagNV"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_NV_read_buffer" supported="gles2">
>+            <require>
>+                <enum name="GL_READ_BUFFER_NV"/>
>+                <command name="glReadBufferNV"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_NV_read_buffer_front" supported="gles2"/>
>+        <extension name="GL_NV_read_depth" supported="gles2"/>
>+        <extension name="GL_NV_read_depth_stencil" supported="gles2"/>
>+        <extension name="GL_NV_read_stencil" supported="gles2"/>
>+        <extension name="GL_NV_register_combiners" supported="gl">
>+            <require>
>+                <enum name="GL_REGISTER_COMBINERS_NV"/>
>+                <enum name="GL_VARIABLE_A_NV"/>
>+                <enum name="GL_VARIABLE_B_NV"/>
>+                <enum name="GL_VARIABLE_C_NV"/>
>+                <enum name="GL_VARIABLE_D_NV"/>
>+                <enum name="GL_VARIABLE_E_NV"/>
>+                <enum name="GL_VARIABLE_F_NV"/>
>+                <enum name="GL_VARIABLE_G_NV"/>
>+                <enum name="GL_CONSTANT_COLOR0_NV"/>
>+                <enum name="GL_CONSTANT_COLOR1_NV"/>
>+                <enum name="GL_PRIMARY_COLOR_NV"/>
>+                <enum name="GL_SECONDARY_COLOR_NV"/>
>+                <enum name="GL_SPARE0_NV"/>
>+                <enum name="GL_SPARE1_NV"/>
>+                <enum name="GL_DISCARD_NV"/>
>+                <enum name="GL_E_TIMES_F_NV"/>
>+                <enum name="GL_SPARE0_PLUS_SECONDARY_COLOR_NV"/>
>+                <enum name="GL_UNSIGNED_IDENTITY_NV"/>
>+                <enum name="GL_UNSIGNED_INVERT_NV"/>
>+                <enum name="GL_EXPAND_NORMAL_NV"/>
>+                <enum name="GL_EXPAND_NEGATE_NV"/>
>+                <enum name="GL_HALF_BIAS_NORMAL_NV"/>
>+                <enum name="GL_HALF_BIAS_NEGATE_NV"/>
>+                <enum name="GL_SIGNED_IDENTITY_NV"/>
>+                <enum name="GL_SIGNED_NEGATE_NV"/>
>+                <enum name="GL_SCALE_BY_TWO_NV"/>
>+                <enum name="GL_SCALE_BY_FOUR_NV"/>
>+                <enum name="GL_SCALE_BY_ONE_HALF_NV"/>
>+                <enum name="GL_BIAS_BY_NEGATIVE_ONE_HALF_NV"/>
>+                <enum name="GL_COMBINER_INPUT_NV"/>
>+                <enum name="GL_COMBINER_MAPPING_NV"/>
>+                <enum name="GL_COMBINER_COMPONENT_USAGE_NV"/>
>+                <enum name="GL_COMBINER_AB_DOT_PRODUCT_NV"/>
>+                <enum name="GL_COMBINER_CD_DOT_PRODUCT_NV"/>
>+                <enum name="GL_COMBINER_MUX_SUM_NV"/>
>+                <enum name="GL_COMBINER_SCALE_NV"/>
>+                <enum name="GL_COMBINER_BIAS_NV"/>
>+                <enum name="GL_COMBINER_AB_OUTPUT_NV"/>
>+                <enum name="GL_COMBINER_CD_OUTPUT_NV"/>
>+                <enum name="GL_COMBINER_SUM_OUTPUT_NV"/>
>+                <enum name="GL_MAX_GENERAL_COMBINERS_NV"/>
>+                <enum name="GL_NUM_GENERAL_COMBINERS_NV"/>
>+                <enum name="GL_COLOR_SUM_CLAMP_NV"/>
>+                <enum name="GL_COMBINER0_NV"/>
>+                <enum name="GL_COMBINER1_NV"/>
>+                <enum name="GL_COMBINER2_NV"/>
>+                <enum name="GL_COMBINER3_NV"/>
>+                <enum name="GL_COMBINER4_NV"/>
>+                <enum name="GL_COMBINER5_NV"/>
>+                <enum name="GL_COMBINER6_NV"/>
>+                <enum name="GL_COMBINER7_NV"/>
>+                <enum name="GL_TEXTURE0_ARB"/>
>+                <enum name="GL_TEXTURE1_ARB"/>
>+                <enum name="GL_ZERO"/>
>+                <enum name="GL_NONE"/>
>+                <enum name="GL_FOG"/>
>+                <command name="glCombinerParameterfvNV"/>
>+                <command name="glCombinerParameterfNV"/>
>+                <command name="glCombinerParameterivNV"/>
>+                <command name="glCombinerParameteriNV"/>
>+                <command name="glCombinerInputNV"/>
>+                <command name="glCombinerOutputNV"/>
>+                <command name="glFinalCombinerInputNV"/>
>+                <command name="glGetCombinerInputParameterfvNV"/>
>+                <command name="glGetCombinerInputParameterivNV"/>
>+                <command name="glGetCombinerOutputParameterfvNV"/>
>+                <command name="glGetCombinerOutputParameterivNV"/>
>+                <command name="glGetFinalCombinerInputParameterfvNV"/>
>+                <command name="glGetFinalCombinerInputParameterivNV"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_NV_register_combiners2" supported="gl">
>+            <require>
>+                <enum name="GL_PER_STAGE_CONSTANTS_NV"/>
>+                <command name="glCombinerStageParameterfvNV"/>
>+                <command name="glGetCombinerStageParameterfvNV"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_NV_robustness_video_memory_purge" supported="gl">
>+            <require>
>+                <enum name="GL_PURGED_CONTEXT_RESET_NV"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_NV_sRGB_formats" supported="gles2">
>+            <require>
>+                <enum name="GL_SLUMINANCE_NV"/>
>+                <enum name="GL_SLUMINANCE_ALPHA_NV"/>
>+                <enum name="GL_SRGB8_NV"/>
>+                <enum name="GL_SLUMINANCE8_NV"/>
>+                <enum name="GL_SLUMINANCE8_ALPHA8_NV"/>
>+                <enum name="GL_COMPRESSED_SRGB_S3TC_DXT1_NV"/>
>+                <enum name="GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT1_NV"/>
>+                <enum name="GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT3_NV"/>
>+                <enum name="GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT5_NV"/>
>+                <enum name="GL_ETC1_SRGB8_NV"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_NV_sample_locations" supported="gl|glcore|gles2">
>+            <require>
>+                <enum name="GL_SAMPLE_LOCATION_SUBPIXEL_BITS_NV"/>
>+                <enum name="GL_SAMPLE_LOCATION_PIXEL_GRID_WIDTH_NV"/>
>+                <enum name="GL_SAMPLE_LOCATION_PIXEL_GRID_HEIGHT_NV"/>
>+                <enum name="GL_PROGRAMMABLE_SAMPLE_LOCATION_TABLE_SIZE_NV"/>
>+                <enum name="GL_SAMPLE_LOCATION_NV"/>
>+                <enum name="GL_PROGRAMMABLE_SAMPLE_LOCATION_NV"/>
>+                <enum name="GL_FRAMEBUFFER_PROGRAMMABLE_SAMPLE_LOCATIONS_NV"/>
>+                <enum name="GL_FRAMEBUFFER_SAMPLE_LOCATION_PIXEL_GRID_NV"/>
>+                <command name="glFramebufferSampleLocationsfvNV"/>
>+                <command name="glNamedFramebufferSampleLocationsfvNV"/>
>+                <command name="glResolveDepthValuesNV"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_NV_sample_mask_override_coverage" supported="gl|glcore|gles2"/>
>+        <extension name="GL_NV_shader_atomic_counters" supported="gl|glcore"/>
>+        <extension name="GL_NV_shader_atomic_float" supported="gl|glcore"/>
>+        <extension name="GL_NV_shader_atomic_float64" supported="gl|glcore"/>
>+        <extension name="GL_NV_shader_atomic_fp16_vector" supported="gl|glcore|gles2"/>
>+        <extension name="GL_NV_shader_atomic_int64" supported="gl|glcore"/>
>+        <extension name="GL_NV_shader_buffer_load" supported="gl|glcore">
>+            <require>
>+                <enum name="GL_BUFFER_GPU_ADDRESS_NV"/>
>+                <enum name="GL_GPU_ADDRESS_NV"/>
>+                <enum name="GL_MAX_SHADER_BUFFER_ADDRESS_NV"/>
>+                <command name="glMakeBufferResidentNV"/>
>+                <command name="glMakeBufferNonResidentNV"/>
>+                <command name="glIsBufferResidentNV"/>
>+                <command name="glMakeNamedBufferResidentNV"/>
>+                <command name="glMakeNamedBufferNonResidentNV"/>
>+                <command name="glIsNamedBufferResidentNV"/>
>+                <command name="glGetBufferParameterui64vNV"/>
>+                <command name="glGetNamedBufferParameterui64vNV"/>
>+                <command name="glGetIntegerui64vNV"/>
>+                <command name="glUniformui64NV"/>
>+                <command name="glUniformui64vNV"/>
>+                <command name="glGetUniformui64vNV"/>
>+                <command name="glProgramUniformui64NV"/>
>+                <command name="glProgramUniformui64vNV"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_NV_shader_buffer_store" supported="gl|glcore">
>+            <require>
>+                <enum name="GL_SHADER_GLOBAL_ACCESS_BARRIER_BIT_NV"/>
>+                <enum name="GL_READ_WRITE"/>
>+                <enum name="GL_WRITE_ONLY"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_NV_shader_noperspective_interpolation" supported="gles2"/>
>+        <extension name="GL_NV_shader_storage_buffer_object" supported="gl"/>
>+        <extension name="GL_NV_shader_thread_group" supported="gl|glcore">
>+            <require>
>+                <enum name="GL_WARP_SIZE_NV"/>
>+                <enum name="GL_WARPS_PER_SM_NV"/>
>+                <enum name="GL_SM_COUNT_NV"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_NV_shader_thread_shuffle" supported="gl|glcore"/>
>+        <extension name="GL_NV_shadow_samplers_array" supported="gles2">
>+            <require>
>+                <enum name="GL_SAMPLER_2D_ARRAY_SHADOW_NV"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_NV_shadow_samplers_cube" supported="gles2">
>+            <require>
>+                <enum name="GL_SAMPLER_CUBE_SHADOW_NV"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_NV_stereo_view_rendering" supported="gl|glcore|gles2"/>
>+        <extension name="GL_NV_tessellation_program5" supported="gl">
>+            <require>
>+                <enum name="GL_MAX_PROGRAM_PATCH_ATTRIBS_NV"/>
>+                <enum name="GL_TESS_CONTROL_PROGRAM_NV"/>
>+                <enum name="GL_TESS_EVALUATION_PROGRAM_NV"/>
>+                <enum name="GL_TESS_CONTROL_PROGRAM_PARAMETER_BUFFER_NV"/>
>+                <enum name="GL_TESS_EVALUATION_PROGRAM_PARAMETER_BUFFER_NV"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_NV_texgen_emboss" supported="gl">
>+            <require>
>+                <enum name="GL_EMBOSS_LIGHT_NV"/>
>+                <enum name="GL_EMBOSS_CONSTANT_NV"/>
>+                <enum name="GL_EMBOSS_MAP_NV"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_NV_texgen_reflection" supported="gl">
>+            <require>
>+                <enum name="GL_NORMAL_MAP_NV"/>
>+                <enum name="GL_REFLECTION_MAP_NV"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_NV_texture_barrier" supported="gl|glcore">
>+            <require>
>+                <command name="glTextureBarrierNV"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_NV_texture_border_clamp" supported="gles2">
>+            <require>
>+                <enum name="GL_TEXTURE_BORDER_COLOR_NV"/>
>+                <enum name="GL_CLAMP_TO_BORDER_NV"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_NV_texture_compression_s3tc_update" supported="gles2"/>
>+        <extension name="GL_NV_texture_compression_vtc" supported="gl"/>
>+        <extension name="GL_NV_texture_env_combine4" supported="gl">
>+            <require>
>+                <enum name="GL_COMBINE4_NV"/>
>+                <enum name="GL_SOURCE3_RGB_NV"/>
>+                <enum name="GL_SOURCE3_ALPHA_NV"/>
>+                <enum name="GL_OPERAND3_RGB_NV"/>
>+                <enum name="GL_OPERAND3_ALPHA_NV"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_NV_texture_expand_normal" supported="gl">
>+            <require>
>+                <enum name="GL_TEXTURE_UNSIGNED_REMAP_MODE_NV"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_NV_texture_multisample" supported="gl">
>+            <require>
>+                <enum name="GL_TEXTURE_COVERAGE_SAMPLES_NV"/>
>+                <enum name="GL_TEXTURE_COLOR_SAMPLES_NV"/>
>+                <command name="glTexImage2DMultisampleCoverageNV"/>
>+                <command name="glTexImage3DMultisampleCoverageNV"/>
>+            </require>
>+            <require comment="Supported only if GL_EXT_direct_state_access is supported">
>+                <command name="glTextureImage2DMultisampleNV"/>
>+                <command name="glTextureImage3DMultisampleNV"/>
>+                <command name="glTextureImage2DMultisampleCoverageNV"/>
>+                <command name="glTextureImage3DMultisampleCoverageNV"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_NV_texture_npot_2D_mipmap" supported="gles2"/>
>+        <extension name="GL_NV_texture_rectangle" supported="gl">
>+            <require>
>+                <enum name="GL_TEXTURE_RECTANGLE_NV"/>
>+                <enum name="GL_TEXTURE_BINDING_RECTANGLE_NV"/>
>+                <enum name="GL_PROXY_TEXTURE_RECTANGLE_NV"/>
>+                <enum name="GL_MAX_RECTANGLE_TEXTURE_SIZE_NV"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_NV_texture_rectangle_compressed" supported="gl|glcore"/>
>+        <extension name="GL_NV_texture_shader" supported="gl">
>+            <require>
>+                <enum name="GL_OFFSET_TEXTURE_RECTANGLE_NV"/>
>+                <enum name="GL_OFFSET_TEXTURE_RECTANGLE_SCALE_NV"/>
>+                <enum name="GL_DOT_PRODUCT_TEXTURE_RECTANGLE_NV"/>
>+                <enum name="GL_RGBA_UNSIGNED_DOT_PRODUCT_MAPPING_NV"/>
>+                <enum name="GL_UNSIGNED_INT_S8_S8_8_8_NV"/>
>+                <enum name="GL_UNSIGNED_INT_8_8_S8_S8_REV_NV"/>
>+                <enum name="GL_DSDT_MAG_INTENSITY_NV"/>
>+                <enum name="GL_SHADER_CONSISTENT_NV"/>
>+                <enum name="GL_TEXTURE_SHADER_NV"/>
>+                <enum name="GL_SHADER_OPERATION_NV"/>
>+                <enum name="GL_CULL_MODES_NV"/>
>+                <enum name="GL_OFFSET_TEXTURE_MATRIX_NV"/>
>+                <enum name="GL_OFFSET_TEXTURE_SCALE_NV"/>
>+                <enum name="GL_OFFSET_TEXTURE_BIAS_NV"/>
>+                <enum name="GL_OFFSET_TEXTURE_2D_MATRIX_NV"/>
>+                <enum name="GL_OFFSET_TEXTURE_2D_SCALE_NV"/>
>+                <enum name="GL_OFFSET_TEXTURE_2D_BIAS_NV"/>
>+                <enum name="GL_PREVIOUS_TEXTURE_INPUT_NV"/>
>+                <enum name="GL_CONST_EYE_NV"/>
>+                <enum name="GL_PASS_THROUGH_NV"/>
>+                <enum name="GL_CULL_FRAGMENT_NV"/>
>+                <enum name="GL_OFFSET_TEXTURE_2D_NV"/>
>+                <enum name="GL_DEPENDENT_AR_TEXTURE_2D_NV"/>
>+                <enum name="GL_DEPENDENT_GB_TEXTURE_2D_NV"/>
>+                <enum name="GL_DOT_PRODUCT_NV"/>
>+                <enum name="GL_DOT_PRODUCT_DEPTH_REPLACE_NV"/>
>+                <enum name="GL_DOT_PRODUCT_TEXTURE_2D_NV"/>
>+                <enum name="GL_DOT_PRODUCT_TEXTURE_CUBE_MAP_NV"/>
>+                <enum name="GL_DOT_PRODUCT_DIFFUSE_CUBE_MAP_NV"/>
>+                <enum name="GL_DOT_PRODUCT_REFLECT_CUBE_MAP_NV"/>
>+                <enum name="GL_DOT_PRODUCT_CONST_EYE_REFLECT_CUBE_MAP_NV"/>
>+                <enum name="GL_HILO_NV"/>
>+                <enum name="GL_DSDT_NV"/>
>+                <enum name="GL_DSDT_MAG_NV"/>
>+                <enum name="GL_DSDT_MAG_VIB_NV"/>
>+                <enum name="GL_HILO16_NV"/>
>+                <enum name="GL_SIGNED_HILO_NV"/>
>+                <enum name="GL_SIGNED_HILO16_NV"/>
>+                <enum name="GL_SIGNED_RGBA_NV"/>
>+                <enum name="GL_SIGNED_RGBA8_NV"/>
>+                <enum name="GL_SIGNED_RGB_NV"/>
>+                <enum name="GL_SIGNED_RGB8_NV"/>
>+                <enum name="GL_SIGNED_LUMINANCE_NV"/>
>+                <enum name="GL_SIGNED_LUMINANCE8_NV"/>
>+                <enum name="GL_SIGNED_LUMINANCE_ALPHA_NV"/>
>+                <enum name="GL_SIGNED_LUMINANCE8_ALPHA8_NV"/>
>+                <enum name="GL_SIGNED_ALPHA_NV"/>
>+                <enum name="GL_SIGNED_ALPHA8_NV"/>
>+                <enum name="GL_SIGNED_INTENSITY_NV"/>
>+                <enum name="GL_SIGNED_INTENSITY8_NV"/>
>+                <enum name="GL_DSDT8_NV"/>
>+                <enum name="GL_DSDT8_MAG8_NV"/>
>+                <enum name="GL_DSDT8_MAG8_INTENSITY8_NV"/>
>+                <enum name="GL_SIGNED_RGB_UNSIGNED_ALPHA_NV"/>
>+                <enum name="GL_SIGNED_RGB8_UNSIGNED_ALPHA8_NV"/>
>+                <enum name="GL_HI_SCALE_NV"/>
>+                <enum name="GL_LO_SCALE_NV"/>
>+                <enum name="GL_DS_SCALE_NV"/>
>+                <enum name="GL_DT_SCALE_NV"/>
>+                <enum name="GL_MAGNITUDE_SCALE_NV"/>
>+                <enum name="GL_VIBRANCE_SCALE_NV"/>
>+                <enum name="GL_HI_BIAS_NV"/>
>+                <enum name="GL_LO_BIAS_NV"/>
>+                <enum name="GL_DS_BIAS_NV"/>
>+                <enum name="GL_DT_BIAS_NV"/>
>+                <enum name="GL_MAGNITUDE_BIAS_NV"/>
>+                <enum name="GL_VIBRANCE_BIAS_NV"/>
>+                <enum name="GL_TEXTURE_BORDER_VALUES_NV"/>
>+                <enum name="GL_TEXTURE_HI_SIZE_NV"/>
>+                <enum name="GL_TEXTURE_LO_SIZE_NV"/>
>+                <enum name="GL_TEXTURE_DS_SIZE_NV"/>
>+                <enum name="GL_TEXTURE_DT_SIZE_NV"/>
>+                <enum name="GL_TEXTURE_MAG_SIZE_NV"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_NV_texture_shader2" supported="gl">
>+            <require>
>+                <enum name="GL_DOT_PRODUCT_TEXTURE_3D_NV"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_NV_texture_shader3" supported="gl">
>+            <require>
>+                <enum name="GL_OFFSET_PROJECTIVE_TEXTURE_2D_NV"/>
>+                <enum name="GL_OFFSET_PROJECTIVE_TEXTURE_2D_SCALE_NV"/>
>+                <enum name="GL_OFFSET_PROJECTIVE_TEXTURE_RECTANGLE_NV"/>
>+                <enum name="GL_OFFSET_PROJECTIVE_TEXTURE_RECTANGLE_SCALE_NV"/>
>+                <enum name="GL_OFFSET_HILO_TEXTURE_2D_NV"/>
>+                <enum name="GL_OFFSET_HILO_TEXTURE_RECTANGLE_NV"/>
>+                <enum name="GL_OFFSET_HILO_PROJECTIVE_TEXTURE_2D_NV"/>
>+                <enum name="GL_OFFSET_HILO_PROJECTIVE_TEXTURE_RECTANGLE_NV"/>
>+                <enum name="GL_DEPENDENT_HILO_TEXTURE_2D_NV"/>
>+                <enum name="GL_DEPENDENT_RGB_TEXTURE_3D_NV"/>
>+                <enum name="GL_DEPENDENT_RGB_TEXTURE_CUBE_MAP_NV"/>
>+                <enum name="GL_DOT_PRODUCT_PASS_THROUGH_NV"/>
>+                <enum name="GL_DOT_PRODUCT_TEXTURE_1D_NV"/>
>+                <enum name="GL_DOT_PRODUCT_AFFINE_DEPTH_REPLACE_NV"/>
>+                <enum name="GL_HILO8_NV"/>
>+                <enum name="GL_SIGNED_HILO8_NV"/>
>+                <enum name="GL_FORCE_BLUE_TO_ONE_NV"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_NV_transform_feedback" supported="gl">
>+            <require>
>+                <enum name="GL_BACK_PRIMARY_COLOR_NV"/>
>+                <enum name="GL_BACK_SECONDARY_COLOR_NV"/>
>+                <enum name="GL_TEXTURE_COORD_NV"/>
>+                <enum name="GL_CLIP_DISTANCE_NV"/>
>+                <enum name="GL_VERTEX_ID_NV"/>
>+                <enum name="GL_PRIMITIVE_ID_NV"/>
>+                <enum name="GL_GENERIC_ATTRIB_NV"/>
>+                <enum name="GL_TRANSFORM_FEEDBACK_ATTRIBS_NV"/>
>+                <enum name="GL_TRANSFORM_FEEDBACK_BUFFER_MODE_NV"/>
>+                <enum name="GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_COMPONENTS_NV"/>
>+                <enum name="GL_ACTIVE_VARYINGS_NV"/>
>+                <enum name="GL_ACTIVE_VARYING_MAX_LENGTH_NV"/>
>+                <enum name="GL_TRANSFORM_FEEDBACK_VARYINGS_NV"/>
>+                <enum name="GL_TRANSFORM_FEEDBACK_BUFFER_START_NV"/>
>+                <enum name="GL_TRANSFORM_FEEDBACK_BUFFER_SIZE_NV"/>
>+                <enum name="GL_TRANSFORM_FEEDBACK_RECORD_NV"/>
>+                <enum name="GL_PRIMITIVES_GENERATED_NV"/>
>+                <enum name="GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN_NV"/>
>+                <enum name="GL_RASTERIZER_DISCARD_NV"/>
>+                <enum name="GL_MAX_TRANSFORM_FEEDBACK_INTERLEAVED_COMPONENTS_NV"/>
>+                <enum name="GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_ATTRIBS_NV"/>
>+                <enum name="GL_INTERLEAVED_ATTRIBS_NV"/>
>+                <enum name="GL_SEPARATE_ATTRIBS_NV"/>
>+                <enum name="GL_TRANSFORM_FEEDBACK_BUFFER_NV"/>
>+                <enum name="GL_TRANSFORM_FEEDBACK_BUFFER_BINDING_NV"/>
>+                <enum name="GL_LAYER_NV"/>
>+                <command name="glBeginTransformFeedbackNV"/>
>+                <command name="glEndTransformFeedbackNV"/>
>+                <command name="glTransformFeedbackAttribsNV"/>
>+                <command name="glBindBufferRangeNV"/>
>+                <command name="glBindBufferOffsetNV"/>
>+                <command name="glBindBufferBaseNV"/>
>+                <command name="glTransformFeedbackVaryingsNV"/>
>+                <command name="glActiveVaryingNV"/>
>+                <command name="glGetVaryingLocationNV"/>
>+                <command name="glGetActiveVaryingNV"/>
>+                <command name="glGetTransformFeedbackVaryingNV"/>
>+            </require>
>+            <require comment="Extended by GL_ARB_transform_feedback3">
>+                <enum name="GL_NEXT_BUFFER_NV"/>
>+                <enum name="GL_SKIP_COMPONENTS4_NV"/>
>+                <enum name="GL_SKIP_COMPONENTS3_NV"/>
>+                <enum name="GL_SKIP_COMPONENTS2_NV"/>
>+                <enum name="GL_SKIP_COMPONENTS1_NV"/>
>+                <command name="glTransformFeedbackStreamAttribsNV"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_NV_transform_feedback2" supported="gl">
>+            <require>
>+                <enum name="GL_TRANSFORM_FEEDBACK_NV"/>
>+                <enum name="GL_TRANSFORM_FEEDBACK_BUFFER_PAUSED_NV"/>
>+                <enum name="GL_TRANSFORM_FEEDBACK_BUFFER_ACTIVE_NV"/>
>+                <enum name="GL_TRANSFORM_FEEDBACK_BINDING_NV"/>
>+                <command name="glBindTransformFeedbackNV"/>
>+                <command name="glDeleteTransformFeedbacksNV"/>
>+                <command name="glGenTransformFeedbacksNV"/>
>+                <command name="glIsTransformFeedbackNV"/>
>+                <command name="glPauseTransformFeedbackNV"/>
>+                <command name="glResumeTransformFeedbackNV"/>
>+                <command name="glDrawTransformFeedbackNV"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_NV_uniform_buffer_unified_memory" supported="gl|glcore">
>+            <require>
>+                <enum name="GL_UNIFORM_BUFFER_UNIFIED_NV"/>
>+                <enum name="GL_UNIFORM_BUFFER_ADDRESS_NV"/>
>+                <enum name="GL_UNIFORM_BUFFER_LENGTH_NV"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_NV_vdpau_interop" supported="gl">
>+            <require>
>+                <enum name="GL_SURFACE_STATE_NV"/>
>+                <enum name="GL_SURFACE_REGISTERED_NV"/>
>+                <enum name="GL_SURFACE_MAPPED_NV"/>
>+                <enum name="GL_WRITE_DISCARD_NV"/>
>+                <command name="glVDPAUInitNV"/>
>+                <command name="glVDPAUFiniNV"/>
>+                <command name="glVDPAURegisterVideoSurfaceNV"/>
>+                <command name="glVDPAURegisterOutputSurfaceNV"/>
>+                <command name="glVDPAUIsSurfaceNV"/>
>+                <command name="glVDPAUUnregisterSurfaceNV"/>
>+                <command name="glVDPAUGetSurfaceivNV"/>
>+                <command name="glVDPAUSurfaceAccessNV"/>
>+                <command name="glVDPAUMapSurfacesNV"/>
>+                <command name="glVDPAUUnmapSurfacesNV"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_NV_vertex_array_range" supported="gl">
>+            <require>
>+                <enum name="GL_VERTEX_ARRAY_RANGE_NV"/>
>+                <enum name="GL_VERTEX_ARRAY_RANGE_LENGTH_NV"/>
>+                <enum name="GL_VERTEX_ARRAY_RANGE_VALID_NV"/>
>+                <enum name="GL_MAX_VERTEX_ARRAY_RANGE_ELEMENT_NV"/>
>+                <enum name="GL_VERTEX_ARRAY_RANGE_POINTER_NV"/>
>+                <command name="glFlushVertexArrayRangeNV"/>
>+                <command name="glVertexArrayRangeNV"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_NV_vertex_array_range2" supported="gl">
>+            <require>
>+                <enum name="GL_VERTEX_ARRAY_RANGE_WITHOUT_FLUSH_NV"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_NV_vertex_attrib_integer_64bit" supported="gl|glcore">
>+            <require>
>+                <enum name="GL_INT64_NV"/>
>+                <enum name="GL_UNSIGNED_INT64_NV"/>
>+                <command name="glVertexAttribL1i64NV"/>
>+                <command name="glVertexAttribL2i64NV"/>
>+                <command name="glVertexAttribL3i64NV"/>
>+                <command name="glVertexAttribL4i64NV"/>
>+                <command name="glVertexAttribL1i64vNV"/>
>+                <command name="glVertexAttribL2i64vNV"/>
>+                <command name="glVertexAttribL3i64vNV"/>
>+                <command name="glVertexAttribL4i64vNV"/>
>+                <command name="glVertexAttribL1ui64NV"/>
>+                <command name="glVertexAttribL2ui64NV"/>
>+                <command name="glVertexAttribL3ui64NV"/>
>+                <command name="glVertexAttribL4ui64NV"/>
>+                <command name="glVertexAttribL1ui64vNV"/>
>+                <command name="glVertexAttribL2ui64vNV"/>
>+                <command name="glVertexAttribL3ui64vNV"/>
>+                <command name="glVertexAttribL4ui64vNV"/>
>+                <command name="glGetVertexAttribLi64vNV"/>
>+                <command name="glGetVertexAttribLui64vNV"/>
>+                <command name="glVertexAttribLFormatNV"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_NV_vertex_buffer_unified_memory" supported="gl|glcore">
>+            <require>
>+                <enum name="GL_VERTEX_ATTRIB_ARRAY_UNIFIED_NV"/>
>+                <enum name="GL_ELEMENT_ARRAY_UNIFIED_NV"/>
>+                <enum name="GL_VERTEX_ATTRIB_ARRAY_ADDRESS_NV"/>
>+                <enum name="GL_VERTEX_ARRAY_ADDRESS_NV"/>
>+                <enum name="GL_NORMAL_ARRAY_ADDRESS_NV"/>
>+                <enum name="GL_COLOR_ARRAY_ADDRESS_NV"/>
>+                <enum name="GL_INDEX_ARRAY_ADDRESS_NV"/>
>+                <enum name="GL_TEXTURE_COORD_ARRAY_ADDRESS_NV"/>
>+                <enum name="GL_EDGE_FLAG_ARRAY_ADDRESS_NV"/>
>+                <enum name="GL_SECONDARY_COLOR_ARRAY_ADDRESS_NV"/>
>+                <enum name="GL_FOG_COORD_ARRAY_ADDRESS_NV"/>
>+                <enum name="GL_ELEMENT_ARRAY_ADDRESS_NV"/>
>+                <enum name="GL_VERTEX_ATTRIB_ARRAY_LENGTH_NV"/>
>+                <enum name="GL_VERTEX_ARRAY_LENGTH_NV"/>
>+                <enum name="GL_NORMAL_ARRAY_LENGTH_NV"/>
>+                <enum name="GL_COLOR_ARRAY_LENGTH_NV"/>
>+                <enum name="GL_INDEX_ARRAY_LENGTH_NV"/>
>+                <enum name="GL_TEXTURE_COORD_ARRAY_LENGTH_NV"/>
>+                <enum name="GL_EDGE_FLAG_ARRAY_LENGTH_NV"/>
>+                <enum name="GL_SECONDARY_COLOR_ARRAY_LENGTH_NV"/>
>+                <enum name="GL_FOG_COORD_ARRAY_LENGTH_NV"/>
>+                <enum name="GL_ELEMENT_ARRAY_LENGTH_NV"/>
>+                <enum name="GL_DRAW_INDIRECT_UNIFIED_NV"/>
>+                <enum name="GL_DRAW_INDIRECT_ADDRESS_NV"/>
>+                <enum name="GL_DRAW_INDIRECT_LENGTH_NV"/>
>+                <command name="glBufferAddressRangeNV"/>
>+                <command name="glVertexFormatNV"/>
>+                <command name="glNormalFormatNV"/>
>+                <command name="glColorFormatNV"/>
>+                <command name="glIndexFormatNV"/>
>+                <command name="glTexCoordFormatNV"/>
>+                <command name="glEdgeFlagFormatNV"/>
>+                <command name="glSecondaryColorFormatNV"/>
>+                <command name="glFogCoordFormatNV"/>
>+                <command name="glVertexAttribFormatNV"/>
>+                <command name="glVertexAttribIFormatNV"/>
>+                <command name="glGetIntegerui64i_vNV"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_NV_vertex_program" supported="gl">
>+            <require>
>+                <enum name="GL_VERTEX_PROGRAM_NV"/>
>+                <enum name="GL_VERTEX_STATE_PROGRAM_NV"/>
>+                <enum name="GL_ATTRIB_ARRAY_SIZE_NV"/>
>+                <enum name="GL_ATTRIB_ARRAY_STRIDE_NV"/>
>+                <enum name="GL_ATTRIB_ARRAY_TYPE_NV"/>
>+                <enum name="GL_CURRENT_ATTRIB_NV"/>
>+                <enum name="GL_PROGRAM_LENGTH_NV"/>
>+                <enum name="GL_PROGRAM_STRING_NV"/>
>+                <enum name="GL_MODELVIEW_PROJECTION_NV"/>
>+                <enum name="GL_IDENTITY_NV"/>
>+                <enum name="GL_INVERSE_NV"/>
>+                <enum name="GL_TRANSPOSE_NV"/>
>+                <enum name="GL_INVERSE_TRANSPOSE_NV"/>
>+                <enum name="GL_MAX_TRACK_MATRIX_STACK_DEPTH_NV"/>
>+                <enum name="GL_MAX_TRACK_MATRICES_NV"/>
>+                <enum name="GL_MATRIX0_NV"/>
>+                <enum name="GL_MATRIX1_NV"/>
>+                <enum name="GL_MATRIX2_NV"/>
>+                <enum name="GL_MATRIX3_NV"/>
>+                <enum name="GL_MATRIX4_NV"/>
>+                <enum name="GL_MATRIX5_NV"/>
>+                <enum name="GL_MATRIX6_NV"/>
>+                <enum name="GL_MATRIX7_NV"/>
>+                <enum name="GL_CURRENT_MATRIX_STACK_DEPTH_NV"/>
>+                <enum name="GL_CURRENT_MATRIX_NV"/>
>+                <enum name="GL_VERTEX_PROGRAM_POINT_SIZE_NV"/>
>+                <enum name="GL_VERTEX_PROGRAM_TWO_SIDE_NV"/>
>+                <enum name="GL_PROGRAM_PARAMETER_NV"/>
>+                <enum name="GL_ATTRIB_ARRAY_POINTER_NV"/>
>+                <enum name="GL_PROGRAM_TARGET_NV"/>
>+                <enum name="GL_PROGRAM_RESIDENT_NV"/>
>+                <enum name="GL_TRACK_MATRIX_NV"/>
>+                <enum name="GL_TRACK_MATRIX_TRANSFORM_NV"/>
>+                <enum name="GL_VERTEX_PROGRAM_BINDING_NV"/>
>+                <enum name="GL_PROGRAM_ERROR_POSITION_NV"/>
>+                <enum name="GL_VERTEX_ATTRIB_ARRAY0_NV"/>
>+                <enum name="GL_VERTEX_ATTRIB_ARRAY1_NV"/>
>+                <enum name="GL_VERTEX_ATTRIB_ARRAY2_NV"/>
>+                <enum name="GL_VERTEX_ATTRIB_ARRAY3_NV"/>
>+                <enum name="GL_VERTEX_ATTRIB_ARRAY4_NV"/>
>+                <enum name="GL_VERTEX_ATTRIB_ARRAY5_NV"/>
>+                <enum name="GL_VERTEX_ATTRIB_ARRAY6_NV"/>
>+                <enum name="GL_VERTEX_ATTRIB_ARRAY7_NV"/>
>+                <enum name="GL_VERTEX_ATTRIB_ARRAY8_NV"/>
>+                <enum name="GL_VERTEX_ATTRIB_ARRAY9_NV"/>
>+                <enum name="GL_VERTEX_ATTRIB_ARRAY10_NV"/>
>+                <enum name="GL_VERTEX_ATTRIB_ARRAY11_NV"/>
>+                <enum name="GL_VERTEX_ATTRIB_ARRAY12_NV"/>
>+                <enum name="GL_VERTEX_ATTRIB_ARRAY13_NV"/>
>+                <enum name="GL_VERTEX_ATTRIB_ARRAY14_NV"/>
>+                <enum name="GL_VERTEX_ATTRIB_ARRAY15_NV"/>
>+                <enum name="GL_MAP1_VERTEX_ATTRIB0_4_NV"/>
>+                <enum name="GL_MAP1_VERTEX_ATTRIB1_4_NV"/>
>+                <enum name="GL_MAP1_VERTEX_ATTRIB2_4_NV"/>
>+                <enum name="GL_MAP1_VERTEX_ATTRIB3_4_NV"/>
>+                <enum name="GL_MAP1_VERTEX_ATTRIB4_4_NV"/>
>+                <enum name="GL_MAP1_VERTEX_ATTRIB5_4_NV"/>
>+                <enum name="GL_MAP1_VERTEX_ATTRIB6_4_NV"/>
>+                <enum name="GL_MAP1_VERTEX_ATTRIB7_4_NV"/>
>+                <enum name="GL_MAP1_VERTEX_ATTRIB8_4_NV"/>
>+                <enum name="GL_MAP1_VERTEX_ATTRIB9_4_NV"/>
>+                <enum name="GL_MAP1_VERTEX_ATTRIB10_4_NV"/>
>+                <enum name="GL_MAP1_VERTEX_ATTRIB11_4_NV"/>
>+                <enum name="GL_MAP1_VERTEX_ATTRIB12_4_NV"/>
>+                <enum name="GL_MAP1_VERTEX_ATTRIB13_4_NV"/>
>+                <enum name="GL_MAP1_VERTEX_ATTRIB14_4_NV"/>
>+                <enum name="GL_MAP1_VERTEX_ATTRIB15_4_NV"/>
>+                <enum name="GL_MAP2_VERTEX_ATTRIB0_4_NV"/>
>+                <enum name="GL_MAP2_VERTEX_ATTRIB1_4_NV"/>
>+                <enum name="GL_MAP2_VERTEX_ATTRIB2_4_NV"/>
>+                <enum name="GL_MAP2_VERTEX_ATTRIB3_4_NV"/>
>+                <enum name="GL_MAP2_VERTEX_ATTRIB4_4_NV"/>
>+                <enum name="GL_MAP2_VERTEX_ATTRIB5_4_NV"/>
>+                <enum name="GL_MAP2_VERTEX_ATTRIB6_4_NV"/>
>+                <enum name="GL_MAP2_VERTEX_ATTRIB7_4_NV"/>
>+                <enum name="GL_MAP2_VERTEX_ATTRIB8_4_NV"/>
>+                <enum name="GL_MAP2_VERTEX_ATTRIB9_4_NV"/>
>+                <enum name="GL_MAP2_VERTEX_ATTRIB10_4_NV"/>
>+                <enum name="GL_MAP2_VERTEX_ATTRIB11_4_NV"/>
>+                <enum name="GL_MAP2_VERTEX_ATTRIB12_4_NV"/>
>+                <enum name="GL_MAP2_VERTEX_ATTRIB13_4_NV"/>
>+                <enum name="GL_MAP2_VERTEX_ATTRIB14_4_NV"/>
>+                <enum name="GL_MAP2_VERTEX_ATTRIB15_4_NV"/>
>+                <command name="glAreProgramsResidentNV"/>
>+                <command name="glBindProgramNV"/>
>+                <command name="glDeleteProgramsNV"/>
>+                <command name="glExecuteProgramNV"/>
>+                <command name="glGenProgramsNV"/>
>+                <command name="glGetProgramParameterdvNV"/>
>+                <command name="glGetProgramParameterfvNV"/>
>+                <command name="glGetProgramivNV"/>
>+                <command name="glGetProgramStringNV"/>
>+                <command name="glGetTrackMatrixivNV"/>
>+                <command name="glGetVertexAttribdvNV"/>
>+                <command name="glGetVertexAttribfvNV"/>
>+                <command name="glGetVertexAttribivNV"/>
>+                <command name="glGetVertexAttribPointervNV"/>
>+                <command name="glIsProgramNV"/>
>+                <command name="glLoadProgramNV"/>
>+                <command name="glProgramParameter4dNV"/>
>+                <command name="glProgramParameter4dvNV"/>
>+                <command name="glProgramParameter4fNV"/>
>+                <command name="glProgramParameter4fvNV"/>
>+                <command name="glProgramParameters4dvNV"/>
>+                <command name="glProgramParameters4fvNV"/>
>+                <command name="glRequestResidentProgramsNV"/>
>+                <command name="glTrackMatrixNV"/>
>+                <command name="glVertexAttribPointerNV"/>
>+                <command name="glVertexAttrib1dNV"/>
>+                <command name="glVertexAttrib1dvNV"/>
>+                <command name="glVertexAttrib1fNV"/>
>+                <command name="glVertexAttrib1fvNV"/>
>+                <command name="glVertexAttrib1sNV"/>
>+                <command name="glVertexAttrib1svNV"/>
>+                <command name="glVertexAttrib2dNV"/>
>+                <command name="glVertexAttrib2dvNV"/>
>+                <command name="glVertexAttrib2fNV"/>
>+                <command name="glVertexAttrib2fvNV"/>
>+                <command name="glVertexAttrib2sNV"/>
>+                <command name="glVertexAttrib2svNV"/>
>+                <command name="glVertexAttrib3dNV"/>
>+                <command name="glVertexAttrib3dvNV"/>
>+                <command name="glVertexAttrib3fNV"/>
>+                <command name="glVertexAttrib3fvNV"/>
>+                <command name="glVertexAttrib3sNV"/>
>+                <command name="glVertexAttrib3svNV"/>
>+                <command name="glVertexAttrib4dNV"/>
>+                <command name="glVertexAttrib4dvNV"/>
>+                <command name="glVertexAttrib4fNV"/>
>+                <command name="glVertexAttrib4fvNV"/>
>+                <command name="glVertexAttrib4sNV"/>
>+                <command name="glVertexAttrib4svNV"/>
>+                <command name="glVertexAttrib4ubNV"/>
>+                <command name="glVertexAttrib4ubvNV"/>
>+                <command name="glVertexAttribs1dvNV"/>
>+                <command name="glVertexAttribs1fvNV"/>
>+                <command name="glVertexAttribs1svNV"/>
>+                <command name="glVertexAttribs2dvNV"/>
>+                <command name="glVertexAttribs2fvNV"/>
>+                <command name="glVertexAttribs2svNV"/>
>+                <command name="glVertexAttribs3dvNV"/>
>+                <command name="glVertexAttribs3fvNV"/>
>+                <command name="glVertexAttribs3svNV"/>
>+                <command name="glVertexAttribs4dvNV"/>
>+                <command name="glVertexAttribs4fvNV"/>
>+                <command name="glVertexAttribs4svNV"/>
>+                <command name="glVertexAttribs4ubvNV"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_NV_vertex_program1_1" supported="gl"/>
>+        <extension name="GL_NV_vertex_program2" supported="gl"/>
>+        <extension name="GL_NV_vertex_program2_option" supported="gl">
>+            <require>
>+                <enum name="GL_MAX_PROGRAM_EXEC_INSTRUCTIONS_NV"/>
>+                <enum name="GL_MAX_PROGRAM_CALL_DEPTH_NV"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_NV_vertex_program3" supported="gl">
>+            <require>
>+                <enum name="GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS_ARB"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_NV_vertex_program4" supported="gl">
>+            <require>
>+                <enum name="GL_VERTEX_ATTRIB_ARRAY_INTEGER_NV"/>
>+                <command name="glVertexAttribI1iEXT"/>
>+                <command name="glVertexAttribI2iEXT"/>
>+                <command name="glVertexAttribI3iEXT"/>
>+                <command name="glVertexAttribI4iEXT"/>
>+                <command name="glVertexAttribI1uiEXT"/>
>+                <command name="glVertexAttribI2uiEXT"/>
>+                <command name="glVertexAttribI3uiEXT"/>
>+                <command name="glVertexAttribI4uiEXT"/>
>+                <command name="glVertexAttribI1ivEXT"/>
>+                <command name="glVertexAttribI2ivEXT"/>
>+                <command name="glVertexAttribI3ivEXT"/>
>+                <command name="glVertexAttribI4ivEXT"/>
>+                <command name="glVertexAttribI1uivEXT"/>
>+                <command name="glVertexAttribI2uivEXT"/>
>+                <command name="glVertexAttribI3uivEXT"/>
>+                <command name="glVertexAttribI4uivEXT"/>
>+                <command name="glVertexAttribI4bvEXT"/>
>+                <command name="glVertexAttribI4svEXT"/>
>+                <command name="glVertexAttribI4ubvEXT"/>
>+                <command name="glVertexAttribI4usvEXT"/>
>+                <command name="glVertexAttribIPointerEXT"/>
>+                <command name="glGetVertexAttribIivEXT"/>
>+                <command name="glGetVertexAttribIuivEXT"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_NV_video_capture" supported="gl">
>+            <require>
>+                <enum name="GL_VIDEO_BUFFER_NV"/>
>+                <enum name="GL_VIDEO_BUFFER_BINDING_NV"/>
>+                <enum name="GL_FIELD_UPPER_NV"/>
>+                <enum name="GL_FIELD_LOWER_NV"/>
>+                <enum name="GL_NUM_VIDEO_CAPTURE_STREAMS_NV"/>
>+                <enum name="GL_NEXT_VIDEO_CAPTURE_BUFFER_STATUS_NV"/>
>+                <enum name="GL_VIDEO_CAPTURE_TO_422_SUPPORTED_NV"/>
>+                <enum name="GL_LAST_VIDEO_CAPTURE_STATUS_NV"/>
>+                <enum name="GL_VIDEO_BUFFER_PITCH_NV"/>
>+                <enum name="GL_VIDEO_COLOR_CONVERSION_MATRIX_NV"/>
>+                <enum name="GL_VIDEO_COLOR_CONVERSION_MAX_NV"/>
>+                <enum name="GL_VIDEO_COLOR_CONVERSION_MIN_NV"/>
>+                <enum name="GL_VIDEO_COLOR_CONVERSION_OFFSET_NV"/>
>+                <enum name="GL_VIDEO_BUFFER_INTERNAL_FORMAT_NV"/>
>+                <enum name="GL_PARTIAL_SUCCESS_NV"/>
>+                <enum name="GL_SUCCESS_NV"/>
>+                <enum name="GL_FAILURE_NV"/>
>+                <enum name="GL_YCBYCR8_422_NV"/>
>+                <enum name="GL_YCBAYCR8A_4224_NV"/>
>+                <enum name="GL_Z6Y10Z6CB10Z6Y10Z6CR10_422_NV"/>
>+                <enum name="GL_Z6Y10Z6CB10Z6A10Z6Y10Z6CR10Z6A10_4224_NV"/>
>+                <enum name="GL_Z4Y12Z4CB12Z4Y12Z4CR12_422_NV"/>
>+                <enum name="GL_Z4Y12Z4CB12Z4A12Z4Y12Z4CR12Z4A12_4224_NV"/>
>+                <enum name="GL_Z4Y12Z4CB12Z4CR12_444_NV"/>
>+                <enum name="GL_VIDEO_CAPTURE_FRAME_WIDTH_NV"/>
>+                <enum name="GL_VIDEO_CAPTURE_FRAME_HEIGHT_NV"/>
>+                <enum name="GL_VIDEO_CAPTURE_FIELD_UPPER_HEIGHT_NV"/>
>+                <enum name="GL_VIDEO_CAPTURE_FIELD_LOWER_HEIGHT_NV"/>
>+                <enum name="GL_VIDEO_CAPTURE_SURFACE_ORIGIN_NV"/>
>+                <command name="glBeginVideoCaptureNV"/>
>+                <command name="glBindVideoCaptureStreamBufferNV"/>
>+                <command name="glBindVideoCaptureStreamTextureNV"/>
>+                <command name="glEndVideoCaptureNV"/>
>+                <command name="glGetVideoCaptureivNV"/>
>+                <command name="glGetVideoCaptureStreamivNV"/>
>+                <command name="glGetVideoCaptureStreamfvNV"/>
>+                <command name="glGetVideoCaptureStreamdvNV"/>
>+                <command name="glVideoCaptureNV"/>
>+                <command name="glVideoCaptureStreamParameterivNV"/>
>+                <command name="glVideoCaptureStreamParameterfvNV"/>
>+                <command name="glVideoCaptureStreamParameterdvNV"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_NV_viewport_array" supported="gles2">
>+            <require>
>+                <enum name="GL_MAX_VIEWPORTS_NV"/>
>+                <enum name="GL_VIEWPORT_SUBPIXEL_BITS_NV"/>
>+                <enum name="GL_VIEWPORT_BOUNDS_RANGE_NV"/>
>+                <enum name="GL_VIEWPORT_INDEX_PROVOKING_VERTEX_NV"/>
>+                <enum name="GL_SCISSOR_BOX"/>
>+                <enum name="GL_VIEWPORT"/>
>+                <enum name="GL_DEPTH_RANGE"/>
>+                <enum name="GL_SCISSOR_TEST"/>
>+                <command name="glViewportArrayvNV"/>
>+                <command name="glViewportIndexedfNV"/>
>+                <command name="glViewportIndexedfvNV"/>
>+                <command name="glScissorArrayvNV"/>
>+                <command name="glScissorIndexedNV"/>
>+                <command name="glScissorIndexedvNV"/>
>+                <command name="glDepthRangeArrayfvNV"/>
>+                <command name="glDepthRangeIndexedfNV"/>
>+                <command name="glGetFloati_vNV"/>
>+                <command name="glEnableiNV"/>
>+                <command name="glDisableiNV"/>
>+                <command name="glIsEnablediNV"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_NV_viewport_array2" supported="gl|glcore|gles2"/>
>+        <extension name="GL_NV_viewport_swizzle" supported="gl|glcore|gles2">
>+            <require>
>+                <enum name="GL_VIEWPORT_SWIZZLE_POSITIVE_X_NV"/>
>+                <enum name="GL_VIEWPORT_SWIZZLE_NEGATIVE_X_NV"/>
>+                <enum name="GL_VIEWPORT_SWIZZLE_POSITIVE_Y_NV"/>
>+                <enum name="GL_VIEWPORT_SWIZZLE_NEGATIVE_Y_NV"/>
>+                <enum name="GL_VIEWPORT_SWIZZLE_POSITIVE_Z_NV"/>
>+                <enum name="GL_VIEWPORT_SWIZZLE_NEGATIVE_Z_NV"/>
>+                <enum name="GL_VIEWPORT_SWIZZLE_POSITIVE_W_NV"/>
>+                <enum name="GL_VIEWPORT_SWIZZLE_NEGATIVE_W_NV"/>
>+                <enum name="GL_VIEWPORT_SWIZZLE_X_NV"/>
>+                <enum name="GL_VIEWPORT_SWIZZLE_Y_NV"/>
>+                <enum name="GL_VIEWPORT_SWIZZLE_Z_NV"/>
>+                <enum name="GL_VIEWPORT_SWIZZLE_W_NV"/>
>+                <command name="glViewportSwizzleNV"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_OES_EGL_image" supported="gles1|gles2">
>+            <require>
>+                <type name="GLeglImageOES"/>
>+                <command name="glEGLImageTargetTexture2DOES"/>
>+                <command name="glEGLImageTargetRenderbufferStorageOES"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_OES_EGL_image_external" supported="gles1|gles2">
>+            <require>
>+                <type name="GLeglImageOES"/>
>+                <enum name="GL_TEXTURE_EXTERNAL_OES"/>
>+                <enum name="GL_TEXTURE_BINDING_EXTERNAL_OES"/>
>+                <enum name="GL_REQUIRED_TEXTURE_IMAGE_UNITS_OES"/>
>+            </require>
>+            <require api="gles2">
>+                <enum name="GL_SAMPLER_EXTERNAL_OES"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_OES_EGL_image_external_essl3" supported="gles2"/>
>+        <extension name="GL_OES_blend_equation_separate" supported="gles1">
>+            <require>
>+                <enum name="GL_BLEND_EQUATION_RGB_OES"/>
>+                <enum name="GL_BLEND_EQUATION_ALPHA_OES"/>
>+                <command name="glBlendEquationSeparateOES"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_OES_blend_func_separate" supported="gles1">
>+            <require>
>+                <enum name="GL_BLEND_DST_RGB_OES"/>
>+                <enum name="GL_BLEND_SRC_RGB_OES"/>
>+                <enum name="GL_BLEND_DST_ALPHA_OES"/>
>+                <enum name="GL_BLEND_SRC_ALPHA_OES"/>
>+                <command name="glBlendFuncSeparateOES"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_OES_blend_subtract" supported="gles1">
>+            <require>
>+                <enum name="GL_BLEND_EQUATION_OES"/>
>+                <enum name="GL_FUNC_ADD_OES"/>
>+                <enum name="GL_FUNC_SUBTRACT_OES"/>
>+                <enum name="GL_FUNC_REVERSE_SUBTRACT_OES"/>
>+                <command name="glBlendEquationOES"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_OES_byte_coordinates" supported="gl|gles1">
>+            <require>
>+                <type name="GLbyte"/>
>+                <enum name="GL_BYTE"/>
>+            </require>
>+            <require api="gl" comment="Immediate-mode entry points don't exist in ES 1.x">
>+                <command name="glMultiTexCoord1bOES"/>
>+                <command name="glMultiTexCoord1bvOES"/>
>+                <command name="glMultiTexCoord2bOES"/>
>+                <command name="glMultiTexCoord2bvOES"/>
>+                <command name="glMultiTexCoord3bOES"/>
>+                <command name="glMultiTexCoord3bvOES"/>
>+                <command name="glMultiTexCoord4bOES"/>
>+                <command name="glMultiTexCoord4bvOES"/>
>+                <command name="glTexCoord1bOES"/>
>+                <command name="glTexCoord1bvOES"/>
>+                <command name="glTexCoord2bOES"/>
>+                <command name="glTexCoord2bvOES"/>
>+                <command name="glTexCoord3bOES"/>
>+                <command name="glTexCoord3bvOES"/>
>+                <command name="glTexCoord4bOES"/>
>+                <command name="glTexCoord4bvOES"/>
>+                <command name="glVertex2bOES"/>
>+                <command name="glVertex2bvOES"/>
>+                <command name="glVertex3bOES"/>
>+                <command name="glVertex3bvOES"/>
>+                <command name="glVertex4bOES"/>
>+                <command name="glVertex4bvOES"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_OES_compressed_ETC1_RGB8_sub_texture" supported="gles1|gles2"/>
>+        <extension name="GL_OES_compressed_ETC1_RGB8_texture" supported="gles1|gles2">
>+            <require>
>+                <enum name="GL_ETC1_RGB8_OES"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_OES_compressed_paletted_texture" supported="gl|gles1|gles2">
>+            <require>
>+                <enum name="GL_PALETTE4_RGB8_OES"/>
>+                <enum name="GL_PALETTE4_RGBA8_OES"/>
>+                <enum name="GL_PALETTE4_R5_G6_B5_OES"/>
>+                <enum name="GL_PALETTE4_RGBA4_OES"/>
>+                <enum name="GL_PALETTE4_RGB5_A1_OES"/>
>+                <enum name="GL_PALETTE8_RGB8_OES"/>
>+                <enum name="GL_PALETTE8_RGBA8_OES"/>
>+                <enum name="GL_PALETTE8_R5_G6_B5_OES"/>
>+                <enum name="GL_PALETTE8_RGBA4_OES"/>
>+                <enum name="GL_PALETTE8_RGB5_A1_OES"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_OES_copy_image" supported="gles2">
>+            <require>
>+                <command name="glCopyImageSubDataOES"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_OES_depth24" supported="gles1|gles2|glsc2">
>+            <require>
>+                <enum name="GL_DEPTH_COMPONENT24_OES"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_OES_depth32" supported="gles1|gles2|glsc2">
>+            <require>
>+                <enum name="GL_DEPTH_COMPONENT32_OES"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_OES_depth_texture" supported="gles2">
>+            <require>
>+                <enum name="GL_DEPTH_COMPONENT"/>
>+                <enum name="GL_UNSIGNED_SHORT"/>
>+                <enum name="GL_UNSIGNED_INT"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_OES_draw_buffers_indexed" supported="gles2">
>+            <require>
>+                <enum name="GL_BLEND_EQUATION_RGB"/>
>+                <enum name="GL_BLEND_EQUATION_ALPHA"/>
>+                <enum name="GL_BLEND_SRC_RGB"/>
>+                <enum name="GL_BLEND_SRC_ALPHA"/>
>+                <enum name="GL_BLEND_DST_RGB"/>
>+                <enum name="GL_BLEND_DST_ALPHA"/>
>+                <enum name="GL_COLOR_WRITEMASK"/>
>+                <enum name="GL_BLEND"/>
>+                <enum name="GL_FUNC_ADD"/>
>+                <enum name="GL_FUNC_SUBTRACT"/>
>+                <enum name="GL_FUNC_REVERSE_SUBTRACT"/>
>+                <enum name="GL_MIN"/>
>+                <enum name="GL_MAX"/>
>+                <enum name="GL_ZERO"/>
>+                <enum name="GL_ONE"/>
>+                <enum name="GL_SRC_COLOR"/>
>+                <enum name="GL_ONE_MINUS_SRC_COLOR"/>
>+                <enum name="GL_DST_COLOR"/>
>+                <enum name="GL_ONE_MINUS_DST_COLOR"/>
>+                <enum name="GL_SRC_ALPHA"/>
>+                <enum name="GL_ONE_MINUS_SRC_ALPHA"/>
>+                <enum name="GL_DST_ALPHA"/>
>+                <enum name="GL_ONE_MINUS_DST_ALPHA"/>
>+                <enum name="GL_CONSTANT_COLOR"/>
>+                <enum name="GL_ONE_MINUS_CONSTANT_COLOR"/>
>+                <enum name="GL_CONSTANT_ALPHA"/>
>+                <enum name="GL_ONE_MINUS_CONSTANT_ALPHA"/>
>+                <enum name="GL_SRC_ALPHA_SATURATE"/>
>+                <command name="glEnableiOES"/>
>+                <command name="glDisableiOES"/>
>+                <command name="glBlendEquationiOES"/>
>+                <command name="glBlendEquationSeparateiOES"/>
>+                <command name="glBlendFunciOES"/>
>+                <command name="glBlendFuncSeparateiOES"/>
>+                <command name="glColorMaskiOES"/>
>+                <command name="glIsEnablediOES"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_OES_draw_elements_base_vertex" supported="gles2">
>+            <require>
>+                <command name="glDrawElementsBaseVertexOES"/>
>+                <command name="glDrawRangeElementsBaseVertexOES" comment="Supported only if OpenGL ES 3.0 is supported"/>
>+                <command name="glDrawElementsInstancedBaseVertexOES" comment="Supported only if OpenGL ES 3.0 is supported"/>
>+                <command name="glMultiDrawElementsBaseVertexEXT" comment="Supported only if GL_EXT_multi_draw_arrays is supported"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_OES_draw_texture" supported="gles1">
>+            <require>
>+                <enum name="GL_TEXTURE_CROP_RECT_OES"/>
>+                <command name="glDrawTexsOES"/>
>+                <command name="glDrawTexiOES"/>
>+                <command name="glDrawTexxOES"/>
>+                <command name="glDrawTexsvOES"/>
>+                <command name="glDrawTexivOES"/>
>+                <command name="glDrawTexxvOES"/>
>+                <command name="glDrawTexfOES"/>
>+                <command name="glDrawTexfvOES"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_OES_element_index_uint" supported="gles1|gles2">
>+            <require>
>+                <enum name="GL_UNSIGNED_INT"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_OES_extended_matrix_palette" supported="gles1"/>
>+        <extension name="GL_OES_fbo_render_mipmap" supported="gles1|gles2"/>
>+        <extension name="GL_OES_fixed_point" supported="gl|gles1">
>+            <require>
>+                <enum name="GL_FIXED_OES"/>
>+                <command name="glAlphaFuncxOES"/>
>+                <command name="glClearColorxOES"/>
>+                <command name="glClearDepthxOES"/>
>+                <command name="glClipPlanexOES"/>
>+                <command name="glColor4xOES"/>
>+                <command name="glDepthRangexOES"/>
>+                <command name="glFogxOES"/>
>+                <command name="glFogxvOES"/>
>+                <command name="glFrustumxOES"/>
>+                <command name="glGetClipPlanexOES"/>
>+                <command name="glGetFixedvOES"/>
>+                <command name="glGetTexEnvxvOES"/>
>+                <command name="glGetTexParameterxvOES"/>
>+                <command name="glLightModelxOES"/>
>+                <command name="glLightModelxvOES"/>
>+                <command name="glLightxOES"/>
>+                <command name="glLightxvOES"/>
>+                <command name="glLineWidthxOES"/>
>+                <command name="glLoadMatrixxOES"/>
>+                <command name="glMaterialxOES"/>
>+                <command name="glMaterialxvOES"/>
>+                <command name="glMultMatrixxOES"/>
>+                <command name="glMultiTexCoord4xOES"/>
>+                <command name="glNormal3xOES"/>
>+                <command name="glOrthoxOES"/>
>+                <command name="glPointParameterxvOES"/>
>+                <command name="glPointSizexOES"/>
>+                <command name="glPolygonOffsetxOES"/>
>+                <command name="glRotatexOES"/>
>+                <command name="glScalexOES"/>
>+                <command name="glTexEnvxOES"/>
>+                <command name="glTexEnvxvOES"/>
>+                <command name="glTexParameterxOES"/>
>+                <command name="glTexParameterxvOES"/>
>+                <command name="glTranslatexOES"/>
>+            </require>
>+            <require api="gles1" comment="Entry points not in the extension spec, but in the Khronos glext.h. Included for backward compatibility.">
>+                <command name="glGetLightxvOES"/>
>+                <command name="glGetMaterialxvOES"/>
>+                <command name="glPointParameterxOES"/>
>+                <command name="glSampleCoveragexOES"/>
>+            </require>
>+            <require api="gl" comment="Entry points in the extension spec, but not the Khronos glext.h. Correspond to GL-only features it's unlikely were ever implemented against ES 1.x.">
>+                <command name="glAccumxOES"/>
>+                <command name="glBitmapxOES"/>
>+                <command name="glBlendColorxOES"/>
>+                <command name="glClearAccumxOES"/>
>+                <command name="glColor3xOES"/>
>+                <command name="glColor3xvOES"/>
>+                <command name="glColor4xvOES"/>
>+                <command name="glConvolutionParameterxOES"/>
>+                <command name="glConvolutionParameterxvOES"/>
>+                <command name="glEvalCoord1xOES"/>
>+                <command name="glEvalCoord1xvOES"/>
>+                <command name="glEvalCoord2xOES"/>
>+                <command name="glEvalCoord2xvOES"/>
>+                <command name="glFeedbackBufferxOES"/>
>+                <command name="glGetConvolutionParameterxvOES"/>
>+                <command name="glGetHistogramParameterxvOES"/>
>+                <command name="glGetLightxOES"/>
>+                <command name="glGetMapxvOES"/>
>+                <command name="glGetMaterialxOES"/>
>+                <command name="glGetPixelMapxv"/>
>+                <command name="glGetTexGenxvOES"/>
>+                <command name="glGetTexLevelParameterxvOES"/>
>+                <command name="glIndexxOES"/>
>+                <command name="glIndexxvOES"/>
>+                <command name="glLoadTransposeMatrixxOES"/>
>+                <command name="glMap1xOES"/>
>+                <command name="glMap2xOES"/>
>+                <command name="glMapGrid1xOES"/>
>+                <command name="glMapGrid2xOES"/>
>+                <command name="glMultTransposeMatrixxOES"/>
>+                <command name="glMultiTexCoord1xOES"/>
>+                <command name="glMultiTexCoord1xvOES"/>
>+                <command name="glMultiTexCoord2xOES"/>
>+                <command name="glMultiTexCoord2xvOES"/>
>+                <command name="glMultiTexCoord3xOES"/>
>+                <command name="glMultiTexCoord3xvOES"/>
>+                <command name="glMultiTexCoord4xvOES"/>
>+                <command name="glNormal3xvOES"/>
>+                <command name="glPassThroughxOES"/>
>+                <command name="glPixelMapx"/>
>+                <command name="glPixelStorex"/>
>+                <command name="glPixelTransferxOES"/>
>+                <command name="glPixelZoomxOES"/>
>+                <command name="glPrioritizeTexturesxOES"/>
>+                <command name="glRasterPos2xOES"/>
>+                <command name="glRasterPos2xvOES"/>
>+                <command name="glRasterPos3xOES"/>
>+                <command name="glRasterPos3xvOES"/>
>+                <command name="glRasterPos4xOES"/>
>+                <command name="glRasterPos4xvOES"/>
>+                <command name="glRectxOES"/>
>+                <command name="glRectxvOES"/>
>+                <command name="glTexCoord1xOES"/>
>+                <command name="glTexCoord1xvOES"/>
>+                <command name="glTexCoord2xOES"/>
>+                <command name="glTexCoord2xvOES"/>
>+                <command name="glTexCoord3xOES"/>
>+                <command name="glTexCoord3xvOES"/>
>+                <command name="glTexCoord4xOES"/>
>+                <command name="glTexCoord4xvOES"/>
>+                <command name="glTexGenxOES"/>
>+                <command name="glTexGenxvOES"/>
>+                <command name="glVertex2xOES"/>
>+                <command name="glVertex2xvOES"/>
>+                <command name="glVertex3xOES"/>
>+                <command name="glVertex3xvOES"/>
>+                <command name="glVertex4xOES"/>
>+                <command name="glVertex4xvOES"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_OES_fragment_precision_high" supported="gles2">
>+            <require>
>+            </require>
>+        </extension>
>+        <extension name="GL_OES_framebuffer_object" supported="gles1">
>+            <require>
>+                <enum name="GL_NONE_OES"/>
>+                <enum name="GL_FRAMEBUFFER_OES"/>
>+                <enum name="GL_RENDERBUFFER_OES"/>
>+                <enum name="GL_RGBA4_OES"/>
>+                <enum name="GL_RGB5_A1_OES"/>
>+                <enum name="GL_RGB565_OES"/>
>+                <enum name="GL_DEPTH_COMPONENT16_OES"/>
>+                <enum name="GL_RENDERBUFFER_WIDTH_OES"/>
>+                <enum name="GL_RENDERBUFFER_HEIGHT_OES"/>
>+                <enum name="GL_RENDERBUFFER_INTERNAL_FORMAT_OES"/>
>+                <enum name="GL_RENDERBUFFER_RED_SIZE_OES"/>
>+                <enum name="GL_RENDERBUFFER_GREEN_SIZE_OES"/>
>+                <enum name="GL_RENDERBUFFER_BLUE_SIZE_OES"/>
>+                <enum name="GL_RENDERBUFFER_ALPHA_SIZE_OES"/>
>+                <enum name="GL_RENDERBUFFER_DEPTH_SIZE_OES"/>
>+                <enum name="GL_RENDERBUFFER_STENCIL_SIZE_OES"/>
>+                <enum name="GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE_OES"/>
>+                <enum name="GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME_OES"/>
>+                <enum name="GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL_OES"/>
>+                <enum name="GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE_OES"/>
>+                <enum name="GL_COLOR_ATTACHMENT0_OES"/>
>+                <enum name="GL_DEPTH_ATTACHMENT_OES"/>
>+                <enum name="GL_STENCIL_ATTACHMENT_OES"/>
>+                <enum name="GL_FRAMEBUFFER_COMPLETE_OES"/>
>+                <enum name="GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT_OES"/>
>+                <enum name="GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT_OES"/>
>+                <enum name="GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS_OES"/>
>+                <enum name="GL_FRAMEBUFFER_INCOMPLETE_FORMATS_OES"/>
>+                <enum name="GL_FRAMEBUFFER_UNSUPPORTED_OES"/>
>+                <enum name="GL_FRAMEBUFFER_BINDING_OES"/>
>+                <enum name="GL_RENDERBUFFER_BINDING_OES"/>
>+                <enum name="GL_MAX_RENDERBUFFER_SIZE_OES"/>
>+                <enum name="GL_INVALID_FRAMEBUFFER_OPERATION_OES"/>
>+                <command name="glIsRenderbufferOES"/>
>+                <command name="glBindRenderbufferOES"/>
>+                <command name="glDeleteRenderbuffersOES"/>
>+                <command name="glGenRenderbuffersOES"/>
>+                <command name="glRenderbufferStorageOES"/>
>+                <command name="glGetRenderbufferParameterivOES"/>
>+                <command name="glIsFramebufferOES"/>
>+                <command name="glBindFramebufferOES"/>
>+                <command name="glDeleteFramebuffersOES"/>
>+                <command name="glGenFramebuffersOES"/>
>+                <command name="glCheckFramebufferStatusOES"/>
>+                <command name="glFramebufferRenderbufferOES"/>
>+                <command name="glFramebufferTexture2DOES"/>
>+                <command name="glGetFramebufferAttachmentParameterivOES"/>
>+                <command name="glGenerateMipmapOES"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_OES_geometry_point_size" supported="gles2"/>
>+        <extension name="GL_OES_geometry_shader" supported="gles2">
>+            <require>
>+                <enum name="GL_GEOMETRY_SHADER_OES"/>
>+                <enum name="GL_GEOMETRY_SHADER_BIT_OES"/>
>+                <enum name="GL_GEOMETRY_LINKED_VERTICES_OUT_OES"/>
>+                <enum name="GL_GEOMETRY_LINKED_INPUT_TYPE_OES"/>
>+                <enum name="GL_GEOMETRY_LINKED_OUTPUT_TYPE_OES"/>
>+                <enum name="GL_GEOMETRY_SHADER_INVOCATIONS_OES"/>
>+                <enum name="GL_LAYER_PROVOKING_VERTEX_OES"/>
>+                <enum name="GL_LINES_ADJACENCY_OES"/>
>+                <enum name="GL_LINE_STRIP_ADJACENCY_OES"/>
>+                <enum name="GL_TRIANGLES_ADJACENCY_OES"/>
>+                <enum name="GL_TRIANGLE_STRIP_ADJACENCY_OES"/>
>+                <enum name="GL_MAX_GEOMETRY_UNIFORM_COMPONENTS_OES"/>
>+                <enum name="GL_MAX_GEOMETRY_UNIFORM_BLOCKS_OES"/>
>+                <enum name="GL_MAX_COMBINED_GEOMETRY_UNIFORM_COMPONENTS_OES"/>
>+                <enum name="GL_MAX_GEOMETRY_INPUT_COMPONENTS_OES"/>
>+                <enum name="GL_MAX_GEOMETRY_OUTPUT_COMPONENTS_OES"/>
>+                <enum name="GL_MAX_GEOMETRY_OUTPUT_VERTICES_OES"/>
>+                <enum name="GL_MAX_GEOMETRY_TOTAL_OUTPUT_COMPONENTS_OES"/>
>+                <enum name="GL_MAX_GEOMETRY_SHADER_INVOCATIONS_OES"/>
>+                <enum name="GL_MAX_GEOMETRY_TEXTURE_IMAGE_UNITS_OES"/>
>+                <enum name="GL_MAX_GEOMETRY_ATOMIC_COUNTER_BUFFERS_OES"/>
>+                <enum name="GL_MAX_GEOMETRY_ATOMIC_COUNTERS_OES"/>
>+                <enum name="GL_MAX_GEOMETRY_IMAGE_UNIFORMS_OES"/>
>+                <enum name="GL_MAX_GEOMETRY_SHADER_STORAGE_BLOCKS_OES"/>
>+                <enum name="GL_FIRST_VERTEX_CONVENTION_OES"/>
>+                <enum name="GL_LAST_VERTEX_CONVENTION_OES"/>
>+                <enum name="GL_UNDEFINED_VERTEX_OES"/>
>+                <enum name="GL_PRIMITIVES_GENERATED_OES"/>
>+                <enum name="GL_FRAMEBUFFER_DEFAULT_LAYERS_OES"/>
>+                <enum name="GL_MAX_FRAMEBUFFER_LAYERS_OES"/>
>+                <enum name="GL_FRAMEBUFFER_INCOMPLETE_LAYER_TARGETS_OES"/>
>+                <enum name="GL_FRAMEBUFFER_ATTACHMENT_LAYERED_OES"/>
>+                <enum name="GL_REFERENCED_BY_GEOMETRY_SHADER_OES"/>
>+                <command name="glFramebufferTextureOES"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_OES_get_program_binary" supported="gles2">
>+            <require>
>+                <enum name="GL_PROGRAM_BINARY_LENGTH_OES"/>
>+                <enum name="GL_NUM_PROGRAM_BINARY_FORMATS_OES"/>
>+                <enum name="GL_PROGRAM_BINARY_FORMATS_OES"/>
>+                <command name="glGetProgramBinaryOES"/>
>+                <command name="glProgramBinaryOES"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_OES_gpu_shader5" supported="gles2"/>
>+        <extension name="GL_OES_mapbuffer" supported="gles1|gles2">
>+            <require>
>+                <enum name="GL_WRITE_ONLY_OES"/>
>+                <enum name="GL_BUFFER_ACCESS_OES"/>
>+                <enum name="GL_BUFFER_MAPPED_OES"/>
>+                <enum name="GL_BUFFER_MAP_POINTER_OES"/>
>+                <command name="glMapBufferOES"/>
>+                <command name="glUnmapBufferOES"/>
>+                <command name="glGetBufferPointervOES"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_OES_matrix_get" supported="gles1">
>+            <require>
>+                <enum name="GL_MODELVIEW_MATRIX_FLOAT_AS_INT_BITS_OES"/>
>+                <enum name="GL_PROJECTION_MATRIX_FLOAT_AS_INT_BITS_OES"/>
>+                <enum name="GL_TEXTURE_MATRIX_FLOAT_AS_INT_BITS_OES"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_OES_matrix_palette" supported="gles1">
>+            <require>
>+                <enum name="GL_MAX_VERTEX_UNITS_OES"/>
>+                <enum name="GL_MAX_PALETTE_MATRICES_OES"/>
>+                <enum name="GL_MATRIX_PALETTE_OES"/>
>+                <enum name="GL_MATRIX_INDEX_ARRAY_OES"/>
>+                <enum name="GL_WEIGHT_ARRAY_OES"/>
>+                <enum name="GL_CURRENT_PALETTE_MATRIX_OES"/>
>+                <enum name="GL_MATRIX_INDEX_ARRAY_SIZE_OES"/>
>+                <enum name="GL_MATRIX_INDEX_ARRAY_TYPE_OES"/>
>+                <enum name="GL_MATRIX_INDEX_ARRAY_STRIDE_OES"/>
>+                <enum name="GL_MATRIX_INDEX_ARRAY_POINTER_OES"/>
>+                <enum name="GL_MATRIX_INDEX_ARRAY_BUFFER_BINDING_OES"/>
>+                <enum name="GL_WEIGHT_ARRAY_SIZE_OES"/>
>+                <enum name="GL_WEIGHT_ARRAY_TYPE_OES"/>
>+                <enum name="GL_WEIGHT_ARRAY_STRIDE_OES"/>
>+                <enum name="GL_WEIGHT_ARRAY_POINTER_OES"/>
>+                <enum name="GL_WEIGHT_ARRAY_BUFFER_BINDING_OES"/>
>+                <command name="glCurrentPaletteMatrixOES"/>
>+                <command name="glLoadPaletteFromModelViewMatrixOES"/>
>+                <command name="glMatrixIndexPointerOES"/>
>+                <command name="glWeightPointerOES"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_OES_packed_depth_stencil" supported="gles1|gles2">
>+            <require>
>+                <enum name="GL_DEPTH_STENCIL_OES"/>
>+                <enum name="GL_UNSIGNED_INT_24_8_OES"/>
>+                <enum name="GL_DEPTH24_STENCIL8_OES"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_OES_point_size_array" supported="gles1">
>+            <require>
>+                <enum name="GL_POINT_SIZE_ARRAY_OES"/>
>+                <enum name="GL_POINT_SIZE_ARRAY_TYPE_OES"/>
>+                <enum name="GL_POINT_SIZE_ARRAY_STRIDE_OES"/>
>+                <enum name="GL_POINT_SIZE_ARRAY_POINTER_OES"/>
>+                <enum name="GL_POINT_SIZE_ARRAY_BUFFER_BINDING_OES"/>
>+                <command name="glPointSizePointerOES"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_OES_point_sprite" supported="gles1">
>+            <require>
>+                <enum name="GL_POINT_SPRITE_OES"/>
>+                <enum name="GL_COORD_REPLACE_OES"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_OES_primitive_bounding_box" supported="gles2">
>+            <require>
>+                <enum name="GL_PRIMITIVE_BOUNDING_BOX_OES"/>
>+                <command name="glPrimitiveBoundingBoxOES"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_OES_query_matrix" supported="gl|gles1">
>+            <require>
>+                <command name="glQueryMatrixxOES"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_OES_read_format" supported="gl|gles1">
>+            <require>
>+                <enum name="GL_IMPLEMENTATION_COLOR_READ_TYPE_OES"/>
>+                <enum name="GL_IMPLEMENTATION_COLOR_READ_FORMAT_OES"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_OES_required_internalformat" supported="gles1|gles2">
>+            <require>
>+                <enum name="GL_ALPHA8_OES"/>
>+                <enum name="GL_DEPTH_COMPONENT16_OES"/>
>+                <enum name="GL_DEPTH_COMPONENT24_OES"/>
>+                <enum name="GL_DEPTH24_STENCIL8_OES"/>
>+                <enum name="GL_DEPTH_COMPONENT32_OES"/>
>+                <enum name="GL_LUMINANCE4_ALPHA4_OES"/>
>+                <enum name="GL_LUMINANCE8_ALPHA8_OES"/>
>+                <enum name="GL_LUMINANCE8_OES"/>
>+                <enum name="GL_RGBA4_OES"/>
>+                <enum name="GL_RGB5_A1_OES"/>
>+                <enum name="GL_RGB565_OES"/>
>+                <enum name="GL_RGB8_OES"/>
>+                <enum name="GL_RGBA8_OES"/>
>+                <enum name="GL_RGB10_EXT"/>
>+                <enum name="GL_RGB10_A2_EXT"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_OES_rgb8_rgba8" supported="gles1|gles2|glsc2">
>+            <require>
>+                <enum name="GL_RGB8_OES"/>
>+                <enum name="GL_RGBA8_OES"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_OES_sample_shading" supported="gles2">
>+            <require>
>+                <command name="glMinSampleShadingOES"/>
>+                <enum name="GL_SAMPLE_SHADING_OES"/>
>+                <enum name="GL_MIN_SAMPLE_SHADING_VALUE_OES"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_OES_sample_variables" supported="gles2"/>
>+        <extension name="GL_OES_shader_image_atomic" supported="gles2"/>
>+        <extension name="GL_OES_shader_io_blocks" supported="gles2"/>
>+        <extension name="GL_OES_shader_multisample_interpolation" supported="gles2">
>+            <require>
>+                <enum name="GL_MIN_FRAGMENT_INTERPOLATION_OFFSET_OES"/>
>+                <enum name="GL_MAX_FRAGMENT_INTERPOLATION_OFFSET_OES"/>
>+                <enum name="GL_FRAGMENT_INTERPOLATION_OFFSET_BITS_OES"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_OES_single_precision" supported="gl|gles1">
>+            <require>
>+                <command name="glClearDepthfOES"/>
>+                <command name="glClipPlanefOES"/>
>+                <command name="glDepthRangefOES"/>
>+                <command name="glFrustumfOES"/>
>+                <command name="glGetClipPlanefOES"/>
>+                <command name="glOrthofOES"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_OES_standard_derivatives" supported="gles2|glsc2">
>+            <require>
>+                <enum name="GL_FRAGMENT_SHADER_DERIVATIVE_HINT_OES"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_OES_stencil1" supported="gles1|gles2">
>+            <require>
>+                <enum name="GL_STENCIL_INDEX1_OES"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_OES_stencil4" supported="gles1|gles2">
>+            <require>
>+                <enum name="GL_STENCIL_INDEX4_OES"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_OES_stencil8" supported="gles1">
>+            <require>
>+                <enum name="GL_STENCIL_INDEX8_OES"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_OES_stencil_wrap" supported="gles1">
>+            <require>
>+                <enum name="GL_INCR_WRAP_OES"/>
>+                <enum name="GL_DECR_WRAP_OES"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_OES_surfaceless_context" supported="gles1|gles2">
>+            <require>
>+                <enum name="GL_FRAMEBUFFER_UNDEFINED_OES"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_OES_tessellation_point_size" supported="gles2"/>
>+        <extension name="GL_OES_tessellation_shader" supported="gles2">
>+            <require>
>+                <enum name="GL_PATCHES_OES"/>
>+                <enum name="GL_PATCH_VERTICES_OES"/>
>+                <enum name="GL_TESS_CONTROL_OUTPUT_VERTICES_OES"/>
>+                <enum name="GL_TESS_GEN_MODE_OES"/>
>+                <enum name="GL_TESS_GEN_SPACING_OES"/>
>+                <enum name="GL_TESS_GEN_VERTEX_ORDER_OES"/>
>+                <enum name="GL_TESS_GEN_POINT_MODE_OES"/>
>+                <enum name="GL_TRIANGLES"/>
>+                <enum name="GL_ISOLINES_OES"/>
>+                <enum name="GL_QUADS_OES"/>
>+                <enum name="GL_EQUAL"/>
>+                <enum name="GL_FRACTIONAL_ODD_OES"/>
>+                <enum name="GL_FRACTIONAL_EVEN_OES"/>
>+                <enum name="GL_CCW"/>
>+                <enum name="GL_CW"/>
>+                <enum name="GL_MAX_PATCH_VERTICES_OES"/>
>+                <enum name="GL_MAX_TESS_GEN_LEVEL_OES"/>
>+                <enum name="GL_MAX_TESS_CONTROL_UNIFORM_COMPONENTS_OES"/>
>+                <enum name="GL_MAX_TESS_EVALUATION_UNIFORM_COMPONENTS_OES"/>
>+                <enum name="GL_MAX_TESS_CONTROL_TEXTURE_IMAGE_UNITS_OES"/>
>+                <enum name="GL_MAX_TESS_EVALUATION_TEXTURE_IMAGE_UNITS_OES"/>
>+                <enum name="GL_MAX_TESS_CONTROL_OUTPUT_COMPONENTS_OES"/>
>+                <enum name="GL_MAX_TESS_PATCH_COMPONENTS_OES"/>
>+                <enum name="GL_MAX_TESS_CONTROL_TOTAL_OUTPUT_COMPONENTS_OES"/>
>+                <enum name="GL_MAX_TESS_EVALUATION_OUTPUT_COMPONENTS_OES"/>
>+                <enum name="GL_MAX_TESS_CONTROL_UNIFORM_BLOCKS_OES"/>
>+                <enum name="GL_MAX_TESS_EVALUATION_UNIFORM_BLOCKS_OES"/>
>+                <enum name="GL_MAX_TESS_CONTROL_INPUT_COMPONENTS_OES"/>
>+                <enum name="GL_MAX_TESS_EVALUATION_INPUT_COMPONENTS_OES"/>
>+                <enum name="GL_MAX_COMBINED_TESS_CONTROL_UNIFORM_COMPONENTS_OES"/>
>+                <enum name="GL_MAX_COMBINED_TESS_EVALUATION_UNIFORM_COMPONENTS_OES"/>
>+                <enum name="GL_MAX_TESS_CONTROL_ATOMIC_COUNTER_BUFFERS_OES"/>
>+                <enum name="GL_MAX_TESS_EVALUATION_ATOMIC_COUNTER_BUFFERS_OES"/>
>+                <enum name="GL_MAX_TESS_CONTROL_ATOMIC_COUNTERS_OES"/>
>+                <enum name="GL_MAX_TESS_EVALUATION_ATOMIC_COUNTERS_OES"/>
>+                <enum name="GL_MAX_TESS_CONTROL_IMAGE_UNIFORMS_OES"/>
>+                <enum name="GL_MAX_TESS_EVALUATION_IMAGE_UNIFORMS_OES"/>
>+                <enum name="GL_MAX_TESS_CONTROL_SHADER_STORAGE_BLOCKS_OES"/>
>+                <enum name="GL_MAX_TESS_EVALUATION_SHADER_STORAGE_BLOCKS_OES"/>
>+                <enum name="GL_PRIMITIVE_RESTART_FOR_PATCHES_SUPPORTED_OES"/>
>+                <enum name="GL_IS_PER_PATCH_OES"/>
>+                <enum name="GL_REFERENCED_BY_TESS_CONTROL_SHADER_OES"/>
>+                <enum name="GL_REFERENCED_BY_TESS_EVALUATION_SHADER_OES"/>
>+                <enum name="GL_TESS_CONTROL_SHADER_OES"/>
>+                <enum name="GL_TESS_EVALUATION_SHADER_OES"/>
>+                <enum name="GL_TESS_CONTROL_SHADER_BIT_OES"/>
>+                <enum name="GL_TESS_EVALUATION_SHADER_BIT_OES"/>
>+                <command name="glPatchParameteriOES"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_OES_texture_3D" supported="gles2">
>+            <require>
>+                <enum name="GL_TEXTURE_WRAP_R_OES"/>
>+                <enum name="GL_TEXTURE_3D_OES"/>
>+                <enum name="GL_TEXTURE_BINDING_3D_OES"/>
>+                <enum name="GL_MAX_3D_TEXTURE_SIZE_OES"/>
>+                <enum name="GL_SAMPLER_3D_OES"/>
>+                <enum name="GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_3D_ZOFFSET_OES"/>
>+                <command name="glTexImage3DOES"/>
>+                <command name="glTexSubImage3DOES"/>
>+                <command name="glCopyTexSubImage3DOES"/>
>+                <command name="glCompressedTexImage3DOES"/>
>+                <command name="glCompressedTexSubImage3DOES"/>
>+                <command name="glFramebufferTexture3DOES"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_OES_texture_border_clamp" supported="gles2">
>+            <require>
>+                <enum name="GL_TEXTURE_BORDER_COLOR_OES"/>
>+                <enum name="GL_CLAMP_TO_BORDER_OES"/>
>+                <command name="glTexParameterIivOES"/>
>+                <command name="glTexParameterIuivOES"/>
>+                <command name="glGetTexParameterIivOES"/>
>+                <command name="glGetTexParameterIuivOES"/>
>+                <command name="glSamplerParameterIivOES"/>
>+                <command name="glSamplerParameterIuivOES"/>
>+                <command name="glGetSamplerParameterIivOES"/>
>+                <command name="glGetSamplerParameterIuivOES"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_OES_texture_buffer" supported="gles2">
>+            <require>
>+                <enum name="GL_TEXTURE_BUFFER_OES"/>
>+                <enum name="GL_TEXTURE_BUFFER_BINDING_OES"/>
>+                <enum name="GL_MAX_TEXTURE_BUFFER_SIZE_OES"/>
>+                <enum name="GL_TEXTURE_BINDING_BUFFER_OES"/>
>+                <enum name="GL_TEXTURE_BUFFER_DATA_STORE_BINDING_OES"/>
>+                <enum name="GL_TEXTURE_BUFFER_OFFSET_ALIGNMENT_OES"/>
>+                <enum name="GL_SAMPLER_BUFFER_OES"/>
>+                <enum name="GL_INT_SAMPLER_BUFFER_OES"/>
>+                <enum name="GL_UNSIGNED_INT_SAMPLER_BUFFER_OES"/>
>+                <enum name="GL_IMAGE_BUFFER_OES"/>
>+                <enum name="GL_INT_IMAGE_BUFFER_OES"/>
>+                <enum name="GL_UNSIGNED_INT_IMAGE_BUFFER_OES"/>
>+                <enum name="GL_TEXTURE_BUFFER_OFFSET_OES"/>
>+                <enum name="GL_TEXTURE_BUFFER_SIZE_OES"/>
>+                <command name="glTexBufferOES"/>
>+                <command name="glTexBufferRangeOES"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_OES_texture_compression_astc" supported="gles2" comment="API is identical to GL_KHR_texture_compression_astc_hdr extension">
>+            <require>
>+                <enum name="GL_COMPRESSED_RGBA_ASTC_4x4_KHR"/>
>+                <enum name="GL_COMPRESSED_RGBA_ASTC_5x4_KHR"/>
>+                <enum name="GL_COMPRESSED_RGBA_ASTC_5x5_KHR"/>
>+                <enum name="GL_COMPRESSED_RGBA_ASTC_6x5_KHR"/>
>+                <enum name="GL_COMPRESSED_RGBA_ASTC_6x6_KHR"/>
>+                <enum name="GL_COMPRESSED_RGBA_ASTC_8x5_KHR"/>
>+                <enum name="GL_COMPRESSED_RGBA_ASTC_8x6_KHR"/>
>+                <enum name="GL_COMPRESSED_RGBA_ASTC_8x8_KHR"/>
>+                <enum name="GL_COMPRESSED_RGBA_ASTC_10x5_KHR"/>
>+                <enum name="GL_COMPRESSED_RGBA_ASTC_10x6_KHR"/>
>+                <enum name="GL_COMPRESSED_RGBA_ASTC_10x8_KHR"/>
>+                <enum name="GL_COMPRESSED_RGBA_ASTC_10x10_KHR"/>
>+                <enum name="GL_COMPRESSED_RGBA_ASTC_12x10_KHR"/>
>+                <enum name="GL_COMPRESSED_RGBA_ASTC_12x12_KHR"/>
>+                <enum name="GL_COMPRESSED_SRGB8_ALPHA8_ASTC_4x4_KHR"/>
>+                <enum name="GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x4_KHR"/>
>+                <enum name="GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x5_KHR"/>
>+                <enum name="GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x5_KHR"/>
>+                <enum name="GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x6_KHR"/>
>+                <enum name="GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x5_KHR"/>
>+                <enum name="GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x6_KHR"/>
>+                <enum name="GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x8_KHR"/>
>+                <enum name="GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x5_KHR"/>
>+                <enum name="GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x6_KHR"/>
>+                <enum name="GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x8_KHR"/>
>+                <enum name="GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x10_KHR"/>
>+                <enum name="GL_COMPRESSED_SRGB8_ALPHA8_ASTC_12x10_KHR"/>
>+                <enum name="GL_COMPRESSED_SRGB8_ALPHA8_ASTC_12x12_KHR"/>
>+                <enum name="GL_COMPRESSED_RGBA_ASTC_3x3x3_OES"/>
>+                <enum name="GL_COMPRESSED_RGBA_ASTC_4x3x3_OES"/>
>+                <enum name="GL_COMPRESSED_RGBA_ASTC_4x4x3_OES"/>
>+                <enum name="GL_COMPRESSED_RGBA_ASTC_4x4x4_OES"/>
>+                <enum name="GL_COMPRESSED_RGBA_ASTC_5x4x4_OES"/>
>+                <enum name="GL_COMPRESSED_RGBA_ASTC_5x5x4_OES"/>
>+                <enum name="GL_COMPRESSED_RGBA_ASTC_5x5x5_OES"/>
>+                <enum name="GL_COMPRESSED_RGBA_ASTC_6x5x5_OES"/>
>+                <enum name="GL_COMPRESSED_RGBA_ASTC_6x6x5_OES"/>
>+                <enum name="GL_COMPRESSED_RGBA_ASTC_6x6x6_OES"/>
>+                <enum name="GL_COMPRESSED_SRGB8_ALPHA8_ASTC_3x3x3_OES"/>
>+                <enum name="GL_COMPRESSED_SRGB8_ALPHA8_ASTC_4x3x3_OES"/>
>+                <enum name="GL_COMPRESSED_SRGB8_ALPHA8_ASTC_4x4x3_OES"/>
>+                <enum name="GL_COMPRESSED_SRGB8_ALPHA8_ASTC_4x4x4_OES"/>
>+                <enum name="GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x4x4_OES"/>
>+                <enum name="GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x5x4_OES"/>
>+                <enum name="GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x5x5_OES"/>
>+                <enum name="GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x5x5_OES"/>
>+                <enum name="GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x6x5_OES"/>
>+                <enum name="GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x6x6_OES"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_OES_texture_cube_map" supported="gles1">
>+            <require>
>+                <enum name="GL_NORMAL_MAP_OES"/>
>+                <enum name="GL_REFLECTION_MAP_OES"/>
>+                <enum name="GL_TEXTURE_CUBE_MAP_OES"/>
>+                <enum name="GL_TEXTURE_BINDING_CUBE_MAP_OES"/>
>+                <enum name="GL_TEXTURE_CUBE_MAP_POSITIVE_X_OES"/>
>+                <enum name="GL_TEXTURE_CUBE_MAP_NEGATIVE_X_OES"/>
>+                <enum name="GL_TEXTURE_CUBE_MAP_POSITIVE_Y_OES"/>
>+                <enum name="GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_OES"/>
>+                <enum name="GL_TEXTURE_CUBE_MAP_POSITIVE_Z_OES"/>
>+                <enum name="GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_OES"/>
>+                <enum name="GL_MAX_CUBE_MAP_TEXTURE_SIZE_OES"/>
>+                <enum name="GL_TEXTURE_GEN_MODE_OES"/>
>+                <enum name="GL_TEXTURE_GEN_STR_OES"/>
>+                <command name="glTexGenfOES"/>
>+                <command name="glTexGenfvOES"/>
>+                <command name="glTexGeniOES"/>
>+                <command name="glTexGenivOES"/>
>+                <command name="glTexGenxOES"/>
>+                <command name="glTexGenxvOES"/>
>+                <command name="glGetTexGenfvOES"/>
>+                <command name="glGetTexGenivOES"/>
>+                <command name="glGetTexGenxvOES"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_OES_texture_cube_map_array" supported="gles2">
>+            <require>
>+                <enum name="GL_TEXTURE_CUBE_MAP_ARRAY_OES"/>
>+                <enum name="GL_TEXTURE_BINDING_CUBE_MAP_ARRAY_OES"/>
>+                <enum name="GL_SAMPLER_CUBE_MAP_ARRAY_OES"/>
>+                <enum name="GL_SAMPLER_CUBE_MAP_ARRAY_SHADOW_OES"/>
>+                <enum name="GL_INT_SAMPLER_CUBE_MAP_ARRAY_OES"/>
>+                <enum name="GL_UNSIGNED_INT_SAMPLER_CUBE_MAP_ARRAY_OES"/>
>+                <enum name="GL_IMAGE_CUBE_MAP_ARRAY_OES"/>
>+                <enum name="GL_INT_IMAGE_CUBE_MAP_ARRAY_OES"/>
>+                <enum name="GL_UNSIGNED_INT_IMAGE_CUBE_MAP_ARRAY_OES"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_OES_texture_env_crossbar" supported="gles1"/>
>+        <extension name="GL_OES_texture_float" supported="gles2">
>+            <require>
>+                <enum name="GL_FLOAT"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_OES_texture_float_linear" supported="gles2"/>
>+        <extension name="GL_OES_texture_half_float" supported="gles2">
>+            <require>
>+                <enum name="GL_HALF_FLOAT_OES"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_OES_texture_half_float_linear" supported="gles2"/>
>+        <extension name="GL_OES_texture_mirrored_repeat" supported="gles1">
>+            <require>
>+                <enum name="GL_MIRRORED_REPEAT_OES"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_OES_texture_npot" supported="gles1|gles2"/>
>+        <extension name="GL_OES_texture_stencil8" supported="gles2">
>+            <require>
>+                <enum name="GL_STENCIL_INDEX_OES"/>
>+                <enum name="GL_STENCIL_INDEX8_OES"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_OES_texture_storage_multisample_2d_array" supported="gles2">
>+            <require>
>+                <enum name="GL_TEXTURE_2D_MULTISAMPLE_ARRAY_OES"/>
>+                <enum name="GL_TEXTURE_BINDING_2D_MULTISAMPLE_ARRAY_OES"/>
>+                <enum name="GL_SAMPLER_2D_MULTISAMPLE_ARRAY_OES"/>
>+                <enum name="GL_INT_SAMPLER_2D_MULTISAMPLE_ARRAY_OES"/>
>+                <enum name="GL_UNSIGNED_INT_SAMPLER_2D_MULTISAMPLE_ARRAY_OES"/>
>+                <command name="glTexStorage3DMultisampleOES"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_OES_texture_view" supported="gles2">
>+            <require>
>+                <enum name="GL_TEXTURE_VIEW_MIN_LEVEL_OES"/>
>+                <enum name="GL_TEXTURE_VIEW_NUM_LEVELS_OES"/>
>+                <enum name="GL_TEXTURE_VIEW_MIN_LAYER_OES"/>
>+                <enum name="GL_TEXTURE_VIEW_NUM_LAYERS_OES"/>
>+                <enum name="GL_TEXTURE_IMMUTABLE_LEVELS"/>
>+                <command name="glTextureViewOES"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_OES_vertex_array_object" supported="gles1|gles2">
>+            <require>
>+                <enum name="GL_VERTEX_ARRAY_BINDING_OES"/>
>+                <command name="glBindVertexArrayOES"/>
>+                <command name="glDeleteVertexArraysOES"/>
>+                <command name="glGenVertexArraysOES"/>
>+                <command name="glIsVertexArrayOES"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_OES_vertex_half_float" supported="gles2">
>+            <require>
>+                <enum name="GL_HALF_FLOAT_OES"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_OES_vertex_type_10_10_10_2" supported="gles2">
>+            <require>
>+                <enum name="GL_UNSIGNED_INT_10_10_10_2_OES"/>
>+                <enum name="GL_INT_10_10_10_2_OES"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_OES_viewport_array" supported="gles2">
>+            <require>
>+                <enum name="GL_SCISSOR_BOX"/>
>+                <enum name="GL_VIEWPORT"/>
>+                <enum name="GL_DEPTH_RANGE"/>
>+                <enum name="GL_SCISSOR_TEST"/>
>+                <enum name="GL_MAX_VIEWPORTS_OES"/>
>+                <enum name="GL_VIEWPORT_SUBPIXEL_BITS_OES"/>
>+                <enum name="GL_VIEWPORT_BOUNDS_RANGE_OES"/>
>+                <enum name="GL_VIEWPORT_INDEX_PROVOKING_VERTEX_OES"/>
>+                <command name="glViewportArrayvOES"/>
>+                <command name="glViewportIndexedfOES"/>
>+                <command name="glViewportIndexedfvOES"/>
>+                <command name="glScissorArrayvOES"/>
>+                <command name="glScissorIndexedOES"/>
>+                <command name="glScissorIndexedvOES"/>
>+                <command name="glDepthRangeArrayfvOES"/>
>+                <command name="glDepthRangeIndexedfOES"/>
>+                <command name="glGetFloati_vOES"/>
>+                <command name="glEnableiOES"/>
>+                <command name="glDisableiOES"/>
>+                <command name="glIsEnablediOES"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_OML_interlace" supported="gl">
>+            <require>
>+                <enum name="GL_INTERLACE_OML"/>
>+                <enum name="GL_INTERLACE_READ_OML"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_OML_resample" supported="gl">
>+            <require>
>+                <enum name="GL_PACK_RESAMPLE_OML"/>
>+                <enum name="GL_UNPACK_RESAMPLE_OML"/>
>+                <enum name="GL_RESAMPLE_REPLICATE_OML"/>
>+                <enum name="GL_RESAMPLE_ZERO_FILL_OML"/>
>+                <enum name="GL_RESAMPLE_AVERAGE_OML"/>
>+                <enum name="GL_RESAMPLE_DECIMATE_OML"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_OML_subsample" supported="gl">
>+            <require>
>+                <enum name="GL_FORMAT_SUBSAMPLE_24_24_OML"/>
>+                <enum name="GL_FORMAT_SUBSAMPLE_244_244_OML"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_OVR_multiview" supported="gl|glcore|gles2">
>+            <require>
>+                <enum name="GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_NUM_VIEWS_OVR"/>
>+                <enum name="GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_BASE_VIEW_INDEX_OVR"/>
>+                <enum name="GL_MAX_VIEWS_OVR"/>
>+                <enum name="GL_FRAMEBUFFER_INCOMPLETE_VIEW_TARGETS_OVR"/>
>+                <command name="glFramebufferTextureMultiviewOVR"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_OVR_multiview2" supported="gl|glcore|gles2"/>
>+        <extension name="GL_OVR_multiview_multisampled_render_to_texture" supported="gles2">
>+            <require>
>+                <command name="glFramebufferTextureMultisampleMultiviewOVR"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_PGI_misc_hints" supported="gl">
>+            <require>
>+                <enum name="GL_PREFER_DOUBLEBUFFER_HINT_PGI"/>
>+                <enum name="GL_CONSERVE_MEMORY_HINT_PGI"/>
>+                <enum name="GL_RECLAIM_MEMORY_HINT_PGI"/>
>+                <enum name="GL_NATIVE_GRAPHICS_HANDLE_PGI"/>
>+                <enum name="GL_NATIVE_GRAPHICS_BEGIN_HINT_PGI"/>
>+                <enum name="GL_NATIVE_GRAPHICS_END_HINT_PGI"/>
>+                <enum name="GL_ALWAYS_FAST_HINT_PGI"/>
>+                <enum name="GL_ALWAYS_SOFT_HINT_PGI"/>
>+                <enum name="GL_ALLOW_DRAW_OBJ_HINT_PGI"/>
>+                <enum name="GL_ALLOW_DRAW_WIN_HINT_PGI"/>
>+                <enum name="GL_ALLOW_DRAW_FRG_HINT_PGI"/>
>+                <enum name="GL_ALLOW_DRAW_MEM_HINT_PGI"/>
>+                <enum name="GL_STRICT_DEPTHFUNC_HINT_PGI"/>
>+                <enum name="GL_STRICT_LIGHTING_HINT_PGI"/>
>+                <enum name="GL_STRICT_SCISSOR_HINT_PGI"/>
>+                <enum name="GL_FULL_STIPPLE_HINT_PGI"/>
>+                <enum name="GL_CLIP_NEAR_HINT_PGI"/>
>+                <enum name="GL_CLIP_FAR_HINT_PGI"/>
>+                <enum name="GL_WIDE_LINE_HINT_PGI"/>
>+                <enum name="GL_BACK_NORMALS_HINT_PGI"/>
>+                <command name="glHintPGI"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_PGI_vertex_hints" supported="gl">
>+            <require>
>+                <enum name="GL_VERTEX_DATA_HINT_PGI"/>
>+                <enum name="GL_VERTEX_CONSISTENT_HINT_PGI"/>
>+                <enum name="GL_MATERIAL_SIDE_HINT_PGI"/>
>+                <enum name="GL_MAX_VERTEX_HINT_PGI"/>
>+                <enum name="GL_COLOR3_BIT_PGI"/>
>+                <enum name="GL_COLOR4_BIT_PGI"/>
>+                <enum name="GL_EDGEFLAG_BIT_PGI"/>
>+                <enum name="GL_INDEX_BIT_PGI"/>
>+                <enum name="GL_MAT_AMBIENT_BIT_PGI"/>
>+                <enum name="GL_MAT_AMBIENT_AND_DIFFUSE_BIT_PGI"/>
>+                <enum name="GL_MAT_DIFFUSE_BIT_PGI"/>
>+                <enum name="GL_MAT_EMISSION_BIT_PGI"/>
>+                <enum name="GL_MAT_COLOR_INDEXES_BIT_PGI"/>
>+                <enum name="GL_MAT_SHININESS_BIT_PGI"/>
>+                <enum name="GL_MAT_SPECULAR_BIT_PGI"/>
>+                <enum name="GL_NORMAL_BIT_PGI"/>
>+                <enum name="GL_TEXCOORD1_BIT_PGI"/>
>+                <enum name="GL_TEXCOORD2_BIT_PGI"/>
>+                <enum name="GL_TEXCOORD3_BIT_PGI"/>
>+                <enum name="GL_TEXCOORD4_BIT_PGI"/>
>+                <enum name="GL_VERTEX23_BIT_PGI"/>
>+                <enum name="GL_VERTEX4_BIT_PGI"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_QCOM_alpha_test" supported="gles2">
>+            <require>
>+                <enum name="GL_ALPHA_TEST_QCOM"/>
>+                <enum name="GL_ALPHA_TEST_FUNC_QCOM"/>
>+                <enum name="GL_ALPHA_TEST_REF_QCOM"/>
>+                <command name="glAlphaFuncQCOM"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_QCOM_binning_control" supported="gles2">
>+            <require>
>+                <enum name="GL_BINNING_CONTROL_HINT_QCOM"/>
>+                <enum name="GL_CPU_OPTIMIZED_QCOM"/>
>+                <enum name="GL_GPU_OPTIMIZED_QCOM"/>
>+                <enum name="GL_RENDER_DIRECT_TO_FRAMEBUFFER_QCOM"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_QCOM_driver_control" supported="gles1|gles2">
>+            <require>
>+                <command name="glGetDriverControlsQCOM"/>
>+                <command name="glGetDriverControlStringQCOM"/>
>+                <command name="glEnableDriverControlQCOM"/>
>+                <command name="glDisableDriverControlQCOM"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_QCOM_extended_get" supported="gles1|gles2">
>+            <require>
>+                <enum name="GL_TEXTURE_WIDTH_QCOM"/>
>+                <enum name="GL_TEXTURE_HEIGHT_QCOM"/>
>+                <enum name="GL_TEXTURE_DEPTH_QCOM"/>
>+                <enum name="GL_TEXTURE_INTERNAL_FORMAT_QCOM"/>
>+                <enum name="GL_TEXTURE_FORMAT_QCOM"/>
>+                <enum name="GL_TEXTURE_TYPE_QCOM"/>
>+                <enum name="GL_TEXTURE_IMAGE_VALID_QCOM"/>
>+                <enum name="GL_TEXTURE_NUM_LEVELS_QCOM"/>
>+                <enum name="GL_TEXTURE_TARGET_QCOM"/>
>+                <enum name="GL_TEXTURE_OBJECT_VALID_QCOM"/>
>+                <enum name="GL_STATE_RESTORE"/>
>+                <command name="glExtGetTexturesQCOM"/>
>+                <command name="glExtGetBuffersQCOM"/>
>+                <command name="glExtGetRenderbuffersQCOM"/>
>+                <command name="glExtGetFramebuffersQCOM"/>
>+                <command name="glExtGetTexLevelParameterivQCOM"/>
>+                <command name="glExtTexObjectStateOverrideiQCOM"/>
>+                <command name="glExtGetTexSubImageQCOM"/>
>+                <command name="glExtGetBufferPointervQCOM"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_QCOM_extended_get2" supported="gles1|gles2">
>+            <require>
>+                <command name="glExtGetShadersQCOM"/>
>+                <command name="glExtGetProgramsQCOM"/>
>+                <command name="glExtIsProgramBinaryQCOM"/>
>+                <command name="glExtGetProgramBinarySourceQCOM"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_QCOM_framebuffer_foveated" supported="gles2">
>+            <require>
>+                <enum name="GL_FOVEATION_ENABLE_BIT_QCOM"/>
>+                <enum name="GL_FOVEATION_SCALED_BIN_METHOD_BIT_QCOM"/>
>+                <command name="glFramebufferFoveationConfigQCOM"/>
>+                <command name="glFramebufferFoveationParametersQCOM"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_QCOM_texture_foveated" supported="gles2">
>+            <require>
>+                <enum name="GL_FOVEATION_ENABLE_BIT_QCOM"/>
>+                <enum name="GL_FOVEATION_SCALED_BIN_METHOD_BIT_QCOM"/>
>+                <enum name="GL_TEXTURE_FOVEATED_FEATURE_BITS_QCOM"/>
>+                <enum name="GL_TEXTURE_FOVEATED_MIN_PIXEL_DENSITY_QCOM"/>
>+                <enum name="GL_TEXTURE_FOVEATED_FEATURE_QUERY_QCOM"/>
>+                <enum name="GL_TEXTURE_FOVEATED_NUM_FOCAL_POINTS_QUERY_QCOM"/>
>+                <enum name="GL_FRAMEBUFFER_INCOMPLETE_FOVEATION_QCOM"/>
>+                <command name="glTextureFoveationParametersQCOM"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_QCOM_perfmon_global_mode" supported="gles1|gles2">
>+            <require>
>+                <enum name="GL_PERFMON_GLOBAL_MODE_QCOM"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_QCOM_shader_framebuffer_fetch_noncoherent" supported="gles2">
>+            <require>
>+                <enum name="GL_FRAMEBUFFER_FETCH_NONCOHERENT_QCOM"/>
>+                <command name="glFramebufferFetchBarrierQCOM"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_QCOM_tiled_rendering" supported="gles1|gles2">
>+            <require>
>+                <enum name="GL_COLOR_BUFFER_BIT0_QCOM"/>
>+                <enum name="GL_COLOR_BUFFER_BIT1_QCOM"/>
>+                <enum name="GL_COLOR_BUFFER_BIT2_QCOM"/>
>+                <enum name="GL_COLOR_BUFFER_BIT3_QCOM"/>
>+                <enum name="GL_COLOR_BUFFER_BIT4_QCOM"/>
>+                <enum name="GL_COLOR_BUFFER_BIT5_QCOM"/>
>+                <enum name="GL_COLOR_BUFFER_BIT6_QCOM"/>
>+                <enum name="GL_COLOR_BUFFER_BIT7_QCOM"/>
>+                <enum name="GL_DEPTH_BUFFER_BIT0_QCOM"/>
>+                <enum name="GL_DEPTH_BUFFER_BIT1_QCOM"/>
>+                <enum name="GL_DEPTH_BUFFER_BIT2_QCOM"/>
>+                <enum name="GL_DEPTH_BUFFER_BIT3_QCOM"/>
>+                <enum name="GL_DEPTH_BUFFER_BIT4_QCOM"/>
>+                <enum name="GL_DEPTH_BUFFER_BIT5_QCOM"/>
>+                <enum name="GL_DEPTH_BUFFER_BIT6_QCOM"/>
>+                <enum name="GL_DEPTH_BUFFER_BIT7_QCOM"/>
>+                <enum name="GL_STENCIL_BUFFER_BIT0_QCOM"/>
>+                <enum name="GL_STENCIL_BUFFER_BIT1_QCOM"/>
>+                <enum name="GL_STENCIL_BUFFER_BIT2_QCOM"/>
>+                <enum name="GL_STENCIL_BUFFER_BIT3_QCOM"/>
>+                <enum name="GL_STENCIL_BUFFER_BIT4_QCOM"/>
>+                <enum name="GL_STENCIL_BUFFER_BIT5_QCOM"/>
>+                <enum name="GL_STENCIL_BUFFER_BIT6_QCOM"/>
>+                <enum name="GL_STENCIL_BUFFER_BIT7_QCOM"/>
>+                <enum name="GL_MULTISAMPLE_BUFFER_BIT0_QCOM"/>
>+                <enum name="GL_MULTISAMPLE_BUFFER_BIT1_QCOM"/>
>+                <enum name="GL_MULTISAMPLE_BUFFER_BIT2_QCOM"/>
>+                <enum name="GL_MULTISAMPLE_BUFFER_BIT3_QCOM"/>
>+                <enum name="GL_MULTISAMPLE_BUFFER_BIT4_QCOM"/>
>+                <enum name="GL_MULTISAMPLE_BUFFER_BIT5_QCOM"/>
>+                <enum name="GL_MULTISAMPLE_BUFFER_BIT6_QCOM"/>
>+                <enum name="GL_MULTISAMPLE_BUFFER_BIT7_QCOM"/>
>+                <command name="glStartTilingQCOM"/>
>+                <command name="glEndTilingQCOM"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_QCOM_writeonly_rendering" supported="gles1|gles2">
>+            <require>
>+                <enum name="GL_WRITEONLY_RENDERING_QCOM"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_REND_screen_coordinates" supported="gl">
>+            <require>
>+                <enum name="GL_SCREEN_COORDINATES_REND"/>
>+                <enum name="GL_INVERTED_SCREEN_W_REND"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_S3_s3tc" supported="gl">
>+            <require>
>+                <enum name="GL_RGB_S3TC"/>
>+                <enum name="GL_RGB4_S3TC"/>
>+                <enum name="GL_RGBA_S3TC"/>
>+                <enum name="GL_RGBA4_S3TC"/>
>+                <enum name="GL_RGBA_DXT5_S3TC"/>
>+                <enum name="GL_RGBA4_DXT5_S3TC"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_SGIS_detail_texture" supported="gl">
>+            <require>
>+                <enum name="GL_DETAIL_TEXTURE_2D_SGIS"/>
>+                <enum name="GL_DETAIL_TEXTURE_2D_BINDING_SGIS"/>
>+                <enum name="GL_LINEAR_DETAIL_SGIS"/>
>+                <enum name="GL_LINEAR_DETAIL_ALPHA_SGIS"/>
>+                <enum name="GL_LINEAR_DETAIL_COLOR_SGIS"/>
>+                <enum name="GL_DETAIL_TEXTURE_LEVEL_SGIS"/>
>+                <enum name="GL_DETAIL_TEXTURE_MODE_SGIS"/>
>+                <enum name="GL_DETAIL_TEXTURE_FUNC_POINTS_SGIS"/>
>+                <command name="glDetailTexFuncSGIS"/>
>+                <command name="glGetDetailTexFuncSGIS"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_SGIS_fog_function" supported="gl">
>+            <require>
>+                <enum name="GL_FOG_FUNC_SGIS"/>
>+                <enum name="GL_FOG_FUNC_POINTS_SGIS"/>
>+                <enum name="GL_MAX_FOG_FUNC_POINTS_SGIS"/>
>+                <command name="glFogFuncSGIS"/>
>+                <command name="glGetFogFuncSGIS"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_SGIS_generate_mipmap" supported="gl">
>+            <require>
>+                <enum name="GL_GENERATE_MIPMAP_SGIS"/>
>+                <enum name="GL_GENERATE_MIPMAP_HINT_SGIS"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_SGIS_multisample" supported="gl">
>+            <require>
>+                <enum name="GL_MULTISAMPLE_SGIS"/>
>+                <enum name="GL_SAMPLE_ALPHA_TO_MASK_SGIS"/>
>+                <enum name="GL_SAMPLE_ALPHA_TO_ONE_SGIS"/>
>+                <enum name="GL_SAMPLE_MASK_SGIS"/>
>+                <enum name="GL_1PASS_SGIS"/>
>+                <enum name="GL_2PASS_0_SGIS"/>
>+                <enum name="GL_2PASS_1_SGIS"/>
>+                <enum name="GL_4PASS_0_SGIS"/>
>+                <enum name="GL_4PASS_1_SGIS"/>
>+                <enum name="GL_4PASS_2_SGIS"/>
>+                <enum name="GL_4PASS_3_SGIS"/>
>+                <enum name="GL_SAMPLE_BUFFERS_SGIS"/>
>+                <enum name="GL_SAMPLES_SGIS"/>
>+                <enum name="GL_SAMPLE_MASK_VALUE_SGIS"/>
>+                <enum name="GL_SAMPLE_MASK_INVERT_SGIS"/>
>+                <enum name="GL_SAMPLE_PATTERN_SGIS"/>
>+                <command name="glSampleMaskSGIS"/>
>+                <command name="glSamplePatternSGIS"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_SGIS_pixel_texture" supported="gl">
>+            <require>
>+                <enum name="GL_PIXEL_TEXTURE_SGIS"/>
>+                <enum name="GL_PIXEL_FRAGMENT_RGB_SOURCE_SGIS"/>
>+                <enum name="GL_PIXEL_FRAGMENT_ALPHA_SOURCE_SGIS"/>
>+                <enum name="GL_PIXEL_GROUP_COLOR_SGIS"/>
>+                <command name="glPixelTexGenParameteriSGIS"/>
>+                <command name="glPixelTexGenParameterivSGIS"/>
>+                <command name="glPixelTexGenParameterfSGIS"/>
>+                <command name="glPixelTexGenParameterfvSGIS"/>
>+                <command name="glGetPixelTexGenParameterivSGIS"/>
>+                <command name="glGetPixelTexGenParameterfvSGIS"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_SGIS_point_line_texgen" supported="gl">
>+            <require>
>+                <enum name="GL_EYE_DISTANCE_TO_POINT_SGIS"/>
>+                <enum name="GL_OBJECT_DISTANCE_TO_POINT_SGIS"/>
>+                <enum name="GL_EYE_DISTANCE_TO_LINE_SGIS"/>
>+                <enum name="GL_OBJECT_DISTANCE_TO_LINE_SGIS"/>
>+                <enum name="GL_EYE_POINT_SGIS"/>
>+                <enum name="GL_OBJECT_POINT_SGIS"/>
>+                <enum name="GL_EYE_LINE_SGIS"/>
>+                <enum name="GL_OBJECT_LINE_SGIS"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_SGIS_point_parameters" supported="gl">
>+            <require>
>+                <enum name="GL_POINT_SIZE_MIN_SGIS"/>
>+                <enum name="GL_POINT_SIZE_MAX_SGIS"/>
>+                <enum name="GL_POINT_FADE_THRESHOLD_SIZE_SGIS"/>
>+                <enum name="GL_DISTANCE_ATTENUATION_SGIS"/>
>+                <command name="glPointParameterfSGIS"/>
>+                <command name="glPointParameterfvSGIS"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_SGIS_sharpen_texture" supported="gl">
>+            <require>
>+                <enum name="GL_LINEAR_SHARPEN_SGIS"/>
>+                <enum name="GL_LINEAR_SHARPEN_ALPHA_SGIS"/>
>+                <enum name="GL_LINEAR_SHARPEN_COLOR_SGIS"/>
>+                <enum name="GL_SHARPEN_TEXTURE_FUNC_POINTS_SGIS"/>
>+                <command name="glSharpenTexFuncSGIS"/>
>+                <command name="glGetSharpenTexFuncSGIS"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_SGIS_texture4D" supported="gl">
>+            <require>
>+                <enum name="GL_PACK_SKIP_VOLUMES_SGIS"/>
>+                <enum name="GL_PACK_IMAGE_DEPTH_SGIS"/>
>+                <enum name="GL_UNPACK_SKIP_VOLUMES_SGIS"/>
>+                <enum name="GL_UNPACK_IMAGE_DEPTH_SGIS"/>
>+                <enum name="GL_TEXTURE_4D_SGIS"/>
>+                <enum name="GL_PROXY_TEXTURE_4D_SGIS"/>
>+                <enum name="GL_TEXTURE_4DSIZE_SGIS"/>
>+                <enum name="GL_TEXTURE_WRAP_Q_SGIS"/>
>+                <enum name="GL_MAX_4D_TEXTURE_SIZE_SGIS"/>
>+                <enum name="GL_TEXTURE_4D_BINDING_SGIS"/>
>+                <command name="glTexImage4DSGIS"/>
>+                <command name="glTexSubImage4DSGIS"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_SGIS_texture_border_clamp" supported="gl">
>+            <require>
>+                <enum name="GL_CLAMP_TO_BORDER_SGIS"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_SGIS_texture_color_mask" supported="gl">
>+            <require>
>+                <enum name="GL_TEXTURE_COLOR_WRITEMASK_SGIS"/>
>+                <command name="glTextureColorMaskSGIS"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_SGIS_texture_edge_clamp" supported="gl">
>+            <require>
>+                <enum name="GL_CLAMP_TO_EDGE_SGIS"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_SGIS_texture_filter4" supported="gl">
>+            <require>
>+                <enum name="GL_FILTER4_SGIS"/>
>+                <enum name="GL_TEXTURE_FILTER4_SIZE_SGIS"/>
>+                <command name="glGetTexFilterFuncSGIS"/>
>+                <command name="glTexFilterFuncSGIS"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_SGIS_texture_lod" supported="gl">
>+            <require>
>+                <enum name="GL_TEXTURE_MIN_LOD_SGIS"/>
>+                <enum name="GL_TEXTURE_MAX_LOD_SGIS"/>
>+                <enum name="GL_TEXTURE_BASE_LEVEL_SGIS"/>
>+                <enum name="GL_TEXTURE_MAX_LEVEL_SGIS"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_SGIS_texture_select" supported="gl">
>+            <require>
>+                <enum name="GL_DUAL_ALPHA4_SGIS"/>
>+                <enum name="GL_DUAL_ALPHA8_SGIS"/>
>+                <enum name="GL_DUAL_ALPHA12_SGIS"/>
>+                <enum name="GL_DUAL_ALPHA16_SGIS"/>
>+                <enum name="GL_DUAL_LUMINANCE4_SGIS"/>
>+                <enum name="GL_DUAL_LUMINANCE8_SGIS"/>
>+                <enum name="GL_DUAL_LUMINANCE12_SGIS"/>
>+                <enum name="GL_DUAL_LUMINANCE16_SGIS"/>
>+                <enum name="GL_DUAL_INTENSITY4_SGIS"/>
>+                <enum name="GL_DUAL_INTENSITY8_SGIS"/>
>+                <enum name="GL_DUAL_INTENSITY12_SGIS"/>
>+                <enum name="GL_DUAL_INTENSITY16_SGIS"/>
>+                <enum name="GL_DUAL_LUMINANCE_ALPHA4_SGIS"/>
>+                <enum name="GL_DUAL_LUMINANCE_ALPHA8_SGIS"/>
>+                <enum name="GL_QUAD_ALPHA4_SGIS"/>
>+                <enum name="GL_QUAD_ALPHA8_SGIS"/>
>+                <enum name="GL_QUAD_LUMINANCE4_SGIS"/>
>+                <enum name="GL_QUAD_LUMINANCE8_SGIS"/>
>+                <enum name="GL_QUAD_INTENSITY4_SGIS"/>
>+                <enum name="GL_QUAD_INTENSITY8_SGIS"/>
>+                <enum name="GL_DUAL_TEXTURE_SELECT_SGIS"/>
>+                <enum name="GL_QUAD_TEXTURE_SELECT_SGIS"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_SGIX_async" supported="gl">
>+            <require>
>+                <enum name="GL_ASYNC_MARKER_SGIX"/>
>+                <command name="glAsyncMarkerSGIX"/>
>+                <command name="glFinishAsyncSGIX"/>
>+                <command name="glPollAsyncSGIX"/>
>+                <command name="glGenAsyncMarkersSGIX"/>
>+                <command name="glDeleteAsyncMarkersSGIX"/>
>+                <command name="glIsAsyncMarkerSGIX"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_SGIX_async_histogram" supported="gl">
>+            <require>
>+                <enum name="GL_ASYNC_HISTOGRAM_SGIX"/>
>+                <enum name="GL_MAX_ASYNC_HISTOGRAM_SGIX"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_SGIX_async_pixel" supported="gl">
>+            <require>
>+                <enum name="GL_ASYNC_TEX_IMAGE_SGIX"/>
>+                <enum name="GL_ASYNC_DRAW_PIXELS_SGIX"/>
>+                <enum name="GL_ASYNC_READ_PIXELS_SGIX"/>
>+                <enum name="GL_MAX_ASYNC_TEX_IMAGE_SGIX"/>
>+                <enum name="GL_MAX_ASYNC_DRAW_PIXELS_SGIX"/>
>+                <enum name="GL_MAX_ASYNC_READ_PIXELS_SGIX"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_SGIX_blend_alpha_minmax" supported="gl">
>+            <require>
>+                <enum name="GL_ALPHA_MIN_SGIX"/>
>+                <enum name="GL_ALPHA_MAX_SGIX"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_SGIX_calligraphic_fragment" supported="gl">
>+            <require>
>+                <enum name="GL_CALLIGRAPHIC_FRAGMENT_SGIX"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_SGIX_clipmap" supported="gl">
>+            <require>
>+                <enum name="GL_LINEAR_CLIPMAP_LINEAR_SGIX"/>
>+                <enum name="GL_TEXTURE_CLIPMAP_CENTER_SGIX"/>
>+                <enum name="GL_TEXTURE_CLIPMAP_FRAME_SGIX"/>
>+                <enum name="GL_TEXTURE_CLIPMAP_OFFSET_SGIX"/>
>+                <enum name="GL_TEXTURE_CLIPMAP_VIRTUAL_DEPTH_SGIX"/>
>+                <enum name="GL_TEXTURE_CLIPMAP_LOD_OFFSET_SGIX"/>
>+                <enum name="GL_TEXTURE_CLIPMAP_DEPTH_SGIX"/>
>+                <enum name="GL_MAX_CLIPMAP_DEPTH_SGIX"/>
>+                <enum name="GL_MAX_CLIPMAP_VIRTUAL_DEPTH_SGIX"/>
>+                <enum name="GL_NEAREST_CLIPMAP_NEAREST_SGIX"/>
>+                <enum name="GL_NEAREST_CLIPMAP_LINEAR_SGIX"/>
>+                <enum name="GL_LINEAR_CLIPMAP_NEAREST_SGIX"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_SGIX_convolution_accuracy" supported="gl">
>+            <require>
>+                <enum name="GL_CONVOLUTION_HINT_SGIX"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_SGIX_depth_pass_instrument" supported="gl"/>
>+        <extension name="GL_SGIX_depth_texture" supported="gl">
>+            <require>
>+                <enum name="GL_DEPTH_COMPONENT16_SGIX"/>
>+                <enum name="GL_DEPTH_COMPONENT24_SGIX"/>
>+                <enum name="GL_DEPTH_COMPONENT32_SGIX"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_SGIX_flush_raster" supported="gl">
>+            <require>
>+                <command name="glFlushRasterSGIX"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_SGIX_fog_offset" supported="gl">
>+            <require>
>+                <enum name="GL_FOG_OFFSET_SGIX"/>
>+                <enum name="GL_FOG_OFFSET_VALUE_SGIX"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_SGIX_fragment_lighting" supported="gl" comment="Incomplete extension">
>+            <require>
>+                <enum name="GL_FRAGMENT_LIGHTING_SGIX"/>
>+                <enum name="GL_FRAGMENT_COLOR_MATERIAL_SGIX"/>
>+                <enum name="GL_FRAGMENT_COLOR_MATERIAL_FACE_SGIX"/>
>+                <enum name="GL_FRAGMENT_COLOR_MATERIAL_PARAMETER_SGIX"/>
>+                <enum name="GL_MAX_FRAGMENT_LIGHTS_SGIX"/>
>+                <enum name="GL_MAX_ACTIVE_LIGHTS_SGIX"/>
>+                <enum name="GL_CURRENT_RASTER_NORMAL_SGIX"/>
>+                <enum name="GL_LIGHT_ENV_MODE_SGIX"/>
>+                <enum name="GL_FRAGMENT_LIGHT_MODEL_LOCAL_VIEWER_SGIX"/>
>+                <enum name="GL_FRAGMENT_LIGHT_MODEL_TWO_SIDE_SGIX"/>
>+                <enum name="GL_FRAGMENT_LIGHT_MODEL_AMBIENT_SGIX"/>
>+                <enum name="GL_FRAGMENT_LIGHT_MODEL_NORMAL_INTERPOLATION_SGIX"/>
>+                <enum name="GL_FRAGMENT_LIGHT0_SGIX"/>
>+                <enum name="GL_FRAGMENT_LIGHT1_SGIX"/>
>+                <enum name="GL_FRAGMENT_LIGHT2_SGIX"/>
>+                <enum name="GL_FRAGMENT_LIGHT3_SGIX"/>
>+                <enum name="GL_FRAGMENT_LIGHT4_SGIX"/>
>+                <enum name="GL_FRAGMENT_LIGHT5_SGIX"/>
>+                <enum name="GL_FRAGMENT_LIGHT6_SGIX"/>
>+                <enum name="GL_FRAGMENT_LIGHT7_SGIX"/>
>+                <command name="glFragmentColorMaterialSGIX"/>
>+                <command name="glFragmentLightfSGIX"/>
>+                <command name="glFragmentLightfvSGIX"/>
>+                <command name="glFragmentLightiSGIX"/>
>+                <command name="glFragmentLightivSGIX"/>
>+                <command name="glFragmentLightModelfSGIX"/>
>+                <command name="glFragmentLightModelfvSGIX"/>
>+                <command name="glFragmentLightModeliSGIX"/>
>+                <command name="glFragmentLightModelivSGIX"/>
>+                <command name="glFragmentMaterialfSGIX"/>
>+                <command name="glFragmentMaterialfvSGIX"/>
>+                <command name="glFragmentMaterialiSGIX"/>
>+                <command name="glFragmentMaterialivSGIX"/>
>+                <command name="glGetFragmentLightfvSGIX"/>
>+                <command name="glGetFragmentLightivSGIX"/>
>+                <command name="glGetFragmentMaterialfvSGIX"/>
>+                <command name="glGetFragmentMaterialivSGIX"/>
>+                <command name="glLightEnviSGIX"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_SGIX_framezoom" supported="gl">
>+            <require>
>+                <enum name="GL_FRAMEZOOM_SGIX"/>
>+                <enum name="GL_FRAMEZOOM_FACTOR_SGIX"/>
>+                <enum name="GL_MAX_FRAMEZOOM_FACTOR_SGIX"/>
>+                <command name="glFrameZoomSGIX"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_SGIX_igloo_interface" supported="gl">
>+            <require>
>+                <command name="glIglooInterfaceSGIX"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_SGIX_instruments" supported="gl">
>+            <require>
>+                <enum name="GL_INSTRUMENT_BUFFER_POINTER_SGIX"/>
>+                <enum name="GL_INSTRUMENT_MEASUREMENTS_SGIX"/>
>+                <command name="glGetInstrumentsSGIX"/>
>+                <command name="glInstrumentsBufferSGIX"/>
>+                <command name="glPollInstrumentsSGIX"/>
>+                <command name="glReadInstrumentsSGIX"/>
>+                <command name="glStartInstrumentsSGIX"/>
>+                <command name="glStopInstrumentsSGIX"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_SGIX_interlace" supported="gl">
>+            <require>
>+                <enum name="GL_INTERLACE_SGIX"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_SGIX_ir_instrument1" supported="gl">
>+            <require>
>+                <enum name="GL_IR_INSTRUMENT1_SGIX"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_SGIX_list_priority" supported="gl">
>+            <require>
>+                <enum name="GL_LIST_PRIORITY_SGIX"/>
>+                <command name="glGetListParameterfvSGIX"/>
>+                <command name="glGetListParameterivSGIX"/>
>+                <command name="glListParameterfSGIX"/>
>+                <command name="glListParameterfvSGIX"/>
>+                <command name="glListParameteriSGIX"/>
>+                <command name="glListParameterivSGIX"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_SGIX_pixel_texture" supported="gl">
>+            <require>
>+                <enum name="GL_PIXEL_TEX_GEN_SGIX"/>
>+                <enum name="GL_PIXEL_TEX_GEN_MODE_SGIX"/>
>+                <command name="glPixelTexGenSGIX"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_SGIX_pixel_tiles" supported="gl">
>+            <require>
>+                <enum name="GL_PIXEL_TILE_BEST_ALIGNMENT_SGIX"/>
>+                <enum name="GL_PIXEL_TILE_CACHE_INCREMENT_SGIX"/>
>+                <enum name="GL_PIXEL_TILE_WIDTH_SGIX"/>
>+                <enum name="GL_PIXEL_TILE_HEIGHT_SGIX"/>
>+                <enum name="GL_PIXEL_TILE_GRID_WIDTH_SGIX"/>
>+                <enum name="GL_PIXEL_TILE_GRID_HEIGHT_SGIX"/>
>+                <enum name="GL_PIXEL_TILE_GRID_DEPTH_SGIX"/>
>+                <enum name="GL_PIXEL_TILE_CACHE_SIZE_SGIX"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_SGIX_polynomial_ffd" supported="gl">
>+            <require>
>+                <enum name="GL_TEXTURE_DEFORMATION_BIT_SGIX"/>
>+                <enum name="GL_GEOMETRY_DEFORMATION_BIT_SGIX"/>
>+                <enum name="GL_GEOMETRY_DEFORMATION_SGIX"/>
>+                <enum name="GL_TEXTURE_DEFORMATION_SGIX"/>
>+                <enum name="GL_DEFORMATIONS_MASK_SGIX"/>
>+                <enum name="GL_MAX_DEFORMATION_ORDER_SGIX"/>
>+                <command name="glDeformationMap3dSGIX"/>
>+                <command name="glDeformationMap3fSGIX"/>
>+                <command name="glDeformSGIX"/>
>+                <command name="glLoadIdentityDeformationMapSGIX"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_SGIX_reference_plane" supported="gl">
>+            <require>
>+                <enum name="GL_REFERENCE_PLANE_SGIX"/>
>+                <enum name="GL_REFERENCE_PLANE_EQUATION_SGIX"/>
>+                <command name="glReferencePlaneSGIX"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_SGIX_resample" supported="gl">
>+            <require>
>+                <enum name="GL_PACK_RESAMPLE_SGIX"/>
>+                <enum name="GL_UNPACK_RESAMPLE_SGIX"/>
>+                <enum name="GL_RESAMPLE_REPLICATE_SGIX"/>
>+                <enum name="GL_RESAMPLE_ZERO_FILL_SGIX"/>
>+                <enum name="GL_RESAMPLE_DECIMATE_SGIX"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_SGIX_scalebias_hint" supported="gl">
>+            <require>
>+                <enum name="GL_SCALEBIAS_HINT_SGIX"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_SGIX_shadow" supported="gl">
>+            <require>
>+                <enum name="GL_TEXTURE_COMPARE_SGIX"/>
>+                <enum name="GL_TEXTURE_COMPARE_OPERATOR_SGIX"/>
>+                <enum name="GL_TEXTURE_LEQUAL_R_SGIX"/>
>+                <enum name="GL_TEXTURE_GEQUAL_R_SGIX"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_SGIX_shadow_ambient" supported="gl">
>+            <require>
>+                <enum name="GL_SHADOW_AMBIENT_SGIX"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_SGIX_sprite" supported="gl">
>+            <require>
>+                <enum name="GL_SPRITE_SGIX"/>
>+                <enum name="GL_SPRITE_MODE_SGIX"/>
>+                <enum name="GL_SPRITE_AXIS_SGIX"/>
>+                <enum name="GL_SPRITE_TRANSLATION_SGIX"/>
>+                <enum name="GL_SPRITE_AXIAL_SGIX"/>
>+                <enum name="GL_SPRITE_OBJECT_ALIGNED_SGIX"/>
>+                <enum name="GL_SPRITE_EYE_ALIGNED_SGIX"/>
>+                <command name="glSpriteParameterfSGIX"/>
>+                <command name="glSpriteParameterfvSGIX"/>
>+                <command name="glSpriteParameteriSGIX"/>
>+                <command name="glSpriteParameterivSGIX"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_SGIX_subsample" supported="gl">
>+            <require>
>+                <enum name="GL_PACK_SUBSAMPLE_RATE_SGIX"/>
>+                <enum name="GL_UNPACK_SUBSAMPLE_RATE_SGIX"/>
>+                <enum name="GL_PIXEL_SUBSAMPLE_4444_SGIX"/>
>+                <enum name="GL_PIXEL_SUBSAMPLE_2424_SGIX"/>
>+                <enum name="GL_PIXEL_SUBSAMPLE_4242_SGIX"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_SGIX_tag_sample_buffer" supported="gl">
>+            <require>
>+                <command name="glTagSampleBufferSGIX"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_SGIX_texture_add_env" supported="gl">
>+            <require>
>+                <enum name="GL_TEXTURE_ENV_BIAS_SGIX"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_SGIX_texture_coordinate_clamp" supported="gl">
>+            <require>
>+                <enum name="GL_TEXTURE_MAX_CLAMP_S_SGIX"/>
>+                <enum name="GL_TEXTURE_MAX_CLAMP_T_SGIX"/>
>+                <enum name="GL_TEXTURE_MAX_CLAMP_R_SGIX"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_SGIX_texture_lod_bias" supported="gl">
>+            <require>
>+                <enum name="GL_TEXTURE_LOD_BIAS_S_SGIX"/>
>+                <enum name="GL_TEXTURE_LOD_BIAS_T_SGIX"/>
>+                <enum name="GL_TEXTURE_LOD_BIAS_R_SGIX"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_SGIX_texture_multi_buffer" supported="gl">
>+            <require>
>+                <enum name="GL_TEXTURE_MULTI_BUFFER_HINT_SGIX"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_SGIX_texture_scale_bias" supported="gl">
>+            <require>
>+                <enum name="GL_POST_TEXTURE_FILTER_BIAS_SGIX"/>
>+                <enum name="GL_POST_TEXTURE_FILTER_SCALE_SGIX"/>
>+                <enum name="GL_POST_TEXTURE_FILTER_BIAS_RANGE_SGIX"/>
>+                <enum name="GL_POST_TEXTURE_FILTER_SCALE_RANGE_SGIX"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_SGIX_vertex_preclip" supported="gl">
>+            <require>
>+                <enum name="GL_VERTEX_PRECLIP_SGIX"/>
>+                <enum name="GL_VERTEX_PRECLIP_HINT_SGIX"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_SGIX_ycrcb" supported="gl">
>+            <require>
>+                <enum name="GL_YCRCB_422_SGIX"/>
>+                <enum name="GL_YCRCB_444_SGIX"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_SGIX_ycrcb_subsample" supported="gl"/>
>+        <extension name="GL_SGIX_ycrcba" supported="gl">
>+            <require>
>+                <enum name="GL_YCRCB_SGIX"/>
>+                <enum name="GL_YCRCBA_SGIX"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_SGI_color_matrix" supported="gl">
>+            <require>
>+                <enum name="GL_COLOR_MATRIX_SGI"/>
>+                <enum name="GL_COLOR_MATRIX_STACK_DEPTH_SGI"/>
>+                <enum name="GL_MAX_COLOR_MATRIX_STACK_DEPTH_SGI"/>
>+                <enum name="GL_POST_COLOR_MATRIX_RED_SCALE_SGI"/>
>+                <enum name="GL_POST_COLOR_MATRIX_GREEN_SCALE_SGI"/>
>+                <enum name="GL_POST_COLOR_MATRIX_BLUE_SCALE_SGI"/>
>+                <enum name="GL_POST_COLOR_MATRIX_ALPHA_SCALE_SGI"/>
>+                <enum name="GL_POST_COLOR_MATRIX_RED_BIAS_SGI"/>
>+                <enum name="GL_POST_COLOR_MATRIX_GREEN_BIAS_SGI"/>
>+                <enum name="GL_POST_COLOR_MATRIX_BLUE_BIAS_SGI"/>
>+                <enum name="GL_POST_COLOR_MATRIX_ALPHA_BIAS_SGI"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_SGI_color_table" supported="gl">
>+            <require>
>+                <enum name="GL_COLOR_TABLE_SGI"/>
>+                <enum name="GL_POST_CONVOLUTION_COLOR_TABLE_SGI"/>
>+                <enum name="GL_POST_COLOR_MATRIX_COLOR_TABLE_SGI"/>
>+                <enum name="GL_PROXY_COLOR_TABLE_SGI"/>
>+                <enum name="GL_PROXY_POST_CONVOLUTION_COLOR_TABLE_SGI"/>
>+                <enum name="GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE_SGI"/>
>+                <enum name="GL_COLOR_TABLE_SCALE_SGI"/>
>+                <enum name="GL_COLOR_TABLE_BIAS_SGI"/>
>+                <enum name="GL_COLOR_TABLE_FORMAT_SGI"/>
>+                <enum name="GL_COLOR_TABLE_WIDTH_SGI"/>
>+                <enum name="GL_COLOR_TABLE_RED_SIZE_SGI"/>
>+                <enum name="GL_COLOR_TABLE_GREEN_SIZE_SGI"/>
>+                <enum name="GL_COLOR_TABLE_BLUE_SIZE_SGI"/>
>+                <enum name="GL_COLOR_TABLE_ALPHA_SIZE_SGI"/>
>+                <enum name="GL_COLOR_TABLE_LUMINANCE_SIZE_SGI"/>
>+                <enum name="GL_COLOR_TABLE_INTENSITY_SIZE_SGI"/>
>+                <command name="glColorTableSGI"/>
>+                <command name="glColorTableParameterfvSGI"/>
>+                <command name="glColorTableParameterivSGI"/>
>+                <command name="glCopyColorTableSGI"/>
>+                <command name="glGetColorTableSGI"/>
>+                <command name="glGetColorTableParameterfvSGI"/>
>+                <command name="glGetColorTableParameterivSGI"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_SGI_texture_color_table" supported="gl">
>+            <require>
>+                <enum name="GL_TEXTURE_COLOR_TABLE_SGI"/>
>+                <enum name="GL_PROXY_TEXTURE_COLOR_TABLE_SGI"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_SUNX_constant_data" supported="gl">
>+            <require>
>+                <enum name="GL_UNPACK_CONSTANT_DATA_SUNX"/>
>+                <enum name="GL_TEXTURE_CONSTANT_DATA_SUNX"/>
>+                <command name="glFinishTextureSUNX"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_SUN_convolution_border_modes" supported="gl">
>+            <require>
>+                <enum name="GL_WRAP_BORDER_SUN"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_SUN_global_alpha" supported="gl">
>+            <require>
>+                <enum name="GL_GLOBAL_ALPHA_SUN"/>
>+                <enum name="GL_GLOBAL_ALPHA_FACTOR_SUN"/>
>+                <command name="glGlobalAlphaFactorbSUN"/>
>+                <command name="glGlobalAlphaFactorsSUN"/>
>+                <command name="glGlobalAlphaFactoriSUN"/>
>+                <command name="glGlobalAlphaFactorfSUN"/>
>+                <command name="glGlobalAlphaFactordSUN"/>
>+                <command name="glGlobalAlphaFactorubSUN"/>
>+                <command name="glGlobalAlphaFactorusSUN"/>
>+                <command name="glGlobalAlphaFactoruiSUN"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_SUN_mesh_array" supported="gl">
>+            <require>
>+                <enum name="GL_QUAD_MESH_SUN"/>
>+                <enum name="GL_TRIANGLE_MESH_SUN"/>
>+                <command name="glDrawMeshArraysSUN"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_SUN_slice_accum" supported="gl">
>+            <require>
>+                <enum name="GL_SLICE_ACCUM_SUN"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_SUN_triangle_list" supported="gl">
>+            <require>
>+                <enum name="GL_RESTART_SUN"/>
>+                <enum name="GL_REPLACE_MIDDLE_SUN"/>
>+                <enum name="GL_REPLACE_OLDEST_SUN"/>
>+                <enum name="GL_TRIANGLE_LIST_SUN"/>
>+                <enum name="GL_REPLACEMENT_CODE_SUN"/>
>+                <enum name="GL_REPLACEMENT_CODE_ARRAY_SUN"/>
>+                <enum name="GL_REPLACEMENT_CODE_ARRAY_TYPE_SUN"/>
>+                <enum name="GL_REPLACEMENT_CODE_ARRAY_STRIDE_SUN"/>
>+                <enum name="GL_REPLACEMENT_CODE_ARRAY_POINTER_SUN"/>
>+                <enum name="GL_R1UI_V3F_SUN"/>
>+                <enum name="GL_R1UI_C4UB_V3F_SUN"/>
>+                <enum name="GL_R1UI_C3F_V3F_SUN"/>
>+                <enum name="GL_R1UI_N3F_V3F_SUN"/>
>+                <enum name="GL_R1UI_C4F_N3F_V3F_SUN"/>
>+                <enum name="GL_R1UI_T2F_V3F_SUN"/>
>+                <enum name="GL_R1UI_T2F_N3F_V3F_SUN"/>
>+                <enum name="GL_R1UI_T2F_C4F_N3F_V3F_SUN"/>
>+                <command name="glReplacementCodeuiSUN"/>
>+                <command name="glReplacementCodeusSUN"/>
>+                <command name="glReplacementCodeubSUN"/>
>+                <command name="glReplacementCodeuivSUN"/>
>+                <command name="glReplacementCodeusvSUN"/>
>+                <command name="glReplacementCodeubvSUN"/>
>+                <command name="glReplacementCodePointerSUN"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_SUN_vertex" supported="gl">
>+            <require>
>+                <command name="glColor4ubVertex2fSUN"/>
>+                <command name="glColor4ubVertex2fvSUN"/>
>+                <command name="glColor4ubVertex3fSUN"/>
>+                <command name="glColor4ubVertex3fvSUN"/>
>+                <command name="glColor3fVertex3fSUN"/>
>+                <command name="glColor3fVertex3fvSUN"/>
>+                <command name="glNormal3fVertex3fSUN"/>
>+                <command name="glNormal3fVertex3fvSUN"/>
>+                <command name="glColor4fNormal3fVertex3fSUN"/>
>+                <command name="glColor4fNormal3fVertex3fvSUN"/>
>+                <command name="glTexCoord2fVertex3fSUN"/>
>+                <command name="glTexCoord2fVertex3fvSUN"/>
>+                <command name="glTexCoord4fVertex4fSUN"/>
>+                <command name="glTexCoord4fVertex4fvSUN"/>
>+                <command name="glTexCoord2fColor4ubVertex3fSUN"/>
>+                <command name="glTexCoord2fColor4ubVertex3fvSUN"/>
>+                <command name="glTexCoord2fColor3fVertex3fSUN"/>
>+                <command name="glTexCoord2fColor3fVertex3fvSUN"/>
>+                <command name="glTexCoord2fNormal3fVertex3fSUN"/>
>+                <command name="glTexCoord2fNormal3fVertex3fvSUN"/>
>+                <command name="glTexCoord2fColor4fNormal3fVertex3fSUN"/>
>+                <command name="glTexCoord2fColor4fNormal3fVertex3fvSUN"/>
>+                <command name="glTexCoord4fColor4fNormal3fVertex4fSUN"/>
>+                <command name="glTexCoord4fColor4fNormal3fVertex4fvSUN"/>
>+                <command name="glReplacementCodeuiVertex3fSUN"/>
>+                <command name="glReplacementCodeuiVertex3fvSUN"/>
>+                <command name="glReplacementCodeuiColor4ubVertex3fSUN"/>
>+                <command name="glReplacementCodeuiColor4ubVertex3fvSUN"/>
>+                <command name="glReplacementCodeuiColor3fVertex3fSUN"/>
>+                <command name="glReplacementCodeuiColor3fVertex3fvSUN"/>
>+                <command name="glReplacementCodeuiNormal3fVertex3fSUN"/>
>+                <command name="glReplacementCodeuiNormal3fVertex3fvSUN"/>
>+                <command name="glReplacementCodeuiColor4fNormal3fVertex3fSUN"/>
>+                <command name="glReplacementCodeuiColor4fNormal3fVertex3fvSUN"/>
>+                <command name="glReplacementCodeuiTexCoord2fVertex3fSUN"/>
>+                <command name="glReplacementCodeuiTexCoord2fVertex3fvSUN"/>
>+                <command name="glReplacementCodeuiTexCoord2fNormal3fVertex3fSUN"/>
>+                <command name="glReplacementCodeuiTexCoord2fNormal3fVertex3fvSUN"/>
>+                <command name="glReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fSUN"/>
>+                <command name="glReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fvSUN"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_VIV_shader_binary" supported="gles2">
>+            <require>
>+                <enum name="GL_SHADER_BINARY_VIV"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_WIN_phong_shading" supported="gl">
>+            <require>
>+                <enum name="GL_PHONG_WIN"/>
>+                <enum name="GL_PHONG_HINT_WIN"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_WIN_specular_fog" supported="gl">
>+            <require>
>+                <enum name="GL_FOG_SPECULAR_TEXTURE_WIN"/>
>+            </require>
>+        </extension>
>+    </extensions>
>+</registry>
>diff --git a/Source/ThirdParty/ANGLE/scripts/gl_angle_ext.xml b/Source/ThirdParty/ANGLE/scripts/gl_angle_ext.xml
>new file mode 100644
>index 00000000000..db7a7c7daef
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/scripts/gl_angle_ext.xml
>@@ -0,0 +1,1074 @@
>+<?xml version="1.0" encoding="UTF-8"?>
>+<registry>
>+    <comment>
>+    Copyright 2018 The ANGLE Project Authors. All rights reserved.
>+    Use of this source code is governed by a BSD-style license that can be
>+    found in the LICENSE file.
>+
>+    gl_angle_ext.xml
>+        Includes data used to auto-generate ANGLE classes.
>+    </comment>
>+    
>+    <commands namespace="GL">
>+            <command>
>+                <proto>void <name>glBindUniformLocationCHROMIUM</name></proto>
>+                <param><ptype>GLuint</ptype> <name>program</name></param>
>+                <param><ptype>GLint</ptype> <name>location</name></param>
>+                <param><ptype>const GLchar*</ptype> <name>name</name></param>
>+            </command>
>+            <command>
>+                <proto>void <name>glCoverageModulationCHROMIUM</name></proto>
>+                <param><ptype>GLenum</ptype> <name>components</name></param>
>+            </command>
>+            <command>
>+                <proto>void <name>glMatrixLoadfCHROMIUM</name></proto>
>+                <param><ptype>GLenum</ptype> <name>matrixMode</name></param>
>+                <param><ptype>const GLfloat *</ptype> <name>matrix</name></param>
>+            </command>
>+            <command>
>+                <proto>void <name>glMatrixLoadIdentityCHROMIUM</name></proto>
>+                <param><ptype>GLenum</ptype> <name>matrixMode</name></param>
>+            </command>
>+            <command>
>+                <proto>GLuint <name>glGenPathsCHROMIUM</name></proto>
>+                <param><ptype>GLsizei</ptype> <name>range</name></param>
>+            </command>
>+            <command>
>+                <proto>void <name>glDeletePathsCHROMIUM</name></proto>
>+                <param><ptype>GLuint</ptype> <name>first</name></param>
>+                <param><ptype>GLsizei</ptype> <name>range</name></param>
>+            </command>
>+            <command>
>+                <proto>GLboolean <name>glIsPathCHROMIUM</name></proto>
>+                <param><ptype>GLuint</ptype> <name>path</name></param>
>+            </command>
>+            <command>
>+                <proto>void <name>glPathCommandsCHROMIUM</name></proto>
>+                <param><ptype>GLuint</ptype> <name>path</name></param>
>+                <param><ptype>GLsizei</ptype> <name>numCommands</name></param>
>+                <param><ptype>const GLubyte *</ptype> <name>commands</name></param>
>+                <param><ptype>GLsizei</ptype> <name>numCoords</name></param>
>+                <param><ptype>GLenum</ptype> <name>coordType</name></param>
>+                <param><ptype>const void*</ptype> <name>coords</name></param>
>+            </command>
>+            <command>
>+                <proto>void <name>glPathParameterfCHROMIUM</name></proto>
>+                <param><ptype>GLuint</ptype> <name>path</name></param>
>+                <param><ptype>GLenum</ptype> <name>pname</name></param>
>+                <param><ptype>GLfloat</ptype> <name>value</name></param>
>+            </command>
>+            <command>
>+                <proto>void <name>glPathParameteriCHROMIUM</name></proto>
>+                <param><ptype>GLuint</ptype> <name>path</name></param>
>+                <param><ptype>GLenum</ptype> <name>pname</name></param>
>+                <param><ptype>GLint</ptype> <name>value</name></param>
>+            </command>
>+            <command>
>+                <proto>void <name>glGetPathParameterfvCHROMIUM</name></proto>
>+                <param><ptype>GLuint</ptype> <name>path</name></param>
>+                <param><ptype>GLenum</ptype> <name>pname</name></param>
>+                <param><ptype>GLfloat *</ptype> <name>value</name></param>
>+            </command>
>+            <command>
>+                <proto>void <name>glGetPathParameterivCHROMIUM</name></proto>
>+                <param><ptype>GLuint</ptype> <name>path</name></param>
>+                <param><ptype>GLenum</ptype> <name>pname</name></param>
>+                <param><ptype>GLint *</ptype> <name>value</name></param>
>+            </command>
>+            <command>
>+                <proto>void <name>glPathStencilFuncCHROMIUM</name></proto>
>+                <param><ptype>GLenum</ptype> <name>func</name></param>
>+                <param><ptype>GLint</ptype> <name>ref</name></param>
>+                <param><ptype>GLuint</ptype> <name>mask</name></param>
>+            </command>
>+            <command>
>+                <proto>void <name>glStencilFillPathCHROMIUM</name></proto>
>+                <param><ptype>GLuint</ptype> <name>path</name></param>
>+                <param><ptype>GLenum</ptype> <name>fillMode</name></param>
>+                <param><ptype>GLuint</ptype> <name>mask</name></param>
>+            </command>
>+            <command>
>+                <proto>void <name>glStencilStrokePathCHROMIUM</name></proto>
>+                <param><ptype>GLuint</ptype> <name>path</name></param>
>+                <param><ptype>GLint</ptype> <name>reference</name></param>
>+                <param><ptype>GLuint</ptype> <name>mask</name></param>
>+            </command>
>+            <command>
>+                <proto>void <name>glCoverFillPathCHROMIUM</name></proto>
>+                <param><ptype>GLuint</ptype> <name>path</name></param>
>+                <param><ptype>GLenum</ptype> <name>coverMode</name></param>
>+            </command>
>+            <command>
>+                <proto>void <name>glCoverStrokePathCHROMIUM</name></proto>
>+                <param><ptype>GLuint</ptype> <name>path</name></param>
>+                <param><ptype>GLenum</ptype> <name>coverMode</name></param>
>+            </command>
>+            <command>
>+                <proto>void <name>glStencilThenCoverFillPathCHROMIUM</name></proto>
>+                <param><ptype>GLuint</ptype> <name>path</name></param>
>+                <param><ptype>GLenum</ptype> <name>fillMode</name></param>
>+                <param><ptype>GLuint</ptype> <name>mask</name></param>
>+                <param><ptype>GLenum</ptype> <name>coverMode</name></param>
>+            </command>
>+            <command>
>+                <proto>void <name>glStencilThenCoverStrokePathCHROMIUM</name></proto>
>+                <param><ptype>GLuint</ptype> <name>path</name></param>
>+                <param><ptype>GLint</ptype> <name>reference</name></param>
>+                <param><ptype>GLuint</ptype> <name>mask</name></param>
>+                <param><ptype>GLenum</ptype> <name>coverMode</name></param>
>+            </command>
>+            <command>
>+                <proto>void <name>glCoverFillPathInstancedCHROMIUM</name></proto>
>+                <param><ptype>GLsizei</ptype> <name>numPath</name></param>
>+                <param><ptype>GLenum</ptype> <name>pathNameType</name></param>
>+                <param><ptype>const void *</ptype> <name>paths</name></param>
>+                <param><ptype>GLuint</ptype> <name>pathBase</name></param>
>+                <param><ptype>GLenum</ptype> <name>coverMode</name></param>
>+                <param><ptype>GLenum</ptype> <name>transformType</name></param>
>+                <param><ptype>const GLfloat *</ptype> <name>transformValues</name></param>
>+            </command>
>+            <command>
>+                <proto>void <name>glCoverStrokePathInstancedCHROMIUM</name></proto>
>+                <param><ptype>GLsizei</ptype> <name>numPath</name></param>
>+                <param><ptype>GLenum</ptype> <name>pathNameType</name></param>
>+                <param><ptype>const void *</ptype> <name>paths</name></param>
>+                <param><ptype>GLuint</ptype> <name>pathBase</name></param>
>+                <param><ptype>GLenum</ptype> <name>coverMode</name></param>
>+                <param><ptype>GLenum</ptype> <name>transformType</name></param>
>+                <param><ptype>const GLfloat *</ptype> <name>transformValues</name></param>
>+            </command>
>+            <command>
>+                <proto>void <name>glStencilStrokePathInstancedCHROMIUM</name></proto>
>+                <param><ptype>GLsizei</ptype> <name>numPath</name></param>
>+                <param><ptype>GLenum</ptype> <name>pathNameType</name></param>
>+                <param><ptype>const void *</ptype> <name>paths</name></param>
>+                <param><ptype>GLuint</ptype> <name>pathBase</name></param>
>+                <param><ptype>GLint</ptype> <name>reference</name></param>
>+                <param><ptype>GLuint</ptype> <name>mask</name></param>
>+                <param><ptype>GLenum</ptype> <name>transformType</name></param>
>+                <param><ptype>const GLfloat *</ptype> <name>transformValues</name></param>
>+            </command>
>+            <command>
>+                <proto>void <name>glStencilFillPathInstancedCHROMIUM</name></proto>
>+                <param><ptype>GLsizei</ptype> <name>numPaths</name></param>
>+                <param><ptype>GLenum</ptype> <name>pathNameType</name></param>
>+                <param><ptype>const void *</ptype> <name>paths</name></param>
>+                <param><ptype>GLuint</ptype> <name>pathBase</name></param>
>+                <param><ptype>GLenum</ptype> <name>fillMode</name></param>
>+                <param><ptype>GLuint</ptype> <name>mask</name></param>
>+                <param><ptype>GLenum</ptype> <name>transformType</name></param>
>+                <param><ptype>const GLfloat *</ptype> <name>transformValues</name></param>
>+            </command>
>+            <command>
>+                <proto>void <name>glStencilThenCoverFillPathInstancedCHROMIUM</name></proto>
>+                <param><ptype>GLsizei</ptype> <name>numPaths</name></param>
>+                <param><ptype>GLenum</ptype> <name>pathNameType</name></param>
>+                <param><ptype>const void *</ptype> <name>paths</name></param>
>+                <param><ptype>GLuint</ptype> <name>pathBase</name></param>
>+                <param><ptype>GLenum</ptype> <name>fillMode</name></param>
>+                <param><ptype>GLuint</ptype> <name>mask</name></param>
>+                <param><ptype>GLenum</ptype> <name>coverMode</name></param>
>+                <param><ptype>GLenum</ptype> <name>transformType</name></param>
>+                <param><ptype>const GLfloat *</ptype> <name>transformValues</name></param>
>+            </command>
>+            <command>
>+                <proto>void <name>glStencilThenCoverStrokePathInstancedCHROMIUM</name></proto>
>+                <param><ptype>GLsizei</ptype> <name>numPaths</name></param>
>+                <param><ptype>GLenum</ptype> <name>pathNameType</name></param>
>+                <param><ptype>const void *</ptype> <name>paths</name></param>
>+                <param><ptype>GLuint</ptype> <name>pathBase</name></param>
>+                <param><ptype>GLint</ptype> <name>reference</name></param>
>+                <param><ptype>GLuint</ptype> <name>mask</name></param>
>+                <param><ptype>GLenum</ptype> <name>coverMode</name></param>
>+                <param><ptype>GLenum</ptype> <name>transformType</name></param>
>+                <param><ptype>const GLfloat *</ptype> <name>transformValues</name></param>
>+            </command>
>+            <command>
>+            <proto>void <name>glBindFragmentInputLocationCHROMIUM</name></proto>
>+                <param><ptype>GLuint</ptype> <name>programs</name></param>
>+                <param><ptype>GLint</ptype> <name>location</name></param>
>+                <param><ptype>const GLchar *</ptype> <name>name</name></param>
>+            </command>
>+            <command>
>+            <proto>void <name>glProgramPathFragmentInputGenCHROMIUM</name></proto>
>+                <param><ptype>GLuint</ptype> <name>program</name></param>
>+                <param><ptype>GLint</ptype> <name>location</name></param>
>+                <param><ptype>GLenum</ptype> <name>genMode</name></param>
>+                <param><ptype>GLint</ptype> <name>components</name></param>
>+                <param><ptype>const GLfloat *</ptype> <name>coeffs</name></param>
>+            </command>
>+            <command>
>+            <proto>void <name>glCopyTextureCHROMIUM</name></proto>
>+                <param><ptype>GLuint</ptype> <name>sourceId</name></param>
>+                <param><ptype>GLint</ptype> <name>sourceLevel</name></param>
>+                <param><ptype>GLenum</ptype> <name>destTarget</name></param>
>+                <param><ptype>GLuint</ptype> <name>destId</name></param>
>+                <param><ptype>GLint</ptype> <name>destLevel</name></param>
>+                <param><ptype>GLint</ptype> <name>internalFormat</name></param>
>+                <param><ptype>GLenum</ptype> <name>destType</name></param>
>+                <param><ptype>GLboolean</ptype> <name>unpackFlipY</name></param>
>+                <param><ptype>GLboolean</ptype> <name>unpackPremultiplyAlpha</name></param>
>+                <param><ptype>GLboolean</ptype> <name>unpackUnmultiplyAlpha</name></param>
>+            </command>
>+            <command>
>+            <proto>void <name>glCopySubTextureCHROMIUM</name></proto>
>+            <param><ptype>GLuint</ptype> <name>sourceId</name></param>
>+            <param><ptype>GLint</ptype> <name>sourceLevel</name></param>
>+            <param><ptype>GLenum</ptype> <name>destTarget</name></param>
>+            <param><ptype>GLuint</ptype> <name>destId</name></param>
>+            <param><ptype>GLint</ptype> <name>destLevel</name></param>
>+            <param><ptype>GLint</ptype> <name>xoffset</name></param>
>+            <param><ptype>GLint</ptype> <name>yoffset</name></param>
>+            <param><ptype>GLint</ptype> <name>x</name></param>
>+            <param><ptype>GLint</ptype> <name>y</name></param>
>+            <param><ptype>GLint</ptype> <name>width</name></param>
>+            <param><ptype>GLint</ptype> <name>height</name></param>
>+            <param><ptype>GLboolean</ptype> <name>unpackFlipY</name></param>
>+            <param><ptype>GLboolean</ptype> <name>unpackPremultiplyAlpha</name></param>
>+            <param><ptype>GLboolean</ptype> <name>unpackUnmultiplyAlpha</name></param>
>+            </command>
>+            <command>
>+            <proto>void <name>glCompressedCopyTextureCHROMIUM</name></proto>
>+                <param><ptype>GLuint</ptype> <name>sourceId</name></param>
>+                <param><ptype>GLuint</ptype> <name>destId</name></param>
>+            </command>
>+            <command>
>+            <proto>void <name>glRequestExtensionANGLE</name></proto>
>+                <param><ptype>const GLchar *</ptype> <name>name</name></param>
>+            </command>
>+            <command>
>+            <proto>void <name>glGetBooleanvRobustANGLE</name></proto>
>+                <param><ptype>GLenum</ptype> <name>pname</name></param>
>+                <param><ptype>GLsizei</ptype> <name>bufSize</name></param>
>+                <param><ptype>GLsizei *</ptype> <name>length</name></param>
>+                <param><ptype>GLboolean *</ptype> <name>params</name></param>
>+            </command>
>+            <command>
>+            <proto>void <name>glGetBufferParameterivRobustANGLE</name></proto>
>+                <param><ptype>GLenum</ptype> <name>target</name></param>
>+                <param><ptype>GLenum</ptype> <name>pname</name></param>
>+                <param><ptype>GLsizei</ptype> <name>bufSize</name></param>
>+                <param><ptype>GLsizei *</ptype> <name>length</name></param>
>+                <param><ptype>GLint *</ptype> <name>params</name></param>
>+            </command>
>+            <command>
>+            <proto>void <name>glGetFloatvRobustANGLE</name></proto>
>+                <param><ptype>GLenum</ptype> <name>pname</name></param>
>+                <param><ptype>GLsizei</ptype> <name>bufSize</name></param>
>+                <param><ptype>GLsizei *</ptype> <name>length</name></param>
>+                <param><ptype>GLfloat *</ptype> <name>params</name></param>
>+            </command>
>+            <command>
>+            <proto>void <name>glGetFramebufferAttachmentParameterivRobustANGLE</name></proto>
>+                <param><ptype>GLenum</ptype> <name>target</name></param>
>+                <param><ptype>GLenum</ptype> <name>attachment</name></param>
>+                <param><ptype>GLenum</ptype> <name>pname</name></param>
>+                <param><ptype>GLsizei</ptype> <name>bufSize</name></param>
>+                <param><ptype>GLsizei *</ptype> <name>length</name></param>
>+                <param><ptype>GLint *</ptype> <name>params</name></param>
>+            </command>
>+            <command>
>+            <proto>void <name>glGetIntegervRobustANGLE</name></proto>
>+                <param><ptype>GLenum</ptype> <name>pname</name></param>
>+                <param><ptype>GLsizei</ptype> <name>bufSize</name></param>
>+                <param><ptype>GLsizei *</ptype> <name>length</name></param>
>+                <param><ptype>GLint *</ptype> <name>data</name></param>
>+            </command>
>+            <command>
>+            <proto>void <name>glGetProgramivRobustANGLE</name></proto>
>+                <param><ptype>GLuint</ptype> <name>program</name></param>
>+                <param><ptype>GLenum</ptype> <name>pname</name></param>
>+                <param><ptype>GLsizei</ptype> <name>bufSize</name></param>
>+                <param><ptype>GLsizei *</ptype> <name>length</name></param>
>+                <param><ptype>GLint *</ptype> <name>params</name></param>
>+            </command>
>+            <command>
>+            <proto>void <name>glGetRenderbufferParameterivRobustANGLE</name></proto>
>+                <param><ptype>GLenum</ptype> <name>target</name></param>
>+                <param><ptype>GLenum</ptype> <name>pname</name></param>
>+                <param><ptype>GLsizei</ptype> <name>bufSize</name></param>
>+                <param><ptype>GLsizei *</ptype> <name>length</name></param>
>+                <param><ptype>GLint *</ptype> <name>params</name></param>
>+            </command>
>+            <command>
>+            <proto>void <name>glGetShaderivRobustANGLE</name></proto>
>+                <param><ptype>GLuint</ptype> <name>shader</name></param>
>+                <param><ptype>GLenum</ptype> <name>pname</name></param>
>+                <param><ptype>GLsizei</ptype> <name>bufSize</name></param>
>+                <param><ptype>GLsizei *</ptype> <name>length</name></param>
>+                <param><ptype>GLint *</ptype> <name>params</name></param>
>+            </command>
>+            <command>
>+            <proto>void <name>glGetTexParameterfvRobustANGLE</name></proto>
>+                <param><ptype>GLenum</ptype> <name>target</name></param>
>+                <param><ptype>GLenum</ptype> <name>pname</name></param>
>+                <param><ptype>GLsizei</ptype> <name>bufSize</name></param>
>+                <param><ptype>GLsizei *</ptype> <name>length</name></param>
>+                <param><ptype>GLfloat *</ptype> <name>params</name></param>
>+            </command>
>+            <command>
>+            <proto>void <name>glGetTexParameterivRobustANGLE</name></proto>
>+                <param><ptype>GLenum</ptype> <name>target</name></param>
>+                <param><ptype>GLenum</ptype> <name>pname</name></param>
>+                <param><ptype>GLsizei</ptype> <name>bufSize</name></param>
>+                <param><ptype>GLsizei *</ptype> <name>length</name></param>
>+                <param><ptype>GLint *</ptype> <name>params</name></param>
>+            </command>
>+            <command>
>+            <proto>void <name>glGetUniformfvRobustANGLE</name></proto>
>+                <param><ptype>GLuint</ptype> <name>program</name></param>
>+                <param><ptype>GLint</ptype> <name>location</name></param>
>+                <param><ptype>GLsizei</ptype> <name>bufSize</name></param>
>+                <param><ptype>GLsizei *</ptype> <name>length</name></param>
>+                <param><ptype>GLfloat *</ptype> <name>params</name></param>
>+            </command>
>+            <command>
>+            <proto>void <name>glGetUniformivRobustANGLE</name></proto>
>+                <param><ptype>GLuint</ptype> <name>program</name></param>
>+                <param><ptype>GLint</ptype> <name>location</name></param>
>+                <param><ptype>GLsizei</ptype> <name>bufSize</name></param>
>+                <param><ptype>GLsizei *</ptype> <name>length</name></param>
>+                <param><ptype>GLint *</ptype> <name>params</name></param>
>+            </command>
>+            <command>
>+            <proto>void <name>glGetVertexAttribfvRobustANGLE</name></proto>
>+                <param><ptype>GLuint</ptype> <name>index</name></param>
>+                <param><ptype>GLenum</ptype> <name>pname</name></param>
>+                <param><ptype>GLsizei</ptype> <name>bufSize</name></param>
>+                <param><ptype>GLsizei *</ptype> <name>length</name></param>
>+                <param><ptype>GLfloat *</ptype> <name>params</name></param>
>+            </command>
>+            <command>
>+            <proto>void <name>glGetVertexAttribivRobustANGLE</name></proto>
>+                <param><ptype>GLuint</ptype> <name>index</name></param>
>+                <param><ptype>GLenum</ptype> <name>pname</name></param>
>+                <param><ptype>GLsizei</ptype> <name>bufSize</name></param>
>+                <param><ptype>GLsizei *</ptype> <name>length</name></param>
>+                <param><ptype>GLint *</ptype> <name>params</name></param>
>+            </command>
>+            <command>
>+            <proto>void <name>glGetVertexAttribPointervRobustANGLE</name></proto>
>+                <param><ptype>GLuint</ptype> <name>index</name></param>
>+                <param><ptype>GLenum</ptype> <name>pname</name></param>
>+                <param><ptype>GLsizei</ptype> <name>bufSize</name></param>
>+                <param><ptype>GLsizei *</ptype> <name>length</name></param>
>+                <param><ptype>void **</ptype> <name>pointer</name></param>
>+            </command>
>+            <command>
>+            <proto>void <name>glReadPixelsRobustANGLE</name></proto>
>+                <param><ptype>GLint</ptype> <name>x</name></param>
>+                <param><ptype>GLint</ptype> <name>y</name></param>
>+                <param><ptype>GLsizei</ptype> <name>width</name></param>
>+                <param><ptype>GLsizei</ptype> <name>height</name></param>
>+                <param><ptype>GLenum</ptype> <name>format</name></param>
>+                <param><ptype>GLenum</ptype> <name>type</name></param>
>+                <param><ptype>GLsizei</ptype> <name>bufSize</name></param>
>+                <param><ptype>GLsizei *</ptype> <name>length</name></param>
>+                <param><ptype>GLsizei *</ptype> <name>columns</name></param>
>+                <param><ptype>GLsizei *</ptype> <name>rows</name></param>
>+                <param><ptype>void *</ptype> <name>pixels</name></param>
>+            </command>
>+            <command>
>+            <proto>void <name>glTexImage2DRobustANGLE</name></proto>
>+                <param><ptype>GLenum</ptype> <name>target</name></param>
>+                <param><ptype>GLint</ptype> <name>level</name></param>
>+                <param><ptype>GLint</ptype> <name>internalformat</name></param>
>+                <param><ptype>GLsizei</ptype> <name>width</name></param>
>+                <param><ptype>GLsizei</ptype> <name>height</name></param>
>+                <param><ptype>GLint</ptype> <name>border</name></param>
>+                <param><ptype>GLenum</ptype> <name>format</name></param>
>+                <param><ptype>GLenum</ptype> <name>type</name></param>
>+                <param><ptype>GLsizei</ptype> <name>bufSize</name></param>
>+                <param><ptype>const void *</ptype> <name>pixels</name></param>
>+            </command>
>+            <command>
>+            <proto>void <name>glTexParameterfvRobustANGLE</name></proto>
>+                <param><ptype>GLenum</ptype> <name>target</name></param>
>+                <param><ptype>GLenum</ptype> <name>pname</name></param>
>+                <param><ptype>GLsizei</ptype> <name>bufSize</name></param>
>+                <param><ptype>const GLfloat *</ptype> <name>params</name></param>
>+            </command>
>+            <command>
>+            <proto>void <name>glTexParameterivRobustANGLE</name></proto>
>+                <param><ptype>GLenum</ptype> <name>target</name></param>
>+                <param><ptype>GLenum</ptype> <name>pname</name></param>
>+                <param><ptype>GLsizei</ptype> <name>bufSize</name></param>
>+                <param><ptype>const GLint *</ptype> <name>params</name></param>
>+            </command>
>+            <command>
>+            <proto>void <name>glTexSubImage2DRobustANGLE</name></proto>
>+                <param><ptype>GLenum</ptype> <name>target</name></param>
>+                <param><ptype>GLint</ptype> <name>level</name></param>
>+                <param><ptype>GLint</ptype> <name>xoffset</name></param>
>+                <param><ptype>GLint</ptype> <name>yoffset</name></param>
>+                <param><ptype>GLsizei</ptype> <name>width</name></param>
>+                <param><ptype>GLsizei</ptype> <name>height</name></param>
>+                <param><ptype>GLenum</ptype> <name>format</name></param>
>+                <param><ptype>GLenum</ptype> <name>type</name></param>
>+                <param><ptype>GLsizei</ptype> <name>bufSize</name></param>
>+                <param><ptype>const void *</ptype> <name>pixels</name></param>
>+            </command>
>+            <command>
>+            <proto>void <name>glTexImage3DRobustANGLE</name></proto>
>+                <param><ptype>GLenum</ptype> <name>target</name></param>
>+                <param><ptype>GLint</ptype> <name>level</name></param>
>+                <param><ptype>GLint</ptype> <name>internalformat</name></param>
>+                <param><ptype>GLsizei</ptype> <name>width</name></param>
>+                <param><ptype>GLsizei</ptype> <name>height</name></param>
>+                <param><ptype>GLsizei</ptype> <name>depth</name></param>
>+                <param><ptype>GLint</ptype> <name>border</name></param>
>+                <param><ptype>GLenum</ptype> <name>format</name></param>
>+                <param><ptype>GLenum</ptype> <name>type</name></param>
>+                <param><ptype>GLsizei</ptype> <name>bufSize</name></param>
>+                <param><ptype>const void *</ptype> <name>pixels</name></param>
>+            </command>
>+            <command>
>+            <proto>void <name>glTexSubImage3DRobustANGLE</name></proto>
>+                <param><ptype>GLenum</ptype> <name>target</name></param>
>+                <param><ptype>GLint</ptype> <name>level</name></param>
>+                <param><ptype>GLint</ptype> <name>xoffset</name></param>
>+                <param><ptype>GLint</ptype> <name>yoffset</name></param>
>+                <param><ptype>GLint</ptype> <name>zoffset</name></param>
>+                <param><ptype>GLsizei</ptype> <name>width</name></param>
>+                <param><ptype>GLsizei</ptype> <name>height</name></param>
>+                <param><ptype>GLsizei</ptype> <name>depth</name></param>
>+                <param><ptype>GLenum</ptype> <name>format</name></param>
>+                <param><ptype>GLenum</ptype> <name>type</name></param>
>+                <param><ptype>GLsizei</ptype> <name>bufSize</name></param>
>+                <param><ptype>const void *</ptype> <name>pixels</name></param>
>+            </command>
>+            <command>
>+            <proto>void <name>glCompressedTexImage2DRobustANGLE</name></proto>
>+                <param><ptype>GLenum</ptype> <name>target</name></param>
>+                <param><ptype>GLint</ptype> <name>level</name></param>
>+                <param><ptype>GLenum</ptype> <name>internalformat</name></param>
>+                <param><ptype>GLsizei</ptype> <name>width</name></param>
>+                <param><ptype>GLsizei</ptype> <name>height</name></param>
>+                <param><ptype>GLint</ptype> <name>border</name></param>
>+                <param><ptype>GLsizei</ptype> <name>imageSize</name></param>
>+                <param><ptype>GLsizei</ptype> <name>dataSize</name></param>
>+                <param><ptype>const GLvoid *</ptype> <name>data</name></param>
>+            </command>
>+            <command>
>+            <proto>void <name>glCompressedTexSubImage2DRobustANGLE</name></proto>
>+                <param><ptype>GLenum</ptype> <name>target</name></param>
>+                <param><ptype>GLint</ptype> <name>level</name></param>
>+                <param><ptype>GLsizei</ptype> <name>xoffset</name></param>
>+                <param><ptype>GLsizei</ptype> <name>yoffset</name></param>
>+                <param><ptype>GLsizei</ptype> <name>width</name></param>
>+                <param><ptype>GLsizei</ptype> <name>height</name></param>
>+                <param><ptype>GLenum</ptype> <name>format</name></param>
>+                <param><ptype>GLsizei</ptype> <name>imageSize</name></param>
>+                <param><ptype>GLsizei</ptype> <name>dataSize</name></param>
>+                <param><ptype>const GLvoid *</ptype> <name>data</name></param>
>+            </command>
>+            <command>
>+            <proto>void <name>glCompressedTexImage3DRobustANGLE</name></proto>
>+                <param><ptype>GLenum</ptype> <name>target</name></param>
>+                <param><ptype>GLint</ptype> <name>level</name></param>
>+                <param><ptype>GLenum</ptype> <name>internalformat</name></param>
>+                <param><ptype>GLsizei</ptype> <name>width</name></param>
>+                <param><ptype>GLsizei</ptype> <name>height</name></param>
>+                <param><ptype>GLsizei</ptype> <name>depth</name></param>
>+                <param><ptype>GLint</ptype> <name>border</name></param>
>+                <param><ptype>GLsizei</ptype> <name>imageSize</name></param>
>+                <param><ptype>GLsizei</ptype> <name>dataSize</name></param>
>+                <param><ptype>const GLvoid *</ptype> <name>data</name></param>
>+            </command>
>+            <command>
>+            <proto>void <name>glCompressedTexSubImage3DRobustANGLE</name></proto>
>+                <param><ptype>GLenum</ptype> <name>target</name></param>
>+                <param><ptype>GLint</ptype> <name>level</name></param>
>+                <param><ptype>GLint</ptype> <name>xoffset</name></param>
>+                <param><ptype>GLint</ptype> <name>yoffset</name></param>
>+                <param><ptype>GLint</ptype> <name>zoffset</name></param>
>+                <param><ptype>GLsizei</ptype> <name>width</name></param>
>+                <param><ptype>GLsizei</ptype> <name>height</name></param>
>+                <param><ptype>GLsizei</ptype> <name>depth</name></param>
>+                <param><ptype>GLenum</ptype> <name>format</name></param>
>+                <param><ptype>GLsizei</ptype> <name>imageSize</name></param>
>+                <param><ptype>GLsizei</ptype> <name>dataSize</name></param>
>+                <param><ptype>const GLvoid *</ptype> <name>data</name></param>
>+            </command>
>+            <command>
>+            <proto>void <name>glGetQueryivRobustANGLE</name></proto>
>+                <param><ptype>GLenum</ptype> <name>target</name></param>
>+                <param><ptype>GLenum</ptype> <name>pname</name></param>
>+                <param><ptype>GLsizei</ptype> <name>bufSize</name></param>
>+                <param><ptype>GLsizei *</ptype> <name>length</name></param>
>+                <param><ptype>GLint *</ptype> <name>params</name></param>
>+            </command>
>+            <command>
>+            <proto>void <name>glGetQueryObjectuivRobustANGLE</name></proto>
>+                <param><ptype>GLuint</ptype> <name>id</name></param>
>+                <param><ptype>GLenum</ptype> <name>pname</name></param>
>+                <param><ptype>GLsizei</ptype> <name>bufSize</name></param>
>+                <param><ptype>GLsizei *</ptype> <name>length</name></param>
>+                <param><ptype>GLuint *</ptype> <name>params</name></param>
>+            </command>
>+            <command>
>+            <proto>void <name>glGetBufferPointervRobustANGLE</name></proto>
>+                <param><ptype>GLenum</ptype> <name>target</name></param>
>+                <param><ptype>GLenum</ptype> <name>pname</name></param>
>+                <param><ptype>GLsizei</ptype> <name>bufSize</name></param>
>+                <param><ptype>GLsizei *</ptype> <name>length</name></param>
>+                <param><ptype>void **</ptype> <name>params</name></param>
>+            </command>
>+            <command>
>+            <proto>void <name>glGetIntegeri_vRobustANGLE</name></proto>
>+                <param><ptype>GLenum</ptype> <name>target</name></param>
>+                <param><ptype>GLuint</ptype> <name>index</name></param>
>+                <param><ptype>GLsizei</ptype> <name>bufSize</name></param>
>+                <param><ptype>GLsizei *</ptype> <name>length</name></param>
>+                <param><ptype>GLint *</ptype> <name>data</name></param>
>+            </command>
>+            <command>
>+            <proto>void <name>glGetInternalformativRobustANGLE</name></proto>
>+                <param><ptype>GLenum</ptype> <name>target</name></param>
>+                <param><ptype>GLenum</ptype> <name>internalformat</name></param>
>+                <param><ptype>GLenum</ptype> <name>pname</name></param>
>+                <param><ptype>GLsizei</ptype> <name>bufSize</name></param>
>+                <param><ptype>GLsizei *</ptype> <name>length</name></param>
>+                <param><ptype>GLint *</ptype> <name>params</name></param>
>+            </command>
>+            <command>
>+            <proto>void <name>glGetVertexAttribIivRobustANGLE</name></proto>
>+                <param><ptype>GLuint</ptype> <name>index</name></param>
>+                <param><ptype>GLenum</ptype> <name>pname</name></param>
>+                <param><ptype>GLsizei</ptype> <name>bufSize</name></param>
>+                <param><ptype>GLsizei *</ptype> <name>length</name></param>
>+                <param><ptype>GLint *</ptype> <name>params</name></param>
>+            </command>
>+            <command>
>+            <proto>void <name>glGetVertexAttribIuivRobustANGLE</name></proto>
>+                <param><ptype>GLuint</ptype> <name>index</name></param>
>+                <param><ptype>GLenum</ptype> <name>pname</name></param>
>+                <param><ptype>GLsizei</ptype> <name>bufSize</name></param>
>+                <param><ptype>GLsizei *</ptype> <name>length</name></param>
>+                <param><ptype>GLuint *</ptype> <name>params</name></param>
>+            </command>
>+            <command>
>+            <proto>void <name>glGetUniformuivRobustANGLE</name></proto>
>+                <param><ptype>GLuint</ptype> <name>program</name></param>
>+                <param><ptype>GLint</ptype> <name>location</name></param>
>+                <param><ptype>GLsizei</ptype> <name>bufSize</name></param>
>+                <param><ptype>GLsizei *</ptype> <name>length</name></param>
>+                <param><ptype>GLuint *</ptype> <name>params</name></param>
>+            </command>
>+            <command>
>+            <proto>void <name>glGetActiveUniformBlockivRobustANGLE</name></proto>
>+                <param><ptype>GLuint</ptype> <name>program</name></param>
>+                <param><ptype>GLuint</ptype> <name>uniformBlockIndex</name></param>
>+                <param><ptype>GLenum</ptype> <name>pname</name></param>
>+                <param><ptype>GLsizei</ptype> <name>bufSize</name></param>
>+                <param><ptype>GLsizei *</ptype> <name>length</name></param>
>+                <param><ptype>GLint *</ptype> <name>params</name></param>
>+            </command>
>+            <command>
>+            <proto>void <name>glGetInteger64vRobustANGLE</name></proto>
>+                <param><ptype>GLenum</ptype> <name>pname</name></param>
>+                <param><ptype>GLsizei</ptype> <name>bufSize</name></param>
>+                <param><ptype>GLsizei *</ptype> <name>length</name></param>
>+                <param><ptype>GLint64 *</ptype> <name>data</name></param>
>+            </command>
>+            <command>
>+            <proto>void <name>glGetInteger64i_vRobustANGLE</name></proto>
>+                <param><ptype>GLenum</ptype> <name>target</name></param>
>+                <param><ptype>GLuint</ptype> <name>index</name></param>
>+                <param><ptype>GLsizei</ptype> <name>bufSize</name></param>
>+                <param><ptype>GLsizei *</ptype> <name>length</name></param>
>+                <param><ptype>GLint64 *</ptype> <name>data</name></param>
>+            </command>
>+            <command>
>+            <proto>void <name>glGetBufferParameteri64vRobustANGLE</name></proto>
>+                <param><ptype>GLenum</ptype> <name>target</name></param>
>+                <param><ptype>GLenum</ptype> <name>pname</name></param>
>+                <param><ptype>GLsizei</ptype> <name>bufSize</name></param>
>+                <param><ptype>GLsizei *</ptype> <name>length</name></param>
>+                <param><ptype>GLint64 *</ptype> <name>params</name></param>
>+            </command>
>+            <command>
>+            <proto>void <name>glSamplerParameterivRobustANGLE</name></proto>
>+                <param><ptype>GLuint</ptype> <name>sampler</name></param>
>+                <param><ptype>GLuint</ptype> <name>pname</name></param>
>+                <param><ptype>GLsizei</ptype> <name>bufSize</name></param>
>+                <param><ptype>const GLint *</ptype> <name>param</name></param>
>+            </command>
>+            <command>
>+            <proto>void <name>glSamplerParameterfvRobustANGLE</name></proto>
>+                <param><ptype>GLuint</ptype> <name>sampler</name></param>
>+                <param><ptype>GLenum</ptype> <name>pname</name></param>
>+                <param><ptype>GLsizei</ptype> <name>bufSize</name></param>
>+                <param><ptype>const GLfloat *</ptype> <name>param</name></param>
>+            </command>
>+            <command>
>+            <proto>void <name>glGetSamplerParameterivRobustANGLE</name></proto>
>+                <param><ptype>GLuint</ptype> <name>sampler</name></param>
>+                <param><ptype>GLenum</ptype> <name>pname</name></param>
>+                <param><ptype>GLsizei</ptype> <name>bufSize</name></param>
>+                <param><ptype>GLsizei *</ptype> <name>length</name></param>
>+                <param><ptype>GLint *</ptype> <name>params</name></param>
>+            </command>
>+            <command>
>+            <proto>void <name>glGetSamplerParameterfvRobustANGLE</name></proto>
>+                <param><ptype>GLuint</ptype> <name>sampler</name></param>
>+                <param><ptype>GLenum</ptype> <name>pname</name></param>
>+                <param><ptype>GLsizei</ptype> <name>bufSize</name></param>
>+                <param><ptype>GLsizei *</ptype> <name>length</name></param>
>+                <param><ptype>GLfloat *</ptype> <name>params</name></param>
>+            </command>
>+            <command>
>+            <proto>void <name>glGetFramebufferParameterivRobustANGLE</name></proto>
>+                <param><ptype>GLuint</ptype> <name>sampler</name></param>
>+                <param><ptype>GLenum</ptype> <name>pname</name></param>
>+                <param><ptype>GLsizei</ptype> <name>bufSize</name></param>
>+                <param><ptype>GLsizei *</ptype> <name>length</name></param>
>+                <param><ptype>GLint *</ptype> <name>params</name></param>
>+            </command>
>+            <command>
>+            <proto>void <name>glGetProgramInterfaceivRobustANGLE</name></proto>
>+                <param><ptype>GLuint</ptype> <name>program</name></param>
>+                <param><ptype>GLenum</ptype> <name>programInterface</name></param>
>+                <param><ptype>GLenum</ptype> <name>pname</name></param>
>+                <param><ptype>GLsizei</ptype> <name>bufSize</name></param>
>+                <param><ptype>GLsizei *</ptype> <name>length</name></param>
>+                <param><ptype>GLint *</ptype> <name>params</name></param>
>+            </command>
>+            <command>
>+            <proto>void <name>glGetBooleani_vRobustANGLE</name></proto>
>+                <param><ptype>GLenum</ptype> <name>target</name></param>
>+                <param><ptype>GLuint</ptype> <name>index</name></param>
>+                <param><ptype>GLsizei</ptype> <name>bufSize</name></param>
>+                <param><ptype>GLsizei *</ptype> <name>length</name></param>
>+                <param><ptype>GLboolean *</ptype> <name>data</name></param>
>+            </command>
>+            <command>
>+            <proto>void <name>glGetMultisamplefvRobustANGLE</name></proto>
>+                <param><ptype>GLenum</ptype> <name>pname</name></param>
>+                <param><ptype>GLuint</ptype> <name>index</name></param>
>+                <param><ptype>GLsizei</ptype> <name>bufSize</name></param>
>+                <param><ptype>GLsizei *</ptype> <name>length</name></param>
>+                <param><ptype>GLfloat *</ptype> <name>val</name></param>
>+            </command>
>+            <command>
>+            <proto>void <name>glGetTexLevelParameterivRobustANGLE</name></proto>
>+                <param><ptype>GLenum</ptype> <name>target</name></param>
>+                <param><ptype>GLint</ptype> <name>level</name></param>
>+                <param><ptype>GLenum</ptype> <name>pname</name></param>
>+                <param><ptype>GLsizei</ptype> <name>bufSize</name></param>
>+                <param><ptype>GLsizei *</ptype> <name>length</name></param>
>+                <param><ptype>GLint *</ptype> <name>params</name></param>
>+            </command>
>+            <command>
>+            <proto>void <name>glGetTexLevelParameterfvRobustANGLE</name></proto>
>+                <param><ptype>GLenum</ptype> <name>target</name></param>
>+                <param><ptype>GLint</ptype> <name>level</name></param>
>+                <param><ptype>GLenum</ptype> <name>pname</name></param>
>+                <param><ptype>GLsizei</ptype> <name>bufSize</name></param>
>+                <param><ptype>GLsizei *</ptype> <name>length</name></param>
>+                <param><ptype>GLfloat *</ptype> <name>params</name></param>
>+            </command>
>+            <command>
>+            <proto>void <name>glGetPointervRobustANGLERobustANGLE</name></proto>
>+                <param><ptype>GLenum</ptype> <name>pname</name></param>
>+                <param><ptype>GLsizei</ptype> <name>bufSize</name></param>
>+                <param><ptype>GLsizei *</ptype> <name>length</name></param>
>+                <param><ptype>void **</ptype> <name>params</name></param>
>+            </command>
>+            <command>
>+            <proto>void <name>glReadnPixelsRobustANGLE</name></proto>
>+                <param><ptype>GLint</ptype> <name>x</name></param>
>+                <param><ptype>GLint</ptype> <name>y</name></param>
>+                <param><ptype>GLsizei</ptype> <name>width</name></param>
>+                <param><ptype>GLsizei</ptype> <name>height</name></param>
>+                <param><ptype>GLenum</ptype> <name>format</name></param>
>+                <param><ptype>GLenum</ptype> <name>type</name></param>
>+                <param><ptype>GLsizei</ptype> <name>bufSize</name></param>
>+                <param><ptype>GLsizei *</ptype> <name>length</name></param>
>+                <param><ptype>GLsizei *</ptype> <name>columns</name></param>
>+                <param><ptype>GLsizei *</ptype> <name>rows</name></param>
>+                <param><ptype>void *</ptype> <name>data</name></param>
>+            </command>
>+            <command>
>+            <proto>void <name>glGetnUniformfvRobustANGLE</name></proto>
>+                <param><ptype>GLuint</ptype> <name>program</name></param>
>+                <param><ptype>GLint</ptype> <name>location</name></param>
>+                <param><ptype>GLsizei</ptype> <name>bufSize</name></param>
>+                <param><ptype>GLsizei *</ptype> <name>length</name></param>
>+                <param><ptype>GLfloat *</ptype> <name>params</name></param>
>+            </command>
>+            <command>
>+            <proto>void <name>glGetnUniformivRobustANGLE</name></proto>
>+                <param><ptype>GLuint</ptype> <name>program</name></param>
>+                <param><ptype>GLint</ptype> <name>location</name></param>
>+                <param><ptype>GLsizei</ptype> <name>bufSize</name></param>
>+                <param><ptype>GLsizei *</ptype> <name>length</name></param>
>+                <param><ptype>GLint *</ptype> <name>params</name></param>
>+            </command>
>+            <command>
>+            <proto>void <name>glGetnUniformuivRobustANGLE</name></proto>
>+                <param><ptype>GLuint</ptype> <name>program</name></param>
>+                <param><ptype>GLint</ptype> <name>location</name></param>
>+                <param><ptype>GLsizei</ptype> <name>bufSize</name></param>
>+                <param><ptype>GLsizei *</ptype> <name>length</name></param>
>+                <param><ptype>GLuint *</ptype> <name>params</name></param>
>+            </command>
>+            <command>
>+            <proto>void <name>glTexParameterIivRobustANGLE</name></proto>
>+                <param><ptype>GLenum</ptype> <name>target</name></param>
>+                <param><ptype>GLenum</ptype> <name>pname</name></param>
>+                <param><ptype>GLsizei</ptype> <name>bufSize</name></param>
>+                <param><ptype>const GLint *</ptype> <name>params</name></param>
>+            </command>
>+            <command>
>+            <proto>void <name>glTexParameterIuivRobustANGLE</name></proto>
>+                <param><ptype>GLenum</ptype> <name>target</name></param>
>+                <param><ptype>GLenum</ptype> <name>pname</name></param>
>+                <param><ptype>GLsizei</ptype> <name>bufSize</name></param>
>+                <param><ptype>const GLuint *</ptype> <name>params</name></param>
>+            </command>
>+            <command>
>+            <proto>void <name>glGetTexParameterIivRobustANGLE</name></proto>
>+                <param><ptype>GLenum</ptype> <name>target</name></param>
>+                <param><ptype>GLenum</ptype> <name>pname</name></param>
>+                <param><ptype>GLsizei</ptype> <name>bufSize</name></param>
>+                <param><ptype>GLsizei *</ptype> <name>length</name></param>
>+                <param><ptype>GLint *</ptype> <name>params</name></param>
>+            </command>
>+            <command>
>+            <proto>void <name>glGetTexParameterIuivRobustANGLE</name></proto>
>+                <param><ptype>GLenum</ptype> <name>target</name></param>
>+                <param><ptype>GLenum</ptype> <name>pname</name></param>
>+                <param><ptype>GLsizei</ptype> <name>bufSize</name></param>
>+                <param><ptype>GLsizei *</ptype> <name>length</name></param>
>+                <param><ptype>GLuint *</ptype> <name>params</name></param>
>+            </command>
>+            <command>
>+            <proto>void <name>glSamplerParameterIivRobustANGLE</name></proto>
>+                <param><ptype>GLuint</ptype> <name>sampler</name></param>
>+                <param><ptype>GLenum</ptype> <name>pname</name></param>
>+                <param><ptype>GLsizei</ptype> <name>bufSize</name></param>
>+                <param><ptype>const GLint *</ptype> <name>param</name></param>
>+            </command>
>+            <command>
>+            <proto>void <name>glSamplerParameterIuivRobustANGLE</name></proto>
>+                <param><ptype>GLuint</ptype> <name>sampler</name></param>
>+                <param><ptype>GLenum</ptype> <name>pname</name></param>
>+                <param><ptype>GLsizei</ptype> <name>bufSize</name></param>
>+                <param><ptype>const GLuint *</ptype> <name>param</name></param>
>+            </command>
>+            <command>
>+            <proto>void <name>glGetSamplerParameterIivRobustANGLE</name></proto>
>+                <param><ptype>GLuint</ptype> <name>sampler</name></param>
>+                <param><ptype>GLenum</ptype> <name>pname</name></param>
>+                <param><ptype>GLsizei</ptype> <name>bufSize</name></param>
>+                <param><ptype>GLsizei *</ptype> <name>length</name></param>
>+                <param><ptype>GLint *</ptype> <name>params</name></param>
>+            </command>
>+            <command>
>+            <proto>void <name>glGetSamplerParameterIuivRobustANGLE</name></proto>
>+                <param><ptype>GLuint</ptype> <name>sampler</name></param>
>+                <param><ptype>GLenum</ptype> <name>pname</name></param>
>+                <param><ptype>GLsizei</ptype> <name>bufSize</name></param>
>+                <param><ptype>GLsizei *</ptype> <name>length</name></param>
>+                <param><ptype>GLuint *</ptype> <name>params</name></param>
>+            </command>
>+            <command>
>+            <proto>void <name>glGetQueryObjectivRobustANGLE</name></proto>
>+                <param><ptype>GLuint</ptype> <name>id</name></param>
>+                <param><ptype>GLenum</ptype> <name>pname</name></param>
>+                <param><ptype>GLsizei</ptype> <name>bufSize</name></param>
>+                <param><ptype>GLsizei *</ptype> <name>length</name></param>
>+                <param><ptype>GLint *</ptype> <name>params</name></param>
>+            </command>
>+            <command>
>+            <proto>void <name>glGetQueryObjecti64vRobustANGLE</name></proto>
>+                <param><ptype>GLuint</ptype> <name>id</name></param>
>+                <param><ptype>GLenum</ptype> <name>pname</name></param>
>+                <param><ptype>GLsizei</ptype> <name>bufSize</name></param>
>+                <param><ptype>GLsizei *</ptype> <name>length</name></param>
>+                <param><ptype>GLint64 *</ptype> <name>params</name></param>
>+            </command>
>+            <command>
>+            <proto>void <name>glGetQueryObjectui64vRobustANGLE</name></proto>
>+                <param><ptype>GLuint</ptype> <name>id</name></param>
>+                <param><ptype>GLenum</ptype> <name>pname</name></param>
>+                <param><ptype>GLsizei</ptype> <name>bufSize</name></param>
>+                <param><ptype>GLsizei *</ptype> <name>length</name></param>
>+                <param><ptype>GLuint64 *</ptype> <name>params</name></param>
>+            </command>
>+            <command>
>+            <proto>void <name>glCopyTexture3DANGLE</name></proto>
>+                <param><ptype>GLuint</ptype> <name>sourceId</name></param>
>+                <param><ptype>GLint</ptype> <name>sourceLevel</name></param>
>+                <param><ptype>GLenum</ptype> <name>destTarget</name></param>
>+                <param><ptype>GLuint</ptype> <name>destId</name></param>
>+                <param><ptype>GLint</ptype> <name>destLevel</name></param>
>+                <param><ptype>GLint</ptype> <name>internalFormat</name></param>
>+                <param><ptype>GLenum</ptype> <name>destType</name></param>
>+                <param><ptype>GLboolean</ptype> <name>unpackFlipY</name></param>
>+                <param><ptype>GLboolean</ptype> <name>unpackPremultiplyAlpha</name></param>
>+                <param><ptype>GLboolean</ptype> <name>unpackUnmultiplyAlpha</name></param>
>+            </command>
>+            <command>
>+            <proto>void <name>glCopySubTexture3DANGLE</name></proto>
>+                <param><ptype>GLuint</ptype> <name>sourceId</name></param>
>+                <param><ptype>GLint</ptype> <name>sourceLevel</name></param>
>+                <param><ptype>GLenum</ptype> <name>destTarget</name></param>
>+                <param><ptype>GLuint</ptype> <name>destId</name></param>
>+                <param><ptype>GLint</ptype> <name>destLevel</name></param>
>+                <param><ptype>GLint</ptype> <name>xoffset</name></param>
>+                <param><ptype>GLint</ptype> <name>yoffset</name></param>
>+                <param><ptype>GLint</ptype> <name>zoffset</name></param>
>+                <param><ptype>GLint</ptype> <name>x</name></param>
>+                <param><ptype>GLint</ptype> <name>y</name></param>
>+                <param><ptype>GLint</ptype> <name>z</name></param>
>+                <param><ptype>GLint</ptype> <name>width</name></param>
>+                <param><ptype>GLint</ptype> <name>height</name></param>
>+                <param><ptype>GLint</ptype> <name>depth</name></param>
>+                <param><ptype>GLboolean</ptype> <name>unpackFlipY</name></param>
>+                <param><ptype>GLboolean</ptype> <name>unpackPremultiplyAlpha</name></param>
>+                <param><ptype>GLboolean</ptype> <name>unpackUnmultiplyAlpha</name></param>
>+            </command>
>+            <command>
>+            <proto>void <name>glTexStorage2DMultisampleANGLE</name></proto>
>+                <param><ptype>GLenum</ptype> <name>target</name></param>
>+                <param><ptype>GLsizei</ptype> <name>samples</name></param>
>+                <param><ptype>GLenum</ptype> <name>internalformat</name></param>
>+                <param><ptype>GLsizei</ptype> <name>width</name></param>
>+                <param><ptype>GLsizei</ptype> <name>height</name></param>
>+                <param><ptype>GLboolean</ptype> <name>fixedsamplelocations</name></param>
>+            </command>
>+           <command>
>+           <proto>void <name>glGetTexLevelParameterivANGLE</name></proto>
>+                <param><ptype>GLenum</ptype> <name>target</name></param>
>+                <param><ptype>GLint</ptype> <name>level</name></param>
>+                <param><ptype>GLenum</ptype> <name>pname</name></param>
>+                <param><ptype>GLint *</ptype> <name>params</name></param>
>+            </command>
>+            <command>
>+            <proto>void <name>glGetTexLevelParameterfvANGLE</name></proto>
>+                <param><ptype>GLenum</ptype> <name>target</name></param>
>+                <param><ptype>GLint</ptype> <name>level</name></param>
>+                <param><ptype>GLenum</ptype> <name>pname</name></param>
>+                <param><ptype>GLfloat *</ptype> <name>params</name></param>
>+            </command>
>+            <command>
>+            <proto>void <name>glMultiDrawArraysANGLE</name></proto>
>+                <param group="PrimitiveType"><ptype>GLenum</ptype> <name>mode</name></param>
>+                <param len="COMPSIZE(primcount)">const <ptype>GLint</ptype> *<name>firsts</name></param>
>+                <param len="COMPSIZE(primcount)">const <ptype>GLsizei</ptype> *<name>counts</name></param>
>+                <param><ptype>GLsizei</ptype> <name>drawcount</name></param>
>+            </command>
>+            <command>
>+            <proto>void <name>glMultiDrawArraysInstancedANGLE</name></proto>
>+                <param group="PrimitiveType"><ptype>GLenum</ptype> <name>mode</name></param>
>+                <param len="COMPSIZE(primcount)">const <ptype>GLint</ptype> *<name>firsts</name></param>
>+                <param len="COMPSIZE(primcount)">const <ptype>GLsizei</ptype> *<name>counts</name></param>
>+                <param len="COMPSIZE(primcount)">const <ptype>GLsizei</ptype> *<name>instanceCounts</name></param>
>+                <param><ptype>GLsizei</ptype> <name>drawcount</name></param>
>+            </command>
>+            <command>
>+            <proto>void <name>glMultiDrawElementsANGLE</name></proto>
>+                <param group="PrimitiveType"><ptype>GLenum</ptype> <name>mode</name></param>
>+                <param len="COMPSIZE(primcount)">const <ptype>GLsizei</ptype> *<name>counts</name></param>
>+                <param group="DrawElementsType"><ptype>GLenum</ptype> <name>type</name></param>
>+                <param len="COMPSIZE(primcount)">const <ptype>GLvoid</ptype> *const*<name>indices</name></param>
>+                <param><ptype>GLsizei</ptype> <name>drawcount</name></param>
>+            </command>
>+            <command>
>+            <proto>void <name>glMultiDrawElementsInstancedANGLE</name></proto>
>+                <param group="PrimitiveType"><ptype>GLenum</ptype> <name>mode</name></param>
>+                <param len="COMPSIZE(primcount)">const <ptype>GLsizei</ptype> *<name>counts</name></param>
>+                <param group="DrawElementsType"><ptype>GLenum</ptype> <name>type</name></param>
>+                <param len="COMPSIZE(primcount)">const <ptype>GLvoid</ptype> *const*<name>indices</name></param>
>+                <param len="COMPSIZE(primcount)">const GLsizei*<name>instanceCounts</name></param>
>+                <param><ptype>GLsizei</ptype> <name>drawcount</name></param>
>+            </command>
>+            <command>
>+            <proto>void <name>glGetMultisamplefvANGLE</name></proto>
>+                <param><ptype>GLenum</ptype> <name>pname</name></param>
>+                <param><ptype>GLuint</ptype> <name>index</name></param>
>+                <param><ptype>GLfloat *</ptype> <name>val</name></param>
>+            </command>
>+            <command>
>+            <proto>void <name>glSampleMaskiANGLE</name></proto>
>+                <param><ptype>GLuint</ptype> <name>maskNumber</name></param>
>+                <param><ptype>GLbitfield</ptype> <name>mask</name></param>
>+            </command>
>+            <command>
>+                <proto>void <name>glProvokingVertexANGLE</name></proto>
>+                <param group="VertexProvokingMode"><ptype>GLenum</ptype> <name>mode</name></param>
>+            </command>
>+            <command>
>+                <proto>void <name>glLoseContextCHROMIUM</name></proto>
>+                <param group="GraphicsResetStatus"><ptype>GLenum</ptype> <name>current</name></param>
>+                <param group="GraphicsResetStatus"><ptype>GLenum</ptype> <name>other</name></param>
>+            </command>
>+    </commands>
>+    
>+    <extensions>
>+        <extension name="GL_CHROMIUM_bind_uniform_location" supported='gles2'>
>+            <require>
>+                <command name="glBindUniformLocationCHROMIUM"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_CHROMIUM_framebuffer_mixed_samples" supported='gles2'>
>+            <require>
>+                <command name="glMatrixLoadfCHROMIUM"/>
>+                <command name="glMatrixLoadIdentityCHROMIUM"/>
>+                <command name="glCoverageModulationCHROMIUM"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_CHROMIUM_path_rendering" supported='gles2'>
>+        <require>
>+            <command name="glGenPathsCHROMIUM"/>
>+            <command name="glDeletePathsCHROMIUM"/>
>+            <command name="glIsPathCHROMIUM"/>
>+            <command name="glPathCommandsCHROMIUM"/>
>+            <command name="glPathParameterfCHROMIUM"/>
>+            <command name="glPathParameteriCHROMIUM"/>
>+            <command name="glGetPathParameterfvCHROMIUM"/>
>+            <command name="glGetPathParameterivCHROMIUM"/>
>+            <command name="glPathStencilFuncCHROMIUM"/>
>+            <command name="glStencilFillPathCHROMIUM"/>
>+            <command name="glStencilStrokePathCHROMIUM"/>
>+            <command name="glCoverFillPathCHROMIUM"/>
>+            <command name="glCoverStrokePathCHROMIUM"/>
>+            <command name="glStencilThenCoverFillPathCHROMIUM"/>
>+            <command name="glStencilThenCoverStrokePathCHROMIUM"/>
>+            <command name="glCoverFillPathInstancedCHROMIUM"/>
>+            <command name="glCoverStrokePathInstancedCHROMIUM"/>
>+            <command name="glStencilFillPathInstancedCHROMIUM"/>
>+            <command name="glStencilStrokePathInstancedCHROMIUM"/>
>+            <command name="glStencilThenCoverFillPathInstancedCHROMIUM"/>
>+            <command name="glStencilThenCoverStrokePathInstancedCHROMIUM"/>
>+            <command name="glBindFragmentInputLocationCHROMIUM"/>
>+            <command name="glProgramPathFragmentInputGenCHROMIUM"/>
>+        </require>
>+        </extension>
>+        <extension name="GL_CHROMIUM_copy_texture" supported='gles2'>
>+            <require>
>+                <command name="glCopyTextureCHROMIUM"/>
>+                <command name="glCopySubTextureCHROMIUM"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_CHROMIUM_copy_compressed_texture" supported='gles2'>
>+            <require>
>+                <command name="glCompressedCopyTextureCHROMIUM"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_ANGLE_request_extension" supported='gles2'>
>+            <require>
>+                <command name="glRequestExtensionANGLE"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_ANGLE_robust_client_memory" supported='gles2'>
>+            <require>
>+                <command name="glGetBooleanvRobustANGLE"/>
>+                <command name="glGetBufferParameterivRobustANGLE"/>
>+                <command name="glGetBufferParameteri64vRobustANGLE"/>
>+                <command name="glGetFloatvRobustANGLE"/>
>+                <command name="glGetFramebufferAttachmentParameterivRobustANGLE"/>
>+                <command name="glGetIntegervRobustANGLE"/>
>+                <command name="glGetProgramivRobustANGLE"/>
>+                <command name="glGetRenderbufferParameterivRobustANGLE"/>
>+                <command name="glGetShaderivRobustANGLE"/>
>+                <command name="glGetTexParameterfvRobustANGLE"/>
>+                <command name="glGetTexParameterivRobustANGLE"/>
>+                <command name="glGetUniformfvRobustANGLE"/>
>+                <command name="glGetUniformivRobustANGLE"/>
>+                <command name="glGetVertexAttribfvRobustANGLE"/>
>+                <command name="glGetVertexAttribivRobustANGLE"/>
>+                <command name="glGetVertexAttribPointervRobustANGLE"/>
>+                <command name="glReadPixelsRobustANGLE"/>
>+                <command name="glTexImage2DRobustANGLE"/>
>+                <command name="glTexParameterfvRobustANGLE"/>
>+                <command name="glTexParameterivRobustANGLE"/>
>+                <command name="glTexSubImage2DRobustANGLE"/>
>+                <command name="glTexImage3DRobustANGLE"/>
>+                <command name="glTexSubImage3DRobustANGLE"/>
>+                <command name="glCompressedTexImage2DRobustANGLE"/>
>+                <command name="glCompressedTexSubImage2DRobustANGLE"/>
>+                <command name="glCompressedTexImage3DRobustANGLE"/>
>+                <command name="glCompressedTexSubImage3DRobustANGLE"/>
>+                <command name="glGetQueryivRobustANGLE"/>
>+                <command name="glGetQueryObjectuivRobustANGLE"/>
>+                <command name="glGetBufferPointervRobustANGLE"/>
>+                <command name="glGetIntegeri_vRobustANGLE"/>
>+                <command name="glGetInternalformativRobustANGLE"/>
>+                <command name="glGetVertexAttribIivRobustANGLE"/>
>+                <command name="glGetVertexAttribIuivRobustANGLE"/>
>+                <command name="glGetUniformuivRobustANGLE"/>
>+                <command name="glGetActiveUniformBlockivRobustANGLE"/>
>+                <command name="glGetInteger64vRobustANGLE"/>
>+                <command name="glGetInteger64i_vRobustANGLE"/>
>+                <command name="glSamplerParameterivRobustANGLE"/>
>+                <command name="glSamplerParameterfvRobustANGLE"/>
>+                <command name="glGetSamplerParameterivRobustANGLE"/>
>+                <command name="glGetSamplerParameterfvRobustANGLE"/>
>+                <command name="glGetFramebufferParameterivRobustANGLE"/>
>+                <command name="glGetProgramInterfaceivRobustANGLE"/>
>+                <command name="glGetBooleani_vRobustANGLE"/>
>+                <command name="glGetMultisamplefvRobustANGLE"/>
>+                <command name="glGetTexLevelParameterivRobustANGLE"/>
>+                <command name="glGetTexLevelParameterfvRobustANGLE"/>
>+                <command name="glGetPointervRobustANGLERobustANGLE"/>
>+                <command name="glReadnPixelsRobustANGLE"/>
>+                <command name="glGetnUniformfvRobustANGLE"/>
>+                <command name="glGetnUniformivRobustANGLE"/>
>+                <command name="glGetnUniformuivRobustANGLE"/>
>+                <command name="glTexParameterIivRobustANGLE"/>
>+                <command name="glTexParameterIuivRobustANGLE"/>
>+                <command name="glGetTexParameterIivRobustANGLE"/>
>+                <command name="glGetTexParameterIuivRobustANGLE"/>
>+                <command name="glSamplerParameterIivRobustANGLE"/>
>+                <command name="glSamplerParameterIuivRobustANGLE"/>
>+                <command name="glGetSamplerParameterIivRobustANGLE"/>
>+                <command name="glGetSamplerParameterIuivRobustANGLE"/>
>+                <command name="glGetQueryObjectivRobustANGLE"/>
>+                <command name="glGetQueryObjecti64vRobustANGLE"/>
>+                <command name="glGetQueryObjectui64vRobustANGLE"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_ANGLE_copy_texture_3d" supported='gles2'>
>+            <require>
>+                <command name="glCopyTexture3DANGLE"/>
>+                <command name="glCopySubTexture3DANGLE"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_ANGLE_texture_multisample" supported='gles2'>
>+            <require>
>+                <command name="glTexStorage2DMultisampleANGLE"/>
>+                <command name="glGetTexLevelParameterivANGLE"/>
>+                <command name="glGetTexLevelParameterfvANGLE"/>
>+                <command name="glGetMultisamplefvANGLE"/>
>+                <command name="glSampleMaskiANGLE"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_ANGLE_multi_draw" supported='gles2'>
>+            <require>
>+                <command name="glMultiDrawArraysANGLE"/>
>+                <command name="glMultiDrawArraysInstancedANGLE"/>
>+                <command name="glMultiDrawElementsANGLE"/>
>+                <command name="glMultiDrawElementsInstancedANGLE"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_ANGLE_provoking_vertex" supported='gles2'>
>+            <require>
>+                <enum name="GL_FIRST_VERTEX_CONVENTION"/>
>+                <enum name="GL_LAST_VERTEX_CONVENTION"/>
>+                <enum name="GL_PROVOKING_VERTEX"/>
>+                <command name="glProvokingVertexANGLE"/>
>+            </require>
>+        </extension>
>+        <extension name="GL_CHROMIUM_lose_context" supported='gles2'>
>+            <require>
>+                <enum name="GL_GUILTY_CONTEXT_RESET"/>
>+                <enum name="GL_INNOCENT_CONTEXT_RESET"/>
>+                <enum name="GL_UNKNOWN_CONTEXT_RESET"/>
>+                <command name="glLoseContextCHROMIUM"/>
>+            </require>
>+        </extension>
>+    </extensions>
>+</registry>
>diff --git a/Source/ThirdParty/ANGLE/scripts/msvs_projects.py b/Source/ThirdParty/ANGLE/scripts/msvs_projects.py
>new file mode 100644
>index 00000000000..08d627738ad
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/scripts/msvs_projects.py
>@@ -0,0 +1,40 @@
>+#!/usr/bin/python2
>+#
>+# Copyright 2017 The ANGLE Project Authors. All rights reserved.
>+# Use of this source code is governed by a BSD-style license that can be
>+# found in the LICENSE file.
>+#
>+# msvs_projects.py:
>+#   A helper utility that generates Visual Studio projects for each of
>+#   the available directories in 'out', and then runs another helper
>+#   utility that merges these projects into one solution.
>+
>+import sys, os, subprocess
>+
>+# Change this to target another VS version.
>+target_ide = 'vs2017'
>+solution_name = 'ANGLE'
>+
>+script_dir = os.path.dirname(sys.argv[0])
>+
>+# Set the CWD to the root ANGLE folder.
>+os.chdir(os.path.join(script_dir, '..'))
>+
>+out_dir = 'out'
>+
>+# Generate the VS solutions for any valid directory.
>+def generate_projects(dirname):
>+    args = ['gn.bat', 'gen', dirname, '--ide=' + target_ide, '--sln=' + solution_name]
>+    print('Running "' + ' '.join(args) + '"')
>+    subprocess.call(args)
>+
>+for potential_dir in os.listdir(out_dir):
>+    path = os.path.join(out_dir, potential_dir)
>+    build_ninja_d = os.path.join(path, 'build.ninja.d')
>+    if os.path.exists(build_ninja_d):
>+        generate_projects(path)
>+
>+# Run the helper utility that merges the projects.
>+args = ['python', os.path.join('build', 'win', 'gn_meta_sln.py')]
>+print('Running "' + ' '.join(args) + '"')
>+subprocess.call(args)
>diff --git a/Source/ThirdParty/ANGLE/scripts/perf_test_runner.py b/Source/ThirdParty/ANGLE/scripts/perf_test_runner.py
>new file mode 100644
>index 00000000000..5d8f9855f43
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/scripts/perf_test_runner.py
>@@ -0,0 +1,139 @@
>+#!/usr/bin/python2
>+#
>+# Copyright 2015 The ANGLE Project Authors. All rights reserved.
>+# Use of this source code is governed by a BSD-style license that can be
>+# found in the LICENSE file.
>+#
>+# perf_test_runner.py:
>+#   Helper script for running and analyzing perftest results. Runs the
>+#   tests in an infinite batch, printing out the mean and coefficient of
>+#   variation of the population continuously.
>+#
>+
>+import glob
>+import subprocess
>+import sys
>+import os
>+import re
>+
>+base_path = os.path.abspath(os.path.join(os.path.dirname(os.path.abspath(__file__)), '..'))
>+
>+# Look for a [Rr]elease build.
>+perftests_paths = glob.glob('out/*elease*')
>+metric = 'wall_time'
>+max_experiments = 10
>+
>+binary_name = 'angle_perftests'
>+if sys.platform == 'win32':
>+    binary_name += '.exe'
>+
>+scores = []
>+
>+# Danke to http://stackoverflow.com/a/27758326
>+def mean(data):
>+    """Return the sample arithmetic mean of data."""
>+    n = len(data)
>+    if n < 1:
>+        raise ValueError('mean requires at least one data point')
>+    return float(sum(data))/float(n) # in Python 2 use sum(data)/float(n)
>+
>+def sum_of_square_deviations(data, c):
>+    """Return sum of square deviations of sequence data."""
>+    ss = sum((float(x)-c)**2 for x in data)
>+    return ss
>+
>+def coefficient_of_variation(data):
>+    """Calculates the population coefficient of variation."""
>+    n = len(data)
>+    if n < 2:
>+        raise ValueError('variance requires at least two data points')
>+    c = mean(data)
>+    ss = sum_of_square_deviations(data, c)
>+    pvar = ss/n # the population variance
>+    stddev = (pvar**0.5) # population standard deviation
>+    return stddev / c
>+
>+def truncated_list(data, n):
>+    """Compute a truncated list, n is truncation size"""
>+    if len(data) < n * 2:
>+        raise ValueError('list not large enough to truncate')
>+    return sorted(data)[n:-n]
>+
>+def truncated_mean(data, n):
>+    """Compute a truncated mean, n is truncation size"""
>+    return mean(truncated_list(data, n))
>+
>+def truncated_cov(data, n):
>+    """Compute a truncated coefficient of variation, n is truncation size"""
>+    return coefficient_of_variation(truncated_list(data, n))
>+
>+# Find most recent binary
>+newest_binary = None
>+newest_mtime = None
>+
>+for path in perftests_paths:
>+    binary_path = os.path.join(base_path, path, binary_name)
>+    if os.path.exists(binary_path):
>+        binary_mtime = os.path.getmtime(binary_path)
>+        if (newest_binary is None) or (binary_mtime > newest_mtime):
>+            newest_binary = binary_path
>+            newest_mtime = binary_mtime
>+
>+perftests_path = newest_binary
>+
>+if perftests_path == None or not os.path.exists(perftests_path):
>+    print('Cannot find Release %s!' % binary_name)
>+    sys.exit(1)
>+
>+if sys.platform == 'win32':
>+    test_name = 'DrawCallPerfBenchmark.Run/d3d11_null'
>+else:
>+    test_name = 'DrawCallPerfBenchmark.Run/gl'
>+
>+if len(sys.argv) >= 2:
>+    test_name = sys.argv[1]
>+
>+print('Using test executable: ' + perftests_path)
>+print('Test name: ' + test_name)
>+
>+def get_results(metric, extra_args=[]):
>+    process = subprocess.Popen([perftests_path, '--gtest_filter=' + test_name] + extra_args, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
>+    output, err = process.communicate()
>+
>+    m = re.search(r'Running (\d+) tests', output)
>+    if m and int(m.group(1)) > 1:
>+        print("Found more than one test result in output:")
>+        print(output)
>+        sys.exit(3)
>+
>+    pattern = metric + r'= ([0-9.]+)'
>+    m = re.findall(pattern, output)
>+    if m is None:
>+        print("Did not find the metric '%s' in the test output:" % metric)
>+        print(output)
>+        sys.exit(1)
>+
>+    return [float(value) for value in m]
>+
>+# Calibrate the number of steps
>+steps = get_results("steps", ["--calibration"])[0]
>+print("running with %d steps." % steps)
>+
>+# Loop 'max_experiments' times, running the tests.
>+for experiment in range(max_experiments):
>+    experiment_scores = get_results(metric, ["--steps", str(steps)])
>+
>+    for score in experiment_scores:
>+        sys.stdout.write("%s: %.2f" % (metric, score))
>+        scores.append(score)
>+
>+        if (len(scores) > 1):
>+            sys.stdout.write(", mean: %.2f" % mean(scores))
>+            sys.stdout.write(", variation: %.2f%%" % (coefficient_of_variation(scores) * 100.0))
>+
>+        if (len(scores) > 7):
>+            truncation_n = len(scores) >> 3
>+            sys.stdout.write(", truncated mean: %.2f" % truncated_mean(scores, truncation_n))
>+            sys.stdout.write(", variation: %.2f%%" % (truncated_cov(scores, truncation_n) * 100.0))
>+
>+        print("")
>diff --git a/Source/ThirdParty/ANGLE/scripts/registry_xml.py b/Source/ThirdParty/ANGLE/scripts/registry_xml.py
>new file mode 100644
>index 00000000000..56f85a6d7d2
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/scripts/registry_xml.py
>@@ -0,0 +1,232 @@
>+#!/usr/bin/python2
>+#
>+# Copyright 2018 The ANGLE Project Authors. All rights reserved.
>+# Use of this source code is governed by a BSD-style license that can be
>+# found in the LICENSE file.
>+#
>+# registry_xml.py:
>+#   Parses information from Khronos registry files..
>+
>+# List of supported extensions. Add to this list to enable new extensions
>+# available in gl.xml.
>+
>+import sys, os
>+import xml.etree.ElementTree as etree
>+
>+angle_extensions = [
>+    # ANGLE extensions
>+    "GL_CHROMIUM_bind_uniform_location",
>+    "GL_CHROMIUM_framebuffer_mixed_samples",
>+    "GL_CHROMIUM_path_rendering",
>+    "GL_CHROMIUM_copy_texture",
>+    "GL_CHROMIUM_copy_compressed_texture",
>+    "GL_CHROMIUM_lose_context",
>+    "GL_ANGLE_request_extension",
>+    "GL_ANGLE_robust_client_memory",
>+    "GL_ANGLE_copy_texture_3d",
>+]
>+
>+gles1_extensions = [
>+    # ES1 (Possibly the min set of extensions needed by Android)
>+    "GL_OES_draw_texture",
>+    "GL_OES_framebuffer_object",
>+    "GL_OES_matrix_palette",
>+    "GL_OES_point_size_array",
>+    "GL_OES_query_matrix",
>+    "GL_OES_texture_cube_map",
>+]
>+
>+supported_extensions = sorted(angle_extensions + gles1_extensions + [
>+    # ES2+
>+    "GL_ANGLE_framebuffer_blit",
>+    "GL_ANGLE_framebuffer_multisample",
>+    "GL_ANGLE_instanced_arrays",
>+    "GL_ANGLE_provoking_vertex",
>+    "GL_ANGLE_texture_multisample",
>+    "GL_ANGLE_translated_shader_source",
>+    "GL_EXT_blend_func_extended",
>+    "GL_EXT_debug_marker",
>+    "GL_EXT_discard_framebuffer",
>+    "GL_EXT_disjoint_timer_query",
>+    "GL_EXT_draw_buffers",
>+    "GL_EXT_geometry_shader",
>+    "GL_EXT_instanced_arrays",
>+    "GL_EXT_map_buffer_range",
>+    "GL_EXT_memory_object",
>+    "GL_EXT_memory_object_fd",
>+    "GL_EXT_occlusion_query_boolean",
>+    "GL_EXT_robustness",
>+    "GL_EXT_semaphore",
>+    "GL_EXT_semaphore_fd",
>+    "GL_EXT_texture_storage",
>+    "GL_KHR_debug",
>+    "GL_NV_fence",
>+    "GL_OES_EGL_image",
>+    "GL_OES_get_program_binary",
>+    "GL_OES_mapbuffer",
>+    "GL_OES_texture_border_clamp",
>+    "GL_OES_texture_storage_multisample_2d_array",
>+    "GL_OES_vertex_array_object",
>+    "GL_OVR_multiview",
>+    "GL_OVR_multiview2",
>+    "GL_KHR_parallel_shader_compile",
>+    "GL_ANGLE_multi_draw",
>+])
>+
>+supported_egl_extensions = [
>+    "EGL_ANDROID_blob_cache",
>+    "EGL_ANDROID_get_frame_timestamps",
>+    "EGL_ANDROID_presentation_time",
>+    "EGL_ANGLE_d3d_share_handle_client_buffer",
>+    "EGL_ANGLE_device_creation",
>+    "EGL_ANGLE_device_d3d",
>+    "EGL_ANGLE_program_cache_control",
>+    "EGL_ANGLE_query_surface_pointer",
>+    "EGL_ANGLE_stream_producer_d3d_texture",
>+    "EGL_ANGLE_surface_d3d_texture_2d_share_handle",
>+    "EGL_ANGLE_window_fixed_size",
>+    "EGL_CHROMIUM_get_sync_values",
>+    "EGL_EXT_create_context_robustness",
>+    "EGL_EXT_device_query",
>+    "EGL_EXT_platform_base",
>+    "EGL_EXT_platform_device",
>+    "EGL_KHR_debug",
>+    "EGL_KHR_fence_sync",
>+    "EGL_KHR_image",
>+    "EGL_KHR_stream",
>+    "EGL_KHR_stream_consumer_gltexture",
>+    "EGL_KHR_swap_buffers_with_damage",
>+    "EGL_KHR_wait_sync",
>+    "EGL_NV_post_sub_buffer",
>+    "EGL_NV_stream_consumer_gltexture_yuv",
>+]
>+
>+# Strip these suffixes from Context entry point names. NV is excluded (for now).
>+strip_suffixes = ["ANGLE", "EXT", "KHR", "OES", "CHROMIUM"]
>+
>+# The EGL_ANGLE_explicit_context extension is generated differently from other extensions.
>+# Toggle generation here.
>+support_EGL_ANGLE_explicit_context = True
>+
>+def script_relative(path):
>+    return os.path.join(os.path.dirname(sys.argv[0]), path)
>+
>+def path_to(folder, file):
>+    return os.path.join(script_relative(".."), "src", folder, file)
>+
>+class GLCommandNames:
>+    def __init__(self):
>+        self.command_names = {}
>+
>+    def get_commands(self, version):
>+        return self.command_names[version]
>+
>+    def get_all_commands(self):
>+        cmd_names = []
>+        # Combine all the version lists into a single list
>+        for version, version_cmd_names in sorted(self.command_names.iteritems()):
>+            cmd_names += version_cmd_names
>+
>+        return cmd_names
>+
>+    def add_commands(self, version, commands):
>+        # Add key if it doesn't exist
>+        if version not in self.command_names:
>+            self.command_names[version] = []
>+        # Add the commands that aren't duplicates
>+        self.command_names[version] += commands
>+
>+class RegistryXML:
>+    def __init__(self, xml_file, ext_file = None):
>+        tree = etree.parse(script_relative(xml_file))
>+        self.root = tree.getroot()
>+        if (ext_file):
>+            self._AppendANGLEExts(ext_file)
>+        self.all_commands = self.root.findall('commands/command')
>+        self.all_cmd_names = GLCommandNames()
>+        self.commands = {}
>+
>+    def _AppendANGLEExts(self, ext_file):
>+        angle_ext_tree = etree.parse(script_relative(ext_file))
>+        angle_ext_root = angle_ext_tree.getroot()
>+
>+        insertion_point = self.root.findall("./commands")[0]
>+        for command in angle_ext_root.iter('commands'):
>+            insertion_point.extend(command)
>+
>+        insertion_point = self.root.findall("./extensions")[0]
>+        for extension in angle_ext_root.iter('extensions'):
>+            insertion_point.extend(extension)
>+
>+    def AddCommands(self, feature_name, annotation):
>+        xpath = ".//feature[@name='%s']//command" % feature_name
>+        commands = [cmd.attrib['name'] for cmd in self.root.findall(xpath)]
>+
>+        # Remove commands that have already been processed
>+        current_cmds = self.all_cmd_names.get_all_commands()
>+        commands = [cmd for cmd in commands if cmd not in current_cmds]
>+
>+        self.all_cmd_names.add_commands(annotation, commands)
>+        self.commands[annotation] = commands
>+
>+    def _ClassifySupport(self, supported):
>+        if 'gles2' in supported:
>+            return 'gl2ext'
>+        elif 'gles1' in supported:
>+            return 'glext'
>+        elif 'egl' in supported:
>+            return 'eglext'
>+        elif 'wgl' in supported:
>+            return 'wglext'
>+        else:
>+            assert False
>+            return 'unknown'
>+
>+    def AddExtensionCommands(self, supported_extensions, apis):
>+        # Use a first step to run through the extensions so we can generate them
>+        # in sorted order.
>+        self.ext_data = {}
>+        self.ext_dupes = {}
>+        ext_annotations = {}
>+
>+        for extension in self.root.findall("extensions/extension"):
>+            extension_name = extension.attrib['name']
>+            if not extension_name in supported_extensions:
>+                continue
>+
>+            ext_annotations[extension_name] = self._ClassifySupport(extension.attrib['supported'])
>+
>+            ext_cmd_names = []
>+
>+            # There's an extra step here to filter out 'api=gl' extensions. This
>+            # is necessary for handling KHR extensions, which have separate entry
>+            # point signatures (without the suffix) for desktop GL. Note that this
>+            # extra step is necessary because of Etree's limited Xpath support.
>+            for require in extension.findall('require'):
>+                if 'api' in require.attrib and require.attrib['api'] not in apis:
>+                    continue
>+
>+                # A special case for EXT_texture_storage
>+                filter_out_comment = "Supported only if GL_EXT_direct_state_access is supported"
>+                if 'comment' in require.attrib and require.attrib['comment'] == filter_out_comment:
>+                    continue
>+
>+                extension_commands = require.findall('command')
>+                ext_cmd_names += [command.attrib['name'] for command in extension_commands]
>+
>+            self.ext_data[extension_name] = sorted(ext_cmd_names)
>+
>+        for extension_name, ext_cmd_names in sorted(self.ext_data.iteritems()):
>+
>+            # Detect and filter duplicate extensions.
>+            dupes = []
>+            for ext_cmd in ext_cmd_names:
>+                if ext_cmd in self.all_cmd_names.get_all_commands():
>+                    dupes.append(ext_cmd)
>+
>+            for dupe in dupes:
>+                ext_cmd_names.remove(dupe)
>+
>+            self.ext_data[extension_name] = sorted(ext_cmd_names)
>+            self.ext_dupes[extension_name] = dupes
>+            self.all_cmd_names.add_commands(ext_annotations[extension_name], ext_cmd_names)
>diff --git a/Source/ThirdParty/ANGLE/scripts/remove_files.py b/Source/ThirdParty/ANGLE/scripts/remove_files.py
>new file mode 100644
>index 00000000000..f52a1a816ff
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/scripts/remove_files.py
>@@ -0,0 +1,31 @@
>+#!/usr/bin/python2
>+#
>+# Copyright 2019 The ANGLE Project Authors. All rights reserved.
>+# Use of this source code is governed by a BSD-style license that can be
>+# found in the LICENSE file.
>+#
>+# remove_files.py:
>+#   This special action is used to cleanup old files from the build directory.
>+#   Otherwise ANGLE will pick up the old file(s), causing build or runtime errors.
>+#
>+
>+import glob
>+import os
>+import sys
>+
>+if len(sys.argv) < 3:
>+    print("Usage: " + sys.argv[0] + " <stamp_file> <remove_patterns>")
>+
>+stamp_file = sys.argv[1]
>+
>+for i in range(2, len(sys.argv)):
>+    remove_pattern = sys.argv[i]
>+    remove_files = glob.glob(remove_pattern)
>+    for f in remove_files:
>+        if os.path.isfile(f):
>+            os.remove(f)
>+
>+# touch a dummy file to keep a timestamp
>+with open(stamp_file, "w") as f:
>+    f.write("blah")
>+    f.close()
>diff --git a/Source/ThirdParty/ANGLE/scripts/run_code_generation.py b/Source/ThirdParty/ANGLE/scripts/run_code_generation.py
>new file mode 100644
>index 00000000000..b622eac4b1a
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/scripts/run_code_generation.py
>@@ -0,0 +1,191 @@
>+#!/usr/bin/python2
>+#
>+# Copyright 2017 The ANGLE Project Authors. All rights reserved.
>+# Use of this source code is governed by a BSD-style license that can be
>+# found in the LICENSE file.
>+#
>+# run_code_generation.py:
>+#   Runs ANGLE format table and other script code generation scripts.
>+
>+import hashlib
>+import json
>+import os
>+import subprocess
>+import sys
>+
>+script_dir = sys.path[0]
>+root_dir = os.path.abspath(os.path.join(script_dir, '..'))
>+
>+# auto_script is a standard way for scripts to return their inputs and outputs.
>+
>+def get_child_script_dirname(script):
>+    # All script names are relative to ANGLE's root
>+    return os.path.dirname(os.path.abspath(os.path.join(root_dir, script)))
>+
>+# Replace all backslashes with forward slashes to be platform independent
>+def clean_path_slashes(path):
>+    return path.replace("\\", "/")
>+
>+# Takes a script file name which is relative to the code generation script's directory and
>+# changes it to be relative to the angle root directory
>+def rebase_script_path(script_path, relative_path):
>+    return os.path.relpath(os.path.join(os.path.dirname(script_path), relative_path), root_dir)
>+
>+def grab_from_script(script, param):
>+    res = subprocess.check_output(['python', script, param]).strip()
>+    if res == '':
>+        return []
>+    return [clean_path_slashes(rebase_script_path(script, name)) for name in res.split(',')]
>+
>+def auto_script(script):
>+    # Set the CWD to the script directory.
>+    os.chdir(get_child_script_dirname(script))
>+    base_script = os.path.basename(script)
>+    info = {
>+        'inputs': grab_from_script(base_script, 'inputs'),
>+        'outputs': grab_from_script(base_script, 'outputs')
>+    }
>+    # Reset the CWD to the root ANGLE directory.
>+    os.chdir(root_dir)
>+    return info
>+
>+hash_fname = "run_code_generation_hashes.json"
>+
>+generators = {
>+    'ANGLE format':
>+        'src/libANGLE/renderer/gen_angle_format_table.py',
>+    'ANGLE load functions table':
>+        'src/libANGLE/renderer/gen_load_functions_table.py',
>+    'D3D11 blit shader selection':
>+        'src/libANGLE/renderer/d3d/d3d11/gen_blit11helper.py',
>+    'D3D11 format':
>+        'src/libANGLE/renderer/d3d/d3d11/gen_texture_format_table.py',
>+    'DXGI format':
>+        'src/libANGLE/renderer/d3d/d3d11/gen_dxgi_format_table.py',
>+    'DXGI format support':
>+        'src/libANGLE/renderer/d3d/d3d11/gen_dxgi_support_tables.py',
>+    'GL copy conversion table':
>+        'src/libANGLE/gen_copy_conversion_table.py',
>+    'GL/EGL/WGL loader':
>+        'scripts/generate_loader.py',
>+    'GL/EGL entry points':
>+        'scripts/generate_entry_points.py',
>+    'GL format map':
>+        'src/libANGLE/gen_format_map.py',
>+    'uniform type':
>+        'src/common/gen_uniform_type_table.py',
>+    'OpenGL dispatch table':
>+        'src/libANGLE/renderer/gl/generate_gl_dispatch_table.py',
>+    'packed enum':
>+        'src/common/gen_packed_gl_enums.py',
>+    'proc table':
>+        'src/libGLESv2/gen_proc_table.py',
>+    'Vulkan format':
>+        'src/libANGLE/renderer/vulkan/gen_vk_format_table.py',
>+    'Vulkan mandatory format support table':
>+        'src/libANGLE/renderer/vulkan/gen_vk_mandatory_format_support_table.py',
>+    'Vulkan internal shader programs':
>+        'src/libANGLE/renderer/vulkan/gen_vk_internal_shaders.py',
>+    'Emulated HLSL functions':
>+        'src/compiler/translator/gen_emulated_builtin_function_tables.py',
>+    'ESSL static builtins':
>+        'src/compiler/translator/gen_builtin_symbols.py',
>+}
>+
>+
>+def md5(fname):
>+    hash_md5 = hashlib.md5()
>+    with open(fname, "r") as f:
>+        for chunk in iter(lambda: f.read(4096), b""):
>+            hash_md5.update(chunk)
>+    return hash_md5.hexdigest()
>+
>+
>+def any_hash_dirty(name, filenames, new_hashes, old_hashes):
>+    found_dirty_hash = False
>+    for filename in filenames:
>+        key = name + ":" + filename
>+        if not os.path.isfile(filename):
>+            print('Could not find %s for %s' % (filename, name))
>+            found_dirty_hash = True
>+        else:
>+            new_hashes[key] = md5(filename)
>+            if (not key in old_hashes) or (old_hashes[key] != new_hashes[key]):
>+                found_dirty_hash = True
>+    return found_dirty_hash
>+
>+
>+def any_old_hash_missing(new_hashes, old_hashes):
>+    result = False
>+    for name, _ in old_hashes.iteritems():
>+        if name not in new_hashes:
>+            script, file = name.split(':')
>+            print('%s missing from generated hashes for %s.' % (file, script))
>+            result = True
>+    return result
>+
>+
>+def update_output_hashes(script, outputs, new_hashes):
>+    for output in outputs:
>+        if not os.path.isfile(output):
>+            print('Output is missing from %s: %s' % (script, output))
>+            sys.exit(1)
>+        key = script + ":" + output
>+        new_hashes[key] = md5(output)
>+
>+
>+def main():
>+    os.chdir(script_dir)
>+
>+    old_hashes = json.load(open(hash_fname))
>+    new_hashes = {}
>+    any_dirty = False
>+
>+    verify_only = False
>+    if len(sys.argv) > 1 and sys.argv[1] == '--verify-no-dirty':
>+        verify_only = True
>+
>+    for name, script in sorted(generators.iteritems()):
>+        info = auto_script(script)
>+        filenames = info['inputs'] + info['outputs'] + [script]
>+        if any_hash_dirty(name, filenames, new_hashes, old_hashes):
>+            any_dirty = True
>+
>+            if not verify_only:
>+                # Set the CWD to the script directory.
>+                os.chdir(get_child_script_dirname(script))
>+
>+                print('Running ' + name + ' code generator')
>+                if subprocess.call(['python', os.path.basename(script)]) != 0:
>+                    sys.exit(1)
>+
>+    if any_old_hash_missing(new_hashes, old_hashes):
>+        any_dirty = True
>+
>+    if verify_only:
>+        sys.exit(any_dirty)
>+
>+    if any_dirty:
>+        args = []
>+        if os.name == 'nt':
>+            args += ['git.bat']
>+        else:
>+            args += ['git']
>+        # The diff can be so large the arguments to clang-format can break the Windows command
>+        # line length limits. Work around this by calling git cl format with --full.
>+        args += ['cl', 'format', '--full']
>+        print('Calling git cl format')
>+        subprocess.call(args)
>+
>+        # Update the output hashes again since they can be formatted.
>+        for name, script in sorted(generators.iteritems()):
>+            info = auto_script(script)
>+            update_output_hashes(name, info['outputs'], new_hashes)
>+
>+        os.chdir(script_dir)
>+        json.dump(new_hashes, open(hash_fname, "w"), indent=2, sort_keys=True,
>+                  separators=(',', ':\n    '))
>+
>+
>+if __name__ == '__main__':
>+    sys.exit(main())
>diff --git a/Source/ThirdParty/ANGLE/scripts/run_code_generation_hashes.json b/Source/ThirdParty/ANGLE/scripts/run_code_generation_hashes.json
>new file mode 100644
>index 00000000000..8e6a1039e79
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/scripts/run_code_generation_hashes.json
>@@ -0,0 +1,390 @@
>+{
>+  "ANGLE format:src/libANGLE/renderer/FormatID_autogen.h":
>+    "083c08bb743bf72a900079890b14184f",
>+  "ANGLE format:src/libANGLE/renderer/Format_table_autogen.cpp":
>+    "a4cf00b75621bc058c4a1b341bdf6989",
>+  "ANGLE format:src/libANGLE/renderer/angle_format.py":
>+    "b18ca0fe4835114a4a2f54977b19e798",
>+  "ANGLE format:src/libANGLE/renderer/angle_format_data.json":
>+    "288d2f350948f8b1928c249234a44b25",
>+  "ANGLE format:src/libANGLE/renderer/angle_format_map.json":
>+    "be9f9bdbdf785dda05920146e8c55dbb",
>+  "ANGLE format:src/libANGLE/renderer/gen_angle_format_table.py":
>+    "3d9f679b65f39ccf19bd7bdf5498f837",
>+  "ANGLE load functions table:src/libANGLE/renderer/gen_load_functions_table.py":
>+    "2dcc3aa0cd700165b588cf53441e243b",
>+  "ANGLE load functions table:src/libANGLE/renderer/load_functions_data.json":
>+    "816be111bf4d1995589350dceb367315",
>+  "ANGLE load functions table:src/libANGLE/renderer/load_functions_table_autogen.cpp":
>+    "e6d34c18d41d3a9259f6a3e3ff6e40ff",
>+  "D3D11 blit shader selection:src/libANGLE/renderer/d3d/d3d11/Blit11Helper_autogen.inc":
>+    "f69cf03a3d868a977fad9e9c0eb0652a",
>+  "D3D11 blit shader selection:src/libANGLE/renderer/d3d/d3d11/d3d11_blit_shaders_autogen.gni":
>+    "329dbafc64b0cb578348819198abcfea",
>+  "D3D11 blit shader selection:src/libANGLE/renderer/d3d/d3d11/gen_blit11helper.py":
>+    "38bff72bc17ac25c6b42c98d40c76e20",
>+  "D3D11 format:src/libANGLE/renderer/angle_format.py":
>+    "b18ca0fe4835114a4a2f54977b19e798",
>+  "D3D11 format:src/libANGLE/renderer/d3d/d3d11/gen_texture_format_table.py":
>+    "d3260e0390ad2cd8b07420b7426fad43",
>+  "D3D11 format:src/libANGLE/renderer/d3d/d3d11/texture_format_data.json":
>+    "d7483ece817e819588f4ca157716dc7b",
>+  "D3D11 format:src/libANGLE/renderer/d3d/d3d11/texture_format_map.json":
>+    "805d30e2443935e3a3bd68839699e171",
>+  "D3D11 format:src/libANGLE/renderer/d3d/d3d11/texture_format_table_autogen.cpp":
>+    "7c42f9e538cb675d13f8b5d2f248ef84",
>+  "DXGI format support:src/libANGLE/renderer/d3d/d3d11/dxgi_support_data.json":
>+    "09195053f8829fc81efe08229b54a8b5",
>+  "DXGI format support:src/libANGLE/renderer/d3d/d3d11/dxgi_support_table_autogen.cpp":
>+    "7ec32ce0ad41450be7493c1db1130e25",
>+  "DXGI format support:src/libANGLE/renderer/d3d/d3d11/gen_dxgi_support_tables.py":
>+    "389a6358534ebad5e232a44944b6123b",
>+  "DXGI format:src/libANGLE/renderer/angle_format.py":
>+    "b18ca0fe4835114a4a2f54977b19e798",
>+  "DXGI format:src/libANGLE/renderer/angle_format_map.json":
>+    "be9f9bdbdf785dda05920146e8c55dbb",
>+  "DXGI format:src/libANGLE/renderer/d3d/d3d11/dxgi_format_data.json":
>+    "24f525b05dc665fbbc8c6d68fb863719",
>+  "DXGI format:src/libANGLE/renderer/d3d/d3d11/dxgi_format_map_autogen.cpp":
>+    "32b9860e3fd8e87a89ff9a09e848e516",
>+  "DXGI format:src/libANGLE/renderer/d3d/d3d11/gen_dxgi_format_table.py":
>+    "bed2688ca828fc9fd1904408d33ba007",
>+  "ESSL static builtins:src/compiler/translator/ParseContext_autogen.h":
>+    "6be7f97ce68aa5ba5ecf30b835bc344d",
>+  "ESSL static builtins:src/compiler/translator/SymbolTable_autogen.cpp":
>+    "f3b75261653cf1729b11afcee7294494",
>+  "ESSL static builtins:src/compiler/translator/SymbolTable_autogen.h":
>+    "bdb3c8eab0d48267a2f264e3af635e1a",
>+  "ESSL static builtins:src/compiler/translator/builtin_function_declarations.txt":
>+    "e5e567406476306ea06984d885be028d",
>+  "ESSL static builtins:src/compiler/translator/builtin_symbols_hash_autogen.txt":
>+    "e60e2185718a035adfd19ab91536fdb7",
>+  "ESSL static builtins:src/compiler/translator/builtin_variables.json":
>+    "a8f3d76c3c395e8f6a35dd22eb2e8416",
>+  "ESSL static builtins:src/compiler/translator/gen_builtin_symbols.py":
>+    "f056dba2fdeac5a5dbad9d8f7b17f55f",
>+  "ESSL static builtins:src/compiler/translator/tree_util/BuiltIn_autogen.h":
>+    "6df5ab6576da4f364763b581da839b77",
>+  "ESSL static builtins:src/tests/compiler_tests/ImmutableString_test_autogen.cpp":
>+    "c7994179a311f152df4b4a8513211c87",
>+  "Emulated HLSL functions:src/compiler/translator/emulated_builtin_function_data_hlsl.json":
>+    "002ad46d144c51fe98d73478aa554ba7",
>+  "Emulated HLSL functions:src/compiler/translator/emulated_builtin_functions_hlsl_autogen.cpp":
>+    "1c759ffdd27a86fd8f2d590b2f3dcb56",
>+  "Emulated HLSL functions:src/compiler/translator/gen_emulated_builtin_function_tables.py":
>+    "c24de0c9ce5f201985c852d2b4b12b98",
>+  "GL copy conversion table:src/libANGLE/es3_copy_conversion_formats.json":
>+    "54608f6f7d9aa7c59a8458ccf3ab9935",
>+  "GL copy conversion table:src/libANGLE/es3_copy_conversion_table_autogen.cpp":
>+    "b20d198cf5e292c43170d4873b381b34",
>+  "GL copy conversion table:src/libANGLE/gen_copy_conversion_table.py":
>+    "92428cef9d97d33ee7063cfa387ccf56",
>+  "GL format map:src/libANGLE/es3_format_type_combinations.json":
>+    "a232823cd6430f14e28793ccabb968ee",
>+  "GL format map:src/libANGLE/format_map_autogen.cpp":
>+    "1e1b1c2af35a8a75c4395430d2370758",
>+  "GL format map:src/libANGLE/format_map_data.json":
>+    "779798d4879e5f73a5a108e3e3fd3095",
>+  "GL format map:src/libANGLE/gen_format_map.py":
>+    "0fd8c00e8b5afb28a5f8b40d9628b9a4",
>+  "GL/EGL entry points:scripts/egl.xml":
>+    "842e24514c4cfe09fba703c17a0fd292",
>+  "GL/EGL entry points:scripts/egl_angle_ext.xml":
>+    "745534010f31fbe8e1a1fcddce15ed2d",
>+  "GL/EGL entry points:scripts/entry_point_packed_gl_enums.json":
>+    "28238b0f52826c3794eaa1aa940238bf",
>+  "GL/EGL entry points:scripts/generate_entry_points.py":
>+    "83064b09d168c807431cac137b845b5f",
>+  "GL/EGL entry points:scripts/gl.xml":
>+    "b470cb06b06cbbe7adb2c8129ec85708",
>+  "GL/EGL entry points:scripts/gl_angle_ext.xml":
>+    "11e1eb2cbe51ae6e7b8705d3506846d5",
>+  "GL/EGL entry points:scripts/registry_xml.py":
>+    "3b9a36e0be051dc5b4e5162d54749e49",
>+  "GL/EGL entry points:src/libANGLE/Context_gles_1_0_autogen.h":
>+    "fad4ec629b41e9d97ff57a132ad946cb",
>+  "GL/EGL entry points:src/libANGLE/validationES1_autogen.h":
>+    "8d3131d2bf2e6f521f46b44e64a6bff9",
>+  "GL/EGL entry points:src/libANGLE/validationES2_autogen.h":
>+    "edf0d7d2afdfd6c090f83d40312394ad",
>+  "GL/EGL entry points:src/libANGLE/validationES31_autogen.h":
>+    "22ef241ea5b79a6abe6589f1afcc80a2",
>+  "GL/EGL entry points:src/libANGLE/validationES3_autogen.h":
>+    "4617942e5bf67fa5e35675daf66afc5c",
>+  "GL/EGL entry points:src/libANGLE/validationESEXT_autogen.h":
>+    "d7777a2ca9aea09ae46fd39088206bfc",
>+  "GL/EGL entry points:src/libGLESv2/entry_points_enum_autogen.h":
>+    "296e06c9ced6c5a9a2b0c54370be8a04",
>+  "GL/EGL entry points:src/libGLESv2/entry_points_gles_1_0_autogen.cpp":
>+    "196771da8ad7a5beded1dc878410ac11",
>+  "GL/EGL entry points:src/libGLESv2/entry_points_gles_1_0_autogen.h":
>+    "77fa8d307ebf839838f8812786cddc1a",
>+  "GL/EGL entry points:src/libGLESv2/entry_points_gles_2_0_autogen.cpp":
>+    "4f86bb77e2f29c6c1994448ab55d772f",
>+  "GL/EGL entry points:src/libGLESv2/entry_points_gles_2_0_autogen.h":
>+    "3bbaf1cf42fba5d675e5b54cd1d14df7",
>+  "GL/EGL entry points:src/libGLESv2/entry_points_gles_3_0_autogen.cpp":
>+    "94cf20c29469d508af7f5e0a791ccd6a",
>+  "GL/EGL entry points:src/libGLESv2/entry_points_gles_3_0_autogen.h":
>+    "395f6978219abd5182bbe80cc367e40c",
>+  "GL/EGL entry points:src/libGLESv2/entry_points_gles_3_1_autogen.cpp":
>+    "72188430258b99258cef9048f0f4b4ee",
>+  "GL/EGL entry points:src/libGLESv2/entry_points_gles_3_1_autogen.h":
>+    "043d09a964c740067bf4279e0b544aed",
>+  "GL/EGL entry points:src/libGLESv2/entry_points_gles_ext_autogen.cpp":
>+    "ea21bf3d72c769362ebe32a226a1836e",
>+  "GL/EGL entry points:src/libGLESv2/entry_points_gles_ext_autogen.h":
>+    "eb5e13e2da6e217068ae949e900487a0",
>+  "GL/EGL entry points:src/libGLESv2/libGLESv2_autogen.cpp":
>+    "c99457bcd86a5b94c61185c1bcddfdcb",
>+  "GL/EGL entry points:src/libGLESv2/libGLESv2_autogen.def":
>+    "f92d6246265e21a5ed7d949d9de1e26e",
>+  "GL/EGL/WGL loader:scripts/egl.xml":
>+    "842e24514c4cfe09fba703c17a0fd292",
>+  "GL/EGL/WGL loader:scripts/egl_angle_ext.xml":
>+    "745534010f31fbe8e1a1fcddce15ed2d",
>+  "GL/EGL/WGL loader:scripts/generate_loader.py":
>+    "475030714c1644b6dfb1f6f08572039d",
>+  "GL/EGL/WGL loader:scripts/registry_xml.py":
>+    "3b9a36e0be051dc5b4e5162d54749e49",
>+  "GL/EGL/WGL loader:scripts/wgl.xml":
>+    "aa96419c582af2f6673430e2847693f4",
>+  "GL/EGL/WGL loader:src/libEGL/egl_loader_autogen.cpp":
>+    "d270ee9f0b0bcbb58f3a8967758d9b38",
>+  "GL/EGL/WGL loader:src/libEGL/egl_loader_autogen.h":
>+    "77d0a6b43528115ea2ce3a987b25fa91",
>+  "GL/EGL/WGL loader:util/egl_loader_autogen.cpp":
>+    "d397c5b251c10f44857c9098eab5f9a2",
>+  "GL/EGL/WGL loader:util/egl_loader_autogen.h":
>+    "897a66bc15e1791e356d7324f2ff94af",
>+  "GL/EGL/WGL loader:util/gles_loader_autogen.cpp":
>+    "34056ce8d9c18d3cdcd23e16b94508c4",
>+  "GL/EGL/WGL loader:util/gles_loader_autogen.h":
>+    "0ee94fbf54d7ae8b56d4fabc478fd31e",
>+  "GL/EGL/WGL loader:util/windows/wgl_loader_autogen.cpp":
>+    "12ffb44e5e743c826e4d84ac65cdba82",
>+  "GL/EGL/WGL loader:util/windows/wgl_loader_autogen.h":
>+    "e18f6c134b709c5a69ed3b4ff38642d0",
>+  "OpenGL dispatch table:scripts/gl.xml":
>+    "b470cb06b06cbbe7adb2c8129ec85708",
>+  "OpenGL dispatch table:src/libANGLE/renderer/angle_format.py":
>+    "b18ca0fe4835114a4a2f54977b19e798",
>+  "OpenGL dispatch table:src/libANGLE/renderer/gl/DispatchTableGL_autogen.cpp":
>+    "96d06b3acf7826aee1ec813a8fa3a867",
>+  "OpenGL dispatch table:src/libANGLE/renderer/gl/DispatchTableGL_autogen.h":
>+    "ea5eded625b5db7d7b2b7f689c72f14b",
>+  "OpenGL dispatch table:src/libANGLE/renderer/gl/generate_gl_dispatch_table.py":
>+    "7571edb9e610891ed0c95dc496120cff",
>+  "OpenGL dispatch table:src/libANGLE/renderer/gl/gl_bindings_data.json":
>+    "1afca09d29ed7788c76cbc9bcfb4de0a",
>+  "OpenGL dispatch table:src/libANGLE/renderer/gl/null_functions.cpp":
>+    "5470d6b1d7057d797e15b986a31e196e",
>+  "OpenGL dispatch table:src/libANGLE/renderer/gl/null_functions.h":
>+    "7906751710cab691f9e7365e59b7beed",
>+  "Vulkan format:src/libANGLE/renderer/angle_format.py":
>+    "b18ca0fe4835114a4a2f54977b19e798",
>+  "Vulkan format:src/libANGLE/renderer/angle_format_map.json":
>+    "be9f9bdbdf785dda05920146e8c55dbb",
>+  "Vulkan format:src/libANGLE/renderer/vulkan/gen_vk_format_table.py":
>+    "c1f153d67fa50e5f6683170c83b610d4",
>+  "Vulkan format:src/libANGLE/renderer/vulkan/vk_format_map.json":
>+    "a6522dc0af17eebfee8b3d6d4723594f",
>+  "Vulkan format:src/libANGLE/renderer/vulkan/vk_format_table_autogen.cpp":
>+    "34dcf4f106f94b03f74c9fd08b22f6ed",
>+  "Vulkan internal shader programs:src/libANGLE/renderer/vulkan/gen_vk_internal_shaders.py":
>+    "1262e5e903c7dad214ded83625f9d3c4",
>+  "Vulkan internal shader programs:src/libANGLE/renderer/vulkan/shaders/gen/BufferUtils.comp.00000000.inc":
>+    "caa03e84d757844a099d0e408a162c7e",
>+  "Vulkan internal shader programs:src/libANGLE/renderer/vulkan/shaders/gen/BufferUtils.comp.00000001.inc":
>+    "e5de095f618b4c5a3f95a0933fac99b8",
>+  "Vulkan internal shader programs:src/libANGLE/renderer/vulkan/shaders/gen/BufferUtils.comp.00000002.inc":
>+    "92be0607996ec71596011ae627d1c014",
>+  "Vulkan internal shader programs:src/libANGLE/renderer/vulkan/shaders/gen/BufferUtils.comp.00000003.inc":
>+    "6514d0995cdeb9106ae13c638f09ff2d",
>+  "Vulkan internal shader programs:src/libANGLE/renderer/vulkan/shaders/gen/BufferUtils.comp.00000004.inc":
>+    "46fe870e1d4dfb51727475f15c5a8696",
>+  "Vulkan internal shader programs:src/libANGLE/renderer/vulkan/shaders/gen/BufferUtils.comp.00000005.inc":
>+    "6a6ecd244c5c0db9eb4987ffaa753418",
>+  "Vulkan internal shader programs:src/libANGLE/renderer/vulkan/shaders/gen/BufferUtils.comp.00000006.inc":
>+    "dbf87695a067c39af53555d89b583022",
>+  "Vulkan internal shader programs:src/libANGLE/renderer/vulkan/shaders/gen/BufferUtils.comp.00000007.inc":
>+    "eb6ee24de79771edeb2841442362c51a",
>+  "Vulkan internal shader programs:src/libANGLE/renderer/vulkan/shaders/gen/BufferUtils.comp.00000008.inc":
>+    "7f32ffa7aac75052911555856088fffa",
>+  "Vulkan internal shader programs:src/libANGLE/renderer/vulkan/shaders/gen/BufferUtils.comp.00000009.inc":
>+    "1d4f8238c97aa8f0b6cbd358c2b5113f",
>+  "Vulkan internal shader programs:src/libANGLE/renderer/vulkan/shaders/gen/BufferUtils.comp.0000000A.inc":
>+    "d4a5d3182f4b4d8e73d2c20657111cb1",
>+  "Vulkan internal shader programs:src/libANGLE/renderer/vulkan/shaders/gen/BufferUtils.comp.0000000B.inc":
>+    "23db7e8e3818a3970d9a89f83b67c01a",
>+  "Vulkan internal shader programs:src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.00000000.inc":
>+    "213a2b787f8844ddb76bd4b155cbb9c2",
>+  "Vulkan internal shader programs:src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.00000001.inc":
>+    "17b71f1b9a22ed05357f1409f7ff8945",
>+  "Vulkan internal shader programs:src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.00000002.inc":
>+    "fc1d4efe95ef97aea9692bb81a368ba6",
>+  "Vulkan internal shader programs:src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.00000003.inc":
>+    "91989c25edcb1ea87585a38ee5639760",
>+  "Vulkan internal shader programs:src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.00000004.inc":
>+    "5258597cfae463579ad5dd389ed6640b",
>+  "Vulkan internal shader programs:src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.00000005.inc":
>+    "5e1e5572e214d9920ac0b917147a5a18",
>+  "Vulkan internal shader programs:src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.00000006.inc":
>+    "d39d7c29b08dd9ce3c8819e9d1ca8d02",
>+  "Vulkan internal shader programs:src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.00000007.inc":
>+    "f25152b2ad944d39695fe7dadd86e660",
>+  "Vulkan internal shader programs:src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.00000008.inc":
>+    "3bd0e4958dbc9d1bbe7e1c613774cb5b",
>+  "Vulkan internal shader programs:src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.00000009.inc":
>+    "9845efd3073ddf7a10b71e225e1d8412",
>+  "Vulkan internal shader programs:src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.0000000A.inc":
>+    "e15c71e7e6691929fd6cfa91f9f2225f",
>+  "Vulkan internal shader programs:src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.0000000B.inc":
>+    "a45fbca55c9e0e8ebeff1361381b837a",
>+  "Vulkan internal shader programs:src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.0000000C.inc":
>+    "b772949f6235efde9f8f046e919024aa",
>+  "Vulkan internal shader programs:src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.0000000D.inc":
>+    "1389d5d1ca18163e458a63115f017004",
>+  "Vulkan internal shader programs:src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.0000000E.inc":
>+    "66d9462ac3ccbba2338e7363c6041aa7",
>+  "Vulkan internal shader programs:src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.0000000F.inc":
>+    "b8e930a6a7357e99476f05cc13436795",
>+  "Vulkan internal shader programs:src/libANGLE/renderer/vulkan/shaders/gen/FullScreenQuad.vert.00000000.inc":
>+    "e0baef7dbb3d37d9220fe5c47b699903",
>+  "Vulkan internal shader programs:src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000000.inc":
>+    "c0574d0edec329664ababf8390f0f8d7",
>+  "Vulkan internal shader programs:src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000001.inc":
>+    "40a0d8489dafa815b0b9a1ca7a796583",
>+  "Vulkan internal shader programs:src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000002.inc":
>+    "cce2d3897ae18cf9df3eefc9c2e08a2b",
>+  "Vulkan internal shader programs:src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000003.inc":
>+    "76e83e0a3df1e9e64009a1de1eac6f0a",
>+  "Vulkan internal shader programs:src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000004.inc":
>+    "9b948bda7d8e77b97fbdb334d3a45eb8",
>+  "Vulkan internal shader programs:src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000005.inc":
>+    "271bdb4d1e3bddddeec4e422d27d6b43",
>+  "Vulkan internal shader programs:src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000006.inc":
>+    "7da53883fadcf31d4f8616f8c7bea8a0",
>+  "Vulkan internal shader programs:src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000007.inc":
>+    "a6465f6fb97f25b8581285691140ff83",
>+  "Vulkan internal shader programs:src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000008.inc":
>+    "440a8ea2bb8cabd360c7c27c642ae220",
>+  "Vulkan internal shader programs:src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000009.inc":
>+    "9e9d743e5da6943bdf98cc18e33ce5ff",
>+  "Vulkan internal shader programs:src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.0000000A.inc":
>+    "dedb37d1db52d3579d352c67ab8fb5c7",
>+  "Vulkan internal shader programs:src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.0000000B.inc":
>+    "cedcc96ae848cff331769640210fb4ca",
>+  "Vulkan internal shader programs:src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.0000000C.inc":
>+    "4b73e2c034d4548467a9a31ae2a330c3",
>+  "Vulkan internal shader programs:src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.0000000D.inc":
>+    "5a6a468b452bb8534ee9c96af8fd2298",
>+  "Vulkan internal shader programs:src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.0000000E.inc":
>+    "baf91a84a621705a56067644a898a984",
>+  "Vulkan internal shader programs:src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.0000000F.inc":
>+    "1d4a9ee861c8da792d1a207e4ee623e3",
>+  "Vulkan internal shader programs:src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000010.inc":
>+    "913bd14e42386d7884cd4c71311c6596",
>+  "Vulkan internal shader programs:src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000011.inc":
>+    "b6809c60e9c7b113e90cc82753818767",
>+  "Vulkan internal shader programs:src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000012.inc":
>+    "93bf55a25b866b73e78dc1253a8eabf3",
>+  "Vulkan internal shader programs:src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000013.inc":
>+    "d4aa885da98dde43ad94dd76742c12e6",
>+  "Vulkan internal shader programs:src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000014.inc":
>+    "d70d2a7380efaa795bab22445119ac45",
>+  "Vulkan internal shader programs:src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000015.inc":
>+    "ae41ff1909b9ab2cd36792d88714e6d3",
>+  "Vulkan internal shader programs:src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000016.inc":
>+    "30b4f51388b992e976e0f8e077f12ecd",
>+  "Vulkan internal shader programs:src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000017.inc":
>+    "d6694636d0ec7c5c6a81505412f0a790",
>+  "Vulkan internal shader programs:src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000000.inc":
>+    "1faa58a55c16b0e9aba212c3d1967bb1",
>+  "Vulkan internal shader programs:src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000001.inc":
>+    "7c6856d0d1fbb2f0cf136429718ea73e",
>+  "Vulkan internal shader programs:src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000002.inc":
>+    "a45cc3d680ebcb25d20778047a4ddd2d",
>+  "Vulkan internal shader programs:src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000003.inc":
>+    "73efe6e89967dcb26f45de624afc2d0b",
>+  "Vulkan internal shader programs:src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000004.inc":
>+    "ef0cd7ca1246951a19ce78db185e6a91",
>+  "Vulkan internal shader programs:src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000005.inc":
>+    "f26939cccda7d0c518391c76ad04b89b",
>+  "Vulkan internal shader programs:src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000008.inc":
>+    "9cba7718c40fec9efa57001e8c096d51",
>+  "Vulkan internal shader programs:src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000009.inc":
>+    "c74d02e82a51952716aa5ccf1c5f00df",
>+  "Vulkan internal shader programs:src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.0000000A.inc":
>+    "d6a808df6cd1a2c9c53a7a3b6fca9f51",
>+  "Vulkan internal shader programs:src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.0000000B.inc":
>+    "b9a74f36b35600bf10b23055ce7d3cf0",
>+  "Vulkan internal shader programs:src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.0000000C.inc":
>+    "0c516b1bd6d91da627957522fb4fe8aa",
>+  "Vulkan internal shader programs:src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.0000000D.inc":
>+    "db29024c7750f2b53db8e23b01c3b44b",
>+  "Vulkan internal shader programs:src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000010.inc":
>+    "15f9a5a9752647caff36fb60574ce5bc",
>+  "Vulkan internal shader programs:src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000011.inc":
>+    "6df4a84b18bd0916674f785e38d44249",
>+  "Vulkan internal shader programs:src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000012.inc":
>+    "c06bb3eb6ed8341088d5f7fa12582a28",
>+  "Vulkan internal shader programs:src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000013.inc":
>+    "dc5420b2fc2cde18713563878b880c7f",
>+  "Vulkan internal shader programs:src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000014.inc":
>+    "65bb707b9a817ff4b8a2da5a4a7202b7",
>+  "Vulkan internal shader programs:src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000015.inc":
>+    "b8ede4184815457b74e4749918236fce",
>+  "Vulkan internal shader programs:src/libANGLE/renderer/vulkan/shaders/src/BufferUtils.comp":
>+    "0c8c050841543da0d7faca2559212aa8",
>+  "Vulkan internal shader programs:src/libANGLE/renderer/vulkan/shaders/src/ConvertVertex.comp":
>+    "93649f61036c2fa4739988ad71f413df",
>+  "Vulkan internal shader programs:src/libANGLE/renderer/vulkan/shaders/src/FullScreenQuad.vert":
>+    "805ec8b2f87d4bd4242dc5b1c58ba3b4",
>+  "Vulkan internal shader programs:src/libANGLE/renderer/vulkan/shaders/src/ImageClear.frag":
>+    "7f562c60e5df018b0087ecb8642ac821",
>+  "Vulkan internal shader programs:src/libANGLE/renderer/vulkan/shaders/src/ImageCopy.frag":
>+    "20c83ade1efb48a802dc34ca838a2be6",
>+  "Vulkan internal shader programs:src/libANGLE/renderer/vulkan/vk_internal_shaders_autogen.cpp":
>+    "751f3554fe613d9b4739c7a4ac87b037",
>+  "Vulkan internal shader programs:src/libANGLE/renderer/vulkan/vk_internal_shaders_autogen.h":
>+    "930fc6f4a705a0d2121770377d3bc764",
>+  "Vulkan internal shader programs:tools/glslang/glslang_validator.exe.sha1":
>+    "4e0076daa7a27051c1245b8b339ebd6d",
>+  "Vulkan internal shader programs:tools/glslang/glslang_validator.sha1":
>+    "ea685e0867a4b3a07ad7e4246ac84e10",
>+  "Vulkan mandatory format support table:src/libANGLE/renderer/angle_format.py":
>+    "b18ca0fe4835114a4a2f54977b19e798",
>+  "Vulkan mandatory format support table:src/libANGLE/renderer/vulkan/gen_vk_mandatory_format_support_table.py":
>+    "417772416d3082400ce05acc2f209c9f",
>+  "Vulkan mandatory format support table:src/libANGLE/renderer/vulkan/vk_mandatory_format_support_data.json":
>+    "fa2bd54c1bb0ab2cf1d386061a4bc5c5",
>+  "Vulkan mandatory format support table:src/libANGLE/renderer/vulkan/vk_mandatory_format_support_table_autogen.cpp":
>+    "d20e549634ef32d6ad4e9f0b28e52acf",
>+  "Vulkan mandatory format support table:third_party/vulkan-headers/src/registry/vk.xml":
>+    "8af0f992bd45c2d9500eb5ed60c256d6",
>+  "packed enum:src/common/PackedEGLEnums_autogen.cpp":
>+    "c9f7cea85751e5a39b92bccc1d97f3bd",
>+  "packed enum:src/common/PackedEGLEnums_autogen.h":
>+    "4073274726e0c926765c5ab8b21dc3de",
>+  "packed enum:src/common/PackedGLEnums_autogen.cpp":
>+    "41faf7a2b9b7a5008269f3e57bbe361d",
>+  "packed enum:src/common/PackedGLEnums_autogen.h":
>+    "0766f2bb7874b2b6b4aaed4a6d0ef49e",
>+  "packed enum:src/common/gen_packed_gl_enums.py":
>+    "0cd1a1cb6d5fde8cbac2994db24eb901",
>+  "packed enum:src/common/packed_egl_enums.json":
>+    "5f591d220ee53b6e54a27d1523a3ab79",
>+  "packed enum:src/common/packed_gl_enums.json":
>+    "cd2c00958dd8cc546b816dedaf4769d3",
>+  "proc table:src/libGLESv2/gen_proc_table.py":
>+    "20ebe54894d613de42b0b15ca34078d9",
>+  "proc table:src/libGLESv2/proc_table_autogen.cpp":
>+    "1e89c264adbe7120edb636013383598b",
>+  "proc table:src/libGLESv2/proc_table_data.json":
>+    "04123621b8fd5e6d18f9f3c95c190693",
>+  "uniform type:src/common/gen_uniform_type_table.py":
>+    "fa40444d496ac07cd9dc0cd239e4a499",
>+  "uniform type:src/common/uniform_type_info_autogen.cpp":
>+    "b31d181bc49ad1c3540401a5c874e692"
>+}
>\ No newline at end of file
>diff --git a/Source/ThirdParty/ANGLE/scripts/trigger.bat b/Source/ThirdParty/ANGLE/scripts/trigger.bat
>new file mode 100644
>index 00000000000..a2d00d65939
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/scripts/trigger.bat
>@@ -0,0 +1 @@
>+@python %~dp0\trigger.py %*
>diff --git a/Source/ThirdParty/ANGLE/scripts/trigger.py b/Source/ThirdParty/ANGLE/scripts/trigger.py
>new file mode 100644
>index 00000000000..f8421ef564f
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/scripts/trigger.py
>@@ -0,0 +1,71 @@
>+#!/usr/bin/python2
>+#
>+# Copyright 2019 The ANGLE Project Authors. All rights reserved.
>+# Use of this source code is governed by a BSD-style license that can be
>+# found in the LICENSE file.
>+#
>+# trigger.py:
>+#   Helper script for triggering GPU tests on swarming.
>+
>+import argparse
>+import os
>+import subprocess
>+import sys
>+
>+
>+def parse_args():
>+    parser = argparse.ArgumentParser(os.path.basename(sys.argv[0]))
>+    parser.add_argument('gn_path', help='path to GN. (e.g. out/Release)')
>+    parser.add_argument('test', help='test name. (e.g. angle_end2end_tests)')
>+    parser.add_argument('os_dim', help='OS dimension. (e.g. Windows-10)')
>+    parser.add_argument('gpu_dim', help='GPU dimension. (e.g. intel-hd-630-win10-stable)')
>+    parser.add_argument('-s', '--shards', default=1, help='number of shards', type=int)
>+    parser.add_argument('-p', '--pool', default='Chrome-GPU', help='swarming pool')
>+    parser.add_argument('extra_args', help='extra test command line arguments', nargs='*')
>+    return parser.parse_args()
>+
>+
>+def main():
>+    args = parse_args()
>+    path = args.gn_path.replace('\\', '/')
>+    out_gn_path = '//' + path
>+    out_file_path = os.path.join(*path.split('/'))
>+
>+    mb_script_path = os.path.join('tools', 'mb', 'mb.py')
>+    subprocess.call(['python', mb_script_path, 'isolate', out_gn_path, args.test])
>+
>+    isolate_script_path = os.path.join('tools', 'swarming_client', 'isolate.py')
>+    isolate_file = os.path.join(out_file_path, '%s.isolate' % args.test)
>+    isolated_file = os.path.join(out_file_path, '%s.isolated' % args.test)
>+
>+    isolate_args = [
>+        'python', isolate_script_path, 'archive',
>+        '-I', 'https://isolateserver.appspot.com',
>+        '-i', isolate_file,
>+        '-s', isolated_file]
>+    stdout = subprocess.check_output(isolate_args)
>+    sha = stdout[:40]
>+
>+    print('Got an isolated SHA of %s' % sha)
>+    swarming_script_path = os.path.join('tools', 'swarming_client', 'swarming.py')
>+
>+    swarmings_args = [
>+        'python', swarming_script_path, 'trigger',
>+        '-S', 'chromium-swarm.appspot.com',
>+        '-I', 'isolateserver.appspot.com',
>+        '-d', 'os', args.os_dim,
>+        '-d', 'pool', args.pool,
>+        '-d', 'gpu', args.gpu_dim,
>+        '--shards=%d' % args.shards,
>+        '-s', sha]
>+
>+    if args.extra_args:
>+        swarmings_args += ['--'] + args.extra_args
>+
>+    print(' '.join(swarmings_args))
>+    subprocess.call(swarmings_args)
>+    return 0
>+
>+
>+if __name__ == '__main__':
>+    sys.exit(main())
>diff --git a/Source/ThirdParty/ANGLE/scripts/update_canary_angle.py b/Source/ThirdParty/ANGLE/scripts/update_canary_angle.py
>new file mode 100644
>index 00000000000..56897d57cc8
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/scripts/update_canary_angle.py
>@@ -0,0 +1,61 @@
>+#!/usr/bin/python2
>+#
>+# Copyright 2016 The ANGLE Project Authors. All rights reserved.
>+# Use of this source code is governed by a BSD-style license that can be
>+# found in the LICENSE file.
>+#
>+# update_canary_angle.py:
>+#   Helper script that copies Windows ANGLE DLLs into the Canary
>+#   application directory. Much faster than compiling Chrome from
>+#   source. The script checks for the most recent DLLs in a set of
>+#   search paths, and copies that into the most recent Canary
>+#   binary folder. Only works on Windows.
>+
>+import glob, sys, os, shutil
>+
>+# Set of search paths.
>+script_dir = os.path.dirname(sys.argv[0])
>+os.chdir(os.path.join(script_dir, ".."))
>+
>+source_paths = glob.glob('out/*')
>+
>+# Default Canary installation path.
>+chrome_folder = os.path.join(os.environ['LOCALAPPDATA'], 'Google', 'Chrome SxS', 'Application')
>+
>+# Find the most recent ANGLE DLLs
>+binary_name = 'libGLESv2.dll'
>+newest_folder = None
>+newest_mtime = None
>+for path in source_paths:
>+    binary_path = os.path.join(path, binary_name)
>+    if os.path.exists(binary_path):
>+        binary_mtime = os.path.getmtime(binary_path)
>+        if (newest_folder is None) or (binary_mtime > newest_mtime):
>+            newest_folder = path
>+            newest_mtime = binary_mtime
>+
>+if newest_folder is None:
>+    sys.exit("Could not find ANGLE DLLs!")
>+
>+source_folder = newest_folder
>+
>+# Is a folder a chrome binary directory?
>+def is_chrome_bin(str):
>+    chrome_file = os.path.join(chrome_folder, str)
>+    return os.path.isdir(chrome_file) and all([char.isdigit() or char == '.' for char in str])
>+
>+sorted_chrome_bins = sorted([folder for folder in os.listdir(chrome_folder) if is_chrome_bin(folder)], reverse=True)
>+
>+dest_folder = os.path.join(chrome_folder, sorted_chrome_bins[0])
>+
>+print('Copying DLLs from ' + source_folder + ' to ' + dest_folder + '.')
>+
>+for dll in ['libGLESv2.dll', 'libEGL.dll']:
>+    src = os.path.join(source_folder, dll)
>+    if os.path.exists(src):
>+        # Make a backup of the original unmodified DLLs if they are present.
>+        backup = os.path.join(source_folder, dll + '.backup')
>+        if not os.path.exists(backup):
>+            shutil.copyfile(src, backup)
>+        shutil.copyfile(src, os.path.join(dest_folder, dll))
>+        shutil.copyfile(src + ".pdb", os.path.join(dest_folder, dll + ".pdb"))
>diff --git a/Source/ThirdParty/ANGLE/scripts/vk_mandatory_format_support_capture_to_json.js b/Source/ThirdParty/ANGLE/scripts/vk_mandatory_format_support_capture_to_json.js
>new file mode 100644
>index 00000000000..0839f83f693
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/scripts/vk_mandatory_format_support_capture_to_json.js
>@@ -0,0 +1,77 @@
>+/**
>+ * Copyright 2018 The ANGLE Project Authors. All rights reserved.
>+ * Use of this source code is governed by a BSD-style license that can be
>+ * found in the LICENSE file.
>+ * This script is meant to be executed agaisnt the vulkan spec 31.3.3 tables.
>+ * Instructions: Copy all the tables from the HTML source to a plain document
>+ * and add a textarea at the bottom with ID='result'. Execute this JS on load
>+ * of the document and you should have a JSON string in the textarea with the
>+ * mandatory specs included. If the spec changes format / CSS in any way, the
>+ * selectors will need to be modified.
>+ **/
>+var indexToFeatureMap = [];
>+var index = 12;
>+
>+var outputJson = {};
>+
>+// Map all features to indexes of squares.
>+$("#features-formats-mandatory-features-subbyte td").each(function() {
>+  $this = $(this);
>+  $this.find("code").each(function() {
>+    if ($(this).text().startsWith("VK_FORMAT_FEATURE")) {
>+        indexToFeatureMap[index--] = $(this).text();
>+    }
>+  });
>+});
>+
>+var allTableIds =
>+  ["features-formats-mandatory-features-subbyte",
>+  "features-formats-mandatory-features-2byte",
>+  "features-formats-mandatory-features-4byte",
>+  "features-formats-mandatory-features-10bit",
>+  "features-formats-mandatory-features-16bit",
>+  "features-formats-mandatory-features-32bit",
>+  "features-formats-mandatory-features-64bit",
>+  "features-formats-mandatory-features-depth-stencil",
>+  "features-formats-mandatory-features-features-bcn",
>+  "features-formats-mandatory-features-features-etc",
>+  "features-formats-mandatory-features-features-astc"];
>+
>+for (var i = 0; i < allTableIds.length; i++) {
>+  $("#" + allTableIds[i] + " td").each(function() {
>+    $this = $(this);
>+
>+    $this.find("code").each(function() {
>+      if (!$(this).text().startsWith("VK_FORMAT_FEATURE") &&
>+          $(this).text().startsWith("VK_FORMAT")) {
>+        // Found one vkFormat to features line.
>+        var vkFormat = $(this).text();
>+        var squareIndex = 0;
>+        var features = [];
>+        var skipEntry = false;
>+
>+        $(this).closest("tr").find("td.halign-center").each(function() {
>+          // Find all squares with features.
>+          if ($(this).text() === "â") {
>+            features.push(indexToFeatureMap[squareIndex]);
>+          }
>+          if ($(this).text() === "â ") {
>+            skipEntry = true;
>+            return false; // Break;
>+          }
>+          squareIndex++;
>+        });
>+        if (!skipEntry &&
>+              (features.length > 0)) {
>+          Object.defineProperty(outputJson, vkFormat, {
>+            value: features,
>+            enumerable: true,
>+            readable: true,
>+            writable: false
>+          });
>+        }
>+      }
>+    });
>+  });
>+}
>+$("#result").text(JSON.stringify(outputJson));
>diff --git a/Source/ThirdParty/ANGLE/scripts/wgl.xml b/Source/ThirdParty/ANGLE/scripts/wgl.xml
>new file mode 100644
>index 00000000000..49277ed4649
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/scripts/wgl.xml
>@@ -0,0 +1,1989 @@
>+<?xml version="1.0" encoding="UTF-8"?>
>+<registry>
>+    <comment>
>+Copyright (c) 2013-2018 The Khronos Group Inc.
>+
>+Licensed under the Apache License, Version 2.0 (the "License");
>+you may not use this file except in compliance with the License.
>+You may obtain a copy of the License at
>+
>+    http://www.apache.org/licenses/LICENSE-2.0
>+
>+Unless required by applicable law or agreed to in writing, software
>+distributed under the License is distributed on an "AS IS" BASIS,
>+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
>+See the License for the specific language governing permissions and
>+limitations under the License.
>+
>+------------------------------------------------------------------------
>+
>+This file, wgl.xml, is the WGL API Registry. The older ".spec" file
>+format has been retired and will no longer be updated with new
>+extensions and API versions. The canonical version of the registry,
>+together with documentation, schema, and Python generator scripts used
>+to generate C header files for WGL, can always be found in the Khronos
>+Registry at
>+        https://github.com/KhronosGroup/OpenGL-Registry
>+    </comment>
>+
>+    
>+
>+    <types>
>+            
>+        <type name="BOOL"/>
>+        <type name="CHAR"/>
>+        <type name="DWORD"/>
>+        <type name="FLOAT"/>
>+        <type name="GLbitfield"/>
>+        <type name="GLboolean"/>
>+        <type name="GLenum"/>
>+        <type name="GLfloat"/>
>+        <type name="GLint"/>
>+        <type name="GLsizei"/>
>+        <type name="GLuint"/>
>+        <type name="GLushort"/>
>+        <type name="HANDLE"/>
>+        <type name="HDC"/>
>+        <type name="HGLRC"/>
>+        <type name="INT"/>
>+        <type name="INT32"/>
>+        <type name="INT64"/>
>+        <type name="PROC"/>
>+        <type name="RECT"/>
>+        <type name="LPCSTR"/>
>+        <type name="LPVOID"/>
>+        <type name="UINT"/>
>+        <type name="USHORT"/>
>+        <type name="VOID"/>
>+            
>+        <type name="COLORREF"/>
>+        <type name="HENHMETAFILE"/>
>+        <type name="LAYERPLANEDESCRIPTOR"/>
>+        <type name="LPGLYPHMETRICSFLOAT"/>
>+        <type name="PIXELFORMATDESCRIPTOR"/>
>+            
>+            
>+        <type>struct <name>_GPU_DEVICE</name> {
>+    DWORD  cb;
>+    CHAR   DeviceName[32];
>+    CHAR   DeviceString[128];
>+    DWORD  Flags;
>+    RECT   rcVirtualScreen;
>+};</type>
>+            
>+        <type>DECLARE_HANDLE(<name>HPBUFFERARB</name>);</type>
>+        <type>DECLARE_HANDLE(<name>HPBUFFEREXT</name>);</type>
>+        <type>DECLARE_HANDLE(<name>HVIDEOOUTPUTDEVICENV</name>);</type>
>+        <type>DECLARE_HANDLE(<name>HPVIDEODEV</name>);</type>
>+        <type>DECLARE_HANDLE(<name>HPGPUNV</name>);</type>
>+        <type>DECLARE_HANDLE(<name>HGPUNV</name>);</type>
>+        <type>DECLARE_HANDLE(<name>HVIDEOINPUTDEVICENV</name>);</type>
>+        <type requires="_GPU_DEVICE">typedef struct _GPU_DEVICE <name>GPU_DEVICE</name>;</type>
>+        <type requires="_GPU_DEVICE">typedef struct _GPU_DEVICE *<name>PGPU_DEVICE</name>;</type>
>+    </types>
>+
>+    
>+
>+    
>+
>+    <enums namespace="WGLLayerPlaneMask" type="bitmask" vendor="MS">
>+        <enum value="0x00000001"  name="WGL_SWAP_MAIN_PLANE"/>
>+        <enum value="0x00000002"  name="WGL_SWAP_OVERLAY1"/>
>+        <enum value="0x00000004"  name="WGL_SWAP_OVERLAY2"/>
>+        <enum value="0x00000008"  name="WGL_SWAP_OVERLAY3"/>
>+        <enum value="0x00000010"  name="WGL_SWAP_OVERLAY4"/>
>+        <enum value="0x00000020"  name="WGL_SWAP_OVERLAY5"/>
>+        <enum value="0x00000040"  name="WGL_SWAP_OVERLAY6"/>
>+        <enum value="0x00000080"  name="WGL_SWAP_OVERLAY7"/>
>+        <enum value="0x00000100"  name="WGL_SWAP_OVERLAY8"/>
>+        <enum value="0x00000200"  name="WGL_SWAP_OVERLAY9"/>
>+        <enum value="0x00000400"  name="WGL_SWAP_OVERLAY10"/>
>+        <enum value="0x00000800"  name="WGL_SWAP_OVERLAY11"/>
>+        <enum value="0x00001000"  name="WGL_SWAP_OVERLAY12"/>
>+        <enum value="0x00002000"  name="WGL_SWAP_OVERLAY13"/>
>+        <enum value="0x00004000"  name="WGL_SWAP_OVERLAY14"/>
>+        <enum value="0x00008000"  name="WGL_SWAP_OVERLAY15"/>
>+        <enum value="0x00010000"  name="WGL_SWAP_UNDERLAY1"/>
>+        <enum value="0x00020000"  name="WGL_SWAP_UNDERLAY2"/>
>+        <enum value="0x00040000"  name="WGL_SWAP_UNDERLAY3"/>
>+        <enum value="0x00080000"  name="WGL_SWAP_UNDERLAY4"/>
>+        <enum value="0x00100000"  name="WGL_SWAP_UNDERLAY5"/>
>+        <enum value="0x00200000"  name="WGL_SWAP_UNDERLAY6"/>
>+        <enum value="0x00400000"  name="WGL_SWAP_UNDERLAY7"/>
>+        <enum value="0x00800000"  name="WGL_SWAP_UNDERLAY8"/>
>+        <enum value="0x01000000"  name="WGL_SWAP_UNDERLAY9"/>
>+        <enum value="0x02000000"  name="WGL_SWAP_UNDERLAY10"/>
>+        <enum value="0x04000000"  name="WGL_SWAP_UNDERLAY11"/>
>+        <enum value="0x08000000"  name="WGL_SWAP_UNDERLAY12"/>
>+        <enum value="0x10000000"  name="WGL_SWAP_UNDERLAY13"/>
>+        <enum value="0x20000000"  name="WGL_SWAP_UNDERLAY14"/>
>+        <enum value="0x40000000"  name="WGL_SWAP_UNDERLAY15"/>
>+    </enums>
>+
>+    <enums namespace="WGLColorBufferMask" type="bitmask" vendor="ARB">
>+        <enum value="0x00000001"    name="WGL_FRONT_COLOR_BUFFER_BIT_ARB"/>
>+        <enum value="0x00000002"    name="WGL_BACK_COLOR_BUFFER_BIT_ARB"/>
>+        <enum value="0x00000004"    name="WGL_DEPTH_BUFFER_BIT_ARB"/>
>+        <enum value="0x00000008"    name="WGL_STENCIL_BUFFER_BIT_ARB"/>
>+    </enums>
>+
>+    <enums namespace="WGLContextFlagsMask" type="bitmask" vendor="ARB">
>+        <enum value="0x00000001"    name="WGL_CONTEXT_DEBUG_BIT_ARB"/>
>+        <enum value="0x00000002"    name="WGL_CONTEXT_FORWARD_COMPATIBLE_BIT_ARB"/>
>+        <enum value="0x00000004"    name="WGL_CONTEXT_ROBUST_ACCESS_BIT_ARB"/>
>+        <enum value="0x00000008"    name="WGL_CONTEXT_RESET_ISOLATION_BIT_ARB"/>
>+    </enums>
>+
>+    <enums namespace="WGLContextProfileMask" type="bitmask" vendor="ARB">
>+        <enum value="0x00000001"    name="WGL_CONTEXT_CORE_PROFILE_BIT_ARB"/>
>+        <enum value="0x00000002"    name="WGL_CONTEXT_COMPATIBILITY_PROFILE_BIT_ARB"/>
>+        <enum value="0x00000004"    name="WGL_CONTEXT_ES_PROFILE_BIT_EXT"/>
>+        <enum value="0x00000004"    name="WGL_CONTEXT_ES2_PROFILE_BIT_EXT" alias="WGL_CONTEXT_ES_PROFILE_BIT_EXT"/>
>+    </enums>
>+
>+    <enums namespace="WGLImageBufferMaskI3D" type="bitmask" vendor="I3D">
>+        <enum value="0x00000001"    name="WGL_IMAGE_BUFFER_MIN_ACCESS_I3D"/>
>+        <enum value="0x00000002"    name="WGL_IMAGE_BUFFER_LOCK_I3D"/>
>+    </enums>
>+
>+    <enums namespace="WGLDXInteropMaskNV" type="bitmask" vendor="NV">
>+        <enum value="0x00000000"    name="WGL_ACCESS_READ_ONLY_NV"/>
>+        <enum value="0x00000001"    name="WGL_ACCESS_READ_WRITE_NV"/>
>+        <enum value="0x00000002"    name="WGL_ACCESS_WRITE_DISCARD_NV"/>
>+    </enums>
>+
>+    
>+
>+    <enums namespace="WGL" group="SpecialNumbers" vendor="MS">
>+        <enum value="0"           name="WGL_CONTEXT_RELEASE_BEHAVIOR_NONE_ARB"/>
>+        <enum value="0"           name="WGL_FONT_LINES"/>
>+        <enum value="1"           name="WGL_FONT_POLYGONS"/>
>+    </enums>
>+
>+    <enums namespace="WGL" start="0x1F00" end="0x1F02" vendor="ARB" comment="Unclear why AMD used values in this range">
>+        <enum value="0x1F00"        name="WGL_GPU_VENDOR_AMD"/>
>+        <enum value="0x1F01"        name="WGL_GPU_RENDERER_STRING_AMD"/>
>+        <enum value="0x1F02"        name="WGL_GPU_OPENGL_VERSION_STRING_AMD"/>
>+    </enums>
>+
>+    <enums namespace="WGL" start="0x2000" end="0x203F" vendor="ARB">
>+        <enum value="0x2000"        name="WGL_NUMBER_PIXEL_FORMATS_ARB"/>
>+        <enum value="0x2000"        name="WGL_NUMBER_PIXEL_FORMATS_EXT"/>
>+        <enum value="0x2001"        name="WGL_DRAW_TO_WINDOW_ARB"/>
>+        <enum value="0x2001"        name="WGL_DRAW_TO_WINDOW_EXT"/>
>+        <enum value="0x2002"        name="WGL_DRAW_TO_BITMAP_ARB"/>
>+        <enum value="0x2002"        name="WGL_DRAW_TO_BITMAP_EXT"/>
>+        <enum value="0x2003"        name="WGL_ACCELERATION_ARB"/>
>+        <enum value="0x2003"        name="WGL_ACCELERATION_EXT"/>
>+        <enum value="0x2004"        name="WGL_NEED_PALETTE_ARB"/>
>+        <enum value="0x2004"        name="WGL_NEED_PALETTE_EXT"/>
>+        <enum value="0x2005"        name="WGL_NEED_SYSTEM_PALETTE_ARB"/>
>+        <enum value="0x2005"        name="WGL_NEED_SYSTEM_PALETTE_EXT"/>
>+        <enum value="0x2006"        name="WGL_SWAP_LAYER_BUFFERS_ARB"/>
>+        <enum value="0x2006"        name="WGL_SWAP_LAYER_BUFFERS_EXT"/>
>+        <enum value="0x2007"        name="WGL_SWAP_METHOD_ARB"/>
>+        <enum value="0x2007"        name="WGL_SWAP_METHOD_EXT"/>
>+        <enum value="0x2008"        name="WGL_NUMBER_OVERLAYS_ARB"/>
>+        <enum value="0x2008"        name="WGL_NUMBER_OVERLAYS_EXT"/>
>+        <enum value="0x2009"        name="WGL_NUMBER_UNDERLAYS_ARB"/>
>+        <enum value="0x2009"        name="WGL_NUMBER_UNDERLAYS_EXT"/>
>+        <enum value="0x200A"        name="WGL_TRANSPARENT_ARB"/>
>+        <enum value="0x200A"        name="WGL_TRANSPARENT_EXT"/>
>+        <enum value="0x200B"        name="WGL_TRANSPARENT_VALUE_EXT"/>
>+        <enum value="0x200C"        name="WGL_SHARE_DEPTH_ARB"/>
>+        <enum value="0x200C"        name="WGL_SHARE_DEPTH_EXT"/>
>+        <enum value="0x200D"        name="WGL_SHARE_STENCIL_ARB"/>
>+        <enum value="0x200D"        name="WGL_SHARE_STENCIL_EXT"/>
>+        <enum value="0x200E"        name="WGL_SHARE_ACCUM_ARB"/>
>+        <enum value="0x200E"        name="WGL_SHARE_ACCUM_EXT"/>
>+        <enum value="0x200F"        name="WGL_SUPPORT_GDI_ARB"/>
>+        <enum value="0x200F"        name="WGL_SUPPORT_GDI_EXT"/>
>+        <enum value="0x2010"        name="WGL_SUPPORT_OPENGL_ARB"/>
>+        <enum value="0x2010"        name="WGL_SUPPORT_OPENGL_EXT"/>
>+        <enum value="0x2011"        name="WGL_DOUBLE_BUFFER_ARB"/>
>+        <enum value="0x2011"        name="WGL_DOUBLE_BUFFER_EXT"/>
>+        <enum value="0x2012"        name="WGL_STEREO_ARB"/>
>+        <enum value="0x2012"        name="WGL_STEREO_EXT"/>
>+        <enum value="0x2013"        name="WGL_PIXEL_TYPE_ARB"/>
>+        <enum value="0x2013"        name="WGL_PIXEL_TYPE_EXT"/>
>+        <enum value="0x2014"        name="WGL_COLOR_BITS_ARB"/>
>+        <enum value="0x2014"        name="WGL_COLOR_BITS_EXT"/>
>+        <enum value="0x2015"        name="WGL_RED_BITS_ARB"/>
>+        <enum value="0x2015"        name="WGL_RED_BITS_EXT"/>
>+        <enum value="0x2016"        name="WGL_RED_SHIFT_ARB"/>
>+        <enum value="0x2016"        name="WGL_RED_SHIFT_EXT"/>
>+        <enum value="0x2017"        name="WGL_GREEN_BITS_ARB"/>
>+        <enum value="0x2017"        name="WGL_GREEN_BITS_EXT"/>
>+        <enum value="0x2018"        name="WGL_GREEN_SHIFT_ARB"/>
>+        <enum value="0x2018"        name="WGL_GREEN_SHIFT_EXT"/>
>+        <enum value="0x2019"        name="WGL_BLUE_BITS_ARB"/>
>+        <enum value="0x2019"        name="WGL_BLUE_BITS_EXT"/>
>+        <enum value="0x201A"        name="WGL_BLUE_SHIFT_ARB"/>
>+        <enum value="0x201A"        name="WGL_BLUE_SHIFT_EXT"/>
>+        <enum value="0x201B"        name="WGL_ALPHA_BITS_ARB"/>
>+        <enum value="0x201B"        name="WGL_ALPHA_BITS_EXT"/>
>+        <enum value="0x201C"        name="WGL_ALPHA_SHIFT_ARB"/>
>+        <enum value="0x201C"        name="WGL_ALPHA_SHIFT_EXT"/>
>+        <enum value="0x201D"        name="WGL_ACCUM_BITS_ARB"/>
>+        <enum value="0x201D"        name="WGL_ACCUM_BITS_EXT"/>
>+        <enum value="0x201E"        name="WGL_ACCUM_RED_BITS_ARB"/>
>+        <enum value="0x201E"        name="WGL_ACCUM_RED_BITS_EXT"/>
>+        <enum value="0x201F"        name="WGL_ACCUM_GREEN_BITS_ARB"/>
>+        <enum value="0x201F"        name="WGL_ACCUM_GREEN_BITS_EXT"/>
>+        <enum value="0x2020"        name="WGL_ACCUM_BLUE_BITS_ARB"/>
>+        <enum value="0x2020"        name="WGL_ACCUM_BLUE_BITS_EXT"/>
>+        <enum value="0x2021"        name="WGL_ACCUM_ALPHA_BITS_ARB"/>
>+        <enum value="0x2021"        name="WGL_ACCUM_ALPHA_BITS_EXT"/>
>+        <enum value="0x2022"        name="WGL_DEPTH_BITS_ARB"/>
>+        <enum value="0x2022"        name="WGL_DEPTH_BITS_EXT"/>
>+        <enum value="0x2023"        name="WGL_STENCIL_BITS_ARB"/>
>+        <enum value="0x2023"        name="WGL_STENCIL_BITS_EXT"/>
>+        <enum value="0x2024"        name="WGL_AUX_BUFFERS_ARB"/>
>+        <enum value="0x2024"        name="WGL_AUX_BUFFERS_EXT"/>
>+        <enum value="0x2025"        name="WGL_NO_ACCELERATION_ARB"/>
>+        <enum value="0x2025"        name="WGL_NO_ACCELERATION_EXT"/>
>+        <enum value="0x2026"        name="WGL_GENERIC_ACCELERATION_ARB"/>
>+        <enum value="0x2026"        name="WGL_GENERIC_ACCELERATION_EXT"/>
>+        <enum value="0x2027"        name="WGL_FULL_ACCELERATION_ARB"/>
>+        <enum value="0x2027"        name="WGL_FULL_ACCELERATION_EXT"/>
>+        <enum value="0x2028"        name="WGL_SWAP_EXCHANGE_ARB"/>
>+        <enum value="0x2028"        name="WGL_SWAP_EXCHANGE_EXT"/>
>+        <enum value="0x2029"        name="WGL_SWAP_COPY_ARB"/>
>+        <enum value="0x2029"        name="WGL_SWAP_COPY_EXT"/>
>+        <enum value="0x202A"        name="WGL_SWAP_UNDEFINED_ARB"/>
>+        <enum value="0x202A"        name="WGL_SWAP_UNDEFINED_EXT"/>
>+        <enum value="0x202B"        name="WGL_TYPE_RGBA_ARB"/>
>+        <enum value="0x202B"        name="WGL_TYPE_RGBA_EXT"/>
>+        <enum value="0x202C"        name="WGL_TYPE_COLORINDEX_ARB"/>
>+        <enum value="0x202C"        name="WGL_TYPE_COLORINDEX_EXT"/>
>+        <enum value="0x202D"        name="WGL_DRAW_TO_PBUFFER_ARB"/>
>+        <enum value="0x202D"        name="WGL_DRAW_TO_PBUFFER_EXT"/>
>+        <enum value="0x202E"        name="WGL_MAX_PBUFFER_PIXELS_ARB"/>
>+        <enum value="0x202E"        name="WGL_MAX_PBUFFER_PIXELS_EXT"/>
>+        <enum value="0x202F"        name="WGL_MAX_PBUFFER_WIDTH_ARB"/>
>+        <enum value="0x202F"        name="WGL_MAX_PBUFFER_WIDTH_EXT"/>
>+        <enum value="0x2030"        name="WGL_MAX_PBUFFER_HEIGHT_ARB"/>
>+        <enum value="0x2030"        name="WGL_MAX_PBUFFER_HEIGHT_EXT"/>
>+        <enum value="0x2031"        name="WGL_OPTIMAL_PBUFFER_WIDTH_EXT"/>
>+        <enum value="0x2032"        name="WGL_OPTIMAL_PBUFFER_HEIGHT_EXT"/>
>+        <enum value="0x2033"        name="WGL_PBUFFER_LARGEST_ARB"/>
>+        <enum value="0x2033"        name="WGL_PBUFFER_LARGEST_EXT"/>
>+        <enum value="0x2034"        name="WGL_PBUFFER_WIDTH_ARB"/>
>+        <enum value="0x2034"        name="WGL_PBUFFER_WIDTH_EXT"/>
>+        <enum value="0x2035"        name="WGL_PBUFFER_HEIGHT_ARB"/>
>+        <enum value="0x2035"        name="WGL_PBUFFER_HEIGHT_EXT"/>
>+        <enum value="0x2036"        name="WGL_PBUFFER_LOST_ARB"/>
>+        <enum value="0x2037"        name="WGL_TRANSPARENT_RED_VALUE_ARB"/>
>+        <enum value="0x2038"        name="WGL_TRANSPARENT_GREEN_VALUE_ARB"/>
>+        <enum value="0x2039"        name="WGL_TRANSPARENT_BLUE_VALUE_ARB"/>
>+        <enum value="0x203A"        name="WGL_TRANSPARENT_ALPHA_VALUE_ARB"/>
>+        <enum value="0x203B"        name="WGL_TRANSPARENT_INDEX_VALUE_ARB"/>
>+            <unused start="0x203C" end="0x203F"/>
>+    </enums>
>+
>+    <enums namespace="WGL" start="0x2040" end="0x205F" vendor="I3D">
>+        <enum value="0x2040"        name="WGL_DEPTH_FLOAT_EXT"/>
>+        <enum value="0x2041"        name="WGL_SAMPLE_BUFFERS_ARB"/>
>+        <enum value="0x2041"        name="WGL_SAMPLE_BUFFERS_EXT"/>
>+        <enum value="0x2042"        name="WGL_COVERAGE_SAMPLES_NV"/>
>+        <enum value="0x2042"        name="WGL_SAMPLES_ARB"/>
>+        <enum value="0x2042"        name="WGL_SAMPLES_EXT"/>
>+        <enum value="0x2043"        name="ERROR_INVALID_PIXEL_TYPE_ARB"/>
>+        <enum value="0x2043"        name="ERROR_INVALID_PIXEL_TYPE_EXT"/>
>+        <enum value="0x2044"        name="WGL_GENLOCK_SOURCE_MULTIVIEW_I3D"/>
>+        <enum value="0x2045"        name="WGL_GENLOCK_SOURCE_EXTERNAL_SYNC_I3D"/>
>+        <enum value="0x2046"        name="WGL_GENLOCK_SOURCE_EXTERNAL_FIELD_I3D"/>
>+        <enum value="0x2047"        name="WGL_GENLOCK_SOURCE_EXTERNAL_TTL_I3D"/>
>+        <enum value="0x2048"        name="WGL_GENLOCK_SOURCE_DIGITAL_SYNC_I3D"/>
>+        <enum value="0x2049"        name="WGL_GENLOCK_SOURCE_DIGITAL_FIELD_I3D"/>
>+        <enum value="0x204A"        name="WGL_GENLOCK_SOURCE_EDGE_FALLING_I3D"/>
>+        <enum value="0x204B"        name="WGL_GENLOCK_SOURCE_EDGE_RISING_I3D"/>
>+        <enum value="0x204C"        name="WGL_GENLOCK_SOURCE_EDGE_BOTH_I3D"/>
>+            <unused start="0x204D"/>
>+        <enum value="0x204E"        name="WGL_GAMMA_TABLE_SIZE_I3D"/>
>+        <enum value="0x204F"        name="WGL_GAMMA_EXCLUDE_DESKTOP_I3D"/>
>+        <enum value="0x2050"        name="WGL_DIGITAL_VIDEO_CURSOR_ALPHA_FRAMEBUFFER_I3D"/>
>+        <enum value="0x2051"        name="WGL_DIGITAL_VIDEO_CURSOR_ALPHA_VALUE_I3D"/>
>+        <enum value="0x2052"        name="WGL_DIGITAL_VIDEO_CURSOR_INCLUDED_I3D"/>
>+        <enum value="0x2053"        name="WGL_DIGITAL_VIDEO_GAMMA_CORRECTED_I3D"/>
>+        <enum value="0x2054"        name="ERROR_INCOMPATIBLE_DEVICE_CONTEXTS_ARB"/>
>+        <enum value="0x2055"        name="WGL_STEREO_EMITTER_ENABLE_3DL"/>
>+        <enum value="0x2056"        name="WGL_STEREO_EMITTER_DISABLE_3DL"/>
>+        <enum value="0x2057"        name="WGL_STEREO_POLARITY_NORMAL_3DL"/>
>+        <enum value="0x2058"        name="WGL_STEREO_POLARITY_INVERT_3DL"/>
>+            <unused start="0x2059" end="0x205F"/>
>+    </enums>
>+
>+    <enums namespace="WGL" start="0x2060" end="0x206F" vendor="3DFX">
>+            <unused start="0x2060" end="0x206F" comment="Could be reclaimed"/>
>+    </enums>
>+
>+    <enums namespace="WGL" start="0x2070" end="0x209F" vendor="ARB" comment="Shared with GLX; synchronize create_context enums">
>+        <enum value="0x2060"        name="WGL_SAMPLE_BUFFERS_3DFX"/>
>+        <enum value="0x2061"        name="WGL_SAMPLES_3DFX"/>
>+        <enum value="0x2070"        name="WGL_BIND_TO_TEXTURE_RGB_ARB"/>
>+        <enum value="0x2071"        name="WGL_BIND_TO_TEXTURE_RGBA_ARB"/>
>+        <enum value="0x2072"        name="WGL_TEXTURE_FORMAT_ARB"/>
>+        <enum value="0x2073"        name="WGL_TEXTURE_TARGET_ARB"/>
>+        <enum value="0x2074"        name="WGL_MIPMAP_TEXTURE_ARB"/>
>+        <enum value="0x2075"        name="WGL_TEXTURE_RGB_ARB"/>
>+        <enum value="0x2076"        name="WGL_TEXTURE_RGBA_ARB"/>
>+        <enum value="0x2077"        name="WGL_NO_TEXTURE_ARB"/>
>+        <enum value="0x2078"        name="WGL_TEXTURE_CUBE_MAP_ARB"/>
>+        <enum value="0x2079"        name="WGL_TEXTURE_1D_ARB"/>
>+        <enum value="0x207A"        name="WGL_TEXTURE_2D_ARB"/>
>+        <enum value="0x207B"        name="WGL_MIPMAP_LEVEL_ARB"/>
>+        <enum value="0x207C"        name="WGL_CUBE_MAP_FACE_ARB"/>
>+        <enum value="0x207D"        name="WGL_TEXTURE_CUBE_MAP_POSITIVE_X_ARB"/>
>+        <enum value="0x207E"        name="WGL_TEXTURE_CUBE_MAP_NEGATIVE_X_ARB"/>
>+        <enum value="0x207F"        name="WGL_TEXTURE_CUBE_MAP_POSITIVE_Y_ARB"/>
>+        <enum value="0x2080"        name="WGL_TEXTURE_CUBE_MAP_NEGATIVE_Y_ARB"/>
>+        <enum value="0x2081"        name="WGL_TEXTURE_CUBE_MAP_POSITIVE_Z_ARB"/>
>+        <enum value="0x2082"        name="WGL_TEXTURE_CUBE_MAP_NEGATIVE_Z_ARB"/>
>+        <enum value="0x2083"        name="WGL_FRONT_LEFT_ARB"/>
>+        <enum value="0x2084"        name="WGL_FRONT_RIGHT_ARB"/>
>+        <enum value="0x2085"        name="WGL_BACK_LEFT_ARB"/>
>+        <enum value="0x2086"        name="WGL_BACK_RIGHT_ARB"/>
>+        <enum value="0x2087"        name="WGL_AUX0_ARB"/>
>+        <enum value="0x2088"        name="WGL_AUX1_ARB"/>
>+        <enum value="0x2089"        name="WGL_AUX2_ARB"/>
>+        <enum value="0x208A"        name="WGL_AUX3_ARB"/>
>+        <enum value="0x208B"        name="WGL_AUX4_ARB"/>
>+        <enum value="0x208C"        name="WGL_AUX5_ARB"/>
>+        <enum value="0x208D"        name="WGL_AUX6_ARB"/>
>+        <enum value="0x208E"        name="WGL_AUX7_ARB"/>
>+        <enum value="0x208F"        name="WGL_AUX8_ARB"/>
>+        <enum value="0x2090"        name="WGL_AUX9_ARB"/>
>+        <enum value="0x2091"        name="WGL_CONTEXT_MAJOR_VERSION_ARB"/>
>+        <enum value="0x2092"        name="WGL_CONTEXT_MINOR_VERSION_ARB"/>
>+        <enum value="0x2093"        name="WGL_CONTEXT_LAYER_PLANE_ARB"/>
>+        <enum value="0x2094"        name="WGL_CONTEXT_FLAGS_ARB"/>
>+        <enum value="0x2095"        name="ERROR_INVALID_VERSION_ARB"/>
>+        <enum value="0x2096"        name="ERROR_INVALID_PROFILE_ARB"/>
>+        <enum value="0x2097"        name="WGL_CONTEXT_RELEASE_BEHAVIOR_ARB"/>
>+        <enum value="0x2098"        name="WGL_CONTEXT_RELEASE_BEHAVIOR_FLUSH_ARB"/>
>+            <unused start="0x2099" end="0x209F"/>
>+    </enums>
>+
>+    <enums namespace="WGL" start="0x20A0" end="0x219F" vendor="NV" comment="shared with GLX">
>+        <enum value="0x20A0"        name="WGL_BIND_TO_TEXTURE_RECTANGLE_RGB_NV"/>
>+        <enum value="0x20A1"        name="WGL_BIND_TO_TEXTURE_RECTANGLE_RGBA_NV"/>
>+        <enum value="0x20A2"        name="WGL_TEXTURE_RECTANGLE_NV"/>
>+        <enum value="0x20A3"        name="WGL_BIND_TO_TEXTURE_DEPTH_NV"/>
>+        <enum value="0x20A4"        name="WGL_BIND_TO_TEXTURE_RECTANGLE_DEPTH_NV"/>
>+        <enum value="0x20A5"        name="WGL_DEPTH_TEXTURE_FORMAT_NV"/>
>+        <enum value="0x20A6"        name="WGL_TEXTURE_DEPTH_COMPONENT_NV"/>
>+        <enum value="0x20A7"        name="WGL_DEPTH_COMPONENT_NV"/>
>+        <enum value="0x20A8"        name="WGL_TYPE_RGBA_UNSIGNED_FLOAT_EXT"/>
>+        <enum value="0x20A9"        name="WGL_FRAMEBUFFER_SRGB_CAPABLE_ARB"/>
>+        <enum value="0x20A9"        name="WGL_FRAMEBUFFER_SRGB_CAPABLE_EXT"/>
>+            <unused start="0x20AA" end="0x20AF"/>
>+        <enum value="0x20B0"        name="WGL_FLOAT_COMPONENTS_NV"/>
>+        <enum value="0x20B1"        name="WGL_BIND_TO_TEXTURE_RECTANGLE_FLOAT_R_NV"/>
>+        <enum value="0x20B2"        name="WGL_BIND_TO_TEXTURE_RECTANGLE_FLOAT_RG_NV"/>
>+        <enum value="0x20B3"        name="WGL_BIND_TO_TEXTURE_RECTANGLE_FLOAT_RGB_NV"/>
>+        <enum value="0x20B4"        name="WGL_BIND_TO_TEXTURE_RECTANGLE_FLOAT_RGBA_NV"/>
>+        <enum value="0x20B5"        name="WGL_TEXTURE_FLOAT_R_NV"/>
>+        <enum value="0x20B6"        name="WGL_TEXTURE_FLOAT_RG_NV"/>
>+        <enum value="0x20B7"        name="WGL_TEXTURE_FLOAT_RGB_NV"/>
>+        <enum value="0x20B8"        name="WGL_TEXTURE_FLOAT_RGBA_NV"/>
>+        <enum value="0x20B9"        name="WGL_COLOR_SAMPLES_NV"/>
>+            <unused start="0x20BA" end="0x20BF"/>
>+        <enum value="0x20C0"        name="WGL_BIND_TO_VIDEO_RGB_NV"/>
>+        <enum value="0x20C1"        name="WGL_BIND_TO_VIDEO_RGBA_NV"/>
>+        <enum value="0x20C2"        name="WGL_BIND_TO_VIDEO_RGB_AND_DEPTH_NV"/>
>+        <enum value="0x20C3"        name="WGL_VIDEO_OUT_COLOR_NV"/>
>+        <enum value="0x20C4"        name="WGL_VIDEO_OUT_ALPHA_NV"/>
>+        <enum value="0x20C5"        name="WGL_VIDEO_OUT_DEPTH_NV"/>
>+        <enum value="0x20C6"        name="WGL_VIDEO_OUT_COLOR_AND_ALPHA_NV"/>
>+        <enum value="0x20C7"        name="WGL_VIDEO_OUT_COLOR_AND_DEPTH_NV"/>
>+        <enum value="0x20C8"        name="WGL_VIDEO_OUT_FRAME"/>
>+        <enum value="0x20C9"        name="WGL_VIDEO_OUT_FIELD_1"/>
>+        <enum value="0x20CA"        name="WGL_VIDEO_OUT_FIELD_2"/>
>+        <enum value="0x20CB"        name="WGL_VIDEO_OUT_STACKED_FIELDS_1_2"/>
>+        <enum value="0x20CC"        name="WGL_VIDEO_OUT_STACKED_FIELDS_2_1"/>
>+            <unused start="0x20CD" comment="reserved for GLX_DEVICE_ID_NV (not present in WGL interface)"/>
>+        <enum value="0x20CE"        name="WGL_UNIQUE_ID_NV"/>
>+        <enum value="0x20CF"        name="WGL_NUM_VIDEO_CAPTURE_SLOTS_NV"/>
>+        <enum value="0x20D0"        name="ERROR_INCOMPATIBLE_AFFINITY_MASKS_NV"/>
>+        <enum value="0x20D1"        name="ERROR_MISSING_AFFINITY_MASK_NV"/>
>+            <unused start="0x20D2" end="0x20EF"/>
>+        <enum value="0x20F0"        name="WGL_NUM_VIDEO_SLOTS_NV"/>
>+            <unused start="0x20F1" end="0x219F"/>
>+    </enums>
>+
>+    <enums namespace="WGL" start="0x21A0" end="0x21AF" vendor="AMD">
>+        <enum value="0x21A0"        name="WGL_TYPE_RGBA_FLOAT_ARB"/>
>+        <enum value="0x21A0"        name="WGL_TYPE_RGBA_FLOAT_ATI"/>
>+            <unused start="0x21A1"/>
>+        <enum value="0x21A2"        name="WGL_GPU_FASTEST_TARGET_GPUS_AMD"/>
>+        <enum value="0x21A3"        name="WGL_GPU_RAM_AMD"/>
>+        <enum value="0x21A4"        name="WGL_GPU_CLOCK_AMD"/>
>+        <enum value="0x21A5"        name="WGL_GPU_NUM_PIPES_AMD"/>
>+        <enum value="0x21A5"        name="WGL_TEXTURE_RECTANGLE_ATI" comment="Duplicates unrelated WGL_GPU_NUM_PIPES_AMD"/>
>+        <enum value="0x21A6"        name="WGL_GPU_NUM_SIMD_AMD"/>
>+        <enum value="0x21A7"        name="WGL_GPU_NUM_RB_AMD"/>
>+        <enum value="0x21A8"        name="WGL_GPU_NUM_SPI_AMD"/>
>+            <unused start="0x21A9" end="0x21AF"/>
>+    </enums>
>+
>+    <enums namespace="WGL" start="0x21B0" end="0x21BF" vendor="Matrox" comment="could be reclaimed (tentative, RFC sent to ARB 2002/10/3)">
>+        <unused start="0x21B0" end="0x21BF"/>
>+    </enums>
>+
>+
>+
>+
>+    <enums namespace="WGL" start="0x21C0" end="0x2FFF" vendor="ARB">
>+            <unused start="0x21C0" end="0x2FFF" comment="Reserved for future use"/>
>+    </enums>
>+
>+    <enums namespace="EGL" start="0x3080" end="0x30AF" vendor="KHR" comment="Values shared with EGL. Do not allocate additional values in this range.">
>+        <enum value="0x309D" name="WGL_COLORSPACE_EXT"/>
>+        <enum value="0x3089" name="WGL_COLORSPACE_SRGB_EXT"/>
>+        <enum value="0x308A" name="WGL_COLORSPACE_LINEAR_EXT"/>
>+    </enums>
>+
>+    <enums namespace="WGL" start="0x31B3" end="0x31B3" vendor="ARB" comment="Shared with GLX.">
>+        <enum value="0x31B3" name="WGL_CONTEXT_OPENGL_NO_ERROR_ARB"/>
>+    </enums>
>+
>+    <enums namespace="GL" start="0x8250" end="0x826F" vendor="ARB" comment="Values shared with GL. Do not allocate additional values in this range.">
>+        <enum value="0x8252"        name="WGL_LOSE_CONTEXT_ON_RESET_ARB"/>
>+        <enum value="0x8256"        name="WGL_CONTEXT_RESET_NOTIFICATION_STRATEGY_ARB"/>
>+        <enum value="0x8261"        name="WGL_NO_RESET_NOTIFICATION_ARB"/>
>+    </enums>
>+
>+    <enums namespace="GL" start="0x9120" end="0x912F"  vendor="ARB" comment="Values shared with GL. Do not allocate additional values in this range.">
>+        <enum value="0x9126"        name="WGL_CONTEXT_PROFILE_MASK_ARB"/>
>+    </enums>
>+
>+    
>+    <commands namespace="WGL">
>+        <command>
>+            <proto>int <name>ChoosePixelFormat</name></proto>
>+            <param><ptype>HDC</ptype> <name>hDc</name></param>
>+            <param>const <ptype>PIXELFORMATDESCRIPTOR</ptype> *<name>pPfd</name></param>
>+        </command>
>+        <command>
>+            <proto>int <name>DescribePixelFormat</name></proto>
>+            <param><ptype>HDC</ptype> <name>hdc</name></param>
>+            <param>int <name>ipfd</name></param>
>+            <param><ptype>UINT</ptype> <name>cjpfd</name></param>
>+            <param>const <ptype>PIXELFORMATDESCRIPTOR</ptype> *<name>ppfd</name></param>
>+        </command>
>+        <command>
>+            <proto>int <name>GetPixelFormat</name></proto>
>+            <param><ptype>HDC</ptype> <name>hdc</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>BOOL</ptype> <name>SetPixelFormat</name></proto>
>+            <param><ptype>HDC</ptype> <name>hdc</name></param>
>+            <param>int <name>ipfd</name></param>
>+            <param>const <ptype>PIXELFORMATDESCRIPTOR</ptype> *<name>ppfd</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>BOOL</ptype> <name>SwapBuffers</name></proto>
>+            <param><ptype>HDC</ptype> <name>hdc</name></param>
>+        </command>
>+        <command>
>+            <proto>void *<name>wglAllocateMemoryNV</name></proto>
>+            <param><ptype>GLsizei</ptype> <name>size</name></param>
>+            <param><ptype>GLfloat</ptype> <name>readfreq</name></param>
>+            <param><ptype>GLfloat</ptype> <name>writefreq</name></param>
>+            <param><ptype>GLfloat</ptype> <name>priority</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>BOOL</ptype> <name>wglAssociateImageBufferEventsI3D</name></proto>
>+            <param><ptype>HDC</ptype> <name>hDC</name></param>
>+            <param>const <ptype>HANDLE</ptype> *<name>pEvent</name></param>
>+            <param>const <ptype>LPVOID</ptype> *<name>pAddress</name></param>
>+            <param>const <ptype>DWORD</ptype> *<name>pSize</name></param>
>+            <param><ptype>UINT</ptype> <name>count</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>BOOL</ptype> <name>wglBeginFrameTrackingI3D</name></proto>
>+        </command>
>+        <command>
>+            <proto><ptype>GLboolean</ptype> <name>wglBindDisplayColorTableEXT</name></proto>
>+            <param><ptype>GLushort</ptype> <name>id</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>BOOL</ptype> <name>wglBindSwapBarrierNV</name></proto>
>+            <param><ptype>GLuint</ptype> <name>group</name></param>
>+            <param><ptype>GLuint</ptype> <name>barrier</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>BOOL</ptype> <name>wglBindTexImageARB</name></proto>
>+            <param><ptype>HPBUFFERARB</ptype> <name>hPbuffer</name></param>
>+            <param>int <name>iBuffer</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>BOOL</ptype> <name>wglBindVideoCaptureDeviceNV</name></proto>
>+            <param><ptype>UINT</ptype> <name>uVideoSlot</name></param>
>+            <param><ptype>HVIDEOINPUTDEVICENV</ptype> <name>hDevice</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>BOOL</ptype> <name>wglBindVideoDeviceNV</name></proto>
>+            <param><ptype>HDC</ptype> <name>hDC</name></param>
>+            <param>unsigned int <name>uVideoSlot</name></param>
>+            <param><ptype>HVIDEOOUTPUTDEVICENV</ptype> <name>hVideoDevice</name></param>
>+            <param>const int *<name>piAttribList</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>BOOL</ptype> <name>wglBindVideoImageNV</name></proto>
>+            <param><ptype>HPVIDEODEV</ptype> <name>hVideoDevice</name></param>
>+            <param><ptype>HPBUFFERARB</ptype> <name>hPbuffer</name></param>
>+            <param>int <name>iVideoBuffer</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>VOID</ptype> <name>wglBlitContextFramebufferAMD</name></proto>
>+            <param><ptype>HGLRC</ptype> <name>dstCtx</name></param>
>+            <param><ptype>GLint</ptype> <name>srcX0</name></param>
>+            <param><ptype>GLint</ptype> <name>srcY0</name></param>
>+            <param><ptype>GLint</ptype> <name>srcX1</name></param>
>+            <param><ptype>GLint</ptype> <name>srcY1</name></param>
>+            <param><ptype>GLint</ptype> <name>dstX0</name></param>
>+            <param><ptype>GLint</ptype> <name>dstY0</name></param>
>+            <param><ptype>GLint</ptype> <name>dstX1</name></param>
>+            <param><ptype>GLint</ptype> <name>dstY1</name></param>
>+            <param><ptype>GLbitfield</ptype> <name>mask</name></param>
>+            <param><ptype>GLenum</ptype> <name>filter</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>BOOL</ptype> <name>wglChoosePixelFormatARB</name></proto>
>+            <param><ptype>HDC</ptype> <name>hdc</name></param>
>+            <param>const int *<name>piAttribIList</name></param>
>+            <param>const <ptype>FLOAT</ptype> *<name>pfAttribFList</name></param>
>+            <param><ptype>UINT</ptype> <name>nMaxFormats</name></param>
>+            <param>int *<name>piFormats</name></param>
>+            <param><ptype>UINT</ptype> *<name>nNumFormats</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>BOOL</ptype> <name>wglChoosePixelFormatEXT</name></proto>
>+            <param><ptype>HDC</ptype> <name>hdc</name></param>
>+            <param>const int *<name>piAttribIList</name></param>
>+            <param>const <ptype>FLOAT</ptype> *<name>pfAttribFList</name></param>
>+            <param><ptype>UINT</ptype> <name>nMaxFormats</name></param>
>+            <param>int *<name>piFormats</name></param>
>+            <param><ptype>UINT</ptype> *<name>nNumFormats</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>BOOL</ptype> <name>wglCopyContext</name></proto>
>+            <param><ptype>HGLRC</ptype> <name>hglrcSrc</name></param>
>+            <param><ptype>HGLRC</ptype> <name>hglrcDst</name></param>
>+            <param><ptype>UINT</ptype> <name>mask</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>BOOL</ptype> <name>wglCopyImageSubDataNV</name></proto>
>+            <param><ptype>HGLRC</ptype> <name>hSrcRC</name></param>
>+            <param><ptype>GLuint</ptype> <name>srcName</name></param>
>+            <param><ptype>GLenum</ptype> <name>srcTarget</name></param>
>+            <param><ptype>GLint</ptype> <name>srcLevel</name></param>
>+            <param><ptype>GLint</ptype> <name>srcX</name></param>
>+            <param><ptype>GLint</ptype> <name>srcY</name></param>
>+            <param><ptype>GLint</ptype> <name>srcZ</name></param>
>+            <param><ptype>HGLRC</ptype> <name>hDstRC</name></param>
>+            <param><ptype>GLuint</ptype> <name>dstName</name></param>
>+            <param><ptype>GLenum</ptype> <name>dstTarget</name></param>
>+            <param><ptype>GLint</ptype> <name>dstLevel</name></param>
>+            <param><ptype>GLint</ptype> <name>dstX</name></param>
>+            <param><ptype>GLint</ptype> <name>dstY</name></param>
>+            <param><ptype>GLint</ptype> <name>dstZ</name></param>
>+            <param><ptype>GLsizei</ptype> <name>width</name></param>
>+            <param><ptype>GLsizei</ptype> <name>height</name></param>
>+            <param><ptype>GLsizei</ptype> <name>depth</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>HDC</ptype> <name>wglCreateAffinityDCNV</name></proto>
>+            <param>const <ptype>HGPUNV</ptype> *<name>phGpuList</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>HGLRC</ptype> <name>wglCreateAssociatedContextAMD</name></proto>
>+            <param><ptype>UINT</ptype> <name>id</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>HGLRC</ptype> <name>wglCreateAssociatedContextAttribsAMD</name></proto>
>+            <param><ptype>UINT</ptype> <name>id</name></param>
>+            <param><ptype>HGLRC</ptype> <name>hShareContext</name></param>
>+            <param>const int *<name>attribList</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>HANDLE</ptype> <name>wglCreateBufferRegionARB</name></proto>
>+            <param><ptype>HDC</ptype> <name>hDC</name></param>
>+            <param>int <name>iLayerPlane</name></param>
>+            <param><ptype>UINT</ptype> <name>uType</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>HGLRC</ptype> <name>wglCreateContext</name></proto>
>+            <param><ptype>HDC</ptype> <name>hDc</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>HGLRC</ptype> <name>wglCreateContextAttribsARB</name></proto>
>+            <param><ptype>HDC</ptype> <name>hDC</name></param>
>+            <param><ptype>HGLRC</ptype> <name>hShareContext</name></param>
>+            <param>const int *<name>attribList</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>GLboolean</ptype> <name>wglCreateDisplayColorTableEXT</name></proto>
>+            <param><ptype>GLushort</ptype> <name>id</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>LPVOID</ptype> <name>wglCreateImageBufferI3D</name></proto>
>+            <param><ptype>HDC</ptype> <name>hDC</name></param>
>+            <param><ptype>DWORD</ptype> <name>dwSize</name></param>
>+            <param><ptype>UINT</ptype> <name>uFlags</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>HGLRC</ptype> <name>wglCreateLayerContext</name></proto>
>+            <param><ptype>HDC</ptype> <name>hDc</name></param>
>+            <param>int <name>level</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>HPBUFFERARB</ptype> <name>wglCreatePbufferARB</name></proto>
>+            <param><ptype>HDC</ptype> <name>hDC</name></param>
>+            <param>int <name>iPixelFormat</name></param>
>+            <param>int <name>iWidth</name></param>
>+            <param>int <name>iHeight</name></param>
>+            <param>const int *<name>piAttribList</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>HPBUFFEREXT</ptype> <name>wglCreatePbufferEXT</name></proto>
>+            <param><ptype>HDC</ptype> <name>hDC</name></param>
>+            <param>int <name>iPixelFormat</name></param>
>+            <param>int <name>iWidth</name></param>
>+            <param>int <name>iHeight</name></param>
>+            <param>const int *<name>piAttribList</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>BOOL</ptype> <name>wglDelayBeforeSwapNV</name></proto>
>+            <param><ptype>HDC</ptype> <name>hDC</name></param>
>+            <param><ptype>GLfloat</ptype> <name>seconds</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>BOOL</ptype> <name>wglDeleteAssociatedContextAMD</name></proto>
>+            <param><ptype>HGLRC</ptype> <name>hglrc</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>VOID</ptype> <name>wglDeleteBufferRegionARB</name></proto>
>+            <param><ptype>HANDLE</ptype> <name>hRegion</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>BOOL</ptype> <name>wglDeleteContext</name></proto>
>+            <param><ptype>HGLRC</ptype> <name>oldContext</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>BOOL</ptype> <name>wglDeleteDCNV</name></proto>
>+            <param><ptype>HDC</ptype> <name>hdc</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>BOOL</ptype> <name>wglDescribeLayerPlane</name></proto>
>+            <param><ptype>HDC</ptype> <name>hDc</name></param>
>+            <param>int <name>pixelFormat</name></param>
>+            <param>int <name>layerPlane</name></param>
>+            <param><ptype>UINT</ptype> <name>nBytes</name></param>
>+            <param>const <ptype>LAYERPLANEDESCRIPTOR</ptype> *<name>plpd</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>VOID</ptype> <name>wglDestroyDisplayColorTableEXT</name></proto>
>+            <param><ptype>GLushort</ptype> <name>id</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>BOOL</ptype> <name>wglDestroyImageBufferI3D</name></proto>
>+            <param><ptype>HDC</ptype> <name>hDC</name></param>
>+            <param><ptype>LPVOID</ptype> <name>pAddress</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>BOOL</ptype> <name>wglDestroyPbufferARB</name></proto>
>+            <param><ptype>HPBUFFERARB</ptype> <name>hPbuffer</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>BOOL</ptype> <name>wglDestroyPbufferEXT</name></proto>
>+            <param><ptype>HPBUFFEREXT</ptype> <name>hPbuffer</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>BOOL</ptype> <name>wglDisableFrameLockI3D</name></proto>
>+        </command>
>+        <command>
>+            <proto><ptype>BOOL</ptype> <name>wglDisableGenlockI3D</name></proto>
>+            <param><ptype>HDC</ptype> <name>hDC</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>BOOL</ptype> <name>wglDXCloseDeviceNV</name></proto>
>+            <param><ptype>HANDLE</ptype> <name>hDevice</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>BOOL</ptype> <name>wglDXLockObjectsNV</name></proto>
>+            <param><ptype>HANDLE</ptype> <name>hDevice</name></param>
>+            <param><ptype>GLint</ptype> <name>count</name></param>
>+            <param><ptype>HANDLE</ptype> *<name>hObjects</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>BOOL</ptype> <name>wglDXObjectAccessNV</name></proto>
>+            <param><ptype>HANDLE</ptype> <name>hObject</name></param>
>+            <param><ptype>GLenum</ptype> <name>access</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>HANDLE</ptype> <name>wglDXOpenDeviceNV</name></proto>
>+            <param>void *<name>dxDevice</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>HANDLE</ptype> <name>wglDXRegisterObjectNV</name></proto>
>+            <param><ptype>HANDLE</ptype> <name>hDevice</name></param>
>+            <param>void *<name>dxObject</name></param>
>+            <param><ptype>GLuint</ptype> <name>name</name></param>
>+            <param><ptype>GLenum</ptype> <name>type</name></param>
>+            <param><ptype>GLenum</ptype> <name>access</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>BOOL</ptype> <name>wglDXSetResourceShareHandleNV</name></proto>
>+            <param>void *<name>dxObject</name></param>
>+            <param><ptype>HANDLE</ptype> <name>shareHandle</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>BOOL</ptype> <name>wglDXUnlockObjectsNV</name></proto>
>+            <param><ptype>HANDLE</ptype> <name>hDevice</name></param>
>+            <param><ptype>GLint</ptype> <name>count</name></param>
>+            <param><ptype>HANDLE</ptype> *<name>hObjects</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>BOOL</ptype> <name>wglDXUnregisterObjectNV</name></proto>
>+            <param><ptype>HANDLE</ptype> <name>hDevice</name></param>
>+            <param><ptype>HANDLE</ptype> <name>hObject</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>BOOL</ptype> <name>wglEnableFrameLockI3D</name></proto>
>+        </command>
>+        <command>
>+            <proto><ptype>BOOL</ptype> <name>wglEnableGenlockI3D</name></proto>
>+            <param><ptype>HDC</ptype> <name>hDC</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>BOOL</ptype> <name>wglEndFrameTrackingI3D</name></proto>
>+        </command>
>+        <command>
>+            <proto><ptype>UINT</ptype> <name>wglEnumerateVideoCaptureDevicesNV</name></proto>
>+            <param><ptype>HDC</ptype> <name>hDc</name></param>
>+            <param><ptype>HVIDEOINPUTDEVICENV</ptype> *<name>phDeviceList</name></param>
>+        </command>
>+        <command>
>+            <proto>int <name>wglEnumerateVideoDevicesNV</name></proto>
>+            <param><ptype>HDC</ptype> <name>hDC</name></param>
>+            <param><ptype>HVIDEOOUTPUTDEVICENV</ptype> *<name>phDeviceList</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>BOOL</ptype> <name>wglEnumGpuDevicesNV</name></proto>
>+            <param><ptype>HGPUNV</ptype> <name>hGpu</name></param>
>+            <param><ptype>UINT</ptype> <name>iDeviceIndex</name></param>
>+            <param><ptype>PGPU_DEVICE</ptype> <name>lpGpuDevice</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>BOOL</ptype> <name>wglEnumGpusFromAffinityDCNV</name></proto>
>+            <param><ptype>HDC</ptype> <name>hAffinityDC</name></param>
>+            <param><ptype>UINT</ptype> <name>iGpuIndex</name></param>
>+            <param><ptype>HGPUNV</ptype> *<name>hGpu</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>BOOL</ptype> <name>wglEnumGpusNV</name></proto>
>+            <param><ptype>UINT</ptype> <name>iGpuIndex</name></param>
>+            <param><ptype>HGPUNV</ptype> *<name>phGpu</name></param>
>+        </command>
>+        <command>
>+            <proto>void <name>wglFreeMemoryNV</name></proto>
>+            <param>void *<name>pointer</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>BOOL</ptype> <name>wglGenlockSampleRateI3D</name></proto>
>+            <param><ptype>HDC</ptype> <name>hDC</name></param>
>+            <param><ptype>UINT</ptype> <name>uRate</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>BOOL</ptype> <name>wglGenlockSourceDelayI3D</name></proto>
>+            <param><ptype>HDC</ptype> <name>hDC</name></param>
>+            <param><ptype>UINT</ptype> <name>uDelay</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>BOOL</ptype> <name>wglGenlockSourceEdgeI3D</name></proto>
>+            <param><ptype>HDC</ptype> <name>hDC</name></param>
>+            <param><ptype>UINT</ptype> <name>uEdge</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>BOOL</ptype> <name>wglGenlockSourceI3D</name></proto>
>+            <param><ptype>HDC</ptype> <name>hDC</name></param>
>+            <param><ptype>UINT</ptype> <name>uSource</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>UINT</ptype> <name>wglGetContextGPUIDAMD</name></proto>
>+            <param><ptype>HGLRC</ptype> <name>hglrc</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>HGLRC</ptype> <name>wglGetCurrentAssociatedContextAMD</name></proto>
>+        </command>
>+        <command>
>+            <proto><ptype>HGLRC</ptype> <name>wglGetCurrentContext</name></proto>
>+        </command>
>+        <command>
>+            <proto><ptype>HDC</ptype> <name>wglGetCurrentDC</name></proto>
>+        </command>
>+        <command>
>+            <proto><ptype>HDC</ptype> <name>wglGetCurrentReadDCARB</name></proto>
>+        </command>
>+        <command>
>+            <proto><ptype>HDC</ptype> <name>wglGetCurrentReadDCEXT</name></proto>
>+        </command>
>+        <command>
>+            <proto><ptype>PROC</ptype> <name>wglGetDefaultProcAddress</name></proto>
>+            <param><ptype>LPCSTR</ptype> <name>lpszProc</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>BOOL</ptype> <name>wglGetDigitalVideoParametersI3D</name></proto>
>+            <param><ptype>HDC</ptype> <name>hDC</name></param>
>+            <param>int <name>iAttribute</name></param>
>+            <param>int *<name>piValue</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>UINT</ptype> <name>GetEnhMetaFilePixelFormat</name></proto>
>+            <param><ptype>HENHMETAFILE</ptype> <name>hemf</name></param>
>+            <param>const <ptype>PIXELFORMATDESCRIPTOR</ptype> *<name>ppfd</name></param>
>+        </command>
>+        <command>
>+            <proto>const char *<name>wglGetExtensionsStringARB</name></proto>
>+            <param><ptype>HDC</ptype> <name>hdc</name></param>
>+        </command>
>+        <command>
>+            <proto>const char *<name>wglGetExtensionsStringEXT</name></proto>
>+        </command>
>+        <command>
>+            <proto><ptype>BOOL</ptype> <name>wglGetFrameUsageI3D</name></proto>
>+            <param>float *<name>pUsage</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>BOOL</ptype> <name>wglGetGammaTableI3D</name></proto>
>+            <param><ptype>HDC</ptype> <name>hDC</name></param>
>+            <param>int <name>iEntries</name></param>
>+            <param><ptype>USHORT</ptype> *<name>puRed</name></param>
>+            <param><ptype>USHORT</ptype> *<name>puGreen</name></param>
>+            <param><ptype>USHORT</ptype> *<name>puBlue</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>BOOL</ptype> <name>wglGetGammaTableParametersI3D</name></proto>
>+            <param><ptype>HDC</ptype> <name>hDC</name></param>
>+            <param>int <name>iAttribute</name></param>
>+            <param>int *<name>piValue</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>BOOL</ptype> <name>wglGetGenlockSampleRateI3D</name></proto>
>+            <param><ptype>HDC</ptype> <name>hDC</name></param>
>+            <param><ptype>UINT</ptype> *<name>uRate</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>BOOL</ptype> <name>wglGetGenlockSourceDelayI3D</name></proto>
>+            <param><ptype>HDC</ptype> <name>hDC</name></param>
>+            <param><ptype>UINT</ptype> *<name>uDelay</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>BOOL</ptype> <name>wglGetGenlockSourceEdgeI3D</name></proto>
>+            <param><ptype>HDC</ptype> <name>hDC</name></param>
>+            <param><ptype>UINT</ptype> *<name>uEdge</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>BOOL</ptype> <name>wglGetGenlockSourceI3D</name></proto>
>+            <param><ptype>HDC</ptype> <name>hDC</name></param>
>+            <param><ptype>UINT</ptype> *<name>uSource</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>UINT</ptype> <name>wglGetGPUIDsAMD</name></proto>
>+            <param><ptype>UINT</ptype> <name>maxCount</name></param>
>+            <param><ptype>UINT</ptype> *<name>ids</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>INT</ptype> <name>wglGetGPUInfoAMD</name></proto>
>+            <param><ptype>UINT</ptype> <name>id</name></param>
>+            <param>int <name>property</name></param>
>+            <param><ptype>GLenum</ptype> <name>dataType</name></param>
>+            <param><ptype>UINT</ptype> <name>size</name></param>
>+            <param>void *<name>data</name></param>
>+        </command>
>+        <command>
>+            <proto>int <name>wglGetLayerPaletteEntries</name></proto>
>+            <param><ptype>HDC</ptype> <name>hdc</name></param>
>+            <param>int <name>iLayerPlane</name></param>
>+            <param>int <name>iStart</name></param>
>+            <param>int <name>cEntries</name></param>
>+            <param>const <ptype>COLORREF</ptype> *<name>pcr</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>BOOL</ptype> <name>wglGetMscRateOML</name></proto>
>+            <param><ptype>HDC</ptype> <name>hdc</name></param>
>+            <param><ptype>INT32</ptype> *<name>numerator</name></param>
>+            <param><ptype>INT32</ptype> *<name>denominator</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>HDC</ptype> <name>wglGetPbufferDCARB</name></proto>
>+            <param><ptype>HPBUFFERARB</ptype> <name>hPbuffer</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>HDC</ptype> <name>wglGetPbufferDCEXT</name></proto>
>+            <param><ptype>HPBUFFEREXT</ptype> <name>hPbuffer</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>BOOL</ptype> <name>wglGetPixelFormatAttribfvARB</name></proto>
>+            <param><ptype>HDC</ptype> <name>hdc</name></param>
>+            <param>int <name>iPixelFormat</name></param>
>+            <param>int <name>iLayerPlane</name></param>
>+            <param><ptype>UINT</ptype> <name>nAttributes</name></param>
>+            <param>const int *<name>piAttributes</name></param>
>+            <param><ptype>FLOAT</ptype> *<name>pfValues</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>BOOL</ptype> <name>wglGetPixelFormatAttribfvEXT</name></proto>
>+            <param><ptype>HDC</ptype> <name>hdc</name></param>
>+            <param>int <name>iPixelFormat</name></param>
>+            <param>int <name>iLayerPlane</name></param>
>+            <param><ptype>UINT</ptype> <name>nAttributes</name></param>
>+            <param>int *<name>piAttributes</name></param>
>+            <param><ptype>FLOAT</ptype> *<name>pfValues</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>BOOL</ptype> <name>wglGetPixelFormatAttribivARB</name></proto>
>+            <param><ptype>HDC</ptype> <name>hdc</name></param>
>+            <param>int <name>iPixelFormat</name></param>
>+            <param>int <name>iLayerPlane</name></param>
>+            <param><ptype>UINT</ptype> <name>nAttributes</name></param>
>+            <param>const int *<name>piAttributes</name></param>
>+            <param>int *<name>piValues</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>BOOL</ptype> <name>wglGetPixelFormatAttribivEXT</name></proto>
>+            <param><ptype>HDC</ptype> <name>hdc</name></param>
>+            <param>int <name>iPixelFormat</name></param>
>+            <param>int <name>iLayerPlane</name></param>
>+            <param><ptype>UINT</ptype> <name>nAttributes</name></param>
>+            <param>int *<name>piAttributes</name></param>
>+            <param>int *<name>piValues</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>PROC</ptype> <name>wglGetProcAddress</name></proto>
>+            <param><ptype>LPCSTR</ptype> <name>lpszProc</name></param>
>+        </command>
>+        <command>
>+            <proto>int <name>wglGetSwapIntervalEXT</name></proto>
>+        </command>
>+        <command>
>+            <proto><ptype>BOOL</ptype> <name>wglGetSyncValuesOML</name></proto>
>+            <param><ptype>HDC</ptype> <name>hdc</name></param>
>+            <param><ptype>INT64</ptype> *<name>ust</name></param>
>+            <param><ptype>INT64</ptype> *<name>msc</name></param>
>+            <param><ptype>INT64</ptype> *<name>sbc</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>BOOL</ptype> <name>wglGetVideoDeviceNV</name></proto>
>+            <param><ptype>HDC</ptype> <name>hDC</name></param>
>+            <param>int <name>numDevices</name></param>
>+            <param><ptype>HPVIDEODEV</ptype> *<name>hVideoDevice</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>BOOL</ptype> <name>wglGetVideoInfoNV</name></proto>
>+            <param><ptype>HPVIDEODEV</ptype> <name>hpVideoDevice</name></param>
>+            <param>unsigned long *<name>pulCounterOutputPbuffer</name></param>
>+            <param>unsigned long *<name>pulCounterOutputVideo</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>BOOL</ptype> <name>wglIsEnabledFrameLockI3D</name></proto>
>+            <param><ptype>BOOL</ptype> *<name>pFlag</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>BOOL</ptype> <name>wglIsEnabledGenlockI3D</name></proto>
>+            <param><ptype>HDC</ptype> <name>hDC</name></param>
>+            <param><ptype>BOOL</ptype> *<name>pFlag</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>BOOL</ptype> <name>wglJoinSwapGroupNV</name></proto>
>+            <param><ptype>HDC</ptype> <name>hDC</name></param>
>+            <param><ptype>GLuint</ptype> <name>group</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>GLboolean</ptype> <name>wglLoadDisplayColorTableEXT</name></proto>
>+            <param>const <ptype>GLushort</ptype> *<name>table</name></param>
>+            <param><ptype>GLuint</ptype> <name>length</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>BOOL</ptype> <name>wglLockVideoCaptureDeviceNV</name></proto>
>+            <param><ptype>HDC</ptype> <name>hDc</name></param>
>+            <param><ptype>HVIDEOINPUTDEVICENV</ptype> <name>hDevice</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>BOOL</ptype> <name>wglMakeAssociatedContextCurrentAMD</name></proto>
>+            <param><ptype>HGLRC</ptype> <name>hglrc</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>BOOL</ptype> <name>wglMakeContextCurrentARB</name></proto>
>+            <param><ptype>HDC</ptype> <name>hDrawDC</name></param>
>+            <param><ptype>HDC</ptype> <name>hReadDC</name></param>
>+            <param><ptype>HGLRC</ptype> <name>hglrc</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>BOOL</ptype> <name>wglMakeContextCurrentEXT</name></proto>
>+            <param><ptype>HDC</ptype> <name>hDrawDC</name></param>
>+            <param><ptype>HDC</ptype> <name>hReadDC</name></param>
>+            <param><ptype>HGLRC</ptype> <name>hglrc</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>BOOL</ptype> <name>wglMakeCurrent</name></proto>
>+            <param><ptype>HDC</ptype> <name>hDc</name></param>
>+            <param><ptype>HGLRC</ptype> <name>newContext</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>BOOL</ptype> <name>wglQueryCurrentContextNV</name></proto>
>+            <param>int <name>iAttribute</name></param>
>+            <param>int *<name>piValue</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>BOOL</ptype> <name>wglQueryFrameCountNV</name></proto>
>+            <param><ptype>HDC</ptype> <name>hDC</name></param>
>+            <param><ptype>GLuint</ptype> *<name>count</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>BOOL</ptype> <name>wglQueryFrameLockMasterI3D</name></proto>
>+            <param><ptype>BOOL</ptype> *<name>pFlag</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>BOOL</ptype> <name>wglQueryFrameTrackingI3D</name></proto>
>+            <param><ptype>DWORD</ptype> *<name>pFrameCount</name></param>
>+            <param><ptype>DWORD</ptype> *<name>pMissedFrames</name></param>
>+            <param>float *<name>pLastMissedUsage</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>BOOL</ptype> <name>wglQueryGenlockMaxSourceDelayI3D</name></proto>
>+            <param><ptype>HDC</ptype> <name>hDC</name></param>
>+            <param><ptype>UINT</ptype> *<name>uMaxLineDelay</name></param>
>+            <param><ptype>UINT</ptype> *<name>uMaxPixelDelay</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>BOOL</ptype> <name>wglQueryMaxSwapGroupsNV</name></proto>
>+            <param><ptype>HDC</ptype> <name>hDC</name></param>
>+            <param><ptype>GLuint</ptype> *<name>maxGroups</name></param>
>+            <param><ptype>GLuint</ptype> *<name>maxBarriers</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>BOOL</ptype> <name>wglQueryPbufferARB</name></proto>
>+            <param><ptype>HPBUFFERARB</ptype> <name>hPbuffer</name></param>
>+            <param>int <name>iAttribute</name></param>
>+            <param>int *<name>piValue</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>BOOL</ptype> <name>wglQueryPbufferEXT</name></proto>
>+            <param><ptype>HPBUFFEREXT</ptype> <name>hPbuffer</name></param>
>+            <param>int <name>iAttribute</name></param>
>+            <param>int *<name>piValue</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>BOOL</ptype> <name>wglQuerySwapGroupNV</name></proto>
>+            <param><ptype>HDC</ptype> <name>hDC</name></param>
>+            <param><ptype>GLuint</ptype> *<name>group</name></param>
>+            <param><ptype>GLuint</ptype> *<name>barrier</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>BOOL</ptype> <name>wglQueryVideoCaptureDeviceNV</name></proto>
>+            <param><ptype>HDC</ptype> <name>hDc</name></param>
>+            <param><ptype>HVIDEOINPUTDEVICENV</ptype> <name>hDevice</name></param>
>+            <param>int <name>iAttribute</name></param>
>+            <param>int *<name>piValue</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>BOOL</ptype> <name>wglRealizeLayerPalette</name></proto>
>+            <param><ptype>HDC</ptype> <name>hdc</name></param>
>+            <param>int <name>iLayerPlane</name></param>
>+            <param><ptype>BOOL</ptype> <name>bRealize</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>BOOL</ptype> <name>wglReleaseImageBufferEventsI3D</name></proto>
>+            <param><ptype>HDC</ptype> <name>hDC</name></param>
>+            <param>const <ptype>LPVOID</ptype> *<name>pAddress</name></param>
>+            <param><ptype>UINT</ptype> <name>count</name></param>
>+        </command>
>+        <command>
>+            <proto>int <name>wglReleasePbufferDCARB</name></proto>
>+            <param><ptype>HPBUFFERARB</ptype> <name>hPbuffer</name></param>
>+            <param><ptype>HDC</ptype> <name>hDC</name></param>
>+        </command>
>+        <command>
>+            <proto>int <name>wglReleasePbufferDCEXT</name></proto>
>+            <param><ptype>HPBUFFEREXT</ptype> <name>hPbuffer</name></param>
>+            <param><ptype>HDC</ptype> <name>hDC</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>BOOL</ptype> <name>wglReleaseTexImageARB</name></proto>
>+            <param><ptype>HPBUFFERARB</ptype> <name>hPbuffer</name></param>
>+            <param>int <name>iBuffer</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>BOOL</ptype> <name>wglReleaseVideoCaptureDeviceNV</name></proto>
>+            <param><ptype>HDC</ptype> <name>hDc</name></param>
>+            <param><ptype>HVIDEOINPUTDEVICENV</ptype> <name>hDevice</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>BOOL</ptype> <name>wglReleaseVideoDeviceNV</name></proto>
>+            <param><ptype>HPVIDEODEV</ptype> <name>hVideoDevice</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>BOOL</ptype> <name>wglReleaseVideoImageNV</name></proto>
>+            <param><ptype>HPBUFFERARB</ptype> <name>hPbuffer</name></param>
>+            <param>int <name>iVideoBuffer</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>BOOL</ptype> <name>wglResetFrameCountNV</name></proto>
>+            <param><ptype>HDC</ptype> <name>hDC</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>BOOL</ptype> <name>wglRestoreBufferRegionARB</name></proto>
>+            <param><ptype>HANDLE</ptype> <name>hRegion</name></param>
>+            <param>int <name>x</name></param>
>+            <param>int <name>y</name></param>
>+            <param>int <name>width</name></param>
>+            <param>int <name>height</name></param>
>+            <param>int <name>xSrc</name></param>
>+            <param>int <name>ySrc</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>BOOL</ptype> <name>wglSaveBufferRegionARB</name></proto>
>+            <param><ptype>HANDLE</ptype> <name>hRegion</name></param>
>+            <param>int <name>x</name></param>
>+            <param>int <name>y</name></param>
>+            <param>int <name>width</name></param>
>+            <param>int <name>height</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>BOOL</ptype> <name>wglSendPbufferToVideoNV</name></proto>
>+            <param><ptype>HPBUFFERARB</ptype> <name>hPbuffer</name></param>
>+            <param>int <name>iBufferType</name></param>
>+            <param>unsigned long *<name>pulCounterPbuffer</name></param>
>+            <param><ptype>BOOL</ptype> <name>bBlock</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>BOOL</ptype> <name>wglSetDigitalVideoParametersI3D</name></proto>
>+            <param><ptype>HDC</ptype> <name>hDC</name></param>
>+            <param>int <name>iAttribute</name></param>
>+            <param>const int *<name>piValue</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>BOOL</ptype> <name>wglSetGammaTableI3D</name></proto>
>+            <param><ptype>HDC</ptype> <name>hDC</name></param>
>+            <param>int <name>iEntries</name></param>
>+            <param>const <ptype>USHORT</ptype> *<name>puRed</name></param>
>+            <param>const <ptype>USHORT</ptype> *<name>puGreen</name></param>
>+            <param>const <ptype>USHORT</ptype> *<name>puBlue</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>BOOL</ptype> <name>wglSetGammaTableParametersI3D</name></proto>
>+            <param><ptype>HDC</ptype> <name>hDC</name></param>
>+            <param>int <name>iAttribute</name></param>
>+            <param>const int *<name>piValue</name></param>
>+        </command>
>+        <command>
>+            <proto>int <name>wglSetLayerPaletteEntries</name></proto>
>+            <param><ptype>HDC</ptype> <name>hdc</name></param>
>+            <param>int <name>iLayerPlane</name></param>
>+            <param>int <name>iStart</name></param>
>+            <param>int <name>cEntries</name></param>
>+            <param>const <ptype>COLORREF</ptype> *<name>pcr</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>BOOL</ptype> <name>wglSetPbufferAttribARB</name></proto>
>+            <param><ptype>HPBUFFERARB</ptype> <name>hPbuffer</name></param>
>+            <param>const int *<name>piAttribList</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>BOOL</ptype> <name>wglSetStereoEmitterState3DL</name></proto>
>+            <param><ptype>HDC</ptype> <name>hDC</name></param>
>+            <param><ptype>UINT</ptype> <name>uState</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>BOOL</ptype> <name>wglShareLists</name></proto>
>+            <param><ptype>HGLRC</ptype> <name>hrcSrvShare</name></param>
>+            <param><ptype>HGLRC</ptype> <name>hrcSrvSource</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>INT64</ptype> <name>wglSwapBuffersMscOML</name></proto>
>+            <param><ptype>HDC</ptype> <name>hdc</name></param>
>+            <param><ptype>INT64</ptype> <name>target_msc</name></param>
>+            <param><ptype>INT64</ptype> <name>divisor</name></param>
>+            <param><ptype>INT64</ptype> <name>remainder</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>BOOL</ptype> <name>wglSwapLayerBuffers</name></proto>
>+            <param><ptype>HDC</ptype> <name>hdc</name></param>
>+            <param><ptype>UINT</ptype> <name>fuFlags</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>BOOL</ptype> <name>wglSwapIntervalEXT</name></proto>
>+            <param>int <name>interval</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>INT64</ptype> <name>wglSwapLayerBuffersMscOML</name></proto>
>+            <param><ptype>HDC</ptype> <name>hdc</name></param>
>+            <param>int <name>fuPlanes</name></param>
>+            <param><ptype>INT64</ptype> <name>target_msc</name></param>
>+            <param><ptype>INT64</ptype> <name>divisor</name></param>
>+            <param><ptype>INT64</ptype> <name>remainder</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>BOOL</ptype> <name>wglUseFontBitmaps</name></proto>
>+            <param><ptype>HDC</ptype> <name>hDC</name></param>
>+            <param><ptype>DWORD</ptype> <name>first</name></param>
>+            <param><ptype>DWORD</ptype> <name>count</name></param>
>+            <param><ptype>DWORD</ptype> <name>listBase</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>BOOL</ptype> <name>wglUseFontBitmapsA</name></proto>
>+            <param><ptype>HDC</ptype> <name>hDC</name></param>
>+            <param><ptype>DWORD</ptype> <name>first</name></param>
>+            <param><ptype>DWORD</ptype> <name>count</name></param>
>+            <param><ptype>DWORD</ptype> <name>listBase</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>BOOL</ptype> <name>wglUseFontBitmapsW</name></proto>
>+            <param><ptype>HDC</ptype> <name>hDC</name></param>
>+            <param><ptype>DWORD</ptype> <name>first</name></param>
>+            <param><ptype>DWORD</ptype> <name>count</name></param>
>+            <param><ptype>DWORD</ptype> <name>listBase</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>BOOL</ptype> <name>wglUseFontOutlines</name></proto>
>+            <param><ptype>HDC</ptype> <name>hDC</name></param>
>+            <param><ptype>DWORD</ptype> <name>first</name></param>
>+            <param><ptype>DWORD</ptype> <name>count</name></param>
>+            <param><ptype>DWORD</ptype> <name>listBase</name></param>
>+            <param><ptype>FLOAT</ptype> <name>deviation</name></param>
>+            <param><ptype>FLOAT</ptype> <name>extrusion</name></param>
>+            <param>int <name>format</name></param>
>+            <param><ptype>LPGLYPHMETRICSFLOAT</ptype> <name>lpgmf</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>BOOL</ptype> <name>wglUseFontOutlinesA</name></proto>
>+            <param><ptype>HDC</ptype> <name>hDC</name></param>
>+            <param><ptype>DWORD</ptype> <name>first</name></param>
>+            <param><ptype>DWORD</ptype> <name>count</name></param>
>+            <param><ptype>DWORD</ptype> <name>listBase</name></param>
>+            <param><ptype>FLOAT</ptype> <name>deviation</name></param>
>+            <param><ptype>FLOAT</ptype> <name>extrusion</name></param>
>+            <param>int <name>format</name></param>
>+            <param><ptype>LPGLYPHMETRICSFLOAT</ptype> <name>lpgmf</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>BOOL</ptype> <name>wglUseFontOutlinesW</name></proto>
>+            <param><ptype>HDC</ptype> <name>hDC</name></param>
>+            <param><ptype>DWORD</ptype> <name>first</name></param>
>+            <param><ptype>DWORD</ptype> <name>count</name></param>
>+            <param><ptype>DWORD</ptype> <name>listBase</name></param>
>+            <param><ptype>FLOAT</ptype> <name>deviation</name></param>
>+            <param><ptype>FLOAT</ptype> <name>extrusion</name></param>
>+            <param>int <name>format</name></param>
>+            <param><ptype>LPGLYPHMETRICSFLOAT</ptype> <name>lpgmf</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>BOOL</ptype> <name>wglWaitForMscOML</name></proto>
>+            <param><ptype>HDC</ptype> <name>hdc</name></param>
>+            <param><ptype>INT64</ptype> <name>target_msc</name></param>
>+            <param><ptype>INT64</ptype> <name>divisor</name></param>
>+            <param><ptype>INT64</ptype> <name>remainder</name></param>
>+            <param><ptype>INT64</ptype> *<name>ust</name></param>
>+            <param><ptype>INT64</ptype> *<name>msc</name></param>
>+            <param><ptype>INT64</ptype> *<name>sbc</name></param>
>+        </command>
>+        <command>
>+            <proto><ptype>BOOL</ptype> <name>wglWaitForSbcOML</name></proto>
>+            <param><ptype>HDC</ptype> <name>hdc</name></param>
>+            <param><ptype>INT64</ptype> <name>target_sbc</name></param>
>+            <param><ptype>INT64</ptype> *<name>ust</name></param>
>+            <param><ptype>INT64</ptype> *<name>msc</name></param>
>+            <param><ptype>INT64</ptype> *<name>sbc</name></param>
>+        </command>
>+    </commands>
>+
>+    
>+    <feature api="wgl" name="WGL_VERSION_1_0" number="1.0">
>+        <require>
>+            <enum name="WGL_FONT_LINES"/>
>+            <enum name="WGL_FONT_POLYGONS"/>
>+            <enum name="WGL_SWAP_MAIN_PLANE"/>
>+            <enum name="WGL_SWAP_OVERLAY1"/>
>+            <enum name="WGL_SWAP_OVERLAY2"/>
>+            <enum name="WGL_SWAP_OVERLAY3"/>
>+            <enum name="WGL_SWAP_OVERLAY4"/>
>+            <enum name="WGL_SWAP_OVERLAY5"/>
>+            <enum name="WGL_SWAP_OVERLAY6"/>
>+            <enum name="WGL_SWAP_OVERLAY7"/>
>+            <enum name="WGL_SWAP_OVERLAY8"/>
>+            <enum name="WGL_SWAP_OVERLAY9"/>
>+            <enum name="WGL_SWAP_OVERLAY10"/>
>+            <enum name="WGL_SWAP_OVERLAY11"/>
>+            <enum name="WGL_SWAP_OVERLAY12"/>
>+            <enum name="WGL_SWAP_OVERLAY13"/>
>+            <enum name="WGL_SWAP_OVERLAY14"/>
>+            <enum name="WGL_SWAP_OVERLAY15"/>
>+            <enum name="WGL_SWAP_UNDERLAY1"/>
>+            <enum name="WGL_SWAP_UNDERLAY2"/>
>+            <enum name="WGL_SWAP_UNDERLAY3"/>
>+            <enum name="WGL_SWAP_UNDERLAY4"/>
>+            <enum name="WGL_SWAP_UNDERLAY5"/>
>+            <enum name="WGL_SWAP_UNDERLAY6"/>
>+            <enum name="WGL_SWAP_UNDERLAY7"/>
>+            <enum name="WGL_SWAP_UNDERLAY8"/>
>+            <enum name="WGL_SWAP_UNDERLAY9"/>
>+            <enum name="WGL_SWAP_UNDERLAY10"/>
>+            <enum name="WGL_SWAP_UNDERLAY11"/>
>+            <enum name="WGL_SWAP_UNDERLAY12"/>
>+            <enum name="WGL_SWAP_UNDERLAY13"/>
>+            <enum name="WGL_SWAP_UNDERLAY14"/>
>+            <enum name="WGL_SWAP_UNDERLAY15"/>
>+            <command name="ChoosePixelFormat"/>
>+            <command name="DescribePixelFormat"/>
>+            <command name="GetEnhMetaFilePixelFormat"/>
>+            <command name="GetPixelFormat"/>
>+            <command name="SetPixelFormat"/>
>+            <command name="SwapBuffers"/>
>+            <command name="wglCopyContext"/>
>+            <command name="wglCreateContext"/>
>+            <command name="wglCreateLayerContext"/>
>+            <command name="wglDeleteContext"/>
>+            <command name="wglDescribeLayerPlane"/>
>+            <command name="wglGetCurrentContext"/>
>+            <command name="wglGetCurrentDC"/>
>+            <command name="wglGetLayerPaletteEntries"/>
>+            <command name="wglGetProcAddress"/>
>+            <command name="wglMakeCurrent"/>
>+            <command name="wglRealizeLayerPalette"/>
>+            <command name="wglSetLayerPaletteEntries"/>
>+            <command name="wglShareLists"/>
>+            <command name="wglSwapLayerBuffers"/>
>+            <command name="wglUseFontBitmaps"/>
>+            <command name="wglUseFontBitmapsA"/>
>+            <command name="wglUseFontBitmapsW"/>
>+            <command name="wglUseFontOutlines"/>
>+            <command name="wglUseFontOutlinesA"/>
>+            <command name="wglUseFontOutlinesW"/>
>+        </require>
>+    </feature>
>+
>+    
>+    <extensions>
>+        <extension name="WGL_3DFX_multisample" supported="wgl">
>+            <require>
>+                <enum name="WGL_SAMPLE_BUFFERS_3DFX"/>
>+                <enum name="WGL_SAMPLES_3DFX"/>
>+            </require>
>+        </extension>
>+        <extension name="WGL_3DL_stereo_control" supported="wgl">
>+            <require>
>+                <enum name="WGL_STEREO_EMITTER_ENABLE_3DL"/>
>+                <enum name="WGL_STEREO_EMITTER_DISABLE_3DL"/>
>+                <enum name="WGL_STEREO_POLARITY_NORMAL_3DL"/>
>+                <enum name="WGL_STEREO_POLARITY_INVERT_3DL"/>
>+                <command name="wglSetStereoEmitterState3DL"/>
>+            </require>
>+        </extension>
>+        <extension name="WGL_AMD_gpu_association" supported="wgl">
>+            <require>
>+                <enum name="WGL_GPU_VENDOR_AMD"/>
>+                <enum name="WGL_GPU_RENDERER_STRING_AMD"/>
>+                <enum name="WGL_GPU_OPENGL_VERSION_STRING_AMD"/>
>+                <enum name="WGL_GPU_FASTEST_TARGET_GPUS_AMD"/>
>+                <enum name="WGL_GPU_RAM_AMD"/>
>+                <enum name="WGL_GPU_CLOCK_AMD"/>
>+                <enum name="WGL_GPU_NUM_PIPES_AMD"/>
>+                <enum name="WGL_GPU_NUM_SIMD_AMD"/>
>+                <enum name="WGL_GPU_NUM_RB_AMD"/>
>+                <enum name="WGL_GPU_NUM_SPI_AMD"/>
>+                <command name="wglGetGPUIDsAMD"/>
>+                <command name="wglGetGPUInfoAMD"/>
>+                <command name="wglGetContextGPUIDAMD"/>
>+                <command name="wglCreateAssociatedContextAMD"/>
>+                <command name="wglCreateAssociatedContextAttribsAMD"/>
>+                <command name="wglDeleteAssociatedContextAMD"/>
>+                <command name="wglMakeAssociatedContextCurrentAMD"/>
>+                <command name="wglGetCurrentAssociatedContextAMD"/>
>+                <command name="wglBlitContextFramebufferAMD"/>
>+            </require>
>+        </extension>
>+        <extension name="WGL_ARB_buffer_region" supported="wgl">
>+            <require>
>+                <enum name="WGL_FRONT_COLOR_BUFFER_BIT_ARB"/>
>+                <enum name="WGL_BACK_COLOR_BUFFER_BIT_ARB"/>
>+                <enum name="WGL_DEPTH_BUFFER_BIT_ARB"/>
>+                <enum name="WGL_STENCIL_BUFFER_BIT_ARB"/>
>+                <command name="wglCreateBufferRegionARB"/>
>+                <command name="wglDeleteBufferRegionARB"/>
>+                <command name="wglSaveBufferRegionARB"/>
>+                <command name="wglRestoreBufferRegionARB"/>
>+            </require>
>+        </extension>
>+        <extension name="WGL_ARB_context_flush_control" supported="wgl">
>+            <require>
>+                <enum name="WGL_CONTEXT_RELEASE_BEHAVIOR_ARB"/>
>+                <enum name="WGL_CONTEXT_RELEASE_BEHAVIOR_NONE_ARB"/>
>+                <enum name="WGL_CONTEXT_RELEASE_BEHAVIOR_FLUSH_ARB"/>
>+            </require>
>+        </extension>
>+        <extension name="WGL_ARB_create_context" supported="wgl">
>+            <require>
>+                <enum name="WGL_CONTEXT_DEBUG_BIT_ARB"/>
>+                <enum name="WGL_CONTEXT_FORWARD_COMPATIBLE_BIT_ARB"/>
>+                <enum name="WGL_CONTEXT_MAJOR_VERSION_ARB"/>
>+                <enum name="WGL_CONTEXT_MINOR_VERSION_ARB"/>
>+                <enum name="WGL_CONTEXT_LAYER_PLANE_ARB"/>
>+                <enum name="WGL_CONTEXT_FLAGS_ARB"/>
>+                <enum name="ERROR_INVALID_VERSION_ARB"/>
>+                <command name="wglCreateContextAttribsARB"/>
>+            </require>
>+        </extension>
>+        <extension name="WGL_ARB_create_context_no_error" supported="wgl">
>+            <require>
>+                <enum name="WGL_CONTEXT_OPENGL_NO_ERROR_ARB"/>
>+            </require>
>+        </extension>
>+        <extension name="WGL_ARB_create_context_profile" supported="wgl">
>+            <require>
>+                <enum name="WGL_CONTEXT_PROFILE_MASK_ARB"/>
>+                <enum name="WGL_CONTEXT_CORE_PROFILE_BIT_ARB"/>
>+                <enum name="WGL_CONTEXT_COMPATIBILITY_PROFILE_BIT_ARB"/>
>+                <enum name="ERROR_INVALID_PROFILE_ARB"/>
>+            </require>
>+        </extension>
>+        <extension name="WGL_ARB_create_context_robustness" supported="wgl">
>+            <require>
>+                <enum name="WGL_CONTEXT_ROBUST_ACCESS_BIT_ARB"/>
>+                <enum name="WGL_LOSE_CONTEXT_ON_RESET_ARB"/>
>+                <enum name="WGL_CONTEXT_RESET_NOTIFICATION_STRATEGY_ARB"/>
>+                <enum name="WGL_NO_RESET_NOTIFICATION_ARB"/>
>+            </require>
>+        </extension>
>+        <extension name="WGL_ARB_extensions_string" supported="wgl">
>+            <require>
>+                <command name="wglGetExtensionsStringARB"/>
>+            </require>
>+        </extension>
>+        <extension name="WGL_ARB_framebuffer_sRGB" supported="wgl">
>+            <require>
>+                <enum name="WGL_FRAMEBUFFER_SRGB_CAPABLE_ARB"/>
>+            </require>
>+        </extension>
>+        <extension name="WGL_ARB_make_current_read" supported="wgl">
>+            <require>
>+                <enum name="ERROR_INVALID_PIXEL_TYPE_ARB"/>
>+                <enum name="ERROR_INCOMPATIBLE_DEVICE_CONTEXTS_ARB"/>
>+                <command name="wglMakeContextCurrentARB"/>
>+                <command name="wglGetCurrentReadDCARB"/>
>+            </require>
>+        </extension>
>+        <extension name="WGL_ARB_multisample" supported="wgl">
>+            <require>
>+                <enum name="WGL_SAMPLE_BUFFERS_ARB"/>
>+                <enum name="WGL_SAMPLES_ARB"/>
>+            </require>
>+        </extension>
>+        <extension name="WGL_ARB_pbuffer" supported="wgl">
>+            <require>
>+                <enum name="WGL_DRAW_TO_PBUFFER_ARB"/>
>+                <enum name="WGL_MAX_PBUFFER_PIXELS_ARB"/>
>+                <enum name="WGL_MAX_PBUFFER_WIDTH_ARB"/>
>+                <enum name="WGL_MAX_PBUFFER_HEIGHT_ARB"/>
>+                <enum name="WGL_PBUFFER_LARGEST_ARB"/>
>+                <enum name="WGL_PBUFFER_WIDTH_ARB"/>
>+                <enum name="WGL_PBUFFER_HEIGHT_ARB"/>
>+                <enum name="WGL_PBUFFER_LOST_ARB"/>
>+                <command name="wglCreatePbufferARB"/>
>+                <command name="wglGetPbufferDCARB"/>
>+                <command name="wglReleasePbufferDCARB"/>
>+                <command name="wglDestroyPbufferARB"/>
>+                <command name="wglQueryPbufferARB"/>
>+            </require>
>+        </extension>
>+        <extension name="WGL_ARB_pixel_format" supported="wgl">
>+            <require>
>+                <enum name="WGL_NUMBER_PIXEL_FORMATS_ARB"/>
>+                <enum name="WGL_DRAW_TO_WINDOW_ARB"/>
>+                <enum name="WGL_DRAW_TO_BITMAP_ARB"/>
>+                <enum name="WGL_ACCELERATION_ARB"/>
>+                <enum name="WGL_NEED_PALETTE_ARB"/>
>+                <enum name="WGL_NEED_SYSTEM_PALETTE_ARB"/>
>+                <enum name="WGL_SWAP_LAYER_BUFFERS_ARB"/>
>+                <enum name="WGL_SWAP_METHOD_ARB"/>
>+                <enum name="WGL_NUMBER_OVERLAYS_ARB"/>
>+                <enum name="WGL_NUMBER_UNDERLAYS_ARB"/>
>+                <enum name="WGL_TRANSPARENT_ARB"/>
>+                <enum name="WGL_TRANSPARENT_RED_VALUE_ARB"/>
>+                <enum name="WGL_TRANSPARENT_GREEN_VALUE_ARB"/>
>+                <enum name="WGL_TRANSPARENT_BLUE_VALUE_ARB"/>
>+                <enum name="WGL_TRANSPARENT_ALPHA_VALUE_ARB"/>
>+                <enum name="WGL_TRANSPARENT_INDEX_VALUE_ARB"/>
>+                <enum name="WGL_SHARE_DEPTH_ARB"/>
>+                <enum name="WGL_SHARE_STENCIL_ARB"/>
>+                <enum name="WGL_SHARE_ACCUM_ARB"/>
>+                <enum name="WGL_SUPPORT_GDI_ARB"/>
>+                <enum name="WGL_SUPPORT_OPENGL_ARB"/>
>+                <enum name="WGL_DOUBLE_BUFFER_ARB"/>
>+                <enum name="WGL_STEREO_ARB"/>
>+                <enum name="WGL_PIXEL_TYPE_ARB"/>
>+                <enum name="WGL_COLOR_BITS_ARB"/>
>+                <enum name="WGL_RED_BITS_ARB"/>
>+                <enum name="WGL_RED_SHIFT_ARB"/>
>+                <enum name="WGL_GREEN_BITS_ARB"/>
>+                <enum name="WGL_GREEN_SHIFT_ARB"/>
>+                <enum name="WGL_BLUE_BITS_ARB"/>
>+                <enum name="WGL_BLUE_SHIFT_ARB"/>
>+                <enum name="WGL_ALPHA_BITS_ARB"/>
>+                <enum name="WGL_ALPHA_SHIFT_ARB"/>
>+                <enum name="WGL_ACCUM_BITS_ARB"/>
>+                <enum name="WGL_ACCUM_RED_BITS_ARB"/>
>+                <enum name="WGL_ACCUM_GREEN_BITS_ARB"/>
>+                <enum name="WGL_ACCUM_BLUE_BITS_ARB"/>
>+                <enum name="WGL_ACCUM_ALPHA_BITS_ARB"/>
>+                <enum name="WGL_DEPTH_BITS_ARB"/>
>+                <enum name="WGL_STENCIL_BITS_ARB"/>
>+                <enum name="WGL_AUX_BUFFERS_ARB"/>
>+                <enum name="WGL_NO_ACCELERATION_ARB"/>
>+                <enum name="WGL_GENERIC_ACCELERATION_ARB"/>
>+                <enum name="WGL_FULL_ACCELERATION_ARB"/>
>+                <enum name="WGL_SWAP_EXCHANGE_ARB"/>
>+                <enum name="WGL_SWAP_COPY_ARB"/>
>+                <enum name="WGL_SWAP_UNDEFINED_ARB"/>
>+                <enum name="WGL_TYPE_RGBA_ARB"/>
>+                <enum name="WGL_TYPE_COLORINDEX_ARB"/>
>+                <command name="wglGetPixelFormatAttribivARB"/>
>+                <command name="wglGetPixelFormatAttribfvARB"/>
>+                <command name="wglChoosePixelFormatARB"/>
>+            </require>
>+        </extension>
>+        <extension name="WGL_ARB_pixel_format_float" supported="wgl">
>+            <require>
>+                <enum name="WGL_TYPE_RGBA_FLOAT_ARB"/>
>+            </require>
>+        </extension>
>+        <extension name="WGL_ARB_render_texture" supported="wgl">
>+            <require>
>+                <enum name="WGL_BIND_TO_TEXTURE_RGB_ARB"/>
>+                <enum name="WGL_BIND_TO_TEXTURE_RGBA_ARB"/>
>+                <enum name="WGL_TEXTURE_FORMAT_ARB"/>
>+                <enum name="WGL_TEXTURE_TARGET_ARB"/>
>+                <enum name="WGL_MIPMAP_TEXTURE_ARB"/>
>+                <enum name="WGL_TEXTURE_RGB_ARB"/>
>+                <enum name="WGL_TEXTURE_RGBA_ARB"/>
>+                <enum name="WGL_NO_TEXTURE_ARB"/>
>+                <enum name="WGL_TEXTURE_CUBE_MAP_ARB"/>
>+                <enum name="WGL_TEXTURE_1D_ARB"/>
>+                <enum name="WGL_TEXTURE_2D_ARB"/>
>+                <enum name="WGL_MIPMAP_LEVEL_ARB"/>
>+                <enum name="WGL_CUBE_MAP_FACE_ARB"/>
>+                <enum name="WGL_TEXTURE_CUBE_MAP_POSITIVE_X_ARB"/>
>+                <enum name="WGL_TEXTURE_CUBE_MAP_NEGATIVE_X_ARB"/>
>+                <enum name="WGL_TEXTURE_CUBE_MAP_POSITIVE_Y_ARB"/>
>+                <enum name="WGL_TEXTURE_CUBE_MAP_NEGATIVE_Y_ARB"/>
>+                <enum name="WGL_TEXTURE_CUBE_MAP_POSITIVE_Z_ARB"/>
>+                <enum name="WGL_TEXTURE_CUBE_MAP_NEGATIVE_Z_ARB"/>
>+                <enum name="WGL_FRONT_LEFT_ARB"/>
>+                <enum name="WGL_FRONT_RIGHT_ARB"/>
>+                <enum name="WGL_BACK_LEFT_ARB"/>
>+                <enum name="WGL_BACK_RIGHT_ARB"/>
>+                <enum name="WGL_AUX0_ARB"/>
>+                <enum name="WGL_AUX1_ARB"/>
>+                <enum name="WGL_AUX2_ARB"/>
>+                <enum name="WGL_AUX3_ARB"/>
>+                <enum name="WGL_AUX4_ARB"/>
>+                <enum name="WGL_AUX5_ARB"/>
>+                <enum name="WGL_AUX6_ARB"/>
>+                <enum name="WGL_AUX7_ARB"/>
>+                <enum name="WGL_AUX8_ARB"/>
>+                <enum name="WGL_AUX9_ARB"/>
>+                <command name="wglBindTexImageARB"/>
>+                <command name="wglReleaseTexImageARB"/>
>+                <command name="wglSetPbufferAttribARB"/>
>+            </require>
>+        </extension>
>+        <extension name="WGL_ARB_robustness_application_isolation" supported="wgl">
>+            <require>
>+                <enum name="WGL_CONTEXT_RESET_ISOLATION_BIT_ARB"/>
>+            </require>
>+        </extension>
>+        <extension name="WGL_ARB_robustness_share_group_isolation" supported="wgl">
>+            <require>
>+                <enum name="WGL_CONTEXT_RESET_ISOLATION_BIT_ARB"/>
>+            </require>
>+        </extension>
>+        <extension name="WGL_ATI_pixel_format_float" supported="wgl">
>+            <require>
>+                <enum name="WGL_TYPE_RGBA_FLOAT_ATI"/>
>+            </require>
>+        </extension>
>+        <extension name="WGL_ATI_render_texture_rectangle" supported="wgl">
>+            <require>
>+                <enum name="WGL_TEXTURE_RECTANGLE_ATI"/>
>+            </require>
>+        </extension>
>+        <extension name="WGL_EXT_colorspace" supported="wgl">
>+            <require>
>+                <enum name="WGL_COLORSPACE_EXT"/>
>+                <enum name="WGL_COLORSPACE_SRGB_EXT"/>
>+                <enum name="WGL_COLORSPACE_LINEAR_EXT"/>
>+            </require>
>+        </extension>
>+        <extension name="WGL_EXT_create_context_es_profile" supported="wgl">
>+            <require>
>+                <enum name="WGL_CONTEXT_ES_PROFILE_BIT_EXT"/>
>+            </require>
>+        </extension>
>+        <extension name="WGL_EXT_create_context_es2_profile" supported="wgl">
>+            <require>
>+                <enum name="WGL_CONTEXT_ES2_PROFILE_BIT_EXT"/>
>+            </require>
>+        </extension>
>+        <extension name="WGL_EXT_depth_float" supported="wgl">
>+            <require>
>+                <enum name="WGL_DEPTH_FLOAT_EXT"/>
>+            </require>
>+        </extension>
>+        <extension name="WGL_EXT_display_color_table" supported="wgl">
>+            <require>
>+                <command name="wglCreateDisplayColorTableEXT"/>
>+                <command name="wglLoadDisplayColorTableEXT"/>
>+                <command name="wglBindDisplayColorTableEXT"/>
>+                <command name="wglDestroyDisplayColorTableEXT"/>
>+            </require>
>+        </extension>
>+        <extension name="WGL_EXT_extensions_string" supported="wgl">
>+            <require>
>+                <command name="wglGetExtensionsStringEXT"/>
>+            </require>
>+        </extension>
>+        <extension name="WGL_EXT_framebuffer_sRGB" supported="wgl">
>+            <require>
>+                <enum name="WGL_FRAMEBUFFER_SRGB_CAPABLE_EXT"/>
>+            </require>
>+        </extension>
>+        <extension name="WGL_EXT_make_current_read" supported="wgl">
>+            <require>
>+                <enum name="ERROR_INVALID_PIXEL_TYPE_EXT"/>
>+                <command name="wglMakeContextCurrentEXT"/>
>+                <command name="wglGetCurrentReadDCEXT"/>
>+            </require>
>+        </extension>
>+        <extension name="WGL_EXT_multisample" supported="wgl">
>+            <require>
>+                <enum name="WGL_SAMPLE_BUFFERS_EXT"/>
>+                <enum name="WGL_SAMPLES_EXT"/>
>+            </require>
>+        </extension>
>+        <extension name="WGL_EXT_pbuffer" supported="wgl">
>+            <require>
>+                <enum name="WGL_DRAW_TO_PBUFFER_EXT"/>
>+                <enum name="WGL_MAX_PBUFFER_PIXELS_EXT"/>
>+                <enum name="WGL_MAX_PBUFFER_WIDTH_EXT"/>
>+                <enum name="WGL_MAX_PBUFFER_HEIGHT_EXT"/>
>+                <enum name="WGL_OPTIMAL_PBUFFER_WIDTH_EXT"/>
>+                <enum name="WGL_OPTIMAL_PBUFFER_HEIGHT_EXT"/>
>+                <enum name="WGL_PBUFFER_LARGEST_EXT"/>
>+                <enum name="WGL_PBUFFER_WIDTH_EXT"/>
>+                <enum name="WGL_PBUFFER_HEIGHT_EXT"/>
>+                <command name="wglCreatePbufferEXT"/>
>+                <command name="wglGetPbufferDCEXT"/>
>+                <command name="wglReleasePbufferDCEXT"/>
>+                <command name="wglDestroyPbufferEXT"/>
>+                <command name="wglQueryPbufferEXT"/>
>+            </require>
>+        </extension>
>+        <extension name="WGL_EXT_pixel_format" supported="wgl">
>+            <require>
>+                <enum name="WGL_NUMBER_PIXEL_FORMATS_EXT"/>
>+                <enum name="WGL_DRAW_TO_WINDOW_EXT"/>
>+                <enum name="WGL_DRAW_TO_BITMAP_EXT"/>
>+                <enum name="WGL_ACCELERATION_EXT"/>
>+                <enum name="WGL_NEED_PALETTE_EXT"/>
>+                <enum name="WGL_NEED_SYSTEM_PALETTE_EXT"/>
>+                <enum name="WGL_SWAP_LAYER_BUFFERS_EXT"/>
>+                <enum name="WGL_SWAP_METHOD_EXT"/>
>+                <enum name="WGL_NUMBER_OVERLAYS_EXT"/>
>+                <enum name="WGL_NUMBER_UNDERLAYS_EXT"/>
>+                <enum name="WGL_TRANSPARENT_EXT"/>
>+                <enum name="WGL_TRANSPARENT_VALUE_EXT"/>
>+                <enum name="WGL_SHARE_DEPTH_EXT"/>
>+                <enum name="WGL_SHARE_STENCIL_EXT"/>
>+                <enum name="WGL_SHARE_ACCUM_EXT"/>
>+                <enum name="WGL_SUPPORT_GDI_EXT"/>
>+                <enum name="WGL_SUPPORT_OPENGL_EXT"/>
>+                <enum name="WGL_DOUBLE_BUFFER_EXT"/>
>+                <enum name="WGL_STEREO_EXT"/>
>+                <enum name="WGL_PIXEL_TYPE_EXT"/>
>+                <enum name="WGL_COLOR_BITS_EXT"/>
>+                <enum name="WGL_RED_BITS_EXT"/>
>+                <enum name="WGL_RED_SHIFT_EXT"/>
>+                <enum name="WGL_GREEN_BITS_EXT"/>
>+                <enum name="WGL_GREEN_SHIFT_EXT"/>
>+                <enum name="WGL_BLUE_BITS_EXT"/>
>+                <enum name="WGL_BLUE_SHIFT_EXT"/>
>+                <enum name="WGL_ALPHA_BITS_EXT"/>
>+                <enum name="WGL_ALPHA_SHIFT_EXT"/>
>+                <enum name="WGL_ACCUM_BITS_EXT"/>
>+                <enum name="WGL_ACCUM_RED_BITS_EXT"/>
>+                <enum name="WGL_ACCUM_GREEN_BITS_EXT"/>
>+                <enum name="WGL_ACCUM_BLUE_BITS_EXT"/>
>+                <enum name="WGL_ACCUM_ALPHA_BITS_EXT"/>
>+                <enum name="WGL_DEPTH_BITS_EXT"/>
>+                <enum name="WGL_STENCIL_BITS_EXT"/>
>+                <enum name="WGL_AUX_BUFFERS_EXT"/>
>+                <enum name="WGL_NO_ACCELERATION_EXT"/>
>+                <enum name="WGL_GENERIC_ACCELERATION_EXT"/>
>+                <enum name="WGL_FULL_ACCELERATION_EXT"/>
>+                <enum name="WGL_SWAP_EXCHANGE_EXT"/>
>+                <enum name="WGL_SWAP_COPY_EXT"/>
>+                <enum name="WGL_SWAP_UNDEFINED_EXT"/>
>+                <enum name="WGL_TYPE_RGBA_EXT"/>
>+                <enum name="WGL_TYPE_COLORINDEX_EXT"/>
>+                <command name="wglGetPixelFormatAttribivEXT"/>
>+                <command name="wglGetPixelFormatAttribfvEXT"/>
>+                <command name="wglChoosePixelFormatEXT"/>
>+            </require>
>+        </extension>
>+        <extension name="WGL_EXT_pixel_format_packed_float" supported="wgl">
>+            <require>
>+                <enum name="WGL_TYPE_RGBA_UNSIGNED_FLOAT_EXT"/>
>+            </require>
>+        </extension>
>+        <extension name="WGL_EXT_swap_control" supported="wgl">
>+            <require>
>+                <command name="wglSwapIntervalEXT"/>
>+                <command name="wglGetSwapIntervalEXT"/>
>+            </require>
>+        </extension>
>+        <extension name="WGL_EXT_swap_control_tear" supported="wgl">
>+            <require>
>+            </require>
>+        </extension>
>+        <extension name="WGL_I3D_digital_video_control" supported="wgl">
>+            <require>
>+                <enum name="WGL_DIGITAL_VIDEO_CURSOR_ALPHA_FRAMEBUFFER_I3D"/>
>+                <enum name="WGL_DIGITAL_VIDEO_CURSOR_ALPHA_VALUE_I3D"/>
>+                <enum name="WGL_DIGITAL_VIDEO_CURSOR_INCLUDED_I3D"/>
>+                <enum name="WGL_DIGITAL_VIDEO_GAMMA_CORRECTED_I3D"/>
>+                <command name="wglGetDigitalVideoParametersI3D"/>
>+                <command name="wglSetDigitalVideoParametersI3D"/>
>+            </require>
>+        </extension>
>+        <extension name="WGL_I3D_gamma" supported="wgl">
>+            <require>
>+                <enum name="WGL_GAMMA_TABLE_SIZE_I3D"/>
>+                <enum name="WGL_GAMMA_EXCLUDE_DESKTOP_I3D"/>
>+                <command name="wglGetGammaTableParametersI3D"/>
>+                <command name="wglSetGammaTableParametersI3D"/>
>+                <command name="wglGetGammaTableI3D"/>
>+                <command name="wglSetGammaTableI3D"/>
>+            </require>
>+        </extension>
>+        <extension name="WGL_I3D_genlock" supported="wgl">
>+            <require>
>+                <enum name="WGL_GENLOCK_SOURCE_MULTIVIEW_I3D"/>
>+                <enum name="WGL_GENLOCK_SOURCE_EXTERNAL_SYNC_I3D"/>
>+                <enum name="WGL_GENLOCK_SOURCE_EXTERNAL_FIELD_I3D"/>
>+                <enum name="WGL_GENLOCK_SOURCE_EXTERNAL_TTL_I3D"/>
>+                <enum name="WGL_GENLOCK_SOURCE_DIGITAL_SYNC_I3D"/>
>+                <enum name="WGL_GENLOCK_SOURCE_DIGITAL_FIELD_I3D"/>
>+                <enum name="WGL_GENLOCK_SOURCE_EDGE_FALLING_I3D"/>
>+                <enum name="WGL_GENLOCK_SOURCE_EDGE_RISING_I3D"/>
>+                <enum name="WGL_GENLOCK_SOURCE_EDGE_BOTH_I3D"/>
>+                <command name="wglEnableGenlockI3D"/>
>+                <command name="wglDisableGenlockI3D"/>
>+                <command name="wglIsEnabledGenlockI3D"/>
>+                <command name="wglGenlockSourceI3D"/>
>+                <command name="wglGetGenlockSourceI3D"/>
>+                <command name="wglGenlockSourceEdgeI3D"/>
>+                <command name="wglGetGenlockSourceEdgeI3D"/>
>+                <command name="wglGenlockSampleRateI3D"/>
>+                <command name="wglGetGenlockSampleRateI3D"/>
>+                <command name="wglGenlockSourceDelayI3D"/>
>+                <command name="wglGetGenlockSourceDelayI3D"/>
>+                <command name="wglQueryGenlockMaxSourceDelayI3D"/>
>+            </require>
>+        </extension>
>+        <extension name="WGL_I3D_image_buffer" supported="wgl">
>+            <require>
>+                <enum name="WGL_IMAGE_BUFFER_MIN_ACCESS_I3D"/>
>+                <enum name="WGL_IMAGE_BUFFER_LOCK_I3D"/>
>+                <command name="wglCreateImageBufferI3D"/>
>+                <command name="wglDestroyImageBufferI3D"/>
>+                <command name="wglAssociateImageBufferEventsI3D"/>
>+                <command name="wglReleaseImageBufferEventsI3D"/>
>+            </require>
>+        </extension>
>+        <extension name="WGL_I3D_swap_frame_lock" supported="wgl">
>+            <require>
>+                <command name="wglEnableFrameLockI3D"/>
>+                <command name="wglDisableFrameLockI3D"/>
>+                <command name="wglIsEnabledFrameLockI3D"/>
>+                <command name="wglQueryFrameLockMasterI3D"/>
>+            </require>
>+        </extension>
>+        <extension name="WGL_I3D_swap_frame_usage" supported="wgl">
>+            <require>
>+                <command name="wglGetFrameUsageI3D"/>
>+                <command name="wglBeginFrameTrackingI3D"/>
>+                <command name="wglEndFrameTrackingI3D"/>
>+                <command name="wglQueryFrameTrackingI3D"/>
>+            </require>
>+        </extension>
>+        <extension name="WGL_NV_copy_image" supported="wgl">
>+            <require>
>+                <command name="wglCopyImageSubDataNV"/>
>+            </require>
>+        </extension>
>+        <extension name="WGL_NV_delay_before_swap" supported="wgl">
>+            <require>
>+                <command name="wglDelayBeforeSwapNV"/>
>+            </require>
>+        </extension>
>+        <extension name="WGL_NV_DX_interop" supported="wgl">
>+            <require>
>+                <enum name="WGL_ACCESS_READ_ONLY_NV"/>
>+                <enum name="WGL_ACCESS_READ_WRITE_NV"/>
>+                <enum name="WGL_ACCESS_WRITE_DISCARD_NV"/>
>+                <command name="wglDXSetResourceShareHandleNV"/>
>+                <command name="wglDXOpenDeviceNV"/>
>+                <command name="wglDXCloseDeviceNV"/>
>+                <command name="wglDXRegisterObjectNV"/>
>+                <command name="wglDXUnregisterObjectNV"/>
>+                <command name="wglDXObjectAccessNV"/>
>+                <command name="wglDXLockObjectsNV"/>
>+                <command name="wglDXUnlockObjectsNV"/>
>+            </require>
>+        </extension>
>+        <extension name="WGL_NV_DX_interop2" supported="wgl">
>+            <require>
>+            </require>
>+        </extension>
>+        <extension name="WGL_NV_float_buffer" supported="wgl">
>+            <require>
>+                <enum name="WGL_FLOAT_COMPONENTS_NV"/>
>+                <enum name="WGL_BIND_TO_TEXTURE_RECTANGLE_FLOAT_R_NV"/>
>+                <enum name="WGL_BIND_TO_TEXTURE_RECTANGLE_FLOAT_RG_NV"/>
>+                <enum name="WGL_BIND_TO_TEXTURE_RECTANGLE_FLOAT_RGB_NV"/>
>+                <enum name="WGL_BIND_TO_TEXTURE_RECTANGLE_FLOAT_RGBA_NV"/>
>+                <enum name="WGL_TEXTURE_FLOAT_R_NV"/>
>+                <enum name="WGL_TEXTURE_FLOAT_RG_NV"/>
>+                <enum name="WGL_TEXTURE_FLOAT_RGB_NV"/>
>+                <enum name="WGL_TEXTURE_FLOAT_RGBA_NV"/>
>+            </require>
>+        </extension>
>+        <extension name="WGL_NV_gpu_affinity" supported="wgl">
>+            <require>
>+                <enum name="ERROR_INCOMPATIBLE_AFFINITY_MASKS_NV"/>
>+                <enum name="ERROR_MISSING_AFFINITY_MASK_NV"/>
>+                <command name="wglEnumGpusNV"/>
>+                <command name="wglEnumGpuDevicesNV"/>
>+                <command name="wglCreateAffinityDCNV"/>
>+                <command name="wglEnumGpusFromAffinityDCNV"/>
>+                <command name="wglDeleteDCNV"/>
>+            </require>
>+        </extension>
>+        <extension name="WGL_NV_multisample_coverage" supported="wgl">
>+            <require>
>+                <enum name="WGL_COVERAGE_SAMPLES_NV"/>
>+                <enum name="WGL_COLOR_SAMPLES_NV"/>
>+            </require>
>+        </extension>
>+        <extension name="WGL_NV_present_video" supported="wgl">
>+            <require>
>+                <enum name="WGL_NUM_VIDEO_SLOTS_NV"/>
>+                <command name="wglEnumerateVideoDevicesNV"/>
>+                <command name="wglBindVideoDeviceNV"/>
>+                <command name="wglQueryCurrentContextNV"/>
>+            </require>
>+        </extension>
>+        <extension name="WGL_NV_render_depth_texture" supported="wgl">
>+            <require>
>+                <enum name="WGL_BIND_TO_TEXTURE_DEPTH_NV"/>
>+                <enum name="WGL_BIND_TO_TEXTURE_RECTANGLE_DEPTH_NV"/>
>+                <enum name="WGL_DEPTH_TEXTURE_FORMAT_NV"/>
>+                <enum name="WGL_TEXTURE_DEPTH_COMPONENT_NV"/>
>+                <enum name="WGL_DEPTH_COMPONENT_NV"/>
>+            </require>
>+        </extension>
>+        <extension name="WGL_NV_render_texture_rectangle" supported="wgl">
>+            <require>
>+                <enum name="WGL_BIND_TO_TEXTURE_RECTANGLE_RGB_NV"/>
>+                <enum name="WGL_BIND_TO_TEXTURE_RECTANGLE_RGBA_NV"/>
>+                <enum name="WGL_TEXTURE_RECTANGLE_NV"/>
>+            </require>
>+        </extension>
>+        <extension name="WGL_NV_swap_group" supported="wgl">
>+            <require>
>+                <command name="wglJoinSwapGroupNV"/>
>+                <command name="wglBindSwapBarrierNV"/>
>+                <command name="wglQuerySwapGroupNV"/>
>+                <command name="wglQueryMaxSwapGroupsNV"/>
>+                <command name="wglQueryFrameCountNV"/>
>+                <command name="wglResetFrameCountNV"/>
>+            </require>
>+        </extension>
>+        <extension name="WGL_NV_video_capture" supported="wgl">
>+            <require>
>+                <enum name="WGL_UNIQUE_ID_NV"/>
>+                <enum name="WGL_NUM_VIDEO_CAPTURE_SLOTS_NV"/>
>+                <command name="wglBindVideoCaptureDeviceNV"/>
>+                <command name="wglEnumerateVideoCaptureDevicesNV"/>
>+                <command name="wglLockVideoCaptureDeviceNV"/>
>+                <command name="wglQueryVideoCaptureDeviceNV"/>
>+                <command name="wglReleaseVideoCaptureDeviceNV"/>
>+            </require>
>+        </extension>
>+        <extension name="WGL_NV_video_output" supported="wgl">
>+            <require>
>+                <enum name="WGL_BIND_TO_VIDEO_RGB_NV"/>
>+                <enum name="WGL_BIND_TO_VIDEO_RGBA_NV"/>
>+                <enum name="WGL_BIND_TO_VIDEO_RGB_AND_DEPTH_NV"/>
>+                <enum name="WGL_VIDEO_OUT_COLOR_NV"/>
>+                <enum name="WGL_VIDEO_OUT_ALPHA_NV"/>
>+                <enum name="WGL_VIDEO_OUT_DEPTH_NV"/>
>+                <enum name="WGL_VIDEO_OUT_COLOR_AND_ALPHA_NV"/>
>+                <enum name="WGL_VIDEO_OUT_COLOR_AND_DEPTH_NV"/>
>+                <enum name="WGL_VIDEO_OUT_FRAME"/>
>+                <enum name="WGL_VIDEO_OUT_FIELD_1"/>
>+                <enum name="WGL_VIDEO_OUT_FIELD_2"/>
>+                <enum name="WGL_VIDEO_OUT_STACKED_FIELDS_1_2"/>
>+                <enum name="WGL_VIDEO_OUT_STACKED_FIELDS_2_1"/>
>+                <command name="wglGetVideoDeviceNV"/>
>+                <command name="wglReleaseVideoDeviceNV"/>
>+                <command name="wglBindVideoImageNV"/>
>+                <command name="wglReleaseVideoImageNV"/>
>+                <command name="wglSendPbufferToVideoNV"/>
>+                <command name="wglGetVideoInfoNV"/>
>+            </require>
>+        </extension>
>+        <extension name="WGL_NV_vertex_array_range" supported="wgl">
>+            <require>
>+                <command name="wglAllocateMemoryNV"/>
>+                <command name="wglFreeMemoryNV"/>
>+            </require>
>+        </extension>
>+        <extension name="WGL_OML_sync_control" supported="wgl">
>+            <require>
>+                <command name="wglGetSyncValuesOML"/>
>+                <command name="wglGetMscRateOML"/>
>+                <command name="wglSwapBuffersMscOML"/>
>+                <command name="wglSwapLayerBuffersMscOML"/>
>+                <command name="wglWaitForMscOML"/>
>+                <command name="wglWaitForSbcOML"/>
>+            </require>
>+        </extension>
>+    </extensions>
>+</registry>
>diff --git a/Source/ThirdParty/ANGLE/src/angle.gyp b/Source/ThirdParty/ANGLE/src/angle.gyp
>deleted file mode 100644
>index aa009482b41..00000000000
>--- a/Source/ThirdParty/ANGLE/src/angle.gyp
>+++ /dev/null
>@@ -1,481 +0,0 @@
>-# Copyright (c) 2012 The ANGLE Project Authors. All rights reserved.
>-# Use of this source code is governed by a BSD-style license that can be
>-# found in the LICENSE file.
>-
>-{
>-    'variables':
>-    {
>-        'angle_code': 1,
>-        'angle_gen_path': '<(SHARED_INTERMEDIATE_DIR)/angle',
>-        'angle_id_script_base': 'commit_id.py',
>-        'angle_id_script': '<(angle_gen_path)/<(angle_id_script_base)',
>-        'angle_id_header_base': 'commit.h',
>-        'angle_id_header': '<(angle_gen_path)/id/<(angle_id_header_base)',
>-        'angle_use_commit_id%': '<!(python <(angle_id_script_base) check ..)',
>-        'angle_enable_d3d9%': 0,
>-        'angle_enable_d3d11%': 0,
>-        'angle_enable_gl%': 0,
>-        'angle_enable_gl_null%': 0,
>-        'angle_enable_vulkan%': 0,
>-        'angle_enable_essl%': 1, # Enable this for all configs by default
>-        'angle_enable_glsl%': 1, # Enable this for all configs by default
>-        'angle_enable_hlsl%': 0,
>-        'angle_link_glx%': 0,
>-        'angle_gl_library_type%': 'shared_library',
>-        'dcheck_always_on%': 0,
>-        'conditions':
>-        [
>-            ['OS=="win"',
>-            {
>-                'angle_enable_gl%': 1,
>-                'angle_enable_gl_null%': 1,
>-                'angle_enable_d3d9%': 1,
>-                'angle_enable_d3d11%': 1,
>-                'angle_enable_hlsl%': 1,
>-                'angle_enable_vulkan%': 1,
>-            }],
>-            ['OS=="linux" and use_x11==1 and chromeos==0',
>-            {
>-                'angle_enable_gl%': 1,
>-                'angle_enable_gl_null%': 1,
>-                'angle_enable_vulkan%': 1,
>-            }],
>-            ['OS=="mac"',
>-            {
>-                'angle_enable_gl%': 1,
>-                'angle_enable_gl_null%': 1,
>-            }],
>-            ['use_ozone==1',
>-            {
>-                'angle_enable_gl%': 1,
>-                'angle_enable_gl_null%': 1,
>-            }],
>-        ],
>-        'angle_enable_null%': 1, # Available on all platforms
>-    },
>-    'includes':
>-    [
>-        'compiler.gypi',
>-        'libGLESv2.gypi',
>-        'libEGL.gypi',
>-        'vulkan_support/vulkan.gypi',
>-    ],
>-
>-    'targets':
>-    [
>-        {
>-            'target_name': 'angle_common',
>-            'type': 'static_library',
>-            'includes': [ '../gyp/common_defines.gypi', ],
>-            'sources':
>-            [
>-                '<@(libangle_common_sources)',
>-            ],
>-            'include_dirs':
>-            [
>-                '.',
>-                '../include',
>-                'common/third_party/base',
>-            ],
>-            'dependencies':
>-            [
>-                'commit_id',
>-            ],
>-            'direct_dependent_settings':
>-            {
>-                'include_dirs':
>-                [
>-                    '<(angle_path)/include',
>-                    '<(angle_path)/src',
>-                    '<(angle_path)/src/common/third_party/base',
>-                ],
>-                'conditions':
>-                [
>-                    ['dcheck_always_on==1',
>-                    {
>-                        'configurations':
>-                        {
>-                            'Release_Base':
>-                            {
>-                                'defines':
>-                                [
>-                                    'ANGLE_ENABLE_RELEASE_ASSERTS',
>-                                ],
>-                            },
>-                        },
>-                    }],
>-                    ['OS=="win"',
>-                    {
>-                        'configurations':
>-                        {
>-                            'Debug_Base':
>-                            {
>-                                'defines':
>-                                [
>-                                    'ANGLE_ENABLE_DEBUG_ANNOTATIONS'
>-                                ],
>-                            },
>-                        },
>-                    }],
>-                ],
>-            },
>-            'conditions':
>-            [
>-                ['dcheck_always_on==1',
>-                {
>-                    'configurations':
>-                    {
>-                        'Release_Base':
>-                        {
>-                            'defines':
>-                            [
>-                                'ANGLE_ENABLE_RELEASE_ASSERTS',
>-                            ],
>-                        },
>-                    },
>-                }],
>-                ['OS=="win"',
>-                {
>-                    'configurations':
>-                    {
>-                        'Debug_Base':
>-                        {
>-                            'defines':
>-                            [
>-                                'ANGLE_ENABLE_DEBUG_ANNOTATIONS'
>-                            ],
>-                        },
>-                    },
>-                    'sources':
>-                    [
>-                        '<@(libangle_common_win_sources)',
>-                    ],
>-                }],
>-                ['OS=="mac"',
>-                {
>-                    'sources':
>-                    [
>-                        '<@(libangle_common_mac_sources)',
>-                    ],
>-                    'link_settings':
>-                    {
>-                        'libraries':
>-                        [
>-                            '$(SDKROOT)/System/Library/Frameworks/IOKit.framework',
>-                            '$(SDKROOT)/System/Library/Frameworks/CoreFoundation.framework',
>-                        ],
>-                    },
>-                }],
>-                ['OS=="linux"',
>-                {
>-                    'sources':
>-                    [
>-                        '<@(libangle_common_linux_sources)',
>-                    ],
>-                }]
>-            ],
>-        },
>-
>-        {
>-            'target_name': 'angle_image_util',
>-            'type': 'static_library',
>-            'includes': [ '../gyp/common_defines.gypi', ],
>-            'sources':
>-            [
>-                '<@(libangle_image_util_sources)',
>-            ],
>-            'include_dirs':
>-            [
>-                '.',
>-                '../include',
>-            ],
>-            'dependencies':
>-            [
>-                'angle_common',
>-            ],
>-            'direct_dependent_settings':
>-            {
>-                'include_dirs':
>-                [
>-                    '<(angle_path)/include',
>-                    '<(angle_path)/src',
>-                ],
>-            },
>-        },
>-
>-        {
>-            'target_name': 'angle_gpu_info_util',
>-            'type': 'static_library',
>-            'includes': [ '../gyp/common_defines.gypi', ],
>-            'sources':
>-            [
>-                '<@(libangle_gpu_info_util_sources)',
>-            ],
>-            'include_dirs':
>-            [
>-                '.',
>-                '../include',
>-            ],
>-            'dependencies':
>-            [
>-                'angle_common',
>-            ],
>-            'direct_dependent_settings':
>-            {
>-                'include_dirs':
>-                [
>-                    '<(angle_path)/include',
>-                    '<(angle_path)/src',
>-                ],
>-            },
>-            'conditions':
>-            [
>-                ['OS=="win"',
>-                {
>-                    'sources':
>-                    [
>-                        '<@(libangle_gpu_info_util_win_sources)',
>-                    ],
>-                }],
>-                ['OS=="win" and angle_build_winrt==0',
>-                {
>-                    'link_settings':
>-                    {
>-                        'msvs_settings':
>-                        {
>-                            'VCLinkerTool':
>-                            {
>-                                'AdditionalDependencies':
>-                                [
>-                                    'setupapi.lib'
>-                                ]
>-                            }
>-                        }
>-                    },
>-                    'defines':
>-                    [
>-                        'GPU_INFO_USE_SETUPAPI',
>-                    ],
>-                },
>-                {
>-                    'link_settings':
>-                    {
>-                        'msvs_settings':
>-                        {
>-                            'VCLinkerTool':
>-                            {
>-                                'AdditionalDependencies':
>-                                [
>-                                    'dxgi.lib'
>-                                ]
>-                            }
>-                        }
>-                    },
>-                    'defines':
>-                    [
>-                        'GPU_INFO_USE_DXGI',
>-                    ],
>-                }],
>-                ['OS=="linux"',
>-                {
>-                    'sources':
>-                    [
>-                        '<@(libangle_gpu_info_util_linux_sources)',
>-                    ],
>-                }],
>-                ['OS=="linux" and use_x11==1',
>-                {
>-                    'sources':
>-                    [
>-                        '<@(libangle_gpu_info_util_x11_sources)',
>-                    ],
>-                    'defines':
>-                    [
>-                        'GPU_INFO_USE_X11',
>-                    ],
>-                    'dependencies':
>-                    [
>-                        '<(angle_path)/src/third_party/libXNVCtrl/libXNVCtrl.gyp:libXNVCtrl',
>-                    ],
>-                    'link_settings':
>-                    {
>-                        'ldflags':
>-                        [
>-                            '<!@(<(pkg-config) --libs-only-L --libs-only-other x11 xi xext)',
>-                        ],
>-                        'libraries':
>-                        [
>-                            '<!@(<(pkg-config) --libs-only-l x11 xi xext) -ldl',
>-                        ],
>-                    },
>-                }],
>-                ['OS=="linux" and use_libpci==1',
>-                {
>-                    'sources':
>-                    [
>-                        '<@(libangle_gpu_info_util_libpci_sources)',
>-                    ],
>-                    'defines':
>-                    [
>-                        'GPU_INFO_USE_LIBPCI',
>-                    ],
>-                    'link_settings':
>-                    {
>-                        'ldflags':
>-                        [
>-                            '<!@(<(pkg-config) --libs-only-L --libs-only-other libpci)',
>-                        ],
>-                        'libraries':
>-                        [
>-                            '<!@(<(pkg-config) --libs-only-l libpci)',
>-                        ],
>-                    },
>-                }],
>-                ['OS=="mac"',
>-                {
>-                    'sources':
>-                    [
>-                        '<@(libangle_gpu_info_util_mac_sources)',
>-                    ],
>-                }],
>-            ],
>-        },
>-
>-        {
>-            'target_name': 'copy_scripts',
>-            'type': 'none',
>-            'includes': [ '../gyp/common_defines.gypi', ],
>-            'hard_dependency': 1,
>-            'copies':
>-            [
>-                {
>-                    'destination': '<(angle_gen_path)',
>-                    'files': [ 'copy_compiler_dll.bat', '<(angle_id_script_base)' ],
>-                },
>-            ],
>-            'conditions':
>-            [
>-                ['angle_build_winrt==1',
>-                {
>-                    'type' : 'shared_library',
>-                }],
>-            ],
>-        },
>-    ],
>-    'conditions':
>-    [
>-        ['angle_use_commit_id!=0',
>-        {
>-            'targets':
>-            [
>-                {
>-                    'target_name': 'commit_id',
>-                    'type': 'none',
>-                    'includes': [ '../gyp/common_defines.gypi', ],
>-                    'dependencies': [ 'copy_scripts', ],
>-                    'hard_dependency': 1,
>-                    'actions':
>-                    [
>-                        {
>-                            'action_name': 'Generate ANGLE Commit ID Header',
>-                            'message': 'Generating ANGLE Commit ID',
>-                            # reference the git index as an input, so we rebuild on changes to the index
>-                            'inputs': [ '<(angle_id_script)', '<(angle_path)/.git/index' ],
>-                            'outputs': [ '<(angle_id_header)' ],
>-                            'msvs_cygwin_shell': 0,
>-                            'action':
>-                            [
>-                                'python', '<(angle_id_script)', 'gen', '<(angle_path)', '<(angle_id_header)'
>-                            ],
>-                        },
>-                    ],
>-                    'all_dependent_settings':
>-                    {
>-                        'include_dirs':
>-                        [
>-                            '<(angle_gen_path)',
>-                        ],
>-                    },
>-                    'conditions':
>-                    [
>-                        ['angle_build_winrt==1',
>-                        {
>-                            'type' : 'shared_library',
>-                        }],
>-                    ],
>-                }
>-            ]
>-        },
>-        { # angle_use_commit_id==0
>-            'targets':
>-            [
>-                {
>-                    'target_name': 'commit_id',
>-                    'type': 'none',
>-                    'hard_dependency': 1,
>-                    'includes': [ '../gyp/common_defines.gypi', ],
>-                    'copies':
>-                    [
>-                        {
>-                            'destination': '<(angle_gen_path)/id',
>-                            'files': [ '<(angle_id_header_base)' ]
>-                        }
>-                    ],
>-                    'all_dependent_settings':
>-                    {
>-                        'include_dirs':
>-                        [
>-                            '<(angle_gen_path)',
>-                        ],
>-                    },
>-                    'conditions':
>-                    [
>-                        ['angle_build_winrt==1',
>-                        {
>-                            'type' : 'shared_library',
>-                        }],
>-                    ],
>-                }
>-            ]
>-        }],
>-        ['OS=="win"',
>-        {
>-            'targets':
>-            [
>-                {
>-                    'target_name': 'copy_compiler_dll',
>-                    'type': 'none',
>-                    'dependencies': [ 'copy_scripts', ],
>-                    'includes': [ '../gyp/common_defines.gypi', ],
>-                    'conditions':
>-                    [
>-                        ['angle_build_winrt==0',
>-                        {
>-                            'actions':
>-                            [
>-                                {
>-                                    'action_name': 'copy_dll',
>-                                    'message': 'Copying D3D Compiler DLL...',
>-                                    'msvs_cygwin_shell': 0,
>-                                    'inputs': [ 'copy_compiler_dll.bat' ],
>-                                    'outputs': [ '<(PRODUCT_DIR)/d3dcompiler_47.dll' ],
>-                                    'action':
>-                                    [
>-                                        "<(angle_gen_path)/copy_compiler_dll.bat",
>-                                        "$(PlatformName)",
>-                                        "<(windows_sdk_path)",
>-                                        "<(PRODUCT_DIR)"
>-                                    ],
>-                                },
>-                            ], #actions
>-                        }],
>-                        ['angle_build_winrt==1',
>-                        {
>-                            'type' : 'shared_library',
>-                        }],
>-                    ]
>-                },
>-            ], # targets
>-        }],
>-    ] # conditions
>-}
>diff --git a/Source/ThirdParty/ANGLE/src/commit_id.py b/Source/ThirdParty/ANGLE/src/commit_id.py
>index bbdb810ce00..a430103be86 100644
>--- a/Source/ThirdParty/ANGLE/src/commit_id.py
>+++ b/Source/ThirdParty/ANGLE/src/commit_id.py
>@@ -1,3 +1,11 @@
>+#!/usr/bin/env python
>+#  Copyright 2018 The ANGLE Project Authors. All rights reserved.
>+#  Use of this source code is governed by a BSD-style license that can be
>+#  found in the LICENSE file.
>+
>+# Generate commit.h with git commit hash.
>+#
>+
> import subprocess as sp
> import sys
> import os
>@@ -23,6 +31,9 @@ if operation == 'check':
>         print("0")
>     sys.exit(0)
> 
>+if len(sys.argv) < 4 or operation != 'gen':
>+    sys.exit(usage)
>+
> output_file = sys.argv[3]
> commit_id_size = 12
> 
>diff --git a/Source/ThirdParty/ANGLE/src/common/Color.h b/Source/ThirdParty/ANGLE/src/common/Color.h
>index 2b4d2f6fba4..e1de358708e 100644
>--- a/Source/ThirdParty/ANGLE/src/common/Color.h
>+++ b/Source/ThirdParty/ANGLE/src/common/Color.h
>@@ -9,19 +9,33 @@
> #ifndef COMMON_COLOR_H_
> #define COMMON_COLOR_H_
> 
>+#include <cstdint>
>+
> namespace angle
> {
> 
> template <typename T>
> struct Color
> {
>+    Color();
>+    constexpr Color(T r, T g, T b, T a);
>+
>+    const T *data() const { return &red; }
>+    T *ptr() { return &red; }
>+
>+    static Color fromData(const T *data) { return Color(data[0], data[1], data[2], data[3]); }
>+    void writeData(T *data) const
>+    {
>+        data[0] = red;
>+        data[1] = green;
>+        data[2] = blue;
>+        data[3] = alpha;
>+    }
>+
>     T red;
>     T green;
>     T blue;
>     T alpha;
>-
>-    Color();
>-    Color(T r, T g, T b, T a);
> };
> 
> template <typename T>
>@@ -34,6 +48,42 @@ typedef Color<float> ColorF;
> typedef Color<int> ColorI;
> typedef Color<unsigned int> ColorUI;
> 
>+struct ColorGeneric
>+{
>+    inline ColorGeneric();
>+    inline ColorGeneric(const ColorF &color);
>+    inline ColorGeneric(const ColorI &color);
>+    inline ColorGeneric(const ColorUI &color);
>+
>+    enum class Type : uint8_t
>+    {
>+        Float = 0,
>+        Int   = 1,
>+        UInt  = 2
>+    };
>+
>+    union
>+    {
>+        ColorF colorF;
>+        ColorI colorI;
>+        ColorUI colorUI;
>+    };
>+
>+    Type type;
>+};
>+
>+inline bool operator==(const ColorGeneric &a, const ColorGeneric &b);
>+
>+inline bool operator!=(const ColorGeneric &a, const ColorGeneric &b);
>+
>+struct DepthStencil
>+{
>+    DepthStencil() : depth(0), stencil(0) {}
>+
>+    // Double is needed to represent the 32-bit integer range of GL_DEPTH_COMPONENT32.
>+    double depth;
>+    uint32_t stencil;
>+};
> }  // namespace angle
> 
> // TODO: Move this fully into the angle namespace
>@@ -41,10 +91,11 @@ namespace gl
> {
> 
> template <typename T>
>-using Color   = angle::Color<T>;
>-using ColorF  = angle::ColorF;
>-using ColorI  = angle::ColorI;
>-using ColorUI = angle::ColorUI;
>+using Color        = angle::Color<T>;
>+using ColorF       = angle::ColorF;
>+using ColorI       = angle::ColorI;
>+using ColorUI      = angle::ColorUI;
>+using ColorGeneric = angle::ColorGeneric;
> 
> }  // namespace gl
> 
>diff --git a/Source/ThirdParty/ANGLE/src/common/Color.inl b/Source/ThirdParty/ANGLE/src/common/Color.inl
>index c3073256b58..8ce6fcf8984 100644
>--- a/Source/ThirdParty/ANGLE/src/common/Color.inl
>+++ b/Source/ThirdParty/ANGLE/src/common/Color.inl
>@@ -15,7 +15,7 @@ Color<T>::Color() : Color(0, 0, 0, 0)
> }
> 
> template <typename T>
>-Color<T>::Color(T r, T g, T b, T a) : red(r), green(g), blue(b), alpha(a)
>+constexpr Color<T>::Color(T r, T g, T b, T a) : red(r), green(g), blue(b), alpha(a)
> {
> }
> 
>@@ -34,4 +34,36 @@ bool operator!=(const Color<T> &a, const Color<T> &b)
>     return !(a == b);
> }
> 
>+
>+ColorGeneric::ColorGeneric() : colorF(), type(Type::Float) {}
>+
>+ColorGeneric::ColorGeneric(const ColorF &color) : colorF(color), type(Type::Float) {}
>+
>+ColorGeneric::ColorGeneric(const ColorI &color) : colorI(color), type(Type::Int) {}
>+
>+ColorGeneric::ColorGeneric(const ColorUI &color) : colorUI(color), type(Type::UInt) {}
>+
>+bool operator==(const ColorGeneric &a, const ColorGeneric &b)
>+{
>+    if (a.type != b.type)
>+    {
>+        return false;
>+    }
>+    switch (a.type)
>+    {
>+        default:
>+        case ColorGeneric::Type::Float:
>+            return a.colorF == b.colorF;
>+        case ColorGeneric::Type::Int:
>+            return a.colorI == b.colorI;
>+        case ColorGeneric::Type::UInt:
>+            return a.colorUI == b.colorUI;
>+    }
>+}
>+
>+bool operator!=(const ColorGeneric &a, const ColorGeneric &b)
>+{
>+    return !(a == b);
>+}
>+
> }  // namespace angle
>diff --git a/Source/ThirdParty/ANGLE/src/common/FastVector.h b/Source/ThirdParty/ANGLE/src/common/FastVector.h
>new file mode 100644
>index 00000000000..7c86a288fc4
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/common/FastVector.h
>@@ -0,0 +1,434 @@
>+//
>+// Copyright 2018 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// FastVector.h:
>+//   A vector class with a initial fixed size and variable growth.
>+//   Based on FixedVector.
>+//
>+
>+#ifndef COMMON_FASTVECTOR_H_
>+#define COMMON_FASTVECTOR_H_
>+
>+#include "common/debug.h"
>+
>+#include <algorithm>
>+#include <array>
>+#include <initializer_list>
>+
>+namespace angle
>+{
>+template <class T, size_t N, class Storage = std::array<T, N>>
>+class FastVector final
>+{
>+  public:
>+    using value_type      = typename Storage::value_type;
>+    using size_type       = typename Storage::size_type;
>+    using reference       = typename Storage::reference;
>+    using const_reference = typename Storage::const_reference;
>+    using pointer         = typename Storage::pointer;
>+    using const_pointer   = typename Storage::const_pointer;
>+    using iterator        = T *;
>+    using const_iterator  = const T *;
>+
>+    FastVector();
>+    FastVector(size_type count, const value_type &value);
>+    FastVector(size_type count);
>+
>+    FastVector(const FastVector<T, N, Storage> &other);
>+    FastVector(FastVector<T, N, Storage> &&other);
>+    FastVector(std::initializer_list<value_type> init);
>+
>+    FastVector<T, N, Storage> &operator=(const FastVector<T, N, Storage> &other);
>+    FastVector<T, N, Storage> &operator=(FastVector<T, N, Storage> &&other);
>+    FastVector<T, N, Storage> &operator=(std::initializer_list<value_type> init);
>+
>+    ~FastVector();
>+
>+    reference at(size_type pos);
>+    const_reference at(size_type pos) const;
>+
>+    reference operator[](size_type pos);
>+    const_reference operator[](size_type pos) const;
>+
>+    pointer data();
>+    const_pointer data() const;
>+
>+    iterator begin();
>+    const_iterator begin() const;
>+
>+    iterator end();
>+    const_iterator end() const;
>+
>+    bool empty() const;
>+    size_type size() const;
>+
>+    void clear();
>+
>+    void push_back(const value_type &value);
>+    void push_back(value_type &&value);
>+
>+    void pop_back();
>+
>+    reference front();
>+    const_reference front() const;
>+
>+    reference back();
>+    const_reference back() const;
>+
>+    void swap(FastVector<T, N, Storage> &other);
>+
>+    void resize(size_type count);
>+    void resize(size_type count, const value_type &value);
>+
>+    // Specialty function that removes a known element and might shuffle the list.
>+    void remove_and_permute(const value_type &element);
>+
>+  private:
>+    void assign_from_initializer_list(std::initializer_list<value_type> init);
>+    void ensure_capacity(size_t capacity);
>+    bool uses_fixed_storage() const;
>+
>+    Storage mFixedStorage;
>+    pointer mData           = mFixedStorage.data();
>+    size_type mSize         = 0;
>+    size_type mReservedSize = N;
>+};
>+
>+template <class T, size_t N, class StorageN, size_t M, class StorageM>
>+bool operator==(const FastVector<T, N, StorageN> &a, const FastVector<T, M, StorageM> &b)
>+{
>+    return a.size() == b.size() && std::equal(a.begin(), a.end(), b.begin());
>+}
>+
>+template <class T, size_t N, class StorageN, size_t M, class StorageM>
>+bool operator!=(const FastVector<T, N, StorageN> &a, const FastVector<T, M, StorageM> &b)
>+{
>+    return !(a == b);
>+}
>+
>+template <class T, size_t N, class Storage>
>+ANGLE_INLINE bool FastVector<T, N, Storage>::uses_fixed_storage() const
>+{
>+    return mData == mFixedStorage.data();
>+}
>+
>+template <class T, size_t N, class Storage>
>+FastVector<T, N, Storage>::FastVector()
>+{}
>+
>+template <class T, size_t N, class Storage>
>+FastVector<T, N, Storage>::FastVector(size_type count, const value_type &value)
>+{
>+    ensure_capacity(count);
>+    mSize = count;
>+    std::fill(begin(), end(), value);
>+}
>+
>+template <class T, size_t N, class Storage>
>+FastVector<T, N, Storage>::FastVector(size_type count)
>+{
>+    ensure_capacity(count);
>+    mSize = count;
>+}
>+
>+template <class T, size_t N, class Storage>
>+FastVector<T, N, Storage>::FastVector(const FastVector<T, N, Storage> &other)
>+{
>+    ensure_capacity(other.mSize);
>+    mSize = other.mSize;
>+    std::copy(other.begin(), other.end(), begin());
>+}
>+
>+template <class T, size_t N, class Storage>
>+FastVector<T, N, Storage>::FastVector(FastVector<T, N, Storage> &&other) : FastVector()
>+{
>+    swap(other);
>+}
>+
>+template <class T, size_t N, class Storage>
>+FastVector<T, N, Storage>::FastVector(std::initializer_list<value_type> init)
>+{
>+    assign_from_initializer_list(init);
>+}
>+
>+template <class T, size_t N, class Storage>
>+FastVector<T, N, Storage> &FastVector<T, N, Storage>::operator=(
>+    const FastVector<T, N, Storage> &other)
>+{
>+    ensure_capacity(other.mSize);
>+    mSize = other.mSize;
>+    std::copy(other.begin(), other.end(), begin());
>+    return *this;
>+}
>+
>+template <class T, size_t N, class Storage>
>+FastVector<T, N, Storage> &FastVector<T, N, Storage>::operator=(FastVector<T, N, Storage> &&other)
>+{
>+    swap(*this, other);
>+    return *this;
>+}
>+
>+template <class T, size_t N, class Storage>
>+FastVector<T, N, Storage> &FastVector<T, N, Storage>::operator=(
>+    std::initializer_list<value_type> init)
>+{
>+    assign_from_initializer_list(init);
>+    return *this;
>+}
>+
>+template <class T, size_t N, class Storage>
>+FastVector<T, N, Storage>::~FastVector()
>+{
>+    clear();
>+    if (!uses_fixed_storage())
>+    {
>+        delete[] mData;
>+    }
>+}
>+
>+template <class T, size_t N, class Storage>
>+typename FastVector<T, N, Storage>::reference FastVector<T, N, Storage>::at(size_type pos)
>+{
>+    ASSERT(pos < mSize);
>+    return mData[pos];
>+}
>+
>+template <class T, size_t N, class Storage>
>+typename FastVector<T, N, Storage>::const_reference FastVector<T, N, Storage>::at(
>+    size_type pos) const
>+{
>+    ASSERT(pos < mSize);
>+    return mData[pos];
>+}
>+
>+template <class T, size_t N, class Storage>
>+ANGLE_INLINE typename FastVector<T, N, Storage>::reference FastVector<T, N, Storage>::operator[](
>+    size_type pos)
>+{
>+    ASSERT(pos < mSize);
>+    return mData[pos];
>+}
>+
>+template <class T, size_t N, class Storage>
>+ANGLE_INLINE
>+    typename FastVector<T, N, Storage>::const_reference FastVector<T, N, Storage>::operator[](
>+        size_type pos) const
>+{
>+    ASSERT(pos < mSize);
>+    return mData[pos];
>+}
>+
>+template <class T, size_t N, class Storage>
>+ANGLE_INLINE typename FastVector<T, N, Storage>::const_pointer
>+angle::FastVector<T, N, Storage>::data() const
>+{
>+    ASSERT(!empty());
>+    return mData;
>+}
>+
>+template <class T, size_t N, class Storage>
>+ANGLE_INLINE typename FastVector<T, N, Storage>::pointer angle::FastVector<T, N, Storage>::data()
>+{
>+    ASSERT(!empty());
>+    return mData;
>+}
>+
>+template <class T, size_t N, class Storage>
>+ANGLE_INLINE typename FastVector<T, N, Storage>::iterator FastVector<T, N, Storage>::begin()
>+{
>+    return mData;
>+}
>+
>+template <class T, size_t N, class Storage>
>+ANGLE_INLINE typename FastVector<T, N, Storage>::const_iterator FastVector<T, N, Storage>::begin()
>+    const
>+{
>+    return mData;
>+}
>+
>+template <class T, size_t N, class Storage>
>+ANGLE_INLINE typename FastVector<T, N, Storage>::iterator FastVector<T, N, Storage>::end()
>+{
>+    return mData + mSize;
>+}
>+
>+template <class T, size_t N, class Storage>
>+ANGLE_INLINE typename FastVector<T, N, Storage>::const_iterator FastVector<T, N, Storage>::end()
>+    const
>+{
>+    return mData + mSize;
>+}
>+
>+template <class T, size_t N, class Storage>
>+ANGLE_INLINE bool FastVector<T, N, Storage>::empty() const
>+{
>+    return mSize == 0;
>+}
>+
>+template <class T, size_t N, class Storage>
>+ANGLE_INLINE typename FastVector<T, N, Storage>::size_type FastVector<T, N, Storage>::size() const
>+{
>+    return mSize;
>+}
>+
>+template <class T, size_t N, class Storage>
>+void FastVector<T, N, Storage>::clear()
>+{
>+    resize(0);
>+}
>+
>+template <class T, size_t N, class Storage>
>+ANGLE_INLINE void FastVector<T, N, Storage>::push_back(const value_type &value)
>+{
>+    if (mSize == mReservedSize)
>+        ensure_capacity(mSize + 1);
>+    mData[mSize++] = value;
>+}
>+
>+template <class T, size_t N, class Storage>
>+ANGLE_INLINE void FastVector<T, N, Storage>::push_back(value_type &&value)
>+{
>+    if (mSize == mReservedSize)
>+        ensure_capacity(mSize + 1);
>+    mData[mSize++] = std::move(value);
>+}
>+
>+template <class T, size_t N, class Storage>
>+ANGLE_INLINE void FastVector<T, N, Storage>::pop_back()
>+{
>+    ASSERT(mSize > 0);
>+    mSize--;
>+}
>+
>+template <class T, size_t N, class Storage>
>+ANGLE_INLINE typename FastVector<T, N, Storage>::reference FastVector<T, N, Storage>::front()
>+{
>+    ASSERT(mSize > 0);
>+    return mData[0];
>+}
>+
>+template <class T, size_t N, class Storage>
>+ANGLE_INLINE typename FastVector<T, N, Storage>::const_reference FastVector<T, N, Storage>::front()
>+    const
>+{
>+    ASSERT(mSize > 0);
>+    return mData[0];
>+}
>+
>+template <class T, size_t N, class Storage>
>+ANGLE_INLINE typename FastVector<T, N, Storage>::reference FastVector<T, N, Storage>::back()
>+{
>+    ASSERT(mSize > 0);
>+    return mData[mSize - 1];
>+}
>+
>+template <class T, size_t N, class Storage>
>+ANGLE_INLINE typename FastVector<T, N, Storage>::const_reference FastVector<T, N, Storage>::back()
>+    const
>+{
>+    ASSERT(mSize > 0);
>+    return mData[mSize - 1];
>+}
>+
>+template <class T, size_t N, class Storage>
>+void FastVector<T, N, Storage>::swap(FastVector<T, N, Storage> &other)
>+{
>+    std::swap(mSize, other.mSize);
>+
>+    pointer tempData = other.mData;
>+    if (uses_fixed_storage())
>+        other.mData = other.mFixedStorage.data();
>+    else
>+        other.mData = mData;
>+    if (tempData == other.mFixedStorage.data())
>+        mData = mFixedStorage.data();
>+    else
>+        mData = tempData;
>+    std::swap(mReservedSize, other.mReservedSize);
>+
>+    if (uses_fixed_storage() || other.uses_fixed_storage())
>+        std::swap(mFixedStorage, other.mFixedStorage);
>+}
>+
>+template <class T, size_t N, class Storage>
>+void FastVector<T, N, Storage>::resize(size_type count)
>+{
>+    if (count > mSize)
>+    {
>+        ensure_capacity(count);
>+    }
>+    mSize = count;
>+}
>+
>+template <class T, size_t N, class Storage>
>+void FastVector<T, N, Storage>::resize(size_type count, const value_type &value)
>+{
>+    if (count > mSize)
>+    {
>+        ensure_capacity(count);
>+        std::fill(mData + mSize, mData + count, value);
>+    }
>+    mSize = count;
>+}
>+
>+template <class T, size_t N, class Storage>
>+void FastVector<T, N, Storage>::assign_from_initializer_list(std::initializer_list<value_type> init)
>+{
>+    ensure_capacity(init.size());
>+    mSize        = init.size();
>+    size_t index = 0;
>+    for (auto &value : init)
>+    {
>+        mData[index++] = value;
>+    }
>+}
>+
>+template <class T, size_t N, class Storage>
>+ANGLE_INLINE void FastVector<T, N, Storage>::remove_and_permute(const value_type &element)
>+{
>+    size_t len = mSize - 1;
>+    for (size_t index = 0; index < len; ++index)
>+    {
>+        if (mData[index] == element)
>+        {
>+            mData[index] = std::move(mData[len]);
>+            break;
>+        }
>+    }
>+    pop_back();
>+}
>+
>+template <class T, size_t N, class Storage>
>+void FastVector<T, N, Storage>::ensure_capacity(size_t capacity)
>+{
>+    // We have a minimum capacity of N.
>+    if (mReservedSize < capacity)
>+    {
>+        ASSERT(capacity > N);
>+        size_type newSize = std::max(mReservedSize, N);
>+        while (newSize < capacity)
>+        {
>+            newSize *= 2;
>+        }
>+
>+        pointer newData = new value_type[newSize];
>+
>+        if (mSize > 0)
>+        {
>+            std::move(begin(), end(), newData);
>+        }
>+
>+        if (!uses_fixed_storage())
>+        {
>+            delete[] mData;
>+        }
>+
>+        mData         = newData;
>+        mReservedSize = newSize;
>+    }
>+}
>+}  // namespace angle
>+
>+#endif  // COMMON_FASTVECTOR_H_
>diff --git a/Source/ThirdParty/ANGLE/src/common/FastVector_unittest.cpp b/Source/ThirdParty/ANGLE/src/common/FastVector_unittest.cpp
>new file mode 100644
>index 00000000000..d5b7c3bbf86
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/common/FastVector_unittest.cpp
>@@ -0,0 +1,236 @@
>+//
>+// Copyright 2018 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// FixedVector_unittest:
>+//   Tests of the FastVector class
>+//
>+
>+#include <gtest/gtest.h>
>+
>+#include "common/FastVector.h"
>+
>+namespace angle
>+{
>+// Make sure the various constructors compile and do basic checks
>+TEST(FastVector, Constructors)
>+{
>+    FastVector<int, 5> defaultContructor;
>+    EXPECT_EQ(0u, defaultContructor.size());
>+
>+    FastVector<int, 5> count(3);
>+    EXPECT_EQ(3u, count.size());
>+
>+    FastVector<int, 5> countAndValue(3, 2);
>+    EXPECT_EQ(3u, countAndValue.size());
>+    EXPECT_EQ(2, countAndValue[1]);
>+
>+    FastVector<int, 5> copy(countAndValue);
>+    EXPECT_EQ(copy, countAndValue);
>+
>+    FastVector<int, 5> copyRValue(std::move(count));
>+    EXPECT_EQ(3u, copyRValue.size());
>+
>+    FastVector<int, 5> initializerList{1, 2, 3, 4, 5};
>+    EXPECT_EQ(5u, initializerList.size());
>+    EXPECT_EQ(3, initializerList[2]);
>+
>+    FastVector<int, 5> assignCopy(copyRValue);
>+    EXPECT_EQ(3u, assignCopy.size());
>+
>+    FastVector<int, 5> assignRValue(std::move(assignCopy));
>+    EXPECT_EQ(3u, assignRValue.size());
>+
>+    FastVector<int, 5> assignmentInitializerList = {1, 2, 3, 4, 5};
>+    EXPECT_EQ(5u, assignmentInitializerList.size());
>+    EXPECT_EQ(3, assignmentInitializerList[2]);
>+}
>+
>+// Test indexing operations (at, operator[])
>+TEST(FastVector, Indexing)
>+{
>+    FastVector<int, 5> vec = {0, 1, 2, 3, 4};
>+    for (int i = 0; i < 5; ++i)
>+    {
>+        EXPECT_EQ(i, vec.at(i));
>+        EXPECT_EQ(vec[i], vec.at(i));
>+    }
>+}
>+
>+// Test the push_back functions
>+TEST(FastVector, PushBack)
>+{
>+    FastVector<int, 5> vec;
>+    vec.push_back(1);
>+    EXPECT_EQ(1, vec[0]);
>+    vec.push_back(1);
>+    vec.push_back(1);
>+    vec.push_back(1);
>+    vec.push_back(1);
>+    EXPECT_EQ(5u, vec.size());
>+}
>+
>+// Tests growing the fast vector beyond the fixed storage.
>+TEST(FastVector, Growth)
>+{
>+    constexpr size_t kSize = 4;
>+    FastVector<size_t, kSize> vec;
>+
>+    for (size_t i = 0; i < kSize * 2; ++i)
>+    {
>+        vec.push_back(i);
>+    }
>+
>+    EXPECT_EQ(kSize * 2, vec.size());
>+
>+    for (size_t i = kSize * 2; i > 0; --i)
>+    {
>+        ASSERT_EQ(vec.back(), i - 1);
>+        vec.pop_back();
>+    }
>+
>+    EXPECT_EQ(0u, vec.size());
>+}
>+
>+// Test the pop_back function
>+TEST(FastVector, PopBack)
>+{
>+    FastVector<int, 5> vec;
>+    vec.push_back(1);
>+    EXPECT_EQ(1, (int)vec.size());
>+    vec.pop_back();
>+    EXPECT_EQ(0, (int)vec.size());
>+}
>+
>+// Test the back function
>+TEST(FastVector, Back)
>+{
>+    FastVector<int, 5> vec;
>+    vec.push_back(1);
>+    vec.push_back(2);
>+    EXPECT_EQ(2, vec.back());
>+}
>+
>+// Test the back function
>+TEST(FastVector, Front)
>+{
>+    FastVector<int, 5> vec;
>+    vec.push_back(1);
>+    vec.push_back(2);
>+    EXPECT_EQ(1, vec.front());
>+}
>+
>+// Test the sizing operations
>+TEST(FastVector, Size)
>+{
>+    FastVector<int, 5> vec;
>+    EXPECT_TRUE(vec.empty());
>+    EXPECT_EQ(0u, vec.size());
>+
>+    vec.push_back(1);
>+    EXPECT_FALSE(vec.empty());
>+    EXPECT_EQ(1u, vec.size());
>+}
>+
>+// Test clearing the vector
>+TEST(FastVector, Clear)
>+{
>+    FastVector<int, 5> vec = {0, 1, 2, 3, 4};
>+    vec.clear();
>+    EXPECT_TRUE(vec.empty());
>+}
>+
>+// Test clearing the vector larger than the fixed size.
>+TEST(FastVector, ClearWithLargerThanFixedSize)
>+{
>+    FastVector<int, 3> vec = {0, 1, 2, 3, 4};
>+    vec.clear();
>+    EXPECT_TRUE(vec.empty());
>+}
>+
>+// Test resizing the vector
>+TEST(FastVector, Resize)
>+{
>+    FastVector<int, 5> vec;
>+    vec.resize(5u, 1);
>+    EXPECT_EQ(5u, vec.size());
>+    for (int i : vec)
>+    {
>+        EXPECT_EQ(1, i);
>+    }
>+
>+    vec.resize(2u);
>+    EXPECT_EQ(2u, vec.size());
>+    for (int i : vec)
>+    {
>+        EXPECT_EQ(1, i);
>+    }
>+
>+    // Resize to larger than minimum
>+    vec.resize(10u, 2);
>+    EXPECT_EQ(10u, vec.size());
>+
>+    for (size_t index = 0; index < 2u; ++index)
>+    {
>+        EXPECT_EQ(1, vec[index]);
>+    }
>+    for (size_t index = 2u; index < 10u; ++index)
>+    {
>+        EXPECT_EQ(2, vec[index]);
>+    }
>+
>+    // Resize back to smaller
>+    vec.resize(2u, 2);
>+    EXPECT_EQ(2u, vec.size());
>+}
>+
>+// Test iterating over the vector
>+TEST(FastVector, Iteration)
>+{
>+    FastVector<int, 5> vec = {0, 1, 2, 3};
>+
>+    int vistedCount = 0;
>+    for (int value : vec)
>+    {
>+        EXPECT_EQ(vistedCount, value);
>+        vistedCount++;
>+    }
>+    EXPECT_EQ(4, vistedCount);
>+}
>+
>+// Tests that equality comparisons work even if reserved size differs.
>+TEST(FastVector, EqualityWithDifferentReservedSizes)
>+{
>+    FastVector<int, 3> vec1 = {1, 2, 3, 4, 5};
>+    FastVector<int, 5> vec2 = {1, 2, 3, 4, 5};
>+    EXPECT_EQ(vec1, vec2);
>+    vec2.push_back(6);
>+    EXPECT_NE(vec1, vec2);
>+}
>+
>+// Tests vector operations with a non copyable type.
>+TEST(FastVector, NonCopyable)
>+{
>+    struct s : angle::NonCopyable
>+    {
>+        s() : x(0) {}
>+        s(int xin) : x(xin) {}
>+        s(s &&other) : x(other.x) {}
>+        s &operator=(s &&other)
>+        {
>+            x = other.x;
>+            return *this;
>+        }
>+        int x;
>+    };
>+
>+    FastVector<s, 3> vec;
>+    vec.push_back(3);
>+    EXPECT_EQ(3, vec[0].x);
>+
>+    FastVector<s, 3> copy = std::move(vec);
>+    EXPECT_EQ(1u, copy.size());
>+    EXPECT_EQ(3, copy[0].x);
>+}
>+}  // namespace angle
>diff --git a/Source/ThirdParty/ANGLE/src/common/FixedVector.h b/Source/ThirdParty/ANGLE/src/common/FixedVector.h
>new file mode 100644
>index 00000000000..764e1ad1944
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/common/FixedVector.h
>@@ -0,0 +1,341 @@
>+//
>+// Copyright 2018 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// FixedVector.h:
>+//   A vector class with a maximum size and fixed storage.
>+//
>+
>+#ifndef COMMON_FIXEDVECTOR_H_
>+#define COMMON_FIXEDVECTOR_H_
>+
>+#include "common/debug.h"
>+
>+#include <algorithm>
>+#include <array>
>+#include <initializer_list>
>+
>+namespace angle
>+{
>+template <class T, size_t N, class Storage = std::array<T, N>>
>+class FixedVector final
>+{
>+  public:
>+    using value_type             = typename Storage::value_type;
>+    using size_type              = typename Storage::size_type;
>+    using reference              = typename Storage::reference;
>+    using const_reference        = typename Storage::const_reference;
>+    using pointer                = typename Storage::pointer;
>+    using const_pointer          = typename Storage::const_pointer;
>+    using iterator               = typename Storage::iterator;
>+    using const_iterator         = typename Storage::const_iterator;
>+    using reverse_iterator       = typename Storage::reverse_iterator;
>+    using const_reverse_iterator = typename Storage::const_reverse_iterator;
>+
>+    FixedVector();
>+    FixedVector(size_type count, const value_type &value);
>+    FixedVector(size_type count);
>+
>+    FixedVector(const FixedVector<T, N, Storage> &other);
>+    FixedVector(FixedVector<T, N, Storage> &&other);
>+    FixedVector(std::initializer_list<value_type> init);
>+
>+    FixedVector<T, N, Storage> &operator=(const FixedVector<T, N, Storage> &other);
>+    FixedVector<T, N, Storage> &operator=(FixedVector<T, N, Storage> &&other);
>+    FixedVector<T, N, Storage> &operator=(std::initializer_list<value_type> init);
>+
>+    ~FixedVector();
>+
>+    reference at(size_type pos);
>+    const_reference at(size_type pos) const;
>+
>+    reference operator[](size_type pos);
>+    const_reference operator[](size_type pos) const;
>+
>+    pointer data();
>+    const_pointer data() const;
>+
>+    iterator begin();
>+    const_iterator begin() const;
>+
>+    iterator end();
>+    const_iterator end() const;
>+
>+    bool empty() const;
>+    size_type size() const;
>+    size_type max_size() const;
>+
>+    void clear();
>+
>+    void push_back(const value_type &value);
>+    void push_back(value_type &&value);
>+
>+    void pop_back();
>+    reference back();
>+    const_reference back() const;
>+
>+    void swap(FixedVector<T, N, Storage> &other);
>+
>+    void resize(size_type count);
>+    void resize(size_type count, const value_type &value);
>+
>+    bool full() const;
>+
>+  private:
>+    void assign_from_initializer_list(std::initializer_list<value_type> init);
>+
>+    Storage mStorage;
>+    size_type mSize = 0;
>+};
>+
>+template <class T, size_t N, class Storage>
>+bool operator==(const FixedVector<T, N, Storage> &a, const FixedVector<T, N, Storage> &b)
>+{
>+    return a.size() == b.size() && std::equal(a.begin(), a.end(), b.begin());
>+}
>+
>+template <class T, size_t N, class Storage>
>+bool operator!=(const FixedVector<T, N, Storage> &a, const FixedVector<T, N, Storage> &b)
>+{
>+    return !(a == b);
>+}
>+
>+template <class T, size_t N, class Storage>
>+FixedVector<T, N, Storage>::FixedVector() = default;
>+
>+template <class T, size_t N, class Storage>
>+FixedVector<T, N, Storage>::FixedVector(size_type count, const value_type &value) : mSize(count)
>+{
>+    ASSERT(count <= N);
>+    std::fill(mStorage.begin(), mStorage.begin() + count, value);
>+}
>+
>+template <class T, size_t N, class Storage>
>+FixedVector<T, N, Storage>::FixedVector(size_type count) : mSize(count)
>+{
>+    ASSERT(count <= N);
>+}
>+
>+template <class T, size_t N, class Storage>
>+FixedVector<T, N, Storage>::FixedVector(const FixedVector<T, N, Storage> &other) = default;
>+
>+template <class T, size_t N, class Storage>
>+FixedVector<T, N, Storage>::FixedVector(FixedVector<T, N, Storage> &&other) = default;
>+
>+template <class T, size_t N, class Storage>
>+FixedVector<T, N, Storage>::FixedVector(std::initializer_list<value_type> init)
>+{
>+    ASSERT(init.size() <= N);
>+    assign_from_initializer_list(init);
>+}
>+
>+template <class T, size_t N, class Storage>
>+FixedVector<T, N, Storage> &FixedVector<T, N, Storage>::operator=(
>+    const FixedVector<T, N, Storage> &other) = default;
>+
>+template <class T, size_t N, class Storage>
>+FixedVector<T, N, Storage> &FixedVector<T, N, Storage>::operator=(
>+    FixedVector<T, N, Storage> &&other) = default;
>+
>+template <class T, size_t N, class Storage>
>+FixedVector<T, N, Storage> &FixedVector<T, N, Storage>::operator=(
>+    std::initializer_list<value_type> init)
>+{
>+    clear();
>+    ASSERT(init.size() <= N);
>+    assign_from_initializer_list(init);
>+    return this;
>+}
>+
>+template <class T, size_t N, class Storage>
>+FixedVector<T, N, Storage>::~FixedVector()
>+{
>+    clear();
>+}
>+
>+template <class T, size_t N, class Storage>
>+typename FixedVector<T, N, Storage>::reference FixedVector<T, N, Storage>::at(size_type pos)
>+{
>+    ASSERT(pos < N);
>+    return mStorage.at(pos);
>+}
>+
>+template <class T, size_t N, class Storage>
>+typename FixedVector<T, N, Storage>::const_reference FixedVector<T, N, Storage>::at(
>+    size_type pos) const
>+{
>+    ASSERT(pos < N);
>+    return mStorage.at(pos);
>+}
>+
>+template <class T, size_t N, class Storage>
>+typename FixedVector<T, N, Storage>::reference FixedVector<T, N, Storage>::operator[](size_type pos)
>+{
>+    ASSERT(pos < N);
>+    return mStorage[pos];
>+}
>+
>+template <class T, size_t N, class Storage>
>+typename FixedVector<T, N, Storage>::const_reference FixedVector<T, N, Storage>::operator[](
>+    size_type pos) const
>+{
>+    ASSERT(pos < N);
>+    return mStorage[pos];
>+}
>+
>+template <class T, size_t N, class Storage>
>+typename FixedVector<T, N, Storage>::const_pointer angle::FixedVector<T, N, Storage>::data() const
>+{
>+    return mStorage.data();
>+}
>+
>+template <class T, size_t N, class Storage>
>+typename FixedVector<T, N, Storage>::pointer angle::FixedVector<T, N, Storage>::data()
>+{
>+    return mStorage.data();
>+}
>+
>+template <class T, size_t N, class Storage>
>+typename FixedVector<T, N, Storage>::iterator FixedVector<T, N, Storage>::begin()
>+{
>+    return mStorage.begin();
>+}
>+
>+template <class T, size_t N, class Storage>
>+typename FixedVector<T, N, Storage>::const_iterator FixedVector<T, N, Storage>::begin() const
>+{
>+    return mStorage.begin();
>+}
>+
>+template <class T, size_t N, class Storage>
>+typename FixedVector<T, N, Storage>::iterator FixedVector<T, N, Storage>::end()
>+{
>+    return mStorage.begin() + mSize;
>+}
>+
>+template <class T, size_t N, class Storage>
>+typename FixedVector<T, N, Storage>::const_iterator FixedVector<T, N, Storage>::end() const
>+{
>+    return mStorage.begin() + mSize;
>+}
>+
>+template <class T, size_t N, class Storage>
>+bool FixedVector<T, N, Storage>::empty() const
>+{
>+    return mSize == 0;
>+}
>+
>+template <class T, size_t N, class Storage>
>+typename FixedVector<T, N, Storage>::size_type FixedVector<T, N, Storage>::size() const
>+{
>+    return mSize;
>+}
>+
>+template <class T, size_t N, class Storage>
>+typename FixedVector<T, N, Storage>::size_type FixedVector<T, N, Storage>::max_size() const
>+{
>+    return N;
>+}
>+
>+template <class T, size_t N, class Storage>
>+void FixedVector<T, N, Storage>::clear()
>+{
>+    resize(0);
>+}
>+
>+template <class T, size_t N, class Storage>
>+void FixedVector<T, N, Storage>::push_back(const value_type &value)
>+{
>+    ASSERT(mSize < N);
>+    mStorage[mSize] = value;
>+    mSize++;
>+}
>+
>+template <class T, size_t N, class Storage>
>+void FixedVector<T, N, Storage>::push_back(value_type &&value)
>+{
>+    ASSERT(mSize < N);
>+    mStorage[mSize] = std::move(value);
>+    mSize++;
>+}
>+
>+template <class T, size_t N, class Storage>
>+void FixedVector<T, N, Storage>::pop_back()
>+{
>+    ASSERT(mSize > 0);
>+    mSize--;
>+}
>+
>+template <class T, size_t N, class Storage>
>+typename FixedVector<T, N, Storage>::reference FixedVector<T, N, Storage>::back()
>+{
>+    ASSERT(mSize > 0);
>+    return mStorage[mSize - 1];
>+}
>+
>+template <class T, size_t N, class Storage>
>+typename FixedVector<T, N, Storage>::const_reference FixedVector<T, N, Storage>::back() const
>+{
>+    ASSERT(mSize > 0);
>+    return mStorage[mSize - 1];
>+}
>+
>+template <class T, size_t N, class Storage>
>+void FixedVector<T, N, Storage>::swap(FixedVector<T, N, Storage> &other)
>+{
>+    std::swap(mSize, other.mSize);
>+    std::swap(mStorage, other.mStorage);
>+}
>+
>+template <class T, size_t N, class Storage>
>+void FixedVector<T, N, Storage>::resize(size_type count)
>+{
>+    ASSERT(count <= N);
>+    while (mSize > count)
>+    {
>+        mSize--;
>+        mStorage[mSize] = value_type();
>+    }
>+    while (mSize < count)
>+    {
>+        mStorage[mSize] = value_type();
>+        mSize++;
>+    }
>+}
>+
>+template <class T, size_t N, class Storage>
>+void FixedVector<T, N, Storage>::resize(size_type count, const value_type &value)
>+{
>+    ASSERT(count <= N);
>+    while (mSize > count)
>+    {
>+        mSize--;
>+        mStorage[mSize] = value_type();
>+    }
>+    while (mSize < count)
>+    {
>+        mStorage[mSize] = value;
>+        mSize++;
>+    }
>+}
>+
>+template <class T, size_t N, class Storage>
>+void FixedVector<T, N, Storage>::assign_from_initializer_list(
>+    std::initializer_list<value_type> init)
>+{
>+    for (auto element : init)
>+    {
>+        mStorage[mSize] = std::move(element);
>+        mSize++;
>+    }
>+}
>+
>+template <class T, size_t N, class Storage>
>+bool FixedVector<T, N, Storage>::full() const
>+{
>+    return (mSize == N);
>+}
>+}  // namespace angle
>+
>+#endif  // COMMON_FIXEDVECTOR_H_
>diff --git a/Source/ThirdParty/ANGLE/src/common/FixedVector_unittest.cpp b/Source/ThirdParty/ANGLE/src/common/FixedVector_unittest.cpp
>new file mode 100644
>index 00000000000..5e6c872556c
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/common/FixedVector_unittest.cpp
>@@ -0,0 +1,148 @@
>+//
>+// Copyright 2018 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// FixedVector_unittest:
>+//   Tests of the FixedVector class
>+//
>+
>+#include <gtest/gtest.h>
>+
>+#include "common/FixedVector.h"
>+
>+namespace angle
>+{
>+// Make sure the various constructors compile and do basic checks
>+TEST(FixedVector, Constructors)
>+{
>+    FixedVector<int, 5> defaultContructor;
>+    EXPECT_EQ(0u, defaultContructor.size());
>+
>+    FixedVector<int, 5> count(3);
>+    EXPECT_EQ(3u, count.size());
>+
>+    FixedVector<int, 5> countAndValue(3, 2);
>+    EXPECT_EQ(3u, countAndValue.size());
>+    EXPECT_EQ(2, countAndValue[1]);
>+
>+    FixedVector<int, 5> copy(countAndValue);
>+    EXPECT_EQ(copy, countAndValue);
>+
>+    FixedVector<int, 5> copyRValue(std::move(count));
>+    EXPECT_EQ(3u, copyRValue.size());
>+
>+    FixedVector<int, 5> initializerList{1, 2, 3, 4, 5};
>+    EXPECT_EQ(5u, initializerList.size());
>+    EXPECT_EQ(3, initializerList[2]);
>+
>+    FixedVector<int, 5> assignCopy(copyRValue);
>+    EXPECT_EQ(3u, assignCopy.size());
>+
>+    FixedVector<int, 5> assignRValue(std::move(assignCopy));
>+    EXPECT_EQ(3u, assignRValue.size());
>+
>+    FixedVector<int, 5> assignmentInitializerList = {1, 2, 3, 4, 5};
>+    EXPECT_EQ(5u, assignmentInitializerList.size());
>+    EXPECT_EQ(3, assignmentInitializerList[2]);
>+}
>+
>+// Test indexing operations (at, operator[])
>+TEST(FixedVector, Indexing)
>+{
>+    FixedVector<int, 5> vec = {0, 1, 2, 3, 4};
>+    EXPECT_EQ(0, vec.at(0));
>+    EXPECT_EQ(vec[0], vec.at(0));
>+}
>+
>+// Test the push_back functions
>+TEST(FixedVector, PushBack)
>+{
>+    FixedVector<int, 5> vec;
>+    vec.push_back(1);
>+    EXPECT_EQ(1, vec[0]);
>+    vec.push_back(1);
>+    vec.push_back(1);
>+    vec.push_back(1);
>+    vec.push_back(1);
>+    EXPECT_EQ(vec.size(), vec.max_size());
>+}
>+
>+// Test the pop_back function
>+TEST(FixedVector, PopBack)
>+{
>+    FixedVector<int, 5> vec;
>+    vec.push_back(1);
>+    EXPECT_EQ(1, (int)vec.size());
>+    vec.pop_back();
>+    EXPECT_EQ(0, (int)vec.size());
>+}
>+
>+// Test the back function
>+TEST(FixedVector, Back)
>+{
>+    FixedVector<int, 5> vec;
>+    vec.push_back(1);
>+    vec.push_back(2);
>+    EXPECT_EQ(2, vec.back());
>+}
>+
>+// Test the sizing operations
>+TEST(FixedVector, Size)
>+{
>+    FixedVector<int, 5> vec;
>+    EXPECT_TRUE(vec.empty());
>+    EXPECT_EQ(0u, vec.size());
>+    EXPECT_EQ(5u, vec.max_size());
>+
>+    vec.push_back(1);
>+    EXPECT_FALSE(vec.empty());
>+    EXPECT_EQ(1u, vec.size());
>+}
>+
>+// Test clearing the vector
>+TEST(FixedVector, Clear)
>+{
>+    FixedVector<int, 5> vec = {0, 1, 2, 3, 4};
>+    vec.clear();
>+    EXPECT_TRUE(vec.empty());
>+}
>+
>+// Test resizing the vector
>+TEST(FixedVector, Resize)
>+{
>+    FixedVector<int, 5> vec;
>+    vec.resize(5u, 1);
>+    EXPECT_EQ(5u, vec.size());
>+    EXPECT_EQ(1, vec[4]);
>+
>+    vec.resize(2u);
>+    EXPECT_EQ(2u, vec.size());
>+}
>+
>+// Test iterating over the vector
>+TEST(FixedVector, Iteration)
>+{
>+    FixedVector<int, 5> vec = {0, 1, 2, 3};
>+
>+    int vistedCount = 0;
>+    for (int value : vec)
>+    {
>+        EXPECT_EQ(vistedCount, value);
>+        vistedCount++;
>+    }
>+    EXPECT_EQ(4, vistedCount);
>+}
>+
>+// Test the "full" method.
>+TEST(FixedVector, Full)
>+{
>+    FixedVector<int, 2> vec;
>+
>+    EXPECT_FALSE(vec.full());
>+    vec.push_back(0);
>+    EXPECT_FALSE(vec.full());
>+    vec.push_back(1);
>+    EXPECT_TRUE(vec.full());
>+}
>+}  // namespace angle
>diff --git a/Source/ThirdParty/ANGLE/src/common/Float16ToFloat32.cpp b/Source/ThirdParty/ANGLE/src/common/Float16ToFloat32.cpp
>index acd0d88b607..6c21987704a 100644
>--- a/Source/ThirdParty/ANGLE/src/common/Float16ToFloat32.cpp
>+++ b/Source/ThirdParty/ANGLE/src/common/Float16ToFloat32.cpp
>@@ -12,2188 +12,284 @@ namespace gl
> {
> 
> const static unsigned g_mantissa[2048] = {
>-    0x00000000,
>-    0x33800000,
>-    0x34000000,
>-    0x34400000,
>-    0x34800000,
>-    0x34a00000,
>-    0x34c00000,
>-    0x34e00000,
>-    0x35000000,
>-    0x35100000,
>-    0x35200000,
>-    0x35300000,
>-    0x35400000,
>-    0x35500000,
>-    0x35600000,
>-    0x35700000,
>-    0x35800000,
>-    0x35880000,
>-    0x35900000,
>-    0x35980000,
>-    0x35a00000,
>-    0x35a80000,
>-    0x35b00000,
>-    0x35b80000,
>-    0x35c00000,
>-    0x35c80000,
>-    0x35d00000,
>-    0x35d80000,
>-    0x35e00000,
>-    0x35e80000,
>-    0x35f00000,
>-    0x35f80000,
>-    0x36000000,
>-    0x36040000,
>-    0x36080000,
>-    0x360c0000,
>-    0x36100000,
>-    0x36140000,
>-    0x36180000,
>-    0x361c0000,
>-    0x36200000,
>-    0x36240000,
>-    0x36280000,
>-    0x362c0000,
>-    0x36300000,
>-    0x36340000,
>-    0x36380000,
>-    0x363c0000,
>-    0x36400000,
>-    0x36440000,
>-    0x36480000,
>-    0x364c0000,
>-    0x36500000,
>-    0x36540000,
>-    0x36580000,
>-    0x365c0000,
>-    0x36600000,
>-    0x36640000,
>-    0x36680000,
>-    0x366c0000,
>-    0x36700000,
>-    0x36740000,
>-    0x36780000,
>-    0x367c0000,
>-    0x36800000,
>-    0x36820000,
>-    0x36840000,
>-    0x36860000,
>-    0x36880000,
>-    0x368a0000,
>-    0x368c0000,
>-    0x368e0000,
>-    0x36900000,
>-    0x36920000,
>-    0x36940000,
>-    0x36960000,
>-    0x36980000,
>-    0x369a0000,
>-    0x369c0000,
>-    0x369e0000,
>-    0x36a00000,
>-    0x36a20000,
>-    0x36a40000,
>-    0x36a60000,
>-    0x36a80000,
>-    0x36aa0000,
>-    0x36ac0000,
>-    0x36ae0000,
>-    0x36b00000,
>-    0x36b20000,
>-    0x36b40000,
>-    0x36b60000,
>-    0x36b80000,
>-    0x36ba0000,
>-    0x36bc0000,
>-    0x36be0000,
>-    0x36c00000,
>-    0x36c20000,
>-    0x36c40000,
>-    0x36c60000,
>-    0x36c80000,
>-    0x36ca0000,
>-    0x36cc0000,
>-    0x36ce0000,
>-    0x36d00000,
>-    0x36d20000,
>-    0x36d40000,
>-    0x36d60000,
>-    0x36d80000,
>-    0x36da0000,
>-    0x36dc0000,
>-    0x36de0000,
>-    0x36e00000,
>-    0x36e20000,
>-    0x36e40000,
>-    0x36e60000,
>-    0x36e80000,
>-    0x36ea0000,
>-    0x36ec0000,
>-    0x36ee0000,
>-    0x36f00000,
>-    0x36f20000,
>-    0x36f40000,
>-    0x36f60000,
>-    0x36f80000,
>-    0x36fa0000,
>-    0x36fc0000,
>-    0x36fe0000,
>-    0x37000000,
>-    0x37010000,
>-    0x37020000,
>-    0x37030000,
>-    0x37040000,
>-    0x37050000,
>-    0x37060000,
>-    0x37070000,
>-    0x37080000,
>-    0x37090000,
>-    0x370a0000,
>-    0x370b0000,
>-    0x370c0000,
>-    0x370d0000,
>-    0x370e0000,
>-    0x370f0000,
>-    0x37100000,
>-    0x37110000,
>-    0x37120000,
>-    0x37130000,
>-    0x37140000,
>-    0x37150000,
>-    0x37160000,
>-    0x37170000,
>-    0x37180000,
>-    0x37190000,
>-    0x371a0000,
>-    0x371b0000,
>-    0x371c0000,
>-    0x371d0000,
>-    0x371e0000,
>-    0x371f0000,
>-    0x37200000,
>-    0x37210000,
>-    0x37220000,
>-    0x37230000,
>-    0x37240000,
>-    0x37250000,
>-    0x37260000,
>-    0x37270000,
>-    0x37280000,
>-    0x37290000,
>-    0x372a0000,
>-    0x372b0000,
>-    0x372c0000,
>-    0x372d0000,
>-    0x372e0000,
>-    0x372f0000,
>-    0x37300000,
>-    0x37310000,
>-    0x37320000,
>-    0x37330000,
>-    0x37340000,
>-    0x37350000,
>-    0x37360000,
>-    0x37370000,
>-    0x37380000,
>-    0x37390000,
>-    0x373a0000,
>-    0x373b0000,
>-    0x373c0000,
>-    0x373d0000,
>-    0x373e0000,
>-    0x373f0000,
>-    0x37400000,
>-    0x37410000,
>-    0x37420000,
>-    0x37430000,
>-    0x37440000,
>-    0x37450000,
>-    0x37460000,
>-    0x37470000,
>-    0x37480000,
>-    0x37490000,
>-    0x374a0000,
>-    0x374b0000,
>-    0x374c0000,
>-    0x374d0000,
>-    0x374e0000,
>-    0x374f0000,
>-    0x37500000,
>-    0x37510000,
>-    0x37520000,
>-    0x37530000,
>-    0x37540000,
>-    0x37550000,
>-    0x37560000,
>-    0x37570000,
>-    0x37580000,
>-    0x37590000,
>-    0x375a0000,
>-    0x375b0000,
>-    0x375c0000,
>-    0x375d0000,
>-    0x375e0000,
>-    0x375f0000,
>-    0x37600000,
>-    0x37610000,
>-    0x37620000,
>-    0x37630000,
>-    0x37640000,
>-    0x37650000,
>-    0x37660000,
>-    0x37670000,
>-    0x37680000,
>-    0x37690000,
>-    0x376a0000,
>-    0x376b0000,
>-    0x376c0000,
>-    0x376d0000,
>-    0x376e0000,
>-    0x376f0000,
>-    0x37700000,
>-    0x37710000,
>-    0x37720000,
>-    0x37730000,
>-    0x37740000,
>-    0x37750000,
>-    0x37760000,
>-    0x37770000,
>-    0x37780000,
>-    0x37790000,
>-    0x377a0000,
>-    0x377b0000,
>-    0x377c0000,
>-    0x377d0000,
>-    0x377e0000,
>-    0x377f0000,
>-    0x37800000,
>-    0x37808000,
>-    0x37810000,
>-    0x37818000,
>-    0x37820000,
>-    0x37828000,
>-    0x37830000,
>-    0x37838000,
>-    0x37840000,
>-    0x37848000,
>-    0x37850000,
>-    0x37858000,
>-    0x37860000,
>-    0x37868000,
>-    0x37870000,
>-    0x37878000,
>-    0x37880000,
>-    0x37888000,
>-    0x37890000,
>-    0x37898000,
>-    0x378a0000,
>-    0x378a8000,
>-    0x378b0000,
>-    0x378b8000,
>-    0x378c0000,
>-    0x378c8000,
>-    0x378d0000,
>-    0x378d8000,
>-    0x378e0000,
>-    0x378e8000,
>-    0x378f0000,
>-    0x378f8000,
>-    0x37900000,
>-    0x37908000,
>-    0x37910000,
>-    0x37918000,
>-    0x37920000,
>-    0x37928000,
>-    0x37930000,
>-    0x37938000,
>-    0x37940000,
>-    0x37948000,
>-    0x37950000,
>-    0x37958000,
>-    0x37960000,
>-    0x37968000,
>-    0x37970000,
>-    0x37978000,
>-    0x37980000,
>-    0x37988000,
>-    0x37990000,
>-    0x37998000,
>-    0x379a0000,
>-    0x379a8000,
>-    0x379b0000,
>-    0x379b8000,
>-    0x379c0000,
>-    0x379c8000,
>-    0x379d0000,
>-    0x379d8000,
>-    0x379e0000,
>-    0x379e8000,
>-    0x379f0000,
>-    0x379f8000,
>-    0x37a00000,
>-    0x37a08000,
>-    0x37a10000,
>-    0x37a18000,
>-    0x37a20000,
>-    0x37a28000,
>-    0x37a30000,
>-    0x37a38000,
>-    0x37a40000,
>-    0x37a48000,
>-    0x37a50000,
>-    0x37a58000,
>-    0x37a60000,
>-    0x37a68000,
>-    0x37a70000,
>-    0x37a78000,
>-    0x37a80000,
>-    0x37a88000,
>-    0x37a90000,
>-    0x37a98000,
>-    0x37aa0000,
>-    0x37aa8000,
>-    0x37ab0000,
>-    0x37ab8000,
>-    0x37ac0000,
>-    0x37ac8000,
>-    0x37ad0000,
>-    0x37ad8000,
>-    0x37ae0000,
>-    0x37ae8000,
>-    0x37af0000,
>-    0x37af8000,
>-    0x37b00000,
>-    0x37b08000,
>-    0x37b10000,
>-    0x37b18000,
>-    0x37b20000,
>-    0x37b28000,
>-    0x37b30000,
>-    0x37b38000,
>-    0x37b40000,
>-    0x37b48000,
>-    0x37b50000,
>-    0x37b58000,
>-    0x37b60000,
>-    0x37b68000,
>-    0x37b70000,
>-    0x37b78000,
>-    0x37b80000,
>-    0x37b88000,
>-    0x37b90000,
>-    0x37b98000,
>-    0x37ba0000,
>-    0x37ba8000,
>-    0x37bb0000,
>-    0x37bb8000,
>-    0x37bc0000,
>-    0x37bc8000,
>-    0x37bd0000,
>-    0x37bd8000,
>-    0x37be0000,
>-    0x37be8000,
>-    0x37bf0000,
>-    0x37bf8000,
>-    0x37c00000,
>-    0x37c08000,
>-    0x37c10000,
>-    0x37c18000,
>-    0x37c20000,
>-    0x37c28000,
>-    0x37c30000,
>-    0x37c38000,
>-    0x37c40000,
>-    0x37c48000,
>-    0x37c50000,
>-    0x37c58000,
>-    0x37c60000,
>-    0x37c68000,
>-    0x37c70000,
>-    0x37c78000,
>-    0x37c80000,
>-    0x37c88000,
>-    0x37c90000,
>-    0x37c98000,
>-    0x37ca0000,
>-    0x37ca8000,
>-    0x37cb0000,
>-    0x37cb8000,
>-    0x37cc0000,
>-    0x37cc8000,
>-    0x37cd0000,
>-    0x37cd8000,
>-    0x37ce0000,
>-    0x37ce8000,
>-    0x37cf0000,
>-    0x37cf8000,
>-    0x37d00000,
>-    0x37d08000,
>-    0x37d10000,
>-    0x37d18000,
>-    0x37d20000,
>-    0x37d28000,
>-    0x37d30000,
>-    0x37d38000,
>-    0x37d40000,
>-    0x37d48000,
>-    0x37d50000,
>-    0x37d58000,
>-    0x37d60000,
>-    0x37d68000,
>-    0x37d70000,
>-    0x37d78000,
>-    0x37d80000,
>-    0x37d88000,
>-    0x37d90000,
>-    0x37d98000,
>-    0x37da0000,
>-    0x37da8000,
>-    0x37db0000,
>-    0x37db8000,
>-    0x37dc0000,
>-    0x37dc8000,
>-    0x37dd0000,
>-    0x37dd8000,
>-    0x37de0000,
>-    0x37de8000,
>-    0x37df0000,
>-    0x37df8000,
>-    0x37e00000,
>-    0x37e08000,
>-    0x37e10000,
>-    0x37e18000,
>-    0x37e20000,
>-    0x37e28000,
>-    0x37e30000,
>-    0x37e38000,
>-    0x37e40000,
>-    0x37e48000,
>-    0x37e50000,
>-    0x37e58000,
>-    0x37e60000,
>-    0x37e68000,
>-    0x37e70000,
>-    0x37e78000,
>-    0x37e80000,
>-    0x37e88000,
>-    0x37e90000,
>-    0x37e98000,
>-    0x37ea0000,
>-    0x37ea8000,
>-    0x37eb0000,
>-    0x37eb8000,
>-    0x37ec0000,
>-    0x37ec8000,
>-    0x37ed0000,
>-    0x37ed8000,
>-    0x37ee0000,
>-    0x37ee8000,
>-    0x37ef0000,
>-    0x37ef8000,
>-    0x37f00000,
>-    0x37f08000,
>-    0x37f10000,
>-    0x37f18000,
>-    0x37f20000,
>-    0x37f28000,
>-    0x37f30000,
>-    0x37f38000,
>-    0x37f40000,
>-    0x37f48000,
>-    0x37f50000,
>-    0x37f58000,
>-    0x37f60000,
>-    0x37f68000,
>-    0x37f70000,
>-    0x37f78000,
>-    0x37f80000,
>-    0x37f88000,
>-    0x37f90000,
>-    0x37f98000,
>-    0x37fa0000,
>-    0x37fa8000,
>-    0x37fb0000,
>-    0x37fb8000,
>-    0x37fc0000,
>-    0x37fc8000,
>-    0x37fd0000,
>-    0x37fd8000,
>-    0x37fe0000,
>-    0x37fe8000,
>-    0x37ff0000,
>-    0x37ff8000,
>-    0x38000000,
>-    0x38004000,
>-    0x38008000,
>-    0x3800c000,
>-    0x38010000,
>-    0x38014000,
>-    0x38018000,
>-    0x3801c000,
>-    0x38020000,
>-    0x38024000,
>-    0x38028000,
>-    0x3802c000,
>-    0x38030000,
>-    0x38034000,
>-    0x38038000,
>-    0x3803c000,
>-    0x38040000,
>-    0x38044000,
>-    0x38048000,
>-    0x3804c000,
>-    0x38050000,
>-    0x38054000,
>-    0x38058000,
>-    0x3805c000,
>-    0x38060000,
>-    0x38064000,
>-    0x38068000,
>-    0x3806c000,
>-    0x38070000,
>-    0x38074000,
>-    0x38078000,
>-    0x3807c000,
>-    0x38080000,
>-    0x38084000,
>-    0x38088000,
>-    0x3808c000,
>-    0x38090000,
>-    0x38094000,
>-    0x38098000,
>-    0x3809c000,
>-    0x380a0000,
>-    0x380a4000,
>-    0x380a8000,
>-    0x380ac000,
>-    0x380b0000,
>-    0x380b4000,
>-    0x380b8000,
>-    0x380bc000,
>-    0x380c0000,
>-    0x380c4000,
>-    0x380c8000,
>-    0x380cc000,
>-    0x380d0000,
>-    0x380d4000,
>-    0x380d8000,
>-    0x380dc000,
>-    0x380e0000,
>-    0x380e4000,
>-    0x380e8000,
>-    0x380ec000,
>-    0x380f0000,
>-    0x380f4000,
>-    0x380f8000,
>-    0x380fc000,
>-    0x38100000,
>-    0x38104000,
>-    0x38108000,
>-    0x3810c000,
>-    0x38110000,
>-    0x38114000,
>-    0x38118000,
>-    0x3811c000,
>-    0x38120000,
>-    0x38124000,
>-    0x38128000,
>-    0x3812c000,
>-    0x38130000,
>-    0x38134000,
>-    0x38138000,
>-    0x3813c000,
>-    0x38140000,
>-    0x38144000,
>-    0x38148000,
>-    0x3814c000,
>-    0x38150000,
>-    0x38154000,
>-    0x38158000,
>-    0x3815c000,
>-    0x38160000,
>-    0x38164000,
>-    0x38168000,
>-    0x3816c000,
>-    0x38170000,
>-    0x38174000,
>-    0x38178000,
>-    0x3817c000,
>-    0x38180000,
>-    0x38184000,
>-    0x38188000,
>-    0x3818c000,
>-    0x38190000,
>-    0x38194000,
>-    0x38198000,
>-    0x3819c000,
>-    0x381a0000,
>-    0x381a4000,
>-    0x381a8000,
>-    0x381ac000,
>-    0x381b0000,
>-    0x381b4000,
>-    0x381b8000,
>-    0x381bc000,
>-    0x381c0000,
>-    0x381c4000,
>-    0x381c8000,
>-    0x381cc000,
>-    0x381d0000,
>-    0x381d4000,
>-    0x381d8000,
>-    0x381dc000,
>-    0x381e0000,
>-    0x381e4000,
>-    0x381e8000,
>-    0x381ec000,
>-    0x381f0000,
>-    0x381f4000,
>-    0x381f8000,
>-    0x381fc000,
>-    0x38200000,
>-    0x38204000,
>-    0x38208000,
>-    0x3820c000,
>-    0x38210000,
>-    0x38214000,
>-    0x38218000,
>-    0x3821c000,
>-    0x38220000,
>-    0x38224000,
>-    0x38228000,
>-    0x3822c000,
>-    0x38230000,
>-    0x38234000,
>-    0x38238000,
>-    0x3823c000,
>-    0x38240000,
>-    0x38244000,
>-    0x38248000,
>-    0x3824c000,
>-    0x38250000,
>-    0x38254000,
>-    0x38258000,
>-    0x3825c000,
>-    0x38260000,
>-    0x38264000,
>-    0x38268000,
>-    0x3826c000,
>-    0x38270000,
>-    0x38274000,
>-    0x38278000,
>-    0x3827c000,
>-    0x38280000,
>-    0x38284000,
>-    0x38288000,
>-    0x3828c000,
>-    0x38290000,
>-    0x38294000,
>-    0x38298000,
>-    0x3829c000,
>-    0x382a0000,
>-    0x382a4000,
>-    0x382a8000,
>-    0x382ac000,
>-    0x382b0000,
>-    0x382b4000,
>-    0x382b8000,
>-    0x382bc000,
>-    0x382c0000,
>-    0x382c4000,
>-    0x382c8000,
>-    0x382cc000,
>-    0x382d0000,
>-    0x382d4000,
>-    0x382d8000,
>-    0x382dc000,
>-    0x382e0000,
>-    0x382e4000,
>-    0x382e8000,
>-    0x382ec000,
>-    0x382f0000,
>-    0x382f4000,
>-    0x382f8000,
>-    0x382fc000,
>-    0x38300000,
>-    0x38304000,
>-    0x38308000,
>-    0x3830c000,
>-    0x38310000,
>-    0x38314000,
>-    0x38318000,
>-    0x3831c000,
>-    0x38320000,
>-    0x38324000,
>-    0x38328000,
>-    0x3832c000,
>-    0x38330000,
>-    0x38334000,
>-    0x38338000,
>-    0x3833c000,
>-    0x38340000,
>-    0x38344000,
>-    0x38348000,
>-    0x3834c000,
>-    0x38350000,
>-    0x38354000,
>-    0x38358000,
>-    0x3835c000,
>-    0x38360000,
>-    0x38364000,
>-    0x38368000,
>-    0x3836c000,
>-    0x38370000,
>-    0x38374000,
>-    0x38378000,
>-    0x3837c000,
>-    0x38380000,
>-    0x38384000,
>-    0x38388000,
>-    0x3838c000,
>-    0x38390000,
>-    0x38394000,
>-    0x38398000,
>-    0x3839c000,
>-    0x383a0000,
>-    0x383a4000,
>-    0x383a8000,
>-    0x383ac000,
>-    0x383b0000,
>-    0x383b4000,
>-    0x383b8000,
>-    0x383bc000,
>-    0x383c0000,
>-    0x383c4000,
>-    0x383c8000,
>-    0x383cc000,
>-    0x383d0000,
>-    0x383d4000,
>-    0x383d8000,
>-    0x383dc000,
>-    0x383e0000,
>-    0x383e4000,
>-    0x383e8000,
>-    0x383ec000,
>-    0x383f0000,
>-    0x383f4000,
>-    0x383f8000,
>-    0x383fc000,
>-    0x38400000,
>-    0x38404000,
>-    0x38408000,
>-    0x3840c000,
>-    0x38410000,
>-    0x38414000,
>-    0x38418000,
>-    0x3841c000,
>-    0x38420000,
>-    0x38424000,
>-    0x38428000,
>-    0x3842c000,
>-    0x38430000,
>-    0x38434000,
>-    0x38438000,
>-    0x3843c000,
>-    0x38440000,
>-    0x38444000,
>-    0x38448000,
>-    0x3844c000,
>-    0x38450000,
>-    0x38454000,
>-    0x38458000,
>-    0x3845c000,
>-    0x38460000,
>-    0x38464000,
>-    0x38468000,
>-    0x3846c000,
>-    0x38470000,
>-    0x38474000,
>-    0x38478000,
>-    0x3847c000,
>-    0x38480000,
>-    0x38484000,
>-    0x38488000,
>-    0x3848c000,
>-    0x38490000,
>-    0x38494000,
>-    0x38498000,
>-    0x3849c000,
>-    0x384a0000,
>-    0x384a4000,
>-    0x384a8000,
>-    0x384ac000,
>-    0x384b0000,
>-    0x384b4000,
>-    0x384b8000,
>-    0x384bc000,
>-    0x384c0000,
>-    0x384c4000,
>-    0x384c8000,
>-    0x384cc000,
>-    0x384d0000,
>-    0x384d4000,
>-    0x384d8000,
>-    0x384dc000,
>-    0x384e0000,
>-    0x384e4000,
>-    0x384e8000,
>-    0x384ec000,
>-    0x384f0000,
>-    0x384f4000,
>-    0x384f8000,
>-    0x384fc000,
>-    0x38500000,
>-    0x38504000,
>-    0x38508000,
>-    0x3850c000,
>-    0x38510000,
>-    0x38514000,
>-    0x38518000,
>-    0x3851c000,
>-    0x38520000,
>-    0x38524000,
>-    0x38528000,
>-    0x3852c000,
>-    0x38530000,
>-    0x38534000,
>-    0x38538000,
>-    0x3853c000,
>-    0x38540000,
>-    0x38544000,
>-    0x38548000,
>-    0x3854c000,
>-    0x38550000,
>-    0x38554000,
>-    0x38558000,
>-    0x3855c000,
>-    0x38560000,
>-    0x38564000,
>-    0x38568000,
>-    0x3856c000,
>-    0x38570000,
>-    0x38574000,
>-    0x38578000,
>-    0x3857c000,
>-    0x38580000,
>-    0x38584000,
>-    0x38588000,
>-    0x3858c000,
>-    0x38590000,
>-    0x38594000,
>-    0x38598000,
>-    0x3859c000,
>-    0x385a0000,
>-    0x385a4000,
>-    0x385a8000,
>-    0x385ac000,
>-    0x385b0000,
>-    0x385b4000,
>-    0x385b8000,
>-    0x385bc000,
>-    0x385c0000,
>-    0x385c4000,
>-    0x385c8000,
>-    0x385cc000,
>-    0x385d0000,
>-    0x385d4000,
>-    0x385d8000,
>-    0x385dc000,
>-    0x385e0000,
>-    0x385e4000,
>-    0x385e8000,
>-    0x385ec000,
>-    0x385f0000,
>-    0x385f4000,
>-    0x385f8000,
>-    0x385fc000,
>-    0x38600000,
>-    0x38604000,
>-    0x38608000,
>-    0x3860c000,
>-    0x38610000,
>-    0x38614000,
>-    0x38618000,
>-    0x3861c000,
>-    0x38620000,
>-    0x38624000,
>-    0x38628000,
>-    0x3862c000,
>-    0x38630000,
>-    0x38634000,
>-    0x38638000,
>-    0x3863c000,
>-    0x38640000,
>-    0x38644000,
>-    0x38648000,
>-    0x3864c000,
>-    0x38650000,
>-    0x38654000,
>-    0x38658000,
>-    0x3865c000,
>-    0x38660000,
>-    0x38664000,
>-    0x38668000,
>-    0x3866c000,
>-    0x38670000,
>-    0x38674000,
>-    0x38678000,
>-    0x3867c000,
>-    0x38680000,
>-    0x38684000,
>-    0x38688000,
>-    0x3868c000,
>-    0x38690000,
>-    0x38694000,
>-    0x38698000,
>-    0x3869c000,
>-    0x386a0000,
>-    0x386a4000,
>-    0x386a8000,
>-    0x386ac000,
>-    0x386b0000,
>-    0x386b4000,
>-    0x386b8000,
>-    0x386bc000,
>-    0x386c0000,
>-    0x386c4000,
>-    0x386c8000,
>-    0x386cc000,
>-    0x386d0000,
>-    0x386d4000,
>-    0x386d8000,
>-    0x386dc000,
>-    0x386e0000,
>-    0x386e4000,
>-    0x386e8000,
>-    0x386ec000,
>-    0x386f0000,
>-    0x386f4000,
>-    0x386f8000,
>-    0x386fc000,
>-    0x38700000,
>-    0x38704000,
>-    0x38708000,
>-    0x3870c000,
>-    0x38710000,
>-    0x38714000,
>-    0x38718000,
>-    0x3871c000,
>-    0x38720000,
>-    0x38724000,
>-    0x38728000,
>-    0x3872c000,
>-    0x38730000,
>-    0x38734000,
>-    0x38738000,
>-    0x3873c000,
>-    0x38740000,
>-    0x38744000,
>-    0x38748000,
>-    0x3874c000,
>-    0x38750000,
>-    0x38754000,
>-    0x38758000,
>-    0x3875c000,
>-    0x38760000,
>-    0x38764000,
>-    0x38768000,
>-    0x3876c000,
>-    0x38770000,
>-    0x38774000,
>-    0x38778000,
>-    0x3877c000,
>-    0x38780000,
>-    0x38784000,
>-    0x38788000,
>-    0x3878c000,
>-    0x38790000,
>-    0x38794000,
>-    0x38798000,
>-    0x3879c000,
>-    0x387a0000,
>-    0x387a4000,
>-    0x387a8000,
>-    0x387ac000,
>-    0x387b0000,
>-    0x387b4000,
>-    0x387b8000,
>-    0x387bc000,
>-    0x387c0000,
>-    0x387c4000,
>-    0x387c8000,
>-    0x387cc000,
>-    0x387d0000,
>-    0x387d4000,
>-    0x387d8000,
>-    0x387dc000,
>-    0x387e0000,
>-    0x387e4000,
>-    0x387e8000,
>-    0x387ec000,
>-    0x387f0000,
>-    0x387f4000,
>-    0x387f8000,
>-    0x387fc000,
>-    0x38000000,
>-    0x38002000,
>-    0x38004000,
>-    0x38006000,
>-    0x38008000,
>-    0x3800a000,
>-    0x3800c000,
>-    0x3800e000,
>-    0x38010000,
>-    0x38012000,
>-    0x38014000,
>-    0x38016000,
>-    0x38018000,
>-    0x3801a000,
>-    0x3801c000,
>-    0x3801e000,
>-    0x38020000,
>-    0x38022000,
>-    0x38024000,
>-    0x38026000,
>-    0x38028000,
>-    0x3802a000,
>-    0x3802c000,
>-    0x3802e000,
>-    0x38030000,
>-    0x38032000,
>-    0x38034000,
>-    0x38036000,
>-    0x38038000,
>-    0x3803a000,
>-    0x3803c000,
>-    0x3803e000,
>-    0x38040000,
>-    0x38042000,
>-    0x38044000,
>-    0x38046000,
>-    0x38048000,
>-    0x3804a000,
>-    0x3804c000,
>-    0x3804e000,
>-    0x38050000,
>-    0x38052000,
>-    0x38054000,
>-    0x38056000,
>-    0x38058000,
>-    0x3805a000,
>-    0x3805c000,
>-    0x3805e000,
>-    0x38060000,
>-    0x38062000,
>-    0x38064000,
>-    0x38066000,
>-    0x38068000,
>-    0x3806a000,
>-    0x3806c000,
>-    0x3806e000,
>-    0x38070000,
>-    0x38072000,
>-    0x38074000,
>-    0x38076000,
>-    0x38078000,
>-    0x3807a000,
>-    0x3807c000,
>-    0x3807e000,
>-    0x38080000,
>-    0x38082000,
>-    0x38084000,
>-    0x38086000,
>-    0x38088000,
>-    0x3808a000,
>-    0x3808c000,
>-    0x3808e000,
>-    0x38090000,
>-    0x38092000,
>-    0x38094000,
>-    0x38096000,
>-    0x38098000,
>-    0x3809a000,
>-    0x3809c000,
>-    0x3809e000,
>-    0x380a0000,
>-    0x380a2000,
>-    0x380a4000,
>-    0x380a6000,
>-    0x380a8000,
>-    0x380aa000,
>-    0x380ac000,
>-    0x380ae000,
>-    0x380b0000,
>-    0x380b2000,
>-    0x380b4000,
>-    0x380b6000,
>-    0x380b8000,
>-    0x380ba000,
>-    0x380bc000,
>-    0x380be000,
>-    0x380c0000,
>-    0x380c2000,
>-    0x380c4000,
>-    0x380c6000,
>-    0x380c8000,
>-    0x380ca000,
>-    0x380cc000,
>-    0x380ce000,
>-    0x380d0000,
>-    0x380d2000,
>-    0x380d4000,
>-    0x380d6000,
>-    0x380d8000,
>-    0x380da000,
>-    0x380dc000,
>-    0x380de000,
>-    0x380e0000,
>-    0x380e2000,
>-    0x380e4000,
>-    0x380e6000,
>-    0x380e8000,
>-    0x380ea000,
>-    0x380ec000,
>-    0x380ee000,
>-    0x380f0000,
>-    0x380f2000,
>-    0x380f4000,
>-    0x380f6000,
>-    0x380f8000,
>-    0x380fa000,
>-    0x380fc000,
>-    0x380fe000,
>-    0x38100000,
>-    0x38102000,
>-    0x38104000,
>-    0x38106000,
>-    0x38108000,
>-    0x3810a000,
>-    0x3810c000,
>-    0x3810e000,
>-    0x38110000,
>-    0x38112000,
>-    0x38114000,
>-    0x38116000,
>-    0x38118000,
>-    0x3811a000,
>-    0x3811c000,
>-    0x3811e000,
>-    0x38120000,
>-    0x38122000,
>-    0x38124000,
>-    0x38126000,
>-    0x38128000,
>-    0x3812a000,
>-    0x3812c000,
>-    0x3812e000,
>-    0x38130000,
>-    0x38132000,
>-    0x38134000,
>-    0x38136000,
>-    0x38138000,
>-    0x3813a000,
>-    0x3813c000,
>-    0x3813e000,
>-    0x38140000,
>-    0x38142000,
>-    0x38144000,
>-    0x38146000,
>-    0x38148000,
>-    0x3814a000,
>-    0x3814c000,
>-    0x3814e000,
>-    0x38150000,
>-    0x38152000,
>-    0x38154000,
>-    0x38156000,
>-    0x38158000,
>-    0x3815a000,
>-    0x3815c000,
>-    0x3815e000,
>-    0x38160000,
>-    0x38162000,
>-    0x38164000,
>-    0x38166000,
>-    0x38168000,
>-    0x3816a000,
>-    0x3816c000,
>-    0x3816e000,
>-    0x38170000,
>-    0x38172000,
>-    0x38174000,
>-    0x38176000,
>-    0x38178000,
>-    0x3817a000,
>-    0x3817c000,
>-    0x3817e000,
>-    0x38180000,
>-    0x38182000,
>-    0x38184000,
>-    0x38186000,
>-    0x38188000,
>-    0x3818a000,
>-    0x3818c000,
>-    0x3818e000,
>-    0x38190000,
>-    0x38192000,
>-    0x38194000,
>-    0x38196000,
>-    0x38198000,
>-    0x3819a000,
>-    0x3819c000,
>-    0x3819e000,
>-    0x381a0000,
>-    0x381a2000,
>-    0x381a4000,
>-    0x381a6000,
>-    0x381a8000,
>-    0x381aa000,
>-    0x381ac000,
>-    0x381ae000,
>-    0x381b0000,
>-    0x381b2000,
>-    0x381b4000,
>-    0x381b6000,
>-    0x381b8000,
>-    0x381ba000,
>-    0x381bc000,
>-    0x381be000,
>-    0x381c0000,
>-    0x381c2000,
>-    0x381c4000,
>-    0x381c6000,
>-    0x381c8000,
>-    0x381ca000,
>-    0x381cc000,
>-    0x381ce000,
>-    0x381d0000,
>-    0x381d2000,
>-    0x381d4000,
>-    0x381d6000,
>-    0x381d8000,
>-    0x381da000,
>-    0x381dc000,
>-    0x381de000,
>-    0x381e0000,
>-    0x381e2000,
>-    0x381e4000,
>-    0x381e6000,
>-    0x381e8000,
>-    0x381ea000,
>-    0x381ec000,
>-    0x381ee000,
>-    0x381f0000,
>-    0x381f2000,
>-    0x381f4000,
>-    0x381f6000,
>-    0x381f8000,
>-    0x381fa000,
>-    0x381fc000,
>-    0x381fe000,
>-    0x38200000,
>-    0x38202000,
>-    0x38204000,
>-    0x38206000,
>-    0x38208000,
>-    0x3820a000,
>-    0x3820c000,
>-    0x3820e000,
>-    0x38210000,
>-    0x38212000,
>-    0x38214000,
>-    0x38216000,
>-    0x38218000,
>-    0x3821a000,
>-    0x3821c000,
>-    0x3821e000,
>-    0x38220000,
>-    0x38222000,
>-    0x38224000,
>-    0x38226000,
>-    0x38228000,
>-    0x3822a000,
>-    0x3822c000,
>-    0x3822e000,
>-    0x38230000,
>-    0x38232000,
>-    0x38234000,
>-    0x38236000,
>-    0x38238000,
>-    0x3823a000,
>-    0x3823c000,
>-    0x3823e000,
>-    0x38240000,
>-    0x38242000,
>-    0x38244000,
>-    0x38246000,
>-    0x38248000,
>-    0x3824a000,
>-    0x3824c000,
>-    0x3824e000,
>-    0x38250000,
>-    0x38252000,
>-    0x38254000,
>-    0x38256000,
>-    0x38258000,
>-    0x3825a000,
>-    0x3825c000,
>-    0x3825e000,
>-    0x38260000,
>-    0x38262000,
>-    0x38264000,
>-    0x38266000,
>-    0x38268000,
>-    0x3826a000,
>-    0x3826c000,
>-    0x3826e000,
>-    0x38270000,
>-    0x38272000,
>-    0x38274000,
>-    0x38276000,
>-    0x38278000,
>-    0x3827a000,
>-    0x3827c000,
>-    0x3827e000,
>-    0x38280000,
>-    0x38282000,
>-    0x38284000,
>-    0x38286000,
>-    0x38288000,
>-    0x3828a000,
>-    0x3828c000,
>-    0x3828e000,
>-    0x38290000,
>-    0x38292000,
>-    0x38294000,
>-    0x38296000,
>-    0x38298000,
>-    0x3829a000,
>-    0x3829c000,
>-    0x3829e000,
>-    0x382a0000,
>-    0x382a2000,
>-    0x382a4000,
>-    0x382a6000,
>-    0x382a8000,
>-    0x382aa000,
>-    0x382ac000,
>-    0x382ae000,
>-    0x382b0000,
>-    0x382b2000,
>-    0x382b4000,
>-    0x382b6000,
>-    0x382b8000,
>-    0x382ba000,
>-    0x382bc000,
>-    0x382be000,
>-    0x382c0000,
>-    0x382c2000,
>-    0x382c4000,
>-    0x382c6000,
>-    0x382c8000,
>-    0x382ca000,
>-    0x382cc000,
>-    0x382ce000,
>-    0x382d0000,
>-    0x382d2000,
>-    0x382d4000,
>-    0x382d6000,
>-    0x382d8000,
>-    0x382da000,
>-    0x382dc000,
>-    0x382de000,
>-    0x382e0000,
>-    0x382e2000,
>-    0x382e4000,
>-    0x382e6000,
>-    0x382e8000,
>-    0x382ea000,
>-    0x382ec000,
>-    0x382ee000,
>-    0x382f0000,
>-    0x382f2000,
>-    0x382f4000,
>-    0x382f6000,
>-    0x382f8000,
>-    0x382fa000,
>-    0x382fc000,
>-    0x382fe000,
>-    0x38300000,
>-    0x38302000,
>-    0x38304000,
>-    0x38306000,
>-    0x38308000,
>-    0x3830a000,
>-    0x3830c000,
>-    0x3830e000,
>-    0x38310000,
>-    0x38312000,
>-    0x38314000,
>-    0x38316000,
>-    0x38318000,
>-    0x3831a000,
>-    0x3831c000,
>-    0x3831e000,
>-    0x38320000,
>-    0x38322000,
>-    0x38324000,
>-    0x38326000,
>-    0x38328000,
>-    0x3832a000,
>-    0x3832c000,
>-    0x3832e000,
>-    0x38330000,
>-    0x38332000,
>-    0x38334000,
>-    0x38336000,
>-    0x38338000,
>-    0x3833a000,
>-    0x3833c000,
>-    0x3833e000,
>-    0x38340000,
>-    0x38342000,
>-    0x38344000,
>-    0x38346000,
>-    0x38348000,
>-    0x3834a000,
>-    0x3834c000,
>-    0x3834e000,
>-    0x38350000,
>-    0x38352000,
>-    0x38354000,
>-    0x38356000,
>-    0x38358000,
>-    0x3835a000,
>-    0x3835c000,
>-    0x3835e000,
>-    0x38360000,
>-    0x38362000,
>-    0x38364000,
>-    0x38366000,
>-    0x38368000,
>-    0x3836a000,
>-    0x3836c000,
>-    0x3836e000,
>-    0x38370000,
>-    0x38372000,
>-    0x38374000,
>-    0x38376000,
>-    0x38378000,
>-    0x3837a000,
>-    0x3837c000,
>-    0x3837e000,
>-    0x38380000,
>-    0x38382000,
>-    0x38384000,
>-    0x38386000,
>-    0x38388000,
>-    0x3838a000,
>-    0x3838c000,
>-    0x3838e000,
>-    0x38390000,
>-    0x38392000,
>-    0x38394000,
>-    0x38396000,
>-    0x38398000,
>-    0x3839a000,
>-    0x3839c000,
>-    0x3839e000,
>-    0x383a0000,
>-    0x383a2000,
>-    0x383a4000,
>-    0x383a6000,
>-    0x383a8000,
>-    0x383aa000,
>-    0x383ac000,
>-    0x383ae000,
>-    0x383b0000,
>-    0x383b2000,
>-    0x383b4000,
>-    0x383b6000,
>-    0x383b8000,
>-    0x383ba000,
>-    0x383bc000,
>-    0x383be000,
>-    0x383c0000,
>-    0x383c2000,
>-    0x383c4000,
>-    0x383c6000,
>-    0x383c8000,
>-    0x383ca000,
>-    0x383cc000,
>-    0x383ce000,
>-    0x383d0000,
>-    0x383d2000,
>-    0x383d4000,
>-    0x383d6000,
>-    0x383d8000,
>-    0x383da000,
>-    0x383dc000,
>-    0x383de000,
>-    0x383e0000,
>-    0x383e2000,
>-    0x383e4000,
>-    0x383e6000,
>-    0x383e8000,
>-    0x383ea000,
>-    0x383ec000,
>-    0x383ee000,
>-    0x383f0000,
>-    0x383f2000,
>-    0x383f4000,
>-    0x383f6000,
>-    0x383f8000,
>-    0x383fa000,
>-    0x383fc000,
>-    0x383fe000,
>-    0x38400000,
>-    0x38402000,
>-    0x38404000,
>-    0x38406000,
>-    0x38408000,
>-    0x3840a000,
>-    0x3840c000,
>-    0x3840e000,
>-    0x38410000,
>-    0x38412000,
>-    0x38414000,
>-    0x38416000,
>-    0x38418000,
>-    0x3841a000,
>-    0x3841c000,
>-    0x3841e000,
>-    0x38420000,
>-    0x38422000,
>-    0x38424000,
>-    0x38426000,
>-    0x38428000,
>-    0x3842a000,
>-    0x3842c000,
>-    0x3842e000,
>-    0x38430000,
>-    0x38432000,
>-    0x38434000,
>-    0x38436000,
>-    0x38438000,
>-    0x3843a000,
>-    0x3843c000,
>-    0x3843e000,
>-    0x38440000,
>-    0x38442000,
>-    0x38444000,
>-    0x38446000,
>-    0x38448000,
>-    0x3844a000,
>-    0x3844c000,
>-    0x3844e000,
>-    0x38450000,
>-    0x38452000,
>-    0x38454000,
>-    0x38456000,
>-    0x38458000,
>-    0x3845a000,
>-    0x3845c000,
>-    0x3845e000,
>-    0x38460000,
>-    0x38462000,
>-    0x38464000,
>-    0x38466000,
>-    0x38468000,
>-    0x3846a000,
>-    0x3846c000,
>-    0x3846e000,
>-    0x38470000,
>-    0x38472000,
>-    0x38474000,
>-    0x38476000,
>-    0x38478000,
>-    0x3847a000,
>-    0x3847c000,
>-    0x3847e000,
>-    0x38480000,
>-    0x38482000,
>-    0x38484000,
>-    0x38486000,
>-    0x38488000,
>-    0x3848a000,
>-    0x3848c000,
>-    0x3848e000,
>-    0x38490000,
>-    0x38492000,
>-    0x38494000,
>-    0x38496000,
>-    0x38498000,
>-    0x3849a000,
>-    0x3849c000,
>-    0x3849e000,
>-    0x384a0000,
>-    0x384a2000,
>-    0x384a4000,
>-    0x384a6000,
>-    0x384a8000,
>-    0x384aa000,
>-    0x384ac000,
>-    0x384ae000,
>-    0x384b0000,
>-    0x384b2000,
>-    0x384b4000,
>-    0x384b6000,
>-    0x384b8000,
>-    0x384ba000,
>-    0x384bc000,
>-    0x384be000,
>-    0x384c0000,
>-    0x384c2000,
>-    0x384c4000,
>-    0x384c6000,
>-    0x384c8000,
>-    0x384ca000,
>-    0x384cc000,
>-    0x384ce000,
>-    0x384d0000,
>-    0x384d2000,
>-    0x384d4000,
>-    0x384d6000,
>-    0x384d8000,
>-    0x384da000,
>-    0x384dc000,
>-    0x384de000,
>-    0x384e0000,
>-    0x384e2000,
>-    0x384e4000,
>-    0x384e6000,
>-    0x384e8000,
>-    0x384ea000,
>-    0x384ec000,
>-    0x384ee000,
>-    0x384f0000,
>-    0x384f2000,
>-    0x384f4000,
>-    0x384f6000,
>-    0x384f8000,
>-    0x384fa000,
>-    0x384fc000,
>-    0x384fe000,
>-    0x38500000,
>-    0x38502000,
>-    0x38504000,
>-    0x38506000,
>-    0x38508000,
>-    0x3850a000,
>-    0x3850c000,
>-    0x3850e000,
>-    0x38510000,
>-    0x38512000,
>-    0x38514000,
>-    0x38516000,
>-    0x38518000,
>-    0x3851a000,
>-    0x3851c000,
>-    0x3851e000,
>-    0x38520000,
>-    0x38522000,
>-    0x38524000,
>-    0x38526000,
>-    0x38528000,
>-    0x3852a000,
>-    0x3852c000,
>-    0x3852e000,
>-    0x38530000,
>-    0x38532000,
>-    0x38534000,
>-    0x38536000,
>-    0x38538000,
>-    0x3853a000,
>-    0x3853c000,
>-    0x3853e000,
>-    0x38540000,
>-    0x38542000,
>-    0x38544000,
>-    0x38546000,
>-    0x38548000,
>-    0x3854a000,
>-    0x3854c000,
>-    0x3854e000,
>-    0x38550000,
>-    0x38552000,
>-    0x38554000,
>-    0x38556000,
>-    0x38558000,
>-    0x3855a000,
>-    0x3855c000,
>-    0x3855e000,
>-    0x38560000,
>-    0x38562000,
>-    0x38564000,
>-    0x38566000,
>-    0x38568000,
>-    0x3856a000,
>-    0x3856c000,
>-    0x3856e000,
>-    0x38570000,
>-    0x38572000,
>-    0x38574000,
>-    0x38576000,
>-    0x38578000,
>-    0x3857a000,
>-    0x3857c000,
>-    0x3857e000,
>-    0x38580000,
>-    0x38582000,
>-    0x38584000,
>-    0x38586000,
>-    0x38588000,
>-    0x3858a000,
>-    0x3858c000,
>-    0x3858e000,
>-    0x38590000,
>-    0x38592000,
>-    0x38594000,
>-    0x38596000,
>-    0x38598000,
>-    0x3859a000,
>-    0x3859c000,
>-    0x3859e000,
>-    0x385a0000,
>-    0x385a2000,
>-    0x385a4000,
>-    0x385a6000,
>-    0x385a8000,
>-    0x385aa000,
>-    0x385ac000,
>-    0x385ae000,
>-    0x385b0000,
>-    0x385b2000,
>-    0x385b4000,
>-    0x385b6000,
>-    0x385b8000,
>-    0x385ba000,
>-    0x385bc000,
>-    0x385be000,
>-    0x385c0000,
>-    0x385c2000,
>-    0x385c4000,
>-    0x385c6000,
>-    0x385c8000,
>-    0x385ca000,
>-    0x385cc000,
>-    0x385ce000,
>-    0x385d0000,
>-    0x385d2000,
>-    0x385d4000,
>-    0x385d6000,
>-    0x385d8000,
>-    0x385da000,
>-    0x385dc000,
>-    0x385de000,
>-    0x385e0000,
>-    0x385e2000,
>-    0x385e4000,
>-    0x385e6000,
>-    0x385e8000,
>-    0x385ea000,
>-    0x385ec000,
>-    0x385ee000,
>-    0x385f0000,
>-    0x385f2000,
>-    0x385f4000,
>-    0x385f6000,
>-    0x385f8000,
>-    0x385fa000,
>-    0x385fc000,
>-    0x385fe000,
>-    0x38600000,
>-    0x38602000,
>-    0x38604000,
>-    0x38606000,
>-    0x38608000,
>-    0x3860a000,
>-    0x3860c000,
>-    0x3860e000,
>-    0x38610000,
>-    0x38612000,
>-    0x38614000,
>-    0x38616000,
>-    0x38618000,
>-    0x3861a000,
>-    0x3861c000,
>-    0x3861e000,
>-    0x38620000,
>-    0x38622000,
>-    0x38624000,
>-    0x38626000,
>-    0x38628000,
>-    0x3862a000,
>-    0x3862c000,
>-    0x3862e000,
>-    0x38630000,
>-    0x38632000,
>-    0x38634000,
>-    0x38636000,
>-    0x38638000,
>-    0x3863a000,
>-    0x3863c000,
>-    0x3863e000,
>-    0x38640000,
>-    0x38642000,
>-    0x38644000,
>-    0x38646000,
>-    0x38648000,
>-    0x3864a000,
>-    0x3864c000,
>-    0x3864e000,
>-    0x38650000,
>-    0x38652000,
>-    0x38654000,
>-    0x38656000,
>-    0x38658000,
>-    0x3865a000,
>-    0x3865c000,
>-    0x3865e000,
>-    0x38660000,
>-    0x38662000,
>-    0x38664000,
>-    0x38666000,
>-    0x38668000,
>-    0x3866a000,
>-    0x3866c000,
>-    0x3866e000,
>-    0x38670000,
>-    0x38672000,
>-    0x38674000,
>-    0x38676000,
>-    0x38678000,
>-    0x3867a000,
>-    0x3867c000,
>-    0x3867e000,
>-    0x38680000,
>-    0x38682000,
>-    0x38684000,
>-    0x38686000,
>-    0x38688000,
>-    0x3868a000,
>-    0x3868c000,
>-    0x3868e000,
>-    0x38690000,
>-    0x38692000,
>-    0x38694000,
>-    0x38696000,
>-    0x38698000,
>-    0x3869a000,
>-    0x3869c000,
>-    0x3869e000,
>-    0x386a0000,
>-    0x386a2000,
>-    0x386a4000,
>-    0x386a6000,
>-    0x386a8000,
>-    0x386aa000,
>-    0x386ac000,
>-    0x386ae000,
>-    0x386b0000,
>-    0x386b2000,
>-    0x386b4000,
>-    0x386b6000,
>-    0x386b8000,
>-    0x386ba000,
>-    0x386bc000,
>-    0x386be000,
>-    0x386c0000,
>-    0x386c2000,
>-    0x386c4000,
>-    0x386c6000,
>-    0x386c8000,
>-    0x386ca000,
>-    0x386cc000,
>-    0x386ce000,
>-    0x386d0000,
>-    0x386d2000,
>-    0x386d4000,
>-    0x386d6000,
>-    0x386d8000,
>-    0x386da000,
>-    0x386dc000,
>-    0x386de000,
>-    0x386e0000,
>-    0x386e2000,
>-    0x386e4000,
>-    0x386e6000,
>-    0x386e8000,
>-    0x386ea000,
>-    0x386ec000,
>-    0x386ee000,
>-    0x386f0000,
>-    0x386f2000,
>-    0x386f4000,
>-    0x386f6000,
>-    0x386f8000,
>-    0x386fa000,
>-    0x386fc000,
>-    0x386fe000,
>-    0x38700000,
>-    0x38702000,
>-    0x38704000,
>-    0x38706000,
>-    0x38708000,
>-    0x3870a000,
>-    0x3870c000,
>-    0x3870e000,
>-    0x38710000,
>-    0x38712000,
>-    0x38714000,
>-    0x38716000,
>-    0x38718000,
>-    0x3871a000,
>-    0x3871c000,
>-    0x3871e000,
>-    0x38720000,
>-    0x38722000,
>-    0x38724000,
>-    0x38726000,
>-    0x38728000,
>-    0x3872a000,
>-    0x3872c000,
>-    0x3872e000,
>-    0x38730000,
>-    0x38732000,
>-    0x38734000,
>-    0x38736000,
>-    0x38738000,
>-    0x3873a000,
>-    0x3873c000,
>-    0x3873e000,
>-    0x38740000,
>-    0x38742000,
>-    0x38744000,
>-    0x38746000,
>-    0x38748000,
>-    0x3874a000,
>-    0x3874c000,
>-    0x3874e000,
>-    0x38750000,
>-    0x38752000,
>-    0x38754000,
>-    0x38756000,
>-    0x38758000,
>-    0x3875a000,
>-    0x3875c000,
>-    0x3875e000,
>-    0x38760000,
>-    0x38762000,
>-    0x38764000,
>-    0x38766000,
>-    0x38768000,
>-    0x3876a000,
>-    0x3876c000,
>-    0x3876e000,
>-    0x38770000,
>-    0x38772000,
>-    0x38774000,
>-    0x38776000,
>-    0x38778000,
>-    0x3877a000,
>-    0x3877c000,
>-    0x3877e000,
>-    0x38780000,
>-    0x38782000,
>-    0x38784000,
>-    0x38786000,
>-    0x38788000,
>-    0x3878a000,
>-    0x3878c000,
>-    0x3878e000,
>-    0x38790000,
>-    0x38792000,
>-    0x38794000,
>-    0x38796000,
>-    0x38798000,
>-    0x3879a000,
>-    0x3879c000,
>-    0x3879e000,
>-    0x387a0000,
>-    0x387a2000,
>-    0x387a4000,
>-    0x387a6000,
>-    0x387a8000,
>-    0x387aa000,
>-    0x387ac000,
>-    0x387ae000,
>-    0x387b0000,
>-    0x387b2000,
>-    0x387b4000,
>-    0x387b6000,
>-    0x387b8000,
>-    0x387ba000,
>-    0x387bc000,
>-    0x387be000,
>-    0x387c0000,
>-    0x387c2000,
>-    0x387c4000,
>-    0x387c6000,
>-    0x387c8000,
>-    0x387ca000,
>-    0x387cc000,
>-    0x387ce000,
>-    0x387d0000,
>-    0x387d2000,
>-    0x387d4000,
>-    0x387d6000,
>-    0x387d8000,
>-    0x387da000,
>-    0x387dc000,
>-    0x387de000,
>-    0x387e0000,
>-    0x387e2000,
>-    0x387e4000,
>-    0x387e6000,
>-    0x387e8000,
>-    0x387ea000,
>-    0x387ec000,
>-    0x387ee000,
>-    0x387f0000,
>-    0x387f2000,
>-    0x387f4000,
>-    0x387f6000,
>-    0x387f8000,
>-    0x387fa000,
>-    0x387fc000,
>-    0x387fe000,
>+    0x00000000, 0x33800000, 0x34000000, 0x34400000, 0x34800000, 0x34a00000, 0x34c00000, 0x34e00000,
>+    0x35000000, 0x35100000, 0x35200000, 0x35300000, 0x35400000, 0x35500000, 0x35600000, 0x35700000,
>+    0x35800000, 0x35880000, 0x35900000, 0x35980000, 0x35a00000, 0x35a80000, 0x35b00000, 0x35b80000,
>+    0x35c00000, 0x35c80000, 0x35d00000, 0x35d80000, 0x35e00000, 0x35e80000, 0x35f00000, 0x35f80000,
>+    0x36000000, 0x36040000, 0x36080000, 0x360c0000, 0x36100000, 0x36140000, 0x36180000, 0x361c0000,
>+    0x36200000, 0x36240000, 0x36280000, 0x362c0000, 0x36300000, 0x36340000, 0x36380000, 0x363c0000,
>+    0x36400000, 0x36440000, 0x36480000, 0x364c0000, 0x36500000, 0x36540000, 0x36580000, 0x365c0000,
>+    0x36600000, 0x36640000, 0x36680000, 0x366c0000, 0x36700000, 0x36740000, 0x36780000, 0x367c0000,
>+    0x36800000, 0x36820000, 0x36840000, 0x36860000, 0x36880000, 0x368a0000, 0x368c0000, 0x368e0000,
>+    0x36900000, 0x36920000, 0x36940000, 0x36960000, 0x36980000, 0x369a0000, 0x369c0000, 0x369e0000,
>+    0x36a00000, 0x36a20000, 0x36a40000, 0x36a60000, 0x36a80000, 0x36aa0000, 0x36ac0000, 0x36ae0000,
>+    0x36b00000, 0x36b20000, 0x36b40000, 0x36b60000, 0x36b80000, 0x36ba0000, 0x36bc0000, 0x36be0000,
>+    0x36c00000, 0x36c20000, 0x36c40000, 0x36c60000, 0x36c80000, 0x36ca0000, 0x36cc0000, 0x36ce0000,
>+    0x36d00000, 0x36d20000, 0x36d40000, 0x36d60000, 0x36d80000, 0x36da0000, 0x36dc0000, 0x36de0000,
>+    0x36e00000, 0x36e20000, 0x36e40000, 0x36e60000, 0x36e80000, 0x36ea0000, 0x36ec0000, 0x36ee0000,
>+    0x36f00000, 0x36f20000, 0x36f40000, 0x36f60000, 0x36f80000, 0x36fa0000, 0x36fc0000, 0x36fe0000,
>+    0x37000000, 0x37010000, 0x37020000, 0x37030000, 0x37040000, 0x37050000, 0x37060000, 0x37070000,
>+    0x37080000, 0x37090000, 0x370a0000, 0x370b0000, 0x370c0000, 0x370d0000, 0x370e0000, 0x370f0000,
>+    0x37100000, 0x37110000, 0x37120000, 0x37130000, 0x37140000, 0x37150000, 0x37160000, 0x37170000,
>+    0x37180000, 0x37190000, 0x371a0000, 0x371b0000, 0x371c0000, 0x371d0000, 0x371e0000, 0x371f0000,
>+    0x37200000, 0x37210000, 0x37220000, 0x37230000, 0x37240000, 0x37250000, 0x37260000, 0x37270000,
>+    0x37280000, 0x37290000, 0x372a0000, 0x372b0000, 0x372c0000, 0x372d0000, 0x372e0000, 0x372f0000,
>+    0x37300000, 0x37310000, 0x37320000, 0x37330000, 0x37340000, 0x37350000, 0x37360000, 0x37370000,
>+    0x37380000, 0x37390000, 0x373a0000, 0x373b0000, 0x373c0000, 0x373d0000, 0x373e0000, 0x373f0000,
>+    0x37400000, 0x37410000, 0x37420000, 0x37430000, 0x37440000, 0x37450000, 0x37460000, 0x37470000,
>+    0x37480000, 0x37490000, 0x374a0000, 0x374b0000, 0x374c0000, 0x374d0000, 0x374e0000, 0x374f0000,
>+    0x37500000, 0x37510000, 0x37520000, 0x37530000, 0x37540000, 0x37550000, 0x37560000, 0x37570000,
>+    0x37580000, 0x37590000, 0x375a0000, 0x375b0000, 0x375c0000, 0x375d0000, 0x375e0000, 0x375f0000,
>+    0x37600000, 0x37610000, 0x37620000, 0x37630000, 0x37640000, 0x37650000, 0x37660000, 0x37670000,
>+    0x37680000, 0x37690000, 0x376a0000, 0x376b0000, 0x376c0000, 0x376d0000, 0x376e0000, 0x376f0000,
>+    0x37700000, 0x37710000, 0x37720000, 0x37730000, 0x37740000, 0x37750000, 0x37760000, 0x37770000,
>+    0x37780000, 0x37790000, 0x377a0000, 0x377b0000, 0x377c0000, 0x377d0000, 0x377e0000, 0x377f0000,
>+    0x37800000, 0x37808000, 0x37810000, 0x37818000, 0x37820000, 0x37828000, 0x37830000, 0x37838000,
>+    0x37840000, 0x37848000, 0x37850000, 0x37858000, 0x37860000, 0x37868000, 0x37870000, 0x37878000,
>+    0x37880000, 0x37888000, 0x37890000, 0x37898000, 0x378a0000, 0x378a8000, 0x378b0000, 0x378b8000,
>+    0x378c0000, 0x378c8000, 0x378d0000, 0x378d8000, 0x378e0000, 0x378e8000, 0x378f0000, 0x378f8000,
>+    0x37900000, 0x37908000, 0x37910000, 0x37918000, 0x37920000, 0x37928000, 0x37930000, 0x37938000,
>+    0x37940000, 0x37948000, 0x37950000, 0x37958000, 0x37960000, 0x37968000, 0x37970000, 0x37978000,
>+    0x37980000, 0x37988000, 0x37990000, 0x37998000, 0x379a0000, 0x379a8000, 0x379b0000, 0x379b8000,
>+    0x379c0000, 0x379c8000, 0x379d0000, 0x379d8000, 0x379e0000, 0x379e8000, 0x379f0000, 0x379f8000,
>+    0x37a00000, 0x37a08000, 0x37a10000, 0x37a18000, 0x37a20000, 0x37a28000, 0x37a30000, 0x37a38000,
>+    0x37a40000, 0x37a48000, 0x37a50000, 0x37a58000, 0x37a60000, 0x37a68000, 0x37a70000, 0x37a78000,
>+    0x37a80000, 0x37a88000, 0x37a90000, 0x37a98000, 0x37aa0000, 0x37aa8000, 0x37ab0000, 0x37ab8000,
>+    0x37ac0000, 0x37ac8000, 0x37ad0000, 0x37ad8000, 0x37ae0000, 0x37ae8000, 0x37af0000, 0x37af8000,
>+    0x37b00000, 0x37b08000, 0x37b10000, 0x37b18000, 0x37b20000, 0x37b28000, 0x37b30000, 0x37b38000,
>+    0x37b40000, 0x37b48000, 0x37b50000, 0x37b58000, 0x37b60000, 0x37b68000, 0x37b70000, 0x37b78000,
>+    0x37b80000, 0x37b88000, 0x37b90000, 0x37b98000, 0x37ba0000, 0x37ba8000, 0x37bb0000, 0x37bb8000,
>+    0x37bc0000, 0x37bc8000, 0x37bd0000, 0x37bd8000, 0x37be0000, 0x37be8000, 0x37bf0000, 0x37bf8000,
>+    0x37c00000, 0x37c08000, 0x37c10000, 0x37c18000, 0x37c20000, 0x37c28000, 0x37c30000, 0x37c38000,
>+    0x37c40000, 0x37c48000, 0x37c50000, 0x37c58000, 0x37c60000, 0x37c68000, 0x37c70000, 0x37c78000,
>+    0x37c80000, 0x37c88000, 0x37c90000, 0x37c98000, 0x37ca0000, 0x37ca8000, 0x37cb0000, 0x37cb8000,
>+    0x37cc0000, 0x37cc8000, 0x37cd0000, 0x37cd8000, 0x37ce0000, 0x37ce8000, 0x37cf0000, 0x37cf8000,
>+    0x37d00000, 0x37d08000, 0x37d10000, 0x37d18000, 0x37d20000, 0x37d28000, 0x37d30000, 0x37d38000,
>+    0x37d40000, 0x37d48000, 0x37d50000, 0x37d58000, 0x37d60000, 0x37d68000, 0x37d70000, 0x37d78000,
>+    0x37d80000, 0x37d88000, 0x37d90000, 0x37d98000, 0x37da0000, 0x37da8000, 0x37db0000, 0x37db8000,
>+    0x37dc0000, 0x37dc8000, 0x37dd0000, 0x37dd8000, 0x37de0000, 0x37de8000, 0x37df0000, 0x37df8000,
>+    0x37e00000, 0x37e08000, 0x37e10000, 0x37e18000, 0x37e20000, 0x37e28000, 0x37e30000, 0x37e38000,
>+    0x37e40000, 0x37e48000, 0x37e50000, 0x37e58000, 0x37e60000, 0x37e68000, 0x37e70000, 0x37e78000,
>+    0x37e80000, 0x37e88000, 0x37e90000, 0x37e98000, 0x37ea0000, 0x37ea8000, 0x37eb0000, 0x37eb8000,
>+    0x37ec0000, 0x37ec8000, 0x37ed0000, 0x37ed8000, 0x37ee0000, 0x37ee8000, 0x37ef0000, 0x37ef8000,
>+    0x37f00000, 0x37f08000, 0x37f10000, 0x37f18000, 0x37f20000, 0x37f28000, 0x37f30000, 0x37f38000,
>+    0x37f40000, 0x37f48000, 0x37f50000, 0x37f58000, 0x37f60000, 0x37f68000, 0x37f70000, 0x37f78000,
>+    0x37f80000, 0x37f88000, 0x37f90000, 0x37f98000, 0x37fa0000, 0x37fa8000, 0x37fb0000, 0x37fb8000,
>+    0x37fc0000, 0x37fc8000, 0x37fd0000, 0x37fd8000, 0x37fe0000, 0x37fe8000, 0x37ff0000, 0x37ff8000,
>+    0x38000000, 0x38004000, 0x38008000, 0x3800c000, 0x38010000, 0x38014000, 0x38018000, 0x3801c000,
>+    0x38020000, 0x38024000, 0x38028000, 0x3802c000, 0x38030000, 0x38034000, 0x38038000, 0x3803c000,
>+    0x38040000, 0x38044000, 0x38048000, 0x3804c000, 0x38050000, 0x38054000, 0x38058000, 0x3805c000,
>+    0x38060000, 0x38064000, 0x38068000, 0x3806c000, 0x38070000, 0x38074000, 0x38078000, 0x3807c000,
>+    0x38080000, 0x38084000, 0x38088000, 0x3808c000, 0x38090000, 0x38094000, 0x38098000, 0x3809c000,
>+    0x380a0000, 0x380a4000, 0x380a8000, 0x380ac000, 0x380b0000, 0x380b4000, 0x380b8000, 0x380bc000,
>+    0x380c0000, 0x380c4000, 0x380c8000, 0x380cc000, 0x380d0000, 0x380d4000, 0x380d8000, 0x380dc000,
>+    0x380e0000, 0x380e4000, 0x380e8000, 0x380ec000, 0x380f0000, 0x380f4000, 0x380f8000, 0x380fc000,
>+    0x38100000, 0x38104000, 0x38108000, 0x3810c000, 0x38110000, 0x38114000, 0x38118000, 0x3811c000,
>+    0x38120000, 0x38124000, 0x38128000, 0x3812c000, 0x38130000, 0x38134000, 0x38138000, 0x3813c000,
>+    0x38140000, 0x38144000, 0x38148000, 0x3814c000, 0x38150000, 0x38154000, 0x38158000, 0x3815c000,
>+    0x38160000, 0x38164000, 0x38168000, 0x3816c000, 0x38170000, 0x38174000, 0x38178000, 0x3817c000,
>+    0x38180000, 0x38184000, 0x38188000, 0x3818c000, 0x38190000, 0x38194000, 0x38198000, 0x3819c000,
>+    0x381a0000, 0x381a4000, 0x381a8000, 0x381ac000, 0x381b0000, 0x381b4000, 0x381b8000, 0x381bc000,
>+    0x381c0000, 0x381c4000, 0x381c8000, 0x381cc000, 0x381d0000, 0x381d4000, 0x381d8000, 0x381dc000,
>+    0x381e0000, 0x381e4000, 0x381e8000, 0x381ec000, 0x381f0000, 0x381f4000, 0x381f8000, 0x381fc000,
>+    0x38200000, 0x38204000, 0x38208000, 0x3820c000, 0x38210000, 0x38214000, 0x38218000, 0x3821c000,
>+    0x38220000, 0x38224000, 0x38228000, 0x3822c000, 0x38230000, 0x38234000, 0x38238000, 0x3823c000,
>+    0x38240000, 0x38244000, 0x38248000, 0x3824c000, 0x38250000, 0x38254000, 0x38258000, 0x3825c000,
>+    0x38260000, 0x38264000, 0x38268000, 0x3826c000, 0x38270000, 0x38274000, 0x38278000, 0x3827c000,
>+    0x38280000, 0x38284000, 0x38288000, 0x3828c000, 0x38290000, 0x38294000, 0x38298000, 0x3829c000,
>+    0x382a0000, 0x382a4000, 0x382a8000, 0x382ac000, 0x382b0000, 0x382b4000, 0x382b8000, 0x382bc000,
>+    0x382c0000, 0x382c4000, 0x382c8000, 0x382cc000, 0x382d0000, 0x382d4000, 0x382d8000, 0x382dc000,
>+    0x382e0000, 0x382e4000, 0x382e8000, 0x382ec000, 0x382f0000, 0x382f4000, 0x382f8000, 0x382fc000,
>+    0x38300000, 0x38304000, 0x38308000, 0x3830c000, 0x38310000, 0x38314000, 0x38318000, 0x3831c000,
>+    0x38320000, 0x38324000, 0x38328000, 0x3832c000, 0x38330000, 0x38334000, 0x38338000, 0x3833c000,
>+    0x38340000, 0x38344000, 0x38348000, 0x3834c000, 0x38350000, 0x38354000, 0x38358000, 0x3835c000,
>+    0x38360000, 0x38364000, 0x38368000, 0x3836c000, 0x38370000, 0x38374000, 0x38378000, 0x3837c000,
>+    0x38380000, 0x38384000, 0x38388000, 0x3838c000, 0x38390000, 0x38394000, 0x38398000, 0x3839c000,
>+    0x383a0000, 0x383a4000, 0x383a8000, 0x383ac000, 0x383b0000, 0x383b4000, 0x383b8000, 0x383bc000,
>+    0x383c0000, 0x383c4000, 0x383c8000, 0x383cc000, 0x383d0000, 0x383d4000, 0x383d8000, 0x383dc000,
>+    0x383e0000, 0x383e4000, 0x383e8000, 0x383ec000, 0x383f0000, 0x383f4000, 0x383f8000, 0x383fc000,
>+    0x38400000, 0x38404000, 0x38408000, 0x3840c000, 0x38410000, 0x38414000, 0x38418000, 0x3841c000,
>+    0x38420000, 0x38424000, 0x38428000, 0x3842c000, 0x38430000, 0x38434000, 0x38438000, 0x3843c000,
>+    0x38440000, 0x38444000, 0x38448000, 0x3844c000, 0x38450000, 0x38454000, 0x38458000, 0x3845c000,
>+    0x38460000, 0x38464000, 0x38468000, 0x3846c000, 0x38470000, 0x38474000, 0x38478000, 0x3847c000,
>+    0x38480000, 0x38484000, 0x38488000, 0x3848c000, 0x38490000, 0x38494000, 0x38498000, 0x3849c000,
>+    0x384a0000, 0x384a4000, 0x384a8000, 0x384ac000, 0x384b0000, 0x384b4000, 0x384b8000, 0x384bc000,
>+    0x384c0000, 0x384c4000, 0x384c8000, 0x384cc000, 0x384d0000, 0x384d4000, 0x384d8000, 0x384dc000,
>+    0x384e0000, 0x384e4000, 0x384e8000, 0x384ec000, 0x384f0000, 0x384f4000, 0x384f8000, 0x384fc000,
>+    0x38500000, 0x38504000, 0x38508000, 0x3850c000, 0x38510000, 0x38514000, 0x38518000, 0x3851c000,
>+    0x38520000, 0x38524000, 0x38528000, 0x3852c000, 0x38530000, 0x38534000, 0x38538000, 0x3853c000,
>+    0x38540000, 0x38544000, 0x38548000, 0x3854c000, 0x38550000, 0x38554000, 0x38558000, 0x3855c000,
>+    0x38560000, 0x38564000, 0x38568000, 0x3856c000, 0x38570000, 0x38574000, 0x38578000, 0x3857c000,
>+    0x38580000, 0x38584000, 0x38588000, 0x3858c000, 0x38590000, 0x38594000, 0x38598000, 0x3859c000,
>+    0x385a0000, 0x385a4000, 0x385a8000, 0x385ac000, 0x385b0000, 0x385b4000, 0x385b8000, 0x385bc000,
>+    0x385c0000, 0x385c4000, 0x385c8000, 0x385cc000, 0x385d0000, 0x385d4000, 0x385d8000, 0x385dc000,
>+    0x385e0000, 0x385e4000, 0x385e8000, 0x385ec000, 0x385f0000, 0x385f4000, 0x385f8000, 0x385fc000,
>+    0x38600000, 0x38604000, 0x38608000, 0x3860c000, 0x38610000, 0x38614000, 0x38618000, 0x3861c000,
>+    0x38620000, 0x38624000, 0x38628000, 0x3862c000, 0x38630000, 0x38634000, 0x38638000, 0x3863c000,
>+    0x38640000, 0x38644000, 0x38648000, 0x3864c000, 0x38650000, 0x38654000, 0x38658000, 0x3865c000,
>+    0x38660000, 0x38664000, 0x38668000, 0x3866c000, 0x38670000, 0x38674000, 0x38678000, 0x3867c000,
>+    0x38680000, 0x38684000, 0x38688000, 0x3868c000, 0x38690000, 0x38694000, 0x38698000, 0x3869c000,
>+    0x386a0000, 0x386a4000, 0x386a8000, 0x386ac000, 0x386b0000, 0x386b4000, 0x386b8000, 0x386bc000,
>+    0x386c0000, 0x386c4000, 0x386c8000, 0x386cc000, 0x386d0000, 0x386d4000, 0x386d8000, 0x386dc000,
>+    0x386e0000, 0x386e4000, 0x386e8000, 0x386ec000, 0x386f0000, 0x386f4000, 0x386f8000, 0x386fc000,
>+    0x38700000, 0x38704000, 0x38708000, 0x3870c000, 0x38710000, 0x38714000, 0x38718000, 0x3871c000,
>+    0x38720000, 0x38724000, 0x38728000, 0x3872c000, 0x38730000, 0x38734000, 0x38738000, 0x3873c000,
>+    0x38740000, 0x38744000, 0x38748000, 0x3874c000, 0x38750000, 0x38754000, 0x38758000, 0x3875c000,
>+    0x38760000, 0x38764000, 0x38768000, 0x3876c000, 0x38770000, 0x38774000, 0x38778000, 0x3877c000,
>+    0x38780000, 0x38784000, 0x38788000, 0x3878c000, 0x38790000, 0x38794000, 0x38798000, 0x3879c000,
>+    0x387a0000, 0x387a4000, 0x387a8000, 0x387ac000, 0x387b0000, 0x387b4000, 0x387b8000, 0x387bc000,
>+    0x387c0000, 0x387c4000, 0x387c8000, 0x387cc000, 0x387d0000, 0x387d4000, 0x387d8000, 0x387dc000,
>+    0x387e0000, 0x387e4000, 0x387e8000, 0x387ec000, 0x387f0000, 0x387f4000, 0x387f8000, 0x387fc000,
>+    0x38000000, 0x38002000, 0x38004000, 0x38006000, 0x38008000, 0x3800a000, 0x3800c000, 0x3800e000,
>+    0x38010000, 0x38012000, 0x38014000, 0x38016000, 0x38018000, 0x3801a000, 0x3801c000, 0x3801e000,
>+    0x38020000, 0x38022000, 0x38024000, 0x38026000, 0x38028000, 0x3802a000, 0x3802c000, 0x3802e000,
>+    0x38030000, 0x38032000, 0x38034000, 0x38036000, 0x38038000, 0x3803a000, 0x3803c000, 0x3803e000,
>+    0x38040000, 0x38042000, 0x38044000, 0x38046000, 0x38048000, 0x3804a000, 0x3804c000, 0x3804e000,
>+    0x38050000, 0x38052000, 0x38054000, 0x38056000, 0x38058000, 0x3805a000, 0x3805c000, 0x3805e000,
>+    0x38060000, 0x38062000, 0x38064000, 0x38066000, 0x38068000, 0x3806a000, 0x3806c000, 0x3806e000,
>+    0x38070000, 0x38072000, 0x38074000, 0x38076000, 0x38078000, 0x3807a000, 0x3807c000, 0x3807e000,
>+    0x38080000, 0x38082000, 0x38084000, 0x38086000, 0x38088000, 0x3808a000, 0x3808c000, 0x3808e000,
>+    0x38090000, 0x38092000, 0x38094000, 0x38096000, 0x38098000, 0x3809a000, 0x3809c000, 0x3809e000,
>+    0x380a0000, 0x380a2000, 0x380a4000, 0x380a6000, 0x380a8000, 0x380aa000, 0x380ac000, 0x380ae000,
>+    0x380b0000, 0x380b2000, 0x380b4000, 0x380b6000, 0x380b8000, 0x380ba000, 0x380bc000, 0x380be000,
>+    0x380c0000, 0x380c2000, 0x380c4000, 0x380c6000, 0x380c8000, 0x380ca000, 0x380cc000, 0x380ce000,
>+    0x380d0000, 0x380d2000, 0x380d4000, 0x380d6000, 0x380d8000, 0x380da000, 0x380dc000, 0x380de000,
>+    0x380e0000, 0x380e2000, 0x380e4000, 0x380e6000, 0x380e8000, 0x380ea000, 0x380ec000, 0x380ee000,
>+    0x380f0000, 0x380f2000, 0x380f4000, 0x380f6000, 0x380f8000, 0x380fa000, 0x380fc000, 0x380fe000,
>+    0x38100000, 0x38102000, 0x38104000, 0x38106000, 0x38108000, 0x3810a000, 0x3810c000, 0x3810e000,
>+    0x38110000, 0x38112000, 0x38114000, 0x38116000, 0x38118000, 0x3811a000, 0x3811c000, 0x3811e000,
>+    0x38120000, 0x38122000, 0x38124000, 0x38126000, 0x38128000, 0x3812a000, 0x3812c000, 0x3812e000,
>+    0x38130000, 0x38132000, 0x38134000, 0x38136000, 0x38138000, 0x3813a000, 0x3813c000, 0x3813e000,
>+    0x38140000, 0x38142000, 0x38144000, 0x38146000, 0x38148000, 0x3814a000, 0x3814c000, 0x3814e000,
>+    0x38150000, 0x38152000, 0x38154000, 0x38156000, 0x38158000, 0x3815a000, 0x3815c000, 0x3815e000,
>+    0x38160000, 0x38162000, 0x38164000, 0x38166000, 0x38168000, 0x3816a000, 0x3816c000, 0x3816e000,
>+    0x38170000, 0x38172000, 0x38174000, 0x38176000, 0x38178000, 0x3817a000, 0x3817c000, 0x3817e000,
>+    0x38180000, 0x38182000, 0x38184000, 0x38186000, 0x38188000, 0x3818a000, 0x3818c000, 0x3818e000,
>+    0x38190000, 0x38192000, 0x38194000, 0x38196000, 0x38198000, 0x3819a000, 0x3819c000, 0x3819e000,
>+    0x381a0000, 0x381a2000, 0x381a4000, 0x381a6000, 0x381a8000, 0x381aa000, 0x381ac000, 0x381ae000,
>+    0x381b0000, 0x381b2000, 0x381b4000, 0x381b6000, 0x381b8000, 0x381ba000, 0x381bc000, 0x381be000,
>+    0x381c0000, 0x381c2000, 0x381c4000, 0x381c6000, 0x381c8000, 0x381ca000, 0x381cc000, 0x381ce000,
>+    0x381d0000, 0x381d2000, 0x381d4000, 0x381d6000, 0x381d8000, 0x381da000, 0x381dc000, 0x381de000,
>+    0x381e0000, 0x381e2000, 0x381e4000, 0x381e6000, 0x381e8000, 0x381ea000, 0x381ec000, 0x381ee000,
>+    0x381f0000, 0x381f2000, 0x381f4000, 0x381f6000, 0x381f8000, 0x381fa000, 0x381fc000, 0x381fe000,
>+    0x38200000, 0x38202000, 0x38204000, 0x38206000, 0x38208000, 0x3820a000, 0x3820c000, 0x3820e000,
>+    0x38210000, 0x38212000, 0x38214000, 0x38216000, 0x38218000, 0x3821a000, 0x3821c000, 0x3821e000,
>+    0x38220000, 0x38222000, 0x38224000, 0x38226000, 0x38228000, 0x3822a000, 0x3822c000, 0x3822e000,
>+    0x38230000, 0x38232000, 0x38234000, 0x38236000, 0x38238000, 0x3823a000, 0x3823c000, 0x3823e000,
>+    0x38240000, 0x38242000, 0x38244000, 0x38246000, 0x38248000, 0x3824a000, 0x3824c000, 0x3824e000,
>+    0x38250000, 0x38252000, 0x38254000, 0x38256000, 0x38258000, 0x3825a000, 0x3825c000, 0x3825e000,
>+    0x38260000, 0x38262000, 0x38264000, 0x38266000, 0x38268000, 0x3826a000, 0x3826c000, 0x3826e000,
>+    0x38270000, 0x38272000, 0x38274000, 0x38276000, 0x38278000, 0x3827a000, 0x3827c000, 0x3827e000,
>+    0x38280000, 0x38282000, 0x38284000, 0x38286000, 0x38288000, 0x3828a000, 0x3828c000, 0x3828e000,
>+    0x38290000, 0x38292000, 0x38294000, 0x38296000, 0x38298000, 0x3829a000, 0x3829c000, 0x3829e000,
>+    0x382a0000, 0x382a2000, 0x382a4000, 0x382a6000, 0x382a8000, 0x382aa000, 0x382ac000, 0x382ae000,
>+    0x382b0000, 0x382b2000, 0x382b4000, 0x382b6000, 0x382b8000, 0x382ba000, 0x382bc000, 0x382be000,
>+    0x382c0000, 0x382c2000, 0x382c4000, 0x382c6000, 0x382c8000, 0x382ca000, 0x382cc000, 0x382ce000,
>+    0x382d0000, 0x382d2000, 0x382d4000, 0x382d6000, 0x382d8000, 0x382da000, 0x382dc000, 0x382de000,
>+    0x382e0000, 0x382e2000, 0x382e4000, 0x382e6000, 0x382e8000, 0x382ea000, 0x382ec000, 0x382ee000,
>+    0x382f0000, 0x382f2000, 0x382f4000, 0x382f6000, 0x382f8000, 0x382fa000, 0x382fc000, 0x382fe000,
>+    0x38300000, 0x38302000, 0x38304000, 0x38306000, 0x38308000, 0x3830a000, 0x3830c000, 0x3830e000,
>+    0x38310000, 0x38312000, 0x38314000, 0x38316000, 0x38318000, 0x3831a000, 0x3831c000, 0x3831e000,
>+    0x38320000, 0x38322000, 0x38324000, 0x38326000, 0x38328000, 0x3832a000, 0x3832c000, 0x3832e000,
>+    0x38330000, 0x38332000, 0x38334000, 0x38336000, 0x38338000, 0x3833a000, 0x3833c000, 0x3833e000,
>+    0x38340000, 0x38342000, 0x38344000, 0x38346000, 0x38348000, 0x3834a000, 0x3834c000, 0x3834e000,
>+    0x38350000, 0x38352000, 0x38354000, 0x38356000, 0x38358000, 0x3835a000, 0x3835c000, 0x3835e000,
>+    0x38360000, 0x38362000, 0x38364000, 0x38366000, 0x38368000, 0x3836a000, 0x3836c000, 0x3836e000,
>+    0x38370000, 0x38372000, 0x38374000, 0x38376000, 0x38378000, 0x3837a000, 0x3837c000, 0x3837e000,
>+    0x38380000, 0x38382000, 0x38384000, 0x38386000, 0x38388000, 0x3838a000, 0x3838c000, 0x3838e000,
>+    0x38390000, 0x38392000, 0x38394000, 0x38396000, 0x38398000, 0x3839a000, 0x3839c000, 0x3839e000,
>+    0x383a0000, 0x383a2000, 0x383a4000, 0x383a6000, 0x383a8000, 0x383aa000, 0x383ac000, 0x383ae000,
>+    0x383b0000, 0x383b2000, 0x383b4000, 0x383b6000, 0x383b8000, 0x383ba000, 0x383bc000, 0x383be000,
>+    0x383c0000, 0x383c2000, 0x383c4000, 0x383c6000, 0x383c8000, 0x383ca000, 0x383cc000, 0x383ce000,
>+    0x383d0000, 0x383d2000, 0x383d4000, 0x383d6000, 0x383d8000, 0x383da000, 0x383dc000, 0x383de000,
>+    0x383e0000, 0x383e2000, 0x383e4000, 0x383e6000, 0x383e8000, 0x383ea000, 0x383ec000, 0x383ee000,
>+    0x383f0000, 0x383f2000, 0x383f4000, 0x383f6000, 0x383f8000, 0x383fa000, 0x383fc000, 0x383fe000,
>+    0x38400000, 0x38402000, 0x38404000, 0x38406000, 0x38408000, 0x3840a000, 0x3840c000, 0x3840e000,
>+    0x38410000, 0x38412000, 0x38414000, 0x38416000, 0x38418000, 0x3841a000, 0x3841c000, 0x3841e000,
>+    0x38420000, 0x38422000, 0x38424000, 0x38426000, 0x38428000, 0x3842a000, 0x3842c000, 0x3842e000,
>+    0x38430000, 0x38432000, 0x38434000, 0x38436000, 0x38438000, 0x3843a000, 0x3843c000, 0x3843e000,
>+    0x38440000, 0x38442000, 0x38444000, 0x38446000, 0x38448000, 0x3844a000, 0x3844c000, 0x3844e000,
>+    0x38450000, 0x38452000, 0x38454000, 0x38456000, 0x38458000, 0x3845a000, 0x3845c000, 0x3845e000,
>+    0x38460000, 0x38462000, 0x38464000, 0x38466000, 0x38468000, 0x3846a000, 0x3846c000, 0x3846e000,
>+    0x38470000, 0x38472000, 0x38474000, 0x38476000, 0x38478000, 0x3847a000, 0x3847c000, 0x3847e000,
>+    0x38480000, 0x38482000, 0x38484000, 0x38486000, 0x38488000, 0x3848a000, 0x3848c000, 0x3848e000,
>+    0x38490000, 0x38492000, 0x38494000, 0x38496000, 0x38498000, 0x3849a000, 0x3849c000, 0x3849e000,
>+    0x384a0000, 0x384a2000, 0x384a4000, 0x384a6000, 0x384a8000, 0x384aa000, 0x384ac000, 0x384ae000,
>+    0x384b0000, 0x384b2000, 0x384b4000, 0x384b6000, 0x384b8000, 0x384ba000, 0x384bc000, 0x384be000,
>+    0x384c0000, 0x384c2000, 0x384c4000, 0x384c6000, 0x384c8000, 0x384ca000, 0x384cc000, 0x384ce000,
>+    0x384d0000, 0x384d2000, 0x384d4000, 0x384d6000, 0x384d8000, 0x384da000, 0x384dc000, 0x384de000,
>+    0x384e0000, 0x384e2000, 0x384e4000, 0x384e6000, 0x384e8000, 0x384ea000, 0x384ec000, 0x384ee000,
>+    0x384f0000, 0x384f2000, 0x384f4000, 0x384f6000, 0x384f8000, 0x384fa000, 0x384fc000, 0x384fe000,
>+    0x38500000, 0x38502000, 0x38504000, 0x38506000, 0x38508000, 0x3850a000, 0x3850c000, 0x3850e000,
>+    0x38510000, 0x38512000, 0x38514000, 0x38516000, 0x38518000, 0x3851a000, 0x3851c000, 0x3851e000,
>+    0x38520000, 0x38522000, 0x38524000, 0x38526000, 0x38528000, 0x3852a000, 0x3852c000, 0x3852e000,
>+    0x38530000, 0x38532000, 0x38534000, 0x38536000, 0x38538000, 0x3853a000, 0x3853c000, 0x3853e000,
>+    0x38540000, 0x38542000, 0x38544000, 0x38546000, 0x38548000, 0x3854a000, 0x3854c000, 0x3854e000,
>+    0x38550000, 0x38552000, 0x38554000, 0x38556000, 0x38558000, 0x3855a000, 0x3855c000, 0x3855e000,
>+    0x38560000, 0x38562000, 0x38564000, 0x38566000, 0x38568000, 0x3856a000, 0x3856c000, 0x3856e000,
>+    0x38570000, 0x38572000, 0x38574000, 0x38576000, 0x38578000, 0x3857a000, 0x3857c000, 0x3857e000,
>+    0x38580000, 0x38582000, 0x38584000, 0x38586000, 0x38588000, 0x3858a000, 0x3858c000, 0x3858e000,
>+    0x38590000, 0x38592000, 0x38594000, 0x38596000, 0x38598000, 0x3859a000, 0x3859c000, 0x3859e000,
>+    0x385a0000, 0x385a2000, 0x385a4000, 0x385a6000, 0x385a8000, 0x385aa000, 0x385ac000, 0x385ae000,
>+    0x385b0000, 0x385b2000, 0x385b4000, 0x385b6000, 0x385b8000, 0x385ba000, 0x385bc000, 0x385be000,
>+    0x385c0000, 0x385c2000, 0x385c4000, 0x385c6000, 0x385c8000, 0x385ca000, 0x385cc000, 0x385ce000,
>+    0x385d0000, 0x385d2000, 0x385d4000, 0x385d6000, 0x385d8000, 0x385da000, 0x385dc000, 0x385de000,
>+    0x385e0000, 0x385e2000, 0x385e4000, 0x385e6000, 0x385e8000, 0x385ea000, 0x385ec000, 0x385ee000,
>+    0x385f0000, 0x385f2000, 0x385f4000, 0x385f6000, 0x385f8000, 0x385fa000, 0x385fc000, 0x385fe000,
>+    0x38600000, 0x38602000, 0x38604000, 0x38606000, 0x38608000, 0x3860a000, 0x3860c000, 0x3860e000,
>+    0x38610000, 0x38612000, 0x38614000, 0x38616000, 0x38618000, 0x3861a000, 0x3861c000, 0x3861e000,
>+    0x38620000, 0x38622000, 0x38624000, 0x38626000, 0x38628000, 0x3862a000, 0x3862c000, 0x3862e000,
>+    0x38630000, 0x38632000, 0x38634000, 0x38636000, 0x38638000, 0x3863a000, 0x3863c000, 0x3863e000,
>+    0x38640000, 0x38642000, 0x38644000, 0x38646000, 0x38648000, 0x3864a000, 0x3864c000, 0x3864e000,
>+    0x38650000, 0x38652000, 0x38654000, 0x38656000, 0x38658000, 0x3865a000, 0x3865c000, 0x3865e000,
>+    0x38660000, 0x38662000, 0x38664000, 0x38666000, 0x38668000, 0x3866a000, 0x3866c000, 0x3866e000,
>+    0x38670000, 0x38672000, 0x38674000, 0x38676000, 0x38678000, 0x3867a000, 0x3867c000, 0x3867e000,
>+    0x38680000, 0x38682000, 0x38684000, 0x38686000, 0x38688000, 0x3868a000, 0x3868c000, 0x3868e000,
>+    0x38690000, 0x38692000, 0x38694000, 0x38696000, 0x38698000, 0x3869a000, 0x3869c000, 0x3869e000,
>+    0x386a0000, 0x386a2000, 0x386a4000, 0x386a6000, 0x386a8000, 0x386aa000, 0x386ac000, 0x386ae000,
>+    0x386b0000, 0x386b2000, 0x386b4000, 0x386b6000, 0x386b8000, 0x386ba000, 0x386bc000, 0x386be000,
>+    0x386c0000, 0x386c2000, 0x386c4000, 0x386c6000, 0x386c8000, 0x386ca000, 0x386cc000, 0x386ce000,
>+    0x386d0000, 0x386d2000, 0x386d4000, 0x386d6000, 0x386d8000, 0x386da000, 0x386dc000, 0x386de000,
>+    0x386e0000, 0x386e2000, 0x386e4000, 0x386e6000, 0x386e8000, 0x386ea000, 0x386ec000, 0x386ee000,
>+    0x386f0000, 0x386f2000, 0x386f4000, 0x386f6000, 0x386f8000, 0x386fa000, 0x386fc000, 0x386fe000,
>+    0x38700000, 0x38702000, 0x38704000, 0x38706000, 0x38708000, 0x3870a000, 0x3870c000, 0x3870e000,
>+    0x38710000, 0x38712000, 0x38714000, 0x38716000, 0x38718000, 0x3871a000, 0x3871c000, 0x3871e000,
>+    0x38720000, 0x38722000, 0x38724000, 0x38726000, 0x38728000, 0x3872a000, 0x3872c000, 0x3872e000,
>+    0x38730000, 0x38732000, 0x38734000, 0x38736000, 0x38738000, 0x3873a000, 0x3873c000, 0x3873e000,
>+    0x38740000, 0x38742000, 0x38744000, 0x38746000, 0x38748000, 0x3874a000, 0x3874c000, 0x3874e000,
>+    0x38750000, 0x38752000, 0x38754000, 0x38756000, 0x38758000, 0x3875a000, 0x3875c000, 0x3875e000,
>+    0x38760000, 0x38762000, 0x38764000, 0x38766000, 0x38768000, 0x3876a000, 0x3876c000, 0x3876e000,
>+    0x38770000, 0x38772000, 0x38774000, 0x38776000, 0x38778000, 0x3877a000, 0x3877c000, 0x3877e000,
>+    0x38780000, 0x38782000, 0x38784000, 0x38786000, 0x38788000, 0x3878a000, 0x3878c000, 0x3878e000,
>+    0x38790000, 0x38792000, 0x38794000, 0x38796000, 0x38798000, 0x3879a000, 0x3879c000, 0x3879e000,
>+    0x387a0000, 0x387a2000, 0x387a4000, 0x387a6000, 0x387a8000, 0x387aa000, 0x387ac000, 0x387ae000,
>+    0x387b0000, 0x387b2000, 0x387b4000, 0x387b6000, 0x387b8000, 0x387ba000, 0x387bc000, 0x387be000,
>+    0x387c0000, 0x387c2000, 0x387c4000, 0x387c6000, 0x387c8000, 0x387ca000, 0x387cc000, 0x387ce000,
>+    0x387d0000, 0x387d2000, 0x387d4000, 0x387d6000, 0x387d8000, 0x387da000, 0x387dc000, 0x387de000,
>+    0x387e0000, 0x387e2000, 0x387e4000, 0x387e6000, 0x387e8000, 0x387ea000, 0x387ec000, 0x387ee000,
>+    0x387f0000, 0x387f2000, 0x387f4000, 0x387f6000, 0x387f8000, 0x387fa000, 0x387fc000, 0x387fe000,
> };
> 
> const static unsigned g_exponent[64] = {
>-    0x00000000,
>-    0x00800000,
>-    0x01000000,
>-    0x01800000,
>-    0x02000000,
>-    0x02800000,
>-    0x03000000,
>-    0x03800000,
>-    0x04000000,
>-    0x04800000,
>-    0x05000000,
>-    0x05800000,
>-    0x06000000,
>-    0x06800000,
>-    0x07000000,
>-    0x07800000,
>-    0x08000000,
>-    0x08800000,
>-    0x09000000,
>-    0x09800000,
>-    0x0a000000,
>-    0x0a800000,
>-    0x0b000000,
>-    0x0b800000,
>-    0x0c000000,
>-    0x0c800000,
>-    0x0d000000,
>-    0x0d800000,
>-    0x0e000000,
>-    0x0e800000,
>-    0x0f000000,
>-    0x47800000,
>-    0x80000000,
>-    0x80800000,
>-    0x81000000,
>-    0x81800000,
>-    0x82000000,
>-    0x82800000,
>-    0x83000000,
>-    0x83800000,
>-    0x84000000,
>-    0x84800000,
>-    0x85000000,
>-    0x85800000,
>-    0x86000000,
>-    0x86800000,
>-    0x87000000,
>-    0x87800000,
>-    0x88000000,
>-    0x88800000,
>-    0x89000000,
>-    0x89800000,
>-    0x8a000000,
>-    0x8a800000,
>-    0x8b000000,
>-    0x8b800000,
>-    0x8c000000,
>-    0x8c800000,
>-    0x8d000000,
>-    0x8d800000,
>-    0x8e000000,
>-    0x8e800000,
>-    0x8f000000,
>-    0xc7800000,
>+    0x00000000, 0x00800000, 0x01000000, 0x01800000, 0x02000000, 0x02800000, 0x03000000, 0x03800000,
>+    0x04000000, 0x04800000, 0x05000000, 0x05800000, 0x06000000, 0x06800000, 0x07000000, 0x07800000,
>+    0x08000000, 0x08800000, 0x09000000, 0x09800000, 0x0a000000, 0x0a800000, 0x0b000000, 0x0b800000,
>+    0x0c000000, 0x0c800000, 0x0d000000, 0x0d800000, 0x0e000000, 0x0e800000, 0x0f000000, 0x47800000,
>+    0x80000000, 0x80800000, 0x81000000, 0x81800000, 0x82000000, 0x82800000, 0x83000000, 0x83800000,
>+    0x84000000, 0x84800000, 0x85000000, 0x85800000, 0x86000000, 0x86800000, 0x87000000, 0x87800000,
>+    0x88000000, 0x88800000, 0x89000000, 0x89800000, 0x8a000000, 0x8a800000, 0x8b000000, 0x8b800000,
>+    0x8c000000, 0x8c800000, 0x8d000000, 0x8d800000, 0x8e000000, 0x8e800000, 0x8f000000, 0xc7800000,
> };
> 
> const static unsigned g_offset[64] = {
>-    0x00000000,
>-    0x00000400,
>-    0x00000400,
>-    0x00000400,
>-    0x00000400,
>-    0x00000400,
>-    0x00000400,
>-    0x00000400,
>-    0x00000400,
>-    0x00000400,
>-    0x00000400,
>-    0x00000400,
>-    0x00000400,
>-    0x00000400,
>-    0x00000400,
>-    0x00000400,
>-    0x00000400,
>-    0x00000400,
>-    0x00000400,
>-    0x00000400,
>-    0x00000400,
>-    0x00000400,
>-    0x00000400,
>-    0x00000400,
>-    0x00000400,
>-    0x00000400,
>-    0x00000400,
>-    0x00000400,
>-    0x00000400,
>-    0x00000400,
>-    0x00000400,
>-    0x00000400,
>-    0x00000000,
>-    0x00000400,
>-    0x00000400,
>-    0x00000400,
>-    0x00000400,
>-    0x00000400,
>-    0x00000400,
>-    0x00000400,
>-    0x00000400,
>-    0x00000400,
>-    0x00000400,
>-    0x00000400,
>-    0x00000400,
>-    0x00000400,
>-    0x00000400,
>-    0x00000400,
>-    0x00000400,
>-    0x00000400,
>-    0x00000400,
>-    0x00000400,
>-    0x00000400,
>-    0x00000400,
>-    0x00000400,
>-    0x00000400,
>-    0x00000400,
>-    0x00000400,
>-    0x00000400,
>-    0x00000400,
>-    0x00000400,
>-    0x00000400,
>-    0x00000400,
>-    0x00000400,
>+    0x00000000, 0x00000400, 0x00000400, 0x00000400, 0x00000400, 0x00000400, 0x00000400, 0x00000400,
>+    0x00000400, 0x00000400, 0x00000400, 0x00000400, 0x00000400, 0x00000400, 0x00000400, 0x00000400,
>+    0x00000400, 0x00000400, 0x00000400, 0x00000400, 0x00000400, 0x00000400, 0x00000400, 0x00000400,
>+    0x00000400, 0x00000400, 0x00000400, 0x00000400, 0x00000400, 0x00000400, 0x00000400, 0x00000400,
>+    0x00000000, 0x00000400, 0x00000400, 0x00000400, 0x00000400, 0x00000400, 0x00000400, 0x00000400,
>+    0x00000400, 0x00000400, 0x00000400, 0x00000400, 0x00000400, 0x00000400, 0x00000400, 0x00000400,
>+    0x00000400, 0x00000400, 0x00000400, 0x00000400, 0x00000400, 0x00000400, 0x00000400, 0x00000400,
>+    0x00000400, 0x00000400, 0x00000400, 0x00000400, 0x00000400, 0x00000400, 0x00000400, 0x00000400,
> };
> 
> float float16ToFloat32(unsigned short h)
>@@ -2201,5 +297,4 @@ float float16ToFloat32(unsigned short h)
>     unsigned i32 = g_mantissa[g_offset[h >> 10] + (h & 0x3ff)] + g_exponent[h >> 10];
>     return bitCast<float>(i32);
> }
>-}
>-
>+}  // namespace gl
>diff --git a/Source/ThirdParty/ANGLE/src/common/MemoryBuffer.cpp b/Source/ThirdParty/ANGLE/src/common/MemoryBuffer.cpp
>index 6f5188c69c8..5e57be225dc 100644
>--- a/Source/ThirdParty/ANGLE/src/common/MemoryBuffer.cpp
>+++ b/Source/ThirdParty/ANGLE/src/common/MemoryBuffer.cpp
>@@ -15,10 +15,6 @@ namespace angle
> {
> 
> // MemoryBuffer implementation.
>-MemoryBuffer::MemoryBuffer() : mSize(0), mData(nullptr)
>-{
>-}
>-
> MemoryBuffer::~MemoryBuffer()
> {
>     free(mData);
>@@ -41,7 +37,7 @@ bool MemoryBuffer::resize(size_t size)
>     }
> 
>     // Only reallocate if the size has changed.
>-    uint8_t *newMemory = reinterpret_cast<uint8_t *>(malloc(sizeof(uint8_t) * size));
>+    uint8_t *newMemory = static_cast<uint8_t *>(malloc(sizeof(uint8_t) * size));
>     if (newMemory == nullptr)
>     {
>         return false;
>@@ -82,13 +78,9 @@ MemoryBuffer &MemoryBuffer::operator=(MemoryBuffer &&other)
> 
> // ScratchBuffer implementation.
> 
>-ScratchBuffer::ScratchBuffer(uint32_t lifetime) : mLifetime(lifetime), mResetCounter(lifetime)
>-{
>-}
>+ScratchBuffer::ScratchBuffer(uint32_t lifetime) : mLifetime(lifetime), mResetCounter(lifetime) {}
> 
>-ScratchBuffer::~ScratchBuffer()
>-{
>-}
>+ScratchBuffer::~ScratchBuffer() {}
> 
> bool ScratchBuffer::get(size_t requestedSize, MemoryBuffer **memoryBufferOut)
> {
>diff --git a/Source/ThirdParty/ANGLE/src/common/MemoryBuffer.h b/Source/ThirdParty/ANGLE/src/common/MemoryBuffer.h
>index f76b9ee62e6..ae6b64c8c72 100644
>--- a/Source/ThirdParty/ANGLE/src/common/MemoryBuffer.h
>+++ b/Source/ThirdParty/ANGLE/src/common/MemoryBuffer.h
>@@ -20,7 +20,8 @@ namespace angle
> class MemoryBuffer final : NonCopyable
> {
>   public:
>-    MemoryBuffer();
>+    MemoryBuffer() = default;
>+    MemoryBuffer(size_t size) { resize(size); }
>     ~MemoryBuffer();
> 
>     MemoryBuffer(MemoryBuffer &&other);
>@@ -37,11 +38,22 @@ class MemoryBuffer final : NonCopyable
>         return mData;
>     }
> 
>+    uint8_t &operator[](size_t pos)
>+    {
>+        ASSERT(pos < mSize);
>+        return mData[pos];
>+    }
>+    const uint8_t &operator[](size_t pos) const
>+    {
>+        ASSERT(pos < mSize);
>+        return mData[pos];
>+    }
>+
>     void fill(uint8_t datum);
> 
>   private:
>-    size_t mSize;
>-    uint8_t *mData;
>+    size_t mSize   = 0;
>+    uint8_t *mData = nullptr;
> };
> 
> class ScratchBuffer final : NonCopyable
>diff --git a/Source/ThirdParty/ANGLE/src/common/Optional_unittest.cpp b/Source/ThirdParty/ANGLE/src/common/Optional_unittest.cpp
>index 81004618462..ebae98e3702 100644
>--- a/Source/ThirdParty/ANGLE/src/common/Optional_unittest.cpp
>+++ b/Source/ThirdParty/ANGLE/src/common/Optional_unittest.cpp
>@@ -44,4 +44,4 @@ TEST(OptionalTest, Copies)
>     ASSERT_EQ(testValid, testCopy);
> }
> 
>-} // namespace
>+}  // namespace
>diff --git a/Source/ThirdParty/ANGLE/src/common/PackedEGLEnums_autogen.cpp b/Source/ThirdParty/ANGLE/src/common/PackedEGLEnums_autogen.cpp
>new file mode 100644
>index 00000000000..2af94d4aa7a
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/common/PackedEGLEnums_autogen.cpp
>@@ -0,0 +1,222 @@
>+// GENERATED FILE - DO NOT EDIT.
>+// Generated by gen_packed_gl_enums.py using data from packed_egl_enums.json.
>+//
>+// Copyright 2019 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// PackedEGLEnums_autogen.cpp:
>+//   Implements ANGLE-specific enums classes for EGLenums and functions operating
>+//   on them.
>+
>+#include "common/PackedEGLEnums_autogen.h"
>+#include "common/debug.h"
>+
>+namespace egl
>+{
>+
>+template <>
>+CompositorTiming FromEGLenum<CompositorTiming>(EGLenum from)
>+{
>+    switch (from)
>+    {
>+        case EGL_COMPOSITE_DEADLINE_ANDROID:
>+            return CompositorTiming::CompositeDeadline;
>+        case EGL_COMPOSITE_INTERVAL_ANDROID:
>+            return CompositorTiming::CompositInterval;
>+        case EGL_COMPOSITE_TO_PRESENT_LATENCY_ANDROID:
>+            return CompositorTiming::CompositToPresentLatency;
>+        default:
>+            return CompositorTiming::InvalidEnum;
>+    }
>+}
>+
>+EGLenum ToEGLenum(CompositorTiming from)
>+{
>+    switch (from)
>+    {
>+        case CompositorTiming::CompositeDeadline:
>+            return EGL_COMPOSITE_DEADLINE_ANDROID;
>+        case CompositorTiming::CompositInterval:
>+            return EGL_COMPOSITE_INTERVAL_ANDROID;
>+        case CompositorTiming::CompositToPresentLatency:
>+            return EGL_COMPOSITE_TO_PRESENT_LATENCY_ANDROID;
>+        default:
>+            UNREACHABLE();
>+            return 0;
>+    }
>+}
>+
>+template <>
>+MessageType FromEGLenum<MessageType>(EGLenum from)
>+{
>+    switch (from)
>+    {
>+        case EGL_DEBUG_MSG_CRITICAL_KHR:
>+            return MessageType::Critical;
>+        case EGL_DEBUG_MSG_ERROR_KHR:
>+            return MessageType::Error;
>+        case EGL_DEBUG_MSG_WARN_KHR:
>+            return MessageType::Warn;
>+        case EGL_DEBUG_MSG_INFO_KHR:
>+            return MessageType::Info;
>+        default:
>+            return MessageType::InvalidEnum;
>+    }
>+}
>+
>+EGLenum ToEGLenum(MessageType from)
>+{
>+    switch (from)
>+    {
>+        case MessageType::Critical:
>+            return EGL_DEBUG_MSG_CRITICAL_KHR;
>+        case MessageType::Error:
>+            return EGL_DEBUG_MSG_ERROR_KHR;
>+        case MessageType::Warn:
>+            return EGL_DEBUG_MSG_WARN_KHR;
>+        case MessageType::Info:
>+            return EGL_DEBUG_MSG_INFO_KHR;
>+        default:
>+            UNREACHABLE();
>+            return 0;
>+    }
>+}
>+
>+template <>
>+ObjectType FromEGLenum<ObjectType>(EGLenum from)
>+{
>+    switch (from)
>+    {
>+        case EGL_OBJECT_THREAD_KHR:
>+            return ObjectType::Thread;
>+        case EGL_OBJECT_DISPLAY_KHR:
>+            return ObjectType::Display;
>+        case EGL_OBJECT_CONTEXT_KHR:
>+            return ObjectType::Context;
>+        case EGL_OBJECT_SURFACE_KHR:
>+            return ObjectType::Surface;
>+        case EGL_OBJECT_IMAGE_KHR:
>+            return ObjectType::Image;
>+        case EGL_OBJECT_SYNC_KHR:
>+            return ObjectType::Sync;
>+        case EGL_OBJECT_STREAM_KHR:
>+            return ObjectType::Stream;
>+        default:
>+            return ObjectType::InvalidEnum;
>+    }
>+}
>+
>+EGLenum ToEGLenum(ObjectType from)
>+{
>+    switch (from)
>+    {
>+        case ObjectType::Thread:
>+            return EGL_OBJECT_THREAD_KHR;
>+        case ObjectType::Display:
>+            return EGL_OBJECT_DISPLAY_KHR;
>+        case ObjectType::Context:
>+            return EGL_OBJECT_CONTEXT_KHR;
>+        case ObjectType::Surface:
>+            return EGL_OBJECT_SURFACE_KHR;
>+        case ObjectType::Image:
>+            return EGL_OBJECT_IMAGE_KHR;
>+        case ObjectType::Sync:
>+            return EGL_OBJECT_SYNC_KHR;
>+        case ObjectType::Stream:
>+            return EGL_OBJECT_STREAM_KHR;
>+        default:
>+            UNREACHABLE();
>+            return 0;
>+    }
>+}
>+
>+template <>
>+TextureFormat FromEGLenum<TextureFormat>(EGLenum from)
>+{
>+    switch (from)
>+    {
>+        case EGL_NO_TEXTURE:
>+            return TextureFormat::NoTexture;
>+        case EGL_TEXTURE_RGB:
>+            return TextureFormat::RGB;
>+        case EGL_TEXTURE_RGBA:
>+            return TextureFormat::RGBA;
>+        default:
>+            return TextureFormat::InvalidEnum;
>+    }
>+}
>+
>+EGLenum ToEGLenum(TextureFormat from)
>+{
>+    switch (from)
>+    {
>+        case TextureFormat::NoTexture:
>+            return EGL_NO_TEXTURE;
>+        case TextureFormat::RGB:
>+            return EGL_TEXTURE_RGB;
>+        case TextureFormat::RGBA:
>+            return EGL_TEXTURE_RGBA;
>+        default:
>+            UNREACHABLE();
>+            return 0;
>+    }
>+}
>+
>+template <>
>+Timestamp FromEGLenum<Timestamp>(EGLenum from)
>+{
>+    switch (from)
>+    {
>+        case EGL_REQUESTED_PRESENT_TIME_ANDROID:
>+            return Timestamp::RequestedPresentTime;
>+        case EGL_RENDERING_COMPLETE_TIME_ANDROID:
>+            return Timestamp::RenderingCompleteTime;
>+        case EGL_COMPOSITION_LATCH_TIME_ANDROID:
>+            return Timestamp::CompositionLatchTime;
>+        case EGL_FIRST_COMPOSITION_START_TIME_ANDROID:
>+            return Timestamp::FirstCompositionStartTime;
>+        case EGL_LAST_COMPOSITION_START_TIME_ANDROID:
>+            return Timestamp::LastCompositionStartTime;
>+        case EGL_FIRST_COMPOSITION_GPU_FINISHED_TIME_ANDROID:
>+            return Timestamp::FirstCompositionGPUFinishedTime;
>+        case EGL_DISPLAY_PRESENT_TIME_ANDROID:
>+            return Timestamp::DisplayPresentTime;
>+        case EGL_DEQUEUE_READY_TIME_ANDROID:
>+            return Timestamp::DequeueReadyTime;
>+        case EGL_READS_DONE_TIME_ANDROID:
>+            return Timestamp::ReadsDoneTime;
>+        default:
>+            return Timestamp::InvalidEnum;
>+    }
>+}
>+
>+EGLenum ToEGLenum(Timestamp from)
>+{
>+    switch (from)
>+    {
>+        case Timestamp::RequestedPresentTime:
>+            return EGL_REQUESTED_PRESENT_TIME_ANDROID;
>+        case Timestamp::RenderingCompleteTime:
>+            return EGL_RENDERING_COMPLETE_TIME_ANDROID;
>+        case Timestamp::CompositionLatchTime:
>+            return EGL_COMPOSITION_LATCH_TIME_ANDROID;
>+        case Timestamp::FirstCompositionStartTime:
>+            return EGL_FIRST_COMPOSITION_START_TIME_ANDROID;
>+        case Timestamp::LastCompositionStartTime:
>+            return EGL_LAST_COMPOSITION_START_TIME_ANDROID;
>+        case Timestamp::FirstCompositionGPUFinishedTime:
>+            return EGL_FIRST_COMPOSITION_GPU_FINISHED_TIME_ANDROID;
>+        case Timestamp::DisplayPresentTime:
>+            return EGL_DISPLAY_PRESENT_TIME_ANDROID;
>+        case Timestamp::DequeueReadyTime:
>+            return EGL_DEQUEUE_READY_TIME_ANDROID;
>+        case Timestamp::ReadsDoneTime:
>+            return EGL_READS_DONE_TIME_ANDROID;
>+        default:
>+            UNREACHABLE();
>+            return 0;
>+    }
>+}
>+
>+}  // namespace egl
>diff --git a/Source/ThirdParty/ANGLE/src/common/PackedEGLEnums_autogen.h b/Source/ThirdParty/ANGLE/src/common/PackedEGLEnums_autogen.h
>new file mode 100644
>index 00000000000..68c65d8bab5
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/common/PackedEGLEnums_autogen.h
>@@ -0,0 +1,110 @@
>+// GENERATED FILE - DO NOT EDIT.
>+// Generated by gen_packed_gl_enums.py using data from packed_egl_enums.json.
>+//
>+// Copyright 2019 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// PackedEGLEnums_autogen.h:
>+//   Declares ANGLE-specific enums classes for EGLenums and functions operating
>+//   on them.
>+
>+#ifndef COMMON_PACKEDEGLENUMS_AUTOGEN_H_
>+#define COMMON_PACKEDEGLENUMS_AUTOGEN_H_
>+
>+#include <EGL/egl.h>
>+#include <EGL/eglext.h>
>+#include <angle_gl.h>
>+
>+#include <cstdint>
>+
>+namespace egl
>+{
>+
>+template <typename Enum>
>+Enum FromEGLenum(EGLenum from);
>+
>+enum class CompositorTiming : uint8_t
>+{
>+    CompositeDeadline        = 0,
>+    CompositInterval         = 1,
>+    CompositToPresentLatency = 2,
>+
>+    InvalidEnum = 3,
>+    EnumCount   = 3,
>+};
>+
>+template <>
>+CompositorTiming FromEGLenum<CompositorTiming>(EGLenum from);
>+EGLenum ToEGLenum(CompositorTiming from);
>+
>+enum class MessageType : uint8_t
>+{
>+    Critical = 0,
>+    Error    = 1,
>+    Warn     = 2,
>+    Info     = 3,
>+
>+    InvalidEnum = 4,
>+    EnumCount   = 4,
>+};
>+
>+template <>
>+MessageType FromEGLenum<MessageType>(EGLenum from);
>+EGLenum ToEGLenum(MessageType from);
>+
>+enum class ObjectType : uint8_t
>+{
>+    Thread  = 0,
>+    Display = 1,
>+    Context = 2,
>+    Surface = 3,
>+    Image   = 4,
>+    Sync    = 5,
>+    Stream  = 6,
>+
>+    InvalidEnum = 7,
>+    EnumCount   = 7,
>+};
>+
>+template <>
>+ObjectType FromEGLenum<ObjectType>(EGLenum from);
>+EGLenum ToEGLenum(ObjectType from);
>+
>+enum class TextureFormat : uint8_t
>+{
>+    NoTexture = 0,
>+    RGB       = 1,
>+    RGBA      = 2,
>+
>+    InvalidEnum = 3,
>+    EnumCount   = 3,
>+};
>+
>+template <>
>+TextureFormat FromEGLenum<TextureFormat>(EGLenum from);
>+EGLenum ToEGLenum(TextureFormat from);
>+
>+enum class Timestamp : uint8_t
>+{
>+    RequestedPresentTime            = 0,
>+    RenderingCompleteTime           = 1,
>+    CompositionLatchTime            = 2,
>+    FirstCompositionStartTime       = 3,
>+    LastCompositionStartTime        = 4,
>+    FirstCompositionGPUFinishedTime = 5,
>+    DisplayPresentTime              = 6,
>+    DequeueReadyTime                = 7,
>+    ReadsDoneTime                   = 8,
>+
>+    InvalidEnum = 9,
>+    EnumCount   = 9,
>+};
>+
>+template <>
>+Timestamp FromEGLenum<Timestamp>(EGLenum from);
>+EGLenum ToEGLenum(Timestamp from);
>+
>+}  // namespace egl
>+
>+#endif  // COMMON_PACKEDEGLENUMS_AUTOGEN_H_
>diff --git a/Source/ThirdParty/ANGLE/src/common/PackedEnums.cpp b/Source/ThirdParty/ANGLE/src/common/PackedEnums.cpp
>new file mode 100644
>index 00000000000..60cc785bc6d
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/common/PackedEnums.cpp
>@@ -0,0 +1,259 @@
>+// Copyright 2018 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// PackedGLEnums.cpp:
>+//   Declares ANGLE-specific enums classes for GLEnum and functions operating
>+//   on them.
>+
>+#include "common/PackedEnums.h"
>+
>+#include "common/utilities.h"
>+
>+namespace gl
>+{
>+
>+TextureType TextureTargetToType(TextureTarget target)
>+{
>+    switch (target)
>+    {
>+        case TextureTarget::CubeMapNegativeX:
>+        case TextureTarget::CubeMapNegativeY:
>+        case TextureTarget::CubeMapNegativeZ:
>+        case TextureTarget::CubeMapPositiveX:
>+        case TextureTarget::CubeMapPositiveY:
>+        case TextureTarget::CubeMapPositiveZ:
>+            return TextureType::CubeMap;
>+        case TextureTarget::External:
>+            return TextureType::External;
>+        case TextureTarget::Rectangle:
>+            return TextureType::Rectangle;
>+        case TextureTarget::_2D:
>+            return TextureType::_2D;
>+        case TextureTarget::_2DArray:
>+            return TextureType::_2DArray;
>+        case TextureTarget::_2DMultisample:
>+            return TextureType::_2DMultisample;
>+        case TextureTarget::_2DMultisampleArray:
>+            return TextureType::_2DMultisampleArray;
>+        case TextureTarget::_3D:
>+            return TextureType::_3D;
>+        case TextureTarget::InvalidEnum:
>+            return TextureType::InvalidEnum;
>+        default:
>+            UNREACHABLE();
>+            return TextureType::InvalidEnum;
>+    }
>+}
>+
>+bool IsCubeMapFaceTarget(TextureTarget target)
>+{
>+    return TextureTargetToType(target) == TextureType::CubeMap;
>+}
>+
>+TextureTarget NonCubeTextureTypeToTarget(TextureType type)
>+{
>+    switch (type)
>+    {
>+        case TextureType::External:
>+            return TextureTarget::External;
>+        case TextureType::Rectangle:
>+            return TextureTarget::Rectangle;
>+        case TextureType::_2D:
>+            return TextureTarget::_2D;
>+        case TextureType::_2DArray:
>+            return TextureTarget::_2DArray;
>+        case TextureType::_2DMultisample:
>+            return TextureTarget::_2DMultisample;
>+        case TextureType::_2DMultisampleArray:
>+            return TextureTarget::_2DMultisampleArray;
>+        case TextureType::_3D:
>+            return TextureTarget::_3D;
>+        default:
>+            UNREACHABLE();
>+            return TextureTarget::InvalidEnum;
>+    }
>+}
>+
>+// Check that we can do arithmetic on TextureTarget to convert from / to cube map faces
>+static_assert(static_cast<uint8_t>(TextureTarget::CubeMapNegativeX) -
>+                      static_cast<uint8_t>(TextureTarget::CubeMapPositiveX) ==
>+                  1u,
>+              "");
>+static_assert(static_cast<uint8_t>(TextureTarget::CubeMapPositiveY) -
>+                      static_cast<uint8_t>(TextureTarget::CubeMapPositiveX) ==
>+                  2u,
>+              "");
>+static_assert(static_cast<uint8_t>(TextureTarget::CubeMapNegativeY) -
>+                      static_cast<uint8_t>(TextureTarget::CubeMapPositiveX) ==
>+                  3u,
>+              "");
>+static_assert(static_cast<uint8_t>(TextureTarget::CubeMapPositiveZ) -
>+                      static_cast<uint8_t>(TextureTarget::CubeMapPositiveX) ==
>+                  4u,
>+              "");
>+static_assert(static_cast<uint8_t>(TextureTarget::CubeMapNegativeZ) -
>+                      static_cast<uint8_t>(TextureTarget::CubeMapPositiveX) ==
>+                  5u,
>+              "");
>+
>+TextureTarget CubeFaceIndexToTextureTarget(size_t face)
>+{
>+    ASSERT(face < 6u);
>+    return static_cast<TextureTarget>(static_cast<uint8_t>(TextureTarget::CubeMapPositiveX) + face);
>+}
>+
>+size_t CubeMapTextureTargetToFaceIndex(TextureTarget target)
>+{
>+    ASSERT(IsCubeMapFaceTarget(target));
>+    return static_cast<uint8_t>(target) - static_cast<uint8_t>(TextureTarget::CubeMapPositiveX);
>+}
>+
>+TextureType SamplerTypeToTextureType(GLenum samplerType)
>+{
>+    switch (samplerType)
>+    {
>+        case GL_SAMPLER_2D:
>+        case GL_INT_SAMPLER_2D:
>+        case GL_UNSIGNED_INT_SAMPLER_2D:
>+        case GL_SAMPLER_2D_SHADOW:
>+            return TextureType::_2D;
>+
>+        case GL_SAMPLER_EXTERNAL_OES:
>+            return TextureType::External;
>+
>+        case GL_SAMPLER_CUBE:
>+        case GL_INT_SAMPLER_CUBE:
>+        case GL_UNSIGNED_INT_SAMPLER_CUBE:
>+        case GL_SAMPLER_CUBE_SHADOW:
>+            return TextureType::CubeMap;
>+
>+        case GL_SAMPLER_2D_ARRAY:
>+        case GL_INT_SAMPLER_2D_ARRAY:
>+        case GL_UNSIGNED_INT_SAMPLER_2D_ARRAY:
>+        case GL_SAMPLER_2D_ARRAY_SHADOW:
>+            return TextureType::_2DArray;
>+
>+        case GL_SAMPLER_3D:
>+        case GL_INT_SAMPLER_3D:
>+        case GL_UNSIGNED_INT_SAMPLER_3D:
>+            return TextureType::_3D;
>+
>+        case GL_SAMPLER_2D_MULTISAMPLE:
>+        case GL_INT_SAMPLER_2D_MULTISAMPLE:
>+        case GL_UNSIGNED_INT_SAMPLER_2D_MULTISAMPLE:
>+            return TextureType::_2DMultisample;
>+
>+        case GL_SAMPLER_2D_MULTISAMPLE_ARRAY:
>+        case GL_INT_SAMPLER_2D_MULTISAMPLE_ARRAY:
>+        case GL_UNSIGNED_INT_SAMPLER_2D_MULTISAMPLE_ARRAY:
>+            return TextureType::_2DMultisampleArray;
>+
>+        case GL_SAMPLER_2D_RECT_ANGLE:
>+            return TextureType::Rectangle;
>+
>+        default:
>+            UNREACHABLE();
>+            return TextureType::InvalidEnum;
>+    }
>+}
>+
>+bool IsMultisampled(gl::TextureType type)
>+{
>+    switch (type)
>+    {
>+        case gl::TextureType::_2DMultisample:
>+        case gl::TextureType::_2DMultisampleArray:
>+            return true;
>+        default:
>+            return false;
>+    }
>+}
>+
>+}  // namespace gl
>+
>+namespace egl
>+{
>+MessageType ErrorCodeToMessageType(EGLint errorCode)
>+{
>+    switch (errorCode)
>+    {
>+        case EGL_BAD_ALLOC:
>+        case EGL_CONTEXT_LOST:
>+        case EGL_NOT_INITIALIZED:
>+            return MessageType::Critical;
>+
>+        case EGL_BAD_ACCESS:
>+        case EGL_BAD_ATTRIBUTE:
>+        case EGL_BAD_CONFIG:
>+        case EGL_BAD_CONTEXT:
>+        case EGL_BAD_CURRENT_SURFACE:
>+        case EGL_BAD_DISPLAY:
>+        case EGL_BAD_MATCH:
>+        case EGL_BAD_NATIVE_PIXMAP:
>+        case EGL_BAD_NATIVE_WINDOW:
>+        case EGL_BAD_PARAMETER:
>+        case EGL_BAD_SURFACE:
>+        case EGL_BAD_STREAM_KHR:
>+        case EGL_BAD_STATE_KHR:
>+        case EGL_BAD_DEVICE_EXT:
>+            return MessageType::Error;
>+
>+        case EGL_SUCCESS:
>+        default:
>+            UNREACHABLE();
>+            return MessageType::InvalidEnum;
>+    }
>+}
>+}  // namespace egl
>+
>+namespace egl_gl
>+{
>+
>+gl::TextureTarget EGLCubeMapTargetToCubeMapTarget(EGLenum eglTarget)
>+{
>+    ASSERT(egl::IsCubeMapTextureTarget(eglTarget));
>+    return gl::CubeFaceIndexToTextureTarget(egl::CubeMapTextureTargetToLayerIndex(eglTarget));
>+}
>+
>+gl::TextureTarget EGLImageTargetToTextureTarget(EGLenum eglTarget)
>+{
>+    switch (eglTarget)
>+    {
>+        case EGL_GL_TEXTURE_2D_KHR:
>+            return gl::TextureTarget::_2D;
>+
>+        case EGL_GL_TEXTURE_CUBE_MAP_POSITIVE_X_KHR:
>+        case EGL_GL_TEXTURE_CUBE_MAP_NEGATIVE_X_KHR:
>+        case EGL_GL_TEXTURE_CUBE_MAP_POSITIVE_Y_KHR:
>+        case EGL_GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_KHR:
>+        case EGL_GL_TEXTURE_CUBE_MAP_POSITIVE_Z_KHR:
>+        case EGL_GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_KHR:
>+            return EGLCubeMapTargetToCubeMapTarget(eglTarget);
>+
>+        case EGL_GL_TEXTURE_3D_KHR:
>+            return gl::TextureTarget::_3D;
>+
>+        default:
>+            UNREACHABLE();
>+            return gl::TextureTarget::InvalidEnum;
>+    }
>+}
>+
>+gl::TextureType EGLTextureTargetToTextureType(EGLenum eglTarget)
>+{
>+    switch (eglTarget)
>+    {
>+        case EGL_TEXTURE_2D:
>+            return gl::TextureType::_2D;
>+
>+        case EGL_TEXTURE_RECTANGLE_ANGLE:
>+            return gl::TextureType::Rectangle;
>+
>+        default:
>+            UNREACHABLE();
>+            return gl::TextureType::InvalidEnum;
>+    }
>+}
>+
>+}  // namespace egl_gl
>diff --git a/Source/ThirdParty/ANGLE/src/common/PackedEnums.h b/Source/ThirdParty/ANGLE/src/common/PackedEnums.h
>new file mode 100644
>index 00000000000..650b168069a
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/common/PackedEnums.h
>@@ -0,0 +1,384 @@
>+// Copyright 2017 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// PackedGLEnums_autogen.h:
>+//   Declares ANGLE-specific enums classes for GLEnum and functions operating
>+//   on them.
>+
>+#ifndef COMMON_PACKEDGLENUMS_H_
>+#define COMMON_PACKEDGLENUMS_H_
>+
>+#include "common/PackedEGLEnums_autogen.h"
>+#include "common/PackedGLEnums_autogen.h"
>+
>+#include <array>
>+#include <bitset>
>+#include <cstddef>
>+
>+#include <EGL/egl.h>
>+
>+#include "common/bitset_utils.h"
>+
>+namespace angle
>+{
>+
>+// Return the number of elements of a packed enum, including the InvalidEnum element.
>+template <typename E>
>+constexpr size_t EnumSize()
>+{
>+    using UnderlyingType = typename std::underlying_type<E>::type;
>+    return static_cast<UnderlyingType>(E::EnumCount);
>+}
>+
>+// Implementation of AllEnums which allows iterating over all the possible values for a packed enums
>+// like so:
>+//     for (auto value : AllEnums<MyPackedEnum>()) {
>+//         // Do something with the enum.
>+//     }
>+
>+template <typename E>
>+class EnumIterator final
>+{
>+  private:
>+    using UnderlyingType = typename std::underlying_type<E>::type;
>+
>+  public:
>+    EnumIterator(E value) : mValue(static_cast<UnderlyingType>(value)) {}
>+    EnumIterator &operator++()
>+    {
>+        mValue++;
>+        return *this;
>+    }
>+    bool operator==(const EnumIterator &other) const { return mValue == other.mValue; }
>+    bool operator!=(const EnumIterator &other) const { return mValue != other.mValue; }
>+    E operator*() const { return static_cast<E>(mValue); }
>+
>+  private:
>+    UnderlyingType mValue;
>+};
>+
>+template <typename E>
>+struct AllEnums
>+{
>+    EnumIterator<E> begin() const { return {static_cast<E>(0)}; }
>+    EnumIterator<E> end() const { return {E::InvalidEnum}; }
>+};
>+
>+// PackedEnumMap<E, T> is like an std::array<T, E::EnumCount> but is indexed with enum values. It
>+// implements all of the std::array interface except with enum values instead of indices.
>+template <typename E, typename T, size_t MaxSize = EnumSize<E>()>
>+class PackedEnumMap
>+{
>+    using UnderlyingType = typename std::underlying_type<E>::type;
>+    using Storage        = std::array<T, MaxSize>;
>+
>+  public:
>+    using InitPair = std::pair<E, T>;
>+
>+    constexpr PackedEnumMap() = default;
>+
>+    constexpr PackedEnumMap(std::initializer_list<InitPair> init) : mPrivateData{}
>+    {
>+        // We use a for loop instead of range-for to work around a limitation in MSVC.
>+        for (const InitPair *it = init.begin(); it != init.end(); ++it)
>+        {
>+            // This horrible const_cast pattern is necessary to work around a constexpr limitation.
>+            // See https://stackoverflow.com/q/34199774/ . Note that it should be fixed with C++17.
>+            const_cast<T &>(const_cast<const Storage &>(
>+                mPrivateData)[static_cast<UnderlyingType>(it->first)]) = it->second;
>+        }
>+    }
>+
>+    // types:
>+    using value_type      = T;
>+    using pointer         = T *;
>+    using const_pointer   = const T *;
>+    using reference       = T &;
>+    using const_reference = const T &;
>+
>+    using size_type       = size_t;
>+    using difference_type = ptrdiff_t;
>+
>+    using iterator               = typename Storage::iterator;
>+    using const_iterator         = typename Storage::const_iterator;
>+    using reverse_iterator       = std::reverse_iterator<iterator>;
>+    using const_reverse_iterator = std::reverse_iterator<const_iterator>;
>+
>+    // No explicit construct/copy/destroy for aggregate type
>+    void fill(const T &u) { mPrivateData.fill(u); }
>+    void swap(PackedEnumMap<E, T> &a) noexcept { mPrivateData.swap(a.mPrivateData); }
>+
>+    // iterators:
>+    iterator begin() noexcept { return mPrivateData.begin(); }
>+    const_iterator begin() const noexcept { return mPrivateData.begin(); }
>+    iterator end() noexcept { return mPrivateData.end(); }
>+    const_iterator end() const noexcept { return mPrivateData.end(); }
>+
>+    reverse_iterator rbegin() noexcept { return mPrivateData.rbegin(); }
>+    const_reverse_iterator rbegin() const noexcept { return mPrivateData.rbegin(); }
>+    reverse_iterator rend() noexcept { return mPrivateData.rend(); }
>+    const_reverse_iterator rend() const noexcept { return mPrivateData.rend(); }
>+
>+    // capacity:
>+    constexpr size_type size() const noexcept { return mPrivateData.size(); }
>+    constexpr size_type max_size() const noexcept { return mPrivateData.max_size(); }
>+    constexpr bool empty() const noexcept { return mPrivateData.empty(); }
>+
>+    // element access:
>+    reference operator[](E n)
>+    {
>+        ASSERT(static_cast<size_t>(n) < mPrivateData.size());
>+        return mPrivateData[static_cast<UnderlyingType>(n)];
>+    }
>+
>+    constexpr const_reference operator[](E n) const
>+    {
>+        ASSERT(static_cast<size_t>(n) < mPrivateData.size());
>+        return mPrivateData[static_cast<UnderlyingType>(n)];
>+    }
>+
>+    const_reference at(E n) const { return mPrivateData.at(static_cast<UnderlyingType>(n)); }
>+    reference at(E n) { return mPrivateData.at(static_cast<UnderlyingType>(n)); }
>+
>+    reference front() { return mPrivateData.front(); }
>+    const_reference front() const { return mPrivateData.front(); }
>+    reference back() { return mPrivateData.back(); }
>+    const_reference back() const { return mPrivateData.back(); }
>+
>+    T *data() noexcept { return mPrivateData.data(); }
>+    const T *data() const noexcept { return mPrivateData.data(); }
>+
>+  private:
>+    Storage mPrivateData;
>+};
>+
>+// PackedEnumBitSetE> is like an std::bitset<E::EnumCount> but is indexed with enum values. It
>+// implements the std::bitset interface except with enum values instead of indices.
>+template <typename E, typename DataT = uint32_t>
>+using PackedEnumBitSet = BitSetT<EnumSize<E>(), DataT, E>;
>+
>+}  // namespace angle
>+
>+namespace gl
>+{
>+
>+TextureType TextureTargetToType(TextureTarget target);
>+TextureTarget NonCubeTextureTypeToTarget(TextureType type);
>+
>+TextureTarget CubeFaceIndexToTextureTarget(size_t face);
>+size_t CubeMapTextureTargetToFaceIndex(TextureTarget target);
>+bool IsCubeMapFaceTarget(TextureTarget target);
>+
>+constexpr TextureTarget kCubeMapTextureTargetMin = TextureTarget::CubeMapPositiveX;
>+constexpr TextureTarget kCubeMapTextureTargetMax = TextureTarget::CubeMapNegativeZ;
>+constexpr TextureTarget kAfterCubeMapTextureTargetMax =
>+    static_cast<TextureTarget>(static_cast<uint8_t>(kCubeMapTextureTargetMax) + 1);
>+struct AllCubeFaceTextureTargets
>+{
>+    angle::EnumIterator<TextureTarget> begin() const { return kCubeMapTextureTargetMin; }
>+    angle::EnumIterator<TextureTarget> end() const { return kAfterCubeMapTextureTargetMax; }
>+};
>+
>+constexpr ShaderType kGLES2ShaderTypeMin = ShaderType::Vertex;
>+constexpr ShaderType kGLES2ShaderTypeMax = ShaderType::Fragment;
>+constexpr ShaderType kAfterGLES2ShaderTypeMax =
>+    static_cast<ShaderType>(static_cast<uint8_t>(kGLES2ShaderTypeMax) + 1);
>+struct AllGLES2ShaderTypes
>+{
>+    angle::EnumIterator<ShaderType> begin() const { return kGLES2ShaderTypeMin; }
>+    angle::EnumIterator<ShaderType> end() const { return kAfterGLES2ShaderTypeMax; }
>+};
>+
>+constexpr ShaderType kShaderTypeMin = ShaderType::Vertex;
>+constexpr ShaderType kShaderTypeMax = ShaderType::Compute;
>+constexpr ShaderType kAfterShaderTypeMax =
>+    static_cast<ShaderType>(static_cast<uint8_t>(kShaderTypeMax) + 1);
>+struct AllShaderTypes
>+{
>+    angle::EnumIterator<ShaderType> begin() const { return kShaderTypeMin; }
>+    angle::EnumIterator<ShaderType> end() const { return kAfterShaderTypeMax; }
>+};
>+
>+constexpr size_t kGraphicsShaderCount = static_cast<size_t>(ShaderType::EnumCount) - 1u;
>+// Arrange the shader types in the order of rendering pipeline
>+constexpr std::array<ShaderType, kGraphicsShaderCount> kAllGraphicsShaderTypes = {
>+    ShaderType::Vertex, ShaderType::Geometry, ShaderType::Fragment};
>+
>+using ShaderBitSet = angle::PackedEnumBitSet<ShaderType, uint8_t>;
>+static_assert(sizeof(ShaderBitSet) == sizeof(uint8_t), "Unexpected size");
>+
>+template <typename T>
>+using ShaderMap = angle::PackedEnumMap<ShaderType, T>;
>+
>+TextureType SamplerTypeToTextureType(GLenum samplerType);
>+
>+bool IsMultisampled(gl::TextureType type);
>+
>+enum class PrimitiveMode : uint8_t
>+{
>+    Points                 = 0x0,
>+    Lines                  = 0x1,
>+    LineLoop               = 0x2,
>+    LineStrip              = 0x3,
>+    Triangles              = 0x4,
>+    TriangleStrip          = 0x5,
>+    TriangleFan            = 0x6,
>+    Unused1                = 0x7,
>+    Unused2                = 0x8,
>+    Unused3                = 0x9,
>+    LinesAdjacency         = 0xA,
>+    LineStripAdjacency     = 0xB,
>+    TrianglesAdjacency     = 0xC,
>+    TriangleStripAdjacency = 0xD,
>+
>+    InvalidEnum = 0xE,
>+    EnumCount   = 0xE,
>+};
>+
>+template <>
>+constexpr PrimitiveMode FromGLenum<PrimitiveMode>(GLenum from)
>+{
>+    if (from >= static_cast<GLenum>(PrimitiveMode::EnumCount))
>+    {
>+        return PrimitiveMode::InvalidEnum;
>+    }
>+
>+    return static_cast<PrimitiveMode>(from);
>+}
>+
>+constexpr GLenum ToGLenum(PrimitiveMode from)
>+{
>+    return static_cast<GLenum>(from);
>+}
>+
>+static_assert(ToGLenum(PrimitiveMode::Points) == GL_POINTS, "PrimitiveMode violation");
>+static_assert(ToGLenum(PrimitiveMode::Lines) == GL_LINES, "PrimitiveMode violation");
>+static_assert(ToGLenum(PrimitiveMode::LineLoop) == GL_LINE_LOOP, "PrimitiveMode violation");
>+static_assert(ToGLenum(PrimitiveMode::LineStrip) == GL_LINE_STRIP, "PrimitiveMode violation");
>+static_assert(ToGLenum(PrimitiveMode::Triangles) == GL_TRIANGLES, "PrimitiveMode violation");
>+static_assert(ToGLenum(PrimitiveMode::TriangleStrip) == GL_TRIANGLE_STRIP,
>+              "PrimitiveMode violation");
>+static_assert(ToGLenum(PrimitiveMode::TriangleFan) == GL_TRIANGLE_FAN, "PrimitiveMode violation");
>+static_assert(ToGLenum(PrimitiveMode::LinesAdjacency) == GL_LINES_ADJACENCY,
>+              "PrimitiveMode violation");
>+static_assert(ToGLenum(PrimitiveMode::LineStripAdjacency) == GL_LINE_STRIP_ADJACENCY,
>+              "PrimitiveMode violation");
>+static_assert(ToGLenum(PrimitiveMode::TrianglesAdjacency) == GL_TRIANGLES_ADJACENCY,
>+              "PrimitiveMode violation");
>+static_assert(ToGLenum(PrimitiveMode::TriangleStripAdjacency) == GL_TRIANGLE_STRIP_ADJACENCY,
>+              "PrimitiveMode violation");
>+
>+enum class DrawElementsType : size_t
>+{
>+    UnsignedByte  = 0,
>+    UnsignedShort = 1,
>+    UnsignedInt   = 2,
>+    InvalidEnum   = 3,
>+    EnumCount     = 3,
>+};
>+
>+template <>
>+constexpr DrawElementsType FromGLenum<DrawElementsType>(GLenum from)
>+{
>+
>+    GLenum scaled = (from - GL_UNSIGNED_BYTE);
>+    // This code sequence generates a ROR instruction on x86/arm. We want to check if the lowest bit
>+    // of scaled is set and if (scaled >> 1) is greater than a non-pot value. If we rotate the
>+    // lowest bit to the hightest bit both conditions can be checked with a single test.
>+    static_assert(sizeof(GLenum) == 4, "Update (scaled << 31) to sizeof(GLenum) * 8 - 1");
>+    GLenum packed = (scaled >> 1) | (scaled << 31);
>+
>+    // operator ? with a simple assignment usually translates to a cmov instruction and thus avoids
>+    // a branch.
>+    packed = (packed >= static_cast<GLenum>(DrawElementsType::EnumCount))
>+                 ? static_cast<GLenum>(DrawElementsType::InvalidEnum)
>+                 : packed;
>+
>+    return static_cast<DrawElementsType>(packed);
>+}
>+
>+constexpr GLenum ToGLenum(DrawElementsType from)
>+{
>+    return ((static_cast<GLenum>(from) << 1) + GL_UNSIGNED_BYTE);
>+}
>+
>+#define ANGLE_VALIDATE_PACKED_ENUM(type, packed, glenum)                 \
>+    static_assert(ToGLenum(type::packed) == glenum, #type " violation"); \
>+    static_assert(FromGLenum<type>(glenum) == type::packed, #type " violation")
>+
>+ANGLE_VALIDATE_PACKED_ENUM(DrawElementsType, UnsignedByte, GL_UNSIGNED_BYTE);
>+ANGLE_VALIDATE_PACKED_ENUM(DrawElementsType, UnsignedShort, GL_UNSIGNED_SHORT);
>+ANGLE_VALIDATE_PACKED_ENUM(DrawElementsType, UnsignedInt, GL_UNSIGNED_INT);
>+
>+enum class VertexAttribType
>+{
>+    Byte               = 0,   // GLenum == 0x1400
>+    UnsignedByte       = 1,   // GLenum == 0x1401
>+    Short              = 2,   // GLenum == 0x1402
>+    UnsignedShort      = 3,   // GLenum == 0x1403
>+    Int                = 4,   // GLenum == 0x1404
>+    UnsignedInt        = 5,   // GLenum == 0x1405
>+    Float              = 6,   // GLenum == 0x1406
>+    Unused1            = 7,   // GLenum == 0x1407
>+    Unused2            = 8,   // GLenum == 0x1408
>+    Unused3            = 9,   // GLenum == 0x1409
>+    Unused4            = 10,  // GLenum == 0x140A
>+    HalfFloat          = 11,  // GLenum == 0x140B
>+    Fixed              = 12,  // GLenum == 0x140C
>+    MaxBasicType       = 12,
>+    UnsignedInt2101010 = 13,  // GLenum == 0x8368
>+    Int2101010         = 14,  // GLenum == 0x8D9F
>+    InvalidEnum        = 15,
>+    EnumCount          = 15,
>+};
>+
>+template <>
>+constexpr VertexAttribType FromGLenum<VertexAttribType>(GLenum from)
>+{
>+    GLenum packed = from - GL_BYTE;
>+    if (packed <= static_cast<GLenum>(VertexAttribType::MaxBasicType))
>+        return static_cast<VertexAttribType>(packed);
>+    if (from == GL_UNSIGNED_INT_2_10_10_10_REV)
>+        return VertexAttribType::UnsignedInt2101010;
>+    if (from == GL_INT_2_10_10_10_REV)
>+        return VertexAttribType::Int2101010;
>+    return VertexAttribType::InvalidEnum;
>+}
>+
>+constexpr GLenum ToGLenum(VertexAttribType from)
>+{
>+    // This could be optimized using a constexpr table.
>+    if (from == VertexAttribType::Int2101010)
>+        return GL_INT_2_10_10_10_REV;
>+    if (from == VertexAttribType::UnsignedInt2101010)
>+        return GL_UNSIGNED_INT_2_10_10_10_REV;
>+    return static_cast<GLenum>(from) + GL_BYTE;
>+}
>+
>+ANGLE_VALIDATE_PACKED_ENUM(VertexAttribType, Byte, GL_BYTE);
>+ANGLE_VALIDATE_PACKED_ENUM(VertexAttribType, UnsignedByte, GL_UNSIGNED_BYTE);
>+ANGLE_VALIDATE_PACKED_ENUM(VertexAttribType, Short, GL_SHORT);
>+ANGLE_VALIDATE_PACKED_ENUM(VertexAttribType, UnsignedShort, GL_UNSIGNED_SHORT);
>+ANGLE_VALIDATE_PACKED_ENUM(VertexAttribType, Int, GL_INT);
>+ANGLE_VALIDATE_PACKED_ENUM(VertexAttribType, UnsignedInt, GL_UNSIGNED_INT);
>+ANGLE_VALIDATE_PACKED_ENUM(VertexAttribType, Float, GL_FLOAT);
>+ANGLE_VALIDATE_PACKED_ENUM(VertexAttribType, HalfFloat, GL_HALF_FLOAT);
>+ANGLE_VALIDATE_PACKED_ENUM(VertexAttribType, Fixed, GL_FIXED);
>+ANGLE_VALIDATE_PACKED_ENUM(VertexAttribType, Int2101010, GL_INT_2_10_10_10_REV);
>+ANGLE_VALIDATE_PACKED_ENUM(VertexAttribType, UnsignedInt2101010, GL_UNSIGNED_INT_2_10_10_10_REV);
>+}  // namespace gl
>+
>+namespace egl
>+{
>+MessageType ErrorCodeToMessageType(EGLint errorCode);
>+}  // namespace egl
>+
>+namespace egl_gl
>+{
>+gl::TextureTarget EGLCubeMapTargetToCubeMapTarget(EGLenum eglTarget);
>+gl::TextureTarget EGLImageTargetToTextureTarget(EGLenum eglTarget);
>+gl::TextureType EGLTextureTargetToTextureType(EGLenum eglTarget);
>+}  // namespace egl_gl
>+
>+#endif  // COMMON_PACKEDGLENUMS_H_
>diff --git a/Source/ThirdParty/ANGLE/src/common/PackedGLEnums_autogen.cpp b/Source/ThirdParty/ANGLE/src/common/PackedGLEnums_autogen.cpp
>new file mode 100644
>index 00000000000..81eef31425e
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/common/PackedGLEnums_autogen.cpp
>@@ -0,0 +1,1322 @@
>+// GENERATED FILE - DO NOT EDIT.
>+// Generated by gen_packed_gl_enums.py using data from packed_gl_enums.json.
>+//
>+// Copyright 2019 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// PackedGLEnums_autogen.cpp:
>+//   Implements ANGLE-specific enums classes for GLenums and functions operating
>+//   on them.
>+
>+#include "common/PackedGLEnums_autogen.h"
>+#include "common/debug.h"
>+
>+namespace gl
>+{
>+
>+template <>
>+AlphaTestFunc FromGLenum<AlphaTestFunc>(GLenum from)
>+{
>+    switch (from)
>+    {
>+        case GL_ALWAYS:
>+            return AlphaTestFunc::AlwaysPass;
>+        case GL_EQUAL:
>+            return AlphaTestFunc::Equal;
>+        case GL_GEQUAL:
>+            return AlphaTestFunc::Gequal;
>+        case GL_GREATER:
>+            return AlphaTestFunc::Greater;
>+        case GL_LEQUAL:
>+            return AlphaTestFunc::Lequal;
>+        case GL_LESS:
>+            return AlphaTestFunc::Less;
>+        case GL_NEVER:
>+            return AlphaTestFunc::Never;
>+        case GL_NOTEQUAL:
>+            return AlphaTestFunc::NotEqual;
>+        default:
>+            return AlphaTestFunc::InvalidEnum;
>+    }
>+}
>+
>+GLenum ToGLenum(AlphaTestFunc from)
>+{
>+    switch (from)
>+    {
>+        case AlphaTestFunc::AlwaysPass:
>+            return GL_ALWAYS;
>+        case AlphaTestFunc::Equal:
>+            return GL_EQUAL;
>+        case AlphaTestFunc::Gequal:
>+            return GL_GEQUAL;
>+        case AlphaTestFunc::Greater:
>+            return GL_GREATER;
>+        case AlphaTestFunc::Lequal:
>+            return GL_LEQUAL;
>+        case AlphaTestFunc::Less:
>+            return GL_LESS;
>+        case AlphaTestFunc::Never:
>+            return GL_NEVER;
>+        case AlphaTestFunc::NotEqual:
>+            return GL_NOTEQUAL;
>+        default:
>+            UNREACHABLE();
>+            return 0;
>+    }
>+}
>+
>+template <>
>+BufferBinding FromGLenum<BufferBinding>(GLenum from)
>+{
>+    switch (from)
>+    {
>+        case GL_ARRAY_BUFFER:
>+            return BufferBinding::Array;
>+        case GL_ATOMIC_COUNTER_BUFFER:
>+            return BufferBinding::AtomicCounter;
>+        case GL_COPY_READ_BUFFER:
>+            return BufferBinding::CopyRead;
>+        case GL_COPY_WRITE_BUFFER:
>+            return BufferBinding::CopyWrite;
>+        case GL_DISPATCH_INDIRECT_BUFFER:
>+            return BufferBinding::DispatchIndirect;
>+        case GL_DRAW_INDIRECT_BUFFER:
>+            return BufferBinding::DrawIndirect;
>+        case GL_ELEMENT_ARRAY_BUFFER:
>+            return BufferBinding::ElementArray;
>+        case GL_PIXEL_PACK_BUFFER:
>+            return BufferBinding::PixelPack;
>+        case GL_PIXEL_UNPACK_BUFFER:
>+            return BufferBinding::PixelUnpack;
>+        case GL_SHADER_STORAGE_BUFFER:
>+            return BufferBinding::ShaderStorage;
>+        case GL_TRANSFORM_FEEDBACK_BUFFER:
>+            return BufferBinding::TransformFeedback;
>+        case GL_UNIFORM_BUFFER:
>+            return BufferBinding::Uniform;
>+        default:
>+            return BufferBinding::InvalidEnum;
>+    }
>+}
>+
>+GLenum ToGLenum(BufferBinding from)
>+{
>+    switch (from)
>+    {
>+        case BufferBinding::Array:
>+            return GL_ARRAY_BUFFER;
>+        case BufferBinding::AtomicCounter:
>+            return GL_ATOMIC_COUNTER_BUFFER;
>+        case BufferBinding::CopyRead:
>+            return GL_COPY_READ_BUFFER;
>+        case BufferBinding::CopyWrite:
>+            return GL_COPY_WRITE_BUFFER;
>+        case BufferBinding::DispatchIndirect:
>+            return GL_DISPATCH_INDIRECT_BUFFER;
>+        case BufferBinding::DrawIndirect:
>+            return GL_DRAW_INDIRECT_BUFFER;
>+        case BufferBinding::ElementArray:
>+            return GL_ELEMENT_ARRAY_BUFFER;
>+        case BufferBinding::PixelPack:
>+            return GL_PIXEL_PACK_BUFFER;
>+        case BufferBinding::PixelUnpack:
>+            return GL_PIXEL_UNPACK_BUFFER;
>+        case BufferBinding::ShaderStorage:
>+            return GL_SHADER_STORAGE_BUFFER;
>+        case BufferBinding::TransformFeedback:
>+            return GL_TRANSFORM_FEEDBACK_BUFFER;
>+        case BufferBinding::Uniform:
>+            return GL_UNIFORM_BUFFER;
>+        default:
>+            UNREACHABLE();
>+            return 0;
>+    }
>+}
>+
>+template <>
>+BufferUsage FromGLenum<BufferUsage>(GLenum from)
>+{
>+    switch (from)
>+    {
>+        case GL_DYNAMIC_COPY:
>+            return BufferUsage::DynamicCopy;
>+        case GL_DYNAMIC_DRAW:
>+            return BufferUsage::DynamicDraw;
>+        case GL_DYNAMIC_READ:
>+            return BufferUsage::DynamicRead;
>+        case GL_STATIC_COPY:
>+            return BufferUsage::StaticCopy;
>+        case GL_STATIC_DRAW:
>+            return BufferUsage::StaticDraw;
>+        case GL_STATIC_READ:
>+            return BufferUsage::StaticRead;
>+        case GL_STREAM_COPY:
>+            return BufferUsage::StreamCopy;
>+        case GL_STREAM_DRAW:
>+            return BufferUsage::StreamDraw;
>+        case GL_STREAM_READ:
>+            return BufferUsage::StreamRead;
>+        default:
>+            return BufferUsage::InvalidEnum;
>+    }
>+}
>+
>+GLenum ToGLenum(BufferUsage from)
>+{
>+    switch (from)
>+    {
>+        case BufferUsage::DynamicCopy:
>+            return GL_DYNAMIC_COPY;
>+        case BufferUsage::DynamicDraw:
>+            return GL_DYNAMIC_DRAW;
>+        case BufferUsage::DynamicRead:
>+            return GL_DYNAMIC_READ;
>+        case BufferUsage::StaticCopy:
>+            return GL_STATIC_COPY;
>+        case BufferUsage::StaticDraw:
>+            return GL_STATIC_DRAW;
>+        case BufferUsage::StaticRead:
>+            return GL_STATIC_READ;
>+        case BufferUsage::StreamCopy:
>+            return GL_STREAM_COPY;
>+        case BufferUsage::StreamDraw:
>+            return GL_STREAM_DRAW;
>+        case BufferUsage::StreamRead:
>+            return GL_STREAM_READ;
>+        default:
>+            UNREACHABLE();
>+            return 0;
>+    }
>+}
>+
>+template <>
>+ClientVertexArrayType FromGLenum<ClientVertexArrayType>(GLenum from)
>+{
>+    switch (from)
>+    {
>+        case GL_COLOR_ARRAY:
>+            return ClientVertexArrayType::Color;
>+        case GL_NORMAL_ARRAY:
>+            return ClientVertexArrayType::Normal;
>+        case GL_POINT_SIZE_ARRAY_OES:
>+            return ClientVertexArrayType::PointSize;
>+        case GL_TEXTURE_COORD_ARRAY:
>+            return ClientVertexArrayType::TextureCoord;
>+        case GL_VERTEX_ARRAY:
>+            return ClientVertexArrayType::Vertex;
>+        default:
>+            return ClientVertexArrayType::InvalidEnum;
>+    }
>+}
>+
>+GLenum ToGLenum(ClientVertexArrayType from)
>+{
>+    switch (from)
>+    {
>+        case ClientVertexArrayType::Color:
>+            return GL_COLOR_ARRAY;
>+        case ClientVertexArrayType::Normal:
>+            return GL_NORMAL_ARRAY;
>+        case ClientVertexArrayType::PointSize:
>+            return GL_POINT_SIZE_ARRAY_OES;
>+        case ClientVertexArrayType::TextureCoord:
>+            return GL_TEXTURE_COORD_ARRAY;
>+        case ClientVertexArrayType::Vertex:
>+            return GL_VERTEX_ARRAY;
>+        default:
>+            UNREACHABLE();
>+            return 0;
>+    }
>+}
>+
>+template <>
>+CullFaceMode FromGLenum<CullFaceMode>(GLenum from)
>+{
>+    switch (from)
>+    {
>+        case GL_BACK:
>+            return CullFaceMode::Back;
>+        case GL_FRONT:
>+            return CullFaceMode::Front;
>+        case GL_FRONT_AND_BACK:
>+            return CullFaceMode::FrontAndBack;
>+        default:
>+            return CullFaceMode::InvalidEnum;
>+    }
>+}
>+
>+GLenum ToGLenum(CullFaceMode from)
>+{
>+    switch (from)
>+    {
>+        case CullFaceMode::Back:
>+            return GL_BACK;
>+        case CullFaceMode::Front:
>+            return GL_FRONT;
>+        case CullFaceMode::FrontAndBack:
>+            return GL_FRONT_AND_BACK;
>+        default:
>+            UNREACHABLE();
>+            return 0;
>+    }
>+}
>+
>+template <>
>+FilterMode FromGLenum<FilterMode>(GLenum from)
>+{
>+    switch (from)
>+    {
>+        case GL_NEAREST:
>+            return FilterMode::Nearest;
>+        case GL_LINEAR:
>+            return FilterMode::Linear;
>+        case GL_NEAREST_MIPMAP_NEAREST:
>+            return FilterMode::NearestMipmapNearest;
>+        case GL_NEAREST_MIPMAP_LINEAR:
>+            return FilterMode::NearestMipmapLinear;
>+        case GL_LINEAR_MIPMAP_LINEAR:
>+            return FilterMode::LinearMipmapLinear;
>+        default:
>+            return FilterMode::InvalidEnum;
>+    }
>+}
>+
>+GLenum ToGLenum(FilterMode from)
>+{
>+    switch (from)
>+    {
>+        case FilterMode::Nearest:
>+            return GL_NEAREST;
>+        case FilterMode::Linear:
>+            return GL_LINEAR;
>+        case FilterMode::NearestMipmapNearest:
>+            return GL_NEAREST_MIPMAP_NEAREST;
>+        case FilterMode::NearestMipmapLinear:
>+            return GL_NEAREST_MIPMAP_LINEAR;
>+        case FilterMode::LinearMipmapLinear:
>+            return GL_LINEAR_MIPMAP_LINEAR;
>+        default:
>+            UNREACHABLE();
>+            return 0;
>+    }
>+}
>+
>+template <>
>+FogMode FromGLenum<FogMode>(GLenum from)
>+{
>+    switch (from)
>+    {
>+        case GL_EXP:
>+            return FogMode::Exp;
>+        case GL_EXP2:
>+            return FogMode::Exp2;
>+        case GL_LINEAR:
>+            return FogMode::Linear;
>+        default:
>+            return FogMode::InvalidEnum;
>+    }
>+}
>+
>+GLenum ToGLenum(FogMode from)
>+{
>+    switch (from)
>+    {
>+        case FogMode::Exp:
>+            return GL_EXP;
>+        case FogMode::Exp2:
>+            return GL_EXP2;
>+        case FogMode::Linear:
>+            return GL_LINEAR;
>+        default:
>+            UNREACHABLE();
>+            return 0;
>+    }
>+}
>+
>+template <>
>+GraphicsResetStatus FromGLenum<GraphicsResetStatus>(GLenum from)
>+{
>+    switch (from)
>+    {
>+        case GL_NO_ERROR:
>+            return GraphicsResetStatus::NoError;
>+        case GL_GUILTY_CONTEXT_RESET:
>+            return GraphicsResetStatus::GuiltyContextReset;
>+        case GL_INNOCENT_CONTEXT_RESET:
>+            return GraphicsResetStatus::InnocentContextReset;
>+        case GL_UNKNOWN_CONTEXT_RESET:
>+            return GraphicsResetStatus::UnknownContextReset;
>+        default:
>+            return GraphicsResetStatus::InvalidEnum;
>+    }
>+}
>+
>+GLenum ToGLenum(GraphicsResetStatus from)
>+{
>+    switch (from)
>+    {
>+        case GraphicsResetStatus::NoError:
>+            return GL_NO_ERROR;
>+        case GraphicsResetStatus::GuiltyContextReset:
>+            return GL_GUILTY_CONTEXT_RESET;
>+        case GraphicsResetStatus::InnocentContextReset:
>+            return GL_INNOCENT_CONTEXT_RESET;
>+        case GraphicsResetStatus::UnknownContextReset:
>+            return GL_UNKNOWN_CONTEXT_RESET;
>+        default:
>+            UNREACHABLE();
>+            return 0;
>+    }
>+}
>+
>+template <>
>+HandleType FromGLenum<HandleType>(GLenum from)
>+{
>+    switch (from)
>+    {
>+        case GL_HANDLE_TYPE_OPAQUE_FD_EXT:
>+            return HandleType::OpaqueFd;
>+        default:
>+            return HandleType::InvalidEnum;
>+    }
>+}
>+
>+GLenum ToGLenum(HandleType from)
>+{
>+    switch (from)
>+    {
>+        case HandleType::OpaqueFd:
>+            return GL_HANDLE_TYPE_OPAQUE_FD_EXT;
>+        default:
>+            UNREACHABLE();
>+            return 0;
>+    }
>+}
>+
>+template <>
>+HintSetting FromGLenum<HintSetting>(GLenum from)
>+{
>+    switch (from)
>+    {
>+        case GL_DONT_CARE:
>+            return HintSetting::DontCare;
>+        case GL_FASTEST:
>+            return HintSetting::Fastest;
>+        case GL_NICEST:
>+            return HintSetting::Nicest;
>+        default:
>+            return HintSetting::InvalidEnum;
>+    }
>+}
>+
>+GLenum ToGLenum(HintSetting from)
>+{
>+    switch (from)
>+    {
>+        case HintSetting::DontCare:
>+            return GL_DONT_CARE;
>+        case HintSetting::Fastest:
>+            return GL_FASTEST;
>+        case HintSetting::Nicest:
>+            return GL_NICEST;
>+        default:
>+            UNREACHABLE();
>+            return 0;
>+    }
>+}
>+
>+template <>
>+LightParameter FromGLenum<LightParameter>(GLenum from)
>+{
>+    switch (from)
>+    {
>+        case GL_AMBIENT:
>+            return LightParameter::Ambient;
>+        case GL_AMBIENT_AND_DIFFUSE:
>+            return LightParameter::AmbientAndDiffuse;
>+        case GL_CONSTANT_ATTENUATION:
>+            return LightParameter::ConstantAttenuation;
>+        case GL_DIFFUSE:
>+            return LightParameter::Diffuse;
>+        case GL_LINEAR_ATTENUATION:
>+            return LightParameter::LinearAttenuation;
>+        case GL_POSITION:
>+            return LightParameter::Position;
>+        case GL_QUADRATIC_ATTENUATION:
>+            return LightParameter::QuadraticAttenuation;
>+        case GL_SPECULAR:
>+            return LightParameter::Specular;
>+        case GL_SPOT_CUTOFF:
>+            return LightParameter::SpotCutoff;
>+        case GL_SPOT_DIRECTION:
>+            return LightParameter::SpotDirection;
>+        case GL_SPOT_EXPONENT:
>+            return LightParameter::SpotExponent;
>+        default:
>+            return LightParameter::InvalidEnum;
>+    }
>+}
>+
>+GLenum ToGLenum(LightParameter from)
>+{
>+    switch (from)
>+    {
>+        case LightParameter::Ambient:
>+            return GL_AMBIENT;
>+        case LightParameter::AmbientAndDiffuse:
>+            return GL_AMBIENT_AND_DIFFUSE;
>+        case LightParameter::ConstantAttenuation:
>+            return GL_CONSTANT_ATTENUATION;
>+        case LightParameter::Diffuse:
>+            return GL_DIFFUSE;
>+        case LightParameter::LinearAttenuation:
>+            return GL_LINEAR_ATTENUATION;
>+        case LightParameter::Position:
>+            return GL_POSITION;
>+        case LightParameter::QuadraticAttenuation:
>+            return GL_QUADRATIC_ATTENUATION;
>+        case LightParameter::Specular:
>+            return GL_SPECULAR;
>+        case LightParameter::SpotCutoff:
>+            return GL_SPOT_CUTOFF;
>+        case LightParameter::SpotDirection:
>+            return GL_SPOT_DIRECTION;
>+        case LightParameter::SpotExponent:
>+            return GL_SPOT_EXPONENT;
>+        default:
>+            UNREACHABLE();
>+            return 0;
>+    }
>+}
>+
>+template <>
>+LogicalOperation FromGLenum<LogicalOperation>(GLenum from)
>+{
>+    switch (from)
>+    {
>+        case GL_AND:
>+            return LogicalOperation::And;
>+        case GL_AND_INVERTED:
>+            return LogicalOperation::AndInverted;
>+        case GL_AND_REVERSE:
>+            return LogicalOperation::AndReverse;
>+        case GL_CLEAR:
>+            return LogicalOperation::Clear;
>+        case GL_COPY:
>+            return LogicalOperation::Copy;
>+        case GL_COPY_INVERTED:
>+            return LogicalOperation::CopyInverted;
>+        case GL_EQUIV:
>+            return LogicalOperation::Equiv;
>+        case GL_INVERT:
>+            return LogicalOperation::Invert;
>+        case GL_NAND:
>+            return LogicalOperation::Nand;
>+        case GL_NOOP:
>+            return LogicalOperation::Noop;
>+        case GL_NOR:
>+            return LogicalOperation::Nor;
>+        case GL_OR:
>+            return LogicalOperation::Or;
>+        case GL_OR_INVERTED:
>+            return LogicalOperation::OrInverted;
>+        case GL_OR_REVERSE:
>+            return LogicalOperation::OrReverse;
>+        case GL_SET:
>+            return LogicalOperation::Set;
>+        case GL_XOR:
>+            return LogicalOperation::Xor;
>+        default:
>+            return LogicalOperation::InvalidEnum;
>+    }
>+}
>+
>+GLenum ToGLenum(LogicalOperation from)
>+{
>+    switch (from)
>+    {
>+        case LogicalOperation::And:
>+            return GL_AND;
>+        case LogicalOperation::AndInverted:
>+            return GL_AND_INVERTED;
>+        case LogicalOperation::AndReverse:
>+            return GL_AND_REVERSE;
>+        case LogicalOperation::Clear:
>+            return GL_CLEAR;
>+        case LogicalOperation::Copy:
>+            return GL_COPY;
>+        case LogicalOperation::CopyInverted:
>+            return GL_COPY_INVERTED;
>+        case LogicalOperation::Equiv:
>+            return GL_EQUIV;
>+        case LogicalOperation::Invert:
>+            return GL_INVERT;
>+        case LogicalOperation::Nand:
>+            return GL_NAND;
>+        case LogicalOperation::Noop:
>+            return GL_NOOP;
>+        case LogicalOperation::Nor:
>+            return GL_NOR;
>+        case LogicalOperation::Or:
>+            return GL_OR;
>+        case LogicalOperation::OrInverted:
>+            return GL_OR_INVERTED;
>+        case LogicalOperation::OrReverse:
>+            return GL_OR_REVERSE;
>+        case LogicalOperation::Set:
>+            return GL_SET;
>+        case LogicalOperation::Xor:
>+            return GL_XOR;
>+        default:
>+            UNREACHABLE();
>+            return 0;
>+    }
>+}
>+
>+template <>
>+MaterialParameter FromGLenum<MaterialParameter>(GLenum from)
>+{
>+    switch (from)
>+    {
>+        case GL_AMBIENT:
>+            return MaterialParameter::Ambient;
>+        case GL_AMBIENT_AND_DIFFUSE:
>+            return MaterialParameter::AmbientAndDiffuse;
>+        case GL_DIFFUSE:
>+            return MaterialParameter::Diffuse;
>+        case GL_EMISSION:
>+            return MaterialParameter::Emission;
>+        case GL_SHININESS:
>+            return MaterialParameter::Shininess;
>+        case GL_SPECULAR:
>+            return MaterialParameter::Specular;
>+        default:
>+            return MaterialParameter::InvalidEnum;
>+    }
>+}
>+
>+GLenum ToGLenum(MaterialParameter from)
>+{
>+    switch (from)
>+    {
>+        case MaterialParameter::Ambient:
>+            return GL_AMBIENT;
>+        case MaterialParameter::AmbientAndDiffuse:
>+            return GL_AMBIENT_AND_DIFFUSE;
>+        case MaterialParameter::Diffuse:
>+            return GL_DIFFUSE;
>+        case MaterialParameter::Emission:
>+            return GL_EMISSION;
>+        case MaterialParameter::Shininess:
>+            return GL_SHININESS;
>+        case MaterialParameter::Specular:
>+            return GL_SPECULAR;
>+        default:
>+            UNREACHABLE();
>+            return 0;
>+    }
>+}
>+
>+template <>
>+MatrixType FromGLenum<MatrixType>(GLenum from)
>+{
>+    switch (from)
>+    {
>+        case GL_MODELVIEW:
>+            return MatrixType::Modelview;
>+        case GL_PROJECTION:
>+            return MatrixType::Projection;
>+        case GL_TEXTURE:
>+            return MatrixType::Texture;
>+        default:
>+            return MatrixType::InvalidEnum;
>+    }
>+}
>+
>+GLenum ToGLenum(MatrixType from)
>+{
>+    switch (from)
>+    {
>+        case MatrixType::Modelview:
>+            return GL_MODELVIEW;
>+        case MatrixType::Projection:
>+            return GL_PROJECTION;
>+        case MatrixType::Texture:
>+            return GL_TEXTURE;
>+        default:
>+            UNREACHABLE();
>+            return 0;
>+    }
>+}
>+
>+template <>
>+PointParameter FromGLenum<PointParameter>(GLenum from)
>+{
>+    switch (from)
>+    {
>+        case GL_POINT_SIZE_MIN:
>+            return PointParameter::PointSizeMin;
>+        case GL_POINT_SIZE_MAX:
>+            return PointParameter::PointSizeMax;
>+        case GL_POINT_FADE_THRESHOLD_SIZE:
>+            return PointParameter::PointFadeThresholdSize;
>+        case GL_POINT_DISTANCE_ATTENUATION:
>+            return PointParameter::PointDistanceAttenuation;
>+        default:
>+            return PointParameter::InvalidEnum;
>+    }
>+}
>+
>+GLenum ToGLenum(PointParameter from)
>+{
>+    switch (from)
>+    {
>+        case PointParameter::PointSizeMin:
>+            return GL_POINT_SIZE_MIN;
>+        case PointParameter::PointSizeMax:
>+            return GL_POINT_SIZE_MAX;
>+        case PointParameter::PointFadeThresholdSize:
>+            return GL_POINT_FADE_THRESHOLD_SIZE;
>+        case PointParameter::PointDistanceAttenuation:
>+            return GL_POINT_DISTANCE_ATTENUATION;
>+        default:
>+            UNREACHABLE();
>+            return 0;
>+    }
>+}
>+
>+template <>
>+ProvokingVertex FromGLenum<ProvokingVertex>(GLenum from)
>+{
>+    switch (from)
>+    {
>+        case GL_FIRST_VERTEX_CONVENTION:
>+            return ProvokingVertex::FirstVertexConvention;
>+        case GL_LAST_VERTEX_CONVENTION:
>+            return ProvokingVertex::LastVertexConvention;
>+        default:
>+            return ProvokingVertex::InvalidEnum;
>+    }
>+}
>+
>+GLenum ToGLenum(ProvokingVertex from)
>+{
>+    switch (from)
>+    {
>+        case ProvokingVertex::FirstVertexConvention:
>+            return GL_FIRST_VERTEX_CONVENTION;
>+        case ProvokingVertex::LastVertexConvention:
>+            return GL_LAST_VERTEX_CONVENTION;
>+        default:
>+            UNREACHABLE();
>+            return 0;
>+    }
>+}
>+
>+template <>
>+QueryType FromGLenum<QueryType>(GLenum from)
>+{
>+    switch (from)
>+    {
>+        case GL_ANY_SAMPLES_PASSED:
>+            return QueryType::AnySamples;
>+        case GL_ANY_SAMPLES_PASSED_CONSERVATIVE:
>+            return QueryType::AnySamplesConservative;
>+        case GL_COMMANDS_COMPLETED_CHROMIUM:
>+            return QueryType::CommandsCompleted;
>+        case GL_PRIMITIVES_GENERATED_EXT:
>+            return QueryType::PrimitivesGenerated;
>+        case GL_TIME_ELAPSED_EXT:
>+            return QueryType::TimeElapsed;
>+        case GL_TIMESTAMP_EXT:
>+            return QueryType::Timestamp;
>+        case GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN:
>+            return QueryType::TransformFeedbackPrimitivesWritten;
>+        default:
>+            return QueryType::InvalidEnum;
>+    }
>+}
>+
>+GLenum ToGLenum(QueryType from)
>+{
>+    switch (from)
>+    {
>+        case QueryType::AnySamples:
>+            return GL_ANY_SAMPLES_PASSED;
>+        case QueryType::AnySamplesConservative:
>+            return GL_ANY_SAMPLES_PASSED_CONSERVATIVE;
>+        case QueryType::CommandsCompleted:
>+            return GL_COMMANDS_COMPLETED_CHROMIUM;
>+        case QueryType::PrimitivesGenerated:
>+            return GL_PRIMITIVES_GENERATED_EXT;
>+        case QueryType::TimeElapsed:
>+            return GL_TIME_ELAPSED_EXT;
>+        case QueryType::Timestamp:
>+            return GL_TIMESTAMP_EXT;
>+        case QueryType::TransformFeedbackPrimitivesWritten:
>+            return GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN;
>+        default:
>+            UNREACHABLE();
>+            return 0;
>+    }
>+}
>+
>+template <>
>+ShaderType FromGLenum<ShaderType>(GLenum from)
>+{
>+    switch (from)
>+    {
>+        case GL_VERTEX_SHADER:
>+            return ShaderType::Vertex;
>+        case GL_FRAGMENT_SHADER:
>+            return ShaderType::Fragment;
>+        case GL_GEOMETRY_SHADER_EXT:
>+            return ShaderType::Geometry;
>+        case GL_COMPUTE_SHADER:
>+            return ShaderType::Compute;
>+        default:
>+            return ShaderType::InvalidEnum;
>+    }
>+}
>+
>+GLenum ToGLenum(ShaderType from)
>+{
>+    switch (from)
>+    {
>+        case ShaderType::Vertex:
>+            return GL_VERTEX_SHADER;
>+        case ShaderType::Fragment:
>+            return GL_FRAGMENT_SHADER;
>+        case ShaderType::Geometry:
>+            return GL_GEOMETRY_SHADER_EXT;
>+        case ShaderType::Compute:
>+            return GL_COMPUTE_SHADER;
>+        default:
>+            UNREACHABLE();
>+            return 0;
>+    }
>+}
>+
>+template <>
>+ShadingModel FromGLenum<ShadingModel>(GLenum from)
>+{
>+    switch (from)
>+    {
>+        case GL_FLAT:
>+            return ShadingModel::Flat;
>+        case GL_SMOOTH:
>+            return ShadingModel::Smooth;
>+        default:
>+            return ShadingModel::InvalidEnum;
>+    }
>+}
>+
>+GLenum ToGLenum(ShadingModel from)
>+{
>+    switch (from)
>+    {
>+        case ShadingModel::Flat:
>+            return GL_FLAT;
>+        case ShadingModel::Smooth:
>+            return GL_SMOOTH;
>+        default:
>+            UNREACHABLE();
>+            return 0;
>+    }
>+}
>+
>+template <>
>+TextureCombine FromGLenum<TextureCombine>(GLenum from)
>+{
>+    switch (from)
>+    {
>+        case GL_ADD:
>+            return TextureCombine::Add;
>+        case GL_ADD_SIGNED:
>+            return TextureCombine::AddSigned;
>+        case GL_DOT3_RGB:
>+            return TextureCombine::Dot3Rgb;
>+        case GL_DOT3_RGBA:
>+            return TextureCombine::Dot3Rgba;
>+        case GL_INTERPOLATE:
>+            return TextureCombine::Interpolate;
>+        case GL_MODULATE:
>+            return TextureCombine::Modulate;
>+        case GL_REPLACE:
>+            return TextureCombine::Replace;
>+        case GL_SUBTRACT:
>+            return TextureCombine::Subtract;
>+        default:
>+            return TextureCombine::InvalidEnum;
>+    }
>+}
>+
>+GLenum ToGLenum(TextureCombine from)
>+{
>+    switch (from)
>+    {
>+        case TextureCombine::Add:
>+            return GL_ADD;
>+        case TextureCombine::AddSigned:
>+            return GL_ADD_SIGNED;
>+        case TextureCombine::Dot3Rgb:
>+            return GL_DOT3_RGB;
>+        case TextureCombine::Dot3Rgba:
>+            return GL_DOT3_RGBA;
>+        case TextureCombine::Interpolate:
>+            return GL_INTERPOLATE;
>+        case TextureCombine::Modulate:
>+            return GL_MODULATE;
>+        case TextureCombine::Replace:
>+            return GL_REPLACE;
>+        case TextureCombine::Subtract:
>+            return GL_SUBTRACT;
>+        default:
>+            UNREACHABLE();
>+            return 0;
>+    }
>+}
>+
>+template <>
>+TextureEnvMode FromGLenum<TextureEnvMode>(GLenum from)
>+{
>+    switch (from)
>+    {
>+        case GL_ADD:
>+            return TextureEnvMode::Add;
>+        case GL_BLEND:
>+            return TextureEnvMode::Blend;
>+        case GL_COMBINE:
>+            return TextureEnvMode::Combine;
>+        case GL_DECAL:
>+            return TextureEnvMode::Decal;
>+        case GL_MODULATE:
>+            return TextureEnvMode::Modulate;
>+        case GL_REPLACE:
>+            return TextureEnvMode::Replace;
>+        default:
>+            return TextureEnvMode::InvalidEnum;
>+    }
>+}
>+
>+GLenum ToGLenum(TextureEnvMode from)
>+{
>+    switch (from)
>+    {
>+        case TextureEnvMode::Add:
>+            return GL_ADD;
>+        case TextureEnvMode::Blend:
>+            return GL_BLEND;
>+        case TextureEnvMode::Combine:
>+            return GL_COMBINE;
>+        case TextureEnvMode::Decal:
>+            return GL_DECAL;
>+        case TextureEnvMode::Modulate:
>+            return GL_MODULATE;
>+        case TextureEnvMode::Replace:
>+            return GL_REPLACE;
>+        default:
>+            UNREACHABLE();
>+            return 0;
>+    }
>+}
>+
>+template <>
>+TextureEnvParameter FromGLenum<TextureEnvParameter>(GLenum from)
>+{
>+    switch (from)
>+    {
>+        case GL_TEXTURE_ENV_MODE:
>+            return TextureEnvParameter::Mode;
>+        case GL_TEXTURE_ENV_COLOR:
>+            return TextureEnvParameter::Color;
>+        case GL_COMBINE_RGB:
>+            return TextureEnvParameter::CombineRgb;
>+        case GL_COMBINE_ALPHA:
>+            return TextureEnvParameter::CombineAlpha;
>+        case GL_RGB_SCALE:
>+            return TextureEnvParameter::RgbScale;
>+        case GL_ALPHA_SCALE:
>+            return TextureEnvParameter::AlphaScale;
>+        case GL_SRC0_RGB:
>+            return TextureEnvParameter::Src0Rgb;
>+        case GL_SRC1_RGB:
>+            return TextureEnvParameter::Src1Rgb;
>+        case GL_SRC2_RGB:
>+            return TextureEnvParameter::Src2Rgb;
>+        case GL_SRC0_ALPHA:
>+            return TextureEnvParameter::Src0Alpha;
>+        case GL_SRC1_ALPHA:
>+            return TextureEnvParameter::Src1Alpha;
>+        case GL_SRC2_ALPHA:
>+            return TextureEnvParameter::Src2Alpha;
>+        case GL_OPERAND0_RGB:
>+            return TextureEnvParameter::Op0Rgb;
>+        case GL_OPERAND1_RGB:
>+            return TextureEnvParameter::Op1Rgb;
>+        case GL_OPERAND2_RGB:
>+            return TextureEnvParameter::Op2Rgb;
>+        case GL_OPERAND0_ALPHA:
>+            return TextureEnvParameter::Op0Alpha;
>+        case GL_OPERAND1_ALPHA:
>+            return TextureEnvParameter::Op1Alpha;
>+        case GL_OPERAND2_ALPHA:
>+            return TextureEnvParameter::Op2Alpha;
>+        case GL_COORD_REPLACE_OES:
>+            return TextureEnvParameter::PointCoordReplace;
>+        default:
>+            return TextureEnvParameter::InvalidEnum;
>+    }
>+}
>+
>+GLenum ToGLenum(TextureEnvParameter from)
>+{
>+    switch (from)
>+    {
>+        case TextureEnvParameter::Mode:
>+            return GL_TEXTURE_ENV_MODE;
>+        case TextureEnvParameter::Color:
>+            return GL_TEXTURE_ENV_COLOR;
>+        case TextureEnvParameter::CombineRgb:
>+            return GL_COMBINE_RGB;
>+        case TextureEnvParameter::CombineAlpha:
>+            return GL_COMBINE_ALPHA;
>+        case TextureEnvParameter::RgbScale:
>+            return GL_RGB_SCALE;
>+        case TextureEnvParameter::AlphaScale:
>+            return GL_ALPHA_SCALE;
>+        case TextureEnvParameter::Src0Rgb:
>+            return GL_SRC0_RGB;
>+        case TextureEnvParameter::Src1Rgb:
>+            return GL_SRC1_RGB;
>+        case TextureEnvParameter::Src2Rgb:
>+            return GL_SRC2_RGB;
>+        case TextureEnvParameter::Src0Alpha:
>+            return GL_SRC0_ALPHA;
>+        case TextureEnvParameter::Src1Alpha:
>+            return GL_SRC1_ALPHA;
>+        case TextureEnvParameter::Src2Alpha:
>+            return GL_SRC2_ALPHA;
>+        case TextureEnvParameter::Op0Rgb:
>+            return GL_OPERAND0_RGB;
>+        case TextureEnvParameter::Op1Rgb:
>+            return GL_OPERAND1_RGB;
>+        case TextureEnvParameter::Op2Rgb:
>+            return GL_OPERAND2_RGB;
>+        case TextureEnvParameter::Op0Alpha:
>+            return GL_OPERAND0_ALPHA;
>+        case TextureEnvParameter::Op1Alpha:
>+            return GL_OPERAND1_ALPHA;
>+        case TextureEnvParameter::Op2Alpha:
>+            return GL_OPERAND2_ALPHA;
>+        case TextureEnvParameter::PointCoordReplace:
>+            return GL_COORD_REPLACE_OES;
>+        default:
>+            UNREACHABLE();
>+            return 0;
>+    }
>+}
>+
>+template <>
>+TextureEnvTarget FromGLenum<TextureEnvTarget>(GLenum from)
>+{
>+    switch (from)
>+    {
>+        case GL_TEXTURE_ENV:
>+            return TextureEnvTarget::Env;
>+        case GL_POINT_SPRITE_OES:
>+            return TextureEnvTarget::PointSprite;
>+        default:
>+            return TextureEnvTarget::InvalidEnum;
>+    }
>+}
>+
>+GLenum ToGLenum(TextureEnvTarget from)
>+{
>+    switch (from)
>+    {
>+        case TextureEnvTarget::Env:
>+            return GL_TEXTURE_ENV;
>+        case TextureEnvTarget::PointSprite:
>+            return GL_POINT_SPRITE_OES;
>+        default:
>+            UNREACHABLE();
>+            return 0;
>+    }
>+}
>+
>+template <>
>+TextureOp FromGLenum<TextureOp>(GLenum from)
>+{
>+    switch (from)
>+    {
>+        case GL_ONE_MINUS_SRC_ALPHA:
>+            return TextureOp::OneMinusSrcAlpha;
>+        case GL_ONE_MINUS_SRC_COLOR:
>+            return TextureOp::OneMinusSrcColor;
>+        case GL_SRC_ALPHA:
>+            return TextureOp::SrcAlpha;
>+        case GL_SRC_COLOR:
>+            return TextureOp::SrcColor;
>+        default:
>+            return TextureOp::InvalidEnum;
>+    }
>+}
>+
>+GLenum ToGLenum(TextureOp from)
>+{
>+    switch (from)
>+    {
>+        case TextureOp::OneMinusSrcAlpha:
>+            return GL_ONE_MINUS_SRC_ALPHA;
>+        case TextureOp::OneMinusSrcColor:
>+            return GL_ONE_MINUS_SRC_COLOR;
>+        case TextureOp::SrcAlpha:
>+            return GL_SRC_ALPHA;
>+        case TextureOp::SrcColor:
>+            return GL_SRC_COLOR;
>+        default:
>+            UNREACHABLE();
>+            return 0;
>+    }
>+}
>+
>+template <>
>+TextureSrc FromGLenum<TextureSrc>(GLenum from)
>+{
>+    switch (from)
>+    {
>+        case GL_CONSTANT:
>+            return TextureSrc::Constant;
>+        case GL_PREVIOUS:
>+            return TextureSrc::Previous;
>+        case GL_PRIMARY_COLOR:
>+            return TextureSrc::PrimaryColor;
>+        case GL_TEXTURE:
>+            return TextureSrc::Texture;
>+        default:
>+            return TextureSrc::InvalidEnum;
>+    }
>+}
>+
>+GLenum ToGLenum(TextureSrc from)
>+{
>+    switch (from)
>+    {
>+        case TextureSrc::Constant:
>+            return GL_CONSTANT;
>+        case TextureSrc::Previous:
>+            return GL_PREVIOUS;
>+        case TextureSrc::PrimaryColor:
>+            return GL_PRIMARY_COLOR;
>+        case TextureSrc::Texture:
>+            return GL_TEXTURE;
>+        default:
>+            UNREACHABLE();
>+            return 0;
>+    }
>+}
>+
>+template <>
>+TextureTarget FromGLenum<TextureTarget>(GLenum from)
>+{
>+    switch (from)
>+    {
>+        case GL_TEXTURE_2D:
>+            return TextureTarget::_2D;
>+        case GL_TEXTURE_2D_ARRAY:
>+            return TextureTarget::_2DArray;
>+        case GL_TEXTURE_2D_MULTISAMPLE:
>+            return TextureTarget::_2DMultisample;
>+        case GL_TEXTURE_2D_MULTISAMPLE_ARRAY_OES:
>+            return TextureTarget::_2DMultisampleArray;
>+        case GL_TEXTURE_3D:
>+            return TextureTarget::_3D;
>+        case GL_TEXTURE_EXTERNAL_OES:
>+            return TextureTarget::External;
>+        case GL_TEXTURE_RECTANGLE_ANGLE:
>+            return TextureTarget::Rectangle;
>+        case GL_TEXTURE_CUBE_MAP_POSITIVE_X:
>+            return TextureTarget::CubeMapPositiveX;
>+        case GL_TEXTURE_CUBE_MAP_NEGATIVE_X:
>+            return TextureTarget::CubeMapNegativeX;
>+        case GL_TEXTURE_CUBE_MAP_POSITIVE_Y:
>+            return TextureTarget::CubeMapPositiveY;
>+        case GL_TEXTURE_CUBE_MAP_NEGATIVE_Y:
>+            return TextureTarget::CubeMapNegativeY;
>+        case GL_TEXTURE_CUBE_MAP_POSITIVE_Z:
>+            return TextureTarget::CubeMapPositiveZ;
>+        case GL_TEXTURE_CUBE_MAP_NEGATIVE_Z:
>+            return TextureTarget::CubeMapNegativeZ;
>+        default:
>+            return TextureTarget::InvalidEnum;
>+    }
>+}
>+
>+GLenum ToGLenum(TextureTarget from)
>+{
>+    switch (from)
>+    {
>+        case TextureTarget::_2D:
>+            return GL_TEXTURE_2D;
>+        case TextureTarget::_2DArray:
>+            return GL_TEXTURE_2D_ARRAY;
>+        case TextureTarget::_2DMultisample:
>+            return GL_TEXTURE_2D_MULTISAMPLE;
>+        case TextureTarget::_2DMultisampleArray:
>+            return GL_TEXTURE_2D_MULTISAMPLE_ARRAY_OES;
>+        case TextureTarget::_3D:
>+            return GL_TEXTURE_3D;
>+        case TextureTarget::External:
>+            return GL_TEXTURE_EXTERNAL_OES;
>+        case TextureTarget::Rectangle:
>+            return GL_TEXTURE_RECTANGLE_ANGLE;
>+        case TextureTarget::CubeMapPositiveX:
>+            return GL_TEXTURE_CUBE_MAP_POSITIVE_X;
>+        case TextureTarget::CubeMapNegativeX:
>+            return GL_TEXTURE_CUBE_MAP_NEGATIVE_X;
>+        case TextureTarget::CubeMapPositiveY:
>+            return GL_TEXTURE_CUBE_MAP_POSITIVE_Y;
>+        case TextureTarget::CubeMapNegativeY:
>+            return GL_TEXTURE_CUBE_MAP_NEGATIVE_Y;
>+        case TextureTarget::CubeMapPositiveZ:
>+            return GL_TEXTURE_CUBE_MAP_POSITIVE_Z;
>+        case TextureTarget::CubeMapNegativeZ:
>+            return GL_TEXTURE_CUBE_MAP_NEGATIVE_Z;
>+        default:
>+            UNREACHABLE();
>+            return 0;
>+    }
>+}
>+
>+template <>
>+TextureType FromGLenum<TextureType>(GLenum from)
>+{
>+    switch (from)
>+    {
>+        case GL_TEXTURE_2D:
>+            return TextureType::_2D;
>+        case GL_TEXTURE_2D_ARRAY:
>+            return TextureType::_2DArray;
>+        case GL_TEXTURE_2D_MULTISAMPLE:
>+            return TextureType::_2DMultisample;
>+        case GL_TEXTURE_2D_MULTISAMPLE_ARRAY_OES:
>+            return TextureType::_2DMultisampleArray;
>+        case GL_TEXTURE_3D:
>+            return TextureType::_3D;
>+        case GL_TEXTURE_EXTERNAL_OES:
>+            return TextureType::External;
>+        case GL_TEXTURE_RECTANGLE_ANGLE:
>+            return TextureType::Rectangle;
>+        case GL_TEXTURE_CUBE_MAP:
>+            return TextureType::CubeMap;
>+        default:
>+            return TextureType::InvalidEnum;
>+    }
>+}
>+
>+GLenum ToGLenum(TextureType from)
>+{
>+    switch (from)
>+    {
>+        case TextureType::_2D:
>+            return GL_TEXTURE_2D;
>+        case TextureType::_2DArray:
>+            return GL_TEXTURE_2D_ARRAY;
>+        case TextureType::_2DMultisample:
>+            return GL_TEXTURE_2D_MULTISAMPLE;
>+        case TextureType::_2DMultisampleArray:
>+            return GL_TEXTURE_2D_MULTISAMPLE_ARRAY_OES;
>+        case TextureType::_3D:
>+            return GL_TEXTURE_3D;
>+        case TextureType::External:
>+            return GL_TEXTURE_EXTERNAL_OES;
>+        case TextureType::Rectangle:
>+            return GL_TEXTURE_RECTANGLE_ANGLE;
>+        case TextureType::CubeMap:
>+            return GL_TEXTURE_CUBE_MAP;
>+        default:
>+            UNREACHABLE();
>+            return 0;
>+    }
>+}
>+
>+template <>
>+VertexArrayType FromGLenum<VertexArrayType>(GLenum from)
>+{
>+    switch (from)
>+    {
>+        case GL_COLOR_ARRAY:
>+            return VertexArrayType::Color;
>+        case GL_NORMAL_ARRAY:
>+            return VertexArrayType::Normal;
>+        case GL_POINT_SIZE_ARRAY_OES:
>+            return VertexArrayType::PointSize;
>+        case GL_TEXTURE_COORD_ARRAY:
>+            return VertexArrayType::TextureCoord;
>+        case GL_VERTEX_ARRAY:
>+            return VertexArrayType::Vertex;
>+        default:
>+            return VertexArrayType::InvalidEnum;
>+    }
>+}
>+
>+GLenum ToGLenum(VertexArrayType from)
>+{
>+    switch (from)
>+    {
>+        case VertexArrayType::Color:
>+            return GL_COLOR_ARRAY;
>+        case VertexArrayType::Normal:
>+            return GL_NORMAL_ARRAY;
>+        case VertexArrayType::PointSize:
>+            return GL_POINT_SIZE_ARRAY_OES;
>+        case VertexArrayType::TextureCoord:
>+            return GL_TEXTURE_COORD_ARRAY;
>+        case VertexArrayType::Vertex:
>+            return GL_VERTEX_ARRAY;
>+        default:
>+            UNREACHABLE();
>+            return 0;
>+    }
>+}
>+
>+template <>
>+WrapMode FromGLenum<WrapMode>(GLenum from)
>+{
>+    switch (from)
>+    {
>+        case GL_CLAMP_TO_EDGE:
>+            return WrapMode::ClampToEdge;
>+        case GL_CLAMP_TO_BORDER:
>+            return WrapMode::ClampToBorder;
>+        case GL_MIRRORED_REPEAT:
>+            return WrapMode::MirroredRepeat;
>+        case GL_REPEAT:
>+            return WrapMode::Repeat;
>+        default:
>+            return WrapMode::InvalidEnum;
>+    }
>+}
>+
>+GLenum ToGLenum(WrapMode from)
>+{
>+    switch (from)
>+    {
>+        case WrapMode::ClampToEdge:
>+            return GL_CLAMP_TO_EDGE;
>+        case WrapMode::ClampToBorder:
>+            return GL_CLAMP_TO_BORDER;
>+        case WrapMode::MirroredRepeat:
>+            return GL_MIRRORED_REPEAT;
>+        case WrapMode::Repeat:
>+            return GL_REPEAT;
>+        default:
>+            UNREACHABLE();
>+            return 0;
>+    }
>+}
>+
>+}  // namespace gl
>diff --git a/Source/ThirdParty/ANGLE/src/common/PackedGLEnums_autogen.h b/Source/ThirdParty/ANGLE/src/common/PackedGLEnums_autogen.h
>new file mode 100644
>index 00000000000..cd65115097f
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/common/PackedGLEnums_autogen.h
>@@ -0,0 +1,529 @@
>+// GENERATED FILE - DO NOT EDIT.
>+// Generated by gen_packed_gl_enums.py using data from packed_gl_enums.json.
>+//
>+// Copyright 2019 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// PackedGLEnums_autogen.h:
>+//   Declares ANGLE-specific enums classes for GLenums and functions operating
>+//   on them.
>+
>+#ifndef COMMON_PACKEDGLENUMS_AUTOGEN_H_
>+#define COMMON_PACKEDGLENUMS_AUTOGEN_H_
>+
>+#include <EGL/egl.h>
>+#include <EGL/eglext.h>
>+#include <angle_gl.h>
>+
>+#include <cstdint>
>+
>+namespace gl
>+{
>+
>+template <typename Enum>
>+Enum FromGLenum(GLenum from);
>+
>+enum class AlphaTestFunc : uint8_t
>+{
>+    AlwaysPass = 0,
>+    Equal      = 1,
>+    Gequal     = 2,
>+    Greater    = 3,
>+    Lequal     = 4,
>+    Less       = 5,
>+    Never      = 6,
>+    NotEqual   = 7,
>+
>+    InvalidEnum = 8,
>+    EnumCount   = 8,
>+};
>+
>+template <>
>+AlphaTestFunc FromGLenum<AlphaTestFunc>(GLenum from);
>+GLenum ToGLenum(AlphaTestFunc from);
>+
>+enum class BufferBinding : uint8_t
>+{
>+    Array             = 0,
>+    AtomicCounter     = 1,
>+    CopyRead          = 2,
>+    CopyWrite         = 3,
>+    DispatchIndirect  = 4,
>+    DrawIndirect      = 5,
>+    ElementArray      = 6,
>+    PixelPack         = 7,
>+    PixelUnpack       = 8,
>+    ShaderStorage     = 9,
>+    TransformFeedback = 10,
>+    Uniform           = 11,
>+
>+    InvalidEnum = 12,
>+    EnumCount   = 12,
>+};
>+
>+template <>
>+BufferBinding FromGLenum<BufferBinding>(GLenum from);
>+GLenum ToGLenum(BufferBinding from);
>+
>+enum class BufferUsage : uint8_t
>+{
>+    DynamicCopy = 0,
>+    DynamicDraw = 1,
>+    DynamicRead = 2,
>+    StaticCopy  = 3,
>+    StaticDraw  = 4,
>+    StaticRead  = 5,
>+    StreamCopy  = 6,
>+    StreamDraw  = 7,
>+    StreamRead  = 8,
>+
>+    InvalidEnum = 9,
>+    EnumCount   = 9,
>+};
>+
>+template <>
>+BufferUsage FromGLenum<BufferUsage>(GLenum from);
>+GLenum ToGLenum(BufferUsage from);
>+
>+enum class ClientVertexArrayType : uint8_t
>+{
>+    Color        = 0,
>+    Normal       = 1,
>+    PointSize    = 2,
>+    TextureCoord = 3,
>+    Vertex       = 4,
>+
>+    InvalidEnum = 5,
>+    EnumCount   = 5,
>+};
>+
>+template <>
>+ClientVertexArrayType FromGLenum<ClientVertexArrayType>(GLenum from);
>+GLenum ToGLenum(ClientVertexArrayType from);
>+
>+enum class CullFaceMode : uint8_t
>+{
>+    Back         = 0,
>+    Front        = 1,
>+    FrontAndBack = 2,
>+
>+    InvalidEnum = 3,
>+    EnumCount   = 3,
>+};
>+
>+template <>
>+CullFaceMode FromGLenum<CullFaceMode>(GLenum from);
>+GLenum ToGLenum(CullFaceMode from);
>+
>+enum class FilterMode : uint8_t
>+{
>+    Nearest              = 0,
>+    Linear               = 1,
>+    NearestMipmapNearest = 2,
>+    NearestMipmapLinear  = 3,
>+    LinearMipmapLinear   = 4,
>+
>+    InvalidEnum = 5,
>+    EnumCount   = 5,
>+};
>+
>+template <>
>+FilterMode FromGLenum<FilterMode>(GLenum from);
>+GLenum ToGLenum(FilterMode from);
>+
>+enum class FogMode : uint8_t
>+{
>+    Exp    = 0,
>+    Exp2   = 1,
>+    Linear = 2,
>+
>+    InvalidEnum = 3,
>+    EnumCount   = 3,
>+};
>+
>+template <>
>+FogMode FromGLenum<FogMode>(GLenum from);
>+GLenum ToGLenum(FogMode from);
>+
>+enum class GraphicsResetStatus : uint8_t
>+{
>+    NoError              = 0,
>+    GuiltyContextReset   = 1,
>+    InnocentContextReset = 2,
>+    UnknownContextReset  = 3,
>+
>+    InvalidEnum = 4,
>+    EnumCount   = 4,
>+};
>+
>+template <>
>+GraphicsResetStatus FromGLenum<GraphicsResetStatus>(GLenum from);
>+GLenum ToGLenum(GraphicsResetStatus from);
>+
>+enum class HandleType : uint8_t
>+{
>+    OpaqueFd = 0,
>+
>+    InvalidEnum = 1,
>+    EnumCount   = 1,
>+};
>+
>+template <>
>+HandleType FromGLenum<HandleType>(GLenum from);
>+GLenum ToGLenum(HandleType from);
>+
>+enum class HintSetting : uint8_t
>+{
>+    DontCare = 0,
>+    Fastest  = 1,
>+    Nicest   = 2,
>+
>+    InvalidEnum = 3,
>+    EnumCount   = 3,
>+};
>+
>+template <>
>+HintSetting FromGLenum<HintSetting>(GLenum from);
>+GLenum ToGLenum(HintSetting from);
>+
>+enum class LightParameter : uint8_t
>+{
>+    Ambient              = 0,
>+    AmbientAndDiffuse    = 1,
>+    ConstantAttenuation  = 2,
>+    Diffuse              = 3,
>+    LinearAttenuation    = 4,
>+    Position             = 5,
>+    QuadraticAttenuation = 6,
>+    Specular             = 7,
>+    SpotCutoff           = 8,
>+    SpotDirection        = 9,
>+    SpotExponent         = 10,
>+
>+    InvalidEnum = 11,
>+    EnumCount   = 11,
>+};
>+
>+template <>
>+LightParameter FromGLenum<LightParameter>(GLenum from);
>+GLenum ToGLenum(LightParameter from);
>+
>+enum class LogicalOperation : uint8_t
>+{
>+    And          = 0,
>+    AndInverted  = 1,
>+    AndReverse   = 2,
>+    Clear        = 3,
>+    Copy         = 4,
>+    CopyInverted = 5,
>+    Equiv        = 6,
>+    Invert       = 7,
>+    Nand         = 8,
>+    Noop         = 9,
>+    Nor          = 10,
>+    Or           = 11,
>+    OrInverted   = 12,
>+    OrReverse    = 13,
>+    Set          = 14,
>+    Xor          = 15,
>+
>+    InvalidEnum = 16,
>+    EnumCount   = 16,
>+};
>+
>+template <>
>+LogicalOperation FromGLenum<LogicalOperation>(GLenum from);
>+GLenum ToGLenum(LogicalOperation from);
>+
>+enum class MaterialParameter : uint8_t
>+{
>+    Ambient           = 0,
>+    AmbientAndDiffuse = 1,
>+    Diffuse           = 2,
>+    Emission          = 3,
>+    Shininess         = 4,
>+    Specular          = 5,
>+
>+    InvalidEnum = 6,
>+    EnumCount   = 6,
>+};
>+
>+template <>
>+MaterialParameter FromGLenum<MaterialParameter>(GLenum from);
>+GLenum ToGLenum(MaterialParameter from);
>+
>+enum class MatrixType : uint8_t
>+{
>+    Modelview  = 0,
>+    Projection = 1,
>+    Texture    = 2,
>+
>+    InvalidEnum = 3,
>+    EnumCount   = 3,
>+};
>+
>+template <>
>+MatrixType FromGLenum<MatrixType>(GLenum from);
>+GLenum ToGLenum(MatrixType from);
>+
>+enum class PointParameter : uint8_t
>+{
>+    PointSizeMin             = 0,
>+    PointSizeMax             = 1,
>+    PointFadeThresholdSize   = 2,
>+    PointDistanceAttenuation = 3,
>+
>+    InvalidEnum = 4,
>+    EnumCount   = 4,
>+};
>+
>+template <>
>+PointParameter FromGLenum<PointParameter>(GLenum from);
>+GLenum ToGLenum(PointParameter from);
>+
>+enum class ProvokingVertex : uint8_t
>+{
>+    FirstVertexConvention = 0,
>+    LastVertexConvention  = 1,
>+
>+    InvalidEnum = 2,
>+    EnumCount   = 2,
>+};
>+
>+template <>
>+ProvokingVertex FromGLenum<ProvokingVertex>(GLenum from);
>+GLenum ToGLenum(ProvokingVertex from);
>+
>+enum class QueryType : uint8_t
>+{
>+    AnySamples                         = 0,
>+    AnySamplesConservative             = 1,
>+    CommandsCompleted                  = 2,
>+    PrimitivesGenerated                = 3,
>+    TimeElapsed                        = 4,
>+    Timestamp                          = 5,
>+    TransformFeedbackPrimitivesWritten = 6,
>+
>+    InvalidEnum = 7,
>+    EnumCount   = 7,
>+};
>+
>+template <>
>+QueryType FromGLenum<QueryType>(GLenum from);
>+GLenum ToGLenum(QueryType from);
>+
>+enum class ShaderType : uint8_t
>+{
>+    Vertex   = 0,
>+    Fragment = 1,
>+    Geometry = 2,
>+    Compute  = 3,
>+
>+    InvalidEnum = 4,
>+    EnumCount   = 4,
>+};
>+
>+template <>
>+ShaderType FromGLenum<ShaderType>(GLenum from);
>+GLenum ToGLenum(ShaderType from);
>+
>+enum class ShadingModel : uint8_t
>+{
>+    Flat   = 0,
>+    Smooth = 1,
>+
>+    InvalidEnum = 2,
>+    EnumCount   = 2,
>+};
>+
>+template <>
>+ShadingModel FromGLenum<ShadingModel>(GLenum from);
>+GLenum ToGLenum(ShadingModel from);
>+
>+enum class TextureCombine : uint8_t
>+{
>+    Add         = 0,
>+    AddSigned   = 1,
>+    Dot3Rgb     = 2,
>+    Dot3Rgba    = 3,
>+    Interpolate = 4,
>+    Modulate    = 5,
>+    Replace     = 6,
>+    Subtract    = 7,
>+
>+    InvalidEnum = 8,
>+    EnumCount   = 8,
>+};
>+
>+template <>
>+TextureCombine FromGLenum<TextureCombine>(GLenum from);
>+GLenum ToGLenum(TextureCombine from);
>+
>+enum class TextureEnvMode : uint8_t
>+{
>+    Add      = 0,
>+    Blend    = 1,
>+    Combine  = 2,
>+    Decal    = 3,
>+    Modulate = 4,
>+    Replace  = 5,
>+
>+    InvalidEnum = 6,
>+    EnumCount   = 6,
>+};
>+
>+template <>
>+TextureEnvMode FromGLenum<TextureEnvMode>(GLenum from);
>+GLenum ToGLenum(TextureEnvMode from);
>+
>+enum class TextureEnvParameter : uint8_t
>+{
>+    Mode              = 0,
>+    Color             = 1,
>+    CombineRgb        = 2,
>+    CombineAlpha      = 3,
>+    RgbScale          = 4,
>+    AlphaScale        = 5,
>+    Src0Rgb           = 6,
>+    Src1Rgb           = 7,
>+    Src2Rgb           = 8,
>+    Src0Alpha         = 9,
>+    Src1Alpha         = 10,
>+    Src2Alpha         = 11,
>+    Op0Rgb            = 12,
>+    Op1Rgb            = 13,
>+    Op2Rgb            = 14,
>+    Op0Alpha          = 15,
>+    Op1Alpha          = 16,
>+    Op2Alpha          = 17,
>+    PointCoordReplace = 18,
>+
>+    InvalidEnum = 19,
>+    EnumCount   = 19,
>+};
>+
>+template <>
>+TextureEnvParameter FromGLenum<TextureEnvParameter>(GLenum from);
>+GLenum ToGLenum(TextureEnvParameter from);
>+
>+enum class TextureEnvTarget : uint8_t
>+{
>+    Env         = 0,
>+    PointSprite = 1,
>+
>+    InvalidEnum = 2,
>+    EnumCount   = 2,
>+};
>+
>+template <>
>+TextureEnvTarget FromGLenum<TextureEnvTarget>(GLenum from);
>+GLenum ToGLenum(TextureEnvTarget from);
>+
>+enum class TextureOp : uint8_t
>+{
>+    OneMinusSrcAlpha = 0,
>+    OneMinusSrcColor = 1,
>+    SrcAlpha         = 2,
>+    SrcColor         = 3,
>+
>+    InvalidEnum = 4,
>+    EnumCount   = 4,
>+};
>+
>+template <>
>+TextureOp FromGLenum<TextureOp>(GLenum from);
>+GLenum ToGLenum(TextureOp from);
>+
>+enum class TextureSrc : uint8_t
>+{
>+    Constant     = 0,
>+    Previous     = 1,
>+    PrimaryColor = 2,
>+    Texture      = 3,
>+
>+    InvalidEnum = 4,
>+    EnumCount   = 4,
>+};
>+
>+template <>
>+TextureSrc FromGLenum<TextureSrc>(GLenum from);
>+GLenum ToGLenum(TextureSrc from);
>+
>+enum class TextureTarget : uint8_t
>+{
>+    _2D                 = 0,
>+    _2DArray            = 1,
>+    _2DMultisample      = 2,
>+    _2DMultisampleArray = 3,
>+    _3D                 = 4,
>+    External            = 5,
>+    Rectangle           = 6,
>+    CubeMapPositiveX    = 7,
>+    CubeMapNegativeX    = 8,
>+    CubeMapPositiveY    = 9,
>+    CubeMapNegativeY    = 10,
>+    CubeMapPositiveZ    = 11,
>+    CubeMapNegativeZ    = 12,
>+
>+    InvalidEnum = 13,
>+    EnumCount   = 13,
>+};
>+
>+template <>
>+TextureTarget FromGLenum<TextureTarget>(GLenum from);
>+GLenum ToGLenum(TextureTarget from);
>+
>+enum class TextureType : uint8_t
>+{
>+    _2D                 = 0,
>+    _2DArray            = 1,
>+    _2DMultisample      = 2,
>+    _2DMultisampleArray = 3,
>+    _3D                 = 4,
>+    External            = 5,
>+    Rectangle           = 6,
>+    CubeMap             = 7,
>+
>+    InvalidEnum = 8,
>+    EnumCount   = 8,
>+};
>+
>+template <>
>+TextureType FromGLenum<TextureType>(GLenum from);
>+GLenum ToGLenum(TextureType from);
>+
>+enum class VertexArrayType : uint8_t
>+{
>+    Color        = 0,
>+    Normal       = 1,
>+    PointSize    = 2,
>+    TextureCoord = 3,
>+    Vertex       = 4,
>+
>+    InvalidEnum = 5,
>+    EnumCount   = 5,
>+};
>+
>+template <>
>+VertexArrayType FromGLenum<VertexArrayType>(GLenum from);
>+GLenum ToGLenum(VertexArrayType from);
>+
>+enum class WrapMode : uint8_t
>+{
>+    ClampToEdge    = 0,
>+    ClampToBorder  = 1,
>+    MirroredRepeat = 2,
>+    Repeat         = 3,
>+
>+    InvalidEnum = 4,
>+    EnumCount   = 4,
>+};
>+
>+template <>
>+WrapMode FromGLenum<WrapMode>(GLenum from);
>+GLenum ToGLenum(WrapMode from);
>+
>+}  // namespace gl
>+
>+#endif  // COMMON_PACKEDGLENUMS_AUTOGEN_H_
>diff --git a/Source/ThirdParty/ANGLE/src/common/PoolAlloc.cpp b/Source/ThirdParty/ANGLE/src/common/PoolAlloc.cpp
>new file mode 100644
>index 00000000000..b6e3702f8f4
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/common/PoolAlloc.cpp
>@@ -0,0 +1,334 @@
>+//
>+// Copyright 2019 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// PoolAlloc.cpp:
>+//    Implements the class methods for PoolAllocator and Allocation classes.
>+//
>+
>+#include "common/PoolAlloc.h"
>+
>+#include <assert.h>
>+#include <stdint.h>
>+#include <stdio.h>
>+
>+#include "common/angleutils.h"
>+#include "common/debug.h"
>+#include "common/mathutil.h"
>+#include "common/platform.h"
>+#include "common/tls.h"
>+
>+namespace angle
>+{
>+
>+//
>+// Implement the functionality of the PoolAllocator class, which
>+// is documented in PoolAlloc.h.
>+//
>+PoolAllocator::PoolAllocator(int growthIncrement, int allocationAlignment)
>+    : mAlignment(allocationAlignment),
>+#if !defined(ANGLE_DISABLE_POOL_ALLOC)
>+      mPageSize(growthIncrement),
>+      mFreeList(0),
>+      mInUseList(0),
>+      mNumCalls(0),
>+      mTotalBytes(0),
>+#endif
>+      mLocked(false)
>+{
>+#if !defined(ANGLE_DISABLE_POOL_ALLOC)
>+    if (mAlignment == 1)
>+    {
>+        // This is a special fast-path where fastAllocation() is enabled
>+        mAlignmentMask = 0;
>+        mHeaderSkip    = sizeof(Header);
>+    }
>+    else
>+    {
>+#endif
>+        //
>+        // Adjust mAlignment to be at least pointer aligned and
>+        // power of 2.
>+        //
>+        size_t minAlign = sizeof(void *);
>+        mAlignment &= ~(minAlign - 1);
>+        if (mAlignment < minAlign)
>+            mAlignment = minAlign;
>+        mAlignment     = gl::ceilPow2(mAlignment);
>+        mAlignmentMask = mAlignment - 1;
>+
>+#if !defined(ANGLE_DISABLE_POOL_ALLOC)
>+        //
>+        // Align header skip
>+        //
>+        mHeaderSkip = minAlign;
>+        if (mHeaderSkip < sizeof(Header))
>+        {
>+            mHeaderSkip = rx::roundUp(sizeof(Header), mAlignment);
>+        }
>+    }
>+    //
>+    // Don't allow page sizes we know are smaller than all common
>+    // OS page sizes.
>+    //
>+    if (mPageSize < 4 * 1024)
>+        mPageSize = 4 * 1024;
>+    //
>+    // A large mCurrentPageOffset indicates a new page needs to
>+    // be obtained to allocate memory.
>+    //
>+    mCurrentPageOffset = mPageSize;
>+#else  // !defined(ANGLE_DISABLE_POOL_ALLOC)
>+    mStack.push_back({});
>+#endif
>+}
>+
>+PoolAllocator::~PoolAllocator()
>+{
>+#if !defined(ANGLE_DISABLE_POOL_ALLOC)
>+    while (mInUseList)
>+    {
>+        Header *next = mInUseList->nextPage;
>+        mInUseList->~Header();
>+        delete[] reinterpret_cast<char *>(mInUseList);
>+        mInUseList = next;
>+    }
>+    // We should not check the guard blocks
>+    // here, because we did it already when the block was
>+    // placed into the free list.
>+    //
>+    while (mFreeList)
>+    {
>+        Header *next = mFreeList->nextPage;
>+        delete[] reinterpret_cast<char *>(mFreeList);
>+        mFreeList = next;
>+    }
>+#else  // !defined(ANGLE_DISABLE_POOL_ALLOC)
>+    for (auto &allocs : mStack)
>+    {
>+        for (auto alloc : allocs)
>+        {
>+            free(alloc);
>+        }
>+    }
>+    mStack.clear();
>+#endif
>+}
>+
>+//
>+// Check a single guard block for damage
>+//
>+void Allocation::checkGuardBlock(unsigned char *blockMem,
>+                                 unsigned char val,
>+                                 const char *locText) const
>+{
>+#if defined(ANGLE_POOL_ALLOC_GUARD_BLOCKS)
>+    for (size_t x = 0; x < kGuardBlockSize; x++)
>+    {
>+        if (blockMem[x] != val)
>+        {
>+            char assertMsg[80];
>+            // We don't print the assert message.  It's here just to be helpful.
>+            snprintf(assertMsg, sizeof(assertMsg),
>+                     "PoolAlloc: Damage %s %zu byte allocation at 0x%p\n", locText, mSize, data());
>+            assert(0 && "PoolAlloc: Damage in guard block");
>+        }
>+    }
>+#endif
>+}
>+
>+void PoolAllocator::push()
>+{
>+#if !defined(ANGLE_DISABLE_POOL_ALLOC)
>+    AllocState state = {mCurrentPageOffset, mInUseList};
>+
>+    mStack.push_back(state);
>+
>+    //
>+    // Indicate there is no current page to allocate from.
>+    //
>+    mCurrentPageOffset = mPageSize;
>+#else  // !defined(ANGLE_DISABLE_POOL_ALLOC)
>+    mStack.push_back({});
>+#endif
>+}
>+
>+//
>+// Do a mass-deallocation of all the individual allocations
>+// that have occurred since the last push(), or since the
>+// last pop(), or since the object's creation.
>+//
>+// The deallocated pages are saved for future allocations.
>+//
>+void PoolAllocator::pop()
>+{
>+    if (mStack.size() < 1)
>+        return;
>+
>+#if !defined(ANGLE_DISABLE_POOL_ALLOC)
>+    Header *page       = mStack.back().page;
>+    mCurrentPageOffset = mStack.back().offset;
>+
>+    while (mInUseList != page)
>+    {
>+        // invoke destructor to free allocation list
>+        mInUseList->~Header();
>+
>+        Header *nextInUse = mInUseList->nextPage;
>+        if (mInUseList->pageCount > 1)
>+            delete[] reinterpret_cast<char *>(mInUseList);
>+        else
>+        {
>+            mInUseList->nextPage = mFreeList;
>+            mFreeList            = mInUseList;
>+        }
>+        mInUseList = nextInUse;
>+    }
>+
>+    mStack.pop_back();
>+#else  // !defined(ANGLE_DISABLE_POOL_ALLOC)
>+    for (auto &alloc : mStack.back())
>+    {
>+        free(alloc);
>+    }
>+    mStack.pop_back();
>+#endif
>+}
>+
>+//
>+// Do a mass-deallocation of all the individual allocations
>+// that have occurred.
>+//
>+void PoolAllocator::popAll()
>+{
>+    while (mStack.size() > 0)
>+        pop();
>+}
>+
>+void *PoolAllocator::allocate(size_t numBytes)
>+{
>+    ASSERT(!mLocked);
>+
>+#if !defined(ANGLE_DISABLE_POOL_ALLOC)
>+    //
>+    // Just keep some interesting statistics.
>+    //
>+    ++mNumCalls;
>+    mTotalBytes += numBytes;
>+
>+    // If we are using guard blocks, all allocations are bracketed by
>+    // them: [guardblock][allocation][guardblock].  numBytes is how
>+    // much memory the caller asked for.  allocationSize is the total
>+    // size including guard blocks.  In release build,
>+    // kGuardBlockSize=0 and this all gets optimized away.
>+    size_t allocationSize = Allocation::AllocationSize(numBytes) + mAlignment;
>+    // Detect integer overflow.
>+    if (allocationSize < numBytes)
>+        return 0;
>+
>+    //
>+    // Do the allocation, most likely case first, for efficiency.
>+    // This step could be moved to be inline sometime.
>+    //
>+    if (allocationSize <= mPageSize - mCurrentPageOffset)
>+    {
>+        //
>+        // Safe to allocate from mCurrentPageOffset.
>+        //
>+        unsigned char *memory = reinterpret_cast<unsigned char *>(mInUseList) + mCurrentPageOffset;
>+        mCurrentPageOffset += allocationSize;
>+        mCurrentPageOffset = (mCurrentPageOffset + mAlignmentMask) & ~mAlignmentMask;
>+
>+        return initializeAllocation(mInUseList, memory, numBytes);
>+    }
>+
>+    if (allocationSize > mPageSize - mHeaderSkip)
>+    {
>+        //
>+        // Do a multi-page allocation.  Don't mix these with the others.
>+        // The OS is efficient in allocating and freeing multiple pages.
>+        //
>+        size_t numBytesToAlloc = allocationSize + mHeaderSkip;
>+        // Detect integer overflow.
>+        if (numBytesToAlloc < allocationSize)
>+            return 0;
>+
>+        Header *memory = reinterpret_cast<Header *>(::new char[numBytesToAlloc]);
>+        if (memory == 0)
>+            return 0;
>+
>+        // Use placement-new to initialize header
>+        new (memory) Header(mInUseList, (numBytesToAlloc + mPageSize - 1) / mPageSize);
>+        mInUseList = memory;
>+
>+        mCurrentPageOffset = mPageSize;  // make next allocation come from a new page
>+
>+        // No guard blocks for multi-page allocations (yet)
>+        void *unalignedPtr =
>+            reinterpret_cast<void *>(reinterpret_cast<uintptr_t>(memory) + mHeaderSkip);
>+        return std::align(mAlignment, numBytes, unalignedPtr, allocationSize);
>+    }
>+    unsigned char *newPageAddr =
>+        static_cast<unsigned char *>(allocateNewPage(numBytes, allocationSize));
>+    return initializeAllocation(mInUseList, newPageAddr, numBytes);
>+#else  // !defined(ANGLE_DISABLE_POOL_ALLOC)
>+    void *alloc = malloc(numBytes + mAlignmentMask);
>+    mStack.back().push_back(alloc);
>+
>+    intptr_t intAlloc = reinterpret_cast<intptr_t>(alloc);
>+    intAlloc          = (intAlloc + mAlignmentMask) & ~mAlignmentMask;
>+    return reinterpret_cast<void *>(intAlloc);
>+#endif
>+}
>+
>+#if !defined(ANGLE_DISABLE_POOL_ALLOC)
>+void *PoolAllocator::allocateNewPage(size_t numBytes, size_t allocationSize)
>+{
>+    //
>+    // Need a simple page to allocate from.
>+    //
>+    Header *memory;
>+    if (mFreeList)
>+    {
>+        memory    = mFreeList;
>+        mFreeList = mFreeList->nextPage;
>+    }
>+    else
>+    {
>+        memory = reinterpret_cast<Header *>(::new char[mPageSize]);
>+        if (memory == 0)
>+            return 0;
>+    }
>+    // Use placement-new to initialize header
>+    new (memory) Header(mInUseList, 1);
>+    mInUseList = memory;
>+
>+    unsigned char *ret = reinterpret_cast<unsigned char *>(mInUseList) + mHeaderSkip;
>+    mCurrentPageOffset = (mHeaderSkip + allocationSize + mAlignmentMask) & ~mAlignmentMask;
>+    return ret;
>+}
>+#endif
>+
>+void PoolAllocator::lock()
>+{
>+    ASSERT(!mLocked);
>+    mLocked = true;
>+}
>+
>+void PoolAllocator::unlock()
>+{
>+    ASSERT(mLocked);
>+    mLocked = false;
>+}
>+
>+//
>+// Check all allocations in a list for damage by calling check on each.
>+//
>+void Allocation::checkAllocList() const
>+{
>+    for (const Allocation *alloc = this; alloc != 0; alloc = alloc->mPrevAlloc)
>+        alloc->check();
>+}
>+
>+}  // namespace angle
>\ No newline at end of file
>diff --git a/Source/ThirdParty/ANGLE/src/common/PoolAlloc.h b/Source/ThirdParty/ANGLE/src/common/PoolAlloc.h
>new file mode 100644
>index 00000000000..1c902bfdd75
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/common/PoolAlloc.h
>@@ -0,0 +1,276 @@
>+//
>+// Copyright 2019 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// PoolAlloc.h:
>+//    Defines the class interface for PoolAllocator and the Allocation
>+//    class that it uses internally.
>+//
>+
>+#ifndef COMMON_POOLALLOC_H_
>+#define COMMON_POOLALLOC_H_
>+
>+#if !defined(NDEBUG)
>+#    define ANGLE_POOL_ALLOC_GUARD_BLOCKS  // define to enable guard block sanity checking
>+#endif
>+
>+//
>+// This header defines an allocator that can be used to efficiently
>+// allocate a large number of small requests for heap memory, with the
>+// intention that they are not individually deallocated, but rather
>+// collectively deallocated at one time.
>+//
>+// This simultaneously
>+//
>+// * Makes each individual allocation much more efficient; the
>+//     typical allocation is trivial.
>+// * Completely avoids the cost of doing individual deallocation.
>+// * Saves the trouble of tracking down and plugging a large class of leaks.
>+//
>+// Individual classes can use this allocator by supplying their own
>+// new and delete methods.
>+//
>+
>+#include <stddef.h>
>+#include <string.h>
>+#include <memory>
>+#include <vector>
>+
>+#include "angleutils.h"
>+#include "common/debug.h"
>+
>+namespace angle
>+{
>+// If we are using guard blocks, we must track each individual
>+// allocation.  If we aren't using guard blocks, these
>+// never get instantiated, so won't have any impact.
>+//
>+
>+class Allocation
>+{
>+  public:
>+    Allocation(size_t size, unsigned char *mem, Allocation *prev = 0)
>+        : mSize(size), mMem(mem), mPrevAlloc(prev)
>+    {
>+// Allocations are bracketed:
>+//    [allocationHeader][initialGuardBlock][userData][finalGuardBlock]
>+// This would be cleaner with if (kGuardBlockSize)..., but that
>+// makes the compiler print warnings about 0 length memsets,
>+// even with the if() protecting them.
>+#if defined(ANGLE_POOL_ALLOC_GUARD_BLOCKS)
>+        memset(preGuard(), kGuardBlockBeginVal, kGuardBlockSize);
>+        memset(data(), kUserDataFill, mSize);
>+        memset(postGuard(), kGuardBlockEndVal, kGuardBlockSize);
>+#endif
>+    }
>+
>+    void check() const
>+    {
>+        checkGuardBlock(preGuard(), kGuardBlockBeginVal, "before");
>+        checkGuardBlock(postGuard(), kGuardBlockEndVal, "after");
>+    }
>+
>+    void checkAllocList() const;
>+
>+    // Return total size needed to accommodate user buffer of 'size',
>+    // plus our tracking data.
>+    static size_t AllocationSize(size_t size) { return size + 2 * kGuardBlockSize + HeaderSize(); }
>+
>+    // Offset from surrounding buffer to get to user data buffer.
>+    static unsigned char *OffsetAllocation(unsigned char *m)
>+    {
>+        return m + kGuardBlockSize + HeaderSize();
>+    }
>+
>+  private:
>+    void checkGuardBlock(unsigned char *blockMem, unsigned char val, const char *locText) const;
>+
>+    // Find offsets to pre and post guard blocks, and user data buffer
>+    unsigned char *preGuard() const { return mMem + HeaderSize(); }
>+    unsigned char *data() const { return preGuard() + kGuardBlockSize; }
>+    unsigned char *postGuard() const { return data() + mSize; }
>+    size_t mSize;            // size of the user data area
>+    unsigned char *mMem;     // beginning of our allocation (pts to header)
>+    Allocation *mPrevAlloc;  // prior allocation in the chain
>+
>+    static constexpr unsigned char kGuardBlockBeginVal = 0xfb;
>+    static constexpr unsigned char kGuardBlockEndVal   = 0xfe;
>+    static constexpr unsigned char kUserDataFill       = 0xcd;
>+#if defined(ANGLE_POOL_ALLOC_GUARD_BLOCKS)
>+    static constexpr size_t kGuardBlockSize = 16;
>+    static constexpr size_t HeaderSize() { return sizeof(Allocation); }
>+#else
>+    static constexpr size_t kGuardBlockSize = 0;
>+    static constexpr size_t HeaderSize() { return 0; }
>+#endif
>+};
>+
>+//
>+// There are several stacks.  One is to track the pushing and popping
>+// of the user, and not yet implemented.  The others are simply a
>+// repositories of free pages or used pages.
>+//
>+// Page stacks are linked together with a simple header at the beginning
>+// of each allocation obtained from the underlying OS.  Multi-page allocations
>+// are returned to the OS.  Individual page allocations are kept for future
>+// re-use.
>+//
>+// The "page size" used is not, nor must it match, the underlying OS
>+// page size.  But, having it be about that size or equal to a set of
>+// pages is likely most optimal.
>+//
>+class PoolAllocator : angle::NonCopyable
>+{
>+  public:
>+    static const int kDefaultAlignment = 16;
>+    //
>+    // Create PoolAllocator. If alignment is be set to 1 byte then fastAllocate()
>+    //  function can be used to make allocations with less overhead.
>+    //
>+    PoolAllocator(int growthIncrement = 8 * 1024, int allocationAlignment = kDefaultAlignment);
>+
>+    //
>+    // Don't call the destructor just to free up the memory, call pop()
>+    //
>+    ~PoolAllocator();
>+
>+    //
>+    // Call push() to establish a new place to pop memory to.  Does not
>+    // have to be called to get things started.
>+    //
>+    void push();
>+
>+    //
>+    // Call pop() to free all memory allocated since the last call to push(),
>+    // or if no last call to push, frees all memory since first allocation.
>+    //
>+    void pop();
>+
>+    //
>+    // Call popAll() to free all memory allocated.
>+    //
>+    void popAll();
>+
>+    //
>+    // Call allocate() to actually acquire memory.  Returns 0 if no memory
>+    // available, otherwise a properly aligned pointer to 'numBytes' of memory.
>+    //
>+    void *allocate(size_t numBytes);
>+
>+    //
>+    // Call fastAllocate() for a faster allocate function that does minimal bookkeeping
>+    // preCondition: Allocator must have been created w/ alignment of 1
>+    ANGLE_INLINE uint8_t *fastAllocate(size_t numBytes)
>+    {
>+#if defined(ANGLE_DISABLE_POOL_ALLOC)
>+        return reinterpret_cast<uint8_t *>(allocate(numBytes));
>+#else
>+        ASSERT(mAlignment == 1);
>+        // No multi-page allocations
>+        ASSERT(numBytes <= (mPageSize - mHeaderSkip));
>+        //
>+        // Do the allocation, most likely case inline first, for efficiency.
>+        //
>+        if (numBytes <= mPageSize - mCurrentPageOffset)
>+        {
>+            //
>+            // Safe to allocate from mCurrentPageOffset.
>+            //
>+            uint8_t *memory = reinterpret_cast<uint8_t *>(mInUseList) + mCurrentPageOffset;
>+            mCurrentPageOffset += numBytes;
>+            return memory;
>+        }
>+        return reinterpret_cast<uint8_t *>(allocateNewPage(numBytes, numBytes));
>+#endif
>+    }
>+
>+    //
>+    // There is no deallocate.  The point of this class is that
>+    // deallocation can be skipped by the user of it, as the model
>+    // of use is to simultaneously deallocate everything at once
>+    // by calling pop(), and to not have to solve memory leak problems.
>+    //
>+
>+    // Catch unwanted allocations.
>+    // TODO(jmadill): Remove this when we remove the global allocator.
>+    void lock();
>+    void unlock();
>+
>+  private:
>+    size_t mAlignment;  // all returned allocations will be aligned at
>+                        // this granularity, which will be a power of 2
>+    size_t mAlignmentMask;
>+#if !defined(ANGLE_DISABLE_POOL_ALLOC)
>+    friend struct Header;
>+
>+    struct Header
>+    {
>+        Header(Header *nextPage, size_t pageCount)
>+            : nextPage(nextPage),
>+              pageCount(pageCount)
>+#    if defined(ANGLE_POOL_ALLOC_GUARD_BLOCKS)
>+              ,
>+              lastAllocation(0)
>+#    endif
>+        {}
>+
>+        ~Header()
>+        {
>+#    if defined(ANGLE_POOL_ALLOC_GUARD_BLOCKS)
>+            if (lastAllocation)
>+                lastAllocation->checkAllocList();
>+#    endif
>+        }
>+
>+        Header *nextPage;
>+        size_t pageCount;
>+#    if defined(ANGLE_POOL_ALLOC_GUARD_BLOCKS)
>+        Allocation *lastAllocation;
>+#    endif
>+    };
>+
>+    struct AllocState
>+    {
>+        size_t offset;
>+        Header *page;
>+    };
>+    using AllocStack = std::vector<AllocState>;
>+
>+    // Slow path of allocation when we have to get a new page.
>+    void *allocateNewPage(size_t numBytes, size_t allocationSize);
>+    // Track allocations if and only if we're using guard blocks
>+    void *initializeAllocation(Header *block, unsigned char *memory, size_t numBytes)
>+    {
>+#    if defined(ANGLE_POOL_ALLOC_GUARD_BLOCKS)
>+        new (memory) Allocation(numBytes + mAlignment, memory, block->lastAllocation);
>+        block->lastAllocation = reinterpret_cast<Allocation *>(memory);
>+#    endif
>+        // The OffsetAllocation() call is optimized away if !defined(ANGLE_POOL_ALLOC_GUARD_BLOCKS)
>+        void *unalignedPtr  = Allocation::OffsetAllocation(memory);
>+        size_t alignedBytes = numBytes + mAlignment;
>+        return std::align(mAlignment, numBytes, unalignedPtr, alignedBytes);
>+    }
>+
>+    size_t mPageSize;           // granularity of allocation from the OS
>+    size_t mHeaderSkip;         // amount of memory to skip to make room for the
>+                                //      header (basically, size of header, rounded
>+                                //      up to make it aligned
>+    size_t mCurrentPageOffset;  // next offset in top of inUseList to allocate from
>+    Header *mFreeList;          // list of popped memory
>+    Header *mInUseList;         // list of all memory currently being used
>+    AllocStack mStack;          // stack of where to allocate from, to partition pool
>+
>+    int mNumCalls;       // just an interesting statistic
>+    size_t mTotalBytes;  // just an interesting statistic
>+
>+#else  // !defined(ANGLE_DISABLE_POOL_ALLOC)
>+    std::vector<std::vector<void *>> mStack;
>+#endif
>+
>+    bool mLocked;
>+};
>+
>+}  // namespace angle
>+
>+#endif  // COMMON_POOLALLOC_H_
>diff --git a/Source/ThirdParty/ANGLE/src/common/PoolAlloc_unittest.cpp b/Source/ThirdParty/ANGLE/src/common/PoolAlloc_unittest.cpp
>new file mode 100644
>index 00000000000..bb3eb55f82d
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/common/PoolAlloc_unittest.cpp
>@@ -0,0 +1,78 @@
>+//
>+// Copyright 2019 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// PoolAlloc_unittest:
>+//   Tests of the PoolAlloc class
>+//
>+
>+#include <gtest/gtest.h>
>+
>+#include "common/PoolAlloc.h"
>+
>+namespace angle
>+{
>+// Verify the public interface of PoolAllocator class
>+TEST(PoolAllocatorTest, Interface)
>+{
>+    size_t numBytes               = 1024;
>+    constexpr uint32_t kTestValue = 0xbaadbeef;
>+    // Create a default pool allocator and allocate from it
>+    PoolAllocator poolAllocator;
>+    void *allocation = poolAllocator.allocate(numBytes);
>+    // Verify non-zero ptr returned
>+    EXPECT_NE(nullptr, allocation);
>+    // Write to allocation to check later
>+    uint32_t *writePtr = static_cast<uint32_t *>(allocation);
>+    *writePtr          = kTestValue;
>+    // Test push and creating a new allocation
>+    poolAllocator.push();
>+    allocation = poolAllocator.allocate(numBytes);
>+    EXPECT_NE(nullptr, allocation);
>+    // Make an allocation that spans multiple pages
>+    allocation = poolAllocator.allocate(10 * 1024);
>+    // pop previous two allocations
>+    poolAllocator.pop();
>+    // Verify first allocation still has data
>+    EXPECT_EQ(kTestValue, *writePtr);
>+    // Make a bunch of allocations
>+    for (uint32_t i = 0; i < 1000; ++i)
>+    {
>+        numBytes   = (rand() % (1024 * 4)) + 1;
>+        allocation = poolAllocator.allocate(numBytes);
>+        EXPECT_NE(nullptr, allocation);
>+        // Write data into full allocation. In debug case if we
>+        //  overwrite any other allocation we get error.
>+        memset(allocation, 0xb8, numBytes);
>+    }
>+    // Free everything
>+    poolAllocator.popAll();
>+}
>+
>+#if !defined(ANGLE_POOL_ALLOC_GUARD_BLOCKS)
>+// Verify allocations are correctly aligned for different alignments
>+class PoolAllocatorAlignmentTest : public testing::TestWithParam<int>
>+{};
>+
>+TEST_P(PoolAllocatorAlignmentTest, Alignment)
>+{
>+    int alignment = GetParam();
>+    // Create a pool allocator to allocate from
>+    PoolAllocator poolAllocator(4096, alignment);
>+    // Test a number of allocation sizes for each alignment
>+    for (uint32_t i = 0; i < 100; ++i)
>+    {
>+        // Vary the allocation size around 4k to hit some multi-page allocations
>+        void *allocation = poolAllocator.allocate((rand() % (1024 * 4)) + 1);
>+        // Verify alignment of allocation matches expected default
>+        EXPECT_EQ(0u, (reinterpret_cast<std::uintptr_t>(allocation) % alignment));
>+    }
>+}
>+
>+INSTANTIATE_TEST_SUITE_P(,
>+                         PoolAllocatorAlignmentTest,
>+                         testing::Values(2, 4, 8, 16, 32, 64, 128),
>+                         testing::PrintToStringParamName());
>+#endif
>+}  // namespace angle
>diff --git a/Source/ThirdParty/ANGLE/src/common/aligned_memory.cpp b/Source/ThirdParty/ANGLE/src/common/aligned_memory.cpp
>new file mode 100644
>index 00000000000..70a730ef62e
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/common/aligned_memory.cpp
>@@ -0,0 +1,64 @@
>+//
>+// Copyright 2017 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// aligned_memory: An aligned memory allocator. Based on Chrome's base/memory/aligned_memory.
>+//
>+
>+#include "common/aligned_memory.h"
>+
>+#include "common/debug.h"
>+#include "common/platform.h"
>+
>+#if defined(COMPILER_MSVC)
>+#    include <malloc.h>
>+#else
>+#    include <stdlib.h>
>+#endif
>+
>+namespace angle
>+{
>+
>+void *AlignedAlloc(size_t size, size_t alignment)
>+{
>+    ASSERT(size > 0);
>+    ASSERT((alignment & (alignment - 1)) == 0);
>+    ASSERT((alignment % sizeof(void *)) == 0);
>+    void *ptr = nullptr;
>+#if defined(ANGLE_PLATFORM_WINDOWS)
>+    ptr = _aligned_malloc(size, alignment);
>+// Android technically supports posix_memalign(), but does not expose it in
>+// the current version of the library headers used by Chrome.  Luckily,
>+// memalign() on Android returns pointers which can safely be used with
>+// free(), so we can use it instead.  Issue filed to document this:
>+// http://code.google.com/p/android/issues/detail?id=35391
>+#elif defined(ANGLE_PLATFORM_ANDROID)
>+    ptr = memalign(alignment, size);
>+#else
>+    if (posix_memalign(&ptr, alignment, size))
>+        ptr = nullptr;
>+#endif
>+    // Since aligned allocations may fail for non-memory related reasons, force a
>+    // crash if we encounter a failed allocation.
>+    if (!ptr)
>+    {
>+        ERR() << "If you crashed here, your aligned allocation is incorrect: "
>+              << "size=" << size << ", alignment=" << alignment;
>+        ASSERT(false);
>+    }
>+    // Sanity check alignment just to be safe.
>+    ASSERT((reinterpret_cast<uintptr_t>(ptr) & (alignment - 1)) == 0);
>+    return ptr;
>+}
>+
>+void AlignedFree(void *ptr)
>+{
>+#if defined(_MSC_VER)
>+    _aligned_free(ptr);
>+#else
>+    free(ptr);
>+#endif
>+}
>+
>+}  // namespace angle
>diff --git a/Source/ThirdParty/ANGLE/src/common/aligned_memory.h b/Source/ThirdParty/ANGLE/src/common/aligned_memory.h
>new file mode 100644
>index 00000000000..dcbb60d1cb5
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/common/aligned_memory.h
>@@ -0,0 +1,23 @@
>+//
>+// Copyright 2017 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// aligned_memory: An aligned memory allocator. Based on Chrome's base/memory/aligned_memory.
>+//
>+
>+#ifndef COMMON_ALIGNED_MEMORY_H_
>+#define COMMON_ALIGNED_MEMORY_H_
>+
>+#include <cstddef>
>+
>+namespace angle
>+{
>+
>+// This can be replaced with std::aligned_malloc when we have C++17.
>+void *AlignedAlloc(size_t size, size_t alignment);
>+void AlignedFree(void *ptr);
>+
>+}  // namespace angle
>+
>+#endif  // COMMON_ALIGNED_MEMORY_H_
>diff --git a/Source/ThirdParty/ANGLE/src/common/aligned_memory_unittest.cpp b/Source/ThirdParty/ANGLE/src/common/aligned_memory_unittest.cpp
>new file mode 100644
>index 00000000000..18e2d156fc5
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/common/aligned_memory_unittest.cpp
>@@ -0,0 +1,45 @@
>+//
>+// Copyright 2017 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// aligned_memory_unittests: Tests for the aligned memory allocator.
>+//   Tests copied from Chrome: src/base/memory/aligned_memory_unittests.cc.
>+//
>+
>+#include "common/aligned_memory.h"
>+
>+#include <memory>
>+
>+#include "gtest/gtest.h"
>+
>+#define EXPECT_ALIGNED(ptr, align) EXPECT_EQ(0u, reinterpret_cast<uintptr_t>(ptr) & (align - 1))
>+
>+namespace angle
>+{
>+
>+// Test that dynamic allocation works as expected.
>+TEST(AlignedMemoryTest, DynamicAllocation)
>+{
>+    void *p = AlignedAlloc(8, 8);
>+    EXPECT_TRUE(p);
>+    EXPECT_ALIGNED(p, 8);
>+    AlignedFree(p);
>+
>+    p = AlignedAlloc(8, 16);
>+    EXPECT_TRUE(p);
>+    EXPECT_ALIGNED(p, 16);
>+    AlignedFree(p);
>+
>+    p = AlignedAlloc(8, 256);
>+    EXPECT_TRUE(p);
>+    EXPECT_ALIGNED(p, 256);
>+    AlignedFree(p);
>+
>+    p = AlignedAlloc(8, 4096);
>+    EXPECT_TRUE(p);
>+    EXPECT_ALIGNED(p, 4096);
>+    AlignedFree(p);
>+}
>+
>+}  // namespace angle
>diff --git a/Source/ThirdParty/ANGLE/src/common/android_util.cpp b/Source/ThirdParty/ANGLE/src/common/android_util.cpp
>new file mode 100644
>index 00000000000..17a5fa89056
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/common/android_util.cpp
>@@ -0,0 +1,259 @@
>+//
>+// Copyright 2018 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+
>+// android_util.cpp: Utilities for the using the Android platform
>+
>+#include "common/android_util.h"
>+
>+// Taken from cutils/native_handle.h:
>+// https://android.googlesource.com/platform/system/core/+/master/libcutils/include/cutils/native_handle.h
>+typedef struct native_handle
>+{
>+    int version; /* sizeof(native_handle_t) */
>+    int numFds;  /* number of file-descriptors at &data[0] */
>+    int numInts; /* number of ints at &data[numFds] */
>+    int data[0]; /* numFds + numInts ints */
>+} native_handle_t;
>+
>+// Taken from nativebase/nativebase.h
>+// https://android.googlesource.com/platform/frameworks/native/+/master/libs/nativebase/include/nativebase/nativebase.h
>+typedef const native_handle_t *buffer_handle_t;
>+
>+typedef struct android_native_base_t
>+{
>+    /* a magic value defined by the actual EGL native type */
>+    int magic;
>+    /* the sizeof() of the actual EGL native type */
>+    int version;
>+    void *reserved[4];
>+    /* reference-counting interface */
>+    void (*incRef)(struct android_native_base_t *base);
>+    void (*decRef)(struct android_native_base_t *base);
>+} android_native_base_t;
>+
>+typedef struct ANativeWindowBuffer
>+{
>+    struct android_native_base_t common;
>+    int width;
>+    int height;
>+    int stride;
>+    int format;
>+    int usage_deprecated;
>+    uintptr_t layerCount;
>+    void *reserved[1];
>+    const native_handle_t *handle;
>+    uint64_t usage;
>+    // we needed extra space for storing the 64-bits usage flags
>+    // the number of slots to use from reserved_proc depends on the
>+    // architecture.
>+    void *reserved_proc[8 - (sizeof(uint64_t) / sizeof(void *))];
>+} ANativeWindowBuffer_t;
>+
>+// Taken from android/hardware_buffer.h
>+// https://android.googlesource.com/platform/frameworks/native/+/master/libs/nativewindow/include/android/hardware_buffer.h
>+
>+// AHARDWAREBUFFER_FORMAT_B8G8R8A8_UNORM AHARDWAREBUFFER_FORMAT_B4G4R4A4_UNORM,
>+// AHARDWAREBUFFER_FORMAT_B5G5R5A1_UNORM formats were deprecated and re-added explicitly.
>+
>+// clang-format off
>+/**
>+ * Buffer pixel formats.
>+ */
>+enum {
>+    /**
>+     * Corresponding formats:
>+     *   Vulkan: VK_FORMAT_R8G8B8A8_UNORM
>+     *   OpenGL ES: GL_RGBA8
>+     */
>+    AHARDWAREBUFFER_FORMAT_R8G8B8A8_UNORM           = 1,
>+
>+    /**
>+     * 32 bits per pixel, 8 bits per channel format where alpha values are
>+     * ignored (always opaque).
>+     * Corresponding formats:
>+     *   Vulkan: VK_FORMAT_R8G8B8A8_UNORM
>+     *   OpenGL ES: GL_RGB8
>+     */
>+    AHARDWAREBUFFER_FORMAT_R8G8B8X8_UNORM           = 2,
>+
>+    /**
>+     * Corresponding formats:
>+     *   Vulkan: VK_FORMAT_R8G8B8_UNORM
>+     *   OpenGL ES: GL_RGB8
>+     */
>+    AHARDWAREBUFFER_FORMAT_R8G8B8_UNORM             = 3,
>+
>+    /**
>+     * Corresponding formats:
>+     *   Vulkan: VK_FORMAT_R5G6B5_UNORM_PACK16
>+     *   OpenGL ES: GL_RGB565
>+     */
>+    AHARDWAREBUFFER_FORMAT_R5G6B5_UNORM             = 4,
>+
>+    AHARDWAREBUFFER_FORMAT_B8G8R8A8_UNORM           = 5,
>+    AHARDWAREBUFFER_FORMAT_B5G5R5A1_UNORM           = 6,
>+    AHARDWAREBUFFER_FORMAT_B4G4R4A4_UNORM           = 7,
>+    /**
>+     * Corresponding formats:
>+     *   Vulkan: VK_FORMAT_R16G16B16A16_SFLOAT
>+     *   OpenGL ES: GL_RGBA16F
>+     */
>+    AHARDWAREBUFFER_FORMAT_R16G16B16A16_FLOAT       = 0x16,
>+
>+    /**
>+     * Corresponding formats:
>+     *   Vulkan: VK_FORMAT_A2B10G10R10_UNORM_PACK32
>+     *   OpenGL ES: GL_RGB10_A2
>+     */
>+    AHARDWAREBUFFER_FORMAT_R10G10B10A2_UNORM        = 0x2b,
>+
>+    /**
>+     * An opaque binary blob format that must have height 1, with width equal to
>+     * the buffer size in bytes.
>+     */
>+    AHARDWAREBUFFER_FORMAT_BLOB                     = 0x21,
>+
>+    /**
>+     * Corresponding formats:
>+     *   Vulkan: VK_FORMAT_D16_UNORM
>+     *   OpenGL ES: GL_DEPTH_COMPONENT16
>+     */
>+    AHARDWAREBUFFER_FORMAT_D16_UNORM                = 0x30,
>+
>+    /**
>+     * Corresponding formats:
>+     *   Vulkan: VK_FORMAT_X8_D24_UNORM_PACK32
>+     *   OpenGL ES: GL_DEPTH_COMPONENT24
>+     */
>+    AHARDWAREBUFFER_FORMAT_D24_UNORM                = 0x31,
>+
>+    /**
>+     * Corresponding formats:
>+     *   Vulkan: VK_FORMAT_D24_UNORM_S8_UINT
>+     *   OpenGL ES: GL_DEPTH24_STENCIL8
>+     */
>+    AHARDWAREBUFFER_FORMAT_D24_UNORM_S8_UINT        = 0x32,
>+
>+    /**
>+     * Corresponding formats:
>+     *   Vulkan: VK_FORMAT_D32_SFLOAT
>+     *   OpenGL ES: GL_DEPTH_COMPONENT32F
>+     */
>+    AHARDWAREBUFFER_FORMAT_D32_FLOAT                = 0x33,
>+
>+    /**
>+     * Corresponding formats:
>+     *   Vulkan: VK_FORMAT_D32_SFLOAT_S8_UINT
>+     *   OpenGL ES: GL_DEPTH32F_STENCIL8
>+     */
>+    AHARDWAREBUFFER_FORMAT_D32_FLOAT_S8_UINT        = 0x34,
>+
>+    /**
>+     * Corresponding formats:
>+     *   Vulkan: VK_FORMAT_S8_UINT
>+     *   OpenGL ES: GL_STENCIL_INDEX8
>+     */
>+    AHARDWAREBUFFER_FORMAT_S8_UINT                  = 0x35,
>+};
>+// clang-format on
>+
>+namespace
>+{
>+
>+template <typename T1, typename T2>
>+T1 *offsetPointer(T2 *ptr, int bytes)
>+{
>+    return reinterpret_cast<T1 *>(reinterpret_cast<intptr_t>(ptr) + bytes);
>+}
>+
>+}  // anonymous namespace
>+
>+namespace angle
>+{
>+
>+namespace android
>+{
>+
>+struct ANativeWindowBuffer *ClientBufferToANativeWindowBuffer(EGLClientBuffer clientBuffer)
>+{
>+    return reinterpret_cast<struct ANativeWindowBuffer *>(clientBuffer);
>+}
>+
>+void GetANativeWindowBufferProperties(const struct ANativeWindowBuffer *buffer,
>+                                      int *width,
>+                                      int *height,
>+                                      int *depth,
>+                                      int *pixelFormat)
>+{
>+    *width       = buffer->width;
>+    *height      = buffer->height;
>+    *depth       = static_cast<int>(buffer->layerCount);
>+    *height      = buffer->height;
>+    *pixelFormat = buffer->format;
>+}
>+
>+GLenum NativePixelFormatToGLInternalFormat(int pixelFormat)
>+{
>+    switch (pixelFormat)
>+    {
>+        case AHARDWAREBUFFER_FORMAT_R8G8B8A8_UNORM:
>+            return GL_RGBA8;
>+        case AHARDWAREBUFFER_FORMAT_R8G8B8X8_UNORM:
>+            return GL_RGB8;
>+        case AHARDWAREBUFFER_FORMAT_R8G8B8_UNORM:
>+            return GL_RGB8;
>+        case AHARDWAREBUFFER_FORMAT_R5G6B5_UNORM:
>+            return GL_RGB565;
>+        case AHARDWAREBUFFER_FORMAT_B8G8R8A8_UNORM:
>+            return GL_BGRA8_EXT;
>+        case AHARDWAREBUFFER_FORMAT_B5G5R5A1_UNORM:
>+            return GL_RGB5_A1;
>+        case AHARDWAREBUFFER_FORMAT_B4G4R4A4_UNORM:
>+            return GL_RGBA4;
>+        case AHARDWAREBUFFER_FORMAT_R16G16B16A16_FLOAT:
>+            return GL_RGBA16F;
>+        case AHARDWAREBUFFER_FORMAT_R10G10B10A2_UNORM:
>+            return GL_RGB10_A2;
>+        case AHARDWAREBUFFER_FORMAT_BLOB:
>+            return GL_NONE;
>+        case AHARDWAREBUFFER_FORMAT_D16_UNORM:
>+            return GL_DEPTH_COMPONENT16;
>+        case AHARDWAREBUFFER_FORMAT_D24_UNORM:
>+            return GL_DEPTH_COMPONENT24;
>+        case AHARDWAREBUFFER_FORMAT_D24_UNORM_S8_UINT:
>+            return GL_DEPTH24_STENCIL8;
>+        case AHARDWAREBUFFER_FORMAT_D32_FLOAT:
>+            return GL_DEPTH_COMPONENT32F;
>+        case AHARDWAREBUFFER_FORMAT_D32_FLOAT_S8_UINT:
>+            return GL_DEPTH32F_STENCIL8;
>+        case AHARDWAREBUFFER_FORMAT_S8_UINT:
>+            return GL_STENCIL_INDEX8;
>+        default:
>+            return GL_NONE;
>+    }
>+}
>+
>+struct AHardwareBuffer *ANativeWindowBufferToAHardwareBuffer(
>+    struct ANativeWindowBuffer *windowBuffer)
>+{
>+    // In the Android system:
>+    // - AHardwareBuffer is essentially a typedef of GraphicBuffer. Conversion functions simply
>+    // reinterpret_cast.
>+    // - GraphicBuffer inherits from two base classes, ANativeWindowBuffer and RefBase.
>+    //
>+    // GraphicBuffer implements a getter for ANativeWindowBuffer (getNativeBuffer) by static_casting
>+    // itself to its base class ANativeWindowBuffer. The offset of the ANativeWindowBuffer pointer
>+    // from the GraphicBuffer pointer is 16 bytes. This is likely due to two pointers: The vtable of
>+    // GraphicBuffer and the one pointer member of the RefBase class.
>+    //
>+    // This is not future proof at all. We need to look into getting utilities added to Android to
>+    // perform this cast for us.
>+    int offset = -(static_cast<int>(sizeof(void *)) * 2);
>+    return offsetPointer<struct AHardwareBuffer>(windowBuffer, offset);
>+}
>+
>+}  // namespace android
>+}  // namespace angle
>diff --git a/Source/ThirdParty/ANGLE/src/common/android_util.h b/Source/ThirdParty/ANGLE/src/common/android_util.h
>new file mode 100644
>index 00000000000..4befd6873ed
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/common/android_util.h
>@@ -0,0 +1,39 @@
>+//
>+// Copyright 2018 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+
>+// android_util.h: Utilities for the using the Android platform
>+
>+#ifndef COMMON_ANDROIDUTIL_H_
>+#define COMMON_ANDROIDUTIL_H_
>+
>+#include <EGL/egl.h>
>+#include "angle_gl.h"
>+
>+struct ANativeWindowBuffer;
>+struct AHardwareBuffer;
>+
>+namespace angle
>+{
>+
>+namespace android
>+{
>+
>+struct ANativeWindowBuffer *ClientBufferToANativeWindowBuffer(EGLClientBuffer clientBuffer);
>+
>+void GetANativeWindowBufferProperties(const struct ANativeWindowBuffer *buffer,
>+                                      int *width,
>+                                      int *height,
>+                                      int *depth,
>+                                      int *pixelFormat);
>+GLenum NativePixelFormatToGLInternalFormat(int pixelFormat);
>+
>+struct AHardwareBuffer *ANativeWindowBufferToAHardwareBuffer(
>+    struct ANativeWindowBuffer *windowBuffer);
>+
>+}  // namespace android
>+}  // namespace angle
>+
>+#endif  // COMMON_ANDROIDUTIL_H_
>diff --git a/Source/ThirdParty/ANGLE/src/common/angleutils.cpp b/Source/ThirdParty/ANGLE/src/common/angleutils.cpp
>index 739d12a7678..5b7836d32d6 100644
>--- a/Source/ThirdParty/ANGLE/src/common/angleutils.cpp
>+++ b/Source/ThirdParty/ANGLE/src/common/angleutils.cpp
>@@ -17,7 +17,7 @@ namespace angle
> // dirtyPointer is a special value that will make the comparison with any valid pointer fail and
> // force the renderer to re-apply the state.
> const uintptr_t DirtyPointer = std::numeric_limits<uintptr_t>::max();
>-}
>+}  // namespace angle
> 
> std::string ArrayString(unsigned int i)
> {
>@@ -47,7 +47,7 @@ std::string ArrayIndexString(const std::vector<unsigned int> &indices)
>     return strstr.str();
> }
> 
>-size_t FormatStringIntoVector(const char *fmt, va_list vararg, std::vector<char>& outBuffer)
>+size_t FormatStringIntoVector(const char *fmt, va_list vararg, std::vector<char> &outBuffer)
> {
>     // The state of the va_list passed to vsnprintf is undefined after the call, do a copy in case
>     // we need to grow the buffer.
>diff --git a/Source/ThirdParty/ANGLE/src/common/angleutils.h b/Source/ThirdParty/ANGLE/src/common/angleutils.h
>index ad32a2f03a9..09adb588921 100644
>--- a/Source/ThirdParty/ANGLE/src/common/angleutils.h
>+++ b/Source/ThirdParty/ANGLE/src/common/angleutils.h
>@@ -14,9 +14,9 @@
> #include <climits>
> #include <cstdarg>
> #include <cstddef>
>-#include <string>
> #include <set>
> #include <sstream>
>+#include <string>
> #include <vector>
> 
> // A helper class to disallow copy and assignment operators
>@@ -30,12 +30,12 @@ using Microsoft::WRL::ComPtr;
> class NonCopyable
> {
>   protected:
>-    NonCopyable() = default;
>-    ~NonCopyable() = default;
>+    constexpr NonCopyable() = default;
>+    ~NonCopyable()          = default;
> 
>   private:
>-    NonCopyable(const NonCopyable&) = delete;
>-    void operator=(const NonCopyable&) = delete;
>+    NonCopyable(const NonCopyable &) = delete;
>+    void operator=(const NonCopyable &) = delete;
> };
> 
> extern const uintptr_t DirtyPointer;
>@@ -54,8 +54,7 @@ class WrappedArray final : angle::NonCopyable
>   public:
>     template <size_t N>
>     constexpr WrappedArray(const T (&data)[N]) : mArray(&data[0]), mSize(N)
>-    {
>-    }
>+    {}
> 
>     constexpr WrappedArray() : mArray(nullptr), mSize(0) {}
>     constexpr WrappedArray(const T *data, size_t size) : mArray(data), mSize(size) {}
>@@ -86,7 +85,7 @@ void SafeRelease(T (&resourceBlock)[N])
> }
> 
> template <typename T>
>-void SafeRelease(T& resource)
>+void SafeRelease(T &resource)
> {
>     if (resource)
>     {
>@@ -103,7 +102,7 @@ void SafeDelete(T *&resource)
> }
> 
> template <typename T>
>-void SafeDeleteContainer(T& resource)
>+void SafeDeleteContainer(T &resource)
> {
>     for (auto &element : resource)
>     {
>@@ -113,7 +112,7 @@ void SafeDeleteContainer(T& resource)
> }
> 
> template <typename T>
>-void SafeDeleteArray(T*& resource)
>+void SafeDeleteArray(T *&resource)
> {
>     delete[] resource;
>     resource = nullptr;
>@@ -148,16 +147,17 @@ inline bool IsMaskFlagSet(T mask, T flag)
>     return (mask & flag) == flag;
> }
> 
>-inline const char* MakeStaticString(const std::string &str)
>+inline const char *MakeStaticString(const std::string &str)
> {
>-    static std::set<std::string> strings;
>-    std::set<std::string>::iterator it = strings.find(str);
>-    if (it != strings.end())
>+    // On the heap so that no destructor runs on application exit.
>+    static std::set<std::string> *strings = new std::set<std::string>;
>+    std::set<std::string>::iterator it    = strings->find(str);
>+    if (it != strings->end())
>     {
>         return it->c_str();
>     }
> 
>-    return strings.insert(str).first->c_str();
>+    return strings->insert(str).first->c_str();
> }
> 
> std::string ArrayString(unsigned int i);
>@@ -173,10 +173,7 @@ inline std::string Str(int i)
>     return strstr.str();
> }
> 
>-size_t FormatStringIntoVector(const char *fmt, va_list vararg, std::vector<char>& buffer);
>-
>-std::string FormatString(const char *fmt, va_list vararg);
>-std::string FormatString(const char *fmt, ...);
>+size_t FormatStringIntoVector(const char *fmt, va_list vararg, std::vector<char> &buffer);
> 
> template <typename T>
> std::string ToString(const T &value)
>@@ -188,9 +185,10 @@ std::string ToString(const T &value)
> 
> // snprintf is not defined with MSVC prior to to msvc14
> #if defined(_MSC_VER) && _MSC_VER < 1900
>-#define snprintf _snprintf
>+#    define snprintf _snprintf
> #endif
> 
>+#define GL_A1RGB5_ANGLEX 0x6AC5
> #define GL_BGRX8_ANGLEX 0x6ABA
> #define GL_BGR565_ANGLEX 0x6ABB
> #define GL_BGRA4_ANGLEX 0x6ABC
>@@ -199,55 +197,137 @@ std::string ToString(const T &value)
> #define GL_UINT_64_ANGLEX 0x6ABF
> #define GL_BGRA8_SRGB_ANGLEX 0x6AC0
> 
>-// Hidden enum for the NULL D3D device type.
>-#define EGL_PLATFORM_ANGLE_DEVICE_TYPE_NULL_ANGLE 0x6AC0
>-
>-// TODO(jmadill): Clean this up at some point.
>-#define EGL_PLATFORM_ANGLE_PLATFORM_METHODS_ANGLEX 0x9999
>-
>-#define ANGLE_TRY_CHECKED_MATH(result)                     \
>-    if (!result.IsValid())                                 \
>-    {                                                      \
>-        return gl::InternalError() << "Integer overflow."; \
>-    }
>+// These are dummy formats used to fit typeless D3D textures that can be bound to EGL pbuffers into
>+// the format system (for extension EGL_ANGLE_d3d_texture_client_buffer):
>+#define GL_RGBA8_TYPELESS_ANGLEX 0x6AC1
>+#define GL_RGBA8_TYPELESS_SRGB_ANGLEX 0x6AC2
>+#define GL_BGRA8_TYPELESS_ANGLEX 0x6AC3
>+#define GL_BGRA8_TYPELESS_SRGB_ANGLEX 0x6AC4
>+
>+#define GL_R8_SSCALED_ANGLEX 0x6AC6
>+#define GL_RG8_SSCALED_ANGLEX 0x6AC7
>+#define GL_RGB8_SSCALED_ANGLEX 0x6AC8
>+#define GL_RGBA8_SSCALED_ANGLEX 0x6AC9
>+#define GL_R8_USCALED_ANGLEX 0x6ACA
>+#define GL_RG8_USCALED_ANGLEX 0x6ACB
>+#define GL_RGB8_USCALED_ANGLEX 0x6ACC
>+#define GL_RGBA8_USCALED_ANGLEX 0x6ACD
>+
>+#define GL_R16_SSCALED_ANGLEX 0x6ACE
>+#define GL_RG16_SSCALED_ANGLEX 0x6ACF
>+#define GL_RGB16_SSCALED_ANGLEX 0x6AD0
>+#define GL_RGBA16_SSCALED_ANGLEX 0x6AD1
>+#define GL_R16_USCALED_ANGLEX 0x6AD2
>+#define GL_RG16_USCALED_ANGLEX 0x6AD3
>+#define GL_RGB16_USCALED_ANGLEX 0x6AD4
>+#define GL_RGBA16_USCALED_ANGLEX 0x6AD5
>+
>+#define GL_R32_SSCALED_ANGLEX 0x6AD6
>+#define GL_RG32_SSCALED_ANGLEX 0x6AD7
>+#define GL_RGB32_SSCALED_ANGLEX 0x6AD8
>+#define GL_RGBA32_SSCALED_ANGLEX 0x6AD9
>+#define GL_R32_USCALED_ANGLEX 0x6ADA
>+#define GL_RG32_USCALED_ANGLEX 0x6ADB
>+#define GL_RGB32_USCALED_ANGLEX 0x6ADC
>+#define GL_RGBA32_USCALED_ANGLEX 0x6ADD
>+
>+#define GL_R32_SNORM_ANGLEX 0x6ADE
>+#define GL_RG32_SNORM_ANGLEX 0x6ADF
>+#define GL_RGB32_SNORM_ANGLEX 0x6AE0
>+#define GL_RGBA32_SNORM_ANGLEX 0x6AE1
>+#define GL_R32_UNORM_ANGLEX 0x6AE2
>+#define GL_RG32_UNORM_ANGLEX 0x6AE3
>+#define GL_RGB32_UNORM_ANGLEX 0x6AE4
>+#define GL_RGBA32_UNORM_ANGLEX 0x6AE5
>+
>+#define GL_R32_FIXED_ANGLEX 0x6AE6
>+#define GL_RG32_FIXED_ANGLEX 0x6AE7
>+#define GL_RGB32_FIXED_ANGLEX 0x6AE8
>+#define GL_RGBA32_FIXED_ANGLEX 0x6AE9
>+
>+#define GL_RGB10_A2_SINT_ANGLEX 0x6AEA
>+#define GL_RGB10_A2_SNORM_ANGLEX 0x6AEB
>+#define GL_RGB10_A2_SSCALED_ANGLEX 0x6AEC
>+#define GL_RGB10_A2_USCALED_ANGLEX 0x6AED
>+
>+#define ANGLE_CHECK_GL_ALLOC(context, result) \
>+    ANGLE_CHECK(context, result, "Failed to allocate host memory", GL_OUT_OF_MEMORY)
>+
>+#define ANGLE_CHECK_GL_MATH(context, result) \
>+    ANGLE_CHECK(context, result, "Integer overflow.", GL_INVALID_OPERATION)
>+
>+#define ANGLE_GL_UNREACHABLE(context) \
>+    UNREACHABLE();                    \
>+    ANGLE_CHECK(context, false, "Unreachable Code.", GL_INVALID_OPERATION)
> 
> // The below inlining code lifted from V8.
> #if defined(__clang__) || (defined(__GNUC__) && defined(__has_attribute))
>-#define ANGLE_HAS_ATTRIBUTE_ALWAYS_INLINE (__has_attribute(always_inline))
>-#define ANGLE_HAS___FORCEINLINE 0
>+#    define ANGLE_HAS_ATTRIBUTE_ALWAYS_INLINE (__has_attribute(always_inline))
>+#    define ANGLE_HAS___FORCEINLINE 0
> #elif defined(_MSC_VER)
>-#define ANGLE_HAS_ATTRIBUTE_ALWAYS_INLINE 0
>-#define ANGLE_HAS___FORCEINLINE 1
>+#    define ANGLE_HAS_ATTRIBUTE_ALWAYS_INLINE 0
>+#    define ANGLE_HAS___FORCEINLINE 1
> #else
>-#define ANGLE_HAS_ATTRIBUTE_ALWAYS_INLINE 0
>-#define ANGLE_HAS___FORCEINLINE 0
>+#    define ANGLE_HAS_ATTRIBUTE_ALWAYS_INLINE 0
>+#    define ANGLE_HAS___FORCEINLINE 0
> #endif
> 
> #if defined(NDEBUG) && ANGLE_HAS_ATTRIBUTE_ALWAYS_INLINE
>-#define ANGLE_INLINE inline __attribute__((always_inline))
>+#    define ANGLE_INLINE inline __attribute__((always_inline))
> #elif defined(NDEBUG) && ANGLE_HAS___FORCEINLINE
>-#define ANGLE_INLINE __forceinline
>+#    define ANGLE_INLINE __forceinline
> #else
>-#define ANGLE_INLINE inline
>+#    define ANGLE_INLINE inline
> #endif
> 
>+#if defined(__clang__) || (defined(__GNUC__) && defined(__has_attribute))
>+#    if __has_attribute(noinline)
>+#        define ANGLE_NOINLINE __attribute__((noinline))
>+#    else
>+#        define ANGLE_NOINLINE
>+#    endif
>+#elif defined(_MSC_VER)
>+#    define ANGLE_NOINLINE __declspec(noinline)
>+#else
>+#    define ANGLE_NOINLINE
>+#endif
>+
>+#if defined(__clang__) || (defined(__GNUC__) && defined(__has_attribute))
>+#    if __has_attribute(format)
>+#        define ANGLE_FORMAT_PRINTF(fmt, args) __attribute__((format(__printf__, fmt, args)))
>+#    else
>+#        define ANGLE_FORMAT_PRINTF(fmt, args)
>+#    endif
>+#else
>+#    define ANGLE_FORMAT_PRINTF(fmt, args)
>+#endif
>+
>+// Format messes up the # inside the macro.
>+// clang-format off
> #ifndef ANGLE_STRINGIFY
>-#define ANGLE_STRINGIFY(x) #x
>+#    define ANGLE_STRINGIFY(x) #x
> #endif
>+// clang-format on
> 
> #ifndef ANGLE_MACRO_STRINGIFY
>-#define ANGLE_MACRO_STRINGIFY(x) ANGLE_STRINGIFY(x)
>+#    define ANGLE_MACRO_STRINGIFY(x) ANGLE_STRINGIFY(x)
> #endif
> 
> // Detect support for C++17 [[nodiscard]]
> #if !defined(__has_cpp_attribute)
>-#define __has_cpp_attribute(name) 0
>+#    define __has_cpp_attribute(name) 0
> #endif  // !defined(__has_cpp_attribute)
> 
> #if __has_cpp_attribute(nodiscard)
>-#define ANGLE_NO_DISCARD [[nodiscard]]
>+#    define ANGLE_NO_DISCARD [[nodiscard]]
> #else
>-#define ANGLE_NO_DISCARD
>+#    define ANGLE_NO_DISCARD
> #endif  // __has_cpp_attribute(nodiscard)
> 
>-#endif // COMMON_ANGLEUTILS_H_
>+#if __has_cpp_attribute(maybe_unused)
>+#    define ANGLE_MAYBE_UNUSED [[maybe_unused]]
>+#else
>+#    define ANGLE_MAYBE_UNUSED
>+#endif  // __has_cpp_attribute(maybe_unused)
>+
>+#endif  // COMMON_ANGLEUTILS_H_
>diff --git a/Source/ThirdParty/ANGLE/src/common/bitset_utils.h b/Source/ThirdParty/ANGLE/src/common/bitset_utils.h
>index 4166a562a72..591a2609ea7 100644
>--- a/Source/ThirdParty/ANGLE/src/common/bitset_utils.h
>+++ b/Source/ThirdParty/ANGLE/src/common/bitset_utils.h
>@@ -22,7 +22,7 @@
> namespace angle
> {
> 
>-template <size_t N, typename BitsT>
>+template <size_t N, typename BitsT, typename ParamT = std::size_t>
> class BitSetT final
> {
>   public:
>@@ -40,10 +40,10 @@ class BitSetT final
>       private:
>         friend class BitSetT;
> 
>-        Reference(BitSetT *parent, std::size_t bit) : mParent(parent), mBit(bit) {}
>+        Reference(BitSetT *parent, ParamT bit) : mParent(parent), mBit(bit) {}
> 
>         BitSetT *mParent;
>-        std::size_t mBit;
>+        ParamT mBit;
>     };
> 
>     class Iterator final
>@@ -54,7 +54,21 @@ class BitSetT final
> 
>         bool operator==(const Iterator &other) const;
>         bool operator!=(const Iterator &other) const;
>-        std::size_t operator*() const;
>+        ParamT operator*() const;
>+
>+        // These helper functions allow mutating an iterator in-flight.
>+        // They only operate on later bits to ensure we don't iterate the same bit twice.
>+        void resetLaterBit(std::size_t index)
>+        {
>+            ASSERT(index > mCurrentBit);
>+            mBitsCopy.reset(index);
>+        }
>+
>+        void setLaterBit(std::size_t index)
>+        {
>+            ASSERT(index > mCurrentBit);
>+            mBitsCopy.set(index);
>+        }
> 
>       private:
>         std::size_t getNextBit();
>@@ -64,8 +78,7 @@ class BitSetT final
>     };
> 
>     BitSetT();
>-    BitSetT(BitsT value);
>-    ~BitSetT();
>+    constexpr explicit BitSetT(BitsT value);
> 
>     BitSetT(const BitSetT &other);
>     BitSetT &operator=(const BitSetT &other);
>@@ -73,10 +86,10 @@ class BitSetT final
>     bool operator==(const BitSetT &other) const;
>     bool operator!=(const BitSetT &other) const;
> 
>-    constexpr bool operator[](std::size_t pos) const;
>-    Reference operator[](std::size_t pos) { return Reference(this, pos); }
>+    constexpr bool operator[](ParamT pos) const;
>+    Reference operator[](ParamT pos) { return Reference(this, pos); }
> 
>-    bool test(std::size_t pos) const;
>+    bool test(ParamT pos) const;
> 
>     bool all() const;
>     bool any() const;
>@@ -90,19 +103,23 @@ class BitSetT final
>     BitSetT &operator^=(const BitSetT &other);
>     BitSetT operator~() const;
> 
>+    BitSetT &operator&=(BitsT value);
>+    BitSetT &operator|=(BitsT value);
>+    BitSetT &operator^=(BitsT value);
>+
>     BitSetT operator<<(std::size_t pos) const;
>     BitSetT &operator<<=(std::size_t pos);
>     BitSetT operator>>(std::size_t pos) const;
>     BitSetT &operator>>=(std::size_t pos);
> 
>     BitSetT &set();
>-    BitSetT &set(std::size_t pos, bool value = true);
>+    BitSetT &set(ParamT pos, bool value = true);
> 
>     BitSetT &reset();
>-    BitSetT &reset(std::size_t pos);
>+    BitSetT &reset(ParamT pos);
> 
>     BitSetT &flip();
>-    BitSetT &flip(std::size_t pos);
>+    BitSetT &flip(ParamT pos);
> 
>     unsigned long to_ulong() const { return static_cast<unsigned long>(mBits); }
>     BitsT bits() const { return mBits; }
>@@ -111,8 +128,15 @@ class BitSetT final
>     Iterator end() const { return Iterator(BitSetT()); }
> 
>   private:
>-    constexpr static BitsT Bit(std::size_t x) { return (static_cast<BitsT>(1) << x); }
>-    constexpr static BitsT Mask(std::size_t x) { return ((Bit(x - 1) - 1) << 1) + 1; }
>+    constexpr static BitsT Bit(ParamT x)
>+    {
>+        return (static_cast<BitsT>(1) << static_cast<size_t>(x));
>+    }
>+    // Produces a mask of ones up to the "x"th bit.
>+    constexpr static BitsT Mask(std::size_t x)
>+    {
>+        return ((Bit(static_cast<ParamT>(x - 1)) - 1) << 1) + 1;
>+    }
> 
>     BitsT mBits;
> };
>@@ -134,6 +158,20 @@ class IterableBitSet : public std::bitset<N>
>         bool operator!=(const Iterator &other) const;
>         unsigned long operator*() const { return mCurrentBit; }
> 
>+        // These helper functions allow mutating an iterator in-flight.
>+        // They only operate on later bits to ensure we don't iterate the same bit twice.
>+        void resetLaterBit(std::size_t index)
>+        {
>+            ASSERT(index > mCurrentBit);
>+            mBits.reset(index - mOffset);
>+        }
>+
>+        void setLaterBit(std::size_t index)
>+        {
>+            ASSERT(index > mCurrentBit);
>+            mBits.set(index - mOffset);
>+        }
>+
>       private:
>         unsigned long getNextBit();
> 
>@@ -162,7 +200,7 @@ IterableBitSet<N>::Iterator::Iterator(const std::bitset<N> &bitset)
> }
> 
> template <size_t N>
>-typename IterableBitSet<N>::Iterator &IterableBitSet<N>::Iterator::operator++()
>+ANGLE_INLINE typename IterableBitSet<N>::Iterator &IterableBitSet<N>::Iterator::operator++()
> {
>     ASSERT(mBits.any());
>     mBits.set(mCurrentBit - mOffset, 0);
>@@ -202,152 +240,166 @@ unsigned long IterableBitSet<N>::Iterator::getNextBit()
>     return 0;
> }
> 
>-template <size_t N, typename BitsT>
>-BitSetT<N, BitsT>::BitSetT() : mBits(0)
>+template <size_t N, typename BitsT, typename ParamT>
>+BitSetT<N, BitsT, ParamT>::BitSetT() : mBits(0)
> {
>     static_assert(N > 0, "Bitset type cannot support zero bits.");
>     static_assert(N <= sizeof(BitsT) * 8, "Bitset type cannot support a size this large.");
> }
> 
>-template <size_t N, typename BitsT>
>-BitSetT<N, BitsT>::BitSetT(BitsT value) : mBits(value & Mask(N))
>-{
>-}
>-
>-template <size_t N, typename BitsT>
>-BitSetT<N, BitsT>::~BitSetT()
>-{
>-}
>+template <size_t N, typename BitsT, typename ParamT>
>+constexpr BitSetT<N, BitsT, ParamT>::BitSetT(BitsT value) : mBits(value & Mask(N))
>+{}
> 
>-template <size_t N, typename BitsT>
>-BitSetT<N, BitsT>::BitSetT(const BitSetT &other) : mBits(other.mBits)
>-{
>-}
>+template <size_t N, typename BitsT, typename ParamT>
>+BitSetT<N, BitsT, ParamT>::BitSetT(const BitSetT &other) : mBits(other.mBits)
>+{}
> 
>-template <size_t N, typename BitsT>
>-BitSetT<N, BitsT> &BitSetT<N, BitsT>::operator=(const BitSetT &other)
>+template <size_t N, typename BitsT, typename ParamT>
>+BitSetT<N, BitsT, ParamT> &BitSetT<N, BitsT, ParamT>::operator=(const BitSetT &other)
> {
>     mBits = other.mBits;
>     return *this;
> }
> 
>-template <size_t N, typename BitsT>
>-bool BitSetT<N, BitsT>::operator==(const BitSetT &other) const
>+template <size_t N, typename BitsT, typename ParamT>
>+bool BitSetT<N, BitsT, ParamT>::operator==(const BitSetT &other) const
> {
>     return mBits == other.mBits;
> }
> 
>-template <size_t N, typename BitsT>
>-bool BitSetT<N, BitsT>::operator!=(const BitSetT &other) const
>+template <size_t N, typename BitsT, typename ParamT>
>+bool BitSetT<N, BitsT, ParamT>::operator!=(const BitSetT &other) const
> {
>     return mBits != other.mBits;
> }
> 
>-template <size_t N, typename BitsT>
>-constexpr bool BitSetT<N, BitsT>::operator[](std::size_t pos) const
>+template <size_t N, typename BitsT, typename ParamT>
>+constexpr bool BitSetT<N, BitsT, ParamT>::operator[](ParamT pos) const
> {
>     return test(pos);
> }
> 
>-template <size_t N, typename BitsT>
>-bool BitSetT<N, BitsT>::test(std::size_t pos) const
>+template <size_t N, typename BitsT, typename ParamT>
>+bool BitSetT<N, BitsT, ParamT>::test(ParamT pos) const
> {
>     return (mBits & Bit(pos)) != 0;
> }
> 
>-template <size_t N, typename BitsT>
>-bool BitSetT<N, BitsT>::all() const
>+template <size_t N, typename BitsT, typename ParamT>
>+bool BitSetT<N, BitsT, ParamT>::all() const
> {
>     ASSERT(mBits == (mBits & Mask(N)));
>     return mBits == Mask(N);
> }
> 
>-template <size_t N, typename BitsT>
>-bool BitSetT<N, BitsT>::any() const
>+template <size_t N, typename BitsT, typename ParamT>
>+bool BitSetT<N, BitsT, ParamT>::any() const
> {
>     ASSERT(mBits == (mBits & Mask(N)));
>     return (mBits != 0);
> }
> 
>-template <size_t N, typename BitsT>
>-bool BitSetT<N, BitsT>::none() const
>+template <size_t N, typename BitsT, typename ParamT>
>+bool BitSetT<N, BitsT, ParamT>::none() const
> {
>     ASSERT(mBits == (mBits & Mask(N)));
>     return (mBits == 0);
> }
> 
>-template <size_t N, typename BitsT>
>-std::size_t BitSetT<N, BitsT>::count() const
>+template <size_t N, typename BitsT, typename ParamT>
>+std::size_t BitSetT<N, BitsT, ParamT>::count() const
> {
>     return gl::BitCount(mBits);
> }
> 
>-template <size_t N, typename BitsT>
>-BitSetT<N, BitsT> &BitSetT<N, BitsT>::operator&=(const BitSetT &other)
>+template <size_t N, typename BitsT, typename ParamT>
>+BitSetT<N, BitsT, ParamT> &BitSetT<N, BitsT, ParamT>::operator&=(const BitSetT &other)
> {
>     mBits &= other.mBits;
>     return *this;
> }
> 
>-template <size_t N, typename BitsT>
>-BitSetT<N, BitsT> &BitSetT<N, BitsT>::operator|=(const BitSetT &other)
>+template <size_t N, typename BitsT, typename ParamT>
>+BitSetT<N, BitsT, ParamT> &BitSetT<N, BitsT, ParamT>::operator|=(const BitSetT &other)
> {
>     mBits |= other.mBits;
>     return *this;
> }
> 
>-template <size_t N, typename BitsT>
>-BitSetT<N, BitsT> &BitSetT<N, BitsT>::operator^=(const BitSetT &other)
>+template <size_t N, typename BitsT, typename ParamT>
>+BitSetT<N, BitsT, ParamT> &BitSetT<N, BitsT, ParamT>::operator^=(const BitSetT &other)
>+{
>+    mBits = mBits ^ other.mBits;
>+    return *this;
>+}
>+
>+template <size_t N, typename BitsT, typename ParamT>
>+BitSetT<N, BitsT, ParamT> BitSetT<N, BitsT, ParamT>::operator~() const
> {
>-    mBits = (mBits ^ other.mBits) & Mask(N);
>+    return BitSetT<N, BitsT, ParamT>(~mBits & Mask(N));
>+}
>+
>+template <size_t N, typename BitsT, typename ParamT>
>+BitSetT<N, BitsT, ParamT> &BitSetT<N, BitsT, ParamT>::operator&=(BitsT value)
>+{
>+    mBits &= value;
>     return *this;
> }
> 
>-template <size_t N, typename BitsT>
>-BitSetT<N, BitsT> BitSetT<N, BitsT>::operator~() const
>+template <size_t N, typename BitsT, typename ParamT>
>+BitSetT<N, BitsT, ParamT> &BitSetT<N, BitsT, ParamT>::operator|=(BitsT value)
> {
>-    return BitSetT<N, BitsT>(~mBits & Mask(N));
>+    mBits |= value & Mask(N);
>+    return *this;
>+}
>+
>+template <size_t N, typename BitsT, typename ParamT>
>+BitSetT<N, BitsT, ParamT> &BitSetT<N, BitsT, ParamT>::operator^=(BitsT value)
>+{
>+    mBits ^= value & Mask(N);
>+    return *this;
> }
> 
>-template <size_t N, typename BitsT>
>-BitSetT<N, BitsT> BitSetT<N, BitsT>::operator<<(std::size_t pos) const
>+template <size_t N, typename BitsT, typename ParamT>
>+BitSetT<N, BitsT, ParamT> BitSetT<N, BitsT, ParamT>::operator<<(std::size_t pos) const
> {
>-    return BitSetT<N, BitsT>((mBits << pos) & Mask(N));
>+    return BitSetT<N, BitsT, ParamT>((mBits << pos) & Mask(N));
> }
> 
>-template <size_t N, typename BitsT>
>-BitSetT<N, BitsT> &BitSetT<N, BitsT>::operator<<=(std::size_t pos)
>+template <size_t N, typename BitsT, typename ParamT>
>+BitSetT<N, BitsT, ParamT> &BitSetT<N, BitsT, ParamT>::operator<<=(std::size_t pos)
> {
>     mBits = (mBits << pos & Mask(N));
>     return *this;
> }
> 
>-template <size_t N, typename BitsT>
>-BitSetT<N, BitsT> BitSetT<N, BitsT>::operator>>(std::size_t pos) const
>+template <size_t N, typename BitsT, typename ParamT>
>+BitSetT<N, BitsT, ParamT> BitSetT<N, BitsT, ParamT>::operator>>(std::size_t pos) const
> {
>-    return BitSetT<N, BitsT>(mBits >> pos);
>+    return BitSetT<N, BitsT, ParamT>(mBits >> pos);
> }
> 
>-template <size_t N, typename BitsT>
>-BitSetT<N, BitsT> &BitSetT<N, BitsT>::operator>>=(std::size_t pos)
>+template <size_t N, typename BitsT, typename ParamT>
>+BitSetT<N, BitsT, ParamT> &BitSetT<N, BitsT, ParamT>::operator>>=(std::size_t pos)
> {
>     mBits = ((mBits >> pos) & Mask(N));
>     return *this;
> }
> 
>-template <size_t N, typename BitsT>
>-BitSetT<N, BitsT> &BitSetT<N, BitsT>::set()
>+template <size_t N, typename BitsT, typename ParamT>
>+BitSetT<N, BitsT, ParamT> &BitSetT<N, BitsT, ParamT>::set()
> {
>     mBits = Mask(N);
>     return *this;
> }
> 
>-template <size_t N, typename BitsT>
>-BitSetT<N, BitsT> &BitSetT<N, BitsT>::set(std::size_t pos, bool value)
>+template <size_t N, typename BitsT, typename ParamT>
>+BitSetT<N, BitsT, ParamT> &BitSetT<N, BitsT, ParamT>::set(ParamT pos, bool value)
> {
>     if (value)
>     {
>-        mBits |= Bit(pos);
>+        mBits |= Bit(pos) & Mask(N);
>     }
>     else
>     {
>@@ -356,36 +408,36 @@ BitSetT<N, BitsT> &BitSetT<N, BitsT>::set(std::size_t pos, bool value)
>     return *this;
> }
> 
>-template <size_t N, typename BitsT>
>-BitSetT<N, BitsT> &BitSetT<N, BitsT>::reset()
>+template <size_t N, typename BitsT, typename ParamT>
>+BitSetT<N, BitsT, ParamT> &BitSetT<N, BitsT, ParamT>::reset()
> {
>     mBits = 0;
>     return *this;
> }
> 
>-template <size_t N, typename BitsT>
>-BitSetT<N, BitsT> &BitSetT<N, BitsT>::reset(std::size_t pos)
>+template <size_t N, typename BitsT, typename ParamT>
>+BitSetT<N, BitsT, ParamT> &BitSetT<N, BitsT, ParamT>::reset(ParamT pos)
> {
>     mBits &= ~Bit(pos);
>     return *this;
> }
> 
>-template <size_t N, typename BitsT>
>-BitSetT<N, BitsT> &BitSetT<N, BitsT>::flip()
>+template <size_t N, typename BitsT, typename ParamT>
>+BitSetT<N, BitsT, ParamT> &BitSetT<N, BitsT, ParamT>::flip()
> {
>     mBits ^= Mask(N);
>     return *this;
> }
> 
>-template <size_t N, typename BitsT>
>-BitSetT<N, BitsT> &BitSetT<N, BitsT>::flip(std::size_t pos)
>+template <size_t N, typename BitsT, typename ParamT>
>+BitSetT<N, BitsT, ParamT> &BitSetT<N, BitsT, ParamT>::flip(ParamT pos)
> {
>-    mBits ^= Bit(pos);
>+    mBits ^= Bit(pos) & Mask(N);
>     return *this;
> }
> 
>-template <size_t N, typename BitsT>
>-BitSetT<N, BitsT>::Iterator::Iterator(const BitSetT &bits) : mBitsCopy(bits), mCurrentBit(0)
>+template <size_t N, typename BitsT, typename ParamT>
>+BitSetT<N, BitsT, ParamT>::Iterator::Iterator(const BitSetT &bits) : mBitsCopy(bits), mCurrentBit(0)
> {
>     if (bits.any())
>     {
>@@ -393,35 +445,36 @@ BitSetT<N, BitsT>::Iterator::Iterator(const BitSetT &bits) : mBitsCopy(bits), mC
>     }
> }
> 
>-template <size_t N, typename BitsT>
>-typename BitSetT<N, BitsT>::Iterator &BitSetT<N, BitsT>::Iterator::operator++()
>+template <size_t N, typename BitsT, typename ParamT>
>+ANGLE_INLINE typename BitSetT<N, BitsT, ParamT>::Iterator &BitSetT<N, BitsT, ParamT>::Iterator::
>+operator++()
> {
>     ASSERT(mBitsCopy.any());
>-    mBitsCopy.reset(mCurrentBit);
>+    mBitsCopy.reset(static_cast<ParamT>(mCurrentBit));
>     mCurrentBit = getNextBit();
>     return *this;
> }
> 
>-template <size_t N, typename BitsT>
>-bool BitSetT<N, BitsT>::Iterator::operator==(const Iterator &other) const
>+template <size_t N, typename BitsT, typename ParamT>
>+bool BitSetT<N, BitsT, ParamT>::Iterator::operator==(const Iterator &other) const
> {
>     return mBitsCopy == other.mBitsCopy;
> }
> 
>-template <size_t N, typename BitsT>
>-bool BitSetT<N, BitsT>::Iterator::operator!=(const Iterator &other) const
>+template <size_t N, typename BitsT, typename ParamT>
>+bool BitSetT<N, BitsT, ParamT>::Iterator::operator!=(const Iterator &other) const
> {
>     return !(*this == other);
> }
> 
>-template <size_t N, typename BitsT>
>-std::size_t BitSetT<N, BitsT>::Iterator::operator*() const
>+template <size_t N, typename BitsT, typename ParamT>
>+ParamT BitSetT<N, BitsT, ParamT>::Iterator::operator*() const
> {
>-    return mCurrentBit;
>+    return static_cast<ParamT>(mCurrentBit);
> }
> 
>-template <size_t N, typename BitsT>
>-std::size_t BitSetT<N, BitsT>::Iterator::getNextBit()
>+template <size_t N, typename BitsT, typename ParamT>
>+std::size_t BitSetT<N, BitsT, ParamT>::Iterator::getNextBit()
> {
>     if (mBitsCopy.none())
>     {
>@@ -472,27 +525,33 @@ struct GetBitSet<N, EnableIfBitsFit<N, uint32_t>>
> template <size_t N>
> using BitSet = typename priv::GetBitSet<N>::Type;
> 
>-}  // angle
>+}  // namespace angle
> 
>-template <size_t N, typename BitsT>
>-inline angle::BitSetT<N, BitsT> operator&(const angle::BitSetT<N, BitsT> &lhs,
>-                                          const angle::BitSetT<N, BitsT> &rhs)
>+template <size_t N, typename BitsT, typename ParamT>
>+inline angle::BitSetT<N, BitsT, ParamT> operator&(const angle::BitSetT<N, BitsT, ParamT> &lhs,
>+                                                  const angle::BitSetT<N, BitsT, ParamT> &rhs)
> {
>-    return angle::BitSetT<N, BitsT>(lhs.bits() & rhs.bits());
>+    angle::BitSetT<N, BitsT, ParamT> result(lhs);
>+    result &= rhs.bits();
>+    return result;
> }
> 
>-template <size_t N, typename BitsT>
>-inline angle::BitSetT<N, BitsT> operator|(const angle::BitSetT<N, BitsT> &lhs,
>-                                          const angle::BitSetT<N, BitsT> &rhs)
>+template <size_t N, typename BitsT, typename ParamT>
>+inline angle::BitSetT<N, BitsT, ParamT> operator|(const angle::BitSetT<N, BitsT, ParamT> &lhs,
>+                                                  const angle::BitSetT<N, BitsT, ParamT> &rhs)
> {
>-    return angle::BitSetT<N, BitsT>(lhs.bits() | rhs.bits());
>+    angle::BitSetT<N, BitsT, ParamT> result(lhs);
>+    result |= rhs.bits();
>+    return result;
> }
> 
>-template <size_t N, typename BitsT>
>-inline angle::BitSetT<N, BitsT> operator^(const angle::BitSetT<N, BitsT> &lhs,
>-                                          const angle::BitSetT<N, BitsT> &rhs)
>+template <size_t N, typename BitsT, typename ParamT>
>+inline angle::BitSetT<N, BitsT, ParamT> operator^(const angle::BitSetT<N, BitsT, ParamT> &lhs,
>+                                                  const angle::BitSetT<N, BitsT, ParamT> &rhs)
> {
>-    return angle::BitSetT<N, BitsT>(lhs.bits() ^ rhs.bits());
>+    angle::BitSetT<N, BitsT, ParamT> result(lhs);
>+    result ^= rhs.bits();
>+    return result;
> }
> 
> #endif  // COMMON_BITSETITERATOR_H_
>diff --git a/Source/ThirdParty/ANGLE/src/common/bitset_utils_unittest.cpp b/Source/ThirdParty/ANGLE/src/common/bitset_utils_unittest.cpp
>index 3394890f25f..7e37ad40a71 100644
>--- a/Source/ThirdParty/ANGLE/src/common/bitset_utils_unittest.cpp
>+++ b/Source/ThirdParty/ANGLE/src/common/bitset_utils_unittest.cpp
>@@ -15,6 +15,148 @@ using namespace angle;
> 
> namespace
> {
>+class BitSetTest : public testing::Test
>+{
>+  protected:
>+    BitSet<12> mBits;
>+};
>+
>+TEST_F(BitSetTest, Basic)
>+{
>+    EXPECT_FALSE(mBits.all());
>+    EXPECT_FALSE(mBits.any());
>+    EXPECT_TRUE(mBits.none());
>+    EXPECT_EQ(mBits.count(), 0u);
>+
>+    // Set every bit to 1.
>+    for (size_t i = 0; i < mBits.size(); ++i)
>+    {
>+        mBits.set(i);
>+
>+        EXPECT_EQ(mBits.all(), i + 1 == mBits.size());
>+        EXPECT_TRUE(mBits.any());
>+        EXPECT_FALSE(mBits.none());
>+        EXPECT_EQ(mBits.count(), i + 1);
>+    }
>+
>+    // Reset every other bit to 0.
>+    for (size_t i = 0; i < mBits.size(); i += 2)
>+    {
>+        mBits.reset(i);
>+
>+        EXPECT_FALSE(mBits.all());
>+        EXPECT_TRUE(mBits.any());
>+        EXPECT_FALSE(mBits.none());
>+        EXPECT_EQ(mBits.count(), mBits.size() - i / 2 - 1);
>+    }
>+
>+    // Flip all bits.
>+    for (size_t i = 0; i < mBits.size(); ++i)
>+    {
>+        mBits.flip(i);
>+
>+        EXPECT_FALSE(mBits.all());
>+        EXPECT_TRUE(mBits.any());
>+        EXPECT_FALSE(mBits.none());
>+        EXPECT_EQ(mBits.count(), mBits.size() / 2 + (i % 2 == 0));
>+    }
>+
>+    // Make sure the bit pattern is what we expect at this point.
>+    for (size_t i = 0; i < mBits.size(); ++i)
>+    {
>+        EXPECT_EQ(mBits.test(i), i % 2 == 0);
>+        EXPECT_EQ(static_cast<bool>(mBits[i]), i % 2 == 0);
>+    }
>+
>+    // Test that flip, set and reset all bits at once work.
>+    mBits.flip();
>+    EXPECT_FALSE(mBits.all());
>+    EXPECT_TRUE(mBits.any());
>+    EXPECT_FALSE(mBits.none());
>+    EXPECT_EQ(mBits.count(), mBits.size() / 2);
>+
>+    mBits.set();
>+    EXPECT_TRUE(mBits.all());
>+    EXPECT_TRUE(mBits.any());
>+    EXPECT_FALSE(mBits.none());
>+    EXPECT_EQ(mBits.count(), mBits.size());
>+
>+    mBits.reset();
>+    EXPECT_FALSE(mBits.all());
>+    EXPECT_FALSE(mBits.any());
>+    EXPECT_TRUE(mBits.none());
>+    EXPECT_EQ(mBits.count(), 0u);
>+
>+    // Test that out-of-bound sets don't modify the bitset
>+    constexpr uint32_t kMask = (1 << 12) - 1;
>+
>+    EXPECT_EQ(mBits.set(12).bits() & ~kMask, 0u);
>+    EXPECT_EQ(mBits.set(13).bits() & ~kMask, 0u);
>+    EXPECT_EQ(mBits.flip(12).bits() & ~kMask, 0u);
>+    EXPECT_EQ(mBits.flip(13).bits() & ~kMask, 0u);
>+}
>+
>+TEST_F(BitSetTest, BitwiseOperators)
>+{
>+    // Use a value that has a 1 in the 12th and 13th bits, to make sure masking to exactly 12 bits
>+    // does not have an off-by-one error.
>+    constexpr uint32_t kSelfValue  = 0xF9E4;
>+    constexpr uint32_t kOtherValue = 0x5C6A;
>+
>+    constexpr uint32_t kMask             = (1 << 12) - 1;
>+    constexpr uint32_t kSelfMaskedValue  = kSelfValue & kMask;
>+    constexpr uint32_t kOtherMaskedValue = kOtherValue & kMask;
>+
>+    constexpr uint32_t kShift            = 3;
>+    constexpr uint32_t kSelfShiftedLeft  = kSelfMaskedValue << kShift & kMask;
>+    constexpr uint32_t kSelfShiftedRight = kSelfMaskedValue >> kShift & kMask;
>+
>+    mBits |= kSelfValue;
>+    BitSet<12> other(kOtherValue);
>+    BitSet<12> anded(kSelfMaskedValue & kOtherMaskedValue);
>+    BitSet<12> ored(kSelfMaskedValue | kOtherMaskedValue);
>+    BitSet<12> xored(kSelfMaskedValue ^ kOtherMaskedValue);
>+
>+    EXPECT_EQ(mBits.bits(), kSelfMaskedValue);
>+    EXPECT_EQ(other.bits(), kOtherMaskedValue);
>+
>+    EXPECT_EQ(mBits & other, anded);
>+    EXPECT_EQ(mBits | other, ored);
>+    EXPECT_EQ(mBits ^ other, xored);
>+
>+    EXPECT_NE(mBits, other);
>+    EXPECT_NE(anded, ored);
>+    EXPECT_NE(anded, xored);
>+    EXPECT_NE(ored, xored);
>+
>+    mBits &= other;
>+    EXPECT_EQ(mBits, anded);
>+
>+    mBits |= ored;
>+    EXPECT_EQ(mBits, ored);
>+
>+    mBits ^= other;
>+    mBits ^= anded;
>+    EXPECT_EQ(mBits, BitSet<12>(kSelfValue));
>+
>+    EXPECT_EQ(mBits << kShift, BitSet<12>(kSelfShiftedLeft));
>+    EXPECT_EQ(mBits >> kShift, BitSet<12>(kSelfShiftedRight));
>+
>+    mBits <<= kShift;
>+    EXPECT_EQ(mBits, BitSet<12>(kSelfShiftedLeft));
>+    EXPECT_EQ(mBits.bits() & ~kMask, 0u);
>+
>+    mBits = BitSet<12>(kSelfValue);
>+    mBits >>= kShift;
>+    EXPECT_EQ(mBits, BitSet<12>(kSelfShiftedRight));
>+    EXPECT_EQ(mBits.bits() & ~kMask, 0u);
>+
>+    mBits |= kSelfMaskedValue;
>+    EXPECT_EQ(mBits.bits() & ~kMask, 0u);
>+    mBits ^= kOtherMaskedValue;
>+    EXPECT_EQ(mBits.bits() & ~kMask, 0u);
>+}
>+
> class BitSetIteratorTest : public testing::Test
> {
>   protected:
>@@ -55,7 +197,7 @@ TEST_F(BitSetIteratorTest, EmptySet)
>     for (size_t bit : mStateBits)
>     {
>         sawBit = true;
>-        UNUSED_VARIABLE(bit);
>+        ANGLE_UNUSED_VARIABLE(bit);
>     }
>     EXPECT_FALSE(sawBit);
> }
>@@ -109,4 +251,53 @@ TEST_F(BitSetIteratorTest, BitAssignment)
>     }
> }
> 
>+// Tests adding bits to the iterator during iteration.
>+TEST_F(BitSetIteratorTest, SetLaterBit)
>+{
>+    std::set<size_t> expectedValues = {1, 3, 5, 7, 9};
>+    mStateBits.set(1);
>+
>+    std::set<size_t> actualValues;
>+
>+    for (auto iter = mStateBits.begin(), end = mStateBits.end(); iter != end; ++iter)
>+    {
>+        if (*iter == 1)
>+        {
>+            iter.setLaterBit(3);
>+            iter.setLaterBit(5);
>+            iter.setLaterBit(7);
>+            iter.setLaterBit(9);
>+        }
>+
>+        actualValues.insert(*iter);
>+    }
>+
>+    EXPECT_EQ(expectedValues, actualValues);
>+}
>+
>+// Tests removing bits from the iterator during iteration.
>+TEST_F(BitSetIteratorTest, ResetLaterBit)
>+{
>+    std::set<size_t> expectedValues = {1, 3, 5, 7, 9};
>+
>+    for (size_t index = 1; index <= 9; ++index)
>+        mStateBits.set(index);
>+
>+    std::set<size_t> actualValues;
>+
>+    for (auto iter = mStateBits.begin(), end = mStateBits.end(); iter != end; ++iter)
>+    {
>+        if (*iter == 1)
>+        {
>+            iter.resetLaterBit(2);
>+            iter.resetLaterBit(4);
>+            iter.resetLaterBit(6);
>+            iter.resetLaterBit(8);
>+        }
>+
>+        actualValues.insert(*iter);
>+    }
>+
>+    EXPECT_EQ(expectedValues, actualValues);
>+}
> }  // anonymous namespace
>diff --git a/Source/ThirdParty/ANGLE/src/common/debug.cpp b/Source/ThirdParty/ANGLE/src/common/debug.cpp
>index b02e80be5f1..6a14631f580 100644
>--- a/Source/ThirdParty/ANGLE/src/common/debug.cpp
>+++ b/Source/ThirdParty/ANGLE/src/common/debug.cpp
>@@ -13,11 +13,16 @@
> #include <array>
> #include <cstdio>
> #include <fstream>
>+#include <mutex>
> #include <ostream>
> #include <vector>
> 
>-#include "common/angleutils.h"
>+#if defined(ANGLE_PLATFORM_ANDROID)
>+#    include <android/log.h>
>+#endif
>+
> #include "common/Optional.h"
>+#include "common/angleutils.h"
> 
> namespace gl
> {
>@@ -27,8 +32,10 @@ namespace
> 
> DebugAnnotator *g_debugAnnotator = nullptr;
> 
>+std::mutex *g_debugMutex = nullptr;
>+
> constexpr std::array<const char *, LOG_NUM_SEVERITIES> g_logSeverityNames = {
>-    {"EVENT", "WARN", "ERR"}};
>+    {"EVENT", "WARN", "ERR", "FATAL"}};
> 
> constexpr const char *LogSeverityName(int severity)
> {
>@@ -41,7 +48,7 @@ bool ShouldCreateLogMessage(LogSeverity severity)
> #if defined(ANGLE_TRACE_ENABLED)
>     return true;
> #elif defined(ANGLE_ENABLE_ASSERTS)
>-    return severity == LOG_ERR;
>+    return severity != LOG_EVENT;
> #else
>     return false;
> #endif
>@@ -61,6 +68,9 @@ bool ShouldCreatePlatformLogMessage(LogSeverity severity)
> #endif
> }
> 
>+// This is never instantiated, it's just used for EAT_STREAM_PARAMETERS to an object of the correct
>+// type on the LHS of the unused part of the ternary operator.
>+std::ostream *gSwallowStream;
> }  // namespace priv
> 
> bool DebugAnnotationsActive()
>@@ -89,10 +99,19 @@ void UninitializeDebugAnnotations()
>     g_debugAnnotator = nullptr;
> }
> 
>-ScopedPerfEventHelper::ScopedPerfEventHelper(const char *format, ...)
>+void InitializeDebugMutexIfNeeded()
> {
>+    if (g_debugMutex == nullptr)
>+    {
>+        g_debugMutex = new std::mutex();
>+    }
>+}
>+
>+ScopedPerfEventHelper::ScopedPerfEventHelper(const char *format, ...) : mFunctionName(nullptr)
>+{
>+    bool dbgTrace = DebugAnnotationsActive();
> #if !defined(ANGLE_ENABLE_DEBUG_TRACE)
>-    if (!DebugAnnotationsActive())
>+    if (!dbgTrace)
>     {
>         return;
>     }
>@@ -103,14 +122,20 @@ ScopedPerfEventHelper::ScopedPerfEventHelper(const char *format, ...)
>     std::vector<char> buffer(512);
>     size_t len = FormatStringIntoVector(format, vararg, buffer);
>     ANGLE_LOG(EVENT) << std::string(&buffer[0], len);
>+    // Pull function name from variable args
>+    mFunctionName = va_arg(vararg, const char *);
>     va_end(vararg);
>+    if (dbgTrace)
>+    {
>+        g_debugAnnotator->beginEvent(mFunctionName, buffer.data());
>+    }
> }
> 
> ScopedPerfEventHelper::~ScopedPerfEventHelper()
> {
>     if (DebugAnnotationsActive())
>     {
>-        g_debugAnnotator->endEvent();
>+        g_debugAnnotator->endEvent(mFunctionName);
>     }
> }
> 
>@@ -126,7 +151,13 @@ LogMessage::LogMessage(const char *function, int line, LogSeverity severity)
> 
> LogMessage::~LogMessage()
> {
>-    if (DebugAnnotationsInitialized() && (mSeverity == LOG_ERR || mSeverity == LOG_WARN))
>+    std::unique_lock<std::mutex> lock;
>+    if (g_debugMutex != nullptr)
>+    {
>+        lock = std::unique_lock<std::mutex>(*g_debugMutex);
>+    }
>+
>+    if (DebugAnnotationsInitialized() && (mSeverity >= LOG_WARN))
>     {
>         g_debugAnnotator->logMessage(*this);
>     }
>@@ -134,6 +165,11 @@ LogMessage::~LogMessage()
>     {
>         Trace(getSeverity(), getMessage().c_str());
>     }
>+
>+    if (mSeverity == LOG_FATAL)
>+    {
>+        ANGLE_CRASH();
>+    }
> }
> 
> void Trace(LogSeverity severity, const char *message)
>@@ -147,42 +183,62 @@ void Trace(LogSeverity severity, const char *message)
> 
>     if (DebugAnnotationsActive())
>     {
>-        std::wstring formattedWideMessage(str.begin(), str.end());
> 
>         switch (severity)
>         {
>             case LOG_EVENT:
>-                g_debugAnnotator->beginEvent(formattedWideMessage.c_str());
>+                // Debugging logging done in ScopedPerfEventHelper
>                 break;
>             default:
>-                g_debugAnnotator->setMarker(formattedWideMessage.c_str());
>+                g_debugAnnotator->setMarker(message);
>                 break;
>         }
>     }
> 
>-    if (severity == LOG_ERR)
>+    if (severity == LOG_FATAL || severity == LOG_ERR || severity == LOG_WARN)
>     {
>+#if defined(ANGLE_PLATFORM_ANDROID)
>+        android_LogPriority android_priority = ANDROID_LOG_ERROR;
>+        switch (severity)
>+        {
>+            case LOG_WARN:
>+                android_priority = ANDROID_LOG_WARN;
>+                break;
>+            case LOG_ERR:
>+                android_priority = ANDROID_LOG_ERROR;
>+                break;
>+            case LOG_FATAL:
>+                android_priority = ANDROID_LOG_FATAL;
>+                break;
>+            default:
>+                UNREACHABLE();
>+        }
>+        __android_log_print(android_priority, "ANGLE", "%s: %s\n", LogSeverityName(severity),
>+                            str.c_str());
>+#else
>         // Note: we use fprintf because <iostream> includes static initializers.
>-        fprintf(stderr, "%s: %s\n", LogSeverityName(severity), str.c_str());
>+        fprintf((severity >= LOG_ERR) ? stderr : stdout, "%s: %s\n", LogSeverityName(severity),
>+                str.c_str());
>+#endif
>     }
> 
> #if defined(ANGLE_PLATFORM_WINDOWS) && \
>     (defined(ANGLE_ENABLE_DEBUG_TRACE_TO_DEBUGGER) || !defined(NDEBUG))
>-#if !defined(ANGLE_ENABLE_DEBUG_TRACE_TO_DEBUGGER)
>-    if (severity == LOG_ERR)
>-#endif  // !defined(ANGLE_ENABLE_DEBUG_TRACE_TO_DEBUGGER)
>+#    if !defined(ANGLE_ENABLE_DEBUG_TRACE_TO_DEBUGGER)
>+    if (severity >= LOG_ERR)
>+#    endif  // !defined(ANGLE_ENABLE_DEBUG_TRACE_TO_DEBUGGER)
>     {
>         OutputDebugStringA(str.c_str());
>     }
> #endif
> 
> #if defined(ANGLE_ENABLE_DEBUG_TRACE)
>-#if defined(NDEBUG)
>+#    if defined(NDEBUG)
>     if (severity == LOG_EVENT || severity == LOG_WARN)
>     {
>         return;
>     }
>-#endif  // defined(NDEBUG)
>+#    endif  // defined(NDEBUG)
>     static std::ofstream file(TRACE_OUTPUT_FILE, std::ofstream::app);
>     if (file)
>     {
>@@ -203,18 +259,15 @@ std::string LogMessage::getMessage() const
> }
> 
> #if defined(ANGLE_PLATFORM_WINDOWS)
>-std::ostream &operator<<(std::ostream &os, const FmtHR &fmt)
>+priv::FmtHexHelper<HRESULT> FmtHR(HRESULT value)
> {
>-    os << "HRESULT: ";
>-    return FmtHexInt(os, fmt.mHR);
>+    return priv::FmtHexHelper<HRESULT>("HRESULT: ", value);
> }
> 
>-std::ostream &operator<<(std::ostream &os, const FmtErr &fmt)
>+priv::FmtHexHelper<DWORD> FmtErr(DWORD value)
> {
>-    os << "error: ";
>-    return FmtHexInt(os, fmt.mErr);
>+    return priv::FmtHexHelper<DWORD>("error: ", value);
> }
>-
> #endif  // defined(ANGLE_PLATFORM_WINDOWS)
> 
> }  // namespace gl
>diff --git a/Source/ThirdParty/ANGLE/src/common/debug.h b/Source/ThirdParty/ANGLE/src/common/debug.h
>index 290a4e8bb75..64783687b33 100644
>--- a/Source/ThirdParty/ANGLE/src/common/debug.h
>+++ b/Source/ThirdParty/ANGLE/src/common/debug.h
>@@ -4,7 +4,8 @@
> // found in the LICENSE file.
> //
> 
>-// debug.h: Debugging utilities.
>+// debug.h: Debugging utilities. A lot of the logging code is adapted from Chromium's
>+// base/logging.h.
> 
> #ifndef COMMON_DEBUG_H_
> #define COMMON_DEBUG_H_
>@@ -12,15 +13,16 @@
> #include <assert.h>
> #include <stdio.h>
> 
>-#include <ios>
> #include <iomanip>
>+#include <ios>
> #include <sstream>
> #include <string>
> 
> #include "common/angleutils.h"
>+#include "common/platform.h"
> 
> #if !defined(TRACE_OUTPUT_FILE)
>-#define TRACE_OUTPUT_FILE "angle_debug.txt"
>+#    define TRACE_OUTPUT_FILE "angle_debug.txt"
> #endif
> 
> namespace gl
>@@ -30,8 +32,12 @@ namespace gl
> class ScopedPerfEventHelper : angle::NonCopyable
> {
>   public:
>-    ScopedPerfEventHelper(const char* format, ...);
>+    ANGLE_FORMAT_PRINTF(2, 3)
>+    ScopedPerfEventHelper(const char *format, ...);
>     ~ScopedPerfEventHelper();
>+
>+  private:
>+    const char *mFunctionName;
> };
> 
> using LogSeverity = int;
>@@ -40,7 +46,8 @@ using LogSeverity = int;
> constexpr LogSeverity LOG_EVENT          = 0;
> constexpr LogSeverity LOG_WARN           = 1;
> constexpr LogSeverity LOG_ERR            = 2;
>-constexpr LogSeverity LOG_NUM_SEVERITIES = 3;
>+constexpr LogSeverity LOG_FATAL          = 3;
>+constexpr LogSeverity LOG_NUM_SEVERITIES = 4;
> 
> void Trace(LogSeverity severity, const char *message);
> 
>@@ -70,17 +77,17 @@ class LogMessage : angle::NonCopyable
>     std::ostringstream mStream;
> };
> 
>-// Wraps the D3D9/D3D11 debug annotation functions.
>+// Wraps the API/Platform-specific debug annotation functions.
> // Also handles redirecting logging destination.
> class DebugAnnotator : angle::NonCopyable
> {
>   public:
>-    DebugAnnotator(){};
>-    virtual ~DebugAnnotator() { };
>-    virtual void beginEvent(const wchar_t *eventName) = 0;
>-    virtual void endEvent() = 0;
>-    virtual void setMarker(const wchar_t *markerName) = 0;
>-    virtual bool getStatus() = 0;
>+    DebugAnnotator() {}
>+    virtual ~DebugAnnotator() {}
>+    virtual void beginEvent(const char *eventName, const char *eventMessage) = 0;
>+    virtual void endEvent(const char *eventName)                             = 0;
>+    virtual void setMarker(const char *markerName)                           = 0;
>+    virtual bool getStatus()                                                 = 0;
>     // Log Message Handler that gets passed every log message,
>     // when debug annotations are initialized,
>     // replacing default handling by LogMessage.
>@@ -92,6 +99,8 @@ void UninitializeDebugAnnotations();
> bool DebugAnnotationsActive();
> bool DebugAnnotationsInitialized();
> 
>+void InitializeDebugMutexIfNeeded();
>+
> namespace priv
> {
> // This class is used to explicitly ignore values in the conditional logging macros. This avoids
>@@ -104,6 +113,8 @@ class LogMessageVoidify
>     void operator&(std::ostream &) {}
> };
> 
>+extern std::ostream *gSwallowStream;
>+
> // Used by ANGLE_LOG_IS_ON to lazy-evaluate stream arguments.
> bool ShouldCreatePlatformLogMessage(LogSeverity severity);
> 
>@@ -124,39 +135,52 @@ std::ostream &FmtHex(std::ostream &os, T value)
> 
>     return os;
> }
>-}  // namespace priv
> 
>-#if defined(ANGLE_PLATFORM_WINDOWS)
>-class FmtHR
>+template <typename T>
>+std::ostream &FmtHexAutoSized(std::ostream &os, T value)
> {
>-  public:
>-    explicit FmtHR(HRESULT hresult) : mHR(hresult) {}
>-  private:
>-    HRESULT mHR;
>-    friend std::ostream &operator<<(std::ostream &os, const FmtHR &fmt);
>-};
>+    constexpr int N = sizeof(T) * 2;
>+    return priv::FmtHex<N>(os, value);
>+}
> 
>-class FmtErr
>+template <typename T>
>+class FmtHexHelper
> {
>   public:
>-    explicit FmtErr(DWORD err) : mErr(err) {}
>+    FmtHexHelper(const char *prefix, T value) : mPrefix(prefix), mValue(value) {}
>+    explicit FmtHexHelper(T value) : mPrefix(nullptr), mValue(value) {}
> 
>   private:
>-    DWORD mErr;
>-    friend std::ostream &operator<<(std::ostream &os, const FmtErr &fmt);
>+    const char *mPrefix;
>+    T mValue;
>+
>+    friend std::ostream &operator<<(std::ostream &os, const FmtHexHelper &fmt)
>+    {
>+        if (fmt.mPrefix)
>+        {
>+            os << fmt.mPrefix;
>+        }
>+        return FmtHexAutoSized(os, fmt.mValue);
>+    }
> };
>-#endif  // defined(ANGLE_PLATFORM_WINDOWS)
>+
>+}  // namespace priv
> 
> template <typename T>
>-std::ostream &FmtHexShort(std::ostream &os, T value)
>+priv::FmtHexHelper<T> FmtHex(T value)
> {
>-    return priv::FmtHex<4>(os, value);
>+    return priv::FmtHexHelper<T>(value);
> }
> 
>+#if defined(ANGLE_PLATFORM_WINDOWS)
>+priv::FmtHexHelper<HRESULT> FmtHR(HRESULT value);
>+priv::FmtHexHelper<DWORD> FmtErr(DWORD value);
>+#endif  // defined(ANGLE_PLATFORM_WINDOWS)
>+
> template <typename T>
>-std::ostream &FmtHexInt(std::ostream &os, T value)
>+std::ostream &FmtHex(std::ostream &os, T value)
> {
>-    return priv::FmtHex<8>(os, value);
>+    return priv::FmtHexAutoSized(os, value);
> }
> 
> // A few definitions of macros that don't generate much code. These are used
>@@ -168,10 +192,13 @@ std::ostream &FmtHexInt(std::ostream &os, T value)
>     ::gl::ClassName(__FUNCTION__, __LINE__, ::gl::LOG_WARN, ##__VA_ARGS__)
> #define COMPACT_ANGLE_LOG_EX_ERR(ClassName, ...) \
>     ::gl::ClassName(__FUNCTION__, __LINE__, ::gl::LOG_ERR, ##__VA_ARGS__)
>+#define COMPACT_ANGLE_LOG_EX_FATAL(ClassName, ...) \
>+    ::gl::ClassName(__FUNCTION__, __LINE__, ::gl::LOG_FATAL, ##__VA_ARGS__)
> 
> #define COMPACT_ANGLE_LOG_EVENT COMPACT_ANGLE_LOG_EX_EVENT(LogMessage)
> #define COMPACT_ANGLE_LOG_WARN COMPACT_ANGLE_LOG_EX_WARN(LogMessage)
> #define COMPACT_ANGLE_LOG_ERR COMPACT_ANGLE_LOG_EX_ERR(LogMessage)
>+#define COMPACT_ANGLE_LOG_FATAL COMPACT_ANGLE_LOG_EX_FATAL(LogMessage)
> 
> #define ANGLE_LOG_IS_ON(severity) (::gl::priv::ShouldCreatePlatformLogMessage(::gl::LOG_##severity))
> 
>@@ -195,92 +222,140 @@ std::ostream &FmtHexInt(std::ostream &os, T value)
> }  // namespace gl
> 
> #if defined(ANGLE_ENABLE_DEBUG_TRACE) || defined(ANGLE_ENABLE_DEBUG_ANNOTATIONS)
>-#define ANGLE_TRACE_ENABLED
>+#    define ANGLE_TRACE_ENABLED
> #endif
> 
>-#define ANGLE_EMPTY_STATEMENT for (;;) break
> #if !defined(NDEBUG) || defined(ANGLE_ENABLE_RELEASE_ASSERTS)
>-#define ANGLE_ENABLE_ASSERTS
>+#    define ANGLE_ENABLE_ASSERTS
> #endif
> 
> #define WARN() ANGLE_LOG(WARN)
> #define ERR() ANGLE_LOG(ERR)
>+#define FATAL() ANGLE_LOG(FATAL)
> 
> // A macro to log a performance event around a scope.
> #if defined(ANGLE_TRACE_ENABLED)
>-#if defined(_MSC_VER)
>-#define EVENT(message, ...) gl::ScopedPerfEventHelper scopedPerfEventHelper ## __LINE__("%s" message "\n", __FUNCTION__, __VA_ARGS__);
>-#else
>-#define EVENT(message, ...) gl::ScopedPerfEventHelper scopedPerfEventHelper("%s" message "\n", __FUNCTION__, ##__VA_ARGS__);
>-#endif // _MSC_VER
>+#    if defined(_MSC_VER)
>+#        define EVENT(message, ...)                                                      \
>+            gl::ScopedPerfEventHelper scopedPerfEventHelper##__LINE__("%s" message "\n", \
>+                                                                      __FUNCTION__, __VA_ARGS__)
>+#    else
>+#        define EVENT(message, ...)                                                          \
>+            gl::ScopedPerfEventHelper scopedPerfEventHelper("%s" message "\n", __FUNCTION__, \
>+                                                            ##__VA_ARGS__)
>+#    endif  // _MSC_VER
> #else
>-#define EVENT(message, ...) (void(0))
>+#    define EVENT(message, ...) (void(0))
> #endif
> 
> #if defined(COMPILER_GCC) || defined(__clang__)
>-#define ANGLE_CRASH() __builtin_trap()
>+#    define ANGLE_CRASH() __builtin_trap()
> #else
>-#define ANGLE_CRASH() ((void)(*(volatile char *)0 = 0))
>+#    define ANGLE_CRASH() ((void)(*(volatile char *)0 = 0)), __assume(0)
> #endif
> 
> #if !defined(NDEBUG)
>-#define ANGLE_ASSERT_IMPL(expression) assert(expression)
>+#    define ANGLE_ASSERT_IMPL(expression) assert(expression)
> #else
> // TODO(jmadill): Detect if debugger is attached and break.
>-#define ANGLE_ASSERT_IMPL(expression) ANGLE_CRASH()
>+#    define ANGLE_ASSERT_IMPL(expression) ANGLE_CRASH()
> #endif  // !defined(NDEBUG)
> 
>+// Note that gSwallowStream is used instead of an arbitrary LOG() stream to avoid the creation of an
>+// object with a non-trivial destructor (LogMessage). On MSVC x86 (checked on 2015 Update 3), this
>+// causes a few additional pointless instructions to be emitted even at full optimization level,
>+// even though the : arm of the ternary operator is clearly never executed. Using a simpler object
>+// to be &'d with Voidify() avoids these extra instructions. Using a simpler POD object with a
>+// templated operator<< also works to avoid these instructions. However, this causes warnings on
>+// statically defined implementations of operator<<(std::ostream, ...) in some .cpp files, because
>+// they become defined-but-unreferenced functions. A reinterpret_cast of 0 to an ostream* also is
>+// not suitable, because some compilers warn of undefined behavior.
>+#define ANGLE_EAT_STREAM_PARAMETERS \
>+    true ? static_cast<void>(0) : ::gl::priv::LogMessageVoidify() & (*::gl::priv::gSwallowStream)
>+
> // A macro asserting a condition and outputting failures to the debug log
> #if defined(ANGLE_ENABLE_ASSERTS)
>-#define ASSERT(expression)                                                                         \
>-    (expression ? static_cast<void>(0) : ((ERR() << "\t! Assert failed in " << __FUNCTION__ << "(" \
>-                                                 << __LINE__ << "): " << #expression),             \
>-                                          ANGLE_ASSERT_IMPL(expression)))
>+#    define ASSERT(expression)                                                               \
>+        (expression ? static_cast<void>(0)                                                   \
>+                    : (FATAL() << "\t! Assert failed in " << __FUNCTION__ << "(" << __LINE__ \
>+                               << "): " << #expression))
> #else
>-// These are just dummy values.
>-#define COMPACT_ANGLE_LOG_EX_ASSERT(ClassName, ...) \
>-    COMPACT_ANGLE_LOG_EX_EVENT(ClassName, ##__VA_ARGS__)
>-#define COMPACT_ANGLE_LOG_ASSERT COMPACT_ANGLE_LOG_EVENT
>-namespace gl
>-{
>-constexpr LogSeverity LOG_ASSERT = LOG_EVENT;
>-}  // namespace gl
>-
>-#define ASSERT(condition)                                                     \
>-    ANGLE_LAZY_STREAM(ANGLE_LOG_STREAM(ASSERT), false ? !(condition) : false) \
>-        << "Check failed: " #condition ". "
>+#    define ASSERT(condition) ANGLE_EAT_STREAM_PARAMETERS << !(condition)
> #endif  // defined(ANGLE_ENABLE_ASSERTS)
> 
>-#define UNUSED_VARIABLE(variable) ((void)variable)
>+#define UNREACHABLE_IS_NORETURN 0
>+
>+#define ANGLE_UNUSED_VARIABLE(variable) (static_cast<void>(variable))
> 
> // A macro to indicate unimplemented functionality
> #ifndef NOASSERT_UNIMPLEMENTED
>-#define NOASSERT_UNIMPLEMENTED 1
>+#    define NOASSERT_UNIMPLEMENTED 1
> #endif
> 
> #if defined(ANGLE_TRACE_ENABLED) || defined(ANGLE_ENABLE_ASSERTS)
>-#define UNIMPLEMENTED()                                                                      \
>-    {                                                                                        \
>-        ERR() << "\t! Unimplemented: " << __FUNCTION__ << "(" << __FILE__ << ":" << __LINE__ \
>-              << ")";                                                                        \
>-        ASSERT(NOASSERT_UNIMPLEMENTED);                                                      \
>-    }                                                                                        \
>-    ANGLE_EMPTY_STATEMENT
>+#    define UNIMPLEMENTED()                                                                       \
>+        do                                                                                        \
>+        {                                                                                         \
>+            WARN() << "\t! Unimplemented: " << __FUNCTION__ << "(" << __FILE__ << ":" << __LINE__ \
>+                   << ")";                                                                        \
>+            ASSERT(NOASSERT_UNIMPLEMENTED);                                                       \
>+        } while (0)
> 
> // A macro for code which is not expected to be reached under valid assumptions
>-#define UNREACHABLE()                                                                            \
>-    ((ERR() << "\t! Unreachable reached: " << __FUNCTION__ << "(" << __FILE__ << ":" << __LINE__ \
>-            << ")"),                                                                             \
>-     ASSERT(false))
>+#    define UNREACHABLE()                                                                    \
>+        do                                                                                   \
>+        {                                                                                    \
>+            FATAL() << "\t! Unreachable reached: " << __FUNCTION__ << "(" << __FILE__ << ":" \
>+                    << __LINE__ << ")";                                                      \
>+        } while (0)
> #else
>-#define UNIMPLEMENTED()                 \
>-    {                                   \
>-        ASSERT(NOASSERT_UNIMPLEMENTED); \
>-    }                                   \
>-    ANGLE_EMPTY_STATEMENT
>+#    define UNIMPLEMENTED()                 \
>+        do                                  \
>+        {                                   \
>+            ASSERT(NOASSERT_UNIMPLEMENTED); \
>+        } while (0)
> 
> // A macro for code which is not expected to be reached under valid assumptions
>-#define UNREACHABLE() ASSERT(false)
>+#    define UNREACHABLE()  \
>+        do                 \
>+        {                  \
>+            ASSERT(false); \
>+        } while (0)
> #endif  // defined(ANGLE_TRACE_ENABLED) || defined(ANGLE_ENABLE_ASSERTS)
> 
>-#endif   // COMMON_DEBUG_H_
>+#if defined(ANGLE_PLATFORM_WINDOWS)
>+#    define ANGLE_FUNCTION __FUNCTION__
>+#else
>+#    define ANGLE_FUNCTION __func__
>+#endif
>+
>+// Defining ANGLE_ENABLE_STRUCT_PADDING_WARNINGS will enable warnings when members are added to
>+// structs to enforce packing. This is helpful for diagnosing unexpected struct sizes when making
>+// fast cache variables.
>+#if defined(__clang__)
>+#    define ANGLE_ENABLE_STRUCT_PADDING_WARNINGS \
>+        _Pragma("clang diagnostic push") _Pragma("clang diagnostic error \"-Wpadded\"")
>+#    define ANGLE_DISABLE_STRUCT_PADDING_WARNINGS _Pragma("clang diagnostic pop")
>+#elif defined(COMPILER_GCC)
>+#    define ANGLE_ENABLE_STRUCT_PADDING_WARNINGS \
>+        _Pragma("GCC diagnostic push") _Pragma("GCC diagnostic error \"-Wpadded\"")
>+#    define ANGLE_DISABLE_STRUCT_PADDING_WARNINGS _Pragma("GCC diagnostic pop")
>+#elif defined(_MSC_VER)
>+#    define ANGLE_ENABLE_STRUCT_PADDING_WARNINGS \
>+        __pragma(warning(push)) __pragma(warning(error : 4820))
>+#    define ANGLE_DISABLE_STRUCT_PADDING_WARNINGS __pragma(warning(pop))
>+#else
>+#    define ANGLE_ENABLE_STRUCT_PADDING_WARNINGS
>+#    define ANGLE_DISABLE_STRUCT_PADDING_WARNINGS
>+#endif
>+
>+#if defined(__clang__)
>+#    define ANGLE_DISABLE_EXTRA_SEMI_WARNING \
>+        _Pragma("clang diagnostic push") _Pragma("clang diagnostic ignored \"-Wextra-semi\"")
>+#    define ANGLE_REENABLE_EXTRA_SEMI_WARNING _Pragma("clang diagnostic pop")
>+#else
>+#    define ANGLE_DISABLE_EXTRA_SEMI_WARNING
>+#    define ANGLE_REENABLE_EXTRA_SEMI_WARNING
>+#endif
>+
>+#endif  // COMMON_DEBUG_H_
>diff --git a/Source/ThirdParty/ANGLE/src/common/event_tracer.cpp b/Source/ThirdParty/ANGLE/src/common/event_tracer.cpp
>index 6dc8458accf..8e810df8560 100644
>--- a/Source/ThirdParty/ANGLE/src/common/event_tracer.cpp
>+++ b/Source/ThirdParty/ANGLE/src/common/event_tracer.cpp
>@@ -45,7 +45,6 @@ angle::TraceEventHandle AddTraceEvent(char phase,
>         angle::TraceEventHandle handle =
>             platform->addTraceEvent(platform, phase, categoryGroupEnabled, name, id, timestamp,
>                                     numArgs, argNames, argTypes, argValues, flags);
>-        ASSERT(handle != 0);
>         return handle;
>     }
> 
>diff --git a/Source/ThirdParty/ANGLE/src/common/event_tracer.h b/Source/ThirdParty/ANGLE/src/common/event_tracer.h
>index 9b30c750c1f..0c275524268 100644
>--- a/Source/ThirdParty/ANGLE/src/common/event_tracer.h
>+++ b/Source/ThirdParty/ANGLE/src/common/event_tracer.h
>@@ -11,7 +11,7 @@
> namespace angle
> {
> 
>-const unsigned char *GetTraceCategoryEnabledFlag(const char* name);
>+const unsigned char *GetTraceCategoryEnabledFlag(const char *name);
> angle::TraceEventHandle AddTraceEvent(char phase,
>                                       const unsigned char *categoryGroupEnabled,
>                                       const char *name,
>@@ -21,6 +21,6 @@ angle::TraceEventHandle AddTraceEvent(char phase,
>                                       const unsigned char *argTypes,
>                                       const unsigned long long *argValues,
>                                       unsigned char flags);
>-}
>+}  // namespace angle
> 
> #endif  // COMMON_EVENT_TRACER_H_
>diff --git a/Source/ThirdParty/ANGLE/src/common/fuchsia_egl/BUILD.gn b/Source/ThirdParty/ANGLE/src/common/fuchsia_egl/BUILD.gn
>new file mode 100644
>index 00000000000..84a12319023
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/common/fuchsia_egl/BUILD.gn
>@@ -0,0 +1,30 @@
>+# Copyright 2019 The Fuchsia Authors. All rights reserved.
>+# Use of this source code is governed by a BSD-style license that can be
>+# found in the LICENSE file.
>+
>+import("../../../gni/angle.gni")
>+
>+assert(is_fuchsia)
>+
>+config("config") {
>+  include_dirs = [ "." ]
>+}
>+
>+angle_shared_library("fuchsia_egl") {
>+  sources = [
>+    "fuchsia_egl.c",
>+  ]
>+  public = [
>+    "fuchsia_egl.h",
>+  ]
>+  public_configs = [":config"]
>+  deps = [
>+    ":backend",
>+  ]
>+}
>+
>+angle_source_set("backend") {
>+  public = [
>+    "fuchsia_egl_backend.h",
>+  ]
>+}
>diff --git a/Source/ThirdParty/ANGLE/src/common/fuchsia_egl/fuchsia_egl.c b/Source/ThirdParty/ANGLE/src/common/fuchsia_egl/fuchsia_egl.c
>new file mode 100644
>index 00000000000..d22f1b5e007
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/common/fuchsia_egl/fuchsia_egl.c
>@@ -0,0 +1,75 @@
>+// Copyright 2019 The Fuchsia Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+
>+#include "fuchsia_egl.h"
>+#include "fuchsia_egl_backend.h"
>+
>+#include <zircon/assert.h>
>+#include <zircon/syscalls.h>
>+
>+#define FUCHSIA_EGL_WINDOW_MAGIC 0x80738870  // "FXIP"
>+
>+struct fuchsia_egl_window
>+{
>+    uint32_t magic;
>+    zx_handle_t image_pipe_handle;
>+    int32_t width;
>+    int32_t height;
>+};
>+
>+fuchsia_egl_window *fuchsia_egl_window_create(zx_handle_t image_pipe_handle,
>+                                              int32_t width,
>+                                              int32_t height)
>+{
>+    if (width <= 0 || height <= 0)
>+        return NULL;
>+
>+    fuchsia_egl_window *egl_window = malloc(sizeof(*egl_window));
>+    egl_window->magic              = FUCHSIA_EGL_WINDOW_MAGIC;
>+    egl_window->image_pipe_handle  = image_pipe_handle;
>+    egl_window->width              = width;
>+    egl_window->height             = height;
>+    return egl_window;
>+}
>+
>+void fuchsia_egl_window_destroy(fuchsia_egl_window *egl_window)
>+{
>+    ZX_ASSERT(egl_window->magic == FUCHSIA_EGL_WINDOW_MAGIC);
>+    if (egl_window->image_pipe_handle != ZX_HANDLE_INVALID)
>+    {
>+        zx_handle_close(egl_window->image_pipe_handle);
>+        egl_window->image_pipe_handle = ZX_HANDLE_INVALID;
>+    }
>+    egl_window->magic = -1U;
>+    free(egl_window);
>+}
>+
>+void fuchsia_egl_window_resize(fuchsia_egl_window *egl_window, int32_t width, int32_t height)
>+{
>+    ZX_ASSERT(egl_window->magic == FUCHSIA_EGL_WINDOW_MAGIC);
>+    if (width <= 0 || height <= 0)
>+        return;
>+    egl_window->width  = width;
>+    egl_window->height = height;
>+}
>+
>+int32_t fuchsia_egl_window_get_width(fuchsia_egl_window *egl_window)
>+{
>+    ZX_ASSERT(egl_window->magic == FUCHSIA_EGL_WINDOW_MAGIC);
>+    return egl_window->width;
>+}
>+
>+int32_t fuchsia_egl_window_get_height(fuchsia_egl_window *egl_window)
>+{
>+    ZX_ASSERT(egl_window->magic == FUCHSIA_EGL_WINDOW_MAGIC);
>+    return egl_window->height;
>+}
>+
>+zx_handle_t fuchsia_egl_window_release_image_pipe(fuchsia_egl_window *egl_window)
>+{
>+    ZX_ASSERT(egl_window->magic == FUCHSIA_EGL_WINDOW_MAGIC);
>+    zx_handle_t image_pipe_handle = egl_window->image_pipe_handle;
>+    egl_window->image_pipe_handle = ZX_HANDLE_INVALID;
>+    return image_pipe_handle;
>+}
>diff --git a/Source/ThirdParty/ANGLE/src/common/fuchsia_egl/fuchsia_egl.h b/Source/ThirdParty/ANGLE/src/common/fuchsia_egl/fuchsia_egl.h
>new file mode 100644
>index 00000000000..068b87d1db1
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/common/fuchsia_egl/fuchsia_egl.h
>@@ -0,0 +1,42 @@
>+// Copyright 2019 The Fuchsia Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+
>+#ifndef FUCHSIA_EGL_H_
>+#define FUCHSIA_EGL_H_
>+
>+#include <inttypes.h>
>+#include <zircon/types.h>
>+
>+#ifdef __cplusplus
>+extern "C" {
>+#endif
>+
>+#if !defined(FUCHSIA_EGL_EXPORT)
>+#    define FUCHSIA_EGL_EXPORT __attribute__((__visibility__("default")))
>+#endif
>+
>+typedef struct fuchsia_egl_window fuchsia_egl_window;
>+
>+FUCHSIA_EGL_EXPORT
>+fuchsia_egl_window *fuchsia_egl_window_create(zx_handle_t image_pipe_handle,
>+                                              int32_t width,
>+                                              int32_t height);
>+
>+FUCHSIA_EGL_EXPORT
>+void fuchsia_egl_window_destroy(fuchsia_egl_window *egl_window);
>+
>+FUCHSIA_EGL_EXPORT
>+void fuchsia_egl_window_resize(fuchsia_egl_window *egl_window, int32_t width, int32_t height);
>+
>+FUCHSIA_EGL_EXPORT
>+int32_t fuchsia_egl_window_get_width(fuchsia_egl_window *egl_window);
>+
>+FUCHSIA_EGL_EXPORT
>+int32_t fuchsia_egl_window_get_height(fuchsia_egl_window *egl_window);
>+
>+#ifdef __cplusplus
>+}
>+#endif
>+
>+#endif  // FUCHSIA_EGL_H_
>diff --git a/Source/ThirdParty/ANGLE/src/common/fuchsia_egl/fuchsia_egl_backend.h b/Source/ThirdParty/ANGLE/src/common/fuchsia_egl/fuchsia_egl_backend.h
>new file mode 100644
>index 00000000000..dcbc3f772bc
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/common/fuchsia_egl/fuchsia_egl_backend.h
>@@ -0,0 +1,25 @@
>+// Copyright 2019 The Fuchsia Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+
>+#ifndef FUCHSIA_EGL_BACKEND_H_
>+#define FUCHSIA_EGL_BACKEND_H_
>+
>+#include <zircon/types.h>
>+
>+#ifdef __cplusplus
>+extern "C" {
>+#endif
>+
>+#if !defined(FUCHSIA_EGL_EXPORT)
>+#    define FUCHSIA_EGL_EXPORT __attribute__((__visibility__("default")))
>+#endif
>+
>+FUCHSIA_EGL_EXPORT
>+zx_handle_t fuchsia_egl_window_release_image_pipe(fuchsia_egl_window *egl_window);
>+
>+#ifdef __cplusplus
>+}
>+#endif
>+
>+#endif  // FUCHSIA_EGL_BACKEND_H_
>diff --git a/Source/ThirdParty/ANGLE/src/common/gen_packed_gl_enums.py b/Source/ThirdParty/ANGLE/src/common/gen_packed_gl_enums.py
>new file mode 100644
>index 00000000000..2f77e72563b
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/common/gen_packed_gl_enums.py
>@@ -0,0 +1,245 @@
>+# Copyright 2018 The ANGLE Project Authors. All rights reserved.
>+# Use of this source code is governed by a BSD-style license that can be
>+# found in the LICENSE file.
>+#
>+# gen_packed_gl_enums.py:
>+#   Code generation for the packed enums.
>+#   NOTE: don't run this script directly. Run scripts/run_code_generation.py.
>+
>+import datetime, json, os, sys
>+from collections import namedtuple
>+from collections import OrderedDict
>+
>+Enum = namedtuple('Enum', ['name', 'values', 'max_value'])
>+EnumValue = namedtuple('EnumValue', ['name', 'gl_name', 'value'])
>+
>+Generators = [
>+    {
>+        'json': 'packed_gl_enums.json',
>+        'output': 'PackedGLEnums',
>+        'namespace': 'gl',
>+        'enum_type': 'GLenum',
>+    },
>+    {
>+        'json': 'packed_egl_enums.json',
>+        'output': 'PackedEGLEnums',
>+        'namespace': 'egl',
>+        'enum_type': 'EGLenum',
>+    },
>+]
>+
>+def load_enums(path):
>+    with open(path) as map_file:
>+        enums_dict = json.loads(map_file.read(), object_pairs_hook=OrderedDict)
>+
>+    enums = []
>+    for (enum_name, value_list) in enums_dict.iteritems():
>+
>+        values = []
>+        i = 0
>+
>+        for (value_name, value_gl_name) in value_list.iteritems():
>+            values.append(EnumValue(value_name, value_gl_name, i))
>+            i += 1
>+
>+        assert(i < 255) # This makes sure enums fit in the uint8_t
>+        enums.append(Enum(enum_name, values, i))
>+
>+    enums.sort(key=lambda enum: enum.name)
>+    return enums
>+
>+def generate_include_guard(path):
>+    return path.replace(".", "_").upper()
>+
>+def header_name_from_cpp_name(path):
>+    return path.replace(".cpp", ".h")
>+
>+header_template = """// GENERATED FILE - DO NOT EDIT.
>+// Generated by {script_name} using data from {data_source_name}.
>+//
>+// Copyright {copyright_year} The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// {file_name}:
>+//   Declares ANGLE-specific enums classes for {api_enum_name}s and functions operating
>+//   on them.
>+
>+#ifndef COMMON_{include_guard}_
>+#define COMMON_{include_guard}_
>+
>+#include <angle_gl.h>
>+#include <EGL/egl.h>
>+#include <EGL/eglext.h>
>+
>+#include <cstdint>
>+
>+namespace {namespace}
>+{{
>+
>+template<typename Enum>
>+Enum From{api_enum_name}({api_enum_name} from);
>+{content}
>+}}  // namespace {namespace}
>+
>+#endif // COMMON_{include_guard}_
>+"""
>+
>+enum_declaration_template = """
>+enum class {enum_name} : uint8_t
>+{{
>+{value_declarations}
>+
>+    InvalidEnum = {max_value},
>+    EnumCount = {max_value},
>+}};
>+
>+template <>
>+{enum_name} From{api_enum_name}<{enum_name}>({api_enum_name} from);
>+{api_enum_name} To{api_enum_name}({enum_name} from);
>+"""
>+
>+def write_header(enums, path_prefix, file_name, data_source_name, namespace, api_enum_name):
>+    content = ['']
>+
>+    for enum in enums:
>+        value_declarations = []
>+        for value in enum.values:
>+            value_declarations.append('    ' + value.name + ' = ' + str(value.value) + ',')
>+
>+        content.append(enum_declaration_template.format(
>+            enum_name = enum.name,
>+            max_value = str(enum.max_value),
>+            value_declarations = '\n'.join(value_declarations),
>+            api_enum_name = api_enum_name
>+        ))
>+
>+    header = header_template.format(
>+        content = ''.join(content),
>+        copyright_year = datetime.date.today().year,
>+        data_source_name = data_source_name,
>+        script_name = sys.argv[0],
>+        file_name = file_name,
>+        include_guard = generate_include_guard(file_name),
>+        namespace = namespace,
>+        api_enum_name = api_enum_name
>+    )
>+
>+    with (open(path_prefix + file_name, 'wt')) as f:
>+        f.write(header)
>+
>+cpp_template = """// GENERATED FILE - DO NOT EDIT.
>+// Generated by {script_name} using data from {data_source_name}.
>+//
>+// Copyright {copyright_year} The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// {file_name}:
>+//   Implements ANGLE-specific enums classes for {api_enum_name}s and functions operating
>+//   on them.
>+
>+#include "common/debug.h"
>+#include "common/{header_name}"
>+
>+namespace {namespace}
>+{{
>+{content}
>+}}  // namespace {namespace}
>+"""
>+
>+enum_implementation_template = """
>+template <>
>+{enum_name} From{api_enum_name}<{enum_name}>({api_enum_name} from)
>+{{
>+    switch (from)
>+    {{
>+{from_glenum_cases}
>+        default:
>+            return {enum_name}::InvalidEnum;
>+    }}
>+}}
>+
>+{api_enum_name} To{api_enum_name}({enum_name} from)
>+{{
>+    switch (from)
>+    {{
>+{to_glenum_cases}
>+        default:
>+            UNREACHABLE();
>+            return 0;
>+    }}
>+}}
>+"""
>+
>+def write_cpp(enums, path_prefix, file_name, data_source_name, namespace, api_enum_name):
>+    content = ['']
>+
>+    for enum in enums:
>+        from_glenum_cases = []
>+        to_glenum_cases = []
>+        for value in enum.values:
>+            qualified_name = enum.name + '::' + value.name
>+            from_glenum_cases.append('        case ' + value.gl_name + ':\n            return ' + qualified_name + ';')
>+            to_glenum_cases.append('        case ' + qualified_name + ':\n            return ' + value.gl_name + ';')
>+
>+        content.append(enum_implementation_template.format(
>+            enum_name = enum.name,
>+            from_glenum_cases = '\n'.join(from_glenum_cases),
>+            max_value = str(enum.max_value),
>+            to_glenum_cases = '\n'.join(to_glenum_cases),
>+            api_enum_name = api_enum_name
>+        ))
>+
>+    cpp = cpp_template.format(
>+        content = ''.join(content),
>+        copyright_year = datetime.date.today().year,
>+        data_source_name = data_source_name,
>+        script_name = sys.argv[0],
>+        file_name = file_name,
>+        header_name = header_name_from_cpp_name(file_name),
>+        namespace = namespace,
>+        api_enum_name = api_enum_name
>+    )
>+
>+    with (open(path_prefix + file_name, 'wt')) as f:
>+        f.write(cpp)
>+
>+
>+def main():
>+
>+    # auto_script parameters.
>+    if len(sys.argv) > 1:
>+        inputs = []
>+        outputs = []
>+        for generator in Generators:
>+            inputs += [generator['json']]
>+            outputs += [
>+                generator['output'] + '_autogen.cpp',
>+                generator['output'] + '_autogen.h',
>+            ]
>+
>+        if sys.argv[1] == 'inputs':
>+            print ','.join(inputs)
>+        elif sys.argv[1] == 'outputs':
>+            print ','.join(outputs)
>+        else:
>+            print('Invalid script parameters')
>+            return 1
>+        return 0
>+
>+    path_prefix = os.path.dirname(os.path.realpath(__file__)) + os.path.sep
>+
>+    for generator in Generators:
>+        json_file = generator['json']
>+        output_file = generator['output']
>+        namespace = generator['namespace']
>+        enum_type = generator['enum_type']
>+        enums = load_enums(path_prefix + json_file)
>+        write_header(enums, path_prefix, output_file + '_autogen.h', json_file, namespace, enum_type)
>+        write_cpp(enums, path_prefix, output_file + '_autogen.cpp', json_file, namespace, enum_type)
>+    return 0
>+
>+
>+if __name__ == '__main__':
>+    sys.exit(main())
>diff --git a/Source/ThirdParty/ANGLE/src/common/gen_uniform_type_table.py b/Source/ThirdParty/ANGLE/src/common/gen_uniform_type_table.py
>index c824eef10a3..21891a8e327 100644
>--- a/Source/ThirdParty/ANGLE/src/common/gen_uniform_type_table.py
>+++ b/Source/ThirdParty/ANGLE/src/common/gen_uniform_type_table.py
>@@ -5,6 +5,7 @@
> #
> # gen_uniform_type_table.py:
> #  Code generation for OpenGL uniform type info tables.
>+#  NOTE: don't run this script directly. Run scripts/run_code_generation.py.
> 
> from datetime import date
> 
>@@ -41,6 +42,7 @@ all_uniform_types = [
>     "GL_INT_SAMPLER_2D",
>     "GL_INT_SAMPLER_2D_ARRAY",
>     "GL_INT_SAMPLER_2D_MULTISAMPLE",
>+    "GL_INT_SAMPLER_2D_MULTISAMPLE_ARRAY",
>     "GL_INT_SAMPLER_3D",
>     "GL_INT_SAMPLER_CUBE",
>     "GL_INT_VEC2",
>@@ -50,6 +52,7 @@ all_uniform_types = [
>     "GL_SAMPLER_2D_ARRAY",
>     "GL_SAMPLER_2D_ARRAY_SHADOW",
>     "GL_SAMPLER_2D_MULTISAMPLE",
>+    "GL_SAMPLER_2D_MULTISAMPLE_ARRAY",
>     "GL_SAMPLER_2D_RECT_ANGLE",
>     "GL_SAMPLER_2D_SHADOW",
>     "GL_SAMPLER_3D",
>@@ -65,6 +68,7 @@ all_uniform_types = [
>     "GL_UNSIGNED_INT_SAMPLER_2D",
>     "GL_UNSIGNED_INT_SAMPLER_2D_ARRAY",
>     "GL_UNSIGNED_INT_SAMPLER_2D_MULTISAMPLE",
>+    "GL_UNSIGNED_INT_SAMPLER_2D_MULTISAMPLE_ARRAY",
>     "GL_UNSIGNED_INT_SAMPLER_3D",
>     "GL_UNSIGNED_INT_SAMPLER_CUBE",
>     "GL_UNSIGNED_INT_VEC2",
>@@ -79,6 +83,7 @@ texture_types = {
>     "2D_ARRAY": "2D_ARRAY",
>     "2D_ARRAY_SHADOW": "2D_ARRAY",
>     "2D_MULTISAMPLE": "2D_MULTISAMPLE",
>+    "2D_MULTISAMPLE_ARRAY": "2D_MULTISAMPLE_ARRAY",
>     "2D_RECT_ANGLE": "2D",
>     "2D_SHADOW": "2D",
>     "3D": "3D",
>@@ -134,7 +139,7 @@ const UniformTypeInfo &GetUniformTypeInfo(GLenum uniformType)
> }}  // namespace gl
> """
> 
>-type_info_data_template = """{{{type}, {component_type}, {texture_type}, {transposed_type}, {bool_type}, {rows}, {columns}, {components}, {component_size}, {internal_size}, {external_size}, {is_sampler}, {is_matrix}, {is_image} }}"""
>+type_info_data_template = """{{{type}, {component_type}, {texture_type}, {transposed_type}, {bool_type}, {sampler_format}, {rows}, {columns}, {components}, {component_size}, {internal_size}, {external_size}, {is_sampler}, {is_matrix}, {is_image} }}"""
> type_index_case_template = """case {enum_value}: return {index_value};"""
> 
> def cpp_bool(value):
>@@ -177,6 +182,18 @@ def get_bool_type(uniform_type):
>     else:
>         return "GL_NONE"
> 
>+def get_sampler_format(uniform_type):
>+    if not "_SAMPLER_" in uniform_type:
>+        return "SamplerFormat::InvalidEnum"
>+    elif "_SHADOW" in uniform_type:
>+        return "SamplerFormat::Shadow"
>+    elif "GL_UNSIGNED_INT_SAMPLER_" in uniform_type:
>+        return "SamplerFormat::Unsigned"
>+    elif "GL_INT_SAMPLER_" in uniform_type:
>+        return "SamplerFormat::Signed"
>+    else:
>+        return "SamplerFormat::Float"
>+
> def get_rows(uniform_type):
>     if uniform_type == "GL_NONE":
>         return "0"
>@@ -235,6 +252,7 @@ def gen_type_info(uniform_type):
>         texture_type = get_texture_type(uniform_type),
>         transposed_type = get_transposed_type(uniform_type),
>         bool_type = get_bool_type(uniform_type),
>+        sampler_format = get_sampler_format(uniform_type),
>         rows = get_rows(uniform_type),
>         columns = get_columns(uniform_type),
>         components = get_components(uniform_type),
>@@ -248,15 +266,37 @@ def gen_type_info(uniform_type):
> def gen_type_index_case(index, uniform_type):
>     return "case " + uniform_type + ": return " + str(index) + ";"
> 
>-uniform_type_info_data = ",\n".join([gen_type_info(uniform_type) for uniform_type in all_uniform_types])
>-uniform_type_index_cases = "\n".join([gen_type_index_case(index, uniform_type) for index, uniform_type in enumerate(all_uniform_types)])
>-
>-with open('uniform_type_info_autogen.cpp', 'wt') as out_file:
>-    output_cpp = template_cpp.format(
>-        script_name = sys.argv[0],
>-        copyright_year = date.today().year,
>-        total_count = len(all_uniform_types),
>-        uniform_type_info_data = uniform_type_info_data,
>-        uniform_type_index_cases = uniform_type_index_cases)
>-    out_file.write(output_cpp)
>-    out_file.close()
>+
>+def main():
>+
>+    # auto_script parameters.
>+    if len(sys.argv) > 1:
>+        inputs = []
>+        outputs = ['uniform_type_info_autogen.cpp']
>+
>+        if sys.argv[1] == 'inputs':
>+            print ','.join(inputs)
>+        elif sys.argv[1] == 'outputs':
>+            print ','.join(outputs)
>+        else:
>+            print('Invalid script parameters')
>+            return 1
>+        return 0
>+
>+    uniform_type_info_data = ",\n".join([gen_type_info(uniform_type) for uniform_type in all_uniform_types])
>+    uniform_type_index_cases = "\n".join([gen_type_index_case(index, uniform_type) for index, uniform_type in enumerate(all_uniform_types)])
>+
>+    with open('uniform_type_info_autogen.cpp', 'wt') as out_file:
>+        output_cpp = template_cpp.format(
>+            script_name = sys.argv[0],
>+            copyright_year = date.today().year,
>+            total_count = len(all_uniform_types),
>+            uniform_type_info_data = uniform_type_info_data,
>+            uniform_type_index_cases = uniform_type_index_cases)
>+        out_file.write(output_cpp)
>+        out_file.close()
>+    return 0
>+
>+
>+if __name__ == '__main__':
>+    sys.exit(main())
>diff --git a/Source/ThirdParty/ANGLE/src/common/hash_utils.h b/Source/ThirdParty/ANGLE/src/common/hash_utils.h
>new file mode 100644
>index 00000000000..aec4e7f77c3
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/common/hash_utils.h
>@@ -0,0 +1,39 @@
>+//
>+// Copyright 2018 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// hash_utils.h: Hashing based helper functions.
>+
>+#ifndef COMMON_HASHUTILS_H_
>+#define COMMON_HASHUTILS_H_
>+
>+#include "common/debug.h"
>+#include "common/third_party/xxhash/xxhash.h"
>+
>+namespace angle
>+{
>+// Computes a hash of "key". Any data passed to this function must be multiples of
>+// 4 bytes, since the PMurHash32 method can only operate increments of 4-byte words.
>+inline std::size_t ComputeGenericHash(const void *key, size_t keySize)
>+{
>+    static constexpr unsigned int kSeed = 0xABCDEF98;
>+
>+    // We can't support "odd" alignments.  ComputeGenericHash requires aligned types
>+    ASSERT(keySize % 4 == 0);
>+#if defined(ANGLE_IS_64_BIT_CPU)
>+    return XXH64(key, keySize, kSeed);
>+#else
>+    return XXH32(key, keySize, kSeed);
>+#endif  // defined(ANGLE_IS_64_BIT_CPU)
>+}
>+
>+template <typename T>
>+std::size_t ComputeGenericHash(const T &key)
>+{
>+    static_assert(sizeof(key) % 4 == 0, "ComputeGenericHash requires aligned types");
>+    return ComputeGenericHash(&key, sizeof(key));
>+}
>+}  // namespace angle
>+
>+#endif  // COMMON_HASHUTILS_H_
>diff --git a/Source/ThirdParty/ANGLE/src/common/hash_utils_unittest.cpp b/Source/ThirdParty/ANGLE/src/common/hash_utils_unittest.cpp
>new file mode 100644
>index 00000000000..490d2d472ea
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/common/hash_utils_unittest.cpp
>@@ -0,0 +1,31 @@
>+//
>+// Copyright 2018 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// hash_utils_unittest: Hashing helper functions tests.
>+
>+#include <gtest/gtest.h>
>+
>+#include "common/hash_utils.h"
>+
>+using namespace angle;
>+
>+namespace
>+{
>+// Basic functionality test.
>+TEST(HashUtilsTest, ComputeGenericHash)
>+{
>+    std::string a = "aSimpleString!!!";
>+    std::string b = "anotherString???";
>+
>+    // Requires a string size aligned to 4 bytes.
>+    ASSERT_TRUE(a.size() % 4 == 0);
>+    ASSERT_TRUE(b.size() % 4 == 0);
>+
>+    size_t aHash = ComputeGenericHash(a.c_str(), a.size());
>+    size_t bHash = ComputeGenericHash(b.c_str(), b.size());
>+
>+    EXPECT_NE(aHash, bHash);
>+}
>+}  // anonymous namespace
>diff --git a/Source/ThirdParty/ANGLE/src/common/mathutil.cpp b/Source/ThirdParty/ANGLE/src/common/mathutil.cpp
>index 5db997c6641..3e3895fcf18 100644
>--- a/Source/ThirdParty/ANGLE/src/common/mathutil.cpp
>+++ b/Source/ThirdParty/ANGLE/src/common/mathutil.cpp
>@@ -8,8 +8,8 @@
> 
> #include "common/mathutil.h"
> 
>-#include <algorithm>
> #include <math.h>
>+#include <algorithm>
> 
> namespace gl
> {
>@@ -43,19 +43,25 @@ constexpr float g_sharedexp_max =
> 
> unsigned int convertRGBFloatsTo999E5(float red, float green, float blue)
> {
>-    const float red_c = std::max<float>(0, std::min(g_sharedexp_max, red));
>+    const float red_c   = std::max<float>(0, std::min(g_sharedexp_max, red));
>     const float green_c = std::max<float>(0, std::min(g_sharedexp_max, green));
>-    const float blue_c = std::max<float>(0, std::min(g_sharedexp_max, blue));
>+    const float blue_c  = std::max<float>(0, std::min(g_sharedexp_max, blue));
> 
>     const float max_c = std::max<float>(std::max<float>(red_c, green_c), blue_c);
>-    const float exp_p = std::max<float>(-g_sharedexp_bias - 1, floor(log(max_c))) + 1 + g_sharedexp_bias;
>-    const int max_s = static_cast<int>(floor((max_c / (pow(2.0f, exp_p - g_sharedexp_bias - g_sharedexp_mantissabits))) + 0.5f));
>-    const int exp_s = static_cast<int>((max_s < pow(2.0f, g_sharedexp_mantissabits)) ? exp_p : exp_p + 1);
>+    const float exp_p =
>+        std::max<float>(-g_sharedexp_bias - 1, floor(log(max_c))) + 1 + g_sharedexp_bias;
>+    const int max_s = static_cast<int>(
>+        floor((max_c / (pow(2.0f, exp_p - g_sharedexp_bias - g_sharedexp_mantissabits))) + 0.5f));
>+    const int exp_s =
>+        static_cast<int>((max_s < pow(2.0f, g_sharedexp_mantissabits)) ? exp_p : exp_p + 1);
> 
>     RGB9E5Data output;
>-    output.R = static_cast<unsigned int>(floor((red_c / (pow(2.0f, exp_s - g_sharedexp_bias - g_sharedexp_mantissabits))) + 0.5f));
>-    output.G = static_cast<unsigned int>(floor((green_c / (pow(2.0f, exp_s - g_sharedexp_bias - g_sharedexp_mantissabits))) + 0.5f));
>-    output.B = static_cast<unsigned int>(floor((blue_c / (pow(2.0f, exp_s - g_sharedexp_bias - g_sharedexp_mantissabits))) + 0.5f));
>+    output.R = static_cast<unsigned int>(
>+        floor((red_c / (pow(2.0f, exp_s - g_sharedexp_bias - g_sharedexp_mantissabits))) + 0.5f));
>+    output.G = static_cast<unsigned int>(
>+        floor((green_c / (pow(2.0f, exp_s - g_sharedexp_bias - g_sharedexp_mantissabits))) + 0.5f));
>+    output.B = static_cast<unsigned int>(
>+        floor((blue_c / (pow(2.0f, exp_s - g_sharedexp_bias - g_sharedexp_mantissabits))) + 0.5f));
>     output.E = exp_s;
> 
>     return bitCast<unsigned int>(output);
>@@ -63,11 +69,25 @@ unsigned int convertRGBFloatsTo999E5(float red, float green, float blue)
> 
> void convert999E5toRGBFloats(unsigned int input, float *red, float *green, float *blue)
> {
>-    const RGB9E5Data *inputData = reinterpret_cast<const RGB9E5Data*>(&input);
>+    const RGB9E5Data *inputData = reinterpret_cast<const RGB9E5Data *>(&input);
>+
>+    *red =
>+        inputData->R * pow(2.0f, (int)inputData->E - g_sharedexp_bias - g_sharedexp_mantissabits);
>+    *green =
>+        inputData->G * pow(2.0f, (int)inputData->E - g_sharedexp_bias - g_sharedexp_mantissabits);
>+    *blue =
>+        inputData->B * pow(2.0f, (int)inputData->E - g_sharedexp_bias - g_sharedexp_mantissabits);
>+}
> 
>-    *red = inputData->R * pow(2.0f, (int)inputData->E - g_sharedexp_bias - g_sharedexp_mantissabits);
>-    *green = inputData->G * pow(2.0f, (int)inputData->E - g_sharedexp_bias - g_sharedexp_mantissabits);
>-    *blue = inputData->B * pow(2.0f, (int)inputData->E - g_sharedexp_bias - g_sharedexp_mantissabits);
>+int BitCountPolyfill(uint32_t bits)
>+{
>+    int ones = 0;
>+    while (bits)
>+    {
>+        ones += bool(bits & 1);
>+        bits >>= 1;
>+    }
>+    return ones;
> }
> 
> }  // namespace gl
>diff --git a/Source/ThirdParty/ANGLE/src/common/mathutil.h b/Source/ThirdParty/ANGLE/src/common/mathutil.h
>index ca6efc567ff..6573dd58986 100644
>--- a/Source/ThirdParty/ANGLE/src/common/mathutil.h
>+++ b/Source/ThirdParty/ANGLE/src/common/mathutil.h
>@@ -9,12 +9,12 @@
> #ifndef COMMON_MATHUTIL_H_
> #define COMMON_MATHUTIL_H_
> 
>-#include <limits>
>-#include <algorithm>
> #include <math.h>
>-#include <string.h>
> #include <stdint.h>
> #include <stdlib.h>
>+#include <string.h>
>+#include <algorithm>
>+#include <limits>
> 
> #include <anglebase/numerics/safe_math.h>
> 
>@@ -25,15 +25,15 @@ namespace angle
> {
> using base::CheckedNumeric;
> using base::IsValueInRangeForNumericType;
>-}
>+}  // namespace angle
> 
> namespace gl
> {
> 
>-const unsigned int Float32One = 0x3F800000;
>+const unsigned int Float32One   = 0x3F800000;
> const unsigned short Float16One = 0x3C00;
> 
>-template<typename T>
>+template <typename T>
> inline bool isPow2(T x)
> {
>     static_assert(std::is_integral<T>::value, "isPow2 must be called on an integer type.");
>@@ -43,13 +43,15 @@ inline bool isPow2(T x)
> inline int log2(int x)
> {
>     int r = 0;
>-    while ((x >> r) > 1) r++;
>+    while ((x >> r) > 1)
>+        r++;
>     return r;
> }
> 
> inline unsigned int ceilPow2(unsigned int x)
> {
>-    if (x != 0) x--;
>+    if (x != 0)
>+        x--;
>     x |= x >> 1;
>     x |= x >> 2;
>     x |= x >> 4;
>@@ -108,7 +110,7 @@ inline int clampCast(bool value)
>     return static_cast<int>(value);
> }
> 
>-template<typename T, typename MIN, typename MAX>
>+template <typename T, typename MIN, typename MAX>
> inline T clamp(T x, MIN min, MAX max)
> {
>     // Since NaNs fail all comparison tests, a NaN value will default to min
>@@ -120,7 +122,7 @@ inline float clamp01(float x)
>     return clamp(x, 0.0f, 1.0f);
> }
> 
>-template<const int n>
>+template <const int n>
> inline unsigned int unorm(float x)
> {
>     const unsigned int max = 0xFFFFFFFF >> (32 - n);
>@@ -142,7 +144,7 @@ inline unsigned int unorm(float x)
> inline bool supportsSSE2()
> {
> #if defined(ANGLE_USE_SSE)
>-    static bool checked = false;
>+    static bool checked  = false;
>     static bool supports = false;
> 
>     if (checked)
>@@ -150,7 +152,7 @@ inline bool supportsSSE2()
>         return supports;
>     }
> 
>-#if defined(ANGLE_PLATFORM_WINDOWS) && !defined(_M_ARM)
>+#    if defined(ANGLE_PLATFORM_WINDOWS) && !defined(_M_ARM) && !defined(_M_ARM64)
>     {
>         int info[4];
>         __cpuid(info, 0);
>@@ -162,7 +164,7 @@ inline bool supportsSSE2()
>             supports = (info[3] >> 26) & 1;
>         }
>     }
>-#endif  // defined(ANGLE_PLATFORM_WINDOWS) && !defined(_M_ARM)
>+#    endif  // defined(ANGLE_PLATFORM_WINDOWS) && !defined(_M_ARM) && !defined(_M_ARM64)
>     checked = true;
>     return supports;
> #else  // defined(ANGLE_USE_SSE)
>@@ -182,19 +184,19 @@ destType bitCast(const sourceType &source)
> inline unsigned short float32ToFloat16(float fp32)
> {
>     unsigned int fp32i = bitCast<unsigned int>(fp32);
>-    unsigned int sign = (fp32i & 0x80000000) >> 16;
>-    unsigned int abs = fp32i & 0x7FFFFFFF;
>+    unsigned int sign  = (fp32i & 0x80000000) >> 16;
>+    unsigned int abs   = fp32i & 0x7FFFFFFF;
> 
>-    if(abs > 0x47FFEFFF)   // Infinity
>+    if (abs > 0x47FFEFFF)  // Infinity
>     {
>         return static_cast<unsigned short>(sign | 0x7FFF);
>     }
>-    else if(abs < 0x38800000)   // Denormal
>+    else if (abs < 0x38800000)  // Denormal
>     {
>         unsigned int mantissa = (abs & 0x007FFFFF) | 0x00800000;
>-        int e = 113 - (abs >> 23);
>+        int e                 = 113 - (abs >> 23);
> 
>-        if(e < 24)
>+        if (e < 24)
>         {
>             abs = mantissa >> e;
>         }
>@@ -207,7 +209,8 @@ inline unsigned short float32ToFloat16(float fp32)
>     }
>     else
>     {
>-        return static_cast<unsigned short>(sign | (abs + 0xC8000000 + 0x00000FFF + ((abs >> 13) & 1)) >> 13);
>+        return static_cast<unsigned short>(
>+            sign | (abs + 0xC8000000 + 0x00000FFF + ((abs >> 13) & 1)) >> 13);
>     }
> }
> 
>@@ -218,24 +221,24 @@ void convert999E5toRGBFloats(unsigned int input, float *red, float *green, float
> 
> inline unsigned short float32ToFloat11(float fp32)
> {
>-    const unsigned int float32MantissaMask = 0x7FFFFF;
>-    const unsigned int float32ExponentMask = 0x7F800000;
>-    const unsigned int float32SignMask = 0x80000000;
>-    const unsigned int float32ValueMask = ~float32SignMask;
>+    const unsigned int float32MantissaMask     = 0x7FFFFF;
>+    const unsigned int float32ExponentMask     = 0x7F800000;
>+    const unsigned int float32SignMask         = 0x80000000;
>+    const unsigned int float32ValueMask        = ~float32SignMask;
>     const unsigned int float32ExponentFirstBit = 23;
>-    const unsigned int float32ExponentBias = 127;
>+    const unsigned int float32ExponentBias     = 127;
> 
>-    const unsigned short float11Max = 0x7BF;
>+    const unsigned short float11Max          = 0x7BF;
>     const unsigned short float11MantissaMask = 0x3F;
>     const unsigned short float11ExponentMask = 0x7C0;
>-    const unsigned short float11BitMask = 0x7FF;
>-    const unsigned int float11ExponentBias = 14;
>+    const unsigned short float11BitMask      = 0x7FF;
>+    const unsigned int float11ExponentBias   = 14;
> 
>     const unsigned int float32Maxfloat11 = 0x477E0000;
>     const unsigned int float32Minfloat11 = 0x38800000;
> 
>     const unsigned int float32Bits = bitCast<unsigned int>(fp32);
>-    const bool float32Sign = (float32Bits & float32SignMask) == float32SignMask;
>+    const bool float32Sign         = (float32Bits & float32SignMask) == float32SignMask;
> 
>     unsigned int float32Val = float32Bits & float32ValueMask;
> 
>@@ -244,7 +247,9 @@ inline unsigned short float32ToFloat11(float fp32)
>         // INF or NAN
>         if ((float32Val & float32MantissaMask) != 0)
>         {
>-            return float11ExponentMask | (((float32Val >> 17) | (float32Val >> 11) | (float32Val >> 6) | (float32Val)) & float11MantissaMask);
>+            return float11ExponentMask |
>+                   (((float32Val >> 17) | (float32Val >> 11) | (float32Val >> 6) | (float32Val)) &
>+                    float11MantissaMask);
>         }
>         else if (float32Sign)
>         {
>@@ -272,8 +277,10 @@ inline unsigned short float32ToFloat11(float fp32)
>         {
>             // The number is too small to be represented as a normalized float11
>             // Convert it to a denormalized value.
>-            const unsigned int shift = (float32ExponentBias - float11ExponentBias) - (float32Val >> float32ExponentFirstBit);
>-            float32Val = ((1 << float32ExponentFirstBit) | (float32Val & float32MantissaMask)) >> shift;
>+            const unsigned int shift = (float32ExponentBias - float11ExponentBias) -
>+                                       (float32Val >> float32ExponentFirstBit);
>+            float32Val =
>+                ((1 << float32ExponentFirstBit) | (float32Val & float32MantissaMask)) >> shift;
>         }
>         else
>         {
>@@ -287,24 +294,24 @@ inline unsigned short float32ToFloat11(float fp32)
> 
> inline unsigned short float32ToFloat10(float fp32)
> {
>-    const unsigned int float32MantissaMask = 0x7FFFFF;
>-    const unsigned int float32ExponentMask = 0x7F800000;
>-    const unsigned int float32SignMask = 0x80000000;
>-    const unsigned int float32ValueMask = ~float32SignMask;
>+    const unsigned int float32MantissaMask     = 0x7FFFFF;
>+    const unsigned int float32ExponentMask     = 0x7F800000;
>+    const unsigned int float32SignMask         = 0x80000000;
>+    const unsigned int float32ValueMask        = ~float32SignMask;
>     const unsigned int float32ExponentFirstBit = 23;
>-    const unsigned int float32ExponentBias = 127;
>+    const unsigned int float32ExponentBias     = 127;
> 
>-    const unsigned short float10Max = 0x3DF;
>+    const unsigned short float10Max          = 0x3DF;
>     const unsigned short float10MantissaMask = 0x1F;
>     const unsigned short float10ExponentMask = 0x3E0;
>-    const unsigned short float10BitMask = 0x3FF;
>-    const unsigned int float10ExponentBias = 14;
>+    const unsigned short float10BitMask      = 0x3FF;
>+    const unsigned int float10ExponentBias   = 14;
> 
>     const unsigned int float32Maxfloat10 = 0x477C0000;
>     const unsigned int float32Minfloat10 = 0x38800000;
> 
>     const unsigned int float32Bits = bitCast<unsigned int>(fp32);
>-    const bool float32Sign = (float32Bits & float32SignMask) == float32SignMask;
>+    const bool float32Sign         = (float32Bits & float32SignMask) == float32SignMask;
> 
>     unsigned int float32Val = float32Bits & float32ValueMask;
> 
>@@ -313,7 +320,9 @@ inline unsigned short float32ToFloat10(float fp32)
>         // INF or NAN
>         if ((float32Val & float32MantissaMask) != 0)
>         {
>-            return float10ExponentMask | (((float32Val >> 18) | (float32Val >> 13) | (float32Val >> 3) | (float32Val)) & float10MantissaMask);
>+            return float10ExponentMask |
>+                   (((float32Val >> 18) | (float32Val >> 13) | (float32Val >> 3) | (float32Val)) &
>+                    float10MantissaMask);
>         }
>         else if (float32Sign)
>         {
>@@ -341,8 +350,10 @@ inline unsigned short float32ToFloat10(float fp32)
>         {
>             // The number is too small to be represented as a normalized float11
>             // Convert it to a denormalized value.
>-            const unsigned int shift = (float32ExponentBias - float10ExponentBias) - (float32Val >> float32ExponentFirstBit);
>-            float32Val = ((1 << float32ExponentFirstBit) | (float32Val & float32MantissaMask)) >> shift;
>+            const unsigned int shift = (float32ExponentBias - float10ExponentBias) -
>+                                       (float32Val >> float32ExponentFirstBit);
>+            float32Val =
>+                ((1 << float32ExponentFirstBit) | (float32Val & float32MantissaMask)) >> shift;
>         }
>         else
>         {
>@@ -379,12 +390,11 @@ inline float float11ToFloat32(unsigned short fp11)
>             {
>                 exponent--;
>                 mantissa <<= 1;
>-            }
>-            while ((mantissa & 0x40) == 0);
>+            } while ((mantissa & 0x40) == 0);
> 
>             mantissa = mantissa & 0x3F;
>         }
>-        else // The value is zero
>+        else  // The value is zero
>         {
>             exponent = static_cast<unsigned short>(-112);
>         }
>@@ -418,12 +428,11 @@ inline float float10ToFloat32(unsigned short fp11)
>             {
>                 exponent--;
>                 mantissa <<= 1;
>-            }
>-            while ((mantissa & 0x20) == 0);
>+            } while ((mantissa & 0x20) == 0);
> 
>             mantissa = mantissa & 0x1F;
>         }
>-        else // The value is zero
>+        else  // The value is zero
>         {
>             exponent = static_cast<unsigned short>(-112);
>         }
>@@ -432,13 +441,48 @@ inline float float10ToFloat32(unsigned short fp11)
>     }
> }
> 
>+// Convers to and from float and 16.16 fixed point format.
>+
>+inline float FixedToFloat(uint32_t fixedInput)
>+{
>+    return static_cast<float>(fixedInput) / 65536.0f;
>+}
>+
>+inline uint32_t FloatToFixed(float floatInput)
>+{
>+    static constexpr uint32_t kHighest = 32767 * 65536 + 65535;
>+    static constexpr uint32_t kLowest  = static_cast<uint32_t>(-32768 * 65536 + 65535);
>+
>+    if (floatInput > 32767.65535)
>+    {
>+        return kHighest;
>+    }
>+    else if (floatInput < -32768.65535)
>+    {
>+        return kLowest;
>+    }
>+    else
>+    {
>+        return static_cast<uint32_t>(floatInput * 65536);
>+    }
>+}
>+
> template <typename T>
> inline float normalizedToFloat(T input)
> {
>     static_assert(std::numeric_limits<T>::is_integer, "T must be an integer.");
> 
>-    const float inverseMax = 1.0f / std::numeric_limits<T>::max();
>-    return input * inverseMax;
>+    if (sizeof(T) > 2)
>+    {
>+        // float has only a 23 bit mantissa, so we need to do the calculation in double precision
>+        constexpr double inverseMax = 1.0 / std::numeric_limits<T>::max();
>+        return static_cast<float>(input * inverseMax);
>+    }
>+    else
>+    {
>+        constexpr float inverseMax = 1.0f / std::numeric_limits<T>::max();
>+        return input * inverseMax;
>+    }
> }
> 
> template <unsigned int inputBitCount, typename T>
>@@ -447,21 +491,47 @@ inline float normalizedToFloat(T input)
>     static_assert(std::numeric_limits<T>::is_integer, "T must be an integer.");
>     static_assert(inputBitCount < (sizeof(T) * 8), "T must have more bits than inputBitCount.");
> 
>-    const float inverseMax = 1.0f / ((1 << inputBitCount) - 1);
>-    return input * inverseMax;
>+    if (inputBitCount > 23)
>+    {
>+        // float has only a 23 bit mantissa, so we need to do the calculation in double precision
>+        constexpr double inverseMax = 1.0 / ((1 << inputBitCount) - 1);
>+        return static_cast<float>(input * inverseMax);
>+    }
>+    else
>+    {
>+        constexpr float inverseMax = 1.0f / ((1 << inputBitCount) - 1);
>+        return input * inverseMax;
>+    }
> }
> 
> template <typename T>
> inline T floatToNormalized(float input)
> {
>-    return static_cast<T>(std::numeric_limits<T>::max() * input + 0.5f);
>+    if (sizeof(T) > 2)
>+    {
>+        // float has only a 23 bit mantissa, so we need to do the calculation in double precision
>+        return static_cast<T>(std::numeric_limits<T>::max() * static_cast<double>(input) + 0.5);
>+    }
>+    else
>+    {
>+        return static_cast<T>(std::numeric_limits<T>::max() * input + 0.5f);
>+    }
> }
> 
> template <unsigned int outputBitCount, typename T>
> inline T floatToNormalized(float input)
> {
>     static_assert(outputBitCount < (sizeof(T) * 8), "T must have more bits than outputBitCount.");
>-    return static_cast<T>(((1 << outputBitCount) - 1) * input + 0.5f);
>+
>+    if (outputBitCount > 23)
>+    {
>+        // float has only a 23 bit mantissa, so we need to do the calculation in double precision
>+        return static_cast<T>(((1 << outputBitCount) - 1) * static_cast<double>(input) + 0.5);
>+    }
>+    else
>+    {
>+        return static_cast<T>(((1 << outputBitCount) - 1) * input + 0.5f);
>+    }
> }
> 
> template <unsigned int inputBitCount, unsigned int inputBitStart, typename T>
>@@ -563,12 +633,16 @@ inline unsigned short averageHalfFloat(unsigned short a, unsigned short b)
> 
> inline unsigned int averageFloat11(unsigned int a, unsigned int b)
> {
>-    return float32ToFloat11((float11ToFloat32(static_cast<unsigned short>(a)) + float11ToFloat32(static_cast<unsigned short>(b))) * 0.5f);
>+    return float32ToFloat11((float11ToFloat32(static_cast<unsigned short>(a)) +
>+                             float11ToFloat32(static_cast<unsigned short>(b))) *
>+                            0.5f);
> }
> 
> inline unsigned int averageFloat10(unsigned int a, unsigned int b)
> {
>-    return float32ToFloat10((float10ToFloat32(static_cast<unsigned short>(a)) + float10ToFloat32(static_cast<unsigned short>(b))) * 0.5f);
>+    return float32ToFloat10((float10ToFloat32(static_cast<unsigned short>(a)) +
>+                             float10ToFloat32(static_cast<unsigned short>(b))) *
>+                            0.5f);
> }
> 
> template <typename T>
>@@ -628,6 +702,12 @@ class Range
>     T low() const { return mLow; }
>     T high() const { return mHigh; }
> 
>+    void invalidate()
>+    {
>+        mLow  = std::numeric_limits<T>::max();
>+        mHigh = std::numeric_limits<T>::min();
>+    }
>+
>   private:
>     T mLow;
>     T mHigh;
>@@ -638,6 +718,9 @@ typedef Range<unsigned int> RangeUI;
> 
> struct IndexRange
> {
>+    struct Undefined
>+    {};
>+    IndexRange(Undefined) {}
>     IndexRange() : IndexRange(0, 0, 0) {}
>     IndexRange(size_t start_, size_t end_, size_t vertexIndexCount_)
>         : start(start_), end(end_), vertexIndexCount(vertexIndexCount_)
>@@ -681,21 +764,21 @@ inline float Ldexp(float x, int exp)
> inline uint32_t packSnorm2x16(float f1, float f2)
> {
>     int16_t leastSignificantBits = static_cast<int16_t>(roundf(clamp(f1, -1.0f, 1.0f) * 32767.0f));
>-    int16_t mostSignificantBits = static_cast<int16_t>(roundf(clamp(f2, -1.0f, 1.0f) * 32767.0f));
>+    int16_t mostSignificantBits  = static_cast<int16_t>(roundf(clamp(f2, -1.0f, 1.0f) * 32767.0f));
>     return static_cast<uint32_t>(mostSignificantBits) << 16 |
>            (static_cast<uint32_t>(leastSignificantBits) & 0xFFFF);
> }
> 
>-// First, unpacks a single 32-bit unsigned integer u into a pair of 16-bit unsigned integers. Then, each
>-// component is converted to a normalized floating-point value to generate the returned two float values.
>-// The first float value will be extracted from the least significant bits of the input;
>-// the last float value will be extracted from the most-significant bits.
>-// The conversion for unpacked fixed-point value to floating point is done as follows:
>-// unpackSnorm2x16 : clamp(f / 32767.0, -1, +1)
>+// First, unpacks a single 32-bit unsigned integer u into a pair of 16-bit unsigned integers. Then,
>+// each component is converted to a normalized floating-point value to generate the returned two
>+// float values. The first float value will be extracted from the least significant bits of the
>+// input; the last float value will be extracted from the most-significant bits. The conversion for
>+// unpacked fixed-point value to floating point is done as follows: unpackSnorm2x16 : clamp(f /
>+// 32767.0, -1, +1)
> inline void unpackSnorm2x16(uint32_t u, float *f1, float *f2)
> {
>     int16_t leastSignificantBits = static_cast<int16_t>(u & 0xFFFF);
>-    int16_t mostSignificantBits = static_cast<int16_t>(u >> 16);
>+    int16_t mostSignificantBits  = static_cast<int16_t>(u >> 16);
>     *f1 = clamp(static_cast<float>(leastSignificantBits) / 32767.0f, -1.0f, 1.0f);
>     *f2 = clamp(static_cast<float>(mostSignificantBits) / 32767.0f, -1.0f, 1.0f);
> }
>@@ -709,22 +792,22 @@ inline void unpackSnorm2x16(uint32_t u, float *f1, float *f2)
> inline uint32_t packUnorm2x16(float f1, float f2)
> {
>     uint16_t leastSignificantBits = static_cast<uint16_t>(roundf(clamp(f1, 0.0f, 1.0f) * 65535.0f));
>-    uint16_t mostSignificantBits = static_cast<uint16_t>(roundf(clamp(f2, 0.0f, 1.0f) * 65535.0f));
>-    return static_cast<uint32_t>(mostSignificantBits) << 16 | static_cast<uint32_t>(leastSignificantBits);
>+    uint16_t mostSignificantBits  = static_cast<uint16_t>(roundf(clamp(f2, 0.0f, 1.0f) * 65535.0f));
>+    return static_cast<uint32_t>(mostSignificantBits) << 16 |
>+           static_cast<uint32_t>(leastSignificantBits);
> }
> 
>-// First, unpacks a single 32-bit unsigned integer u into a pair of 16-bit unsigned integers. Then, each
>-// component is converted to a normalized floating-point value to generate the returned two float values.
>-// The first float value will be extracted from the least significant bits of the input;
>-// the last float value will be extracted from the most-significant bits.
>-// The conversion for unpacked fixed-point value to floating point is done as follows:
>-// unpackUnorm2x16 : f / 65535.0
>+// First, unpacks a single 32-bit unsigned integer u into a pair of 16-bit unsigned integers. Then,
>+// each component is converted to a normalized floating-point value to generate the returned two
>+// float values. The first float value will be extracted from the least significant bits of the
>+// input; the last float value will be extracted from the most-significant bits. The conversion for
>+// unpacked fixed-point value to floating point is done as follows: unpackUnorm2x16 : f / 65535.0
> inline void unpackUnorm2x16(uint32_t u, float *f1, float *f2)
> {
>     uint16_t leastSignificantBits = static_cast<uint16_t>(u & 0xFFFF);
>-    uint16_t mostSignificantBits = static_cast<uint16_t>(u >> 16);
>-    *f1 = static_cast<float>(leastSignificantBits) / 65535.0f;
>-    *f2 = static_cast<float>(mostSignificantBits) / 65535.0f;
>+    uint16_t mostSignificantBits  = static_cast<uint16_t>(u >> 16);
>+    *f1                           = static_cast<float>(leastSignificantBits) / 65535.0f;
>+    *f2                           = static_cast<float>(mostSignificantBits) / 65535.0f;
> }
> 
> // Helper functions intended to be used only here.
>@@ -815,19 +898,20 @@ inline void UnpackSnorm4x8(uint32_t u, float *f)
> inline uint32_t packHalf2x16(float f1, float f2)
> {
>     uint16_t leastSignificantBits = static_cast<uint16_t>(float32ToFloat16(f1));
>-    uint16_t mostSignificantBits = static_cast<uint16_t>(float32ToFloat16(f2));
>-    return static_cast<uint32_t>(mostSignificantBits) << 16 | static_cast<uint32_t>(leastSignificantBits);
>+    uint16_t mostSignificantBits  = static_cast<uint16_t>(float32ToFloat16(f2));
>+    return static_cast<uint32_t>(mostSignificantBits) << 16 |
>+           static_cast<uint32_t>(leastSignificantBits);
> }
> 
>-// Returns two floating-point values obtained by unpacking a 32-bit unsigned integer into a pair of 16-bit values,
>-// interpreting those values as 16-bit floating-point numbers according to the OpenGL ES Specification,
>-// and converting them to 32-bit floating-point values.
>-// The first float value is obtained from the 16 least-significant bits of u;
>-// the second component is obtained from the 16 most-significant bits of u.
>+// Returns two floating-point values obtained by unpacking a 32-bit unsigned integer into a pair of
>+// 16-bit values, interpreting those values as 16-bit floating-point numbers according to the OpenGL
>+// ES Specification, and converting them to 32-bit floating-point values. The first float value is
>+// obtained from the 16 least-significant bits of u; the second component is obtained from the 16
>+// most-significant bits of u.
> inline void unpackHalf2x16(uint32_t u, float *f1, float *f2)
> {
>     uint16_t leastSignificantBits = static_cast<uint16_t>(u & 0xFFFF);
>-    uint16_t mostSignificantBits = static_cast<uint16_t>(u >> 16);
>+    uint16_t mostSignificantBits  = static_cast<uint16_t>(u >> 16);
> 
>     *f1 = float16ToFloat32(leastSignificantBits);
>     *f2 = float16ToFloat32(mostSignificantBits);
>@@ -883,32 +967,64 @@ inline uint32_t BitfieldReverse(uint32_t value)
> }
> 
> // Count the 1 bits.
>-#if defined(ANGLE_PLATFORM_WINDOWS)
>+#if defined(_MSC_VER) && (defined(_M_IX86) || defined(_M_X64))
>+#    define ANGLE_HAS_BITCOUNT_32
> inline int BitCount(uint32_t bits)
> {
>     return static_cast<int>(__popcnt(bits));
> }
>-#if defined(ANGLE_IS_64_BIT_CPU)
>+#    if defined(_M_X64)
>+#        define ANGLE_HAS_BITCOUNT_64
> inline int BitCount(uint64_t bits)
> {
>     return static_cast<int>(__popcnt64(bits));
> }
>-#endif  // defined(ANGLE_IS_64_BIT_CPU)
>-#endif  // defined(ANGLE_PLATFORM_WINDOWS)
>+#    endif  // defined(_M_X64)
>+#endif      // defined(_M_IX86) || defined(_M_X64)
> 
> #if defined(ANGLE_PLATFORM_POSIX)
>+#    define ANGLE_HAS_BITCOUNT_32
> inline int BitCount(uint32_t bits)
> {
>     return __builtin_popcount(bits);
> }
> 
>-#if defined(ANGLE_IS_64_BIT_CPU)
>+#    if defined(ANGLE_IS_64_BIT_CPU)
>+#        define ANGLE_HAS_BITCOUNT_64
> inline int BitCount(uint64_t bits)
> {
>     return __builtin_popcountll(bits);
> }
>-#endif  // defined(ANGLE_IS_64_BIT_CPU)
>-#endif  // defined(ANGLE_PLATFORM_POSIX)
>+#    endif  // defined(ANGLE_IS_64_BIT_CPU)
>+#endif      // defined(ANGLE_PLATFORM_POSIX)
>+
>+int BitCountPolyfill(uint32_t bits);
>+
>+#if !defined(ANGLE_HAS_BITCOUNT_32)
>+inline int BitCount(const uint32_t bits)
>+{
>+    return BitCountPolyfill(bits);
>+}
>+#endif  // !defined(ANGLE_HAS_BITCOUNT_32)
>+
>+#if !defined(ANGLE_HAS_BITCOUNT_64)
>+inline int BitCount(const uint64_t bits)
>+{
>+    return BitCount(static_cast<uint32_t>(bits >> 32)) + BitCount(static_cast<uint32_t>(bits));
>+}
>+#endif  // !defined(ANGLE_HAS_BITCOUNT_64)
>+#undef ANGLE_HAS_BITCOUNT_32
>+#undef ANGLE_HAS_BITCOUNT_64
>+
>+inline int BitCount(uint8_t bits)
>+{
>+    return BitCount(static_cast<uint32_t>(bits));
>+}
>+
>+inline int BitCount(uint16_t bits)
>+{
>+    return BitCount(static_cast<uint32_t>(bits));
>+}
> 
> #if defined(ANGLE_PLATFORM_WINDOWS)
> // Return the index of the least significant bit set. Indexing is such that bit 0 is the least
>@@ -922,7 +1038,7 @@ inline unsigned long ScanForward(uint32_t bits)
>     return firstBitIndex;
> }
> 
>-#if defined(ANGLE_IS_64_BIT_CPU)
>+#    if defined(ANGLE_IS_64_BIT_CPU)
> inline unsigned long ScanForward(uint64_t bits)
> {
>     ASSERT(bits != 0u);
>@@ -931,8 +1047,8 @@ inline unsigned long ScanForward(uint64_t bits)
>     ASSERT(ret != 0u);
>     return firstBitIndex;
> }
>-#endif  // defined(ANGLE_IS_64_BIT_CPU)
>-#endif  // defined(ANGLE_PLATFORM_WINDOWS)
>+#    endif  // defined(ANGLE_IS_64_BIT_CPU)
>+#endif      // defined(ANGLE_PLATFORM_WINDOWS)
> 
> #if defined(ANGLE_PLATFORM_POSIX)
> inline unsigned long ScanForward(uint32_t bits)
>@@ -941,14 +1057,24 @@ inline unsigned long ScanForward(uint32_t bits)
>     return static_cast<unsigned long>(__builtin_ctz(bits));
> }
> 
>-#if defined(ANGLE_IS_64_BIT_CPU)
>+#    if defined(ANGLE_IS_64_BIT_CPU)
> inline unsigned long ScanForward(uint64_t bits)
> {
>     ASSERT(bits != 0u);
>     return static_cast<unsigned long>(__builtin_ctzll(bits));
> }
>-#endif  // defined(ANGLE_IS_64_BIT_CPU)
>-#endif  // defined(ANGLE_PLATFORM_POSIX)
>+#    endif  // defined(ANGLE_IS_64_BIT_CPU)
>+#endif      // defined(ANGLE_PLATFORM_POSIX)
>+
>+inline unsigned long ScanForward(uint8_t bits)
>+{
>+    return ScanForward(static_cast<uint32_t>(bits));
>+}
>+
>+inline unsigned long ScanForward(uint16_t bits)
>+{
>+    return ScanForward(static_cast<uint32_t>(bits));
>+}
> 
> // Return the index of the most significant bit set. Indexing is such that bit 0 is the least
> // significant bit.
>@@ -963,7 +1089,7 @@ inline unsigned long ScanReverse(unsigned long bits)
> #elif defined(ANGLE_PLATFORM_POSIX)
>     return static_cast<unsigned long>(sizeof(unsigned long) * CHAR_BIT - 1 - __builtin_clzl(bits));
> #else
>-#error Please implement bit-scan-reverse for your platform!
>+#    error Please implement bit-scan-reverse for your platform!
> #endif
> }
> 
>@@ -998,21 +1124,25 @@ int FindMSB(T bits)
> }
> 
> // Returns whether the argument is Not a Number.
>-// IEEE 754 single precision NaN representation: Exponent(8 bits) - 255, Mantissa(23 bits) - non-zero.
>+// IEEE 754 single precision NaN representation: Exponent(8 bits) - 255, Mantissa(23 bits) -
>+// non-zero.
> inline bool isNaN(float f)
> {
>     // Exponent mask: ((1u << 8) - 1u) << 23 = 0x7f800000u
>     // Mantissa mask: ((1u << 23) - 1u) = 0x7fffffu
>-    return ((bitCast<uint32_t>(f) & 0x7f800000u) == 0x7f800000u) && (bitCast<uint32_t>(f) & 0x7fffffu);
>+    return ((bitCast<uint32_t>(f) & 0x7f800000u) == 0x7f800000u) &&
>+           (bitCast<uint32_t>(f) & 0x7fffffu);
> }
> 
> // Returns whether the argument is infinity.
>-// IEEE 754 single precision infinity representation: Exponent(8 bits) - 255, Mantissa(23 bits) - zero.
>+// IEEE 754 single precision infinity representation: Exponent(8 bits) - 255, Mantissa(23 bits) -
>+// zero.
> inline bool isInf(float f)
> {
>     // Exponent mask: ((1u << 8) - 1u) << 23 = 0x7f800000u
>     // Mantissa mask: ((1u << 23) - 1u) = 0x7fffffu
>-    return ((bitCast<uint32_t>(f) & 0x7f800000u) == 0x7f800000u) && !(bitCast<uint32_t>(f) & 0x7fffffu);
>+    return ((bitCast<uint32_t>(f) & 0x7f800000u) == 0x7f800000u) &&
>+           !(bitCast<uint32_t>(f) & 0x7fffffu);
> }
> 
> namespace priv
>@@ -1083,6 +1213,17 @@ inline int32_t WrappingMul(int32_t lhs, int32_t rhs)
>     return static_cast<int32_t>(resultWide);
> }
> 
>+inline float scaleScreenDimensionToNdc(float dimensionScreen, float viewportDimension)
>+{
>+    return 2.0f * dimensionScreen / viewportDimension;
>+}
>+
>+inline float scaleScreenCoordinateToNdc(float coordinateScreen, float viewportDimension)
>+{
>+    float halfShifted = coordinateScreen / viewportDimension;
>+    return 2.0f * (halfShifted - 0.5f);
>+}
>+
> }  // namespace gl
> 
> namespace rx
>@@ -1111,8 +1252,8 @@ inline unsigned int UnsignedCeilDivide(unsigned int value, unsigned int divisor)
> 
> #if defined(_MSC_VER)
> 
>-#define ANGLE_ROTL(x,y) _rotl(x,y)
>-#define ANGLE_ROTR16(x,y) _rotr16(x,y)
>+#    define ANGLE_ROTL(x, y) _rotl(x, y)
>+#    define ANGLE_ROTR16(x, y) _rotr16(x, y)
> 
> #else
> 
>@@ -1126,11 +1267,15 @@ inline uint16_t RotR16(uint16_t x, int8_t r)
>     return (x >> r) | (x << (16 - r));
> }
> 
>-#define ANGLE_ROTL(x, y) ::rx::RotL(x, y)
>-#define ANGLE_ROTR16(x, y) ::rx::RotR16(x, y)
>+#    define ANGLE_ROTL(x, y) ::rx::RotL(x, y)
>+#    define ANGLE_ROTR16(x, y) ::rx::RotR16(x, y)
> 
>-#endif // namespace rx
>+#endif  // namespace rx
> 
>+constexpr unsigned int Log2(unsigned int bytes)
>+{
>+    return bytes == 1 ? 0 : (1 + Log2(bytes / 2));
> }
>+}  // namespace rx
> 
>-#endif   // COMMON_MATHUTIL_H_
>+#endif  // COMMON_MATHUTIL_H_
>diff --git a/Source/ThirdParty/ANGLE/src/common/mathutil_unittest.cpp b/Source/ThirdParty/ANGLE/src/common/mathutil_unittest.cpp
>index 81f33a43e6c..3c3f11db422 100644
>--- a/Source/ThirdParty/ANGLE/src/common/mathutil_unittest.cpp
>+++ b/Source/ThirdParty/ANGLE/src/common/mathutil_unittest.cpp
>@@ -20,17 +20,9 @@ namespace
> // For floats f1 and f2, unpackSnorm2x16(packSnorm2x16(f1, f2)) should be same as f1 and f2.
> TEST(MathUtilTest, packAndUnpackSnorm2x16)
> {
>-    const float input[8][2] =
>-    {
>-        { 0.0f, 0.0f },
>-        { 1.0f, 1.0f },
>-        { -1.0f, 1.0f },
>-        { -1.0f, -1.0f },
>-        { 0.875f, 0.75f },
>-        { 0.00392f, -0.99215f },
>-        { -0.000675f, 0.004954f },
>-        { -0.6937f, -0.02146f }
>-    };
>+    const float input[8][2] = {
>+        {0.0f, 0.0f},    {1.0f, 1.0f},          {-1.0f, 1.0f},           {-1.0f, -1.0f},
>+        {0.875f, 0.75f}, {0.00392f, -0.99215f}, {-0.000675f, 0.004954f}, {-0.6937f, -0.02146f}};
>     const float floatFaultTolerance = 0.0001f;
>     float outputVal1, outputVal2;
> 
>@@ -50,17 +42,20 @@ TEST(MathUtilTest, packAndUnpackSnorm2x16Infinity)
>     float outputVal1, outputVal2;
> 
>     unpackSnorm2x16(packSnorm2x16(std::numeric_limits<float>::infinity(),
>-                                  std::numeric_limits<float>::infinity()), &outputVal1, &outputVal2);
>+                                  std::numeric_limits<float>::infinity()),
>+                    &outputVal1, &outputVal2);
>     EXPECT_NEAR(1.0f, outputVal1, floatFaultTolerance);
>     EXPECT_NEAR(1.0f, outputVal2, floatFaultTolerance);
> 
>     unpackSnorm2x16(packSnorm2x16(std::numeric_limits<float>::infinity(),
>-                                  -std::numeric_limits<float>::infinity()), &outputVal1, &outputVal2);
>+                                  -std::numeric_limits<float>::infinity()),
>+                    &outputVal1, &outputVal2);
>     EXPECT_NEAR(1.0f, outputVal1, floatFaultTolerance);
>     EXPECT_NEAR(-1.0f, outputVal2, floatFaultTolerance);
> 
>     unpackSnorm2x16(packSnorm2x16(-std::numeric_limits<float>::infinity(),
>-                                  -std::numeric_limits<float>::infinity()), &outputVal1, &outputVal2);
>+                                  -std::numeric_limits<float>::infinity()),
>+                    &outputVal1, &outputVal2);
>     EXPECT_NEAR(-1.0f, outputVal1, floatFaultTolerance);
>     EXPECT_NEAR(-1.0f, outputVal2, floatFaultTolerance);
> }
>@@ -69,17 +64,9 @@ TEST(MathUtilTest, packAndUnpackSnorm2x16Infinity)
> // For floats f1 and f2, unpackUnorm2x16(packUnorm2x16(f1, f2)) should be same as f1 and f2.
> TEST(MathUtilTest, packAndUnpackUnorm2x16)
> {
>-    const float input[8][2] =
>-    {
>-        { 0.0f, 0.0f },
>-        { 1.0f, 1.0f },
>-        { -1.0f, 1.0f },
>-        { -1.0f, -1.0f },
>-        { 0.875f, 0.75f },
>-        { 0.00392f, -0.99215f },
>-        { -0.000675f, 0.004954f },
>-        { -0.6937f, -0.02146f }
>-    };
>+    const float input[8][2] = {
>+        {0.0f, 0.0f},    {1.0f, 1.0f},          {-1.0f, 1.0f},           {-1.0f, -1.0f},
>+        {0.875f, 0.75f}, {0.00392f, -0.99215f}, {-0.000675f, 0.004954f}, {-0.6937f, -0.02146f}};
>     const float floatFaultTolerance = 0.0001f;
>     float outputVal1, outputVal2;
> 
>@@ -101,17 +88,20 @@ TEST(MathUtilTest, packAndUnpackUnorm2x16Infinity)
>     float outputVal1, outputVal2;
> 
>     unpackUnorm2x16(packUnorm2x16(std::numeric_limits<float>::infinity(),
>-                                  std::numeric_limits<float>::infinity()), &outputVal1, &outputVal2);
>+                                  std::numeric_limits<float>::infinity()),
>+                    &outputVal1, &outputVal2);
>     EXPECT_NEAR(1.0f, outputVal1, floatFaultTolerance);
>     EXPECT_NEAR(1.0f, outputVal2, floatFaultTolerance);
> 
>     unpackUnorm2x16(packUnorm2x16(std::numeric_limits<float>::infinity(),
>-                                  -std::numeric_limits<float>::infinity()), &outputVal1, &outputVal2);
>+                                  -std::numeric_limits<float>::infinity()),
>+                    &outputVal1, &outputVal2);
>     EXPECT_NEAR(1.0f, outputVal1, floatFaultTolerance);
>     EXPECT_NEAR(0.0f, outputVal2, floatFaultTolerance);
> 
>     unpackUnorm2x16(packUnorm2x16(-std::numeric_limits<float>::infinity(),
>-                                  -std::numeric_limits<float>::infinity()), &outputVal1, &outputVal2);
>+                                  -std::numeric_limits<float>::infinity()),
>+                    &outputVal1, &outputVal2);
>     EXPECT_NEAR(0.0f, outputVal1, floatFaultTolerance);
>     EXPECT_NEAR(0.0f, outputVal2, floatFaultTolerance);
> }
>@@ -120,16 +110,9 @@ TEST(MathUtilTest, packAndUnpackUnorm2x16Infinity)
> // For floats f1 and f2, unpackHalf2x16(packHalf2x16(f1, f2)) should be same as f1 and f2.
> TEST(MathUtilTest, packAndUnpackHalf2x16)
> {
>-    const float input[8][2] =
>-    {
>-        { 0.0f, 0.0f },
>-        { 1.0f, 1.0f },
>-        { -1.0f, 1.0f },
>-        { -1.0f, -1.0f },
>-        { 0.875f, 0.75f },
>-        { 0.00392f, -0.99215f },
>-        { -0.000675f, 0.004954f },
>-        { -0.6937f, -0.02146f },
>+    const float input[8][2] = {
>+        {0.0f, 0.0f},    {1.0f, 1.0f},          {-1.0f, 1.0f},           {-1.0f, -1.0f},
>+        {0.875f, 0.75f}, {0.00392f, -0.99215f}, {-0.000675f, 0.004954f}, {-0.6937f, -0.02146f},
>     };
>     const float floatFaultTolerance = 0.0005f;
>     float outputVal1, outputVal2;
>@@ -276,9 +259,9 @@ TEST(MathUtilTest, BitCount)
>     EXPECT_EQ(10, gl::BitCount(0x17103121u));
> 
> #if defined(ANGLE_IS_64_BIT_CPU)
>-    EXPECT_EQ(0, gl::BitCount(0ull));
>-    EXPECT_EQ(32, gl::BitCount(0xFFFFFFFFull));
>-    EXPECT_EQ(10, gl::BitCount(0x17103121ull));
>+    EXPECT_EQ(0, gl::BitCount(static_cast<uint64_t>(0ull)));
>+    EXPECT_EQ(32, gl::BitCount(static_cast<uint64_t>(0xFFFFFFFFull)));
>+    EXPECT_EQ(10, gl::BitCount(static_cast<uint64_t>(0x17103121ull)));
> #endif  // defined(ANGLE_IS_64_BIT_CPU)
> }
> 
>@@ -290,9 +273,9 @@ TEST(MathUtilTest, ScanForward)
>     EXPECT_EQ(31ul, gl::ScanForward(0x80000000u));
> 
> #if defined(ANGLE_IS_64_BIT_CPU)
>-    EXPECT_EQ(0ul, gl::ScanForward(1ull));
>-    EXPECT_EQ(16ul, gl::ScanForward(0x80010000ull));
>-    EXPECT_EQ(31ul, gl::ScanForward(0x80000000ull));
>+    EXPECT_EQ(0ul, gl::ScanForward(static_cast<uint64_t>(1ull)));
>+    EXPECT_EQ(16ul, gl::ScanForward(static_cast<uint64_t>(0x80010000ull)));
>+    EXPECT_EQ(31ul, gl::ScanForward(static_cast<uint64_t>(0x80000000ull)));
> #endif  // defined(ANGLE_IS_64_BIT_CPU)
> }
> 
>diff --git a/Source/ThirdParty/ANGLE/src/common/matrix_utils.cpp b/Source/ThirdParty/ANGLE/src/common/matrix_utils.cpp
>new file mode 100644
>index 00000000000..59ab4ca4374
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/common/matrix_utils.cpp
>@@ -0,0 +1,285 @@
>+//
>+// Copyright 2018 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+
>+// matrix_utils.cpp: Contains implementations for Mat4 methods.
>+
>+#include "common/matrix_utils.h"
>+
>+namespace angle
>+{
>+
>+Mat4::Mat4() : Mat4(1.f, 0.f, 0.f, 0.f, 0.f, 1.f, 0.f, 0.f, 0.f, 0.f, 1.f, 0.f, 0.f, 0.f, 0.f, 1.f)
>+{}
>+
>+Mat4::Mat4(const Matrix<float> generalMatrix) : Matrix(std::vector<float>(16, 0), 4, 4)
>+{
>+    unsigned int minCols = std::min((unsigned int)4, generalMatrix.columns());
>+    unsigned int minRows = std::min((unsigned int)4, generalMatrix.rows());
>+    for (unsigned int i = 0; i < minCols; i++)
>+    {
>+        for (unsigned int j = 0; j < minRows; j++)
>+        {
>+            mElements[j * minCols + i] = generalMatrix.at(j, i);
>+        }
>+    }
>+}
>+
>+Mat4::Mat4(const std::vector<float> &elements) : Matrix(elements, 4) {}
>+
>+Mat4::Mat4(const float *elements) : Matrix(elements, 4) {}
>+
>+Mat4::Mat4(float m00,
>+           float m01,
>+           float m02,
>+           float m03,
>+           float m10,
>+           float m11,
>+           float m12,
>+           float m13,
>+           float m20,
>+           float m21,
>+           float m22,
>+           float m23,
>+           float m30,
>+           float m31,
>+           float m32,
>+           float m33)
>+    : Matrix(std::vector<float>(16, 0), 4, 4)
>+{
>+    mElements[0]  = m00;
>+    mElements[1]  = m01;
>+    mElements[2]  = m02;
>+    mElements[3]  = m03;
>+    mElements[4]  = m10;
>+    mElements[5]  = m11;
>+    mElements[6]  = m12;
>+    mElements[7]  = m13;
>+    mElements[8]  = m20;
>+    mElements[9]  = m21;
>+    mElements[10] = m22;
>+    mElements[11] = m23;
>+    mElements[12] = m30;
>+    mElements[13] = m31;
>+    mElements[14] = m32;
>+    mElements[15] = m33;
>+}
>+
>+// static
>+Mat4 Mat4::Rotate(float angle, const Vector3 &axis)
>+{
>+    auto axis_normalized = axis.normalized();
>+    float angle_radians  = angle * (3.14159265358979323f / 180.0f);
>+    float c              = cos(angle_radians);
>+    float ci             = 1.f - c;
>+    float s              = sin(angle_radians);
>+
>+    float x = axis_normalized.x();
>+    float y = axis_normalized.y();
>+    float z = axis_normalized.z();
>+
>+    float x2 = x * x;
>+    float y2 = y * y;
>+    float z2 = z * z;
>+
>+    float xy = x * y;
>+    float yz = y * z;
>+    float zx = z * x;
>+
>+    float r00 = c + ci * x2;
>+    float r01 = ci * xy + s * z;
>+    float r02 = ci * zx - s * y;
>+    float r03 = 0.f;
>+
>+    float r10 = ci * xy - s * z;
>+    float r11 = c + ci * y2;
>+    float r12 = ci * yz + s * x;
>+    float r13 = 0.f;
>+
>+    float r20 = ci * zx + s * y;
>+    float r21 = ci * yz - s * x;
>+    float r22 = c + ci * z2;
>+    float r23 = 0.f;
>+
>+    float r30 = 0.f;
>+    float r31 = 0.f;
>+    float r32 = 0.f;
>+    float r33 = 1.f;
>+
>+    return Mat4(r00, r01, r02, r03, r10, r11, r12, r13, r20, r21, r22, r23, r30, r31, r32, r33);
>+}
>+
>+// static
>+Mat4 Mat4::Translate(const Vector3 &t)
>+{
>+    float r00 = 1.f;
>+    float r01 = 0.f;
>+    float r02 = 0.f;
>+    float r03 = 0.f;
>+
>+    float r10 = 0.f;
>+    float r11 = 1.f;
>+    float r12 = 0.f;
>+    float r13 = 0.f;
>+
>+    float r20 = 0.f;
>+    float r21 = 0.f;
>+    float r22 = 1.f;
>+    float r23 = 0.f;
>+
>+    float r30 = t.x();
>+    float r31 = t.y();
>+    float r32 = t.z();
>+    float r33 = 1.f;
>+
>+    return Mat4(r00, r01, r02, r03, r10, r11, r12, r13, r20, r21, r22, r23, r30, r31, r32, r33);
>+}
>+
>+// static
>+Mat4 Mat4::Scale(const Vector3 &s)
>+{
>+    float r00 = s.x();
>+    float r01 = 0.f;
>+    float r02 = 0.f;
>+    float r03 = 0.f;
>+
>+    float r10 = 0.f;
>+    float r11 = s.y();
>+    float r12 = 0.f;
>+    float r13 = 0.f;
>+
>+    float r20 = 0.f;
>+    float r21 = 0.f;
>+    float r22 = s.z();
>+    float r23 = 0.f;
>+
>+    float r30 = 0.f;
>+    float r31 = 0.f;
>+    float r32 = 0.f;
>+    float r33 = 1.f;
>+
>+    return Mat4(r00, r01, r02, r03, r10, r11, r12, r13, r20, r21, r22, r23, r30, r31, r32, r33);
>+}
>+
>+// static
>+Mat4 Mat4::Frustum(float l, float r, float b, float t, float n, float f)
>+{
>+    float nn  = 2.f * n;
>+    float fpn = f + n;
>+    float fmn = f - n;
>+    float tpb = t + b;
>+    float tmb = t - b;
>+    float rpl = r + l;
>+    float rml = r - l;
>+
>+    float r00 = nn / rml;
>+    float r01 = 0.f;
>+    float r02 = 0.f;
>+    float r03 = 0.f;
>+
>+    float r10 = 0.f;
>+    float r11 = nn / tmb;
>+    float r12 = 0.f;
>+    float r13 = 0.f;
>+
>+    float r20 = rpl / rml;
>+    float r21 = tpb / tmb;
>+    float r22 = -fpn / fmn;
>+    float r23 = -1.f;
>+
>+    float r30 = 0.f;
>+    float r31 = 0.f;
>+    float r32 = -nn * f / fmn;
>+    float r33 = 0.f;
>+
>+    return Mat4(r00, r01, r02, r03, r10, r11, r12, r13, r20, r21, r22, r23, r30, r31, r32, r33);
>+}
>+
>+// static
>+Mat4 Mat4::Perspective(float fov, float aspectRatio, float n, float f)
>+{
>+    const float frustumHeight = tanf(static_cast<float>(fov / 360.0f * 3.14159265358979323)) * n;
>+    const float frustumWidth  = frustumHeight * aspectRatio;
>+    return Frustum(-frustumWidth, frustumWidth, -frustumHeight, frustumHeight, n, f);
>+}
>+
>+// static
>+Mat4 Mat4::Ortho(float l, float r, float b, float t, float n, float f)
>+{
>+    float fpn = f + n;
>+    float fmn = f - n;
>+    float tpb = t + b;
>+    float tmb = t - b;
>+    float rpl = r + l;
>+    float rml = r - l;
>+
>+    float r00 = 2.f / rml;
>+    float r01 = 0.f;
>+    float r02 = 0.f;
>+    float r03 = 0.f;
>+
>+    float r10 = 0.f;
>+    float r11 = 2.f / tmb;
>+    float r12 = 0.f;
>+    float r13 = 0.f;
>+
>+    float r20 = 0.f;
>+    float r21 = 0.f;
>+    float r22 = -2.f / fmn;
>+    float r23 = 0.f;
>+
>+    float r30 = -rpl / rml;
>+    float r31 = -tpb / tmb;
>+    float r32 = -fpn / fmn;
>+    float r33 = 1.f;
>+
>+    return Mat4(r00, r01, r02, r03, r10, r11, r12, r13, r20, r21, r22, r23, r30, r31, r32, r33);
>+}
>+
>+Mat4 Mat4::product(const Mat4 &m)
>+{
>+    const float *a = mElements.data();
>+    const float *b = m.mElements.data();
>+
>+    return Mat4(a[0] * b[0] + a[4] * b[1] + a[8] * b[2] + a[12] * b[3],
>+                a[1] * b[0] + a[5] * b[1] + a[9] * b[2] + a[13] * b[3],
>+                a[2] * b[0] + a[6] * b[1] + a[10] * b[2] + a[14] * b[3],
>+                a[3] * b[0] + a[7] * b[1] + a[11] * b[2] + a[15] * b[3],
>+
>+                a[0] * b[4] + a[4] * b[5] + a[8] * b[6] + a[12] * b[7],
>+                a[1] * b[4] + a[5] * b[5] + a[9] * b[6] + a[13] * b[7],
>+                a[2] * b[4] + a[6] * b[5] + a[10] * b[6] + a[14] * b[7],
>+                a[3] * b[4] + a[7] * b[5] + a[11] * b[6] + a[15] * b[7],
>+
>+                a[0] * b[8] + a[4] * b[9] + a[8] * b[10] + a[12] * b[11],
>+                a[1] * b[8] + a[5] * b[9] + a[9] * b[10] + a[13] * b[11],
>+                a[2] * b[8] + a[6] * b[9] + a[10] * b[10] + a[14] * b[11],
>+                a[3] * b[8] + a[7] * b[9] + a[11] * b[10] + a[15] * b[11],
>+
>+                a[0] * b[12] + a[4] * b[13] + a[8] * b[14] + a[12] * b[15],
>+                a[1] * b[12] + a[5] * b[13] + a[9] * b[14] + a[13] * b[15],
>+                a[2] * b[12] + a[6] * b[13] + a[10] * b[14] + a[14] * b[15],
>+                a[3] * b[12] + a[7] * b[13] + a[11] * b[14] + a[15] * b[15]);
>+}
>+
>+Vector4 Mat4::product(const Vector4 &b)
>+{
>+    return Vector4(
>+        mElements[0] * b.x() + mElements[4] * b.y() + mElements[8] * b.z() + mElements[12] * b.w(),
>+        mElements[1] * b.x() + mElements[5] * b.y() + mElements[9] * b.z() + mElements[13] * b.w(),
>+        mElements[2] * b.x() + mElements[6] * b.y() + mElements[10] * b.z() + mElements[14] * b.w(),
>+        mElements[3] * b.x() + mElements[7] * b.y() + mElements[11] * b.z() +
>+            mElements[15] * b.w());
>+}
>+
>+void Mat4::dump()
>+{
>+    printf("[ %f %f %f %f ]\n", mElements[0], mElements[4], mElements[8], mElements[12]);
>+    printf("[ %f %f %f %f ]\n", mElements[1], mElements[5], mElements[9], mElements[13]);
>+    printf("[ %f %f %f %f ]\n", mElements[2], mElements[6], mElements[10], mElements[14]);
>+    printf("[ %f %f %f %f ]\n", mElements[3], mElements[7], mElements[11], mElements[15]);
>+}
>+
>+}  // namespace angle
>diff --git a/Source/ThirdParty/ANGLE/src/common/matrix_utils.h b/Source/ThirdParty/ANGLE/src/common/matrix_utils.h
>index aa3f89536e3..5a6b9680c23 100644
>--- a/Source/ThirdParty/ANGLE/src/common/matrix_utils.h
>+++ b/Source/ThirdParty/ANGLE/src/common/matrix_utils.h
>@@ -7,7 +7,8 @@
> //   Utility class implementing various matrix operations.
> //   Supports matrices with minimum 2 and maximum 4 number of rows/columns.
> //
>-// TODO: Check if we can merge Matrix.h in sample_util with this and replace it with this implementation.
>+// TODO: Check if we can merge Matrix.h in sample_util with this and replace it with this
>+// implementation.
> // TODO: Rename this file to Matrix.h once we remove Matrix.h in sample_util.
> 
> #ifndef COMMON_MATRIX_UTILS_H_
>@@ -17,35 +18,30 @@
> 
> #include "common/debug.h"
> #include "common/mathutil.h"
>+#include "common/vector_utils.h"
> 
> namespace angle
> {
> 
>-template<typename T>
>+template <typename T>
> class Matrix
> {
>   public:
>-    Matrix(const std::vector<T> &elements, const unsigned int &numRows, const unsigned int &numCols)
>-        : mElements(elements),
>-          mRows(numRows),
>-          mCols(numCols)
>+    Matrix(const std::vector<T> &elements, const unsigned int numRows, const unsigned int numCols)
>+        : mElements(elements), mRows(numRows), mCols(numCols)
>     {
>         ASSERT(rows() >= 1 && rows() <= 4);
>         ASSERT(columns() >= 1 && columns() <= 4);
>     }
> 
>-    Matrix(const std::vector<T> &elements, const unsigned int &size)
>-        : mElements(elements),
>-          mRows(size),
>-          mCols(size)
>+    Matrix(const std::vector<T> &elements, const unsigned int size)
>+        : mElements(elements), mRows(size), mCols(size)
>     {
>         ASSERT(rows() >= 1 && rows() <= 4);
>         ASSERT(columns() >= 1 && columns() <= 4);
>     }
> 
>-    Matrix(const T *elements, const unsigned int &size)
>-        : mRows(size),
>-          mCols(size)
>+    Matrix(const T *elements, const unsigned int size) : mRows(size), mCols(size)
>     {
>         ASSERT(rows() >= 1 && rows() <= 4);
>         ASSERT(columns() >= 1 && columns() <= 4);
>@@ -53,18 +49,24 @@ class Matrix
>             mElements.push_back(elements[i]);
>     }
> 
>-    const T &operator()(const unsigned int &rowIndex, const unsigned int &columnIndex) const
>+    const T &operator()(const unsigned int rowIndex, const unsigned int columnIndex) const
>     {
>+        ASSERT(rowIndex < mRows);
>+        ASSERT(columnIndex < mCols);
>         return mElements[rowIndex * columns() + columnIndex];
>     }
> 
>-    T &operator()(const unsigned int &rowIndex, const unsigned int &columnIndex)
>+    T &operator()(const unsigned int rowIndex, const unsigned int columnIndex)
>     {
>+        ASSERT(rowIndex < mRows);
>+        ASSERT(columnIndex < mCols);
>         return mElements[rowIndex * columns() + columnIndex];
>     }
> 
>-    const T &at(const unsigned int &rowIndex, const unsigned int &columnIndex) const
>+    const T &at(const unsigned int rowIndex, const unsigned int columnIndex) const
>     {
>+        ASSERT(rowIndex < mRows);
>+        ASSERT(columnIndex < mCols);
>         return operator()(rowIndex, columnIndex);
>     }
> 
>@@ -89,6 +91,37 @@ class Matrix
>         return result;
>     }
> 
>+    void operator*=(const Matrix<T> &m)
>+    {
>+        ASSERT(columns() == m.rows());
>+        Matrix<T> res  = (*this) * m;
>+        size_t numElts = res.elements().size();
>+        mElements.resize(numElts);
>+        memcpy(mElements.data(), res.data(), numElts * sizeof(float));
>+    }
>+
>+    bool operator==(const Matrix<T> &m) const
>+    {
>+        ASSERT(columns() == m.columns());
>+        ASSERT(rows() == m.rows());
>+        return mElements == m.elements();
>+    }
>+
>+    bool operator!=(const Matrix<T> &m) const { return !(mElements == m.elements()); }
>+
>+    bool nearlyEqual(T epsilon, const Matrix<T> &m) const
>+    {
>+        ASSERT(columns() == m.columns());
>+        ASSERT(rows() == m.rows());
>+        const auto &otherElts = m.elements();
>+        for (size_t i = 0; i < otherElts.size(); i++)
>+        {
>+            if ((mElements[i] - otherElts[i] > epsilon) && (otherElts[i] - mElements[i] > epsilon))
>+                return false;
>+        }
>+        return true;
>+    }
>+
>     unsigned int size() const
>     {
>         ASSERT(rows() == columns());
>@@ -100,13 +133,20 @@ class Matrix
>     unsigned int columns() const { return mCols; }
> 
>     std::vector<T> elements() const { return mElements; }
>+    T *data() { return mElements.data(); }
> 
>     Matrix<T> compMult(const Matrix<T> &mat1) const
>     {
>-        Matrix result(std::vector<T>(mElements.size()), size());
>-        for (unsigned int i = 0; i < columns(); i++)
>-            for (unsigned int j = 0; j < rows(); j++)
>-                result(i, j) = at(i, j) * mat1(i, j);
>+        Matrix result(std::vector<T>(mElements.size()), rows(), columns());
>+        for (unsigned int i = 0; i < rows(); i++)
>+        {
>+            for (unsigned int j = 0; j < columns(); j++)
>+            {
>+                T lhs        = at(i, j);
>+                T rhs        = mat1(i, j);
>+                result(i, j) = rhs * lhs;
>+            }
>+        }
> 
>         return result;
>     }
>@@ -138,51 +178,69 @@ class Matrix
> 
>         switch (size())
>         {
>-          case 2:
>-            return at(0, 0) * at(1, 1) - at(0, 1) * at(1, 0);
>-
>-          case 3:
>-            return at(0, 0) * at(1, 1) * at(2, 2) +
>-                at(0, 1) * at(1, 2) * at(2, 0) +
>-                at(0, 2) * at(1, 0) * at(2, 1) -
>-                at(0, 2) * at(1, 1) * at(2, 0) -
>-                at(0, 1) * at(1, 0) * at(2, 2) -
>-                at(0, 0) * at(1, 2) * at(2, 1);
>-
>-          case 4:
>+            case 2:
>+                return at(0, 0) * at(1, 1) - at(0, 1) * at(1, 0);
>+
>+            case 3:
>+                return at(0, 0) * at(1, 1) * at(2, 2) + at(0, 1) * at(1, 2) * at(2, 0) +
>+                       at(0, 2) * at(1, 0) * at(2, 1) - at(0, 2) * at(1, 1) * at(2, 0) -
>+                       at(0, 1) * at(1, 0) * at(2, 2) - at(0, 0) * at(1, 2) * at(2, 1);
>+
>+            case 4:
>             {
>-                const float minorMatrices[4][3 * 3] =
>-                {
>-                    {
>-                        at(1, 1), at(2, 1), at(3, 1),
>-                        at(1, 2), at(2, 2), at(3, 2),
>-                        at(1, 3), at(2, 3), at(3, 3),
>-                    },
>-                    {
>-                        at(1, 0), at(2, 0), at(3, 0),
>-                        at(1, 2), at(2, 2), at(3, 2),
>-                        at(1, 3), at(2, 3), at(3, 3),
>-                    },
>-                    {
>-                        at(1, 0), at(2, 0), at(3, 0),
>-                        at(1, 1), at(2, 1), at(3, 1),
>-                        at(1, 3), at(2, 3), at(3, 3),
>-                    },
>-                    {
>-                        at(1, 0), at(2, 0), at(3, 0),
>-                        at(1, 1), at(2, 1), at(3, 1),
>-                        at(1, 2), at(2, 2), at(3, 2),
>-                    }
>-              };
>-              return at(0, 0) * Matrix<T>(minorMatrices[0], 3).determinant() -
>-                  at(0, 1) * Matrix<T>(minorMatrices[1], 3).determinant() +
>-                  at(0, 2) * Matrix<T>(minorMatrices[2], 3).determinant() -
>-                  at(0, 3) * Matrix<T>(minorMatrices[3], 3).determinant();
>+                const float minorMatrices[4][3 * 3] = {{
>+                                                           at(1, 1),
>+                                                           at(2, 1),
>+                                                           at(3, 1),
>+                                                           at(1, 2),
>+                                                           at(2, 2),
>+                                                           at(3, 2),
>+                                                           at(1, 3),
>+                                                           at(2, 3),
>+                                                           at(3, 3),
>+                                                       },
>+                                                       {
>+                                                           at(1, 0),
>+                                                           at(2, 0),
>+                                                           at(3, 0),
>+                                                           at(1, 2),
>+                                                           at(2, 2),
>+                                                           at(3, 2),
>+                                                           at(1, 3),
>+                                                           at(2, 3),
>+                                                           at(3, 3),
>+                                                       },
>+                                                       {
>+                                                           at(1, 0),
>+                                                           at(2, 0),
>+                                                           at(3, 0),
>+                                                           at(1, 1),
>+                                                           at(2, 1),
>+                                                           at(3, 1),
>+                                                           at(1, 3),
>+                                                           at(2, 3),
>+                                                           at(3, 3),
>+                                                       },
>+                                                       {
>+                                                           at(1, 0),
>+                                                           at(2, 0),
>+                                                           at(3, 0),
>+                                                           at(1, 1),
>+                                                           at(2, 1),
>+                                                           at(3, 1),
>+                                                           at(1, 2),
>+                                                           at(2, 2),
>+                                                           at(3, 2),
>+                                                       }};
>+                return at(0, 0) * Matrix<T>(minorMatrices[0], 3).determinant() -
>+                       at(0, 1) * Matrix<T>(minorMatrices[1], 3).determinant() +
>+                       at(0, 2) * Matrix<T>(minorMatrices[2], 3).determinant() -
>+                       at(0, 3) * Matrix<T>(minorMatrices[3], 3).determinant();
>             }
> 
>-          default:
>-            UNREACHABLE();
>-            break;
>+            default:
>+                UNREACHABLE();
>+                break;
>         }
> 
>         return T();
>@@ -195,139 +253,83 @@ class Matrix
>         Matrix<T> cof(std::vector<T>(mElements.size()), rows(), columns());
>         switch (size())
>         {
>-          case 2:
>-            cof(0, 0) = at(1, 1);
>-            cof(0, 1) = -at(1, 0);
>-            cof(1, 0) = -at(0, 1);
>-            cof(1, 1) = at(0, 0);
>-            break;
>-
>-          case 3:
>-            cof(0, 0) = at(1, 1) * at(2, 2) -
>-                at(2, 1) * at(1, 2);
>-            cof(0, 1) = -(at(1, 0) * at(2, 2) -
>-                at(2, 0) * at(1, 2));
>-            cof(0, 2) = at(1, 0) * at(2, 1) -
>-                at(2, 0) * at(1, 1);
>-            cof(1, 0) = -(at(0, 1) * at(2, 2) -
>-                at(2, 1) * at(0, 2));
>-            cof(1, 1) = at(0, 0) * at(2, 2) -
>-                at(2, 0) * at(0, 2);
>-            cof(1, 2) = -(at(0, 0) * at(2, 1) -
>-                at(2, 0) * at(0, 1));
>-            cof(2, 0) = at(0, 1) * at(1, 2) -
>-                at(1, 1) * at(0, 2);
>-            cof(2, 1) = -(at(0, 0) * at(1, 2) -
>-                at(1, 0) * at(0, 2));
>-            cof(2, 2) = at(0, 0) * at(1, 1) -
>-                at(1, 0) * at(0, 1);
>-            break;
>-
>-          case 4:
>-            cof(0, 0) = at(1, 1) * at(2, 2) * at(3, 3) +
>-                at(2, 1) * at(3, 2) * at(1, 3) +
>-                at(3, 1) * at(1, 2) * at(2, 3) -
>-                at(1, 1) * at(3, 2) * at(2, 3) -
>-                at(2, 1) * at(1, 2) * at(3, 3) -
>-                at(3, 1) * at(2, 2) * at(1, 3);
>-            cof(0, 1) = -(at(1, 0) * at(2, 2) * at(3, 3) +
>-                at(2, 0) * at(3, 2) * at(1, 3) +
>-                at(3, 0) * at(1, 2) * at(2, 3) -
>-                at(1, 0) * at(3, 2) * at(2, 3) -
>-                at(2, 0) * at(1, 2) * at(3, 3) -
>-                at(3, 0) * at(2, 2) * at(1, 3));
>-            cof(0, 2) = at(1, 0) * at(2, 1) * at(3, 3) +
>-                at(2, 0) * at(3, 1) * at(1, 3) +
>-                at(3, 0) * at(1, 1) * at(2, 3) -
>-                at(1, 0) * at(3, 1) * at(2, 3) -
>-                at(2, 0) * at(1, 1) * at(3, 3) -
>-                at(3, 0) * at(2, 1) * at(1, 3);
>-            cof(0, 3) = -(at(1, 0) * at(2, 1) * at(3, 2) +
>-                at(2, 0) * at(3, 1) * at(1, 2) +
>-                at(3, 0) * at(1, 1) * at(2, 2) -
>-                at(1, 0) * at(3, 1) * at(2, 2) -
>-                at(2, 0) * at(1, 1) * at(3, 2) -
>-                at(3, 0) * at(2, 1) * at(1, 2));
>-            cof(1, 0) = -(at(0, 1) * at(2, 2) * at(3, 3) +
>-                at(2, 1) * at(3, 2) * at(0, 3) +
>-                at(3, 1) * at(0, 2) * at(2, 3) -
>-                at(0, 1) * at(3, 2) * at(2, 3) -
>-                at(2, 1) * at(0, 2) * at(3, 3) -
>-                at(3, 1) * at(2, 2) * at(0, 3));
>-            cof(1, 1) = at(0, 0) * at(2, 2) * at(3, 3) +
>-                at(2, 0) * at(3, 2) * at(0, 3) +
>-                at(3, 0) * at(0, 2) * at(2, 3) -
>-                at(0, 0) * at(3, 2) * at(2, 3) -
>-                at(2, 0) * at(0, 2) * at(3, 3) -
>-                at(3, 0) * at(2, 2) * at(0, 3);
>-            cof(1, 2) = -(at(0, 0) * at(2, 1) * at(3, 3) +
>-                at(2, 0) * at(3, 1) * at(0, 3) +
>-                at(3, 0) * at(0, 1) * at(2, 3) -
>-                at(0, 0) * at(3, 1) * at(2, 3) -
>-                at(2, 0) * at(0, 1) * at(3, 3) -
>-                at(3, 0) * at(2, 1) * at(0, 3));
>-            cof(1, 3) = at(0, 0) * at(2, 1) * at(3, 2) +
>-                at(2, 0) * at(3, 1) * at(0, 2) +
>-                at(3, 0) * at(0, 1) * at(2, 2) -
>-                at(0, 0) * at(3, 1) * at(2, 2) -
>-                at(2, 0) * at(0, 1) * at(3, 2) -
>-                at(3, 0) * at(2, 1) * at(0, 2);
>-            cof(2, 0) = at(0, 1) * at(1, 2) * at(3, 3) +
>-                at(1, 1) * at(3, 2) * at(0, 3) +
>-                at(3, 1) * at(0, 2) * at(1, 3) -
>-                at(0, 1) * at(3, 2) * at(1, 3) -
>-                at(1, 1) * at(0, 2) * at(3, 3) -
>-                at(3, 1) * at(1, 2) * at(0, 3);
>-            cof(2, 1) = -(at(0, 0) * at(1, 2) * at(3, 3) +
>-                at(1, 0) * at(3, 2) * at(0, 3) +
>-                at(3, 0) * at(0, 2) * at(1, 3) -
>-                at(0, 0) * at(3, 2) * at(1, 3) -
>-                at(1, 0) * at(0, 2) * at(3, 3) -
>-                at(3, 0) * at(1, 2) * at(0, 3));
>-            cof(2, 2) = at(0, 0) * at(1, 1) * at(3, 3) +
>-                at(1, 0) * at(3, 1) * at(0, 3) +
>-                at(3, 0) * at(0, 1) * at(1, 3) -
>-                at(0, 0) * at(3, 1) * at(1, 3) -
>-                at(1, 0) * at(0, 1) * at(3, 3) -
>-                at(3, 0) * at(1, 1) * at(0, 3);
>-            cof(2, 3) = -(at(0, 0) * at(1, 1) * at(3, 2) +
>-                at(1, 0) * at(3, 1) * at(0, 2) +
>-                at(3, 0) * at(0, 1) * at(1, 2) -
>-                at(0, 0) * at(3, 1) * at(1, 2) -
>-                at(1, 0) * at(0, 1) * at(3, 2) -
>-                at(3, 0) * at(1, 1) * at(0, 2));
>-            cof(3, 0) = -(at(0, 1) * at(1, 2) * at(2, 3) +
>-                at(1, 1) * at(2, 2) * at(0, 3) +
>-                at(2, 1) * at(0, 2) * at(1, 3) -
>-                at(0, 1) * at(2, 2) * at(1, 3) -
>-                at(1, 1) * at(0, 2) * at(2, 3) -
>-                at(2, 1) * at(1, 2) * at(0, 3));
>-            cof(3, 1) = at(0, 0) * at(1, 2) * at(2, 3) +
>-                at(1, 0) * at(2, 2) * at(0, 3) +
>-                at(2, 0) * at(0, 2) * at(1, 3) -
>-                at(0, 0) * at(2, 2) * at(1, 3) -
>-                at(1, 0) * at(0, 2) * at(2, 3) -
>-                at(2, 0) * at(1, 2) * at(0, 3);
>-            cof(3, 2) = -(at(0, 0) * at(1, 1) * at(2, 3) +
>-                at(1, 0) * at(2, 1) * at(0, 3) +
>-                at(2, 0) * at(0, 1) * at(1, 3) -
>-                at(0, 0) * at(2, 1) * at(1, 3) -
>-                at(1, 0) * at(0, 1) * at(2, 3) -
>-                at(2, 0) * at(1, 1) * at(0, 3));
>-            cof(3, 3) = at(0, 0) * at(1, 1) * at(2, 2) +
>-                at(1, 0) * at(2, 1) * at(0, 2) +
>-                at(2, 0) * at(0, 1) * at(1, 2) -
>-                at(0, 0) * at(2, 1) * at(1, 2) -
>-                at(1, 0) * at(0, 1) * at(2, 2) -
>-                at(2, 0) * at(1, 1) * at(0, 2);
>-            break;
>-
>-          default:
>-            UNREACHABLE();
>-            break;
>+            case 2:
>+                cof(0, 0) = at(1, 1);
>+                cof(0, 1) = -at(1, 0);
>+                cof(1, 0) = -at(0, 1);
>+                cof(1, 1) = at(0, 0);
>+                break;
>+
>+            case 3:
>+                cof(0, 0) = at(1, 1) * at(2, 2) - at(2, 1) * at(1, 2);
>+                cof(0, 1) = -(at(1, 0) * at(2, 2) - at(2, 0) * at(1, 2));
>+                cof(0, 2) = at(1, 0) * at(2, 1) - at(2, 0) * at(1, 1);
>+                cof(1, 0) = -(at(0, 1) * at(2, 2) - at(2, 1) * at(0, 2));
>+                cof(1, 1) = at(0, 0) * at(2, 2) - at(2, 0) * at(0, 2);
>+                cof(1, 2) = -(at(0, 0) * at(2, 1) - at(2, 0) * at(0, 1));
>+                cof(2, 0) = at(0, 1) * at(1, 2) - at(1, 1) * at(0, 2);
>+                cof(2, 1) = -(at(0, 0) * at(1, 2) - at(1, 0) * at(0, 2));
>+                cof(2, 2) = at(0, 0) * at(1, 1) - at(1, 0) * at(0, 1);
>+                break;
>+
>+            case 4:
>+                cof(0, 0) = at(1, 1) * at(2, 2) * at(3, 3) + at(2, 1) * at(3, 2) * at(1, 3) +
>+                            at(3, 1) * at(1, 2) * at(2, 3) - at(1, 1) * at(3, 2) * at(2, 3) -
>+                            at(2, 1) * at(1, 2) * at(3, 3) - at(3, 1) * at(2, 2) * at(1, 3);
>+                cof(0, 1) = -(at(1, 0) * at(2, 2) * at(3, 3) + at(2, 0) * at(3, 2) * at(1, 3) +
>+                              at(3, 0) * at(1, 2) * at(2, 3) - at(1, 0) * at(3, 2) * at(2, 3) -
>+                              at(2, 0) * at(1, 2) * at(3, 3) - at(3, 0) * at(2, 2) * at(1, 3));
>+                cof(0, 2) = at(1, 0) * at(2, 1) * at(3, 3) + at(2, 0) * at(3, 1) * at(1, 3) +
>+                            at(3, 0) * at(1, 1) * at(2, 3) - at(1, 0) * at(3, 1) * at(2, 3) -
>+                            at(2, 0) * at(1, 1) * at(3, 3) - at(3, 0) * at(2, 1) * at(1, 3);
>+                cof(0, 3) = -(at(1, 0) * at(2, 1) * at(3, 2) + at(2, 0) * at(3, 1) * at(1, 2) +
>+                              at(3, 0) * at(1, 1) * at(2, 2) - at(1, 0) * at(3, 1) * at(2, 2) -
>+                              at(2, 0) * at(1, 1) * at(3, 2) - at(3, 0) * at(2, 1) * at(1, 2));
>+                cof(1, 0) = -(at(0, 1) * at(2, 2) * at(3, 3) + at(2, 1) * at(3, 2) * at(0, 3) +
>+                              at(3, 1) * at(0, 2) * at(2, 3) - at(0, 1) * at(3, 2) * at(2, 3) -
>+                              at(2, 1) * at(0, 2) * at(3, 3) - at(3, 1) * at(2, 2) * at(0, 3));
>+                cof(1, 1) = at(0, 0) * at(2, 2) * at(3, 3) + at(2, 0) * at(3, 2) * at(0, 3) +
>+                            at(3, 0) * at(0, 2) * at(2, 3) - at(0, 0) * at(3, 2) * at(2, 3) -
>+                            at(2, 0) * at(0, 2) * at(3, 3) - at(3, 0) * at(2, 2) * at(0, 3);
>+                cof(1, 2) = -(at(0, 0) * at(2, 1) * at(3, 3) + at(2, 0) * at(3, 1) * at(0, 3) +
>+                              at(3, 0) * at(0, 1) * at(2, 3) - at(0, 0) * at(3, 1) * at(2, 3) -
>+                              at(2, 0) * at(0, 1) * at(3, 3) - at(3, 0) * at(2, 1) * at(0, 3));
>+                cof(1, 3) = at(0, 0) * at(2, 1) * at(3, 2) + at(2, 0) * at(3, 1) * at(0, 2) +
>+                            at(3, 0) * at(0, 1) * at(2, 2) - at(0, 0) * at(3, 1) * at(2, 2) -
>+                            at(2, 0) * at(0, 1) * at(3, 2) - at(3, 0) * at(2, 1) * at(0, 2);
>+                cof(2, 0) = at(0, 1) * at(1, 2) * at(3, 3) + at(1, 1) * at(3, 2) * at(0, 3) +
>+                            at(3, 1) * at(0, 2) * at(1, 3) - at(0, 1) * at(3, 2) * at(1, 3) -
>+                            at(1, 1) * at(0, 2) * at(3, 3) - at(3, 1) * at(1, 2) * at(0, 3);
>+                cof(2, 1) = -(at(0, 0) * at(1, 2) * at(3, 3) + at(1, 0) * at(3, 2) * at(0, 3) +
>+                              at(3, 0) * at(0, 2) * at(1, 3) - at(0, 0) * at(3, 2) * at(1, 3) -
>+                              at(1, 0) * at(0, 2) * at(3, 3) - at(3, 0) * at(1, 2) * at(0, 3));
>+                cof(2, 2) = at(0, 0) * at(1, 1) * at(3, 3) + at(1, 0) * at(3, 1) * at(0, 3) +
>+                            at(3, 0) * at(0, 1) * at(1, 3) - at(0, 0) * at(3, 1) * at(1, 3) -
>+                            at(1, 0) * at(0, 1) * at(3, 3) - at(3, 0) * at(1, 1) * at(0, 3);
>+                cof(2, 3) = -(at(0, 0) * at(1, 1) * at(3, 2) + at(1, 0) * at(3, 1) * at(0, 2) +
>+                              at(3, 0) * at(0, 1) * at(1, 2) - at(0, 0) * at(3, 1) * at(1, 2) -
>+                              at(1, 0) * at(0, 1) * at(3, 2) - at(3, 0) * at(1, 1) * at(0, 2));
>+                cof(3, 0) = -(at(0, 1) * at(1, 2) * at(2, 3) + at(1, 1) * at(2, 2) * at(0, 3) +
>+                              at(2, 1) * at(0, 2) * at(1, 3) - at(0, 1) * at(2, 2) * at(1, 3) -
>+                              at(1, 1) * at(0, 2) * at(2, 3) - at(2, 1) * at(1, 2) * at(0, 3));
>+                cof(3, 1) = at(0, 0) * at(1, 2) * at(2, 3) + at(1, 0) * at(2, 2) * at(0, 3) +
>+                            at(2, 0) * at(0, 2) * at(1, 3) - at(0, 0) * at(2, 2) * at(1, 3) -
>+                            at(1, 0) * at(0, 2) * at(2, 3) - at(2, 0) * at(1, 2) * at(0, 3);
>+                cof(3, 2) = -(at(0, 0) * at(1, 1) * at(2, 3) + at(1, 0) * at(2, 1) * at(0, 3) +
>+                              at(2, 0) * at(0, 1) * at(1, 3) - at(0, 0) * at(2, 1) * at(1, 3) -
>+                              at(1, 0) * at(0, 1) * at(2, 3) - at(2, 0) * at(1, 1) * at(0, 3));
>+                cof(3, 3) = at(0, 0) * at(1, 1) * at(2, 2) + at(1, 0) * at(2, 1) * at(0, 2) +
>+                            at(2, 0) * at(0, 1) * at(1, 2) - at(0, 0) * at(2, 1) * at(1, 2) -
>+                            at(1, 0) * at(0, 1) * at(2, 2) - at(2, 0) * at(1, 1) * at(0, 2);
>+                break;
>+
>+            default:
>+                UNREACHABLE();
>+                break;
>         }
> 
>-        // The inverse of A is the transpose of the cofactor matrix times the reciprocal of the determinant of A.
>+        // The inverse of A is the transpose of the cofactor matrix times the reciprocal of the
>+        // determinant of A.
>         Matrix<T> adjugateMatrix(cof.transpose());
>         T det = determinant();
>         Matrix<T> result(std::vector<T>(mElements.size()), rows(), columns());
>@@ -356,7 +358,7 @@ class Matrix
>     }
> 
>     template <unsigned int Size>
>-    static void setToIdentity(T(&matrix)[Size])
>+    static void setToIdentity(T (&matrix)[Size])
>     {
>         static_assert(gl::iSquareRoot<Size>() != 0, "Matrix is not square.");
> 
>@@ -374,13 +376,48 @@ class Matrix
>         }
>     }
> 
>-  private:
>+  protected:
>     std::vector<T> mElements;
>     unsigned int mRows;
>     unsigned int mCols;
> };
> 
>-} // namespace angle
>+class Mat4 : public Matrix<float>
>+{
>+  public:
>+    Mat4();
>+    Mat4(const Matrix<float> generalMatrix);
>+    Mat4(const std::vector<float> &elements);
>+    Mat4(const float *elements);
>+    Mat4(float m00,
>+         float m01,
>+         float m02,
>+         float m03,
>+         float m10,
>+         float m11,
>+         float m12,
>+         float m13,
>+         float m20,
>+         float m21,
>+         float m22,
>+         float m23,
>+         float m30,
>+         float m31,
>+         float m32,
>+         float m33);
>+
>+    static Mat4 Rotate(float angle, const Vector3 &axis);
>+    static Mat4 Translate(const Vector3 &t);
>+    static Mat4 Scale(const Vector3 &s);
>+    static Mat4 Frustum(float l, float r, float b, float t, float n, float f);
>+    static Mat4 Perspective(float fov, float aspectRatio, float n, float f);
>+    static Mat4 Ortho(float l, float r, float b, float t, float n, float f);
>+
>+    Mat4 product(const Mat4 &m);
>+    Vector4 product(const Vector4 &b);
>+    void dump();
>+};
> 
>-#endif   // COMMON_MATRIX_UTILS_H_
>+}  // namespace angle
> 
>+#endif  // COMMON_MATRIX_UTILS_H_
>diff --git a/Source/ThirdParty/ANGLE/src/common/matrix_utils_unittest.cpp b/Source/ThirdParty/ANGLE/src/common/matrix_utils_unittest.cpp
>index 6e9f92d9a82..5efc39fd50a 100644
>--- a/Source/ThirdParty/ANGLE/src/common/matrix_utils_unittest.cpp
>+++ b/Source/ThirdParty/ANGLE/src/common/matrix_utils_unittest.cpp
>@@ -16,6 +16,72 @@ using namespace angle;
> namespace
> {
> 
>+struct RotateArgs
>+{
>+    float angle;
>+    Vector3 axis;
>+};
>+
>+struct TranslateArgs
>+{
>+    float x;
>+    float y;
>+    float z;
>+};
>+
>+struct ScaleArgs
>+{
>+    float x;
>+    float y;
>+    float z;
>+};
>+
>+struct FrustumArgs
>+{
>+    float l;
>+    float r;
>+    float b;
>+    float t;
>+    float n;
>+    float f;
>+};
>+
>+void CheckMat4ExactlyEq(const Matrix<float> &a, const Matrix<float> &b)
>+{
>+    for (unsigned int i = 0; i < 4; i++)
>+    {
>+        for (unsigned int j = 0; i < 4; i++)
>+        {
>+            EXPECT_EQ(a.at(i, j), b.at(i, j));
>+        }
>+    }
>+}
>+
>+// TODO(lfy): Spec out requirements for matrix precision
>+void CheckMatrixCloseToGolden(float *golden, const Mat4 &m)
>+{
>+    const float floatFaultTolarance = 0.000001f;
>+    const auto &checkElts           = m.elements();
>+    for (size_t i = 0; i < checkElts.size(); i++)
>+    {
>+        EXPECT_NEAR(golden[i], checkElts[i], floatFaultTolarance);
>+    }
>+}
>+
>+void CheckMatrixCloseToGolden(const std::vector<float> &golden, const Mat4 &m)
>+{
>+    const float floatFaultTolarance = 0.000001f;
>+    const auto &checkElts           = m.elements();
>+    for (size_t i = 0; i < golden.size(); i++)
>+    {
>+        EXPECT_NEAR(golden[i], checkElts[i], floatFaultTolarance);
>+    }
>+}
>+}  // namespace
>+
>+namespace
>+{
>+
> const unsigned int minDimensions = 2;
> const unsigned int maxDimensions = 4;
> 
>@@ -49,7 +115,7 @@ TEST(MatrixUtilsTest, MatrixCompMultTest)
>     {
>         unsigned int numElements = i * i;
>         Matrix<float> m1(std::vector<float>(numElements, 2.0f), i);
>-        Matrix<float> actualResult = m1.compMult(m1);
>+        Matrix<float> actualResult              = m1.compMult(m1);
>         std::vector<float> actualResultElements = actualResult.elements();
>         std::vector<float> expectedResultElements(numElements, 4.0f);
>         EXPECT_EQ(expectedResultElements, actualResultElements);
>@@ -83,7 +149,8 @@ TEST(MatrixUtilsTest, MatrixTransposeTest)
>         {
>             unsigned int numElements = i * j;
>             Matrix<float> m1(std::vector<float>(numElements, 2.0f), i, j);
>-            Matrix<float> expectedResult = Matrix<float>(std::vector<float>(numElements, 2.0f), j, i);
>+            Matrix<float> expectedResult =
>+                Matrix<float>(std::vector<float>(numElements, 2.0f), j, i);
>             Matrix<float> actualResult = m1.transpose();
>             EXPECT_EQ(expectedResult.elements(), actualResult.elements());
>             EXPECT_EQ(actualResult.rows(), expectedResult.rows());
>@@ -107,19 +174,11 @@ TEST(MatrixUtilsTest, MatrixDeterminantTest)
> 
> TEST(MatrixUtilsTest, 2x2MatrixInverseTest)
> {
>-    float inputElements[] =
>-    {
>-        2.0f, 5.0f,
>-        3.0f, 7.0f
>-    };
>+    float inputElements[]    = {2.0f, 5.0f, 3.0f, 7.0f};
>     unsigned int numElements = 4;
>     std::vector<float> input(inputElements, inputElements + numElements);
>     Matrix<float> inputMatrix(input, 2);
>-    float identityElements[] =
>-    {
>-        1.0f, 0.0f,
>-        0.0f, 1.0f
>-    };
>+    float identityElements[] = {1.0f, 0.0f, 0.0f, 1.0f};
>     std::vector<float> identityMatrix(identityElements, identityElements + numElements);
>     // A * inverse(A) = I, where I is identity matrix.
>     Matrix<float> result = inputMatrix * inputMatrix.inverse();
>@@ -128,57 +187,2255 @@ TEST(MatrixUtilsTest, 2x2MatrixInverseTest)
> 
> TEST(MatrixUtilsTest, 3x3MatrixInverseTest)
> {
>-    float inputElements[] =
>-    {
>-        11.0f, 23.0f, 37.0f,
>-        13.0f, 29.0f, 41.0f,
>-        19.0f, 31.0f, 43.0f
>-    };
>+    float inputElements[]    = {11.0f, 23.0f, 37.0f, 13.0f, 29.0f, 41.0f, 19.0f, 31.0f, 43.0f};
>     unsigned int numElements = 9;
>     std::vector<float> input(inputElements, inputElements + numElements);
>     Matrix<float> inputMatrix(input, 3);
>-    float identityElements[] =
>-    {
>-        1.0f, 0.0f, 0.0f,
>-        0.0f, 1.0f, 0.0f,
>-        0.0f, 0.0f, 1.0f
>-    };
>+    float identityElements[] = {1.0f, 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 0.0f, 0.0f, 1.0f};
>     std::vector<float> identityMatrix(identityElements, identityElements + numElements);
>     // A * inverse(A) = I, where I is identity matrix.
>-    Matrix<float> result = inputMatrix * inputMatrix.inverse();
>+    Matrix<float> result              = inputMatrix * inputMatrix.inverse();
>     std::vector<float> resultElements = result.elements();
>-    const float floatFaultTolarance = 0.000001f;
>+    const float floatFaultTolarance   = 0.000001f;
>     for (size_t i = 0; i < numElements; i++)
>         EXPECT_NEAR(resultElements[i], identityMatrix[i], floatFaultTolarance);
> }
> 
> TEST(MatrixUtilsTest, 4x4MatrixInverseTest)
> {
>-    float inputElements[] =
>-    {
>-        29.0f, 43.0f, 61.0f, 79.0f,
>-        31.0f, 47.0f, 67.0f, 83.0f,
>-        37.0f, 53.0f, 71.0f, 89.0f,
>-        41.0f, 59.0f, 73.0f, 97.0f
>-    };
>+    float inputElements[]    = {29.0f, 43.0f, 61.0f, 79.0f, 31.0f, 47.0f, 67.0f, 83.0f,
>+                             37.0f, 53.0f, 71.0f, 89.0f, 41.0f, 59.0f, 73.0f, 97.0f};
>     unsigned int numElements = 16;
>     std::vector<float> input(inputElements, inputElements + numElements);
>     Matrix<float> inputMatrix(input, 4);
>-    float identityElements[] =
>-    {
>-        1.0f, 0.0f, 0.0f, 0.0f,
>-        0.0f, 1.0f, 0.0f, 0.0f,
>-        0.0f, 0.0f, 1.0f, 0.0f,
>-        0.0f, 0.0f, 0.0f, 1.0f,
>+    float identityElements[] = {
>+        1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 0.0f,
>+        0.0f, 0.0f, 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f,
>     };
>     std::vector<float> identityMatrix(identityElements, identityElements + numElements);
>     // A * inverse(A) = I, where I is identity matrix.
>-    Matrix<float> result = inputMatrix * inputMatrix.inverse();
>+    Matrix<float> result              = inputMatrix * inputMatrix.inverse();
>     std::vector<float> resultElements = result.elements();
>-    const float floatFaultTolarance = 0.00001f;
>+    const float floatFaultTolarance   = 0.00001f;
>     for (unsigned int i = 0; i < numElements; i++)
>         EXPECT_NEAR(resultElements[i], identityMatrix[i], floatFaultTolarance);
> }
> 
>+// Tests constructors for mat4; using raw float*, std::vector<float>,
>+// and Matrix<float>.
>+TEST(MatrixUtilsTest, Mat4Construction)
>+{
>+    float elements[] = {
>+        0.0f, 1.0f, 2.0f,  3.0f,  4.0f,  5.0f,  6.0f,  7.0f,
>+        8.0f, 9.0f, 10.0f, 11.0f, 12.0f, 13.0f, 14.0f, 15.0f,
>+    };
>+
>+    std::vector<float> elementsVector(16, 0);
>+    for (int i = 0; i < 16; i++)
>+    {
>+        elementsVector[i] = elements[i];
>+    }
>+
>+    Matrix<float> a(elements, 4);
>+    Mat4 b(elements);
>+    Mat4 bVec(elementsVector);
>+
>+    CheckMat4ExactlyEq(a, b);
>+    CheckMat4ExactlyEq(b, bVec);
>+
>+    a.setToIdentity();
>+    b = Mat4();
>+
>+    CheckMat4ExactlyEq(a, b);
>+
>+    Mat4 c(0.0f, 1.0f, 2.0f, 3.0f, 4.0f, 5.0f, 6.0f, 7.0f, 8.0f, 9.0f, 10.0f, 11.0f, 12.0f, 13.0f,
>+           14.0f, 15.0f);
>+    Mat4 d(elements);
>+    Mat4 e(Matrix<float>(elements, 4));
>+
>+    CheckMat4ExactlyEq(c, d);
>+    CheckMat4ExactlyEq(e, d);
>+}
>+
>+// Tests rotation matrices.
>+TEST(MatrixUtilsTest, Mat4Rotate)
>+{
>+    // Sanity check.
>+    float elementsExpected[] = {
>+        1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 0.0f,
>+        0.0f, 0.0f, 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f,
>+    };
>+
>+    std::vector<float> elementsExpectedVector(16, 0);
>+    for (int i = 0; i < 16; i++)
>+    {
>+        elementsExpectedVector[i] = elementsExpected[i];
>+    }
>+
>+    Mat4 r = Mat4::Rotate(0.f, Vector3(0.f, 0.f, 1.f));
>+    Mat4 golden(elementsExpected);
>+    CheckMatrixCloseToGolden(elementsExpected, r);
>+    CheckMatrixCloseToGolden(elementsExpectedVector, r);
>+    CheckMat4ExactlyEq(r, golden);
>+
>+    // Randomly-generated inputs, outputs using GLM.
>+    std::vector<RotateArgs> rotationGoldenInputs;
>+    std::vector<std::vector<float>> rotationGoldenOutputs;
>+    rotationGoldenInputs.push_back(
>+        {-123.2026214599609375f,
>+         Vector3(1.4951171875000000f, 8.4370708465576172f, 1.8489227294921875f)});
>+    rotationGoldenInputs.push_back(
>+        {-185.3049316406250000f,
>+         Vector3(8.3313980102539062f, 5.8317651748657227f, -5.5201716423034668f)});
>+    rotationGoldenInputs.push_back(
>+        {89.1301574707031250f,
>+         Vector3(-8.5962724685668945f, 2.4547367095947266f, -3.2461600303649902f)});
>+    rotationGoldenInputs.push_back(
>+        {64.2547302246093750f,
>+         Vector3(-1.9640445709228516f, -9.6942234039306641f, 9.1921043395996094f)});
>+    rotationGoldenInputs.push_back(
>+        {-298.5585021972656250f,
>+         Vector3(-5.3600544929504395f, -6.4333534240722656f, -5.3734750747680664f)});
>+    rotationGoldenInputs.push_back(
>+        {288.2606201171875000f,
>+         Vector3(-2.3043875694274902f, -9.8447618484497070f, -0.9124794006347656f)});
>+    rotationGoldenInputs.push_back(
>+        {142.3956298828125000f,
>+         Vector3(-1.0044975280761719f, -2.5834980010986328f, -0.8451175689697266f)});
>+    rotationGoldenInputs.push_back(
>+        {-140.0445861816406250f,
>+         Vector3(-1.3710060119628906f, -2.5042991638183594f, -9.7572088241577148f)});
>+    rotationGoldenInputs.push_back(
>+        {-338.5443420410156250f,
>+         Vector3(6.8056621551513672f, 2.7508878707885742f, -5.8343429565429688f)});
>+    rotationGoldenInputs.push_back(
>+        {79.0578613281250000f,
>+         Vector3(9.0518493652343750f, -5.5615901947021484f, 6.3559799194335938f)});
>+    rotationGoldenInputs.push_back(
>+        {4464.6367187500000000f,
>+         Vector3(-53.9424285888671875f, -10.3614959716796875f, 54.3564453125000000f)});
>+    rotationGoldenInputs.push_back(
>+        {-2820.6347656250000000f,
>+         Vector3(62.1694793701171875f, 82.4977569580078125f, -60.0084800720214844f)});
>+    rotationGoldenInputs.push_back(
>+        {3371.0527343750000000f,
>+         Vector3(-74.5660324096679688f, -31.3026275634765625f, 96.7252349853515625f)});
>+    rotationGoldenInputs.push_back(
>+        {5501.7167968750000000f,
>+         Vector3(15.0308380126953125f, 23.2323913574218750f, 66.8295593261718750f)});
>+    rotationGoldenInputs.push_back(
>+        {392.1757812500000000f,
>+         Vector3(36.5722198486328125f, 69.2820892333984375f, 24.1789474487304688f)});
>+    rotationGoldenInputs.push_back(
>+        {-2206.7138671875000000f,
>+         Vector3(-91.5292282104492188f, 68.2716674804687500f, 42.0627288818359375f)});
>+    rotationGoldenInputs.push_back(
>+        {-4648.8623046875000000f,
>+         Vector3(50.7790374755859375f, 43.3964080810546875f, -36.3877525329589844f)});
>+    rotationGoldenInputs.push_back(
>+        {2794.6015625000000000f,
>+         Vector3(76.2934265136718750f, 63.4901885986328125f, 79.5993041992187500f)});
>+    rotationGoldenInputs.push_back(
>+        {2294.6787109375000000f,
>+         Vector3(-81.3662338256835938f, 77.6944580078125000f, 10.8423461914062500f)});
>+    rotationGoldenInputs.push_back(
>+        {2451.0468750000000000f,
>+         Vector3(-80.6299896240234375f, 51.8244628906250000f, 13.6877517700195312f)});
>+    rotationGoldenOutputs.push_back({
>+        -0.5025786161422729f,
>+        0.0775775760412216f,
>+        0.8610438108444214f,
>+        0.0000000000000000f,
>+        0.4305581450462341f,
>+        0.8861245512962341f,
>+        0.1714731603860855f,
>+        0.0000000000000000f,
>+        -0.7496895790100098f,
>+        0.4569081664085388f,
>+        -0.4787489175796509f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        1.0000000000000000f,
>+    });
>+    rotationGoldenOutputs.push_back({
>+        0.0388860106468201f,
>+        0.6800884604454041f,
>+        -0.7320981621742249f,
>+        0.0000000000000000f,
>+        0.7683026194572449f,
>+        -0.4887983798980713f,
>+        -0.4132642149925232f,
>+        0.0000000000000000f,
>+        -0.6389046907424927f,
>+        -0.5464027523994446f,
>+        -0.5415209531784058f,
>+        -0.0000000000000000f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        1.0000000000000000f,
>+    });
>+    rotationGoldenOutputs.push_back({
>+        0.8196773529052734f,
>+        -0.5709969997406006f,
>+        0.0457325875759125f,
>+        0.0000000000000000f,
>+        0.1115358471870422f,
>+        0.0807825028896332f,
>+        -0.9904716014862061f,
>+        0.0000000000000000f,
>+        0.5618618726730347f,
>+        0.8169679641723633f,
>+        0.1299021989107132f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        1.0000000000000000f,
>+    });
>+    rotationGoldenOutputs.push_back({
>+        0.4463376104831696f,
>+        0.6722379326820374f,
>+        0.5906597971916199f,
>+        0.0000000000000000f,
>+        -0.5541059374809265f,
>+        0.7259115576744080f,
>+        -0.4074544310569763f,
>+        0.0000000000000000f,
>+        -0.7026730179786682f,
>+        -0.1454258561134338f,
>+        0.6964926123619080f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        1.0000000000000000f,
>+    });
>+    rotationGoldenOutputs.push_back({
>+        0.6295375227928162f,
>+        -0.2925493717193604f,
>+        0.7197898030281067f,
>+        0.0000000000000000f,
>+        0.6561784744262695f,
>+        0.6962769031524658f,
>+        -0.2909094095230103f,
>+        0.0000000000000000f,
>+        -0.4160676598548889f,
>+        0.6554489731788635f,
>+        0.6302970647811890f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        1.0000000000000000f,
>+    });
>+    rotationGoldenOutputs.push_back({
>+        0.3487194776535034f,
>+        0.2365041077136993f,
>+        -0.9068960547447205f,
>+        0.0000000000000000f,
>+        0.0657925531268120f,
>+        0.9590729475021362f,
>+        0.2754095196723938f,
>+        0.0000000000000000f,
>+        0.9349150061607361f,
>+        -0.1557076722383499f,
>+        0.3188872337341309f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        1.0000000000000000f,
>+    });
>+    rotationGoldenOutputs.push_back({
>+        -0.5768983364105225f,
>+        0.3758956193923950f,
>+        0.7251832485198975f,
>+        0.0000000000000000f,
>+        0.7318079471588135f,
>+        0.6322251558303833f,
>+        0.2544573545455933f,
>+        0.0000000000000000f,
>+        -0.3628296852111816f,
>+        0.6774909496307373f,
>+        -0.6398130059242249f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        1.0000000000000000f,
>+    });
>+    rotationGoldenOutputs.push_back({
>+        -0.7344170808792114f,
>+        0.6750319004058838f,
>+        0.0704519301652908f,
>+        0.0000000000000000f,
>+        -0.5576634407043457f,
>+        -0.6593509316444397f,
>+        0.5042498111724854f,
>+        0.0000000000000000f,
>+        0.3868372440338135f,
>+        0.3310411870479584f,
>+        0.8606789708137512f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        1.0000000000000000f,
>+    });
>+    rotationGoldenOutputs.push_back({
>+        0.9672066569328308f,
>+        -0.2128375321626663f,
>+        -0.1386056393384933f,
>+        0.0000000000000000f,
>+        0.2423491925001144f,
>+        0.9366652965545654f,
>+        0.2528339624404907f,
>+        0.0000000000000000f,
>+        0.0760145336389542f,
>+        -0.2781336307525635f,
>+        0.9575299024581909f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        1.0000000000000000f,
>+    });
>+    rotationGoldenOutputs.push_back({
>+        0.6229416728019714f,
>+        0.2379529774188995f,
>+        0.7451993227005005f,
>+        0.0000000000000000f,
>+        -0.7701886892318726f,
>+        0.3533243536949158f,
>+        0.5310096740722656f,
>+        0.0000000000000000f,
>+        -0.1369417309761047f,
>+        -0.9047321081161499f,
>+        0.4033691287040710f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        1.0000000000000000f,
>+    });
>+    rotationGoldenOutputs.push_back({
>+        0.0691163539886475f,
>+        0.5770183801651001f,
>+        -0.8138013482093811f,
>+        0.0000000000000000f,
>+        -0.2371776401996613f,
>+        -0.7828579545021057f,
>+        -0.5752218365669250f,
>+        -0.0000000000000000f,
>+        -0.9690044522285461f,
>+        0.2327727228403091f,
>+        0.0827475786209106f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        1.0000000000000000f,
>+    });
>+    rotationGoldenOutputs.push_back({
>+        0.6423799991607666f,
>+        -0.2559574246406555f,
>+        -0.7223805189132690f,
>+        0.0000000000000000f,
>+        0.6084498763084412f,
>+        0.7434381246566772f,
>+        0.2776480317115784f,
>+        0.0000000000000000f,
>+        0.4659791886806488f,
>+        -0.6178879141807556f,
>+        0.6333070397377014f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        1.0000000000000000f,
>+    });
>+    rotationGoldenOutputs.push_back({
>+        -0.0772442221641541f,
>+        0.8218145370483398f,
>+        -0.5644945502281189f,
>+        0.0000000000000000f,
>+        -0.3352625370025635f,
>+        -0.5546256303787231f,
>+        -0.7615703344345093f,
>+        -0.0000000000000000f,
>+        -0.9389528036117554f,
>+        0.1304270327091217f,
>+        0.3183652758598328f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        1.0000000000000000f,
>+    });
>+    rotationGoldenOutputs.push_back({
>+        -0.1511210501194000f,
>+        0.9849811196327209f,
>+        -0.0835132896900177f,
>+        0.0000000000000000f,
>+        -0.8243820667266846f,
>+        -0.0789582207798958f,
>+        0.5604994893074036f,
>+        0.0000000000000000f,
>+        0.5454874038696289f,
>+        0.1535501033067703f,
>+        0.8239331245422363f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        1.0000000000000000f,
>+    });
>+    rotationGoldenOutputs.push_back({
>+        0.8769769668579102f,
>+        0.2149325907230377f,
>+        -0.4297852218151093f,
>+        0.0000000000000000f,
>+        -0.0991527736186981f,
>+        0.9560844898223877f,
>+        0.2758098840713501f,
>+        0.0000000000000000f,
>+        0.4701915681362152f,
>+        -0.1992645263671875f,
>+        0.8597752451896667f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        1.0000000000000000f,
>+    });
>+    rotationGoldenOutputs.push_back({
>+        0.8634905815124512f,
>+        -0.3842780590057373f,
>+        0.3266716897487640f,
>+        0.0000000000000000f,
>+        0.1189628839492798f,
>+        0.7845909595489502f,
>+        0.6084939241409302f,
>+        0.0000000000000000f,
>+        -0.4901345074176788f,
>+        -0.4865669906139374f,
>+        0.7232017517089844f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        1.0000000000000000f,
>+    });
>+    rotationGoldenOutputs.push_back({
>+        0.9201348423957825f,
>+        -0.1924955844879150f,
>+        -0.3410238325595856f,
>+        0.0000000000000000f,
>+        0.3022402822971344f,
>+        0.9028221964836121f,
>+        0.3058805167675018f,
>+        0.0000000000000000f,
>+        0.2490032464265823f,
>+        -0.3845224678516388f,
>+        0.8888981342315674f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        1.0000000000000000f,
>+    });
>+    rotationGoldenOutputs.push_back({
>+        0.4109522104263306f,
>+        -0.3483857214450836f,
>+        0.8424642086029053f,
>+        0.0000000000000000f,
>+        0.8988372087478638f,
>+        0.3092637956142426f,
>+        -0.3105604350566864f,
>+        0.0000000000000000f,
>+        -0.1523487865924835f,
>+        0.8848635554313660f,
>+        0.4402346611022949f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        1.0000000000000000f,
>+    });
>+    rotationGoldenOutputs.push_back({
>+        0.1795312762260437f,
>+        -0.7746179103851318f,
>+        -0.6064119935035706f,
>+        0.0000000000000000f,
>+        -0.9110413789749146f,
>+        0.1016657948493958f,
>+        -0.3995841145515442f,
>+        0.0000000000000000f,
>+        0.3711764216423035f,
>+        0.6242043375968933f,
>+        -0.6874569058418274f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        1.0000000000000000f,
>+    });
>+    rotationGoldenOutputs.push_back({
>+        0.8035809993743896f,
>+        -0.4176068902015686f,
>+        0.4241013824939728f,
>+        0.0000000000000000f,
>+        -0.1537265181541443f,
>+        0.5427432060241699f,
>+        0.8257105946540833f,
>+        0.0000000000000000f,
>+        -0.5750005841255188f,
>+        -0.7287209630012512f,
>+        0.3719408810138702f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        1.0000000000000000f,
>+    });
>+    EXPECT_EQ(rotationGoldenInputs.size(), rotationGoldenOutputs.size());
>+
>+    for (size_t i = 0; i < rotationGoldenInputs.size(); i++)
>+    {
>+        const auto &input  = rotationGoldenInputs[i];
>+        const auto &output = rotationGoldenOutputs[i];
>+        Mat4 rot           = Mat4::Rotate(input.angle, input.axis);
>+        CheckMatrixCloseToGolden(output, rot);
>+    }
>+}
>+
>+// Tests mat4 translation.
>+TEST(MatrixUtilsTest, Mat4Translate)
>+{
>+    float elementsExpected[] = {
>+        1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 0.0f,
>+        0.0f, 0.0f, 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f,
>+    };
>+
>+    std::vector<float> elementsExpectedVector(16, 0);
>+    for (int i = 0; i < 16; i++)
>+    {
>+        elementsExpectedVector[i] = elementsExpected[i];
>+    }
>+
>+    Mat4 r = Mat4::Translate(Vector3(0.f, 0.f, 0.f));
>+    Mat4 golden(elementsExpected);
>+    CheckMatrixCloseToGolden(elementsExpected, r);
>+    CheckMatrixCloseToGolden(elementsExpectedVector, r);
>+    CheckMat4ExactlyEq(r, golden);
>+
>+    float elementsExpected1[] = {
>+        1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 0.0f,
>+        0.0f, 0.0f, 1.0f, 0.0f, 1.0f, 1.0f, 1.0f, 1.0f,
>+    };
>+
>+    float elementsExpected2[] = {
>+        1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 0.0f,
>+        0.0f, 0.0f, 1.0f, 0.0f, 2.0f, 2.0f, 2.0f, 1.0f,
>+    };
>+
>+    Mat4 golden1(elementsExpected1);
>+    Mat4 golden2(elementsExpected2);
>+
>+    Mat4 t1   = Mat4::Translate(Vector3(1.f, 1.f, 1.f));
>+    Mat4 t2   = Mat4::Translate(Vector3(2.f, 2.f, 2.f));
>+    Mat4 t1t1 = t1.product(t1);
>+
>+    CheckMat4ExactlyEq(t1, golden1);
>+    CheckMat4ExactlyEq(t2, golden2);
>+    CheckMat4ExactlyEq(t1t1, golden2);
>+}
>+
>+// Tests scale for mat4.
>+TEST(MatrixUtilsTest, Mat4Scale)
>+{
>+
>+    // Sanity check.
>+    float elementsExpected[] = {
>+        1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 0.0f,
>+        0.0f, 0.0f, 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f,
>+    };
>+
>+    std::vector<float> elementsExpectedVector(16, 0);
>+    for (int i = 0; i < 16; i++)
>+    {
>+        elementsExpectedVector[i] = elementsExpected[i];
>+    }
>+
>+    Mat4 r = Mat4::Scale(Vector3(1.f, 1.f, 1.f));
>+    Mat4 golden(elementsExpected);
>+    CheckMatrixCloseToGolden(elementsExpected, r);
>+    CheckMatrixCloseToGolden(elementsExpectedVector, r);
>+    CheckMat4ExactlyEq(r, golden);
>+
>+    float elementsExpected2[] = {
>+        2.0f, 0.0f, 0.0f, 0.0f, 0.0f, 2.0f, 0.0f, 0.0f,
>+        0.0f, 0.0f, 2.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f,
>+    };
>+
>+    float elementsExpected4[] = {
>+        4.0f, 0.0f, 0.0f, 0.0f, 0.0f, 4.0f, 0.0f, 0.0f,
>+        0.0f, 0.0f, 4.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f,
>+    };
>+
>+    Mat4 golden2(elementsExpected2);
>+    Mat4 golden4(elementsExpected4);
>+
>+    Mat4 t2   = Mat4::Scale(Vector3(2.f, 2.f, 2.f));
>+    Mat4 t2t2 = t2.product(t2);
>+
>+    CheckMat4ExactlyEq(t2, golden2);
>+    CheckMat4ExactlyEq(t2t2, golden4);
>+}
>+
>+// Tests frustum matrices.
>+TEST(MatrixUtilsTest, Mat4Frustum)
>+{
>+    // Randomly-generated inputs, outputs using GLM.
>+    std::vector<FrustumArgs> frustumGoldenInputs;
>+    std::vector<std::vector<float>> frustumGoldenOutputs;
>+
>+    EXPECT_EQ(frustumGoldenInputs.size(), frustumGoldenOutputs.size());
>+
>+    frustumGoldenInputs.push_back({6.5640869140625000f, 2.6196002960205078f, 7.6299438476562500f,
>+                                   -3.5341463088989258f, 1.5971517562866211f, 3.3254327774047852f});
>+    frustumGoldenInputs.push_back({-9.4570913314819336f, -5.3334407806396484f, 0.8660326004028320f,
>+                                   -4.5830192565917969f, -6.7980914115905762f,
>+                                   4.4744148254394531f});
>+    frustumGoldenInputs.push_back({1.4876422882080078f, 2.8094434738159180f, -1.6803054809570312f,
>+                                   -0.8823823928833008f, 9.7977848052978516f,
>+                                   -8.6204166412353516f});
>+    frustumGoldenInputs.push_back({-3.3456401824951172f, 9.8235015869140625f, 3.5869121551513672f,
>+                                   5.2356719970703125f, -4.0609388351440430f, 7.7973194122314453f});
>+    frustumGoldenInputs.push_back({9.5381393432617188f, 7.5244369506835938f, 3.2054557800292969f,
>+                                   -5.9051651954650879f, -8.1114397048950195f,
>+                                   -8.9626598358154297f});
>+    frustumGoldenInputs.push_back({4.5731735229492188f, 1.3278274536132812f, -3.2062773704528809f,
>+                                   -7.9090023040771484f, -6.6076564788818359f,
>+                                   5.1205596923828125f});
>+    frustumGoldenInputs.push_back({1.2519702911376953f, 1.8767604827880859f, 2.7256736755371094f,
>+                                   -9.6021852493286133f, -3.9267930984497070f,
>+                                   2.3794260025024414f});
>+    frustumGoldenInputs.push_back({-8.9887380599975586f, 6.2763042449951172f, 5.8243169784545898f,
>+                                   9.2890701293945312f, 1.3859443664550781f, -6.4422101974487305f});
>+    frustumGoldenInputs.push_back({5.7714862823486328f, 1.3688507080078125f, 6.2611656188964844f,
>+                                   -8.5859031677246094f, -3.2825427055358887f,
>+                                   -9.7015857696533203f});
>+    frustumGoldenInputs.push_back({5.4493808746337891f, 7.7383766174316406f, -1.1092796325683594f,
>+                                   -3.6691951751708984f, -8.1641988754272461f,
>+                                   4.3122081756591797f});
>+    frustumGoldenInputs.push_back({-47.3135452270507812f, 1.1683349609375000f, 36.1483764648437500f,
>+                                   -54.2228546142578125f, 76.4831085205078125f,
>+                                   51.5773468017578125f});
>+    frustumGoldenInputs.push_back({60.6750030517578125f, -35.2967681884765625f,
>+                                   -32.8269577026367188f, 77.3887939453125000f,
>+                                   73.3114624023437500f, -54.2619438171386719f});
>+    frustumGoldenInputs.push_back({19.5157546997070312f, 1.3348083496093750f, 34.2350463867187500f,
>+                                   -11.5907974243164062f, -6.4835968017578125f,
>+                                   30.2026824951171875f});
>+    frustumGoldenInputs.push_back({16.5014953613281250f, -59.4170761108398438f,
>+                                   -22.8201065063476562f, 62.5094299316406250f,
>+                                   -3.9552688598632812f, -76.2280197143554688f});
>+    frustumGoldenInputs.push_back({35.6607666015625000f, -49.5569000244140625f,
>+                                   97.1632690429687500f, 23.1938247680664062f, 18.6621780395507812f,
>+                                   55.2039489746093750f});
>+    frustumGoldenInputs.push_back({12.7565383911132812f, -0.8035964965820312f, 94.0040435791015625f,
>+                                   -73.9960327148437500f, -51.3727264404296875f,
>+                                   -21.3958053588867188f});
>+    frustumGoldenInputs.push_back({0.6055984497070312f, -21.7872161865234375f, 22.3246612548828125f,
>+                                   10.5279464721679688f, -56.8082237243652344f,
>+                                   24.1726150512695312f});
>+    frustumGoldenInputs.push_back({69.2176513671875000f, -59.0015220642089844f,
>+                                   -38.5509605407714844f, 74.0315246582031250f,
>+                                   47.9032897949218750f, -89.4692459106445312f});
>+    frustumGoldenInputs.push_back({90.4153137207031250f, 10.0325012207031250f, 16.1712417602539062f,
>+                                   -9.9705123901367188f, 25.6828689575195312f,
>+                                   51.8659057617187500f});
>+    frustumGoldenInputs.push_back({-89.5869369506835938f, -87.6541290283203125f,
>+                                   -3.0015182495117188f, -46.5026855468750000f,
>+                                   29.3566131591796875f, -3.5230865478515625f});
>+    frustumGoldenOutputs.push_back({
>+        -0.8098147511482239f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        -0.2861230373382568f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        -2.3282337188720703f,
>+        -0.3668724894523621f,
>+        -2.8482546806335449f,
>+        -1.0000000000000000f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        -6.1462464332580566f,
>+        0.0000000000000000f,
>+    });
>+    frustumGoldenOutputs.push_back({
>+        -3.2971229553222656f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        2.4951465129852295f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        -3.5867569446563721f,
>+        0.6821345686912537f,
>+        0.2061366289854050f,
>+        -1.0000000000000000f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        5.3967552185058594f,
>+        0.0000000000000000f,
>+    });
>+    frustumGoldenOutputs.push_back({
>+        14.8248996734619141f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        24.5582180023193359f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        3.2509319782257080f,
>+        -3.2116978168487549f,
>+        0.0639241635799408f,
>+        -1.0000000000000000f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        -9.1714696884155273f,
>+        0.0000000000000000f,
>+    });
>+    frustumGoldenOutputs.push_back({
>+        -0.6167355179786682f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        -4.9260525703430176f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        0.4918970167636871f,
>+        5.3510427474975586f,
>+        -0.3150867819786072f,
>+        -1.0000000000000000f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        5.3404870033264160f,
>+        0.0000000000000000f,
>+    });
>+    frustumGoldenOutputs.push_back({
>+        8.0562448501586914f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        1.7806558609008789f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        -8.4732360839843750f,
>+        0.2963255345821381f,
>+        -20.0583839416503906f,
>+        -1.0000000000000000f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        170.8137969970703125f,
>+        0.0000000000000000f,
>+    });
>+    frustumGoldenOutputs.push_back({
>+        4.0720810890197754f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        2.8101394176483154f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        -1.8182963132858276f,
>+        2.3635828495025635f,
>+        0.1267964988946915f,
>+        -1.0000000000000000f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        5.7698287963867188f,
>+        0.0000000000000000f,
>+    });
>+    frustumGoldenOutputs.push_back({
>+        -12.5699577331542969f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        0.6370600461959839f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        5.0076503753662109f,
>+        0.5578025579452515f,
>+        0.2453716099262238f,
>+        -1.0000000000000000f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        2.9632694721221924f,
>+        0.0000000000000000f,
>+    });
>+    frustumGoldenOutputs.push_back({
>+        0.1815840899944305f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        0.8000248670578003f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        -0.1776892393827438f,
>+        4.3620386123657227f,
>+        -0.6459077596664429f,
>+        -1.0000000000000000f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        -2.2811365127563477f,
>+        0.0000000000000000f,
>+    });
>+    frustumGoldenOutputs.push_back({
>+        1.4911717176437378f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        0.4421805739402771f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        -1.6218323707580566f,
>+        0.1565788835287094f,
>+        -2.0227515697479248f,
>+        -1.0000000000000000f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        9.9223108291625977f,
>+        0.0000000000000000f,
>+    });
>+    frustumGoldenOutputs.push_back({
>+        -7.1334328651428223f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        6.3784909248352051f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        5.7613725662231445f,
>+        1.8666533231735229f,
>+        0.3087419867515564f,
>+        -1.0000000000000000f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        5.6435680389404297f,
>+        0.0000000000000000f,
>+    });
>+    frustumGoldenOutputs.push_back({
>+        3.1551213264465332f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        -1.6926428079605103f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        -0.9518032073974609f,
>+        0.2000025659799576f,
>+        5.1418004035949707f,
>+        -1.0000000000000000f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        316.7777709960937500f,
>+        0.0000000000000000f,
>+    });
>+    frustumGoldenOutputs.push_back({
>+        -1.5277713537216187f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        1.3303264379501343f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        -0.2644343674182892f,
>+        0.4043145775794983f,
>+        0.1493220180273056f,
>+        -1.0000000000000000f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        -62.3644447326660156f,
>+        0.0000000000000000f,
>+    });
>+    frustumGoldenOutputs.push_back({
>+        0.7132298350334167f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        0.2829668223857880f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        -1.1468359231948853f,
>+        -0.4941370785236359f,
>+        -0.6465383172035217f,
>+        -1.0000000000000000f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        10.6754913330078125f,
>+        0.0000000000000000f,
>+    });
>+    frustumGoldenOutputs.push_back({
>+        0.1041976660490036f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        -0.0927057415246964f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        0.5652843713760376f,
>+        0.4651299417018890f,
>+        -1.1094539165496826f,
>+        -1.0000000000000000f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        8.3434572219848633f,
>+        0.0000000000000000f,
>+    });
>+    frustumGoldenOutputs.push_back({
>+        -0.4379884898662567f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        -0.5045915246009827f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        0.1630663424730301f,
>+        -1.6271190643310547f,
>+        -2.0214161872863770f,
>+        -1.0000000000000000f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        -56.3862075805664062f,
>+        0.0000000000000000f,
>+    });
>+    frustumGoldenOutputs.push_back({
>+        7.5770230293273926f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        0.6115797758102417f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        -0.8814766407012939f,
>+        -0.1190952509641647f,
>+        2.4274852275848389f,
>+        -1.0000000000000000f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        -73.3338088989257812f,
>+        0.0000000000000000f,
>+    });
>+    frustumGoldenOutputs.push_back({
>+        5.0737905502319336f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        9.6311941146850586f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        0.9459113478660583f,
>+        -2.7848947048187256f,
>+        0.4030041098594666f,
>+        -1.0000000000000000f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        33.9142799377441406f,
>+        0.0000000000000000f,
>+    });
>+    frustumGoldenOutputs.push_back({
>+        -0.7472094297409058f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        0.8509900569915771f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        -0.0796770751476288f,
>+        0.3151517212390900f,
>+        -0.3025783598423004f,
>+        -1.0000000000000000f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        -62.3977890014648438f,
>+        0.0000000000000000f,
>+    });
>+    frustumGoldenOutputs.push_back({
>+        -0.6390139460563660f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        -1.9648925065994263f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        -1.2496180534362793f,
>+        -0.2371963709592819f,
>+        -2.9617946147918701f,
>+        -1.0000000000000000f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        -101.7502517700195312f,
>+        0.0000000000000000f,
>+    });
>+    frustumGoldenOutputs.push_back({
>+        30.3771648406982422f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        -1.3496931791305542f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        -91.7013320922851562f,
>+        1.1379971504211426f,
>+        0.7856983542442322f,
>+        -1.0000000000000000f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        -6.2911696434020996f,
>+        0.0000000000000000f,
>+    });
>+
>+    for (size_t i = 0; i < frustumGoldenInputs.size(); i++)
>+    {
>+        const auto &input  = frustumGoldenInputs[i];
>+        const auto &output = frustumGoldenOutputs[i];
>+        Mat4 r             = Mat4::Frustum(input.l, input.r, input.b, input.t, input.n, input.f);
>+        CheckMatrixCloseToGolden(output, r);
>+    }
>+}
>+
>+// Tests orthographic projection matrices.
>+TEST(MatrixUtilsTest, Mat4Ortho)
>+{
>+    // Randomly-generated inputs, outputs using GLM.
>+    std::vector<FrustumArgs> orthoGoldenInputs;
>+    std::vector<std::vector<float>> orthoGoldenOutputs;
>+
>+    orthoGoldenInputs.push_back({-1.2515230178833008f, 5.6523618698120117f, -0.7427234649658203f,
>+                                 -2.9657564163208008f, -5.4732933044433594f, -9.6416902542114258f});
>+    orthoGoldenInputs.push_back({-7.8948307037353516f, -8.4146118164062500f, -4.3893952369689941f,
>+                                 7.4392738342285156f, -8.1261911392211914f, 3.1107978820800781f});
>+    orthoGoldenInputs.push_back({3.1667709350585938f, 3.9134168624877930f, -7.1993961334228516f,
>+                                 -0.2519502639770508f, 5.4625358581542969f, 8.8320560455322266f});
>+    orthoGoldenInputs.push_back({0.3597183227539062f, 5.7859621047973633f, 4.6786174774169922f,
>+                                 -6.4736566543579102f, -2.7510557174682617f, 2.9977531433105469f});
>+    orthoGoldenInputs.push_back({3.2480134963989258f, 9.3551750183105469f, -7.5922241210937500f,
>+                                 -2.5135083198547363f, -4.5282001495361328f, -5.4564580917358398f});
>+    orthoGoldenInputs.push_back({-6.6918325424194336f, -9.6249752044677734f, -6.9591665267944336f,
>+                                 -2.7099137306213379f, -5.5196690559387207f, -9.0791969299316406f});
>+    orthoGoldenInputs.push_back({5.9386453628540039f, -9.1784019470214844f, -1.4078102111816406f,
>+                                 -1.0552892684936523f, 3.7563705444335938f, -6.6715431213378906f});
>+    orthoGoldenInputs.push_back({-8.6238059997558594f, -0.2995386123657227f, 5.6623821258544922f,
>+                                 7.6483421325683594f, 5.6686410903930664f, -7.1456899642944336f});
>+    orthoGoldenInputs.push_back({2.3857555389404297f, -2.6020836830139160f, 6.7841358184814453f,
>+                                 0.9868297576904297f, 5.6463518142700195f, -1.7597074508666992f});
>+    orthoGoldenInputs.push_back({4.6028537750244141f, 0.1757516860961914f, -6.1434607505798340f,
>+                                 6.8524093627929688f, 8.4380626678466797f, -1.4824752807617188f});
>+    orthoGoldenInputs.push_back({40.3382720947265625f, -34.5338973999023438f, -11.1726379394531250f,
>+                                 21.4206924438476562f, 17.5087890625000000f, 70.2734069824218750f});
>+    orthoGoldenInputs.push_back({85.2872314453125000f, 22.3899002075195312f, -92.8537139892578125f,
>+                                 7.6059341430664062f, 32.9500732421875000f, -8.1374511718750000f});
>+    orthoGoldenInputs.push_back({33.8771057128906250f, -27.6973648071289062f, 90.3841094970703125f,
>+                                 85.8473358154296875f, 36.0423278808593750f,
>+                                 -36.5140991210937500f});
>+    orthoGoldenInputs.push_back({-92.4729461669921875f, 7.1592102050781250f, -75.2177963256835938f,
>+                                 14.4945983886718750f, 10.6297378540039062f, 53.9828796386718750f});
>+    orthoGoldenInputs.push_back({90.2037658691406250f, 54.5332946777343750f, -58.9839515686035156f,
>+                                 56.7301330566406250f, 63.2403869628906250f, 81.1043853759765625f});
>+    orthoGoldenInputs.push_back({-78.6419067382812500f, 65.5156250000000000f, -78.8265304565429688f,
>+                                 -37.5036048889160156f, 76.9322204589843750f,
>+                                 -0.2213287353515625f});
>+    orthoGoldenInputs.push_back({80.1368560791015625f, 60.2946777343750000f, -27.3523788452148438f,
>+                                 88.5419616699218750f, -75.3445968627929688f,
>+                                 83.3852081298828125f});
>+    orthoGoldenInputs.push_back({55.0712585449218750f, -17.4033813476562500f, -98.6088104248046875f,
>+                                 81.6600952148437500f, 61.1217803955078125f, 73.5973815917968750f});
>+    orthoGoldenInputs.push_back({-48.7522583007812500f, 20.8100433349609375f, -45.6365356445312500f,
>+                                 -13.2819519042968750f, -29.7577133178710938f,
>+                                 62.1014862060546875f});
>+    orthoGoldenInputs.push_back({-60.3634567260742188f, 71.4023284912109375f, 59.0719757080078125f,
>+                                 22.6195831298828125f, -32.6802139282226562f,
>+                                 -56.3766899108886719f});
>+    orthoGoldenOutputs.push_back({
>+        0.2896919548511505f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        -0.8996717929840088f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        0.4798007607460022f,
>+        0.0000000000000000f,
>+        -0.6374438405036926f,
>+        -1.6682072877883911f,
>+        -3.6260902881622314f,
>+        1.0000000000000000f,
>+    });
>+    orthoGoldenOutputs.push_back({
>+        -3.8477735519409180f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        0.1690807342529297f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        -0.1779836267232895f,
>+        0.0000000000000000f,
>+        -31.3775196075439453f,
>+        -0.2578378617763519f,
>+        0.4463289380073547f,
>+        1.0000000000000000f,
>+    });
>+    orthoGoldenOutputs.push_back({
>+        2.6786458492279053f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        0.2878755927085876f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        -0.5935563445091248f,
>+        0.0000000000000000f,
>+        -9.4826574325561523f,
>+        1.0725302696228027f,
>+        -4.2423224449157715f,
>+        1.0000000000000000f,
>+    });
>+    orthoGoldenOutputs.push_back({
>+        0.3685790896415710f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        -0.1793356239795685f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        -0.3478981554508209f,
>+        0.0000000000000000f,
>+        -1.1325846910476685f,
>+        -0.1609572321176529f,
>+        -0.0429127886891365f,
>+        1.0000000000000000f,
>+    });
>+    orthoGoldenOutputs.push_back({
>+        0.3274843692779541f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        0.3938003480434418f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        2.1545734405517578f,
>+        0.0000000000000000f,
>+        -2.0636737346649170f,
>+        1.9898203611373901f,
>+        -10.7563400268554688f,
>+        1.0000000000000000f,
>+    });
>+    orthoGoldenOutputs.push_back({
>+        -0.6818625330924988f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        0.4706709980964661f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        0.5618722438812256f,
>+        0.0000000000000000f,
>+        -5.5629096031188965f,
>+        2.2754778861999512f,
>+        -4.1013488769531250f,
>+        1.0000000000000000f,
>+    });
>+    orthoGoldenOutputs.push_back({
>+        -0.1323009729385376f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        5.6734218597412109f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        0.1917929202318192f,
>+        0.0000000000000000f,
>+        -0.2143114656209946f,
>+        6.9871010780334473f,
>+        -0.2795547246932983f,
>+        1.0000000000000000f,
>+    });
>+    orthoGoldenOutputs.push_back({
>+        0.2402613908052444f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        1.0070695877075195f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        0.1560752540826797f,
>+        0.0000000000000000f,
>+        1.0719676017761230f,
>+        -6.7024130821228027f,
>+        -0.1152653917670250f,
>+        1.0000000000000000f,
>+    });
>+    orthoGoldenOutputs.push_back({
>+        -0.4009752273559570f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        -0.3449878096580505f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        0.2700491547584534f,
>+        0.0000000000000000f,
>+        -0.0433711148798466f,
>+        1.3404442071914673f,
>+        0.5247924923896790f,
>+        1.0000000000000000f,
>+    });
>+    orthoGoldenOutputs.push_back({
>+        -0.4517627954483032f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        0.1538950353860855f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        0.2016019672155380f,
>+        0.0000000000000000f,
>+        1.0793980360031128f,
>+        -0.0545518361032009f,
>+        0.7011300325393677f,
>+        1.0000000000000000f,
>+    });
>+    orthoGoldenOutputs.push_back({
>+        -0.0267121959477663f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        0.0613622479140759f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        -0.0379041880369186f,
>+        0.0000000000000000f,
>+        0.0775237977504730f,
>+        -0.3144218325614929f,
>+        -1.6636564731597900f,
>+        1.0000000000000000f,
>+    });
>+    orthoGoldenOutputs.push_back({
>+        -0.0317978523671627f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        0.0199084915220737f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        0.0486765764653683f,
>+        0.0000000000000000f,
>+        1.7119507789611816f,
>+        0.8485773205757141f,
>+        0.6038967370986938f,
>+        1.0000000000000000f,
>+    });
>+    orthoGoldenOutputs.push_back({
>+        -0.0324809923768044f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        -0.4408419132232666f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        0.0275647528469563f,
>+        0.0000000000000000f,
>+        0.1003620624542236f,
>+        38.8451042175292969f,
>+        -0.0065021286718547f,
>+        1.0000000000000000f,
>+    });
>+    orthoGoldenOutputs.push_back({
>+        0.0200738403946161f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        0.0222934633493423f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        -0.0461327582597733f,
>+        0.0000000000000000f,
>+        0.8562871813774109f,
>+        0.6768652200698853f,
>+        -1.4903790950775146f,
>+        1.0000000000000000f,
>+    });
>+    orthoGoldenOutputs.push_back({
>+        -0.0560687854886055f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        0.0172839816659689f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        -0.1119570210576057f,
>+        0.0000000000000000f,
>+        4.0576157569885254f,
>+        0.0194774791598320f,
>+        -8.0802049636840820f,
>+        1.0000000000000000f,
>+    });
>+    orthoGoldenOutputs.push_back({
>+        0.0138737112283707f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        0.0483992844820023f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        0.0259223338216543f,
>+        0.0000000000000000f,
>+        0.0910551249980927f,
>+        2.8151476383209229f,
>+        0.9942626357078552f,
>+        1.0000000000000000f,
>+    });
>+    orthoGoldenOutputs.push_back({
>+        -0.1007953882217407f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        0.0172570981085300f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        -0.0126000288873911f,
>+        0.0000000000000000f,
>+        7.0774250030517578f,
>+        -0.5279772877693176f,
>+        -0.0506559647619724f,
>+        1.0000000000000000f,
>+    });
>+    orthoGoldenOutputs.push_back({
>+        -0.0275958590209484f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        0.0110945366322994f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        -0.1603129208087921f,
>+        0.0000000000000000f,
>+        0.5197387337684631f,
>+        0.0940190702676773f,
>+        -10.7986106872558594f,
>+        1.0000000000000000f,
>+    });
>+    orthoGoldenOutputs.push_back({
>+        0.0287512056529522f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        0.0618150420486927f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        -0.0217724516987801f,
>+        0.0000000000000000f,
>+        0.4016861617565155f,
>+        1.8210244178771973f,
>+        -0.3521016240119934f,
>+        1.0000000000000000f,
>+    });
>+    orthoGoldenOutputs.push_back({
>+        0.0151784475892782f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        -0.0548660829663277f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        0.0844007357954979f,
>+        0.0000000000000000f,
>+        -0.0837764739990234f,
>+        2.2410478591918945f,
>+        -3.7582340240478516f,
>+        1.0000000000000000f,
>+    });
>+
>+    EXPECT_EQ(orthoGoldenInputs.size(), orthoGoldenOutputs.size());
>+
>+    for (size_t i = 0; i < orthoGoldenInputs.size(); i++)
>+    {
>+        const auto &input  = orthoGoldenInputs[i];
>+        const auto &output = orthoGoldenOutputs[i];
>+        Mat4 r             = Mat4::Ortho(input.l, input.r, input.b, input.t, input.n, input.f);
>+        CheckMatrixCloseToGolden(output, r);
>+    }
>+}
>+
>+// Tests for inverse transpose of mat4, which is a frequent operation done to
>+// the modelview matrix, for things such as transformation of normals.
>+TEST(MatrixUtilsTest, Mat4InvTr)
>+{
>+
>+    std::vector<std::vector<float>> invTrInputs;
>+    std::vector<std::vector<float>> invTrOutputs;
>+    invTrInputs.push_back({
>+        0.3247877955436707f,
>+        -0.8279561400413513f,
>+        0.4571666717529297f,
>+        0.0000000000000000f,
>+        0.9041201472282410f,
>+        0.1299063563346863f,
>+        -0.4070515632629395f,
>+        0.0000000000000000f,
>+        0.2776319682598114f,
>+        0.5455390810966492f,
>+        0.7907638549804688f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        1.0000000000000000f,
>+    });
>+    invTrInputs.push_back({
>+        -0.8843839168548584f,
>+        0.3047805428504944f,
>+        -0.3535164594650269f,
>+        0.0000000000000000f,
>+        0.4647803902626038f,
>+        0.6447106003761292f,
>+        -0.6068999171257019f,
>+        0.0000000000000000f,
>+        0.0429445058107376f,
>+        -0.7010400891304016f,
>+        -0.7118276357650757f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        1.0000000000000000f,
>+    });
>+    invTrInputs.push_back({
>+        -0.4487786889076233f,
>+        0.8632985353469849f,
>+        0.2308966517448425f,
>+        0.0000000000000000f,
>+        -0.5765564441680908f,
>+        -0.0823006033897400f,
>+        -0.8129017353057861f,
>+        -0.0000000000000000f,
>+        -0.6827739477157593f,
>+        -0.4979379475116730f,
>+        0.5346751213073730f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        1.0000000000000000f,
>+    });
>+    invTrInputs.push_back({
>+        0.9865614175796509f,
>+        0.0901400744915009f,
>+        -0.1362765878438950f,
>+        0.0000000000000000f,
>+        0.0155128352344036f,
>+        0.7786107659339905f,
>+        0.6273153424263000f,
>+        0.0000000000000000f,
>+        0.1626526862382889f,
>+        -0.6209991574287415f,
>+        0.7667490243911743f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        1.0000000000000000f,
>+    });
>+    invTrInputs.push_back({
>+        -0.5566663742065430f,
>+        0.8302737474441528f,
>+        -0.0277124047279358f,
>+        0.0000000000000000f,
>+        -0.0281167924404144f,
>+        0.0145094990730286f,
>+        0.9994993209838867f,
>+        0.0000000000000000f,
>+        0.8302601575851440f,
>+        0.5571669340133667f,
>+        0.0152677297592163f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        1.0000000000000000f,
>+    });
>+    invTrInputs.push_back({
>+        0.4160673320293427f,
>+        -0.9093281030654907f,
>+        0.0032218396663666f,
>+        0.0000000000000000f,
>+        -0.1397584974765778f,
>+        -0.0674473643302917f,
>+        -0.9878858327865601f,
>+        -0.0000000000000000f,
>+        0.8985296487808228f,
>+        0.4105767309665680f,
>+        -0.1551489830017090f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        1.0000000000000000f,
>+    });
>+    invTrInputs.push_back({
>+        0.9039891958236694f,
>+        -0.3967807590961456f,
>+        -0.1592751741409302f,
>+        0.0000000000000000f,
>+        0.4139676988124847f,
>+        0.9054293632507324f,
>+        0.0939593166112900f,
>+        0.0000000000000000f,
>+        0.1069311797618866f,
>+        -0.1508729904890060f,
>+        0.9827527999877930f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        1.0000000000000000f,
>+    });
>+    invTrInputs.push_back({
>+        0.3662135303020477f,
>+        0.2184857577085495f,
>+        0.9045174121856689f,
>+        0.0000000000000000f,
>+        -0.6651677489280701f,
>+        0.7412178516387939f,
>+        0.0902667641639709f,
>+        0.0000000000000000f,
>+        -0.6507223844528198f,
>+        -0.6347126960754395f,
>+        0.4167736768722534f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        1.0000000000000000f,
>+    });
>+    invTrInputs.push_back({
>+        0.3791426718235016f,
>+        0.7277372479438782f,
>+        -0.5715323686599731f,
>+        0.0000000000000000f,
>+        -0.3511379361152649f,
>+        0.6845993995666504f,
>+        0.6387689113616943f,
>+        0.0000000000000000f,
>+        0.8561266660690308f,
>+        -0.0414978563785553f,
>+        0.5150970220565796f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        1.0000000000000000f,
>+    });
>+    invTrInputs.push_back({
>+        -0.6766842603683472f,
>+        -0.0953263640403748f,
>+        -0.7300762534141541f,
>+        -0.0000000000000000f,
>+        -0.5922094583511353f,
>+        0.6596454977989197f,
>+        0.4627699255943298f,
>+        0.0000000000000000f,
>+        0.4374772906303406f,
>+        0.7455072402954102f,
>+        -0.5028247833251953f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        1.0000000000000000f,
>+    });
>+    invTrInputs.push_back({
>+        0.8012667894363403f,
>+        -0.5429225564002991f,
>+        0.2514090538024902f,
>+        0.0000000000000000f,
>+        0.3384204804897308f,
>+        0.7577887773513794f,
>+        0.5578778386116028f,
>+        0.0000000000000000f,
>+        -0.4933994412422180f,
>+        -0.3619270324707031f,
>+        0.7909271121025085f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        1.0000000000000000f,
>+    });
>+    invTrInputs.push_back({
>+        0.6100972890853882f,
>+        0.4051006734371185f,
>+        0.6809366941452026f,
>+        0.0000000000000000f,
>+        -0.6470826864242554f,
>+        0.7507012486457825f,
>+        0.1331603974103928f,
>+        0.0000000000000000f,
>+        -0.4572366476058960f,
>+        -0.5218631625175476f,
>+        0.7201343774795532f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        1.0000000000000000f,
>+    });
>+    invTrInputs.push_back({
>+        0.6304160356521606f,
>+        0.2796489298343658f,
>+        -0.7241353392601013f,
>+        0.0000000000000000f,
>+        0.3735889792442322f,
>+        0.7084143161773682f,
>+        0.5988158583641052f,
>+        0.0000000000000000f,
>+        0.6804460883140564f,
>+        -0.6480321288108826f,
>+        0.3421219885349274f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        1.0000000000000000f,
>+    });
>+    invTrInputs.push_back({
>+        -0.2888220548629761f,
>+        0.9278694987297058f,
>+        -0.2358816564083099f,
>+        0.0000000000000000f,
>+        0.8899697065353394f,
>+        0.1693908572196960f,
>+        -0.4233919680118561f,
>+        0.0000000000000000f,
>+        -0.3528962731361389f,
>+        -0.3322124481201172f,
>+        -0.8746994137763977f,
>+        -0.0000000000000000f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        1.0000000000000000f,
>+    });
>+    invTrInputs.push_back({
>+        0.7878623008728027f,
>+        0.2866843938827515f,
>+        0.5450551509857178f,
>+        0.0000000000000000f,
>+        -0.5206709504127502f,
>+        0.7827371954917908f,
>+        0.3409168124198914f,
>+        0.0000000000000000f,
>+        -0.3288993835449219f,
>+        -0.5523898601531982f,
>+        0.7659573554992676f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        1.0000000000000000f,
>+    });
>+    invTrInputs.push_back({
>+        -0.3225378990173340f,
>+        0.9464974999427795f,
>+        0.0105716586112976f,
>+        0.0000000000000000f,
>+        -0.4923008084297180f,
>+        -0.1582012772560120f,
>+        -0.8559277057647705f,
>+        -0.0000000000000000f,
>+        -0.8084610104560852f,
>+        -0.2812736034393311f,
>+        0.5169874429702759f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        1.0000000000000000f,
>+    });
>+    invTrInputs.push_back({
>+        0.3137793838977814f,
>+        0.3656709790229797f,
>+        0.8762575387954712f,
>+        0.0000000000000000f,
>+        0.8767655491828918f,
>+        0.2426431477069855f,
>+        -0.4152186512947083f,
>+        0.0000000000000000f,
>+        -0.3644512593746185f,
>+        0.8985595107078552f,
>+        -0.2444712668657303f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        1.0000000000000000f,
>+    });
>+    invTrInputs.push_back({
>+        0.8862395882606506f,
>+        -0.3831786513328552f,
>+        0.2602950036525726f,
>+        0.0000000000000000f,
>+        0.4416945576667786f,
>+        0.8683440685272217f,
>+        -0.2255758643150330f,
>+        0.0000000000000000f,
>+        -0.1395897567272186f,
>+        0.3148851394653320f,
>+        0.9388087987899780f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        1.0000000000000000f,
>+    });
>+    invTrInputs.push_back({
>+        0.4614841341972351f,
>+        -0.8635553717613220f,
>+        -0.2032356113195419f,
>+        0.0000000000000000f,
>+        -0.7492366433143616f,
>+        -0.5020523071289062f,
>+        0.4319583475589752f,
>+        0.0000000000000000f,
>+        -0.4750548601150513f,
>+        -0.0470703244209290f,
>+        -0.8786963224411011f,
>+        -0.0000000000000000f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        1.0000000000000000f,
>+    });
>+    invTrInputs.push_back({
>+        0.7327640056610107f,
>+        -0.5076418519020081f,
>+        0.4531629979610443f,
>+        0.0000000000000000f,
>+        -0.0702797919511795f,
>+        0.6059250831604004f,
>+        0.7924112081527710f,
>+        0.0000000000000000f,
>+        -0.6768439412117004f,
>+        -0.6124986410140991f,
>+        0.4083231091499329f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        1.0000000000000000f,
>+    });
>+    invTrOutputs.push_back({
>+        0.3247878849506378f,
>+        -0.8279562592506409f,
>+        0.4571668505668640f,
>+        -0.0000000000000000f,
>+        0.9041203260421753f,
>+        0.1299064010381699f,
>+        -0.4070515930652618f,
>+        0.0000000000000000f,
>+        0.2776320576667786f,
>+        0.5455390810966492f,
>+        0.7907639741897583f,
>+        -0.0000000000000000f,
>+        -0.0000000000000000f,
>+        0.0000000000000000f,
>+        -0.0000000000000000f,
>+        1.0000000000000000f,
>+    });
>+    invTrOutputs.push_back({
>+        -0.8843840360641479f,
>+        0.3047805130481720f,
>+        -0.3535164594650269f,
>+        -0.0000000000000000f,
>+        0.4647804200649261f,
>+        0.6447105407714844f,
>+        -0.6068999171257019f,
>+        -0.0000000000000000f,
>+        0.0429445207118988f,
>+        -0.7010400891304016f,
>+        -0.7118277549743652f,
>+        0.0000000000000000f,
>+        -0.0000000000000000f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        1.0000000000000000f,
>+    });
>+    invTrOutputs.push_back({
>+        -0.4487787485122681f,
>+        0.8632985949516296f,
>+        0.2308966219425201f,
>+        -0.0000000000000000f,
>+        -0.5765565037727356f,
>+        -0.0823005959391594f,
>+        -0.8129017353057861f,
>+        0.0000000000000000f,
>+        -0.6827740073204041f,
>+        -0.4979379475116730f,
>+        0.5346751213073730f,
>+        -0.0000000000000000f,
>+        -0.0000000000000000f,
>+        0.0000000000000000f,
>+        -0.0000000000000000f,
>+        1.0000000000000000f,
>+    });
>+    invTrOutputs.push_back({
>+        0.9865614175796509f,
>+        0.0901400819420815f,
>+        -0.1362766027450562f,
>+        -0.0000000000000000f,
>+        0.0155128324404359f,
>+        0.7786108255386353f,
>+        0.6273154020309448f,
>+        -0.0000000000000000f,
>+        0.1626526862382889f,
>+        -0.6209992170333862f,
>+        0.7667490839958191f,
>+        -0.0000000000000000f,
>+        -0.0000000000000000f,
>+        0.0000000000000000f,
>+        -0.0000000000000000f,
>+        1.0000000000000000f,
>+    });
>+    invTrOutputs.push_back({
>+        -0.5566664934158325f,
>+        0.8302738070487976f,
>+        -0.0277124084532261f,
>+        -0.0000000000000000f,
>+        -0.0281168315559626f,
>+        0.0145094739273190f,
>+        0.9994993805885315f,
>+        -0.0000000000000000f,
>+        0.8302602171897888f,
>+        0.5571669340133667f,
>+        0.0152676850557327f,
>+        -0.0000000000000000f,
>+        -0.0000000000000000f,
>+        -0.0000000000000000f,
>+        -0.0000000000000000f,
>+        1.0000000000000000f,
>+    });
>+    invTrOutputs.push_back({
>+        0.4160673320293427f,
>+        -0.9093281030654907f,
>+        0.0032218731939793f,
>+        -0.0000000000000000f,
>+        -0.1397585272789001f,
>+        -0.0674473419785500f,
>+        -0.9878858327865601f,
>+        0.0000000000000000f,
>+        0.8985296487808228f,
>+        0.4105767309665680f,
>+        -0.1551489681005478f,
>+        -0.0000000000000000f,
>+        -0.0000000000000000f,
>+        0.0000000000000000f,
>+        -0.0000000000000000f,
>+        1.0000000000000000f,
>+    });
>+    invTrOutputs.push_back({
>+        0.9039891958236694f,
>+        -0.3967807590961456f,
>+        -0.1592751741409302f,
>+        -0.0000000000000000f,
>+        0.4139677286148071f,
>+        0.9054294228553772f,
>+        0.0939593166112900f,
>+        0.0000000000000000f,
>+        0.1069311797618866f,
>+        -0.1508729755878448f,
>+        0.9827527999877930f,
>+        -0.0000000000000000f,
>+        -0.0000000000000000f,
>+        0.0000000000000000f,
>+        -0.0000000000000000f,
>+        1.0000000000000000f,
>+    });
>+    invTrOutputs.push_back({
>+        0.3662134706974030f,
>+        0.2184857726097107f,
>+        0.9045172333717346f,
>+        -0.0000000000000000f,
>+        -0.6651675701141357f,
>+        0.7412176728248596f,
>+        0.0902667865157127f,
>+        0.0000000000000000f,
>+        -0.6507222652435303f,
>+        -0.6347125172615051f,
>+        0.4167735874652863f,
>+        -0.0000000000000000f,
>+        -0.0000000000000000f,
>+        0.0000000000000000f,
>+        -0.0000000000000000f,
>+        1.0000000000000000f,
>+    });
>+    invTrOutputs.push_back({
>+        0.3791427314281464f,
>+        0.7277373671531677f,
>+        -0.5715324282646179f,
>+        -0.0000000000000000f,
>+        -0.3511379957199097f,
>+        0.6845995187759399f,
>+        0.6387690305709839f,
>+        -0.0000000000000000f,
>+        0.8561268448829651f,
>+        -0.0414978675544262f,
>+        0.5150971412658691f,
>+        -0.0000000000000000f,
>+        -0.0000000000000000f,
>+        0.0000000000000000f,
>+        -0.0000000000000000f,
>+        1.0000000000000000f,
>+    });
>+    invTrOutputs.push_back({
>+        -0.6766842603683472f,
>+        -0.0953262373805046f,
>+        -0.7300761342048645f,
>+        -0.0000000000000000f,
>+        -0.5922094583511353f,
>+        0.6596452593803406f,
>+        0.4627698063850403f,
>+        0.0000000000000000f,
>+        0.4374772608280182f,
>+        0.7455070018768311f,
>+        -0.5028247833251953f,
>+        -0.0000000000000000f,
>+        -0.0000000000000000f,
>+        -0.0000000000000000f,
>+        -0.0000000000000000f,
>+        1.0000000000000000f,
>+    });
>+    invTrOutputs.push_back({
>+        0.8012669086456299f,
>+        -0.5429226160049438f,
>+        0.2514090836048126f,
>+        -0.0000000000000000f,
>+        0.3384204804897308f,
>+        0.7577888369560242f,
>+        0.5578778982162476f,
>+        0.0000000000000000f,
>+        -0.4933995306491852f,
>+        -0.3619270920753479f,
>+        0.7909271717071533f,
>+        -0.0000000000000000f,
>+        -0.0000000000000000f,
>+        0.0000000000000000f,
>+        -0.0000000000000000f,
>+        1.0000000000000000f,
>+    });
>+    invTrOutputs.push_back({
>+        0.6100972294807434f,
>+        0.4051006138324738f,
>+        0.6809366941452026f,
>+        -0.0000000000000000f,
>+        -0.6470826268196106f,
>+        0.7507011294364929f,
>+        0.1331604123115540f,
>+        0.0000000000000000f,
>+        -0.4572366178035736f,
>+        -0.5218631029129028f,
>+        0.7201343774795532f,
>+        -0.0000000000000000f,
>+        -0.0000000000000000f,
>+        0.0000000000000000f,
>+        -0.0000000000000000f,
>+        1.0000000000000000f,
>+    });
>+    invTrOutputs.push_back({
>+        0.6304160952568054f,
>+        0.2796489298343658f,
>+        -0.7241354584693909f,
>+        -0.0000000000000000f,
>+        0.3735889494419098f,
>+        0.7084143161773682f,
>+        0.5988159179687500f,
>+        -0.0000000000000000f,
>+        0.6804461479187012f,
>+        -0.6480321288108826f,
>+        0.3421220481395721f,
>+        -0.0000000000000000f,
>+        -0.0000000000000000f,
>+        0.0000000000000000f,
>+        -0.0000000000000000f,
>+        1.0000000000000000f,
>+    });
>+    invTrOutputs.push_back({
>+        -0.2888221442699432f,
>+        0.9278693199157715f,
>+        -0.2358815670013428f,
>+        -0.0000000000000000f,
>+        0.8899695873260498f,
>+        0.1693906933069229f,
>+        -0.4233919084072113f,
>+        -0.0000000000000000f,
>+        -0.3528962433338165f,
>+        -0.3322124481201172f,
>+        -0.8746994137763977f,
>+        0.0000000000000000f,
>+        -0.0000000000000000f,
>+        0.0000000000000000f,
>+        0.0000000000000000f,
>+        1.0000000000000000f,
>+    });
>+    invTrOutputs.push_back({
>+        0.7878623008728027f,
>+        0.2866844236850739f,
>+        0.5450551509857178f,
>+        -0.0000000000000000f,
>+        -0.5206709504127502f,
>+        0.7827371954917908f,
>+        0.3409168422222137f,
>+        0.0000000000000000f,
>+        -0.3288994133472443f,
>+        -0.5523898601531982f,
>+        0.7659573554992676f,
>+        -0.0000000000000000f,
>+        -0.0000000000000000f,
>+        0.0000000000000000f,
>+        -0.0000000000000000f,
>+        1.0000000000000000f,
>+    });
>+    invTrOutputs.push_back({
>+        -0.3225379288196564f,
>+        0.9464974999427795f,
>+        0.0105716586112976f,
>+        -0.0000000000000000f,
>+        -0.4923008382320404f,
>+        -0.1582012772560120f,
>+        -0.8559277057647705f,
>+        0.0000000000000000f,
>+        -0.8084610104560852f,
>+        -0.2812735736370087f,
>+        0.5169873833656311f,
>+        -0.0000000000000000f,
>+        -0.0000000000000000f,
>+        0.0000000000000000f,
>+        -0.0000000000000000f,
>+        1.0000000000000000f,
>+    });
>+    invTrOutputs.push_back({
>+        0.3137793540954590f,
>+        0.3656708896160126f,
>+        0.8762574791908264f,
>+        -0.0000000000000000f,
>+        0.8767654895782471f,
>+        0.2426430881023407f,
>+        -0.4152186512947083f,
>+        0.0000000000000000f,
>+        -0.3644512593746185f,
>+        0.8985593318939209f,
>+        -0.2444712817668915f,
>+        -0.0000000000000000f,
>+        -0.0000000000000000f,
>+        0.0000000000000000f,
>+        -0.0000000000000000f,
>+        1.0000000000000000f,
>+    });
>+    invTrOutputs.push_back({
>+        0.8862395882606506f,
>+        -0.3831786811351776f,
>+        0.2602950334548950f,
>+        -0.0000000000000000f,
>+        0.4416945576667786f,
>+        0.8683440685272217f,
>+        -0.2255758792161942f,
>+        0.0000000000000000f,
>+        -0.1395897865295410f,
>+        0.3148851692676544f,
>+        0.9388088583946228f,
>+        -0.0000000000000000f,
>+        -0.0000000000000000f,
>+        0.0000000000000000f,
>+        -0.0000000000000000f,
>+        1.0000000000000000f,
>+    });
>+    invTrOutputs.push_back({
>+        0.4614838957786560f,
>+        -0.8635552525520325f,
>+        -0.2032355368137360f,
>+        -0.0000000000000000f,
>+        -0.7492365241050720f,
>+        -0.5020524263381958f,
>+        0.4319583177566528f,
>+        0.0000000000000000f,
>+        -0.4750548005104065f,
>+        -0.0470703467726707f,
>+        -0.8786963820457458f,
>+        0.0000000000000000f,
>+        -0.0000000000000000f,
>+        0.0000000000000000f,
>+        -0.0000000000000000f,
>+        1.0000000000000000f,
>+    });
>+    invTrOutputs.push_back({
>+        0.7327639460563660f,
>+        -0.5076418519020081f,
>+        0.4531629383563995f,
>+        -0.0000000000000000f,
>+        -0.0702798143029213f,
>+        0.6059250235557556f,
>+        0.7924111485481262f,
>+        0.0000000000000000f,
>+        -0.6768438220024109f,
>+        -0.6124985218048096f,
>+        0.4083230793476105f,
>+        -0.0000000000000000f,
>+        -0.0000000000000000f,
>+        0.0000000000000000f,
>+        -0.0000000000000000f,
>+        1.0000000000000000f,
>+    });
>+
>+    EXPECT_EQ(invTrInputs.size(), invTrInputs.size());
>+
>+    for (size_t i = 0; i < invTrInputs.size(); i++)
>+    {
>+        Mat4 a(invTrInputs[i]);
>+        CheckMatrixCloseToGolden(invTrOutputs[i], a.transpose().inverse());
>+    }
>+}
>+
>+// Tests mat4 matrix/matrix multiplication by multiplying two translation matrices.
>+TEST(MatrixUtilsTest, Mat4Mult)
>+{
>+    Mat4 a, b;
>+    CheckMatrixCloseToGolden(a.data(), a.product(b));
>+
>+    Mat4 r = Mat4::Translate(Vector3(1.f, 1.f, 1.f));
>+    CheckMatrixCloseToGolden(r.data(), a.product(r));
>+
>+    Mat4 s = Mat4::Translate(Vector3(2.f, 2.f, 2.f));
>+    Mat4 t = r.product(r);
>+    CheckMatrixCloseToGolden(s.data(), t);
>+}
>+
>+// Tests exact equality.
>+TEST(MatrixUtilsTest, ExactEquality)
>+{
>+    Mat4 a, b;
>+    EXPECT_EQ(a, b);
>+    Mat4 c;
>+    c(0, 0) += 0.000001f;
>+    EXPECT_NE(a, c);
>+}
>+
>+// Tests near equality.
>+TEST(MatrixUtilsTest, NearEquality)
>+{
>+    Mat4 a, b;
>+
>+    float *bData = b.data();
>+    for (int i = 0; i < 16; i++)
>+    {
>+        bData[i] += 0.09f;
>+    }
>+
>+    EXPECT_TRUE(a.nearlyEqual(0.1f, b));
>+
>+    for (int i = 0; i < 16; i++)
>+    {
>+        bData[i] -= 2 * 0.09f;
>+    }
>+
>+    EXPECT_TRUE(a.nearlyEqual(0.1f, b));
> }
> 
>+}  // namespace
>diff --git a/Source/ThirdParty/ANGLE/src/common/packed_egl_enums.json b/Source/ThirdParty/ANGLE/src/common/packed_egl_enums.json
>new file mode 100644
>index 00000000000..ec22d1a0d9f
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/common/packed_egl_enums.json
>@@ -0,0 +1,43 @@
>+{
>+    "TextureFormat":
>+    {
>+        "NoTexture": "EGL_NO_TEXTURE",
>+        "RGB": "EGL_TEXTURE_RGB",
>+        "RGBA": "EGL_TEXTURE_RGBA"
>+    },
>+    "ObjectType":
>+    {
>+        "Thread": "EGL_OBJECT_THREAD_KHR",
>+        "Display": "EGL_OBJECT_DISPLAY_KHR",
>+        "Context": "EGL_OBJECT_CONTEXT_KHR",
>+        "Surface": "EGL_OBJECT_SURFACE_KHR",
>+        "Image": "EGL_OBJECT_IMAGE_KHR",
>+        "Sync": "EGL_OBJECT_SYNC_KHR",
>+        "Stream": "EGL_OBJECT_STREAM_KHR"
>+    },
>+    "MessageType":
>+    {
>+        "Critical": "EGL_DEBUG_MSG_CRITICAL_KHR",
>+        "Error": "EGL_DEBUG_MSG_ERROR_KHR",
>+        "Warn": "EGL_DEBUG_MSG_WARN_KHR",
>+        "Info": "EGL_DEBUG_MSG_INFO_KHR"
>+    },
>+    "CompositorTiming":
>+    {
>+        "CompositeDeadline": "EGL_COMPOSITE_DEADLINE_ANDROID",
>+        "CompositInterval": "EGL_COMPOSITE_INTERVAL_ANDROID",
>+        "CompositToPresentLatency": "EGL_COMPOSITE_TO_PRESENT_LATENCY_ANDROID"
>+    },
>+    "Timestamp":
>+    {
>+        "RequestedPresentTime": "EGL_REQUESTED_PRESENT_TIME_ANDROID",
>+        "RenderingCompleteTime": "EGL_RENDERING_COMPLETE_TIME_ANDROID",
>+        "CompositionLatchTime": "EGL_COMPOSITION_LATCH_TIME_ANDROID",
>+        "FirstCompositionStartTime": "EGL_FIRST_COMPOSITION_START_TIME_ANDROID",
>+        "LastCompositionStartTime": "EGL_LAST_COMPOSITION_START_TIME_ANDROID",
>+        "FirstCompositionGPUFinishedTime": "EGL_FIRST_COMPOSITION_GPU_FINISHED_TIME_ANDROID",
>+        "DisplayPresentTime": "EGL_DISPLAY_PRESENT_TIME_ANDROID",
>+        "DequeueReadyTime": "EGL_DEQUEUE_READY_TIME_ANDROID",
>+        "ReadsDoneTime": "EGL_READS_DONE_TIME_ANDROID"
>+    }
>+}
>diff --git a/Source/ThirdParty/ANGLE/src/common/packed_gl_enums.json b/Source/ThirdParty/ANGLE/src/common/packed_gl_enums.json
>new file mode 100644
>index 00000000000..0cff012e375
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/common/packed_gl_enums.json
>@@ -0,0 +1,270 @@
>+{
>+    "AlphaTestFunc":
>+    {
>+        "AlwaysPass": "GL_ALWAYS",
>+        "Equal": "GL_EQUAL",
>+        "Gequal": "GL_GEQUAL",
>+        "Greater": "GL_GREATER",
>+        "Lequal": "GL_LEQUAL",
>+        "Less": "GL_LESS",
>+        "Never": "GL_NEVER",
>+        "NotEqual": "GL_NOTEQUAL"
>+    },
>+    "BufferBinding":
>+    {
>+        "Array": "GL_ARRAY_BUFFER",
>+        "AtomicCounter": "GL_ATOMIC_COUNTER_BUFFER",
>+        "CopyRead": "GL_COPY_READ_BUFFER",
>+        "CopyWrite": "GL_COPY_WRITE_BUFFER",
>+        "DispatchIndirect": "GL_DISPATCH_INDIRECT_BUFFER",
>+        "DrawIndirect": "GL_DRAW_INDIRECT_BUFFER",
>+        "ElementArray": "GL_ELEMENT_ARRAY_BUFFER",
>+        "PixelPack": "GL_PIXEL_PACK_BUFFER",
>+        "PixelUnpack": "GL_PIXEL_UNPACK_BUFFER",
>+        "ShaderStorage": "GL_SHADER_STORAGE_BUFFER",
>+        "TransformFeedback": "GL_TRANSFORM_FEEDBACK_BUFFER",
>+        "Uniform": "GL_UNIFORM_BUFFER"
>+    },
>+    "BufferUsage":
>+    {
>+        "DynamicCopy": "GL_DYNAMIC_COPY",
>+        "DynamicDraw": "GL_DYNAMIC_DRAW",
>+        "DynamicRead": "GL_DYNAMIC_READ",
>+        "StaticCopy": "GL_STATIC_COPY",
>+        "StaticDraw": "GL_STATIC_DRAW",
>+        "StaticRead": "GL_STATIC_READ",
>+        "StreamCopy": "GL_STREAM_COPY",
>+        "StreamDraw": "GL_STREAM_DRAW",
>+        "StreamRead": "GL_STREAM_READ"
>+    },
>+    "ClientVertexArrayType":
>+    {
>+        "Color": "GL_COLOR_ARRAY",
>+        "Normal": "GL_NORMAL_ARRAY",
>+        "PointSize": "GL_POINT_SIZE_ARRAY_OES",
>+        "TextureCoord": "GL_TEXTURE_COORD_ARRAY",
>+        "Vertex": "GL_VERTEX_ARRAY"
>+    },
>+    "CullFaceMode":
>+    {
>+        "Back": "GL_BACK",
>+        "Front": "GL_FRONT",
>+        "FrontAndBack": "GL_FRONT_AND_BACK"
>+    },
>+    "FogMode":
>+    {
>+        "Exp": "GL_EXP",
>+        "Exp2": "GL_EXP2",
>+        "Linear": "GL_LINEAR"
>+    },
>+    "GraphicsResetStatus":
>+    {
>+        "NoError": "GL_NO_ERROR",
>+        "GuiltyContextReset": "GL_GUILTY_CONTEXT_RESET",
>+        "InnocentContextReset": "GL_INNOCENT_CONTEXT_RESET",
>+        "UnknownContextReset": "GL_UNKNOWN_CONTEXT_RESET"
>+    },
>+    "HintSetting":
>+    {
>+        "DontCare": "GL_DONT_CARE",
>+        "Fastest": "GL_FASTEST",
>+        "Nicest": "GL_NICEST"
>+    },
>+    "LogicalOperation":
>+    {
>+        "And": "GL_AND",
>+        "AndInverted": "GL_AND_INVERTED",
>+        "AndReverse": "GL_AND_REVERSE",
>+        "Clear": "GL_CLEAR",
>+        "Copy": "GL_COPY",
>+        "CopyInverted": "GL_COPY_INVERTED",
>+        "Equiv": "GL_EQUIV",
>+        "Invert": "GL_INVERT",
>+        "Nand": "GL_NAND",
>+        "Noop": "GL_NOOP",
>+        "Nor": "GL_NOR",
>+        "Or": "GL_OR",
>+        "OrInverted": "GL_OR_INVERTED",
>+        "OrReverse": "GL_OR_REVERSE",
>+        "Set": "GL_SET",
>+        "Xor": "GL_XOR"
>+    },
>+    "MatrixType":
>+    {
>+        "Modelview": "GL_MODELVIEW",
>+        "Projection": "GL_PROJECTION",
>+        "Texture": "GL_TEXTURE"
>+    },
>+    "QueryType":
>+    {
>+        "AnySamples": "GL_ANY_SAMPLES_PASSED",
>+        "AnySamplesConservative": "GL_ANY_SAMPLES_PASSED_CONSERVATIVE",
>+        "CommandsCompleted": "GL_COMMANDS_COMPLETED_CHROMIUM",
>+        "PrimitivesGenerated": "GL_PRIMITIVES_GENERATED_EXT",
>+        "TimeElapsed": "GL_TIME_ELAPSED_EXT",
>+        "Timestamp": "GL_TIMESTAMP_EXT",
>+        "TransformFeedbackPrimitivesWritten": "GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN"
>+    },
>+    "ShaderType":
>+    {
>+        "Vertex": "GL_VERTEX_SHADER",
>+        "Fragment": "GL_FRAGMENT_SHADER",
>+        "Geometry": "GL_GEOMETRY_SHADER_EXT",
>+        "Compute": "GL_COMPUTE_SHADER"
>+    },
>+    "ShadingModel":
>+    {
>+        "Flat": "GL_FLAT",
>+        "Smooth": "GL_SMOOTH"
>+    },
>+    "TextureCombine":
>+    {
>+        "Add": "GL_ADD",
>+        "AddSigned": "GL_ADD_SIGNED",
>+        "Dot3Rgb": "GL_DOT3_RGB",
>+        "Dot3Rgba": "GL_DOT3_RGBA",
>+        "Interpolate": "GL_INTERPOLATE",
>+        "Modulate": "GL_MODULATE",
>+        "Replace": "GL_REPLACE",
>+        "Subtract": "GL_SUBTRACT"
>+    },
>+    "TextureEnvMode":
>+    {
>+        "Add": "GL_ADD",
>+        "Blend": "GL_BLEND",
>+        "Combine": "GL_COMBINE",
>+        "Decal": "GL_DECAL",
>+        "Modulate": "GL_MODULATE",
>+        "Replace": "GL_REPLACE"
>+    },
>+    "TextureEnvTarget":
>+    {
>+        "Env": "GL_TEXTURE_ENV",
>+        "PointSprite": "GL_POINT_SPRITE_OES"
>+    },
>+    "TextureEnvParameter":
>+    {
>+        "Mode": "GL_TEXTURE_ENV_MODE",
>+        "Color": "GL_TEXTURE_ENV_COLOR",
>+        "CombineRgb": "GL_COMBINE_RGB",
>+        "CombineAlpha": "GL_COMBINE_ALPHA",
>+        "RgbScale": "GL_RGB_SCALE",
>+        "AlphaScale": "GL_ALPHA_SCALE",
>+        "Src0Rgb": "GL_SRC0_RGB",
>+        "Src1Rgb": "GL_SRC1_RGB",
>+        "Src2Rgb": "GL_SRC2_RGB",
>+        "Src0Alpha": "GL_SRC0_ALPHA",
>+        "Src1Alpha": "GL_SRC1_ALPHA",
>+        "Src2Alpha": "GL_SRC2_ALPHA",
>+        "Op0Rgb": "GL_OPERAND0_RGB",
>+        "Op1Rgb": "GL_OPERAND1_RGB",
>+        "Op2Rgb": "GL_OPERAND2_RGB",
>+        "Op0Alpha": "GL_OPERAND0_ALPHA",
>+        "Op1Alpha": "GL_OPERAND1_ALPHA",
>+        "Op2Alpha": "GL_OPERAND2_ALPHA",
>+        "PointCoordReplace": "GL_COORD_REPLACE_OES"
>+    },
>+    "TextureOp":
>+    {
>+        "OneMinusSrcAlpha": "GL_ONE_MINUS_SRC_ALPHA",
>+        "OneMinusSrcColor": "GL_ONE_MINUS_SRC_COLOR",
>+        "SrcAlpha": "GL_SRC_ALPHA",
>+        "SrcColor": "GL_SRC_COLOR"
>+    },
>+    "TextureSrc":
>+    {
>+        "Constant": "GL_CONSTANT",
>+        "Previous": "GL_PREVIOUS",
>+        "PrimaryColor": "GL_PRIMARY_COLOR",
>+        "Texture": "GL_TEXTURE"
>+    },
>+    "TextureType":
>+    {
>+        "_2D": "GL_TEXTURE_2D",
>+        "_2DArray": "GL_TEXTURE_2D_ARRAY",
>+        "_2DMultisample": "GL_TEXTURE_2D_MULTISAMPLE",
>+        "_2DMultisampleArray": "GL_TEXTURE_2D_MULTISAMPLE_ARRAY_OES",
>+        "_3D": "GL_TEXTURE_3D",
>+        "External": "GL_TEXTURE_EXTERNAL_OES",
>+        "Rectangle": "GL_TEXTURE_RECTANGLE_ANGLE",
>+        "CubeMap": "GL_TEXTURE_CUBE_MAP"
>+    },
>+    "TextureTarget":
>+    {
>+        "_2D": "GL_TEXTURE_2D",
>+        "_2DArray": "GL_TEXTURE_2D_ARRAY",
>+        "_2DMultisample": "GL_TEXTURE_2D_MULTISAMPLE",
>+        "_2DMultisampleArray": "GL_TEXTURE_2D_MULTISAMPLE_ARRAY_OES",
>+        "_3D": "GL_TEXTURE_3D",
>+        "External": "GL_TEXTURE_EXTERNAL_OES",
>+        "Rectangle": "GL_TEXTURE_RECTANGLE_ANGLE",
>+        "CubeMapPositiveX": "GL_TEXTURE_CUBE_MAP_POSITIVE_X",
>+        "CubeMapNegativeX": "GL_TEXTURE_CUBE_MAP_NEGATIVE_X",
>+        "CubeMapPositiveY": "GL_TEXTURE_CUBE_MAP_POSITIVE_Y",
>+        "CubeMapNegativeY": "GL_TEXTURE_CUBE_MAP_NEGATIVE_Y",
>+        "CubeMapPositiveZ": "GL_TEXTURE_CUBE_MAP_POSITIVE_Z",
>+        "CubeMapNegativeZ": "GL_TEXTURE_CUBE_MAP_NEGATIVE_Z"
>+    },
>+    "VertexArrayType":
>+    {
>+        "Color": "GL_COLOR_ARRAY",
>+        "Normal": "GL_NORMAL_ARRAY",
>+        "PointSize": "GL_POINT_SIZE_ARRAY_OES",
>+        "TextureCoord": "GL_TEXTURE_COORD_ARRAY",
>+        "Vertex": "GL_VERTEX_ARRAY"
>+    },
>+    "MaterialParameter":
>+    {
>+        "Ambient": "GL_AMBIENT",
>+        "AmbientAndDiffuse": "GL_AMBIENT_AND_DIFFUSE",
>+        "Diffuse": "GL_DIFFUSE",
>+        "Emission": "GL_EMISSION",
>+        "Shininess": "GL_SHININESS",
>+        "Specular": "GL_SPECULAR"
>+    },
>+    "LightParameter":
>+    {
>+        "Ambient": "GL_AMBIENT",
>+        "AmbientAndDiffuse": "GL_AMBIENT_AND_DIFFUSE",
>+        "ConstantAttenuation": "GL_CONSTANT_ATTENUATION",
>+        "Diffuse": "GL_DIFFUSE",
>+        "LinearAttenuation": "GL_LINEAR_ATTENUATION",
>+        "Position": "GL_POSITION",
>+        "QuadraticAttenuation": "GL_QUADRATIC_ATTENUATION",
>+        "Specular": "GL_SPECULAR",
>+        "SpotCutoff": "GL_SPOT_CUTOFF",
>+        "SpotDirection": "GL_SPOT_DIRECTION",
>+        "SpotExponent": "GL_SPOT_EXPONENT"
>+    },
>+    "PointParameter":
>+    {
>+        "PointSizeMin" : "GL_POINT_SIZE_MIN",
>+        "PointSizeMax" : "GL_POINT_SIZE_MAX",
>+        "PointFadeThresholdSize" : "GL_POINT_FADE_THRESHOLD_SIZE",
>+        "PointDistanceAttenuation" : "GL_POINT_DISTANCE_ATTENUATION"
>+    },
>+    "FilterMode":
>+    {
>+        "Nearest": "GL_NEAREST",
>+        "Linear": "GL_LINEAR",
>+        "NearestMipmapNearest": "GL_NEAREST_MIPMAP_NEAREST",
>+        "NearestMipmapLinear": "GL_NEAREST_MIPMAP_LINEAR",
>+        "LinearMipmapLinear": "GL_LINEAR_MIPMAP_LINEAR"
>+    },
>+    "WrapMode":
>+    {
>+        "ClampToEdge": "GL_CLAMP_TO_EDGE",
>+        "ClampToBorder": "GL_CLAMP_TO_BORDER",
>+        "MirroredRepeat": "GL_MIRRORED_REPEAT",
>+        "Repeat": "GL_REPEAT"
>+    },
>+    "ProvokingVertex":
>+    {
>+        "FirstVertexConvention": "GL_FIRST_VERTEX_CONVENTION",
>+        "LastVertexConvention": "GL_LAST_VERTEX_CONVENTION"
>+    },
>+    "HandleType":
>+    {
>+        "OpaqueFd": "GL_HANDLE_TYPE_OPAQUE_FD_EXT"
>+    }
>+}
>diff --git a/Source/ThirdParty/ANGLE/src/common/platform.h b/Source/ThirdParty/ANGLE/src/common/platform.h
>index 0065fd25196..acb21575ace 100644
>--- a/Source/ThirdParty/ANGLE/src/common/platform.h
>+++ b/Source/ThirdParty/ANGLE/src/common/platform.h
>@@ -9,95 +9,103 @@
> #ifndef COMMON_PLATFORM_H_
> #define COMMON_PLATFORM_H_
> 
>-#if defined(_WIN32) || defined(_WIN64)
>-#   define ANGLE_PLATFORM_WINDOWS 1
>+#if defined(_WIN32)
>+#    define ANGLE_PLATFORM_WINDOWS 1
>+#elif defined(__Fuchsia__)
>+#    define ANGLE_PLATFORM_FUCHSIA 1
>+#    define ANGLE_PLATFORM_POSIX 1
> #elif defined(__APPLE__)
>-#   define ANGLE_PLATFORM_APPLE 1
>-#   define ANGLE_PLATFORM_POSIX 1
>+#    define ANGLE_PLATFORM_APPLE 1
>+#    define ANGLE_PLATFORM_POSIX 1
> #elif defined(ANDROID)
>-#   define ANGLE_PLATFORM_ANDROID 1
>-#   define ANGLE_PLATFORM_POSIX 1
>+#    define ANGLE_PLATFORM_ANDROID 1
>+#    define ANGLE_PLATFORM_POSIX 1
> #elif defined(__linux__) || defined(EMSCRIPTEN)
>-#   define ANGLE_PLATFORM_LINUX 1
>-#   define ANGLE_PLATFORM_POSIX 1
>-#elif defined(__FreeBSD__) || \
>-      defined(__OpenBSD__) || \
>-      defined(__NetBSD__) || \
>-      defined(__DragonFly__) || \
>-      defined(__sun) || \
>-      defined(__GLIBC__) || \
>-      defined(__GNU__) || \
>-      defined(__QNX__) || \
>-      defined(__Fuchsia__) || \
>-      defined(__HAIKU__)
>-#   define ANGLE_PLATFORM_POSIX 1
>+#    define ANGLE_PLATFORM_LINUX 1
>+#    define ANGLE_PLATFORM_POSIX 1
>+#elif defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) ||              \
>+    defined(__DragonFly__) || defined(__sun) || defined(__GLIBC__) || defined(__GNU__) || \
>+    defined(__QNX__) || defined(__Fuchsia__) || defined(__HAIKU__)
>+#    define ANGLE_PLATFORM_POSIX 1
> #else
>-#   error Unsupported platform.
>+#    error Unsupported platform.
> #endif
> 
> #ifdef ANGLE_PLATFORM_WINDOWS
>-#   ifndef STRICT
>-#       define STRICT 1
>-#   endif
>-#   ifndef WIN32_LEAN_AND_MEAN
>-#       define WIN32_LEAN_AND_MEAN 1
>-#   endif
>-#   ifndef NOMINMAX
>-#       define NOMINMAX 1
>-#   endif
>-
>-#   include <windows.h>
>-#   include <intrin.h>
>-
>-#   if defined(WINAPI_FAMILY) && (WINAPI_FAMILY != WINAPI_FAMILY_DESKTOP_APP)
>-#       define ANGLE_ENABLE_WINDOWS_STORE 1
>-#   endif
>-
>-#   if defined(ANGLE_ENABLE_D3D9)
>-#       include <d3d9.h>
>-#       include <d3dcompiler.h>
>-#   endif
>-
>-#   if defined(ANGLE_ENABLE_D3D11)
>-#include <d3d10_1.h>
>-#include <d3d11.h>
>-#include <d3d11_3.h>
>-#include <d3dcompiler.h>
>-#include <dxgi.h>
>-#include <dxgi1_2.h>
>-#   endif
>-
>-#if defined(ANGLE_ENABLE_D3D9) || defined(ANGLE_ENABLE_D3D11)
>-#include <wrl.h>
>-#endif
>+#    ifndef STRICT
>+#        define STRICT 1
>+#    endif
>+#    ifndef WIN32_LEAN_AND_MEAN
>+#        define WIN32_LEAN_AND_MEAN 1
>+#    endif
>+#    ifndef NOMINMAX
>+#        define NOMINMAX 1
>+#    endif
>+
>+#    include <intrin.h>
>+#    include <windows.h>
>+
>+#    if defined(WINAPI_FAMILY) && (WINAPI_FAMILY != WINAPI_FAMILY_DESKTOP_APP)
>+#        define ANGLE_ENABLE_WINDOWS_STORE 1
>+#    endif
>+
>+#    if defined(ANGLE_ENABLE_D3D9)
>+#        include <d3d9.h>
>+#        include <d3dcompiler.h>
>+#    endif
> 
>-#   if defined(ANGLE_ENABLE_WINDOWS_STORE)
>-#       include <dxgi1_3.h>
>-#       if defined(_DEBUG)
>-#           include <DXProgrammableCapture.h>
>-#           include <dxgidebug.h>
>-#       endif
>-#   endif
>+// Include D3D11 headers when OpenGL is enabled on Windows for interop extensions.
>+#    if defined(ANGLE_ENABLE_D3D11) || defined(ANGLE_ENABLE_OPENGL)
>+#        include <d3d10_1.h>
>+#        include <d3d11.h>
>+#        include <d3d11_3.h>
>+#        include <d3dcompiler.h>
>+#        include <dxgi.h>
>+#        include <dxgi1_2.h>
>+#    endif
> 
>-#   undef near
>-#   undef far
>+#    if defined(ANGLE_ENABLE_D3D9) || defined(ANGLE_ENABLE_D3D11)
>+#        include <wrl.h>
>+#    endif
>+
>+#    if defined(ANGLE_ENABLE_WINDOWS_STORE)
>+#        include <dxgi1_3.h>
>+#        if defined(_DEBUG)
>+#            include <DXProgrammableCapture.h>
>+#            include <dxgidebug.h>
>+#        endif
>+#    endif
>+
>+#    undef near
>+#    undef far
> #endif
> 
>-#if defined(_MSC_VER) && !defined(_M_ARM)
>-#include <intrin.h>
>-#define ANGLE_USE_SSE
>+#if defined(_MSC_VER) && !defined(_M_ARM) && !defined(_M_ARM64)
>+#    include <intrin.h>
>+#    define ANGLE_USE_SSE
> #elif defined(__GNUC__) && (defined(__x86_64__) || defined(__i386__))
>-#include <x86intrin.h>
>-#define ANGLE_USE_SSE
>+#    include <x86intrin.h>
>+#    define ANGLE_USE_SSE
> #endif
> 
> // Mips and arm devices need to include stddef for size_t.
> #if defined(__mips__) || defined(__arm__) || defined(__aarch64__)
>-#include <stddef.h>
>+#    include <stddef.h>
> #endif
> 
> // The MemoryBarrier function name collides with a macro under Windows
> // We will undef the macro so that the function name does not get replaced
> #undef MemoryBarrier
> 
>-#endif // COMMON_PLATFORM_H_
>+// Macro for hinting that an expression is likely to be true/false.
>+#if !defined(ANGLE_LIKELY) || !defined(ANGLE_UNLIKELY)
>+#    if defined(__GNUC__) || defined(__clang__)
>+#        define ANGLE_LIKELY(x) __builtin_expect(!!(x), 1)
>+#        define ANGLE_UNLIKELY(x) __builtin_expect(!!(x), 0)
>+#    else
>+#        define ANGLE_LIKELY(x) (x)
>+#        define ANGLE_UNLIKELY(x) (x)
>+#    endif  // defined(__GNUC__) || defined(__clang__)
>+#endif      // !defined(ANGLE_LIKELY) || !defined(ANGLE_UNLIKELY)
>+
>+#endif  // COMMON_PLATFORM_H_
>diff --git a/Source/ThirdParty/ANGLE/src/common/string_utils.cpp b/Source/ThirdParty/ANGLE/src/common/string_utils.cpp
>index 26f384bb2ae..6c0d4b69495 100644
>--- a/Source/ThirdParty/ANGLE/src/common/string_utils.cpp
>+++ b/Source/ThirdParty/ANGLE/src/common/string_utils.cpp
>@@ -9,9 +9,9 @@
> 
> #include "string_utils.h"
> 
>-#include <algorithm>
> #include <stdlib.h>
> #include <string.h>
>+#include <algorithm>
> #include <fstream>
> #include <sstream>
> 
>@@ -64,8 +64,7 @@ std::vector<std::string> SplitString(const std::string &input,
>     return result;
> }
> 
>-void SplitStringAlongWhitespace(const std::string &input,
>-                                std::vector<std::string> *tokensOut)
>+void SplitStringAlongWhitespace(const std::string &input, std::vector<std::string> *tokensOut)
> {
> 
>     std::istringstream stream(input);
>@@ -142,7 +141,8 @@ Optional<std::vector<wchar_t>> WidenString(size_t length, const char *cString)
> {
>     std::vector<wchar_t> wcstring(length + 1);
> #if !defined(ANGLE_PLATFORM_WINDOWS)
>-    size_t written = mbstowcs(wcstring.data(), cString, length + 1);
>+    mbstate_t mbstate = {};
>+    size_t written    = mbsrtowcs(wcstring.data(), &cString, length + 1, &mbstate);
>     if (written == 0)
>     {
>         return Optional<std::vector<wchar_t>>::Invalid();
>diff --git a/Source/ThirdParty/ANGLE/src/common/string_utils.h b/Source/ThirdParty/ANGLE/src/common/string_utils.h
>index 07bf1ff81a1..bb1c92993c6 100644
>--- a/Source/ThirdParty/ANGLE/src/common/string_utils.h
>+++ b/Source/ThirdParty/ANGLE/src/common/string_utils.h
>@@ -37,8 +37,7 @@ std::vector<std::string> SplitString(const std::string &input,
>                                      WhitespaceHandling whitespace,
>                                      SplitResult resultType);
> 
>-void SplitStringAlongWhitespace(const std::string &input,
>-                                std::vector<std::string> *tokensOut);
>+void SplitStringAlongWhitespace(const std::string &input, std::vector<std::string> *tokensOut);
> 
> std::string TrimString(const std::string &input, const std::string &trimChars);
> 
>@@ -70,7 +69,7 @@ bool BeginsWith(const std::string &str, const std::string &prefix, const size_t
> // Check if the string str ends with the given suffix.
> // Suffix may not be NUL and needs to be NULL terminated.
> // The comparison is case sensitive.
>-bool EndsWith(const std::string& str, const char* suffix);
>+bool EndsWith(const std::string &str, const char *suffix);
> 
> // Convert to lower-case.
> void ToLower(std::string *str);
>@@ -82,4 +81,4 @@ bool ReplaceSubstring(std::string *str,
> 
> }  // namespace angle
> 
>-#endif // LIBANGLE_STRING_UTILS_H_
>+#endif  // LIBANGLE_STRING_UTILS_H_
>diff --git a/Source/ThirdParty/ANGLE/src/common/system_utils.cpp b/Source/ThirdParty/ANGLE/src/common/system_utils.cpp
>new file mode 100644
>index 00000000000..9121dfb1c27
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/common/system_utils.cpp
>@@ -0,0 +1,33 @@
>+//
>+// Copyright 2018 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+
>+// system_utils.cpp: Implementation of common functions
>+
>+#include "system_utils.h"
>+
>+namespace angle
>+{
>+
>+bool PrependPathToEnvironmentVar(const char *variableName, const char *path)
>+{
>+    std::string oldValue = GetEnvironmentVar(variableName);
>+    const char *newValue = nullptr;
>+    std::string buf;
>+    if (oldValue.empty())
>+    {
>+        newValue = path;
>+    }
>+    else
>+    {
>+        buf = path;
>+        buf += GetPathSeparator();
>+        buf += oldValue;
>+        newValue = buf.c_str();
>+    }
>+    return SetEnvironmentVar(variableName, newValue);
>+}
>+
>+}  // namespace angle
>diff --git a/Source/ThirdParty/ANGLE/src/common/system_utils.h b/Source/ThirdParty/ANGLE/src/common/system_utils.h
>index d61faa53fd6..2c760417fd0 100644
>--- a/Source/ThirdParty/ANGLE/src/common/system_utils.h
>+++ b/Source/ThirdParty/ANGLE/src/common/system_utils.h
>@@ -9,19 +9,46 @@
> #ifndef COMMON_SYSTEM_UTILS_H_
> #define COMMON_SYSTEM_UTILS_H_
> 
>-#include "common/angleutils.h"
> #include "common/Optional.h"
>+#include "common/angleutils.h"
> 
> namespace angle
> {
>-
>-const char *GetExecutablePath();
>-const char *GetExecutableDirectory();
>+std::string GetExecutablePath();
>+std::string GetExecutableDirectory();
> const char *GetSharedLibraryExtension();
> Optional<std::string> GetCWD();
> bool SetCWD(const char *dirName);
> bool SetEnvironmentVar(const char *variableName, const char *value);
>+bool UnsetEnvironmentVar(const char *variableName);
>+std::string GetEnvironmentVar(const char *variableName);
>+const char *GetPathSeparator();
>+bool PrependPathToEnvironmentVar(const char *variableName, const char *path);
>+
>+// Run an application and get the output.  Gets a nullptr-terminated set of args to execute the
>+// application with, and returns the stdout and stderr outputs as well as the exit code.
>+//
>+// Returns false if it fails to actually execute the application.
>+bool RunApp(const std::vector<const char *> &args,
>+            std::string *stdoutOut,
>+            std::string *stderrOut,
>+            int *exitCodeOut);
>+
>+class Library : angle::NonCopyable
>+{
>+  public:
>+    virtual ~Library() {}
>+    virtual void *getSymbol(const char *symbolName) = 0;
>+    virtual void *getNative() const                 = 0;
>+
>+    template <typename FuncT>
>+    void getAs(const char *symbolName, FuncT *funcOut)
>+    {
>+        *funcOut = reinterpret_cast<FuncT>(getSymbol(symbolName));
>+    }
>+};
> 
>+Library *OpenSharedLibrary(const char *libraryName);
> }  // namespace angle
> 
> #endif  // COMMON_SYSTEM_UTILS_H_
>diff --git a/Source/ThirdParty/ANGLE/src/common/system_utils_linux.cpp b/Source/ThirdParty/ANGLE/src/common/system_utils_linux.cpp
>index 851f9897f3f..f7ea49fc4d3 100644
>--- a/Source/ThirdParty/ANGLE/src/common/system_utils_linux.cpp
>+++ b/Source/ThirdParty/ANGLE/src/common/system_utils_linux.cpp
>@@ -17,11 +17,7 @@
> 
> namespace angle
> {
>-
>-namespace
>-{
>-
>-std::string GetExecutablePathImpl()
>+std::string GetExecutablePath()
> {
>     // We cannot use lstat to get the size of /proc/self/exe as it always returns 0
>     // so we just use a big buffer and hope the path fits in it.
>@@ -37,53 +33,15 @@ std::string GetExecutablePathImpl()
>     return path;
> }
> 
>-std::string GetExecutableDirectoryImpl()
>+std::string GetExecutableDirectory()
> {
>     std::string executablePath = GetExecutablePath();
>     size_t lastPathSepLoc      = executablePath.find_last_of("/");
>     return (lastPathSepLoc != std::string::npos) ? executablePath.substr(0, lastPathSepLoc) : "";
> }
> 
>-}  // anonymous namespace
>-
>-const char *GetExecutablePath()
>-{
>-    // TODO(jmadill): Make global static string thread-safe.
>-    const static std::string exePath = GetExecutablePathImpl();
>-    return exePath.c_str();
>-}
>-
>-const char *GetExecutableDirectory()
>-{
>-    // TODO(jmadill): Make global static string thread-safe.
>-    const static std::string exeDir = GetExecutableDirectoryImpl();
>-    return exeDir.c_str();
>-}
>-
> const char *GetSharedLibraryExtension()
> {
>     return "so";
> }
>-
>-Optional<std::string> GetCWD()
>-{
>-    std::array<char, 4096> pathBuf;
>-    char *result = getcwd(pathBuf.data(), pathBuf.size());
>-    if (result == nullptr)
>-    {
>-        return Optional<std::string>::Invalid();
>-    }
>-    return std::string(pathBuf.data());
>-}
>-
>-bool SetCWD(const char *dirName)
>-{
>-    return (chdir(dirName) == 0);
>-}
>-
>-bool SetEnvironmentVar(const char *variableName, const char *value)
>-{
>-    return (setenv(variableName, value, 1) == 0);
>-}
>-
> }  // namespace angle
>diff --git a/Source/ThirdParty/ANGLE/src/common/system_utils_mac.cpp b/Source/ThirdParty/ANGLE/src/common/system_utils_mac.cpp
>index 9d69fbcd304..f3d9891ebbc 100644
>--- a/Source/ThirdParty/ANGLE/src/common/system_utils_mac.cpp
>+++ b/Source/ThirdParty/ANGLE/src/common/system_utils_mac.cpp
>@@ -10,19 +10,15 @@
> 
> #include <unistd.h>
> 
>-#include <cstdlib>
> #include <mach-o/dyld.h>
>+#include <cstdlib>
> #include <vector>
> 
> #include <array>
> 
> namespace angle
> {
>-
>-namespace
>-{
>-
>-std::string GetExecutablePathImpl()
>+std::string GetExecutablePath()
> {
>     std::string result;
> 
>@@ -42,53 +38,15 @@ std::string GetExecutablePathImpl()
>     return buffer.data();
> }
> 
>-std::string GetExecutableDirectoryImpl()
>+std::string GetExecutableDirectory()
> {
>     std::string executablePath = GetExecutablePath();
>     size_t lastPathSepLoc      = executablePath.find_last_of("/");
>     return (lastPathSepLoc != std::string::npos) ? executablePath.substr(0, lastPathSepLoc) : "";
> }
> 
>-}  // anonymous namespace
>-
>-const char *GetExecutablePath()
>-{
>-    // TODO(jmadill): Make global static string thread-safe.
>-    const static std::string exePath = GetExecutablePathImpl();
>-    return exePath.c_str();
>-}
>-
>-const char *GetExecutableDirectory()
>-{
>-    // TODO(jmadill): Make global static string thread-safe.
>-    const static std::string exeDir = GetExecutableDirectoryImpl();
>-    return exeDir.c_str();
>-}
>-
> const char *GetSharedLibraryExtension()
> {
>     return "dylib";
> }
>-
>-Optional<std::string> GetCWD()
>-{
>-    std::array<char, 4096> pathBuf;
>-    char *result = getcwd(pathBuf.data(), pathBuf.size());
>-    if (result == nullptr)
>-    {
>-        return Optional<std::string>::Invalid();
>-    }
>-    return std::string(pathBuf.data());
>-}
>-
>-bool SetCWD(const char *dirName)
>-{
>-    return (chdir(dirName) == 0);
>-}
>-
>-bool SetEnvironmentVar(const char *variableName, const char *value)
>-{
>-    return (setenv(variableName, value, 1) == 0);
>-}
>-
> }  // namespace angle
>diff --git a/Source/ThirdParty/ANGLE/src/common/system_utils_posix.cpp b/Source/ThirdParty/ANGLE/src/common/system_utils_posix.cpp
>new file mode 100644
>index 00000000000..fe7db695a8b
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/common/system_utils_posix.cpp
>@@ -0,0 +1,258 @@
>+//
>+// Copyright 2018 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+
>+// system_utils_posix.cpp: Implementation of POSIX OS-specific functions.
>+
>+#include "system_utils.h"
>+
>+#include <array>
>+
>+#include <dlfcn.h>
>+#include <sys/types.h>
>+#include <sys/wait.h>
>+#include <unistd.h>
>+
>+// On BSDs (including mac), environ is not declared anywhere:
>+// https://stackoverflow.com/a/31347357/912144
>+extern char **environ;
>+
>+namespace angle
>+{
>+
>+namespace
>+{
>+struct ScopedPipe
>+{
>+    ~ScopedPipe()
>+    {
>+        closeEndPoint(0);
>+        closeEndPoint(1);
>+    }
>+    void closeEndPoint(int index)
>+    {
>+        if (fds[index] >= 0)
>+        {
>+            close(fds[index]);
>+            fds[index] = -1;
>+        }
>+    }
>+    int fds[2] = {
>+        -1,
>+        -1,
>+    };
>+};
>+
>+void ReadEntireFile(int fd, std::string *out)
>+{
>+    out->clear();
>+
>+    while (true)
>+    {
>+        char buffer[256];
>+        ssize_t bytesRead = read(fd, buffer, sizeof(buffer));
>+
>+        // If interrupted, retry.
>+        if (bytesRead < 0 && errno == EINTR)
>+        {
>+            continue;
>+        }
>+
>+        // If failed, or nothing to read, we are done.
>+        if (bytesRead <= 0)
>+        {
>+            break;
>+        }
>+
>+        out->append(buffer, bytesRead);
>+    }
>+}
>+}  // anonymous namespace
>+
>+Optional<std::string> GetCWD()
>+{
>+    std::array<char, 4096> pathBuf;
>+    char *result = getcwd(pathBuf.data(), pathBuf.size());
>+    if (result == nullptr)
>+    {
>+        return Optional<std::string>::Invalid();
>+    }
>+    return std::string(pathBuf.data());
>+}
>+
>+bool SetCWD(const char *dirName)
>+{
>+    return (chdir(dirName) == 0);
>+}
>+
>+bool UnsetEnvironmentVar(const char *variableName)
>+{
>+    return (unsetenv(variableName) == 0);
>+}
>+
>+bool SetEnvironmentVar(const char *variableName, const char *value)
>+{
>+    return (setenv(variableName, value, 1) == 0);
>+}
>+
>+std::string GetEnvironmentVar(const char *variableName)
>+{
>+    const char *value = getenv(variableName);
>+    return (value == nullptr ? std::string() : std::string(value));
>+}
>+
>+const char *GetPathSeparator()
>+{
>+    return ":";
>+}
>+
>+bool RunApp(const std::vector<const char *> &args,
>+            std::string *stdoutOut,
>+            std::string *stderrOut,
>+            int *exitCodeOut)
>+{
>+    if (args.size() == 0 || args.back() != nullptr)
>+    {
>+        return false;
>+    }
>+
>+    ScopedPipe stdoutPipe;
>+    ScopedPipe stderrPipe;
>+
>+    // Create pipes for stdout and stderr.
>+    if (stdoutOut && pipe(stdoutPipe.fds) != 0)
>+    {
>+        return false;
>+    }
>+    if (stderrOut && pipe(stderrPipe.fds) != 0)
>+    {
>+        return false;
>+    }
>+
>+    pid_t pid = fork();
>+    if (pid < 0)
>+    {
>+        return false;
>+    }
>+
>+    if (pid == 0)
>+    {
>+        // Child.  Execute the application.
>+
>+        // Redirect stdout and stderr to the pipe fds.
>+        if (stdoutOut)
>+        {
>+            if (dup2(stdoutPipe.fds[1], STDOUT_FILENO) < 0)
>+            {
>+                _exit(errno);
>+            }
>+        }
>+        if (stderrOut)
>+        {
>+            if (dup2(stderrPipe.fds[1], STDERR_FILENO) < 0)
>+            {
>+                _exit(errno);
>+            }
>+        }
>+
>+        // Execute the application, which doesn't return unless failed.  Note: execve takes argv as
>+        // `char * const *` for historical reasons.  It is safe to const_cast it:
>+        //
>+        // http://pubs.opengroup.org/onlinepubs/9699919799/functions/exec.html
>+        //
>+        // > The statement about argv[] and envp[] being constants is included to make explicit to
>+        // future writers of language bindings that these objects are completely constant. Due to a
>+        // limitation of the ISO C standard, it is not possible to state that idea in standard C.
>+        // Specifying two levels of const- qualification for the argv[] and envp[] parameters for
>+        // the exec functions may seem to be the natural choice, given that these functions do not
>+        // modify either the array of pointers or the characters to which the function points, but
>+        // this would disallow existing correct code. Instead, only the array of pointers is noted
>+        // as constant.
>+        execve(args[0], const_cast<char *const *>(args.data()), environ);
>+        _exit(errno);
>+    }
>+
>+    // Parent.  Read child output from the pipes and clean it up.
>+
>+    // Close the write end of the pipes, so EOF can be generated when child exits.
>+    stdoutPipe.closeEndPoint(1);
>+    stderrPipe.closeEndPoint(1);
>+
>+    // Read back the output of the child.
>+    if (stdoutOut)
>+    {
>+        ReadEntireFile(stdoutPipe.fds[0], stdoutOut);
>+    }
>+    if (stderrOut)
>+    {
>+        ReadEntireFile(stderrPipe.fds[0], stderrOut);
>+    }
>+
>+    // Cleanup the child.
>+    int status = 0;
>+    do
>+    {
>+        pid_t changedPid = waitpid(pid, &status, 0);
>+        if (changedPid < 0 && errno == EINTR)
>+        {
>+            continue;
>+        }
>+        if (changedPid < 0)
>+        {
>+            return false;
>+        }
>+    } while (!WIFEXITED(status) && !WIFSIGNALED(status));
>+
>+    // Retrieve the error code.
>+    if (exitCodeOut)
>+    {
>+        *exitCodeOut = WEXITSTATUS(status);
>+    }
>+
>+    return true;
>+}
>+
>+class PosixLibrary : public Library
>+{
>+  public:
>+    PosixLibrary(const char *libraryName)
>+    {
>+        char buffer[1000];
>+        int ret = snprintf(buffer, 1000, "%s.%s", libraryName, GetSharedLibraryExtension());
>+        if (ret > 0 && ret < 1000)
>+        {
>+            mModule = dlopen(buffer, RTLD_NOW);
>+        }
>+    }
>+
>+    ~PosixLibrary() override
>+    {
>+        if (mModule)
>+        {
>+            dlclose(mModule);
>+        }
>+    }
>+
>+    void *getSymbol(const char *symbolName) override
>+    {
>+        if (!mModule)
>+        {
>+            return nullptr;
>+        }
>+
>+        return dlsym(mModule, symbolName);
>+    }
>+
>+    void *getNative() const override { return mModule; }
>+
>+  private:
>+    void *mModule = nullptr;
>+};
>+
>+Library *OpenSharedLibrary(const char *libraryName)
>+{
>+    return new PosixLibrary(libraryName);
>+}
>+}  // namespace angle
>diff --git a/Source/ThirdParty/ANGLE/src/common/system_utils_unittest.cpp b/Source/ThirdParty/ANGLE/src/common/system_utils_unittest.cpp
>new file mode 100644
>index 00000000000..7a5948a4936
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/common/system_utils_unittest.cpp
>@@ -0,0 +1,142 @@
>+//
>+// Copyright 2019 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+
>+// system_utils_unittest.cpp: Unit tests for ANGLE's system utility functions
>+
>+#include "gmock/gmock.h"
>+#include "gtest/gtest.h"
>+
>+#include "common/system_utils.h"
>+#include "common/system_utils_unittest_helper.h"
>+
>+using namespace angle;
>+
>+namespace
>+{
>+#if defined(ANGLE_PLATFORM_WINDOWS)
>+constexpr char kRunAppHelperExecutable[] = "angle_unittests_helper.exe";
>+#else
>+constexpr char kRunAppHelperExecutable[] = "angle_unittests_helper";
>+#endif
>+
>+// Transforms various line endings into C/Unix line endings:
>+//
>+// - A\nB -> A\nB
>+// - A\rB -> A\nB
>+// - A\r\nB -> A\nB
>+std::string NormalizeNewLines(const std::string &str)
>+{
>+    std::string result;
>+
>+    for (size_t i = 0; i < str.size(); ++i)
>+    {
>+        if (str[i] == '\r')
>+        {
>+            if (i + 1 < str.size() && str[i + 1] == '\n')
>+            {
>+                ++i;
>+            }
>+            result += '\n';
>+        }
>+        else
>+        {
>+            result += str[i];
>+        }
>+    }
>+
>+    return result;
>+}
>+
>+// Test getting the executable path
>+TEST(SystemUtils, ExecutablePath)
>+{
>+#if defined(ANGLE_PLATFORM_FUCHSIA)
>+    // TODO: fuchsia support. http://anglebug.com/3161
>+    return;
>+#endif
>+
>+    std::string executablePath = GetExecutablePath();
>+    EXPECT_NE("", executablePath);
>+}
>+
>+// Test getting the executable directory
>+TEST(SystemUtils, ExecutableDir)
>+{
>+#if defined(ANGLE_PLATFORM_FUCHSIA)
>+    // TODO: fuchsia support. http://anglebug.com/3161
>+    return;
>+#endif
>+
>+    std::string executableDir = GetExecutableDirectory();
>+    EXPECT_NE("", executableDir);
>+
>+    std::string executablePath = GetExecutablePath();
>+    EXPECT_LT(executableDir.size(), executablePath.size());
>+    EXPECT_EQ(0, strncmp(executableDir.c_str(), executablePath.c_str(), executableDir.size()));
>+}
>+
>+// Test setting environment variables
>+TEST(SystemUtils, Environment)
>+{
>+    constexpr char kEnvVarName[]  = "UNITTEST_ENV_VARIABLE";
>+    constexpr char kEnvVarValue[] = "The quick brown fox jumps over the lazy dog";
>+
>+    bool setEnvDone = SetEnvironmentVar(kEnvVarName, kEnvVarValue);
>+    EXPECT_TRUE(setEnvDone);
>+
>+    std::string readback = GetEnvironmentVar(kEnvVarName);
>+    EXPECT_EQ(kEnvVarValue, readback);
>+
>+    bool unsetEnvDone = UnsetEnvironmentVar(kEnvVarName);
>+    EXPECT_TRUE(unsetEnvDone);
>+
>+    readback = GetEnvironmentVar(kEnvVarName);
>+    EXPECT_EQ("", readback);
>+}
>+
>+// Test running an external application and receiving its output
>+TEST(SystemUtils, RunApp)
>+{
>+#if defined(ANGLE_PLATFORM_ANDROID)
>+    // TODO: android support. http://anglebug.com/3125
>+    return;
>+#endif
>+
>+#if defined(ANGLE_PLATFORM_FUCHSIA)
>+    // TODO: fuchsia support. http://anglebug.com/3161
>+    return;
>+#endif
>+
>+    std::string executablePath = GetExecutableDirectory();
>+    EXPECT_NE(executablePath, "");
>+    executablePath += "/";
>+    executablePath += kRunAppHelperExecutable;
>+
>+    std::vector<const char *> args = {executablePath.c_str(), kRunAppTestArg1, kRunAppTestArg2,
>+                                      nullptr};
>+
>+    std::string stdoutOutput;
>+    std::string stderrOutput;
>+    int exitCode = EXIT_FAILURE;
>+
>+    // Test that the application can be executed.
>+    bool ranApp = RunApp(args, &stdoutOutput, &stderrOutput, &exitCode);
>+    EXPECT_TRUE(ranApp);
>+    EXPECT_EQ(kRunAppTestStdout, NormalizeNewLines(stdoutOutput));
>+    EXPECT_EQ(kRunAppTestStderr, NormalizeNewLines(stderrOutput));
>+    EXPECT_EQ(EXIT_SUCCESS, exitCode);
>+
>+    // Test that environment variables reach the cild.
>+    bool setEnvDone = SetEnvironmentVar(kRunAppTestEnvVarName, kRunAppTestEnvVarValue);
>+    EXPECT_TRUE(setEnvDone);
>+
>+    ranApp = RunApp(args, &stdoutOutput, &stderrOutput, &exitCode);
>+    EXPECT_TRUE(ranApp);
>+    EXPECT_EQ("", stdoutOutput);
>+    EXPECT_EQ(kRunAppTestEnvVarValue, NormalizeNewLines(stderrOutput));
>+    EXPECT_EQ(EXIT_SUCCESS, exitCode);
>+}
>+
>+}  // anonymous namespace
>diff --git a/Source/ThirdParty/ANGLE/src/common/system_utils_unittest_helper.cpp b/Source/ThirdParty/ANGLE/src/common/system_utils_unittest_helper.cpp
>new file mode 100644
>index 00000000000..f1bfa69b48c
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/common/system_utils_unittest_helper.cpp
>@@ -0,0 +1,33 @@
>+//
>+// Copyright 2019 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+
>+// system_utils_unittest_helper.cpp: Helper to the SystemUtils.RunApp unittest
>+
>+#include "common/system_utils_unittest_helper.h"
>+#include <string.h>
>+#include "common/system_utils.h"
>+
>+int main(int argc, char **argv)
>+{
>+    if (argc != 3 || strcmp(argv[1], kRunAppTestArg1) != 0 || strcmp(argv[2], kRunAppTestArg2) != 0)
>+    {
>+        fprintf(stderr, "Expected command line:\n%s %s %s\n", argv[0], kRunAppTestArg1,
>+                kRunAppTestArg2);
>+        return EXIT_FAILURE;
>+    }
>+
>+    std::string env = angle::GetEnvironmentVar(kRunAppTestEnvVarName);
>+    if (env == "")
>+    {
>+        printf("%s", kRunAppTestStdout);
>+        fprintf(stderr, "%s", kRunAppTestStderr);
>+    }
>+    else
>+    {
>+        fprintf(stderr, "%s", env.c_str());
>+    }
>+
>+    return EXIT_SUCCESS;
>+}
>diff --git a/Source/ThirdParty/ANGLE/src/common/system_utils_unittest_helper.h b/Source/ThirdParty/ANGLE/src/common/system_utils_unittest_helper.h
>new file mode 100644
>index 00000000000..660bde1afe7
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/common/system_utils_unittest_helper.h
>@@ -0,0 +1,21 @@
>+//
>+// Copyright 2019 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+
>+// system_utils_unittest_helper.h: Constants used by the SystemUtils.RunApp unittest
>+
>+#ifndef COMMON_SYSTEM_UTILS_UNITTEST_HELPER_H_
>+#define COMMON_SYSTEM_UTILS_UNITTEST_HELPER_H_
>+
>+namespace
>+{
>+constexpr char kRunAppTestEnvVarName[]  = "RUN_APP_TEST_ENV";
>+constexpr char kRunAppTestEnvVarValue[] = "RunAppTest environment variable value\n";
>+constexpr char kRunAppTestStdout[]      = "RunAppTest stdout test\n";
>+constexpr char kRunAppTestStderr[] = "RunAppTest stderr test\n  .. that expands multiple lines\n";
>+constexpr char kRunAppTestArg1[]   = "--expected-arg1";
>+constexpr char kRunAppTestArg2[]   = "expected_arg2";
>+}  // anonymous namespace
>+
>+#endif  // COMMON_SYSTEM_UTILS_UNITTEST_HELPER_H_
>diff --git a/Source/ThirdParty/ANGLE/src/common/system_utils_win.cpp b/Source/ThirdParty/ANGLE/src/common/system_utils_win.cpp
>index 8e53d3403d6..816d1131246 100644
>--- a/Source/ThirdParty/ANGLE/src/common/system_utils_win.cpp
>+++ b/Source/ThirdParty/ANGLE/src/common/system_utils_win.cpp
>@@ -15,11 +15,57 @@
> 
> namespace angle
> {
>-
> namespace
> {
>+struct ScopedPipe
>+{
>+    ~ScopedPipe()
>+    {
>+        closeReadHandle();
>+        closeWriteHandle();
>+    }
>+    void closeReadHandle()
>+    {
>+        if (readHandle)
>+        {
>+            CloseHandle(readHandle);
>+            readHandle = nullptr;
>+        }
>+    }
>+    void closeWriteHandle()
>+    {
>+        if (writeHandle)
>+        {
>+            CloseHandle(writeHandle);
>+            writeHandle = nullptr;
>+        }
>+    }
>+    HANDLE readHandle  = nullptr;
>+    HANDLE writeHandle = nullptr;
>+};
>+
>+void ReadEntireFile(HANDLE handle, std::string *out)
>+{
>+    out->clear();
>+
>+    while (true)
>+    {
>+        char buffer[256];
>+        DWORD bytesRead;
> 
>-std::string GetExecutablePathImpl()
>+        BOOL success = ReadFile(handle, buffer, sizeof(buffer), &bytesRead, nullptr);
>+
>+        if (!success || bytesRead == 0)
>+        {
>+            break;
>+        }
>+
>+        out->append(buffer, bytesRead);
>+    }
>+}
>+}  // anonymous namespace
>+
>+std::string GetExecutablePath()
> {
>     std::array<char, MAX_PATH> executableFileBuf;
>     DWORD executablePathLen = GetModuleFileNameA(nullptr, executableFileBuf.data(),
>@@ -27,29 +73,13 @@ std::string GetExecutablePathImpl()
>     return (executablePathLen > 0 ? std::string(executableFileBuf.data()) : "");
> }
> 
>-std::string GetExecutableDirectoryImpl()
>+std::string GetExecutableDirectory()
> {
>     std::string executablePath = GetExecutablePath();
>     size_t lastPathSepLoc      = executablePath.find_last_of("\\/");
>     return (lastPathSepLoc != std::string::npos) ? executablePath.substr(0, lastPathSepLoc) : "";
> }
> 
>-}  // anonymous namespace
>-
>-const char *GetExecutablePath()
>-{
>-    // TODO(jmadill): Make global static string thread-safe.
>-    const static std::string exePath = GetExecutablePathImpl();
>-    return exePath.c_str();
>-}
>-
>-const char *GetExecutableDirectory()
>-{
>-    // TODO(jmadill): Make global static string thread-safe.
>-    const static std::string exeDir = GetExecutableDirectoryImpl();
>-    return exeDir.c_str();
>-}
>-
> const char *GetSharedLibraryExtension()
> {
>     return "dll";
>@@ -71,9 +101,182 @@ bool SetCWD(const char *dirName)
>     return (SetCurrentDirectoryA(dirName) == TRUE);
> }
> 
>+bool UnsetEnvironmentVar(const char *variableName)
>+{
>+    return (SetEnvironmentVariableA(variableName, nullptr) == TRUE);
>+}
>+
> bool SetEnvironmentVar(const char *variableName, const char *value)
> {
>     return (SetEnvironmentVariableA(variableName, value) == TRUE);
> }
> 
>+std::string GetEnvironmentVar(const char *variableName)
>+{
>+    std::array<char, MAX_PATH> oldValue;
>+    DWORD result =
>+        GetEnvironmentVariableA(variableName, oldValue.data(), static_cast<DWORD>(oldValue.size()));
>+    if (result == 0)
>+    {
>+        return std::string();
>+    }
>+    else
>+    {
>+        return std::string(oldValue.data());
>+    }
>+}
>+
>+const char *GetPathSeparator()
>+{
>+    return ";";
>+}
>+
>+bool RunApp(const std::vector<const char *> &args,
>+            std::string *stdoutOut,
>+            std::string *stderrOut,
>+            int *exitCodeOut)
>+{
>+    ScopedPipe stdoutPipe;
>+    ScopedPipe stderrPipe;
>+
>+    SECURITY_ATTRIBUTES sa_attr;
>+    // Set the bInheritHandle flag so pipe handles are inherited.
>+    sa_attr.nLength              = sizeof(SECURITY_ATTRIBUTES);
>+    sa_attr.bInheritHandle       = TRUE;
>+    sa_attr.lpSecurityDescriptor = nullptr;
>+
>+    // Create pipes for stdout and stderr.  Ensure the read handles to the pipes are not inherited.
>+    if (stdoutOut && !CreatePipe(&stdoutPipe.readHandle, &stdoutPipe.writeHandle, &sa_attr, 0) &&
>+        !SetHandleInformation(stdoutPipe.readHandle, HANDLE_FLAG_INHERIT, 0))
>+    {
>+        return false;
>+    }
>+    if (stderrOut && !CreatePipe(&stderrPipe.readHandle, &stderrPipe.writeHandle, &sa_attr, 0) &&
>+        !SetHandleInformation(stderrPipe.readHandle, HANDLE_FLAG_INHERIT, 0))
>+    {
>+        return false;
>+    }
>+
>+    // Concat the nicely separated arguments into one string so the application has to reparse it.
>+    // We don't support quotation and spaces in arguments currently.
>+    std::vector<char> commandLineString;
>+    for (const char *arg : args)
>+    {
>+        if (arg)
>+        {
>+            if (!commandLineString.empty())
>+            {
>+                commandLineString.push_back(' ');
>+            }
>+            commandLineString.insert(commandLineString.end(), arg, arg + strlen(arg));
>+        }
>+    }
>+    commandLineString.push_back('\0');
>+
>+    STARTUPINFOA startInfo = {};
>+
>+    startInfo.cb        = sizeof(STARTUPINFOA);
>+    startInfo.hStdInput = GetStdHandle(STD_INPUT_HANDLE);
>+    if (stdoutOut)
>+    {
>+        startInfo.hStdOutput = stdoutPipe.writeHandle;
>+    }
>+    else
>+    {
>+        startInfo.hStdError = GetStdHandle(STD_OUTPUT_HANDLE);
>+    }
>+    if (stderrOut)
>+    {
>+        startInfo.hStdError = stderrPipe.writeHandle;
>+    }
>+    else
>+    {
>+        startInfo.hStdError = GetStdHandle(STD_ERROR_HANDLE);
>+    }
>+    startInfo.dwFlags |= STARTF_USESTDHANDLES;
>+
>+    // Create the child process.
>+    PROCESS_INFORMATION processInfo = {};
>+    if (!CreateProcessA(nullptr, commandLineString.data(), nullptr, nullptr,
>+                        TRUE,  // Handles are inherited.
>+                        0, nullptr, nullptr, &startInfo, &processInfo))
>+    {
>+        return false;
>+    }
>+
>+    // Close the write end of the pipes, so EOF can be generated when child exits.
>+    stdoutPipe.closeWriteHandle();
>+    stderrPipe.closeWriteHandle();
>+
>+    // Read back the output of the child.
>+    if (stdoutOut)
>+    {
>+        ReadEntireFile(stdoutPipe.readHandle, stdoutOut);
>+    }
>+    if (stderrOut)
>+    {
>+        ReadEntireFile(stderrPipe.readHandle, stderrOut);
>+    }
>+
>+    // Cleanup the child.
>+    bool success = WaitForSingleObject(processInfo.hProcess, INFINITE) == WAIT_OBJECT_0;
>+
>+    if (success)
>+    {
>+        DWORD exitCode = 0;
>+        success        = GetExitCodeProcess(processInfo.hProcess, &exitCode);
>+
>+        if (success)
>+        {
>+            *exitCodeOut = static_cast<int>(exitCode);
>+        }
>+    }
>+
>+    CloseHandle(processInfo.hProcess);
>+    CloseHandle(processInfo.hThread);
>+
>+    return success;
>+}
>+
>+class Win32Library : public Library
>+{
>+  public:
>+    Win32Library(const char *libraryName)
>+    {
>+        char buffer[MAX_PATH];
>+        int ret = snprintf(buffer, MAX_PATH, "%s.%s", libraryName, GetSharedLibraryExtension());
>+        if (ret > 0 && ret < MAX_PATH)
>+        {
>+            mModule = LoadLibraryA(buffer);
>+        }
>+    }
>+
>+    ~Win32Library() override
>+    {
>+        if (mModule)
>+        {
>+            FreeLibrary(mModule);
>+        }
>+    }
>+
>+    void *getSymbol(const char *symbolName) override
>+    {
>+        if (!mModule)
>+        {
>+            return nullptr;
>+        }
>+
>+        return reinterpret_cast<void *>(GetProcAddress(mModule, symbolName));
>+    }
>+
>+    void *getNative() const override { return reinterpret_cast<void *>(mModule); }
>+
>+  private:
>+    HMODULE mModule = nullptr;
>+};
>+
>+Library *OpenSharedLibrary(const char *libraryName)
>+{
>+    return new Win32Library(libraryName);
>+}
> }  // namespace angle
>diff --git a/Source/ThirdParty/ANGLE/src/common/third_party/base/anglebase/logging.h b/Source/ThirdParty/ANGLE/src/common/third_party/base/anglebase/logging.h
>index 85ad82b47da..73f81e87f21 100644
>--- a/Source/ThirdParty/ANGLE/src/common/third_party/base/anglebase/logging.h
>+++ b/Source/ThirdParty/ANGLE/src/common/third_party/base/anglebase/logging.h
>@@ -11,16 +11,16 @@
> #include "common/debug.h"
> 
> #ifndef DCHECK
>-#define DCHECK(X) ASSERT(X)
>+#    define DCHECK(X) ASSERT(X)
> #endif
> 
> #ifndef CHECK
>-#define CHECK(X) ASSERT(X)
>+#    define CHECK(X) ASSERT(X)
> #endif
> 
> // Unfortunately ANGLE relies on ASSERT being an empty statement, which these libs don't respect.
> #ifndef NOTREACHED
>-#define NOTREACHED() UNREACHABLE()
>+#    define NOTREACHED() ({ UNREACHABLE(); })
> #endif
> 
> #endif  // ANGLEBASE_LOGGING_H_
>diff --git a/Source/ThirdParty/ANGLE/src/common/third_party/base/anglebase/numerics/safe_conversions.h b/Source/ThirdParty/ANGLE/src/common/third_party/base/anglebase/numerics/safe_conversions.h
>index 43babc31a80..b37a36cd319 100644
>--- a/Source/ThirdParty/ANGLE/src/common/third_party/base/anglebase/numerics/safe_conversions.h
>+++ b/Source/ThirdParty/ANGLE/src/common/third_party/base/anglebase/numerics/safe_conversions.h
>@@ -148,15 +148,13 @@ class StrictNumeric
>     // Copy constructor.
>     template <typename Src>
>     constexpr StrictNumeric(const StrictNumeric<Src> &rhs) : value_(strict_cast<T>(rhs.value_))
>-    {
>-    }
>+    {}
> 
>     // This is not an explicit constructor because we implicitly upgrade regular
>     // numerics to StrictNumerics to make them easier to use.
>     template <typename Src>
>     constexpr StrictNumeric(Src value) : value_(strict_cast<T>(value))
>-    {
>-    }
>+    {}
> 
>     // The numeric cast operator basically handles all the magic.
>     template <typename Dst>
>diff --git a/Source/ThirdParty/ANGLE/src/common/third_party/base/anglebase/numerics/safe_conversions_impl.h b/Source/ThirdParty/ANGLE/src/common/third_party/base/anglebase/numerics/safe_conversions_impl.h
>index 10ed6c7a7f8..67cc4c92940 100644
>--- a/Source/ThirdParty/ANGLE/src/common/third_party/base/anglebase/numerics/safe_conversions_impl.h
>+++ b/Source/ThirdParty/ANGLE/src/common/third_party/base/anglebase/numerics/safe_conversions_impl.h
>@@ -150,12 +150,11 @@ struct NarrowingRange
>     // The following logic avoids warnings where the max function is
>     // instantiated with invalid values for a bit shift (even though
>     // such a function can never be called).
>-    static const int shift = (MaxExponent<Src>::value > MaxExponent<Dst>::value &&
>-                              SrcLimits::digits < DstLimits::digits &&
>-                              SrcLimits::is_iec559 &&
>-                              DstLimits::is_integer)
>-                                 ? (DstLimits::digits - SrcLimits::digits)
>-                                 : 0;
>+    static const int shift =
>+        (MaxExponent<Src>::value > MaxExponent<Dst>::value &&
>+         SrcLimits::digits < DstLimits::digits && SrcLimits::is_iec559 && DstLimits::is_integer)
>+            ? (DstLimits::digits - SrcLimits::digits)
>+            : 0;
> 
>     static constexpr Dst max()
>     {
>diff --git a/Source/ThirdParty/ANGLE/src/common/third_party/base/anglebase/numerics/safe_math.h b/Source/ThirdParty/ANGLE/src/common/third_party/base/anglebase/numerics/safe_math.h
>index 3af4db63f76..457acc0d771 100644
>--- a/Source/ThirdParty/ANGLE/src/common/third_party/base/anglebase/numerics/safe_math.h
>+++ b/Source/ThirdParty/ANGLE/src/common/third_party/base/anglebase/numerics/safe_math.h
>@@ -64,13 +64,11 @@ class CheckedNumeric
>     // Copy constructor.
>     template <typename Src>
>     CheckedNumeric(const CheckedNumeric<Src> &rhs) : state_(rhs.ValueUnsafe(), rhs.validity())
>-    {
>-    }
>+    {}
> 
>     template <typename Src>
>     CheckedNumeric(Src value, RangeConstraint validity) : state_(value, validity)
>-    {
>-    }
>+    {}
> 
>     // This is not an explicit constructor because we implicitly upgrade regular
>     // numerics to CheckedNumerics to make them easier to use.
>@@ -86,8 +84,7 @@ class CheckedNumeric
>     template <typename Src>
>     CheckedNumeric(StrictNumeric<Src> value)  // NOLINT(runtime/explicit)
>         : state_(static_cast<Src>(value))
>-    {
>-    }
>+    {}
> 
>     // IsValid() is the public API to test if a CheckedNumeric is currently valid.
>     bool IsValid() const { return validity() == RANGE_VALID; }
>@@ -247,7 +244,7 @@ class CheckedNumeric
> //  * We skip range checks for floating points.
> //  * We skip range checks for destination integers with sufficient range.
> // TODO(jschuh): extract these out into templates.
>-#define ANGLEBASE_NUMERIC_ARITHMETIC_OPERATORS(NAME, OP, COMPOUND_OP)                                   \
>+#define ANGLEBASE_NUMERIC_ARITHMETIC_OPERATORS(NAME, OP, COMPOUND_OP)                              \
>     /* Binary arithmetic operator for CheckedNumerics of the same type. */                         \
>     template <typename T>                                                                          \
>     CheckedNumeric<typename ArithmeticPromotion<T>::type> operator OP(                             \
>diff --git a/Source/ThirdParty/ANGLE/src/common/third_party/base/anglebase/numerics/safe_math_impl.h b/Source/ThirdParty/ANGLE/src/common/third_party/base/anglebase/numerics/safe_math_impl.h
>index 2831cc6cebc..778fb8daaae 100644
>--- a/Source/ThirdParty/ANGLE/src/common/third_party/base/anglebase/numerics/safe_math_impl.h
>+++ b/Source/ThirdParty/ANGLE/src/common/third_party/base/anglebase/numerics/safe_math_impl.h
>@@ -364,7 +364,7 @@ CheckedUnsignedAbs(T value)
> 
> // These are the floating point stubs that the compiler needs to see. Only the
> // negation operation is ever called.
>-#define ANGLEBASE_FLOAT_ARITHMETIC_STUBS(NAME)                                              \
>+#define ANGLEBASE_FLOAT_ARITHMETIC_STUBS(NAME)                                         \
>     template <typename T>                                                              \
>     typename std::enable_if<std::numeric_limits<T>::is_iec559, T>::type Checked##NAME( \
>         T, T, RangeConstraint *)                                                       \
>@@ -416,8 +416,7 @@ struct GetNumericRepresentation
> 
> template <typename T, NumericRepresentation type = GetNumericRepresentation<T>::value>
> class CheckedNumericState
>-{
>-};
>+{};
> 
> // Integrals require quite a bit of additional housekeeping to manage state.
> template <typename T>
>@@ -446,16 +445,14 @@ class CheckedNumericState<T, NUMERIC_INTEGER>
>     CheckedNumericState(const CheckedNumericState<Src> &rhs)
>         : value_(static_cast<T>(rhs.value())),
>           validity_(GetRangeConstraint(rhs.validity() | DstRangeRelationToSrcRange<T>(rhs.value())))
>-    {
>-    }
>+    {}
> 
>     template <typename Src>
>     explicit CheckedNumericState(
>         Src value,
>         typename std::enable_if<std::numeric_limits<Src>::is_specialized, int>::type = 0)
>         : value_(static_cast<T>(value)), validity_(DstRangeRelationToSrcRange<T>(value))
>-    {
>-    }
>+    {}
> 
>     RangeConstraint validity() const { return validity_; }
>     T value() const { return value_; }
>@@ -508,14 +505,12 @@ class CheckedNumericState<T, NUMERIC_FLOATING>
>         Src value,
>         typename std::enable_if<std::numeric_limits<Src>::is_specialized, int>::type = 0)
>         : value_(static_cast<T>(value))
>-    {
>-    }
>+    {}
> 
>     // Copy constructor.
>     template <typename Src>
>     CheckedNumericState(const CheckedNumericState<Src> &rhs) : value_(static_cast<T>(rhs.value()))
>-    {
>-    }
>+    {}
> 
>     RangeConstraint validity() const
>     {
>diff --git a/Source/ThirdParty/ANGLE/src/common/third_party/smhasher/src/PMurHash.cpp b/Source/ThirdParty/ANGLE/src/common/third_party/smhasher/src/PMurHash.cpp
>index 2d608e97dd2..379e5ce3d5b 100644
>--- a/Source/ThirdParty/ANGLE/src/common/third_party/smhasher/src/PMurHash.cpp
>+++ b/Source/ThirdParty/ANGLE/src/common/third_party/smhasher/src/PMurHash.cpp
>@@ -9,7 +9,7 @@
>  */
> 
> /*-----------------------------------------------------------------------------
>- 
>+
> If you want to understand the MurmurHash algorithm you would be much better
> off reading the original source. Just point your browser at:
> http://code.google.com/p/smhasher/source/browse/trunk/MurmurHash3.cpp
>@@ -47,8 +47,8 @@ on big endian machines, or a byte-by-byte read if the endianess is unknown.
> 
> -----------------------------------------------------------------------------*/
> 
>-
> #include "PMurHash.h"
>+#include <stdint.h>
> 
> /* I used ugly type names in the header to avoid potential conflicts with
>  * application or system typedefs & defines. Since I'm not including any more
>@@ -56,11 +56,11 @@ on big endian machines, or a byte-by-byte read if the endianess is unknown.
> #undef uint32_t
> #define uint32_t MH_UINT32
> #undef uint8_t
>-#define uint8_t  MH_UINT8
>+#define uint8_t MH_UINT8
> 
> /* MSVC warnings we choose to ignore */
> #if defined(_MSC_VER)
>-  #pragma warning(disable: 4127) /* conditional expression is constant */
>+#    pragma warning(disable : 4127) /* conditional expression is constant */
> #endif
> 
> /*-----------------------------------------------------------------------------
>@@ -74,117 +74,109 @@ on big endian machines, or a byte-by-byte read if the endianess is unknown.
>  * ROTL32(x,r)      Rotate x left by r bits
>  */
> 
>-#if !defined(__BYTE_ORDER) && defined(__GNUC__)
>-  #define __BIG_ENDIAN __ORDER_BIG_ENDIAN__
>-  #define __LITTLE_ENDIAN __ORDER_LITTLE_ENDIAN__
>-  #define __BYTE_ORDER __BYTE_ORDER__
>-#endif
>-
> /* Convention is to define __BYTE_ORDER == to one of these values */
> #if !defined(__BIG_ENDIAN)
>-  #define __BIG_ENDIAN 4321
>+#    define __BIG_ENDIAN 4321
> #endif
> #if !defined(__LITTLE_ENDIAN)
>-  #define __LITTLE_ENDIAN 1234
>+#    define __LITTLE_ENDIAN 1234
> #endif
> 
> /* I386 */
> #if defined(_M_IX86) || defined(__i386__) || defined(__i386) || defined(i386)
>-  #if !defined(__BYTE_ORDER)
>-    #define __BYTE_ORDER __LITTLE_ENDIAN
>-  #endif
>-  #define UNALIGNED_SAFE
>+#    define __BYTE_ORDER __LITTLE_ENDIAN
>+#    define UNALIGNED_SAFE
> #endif
> 
> /* gcc 'may' define __LITTLE_ENDIAN__ or __BIG_ENDIAN__ to 1 (Note the trailing __),
>  * or even _LITTLE_ENDIAN or _BIG_ENDIAN (Note the single _ prefix) */
> #if !defined(__BYTE_ORDER)
>-  #if defined(__LITTLE_ENDIAN__) && __LITTLE_ENDIAN__==1 || defined(_LITTLE_ENDIAN) && _LITTLE_ENDIAN==1
>-    #define __BYTE_ORDER __LITTLE_ENDIAN
>-  #elif defined(__BIG_ENDIAN__) && __BIG_ENDIAN__==1 || defined(_BIG_ENDIAN) && _BIG_ENDIAN==1
>-    #define __BYTE_ORDER __BIG_ENDIAN
>-  #endif
>+#    if defined(__LITTLE_ENDIAN__) && __LITTLE_ENDIAN__ == 1 || \
>+        defined(_LITTLE_ENDIAN) && _LITTLE_ENDIAN == 1
>+#        define __BYTE_ORDER __LITTLE_ENDIAN
>+#    elif defined(__BIG_ENDIAN__) && __BIG_ENDIAN__ == 1 || defined(_BIG_ENDIAN) && _BIG_ENDIAN == 1
>+#        define __BYTE_ORDER __BIG_ENDIAN
>+#    endif
> #endif
> 
> /* gcc (usually) defines xEL/EB macros for ARM and MIPS endianess */
> #if !defined(__BYTE_ORDER)
>-  #if defined(__ARMEL__) || defined(__MIPSEL__)
>-    #define __BYTE_ORDER __LITTLE_ENDIAN
>-  #endif
>-  #if defined(__ARMEB__) || defined(__MIPSEB__)
>-    #define __BYTE_ORDER __BIG_ENDIAN
>-  #endif
>+#    if defined(__ARMEL__) || defined(__MIPSEL__)
>+#        define __BYTE_ORDER __LITTLE_ENDIAN
>+#    endif
>+#    if defined(__ARMEB__) || defined(__MIPSEB__)
>+#        define __BYTE_ORDER __BIG_ENDIAN
>+#    endif
> #endif
> 
> /* Now find best way we can to READ_UINT32 */
>-#if __BYTE_ORDER==__LITTLE_ENDIAN
>-  /* CPU endian matches murmurhash algorithm, so read 32-bit word directly */
>-#if defined(__clang__)
>-#pragma clang diagnostic push
>-#pragma clang diagnostic ignored "-Wcast-align"
>-#endif
>-  #define READ_UINT32(ptr)   (*((uint32_t*)(ptr)))
>-#if defined(__clang__)
>-#pragma clang diagnostic pop
>-#endif
>-#elif __BYTE_ORDER==__BIG_ENDIAN
>-  /* TODO: Add additional cases below where a compiler provided bswap32 is available */
>-  #if defined(__GNUC__) && (__GNUC__>4 || (__GNUC__==4 && __GNUC_MINOR__>=3))
>-    #define READ_UINT32(ptr)   (__builtin_bswap32(*((uint32_t*)(ptr))))
>-  #else
>-    /* Without a known fast bswap32 we're just as well off doing this */
>-    #define READ_UINT32(ptr)   (ptr[0]|ptr[1]<<8|ptr[2]<<16|ptr[3]<<24)
>-    #define UNALIGNED_SAFE
>-  #endif
>+#if __BYTE_ORDER == __LITTLE_ENDIAN
>+/* CPU endian matches murmurhash algorithm, so read 32-bit word directly */
>+#    define READ_UINT32(ptr) (*((uint32_t *)(ptr)))
>+#elif __BYTE_ORDER == __BIG_ENDIAN
>+/* TODO: Add additional cases below where a compiler provided bswap32 is available */
>+#    if defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3))
>+#        define READ_UINT32(ptr) (__builtin_bswap32(*((uint32_t *)(ptr))))
>+#    else
>+/* Without a known fast bswap32 we're just as well off doing this */
>+#        define READ_UINT32(ptr) (ptr[0] | ptr[1] << 8 | ptr[2] << 16 | ptr[3] << 24)
>+#        define UNALIGNED_SAFE
>+#    endif
> #else
>-  /* Unknown endianess so last resort is to read individual bytes */
>-  #define READ_UINT32(ptr)   (ptr[0]|ptr[1]<<8|ptr[2]<<16|ptr[3]<<24)
>+/* Unknown endianess so last resort is to read individual bytes */
>+#    define READ_UINT32(ptr) (ptr[0] | ptr[1] << 8 | ptr[2] << 16 | ptr[3] << 24)
> 
>-  /* Since we're not doing word-reads we can skip the messing about with realignment */
>-  #define UNALIGNED_SAFE
>+/* Since we're not doing word-reads we can skip the messing about with realignment */
>+#    define UNALIGNED_SAFE
> #endif
> 
> /* Find best way to ROTL32 */
> #if defined(_MSC_VER)
>-  #include <stdlib.h>  /* Microsoft put _rotl declaration in here */
>-  #define ROTL32(x,r)  _rotl(x,r)
>+#    include <stdlib.h> /* Microsoft put _rotl declaration in here */
>+#    define ROTL32(x, r) _rotl(x, r)
> #else
>-  /* gcc recognises this code and generates a rotate instruction for CPUs with one */
>-  #define ROTL32(x,r)  (((uint32_t)x << r) | ((uint32_t)x >> (32 - r)))
>+/* gcc recognises this code and generates a rotate instruction for CPUs with one */
>+#    define ROTL32(x, r) (((uint32_t)x << r) | ((uint32_t)x >> (32 - r)))
> #endif
> 
>-
> /*-----------------------------------------------------------------------------
>  * Core murmurhash algorithm macros */
> 
>-#define C1  (0xcc9e2d51)
>-#define C2  (0x1b873593)
>+#define C1 (0xcc9e2d51)
>+#define C2 (0x1b873593)
> 
> /* This is the main processing body of the algorithm. It operates
>  * on each full 32-bits of input. */
>-#define DOBLOCK(h1, k1) do{ \
>-        k1 *= C1; \
>-        k1 = ROTL32(k1,15); \
>-        k1 *= C2; \
>-        \
>-        h1 ^= k1; \
>-        h1 = ROTL32(h1,13); \
>-        h1 = h1*5+0xe6546b64; \
>-    }while(0)
>-
>+#define DOBLOCK(h1, k1)           \
>+    do                            \
>+    {                             \
>+        k1 *= C1;                 \
>+        k1 = ROTL32(k1, 15);      \
>+        k1 *= C2;                 \
>+                                  \
>+        h1 ^= k1;                 \
>+        h1 = ROTL32(h1, 13);      \
>+        h1 = h1 * 5 + 0xe6546b64; \
>+    } while (0)
> 
> /* Append unaligned bytes to carry, forcing hash churn if we have 4 bytes */
> /* cnt=bytes to process, h1=name of h1 var, c=carry, n=bytes in c, ptr/len=payload */
>-#define DOBYTES(cnt, h1, c, n, ptr, len) do{ \
>-    int _i = cnt; \
>-    while(_i--) { \
>-        c = c>>8 | *ptr++<<24; \
>-        n++; len--; \
>-        if(n==4) { \
>-            DOBLOCK(h1, c); \
>-            n = 0; \
>-        } \
>-    } }while(0)
>+#define DOBYTES(cnt, h1, c, n, ptr, len) \
>+    do                                   \
>+    {                                    \
>+        int _i = cnt;                    \
>+        while (_i--)                     \
>+        {                                \
>+            c = c >> 8 | *ptr++ << 24;   \
>+            n++;                         \
>+            len--;                       \
>+            if (n == 4)                  \
>+            {                            \
>+                DOBLOCK(h1, c);          \
>+                n = 0;                   \
>+            }                            \
>+        }                                \
>+    } while (0)
> 
> /*---------------------------------------------------------------------------*/
> 
>@@ -194,135 +186,119 @@ namespace angle
>  * if wanted. Both ph1 and pcarry are required arguments. */
> void PMurHash32_Process(uint32_t *ph1, uint32_t *pcarry, const void *key, int len)
> {
>-  uint32_t h1 = *ph1;
>-  uint32_t c = *pcarry;
>+    uint32_t h1 = *ph1;
>+    uint32_t c  = *pcarry;
> 
>-  const uint8_t *ptr = (uint8_t*)key;
>-  const uint8_t *end;
>+    const uint8_t *ptr = (uint8_t *)key;
>+    const uint8_t *end;
> 
>-  /* Extract carry count from low 2 bits of c value */
>-  int n = c & 3;
>+    /* Extract carry count from low 2 bits of c value */
>+    int n = c & 3;
> 
> #if defined(UNALIGNED_SAFE)
>-  /* This CPU handles unaligned word access */
>+    /* This CPU handles unaligned word access */
> 
>-  /* Consume any carry bytes */
>-  int i = (4-n) & 3;
>-  if(i && i <= len) {
>-    DOBYTES(i, h1, c, n, ptr, len);
>-  }
>-
>-  /* Process 32-bit chunks */
>-  end = ptr + len/4*4;
>-  for( ; ptr < end ; ptr+=4) {
>-    uint32_t k1 = READ_UINT32(ptr);
>-    DOBLOCK(h1, k1);
>-  }
>+    /* Consume any carry bytes */
>+    int i = (4 - n) & 3;
>+    if (i && i <= len)
>+    {
>+        DOBYTES(i, h1, c, n, ptr, len);
>+    }
> 
>-#else /*UNALIGNED_SAFE*/
>-  /* This CPU does not handle unaligned word access */
>+    /* Process 32-bit chunks */
>+    end = ptr + len / 4 * 4;
>+    for (; ptr < end; ptr += 4)
>+    {
>+        uint32_t k1 = READ_UINT32(ptr);
>+        DOBLOCK(h1, k1);
>+    }
> 
>-  /* Consume enough so that the next data byte is word aligned */
>-  int i = -(long)ptr & 3;
>-  if(i && i <= len) {
>-      DOBYTES(i, h1, c, n, ptr, len);
>-  }
>+#else  /*UNALIGNED_SAFE*/
>+    /* This CPU does not handle unaligned word access */
> 
>-  /* We're now aligned. Process in aligned blocks. Specialise for each possible carry count */
>-  end = ptr + len/4*4;
>-  switch(n) { /* how many bytes in c */
>-  case 0: /* c=[----]  w=[3210]  b=[3210]=w            c'=[----] */
>-    for( ; ptr < end ; ptr+=4) {
>-#if defined(__clang__)
>-#pragma clang diagnostic push
>-#pragma clang diagnostic ignored "-Wcast-align"
>-#endif
>-      uint32_t k1 = READ_UINT32(ptr);
>-#if defined(__clang__)
>-#pragma clang diagnostic pop
>-#endif
>-      DOBLOCK(h1, k1);
>-    }
>-    break;
>-  case 1: /* c=[0---]  w=[4321]  b=[3210]=c>>24|w<<8   c'=[4---] */
>-    for( ; ptr < end ; ptr+=4) {
>-      uint32_t k1 = c>>24;
>-#if defined(__clang__)
>-#pragma clang diagnostic push
>-#pragma clang diagnostic ignored "-Wcast-align"
>-#endif
>-      c = READ_UINT32(ptr);
>-#if defined(__clang__)
>-#pragma clang diagnostic pop
>-#endif
>-      k1 |= c<<8;
>-      DOBLOCK(h1, k1);
>+    /* Consume enough so that the next data byte is word aligned */
>+    int i = -(intptr_t)ptr & 3;
>+    if (i && i <= len)
>+    {
>+        DOBYTES(i, h1, c, n, ptr, len);
>     }
>-    break;
>-  case 2: /* c=[10--]  w=[5432]  b=[3210]=c>>16|w<<16  c'=[54--] */
>-    for( ; ptr < end ; ptr+=4) {
>-      uint32_t k1 = c>>16;
>-#if defined(__clang__)
>-#pragma clang diagnostic push
>-#pragma clang diagnostic ignored "-Wcast-align"
>-#endif
>-      c = READ_UINT32(ptr);
>-#if defined(__clang__)
>-#pragma clang diagnostic pop
>-#endif
>-      k1 |= c<<16;
>-      DOBLOCK(h1, k1);
>-    }
>-    break;
>-  case 3: /* c=[210-]  w=[6543]  b=[3210]=c>>8|w<<24   c'=[654-] */
>-    for( ; ptr < end ; ptr+=4) {
>-      uint32_t k1 = c>>8;
>-#if defined(__clang__)
>-#pragma clang diagnostic push
>-#pragma clang diagnostic ignored "-Wcast-align"
>-#endif
>-      c = READ_UINT32(ptr);
>-#if defined(__clang__)
>-#pragma clang diagnostic pop
>-#endif
>-      k1 |= c<<24;
>-      DOBLOCK(h1, k1);
>+
>+    /* We're now aligned. Process in aligned blocks. Specialise for each possible carry count */
>+    end = ptr + len / 4 * 4;
>+    switch (n)
>+    {           /* how many bytes in c */
>+        case 0: /* c=[----]  w=[3210]  b=[3210]=w            c'=[----] */
>+            for (; ptr < end; ptr += 4)
>+            {
>+                uint32_t k1 = READ_UINT32(ptr);
>+                DOBLOCK(h1, k1);
>+            }
>+            break;
>+        case 1: /* c=[0---]  w=[4321]  b=[3210]=c>>24|w<<8   c'=[4---] */
>+            for (; ptr < end; ptr += 4)
>+            {
>+                uint32_t k1 = c >> 24;
>+                c           = READ_UINT32(ptr);
>+                k1 |= c << 8;
>+                DOBLOCK(h1, k1);
>+            }
>+            break;
>+        case 2: /* c=[10--]  w=[5432]  b=[3210]=c>>16|w<<16  c'=[54--] */
>+            for (; ptr < end; ptr += 4)
>+            {
>+                uint32_t k1 = c >> 16;
>+                c           = READ_UINT32(ptr);
>+                k1 |= c << 16;
>+                DOBLOCK(h1, k1);
>+            }
>+            break;
>+        case 3: /* c=[210-]  w=[6543]  b=[3210]=c>>8|w<<24   c'=[654-] */
>+            for (; ptr < end; ptr += 4)
>+            {
>+                uint32_t k1 = c >> 8;
>+                c           = READ_UINT32(ptr);
>+                k1 |= c << 24;
>+                DOBLOCK(h1, k1);
>+            }
>     }
>-  }
> #endif /*UNALIGNED_SAFE*/
> 
>-  /* Advance over whole 32-bit chunks, possibly leaving 1..3 bytes */
>-  len -= len/4*4;
>+    /* Advance over whole 32-bit chunks, possibly leaving 1..3 bytes */
>+    len -= len / 4 * 4;
> 
>-  /* Append any remaining bytes into carry */
>-  DOBYTES(len, h1, c, n, ptr, len);
>+    /* Append any remaining bytes into carry */
>+    DOBYTES(len, h1, c, n, ptr, len);
> 
>-  /* Copy out new running hash and carry */
>-  *ph1 = h1;
>-  *pcarry = (c & ~0xff) | n;
>-} 
>+    /* Copy out new running hash and carry */
>+    *ph1    = h1;
>+    *pcarry = (c & ~0xff) | n;
>+}
> 
> /*---------------------------------------------------------------------------*/
> 
> /* Finalize a hash. To match the original Murmur3A the total_length must be provided */
> uint32_t PMurHash32_Result(uint32_t h, uint32_t carry, uint32_t total_length)
> {
>-  uint32_t k1;
>-  int n = carry & 3;
>-  if(n) {
>-    k1 = carry >> (4-n)*8;
>-    k1 *= C1; k1 = ROTL32(k1,15); k1 *= C2; h ^= k1;
>-  }
>-  h ^= total_length;
>+    uint32_t k1;
>+    int n = carry & 3;
>+    if (n)
>+    {
>+        k1 = carry >> (4 - n) * 8;
>+        k1 *= C1;
>+        k1 = ROTL32(k1, 15);
>+        k1 *= C2;
>+        h ^= k1;
>+    }
>+    h ^= total_length;
> 
>-  /* fmix */
>-  h ^= h >> 16;
>-  h *= 0x85ebca6b;
>-  h ^= h >> 13;
>-  h *= 0xc2b2ae35;
>-  h ^= h >> 16;
>+    /* fmix */
>+    h ^= h >> 16;
>+    h *= 0x85ebca6b;
>+    h ^= h >> 13;
>+    h *= 0xc2b2ae35;
>+    h ^= h >> 16;
> 
>-  return h;
>+    return h;
> }
> 
> /*---------------------------------------------------------------------------*/
>@@ -330,9 +306,9 @@ uint32_t PMurHash32_Result(uint32_t h, uint32_t carry, uint32_t total_length)
> /* Murmur3A compatable all-at-once */
> uint32_t PMurHash32(uint32_t seed, const void *key, int len)
> {
>-  uint32_t h1=seed, carry=0;
>-  PMurHash32_Process(&h1, &carry, key, len);
>-  return PMurHash32_Result(h1, carry, len);
>+    uint32_t h1 = seed, carry = 0;
>+    PMurHash32_Process(&h1, &carry, key, len);
>+    return PMurHash32_Result(h1, carry, len);
> }
> 
> /*---------------------------------------------------------------------------*/
>@@ -340,9 +316,9 @@ uint32_t PMurHash32(uint32_t seed, const void *key, int len)
> /* Provide an API suitable for smhasher */
> void PMurHash32_test(const void *key, int len, uint32_t seed, void *out)
> {
>-  uint32_t h1=seed, carry=0;
>-  const uint8_t *ptr = (uint8_t*)key;
>-  const uint8_t *end = ptr + len;
>+    uint32_t h1 = seed, carry = 0;
>+    const uint8_t *ptr = (uint8_t *)key;
>+    const uint8_t *end = ptr + len;
> 
> #if 0 /* Exercise the progressive processing */
>   while(ptr < end) {
>@@ -353,11 +329,11 @@ void PMurHash32_test(const void *key, int len, uint32_t seed, void *out)
>     ptr = mid;
>   }
> #else
>-  PMurHash32_Process(&h1, &carry, ptr, (int)(end-ptr));
>+    PMurHash32_Process(&h1, &carry, ptr, (int)(end - ptr));
> #endif
>-  h1 = PMurHash32_Result(h1, carry, len);
>-  *(uint32_t*)out = h1;
>-}
>+    h1               = PMurHash32_Result(h1, carry, len);
>+    *(uint32_t *)out = h1;
> }
>+}  // namespace angle
> 
> /*---------------------------------------------------------------------------*/
>diff --git a/Source/ThirdParty/ANGLE/src/common/third_party/smhasher/src/PMurHash.h b/Source/ThirdParty/ANGLE/src/common/third_party/smhasher/src/PMurHash.h
>index 57c56c538d6..0a3c96fa142 100644
>--- a/Source/ThirdParty/ANGLE/src/common/third_party/smhasher/src/PMurHash.h
>+++ b/Source/ThirdParty/ANGLE/src/common/third_party/smhasher/src/PMurHash.h
>@@ -16,35 +16,33 @@
> 
> /* First look for special cases */
> #if defined(_MSC_VER)
>-  #define MH_UINT32 unsigned long
>+#    define MH_UINT32 unsigned long
> #endif
> 
> /* If the compiler says it's C99 then take its word for it */
>-#if !defined(MH_UINT32) && ( \
>-     defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L )
>-  #include <stdint.h>
>-  #define MH_UINT32 uint32_t
>+#if !defined(MH_UINT32) && (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L)
>+#    include <stdint.h>
>+#    define MH_UINT32 uint32_t
> #endif
> 
> /* Otherwise try testing against max value macros from limit.h */
> #if !defined(MH_UINT32)
>-  #include  <limits.h>
>-  #if   (USHRT_MAX == 0xffffffffUL)
>-    #define MH_UINT32 unsigned short
>-  #elif (UINT_MAX == 0xffffffffUL)
>-    #define MH_UINT32 unsigned int
>-  #elif (ULONG_MAX == 0xffffffffUL)
>-    #define MH_UINT32 unsigned long
>-  #endif
>+#    include <limits.h>
>+#    if (USHRT_MAX == 0xffffffffUL)
>+#        define MH_UINT32 unsigned short
>+#    elif (UINT_MAX == 0xffffffffUL)
>+#        define MH_UINT32 unsigned int
>+#    elif (ULONG_MAX == 0xffffffffUL)
>+#        define MH_UINT32 unsigned long
>+#    endif
> #endif
> 
> #if !defined(MH_UINT32)
>-  #error Unable to determine type name for unsigned 32-bit int
>+#    error Unable to determine type name for unsigned 32-bit int
> #endif
> 
> /* I'm yet to work on a platform where 'unsigned char' is not 8 bits */
>-#define MH_UINT8  unsigned char
>-
>+#define MH_UINT8 unsigned char
> 
> /* ------------------------------------------------------------------------- */
> /* Prototypes */
>@@ -56,4 +54,4 @@ MH_UINT32 PMurHash32_Result(MH_UINT32 h1, MH_UINT32 carry, MH_UINT32 total_lengt
> MH_UINT32 PMurHash32(MH_UINT32 seed, const void *key, int len);
> 
> void PMurHash32_test(const void *key, int len, MH_UINT32 seed, void *out);
>-}
>+}  // namespace angle
>diff --git a/Source/ThirdParty/ANGLE/src/common/third_party/xxhash/LICENSE b/Source/ThirdParty/ANGLE/src/common/third_party/xxhash/LICENSE
>new file mode 100644
>index 00000000000..7de801ed1bc
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/common/third_party/xxhash/LICENSE
>@@ -0,0 +1,24 @@
>+xxHash Library
>+Copyright (c) 2012-2014, Yann Collet
>+All rights reserved.
>+
>+Redistribution and use in source and binary forms, with or without modification,
>+are permitted provided that the following conditions are met:
>+
>+* Redistributions of source code must retain the above copyright notice, this
>+  list of conditions and the following disclaimer.
>+
>+* Redistributions in binary form must reproduce the above copyright notice, this
>+  list of conditions and the following disclaimer in the documentation and/or
>+  other materials provided with the distribution.
>+
>+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
>+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
>+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
>+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
>+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
>+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
>+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
>+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
>+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
>+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>diff --git a/Source/ThirdParty/ANGLE/src/common/third_party/xxhash/README.chromium b/Source/ThirdParty/ANGLE/src/common/third_party/xxhash/README.chromium
>new file mode 100644
>index 00000000000..ba6652c3974
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/common/third_party/xxhash/README.chromium
>@@ -0,0 +1,8 @@
>+Name: xxHash
>+URL: https://github.com/Cyan4973/xxHash
>+License: BSD
>+License File: LICENSE
>+Security Critical: yes
>+
>+Description:
>+Extremely fast non-cryptographic hash algorithm
>diff --git a/Source/ThirdParty/ANGLE/src/common/third_party/xxhash/README.md b/Source/ThirdParty/ANGLE/src/common/third_party/xxhash/README.md
>new file mode 100644
>index 00000000000..6a0ad1910a8
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/common/third_party/xxhash/README.md
>@@ -0,0 +1,167 @@
>+xxHash - Extremely fast hash algorithm
>+======================================
>+
>+xxHash is an Extremely fast Hash algorithm, running at RAM speed limits.
>+It successfully completes the [SMHasher](http://code.google.com/p/smhasher/wiki/SMHasher) test suite
>+which evaluates collision, dispersion and randomness qualities of hash functions.
>+Code is highly portable, and hashes are identical on all platforms (little / big endian).
>+
>+|Branch      |Status   |
>+|------------|---------|
>+|master      | [![Build Status](https://travis-ci.org/Cyan4973/xxHash.svg?branch=master)](https://travis-ci.org/Cyan4973/xxHash?branch=master) |
>+|dev         | [![Build Status](https://travis-ci.org/Cyan4973/xxHash.svg?branch=dev)](https://travis-ci.org/Cyan4973/xxHash?branch=dev) |
>+
>+
>+
>+Benchmarks
>+-------------------------
>+
>+The benchmark uses SMHasher speed test, compiled with Visual 2010 on a Windows Seven 32-bit box.
>+The reference system uses a Core 2 Duo @3GHz
>+
>+
>+| Name          |   Speed  | Quality | Author           |
>+|---------------|----------|:-------:|------------------|
>+| [xxHash]      | 5.4 GB/s |   10    | Y.C.             |
>+| MurmurHash 3a | 2.7 GB/s |   10    | Austin Appleby   |
>+| SBox          | 1.4 GB/s |    9    | Bret Mulvey      |
>+| Lookup3       | 1.2 GB/s |    9    | Bob Jenkins      |
>+| CityHash64    | 1.05 GB/s|   10    | Pike & Alakuijala|
>+| FNV           | 0.55 GB/s|    5    | Fowler, Noll, Vo |
>+| CRC32         | 0.43 GB/s|    9    |                  |
>+| MD5-32        | 0.33 GB/s|   10    | Ronald L.Rivest  |
>+| SHA1-32       | 0.28 GB/s|   10    |                  |
>+
>+[xxHash]: http://www.xxhash.com
>+
>+Q.Score is a measure of quality of the hash function.
>+It depends on successfully passing SMHasher test set.
>+10 is a perfect score.
>+Algorithms with a score < 5 are not listed on this table.
>+
>+A more recent version, XXH64, has been created thanks to [Mathias Westerdahl](https://github.com/JCash),
>+which offers superior speed and dispersion for 64-bit systems.
>+Note however that 32-bit applications will still run faster using the 32-bit version.
>+
>+SMHasher speed test, compiled using GCC 4.8.2, on Linux Mint 64-bit.
>+The reference system uses a Core i5-3340M @2.7GHz
>+
>+| Version    | Speed on 64-bit | Speed on 32-bit |
>+|------------|------------------|------------------|
>+| XXH64      | 13.8 GB/s        |  1.9 GB/s        |
>+| XXH32      |  6.8 GB/s        |  6.0 GB/s        |
>+
>+This project also includes a command line utility, named `xxhsum`, offering similar features as `md5sum`,
>+thanks to [Takayuki Matsuoka](https://github.com/t-mat) contributions.
>+
>+
>+### License
>+
>+The library files `xxhash.c` and `xxhash.h` are BSD licensed.
>+The utility `xxhsum` is GPL licensed.
>+
>+
>+### Build modifiers
>+
>+The following macros can be set at compilation time,
>+they modify xxhash behavior. They are all disabled by default.
>+
>+- `XXH_INLINE_ALL` : Make all functions `inline`, with bodies directly included within `xxhash.h`.
>+                     There is no need for an `xxhash.o` module in this case.
>+                     Inlining functions is generally beneficial for speed on small keys.
>+                     It's especially effective when key length is a compile time constant,
>+                     with observed performance improvement in the +200% range .
>+                     See [this article](https://fastcompression.blogspot.com/2018/03/xxhash-for-small-keys-impressive-power.html) for details.
>+- `XXH_ACCEPT_NULL_INPUT_POINTER` : if set to `1`, when input is a null-pointer,
>+                                    xxhash result is the same as a zero-length key
>+                                    (instead of a dereference segfault).
>+- `XXH_FORCE_MEMORY_ACCESS` : default method `0` uses a portable `memcpy()` notation.
>+                              Method `1` uses a gcc-specific `packed` attribute, which can provide better performance for some targets.
>+                              Method `2` forces unaligned reads, which is not standard compliant, but might sometimes be the only way to extract better performance.
>+- `XXH_CPU_LITTLE_ENDIAN` : by default, endianess is determined at compile time.
>+                            It's possible to skip auto-detection and force format to little-endian, by setting this macro to 1.
>+                            Setting it to 0 forces big-endian.
>+- `XXH_FORCE_NATIVE_FORMAT` : on big-endian systems : use native number representation.
>+                              Breaks consistency with little-endian results.
>+- `XXH_PRIVATE_API` : same impact as `XXH_INLINE_ALL`.
>+                      Name underlines that symbols will not be published on library public interface.
>+- `XXH_NAMESPACE` : prefix all symbols with the value of `XXH_NAMESPACE`.
>+                    Useful to evade symbol naming collisions,
>+                    in case of multiple inclusions of xxHash source code.
>+                    Client applications can still use regular function name,
>+                    symbols are automatically translated through `xxhash.h`.
>+- `XXH_STATIC_LINKING_ONLY` : gives access to state declaration for static allocation.
>+                              Incompatible with dynamic linking, due to risks of ABI changes.
>+- `XXH_NO_LONG_LONG` : removes support for XXH64,
>+                       for targets without 64-bit support.
>+
>+
>+### Example
>+
>+Calling xxhash 64-bit variant from a C program :
>+
>+```c
>+#include "xxhash.h"
>+
>+unsigned long long calcul_hash(const void* buffer, size_t length)
>+{
>+    unsigned long long const seed = 0;   /* or any other value */
>+    unsigned long long const hash = XXH64(buffer, length, seed);
>+    return hash;
>+}
>+```
>+
>+Using streaming variant is more involved, but makes it possible to provide data in multiple rounds :
>+```c
>+#include "stdlib.h"   /* abort() */
>+#include "xxhash.h"
>+
>+
>+unsigned long long calcul_hash_streaming(someCustomType handler)
>+{
>+    XXH64_state_t* const state = XXH64_createState();
>+    if (state==NULL) abort();
>+
>+    size_t const bufferSize = SOME_VALUE;
>+    void* const buffer = malloc(bufferSize);
>+    if (buffer==NULL) abort();
>+
>+    unsigned long long const seed = 0;   /* or any other value */
>+    XXH_errorcode const resetResult = XXH64_reset(state, seed);
>+    if (resetResult == XXH_ERROR) abort();
>+
>+    (...)
>+    while ( /* any condition */ ) {
>+        size_t const length = get_more_data(buffer, bufferSize, handler);   /* undescribed */
>+        XXH_errorcode const addResult = XXH64_update(state, buffer, length);
>+        if (addResult == XXH_ERROR) abort();
>+        (...)
>+    }
>+
>+    (...)
>+    unsigned long long const hash = XXH64_digest(state);
>+
>+    free(buffer);
>+    XXH64_freeState(state);
>+
>+    return hash;
>+}
>+```
>+
>+
>+### Other programming languages
>+
>+Beyond the C reference version,
>+xxHash is also available on many programming languages,
>+thanks to great contributors.
>+They are [listed here](http://www.xxhash.com/#other-languages).
>+
>+
>+### Branch Policy
>+
>+> - The "master" branch is considered stable, at all times.
>+> - The "dev" branch is the one where all contributions must be merged
>+    before being promoted to master.
>+>   + If you plan to propose a patch, please commit into the "dev" branch,
>+      or its own feature branch.
>+      Direct commit to "master" are not permitted.
>diff --git a/Source/ThirdParty/ANGLE/src/common/third_party/xxhash/xxhash.c b/Source/ThirdParty/ANGLE/src/common/third_party/xxhash/xxhash.c
>new file mode 100644
>index 00000000000..13669b2a4d9
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/common/third_party/xxhash/xxhash.c
>@@ -0,0 +1,1030 @@
>+/*
>+*  xxHash - Fast Hash algorithm
>+*  Copyright (C) 2012-2016, Yann Collet
>+*
>+*  BSD 2-Clause License (http://www.opensource.org/licenses/bsd-license.php)
>+*
>+*  Redistribution and use in source and binary forms, with or without
>+*  modification, are permitted provided that the following conditions are
>+*  met:
>+*
>+*  * Redistributions of source code must retain the above copyright
>+*  notice, this list of conditions and the following disclaimer.
>+*  * Redistributions in binary form must reproduce the above
>+*  copyright notice, this list of conditions and the following disclaimer
>+*  in the documentation and/or other materials provided with the
>+*  distribution.
>+*
>+*  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
>+*  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
>+*  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
>+*  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
>+*  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
>+*  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
>+*  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
>+*  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
>+*  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
>+*  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
>+*  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>+*
>+*  You can contact the author at :
>+*  - xxHash homepage: http://www.xxhash.com
>+*  - xxHash source repository : https://github.com/Cyan4973/xxHash
>+*/
>+
>+
>+/* *************************************
>+*  Tuning parameters
>+***************************************/
>+/*!XXH_FORCE_MEMORY_ACCESS :
>+ * By default, access to unaligned memory is controlled by `memcpy()`, which is safe and portable.
>+ * Unfortunately, on some target/compiler combinations, the generated assembly is sub-optimal.
>+ * The below switch allow to select different access method for improved performance.
>+ * Method 0 (default) : use `memcpy()`. Safe and portable.
>+ * Method 1 : `__packed` statement. It depends on compiler extension (ie, not portable).
>+ *            This method is safe if your compiler supports it, and *generally* as fast or faster than `memcpy`.
>+ * Method 2 : direct access. This method doesn't depend on compiler but violate C standard.
>+ *            It can generate buggy code on targets which do not support unaligned memory accesses.
>+ *            But in some circumstances, it's the only known way to get the most performance (ie GCC + ARMv6)
>+ * See http://stackoverflow.com/a/32095106/646947 for details.
>+ * Prefer these methods in priority order (0 > 1 > 2)
>+ */
>+#ifndef XXH_FORCE_MEMORY_ACCESS   /* can be defined externally, on command line for example */
>+#  if defined(__GNUC__) && ( defined(__ARM_ARCH_6__) || defined(__ARM_ARCH_6J__) \
>+                        || defined(__ARM_ARCH_6K__) || defined(__ARM_ARCH_6Z__) \
>+                        || defined(__ARM_ARCH_6ZK__) || defined(__ARM_ARCH_6T2__) )
>+#    define XXH_FORCE_MEMORY_ACCESS 2
>+#  elif (defined(__INTEL_COMPILER) && !defined(_WIN32)) || \
>+  (defined(__GNUC__) && ( defined(__ARM_ARCH_7__) || defined(__ARM_ARCH_7A__) \
>+                    || defined(__ARM_ARCH_7R__) || defined(__ARM_ARCH_7M__) \
>+                    || defined(__ARM_ARCH_7S__) ))
>+#    define XXH_FORCE_MEMORY_ACCESS 1
>+#  endif
>+#endif
>+
>+/*!XXH_ACCEPT_NULL_INPUT_POINTER :
>+ * If input pointer is NULL, xxHash default behavior is to dereference it, triggering a segfault.
>+ * When this macro is enabled, xxHash actively checks input for null pointer.
>+ * It it is, result for null input pointers is the same as a null-length input.
>+ */
>+#ifndef XXH_ACCEPT_NULL_INPUT_POINTER   /* can be defined externally */
>+#  define XXH_ACCEPT_NULL_INPUT_POINTER 0
>+#endif
>+
>+/*!XXH_FORCE_NATIVE_FORMAT :
>+ * By default, xxHash library provides endian-independent Hash values, based on little-endian convention.
>+ * Results are therefore identical for little-endian and big-endian CPU.
>+ * This comes at a performance cost for big-endian CPU, since some swapping is required to emulate little-endian format.
>+ * Should endian-independence be of no importance for your application, you may set the #define below to 1,
>+ * to improve speed for Big-endian CPU.
>+ * This option has no impact on Little_Endian CPU.
>+ */
>+#ifndef XXH_FORCE_NATIVE_FORMAT   /* can be defined externally */
>+#  define XXH_FORCE_NATIVE_FORMAT 0
>+#endif
>+
>+/*!XXH_FORCE_ALIGN_CHECK :
>+ * This is a minor performance trick, only useful with lots of very small keys.
>+ * It means : check for aligned/unaligned input.
>+ * The check costs one initial branch per hash;
>+ * set it to 0 when the input is guaranteed to be aligned,
>+ * or when alignment doesn't matter for performance.
>+ */
>+#ifndef XXH_FORCE_ALIGN_CHECK /* can be defined externally */
>+#  if defined(__i386) || defined(_M_IX86) || defined(__x86_64__) || defined(_M_X64)
>+#    define XXH_FORCE_ALIGN_CHECK 0
>+#  else
>+#    define XXH_FORCE_ALIGN_CHECK 1
>+#  endif
>+#endif
>+
>+
>+/* *************************************
>+*  Includes & Memory related functions
>+***************************************/
>+/*! Modify the local functions below should you wish to use some other memory routines
>+*   for malloc(), free() */
>+#include <stdlib.h>
>+static void* XXH_malloc(size_t s) { return malloc(s); }
>+static void  XXH_free  (void* p)  { free(p); }
>+/*! and for memcpy() */
>+#include <string.h>
>+static void* XXH_memcpy(void* dest, const void* src, size_t size) { return memcpy(dest,src,size); }
>+
>+#include <assert.h>   /* assert */
>+
>+#define XXH_STATIC_LINKING_ONLY
>+#include "xxhash.h"
>+
>+
>+/* *************************************
>+*  Compiler Specific Options
>+***************************************/
>+#ifdef _MSC_VER    /* Visual Studio */
>+#  pragma warning(disable : 4127)      /* disable: C4127: conditional expression is constant */
>+#  define FORCE_INLINE static __forceinline
>+#else
>+#  if defined (__cplusplus) || defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L   /* C99 */
>+#    ifdef __GNUC__
>+#      define FORCE_INLINE static inline __attribute__((always_inline))
>+#    else
>+#      define FORCE_INLINE static inline
>+#    endif
>+#  else
>+#    define FORCE_INLINE static
>+#  endif /* __STDC_VERSION__ */
>+#endif
>+
>+
>+/* *************************************
>+*  Basic Types
>+***************************************/
>+#ifndef MEM_MODULE
>+# if !defined (__VMS) \
>+  && (defined (__cplusplus) \
>+  || (defined (__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L) /* C99 */) )
>+#   include <stdint.h>
>+    typedef uint8_t  BYTE;
>+    typedef uint16_t U16;
>+    typedef uint32_t U32;
>+# else
>+    typedef unsigned char      BYTE;
>+    typedef unsigned short     U16;
>+    typedef unsigned int       U32;
>+# endif
>+#endif
>+
>+#if (defined(XXH_FORCE_MEMORY_ACCESS) && (XXH_FORCE_MEMORY_ACCESS==2))
>+
>+/* Force direct memory access. Only works on CPU which support unaligned memory access in hardware */
>+static U32 XXH_read32(const void* memPtr) { return *(const U32*) memPtr; }
>+
>+#elif (defined(XXH_FORCE_MEMORY_ACCESS) && (XXH_FORCE_MEMORY_ACCESS==1))
>+
>+/* __pack instructions are safer, but compiler specific, hence potentially problematic for some compilers */
>+/* currently only defined for gcc and icc */
>+typedef union { U32 u32; } __attribute__((packed)) unalign;
>+static U32 XXH_read32(const void* ptr) { return ((const unalign*)ptr)->u32; }
>+
>+#else
>+
>+/* portable and safe solution. Generally efficient.
>+ * see : http://stackoverflow.com/a/32095106/646947
>+ */
>+static U32 XXH_read32(const void* memPtr)
>+{
>+    U32 val;
>+    memcpy(&val, memPtr, sizeof(val));
>+    return val;
>+}
>+
>+#endif   /* XXH_FORCE_DIRECT_MEMORY_ACCESS */
>+
>+
>+/* ****************************************
>+*  Compiler-specific Functions and Macros
>+******************************************/
>+#define XXH_GCC_VERSION (__GNUC__ * 100 + __GNUC_MINOR__)
>+
>+/* Note : although _rotl exists for minGW (GCC under windows), performance seems poor */
>+#if defined(_MSC_VER)
>+#  define XXH_rotl32(x,r) _rotl(x,r)
>+#  define XXH_rotl64(x,r) _rotl64(x,r)
>+#else
>+#  define XXH_rotl32(x,r) ((x << r) | (x >> (32 - r)))
>+#  define XXH_rotl64(x,r) ((x << r) | (x >> (64 - r)))
>+#endif
>+
>+#if defined(_MSC_VER)     /* Visual Studio */
>+#  define XXH_swap32 _byteswap_ulong
>+#elif XXH_GCC_VERSION >= 403
>+#  define XXH_swap32 __builtin_bswap32
>+#else
>+static U32 XXH_swap32 (U32 x)
>+{
>+    return  ((x << 24) & 0xff000000 ) |
>+            ((x <<  8) & 0x00ff0000 ) |
>+            ((x >>  8) & 0x0000ff00 ) |
>+            ((x >> 24) & 0x000000ff );
>+}
>+#endif
>+
>+
>+/* *************************************
>+*  Architecture Macros
>+***************************************/
>+typedef enum { XXH_bigEndian=0, XXH_littleEndian=1 } XXH_endianess;
>+
>+/* XXH_CPU_LITTLE_ENDIAN can be defined externally, for example on the compiler command line */
>+#ifndef XXH_CPU_LITTLE_ENDIAN
>+static int XXH_isLittleEndian(void)
>+{
>+    const union { U32 u; BYTE c[4]; } one = { 1 };   /* don't use static : performance detrimental  */
>+    return one.c[0];
>+}
>+#   define XXH_CPU_LITTLE_ENDIAN   XXH_isLittleEndian()
>+#endif
>+
>+
>+/* ***************************
>+*  Memory reads
>+*****************************/
>+typedef enum { XXH_aligned, XXH_unaligned } XXH_alignment;
>+
>+FORCE_INLINE U32 XXH_readLE32_align(const void* ptr, XXH_endianess endian, XXH_alignment align)
>+{
>+    if (align==XXH_unaligned)
>+        return endian==XXH_littleEndian ? XXH_read32(ptr) : XXH_swap32(XXH_read32(ptr));
>+    else
>+        return endian==XXH_littleEndian ? *(const U32*)ptr : XXH_swap32(*(const U32*)ptr);
>+}
>+
>+FORCE_INLINE U32 XXH_readLE32(const void* ptr, XXH_endianess endian)
>+{
>+    return XXH_readLE32_align(ptr, endian, XXH_unaligned);
>+}
>+
>+static U32 XXH_readBE32(const void* ptr)
>+{
>+    return XXH_CPU_LITTLE_ENDIAN ? XXH_swap32(XXH_read32(ptr)) : XXH_read32(ptr);
>+}
>+
>+
>+/* *************************************
>+*  Macros
>+***************************************/
>+#define XXH_STATIC_ASSERT(c)  { enum { XXH_sa = 1/(int)(!!(c)) }; }  /* use after variable declarations */
>+XXH_PUBLIC_API unsigned XXH_versionNumber (void) { return XXH_VERSION_NUMBER; }
>+
>+
>+/* *******************************************************************
>+*  32-bit hash functions
>+*********************************************************************/
>+static const U32 PRIME32_1 = 2654435761U;   /* 0b10011110001101110111100110110001 */
>+static const U32 PRIME32_2 = 2246822519U;   /* 0b10000101111010111100101001110111 */
>+static const U32 PRIME32_3 = 3266489917U;   /* 0b11000010101100101010111000111101 */
>+static const U32 PRIME32_4 =  668265263U;   /* 0b00100111110101001110101100101111 */
>+static const U32 PRIME32_5 =  374761393U;   /* 0b00010110010101100110011110110001 */
>+
>+static U32 XXH32_round(U32 seed, U32 input)
>+{
>+    seed += input * PRIME32_2;
>+    seed  = XXH_rotl32(seed, 13);
>+    seed *= PRIME32_1;
>+    return seed;
>+}
>+
>+/* mix all bits */
>+static U32 XXH32_avalanche(U32 h32)
>+{
>+    h32 ^= h32 >> 15;
>+    h32 *= PRIME32_2;
>+    h32 ^= h32 >> 13;
>+    h32 *= PRIME32_3;
>+    h32 ^= h32 >> 16;
>+    return(h32);
>+}
>+
>+#define XXH_get32bits(p) XXH_readLE32_align(p, endian, align)
>+
>+static U32
>+XXH32_finalize(U32 h32, const void* ptr, size_t len,
>+                XXH_endianess endian, XXH_alignment align)
>+
>+{
>+    const BYTE* p = (const BYTE*)ptr;
>+
>+#define PROCESS1               \
>+    h32 += (*p++) * PRIME32_5; \
>+    h32 = XXH_rotl32(h32, 11) * PRIME32_1 ;
>+
>+#define PROCESS4                         \
>+    h32 += XXH_get32bits(p) * PRIME32_3; \
>+    p+=4;                                \
>+    h32  = XXH_rotl32(h32, 17) * PRIME32_4 ;
>+
>+    switch(len&15)  /* or switch(bEnd - p) */
>+    {
>+      case 12:      PROCESS4;
>+                    /* fallthrough */
>+      case 8:       PROCESS4;
>+                    /* fallthrough */
>+      case 4:       PROCESS4;
>+                    return XXH32_avalanche(h32);
>+
>+      case 13:      PROCESS4;
>+                    /* fallthrough */
>+      case 9:       PROCESS4;
>+                    /* fallthrough */
>+      case 5:       PROCESS4;
>+                    PROCESS1;
>+                    return XXH32_avalanche(h32);
>+
>+      case 14:      PROCESS4;
>+                    /* fallthrough */
>+      case 10:      PROCESS4;
>+                    /* fallthrough */
>+      case 6:       PROCESS4;
>+                    PROCESS1;
>+                    PROCESS1;
>+                    return XXH32_avalanche(h32);
>+
>+      case 15:      PROCESS4;
>+                    /* fallthrough */
>+      case 11:      PROCESS4;
>+                    /* fallthrough */
>+      case 7:       PROCESS4;
>+                    /* fallthrough */
>+      case 3:       PROCESS1;
>+                    /* fallthrough */
>+      case 2:       PROCESS1;
>+                    /* fallthrough */
>+      case 1:       PROCESS1;
>+                    /* fallthrough */
>+      case 0:       return XXH32_avalanche(h32);
>+    }
>+    assert(0);
>+    return h32;   /* reaching this point is deemed impossible */
>+}
>+
>+
>+FORCE_INLINE U32
>+XXH32_endian_align(const void* input, size_t len, U32 seed,
>+                    XXH_endianess endian, XXH_alignment align)
>+{
>+    const BYTE* p = (const BYTE*)input;
>+    const BYTE* bEnd = p + len;
>+    U32 h32;
>+
>+#if defined(XXH_ACCEPT_NULL_INPUT_POINTER) && (XXH_ACCEPT_NULL_INPUT_POINTER>=1)
>+    if (p==NULL) {
>+        len=0;
>+        bEnd=p=(const BYTE*)(size_t)16;
>+    }
>+#endif
>+
>+    if (len>=16) {
>+        const BYTE* const limit = bEnd - 15;
>+        U32 v1 = seed + PRIME32_1 + PRIME32_2;
>+        U32 v2 = seed + PRIME32_2;
>+        U32 v3 = seed + 0;
>+        U32 v4 = seed - PRIME32_1;
>+
>+        do {
>+            v1 = XXH32_round(v1, XXH_get32bits(p)); p+=4;
>+            v2 = XXH32_round(v2, XXH_get32bits(p)); p+=4;
>+            v3 = XXH32_round(v3, XXH_get32bits(p)); p+=4;
>+            v4 = XXH32_round(v4, XXH_get32bits(p)); p+=4;
>+        } while (p < limit);
>+
>+        h32 = XXH_rotl32(v1, 1)  + XXH_rotl32(v2, 7)
>+            + XXH_rotl32(v3, 12) + XXH_rotl32(v4, 18);
>+    } else {
>+        h32  = seed + PRIME32_5;
>+    }
>+
>+    h32 += (U32)len;
>+
>+    return XXH32_finalize(h32, p, len&15, endian, align);
>+}
>+
>+
>+XXH_PUBLIC_API unsigned int XXH32 (const void* input, size_t len, unsigned int seed)
>+{
>+#if 0
>+    /* Simple version, good for code maintenance, but unfortunately slow for small inputs */
>+    XXH32_state_t state;
>+    XXH32_reset(&state, seed);
>+    XXH32_update(&state, input, len);
>+    return XXH32_digest(&state);
>+#else
>+    XXH_endianess endian_detected = (XXH_endianess)XXH_CPU_LITTLE_ENDIAN;
>+
>+    if (XXH_FORCE_ALIGN_CHECK) {
>+        if ((((size_t)input) & 3) == 0) {   /* Input is 4-bytes aligned, leverage the speed benefit */
>+            if ((endian_detected==XXH_littleEndian) || XXH_FORCE_NATIVE_FORMAT)
>+                return XXH32_endian_align(input, len, seed, XXH_littleEndian, XXH_aligned);
>+            else
>+                return XXH32_endian_align(input, len, seed, XXH_bigEndian, XXH_aligned);
>+    }   }
>+
>+    if ((endian_detected==XXH_littleEndian) || XXH_FORCE_NATIVE_FORMAT)
>+        return XXH32_endian_align(input, len, seed, XXH_littleEndian, XXH_unaligned);
>+    else
>+        return XXH32_endian_align(input, len, seed, XXH_bigEndian, XXH_unaligned);
>+#endif
>+}
>+
>+
>+
>+/*======   Hash streaming   ======*/
>+
>+XXH_PUBLIC_API XXH32_state_t* XXH32_createState(void)
>+{
>+    return (XXH32_state_t*)XXH_malloc(sizeof(XXH32_state_t));
>+}
>+XXH_PUBLIC_API XXH_errorcode XXH32_freeState(XXH32_state_t* statePtr)
>+{
>+    XXH_free(statePtr);
>+    return XXH_OK;
>+}
>+
>+XXH_PUBLIC_API void XXH32_copyState(XXH32_state_t* dstState, const XXH32_state_t* srcState)
>+{
>+    memcpy(dstState, srcState, sizeof(*dstState));
>+}
>+
>+XXH_PUBLIC_API XXH_errorcode XXH32_reset(XXH32_state_t* statePtr, unsigned int seed)
>+{
>+    XXH32_state_t state;   /* using a local state to memcpy() in order to avoid strict-aliasing warnings */
>+    memset(&state, 0, sizeof(state));
>+    state.v1 = seed + PRIME32_1 + PRIME32_2;
>+    state.v2 = seed + PRIME32_2;
>+    state.v3 = seed + 0;
>+    state.v4 = seed - PRIME32_1;
>+    /* do not write into reserved, planned to be removed in a future version */
>+    memcpy(statePtr, &state, sizeof(state) - sizeof(state.reserved));
>+    return XXH_OK;
>+}
>+
>+
>+FORCE_INLINE XXH_errorcode
>+XXH32_update_endian(XXH32_state_t* state, const void* input, size_t len, XXH_endianess endian)
>+{
>+    if (input==NULL)
>+#if defined(XXH_ACCEPT_NULL_INPUT_POINTER) && (XXH_ACCEPT_NULL_INPUT_POINTER>=1)
>+        return XXH_OK;
>+#else
>+        return XXH_ERROR;
>+#endif
>+
>+    {   const BYTE* p = (const BYTE*)input;
>+        const BYTE* const bEnd = p + len;
>+
>+        state->total_len_32 += (unsigned)len;
>+        state->large_len |= (len>=16) | (state->total_len_32>=16);
>+
>+        if (state->memsize + len < 16)  {   /* fill in tmp buffer */
>+            XXH_memcpy((BYTE*)(state->mem32) + state->memsize, input, len);
>+            state->memsize += (unsigned)len;
>+            return XXH_OK;
>+        }
>+
>+        if (state->memsize) {   /* some data left from previous update */
>+            XXH_memcpy((BYTE*)(state->mem32) + state->memsize, input, 16-state->memsize);
>+            {   const U32* p32 = state->mem32;
>+                state->v1 = XXH32_round(state->v1, XXH_readLE32(p32, endian)); p32++;
>+                state->v2 = XXH32_round(state->v2, XXH_readLE32(p32, endian)); p32++;
>+                state->v3 = XXH32_round(state->v3, XXH_readLE32(p32, endian)); p32++;
>+                state->v4 = XXH32_round(state->v4, XXH_readLE32(p32, endian));
>+            }
>+            p += 16-state->memsize;
>+            state->memsize = 0;
>+        }
>+
>+        if (p <= bEnd-16) {
>+            const BYTE* const limit = bEnd - 16;
>+            U32 v1 = state->v1;
>+            U32 v2 = state->v2;
>+            U32 v3 = state->v3;
>+            U32 v4 = state->v4;
>+
>+            do {
>+                v1 = XXH32_round(v1, XXH_readLE32(p, endian)); p+=4;
>+                v2 = XXH32_round(v2, XXH_readLE32(p, endian)); p+=4;
>+                v3 = XXH32_round(v3, XXH_readLE32(p, endian)); p+=4;
>+                v4 = XXH32_round(v4, XXH_readLE32(p, endian)); p+=4;
>+            } while (p<=limit);
>+
>+            state->v1 = v1;
>+            state->v2 = v2;
>+            state->v3 = v3;
>+            state->v4 = v4;
>+        }
>+
>+        if (p < bEnd) {
>+            XXH_memcpy(state->mem32, p, (size_t)(bEnd-p));
>+            state->memsize = (unsigned)(bEnd-p);
>+        }
>+    }
>+
>+    return XXH_OK;
>+}
>+
>+
>+XXH_PUBLIC_API XXH_errorcode XXH32_update (XXH32_state_t* state_in, const void* input, size_t len)
>+{
>+    XXH_endianess endian_detected = (XXH_endianess)XXH_CPU_LITTLE_ENDIAN;
>+
>+    if ((endian_detected==XXH_littleEndian) || XXH_FORCE_NATIVE_FORMAT)
>+        return XXH32_update_endian(state_in, input, len, XXH_littleEndian);
>+    else
>+        return XXH32_update_endian(state_in, input, len, XXH_bigEndian);
>+}
>+
>+
>+FORCE_INLINE U32
>+XXH32_digest_endian (const XXH32_state_t* state, XXH_endianess endian)
>+{
>+    U32 h32;
>+
>+    if (state->large_len) {
>+        h32 = XXH_rotl32(state->v1, 1)
>+            + XXH_rotl32(state->v2, 7)
>+            + XXH_rotl32(state->v3, 12)
>+            + XXH_rotl32(state->v4, 18);
>+    } else {
>+        h32 = state->v3 /* == seed */ + PRIME32_5;
>+    }
>+
>+    h32 += state->total_len_32;
>+
>+    return XXH32_finalize(h32, state->mem32, state->memsize, endian, XXH_aligned);
>+}
>+
>+
>+XXH_PUBLIC_API unsigned int XXH32_digest (const XXH32_state_t* state_in)
>+{
>+    XXH_endianess endian_detected = (XXH_endianess)XXH_CPU_LITTLE_ENDIAN;
>+
>+    if ((endian_detected==XXH_littleEndian) || XXH_FORCE_NATIVE_FORMAT)
>+        return XXH32_digest_endian(state_in, XXH_littleEndian);
>+    else
>+        return XXH32_digest_endian(state_in, XXH_bigEndian);
>+}
>+
>+
>+/*======   Canonical representation   ======*/
>+
>+/*! Default XXH result types are basic unsigned 32 and 64 bits.
>+*   The canonical representation follows human-readable write convention, aka big-endian (large digits first).
>+*   These functions allow transformation of hash result into and from its canonical format.
>+*   This way, hash values can be written into a file or buffer, remaining comparable across different systems.
>+*/
>+
>+XXH_PUBLIC_API void XXH32_canonicalFromHash(XXH32_canonical_t* dst, XXH32_hash_t hash)
>+{
>+    XXH_STATIC_ASSERT(sizeof(XXH32_canonical_t) == sizeof(XXH32_hash_t));
>+    if (XXH_CPU_LITTLE_ENDIAN) hash = XXH_swap32(hash);
>+    memcpy(dst, &hash, sizeof(*dst));
>+}
>+
>+XXH_PUBLIC_API XXH32_hash_t XXH32_hashFromCanonical(const XXH32_canonical_t* src)
>+{
>+    return XXH_readBE32(src);
>+}
>+
>+
>+#ifndef XXH_NO_LONG_LONG
>+
>+/* *******************************************************************
>+*  64-bit hash functions
>+*********************************************************************/
>+
>+/*======   Memory access   ======*/
>+
>+#ifndef MEM_MODULE
>+# define MEM_MODULE
>+# if !defined (__VMS) \
>+  && (defined (__cplusplus) \
>+  || (defined (__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L) /* C99 */) )
>+#   include <stdint.h>
>+    typedef uint64_t U64;
>+# else
>+    /* if compiler doesn't support unsigned long long, replace by another 64-bit type */
>+    typedef unsigned long long U64;
>+# endif
>+#endif
>+
>+
>+#if (defined(XXH_FORCE_MEMORY_ACCESS) && (XXH_FORCE_MEMORY_ACCESS==2))
>+
>+/* Force direct memory access. Only works on CPU which support unaligned memory access in hardware */
>+static U64 XXH_read64(const void* memPtr) { return *(const U64*) memPtr; }
>+
>+#elif (defined(XXH_FORCE_MEMORY_ACCESS) && (XXH_FORCE_MEMORY_ACCESS==1))
>+
>+/* __pack instructions are safer, but compiler specific, hence potentially problematic for some compilers */
>+/* currently only defined for gcc and icc */
>+typedef union { U32 u32; U64 u64; } __attribute__((packed)) unalign64;
>+static U64 XXH_read64(const void* ptr) { return ((const unalign64*)ptr)->u64; }
>+
>+#else
>+
>+/* portable and safe solution. Generally efficient.
>+ * see : http://stackoverflow.com/a/32095106/646947
>+ */
>+
>+static U64 XXH_read64(const void* memPtr)
>+{
>+    U64 val;
>+    memcpy(&val, memPtr, sizeof(val));
>+    return val;
>+}
>+
>+#endif   /* XXH_FORCE_DIRECT_MEMORY_ACCESS */
>+
>+#if defined(_MSC_VER)     /* Visual Studio */
>+#  define XXH_swap64 _byteswap_uint64
>+#elif XXH_GCC_VERSION >= 403
>+#  define XXH_swap64 __builtin_bswap64
>+#else
>+static U64 XXH_swap64 (U64 x)
>+{
>+    return  ((x << 56) & 0xff00000000000000ULL) |
>+            ((x << 40) & 0x00ff000000000000ULL) |
>+            ((x << 24) & 0x0000ff0000000000ULL) |
>+            ((x << 8)  & 0x000000ff00000000ULL) |
>+            ((x >> 8)  & 0x00000000ff000000ULL) |
>+            ((x >> 24) & 0x0000000000ff0000ULL) |
>+            ((x >> 40) & 0x000000000000ff00ULL) |
>+            ((x >> 56) & 0x00000000000000ffULL);
>+}
>+#endif
>+
>+FORCE_INLINE U64 XXH_readLE64_align(const void* ptr, XXH_endianess endian, XXH_alignment align)
>+{
>+    if (align==XXH_unaligned)
>+        return endian==XXH_littleEndian ? XXH_read64(ptr) : XXH_swap64(XXH_read64(ptr));
>+    else
>+        return endian==XXH_littleEndian ? *(const U64*)ptr : XXH_swap64(*(const U64*)ptr);
>+}
>+
>+FORCE_INLINE U64 XXH_readLE64(const void* ptr, XXH_endianess endian)
>+{
>+    return XXH_readLE64_align(ptr, endian, XXH_unaligned);
>+}
>+
>+static U64 XXH_readBE64(const void* ptr)
>+{
>+    return XXH_CPU_LITTLE_ENDIAN ? XXH_swap64(XXH_read64(ptr)) : XXH_read64(ptr);
>+}
>+
>+
>+/*======   xxh64   ======*/
>+
>+static const U64 PRIME64_1 = 11400714785074694791ULL;   /* 0b1001111000110111011110011011000110000101111010111100101010000111 */
>+static const U64 PRIME64_2 = 14029467366897019727ULL;   /* 0b1100001010110010101011100011110100100111110101001110101101001111 */
>+static const U64 PRIME64_3 =  1609587929392839161ULL;   /* 0b0001011001010110011001111011000110011110001101110111100111111001 */
>+static const U64 PRIME64_4 =  9650029242287828579ULL;   /* 0b1000010111101011110010100111011111000010101100101010111001100011 */
>+static const U64 PRIME64_5 =  2870177450012600261ULL;   /* 0b0010011111010100111010110010111100010110010101100110011111000101 */
>+
>+static U64 XXH64_round(U64 acc, U64 input)
>+{
>+    acc += input * PRIME64_2;
>+    acc  = XXH_rotl64(acc, 31);
>+    acc *= PRIME64_1;
>+    return acc;
>+}
>+
>+static U64 XXH64_mergeRound(U64 acc, U64 val)
>+{
>+    val  = XXH64_round(0, val);
>+    acc ^= val;
>+    acc  = acc * PRIME64_1 + PRIME64_4;
>+    return acc;
>+}
>+
>+static U64 XXH64_avalanche(U64 h64)
>+{
>+    h64 ^= h64 >> 33;
>+    h64 *= PRIME64_2;
>+    h64 ^= h64 >> 29;
>+    h64 *= PRIME64_3;
>+    h64 ^= h64 >> 32;
>+    return h64;
>+}
>+
>+
>+#define XXH_get64bits(p) XXH_readLE64_align(p, endian, align)
>+
>+static U64
>+XXH64_finalize(U64 h64, const void* ptr, size_t len,
>+               XXH_endianess endian, XXH_alignment align)
>+{
>+    const BYTE* p = (const BYTE*)ptr;
>+
>+#define PROCESS1_64            \
>+    h64 ^= (*p++) * PRIME64_5; \
>+    h64 = XXH_rotl64(h64, 11) * PRIME64_1;
>+
>+#define PROCESS4_64          \
>+    h64 ^= (U64)(XXH_get32bits(p)) * PRIME64_1; \
>+    p+=4;                    \
>+    h64 = XXH_rotl64(h64, 23) * PRIME64_2 + PRIME64_3;
>+
>+#define PROCESS8_64 {        \
>+    U64 const k1 = XXH64_round(0, XXH_get64bits(p)); \
>+    p+=8;                    \
>+    h64 ^= k1;               \
>+    h64  = XXH_rotl64(h64,27) * PRIME64_1 + PRIME64_4; \
>+}
>+
>+    switch(len&31) {
>+      case 24: PROCESS8_64;
>+                    /* fallthrough */
>+      case 16: PROCESS8_64;
>+                    /* fallthrough */
>+      case  8: PROCESS8_64;
>+               return XXH64_avalanche(h64);
>+
>+      case 28: PROCESS8_64;
>+                    /* fallthrough */
>+      case 20: PROCESS8_64;
>+                    /* fallthrough */
>+      case 12: PROCESS8_64;
>+                    /* fallthrough */
>+      case  4: PROCESS4_64;
>+               return XXH64_avalanche(h64);
>+
>+      case 25: PROCESS8_64;
>+                    /* fallthrough */
>+      case 17: PROCESS8_64;
>+                    /* fallthrough */
>+      case  9: PROCESS8_64;
>+               PROCESS1_64;
>+               return XXH64_avalanche(h64);
>+
>+      case 29: PROCESS8_64;
>+                    /* fallthrough */
>+      case 21: PROCESS8_64;
>+                    /* fallthrough */
>+      case 13: PROCESS8_64;
>+                    /* fallthrough */
>+      case  5: PROCESS4_64;
>+               PROCESS1_64;
>+               return XXH64_avalanche(h64);
>+
>+      case 26: PROCESS8_64;
>+                    /* fallthrough */
>+      case 18: PROCESS8_64;
>+                    /* fallthrough */
>+      case 10: PROCESS8_64;
>+               PROCESS1_64;
>+               PROCESS1_64;
>+               return XXH64_avalanche(h64);
>+
>+      case 30: PROCESS8_64;
>+                    /* fallthrough */
>+      case 22: PROCESS8_64;
>+                    /* fallthrough */
>+      case 14: PROCESS8_64;
>+                    /* fallthrough */
>+      case  6: PROCESS4_64;
>+               PROCESS1_64;
>+               PROCESS1_64;
>+               return XXH64_avalanche(h64);
>+
>+      case 27: PROCESS8_64;
>+                    /* fallthrough */
>+      case 19: PROCESS8_64;
>+                    /* fallthrough */
>+      case 11: PROCESS8_64;
>+               PROCESS1_64;
>+               PROCESS1_64;
>+               PROCESS1_64;
>+               return XXH64_avalanche(h64);
>+
>+      case 31: PROCESS8_64;
>+                    /* fallthrough */
>+      case 23: PROCESS8_64;
>+                    /* fallthrough */
>+      case 15: PROCESS8_64;
>+                    /* fallthrough */
>+      case  7: PROCESS4_64;
>+                    /* fallthrough */
>+      case  3: PROCESS1_64;
>+                    /* fallthrough */
>+      case  2: PROCESS1_64;
>+                    /* fallthrough */
>+      case  1: PROCESS1_64;
>+                    /* fallthrough */
>+      case  0: return XXH64_avalanche(h64);
>+    }
>+
>+    /* impossible to reach */
>+    assert(0);
>+    return 0;  /* unreachable, but some compilers complain without it */
>+}
>+
>+FORCE_INLINE U64
>+XXH64_endian_align(const void* input, size_t len, U64 seed,
>+                XXH_endianess endian, XXH_alignment align)
>+{
>+    const BYTE* p = (const BYTE*)input;
>+    const BYTE* bEnd = p + len;
>+    U64 h64;
>+
>+#if defined(XXH_ACCEPT_NULL_INPUT_POINTER) && (XXH_ACCEPT_NULL_INPUT_POINTER>=1)
>+    if (p==NULL) {
>+        len=0;
>+        bEnd=p=(const BYTE*)(size_t)32;
>+    }
>+#endif
>+
>+    if (len>=32) {
>+        const BYTE* const limit = bEnd - 32;
>+        U64 v1 = seed + PRIME64_1 + PRIME64_2;
>+        U64 v2 = seed + PRIME64_2;
>+        U64 v3 = seed + 0;
>+        U64 v4 = seed - PRIME64_1;
>+
>+        do {
>+            v1 = XXH64_round(v1, XXH_get64bits(p)); p+=8;
>+            v2 = XXH64_round(v2, XXH_get64bits(p)); p+=8;
>+            v3 = XXH64_round(v3, XXH_get64bits(p)); p+=8;
>+            v4 = XXH64_round(v4, XXH_get64bits(p)); p+=8;
>+        } while (p<=limit);
>+
>+        h64 = XXH_rotl64(v1, 1) + XXH_rotl64(v2, 7) + XXH_rotl64(v3, 12) + XXH_rotl64(v4, 18);
>+        h64 = XXH64_mergeRound(h64, v1);
>+        h64 = XXH64_mergeRound(h64, v2);
>+        h64 = XXH64_mergeRound(h64, v3);
>+        h64 = XXH64_mergeRound(h64, v4);
>+
>+    } else {
>+        h64  = seed + PRIME64_5;
>+    }
>+
>+    h64 += (U64) len;
>+
>+    return XXH64_finalize(h64, p, len, endian, align);
>+}
>+
>+
>+XXH_PUBLIC_API unsigned long long XXH64 (const void* input, size_t len, unsigned long long seed)
>+{
>+#if 0
>+    /* Simple version, good for code maintenance, but unfortunately slow for small inputs */
>+    XXH64_state_t state;
>+    XXH64_reset(&state, seed);
>+    XXH64_update(&state, input, len);
>+    return XXH64_digest(&state);
>+#else
>+    XXH_endianess endian_detected = (XXH_endianess)XXH_CPU_LITTLE_ENDIAN;
>+
>+    if (XXH_FORCE_ALIGN_CHECK) {
>+        if ((((size_t)input) & 7)==0) {  /* Input is aligned, let's leverage the speed advantage */
>+            if ((endian_detected==XXH_littleEndian) || XXH_FORCE_NATIVE_FORMAT)
>+                return XXH64_endian_align(input, len, seed, XXH_littleEndian, XXH_aligned);
>+            else
>+                return XXH64_endian_align(input, len, seed, XXH_bigEndian, XXH_aligned);
>+    }   }
>+
>+    if ((endian_detected==XXH_littleEndian) || XXH_FORCE_NATIVE_FORMAT)
>+        return XXH64_endian_align(input, len, seed, XXH_littleEndian, XXH_unaligned);
>+    else
>+        return XXH64_endian_align(input, len, seed, XXH_bigEndian, XXH_unaligned);
>+#endif
>+}
>+
>+/*======   Hash Streaming   ======*/
>+
>+XXH_PUBLIC_API XXH64_state_t* XXH64_createState(void)
>+{
>+    return (XXH64_state_t*)XXH_malloc(sizeof(XXH64_state_t));
>+}
>+XXH_PUBLIC_API XXH_errorcode XXH64_freeState(XXH64_state_t* statePtr)
>+{
>+    XXH_free(statePtr);
>+    return XXH_OK;
>+}
>+
>+XXH_PUBLIC_API void XXH64_copyState(XXH64_state_t* dstState, const XXH64_state_t* srcState)
>+{
>+    memcpy(dstState, srcState, sizeof(*dstState));
>+}
>+
>+XXH_PUBLIC_API XXH_errorcode XXH64_reset(XXH64_state_t* statePtr, unsigned long long seed)
>+{
>+    XXH64_state_t state;   /* using a local state to memcpy() in order to avoid strict-aliasing warnings */
>+    memset(&state, 0, sizeof(state));
>+    state.v1 = seed + PRIME64_1 + PRIME64_2;
>+    state.v2 = seed + PRIME64_2;
>+    state.v3 = seed + 0;
>+    state.v4 = seed - PRIME64_1;
>+     /* do not write into reserved, planned to be removed in a future version */
>+    memcpy(statePtr, &state, sizeof(state) - sizeof(state.reserved));
>+    return XXH_OK;
>+}
>+
>+FORCE_INLINE XXH_errorcode
>+XXH64_update_endian (XXH64_state_t* state, const void* input, size_t len, XXH_endianess endian)
>+{
>+    if (input==NULL)
>+#if defined(XXH_ACCEPT_NULL_INPUT_POINTER) && (XXH_ACCEPT_NULL_INPUT_POINTER>=1)
>+        return XXH_OK;
>+#else
>+        return XXH_ERROR;
>+#endif
>+
>+    {   const BYTE* p = (const BYTE*)input;
>+        const BYTE* const bEnd = p + len;
>+
>+        state->total_len += len;
>+
>+        if (state->memsize + len < 32) {  /* fill in tmp buffer */
>+            XXH_memcpy(((BYTE*)state->mem64) + state->memsize, input, len);
>+            state->memsize += (U32)len;
>+            return XXH_OK;
>+        }
>+
>+        if (state->memsize) {   /* tmp buffer is full */
>+            XXH_memcpy(((BYTE*)state->mem64) + state->memsize, input, 32-state->memsize);
>+            state->v1 = XXH64_round(state->v1, XXH_readLE64(state->mem64+0, endian));
>+            state->v2 = XXH64_round(state->v2, XXH_readLE64(state->mem64+1, endian));
>+            state->v3 = XXH64_round(state->v3, XXH_readLE64(state->mem64+2, endian));
>+            state->v4 = XXH64_round(state->v4, XXH_readLE64(state->mem64+3, endian));
>+            p += 32-state->memsize;
>+            state->memsize = 0;
>+        }
>+
>+        if (p+32 <= bEnd) {
>+            const BYTE* const limit = bEnd - 32;
>+            U64 v1 = state->v1;
>+            U64 v2 = state->v2;
>+            U64 v3 = state->v3;
>+            U64 v4 = state->v4;
>+
>+            do {
>+                v1 = XXH64_round(v1, XXH_readLE64(p, endian)); p+=8;
>+                v2 = XXH64_round(v2, XXH_readLE64(p, endian)); p+=8;
>+                v3 = XXH64_round(v3, XXH_readLE64(p, endian)); p+=8;
>+                v4 = XXH64_round(v4, XXH_readLE64(p, endian)); p+=8;
>+            } while (p<=limit);
>+
>+            state->v1 = v1;
>+            state->v2 = v2;
>+            state->v3 = v3;
>+            state->v4 = v4;
>+        }
>+
>+        if (p < bEnd) {
>+            XXH_memcpy(state->mem64, p, (size_t)(bEnd-p));
>+            state->memsize = (unsigned)(bEnd-p);
>+        }
>+    }
>+
>+    return XXH_OK;
>+}
>+
>+XXH_PUBLIC_API XXH_errorcode XXH64_update (XXH64_state_t* state_in, const void* input, size_t len)
>+{
>+    XXH_endianess endian_detected = (XXH_endianess)XXH_CPU_LITTLE_ENDIAN;
>+
>+    if ((endian_detected==XXH_littleEndian) || XXH_FORCE_NATIVE_FORMAT)
>+        return XXH64_update_endian(state_in, input, len, XXH_littleEndian);
>+    else
>+        return XXH64_update_endian(state_in, input, len, XXH_bigEndian);
>+}
>+
>+FORCE_INLINE U64 XXH64_digest_endian (const XXH64_state_t* state, XXH_endianess endian)
>+{
>+    U64 h64;
>+
>+    if (state->total_len >= 32) {
>+        U64 const v1 = state->v1;
>+        U64 const v2 = state->v2;
>+        U64 const v3 = state->v3;
>+        U64 const v4 = state->v4;
>+
>+        h64 = XXH_rotl64(v1, 1) + XXH_rotl64(v2, 7) + XXH_rotl64(v3, 12) + XXH_rotl64(v4, 18);
>+        h64 = XXH64_mergeRound(h64, v1);
>+        h64 = XXH64_mergeRound(h64, v2);
>+        h64 = XXH64_mergeRound(h64, v3);
>+        h64 = XXH64_mergeRound(h64, v4);
>+    } else {
>+        h64  = state->v3 /*seed*/ + PRIME64_5;
>+    }
>+
>+    h64 += (U64) state->total_len;
>+
>+    return XXH64_finalize(h64, state->mem64, (size_t)state->total_len, endian, XXH_aligned);
>+}
>+
>+XXH_PUBLIC_API unsigned long long XXH64_digest (const XXH64_state_t* state_in)
>+{
>+    XXH_endianess endian_detected = (XXH_endianess)XXH_CPU_LITTLE_ENDIAN;
>+
>+    if ((endian_detected==XXH_littleEndian) || XXH_FORCE_NATIVE_FORMAT)
>+        return XXH64_digest_endian(state_in, XXH_littleEndian);
>+    else
>+        return XXH64_digest_endian(state_in, XXH_bigEndian);
>+}
>+
>+
>+/*====== Canonical representation   ======*/
>+
>+XXH_PUBLIC_API void XXH64_canonicalFromHash(XXH64_canonical_t* dst, XXH64_hash_t hash)
>+{
>+    XXH_STATIC_ASSERT(sizeof(XXH64_canonical_t) == sizeof(XXH64_hash_t));
>+    if (XXH_CPU_LITTLE_ENDIAN) hash = XXH_swap64(hash);
>+    memcpy(dst, &hash, sizeof(*dst));
>+}
>+
>+XXH_PUBLIC_API XXH64_hash_t XXH64_hashFromCanonical(const XXH64_canonical_t* src)
>+{
>+    return XXH_readBE64(src);
>+}
>+
>+#endif  /* XXH_NO_LONG_LONG */
>diff --git a/Source/ThirdParty/ANGLE/src/common/third_party/xxhash/xxhash.h b/Source/ThirdParty/ANGLE/src/common/third_party/xxhash/xxhash.h
>new file mode 100644
>index 00000000000..0de203c947b
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/common/third_party/xxhash/xxhash.h
>@@ -0,0 +1,341 @@
>+/*
>+   xxHash - Extremely Fast Hash algorithm
>+   Header File
>+   Copyright (C) 2012-2016, Yann Collet.
>+
>+   BSD 2-Clause License (http://www.opensource.org/licenses/bsd-license.php)
>+
>+   Redistribution and use in source and binary forms, with or without
>+   modification, are permitted provided that the following conditions are
>+   met:
>+
>+       * Redistributions of source code must retain the above copyright
>+   notice, this list of conditions and the following disclaimer.
>+       * Redistributions in binary form must reproduce the above
>+   copyright notice, this list of conditions and the following disclaimer
>+   in the documentation and/or other materials provided with the
>+   distribution.
>+
>+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
>+   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
>+   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
>+   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
>+   OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
>+   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
>+   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
>+   DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
>+   THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
>+   (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
>+   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>+
>+   You can contact the author at :
>+   - xxHash source repository : https://github.com/Cyan4973/xxHash
>+*/
>+
>+/* Notice extracted from xxHash homepage :
>+
>+xxHash is an extremely fast Hash algorithm, running at RAM speed limits.
>+It also successfully passes all tests from the SMHasher suite.
>+
>+Comparison (single thread, Windows Seven 32 bits, using SMHasher on a Core 2 Duo @3GHz)
>+
>+Name            Speed       Q.Score   Author
>+xxHash          5.4 GB/s     10
>+CrapWow         3.2 GB/s      2       Andrew
>+MumurHash 3a    2.7 GB/s     10       Austin Appleby
>+SpookyHash      2.0 GB/s     10       Bob Jenkins
>+SBox            1.4 GB/s      9       Bret Mulvey
>+Lookup3         1.2 GB/s      9       Bob Jenkins
>+SuperFastHash   1.2 GB/s      1       Paul Hsieh
>+CityHash64      1.05 GB/s    10       Pike & Alakuijala
>+FNV             0.55 GB/s     5       Fowler, Noll, Vo
>+CRC32           0.43 GB/s     9
>+MD5-32          0.33 GB/s    10       Ronald L. Rivest
>+SHA1-32         0.28 GB/s    10
>+
>+Q.Score is a measure of quality of the hash function.
>+It depends on successfully passing SMHasher test set.
>+10 is a perfect score.
>+
>+A 64-bit version, named XXH64, is available since r35.
>+It offers much better speed, but for 64-bit applications only.
>+Name     Speed on 64 bits    Speed on 32 bits
>+XXH64       13.8 GB/s            1.9 GB/s
>+XXH32        6.8 GB/s            6.0 GB/s
>+*/
>+
>+#ifndef XXHASH_H_5627135585666179
>+#define XXHASH_H_5627135585666179 1
>+
>+#if defined(__cplusplus)
>+extern "C" {
>+#endif
>+
>+/* ****************************
>+ *  Definitions
>+ ******************************/
>+#include <stddef.h> /* size_t */
>+typedef enum
>+{
>+    XXH_OK = 0,
>+    XXH_ERROR
>+} XXH_errorcode;
>+
>+/* ****************************
>+ *  API modifier
>+ ******************************/
>+/** XXH_INLINE_ALL (and XXH_PRIVATE_API)
>+ *  This is useful to include xxhash functions in `static` mode
>+ *  in order to inline them, and remove their symbol from the public list.
>+ *  Inlining can offer dramatic performance improvement on small keys.
>+ *  Methodology :
>+ *     #define XXH_INLINE_ALL
>+ *     #include "xxhash.h"
>+ * `xxhash.c` is automatically included.
>+ *  It's not useful to compile and link it as a separate module.
>+ */
>+#if defined(XXH_INLINE_ALL) || defined(XXH_PRIVATE_API)
>+#    ifndef XXH_STATIC_LINKING_ONLY
>+#        define XXH_STATIC_LINKING_ONLY
>+#    endif
>+#    if defined(__GNUC__)
>+#        define XXH_PUBLIC_API static __inline __attribute__((unused))
>+#elif defined(__cplusplus) || (defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L) /* C99 \
>+                                                                                           */)
>+#        define XXH_PUBLIC_API static inline
>+#    elif defined(_MSC_VER)
>+#        define XXH_PUBLIC_API static __inline
>+#    else
>+/* this version may generate warnings for unused static functions */
>+#        define XXH_PUBLIC_API static
>+#    endif
>+#else
>+#    define XXH_PUBLIC_API /* do nothing */
>+#endif                     /* XXH_INLINE_ALL || XXH_PRIVATE_API */
>+
>+/*! XXH_NAMESPACE, aka Namespace Emulation :
>+ *
>+ * If you want to include _and expose_ xxHash functions from within your own library,
>+ * but also want to avoid symbol collisions with other libraries which may also include xxHash,
>+ *
>+ * you can use XXH_NAMESPACE, to automatically prefix any public symbol from xxhash library
>+ * with the value of XXH_NAMESPACE (therefore, avoid NULL and numeric values).
>+ *
>+ * Note that no change is required within the calling program as long as it includes `xxhash.h` :
>+ * regular symbol name will be automatically translated by this header.
>+ */
>+#ifdef XXH_NAMESPACE
>+#    define XXH_CAT(A, B) A##B
>+#    define XXH_NAME2(A, B) XXH_CAT(A, B)
>+#    define XXH_versionNumber XXH_NAME2(XXH_NAMESPACE, XXH_versionNumber)
>+#    define XXH32 XXH_NAME2(XXH_NAMESPACE, XXH32)
>+#    define XXH32_createState XXH_NAME2(XXH_NAMESPACE, XXH32_createState)
>+#    define XXH32_freeState XXH_NAME2(XXH_NAMESPACE, XXH32_freeState)
>+#    define XXH32_reset XXH_NAME2(XXH_NAMESPACE, XXH32_reset)
>+#    define XXH32_update XXH_NAME2(XXH_NAMESPACE, XXH32_update)
>+#    define XXH32_digest XXH_NAME2(XXH_NAMESPACE, XXH32_digest)
>+#    define XXH32_copyState XXH_NAME2(XXH_NAMESPACE, XXH32_copyState)
>+#    define XXH32_canonicalFromHash XXH_NAME2(XXH_NAMESPACE, XXH32_canonicalFromHash)
>+#    define XXH32_hashFromCanonical XXH_NAME2(XXH_NAMESPACE, XXH32_hashFromCanonical)
>+#    define XXH64 XXH_NAME2(XXH_NAMESPACE, XXH64)
>+#    define XXH64_createState XXH_NAME2(XXH_NAMESPACE, XXH64_createState)
>+#    define XXH64_freeState XXH_NAME2(XXH_NAMESPACE, XXH64_freeState)
>+#    define XXH64_reset XXH_NAME2(XXH_NAMESPACE, XXH64_reset)
>+#    define XXH64_update XXH_NAME2(XXH_NAMESPACE, XXH64_update)
>+#    define XXH64_digest XXH_NAME2(XXH_NAMESPACE, XXH64_digest)
>+#    define XXH64_copyState XXH_NAME2(XXH_NAMESPACE, XXH64_copyState)
>+#    define XXH64_canonicalFromHash XXH_NAME2(XXH_NAMESPACE, XXH64_canonicalFromHash)
>+#    define XXH64_hashFromCanonical XXH_NAME2(XXH_NAMESPACE, XXH64_hashFromCanonical)
>+#endif
>+
>+/* *************************************
>+ *  Version
>+ ***************************************/
>+#define XXH_VERSION_MAJOR 0
>+#define XXH_VERSION_MINOR 6
>+#define XXH_VERSION_RELEASE 5
>+#define XXH_VERSION_NUMBER \
>+    (XXH_VERSION_MAJOR * 100 * 100 + XXH_VERSION_MINOR * 100 + XXH_VERSION_RELEASE)
>+XXH_PUBLIC_API unsigned XXH_versionNumber(void);
>+
>+/*-**********************************************************************
>+ *  32-bit hash
>+ ************************************************************************/
>+typedef unsigned int XXH32_hash_t;
>+
>+/*! XXH32() :
>+    Calculate the 32-bit hash of sequence "length" bytes stored at memory address "input".
>+    The memory between input & input+length must be valid (allocated and read-accessible).
>+    "seed" can be used to alter the result predictably.
>+    Speed on Core 2 Duo @ 3 GHz (single thread, SMHasher benchmark) : 5.4 GB/s */
>+XXH_PUBLIC_API XXH32_hash_t XXH32(const void *input, size_t length, unsigned int seed);
>+
>+/*======   Streaming   ======*/
>+typedef struct XXH32_state_s XXH32_state_t; /* incomplete type */
>+XXH_PUBLIC_API XXH32_state_t *XXH32_createState(void);
>+XXH_PUBLIC_API XXH_errorcode XXH32_freeState(XXH32_state_t *statePtr);
>+XXH_PUBLIC_API void XXH32_copyState(XXH32_state_t *dst_state, const XXH32_state_t *src_state);
>+
>+XXH_PUBLIC_API XXH_errorcode XXH32_reset(XXH32_state_t *statePtr, unsigned int seed);
>+XXH_PUBLIC_API XXH_errorcode XXH32_update(XXH32_state_t *statePtr,
>+                                          const void *input,
>+                                          size_t length);
>+XXH_PUBLIC_API XXH32_hash_t XXH32_digest(const XXH32_state_t *statePtr);
>+
>+/*
>+ * Streaming functions generate the xxHash of an input provided in multiple segments.
>+ * Note that, for small input, they are slower than single-call functions, due to state
>+ * management. For small inputs, prefer `XXH32()` and `XXH64()`, which are better optimized.
>+ *
>+ * XXH state must first be allocated, using XXH*_createState() .
>+ *
>+ * Start a new hash by initializing state with a seed, using XXH*_reset().
>+ *
>+ * Then, feed the hash state by calling XXH*_update() as many times as necessary.
>+ * The function returns an error code, with 0 meaning OK, and any other value meaning there is
>+ * an error.
>+ *
>+ * Finally, a hash value can be produced anytime, by using XXH*_digest().
>+ * This function returns the nn-bits hash as an int or long long.
>+ *
>+ * It's still possible to continue inserting input into the hash state after a digest,
>+ * and generate some new hashes later on, by calling again XXH*_digest().
>+ *
>+ * When done, free XXH state space if it was allocated dynamically.
>+ */
>+
>+/*======   Canonical representation   ======*/
>+
>+typedef struct
>+{
>+    unsigned char digest[4];
>+} XXH32_canonical_t;
>+XXH_PUBLIC_API void XXH32_canonicalFromHash(XXH32_canonical_t *dst, XXH32_hash_t hash);
>+XXH_PUBLIC_API XXH32_hash_t XXH32_hashFromCanonical(const XXH32_canonical_t *src);
>+
>+/* Default result type for XXH functions are primitive unsigned 32 and 64 bits.
>+ * The canonical representation uses human-readable write convention, aka big-endian (large
>+ * digits first). These functions allow transformation of hash result into and from its
>+ * canonical format. This way, hash values can be written into a file / memory, and remain
>+ * comparable on different systems and programs.
>+ */
>+
>+#ifndef XXH_NO_LONG_LONG
>+/*-**********************************************************************
>+ *  64-bit hash
>+ ************************************************************************/
>+typedef unsigned long long XXH64_hash_t;
>+
>+/*! XXH64() :
>+    Calculate the 64-bit hash of sequence of length "len" stored at memory address "input".
>+    "seed" can be used to alter the result predictably.
>+    This function runs faster on 64-bit systems, but slower on 32-bit systems (see benchmark).
>+*/
>+XXH_PUBLIC_API XXH64_hash_t XXH64(const void *input, size_t length, unsigned long long seed);
>+
>+/*======   Streaming   ======*/
>+typedef struct XXH64_state_s XXH64_state_t; /* incomplete type */
>+XXH_PUBLIC_API XXH64_state_t *XXH64_createState(void);
>+XXH_PUBLIC_API XXH_errorcode XXH64_freeState(XXH64_state_t *statePtr);
>+XXH_PUBLIC_API void XXH64_copyState(XXH64_state_t *dst_state, const XXH64_state_t *src_state);
>+
>+XXH_PUBLIC_API XXH_errorcode XXH64_reset(XXH64_state_t *statePtr, unsigned long long seed);
>+XXH_PUBLIC_API XXH_errorcode XXH64_update(XXH64_state_t *statePtr,
>+                                          const void *input,
>+                                          size_t length);
>+XXH_PUBLIC_API XXH64_hash_t XXH64_digest(const XXH64_state_t *statePtr);
>+
>+/*======   Canonical representation   ======*/
>+typedef struct
>+{
>+    unsigned char digest[8];
>+} XXH64_canonical_t;
>+XXH_PUBLIC_API void XXH64_canonicalFromHash(XXH64_canonical_t *dst, XXH64_hash_t hash);
>+XXH_PUBLIC_API XXH64_hash_t XXH64_hashFromCanonical(const XXH64_canonical_t *src);
>+#endif /* XXH_NO_LONG_LONG */
>+
>+#ifdef XXH_STATIC_LINKING_ONLY
>+
>+/* ================================================================================================
>+   This section contains declarations which are not guaranteed to remain stable.
>+   They may change in future versions, becoming incompatible with a different version of the
>+library. These declarations should only be used with static linking. Never use them in
>+association with dynamic linking !
>+===================================================================================================
>+*/
>+
>+/* These definitions are only present to allow
>+ * static allocation of XXH state, on stack or in a struct for example.
>+ * Never **ever** use members directly. */
>+
>+#    if !defined(__VMS) && (defined(__cplusplus) || (defined(__STDC_VERSION__) && \
>+                                                     (__STDC_VERSION__ >= 199901L) /* C99 */))
>+#        include <stdint.h>
>+
>+struct XXH32_state_s
>+{
>+    uint32_t total_len_32;
>+    uint32_t large_len;
>+    uint32_t v1;
>+    uint32_t v2;
>+    uint32_t v3;
>+    uint32_t v4;
>+    uint32_t mem32[4];
>+    uint32_t memsize;
>+    uint32_t reserved; /* never read nor write, might be removed in a future version */
>+};                     /* typedef'd to XXH32_state_t */
>+
>+struct XXH64_state_s
>+{
>+    uint64_t total_len;
>+    uint64_t v1;
>+    uint64_t v2;
>+    uint64_t v3;
>+    uint64_t v4;
>+    uint64_t mem64[4];
>+    uint32_t memsize;
>+    uint32_t reserved[2]; /* never read nor write, might be removed in a future version */
>+};                        /* typedef'd to XXH64_state_t */
>+
>+#    else
>+
>+struct XXH32_state_s
>+{
>+    unsigned total_len_32;
>+    unsigned large_len;
>+    unsigned v1;
>+    unsigned v2;
>+    unsigned v3;
>+    unsigned v4;
>+    unsigned mem32[4];
>+    unsigned memsize;
>+    unsigned reserved; /* never read nor write, might be removed in a future version */
>+};                     /* typedef'd to XXH32_state_t */
>+
>+#        ifndef XXH_NO_LONG_LONG /* remove 64-bit support */
>+struct XXH64_state_s
>+{
>+    unsigned long long total_len;
>+    unsigned long long v1;
>+    unsigned long long v2;
>+    unsigned long long v3;
>+    unsigned long long v4;
>+    unsigned long long mem64[4];
>+    unsigned memsize;
>+    unsigned reserved[2]; /* never read nor write, might be removed in a future version */
>+};                        /* typedef'd to XXH64_state_t */
>+#        endif
>+
>+#    endif
>+
>+#    if defined(XXH_INLINE_ALL) || defined(XXH_PRIVATE_API)
>+#        include "xxhash.c" /* include xxhash function bodies as `static`, for inlining */
>+#    endif
>+
>+#endif /* XXH_STATIC_LINKING_ONLY */
>+
>+#if defined(__cplusplus)
>+}
>+#endif
>+
>+#endif /* XXHASH_H_5627135585666179 */
>diff --git a/Source/ThirdParty/ANGLE/src/common/third_party/xxhash/xxhash_fuzzer.cpp b/Source/ThirdParty/ANGLE/src/common/third_party/xxhash/xxhash_fuzzer.cpp
>new file mode 100644
>index 00000000000..638c1920445
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/common/third_party/xxhash/xxhash_fuzzer.cpp
>@@ -0,0 +1,46 @@
>+//
>+// Copyright 2019 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// xxHash Fuzzer test:
>+//      Integration with Chromium's libfuzzer for xxHash.
>+
>+#include <cstddef>
>+#include <cstdint>
>+#include <cstring>
>+
>+#include "xxhash.h"
>+
>+extern "C" int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size)
>+{
>+#if !defined(XXH_NO_LONG_LONG)
>+    // Test 64-bit hash.
>+    size_t seedSize64 = sizeof(unsigned long long);
>+    if (size < seedSize64)
>+    {
>+        XXH64(data, size, 0ull);
>+    }
>+    else
>+    {
>+        unsigned long long seed64;
>+        memcpy(&seed64, data, seedSize64);
>+        XXH64(&data[seedSize64], size - seedSize64, seed64);
>+    }
>+#endif  // !defined(XXH_NO_LONG_LONG)
>+
>+    // Test 32-bit hash.
>+    size_t seedSize32 = sizeof(unsigned int);
>+    if (size < seedSize32)
>+    {
>+        XXH64(data, size, 0ull);
>+    }
>+    else
>+    {
>+        unsigned long long seed32;
>+        memcpy(&seed32, data, seedSize32);
>+        XXH32(&data[seedSize32], size - seedSize32, seed32);
>+    }
>+
>+    return 0;
>+}
>diff --git a/Source/ThirdParty/ANGLE/src/common/tls.cpp b/Source/ThirdParty/ANGLE/src/common/tls.cpp
>index 10a10252f4c..20977f48cfb 100644
>--- a/Source/ThirdParty/ANGLE/src/common/tls.cpp
>+++ b/Source/ThirdParty/ANGLE/src/common/tls.cpp
>@@ -11,24 +11,24 @@
> #include <assert.h>
> 
> #ifdef ANGLE_ENABLE_WINDOWS_STORE
>-#include <vector>
>-#include <set>
>-#include <map>
>-#include <mutex>
>+#    include <map>
>+#    include <mutex>
>+#    include <set>
>+#    include <vector>
> 
>-#include <wrl/client.h>
>-#include <wrl/async.h>
>-#include <Windows.System.Threading.h>
>+#    include <Windows.System.Threading.h>
>+#    include <wrl/async.h>
>+#    include <wrl/client.h>
> 
> using namespace std;
> using namespace Windows::Foundation;
> using namespace ABI::Windows::System::Threading;
> 
> // Thread local storage for Windows Store support
>-typedef vector<void*> ThreadLocalData;
>+typedef vector<void *> ThreadLocalData;
> 
>-static __declspec(thread) ThreadLocalData* currentThreadData = nullptr;
>-static set<ThreadLocalData*> allThreadData;
>+static __declspec(thread) ThreadLocalData *currentThreadData = nullptr;
>+static set<ThreadLocalData *> allThreadData;
> static DWORD nextTlsIndex = 0;
> static vector<DWORD> freeTlsIndices;
> 
>@@ -39,7 +39,7 @@ TLSIndex CreateTLSIndex()
>     TLSIndex index;
> 
> #ifdef ANGLE_PLATFORM_WINDOWS
>-#ifdef ANGLE_ENABLE_WINDOWS_STORE
>+#    ifdef ANGLE_ENABLE_WINDOWS_STORE
>     if (!freeTlsIndices.empty())
>     {
>         DWORD result = freeTlsIndices.back();
>@@ -50,9 +50,9 @@ TLSIndex CreateTLSIndex()
>     {
>         index = nextTlsIndex++;
>     }
>-#else
>+#    else
>     index = TlsAlloc();
>-#endif
>+#    endif
> 
> #elif defined(ANGLE_PLATFORM_POSIX)
>     // Create global pool key
>@@ -62,7 +62,8 @@ TLSIndex CreateTLSIndex()
>     }
> #endif
> 
>-    assert(index != TLS_INVALID_INDEX && "CreateTLSIndex(): Unable to allocate Thread Local Storage");
>+    assert(index != TLS_INVALID_INDEX &&
>+           "CreateTLSIndex(): Unable to allocate Thread Local Storage");
>     return index;
> }
> 
>@@ -75,7 +76,7 @@ bool DestroyTLSIndex(TLSIndex index)
>     }
> 
> #ifdef ANGLE_PLATFORM_WINDOWS
>-#ifdef ANGLE_ENABLE_WINDOWS_STORE
>+#    ifdef ANGLE_ENABLE_WINDOWS_STORE
>     assert(index < nextTlsIndex);
>     assert(find(freeTlsIndices.begin(), freeTlsIndices.end(), index) == freeTlsIndices.end());
> 
>@@ -88,9 +89,9 @@ bool DestroyTLSIndex(TLSIndex index)
>         }
>     }
>     return true;
>-#else
>+#    else
>     return (TlsFree(index) == TRUE);
>-#endif
>+#    endif
> #elif defined(ANGLE_PLATFORM_POSIX)
>     return (pthread_key_delete(index) == 0);
> #endif
>@@ -105,8 +106,8 @@ bool SetTLSValue(TLSIndex index, void *value)
>     }
> 
> #ifdef ANGLE_PLATFORM_WINDOWS
>-#ifdef ANGLE_ENABLE_WINDOWS_STORE
>-    ThreadLocalData* threadData = currentThreadData;
>+#    ifdef ANGLE_ENABLE_WINDOWS_STORE
>+    ThreadLocalData *threadData = currentThreadData;
>     if (!threadData)
>     {
>         threadData = new ThreadLocalData(index + 1, nullptr);
>@@ -120,9 +121,9 @@ bool SetTLSValue(TLSIndex index, void *value)
> 
>     threadData->at(index) = value;
>     return true;
>-#else
>+#    else
>     return (TlsSetValue(index, value) == TRUE);
>-#endif
>+#    endif
> #elif defined(ANGLE_PLATFORM_POSIX)
>     return (pthread_setspecific(index, value) == 0);
> #endif
>@@ -137,8 +138,8 @@ void *GetTLSValue(TLSIndex index)
>     }
> 
> #ifdef ANGLE_PLATFORM_WINDOWS
>-#ifdef ANGLE_ENABLE_WINDOWS_STORE
>-    ThreadLocalData* threadData = currentThreadData;
>+#    ifdef ANGLE_ENABLE_WINDOWS_STORE
>+    ThreadLocalData *threadData = currentThreadData;
>     if (threadData && threadData->size() > index)
>     {
>         return threadData->at(index);
>@@ -147,9 +148,9 @@ void *GetTLSValue(TLSIndex index)
>     {
>         return nullptr;
>     }
>-#else
>+#    else
>     return TlsGetValue(index);
>-#endif
>+#    endif
> #elif defined(ANGLE_PLATFORM_POSIX)
>     return pthread_getspecific(index);
> #endif
>diff --git a/Source/ThirdParty/ANGLE/src/common/tls.h b/Source/ThirdParty/ANGLE/src/common/tls.h
>index ca9e07ab700..33c776adc5b 100644
>--- a/Source/ThirdParty/ANGLE/src/common/tls.h
>+++ b/Source/ThirdParty/ANGLE/src/common/tls.h
>@@ -14,24 +14,24 @@
> #ifdef ANGLE_PLATFORM_WINDOWS
> 
> // TLS does not exist for Windows Store and needs to be emulated
>-#   ifdef ANGLE_ENABLE_WINDOWS_STORE
>-#       ifndef TLS_OUT_OF_INDEXES
>-#           define TLS_OUT_OF_INDEXES static_cast<DWORD>(0xFFFFFFFF)
>-#       endif
>-#       ifndef CREATE_SUSPENDED
>-#           define CREATE_SUSPENDED 0x00000004
>-#       endif
>-#   endif
>-    typedef DWORD TLSIndex;
>-#   define TLS_INVALID_INDEX (TLS_OUT_OF_INDEXES)
>+#    ifdef ANGLE_ENABLE_WINDOWS_STORE
>+#        ifndef TLS_OUT_OF_INDEXES
>+#            define TLS_OUT_OF_INDEXES static_cast<DWORD>(0xFFFFFFFF)
>+#        endif
>+#        ifndef CREATE_SUSPENDED
>+#            define CREATE_SUSPENDED 0x00000004
>+#        endif
>+#    endif
>+typedef DWORD TLSIndex;
>+#    define TLS_INVALID_INDEX (TLS_OUT_OF_INDEXES)
> #elif defined(ANGLE_PLATFORM_POSIX)
>-#   include <pthread.h>
>-#   include <semaphore.h>
>-#   include <errno.h>
>-    typedef pthread_key_t TLSIndex;
>-#   define TLS_INVALID_INDEX (static_cast<TLSIndex>(-1))
>+#    include <errno.h>
>+#    include <pthread.h>
>+#    include <semaphore.h>
>+typedef pthread_key_t TLSIndex;
>+#    define TLS_INVALID_INDEX (static_cast<TLSIndex>(-1))
> #else
>-#   error Unsupported platform.
>+#    error Unsupported platform.
> #endif
> 
> // TODO(kbr): for POSIX platforms this will have to be changed to take
>@@ -43,4 +43,4 @@ bool DestroyTLSIndex(TLSIndex index);
> bool SetTLSValue(TLSIndex index, void *value);
> void *GetTLSValue(TLSIndex index);
> 
>-#endif // COMMON_TLS_H_
>+#endif  // COMMON_TLS_H_
>diff --git a/Source/ThirdParty/ANGLE/src/common/uniform_type_info_autogen.cpp b/Source/ThirdParty/ANGLE/src/common/uniform_type_info_autogen.cpp
>index 9c199128a4a..1de2146dc0f 100644
>--- a/Source/ThirdParty/ANGLE/src/common/uniform_type_info_autogen.cpp
>+++ b/Source/ThirdParty/ANGLE/src/common/uniform_type_info_autogen.cpp
>@@ -1,7 +1,7 @@
> // GENERATED FILE - DO NOT EDIT.
> // Generated by gen_uniform_type_table.py.
> //
>-// Copyright 2017 The ANGLE Project Authors. All rights reserved.
>+// Copyright 2019 The ANGLE Project Authors. All rights reserved.
> // Use of this source code is governed by a BSD-style license that can be
> // found in the LICENSE file.
> //
>@@ -18,124 +18,152 @@ namespace gl
> 
> namespace
> {
>-constexpr std::array<UniformTypeInfo, 59> kInfoTable = {
>-    {{GL_NONE, GL_NONE, GL_NONE, GL_NONE, GL_NONE, 0, 0, 0, 0, 0 * 0, 0 * 0, false, false, false},
>-     {GL_BOOL, GL_BOOL, GL_NONE, GL_NONE, GL_NONE, 1, 1, 1, sizeof(GLint), sizeof(GLint) * 4,
>-      sizeof(GLint) * 1, false, false, false},
>-     {GL_BOOL_VEC2, GL_BOOL, GL_NONE, GL_NONE, GL_BOOL_VEC2, 1, 2, 2, sizeof(GLint),
>-      sizeof(GLint) * 4, sizeof(GLint) * 2, false, false, false},
>-     {GL_BOOL_VEC3, GL_BOOL, GL_NONE, GL_NONE, GL_BOOL_VEC3, 1, 3, 3, sizeof(GLint),
>-      sizeof(GLint) * 4, sizeof(GLint) * 3, false, false, false},
>-     {GL_BOOL_VEC4, GL_BOOL, GL_NONE, GL_NONE, GL_BOOL_VEC4, 1, 4, 4, sizeof(GLint),
>-      sizeof(GLint) * 4, sizeof(GLint) * 4, false, false, false},
>-     {GL_FLOAT, GL_FLOAT, GL_NONE, GL_NONE, GL_BOOL, 1, 1, 1, sizeof(GLfloat), sizeof(GLfloat) * 4,
>-      sizeof(GLfloat) * 1, false, false, false},
>-     {GL_FLOAT_MAT2, GL_FLOAT, GL_NONE, GL_FLOAT_MAT2, GL_NONE, 2, 2, 4, sizeof(GLfloat),
>-      sizeof(GLfloat) * 8, sizeof(GLfloat) * 4, false, true, false},
>-     {GL_FLOAT_MAT2x3, GL_FLOAT, GL_NONE, GL_FLOAT_MAT3x2, GL_NONE, 3, 2, 6, sizeof(GLfloat),
>-      sizeof(GLfloat) * 12, sizeof(GLfloat) * 6, false, true, false},
>-     {GL_FLOAT_MAT2x4, GL_FLOAT, GL_NONE, GL_FLOAT_MAT4x2, GL_NONE, 4, 2, 8, sizeof(GLfloat),
>-      sizeof(GLfloat) * 16, sizeof(GLfloat) * 8, false, true, false},
>-     {GL_FLOAT_MAT3, GL_FLOAT, GL_NONE, GL_FLOAT_MAT3, GL_NONE, 3, 3, 9, sizeof(GLfloat),
>-      sizeof(GLfloat) * 12, sizeof(GLfloat) * 9, false, true, false},
>-     {GL_FLOAT_MAT3x2, GL_FLOAT, GL_NONE, GL_FLOAT_MAT2x3, GL_NONE, 2, 3, 6, sizeof(GLfloat),
>-      sizeof(GLfloat) * 8, sizeof(GLfloat) * 6, false, true, false},
>-     {GL_FLOAT_MAT3x4, GL_FLOAT, GL_NONE, GL_FLOAT_MAT4x3, GL_NONE, 4, 3, 12, sizeof(GLfloat),
>-      sizeof(GLfloat) * 16, sizeof(GLfloat) * 12, false, true, false},
>-     {GL_FLOAT_MAT4, GL_FLOAT, GL_NONE, GL_FLOAT_MAT4, GL_NONE, 4, 4, 16, sizeof(GLfloat),
>-      sizeof(GLfloat) * 16, sizeof(GLfloat) * 16, false, true, false},
>-     {GL_FLOAT_MAT4x2, GL_FLOAT, GL_NONE, GL_FLOAT_MAT2x4, GL_NONE, 2, 4, 8, sizeof(GLfloat),
>-      sizeof(GLfloat) * 8, sizeof(GLfloat) * 8, false, true, false},
>-     {GL_FLOAT_MAT4x3, GL_FLOAT, GL_NONE, GL_FLOAT_MAT3x4, GL_NONE, 3, 4, 12, sizeof(GLfloat),
>-      sizeof(GLfloat) * 12, sizeof(GLfloat) * 12, false, true, false},
>-     {GL_FLOAT_VEC2, GL_FLOAT, GL_NONE, GL_NONE, GL_BOOL_VEC2, 1, 2, 2, sizeof(GLfloat),
>-      sizeof(GLfloat) * 4, sizeof(GLfloat) * 2, false, false, false},
>-     {GL_FLOAT_VEC3, GL_FLOAT, GL_NONE, GL_NONE, GL_BOOL_VEC3, 1, 3, 3, sizeof(GLfloat),
>-      sizeof(GLfloat) * 4, sizeof(GLfloat) * 3, false, false, false},
>-     {GL_FLOAT_VEC4, GL_FLOAT, GL_NONE, GL_NONE, GL_BOOL_VEC4, 1, 4, 4, sizeof(GLfloat),
>-      sizeof(GLfloat) * 4, sizeof(GLfloat) * 4, false, false, false},
>-     {GL_IMAGE_2D, GL_INT, GL_TEXTURE_2D, GL_NONE, GL_NONE, 1, 1, 1, sizeof(GLint),
>-      sizeof(GLint) * 4, sizeof(GLint) * 1, false, false, true},
>-     {GL_IMAGE_2D_ARRAY, GL_INT, GL_TEXTURE_2D_ARRAY, GL_NONE, GL_NONE, 1, 1, 1, sizeof(GLint),
>-      sizeof(GLint) * 4, sizeof(GLint) * 1, false, false, true},
>-     {GL_IMAGE_3D, GL_INT, GL_TEXTURE_3D, GL_NONE, GL_NONE, 1, 1, 1, sizeof(GLint),
>-      sizeof(GLint) * 4, sizeof(GLint) * 1, false, false, true},
>-     {GL_IMAGE_CUBE, GL_INT, GL_TEXTURE_CUBE_MAP, GL_NONE, GL_NONE, 1, 1, 1, sizeof(GLint),
>-      sizeof(GLint) * 4, sizeof(GLint) * 1, false, false, true},
>-     {GL_INT, GL_INT, GL_NONE, GL_NONE, GL_BOOL, 1, 1, 1, sizeof(GLint), sizeof(GLint) * 4,
>-      sizeof(GLint) * 1, false, false, false},
>-     {GL_INT_IMAGE_2D, GL_INT, GL_TEXTURE_2D, GL_NONE, GL_NONE, 1, 1, 1, sizeof(GLint),
>-      sizeof(GLint) * 4, sizeof(GLint) * 1, false, false, true},
>-     {GL_INT_IMAGE_2D_ARRAY, GL_INT, GL_TEXTURE_2D_ARRAY, GL_NONE, GL_NONE, 1, 1, 1, sizeof(GLint),
>-      sizeof(GLint) * 4, sizeof(GLint) * 1, false, false, true},
>-     {GL_INT_IMAGE_3D, GL_INT, GL_TEXTURE_3D, GL_NONE, GL_NONE, 1, 1, 1, sizeof(GLint),
>-      sizeof(GLint) * 4, sizeof(GLint) * 1, false, false, true},
>-     {GL_INT_IMAGE_CUBE, GL_INT, GL_TEXTURE_CUBE_MAP, GL_NONE, GL_NONE, 1, 1, 1, sizeof(GLint),
>-      sizeof(GLint) * 4, sizeof(GLint) * 1, false, false, true},
>-     {GL_INT_SAMPLER_2D, GL_INT, GL_TEXTURE_2D, GL_NONE, GL_NONE, 1, 1, 1, sizeof(GLint),
>-      sizeof(GLint) * 4, sizeof(GLint) * 1, true, false, false},
>-     {GL_INT_SAMPLER_2D_ARRAY, GL_INT, GL_TEXTURE_2D_ARRAY, GL_NONE, GL_NONE, 1, 1, 1,
>+constexpr std::array<UniformTypeInfo, 62> kInfoTable = {
>+    {{GL_NONE, GL_NONE, GL_NONE, GL_NONE, GL_NONE, SamplerFormat::InvalidEnum, 0, 0, 0, 0, 0 * 0,
>+      0 * 0, false, false, false},
>+     {GL_BOOL, GL_BOOL, GL_NONE, GL_NONE, GL_NONE, SamplerFormat::InvalidEnum, 1, 1, 1,
>+      sizeof(GLint), sizeof(GLint) * 4, sizeof(GLint) * 1, false, false, false},
>+     {GL_BOOL_VEC2, GL_BOOL, GL_NONE, GL_NONE, GL_BOOL_VEC2, SamplerFormat::InvalidEnum, 1, 2, 2,
>+      sizeof(GLint), sizeof(GLint) * 4, sizeof(GLint) * 2, false, false, false},
>+     {GL_BOOL_VEC3, GL_BOOL, GL_NONE, GL_NONE, GL_BOOL_VEC3, SamplerFormat::InvalidEnum, 1, 3, 3,
>+      sizeof(GLint), sizeof(GLint) * 4, sizeof(GLint) * 3, false, false, false},
>+     {GL_BOOL_VEC4, GL_BOOL, GL_NONE, GL_NONE, GL_BOOL_VEC4, SamplerFormat::InvalidEnum, 1, 4, 4,
>+      sizeof(GLint), sizeof(GLint) * 4, sizeof(GLint) * 4, false, false, false},
>+     {GL_FLOAT, GL_FLOAT, GL_NONE, GL_NONE, GL_BOOL, SamplerFormat::InvalidEnum, 1, 1, 1,
>+      sizeof(GLfloat), sizeof(GLfloat) * 4, sizeof(GLfloat) * 1, false, false, false},
>+     {GL_FLOAT_MAT2, GL_FLOAT, GL_NONE, GL_FLOAT_MAT2, GL_NONE, SamplerFormat::InvalidEnum, 2, 2, 4,
>+      sizeof(GLfloat), sizeof(GLfloat) * 8, sizeof(GLfloat) * 4, false, true, false},
>+     {GL_FLOAT_MAT2x3, GL_FLOAT, GL_NONE, GL_FLOAT_MAT3x2, GL_NONE, SamplerFormat::InvalidEnum, 3,
>+      2, 6, sizeof(GLfloat), sizeof(GLfloat) * 12, sizeof(GLfloat) * 6, false, true, false},
>+     {GL_FLOAT_MAT2x4, GL_FLOAT, GL_NONE, GL_FLOAT_MAT4x2, GL_NONE, SamplerFormat::InvalidEnum, 4,
>+      2, 8, sizeof(GLfloat), sizeof(GLfloat) * 16, sizeof(GLfloat) * 8, false, true, false},
>+     {GL_FLOAT_MAT3, GL_FLOAT, GL_NONE, GL_FLOAT_MAT3, GL_NONE, SamplerFormat::InvalidEnum, 3, 3, 9,
>+      sizeof(GLfloat), sizeof(GLfloat) * 12, sizeof(GLfloat) * 9, false, true, false},
>+     {GL_FLOAT_MAT3x2, GL_FLOAT, GL_NONE, GL_FLOAT_MAT2x3, GL_NONE, SamplerFormat::InvalidEnum, 2,
>+      3, 6, sizeof(GLfloat), sizeof(GLfloat) * 8, sizeof(GLfloat) * 6, false, true, false},
>+     {GL_FLOAT_MAT3x4, GL_FLOAT, GL_NONE, GL_FLOAT_MAT4x3, GL_NONE, SamplerFormat::InvalidEnum, 4,
>+      3, 12, sizeof(GLfloat), sizeof(GLfloat) * 16, sizeof(GLfloat) * 12, false, true, false},
>+     {GL_FLOAT_MAT4, GL_FLOAT, GL_NONE, GL_FLOAT_MAT4, GL_NONE, SamplerFormat::InvalidEnum, 4, 4,
>+      16, sizeof(GLfloat), sizeof(GLfloat) * 16, sizeof(GLfloat) * 16, false, true, false},
>+     {GL_FLOAT_MAT4x2, GL_FLOAT, GL_NONE, GL_FLOAT_MAT2x4, GL_NONE, SamplerFormat::InvalidEnum, 2,
>+      4, 8, sizeof(GLfloat), sizeof(GLfloat) * 8, sizeof(GLfloat) * 8, false, true, false},
>+     {GL_FLOAT_MAT4x3, GL_FLOAT, GL_NONE, GL_FLOAT_MAT3x4, GL_NONE, SamplerFormat::InvalidEnum, 3,
>+      4, 12, sizeof(GLfloat), sizeof(GLfloat) * 12, sizeof(GLfloat) * 12, false, true, false},
>+     {GL_FLOAT_VEC2, GL_FLOAT, GL_NONE, GL_NONE, GL_BOOL_VEC2, SamplerFormat::InvalidEnum, 1, 2, 2,
>+      sizeof(GLfloat), sizeof(GLfloat) * 4, sizeof(GLfloat) * 2, false, false, false},
>+     {GL_FLOAT_VEC3, GL_FLOAT, GL_NONE, GL_NONE, GL_BOOL_VEC3, SamplerFormat::InvalidEnum, 1, 3, 3,
>+      sizeof(GLfloat), sizeof(GLfloat) * 4, sizeof(GLfloat) * 3, false, false, false},
>+     {GL_FLOAT_VEC4, GL_FLOAT, GL_NONE, GL_NONE, GL_BOOL_VEC4, SamplerFormat::InvalidEnum, 1, 4, 4,
>+      sizeof(GLfloat), sizeof(GLfloat) * 4, sizeof(GLfloat) * 4, false, false, false},
>+     {GL_IMAGE_2D, GL_INT, GL_TEXTURE_2D, GL_NONE, GL_NONE, SamplerFormat::InvalidEnum, 1, 1, 1,
>+      sizeof(GLint), sizeof(GLint) * 4, sizeof(GLint) * 1, false, false, true},
>+     {GL_IMAGE_2D_ARRAY, GL_INT, GL_TEXTURE_2D_ARRAY, GL_NONE, GL_NONE, SamplerFormat::InvalidEnum,
>+      1, 1, 1, sizeof(GLint), sizeof(GLint) * 4, sizeof(GLint) * 1, false, false, true},
>+     {GL_IMAGE_3D, GL_INT, GL_TEXTURE_3D, GL_NONE, GL_NONE, SamplerFormat::InvalidEnum, 1, 1, 1,
>+      sizeof(GLint), sizeof(GLint) * 4, sizeof(GLint) * 1, false, false, true},
>+     {GL_IMAGE_CUBE, GL_INT, GL_TEXTURE_CUBE_MAP, GL_NONE, GL_NONE, SamplerFormat::InvalidEnum, 1,
>+      1, 1, sizeof(GLint), sizeof(GLint) * 4, sizeof(GLint) * 1, false, false, true},
>+     {GL_INT, GL_INT, GL_NONE, GL_NONE, GL_BOOL, SamplerFormat::InvalidEnum, 1, 1, 1, sizeof(GLint),
>+      sizeof(GLint) * 4, sizeof(GLint) * 1, false, false, false},
>+     {GL_INT_IMAGE_2D, GL_INT, GL_TEXTURE_2D, GL_NONE, GL_NONE, SamplerFormat::InvalidEnum, 1, 1, 1,
>+      sizeof(GLint), sizeof(GLint) * 4, sizeof(GLint) * 1, false, false, true},
>+     {GL_INT_IMAGE_2D_ARRAY, GL_INT, GL_TEXTURE_2D_ARRAY, GL_NONE, GL_NONE,
>+      SamplerFormat::InvalidEnum, 1, 1, 1, sizeof(GLint), sizeof(GLint) * 4, sizeof(GLint) * 1,
>+      false, false, true},
>+     {GL_INT_IMAGE_3D, GL_INT, GL_TEXTURE_3D, GL_NONE, GL_NONE, SamplerFormat::InvalidEnum, 1, 1, 1,
>+      sizeof(GLint), sizeof(GLint) * 4, sizeof(GLint) * 1, false, false, true},
>+     {GL_INT_IMAGE_CUBE, GL_INT, GL_TEXTURE_CUBE_MAP, GL_NONE, GL_NONE, SamplerFormat::InvalidEnum,
>+      1, 1, 1, sizeof(GLint), sizeof(GLint) * 4, sizeof(GLint) * 1, false, false, true},
>+     {GL_INT_SAMPLER_2D, GL_INT, GL_TEXTURE_2D, GL_NONE, GL_NONE, SamplerFormat::Signed, 1, 1, 1,
>       sizeof(GLint), sizeof(GLint) * 4, sizeof(GLint) * 1, true, false, false},
>-     {GL_INT_SAMPLER_2D_MULTISAMPLE, GL_INT, GL_TEXTURE_2D_MULTISAMPLE, GL_NONE, GL_NONE, 1, 1, 1,
>+     {GL_INT_SAMPLER_2D_ARRAY, GL_INT, GL_TEXTURE_2D_ARRAY, GL_NONE, GL_NONE, SamplerFormat::Signed,
>+      1, 1, 1, sizeof(GLint), sizeof(GLint) * 4, sizeof(GLint) * 1, true, false, false},
>+     {GL_INT_SAMPLER_2D_MULTISAMPLE, GL_INT, GL_TEXTURE_2D_MULTISAMPLE, GL_NONE, GL_NONE,
>+      SamplerFormat::Signed, 1, 1, 1, sizeof(GLint), sizeof(GLint) * 4, sizeof(GLint) * 1, true,
>+      false, false},
>+     {GL_INT_SAMPLER_2D_MULTISAMPLE_ARRAY, GL_INT, GL_TEXTURE_2D_MULTISAMPLE_ARRAY, GL_NONE,
>+      GL_NONE, SamplerFormat::Signed, 1, 1, 1, sizeof(GLint), sizeof(GLint) * 4, sizeof(GLint) * 1,
>+      true, false, false},
>+     {GL_INT_SAMPLER_3D, GL_INT, GL_TEXTURE_3D, GL_NONE, GL_NONE, SamplerFormat::Signed, 1, 1, 1,
>       sizeof(GLint), sizeof(GLint) * 4, sizeof(GLint) * 1, true, false, false},
>-     {GL_INT_SAMPLER_3D, GL_INT, GL_TEXTURE_3D, GL_NONE, GL_NONE, 1, 1, 1, sizeof(GLint),
>-      sizeof(GLint) * 4, sizeof(GLint) * 1, true, false, false},
>-     {GL_INT_SAMPLER_CUBE, GL_INT, GL_TEXTURE_CUBE_MAP, GL_NONE, GL_NONE, 1, 1, 1, sizeof(GLint),
>-      sizeof(GLint) * 4, sizeof(GLint) * 1, true, false, false},
>-     {GL_INT_VEC2, GL_INT, GL_NONE, GL_NONE, GL_BOOL_VEC2, 1, 2, 2, sizeof(GLint),
>-      sizeof(GLint) * 4, sizeof(GLint) * 2, false, false, false},
>-     {GL_INT_VEC3, GL_INT, GL_NONE, GL_NONE, GL_BOOL_VEC3, 1, 3, 3, sizeof(GLint),
>-      sizeof(GLint) * 4, sizeof(GLint) * 3, false, false, false},
>-     {GL_INT_VEC4, GL_INT, GL_NONE, GL_NONE, GL_BOOL_VEC4, 1, 4, 4, sizeof(GLint),
>-      sizeof(GLint) * 4, sizeof(GLint) * 4, false, false, false},
>-     {GL_SAMPLER_2D, GL_INT, GL_TEXTURE_2D, GL_NONE, GL_NONE, 1, 1, 1, sizeof(GLint),
>-      sizeof(GLint) * 4, sizeof(GLint) * 1, true, false, false},
>-     {GL_SAMPLER_2D_ARRAY, GL_INT, GL_TEXTURE_2D_ARRAY, GL_NONE, GL_NONE, 1, 1, 1, sizeof(GLint),
>-      sizeof(GLint) * 4, sizeof(GLint) * 1, true, false, false},
>-     {GL_SAMPLER_2D_ARRAY_SHADOW, GL_INT, GL_TEXTURE_2D_ARRAY, GL_NONE, GL_NONE, 1, 1, 1,
>+     {GL_INT_SAMPLER_CUBE, GL_INT, GL_TEXTURE_CUBE_MAP, GL_NONE, GL_NONE, SamplerFormat::Signed, 1,
>+      1, 1, sizeof(GLint), sizeof(GLint) * 4, sizeof(GLint) * 1, true, false, false},
>+     {GL_INT_VEC2, GL_INT, GL_NONE, GL_NONE, GL_BOOL_VEC2, SamplerFormat::InvalidEnum, 1, 2, 2,
>+      sizeof(GLint), sizeof(GLint) * 4, sizeof(GLint) * 2, false, false, false},
>+     {GL_INT_VEC3, GL_INT, GL_NONE, GL_NONE, GL_BOOL_VEC3, SamplerFormat::InvalidEnum, 1, 3, 3,
>+      sizeof(GLint), sizeof(GLint) * 4, sizeof(GLint) * 3, false, false, false},
>+     {GL_INT_VEC4, GL_INT, GL_NONE, GL_NONE, GL_BOOL_VEC4, SamplerFormat::InvalidEnum, 1, 4, 4,
>+      sizeof(GLint), sizeof(GLint) * 4, sizeof(GLint) * 4, false, false, false},
>+     {GL_SAMPLER_2D, GL_INT, GL_TEXTURE_2D, GL_NONE, GL_NONE, SamplerFormat::Float, 1, 1, 1,
>       sizeof(GLint), sizeof(GLint) * 4, sizeof(GLint) * 1, true, false, false},
>-     {GL_SAMPLER_2D_MULTISAMPLE, GL_INT, GL_TEXTURE_2D_MULTISAMPLE, GL_NONE, GL_NONE, 1, 1, 1,
>+     {GL_SAMPLER_2D_ARRAY, GL_INT, GL_TEXTURE_2D_ARRAY, GL_NONE, GL_NONE, SamplerFormat::Float, 1,
>+      1, 1, sizeof(GLint), sizeof(GLint) * 4, sizeof(GLint) * 1, true, false, false},
>+     {GL_SAMPLER_2D_ARRAY_SHADOW, GL_INT, GL_TEXTURE_2D_ARRAY, GL_NONE, GL_NONE,
>+      SamplerFormat::Shadow, 1, 1, 1, sizeof(GLint), sizeof(GLint) * 4, sizeof(GLint) * 1, true,
>+      false, false},
>+     {GL_SAMPLER_2D_MULTISAMPLE, GL_INT, GL_TEXTURE_2D_MULTISAMPLE, GL_NONE, GL_NONE,
>+      SamplerFormat::Float, 1, 1, 1, sizeof(GLint), sizeof(GLint) * 4, sizeof(GLint) * 1, true,
>+      false, false},
>+     {GL_SAMPLER_2D_MULTISAMPLE_ARRAY, GL_INT, GL_TEXTURE_2D_MULTISAMPLE_ARRAY, GL_NONE, GL_NONE,
>+      SamplerFormat::Float, 1, 1, 1, sizeof(GLint), sizeof(GLint) * 4, sizeof(GLint) * 1, true,
>+      false, false},
>+     {GL_SAMPLER_2D_RECT_ANGLE, GL_INT, GL_TEXTURE_2D, GL_NONE, GL_NONE, SamplerFormat::Float, 1, 1,
>+      1, sizeof(GLint), sizeof(GLint) * 4, sizeof(GLint) * 1, true, false, false},
>+     {GL_SAMPLER_2D_SHADOW, GL_INT, GL_TEXTURE_2D, GL_NONE, GL_NONE, SamplerFormat::Shadow, 1, 1, 1,
>       sizeof(GLint), sizeof(GLint) * 4, sizeof(GLint) * 1, true, false, false},
>-     {GL_SAMPLER_2D_RECT_ANGLE, GL_INT, GL_TEXTURE_2D, GL_NONE, GL_NONE, 1, 1, 1, sizeof(GLint),
>-      sizeof(GLint) * 4, sizeof(GLint) * 1, true, false, false},
>-     {GL_SAMPLER_2D_SHADOW, GL_INT, GL_TEXTURE_2D, GL_NONE, GL_NONE, 1, 1, 1, sizeof(GLint),
>-      sizeof(GLint) * 4, sizeof(GLint) * 1, true, false, false},
>-     {GL_SAMPLER_3D, GL_INT, GL_TEXTURE_3D, GL_NONE, GL_NONE, 1, 1, 1, sizeof(GLint),
>-      sizeof(GLint) * 4, sizeof(GLint) * 1, true, false, false},
>-     {GL_SAMPLER_CUBE, GL_INT, GL_TEXTURE_CUBE_MAP, GL_NONE, GL_NONE, 1, 1, 1, sizeof(GLint),
>-      sizeof(GLint) * 4, sizeof(GLint) * 1, true, false, false},
>-     {GL_SAMPLER_CUBE_SHADOW, GL_INT, GL_TEXTURE_CUBE_MAP, GL_NONE, GL_NONE, 1, 1, 1, sizeof(GLint),
>-      sizeof(GLint) * 4, sizeof(GLint) * 1, true, false, false},
>-     {GL_SAMPLER_EXTERNAL_OES, GL_INT, GL_TEXTURE_EXTERNAL_OES, GL_NONE, GL_NONE, 1, 1, 1,
>+     {GL_SAMPLER_3D, GL_INT, GL_TEXTURE_3D, GL_NONE, GL_NONE, SamplerFormat::Float, 1, 1, 1,
>       sizeof(GLint), sizeof(GLint) * 4, sizeof(GLint) * 1, true, false, false},
>-     {GL_UNSIGNED_INT, GL_UNSIGNED_INT, GL_NONE, GL_NONE, GL_BOOL, 1, 1, 1, sizeof(GLuint),
>-      sizeof(GLuint) * 4, sizeof(GLuint) * 1, false, false, false},
>-     {GL_UNSIGNED_INT_ATOMIC_COUNTER, GL_UNSIGNED_INT, GL_NONE, GL_NONE, GL_NONE, 1, 1, 1,
>-      sizeof(GLuint), sizeof(GLuint) * 4, sizeof(GLuint) * 1, false, false, false},
>-     {GL_UNSIGNED_INT_IMAGE_2D, GL_UNSIGNED_INT, GL_TEXTURE_2D, GL_NONE, GL_NONE, 1, 1, 1,
>-      sizeof(GLuint), sizeof(GLuint) * 4, sizeof(GLuint) * 1, false, false, true},
>-     {GL_UNSIGNED_INT_IMAGE_2D_ARRAY, GL_UNSIGNED_INT, GL_TEXTURE_2D_ARRAY, GL_NONE, GL_NONE, 1, 1,
>-      1, sizeof(GLuint), sizeof(GLuint) * 4, sizeof(GLuint) * 1, false, false, true},
>-     {GL_UNSIGNED_INT_IMAGE_3D, GL_UNSIGNED_INT, GL_TEXTURE_3D, GL_NONE, GL_NONE, 1, 1, 1,
>-      sizeof(GLuint), sizeof(GLuint) * 4, sizeof(GLuint) * 1, false, false, true},
>-     {GL_UNSIGNED_INT_IMAGE_CUBE, GL_UNSIGNED_INT, GL_TEXTURE_CUBE_MAP, GL_NONE, GL_NONE, 1, 1, 1,
>-      sizeof(GLuint), sizeof(GLuint) * 4, sizeof(GLuint) * 1, false, false, true},
>-     {GL_UNSIGNED_INT_SAMPLER_2D, GL_UNSIGNED_INT, GL_TEXTURE_2D, GL_NONE, GL_NONE, 1, 1, 1,
>-      sizeof(GLuint), sizeof(GLuint) * 4, sizeof(GLuint) * 1, true, false, false},
>-     {GL_UNSIGNED_INT_SAMPLER_2D_ARRAY, GL_UNSIGNED_INT, GL_TEXTURE_2D_ARRAY, GL_NONE, GL_NONE, 1,
>-      1, 1, sizeof(GLuint), sizeof(GLuint) * 4, sizeof(GLuint) * 1, true, false, false},
>+     {GL_SAMPLER_CUBE, GL_INT, GL_TEXTURE_CUBE_MAP, GL_NONE, GL_NONE, SamplerFormat::Float, 1, 1, 1,
>+      sizeof(GLint), sizeof(GLint) * 4, sizeof(GLint) * 1, true, false, false},
>+     {GL_SAMPLER_CUBE_SHADOW, GL_INT, GL_TEXTURE_CUBE_MAP, GL_NONE, GL_NONE, SamplerFormat::Shadow,
>+      1, 1, 1, sizeof(GLint), sizeof(GLint) * 4, sizeof(GLint) * 1, true, false, false},
>+     {GL_SAMPLER_EXTERNAL_OES, GL_INT, GL_TEXTURE_EXTERNAL_OES, GL_NONE, GL_NONE,
>+      SamplerFormat::Float, 1, 1, 1, sizeof(GLint), sizeof(GLint) * 4, sizeof(GLint) * 1, true,
>+      false, false},
>+     {GL_UNSIGNED_INT, GL_UNSIGNED_INT, GL_NONE, GL_NONE, GL_BOOL, SamplerFormat::InvalidEnum, 1, 1,
>+      1, sizeof(GLuint), sizeof(GLuint) * 4, sizeof(GLuint) * 1, false, false, false},
>+     {GL_UNSIGNED_INT_ATOMIC_COUNTER, GL_UNSIGNED_INT, GL_NONE, GL_NONE, GL_NONE,
>+      SamplerFormat::InvalidEnum, 1, 1, 1, sizeof(GLuint), sizeof(GLuint) * 4, sizeof(GLuint) * 1,
>+      false, false, false},
>+     {GL_UNSIGNED_INT_IMAGE_2D, GL_UNSIGNED_INT, GL_TEXTURE_2D, GL_NONE, GL_NONE,
>+      SamplerFormat::InvalidEnum, 1, 1, 1, sizeof(GLuint), sizeof(GLuint) * 4, sizeof(GLuint) * 1,
>+      false, false, true},
>+     {GL_UNSIGNED_INT_IMAGE_2D_ARRAY, GL_UNSIGNED_INT, GL_TEXTURE_2D_ARRAY, GL_NONE, GL_NONE,
>+      SamplerFormat::InvalidEnum, 1, 1, 1, sizeof(GLuint), sizeof(GLuint) * 4, sizeof(GLuint) * 1,
>+      false, false, true},
>+     {GL_UNSIGNED_INT_IMAGE_3D, GL_UNSIGNED_INT, GL_TEXTURE_3D, GL_NONE, GL_NONE,
>+      SamplerFormat::InvalidEnum, 1, 1, 1, sizeof(GLuint), sizeof(GLuint) * 4, sizeof(GLuint) * 1,
>+      false, false, true},
>+     {GL_UNSIGNED_INT_IMAGE_CUBE, GL_UNSIGNED_INT, GL_TEXTURE_CUBE_MAP, GL_NONE, GL_NONE,
>+      SamplerFormat::InvalidEnum, 1, 1, 1, sizeof(GLuint), sizeof(GLuint) * 4, sizeof(GLuint) * 1,
>+      false, false, true},
>+     {GL_UNSIGNED_INT_SAMPLER_2D, GL_UNSIGNED_INT, GL_TEXTURE_2D, GL_NONE, GL_NONE,
>+      SamplerFormat::Unsigned, 1, 1, 1, sizeof(GLuint), sizeof(GLuint) * 4, sizeof(GLuint) * 1,
>+      true, false, false},
>+     {GL_UNSIGNED_INT_SAMPLER_2D_ARRAY, GL_UNSIGNED_INT, GL_TEXTURE_2D_ARRAY, GL_NONE, GL_NONE,
>+      SamplerFormat::Unsigned, 1, 1, 1, sizeof(GLuint), sizeof(GLuint) * 4, sizeof(GLuint) * 1,
>+      true, false, false},
>      {GL_UNSIGNED_INT_SAMPLER_2D_MULTISAMPLE, GL_UNSIGNED_INT, GL_TEXTURE_2D_MULTISAMPLE, GL_NONE,
>-      GL_NONE, 1, 1, 1, sizeof(GLuint), sizeof(GLuint) * 4, sizeof(GLuint) * 1, true, false, false},
>-     {GL_UNSIGNED_INT_SAMPLER_3D, GL_UNSIGNED_INT, GL_TEXTURE_3D, GL_NONE, GL_NONE, 1, 1, 1,
>+      GL_NONE, SamplerFormat::Unsigned, 1, 1, 1, sizeof(GLuint), sizeof(GLuint) * 4,
>+      sizeof(GLuint) * 1, true, false, false},
>+     {GL_UNSIGNED_INT_SAMPLER_2D_MULTISAMPLE_ARRAY, GL_UNSIGNED_INT,
>+      GL_TEXTURE_2D_MULTISAMPLE_ARRAY, GL_NONE, GL_NONE, SamplerFormat::Unsigned, 1, 1, 1,
>       sizeof(GLuint), sizeof(GLuint) * 4, sizeof(GLuint) * 1, true, false, false},
>-     {GL_UNSIGNED_INT_SAMPLER_CUBE, GL_UNSIGNED_INT, GL_TEXTURE_CUBE_MAP, GL_NONE, GL_NONE, 1, 1, 1,
>-      sizeof(GLuint), sizeof(GLuint) * 4, sizeof(GLuint) * 1, true, false, false},
>-     {GL_UNSIGNED_INT_VEC2, GL_UNSIGNED_INT, GL_NONE, GL_NONE, GL_BOOL_VEC2, 1, 2, 2,
>-      sizeof(GLuint), sizeof(GLuint) * 4, sizeof(GLuint) * 2, false, false, false},
>-     {GL_UNSIGNED_INT_VEC3, GL_UNSIGNED_INT, GL_NONE, GL_NONE, GL_BOOL_VEC3, 1, 3, 3,
>-      sizeof(GLuint), sizeof(GLuint) * 4, sizeof(GLuint) * 3, false, false, false},
>-     {GL_UNSIGNED_INT_VEC4, GL_UNSIGNED_INT, GL_NONE, GL_NONE, GL_BOOL_VEC4, 1, 4, 4,
>-      sizeof(GLuint), sizeof(GLuint) * 4, sizeof(GLuint) * 4, false, false, false}}};
>+     {GL_UNSIGNED_INT_SAMPLER_3D, GL_UNSIGNED_INT, GL_TEXTURE_3D, GL_NONE, GL_NONE,
>+      SamplerFormat::Unsigned, 1, 1, 1, sizeof(GLuint), sizeof(GLuint) * 4, sizeof(GLuint) * 1,
>+      true, false, false},
>+     {GL_UNSIGNED_INT_SAMPLER_CUBE, GL_UNSIGNED_INT, GL_TEXTURE_CUBE_MAP, GL_NONE, GL_NONE,
>+      SamplerFormat::Unsigned, 1, 1, 1, sizeof(GLuint), sizeof(GLuint) * 4, sizeof(GLuint) * 1,
>+      true, false, false},
>+     {GL_UNSIGNED_INT_VEC2, GL_UNSIGNED_INT, GL_NONE, GL_NONE, GL_BOOL_VEC2,
>+      SamplerFormat::InvalidEnum, 1, 2, 2, sizeof(GLuint), sizeof(GLuint) * 4, sizeof(GLuint) * 2,
>+      false, false, false},
>+     {GL_UNSIGNED_INT_VEC3, GL_UNSIGNED_INT, GL_NONE, GL_NONE, GL_BOOL_VEC3,
>+      SamplerFormat::InvalidEnum, 1, 3, 3, sizeof(GLuint), sizeof(GLuint) * 4, sizeof(GLuint) * 3,
>+      false, false, false},
>+     {GL_UNSIGNED_INT_VEC4, GL_UNSIGNED_INT, GL_NONE, GL_NONE, GL_BOOL_VEC4,
>+      SamplerFormat::InvalidEnum, 1, 4, 4, sizeof(GLuint), sizeof(GLuint) * 4, sizeof(GLuint) * 4,
>+      false, false, false}}};
> 
> size_t GetTypeInfoIndex(GLenum uniformType)
> {
>@@ -201,64 +229,70 @@ size_t GetTypeInfoIndex(GLenum uniformType)
>             return 28;
>         case GL_INT_SAMPLER_2D_MULTISAMPLE:
>             return 29;
>-        case GL_INT_SAMPLER_3D:
>+        case GL_INT_SAMPLER_2D_MULTISAMPLE_ARRAY:
>             return 30;
>-        case GL_INT_SAMPLER_CUBE:
>+        case GL_INT_SAMPLER_3D:
>             return 31;
>-        case GL_INT_VEC2:
>+        case GL_INT_SAMPLER_CUBE:
>             return 32;
>-        case GL_INT_VEC3:
>+        case GL_INT_VEC2:
>             return 33;
>-        case GL_INT_VEC4:
>+        case GL_INT_VEC3:
>             return 34;
>-        case GL_SAMPLER_2D:
>+        case GL_INT_VEC4:
>             return 35;
>-        case GL_SAMPLER_2D_ARRAY:
>+        case GL_SAMPLER_2D:
>             return 36;
>-        case GL_SAMPLER_2D_ARRAY_SHADOW:
>+        case GL_SAMPLER_2D_ARRAY:
>             return 37;
>-        case GL_SAMPLER_2D_MULTISAMPLE:
>+        case GL_SAMPLER_2D_ARRAY_SHADOW:
>             return 38;
>-        case GL_SAMPLER_2D_RECT_ANGLE:
>+        case GL_SAMPLER_2D_MULTISAMPLE:
>             return 39;
>-        case GL_SAMPLER_2D_SHADOW:
>+        case GL_SAMPLER_2D_MULTISAMPLE_ARRAY:
>             return 40;
>-        case GL_SAMPLER_3D:
>+        case GL_SAMPLER_2D_RECT_ANGLE:
>             return 41;
>-        case GL_SAMPLER_CUBE:
>+        case GL_SAMPLER_2D_SHADOW:
>             return 42;
>-        case GL_SAMPLER_CUBE_SHADOW:
>+        case GL_SAMPLER_3D:
>             return 43;
>-        case GL_SAMPLER_EXTERNAL_OES:
>+        case GL_SAMPLER_CUBE:
>             return 44;
>-        case GL_UNSIGNED_INT:
>+        case GL_SAMPLER_CUBE_SHADOW:
>             return 45;
>-        case GL_UNSIGNED_INT_ATOMIC_COUNTER:
>+        case GL_SAMPLER_EXTERNAL_OES:
>             return 46;
>-        case GL_UNSIGNED_INT_IMAGE_2D:
>+        case GL_UNSIGNED_INT:
>             return 47;
>-        case GL_UNSIGNED_INT_IMAGE_2D_ARRAY:
>+        case GL_UNSIGNED_INT_ATOMIC_COUNTER:
>             return 48;
>-        case GL_UNSIGNED_INT_IMAGE_3D:
>+        case GL_UNSIGNED_INT_IMAGE_2D:
>             return 49;
>-        case GL_UNSIGNED_INT_IMAGE_CUBE:
>+        case GL_UNSIGNED_INT_IMAGE_2D_ARRAY:
>             return 50;
>-        case GL_UNSIGNED_INT_SAMPLER_2D:
>+        case GL_UNSIGNED_INT_IMAGE_3D:
>             return 51;
>-        case GL_UNSIGNED_INT_SAMPLER_2D_ARRAY:
>+        case GL_UNSIGNED_INT_IMAGE_CUBE:
>             return 52;
>-        case GL_UNSIGNED_INT_SAMPLER_2D_MULTISAMPLE:
>+        case GL_UNSIGNED_INT_SAMPLER_2D:
>             return 53;
>-        case GL_UNSIGNED_INT_SAMPLER_3D:
>+        case GL_UNSIGNED_INT_SAMPLER_2D_ARRAY:
>             return 54;
>-        case GL_UNSIGNED_INT_SAMPLER_CUBE:
>+        case GL_UNSIGNED_INT_SAMPLER_2D_MULTISAMPLE:
>             return 55;
>-        case GL_UNSIGNED_INT_VEC2:
>+        case GL_UNSIGNED_INT_SAMPLER_2D_MULTISAMPLE_ARRAY:
>             return 56;
>-        case GL_UNSIGNED_INT_VEC3:
>+        case GL_UNSIGNED_INT_SAMPLER_3D:
>             return 57;
>-        case GL_UNSIGNED_INT_VEC4:
>+        case GL_UNSIGNED_INT_SAMPLER_CUBE:
>             return 58;
>+        case GL_UNSIGNED_INT_VEC2:
>+            return 59;
>+        case GL_UNSIGNED_INT_VEC3:
>+            return 60;
>+        case GL_UNSIGNED_INT_VEC4:
>+            return 61;
>         default:
>             UNREACHABLE();
>             return 0;
>diff --git a/Source/ThirdParty/ANGLE/src/common/utilities.cpp b/Source/ThirdParty/ANGLE/src/common/utilities.cpp
>index 6dae9cc51f8..84be99016ea 100644
>--- a/Source/ThirdParty/ANGLE/src/common/utilities.cpp
>+++ b/Source/ThirdParty/ANGLE/src/common/utilities.cpp
>@@ -7,16 +7,17 @@
> // utilities.cpp: Conversion functions and other utility routines.
> 
> #include "common/utilities.h"
>+#include <GLSLANG/ShaderVars.h>
> #include "common/mathutil.h"
> #include "common/platform.h"
> 
> #include <set>
> 
> #if defined(ANGLE_ENABLE_WINDOWS_STORE)
>-#  include <wrl.h>
>-#  include <wrl/wrappers/corewrappers.h>
>-#  include <windows.applicationmodel.core.h>
>-#  include <windows.graphics.display.h>
>+#    include <windows.applicationmodel.core.h>
>+#    include <windows.graphics.display.h>
>+#    include <wrl.h>
>+#    include <wrl/wrappers/corewrappers.h>
> #endif
> 
> namespace
>@@ -101,72 +102,75 @@ int VariableComponentCount(GLenum type)
> 
> GLenum VariableComponentType(GLenum type)
> {
>-    switch(type)
>+    switch (type)
>     {
>-      case GL_BOOL:
>-      case GL_BOOL_VEC2:
>-      case GL_BOOL_VEC3:
>-      case GL_BOOL_VEC4:
>-        return GL_BOOL;
>-      case GL_FLOAT:
>-      case GL_FLOAT_VEC2:
>-      case GL_FLOAT_VEC3:
>-      case GL_FLOAT_VEC4:
>-      case GL_FLOAT_MAT2:
>-      case GL_FLOAT_MAT3:
>-      case GL_FLOAT_MAT4:
>-      case GL_FLOAT_MAT2x3:
>-      case GL_FLOAT_MAT3x2:
>-      case GL_FLOAT_MAT2x4:
>-      case GL_FLOAT_MAT4x2:
>-      case GL_FLOAT_MAT3x4:
>-      case GL_FLOAT_MAT4x3:
>-        return GL_FLOAT;
>-      case GL_INT:
>-      case GL_SAMPLER_2D:
>-      case GL_SAMPLER_2D_RECT_ANGLE:
>-      case GL_SAMPLER_3D:
>-      case GL_SAMPLER_CUBE:
>-      case GL_SAMPLER_2D_ARRAY:
>-      case GL_SAMPLER_EXTERNAL_OES:
>-      case GL_SAMPLER_2D_MULTISAMPLE:
>-      case GL_INT_SAMPLER_2D:
>-      case GL_INT_SAMPLER_3D:
>-      case GL_INT_SAMPLER_CUBE:
>-      case GL_INT_SAMPLER_2D_ARRAY:
>-      case GL_INT_SAMPLER_2D_MULTISAMPLE:
>-      case GL_UNSIGNED_INT_SAMPLER_2D:
>-      case GL_UNSIGNED_INT_SAMPLER_3D:
>-      case GL_UNSIGNED_INT_SAMPLER_CUBE:
>-      case GL_UNSIGNED_INT_SAMPLER_2D_ARRAY:
>-      case GL_UNSIGNED_INT_SAMPLER_2D_MULTISAMPLE:
>-      case GL_SAMPLER_2D_SHADOW:
>-      case GL_SAMPLER_CUBE_SHADOW:
>-      case GL_SAMPLER_2D_ARRAY_SHADOW:
>-      case GL_INT_VEC2:
>-      case GL_INT_VEC3:
>-      case GL_INT_VEC4:
>-      case GL_IMAGE_2D:
>-      case GL_INT_IMAGE_2D:
>-      case GL_UNSIGNED_INT_IMAGE_2D:
>-      case GL_IMAGE_3D:
>-      case GL_INT_IMAGE_3D:
>-      case GL_UNSIGNED_INT_IMAGE_3D:
>-      case GL_IMAGE_2D_ARRAY:
>-      case GL_INT_IMAGE_2D_ARRAY:
>-      case GL_UNSIGNED_INT_IMAGE_2D_ARRAY:
>-      case GL_IMAGE_CUBE:
>-      case GL_INT_IMAGE_CUBE:
>-      case GL_UNSIGNED_INT_IMAGE_CUBE:
>-      case GL_UNSIGNED_INT_ATOMIC_COUNTER:
>-          return GL_INT;
>-      case GL_UNSIGNED_INT:
>-      case GL_UNSIGNED_INT_VEC2:
>-      case GL_UNSIGNED_INT_VEC3:
>-      case GL_UNSIGNED_INT_VEC4:
>-        return GL_UNSIGNED_INT;
>-      default:
>-        UNREACHABLE();
>+        case GL_BOOL:
>+        case GL_BOOL_VEC2:
>+        case GL_BOOL_VEC3:
>+        case GL_BOOL_VEC4:
>+            return GL_BOOL;
>+        case GL_FLOAT:
>+        case GL_FLOAT_VEC2:
>+        case GL_FLOAT_VEC3:
>+        case GL_FLOAT_VEC4:
>+        case GL_FLOAT_MAT2:
>+        case GL_FLOAT_MAT3:
>+        case GL_FLOAT_MAT4:
>+        case GL_FLOAT_MAT2x3:
>+        case GL_FLOAT_MAT3x2:
>+        case GL_FLOAT_MAT2x4:
>+        case GL_FLOAT_MAT4x2:
>+        case GL_FLOAT_MAT3x4:
>+        case GL_FLOAT_MAT4x3:
>+            return GL_FLOAT;
>+        case GL_INT:
>+        case GL_SAMPLER_2D:
>+        case GL_SAMPLER_2D_RECT_ANGLE:
>+        case GL_SAMPLER_3D:
>+        case GL_SAMPLER_CUBE:
>+        case GL_SAMPLER_2D_ARRAY:
>+        case GL_SAMPLER_EXTERNAL_OES:
>+        case GL_SAMPLER_2D_MULTISAMPLE:
>+        case GL_SAMPLER_2D_MULTISAMPLE_ARRAY:
>+        case GL_INT_SAMPLER_2D:
>+        case GL_INT_SAMPLER_3D:
>+        case GL_INT_SAMPLER_CUBE:
>+        case GL_INT_SAMPLER_2D_ARRAY:
>+        case GL_INT_SAMPLER_2D_MULTISAMPLE:
>+        case GL_INT_SAMPLER_2D_MULTISAMPLE_ARRAY:
>+        case GL_UNSIGNED_INT_SAMPLER_2D:
>+        case GL_UNSIGNED_INT_SAMPLER_3D:
>+        case GL_UNSIGNED_INT_SAMPLER_CUBE:
>+        case GL_UNSIGNED_INT_SAMPLER_2D_ARRAY:
>+        case GL_UNSIGNED_INT_SAMPLER_2D_MULTISAMPLE:
>+        case GL_UNSIGNED_INT_SAMPLER_2D_MULTISAMPLE_ARRAY:
>+        case GL_SAMPLER_2D_SHADOW:
>+        case GL_SAMPLER_CUBE_SHADOW:
>+        case GL_SAMPLER_2D_ARRAY_SHADOW:
>+        case GL_INT_VEC2:
>+        case GL_INT_VEC3:
>+        case GL_INT_VEC4:
>+        case GL_IMAGE_2D:
>+        case GL_INT_IMAGE_2D:
>+        case GL_UNSIGNED_INT_IMAGE_2D:
>+        case GL_IMAGE_3D:
>+        case GL_INT_IMAGE_3D:
>+        case GL_UNSIGNED_INT_IMAGE_3D:
>+        case GL_IMAGE_2D_ARRAY:
>+        case GL_INT_IMAGE_2D_ARRAY:
>+        case GL_UNSIGNED_INT_IMAGE_2D_ARRAY:
>+        case GL_IMAGE_CUBE:
>+        case GL_INT_IMAGE_CUBE:
>+        case GL_UNSIGNED_INT_IMAGE_CUBE:
>+        case GL_UNSIGNED_INT_ATOMIC_COUNTER:
>+            return GL_INT;
>+        case GL_UNSIGNED_INT:
>+        case GL_UNSIGNED_INT_VEC2:
>+        case GL_UNSIGNED_INT_VEC3:
>+        case GL_UNSIGNED_INT_VEC4:
>+            return GL_UNSIGNED_INT;
>+        default:
>+            UNREACHABLE();
>     }
> 
>     return GL_NONE;
>@@ -174,13 +178,18 @@ GLenum VariableComponentType(GLenum type)
> 
> size_t VariableComponentSize(GLenum type)
> {
>-    switch(type)
>+    switch (type)
>     {
>-      case GL_BOOL:         return sizeof(GLint);
>-      case GL_FLOAT:        return sizeof(GLfloat);
>-      case GL_INT:          return sizeof(GLint);
>-      case GL_UNSIGNED_INT: return sizeof(GLuint);
>-      default:       UNREACHABLE();
>+        case GL_BOOL:
>+            return sizeof(GLint);
>+        case GL_FLOAT:
>+            return sizeof(GLfloat);
>+        case GL_INT:
>+            return sizeof(GLint);
>+        case GL_UNSIGNED_INT:
>+            return sizeof(GLuint);
>+        default:
>+            UNREACHABLE();
>     }
> 
>     return 0;
>@@ -201,26 +210,26 @@ GLenum VariableBoolVectorType(GLenum type)
> {
>     switch (type)
>     {
>-      case GL_FLOAT:
>-      case GL_INT:
>-      case GL_UNSIGNED_INT:
>-        return GL_BOOL;
>-      case GL_FLOAT_VEC2:
>-      case GL_INT_VEC2:
>-      case GL_UNSIGNED_INT_VEC2:
>-        return GL_BOOL_VEC2;
>-      case GL_FLOAT_VEC3:
>-      case GL_INT_VEC3:
>-      case GL_UNSIGNED_INT_VEC3:
>-        return GL_BOOL_VEC3;
>-      case GL_FLOAT_VEC4:
>-      case GL_INT_VEC4:
>-      case GL_UNSIGNED_INT_VEC4:
>-        return GL_BOOL_VEC4;
>-
>-      default:
>-        UNREACHABLE();
>-        return GL_NONE;
>+        case GL_FLOAT:
>+        case GL_INT:
>+        case GL_UNSIGNED_INT:
>+            return GL_BOOL;
>+        case GL_FLOAT_VEC2:
>+        case GL_INT_VEC2:
>+        case GL_UNSIGNED_INT_VEC2:
>+            return GL_BOOL_VEC2;
>+        case GL_FLOAT_VEC3:
>+        case GL_INT_VEC3:
>+        case GL_UNSIGNED_INT_VEC3:
>+            return GL_BOOL_VEC3;
>+        case GL_FLOAT_VEC4:
>+        case GL_INT_VEC4:
>+        case GL_UNSIGNED_INT_VEC4:
>+            return GL_BOOL_VEC4;
>+
>+        default:
>+            UNREACHABLE();
>+            return GL_NONE;
>     }
> }
> 
>@@ -228,72 +237,75 @@ int VariableRowCount(GLenum type)
> {
>     switch (type)
>     {
>-      case GL_NONE:
>-        return 0;
>-      case GL_BOOL:
>-      case GL_FLOAT:
>-      case GL_INT:
>-      case GL_UNSIGNED_INT:
>-      case GL_BOOL_VEC2:
>-      case GL_FLOAT_VEC2:
>-      case GL_INT_VEC2:
>-      case GL_UNSIGNED_INT_VEC2:
>-      case GL_BOOL_VEC3:
>-      case GL_FLOAT_VEC3:
>-      case GL_INT_VEC3:
>-      case GL_UNSIGNED_INT_VEC3:
>-      case GL_BOOL_VEC4:
>-      case GL_FLOAT_VEC4:
>-      case GL_INT_VEC4:
>-      case GL_UNSIGNED_INT_VEC4:
>-      case GL_SAMPLER_2D:
>-      case GL_SAMPLER_3D:
>-      case GL_SAMPLER_CUBE:
>-      case GL_SAMPLER_2D_ARRAY:
>-      case GL_SAMPLER_EXTERNAL_OES:
>-      case GL_SAMPLER_2D_RECT_ANGLE:
>-      case GL_SAMPLER_2D_MULTISAMPLE:
>-      case GL_INT_SAMPLER_2D:
>-      case GL_INT_SAMPLER_3D:
>-      case GL_INT_SAMPLER_CUBE:
>-      case GL_INT_SAMPLER_2D_ARRAY:
>-      case GL_INT_SAMPLER_2D_MULTISAMPLE:
>-      case GL_UNSIGNED_INT_SAMPLER_2D:
>-      case GL_UNSIGNED_INT_SAMPLER_3D:
>-      case GL_UNSIGNED_INT_SAMPLER_CUBE:
>-      case GL_UNSIGNED_INT_SAMPLER_2D_ARRAY:
>-      case GL_UNSIGNED_INT_SAMPLER_2D_MULTISAMPLE:
>-      case GL_SAMPLER_2D_SHADOW:
>-      case GL_SAMPLER_CUBE_SHADOW:
>-      case GL_SAMPLER_2D_ARRAY_SHADOW:
>-      case GL_IMAGE_2D:
>-      case GL_INT_IMAGE_2D:
>-      case GL_UNSIGNED_INT_IMAGE_2D:
>-      case GL_IMAGE_2D_ARRAY:
>-      case GL_INT_IMAGE_2D_ARRAY:
>-      case GL_UNSIGNED_INT_IMAGE_2D_ARRAY:
>-      case GL_IMAGE_3D:
>-      case GL_INT_IMAGE_3D:
>-      case GL_UNSIGNED_INT_IMAGE_3D:
>-      case GL_IMAGE_CUBE:
>-      case GL_INT_IMAGE_CUBE:
>-      case GL_UNSIGNED_INT_IMAGE_CUBE:
>-      case GL_UNSIGNED_INT_ATOMIC_COUNTER:
>-          return 1;
>-      case GL_FLOAT_MAT2:
>-      case GL_FLOAT_MAT3x2:
>-      case GL_FLOAT_MAT4x2:
>-        return 2;
>-      case GL_FLOAT_MAT3:
>-      case GL_FLOAT_MAT2x3:
>-      case GL_FLOAT_MAT4x3:
>-        return 3;
>-      case GL_FLOAT_MAT4:
>-      case GL_FLOAT_MAT2x4:
>-      case GL_FLOAT_MAT3x4:
>-        return 4;
>-      default:
>-        UNREACHABLE();
>+        case GL_NONE:
>+            return 0;
>+        case GL_BOOL:
>+        case GL_FLOAT:
>+        case GL_INT:
>+        case GL_UNSIGNED_INT:
>+        case GL_BOOL_VEC2:
>+        case GL_FLOAT_VEC2:
>+        case GL_INT_VEC2:
>+        case GL_UNSIGNED_INT_VEC2:
>+        case GL_BOOL_VEC3:
>+        case GL_FLOAT_VEC3:
>+        case GL_INT_VEC3:
>+        case GL_UNSIGNED_INT_VEC3:
>+        case GL_BOOL_VEC4:
>+        case GL_FLOAT_VEC4:
>+        case GL_INT_VEC4:
>+        case GL_UNSIGNED_INT_VEC4:
>+        case GL_SAMPLER_2D:
>+        case GL_SAMPLER_3D:
>+        case GL_SAMPLER_CUBE:
>+        case GL_SAMPLER_2D_ARRAY:
>+        case GL_SAMPLER_EXTERNAL_OES:
>+        case GL_SAMPLER_2D_RECT_ANGLE:
>+        case GL_SAMPLER_2D_MULTISAMPLE:
>+        case GL_SAMPLER_2D_MULTISAMPLE_ARRAY:
>+        case GL_INT_SAMPLER_2D:
>+        case GL_INT_SAMPLER_3D:
>+        case GL_INT_SAMPLER_CUBE:
>+        case GL_INT_SAMPLER_2D_ARRAY:
>+        case GL_INT_SAMPLER_2D_MULTISAMPLE:
>+        case GL_INT_SAMPLER_2D_MULTISAMPLE_ARRAY:
>+        case GL_UNSIGNED_INT_SAMPLER_2D:
>+        case GL_UNSIGNED_INT_SAMPLER_3D:
>+        case GL_UNSIGNED_INT_SAMPLER_CUBE:
>+        case GL_UNSIGNED_INT_SAMPLER_2D_ARRAY:
>+        case GL_UNSIGNED_INT_SAMPLER_2D_MULTISAMPLE:
>+        case GL_UNSIGNED_INT_SAMPLER_2D_MULTISAMPLE_ARRAY:
>+        case GL_SAMPLER_2D_SHADOW:
>+        case GL_SAMPLER_CUBE_SHADOW:
>+        case GL_SAMPLER_2D_ARRAY_SHADOW:
>+        case GL_IMAGE_2D:
>+        case GL_INT_IMAGE_2D:
>+        case GL_UNSIGNED_INT_IMAGE_2D:
>+        case GL_IMAGE_2D_ARRAY:
>+        case GL_INT_IMAGE_2D_ARRAY:
>+        case GL_UNSIGNED_INT_IMAGE_2D_ARRAY:
>+        case GL_IMAGE_3D:
>+        case GL_INT_IMAGE_3D:
>+        case GL_UNSIGNED_INT_IMAGE_3D:
>+        case GL_IMAGE_CUBE:
>+        case GL_INT_IMAGE_CUBE:
>+        case GL_UNSIGNED_INT_IMAGE_CUBE:
>+        case GL_UNSIGNED_INT_ATOMIC_COUNTER:
>+            return 1;
>+        case GL_FLOAT_MAT2:
>+        case GL_FLOAT_MAT3x2:
>+        case GL_FLOAT_MAT4x2:
>+            return 2;
>+        case GL_FLOAT_MAT3:
>+        case GL_FLOAT_MAT2x3:
>+        case GL_FLOAT_MAT4x3:
>+            return 3;
>+        case GL_FLOAT_MAT4:
>+        case GL_FLOAT_MAT2x4:
>+        case GL_FLOAT_MAT3x4:
>+            return 4;
>+        default:
>+            UNREACHABLE();
>     }
> 
>     return 0;
>@@ -303,72 +315,75 @@ int VariableColumnCount(GLenum type)
> {
>     switch (type)
>     {
>-      case GL_NONE:
>-        return 0;
>-      case GL_BOOL:
>-      case GL_FLOAT:
>-      case GL_INT:
>-      case GL_UNSIGNED_INT:
>-      case GL_SAMPLER_2D:
>-      case GL_SAMPLER_3D:
>-      case GL_SAMPLER_CUBE:
>-      case GL_SAMPLER_2D_ARRAY:
>-      case GL_SAMPLER_2D_MULTISAMPLE:
>-      case GL_INT_SAMPLER_2D:
>-      case GL_INT_SAMPLER_3D:
>-      case GL_INT_SAMPLER_CUBE:
>-      case GL_INT_SAMPLER_2D_ARRAY:
>-      case GL_INT_SAMPLER_2D_MULTISAMPLE:
>-      case GL_SAMPLER_EXTERNAL_OES:
>-      case GL_SAMPLER_2D_RECT_ANGLE:
>-      case GL_UNSIGNED_INT_SAMPLER_2D:
>-      case GL_UNSIGNED_INT_SAMPLER_3D:
>-      case GL_UNSIGNED_INT_SAMPLER_CUBE:
>-      case GL_UNSIGNED_INT_SAMPLER_2D_ARRAY:
>-      case GL_UNSIGNED_INT_SAMPLER_2D_MULTISAMPLE:
>-      case GL_SAMPLER_2D_SHADOW:
>-      case GL_SAMPLER_CUBE_SHADOW:
>-      case GL_SAMPLER_2D_ARRAY_SHADOW:
>-      case GL_IMAGE_2D:
>-      case GL_INT_IMAGE_2D:
>-      case GL_UNSIGNED_INT_IMAGE_2D:
>-      case GL_IMAGE_3D:
>-      case GL_INT_IMAGE_3D:
>-      case GL_UNSIGNED_INT_IMAGE_3D:
>-      case GL_IMAGE_2D_ARRAY:
>-      case GL_INT_IMAGE_2D_ARRAY:
>-      case GL_UNSIGNED_INT_IMAGE_2D_ARRAY:
>-      case GL_IMAGE_CUBE:
>-      case GL_INT_IMAGE_CUBE:
>-      case GL_UNSIGNED_INT_IMAGE_CUBE:
>-      case GL_UNSIGNED_INT_ATOMIC_COUNTER:
>-          return 1;
>-      case GL_BOOL_VEC2:
>-      case GL_FLOAT_VEC2:
>-      case GL_INT_VEC2:
>-      case GL_UNSIGNED_INT_VEC2:
>-      case GL_FLOAT_MAT2:
>-      case GL_FLOAT_MAT2x3:
>-      case GL_FLOAT_MAT2x4:
>-        return 2;
>-      case GL_BOOL_VEC3:
>-      case GL_FLOAT_VEC3:
>-      case GL_INT_VEC3:
>-      case GL_UNSIGNED_INT_VEC3:
>-      case GL_FLOAT_MAT3:
>-      case GL_FLOAT_MAT3x2:
>-      case GL_FLOAT_MAT3x4:
>-        return 3;
>-      case GL_BOOL_VEC4:
>-      case GL_FLOAT_VEC4:
>-      case GL_INT_VEC4:
>-      case GL_UNSIGNED_INT_VEC4:
>-      case GL_FLOAT_MAT4:
>-      case GL_FLOAT_MAT4x2:
>-      case GL_FLOAT_MAT4x3:
>-        return 4;
>-      default:
>-        UNREACHABLE();
>+        case GL_NONE:
>+            return 0;
>+        case GL_BOOL:
>+        case GL_FLOAT:
>+        case GL_INT:
>+        case GL_UNSIGNED_INT:
>+        case GL_SAMPLER_2D:
>+        case GL_SAMPLER_3D:
>+        case GL_SAMPLER_CUBE:
>+        case GL_SAMPLER_2D_ARRAY:
>+        case GL_SAMPLER_2D_MULTISAMPLE:
>+        case GL_SAMPLER_2D_MULTISAMPLE_ARRAY:
>+        case GL_INT_SAMPLER_2D:
>+        case GL_INT_SAMPLER_3D:
>+        case GL_INT_SAMPLER_CUBE:
>+        case GL_INT_SAMPLER_2D_ARRAY:
>+        case GL_INT_SAMPLER_2D_MULTISAMPLE:
>+        case GL_INT_SAMPLER_2D_MULTISAMPLE_ARRAY:
>+        case GL_SAMPLER_EXTERNAL_OES:
>+        case GL_SAMPLER_2D_RECT_ANGLE:
>+        case GL_UNSIGNED_INT_SAMPLER_2D:
>+        case GL_UNSIGNED_INT_SAMPLER_3D:
>+        case GL_UNSIGNED_INT_SAMPLER_CUBE:
>+        case GL_UNSIGNED_INT_SAMPLER_2D_ARRAY:
>+        case GL_UNSIGNED_INT_SAMPLER_2D_MULTISAMPLE:
>+        case GL_UNSIGNED_INT_SAMPLER_2D_MULTISAMPLE_ARRAY:
>+        case GL_SAMPLER_2D_SHADOW:
>+        case GL_SAMPLER_CUBE_SHADOW:
>+        case GL_SAMPLER_2D_ARRAY_SHADOW:
>+        case GL_IMAGE_2D:
>+        case GL_INT_IMAGE_2D:
>+        case GL_UNSIGNED_INT_IMAGE_2D:
>+        case GL_IMAGE_3D:
>+        case GL_INT_IMAGE_3D:
>+        case GL_UNSIGNED_INT_IMAGE_3D:
>+        case GL_IMAGE_2D_ARRAY:
>+        case GL_INT_IMAGE_2D_ARRAY:
>+        case GL_UNSIGNED_INT_IMAGE_2D_ARRAY:
>+        case GL_IMAGE_CUBE:
>+        case GL_INT_IMAGE_CUBE:
>+        case GL_UNSIGNED_INT_IMAGE_CUBE:
>+        case GL_UNSIGNED_INT_ATOMIC_COUNTER:
>+            return 1;
>+        case GL_BOOL_VEC2:
>+        case GL_FLOAT_VEC2:
>+        case GL_INT_VEC2:
>+        case GL_UNSIGNED_INT_VEC2:
>+        case GL_FLOAT_MAT2:
>+        case GL_FLOAT_MAT2x3:
>+        case GL_FLOAT_MAT2x4:
>+            return 2;
>+        case GL_BOOL_VEC3:
>+        case GL_FLOAT_VEC3:
>+        case GL_INT_VEC3:
>+        case GL_UNSIGNED_INT_VEC3:
>+        case GL_FLOAT_MAT3:
>+        case GL_FLOAT_MAT3x2:
>+        case GL_FLOAT_MAT3x4:
>+            return 3;
>+        case GL_BOOL_VEC4:
>+        case GL_FLOAT_VEC4:
>+        case GL_INT_VEC4:
>+        case GL_UNSIGNED_INT_VEC4:
>+        case GL_FLOAT_MAT4:
>+        case GL_FLOAT_MAT4x2:
>+        case GL_FLOAT_MAT4x3:
>+            return 4;
>+        default:
>+            UNREACHABLE();
>     }
> 
>     return 0;
>@@ -378,27 +393,30 @@ bool IsSamplerType(GLenum type)
> {
>     switch (type)
>     {
>-      case GL_SAMPLER_2D:
>-      case GL_SAMPLER_3D:
>-      case GL_SAMPLER_CUBE:
>-      case GL_SAMPLER_2D_ARRAY:
>-      case GL_SAMPLER_EXTERNAL_OES:
>-      case GL_SAMPLER_2D_MULTISAMPLE:
>-      case GL_SAMPLER_2D_RECT_ANGLE:
>-      case GL_INT_SAMPLER_2D:
>-      case GL_INT_SAMPLER_3D:
>-      case GL_INT_SAMPLER_CUBE:
>-      case GL_INT_SAMPLER_2D_ARRAY:
>-      case GL_INT_SAMPLER_2D_MULTISAMPLE:
>-      case GL_UNSIGNED_INT_SAMPLER_2D:
>-      case GL_UNSIGNED_INT_SAMPLER_3D:
>-      case GL_UNSIGNED_INT_SAMPLER_CUBE:
>-      case GL_UNSIGNED_INT_SAMPLER_2D_ARRAY:
>-      case GL_UNSIGNED_INT_SAMPLER_2D_MULTISAMPLE:
>-      case GL_SAMPLER_2D_SHADOW:
>-      case GL_SAMPLER_CUBE_SHADOW:
>-      case GL_SAMPLER_2D_ARRAY_SHADOW:
>-        return true;
>+        case GL_SAMPLER_2D:
>+        case GL_SAMPLER_3D:
>+        case GL_SAMPLER_CUBE:
>+        case GL_SAMPLER_2D_ARRAY:
>+        case GL_SAMPLER_EXTERNAL_OES:
>+        case GL_SAMPLER_2D_MULTISAMPLE:
>+        case GL_SAMPLER_2D_MULTISAMPLE_ARRAY:
>+        case GL_SAMPLER_2D_RECT_ANGLE:
>+        case GL_INT_SAMPLER_2D:
>+        case GL_INT_SAMPLER_3D:
>+        case GL_INT_SAMPLER_CUBE:
>+        case GL_INT_SAMPLER_2D_ARRAY:
>+        case GL_INT_SAMPLER_2D_MULTISAMPLE:
>+        case GL_INT_SAMPLER_2D_MULTISAMPLE_ARRAY:
>+        case GL_UNSIGNED_INT_SAMPLER_2D:
>+        case GL_UNSIGNED_INT_SAMPLER_3D:
>+        case GL_UNSIGNED_INT_SAMPLER_CUBE:
>+        case GL_UNSIGNED_INT_SAMPLER_2D_ARRAY:
>+        case GL_UNSIGNED_INT_SAMPLER_2D_MULTISAMPLE:
>+        case GL_UNSIGNED_INT_SAMPLER_2D_MULTISAMPLE_ARRAY:
>+        case GL_SAMPLER_2D_SHADOW:
>+        case GL_SAMPLER_CUBE_SHADOW:
>+        case GL_SAMPLER_2D_ARRAY_SHADOW:
>+            return true;
>     }
> 
>     return false;
>@@ -425,6 +443,30 @@ bool IsImageType(GLenum type)
>     return false;
> }
> 
>+bool IsImage2DType(GLenum type)
>+{
>+    switch (type)
>+    {
>+        case GL_IMAGE_2D:
>+        case GL_INT_IMAGE_2D:
>+        case GL_UNSIGNED_INT_IMAGE_2D:
>+            return true;
>+        case GL_IMAGE_3D:
>+        case GL_INT_IMAGE_3D:
>+        case GL_UNSIGNED_INT_IMAGE_3D:
>+        case GL_IMAGE_2D_ARRAY:
>+        case GL_INT_IMAGE_2D_ARRAY:
>+        case GL_UNSIGNED_INT_IMAGE_2D_ARRAY:
>+        case GL_IMAGE_CUBE:
>+        case GL_INT_IMAGE_CUBE:
>+        case GL_UNSIGNED_INT_IMAGE_CUBE:
>+            return false;
>+        default:
>+            UNREACHABLE();
>+            return false;
>+    }
>+}
>+
> bool IsAtomicCounterType(GLenum type)
> {
>     return type == GL_UNSIGNED_INT_ATOMIC_COUNTER;
>@@ -436,50 +478,6 @@ bool IsOpaqueType(GLenum type)
>     return IsImageType(type) || IsSamplerType(type) || IsAtomicCounterType(type);
> }
> 
>-GLenum SamplerTypeToTextureType(GLenum samplerType)
>-{
>-    switch (samplerType)
>-    {
>-      case GL_SAMPLER_2D:
>-      case GL_INT_SAMPLER_2D:
>-      case GL_UNSIGNED_INT_SAMPLER_2D:
>-      case GL_SAMPLER_2D_SHADOW:
>-        return GL_TEXTURE_2D;
>-
>-      case GL_SAMPLER_EXTERNAL_OES:
>-          return GL_TEXTURE_EXTERNAL_OES;
>-
>-      case GL_SAMPLER_CUBE:
>-      case GL_INT_SAMPLER_CUBE:
>-      case GL_UNSIGNED_INT_SAMPLER_CUBE:
>-      case GL_SAMPLER_CUBE_SHADOW:
>-        return GL_TEXTURE_CUBE_MAP;
>-
>-      case GL_SAMPLER_2D_ARRAY:
>-      case GL_INT_SAMPLER_2D_ARRAY:
>-      case GL_UNSIGNED_INT_SAMPLER_2D_ARRAY:
>-      case GL_SAMPLER_2D_ARRAY_SHADOW:
>-        return GL_TEXTURE_2D_ARRAY;
>-
>-      case GL_SAMPLER_3D:
>-      case GL_INT_SAMPLER_3D:
>-      case GL_UNSIGNED_INT_SAMPLER_3D:
>-        return GL_TEXTURE_3D;
>-
>-      case GL_SAMPLER_2D_MULTISAMPLE:
>-      case GL_INT_SAMPLER_2D_MULTISAMPLE:
>-      case GL_UNSIGNED_INT_SAMPLER_2D_MULTISAMPLE:
>-          return GL_TEXTURE_2D_MULTISAMPLE;
>-
>-      case GL_SAMPLER_2D_RECT_ANGLE:
>-          return GL_TEXTURE_RECTANGLE_ANGLE;
>-
>-      default:
>-        UNREACHABLE();
>-        return 0;
>-    }
>-}
>-
> bool IsMatrixType(GLenum type)
> {
>     return VariableRowCount(type) > 1;
>@@ -494,16 +492,27 @@ GLenum TransposeMatrixType(GLenum type)
> 
>     switch (type)
>     {
>-      case GL_FLOAT_MAT2:   return GL_FLOAT_MAT2;
>-      case GL_FLOAT_MAT3:   return GL_FLOAT_MAT3;
>-      case GL_FLOAT_MAT4:   return GL_FLOAT_MAT4;
>-      case GL_FLOAT_MAT2x3: return GL_FLOAT_MAT3x2;
>-      case GL_FLOAT_MAT3x2: return GL_FLOAT_MAT2x3;
>-      case GL_FLOAT_MAT2x4: return GL_FLOAT_MAT4x2;
>-      case GL_FLOAT_MAT4x2: return GL_FLOAT_MAT2x4;
>-      case GL_FLOAT_MAT3x4: return GL_FLOAT_MAT4x3;
>-      case GL_FLOAT_MAT4x3: return GL_FLOAT_MAT3x4;
>-      default: UNREACHABLE(); return GL_NONE;
>+        case GL_FLOAT_MAT2:
>+            return GL_FLOAT_MAT2;
>+        case GL_FLOAT_MAT3:
>+            return GL_FLOAT_MAT3;
>+        case GL_FLOAT_MAT4:
>+            return GL_FLOAT_MAT4;
>+        case GL_FLOAT_MAT2x3:
>+            return GL_FLOAT_MAT3x2;
>+        case GL_FLOAT_MAT3x2:
>+            return GL_FLOAT_MAT2x3;
>+        case GL_FLOAT_MAT2x4:
>+            return GL_FLOAT_MAT4x2;
>+        case GL_FLOAT_MAT4x2:
>+            return GL_FLOAT_MAT2x4;
>+        case GL_FLOAT_MAT3x4:
>+            return GL_FLOAT_MAT4x3;
>+        case GL_FLOAT_MAT4x3:
>+            return GL_FLOAT_MAT3x4;
>+        default:
>+            UNREACHABLE();
>+            return GL_NONE;
>     }
> }
> 
>@@ -528,7 +537,8 @@ int AllocateFirstFreeBits(unsigned int *bits, unsigned int allocationSize, unsig
> {
>     ASSERT(allocationSize <= bitsSize);
> 
>-    unsigned int mask = std::numeric_limits<unsigned int>::max() >> (std::numeric_limits<unsigned int>::digits - allocationSize);
>+    unsigned int mask = std::numeric_limits<unsigned int>::max() >>
>+                        (std::numeric_limits<unsigned int>::digits - allocationSize);
> 
>     for (unsigned int i = 0; i < bitsSize - allocationSize + 1; i++)
>     {
>@@ -544,45 +554,22 @@ int AllocateFirstFreeBits(unsigned int *bits, unsigned int allocationSize, unsig
>     return -1;
> }
> 
>-static_assert(GL_TEXTURE_CUBE_MAP_NEGATIVE_X - GL_TEXTURE_CUBE_MAP_POSITIVE_X == 1, "Unexpected GL cube map enum value.");
>-static_assert(GL_TEXTURE_CUBE_MAP_POSITIVE_Y - GL_TEXTURE_CUBE_MAP_POSITIVE_X == 2, "Unexpected GL cube map enum value.");
>-static_assert(GL_TEXTURE_CUBE_MAP_NEGATIVE_Y - GL_TEXTURE_CUBE_MAP_POSITIVE_X == 3, "Unexpected GL cube map enum value.");
>-static_assert(GL_TEXTURE_CUBE_MAP_POSITIVE_Z - GL_TEXTURE_CUBE_MAP_POSITIVE_X == 4, "Unexpected GL cube map enum value.");
>-static_assert(GL_TEXTURE_CUBE_MAP_NEGATIVE_Z - GL_TEXTURE_CUBE_MAP_POSITIVE_X == 5, "Unexpected GL cube map enum value.");
>-
>-bool IsCubeMapTextureTarget(GLenum target)
>-{
>-    return (target >= FirstCubeMapTextureTarget && target <= LastCubeMapTextureTarget);
>-}
>-
>-size_t CubeMapTextureTargetToLayerIndex(GLenum target)
>-{
>-    ASSERT(IsCubeMapTextureTarget(target));
>-    return target - static_cast<size_t>(FirstCubeMapTextureTarget);
>-}
>-
>-GLenum LayerIndexToCubeMapTextureTarget(size_t index)
>-{
>-    ASSERT(index <= (LastCubeMapTextureTarget - FirstCubeMapTextureTarget));
>-    return FirstCubeMapTextureTarget + static_cast<GLenum>(index);
>-}
>-
>-IndexRange ComputeIndexRange(GLenum indexType,
>+IndexRange ComputeIndexRange(DrawElementsType indexType,
>                              const GLvoid *indices,
>                              size_t count,
>                              bool primitiveRestartEnabled)
> {
>     switch (indexType)
>     {
>-        case GL_UNSIGNED_BYTE:
>+        case DrawElementsType::UnsignedByte:
>             return ComputeTypedIndexRange(static_cast<const GLubyte *>(indices), count,
>                                           primitiveRestartEnabled,
>                                           GetPrimitiveRestartIndex(indexType));
>-        case GL_UNSIGNED_SHORT:
>+        case DrawElementsType::UnsignedShort:
>             return ComputeTypedIndexRange(static_cast<const GLushort *>(indices), count,
>                                           primitiveRestartEnabled,
>                                           GetPrimitiveRestartIndex(indexType));
>-        case GL_UNSIGNED_INT:
>+        case DrawElementsType::UnsignedInt:
>             return ComputeTypedIndexRange(static_cast<const GLuint *>(indices), count,
>                                           primitiveRestartEnabled,
>                                           GetPrimitiveRestartIndex(indexType));
>@@ -592,15 +579,15 @@ IndexRange ComputeIndexRange(GLenum indexType,
>     }
> }
> 
>-GLuint GetPrimitiveRestartIndex(GLenum indexType)
>+GLuint GetPrimitiveRestartIndex(DrawElementsType indexType)
> {
>     switch (indexType)
>     {
>-        case GL_UNSIGNED_BYTE:
>+        case DrawElementsType::UnsignedByte:
>             return 0xFF;
>-        case GL_UNSIGNED_SHORT:
>+        case DrawElementsType::UnsignedShort:
>             return 0xFFFF;
>-        case GL_UNSIGNED_INT:
>+        case DrawElementsType::UnsignedInt:
>             return 0xFFFFFFFF;
>         default:
>             UNREACHABLE();
>@@ -608,25 +595,35 @@ GLuint GetPrimitiveRestartIndex(GLenum indexType)
>     }
> }
> 
>-bool IsTriangleMode(GLenum drawMode)
>+bool IsTriangleMode(PrimitiveMode drawMode)
> {
>     switch (drawMode)
>     {
>-      case GL_TRIANGLES:
>-      case GL_TRIANGLE_FAN:
>-      case GL_TRIANGLE_STRIP:
>-        return true;
>-      case GL_POINTS:
>-      case GL_LINES:
>-      case GL_LINE_LOOP:
>-      case GL_LINE_STRIP:
>-        return false;
>-      default: UNREACHABLE();
>+        case PrimitiveMode::Triangles:
>+        case PrimitiveMode::TriangleFan:
>+        case PrimitiveMode::TriangleStrip:
>+            return true;
>+        case PrimitiveMode::Points:
>+        case PrimitiveMode::Lines:
>+        case PrimitiveMode::LineLoop:
>+        case PrimitiveMode::LineStrip:
>+            return false;
>+        default:
>+            UNREACHABLE();
>     }
> 
>     return false;
> }
> 
>+namespace priv
>+{
>+const angle::PackedEnumMap<PrimitiveMode, bool> gLineModes = {
>+    {{PrimitiveMode::LineLoop, true},
>+     {PrimitiveMode::LineStrip, true},
>+     {PrimitiveMode::LineStripAdjacency, true},
>+     {PrimitiveMode::Lines, true}}};
>+}  // namespace priv
>+
> bool IsIntegerFormat(GLenum unsizedFormat)
> {
>     switch (unsizedFormat)
>@@ -648,90 +645,93 @@ int VariableSortOrder(GLenum type)
> {
>     switch (type)
>     {
>-      // 1. Arrays of mat4 and mat4
>-      // Non-square matrices of type matCxR consume the same space as a square
>-      // matrix of type matN where N is the greater of C and R
>-      case GL_FLOAT_MAT4:
>-      case GL_FLOAT_MAT2x4:
>-      case GL_FLOAT_MAT3x4:
>-      case GL_FLOAT_MAT4x2:
>-      case GL_FLOAT_MAT4x3:
>-        return 0;
>-
>-      // 2. Arrays of mat2 and mat2 (since they occupy full rows)
>-      case GL_FLOAT_MAT2:
>-        return 1;
>-
>-      // 3. Arrays of vec4 and vec4
>-      case GL_FLOAT_VEC4:
>-      case GL_INT_VEC4:
>-      case GL_BOOL_VEC4:
>-      case GL_UNSIGNED_INT_VEC4:
>-        return 2;
>-
>-      // 4. Arrays of mat3 and mat3
>-      case GL_FLOAT_MAT3:
>-      case GL_FLOAT_MAT2x3:
>-      case GL_FLOAT_MAT3x2:
>-        return 3;
>-
>-      // 5. Arrays of vec3 and vec3
>-      case GL_FLOAT_VEC3:
>-      case GL_INT_VEC3:
>-      case GL_BOOL_VEC3:
>-      case GL_UNSIGNED_INT_VEC3:
>-        return 4;
>-
>-      // 6. Arrays of vec2 and vec2
>-      case GL_FLOAT_VEC2:
>-      case GL_INT_VEC2:
>-      case GL_BOOL_VEC2:
>-      case GL_UNSIGNED_INT_VEC2:
>-        return 5;
>-
>-      // 7. Single component types
>-      case GL_FLOAT:
>-      case GL_INT:
>-      case GL_BOOL:
>-      case GL_UNSIGNED_INT:
>-      case GL_SAMPLER_2D:
>-      case GL_SAMPLER_CUBE:
>-      case GL_SAMPLER_EXTERNAL_OES:
>-      case GL_SAMPLER_2D_RECT_ANGLE:
>-      case GL_SAMPLER_2D_ARRAY:
>-      case GL_SAMPLER_2D_MULTISAMPLE:
>-      case GL_SAMPLER_3D:
>-      case GL_INT_SAMPLER_2D:
>-      case GL_INT_SAMPLER_3D:
>-      case GL_INT_SAMPLER_CUBE:
>-      case GL_INT_SAMPLER_2D_ARRAY:
>-      case GL_INT_SAMPLER_2D_MULTISAMPLE:
>-      case GL_UNSIGNED_INT_SAMPLER_2D:
>-      case GL_UNSIGNED_INT_SAMPLER_3D:
>-      case GL_UNSIGNED_INT_SAMPLER_CUBE:
>-      case GL_UNSIGNED_INT_SAMPLER_2D_ARRAY:
>-      case GL_UNSIGNED_INT_SAMPLER_2D_MULTISAMPLE:
>-      case GL_SAMPLER_2D_SHADOW:
>-      case GL_SAMPLER_2D_ARRAY_SHADOW:
>-      case GL_SAMPLER_CUBE_SHADOW:
>-      case GL_IMAGE_2D:
>-      case GL_INT_IMAGE_2D:
>-      case GL_UNSIGNED_INT_IMAGE_2D:
>-      case GL_IMAGE_3D:
>-      case GL_INT_IMAGE_3D:
>-      case GL_UNSIGNED_INT_IMAGE_3D:
>-      case GL_IMAGE_2D_ARRAY:
>-      case GL_INT_IMAGE_2D_ARRAY:
>-      case GL_UNSIGNED_INT_IMAGE_2D_ARRAY:
>-      case GL_IMAGE_CUBE:
>-      case GL_INT_IMAGE_CUBE:
>-      case GL_UNSIGNED_INT_IMAGE_CUBE:
>-      case GL_UNSIGNED_INT_ATOMIC_COUNTER:
>-          return 6;
>-
>-      default:
>-        UNREACHABLE();
>-        return 0;
>+        // 1. Arrays of mat4 and mat4
>+        // Non-square matrices of type matCxR consume the same space as a square
>+        // matrix of type matN where N is the greater of C and R
>+        case GL_FLOAT_MAT4:
>+        case GL_FLOAT_MAT2x4:
>+        case GL_FLOAT_MAT3x4:
>+        case GL_FLOAT_MAT4x2:
>+        case GL_FLOAT_MAT4x3:
>+            return 0;
>+
>+        // 2. Arrays of mat2 and mat2 (since they occupy full rows)
>+        case GL_FLOAT_MAT2:
>+            return 1;
>+
>+        // 3. Arrays of vec4 and vec4
>+        case GL_FLOAT_VEC4:
>+        case GL_INT_VEC4:
>+        case GL_BOOL_VEC4:
>+        case GL_UNSIGNED_INT_VEC4:
>+            return 2;
>+
>+        // 4. Arrays of mat3 and mat3
>+        case GL_FLOAT_MAT3:
>+        case GL_FLOAT_MAT2x3:
>+        case GL_FLOAT_MAT3x2:
>+            return 3;
>+
>+        // 5. Arrays of vec3 and vec3
>+        case GL_FLOAT_VEC3:
>+        case GL_INT_VEC3:
>+        case GL_BOOL_VEC3:
>+        case GL_UNSIGNED_INT_VEC3:
>+            return 4;
>+
>+        // 6. Arrays of vec2 and vec2
>+        case GL_FLOAT_VEC2:
>+        case GL_INT_VEC2:
>+        case GL_BOOL_VEC2:
>+        case GL_UNSIGNED_INT_VEC2:
>+            return 5;
>+
>+        // 7. Single component types
>+        case GL_FLOAT:
>+        case GL_INT:
>+        case GL_BOOL:
>+        case GL_UNSIGNED_INT:
>+        case GL_SAMPLER_2D:
>+        case GL_SAMPLER_CUBE:
>+        case GL_SAMPLER_EXTERNAL_OES:
>+        case GL_SAMPLER_2D_RECT_ANGLE:
>+        case GL_SAMPLER_2D_ARRAY:
>+        case GL_SAMPLER_2D_MULTISAMPLE:
>+        case GL_SAMPLER_2D_MULTISAMPLE_ARRAY:
>+        case GL_SAMPLER_3D:
>+        case GL_INT_SAMPLER_2D:
>+        case GL_INT_SAMPLER_3D:
>+        case GL_INT_SAMPLER_CUBE:
>+        case GL_INT_SAMPLER_2D_ARRAY:
>+        case GL_INT_SAMPLER_2D_MULTISAMPLE:
>+        case GL_INT_SAMPLER_2D_MULTISAMPLE_ARRAY:
>+        case GL_UNSIGNED_INT_SAMPLER_2D:
>+        case GL_UNSIGNED_INT_SAMPLER_3D:
>+        case GL_UNSIGNED_INT_SAMPLER_CUBE:
>+        case GL_UNSIGNED_INT_SAMPLER_2D_ARRAY:
>+        case GL_UNSIGNED_INT_SAMPLER_2D_MULTISAMPLE:
>+        case GL_UNSIGNED_INT_SAMPLER_2D_MULTISAMPLE_ARRAY:
>+        case GL_SAMPLER_2D_SHADOW:
>+        case GL_SAMPLER_2D_ARRAY_SHADOW:
>+        case GL_SAMPLER_CUBE_SHADOW:
>+        case GL_IMAGE_2D:
>+        case GL_INT_IMAGE_2D:
>+        case GL_UNSIGNED_INT_IMAGE_2D:
>+        case GL_IMAGE_3D:
>+        case GL_INT_IMAGE_3D:
>+        case GL_UNSIGNED_INT_IMAGE_3D:
>+        case GL_IMAGE_2D_ARRAY:
>+        case GL_INT_IMAGE_2D_ARRAY:
>+        case GL_UNSIGNED_INT_IMAGE_2D_ARRAY:
>+        case GL_IMAGE_CUBE:
>+        case GL_INT_IMAGE_CUBE:
>+        case GL_UNSIGNED_INT_IMAGE_CUBE:
>+        case GL_UNSIGNED_INT_ATOMIC_COUNTER:
>+            return 6;
>+
>+        default:
>+            UNREACHABLE();
>+            return 0;
>     }
> }
> 
>@@ -770,6 +770,38 @@ std::string ParseResourceName(const std::string &name, std::vector<unsigned int>
>     return name.substr(0, baseNameLength);
> }
> 
>+const sh::ShaderVariable *FindShaderVarField(const sh::ShaderVariable &var,
>+                                             const std::string &fullName)
>+{
>+    if (var.fields.empty())
>+    {
>+        return nullptr;
>+    }
>+    size_t pos = fullName.find_first_of(".");
>+    if (pos == std::string::npos)
>+    {
>+        return nullptr;
>+    }
>+    std::string topName = fullName.substr(0, pos);
>+    if (topName != var.name)
>+    {
>+        return nullptr;
>+    }
>+    std::string fieldName = fullName.substr(pos + 1);
>+    if (fieldName.empty())
>+    {
>+        return nullptr;
>+    }
>+    for (const auto &field : var.fields)
>+    {
>+        if (field.name == fieldName)
>+        {
>+            return &field;
>+        }
>+    }
>+    return nullptr;
>+}
>+
> unsigned int ArraySizeProduct(const std::vector<unsigned int> &arraySizes)
> {
>     unsigned int arraySizeProduct = 1u;
>@@ -915,6 +947,18 @@ bool IsRenderbufferTarget(EGLenum target)
>     return target == EGL_GL_RENDERBUFFER_KHR;
> }
> 
>+bool IsExternalImageTarget(EGLenum target)
>+{
>+    switch (target)
>+    {
>+        case EGL_NATIVE_BUFFER_ANDROID:
>+            return true;
>+
>+        default:
>+            return false;
>+    }
>+}
>+
> const char *GetGenericErrorMessage(EGLint error)
> {
>     switch (error)
>@@ -963,36 +1007,6 @@ const char *GetGenericErrorMessage(EGLint error)
> 
> namespace egl_gl
> {
>-GLenum EGLCubeMapTargetToGLCubeMapTarget(EGLenum eglTarget)
>-{
>-    ASSERT(egl::IsCubeMapTextureTarget(eglTarget));
>-    return gl::LayerIndexToCubeMapTextureTarget(egl::CubeMapTextureTargetToLayerIndex(eglTarget));
>-}
>-
>-GLenum EGLImageTargetToGLTextureTarget(EGLenum eglTarget)
>-{
>-    switch (eglTarget)
>-    {
>-        case EGL_GL_TEXTURE_2D_KHR:
>-            return GL_TEXTURE_2D;
>-
>-        case EGL_GL_TEXTURE_CUBE_MAP_POSITIVE_X_KHR:
>-        case EGL_GL_TEXTURE_CUBE_MAP_NEGATIVE_X_KHR:
>-        case EGL_GL_TEXTURE_CUBE_MAP_POSITIVE_Y_KHR:
>-        case EGL_GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_KHR:
>-        case EGL_GL_TEXTURE_CUBE_MAP_POSITIVE_Z_KHR:
>-        case EGL_GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_KHR:
>-            return EGLCubeMapTargetToGLCubeMapTarget(eglTarget);
>-
>-        case EGL_GL_TEXTURE_3D_KHR:
>-            return GL_TEXTURE_3D;
>-
>-        default:
>-            UNREACHABLE();
>-            return GL_NONE;
>-    }
>-}
>-
> GLuint EGLClientBufferToGLObjectHandle(EGLClientBuffer buffer)
> {
>     return static_cast<GLuint>(reinterpret_cast<uintptr_t>(buffer));
>@@ -1016,12 +1030,18 @@ EGLenum GLComponentTypeToEGLColorComponentType(GLenum glComponentType)
>             return EGL_NONE;
>     }
> }
>+
>+EGLClientBuffer GLObjectHandleToEGLClientBuffer(GLuint handle)
>+{
>+    return reinterpret_cast<EGLClientBuffer>(static_cast<uintptr_t>(handle));
>+}
>+
> }  // namespace gl_egl
> 
> #if !defined(ANGLE_ENABLE_WINDOWS_STORE)
> std::string getTempPath()
> {
>-#ifdef ANGLE_PLATFORM_WINDOWS
>+#    ifdef ANGLE_PLATFORM_WINDOWS
>     char path[MAX_PATH];
>     DWORD pathLen = GetTempPathA(sizeof(path) / sizeof(path[0]), path);
>     if (pathLen == 0)
>@@ -1038,15 +1058,15 @@ std::string getTempPath()
>     }
> 
>     return path;
>-#else
>+#    else
>     UNIMPLEMENTED();
>     return "";
>-#endif
>+#    endif
> }
> 
>-void writeFile(const char* path, const void* content, size_t size)
>+void writeFile(const char *path, const void *content, size_t size)
> {
>-    FILE* file = fopen(path, "w");
>+    FILE *file = fopen(path, "w");
>     if (!file)
>     {
>         UNREACHABLE();
>@@ -1056,9 +1076,9 @@ void writeFile(const char* path, const void* content, size_t size)
>     fwrite(content, sizeof(char), size, file);
>     fclose(file);
> }
>-#endif // !ANGLE_ENABLE_WINDOWS_STORE
>+#endif  // !ANGLE_ENABLE_WINDOWS_STORE
> 
>-#if defined (ANGLE_PLATFORM_WINDOWS)
>+#if defined(ANGLE_PLATFORM_WINDOWS)
> 
> // Causes the thread to relinquish the remainder of its time slice to any
> // other thread that is ready to run.If there are no other threads ready
>diff --git a/Source/ThirdParty/ANGLE/src/common/utilities.h b/Source/ThirdParty/ANGLE/src/common/utilities.h
>index f2f9c63d0e6..9dcb06e8a2d 100644
>--- a/Source/ThirdParty/ANGLE/src/common/utilities.h
>+++ b/Source/ThirdParty/ANGLE/src/common/utilities.h
>@@ -15,9 +15,17 @@
> #include <math.h>
> #include <string>
> #include <vector>
>+
> #include "angle_gl.h"
> 
>+#include "common/PackedEnums.h"
> #include "common/mathutil.h"
>+#include "common/platform.h"
>+
>+namespace sh
>+{
>+struct ShaderVariable;
>+}
> 
> namespace gl
> {
>@@ -31,9 +39,9 @@ int VariableRowCount(GLenum type);
> int VariableColumnCount(GLenum type);
> bool IsSamplerType(GLenum type);
> bool IsImageType(GLenum type);
>+bool IsImage2DType(GLenum type);
> bool IsAtomicCounterType(GLenum type);
> bool IsOpaqueType(GLenum type);
>-GLenum SamplerTypeToTextureType(GLenum samplerType);
> bool IsMatrixType(GLenum type);
> GLenum TransposeMatrixType(GLenum type);
> int VariableRegisterCount(GLenum type);
>@@ -44,12 +52,6 @@ GLenum VariableBoolVectorType(GLenum type);
> 
> int AllocateFirstFreeBits(unsigned int *bits, unsigned int allocationSize, unsigned int bitsSize);
> 
>-static const GLenum FirstCubeMapTextureTarget = GL_TEXTURE_CUBE_MAP_POSITIVE_X;
>-static const GLenum LastCubeMapTextureTarget = GL_TEXTURE_CUBE_MAP_NEGATIVE_Z;
>-bool IsCubeMapTextureTarget(GLenum target);
>-size_t CubeMapTextureTargetToLayerIndex(GLenum target);
>-GLenum LayerIndexToCubeMapTextureTarget(size_t index);
>-
> // Parse the base resource name and array indices. Returns the base name of the resource.
> // If the provided name doesn't index an array, the outSubscripts vector will be empty.
> // If the provided name indexes an array, the outSubscripts vector will contain indices with
>@@ -57,17 +59,33 @@ GLenum LayerIndexToCubeMapTextureTarget(size_t index);
> // outSubscripts.
> std::string ParseResourceName(const std::string &name, std::vector<unsigned int> *outSubscripts);
> 
>+// Find the child field which matches 'fullName' == var.name + "." + field.name.
>+// Return nullptr if not found.
>+const sh::ShaderVariable *FindShaderVarField(const sh::ShaderVariable &var,
>+                                             const std::string &fullName);
>+
> // Find the range of index values in the provided indices pointer.  Primitive restart indices are
> // only counted in the range if primitive restart is disabled.
>-IndexRange ComputeIndexRange(GLenum indexType,
>+IndexRange ComputeIndexRange(DrawElementsType indexType,
>                              const GLvoid *indices,
>                              size_t count,
>                              bool primitiveRestartEnabled);
> 
> // Get the primitive restart index value for the given index type.
>-GLuint GetPrimitiveRestartIndex(GLenum indexType);
>+GLuint GetPrimitiveRestartIndex(DrawElementsType indexType);
>+
>+bool IsTriangleMode(PrimitiveMode drawMode);
>+
>+namespace priv
>+{
>+extern const angle::PackedEnumMap<PrimitiveMode, bool> gLineModes;
>+}  // namespace priv
>+
>+ANGLE_INLINE bool IsLineMode(PrimitiveMode primitiveMode)
>+{
>+    return priv::gLineModes[primitiveMode];
>+}
> 
>-bool IsTriangleMode(GLenum drawMode);
> bool IsIntegerFormat(GLenum unsizedFormat);
> 
> // Returns the product of the sizes in the vector, or 1 if the vector is empty. Doesn't currently
>@@ -79,44 +97,41 @@ unsigned int ArraySizeProduct(const std::vector<unsigned int> &arraySizes);
> // GL_INVALID_INDEX and write the length of the original string.
> unsigned int ParseArrayIndex(const std::string &name, size_t *nameLengthWithoutArrayIndexOut);
> 
>+enum class SamplerFormat : uint8_t
>+{
>+    Float    = 0,
>+    Unsigned = 1,
>+    Signed   = 2,
>+    Shadow   = 3,
>+
>+    InvalidEnum = 4,
>+    EnumCount   = 4,
>+};
>+
> struct UniformTypeInfo final : angle::NonCopyable
> {
>-    constexpr UniformTypeInfo(GLenum type,
>-                              GLenum componentType,
>-                              GLenum samplerTextureType,
>-                              GLenum transposedMatrixType,
>-                              GLenum boolVectorType,
>-                              int rowCount,
>-                              int columnCount,
>-                              int componentCount,
>-                              size_t componentSize,
>-                              size_t internalSize,
>-                              size_t externalSize,
>-                              bool isSampler,
>-                              bool isMatrixType,
>-                              bool isImageType)
>-        : type(type),
>-          componentType(componentType),
>-          samplerTextureType(samplerTextureType),
>-          transposedMatrixType(transposedMatrixType),
>-          boolVectorType(boolVectorType),
>-          rowCount(rowCount),
>-          columnCount(columnCount),
>-          componentCount(componentCount),
>-          componentSize(componentSize),
>-          internalSize(internalSize),
>-          externalSize(externalSize),
>-          isSampler(isSampler),
>-          isMatrixType(isMatrixType),
>-          isImageType(isImageType)
>-    {
>-    }
>+    inline constexpr UniformTypeInfo(GLenum type,
>+                                     GLenum componentType,
>+                                     GLenum textureType,
>+                                     GLenum transposedMatrixType,
>+                                     GLenum boolVectorType,
>+                                     SamplerFormat samplerFormat,
>+                                     int rowCount,
>+                                     int columnCount,
>+                                     int componentCount,
>+                                     size_t componentSize,
>+                                     size_t internalSize,
>+                                     size_t externalSize,
>+                                     bool isSampler,
>+                                     bool isMatrixType,
>+                                     bool isImageType);
> 
>     GLenum type;
>     GLenum componentType;
>-    GLenum samplerTextureType;
>+    GLenum textureType;
>     GLenum transposedMatrixType;
>     GLenum boolVectorType;
>+    SamplerFormat samplerFormat;
>     int rowCount;
>     int columnCount;
>     int componentCount;
>@@ -128,45 +143,83 @@ struct UniformTypeInfo final : angle::NonCopyable
>     bool isImageType;
> };
> 
>+inline constexpr UniformTypeInfo::UniformTypeInfo(GLenum type,
>+                                                  GLenum componentType,
>+                                                  GLenum textureType,
>+                                                  GLenum transposedMatrixType,
>+                                                  GLenum boolVectorType,
>+                                                  SamplerFormat samplerFormat,
>+                                                  int rowCount,
>+                                                  int columnCount,
>+                                                  int componentCount,
>+                                                  size_t componentSize,
>+                                                  size_t internalSize,
>+                                                  size_t externalSize,
>+                                                  bool isSampler,
>+                                                  bool isMatrixType,
>+                                                  bool isImageType)
>+    : type(type),
>+      componentType(componentType),
>+      textureType(textureType),
>+      transposedMatrixType(transposedMatrixType),
>+      boolVectorType(boolVectorType),
>+      samplerFormat(samplerFormat),
>+      rowCount(rowCount),
>+      columnCount(columnCount),
>+      componentCount(componentCount),
>+      componentSize(componentSize),
>+      internalSize(internalSize),
>+      externalSize(externalSize),
>+      isSampler(isSampler),
>+      isMatrixType(isMatrixType),
>+      isImageType(isImageType)
>+{}
>+
> const UniformTypeInfo &GetUniformTypeInfo(GLenum uniformType);
> 
> const char *GetGenericErrorMessage(GLenum error);
> 
> unsigned int ElementTypeSize(GLenum elementType);
> 
>+template <typename T>
>+T GetClampedVertexCount(size_t vertexCount)
>+{
>+    static constexpr size_t kMax = static_cast<size_t>(std::numeric_limits<T>::max());
>+    return static_cast<T>(vertexCount > kMax ? kMax : vertexCount);
>+}
> }  // namespace gl
> 
> namespace egl
> {
> static const EGLenum FirstCubeMapTextureTarget = EGL_GL_TEXTURE_CUBE_MAP_POSITIVE_X_KHR;
>-static const EGLenum LastCubeMapTextureTarget = EGL_GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_KHR;
>+static const EGLenum LastCubeMapTextureTarget  = EGL_GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_KHR;
> bool IsCubeMapTextureTarget(EGLenum target);
> size_t CubeMapTextureTargetToLayerIndex(EGLenum target);
> EGLenum LayerIndexToCubeMapTextureTarget(size_t index);
> bool IsTextureTarget(EGLenum target);
> bool IsRenderbufferTarget(EGLenum target);
>+bool IsExternalImageTarget(EGLenum target);
> 
> const char *GetGenericErrorMessage(EGLint error);
> }  // namespace egl
> 
> namespace egl_gl
> {
>-GLenum EGLCubeMapTargetToGLCubeMapTarget(EGLenum eglTarget);
>-GLenum EGLImageTargetToGLTextureTarget(EGLenum eglTarget);
> GLuint EGLClientBufferToGLObjectHandle(EGLClientBuffer buffer);
> }
> 
> namespace gl_egl
> {
> EGLenum GLComponentTypeToEGLColorComponentType(GLenum glComponentType);
>+EGLClientBuffer GLObjectHandleToEGLClientBuffer(GLuint handle);
> }  // namespace gl_egl
> 
> #if !defined(ANGLE_ENABLE_WINDOWS_STORE)
> std::string getTempPath();
>-void writeFile(const char* path, const void* data, size_t size);
>+void writeFile(const char *path, const void *data, size_t size);
> #endif
> 
>-#if defined (ANGLE_PLATFORM_WINDOWS)
>+#if defined(ANGLE_PLATFORM_WINDOWS)
> void ScheduleYield();
> #endif
> 
>diff --git a/Source/ThirdParty/ANGLE/src/common/vector_utils.h b/Source/ThirdParty/ANGLE/src/common/vector_utils.h
>index 9f5bee1a4ad..d23a836288c 100644
>--- a/Source/ThirdParty/ANGLE/src/common/vector_utils.h
>+++ b/Source/ThirdParty/ANGLE/src/common/vector_utils.h
>@@ -367,7 +367,7 @@ Vector<Dimension, Type> &VectorBase<Dimension, Type>::operator+=(
>     {
>         mData[i] += other.mData[i];
>     }
>-    return *reinterpret_cast<Vector<Dimension, Type> *>(this);
>+    return *static_cast<Vector<Dimension, Type> *>(this);
> }
> 
> template <size_t Dimension, typename Type>
>@@ -378,7 +378,7 @@ Vector<Dimension, Type> &VectorBase<Dimension, Type>::operator-=(
>     {
>         mData[i] -= other.mData[i];
>     }
>-    return *reinterpret_cast<Vector<Dimension, Type> *>(this);
>+    return *static_cast<Vector<Dimension, Type> *>(this);
> }
> 
> template <size_t Dimension, typename Type>
>@@ -389,7 +389,7 @@ Vector<Dimension, Type> &VectorBase<Dimension, Type>::operator*=(
>     {
>         mData[i] *= other.mData[i];
>     }
>-    return *reinterpret_cast<Vector<Dimension, Type> *>(this);
>+    return *static_cast<Vector<Dimension, Type> *>(this);
> }
> 
> template <size_t Dimension, typename Type>
>@@ -400,7 +400,7 @@ Vector<Dimension, Type> &VectorBase<Dimension, Type>::operator/=(
>     {
>         mData[i] /= other.mData[i];
>     }
>-    return *reinterpret_cast<Vector<Dimension, Type> *>(this);
>+    return *static_cast<Vector<Dimension, Type> *>(this);
> }
> 
> template <size_t Dimension, typename Type>
>@@ -410,7 +410,7 @@ Vector<Dimension, Type> &VectorBase<Dimension, Type>::operator*=(Type other)
>     {
>         mData[i] *= other;
>     }
>-    return *reinterpret_cast<Vector<Dimension, Type> *>(this);
>+    return *static_cast<Vector<Dimension, Type> *>(this);
> }
> 
> template <size_t Dimension, typename Type>
>@@ -420,7 +420,7 @@ Vector<Dimension, Type> &VectorBase<Dimension, Type>::operator/=(Type other)
>     {
>         mData[i] /= other;
>     }
>-    return *reinterpret_cast<Vector<Dimension, Type> *>(this);
>+    return *static_cast<Vector<Dimension, Type> *>(this);
> }
> 
> // Implementation of comparison operators
>diff --git a/Source/ThirdParty/ANGLE/src/common/version.h b/Source/ThirdParty/ANGLE/src/common/version.h
>index e7ffa7cab34..ff96e599191 100644
>--- a/Source/ThirdParty/ANGLE/src/common/version.h
>+++ b/Source/ThirdParty/ANGLE/src/common/version.h
>@@ -13,16 +13,15 @@
> #define ANGLE_MINOR_VERSION 1
> 
> #ifndef ANGLE_REVISION
>-#define ANGLE_REVISION 0
>+#    define ANGLE_REVISION 0
> #endif
> 
>-#define ANGLE_STRINGIFY(x)       #x
>+#define ANGLE_STRINGIFY(x) #x
> #define ANGLE_MACRO_STRINGIFY(x) ANGLE_STRINGIFY(x)
> 
>-#define ANGLE_VERSION_STRING                       \
>-    ANGLE_MACRO_STRINGIFY(ANGLE_MAJOR_VERSION) "." \
>-    ANGLE_MACRO_STRINGIFY(ANGLE_MINOR_VERSION) "." \
>-    ANGLE_MACRO_STRINGIFY(ANGLE_REVISION) "." \
>-    ANGLE_COMMIT_HASH
>+#define ANGLE_VERSION_STRING                                                  \
>+    ANGLE_MACRO_STRINGIFY(ANGLE_MAJOR_VERSION)                                \
>+    "." ANGLE_MACRO_STRINGIFY(ANGLE_MINOR_VERSION) "." ANGLE_MACRO_STRINGIFY( \
>+        ANGLE_REVISION) "." ANGLE_COMMIT_HASH
> 
>-#endif // COMMON_VERSION_H_
>+#endif  // COMMON_VERSION_H_
>diff --git a/Source/ThirdParty/ANGLE/src/compiler.gni b/Source/ThirdParty/ANGLE/src/compiler.gni
>new file mode 100644
>index 00000000000..9fced4d7190
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/compiler.gni
>@@ -0,0 +1,309 @@
>+# Copyright (c) 2013 The ANGLE Project Authors. All rights reserved.
>+# Use of this source code is governed by a BSD-style license that can be
>+# found in the LICENSE file.
>+
>+angle_translator_sources = [
>+  "include/EGL/egl.h",
>+  "include/EGL/eglext.h",
>+  "include/EGL/eglplatform.h",
>+  "include/GLES2/gl2.h",
>+  "include/GLES2/gl2ext.h",
>+  "include/GLES2/gl2platform.h",
>+  "include/GLES3/gl3.h",
>+  "include/GLES3/gl3platform.h",
>+  "include/GLES3/gl31.h",
>+  "include/GLES3/gl32.h",
>+  "include/GLSLANG/ShaderLang.h",
>+  "include/GLSLANG/ShaderVars.h",
>+  "include/KHR/khrplatform.h",
>+  "include/angle_gl.h",
>+  "src/compiler/translator/BaseTypes.h",
>+  "src/compiler/translator/BuiltInFunctionEmulator.cpp",
>+  "src/compiler/translator/BuiltInFunctionEmulator.h",
>+  "src/compiler/translator/CallDAG.cpp",
>+  "src/compiler/translator/CallDAG.h",
>+  "src/compiler/translator/CodeGen.cpp",
>+  "src/compiler/translator/CollectVariables.cpp",
>+  "src/compiler/translator/CollectVariables.h",
>+  "src/compiler/translator/Common.h",
>+  "src/compiler/translator/Compiler.cpp",
>+  "src/compiler/translator/Compiler.h",
>+  "src/compiler/translator/ConstantUnion.cpp",
>+  "src/compiler/translator/ConstantUnion.h",
>+  "src/compiler/translator/Declarator.cpp",
>+  "src/compiler/translator/Declarator.h",
>+  "src/compiler/translator/Diagnostics.cpp",
>+  "src/compiler/translator/Diagnostics.h",
>+  "src/compiler/translator/DirectiveHandler.cpp",
>+  "src/compiler/translator/DirectiveHandler.h",
>+  "src/compiler/translator/ExtensionBehavior.cpp",
>+  "src/compiler/translator/ExtensionBehavior.h",
>+  "src/compiler/translator/FlagStd140Structs.cpp",
>+  "src/compiler/translator/FlagStd140Structs.h",
>+  "src/compiler/translator/FunctionLookup.cpp",
>+  "src/compiler/translator/FunctionLookup.h",
>+  "src/compiler/translator/HashNames.cpp",
>+  "src/compiler/translator/HashNames.h",
>+  "src/compiler/translator/ImmutableString.cpp",
>+  "src/compiler/translator/ImmutableString.h",
>+  "src/compiler/translator/ImmutableStringBuilder.cpp",
>+  "src/compiler/translator/ImmutableStringBuilder.h",
>+  "src/compiler/translator/InfoSink.cpp",
>+  "src/compiler/translator/InfoSink.h",
>+  "src/compiler/translator/Initialize.cpp",
>+  "src/compiler/translator/Initialize.h",
>+  "src/compiler/translator/InitializeDll.cpp",
>+  "src/compiler/translator/InitializeDll.h",
>+  "src/compiler/translator/InitializeGlobals.h",
>+  "src/compiler/translator/IntermNode.h",
>+  "src/compiler/translator/IntermNode.cpp",
>+  "src/compiler/translator/IsASTDepthBelowLimit.cpp",
>+  "src/compiler/translator/IsASTDepthBelowLimit.h",
>+  "src/compiler/translator/Operator.cpp",
>+  "src/compiler/translator/Operator.h",
>+  "src/compiler/translator/OutputTree.cpp",
>+  "src/compiler/translator/OutputTree.h",
>+  "src/compiler/translator/ParseContext.cpp",
>+  "src/compiler/translator/ParseContext.h",
>+  "src/compiler/translator/ParseContext_autogen.h",
>+  "src/compiler/translator/PoolAlloc.cpp",
>+  "src/compiler/translator/PoolAlloc.h",
>+  "src/compiler/translator/Pragma.h",
>+  "src/compiler/translator/QualifierTypes.h",
>+  "src/compiler/translator/QualifierTypes.cpp",
>+  "src/compiler/translator/Severity.h",
>+  "src/compiler/translator/ShaderLang.cpp",
>+  "src/compiler/translator/ShaderVars.cpp",
>+  "src/compiler/translator/StaticType.h",
>+  "src/compiler/translator/Symbol.cpp",
>+  "src/compiler/translator/Symbol.h",
>+  "src/compiler/translator/SymbolTable.cpp",
>+  "src/compiler/translator/SymbolTable.h",
>+  "src/compiler/translator/SymbolTable_autogen.cpp",
>+  "src/compiler/translator/SymbolTable_autogen.h",
>+  "src/compiler/translator/SymbolUniqueId.cpp",
>+  "src/compiler/translator/SymbolUniqueId.h",
>+  "src/compiler/translator/Types.cpp",
>+  "src/compiler/translator/Types.h",
>+  "src/compiler/translator/ValidateAST.cpp",
>+  "src/compiler/translator/ValidateAST.h",
>+  "src/compiler/translator/ValidateGlobalInitializer.cpp",
>+  "src/compiler/translator/ValidateGlobalInitializer.h",
>+  "src/compiler/translator/ValidateLimitations.cpp",
>+  "src/compiler/translator/ValidateLimitations.h",
>+  "src/compiler/translator/ValidateMaxParameters.h",
>+  "src/compiler/translator/ValidateMaxParameters.cpp",
>+  "src/compiler/translator/ValidateOutputs.cpp",
>+  "src/compiler/translator/ValidateOutputs.h",
>+  "src/compiler/translator/ValidateSwitch.cpp",
>+  "src/compiler/translator/ValidateSwitch.h",
>+  "src/compiler/translator/ValidateVaryingLocations.cpp",
>+  "src/compiler/translator/ValidateVaryingLocations.h",
>+  "src/compiler/translator/VariablePacker.cpp",
>+  "src/compiler/translator/VariablePacker.h",
>+  "src/compiler/translator/blocklayout.cpp",
>+  "src/compiler/translator/blocklayout.h",
>+  "src/compiler/translator/glslang.h",
>+  "src/compiler/translator/glslang.l",
>+  "src/compiler/translator/glslang.y",
>+  "src/compiler/translator/glslang_lex.cpp",
>+  "src/compiler/translator/glslang_tab.cpp",
>+  "src/compiler/translator/glslang_tab.h",
>+  "src/compiler/translator/length_limits.h",
>+  "src/compiler/translator/util.cpp",
>+  "src/compiler/translator/util.h",
>+  "src/compiler/translator/tree_ops/AddAndTrueToLoopCondition.cpp",
>+  "src/compiler/translator/tree_ops/AddAndTrueToLoopCondition.h",
>+  "src/compiler/translator/tree_ops/BreakVariableAliasingInInnerLoops.cpp",
>+  "src/compiler/translator/tree_ops/BreakVariableAliasingInInnerLoops.h",
>+  "src/compiler/translator/tree_ops/ClampFragDepth.cpp",
>+  "src/compiler/translator/tree_ops/ClampFragDepth.h",
>+  "src/compiler/translator/tree_ops/ClampPointSize.cpp",
>+  "src/compiler/translator/tree_ops/ClampPointSize.h",
>+  "src/compiler/translator/tree_ops/DeclareAndInitBuiltinsForInstancedMultiview.h",
>+  "src/compiler/translator/tree_ops/DeclareAndInitBuiltinsForInstancedMultiview.cpp",
>+  "src/compiler/translator/tree_ops/DeferGlobalInitializers.cpp",
>+  "src/compiler/translator/tree_ops/DeferGlobalInitializers.h",
>+  "src/compiler/translator/tree_ops/EmulateGLDrawID.cpp",
>+  "src/compiler/translator/tree_ops/EmulateGLDrawID.h",
>+  "src/compiler/translator/tree_ops/EmulateGLFragColorBroadcast.cpp",
>+  "src/compiler/translator/tree_ops/EmulateGLFragColorBroadcast.h",
>+  "src/compiler/translator/tree_ops/EmulatePrecision.cpp",
>+  "src/compiler/translator/tree_ops/EmulatePrecision.h",
>+  "src/compiler/translator/tree_ops/ExpandIntegerPowExpressions.cpp",
>+  "src/compiler/translator/tree_ops/ExpandIntegerPowExpressions.h",
>+  "src/compiler/translator/tree_ops/FoldExpressions.cpp",
>+  "src/compiler/translator/tree_ops/FoldExpressions.h",
>+  "src/compiler/translator/tree_ops/InitializeVariables.cpp",
>+  "src/compiler/translator/tree_ops/InitializeVariables.h",
>+  "src/compiler/translator/tree_ops/NameEmbeddedUniformStructs.cpp",
>+  "src/compiler/translator/tree_ops/NameEmbeddedUniformStructs.h",
>+  "src/compiler/translator/tree_ops/PruneEmptyCases.cpp",
>+  "src/compiler/translator/tree_ops/PruneEmptyCases.h",
>+  "src/compiler/translator/tree_ops/PruneNoOps.cpp",
>+  "src/compiler/translator/tree_ops/PruneNoOps.h",
>+  "src/compiler/translator/tree_ops/RecordConstantPrecision.cpp",
>+  "src/compiler/translator/tree_ops/RecordConstantPrecision.h",
>+  "src/compiler/translator/tree_ops/RegenerateStructNames.cpp",
>+  "src/compiler/translator/tree_ops/RegenerateStructNames.h",
>+  "src/compiler/translator/tree_ops/RemoveArrayLengthMethod.cpp",
>+  "src/compiler/translator/tree_ops/RemoveArrayLengthMethod.h",
>+  "src/compiler/translator/tree_ops/RemoveInvariantDeclaration.cpp",
>+  "src/compiler/translator/tree_ops/RemoveInvariantDeclaration.h",
>+  "src/compiler/translator/tree_ops/RemovePow.cpp",
>+  "src/compiler/translator/tree_ops/RemovePow.h",
>+  "src/compiler/translator/tree_ops/RemoveUnreferencedVariables.cpp",
>+  "src/compiler/translator/tree_ops/RemoveUnreferencedVariables.h",
>+  "src/compiler/translator/tree_ops/RewriteAtomicFunctionExpressions.cpp",
>+  "src/compiler/translator/tree_ops/RewriteAtomicFunctionExpressions.h",
>+  "src/compiler/translator/tree_ops/RewriteDoWhile.cpp",
>+  "src/compiler/translator/tree_ops/RewriteDoWhile.h",
>+  "src/compiler/translator/tree_ops/RewriteExpressionsWithShaderStorageBlock.cpp",
>+  "src/compiler/translator/tree_ops/RewriteExpressionsWithShaderStorageBlock.h",
>+  "src/compiler/translator/tree_ops/RewriteStructSamplers.cpp",
>+  "src/compiler/translator/tree_ops/RewriteStructSamplers.h",
>+  "src/compiler/translator/tree_ops/RewriteRepeatedAssignToSwizzled.cpp",
>+  "src/compiler/translator/tree_ops/RewriteRepeatedAssignToSwizzled.h",
>+  "src/compiler/translator/tree_ops/RewriteTexelFetchOffset.cpp",
>+  "src/compiler/translator/tree_ops/RewriteTexelFetchOffset.h",
>+  "src/compiler/translator/tree_ops/RewriteUnaryMinusOperatorFloat.cpp",
>+  "src/compiler/translator/tree_ops/RewriteUnaryMinusOperatorFloat.h",
>+  "src/compiler/translator/tree_ops/RewriteUnaryMinusOperatorInt.cpp",
>+  "src/compiler/translator/tree_ops/RewriteUnaryMinusOperatorInt.h",
>+  "src/compiler/translator/tree_ops/ScalarizeVecAndMatConstructorArgs.cpp",
>+  "src/compiler/translator/tree_ops/ScalarizeVecAndMatConstructorArgs.h",
>+  "src/compiler/translator/tree_ops/SeparateDeclarations.cpp",
>+  "src/compiler/translator/tree_ops/SeparateDeclarations.h",
>+  "src/compiler/translator/tree_ops/SimplifyLoopConditions.cpp",
>+  "src/compiler/translator/tree_ops/SimplifyLoopConditions.h",
>+  "src/compiler/translator/tree_ops/SplitSequenceOperator.cpp",
>+  "src/compiler/translator/tree_ops/SplitSequenceOperator.h",
>+  "src/compiler/translator/tree_ops/UnfoldShortCircuitAST.cpp",
>+  "src/compiler/translator/tree_ops/UnfoldShortCircuitAST.h",
>+  "src/compiler/translator/tree_ops/UseInterfaceBlockFields.cpp",
>+  "src/compiler/translator/tree_ops/UseInterfaceBlockFields.h",
>+  "src/compiler/translator/tree_ops/VectorizeVectorScalarArithmetic.cpp",
>+  "src/compiler/translator/tree_ops/VectorizeVectorScalarArithmetic.h",
>+  "src/compiler/translator/tree_util/BuiltIn_autogen.h",
>+  "src/compiler/translator/tree_util/FindMain.cpp",
>+  "src/compiler/translator/tree_util/FindMain.h",
>+  "src/compiler/translator/tree_util/FindSymbolNode.cpp",
>+  "src/compiler/translator/tree_util/FindSymbolNode.h",
>+  "src/compiler/translator/tree_util/IntermNodePatternMatcher.cpp",
>+  "src/compiler/translator/tree_util/IntermNodePatternMatcher.h",
>+  "src/compiler/translator/tree_util/IntermNode_util.cpp",
>+  "src/compiler/translator/tree_util/IntermNode_util.h",
>+  "src/compiler/translator/tree_util/IntermTraverse.cpp",
>+  "src/compiler/translator/tree_util/IntermTraverse.h",
>+  "src/compiler/translator/tree_util/NodeSearch.h",
>+  "src/compiler/translator/tree_util/ReplaceVariable.cpp",
>+  "src/compiler/translator/tree_util/ReplaceVariable.h",
>+  "src/compiler/translator/tree_util/RunAtTheEndOfShader.cpp",
>+  "src/compiler/translator/tree_util/RunAtTheEndOfShader.h",
>+  "src/compiler/translator/tree_util/Visit.h",
>+  "src/third_party/compiler/ArrayBoundsClamper.cpp",
>+  "src/third_party/compiler/ArrayBoundsClamper.h",
>+]
>+angle_translator_essl_sources = [
>+  "src/compiler/translator/OutputESSL.cpp",
>+  "src/compiler/translator/OutputESSL.h",
>+  "src/compiler/translator/TranslatorESSL.cpp",
>+  "src/compiler/translator/TranslatorESSL.h",
>+]
>+angle_translator_glsl_sources = [
>+  "src/compiler/translator/BuiltInFunctionEmulatorGLSL.cpp",
>+  "src/compiler/translator/BuiltInFunctionEmulatorGLSL.h",
>+  "src/compiler/translator/ExtensionGLSL.cpp",
>+  "src/compiler/translator/ExtensionGLSL.h",
>+  "src/compiler/translator/OutputGLSL.cpp",
>+  "src/compiler/translator/OutputGLSL.h",
>+  "src/compiler/translator/OutputGLSLBase.cpp",
>+  "src/compiler/translator/OutputGLSLBase.h",
>+  "src/compiler/translator/TranslatorGLSL.cpp",
>+  "src/compiler/translator/TranslatorGLSL.h",
>+  "src/compiler/translator/VersionGLSL.cpp",
>+  "src/compiler/translator/VersionGLSL.h",
>+]
>+angle_translator_hlsl_sources = [
>+  "src/compiler/translator/ASTMetadataHLSL.cpp",
>+  "src/compiler/translator/ASTMetadataHLSL.h",
>+  "src/compiler/translator/AtomicCounterFunctionHLSL.cpp",
>+  "src/compiler/translator/AtomicCounterFunctionHLSL.h",
>+  "src/compiler/translator/blocklayoutHLSL.cpp",
>+  "src/compiler/translator/blocklayoutHLSL.h",
>+  "src/compiler/translator/BuiltInFunctionEmulatorHLSL.cpp",
>+  "src/compiler/translator/BuiltInFunctionEmulatorHLSL.h",
>+  "src/compiler/translator/OutputHLSL.cpp",
>+  "src/compiler/translator/OutputHLSL.h",
>+  "src/compiler/translator/ResourcesHLSL.cpp",
>+  "src/compiler/translator/ResourcesHLSL.h",
>+  "src/compiler/translator/ShaderStorageBlockFunctionHLSL.cpp",
>+  "src/compiler/translator/ShaderStorageBlockFunctionHLSL.h",
>+  "src/compiler/translator/ShaderStorageBlockOutputHLSL.cpp",
>+  "src/compiler/translator/ShaderStorageBlockOutputHLSL.h",
>+  "src/compiler/translator/StructureHLSL.cpp",
>+  "src/compiler/translator/StructureHLSL.h",
>+  "src/compiler/translator/TextureFunctionHLSL.cpp",
>+  "src/compiler/translator/TextureFunctionHLSL.h",
>+  "src/compiler/translator/ImageFunctionHLSL.cpp",
>+  "src/compiler/translator/ImageFunctionHLSL.h",
>+  "src/compiler/translator/TranslatorHLSL.cpp",
>+  "src/compiler/translator/TranslatorHLSL.h",
>+  "src/compiler/translator/UtilsHLSL.cpp",
>+  "src/compiler/translator/UtilsHLSL.h",
>+  "src/compiler/translator/emulated_builtin_functions_hlsl_autogen.cpp",
>+  "src/compiler/translator/tree_ops/AddDefaultReturnStatements.cpp",
>+  "src/compiler/translator/tree_ops/AddDefaultReturnStatements.h",
>+  "src/compiler/translator/tree_ops/ArrayReturnValueToOutParameter.cpp",
>+  "src/compiler/translator/tree_ops/ArrayReturnValueToOutParameter.h",
>+  "src/compiler/translator/tree_ops/RemoveDynamicIndexing.cpp",
>+  "src/compiler/translator/tree_ops/RemoveDynamicIndexing.h",
>+  "src/compiler/translator/tree_ops/RemoveSwitchFallThrough.cpp",
>+  "src/compiler/translator/tree_ops/RemoveSwitchFallThrough.h",
>+  "src/compiler/translator/tree_ops/RewriteElseBlocks.cpp",
>+  "src/compiler/translator/tree_ops/RewriteElseBlocks.h",
>+  "src/compiler/translator/tree_ops/SeparateArrayConstructorStatements.cpp",
>+  "src/compiler/translator/tree_ops/SeparateArrayConstructorStatements.h",
>+  "src/compiler/translator/tree_ops/SeparateArrayInitialization.cpp",
>+  "src/compiler/translator/tree_ops/SeparateArrayInitialization.h",
>+  "src/compiler/translator/tree_ops/SeparateExpressionsReturningArrays.cpp",
>+  "src/compiler/translator/tree_ops/SeparateExpressionsReturningArrays.h",
>+  "src/compiler/translator/tree_ops/UnfoldShortCircuitToIf.cpp",
>+  "src/compiler/translator/tree_ops/UnfoldShortCircuitToIf.h",
>+  "src/compiler/translator/tree_ops/WrapSwitchStatementsInBlocks.cpp",
>+  "src/compiler/translator/tree_ops/WrapSwitchStatementsInBlocks.h",
>+]
>+angle_translator_lib_vulkan_sources = [
>+  "src/compiler/translator/OutputVulkanGLSL.cpp",
>+  "src/compiler/translator/OutputVulkanGLSL.h",
>+  "src/compiler/translator/TranslatorVulkan.cpp",
>+  "src/compiler/translator/TranslatorVulkan.h",
>+]
>+angle_preprocessor_sources = [
>+  "src/compiler/preprocessor/DiagnosticsBase.cpp",
>+  "src/compiler/preprocessor/DiagnosticsBase.h",
>+  "src/compiler/preprocessor/DirectiveHandlerBase.cpp",
>+  "src/compiler/preprocessor/DirectiveHandlerBase.h",
>+  "src/compiler/preprocessor/DirectiveParser.cpp",
>+  "src/compiler/preprocessor/DirectiveParser.h",
>+  "src/compiler/preprocessor/ExpressionParser.cpp",
>+  "src/compiler/preprocessor/ExpressionParser.h",
>+  "src/compiler/preprocessor/ExpressionParser.y",
>+  "src/compiler/preprocessor/Input.cpp",
>+  "src/compiler/preprocessor/Input.h",
>+  "src/compiler/preprocessor/Lexer.cpp",
>+  "src/compiler/preprocessor/Lexer.h",
>+  "src/compiler/preprocessor/Macro.cpp",
>+  "src/compiler/preprocessor/Macro.h",
>+  "src/compiler/preprocessor/MacroExpander.cpp",
>+  "src/compiler/preprocessor/MacroExpander.h",
>+  "src/compiler/preprocessor/Preprocessor.cpp",
>+  "src/compiler/preprocessor/Preprocessor.h",
>+  "src/compiler/preprocessor/SourceLocation.h",
>+  "src/compiler/preprocessor/Token.cpp",
>+  "src/compiler/preprocessor/Token.h",
>+  "src/compiler/preprocessor/Tokenizer.cpp",
>+  "src/compiler/preprocessor/Tokenizer.h",
>+  "src/compiler/preprocessor/Tokenizer.l",
>+  "src/compiler/preprocessor/numeric_lex.h",
>+]
>diff --git a/Source/ThirdParty/ANGLE/src/compiler.gypi b/Source/ThirdParty/ANGLE/src/compiler.gypi
>deleted file mode 100644
>index e4adfb38871..00000000000
>--- a/Source/ThirdParty/ANGLE/src/compiler.gypi
>+++ /dev/null
>@@ -1,393 +0,0 @@
>-# Copyright (c) 2013 The ANGLE Project Authors. All rights reserved.
>-# Use of this source code is governed by a BSD-style license that can be
>-# found in the LICENSE file.
>-
>-{
>-    'variables':
>-    {
>-        # These file lists are shared with the GN build.
>-        'angle_translator_sources':
>-        [
>-            '../include/EGL/egl.h',
>-            '../include/EGL/eglext.h',
>-            '../include/EGL/eglplatform.h',
>-            '../include/GLES2/gl2.h',
>-            '../include/GLES2/gl2ext.h',
>-            '../include/GLES2/gl2platform.h',
>-            '../include/GLES3/gl3.h',
>-            '../include/GLES3/gl3platform.h',
>-            '../include/GLES3/gl31.h',
>-            '../include/GLES3/gl32.h',
>-            '../include/GLSLANG/ShaderLang.h',
>-            '../include/GLSLANG/ShaderVars.h',
>-            '../include/KHR/khrplatform.h',
>-            '../include/angle_gl.h',
>-            'compiler/translator/AddAndTrueToLoopCondition.cpp',
>-            'compiler/translator/AddAndTrueToLoopCondition.h',
>-            'compiler/translator/BaseTypes.h',
>-            'compiler/translator/BuiltInFunctionEmulator.cpp',
>-            'compiler/translator/BuiltInFunctionEmulator.h',
>-            'compiler/translator/BreakVariableAliasingInInnerLoops.cpp',
>-            'compiler/translator/BreakVariableAliasingInInnerLoops.h',
>-            'compiler/translator/Cache.cpp',
>-            'compiler/translator/Cache.h',
>-            'compiler/translator/CallDAG.cpp',
>-            'compiler/translator/CallDAG.h',
>-            'compiler/translator/ClampPointSize.cpp',
>-            'compiler/translator/ClampPointSize.h',
>-            'compiler/translator/CodeGen.cpp',
>-            'compiler/translator/CollectVariables.cpp',
>-            'compiler/translator/CollectVariables.h',
>-            'compiler/translator/Common.h',
>-            'compiler/translator/Compiler.cpp',
>-            'compiler/translator/Compiler.h',
>-            'compiler/translator/ConstantUnion.cpp',
>-            'compiler/translator/ConstantUnion.h',
>-            'compiler/translator/DeclareAndInitBuiltinsForInstancedMultiview.h',
>-            'compiler/translator/DeclareAndInitBuiltinsForInstancedMultiview.cpp',
>-            'compiler/translator/DeferGlobalInitializers.cpp',
>-            'compiler/translator/DeferGlobalInitializers.h',
>-            'compiler/translator/Diagnostics.cpp',
>-            'compiler/translator/Diagnostics.h',
>-            'compiler/translator/DirectiveHandler.cpp',
>-            'compiler/translator/DirectiveHandler.h',
>-            'compiler/translator/EmulateGLFragColorBroadcast.cpp',
>-            'compiler/translator/EmulateGLFragColorBroadcast.h',
>-            'compiler/translator/EmulatePrecision.cpp',
>-            'compiler/translator/EmulatePrecision.h',
>-            'compiler/translator/ExpandIntegerPowExpressions.cpp',
>-            'compiler/translator/ExpandIntegerPowExpressions.h',
>-            'compiler/translator/ExtensionBehavior.cpp',
>-            'compiler/translator/ExtensionBehavior.h',
>-            'compiler/translator/FindMain.cpp',
>-            'compiler/translator/FindMain.h',
>-            'compiler/translator/FindSymbolNode.cpp',
>-            'compiler/translator/FindSymbolNode.h',
>-            'compiler/translator/FlagStd140Structs.cpp',
>-            'compiler/translator/FlagStd140Structs.h',
>-            'compiler/translator/HashNames.cpp',
>-            'compiler/translator/HashNames.h',
>-            'compiler/translator/InfoSink.cpp',
>-            'compiler/translator/InfoSink.h',
>-            'compiler/translator/Initialize.cpp',
>-            'compiler/translator/Initialize.h',
>-            'compiler/translator/InitializeDll.cpp',
>-            'compiler/translator/InitializeDll.h',
>-            'compiler/translator/InitializeGlobals.h',
>-            'compiler/translator/InitializeVariables.cpp',
>-            'compiler/translator/InitializeVariables.h',
>-            'compiler/translator/IntermNode.h',
>-            'compiler/translator/IntermNode.cpp',
>-            'compiler/translator/IntermNodePatternMatcher.cpp',
>-            'compiler/translator/IntermNodePatternMatcher.h',
>-            'compiler/translator/IntermNode_util.cpp',
>-            'compiler/translator/IntermNode_util.h',
>-            'compiler/translator/IntermTraverse.cpp',
>-            'compiler/translator/IntermTraverse.h',
>-            'compiler/translator/IsASTDepthBelowLimit.cpp',
>-            'compiler/translator/IsASTDepthBelowLimit.h',
>-            'compiler/translator/NodeSearch.h',
>-            'compiler/translator/Operator.cpp',
>-            'compiler/translator/Operator.h',
>-            'compiler/translator/OutputTree.cpp',
>-            'compiler/translator/OutputTree.h',
>-            'compiler/translator/ParamType.h',
>-            'compiler/translator/ParseContext.cpp',
>-            'compiler/translator/ParseContext.h',
>-            'compiler/translator/PoolAlloc.cpp',
>-            'compiler/translator/PoolAlloc.h',
>-            'compiler/translator/Pragma.h',
>-            'compiler/translator/PruneNoOps.cpp',
>-            'compiler/translator/PruneNoOps.h',
>-            'compiler/translator/QualifierTypes.h',
>-            'compiler/translator/QualifierTypes.cpp',
>-            'compiler/translator/RecordConstantPrecision.cpp',
>-            'compiler/translator/RecordConstantPrecision.h',
>-            'compiler/translator/RegenerateStructNames.cpp',
>-            'compiler/translator/RegenerateStructNames.h',
>-            'compiler/translator/RemoveArrayLengthMethod.cpp',
>-            'compiler/translator/RemoveArrayLengthMethod.h',
>-            'compiler/translator/RemoveEmptySwitchStatements.cpp',
>-            'compiler/translator/RemoveEmptySwitchStatements.h',
>-            'compiler/translator/RemoveInvariantDeclaration.cpp',
>-            'compiler/translator/RemoveInvariantDeclaration.h',
>-            'compiler/translator/RemoveNoOpCasesFromEndOfSwitchStatements.cpp',
>-            'compiler/translator/RemoveNoOpCasesFromEndOfSwitchStatements.h',
>-            'compiler/translator/RemovePow.cpp',
>-            'compiler/translator/RemovePow.h',
>-            'compiler/translator/RemoveUnreferencedVariables.cpp',
>-            'compiler/translator/RemoveUnreferencedVariables.h',
>-            'compiler/translator/RewriteDoWhile.cpp',
>-            'compiler/translator/RewriteDoWhile.h',
>-            'compiler/translator/RewriteTexelFetchOffset.cpp',
>-            'compiler/translator/RewriteTexelFetchOffset.h',
>-            'compiler/translator/RewriteUnaryMinusOperatorFloat.cpp',
>-            'compiler/translator/RewriteUnaryMinusOperatorFloat.h',
>-            'compiler/translator/RewriteUnaryMinusOperatorInt.cpp',
>-            'compiler/translator/RewriteUnaryMinusOperatorInt.h',
>-            'compiler/translator/RunAtTheEndOfShader.cpp',
>-            'compiler/translator/RunAtTheEndOfShader.h',
>-            'compiler/translator/ScalarizeVecAndMatConstructorArgs.cpp',
>-            'compiler/translator/ScalarizeVecAndMatConstructorArgs.h',
>-            'compiler/translator/SearchSymbol.cpp',
>-            'compiler/translator/SearchSymbol.h',
>-            'compiler/translator/SeparateDeclarations.cpp',
>-            'compiler/translator/SeparateDeclarations.h',
>-            'compiler/translator/Severity.h',
>-            'compiler/translator/ShaderLang.cpp',
>-            'compiler/translator/ShaderVars.cpp',
>-            'compiler/translator/SimplifyLoopConditions.cpp',
>-            'compiler/translator/SimplifyLoopConditions.h',
>-            'compiler/translator/SplitSequenceOperator.cpp',
>-            'compiler/translator/SplitSequenceOperator.h',
>-            'compiler/translator/SymbolTable.cpp',
>-            'compiler/translator/SymbolTable.h',
>-            'compiler/translator/SymbolUniqueId.cpp',
>-            'compiler/translator/SymbolUniqueId.h',
>-            'compiler/translator/Types.cpp',
>-            'compiler/translator/Types.h',
>-            'compiler/translator/UnfoldShortCircuitAST.cpp',
>-            'compiler/translator/UnfoldShortCircuitAST.h',
>-            'compiler/translator/UseInterfaceBlockFields.cpp',
>-            'compiler/translator/UseInterfaceBlockFields.h',
>-            'compiler/translator/ValidateGlobalInitializer.cpp',
>-            'compiler/translator/ValidateGlobalInitializer.h',
>-            'compiler/translator/ValidateLimitations.cpp',
>-            'compiler/translator/ValidateLimitations.h',
>-            'compiler/translator/ValidateMaxParameters.h',
>-            'compiler/translator/ValidateMaxParameters.cpp',
>-            'compiler/translator/ValidateOutputs.cpp',
>-            'compiler/translator/ValidateOutputs.h',
>-            'compiler/translator/ValidateSwitch.cpp',
>-            'compiler/translator/ValidateSwitch.h',
>-            'compiler/translator/ValidateVaryingLocations.cpp',
>-            'compiler/translator/ValidateVaryingLocations.h',
>-            'compiler/translator/VariablePacker.cpp',
>-            'compiler/translator/VariablePacker.h',
>-            'compiler/translator/VectorizeVectorScalarArithmetic.cpp',
>-            'compiler/translator/VectorizeVectorScalarArithmetic.h',
>-            'compiler/translator/blocklayout.cpp',
>-            'compiler/translator/blocklayout.h',
>-            'compiler/translator/glslang.h',
>-            'compiler/translator/glslang.l',
>-            'compiler/translator/glslang.y',
>-            'compiler/translator/glslang_lex.cpp',
>-            'compiler/translator/glslang_tab.cpp',
>-            'compiler/translator/glslang_tab.h',
>-            'compiler/translator/length_limits.h',
>-            'compiler/translator/util.cpp',
>-            'compiler/translator/util.h',
>-            'third_party/compiler/ArrayBoundsClamper.cpp',
>-            'third_party/compiler/ArrayBoundsClamper.h',
>-        ],
>-        'angle_translator_essl_sources':
>-        [
>-            'compiler/translator/OutputESSL.cpp',
>-            'compiler/translator/OutputESSL.h',
>-            'compiler/translator/TranslatorESSL.cpp',
>-            'compiler/translator/TranslatorESSL.h',
>-        ],
>-        'angle_translator_glsl_sources':
>-        [
>-            'compiler/translator/BuiltInFunctionEmulatorGLSL.cpp',
>-            'compiler/translator/BuiltInFunctionEmulatorGLSL.h',
>-            'compiler/translator/ExtensionGLSL.cpp',
>-            'compiler/translator/ExtensionGLSL.h',
>-            'compiler/translator/OutputGLSL.cpp',
>-            'compiler/translator/OutputGLSL.h',
>-            'compiler/translator/OutputGLSLBase.cpp',
>-            'compiler/translator/OutputGLSLBase.h',
>-            'compiler/translator/TranslatorGLSL.cpp',
>-            'compiler/translator/TranslatorGLSL.h',
>-            'compiler/translator/VersionGLSL.cpp',
>-            'compiler/translator/VersionGLSL.h',
>-        ],
>-        'angle_translator_hlsl_sources':
>-        [
>-            'compiler/translator/AddDefaultReturnStatements.cpp',
>-            'compiler/translator/AddDefaultReturnStatements.h',
>-            'compiler/translator/ArrayReturnValueToOutParameter.cpp',
>-            'compiler/translator/ArrayReturnValueToOutParameter.h',
>-            'compiler/translator/ASTMetadataHLSL.cpp',
>-            'compiler/translator/ASTMetadataHLSL.h',
>-            'compiler/translator/blocklayoutHLSL.cpp',
>-            'compiler/translator/blocklayoutHLSL.h',
>-            'compiler/translator/BuiltInFunctionEmulatorHLSL.cpp',
>-            'compiler/translator/BuiltInFunctionEmulatorHLSL.h',
>-            'compiler/translator/OutputHLSL.cpp',
>-            'compiler/translator/OutputHLSL.h',
>-            'compiler/translator/RemoveDynamicIndexing.cpp',
>-            'compiler/translator/RemoveDynamicIndexing.h',
>-            'compiler/translator/RemoveSwitchFallThrough.cpp',
>-            'compiler/translator/RemoveSwitchFallThrough.h',
>-            'compiler/translator/RewriteElseBlocks.cpp',
>-            'compiler/translator/RewriteElseBlocks.h',
>-            'compiler/translator/SeparateArrayInitialization.cpp',
>-            'compiler/translator/SeparateArrayInitialization.h',
>-            'compiler/translator/SeparateExpressionsReturningArrays.cpp',
>-            'compiler/translator/SeparateExpressionsReturningArrays.h',
>-            'compiler/translator/StructureHLSL.cpp',
>-            'compiler/translator/StructureHLSL.h',
>-            'compiler/translator/TextureFunctionHLSL.cpp',
>-            'compiler/translator/TextureFunctionHLSL.h',
>-            'compiler/translator/ImageFunctionHLSL.cpp',
>-            'compiler/translator/ImageFunctionHLSL.h',
>-            'compiler/translator/TranslatorHLSL.cpp',
>-            'compiler/translator/TranslatorHLSL.h',
>-            'compiler/translator/UnfoldShortCircuitToIf.cpp',
>-            'compiler/translator/UnfoldShortCircuitToIf.h',
>-            'compiler/translator/UniformHLSL.cpp',
>-            'compiler/translator/UniformHLSL.h',
>-            'compiler/translator/UtilsHLSL.cpp',
>-            'compiler/translator/UtilsHLSL.h',
>-            'compiler/translator/WrapSwitchStatementsInBlocks.cpp',
>-            'compiler/translator/WrapSwitchStatementsInBlocks.h',
>-            'compiler/translator/emulated_builtin_functions_hlsl_autogen.cpp',
>-        ],
>-        'angle_translator_lib_vulkan_sources':
>-        [
>-            'compiler/translator/OutputVulkanGLSL.cpp',
>-            'compiler/translator/OutputVulkanGLSL.h',
>-            'compiler/translator/TranslatorVulkan.cpp',
>-            'compiler/translator/TranslatorVulkan.h',
>-        ],
>-        'angle_preprocessor_sources':
>-        [
>-            'compiler/preprocessor/DiagnosticsBase.cpp',
>-            'compiler/preprocessor/DiagnosticsBase.h',
>-            'compiler/preprocessor/DirectiveHandlerBase.cpp',
>-            'compiler/preprocessor/DirectiveHandlerBase.h',
>-            'compiler/preprocessor/DirectiveParser.cpp',
>-            'compiler/preprocessor/DirectiveParser.h',
>-            'compiler/preprocessor/ExpressionParser.cpp',
>-            'compiler/preprocessor/ExpressionParser.h',
>-            'compiler/preprocessor/ExpressionParser.y',
>-            'compiler/preprocessor/Input.cpp',
>-            'compiler/preprocessor/Input.h',
>-            'compiler/preprocessor/Lexer.cpp',
>-            'compiler/preprocessor/Lexer.h',
>-            'compiler/preprocessor/Macro.cpp',
>-            'compiler/preprocessor/Macro.h',
>-            'compiler/preprocessor/MacroExpander.cpp',
>-            'compiler/preprocessor/MacroExpander.h',
>-            'compiler/preprocessor/Preprocessor.cpp',
>-            'compiler/preprocessor/Preprocessor.h',
>-            'compiler/preprocessor/SourceLocation.h',
>-            'compiler/preprocessor/Token.cpp',
>-            'compiler/preprocessor/Token.h',
>-            'compiler/preprocessor/Tokenizer.cpp',
>-            'compiler/preprocessor/Tokenizer.h',
>-            'compiler/preprocessor/Tokenizer.l',
>-            'compiler/preprocessor/numeric_lex.h',
>-        ],
>-    },
>-    # Everything below this is duplicated in the GN build. If you change
>-    # anything also change angle/BUILD.gn
>-    'targets':
>-    [
>-        {
>-            'target_name': 'preprocessor',
>-            'type': 'static_library',
>-            'dependencies': [ 'angle_common' ],
>-            'includes': [ '../gyp/common_defines.gypi', ],
>-            'sources': [ '<@(angle_preprocessor_sources)', ],
>-        },
>-        {
>-            'target_name': 'translator',
>-            'type': 'static_library',
>-            'dependencies': [ 'preprocessor', 'angle_common' ],
>-            'includes': [ '../gyp/common_defines.gypi', ],
>-            'include_dirs':
>-            [
>-                '.',
>-                '../include',
>-            ],
>-            'sources':
>-            [
>-                '<@(angle_translator_sources)',
>-            ],
>-            'msvs_settings':
>-            {
>-              'VCLibrarianTool':
>-              {
>-                'AdditionalOptions': ['/ignore:4221']
>-              },
>-            },
>-            'conditions':
>-            [
>-                ['angle_enable_essl==1',
>-                {
>-                    'defines':
>-                    [
>-                        'ANGLE_ENABLE_ESSL',
>-                    ],
>-                    'direct_dependent_settings':
>-                    {
>-                        'defines':
>-                        [
>-                            'ANGLE_ENABLE_ESSL',
>-                        ],
>-                    },
>-                    'sources':
>-                    [
>-                        '<@(angle_translator_essl_sources)',
>-                    ],
>-                }],
>-                ['angle_enable_glsl==1',
>-                {
>-                    'defines':
>-                    [
>-                        'ANGLE_ENABLE_GLSL',
>-                    ],
>-                    'direct_dependent_settings':
>-                    {
>-                        'defines':
>-                        [
>-                            'ANGLE_ENABLE_GLSL',
>-                        ],
>-                    },
>-                    'sources':
>-                    [
>-                        '<@(angle_translator_glsl_sources)',
>-                    ],
>-                }],
>-                ['angle_enable_hlsl==1',
>-                {
>-                    'defines':
>-                    [
>-                        'ANGLE_ENABLE_HLSL',
>-                    ],
>-                    'direct_dependent_settings':
>-                    {
>-                        'defines':
>-                        [
>-                            'ANGLE_ENABLE_HLSL',
>-                        ],
>-                    },
>-                    'sources':
>-                    [
>-                        '<@(angle_translator_hlsl_sources)',
>-                    ],
>-                }],
>-                ['angle_enable_vulkan==1',
>-                {
>-                    'defines':
>-                    [
>-                        'ANGLE_ENABLE_VULKAN',
>-                    ],
>-                    'direct_dependent_settings':
>-                    {
>-                        'defines':
>-                        [
>-                            'ANGLE_ENABLE_VULKAN',
>-                        ],
>-                    },
>-                    'sources':
>-                    [
>-                        '<@(angle_translator_lib_vulkan_sources)',
>-                    ],
>-                }],
>-            ],
>-        },
>-    ],
>-}
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/preprocessor/DiagnosticsBase.cpp b/Source/ThirdParty/ANGLE/src/compiler/preprocessor/DiagnosticsBase.cpp
>index c89bc9fa763..575b151432d 100644
>--- a/Source/ThirdParty/ANGLE/src/compiler/preprocessor/DiagnosticsBase.cpp
>+++ b/Source/ThirdParty/ANGLE/src/compiler/preprocessor/DiagnosticsBase.cpp
>@@ -8,12 +8,13 @@
> 
> #include "common/debug.h"
> 
>-namespace pp
>+namespace angle
> {
> 
>-Diagnostics::~Diagnostics()
>+namespace pp
> {
>-}
>+
>+Diagnostics::~Diagnostics() {}
> 
> void Diagnostics::report(ID id, const SourceLocation &loc, const std::string &text)
> {
>@@ -141,3 +142,5 @@ const char *Diagnostics::message(ID id)
> }
> 
> }  // namespace pp
>+
>+}  // namespace angle
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/preprocessor/DiagnosticsBase.h b/Source/ThirdParty/ANGLE/src/compiler/preprocessor/DiagnosticsBase.h
>index ea376146063..bb90bf08292 100644
>--- a/Source/ThirdParty/ANGLE/src/compiler/preprocessor/DiagnosticsBase.h
>+++ b/Source/ThirdParty/ANGLE/src/compiler/preprocessor/DiagnosticsBase.h
>@@ -9,6 +9,9 @@
> 
> #include <string>
> 
>+namespace angle
>+{
>+
> namespace pp
> {
> 
>@@ -61,6 +64,7 @@ class Diagnostics
>         PP_INVALID_LINE_NUMBER,
>         PP_INVALID_FILE_NUMBER,
>         PP_INVALID_LINE_DIRECTIVE,
>+        PP_NON_PP_TOKEN_BEFORE_EXTENSION_ESSL1,
>         PP_NON_PP_TOKEN_BEFORE_EXTENSION_ESSL3,
>         PP_UNDEFINED_SHIFT,
>         PP_TOKENIZER_ERROR,
>@@ -69,7 +73,6 @@ class Diagnostics
>         PP_WARNING_BEGIN,
>         PP_EOF_IN_DIRECTIVE,
>         PP_UNRECOGNIZED_PRAGMA,
>-        PP_NON_PP_TOKEN_BEFORE_EXTENSION_ESSL1,
>         PP_WARNING_MACRO_NAME_RESERVED,
>         PP_WARNING_END
>     };
>@@ -87,4 +90,6 @@ class Diagnostics
> 
> }  // namespace pp
> 
>+}  // namespace angle
>+
> #endif  // COMPILER_PREPROCESSOR_DIAGNOSTICSBASE_H_
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/preprocessor/DirectiveHandlerBase.cpp b/Source/ThirdParty/ANGLE/src/compiler/preprocessor/DirectiveHandlerBase.cpp
>index 049dae9071c..c359ebcfd8c 100644
>--- a/Source/ThirdParty/ANGLE/src/compiler/preprocessor/DirectiveHandlerBase.cpp
>+++ b/Source/ThirdParty/ANGLE/src/compiler/preprocessor/DirectiveHandlerBase.cpp
>@@ -6,11 +6,14 @@
> 
> #include "compiler/preprocessor/DirectiveHandlerBase.h"
> 
>-namespace pp
>+namespace angle
> {
> 
>-DirectiveHandler::~DirectiveHandler()
>+namespace pp
> {
>-}
>+
>+DirectiveHandler::~DirectiveHandler() {}
> 
> }  // namespace pp
>+
>+}  // namespace angle
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/preprocessor/DirectiveHandlerBase.h b/Source/ThirdParty/ANGLE/src/compiler/preprocessor/DirectiveHandlerBase.h
>index 6c81d015f56..858bc1da630 100644
>--- a/Source/ThirdParty/ANGLE/src/compiler/preprocessor/DirectiveHandlerBase.h
>+++ b/Source/ThirdParty/ANGLE/src/compiler/preprocessor/DirectiveHandlerBase.h
>@@ -9,6 +9,9 @@
> 
> #include <string>
> 
>+namespace angle
>+{
>+
> namespace pp
> {
> 
>@@ -40,4 +43,6 @@ class DirectiveHandler
> 
> }  // namespace pp
> 
>+}  // namespace angle
>+
> #endif  // COMPILER_PREPROCESSOR_DIRECTIVEHANDLERBASE_H_
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/preprocessor/DirectiveParser.cpp b/Source/ThirdParty/ANGLE/src/compiler/preprocessor/DirectiveParser.cpp
>index f6c57639908..e99d843b2d3 100644
>--- a/Source/ThirdParty/ANGLE/src/compiler/preprocessor/DirectiveParser.cpp
>+++ b/Source/ThirdParty/ANGLE/src/compiler/preprocessor/DirectiveParser.cpp
>@@ -18,6 +18,9 @@
> #include "compiler/preprocessor/Token.h"
> #include "compiler/preprocessor/Tokenizer.h"
> 
>+namespace angle
>+{
>+
> namespace
> {
> enum DirectiveType
>@@ -134,76 +137,15 @@ bool isMacroPredefined(const std::string &name, const pp::MacroSet &macroSet)
>     return iter != macroSet.end() ? iter->second->predefined : false;
> }
> 
>-}  // namespace anonymous
>+}  // namespace
> 
> namespace pp
> {
>-
>-class DefinedParser : public Lexer
>-{
>-  public:
>-    DefinedParser(Lexer *lexer, const MacroSet *macroSet, Diagnostics *diagnostics)
>-        : mLexer(lexer), mMacroSet(macroSet), mDiagnostics(diagnostics)
>-    {
>-    }
>-
>-  protected:
>-    void lex(Token *token) override
>-    {
>-        const char kDefined[] = "defined";
>-
>-        mLexer->lex(token);
>-        if (token->type != Token::IDENTIFIER)
>-            return;
>-        if (token->text != kDefined)
>-            return;
>-
>-        bool paren = false;
>-        mLexer->lex(token);
>-        if (token->type == '(')
>-        {
>-            paren = true;
>-            mLexer->lex(token);
>-        }
>-
>-        if (token->type != Token::IDENTIFIER)
>-        {
>-            mDiagnostics->report(Diagnostics::PP_UNEXPECTED_TOKEN, token->location, token->text);
>-            skipUntilEOD(mLexer, token);
>-            return;
>-        }
>-        MacroSet::const_iterator iter = mMacroSet->find(token->text);
>-        std::string expression        = iter != mMacroSet->end() ? "1" : "0";
>-
>-        if (paren)
>-        {
>-            mLexer->lex(token);
>-            if (token->type != ')')
>-            {
>-                mDiagnostics->report(Diagnostics::PP_UNEXPECTED_TOKEN, token->location,
>-                                     token->text);
>-                skipUntilEOD(mLexer, token);
>-                return;
>-            }
>-        }
>-
>-        // We have a valid defined operator.
>-        // Convert the current token into a CONST_INT token.
>-        token->type = Token::CONST_INT;
>-        token->text = expression;
>-    }
>-
>-  private:
>-    Lexer *mLexer;
>-    const MacroSet *mMacroSet;
>-    Diagnostics *mDiagnostics;
>-};
>-
> DirectiveParser::DirectiveParser(Tokenizer *tokenizer,
>                                  MacroSet *macroSet,
>                                  Diagnostics *diagnostics,
>                                  DirectiveHandler *directiveHandler,
>-                                 int maxMacroExpansionDepth)
>+                                 const PreprocessorSettings &settings)
>     : mPastFirstStatement(false),
>       mSeenNonPreprocessorToken(false),
>       mTokenizer(tokenizer),
>@@ -211,13 +153,10 @@ DirectiveParser::DirectiveParser(Tokenizer *tokenizer,
>       mDiagnostics(diagnostics),
>       mDirectiveHandler(directiveHandler),
>       mShaderVersion(100),
>-      mMaxMacroExpansionDepth(maxMacroExpansionDepth)
>-{
>-}
>+      mSettings(settings)
>+{}
> 
>-DirectiveParser::~DirectiveParser()
>-{
>-}
>+DirectiveParser::~DirectiveParser() {}
> 
> void DirectiveParser::lex(Token *token)
> {
>@@ -840,7 +779,7 @@ void DirectiveParser::parseLine(Token *token)
>     bool parsedFileNumber = false;
>     int line = 0, file = 0;
> 
>-    MacroExpander macroExpander(mTokenizer, mMacroSet, mDiagnostics, mMaxMacroExpansionDepth);
>+    MacroExpander macroExpander(mTokenizer, mMacroSet, mDiagnostics, mSettings, false);
> 
>     // Lex the first token after "#line" so we can check it for EOD.
>     macroExpander.lex(token);
>@@ -948,8 +887,7 @@ int DirectiveParser::parseExpressionIf(Token *token)
> {
>     ASSERT((getDirective(token) == DIRECTIVE_IF) || (getDirective(token) == DIRECTIVE_ELIF));
> 
>-    DefinedParser definedParser(mTokenizer, mMacroSet, mDiagnostics);
>-    MacroExpander macroExpander(&definedParser, mMacroSet, mDiagnostics, mMaxMacroExpansionDepth);
>+    MacroExpander macroExpander(mTokenizer, mMacroSet, mDiagnostics, mSettings, true);
>     ExpressionParser expressionParser(&macroExpander, mDiagnostics);
> 
>     int expression = 0;
>@@ -998,3 +936,5 @@ int DirectiveParser::parseExpressionIfdef(Token *token)
> }
> 
> }  // namespace pp
>+
>+}  // namespace angle
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/preprocessor/DirectiveParser.h b/Source/ThirdParty/ANGLE/src/compiler/preprocessor/DirectiveParser.h
>index 29c30a8239f..eb8a2ee9a2e 100644
>--- a/Source/ThirdParty/ANGLE/src/compiler/preprocessor/DirectiveParser.h
>+++ b/Source/ThirdParty/ANGLE/src/compiler/preprocessor/DirectiveParser.h
>@@ -9,8 +9,12 @@
> 
> #include "compiler/preprocessor/Lexer.h"
> #include "compiler/preprocessor/Macro.h"
>+#include "compiler/preprocessor/Preprocessor.h"
> #include "compiler/preprocessor/SourceLocation.h"
> 
>+namespace angle
>+{
>+
> namespace pp
> {
> 
>@@ -25,7 +29,7 @@ class DirectiveParser : public Lexer
>                     MacroSet *macroSet,
>                     Diagnostics *diagnostics,
>                     DirectiveHandler *directiveHandler,
>-                    int maxMacroExpansionDepth);
>+                    const PreprocessorSettings &settings);
>     ~DirectiveParser() override;
> 
>     void lex(Token *token) override;
>@@ -62,8 +66,7 @@ class DirectiveParser : public Lexer
> 
>         ConditionalBlock()
>             : skipBlock(false), skipGroup(false), foundValidGroup(false), foundElseGroup(false)
>-        {
>-        }
>+        {}
>     };
>     bool mPastFirstStatement;
>     bool mSeenNonPreprocessorToken;  // Tracks if a non-preprocessor token has been seen yet.  Some
>@@ -75,9 +78,11 @@ class DirectiveParser : public Lexer
>     Diagnostics *mDiagnostics;
>     DirectiveHandler *mDirectiveHandler;
>     int mShaderVersion;
>-    int mMaxMacroExpansionDepth;
>+    const PreprocessorSettings mSettings;
> };
> 
> }  // namespace pp
> 
>+}  // namespace angle
>+
> #endif  // COMPILER_PREPROCESSOR_DIRECTIVEPARSER_H_
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/preprocessor/ExpressionParser.cpp b/Source/ThirdParty/ANGLE/src/compiler/preprocessor/ExpressionParser.cpp
>index c0f8b9c97df..461c2145ddb 100644
>--- a/Source/ThirdParty/ANGLE/src/compiler/preprocessor/ExpressionParser.cpp
>+++ b/Source/ThirdParty/ANGLE/src/compiler/preprocessor/ExpressionParser.cpp
>@@ -1,7 +1,5 @@
> /* A Bison parser, made by GNU Bison 3.0.4.  */
> 
>-/* Apple Note: For the avoidance of doubt, Apple elects to distribute this file under the terms of the BSD license. */
>-
> /* Bison implementation for Yacc-like parsers in C
> 
>    Copyright (C) 1984, 1989-1990, 2000-2015 Free Software Foundation, Inc.
>@@ -60,18 +58,15 @@
> /* Pull parsers.  */
> #define YYPULL 1
> 
>-
> /* Substitute the variable and function names.  */
>-#define yyparse         ppparse
>-#define yylex           pplex
>-#define yyerror         pperror
>-#define yydebug         ppdebug
>-#define yynerrs         ppnerrs
>-
>+#define yyparse ppparse
>+#define yylex pplex
>+#define yyerror pperror
>+#define yydebug ppdebug
>+#define yynerrs ppnerrs
> 
> /* Copy the first part of user declarations.  */
> 
>-
> //
> // Copyright (c) 2012 The ANGLE Project Authors. All rights reserved.
> // Use of this source code is governed by a BSD-style license that can be
>@@ -82,26 +77,26 @@
> 
> #if defined(__GNUC__)
> // Triggered by the auto-generated pplval variable.
>-#if !defined(__clang__) && ((__GNUC__ > 4) || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7))
>-#pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
>-#else
>-#pragma GCC diagnostic ignored "-Wuninitialized"
>-#endif
>+#    if !defined(__clang__) && ((__GNUC__ > 4) || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7))
>+#        pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
>+#    else
>+#        pragma GCC diagnostic ignored "-Wuninitialized"
>+#    endif
> #elif defined(_MSC_VER)
>-#pragma warning(disable: 4065 4244 4701 4702)
>+#    pragma warning(disable : 4065 4244 4701 4702)
> #endif
> 
> #include "ExpressionParser.h"
> 
> #if defined(_MSC_VER)
>-#include <malloc.h>
>+#    include <malloc.h>
> #else
>-#include <stdlib.h>
>+#    include <stdlib.h>
> #endif
> 
>+#include <stdint.h>
> #include <cassert>
> #include <sstream>
>-#include <stdint.h>
> 
> #include "DiagnosticsBase.h"
> #include "Lexer.h"
>@@ -116,16 +111,17 @@ typedef uint32_t UNSIGNED_TYPE;
> #define YYSTYPE_IS_TRIVIAL 1
> #define YYSTYPE_IS_DECLARED 1
> 
>-namespace {
>+namespace
>+{
> struct Context
> {
>-    pp::Diagnostics* diagnostics;
>-    pp::Lexer* lexer;
>-    pp::Token* token;
>-    int* result;
>+    angle::pp::Diagnostics *diagnostics;
>+    angle::pp::Lexer *lexer;
>+    angle::pp::Token *token;
>+    int *result;
>     bool parsePresetToken;
> 
>-    pp::ExpressionParser::ErrorSettings errorSettings;
>+    angle::pp::ExpressionParser::ErrorSettings errorSettings;
>     bool *valid;
> 
>     void startIgnoreErrors() { ++ignoreErrors; }
>@@ -137,32 +133,28 @@ struct Context
> };
> }  // namespace
> 
>+static int yylex(YYSTYPE *lvalp, Context *context);
>+static void yyerror(Context *context, const char *reason);
> 
>-static int yylex(YYSTYPE* lvalp, Context* context);
>-static void yyerror(Context* context, const char* reason);
>-
>-
>-
>-# ifndef YY_NULLPTR
>-#  if defined __cplusplus && 201103L <= __cplusplus
>-#   define YY_NULLPTR nullptr
>-#  else
>-#   define YY_NULLPTR 0
>-#  endif
>-# endif
>+#ifndef YY_NULLPTR
>+#    if defined __cplusplus && 201103L <= __cplusplus
>+#        define YY_NULLPTR nullptr
>+#    else
>+#        define YY_NULLPTR 0
>+#    endif
>+#endif
> 
> /* Enabling verbose error messages.  */
> #ifdef YYERROR_VERBOSE
>-# undef YYERROR_VERBOSE
>-# define YYERROR_VERBOSE 1
>+#    undef YYERROR_VERBOSE
>+#    define YYERROR_VERBOSE 1
> #else
>-# define YYERROR_VERBOSE 0
>+#    define YYERROR_VERBOSE 0
> #endif
> 
>-
> /* Debug traces.  */
> #ifndef YYDEBUG
>-# define YYDEBUG 0
>+#    define YYDEBUG 0
> #endif
> #if YYDEBUG
> extern int ppdebug;
>@@ -170,42 +162,36 @@ extern int ppdebug;
> 
> /* Token type.  */
> #ifndef YYTOKENTYPE
>-# define YYTOKENTYPE
>-  enum yytokentype
>-  {
>-    TOK_CONST_INT = 258,
>+#    define YYTOKENTYPE
>+enum yytokentype
>+{
>+    TOK_CONST_INT  = 258,
>     TOK_IDENTIFIER = 259,
>-    TOK_OP_OR = 260,
>-    TOK_OP_AND = 261,
>-    TOK_OP_EQ = 262,
>-    TOK_OP_NE = 263,
>-    TOK_OP_LE = 264,
>-    TOK_OP_GE = 265,
>-    TOK_OP_LEFT = 266,
>-    TOK_OP_RIGHT = 267,
>-    TOK_UNARY = 268
>-  };
>+    TOK_OP_OR      = 260,
>+    TOK_OP_AND     = 261,
>+    TOK_OP_EQ      = 262,
>+    TOK_OP_NE      = 263,
>+    TOK_OP_LE      = 264,
>+    TOK_OP_GE      = 265,
>+    TOK_OP_LEFT    = 266,
>+    TOK_OP_RIGHT   = 267,
>+    TOK_UNARY      = 268
>+};
> #endif
> 
> /* Value type.  */
>-#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
>+#if !defined YYSTYPE && !defined YYSTYPE_IS_DECLARED
> typedef int YYSTYPE;
>-# define YYSTYPE_IS_TRIVIAL 1
>-# define YYSTYPE_IS_DECLARED 1
>+#    define YYSTYPE_IS_TRIVIAL 1
>+#    define YYSTYPE_IS_DECLARED 1
> #endif
> 
>-
>-
>-int ppparse (Context *context);
>-
>-
>+int ppparse(Context *context);
> 
> /* Copy the second part of user declarations.  */
> 
>-
>-
> #ifdef short
>-# undef short
>+#    undef short
> #endif
> 
> #ifdef YYTYPE_UINT8
>@@ -233,271 +219,242 @@ typedef short int yytype_int16;
> #endif
> 
> #ifndef YYSIZE_T
>-# ifdef __SIZE_TYPE__
>-#  define YYSIZE_T __SIZE_TYPE__
>-# elif defined size_t
>-#  define YYSIZE_T size_t
>-# elif ! defined YYSIZE_T
>-#  include <stddef.h> /* INFRINGES ON USER NAME SPACE */
>-#  define YYSIZE_T size_t
>-# else
>-#  define YYSIZE_T unsigned int
>-# endif
>+#    ifdef __SIZE_TYPE__
>+#        define YYSIZE_T __SIZE_TYPE__
>+#    elif defined size_t
>+#        define YYSIZE_T size_t
>+#    elif !defined YYSIZE_T
>+#        include <stddef.h> /* INFRINGES ON USER NAME SPACE */
>+#        define YYSIZE_T size_t
>+#    else
>+#        define YYSIZE_T unsigned int
>+#    endif
> #endif
> 
>-#define YYSIZE_MAXIMUM ((YYSIZE_T) -1)
>+#define YYSIZE_MAXIMUM ((YYSIZE_T)-1)
> 
> #ifndef YY_
>-# if defined YYENABLE_NLS && YYENABLE_NLS
>-#  if ENABLE_NLS
>-#   include <libintl.h> /* INFRINGES ON USER NAME SPACE */
>-#   define YY_(Msgid) dgettext ("bison-runtime", Msgid)
>-#  endif
>-# endif
>-# ifndef YY_
>-#  define YY_(Msgid) Msgid
>-# endif
>+#    if defined YYENABLE_NLS && YYENABLE_NLS
>+#        if ENABLE_NLS
>+#            include <libintl.h> /* INFRINGES ON USER NAME SPACE */
>+#            define YY_(Msgid) dgettext("bison-runtime", Msgid)
>+#        endif
>+#    endif
>+#    ifndef YY_
>+#        define YY_(Msgid) Msgid
>+#    endif
> #endif
> 
> #ifndef YY_ATTRIBUTE
>-# if (defined __GNUC__                                               \
>-      && (2 < __GNUC__ || (__GNUC__ == 2 && 96 <= __GNUC_MINOR__)))  \
>-     || defined __SUNPRO_C && 0x5110 <= __SUNPRO_C
>-#  define YY_ATTRIBUTE(Spec) __attribute__(Spec)
>-# else
>-#  define YY_ATTRIBUTE(Spec) /* empty */
>-# endif
>+#    if (defined __GNUC__ && (2 < __GNUC__ || (__GNUC__ == 2 && 96 <= __GNUC_MINOR__))) || \
>+        defined __SUNPRO_C && 0x5110 <= __SUNPRO_C
>+#        define YY_ATTRIBUTE(Spec) __attribute__(Spec)
>+#    else
>+#        define YY_ATTRIBUTE(Spec) /* empty */
>+#    endif
> #endif
> 
> #ifndef YY_ATTRIBUTE_PURE
>-# define YY_ATTRIBUTE_PURE   YY_ATTRIBUTE ((__pure__))
>+#    define YY_ATTRIBUTE_PURE YY_ATTRIBUTE((__pure__))
> #endif
> 
> #ifndef YY_ATTRIBUTE_UNUSED
>-# define YY_ATTRIBUTE_UNUSED YY_ATTRIBUTE ((__unused__))
>+#    define YY_ATTRIBUTE_UNUSED YY_ATTRIBUTE((__unused__))
> #endif
> 
>-#if !defined _Noreturn \
>-     && (!defined __STDC_VERSION__ || __STDC_VERSION__ < 201112)
>-# if defined _MSC_VER && 1200 <= _MSC_VER
>-#  define _Noreturn __declspec (noreturn)
>-# else
>-#  define _Noreturn YY_ATTRIBUTE ((__noreturn__))
>-# endif
>+#if !defined _Noreturn && (!defined __STDC_VERSION__ || __STDC_VERSION__ < 201112)
>+#    if defined _MSC_VER && 1200 <= _MSC_VER
>+#        define _Noreturn __declspec(noreturn)
>+#    else
>+#        define _Noreturn YY_ATTRIBUTE((__noreturn__))
>+#    endif
> #endif
> 
> /* Suppress unused-variable warnings by "using" E.  */
>-#if ! defined lint || defined __GNUC__
>-# define YYUSE(E) ((void) (E))
>+#if !defined lint || defined __GNUC__
>+#    define YYUSE(E) ((void)(E))
> #else
>-# define YYUSE(E) /* empty */
>+#    define YYUSE(E) /* empty */
> #endif
> 
> #if defined __GNUC__ && 407 <= __GNUC__ * 100 + __GNUC_MINOR__
> /* Suppress an incorrect diagnostic about yylval being uninitialized.  */
>-# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN \
>-    _Pragma ("GCC diagnostic push") \
>-    _Pragma ("GCC diagnostic ignored \"-Wuninitialized\"")\
>-    _Pragma ("GCC diagnostic ignored \"-Wmaybe-uninitialized\"")
>-# define YY_IGNORE_MAYBE_UNINITIALIZED_END \
>-    _Pragma ("GCC diagnostic pop")
>+#    define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN                                              \
>+        _Pragma("GCC diagnostic push") _Pragma("GCC diagnostic ignored \"-Wuninitialized\"") \
>+            _Pragma("GCC diagnostic ignored \"-Wmaybe-uninitialized\"")
>+#    define YY_IGNORE_MAYBE_UNINITIALIZED_END _Pragma("GCC diagnostic pop")
> #else
>-# define YY_INITIAL_VALUE(Value) Value
>+#    define YY_INITIAL_VALUE(Value) Value
> #endif
> #ifndef YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
>-# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
>-# define YY_IGNORE_MAYBE_UNINITIALIZED_END
>+#    define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
>+#    define YY_IGNORE_MAYBE_UNINITIALIZED_END
> #endif
> #ifndef YY_INITIAL_VALUE
>-# define YY_INITIAL_VALUE(Value) /* Nothing. */
>+#    define YY_INITIAL_VALUE(Value) /* Nothing. */
> #endif
> 
>-
>-#if ! defined yyoverflow || YYERROR_VERBOSE
>+#if !defined yyoverflow || YYERROR_VERBOSE
> 
> /* The parser invokes alloca or malloc; define the necessary symbols.  */
> 
>-# ifdef YYSTACK_USE_ALLOCA
>-#  if YYSTACK_USE_ALLOCA
>-#   ifdef __GNUC__
>-#    define YYSTACK_ALLOC __builtin_alloca
>-#   elif defined __BUILTIN_VA_ARG_INCR
>-#    include <alloca.h> /* INFRINGES ON USER NAME SPACE */
>-#   elif defined _AIX
>-#    define YYSTACK_ALLOC __alloca
>-#   elif defined _MSC_VER
>-#    include <malloc.h> /* INFRINGES ON USER NAME SPACE */
>-#    define alloca _alloca
>-#   else
>-#    define YYSTACK_ALLOC alloca
>-#    if ! defined _ALLOCA_H && ! defined EXIT_SUCCESS
>-#     include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
>-      /* Use EXIT_SUCCESS as a witness for stdlib.h.  */
>-#     ifndef EXIT_SUCCESS
>-#      define EXIT_SUCCESS 0
>-#     endif
>+#    ifdef YYSTACK_USE_ALLOCA
>+#        if YYSTACK_USE_ALLOCA
>+#            ifdef __GNUC__
>+#                define YYSTACK_ALLOC __builtin_alloca
>+#            elif defined __BUILTIN_VA_ARG_INCR
>+#                include <alloca.h> /* INFRINGES ON USER NAME SPACE */
>+#            elif defined _AIX
>+#                define YYSTACK_ALLOC __alloca
>+#            elif defined _MSC_VER
>+#                include <malloc.h> /* INFRINGES ON USER NAME SPACE */
>+#                define alloca _alloca
>+#            else
>+#                define YYSTACK_ALLOC alloca
>+#                if !defined _ALLOCA_H && !defined EXIT_SUCCESS
>+#                    include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
>+/* Use EXIT_SUCCESS as a witness for stdlib.h.  */
>+#                    ifndef EXIT_SUCCESS
>+#                        define EXIT_SUCCESS 0
>+#                    endif
>+#                endif
>+#            endif
>+#        endif
> #    endif
>-#   endif
>-#  endif
>-# endif
>-
>-# ifdef YYSTACK_ALLOC
>-   /* Pacify GCC's 'empty if-body' warning.  */
>-#  define YYSTACK_FREE(Ptr) do { /* empty */; } while (0)
>-#  ifndef YYSTACK_ALLOC_MAXIMUM
>-    /* The OS might guarantee only one guard page at the bottom of the stack,
>-       and a page size can be as small as 4096 bytes.  So we cannot safely
>-       invoke alloca (N) if N exceeds 4096.  Use a slightly smaller number
>-       to allow for a few compiler-allocated temporary stack slots.  */
>-#   define YYSTACK_ALLOC_MAXIMUM 4032 /* reasonable circa 2006 */
>-#  endif
>-# else
>-#  define YYSTACK_ALLOC YYMALLOC
>-#  define YYSTACK_FREE YYFREE
>-#  ifndef YYSTACK_ALLOC_MAXIMUM
>-#   define YYSTACK_ALLOC_MAXIMUM YYSIZE_MAXIMUM
>-#  endif
>-#  if (defined __cplusplus && ! defined EXIT_SUCCESS \
>-       && ! ((defined YYMALLOC || defined malloc) \
>-             && (defined YYFREE || defined free)))
>-#   include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
>-#   ifndef EXIT_SUCCESS
>-#    define EXIT_SUCCESS 0
>-#   endif
>-#  endif
>-#  ifndef YYMALLOC
>-#   define YYMALLOC malloc
>-#   if ! defined malloc && ! defined EXIT_SUCCESS
>-void *malloc (YYSIZE_T); /* INFRINGES ON USER NAME SPACE */
>-#   endif
>-#  endif
>-#  ifndef YYFREE
>-#   define YYFREE free
>-#   if ! defined free && ! defined EXIT_SUCCESS
>-void free (void *); /* INFRINGES ON USER NAME SPACE */
>-#   endif
>-#  endif
>-# endif
>-#endif /* ! defined yyoverflow || YYERROR_VERBOSE */
> 
>+#    ifdef YYSTACK_ALLOC
>+/* Pacify GCC's 'empty if-body' warning.  */
>+#        define YYSTACK_FREE(Ptr) \
>+            do                    \
>+            { /* empty */         \
>+                ;                 \
>+            } while (0)
>+#        ifndef YYSTACK_ALLOC_MAXIMUM
>+/* The OS might guarantee only one guard page at the bottom of the stack,
>+   and a page size can be as small as 4096 bytes.  So we cannot safely
>+   invoke alloca (N) if N exceeds 4096.  Use a slightly smaller number
>+   to allow for a few compiler-allocated temporary stack slots.  */
>+#            define YYSTACK_ALLOC_MAXIMUM 4032 /* reasonable circa 2006 */
>+#        endif
>+#    else
>+#        define YYSTACK_ALLOC YYMALLOC
>+#        define YYSTACK_FREE YYFREE
>+#        ifndef YYSTACK_ALLOC_MAXIMUM
>+#            define YYSTACK_ALLOC_MAXIMUM YYSIZE_MAXIMUM
>+#        endif
>+#        if (defined __cplusplus && !defined EXIT_SUCCESS && \
>+             !((defined YYMALLOC || defined malloc) && (defined YYFREE || defined free)))
>+#            include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
>+#            ifndef EXIT_SUCCESS
>+#                define EXIT_SUCCESS 0
>+#            endif
>+#        endif
>+#        ifndef YYMALLOC
>+#            define YYMALLOC malloc
>+#            if !defined malloc && !defined EXIT_SUCCESS
>+void *malloc(YYSIZE_T); /* INFRINGES ON USER NAME SPACE */
>+#            endif
>+#        endif
>+#        ifndef YYFREE
>+#            define YYFREE free
>+#            if !defined free && !defined EXIT_SUCCESS
>+void free(void *);      /* INFRINGES ON USER NAME SPACE */
>+#            endif
>+#        endif
>+#    endif
>+#endif /* ! defined yyoverflow || YYERROR_VERBOSE */
> 
>-#if (! defined yyoverflow \
>-     && (! defined __cplusplus \
>-         || (defined YYSTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL)))
>+#if (!defined yyoverflow && \
>+     (!defined __cplusplus || (defined YYSTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL)))
> 
> /* A type that is properly aligned for any stack member.  */
> union yyalloc
> {
>-  yytype_int16 yyss_alloc;
>-  YYSTYPE yyvs_alloc;
>+    yytype_int16 yyss_alloc;
>+    YYSTYPE yyvs_alloc;
> };
> 
> /* The size of the maximum gap between one aligned stack and the next.  */
>-# define YYSTACK_GAP_MAXIMUM (sizeof (union yyalloc) - 1)
>+#    define YYSTACK_GAP_MAXIMUM (sizeof(union yyalloc) - 1)
> 
> /* The size of an array large to enough to hold all stacks, each with
>    N elements.  */
>-# define YYSTACK_BYTES(N) \
>-     ((N) * (sizeof (yytype_int16) + sizeof (YYSTYPE)) \
>-      + YYSTACK_GAP_MAXIMUM)
>+#    define YYSTACK_BYTES(N) ((N) * (sizeof(yytype_int16) + sizeof(YYSTYPE)) + YYSTACK_GAP_MAXIMUM)
> 
>-# define YYCOPY_NEEDED 1
>+#    define YYCOPY_NEEDED 1
> 
> /* Relocate STACK from its old location to the new one.  The
>    local variables YYSIZE and YYSTACKSIZE give the old and new number of
>    elements in the stack, and YYPTR gives the new location of the
>    stack.  Advance YYPTR to a properly aligned location for the next
>    stack.  */
>-# define YYSTACK_RELOCATE(Stack_alloc, Stack)                           \
>-    do                                                                  \
>-      {                                                                 \
>-        YYSIZE_T yynewbytes;                                            \
>-        YYCOPY (&yyptr->Stack_alloc, Stack, yysize);                    \
>-        Stack = &yyptr->Stack_alloc;                                    \
>-        yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \
>-        yyptr += yynewbytes / sizeof (*yyptr);                          \
>-      }                                                                 \
>-    while (0)
>+#    define YYSTACK_RELOCATE(Stack_alloc, Stack)                             \
>+        do                                                                   \
>+        {                                                                    \
>+            YYSIZE_T yynewbytes;                                             \
>+            YYCOPY(&yyptr->Stack_alloc, Stack, yysize);                      \
>+            Stack      = &yyptr->Stack_alloc;                                \
>+            yynewbytes = yystacksize * sizeof(*Stack) + YYSTACK_GAP_MAXIMUM; \
>+            yyptr += yynewbytes / sizeof(*yyptr);                            \
>+        } while (0)
> 
> #endif
> 
> #if defined YYCOPY_NEEDED && YYCOPY_NEEDED
> /* Copy COUNT objects from SRC to DST.  The source and destination do
>    not overlap.  */
>-# ifndef YYCOPY
>-#  if defined __GNUC__ && 1 < __GNUC__
>-#   define YYCOPY(Dst, Src, Count) \
>-      __builtin_memcpy (Dst, Src, (Count) * sizeof (*(Src)))
>-#  else
>-#   define YYCOPY(Dst, Src, Count)              \
>-      do                                        \
>-        {                                       \
>-          YYSIZE_T yyi;                         \
>-          for (yyi = 0; yyi < (Count); yyi++)   \
>-            (Dst)[yyi] = (Src)[yyi];            \
>-        }                                       \
>-      while (0)
>-#  endif
>-# endif
>+#    ifndef YYCOPY
>+#        if defined __GNUC__ && 1 < __GNUC__
>+#            define YYCOPY(Dst, Src, Count) __builtin_memcpy(Dst, Src, (Count) * sizeof(*(Src)))
>+#        else
>+#            define YYCOPY(Dst, Src, Count)             \
>+                do                                      \
>+                {                                       \
>+                    YYSIZE_T yyi;                       \
>+                    for (yyi = 0; yyi < (Count); yyi++) \
>+                        (Dst)[yyi] = (Src)[yyi];        \
>+                } while (0)
>+#        endif
>+#    endif
> #endif /* !YYCOPY_NEEDED */
> 
> /* YYFINAL -- State number of the termination state.  */
>-#define YYFINAL  15
>+#define YYFINAL 15
> /* YYLAST -- Last index in YYTABLE.  */
>-#define YYLAST   176
>+#define YYLAST 176
> 
> /* YYNTOKENS -- Number of terminals.  */
>-#define YYNTOKENS  28
>+#define YYNTOKENS 28
> /* YYNNTS -- Number of nonterminals.  */
>-#define YYNNTS  5
>+#define YYNNTS 5
> /* YYNRULES -- Number of rules.  */
>-#define YYNRULES  29
>+#define YYNRULES 29
> /* YYNSTATES -- Number of states.  */
>-#define YYNSTATES  55
>+#define YYNSTATES 55
> 
> /* YYTRANSLATE[YYX] -- Symbol number corresponding to YYX as returned
>    by yylex, with out-of-bounds checking.  */
>-#define YYUNDEFTOK  2
>-#define YYMAXUTOK   268
>+#define YYUNDEFTOK 2
>+#define YYMAXUTOK 268
> 
>-#define YYTRANSLATE(YYX)                                                \
>-  ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
>+#define YYTRANSLATE(YYX) ((unsigned int)(YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
> 
> /* YYTRANSLATE[TOKEN-NUM] -- Symbol number corresponding to TOKEN-NUM
>    as returned by yylex, without out-of-bounds checking.  */
>-static const yytype_uint8 yytranslate[] =
>-{
>-       0,     2,     2,     2,     2,     2,     2,     2,     2,     2,
>-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
>-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
>-       2,     2,     2,    24,     2,     2,     2,    22,     9,     2,
>-      26,    27,    20,    18,     2,    19,     2,    21,     2,     2,
>-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
>-      12,     2,    13,     2,     2,     2,     2,     2,     2,     2,
>-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
>-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
>-       2,     2,     2,     2,     8,     2,     2,     2,     2,     2,
>-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
>-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
>-       2,     2,     2,     2,     7,     2,    25,     2,     2,     2,
>-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
>-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
>-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
>-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
>-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
>-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
>-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
>-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
>-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
>-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
>-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
>-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
>-       2,     2,     2,     2,     2,     2,     1,     2,     3,     4,
>-       5,     6,    10,    11,    14,    15,    16,    17,    23
>-};
>+static const yytype_uint8 yytranslate[] = {
>+    0, 2, 2, 2, 2, 2, 2,  2, 2,  2, 2,  2, 2, 2,  2,  2,  2,  2, 2,  2,  2,  2,  2,  2,  2,  2, 2,
>+    2, 2, 2, 2, 2, 2, 24, 2, 2,  2, 22, 9, 2, 26, 27, 20, 18, 2, 19, 2,  21, 2,  2,  2,  2,  2, 2,
>+    2, 2, 2, 2, 2, 2, 12, 2, 13, 2, 2,  2, 2, 2,  2,  2,  2,  2, 2,  2,  2,  2,  2,  2,  2,  2, 2,
>+    2, 2, 2, 2, 2, 2, 2,  2, 2,  2, 2,  2, 2, 8,  2,  2,  2,  2, 2,  2,  2,  2,  2,  2,  2,  2, 2,
>+    2, 2, 2, 2, 2, 2, 2,  2, 2,  2, 2,  2, 2, 2,  2,  2,  7,  2, 25, 2,  2,  2,  2,  2,  2,  2, 2,
>+    2, 2, 2, 2, 2, 2, 2,  2, 2,  2, 2,  2, 2, 2,  2,  2,  2,  2, 2,  2,  2,  2,  2,  2,  2,  2, 2,
>+    2, 2, 2, 2, 2, 2, 2,  2, 2,  2, 2,  2, 2, 2,  2,  2,  2,  2, 2,  2,  2,  2,  2,  2,  2,  2, 2,
>+    2, 2, 2, 2, 2, 2, 2,  2, 2,  2, 2,  2, 2, 2,  2,  2,  2,  2, 2,  2,  2,  2,  2,  2,  2,  2, 2,
>+    2, 2, 2, 2, 2, 2, 2,  2, 2,  2, 2,  2, 2, 2,  2,  2,  2,  2, 2,  2,  2,  2,  2,  2,  2,  2, 2,
>+    2, 2, 2, 2, 2, 2, 2,  2, 2,  2, 2,  2, 2, 1,  2,  3,  4,  5, 6,  10, 11, 14, 15, 16, 17, 23};
> 
> #if YYDEBUG
>-  /* YYRLINE[YYN] -- Source line where rule number YYN was defined.  */
>+/* YYRLINE[YYN] -- Source line where rule number YYN was defined.  */
> static const yytype_uint16 yyrline[] = {0,   108, 108, 115, 116, 127, 127, 148, 148, 169,
>                                         172, 175, 178, 181, 184, 187, 190, 193, 196, 221,
>                                         243, 246, 249, 275, 302, 305, 308, 311, 323, 326};
>@@ -506,249 +463,188 @@ static const yytype_uint16 yyrline[] = {0,   108, 108, 115, 116, 127, 127, 148,
> #if YYDEBUG || YYERROR_VERBOSE || 0
> /* YYTNAME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM.
>    First, the terminals, then, starting at YYNTOKENS, nonterminals.  */
>-static const char *const yytname[] =
>-{
>-  "$end", "error", "$undefined", "TOK_CONST_INT", "TOK_IDENTIFIER",
>-  "TOK_OP_OR", "TOK_OP_AND", "'|'", "'^'", "'&'", "TOK_OP_EQ", "TOK_OP_NE",
>-  "'<'", "'>'", "TOK_OP_LE", "TOK_OP_GE", "TOK_OP_LEFT", "TOK_OP_RIGHT",
>-  "'+'", "'-'", "'*'", "'/'", "'%'", "TOK_UNARY", "'!'", "'~'", "'('",
>-  "')'", "$accept", "input", "expression", "$@1", "$@2", YY_NULLPTR
>-};
>+static const char *const yytname[] = {
>+    "$end",       "error",       "$undefined",   "TOK_CONST_INT", "TOK_IDENTIFIER",
>+    "TOK_OP_OR",  "TOK_OP_AND",  "'|'",          "'^'",           "'&'",
>+    "TOK_OP_EQ",  "TOK_OP_NE",   "'<'",          "'>'",           "TOK_OP_LE",
>+    "TOK_OP_GE",  "TOK_OP_LEFT", "TOK_OP_RIGHT", "'+'",           "'-'",
>+    "'*'",        "'/'",         "'%'",          "TOK_UNARY",     "'!'",
>+    "'~'",        "'('",         "')'",          "$accept",       "input",
>+    "expression", "$@1",         "$@2",          YY_NULLPTR};
> #endif
> 
>-# ifdef YYPRINT
>+#ifdef YYPRINT
> /* YYTOKNUM[NUM] -- (External) token number corresponding to the
>    (internal) symbol number NUM (which must be that of a token).  */
>-static const yytype_uint16 yytoknum[] =
>-{
>-       0,   256,   257,   258,   259,   260,   261,   124,    94,    38,
>-     262,   263,    60,    62,   264,   265,   266,   267,    43,    45,
>-      42,    47,    37,   268,    33,   126,    40,    41
>-};
>-# endif
>+static const yytype_uint16 yytoknum[] = {0,   256, 257, 258, 259, 260, 261, 124, 94, 38,
>+                                         262, 263, 60,  62,  264, 265, 266, 267, 43, 45,
>+                                         42,  47,  37,  268, 33,  126, 40,  41};
>+#endif
> 
> #define YYPACT_NINF -12
> 
>-#define yypact_value_is_default(Yystate) \
>-  (!!((Yystate) == (-12)))
>+#define yypact_value_is_default(Yystate) (!!((Yystate) == (-12)))
> 
> #define YYTABLE_NINF -1
> 
>-#define yytable_value_is_error(Yytable_value) \
>-  0
>-
>-  /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
>-     STATE-NUM.  */
>-static const yytype_int16 yypact[] =
>-{
>-      31,   -12,   -12,    31,    31,    31,    31,    31,    51,    76,
>-     -12,   -12,   -12,   -12,    53,   -12,   -12,   -12,    31,    31,
>-      31,    31,    31,    31,    31,    31,    31,    31,    31,    31,
>-      31,    31,    31,    31,   -12,    31,    31,   124,   138,    26,
>-     149,   149,   -11,   -11,   -11,   -11,   154,   154,    -8,    -8,
>-     -12,   -12,   -12,    93,   109
>-};
>-
>-  /* YYDEFACT[STATE-NUM] -- Default reduction number in state STATE-NUM.
>-     Performed when YYTABLE does not specify something else to do.  Zero
>-     means the default is an error.  */
>-static const yytype_uint8 yydefact[] =
>-{
>-       0,     3,     4,     0,     0,     0,     0,     0,     0,     2,
>-      28,    27,    25,    26,     0,     1,     5,     7,     0,     0,
>-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
>-       0,     0,     0,     0,    29,     0,     0,     9,    10,    11,
>-      13,    12,    17,    16,    15,    14,    19,    18,    21,    20,
>-      24,    23,    22,     6,     8
>-};
>-
>-  /* YYPGOTO[NTERM-NUM].  */
>-static const yytype_int8 yypgoto[] =
>-{
>-     -12,   -12,    -3,   -12,   -12
>-};
>-
>-  /* YYDEFGOTO[NTERM-NUM].  */
>-static const yytype_int8 yydefgoto[] =
>-{
>-      -1,     8,     9,    35,    36
>-};
>-
>-  /* YYTABLE[YYPACT[STATE-NUM]] -- What to do in state STATE-NUM.  If
>-     positive, shift that token.  If negative, reduce the rule whose
>-     number is the opposite.  If YYTABLE_NINF, syntax error.  */
>-static const yytype_uint8 yytable[] =
>-{
>-      10,    11,    12,    13,    14,    27,    28,    29,    30,    31,
>-      32,    33,    31,    32,    33,    37,    38,    39,    40,    41,
>-      42,    43,    44,    45,    46,    47,    48,    49,    50,    51,
>-      52,     0,    53,    54,     1,     2,    21,    22,    23,    24,
>-      25,    26,    27,    28,    29,    30,    31,    32,    33,     3,
>-       4,    15,     0,     0,     0,     5,     6,     7,    16,    17,
>-      18,    19,    20,    21,    22,    23,    24,    25,    26,    27,
>-      28,    29,    30,    31,    32,    33,     0,     0,     0,     0,
>-      34,    16,    17,    18,    19,    20,    21,    22,    23,    24,
>-      25,    26,    27,    28,    29,    30,    31,    32,    33,    17,
>-      18,    19,    20,    21,    22,    23,    24,    25,    26,    27,
>-      28,    29,    30,    31,    32,    33,    18,    19,    20,    21,
>-      22,    23,    24,    25,    26,    27,    28,    29,    30,    31,
>-      32,    33,    19,    20,    21,    22,    23,    24,    25,    26,
>-      27,    28,    29,    30,    31,    32,    33,    20,    21,    22,
>-      23,    24,    25,    26,    27,    28,    29,    30,    31,    32,
>-      33,    23,    24,    25,    26,    27,    28,    29,    30,    31,
>-      32,    33,    29,    30,    31,    32,    33
>-};
>-
>-static const yytype_int8 yycheck[] =
>-{
>-       3,     4,     5,     6,     7,    16,    17,    18,    19,    20,
>-      21,    22,    20,    21,    22,    18,    19,    20,    21,    22,
>-      23,    24,    25,    26,    27,    28,    29,    30,    31,    32,
>-      33,    -1,    35,    36,     3,     4,    10,    11,    12,    13,
>-      14,    15,    16,    17,    18,    19,    20,    21,    22,    18,
>-      19,     0,    -1,    -1,    -1,    24,    25,    26,     5,     6,
>-       7,     8,     9,    10,    11,    12,    13,    14,    15,    16,
>-      17,    18,    19,    20,    21,    22,    -1,    -1,    -1,    -1,
>-      27,     5,     6,     7,     8,     9,    10,    11,    12,    13,
>-      14,    15,    16,    17,    18,    19,    20,    21,    22,     6,
>-       7,     8,     9,    10,    11,    12,    13,    14,    15,    16,
>-      17,    18,    19,    20,    21,    22,     7,     8,     9,    10,
>-      11,    12,    13,    14,    15,    16,    17,    18,    19,    20,
>-      21,    22,     8,     9,    10,    11,    12,    13,    14,    15,
>-      16,    17,    18,    19,    20,    21,    22,     9,    10,    11,
>-      12,    13,    14,    15,    16,    17,    18,    19,    20,    21,
>-      22,    12,    13,    14,    15,    16,    17,    18,    19,    20,
>-      21,    22,    18,    19,    20,    21,    22
>-};
>-
>-  /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
>-     symbol of state STATE-NUM.  */
>-static const yytype_uint8 yystos[] =
>-{
>-       0,     3,     4,    18,    19,    24,    25,    26,    29,    30,
>-      30,    30,    30,    30,    30,     0,     5,     6,     7,     8,
>-       9,    10,    11,    12,    13,    14,    15,    16,    17,    18,
>-      19,    20,    21,    22,    27,    31,    32,    30,    30,    30,
>-      30,    30,    30,    30,    30,    30,    30,    30,    30,    30,
>-      30,    30,    30,    30,    30
>-};
>-
>-  /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives.  */
>-static const yytype_uint8 yyr1[] =
>-{
>-       0,    28,    29,    30,    30,    31,    30,    32,    30,    30,
>-      30,    30,    30,    30,    30,    30,    30,    30,    30,    30,
>-      30,    30,    30,    30,    30,    30,    30,    30,    30,    30
>-};
>-
>-  /* YYR2[YYN] -- Number of symbols on the right hand side of rule YYN.  */
>-static const yytype_uint8 yyr2[] =
>-{
>-       0,     2,     1,     1,     1,     0,     4,     0,     4,     3,
>-       3,     3,     3,     3,     3,     3,     3,     3,     3,     3,
>-       3,     3,     3,     3,     3,     2,     2,     2,     2,     3
>-};
>-
>-
>-#define yyerrok         (yyerrstatus = 0)
>-#define yyclearin       (yychar = YYEMPTY)
>-#define YYEMPTY         (-2)
>-#define YYEOF           0
>-
>-#define YYACCEPT        goto yyacceptlab
>-#define YYABORT         goto yyabortlab
>-#define YYERROR         goto yyerrorlab
>-
>-
>-#define YYRECOVERING()  (!!yyerrstatus)
>-
>-#define YYBACKUP(Token, Value)                                  \
>-do                                                              \
>-  if (yychar == YYEMPTY)                                        \
>-    {                                                           \
>-      yychar = (Token);                                         \
>-      yylval = (Value);                                         \
>-      YYPOPSTACK (yylen);                                       \
>-      yystate = *yyssp;                                         \
>-      goto yybackup;                                            \
>-    }                                                           \
>-  else                                                          \
>-    {                                                           \
>-      yyerror (context, YY_("syntax error: cannot back up")); \
>-      YYERROR;                                                  \
>-    }                                                           \
>-while (0)
>+#define yytable_value_is_error(Yytable_value) 0
>+
>+/* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
>+   STATE-NUM.  */
>+static const yytype_int16 yypact[] = {
>+    31,  -12, -12, 31,  31,  31,  31,  31,  51,  76,  -12, -12, -12, -12, 53,  -12, -12, -12, 31,
>+    31,  31,  31,  31,  31,  31,  31,  31,  31,  31,  31,  31,  31,  31,  31,  -12, 31,  31,  124,
>+    138, 26,  149, 149, -11, -11, -11, -11, 154, 154, -8,  -8,  -12, -12, -12, 93,  109};
>+
>+/* YYDEFACT[STATE-NUM] -- Default reduction number in state STATE-NUM.
>+   Performed when YYTABLE does not specify something else to do.  Zero
>+   means the default is an error.  */
>+static const yytype_uint8 yydefact[] = {0,  3,  4,  0,  0,  0,  0,  0,  0,  2,  28, 27, 25, 26,
>+                                        0,  1,  5,  7,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
>+                                        0,  0,  0,  0,  0,  0,  29, 0,  0,  9,  10, 11, 13, 12,
>+                                        17, 16, 15, 14, 19, 18, 21, 20, 24, 23, 22, 6,  8};
>+
>+/* YYPGOTO[NTERM-NUM].  */
>+static const yytype_int8 yypgoto[] = {-12, -12, -3, -12, -12};
>+
>+/* YYDEFGOTO[NTERM-NUM].  */
>+static const yytype_int8 yydefgoto[] = {-1, 8, 9, 35, 36};
>+
>+/* YYTABLE[YYPACT[STATE-NUM]] -- What to do in state STATE-NUM.  If
>+   positive, shift that token.  If negative, reduce the rule whose
>+   number is the opposite.  If YYTABLE_NINF, syntax error.  */
>+static const yytype_uint8 yytable[] = {
>+    10, 11, 12, 13, 14, 27, 28, 29, 30, 31, 32, 33, 31, 32, 33, 37, 38, 39, 40, 41, 42, 43, 44,
>+    45, 46, 47, 48, 49, 50, 51, 52, 0,  53, 54, 1,  2,  21, 22, 23, 24, 25, 26, 27, 28, 29, 30,
>+    31, 32, 33, 3,  4,  15, 0,  0,  0,  5,  6,  7,  16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26,
>+    27, 28, 29, 30, 31, 32, 33, 0,  0,  0,  0,  34, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26,
>+    27, 28, 29, 30, 31, 32, 33, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32,
>+    33, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 19, 20, 21, 22, 23, 24,
>+    25, 26, 27, 28, 29, 30, 31, 32, 33, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33,
>+    23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 29, 30, 31, 32, 33};
>+
>+static const yytype_int8 yycheck[] = {
>+    3,  4,  5,  6,  7,  16, 17, 18, 19, 20, 21, 22, 20, 21, 22, 18, 19, 20, 21, 22, 23, 24, 25,
>+    26, 27, 28, 29, 30, 31, 32, 33, -1, 35, 36, 3,  4,  10, 11, 12, 13, 14, 15, 16, 17, 18, 19,
>+    20, 21, 22, 18, 19, 0,  -1, -1, -1, 24, 25, 26, 5,  6,  7,  8,  9,  10, 11, 12, 13, 14, 15,
>+    16, 17, 18, 19, 20, 21, 22, -1, -1, -1, -1, 27, 5,  6,  7,  8,  9,  10, 11, 12, 13, 14, 15,
>+    16, 17, 18, 19, 20, 21, 22, 6,  7,  8,  9,  10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21,
>+    22, 7,  8,  9,  10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 8,  9,  10, 11, 12, 13,
>+    14, 15, 16, 17, 18, 19, 20, 21, 22, 9,  10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22,
>+    12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 18, 19, 20, 21, 22};
>+
>+/* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
>+   symbol of state STATE-NUM.  */
>+static const yytype_uint8 yystos[] = {0,  3,  4,  18, 19, 24, 25, 26, 29, 30, 30, 30, 30, 30,
>+                                      30, 0,  5,  6,  7,  8,  9,  10, 11, 12, 13, 14, 15, 16,
>+                                      17, 18, 19, 20, 21, 22, 27, 31, 32, 30, 30, 30, 30, 30,
>+                                      30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30};
>+
>+/* YYR1[YYN] -- Symbol number of symbol that rule YYN derives.  */
>+static const yytype_uint8 yyr1[] = {0,  28, 29, 30, 30, 31, 30, 32, 30, 30, 30, 30, 30, 30, 30,
>+                                    30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30};
>+
>+/* YYR2[YYN] -- Number of symbols on the right hand side of rule YYN.  */
>+static const yytype_uint8 yyr2[] = {0, 2, 1, 1, 1, 0, 4, 0, 4, 3, 3, 3, 3, 3, 3,
>+                                    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 2, 2, 2, 2, 3};
>+
>+#define yyerrok (yyerrstatus = 0)
>+#define yyclearin (yychar = YYEMPTY)
>+#define YYEMPTY (-2)
>+#define YYEOF 0
>+
>+#define YYACCEPT goto yyacceptlab
>+#define YYABORT goto yyabortlab
>+#define YYERROR goto yyerrorlab
>+
>+#define YYRECOVERING() (!!yyerrstatus)
>+
>+#define YYBACKUP(Token, Value)                                     \
>+    do                                                             \
>+        if (yychar == YYEMPTY)                                     \
>+        {                                                          \
>+            yychar = (Token);                                      \
>+            yylval = (Value);                                      \
>+            YYPOPSTACK(yylen);                                     \
>+            yystate = *yyssp;                                      \
>+            goto yybackup;                                         \
>+        }                                                          \
>+        else                                                       \
>+        {                                                          \
>+            yyerror(context, YY_("syntax error: cannot back up")); \
>+            YYERROR;                                               \
>+        }                                                          \
>+    while (0)
> 
> /* Error token number */
>-#define YYTERROR        1
>-#define YYERRCODE       256
>-
>-
>+#define YYTERROR 1
>+#define YYERRCODE 256
> 
> /* Enable debugging if requested.  */
> #if YYDEBUG
> 
>-# ifndef YYFPRINTF
>-#  include <stdio.h> /* INFRINGES ON USER NAME SPACE */
>-#  define YYFPRINTF fprintf
>-# endif
>+#    ifndef YYFPRINTF
>+#        include <stdio.h> /* INFRINGES ON USER NAME SPACE */
>+#        define YYFPRINTF fprintf
>+#    endif
> 
>-# define YYDPRINTF(Args)                        \
>-do {                                            \
>-  if (yydebug)                                  \
>-    YYFPRINTF Args;                             \
>-} while (0)
>+#    define YYDPRINTF(Args)     \
>+        do                      \
>+        {                       \
>+            if (yydebug)        \
>+                YYFPRINTF Args; \
>+        } while (0)
> 
> /* This macro is provided for backward compatibility. */
>-#ifndef YY_LOCATION_PRINT
>-# define YY_LOCATION_PRINT(File, Loc) ((void) 0)
>-#endif
>-
>-
>-# define YY_SYMBOL_PRINT(Title, Type, Value, Location)                    \
>-do {                                                                      \
>-  if (yydebug)                                                            \
>-    {                                                                     \
>-      YYFPRINTF (stderr, "%s ", Title);                                   \
>-      yy_symbol_print (stderr,                                            \
>-                  Type, Value, context); \
>-      YYFPRINTF (stderr, "\n");                                           \
>-    }                                                                     \
>-} while (0)
>+#    ifndef YY_LOCATION_PRINT
>+#        define YY_LOCATION_PRINT(File, Loc) ((void)0)
>+#    endif
> 
>+#    define YY_SYMBOL_PRINT(Title, Type, Value, Location)      \
>+        do                                                     \
>+        {                                                      \
>+            if (yydebug)                                       \
>+            {                                                  \
>+                YYFPRINTF(stderr, "%s ", Title);               \
>+                yy_symbol_print(stderr, Type, Value, context); \
>+                YYFPRINTF(stderr, "\n");                       \
>+            }                                                  \
>+        } while (0)
> 
> /*----------------------------------------.
> | Print this symbol's value on YYOUTPUT.  |
> `----------------------------------------*/
> 
>-static void
>-yy_symbol_value_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep, Context *context)
>+static void yy_symbol_value_print(FILE *yyoutput,
>+                                  int yytype,
>+                                  YYSTYPE const *const yyvaluep,
>+                                  Context *context)
> {
>-  FILE *yyo = yyoutput;
>-  YYUSE (yyo);
>-  YYUSE (context);
>-  if (!yyvaluep)
>-    return;
>-# ifdef YYPRINT
>-  if (yytype < YYNTOKENS)
>-    YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep);
>-# endif
>-  YYUSE (yytype);
>+    FILE *yyo = yyoutput;
>+    YYUSE(yyo);
>+    YYUSE(context);
>+    if (!yyvaluep)
>+        return;
>+#    ifdef YYPRINT
>+    if (yytype < YYNTOKENS)
>+        YYPRINT(yyoutput, yytoknum[yytype], *yyvaluep);
>+#    endif
>+    YYUSE(yytype);
> }
> 
>-
> /*--------------------------------.
> | Print this symbol on YYOUTPUT.  |
> `--------------------------------*/
> 
>-static void
>-yy_symbol_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep, Context *context)
>+static void yy_symbol_print(FILE *yyoutput,
>+                            int yytype,
>+                            YYSTYPE const *const yyvaluep,
>+                            Context *context)
> {
>-  YYFPRINTF (yyoutput, "%s %s (",
>-             yytype < YYNTOKENS ? "token" : "nterm", yytname[yytype]);
>+    YYFPRINTF(yyoutput, "%s %s (", yytype < YYNTOKENS ? "token" : "nterm", yytname[yytype]);
> 
>-  yy_symbol_value_print (yyoutput, yytype, yyvaluep, context);
>-  YYFPRINTF (yyoutput, ")");
>+    yy_symbol_value_print(yyoutput, yytype, yyvaluep, context);
>+    YYFPRINTF(yyoutput, ")");
> }
> 
> /*------------------------------------------------------------------.
>@@ -756,69 +652,64 @@ yy_symbol_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep, Con
> | TOP (included).                                                   |
> `------------------------------------------------------------------*/
> 
>-static void
>-yy_stack_print (yytype_int16 *yybottom, yytype_int16 *yytop)
>+static void yy_stack_print(yytype_int16 *yybottom, yytype_int16 *yytop)
> {
>-  YYFPRINTF (stderr, "Stack now");
>-  for (; yybottom <= yytop; yybottom++)
>+    YYFPRINTF(stderr, "Stack now");
>+    for (; yybottom <= yytop; yybottom++)
>     {
>-      int yybot = *yybottom;
>-      YYFPRINTF (stderr, " %d", yybot);
>+        int yybot = *yybottom;
>+        YYFPRINTF(stderr, " %d", yybot);
>     }
>-  YYFPRINTF (stderr, "\n");
>+    YYFPRINTF(stderr, "\n");
> }
> 
>-# define YY_STACK_PRINT(Bottom, Top)                            \
>-do {                                                            \
>-  if (yydebug)                                                  \
>-    yy_stack_print ((Bottom), (Top));                           \
>-} while (0)
>-
>+#    define YY_STACK_PRINT(Bottom, Top)          \
>+        do                                       \
>+        {                                        \
>+            if (yydebug)                         \
>+                yy_stack_print((Bottom), (Top)); \
>+        } while (0)
> 
> /*------------------------------------------------.
> | Report that the YYRULE is going to be reduced.  |
> `------------------------------------------------*/
> 
>-static void
>-yy_reduce_print (yytype_int16 *yyssp, YYSTYPE *yyvsp, int yyrule, Context *context)
>+static void yy_reduce_print(yytype_int16 *yyssp, YYSTYPE *yyvsp, int yyrule, Context *context)
> {
>-  unsigned long int yylno = yyrline[yyrule];
>-  int yynrhs = yyr2[yyrule];
>-  int yyi;
>-  YYFPRINTF (stderr, "Reducing stack by rule %d (line %lu):\n",
>-             yyrule - 1, yylno);
>-  /* The symbols being reduced.  */
>-  for (yyi = 0; yyi < yynrhs; yyi++)
>+    unsigned long int yylno = yyrline[yyrule];
>+    int yynrhs              = yyr2[yyrule];
>+    int yyi;
>+    YYFPRINTF(stderr, "Reducing stack by rule %d (line %lu):\n", yyrule - 1, yylno);
>+    /* The symbols being reduced.  */
>+    for (yyi = 0; yyi < yynrhs; yyi++)
>     {
>-      YYFPRINTF (stderr, "   $%d = ", yyi + 1);
>-      yy_symbol_print (stderr,
>-                       yystos[yyssp[yyi + 1 - yynrhs]],
>-                       &(yyvsp[(yyi + 1) - (yynrhs)])
>-                                              , context);
>-      YYFPRINTF (stderr, "\n");
>+        YYFPRINTF(stderr, "   $%d = ", yyi + 1);
>+        yy_symbol_print(stderr, yystos[yyssp[yyi + 1 - yynrhs]], &(yyvsp[(yyi + 1) - (yynrhs)]),
>+                        context);
>+        YYFPRINTF(stderr, "\n");
>     }
> }
> 
>-# define YY_REDUCE_PRINT(Rule)          \
>-do {                                    \
>-  if (yydebug)                          \
>-    yy_reduce_print (yyssp, yyvsp, Rule, context); \
>-} while (0)
>+#    define YY_REDUCE_PRINT(Rule)                             \
>+        do                                                    \
>+        {                                                     \
>+            if (yydebug)                                      \
>+                yy_reduce_print(yyssp, yyvsp, Rule, context); \
>+        } while (0)
> 
> /* Nonzero means print parse trace.  It is left uninitialized so that
>    multiple parsers can coexist.  */
> int yydebug;
> #else /* !YYDEBUG */
>-# define YYDPRINTF(Args)
>-# define YY_SYMBOL_PRINT(Title, Type, Value, Location)
>-# define YY_STACK_PRINT(Bottom, Top)
>-# define YY_REDUCE_PRINT(Rule)
>+#    define YYDPRINTF(Args)
>+#    define YY_SYMBOL_PRINT(Title, Type, Value, Location)
>+#    define YY_STACK_PRINT(Bottom, Top)
>+#    define YY_REDUCE_PRINT(Rule)
> #endif /* !YYDEBUG */
> 
>-
> /* YYINITDEPTH -- initial size of the parser's stacks.  */
> #ifndef YYINITDEPTH
>-# define YYINITDEPTH 200
>+#    define YYINITDEPTH 200
> #endif
> 
> /* YYMAXDEPTH -- maximum size the stacks can grow to (effective only
>@@ -829,49 +720,46 @@ int yydebug;
>    evaluated with infinite-precision integer arithmetic.  */
> 
> #ifndef YYMAXDEPTH
>-# define YYMAXDEPTH 10000
>+#    define YYMAXDEPTH 10000
> #endif
> 
>-
> #if YYERROR_VERBOSE
> 
>-# ifndef yystrlen
>-#  if defined __GLIBC__ && defined _STRING_H
>-#   define yystrlen strlen
>-#  else
>+#    ifndef yystrlen
>+#        if defined __GLIBC__ && defined _STRING_H
>+#            define yystrlen strlen
>+#        else
> /* Return the length of YYSTR.  */
>-static YYSIZE_T
>-yystrlen (const char *yystr)
>+static YYSIZE_T yystrlen(const char *yystr)
> {
>-  YYSIZE_T yylen;
>-  for (yylen = 0; yystr[yylen]; yylen++)
>-    continue;
>-  return yylen;
>+    YYSIZE_T yylen;
>+    for (yylen = 0; yystr[yylen]; yylen++)
>+        continue;
>+    return yylen;
> }
>-#  endif
>-# endif
>+#        endif
>+#    endif
> 
>-# ifndef yystpcpy
>-#  if defined __GLIBC__ && defined _STRING_H && defined _GNU_SOURCE
>-#   define yystpcpy stpcpy
>-#  else
>+#    ifndef yystpcpy
>+#        if defined __GLIBC__ && defined _STRING_H && defined _GNU_SOURCE
>+#            define yystpcpy stpcpy
>+#        else
> /* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in
>    YYDEST.  */
>-static char *
>-yystpcpy (char *yydest, const char *yysrc)
>+static char *yystpcpy(char *yydest, const char *yysrc)
> {
>-  char *yyd = yydest;
>-  const char *yys = yysrc;
>+    char *yyd       = yydest;
>+    const char *yys = yysrc;
> 
>-  while ((*yyd++ = *yys++) != '\0')
>-    continue;
>+    while ((*yyd++ = *yys++) != '\0')
>+        continue;
> 
>-  return yyd - 1;
>+    return yyd - 1;
> }
>-#  endif
>-# endif
>+#        endif
>+#    endif
> 
>-# ifndef yytnamerr
>+#    ifndef yytnamerr
> /* Copy to YYRES the contents of YYSTR after stripping away unnecessary
>    quotes and backslashes, so that it's suitable for yyerror.  The
>    heuristic is that double-quoting is unnecessary unless the string
>@@ -879,45 +767,44 @@ yystpcpy (char *yydest, const char *yysrc)
>    backslash-backslash).  YYSTR is taken from yytname.  If YYRES is
>    null, do not copy; instead, return the length of what the result
>    would have been.  */
>-static YYSIZE_T
>-yytnamerr (char *yyres, const char *yystr)
>+static YYSIZE_T yytnamerr(char *yyres, const char *yystr)
> {
>-  if (*yystr == '"')
>+    if (*yystr == '"')
>     {
>-      YYSIZE_T yyn = 0;
>-      char const *yyp = yystr;
>-
>-      for (;;)
>-        switch (*++yyp)
>-          {
>-          case '\'':
>-          case ',':
>-            goto do_not_strip_quotes;
>-
>-          case '\\':
>-            if (*++yyp != '\\')
>-              goto do_not_strip_quotes;
>-            /* Fall through.  */
>-          default:
>-            if (yyres)
>-              yyres[yyn] = *yyp;
>-            yyn++;
>-            break;
>+        YYSIZE_T yyn    = 0;
>+        char const *yyp = yystr;
>+
>+        for (;;)
>+            switch (*++yyp)
>+            {
>+                case '\'':
>+                case ',':
>+                    goto do_not_strip_quotes;
>+
>+                case '\\':
>+                    if (*++yyp != '\\')
>+                        goto do_not_strip_quotes;
>+                    /* Fall through.  */
>+                default:
>+                    if (yyres)
>+                        yyres[yyn] = *yyp;
>+                    yyn++;
>+                    break;
> 
>-          case '"':
>-            if (yyres)
>-              yyres[yyn] = '\0';
>-            return yyn;
>-          }
>-    do_not_strip_quotes: ;
>+                case '"':
>+                    if (yyres)
>+                        yyres[yyn] = '\0';
>+                    return yyn;
>+            }
>+    do_not_strip_quotes:;
>     }
> 
>-  if (! yyres)
>-    return yystrlen (yystr);
>+    if (!yyres)
>+        return yystrlen(yystr);
> 
>-  return yystpcpy (yyres, yystr) - yyres;
>+    return yystpcpy(yyres, yystr) - yyres;
> }
>-# endif
>+#    endif
> 
> /* Copy into *YYMSG, which is of size *YYMSG_ALLOC, an error message
>    about the unexpected token YYTOKEN for the state stack whose top is
>@@ -927,131 +814,130 @@ yytnamerr (char *yyres, const char *yystr)
>    not large enough to hold the message.  In that case, also set
>    *YYMSG_ALLOC to the required number of bytes.  Return 2 if the
>    required number of bytes is too large to store.  */
>-static int
>-yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg,
>-                yytype_int16 *yyssp, int yytoken)
>+static int yysyntax_error(YYSIZE_T *yymsg_alloc, char **yymsg, yytype_int16 *yyssp, int yytoken)
> {
>-  YYSIZE_T yysize0 = yytnamerr (YY_NULLPTR, yytname[yytoken]);
>-  YYSIZE_T yysize = yysize0;
>-  enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 };
>-  /* Internationalized format string. */
>-  const char *yyformat = YY_NULLPTR;
>-  /* Arguments of yyformat. */
>-  char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM];
>-  /* Number of reported tokens (one for the "unexpected", one per
>-     "expected"). */
>-  int yycount = 0;
>-
>-  /* There are many possibilities here to consider:
>-     - If this state is a consistent state with a default action, then
>-       the only way this function was invoked is if the default action
>-       is an error action.  In that case, don't check for expected
>-       tokens because there are none.
>-     - The only way there can be no lookahead present (in yychar) is if
>-       this state is a consistent state with a default action.  Thus,
>-       detecting the absence of a lookahead is sufficient to determine
>-       that there is no unexpected or expected token to report.  In that
>-       case, just report a simple "syntax error".
>-     - Don't assume there isn't a lookahead just because this state is a
>-       consistent state with a default action.  There might have been a
>-       previous inconsistent state, consistent state with a non-default
>-       action, or user semantic action that manipulated yychar.
>-     - Of course, the expected token list depends on states to have
>-       correct lookahead information, and it depends on the parser not
>-       to perform extra reductions after fetching a lookahead from the
>-       scanner and before detecting a syntax error.  Thus, state merging
>-       (from LALR or IELR) and default reductions corrupt the expected
>-       token list.  However, the list is correct for canonical LR with
>-       one exception: it will still contain any token that will not be
>-       accepted due to an error action in a later state.
>-  */
>-  if (yytoken != YYEMPTY)
>+    YYSIZE_T yysize0 = yytnamerr(YY_NULLPTR, yytname[yytoken]);
>+    YYSIZE_T yysize  = yysize0;
>+    enum
>+    {
>+        YYERROR_VERBOSE_ARGS_MAXIMUM = 5
>+    };
>+    /* Internationalized format string. */
>+    const char *yyformat = YY_NULLPTR;
>+    /* Arguments of yyformat. */
>+    char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM];
>+    /* Number of reported tokens (one for the "unexpected", one per
>+       "expected"). */
>+    int yycount = 0;
>+
>+    /* There are many possibilities here to consider:
>+       - If this state is a consistent state with a default action, then
>+         the only way this function was invoked is if the default action
>+         is an error action.  In that case, don't check for expected
>+         tokens because there are none.
>+       - The only way there can be no lookahead present (in yychar) is if
>+         this state is a consistent state with a default action.  Thus,
>+         detecting the absence of a lookahead is sufficient to determine
>+         that there is no unexpected or expected token to report.  In that
>+         case, just report a simple "syntax error".
>+       - Don't assume there isn't a lookahead just because this state is a
>+         consistent state with a default action.  There might have been a
>+         previous inconsistent state, consistent state with a non-default
>+         action, or user semantic action that manipulated yychar.
>+       - Of course, the expected token list depends on states to have
>+         correct lookahead information, and it depends on the parser not
>+         to perform extra reductions after fetching a lookahead from the
>+         scanner and before detecting a syntax error.  Thus, state merging
>+         (from LALR or IELR) and default reductions corrupt the expected
>+         token list.  However, the list is correct for canonical LR with
>+         one exception: it will still contain any token that will not be
>+         accepted due to an error action in a later state.
>+    */
>+    if (yytoken != YYEMPTY)
>     {
>-      int yyn = yypact[*yyssp];
>-      yyarg[yycount++] = yytname[yytoken];
>-      if (!yypact_value_is_default (yyn))
>+        int yyn          = yypact[*yyssp];
>+        yyarg[yycount++] = yytname[yytoken];
>+        if (!yypact_value_is_default(yyn))
>         {
>-          /* Start YYX at -YYN if negative to avoid negative indexes in
>-             YYCHECK.  In other words, skip the first -YYN actions for
>-             this state because they are default actions.  */
>-          int yyxbegin = yyn < 0 ? -yyn : 0;
>-          /* Stay within bounds of both yycheck and yytname.  */
>-          int yychecklim = YYLAST - yyn + 1;
>-          int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS;
>-          int yyx;
>-
>-          for (yyx = yyxbegin; yyx < yyxend; ++yyx)
>-            if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR
>-                && !yytable_value_is_error (yytable[yyx + yyn]))
>-              {
>-                if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM)
>-                  {
>-                    yycount = 1;
>-                    yysize = yysize0;
>-                    break;
>-                  }
>-                yyarg[yycount++] = yytname[yyx];
>+            /* Start YYX at -YYN if negative to avoid negative indexes in
>+               YYCHECK.  In other words, skip the first -YYN actions for
>+               this state because they are default actions.  */
>+            int yyxbegin = yyn < 0 ? -yyn : 0;
>+            /* Stay within bounds of both yycheck and yytname.  */
>+            int yychecklim = YYLAST - yyn + 1;
>+            int yyxend     = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS;
>+            int yyx;
>+
>+            for (yyx = yyxbegin; yyx < yyxend; ++yyx)
>+                if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR &&
>+                    !yytable_value_is_error(yytable[yyx + yyn]))
>                 {
>-                  YYSIZE_T yysize1 = yysize + yytnamerr (YY_NULLPTR, yytname[yyx]);
>-                  if (! (yysize <= yysize1
>-                         && yysize1 <= YYSTACK_ALLOC_MAXIMUM))
>-                    return 2;
>-                  yysize = yysize1;
>+                    if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM)
>+                    {
>+                        yycount = 1;
>+                        yysize  = yysize0;
>+                        break;
>+                    }
>+                    yyarg[yycount++] = yytname[yyx];
>+                    {
>+                        YYSIZE_T yysize1 = yysize + yytnamerr(YY_NULLPTR, yytname[yyx]);
>+                        if (!(yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM))
>+                            return 2;
>+                        yysize = yysize1;
>+                    }
>                 }
>-              }
>         }
>     }
> 
>-  switch (yycount)
>+    switch (yycount)
>     {
>-# define YYCASE_(N, S)                      \
>-      case N:                               \
>-        yyformat = S;                       \
>-      break
>-      YYCASE_(0, YY_("syntax error"));
>-      YYCASE_(1, YY_("syntax error, unexpected %s"));
>-      YYCASE_(2, YY_("syntax error, unexpected %s, expecting %s"));
>-      YYCASE_(3, YY_("syntax error, unexpected %s, expecting %s or %s"));
>-      YYCASE_(4, YY_("syntax error, unexpected %s, expecting %s or %s or %s"));
>-      YYCASE_(5, YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s"));
>-# undef YYCASE_
>+#    define YYCASE_(N, S) \
>+        case N:           \
>+            yyformat = S; \
>+            break
>+        YYCASE_(0, YY_("syntax error"));
>+        YYCASE_(1, YY_("syntax error, unexpected %s"));
>+        YYCASE_(2, YY_("syntax error, unexpected %s, expecting %s"));
>+        YYCASE_(3, YY_("syntax error, unexpected %s, expecting %s or %s"));
>+        YYCASE_(4, YY_("syntax error, unexpected %s, expecting %s or %s or %s"));
>+        YYCASE_(5, YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s"));
>+#    undef YYCASE_
>     }
> 
>-  {
>-    YYSIZE_T yysize1 = yysize + yystrlen (yyformat);
>-    if (! (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM))
>-      return 2;
>-    yysize = yysize1;
>-  }
>+    {
>+        YYSIZE_T yysize1 = yysize + yystrlen(yyformat);
>+        if (!(yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM))
>+            return 2;
>+        yysize = yysize1;
>+    }
> 
>-  if (*yymsg_alloc < yysize)
>+    if (*yymsg_alloc < yysize)
>     {
>-      *yymsg_alloc = 2 * yysize;
>-      if (! (yysize <= *yymsg_alloc
>-             && *yymsg_alloc <= YYSTACK_ALLOC_MAXIMUM))
>-        *yymsg_alloc = YYSTACK_ALLOC_MAXIMUM;
>-      return 1;
>+        *yymsg_alloc = 2 * yysize;
>+        if (!(yysize <= *yymsg_alloc && *yymsg_alloc <= YYSTACK_ALLOC_MAXIMUM))
>+            *yymsg_alloc = YYSTACK_ALLOC_MAXIMUM;
>+        return 1;
>     }
> 
>-  /* Avoid sprintf, as that infringes on the user's name space.
>-     Don't have undefined behavior even if the translation
>-     produced a string with the wrong number of "%s"s.  */
>-  {
>-    char *yyp = *yymsg;
>-    int yyi = 0;
>-    while ((*yyp = *yyformat) != '\0')
>-      if (*yyp == '%' && yyformat[1] == 's' && yyi < yycount)
>-        {
>-          yyp += yytnamerr (yyp, yyarg[yyi++]);
>-          yyformat += 2;
>-        }
>-      else
>-        {
>-          yyp++;
>-          yyformat++;
>-        }
>-  }
>-  return 0;
>+    /* Avoid sprintf, as that infringes on the user's name space.
>+       Don't have undefined behavior even if the translation
>+       produced a string with the wrong number of "%s"s.  */
>+    {
>+        char *yyp = *yymsg;
>+        int yyi   = 0;
>+        while ((*yyp = *yyformat) != '\0')
>+            if (*yyp == '%' && yyformat[1] == 's' && yyi < yycount)
>+            {
>+                yyp += yytnamerr(yyp, yyarg[yyi++]);
>+                yyformat += 2;
>+            }
>+            else
>+            {
>+                yyp++;
>+                yyformat++;
>+            }
>+    }
>+    return 0;
> }
> #endif /* YYERROR_VERBOSE */
> 
>@@ -1059,39 +945,33 @@ yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg,
> | Release the memory associated to this symbol.  |
> `-----------------------------------------------*/
> 
>-static void
>-yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep, Context *context)
>+static void yydestruct(const char *yymsg, int yytype, YYSTYPE *yyvaluep, Context *context)
> {
>-  YYUSE (yyvaluep);
>-  YYUSE (context);
>-  if (!yymsg)
>-    yymsg = "Deleting";
>-  YY_SYMBOL_PRINT (yymsg, yytype, yyvaluep, yylocationp);
>-
>-  YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
>-  YYUSE (yytype);
>-  YY_IGNORE_MAYBE_UNINITIALIZED_END
>+    YYUSE(yyvaluep);
>+    YYUSE(context);
>+    if (!yymsg)
>+        yymsg = "Deleting";
>+    YY_SYMBOL_PRINT(yymsg, yytype, yyvaluep, yylocationp);
>+
>+    YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
>+    YYUSE(yytype);
>+    YY_IGNORE_MAYBE_UNINITIALIZED_END
> }
> 
>-
>-
>-
> /*----------.
> | yyparse.  |
> `----------*/
> 
>-int
>-yyparse (Context *context)
>+int yyparse(Context *context)
> {
>-/* The lookahead symbol.  */
>-int yychar;
>-
>+    /* The lookahead symbol.  */
>+    int yychar;
> 
>-/* The semantic value of the lookahead symbol.  */
>-/* Default value used for initialization, for pacifying older GCCs
>-   or non-GCC compilers.  */
>-YY_INITIAL_VALUE (static YYSTYPE yyval_default;)
>-YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default);
>+    /* The semantic value of the lookahead symbol.  */
>+    /* Default value used for initialization, for pacifying older GCCs
>+       or non-GCC compilers.  */
>+    YY_INITIAL_VALUE(static YYSTYPE yyval_default;)
>+    YYSTYPE yylval YY_INITIAL_VALUE(= yyval_default);
> 
>     /* Number of syntax errors so far.  */
>     int yynerrs;
>@@ -1119,804 +999,779 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default);
> 
>     YYSIZE_T yystacksize;
> 
>-  int yyn;
>-  int yyresult;
>-  /* Lookahead token as an internal (translated) token number.  */
>-  int yytoken = 0;
>-  /* The variables used to return semantic value and location from the
>-     action routines.  */
>-  YYSTYPE yyval;
>+    int yyn;
>+    int yyresult;
>+    /* Lookahead token as an internal (translated) token number.  */
>+    int yytoken = 0;
>+    /* The variables used to return semantic value and location from the
>+       action routines.  */
>+    YYSTYPE yyval;
> 
> #if YYERROR_VERBOSE
>-  /* Buffer for error messages, and its allocated size.  */
>-  char yymsgbuf[128];
>-  char *yymsg = yymsgbuf;
>-  YYSIZE_T yymsg_alloc = sizeof yymsgbuf;
>+    /* Buffer for error messages, and its allocated size.  */
>+    char yymsgbuf[128];
>+    char *yymsg          = yymsgbuf;
>+    YYSIZE_T yymsg_alloc = sizeof yymsgbuf;
> #endif
> 
>-#define YYPOPSTACK(N)   (yyvsp -= (N), yyssp -= (N))
>+#define YYPOPSTACK(N) (yyvsp -= (N), yyssp -= (N))
> 
>-  /* The number of symbols on the RHS of the reduced rule.
>-     Keep to zero when no symbol should be popped.  */
>-  int yylen = 0;
>+    /* The number of symbols on the RHS of the reduced rule.
>+       Keep to zero when no symbol should be popped.  */
>+    int yylen = 0;
> 
>-  yyssp = yyss = yyssa;
>-  yyvsp = yyvs = yyvsa;
>-  yystacksize = YYINITDEPTH;
>+    yyssp = yyss = yyssa;
>+    yyvsp = yyvs = yyvsa;
>+    yystacksize  = YYINITDEPTH;
> 
>-  YYDPRINTF ((stderr, "Starting parse\n"));
>+    YYDPRINTF((stderr, "Starting parse\n"));
> 
>-  yystate = 0;
>-  yyerrstatus = 0;
>-  yynerrs = 0;
>-  yychar = YYEMPTY; /* Cause a token to be read.  */
>-  goto yysetstate;
>+    yystate     = 0;
>+    yyerrstatus = 0;
>+    yynerrs     = 0;
>+    yychar      = YYEMPTY; /* Cause a token to be read.  */
>+    goto yysetstate;
> 
>-/*------------------------------------------------------------.
>-| yynewstate -- Push a new state, which is found in yystate.  |
>-`------------------------------------------------------------*/
>- yynewstate:
>-  /* In all cases, when you get here, the value and location stacks
>-     have just been pushed.  So pushing a state here evens the stacks.  */
>-  yyssp++;
>+    /*------------------------------------------------------------.
>+    | yynewstate -- Push a new state, which is found in yystate.  |
>+    `------------------------------------------------------------*/
>+yynewstate:
>+    /* In all cases, when you get here, the value and location stacks
>+       have just been pushed.  So pushing a state here evens the stacks.  */
>+    yyssp++;
> 
>- yysetstate:
>-  *yyssp = yystate;
>+yysetstate:
>+    *yyssp = yystate;
> 
>-  if (yyss + yystacksize - 1 <= yyssp)
>+    if (yyss + yystacksize - 1 <= yyssp)
>     {
>-      /* Get the current used size of the three stacks, in elements.  */
>-      YYSIZE_T yysize = yyssp - yyss + 1;
>+        /* Get the current used size of the three stacks, in elements.  */
>+        YYSIZE_T yysize = yyssp - yyss + 1;
> 
> #ifdef yyoverflow
>-      {
>-        /* Give user a chance to reallocate the stack.  Use copies of
>-           these so that the &'s don't force the real ones into
>-           memory.  */
>-        YYSTYPE *yyvs1 = yyvs;
>-        yytype_int16 *yyss1 = yyss;
>-
>-        /* Each stack pointer address is followed by the size of the
>-           data in use in that stack, in bytes.  This used to be a
>-           conditional around just the two extra args, but that might
>-           be undefined if yyoverflow is a macro.  */
>-        yyoverflow (YY_("memory exhausted"),
>-                    &yyss1, yysize * sizeof (*yyssp),
>-                    &yyvs1, yysize * sizeof (*yyvsp),
>-                    &yystacksize);
>-
>-        yyss = yyss1;
>-        yyvs = yyvs1;
>-      }
>+        {
>+            /* Give user a chance to reallocate the stack.  Use copies of
>+               these so that the &'s don't force the real ones into
>+               memory.  */
>+            YYSTYPE *yyvs1      = yyvs;
>+            yytype_int16 *yyss1 = yyss;
>+
>+            /* Each stack pointer address is followed by the size of the
>+               data in use in that stack, in bytes.  This used to be a
>+               conditional around just the two extra args, but that might
>+               be undefined if yyoverflow is a macro.  */
>+            yyoverflow(YY_("memory exhausted"), &yyss1, yysize * sizeof(*yyssp), &yyvs1,
>+                       yysize * sizeof(*yyvsp), &yystacksize);
>+
>+            yyss = yyss1;
>+            yyvs = yyvs1;
>+        }
> #else /* no yyoverflow */
>-# ifndef YYSTACK_RELOCATE
>-      goto yyexhaustedlab;
>-# else
>-      /* Extend the stack our own way.  */
>-      if (YYMAXDEPTH <= yystacksize)
>+#    ifndef YYSTACK_RELOCATE
>         goto yyexhaustedlab;
>-      yystacksize *= 2;
>-      if (YYMAXDEPTH < yystacksize)
>-        yystacksize = YYMAXDEPTH;
>-
>-      {
>-        yytype_int16 *yyss1 = yyss;
>-        union yyalloc *yyptr =
>-          (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize));
>-        if (! yyptr)
>-          goto yyexhaustedlab;
>-        YYSTACK_RELOCATE (yyss_alloc, yyss);
>-        YYSTACK_RELOCATE (yyvs_alloc, yyvs);
>-#  undef YYSTACK_RELOCATE
>-        if (yyss1 != yyssa)
>-          YYSTACK_FREE (yyss1);
>-      }
>-# endif
>+#    else
>+        /* Extend the stack our own way.  */
>+        if (YYMAXDEPTH <= yystacksize)
>+            goto yyexhaustedlab;
>+        yystacksize *= 2;
>+        if (YYMAXDEPTH < yystacksize)
>+            yystacksize = YYMAXDEPTH;
>+
>+        {
>+            yytype_int16 *yyss1  = yyss;
>+            union yyalloc *yyptr = (union yyalloc *)YYSTACK_ALLOC(YYSTACK_BYTES(yystacksize));
>+            if (!yyptr)
>+                goto yyexhaustedlab;
>+            YYSTACK_RELOCATE(yyss_alloc, yyss);
>+            YYSTACK_RELOCATE(yyvs_alloc, yyvs);
>+#        undef YYSTACK_RELOCATE
>+            if (yyss1 != yyssa)
>+                YYSTACK_FREE(yyss1);
>+        }
>+#    endif
> #endif /* no yyoverflow */
> 
>-      yyssp = yyss + yysize - 1;
>-      yyvsp = yyvs + yysize - 1;
>+        yyssp = yyss + yysize - 1;
>+        yyvsp = yyvs + yysize - 1;
> 
>-      YYDPRINTF ((stderr, "Stack size increased to %lu\n",
>-                  (unsigned long int) yystacksize));
>+        YYDPRINTF((stderr, "Stack size increased to %lu\n", (unsigned long int)yystacksize));
> 
>-      if (yyss + yystacksize - 1 <= yyssp)
>-        YYABORT;
>+        if (yyss + yystacksize - 1 <= yyssp)
>+            YYABORT;
>     }
> 
>-  YYDPRINTF ((stderr, "Entering state %d\n", yystate));
>+    YYDPRINTF((stderr, "Entering state %d\n", yystate));
> 
>-  if (yystate == YYFINAL)
>-    YYACCEPT;
>+    if (yystate == YYFINAL)
>+        YYACCEPT;
> 
>-  goto yybackup;
>+    goto yybackup;
> 
> /*-----------.
> | yybackup.  |
> `-----------*/
> yybackup:
> 
>-  /* Do appropriate processing given the current state.  Read a
>-     lookahead token if we need one and don't already have one.  */
>+    /* Do appropriate processing given the current state.  Read a
>+       lookahead token if we need one and don't already have one.  */
> 
>-  /* First try to decide what to do without reference to lookahead token.  */
>-  yyn = yypact[yystate];
>-  if (yypact_value_is_default (yyn))
>-    goto yydefault;
>+    /* First try to decide what to do without reference to lookahead token.  */
>+    yyn = yypact[yystate];
>+    if (yypact_value_is_default(yyn))
>+        goto yydefault;
> 
>-  /* Not known => get a lookahead token if don't already have one.  */
>+    /* Not known => get a lookahead token if don't already have one.  */
> 
>-  /* YYCHAR is either YYEMPTY or YYEOF or a valid lookahead symbol.  */
>-  if (yychar == YYEMPTY)
>+    /* YYCHAR is either YYEMPTY or YYEOF or a valid lookahead symbol.  */
>+    if (yychar == YYEMPTY)
>     {
>-      YYDPRINTF ((stderr, "Reading a token: "));
>-      yychar = yylex (&yylval, context);
>+        YYDPRINTF((stderr, "Reading a token: "));
>+        yychar = yylex(&yylval, context);
>     }
> 
>-  if (yychar <= YYEOF)
>+    if (yychar <= YYEOF)
>     {
>-      yychar = yytoken = YYEOF;
>-      YYDPRINTF ((stderr, "Now at end of input.\n"));
>+        yychar = yytoken = YYEOF;
>+        YYDPRINTF((stderr, "Now at end of input.\n"));
>     }
>-  else
>+    else
>     {
>-      yytoken = YYTRANSLATE (yychar);
>-      YY_SYMBOL_PRINT ("Next token is", yytoken, &yylval, &yylloc);
>+        yytoken = YYTRANSLATE(yychar);
>+        YY_SYMBOL_PRINT("Next token is", yytoken, &yylval, &yylloc);
>     }
> 
>-  /* If the proper action on seeing token YYTOKEN is to reduce or to
>-     detect an error, take that action.  */
>-  yyn += yytoken;
>-  if (yyn < 0 || YYLAST < yyn || yycheck[yyn] != yytoken)
>-    goto yydefault;
>-  yyn = yytable[yyn];
>-  if (yyn <= 0)
>+    /* If the proper action on seeing token YYTOKEN is to reduce or to
>+       detect an error, take that action.  */
>+    yyn += yytoken;
>+    if (yyn < 0 || YYLAST < yyn || yycheck[yyn] != yytoken)
>+        goto yydefault;
>+    yyn = yytable[yyn];
>+    if (yyn <= 0)
>     {
>-      if (yytable_value_is_error (yyn))
>-        goto yyerrlab;
>-      yyn = -yyn;
>-      goto yyreduce;
>+        if (yytable_value_is_error(yyn))
>+            goto yyerrlab;
>+        yyn = -yyn;
>+        goto yyreduce;
>     }
> 
>-  /* Count tokens shifted since error; after three, turn off error
>-     status.  */
>-  if (yyerrstatus)
>-    yyerrstatus--;
>-
>-  /* Shift the lookahead token.  */
>-  YY_SYMBOL_PRINT ("Shifting", yytoken, &yylval, &yylloc);
>+    /* Count tokens shifted since error; after three, turn off error
>+       status.  */
>+    if (yyerrstatus)
>+        yyerrstatus--;
> 
>-  /* Discard the shifted token.  */
>-  yychar = YYEMPTY;
>+    /* Shift the lookahead token.  */
>+    YY_SYMBOL_PRINT("Shifting", yytoken, &yylval, &yylloc);
> 
>-  yystate = yyn;
>-  YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
>-  *++yyvsp = yylval;
>-  YY_IGNORE_MAYBE_UNINITIALIZED_END
>+    /* Discard the shifted token.  */
>+    yychar = YYEMPTY;
> 
>-  goto yynewstate;
>+    yystate = yyn;
>+    YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
>+    *++yyvsp = yylval;
>+    YY_IGNORE_MAYBE_UNINITIALIZED_END
> 
>+    goto yynewstate;
> 
> /*-----------------------------------------------------------.
> | yydefault -- do the default action for the current state.  |
> `-----------------------------------------------------------*/
> yydefault:
>-  yyn = yydefact[yystate];
>-  if (yyn == 0)
>-    goto yyerrlab;
>-  goto yyreduce;
>-
>+    yyn = yydefact[yystate];
>+    if (yyn == 0)
>+        goto yyerrlab;
>+    goto yyreduce;
> 
> /*-----------------------------.
> | yyreduce -- Do a reduction.  |
> `-----------------------------*/
> yyreduce:
>-  /* yyn is the number of a rule to reduce with.  */
>-  yylen = yyr2[yyn];
>+    /* yyn is the number of a rule to reduce with.  */
>+    yylen = yyr2[yyn];
> 
>-  /* If YYLEN is nonzero, implement the default value of the action:
>-     '$$ = $1'.
>+    /* If YYLEN is nonzero, implement the default value of the action:
>+       '$$ = $1'.
> 
>-     Otherwise, the following line sets YYVAL to garbage.
>-     This behavior is undocumented and Bison
>-     users should not rely upon it.  Assigning to YYVAL
>-     unconditionally makes the parser a bit smaller, and it avoids a
>-     GCC warning that YYVAL may be used uninitialized.  */
>-  yyval = yyvsp[1-yylen];
>+       Otherwise, the following line sets YYVAL to garbage.
>+       This behavior is undocumented and Bison
>+       users should not rely upon it.  Assigning to YYVAL
>+       unconditionally makes the parser a bit smaller, and it avoids a
>+       GCC warning that YYVAL may be used uninitialized.  */
>+    yyval = yyvsp[1 - yylen];
> 
>-
>-  YY_REDUCE_PRINT (yyn);
>-  switch (yyn)
>+    YY_REDUCE_PRINT(yyn);
>+    switch (yyn)
>     {
>         case 2:
> 
>-    {
>-        *(context->result) = static_cast<int>((yyvsp[0]));
>-        YYACCEPT;
>-    }
>+        {
>+            *(context->result) = static_cast<int>((yyvsp[0]));
>+            YYACCEPT;
>+        }
> 
>-    break;
>+        break;
> 
>-  case 4:
>+        case 4:
> 
>-    {
>-        if (!context->isIgnoringErrors())
>         {
>-            // This rule should be applied right after the token is lexed, so we can
>-            // refer to context->token in the error message.
>-            context->diagnostics->report(context->errorSettings.unexpectedIdentifier,
>-                                         context->token->location, context->token->text);
>-            *(context->valid) = false;
>+            if (!context->isIgnoringErrors())
>+            {
>+                // This rule should be applied right after the token is lexed, so we can
>+                // refer to context->token in the error message.
>+                context->diagnostics->report(context->errorSettings.unexpectedIdentifier,
>+                                             context->token->location, context->token->text);
>+                *(context->valid) = false;
>+            }
>+            (yyval) = (yyvsp[0]);
>         }
>-        (yyval) = (yyvsp[0]);
>-    }
> 
>-    break;
>+        break;
> 
>-  case 5:
>+        case 5:
> 
>-    {
>-        if ((yyvsp[-1]) != 0)
>         {
>-            // Ignore errors in the short-circuited part of the expression.
>-            // ESSL3.00 section 3.4:
>-            // If an operand is not evaluated, the presence of undefined identifiers
>-            // in the operand will not cause an error.
>-            // Unevaluated division by zero should not cause an error either.
>-            context->startIgnoreErrors();
>+            if ((yyvsp[-1]) != 0)
>+            {
>+                // Ignore errors in the short-circuited part of the expression.
>+                // ESSL3.00 section 3.4:
>+                // If an operand is not evaluated, the presence of undefined identifiers
>+                // in the operand will not cause an error.
>+                // Unevaluated division by zero should not cause an error either.
>+                context->startIgnoreErrors();
>+            }
>         }
>-    }
> 
>-    break;
>+        break;
> 
>-  case 6:
>+        case 6:
> 
>-    {
>-        if ((yyvsp[-3]) != 0)
>-        {
>-            context->endIgnoreErrors();
>-            (yyval) = static_cast<YYSTYPE>(1);
>-        }
>-        else
>         {
>-            (yyval) = (yyvsp[-3]) || (yyvsp[0]);
>+            if ((yyvsp[-3]) != 0)
>+            {
>+                context->endIgnoreErrors();
>+                (yyval) = static_cast<YYSTYPE>(1);
>+            }
>+            else
>+            {
>+                (yyval) = (yyvsp[-3]) || (yyvsp[0]);
>+            }
>         }
>-    }
> 
>-    break;
>+        break;
> 
>-  case 7:
>+        case 7:
> 
>-    {
>-        if ((yyvsp[-1]) == 0)
>         {
>-            // Ignore errors in the short-circuited part of the expression.
>-            // ESSL3.00 section 3.4:
>-            // If an operand is not evaluated, the presence of undefined identifiers
>-            // in the operand will not cause an error.
>-            // Unevaluated division by zero should not cause an error either.
>-            context->startIgnoreErrors();
>+            if ((yyvsp[-1]) == 0)
>+            {
>+                // Ignore errors in the short-circuited part of the expression.
>+                // ESSL3.00 section 3.4:
>+                // If an operand is not evaluated, the presence of undefined identifiers
>+                // in the operand will not cause an error.
>+                // Unevaluated division by zero should not cause an error either.
>+                context->startIgnoreErrors();
>+            }
>         }
>-    }
> 
>-    break;
>+        break;
> 
>-  case 8:
>+        case 8:
> 
>-    {
>-        if ((yyvsp[-3]) == 0)
>         {
>-            context->endIgnoreErrors();
>-            (yyval) = static_cast<YYSTYPE>(0);
>-        }
>-        else
>-        {
>-            (yyval) = (yyvsp[-3]) && (yyvsp[0]);
>+            if ((yyvsp[-3]) == 0)
>+            {
>+                context->endIgnoreErrors();
>+                (yyval) = static_cast<YYSTYPE>(0);
>+            }
>+            else
>+            {
>+                (yyval) = (yyvsp[-3]) && (yyvsp[0]);
>+            }
>         }
>-    }
> 
>-    break;
>+        break;
> 
>-  case 9:
>+        case 9:
> 
>-    {
>-        (yyval) = (yyvsp[-2]) | (yyvsp[0]);
>-    }
>+        {
>+            (yyval) = (yyvsp[-2]) | (yyvsp[0]);
>+        }
> 
>-    break;
>+        break;
> 
>-  case 10:
>+        case 10:
> 
>-    {
>-        (yyval) = (yyvsp[-2]) ^ (yyvsp[0]);
>-    }
>+        {
>+            (yyval) = (yyvsp[-2]) ^ (yyvsp[0]);
>+        }
> 
>-    break;
>+        break;
> 
>-  case 11:
>+        case 11:
> 
>-    {
>-        (yyval) = (yyvsp[-2]) & (yyvsp[0]);
>-    }
>+        {
>+            (yyval) = (yyvsp[-2]) & (yyvsp[0]);
>+        }
> 
>-    break;
>+        break;
> 
>-  case 12:
>+        case 12:
> 
>-    {
>-        (yyval) = (yyvsp[-2]) != (yyvsp[0]);
>-    }
>+        {
>+            (yyval) = (yyvsp[-2]) != (yyvsp[0]);
>+        }
> 
>-    break;
>+        break;
> 
>-  case 13:
>+        case 13:
> 
>-    {
>-        (yyval) = (yyvsp[-2]) == (yyvsp[0]);
>-    }
>+        {
>+            (yyval) = (yyvsp[-2]) == (yyvsp[0]);
>+        }
> 
>-    break;
>+        break;
> 
>-  case 14:
>+        case 14:
> 
>-    {
>-        (yyval) = (yyvsp[-2]) >= (yyvsp[0]);
>-    }
>+        {
>+            (yyval) = (yyvsp[-2]) >= (yyvsp[0]);
>+        }
> 
>-    break;
>+        break;
> 
>-  case 15:
>+        case 15:
> 
>-    {
>-        (yyval) = (yyvsp[-2]) <= (yyvsp[0]);
>-    }
>+        {
>+            (yyval) = (yyvsp[-2]) <= (yyvsp[0]);
>+        }
> 
>-    break;
>+        break;
> 
>-  case 16:
>+        case 16:
> 
>-    {
>-        (yyval) = (yyvsp[-2]) > (yyvsp[0]);
>-    }
>+        {
>+            (yyval) = (yyvsp[-2]) > (yyvsp[0]);
>+        }
> 
>-    break;
>+        break;
> 
>-  case 17:
>+        case 17:
> 
>-    {
>-        (yyval) = (yyvsp[-2]) < (yyvsp[0]);
>-    }
>+        {
>+            (yyval) = (yyvsp[-2]) < (yyvsp[0]);
>+        }
> 
>-    break;
>+        break;
> 
>-  case 18:
>+        case 18:
> 
>-    {
>-        if ((yyvsp[0]) < 0 || (yyvsp[0]) > 31)
>         {
>-            if (!context->isIgnoringErrors())
>+            if ((yyvsp[0]) < 0 || (yyvsp[0]) > 31)
>             {
>-                std::ostringstream stream;
>-                stream << (yyvsp[-2]) << " >> " << (yyvsp[0]);
>-                std::string text = stream.str();
>-                context->diagnostics->report(pp::Diagnostics::PP_UNDEFINED_SHIFT,
>-                                             context->token->location,
>-                                             text.c_str());
>-                *(context->valid) = false;
>+                if (!context->isIgnoringErrors())
>+                {
>+                    std::ostringstream stream;
>+                    stream << (yyvsp[-2]) << " >> " << (yyvsp[0]);
>+                    std::string text = stream.str();
>+                    context->diagnostics->report(angle::pp::Diagnostics::PP_UNDEFINED_SHIFT,
>+                                                 context->token->location, text.c_str());
>+                    *(context->valid) = false;
>+                }
>+                (yyval) = static_cast<YYSTYPE>(0);
>+            }
>+            else if ((yyvsp[-2]) < 0)
>+            {
>+                // Logical shift right.
>+                (yyval) =
>+                    static_cast<YYSTYPE>(static_cast<UNSIGNED_TYPE>((yyvsp[-2])) >> (yyvsp[0]));
>+            }
>+            else
>+            {
>+                (yyval) = (yyvsp[-2]) >> (yyvsp[0]);
>             }
>-            (yyval) = static_cast<YYSTYPE>(0);
>-        }
>-        else if ((yyvsp[-2]) < 0)
>-        {
>-            // Logical shift right.
>-            (yyval) = static_cast<YYSTYPE>(static_cast<UNSIGNED_TYPE>((yyvsp[-2])) >> (yyvsp[0]));
>-        }
>-        else
>-        {
>-            (yyval) = (yyvsp[-2]) >> (yyvsp[0]);
>         }
>-    }
> 
>-    break;
>+        break;
> 
>-  case 19:
>+        case 19:
> 
>-    {
>-        if ((yyvsp[0]) < 0 || (yyvsp[0]) > 31)
>         {
>-            if (!context->isIgnoringErrors())
>+            if ((yyvsp[0]) < 0 || (yyvsp[0]) > 31)
>             {
>-                std::ostringstream stream;
>-                stream << (yyvsp[-2]) << " << " << (yyvsp[0]);
>-                std::string text = stream.str();
>-                context->diagnostics->report(pp::Diagnostics::PP_UNDEFINED_SHIFT,
>-                                             context->token->location,
>-                                             text.c_str());
>-                *(context->valid) = false;
>+                if (!context->isIgnoringErrors())
>+                {
>+                    std::ostringstream stream;
>+                    stream << (yyvsp[-2]) << " << " << (yyvsp[0]);
>+                    std::string text = stream.str();
>+                    context->diagnostics->report(angle::pp::Diagnostics::PP_UNDEFINED_SHIFT,
>+                                                 context->token->location, text.c_str());
>+                    *(context->valid) = false;
>+                }
>+                (yyval) = static_cast<YYSTYPE>(0);
>+            }
>+            else
>+            {
>+                // Logical shift left. Casting to unsigned is needed to ensure there's no signed
>+                // integer overflow, which some tools treat as an error.
>+                (yyval) =
>+                    static_cast<YYSTYPE>(static_cast<UNSIGNED_TYPE>((yyvsp[-2])) << (yyvsp[0]));
>             }
>-            (yyval) = static_cast<YYSTYPE>(0);
>-        }
>-        else
>-        {
>-            // Logical shift left. Casting to unsigned is needed to ensure there's no signed integer
>-            // overflow, which some tools treat as an error.
>-            (yyval) = static_cast<YYSTYPE>(static_cast<UNSIGNED_TYPE>((yyvsp[-2])) << (yyvsp[0]));
>         }
>-    }
> 
>-    break;
>+        break;
> 
>-  case 20:
>+        case 20:
> 
>-    {
>-        (yyval) = gl::WrappingDiff<YYSTYPE>((yyvsp[-2]), (yyvsp[0]));
>-    }
>+        {
>+            (yyval) = gl::WrappingDiff<YYSTYPE>((yyvsp[-2]), (yyvsp[0]));
>+        }
> 
>-    break;
>+        break;
> 
>-  case 21:
>+        case 21:
> 
>-    {
>-        (yyval) = gl::WrappingSum<YYSTYPE>((yyvsp[-2]), (yyvsp[0]));
>-    }
>+        {
>+            (yyval) = gl::WrappingSum<YYSTYPE>((yyvsp[-2]), (yyvsp[0]));
>+        }
> 
>-    break;
>+        break;
> 
>-  case 22:
>+        case 22:
> 
>-    {
>-        if ((yyvsp[0]) == 0)
>         {
>-            if (!context->isIgnoringErrors())
>+            if ((yyvsp[0]) == 0)
>             {
>-                std::ostringstream stream;
>-                stream << (yyvsp[-2]) << " % " << (yyvsp[0]);
>-                std::string text = stream.str();
>-                context->diagnostics->report(pp::Diagnostics::PP_DIVISION_BY_ZERO,
>-                                             context->token->location,
>-                                             text.c_str());
>-                *(context->valid) = false;
>+                if (!context->isIgnoringErrors())
>+                {
>+                    std::ostringstream stream;
>+                    stream << (yyvsp[-2]) << " % " << (yyvsp[0]);
>+                    std::string text = stream.str();
>+                    context->diagnostics->report(angle::pp::Diagnostics::PP_DIVISION_BY_ZERO,
>+                                                 context->token->location, text.c_str());
>+                    *(context->valid) = false;
>+                }
>+                (yyval) = static_cast<YYSTYPE>(0);
>+            }
>+            else if (((yyvsp[-2]) == std::numeric_limits<YYSTYPE>::min()) && ((yyvsp[0]) == -1))
>+            {
>+                // Check for the special case where the minimum representable number is
>+                // divided by -1. If left alone this has undefined results.
>+                (yyval) = 0;
>+            }
>+            else
>+            {
>+                (yyval) = (yyvsp[-2]) % (yyvsp[0]);
>             }
>-            (yyval) = static_cast<YYSTYPE>(0);
>-        }
>-        else if (((yyvsp[-2]) == std::numeric_limits<YYSTYPE>::min()) && ((yyvsp[0]) == -1))
>-        {
>-            // Check for the special case where the minimum representable number is
>-            // divided by -1. If left alone this has undefined results.
>-            (yyval) = 0;
>-        }
>-        else
>-        {
>-            (yyval) = (yyvsp[-2]) % (yyvsp[0]);
>         }
>-    }
> 
>-    break;
>+        break;
> 
>-  case 23:
>+        case 23:
> 
>-    {
>-        if ((yyvsp[0]) == 0)
>         {
>-            if (!context->isIgnoringErrors())
>+            if ((yyvsp[0]) == 0)
>             {
>-                std::ostringstream stream;
>-                stream << (yyvsp[-2]) << " / " << (yyvsp[0]);
>-                std::string text = stream.str();
>-                context->diagnostics->report(pp::Diagnostics::PP_DIVISION_BY_ZERO,
>-                                            context->token->location,
>-                                            text.c_str());
>-                *(context->valid) = false;
>+                if (!context->isIgnoringErrors())
>+                {
>+                    std::ostringstream stream;
>+                    stream << (yyvsp[-2]) << " / " << (yyvsp[0]);
>+                    std::string text = stream.str();
>+                    context->diagnostics->report(angle::pp::Diagnostics::PP_DIVISION_BY_ZERO,
>+                                                 context->token->location, text.c_str());
>+                    *(context->valid) = false;
>+                }
>+                (yyval) = static_cast<YYSTYPE>(0);
>+            }
>+            else if (((yyvsp[-2]) == std::numeric_limits<YYSTYPE>::min()) && ((yyvsp[0]) == -1))
>+            {
>+                // Check for the special case where the minimum representable number is
>+                // divided by -1. If left alone this leads to integer overflow in C++, which
>+                // has undefined results.
>+                (yyval) = std::numeric_limits<YYSTYPE>::max();
>+            }
>+            else
>+            {
>+                (yyval) = (yyvsp[-2]) / (yyvsp[0]);
>             }
>-            (yyval) = static_cast<YYSTYPE>(0);
>-        }
>-        else if (((yyvsp[-2]) == std::numeric_limits<YYSTYPE>::min()) && ((yyvsp[0]) == -1))
>-        {
>-            // Check for the special case where the minimum representable number is
>-            // divided by -1. If left alone this leads to integer overflow in C++, which
>-            // has undefined results.
>-            (yyval) = std::numeric_limits<YYSTYPE>::max();
>-        }
>-        else
>-        {
>-            (yyval) = (yyvsp[-2]) / (yyvsp[0]);
>         }
>-    }
> 
>-    break;
>+        break;
> 
>-  case 24:
>+        case 24:
> 
>-    {
>-        (yyval) = gl::WrappingMul((yyvsp[-2]), (yyvsp[0]));
>-    }
>+        {
>+            (yyval) = gl::WrappingMul((yyvsp[-2]), (yyvsp[0]));
>+        }
> 
>-    break;
>+        break;
> 
>-  case 25:
>+        case 25:
> 
>-    {
>-        (yyval) = ! (yyvsp[0]);
>-    }
>+        {
>+            (yyval) = !(yyvsp[0]);
>+        }
> 
>-    break;
>+        break;
> 
>-  case 26:
>+        case 26:
> 
>-    {
>-        (yyval) = ~ (yyvsp[0]);
>-    }
>+        {
>+            (yyval) = ~(yyvsp[0]);
>+        }
> 
>-    break;
>+        break;
> 
>-  case 27:
>+        case 27:
> 
>-    {
>-        // Check for negation of minimum representable integer to prevent undefined signed int
>-        // overflow.
>-        if ((yyvsp[0]) == std::numeric_limits<YYSTYPE>::min())
>-        {
>-            (yyval) = std::numeric_limits<YYSTYPE>::min();
>-        }
>-        else
>         {
>-            (yyval) = -(yyvsp[0]);
>+            // Check for negation of minimum representable integer to prevent undefined signed int
>+            // overflow.
>+            if ((yyvsp[0]) == std::numeric_limits<YYSTYPE>::min())
>+            {
>+                (yyval) = std::numeric_limits<YYSTYPE>::min();
>+            }
>+            else
>+            {
>+                (yyval) = -(yyvsp[0]);
>+            }
>         }
>-    }
>-
>-    break;
>-
>-  case 28:
> 
>-    {
>-        (yyval) = + (yyvsp[0]);
>-    }
>+        break;
> 
>-    break;
>+        case 28:
> 
>-  case 29:
>+        {
>+            (yyval) = +(yyvsp[0]);
>+        }
> 
>-    {
>-        (yyval) = (yyvsp[-1]);
>-    }
>+        break;
> 
>-    break;
>+        case 29:
> 
>+        {
>+            (yyval) = (yyvsp[-1]);
>+        }
> 
>+        break;
> 
>-      default: break;
>+        default:
>+            break;
>     }
>-  /* User semantic actions sometimes alter yychar, and that requires
>-     that yytoken be updated with the new translation.  We take the
>-     approach of translating immediately before every use of yytoken.
>-     One alternative is translating here after every semantic action,
>-     but that translation would be missed if the semantic action invokes
>-     YYABORT, YYACCEPT, or YYERROR immediately after altering yychar or
>-     if it invokes YYBACKUP.  In the case of YYABORT or YYACCEPT, an
>-     incorrect destructor might then be invoked immediately.  In the
>-     case of YYERROR or YYBACKUP, subsequent parser actions might lead
>-     to an incorrect destructor call or verbose syntax error message
>-     before the lookahead is translated.  */
>-  YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);
>-
>-  YYPOPSTACK (yylen);
>-  yylen = 0;
>-  YY_STACK_PRINT (yyss, yyssp);
>-
>-  *++yyvsp = yyval;
>-
>-  /* Now 'shift' the result of the reduction.  Determine what state
>-     that goes to, based on the state we popped back to and the rule
>-     number reduced by.  */
>-
>-  yyn = yyr1[yyn];
>-
>-  yystate = yypgoto[yyn - YYNTOKENS] + *yyssp;
>-  if (0 <= yystate && yystate <= YYLAST && yycheck[yystate] == *yyssp)
>-    yystate = yytable[yystate];
>-  else
>-    yystate = yydefgoto[yyn - YYNTOKENS];
>-
>-  goto yynewstate;
>-
>+    /* User semantic actions sometimes alter yychar, and that requires
>+       that yytoken be updated with the new translation.  We take the
>+       approach of translating immediately before every use of yytoken.
>+       One alternative is translating here after every semantic action,
>+       but that translation would be missed if the semantic action invokes
>+       YYABORT, YYACCEPT, or YYERROR immediately after altering yychar or
>+       if it invokes YYBACKUP.  In the case of YYABORT or YYACCEPT, an
>+       incorrect destructor might then be invoked immediately.  In the
>+       case of YYERROR or YYBACKUP, subsequent parser actions might lead
>+       to an incorrect destructor call or verbose syntax error message
>+       before the lookahead is translated.  */
>+    YY_SYMBOL_PRINT("-> $$ =", yyr1[yyn], &yyval, &yyloc);
>+
>+    YYPOPSTACK(yylen);
>+    yylen = 0;
>+    YY_STACK_PRINT(yyss, yyssp);
>+
>+    *++yyvsp = yyval;
>+
>+    /* Now 'shift' the result of the reduction.  Determine what state
>+       that goes to, based on the state we popped back to and the rule
>+       number reduced by.  */
>+
>+    yyn = yyr1[yyn];
>+
>+    yystate = yypgoto[yyn - YYNTOKENS] + *yyssp;
>+    if (0 <= yystate && yystate <= YYLAST && yycheck[yystate] == *yyssp)
>+        yystate = yytable[yystate];
>+    else
>+        yystate = yydefgoto[yyn - YYNTOKENS];
>+
>+    goto yynewstate;
> 
> /*--------------------------------------.
> | yyerrlab -- here on detecting error.  |
> `--------------------------------------*/
> yyerrlab:
>-  /* Make sure we have latest lookahead translation.  See comments at
>-     user semantic actions for why this is necessary.  */
>-  yytoken = yychar == YYEMPTY ? YYEMPTY : YYTRANSLATE (yychar);
>+    /* Make sure we have latest lookahead translation.  See comments at
>+       user semantic actions for why this is necessary.  */
>+    yytoken = yychar == YYEMPTY ? YYEMPTY : YYTRANSLATE(yychar);
> 
>-  /* If not already recovering from an error, report this error.  */
>-  if (!yyerrstatus)
>+    /* If not already recovering from an error, report this error.  */
>+    if (!yyerrstatus)
>     {
>-      ++yynerrs;
>-#if ! YYERROR_VERBOSE
>-      yyerror (context, YY_("syntax error"));
>+        ++yynerrs;
>+#if !YYERROR_VERBOSE
>+        yyerror(context, YY_("syntax error"));
> #else
>-# define YYSYNTAX_ERROR yysyntax_error (&yymsg_alloc, &yymsg, \
>-                                        yyssp, yytoken)
>-      {
>-        char const *yymsgp = YY_("syntax error");
>-        int yysyntax_error_status;
>-        yysyntax_error_status = YYSYNTAX_ERROR;
>-        if (yysyntax_error_status == 0)
>-          yymsgp = yymsg;
>-        else if (yysyntax_error_status == 1)
>-          {
>-            if (yymsg != yymsgbuf)
>-              YYSTACK_FREE (yymsg);
>-            yymsg = (char *) YYSTACK_ALLOC (yymsg_alloc);
>-            if (!yymsg)
>-              {
>-                yymsg = yymsgbuf;
>-                yymsg_alloc = sizeof yymsgbuf;
>-                yysyntax_error_status = 2;
>-              }
>-            else
>-              {
>-                yysyntax_error_status = YYSYNTAX_ERROR;
>+#    define YYSYNTAX_ERROR yysyntax_error(&yymsg_alloc, &yymsg, yyssp, yytoken)
>+        {
>+            char const *yymsgp = YY_("syntax error");
>+            int yysyntax_error_status;
>+            yysyntax_error_status = YYSYNTAX_ERROR;
>+            if (yysyntax_error_status == 0)
>                 yymsgp = yymsg;
>-              }
>-          }
>-        yyerror (context, yymsgp);
>-        if (yysyntax_error_status == 2)
>-          goto yyexhaustedlab;
>-      }
>-# undef YYSYNTAX_ERROR
>+            else if (yysyntax_error_status == 1)
>+            {
>+                if (yymsg != yymsgbuf)
>+                    YYSTACK_FREE(yymsg);
>+                yymsg = (char *)YYSTACK_ALLOC(yymsg_alloc);
>+                if (!yymsg)
>+                {
>+                    yymsg                 = yymsgbuf;
>+                    yymsg_alloc           = sizeof yymsgbuf;
>+                    yysyntax_error_status = 2;
>+                }
>+                else
>+                {
>+                    yysyntax_error_status = YYSYNTAX_ERROR;
>+                    yymsgp                = yymsg;
>+                }
>+            }
>+            yyerror(context, yymsgp);
>+            if (yysyntax_error_status == 2)
>+                goto yyexhaustedlab;
>+        }
>+#    undef YYSYNTAX_ERROR
> #endif
>     }
> 
>-
>-
>-  if (yyerrstatus == 3)
>+    if (yyerrstatus == 3)
>     {
>-      /* If just tried and failed to reuse lookahead token after an
>-         error, discard it.  */
>+        /* If just tried and failed to reuse lookahead token after an
>+           error, discard it.  */
> 
>-      if (yychar <= YYEOF)
>+        if (yychar <= YYEOF)
>         {
>-          /* Return failure if at end of input.  */
>-          if (yychar == YYEOF)
>-            YYABORT;
>+            /* Return failure if at end of input.  */
>+            if (yychar == YYEOF)
>+                YYABORT;
>         }
>-      else
>+        else
>         {
>-          yydestruct ("Error: discarding",
>-                      yytoken, &yylval, context);
>-          yychar = YYEMPTY;
>+            yydestruct("Error: discarding", yytoken, &yylval, context);
>+            yychar = YYEMPTY;
>         }
>     }
> 
>-  /* Else will try to reuse lookahead token after shifting the error
>-     token.  */
>-  goto yyerrlab1;
>-
>+    /* Else will try to reuse lookahead token after shifting the error
>+       token.  */
>+    goto yyerrlab1;
> 
> /*---------------------------------------------------.
> | yyerrorlab -- error raised explicitly by YYERROR.  |
> `---------------------------------------------------*/
> yyerrorlab:
> 
>-  /* Pacify compilers like GCC when the user code never invokes
>-     YYERROR and the label yyerrorlab therefore never appears in user
>-     code.  */
>-  if (/*CONSTCOND*/ 0)
>-     goto yyerrorlab;
>-
>-  /* Do not reclaim the symbols of the rule whose action triggered
>-     this YYERROR.  */
>-  YYPOPSTACK (yylen);
>-  yylen = 0;
>-  YY_STACK_PRINT (yyss, yyssp);
>-  yystate = *yyssp;
>-  goto yyerrlab1;
>+    /* Pacify compilers like GCC when the user code never invokes
>+       YYERROR and the label yyerrorlab therefore never appears in user
>+       code.  */
>+    if (/*CONSTCOND*/ 0)
>+        goto yyerrorlab;
> 
>+    /* Do not reclaim the symbols of the rule whose action triggered
>+       this YYERROR.  */
>+    YYPOPSTACK(yylen);
>+    yylen = 0;
>+    YY_STACK_PRINT(yyss, yyssp);
>+    yystate = *yyssp;
>+    goto yyerrlab1;
> 
> /*-------------------------------------------------------------.
> | yyerrlab1 -- common code for both syntax error and YYERROR.  |
> `-------------------------------------------------------------*/
> yyerrlab1:
>-  yyerrstatus = 3;      /* Each real token shifted decrements this.  */
>+    yyerrstatus = 3; /* Each real token shifted decrements this.  */
> 
>-  for (;;)
>+    for (;;)
>     {
>-      yyn = yypact[yystate];
>-      if (!yypact_value_is_default (yyn))
>+        yyn = yypact[yystate];
>+        if (!yypact_value_is_default(yyn))
>         {
>-          yyn += YYTERROR;
>-          if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR)
>+            yyn += YYTERROR;
>+            if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR)
>             {
>-              yyn = yytable[yyn];
>-              if (0 < yyn)
>-                break;
>+                yyn = yytable[yyn];
>+                if (0 < yyn)
>+                    break;
>             }
>         }
> 
>-      /* Pop the current state because it cannot handle the error token.  */
>-      if (yyssp == yyss)
>-        YYABORT;
>-
>+        /* Pop the current state because it cannot handle the error token.  */
>+        if (yyssp == yyss)
>+            YYABORT;
> 
>-      yydestruct ("Error: popping",
>-                  yystos[yystate], yyvsp, context);
>-      YYPOPSTACK (1);
>-      yystate = *yyssp;
>-      YY_STACK_PRINT (yyss, yyssp);
>+        yydestruct("Error: popping", yystos[yystate], yyvsp, context);
>+        YYPOPSTACK(1);
>+        yystate = *yyssp;
>+        YY_STACK_PRINT(yyss, yyssp);
>     }
> 
>-  YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
>-  *++yyvsp = yylval;
>-  YY_IGNORE_MAYBE_UNINITIALIZED_END
>-
>+    YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
>+    *++yyvsp = yylval;
>+    YY_IGNORE_MAYBE_UNINITIALIZED_END
> 
>-  /* Shift the error token.  */
>-  YY_SYMBOL_PRINT ("Shifting", yystos[yyn], yyvsp, yylsp);
>-
>-  yystate = yyn;
>-  goto yynewstate;
>+    /* Shift the error token.  */
>+    YY_SYMBOL_PRINT("Shifting", yystos[yyn], yyvsp, yylsp);
> 
>+    yystate = yyn;
>+    goto yynewstate;
> 
> /*-------------------------------------.
> | yyacceptlab -- YYACCEPT comes here.  |
> `-------------------------------------*/
> yyacceptlab:
>-  yyresult = 0;
>-  goto yyreturn;
>+    yyresult = 0;
>+    goto yyreturn;
> 
> /*-----------------------------------.
> | yyabortlab -- YYABORT comes here.  |
> `-----------------------------------*/
> yyabortlab:
>-  yyresult = 1;
>-  goto yyreturn;
>+    yyresult = 1;
>+    goto yyreturn;
> 
> #if !defined yyoverflow || YYERROR_VERBOSE
> /*-------------------------------------------------.
> | yyexhaustedlab -- memory exhaustion comes here.  |
> `-------------------------------------------------*/
> yyexhaustedlab:
>-  yyerror (context, YY_("memory exhausted"));
>-  yyresult = 2;
>-  /* Fall through.  */
>+    yyerror(context, YY_("memory exhausted"));
>+    yyresult = 2;
>+    /* Fall through.  */
> #endif
> 
> yyreturn:
>-  if (yychar != YYEMPTY)
>+    if (yychar != YYEMPTY)
>     {
>-      /* Make sure we have latest lookahead translation.  See comments at
>-         user semantic actions for why this is necessary.  */
>-      yytoken = YYTRANSLATE (yychar);
>-      yydestruct ("Cleanup: discarding lookahead",
>-                  yytoken, &yylval, context);
>+        /* Make sure we have latest lookahead translation.  See comments at
>+           user semantic actions for why this is necessary.  */
>+        yytoken = YYTRANSLATE(yychar);
>+        yydestruct("Cleanup: discarding lookahead", yytoken, &yylval, context);
>     }
>-  /* Do not reclaim the symbols of the rule whose action triggered
>-     this YYABORT or YYACCEPT.  */
>-  YYPOPSTACK (yylen);
>-  YY_STACK_PRINT (yyss, yyssp);
>-  while (yyssp != yyss)
>+    /* Do not reclaim the symbols of the rule whose action triggered
>+       this YYABORT or YYACCEPT.  */
>+    YYPOPSTACK(yylen);
>+    YY_STACK_PRINT(yyss, yyssp);
>+    while (yyssp != yyss)
>     {
>-      yydestruct ("Cleanup: popping",
>-                  yystos[*yyssp], yyvsp, context);
>-      YYPOPSTACK (1);
>+        yydestruct("Cleanup: popping", yystos[*yyssp], yyvsp, context);
>+        YYPOPSTACK(1);
>     }
> #ifndef yyoverflow
>-  if (yyss != yyssa)
>-    YYSTACK_FREE (yyss);
>+    if (yyss != yyssa)
>+        YYSTACK_FREE(yyss);
> #endif
> #if YYERROR_VERBOSE
>-  if (yymsg != yymsgbuf)
>-    YYSTACK_FREE (yymsg);
>+    if (yymsg != yymsgbuf)
>+        YYSTACK_FREE(yymsg);
> #endif
>-  return yyresult;
>+    return yyresult;
> }
> 
>-
>-
> int yylex(YYSTYPE *lvalp, Context *context)
> {
>-    pp::Token *token = context->token;
>+    angle::pp::Token *token = context->token;
>     if (!context->parsePresetToken)
>     {
>         context->lexer->lex(token);
>@@ -1927,67 +1782,69 @@ int yylex(YYSTYPE *lvalp, Context *context)
> 
>     switch (token->type)
>     {
>-      case pp::Token::CONST_INT: {
>-        unsigned int val = 0;
>-        int testVal = 0;
>-        if (!token->uValue(&val) || (!token->iValue(&testVal) &&
>-                                     context->errorSettings.integerLiteralsMustFit32BitSignedRange))
>+        case angle::pp::Token::CONST_INT:
>         {
>-            context->diagnostics->report(pp::Diagnostics::PP_INTEGER_OVERFLOW,
>-                                         token->location, token->text);
>-            *(context->valid) = false;
>+            unsigned int val = 0;
>+            int testVal      = 0;
>+            if (!token->uValue(&val) ||
>+                (!token->iValue(&testVal) &&
>+                 context->errorSettings.integerLiteralsMustFit32BitSignedRange))
>+            {
>+                context->diagnostics->report(angle::pp::Diagnostics::PP_INTEGER_OVERFLOW,
>+                                             token->location, token->text);
>+                *(context->valid) = false;
>+            }
>+            *lvalp = static_cast<YYSTYPE>(val);
>+            type   = TOK_CONST_INT;
>+            break;
>         }
>-        *lvalp = static_cast<YYSTYPE>(val);
>-        type = TOK_CONST_INT;
>-        break;
>-      }
>-      case pp::Token::IDENTIFIER:
>-        *lvalp = static_cast<YYSTYPE>(-1);
>-        type = TOK_IDENTIFIER;
>-        break;
>-      case pp::Token::OP_OR:
>-        type = TOK_OP_OR;
>-        break;
>-      case pp::Token::OP_AND:
>-        type = TOK_OP_AND;
>-        break;
>-      case pp::Token::OP_NE:
>-        type = TOK_OP_NE;
>-        break;
>-      case pp::Token::OP_EQ:
>-        type = TOK_OP_EQ;
>-        break;
>-      case pp::Token::OP_GE:
>-        type = TOK_OP_GE;
>-        break;
>-      case pp::Token::OP_LE:
>-        type = TOK_OP_LE;
>-        break;
>-      case pp::Token::OP_RIGHT:
>-        type = TOK_OP_RIGHT;
>-        break;
>-      case pp::Token::OP_LEFT:
>-        type = TOK_OP_LEFT;
>-        break;
>-      case '|':
>-      case '^':
>-      case '&':
>-      case '>':
>-      case '<':
>-      case '-':
>-      case '+':
>-      case '%':
>-      case '/':
>-      case '*':
>-      case '!':
>-      case '~':
>-      case '(':
>-      case ')':
>-        type = token->type;
>-        break;
>+        case angle::pp::Token::IDENTIFIER:
>+            *lvalp = static_cast<YYSTYPE>(-1);
>+            type   = TOK_IDENTIFIER;
>+            break;
>+        case angle::pp::Token::OP_OR:
>+            type = TOK_OP_OR;
>+            break;
>+        case angle::pp::Token::OP_AND:
>+            type = TOK_OP_AND;
>+            break;
>+        case angle::pp::Token::OP_NE:
>+            type = TOK_OP_NE;
>+            break;
>+        case angle::pp::Token::OP_EQ:
>+            type = TOK_OP_EQ;
>+            break;
>+        case angle::pp::Token::OP_GE:
>+            type = TOK_OP_GE;
>+            break;
>+        case angle::pp::Token::OP_LE:
>+            type = TOK_OP_LE;
>+            break;
>+        case angle::pp::Token::OP_RIGHT:
>+            type = TOK_OP_RIGHT;
>+            break;
>+        case angle::pp::Token::OP_LEFT:
>+            type = TOK_OP_LEFT;
>+            break;
>+        case '|':
>+        case '^':
>+        case '&':
>+        case '>':
>+        case '<':
>+        case '-':
>+        case '+':
>+        case '%':
>+        case '/':
>+        case '*':
>+        case '!':
>+        case '~':
>+        case '(':
>+        case ')':
>+            type = token->type;
>+            break;
> 
>-      default:
>-        break;
>+        default:
>+            break;
>     }
> 
>     return type;
>@@ -1995,18 +1852,19 @@ int yylex(YYSTYPE *lvalp, Context *context)
> 
> void yyerror(Context *context, const char *reason)
> {
>-    context->diagnostics->report(pp::Diagnostics::PP_INVALID_EXPRESSION,
>-                                 context->token->location,
>-                                 reason);
>+    context->diagnostics->report(angle::pp::Diagnostics::PP_INVALID_EXPRESSION,
>+                                 context->token->location, reason);
> }
> 
>-namespace pp {
>+namespace angle
>+{
> 
>-ExpressionParser::ExpressionParser(Lexer *lexer, Diagnostics *diagnostics)
>-    : mLexer(lexer),
>-      mDiagnostics(diagnostics)
>+namespace pp
> {
>-}
>+
>+ExpressionParser::ExpressionParser(Lexer *lexer, Diagnostics *diagnostics)
>+    : mLexer(lexer), mDiagnostics(diagnostics)
>+{}
> 
> bool ExpressionParser::parse(Token *token,
>                              int *result,
>@@ -2015,32 +1873,34 @@ bool ExpressionParser::parse(Token *token,
>                              bool *valid)
> {
>     Context context;
>-    context.diagnostics = mDiagnostics;
>-    context.lexer = mLexer;
>-    context.token = token;
>-    context.result = result;
>-    context.ignoreErrors = 0;
>+    context.diagnostics      = mDiagnostics;
>+    context.lexer            = mLexer;
>+    context.token            = token;
>+    context.result           = result;
>+    context.ignoreErrors     = 0;
>     context.parsePresetToken = parsePresetToken;
>     context.errorSettings    = errorSettings;
>     context.valid            = valid;
>-    int ret = yyparse(&context);
>+    int ret                  = yyparse(&context);
>     switch (ret)
>     {
>-      case 0:
>-      case 1:
>-        break;
>+        case 0:
>+        case 1:
>+            break;
> 
>-      case 2:
>-        mDiagnostics->report(Diagnostics::PP_OUT_OF_MEMORY, token->location, "");
>-        break;
>+        case 2:
>+            mDiagnostics->report(Diagnostics::PP_OUT_OF_MEMORY, token->location, "");
>+            break;
> 
>-      default:
>-        assert(false);
>-        mDiagnostics->report(Diagnostics::PP_INTERNAL_ERROR, token->location, "");
>-        break;
>+        default:
>+            assert(false);
>+            mDiagnostics->report(Diagnostics::PP_INTERNAL_ERROR, token->location, "");
>+            break;
>     }
> 
>     return ret == 0;
> }
> 
> }  // namespace pp
>+
>+}  // namespace angle
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/preprocessor/ExpressionParser.h b/Source/ThirdParty/ANGLE/src/compiler/preprocessor/ExpressionParser.h
>index 0f2901b8786..c5cd7f7d8bb 100644
>--- a/Source/ThirdParty/ANGLE/src/compiler/preprocessor/ExpressionParser.h
>+++ b/Source/ThirdParty/ANGLE/src/compiler/preprocessor/ExpressionParser.h
>@@ -10,6 +10,9 @@
> #include "common/angleutils.h"
> #include "compiler/preprocessor/DiagnosticsBase.h"
> 
>+namespace angle
>+{
>+
> namespace pp
> {
> 
>@@ -40,4 +43,6 @@ class ExpressionParser : angle::NonCopyable
> 
> }  // namespace pp
> 
>+}  // namespace angle
>+
> #endif  // COMPILER_PREPROCESSOR_EXPRESSIONPARSER_H_
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/preprocessor/ExpressionParser.y b/Source/ThirdParty/ANGLE/src/compiler/preprocessor/ExpressionParser.y
>index 68d7cc3958c..6ddf9122c71 100644
>--- a/Source/ThirdParty/ANGLE/src/compiler/preprocessor/ExpressionParser.y
>+++ b/Source/ThirdParty/ANGLE/src/compiler/preprocessor/ExpressionParser.y
>@@ -59,13 +59,13 @@ typedef uint32_t UNSIGNED_TYPE;
> namespace {
> struct Context
> {
>-    pp::Diagnostics* diagnostics;
>-    pp::Lexer* lexer;
>-    pp::Token* token;
>+    angle::pp::Diagnostics *diagnostics;
>+    angle::pp::Lexer *lexer;
>+    angle::pp::Token *token;
>     int* result;
>     bool parsePresetToken;
> 
>-    pp::ExpressionParser::ErrorSettings errorSettings;
>+    angle::pp::ExpressionParser::ErrorSettings errorSettings;
>     bool *valid;
> 
>     void startIgnoreErrors() { ++ignoreErrors; }
>@@ -201,7 +201,7 @@ expression
>                 std::ostringstream stream;
>                 stream << $1 << " >> " << $3;
>                 std::string text = stream.str();
>-                context->diagnostics->report(pp::Diagnostics::PP_UNDEFINED_SHIFT,
>+                context->diagnostics->report(angle::pp::Diagnostics::PP_UNDEFINED_SHIFT,
>                                              context->token->location,
>                                              text.c_str());
>                 *(context->valid) = false;
>@@ -226,7 +226,7 @@ expression
>                 std::ostringstream stream;
>                 stream << $1 << " << " << $3;
>                 std::string text = stream.str();
>-                context->diagnostics->report(pp::Diagnostics::PP_UNDEFINED_SHIFT,
>+                context->diagnostics->report(angle::pp::Diagnostics::PP_UNDEFINED_SHIFT,
>                                              context->token->location,
>                                              text.c_str());
>                 *(context->valid) = false;
>@@ -254,7 +254,7 @@ expression
>                 std::ostringstream stream;
>                 stream << $1 << " % " << $3;
>                 std::string text = stream.str();
>-                context->diagnostics->report(pp::Diagnostics::PP_DIVISION_BY_ZERO,
>+                context->diagnostics->report(angle::pp::Diagnostics::PP_DIVISION_BY_ZERO,
>                                              context->token->location,
>                                              text.c_str());
>                 *(context->valid) = false;
>@@ -280,7 +280,7 @@ expression
>                 std::ostringstream stream;
>                 stream << $1 << " / " << $3;
>                 std::string text = stream.str();
>-                context->diagnostics->report(pp::Diagnostics::PP_DIVISION_BY_ZERO,
>+                context->diagnostics->report(angle::pp::Diagnostics::PP_DIVISION_BY_ZERO,
>                                             context->token->location,
>                                             text.c_str());
>                 *(context->valid) = false;
>@@ -332,7 +332,7 @@ expression
> 
> int yylex(YYSTYPE *lvalp, Context *context)
> {
>-    pp::Token *token = context->token;
>+    angle::pp::Token *token = context->token;
>     if (!context->parsePresetToken)
>     {
>         context->lexer->lex(token);
>@@ -343,13 +343,13 @@ int yylex(YYSTYPE *lvalp, Context *context)
> 
>     switch (token->type)
>     {
>-      case pp::Token::CONST_INT: {
>+      case angle::pp::Token::CONST_INT: {
>         unsigned int val = 0;
>         int testVal = 0;
>         if (!token->uValue(&val) || (!token->iValue(&testVal) &&
>                                      context->errorSettings.integerLiteralsMustFit32BitSignedRange))
>         {
>-            context->diagnostics->report(pp::Diagnostics::PP_INTEGER_OVERFLOW,
>+            context->diagnostics->report(angle::pp::Diagnostics::PP_INTEGER_OVERFLOW,
>                                          token->location, token->text);
>             *(context->valid) = false;
>         }
>@@ -357,32 +357,32 @@ int yylex(YYSTYPE *lvalp, Context *context)
>         type = TOK_CONST_INT;
>         break;
>       }
>-      case pp::Token::IDENTIFIER:
>+      case angle::pp::Token::IDENTIFIER:
>         *lvalp = static_cast<YYSTYPE>(-1);
>         type = TOK_IDENTIFIER;
>         break;
>-      case pp::Token::OP_OR:
>+      case angle::pp::Token::OP_OR:
>         type = TOK_OP_OR;
>         break;
>-      case pp::Token::OP_AND:
>+      case angle::pp::Token::OP_AND:
>         type = TOK_OP_AND;
>         break;
>-      case pp::Token::OP_NE:
>+      case angle::pp::Token::OP_NE:
>         type = TOK_OP_NE;
>         break;
>-      case pp::Token::OP_EQ:
>+      case angle::pp::Token::OP_EQ:
>         type = TOK_OP_EQ;
>         break;
>-      case pp::Token::OP_GE:
>+      case angle::pp::Token::OP_GE:
>         type = TOK_OP_GE;
>         break;
>-      case pp::Token::OP_LE:
>+      case angle::pp::Token::OP_LE:
>         type = TOK_OP_LE;
>         break;
>-      case pp::Token::OP_RIGHT:
>+      case angle::pp::Token::OP_RIGHT:
>         type = TOK_OP_RIGHT;
>         break;
>-      case pp::Token::OP_LEFT:
>+      case angle::pp::Token::OP_LEFT:
>         type = TOK_OP_LEFT;
>         break;
>       case '|':
>@@ -411,11 +411,13 @@ int yylex(YYSTYPE *lvalp, Context *context)
> 
> void yyerror(Context *context, const char *reason)
> {
>-    context->diagnostics->report(pp::Diagnostics::PP_INVALID_EXPRESSION,
>+    context->diagnostics->report(angle::pp::Diagnostics::PP_INVALID_EXPRESSION,
>                                  context->token->location,
>                                  reason);
> }
> 
>+namespace angle {
>+
> namespace pp {
> 
> ExpressionParser::ExpressionParser(Lexer *lexer, Diagnostics *diagnostics)
>@@ -460,3 +462,5 @@ bool ExpressionParser::parse(Token *token,
> }
> 
> }  // namespace pp
>+
>+}  // namespace angle
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/preprocessor/Input.cpp b/Source/ThirdParty/ANGLE/src/compiler/preprocessor/Input.cpp
>index 0f2327b823d..8d1cac5386b 100644
>--- a/Source/ThirdParty/ANGLE/src/compiler/preprocessor/Input.cpp
>+++ b/Source/ThirdParty/ANGLE/src/compiler/preprocessor/Input.cpp
>@@ -11,16 +11,15 @@
> 
> #include "common/debug.h"
> 
>-namespace pp
>+namespace angle
> {
> 
>-Input::Input() : mCount(0), mString(0)
>+namespace pp
> {
>-}
> 
>-Input::~Input()
>-{
>-}
>+Input::Input() : mCount(0), mString(0) {}
>+
>+Input::~Input() {}
> 
> Input::Input(size_t count, const char *const string[], const int length[])
>     : mCount(count), mString(string)
>@@ -127,3 +126,5 @@ size_t Input::read(char *buf, size_t maxSize, int *lineNo)
> }
> 
> }  // namespace pp
>+
>+}  // namespace angle
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/preprocessor/Input.h b/Source/ThirdParty/ANGLE/src/compiler/preprocessor/Input.h
>index 8c7c7ee19ee..e2150f899e4 100644
>--- a/Source/ThirdParty/ANGLE/src/compiler/preprocessor/Input.h
>+++ b/Source/ThirdParty/ANGLE/src/compiler/preprocessor/Input.h
>@@ -10,6 +10,9 @@
> #include <cstddef>
> #include <vector>
> 
>+namespace angle
>+{
>+
> namespace pp
> {
> 
>@@ -51,4 +54,6 @@ class Input
> 
> }  // namespace pp
> 
>+}  // namespace angle
>+
> #endif  // COMPILER_PREPROCESSOR_INPUT_H_
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/preprocessor/Lexer.cpp b/Source/ThirdParty/ANGLE/src/compiler/preprocessor/Lexer.cpp
>index 89cb3cf44e4..4fc7797f567 100644
>--- a/Source/ThirdParty/ANGLE/src/compiler/preprocessor/Lexer.cpp
>+++ b/Source/ThirdParty/ANGLE/src/compiler/preprocessor/Lexer.cpp
>@@ -6,11 +6,14 @@
> 
> #include "compiler/preprocessor/Lexer.h"
> 
>-namespace pp
>+namespace angle
> {
> 
>-Lexer::~Lexer()
>+namespace pp
> {
>-}
>+
>+Lexer::~Lexer() {}
> 
> }  // namespace pp
>+
>+}  // namespace angle
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/preprocessor/Lexer.h b/Source/ThirdParty/ANGLE/src/compiler/preprocessor/Lexer.h
>index 775bc0a202a..c26770745fc 100644
>--- a/Source/ThirdParty/ANGLE/src/compiler/preprocessor/Lexer.h
>+++ b/Source/ThirdParty/ANGLE/src/compiler/preprocessor/Lexer.h
>@@ -9,6 +9,9 @@
> 
> #include "common/angleutils.h"
> 
>+namespace angle
>+{
>+
> namespace pp
> {
> 
>@@ -24,4 +27,6 @@ class Lexer : angle::NonCopyable
> 
> }  // namespace pp
> 
>+}  // namespace angle
>+
> #endif  // COMPILER_PREPROCESSOR_LEXER_H_
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/preprocessor/Macro.cpp b/Source/ThirdParty/ANGLE/src/compiler/preprocessor/Macro.cpp
>index 52e2312fe60..a7a2f87b55f 100644
>--- a/Source/ThirdParty/ANGLE/src/compiler/preprocessor/Macro.cpp
>+++ b/Source/ThirdParty/ANGLE/src/compiler/preprocessor/Macro.cpp
>@@ -9,16 +9,15 @@
> #include "common/angleutils.h"
> #include "compiler/preprocessor/Token.h"
> 
>-namespace pp
>+namespace angle
> {
> 
>-Macro::Macro() : predefined(false), disabled(false), expansionCount(0), type(kTypeObj)
>+namespace pp
> {
>-}
> 
>-Macro::~Macro()
>-{
>-}
>+Macro::Macro() : predefined(false), disabled(false), expansionCount(0), type(kTypeObj) {}
>+
>+Macro::~Macro() {}
> 
> bool Macro::equals(const Macro &other) const
> {
>@@ -42,3 +41,5 @@ void PredefineMacro(MacroSet *macroSet, const char *name, int value)
> }
> 
> }  // namespace pp
>+
>+}  // namespace angle
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/preprocessor/Macro.h b/Source/ThirdParty/ANGLE/src/compiler/preprocessor/Macro.h
>index c42e172ef9d..d7880f4eb3c 100644
>--- a/Source/ThirdParty/ANGLE/src/compiler/preprocessor/Macro.h
>+++ b/Source/ThirdParty/ANGLE/src/compiler/preprocessor/Macro.h
>@@ -12,6 +12,9 @@
> #include <string>
> #include <vector>
> 
>+namespace angle
>+{
>+
> namespace pp
> {
> 
>@@ -47,4 +50,6 @@ void PredefineMacro(MacroSet *macroSet, const char *name, int value);
> 
> }  // namespace pp
> 
>+}  // namespace angle
>+
> #endif  // COMPILER_PREPROCESSOR_MACRO_H_
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/preprocessor/MacroExpander.cpp b/Source/ThirdParty/ANGLE/src/compiler/preprocessor/MacroExpander.cpp
>index 6e2accf29da..32083c3e354 100644
>--- a/Source/ThirdParty/ANGLE/src/compiler/preprocessor/MacroExpander.cpp
>+++ b/Source/ThirdParty/ANGLE/src/compiler/preprocessor/MacroExpander.cpp
>@@ -6,12 +6,16 @@
> 
> #include "compiler/preprocessor/MacroExpander.h"
> 
>+#include <GLSLANG/ShaderLang.h>
> #include <algorithm>
> 
> #include "common/debug.h"
> #include "compiler/preprocessor/DiagnosticsBase.h"
> #include "compiler/preprocessor/Token.h"
> 
>+namespace angle
>+{
>+
> namespace pp
> {
> 
>@@ -70,7 +74,7 @@ MacroExpander::ScopedMacroReenabler::ScopedMacroReenabler(MacroExpander *expande
> MacroExpander::ScopedMacroReenabler::~ScopedMacroReenabler()
> {
>     mExpander->mDeferReenablingMacros = false;
>-    for (const auto& macro : mExpander->mMacrosToReenable)
>+    for (const std::shared_ptr<Macro> &macro : mExpander->mMacrosToReenable)
>     {
>         // Copying the string here by using substr is a check for use-after-free. It detects
>         // use-after-free more reliably than just toggling the disabled flag.
>@@ -83,15 +87,16 @@ MacroExpander::ScopedMacroReenabler::~ScopedMacroReenabler()
> MacroExpander::MacroExpander(Lexer *lexer,
>                              MacroSet *macroSet,
>                              Diagnostics *diagnostics,
>-                             int allowedMacroExpansionDepth)
>+                             const PreprocessorSettings &settings,
>+                             bool parseDefined)
>     : mLexer(lexer),
>       mMacroSet(macroSet),
>       mDiagnostics(diagnostics),
>+      mParseDefined(parseDefined),
>       mTotalTokensInContexts(0),
>-      mAllowedMacroExpansionDepth(allowedMacroExpansionDepth),
>+      mSettings(settings),
>       mDeferReenablingMacros(false)
>-{
>-}
>+{}
> 
> MacroExpander::~MacroExpander()
> {
>@@ -111,6 +116,51 @@ void MacroExpander::lex(Token *token)
>         if (token->type != Token::IDENTIFIER)
>             break;
> 
>+        // Defined operator is parsed here since it may be generated by macro expansion.
>+        // Defined operator produced by macro expansion has undefined behavior according to C++
>+        // spec, which the GLSL spec references (see C++14 draft spec section 16.1.4), but this
>+        // behavior is needed for passing dEQP tests, which enforce stricter compatibility between
>+        // implementations.
>+        if (mParseDefined && token->text == kDefined)
>+        {
>+            // Defined inside a macro is forbidden in WebGL.
>+            if (!mContextStack.empty() && sh::IsWebGLBasedSpec(mSettings.shaderSpec))
>+                break;
>+
>+            bool paren = false;
>+            getToken(token);
>+            if (token->type == '(')
>+            {
>+                paren = true;
>+                getToken(token);
>+            }
>+            if (token->type != Token::IDENTIFIER)
>+            {
>+                mDiagnostics->report(Diagnostics::PP_UNEXPECTED_TOKEN, token->location,
>+                                     token->text);
>+                break;
>+            }
>+            auto iter              = mMacroSet->find(token->text);
>+            std::string expression = iter != mMacroSet->end() ? "1" : "0";
>+
>+            if (paren)
>+            {
>+                getToken(token);
>+                if (token->type != ')')
>+                {
>+                    mDiagnostics->report(Diagnostics::PP_UNEXPECTED_TOKEN, token->location,
>+                                         token->text);
>+                    break;
>+                }
>+            }
>+
>+            // We have a valid defined operator.
>+            // Convert the current token into a CONST_INT token.
>+            token->type = Token::CONST_INT;
>+            token->text = expression;
>+            break;
>+        }
>+
>         if (token->expansionDisabled())
>             break;
> 
>@@ -383,13 +433,15 @@ bool MacroExpander::collectMacroArgs(const Macro &macro,
>     for (auto &arg : *args)
>     {
>         TokenLexer lexer(&arg);
>-        if (mAllowedMacroExpansionDepth < 1)
>+        if (mSettings.maxMacroExpansionDepth < 1)
>         {
>             mDiagnostics->report(Diagnostics::PP_MACRO_INVOCATION_CHAIN_TOO_DEEP, token.location,
>                                  token.text);
>             return false;
>         }
>-        MacroExpander expander(&lexer, mMacroSet, mDiagnostics, mAllowedMacroExpansionDepth - 1);
>+        PreprocessorSettings nestedSettings(mSettings.shaderSpec);
>+        nestedSettings.maxMacroExpansionDepth = mSettings.maxMacroExpansionDepth - 1;
>+        MacroExpander expander(&lexer, mMacroSet, mDiagnostics, nestedSettings, mParseDefined);
> 
>         arg.clear();
>         expander.lex(&token);
>@@ -454,13 +506,9 @@ void MacroExpander::replaceMacroParams(const Macro &macro,
>     }
> }
> 
>-MacroExpander::MacroContext::MacroContext() : macro(0), index(0)
>-{
>-}
>+MacroExpander::MacroContext::MacroContext() : macro(0), index(0) {}
> 
>-MacroExpander::MacroContext::~MacroContext()
>-{
>-}
>+MacroExpander::MacroContext::~MacroContext() {}
> 
> bool MacroExpander::MacroContext::empty() const
> {
>@@ -479,3 +527,5 @@ void MacroExpander::MacroContext::unget()
> }
> 
> }  // namespace pp
>+
>+}  // namespace angle
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/preprocessor/MacroExpander.h b/Source/ThirdParty/ANGLE/src/compiler/preprocessor/MacroExpander.h
>index fae7676fb0f..837bd73302e 100644
>--- a/Source/ThirdParty/ANGLE/src/compiler/preprocessor/MacroExpander.h
>+++ b/Source/ThirdParty/ANGLE/src/compiler/preprocessor/MacroExpander.h
>@@ -12,6 +12,10 @@
> 
> #include "compiler/preprocessor/Lexer.h"
> #include "compiler/preprocessor/Macro.h"
>+#include "compiler/preprocessor/Preprocessor.h"
>+
>+namespace angle
>+{
> 
> namespace pp
> {
>@@ -25,7 +29,8 @@ class MacroExpander : public Lexer
>     MacroExpander(Lexer *lexer,
>                   MacroSet *macroSet,
>                   Diagnostics *diagnostics,
>-                  int allowedMacroExpansionDepth);
>+                  const PreprocessorSettings &settings,
>+                  bool parseDefined);
>     ~MacroExpander() override;
> 
>     void lex(Token *token) override;
>@@ -65,12 +70,13 @@ class MacroExpander : public Lexer
>     Lexer *mLexer;
>     MacroSet *mMacroSet;
>     Diagnostics *mDiagnostics;
>+    bool mParseDefined;
> 
>     std::unique_ptr<Token> mReserveToken;
>     std::vector<MacroContext *> mContextStack;
>     size_t mTotalTokensInContexts;
> 
>-    int mAllowedMacroExpansionDepth;
>+    PreprocessorSettings mSettings;
> 
>     bool mDeferReenablingMacros;
>     std::vector<std::shared_ptr<Macro>> mMacrosToReenable;
>@@ -80,4 +86,6 @@ class MacroExpander : public Lexer
> 
> }  // namespace pp
> 
>+}  // namespace angle
>+
> #endif  // COMPILER_PREPROCESSOR_MACROEXPANDER_H_
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/preprocessor/Preprocessor.cpp b/Source/ThirdParty/ANGLE/src/compiler/preprocessor/Preprocessor.cpp
>index 349c7b06c71..ec6f7e14306 100644
>--- a/Source/ThirdParty/ANGLE/src/compiler/preprocessor/Preprocessor.cpp
>+++ b/Source/ThirdParty/ANGLE/src/compiler/preprocessor/Preprocessor.cpp
>@@ -14,6 +14,9 @@
> #include "compiler/preprocessor/Token.h"
> #include "compiler/preprocessor/Tokenizer.h"
> 
>+namespace angle
>+{
>+
> namespace pp
> {
> 
>@@ -30,14 +33,9 @@ struct PreprocessorImpl
>                      const PreprocessorSettings &settings)
>         : diagnostics(diag),
>           tokenizer(diag),
>-          directiveParser(&tokenizer,
>-                          &macroSet,
>-                          diag,
>-                          directiveHandler,
>-                          settings.maxMacroExpansionDepth),
>-          macroExpander(&directiveParser, &macroSet, diag, settings.maxMacroExpansionDepth)
>-    {
>-    }
>+          directiveParser(&tokenizer, &macroSet, diag, directiveHandler, settings),
>+          macroExpander(&directiveParser, &macroSet, diag, settings, false)
>+    {}
> };
> 
> Preprocessor::Preprocessor(Diagnostics *diagnostics,
>@@ -105,3 +103,5 @@ void Preprocessor::setMaxTokenSize(size_t maxTokenSize)
> }
> 
> }  // namespace pp
>+
>+}  // namespace angle
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/preprocessor/Preprocessor.h b/Source/ThirdParty/ANGLE/src/compiler/preprocessor/Preprocessor.h
>index 2fe504f7f9b..58b4a70ec75 100644
>--- a/Source/ThirdParty/ANGLE/src/compiler/preprocessor/Preprocessor.h
>+++ b/Source/ThirdParty/ANGLE/src/compiler/preprocessor/Preprocessor.h
>@@ -9,8 +9,12 @@
> 
> #include <cstddef>
> 
>+#include "GLSLANG/ShaderLang.h"
> #include "common/angleutils.h"
> 
>+namespace angle
>+{
>+
> namespace pp
> {
> 
>@@ -19,10 +23,16 @@ class DirectiveHandler;
> struct PreprocessorImpl;
> struct Token;
> 
>-struct PreprocessorSettings : private angle::NonCopyable
>+struct PreprocessorSettings final
> {
>-    PreprocessorSettings() : maxMacroExpansionDepth(1000) {}
>+    PreprocessorSettings(ShShaderSpec shaderSpec)
>+        : maxMacroExpansionDepth(1000), shaderSpec(shaderSpec)
>+    {}
>+
>+    PreprocessorSettings(const PreprocessorSettings &other) = default;
>+
>     int maxMacroExpansionDepth;
>+    ShShaderSpec shaderSpec;
> };
> 
> class Preprocessor : angle::NonCopyable
>@@ -57,4 +67,6 @@ class Preprocessor : angle::NonCopyable
> 
> }  // namespace pp
> 
>+}  // namespace angle
>+
> #endif  // COMPILER_PREPROCESSOR_PREPROCESSOR_H_
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/preprocessor/SourceLocation.h b/Source/ThirdParty/ANGLE/src/compiler/preprocessor/SourceLocation.h
>index 51908a3b4bd..61d1af057cd 100644
>--- a/Source/ThirdParty/ANGLE/src/compiler/preprocessor/SourceLocation.h
>+++ b/Source/ThirdParty/ANGLE/src/compiler/preprocessor/SourceLocation.h
>@@ -7,6 +7,9 @@
> #ifndef COMPILER_PREPROCESSOR_SOURCELOCATION_H_
> #define COMPILER_PREPROCESSOR_SOURCELOCATION_H_
> 
>+namespace angle
>+{
>+
> namespace pp
> {
> 
>@@ -36,4 +39,6 @@ inline bool operator!=(const SourceLocation &lhs, const SourceLocation &rhs)
> 
> }  // namespace pp
> 
>+}  // namespace angle
>+
> #endif  // COMPILER_PREPROCESSOR_SOURCELOCATION_H_
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/preprocessor/Token.cpp b/Source/ThirdParty/ANGLE/src/compiler/preprocessor/Token.cpp
>index ce0ce94f49a..45b917bf03c 100644
>--- a/Source/ThirdParty/ANGLE/src/compiler/preprocessor/Token.cpp
>+++ b/Source/ThirdParty/ANGLE/src/compiler/preprocessor/Token.cpp
>@@ -9,6 +9,9 @@
> #include "common/debug.h"
> #include "compiler/preprocessor/numeric_lex.h"
> 
>+namespace angle
>+{
>+
> namespace pp
> {
> 
>@@ -62,12 +65,6 @@ bool Token::uValue(unsigned int *value) const
>     return numeric_lex_int(text, value);
> }
> 
>-bool Token::fValue(float *value) const
>-{
>-    ASSERT(type == CONST_FLOAT);
>-    return numeric_lex_float(text, value);
>-}
>-
> std::ostream &operator<<(std::ostream &out, const Token &token)
> {
>     if (token.hasLeadingSpace())
>@@ -78,3 +75,5 @@ std::ostream &operator<<(std::ostream &out, const Token &token)
> }
> 
> }  // namespace pp
>+
>+}  // namespace angle
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/preprocessor/Token.h b/Source/ThirdParty/ANGLE/src/compiler/preprocessor/Token.h
>index 26732ab64d2..436c5b6db74 100644
>--- a/Source/ThirdParty/ANGLE/src/compiler/preprocessor/Token.h
>+++ b/Source/ThirdParty/ANGLE/src/compiler/preprocessor/Token.h
>@@ -12,6 +12,9 @@
> 
> #include "compiler/preprocessor/SourceLocation.h"
> 
>+namespace angle
>+{
>+
> namespace pp
> {
> 
>@@ -21,7 +24,7 @@ struct Token
>     {
>         // Calling this ERROR causes a conflict with wingdi.h
>         GOT_ERROR = -1,
>-        LAST  = 0,  // EOF.
>+        LAST      = 0,  // EOF.
> 
>         IDENTIFIER = 258,
> 
>@@ -84,7 +87,6 @@ struct Token
>     // Returns false if the parsed value cannot fit into an int or float.
>     bool iValue(int *value) const;
>     bool uValue(unsigned int *value) const;
>-    bool fValue(float *value) const;
> 
>     int type;
>     unsigned int flags;
>@@ -104,6 +106,10 @@ inline bool operator!=(const Token &lhs, const Token &rhs)
> 
> std::ostream &operator<<(std::ostream &out, const Token &token);
> 
>-}  // namepsace pp
>+constexpr char kDefined[] = "defined";
>+
>+}  // namespace pp
>+
>+}  // namespace angle
> 
> #endif  // COMPILER_PREPROCESSOR_TOKEN_H_
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/preprocessor/Tokenizer.cpp b/Source/ThirdParty/ANGLE/src/compiler/preprocessor/Tokenizer.cpp
>index d7fad68f1fe..2ce67b73863 100644
>--- a/Source/ThirdParty/ANGLE/src/compiler/preprocessor/Tokenizer.cpp
>+++ b/Source/ThirdParty/ANGLE/src/compiler/preprocessor/Tokenizer.cpp
>@@ -7,457 +7,355 @@
> 
> // This file is auto-generated by generate_parser.sh. DO NOT EDIT!
> 
>-
>-
>-#define  YY_INT_ALIGNED short int
>+#define YY_INT_ALIGNED short int
> 
> /* A lexical scanner generated by flex */
> 
>-
>-
>-
>-
>-
>-
>-
>-
>-
> #define FLEX_SCANNER
> #define YY_FLEX_MAJOR_VERSION 2
> #define YY_FLEX_MINOR_VERSION 6
> #define YY_FLEX_SUBMINOR_VERSION 4
> #if YY_FLEX_SUBMINOR_VERSION > 0
>-#define FLEX_BETA
>+#    define FLEX_BETA
> #endif
> 
>-
>-
>-
>-
>-
>-
>-
>-
>-
>-
>-
>-
>-
> #ifdef yy_create_buffer
>-#define pp_create_buffer_ALREADY_DEFINED
>+#    define pp_create_buffer_ALREADY_DEFINED
> #else
>-#define yy_create_buffer pp_create_buffer
>+#    define yy_create_buffer pp_create_buffer
> #endif
> 
>-    
> #ifdef yy_delete_buffer
>-#define pp_delete_buffer_ALREADY_DEFINED
>+#    define pp_delete_buffer_ALREADY_DEFINED
> #else
>-#define yy_delete_buffer pp_delete_buffer
>+#    define yy_delete_buffer pp_delete_buffer
> #endif
> 
>-    
> #ifdef yy_scan_buffer
>-#define pp_scan_buffer_ALREADY_DEFINED
>+#    define pp_scan_buffer_ALREADY_DEFINED
> #else
>-#define yy_scan_buffer pp_scan_buffer
>+#    define yy_scan_buffer pp_scan_buffer
> #endif
> 
>-    
> #ifdef yy_scan_string
>-#define pp_scan_string_ALREADY_DEFINED
>+#    define pp_scan_string_ALREADY_DEFINED
> #else
>-#define yy_scan_string pp_scan_string
>+#    define yy_scan_string pp_scan_string
> #endif
> 
>-    
> #ifdef yy_scan_bytes
>-#define pp_scan_bytes_ALREADY_DEFINED
>+#    define pp_scan_bytes_ALREADY_DEFINED
> #else
>-#define yy_scan_bytes pp_scan_bytes
>+#    define yy_scan_bytes pp_scan_bytes
> #endif
> 
>-    
> #ifdef yy_init_buffer
>-#define pp_init_buffer_ALREADY_DEFINED
>+#    define pp_init_buffer_ALREADY_DEFINED
> #else
>-#define yy_init_buffer pp_init_buffer
>+#    define yy_init_buffer pp_init_buffer
> #endif
> 
>-    
> #ifdef yy_flush_buffer
>-#define pp_flush_buffer_ALREADY_DEFINED
>+#    define pp_flush_buffer_ALREADY_DEFINED
> #else
>-#define yy_flush_buffer pp_flush_buffer
>+#    define yy_flush_buffer pp_flush_buffer
> #endif
> 
>-    
> #ifdef yy_load_buffer_state
>-#define pp_load_buffer_state_ALREADY_DEFINED
>+#    define pp_load_buffer_state_ALREADY_DEFINED
> #else
>-#define yy_load_buffer_state pp_load_buffer_state
>+#    define yy_load_buffer_state pp_load_buffer_state
> #endif
> 
>-    
> #ifdef yy_switch_to_buffer
>-#define pp_switch_to_buffer_ALREADY_DEFINED
>+#    define pp_switch_to_buffer_ALREADY_DEFINED
> #else
>-#define yy_switch_to_buffer pp_switch_to_buffer
>+#    define yy_switch_to_buffer pp_switch_to_buffer
> #endif
> 
>-    
> #ifdef yypush_buffer_state
>-#define pppush_buffer_state_ALREADY_DEFINED
>+#    define pppush_buffer_state_ALREADY_DEFINED
> #else
>-#define yypush_buffer_state pppush_buffer_state
>+#    define yypush_buffer_state pppush_buffer_state
> #endif
> 
>-    
> #ifdef yypop_buffer_state
>-#define pppop_buffer_state_ALREADY_DEFINED
>+#    define pppop_buffer_state_ALREADY_DEFINED
> #else
>-#define yypop_buffer_state pppop_buffer_state
>+#    define yypop_buffer_state pppop_buffer_state
> #endif
> 
>-    
> #ifdef yyensure_buffer_stack
>-#define ppensure_buffer_stack_ALREADY_DEFINED
>+#    define ppensure_buffer_stack_ALREADY_DEFINED
> #else
>-#define yyensure_buffer_stack ppensure_buffer_stack
>+#    define yyensure_buffer_stack ppensure_buffer_stack
> #endif
> 
>-    
> #ifdef yylex
>-#define pplex_ALREADY_DEFINED
>+#    define pplex_ALREADY_DEFINED
> #else
>-#define yylex pplex
>+#    define yylex pplex
> #endif
> 
>-    
> #ifdef yyrestart
>-#define pprestart_ALREADY_DEFINED
>+#    define pprestart_ALREADY_DEFINED
> #else
>-#define yyrestart pprestart
>+#    define yyrestart pprestart
> #endif
> 
>-    
> #ifdef yylex_init
>-#define pplex_init_ALREADY_DEFINED
>+#    define pplex_init_ALREADY_DEFINED
> #else
>-#define yylex_init pplex_init
>+#    define yylex_init pplex_init
> #endif
> 
>-    
> #ifdef yylex_init_extra
>-#define pplex_init_extra_ALREADY_DEFINED
>+#    define pplex_init_extra_ALREADY_DEFINED
> #else
>-#define yylex_init_extra pplex_init_extra
>+#    define yylex_init_extra pplex_init_extra
> #endif
> 
>-    
> #ifdef yylex_destroy
>-#define pplex_destroy_ALREADY_DEFINED
>+#    define pplex_destroy_ALREADY_DEFINED
> #else
>-#define yylex_destroy pplex_destroy
>+#    define yylex_destroy pplex_destroy
> #endif
> 
>-    
> #ifdef yyget_debug
>-#define ppget_debug_ALREADY_DEFINED
>+#    define ppget_debug_ALREADY_DEFINED
> #else
>-#define yyget_debug ppget_debug
>+#    define yyget_debug ppget_debug
> #endif
> 
>-    
> #ifdef yyset_debug
>-#define ppset_debug_ALREADY_DEFINED
>+#    define ppset_debug_ALREADY_DEFINED
> #else
>-#define yyset_debug ppset_debug
>+#    define yyset_debug ppset_debug
> #endif
> 
>-    
> #ifdef yyget_extra
>-#define ppget_extra_ALREADY_DEFINED
>+#    define ppget_extra_ALREADY_DEFINED
> #else
>-#define yyget_extra ppget_extra
>+#    define yyget_extra ppget_extra
> #endif
> 
>-    
> #ifdef yyset_extra
>-#define ppset_extra_ALREADY_DEFINED
>+#    define ppset_extra_ALREADY_DEFINED
> #else
>-#define yyset_extra ppset_extra
>+#    define yyset_extra ppset_extra
> #endif
> 
>-    
> #ifdef yyget_in
>-#define ppget_in_ALREADY_DEFINED
>+#    define ppget_in_ALREADY_DEFINED
> #else
>-#define yyget_in ppget_in
>+#    define yyget_in ppget_in
> #endif
> 
>-    
> #ifdef yyset_in
>-#define ppset_in_ALREADY_DEFINED
>+#    define ppset_in_ALREADY_DEFINED
> #else
>-#define yyset_in ppset_in
>+#    define yyset_in ppset_in
> #endif
> 
>-    
> #ifdef yyget_out
>-#define ppget_out_ALREADY_DEFINED
>+#    define ppget_out_ALREADY_DEFINED
> #else
>-#define yyget_out ppget_out
>+#    define yyget_out ppget_out
> #endif
> 
>-    
> #ifdef yyset_out
>-#define ppset_out_ALREADY_DEFINED
>+#    define ppset_out_ALREADY_DEFINED
> #else
>-#define yyset_out ppset_out
>+#    define yyset_out ppset_out
> #endif
> 
>-    
> #ifdef yyget_leng
>-#define ppget_leng_ALREADY_DEFINED
>+#    define ppget_leng_ALREADY_DEFINED
> #else
>-#define yyget_leng ppget_leng
>+#    define yyget_leng ppget_leng
> #endif
> 
>-    
> #ifdef yyget_text
>-#define ppget_text_ALREADY_DEFINED
>+#    define ppget_text_ALREADY_DEFINED
> #else
>-#define yyget_text ppget_text
>+#    define yyget_text ppget_text
> #endif
> 
>-    
> #ifdef yyget_lineno
>-#define ppget_lineno_ALREADY_DEFINED
>+#    define ppget_lineno_ALREADY_DEFINED
> #else
>-#define yyget_lineno ppget_lineno
>+#    define yyget_lineno ppget_lineno
> #endif
> 
>-    
> #ifdef yyset_lineno
>-#define ppset_lineno_ALREADY_DEFINED
>+#    define ppset_lineno_ALREADY_DEFINED
> #else
>-#define yyset_lineno ppset_lineno
>+#    define yyset_lineno ppset_lineno
> #endif
> 
>-    
>-        
> #ifdef yyget_column
>-#define ppget_column_ALREADY_DEFINED
>+#    define ppget_column_ALREADY_DEFINED
> #else
>-#define yyget_column ppget_column
>+#    define yyget_column ppget_column
> #endif
> 
>-        
> #ifdef yyset_column
>-#define ppset_column_ALREADY_DEFINED
>+#    define ppset_column_ALREADY_DEFINED
> #else
>-#define yyset_column ppset_column
>+#    define yyset_column ppset_column
> #endif
> 
>-    
>-    
> #ifdef yywrap
>-#define ppwrap_ALREADY_DEFINED
>+#    define ppwrap_ALREADY_DEFINED
> #else
>-#define yywrap ppwrap
>+#    define yywrap ppwrap
> #endif
> 
>-
>-
>-
>-    
> #ifdef yyget_lval
>-#define ppget_lval_ALREADY_DEFINED
>+#    define ppget_lval_ALREADY_DEFINED
> #else
>-#define yyget_lval ppget_lval
>+#    define yyget_lval ppget_lval
> #endif
> 
>-    
> #ifdef yyset_lval
>-#define ppset_lval_ALREADY_DEFINED
>+#    define ppset_lval_ALREADY_DEFINED
> #else
>-#define yyset_lval ppset_lval
>+#    define yyset_lval ppset_lval
> #endif
> 
>-
>-
>-
>-    
> #ifdef yyget_lloc
>-#define ppget_lloc_ALREADY_DEFINED
>+#    define ppget_lloc_ALREADY_DEFINED
> #else
>-#define yyget_lloc ppget_lloc
>+#    define yyget_lloc ppget_lloc
> #endif
> 
>-    
> #ifdef yyset_lloc
>-#define ppset_lloc_ALREADY_DEFINED
>+#    define ppset_lloc_ALREADY_DEFINED
> #else
>-#define yyset_lloc ppset_lloc
>+#    define yyset_lloc ppset_lloc
> #endif
> 
>-
>-
>-
> #ifdef yyalloc
>-#define ppalloc_ALREADY_DEFINED
>+#    define ppalloc_ALREADY_DEFINED
> #else
>-#define yyalloc ppalloc
>+#    define yyalloc ppalloc
> #endif
> 
>-    
> #ifdef yyrealloc
>-#define pprealloc_ALREADY_DEFINED
>+#    define pprealloc_ALREADY_DEFINED
> #else
>-#define yyrealloc pprealloc
>+#    define yyrealloc pprealloc
> #endif
> 
>-    
> #ifdef yyfree
>-#define ppfree_ALREADY_DEFINED
>+#    define ppfree_ALREADY_DEFINED
> #else
>-#define yyfree ppfree
>+#    define yyfree ppfree
> #endif
> 
>-
>-
>-
>-
>-
>-
>-
>-
> /* First, we deal with  platform-specific or compiler-specific issues. */
> 
> /* begin standard C headers. */
>-#include <stdio.h>
>-#include <string.h>
> #include <errno.h>
>+#include <stdio.h>
> #include <stdlib.h>
>+#include <string.h>
> 
> /* end standard C headers. */
> 
> /* flex integer type definitions */
> 
> #ifndef FLEXINT_H
>-#define FLEXINT_H
>+#    define FLEXINT_H
> 
> /* C99 systems have <inttypes.h>. Non-C99 systems may or may not. */
> 
>-#if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
>+#    if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
> 
> /* C99 says to define __STDC_LIMIT_MACROS before including stdint.h,
>- * if you want the limit (max/min) macros for int types. 
>+ * if you want the limit (max/min) macros for int types.
>  */
>-#ifndef __STDC_LIMIT_MACROS
>-#define __STDC_LIMIT_MACROS 1
>-#endif
>+#        ifndef __STDC_LIMIT_MACROS
>+#            define __STDC_LIMIT_MACROS 1
>+#        endif
> 
>-#include <inttypes.h>
>+#        include <inttypes.h>
> typedef int8_t flex_int8_t;
> typedef uint8_t flex_uint8_t;
> typedef int16_t flex_int16_t;
> typedef uint16_t flex_uint16_t;
> typedef int32_t flex_int32_t;
> typedef uint32_t flex_uint32_t;
>-#else
>+#    else
> typedef signed char flex_int8_t;
> typedef short int flex_int16_t;
> typedef int flex_int32_t;
>-typedef unsigned char flex_uint8_t; 
>+typedef unsigned char flex_uint8_t;
> typedef unsigned short int flex_uint16_t;
> typedef unsigned int flex_uint32_t;
> 
> /* Limits of integral types. */
>-#ifndef INT8_MIN
>-#define INT8_MIN               (-128)
>-#endif
>-#ifndef INT16_MIN
>-#define INT16_MIN              (-32767-1)
>-#endif
>-#ifndef INT32_MIN
>-#define INT32_MIN              (-2147483647-1)
>-#endif
>-#ifndef INT8_MAX
>-#define INT8_MAX               (127)
>-#endif
>-#ifndef INT16_MAX
>-#define INT16_MAX              (32767)
>-#endif
>-#ifndef INT32_MAX
>-#define INT32_MAX              (2147483647)
>-#endif
>-#ifndef UINT8_MAX
>-#define UINT8_MAX              (255U)
>-#endif
>-#ifndef UINT16_MAX
>-#define UINT16_MAX             (65535U)
>-#endif
>-#ifndef UINT32_MAX
>-#define UINT32_MAX             (4294967295U)
>-#endif
>-
>-#ifndef SIZE_MAX
>-#define SIZE_MAX               (~(size_t)0)
>-#endif
>-
>-#endif /* ! C99 */
>+#        ifndef INT8_MIN
>+#            define INT8_MIN (-128)
>+#        endif
>+#        ifndef INT16_MIN
>+#            define INT16_MIN (-32767 - 1)
>+#        endif
>+#        ifndef INT32_MIN
>+#            define INT32_MIN (-2147483647 - 1)
>+#        endif
>+#        ifndef INT8_MAX
>+#            define INT8_MAX (127)
>+#        endif
>+#        ifndef INT16_MAX
>+#            define INT16_MAX (32767)
>+#        endif
>+#        ifndef INT32_MAX
>+#            define INT32_MAX (2147483647)
>+#        endif
>+#        ifndef UINT8_MAX
>+#            define UINT8_MAX (255U)
>+#        endif
>+#        ifndef UINT16_MAX
>+#            define UINT16_MAX (65535U)
>+#        endif
>+#        ifndef UINT32_MAX
>+#            define UINT32_MAX (4294967295U)
>+#        endif
>+
>+#        ifndef SIZE_MAX
>+#            define SIZE_MAX (~(size_t)0)
>+#        endif
>+
>+#    endif /* ! C99 */
> 
> #endif /* ! FLEXINT_H */
> 
>-
> /* begin standard C++ headers. */
> 
> /* TODO: this is always defined, so inline it */
> #define yyconst const
> 
> #if defined(__GNUC__) && __GNUC__ >= 3
>-#define yynoreturn __attribute__((__noreturn__))
>+#    define yynoreturn __attribute__((__noreturn__))
> #else
>-#define yynoreturn
>+#    define yynoreturn
> #endif
> 
> /* Returned upon end-of-file. */
> #define YY_NULL 0
> 
>-
> /* Promotes a possibly negative, possibly signed char to an
>  *   integer in range [0..255] for use as an array index.
>  */
>-#define YY_SC_TO_UI(c) ((YY_CHAR) (c))
>-
>-
>-
>-
>+#define YY_SC_TO_UI(c) ((YY_CHAR)(c))
> 
> /* An opaque pointer. */
> #ifndef YY_TYPEDEF_YY_SCANNER_T
>-#define YY_TYPEDEF_YY_SCANNER_T
>-typedef void* yyscan_t;
>+#    define YY_TYPEDEF_YY_SCANNER_T
>+typedef void *yyscan_t;
> #endif
> 
>-
>-
>-
>-
>-
>-
>-
>-
>-
>-
>-
>-
>-
>-
>-
>-
> /* For convenience, these vars (plus the bison vars far below)
>    are macros in the reentrant scanner. */
> #define yyin yyg->yyin_r
>@@ -469,18 +367,6 @@ typedef void* yyscan_t;
> #define yycolumn (YY_CURRENT_BUFFER_LVALUE->yy_bs_column)
> #define yy_flex_debug yyg->yy_flex_debug_r
> 
>-
>-
>-
>-
>-
>-
>-
>-
>-
>-
>-
>-
> /* Enter a start condition.  This macro really ought to take a parameter,
>  * but we do it the disgusting crufty way forced on us by the ()-less
>  * definition of BEGIN.
>@@ -495,385 +381,285 @@ typedef void* yyscan_t;
> /* Action number for EOF rule of a given start state. */
> #define YY_STATE_EOF(state) (YY_END_OF_BUFFER + state + 1)
> /* Special action meaning "start processing a new file". */
>-#define YY_NEW_FILE yyrestart( yyin , yyscanner )
>+#define YY_NEW_FILE yyrestart(yyin, yyscanner)
> #define YY_END_OF_BUFFER_CHAR 0
> 
>-
> /* Size of default input buffer. */
> #ifndef YY_BUF_SIZE
>-#ifdef __ia64__
>+#    ifdef __ia64__
> /* On IA-64, the buffer size is 16k, not 8k.
>  * Moreover, YY_BUF_SIZE is 2*YY_READ_BUF_SIZE in the general case.
>  * Ditto for the __ia64__ case accordingly.
>  */
>-#define YY_BUF_SIZE 32768
>-#else
>-#define YY_BUF_SIZE 16384
>-#endif /* __ia64__ */
>+#        define YY_BUF_SIZE 32768
>+#    else
>+#        define YY_BUF_SIZE 16384
>+#    endif /* __ia64__ */
> #endif
> 
>-
> /* The state buf must be large enough to hold one state per character in the main buffer.
>  */
>-#define YY_STATE_BUF_SIZE   ((YY_BUF_SIZE + 2) * sizeof(yy_state_type))
>-
>-
>+#define YY_STATE_BUF_SIZE ((YY_BUF_SIZE + 2) * sizeof(yy_state_type))
> 
> #ifndef YY_TYPEDEF_YY_BUFFER_STATE
>-#define YY_TYPEDEF_YY_BUFFER_STATE
>+#    define YY_TYPEDEF_YY_BUFFER_STATE
> typedef struct yy_buffer_state *YY_BUFFER_STATE;
> #endif
> 
> #ifndef YY_TYPEDEF_YY_SIZE_T
>-#define YY_TYPEDEF_YY_SIZE_T
>+#    define YY_TYPEDEF_YY_SIZE_T
> typedef size_t yy_size_t;
> #endif
> 
>-
>-
>-
> #define EOB_ACT_CONTINUE_SCAN 0
> #define EOB_ACT_END_OF_FILE 1
> #define EOB_ACT_LAST_MATCH 2
>-    
>-    #define YY_LESS_LINENO(n)
>-    #define YY_LINENO_REWIND_TO(ptr)
>-    
>-/* Return all but the first "n" matched characters back to the input stream. */
>-#define yyless(n) \
>-	do \
>-		{ \
>-		/* Undo effects of setting up yytext. */ \
>-        int yyless_macro_arg = (n); \
>-        YY_LESS_LINENO(yyless_macro_arg);\
>-		*yy_cp = yyg->yy_hold_char; \
>-		YY_RESTORE_YY_MORE_OFFSET \
>-		yyg->yy_c_buf_p = yy_cp = yy_bp + yyless_macro_arg - YY_MORE_ADJ; \
>-		YY_DO_BEFORE_ACTION; /* set up yytext again */ \
>-		} \
>-	while ( 0 )
>-#define unput(c) yyunput( c, yyg->yytext_ptr , yyscanner )
> 
>+#define YY_LESS_LINENO(n)
>+#define YY_LINENO_REWIND_TO(ptr)
>+
>+/* Return all but the first "n" matched characters back to the input stream. */
>+#define yyless(n)                                                         \
>+    do                                                                    \
>+    {                                                                     \
>+        /* Undo effects of setting up yytext. */                          \
>+        int yyless_macro_arg = (n);                                       \
>+        YY_LESS_LINENO(yyless_macro_arg);                                 \
>+        *yy_cp = yyg->yy_hold_char;                                       \
>+        YY_RESTORE_YY_MORE_OFFSET                                         \
>+        yyg->yy_c_buf_p = yy_cp = yy_bp + yyless_macro_arg - YY_MORE_ADJ; \
>+        YY_DO_BEFORE_ACTION; /* set up yytext again */                    \
>+    } while (0)
>+#define unput(c) yyunput(c, yyg->yytext_ptr, yyscanner)
> 
> #ifndef YY_STRUCT_YY_BUFFER_STATE
>-#define YY_STRUCT_YY_BUFFER_STATE
>+#    define YY_STRUCT_YY_BUFFER_STATE
> struct yy_buffer_state
>-	{
>-	FILE *yy_input_file;
>-
>-
>+{
>+    FILE *yy_input_file;
> 
>-	char *yy_ch_buf;		/* input buffer */
>-	char *yy_buf_pos;		/* current position in input buffer */
>+    char *yy_ch_buf;  /* input buffer */
>+    char *yy_buf_pos; /* current position in input buffer */
> 
>-	/* Size of input buffer in bytes, not including room for EOB
>-	 * characters.
>-	 */
>-	int yy_buf_size;
>+    /* Size of input buffer in bytes, not including room for EOB
>+     * characters.
>+     */
>+    int yy_buf_size;
> 
>-	/* Number of characters read into yy_ch_buf, not including EOB
>-	 * characters.
>-	 */
>-	int yy_n_chars;
>+    /* Number of characters read into yy_ch_buf, not including EOB
>+     * characters.
>+     */
>+    int yy_n_chars;
> 
>-	/* Whether we "own" the buffer - i.e., we know we created it,
>-	 * and can realloc() it to grow it, and should free() it to
>-	 * delete it.
>-	 */
>-	int yy_is_our_buffer;
>+    /* Whether we "own" the buffer - i.e., we know we created it,
>+     * and can realloc() it to grow it, and should free() it to
>+     * delete it.
>+     */
>+    int yy_is_our_buffer;
> 
>-	/* Whether this is an "interactive" input source; if so, and
>-	 * if we're using stdio for input, then we want to use getc()
>-	 * instead of fread(), to make sure we stop fetching input after
>-	 * each newline.
>-	 */
>-	int yy_is_interactive;
>+    /* Whether this is an "interactive" input source; if so, and
>+     * if we're using stdio for input, then we want to use getc()
>+     * instead of fread(), to make sure we stop fetching input after
>+     * each newline.
>+     */
>+    int yy_is_interactive;
> 
>-	/* Whether we're considered to be at the beginning of a line.
>-	 * If so, '^' rules will be active on the next match, otherwise
>-	 * not.
>-	 */
>-	int yy_at_bol;
>+    /* Whether we're considered to be at the beginning of a line.
>+     * If so, '^' rules will be active on the next match, otherwise
>+     * not.
>+     */
>+    int yy_at_bol;
> 
>     int yy_bs_lineno; /**< The line count. */
>     int yy_bs_column; /**< The column count. */
> 
>-
>-	/* Whether to try to fill the input buffer when we reach the
>-	 * end of it.
>-	 */
>-	int yy_fill_buffer;
>-
>-	int yy_buffer_status;
>-
>-#define YY_BUFFER_NEW 0
>-#define YY_BUFFER_NORMAL 1
>-	/* When an EOF's been seen but there's still some text to process
>-	 * then we mark the buffer as YY_EOF_PENDING, to indicate that we
>-	 * shouldn't try reading from the input source any more.  We might
>-	 * still have a bunch of tokens to match, though, because of
>-	 * possible backing-up.
>-	 *
>-	 * When we actually see the EOF, we change the status to "new"
>-	 * (via yyrestart()), so that the user can continue scanning by
>-	 * just pointing yyin at a new input file.
>-	 */
>-#define YY_BUFFER_EOF_PENDING 2
>-
>-	};
>+    /* Whether to try to fill the input buffer when we reach the
>+     * end of it.
>+     */
>+    int yy_fill_buffer;
>+
>+    int yy_buffer_status;
>+
>+#    define YY_BUFFER_NEW 0
>+#    define YY_BUFFER_NORMAL 1
>+    /* When an EOF's been seen but there's still some text to process
>+     * then we mark the buffer as YY_EOF_PENDING, to indicate that we
>+     * shouldn't try reading from the input source any more.  We might
>+     * still have a bunch of tokens to match, though, because of
>+     * possible backing-up.
>+     *
>+     * When we actually see the EOF, we change the status to "new"
>+     * (via yyrestart()), so that the user can continue scanning by
>+     * just pointing yyin at a new input file.
>+     */
>+#    define YY_BUFFER_EOF_PENDING 2
>+};
> #endif /* !YY_STRUCT_YY_BUFFER_STATE */
> 
>-
>-
>-
> /* We provide macros for accessing buffer states in case in the
>  * future we want to put the buffer states in a more general
>  * "scanner state".
>  *
>  * Returns the top of the stack, or NULL.
>  */
>-#define YY_CURRENT_BUFFER ( yyg->yy_buffer_stack \
>-                          ? yyg->yy_buffer_stack[yyg->yy_buffer_stack_top] \
>-                          : NULL)
>+#define YY_CURRENT_BUFFER \
>+    (yyg->yy_buffer_stack ? yyg->yy_buffer_stack[yyg->yy_buffer_stack_top] : NULL)
> /* Same as previous macro, but useful when we know that the buffer stack is not
>  * NULL or when we need an lvalue. For internal use only.
>  */
> #define YY_CURRENT_BUFFER_LVALUE yyg->yy_buffer_stack[yyg->yy_buffer_stack_top]
> 
>+void yyrestart(FILE *input_file, yyscan_t yyscanner);
>+void yy_switch_to_buffer(YY_BUFFER_STATE new_buffer, yyscan_t yyscanner);
>+YY_BUFFER_STATE yy_create_buffer(FILE *file, int size, yyscan_t yyscanner);
>+void yy_delete_buffer(YY_BUFFER_STATE b, yyscan_t yyscanner);
>+void yy_flush_buffer(YY_BUFFER_STATE b, yyscan_t yyscanner);
>+void yypush_buffer_state(YY_BUFFER_STATE new_buffer, yyscan_t yyscanner);
>+void yypop_buffer_state(yyscan_t yyscanner);
> 
>+static void yyensure_buffer_stack(yyscan_t yyscanner);
>+static void yy_load_buffer_state(yyscan_t yyscanner);
>+static void yy_init_buffer(YY_BUFFER_STATE b, FILE *file, yyscan_t yyscanner);
>+#define YY_FLUSH_BUFFER yy_flush_buffer(YY_CURRENT_BUFFER, yyscanner)
> 
>+YY_BUFFER_STATE yy_scan_buffer(char *base, yy_size_t size, yyscan_t yyscanner);
>+YY_BUFFER_STATE yy_scan_string(const char *yy_str, yyscan_t yyscanner);
>+YY_BUFFER_STATE yy_scan_bytes(const char *bytes, int len, yyscan_t yyscanner);
> 
>-
>-void yyrestart ( FILE *input_file , yyscan_t yyscanner );
>-void yy_switch_to_buffer ( YY_BUFFER_STATE new_buffer , yyscan_t yyscanner );
>-YY_BUFFER_STATE yy_create_buffer ( FILE *file, int size , yyscan_t yyscanner );
>-void yy_delete_buffer ( YY_BUFFER_STATE b , yyscan_t yyscanner );
>-void yy_flush_buffer ( YY_BUFFER_STATE b , yyscan_t yyscanner );
>-void yypush_buffer_state ( YY_BUFFER_STATE new_buffer , yyscan_t yyscanner );
>-void yypop_buffer_state ( yyscan_t yyscanner );
>-
>-
>-static void yyensure_buffer_stack ( yyscan_t yyscanner );
>-static void yy_load_buffer_state ( yyscan_t yyscanner );
>-static void yy_init_buffer ( YY_BUFFER_STATE b, FILE *file , yyscan_t yyscanner );
>-#define YY_FLUSH_BUFFER yy_flush_buffer( YY_CURRENT_BUFFER , yyscanner)
>-
>-
>-YY_BUFFER_STATE yy_scan_buffer ( char *base, yy_size_t size , yyscan_t yyscanner );
>-YY_BUFFER_STATE yy_scan_string ( const char *yy_str , yyscan_t yyscanner );
>-YY_BUFFER_STATE yy_scan_bytes ( const char *bytes, int len , yyscan_t yyscanner );
>-
>-
>-void *yyalloc ( yy_size_t , yyscan_t yyscanner );
>-void *yyrealloc ( void *, yy_size_t , yyscan_t yyscanner );
>-void yyfree ( void * , yyscan_t yyscanner );
>-
>+void *yyalloc(yy_size_t, yyscan_t yyscanner);
>+void *yyrealloc(void *, yy_size_t, yyscan_t yyscanner);
>+void yyfree(void *, yyscan_t yyscanner);
> 
> #define yy_new_buffer yy_create_buffer
>-#define yy_set_interactive(is_interactive) \
>-	{ \
>-	if ( ! YY_CURRENT_BUFFER ){ \
>-        yyensure_buffer_stack (yyscanner); \
>-		YY_CURRENT_BUFFER_LVALUE =    \
>-            yy_create_buffer( yyin, YY_BUF_SIZE , yyscanner); \
>-	} \
>-	YY_CURRENT_BUFFER_LVALUE->yy_is_interactive = is_interactive; \
>-	}
>-#define yy_set_bol(at_bol) \
>-	{ \
>-	if ( ! YY_CURRENT_BUFFER ){\
>-        yyensure_buffer_stack (yyscanner); \
>-		YY_CURRENT_BUFFER_LVALUE =    \
>-            yy_create_buffer( yyin, YY_BUF_SIZE , yyscanner); \
>-	} \
>-	YY_CURRENT_BUFFER_LVALUE->yy_at_bol = at_bol; \
>-	}
>+#define yy_set_interactive(is_interactive)                                             \
>+    {                                                                                  \
>+        if (!YY_CURRENT_BUFFER)                                                        \
>+        {                                                                              \
>+            yyensure_buffer_stack(yyscanner);                                          \
>+            YY_CURRENT_BUFFER_LVALUE = yy_create_buffer(yyin, YY_BUF_SIZE, yyscanner); \
>+        }                                                                              \
>+        YY_CURRENT_BUFFER_LVALUE->yy_is_interactive = is_interactive;                  \
>+    }
>+#define yy_set_bol(at_bol)                                                             \
>+    {                                                                                  \
>+        if (!YY_CURRENT_BUFFER)                                                        \
>+        {                                                                              \
>+            yyensure_buffer_stack(yyscanner);                                          \
>+            YY_CURRENT_BUFFER_LVALUE = yy_create_buffer(yyin, YY_BUF_SIZE, yyscanner); \
>+        }                                                                              \
>+        YY_CURRENT_BUFFER_LVALUE->yy_at_bol = at_bol;                                  \
>+    }
> #define YY_AT_BOL() (YY_CURRENT_BUFFER_LVALUE->yy_at_bol)
> 
>-
> /* Begin user sect3 */
> 
>-#define ppwrap(yyscanner) (/*CONSTCOND*/1)
>+#define ppwrap(yyscanner) (/*CONSTCOND*/ 1)
> #define YY_SKIP_YYWRAP
> typedef flex_uint8_t YY_CHAR;
> 
>-
> typedef int yy_state_type;
> 
> #define yytext_ptr yytext_r
> 
>-
>-
>-
>-
>-
>-static yy_state_type yy_get_previous_state ( yyscan_t yyscanner );
>-static yy_state_type yy_try_NUL_trans ( yy_state_type current_state  , yyscan_t yyscanner);
>-static int yy_get_next_buffer ( yyscan_t yyscanner );
>-static void yynoreturn yy_fatal_error ( const char* msg , yyscan_t yyscanner );
>-
>-
>-
>+static yy_state_type yy_get_previous_state(yyscan_t yyscanner);
>+static yy_state_type yy_try_NUL_trans(yy_state_type current_state, yyscan_t yyscanner);
>+static int yy_get_next_buffer(yyscan_t yyscanner);
>+static void yynoreturn yy_fatal_error(const char *msg, yyscan_t yyscanner);
> 
> /* Done after the current pattern has been matched and before the
>  * corresponding action - sets up yytext.
>  */
>-#define YY_DO_BEFORE_ACTION \
>-	yyg->yytext_ptr = yy_bp; \
>-	yyleng = (int) (yy_cp - yy_bp); \
>-	yyg->yy_hold_char = *yy_cp; \
>-	*yy_cp = '\0'; \
>-	yyg->yy_c_buf_p = yy_cp;
>+#define YY_DO_BEFORE_ACTION                   \
>+    yyg->yytext_ptr   = yy_bp;                \
>+    yyleng            = (int)(yy_cp - yy_bp); \
>+    yyg->yy_hold_char = *yy_cp;               \
>+    *yy_cp            = '\0';                 \
>+    yyg->yy_c_buf_p   = yy_cp;
> #define YY_NUM_RULES 37
> #define YY_END_OF_BUFFER 38
> /* This struct is not used in this scanner,
>    but its presence is necessary. */
> struct yy_trans_info
>-	{
>-	flex_int32_t yy_verify;
>-	flex_int32_t yy_nxt;
>-	};
>-static const flex_int16_t yy_accept[95] =
>-    {   0,
>-        0,    0,    0,    0,   38,   36,   34,   35,   35,   33,
>-        7,   33,   33,   33,   33,   33,   33,   33,   33,    9,
>-        9,   33,   33,   33,    8,   33,   33,    3,    5,    5,
>-        4,   34,   35,   19,   27,   20,   30,   25,   12,   23,
>-       13,   24,   10,    2,    1,   26,   10,    9,   11,   11,
>-       11,    9,   11,    9,    9,   14,   16,   18,   17,   15,
>-        8,   31,   21,   32,   22,    3,    5,    6,   11,   10,
>-       11,   10,    1,   10,   11,   10,    0,   10,    9,    9,
>-        9,   28,   29,    0,   10,   10,   10,   10,    9,   10,
>-       10,    9,   10,    0
>-
>-    } ;
>-
>-static const YY_CHAR yy_ec[256] =
>-    {   0,
>-        1,    1,    1,    1,    1,    1,    1,    1,    2,    3,
>-        2,    2,    4,    1,    1,    1,    1,    1,    1,    1,
>-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
>-        1,    2,    5,    1,    6,    1,    7,    8,    1,    9,
>-        9,   10,   11,    9,   12,   13,   14,   15,   16,   16,
>-       16,   16,   16,   16,   16,   17,   17,    9,    9,   18,
>-       19,   20,    9,    1,   21,   21,   21,   21,   22,   23,
>-       24,   24,   24,   24,   24,   24,   24,   24,   24,   24,
>-       24,   24,   24,   24,   25,   24,   24,   26,   24,   24,
>-        9,    1,    9,   27,   24,    1,   21,   21,   21,   21,
>-
>-       22,   23,   24,   24,   24,   24,   24,   24,   24,   24,
>-       24,   24,   24,   24,   24,   24,   25,   24,   24,   26,
>-       24,   24,    9,   28,    9,    9,    1,    1,    1,    1,
>-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
>-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
>-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
>-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
>-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
>-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
>-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
>-
>-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
>-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
>-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
>-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
>-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
>-        1,    1,    1,    1,    1
>-    } ;
>-
>-static const YY_CHAR yy_meta[29] =
>-    {   0,
>-        1,    1,    2,    2,    1,    1,    1,    1,    1,    3,
>-        1,    1,    4,    1,    5,    5,    5,    1,    1,    1,
>-        5,    5,    5,    5,    5,    5,    1,    1
>-    } ;
>-
>-static const flex_int16_t yy_base[100] =
>-    {   0,
>-        0,    0,   26,   28,  133,  195,  130,  195,  128,  105,
>-      195,  104,   25,  195,  100,   23,   27,   32,   31,   38,
>-       50,   38,   93,   49,    0,   16,   51,    0,  195,  105,
>-       87,   93,  195,  195,  195,  195,  195,  195,  195,  195,
>-      195,  195,   67,  195,    0,  195,   81,   55,   84,   98,
>-      110,   53,   61,    0,   52,   39,  195,  195,  195,   33,
>-        0,  195,  195,  195,  195,    0,  195,  195,  113,    0,
>-      126,    0,    0,    0,  133,    0,   56,  128,    0,  133,
>-        0,  195,  195,  101,  141,  143,  145,    0,   15,  154,
>-      195,    0,  195,  195,  177,   32,  182,  187,  189
>-
>-    } ;
>-
>-static const flex_int16_t yy_def[100] =
>-    {   0,
>-       94,    1,   95,   95,   94,   94,   94,   94,   94,   94,
>-       94,   94,   94,   94,   94,   94,   94,   94,   94,   94,
>-       20,   94,   94,   94,   96,   94,   94,   97,   94,   94,
>-       94,   94,   94,   94,   94,   94,   94,   94,   94,   94,
>-       94,   94,   94,   94,   98,   94,   94,   20,   20,   49,
>-       50,   50,   99,   21,   50,   94,   94,   94,   94,   94,
>-       96,   94,   94,   94,   94,   97,   94,   94,   43,   43,
>-       69,   69,   98,   47,   50,   50,   94,   51,   50,   99,
>-       50,   94,   94,   94,   71,   75,   94,   50,   50,   94,
>-       94,   50,   94,    0,   94,   94,   94,   94,   94
>-
>-    } ;
>-
>-static const flex_int16_t yy_nxt[224] =
>-    {   0,
>-        6,    7,    8,    9,   10,   11,   12,   13,   14,   15,
>-       16,   17,   18,   19,   20,   21,   21,   22,   23,   24,
>-       25,   25,   25,   25,   25,   25,   26,   27,   29,   30,
>-       29,   30,   36,   39,   62,   31,   61,   31,   41,   92,
>-       44,   40,   63,   37,   45,   42,   43,   43,   43,   46,
>-       47,   83,   48,   48,   49,   56,   57,   82,   50,   51,
>-       50,   50,   52,   53,   54,   54,   54,   59,   60,   64,
>-       87,   87,   87,   50,   55,   50,   81,   79,   65,   69,
>-       50,   70,   70,   70,   50,   50,   50,   69,   71,   72,
>-       69,   69,   69,   50,   32,   74,   74,   74,   49,   49,
>-
>-       68,   50,   75,   76,   50,   50,   50,   67,   50,   50,
>-       50,   58,   50,   50,   50,   90,   90,   90,   38,   50,
>-       77,   77,   35,   34,   78,   78,   78,   69,   69,   69,
>-       33,   32,   94,   94,   69,   69,   84,   84,   94,   94,
>-       85,   85,   85,   84,   84,   50,   94,   86,   86,   86,
>-       88,   94,   94,   94,   94,   94,   50,   89,   50,   87,
>-       87,   87,   94,   72,   94,   76,   94,   91,   90,   90,
>-       90,   94,   94,   94,   94,   94,   93,   28,   28,   28,
>-       28,   28,   66,   94,   94,   66,   66,   73,   94,   73,
>-       73,   73,   80,   80,    5,   94,   94,   94,   94,   94,
>-
>-       94,   94,   94,   94,   94,   94,   94,   94,   94,   94,
>-       94,   94,   94,   94,   94,   94,   94,   94,   94,   94,
>-       94,   94,   94
>-    } ;
>-
>-static const flex_int16_t yy_chk[224] =
>-    {   0,
>-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
>-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
>-        1,    1,    1,    1,    1,    1,    1,    1,    3,    3,
>-        4,    4,   13,   16,   26,    3,   96,    4,   17,   89,
>-       19,   16,   26,   13,   19,   17,   18,   18,   18,   19,
>-       20,   60,   20,   20,   20,   22,   22,   56,   20,   20,
>-       20,   20,   20,   20,   21,   21,   21,   24,   24,   27,
>-       77,   77,   77,   53,   21,   21,   55,   52,   27,   43,
>-       48,   43,   43,   43,   53,   53,   53,   43,   43,   43,
>-       43,   43,   43,   47,   32,   47,   47,   47,   49,   49,
>-
>-       31,   47,   47,   47,   47,   47,   47,   30,   49,   49,
>-       50,   23,   50,   50,   50,   84,   84,   84,   15,   50,
>-       51,   51,   12,   10,   51,   51,   51,   69,   69,   69,
>-        9,    7,    5,    0,   69,   69,   71,   71,   78,   78,
>-       71,   71,   71,   75,   75,   80,    0,   75,   75,   75,
>-       78,   85,   85,   86,   86,    0,   80,   80,   80,   87,
>-       87,   87,    0,   85,    0,   86,    0,   87,   90,   90,
>-       90,    0,    0,    0,    0,    0,   90,   95,   95,   95,
>-       95,   95,   97,    0,    0,   97,   97,   98,    0,   98,
>-       98,   98,   99,   99,   94,   94,   94,   94,   94,   94,
>-
>-       94,   94,   94,   94,   94,   94,   94,   94,   94,   94,
>-       94,   94,   94,   94,   94,   94,   94,   94,   94,   94,
>-       94,   94,   94
>-    } ;
>+{
>+    flex_int32_t yy_verify;
>+    flex_int32_t yy_nxt;
>+};
>+static const flex_int16_t yy_accept[95] = {
>+    0,  0,  0,  0,  0,  38, 36, 34, 35, 35, 33, 7,  33, 33, 33, 33, 33, 33, 33, 33, 9, 9,  33, 33,
>+    33, 8,  33, 33, 3,  5,  5,  4,  34, 35, 19, 27, 20, 30, 25, 12, 23, 13, 24, 10, 2, 1,  26, 10,
>+    9,  11, 11, 11, 9,  11, 9,  9,  14, 16, 18, 17, 15, 8,  31, 21, 32, 22, 3,  5,  6, 11, 10, 11,
>+    10, 1,  10, 11, 10, 0,  10, 9,  9,  9,  28, 29, 0,  10, 10, 10, 10, 9,  10, 10, 9, 10, 0
>+
>+};
>+
>+static const YY_CHAR yy_ec[256] = {
>+    0,  1,  1,  1,  1,  1,  1,  1,  1,  2,  3,  2,  2,  4,  1,  1,  1,  1,  1,  1,  1,
>+    1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  2,  5,  1,  6,  1,  7,  8,  1,  9,  9,
>+    10, 11, 9,  12, 13, 14, 15, 16, 16, 16, 16, 16, 16, 16, 17, 17, 9,  9,  18, 19, 20,
>+    9,  1,  21, 21, 21, 21, 22, 23, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
>+    24, 25, 24, 24, 26, 24, 24, 9,  1,  9,  27, 24, 1,  21, 21, 21, 21,
>+
>+    22, 23, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 25, 24, 24, 26, 24,
>+    24, 9,  28, 9,  9,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,
>+    1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,
>+    1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,
>+    1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,
>+
>+    1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,
>+    1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,
>+    1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1};
>+
>+static const YY_CHAR yy_meta[29] = {0, 1, 1, 2, 2, 1, 1, 1, 1, 1, 3, 1, 1, 4, 1,
>+                                    5, 5, 5, 1, 1, 1, 5, 5, 5, 5, 5, 5, 1, 1};
>+
>+static const flex_int16_t yy_base[100] = {
>+    0,   0,   0,   26,  28,  133, 195, 130, 195, 128, 105, 195, 104, 25,  195, 100, 23,
>+    27,  32,  31,  38,  50,  38,  93,  49,  0,   16,  51,  0,   195, 105, 87,  93,  195,
>+    195, 195, 195, 195, 195, 195, 195, 195, 195, 67,  195, 0,   195, 81,  55,  84,  98,
>+    110, 53,  61,  0,   52,  39,  195, 195, 195, 33,  0,   195, 195, 195, 195, 0,   195,
>+    195, 113, 0,   126, 0,   0,   0,   133, 0,   56,  128, 0,   133, 0,   195, 195, 101,
>+    141, 143, 145, 0,   15,  154, 195, 0,   195, 195, 177, 32,  182, 187, 189
>+
>+};
>+
>+static const flex_int16_t yy_def[100] = {
>+    0,  94, 1,  95, 95, 94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 94,
>+    20, 94, 94, 94, 96, 94, 94, 97, 94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 94,
>+    94, 94, 94, 98, 94, 94, 20, 20, 49, 50, 50, 99, 21, 50, 94, 94, 94, 94, 94, 96, 94,
>+    94, 94, 94, 97, 94, 94, 43, 43, 69, 69, 98, 47, 50, 50, 94, 51, 50, 99, 50, 94, 94,
>+    94, 71, 75, 94, 50, 50, 94, 94, 50, 94, 0,  94, 94, 94, 94, 94
>+
>+};
>+
>+static const flex_int16_t yy_nxt[224] = {
>+    0,  6,  7,  8,  9,  10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 21, 22, 23, 24, 25, 25,
>+    25, 25, 25, 25, 26, 27, 29, 30, 29, 30, 36, 39, 62, 31, 61, 31, 41, 92, 44, 40, 63, 37, 45,
>+    42, 43, 43, 43, 46, 47, 83, 48, 48, 49, 56, 57, 82, 50, 51, 50, 50, 52, 53, 54, 54, 54, 59,
>+    60, 64, 87, 87, 87, 50, 55, 50, 81, 79, 65, 69, 50, 70, 70, 70, 50, 50, 50, 69, 71, 72, 69,
>+    69, 69, 50, 32, 74, 74, 74, 49, 49,
>+
>+    68, 50, 75, 76, 50, 50, 50, 67, 50, 50, 50, 58, 50, 50, 50, 90, 90, 90, 38, 50, 77, 77, 35,
>+    34, 78, 78, 78, 69, 69, 69, 33, 32, 94, 94, 69, 69, 84, 84, 94, 94, 85, 85, 85, 84, 84, 50,
>+    94, 86, 86, 86, 88, 94, 94, 94, 94, 94, 50, 89, 50, 87, 87, 87, 94, 72, 94, 76, 94, 91, 90,
>+    90, 90, 94, 94, 94, 94, 94, 93, 28, 28, 28, 28, 28, 66, 94, 94, 66, 66, 73, 94, 73, 73, 73,
>+    80, 80, 5,  94, 94, 94, 94, 94,
>+
>+    94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 94};
>+
>+static const flex_int16_t yy_chk[224] = {
>+    0,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,
>+    1,  1,  1,  1,  1,  1,  3,  3,  4,  4,  13, 16, 26, 3,  96, 4,  17, 89, 19, 16, 26, 13, 19,
>+    17, 18, 18, 18, 19, 20, 60, 20, 20, 20, 22, 22, 56, 20, 20, 20, 20, 20, 20, 21, 21, 21, 24,
>+    24, 27, 77, 77, 77, 53, 21, 21, 55, 52, 27, 43, 48, 43, 43, 43, 53, 53, 53, 43, 43, 43, 43,
>+    43, 43, 47, 32, 47, 47, 47, 49, 49,
>+
>+    31, 47, 47, 47, 47, 47, 47, 30, 49, 49, 50, 23, 50, 50, 50, 84, 84, 84, 15, 50, 51, 51, 12,
>+    10, 51, 51, 51, 69, 69, 69, 9,  7,  5,  0,  69, 69, 71, 71, 78, 78, 71, 71, 71, 75, 75, 80,
>+    0,  75, 75, 75, 78, 85, 85, 86, 86, 0,  80, 80, 80, 87, 87, 87, 0,  85, 0,  86, 0,  87, 90,
>+    90, 90, 0,  0,  0,  0,  0,  90, 95, 95, 95, 95, 95, 97, 0,  0,  97, 97, 98, 0,  98, 98, 98,
>+    99, 99, 94, 94, 94, 94, 94, 94,
>+
>+    94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 94};
> 
> /* The intent behind this definition is that it'll catch
>  * any uses of REJECT which flex missed.
>@@ -897,7 +683,7 @@ IF YOU MODIFY THIS FILE YOU ALSO NEED TO RUN generate_parser.sh.
> */
> 
> #if defined(_MSC_VER)
>-#pragma warning(disable: 4005)
>+#    pragma warning(disable : 4005)
> #endif
> 
> #include "compiler/preprocessor/Tokenizer.h"
>@@ -907,80 +693,76 @@ IF YOU MODIFY THIS FILE YOU ALSO NEED TO RUN generate_parser.sh.
> 
> #if defined(__GNUC__)
> // Triggered by the auto-generated yy_fatal_error function.
>-#pragma GCC diagnostic ignored "-Wmissing-noreturn"
>+#    pragma GCC diagnostic ignored "-Wmissing-noreturn"
> #elif defined(_MSC_VER)
>-#pragma warning(disable: 4244)
>+#    pragma warning(disable : 4244)
>+#endif
>+#if defined(__clang__)
>+// Flex uses `/*FALLTHROUGH*/` instead of dedicated statements.
>+#    pragma GCC diagnostic ignored "-Wimplicit-fallthrough"
>+// Flex isn't semi-colon clean.
>+#    pragma clang diagnostic ignored "-Wextra-semi-stmt"
> #endif
> 
> // Workaround for flex using the register keyword, deprecated in C++11.
> #ifdef __cplusplus
>-#if __cplusplus > 199711L
>-#define register
>-#endif
>+#    if __cplusplus > 199711L
>+#        define register
>+#    endif
> #endif
> 
> typedef std::string YYSTYPE;
>-typedef pp::SourceLocation YYLTYPE;
>+typedef angle::pp::SourceLocation YYLTYPE;
> 
> // Use the unused yycolumn variable to track file (string) number.
> #define yyfileno yycolumn
> 
> #define YY_USER_INIT                   \
>-    do {                               \
>-        yyfileno = 0;                  \
>-        yylineno = 1;                  \
>+    do                                 \
>+    {                                  \
>+        yyfileno              = 0;     \
>+        yylineno              = 1;     \
>         yyextra->leadingSpace = false; \
>-        yyextra->lineStart = true;     \
>-    } while(0);
>+        yyextra->lineStart    = true;  \
>+    } while (0);
> 
>+#define YY_NO_INPUT
> #define YY_USER_ACTION                                              \
>     do                                                              \
>     {                                                               \
>-        pp::Input* input = &yyextra->input;                         \
>-        pp::Input::Location* scanLoc = &yyextra->scanLoc;           \
>+        angle::pp::Input *input             = &yyextra->input;      \
>+        angle::pp::Input::Location *scanLoc = &yyextra->scanLoc;    \
>         while ((scanLoc->sIndex < input->count()) &&                \
>                (scanLoc->cIndex >= input->length(scanLoc->sIndex))) \
>         {                                                           \
>             scanLoc->cIndex -= input->length(scanLoc->sIndex++);    \
>-            ++yyfileno; yylineno = 1;                               \
>+            ++yyfileno;                                             \
>+            yylineno = 1;                                           \
>         }                                                           \
>         yylloc->file = yyfileno;                                    \
>         yylloc->line = yylineno;                                    \
>         scanLoc->cIndex += yyleng;                                  \
>-    } while(0);
>-
>-#define YY_INPUT(buf, result, maxSize) \
>-    result = yyextra->input.read(buf, maxSize, &yylineno);
>-
>-
>-
>+    } while (0);
> 
>+#define YY_INPUT(buf, result, maxSize) result = yyextra->input.read(buf, maxSize, &yylineno);
> 
> #define INITIAL 0
> #define COMMENT 1
> 
>-
>-
>-
>-
>-
>-#define YY_EXTRA_TYPE pp::Tokenizer::Context*
>-
>-
>-
>+#define YY_EXTRA_TYPE angle::pp::Tokenizer::Context *
> 
> /* Holds the entire state of the reentrant scanner. */
> struct yyguts_t
>-    {
>+{
> 
>     /* User-defined. Not touched by flex. */
>     YY_EXTRA_TYPE yyextra_r;
> 
>     /* The rest are the same as the globals declared in the non-reentrant scanner. */
>     FILE *yyin_r, *yyout_r;
>-    size_t yy_buffer_stack_top; /**< index of top of stack. */
>-    size_t yy_buffer_stack_max; /**< capacity of stack. */
>-    YY_BUFFER_STATE * yy_buffer_stack; /**< Stack as an array. */
>+    size_t yy_buffer_stack_top;       /**< index of top of stack. */
>+    size_t yy_buffer_stack_max;       /**< capacity of stack. */
>+    YY_BUFFER_STATE *yy_buffer_stack; /**< Stack as an array. */
>     char yy_hold_char;
>     int yy_n_chars;
>     int yyleng_r;
>@@ -992,1203 +774,1070 @@ struct yyguts_t
>     int yy_start_stack_depth;
>     int *yy_start_stack;
>     yy_state_type yy_last_accepting_state;
>-    char* yy_last_accepting_cpos;
>+    char *yy_last_accepting_cpos;
> 
>     int yylineno_r;
>     int yy_flex_debug_r;
> 
>-
>-
>-
>     char *yytext_r;
>     int yy_more_flag;
>     int yy_more_len;
> 
>+    YYSTYPE *yylval_r;
> 
>+    YYLTYPE *yylloc_r;
> 
>-    YYSTYPE * yylval_r;
>-
>+}; /* end struct yyguts_t */
> 
>+static int yy_init_globals(yyscan_t yyscanner);
> 
>-    YYLTYPE * yylloc_r;
>+/* This must go here because YYSTYPE and YYLTYPE are included
>+ * from bison output in section 1.*/
>+#define yylval yyg->yylval_r
> 
>+#define yylloc yyg->yylloc_r
> 
>-    }; /* end struct yyguts_t */
>-
>-
>-
>-
>-static int yy_init_globals ( yyscan_t yyscanner );
>-
>-
>-
>-
>-    
>-    /* This must go here because YYSTYPE and YYLTYPE are included
>-     * from bison output in section 1.*/
>-    #    define yylval yyg->yylval_r
>-    
>-
>-    
>-    #    define yylloc yyg->yylloc_r
>-    
>-
>-
>-int yylex_init (yyscan_t* scanner);
>-
>-int yylex_init_extra ( YY_EXTRA_TYPE user_defined, yyscan_t* scanner);
>-
>+int yylex_init(yyscan_t *scanner);
> 
>+int yylex_init_extra(YY_EXTRA_TYPE user_defined, yyscan_t *scanner);
> 
> /* Accessor methods to globals.
>    These are made visible to non-reentrant scanners for convenience. */
> 
>+int yylex_destroy(yyscan_t yyscanner);
> 
>-int yylex_destroy ( yyscan_t yyscanner );
>-
>-
>-
>-int yyget_debug ( yyscan_t yyscanner );
>-
>-
>-
>-void yyset_debug ( int debug_flag , yyscan_t yyscanner );
>-
>-
>-
>-YY_EXTRA_TYPE yyget_extra ( yyscan_t yyscanner );
>-
>-
>-
>-void yyset_extra ( YY_EXTRA_TYPE user_defined , yyscan_t yyscanner );
>-
>-
>-
>-FILE *yyget_in ( yyscan_t yyscanner );
>-
>-
>-
>-void yyset_in  ( FILE * _in_str , yyscan_t yyscanner );
>-
>+int yyget_debug(yyscan_t yyscanner);
> 
>+void yyset_debug(int debug_flag, yyscan_t yyscanner);
> 
>-FILE *yyget_out ( yyscan_t yyscanner );
>+YY_EXTRA_TYPE yyget_extra(yyscan_t yyscanner);
> 
>+void yyset_extra(YY_EXTRA_TYPE user_defined, yyscan_t yyscanner);
> 
>+FILE *yyget_in(yyscan_t yyscanner);
> 
>-void yyset_out  ( FILE * _out_str , yyscan_t yyscanner );
>+void yyset_in(FILE *_in_str, yyscan_t yyscanner);
> 
>+FILE *yyget_out(yyscan_t yyscanner);
> 
>+void yyset_out(FILE *_out_str, yyscan_t yyscanner);
> 
>-			int yyget_leng ( yyscan_t yyscanner );
>+int yyget_leng(yyscan_t yyscanner);
> 
>+char *yyget_text(yyscan_t yyscanner);
> 
>+int yyget_lineno(yyscan_t yyscanner);
> 
>-char *yyget_text ( yyscan_t yyscanner );
>+void yyset_lineno(int _line_number, yyscan_t yyscanner);
> 
>+int yyget_column(yyscan_t yyscanner);
> 
>+void yyset_column(int _column_no, yyscan_t yyscanner);
> 
>-int yyget_lineno ( yyscan_t yyscanner );
>+YYSTYPE *yyget_lval(yyscan_t yyscanner);
> 
>+void yyset_lval(YYSTYPE *yylval_param, yyscan_t yyscanner);
> 
>+YYLTYPE *yyget_lloc(yyscan_t yyscanner);
> 
>-void yyset_lineno ( int _line_number , yyscan_t yyscanner );
>-
>-
>-
>-
>-int yyget_column  ( yyscan_t yyscanner );
>-
>-
>-
>-
>-
>-void yyset_column ( int _column_no , yyscan_t yyscanner );
>-
>-
>-
>-
>-YYSTYPE * yyget_lval ( yyscan_t yyscanner );
>-
>-
>-void yyset_lval ( YYSTYPE * yylval_param , yyscan_t yyscanner );
>-
>-
>-    
>-       YYLTYPE *yyget_lloc ( yyscan_t yyscanner );
>-    
>-
>-    
>-        void yyset_lloc ( YYLTYPE * yylloc_param , yyscan_t yyscanner );
>-    
>-
>+void yyset_lloc(YYLTYPE *yylloc_param, yyscan_t yyscanner);
> 
> /* Macros after this point can all be overridden by user definitions in
>  * section 1.
>  */
> 
> #ifndef YY_SKIP_YYWRAP
>-#ifdef __cplusplus
>-extern "C" int yywrap ( yyscan_t yyscanner );
>-#else
>-extern int yywrap ( yyscan_t yyscanner );
>-#endif
>+#    ifdef __cplusplus
>+extern "C" int yywrap(yyscan_t yyscanner);
>+#    else
>+extern int yywrap(yyscan_t yyscanner);
>+#    endif
> #endif
> 
> #ifndef YY_NO_UNPUT
>-    
>-#endif
> 
>+#endif
> 
> #ifndef yytext_ptr
>-static void yy_flex_strncpy ( char *, const char *, int , yyscan_t yyscanner);
>+static void yy_flex_strncpy(char *, const char *, int, yyscan_t yyscanner);
> #endif
> 
> #ifdef YY_NEED_STRLEN
>-static int yy_flex_strlen ( const char * , yyscan_t yyscanner);
>+static int yy_flex_strlen(const char *, yyscan_t yyscanner);
> #endif
> 
>-#if 0 // #ifndef YY_NO_INPUT
>-#ifdef __cplusplus
>-static int yyinput ( yyscan_t yyscanner );
>-#else
>-static int input ( yyscan_t yyscanner );
>-#endif
>+#ifndef YY_NO_INPUT
>+#    ifdef __cplusplus
>+static int yyinput(yyscan_t yyscanner);
>+#    else
>+static int input(yyscan_t yyscanner);
>+#    endif
> 
> #endif
> 
>-
>-
>-
>-
>-
>-
>-
> /* Amount of stuff to slurp up with each read. */
> #ifndef YY_READ_BUF_SIZE
>-#ifdef __ia64__
>+#    ifdef __ia64__
> /* On IA-64, the buffer size is 16k, not 8k */
>-#define YY_READ_BUF_SIZE 16384
>-#else
>-#define YY_READ_BUF_SIZE 8192
>-#endif /* __ia64__ */
>+#        define YY_READ_BUF_SIZE 16384
>+#    else
>+#        define YY_READ_BUF_SIZE 8192
>+#    endif /* __ia64__ */
> #endif
> 
>-
> /* Copy whatever the last rule matched to the standard output. */
> #ifndef ECHO
> /* This used to be an fputs(), but since the string might contain NUL's,
>  * we now use fwrite().
>  */
>-#define ECHO do { if (fwrite( yytext, (size_t) yyleng, 1, yyout )) {} } while (0)
>+#    define ECHO                                          \
>+        do                                                \
>+        {                                                 \
>+            if (fwrite(yytext, (size_t)yyleng, 1, yyout)) \
>+            {                                             \
>+            }                                             \
>+        } while (0)
> #endif
> 
>-
>-
> /* Gets input and stuffs it into "buf".  number of characters read, or YY_NULL,
>  * is returned in "result".
>  */
> #ifndef YY_INPUT
>-#define YY_INPUT(buf,result,max_size) \
>-	if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \
>-		{ \
>-		int c = '*'; \
>-		int n; \
>-		for ( n = 0; n < max_size && \
>-			     (c = getc( yyin )) != EOF && c != '\n'; ++n ) \
>-			buf[n] = (char) c; \
>-		if ( c == '\n' ) \
>-			buf[n++] = (char) c; \
>-		if ( c == EOF && ferror( yyin ) ) \
>-			YY_FATAL_ERROR( "input in flex scanner failed" ); \
>-		result = n; \
>-		} \
>-	else \
>-		{ \
>-		errno=0; \
>-		while ( (result = (int) fread(buf, 1, (yy_size_t) max_size, yyin)) == 0 && ferror(yyin)) \
>-			{ \
>-			if( errno != EINTR) \
>-				{ \
>-				YY_FATAL_ERROR( "input in flex scanner failed" ); \
>-				break; \
>-				} \
>-			errno=0; \
>-			clearerr(yyin); \
>-			} \
>-		}\
>-\
>+#    define YY_INPUT(buf, result, max_size)                                                       \
>+        if (YY_CURRENT_BUFFER_LVALUE->yy_is_interactive)                                          \
>+        {                                                                                         \
>+            int c = '*';                                                                          \
>+            int n;                                                                                \
>+            for (n = 0; n < max_size && (c = getc(yyin)) != EOF && c != '\n'; ++n)                \
>+                buf[n] = (char)c;                                                                 \
>+            if (c == '\n')                                                                        \
>+                buf[n++] = (char)c;                                                               \
>+            if (c == EOF && ferror(yyin))                                                         \
>+                YY_FATAL_ERROR("input in flex scanner failed");                                   \
>+            result = n;                                                                           \
>+        }                                                                                         \
>+        else                                                                                      \
>+        {                                                                                         \
>+            errno = 0;                                                                            \
>+            while ((result = (int)fread(buf, 1, (yy_size_t)max_size, yyin)) == 0 && ferror(yyin)) \
>+            {                                                                                     \
>+                if (errno != EINTR)                                                               \
>+                {                                                                                 \
>+                    YY_FATAL_ERROR("input in flex scanner failed");                               \
>+                    break;                                                                        \
>+                }                                                                                 \
>+                errno = 0;                                                                        \
>+                clearerr(yyin);                                                                   \
>+            }                                                                                     \
>+        }
> 
> #endif
> 
>-
>-
> /* No semi-colon after return; correct usage is to write "yyterminate();" -
>  * we don't want an extra ';' after the "return" because that will cause
>  * some compilers to complain about unreachable statements.
>  */
> #ifndef yyterminate
>-#define yyterminate() return YY_NULL
>+#    define yyterminate() return YY_NULL
> #endif
> 
>-
> /* Number of entries by which start-condition stack grows. */
> #ifndef YY_START_STACK_INCR
>-#define YY_START_STACK_INCR 25
>+#    define YY_START_STACK_INCR 25
> #endif
> 
>-
> /* Report a fatal error. */
> #ifndef YY_FATAL_ERROR
>-#define YY_FATAL_ERROR(msg) yy_fatal_error( msg , yyscanner)
>+#    define YY_FATAL_ERROR(msg) yy_fatal_error(msg, yyscanner)
> #endif
> 
>-
>-
> /* end tables serialization structures and prototypes */
> 
>-
>-
> /* Default declaration of generated scanner - a define so the user can
>  * easily add parameters.
>  */
> #ifndef YY_DECL
>-#define YY_DECL_IS_OURS 1
>-
>-
>+#    define YY_DECL_IS_OURS 1
> 
>+extern int yylex(YYSTYPE *yylval_param, YYLTYPE *yylloc_param, yyscan_t yyscanner);
> 
>-
>-
>-        
>-    
>-    
>-
>-
>-
>-    
>-    
>-    
>-
>-
>-extern int yylex \
>-               (YYSTYPE * yylval_param, YYLTYPE * yylloc_param , yyscan_t yyscanner);
>-
>-#define YY_DECL int yylex \
>-               (YYSTYPE * yylval_param, YYLTYPE * yylloc_param , yyscan_t yyscanner)
>+#    define YY_DECL int yylex(YYSTYPE *yylval_param, YYLTYPE *yylloc_param, yyscan_t yyscanner)
> #endif /* !YY_DECL */
> 
>-
> /* Code executed at the beginning of each rule, after yytext and yyleng
>  * have been set up.
>  */
> #ifndef YY_USER_ACTION
>-#define YY_USER_ACTION
>+#    define YY_USER_ACTION
> #endif
> 
>-
>-
> /* Code executed at the end of each rule. */
> #ifndef YY_BREAK
>-#define YY_BREAK /*LINTED*/break;
>+#    define YY_BREAK /*LINTED*/ break;
> #endif
> 
>-
>-
>-#define YY_RULE_SETUP \
>-	YY_USER_ACTION
>-
>+#define YY_RULE_SETUP YY_USER_ACTION
> 
> /** The main scanner function which does all the work.
>  */
> YY_DECL
> {
>-	yy_state_type yy_current_state;
>-	char *yy_cp, *yy_bp;
>-	int yy_act;
>-    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
>+    yy_state_type yy_current_state;
>+    char *yy_cp, *yy_bp;
>+    int yy_act;
>+    struct yyguts_t *yyg = (struct yyguts_t *)yyscanner;
> 
>+    yylval = yylval_param;
> 
>+    yylloc = yylloc_param;
> 
>-
>-    yylval = yylval_param;
>-
>-
>-
>-    yylloc = yylloc_param;
>-
>-
>-	if ( !yyg->yy_init )
>-		{
>-		yyg->yy_init = 1;
>+    if (!yyg->yy_init)
>+    {
>+        yyg->yy_init = 1;
> 
> #ifdef YY_USER_INIT
>-		YY_USER_INIT;
>+        YY_USER_INIT;
> #endif
> 
>+        if (!yyg->yy_start)
>+            yyg->yy_start = 1; /* first start state */
> 
>+        if (!yyin)
>+            yyin = stdin;
> 
>-		if ( ! yyg->yy_start )
>-			yyg->yy_start = 1;	/* first start state */
>+        if (!yyout)
>+            yyout = stdout;
> 
>-		if ( ! yyin )
>-			yyin = stdin;
>+        if (!YY_CURRENT_BUFFER)
>+        {
>+            yyensure_buffer_stack(yyscanner);
>+            YY_CURRENT_BUFFER_LVALUE = yy_create_buffer(yyin, YY_BUF_SIZE, yyscanner);
>+        }
> 
>-		if ( ! yyout )
>-			yyout = stdout;
>+        yy_load_buffer_state(yyscanner);
>+    }
> 
>-		if ( ! YY_CURRENT_BUFFER ) {
>-			yyensure_buffer_stack (yyscanner);
>-			YY_CURRENT_BUFFER_LVALUE =
>-				yy_create_buffer( yyin, YY_BUF_SIZE , yyscanner);
>-		}
>+    {
> 
>-		yy_load_buffer_state( yyscanner );
>-		}
>+        /* Line comment */
>+
>+        while (/*CONSTCOND*/ 1) /* loops until end-of-file is reached */
>+        {
>+            yy_cp = yyg->yy_c_buf_p;
>+
>+            /* Support of yytext. */
>+            *yy_cp = yyg->yy_hold_char;
>+
>+            /* yy_bp points to the position in yy_ch_buf of the start of
>+             * the current run.
>+             */
>+            yy_bp = yy_cp;
>+
>+            yy_current_state = yyg->yy_start;
>+        yy_match:
>+            do
>+            {
>+                YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)];
>+                if (yy_accept[yy_current_state])
>+                {
>+                    yyg->yy_last_accepting_state = yy_current_state;
>+                    yyg->yy_last_accepting_cpos  = yy_cp;
>+                }
>+                while (yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state)
>+                {
>+                    yy_current_state = (int)yy_def[yy_current_state];
>+                    if (yy_current_state >= 95)
>+                        yy_c = yy_meta[yy_c];
>+                }
>+                yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c];
>+                ++yy_cp;
>+            } while (yy_current_state != 94);
>+            yy_cp            = yyg->yy_last_accepting_cpos;
>+            yy_current_state = yyg->yy_last_accepting_state;
>+
>+        yy_find_action:
>+            yy_act = yy_accept[yy_current_state];
>+
>+            YY_DO_BEFORE_ACTION;
>+
>+        do_action: /* This label is used only to access EOF actions. */
>+
>+            switch (yy_act)
>+            {           /* beginning of action switch */
>+                case 0: /* must back up */
>+                    /* undo the effects of YY_DO_BEFORE_ACTION */
>+                    *yy_cp           = yyg->yy_hold_char;
>+                    yy_cp            = yyg->yy_last_accepting_cpos;
>+                    yy_current_state = yyg->yy_last_accepting_state;
>+                    goto yy_find_action;
>+
>+                case 1:
>+                    YY_RULE_SETUP
>+
>+                    YY_BREAK
>+                /* Block comment */
>+                /* Line breaks are just counted - not returned. */
>+                /* The comment is replaced by a single space. */
>+                case 2:
>+                    YY_RULE_SETUP { BEGIN(COMMENT); }
>+                    YY_BREAK
>+                case 3:
>+                    YY_RULE_SETUP
>+
>+                    YY_BREAK
>+                case 4:
>+                    YY_RULE_SETUP
>+
>+                    YY_BREAK
>+                case 5:
>+                    /* rule 5 can match eol */
>+                    YY_RULE_SETUP
>+                    {
>+                        if (yylineno == INT_MAX)
>+                        {
>+                            *yylval = "Integer overflow on line number";
>+                            return angle::pp::Token::GOT_ERROR;
>+                        }
>+                        ++yylineno;
>+                    }
>+                    YY_BREAK
>+                case 6:
>+                    YY_RULE_SETUP
>+                    {
>+                        yyextra->leadingSpace = true;
>+                        BEGIN(INITIAL);
>+                    }
>+                    YY_BREAK
>+                case 7:
>+                    YY_RULE_SETUP
>+                    {
>+                        // # is only valid at start of line for preprocessor directives.
>+                        yylval->assign(1, yytext[0]);
>+                        return yyextra->lineStart ? angle::pp::Token::PP_HASH
>+                                                  : angle::pp::Token::PP_OTHER;
>+                    }
>+                    YY_BREAK
>+                case 8:
>+                    YY_RULE_SETUP
>+                    {
>+                        yylval->assign(yytext, yyleng);
>+                        return angle::pp::Token::IDENTIFIER;
>+                    }
>+                    YY_BREAK
>+                case 9:
>+                    YY_RULE_SETUP
>+                    {
>+                        yylval->assign(yytext, yyleng);
>+                        return angle::pp::Token::CONST_INT;
>+                    }
>+                    YY_BREAK
>+                case 10:
>+                    YY_RULE_SETUP
>+                    {
>+                        yylval->assign(yytext, yyleng);
>+                        return angle::pp::Token::CONST_FLOAT;
>+                    }
>+                    YY_BREAK
>+                /* Anything that starts with a {DIGIT} or .{DIGIT} must be a number. */
>+                /* Rule to catch all invalid integers and floats. */
>+                case 11:
>+                    YY_RULE_SETUP
>+                    {
>+                        yylval->assign(yytext, yyleng);
>+                        return angle::pp::Token::PP_NUMBER;
>+                    }
>+                    YY_BREAK
>+                case 12:
>+                    YY_RULE_SETUP
>+                    {
>+                        yylval->assign(yytext, yyleng);
>+                        return angle::pp::Token::OP_INC;
>+                    }
>+                    YY_BREAK
>+                case 13:
>+                    YY_RULE_SETUP
>+                    {
>+                        yylval->assign(yytext, yyleng);
>+                        return angle::pp::Token::OP_DEC;
>+                    }
>+                    YY_BREAK
>+                case 14:
>+                    YY_RULE_SETUP
>+                    {
>+                        yylval->assign(yytext, yyleng);
>+                        return angle::pp::Token::OP_LEFT;
>+                    }
>+                    YY_BREAK
>+                case 15:
>+                    YY_RULE_SETUP
>+                    {
>+                        yylval->assign(yytext, yyleng);
>+                        return angle::pp::Token::OP_RIGHT;
>+                    }
>+                    YY_BREAK
>+                case 16:
>+                    YY_RULE_SETUP
>+                    {
>+                        yylval->assign(yytext, yyleng);
>+                        return angle::pp::Token::OP_LE;
>+                    }
>+                    YY_BREAK
>+                case 17:
>+                    YY_RULE_SETUP
>+                    {
>+                        yylval->assign(yytext, yyleng);
>+                        return angle::pp::Token::OP_GE;
>+                    }
>+                    YY_BREAK
>+                case 18:
>+                    YY_RULE_SETUP
>+                    {
>+                        yylval->assign(yytext, yyleng);
>+                        return angle::pp::Token::OP_EQ;
>+                    }
>+                    YY_BREAK
>+                case 19:
>+                    YY_RULE_SETUP
>+                    {
>+                        yylval->assign(yytext, yyleng);
>+                        return angle::pp::Token::OP_NE;
>+                    }
>+                    YY_BREAK
>+                case 20:
>+                    YY_RULE_SETUP
>+                    {
>+                        yylval->assign(yytext, yyleng);
>+                        return angle::pp::Token::OP_AND;
>+                    }
>+                    YY_BREAK
>+                case 21:
>+                    YY_RULE_SETUP
>+                    {
>+                        yylval->assign(yytext, yyleng);
>+                        return angle::pp::Token::OP_XOR;
>+                    }
>+                    YY_BREAK
>+                case 22:
>+                    YY_RULE_SETUP
>+                    {
>+                        yylval->assign(yytext, yyleng);
>+                        return angle::pp::Token::OP_OR;
>+                    }
>+                    YY_BREAK
>+                case 23:
>+                    YY_RULE_SETUP
>+                    {
>+                        yylval->assign(yytext, yyleng);
>+                        return angle::pp::Token::OP_ADD_ASSIGN;
>+                    }
>+                    YY_BREAK
>+                case 24:
>+                    YY_RULE_SETUP
>+                    {
>+                        yylval->assign(yytext, yyleng);
>+                        return angle::pp::Token::OP_SUB_ASSIGN;
>+                    }
>+                    YY_BREAK
>+                case 25:
>+                    YY_RULE_SETUP
>+                    {
>+                        yylval->assign(yytext, yyleng);
>+                        return angle::pp::Token::OP_MUL_ASSIGN;
>+                    }
>+                    YY_BREAK
>+                case 26:
>+                    YY_RULE_SETUP
>+                    {
>+                        yylval->assign(yytext, yyleng);
>+                        return angle::pp::Token::OP_DIV_ASSIGN;
>+                    }
>+                    YY_BREAK
>+                case 27:
>+                    YY_RULE_SETUP
>+                    {
>+                        yylval->assign(yytext, yyleng);
>+                        return angle::pp::Token::OP_MOD_ASSIGN;
>+                    }
>+                    YY_BREAK
>+                case 28:
>+                    YY_RULE_SETUP
>+                    {
>+                        yylval->assign(yytext, yyleng);
>+                        return angle::pp::Token::OP_LEFT_ASSIGN;
>+                    }
>+                    YY_BREAK
>+                case 29:
>+                    YY_RULE_SETUP
>+                    {
>+                        yylval->assign(yytext, yyleng);
>+                        return angle::pp::Token::OP_RIGHT_ASSIGN;
>+                    }
>+                    YY_BREAK
>+                case 30:
>+                    YY_RULE_SETUP
>+                    {
>+                        yylval->assign(yytext, yyleng);
>+                        return angle::pp::Token::OP_AND_ASSIGN;
>+                    }
>+                    YY_BREAK
>+                case 31:
>+                    YY_RULE_SETUP
>+                    {
>+                        yylval->assign(yytext, yyleng);
>+                        return angle::pp::Token::OP_XOR_ASSIGN;
>+                    }
>+                    YY_BREAK
>+                case 32:
>+                    YY_RULE_SETUP
>+                    {
>+                        yylval->assign(yytext, yyleng);
>+                        return angle::pp::Token::OP_OR_ASSIGN;
>+                    }
>+                    YY_BREAK
>+                case 33:
>+                    YY_RULE_SETUP
>+                    {
>+                        yylval->assign(1, yytext[0]);
>+                        return yytext[0];
>+                    }
>+                    YY_BREAK
>+                case 34:
>+                    YY_RULE_SETUP { yyextra->leadingSpace = true; }
>+                    YY_BREAK
>+                case 35:
>+                    /* rule 35 can match eol */
>+                    YY_RULE_SETUP
>+                    {
>+                        if (yylineno == INT_MAX)
>+                        {
>+                            *yylval = "Integer overflow on line number";
>+                            return angle::pp::Token::GOT_ERROR;
>+                        }
>+                        ++yylineno;
>+                        yylval->assign(1, '\n');
>+                        return '\n';
>+                    }
>+                    YY_BREAK
>+                case 36:
>+                    YY_RULE_SETUP
>+                    {
>+                        yylval->assign(1, yytext[0]);
>+                        return angle::pp::Token::PP_OTHER;
>+                    }
>+                    YY_BREAK
>+                case YY_STATE_EOF(INITIAL):
>+                case YY_STATE_EOF(COMMENT):
>+                {
>+                    // YY_USER_ACTION is not invoked for handling EOF.
>+                    // Set the location for EOF token manually.
>+                    angle::pp::Input *input             = &yyextra->input;
>+                    angle::pp::Input::Location *scanLoc = &yyextra->scanLoc;
>+                    yy_size_t sIndexMax                 = input->count() ? input->count() - 1 : 0;
>+                    if (scanLoc->sIndex != sIndexMax)
>+                    {
>+                        // We can only reach here if there are empty strings at the
>+                        // end of the input.
>+                        scanLoc->sIndex = sIndexMax;
>+                        scanLoc->cIndex = 0;
>+                        // FIXME: this is not 64-bit clean.
>+                        yyfileno = static_cast<int>(sIndexMax);
>+                        yylineno = 1;
>+                    }
>+                    yylloc->file = yyfileno;
>+                    yylloc->line = yylineno;
>+                    yylval->clear();
>+
>+                    // Line number overflows fake EOFs to exit early, check for this case.
>+                    if (yylineno == INT_MAX)
>+                    {
>+                        yyextra->diagnostics->report(angle::pp::Diagnostics::PP_TOKENIZER_ERROR,
>+                                                     angle::pp::SourceLocation(yyfileno, yylineno),
>+                                                     "Integer overflow on line number");
>+                    }
>+                    else if (YY_START == COMMENT)
>+                    {
>+                        yyextra->diagnostics->report(angle::pp::Diagnostics::PP_EOF_IN_COMMENT,
>+                                                     angle::pp::SourceLocation(yyfileno, yylineno),
>+                                                     "EOF while in a comment");
>+                    }
>+                    yyterminate();
>+                }
>+                    YY_BREAK
>+                case 37:
>+                    YY_RULE_SETUP
>+                    ECHO;
>+                    YY_BREAK
>+
>+                case YY_END_OF_BUFFER:
>+                {
>+                    /* Amount of text matched not including the EOB char. */
>+                    int yy_amount_of_matched_text = (int)(yy_cp - yyg->yytext_ptr) - 1;
>+
>+                    /* Undo the effects of YY_DO_BEFORE_ACTION. */
>+                    *yy_cp = yyg->yy_hold_char;
>+                    YY_RESTORE_YY_MORE_OFFSET
>+
>+                    if (YY_CURRENT_BUFFER_LVALUE->yy_buffer_status == YY_BUFFER_NEW)
>+                    {
>+                        /* We're scanning a new file or input source.  It's
>+                         * possible that this happened because the user
>+                         * just pointed yyin at a new source and called
>+                         * yylex().  If so, then we have to assure
>+                         * consistency between YY_CURRENT_BUFFER and our
>+                         * globals.  Here is the right place to do so, because
>+                         * this is the first action (other than possibly a
>+                         * back-up) that will match for the new input source.
>+                         */
>+                        yyg->yy_n_chars = YY_CURRENT_BUFFER_LVALUE->yy_n_chars;
>+                        YY_CURRENT_BUFFER_LVALUE->yy_input_file    = yyin;
>+                        YY_CURRENT_BUFFER_LVALUE->yy_buffer_status = YY_BUFFER_NORMAL;
>+                    }
>+
>+                    /* Note that here we test for yy_c_buf_p "<=" to the position
>+                     * of the first EOB in the buffer, since yy_c_buf_p will
>+                     * already have been incremented past the NUL character
>+                     * (since all states make transitions on EOB to the
>+                     * end-of-buffer state).  Contrast this with the test
>+                     * in input().
>+                     */
>+                    if (yyg->yy_c_buf_p <= &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[yyg->yy_n_chars])
>+                    { /* This was really a NUL. */
>+                        yy_state_type yy_next_state;
>+
>+                        yyg->yy_c_buf_p = yyg->yytext_ptr + yy_amount_of_matched_text;
>+
>+                        yy_current_state = yy_get_previous_state(yyscanner);
>+
>+                        /* Okay, we're now positioned to make the NUL
>+                         * transition.  We couldn't have
>+                         * yy_get_previous_state() go ahead and do it
>+                         * for us because it doesn't know how to deal
>+                         * with the possibility of jamming (and we don't
>+                         * want to build jamming into it because then it
>+                         * will run more slowly).
>+                         */
>+
>+                        yy_next_state = yy_try_NUL_trans(yy_current_state, yyscanner);
>+
>+                        yy_bp = yyg->yytext_ptr + YY_MORE_ADJ;
>+
>+                        if (yy_next_state)
>+                        {
>+                            /* Consume the NUL. */
>+                            yy_cp            = ++yyg->yy_c_buf_p;
>+                            yy_current_state = yy_next_state;
>+                            goto yy_match;
>+                        }
>+
>+                        else
>+                        {
>+                            yy_cp            = yyg->yy_last_accepting_cpos;
>+                            yy_current_state = yyg->yy_last_accepting_state;
>+                            goto yy_find_action;
>+                        }
>+                    }
>+
>+                    else
>+                        switch (yy_get_next_buffer(yyscanner))
>+                        {
>+                            case EOB_ACT_END_OF_FILE:
>+                            {
>+                                yyg->yy_did_buffer_switch_on_eof = 0;
>+
>+                                if (yywrap(yyscanner))
>+                                {
>+                                    /* Note: because we've taken care in
>+                                     * yy_get_next_buffer() to have set up
>+                                     * yytext, we can now set up
>+                                     * yy_c_buf_p so that if some total
>+                                     * hoser (like flex itself) wants to
>+                                     * call the scanner after we return the
>+                                     * YY_NULL, it'll still work - another
>+                                     * YY_NULL will get returned.
>+                                     */
>+                                    yyg->yy_c_buf_p = yyg->yytext_ptr + YY_MORE_ADJ;
>+
>+                                    yy_act = YY_STATE_EOF(YY_START);
>+                                    goto do_action;
>+                                }
>+
>+                                else
>+                                {
>+                                    if (!yyg->yy_did_buffer_switch_on_eof)
>+                                        YY_NEW_FILE;
>+                                }
>+                                break;
>+                            }
>+
>+                            case EOB_ACT_CONTINUE_SCAN:
>+                                yyg->yy_c_buf_p = yyg->yytext_ptr + yy_amount_of_matched_text;
>+
>+                                yy_current_state = yy_get_previous_state(yyscanner);
>+
>+                                yy_cp = yyg->yy_c_buf_p;
>+                                yy_bp = yyg->yytext_ptr + YY_MORE_ADJ;
>+                                goto yy_match;
>+
>+                            case EOB_ACT_LAST_MATCH:
>+                                yyg->yy_c_buf_p =
>+                                    &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[yyg->yy_n_chars];
>+
>+                                yy_current_state = yy_get_previous_state(yyscanner);
>+
>+                                yy_cp = yyg->yy_c_buf_p;
>+                                yy_bp = yyg->yytext_ptr + YY_MORE_ADJ;
>+                                goto yy_find_action;
>+                        }
>+                    break;
>+                }
>+
>+                default:
>+                    YY_FATAL_ERROR("fatal flex scanner internal error--no action found");
>+            } /* end of action switch */
>+        }     /* end of scanning one token */
>+    }         /* end of user's declarations */
>+} /* end of yylex */
> 
>-	{
>+/* yy_get_next_buffer - try to read in a new buffer
>+ *
>+ * Returns a code representing an action:
>+ *	EOB_ACT_LAST_MATCH -
>+ *	EOB_ACT_CONTINUE_SCAN - continue scanning from current position
>+ *	EOB_ACT_END_OF_FILE - end of file
>+ */
>+static int yy_get_next_buffer(yyscan_t yyscanner)
>+{
>+    struct yyguts_t *yyg = (struct yyguts_t *)yyscanner;
>+    char *dest           = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf;
>+    char *source         = yyg->yytext_ptr;
>+    int number_to_move, i;
>+    int ret_val;
>+
>+    if (yyg->yy_c_buf_p > &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[yyg->yy_n_chars + 1])
>+        YY_FATAL_ERROR("fatal flex scanner internal error--end of buffer missed");
>+
>+    if (YY_CURRENT_BUFFER_LVALUE->yy_fill_buffer == 0)
>+    { /* Don't try to fill the buffer, so this is an EOF. */
>+        if (yyg->yy_c_buf_p - yyg->yytext_ptr - YY_MORE_ADJ == 1)
>+        {
>+            /* We matched a single character, the EOB, so
>+             * treat this as a final EOF.
>+             */
>+            return EOB_ACT_END_OF_FILE;
>+        }
>+
>+        else
>+        {
>+            /* We matched some text prior to the EOB, first
>+             * process it.
>+             */
>+            return EOB_ACT_LAST_MATCH;
>+        }
>+    }
> 
>+    /* Try to read more data. */
> 
>-    /* Line comment */
>+    /* First move last chars to start of buffer. */
>+    number_to_move = (int)(yyg->yy_c_buf_p - yyg->yytext_ptr - 1);
> 
>-	while ( /*CONSTCOND*/1 )		/* loops until end-of-file is reached */
>-		{
>-		yy_cp = yyg->yy_c_buf_p;
>+    for (i = 0; i < number_to_move; ++i)
>+        *(dest++) = *(source++);
> 
>-		/* Support of yytext. */
>-		*yy_cp = yyg->yy_hold_char;
>+    if (YY_CURRENT_BUFFER_LVALUE->yy_buffer_status == YY_BUFFER_EOF_PENDING)
>+        /* don't do the read, it's not guaranteed to return an EOF,
>+         * just force an EOF
>+         */
>+        YY_CURRENT_BUFFER_LVALUE->yy_n_chars = yyg->yy_n_chars = 0;
> 
>-		/* yy_bp points to the position in yy_ch_buf of the start of
>-		 * the current run.
>-		 */
>-		yy_bp = yy_cp;
>+    else
>+    {
>+        int num_to_read = YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1;
> 
>-		yy_current_state = yyg->yy_start;
>-yy_match:
>-		do
>-			{
>-			YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)] ;
>-			if ( yy_accept[yy_current_state] )
>-				{
>-				yyg->yy_last_accepting_state = yy_current_state;
>-				yyg->yy_last_accepting_cpos = yy_cp;
>-				}
>-			while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
>-				{
>-				yy_current_state = (int) yy_def[yy_current_state];
>-				if ( yy_current_state >= 95 )
>-					yy_c = yy_meta[yy_c];
>-				}
>-			yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c];
>-			++yy_cp;
>-			}
>-		while ( yy_current_state != 94 );
>-		yy_cp = yyg->yy_last_accepting_cpos;
>-		yy_current_state = yyg->yy_last_accepting_state;
>+        while (num_to_read <= 0)
>+        { /* Not enough room in the buffer - grow it. */
> 
>-yy_find_action:
>-		yy_act = yy_accept[yy_current_state];
>+            /* just a shorter name for the current buffer */
>+            YY_BUFFER_STATE b = YY_CURRENT_BUFFER_LVALUE;
> 
>-		YY_DO_BEFORE_ACTION;
>+            int yy_c_buf_p_offset = (int)(yyg->yy_c_buf_p - b->yy_ch_buf);
> 
>+            if (b->yy_is_our_buffer)
>+            {
>+                int new_size = b->yy_buf_size * 2;
> 
>+                if (new_size <= 0)
>+                    b->yy_buf_size += b->yy_buf_size / 8;
>+                else
>+                    b->yy_buf_size *= 2;
> 
>-do_action:	/* This label is used only to access EOF actions. */
>+                b->yy_ch_buf = (char *)
>+                    /* Include room in for 2 EOB chars. */
>+                    yyrealloc((void *)b->yy_ch_buf, (yy_size_t)(b->yy_buf_size + 2), yyscanner);
>+            }
>+            else
>+                /* Can't grow it, we don't own it. */
>+                b->yy_ch_buf = NULL;
> 
>+            if (!b->yy_ch_buf)
>+                YY_FATAL_ERROR("fatal error - scanner input buffer overflow");
> 
>-		switch ( yy_act )
>-	{ /* beginning of action switch */
>-			case 0: /* must back up */
>-			/* undo the effects of YY_DO_BEFORE_ACTION */
>-			*yy_cp = yyg->yy_hold_char;
>-			yy_cp = yyg->yy_last_accepting_cpos;
>-			yy_current_state = yyg->yy_last_accepting_state;
>-			goto yy_find_action;
>+            yyg->yy_c_buf_p = &b->yy_ch_buf[yy_c_buf_p_offset];
> 
>-case 1:
>-YY_RULE_SETUP
>+            num_to_read = YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1;
>+        }
> 
>-	YY_BREAK
>-/* Block comment */
>-/* Line breaks are just counted - not returned. */
>-/* The comment is replaced by a single space. */
>-case 2:
>-YY_RULE_SETUP
>-{ BEGIN(COMMENT); }
>-	YY_BREAK
>-case 3:
>-YY_RULE_SETUP
>+        if (num_to_read > YY_READ_BUF_SIZE)
>+            num_to_read = YY_READ_BUF_SIZE;
> 
>-	YY_BREAK
>-case 4:
>-YY_RULE_SETUP
>+        /* Read in more data. */
>+        yy_size_t ret = 0;
>+        YY_INPUT((&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move]), ret, num_to_read);
>+        yyg->yy_n_chars = static_cast<int>(ret);
> 
>-	YY_BREAK
>-case 5:
>-/* rule 5 can match eol */
>-YY_RULE_SETUP
>-{
>-    if (yylineno == INT_MAX)
>-    {
>-        *yylval = "Integer overflow on line number";
>-        return pp::Token::GOT_ERROR;
>-    }
>-    ++yylineno;
>-}
>-	YY_BREAK
>-case 6:
>-YY_RULE_SETUP
>-{
>-    yyextra->leadingSpace = true;
>-    BEGIN(INITIAL);
>-}
>-	YY_BREAK
>-case 7:
>-YY_RULE_SETUP
>-{
>-    // # is only valid at start of line for preprocessor directives.
>-    yylval->assign(1, yytext[0]);
>-    return yyextra->lineStart ? pp::Token::PP_HASH : pp::Token::PP_OTHER;
>-}
>-	YY_BREAK
>-case 8:
>-YY_RULE_SETUP
>-{
>-    yylval->assign(yytext, yyleng);
>-    return pp::Token::IDENTIFIER;
>-}
>-	YY_BREAK
>-case 9:
>-YY_RULE_SETUP
>-{
>-    yylval->assign(yytext, yyleng);
>-    return pp::Token::CONST_INT;
>-}
>-	YY_BREAK
>-case 10:
>-YY_RULE_SETUP
>-{
>-    yylval->assign(yytext, yyleng);
>-    return pp::Token::CONST_FLOAT;
>-}
>-	YY_BREAK
>-/* Anything that starts with a {DIGIT} or .{DIGIT} must be a number. */
>-/* Rule to catch all invalid integers and floats. */
>-case 11:
>-YY_RULE_SETUP
>-{
>-    yylval->assign(yytext, yyleng);
>-    return pp::Token::PP_NUMBER;
>-}
>-	YY_BREAK
>-case 12:
>-YY_RULE_SETUP
>-{
>-    yylval->assign(yytext, yyleng);
>-    return pp::Token::OP_INC;
>-}
>-	YY_BREAK
>-case 13:
>-YY_RULE_SETUP
>-{
>-    yylval->assign(yytext, yyleng);
>-    return pp::Token::OP_DEC;
>-}
>-	YY_BREAK
>-case 14:
>-YY_RULE_SETUP
>-{
>-    yylval->assign(yytext, yyleng);
>-    return pp::Token::OP_LEFT;
>-}
>-	YY_BREAK
>-case 15:
>-YY_RULE_SETUP
>-{
>-    yylval->assign(yytext, yyleng);
>-    return pp::Token::OP_RIGHT;
>-}
>-	YY_BREAK
>-case 16:
>-YY_RULE_SETUP
>-{
>-    yylval->assign(yytext, yyleng);
>-    return pp::Token::OP_LE;
>-}
>-	YY_BREAK
>-case 17:
>-YY_RULE_SETUP
>-{
>-    yylval->assign(yytext, yyleng);
>-    return pp::Token::OP_GE;
>-}
>-	YY_BREAK
>-case 18:
>-YY_RULE_SETUP
>-{
>-    yylval->assign(yytext, yyleng);
>-    return pp::Token::OP_EQ;
>-}
>-	YY_BREAK
>-case 19:
>-YY_RULE_SETUP
>-{
>-    yylval->assign(yytext, yyleng);
>-    return pp::Token::OP_NE;
>-}
>-	YY_BREAK
>-case 20:
>-YY_RULE_SETUP
>-{
>-    yylval->assign(yytext, yyleng);
>-    return pp::Token::OP_AND;
>-}
>-	YY_BREAK
>-case 21:
>-YY_RULE_SETUP
>-{
>-    yylval->assign(yytext, yyleng);
>-    return pp::Token::OP_XOR;
>-}
>-	YY_BREAK
>-case 22:
>-YY_RULE_SETUP
>-{
>-    yylval->assign(yytext, yyleng);
>-    return pp::Token::OP_OR;
>-}
>-	YY_BREAK
>-case 23:
>-YY_RULE_SETUP
>-{
>-    yylval->assign(yytext, yyleng);
>-    return pp::Token::OP_ADD_ASSIGN;
>-}
>-	YY_BREAK
>-case 24:
>-YY_RULE_SETUP
>-{
>-    yylval->assign(yytext, yyleng);
>-    return pp::Token::OP_SUB_ASSIGN;
>-}
>-	YY_BREAK
>-case 25:
>-YY_RULE_SETUP
>-{
>-    yylval->assign(yytext, yyleng);
>-    return pp::Token::OP_MUL_ASSIGN;
>-}
>-	YY_BREAK
>-case 26:
>-YY_RULE_SETUP
>-{
>-    yylval->assign(yytext, yyleng);
>-    return pp::Token::OP_DIV_ASSIGN;
>-}
>-	YY_BREAK
>-case 27:
>-YY_RULE_SETUP
>-{
>-    yylval->assign(yytext, yyleng);
>-    return pp::Token::OP_MOD_ASSIGN;
>-}
>-	YY_BREAK
>-case 28:
>-YY_RULE_SETUP
>-{
>-    yylval->assign(yytext, yyleng);
>-    return pp::Token::OP_LEFT_ASSIGN;
>-}
>-	YY_BREAK
>-case 29:
>-YY_RULE_SETUP
>-{
>-    yylval->assign(yytext, yyleng);
>-    return pp::Token::OP_RIGHT_ASSIGN;
>-}
>-	YY_BREAK
>-case 30:
>-YY_RULE_SETUP
>-{
>-    yylval->assign(yytext, yyleng);
>-    return pp::Token::OP_AND_ASSIGN;
>-}
>-	YY_BREAK
>-case 31:
>-YY_RULE_SETUP
>-{
>-    yylval->assign(yytext, yyleng);
>-    return pp::Token::OP_XOR_ASSIGN;
>-}
>-	YY_BREAK
>-case 32:
>-YY_RULE_SETUP
>-{
>-    yylval->assign(yytext, yyleng);
>-    return pp::Token::OP_OR_ASSIGN;
>-}
>-	YY_BREAK
>-case 33:
>-YY_RULE_SETUP
>-{
>-    yylval->assign(1, yytext[0]);
>-    return yytext[0];
>-}
>-	YY_BREAK
>-case 34:
>-YY_RULE_SETUP
>-{ yyextra->leadingSpace = true; }
>-	YY_BREAK
>-case 35:
>-/* rule 35 can match eol */
>-YY_RULE_SETUP
>-{
>-    if (yylineno == INT_MAX)
>-    {
>-        *yylval = "Integer overflow on line number";
>-        return pp::Token::GOT_ERROR;
>+        YY_CURRENT_BUFFER_LVALUE->yy_n_chars = yyg->yy_n_chars;
>     }
>-    ++yylineno;
>-    yylval->assign(1, '\n');
>-    return '\n';
>-}
>-	YY_BREAK
>-case 36:
>-YY_RULE_SETUP
>-{
>-    yylval->assign(1, yytext[0]);
>-    return pp::Token::PP_OTHER;
>-}
>-	YY_BREAK
>-case YY_STATE_EOF(INITIAL):
>-case YY_STATE_EOF(COMMENT):
>-{
>-    // YY_USER_ACTION is not invoked for handling EOF.
>-    // Set the location for EOF token manually.
>-    pp::Input* input = &yyextra->input;
>-    pp::Input::Location* scanLoc = &yyextra->scanLoc;
>-    yy_size_t sIndexMax = input->count() ? input->count() - 1 : 0;
>-    if (scanLoc->sIndex != sIndexMax)
>-    {
>-        // We can only reach here if there are empty strings at the
>-        // end of the input.
>-        scanLoc->sIndex = sIndexMax; scanLoc->cIndex = 0;
>-        // FIXME: this is not 64-bit clean.
>-        yyfileno = static_cast<int>(sIndexMax); yylineno = 1;
>-    }
>-    yylloc->file = yyfileno;
>-    yylloc->line = yylineno;
>-    yylval->clear();
> 
>-    // Line number overflows fake EOFs to exit early, check for this case.
>-    if (yylineno == INT_MAX)
>+    if (yyg->yy_n_chars == 0)
>     {
>-        yyextra->diagnostics->report(pp::Diagnostics::PP_TOKENIZER_ERROR,
>-                                     pp::SourceLocation(yyfileno, yylineno),
>-                                     "Integer overflow on line number");
>+        if (number_to_move == YY_MORE_ADJ)
>+        {
>+            ret_val = EOB_ACT_END_OF_FILE;
>+            yyrestart(yyin, yyscanner);
>+        }
>+
>+        else
>+        {
>+            ret_val                                    = EOB_ACT_LAST_MATCH;
>+            YY_CURRENT_BUFFER_LVALUE->yy_buffer_status = YY_BUFFER_EOF_PENDING;
>+        }
>     }
>-    else if (YY_START == COMMENT)
>+
>+    else
>+        ret_val = EOB_ACT_CONTINUE_SCAN;
>+
>+    if ((yyg->yy_n_chars + number_to_move) > YY_CURRENT_BUFFER_LVALUE->yy_buf_size)
>     {
>-        yyextra->diagnostics->report(pp::Diagnostics::PP_EOF_IN_COMMENT,
>-                                     pp::SourceLocation(yyfileno, yylineno),
>-                                     "EOF while in a comment");
>+        /* Extend the array by 50%, plus the number we really need. */
>+        int new_size = yyg->yy_n_chars + number_to_move + (yyg->yy_n_chars >> 1);
>+        YY_CURRENT_BUFFER_LVALUE->yy_ch_buf = (char *)yyrealloc(
>+            (void *)YY_CURRENT_BUFFER_LVALUE->yy_ch_buf, (yy_size_t)new_size, yyscanner);
>+        if (!YY_CURRENT_BUFFER_LVALUE->yy_ch_buf)
>+            YY_FATAL_ERROR("out of dynamic memory in yy_get_next_buffer()");
>+        /* "- 2" to take care of EOB's */
>+        YY_CURRENT_BUFFER_LVALUE->yy_buf_size = (int)(new_size - 2);
>     }
>-    yyterminate();
>-}
>-	YY_BREAK
>-case 37:
>-YY_RULE_SETUP
>-ECHO;
>-	YY_BREAK
>-
>-	case YY_END_OF_BUFFER:
>-		{
>-		/* Amount of text matched not including the EOB char. */
>-		int yy_amount_of_matched_text = (int) (yy_cp - yyg->yytext_ptr) - 1;
>-
>-		/* Undo the effects of YY_DO_BEFORE_ACTION. */
>-		*yy_cp = yyg->yy_hold_char;
>-		YY_RESTORE_YY_MORE_OFFSET
>-
>-		if ( YY_CURRENT_BUFFER_LVALUE->yy_buffer_status == YY_BUFFER_NEW )
>-			{
>-			/* We're scanning a new file or input source.  It's
>-			 * possible that this happened because the user
>-			 * just pointed yyin at a new source and called
>-			 * yylex().  If so, then we have to assure
>-			 * consistency between YY_CURRENT_BUFFER and our
>-			 * globals.  Here is the right place to do so, because
>-			 * this is the first action (other than possibly a
>-			 * back-up) that will match for the new input source.
>-			 */
>-			yyg->yy_n_chars = YY_CURRENT_BUFFER_LVALUE->yy_n_chars;
>-			YY_CURRENT_BUFFER_LVALUE->yy_input_file = yyin;
>-			YY_CURRENT_BUFFER_LVALUE->yy_buffer_status = YY_BUFFER_NORMAL;
>-			}
>-
>-		/* Note that here we test for yy_c_buf_p "<=" to the position
>-		 * of the first EOB in the buffer, since yy_c_buf_p will
>-		 * already have been incremented past the NUL character
>-		 * (since all states make transitions on EOB to the
>-		 * end-of-buffer state).  Contrast this with the test
>-		 * in input().
>-		 */
>-		if ( yyg->yy_c_buf_p <= &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[yyg->yy_n_chars] )
>-			{ /* This was really a NUL. */
>-			yy_state_type yy_next_state;
>-
>-			yyg->yy_c_buf_p = yyg->yytext_ptr + yy_amount_of_matched_text;
>-
>-			yy_current_state = yy_get_previous_state( yyscanner );
>-
>-			/* Okay, we're now positioned to make the NUL
>-			 * transition.  We couldn't have
>-			 * yy_get_previous_state() go ahead and do it
>-			 * for us because it doesn't know how to deal
>-			 * with the possibility of jamming (and we don't
>-			 * want to build jamming into it because then it
>-			 * will run more slowly).
>-			 */
>-
>-			yy_next_state = yy_try_NUL_trans( yy_current_state , yyscanner);
>-
>-			yy_bp = yyg->yytext_ptr + YY_MORE_ADJ;
>-
>-			if ( yy_next_state )
>-				{
>-				/* Consume the NUL. */
>-				yy_cp = ++yyg->yy_c_buf_p;
>-				yy_current_state = yy_next_state;
>-				goto yy_match;
>-				}
>-
>-			else
>-				{
>-				yy_cp = yyg->yy_last_accepting_cpos;
>-				yy_current_state = yyg->yy_last_accepting_state;
>-				goto yy_find_action;
>-				}
>-			}
>-
>-		else switch ( yy_get_next_buffer( yyscanner ) )
>-			{
>-			case EOB_ACT_END_OF_FILE:
>-				{
>-				yyg->yy_did_buffer_switch_on_eof = 0;
>-
>-				if ( yywrap( yyscanner ) )
>-					{
>-					/* Note: because we've taken care in
>-					 * yy_get_next_buffer() to have set up
>-					 * yytext, we can now set up
>-					 * yy_c_buf_p so that if some total
>-					 * hoser (like flex itself) wants to
>-					 * call the scanner after we return the
>-					 * YY_NULL, it'll still work - another
>-					 * YY_NULL will get returned.
>-					 */
>-					yyg->yy_c_buf_p = yyg->yytext_ptr + YY_MORE_ADJ;
>-
>-					yy_act = YY_STATE_EOF(YY_START);
>-					goto do_action;
>-					}
>-
>-				else
>-					{
>-					if ( ! yyg->yy_did_buffer_switch_on_eof )
>-						YY_NEW_FILE;
>-					}
>-				break;
>-				}
>-
>-			case EOB_ACT_CONTINUE_SCAN:
>-				yyg->yy_c_buf_p =
>-					yyg->yytext_ptr + yy_amount_of_matched_text;
>-
>-				yy_current_state = yy_get_previous_state( yyscanner );
>-
>-				yy_cp = yyg->yy_c_buf_p;
>-				yy_bp = yyg->yytext_ptr + YY_MORE_ADJ;
>-				goto yy_match;
>-
>-			case EOB_ACT_LAST_MATCH:
>-				yyg->yy_c_buf_p =
>-				&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[yyg->yy_n_chars];
>-
>-				yy_current_state = yy_get_previous_state( yyscanner );
>-
>-				yy_cp = yyg->yy_c_buf_p;
>-				yy_bp = yyg->yytext_ptr + YY_MORE_ADJ;
>-				goto yy_find_action;
>-			}
>-		break;
>-		}
>-
>-	default:
>-		YY_FATAL_ERROR(
>-			"fatal flex scanner internal error--no action found" );
>-	} /* end of action switch */
>-		} /* end of scanning one token */
>-	} /* end of user's declarations */
>-} /* end of yylex */
> 
>+    yyg->yy_n_chars += number_to_move;
>+    YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[yyg->yy_n_chars]     = YY_END_OF_BUFFER_CHAR;
>+    YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[yyg->yy_n_chars + 1] = YY_END_OF_BUFFER_CHAR;
> 
>+    yyg->yytext_ptr = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[0];
> 
>+    return ret_val;
>+}
> 
>+/* yy_get_previous_state - get the state just before the EOB char was reached */
> 
>-/* yy_get_next_buffer - try to read in a new buffer
>- *
>- * Returns a code representing an action:
>- *	EOB_ACT_LAST_MATCH -
>- *	EOB_ACT_CONTINUE_SCAN - continue scanning from current position
>- *	EOB_ACT_END_OF_FILE - end of file
>- */
>-static int yy_get_next_buffer (yyscan_t yyscanner)
>+static yy_state_type yy_get_previous_state(yyscan_t yyscanner)
> {
>-    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
>-	char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf;
>-	char *source = yyg->yytext_ptr;
>-	int number_to_move, i;
>-	int ret_val;
>-
>-	if ( yyg->yy_c_buf_p > &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[yyg->yy_n_chars + 1] )
>-		YY_FATAL_ERROR(
>-		"fatal flex scanner internal error--end of buffer missed" );
>-
>-	if ( YY_CURRENT_BUFFER_LVALUE->yy_fill_buffer == 0 )
>-		{ /* Don't try to fill the buffer, so this is an EOF. */
>-		if ( yyg->yy_c_buf_p - yyg->yytext_ptr - YY_MORE_ADJ == 1 )
>-			{
>-			/* We matched a single character, the EOB, so
>-			 * treat this as a final EOF.
>-			 */
>-			return EOB_ACT_END_OF_FILE;
>-			}
>-
>-		else
>-			{
>-			/* We matched some text prior to the EOB, first
>-			 * process it.
>-			 */
>-			return EOB_ACT_LAST_MATCH;
>-			}
>-		}
>-
>-	/* Try to read more data. */
>-
>-	/* First move last chars to start of buffer. */
>-	number_to_move = (int) (yyg->yy_c_buf_p - yyg->yytext_ptr - 1);
>-
>-	for ( i = 0; i < number_to_move; ++i )
>-		*(dest++) = *(source++);
>-
>-	if ( YY_CURRENT_BUFFER_LVALUE->yy_buffer_status == YY_BUFFER_EOF_PENDING )
>-		/* don't do the read, it's not guaranteed to return an EOF,
>-		 * just force an EOF
>-		 */
>-		YY_CURRENT_BUFFER_LVALUE->yy_n_chars = yyg->yy_n_chars = 0;
>-
>-	else
>-		{
>-			int num_to_read =
>-			YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1;
>-
>-		while ( num_to_read <= 0 )
>-			{ /* Not enough room in the buffer - grow it. */
>-
>-			/* just a shorter name for the current buffer */
>-			YY_BUFFER_STATE b = YY_CURRENT_BUFFER_LVALUE;
>-
>-			int yy_c_buf_p_offset =
>-				(int) (yyg->yy_c_buf_p - b->yy_ch_buf);
>-
>-			if ( b->yy_is_our_buffer )
>-				{
>-				int new_size = b->yy_buf_size * 2;
>-
>-				if ( new_size <= 0 )
>-					b->yy_buf_size += b->yy_buf_size / 8;
>-				else
>-					b->yy_buf_size *= 2;
>-
>-				b->yy_ch_buf = (char *)
>-					/* Include room in for 2 EOB chars. */
>-					yyrealloc( (void *) b->yy_ch_buf,
>-							 (yy_size_t) (b->yy_buf_size + 2) , yyscanner );
>-				}
>-			else
>-				/* Can't grow it, we don't own it. */
>-				b->yy_ch_buf = NULL;
>-
>-			if ( ! b->yy_ch_buf )
>-				YY_FATAL_ERROR(
>-				"fatal error - scanner input buffer overflow" );
>-
>-			yyg->yy_c_buf_p = &b->yy_ch_buf[yy_c_buf_p_offset];
>-
>-			num_to_read = YY_CURRENT_BUFFER_LVALUE->yy_buf_size -
>-						number_to_move - 1;
>-
>-			}
>-
>-		if ( num_to_read > YY_READ_BUF_SIZE )
>-			num_to_read = YY_READ_BUF_SIZE;
>-
>-		/* Read in more data. */
>-		yy_size_t ret = 0;
>-		YY_INPUT( (&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move]),
>-			ret, num_to_read );
>-		yyg->yy_n_chars = static_cast<int>(ret);
>-
>-		YY_CURRENT_BUFFER_LVALUE->yy_n_chars = yyg->yy_n_chars;
>-		}
>-
>-	if ( yyg->yy_n_chars == 0 )
>-		{
>-		if ( number_to_move == YY_MORE_ADJ )
>-			{
>-			ret_val = EOB_ACT_END_OF_FILE;
>-			yyrestart( yyin  , yyscanner);
>-			}
>-
>-		else
>-			{
>-			ret_val = EOB_ACT_LAST_MATCH;
>-			YY_CURRENT_BUFFER_LVALUE->yy_buffer_status =
>-				YY_BUFFER_EOF_PENDING;
>-			}
>-		}
>-
>-	else
>-		ret_val = EOB_ACT_CONTINUE_SCAN;
>-
>-	if ((yyg->yy_n_chars + number_to_move) > YY_CURRENT_BUFFER_LVALUE->yy_buf_size) {
>-		/* Extend the array by 50%, plus the number we really need. */
>-		int new_size = yyg->yy_n_chars + number_to_move + (yyg->yy_n_chars >> 1);
>-		YY_CURRENT_BUFFER_LVALUE->yy_ch_buf = (char *) yyrealloc(
>-			(void *) YY_CURRENT_BUFFER_LVALUE->yy_ch_buf, (yy_size_t) new_size , yyscanner );
>-		if ( ! YY_CURRENT_BUFFER_LVALUE->yy_ch_buf )
>-			YY_FATAL_ERROR( "out of dynamic memory in yy_get_next_buffer()" );
>-		/* "- 2" to take care of EOB's */
>-		YY_CURRENT_BUFFER_LVALUE->yy_buf_size = (int) (new_size - 2);
>-	}
>-
>-	yyg->yy_n_chars += number_to_move;
>-	YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[yyg->yy_n_chars] = YY_END_OF_BUFFER_CHAR;
>-	YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[yyg->yy_n_chars + 1] = YY_END_OF_BUFFER_CHAR;
>-
>-	yyg->yytext_ptr = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[0];
>-
>-	return ret_val;
>-}
>+    yy_state_type yy_current_state;
>+    char *yy_cp;
>+    struct yyguts_t *yyg = (struct yyguts_t *)yyscanner;
> 
>+    yy_current_state = yyg->yy_start;
> 
>-/* yy_get_previous_state - get the state just before the EOB char was reached */
>+    for (yy_cp = yyg->yytext_ptr + YY_MORE_ADJ; yy_cp < yyg->yy_c_buf_p; ++yy_cp)
>+    {
>+        YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1);
>+        if (yy_accept[yy_current_state])
>+        {
>+            yyg->yy_last_accepting_state = yy_current_state;
>+            yyg->yy_last_accepting_cpos  = yy_cp;
>+        }
>+        while (yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state)
>+        {
>+            yy_current_state = (int)yy_def[yy_current_state];
>+            if (yy_current_state >= 95)
>+                yy_c = yy_meta[yy_c];
>+        }
>+        yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c];
>+    }
> 
>-    static yy_state_type yy_get_previous_state (yyscan_t yyscanner)
>-{
>-	yy_state_type yy_current_state;
>-	char *yy_cp;
>-    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
>-
>-	yy_current_state = yyg->yy_start;
>-
>-	for ( yy_cp = yyg->yytext_ptr + YY_MORE_ADJ; yy_cp < yyg->yy_c_buf_p; ++yy_cp )
>-		{
>-		YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1);
>-		if ( yy_accept[yy_current_state] )
>-			{
>-			yyg->yy_last_accepting_state = yy_current_state;
>-			yyg->yy_last_accepting_cpos = yy_cp;
>-			}
>-		while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
>-			{
>-			yy_current_state = (int) yy_def[yy_current_state];
>-			if ( yy_current_state >= 95 )
>-				yy_c = yy_meta[yy_c];
>-			}
>-		yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c];
>-		}
>-
>-	return yy_current_state;
>+    return yy_current_state;
> }
> 
>-
> /* yy_try_NUL_trans - try to make a transition on the NUL character
>  *
>  * synopsis
>  *	next_state = yy_try_NUL_trans( current_state );
>  */
>-    static yy_state_type yy_try_NUL_trans  (yy_state_type yy_current_state , yyscan_t yyscanner)
>+static yy_state_type yy_try_NUL_trans(yy_state_type yy_current_state, yyscan_t yyscanner)
> {
>-	int yy_is_jam;
>-    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; /* This var may be unused depending upon options. */
>-	char *yy_cp = yyg->yy_c_buf_p;
>-
>-	YY_CHAR yy_c = 1;
>-	if ( yy_accept[yy_current_state] )
>-		{
>-		yyg->yy_last_accepting_state = yy_current_state;
>-		yyg->yy_last_accepting_cpos = yy_cp;
>-		}
>-	while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
>-		{
>-		yy_current_state = (int) yy_def[yy_current_state];
>-		if ( yy_current_state >= 95 )
>-			yy_c = yy_meta[yy_c];
>-		}
>-	yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c];
>-	yy_is_jam = (yy_current_state == 94);
>-
>-	(void)yyg;
>-	return yy_is_jam ? 0 : yy_current_state;
>-}
>+    int yy_is_jam;
>+    struct yyguts_t *yyg =
>+        (struct yyguts_t *)yyscanner; /* This var may be unused depending upon options. */
>+    char *yy_cp = yyg->yy_c_buf_p;
>+
>+    YY_CHAR yy_c = 1;
>+    if (yy_accept[yy_current_state])
>+    {
>+        yyg->yy_last_accepting_state = yy_current_state;
>+        yyg->yy_last_accepting_cpos  = yy_cp;
>+    }
>+    while (yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state)
>+    {
>+        yy_current_state = (int)yy_def[yy_current_state];
>+        if (yy_current_state >= 95)
>+            yy_c = yy_meta[yy_c];
>+    }
>+    yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c];
>+    yy_is_jam        = (yy_current_state == 94);
> 
>+    (void)yyg;
>+    return yy_is_jam ? 0 : yy_current_state;
>+}
> 
> #ifndef YY_NO_UNPUT
> 
> #endif
> 
>-#if 0 // #ifndef YY_NO_INPUT
>-#ifdef __cplusplus
>-    static int yyinput (yyscan_t yyscanner)
>-#else
>-    static int input  (yyscan_t yyscanner)
>-#endif
>+#ifndef YY_NO_INPUT
>+#    ifdef __cplusplus
>+static int yyinput(yyscan_t yyscanner)
>+#    else
>+static int input(yyscan_t yyscanner)
>+#    endif
> 
> {
>-	int c;
>-    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
>-
>-	*yyg->yy_c_buf_p = yyg->yy_hold_char;
>-
>-	if ( *yyg->yy_c_buf_p == YY_END_OF_BUFFER_CHAR )
>-		{
>-		/* yy_c_buf_p now points to the character we want to return.
>-		 * If this occurs *before* the EOB characters, then it's a
>-		 * valid NUL; if not, then we've hit the end of the buffer.
>-		 */
>-		if ( yyg->yy_c_buf_p < &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[yyg->yy_n_chars] )
>-			/* This was really a NUL. */
>-			*yyg->yy_c_buf_p = '\0';
>-
>-		else
>-			{ /* need more input */
>-			int offset = (int) (yyg->yy_c_buf_p - yyg->yytext_ptr);
>-			++yyg->yy_c_buf_p;
>-
>-			switch ( yy_get_next_buffer( yyscanner ) )
>-				{
>-				case EOB_ACT_LAST_MATCH:
>-					/* This happens because yy_g_n_b()
>-					 * sees that we've accumulated a
>-					 * token and flags that we need to
>-					 * try matching the token before
>-					 * proceeding.  But for input(),
>-					 * there's no matching to consider.
>-					 * So convert the EOB_ACT_LAST_MATCH
>-					 * to EOB_ACT_END_OF_FILE.
>-					 */
>-
>-					/* Reset buffer status. */
>-					yyrestart( yyin , yyscanner);
>-
>-					/*FALLTHROUGH*/
>-
>-				case EOB_ACT_END_OF_FILE:
>-					{
>-					if ( yywrap( yyscanner ) )
>-						return 0;
>-
>-					if ( ! yyg->yy_did_buffer_switch_on_eof )
>-						YY_NEW_FILE;
>-#ifdef __cplusplus
>-					return yyinput(yyscanner);
>-#else
>-					return input(yyscanner);
>-#endif
>-					}
>+    int c;
>+    struct yyguts_t *yyg = (struct yyguts_t *)yyscanner;
> 
>-				case EOB_ACT_CONTINUE_SCAN:
>-					yyg->yy_c_buf_p = yyg->yytext_ptr + offset;
>-					break;
>-				}
>-			}
>-		}
>+    *yyg->yy_c_buf_p = yyg->yy_hold_char;
> 
>-	c = *(unsigned char *) yyg->yy_c_buf_p;	/* cast for 8-bit char's */
>-	*yyg->yy_c_buf_p = '\0';	/* preserve yytext */
>-	yyg->yy_hold_char = *++yyg->yy_c_buf_p;
>+    if (*yyg->yy_c_buf_p == YY_END_OF_BUFFER_CHAR)
>+    {
>+        /* yy_c_buf_p now points to the character we want to return.
>+         * If this occurs *before* the EOB characters, then it's a
>+         * valid NUL; if not, then we've hit the end of the buffer.
>+         */
>+        if (yyg->yy_c_buf_p < &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[yyg->yy_n_chars])
>+            /* This was really a NUL. */
>+            *yyg->yy_c_buf_p = '\0';
>+
>+        else
>+        { /* need more input */
>+            int offset = (int)(yyg->yy_c_buf_p - yyg->yytext_ptr);
>+            ++yyg->yy_c_buf_p;
>+
>+            switch (yy_get_next_buffer(yyscanner))
>+            {
>+                case EOB_ACT_LAST_MATCH:
>+                    /* This happens because yy_g_n_b()
>+                     * sees that we've accumulated a
>+                     * token and flags that we need to
>+                     * try matching the token before
>+                     * proceeding.  But for input(),
>+                     * there's no matching to consider.
>+                     * So convert the EOB_ACT_LAST_MATCH
>+                     * to EOB_ACT_END_OF_FILE.
>+                     */
>+
>+                    /* Reset buffer status. */
>+                    yyrestart(yyin, yyscanner);
>+
>+                    /*FALLTHROUGH*/
>+
>+                case EOB_ACT_END_OF_FILE:
>+                {
>+                    if (yywrap(yyscanner))
>+                        return 0;
>+
>+                    if (!yyg->yy_did_buffer_switch_on_eof)
>+                        YY_NEW_FILE;
>+#    ifdef __cplusplus
>+                    return yyinput(yyscanner);
>+#    else
>+                    return input(yyscanner);
>+#    endif
>+                }
>+
>+                case EOB_ACT_CONTINUE_SCAN:
>+                    yyg->yy_c_buf_p = yyg->yytext_ptr + offset;
>+                    break;
>+            }
>+        }
>+    }
> 
>+    c                 = *(unsigned char *)yyg->yy_c_buf_p; /* cast for 8-bit char's */
>+    *yyg->yy_c_buf_p  = '\0';                              /* preserve yytext */
>+    yyg->yy_hold_char = *++yyg->yy_c_buf_p;
> 
>-	return c;
>+    return c;
> }
>-#endif	/* ifndef YY_NO_INPUT */
>+#endif /* ifndef YY_NO_INPUT */
> 
> /** Immediately switch to a different input stream.
>  * @param input_file A readable stream.
>  * @param yyscanner The scanner object.
>  * @note This function does not reset the start condition to @c INITIAL .
>  */
>-    void yyrestart  (FILE * input_file , yyscan_t yyscanner)
>+void yyrestart(FILE *input_file, yyscan_t yyscanner)
> {
>-    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
>+    struct yyguts_t *yyg = (struct yyguts_t *)yyscanner;
> 
>-	if ( ! YY_CURRENT_BUFFER ){
>-        yyensure_buffer_stack (yyscanner);
>-		YY_CURRENT_BUFFER_LVALUE =
>-            yy_create_buffer( yyin, YY_BUF_SIZE , yyscanner);
>-	}
>+    if (!YY_CURRENT_BUFFER)
>+    {
>+        yyensure_buffer_stack(yyscanner);
>+        YY_CURRENT_BUFFER_LVALUE = yy_create_buffer(yyin, YY_BUF_SIZE, yyscanner);
>+    }
> 
>-	yy_init_buffer( YY_CURRENT_BUFFER, input_file , yyscanner);
>-	yy_load_buffer_state( yyscanner );
>+    yy_init_buffer(YY_CURRENT_BUFFER, input_file, yyscanner);
>+    yy_load_buffer_state(yyscanner);
> }
> 
>-
> /** Switch to a different input buffer.
>  * @param new_buffer The new input buffer.
>  * @param yyscanner The scanner object.
>  */
>-    void yy_switch_to_buffer  (YY_BUFFER_STATE  new_buffer , yyscan_t yyscanner)
>+void yy_switch_to_buffer(YY_BUFFER_STATE new_buffer, yyscan_t yyscanner)
> {
>-    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
>+    struct yyguts_t *yyg = (struct yyguts_t *)yyscanner;
> 
>-	/* TODO. We should be able to replace this entire function body
>-	 * with
>-	 *		yypop_buffer_state();
>-	 *		yypush_buffer_state(new_buffer);
>+    /* TODO. We should be able to replace this entire function body
>+     * with
>+     *		yypop_buffer_state();
>+     *		yypush_buffer_state(new_buffer);
>      */
>-	yyensure_buffer_stack (yyscanner);
>-	if ( YY_CURRENT_BUFFER == new_buffer )
>-		return;
>-
>-	if ( YY_CURRENT_BUFFER )
>-		{
>-		/* Flush out information for old buffer. */
>-		*yyg->yy_c_buf_p = yyg->yy_hold_char;
>-		YY_CURRENT_BUFFER_LVALUE->yy_buf_pos = yyg->yy_c_buf_p;
>-		YY_CURRENT_BUFFER_LVALUE->yy_n_chars = yyg->yy_n_chars;
>-		}
>-
>-	YY_CURRENT_BUFFER_LVALUE = new_buffer;
>-	yy_load_buffer_state( yyscanner );
>-
>-	/* We don't actually know whether we did this switch during
>-	 * EOF (yywrap()) processing, but the only time this flag
>-	 * is looked at is after yywrap() is called, so it's safe
>-	 * to go ahead and always set it.
>-	 */
>-	yyg->yy_did_buffer_switch_on_eof = 1;
>-}
>+    yyensure_buffer_stack(yyscanner);
>+    if (YY_CURRENT_BUFFER == new_buffer)
>+        return;
> 
>+    if (YY_CURRENT_BUFFER)
>+    {
>+        /* Flush out information for old buffer. */
>+        *yyg->yy_c_buf_p                     = yyg->yy_hold_char;
>+        YY_CURRENT_BUFFER_LVALUE->yy_buf_pos = yyg->yy_c_buf_p;
>+        YY_CURRENT_BUFFER_LVALUE->yy_n_chars = yyg->yy_n_chars;
>+    }
>+
>+    YY_CURRENT_BUFFER_LVALUE = new_buffer;
>+    yy_load_buffer_state(yyscanner);
>+
>+    /* We don't actually know whether we did this switch during
>+     * EOF (yywrap()) processing, but the only time this flag
>+     * is looked at is after yywrap() is called, so it's safe
>+     * to go ahead and always set it.
>+     */
>+    yyg->yy_did_buffer_switch_on_eof = 1;
>+}
> 
>-static void yy_load_buffer_state  (yyscan_t yyscanner)
>+static void yy_load_buffer_state(yyscan_t yyscanner)
> {
>-    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
>-	yyg->yy_n_chars = YY_CURRENT_BUFFER_LVALUE->yy_n_chars;
>-	yyg->yytext_ptr = yyg->yy_c_buf_p = YY_CURRENT_BUFFER_LVALUE->yy_buf_pos;
>-	yyin = YY_CURRENT_BUFFER_LVALUE->yy_input_file;
>-	yyg->yy_hold_char = *yyg->yy_c_buf_p;
>+    struct yyguts_t *yyg = (struct yyguts_t *)yyscanner;
>+    yyg->yy_n_chars      = YY_CURRENT_BUFFER_LVALUE->yy_n_chars;
>+    yyg->yytext_ptr = yyg->yy_c_buf_p = YY_CURRENT_BUFFER_LVALUE->yy_buf_pos;
>+    yyin                              = YY_CURRENT_BUFFER_LVALUE->yy_input_file;
>+    yyg->yy_hold_char                 = *yyg->yy_c_buf_p;
> }
> 
> /** Allocate and initialize an input buffer state.
>@@ -2197,110 +1846,106 @@ static void yy_load_buffer_state  (yyscan_t yyscanner)
>  * @param yyscanner The scanner object.
>  * @return the allocated buffer state.
>  */
>-    YY_BUFFER_STATE yy_create_buffer  (FILE * file, int  size , yyscan_t yyscanner)
>+YY_BUFFER_STATE yy_create_buffer(FILE *file, int size, yyscan_t yyscanner)
> {
>-	YY_BUFFER_STATE b;
>-    
>-	b = (YY_BUFFER_STATE) yyalloc( sizeof( struct yy_buffer_state ) , yyscanner );
>-	if ( ! b )
>-		YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" );
>+    YY_BUFFER_STATE b;
> 
>-	b->yy_buf_size = size;
>+    b = (YY_BUFFER_STATE)yyalloc(sizeof(struct yy_buffer_state), yyscanner);
>+    if (!b)
>+        YY_FATAL_ERROR("out of dynamic memory in yy_create_buffer()");
> 
>-	/* yy_ch_buf has to be 2 characters longer than the size given because
>-	 * we need to put in 2 end-of-buffer characters.
>-	 */
>-	b->yy_ch_buf = (char *) yyalloc( (yy_size_t) (b->yy_buf_size + 2) , yyscanner );
>-	if ( ! b->yy_ch_buf )
>-		YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" );
>+    b->yy_buf_size = size;
> 
>-	b->yy_is_our_buffer = 1;
>+    /* yy_ch_buf has to be 2 characters longer than the size given because
>+     * we need to put in 2 end-of-buffer characters.
>+     */
>+    b->yy_ch_buf = (char *)yyalloc((yy_size_t)(b->yy_buf_size + 2), yyscanner);
>+    if (!b->yy_ch_buf)
>+        YY_FATAL_ERROR("out of dynamic memory in yy_create_buffer()");
> 
>-	yy_init_buffer( b, file , yyscanner);
>+    b->yy_is_our_buffer = 1;
> 
>-	return b;
>-}
>+    yy_init_buffer(b, file, yyscanner);
> 
>+    return b;
>+}
> 
> /** Destroy the buffer.
>  * @param b a buffer created with yy_create_buffer()
>  * @param yyscanner The scanner object.
>  */
>-    void yy_delete_buffer (YY_BUFFER_STATE  b , yyscan_t yyscanner)
>+void yy_delete_buffer(YY_BUFFER_STATE b, yyscan_t yyscanner)
> {
>-    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
>+    struct yyguts_t *yyg = (struct yyguts_t *)yyscanner;
> 
>-	if ( ! b )
>-		return;
>+    if (!b)
>+        return;
> 
>-	if ( b == YY_CURRENT_BUFFER ) /* Not sure if we should pop here. */
>-		YY_CURRENT_BUFFER_LVALUE = (YY_BUFFER_STATE) 0;
>+    if (b == YY_CURRENT_BUFFER) /* Not sure if we should pop here. */
>+        YY_CURRENT_BUFFER_LVALUE = (YY_BUFFER_STATE)0;
> 
>-	if ( b->yy_is_our_buffer )
>-		yyfree( (void *) b->yy_ch_buf , yyscanner );
>+    if (b->yy_is_our_buffer)
>+        yyfree((void *)b->yy_ch_buf, yyscanner);
> 
>-	yyfree( (void *) b , yyscanner );
>+    yyfree((void *)b, yyscanner);
> }
> 
>-
> /* Initializes or reinitializes a buffer.
>  * This function is sometimes called more than once on the same buffer,
>  * such as during a yyrestart() or at EOF.
>  */
>-    static void yy_init_buffer  (YY_BUFFER_STATE  b, FILE * file , yyscan_t yyscanner)
>+static void yy_init_buffer(YY_BUFFER_STATE b, FILE *file, yyscan_t yyscanner)
> 
> {
>-	int oerrno = errno;
>-    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
>+    int oerrno           = errno;
>+    struct yyguts_t *yyg = (struct yyguts_t *)yyscanner;
> 
>-	yy_flush_buffer( b , yyscanner);
>+    yy_flush_buffer(b, yyscanner);
> 
>-	b->yy_input_file = file;
>-	b->yy_fill_buffer = 1;
>+    b->yy_input_file  = file;
>+    b->yy_fill_buffer = 1;
> 
>     /* If b is the current buffer, then yy_init_buffer was _probably_
>      * called from yyrestart() or through yy_get_next_buffer.
>      * In that case, we don't want to reset the lineno or column.
>      */
>-    if (b != YY_CURRENT_BUFFER){
>+    if (b != YY_CURRENT_BUFFER)
>+    {
>         b->yy_bs_lineno = 1;
>         b->yy_bs_column = 0;
>     }
> 
>+    b->yy_is_interactive = 0;
> 
>-    
>-        b->yy_is_interactive = 0;
>-    
>-
>-	errno = oerrno;
>+    errno = oerrno;
> }
> 
> /** Discard all buffered characters. On the next scan, YY_INPUT will be called.
>  * @param b the buffer state to be flushed, usually @c YY_CURRENT_BUFFER.
>  * @param yyscanner The scanner object.
>  */
>-    void yy_flush_buffer (YY_BUFFER_STATE  b , yyscan_t yyscanner)
>+void yy_flush_buffer(YY_BUFFER_STATE b, yyscan_t yyscanner)
> {
>-    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
>-	if ( ! b )
>-		return;
>+    struct yyguts_t *yyg = (struct yyguts_t *)yyscanner;
>+    if (!b)
>+        return;
> 
>-	b->yy_n_chars = 0;
>+    b->yy_n_chars = 0;
> 
>-	/* We always need two end-of-buffer characters.  The first causes
>-	 * a transition to the end-of-buffer state.  The second causes
>-	 * a jam in that state.
>-	 */
>-	b->yy_ch_buf[0] = YY_END_OF_BUFFER_CHAR;
>-	b->yy_ch_buf[1] = YY_END_OF_BUFFER_CHAR;
>+    /* We always need two end-of-buffer characters.  The first causes
>+     * a transition to the end-of-buffer state.  The second causes
>+     * a jam in that state.
>+     */
>+    b->yy_ch_buf[0] = YY_END_OF_BUFFER_CHAR;
>+    b->yy_ch_buf[1] = YY_END_OF_BUFFER_CHAR;
> 
>-	b->yy_buf_pos = &b->yy_ch_buf[0];
>+    b->yy_buf_pos = &b->yy_ch_buf[0];
> 
>-	b->yy_at_bol = 1;
>-	b->yy_buffer_status = YY_BUFFER_NEW;
>+    b->yy_at_bol        = 1;
>+    b->yy_buffer_status = YY_BUFFER_NEW;
> 
>-	if ( b == YY_CURRENT_BUFFER )
>-		yy_load_buffer_state( yyscanner );
>+    if (b == YY_CURRENT_BUFFER)
>+        yy_load_buffer_state(yyscanner);
> }
> 
> /** Pushes the new state onto the stack. The new state becomes
>@@ -2309,107 +1954,101 @@ static void yy_load_buffer_state  (yyscan_t yyscanner)
>  *  @param new_buffer The new state.
>  *  @param yyscanner The scanner object.
>  */
>-void yypush_buffer_state (YY_BUFFER_STATE new_buffer , yyscan_t yyscanner)
>+void yypush_buffer_state(YY_BUFFER_STATE new_buffer, yyscan_t yyscanner)
> {
>-    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
>-	if (new_buffer == NULL)
>-		return;
>-
>-	yyensure_buffer_stack(yyscanner);
>-
>-	/* This block is copied from yy_switch_to_buffer. */
>-	if ( YY_CURRENT_BUFFER )
>-		{
>-		/* Flush out information for old buffer. */
>-		*yyg->yy_c_buf_p = yyg->yy_hold_char;
>-		YY_CURRENT_BUFFER_LVALUE->yy_buf_pos = yyg->yy_c_buf_p;
>-		YY_CURRENT_BUFFER_LVALUE->yy_n_chars = yyg->yy_n_chars;
>-		}
>-
>-	/* Only push if top exists. Otherwise, replace top. */
>-	if (YY_CURRENT_BUFFER)
>-		yyg->yy_buffer_stack_top++;
>-	YY_CURRENT_BUFFER_LVALUE = new_buffer;
>-
>-	/* copied from yy_switch_to_buffer. */
>-	yy_load_buffer_state( yyscanner );
>-	yyg->yy_did_buffer_switch_on_eof = 1;
>-}
>+    struct yyguts_t *yyg = (struct yyguts_t *)yyscanner;
>+    if (new_buffer == NULL)
>+        return;
> 
>+    yyensure_buffer_stack(yyscanner);
>+
>+    /* This block is copied from yy_switch_to_buffer. */
>+    if (YY_CURRENT_BUFFER)
>+    {
>+        /* Flush out information for old buffer. */
>+        *yyg->yy_c_buf_p                     = yyg->yy_hold_char;
>+        YY_CURRENT_BUFFER_LVALUE->yy_buf_pos = yyg->yy_c_buf_p;
>+        YY_CURRENT_BUFFER_LVALUE->yy_n_chars = yyg->yy_n_chars;
>+    }
>+
>+    /* Only push if top exists. Otherwise, replace top. */
>+    if (YY_CURRENT_BUFFER)
>+        yyg->yy_buffer_stack_top++;
>+    YY_CURRENT_BUFFER_LVALUE = new_buffer;
>+
>+    /* copied from yy_switch_to_buffer. */
>+    yy_load_buffer_state(yyscanner);
>+    yyg->yy_did_buffer_switch_on_eof = 1;
>+}
> 
> /** Removes and deletes the top of the stack, if present.
>  *  The next element becomes the new top.
>  *  @param yyscanner The scanner object.
>  */
>-void yypop_buffer_state (yyscan_t yyscanner)
>+void yypop_buffer_state(yyscan_t yyscanner)
> {
>-    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
>-	if (!YY_CURRENT_BUFFER)
>-		return;
>-
>-	yy_delete_buffer(YY_CURRENT_BUFFER , yyscanner);
>-	YY_CURRENT_BUFFER_LVALUE = NULL;
>-	if (yyg->yy_buffer_stack_top > 0)
>-		--yyg->yy_buffer_stack_top;
>-
>-	if (YY_CURRENT_BUFFER) {
>-		yy_load_buffer_state( yyscanner );
>-		yyg->yy_did_buffer_switch_on_eof = 1;
>-	}
>-}
>+    struct yyguts_t *yyg = (struct yyguts_t *)yyscanner;
>+    if (!YY_CURRENT_BUFFER)
>+        return;
> 
>+    yy_delete_buffer(YY_CURRENT_BUFFER, yyscanner);
>+    YY_CURRENT_BUFFER_LVALUE = NULL;
>+    if (yyg->yy_buffer_stack_top > 0)
>+        --yyg->yy_buffer_stack_top;
>+
>+    if (YY_CURRENT_BUFFER)
>+    {
>+        yy_load_buffer_state(yyscanner);
>+        yyg->yy_did_buffer_switch_on_eof = 1;
>+    }
>+}
> 
> /* Allocates the stack if it does not exist.
>  *  Guarantees space for at least one push.
>  */
>-static void yyensure_buffer_stack (yyscan_t yyscanner)
>+static void yyensure_buffer_stack(yyscan_t yyscanner)
> {
>-	yy_size_t num_to_alloc;
>-    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
>+    yy_size_t num_to_alloc;
>+    struct yyguts_t *yyg = (struct yyguts_t *)yyscanner;
> 
>-	if (!yyg->yy_buffer_stack) {
>+    if (!yyg->yy_buffer_stack)
>+    {
> 
>-		/* First allocation is just for 2 elements, since we don't know if this
>-		 * scanner will even need a stack. We use 2 instead of 1 to avoid an
>-		 * immediate realloc on the next call.
>+        /* First allocation is just for 2 elements, since we don't know if this
>+         * scanner will even need a stack. We use 2 instead of 1 to avoid an
>+         * immediate realloc on the next call.
>          */
>-      num_to_alloc = 1; /* After all that talk, this was set to 1 anyways... */
>-		yyg->yy_buffer_stack = (struct yy_buffer_state**)yyalloc
>-								(num_to_alloc * sizeof(struct yy_buffer_state*)
>-								, yyscanner);
>-		if ( ! yyg->yy_buffer_stack )
>-			YY_FATAL_ERROR( "out of dynamic memory in yyensure_buffer_stack()" );
>-
>-
>-		memset(yyg->yy_buffer_stack, 0, num_to_alloc * sizeof(struct yy_buffer_state*));
>-
>-		yyg->yy_buffer_stack_max = num_to_alloc;
>-		yyg->yy_buffer_stack_top = 0;
>-		return;
>-	}
>-
>-	if (yyg->yy_buffer_stack_top >= (yyg->yy_buffer_stack_max) - 1){
>-
>-		/* Increase the buffer to prepare for a possible push. */
>-		yy_size_t grow_size = 8 /* arbitrary grow size */;
>-
>-		num_to_alloc = yyg->yy_buffer_stack_max + grow_size;
>-		yyg->yy_buffer_stack = (struct yy_buffer_state**)yyrealloc
>-								(yyg->yy_buffer_stack,
>-								num_to_alloc * sizeof(struct yy_buffer_state*)
>-								, yyscanner);
>-		if ( ! yyg->yy_buffer_stack )
>-			YY_FATAL_ERROR( "out of dynamic memory in yyensure_buffer_stack()" );
>-
>-		/* zero only the new slots.*/
>-		memset(yyg->yy_buffer_stack + yyg->yy_buffer_stack_max, 0, grow_size * sizeof(struct yy_buffer_state*));
>-		yyg->yy_buffer_stack_max = num_to_alloc;
>-	}
>-}
>+        num_to_alloc         = 1; /* After all that talk, this was set to 1 anyways... */
>+        yyg->yy_buffer_stack = (struct yy_buffer_state **)yyalloc(
>+            num_to_alloc * sizeof(struct yy_buffer_state *), yyscanner);
>+        if (!yyg->yy_buffer_stack)
>+            YY_FATAL_ERROR("out of dynamic memory in yyensure_buffer_stack()");
> 
>+        memset(yyg->yy_buffer_stack, 0, num_to_alloc * sizeof(struct yy_buffer_state *));
> 
>+        yyg->yy_buffer_stack_max = num_to_alloc;
>+        yyg->yy_buffer_stack_top = 0;
>+        return;
>+    }
>+
>+    if (yyg->yy_buffer_stack_top >= (yyg->yy_buffer_stack_max) - 1)
>+    {
> 
>+        /* Increase the buffer to prepare for a possible push. */
>+        yy_size_t grow_size = 8 /* arbitrary grow size */;
> 
>+        num_to_alloc         = yyg->yy_buffer_stack_max + grow_size;
>+        yyg->yy_buffer_stack = (struct yy_buffer_state **)yyrealloc(
>+            yyg->yy_buffer_stack, num_to_alloc * sizeof(struct yy_buffer_state *), yyscanner);
>+        if (!yyg->yy_buffer_stack)
>+            YY_FATAL_ERROR("out of dynamic memory in yyensure_buffer_stack()");
>+
>+        /* zero only the new slots.*/
>+        memset(yyg->yy_buffer_stack + yyg->yy_buffer_stack_max, 0,
>+               grow_size * sizeof(struct yy_buffer_state *));
>+        yyg->yy_buffer_stack_max = num_to_alloc;
>+    }
>+}
> 
> /** Setup the input buffer state to scan directly from a user-specified character buffer.
>  * @param base the character buffer
>@@ -2417,37 +2056,33 @@ static void yyensure_buffer_stack (yyscan_t yyscanner)
>  * @param yyscanner The scanner object.
>  * @return the newly allocated buffer state object.
>  */
>-YY_BUFFER_STATE yy_scan_buffer  (char * base, yy_size_t  size , yyscan_t yyscanner)
>+YY_BUFFER_STATE yy_scan_buffer(char *base, yy_size_t size, yyscan_t yyscanner)
> {
>-	YY_BUFFER_STATE b;
>-    
>-	if ( size < 2 ||
>-	     base[size-2] != YY_END_OF_BUFFER_CHAR ||
>-	     base[size-1] != YY_END_OF_BUFFER_CHAR )
>-		/* They forgot to leave room for the EOB's. */
>-		return NULL;
>-
>-	b = (YY_BUFFER_STATE) yyalloc( sizeof( struct yy_buffer_state ) , yyscanner );
>-	if ( ! b )
>-		YY_FATAL_ERROR( "out of dynamic memory in yy_scan_buffer()" );
>-
>-	b->yy_buf_size = (int) (size - 2);	/* "- 2" to take care of EOB's */
>-	b->yy_buf_pos = b->yy_ch_buf = base;
>-	b->yy_is_our_buffer = 0;
>-	b->yy_input_file = NULL;
>-	b->yy_n_chars = b->yy_buf_size;
>-	b->yy_is_interactive = 0;
>-	b->yy_at_bol = 1;
>-	b->yy_fill_buffer = 0;
>-	b->yy_buffer_status = YY_BUFFER_NEW;
>-
>-	yy_switch_to_buffer( b , yyscanner );
>-
>-	return b;
>-}
>+    YY_BUFFER_STATE b;
> 
>+    if (size < 2 || base[size - 2] != YY_END_OF_BUFFER_CHAR ||
>+        base[size - 1] != YY_END_OF_BUFFER_CHAR)
>+        /* They forgot to leave room for the EOB's. */
>+        return NULL;
> 
>+    b = (YY_BUFFER_STATE)yyalloc(sizeof(struct yy_buffer_state), yyscanner);
>+    if (!b)
>+        YY_FATAL_ERROR("out of dynamic memory in yy_scan_buffer()");
> 
>+    b->yy_buf_size = (int)(size - 2); /* "- 2" to take care of EOB's */
>+    b->yy_buf_pos = b->yy_ch_buf = base;
>+    b->yy_is_our_buffer          = 0;
>+    b->yy_input_file             = NULL;
>+    b->yy_n_chars                = b->yy_buf_size;
>+    b->yy_is_interactive         = 0;
>+    b->yy_at_bol                 = 1;
>+    b->yy_fill_buffer            = 0;
>+    b->yy_buffer_status          = YY_BUFFER_NEW;
>+
>+    yy_switch_to_buffer(b, yyscanner);
>+
>+    return b;
>+}
> 
> /** Setup the input buffer state to scan a string. The next call to yylex() will
>  * scan from a @e copy of @a str.
>@@ -2457,14 +2092,11 @@ YY_BUFFER_STATE yy_scan_buffer  (char * base, yy_size_t  size , yyscan_t yyscann
>  * @note If you want to scan bytes that may contain NUL values, then use
>  *       yy_scan_bytes() instead.
>  */
>-YY_BUFFER_STATE yy_scan_string (const char * yystr , yyscan_t yyscanner)
>+YY_BUFFER_STATE yy_scan_string(const char *yystr, yyscan_t yyscanner)
> {
>-    
>-	return yy_scan_bytes( yystr, (int) strlen(yystr) , yyscanner);
>-}
>-
>-
> 
>+    return yy_scan_bytes(yystr, (int)strlen(yystr), yyscanner);
>+}
> 
> /** Setup the input buffer state to scan the given bytes. The next call to yylex() will
>  * scan from a @e copy of @a bytes.
>@@ -2473,295 +2105,233 @@ YY_BUFFER_STATE yy_scan_string (const char * yystr , yyscan_t yyscanner)
>  * @param yyscanner The scanner object.
>  * @return the newly allocated buffer state object.
>  */
>-YY_BUFFER_STATE yy_scan_bytes  (const char * yybytes, int  _yybytes_len , yyscan_t yyscanner)
>+YY_BUFFER_STATE yy_scan_bytes(const char *yybytes, int _yybytes_len, yyscan_t yyscanner)
> {
>-	YY_BUFFER_STATE b;
>-	char *buf;
>-	yy_size_t n;
>-	int i;
>-    
>-	/* Get memory for full buffer, including space for trailing EOB's. */
>-	n = (yy_size_t) (_yybytes_len + 2);
>-	buf = (char *) yyalloc( n , yyscanner );
>-	if ( ! buf )
>-		YY_FATAL_ERROR( "out of dynamic memory in yy_scan_bytes()" );
>-
>-	for ( i = 0; i < _yybytes_len; ++i )
>-		buf[i] = yybytes[i];
>-
>-	buf[_yybytes_len] = buf[_yybytes_len+1] = YY_END_OF_BUFFER_CHAR;
>-
>-	b = yy_scan_buffer( buf, n , yyscanner);
>-	if ( ! b )
>-		YY_FATAL_ERROR( "bad buffer in yy_scan_bytes()" );
>-
>-	/* It's okay to grow etc. this buffer, and we should throw it
>-	 * away when we're done.
>-	 */
>-	b->yy_is_our_buffer = 1;
>-
>-	return b;
>-}
>-
>-
>-
>-
>+    YY_BUFFER_STATE b;
>+    char *buf;
>+    yy_size_t n;
>+    int i;
> 
>+    /* Get memory for full buffer, including space for trailing EOB's. */
>+    n   = (yy_size_t)(_yybytes_len + 2);
>+    buf = (char *)yyalloc(n, yyscanner);
>+    if (!buf)
>+        YY_FATAL_ERROR("out of dynamic memory in yy_scan_bytes()");
> 
>+    for (i = 0; i < _yybytes_len; ++i)
>+        buf[i] = yybytes[i];
> 
>+    buf[_yybytes_len] = buf[_yybytes_len + 1] = YY_END_OF_BUFFER_CHAR;
> 
>+    b = yy_scan_buffer(buf, n, yyscanner);
>+    if (!b)
>+        YY_FATAL_ERROR("bad buffer in yy_scan_bytes()");
> 
>+    /* It's okay to grow etc. this buffer, and we should throw it
>+     * away when we're done.
>+     */
>+    b->yy_is_our_buffer = 1;
> 
>+    return b;
>+}
> 
> #ifndef YY_EXIT_FAILURE
>-#define YY_EXIT_FAILURE 2
>+#    define YY_EXIT_FAILURE 2
> #endif
> 
>-static void yynoreturn yy_fatal_error (const char* msg , yyscan_t yyscanner)
>+static void yynoreturn yy_fatal_error(const char *msg, yyscan_t yyscanner)
> {
>-	struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
>-	(void)yyg;
>-	fprintf( stderr, "%s\n", msg );
>-	exit( YY_EXIT_FAILURE );
>+    struct yyguts_t *yyg = (struct yyguts_t *)yyscanner;
>+    (void)yyg;
>+    fprintf(stderr, "%s\n", msg);
>+    exit(YY_EXIT_FAILURE);
> }
> 
> /* Redefine yyless() so it works in section 3 code. */
> 
> #undef yyless
>-#define yyless(n) \
>-	do \
>-		{ \
>-		/* Undo effects of setting up yytext. */ \
>-        int yyless_macro_arg = (n); \
>-        YY_LESS_LINENO(yyless_macro_arg);\
>-		yytext[yyleng] = yyg->yy_hold_char; \
>-		yyg->yy_c_buf_p = yytext + yyless_macro_arg; \
>-		yyg->yy_hold_char = *yyg->yy_c_buf_p; \
>-		*yyg->yy_c_buf_p = '\0'; \
>-		yyleng = yyless_macro_arg; \
>-		} \
>-	while ( 0 )
>-
>-
>+#define yyless(n)                                      \
>+    do                                                 \
>+    {                                                  \
>+        /* Undo effects of setting up yytext. */       \
>+        int yyless_macro_arg = (n);                    \
>+        YY_LESS_LINENO(yyless_macro_arg);              \
>+        yytext[yyleng]    = yyg->yy_hold_char;         \
>+        yyg->yy_c_buf_p   = yytext + yyless_macro_arg; \
>+        yyg->yy_hold_char = *yyg->yy_c_buf_p;          \
>+        *yyg->yy_c_buf_p  = '\0';                      \
>+        yyleng            = yyless_macro_arg;          \
>+    } while (0)
> 
> /* Accessor  methods (get/set functions) to struct members. */
> 
>-
> /** Get the user-defined data for this scanner.
>  * @param yyscanner The scanner object.
>  */
>-YY_EXTRA_TYPE yyget_extra  (yyscan_t yyscanner)
>+YY_EXTRA_TYPE yyget_extra(yyscan_t yyscanner)
> {
>-    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
>+    struct yyguts_t *yyg = (struct yyguts_t *)yyscanner;
>     return yyextra;
> }
> 
>-
>-
> /** Get the current line number.
>  * @param yyscanner The scanner object.
>  */
>-int yyget_lineno  (yyscan_t yyscanner)
>+int yyget_lineno(yyscan_t yyscanner)
> {
>-    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
>+    struct yyguts_t *yyg = (struct yyguts_t *)yyscanner;
>+
>+    if (!YY_CURRENT_BUFFER)
>+        return 0;
> 
>-    
>-        if (! YY_CURRENT_BUFFER)
>-            return 0;
>-    
>     return yylineno;
> }
> 
>-
>-
>-
> /** Get the current column number.
>  * @param yyscanner The scanner object.
>  */
>-int yyget_column  (yyscan_t yyscanner)
>+int yyget_column(yyscan_t yyscanner)
> {
>-    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
>+    struct yyguts_t *yyg = (struct yyguts_t *)yyscanner;
>+
>+    if (!YY_CURRENT_BUFFER)
>+        return 0;
> 
>-    
>-        if (! YY_CURRENT_BUFFER)
>-            return 0;
>-    
>     return yycolumn;
> }
> 
>-
>-
>-
> /** Get the input stream.
>  * @param yyscanner The scanner object.
>  */
>-FILE *yyget_in  (yyscan_t yyscanner)
>+FILE *yyget_in(yyscan_t yyscanner)
> {
>-    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
>+    struct yyguts_t *yyg = (struct yyguts_t *)yyscanner;
>     return yyin;
> }
> 
>-
>-
> /** Get the output stream.
>  * @param yyscanner The scanner object.
>  */
>-FILE *yyget_out  (yyscan_t yyscanner)
>+FILE *yyget_out(yyscan_t yyscanner)
> {
>-    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
>+    struct yyguts_t *yyg = (struct yyguts_t *)yyscanner;
>     return yyout;
> }
> 
>-
>-
> /** Get the length of the current token.
>  * @param yyscanner The scanner object.
>  */
>-int yyget_leng  (yyscan_t yyscanner)
>+int yyget_leng(yyscan_t yyscanner)
> {
>-    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
>+    struct yyguts_t *yyg = (struct yyguts_t *)yyscanner;
>     return yyleng;
> }
> 
>-
> /** Get the current token.
>  * @param yyscanner The scanner object.
>  */
> 
>-char *yyget_text  (yyscan_t yyscanner)
>+char *yyget_text(yyscan_t yyscanner)
> {
>-    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
>+    struct yyguts_t *yyg = (struct yyguts_t *)yyscanner;
>     return yytext;
> }
> 
>-
>-
> /** Set the user-defined data. This data is never touched by the scanner.
>  * @param user_defined The data to be associated with this scanner.
>  * @param yyscanner The scanner object.
>  */
>-void yyset_extra (YY_EXTRA_TYPE  user_defined , yyscan_t yyscanner)
>+void yyset_extra(YY_EXTRA_TYPE user_defined, yyscan_t yyscanner)
> {
>-    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
>-    yyextra = user_defined ;
>+    struct yyguts_t *yyg = (struct yyguts_t *)yyscanner;
>+    yyextra              = user_defined;
> }
> 
>-
>-
> /** Set the current line number.
>  * @param _line_number line number
>  * @param yyscanner The scanner object.
>  */
>-void yyset_lineno (int  _line_number , yyscan_t yyscanner)
>+void yyset_lineno(int _line_number, yyscan_t yyscanner)
> {
>-    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
>+    struct yyguts_t *yyg = (struct yyguts_t *)yyscanner;
>+
>+    /* lineno is only valid if an input buffer exists. */
>+    if (!YY_CURRENT_BUFFER)
>+        YY_FATAL_ERROR("yyset_lineno called with no buffer");
> 
>-    
>-        /* lineno is only valid if an input buffer exists. */
>-        if (! YY_CURRENT_BUFFER )
>-           YY_FATAL_ERROR( "yyset_lineno called with no buffer" );
>-    
>     yylineno = _line_number;
> }
> 
>-
>-
>-
> /** Set the current column.
>  * @param _column_no column number
>  * @param yyscanner The scanner object.
>  */
>-void yyset_column (int  _column_no , yyscan_t yyscanner)
>+void yyset_column(int _column_no, yyscan_t yyscanner)
> {
>-    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
>+    struct yyguts_t *yyg = (struct yyguts_t *)yyscanner;
>+
>+    /* column is only valid if an input buffer exists. */
>+    if (!YY_CURRENT_BUFFER)
>+        YY_FATAL_ERROR("yyset_column called with no buffer");
> 
>-    
>-        /* column is only valid if an input buffer exists. */
>-        if (! YY_CURRENT_BUFFER )
>-           YY_FATAL_ERROR( "yyset_column called with no buffer" );
>-    
>     yycolumn = _column_no;
> }
> 
>-
>-
>-
>-
> /** Set the input stream. This does not discard the current
>  * input buffer.
>  * @param _in_str A readable stream.
>  * @param yyscanner The scanner object.
>  * @see yy_switch_to_buffer
>  */
>-void yyset_in (FILE *  _in_str , yyscan_t yyscanner)
>+void yyset_in(FILE *_in_str, yyscan_t yyscanner)
> {
>-    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
>-    yyin = _in_str ;
>+    struct yyguts_t *yyg = (struct yyguts_t *)yyscanner;
>+    yyin                 = _in_str;
> }
> 
>-
>-
>-void yyset_out (FILE *  _out_str , yyscan_t yyscanner)
>+void yyset_out(FILE *_out_str, yyscan_t yyscanner)
> {
>-    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
>-    yyout = _out_str ;
>+    struct yyguts_t *yyg = (struct yyguts_t *)yyscanner;
>+    yyout                = _out_str;
> }
> 
>-
>-
>-
>-int yyget_debug  (yyscan_t yyscanner)
>+int yyget_debug(yyscan_t yyscanner)
> {
>-    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
>+    struct yyguts_t *yyg = (struct yyguts_t *)yyscanner;
>     return yy_flex_debug;
> }
> 
>-
>-
>-void yyset_debug (int  _bdebug , yyscan_t yyscanner)
>+void yyset_debug(int _bdebug, yyscan_t yyscanner)
> {
>-    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
>-    yy_flex_debug = _bdebug ;
>+    struct yyguts_t *yyg = (struct yyguts_t *)yyscanner;
>+    yy_flex_debug        = _bdebug;
> }
> 
>-
> /* Accessor methods for yylval and yylloc */
> 
>-
>-YYSTYPE * yyget_lval  (yyscan_t yyscanner)
>+YYSTYPE *yyget_lval(yyscan_t yyscanner)
> {
>-    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
>+    struct yyguts_t *yyg = (struct yyguts_t *)yyscanner;
>     return yylval;
> }
> 
>-
>-
>-void yyset_lval (YYSTYPE *  yylval_param , yyscan_t yyscanner)
>+void yyset_lval(YYSTYPE *yylval_param, yyscan_t yyscanner)
> {
>-    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
>-    yylval = yylval_param;
>+    struct yyguts_t *yyg = (struct yyguts_t *)yyscanner;
>+    yylval               = yylval_param;
> }
> 
>-
>-
>-    
>-YYLTYPE *yyget_lloc  (yyscan_t yyscanner)
>+YYLTYPE *yyget_lloc(yyscan_t yyscanner)
> {
>-    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
>+    struct yyguts_t *yyg = (struct yyguts_t *)yyscanner;
>     return yylloc;
> }
>-    
> 
>-    
>-void yyset_lloc (YYLTYPE *  yylloc_param , yyscan_t yyscanner)
>+void yyset_lloc(YYLTYPE *yylloc_param, yyscan_t yyscanner)
> {
>-    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
>-    yylloc = yylloc_param;
>+    struct yyguts_t *yyg = (struct yyguts_t *)yyscanner;
>+    yylloc               = yylloc_param;
> }
>-    
>-
>-
>-
> 
> /* User-visible API */
> 
>@@ -2769,27 +2339,28 @@ void yyset_lloc (YYLTYPE *  yylloc_param , yyscan_t yyscanner)
>  * the ONLY reentrant function that doesn't take the scanner as the last argument.
>  * That's why we explicitly handle the declaration, instead of using our macros.
>  */
>-int yylex_init(yyscan_t* ptr_yy_globals)
>+int yylex_init(yyscan_t *ptr_yy_globals)
> {
>-    if (ptr_yy_globals == NULL){
>+    if (ptr_yy_globals == NULL)
>+    {
>         errno = EINVAL;
>         return 1;
>     }
> 
>-    *ptr_yy_globals = (yyscan_t) yyalloc ( sizeof( struct yyguts_t ), NULL );
>+    *ptr_yy_globals = (yyscan_t)yyalloc(sizeof(struct yyguts_t), NULL);
> 
>-    if (*ptr_yy_globals == NULL){
>+    if (*ptr_yy_globals == NULL)
>+    {
>         errno = ENOMEM;
>         return 1;
>     }
> 
>     /* By setting to 0xAA, we expose bugs in yy_init_globals. Leave at 0x00 for releases. */
>-    memset(*ptr_yy_globals,0x00,sizeof(struct yyguts_t));
>+    memset(*ptr_yy_globals, 0x00, sizeof(struct yyguts_t));
> 
>-    return yy_init_globals ( *ptr_yy_globals );
>+    return yy_init_globals(*ptr_yy_globals);
> }
> 
>-
> /* yylex_init_extra has the same functionality as yylex_init, but follows the
>  * convention of taking the scanner as the last argument. Note however, that
>  * this is a *pointer* to a scanner, as it will be allocated by this call (and
>@@ -2797,65 +2368,59 @@ int yylex_init(yyscan_t* ptr_yy_globals)
>  * The user defined value in the first argument will be available to yyalloc in
>  * the yyextra field.
>  */
>-int yylex_init_extra( YY_EXTRA_TYPE yy_user_defined, yyscan_t* ptr_yy_globals )
>+int yylex_init_extra(YY_EXTRA_TYPE yy_user_defined, yyscan_t *ptr_yy_globals)
> {
>     struct yyguts_t dummy_yyguts;
> 
>-    yyset_extra (yy_user_defined, &dummy_yyguts);
>+    yyset_extra(yy_user_defined, &dummy_yyguts);
> 
>-    if (ptr_yy_globals == NULL){
>+    if (ptr_yy_globals == NULL)
>+    {
>         errno = EINVAL;
>         return 1;
>     }
> 
>-    *ptr_yy_globals = (yyscan_t) yyalloc ( sizeof( struct yyguts_t ), &dummy_yyguts );
>+    *ptr_yy_globals = (yyscan_t)yyalloc(sizeof(struct yyguts_t), &dummy_yyguts);
> 
>-    if (*ptr_yy_globals == NULL){
>+    if (*ptr_yy_globals == NULL)
>+    {
>         errno = ENOMEM;
>         return 1;
>     }
> 
>     /* By setting to 0xAA, we expose bugs in
>     yy_init_globals. Leave at 0x00 for releases. */
>-    memset(*ptr_yy_globals,0x00,sizeof(struct yyguts_t));
>+    memset(*ptr_yy_globals, 0x00, sizeof(struct yyguts_t));
> 
>-    yyset_extra (yy_user_defined, *ptr_yy_globals);
>+    yyset_extra(yy_user_defined, *ptr_yy_globals);
> 
>-    return yy_init_globals ( *ptr_yy_globals );
>+    return yy_init_globals(*ptr_yy_globals);
> }
> 
>-
>-static int yy_init_globals (yyscan_t yyscanner)
>+static int yy_init_globals(yyscan_t yyscanner)
> {
>-    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
>+    struct yyguts_t *yyg = (struct yyguts_t *)yyscanner;
>     /* Initialization is the same as for the non-reentrant scanner.
>      * This function is called from yylex_destroy(), so don't allocate here.
>      */
> 
>-
>-    yyg->yy_buffer_stack = NULL;
>+    yyg->yy_buffer_stack     = NULL;
>     yyg->yy_buffer_stack_top = 0;
>     yyg->yy_buffer_stack_max = 0;
>-    yyg->yy_c_buf_p = NULL;
>-    yyg->yy_init = 0;
>-    yyg->yy_start = 0;
>-
>+    yyg->yy_c_buf_p          = NULL;
>+    yyg->yy_init             = 0;
>+    yyg->yy_start            = 0;
> 
>-    yyg->yy_start_stack_ptr = 0;
>+    yyg->yy_start_stack_ptr   = 0;
>     yyg->yy_start_stack_depth = 0;
>-    yyg->yy_start_stack =  NULL;
>-
>-
>-
>-
>-
>+    yyg->yy_start_stack       = NULL;
> 
> /* Defined in main.c */
> #ifdef YY_STDINIT
>-    yyin = stdin;
>+    yyin  = stdin;
>     yyout = stdout;
> #else
>-    yyin = NULL;
>+    yyin  = NULL;
>     yyout = NULL;
> #endif
> 
>@@ -2865,120 +2430,100 @@ static int yy_init_globals (yyscan_t yyscanner)
>     return 0;
> }
> 
>-
> /* yylex_destroy is for both reentrant and non-reentrant scanners. */
>-int yylex_destroy  (yyscan_t yyscanner)
>+int yylex_destroy(yyscan_t yyscanner)
> {
>-    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
>+    struct yyguts_t *yyg = (struct yyguts_t *)yyscanner;
> 
>     /* Pop the buffer stack, destroying each element. */
>-	while(YY_CURRENT_BUFFER){
>-		yy_delete_buffer( YY_CURRENT_BUFFER , yyscanner );
>-		YY_CURRENT_BUFFER_LVALUE = NULL;
>-		yypop_buffer_state(yyscanner);
>-	}
>-
>-	/* Destroy the stack itself. */
>-	yyfree(yyg->yy_buffer_stack , yyscanner);
>-	yyg->yy_buffer_stack = NULL;
>+    while (YY_CURRENT_BUFFER)
>+    {
>+        yy_delete_buffer(YY_CURRENT_BUFFER, yyscanner);
>+        YY_CURRENT_BUFFER_LVALUE = NULL;
>+        yypop_buffer_state(yyscanner);
>+    }
> 
>+    /* Destroy the stack itself. */
>+    yyfree(yyg->yy_buffer_stack, yyscanner);
>+    yyg->yy_buffer_stack = NULL;
> 
>     /* Destroy the start condition stack. */
>-        yyfree( yyg->yy_start_stack , yyscanner );
>-        yyg->yy_start_stack = NULL;
>-
>-
>-
>+    yyfree(yyg->yy_start_stack, yyscanner);
>+    yyg->yy_start_stack = NULL;
> 
>     /* Reset the globals. This is important in a non-reentrant scanner so the next time
>      * yylex() is called, initialization will occur. */
>-    yy_init_globals( yyscanner);
>+    yy_init_globals(yyscanner);
> 
>     /* Destroy the main struct (reentrant only). */
>-    yyfree ( yyscanner , yyscanner );
>+    yyfree(yyscanner, yyscanner);
>     yyscanner = NULL;
>     return 0;
> }
> 
>-
>-
> /*
>  * Internal utility routines.
>  */
> 
>-
>-
> #ifndef yytext_ptr
>-static void yy_flex_strncpy (char* s1, const char * s2, int n , yyscan_t yyscanner)
>+static void yy_flex_strncpy(char *s1, const char *s2, int n, yyscan_t yyscanner)
> {
>-	struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
>-	(void)yyg;
>+    struct yyguts_t *yyg = (struct yyguts_t *)yyscanner;
>+    (void)yyg;
> 
>-	int i;
>-	for ( i = 0; i < n; ++i )
>-		s1[i] = s2[i];
>+    int i;
>+    for (i = 0; i < n; ++i)
>+        s1[i] = s2[i];
> }
> #endif
> 
>-
>-
> #ifdef YY_NEED_STRLEN
>-static int yy_flex_strlen (const char * s , yyscan_t yyscanner)
>+static int yy_flex_strlen(const char *s, yyscan_t yyscanner)
> {
>-	int n;
>-	for ( n = 0; s[n]; ++n )
>-		;
>+    int n;
>+    for (n = 0; s[n]; ++n)
>+        ;
> 
>-	return n;
>+    return n;
> }
> #endif
> 
>-
>-
>-void *yyalloc (yy_size_t  size , yyscan_t yyscanner)
>+void *yyalloc(yy_size_t size, yyscan_t yyscanner)
> {
>-	struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
>-	(void)yyg;
>-	return malloc(size);
>+    struct yyguts_t *yyg = (struct yyguts_t *)yyscanner;
>+    (void)yyg;
>+    return malloc(size);
> }
> 
>-
>-
>-void *yyrealloc  (void * ptr, yy_size_t  size , yyscan_t yyscanner)
>+void *yyrealloc(void *ptr, yy_size_t size, yyscan_t yyscanner)
> {
>-	struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
>-	(void)yyg;
>-
>-	/* The cast to (char *) in the following accommodates both
>-	 * implementations that use char* generic pointers, and those
>-	 * that use void* generic pointers.  It works with the latter
>-	 * because both ANSI C and C++ allow castless assignment from
>-	 * any pointer type to void*, and deal with argument conversions
>-	 * as though doing an assignment.
>-	 */
>-	return realloc(ptr, size);
>-}
>-
>+    struct yyguts_t *yyg = (struct yyguts_t *)yyscanner;
>+    (void)yyg;
> 
>+    /* The cast to (char *) in the following accommodates both
>+     * implementations that use char* generic pointers, and those
>+     * that use void* generic pointers.  It works with the latter
>+     * because both ANSI C and C++ allow castless assignment from
>+     * any pointer type to void*, and deal with argument conversions
>+     * as though doing an assignment.
>+     */
>+    return realloc(ptr, size);
>+}
> 
>-void yyfree (void * ptr , yyscan_t yyscanner)
>+void yyfree(void *ptr, yyscan_t yyscanner)
> {
>-	struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
>-	(void)yyg;
>-	free( (char *) ptr );	/* see yyrealloc() for (char *) cast */
>+    struct yyguts_t *yyg = (struct yyguts_t *)yyscanner;
>+    (void)yyg;
>+    free((char *)ptr); /* see yyrealloc() for (char *) cast */
> }
> 
>-
> #define YYTABLES_NAME "yytables"
> 
>+namespace angle
>+{
> 
>-
>-
>-
>-
>-
>-
>-namespace pp {
>+namespace pp
>+{
> 
> Tokenizer::Tokenizer(Diagnostics *diagnostics) : mHandle(nullptr), mMaxTokenSize(256)
> {
>@@ -2990,7 +2535,7 @@ Tokenizer::~Tokenizer()
>     destroyScanner();
> }
> 
>-bool Tokenizer::init(size_t count, const char * const string[], const int length[])
>+bool Tokenizer::init(size_t count, const char *const string[], const int length[])
> {
>     if ((count > 0) && (string == 0))
>         return false;
>@@ -3032,8 +2577,7 @@ void Tokenizer::lex(Token *token)
> 
>     if (token->text.size() > mMaxTokenSize)
>     {
>-        mContext.diagnostics->report(Diagnostics::PP_TOKEN_TOO_LONG,
>-                                     token->location, token->text);
>+        mContext.diagnostics->report(Diagnostics::PP_TOKEN_TOO_LONG, token->location, token->text);
>         token->text.erase(mMaxTokenSize);
>     }
> 
>@@ -3066,4 +2610,4 @@ void Tokenizer::destroyScanner()
> 
> }  // namespace pp
> 
>-
>+}  // namespace angle
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/preprocessor/Tokenizer.h b/Source/ThirdParty/ANGLE/src/compiler/preprocessor/Tokenizer.h
>index af4fd7ce7b1..4609179a06e 100644
>--- a/Source/ThirdParty/ANGLE/src/compiler/preprocessor/Tokenizer.h
>+++ b/Source/ThirdParty/ANGLE/src/compiler/preprocessor/Tokenizer.h
>@@ -11,6 +11,9 @@
> #include "compiler/preprocessor/Input.h"
> #include "compiler/preprocessor/Lexer.h"
> 
>+namespace angle
>+{
>+
> namespace pp
> {
> 
>@@ -55,4 +58,6 @@ class Tokenizer : public Lexer
> 
> }  // namespace pp
> 
>+}  // namespace angle
>+
> #endif  // COMPILER_PREPROCESSOR_TOKENIZER_H_
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/preprocessor/Tokenizer.l b/Source/ThirdParty/ANGLE/src/compiler/preprocessor/Tokenizer.l
>index 096812d45f1..94db185ef7b 100644
>--- a/Source/ThirdParty/ANGLE/src/compiler/preprocessor/Tokenizer.l
>+++ b/Source/ThirdParty/ANGLE/src/compiler/preprocessor/Tokenizer.l
>@@ -38,6 +38,12 @@ IF YOU MODIFY THIS FILE YOU ALSO NEED TO RUN generate_parser.sh.
> #elif defined(_MSC_VER)
> #pragma warning(disable: 4244)
> #endif
>+#if defined(__clang__)
>+// Flex uses `/*FALLTHROUGH*/` instead of dedicated statements.
>+#pragma GCC diagnostic ignored "-Wimplicit-fallthrough"
>+// Flex isn't semi-colon clean.
>+#pragma clang diagnostic ignored "-Wextra-semi-stmt"
>+#endif
> 
> // Workaround for flex using the register keyword, deprecated in C++11.
> #ifdef __cplusplus
>@@ -47,7 +53,7 @@ IF YOU MODIFY THIS FILE YOU ALSO NEED TO RUN generate_parser.sh.
> #endif
> 
> typedef std::string YYSTYPE;
>-typedef pp::SourceLocation YYLTYPE;
>+typedef angle::pp::SourceLocation YYLTYPE;
> 
> // Use the unused yycolumn variable to track file (string) number.
> #define yyfileno yycolumn
>@@ -60,11 +66,12 @@ typedef pp::SourceLocation YYLTYPE;
>         yyextra->lineStart = true;     \
>     } while(0);
> 
>+#define YY_NO_INPUT
> #define YY_USER_ACTION                                              \
>     do                                                              \
>     {                                                               \
>-        pp::Input* input = &yyextra->input;                         \
>-        pp::Input::Location* scanLoc = &yyextra->scanLoc;           \
>+        angle::pp::Input* input = &yyextra->input;                  \
>+        angle::pp::Input::Location* scanLoc = &yyextra->scanLoc;    \
>         while ((scanLoc->sIndex < input->count()) &&                \
>                (scanLoc->cIndex >= input->length(scanLoc->sIndex))) \
>         {                                                           \
>@@ -84,7 +91,7 @@ typedef pp::SourceLocation YYLTYPE;
> %option noyywrap nounput never-interactive
> %option reentrant bison-bridge bison-locations
> %option prefix="pp"
>-%option extra-type="pp::Tokenizer::Context*"
>+%option extra-type="angle::pp::Tokenizer::Context*"
> %x COMMENT
> 
> NEWLINE     \n|\r|\r\n
>@@ -114,7 +121,7 @@ FRACTIONAL_CONSTANT  ({DIGIT}*"."{DIGIT}+)|({DIGIT}+".")
>     if (yylineno == INT_MAX)
>     {
>         *yylval = "Integer overflow on line number";
>-        return pp::Token::GOT_ERROR;
>+        return angle::pp::Token::GOT_ERROR;
>     }
>     ++yylineno;
> }
>@@ -126,114 +133,114 @@ FRACTIONAL_CONSTANT  ({DIGIT}*"."{DIGIT}+)|({DIGIT}+".")
> # {
>     // # is only valid at start of line for preprocessor directives.
>     yylval->assign(1, yytext[0]);
>-    return yyextra->lineStart ? pp::Token::PP_HASH : pp::Token::PP_OTHER;
>+    return yyextra->lineStart ? angle::pp::Token::PP_HASH : angle::pp::Token::PP_OTHER;
> }
> 
> {IDENTIFIER} {
>     yylval->assign(yytext, yyleng);
>-    return pp::Token::IDENTIFIER;
>+    return angle::pp::Token::IDENTIFIER;
> }
> 
> ({DECIMAL_CONSTANT}[uU]?)|({OCTAL_CONSTANT}[uU]?)|({HEXADECIMAL_CONSTANT}[uU]?) {
>     yylval->assign(yytext, yyleng);
>-    return pp::Token::CONST_INT;
>+    return angle::pp::Token::CONST_INT;
> }
> 
> ({DIGIT}+{EXPONENT_PART}[fF]?)|({FRACTIONAL_CONSTANT}{EXPONENT_PART}?[fF]?) {
>     yylval->assign(yytext, yyleng);
>-    return pp::Token::CONST_FLOAT;
>+    return angle::pp::Token::CONST_FLOAT;
> }
> 
>     /* Anything that starts with a {DIGIT} or .{DIGIT} must be a number. */
>     /* Rule to catch all invalid integers and floats. */
> ({DIGIT}+[_a-zA-Z0-9.]*)|("."{DIGIT}+[_a-zA-Z0-9.]*) {
>     yylval->assign(yytext, yyleng);
>-    return pp::Token::PP_NUMBER;
>+    return angle::pp::Token::PP_NUMBER;
> }
> 
> "++" {
>     yylval->assign(yytext, yyleng);
>-    return pp::Token::OP_INC;
>+    return angle::pp::Token::OP_INC;
> }
> "--" {
>     yylval->assign(yytext, yyleng);
>-    return pp::Token::OP_DEC;
>+    return angle::pp::Token::OP_DEC;
> }
> "<<" {
>     yylval->assign(yytext, yyleng);
>-    return pp::Token::OP_LEFT;
>+    return angle::pp::Token::OP_LEFT;
> }
> ">>" {
>     yylval->assign(yytext, yyleng);
>-    return pp::Token::OP_RIGHT;
>+    return angle::pp::Token::OP_RIGHT;
> }
> "<=" {
>     yylval->assign(yytext, yyleng);
>-    return pp::Token::OP_LE;
>+    return angle::pp::Token::OP_LE;
> }
> ">=" {
>     yylval->assign(yytext, yyleng);
>-    return pp::Token::OP_GE;
>+    return angle::pp::Token::OP_GE;
> }
> "==" {
>     yylval->assign(yytext, yyleng);
>-    return pp::Token::OP_EQ;
>+    return angle::pp::Token::OP_EQ;
> }
> "!=" {
>     yylval->assign(yytext, yyleng);
>-    return pp::Token::OP_NE;
>+    return angle::pp::Token::OP_NE;
> }
> "&&" {
>     yylval->assign(yytext, yyleng);
>-    return pp::Token::OP_AND;
>+    return angle::pp::Token::OP_AND;
> }
> "^^" {
>     yylval->assign(yytext, yyleng);
>-    return pp::Token::OP_XOR;
>+    return angle::pp::Token::OP_XOR;
> }
> "||" {
>     yylval->assign(yytext, yyleng);
>-    return pp::Token::OP_OR;
>+    return angle::pp::Token::OP_OR;
> }
> "+=" {
>     yylval->assign(yytext, yyleng);
>-    return pp::Token::OP_ADD_ASSIGN;
>+    return angle::pp::Token::OP_ADD_ASSIGN;
> }
> "-=" {
>     yylval->assign(yytext, yyleng);
>-    return pp::Token::OP_SUB_ASSIGN;
>+    return angle::pp::Token::OP_SUB_ASSIGN;
> }
> "*=" {
>     yylval->assign(yytext, yyleng);
>-    return pp::Token::OP_MUL_ASSIGN;
>+    return angle::pp::Token::OP_MUL_ASSIGN;
> }
> "/=" {
>     yylval->assign(yytext, yyleng);
>-    return pp::Token::OP_DIV_ASSIGN;
>+    return angle::pp::Token::OP_DIV_ASSIGN;
> }
> "%=" {
>     yylval->assign(yytext, yyleng);
>-    return pp::Token::OP_MOD_ASSIGN;
>+    return angle::pp::Token::OP_MOD_ASSIGN;
> }
> "<<=" {
>     yylval->assign(yytext, yyleng);
>-    return pp::Token::OP_LEFT_ASSIGN;
>+    return angle::pp::Token::OP_LEFT_ASSIGN;
> }
> ">>=" {
>     yylval->assign(yytext, yyleng);
>-    return pp::Token::OP_RIGHT_ASSIGN;
>+    return angle::pp::Token::OP_RIGHT_ASSIGN;
> }
> "&=" {
>     yylval->assign(yytext, yyleng);
>-    return pp::Token::OP_AND_ASSIGN;
>+    return angle::pp::Token::OP_AND_ASSIGN;
> }
> "^=" {
>     yylval->assign(yytext, yyleng);
>-    return pp::Token::OP_XOR_ASSIGN;
>+    return angle::pp::Token::OP_XOR_ASSIGN;
> }
> "|=" {
>     yylval->assign(yytext, yyleng);
>-    return pp::Token::OP_OR_ASSIGN;
>+    return angle::pp::Token::OP_OR_ASSIGN;
> }
> 
> {PUNCTUATOR} {
>@@ -247,7 +254,7 @@ FRACTIONAL_CONSTANT  ({DIGIT}*"."{DIGIT}+)|({DIGIT}+".")
>     if (yylineno == INT_MAX)
>     {
>         *yylval = "Integer overflow on line number";
>-        return pp::Token::GOT_ERROR;
>+        return angle::pp::Token::GOT_ERROR;
>     }
>     ++yylineno;
>     yylval->assign(1, '\n');
>@@ -256,14 +263,14 @@ FRACTIONAL_CONSTANT  ({DIGIT}*"."{DIGIT}+)|({DIGIT}+".")
> 
> . {
>     yylval->assign(1, yytext[0]);
>-    return pp::Token::PP_OTHER;
>+    return angle::pp::Token::PP_OTHER;
> }
> 
> <*><<EOF>> {
>     // YY_USER_ACTION is not invoked for handling EOF.
>     // Set the location for EOF token manually.
>-    pp::Input* input = &yyextra->input;
>-    pp::Input::Location* scanLoc = &yyextra->scanLoc;
>+    angle::pp::Input* input = &yyextra->input;
>+    angle::pp::Input::Location* scanLoc = &yyextra->scanLoc;
>     yy_size_t sIndexMax = input->count() ? input->count() - 1 : 0;
>     if (scanLoc->sIndex != sIndexMax)
>     {
>@@ -279,14 +286,14 @@ FRACTIONAL_CONSTANT  ({DIGIT}*"."{DIGIT}+)|({DIGIT}+".")
> 
>     // Line number overflows fake EOFs to exit early, check for this case.
>     if (yylineno == INT_MAX) {
>-        yyextra->diagnostics->report(pp::Diagnostics::PP_TOKENIZER_ERROR,
>-                pp::SourceLocation(yyfileno, yylineno),
>+        yyextra->diagnostics->report(angle::pp::Diagnostics::PP_TOKENIZER_ERROR,
>+                angle::pp::SourceLocation(yyfileno, yylineno),
>                 "Integer overflow on line number");
>     }
>     else if (YY_START == COMMENT)
>     {
>-        yyextra->diagnostics->report(pp::Diagnostics::PP_EOF_IN_COMMENT,
>-                                     pp::SourceLocation(yyfileno, yylineno),
>+        yyextra->diagnostics->report(angle::pp::Diagnostics::PP_EOF_IN_COMMENT,
>+                                     angle::pp::SourceLocation(yyfileno, yylineno),
>                                      "EOF while in a comment");
>     }
>     yyterminate();
>@@ -294,6 +301,8 @@ FRACTIONAL_CONSTANT  ({DIGIT}*"."{DIGIT}+)|({DIGIT}+".")
> 
> %%
> 
>+namespace angle {
>+
> namespace pp {
> 
> Tokenizer::Tokenizer(Diagnostics *diagnostics) : mHandle(nullptr), mMaxTokenSize(256)
>@@ -382,3 +391,5 @@ void Tokenizer::destroyScanner()
> 
> }  // namespace pp
> 
>+} // namespace angle
>+
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/preprocessor/numeric_lex.h b/Source/ThirdParty/ANGLE/src/compiler/preprocessor/numeric_lex.h
>index 6ea779ab8f6..2203d8ac8f9 100644
>--- a/Source/ThirdParty/ANGLE/src/compiler/preprocessor/numeric_lex.h
>+++ b/Source/ThirdParty/ANGLE/src/compiler/preprocessor/numeric_lex.h
>@@ -9,9 +9,11 @@
> #ifndef COMPILER_PREPROCESSOR_NUMERICLEX_H_
> #define COMPILER_PREPROCESSOR_NUMERICLEX_H_
> 
>-#include <cmath>
> #include <sstream>
> 
>+namespace angle
>+{
>+
> namespace pp
> {
> 
>@@ -45,28 +47,8 @@ bool numeric_lex_int(const std::string &str, IntType *value)
>     return !stream.fail();
> }
> 
>-template <typename FloatType>
>-bool numeric_lex_float(const std::string &str, FloatType *value)
>-{
>-// On 64-bit Intel Android, istringstream is broken.  Until this is fixed in
>-// a newer NDK, don't use it.  Android doesn't have locale support, so this
>-// doesn't have to force the C locale.
>-// TODO(thakis): Remove this once this bug has been fixed in the NDK and
>-// that NDK has been rolled into chromium.
>-#if defined(ANGLE_PLATFORM_ANDROID) && __x86_64__
>-    *value = strtod(str.c_str(), nullptr);
>-    return errno != ERANGE;
>-#else
>-    std::istringstream stream(str);
>-    // Force "C" locale so that decimal character is always '.', and
>-    // not dependent on the current locale.
>-    stream.imbue(std::locale::classic());
>-
>-    stream >> (*value);
>-    return !stream.fail() && std::isfinite(*value);
>-#endif
>-}
>+}  // namespace pp
> 
>-}  // namespace pp.
>+}  // namespace angle
> 
> #endif  // COMPILER_PREPROCESSOR_NUMERICLEX_H_
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/ASTMetadataHLSL.cpp b/Source/ThirdParty/ANGLE/src/compiler/translator/ASTMetadataHLSL.cpp
>index b04fc28259f..e2d4df3d5a7 100644
>--- a/Source/ThirdParty/ANGLE/src/compiler/translator/ASTMetadataHLSL.cpp
>+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/ASTMetadataHLSL.cpp
>@@ -9,8 +9,8 @@
> #include "compiler/translator/ASTMetadataHLSL.h"
> 
> #include "compiler/translator/CallDAG.h"
>-#include "compiler/translator/IntermTraverse.h"
> #include "compiler/translator/SymbolTable.h"
>+#include "compiler/translator/tree_util/IntermTraverse.h"
> 
> namespace sh
> {
>@@ -35,15 +35,15 @@ class PullGradient : public TIntermTraverser
>         ASSERT(index < metadataList->size());
> 
>         // ESSL 100 builtin gradient functions
>-        mGradientBuiltinFunctions.insert("texture2D");
>-        mGradientBuiltinFunctions.insert("texture2DProj");
>-        mGradientBuiltinFunctions.insert("textureCube");
>+        mGradientBuiltinFunctions.insert(ImmutableString("texture2D"));
>+        mGradientBuiltinFunctions.insert(ImmutableString("texture2DProj"));
>+        mGradientBuiltinFunctions.insert(ImmutableString("textureCube"));
> 
>         // ESSL 300 builtin gradient functions
>-        mGradientBuiltinFunctions.insert("texture");
>-        mGradientBuiltinFunctions.insert("textureProj");
>-        mGradientBuiltinFunctions.insert("textureOffset");
>-        mGradientBuiltinFunctions.insert("textureProjOffset");
>+        mGradientBuiltinFunctions.insert(ImmutableString("texture"));
>+        mGradientBuiltinFunctions.insert(ImmutableString("textureProj"));
>+        mGradientBuiltinFunctions.insert(ImmutableString("textureOffset"));
>+        mGradientBuiltinFunctions.insert(ImmutableString("textureProjOffset"));
> 
>         // ESSL 310 doesn't add builtin gradient functions
>     }
>@@ -105,6 +105,7 @@ class PullGradient : public TIntermTraverser
>                 case EOpDFdy:
>                 case EOpFwidth:
>                     onGradient();
>+                    break;
>                 default:
>                     break;
>             }
>@@ -119,7 +120,7 @@ class PullGradient : public TIntermTraverser
>         {
>             if (node->getOp() == EOpCallFunctionInAST)
>             {
>-                size_t calleeIndex = mDag.findIndex(node->getFunctionSymbolInfo());
>+                size_t calleeIndex = mDag.findIndex(node->getFunction()->uniqueId());
>                 ASSERT(calleeIndex != CallDAG::InvalidIndex && calleeIndex < mIndex);
> 
>                 if ((*mMetadataList)[calleeIndex].mUsesGradient)
>@@ -129,7 +130,7 @@ class PullGradient : public TIntermTraverser
>             }
>             else if (node->getOp() == EOpCallBuiltInFunction)
>             {
>-                if (mGradientBuiltinFunctions.find(node->getFunctionSymbolInfo()->getName()) !=
>+                if (mGradientBuiltinFunctions.find(node->getFunction()->name()) !=
>                     mGradientBuiltinFunctions.end())
>                 {
>                     onGradient();
>@@ -151,7 +152,7 @@ class PullGradient : public TIntermTraverser
>     std::vector<TIntermNode *> mParents;
> 
>     // A list of builtin functions that use gradients
>-    std::set<TString> mGradientBuiltinFunctions;
>+    std::set<ImmutableString> mGradientBuiltinFunctions;
> };
> 
> // Traverses the AST of a function definition to compute the the discontinuous loops
>@@ -169,8 +170,7 @@ class PullComputeDiscontinuousAndGradientLoops : public TIntermTraverser
>           mMetadata(&(*metadataList)[index]),
>           mIndex(index),
>           mDag(dag)
>-    {
>-    }
>+    {}
> 
>     void traverse(TIntermFunctionDefinition *node)
>     {
>@@ -288,7 +288,7 @@ class PullComputeDiscontinuousAndGradientLoops : public TIntermTraverser
>     {
>         if (visit == PreVisit && node->getOp() == EOpCallFunctionInAST)
>         {
>-            size_t calleeIndex = mDag.findIndex(node->getFunctionSymbolInfo());
>+            size_t calleeIndex = mDag.findIndex(node->getFunction()->uniqueId());
>             ASSERT(calleeIndex != CallDAG::InvalidIndex && calleeIndex < mIndex);
> 
>             if ((*mMetadataList)[calleeIndex].mHasGradientLoopInCallGraph)
>@@ -335,8 +335,7 @@ class PushDiscontinuousLoops : public TIntermTraverser
>           mIndex(index),
>           mDag(dag),
>           mNestedDiscont(mMetadata->mCalledInDiscontinuousLoop ? 1 : 0)
>-    {
>-    }
>+    {}
> 
>     void traverse(TIntermFunctionDefinition *node)
>     {
>@@ -367,7 +366,7 @@ class PushDiscontinuousLoops : public TIntermTraverser
>             case EOpCallFunctionInAST:
>                 if (visit == PreVisit && mNestedDiscont > 0)
>                 {
>-                    size_t calleeIndex = mDag.findIndex(node->getFunctionSymbolInfo());
>+                    size_t calleeIndex = mDag.findIndex(node->getFunction()->uniqueId());
>                     ASSERT(calleeIndex != CallDAG::InvalidIndex && calleeIndex < mIndex);
> 
>                     (*mMetadataList)[calleeIndex].mCalledInDiscontinuousLoop = true;
>@@ -387,7 +386,7 @@ class PushDiscontinuousLoops : public TIntermTraverser
> 
>     int mNestedDiscont;
> };
>-}
>+}  // namespace
> 
> bool ASTMetadataHLSL::hasGradientInCallGraph(TIntermLoop *node)
> {
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/ASTMetadataHLSL.h b/Source/ThirdParty/ANGLE/src/compiler/translator/ASTMetadataHLSL.h
>index 550a522b864..da00faabeb0 100644
>--- a/Source/ThirdParty/ANGLE/src/compiler/translator/ASTMetadataHLSL.h
>+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/ASTMetadataHLSL.h
>@@ -27,8 +27,7 @@ struct ASTMetadataHLSL
>           mCalledInDiscontinuousLoop(false),
>           mHasGradientLoopInCallGraph(false),
>           mNeedsLod0(false)
>-    {
>-    }
>+    {}
> 
>     // Here "something uses a gradient" means here that it either contains a
>     // gradient operation, or a call to a function that uses a gradient.
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/AddAndTrueToLoopCondition.cpp b/Source/ThirdParty/ANGLE/src/compiler/translator/AddAndTrueToLoopCondition.cpp
>deleted file mode 100644
>index 6a051042330..00000000000
>--- a/Source/ThirdParty/ANGLE/src/compiler/translator/AddAndTrueToLoopCondition.cpp
>+++ /dev/null
>@@ -1,59 +0,0 @@
>-//
>-// Copyright (c) 2016 The ANGLE Project Authors. All rights reserved.
>-// Use of this source code is governed by a BSD-style license that can be
>-// found in the LICENSE file.
>-//
>-
>-#include "compiler/translator/AddAndTrueToLoopCondition.h"
>-
>-#include "compiler/translator/IntermTraverse.h"
>-
>-namespace sh
>-{
>-
>-namespace
>-{
>-
>-// An AST traverser that rewrites for and while loops by replacing "condition" with
>-// "condition && true" to work around condition bug on Intel Mac.
>-class AddAndTrueToLoopConditionTraverser : public TIntermTraverser
>-{
>-  public:
>-    AddAndTrueToLoopConditionTraverser() : TIntermTraverser(true, false, false) {}
>-
>-    bool visitLoop(Visit, TIntermLoop *loop) override
>-    {
>-        // do-while loop doesn't have this bug.
>-        if (loop->getType() != ELoopFor && loop->getType() != ELoopWhile)
>-        {
>-            return true;
>-        }
>-
>-        // For loop may not have a condition.
>-        if (loop->getCondition() == nullptr)
>-        {
>-            return true;
>-        }
>-
>-        // Constant true.
>-        TConstantUnion *trueConstant = new TConstantUnion();
>-        trueConstant->setBConst(true);
>-        TIntermTyped *trueValue = new TIntermConstantUnion(trueConstant, TType(EbtBool));
>-
>-        // CONDITION && true.
>-        TIntermBinary *andOp = new TIntermBinary(EOpLogicalAnd, loop->getCondition(), trueValue);
>-        loop->setCondition(andOp);
>-
>-        return true;
>-    }
>-};
>-
>-}  // anonymous namespace
>-
>-void AddAndTrueToLoopCondition(TIntermNode *root)
>-{
>-    AddAndTrueToLoopConditionTraverser traverser;
>-    root->traverse(&traverser);
>-}
>-
>-}  // namespace sh
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/AddAndTrueToLoopCondition.h b/Source/ThirdParty/ANGLE/src/compiler/translator/AddAndTrueToLoopCondition.h
>deleted file mode 100644
>index 34debe0ed97..00000000000
>--- a/Source/ThirdParty/ANGLE/src/compiler/translator/AddAndTrueToLoopCondition.h
>+++ /dev/null
>@@ -1,20 +0,0 @@
>-//
>-// Copyright (c) 2016 The ANGLE Project Authors. All rights reserved.
>-// Use of this source code is governed by a BSD-style license that can be
>-// found in the LICENSE file.
>-//
>-
>-// Rewrite condition in for and while loops to work around driver bug on Intel Mac.
>-
>-#ifndef COMPILER_TRANSLATOR_ADDANDTRUETOLOOPCONDITION_H_
>-#define COMPILER_TRANSLATOR_ADDANDTRUETOLOOPCONDITION_H_
>-
>-class TIntermNode;
>-namespace sh
>-{
>-
>-void AddAndTrueToLoopCondition(TIntermNode *root);
>-
>-}  // namespace sh
>-
>-#endif  // COMPILER_TRANSLATOR_ADDANDTRUETOLOOPCONDITION_H_
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/AddDefaultReturnStatements.cpp b/Source/ThirdParty/ANGLE/src/compiler/translator/AddDefaultReturnStatements.cpp
>deleted file mode 100644
>index 4dfe60c0bcb..00000000000
>--- a/Source/ThirdParty/ANGLE/src/compiler/translator/AddDefaultReturnStatements.cpp
>+++ /dev/null
>@@ -1,58 +0,0 @@
>-//
>-// Copyright (c) 2016 The ANGLE Project Authors. All rights reserved.
>-// Use of this source code is governed by a BSD-style license that can be
>-// found in the LICENSE file.
>-//
>-// AddDefaultReturnStatements.cpp: Add default return statements to functions that do not end in a
>-//                                 return.
>-//
>-
>-#include "compiler/translator/AddDefaultReturnStatements.h"
>-
>-#include "compiler/translator/IntermNode.h"
>-#include "compiler/translator/IntermNode_util.h"
>-#include "compiler/translator/util.h"
>-
>-namespace sh
>-{
>-
>-namespace
>-{
>-
>-bool NeedsReturnStatement(TIntermFunctionDefinition *node, TType *returnType)
>-{
>-    *returnType = node->getFunctionPrototype()->getType();
>-    if (returnType->getBasicType() == EbtVoid)
>-    {
>-        return false;
>-    }
>-
>-    TIntermBlock *bodyNode    = node->getBody();
>-    TIntermBranch *returnNode = bodyNode->getSequence()->back()->getAsBranchNode();
>-    if (returnNode != nullptr && returnNode->getFlowOp() == EOpReturn)
>-    {
>-        return false;
>-    }
>-
>-    return true;
>-}
>-
>-}  // anonymous namespace
>-
>-void AddDefaultReturnStatements(TIntermBlock *root)
>-{
>-    TType returnType;
>-    for (TIntermNode *node : *root->getSequence())
>-    {
>-        TIntermFunctionDefinition *definition = node->getAsFunctionDefinition();
>-        if (definition != nullptr && NeedsReturnStatement(definition, &returnType))
>-        {
>-            TIntermBranch *branch = new TIntermBranch(EOpReturn, CreateZeroNode(returnType));
>-
>-            TIntermBlock *bodyNode = definition->getBody();
>-            bodyNode->getSequence()->push_back(branch);
>-        }
>-    }
>-}
>-
>-}  // namespace sh
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/AddDefaultReturnStatements.h b/Source/ThirdParty/ANGLE/src/compiler/translator/AddDefaultReturnStatements.h
>deleted file mode 100644
>index 40a70ad8c2a..00000000000
>--- a/Source/ThirdParty/ANGLE/src/compiler/translator/AddDefaultReturnStatements.h
>+++ /dev/null
>@@ -1,22 +0,0 @@
>-//
>-// Copyright (c) 2016 The ANGLE Project Authors. All rights reserved.
>-// Use of this source code is governed by a BSD-style license that can be
>-// found in the LICENSE file.
>-//
>-// AddDefaultReturnStatements.h: Add default return statements to functions that do not end in a
>-//                               return.
>-//
>-
>-#ifndef COMPILER_TRANSLATOR_ADDDEFAULTRETURNSTATEMENTS_H_
>-#define COMPILER_TRANSLATOR_ADDDEFAULTRETURNSTATEMENTS_H_
>-
>-class TIntermBlock;
>-
>-namespace sh
>-{
>-
>-void AddDefaultReturnStatements(TIntermBlock *root);
>-
>-}  // namespace sh
>-
>-#endif  // COMPILER_TRANSLATOR_ADDDEFAULTRETURNSTATEMENTS_H_
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/ArrayReturnValueToOutParameter.cpp b/Source/ThirdParty/ANGLE/src/compiler/translator/ArrayReturnValueToOutParameter.cpp
>deleted file mode 100644
>index 17721fb0dc0..00000000000
>--- a/Source/ThirdParty/ANGLE/src/compiler/translator/ArrayReturnValueToOutParameter.cpp
>+++ /dev/null
>@@ -1,213 +0,0 @@
>-//
>-// Copyright (c) 2002-2015 The ANGLE Project Authors. All rights reserved.
>-// Use of this source code is governed by a BSD-style license that can be
>-// found in the LICENSE file.
>-//
>-// The ArrayReturnValueToOutParameter function changes return values of an array type to out
>-// parameters in function definitions, prototypes, and call sites.
>-
>-#include "compiler/translator/ArrayReturnValueToOutParameter.h"
>-
>-#include <map>
>-
>-#include "compiler/translator/IntermTraverse.h"
>-#include "compiler/translator/SymbolTable.h"
>-
>-namespace sh
>-{
>-
>-namespace
>-{
>-
>-void CopyAggregateChildren(TIntermAggregateBase *from, TIntermAggregateBase *to)
>-{
>-    const TIntermSequence *fromSequence = from->getSequence();
>-    for (size_t ii = 0; ii < fromSequence->size(); ++ii)
>-    {
>-        to->getSequence()->push_back(fromSequence->at(ii));
>-    }
>-}
>-
>-TIntermSymbol *CreateReturnValueSymbol(const TSymbolUniqueId &id, const TType &type)
>-{
>-    TIntermSymbol *node = new TIntermSymbol(id, "angle_return", type);
>-    node->setInternal(true);
>-    node->getTypePointer()->setQualifier(EvqOut);
>-    return node;
>-}
>-
>-TIntermAggregate *CreateReplacementCall(TIntermAggregate *originalCall,
>-                                        TIntermTyped *returnValueTarget)
>-{
>-    TIntermSequence *replacementArguments = new TIntermSequence();
>-    TIntermSequence *originalArguments    = originalCall->getSequence();
>-    for (auto &arg : *originalArguments)
>-    {
>-        replacementArguments->push_back(arg);
>-    }
>-    replacementArguments->push_back(returnValueTarget);
>-    TIntermAggregate *replacementCall = TIntermAggregate::CreateFunctionCall(
>-        TType(EbtVoid), originalCall->getFunctionSymbolInfo()->getId(),
>-        originalCall->getFunctionSymbolInfo()->getNameObj(), replacementArguments);
>-    replacementCall->setLine(originalCall->getLine());
>-    return replacementCall;
>-}
>-
>-class ArrayReturnValueToOutParameterTraverser : private TIntermTraverser
>-{
>-  public:
>-    static void apply(TIntermNode *root, TSymbolTable *symbolTable);
>-
>-  private:
>-    ArrayReturnValueToOutParameterTraverser(TSymbolTable *symbolTable);
>-
>-    bool visitFunctionPrototype(Visit visit, TIntermFunctionPrototype *node) override;
>-    bool visitFunctionDefinition(Visit visit, TIntermFunctionDefinition *node) override;
>-    bool visitAggregate(Visit visit, TIntermAggregate *node) override;
>-    bool visitBranch(Visit visit, TIntermBranch *node) override;
>-    bool visitBinary(Visit visit, TIntermBinary *node) override;
>-
>-    // Set when traversal is inside a function with array return value.
>-    TIntermFunctionDefinition *mFunctionWithArrayReturnValue;
>-
>-    // Map from function symbol ids to array return value ids.
>-    std::map<int, TSymbolUniqueId *> mReturnValueIds;
>-};
>-
>-void ArrayReturnValueToOutParameterTraverser::apply(TIntermNode *root, TSymbolTable *symbolTable)
>-{
>-    ArrayReturnValueToOutParameterTraverser arrayReturnValueToOutParam(symbolTable);
>-    root->traverse(&arrayReturnValueToOutParam);
>-    arrayReturnValueToOutParam.updateTree();
>-}
>-
>-ArrayReturnValueToOutParameterTraverser::ArrayReturnValueToOutParameterTraverser(
>-    TSymbolTable *symbolTable)
>-    : TIntermTraverser(true, false, true, symbolTable), mFunctionWithArrayReturnValue(nullptr)
>-{
>-}
>-
>-bool ArrayReturnValueToOutParameterTraverser::visitFunctionDefinition(
>-    Visit visit,
>-    TIntermFunctionDefinition *node)
>-{
>-    if (node->getFunctionPrototype()->isArray() && visit == PreVisit)
>-    {
>-        // Replacing the function header is done on visitFunctionPrototype().
>-        mFunctionWithArrayReturnValue = node;
>-    }
>-    if (visit == PostVisit)
>-    {
>-        mFunctionWithArrayReturnValue = nullptr;
>-    }
>-    return true;
>-}
>-
>-bool ArrayReturnValueToOutParameterTraverser::visitFunctionPrototype(Visit visit,
>-                                                                     TIntermFunctionPrototype *node)
>-{
>-    if (visit == PreVisit && node->isArray())
>-    {
>-        // Replace the whole prototype node with another node that has the out parameter
>-        // added. Also set the function to return void.
>-        TIntermFunctionPrototype *replacement =
>-            new TIntermFunctionPrototype(TType(EbtVoid), node->getFunctionSymbolInfo()->getId());
>-        CopyAggregateChildren(node, replacement);
>-        const TSymbolUniqueId &functionId = node->getFunctionSymbolInfo()->getId();
>-        if (mReturnValueIds.find(functionId.get()) == mReturnValueIds.end())
>-        {
>-            mReturnValueIds[functionId.get()] = new TSymbolUniqueId(mSymbolTable);
>-        }
>-        replacement->getSequence()->push_back(
>-            CreateReturnValueSymbol(*mReturnValueIds[functionId.get()], node->getType()));
>-        *replacement->getFunctionSymbolInfo() = *node->getFunctionSymbolInfo();
>-        replacement->setLine(node->getLine());
>-
>-        queueReplacement(replacement, OriginalNode::IS_DROPPED);
>-    }
>-    return false;
>-}
>-
>-bool ArrayReturnValueToOutParameterTraverser::visitAggregate(Visit visit, TIntermAggregate *node)
>-{
>-    ASSERT(!node->isArray() || node->getOp() != EOpCallInternalRawFunction);
>-    if (visit == PreVisit && node->isArray() && node->getOp() == EOpCallFunctionInAST)
>-    {
>-        // Handle call sites where the returned array is not assigned.
>-        // Examples where f() is a function returning an array:
>-        // 1. f();
>-        // 2. another_array == f();
>-        // 3. another_function(f());
>-        // 4. return f();
>-        // Cases 2 to 4 are already converted to simpler cases by
>-        // SeparateExpressionsReturningArrays, so we only need to worry about the case where a
>-        // function call returning an array forms an expression by itself.
>-        TIntermBlock *parentBlock = getParentNode()->getAsBlock();
>-        if (parentBlock)
>-        {
>-            nextTemporaryId();
>-            TIntermSequence replacements;
>-            replacements.push_back(createTempDeclaration(node->getType()));
>-            TIntermSymbol *returnSymbol = createTempSymbol(node->getType());
>-            replacements.push_back(CreateReplacementCall(node, returnSymbol));
>-            mMultiReplacements.push_back(
>-                NodeReplaceWithMultipleEntry(parentBlock, node, replacements));
>-        }
>-        return false;
>-    }
>-    return true;
>-}
>-
>-bool ArrayReturnValueToOutParameterTraverser::visitBranch(Visit visit, TIntermBranch *node)
>-{
>-    if (mFunctionWithArrayReturnValue && node->getFlowOp() == EOpReturn)
>-    {
>-        // Instead of returning a value, assign to the out parameter and then return.
>-        TIntermSequence replacements;
>-
>-        TIntermTyped *expression = node->getExpression();
>-        ASSERT(expression != nullptr);
>-        const TSymbolUniqueId &functionId =
>-            mFunctionWithArrayReturnValue->getFunctionSymbolInfo()->getId();
>-        ASSERT(mReturnValueIds.find(functionId.get()) != mReturnValueIds.end());
>-        const TSymbolUniqueId &returnValueId = *mReturnValueIds[functionId.get()];
>-        TIntermSymbol *returnValueSymbol =
>-            CreateReturnValueSymbol(returnValueId, expression->getType());
>-        TIntermBinary *replacementAssignment =
>-            new TIntermBinary(EOpAssign, returnValueSymbol, expression);
>-        replacementAssignment->setLine(expression->getLine());
>-        replacements.push_back(replacementAssignment);
>-
>-        TIntermBranch *replacementBranch = new TIntermBranch(EOpReturn, nullptr);
>-        replacementBranch->setLine(node->getLine());
>-        replacements.push_back(replacementBranch);
>-
>-        mMultiReplacements.push_back(
>-            NodeReplaceWithMultipleEntry(getParentNode()->getAsBlock(), node, replacements));
>-    }
>-    return false;
>-}
>-
>-bool ArrayReturnValueToOutParameterTraverser::visitBinary(Visit visit, TIntermBinary *node)
>-{
>-    if (node->getOp() == EOpAssign && node->getLeft()->isArray())
>-    {
>-        TIntermAggregate *rightAgg = node->getRight()->getAsAggregate();
>-        ASSERT(rightAgg == nullptr || rightAgg->getOp() != EOpCallInternalRawFunction);
>-        if (rightAgg != nullptr && rightAgg->getOp() == EOpCallFunctionInAST)
>-        {
>-            TIntermAggregate *replacementCall = CreateReplacementCall(rightAgg, node->getLeft());
>-            queueReplacement(replacementCall, OriginalNode::IS_DROPPED);
>-        }
>-    }
>-    return false;
>-}
>-
>-}  // namespace
>-
>-void ArrayReturnValueToOutParameter(TIntermNode *root, TSymbolTable *symbolTable)
>-{
>-    ArrayReturnValueToOutParameterTraverser::apply(root, symbolTable);
>-}
>-
>-}  // namespace sh
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/ArrayReturnValueToOutParameter.h b/Source/ThirdParty/ANGLE/src/compiler/translator/ArrayReturnValueToOutParameter.h
>deleted file mode 100644
>index 469c7a3b149..00000000000
>--- a/Source/ThirdParty/ANGLE/src/compiler/translator/ArrayReturnValueToOutParameter.h
>+++ /dev/null
>@@ -1,22 +0,0 @@
>-//
>-// Copyright (c) 2002-2015 The ANGLE Project Authors. All rights reserved.
>-// Use of this source code is governed by a BSD-style license that can be
>-// found in the LICENSE file.
>-//
>-// The ArrayReturnValueToOutParameter function changes return values of an array type to out
>-// parameters in function definitions, prototypes and call sites.
>-
>-#ifndef COMPILER_TRANSLATOR_ARRAYRETURNVALUETOOUTPARAMETER_H_
>-#define COMPILER_TRANSLATOR_ARRAYRETURNVALUETOOUTPARAMETER_H_
>-
>-namespace sh
>-{
>-
>-class TIntermNode;
>-class TSymbolTable;
>-
>-void ArrayReturnValueToOutParameter(TIntermNode *root, TSymbolTable *symbolTable);
>-
>-}  // namespace sh
>-
>-#endif  // COMPILER_TRANSLATOR_ARRAYRETURNVALUETOOUTPARAMETER_H_
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/AtomicCounterFunctionHLSL.cpp b/Source/ThirdParty/ANGLE/src/compiler/translator/AtomicCounterFunctionHLSL.cpp
>new file mode 100644
>index 00000000000..52b8b878c36
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/AtomicCounterFunctionHLSL.cpp
>@@ -0,0 +1,112 @@
>+//
>+// Copyright (c) 2018 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// AtomicCounterFunctionHLSL: Class for writing implementation of atomic counter functions into HLSL
>+// output.
>+//
>+
>+#include "compiler/translator/AtomicCounterFunctionHLSL.h"
>+
>+#include "compiler/translator/Common.h"
>+#include "compiler/translator/ImmutableStringBuilder.h"
>+#include "compiler/translator/InfoSink.h"
>+#include "compiler/translator/IntermNode.h"
>+
>+namespace sh
>+{
>+
>+namespace
>+{
>+constexpr ImmutableString kAtomicCounter("atomicCounter");
>+constexpr ImmutableString kAtomicCounterIncrement("atomicCounterIncrement");
>+constexpr ImmutableString kAtomicCounterDecrement("atomicCounterDecrement");
>+constexpr ImmutableString kAtomicCounterBaseName("_acbase_");
>+}  // namespace
>+
>+AtomicCounterFunctionHLSL::AtomicCounterFunctionHLSL(bool forceResolution)
>+    : mForceResolution(forceResolution)
>+{}
>+
>+ImmutableString AtomicCounterFunctionHLSL::useAtomicCounterFunction(const ImmutableString &name)
>+{
>+    // The largest string that will be create created is "_acbase_increment" or "_acbase_decrement"
>+    ImmutableStringBuilder hlslFunctionNameSB(kAtomicCounterBaseName.length() +
>+                                              strlen("increment"));
>+    hlslFunctionNameSB << kAtomicCounterBaseName;
>+
>+    AtomicCounterFunction atomicMethod;
>+    if (kAtomicCounter == name)
>+    {
>+        atomicMethod = AtomicCounterFunction::LOAD;
>+        hlslFunctionNameSB << "load";
>+    }
>+    else if (kAtomicCounterIncrement == name)
>+    {
>+        atomicMethod = AtomicCounterFunction::INCREMENT;
>+        hlslFunctionNameSB << "increment";
>+    }
>+    else if (kAtomicCounterDecrement == name)
>+    {
>+        atomicMethod = AtomicCounterFunction::DECREMENT;
>+        hlslFunctionNameSB << "decrement";
>+    }
>+    else
>+    {
>+        atomicMethod = AtomicCounterFunction::INVALID;
>+        UNREACHABLE();
>+    }
>+
>+    ImmutableString hlslFunctionName(hlslFunctionNameSB);
>+    mAtomicCounterFunctions[hlslFunctionName] = atomicMethod;
>+
>+    return hlslFunctionName;
>+}
>+
>+void AtomicCounterFunctionHLSL::atomicCounterFunctionHeader(TInfoSinkBase &out)
>+{
>+    for (auto &atomicFunction : mAtomicCounterFunctions)
>+    {
>+        out << "uint " << atomicFunction.first
>+            << "(in RWByteAddressBuffer counter, int address)\n"
>+               "{\n"
>+               "    uint ret;\n";
>+
>+        switch (atomicFunction.second)
>+        {
>+            case AtomicCounterFunction::INCREMENT:
>+                out << "    counter.InterlockedAdd(address, 1u, ret);\n";
>+                break;
>+            case AtomicCounterFunction::DECREMENT:
>+                out << "    counter.InterlockedAdd(address, 0u - 1u, ret);\n"
>+                       "    ret -= 1u;\n";  // atomicCounterDecrement is a post-decrement op
>+                break;
>+            case AtomicCounterFunction::LOAD:
>+                out << "    ret = counter.Load(address);\n";
>+                break;
>+            default:
>+                UNREACHABLE();
>+                break;
>+        }
>+
>+        if (mForceResolution && atomicFunction.second != AtomicCounterFunction::LOAD)
>+        {
>+            out << "    if (ret == 0) {\n"
>+                   "        ret = 0 - ret;\n"
>+                   "    }\n";
>+        }
>+
>+        out << "    return ret;\n"
>+               "}\n\n";
>+    }
>+}
>+
>+ImmutableString getAtomicCounterNameForBinding(int binding)
>+{
>+    std::stringstream counterName = sh::InitializeStream<std::stringstream>();
>+    counterName << kAtomicCounterBaseName << binding;
>+    return ImmutableString(counterName.str());
>+}
>+
>+}  // namespace sh
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/AtomicCounterFunctionHLSL.h b/Source/ThirdParty/ANGLE/src/compiler/translator/AtomicCounterFunctionHLSL.h
>new file mode 100644
>index 00000000000..e658df3c203
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/AtomicCounterFunctionHLSL.h
>@@ -0,0 +1,50 @@
>+//
>+// Copyright (c) 2018 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// AtomicCounterFunctionHLSL: Class for writing implementation of atomic counter functions into HLSL
>+// output.
>+//
>+
>+#ifndef COMPILER_TRANSLATOR_ATOMICCOUNTERFUNCTIONHLSL_H_
>+#define COMPILER_TRANSLATOR_ATOMICCOUNTERFUNCTIONHLSL_H_
>+
>+#include <map>
>+
>+#include "compiler/translator/Common.h"
>+#include "compiler/translator/ImmutableString.h"
>+
>+namespace sh
>+{
>+
>+class TInfoSinkBase;
>+struct TLayoutQualifier;
>+
>+class AtomicCounterFunctionHLSL final : angle::NonCopyable
>+{
>+  public:
>+    AtomicCounterFunctionHLSL(bool forceResolution);
>+
>+    ImmutableString useAtomicCounterFunction(const ImmutableString &name);
>+
>+    void atomicCounterFunctionHeader(TInfoSinkBase &out);
>+
>+  private:
>+    enum class AtomicCounterFunction
>+    {
>+        LOAD,
>+        INCREMENT,
>+        DECREMENT,
>+        INVALID
>+    };
>+
>+    std::map<ImmutableString, AtomicCounterFunction> mAtomicCounterFunctions;
>+    bool mForceResolution;
>+};
>+
>+ImmutableString getAtomicCounterNameForBinding(int binding);
>+
>+}  // namespace sh
>+
>+#endif  // COMPILER_TRANSLATOR_ATOMICCOUNTERFUNCTIONHLSL_H_
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/BaseTypes.h b/Source/ThirdParty/ANGLE/src/compiler/translator/BaseTypes.h
>index b2070f3bafb..62a0e947a23 100644
>--- a/Source/ThirdParty/ANGLE/src/compiler/translator/BaseTypes.h
>+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/BaseTypes.h
>@@ -10,8 +10,9 @@
> #include <algorithm>
> #include <array>
> 
>-#include "common/debug.h"
> #include "GLSLANG/ShaderLang.h"
>+#include "common/debug.h"
>+#include "compiler/translator/ImmutableString.h"
> 
> namespace sh
> {
>@@ -56,18 +57,12 @@ enum TBasicType
>     EbtInt,
>     EbtUInt,
>     EbtBool,
>-    EbtGVec4,              // non type: represents vec4, ivec4, and uvec4
>-    EbtGenType,            // non type: represents float, vec2, vec3, and vec4
>-    EbtGenIType,           // non type: represents int, ivec2, ivec3, and ivec4
>-    EbtGenUType,           // non type: represents uint, uvec2, uvec3, and uvec4
>-    EbtGenBType,           // non type: represents bool, bvec2, bvec3, and bvec4
>-    EbtVec,                // non type: represents vec2, vec3, and vec4
>-    EbtIVec,               // non type: represents ivec2, ivec3, and ivec4
>-    EbtUVec,               // non type: represents uvec2, uvec3, and uvec4
>-    EbtBVec,               // non type: represents bvec2, bvec3, and bvec4
>+
>+    EbtAtomicCounter,
>     EbtYuvCscStandardEXT,  // Only valid if EXT_YUV_target exists.
>+
>     EbtGuardSamplerBegin,  // non type: see implementation of IsSampler()
>-    EbtSampler2D,
>+    EbtSampler2D = EbtGuardSamplerBegin,
>     EbtSampler3D,
>     EbtSamplerCube,
>     EbtSampler2DArray,
>@@ -75,30 +70,27 @@ enum TBasicType
>     EbtSamplerExternal2DY2YEXT,  // Only valid if GL_EXT_YUV_target exists.
>     EbtSampler2DRect,            // Only valid if GL_ARB_texture_rectangle exists.
>     EbtSampler2DMS,
>+    EbtSampler2DMSArray,
>     EbtISampler2D,
>     EbtISampler3D,
>     EbtISamplerCube,
>     EbtISampler2DArray,
>     EbtISampler2DMS,
>+    EbtISampler2DMSArray,
>     EbtUSampler2D,
>     EbtUSampler3D,
>     EbtUSamplerCube,
>     EbtUSampler2DArray,
>     EbtUSampler2DMS,
>+    EbtUSampler2DMSArray,
>     EbtSampler2DShadow,
>     EbtSamplerCubeShadow,
>     EbtSampler2DArrayShadow,
>-    EbtGuardSamplerEnd,  // non type: see implementation of IsSampler()
>-    EbtGSampler2D,       // non type: represents sampler2D, isampler2D, and usampler2D
>-    EbtGSampler3D,       // non type: represents sampler3D, isampler3D, and usampler3D
>-    EbtGSamplerCube,     // non type: represents samplerCube, isamplerCube, and usamplerCube
>-    EbtGSampler2DArray,  // non type: represents sampler2DArray, isampler2DArray, and
>-                         // usampler2DArray
>-    EbtGSampler2DMS,     // non type: represents sampler2DMS, isampler2DMS, and usampler2DMS
>+    EbtGuardSamplerEnd = EbtSampler2DArrayShadow,  // non type: see implementation of IsSampler()
> 
>     // images
>     EbtGuardImageBegin,
>-    EbtImage2D,
>+    EbtImage2D = EbtGuardImageBegin,
>     EbtIImage2D,
>     EbtUImage2D,
>     EbtImage3D,
>@@ -110,94 +102,41 @@ enum TBasicType
>     EbtImageCube,
>     EbtIImageCube,
>     EbtUImageCube,
>-    EbtGuardImageEnd,
>+    EbtGuardImageEnd = EbtUImageCube,
> 
>-    EbtGuardGImageBegin,
>-    EbtGImage2D,       // non type: represents image2D, uimage2D, iimage2D
>-    EbtGImage3D,       // non type: represents image3D, uimage3D, iimage3D
>-    EbtGImage2DArray,  // non type: represents image2DArray, uimage2DArray, iimage2DArray
>-    EbtGImageCube,     // non type: represents imageCube, uimageCube, iimageCube
>-    EbtGuardGImageEnd,
>+    EbtLastSimpleType = EbtGuardImageEnd,
> 
>     EbtStruct,
>     EbtInterfaceBlock,
>-    EbtAddress,  // should be deprecated??
>-
>-    EbtAtomicCounter,
> 
>     // end of list
>-    EbtLast
>+    EbtLast = EbtInterfaceBlock
> };
> 
>-inline TBasicType convertGImageToFloatImage(TBasicType type)
>-{
>-    switch (type)
>-    {
>-        case EbtGImage2D:
>-            return EbtImage2D;
>-        case EbtGImage3D:
>-            return EbtImage3D;
>-        case EbtGImage2DArray:
>-            return EbtImage2DArray;
>-        case EbtGImageCube:
>-            return EbtImageCube;
>-        default:
>-            UNREACHABLE();
>-    }
>-    return EbtLast;
>-}
>-
>-inline TBasicType convertGImageToIntImage(TBasicType type)
>+constexpr char GetBasicMangledName(TBasicType t)
> {
>-    switch (type)
>+    if (t > EbtLastSimpleType)
>     {
>-        case EbtGImage2D:
>-            return EbtIImage2D;
>-        case EbtGImage3D:
>-            return EbtIImage3D;
>-        case EbtGImage2DArray:
>-            return EbtIImage2DArray;
>-        case EbtGImageCube:
>-            return EbtIImageCube;
>-        default:
>-            UNREACHABLE();
>+        return '{';
>     }
>-    return EbtLast;
>-}
>-
>-inline TBasicType convertGImageToUnsignedImage(TBasicType type)
>-{
>-    switch (type)
>+    static_assert(EbtLastSimpleType < 52, "We only use alphabetic characters for mangled names");
>+    if (t < 26)
>     {
>-        case EbtGImage2D:
>-            return EbtUImage2D;
>-        case EbtGImage3D:
>-            return EbtUImage3D;
>-        case EbtGImage2DArray:
>-            return EbtUImage2DArray;
>-        case EbtGImageCube:
>-            return EbtUImageCube;
>-        default:
>-            UNREACHABLE();
>+        return static_cast<char>('A' + t);
>     }
>-    return EbtLast;
>+    return static_cast<char>('a' - 26 + t);
> }
> 
> const char *getBasicString(TBasicType t);
> 
> inline bool IsSampler(TBasicType type)
> {
>-    return type > EbtGuardSamplerBegin && type < EbtGuardSamplerEnd;
>+    return type >= EbtGuardSamplerBegin && type <= EbtGuardSamplerEnd;
> }
> 
> inline bool IsImage(TBasicType type)
> {
>-    return type > EbtGuardImageBegin && type < EbtGuardImageEnd;
>-}
>-
>-inline bool IsGImage(TBasicType type)
>-{
>-    return type > EbtGuardGImageBegin && type < EbtGuardGImageEnd;
>+    return type >= EbtGuardImageBegin && type <= EbtGuardImageEnd;
> }
> 
> inline bool IsAtomicCounter(TBasicType type)
>@@ -219,11 +158,13 @@ inline bool IsIntegerSampler(TBasicType type)
>         case EbtISamplerCube:
>         case EbtISampler2DArray:
>         case EbtISampler2DMS:
>+        case EbtISampler2DMSArray:
>         case EbtUSampler2D:
>         case EbtUSampler3D:
>         case EbtUSamplerCube:
>         case EbtUSampler2DArray:
>         case EbtUSampler2DMS:
>+        case EbtUSampler2DMSArray:
>             return true;
>         case EbtSampler2D:
>         case EbtSampler3D:
>@@ -236,6 +177,7 @@ inline bool IsIntegerSampler(TBasicType type)
>         case EbtSamplerCubeShadow:
>         case EbtSampler2DArrayShadow:
>         case EbtSampler2DMS:
>+        case EbtSampler2DMSArray:
>             return false;
>         default:
>             assert(!IsSampler(type));
>@@ -244,6 +186,31 @@ inline bool IsIntegerSampler(TBasicType type)
>     return false;
> }
> 
>+inline bool IsIntegerSamplerUnsigned(TBasicType type)
>+{
>+    switch (type)
>+    {
>+        case EbtISampler2D:
>+        case EbtISampler3D:
>+        case EbtISamplerCube:
>+        case EbtISampler2DArray:
>+        case EbtISampler2DMS:
>+        case EbtISampler2DMSArray:
>+            return false;
>+        case EbtUSampler2D:
>+        case EbtUSampler3D:
>+        case EbtUSamplerCube:
>+        case EbtUSampler2DArray:
>+        case EbtUSampler2DMS:
>+        case EbtUSampler2DMSArray:
>+            return true;
>+        default:
>+            assert(!IsIntegerSampler(type));
>+    }
>+
>+    return false;
>+}
>+
> inline bool IsSampler2DMS(TBasicType type)
> {
>     switch (type)
>@@ -257,6 +224,19 @@ inline bool IsSampler2DMS(TBasicType type)
>     }
> }
> 
>+inline bool IsSampler2DMSArray(TBasicType type)
>+{
>+    switch (type)
>+    {
>+        case EbtSampler2DMSArray:
>+        case EbtISampler2DMSArray:
>+        case EbtUSampler2DMSArray:
>+            return true;
>+        default:
>+            return false;
>+    }
>+}
>+
> inline bool IsFloatImage(TBasicType type)
> {
>     switch (type)
>@@ -307,6 +287,8 @@ inline bool IsUnsignedImage(TBasicType type)
>     return false;
> }
> 
>+// Samplers are divided into 4 disjoint categories: 2D, cube, 3D, and array.
>+// Array samplers are not 2D samplers.
> inline bool IsSampler2D(TBasicType type)
> {
>     switch (type)
>@@ -314,18 +296,21 @@ inline bool IsSampler2D(TBasicType type)
>         case EbtSampler2D:
>         case EbtISampler2D:
>         case EbtUSampler2D:
>-        case EbtSampler2DArray:
>-        case EbtISampler2DArray:
>-        case EbtUSampler2DArray:
>         case EbtSampler2DRect:
>         case EbtSamplerExternalOES:
>         case EbtSamplerExternal2DY2YEXT:
>         case EbtSampler2DShadow:
>-        case EbtSampler2DArrayShadow:
>         case EbtSampler2DMS:
>         case EbtISampler2DMS:
>         case EbtUSampler2DMS:
>             return true;
>+        case EbtSampler2DArray:
>+        case EbtISampler2DArray:
>+        case EbtUSampler2DArray:
>+        case EbtSampler2DMSArray:
>+        case EbtISampler2DMSArray:
>+        case EbtUSampler2DMSArray:
>+        case EbtSampler2DArrayShadow:
>         case EbtSampler3D:
>         case EbtISampler3D:
>         case EbtUSampler3D:
>@@ -357,14 +342,17 @@ inline bool IsSamplerCube(TBasicType type)
>         case EbtSampler2DRect:
>         case EbtSampler2DArray:
>         case EbtSampler2DMS:
>+        case EbtSampler2DMSArray:
>         case EbtISampler2D:
>         case EbtISampler3D:
>         case EbtISampler2DArray:
>         case EbtISampler2DMS:
>+        case EbtISampler2DMSArray:
>         case EbtUSampler2D:
>         case EbtUSampler3D:
>         case EbtUSampler2DArray:
>         case EbtUSampler2DMS:
>+        case EbtUSampler2DMSArray:
>         case EbtSampler2DShadow:
>         case EbtSampler2DArrayShadow:
>             return false;
>@@ -390,14 +378,17 @@ inline bool IsSampler3D(TBasicType type)
>         case EbtSampler2DRect:
>         case EbtSampler2DArray:
>         case EbtSampler2DMS:
>+        case EbtSampler2DMSArray:
>         case EbtISampler2D:
>         case EbtISamplerCube:
>         case EbtISampler2DArray:
>         case EbtISampler2DMS:
>+        case EbtISampler2DMSArray:
>         case EbtUSampler2D:
>         case EbtUSamplerCube:
>         case EbtUSampler2DArray:
>         case EbtUSampler2DMS:
>+        case EbtUSampler2DMSArray:
>         case EbtSampler2DShadow:
>         case EbtSamplerCubeShadow:
>         case EbtSampler2DArrayShadow:
>@@ -416,6 +407,9 @@ inline bool IsSamplerArray(TBasicType type)
>         case EbtSampler2DArray:
>         case EbtISampler2DArray:
>         case EbtUSampler2DArray:
>+        case EbtSampler2DMSArray:
>+        case EbtISampler2DMSArray:
>+        case EbtUSampler2DMSArray:
>         case EbtSampler2DArrayShadow:
>             return true;
>         case EbtSampler2D:
>@@ -456,11 +450,13 @@ inline bool IsShadowSampler(TBasicType type)
>         case EbtISamplerCube:
>         case EbtISampler2DArray:
>         case EbtISampler2DMS:
>+        case EbtISampler2DMSArray:
>         case EbtUSampler2D:
>         case EbtUSampler3D:
>         case EbtUSamplerCube:
>         case EbtUSampler2DArray:
>         case EbtUSampler2DMS:
>+        case EbtUSampler2DMSArray:
>         case EbtSampler2D:
>         case EbtSampler3D:
>         case EbtSamplerCube:
>@@ -469,6 +465,7 @@ inline bool IsShadowSampler(TBasicType type)
>         case EbtSampler2DRect:
>         case EbtSampler2DArray:
>         case EbtSampler2DMS:
>+        case EbtSampler2DMSArray:
>             return false;
>         default:
>             assert(!IsSampler(type));
>@@ -623,6 +620,8 @@ enum TQualifier
>     EvqPosition,
>     EvqPointSize,
> 
>+    EvqDrawID,  // ANGLE_multi_draw
>+
>     // built-ins read by fragment shader
>     EvqFragCoord,
>     EvqFrontFacing,
>@@ -673,7 +672,7 @@ enum TQualifier
>     EvqRestrict,
>     EvqVolatile,
> 
>-    // GLSL ES 3.1 extension OES_geometry_shader qualifiers
>+    // GLSL ES 3.1 extension EXT_geometry_shader qualifiers
>     EvqGeometryIn,
>     EvqGeometryOut,
>     EvqPerVertexIn,    // gl_in
>@@ -757,7 +756,8 @@ struct TLayoutQualifier
>         return location == -1 && binding == -1 && offset == -1 && numViews == -1 && yuv == false &&
>                matrixPacking == EmpUnspecified && blockStorage == EbsUnspecified &&
>                !localSize.isAnyValueSet() && imageInternalFormat == EiifUnspecified &&
>-               primitiveType == EptUndefined && invocations == 0 && maxVertices == -1;
>+               primitiveType == EptUndefined && invocations == 0 && maxVertices == -1 &&
>+               index == -1;
>     }
> 
>     bool isCombinationValid() const
>@@ -767,7 +767,7 @@ struct TLayoutQualifier
>         bool geometryShaderSpecified =
>             (primitiveType != EptUndefined) || (invocations != 0) || (maxVertices != -1);
>         bool otherLayoutQualifiersSpecified =
>-            (location != -1 || binding != -1 || matrixPacking != EmpUnspecified ||
>+            (location != -1 || binding != -1 || index != -1 || matrixPacking != EmpUnspecified ||
>              blockStorage != EbsUnspecified || imageInternalFormat != EiifUnspecified);
> 
>         // we can have either the work group size specified, or number of views,
>@@ -777,7 +777,7 @@ struct TLayoutQualifier
>                1;
>     }
> 
>-    bool isLocalSizeEqual(const sh::WorkGroupSize &localSizeIn) const
>+    bool isLocalSizeEqual(const WorkGroupSize &localSizeIn) const
>     {
>         return localSize.isWorkGroupSizeMatching(localSizeIn);
>     }
>@@ -788,7 +788,7 @@ struct TLayoutQualifier
>     TLayoutBlockStorage blockStorage;
> 
>     // Compute shader layout qualifiers.
>-    sh::WorkGroupSize localSize;
>+    WorkGroupSize localSize;
> 
>     int binding;
>     int offset;
>@@ -807,6 +807,9 @@ struct TLayoutQualifier
>     int invocations;
>     int maxVertices;
> 
>+    // EXT_blend_func_extended fragment output layout qualifier
>+    int index;
>+
>   private:
>     explicit constexpr TLayoutQualifier(int /*placeholder*/)
>         : location(-1),
>@@ -821,9 +824,9 @@ struct TLayoutQualifier
>           yuv(false),
>           primitiveType(EptUndefined),
>           invocations(0),
>-          maxVertices(-1)
>-    {
>-    }
>+          maxVertices(-1),
>+          index(-1)
>+    {}
> };
> 
> struct TMemoryQualifier
>@@ -856,8 +859,7 @@ struct TMemoryQualifier
>           coherent(false),
>           restrictQualifier(false),
>           volatileQualifier(false)
>-    {
>-    }
>+    {}
> };
> 
> inline const char *getWorkGroupSizeString(size_t dimension)
>@@ -904,6 +906,7 @@ inline const char *getQualifierString(TQualifier q)
>     case EvqVertexID:               return "VertexID";
>     case EvqPosition:               return "Position";
>     case EvqPointSize:              return "PointSize";
>+    case EvqDrawID:                 return "DrawID";
>     case EvqFragCoord:              return "FragCoord";
>     case EvqFrontFacing:            return "FrontFacing";
>     case EvqPointCoord:             return "PointCoord";
>@@ -1017,7 +1020,7 @@ inline const char *getImageInternalFormatString(TLayoutImageInternalFormat iifq)
>     }
> }
> 
>-inline TYuvCscStandardEXT getYuvCscStandardEXT(const std::string &str)
>+inline TYuvCscStandardEXT getYuvCscStandardEXT(const ImmutableString &str)
> {
>     if (str == "itu_601")
>         return EycsItu601;
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/BreakVariableAliasingInInnerLoops.cpp b/Source/ThirdParty/ANGLE/src/compiler/translator/BreakVariableAliasingInInnerLoops.cpp
>deleted file mode 100644
>index d6a1e025def..00000000000
>--- a/Source/ThirdParty/ANGLE/src/compiler/translator/BreakVariableAliasingInInnerLoops.cpp
>+++ /dev/null
>@@ -1,107 +0,0 @@
>-//
>-// Copyright (c) 2016 The ANGLE Project Authors. All rights reserved.
>-// Use of this source code is governed by a BSD-style license that can be
>-// found in the LICENSE file.
>-//
>-
>-// BreakVariableAliasingInInnerLoops.h: To optimize simple assignments, the HLSL compiler frontend
>-//      may record a variable as aliasing another. Sometimes the alias information gets garbled
>-//      so we work around this issue by breaking the aliasing chain in inner loops.
>-
>-#include "BreakVariableAliasingInInnerLoops.h"
>-
>-#include "compiler/translator/IntermNode_util.h"
>-#include "compiler/translator/IntermTraverse.h"
>-
>-// A HLSL compiler developer gave us more details on the root cause and the workaround needed:
>-//     The root problem is that if the HLSL compiler is applying aliasing information even on
>-//     incomplete simulations (in this case, a single pass). The bug is triggered by an assignment
>-//     that comes from a series of assignments, possibly with swizzled or ternary operators with
>-//     known conditionals, where the source is before the loop.
>-//     So, a workaround is to add a +0 term to variables the first time they are assigned to in
>-//     an inner loop (if they are declared in an outside scope, otherwise there is no need).
>-//     This will break the aliasing chain.
>-
>-// For simplicity here we add a +0 to any assignment that is in at least two nested loops. Because
>-// the bug only shows up with swizzles, and ternary assignment, whole array or whole structure
>-// assignment don't need a workaround.
>-
>-namespace sh
>-{
>-
>-namespace
>-{
>-
>-class AliasingBreaker : public TIntermTraverser
>-{
>-  public:
>-    AliasingBreaker() : TIntermTraverser(true, false, true) {}
>-
>-  protected:
>-    bool visitBinary(Visit visit, TIntermBinary *binary)
>-    {
>-        if (visit != PreVisit)
>-        {
>-            return false;
>-        }
>-
>-        if (mLoopLevel < 2 || !binary->isAssignment())
>-        {
>-            return true;
>-        }
>-
>-        TIntermTyped *B = binary->getRight();
>-        TType type      = B->getType();
>-
>-        if (!type.isScalar() && !type.isVector() && !type.isMatrix())
>-        {
>-            return true;
>-        }
>-
>-        if (type.isArray() || IsSampler(type.getBasicType()))
>-        {
>-            return true;
>-        }
>-
>-        // We have a scalar / vector / matrix assignment with loop depth 2.
>-        // Transform it from
>-        //    A = B
>-        // to
>-        //    A = (B + typeof<B>(0));
>-
>-        TIntermBinary *bPlusZero = new TIntermBinary(EOpAdd, B, CreateZeroNode(type));
>-        bPlusZero->setLine(B->getLine());
>-
>-        binary->replaceChildNode(B, bPlusZero);
>-
>-        return true;
>-    }
>-
>-    bool visitLoop(Visit visit, TIntermLoop *loop)
>-    {
>-        if (visit == PreVisit)
>-        {
>-            mLoopLevel++;
>-        }
>-        else
>-        {
>-            ASSERT(mLoopLevel > 0);
>-            mLoopLevel--;
>-        }
>-
>-        return true;
>-    }
>-
>-  private:
>-    int mLoopLevel = 0;
>-};
>-
>-}  // anonymous namespace
>-
>-void BreakVariableAliasingInInnerLoops(TIntermNode *root)
>-{
>-    AliasingBreaker breaker;
>-    root->traverse(&breaker);
>-}
>-
>-}  // namespace sh
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/BreakVariableAliasingInInnerLoops.h b/Source/ThirdParty/ANGLE/src/compiler/translator/BreakVariableAliasingInInnerLoops.h
>deleted file mode 100644
>index b1d906f9198..00000000000
>--- a/Source/ThirdParty/ANGLE/src/compiler/translator/BreakVariableAliasingInInnerLoops.h
>+++ /dev/null
>@@ -1,23 +0,0 @@
>-//
>-// Copyright (c) 2016 The ANGLE Project Authors. All rights reserved.
>-// Use of this source code is governed by a BSD-style license that can be
>-// found in the LICENSE file.
>-//
>-
>-// BreakVariableAliasingInInnerLoops.h: To optimize simple assignments, the HLSL compiler frontend
>-//      may record a variable as aliasing another. Sometimes the alias information gets garbled
>-//      so we work around this issue by breaking the aliasing chain in inner loops.
>-
>-#ifndef COMPILER_TRANSLATOR_BREAKVARIABLEALIASINGININNERLOOPS_H_
>-#define COMPILER_TRANSLATOR_BREAKVARIABLEALIASINGININNERLOOPS_H_
>-
>-class TIntermNode;
>-
>-namespace sh
>-{
>-
>-void BreakVariableAliasingInInnerLoops(TIntermNode *root);
>-
>-}  // namespace sh
>-
>-#endif  // COMPILER_TRANSLATOR_BREAKVARIABLEALIASINGININNERLOOPS_H_
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/BuiltInFunctionEmulator.cpp b/Source/ThirdParty/ANGLE/src/compiler/translator/BuiltInFunctionEmulator.cpp
>index 905e634fd14..290f84df689 100644
>--- a/Source/ThirdParty/ANGLE/src/compiler/translator/BuiltInFunctionEmulator.cpp
>+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/BuiltInFunctionEmulator.cpp
>@@ -6,9 +6,9 @@
> 
> #include "compiler/translator/BuiltInFunctionEmulator.h"
> #include "angle_gl.h"
>-#include "compiler/translator/Cache.h"
>-#include "compiler/translator/IntermTraverse.h"
>-#include "compiler/translator/SymbolTable.h"
>+#include "compiler/translator/StaticType.h"
>+#include "compiler/translator/Symbol.h"
>+#include "compiler/translator/tree_util/IntermTraverse.h"
> 
> namespace sh
> {
>@@ -18,15 +18,13 @@ class BuiltInFunctionEmulator::BuiltInFunctionEmulationMarker : public TIntermTr
>   public:
>     BuiltInFunctionEmulationMarker(BuiltInFunctionEmulator &emulator)
>         : TIntermTraverser(true, false, false), mEmulator(emulator)
>-    {
>-    }
>+    {}
> 
>     bool visitUnary(Visit visit, TIntermUnary *node) override
>     {
>-        if (visit == PreVisit)
>+        if (node->getFunction())
>         {
>-            bool needToEmulate =
>-                mEmulator.setFunctionCalled(node->getOp(), node->getOperand()->getType());
>+            bool needToEmulate = mEmulator.setFunctionCalled(node->getFunction());
>             if (needToEmulate)
>                 node->setUseEmulatedFunction();
>         }
>@@ -35,56 +33,15 @@ class BuiltInFunctionEmulator::BuiltInFunctionEmulationMarker : public TIntermTr
> 
>     bool visitAggregate(Visit visit, TIntermAggregate *node) override
>     {
>-        if (visit == PreVisit)
>+        // Here we handle all the built-in functions mapped to ops, not just the ones that are
>+        // currently identified as problematic.
>+        if (node->isConstructor() || node->isFunctionCall())
>         {
>-            // Here we handle all the built-in functions mapped to ops, not just the ones that are
>-            // currently identified as problematic.
>-            if (node->isConstructor() || node->isFunctionCall())
>-            {
>-                return true;
>-            }
>-            const TIntermSequence &sequence = *(node->getSequence());
>-            bool needToEmulate              = false;
>-            // Right now we only handle built-in functions with two to four parameters.
>-            if (sequence.size() == 2)
>-            {
>-                TIntermTyped *param1 = sequence[0]->getAsTyped();
>-                TIntermTyped *param2 = sequence[1]->getAsTyped();
>-                if (!param1 || !param2)
>-                    return true;
>-                needToEmulate = mEmulator.setFunctionCalled(node->getOp(), param1->getType(),
>-                                                            param2->getType());
>-            }
>-            else if (sequence.size() == 3)
>-            {
>-                TIntermTyped *param1 = sequence[0]->getAsTyped();
>-                TIntermTyped *param2 = sequence[1]->getAsTyped();
>-                TIntermTyped *param3 = sequence[2]->getAsTyped();
>-                if (!param1 || !param2 || !param3)
>-                    return true;
>-                needToEmulate = mEmulator.setFunctionCalled(node->getOp(), param1->getType(),
>-                                                            param2->getType(), param3->getType());
>-            }
>-            else if (sequence.size() == 4)
>-            {
>-                TIntermTyped *param1 = sequence[0]->getAsTyped();
>-                TIntermTyped *param2 = sequence[1]->getAsTyped();
>-                TIntermTyped *param3 = sequence[2]->getAsTyped();
>-                TIntermTyped *param4 = sequence[3]->getAsTyped();
>-                if (!param1 || !param2 || !param3 || !param4)
>-                    return true;
>-                needToEmulate =
>-                    mEmulator.setFunctionCalled(node->getOp(), param1->getType(), param2->getType(),
>-                                                param3->getType(), param4->getType());
>-            }
>-            else
>-            {
>-                return true;
>-            }
>-
>-            if (needToEmulate)
>-                node->setUseEmulatedFunction();
>+            return true;
>         }
>+        bool needToEmulate = mEmulator.setFunctionCalled(node->getFunction());
>+        if (needToEmulate)
>+            node->setUseEmulatedFunction();
>         return true;
>     }
> 
>@@ -92,78 +49,21 @@ class BuiltInFunctionEmulator::BuiltInFunctionEmulationMarker : public TIntermTr
>     BuiltInFunctionEmulator &mEmulator;
> };
> 
>-BuiltInFunctionEmulator::BuiltInFunctionEmulator()
>-{
>-}
>-
>-FunctionId BuiltInFunctionEmulator::addEmulatedFunction(TOperator op,
>-                                                        const TType *param,
>-                                                        const char *emulatedFunctionDefinition)
>-{
>-    FunctionId id(op, param);
>-    mEmulatedFunctions[id] = std::string(emulatedFunctionDefinition);
>-    return id;
>-}
>-
>-FunctionId BuiltInFunctionEmulator::addEmulatedFunction(TOperator op,
>-                                                        const TType *param1,
>-                                                        const TType *param2,
>-                                                        const char *emulatedFunctionDefinition)
>-{
>-    FunctionId id(op, param1, param2);
>-    mEmulatedFunctions[id] = std::string(emulatedFunctionDefinition);
>-    return id;
>-}
>-
>-FunctionId BuiltInFunctionEmulator::addEmulatedFunctionWithDependency(
>-    const FunctionId &dependency,
>-    TOperator op,
>-    const TType *param1,
>-    const TType *param2,
>-    const char *emulatedFunctionDefinition)
>-{
>-    FunctionId id(op, param1, param2);
>-    mEmulatedFunctions[id]    = std::string(emulatedFunctionDefinition);
>-    mFunctionDependencies[id] = dependency;
>-    return id;
>-}
>-
>-FunctionId BuiltInFunctionEmulator::addEmulatedFunction(TOperator op,
>-                                                        const TType *param1,
>-                                                        const TType *param2,
>-                                                        const TType *param3,
>-                                                        const char *emulatedFunctionDefinition)
>-{
>-    FunctionId id(op, param1, param2, param3);
>-    mEmulatedFunctions[id] = std::string(emulatedFunctionDefinition);
>-    return id;
>-}
>+BuiltInFunctionEmulator::BuiltInFunctionEmulator() {}
> 
>-FunctionId BuiltInFunctionEmulator::addEmulatedFunction(TOperator op,
>-                                                        const TType *param1,
>-                                                        const TType *param2,
>-                                                        const TType *param3,
>-                                                        const TType *param4,
>-                                                        const char *emulatedFunctionDefinition)
>+void BuiltInFunctionEmulator::addEmulatedFunction(const TSymbolUniqueId &uniqueId,
>+                                                  const char *emulatedFunctionDefinition)
> {
>-    FunctionId id(op, param1, param2, param3, param4);
>-    mEmulatedFunctions[id] = std::string(emulatedFunctionDefinition);
>-    return id;
>+    mEmulatedFunctions[uniqueId.get()] = std::string(emulatedFunctionDefinition);
> }
> 
>-FunctionId BuiltInFunctionEmulator::addEmulatedFunctionWithDependency(
>-    const FunctionId &dependency,
>-    TOperator op,
>-    const TType *param1,
>-    const TType *param2,
>-    const TType *param3,
>-    const TType *param4,
>+void BuiltInFunctionEmulator::addEmulatedFunctionWithDependency(
>+    const TSymbolUniqueId &dependency,
>+    const TSymbolUniqueId &uniqueId,
>     const char *emulatedFunctionDefinition)
> {
>-    FunctionId id(op, param1, param2, param3, param4);
>-    mEmulatedFunctions[id]    = std::string(emulatedFunctionDefinition);
>-    mFunctionDependencies[id] = dependency;
>-    return id;
>+    mEmulatedFunctions[uniqueId.get()]    = std::string(emulatedFunctionDefinition);
>+    mFunctionDependencies[uniqueId.get()] = dependency.get();
> }
> 
> bool BuiltInFunctionEmulator::isOutputEmpty() const
>@@ -182,47 +82,18 @@ void BuiltInFunctionEmulator::outputEmulatedFunctions(TInfoSinkBase &out) const
>     }
> }
> 
>-bool BuiltInFunctionEmulator::setFunctionCalled(TOperator op, const TType &param)
>-{
>-    return setFunctionCalled(FunctionId(op, &param));
>-}
>-
>-bool BuiltInFunctionEmulator::setFunctionCalled(TOperator op,
>-                                                const TType &param1,
>-                                                const TType &param2)
>-{
>-    return setFunctionCalled(FunctionId(op, &param1, &param2));
>-}
>-
>-bool BuiltInFunctionEmulator::setFunctionCalled(TOperator op,
>-                                                const TType &param1,
>-                                                const TType &param2,
>-                                                const TType &param3)
>-{
>-    return setFunctionCalled(FunctionId(op, &param1, &param2, &param3));
>-}
>-
>-bool BuiltInFunctionEmulator::setFunctionCalled(TOperator op,
>-                                                const TType &param1,
>-                                                const TType &param2,
>-                                                const TType &param3,
>-                                                const TType &param4)
>-{
>-    return setFunctionCalled(FunctionId(op, &param1, &param2, &param3, &param4));
>-}
>-
>-const char *BuiltInFunctionEmulator::findEmulatedFunction(const FunctionId &functionId) const
>+const char *BuiltInFunctionEmulator::findEmulatedFunction(int uniqueId) const
> {
>     for (const auto &queryFunction : mQueryFunctions)
>     {
>-        const char *result = queryFunction(functionId);
>+        const char *result = queryFunction(uniqueId);
>         if (result)
>         {
>             return result;
>         }
>     }
> 
>-    const auto &result = mEmulatedFunctions.find(functionId);
>+    const auto &result = mEmulatedFunctions.find(uniqueId);
>     if (result != mEmulatedFunctions.end())
>     {
>         return result->second.c_str();
>@@ -231,27 +102,31 @@ const char *BuiltInFunctionEmulator::findEmulatedFunction(const FunctionId &func
>     return nullptr;
> }
> 
>-bool BuiltInFunctionEmulator::setFunctionCalled(const FunctionId &functionId)
>+bool BuiltInFunctionEmulator::setFunctionCalled(const TFunction *function)
>+{
>+    ASSERT(function != nullptr);
>+    return setFunctionCalled(function->uniqueId().get());
>+}
>+
>+bool BuiltInFunctionEmulator::setFunctionCalled(int uniqueId)
> {
>-    if (!findEmulatedFunction(functionId))
>+    if (!findEmulatedFunction(uniqueId))
>     {
>         return false;
>     }
> 
>     for (size_t i = 0; i < mFunctions.size(); ++i)
>     {
>-        if (mFunctions[i] == functionId)
>+        if (mFunctions[i] == uniqueId)
>             return true;
>     }
>     // If the function depends on another, mark the dependency as called.
>-    auto dependency = mFunctionDependencies.find(functionId);
>+    auto dependency = mFunctionDependencies.find(uniqueId);
>     if (dependency != mFunctionDependencies.end())
>     {
>         setFunctionCalled((*dependency).second);
>     }
>-    // Copy the functionId if it needs to be stored, to make sure that the TType pointers inside
>-    // remain valid and constant.
>-    mFunctions.push_back(functionId.getCopy());
>+    mFunctions.push_back(uniqueId);
>     return true;
> }
> 
>@@ -284,72 +159,4 @@ void BuiltInFunctionEmulator::WriteEmulatedFunctionName(TInfoSinkBase &out, cons
>     out << name << "_emu";
> }
> 
>-FunctionId::FunctionId()
>-    : mOp(EOpNull),
>-      mParam1(TCache::getType(EbtVoid)),
>-      mParam2(TCache::getType(EbtVoid)),
>-      mParam3(TCache::getType(EbtVoid)),
>-      mParam4(TCache::getType(EbtVoid))
>-{
>-}
>-
>-FunctionId::FunctionId(TOperator op, const TType *param)
>-    : mOp(op),
>-      mParam1(param),
>-      mParam2(TCache::getType(EbtVoid)),
>-      mParam3(TCache::getType(EbtVoid)),
>-      mParam4(TCache::getType(EbtVoid))
>-{
>-}
>-
>-FunctionId::FunctionId(TOperator op, const TType *param1, const TType *param2)
>-    : mOp(op),
>-      mParam1(param1),
>-      mParam2(param2),
>-      mParam3(TCache::getType(EbtVoid)),
>-      mParam4(TCache::getType(EbtVoid))
>-{
>-}
>-
>-FunctionId::FunctionId(TOperator op, const TType *param1, const TType *param2, const TType *param3)
>-    : mOp(op), mParam1(param1), mParam2(param2), mParam3(param3), mParam4(TCache::getType(EbtVoid))
>-{
>-}
>-
>-FunctionId::FunctionId(TOperator op,
>-                       const TType *param1,
>-                       const TType *param2,
>-                       const TType *param3,
>-                       const TType *param4)
>-    : mOp(op), mParam1(param1), mParam2(param2), mParam3(param3), mParam4(param4)
>-{
>-}
>-
>-bool FunctionId::operator==(const FunctionId &other) const
>-{
>-    return (mOp == other.mOp && *mParam1 == *other.mParam1 && *mParam2 == *other.mParam2 &&
>-            *mParam3 == *other.mParam3 && *mParam4 == *other.mParam4);
>-}
>-
>-bool FunctionId::operator<(const FunctionId &other) const
>-{
>-    if (mOp != other.mOp)
>-        return mOp < other.mOp;
>-    if (*mParam1 != *other.mParam1)
>-        return *mParam1 < *other.mParam1;
>-    if (*mParam2 != *other.mParam2)
>-        return *mParam2 < *other.mParam2;
>-    if (*mParam3 != *other.mParam3)
>-        return *mParam3 < *other.mParam3;
>-    if (*mParam4 != *other.mParam4)
>-        return *mParam4 < *other.mParam4;
>-    return false;  // all fields are equal
>-}
>-
>-FunctionId FunctionId::getCopy() const
>-{
>-    return FunctionId(mOp, new TType(*mParam1), new TType(*mParam2), new TType(*mParam3),
>-                      new TType(*mParam4));
>-}
>-
> }  // namespace sh
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/BuiltInFunctionEmulator.h b/Source/ThirdParty/ANGLE/src/compiler/translator/BuiltInFunctionEmulator.h
>index 5f15f662249..d15e83d75c8 100644
>--- a/Source/ThirdParty/ANGLE/src/compiler/translator/BuiltInFunctionEmulator.h
>+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/BuiltInFunctionEmulator.h
>@@ -8,82 +8,15 @@
> #define COMPILER_TRANSLATOR_BUILTINFUNCTIONEMULATOR_H_
> 
> #include "compiler/translator/InfoSink.h"
>-#include "compiler/translator/IntermNode.h"
>-#include "compiler/translator/ParamType.h"
> 
> namespace sh
> {
> 
>-struct MiniFunctionId
>-{
>-    constexpr MiniFunctionId(TOperator op         = EOpNull,
>-                             ParamType paramType1 = ParamType::Void,
>-                             ParamType paramType2 = ParamType::Void,
>-                             ParamType paramType3 = ParamType::Void,
>-                             ParamType paramType4 = ParamType::Void)
>-        : op(op),
>-          paramType1(paramType1),
>-          paramType2(paramType2),
>-          paramType3(paramType3),
>-          paramType4(paramType4)
>-    {
>-    }
>-
>-    TOperator op;
>-    ParamType paramType1;
>-    ParamType paramType2;
>-    ParamType paramType3;
>-    ParamType paramType4;
>-};
>-
>-class FunctionId final
>-{
>-  public:
>-    FunctionId();
>-    FunctionId(TOperator op, const TType *param);
>-    FunctionId(TOperator op, const TType *param1, const TType *param2);
>-    FunctionId(TOperator op, const TType *param1, const TType *param2, const TType *param3);
>-    FunctionId(TOperator op,
>-               const TType *param1,
>-               const TType *param2,
>-               const TType *param3,
>-               const TType *param4);
>+class TIntermNode;
>+class TFunction;
>+class TSymbolUniqueId;
> 
>-    FunctionId(const FunctionId &) = default;
>-    FunctionId &operator=(const FunctionId &) = default;
>-
>-    bool operator==(const FunctionId &other) const;
>-    bool operator<(const FunctionId &other) const;
>-
>-    FunctionId getCopy() const;
>-
>-  private:
>-    friend bool operator==(const MiniFunctionId &miniId, const FunctionId &functionId);
>-    TOperator mOp;
>-
>-    // The memory that these TType objects use is freed by PoolAllocator. The
>-    // BuiltInFunctionEmulator's lifetime can extend until after the memory pool is freed, but
>-    // that's not an issue since this class never destructs these objects.
>-    const TType *mParam1;
>-    const TType *mParam2;
>-    const TType *mParam3;
>-    const TType *mParam4;
>-};
>-
>-inline bool operator==(ParamType paramType, const TType *type)
>-{
>-    return SameParamType(paramType, type->getBasicType(), type->getNominalSize(),
>-                         type->getSecondarySize());
>-}
>-
>-inline bool operator==(const MiniFunctionId &miniId, const FunctionId &functionId)
>-{
>-    return miniId.op == functionId.mOp && miniId.paramType1 == functionId.mParam1 &&
>-           miniId.paramType2 == functionId.mParam2 && miniId.paramType3 == functionId.mParam3 &&
>-           miniId.paramType4 == functionId.mParam4;
>-}
>-
>-using BuiltinQueryFunc = const char *(const FunctionId &);
>+using BuiltinQueryFunc = const char *(int);
> 
> //
> // This class decides which built-in functions need to be replaced with the emulated ones. It can be
>@@ -108,37 +41,12 @@ class BuiltInFunctionEmulator
>     void outputEmulatedFunctions(TInfoSinkBase &out) const;
> 
>     // Add functions that need to be emulated.
>-    FunctionId addEmulatedFunction(TOperator op,
>-                                   const TType *param,
>-                                   const char *emulatedFunctionDefinition);
>-    FunctionId addEmulatedFunction(TOperator op,
>-                                   const TType *param1,
>-                                   const TType *param2,
>-                                   const char *emulatedFunctionDefinition);
>-    FunctionId addEmulatedFunction(TOperator op,
>-                                   const TType *param1,
>-                                   const TType *param2,
>-                                   const TType *param3,
>-                                   const char *emulatedFunctionDefinition);
>-    FunctionId addEmulatedFunction(TOperator op,
>-                                   const TType *param1,
>-                                   const TType *param2,
>-                                   const TType *param3,
>-                                   const TType *param4,
>-                                   const char *emulatedFunctionDefinition);
>-
>-    FunctionId addEmulatedFunctionWithDependency(const FunctionId &dependency,
>-                                                 TOperator op,
>-                                                 const TType *param1,
>-                                                 const TType *param2,
>-                                                 const char *emulatedFunctionDefinition);
>-    FunctionId addEmulatedFunctionWithDependency(const FunctionId &dependency,
>-                                                 TOperator op,
>-                                                 const TType *param1,
>-                                                 const TType *param2,
>-                                                 const TType *param3,
>-                                                 const TType *param4,
>-                                                 const char *emulatedFunctionDefinition);
>+    void addEmulatedFunction(const TSymbolUniqueId &uniqueId,
>+                             const char *emulatedFunctionDefinition);
>+
>+    void addEmulatedFunctionWithDependency(const TSymbolUniqueId &dependency,
>+                                           const TSymbolUniqueId &uniqueId,
>+                                           const char *emulatedFunctionDefinition);
> 
>     void addFunctionMap(BuiltinQueryFunc queryFunc);
> 
>@@ -148,31 +56,20 @@ class BuiltInFunctionEmulator
>     // Records that a function is called by the shader and might need to be emulated. If the
>     // function is not in mEmulatedFunctions, this becomes a no-op. Returns true if the function
>     // call needs to be replaced with an emulated one.
>-    bool setFunctionCalled(TOperator op, const TType &param);
>-    bool setFunctionCalled(TOperator op, const TType &param1, const TType &param2);
>-    bool setFunctionCalled(TOperator op,
>-                           const TType &param1,
>-                           const TType &param2,
>-                           const TType &param3);
>-    bool setFunctionCalled(TOperator op,
>-                           const TType &param1,
>-                           const TType &param2,
>-                           const TType &param3,
>-                           const TType &param4);
>-
>-    bool setFunctionCalled(const FunctionId &functionId);
>+    bool setFunctionCalled(const TFunction *function);
>+    bool setFunctionCalled(int uniqueId);
> 
>-    const char *findEmulatedFunction(const FunctionId &functionId) const;
>+    const char *findEmulatedFunction(int uniqueId) const;
> 
>-    // Map from function id to emulated function definition
>-    std::map<FunctionId, std::string> mEmulatedFunctions;
>+    // Map from function unique id to emulated function definition
>+    std::map<int, std::string> mEmulatedFunctions;
> 
>     // Map from dependent functions to their dependencies. This structure allows each function to
>     // have at most one dependency.
>-    std::map<FunctionId, FunctionId> mFunctionDependencies;
>+    std::map<int, int> mFunctionDependencies;
> 
>     // Called function ids
>-    std::vector<FunctionId> mFunctions;
>+    std::vector<int> mFunctions;
> 
>     // Constexpr function tables.
>     std::vector<BuiltinQueryFunc *> mQueryFunctions;
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/BuiltInFunctionEmulatorGLSL.cpp b/Source/ThirdParty/ANGLE/src/compiler/translator/BuiltInFunctionEmulatorGLSL.cpp
>index 27ee04da35e..dc485274804 100644
>--- a/Source/ThirdParty/ANGLE/src/compiler/translator/BuiltInFunctionEmulatorGLSL.cpp
>+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/BuiltInFunctionEmulatorGLSL.cpp
>@@ -4,12 +4,12 @@
> // found in the LICENSE file.
> //
> 
>+#include "compiler/translator/BuiltInFunctionEmulatorGLSL.h"
>+
> #include "angle_gl.h"
> #include "compiler/translator/BuiltInFunctionEmulator.h"
>-#include "compiler/translator/BuiltInFunctionEmulatorGLSL.h"
>-#include "compiler/translator/Cache.h"
>-#include "compiler/translator/SymbolTable.h"
> #include "compiler/translator/VersionGLSL.h"
>+#include "compiler/translator/tree_util/BuiltIn_autogen.h"
> 
> namespace sh
> {
>@@ -19,8 +19,7 @@ void InitBuiltInAbsFunctionEmulatorForGLSLWorkarounds(BuiltInFunctionEmulator *e
> {
>     if (shaderType == GL_VERTEX_SHADER)
>     {
>-        const TType *int1 = TCache::getType(EbtInt);
>-        emu->addEmulatedFunction(EOpAbs, int1, "int abs_emu(int x) { return x * sign(x); }");
>+        emu->addEmulatedFunction(BuiltInId::abs_Int1, "int abs_emu(int x) { return x * sign(x); }");
>     }
> }
> 
>@@ -31,17 +30,12 @@ void InitBuiltInIsnanFunctionEmulatorForGLSLWorkarounds(BuiltInFunctionEmulator
>     if (targetGLSLVersion < GLSL_VERSION_130)
>         return;
> 
>-    const TType *float1 = TCache::getType(EbtFloat);
>-    const TType *float2 = TCache::getType(EbtFloat, 2);
>-    const TType *float3 = TCache::getType(EbtFloat, 3);
>-    const TType *float4 = TCache::getType(EbtFloat, 4);
>-
>     // !(x > 0.0 || x < 0.0 || x == 0.0) will be optimized and always equal to false.
>     emu->addEmulatedFunction(
>-        EOpIsNan, float1,
>+        BuiltInId::isnan_Float1,
>         "bool isnan_emu(float x) { return (x > 0.0 || x < 0.0) ? false : x != 0.0; }");
>     emu->addEmulatedFunction(
>-        EOpIsNan, float2,
>+        BuiltInId::isnan_Float2,
>         "bvec2 isnan_emu(vec2 x)\n"
>         "{\n"
>         "    bvec2 isnan;\n"
>@@ -52,7 +46,7 @@ void InitBuiltInIsnanFunctionEmulatorForGLSLWorkarounds(BuiltInFunctionEmulator
>         "    return isnan;\n"
>         "}\n");
>     emu->addEmulatedFunction(
>-        EOpIsNan, float3,
>+        BuiltInId::isnan_Float3,
>         "bvec3 isnan_emu(vec3 x)\n"
>         "{\n"
>         "    bvec3 isnan;\n"
>@@ -63,7 +57,7 @@ void InitBuiltInIsnanFunctionEmulatorForGLSLWorkarounds(BuiltInFunctionEmulator
>         "    return isnan;\n"
>         "}\n");
>     emu->addEmulatedFunction(
>-        EOpIsNan, float4,
>+        BuiltInId::isnan_Float4,
>         "bvec4 isnan_emu(vec4 x)\n"
>         "{\n"
>         "    bvec4 isnan;\n"
>@@ -77,21 +71,24 @@ void InitBuiltInIsnanFunctionEmulatorForGLSLWorkarounds(BuiltInFunctionEmulator
> 
> void InitBuiltInAtanFunctionEmulatorForGLSLWorkarounds(BuiltInFunctionEmulator *emu)
> {
>-    const TType *float1 = TCache::getType(EbtFloat);
>-    auto floatFuncId    = emu->addEmulatedFunction(
>-        EOpAtan, float1, float1,
>-        "emu_precision float atan_emu(emu_precision float y, emu_precision "
>-        "float x)\n"
>-        "{\n"
>-        "    if (x > 0.0) return atan(y / x);\n"
>-        "    else if (x < 0.0 && y >= 0.0) return atan(y / x) + 3.14159265;\n"
>-        "    else if (x < 0.0 && y < 0.0) return atan(y / x) - 3.14159265;\n"
>-        "    else return 1.57079632 * sign(y);\n"
>-        "}\n");
>+    emu->addEmulatedFunction(BuiltInId::atan_Float1_Float1,
>+                             "emu_precision float atan_emu(emu_precision float y, emu_precision "
>+                             "float x)\n"
>+                             "{\n"
>+                             "    if (x > 0.0) return atan(y / x);\n"
>+                             "    else if (x < 0.0 && y >= 0.0) return atan(y / x) + 3.14159265;\n"
>+                             "    else if (x < 0.0 && y < 0.0) return atan(y / x) - 3.14159265;\n"
>+                             "    else return 1.57079632 * sign(y);\n"
>+                             "}\n");
>+    static const std::array<TSymbolUniqueId, 4> ids = {
>+        BuiltInId::atan_Float1_Float1,
>+        BuiltInId::atan_Float2_Float2,
>+        BuiltInId::atan_Float3_Float3,
>+        BuiltInId::atan_Float4_Float4,
>+    };
>     for (int dim = 2; dim <= 4; ++dim)
>     {
>-        const TType *floatVec = TCache::getType(EbtFloat, static_cast<unsigned char>(dim));
>-        std::stringstream ss;
>+        std::stringstream ss = sh::InitializeStream<std::stringstream>();
>         ss << "emu_precision vec" << dim << " atan_emu(emu_precision vec" << dim
>            << " y, emu_precision vec" << dim << " x)\n"
>            << "{\n"
>@@ -107,7 +104,7 @@ void InitBuiltInAtanFunctionEmulatorForGLSLWorkarounds(BuiltInFunctionEmulator *
>         }
>         ss << ");\n"
>               "}\n";
>-        emu->addEmulatedFunctionWithDependency(floatFuncId, EOpAtan, floatVec, floatVec,
>+        emu->addEmulatedFunctionWithDependency(BuiltInId::atan_Float1_Float1, ids[dim - 1],
>                                                ss.str().c_str());
>     }
> }
>@@ -120,11 +117,8 @@ void InitBuiltInFunctionEmulatorForGLSLMissingFunctions(BuiltInFunctionEmulator
>     // Emulate packUnorm2x16 and unpackUnorm2x16 (GLSL 4.10)
>     if (targetGLSLVersion < GLSL_VERSION_410)
>     {
>-        const TType *float2 = TCache::getType(EbtFloat, 2);
>-        const TType *uint1  = TCache::getType(EbtUInt);
>-
>         // clang-format off
>-        emu->addEmulatedFunction(EOpPackUnorm2x16, float2,
>+        emu->addEmulatedFunction(BuiltInId::packUnorm2x16_Float2,
>             "uint packUnorm2x16_emu(vec2 v)\n"
>             "{\n"
>             "    int x = int(round(clamp(v.x, 0.0, 1.0) * 65535.0));\n"
>@@ -132,7 +126,7 @@ void InitBuiltInFunctionEmulatorForGLSLMissingFunctions(BuiltInFunctionEmulator
>             "    return uint((y << 16) | (x & 0xFFFF));\n"
>             "}\n");
> 
>-        emu->addEmulatedFunction(EOpUnpackUnorm2x16, uint1,
>+        emu->addEmulatedFunction(BuiltInId::unpackUnorm2x16_UInt1,
>             "vec2 unpackUnorm2x16_emu(uint u)\n"
>             "{\n"
>             "    float x = float(u & 0xFFFFu) / 65535.0;\n"
>@@ -146,11 +140,8 @@ void InitBuiltInFunctionEmulatorForGLSLMissingFunctions(BuiltInFunctionEmulator
>     // by using floatBitsToInt, floatBitsToUint, intBitsToFloat, and uintBitsToFloat (GLSL 3.30).
>     if (targetGLSLVersion >= GLSL_VERSION_330 && targetGLSLVersion < GLSL_VERSION_420)
>     {
>-        const TType *float2 = TCache::getType(EbtFloat, 2);
>-        const TType *uint1  = TCache::getType(EbtUInt);
>-
>         // clang-format off
>-        emu->addEmulatedFunction(EOpPackSnorm2x16, float2,
>+        emu->addEmulatedFunction(BuiltInId::packSnorm2x16_Float2,
>             "uint packSnorm2x16_emu(vec2 v)\n"
>             "{\n"
>             "    #if defined(GL_ARB_shading_language_packing)\n"
>@@ -161,7 +152,7 @@ void InitBuiltInFunctionEmulatorForGLSLMissingFunctions(BuiltInFunctionEmulator
>             "        return uint((y << 16) | (x & 0xFFFF));\n"
>             "    #endif\n"
>             "}\n");
>-        emu->addEmulatedFunction(EOpUnpackSnorm2x16, uint1,
>+        emu->addEmulatedFunction(BuiltInId::unpackSnorm2x16_UInt1,
>             "#if !defined(GL_ARB_shading_language_packing)\n"
>             "    float fromSnorm(uint x)\n"
>             "    {\n"
>@@ -182,7 +173,7 @@ void InitBuiltInFunctionEmulatorForGLSLMissingFunctions(BuiltInFunctionEmulator
>             "}\n");
>         // Functions uint f32tof16(float val) and float f16tof32(uint val) are
>         // based on the OpenGL redbook Appendix Session "Floating-Point Formats Used in OpenGL".
>-        emu->addEmulatedFunction(EOpPackHalf2x16, float2,
>+        emu->addEmulatedFunction(BuiltInId::packHalf2x16_Float2,
>             "#if !defined(GL_ARB_shading_language_packing)\n"
>             "    uint f32tof16(float val)\n"
>             "    {\n"
>@@ -229,7 +220,7 @@ void InitBuiltInFunctionEmulatorForGLSLMissingFunctions(BuiltInFunctionEmulator
>             "        return (y << 16) | x;\n"
>             "    #endif\n"
>             "}\n");
>-        emu->addEmulatedFunction(EOpUnpackHalf2x16, uint1,
>+        emu->addEmulatedFunction(BuiltInId::unpackHalf2x16_UInt1,
>             "#if !defined(GL_ARB_shading_language_packing)\n"
>             "    float f16tof32(uint val)\n"
>             "    {\n"
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/BuiltInFunctionEmulatorHLSL.cpp b/Source/ThirdParty/ANGLE/src/compiler/translator/BuiltInFunctionEmulatorHLSL.cpp
>index e78d86d00a3..b4bca0d36de 100644
>--- a/Source/ThirdParty/ANGLE/src/compiler/translator/BuiltInFunctionEmulatorHLSL.cpp
>+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/BuiltInFunctionEmulatorHLSL.cpp
>@@ -4,17 +4,17 @@
> // found in the LICENSE file.
> //
> 
>+#include "compiler/translator/BuiltInFunctionEmulatorHLSL.h"
> #include "angle_gl.h"
> #include "compiler/translator/BuiltInFunctionEmulator.h"
>-#include "compiler/translator/BuiltInFunctionEmulatorHLSL.h"
>-#include "compiler/translator/SymbolTable.h"
> #include "compiler/translator/VersionGLSL.h"
>+#include "compiler/translator/tree_util/BuiltIn_autogen.h"
> 
> namespace sh
> {
> 
> // Defined in emulated_builtin_functions_hlsl_autogen.cpp.
>-const char *FindHLSLFunction(const FunctionId &functionID);
>+const char *FindHLSLFunction(int uniqueId);
> 
> void InitBuiltInIsnanFunctionEmulatorForHLSLWorkarounds(BuiltInFunctionEmulator *emu,
>                                                         int targetGLSLVersion)
>@@ -22,12 +22,7 @@ void InitBuiltInIsnanFunctionEmulatorForHLSLWorkarounds(BuiltInFunctionEmulator
>     if (targetGLSLVersion < GLSL_VERSION_130)
>         return;
> 
>-    TType *float1 = new TType(EbtFloat);
>-    TType *float2 = new TType(EbtFloat, 2);
>-    TType *float3 = new TType(EbtFloat, 3);
>-    TType *float4 = new TType(EbtFloat, 4);
>-
>-    emu->addEmulatedFunction(EOpIsNan, float1,
>+    emu->addEmulatedFunction(BuiltInId::isnan_Float1,
>                              "bool isnan_emu(float x)\n"
>                              "{\n"
>                              "    return (x > 0.0 || x < 0.0) ? false : x != 0.0;\n"
>@@ -35,7 +30,7 @@ void InitBuiltInIsnanFunctionEmulatorForHLSLWorkarounds(BuiltInFunctionEmulator
>                              "\n");
> 
>     emu->addEmulatedFunction(
>-        EOpIsNan, float2,
>+        BuiltInId::isnan_Float2,
>         "bool2 isnan_emu(float2 x)\n"
>         "{\n"
>         "    bool2 isnan;\n"
>@@ -47,7 +42,7 @@ void InitBuiltInIsnanFunctionEmulatorForHLSLWorkarounds(BuiltInFunctionEmulator
>         "}\n");
> 
>     emu->addEmulatedFunction(
>-        EOpIsNan, float3,
>+        BuiltInId::isnan_Float3,
>         "bool3 isnan_emu(float3 x)\n"
>         "{\n"
>         "    bool3 isnan;\n"
>@@ -59,7 +54,7 @@ void InitBuiltInIsnanFunctionEmulatorForHLSLWorkarounds(BuiltInFunctionEmulator
>         "}\n");
> 
>     emu->addEmulatedFunction(
>-        EOpIsNan, float4,
>+        BuiltInId::isnan_Float4,
>         "bool4 isnan_emu(float4 x)\n"
>         "{\n"
>         "    bool4 isnan;\n"
>@@ -73,43 +68,35 @@ void InitBuiltInIsnanFunctionEmulatorForHLSLWorkarounds(BuiltInFunctionEmulator
> 
> void InitBuiltInFunctionEmulatorForHLSL(BuiltInFunctionEmulator *emu)
> {
>-    TType *int1   = new TType(EbtInt);
>-    TType *int2   = new TType(EbtInt, 2);
>-    TType *int3   = new TType(EbtInt, 3);
>-    TType *int4   = new TType(EbtInt, 4);
>-    TType *uint1  = new TType(EbtUInt);
>-    TType *uint2  = new TType(EbtUInt, 2);
>-    TType *uint3  = new TType(EbtUInt, 3);
>-    TType *uint4  = new TType(EbtUInt, 4);
>-
>     emu->addFunctionMap(FindHLSLFunction);
> 
>     // (a + b2^16) * (c + d2^16) = ac + (ad + bc) * 2^16 + bd * 2^32
>     // Also note that below, a * d + ((a * c) >> 16) is guaranteed not to overflow, because:
>     // a <= 0xffff, d <= 0xffff, ((a * c) >> 16) <= 0xffff and 0xffff * 0xffff + 0xffff = 0xffff0000
>-    FunctionId umulExtendedUint1 = emu->addEmulatedFunction(
>-        EOpUmulExtended, uint1, uint1, uint1, uint1,
>-        "void umulExtended_emu(uint x, uint y, out uint msb, out uint lsb)\n"
>-        "{\n"
>-        "    lsb = x * y;\n"
>-        "    uint a = (x & 0xffffu);\n"
>-        "    uint b = (x >> 16);\n"
>-        "    uint c = (y & 0xffffu);\n"
>-        "    uint d = (y >> 16);\n"
>-        "    uint ad = a * d + ((a * c) >> 16);\n"
>-        "    uint bc = b * c;\n"
>-        "    uint carry = uint(ad > (0xffffffffu - bc));\n"
>-        "    msb = ((ad + bc) >> 16) + (carry << 16) + b * d;\n"
>-        "}\n");
>+    emu->addEmulatedFunction(BuiltInId::umulExtended_UInt1_UInt1_UInt1_UInt1,
>+                             "void umulExtended_emu(uint x, uint y, out uint msb, out uint lsb)\n"
>+                             "{\n"
>+                             "    lsb = x * y;\n"
>+                             "    uint a = (x & 0xffffu);\n"
>+                             "    uint b = (x >> 16);\n"
>+                             "    uint c = (y & 0xffffu);\n"
>+                             "    uint d = (y >> 16);\n"
>+                             "    uint ad = a * d + ((a * c) >> 16);\n"
>+                             "    uint bc = b * c;\n"
>+                             "    uint carry = uint(ad > (0xffffffffu - bc));\n"
>+                             "    msb = ((ad + bc) >> 16) + (carry << 16) + b * d;\n"
>+                             "}\n");
>     emu->addEmulatedFunctionWithDependency(
>-        umulExtendedUint1, EOpUmulExtended, uint2, uint2, uint2, uint2,
>+        BuiltInId::umulExtended_UInt1_UInt1_UInt1_UInt1,
>+        BuiltInId::umulExtended_UInt2_UInt2_UInt2_UInt2,
>         "void umulExtended_emu(uint2 x, uint2 y, out uint2 msb, out uint2 lsb)\n"
>         "{\n"
>         "    umulExtended_emu(x.x, y.x, msb.x, lsb.x);\n"
>         "    umulExtended_emu(x.y, y.y, msb.y, lsb.y);\n"
>         "}\n");
>     emu->addEmulatedFunctionWithDependency(
>-        umulExtendedUint1, EOpUmulExtended, uint3, uint3, uint3, uint3,
>+        BuiltInId::umulExtended_UInt1_UInt1_UInt1_UInt1,
>+        BuiltInId::umulExtended_UInt3_UInt3_UInt3_UInt3,
>         "void umulExtended_emu(uint3 x, uint3 y, out uint3 msb, out uint3 lsb)\n"
>         "{\n"
>         "    umulExtended_emu(x.x, y.x, msb.x, lsb.x);\n"
>@@ -117,7 +104,8 @@ void InitBuiltInFunctionEmulatorForHLSL(BuiltInFunctionEmulator *emu)
>         "    umulExtended_emu(x.z, y.z, msb.z, lsb.z);\n"
>         "}\n");
>     emu->addEmulatedFunctionWithDependency(
>-        umulExtendedUint1, EOpUmulExtended, uint4, uint4, uint4, uint4,
>+        BuiltInId::umulExtended_UInt1_UInt1_UInt1_UInt1,
>+        BuiltInId::umulExtended_UInt4_UInt4_UInt4_UInt4,
>         "void umulExtended_emu(uint4 x, uint4 y, out uint4 msb, out uint4 lsb)\n"
>         "{\n"
>         "    umulExtended_emu(x.x, y.x, msb.x, lsb.x);\n"
>@@ -130,8 +118,9 @@ void InitBuiltInFunctionEmulatorForHLSL(BuiltInFunctionEmulator *emu)
>     // result needs to be negative.
>     // TODO(oetuaho): Note that this code doesn't take one edge case into account, where x or y is
>     // -2^31. abs(-2^31) is undefined.
>-    FunctionId imulExtendedInt1 = emu->addEmulatedFunctionWithDependency(
>-        umulExtendedUint1, EOpImulExtended, int1, int1, int1, int1,
>+    emu->addEmulatedFunctionWithDependency(
>+        BuiltInId::umulExtended_UInt1_UInt1_UInt1_UInt1,
>+        BuiltInId::imulExtended_Int1_Int1_Int1_Int1,
>         "void imulExtended_emu(int x, int y, out int msb, out int lsb)\n"
>         "{\n"
>         "    uint unsignedMsb;\n"
>@@ -156,14 +145,14 @@ void InitBuiltInFunctionEmulatorForHLSL(BuiltInFunctionEmulator *emu)
>         "    }\n"
>         "}\n");
>     emu->addEmulatedFunctionWithDependency(
>-        imulExtendedInt1, EOpImulExtended, int2, int2, int2, int2,
>+        BuiltInId::imulExtended_Int1_Int1_Int1_Int1, BuiltInId::imulExtended_Int2_Int2_Int2_Int2,
>         "void imulExtended_emu(int2 x, int2 y, out int2 msb, out int2 lsb)\n"
>         "{\n"
>         "    imulExtended_emu(x.x, y.x, msb.x, lsb.x);\n"
>         "    imulExtended_emu(x.y, y.y, msb.y, lsb.y);\n"
>         "}\n");
>     emu->addEmulatedFunctionWithDependency(
>-        imulExtendedInt1, EOpImulExtended, int3, int3, int3, int3,
>+        BuiltInId::imulExtended_Int1_Int1_Int1_Int1, BuiltInId::imulExtended_Int3_Int3_Int3_Int3,
>         "void imulExtended_emu(int3 x, int3 y, out int3 msb, out int3 lsb)\n"
>         "{\n"
>         "    imulExtended_emu(x.x, y.x, msb.x, lsb.x);\n"
>@@ -171,7 +160,7 @@ void InitBuiltInFunctionEmulatorForHLSL(BuiltInFunctionEmulator *emu)
>         "    imulExtended_emu(x.z, y.z, msb.z, lsb.z);\n"
>         "}\n");
>     emu->addEmulatedFunctionWithDependency(
>-        imulExtendedInt1, EOpImulExtended, int4, int4, int4, int4,
>+        BuiltInId::imulExtended_Int1_Int1_Int1_Int1, BuiltInId::imulExtended_Int4_Int4_Int4_Int4,
>         "void imulExtended_emu(int4 x, int4 y, out int4 msb, out int4 lsb)\n"
>         "{\n"
>         "    imulExtended_emu(x.x, y.x, msb.x, lsb.x);\n"
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/Cache.cpp b/Source/ThirdParty/ANGLE/src/compiler/translator/Cache.cpp
>deleted file mode 100644
>index 417e82403ab..00000000000
>--- a/Source/ThirdParty/ANGLE/src/compiler/translator/Cache.cpp
>+++ /dev/null
>@@ -1,99 +0,0 @@
>-//
>-// Copyright (c) 2015 The ANGLE Project Authors. All rights reserved.
>-// Use of this source code is governed by a BSD-style license that can be
>-// found in the LICENSE file.
>-//
>-
>-// Cache.cpp: Implements a cache for various commonly created objects.
>-
>-#include <limits>
>-
>-#include "common/angleutils.h"
>-#include "common/debug.h"
>-#include "compiler/translator/Cache.h"
>-
>-namespace sh
>-{
>-
>-namespace
>-{
>-
>-class TScopedAllocator : angle::NonCopyable
>-{
>-  public:
>-    TScopedAllocator(TPoolAllocator *allocator) : mPreviousAllocator(GetGlobalPoolAllocator())
>-    {
>-        SetGlobalPoolAllocator(allocator);
>-    }
>-    ~TScopedAllocator() { SetGlobalPoolAllocator(mPreviousAllocator); }
>-
>-  private:
>-    TPoolAllocator *mPreviousAllocator;
>-};
>-
>-}  // namespace
>-
>-TCache::TypeKey::TypeKey(TBasicType basicType,
>-                         TPrecision precision,
>-                         TQualifier qualifier,
>-                         unsigned char primarySize,
>-                         unsigned char secondarySize)
>-{
>-    static_assert(sizeof(components) <= sizeof(value), "TypeKey::value is too small");
>-
>-    const size_t MaxEnumValue = std::numeric_limits<EnumComponentType>::max();
>-
>-    // TODO: change to static_assert() once we deprecate MSVC 2013 support
>-    ASSERT(MaxEnumValue >= EbtLast && MaxEnumValue >= EbpLast && MaxEnumValue >= EvqLast &&
>-           "TypeKey::EnumComponentType is too small");
>-
>-    value                    = 0;
>-    components.basicType     = static_cast<EnumComponentType>(basicType);
>-    components.precision     = static_cast<EnumComponentType>(precision);
>-    components.qualifier     = static_cast<EnumComponentType>(qualifier);
>-    components.primarySize   = primarySize;
>-    components.secondarySize = secondarySize;
>-}
>-
>-TCache *TCache::sCache = nullptr;
>-
>-TCache::TCache()
>-{
>-}
>-
>-void TCache::initialize()
>-{
>-    if (sCache == nullptr)
>-    {
>-        sCache = new TCache();
>-    }
>-}
>-
>-void TCache::destroy()
>-{
>-    SafeDelete(sCache);
>-}
>-
>-const TType *TCache::getType(TBasicType basicType,
>-                             TPrecision precision,
>-                             TQualifier qualifier,
>-                             unsigned char primarySize,
>-                             unsigned char secondarySize)
>-{
>-    TypeKey key(basicType, precision, qualifier, primarySize, secondarySize);
>-    auto it = sCache->mTypes.find(key);
>-    if (it != sCache->mTypes.end())
>-    {
>-        return it->second;
>-    }
>-
>-    TScopedAllocator scopedAllocator(&sCache->mAllocator);
>-
>-    TType *type = new TType(basicType, precision, qualifier, primarySize, secondarySize);
>-    type->realize();
>-    sCache->mTypes.insert(std::make_pair(key, type));
>-
>-    return type;
>-}
>-
>-}  // namespace sh
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/Cache.h b/Source/ThirdParty/ANGLE/src/compiler/translator/Cache.h
>deleted file mode 100644
>index a182b07f514..00000000000
>--- a/Source/ThirdParty/ANGLE/src/compiler/translator/Cache.h
>+++ /dev/null
>@@ -1,84 +0,0 @@
>-//
>-// Copyright (c) 2015 The ANGLE Project Authors. All rights reserved.
>-// Use of this source code is governed by a BSD-style license that can be
>-// found in the LICENSE file.
>-//
>-
>-// Cache.h: Implements a cache for various commonly created objects.
>-
>-#ifndef COMPILER_TRANSLATOR_CACHE_H_
>-#define COMPILER_TRANSLATOR_CACHE_H_
>-
>-#include <stdint.h>
>-#include <string.h>
>-#include <map>
>-
>-#include "compiler/translator/Types.h"
>-#include "compiler/translator/PoolAlloc.h"
>-
>-namespace sh
>-{
>-
>-class TCache
>-{
>-  public:
>-    static void initialize();
>-    static void destroy();
>-
>-    static const TType *getType(TBasicType basicType, TPrecision precision)
>-    {
>-        return getType(basicType, precision, EvqTemporary, 1, 1);
>-    }
>-    static const TType *getType(TBasicType basicType,
>-                                unsigned char primarySize   = 1,
>-                                unsigned char secondarySize = 1)
>-    {
>-        return getType(basicType, EbpUndefined, EvqGlobal, primarySize, secondarySize);
>-    }
>-    static const TType *getType(TBasicType basicType,
>-                                TQualifier qualifier,
>-                                unsigned char primarySize   = 1,
>-                                unsigned char secondarySize = 1)
>-    {
>-        return getType(basicType, EbpUndefined, qualifier, primarySize, secondarySize);
>-    }
>-    static const TType *getType(TBasicType basicType,
>-                                TPrecision precision,
>-                                TQualifier qualifier,
>-                                unsigned char primarySize,
>-                                unsigned char secondarySize);
>-
>-  private:
>-    TCache();
>-
>-    union TypeKey {
>-        TypeKey(TBasicType basicType,
>-                TPrecision precision,
>-                TQualifier qualifier,
>-                unsigned char primarySize,
>-                unsigned char secondarySize);
>-
>-        typedef uint8_t EnumComponentType;
>-        struct
>-        {
>-            EnumComponentType basicType;
>-            EnumComponentType precision;
>-            EnumComponentType qualifier;
>-            unsigned char primarySize;
>-            unsigned char secondarySize;
>-        } components;
>-        uint64_t value;
>-
>-        bool operator<(const TypeKey &other) const { return value < other.value; }
>-    };
>-    typedef std::map<TypeKey, const TType *> TypeMap;
>-
>-    TypeMap mTypes;
>-    TPoolAllocator mAllocator;
>-
>-    static TCache *sCache;
>-};
>-
>-}  // namespace sh
>-
>-#endif  // COMPILER_TRANSLATOR_CACHE_H_
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/CallDAG.cpp b/Source/ThirdParty/ANGLE/src/compiler/translator/CallDAG.cpp
>index 5f54e808984..63c8cd0f92e 100644
>--- a/Source/ThirdParty/ANGLE/src/compiler/translator/CallDAG.cpp
>+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/CallDAG.cpp
>@@ -11,8 +11,8 @@
> #include "compiler/translator/CallDAG.h"
> 
> #include "compiler/translator/Diagnostics.h"
>-#include "compiler/translator/IntermTraverse.h"
> #include "compiler/translator/SymbolTable.h"
>+#include "compiler/translator/tree_util/IntermTraverse.h"
> 
> namespace sh
> {
>@@ -23,12 +23,11 @@ class CallDAG::CallDAGCreator : public TIntermTraverser
> {
>   public:
>     CallDAGCreator(TDiagnostics *diagnostics)
>-        : TIntermTraverser(true, false, true),
>+        : TIntermTraverser(true, false, false),
>           mDiagnostics(diagnostics),
>           mCurrentFunction(nullptr),
>           mCurrentIndex(0)
>-    {
>-    }
>+    {}
> 
>     InitResult assignIndices()
>     {
>@@ -36,7 +35,7 @@ class CallDAG::CallDAGCreator : public TIntermTraverser
>         for (auto &it : mFunctions)
>         {
>             // Skip unimplemented functions
>-            if (it.second.node)
>+            if (it.second.definitionNode)
>             {
>                 InitResult result = assignIndicesInternal(&it.second);
>                 if (result != INITDAG_SUCCESS)
>@@ -65,15 +64,14 @@ class CallDAG::CallDAGCreator : public TIntermTraverser
>         {
>             CreatorFunctionData &data = it.second;
>             // Skip unimplemented functions
>-            if (!data.node)
>+            if (!data.definitionNode)
>             {
>                 continue;
>             }
>             ASSERT(data.index < records->size());
>             Record &record = (*records)[data.index];
> 
>-            record.name = data.name.data();
>-            record.node = data.node;
>+            record.node = data.definitionNode;
> 
>             record.callees.reserve(data.callees.size());
>             for (auto &callee : data.callees)
>@@ -81,19 +79,20 @@ class CallDAG::CallDAGCreator : public TIntermTraverser
>                 record.callees.push_back(static_cast<int>(callee->index));
>             }
> 
>-            (*idToIndex)[data.node->getFunctionSymbolInfo()->getId().get()] =
>-                static_cast<int>(data.index);
>+            (*idToIndex)[it.first] = static_cast<int>(data.index);
>         }
>     }
> 
>   private:
>     struct CreatorFunctionData
>     {
>-        CreatorFunctionData() : node(nullptr), index(0), indexAssigned(false), visiting(false) {}
>+        CreatorFunctionData()
>+            : definitionNode(nullptr), name(""), index(0), indexAssigned(false), visiting(false)
>+        {}
> 
>         std::set<CreatorFunctionData *> callees;
>-        TIntermFunctionDefinition *node;
>-        TString name;
>+        TIntermFunctionDefinition *definitionNode;
>+        ImmutableString name;
>         size_t index;
>         bool indexAssigned;
>         bool visiting;
>@@ -101,54 +100,36 @@ class CallDAG::CallDAGCreator : public TIntermTraverser
> 
>     bool visitFunctionDefinition(Visit visit, TIntermFunctionDefinition *node) override
>     {
>-        // Create the record if need be and remember the node.
>-        if (visit == PreVisit)
>-        {
>-            auto it = mFunctions.find(node->getFunctionSymbolInfo()->getId().get());
>-
>-            if (it == mFunctions.end())
>-            {
>-                mCurrentFunction       = &mFunctions[node->getFunctionSymbolInfo()->getId().get()];
>-                mCurrentFunction->name = node->getFunctionSymbolInfo()->getName();
>-            }
>-            else
>-            {
>-                mCurrentFunction = &it->second;
>-                ASSERT(mCurrentFunction->name == node->getFunctionSymbolInfo()->getName());
>-            }
>-
>-            mCurrentFunction->node = node;
>-        }
>-        else if (visit == PostVisit)
>-        {
>-            mCurrentFunction = nullptr;
>-        }
>-        return true;
>+        // Create the record if need be and remember the definition node.
>+        mCurrentFunction = &mFunctions[node->getFunction()->uniqueId().get()];
>+        // Name will be overwritten here. If we've already traversed the prototype of this function,
>+        // it should have had the same name.
>+        ASSERT(mCurrentFunction->name == "" ||
>+               mCurrentFunction->name == node->getFunction()->name());
>+        mCurrentFunction->name           = node->getFunction()->name();
>+        mCurrentFunction->definitionNode = node;
>+
>+        node->getBody()->traverse(this);
>+        mCurrentFunction = nullptr;
>+        return false;
>     }
> 
>-    bool visitFunctionPrototype(Visit visit, TIntermFunctionPrototype *node) override
>+    void visitFunctionPrototype(TIntermFunctionPrototype *node) override
>     {
>-        ASSERT(visit == PreVisit);
>-        if (mCurrentFunction != nullptr)
>-        {
>-            return false;
>-        }
>+        ASSERT(mCurrentFunction == nullptr);
> 
>         // Function declaration, create an empty record.
>-        auto &record = mFunctions[node->getFunctionSymbolInfo()->getId().get()];
>-        record.name  = node->getFunctionSymbolInfo()->getName();
>-
>-        // No need to traverse the parameters.
>-        return false;
>+        auto &record = mFunctions[node->getFunction()->uniqueId().get()];
>+        record.name  = node->getFunction()->name();
>     }
> 
>-    // Aggregates the AST node for each function as well as the name of the functions called by it
>+    // Track functions called from another function.
>     bool visitAggregate(Visit visit, TIntermAggregate *node) override
>     {
>-        if (visit == PreVisit && node->getOp() == EOpCallFunctionInAST)
>+        if (node->getOp() == EOpCallFunctionInAST)
>         {
>             // Function call, add the callees
>-            auto it = mFunctions.find(node->getFunctionSymbolInfo()->getId().get());
>+            auto it = mFunctions.find(node->getFunction()->uniqueId().get());
>             ASSERT(it != mFunctions.end());
> 
>             // We might be traversing the initializer of a global variable. Even though function
>@@ -190,7 +171,7 @@ class CallDAG::CallDAGCreator : public TIntermTraverser
> 
>         InitResult result = INITDAG_SUCCESS;
> 
>-        std::stringstream errorStream;
>+        std::stringstream errorStream = sh::InitializeStream<std::stringstream>();
> 
>         while (!functionsToProcess.empty())
>         {
>@@ -206,7 +187,7 @@ class CallDAG::CallDAGCreator : public TIntermTraverser
>                 continue;
>             }
> 
>-            if (!function->node)
>+            if (!function->definitionNode)
>             {
>                 errorStream << "Undefined function '" << function->name
>                             << ")' used in the following call chain:";
>@@ -277,19 +258,15 @@ class CallDAG::CallDAGCreator : public TIntermTraverser
> 
> // CallDAG
> 
>-CallDAG::CallDAG()
>-{
>-}
>+CallDAG::CallDAG() {}
> 
>-CallDAG::~CallDAG()
>-{
>-}
>+CallDAG::~CallDAG() {}
> 
> const size_t CallDAG::InvalidIndex = std::numeric_limits<size_t>::max();
> 
>-size_t CallDAG::findIndex(const TFunctionSymbolInfo *functionInfo) const
>+size_t CallDAG::findIndex(const TSymbolUniqueId &id) const
> {
>-    auto it = mFunctionIdToIndex.find(functionInfo->getId().get());
>+    auto it = mFunctionIdToIndex.find(id.get());
> 
>     if (it == mFunctionIdToIndex.end())
>     {
>@@ -307,13 +284,6 @@ const CallDAG::Record &CallDAG::getRecordFromIndex(size_t index) const
>     return mRecords[index];
> }
> 
>-const CallDAG::Record &CallDAG::getRecord(const TIntermAggregate *function) const
>-{
>-    size_t index = findIndex(function->getFunctionSymbolInfo());
>-    ASSERT(index != InvalidIndex && index < mRecords.size());
>-    return mRecords[index];
>-}
>-
> size_t CallDAG::size() const
> {
>     return mRecords.size();
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/CallDAG.h b/Source/ThirdParty/ANGLE/src/compiler/translator/CallDAG.h
>index 155081c9a29..813fc75573c 100644
>--- a/Source/ThirdParty/ANGLE/src/compiler/translator/CallDAG.h
>+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/CallDAG.h
>@@ -24,10 +24,10 @@ namespace sh
> // This class is used to precompute that function call DAG so that it
> // can be reused by multiple analyses.
> //
>-// It stores a vector of function records, with one record per function.
>+// It stores a vector of function records, with one record per defined function.
> // Records are accessed by index but a function symbol id can be converted
>-// to the index of the corresponding record. The records mostly contain the
>-// AST node of the function and the indices of the function's callees.
>+// to the index of the corresponding record. The records contain the AST node
>+// of the function definition and the indices of the function's callees.
> //
> // In addition, records are in reverse topological order: a function F being
> // called by a function G will have index index(F) < index(G), that way
>@@ -41,8 +41,7 @@ class CallDAG : angle::NonCopyable
> 
>     struct Record
>     {
>-        std::string name;
>-        TIntermFunctionDefinition *node;
>+        TIntermFunctionDefinition *node;  // Guaranteed to be non-null.
>         std::vector<int> callees;
>     };
> 
>@@ -58,10 +57,9 @@ class CallDAG : angle::NonCopyable
>     InitResult init(TIntermNode *root, TDiagnostics *diagnostics);
> 
>     // Returns InvalidIndex if the function wasn't found
>-    size_t findIndex(const TFunctionSymbolInfo *functionInfo) const;
>+    size_t findIndex(const TSymbolUniqueId &id) const;
> 
>     const Record &getRecordFromIndex(size_t index) const;
>-    const Record &getRecord(const TIntermAggregate *function) const;
>     size_t size() const;
>     void clear();
> 
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/ClampPointSize.cpp b/Source/ThirdParty/ANGLE/src/compiler/translator/ClampPointSize.cpp
>deleted file mode 100644
>index 8598a137f53..00000000000
>--- a/Source/ThirdParty/ANGLE/src/compiler/translator/ClampPointSize.cpp
>+++ /dev/null
>@@ -1,47 +0,0 @@
>-//
>-// Copyright (c) 2017 The ANGLE Project Authors. All rights reserved.
>-// Use of this source code is governed by a BSD-style license that can be
>-// found in the LICENSE file.
>-//
>-// ClampPointSize.cpp: Limit the value that is written to gl_PointSize.
>-//
>-
>-#include "compiler/translator/ClampPointSize.h"
>-
>-#include "compiler/translator/FindSymbolNode.h"
>-#include "compiler/translator/IntermNode_util.h"
>-#include "compiler/translator/RunAtTheEndOfShader.h"
>-#include "compiler/translator/SymbolTable.h"
>-
>-namespace sh
>-{
>-
>-void ClampPointSize(TIntermBlock *root, float maxPointSize, TSymbolTable *symbolTable)
>-{
>-    // Only clamp gl_PointSize if it's used in the shader.
>-    if (!FindSymbolNode(root, TString("gl_PointSize"), EbtFloat))
>-    {
>-        return;
>-    }
>-
>-    TIntermSymbol *pointSizeNode = ReferenceBuiltInVariable("gl_PointSize", *symbolTable, 100);
>-
>-    TConstantUnion *maxPointSizeConstant = new TConstantUnion();
>-    maxPointSizeConstant->setFConst(maxPointSize);
>-    TIntermConstantUnion *maxPointSizeNode =
>-        new TIntermConstantUnion(maxPointSizeConstant, TType(EbtFloat, EbpHigh, EvqConst));
>-
>-    // min(gl_PointSize, maxPointSize)
>-    TIntermSequence *minArguments = new TIntermSequence();
>-    minArguments->push_back(pointSizeNode->deepCopy());
>-    minArguments->push_back(maxPointSizeNode);
>-    TIntermTyped *clampedPointSize =
>-        CreateBuiltInFunctionCallNode("min", minArguments, *symbolTable, 100);
>-
>-    // gl_PointSize = min(gl_PointSize, maxPointSize)
>-    TIntermBinary *assignPointSize = new TIntermBinary(EOpAssign, pointSizeNode, clampedPointSize);
>-
>-    RunAtTheEndOfShader(root, assignPointSize, symbolTable);
>-}
>-
>-}  // namespace sh
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/ClampPointSize.h b/Source/ThirdParty/ANGLE/src/compiler/translator/ClampPointSize.h
>deleted file mode 100644
>index 0c71ae6b0d2..00000000000
>--- a/Source/ThirdParty/ANGLE/src/compiler/translator/ClampPointSize.h
>+++ /dev/null
>@@ -1,22 +0,0 @@
>-//
>-// Copyright (c) 2017 The ANGLE Project Authors. All rights reserved.
>-// Use of this source code is governed by a BSD-style license that can be
>-// found in the LICENSE file.
>-//
>-// ClampPointSize.h: Limit the value that is written to gl_PointSize.
>-//
>-
>-#ifndef COMPILER_TRANSLATOR_CLAMPPOINTSIZE_H_
>-#define COMPILER_TRANSLATOR_CLAMPPOINTSIZE_H_
>-
>-namespace sh
>-{
>-
>-class TIntermBlock;
>-class TSymbolTable;
>-
>-void ClampPointSize(TIntermBlock *root, float maxPointSize, TSymbolTable *symbolTable);
>-
>-}  // namespace sh
>-
>-#endif  // COMPILER_TRANSLATOR_CLAMPPOINTSIZE_H_
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/CodeGen.cpp b/Source/ThirdParty/ANGLE/src/compiler/translator/CodeGen.cpp
>index 3e25cc2339a..6dc9485589f 100644
>--- a/Source/ThirdParty/ANGLE/src/compiler/translator/CodeGen.cpp
>+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/CodeGen.cpp
>@@ -5,19 +5,19 @@
> //
> 
> #ifdef ANGLE_ENABLE_ESSL
>-#include "compiler/translator/TranslatorESSL.h"
>+#    include "compiler/translator/TranslatorESSL.h"
> #endif  // ANGLE_ENABLE_ESSL
> 
> #ifdef ANGLE_ENABLE_GLSL
>-#include "compiler/translator/TranslatorGLSL.h"
>+#    include "compiler/translator/TranslatorGLSL.h"
> #endif  // ANGLE_ENABLE_GLSL
> 
> #ifdef ANGLE_ENABLE_HLSL
>-#include "compiler/translator/TranslatorHLSL.h"
>+#    include "compiler/translator/TranslatorHLSL.h"
> #endif  // ANGLE_ENABLE_HLSL
> 
> #ifdef ANGLE_ENABLE_VULKAN
>-#include "compiler/translator/TranslatorVulkan.h"
>+#    include "compiler/translator/TranslatorVulkan.h"
> #endif  // ANGLE_ENABLE_VULKAN
> 
> #include "compiler/translator/util.h"
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/CollectVariables.cpp b/Source/ThirdParty/ANGLE/src/compiler/translator/CollectVariables.cpp
>index bd8cbc971ab..cbaaf83b27d 100644
>--- a/Source/ThirdParty/ANGLE/src/compiler/translator/CollectVariables.cpp
>+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/CollectVariables.cpp
>@@ -10,8 +10,8 @@
> #include "angle_gl.h"
> #include "common/utilities.h"
> #include "compiler/translator/HashNames.h"
>-#include "compiler/translator/IntermTraverse.h"
> #include "compiler/translator/SymbolTable.h"
>+#include "compiler/translator/tree_util/IntermTraverse.h"
> #include "compiler/translator/util.h"
> 
> namespace sh
>@@ -38,7 +38,7 @@ BlockLayoutType GetBlockLayoutType(TLayoutBlockStorage blockStorage)
>     }
> }
> 
>-// TODO(jiawei.shao@intel.com): implement GL_OES_shader_io_blocks.
>+// TODO(jiawei.shao@intel.com): implement GL_EXT_shader_io_blocks.
> BlockType GetBlockType(TQualifier qualifier)
> {
>     switch (qualifier)
>@@ -56,37 +56,38 @@ BlockType GetBlockType(TQualifier qualifier)
> }
> 
> template <class VarT>
>-VarT *FindVariable(const TString &name, std::vector<VarT> *infoList)
>+VarT *FindVariable(const ImmutableString &name, std::vector<VarT> *infoList)
> {
>     // TODO(zmo): optimize this function.
>     for (size_t ii = 0; ii < infoList->size(); ++ii)
>     {
>-        if ((*infoList)[ii].name.c_str() == name)
>+        if (name == (*infoList)[ii].name)
>             return &((*infoList)[ii]);
>     }
> 
>     return nullptr;
> }
> 
>-// Note that this shouldn't be called for interface blocks - static use information is collected for
>+// Note that this shouldn't be called for interface blocks - active information is collected for
> // individual fields in case of interface blocks.
>-void MarkStaticallyUsed(ShaderVariable *variable)
>+void MarkActive(ShaderVariable *variable)
> {
>-    if (!variable->staticUse)
>+    if (!variable->active)
>     {
>         if (variable->isStruct())
>         {
>             // Conservatively assume all fields are statically used as well.
>             for (auto &field : variable->fields)
>             {
>-                MarkStaticallyUsed(&field);
>+                MarkActive(&field);
>             }
>         }
>-        variable->staticUse = true;
>+        ASSERT(variable->staticUse);
>+        variable->active = true;
>     }
> }
> 
>-ShaderVariable *FindVariableInInterfaceBlock(const TString &name,
>+ShaderVariable *FindVariableInInterfaceBlock(const ImmutableString &name,
>                                              const TInterfaceBlock *interfaceBlock,
>                                              std::vector<InterfaceBlock> *infoList)
> {
>@@ -96,6 +97,7 @@ ShaderVariable *FindVariableInInterfaceBlock(const TString &name,
> 
>     // Set static use on the parent interface block here
>     namedBlock->staticUse = true;
>+    namedBlock->active    = true;
>     return FindVariable(name, &namedBlock->fields);
> }
> 
>@@ -114,37 +116,45 @@ class CollectVariablesTraverser : public TIntermTraverser
>                               std::vector<InterfaceBlock> *inBlocks,
>                               ShHashFunction64 hashFunction,
>                               TSymbolTable *symbolTable,
>-                              int shaderVersion,
>                               GLenum shaderType,
>                               const TExtensionBehavior &extensionBehavior);
> 
>+    bool visitInvariantDeclaration(Visit visit, TIntermInvariantDeclaration *node) override;
>     void visitSymbol(TIntermSymbol *symbol) override;
>     bool visitDeclaration(Visit, TIntermDeclaration *node) override;
>     bool visitBinary(Visit visit, TIntermBinary *binaryNode) override;
> 
>   private:
>-    std::string getMappedName(const TName &name) const;
>-
>+    std::string getMappedName(const TSymbol *symbol) const;
>+
>+    void setFieldOrVariableProperties(const TType &type,
>+                                      bool staticUse,
>+                                      ShaderVariable *variableOut) const;
>+    void setFieldProperties(const TType &type,
>+                            const ImmutableString &name,
>+                            bool staticUse,
>+                            ShaderVariable *variableOut) const;
>     void setCommonVariableProperties(const TType &type,
>-                                     const TName &name,
>+                                     const TVariable &variable,
>                                      ShaderVariable *variableOut) const;
> 
>     Attribute recordAttribute(const TIntermSymbol &variable) const;
>     OutputVariable recordOutputVariable(const TIntermSymbol &variable) const;
>     Varying recordVarying(const TIntermSymbol &variable) const;
>-    void recordInterfaceBlock(const TType &interfaceBlockType,
>+    void recordInterfaceBlock(const char *instanceName,
>+                              const TType &interfaceBlockType,
>                               InterfaceBlock *interfaceBlock) const;
>     Uniform recordUniform(const TIntermSymbol &variable) const;
> 
>-    void setBuiltInInfoFromSymbolTable(const char *name, ShaderVariable *info);
>+    void setBuiltInInfoFromSymbol(const TVariable &variable, ShaderVariable *info);
> 
>-    void recordBuiltInVaryingUsed(const char *name,
>+    void recordBuiltInVaryingUsed(const TVariable &variable,
>                                   bool *addedFlag,
>                                   std::vector<Varying> *varyings);
>-    void recordBuiltInFragmentOutputUsed(const char *name, bool *addedFlag);
>-    void recordBuiltInAttributeUsed(const char *name, bool *addedFlag);
>+    void recordBuiltInFragmentOutputUsed(const TVariable &variable, bool *addedFlag);
>+    void recordBuiltInAttributeUsed(const TVariable &variable, bool *addedFlag);
>     InterfaceBlock *recordGLInUsed(const TType &glInType);
>-    InterfaceBlock *findNamedInterfaceBlock(const TString &name) const;
>+    InterfaceBlock *findNamedInterfaceBlock(const ImmutableString &name) const;
> 
>     std::vector<Attribute> *mAttribs;
>     std::vector<OutputVariable> *mOutputVariables;
>@@ -164,6 +174,7 @@ class CollectVariablesTraverser : public TIntermTraverser
>     bool mInstanceIDAdded;
>     bool mVertexIDAdded;
>     bool mPointSizeAdded;
>+    bool mDrawIDAdded;
> 
>     // Vertex Shader and Geometry Shader builtins
>     bool mPositionAdded;
>@@ -191,7 +202,6 @@ class CollectVariablesTraverser : public TIntermTraverser
> 
>     ShHashFunction64 mHashFunction;
> 
>-    int mShaderVersion;
>     GLenum mShaderType;
>     const TExtensionBehavior &mExtensionBehavior;
> };
>@@ -207,7 +217,6 @@ CollectVariablesTraverser::CollectVariablesTraverser(
>     std::vector<sh::InterfaceBlock> *inBlocks,
>     ShHashFunction64 hashFunction,
>     TSymbolTable *symbolTable,
>-    int shaderVersion,
>     GLenum shaderType,
>     const TExtensionBehavior &extensionBehavior)
>     : TIntermTraverser(true, false, false, symbolTable),
>@@ -223,6 +232,7 @@ CollectVariablesTraverser::CollectVariablesTraverser(
>       mInstanceIDAdded(false),
>       mVertexIDAdded(false),
>       mPointSizeAdded(false),
>+      mDrawIDAdded(false),
>       mPositionAdded(false),
>       mPointCoordAdded(false),
>       mFrontFacingAdded(false),
>@@ -240,36 +250,31 @@ CollectVariablesTraverser::CollectVariablesTraverser(
>       mPrimitiveIDAdded(false),
>       mLayerAdded(false),
>       mHashFunction(hashFunction),
>-      mShaderVersion(shaderVersion),
>       mShaderType(shaderType),
>       mExtensionBehavior(extensionBehavior)
>-{
>-}
>+{}
> 
>-std::string CollectVariablesTraverser::getMappedName(const TName &name) const
>+std::string CollectVariablesTraverser::getMappedName(const TSymbol *symbol) const
> {
>-    return HashName(name, mHashFunction, nullptr).c_str();
>+    return HashName(symbol, mHashFunction, nullptr).data();
> }
> 
>-void CollectVariablesTraverser::setBuiltInInfoFromSymbolTable(const char *name,
>-                                                              ShaderVariable *info)
>+void CollectVariablesTraverser::setBuiltInInfoFromSymbol(const TVariable &variable,
>+                                                         ShaderVariable *info)
> {
>-    TVariable *symbolTableVar =
>-        reinterpret_cast<TVariable *>(mSymbolTable->findBuiltIn(name, mShaderVersion));
>-    ASSERT(symbolTableVar);
>-    const TType &type = symbolTableVar->getType();
>+    const TType &type = variable.getType();
> 
>-    info->name       = name;
>-    info->mappedName = name;
>+    info->name       = variable.name().data();
>+    info->mappedName = variable.name().data();
>     info->type       = GLVariableType(type);
>-    info->precision = GLVariablePrecision(type);
>+    info->precision  = GLVariablePrecision(type);
>     if (auto *arraySizes = type.getArraySizes())
>     {
>         info->arraySizes.assign(arraySizes->begin(), arraySizes->end());
>     }
> }
> 
>-void CollectVariablesTraverser::recordBuiltInVaryingUsed(const char *name,
>+void CollectVariablesTraverser::recordBuiltInVaryingUsed(const TVariable &variable,
>                                                          bool *addedFlag,
>                                                          std::vector<Varying> *varyings)
> {
>@@ -277,33 +282,38 @@ void CollectVariablesTraverser::recordBuiltInVaryingUsed(const char *name,
>     if (!(*addedFlag))
>     {
>         Varying info;
>-        setBuiltInInfoFromSymbolTable(name, &info);
>+        setBuiltInInfoFromSymbol(variable, &info);
>         info.staticUse   = true;
>-        info.isInvariant = mSymbolTable->isVaryingInvariant(name);
>+        info.active      = true;
>+        info.isInvariant = mSymbolTable->isVaryingInvariant(variable);
>         varyings->push_back(info);
>         (*addedFlag) = true;
>     }
> }
> 
>-void CollectVariablesTraverser::recordBuiltInFragmentOutputUsed(const char *name, bool *addedFlag)
>+void CollectVariablesTraverser::recordBuiltInFragmentOutputUsed(const TVariable &variable,
>+                                                                bool *addedFlag)
> {
>     if (!(*addedFlag))
>     {
>         OutputVariable info;
>-        setBuiltInInfoFromSymbolTable(name, &info);
>+        setBuiltInInfoFromSymbol(variable, &info);
>         info.staticUse = true;
>+        info.active    = true;
>         mOutputVariables->push_back(info);
>         (*addedFlag) = true;
>     }
> }
> 
>-void CollectVariablesTraverser::recordBuiltInAttributeUsed(const char *name, bool *addedFlag)
>+void CollectVariablesTraverser::recordBuiltInAttributeUsed(const TVariable &variable,
>+                                                           bool *addedFlag)
> {
>     if (!(*addedFlag))
>     {
>         Attribute info;
>-        setBuiltInInfoFromSymbolTable(name, &info);
>+        setBuiltInInfoFromSymbol(variable, &info);
>         info.staticUse = true;
>+        info.active    = true;
>         info.location  = -1;
>         mAttribs->push_back(info);
>         (*addedFlag) = true;
>@@ -316,8 +326,7 @@ InterfaceBlock *CollectVariablesTraverser::recordGLInUsed(const TType &glInType)
>     {
>         ASSERT(glInType.getQualifier() == EvqPerVertexIn);
>         InterfaceBlock info;
>-        recordInterfaceBlock(glInType, &info);
>-        info.staticUse = true;
>+        recordInterfaceBlock("gl_in", glInType, &info);
> 
>         mPerVertexInAdded = true;
>         mInBlocks->push_back(info);
>@@ -325,33 +334,45 @@ InterfaceBlock *CollectVariablesTraverser::recordGLInUsed(const TType &glInType)
>     }
>     else
>     {
>-        return FindVariable("gl_PerVertex", mInBlocks);
>+        return FindVariable(ImmutableString("gl_PerVertex"), mInBlocks);
>     }
> }
> 
>-// We want to check whether a uniform/varying is statically used
>-// because we only count the used ones in packing computing.
>-// Also, gl_FragCoord, gl_PointCoord, and gl_FrontFacing count
>-// toward varying counting if they are statically used in a fragment
>-// shader.
>+bool CollectVariablesTraverser::visitInvariantDeclaration(Visit visit,
>+                                                          TIntermInvariantDeclaration *node)
>+{
>+    // We should not mark variables as active just based on an invariant declaration, so we don't
>+    // traverse the symbols declared invariant.
>+    return false;
>+}
>+
>+// We want to check whether a uniform/varying is active because we need to skip updating inactive
>+// ones. We also only count the active ones in packing computing. Also, gl_FragCoord, gl_PointCoord,
>+// and gl_FrontFacing count toward varying counting if they are active in a fragment shader.
> void CollectVariablesTraverser::visitSymbol(TIntermSymbol *symbol)
> {
>     ASSERT(symbol != nullptr);
> 
>-    if (symbol->getName().isInternal())
>+    if (symbol->variable().symbolType() == SymbolType::AngleInternal ||
>+        symbol->variable().symbolType() == SymbolType::Empty)
>     {
>-        // Internal variables are not collected.
>+        // Internal variables or nameless variables are not collected.
>         return;
>     }
> 
>-    ShaderVariable *var       = nullptr;
>-    const TString &symbolName = symbol->getName().getString();
>+    ShaderVariable *var = nullptr;
> 
>-    if (IsVaryingIn(symbol->getQualifier()))
>+    const ImmutableString &symbolName = symbol->getName();
>+
>+    // Check the qualifier from the variable, not from the symbol node. The node may have a
>+    // different qualifier if it's the result of a folded ternary node.
>+    TQualifier qualifier = symbol->variable().getType().getQualifier();
>+
>+    if (IsVaryingIn(qualifier))
>     {
>         var = FindVariable(symbolName, mInputVaryings);
>     }
>-    else if (IsVaryingOut(symbol->getQualifier()))
>+    else if (IsVaryingOut(qualifier))
>     {
>         var = FindVariable(symbolName, mOutputVaryings);
>     }
>@@ -361,7 +382,7 @@ void CollectVariablesTraverser::visitSymbol(TIntermSymbol *symbol)
>     }
>     else if (symbolName == "gl_DepthRange")
>     {
>-        ASSERT(symbol->getQualifier() == EvqUniform);
>+        ASSERT(qualifier == EvqUniform);
> 
>         if (!mDepthRangeAdded)
>         {
>@@ -372,6 +393,7 @@ void CollectVariablesTraverser::visitSymbol(TIntermSymbol *symbol)
>             info.type          = GL_NONE;
>             info.precision     = GL_NONE;
>             info.staticUse     = true;
>+            info.active        = true;
> 
>             ShaderVariable nearInfo(GL_FLOAT);
>             const char kNearName[] = "near";
>@@ -379,6 +401,7 @@ void CollectVariablesTraverser::visitSymbol(TIntermSymbol *symbol)
>             nearInfo.mappedName    = kNearName;
>             nearInfo.precision     = GL_HIGH_FLOAT;
>             nearInfo.staticUse     = true;
>+            nearInfo.active        = true;
> 
>             ShaderVariable farInfo(GL_FLOAT);
>             const char kFarName[] = "far";
>@@ -386,6 +409,7 @@ void CollectVariablesTraverser::visitSymbol(TIntermSymbol *symbol)
>             farInfo.mappedName    = kFarName;
>             farInfo.precision     = GL_HIGH_FLOAT;
>             farInfo.staticUse     = true;
>+            farInfo.active        = true;
> 
>             ShaderVariable diffInfo(GL_FLOAT);
>             const char kDiffName[] = "diff";
>@@ -393,6 +417,7 @@ void CollectVariablesTraverser::visitSymbol(TIntermSymbol *symbol)
>             diffInfo.mappedName    = kDiffName;
>             diffInfo.precision     = GL_HIGH_FLOAT;
>             diffInfo.staticUse     = true;
>+            diffInfo.active        = true;
> 
>             info.fields.push_back(nearInfo);
>             info.fields.push_back(farInfo);
>@@ -404,7 +429,7 @@ void CollectVariablesTraverser::visitSymbol(TIntermSymbol *symbol)
>     }
>     else
>     {
>-        switch (symbol->getQualifier())
>+        switch (qualifier)
>         {
>             case EvqAttribute:
>             case EvqVertexIn:
>@@ -426,7 +451,7 @@ void CollectVariablesTraverser::visitSymbol(TIntermSymbol *symbol)
>                 }
> 
>                 // It's an internal error to reference an undefined user uniform
>-                ASSERT(symbolName.compare(0, 3, "gl_") != 0 || var);
>+                ASSERT(!symbolName.beginsWith("gl_") || var);
>             }
>             break;
>             case EvqBuffer:
>@@ -437,108 +462,99 @@ void CollectVariablesTraverser::visitSymbol(TIntermSymbol *symbol)
>             }
>             break;
>             case EvqFragCoord:
>-                recordBuiltInVaryingUsed("gl_FragCoord", &mFragCoordAdded, mInputVaryings);
>+                recordBuiltInVaryingUsed(symbol->variable(), &mFragCoordAdded, mInputVaryings);
>                 return;
>             case EvqFrontFacing:
>-                recordBuiltInVaryingUsed("gl_FrontFacing", &mFrontFacingAdded, mInputVaryings);
>+                recordBuiltInVaryingUsed(symbol->variable(), &mFrontFacingAdded, mInputVaryings);
>                 return;
>             case EvqPointCoord:
>-                recordBuiltInVaryingUsed("gl_PointCoord", &mPointCoordAdded, mInputVaryings);
>+                recordBuiltInVaryingUsed(symbol->variable(), &mPointCoordAdded, mInputVaryings);
>                 return;
>             case EvqInstanceID:
>                 // Whenever the SH_INITIALIZE_BUILTINS_FOR_INSTANCED_MULTIVIEW option is set,
>                 // gl_InstanceID is added inside expressions to initialize ViewID_OVR and
>-                // InstanceID. gl_InstanceID is not added to the symbol table for ESSL1 shaders
>-                // which makes it necessary to populate the type information explicitly instead of
>-                // extracting it from the symbol table.
>-                if (!mInstanceIDAdded)
>-                {
>-                    Attribute info;
>-                    const char kName[] = "gl_InstanceID";
>-                    info.name          = kName;
>-                    info.mappedName    = kName;
>-                    info.type          = GL_INT;
>-                    info.precision     = GL_HIGH_INT;  // Defined by spec.
>-                    info.staticUse     = true;
>-                    info.location      = -1;
>-                    mAttribs->push_back(info);
>-                    mInstanceIDAdded = true;
>-                }
>+                // InstanceID. Note that gl_InstanceID is not added to the symbol table for ESSL1
>+                // shaders.
>+                recordBuiltInAttributeUsed(symbol->variable(), &mInstanceIDAdded);
>                 return;
>             case EvqVertexID:
>-                recordBuiltInAttributeUsed("gl_VertexID", &mVertexIDAdded);
>+                recordBuiltInAttributeUsed(symbol->variable(), &mVertexIDAdded);
>                 return;
>             case EvqPosition:
>-                recordBuiltInVaryingUsed("gl_Position", &mPositionAdded, mOutputVaryings);
>+                recordBuiltInVaryingUsed(symbol->variable(), &mPositionAdded, mOutputVaryings);
>                 return;
>             case EvqPointSize:
>-                recordBuiltInVaryingUsed("gl_PointSize", &mPointSizeAdded, mOutputVaryings);
>+                recordBuiltInVaryingUsed(symbol->variable(), &mPointSizeAdded, mOutputVaryings);
>+                return;
>+            case EvqDrawID:
>+                recordBuiltInAttributeUsed(symbol->variable(), &mDrawIDAdded);
>                 return;
>             case EvqLastFragData:
>-                recordBuiltInVaryingUsed("gl_LastFragData", &mLastFragDataAdded, mInputVaryings);
>+                recordBuiltInVaryingUsed(symbol->variable(), &mLastFragDataAdded, mInputVaryings);
>                 return;
>             case EvqFragColor:
>-                recordBuiltInFragmentOutputUsed("gl_FragColor", &mFragColorAdded);
>+                recordBuiltInFragmentOutputUsed(symbol->variable(), &mFragColorAdded);
>                 return;
>             case EvqFragData:
>                 if (!mFragDataAdded)
>                 {
>                     OutputVariable info;
>-                    setBuiltInInfoFromSymbolTable("gl_FragData", &info);
>+                    setBuiltInInfoFromSymbol(symbol->variable(), &info);
>                     if (!IsExtensionEnabled(mExtensionBehavior, TExtension::EXT_draw_buffers))
>                     {
>                         ASSERT(info.arraySizes.size() == 1u);
>                         info.arraySizes.back() = 1u;
>                     }
>                     info.staticUse = true;
>+                    info.active    = true;
>                     mOutputVariables->push_back(info);
>                     mFragDataAdded = true;
>                 }
>                 return;
>             case EvqFragDepthEXT:
>-                recordBuiltInFragmentOutputUsed("gl_FragDepthEXT", &mFragDepthEXTAdded);
>+                recordBuiltInFragmentOutputUsed(symbol->variable(), &mFragDepthEXTAdded);
>                 return;
>             case EvqFragDepth:
>-                recordBuiltInFragmentOutputUsed("gl_FragDepth", &mFragDepthAdded);
>+                recordBuiltInFragmentOutputUsed(symbol->variable(), &mFragDepthAdded);
>                 return;
>             case EvqSecondaryFragColorEXT:
>-                recordBuiltInFragmentOutputUsed("gl_SecondaryFragColorEXT",
>-                                                &mSecondaryFragColorEXTAdded);
>+                recordBuiltInFragmentOutputUsed(symbol->variable(), &mSecondaryFragColorEXTAdded);
>                 return;
>             case EvqSecondaryFragDataEXT:
>-                recordBuiltInFragmentOutputUsed("gl_SecondaryFragDataEXT",
>-                                                &mSecondaryFragDataEXTAdded);
>+                recordBuiltInFragmentOutputUsed(symbol->variable(), &mSecondaryFragDataEXTAdded);
>                 return;
>             case EvqInvocationID:
>-                recordBuiltInVaryingUsed("gl_InvocationID", &mInvocationIDAdded, mInputVaryings);
>+                recordBuiltInVaryingUsed(symbol->variable(), &mInvocationIDAdded, mInputVaryings);
>                 break;
>             case EvqPrimitiveIDIn:
>-                recordBuiltInVaryingUsed("gl_PrimitiveIDIn", &mPrimitiveIDInAdded, mInputVaryings);
>+                recordBuiltInVaryingUsed(symbol->variable(), &mPrimitiveIDInAdded, mInputVaryings);
>                 break;
>             case EvqPrimitiveID:
>-                if (mShaderType == GL_GEOMETRY_SHADER_OES)
>+                if (mShaderType == GL_GEOMETRY_SHADER_EXT)
>                 {
>-                    recordBuiltInVaryingUsed("gl_PrimitiveID", &mPrimitiveIDAdded, mOutputVaryings);
>+                    recordBuiltInVaryingUsed(symbol->variable(), &mPrimitiveIDAdded,
>+                                             mOutputVaryings);
>                 }
>                 else
>                 {
>                     ASSERT(mShaderType == GL_FRAGMENT_SHADER);
>-                    recordBuiltInVaryingUsed("gl_PrimitiveID", &mPrimitiveIDAdded, mInputVaryings);
>+                    recordBuiltInVaryingUsed(symbol->variable(), &mPrimitiveIDAdded,
>+                                             mInputVaryings);
>                 }
>                 break;
>             case EvqLayer:
>-                if (mShaderType == GL_GEOMETRY_SHADER_OES)
>+                if (mShaderType == GL_GEOMETRY_SHADER_EXT)
>                 {
>-                    recordBuiltInVaryingUsed("gl_Layer", &mLayerAdded, mOutputVaryings);
>+                    recordBuiltInVaryingUsed(symbol->variable(), &mLayerAdded, mOutputVaryings);
>                 }
>                 else if (mShaderType == GL_FRAGMENT_SHADER)
>                 {
>-                    recordBuiltInVaryingUsed("gl_Layer", &mLayerAdded, mInputVaryings);
>+                    recordBuiltInVaryingUsed(symbol->variable(), &mLayerAdded, mInputVaryings);
>                 }
>                 else
>                 {
>                     ASSERT(mShaderType == GL_VERTEX_SHADER &&
>-                           IsExtensionEnabled(mExtensionBehavior, TExtension::OVR_multiview));
>+                           IsExtensionEnabled(mExtensionBehavior, TExtension::OVR_multiview2));
>                 }
>                 break;
>             default:
>@@ -547,18 +563,19 @@ void CollectVariablesTraverser::visitSymbol(TIntermSymbol *symbol)
>     }
>     if (var)
>     {
>-        MarkStaticallyUsed(var);
>+        MarkActive(var);
>     }
> }
> 
>-void CollectVariablesTraverser::setCommonVariableProperties(const TType &type,
>-                                                            const TName &name,
>-                                                            ShaderVariable *variableOut) const
>+void CollectVariablesTraverser::setFieldOrVariableProperties(const TType &type,
>+                                                             bool staticUse,
>+                                                             ShaderVariable *variableOut) const
> {
>     ASSERT(variableOut);
> 
>-    const TStructure *structure = type.getStruct();
>+    variableOut->staticUse = staticUse;
> 
>+    const TStructure *structure = type.getStruct();
>     if (!structure)
>     {
>         variableOut->type      = GLVariableType(type);
>@@ -567,36 +584,60 @@ void CollectVariablesTraverser::setCommonVariableProperties(const TType &type,
>     else
>     {
>         // Structures use a NONE type that isn't exposed outside ANGLE.
>-        variableOut->type       = GL_NONE;
>-        variableOut->structName = structure->name().c_str();
>+        variableOut->type = GL_NONE;
>+        if (structure->symbolType() != SymbolType::Empty)
>+        {
>+            variableOut->structName = structure->name().data();
>+        }
> 
>         const TFieldList &fields = structure->fields();
> 
>-        for (TField *field : fields)
>+        for (const TField *field : fields)
>         {
>             // Regardless of the variable type (uniform, in/out etc.) its fields are always plain
>             // ShaderVariable objects.
>             ShaderVariable fieldVariable;
>-            setCommonVariableProperties(*field->type(), TName(field->name()), &fieldVariable);
>+            setFieldProperties(*field->type(), field->name(), staticUse, &fieldVariable);
>             variableOut->fields.push_back(fieldVariable);
>         }
>     }
>-    variableOut->name       = name.getString().c_str();
>-    variableOut->mappedName = getMappedName(name);
>-
>     if (auto *arraySizes = type.getArraySizes())
>     {
>         variableOut->arraySizes.assign(arraySizes->begin(), arraySizes->end());
>     }
> }
> 
>+void CollectVariablesTraverser::setFieldProperties(const TType &type,
>+                                                   const ImmutableString &name,
>+                                                   bool staticUse,
>+                                                   ShaderVariable *variableOut) const
>+{
>+    ASSERT(variableOut);
>+    setFieldOrVariableProperties(type, staticUse, variableOut);
>+    variableOut->name.assign(name.data(), name.length());
>+    variableOut->mappedName = HashName(name, mHashFunction, nullptr).data();
>+}
>+
>+void CollectVariablesTraverser::setCommonVariableProperties(const TType &type,
>+                                                            const TVariable &variable,
>+                                                            ShaderVariable *variableOut) const
>+{
>+    ASSERT(variableOut);
>+
>+    variableOut->staticUse = mSymbolTable->isStaticallyUsed(variable);
>+    setFieldOrVariableProperties(type, variableOut->staticUse, variableOut);
>+    ASSERT(variable.symbolType() != SymbolType::Empty);
>+    variableOut->name.assign(variable.name().data(), variable.name().length());
>+    variableOut->mappedName = getMappedName(&variable);
>+}
>+
> Attribute CollectVariablesTraverser::recordAttribute(const TIntermSymbol &variable) const
> {
>     const TType &type = variable.getType();
>     ASSERT(!type.getStruct());
> 
>     Attribute attribute;
>-    setCommonVariableProperties(type, variable.getName(), &attribute);
>+    setCommonVariableProperties(type, variable.variable(), &attribute);
> 
>     attribute.location = type.getLayoutQualifier().location;
>     return attribute;
>@@ -608,9 +649,10 @@ OutputVariable CollectVariablesTraverser::recordOutputVariable(const TIntermSymb
>     ASSERT(!type.getStruct());
> 
>     OutputVariable outputVariable;
>-    setCommonVariableProperties(type, variable.getName(), &outputVariable);
>+    setCommonVariableProperties(type, variable.variable(), &outputVariable);
> 
>     outputVariable.location = type.getLayoutQualifier().location;
>+    outputVariable.index    = type.getLayoutQualifier().index;
>     return outputVariable;
> }
> 
>@@ -619,7 +661,7 @@ Varying CollectVariablesTraverser::recordVarying(const TIntermSymbol &variable)
>     const TType &type = variable.getType();
> 
>     Varying varying;
>-    setCommonVariableProperties(type, variable.getName(), &varying);
>+    setCommonVariableProperties(type, variable.variable(), &varying);
>     varying.location = type.getLayoutQualifier().location;
> 
>     switch (type.getQualifier())
>@@ -631,8 +673,7 @@ Varying CollectVariablesTraverser::recordVarying(const TIntermSymbol &variable)
>         case EvqFlatOut:
>         case EvqCentroidOut:
>         case EvqGeometryOut:
>-            if (mSymbolTable->isVaryingInvariant(std::string(variable.getSymbol().c_str())) ||
>-                type.isInvariant())
>+            if (mSymbolTable->isVaryingInvariant(variable.variable()) || type.isInvariant())
>             {
>                 varying.isInvariant = true;
>             }
>@@ -645,8 +686,9 @@ Varying CollectVariablesTraverser::recordVarying(const TIntermSymbol &variable)
>     return varying;
> }
> 
>-// TODO(jiawei.shao@intel.com): implement GL_OES_shader_io_blocks.
>-void CollectVariablesTraverser::recordInterfaceBlock(const TType &interfaceBlockType,
>+// TODO(jiawei.shao@intel.com): implement GL_EXT_shader_io_blocks.
>+void CollectVariablesTraverser::recordInterfaceBlock(const char *instanceName,
>+                                                     const TType &interfaceBlockType,
>                                                      InterfaceBlock *interfaceBlock) const
> {
>     ASSERT(interfaceBlockType.getBasicType() == EbtInterfaceBlock);
>@@ -655,42 +697,82 @@ void CollectVariablesTraverser::recordInterfaceBlock(const TType &interfaceBlock
>     const TInterfaceBlock *blockType = interfaceBlockType.getInterfaceBlock();
>     ASSERT(blockType);
> 
>-    interfaceBlock->name       = blockType->name().c_str();
>-    interfaceBlock->mappedName = getMappedName(TName(blockType->name()));
>-    interfaceBlock->instanceName =
>-        (blockType->hasInstanceName() ? blockType->instanceName().c_str() : "");
>+    interfaceBlock->name       = blockType->name().data();
>+    interfaceBlock->mappedName = getMappedName(blockType);
>+    if (instanceName != nullptr)
>+    {
>+        interfaceBlock->instanceName = instanceName;
>+        const TSymbol *blockSymbol   = nullptr;
>+        if (strncmp(instanceName, "gl_in", 5u) == 0)
>+        {
>+            blockSymbol = mSymbolTable->getGlInVariableWithArraySize();
>+        }
>+        else
>+        {
>+            blockSymbol = mSymbolTable->findGlobal(ImmutableString(instanceName));
>+        }
>+        ASSERT(blockSymbol && blockSymbol->isVariable());
>+        interfaceBlock->staticUse =
>+            mSymbolTable->isStaticallyUsed(*static_cast<const TVariable *>(blockSymbol));
>+    }
>     ASSERT(!interfaceBlockType.isArrayOfArrays());  // Disallowed by GLSL ES 3.10 section 4.3.9
>-    interfaceBlock->arraySize = interfaceBlockType.isArray() ? interfaceBlockType.getOutermostArraySize() : 0;
>+    interfaceBlock->arraySize =
>+        interfaceBlockType.isArray() ? interfaceBlockType.getOutermostArraySize() : 0;
> 
>     interfaceBlock->blockType = GetBlockType(interfaceBlockType.getQualifier());
>     if (interfaceBlock->blockType == BlockType::BLOCK_UNIFORM ||
>         interfaceBlock->blockType == BlockType::BLOCK_BUFFER)
>     {
>-        interfaceBlock->isRowMajorLayout = (blockType->matrixPacking() == EmpRowMajor);
>+        // TODO(oetuaho): Remove setting isRowMajorLayout.
>+        interfaceBlock->isRowMajorLayout = false;
>         interfaceBlock->binding          = blockType->blockBinding();
>         interfaceBlock->layout           = GetBlockLayoutType(blockType->blockStorage());
>     }
> 
>     // Gather field information
>+    bool anyFieldStaticallyUsed = false;
>     for (const TField *field : blockType->fields())
>     {
>         const TType &fieldType = *field->type();
> 
>+        bool staticUse = false;
>+        if (instanceName == nullptr)
>+        {
>+            // Static use of individual fields has been recorded, since they are present in the
>+            // symbol table as variables.
>+            const TSymbol *fieldSymbol = mSymbolTable->findGlobal(field->name());
>+            ASSERT(fieldSymbol && fieldSymbol->isVariable());
>+            staticUse =
>+                mSymbolTable->isStaticallyUsed(*static_cast<const TVariable *>(fieldSymbol));
>+            if (staticUse)
>+            {
>+                anyFieldStaticallyUsed = true;
>+            }
>+        }
>+
>         InterfaceBlockField fieldVariable;
>-        setCommonVariableProperties(fieldType, TName(field->name()), &fieldVariable);
>+        setFieldProperties(fieldType, field->name(), staticUse, &fieldVariable);
>         fieldVariable.isRowMajorLayout =
>             (fieldType.getLayoutQualifier().matrixPacking == EmpRowMajor);
>         interfaceBlock->fields.push_back(fieldVariable);
>     }
>+    if (anyFieldStaticallyUsed)
>+    {
>+        interfaceBlock->staticUse = true;
>+    }
> }
> 
> Uniform CollectVariablesTraverser::recordUniform(const TIntermSymbol &variable) const
> {
>     Uniform uniform;
>-    setCommonVariableProperties(variable.getType(), variable.getName(), &uniform);
>-    uniform.binding  = variable.getType().getLayoutQualifier().binding;
>-    uniform.location = variable.getType().getLayoutQualifier().location;
>-    uniform.offset   = variable.getType().getLayoutQualifier().offset;
>+    setCommonVariableProperties(variable.getType(), variable.variable(), &uniform);
>+    uniform.binding = variable.getType().getLayoutQualifier().binding;
>+    uniform.imageUnitFormat =
>+        GetImageInternalFormatType(variable.getType().getLayoutQualifier().imageInternalFormat);
>+    uniform.location  = variable.getType().getLayoutQualifier().location;
>+    uniform.offset    = variable.getType().getLayoutQualifier().offset;
>+    uniform.readonly  = variable.getType().getMemoryQualifier().readonly;
>+    uniform.writeonly = variable.getType().getMemoryQualifier().writeonly;
>     return uniform;
> }
> 
>@@ -718,17 +800,20 @@ bool CollectVariablesTraverser::visitDeclaration(Visit, TIntermDeclaration *node
>         // uniforms, varyings, outputs and interface blocks cannot be initialized in a shader, we
>         // must have only TIntermSymbol nodes in the sequence in the cases we are interested in.
>         const TIntermSymbol &variable = *variableNode->getAsSymbolNode();
>-        if (variable.getName().isInternal())
>+        if (variable.variable().symbolType() == SymbolType::AngleInternal)
>         {
>             // Internal variables are not collected.
>             continue;
>         }
> 
>-        // TODO(jiawei.shao@intel.com): implement GL_OES_shader_io_blocks.
>+        // TODO(jiawei.shao@intel.com): implement GL_EXT_shader_io_blocks.
>         if (typedNode.getBasicType() == EbtInterfaceBlock)
>         {
>             InterfaceBlock interfaceBlock;
>-            recordInterfaceBlock(variable.getType(), &interfaceBlock);
>+            recordInterfaceBlock(variable.variable().symbolType() != SymbolType::Empty
>+                                     ? variable.getName().data()
>+                                     : nullptr,
>+                                 variable.getType(), &interfaceBlock);
> 
>             switch (qualifier)
>             {
>@@ -744,6 +829,7 @@ bool CollectVariablesTraverser::visitDeclaration(Visit, TIntermDeclaration *node
>         }
>         else
>         {
>+            ASSERT(variable.variable().symbolType() != SymbolType::Empty);
>             switch (qualifier)
>             {
>                 case EvqAttribute:
>@@ -777,8 +863,9 @@ bool CollectVariablesTraverser::visitDeclaration(Visit, TIntermDeclaration *node
> }
> 
> // TODO(jiawei.shao@intel.com): add search on mInBlocks and mOutBlocks when implementing
>-// GL_OES_shader_io_blocks.
>-InterfaceBlock *CollectVariablesTraverser::findNamedInterfaceBlock(const TString &blockName) const
>+// GL_EXT_shader_io_blocks.
>+InterfaceBlock *CollectVariablesTraverser::findNamedInterfaceBlock(
>+    const ImmutableString &blockName) const
> {
>     InterfaceBlock *namedBlock = FindVariable(blockName, mUniformBlocks);
>     if (!namedBlock)
>@@ -792,7 +879,7 @@ bool CollectVariablesTraverser::visitBinary(Visit, TIntermBinary *binaryNode)
> {
>     if (binaryNode->getOp() == EOpIndexDirectInterfaceBlock)
>     {
>-        // NOTE: we do not determine static use for individual blocks of an array
>+        // NOTE: we do not determine static use / activeness for individual blocks of an array.
>         TIntermTyped *blockNode = binaryNode->getLeft()->getAsTyped();
>         ASSERT(blockNode);
> 
>@@ -826,10 +913,15 @@ bool CollectVariablesTraverser::visitBinary(Visit, TIntermBinary *binaryNode)
>             namedBlock = findNamedInterfaceBlock(interfaceBlock->name());
>         }
>         ASSERT(namedBlock);
>-        namedBlock->staticUse   = true;
>+        ASSERT(namedBlock->staticUse);
>+        namedBlock->active      = true;
>         unsigned int fieldIndex = static_cast<unsigned int>(constantUnion->getIConst(0));
>         ASSERT(fieldIndex < namedBlock->fields.size());
>+        // TODO(oetuaho): Would be nicer to record static use of fields of named interface blocks
>+        // more accurately at parse time - now we only mark the fields statically used if they are
>+        // active. http://anglebug.com/2440
>         namedBlock->fields[fieldIndex].staticUse = true;
>+        namedBlock->fields[fieldIndex].active    = true;
> 
>         if (traverseIndexExpression)
>         {
>@@ -855,14 +947,12 @@ void CollectVariables(TIntermBlock *root,
>                       std::vector<InterfaceBlock> *inBlocks,
>                       ShHashFunction64 hashFunction,
>                       TSymbolTable *symbolTable,
>-                      int shaderVersion,
>                       GLenum shaderType,
>                       const TExtensionBehavior &extensionBehavior)
> {
>     CollectVariablesTraverser collect(attributes, outputVariables, uniforms, inputVaryings,
>                                       outputVaryings, uniformBlocks, shaderStorageBlocks, inBlocks,
>-                                      hashFunction, symbolTable, shaderVersion, shaderType,
>-                                      extensionBehavior);
>+                                      hashFunction, symbolTable, shaderType, extensionBehavior);
>     root->traverse(&collect);
> }
> 
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/CollectVariables.h b/Source/ThirdParty/ANGLE/src/compiler/translator/CollectVariables.h
>index 4d0d1192e0d..84494a1433c 100644
>--- a/Source/ThirdParty/ANGLE/src/compiler/translator/CollectVariables.h
>+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/CollectVariables.h
>@@ -29,9 +29,8 @@ void CollectVariables(TIntermBlock *root,
>                       std::vector<InterfaceBlock> *inBlocks,
>                       ShHashFunction64 hashFunction,
>                       TSymbolTable *symbolTable,
>-                      int shaderVersion,
>                       GLenum shaderType,
>                       const TExtensionBehavior &extensionBehavior);
>-}
>+}  // namespace sh
> 
> #endif  // COMPILER_TRANSLATOR_COLLECTVARIABLES_H_
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/Common.h b/Source/ThirdParty/ANGLE/src/compiler/translator/Common.h
>index cb3a680d85a..179cfe21ee5 100644
>--- a/Source/ThirdParty/ANGLE/src/compiler/translator/Common.h
>+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/Common.h
>@@ -7,13 +7,13 @@
> #ifndef COMPILER_TRANSLATOR_COMMON_H_
> #define COMPILER_TRANSLATOR_COMMON_H_
> 
>+#include <stdio.h>
>+#include <limits>
> #include <map>
> #include <sstream>
> #include <string>
> #include <unordered_map>
> #include <vector>
>-#include <limits>
>-#include <stdio.h>
> 
> #include "common/angleutils.h"
> #include "common/debug.h"
>@@ -34,7 +34,7 @@ struct TSourceLoc
> //
> // Put POOL_ALLOCATOR_NEW_DELETE in base classes to make them use this scheme.
> //
>-#define POOL_ALLOCATOR_NEW_DELETE()                                                  \
>+#define POOL_ALLOCATOR_NEW_DELETE                                                    \
>     void *operator new(size_t s) { return GetGlobalPoolAllocator()->allocate(s); }   \
>     void *operator new(size_t, void *_Where) { return (_Where); }                    \
>     void operator delete(void *) {}                                                  \
>@@ -50,11 +50,6 @@ struct TSourceLoc
> typedef pool_allocator<char> TStringAllocator;
> typedef std::basic_string<char, std::char_traits<char>, TStringAllocator> TString;
> typedef std::basic_ostringstream<char, std::char_traits<char>, TStringAllocator> TStringStream;
>-inline TString *NewPoolTString(const char *s)
>-{
>-    void *memory = GetGlobalPoolAllocator()->allocate(sizeof(TString));
>-    return new (memory) TString(s);
>-}
> 
> //
> // Persistent string memory.  Should only be used for strings that survive
>@@ -70,7 +65,7 @@ template <class T>
> class TVector : public std::vector<T, pool_allocator<T>>
> {
>   public:
>-    POOL_ALLOCATOR_NEW_DELETE();
>+    POOL_ALLOCATOR_NEW_DELETE
> 
>     typedef typename std::vector<T, pool_allocator<T>>::size_type size_type;
>     TVector() : std::vector<T, pool_allocator<T>>() {}
>@@ -82,7 +77,7 @@ template <class K, class D, class H = std::hash<K>, class CMP = std::equal_to<K>
> class TUnorderedMap : public std::unordered_map<K, D, H, CMP, pool_allocator<std::pair<const K, D>>>
> {
>   public:
>-    POOL_ALLOCATOR_NEW_DELETE();
>+    POOL_ALLOCATOR_NEW_DELETE
>     typedef pool_allocator<std::pair<const K, D>> tAllocator;
> 
>     TUnorderedMap() : std::unordered_map<K, D, H, CMP, tAllocator>() {}
>@@ -91,23 +86,21 @@ class TUnorderedMap : public std::unordered_map<K, D, H, CMP, pool_allocator<std
>         : std::unordered_map<K, D, H, CMP, tAllocator>(
>               std::unordered_map<K, D, H, CMP, tAllocator>::key_compare(),
>               a)
>-    {
>-    }
>+    {}
> };
> 
> template <class K, class D, class CMP = std::less<K>>
> class TMap : public std::map<K, D, CMP, pool_allocator<std::pair<const K, D>>>
> {
>   public:
>-    POOL_ALLOCATOR_NEW_DELETE();
>+    POOL_ALLOCATOR_NEW_DELETE
>     typedef pool_allocator<std::pair<const K, D>> tAllocator;
> 
>     TMap() : std::map<K, D, CMP, tAllocator>() {}
>     // use correct two-stage name lookup supported in gcc 3.4 and above
>     TMap(const tAllocator &a)
>         : std::map<K, D, CMP, tAllocator>(std::map<K, D, CMP, tAllocator>::key_compare(), a)
>-    {
>-    }
>+    {}
> };
> 
> // Integer to TString conversion
>@@ -121,6 +114,26 @@ inline TString str(T i)
>     return buffer;
> }
> 
>+// Allocate a char array in the global memory pool. str must be a null terminated string. strLength
>+// is the length without the null terminator.
>+inline const char *AllocatePoolCharArray(const char *str, size_t strLength)
>+{
>+    size_t requiredSize = strLength + 1;
>+    char *buffer        = static_cast<char *>(GetGlobalPoolAllocator()->allocate(requiredSize));
>+    memcpy(buffer, str, requiredSize);
>+    ASSERT(buffer[strLength] == '\0');
>+    return buffer;
>+}
>+
>+// Initialize a new stream which must be imbued with the classic locale
>+template <typename T>
>+T InitializeStream()
>+{
>+    T stream;
>+    stream.imbue(std::locale::classic());
>+    return stream;
>+}
>+
> }  // namespace sh
> 
> namespace std
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/Compiler.cpp b/Source/ThirdParty/ANGLE/src/compiler/translator/Compiler.cpp
>index 594147d8695..a31eda779b1 100644
>--- a/Source/ThirdParty/ANGLE/src/compiler/translator/Compiler.cpp
>+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/Compiler.cpp
>@@ -10,42 +10,45 @@
> 
> #include "angle_gl.h"
> #include "common/utilities.h"
>-#include "compiler/translator/AddAndTrueToLoopCondition.h"
>-#include "compiler/translator/Cache.h"
> #include "compiler/translator/CallDAG.h"
>-#include "compiler/translator/ClampPointSize.h"
> #include "compiler/translator/CollectVariables.h"
>-#include "compiler/translator/DeclareAndInitBuiltinsForInstancedMultiview.h"
>-#include "compiler/translator/DeferGlobalInitializers.h"
>-#include "compiler/translator/EmulateGLFragColorBroadcast.h"
>-#include "compiler/translator/EmulatePrecision.h"
> #include "compiler/translator/Initialize.h"
>-#include "compiler/translator/InitializeVariables.h"
>-#include "compiler/translator/IntermNodePatternMatcher.h"
> #include "compiler/translator/IsASTDepthBelowLimit.h"
> #include "compiler/translator/OutputTree.h"
> #include "compiler/translator/ParseContext.h"
>-#include "compiler/translator/PruneNoOps.h"
>-#include "compiler/translator/RegenerateStructNames.h"
>-#include "compiler/translator/RemoveArrayLengthMethod.h"
>-#include "compiler/translator/RemoveEmptySwitchStatements.h"
>-#include "compiler/translator/RemoveInvariantDeclaration.h"
>-#include "compiler/translator/RemoveNoOpCasesFromEndOfSwitchStatements.h"
>-#include "compiler/translator/RemovePow.h"
>-#include "compiler/translator/RemoveUnreferencedVariables.h"
>-#include "compiler/translator/RewriteDoWhile.h"
>-#include "compiler/translator/ScalarizeVecAndMatConstructorArgs.h"
>-#include "compiler/translator/SeparateDeclarations.h"
>-#include "compiler/translator/SimplifyLoopConditions.h"
>-#include "compiler/translator/SplitSequenceOperator.h"
>-#include "compiler/translator/UnfoldShortCircuitAST.h"
>-#include "compiler/translator/UseInterfaceBlockFields.h"
> #include "compiler/translator/ValidateLimitations.h"
> #include "compiler/translator/ValidateMaxParameters.h"
> #include "compiler/translator/ValidateOutputs.h"
> #include "compiler/translator/ValidateVaryingLocations.h"
> #include "compiler/translator/VariablePacker.h"
>-#include "compiler/translator/VectorizeVectorScalarArithmetic.h"
>+#include "compiler/translator/tree_ops/AddAndTrueToLoopCondition.h"
>+#include "compiler/translator/tree_ops/ClampFragDepth.h"
>+#include "compiler/translator/tree_ops/ClampPointSize.h"
>+#include "compiler/translator/tree_ops/DeclareAndInitBuiltinsForInstancedMultiview.h"
>+#include "compiler/translator/tree_ops/DeferGlobalInitializers.h"
>+#include "compiler/translator/tree_ops/EmulateGLDrawID.h"
>+#include "compiler/translator/tree_ops/EmulateGLFragColorBroadcast.h"
>+#include "compiler/translator/tree_ops/EmulatePrecision.h"
>+#include "compiler/translator/tree_ops/FoldExpressions.h"
>+#include "compiler/translator/tree_ops/InitializeVariables.h"
>+#include "compiler/translator/tree_ops/PruneEmptyCases.h"
>+#include "compiler/translator/tree_ops/PruneNoOps.h"
>+#include "compiler/translator/tree_ops/RegenerateStructNames.h"
>+#include "compiler/translator/tree_ops/RemoveArrayLengthMethod.h"
>+#include "compiler/translator/tree_ops/RemoveInvariantDeclaration.h"
>+#include "compiler/translator/tree_ops/RemovePow.h"
>+#include "compiler/translator/tree_ops/RemoveUnreferencedVariables.h"
>+#include "compiler/translator/tree_ops/RewriteDoWhile.h"
>+#include "compiler/translator/tree_ops/RewriteRepeatedAssignToSwizzled.h"
>+#include "compiler/translator/tree_ops/ScalarizeVecAndMatConstructorArgs.h"
>+#include "compiler/translator/tree_ops/SeparateDeclarations.h"
>+#include "compiler/translator/tree_ops/SimplifyLoopConditions.h"
>+#include "compiler/translator/tree_ops/SplitSequenceOperator.h"
>+#include "compiler/translator/tree_ops/UnfoldShortCircuitAST.h"
>+#include "compiler/translator/tree_ops/UseInterfaceBlockFields.h"
>+#include "compiler/translator/tree_ops/VectorizeVectorScalarArithmetic.h"
>+#include "compiler/translator/tree_util/BuiltIn_autogen.h"
>+#include "compiler/translator/tree_util/IntermNodePatternMatcher.h"
> #include "compiler/translator/util.h"
> #include "third_party/compiler/ArrayBoundsClamper.h"
> 
>@@ -65,7 +68,7 @@ void DumpFuzzerCase(char const *const *shaderStrings,
> {
>     static int fileIndex = 0;
> 
>-    std::ostringstream o;
>+    std::ostringstream o = sh::InitializeStream<std::ostringstream>();
>     o << "corpus/" << fileIndex++ << ".sample";
>     std::string s = o.str();
> 
>@@ -90,11 +93,6 @@ void DumpFuzzerCase(char const *const *shaderStrings,
> #endif  // defined(ANGLE_ENABLE_FUZZER_CORPUS_OUTPUT)
> }  // anonymous namespace
> 
>-bool IsWebGLBasedSpec(ShShaderSpec spec)
>-{
>-    return (spec == SH_WEBGL_SPEC || spec == SH_WEBGL2_SPEC || spec == SH_WEBGL3_SPEC);
>-}
>-
> bool IsGLSL130OrNewer(ShShaderOutput output)
> {
>     return (output == SH_GLSL_130_OUTPUT || output == SH_GLSL_140_OUTPUT ||
>@@ -158,7 +156,7 @@ int GetMaxUniformVectorsForShaderType(GLenum shaderType, const ShBuiltInResource
>         // TODO (jiawei.shao@intel.com): check if we need finer-grained component counting
>         case GL_COMPUTE_SHADER:
>             return resources.MaxComputeUniformComponents / 4;
>-        case GL_GEOMETRY_SHADER_OES:
>+        case GL_GEOMETRY_SHADER_EXT:
>             return resources.MaxGeometryUniformComponents / 4;
>         default:
>             UNREACHABLE();
>@@ -172,7 +170,7 @@ namespace
> class TScopedPoolAllocator
> {
>   public:
>-    TScopedPoolAllocator(TPoolAllocator *allocator) : mAllocator(allocator)
>+    TScopedPoolAllocator(angle::PoolAllocator *allocator) : mAllocator(allocator)
>     {
>         mAllocator->push();
>         SetGlobalPoolAllocator(mAllocator);
>@@ -184,7 +182,7 @@ class TScopedPoolAllocator
>     }
> 
>   private:
>-    TPoolAllocator *mAllocator;
>+    angle::PoolAllocator *mAllocator;
> };
> 
> class TScopedSymbolTableLevel
>@@ -192,12 +190,12 @@ class TScopedSymbolTableLevel
>   public:
>     TScopedSymbolTableLevel(TSymbolTable *table) : mTable(table)
>     {
>-        ASSERT(mTable->atBuiltInLevel());
>+        ASSERT(mTable->isEmpty());
>         mTable->push();
>     }
>     ~TScopedSymbolTableLevel()
>     {
>-        while (!mTable->atBuiltInLevel())
>+        while (!mTable->isEmpty())
>             mTable->pop();
>     }
> 
>@@ -224,6 +222,51 @@ int MapSpecToShaderVersion(ShShaderSpec spec)
>     }
> }
> 
>+bool ValidateFragColorAndFragData(GLenum shaderType,
>+                                  int shaderVersion,
>+                                  const TSymbolTable &symbolTable,
>+                                  TDiagnostics *diagnostics)
>+{
>+    if (shaderVersion > 100 || shaderType != GL_FRAGMENT_SHADER)
>+    {
>+        return true;
>+    }
>+
>+    bool usesFragColor = false;
>+    bool usesFragData  = false;
>+    // This validation is a bit stricter than the spec - it's only an error to write to
>+    // both FragData and FragColor. But because it's better not to have reads from undefined
>+    // variables, we always return an error if they are both referenced, rather than only if they
>+    // are written.
>+    if (symbolTable.isStaticallyUsed(*BuiltInVariable::gl_FragColor()) ||
>+        symbolTable.isStaticallyUsed(*BuiltInVariable::gl_SecondaryFragColorEXT()))
>+    {
>+        usesFragColor = true;
>+    }
>+    // Extension variables may not always be initialized (saves some time at symbol table init).
>+    bool secondaryFragDataUsed =
>+        symbolTable.gl_SecondaryFragDataEXT() != nullptr &&
>+        symbolTable.isStaticallyUsed(*symbolTable.gl_SecondaryFragDataEXT());
>+    if (symbolTable.isStaticallyUsed(*symbolTable.gl_FragData()) || secondaryFragDataUsed)
>+    {
>+        usesFragData = true;
>+    }
>+    if (usesFragColor && usesFragData)
>+    {
>+        const char *errorMessage = "cannot use both gl_FragData and gl_FragColor";
>+        if (symbolTable.isStaticallyUsed(*BuiltInVariable::gl_SecondaryFragColorEXT()) ||
>+            secondaryFragDataUsed)
>+        {
>+            errorMessage =
>+                "cannot use both output variable sets (gl_FragData, gl_SecondaryFragDataEXT)"
>+                " and (gl_FragColor, gl_SecondaryFragColorEXT)";
>+        }
>+        diagnostics->globalError(errorMessage);
>+        return false;
>+    }
>+    return true;
>+}
>+
> }  // namespace
> 
> TShHandleBase::TShHandleBase()
>@@ -239,19 +282,13 @@ TShHandleBase::~TShHandleBase()
> }
> 
> TCompiler::TCompiler(sh::GLenum type, ShShaderSpec spec, ShShaderOutput output)
>-    : variablesCollected(false),
>+    : mVariablesCollected(false),
>       mGLPositionInitialized(false),
>-      shaderType(type),
>-      shaderSpec(spec),
>-      outputType(output),
>-      maxUniformVectors(0),
>-      maxExpressionComplexity(0),
>-      maxCallStackDepth(0),
>-      maxFunctionParameters(0),
>-      fragmentPrecisionHigh(false),
>-      clampingStrategy(SH_CLAMP_WITH_CLAMP_INTRINSIC),
>-      builtInFunctionEmulator(),
>-      mDiagnostics(infoSink.info),
>+      mShaderType(type),
>+      mShaderSpec(spec),
>+      mOutputType(output),
>+      mBuiltInFunctionEmulator(),
>+      mDiagnostics(mInfoSink.info),
>       mSourcePath(nullptr),
>       mComputeShaderLocalSizeDeclared(false),
>       mComputeShaderLocalSize(1),
>@@ -259,45 +296,32 @@ TCompiler::TCompiler(sh::GLenum type, ShShaderSpec spec, ShShaderOutput output)
>       mGeometryShaderInvocations(0),
>       mGeometryShaderInputPrimitiveType(EptUndefined),
>       mGeometryShaderOutputPrimitiveType(EptUndefined)
>-{
>-}
>+{}
> 
>-TCompiler::~TCompiler()
>-{
>-}
>+TCompiler::~TCompiler() {}
> 
> bool TCompiler::shouldRunLoopAndIndexingValidation(ShCompileOptions compileOptions) const
> {
>     // If compiling an ESSL 1.00 shader for WebGL, or if its been requested through the API,
>     // validate loop and indexing as well (to verify that the shader only uses minimal functionality
>     // of ESSL 1.00 as in Appendix A of the spec).
>-    return (IsWebGLBasedSpec(shaderSpec) && shaderVersion == 100) ||
>+    return (IsWebGLBasedSpec(mShaderSpec) && mShaderVersion == 100) ||
>            (compileOptions & SH_VALIDATE_LOOP_INDEXING);
> }
> 
> bool TCompiler::Init(const ShBuiltInResources &resources)
> {
>-    shaderVersion = 100;
>-
>-    maxUniformVectors = GetMaxUniformVectorsForShaderType(shaderType, resources);
>-
>-    maxExpressionComplexity = resources.MaxExpressionComplexity;
>-    maxCallStackDepth       = resources.MaxCallStackDepth;
>-    maxFunctionParameters   = resources.MaxFunctionParameters;
>-
>     SetGlobalPoolAllocator(&allocator);
> 
>     // Generate built-in symbol table.
>-    if (!InitBuiltInSymbolTable(resources))
>+    if (!initBuiltInSymbolTable(resources))
>         return false;
>-    InitExtensionBehavior(resources, extensionBehavior);
>-    fragmentPrecisionHigh = resources.FragmentPrecisionHigh == 1;
> 
>-    arrayBoundsClamper.SetClampingStrategy(resources.ArrayIndexClampingStrategy);
>-    clampingStrategy = resources.ArrayIndexClampingStrategy;
>-
>-    hashFunction = resources.HashFunction;
>+    mResources = resources;
>+    setResourceString();
> 
>+    InitExtensionBehavior(resources, mExtensionBehavior);
>+    mArrayBoundsClamper.SetClampingStrategy(resources.ArrayIndexClampingStrategy);
>     return true;
> }
> 
>@@ -318,7 +342,19 @@ TIntermBlock *TCompiler::compileTreeImpl(const char *const shaderStrings[],
>     ASSERT(GetGlobalPoolAllocator());
> 
>     // Reset the extension behavior for each compilation unit.
>-    ResetExtensionBehavior(extensionBehavior);
>+    ResetExtensionBehavior(mExtensionBehavior);
>+
>+    // If gl_DrawID is not supported, remove it from the available extensions
>+    // Currently we only allow emulation of gl_DrawID
>+    const bool glDrawIDSupported = (compileOptions & SH_EMULATE_GL_DRAW_ID) != 0u;
>+    if (!glDrawIDSupported)
>+    {
>+        auto it = mExtensionBehavior.find(TExtension::ANGLE_multi_draw);
>+        if (it != mExtensionBehavior.end())
>+        {
>+            mExtensionBehavior.erase(it);
>+        }
>+    }
> 
>     // First string is path of source file if flag is set. The actual source follows.
>     size_t firstSource = 0;
>@@ -328,14 +364,15 @@ TIntermBlock *TCompiler::compileTreeImpl(const char *const shaderStrings[],
>         ++firstSource;
>     }
> 
>-    TParseContext parseContext(symbolTable, extensionBehavior, shaderType, shaderSpec,
>+    TParseContext parseContext(mSymbolTable, mExtensionBehavior, mShaderType, mShaderSpec,
>                                compileOptions, true, &mDiagnostics, getResources());
> 
>-    parseContext.setFragmentPrecisionHighOnESSL1(fragmentPrecisionHigh);
>+    parseContext.setFragmentPrecisionHighOnESSL1(mResources.FragmentPrecisionHigh == 1);
> 
>     // We preserve symbols at the built-in level from compile-to-compile.
>     // Start pushing the user-defined symbols at global level.
>-    TScopedSymbolTableLevel scopedSymbolLevel(&symbolTable);
>+    TScopedSymbolTableLevel globalLevel(&mSymbolTable);
>+    ASSERT(mSymbolTable.atGlobalLevel());
> 
>     // Parse shader.
>     if (PaParseStrings(numStrings - firstSource, &shaderStrings[firstSource], nullptr,
>@@ -351,9 +388,8 @@ TIntermBlock *TCompiler::compileTreeImpl(const char *const shaderStrings[],
> 
>     setASTMetadata(parseContext);
> 
>-    if (MapSpecToShaderVersion(shaderSpec) < shaderVersion)
>+    if (!checkShaderVersion(&parseContext))
>     {
>-        mDiagnostics.globalError("unsupported shader version");
>         return nullptr;
>     }
> 
>@@ -366,22 +402,63 @@ TIntermBlock *TCompiler::compileTreeImpl(const char *const shaderStrings[],
>     return root;
> }
> 
>+bool TCompiler::checkShaderVersion(TParseContext *parseContext)
>+{
>+    if (MapSpecToShaderVersion(mShaderSpec) < mShaderVersion)
>+    {
>+        mDiagnostics.globalError("unsupported shader version");
>+        return false;
>+    }
>+
>+    ASSERT(parseContext);
>+    switch (mShaderType)
>+    {
>+        case GL_COMPUTE_SHADER:
>+            if (mShaderVersion < 310)
>+            {
>+                mDiagnostics.globalError("Compute shader is not supported in this shader version.");
>+                return false;
>+            }
>+            break;
>+
>+        case GL_GEOMETRY_SHADER_EXT:
>+            if (mShaderVersion < 310)
>+            {
>+                mDiagnostics.globalError(
>+                    "Geometry shader is not supported in this shader version.");
>+                return false;
>+            }
>+            else
>+            {
>+                ASSERT(mShaderVersion == 310);
>+                if (!parseContext->checkCanUseExtension(sh::TSourceLoc(),
>+                                                        TExtension::EXT_geometry_shader))
>+                {
>+                    return false;
>+                }
>+            }
>+            break;
>+
>+        default:
>+            break;
>+    }
>+
>+    return true;
>+}
>+
> void TCompiler::setASTMetadata(const TParseContext &parseContext)
> {
>-    shaderVersion = parseContext.getShaderVersion();
>+    mShaderVersion = parseContext.getShaderVersion();
> 
>     mPragma = parseContext.pragma();
>-    symbolTable.setGlobalInvariant(mPragma.stdgl.invariantAll);
>+    mSymbolTable.setGlobalInvariant(mPragma.stdgl.invariantAll);
> 
>     mComputeShaderLocalSizeDeclared = parseContext.isComputeShaderLocalSizeDeclared();
>     mComputeShaderLocalSize         = parseContext.getComputeShaderLocalSize();
> 
>     mNumViews = parseContext.getNumViews();
> 
>-    // Highp might have been auto-enabled based on shader version
>-    fragmentPrecisionHigh = parseContext.getFragmentPrecisionHigh();
>-
>-    if (shaderType == GL_GEOMETRY_SHADER_OES)
>+    if (mShaderType == GL_GEOMETRY_SHADER_EXT)
>     {
>         mGeometryShaderInputPrimitiveType  = parseContext.getGeometryShaderInputPrimitiveType();
>         mGeometryShaderOutputPrimitiveType = parseContext.getGeometryShaderOutputPrimitiveType();
>@@ -400,6 +477,27 @@ bool TCompiler::checkAndSimplifyAST(TIntermBlock *root,
>         return false;
>     }
> 
>+    if (shouldRunLoopAndIndexingValidation(compileOptions) &&
>+        !ValidateLimitations(root, mShaderType, &mSymbolTable, &mDiagnostics))
>+    {
>+        return false;
>+    }
>+
>+    if (!ValidateFragColorAndFragData(mShaderType, mShaderVersion, mSymbolTable, &mDiagnostics))
>+    {
>+        return false;
>+    }
>+
>+    // Fold expressions that could not be folded before validation that was done as a part of
>+    // parsing.
>+    FoldExpressions(root, &mDiagnostics);
>+    // Folding should only be able to generate warnings.
>+    ASSERT(mDiagnostics.numErrors() == 0);
>+    if (!ValidateAST(root, &mDiagnostics, mValidateASTOptions))
>+    {
>+        return false;
>+    }
>+
>     // We prune no-ops to work around driver bugs and to keep AST processing and output simple.
>     // The following kinds of no-ops are pruned:
>     //   1. Empty declarations "int;".
>@@ -407,17 +505,11 @@ bool TCompiler::checkAndSimplifyAST(TIntermBlock *root,
>     //      for float, so float literal statements would end up with no precision which is
>     //      invalid ESSL.
>     // After this empty declarations are not allowed in the AST.
>-    PruneNoOps(root);
>-
>-    // In case the last case inside a switch statement is a certain type of no-op, GLSL
>-    // compilers in drivers may not accept it. In this case we clean up the dead code from the
>-    // end of switch statements. This is also required because PruneNoOps may have left switch
>-    // statements that only contained an empty declaration inside the final case in an invalid
>-    // state. Relies on that PruneNoOps has already been run.
>-    RemoveNoOpCasesFromEndOfSwitchStatements(root, &symbolTable);
>-
>-    // Remove empty switch statements - this makes output simpler.
>-    RemoveEmptySwitchStatements(root);
>+    PruneNoOps(root, &mSymbolTable);
>+    if (!ValidateAST(root, &mDiagnostics, mValidateASTOptions))
>+    {
>+        return false;
>+    }
> 
>     // Create the function DAG and check there is no recursion
>     if (!initCallDag(root))
>@@ -431,8 +523,8 @@ bool TCompiler::checkAndSimplifyAST(TIntermBlock *root,
>     }
> 
>     // Checks which functions are used and if "main" exists
>-    functionMetadata.clear();
>-    functionMetadata.resize(mCallDag.size());
>+    mFunctionMetadata.clear();
>+    mFunctionMetadata.resize(mCallDag.size());
>     if (!tagUsedFunctions())
>     {
>         return false;
>@@ -441,29 +533,26 @@ bool TCompiler::checkAndSimplifyAST(TIntermBlock *root,
>     if (!(compileOptions & SH_DONT_PRUNE_UNUSED_FUNCTIONS))
>     {
>         pruneUnusedFunctions(root);
>+        if (!ValidateAST(root, &mDiagnostics, mValidateASTOptions))
>+        {
>+            return false;
>+        }
>     }
> 
>-    if (shaderVersion >= 310 && !ValidateVaryingLocations(root, &mDiagnostics, shaderType))
>-    {
>-        return false;
>-    }
>-
>-    if (shaderVersion >= 300 && shaderType == GL_FRAGMENT_SHADER &&
>-        !ValidateOutputs(root, getExtensionBehavior(), compileResources.MaxDrawBuffers,
>-                         &mDiagnostics))
>+    if (mShaderVersion >= 310 && !ValidateVaryingLocations(root, &mDiagnostics, mShaderType))
>     {
>         return false;
>     }
> 
>-    if (shouldRunLoopAndIndexingValidation(compileOptions) &&
>-        !ValidateLimitations(root, shaderType, &symbolTable, shaderVersion, &mDiagnostics))
>+    if (mShaderVersion >= 300 && mShaderType == GL_FRAGMENT_SHADER &&
>+        !ValidateOutputs(root, getExtensionBehavior(), mResources.MaxDrawBuffers, &mDiagnostics))
>     {
>         return false;
>     }
> 
>     // Fail compilation if precision emulation not supported.
>     if (getResources().WEBGL_debug_shader_precision && getPragma().debugShaderPrecision &&
>-        !EmulatePrecision::SupportedInLanguage(outputType))
>+        !EmulatePrecision::SupportedInLanguage(mOutputType))
>     {
>         mDiagnostics.globalError("Precision emulation not supported for this output type.");
>         return false;
>@@ -472,124 +561,224 @@ bool TCompiler::checkAndSimplifyAST(TIntermBlock *root,
>     // Clamping uniform array bounds needs to happen after validateLimitations pass.
>     if (compileOptions & SH_CLAMP_INDIRECT_ARRAY_BOUNDS)
>     {
>-        arrayBoundsClamper.MarkIndirectArrayBoundsForClamping(root);
>+        mArrayBoundsClamper.MarkIndirectArrayBoundsForClamping(root);
>     }
> 
>     if ((compileOptions & SH_INITIALIZE_BUILTINS_FOR_INSTANCED_MULTIVIEW) &&
>-        parseContext.isExtensionEnabled(TExtension::OVR_multiview) &&
>+        parseContext.isExtensionEnabled(TExtension::OVR_multiview2) &&
>         getShaderType() != GL_COMPUTE_SHADER)
>     {
>-        DeclareAndInitBuiltinsForInstancedMultiview(root, mNumViews, shaderType, compileOptions,
>-                                                    outputType, &symbolTable);
>+        DeclareAndInitBuiltinsForInstancedMultiview(root, mNumViews, mShaderType, compileOptions,
>+                                                    mOutputType, &mSymbolTable);
>+        if (!ValidateAST(root, &mDiagnostics, mValidateASTOptions))
>+        {
>+            return false;
>+        }
>     }
> 
>     // This pass might emit short circuits so keep it before the short circuit unfolding
>     if (compileOptions & SH_REWRITE_DO_WHILE_LOOPS)
>-        RewriteDoWhile(root, &symbolTable);
>+    {
>+        RewriteDoWhile(root, &mSymbolTable);
>+        if (!ValidateAST(root, &mDiagnostics, mValidateASTOptions))
>+        {
>+            return false;
>+        }
>+    }
> 
>     if (compileOptions & SH_ADD_AND_TRUE_TO_LOOP_CONDITION)
>-        sh::AddAndTrueToLoopCondition(root);
>+    {
>+        AddAndTrueToLoopCondition(root);
>+        if (!ValidateAST(root, &mDiagnostics, mValidateASTOptions))
>+        {
>+            return false;
>+        }
>+    }
> 
>     if (compileOptions & SH_UNFOLD_SHORT_CIRCUIT)
>     {
>-        UnfoldShortCircuitAST unfoldShortCircuit;
>-        root->traverse(&unfoldShortCircuit);
>-        unfoldShortCircuit.updateTree();
>+        UnfoldShortCircuitAST(root);
>+        if (!ValidateAST(root, &mDiagnostics, mValidateASTOptions))
>+        {
>+            return false;
>+        }
>     }
> 
>     if (compileOptions & SH_REMOVE_POW_WITH_CONSTANT_EXPONENT)
>     {
>-        RemovePow(root);
>+        RemovePow(root, &mSymbolTable);
>+        if (!ValidateAST(root, &mDiagnostics, mValidateASTOptions))
>+        {
>+            return false;
>+        }
>     }
> 
>     if (compileOptions & SH_REGENERATE_STRUCT_NAMES)
>     {
>-        RegenerateStructNames gen(&symbolTable, shaderVersion);
>+        RegenerateStructNames gen(&mSymbolTable);
>         root->traverse(&gen);
>+        if (!ValidateAST(root, &mDiagnostics, mValidateASTOptions))
>+        {
>+            return false;
>+        }
>     }
> 
>-    if (shaderType == GL_FRAGMENT_SHADER && shaderVersion == 100 &&
>-        compileResources.EXT_draw_buffers && compileResources.MaxDrawBuffers > 1 &&
>-        IsExtensionEnabled(extensionBehavior, TExtension::EXT_draw_buffers))
>+    if (mShaderType == GL_VERTEX_SHADER &&
>+        IsExtensionEnabled(mExtensionBehavior, TExtension::ANGLE_multi_draw))
>     {
>-        EmulateGLFragColorBroadcast(root, compileResources.MaxDrawBuffers, &outputVariables,
>-                                    &symbolTable, shaderVersion);
>+        if ((compileOptions & SH_EMULATE_GL_DRAW_ID) != 0)
>+        {
>+            EmulateGLDrawID(root, &mSymbolTable, &mUniforms,
>+                            shouldCollectVariables(compileOptions));
>+            if (!ValidateAST(root, &mDiagnostics, mValidateASTOptions))
>+            {
>+                return false;
>+            }
>+        }
>     }
> 
>+    if (mShaderType == GL_FRAGMENT_SHADER && mShaderVersion == 100 && mResources.EXT_draw_buffers &&
>+        mResources.MaxDrawBuffers > 1 &&
>+        IsExtensionEnabled(mExtensionBehavior, TExtension::EXT_draw_buffers))
>+    {
>+        EmulateGLFragColorBroadcast(root, mResources.MaxDrawBuffers, &mOutputVariables,
>+                                    &mSymbolTable, mShaderVersion);
>+        if (!ValidateAST(root, &mDiagnostics, mValidateASTOptions))
>+        {
>+            return false;
>+        }
>+    }
>+
>+    int simplifyScalarized = (compileOptions & SH_SCALARIZE_VEC_AND_MAT_CONSTRUCTOR_ARGS)
>+                                 ? IntermNodePatternMatcher::kScalarizedVecOrMatConstructor
>+                                 : 0;
>+
>     // Split multi declarations and remove calls to array length().
>     // Note that SimplifyLoopConditions needs to be run before any other AST transformations
>     // that may need to generate new statements from loop conditions or loop expressions.
>-    SimplifyLoopConditions(
>-        root,
>-        IntermNodePatternMatcher::kMultiDeclaration | IntermNodePatternMatcher::kArrayLengthMethod,
>-        &getSymbolTable(), getShaderVersion());
>+    SimplifyLoopConditions(root,
>+                           IntermNodePatternMatcher::kMultiDeclaration |
>+                               IntermNodePatternMatcher::kArrayLengthMethod | simplifyScalarized,
>+                           &getSymbolTable());
>+    if (!ValidateAST(root, &mDiagnostics, mValidateASTOptions))
>+    {
>+        return false;
>+    }
> 
>     // Note that separate declarations need to be run before other AST transformations that
>     // generate new statements from expressions.
>     SeparateDeclarations(root);
>+    mValidateASTOptions.validateMultiDeclarations = true;
>+    if (!ValidateAST(root, &mDiagnostics, mValidateASTOptions))
>+    {
>+        return false;
>+    }
> 
>-    SplitSequenceOperator(root, IntermNodePatternMatcher::kArrayLengthMethod, &getSymbolTable(),
>-                          getShaderVersion());
>+    SplitSequenceOperator(root, IntermNodePatternMatcher::kArrayLengthMethod | simplifyScalarized,
>+                          &getSymbolTable());
>+    if (!ValidateAST(root, &mDiagnostics, mValidateASTOptions))
>+    {
>+        return false;
>+    }
> 
>     RemoveArrayLengthMethod(root);
>+    if (!ValidateAST(root, &mDiagnostics, mValidateASTOptions))
>+    {
>+        return false;
>+    }
>+
>+    RemoveUnreferencedVariables(root, &mSymbolTable);
>+    if (!ValidateAST(root, &mDiagnostics, mValidateASTOptions))
>+    {
>+        return false;
>+    }
> 
>-    RemoveUnreferencedVariables(root, &symbolTable);
>+    // In case the last case inside a switch statement is a certain type of no-op, GLSL compilers in
>+    // drivers may not accept it. In this case we clean up the dead code from the end of switch
>+    // statements. This is also required because PruneNoOps or RemoveUnreferencedVariables may have
>+    // left switch statements that only contained an empty declaration inside the final case in an
>+    // invalid state. Relies on that PruneNoOps and RemoveUnreferencedVariables have already been
>+    // run.
>+    PruneEmptyCases(root);
>+    if (!ValidateAST(root, &mDiagnostics, mValidateASTOptions))
>+    {
>+        return false;
>+    }
> 
>     // Built-in function emulation needs to happen after validateLimitations pass.
>     // TODO(jmadill): Remove global pool allocator.
>     GetGlobalPoolAllocator()->lock();
>-    initBuiltInFunctionEmulator(&builtInFunctionEmulator, compileOptions);
>+    initBuiltInFunctionEmulator(&mBuiltInFunctionEmulator, compileOptions);
>     GetGlobalPoolAllocator()->unlock();
>-    builtInFunctionEmulator.markBuiltInFunctionsForEmulation(root);
>+    mBuiltInFunctionEmulator.markBuiltInFunctionsForEmulation(root);
> 
>+    bool highPrecisionSupported = mShaderVersion > 100 || mShaderType != GL_FRAGMENT_SHADER ||
>+                                  mResources.FragmentPrecisionHigh == 1;
>     if (compileOptions & SH_SCALARIZE_VEC_AND_MAT_CONSTRUCTOR_ARGS)
>     {
>-        ScalarizeVecAndMatConstructorArgs(root, shaderType, fragmentPrecisionHigh, &symbolTable);
>+        ScalarizeVecAndMatConstructorArgs(root, mShaderType, highPrecisionSupported, &mSymbolTable);
>+        if (!ValidateAST(root, &mDiagnostics, mValidateASTOptions))
>+        {
>+            return false;
>+        }
>     }
> 
>     if (shouldCollectVariables(compileOptions))
>     {
>-        ASSERT(!variablesCollected);
>-        CollectVariables(root, &attributes, &outputVariables, &uniforms, &inputVaryings,
>-                         &outputVaryings, &uniformBlocks, &shaderStorageBlocks, &inBlocks,
>-                         hashFunction, &symbolTable, shaderVersion, shaderType, extensionBehavior);
>+        ASSERT(!mVariablesCollected);
>+        CollectVariables(root, &mAttributes, &mOutputVariables, &mUniforms, &mInputVaryings,
>+                         &mOutputVaryings, &mUniformBlocks, &mShaderStorageBlocks, &mInBlocks,
>+                         mResources.HashFunction, &mSymbolTable, mShaderType, mExtensionBehavior);
>         collectInterfaceBlocks();
>-        variablesCollected = true;
>+        mVariablesCollected = true;
>         if (compileOptions & SH_USE_UNUSED_STANDARD_SHARED_BLOCKS)
>         {
>             useAllMembersInUnusedStandardAndSharedBlocks(root);
>         }
>         if (compileOptions & SH_ENFORCE_PACKING_RESTRICTIONS)
>         {
>+            int maxUniformVectors = GetMaxUniformVectorsForShaderType(mShaderType, mResources);
>             // Returns true if, after applying the packing rules in the GLSL ES 1.00.17 spec
>             // Appendix A, section 7, the shader does not use too many uniforms.
>-            if (!CheckVariablesInPackingLimits(maxUniformVectors, uniforms))
>+            if (!CheckVariablesInPackingLimits(maxUniformVectors, mUniforms))
>             {
>                 mDiagnostics.globalError("too many uniforms");
>                 return false;
>             }
>         }
>-        if (compileOptions & SH_INIT_OUTPUT_VARIABLES)
>+        if ((compileOptions & SH_INIT_OUTPUT_VARIABLES) && (mShaderType != GL_COMPUTE_SHADER))
>         {
>             initializeOutputVariables(root);
>+            if (!ValidateAST(root, &mDiagnostics, mValidateASTOptions))
>+            {
>+                return false;
>+            }
>         }
>     }
> 
>     // Removing invariant declarations must be done after collecting variables.
>     // Otherwise, built-in invariant declarations don't apply.
>-    if (RemoveInvariant(shaderType, shaderVersion, outputType, compileOptions))
>+    if (RemoveInvariant(mShaderType, mShaderVersion, mOutputType, compileOptions))
>     {
>         RemoveInvariantDeclaration(root);
>+        if (!ValidateAST(root, &mDiagnostics, mValidateASTOptions))
>+        {
>+            return false;
>+        }
>     }
> 
>     // gl_Position is always written in compatibility output mode.
>     // It may have been already initialized among other output variables, in that case we don't
>     // need to initialize it twice.
>-    if (shaderType == GL_VERTEX_SHADER && !mGLPositionInitialized &&
>-        ((compileOptions & SH_INIT_GL_POSITION) || (outputType == SH_GLSL_COMPATIBILITY_OUTPUT)))
>+    if (mShaderType == GL_VERTEX_SHADER && !mGLPositionInitialized &&
>+        ((compileOptions & SH_INIT_GL_POSITION) || (mOutputType == SH_GLSL_COMPATIBILITY_OUTPUT)))
>     {
>         initializeGLPosition(root);
>         mGLPositionInitialized = true;
>+        if (!ValidateAST(root, &mDiagnostics, mValidateASTOptions))
>+        {
>+            return false;
>+        }
>     }
> 
>     // DeferGlobalInitializers needs to be run before other AST transformations that generate new
>@@ -599,7 +788,12 @@ bool TCompiler::checkAndSimplifyAST(TIntermBlock *root,
>     bool initializeLocalsAndGlobals =
>         (compileOptions & SH_INITIALIZE_UNINITIALIZED_LOCALS) && !IsOutputHLSL(getOutputType());
>     bool canUseLoopsToInitialize = !(compileOptions & SH_DONT_USE_LOOPS_TO_INITIALIZE_VARIABLES);
>-    DeferGlobalInitializers(root, initializeLocalsAndGlobals, canUseLoopsToInitialize, &symbolTable);
>+    DeferGlobalInitializers(root, initializeLocalsAndGlobals, canUseLoopsToInitialize,
>+                            highPrecisionSupported, &mSymbolTable);
>+    if (!ValidateAST(root, &mDiagnostics, mValidateASTOptions))
>+    {
>+        return false;
>+    }
> 
>     if (initializeLocalsAndGlobals)
>     {
>@@ -616,21 +810,55 @@ bool TCompiler::checkAndSimplifyAST(TIntermBlock *root,
>             SimplifyLoopConditions(root,
>                                    IntermNodePatternMatcher::kArrayDeclaration |
>                                        IntermNodePatternMatcher::kNamelessStructDeclaration,
>-                                   &getSymbolTable(), getShaderVersion());
>+                                   &getSymbolTable());
>+            if (!ValidateAST(root, &mDiagnostics, mValidateASTOptions))
>+            {
>+                return false;
>+            }
>         }
> 
>         InitializeUninitializedLocals(root, getShaderVersion(), canUseLoopsToInitialize,
>-                                      &getSymbolTable());
>+                                      highPrecisionSupported, &getSymbolTable());
>+        if (!ValidateAST(root, &mDiagnostics, mValidateASTOptions))
>+        {
>+            return false;
>+        }
>     }
> 
>     if (getShaderType() == GL_VERTEX_SHADER && (compileOptions & SH_CLAMP_POINT_SIZE))
>     {
>-        ClampPointSize(root, compileResources.MaxPointSize, &getSymbolTable());
>+        ClampPointSize(root, mResources.MaxPointSize, &getSymbolTable());
>+        if (!ValidateAST(root, &mDiagnostics, mValidateASTOptions))
>+        {
>+            return false;
>+        }
>+    }
>+
>+    if (getShaderType() == GL_FRAGMENT_SHADER && (compileOptions & SH_CLAMP_FRAG_DEPTH))
>+    {
>+        ClampFragDepth(root, &getSymbolTable());
>+        if (!ValidateAST(root, &mDiagnostics, mValidateASTOptions))
>+        {
>+            return false;
>+        }
>+    }
>+
>+    if (compileOptions & SH_REWRITE_REPEATED_ASSIGN_TO_SWIZZLED)
>+    {
>+        sh::RewriteRepeatedAssignToSwizzled(root);
>+        if (!ValidateAST(root, &mDiagnostics, mValidateASTOptions))
>+        {
>+            return false;
>+        }
>     }
> 
>     if (compileOptions & SH_REWRITE_VECTOR_SCALAR_ARITHMETIC)
>     {
>         VectorizeVectorScalarArithmetic(root, &getSymbolTable());
>+        if (!ValidateAST(root, &mDiagnostics, mValidateASTOptions))
>+        {
>+            return false;
>+        }
>     }
> 
>     return true;
>@@ -641,7 +869,8 @@ bool TCompiler::compile(const char *const shaderStrings[],
>                         ShCompileOptions compileOptionsIn)
> {
> #if defined(ANGLE_ENABLE_FUZZER_CORPUS_OUTPUT)
>-    DumpFuzzerCase(shaderStrings, numStrings, shaderType, shaderSpec, outputType, compileOptionsIn);
>+    DumpFuzzerCase(shaderStrings, numStrings, mShaderType, mShaderSpec, mOutputType,
>+                   compileOptionsIn);
> #endif  // defined(ANGLE_ENABLE_FUZZER_CORPUS_OUTPUT)
> 
>     if (numStrings == 0)
>@@ -662,7 +891,7 @@ bool TCompiler::compile(const char *const shaderStrings[],
>     if (root)
>     {
>         if (compileOptions & SH_INTERMEDIATE_TREE)
>-            OutputTree(root, infoSink.info);
>+            OutputTree(root, mInfoSink.info);
> 
>         if (compileOptions & SH_OBJECT_CODE)
>         {
>@@ -670,6 +899,22 @@ bool TCompiler::compile(const char *const shaderStrings[],
>             translate(root, compileOptions, &perfDiagnostics);
>         }
> 
>+        if (mShaderType == GL_VERTEX_SHADER &&
>+            IsExtensionEnabled(mExtensionBehavior, TExtension::ANGLE_multi_draw))
>+        {
>+            if ((compileOptions & SH_EMULATE_GL_DRAW_ID) != 0)
>+            {
>+                for (auto &uniform : mUniforms)
>+                {
>+                    if (uniform.name == "angle_DrawID" && uniform.mappedName == "angle_DrawID")
>+                    {
>+                        uniform.name = "gl_DrawID";
>+                        break;
>+                    }
>+                }
>+            }
>+        }
>+
>         // The IntermNode tree doesn't need to be deleted here, since the
>         // memory will be freed in a big chunk by the PoolAllocator.
>         return true;
>@@ -677,7 +922,7 @@ bool TCompiler::compile(const char *const shaderStrings[],
>     return false;
> }
> 
>-bool TCompiler::InitBuiltInSymbolTable(const ShBuiltInResources &resources)
>+bool TCompiler::initBuiltInSymbolTable(const ShBuiltInResources &resources)
> {
>     if (resources.MaxDrawBuffers < 1)
>     {
>@@ -688,168 +933,124 @@ bool TCompiler::InitBuiltInSymbolTable(const ShBuiltInResources &resources)
>         return false;
>     }
> 
>-    compileResources = resources;
>-    setResourceString();
>-
>-    ASSERT(symbolTable.isEmpty());
>-    symbolTable.push();  // COMMON_BUILTINS
>-    symbolTable.push();  // ESSL1_BUILTINS
>-    symbolTable.push();  // ESSL3_BUILTINS
>-    symbolTable.push();  // ESSL3_1_BUILTINS
>-    symbolTable.push();  // GLSL_BUILTINS
>-
>-    switch (shaderType)
>-    {
>-        case GL_FRAGMENT_SHADER:
>-            symbolTable.setDefaultPrecision(EbtInt, EbpMedium);
>-            break;
>-        case GL_VERTEX_SHADER:
>-        case GL_COMPUTE_SHADER:
>-        case GL_GEOMETRY_SHADER_OES:
>-            symbolTable.setDefaultPrecision(EbtInt, EbpHigh);
>-            symbolTable.setDefaultPrecision(EbtFloat, EbpHigh);
>-            break;
>-        default:
>-            UNREACHABLE();
>-    }
>-    // Set defaults for sampler types that have default precision, even those that are
>-    // only available if an extension exists.
>-    // New sampler types in ESSL3 don't have default precision. ESSL1 types do.
>-    initSamplerDefaultPrecision(EbtSampler2D);
>-    initSamplerDefaultPrecision(EbtSamplerCube);
>-    // SamplerExternalOES is specified in the extension to have default precision.
>-    initSamplerDefaultPrecision(EbtSamplerExternalOES);
>-    // SamplerExternal2DY2YEXT is specified in the extension to have default precision.
>-    initSamplerDefaultPrecision(EbtSamplerExternal2DY2YEXT);
>-    // It isn't specified whether Sampler2DRect has default precision.
>-    initSamplerDefaultPrecision(EbtSampler2DRect);
>-
>-    symbolTable.setDefaultPrecision(EbtAtomicCounter, EbpHigh);
>-
>-    InsertBuiltInFunctions(shaderType, shaderSpec, resources, symbolTable);
>-
>-    IdentifyBuiltIns(shaderType, shaderSpec, resources, symbolTable);
>+    mSymbolTable.initializeBuiltIns(mShaderType, mShaderSpec, resources);
> 
>     return true;
> }
> 
>-void TCompiler::initSamplerDefaultPrecision(TBasicType samplerType)
>-{
>-    ASSERT(samplerType > EbtGuardSamplerBegin && samplerType < EbtGuardSamplerEnd);
>-    symbolTable.setDefaultPrecision(samplerType, EbpLow);
>-}
>-
> void TCompiler::setResourceString()
> {
>-    std::ostringstream strstream;
>+    std::ostringstream strstream = sh::InitializeStream<std::ostringstream>();
> 
>     // clang-format off
>-    strstream << ":MaxVertexAttribs:" << compileResources.MaxVertexAttribs
>-        << ":MaxVertexUniformVectors:" << compileResources.MaxVertexUniformVectors
>-        << ":MaxVaryingVectors:" << compileResources.MaxVaryingVectors
>-        << ":MaxVertexTextureImageUnits:" << compileResources.MaxVertexTextureImageUnits
>-        << ":MaxCombinedTextureImageUnits:" << compileResources.MaxCombinedTextureImageUnits
>-        << ":MaxTextureImageUnits:" << compileResources.MaxTextureImageUnits
>-        << ":MaxFragmentUniformVectors:" << compileResources.MaxFragmentUniformVectors
>-        << ":MaxDrawBuffers:" << compileResources.MaxDrawBuffers
>-        << ":OES_standard_derivatives:" << compileResources.OES_standard_derivatives
>-        << ":OES_EGL_image_external:" << compileResources.OES_EGL_image_external
>-        << ":OES_EGL_image_external_essl3:" << compileResources.OES_EGL_image_external_essl3
>-        << ":NV_EGL_stream_consumer_external:" << compileResources.NV_EGL_stream_consumer_external
>-        << ":ARB_texture_rectangle:" << compileResources.ARB_texture_rectangle
>-        << ":EXT_draw_buffers:" << compileResources.EXT_draw_buffers
>-        << ":FragmentPrecisionHigh:" << compileResources.FragmentPrecisionHigh
>-        << ":MaxExpressionComplexity:" << compileResources.MaxExpressionComplexity
>-        << ":MaxCallStackDepth:" << compileResources.MaxCallStackDepth
>-        << ":MaxFunctionParameters:" << compileResources.MaxFunctionParameters
>-        << ":EXT_blend_func_extended:" << compileResources.EXT_blend_func_extended
>-        << ":EXT_frag_depth:" << compileResources.EXT_frag_depth
>-        << ":EXT_shader_texture_lod:" << compileResources.EXT_shader_texture_lod
>-        << ":EXT_shader_framebuffer_fetch:" << compileResources.EXT_shader_framebuffer_fetch
>-        << ":NV_shader_framebuffer_fetch:" << compileResources.NV_shader_framebuffer_fetch
>-        << ":ARM_shader_framebuffer_fetch:" << compileResources.ARM_shader_framebuffer_fetch
>-        << ":OVR_multiview:" << compileResources.OVR_multiview
>-        << ":EXT_YUV_target:" << compileResources.EXT_YUV_target
>-        << ":OES_geometry_shader:" << compileResources.OES_geometry_shader
>-        << ":MaxVertexOutputVectors:" << compileResources.MaxVertexOutputVectors
>-        << ":MaxFragmentInputVectors:" << compileResources.MaxFragmentInputVectors
>-        << ":MinProgramTexelOffset:" << compileResources.MinProgramTexelOffset
>-        << ":MaxProgramTexelOffset:" << compileResources.MaxProgramTexelOffset
>-        << ":MaxDualSourceDrawBuffers:" << compileResources.MaxDualSourceDrawBuffers
>-        << ":MaxViewsOVR:" << compileResources.MaxViewsOVR
>-        << ":NV_draw_buffers:" << compileResources.NV_draw_buffers
>-        << ":WEBGL_debug_shader_precision:" << compileResources.WEBGL_debug_shader_precision
>-        << ":MinProgramTextureGatherOffset:" << compileResources.MinProgramTextureGatherOffset
>-        << ":MaxProgramTextureGatherOffset:" << compileResources.MaxProgramTextureGatherOffset
>-        << ":MaxImageUnits:" << compileResources.MaxImageUnits
>-        << ":MaxVertexImageUniforms:" << compileResources.MaxVertexImageUniforms
>-        << ":MaxFragmentImageUniforms:" << compileResources.MaxFragmentImageUniforms
>-        << ":MaxComputeImageUniforms:" << compileResources.MaxComputeImageUniforms
>-        << ":MaxCombinedImageUniforms:" << compileResources.MaxCombinedImageUniforms
>-        << ":MaxCombinedShaderOutputResources:" << compileResources.MaxCombinedShaderOutputResources
>-        << ":MaxComputeWorkGroupCountX:" << compileResources.MaxComputeWorkGroupCount[0]
>-        << ":MaxComputeWorkGroupCountY:" << compileResources.MaxComputeWorkGroupCount[1]
>-        << ":MaxComputeWorkGroupCountZ:" << compileResources.MaxComputeWorkGroupCount[2]
>-        << ":MaxComputeWorkGroupSizeX:" << compileResources.MaxComputeWorkGroupSize[0]
>-        << ":MaxComputeWorkGroupSizeY:" << compileResources.MaxComputeWorkGroupSize[1]
>-        << ":MaxComputeWorkGroupSizeZ:" << compileResources.MaxComputeWorkGroupSize[2]
>-        << ":MaxComputeUniformComponents:" << compileResources.MaxComputeUniformComponents
>-        << ":MaxComputeTextureImageUnits:" << compileResources.MaxComputeTextureImageUnits
>-        << ":MaxComputeAtomicCounters:" << compileResources.MaxComputeAtomicCounters
>-        << ":MaxComputeAtomicCounterBuffers:" << compileResources.MaxComputeAtomicCounterBuffers
>-        << ":MaxVertexAtomicCounters:" << compileResources.MaxVertexAtomicCounters
>-        << ":MaxFragmentAtomicCounters:" << compileResources.MaxFragmentAtomicCounters
>-        << ":MaxCombinedAtomicCounters:" << compileResources.MaxCombinedAtomicCounters
>-        << ":MaxAtomicCounterBindings:" << compileResources.MaxAtomicCounterBindings
>-        << ":MaxVertexAtomicCounterBuffers:" << compileResources.MaxVertexAtomicCounterBuffers
>-        << ":MaxFragmentAtomicCounterBuffers:" << compileResources.MaxFragmentAtomicCounterBuffers
>-        << ":MaxCombinedAtomicCounterBuffers:" << compileResources.MaxCombinedAtomicCounterBuffers
>-        << ":MaxAtomicCounterBufferSize:" << compileResources.MaxAtomicCounterBufferSize
>-        << ":MaxGeometryUniformComponents:" << compileResources.MaxGeometryUniformComponents
>-        << ":MaxGeometryUniformBlocks:" << compileResources.MaxGeometryUniformBlocks
>-        << ":MaxGeometryInputComponents:" << compileResources.MaxGeometryInputComponents
>-        << ":MaxGeometryOutputComponents:" << compileResources.MaxGeometryOutputComponents
>-        << ":MaxGeometryOutputVertices:" << compileResources.MaxGeometryOutputVertices
>-        << ":MaxGeometryTotalOutputComponents:" << compileResources.MaxGeometryTotalOutputComponents
>-        << ":MaxGeometryTextureImageUnits:" << compileResources.MaxGeometryTextureImageUnits
>-        << ":MaxGeometryAtomicCounterBuffers:" << compileResources.MaxGeometryAtomicCounterBuffers
>-        << ":MaxGeometryAtomicCounters:" << compileResources.MaxGeometryAtomicCounters
>-        << ":MaxGeometryShaderStorageBlocks:" << compileResources.MaxGeometryShaderStorageBlocks
>-        << ":MaxGeometryShaderInvocations:" << compileResources.MaxGeometryShaderInvocations
>-        << ":MaxGeometryImageUniforms:" << compileResources.MaxGeometryImageUniforms;
>+    strstream << ":MaxVertexAttribs:" << mResources.MaxVertexAttribs
>+        << ":MaxVertexUniformVectors:" << mResources.MaxVertexUniformVectors
>+        << ":MaxVaryingVectors:" << mResources.MaxVaryingVectors
>+        << ":MaxVertexTextureImageUnits:" << mResources.MaxVertexTextureImageUnits
>+        << ":MaxCombinedTextureImageUnits:" << mResources.MaxCombinedTextureImageUnits
>+        << ":MaxTextureImageUnits:" << mResources.MaxTextureImageUnits
>+        << ":MaxFragmentUniformVectors:" << mResources.MaxFragmentUniformVectors
>+        << ":MaxDrawBuffers:" << mResources.MaxDrawBuffers
>+        << ":OES_standard_derivatives:" << mResources.OES_standard_derivatives
>+        << ":OES_EGL_image_external:" << mResources.OES_EGL_image_external
>+        << ":OES_EGL_image_external_essl3:" << mResources.OES_EGL_image_external_essl3
>+        << ":NV_EGL_stream_consumer_external:" << mResources.NV_EGL_stream_consumer_external
>+        << ":ARB_texture_rectangle:" << mResources.ARB_texture_rectangle
>+        << ":EXT_draw_buffers:" << mResources.EXT_draw_buffers
>+        << ":FragmentPrecisionHigh:" << mResources.FragmentPrecisionHigh
>+        << ":MaxExpressionComplexity:" << mResources.MaxExpressionComplexity
>+        << ":MaxCallStackDepth:" << mResources.MaxCallStackDepth
>+        << ":MaxFunctionParameters:" << mResources.MaxFunctionParameters
>+        << ":EXT_blend_func_extended:" << mResources.EXT_blend_func_extended
>+        << ":EXT_frag_depth:" << mResources.EXT_frag_depth
>+        << ":EXT_shader_texture_lod:" << mResources.EXT_shader_texture_lod
>+        << ":EXT_shader_framebuffer_fetch:" << mResources.EXT_shader_framebuffer_fetch
>+        << ":NV_shader_framebuffer_fetch:" << mResources.NV_shader_framebuffer_fetch
>+        << ":ARM_shader_framebuffer_fetch:" << mResources.ARM_shader_framebuffer_fetch
>+        << ":OVR_multiview2:" << mResources.OVR_multiview2
>+        << ":EXT_YUV_target:" << mResources.EXT_YUV_target
>+        << ":EXT_geometry_shader:" << mResources.EXT_geometry_shader
>+        << ":MaxVertexOutputVectors:" << mResources.MaxVertexOutputVectors
>+        << ":MaxFragmentInputVectors:" << mResources.MaxFragmentInputVectors
>+        << ":MinProgramTexelOffset:" << mResources.MinProgramTexelOffset
>+        << ":MaxProgramTexelOffset:" << mResources.MaxProgramTexelOffset
>+        << ":MaxDualSourceDrawBuffers:" << mResources.MaxDualSourceDrawBuffers
>+        << ":MaxViewsOVR:" << mResources.MaxViewsOVR
>+        << ":NV_draw_buffers:" << mResources.NV_draw_buffers
>+        << ":WEBGL_debug_shader_precision:" << mResources.WEBGL_debug_shader_precision
>+        << ":ANGLE_multi_draw:" << mResources.ANGLE_multi_draw
>+        << ":MinProgramTextureGatherOffset:" << mResources.MinProgramTextureGatherOffset
>+        << ":MaxProgramTextureGatherOffset:" << mResources.MaxProgramTextureGatherOffset
>+        << ":MaxImageUnits:" << mResources.MaxImageUnits
>+        << ":MaxVertexImageUniforms:" << mResources.MaxVertexImageUniforms
>+        << ":MaxFragmentImageUniforms:" << mResources.MaxFragmentImageUniforms
>+        << ":MaxComputeImageUniforms:" << mResources.MaxComputeImageUniforms
>+        << ":MaxCombinedImageUniforms:" << mResources.MaxCombinedImageUniforms
>+        << ":MaxCombinedShaderOutputResources:" << mResources.MaxCombinedShaderOutputResources
>+        << ":MaxComputeWorkGroupCountX:" << mResources.MaxComputeWorkGroupCount[0]
>+        << ":MaxComputeWorkGroupCountY:" << mResources.MaxComputeWorkGroupCount[1]
>+        << ":MaxComputeWorkGroupCountZ:" << mResources.MaxComputeWorkGroupCount[2]
>+        << ":MaxComputeWorkGroupSizeX:" << mResources.MaxComputeWorkGroupSize[0]
>+        << ":MaxComputeWorkGroupSizeY:" << mResources.MaxComputeWorkGroupSize[1]
>+        << ":MaxComputeWorkGroupSizeZ:" << mResources.MaxComputeWorkGroupSize[2]
>+        << ":MaxComputeUniformComponents:" << mResources.MaxComputeUniformComponents
>+        << ":MaxComputeTextureImageUnits:" << mResources.MaxComputeTextureImageUnits
>+        << ":MaxComputeAtomicCounters:" << mResources.MaxComputeAtomicCounters
>+        << ":MaxComputeAtomicCounterBuffers:" << mResources.MaxComputeAtomicCounterBuffers
>+        << ":MaxVertexAtomicCounters:" << mResources.MaxVertexAtomicCounters
>+        << ":MaxFragmentAtomicCounters:" << mResources.MaxFragmentAtomicCounters
>+        << ":MaxCombinedAtomicCounters:" << mResources.MaxCombinedAtomicCounters
>+        << ":MaxAtomicCounterBindings:" << mResources.MaxAtomicCounterBindings
>+        << ":MaxVertexAtomicCounterBuffers:" << mResources.MaxVertexAtomicCounterBuffers
>+        << ":MaxFragmentAtomicCounterBuffers:" << mResources.MaxFragmentAtomicCounterBuffers
>+        << ":MaxCombinedAtomicCounterBuffers:" << mResources.MaxCombinedAtomicCounterBuffers
>+        << ":MaxAtomicCounterBufferSize:" << mResources.MaxAtomicCounterBufferSize
>+        << ":MaxGeometryUniformComponents:" << mResources.MaxGeometryUniformComponents
>+        << ":MaxGeometryUniformBlocks:" << mResources.MaxGeometryUniformBlocks
>+        << ":MaxGeometryInputComponents:" << mResources.MaxGeometryInputComponents
>+        << ":MaxGeometryOutputComponents:" << mResources.MaxGeometryOutputComponents
>+        << ":MaxGeometryOutputVertices:" << mResources.MaxGeometryOutputVertices
>+        << ":MaxGeometryTotalOutputComponents:" << mResources.MaxGeometryTotalOutputComponents
>+        << ":MaxGeometryTextureImageUnits:" << mResources.MaxGeometryTextureImageUnits
>+        << ":MaxGeometryAtomicCounterBuffers:" << mResources.MaxGeometryAtomicCounterBuffers
>+        << ":MaxGeometryAtomicCounters:" << mResources.MaxGeometryAtomicCounters
>+        << ":MaxGeometryShaderStorageBlocks:" << mResources.MaxGeometryShaderStorageBlocks
>+        << ":MaxGeometryShaderInvocations:" << mResources.MaxGeometryShaderInvocations
>+        << ":MaxGeometryImageUniforms:" << mResources.MaxGeometryImageUniforms;
>     // clang-format on
> 
>-    builtInResourcesString = strstream.str();
>+    mBuiltInResourcesString = strstream.str();
> }
> 
> void TCompiler::collectInterfaceBlocks()
> {
>-    ASSERT(interfaceBlocks.empty());
>-    interfaceBlocks.reserve(uniformBlocks.size() + shaderStorageBlocks.size() + inBlocks.size());
>-    interfaceBlocks.insert(interfaceBlocks.end(), uniformBlocks.begin(), uniformBlocks.end());
>-    interfaceBlocks.insert(interfaceBlocks.end(), shaderStorageBlocks.begin(),
>-                           shaderStorageBlocks.end());
>-    interfaceBlocks.insert(interfaceBlocks.end(), inBlocks.begin(), inBlocks.end());
>+    ASSERT(mInterfaceBlocks.empty());
>+    mInterfaceBlocks.reserve(mUniformBlocks.size() + mShaderStorageBlocks.size() +
>+                             mInBlocks.size());
>+    mInterfaceBlocks.insert(mInterfaceBlocks.end(), mUniformBlocks.begin(), mUniformBlocks.end());
>+    mInterfaceBlocks.insert(mInterfaceBlocks.end(), mShaderStorageBlocks.begin(),
>+                            mShaderStorageBlocks.end());
>+    mInterfaceBlocks.insert(mInterfaceBlocks.end(), mInBlocks.begin(), mInBlocks.end());
> }
> 
> void TCompiler::clearResults()
> {
>-    arrayBoundsClamper.Cleanup();
>-    infoSink.info.erase();
>-    infoSink.obj.erase();
>-    infoSink.debug.erase();
>+    mArrayBoundsClamper.Cleanup();
>+    mInfoSink.info.erase();
>+    mInfoSink.obj.erase();
>+    mInfoSink.debug.erase();
>     mDiagnostics.resetErrorCount();
> 
>-    attributes.clear();
>-    outputVariables.clear();
>-    uniforms.clear();
>-    inputVaryings.clear();
>-    outputVaryings.clear();
>-    interfaceBlocks.clear();
>-    uniformBlocks.clear();
>-    shaderStorageBlocks.clear();
>-    inBlocks.clear();
>-    variablesCollected = false;
>+    mAttributes.clear();
>+    mOutputVariables.clear();
>+    mUniforms.clear();
>+    mInputVaryings.clear();
>+    mOutputVaryings.clear();
>+    mInterfaceBlocks.clear();
>+    mUniformBlocks.clear();
>+    mShaderStorageBlocks.clear();
>+    mInBlocks.clear();
>+    mVariablesCollected    = false;
>     mGLPositionInitialized = false;
> 
>     mNumViews = -1;
>@@ -859,11 +1060,13 @@ void TCompiler::clearResults()
>     mGeometryShaderInvocations         = 0;
>     mGeometryShaderMaxVertices         = -1;
> 
>-    builtInFunctionEmulator.cleanup();
>+    mBuiltInFunctionEmulator.cleanup();
> 
>-    nameMap.clear();
>+    mNameMap.clear();
> 
>-    mSourcePath     = nullptr;
>+    mSourcePath = nullptr;
>+
>+    mSymbolTable.clearCompilationResults();
> }
> 
> bool TCompiler::initCallDag(TIntermNode *root)
>@@ -891,32 +1094,35 @@ bool TCompiler::checkCallDepth()
> 
>     for (size_t i = 0; i < mCallDag.size(); i++)
>     {
>-        int depth    = 0;
>-        auto &record = mCallDag.getRecordFromIndex(i);
>+        int depth                     = 0;
>+        const CallDAG::Record &record = mCallDag.getRecordFromIndex(i);
> 
>-        for (auto &calleeIndex : record.callees)
>+        for (const int &calleeIndex : record.callees)
>         {
>             depth = std::max(depth, depths[calleeIndex] + 1);
>         }
> 
>         depths[i] = depth;
> 
>-        if (depth >= maxCallStackDepth)
>+        if (depth >= mResources.MaxCallStackDepth)
>         {
>             // Trace back the function chain to have a meaningful info log.
>-            std::stringstream errorStream;
>-            errorStream << "Call stack too deep (larger than " << maxCallStackDepth
>-                        << ") with the following call chain: " << record.name;
>+            std::stringstream errorStream = sh::InitializeStream<std::stringstream>();
>+            errorStream << "Call stack too deep (larger than " << mResources.MaxCallStackDepth
>+                        << ") with the following call chain: "
>+                        << record.node->getFunction()->name();
> 
>             int currentFunction = static_cast<int>(i);
>             int currentDepth    = depth;
> 
>             while (currentFunction != -1)
>             {
>-                errorStream << " -> " << mCallDag.getRecordFromIndex(currentFunction).name;
>+                errorStream
>+                    << " -> "
>+                    << mCallDag.getRecordFromIndex(currentFunction).node->getFunction()->name();
> 
>                 int nextFunction = -1;
>-                for (auto &calleeIndex : mCallDag.getRecordFromIndex(currentFunction).callees)
>+                for (const int &calleeIndex : mCallDag.getRecordFromIndex(currentFunction).callees)
>                 {
>                     if (depths[calleeIndex] == currentDepth - 1)
>                     {
>@@ -943,7 +1149,7 @@ bool TCompiler::tagUsedFunctions()
>     // Search from main, starting from the end of the DAG as it usually is the root.
>     for (size_t i = mCallDag.size(); i-- > 0;)
>     {
>-        if (mCallDag.getRecordFromIndex(i).name == "main")
>+        if (mCallDag.getRecordFromIndex(i).node->getFunction()->isMain())
>         {
>             internalTagUsedFunction(i);
>             return true;
>@@ -956,12 +1162,12 @@ bool TCompiler::tagUsedFunctions()
> 
> void TCompiler::internalTagUsedFunction(size_t index)
> {
>-    if (functionMetadata[index].used)
>+    if (mFunctionMetadata[index].used)
>     {
>         return;
>     }
> 
>-    functionMetadata[index].used = true;
>+    mFunctionMetadata[index].used = true;
> 
>     for (int calleeIndex : mCallDag.getRecordFromIndex(index).callees)
>     {
>@@ -975,30 +1181,29 @@ class TCompiler::UnusedPredicate
>   public:
>     UnusedPredicate(const CallDAG *callDag, const std::vector<FunctionMetadata> *metadatas)
>         : mCallDag(callDag), mMetadatas(metadatas)
>-    {
>-    }
>+    {}
> 
>     bool operator()(TIntermNode *node)
>     {
>         const TIntermFunctionPrototype *asFunctionPrototype   = node->getAsFunctionPrototypeNode();
>         const TIntermFunctionDefinition *asFunctionDefinition = node->getAsFunctionDefinition();
> 
>-        const TFunctionSymbolInfo *functionInfo = nullptr;
>+        const TFunction *func = nullptr;
> 
>         if (asFunctionDefinition)
>         {
>-            functionInfo = asFunctionDefinition->getFunctionSymbolInfo();
>+            func = asFunctionDefinition->getFunction();
>         }
>         else if (asFunctionPrototype)
>         {
>-            functionInfo = asFunctionPrototype->getFunctionSymbolInfo();
>+            func = asFunctionPrototype->getFunction();
>         }
>-        if (functionInfo == nullptr)
>+        if (func == nullptr)
>         {
>             return false;
>         }
> 
>-        size_t callDagIndex = mCallDag->findIndex(functionInfo);
>+        size_t callDagIndex = mCallDag->findIndex(func->uniqueId());
>         if (callDagIndex == CallDAG::InvalidIndex)
>         {
>             // This happens only for unimplemented prototypes which are thus unused
>@@ -1017,7 +1222,7 @@ class TCompiler::UnusedPredicate
> 
> void TCompiler::pruneUnusedFunctions(TIntermBlock *root)
> {
>-    UnusedPredicate isUnused(&mCallDag, &functionMetadata);
>+    UnusedPredicate isUnused(&mCallDag, &mFunctionMetadata);
>     TIntermSequence *sequence = root->getSequence();
> 
>     if (!sequence->empty())
>@@ -1029,13 +1234,13 @@ void TCompiler::pruneUnusedFunctions(TIntermBlock *root)
> 
> bool TCompiler::limitExpressionComplexity(TIntermBlock *root)
> {
>-    if (!IsASTDepthBelowLimit(root, maxExpressionComplexity))
>+    if (!IsASTDepthBelowLimit(root, mResources.MaxExpressionComplexity))
>     {
>         mDiagnostics.globalError("Expression too complex.");
>         return false;
>     }
> 
>-    if (!ValidateMaxParameters(root, maxFunctionParameters))
>+    if (!ValidateMaxParameters(root, mResources.MaxFunctionParameters))
>     {
>         mDiagnostics.globalError("Function has too many parameters.");
>         return false;
>@@ -1051,7 +1256,7 @@ bool TCompiler::shouldCollectVariables(ShCompileOptions compileOptions)
> 
> bool TCompiler::wereVariablesCollected() const
> {
>-    return variablesCollected;
>+    return mVariablesCollected;
> }
> 
> void TCompiler::initializeGLPosition(TIntermBlock *root)
>@@ -1060,14 +1265,15 @@ void TCompiler::initializeGLPosition(TIntermBlock *root)
>     sh::ShaderVariable var(GL_FLOAT_VEC4);
>     var.name = "gl_Position";
>     list.push_back(var);
>-    InitializeVariables(root, list, &symbolTable, shaderVersion, extensionBehavior, false);
>+    InitializeVariables(root, list, &mSymbolTable, mShaderVersion, mExtensionBehavior, false,
>+                        false);
> }
> 
> void TCompiler::useAllMembersInUnusedStandardAndSharedBlocks(TIntermBlock *root)
> {
>     sh::InterfaceBlockList list;
> 
>-    for (const auto& block : uniformBlocks)
>+    for (const sh::InterfaceBlock &block : mUniformBlocks)
>     {
>         if (!block.staticUse &&
>             (block.layout == sh::BLOCKLAYOUT_STD140 || block.layout == sh::BLOCKLAYOUT_SHARED))
>@@ -1076,15 +1282,15 @@ void TCompiler::useAllMembersInUnusedStandardAndSharedBlocks(TIntermBlock *root)
>         }
>     }
> 
>-    sh::UseInterfaceBlockFields(root, list, symbolTable);
>+    sh::UseInterfaceBlockFields(root, list, mSymbolTable);
> }
> 
> void TCompiler::initializeOutputVariables(TIntermBlock *root)
> {
>     InitVariableList list;
>-    if (shaderType == GL_VERTEX_SHADER || shaderType == GL_GEOMETRY_SHADER_OES)
>+    if (mShaderType == GL_VERTEX_SHADER || mShaderType == GL_GEOMETRY_SHADER_EXT)
>     {
>-        for (const auto& var : outputVaryings)
>+        for (const sh::Varying &var : mOutputVaryings)
>         {
>             list.push_back(var);
>             if (var.name == "gl_Position")
>@@ -1096,18 +1302,19 @@ void TCompiler::initializeOutputVariables(TIntermBlock *root)
>     }
>     else
>     {
>-        ASSERT(shaderType == GL_FRAGMENT_SHADER);
>-        for (const auto& var : outputVariables)
>+        ASSERT(mShaderType == GL_FRAGMENT_SHADER);
>+        for (const sh::OutputVariable &var : mOutputVariables)
>         {
>             list.push_back(var);
>         }
>     }
>-    InitializeVariables(root, list, &symbolTable, shaderVersion, extensionBehavior, false);
>+    InitializeVariables(root, list, &mSymbolTable, mShaderVersion, mExtensionBehavior, false,
>+                        false);
> }
> 
> const TExtensionBehavior &TCompiler::getExtensionBehavior() const
> {
>-    return extensionBehavior;
>+    return mExtensionBehavior;
> }
> 
> const char *TCompiler::getSourcePath() const
>@@ -1117,29 +1324,29 @@ const char *TCompiler::getSourcePath() const
> 
> const ShBuiltInResources &TCompiler::getResources() const
> {
>-    return compileResources;
>+    return mResources;
> }
> 
> const ArrayBoundsClamper &TCompiler::getArrayBoundsClamper() const
> {
>-    return arrayBoundsClamper;
>+    return mArrayBoundsClamper;
> }
> 
> ShArrayIndexClampingStrategy TCompiler::getArrayIndexClampingStrategy() const
> {
>-    return clampingStrategy;
>+    return mResources.ArrayIndexClampingStrategy;
> }
> 
> const BuiltInFunctionEmulator &TCompiler::getBuiltInFunctionEmulator() const
> {
>-    return builtInFunctionEmulator;
>+    return mBuiltInFunctionEmulator;
> }
> 
> void TCompiler::writePragma(ShCompileOptions compileOptions)
> {
>     if (!(compileOptions & SH_FLATTEN_PRAGMA_STDGL_INVARIANT_ALL))
>     {
>-        TInfoSinkBase &sink = infoSink.obj;
>+        TInfoSinkBase &sink = mInfoSink.obj;
>         if (mPragma.stdgl.invariantAll)
>             sink << "#pragma STDGL invariant(all)\n";
>     }
>@@ -1147,17 +1354,17 @@ void TCompiler::writePragma(ShCompileOptions compileOptions)
> 
> bool TCompiler::isVaryingDefined(const char *varyingName)
> {
>-    ASSERT(variablesCollected);
>-    for (size_t ii = 0; ii < inputVaryings.size(); ++ii)
>+    ASSERT(mVariablesCollected);
>+    for (size_t ii = 0; ii < mInputVaryings.size(); ++ii)
>     {
>-        if (inputVaryings[ii].name == varyingName)
>+        if (mInputVaryings[ii].name == varyingName)
>         {
>             return true;
>         }
>     }
>-    for (size_t ii = 0; ii < outputVaryings.size(); ++ii)
>+    for (size_t ii = 0; ii < mOutputVaryings.size(); ++ii)
>     {
>-        if (outputVaryings[ii].name == varyingName)
>+        if (mOutputVaryings[ii].name == varyingName)
>         {
>             return true;
>         }
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/Compiler.h b/Source/ThirdParty/ANGLE/src/compiler/translator/Compiler.h
>index 753cfb8e7b2..392f7ecd29d 100644
>--- a/Source/ThirdParty/ANGLE/src/compiler/translator/Compiler.h
>+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/Compiler.h
>@@ -24,6 +24,7 @@
> #include "compiler/translator/InfoSink.h"
> #include "compiler/translator/Pragma.h"
> #include "compiler/translator/SymbolTable.h"
>+#include "compiler/translator/ValidateAST.h"
> #include "third_party/compiler/ArrayBoundsClamper.h"
> 
> namespace sh
>@@ -35,11 +36,6 @@ class TParseContext;
> class TranslatorHLSL;
> #endif  // ANGLE_ENABLE_HLSL
> 
>-//
>-// Helper function to identify specs that are based on the WebGL spec.
>-//
>-bool IsWebGLBasedSpec(ShShaderSpec spec);
>-
> //
> // Helper function to check if the shader type is GLSL.
> //
>@@ -71,7 +67,7 @@ class TShHandleBase
>   protected:
>     // Memory allocator. Allocates and tracks memory required by the compiler.
>     // Deallocates all memory when compiler is destructed.
>-    TPoolAllocator allocator;
>+    angle::PoolAllocator allocator;
> };
> 
> //
>@@ -99,8 +95,8 @@ class TCompiler : public TShHandleBase
>                  ShCompileOptions compileOptions);
> 
>     // Get results of the last compilation.
>-    int getShaderVersion() const { return shaderVersion; }
>-    TInfoSink &getInfoSink() { return infoSink; }
>+    int getShaderVersion() const { return mShaderVersion; }
>+    TInfoSink &getInfoSink() { return mInfoSink; }
> 
>     bool isComputeShaderLocalSizeDeclared() const { return mComputeShaderLocalSizeDeclared; }
>     const sh::WorkGroupSize &getComputeShaderLocalSize() const { return mComputeShaderLocalSize; }
>@@ -109,25 +105,25 @@ class TCompiler : public TShHandleBase
>     // Clears the results from the previous compilation.
>     void clearResults();
> 
>-    const std::vector<sh::Attribute> &getAttributes() const { return attributes; }
>-    const std::vector<sh::OutputVariable> &getOutputVariables() const { return outputVariables; }
>-    const std::vector<sh::Uniform> &getUniforms() const { return uniforms; }
>-    const std::vector<sh::Varying> &getInputVaryings() const { return inputVaryings; }
>-    const std::vector<sh::Varying> &getOutputVaryings() const { return outputVaryings; }
>-    const std::vector<sh::InterfaceBlock> &getInterfaceBlocks() const { return interfaceBlocks; }
>-    const std::vector<sh::InterfaceBlock> &getUniformBlocks() const { return uniformBlocks; }
>+    const std::vector<sh::Attribute> &getAttributes() const { return mAttributes; }
>+    const std::vector<sh::OutputVariable> &getOutputVariables() const { return mOutputVariables; }
>+    const std::vector<sh::Uniform> &getUniforms() const { return mUniforms; }
>+    const std::vector<sh::Varying> &getInputVaryings() const { return mInputVaryings; }
>+    const std::vector<sh::Varying> &getOutputVaryings() const { return mOutputVaryings; }
>+    const std::vector<sh::InterfaceBlock> &getInterfaceBlocks() const { return mInterfaceBlocks; }
>+    const std::vector<sh::InterfaceBlock> &getUniformBlocks() const { return mUniformBlocks; }
>     const std::vector<sh::InterfaceBlock> &getShaderStorageBlocks() const
>     {
>-        return shaderStorageBlocks;
>+        return mShaderStorageBlocks;
>     }
>-    const std::vector<sh::InterfaceBlock> &getInBlocks() const { return inBlocks; }
>+    const std::vector<sh::InterfaceBlock> &getInBlocks() const { return mInBlocks; }
> 
>-    ShHashFunction64 getHashFunction() const { return hashFunction; }
>-    NameMap &getNameMap() { return nameMap; }
>-    TSymbolTable &getSymbolTable() { return symbolTable; }
>-    ShShaderSpec getShaderSpec() const { return shaderSpec; }
>-    ShShaderOutput getOutputType() const { return outputType; }
>-    const std::string &getBuiltInResourcesString() const { return builtInResourcesString; }
>+    ShHashFunction64 getHashFunction() const { return mResources.HashFunction; }
>+    NameMap &getNameMap() { return mNameMap; }
>+    TSymbolTable &getSymbolTable() { return mSymbolTable; }
>+    ShShaderSpec getShaderSpec() const { return mShaderSpec; }
>+    ShShaderOutput getOutputType() const { return mOutputType; }
>+    const std::string &getBuiltInResourcesString() const { return mBuiltInResourcesString; }
> 
>     bool shouldRunLoopAndIndexingValidation(ShCompileOptions compileOptions) const;
> 
>@@ -145,36 +141,17 @@ class TCompiler : public TShHandleBase
>         return mGeometryShaderOutputPrimitiveType;
>     }
> 
>-    sh::GLenum getShaderType() const { return shaderType; }
>+    sh::GLenum getShaderType() const { return mShaderType; }
> 
>   protected:
>-    // Initialize symbol-table with built-in symbols.
>-    bool InitBuiltInSymbolTable(const ShBuiltInResources &resources);
>-    // Compute the string representation of the built-in resources
>-    void setResourceString();
>-    // Return false if the call depth is exceeded.
>-    bool checkCallDepth();
>     // Add emulated functions to the built-in function emulator.
>     virtual void initBuiltInFunctionEmulator(BuiltInFunctionEmulator *emu,
>-                                             ShCompileOptions compileOptions){};
>+                                             ShCompileOptions compileOptions)
>+    {}
>     // Translate to object code. May generate performance warnings through the diagnostics.
>     virtual void translate(TIntermBlock *root,
>                            ShCompileOptions compileOptions,
>                            PerformanceDiagnostics *perfDiagnostics) = 0;
>-    // Insert statements to reference all members in unused uniform blocks with standard and shared
>-    // layout. This is to work around a Mac driver that treats unused standard/shared
>-    // uniform blocks as inactive.
>-    void useAllMembersInUnusedStandardAndSharedBlocks(TIntermBlock *root);
>-    // Insert statements to initialize output variables in the beginning of main().
>-    // This is to avoid undefined behaviors.
>-    void initializeOutputVariables(TIntermBlock *root);
>-    // Insert gl_Position = vec4(0,0,0,0) to the beginning of main().
>-    // It is to work around a Linux driver bug where missing this causes compile failure
>-    // while spec says it is allowed.
>-    // This function should only be applied to vertex shaders.
>-    void initializeGLPosition(TIntermBlock *root);
>-    // Return true if the maximum expression complexity is below the limit.
>-    bool limitExpressionComplexity(TIntermBlock *root);
>     // Get built-in extensions with default behavior.
>     const TExtensionBehavior &getExtensionBehavior() const;
>     const char *getSourcePath() const;
>@@ -191,28 +168,46 @@ class TCompiler : public TShHandleBase
>     virtual bool shouldCollectVariables(ShCompileOptions compileOptions);
> 
>     bool wereVariablesCollected() const;
>-    std::vector<sh::Attribute> attributes;
>-    std::vector<sh::OutputVariable> outputVariables;
>-    std::vector<sh::Uniform> uniforms;
>-    std::vector<sh::Varying> inputVaryings;
>-    std::vector<sh::Varying> outputVaryings;
>-    std::vector<sh::InterfaceBlock> interfaceBlocks;
>-    std::vector<sh::InterfaceBlock> uniformBlocks;
>-    std::vector<sh::InterfaceBlock> shaderStorageBlocks;
>-    std::vector<sh::InterfaceBlock> inBlocks;
>+    std::vector<sh::Attribute> mAttributes;
>+    std::vector<sh::OutputVariable> mOutputVariables;
>+    std::vector<sh::Uniform> mUniforms;
>+    std::vector<sh::Varying> mInputVaryings;
>+    std::vector<sh::Varying> mOutputVaryings;
>+    std::vector<sh::InterfaceBlock> mInterfaceBlocks;
>+    std::vector<sh::InterfaceBlock> mUniformBlocks;
>+    std::vector<sh::InterfaceBlock> mShaderStorageBlocks;
>+    std::vector<sh::InterfaceBlock> mInBlocks;
> 
>   private:
>+    // Initialize symbol-table with built-in symbols.
>+    bool initBuiltInSymbolTable(const ShBuiltInResources &resources);
>+    // Compute the string representation of the built-in resources
>+    void setResourceString();
>+    // Return false if the call depth is exceeded.
>+    bool checkCallDepth();
>+    // Insert statements to reference all members in unused uniform blocks with standard and shared
>+    // layout. This is to work around a Mac driver that treats unused standard/shared
>+    // uniform blocks as inactive.
>+    void useAllMembersInUnusedStandardAndSharedBlocks(TIntermBlock *root);
>+    // Insert statements to initialize output variables in the beginning of main().
>+    // This is to avoid undefined behaviors.
>+    void initializeOutputVariables(TIntermBlock *root);
>+    // Insert gl_Position = vec4(0,0,0,0) to the beginning of main().
>+    // It is to work around a Linux driver bug where missing this causes compile failure
>+    // while spec says it is allowed.
>+    // This function should only be applied to vertex shaders.
>+    void initializeGLPosition(TIntermBlock *root);
>+    // Return true if the maximum expression complexity is below the limit.
>+    bool limitExpressionComplexity(TIntermBlock *root);
>     // Creates the function call DAG for further analysis, returning false if there is a recursion
>     bool initCallDag(TIntermNode *root);
>     // Return false if "main" doesn't exist
>     bool tagUsedFunctions();
>     void internalTagUsedFunction(size_t index);
> 
>-    void initSamplerDefaultPrecision(TBasicType samplerType);
>-
>     void collectInterfaceBlocks();
> 
>-    bool variablesCollected;
>+    bool mVariablesCollected;
> 
>     bool mGLPositionInitialized;
> 
>@@ -228,14 +223,17 @@ class TCompiler : public TShHandleBase
>     // version.
>     void setASTMetadata(const TParseContext &parseContext);
> 
>+    // Check if shader version meets the requirement.
>+    bool checkShaderVersion(TParseContext *parseContext);
>+
>     // Does checks that need to be run after parsing is complete and returns true if they pass.
>     bool checkAndSimplifyAST(TIntermBlock *root,
>                              const TParseContext &parseContext,
>                              ShCompileOptions compileOptions);
> 
>-    sh::GLenum shaderType;
>-    ShShaderSpec shaderSpec;
>-    ShShaderOutput outputType;
>+    sh::GLenum mShaderType;
>+    ShShaderSpec mShaderSpec;
>+    ShShaderOutput mOutputType;
> 
>     struct FunctionMetadata
>     {
>@@ -244,30 +242,23 @@ class TCompiler : public TShHandleBase
>     };
> 
>     CallDAG mCallDag;
>-    std::vector<FunctionMetadata> functionMetadata;
>+    std::vector<FunctionMetadata> mFunctionMetadata;
> 
>-    int maxUniformVectors;
>-    int maxExpressionComplexity;
>-    int maxCallStackDepth;
>-    int maxFunctionParameters;
>-
>-    ShBuiltInResources compileResources;
>-    std::string builtInResourcesString;
>+    ShBuiltInResources mResources;
>+    std::string mBuiltInResourcesString;
> 
>     // Built-in symbol table for the given language, spec, and resources.
>     // It is preserved from compile-to-compile.
>-    TSymbolTable symbolTable;
>+    TSymbolTable mSymbolTable;
>     // Built-in extensions with default behavior.
>-    TExtensionBehavior extensionBehavior;
>-    bool fragmentPrecisionHigh;
>+    TExtensionBehavior mExtensionBehavior;
> 
>-    ArrayBoundsClamper arrayBoundsClamper;
>-    ShArrayIndexClampingStrategy clampingStrategy;
>-    BuiltInFunctionEmulator builtInFunctionEmulator;
>+    ArrayBoundsClamper mArrayBoundsClamper;
>+    BuiltInFunctionEmulator mBuiltInFunctionEmulator;
> 
>     // Results of compilation.
>-    int shaderVersion;
>-    TInfoSink infoSink;       // Output sink.
>+    int mShaderVersion;
>+    TInfoSink mInfoSink;  // Output sink.
>     TDiagnostics mDiagnostics;
>     const char *mSourcePath;  // Path of source file or NULL
> 
>@@ -285,10 +276,12 @@ class TCompiler : public TShHandleBase
>     TLayoutPrimitiveType mGeometryShaderOutputPrimitiveType;
> 
>     // name hashing.
>-    ShHashFunction64 hashFunction;
>-    NameMap nameMap;
>+    NameMap mNameMap;
> 
>     TPragma mPragma;
>+
>+    // Track what should be validated given passes currently applied.
>+    ValidateASTOptions mValidateASTOptions;
> };
> 
> //
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/ConstantUnion.cpp b/Source/ThirdParty/ANGLE/src/compiler/translator/ConstantUnion.cpp
>index 7004aedee3f..c6389f40ef5 100644
>--- a/Source/ThirdParty/ANGLE/src/compiler/translator/ConstantUnion.cpp
>+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/ConstantUnion.cpp
>@@ -157,7 +157,16 @@ bool TConstantUnion::cast(TBasicType newType, const TConstantUnion &constant)
>                     setUConst(static_cast<unsigned int>(constant.getBConst()));
>                     break;
>                 case EbtFloat:
>-                    setUConst(static_cast<unsigned int>(constant.getFConst()));
>+                    if (constant.getFConst() < 0.0f)
>+                    {
>+                        // Avoid undefined behavior in C++ by first casting to signed int.
>+                        setUConst(
>+                            static_cast<unsigned int>(static_cast<int>(constant.getFConst())));
>+                    }
>+                    else
>+                    {
>+                        setUConst(static_cast<unsigned int>(constant.getFConst()));
>+                    }
>                     break;
>                 default:
>                     return false;
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/ConstantUnion.h b/Source/ThirdParty/ANGLE/src/compiler/translator/ConstantUnion.h
>index c1b3db90707..155fcd44b08 100644
>--- a/Source/ThirdParty/ANGLE/src/compiler/translator/ConstantUnion.h
>+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/ConstantUnion.h
>@@ -9,8 +9,8 @@
> 
> #include <assert.h>
> 
>-#include "compiler/translator/Common.h"
> #include "compiler/translator/BaseTypes.h"
>+#include "compiler/translator/Common.h"
> 
> namespace sh
> {
>@@ -20,7 +20,7 @@ class TDiagnostics;
> class TConstantUnion
> {
>   public:
>-    POOL_ALLOCATOR_NEW_DELETE();
>+    POOL_ALLOCATOR_NEW_DELETE
>     TConstantUnion();
> 
>     bool cast(TBasicType newType, const TConstantUnion &constant);
>@@ -100,8 +100,10 @@ class TConstantUnion
>     TConstantUnion operator||(const TConstantUnion &constant) const;
> 
>     TBasicType getType() const { return type; }
>+
>   private:
>-    union {
>+    union
>+    {
>         int iConst;           // used for ivec, scalar ints
>         unsigned int uConst;  // used for uvec, scalar uints
>         bool bConst;          // used for bvec, scalar bools
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/Declarator.cpp b/Source/ThirdParty/ANGLE/src/compiler/translator/Declarator.cpp
>new file mode 100644
>index 00000000000..7a17a82b6a0
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/Declarator.cpp
>@@ -0,0 +1,33 @@
>+//
>+// Copyright (c) 2017 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// Declarator.cpp:
>+//   Declarator type for parsing structure field declarators.
>+
>+#include "compiler/translator/Declarator.h"
>+
>+namespace sh
>+{
>+
>+TDeclarator::TDeclarator(const ImmutableString &name, const TSourceLoc &line)
>+    : mName(name), mArraySizes(nullptr), mLine(line)
>+{
>+    ASSERT(mName != "");
>+}
>+
>+TDeclarator::TDeclarator(const ImmutableString &name,
>+                         const TVector<unsigned int> *arraySizes,
>+                         const TSourceLoc &line)
>+    : mName(name), mArraySizes(arraySizes), mLine(line)
>+{
>+    ASSERT(mArraySizes);
>+}
>+
>+bool TDeclarator::isArray() const
>+{
>+    return mArraySizes != nullptr && mArraySizes->size() > 0;
>+}
>+
>+}  // namespace sh
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/Declarator.h b/Source/ThirdParty/ANGLE/src/compiler/translator/Declarator.h
>new file mode 100644
>index 00000000000..5b5d26b53ad
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/Declarator.h
>@@ -0,0 +1,49 @@
>+//
>+// Copyright (c) 2017 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// Declarator.h:
>+//   Declarator type for parsing structure field declarators.
>+
>+#ifndef COMPILER_TRANSLATOR_DECLARATOR_H_
>+#define COMPILER_TRANSLATOR_DECLARATOR_H_
>+
>+#include "compiler/translator/Common.h"
>+#include "compiler/translator/ImmutableString.h"
>+
>+namespace sh
>+{
>+
>+// Declarator like "a[2][4]". Only used for parsing structure field declarators.
>+class TDeclarator : angle::NonCopyable
>+{
>+  public:
>+    POOL_ALLOCATOR_NEW_DELETE
>+    TDeclarator(const ImmutableString &name, const TSourceLoc &line);
>+
>+    TDeclarator(const ImmutableString &name,
>+                const TVector<unsigned int> *arraySizes,
>+                const TSourceLoc &line);
>+
>+    const ImmutableString &name() const { return mName; }
>+
>+    bool isArray() const;
>+    const TVector<unsigned int> *arraySizes() const { return mArraySizes; }
>+
>+    const TSourceLoc &line() const { return mLine; }
>+
>+  private:
>+    const ImmutableString mName;
>+
>+    // Outermost array size is stored at the end of the vector.
>+    const TVector<unsigned int> *const mArraySizes;
>+
>+    const TSourceLoc mLine;
>+};
>+
>+using TDeclaratorList = TVector<TDeclarator *>;
>+
>+}  // namespace sh
>+
>+#endif  // COMPILER_TRANSLATOR_DECLARATOR_H_
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/DeclareAndInitBuiltinsForInstancedMultiview.cpp b/Source/ThirdParty/ANGLE/src/compiler/translator/DeclareAndInitBuiltinsForInstancedMultiview.cpp
>deleted file mode 100644
>index ce9828f1f91..00000000000
>--- a/Source/ThirdParty/ANGLE/src/compiler/translator/DeclareAndInitBuiltinsForInstancedMultiview.cpp
>+++ /dev/null
>@@ -1,221 +0,0 @@
>-//
>-// Copyright (c) 2017 The ANGLE Project Authors. All rights reserved.
>-// Use of this source code is governed by a BSD-style license that can be
>-// found in the LICENSE file.
>-//
>-// Applies the necessary AST transformations to support multiview rendering through instancing.
>-// Check the header file For more information.
>-//
>-
>-#include "compiler/translator/DeclareAndInitBuiltinsForInstancedMultiview.h"
>-
>-#include "compiler/translator/FindMain.h"
>-#include "compiler/translator/InitializeVariables.h"
>-#include "compiler/translator/IntermNode_util.h"
>-#include "compiler/translator/IntermTraverse.h"
>-#include "compiler/translator/SymbolTable.h"
>-#include "compiler/translator/util.h"
>-
>-namespace sh
>-{
>-
>-namespace
>-{
>-
>-class ReplaceVariableTraverser : public TIntermTraverser
>-{
>-  public:
>-    ReplaceVariableTraverser(const TString &symbolName, TIntermSymbol *newSymbol)
>-        : TIntermTraverser(true, false, false), mSymbolName(symbolName), mNewSymbol(newSymbol)
>-    {
>-    }
>-
>-    void visitSymbol(TIntermSymbol *node) override
>-    {
>-        TName &name = node->getName();
>-        if (name.getString() == mSymbolName)
>-        {
>-            queueReplacement(mNewSymbol->deepCopy(), OriginalNode::IS_DROPPED);
>-        }
>-    }
>-
>-  private:
>-    TString mSymbolName;
>-    TIntermSymbol *mNewSymbol;
>-};
>-
>-TIntermSymbol *CreateGLInstanceIDSymbol(const TSymbolTable &symbolTable)
>-{
>-    return ReferenceBuiltInVariable("gl_InstanceID", symbolTable, 300);
>-}
>-
>-// Adds the InstanceID and ViewID_OVR initializers to the end of the initializers' sequence.
>-void InitializeViewIDAndInstanceID(TIntermTyped *viewIDSymbol,
>-                                   TIntermTyped *instanceIDSymbol,
>-                                   unsigned numberOfViews,
>-                                   const TSymbolTable &symbolTable,
>-                                   TIntermSequence *initializers)
>-{
>-    // Create an unsigned numberOfViews node.
>-    TConstantUnion *numberOfViewsUnsignedConstant = new TConstantUnion();
>-    numberOfViewsUnsignedConstant->setUConst(numberOfViews);
>-    TIntermConstantUnion *numberOfViewsUint =
>-        new TIntermConstantUnion(numberOfViewsUnsignedConstant, TType(EbtUInt, EbpHigh, EvqConst));
>-
>-    // Create a uint(gl_InstanceID) node.
>-    TIntermSequence *glInstanceIDSymbolCastArguments = new TIntermSequence();
>-    glInstanceIDSymbolCastArguments->push_back(CreateGLInstanceIDSymbol(symbolTable));
>-    TIntermAggregate *glInstanceIDAsUint = TIntermAggregate::CreateConstructor(
>-        TType(EbtUInt, EbpHigh, EvqTemporary), glInstanceIDSymbolCastArguments);
>-
>-    // Create a uint(gl_InstanceID) / numberOfViews node.
>-    TIntermBinary *normalizedInstanceID =
>-        new TIntermBinary(EOpDiv, glInstanceIDAsUint, numberOfViewsUint);
>-
>-    // Create an int(uint(gl_InstanceID) / numberOfViews) node.
>-    TIntermSequence *normalizedInstanceIDCastArguments = new TIntermSequence();
>-    normalizedInstanceIDCastArguments->push_back(normalizedInstanceID);
>-    TIntermAggregate *normalizedInstanceIDAsInt = TIntermAggregate::CreateConstructor(
>-        TType(EbtInt, EbpHigh, EvqTemporary), normalizedInstanceIDCastArguments);
>-
>-    // Create an InstanceID = int(uint(gl_InstanceID) / numberOfViews) node.
>-    TIntermBinary *instanceIDInitializer =
>-        new TIntermBinary(EOpAssign, instanceIDSymbol->deepCopy(), normalizedInstanceIDAsInt);
>-    initializers->push_back(instanceIDInitializer);
>-
>-    // Create a uint(gl_InstanceID) % numberOfViews node.
>-    TIntermBinary *normalizedViewID =
>-        new TIntermBinary(EOpIMod, glInstanceIDAsUint->deepCopy(), numberOfViewsUint->deepCopy());
>-
>-    // Create a ViewID_OVR = uint(gl_InstanceID) % numberOfViews node.
>-    TIntermBinary *viewIDInitializer =
>-        new TIntermBinary(EOpAssign, viewIDSymbol->deepCopy(), normalizedViewID);
>-    initializers->push_back(viewIDInitializer);
>-}
>-
>-// Replaces every occurrence of a symbol with the name specified in symbolName with newSymbolNode.
>-void ReplaceSymbol(TIntermBlock *root, const TString &symbolName, TIntermSymbol *newSymbolNode)
>-{
>-    ReplaceVariableTraverser traverser(symbolName, newSymbolNode);
>-    root->traverse(&traverser);
>-    traverser.updateTree();
>-}
>-
>-void DeclareGlobalVariable(TIntermBlock *root, TIntermTyped *typedNode)
>-{
>-    TIntermSequence *globalSequence = root->getSequence();
>-    TIntermDeclaration *declaration = new TIntermDeclaration();
>-    declaration->appendDeclarator(typedNode->deepCopy());
>-    globalSequence->insert(globalSequence->begin(), declaration);
>-}
>-
>-// Adds a branch to write int(ViewID_OVR) to either gl_ViewportIndex or gl_Layer. The branch is
>-// added to the end of the initializers' sequence.
>-void SelectViewIndexInVertexShader(TIntermTyped *viewIDSymbol,
>-                                   TIntermTyped *multiviewBaseViewLayerIndexSymbol,
>-                                   TIntermSequence *initializers,
>-                                   const TSymbolTable &symbolTable)
>-{
>-    // Create an int(ViewID_OVR) node.
>-    TIntermSequence *viewIDSymbolCastArguments = new TIntermSequence();
>-    viewIDSymbolCastArguments->push_back(viewIDSymbol);
>-    TIntermAggregate *viewIDAsInt = TIntermAggregate::CreateConstructor(
>-        TType(EbtInt, EbpHigh, EvqTemporary), viewIDSymbolCastArguments);
>-
>-    // Create a gl_ViewportIndex node.
>-    TIntermSymbol *viewportIndexSymbol =
>-        ReferenceBuiltInVariable("gl_ViewportIndex", symbolTable, 0);
>-
>-    // Create a { gl_ViewportIndex = int(ViewID_OVR) } node.
>-    TIntermBlock *viewportIndexInitializerInBlock = new TIntermBlock();
>-    viewportIndexInitializerInBlock->appendStatement(
>-        new TIntermBinary(EOpAssign, viewportIndexSymbol, viewIDAsInt));
>-
>-    // Create a gl_Layer node.
>-    TIntermSymbol *layerSymbol = ReferenceBuiltInVariable("gl_Layer", symbolTable, 0);
>-
>-    // Create an int(ViewID_OVR) + multiviewBaseViewLayerIndex node
>-    TIntermBinary *sumOfViewIDAndBaseViewIndex =
>-        new TIntermBinary(EOpAdd, viewIDAsInt->deepCopy(), multiviewBaseViewLayerIndexSymbol);
>-
>-    // Create a { gl_Layer = int(ViewID_OVR) + multiviewBaseViewLayerIndex } node.
>-    TIntermBlock *layerInitializerInBlock = new TIntermBlock();
>-    layerInitializerInBlock->appendStatement(
>-        new TIntermBinary(EOpAssign, layerSymbol, sumOfViewIDAndBaseViewIndex));
>-
>-    // Create a node to compare whether the base view index uniform is less than zero.
>-    TIntermBinary *multiviewBaseViewLayerIndexZeroComparison =
>-        new TIntermBinary(EOpLessThan, multiviewBaseViewLayerIndexSymbol->deepCopy(),
>-                          CreateZeroNode(TType(EbtInt, EbpHigh, EvqConst)));
>-
>-    // Create an if-else statement to select the code path.
>-    TIntermIfElse *multiviewBranch =
>-        new TIntermIfElse(multiviewBaseViewLayerIndexZeroComparison,
>-                          viewportIndexInitializerInBlock, layerInitializerInBlock);
>-
>-    initializers->push_back(multiviewBranch);
>-}
>-
>-}  // namespace
>-
>-void DeclareAndInitBuiltinsForInstancedMultiview(TIntermBlock *root,
>-                                                 unsigned numberOfViews,
>-                                                 GLenum shaderType,
>-                                                 ShCompileOptions compileOptions,
>-                                                 ShShaderOutput shaderOutput,
>-                                                 TSymbolTable *symbolTable)
>-{
>-    ASSERT(shaderType == GL_VERTEX_SHADER || shaderType == GL_FRAGMENT_SHADER);
>-
>-    TQualifier viewIDQualifier  = (shaderType == GL_VERTEX_SHADER) ? EvqFlatOut : EvqFlatIn;
>-    TIntermSymbol *viewIDSymbol = new TIntermSymbol(symbolTable->nextUniqueId(), "ViewID_OVR",
>-                                                    TType(EbtUInt, EbpHigh, viewIDQualifier));
>-    viewIDSymbol->setInternal(true);
>-
>-    DeclareGlobalVariable(root, viewIDSymbol);
>-    ReplaceSymbol(root, "gl_ViewID_OVR", viewIDSymbol);
>-    if (shaderType == GL_VERTEX_SHADER)
>-    {
>-        // Replacing gl_InstanceID with InstanceID should happen before adding the initializers of
>-        // InstanceID and ViewID.
>-        TIntermSymbol *instanceIDSymbol = new TIntermSymbol(
>-            symbolTable->nextUniqueId(), "InstanceID", TType(EbtInt, EbpHigh, EvqGlobal));
>-        instanceIDSymbol->setInternal(true);
>-        DeclareGlobalVariable(root, instanceIDSymbol);
>-        ReplaceSymbol(root, "gl_InstanceID", instanceIDSymbol);
>-
>-        TIntermSequence *initializers = new TIntermSequence();
>-        InitializeViewIDAndInstanceID(viewIDSymbol, instanceIDSymbol, numberOfViews, *symbolTable,
>-                                      initializers);
>-
>-        // The AST transformation which adds the expression to select the viewport index should
>-        // be done only for the GLSL and ESSL output.
>-        const bool selectView = (compileOptions & SH_SELECT_VIEW_IN_NV_GLSL_VERTEX_SHADER) != 0u;
>-        // Assert that if the view is selected in the vertex shader, then the output is
>-        // either GLSL or ESSL.
>-        ASSERT(!selectView || IsOutputGLSL(shaderOutput) || IsOutputESSL(shaderOutput));
>-        if (selectView)
>-        {
>-            // Add a uniform to switch between side-by-side and layered rendering.
>-            TIntermSymbol *multiviewBaseViewLayerIndexSymbol =
>-                new TIntermSymbol(symbolTable->nextUniqueId(), "multiviewBaseViewLayerIndex",
>-                                  TType(EbtInt, EbpHigh, EvqUniform));
>-            multiviewBaseViewLayerIndexSymbol->setInternal(true);
>-            DeclareGlobalVariable(root, multiviewBaseViewLayerIndexSymbol);
>-
>-            // Setting a value to gl_ViewportIndex or gl_Layer should happen after ViewID_OVR's
>-            // initialization.
>-            SelectViewIndexInVertexShader(viewIDSymbol->deepCopy(),
>-                                          multiviewBaseViewLayerIndexSymbol->deepCopy(),
>-                                          initializers, *symbolTable);
>-        }
>-
>-        // Insert initializers at the beginning of main().
>-        TIntermBlock *initializersBlock = new TIntermBlock();
>-        initializersBlock->getSequence()->swap(*initializers);
>-        TIntermBlock *mainBody = FindMainBody(root);
>-        mainBody->getSequence()->insert(mainBody->getSequence()->begin(), initializersBlock);
>-    }
>-}
>-
>-}  // namespace sh
>\ No newline at end of file
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/DeclareAndInitBuiltinsForInstancedMultiview.h b/Source/ThirdParty/ANGLE/src/compiler/translator/DeclareAndInitBuiltinsForInstancedMultiview.h
>deleted file mode 100644
>index b4ab05fd0e7..00000000000
>--- a/Source/ThirdParty/ANGLE/src/compiler/translator/DeclareAndInitBuiltinsForInstancedMultiview.h
>+++ /dev/null
>@@ -1,48 +0,0 @@
>-//
>-// Copyright (c) 2017 The ANGLE Project Authors. All rights reserved.
>-// Use of this source code is governed by a BSD-style license that can be
>-// found in the LICENSE file.
>-//
>-// Regardless of the shader type, the following AST transformations are applied:
>-// - Add declaration of View_ID_OVR.
>-// - Replace every occurrence of gl_ViewID_OVR with ViewID_OVR, mark ViewID_OVR as internal and
>-// declare it as a flat varying.
>-//
>-// If the shader type is a vertex shader, the following AST transformations are applied:
>-// - Replace every occurrence of gl_InstanceID with InstanceID, mark InstanceID as internal and set
>-// its qualifier to EvqTemporary.
>-// - Add initializers of ViewID_OVR and InstanceID to the beginning of the body of main. The pass
>-// should be executed before any variables get collected so that usage of gl_InstanceID is recorded.
>-// - If the output is ESSL or GLSL and the SH_SELECT_VIEW_IN_NV_GLSL_VERTEX_SHADER option is
>-// enabled, the expression
>-// "if (multiviewBaseViewLayerIndex < 0) {
>-//      gl_ViewportIndex = int(ViewID_OVR);
>-//  } else {
>-//      gl_Layer = int(ViewID_OVR) + multiviewBaseViewLayerIndex;
>-//  }"
>-// is added after ViewID and InstanceID are initialized. Also, MultiviewRenderPath is added as a
>-// uniform.
>-//
>-
>-#ifndef COMPILER_TRANSLATOR_DECLAREANDINITBUILTINSFORINSTANCEDMULTIVIEW_H_
>-#define COMPILER_TRANSLATOR_DECLAREANDINITBUILTINSFORINSTANCEDMULTIVIEW_H_
>-
>-#include "GLSLANG/ShaderLang.h"
>-#include "angle_gl.h"
>-
>-namespace sh
>-{
>-
>-class TIntermBlock;
>-class TSymbolTable;
>-
>-void DeclareAndInitBuiltinsForInstancedMultiview(TIntermBlock *root,
>-                                                 unsigned numberOfViews,
>-                                                 GLenum shaderType,
>-                                                 ShCompileOptions compileOptions,
>-                                                 ShShaderOutput shaderOutput,
>-                                                 TSymbolTable *symbolTable);
>-
>-}  // namespace sh
>-
>-#endif  // COMPILER_TRANSLATOR_DECLAREANDINITBUILTINSFORINSTANCEDMULTIVIEW_H_
>\ No newline at end of file
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/DeferGlobalInitializers.cpp b/Source/ThirdParty/ANGLE/src/compiler/translator/DeferGlobalInitializers.cpp
>deleted file mode 100644
>index 67d51ea87b9..00000000000
>--- a/Source/ThirdParty/ANGLE/src/compiler/translator/DeferGlobalInitializers.cpp
>+++ /dev/null
>@@ -1,147 +0,0 @@
>-//
>-// Copyright (c) 2016 The ANGLE Project Authors. All rights reserved.
>-// Use of this source code is governed by a BSD-style license that can be
>-// found in the LICENSE file.
>-//
>-// DeferGlobalInitializers is an AST traverser that moves global initializers into a separate
>-// function that is called in the beginning of main(). This enables initialization of globals with
>-// uniforms or non-constant globals, as allowed by the WebGL spec. Some initializers referencing
>-// non-constants may need to be unfolded into if statements in HLSL - this kind of steps should be
>-// done after DeferGlobalInitializers is run. Note that it's important that the function definition
>-// is at the end of the shader, as some globals may be declared after main().
>-//
>-// It can also initialize all uninitialized globals.
>-//
>-
>-#include "compiler/translator/DeferGlobalInitializers.h"
>-
>-#include "compiler/translator/FindMain.h"
>-#include "compiler/translator/InitializeVariables.h"
>-#include "compiler/translator/IntermNode.h"
>-#include "compiler/translator/IntermNode_util.h"
>-#include "compiler/translator/SymbolTable.h"
>-
>-namespace sh
>-{
>-
>-namespace
>-{
>-
>-void GetDeferredInitializers(TIntermDeclaration *declaration,
>-                             bool initializeUninitializedGlobals,
>-                             bool canUseLoopsToInitialize,
>-                             TIntermSequence *deferredInitializersOut,
>-                             TSymbolTable *symbolTable)
>-{
>-    // SeparateDeclarations should have already been run.
>-    ASSERT(declaration->getSequence()->size() == 1);
>-
>-    TIntermNode *declarator = declaration->getSequence()->back();
>-    TIntermBinary *init     = declarator->getAsBinaryNode();
>-    if (init)
>-    {
>-        TIntermSymbol *symbolNode = init->getLeft()->getAsSymbolNode();
>-        ASSERT(symbolNode);
>-        TIntermTyped *expression = init->getRight();
>-
>-        if ((expression->getQualifier() != EvqConst ||
>-             (expression->getAsConstantUnion() == nullptr &&
>-              !expression->isConstructorWithOnlyConstantUnionParameters())))
>-        {
>-            // For variables which are not constant, defer their real initialization until
>-            // after we initialize uniforms.
>-            // Deferral is done also in any cases where the variable has not been constant
>-            // folded, since otherwise there's a chance that HLSL output will generate extra
>-            // statements from the initializer expression.
>-
>-            // Change const global to a regular global if its initialization is deferred.
>-            // This can happen if ANGLE has not been able to fold the constant expression used
>-            // as an initializer.
>-            ASSERT(symbolNode->getQualifier() == EvqConst ||
>-                   symbolNode->getQualifier() == EvqGlobal);
>-            if (symbolNode->getQualifier() == EvqConst)
>-            {
>-                symbolNode->getTypePointer()->setQualifier(EvqGlobal);
>-            }
>-
>-            TIntermBinary *deferredInit =
>-                new TIntermBinary(EOpAssign, symbolNode->deepCopy(), init->getRight());
>-            deferredInitializersOut->push_back(deferredInit);
>-
>-            // Remove the initializer from the global scope and just declare the global instead.
>-            declaration->replaceChildNode(init, symbolNode);
>-        }
>-    }
>-    else if (initializeUninitializedGlobals)
>-    {
>-        TIntermSymbol *symbolNode = declarator->getAsSymbolNode();
>-        ASSERT(symbolNode);
>-
>-        // Ignore ANGLE internal variables.
>-        if (symbolNode->getName().isInternal())
>-            return;
>-
>-        if (symbolNode->getQualifier() == EvqGlobal && symbolNode->getSymbol() != "")
>-        {
>-            TIntermSequence *initCode =
>-                CreateInitCode(symbolNode, canUseLoopsToInitialize, symbolTable);
>-            deferredInitializersOut->insert(deferredInitializersOut->end(), initCode->begin(),
>-                                            initCode->end());
>-        }
>-    }
>-}
>-
>-void InsertInitCallToMain(TIntermBlock *root,
>-                          TIntermSequence *deferredInitializers,
>-                          TSymbolTable *symbolTable)
>-{
>-    TIntermBlock *initGlobalsBlock = new TIntermBlock();
>-    initGlobalsBlock->getSequence()->swap(*deferredInitializers);
>-
>-    TSymbolUniqueId initGlobalsFunctionId(symbolTable);
>-
>-    const char *kInitGlobalsFunctionName = "initGlobals";
>-
>-    TIntermFunctionPrototype *initGlobalsFunctionPrototype =
>-        CreateInternalFunctionPrototypeNode(TType(), kInitGlobalsFunctionName, initGlobalsFunctionId);
>-    root->getSequence()->insert(root->getSequence()->begin(), initGlobalsFunctionPrototype);
>-    TIntermFunctionDefinition *initGlobalsFunctionDefinition = CreateInternalFunctionDefinitionNode(
>-        TType(), kInitGlobalsFunctionName, initGlobalsBlock, initGlobalsFunctionId);
>-    root->appendStatement(initGlobalsFunctionDefinition);
>-
>-    TIntermAggregate *initGlobalsCall = CreateInternalFunctionCallNode(
>-        TType(), kInitGlobalsFunctionName, initGlobalsFunctionId, new TIntermSequence());
>-
>-    TIntermBlock *mainBody = FindMainBody(root);
>-    mainBody->getSequence()->insert(mainBody->getSequence()->begin(), initGlobalsCall);
>-}
>-
>-}  // namespace
>-
>-void DeferGlobalInitializers(TIntermBlock *root,
>-                             bool initializeUninitializedGlobals,
>-                             bool canUseLoopsToInitialize,
>-                             TSymbolTable *symbolTable)
>-{
>-    TIntermSequence *deferredInitializers = new TIntermSequence();
>-
>-    // Loop over all global statements and process the declarations. This is simpler than using a
>-    // traverser.
>-    for (TIntermNode *statement : *root->getSequence())
>-    {
>-        TIntermDeclaration *declaration = statement->getAsDeclarationNode();
>-        if (declaration)
>-        {
>-            GetDeferredInitializers(declaration, initializeUninitializedGlobals,
>-                                    canUseLoopsToInitialize, deferredInitializers, symbolTable);
>-        }
>-    }
>-
>-    // Add the function with initialization and the call to that.
>-    if (!deferredInitializers->empty())
>-    {
>-        InsertInitCallToMain(root, deferredInitializers, symbolTable);
>-    }
>-}
>-
>-}  // namespace sh
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/DeferGlobalInitializers.h b/Source/ThirdParty/ANGLE/src/compiler/translator/DeferGlobalInitializers.h
>deleted file mode 100644
>index 86930a585fc..00000000000
>--- a/Source/ThirdParty/ANGLE/src/compiler/translator/DeferGlobalInitializers.h
>+++ /dev/null
>@@ -1,32 +0,0 @@
>-//
>-// Copyright (c) 2016 The ANGLE Project Authors. All rights reserved.
>-// Use of this source code is governed by a BSD-style license that can be
>-// found in the LICENSE file.
>-//
>-// DeferGlobalInitializers is an AST traverser that moves global initializers into a separate
>-// function that is called in the beginning of main(). This enables initialization of globals with
>-// uniforms or non-constant globals, as allowed by the WebGL spec. Some initializers referencing
>-// non-constants may need to be unfolded into if statements in HLSL - this kind of steps should be
>-// done after DeferGlobalInitializers is run. Note that it's important that the function definition
>-// is at the end of the shader, as some globals may be declared after main().
>-//
>-// It can also initialize all uninitialized globals.
>-//
>-
>-#ifndef COMPILER_TRANSLATOR_DEFERGLOBALINITIALIZERS_H_
>-#define COMPILER_TRANSLATOR_DEFERGLOBALINITIALIZERS_H_
>-
>-namespace sh
>-{
>-
>-class TIntermBlock;
>-class TSymbolTable;
>-
>-void DeferGlobalInitializers(TIntermBlock *root,
>-                             bool initializeUninitializedGlobals,
>-                             bool canUseLoopsToInitialize,
>-                             TSymbolTable *symbolTable);
>-
>-}  // namespace sh
>-
>-#endif  // COMPILER_TRANSLATOR_DEFERGLOBALINITIALIZERS_H_
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/Diagnostics.cpp b/Source/ThirdParty/ANGLE/src/compiler/translator/Diagnostics.cpp
>index 1744e5ab3ef..5ec4867cbba 100644
>--- a/Source/ThirdParty/ANGLE/src/compiler/translator/Diagnostics.cpp
>+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/Diagnostics.cpp
>@@ -16,15 +16,12 @@ namespace sh
> 
> TDiagnostics::TDiagnostics(TInfoSinkBase &infoSink)
>     : mInfoSink(infoSink), mNumErrors(0), mNumWarnings(0)
>-{
>-}
>+{}
> 
>-TDiagnostics::~TDiagnostics()
>-{
>-}
>+TDiagnostics::~TDiagnostics() {}
> 
> void TDiagnostics::writeInfo(Severity severity,
>-                             const pp::SourceLocation &loc,
>+                             const angle::pp::SourceLocation &loc,
>                              const char *reason,
>                              const char *token)
> {
>@@ -54,19 +51,23 @@ void TDiagnostics::globalError(const char *message)
>     mInfoSink << message << "\n";
> }
> 
>-void TDiagnostics::error(const pp::SourceLocation &loc, const char *reason, const char *token)
>+void TDiagnostics::error(const angle::pp::SourceLocation &loc,
>+                         const char *reason,
>+                         const char *token)
> {
>     writeInfo(SH_ERROR, loc, reason, token);
> }
> 
>-void TDiagnostics::warning(const pp::SourceLocation &loc, const char *reason, const char *token)
>+void TDiagnostics::warning(const angle::pp::SourceLocation &loc,
>+                           const char *reason,
>+                           const char *token)
> {
>     writeInfo(SH_WARNING, loc, reason, token);
> }
> 
> void TDiagnostics::error(const TSourceLoc &loc, const char *reason, const char *token)
> {
>-    pp::SourceLocation srcLoc;
>+    angle::pp::SourceLocation srcLoc;
>     srcLoc.file = loc.first_file;
>     srcLoc.line = loc.first_line;
>     error(srcLoc, reason, token);
>@@ -74,13 +75,13 @@ void TDiagnostics::error(const TSourceLoc &loc, const char *reason, const char *
> 
> void TDiagnostics::warning(const TSourceLoc &loc, const char *reason, const char *token)
> {
>-    pp::SourceLocation srcLoc;
>+    angle::pp::SourceLocation srcLoc;
>     srcLoc.file = loc.first_file;
>     srcLoc.line = loc.first_line;
>     warning(srcLoc, reason, token);
> }
> 
>-void TDiagnostics::print(ID id, const pp::SourceLocation &loc, const std::string &text)
>+void TDiagnostics::print(ID id, const angle::pp::SourceLocation &loc, const std::string &text)
> {
>     writeInfo(isError(id) ? SH_ERROR : SH_WARNING, loc, message(id), text.c_str());
> }
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/Diagnostics.h b/Source/ThirdParty/ANGLE/src/compiler/translator/Diagnostics.h
>index 55b88991df5..121b6f3c2a0 100644
>--- a/Source/ThirdParty/ANGLE/src/compiler/translator/Diagnostics.h
>+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/Diagnostics.h
>@@ -17,7 +17,7 @@ namespace sh
> class TInfoSinkBase;
> struct TSourceLoc;
> 
>-class TDiagnostics : public pp::Diagnostics, angle::NonCopyable
>+class TDiagnostics : public angle::pp::Diagnostics, angle::NonCopyable
> {
>   public:
>     TDiagnostics(TInfoSinkBase &infoSink);
>@@ -26,8 +26,8 @@ class TDiagnostics : public pp::Diagnostics, angle::NonCopyable
>     int numErrors() const { return mNumErrors; }
>     int numWarnings() const { return mNumWarnings; }
> 
>-    void error(const pp::SourceLocation &loc, const char *reason, const char *token);
>-    void warning(const pp::SourceLocation &loc, const char *reason, const char *token);
>+    void error(const angle::pp::SourceLocation &loc, const char *reason, const char *token);
>+    void warning(const angle::pp::SourceLocation &loc, const char *reason, const char *token);
> 
>     void error(const TSourceLoc &loc, const char *reason, const char *token);
>     void warning(const TSourceLoc &loc, const char *reason, const char *token);
>@@ -38,11 +38,11 @@ class TDiagnostics : public pp::Diagnostics, angle::NonCopyable
> 
>   protected:
>     void writeInfo(Severity severity,
>-                   const pp::SourceLocation &loc,
>+                   const angle::pp::SourceLocation &loc,
>                    const char *reason,
>                    const char *token);
> 
>-    void print(ID id, const pp::SourceLocation &loc, const std::string &text) override;
>+    void print(ID id, const angle::pp::SourceLocation &loc, const std::string &text) override;
> 
>   private:
>     TInfoSinkBase &mInfoSink;
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/DirectiveHandler.cpp b/Source/ThirdParty/ANGLE/src/compiler/translator/DirectiveHandler.cpp
>index 485e66670c7..e468fd44d3b 100644
>--- a/Source/ThirdParty/ANGLE/src/compiler/translator/DirectiveHandler.cpp
>+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/DirectiveHandler.cpp
>@@ -10,6 +10,7 @@
> 
> #include "angle_gl.h"
> #include "common/debug.h"
>+#include "compiler/translator/Common.h"
> #include "compiler/translator/Diagnostics.h"
> 
> namespace sh
>@@ -43,19 +44,16 @@ TDirectiveHandler::TDirectiveHandler(TExtensionBehavior &extBehavior,
>       mShaderVersion(shaderVersion),
>       mShaderType(shaderType),
>       mDebugShaderPrecisionSupported(debugShaderPrecisionSupported)
>-{
>-}
>+{}
> 
>-TDirectiveHandler::~TDirectiveHandler()
>-{
>-}
>+TDirectiveHandler::~TDirectiveHandler() {}
> 
>-void TDirectiveHandler::handleError(const pp::SourceLocation &loc, const std::string &msg)
>+void TDirectiveHandler::handleError(const angle::pp::SourceLocation &loc, const std::string &msg)
> {
>     mDiagnostics.error(loc, msg.c_str(), "");
> }
> 
>-void TDirectiveHandler::handlePragma(const pp::SourceLocation &loc,
>+void TDirectiveHandler::handlePragma(const angle::pp::SourceLocation &loc,
>                                      const std::string &name,
>                                      const std::string &value,
>                                      bool stdgl)
>@@ -119,7 +117,7 @@ void TDirectiveHandler::handlePragma(const pp::SourceLocation &loc,
>         }
>         else
>         {
>-            mDiagnostics.report(pp::Diagnostics::PP_UNRECOGNIZED_PRAGMA, loc, name);
>+            mDiagnostics.report(angle::pp::Diagnostics::PP_UNRECOGNIZED_PRAGMA, loc, name);
>             return;
>         }
> 
>@@ -130,7 +128,7 @@ void TDirectiveHandler::handlePragma(const pp::SourceLocation &loc,
>     }
> }
> 
>-void TDirectiveHandler::handleExtension(const pp::SourceLocation &loc,
>+void TDirectiveHandler::handleExtension(const angle::pp::SourceLocation &loc,
>                                         const std::string &name,
>                                         const std::string &behavior)
> {
>@@ -185,7 +183,7 @@ void TDirectiveHandler::handleExtension(const pp::SourceLocation &loc,
>     }
> }
> 
>-void TDirectiveHandler::handleVersion(const pp::SourceLocation &loc, int version)
>+void TDirectiveHandler::handleVersion(const angle::pp::SourceLocation &loc, int version)
> {
>     if (version == 100 || version == 300 || version == 310)
>     {
>@@ -193,7 +191,7 @@ void TDirectiveHandler::handleVersion(const pp::SourceLocation &loc, int version
>     }
>     else
>     {
>-        std::stringstream stream;
>+        std::stringstream stream = sh::InitializeStream<std::stringstream>();
>         stream << version;
>         std::string str = stream.str();
>         mDiagnostics.error(loc, "version number not supported", str.c_str());
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/DirectiveHandler.h b/Source/ThirdParty/ANGLE/src/compiler/translator/DirectiveHandler.h
>index 8e8cb9bbf6f..b5b92821031 100644
>--- a/Source/ThirdParty/ANGLE/src/compiler/translator/DirectiveHandler.h
>+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/DirectiveHandler.h
>@@ -7,17 +7,17 @@
> #ifndef COMPILER_TRANSLATOR_DIRECTIVEHANDLER_H_
> #define COMPILER_TRANSLATOR_DIRECTIVEHANDLER_H_
> 
>+#include "GLSLANG/ShaderLang.h"
> #include "common/angleutils.h"
>+#include "compiler/preprocessor/DirectiveHandlerBase.h"
> #include "compiler/translator/ExtensionBehavior.h"
> #include "compiler/translator/Pragma.h"
>-#include "compiler/preprocessor/DirectiveHandlerBase.h"
>-#include "GLSLANG/ShaderLang.h"
> 
> namespace sh
> {
> class TDiagnostics;
> 
>-class TDirectiveHandler : public pp::DirectiveHandler, angle::NonCopyable
>+class TDirectiveHandler : public angle::pp::DirectiveHandler, angle::NonCopyable
> {
>   public:
>     TDirectiveHandler(TExtensionBehavior &extBehavior,
>@@ -30,18 +30,18 @@ class TDirectiveHandler : public pp::DirectiveHandler, angle::NonCopyable
>     const TPragma &pragma() const { return mPragma; }
>     const TExtensionBehavior &extensionBehavior() const { return mExtensionBehavior; }
> 
>-    void handleError(const pp::SourceLocation &loc, const std::string &msg) override;
>+    void handleError(const angle::pp::SourceLocation &loc, const std::string &msg) override;
> 
>-    void handlePragma(const pp::SourceLocation &loc,
>+    void handlePragma(const angle::pp::SourceLocation &loc,
>                       const std::string &name,
>                       const std::string &value,
>                       bool stdgl) override;
> 
>-    void handleExtension(const pp::SourceLocation &loc,
>+    void handleExtension(const angle::pp::SourceLocation &loc,
>                          const std::string &name,
>                          const std::string &behavior) override;
> 
>-    void handleVersion(const pp::SourceLocation &loc, int version) override;
>+    void handleVersion(const angle::pp::SourceLocation &loc, int version) override;
> 
>   private:
>     TPragma mPragma;
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/EmulateGLFragColorBroadcast.cpp b/Source/ThirdParty/ANGLE/src/compiler/translator/EmulateGLFragColorBroadcast.cpp
>deleted file mode 100644
>index 189ea341eb9..00000000000
>--- a/Source/ThirdParty/ANGLE/src/compiler/translator/EmulateGLFragColorBroadcast.cpp
>+++ /dev/null
>@@ -1,129 +0,0 @@
>-//
>-// Copyright (c) 2002-2016 The ANGLE Project Authors. All rights reserved.
>-// Use of this source code is governed by a BSD-style license that can be
>-// found in the LICENSE file.
>-//
>-// gl_FragColor needs to broadcast to all color buffers in ES2 if
>-// GL_EXT_draw_buffers is explicitly enabled in a fragment shader.
>-//
>-// We emulate this by replacing all gl_FragColor with gl_FragData[0], and in the end
>-// of main() function, assigning gl_FragData[1], ..., gl_FragData[maxDrawBuffers-1]
>-// with gl_FragData[0].
>-//
>-
>-#include "compiler/translator/EmulateGLFragColorBroadcast.h"
>-
>-#include "compiler/translator/IntermNode_util.h"
>-#include "compiler/translator/IntermTraverse.h"
>-#include "compiler/translator/RunAtTheEndOfShader.h"
>-
>-namespace sh
>-{
>-
>-namespace
>-{
>-
>-class GLFragColorBroadcastTraverser : public TIntermTraverser
>-{
>-  public:
>-    GLFragColorBroadcastTraverser(int maxDrawBuffers, TSymbolTable *symbolTable, int shaderVersion)
>-        : TIntermTraverser(true, false, false, symbolTable),
>-          mGLFragColorUsed(false),
>-          mMaxDrawBuffers(maxDrawBuffers),
>-          mShaderVersion(shaderVersion)
>-    {
>-    }
>-
>-    void broadcastGLFragColor(TIntermBlock *root);
>-
>-    bool isGLFragColorUsed() const { return mGLFragColorUsed; }
>-
>-  protected:
>-    void visitSymbol(TIntermSymbol *node) override;
>-
>-    TIntermBinary *constructGLFragDataNode(int index) const;
>-    TIntermBinary *constructGLFragDataAssignNode(int index) const;
>-
>-  private:
>-    bool mGLFragColorUsed;
>-    int mMaxDrawBuffers;
>-    const int mShaderVersion;
>-};
>-
>-TIntermBinary *GLFragColorBroadcastTraverser::constructGLFragDataNode(int index) const
>-{
>-    TIntermSymbol *symbol =
>-        ReferenceBuiltInVariable(TString("gl_FragData"), *mSymbolTable, mShaderVersion);
>-    TIntermTyped *indexNode = CreateIndexNode(index);
>-
>-    TIntermBinary *binary = new TIntermBinary(EOpIndexDirect, symbol, indexNode);
>-    return binary;
>-}
>-
>-TIntermBinary *GLFragColorBroadcastTraverser::constructGLFragDataAssignNode(int index) const
>-{
>-    TIntermTyped *fragDataIndex = constructGLFragDataNode(index);
>-    TIntermTyped *fragDataZero  = constructGLFragDataNode(0);
>-
>-    return new TIntermBinary(EOpAssign, fragDataIndex, fragDataZero);
>-}
>-
>-void GLFragColorBroadcastTraverser::visitSymbol(TIntermSymbol *node)
>-{
>-    if (node->getSymbol() == "gl_FragColor")
>-    {
>-        queueReplacement(constructGLFragDataNode(0), OriginalNode::IS_DROPPED);
>-        mGLFragColorUsed = true;
>-    }
>-}
>-
>-void GLFragColorBroadcastTraverser::broadcastGLFragColor(TIntermBlock *root)
>-{
>-    ASSERT(mMaxDrawBuffers > 1);
>-    if (!mGLFragColorUsed)
>-    {
>-        return;
>-    }
>-
>-    TIntermBlock *broadcastBlock = new TIntermBlock();
>-    // Now insert statements
>-    //   gl_FragData[1] = gl_FragData[0];
>-    //   ...
>-    //   gl_FragData[maxDrawBuffers - 1] = gl_FragData[0];
>-    for (int colorIndex = 1; colorIndex < mMaxDrawBuffers; ++colorIndex)
>-    {
>-        broadcastBlock->appendStatement(constructGLFragDataAssignNode(colorIndex));
>-    }
>-    RunAtTheEndOfShader(root, broadcastBlock, mSymbolTable);
>-}
>-
>-}  // namespace anonymous
>-
>-void EmulateGLFragColorBroadcast(TIntermBlock *root,
>-                                 int maxDrawBuffers,
>-                                 std::vector<sh::OutputVariable> *outputVariables,
>-                                 TSymbolTable *symbolTable,
>-                                 int shaderVersion)
>-{
>-    ASSERT(maxDrawBuffers > 1);
>-    GLFragColorBroadcastTraverser traverser(maxDrawBuffers, symbolTable, shaderVersion);
>-    root->traverse(&traverser);
>-    if (traverser.isGLFragColorUsed())
>-    {
>-        traverser.updateTree();
>-        traverser.broadcastGLFragColor(root);
>-        for (auto &var : *outputVariables)
>-        {
>-            if (var.name == "gl_FragColor")
>-            {
>-                // TODO(zmo): Find a way to keep the original variable information.
>-                var.name       = "gl_FragData";
>-                var.mappedName = "gl_FragData";
>-                var.arraySizes.push_back(maxDrawBuffers);
>-                ASSERT(var.arraySizes.size() == 1u);
>-            }
>-        }
>-    }
>-}
>-
>-}  // namespace sh
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/EmulateGLFragColorBroadcast.h b/Source/ThirdParty/ANGLE/src/compiler/translator/EmulateGLFragColorBroadcast.h
>deleted file mode 100644
>index e652b7e07e6..00000000000
>--- a/Source/ThirdParty/ANGLE/src/compiler/translator/EmulateGLFragColorBroadcast.h
>+++ /dev/null
>@@ -1,31 +0,0 @@
>-//
>-// Copyright (c) 2002-2016 The ANGLE Project Authors. All rights reserved.
>-// Use of this source code is governed by a BSD-style license that can be
>-// found in the LICENSE file.
>-//
>-// Emulate gl_FragColor broadcast behaviors in ES2 where
>-// GL_EXT_draw_buffers is explicitly enabled in a fragment shader.
>-//
>-
>-#ifndef COMPILER_TRANSLATOR_EMULATEGLFRAGCOLORBROADCAST_H_
>-#define COMPILER_TRANSLATOR_EMULATEGLFRAGCOLORBROADCAST_H_
>-
>-#include <vector>
>-
>-namespace sh
>-{
>-struct OutputVariable;
>-class TIntermBlock;
>-class TSymbolTable;
>-
>-// Replace all gl_FragColor with gl_FragData[0], and in the end of main() function,
>-// assign gl_FragData[1] ... gl_FragData[maxDrawBuffers - 1] with gl_FragData[0].
>-// If gl_FragColor is in outputVariables, it is replaced by gl_FragData.
>-void EmulateGLFragColorBroadcast(TIntermBlock *root,
>-                                 int maxDrawBuffers,
>-                                 std::vector<OutputVariable> *outputVariables,
>-                                 TSymbolTable *symbolTable,
>-                                 int shaderVersion);
>-}
>-
>-#endif  // COMPILER_TRANSLATOR_EMULATEGLFRAGCOLORBROADCAST_H_
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/EmulatePrecision.cpp b/Source/ThirdParty/ANGLE/src/compiler/translator/EmulatePrecision.cpp
>deleted file mode 100644
>index ba09fd77dff..00000000000
>--- a/Source/ThirdParty/ANGLE/src/compiler/translator/EmulatePrecision.cpp
>+++ /dev/null
>@@ -1,751 +0,0 @@
>-//
>-// Copyright (c) 2002-2014 The ANGLE Project Authors. All rights reserved.
>-// Use of this source code is governed by a BSD-style license that can be
>-// found in the LICENSE file.
>-//
>-
>-#include "compiler/translator/EmulatePrecision.h"
>-
>-#include <memory>
>-
>-namespace sh
>-{
>-
>-namespace
>-{
>-
>-class RoundingHelperWriter : angle::NonCopyable
>-{
>-  public:
>-    static RoundingHelperWriter *createHelperWriter(const ShShaderOutput outputLanguage);
>-
>-    void writeCommonRoundingHelpers(TInfoSinkBase &sink, const int shaderVersion);
>-    void writeCompoundAssignmentHelper(TInfoSinkBase &sink,
>-                                       const char *lType,
>-                                       const char *rType,
>-                                       const char *opStr,
>-                                       const char *opNameStr);
>-
>-    virtual ~RoundingHelperWriter() {}
>-
>-  protected:
>-    RoundingHelperWriter(const ShShaderOutput outputLanguage) : mOutputLanguage(outputLanguage) {}
>-    RoundingHelperWriter() = delete;
>-
>-    const ShShaderOutput mOutputLanguage;
>-
>-  private:
>-    virtual std::string getTypeString(const char *glslType)     = 0;
>-    virtual void writeFloatRoundingHelpers(TInfoSinkBase &sink) = 0;
>-    virtual void writeVectorRoundingHelpers(TInfoSinkBase &sink, const unsigned int size) = 0;
>-    virtual void writeMatrixRoundingHelper(TInfoSinkBase &sink,
>-                                           const unsigned int columns,
>-                                           const unsigned int rows,
>-                                           const char *functionName) = 0;
>-};
>-
>-class RoundingHelperWriterGLSL : public RoundingHelperWriter
>-{
>-  public:
>-    RoundingHelperWriterGLSL(const ShShaderOutput outputLanguage)
>-        : RoundingHelperWriter(outputLanguage)
>-    {
>-    }
>-
>-  private:
>-    std::string getTypeString(const char *glslType) override;
>-    void writeFloatRoundingHelpers(TInfoSinkBase &sink) override;
>-    void writeVectorRoundingHelpers(TInfoSinkBase &sink, const unsigned int size) override;
>-    void writeMatrixRoundingHelper(TInfoSinkBase &sink,
>-                                   const unsigned int columns,
>-                                   const unsigned int rows,
>-                                   const char *functionName) override;
>-};
>-
>-class RoundingHelperWriterESSL : public RoundingHelperWriterGLSL
>-{
>-  public:
>-    RoundingHelperWriterESSL(const ShShaderOutput outputLanguage)
>-        : RoundingHelperWriterGLSL(outputLanguage)
>-    {
>-    }
>-
>-  private:
>-    std::string getTypeString(const char *glslType) override;
>-};
>-
>-class RoundingHelperWriterHLSL : public RoundingHelperWriter
>-{
>-  public:
>-    RoundingHelperWriterHLSL(const ShShaderOutput outputLanguage)
>-        : RoundingHelperWriter(outputLanguage)
>-    {
>-    }
>-
>-  private:
>-    std::string getTypeString(const char *glslType) override;
>-    void writeFloatRoundingHelpers(TInfoSinkBase &sink) override;
>-    void writeVectorRoundingHelpers(TInfoSinkBase &sink, const unsigned int size) override;
>-    void writeMatrixRoundingHelper(TInfoSinkBase &sink,
>-                                   const unsigned int columns,
>-                                   const unsigned int rows,
>-                                   const char *functionName) override;
>-};
>-
>-RoundingHelperWriter *RoundingHelperWriter::createHelperWriter(const ShShaderOutput outputLanguage)
>-{
>-    ASSERT(EmulatePrecision::SupportedInLanguage(outputLanguage));
>-    switch (outputLanguage)
>-    {
>-        case SH_HLSL_4_1_OUTPUT:
>-            return new RoundingHelperWriterHLSL(outputLanguage);
>-        case SH_ESSL_OUTPUT:
>-            return new RoundingHelperWriterESSL(outputLanguage);
>-        default:
>-            return new RoundingHelperWriterGLSL(outputLanguage);
>-    }
>-}
>-
>-void RoundingHelperWriter::writeCommonRoundingHelpers(TInfoSinkBase &sink, const int shaderVersion)
>-{
>-    // Write the angle_frm functions that round floating point numbers to
>-    // half precision, and angle_frl functions that round them to minimum lowp
>-    // precision.
>-
>-    writeFloatRoundingHelpers(sink);
>-    writeVectorRoundingHelpers(sink, 2);
>-    writeVectorRoundingHelpers(sink, 3);
>-    writeVectorRoundingHelpers(sink, 4);
>-    if (shaderVersion > 100)
>-    {
>-        for (unsigned int columns = 2; columns <= 4; ++columns)
>-        {
>-            for (unsigned int rows = 2; rows <= 4; ++rows)
>-            {
>-                writeMatrixRoundingHelper(sink, columns, rows, "angle_frm");
>-                writeMatrixRoundingHelper(sink, columns, rows, "angle_frl");
>-            }
>-        }
>-    }
>-    else
>-    {
>-        for (unsigned int size = 2; size <= 4; ++size)
>-        {
>-            writeMatrixRoundingHelper(sink, size, size, "angle_frm");
>-            writeMatrixRoundingHelper(sink, size, size, "angle_frl");
>-        }
>-    }
>-}
>-
>-void RoundingHelperWriter::writeCompoundAssignmentHelper(TInfoSinkBase &sink,
>-                                                         const char *lType,
>-                                                         const char *rType,
>-                                                         const char *opStr,
>-                                                         const char *opNameStr)
>-{
>-    std::string lTypeStr = getTypeString(lType);
>-    std::string rTypeStr = getTypeString(rType);
>-
>-    // Note that y should be passed through angle_frm at the function call site,
>-    // but x can't be passed through angle_frm there since it is an inout parameter.
>-    // So only pass x and the result through angle_frm here.
>-    // clang-format off
>-    sink <<
>-        lTypeStr << " angle_compound_" << opNameStr << "_frm(inout " << lTypeStr << " x, in " << rTypeStr << " y) {\n"
>-        "    x = angle_frm(angle_frm(x) " << opStr << " y);\n"
>-        "    return x;\n"
>-        "}\n";
>-    sink <<
>-        lTypeStr << " angle_compound_" << opNameStr << "_frl(inout " << lTypeStr << " x, in " << rTypeStr << " y) {\n"
>-        "    x = angle_frl(angle_frl(x) " << opStr << " y);\n"
>-        "    return x;\n"
>-        "}\n";
>-    // clang-format on
>-}
>-
>-std::string RoundingHelperWriterGLSL::getTypeString(const char *glslType)
>-{
>-    return glslType;
>-}
>-
>-std::string RoundingHelperWriterESSL::getTypeString(const char *glslType)
>-{
>-    std::stringstream typeStrStr;
>-    typeStrStr << "highp " << glslType;
>-    return typeStrStr.str();
>-}
>-
>-void RoundingHelperWriterGLSL::writeFloatRoundingHelpers(TInfoSinkBase &sink)
>-{
>-    // Unoptimized version of angle_frm for single floats:
>-    //
>-    // int webgl_maxNormalExponent(in int exponentBits)
>-    // {
>-    //     int possibleExponents = int(exp2(float(exponentBits)));
>-    //     int exponentBias = possibleExponents / 2 - 1;
>-    //     int allExponentBitsOne = possibleExponents - 1;
>-    //     return (allExponentBitsOne - 1) - exponentBias;
>-    // }
>-    //
>-    // float angle_frm(in float x)
>-    // {
>-    //     int mantissaBits = 10;
>-    //     int exponentBits = 5;
>-    //     float possibleMantissas = exp2(float(mantissaBits));
>-    //     float mantissaMax = 2.0 - 1.0 / possibleMantissas;
>-    //     int maxNE = webgl_maxNormalExponent(exponentBits);
>-    //     float max = exp2(float(maxNE)) * mantissaMax;
>-    //     if (x > max)
>-    //     {
>-    //         return max;
>-    //     }
>-    //     if (x < -max)
>-    //     {
>-    //         return -max;
>-    //     }
>-    //     float exponent = floor(log2(abs(x)));
>-    //     if (abs(x) == 0.0 || exponent < -float(maxNE))
>-    //     {
>-    //         return 0.0 * sign(x)
>-    //     }
>-    //     x = x * exp2(-(exponent - float(mantissaBits)));
>-    //     x = sign(x) * floor(abs(x));
>-    //     return x * exp2(exponent - float(mantissaBits));
>-    // }
>-
>-    // All numbers with a magnitude less than 2^-15 are subnormal, and are
>-    // flushed to zero.
>-
>-    // Note the constant numbers below:
>-    // a) 65504 is the maximum possible mantissa (1.1111111111 in binary) times
>-    //    2^15, the maximum normal exponent.
>-    // b) 10.0 is the number of mantissa bits.
>-    // c) -25.0 is the minimum normal half-float exponent -15.0 minus the number
>-    //    of mantissa bits.
>-    // d) + 1e-30 is to make sure the argument of log2() won't be zero. It can
>-    //    only affect the result of log2 on x where abs(x) < 1e-22. Since these
>-    //    numbers will be flushed to zero either way (2^-15 is the smallest
>-    //    normal positive number), this does not introduce any error.
>-
>-    std::string floatType = getTypeString("float");
>-
>-    // clang-format off
>-    sink <<
>-        floatType << " angle_frm(in " << floatType << " x) {\n"
>-        "    x = clamp(x, -65504.0, 65504.0);\n"
>-        "    " << floatType << " exponent = floor(log2(abs(x) + 1e-30)) - 10.0;\n"
>-        "    bool isNonZero = (exponent >= -25.0);\n"
>-        "    x = x * exp2(-exponent);\n"
>-        "    x = sign(x) * floor(abs(x));\n"
>-        "    return x * exp2(exponent) * float(isNonZero);\n"
>-        "}\n";
>-
>-    sink <<
>-        floatType << " angle_frl(in " << floatType << " x) {\n"
>-        "    x = clamp(x, -2.0, 2.0);\n"
>-        "    x = x * 256.0;\n"
>-        "    x = sign(x) * floor(abs(x));\n"
>-        "    return x * 0.00390625;\n"
>-        "}\n";
>-    // clang-format on
>-}
>-
>-void RoundingHelperWriterGLSL::writeVectorRoundingHelpers(TInfoSinkBase &sink,
>-                                                          const unsigned int size)
>-{
>-    std::stringstream vecTypeStrStr;
>-    vecTypeStrStr << "vec" << size;
>-    std::string vecType = getTypeString(vecTypeStrStr.str().c_str());
>-
>-    // clang-format off
>-    sink <<
>-        vecType << " angle_frm(in " << vecType << " v) {\n"
>-        "    v = clamp(v, -65504.0, 65504.0);\n"
>-        "    " << vecType << " exponent = floor(log2(abs(v) + 1e-30)) - 10.0;\n"
>-        "    bvec" << size << " isNonZero = greaterThanEqual(exponent, vec" << size << "(-25.0));\n"
>-        "    v = v * exp2(-exponent);\n"
>-        "    v = sign(v) * floor(abs(v));\n"
>-        "    return v * exp2(exponent) * vec" << size << "(isNonZero);\n"
>-        "}\n";
>-
>-    sink <<
>-        vecType << " angle_frl(in " << vecType << " v) {\n"
>-        "    v = clamp(v, -2.0, 2.0);\n"
>-        "    v = v * 256.0;\n"
>-        "    v = sign(v) * floor(abs(v));\n"
>-        "    return v * 0.00390625;\n"
>-        "}\n";
>-    // clang-format on
>-}
>-
>-void RoundingHelperWriterGLSL::writeMatrixRoundingHelper(TInfoSinkBase &sink,
>-                                                         const unsigned int columns,
>-                                                         const unsigned int rows,
>-                                                         const char *functionName)
>-{
>-    std::stringstream matTypeStrStr;
>-    matTypeStrStr << "mat" << columns;
>-    if (rows != columns)
>-    {
>-        matTypeStrStr << "x" << rows;
>-    }
>-    std::string matType = getTypeString(matTypeStrStr.str().c_str());
>-
>-    sink << matType << " " << functionName << "(in " << matType << " m) {\n"
>-         << "    " << matType << " rounded;\n";
>-
>-    for (unsigned int i = 0; i < columns; ++i)
>-    {
>-        sink << "    rounded[" << i << "] = " << functionName << "(m[" << i << "]);\n";
>-    }
>-
>-    sink << "    return rounded;\n"
>-            "}\n";
>-}
>-
>-static const char *GetHLSLTypeStr(const char *floatTypeStr)
>-{
>-    if (strcmp(floatTypeStr, "float") == 0)
>-    {
>-        return "float";
>-    }
>-    if (strcmp(floatTypeStr, "vec2") == 0)
>-    {
>-        return "float2";
>-    }
>-    if (strcmp(floatTypeStr, "vec3") == 0)
>-    {
>-        return "float3";
>-    }
>-    if (strcmp(floatTypeStr, "vec4") == 0)
>-    {
>-        return "float4";
>-    }
>-    if (strcmp(floatTypeStr, "mat2") == 0)
>-    {
>-        return "float2x2";
>-    }
>-    if (strcmp(floatTypeStr, "mat3") == 0)
>-    {
>-        return "float3x3";
>-    }
>-    if (strcmp(floatTypeStr, "mat4") == 0)
>-    {
>-        return "float4x4";
>-    }
>-    if (strcmp(floatTypeStr, "mat2x3") == 0)
>-    {
>-        return "float2x3";
>-    }
>-    if (strcmp(floatTypeStr, "mat2x4") == 0)
>-    {
>-        return "float2x4";
>-    }
>-    if (strcmp(floatTypeStr, "mat3x2") == 0)
>-    {
>-        return "float3x2";
>-    }
>-    if (strcmp(floatTypeStr, "mat3x4") == 0)
>-    {
>-        return "float3x4";
>-    }
>-    if (strcmp(floatTypeStr, "mat4x2") == 0)
>-    {
>-        return "float4x2";
>-    }
>-    if (strcmp(floatTypeStr, "mat4x3") == 0)
>-    {
>-        return "float4x3";
>-    }
>-    UNREACHABLE();
>-    return nullptr;
>-}
>-
>-std::string RoundingHelperWriterHLSL::getTypeString(const char *glslType)
>-{
>-    return GetHLSLTypeStr(glslType);
>-}
>-
>-void RoundingHelperWriterHLSL::writeFloatRoundingHelpers(TInfoSinkBase &sink)
>-{
>-    // In HLSL scalars are the same as 1-vectors.
>-    writeVectorRoundingHelpers(sink, 1);
>-}
>-
>-void RoundingHelperWriterHLSL::writeVectorRoundingHelpers(TInfoSinkBase &sink,
>-                                                          const unsigned int size)
>-{
>-    std::stringstream vecTypeStrStr;
>-    vecTypeStrStr << "float" << size;
>-    std::string vecType = vecTypeStrStr.str();
>-
>-    // clang-format off
>-    sink <<
>-        vecType << " angle_frm(" << vecType << " v) {\n"
>-        "    v = clamp(v, -65504.0, 65504.0);\n"
>-        "    " << vecType << " exponent = floor(log2(abs(v) + 1e-30)) - 10.0;\n"
>-        "    bool" << size << " isNonZero = exponent < -25.0;\n"
>-        "    v = v * exp2(-exponent);\n"
>-        "    v = sign(v) * floor(abs(v));\n"
>-        "    return v * exp2(exponent) * (float" << size << ")(isNonZero);\n"
>-        "}\n";
>-
>-    sink <<
>-        vecType << " angle_frl(" << vecType << " v) {\n"
>-        "    v = clamp(v, -2.0, 2.0);\n"
>-        "    v = v * 256.0;\n"
>-        "    v = sign(v) * floor(abs(v));\n"
>-        "    return v * 0.00390625;\n"
>-        "}\n";
>-    // clang-format on
>-}
>-
>-void RoundingHelperWriterHLSL::writeMatrixRoundingHelper(TInfoSinkBase &sink,
>-                                                         const unsigned int columns,
>-                                                         const unsigned int rows,
>-                                                         const char *functionName)
>-{
>-    std::stringstream matTypeStrStr;
>-    matTypeStrStr << "float" << columns << "x" << rows;
>-    std::string matType = matTypeStrStr.str();
>-
>-    sink << matType << " " << functionName << "(" << matType << " m) {\n"
>-         << "    " << matType << " rounded;\n";
>-
>-    for (unsigned int i = 0; i < columns; ++i)
>-    {
>-        sink << "    rounded[" << i << "] = " << functionName << "(m[" << i << "]);\n";
>-    }
>-
>-    sink << "    return rounded;\n"
>-            "}\n";
>-}
>-
>-bool canRoundFloat(const TType &type)
>-{
>-    return type.getBasicType() == EbtFloat && !type.isArray() &&
>-           (type.getPrecision() == EbpLow || type.getPrecision() == EbpMedium);
>-}
>-
>-TIntermAggregate *createInternalFunctionCallNode(const TType &type,
>-                                                 TString name,
>-                                                 TIntermSequence *arguments)
>-{
>-    TName nameObj(name);
>-    nameObj.setInternal(true);
>-    TIntermAggregate *callNode =
>-        TIntermAggregate::Create(type, EOpCallInternalRawFunction, arguments);
>-    callNode->getFunctionSymbolInfo()->setNameObj(nameObj);
>-    return callNode;
>-}
>-
>-TIntermAggregate *createRoundingFunctionCallNode(TIntermTyped *roundedChild)
>-{
>-    TString roundFunctionName;
>-    if (roundedChild->getPrecision() == EbpMedium)
>-        roundFunctionName = "angle_frm";
>-    else
>-        roundFunctionName      = "angle_frl";
>-    TIntermSequence *arguments = new TIntermSequence();
>-    arguments->push_back(roundedChild);
>-    TIntermAggregate *callNode =
>-        createInternalFunctionCallNode(roundedChild->getType(), roundFunctionName, arguments);
>-    callNode->getFunctionSymbolInfo()->setKnownToNotHaveSideEffects(true);
>-    return callNode;
>-}
>-
>-TIntermAggregate *createCompoundAssignmentFunctionCallNode(TIntermTyped *left,
>-                                                           TIntermTyped *right,
>-                                                           const char *opNameStr)
>-{
>-    std::stringstream strstr;
>-    if (left->getPrecision() == EbpMedium)
>-        strstr << "angle_compound_" << opNameStr << "_frm";
>-    else
>-        strstr << "angle_compound_" << opNameStr << "_frl";
>-    TString functionName       = strstr.str().c_str();
>-    TIntermSequence *arguments = new TIntermSequence();
>-    arguments->push_back(left);
>-    arguments->push_back(right);
>-    return createInternalFunctionCallNode(left->getType(), functionName, arguments);
>-}
>-
>-bool ParentUsesResult(TIntermNode *parent, TIntermTyped *node)
>-{
>-    if (!parent)
>-    {
>-        return false;
>-    }
>-
>-    TIntermBlock *blockParent = parent->getAsBlock();
>-    // If the parent is a block, the result is not assigned anywhere,
>-    // so rounding it is not needed. In particular, this can avoid a lot of
>-    // unnecessary rounding of unused return values of assignment.
>-    if (blockParent)
>-    {
>-        return false;
>-    }
>-    TIntermBinary *binaryParent = parent->getAsBinaryNode();
>-    if (binaryParent && binaryParent->getOp() == EOpComma && (binaryParent->getRight() != node))
>-    {
>-        return false;
>-    }
>-    return true;
>-}
>-
>-bool ParentConstructorTakesCareOfRounding(TIntermNode *parent, TIntermTyped *node)
>-{
>-    if (!parent)
>-    {
>-        return false;
>-    }
>-    TIntermAggregate *parentConstructor = parent->getAsAggregate();
>-    if (!parentConstructor || parentConstructor->getOp() != EOpConstruct)
>-    {
>-        return false;
>-    }
>-    if (parentConstructor->getPrecision() != node->getPrecision())
>-    {
>-        return false;
>-    }
>-    return canRoundFloat(parentConstructor->getType());
>-}
>-
>-}  // namespace anonymous
>-
>-EmulatePrecision::EmulatePrecision(TSymbolTable *symbolTable, int shaderVersion)
>-    : TLValueTrackingTraverser(true, true, true, symbolTable, shaderVersion),
>-      mDeclaringVariables(false)
>-{
>-}
>-
>-void EmulatePrecision::visitSymbol(TIntermSymbol *node)
>-{
>-    TIntermNode *parent = getParentNode();
>-    if (canRoundFloat(node->getType()) && ParentUsesResult(parent, node) &&
>-        !ParentConstructorTakesCareOfRounding(parent, node) && !mDeclaringVariables &&
>-        !isLValueRequiredHere())
>-    {
>-        TIntermNode *replacement = createRoundingFunctionCallNode(node);
>-        queueReplacement(replacement, OriginalNode::BECOMES_CHILD);
>-    }
>-}
>-
>-bool EmulatePrecision::visitBinary(Visit visit, TIntermBinary *node)
>-{
>-    bool visitChildren = true;
>-
>-    TOperator op = node->getOp();
>-
>-    // RHS of initialize is not being declared.
>-    if (op == EOpInitialize && visit == InVisit)
>-        mDeclaringVariables = false;
>-
>-    if ((op == EOpIndexDirectStruct) && visit == InVisit)
>-        visitChildren = false;
>-
>-    if (visit != PreVisit)
>-        return visitChildren;
>-
>-    const TType &type = node->getType();
>-    bool roundFloat   = canRoundFloat(type);
>-
>-    if (roundFloat)
>-    {
>-        switch (op)
>-        {
>-            // Math operators that can result in a float may need to apply rounding to the return
>-            // value. Note that in the case of assignment, the rounding is applied to its return
>-            // value here, not the value being assigned.
>-            case EOpAssign:
>-            case EOpAdd:
>-            case EOpSub:
>-            case EOpMul:
>-            case EOpDiv:
>-            case EOpVectorTimesScalar:
>-            case EOpVectorTimesMatrix:
>-            case EOpMatrixTimesVector:
>-            case EOpMatrixTimesScalar:
>-            case EOpMatrixTimesMatrix:
>-            {
>-                TIntermNode *parent = getParentNode();
>-                if (!ParentUsesResult(parent, node) ||
>-                    ParentConstructorTakesCareOfRounding(parent, node))
>-                {
>-                    break;
>-                }
>-                TIntermNode *replacement = createRoundingFunctionCallNode(node);
>-                queueReplacement(replacement, OriginalNode::BECOMES_CHILD);
>-                break;
>-            }
>-
>-            // Compound assignment cases need to replace the operator with a function call.
>-            case EOpAddAssign:
>-            {
>-                mEmulateCompoundAdd.insert(
>-                    TypePair(type.getBuiltInTypeNameString(),
>-                             node->getRight()->getType().getBuiltInTypeNameString()));
>-                TIntermNode *replacement = createCompoundAssignmentFunctionCallNode(
>-                    node->getLeft(), node->getRight(), "add");
>-                queueReplacement(replacement, OriginalNode::IS_DROPPED);
>-                break;
>-            }
>-            case EOpSubAssign:
>-            {
>-                mEmulateCompoundSub.insert(
>-                    TypePair(type.getBuiltInTypeNameString(),
>-                             node->getRight()->getType().getBuiltInTypeNameString()));
>-                TIntermNode *replacement = createCompoundAssignmentFunctionCallNode(
>-                    node->getLeft(), node->getRight(), "sub");
>-                queueReplacement(replacement, OriginalNode::IS_DROPPED);
>-                break;
>-            }
>-            case EOpMulAssign:
>-            case EOpVectorTimesMatrixAssign:
>-            case EOpVectorTimesScalarAssign:
>-            case EOpMatrixTimesScalarAssign:
>-            case EOpMatrixTimesMatrixAssign:
>-            {
>-                mEmulateCompoundMul.insert(
>-                    TypePair(type.getBuiltInTypeNameString(),
>-                             node->getRight()->getType().getBuiltInTypeNameString()));
>-                TIntermNode *replacement = createCompoundAssignmentFunctionCallNode(
>-                    node->getLeft(), node->getRight(), "mul");
>-                queueReplacement(replacement, OriginalNode::IS_DROPPED);
>-                break;
>-            }
>-            case EOpDivAssign:
>-            {
>-                mEmulateCompoundDiv.insert(
>-                    TypePair(type.getBuiltInTypeNameString(),
>-                             node->getRight()->getType().getBuiltInTypeNameString()));
>-                TIntermNode *replacement = createCompoundAssignmentFunctionCallNode(
>-                    node->getLeft(), node->getRight(), "div");
>-                queueReplacement(replacement, OriginalNode::IS_DROPPED);
>-                break;
>-            }
>-            default:
>-                // The rest of the binary operations should not need precision emulation.
>-                break;
>-        }
>-    }
>-    return visitChildren;
>-}
>-
>-bool EmulatePrecision::visitDeclaration(Visit visit, TIntermDeclaration *node)
>-{
>-    // Variable or interface block declaration.
>-    if (visit == PreVisit)
>-    {
>-        mDeclaringVariables = true;
>-    }
>-    else if (visit == InVisit)
>-    {
>-        mDeclaringVariables = true;
>-    }
>-    else
>-    {
>-        mDeclaringVariables = false;
>-    }
>-    return true;
>-}
>-
>-bool EmulatePrecision::visitInvariantDeclaration(Visit visit, TIntermInvariantDeclaration *node)
>-{
>-    return false;
>-}
>-
>-bool EmulatePrecision::visitFunctionPrototype(Visit visit, TIntermFunctionPrototype *node)
>-{
>-    return false;
>-}
>-
>-bool EmulatePrecision::visitAggregate(Visit visit, TIntermAggregate *node)
>-{
>-    if (visit != PreVisit)
>-        return true;
>-    switch (node->getOp())
>-    {
>-        case EOpCallInternalRawFunction:
>-        case EOpCallFunctionInAST:
>-            // User-defined function return values are not rounded. The calculations that produced
>-            // the value inside the function definition should have been rounded.
>-            break;
>-        case EOpConstruct:
>-            if (node->getBasicType() == EbtStruct)
>-            {
>-                break;
>-            }
>-        default:
>-            TIntermNode *parent = getParentNode();
>-            if (canRoundFloat(node->getType()) && ParentUsesResult(parent, node) &&
>-                !ParentConstructorTakesCareOfRounding(parent, node))
>-            {
>-                TIntermNode *replacement = createRoundingFunctionCallNode(node);
>-                queueReplacement(replacement, OriginalNode::BECOMES_CHILD);
>-            }
>-            break;
>-    }
>-    return true;
>-}
>-
>-bool EmulatePrecision::visitUnary(Visit visit, TIntermUnary *node)
>-{
>-    switch (node->getOp())
>-    {
>-        case EOpNegative:
>-        case EOpLogicalNot:
>-        case EOpPostIncrement:
>-        case EOpPostDecrement:
>-        case EOpPreIncrement:
>-        case EOpPreDecrement:
>-        case EOpLogicalNotComponentWise:
>-            break;
>-        default:
>-            if (canRoundFloat(node->getType()) && visit == PreVisit)
>-            {
>-                TIntermNode *replacement = createRoundingFunctionCallNode(node);
>-                queueReplacement(replacement, OriginalNode::BECOMES_CHILD);
>-            }
>-            break;
>-    }
>-
>-    return true;
>-}
>-
>-void EmulatePrecision::writeEmulationHelpers(TInfoSinkBase &sink,
>-                                             const int shaderVersion,
>-                                             const ShShaderOutput outputLanguage)
>-{
>-    std::unique_ptr<RoundingHelperWriter> roundingHelperWriter(
>-        RoundingHelperWriter::createHelperWriter(outputLanguage));
>-
>-    roundingHelperWriter->writeCommonRoundingHelpers(sink, shaderVersion);
>-
>-    EmulationSet::const_iterator it;
>-    for (it = mEmulateCompoundAdd.begin(); it != mEmulateCompoundAdd.end(); it++)
>-        roundingHelperWriter->writeCompoundAssignmentHelper(sink, it->lType, it->rType, "+", "add");
>-    for (it = mEmulateCompoundSub.begin(); it != mEmulateCompoundSub.end(); it++)
>-        roundingHelperWriter->writeCompoundAssignmentHelper(sink, it->lType, it->rType, "-", "sub");
>-    for (it = mEmulateCompoundDiv.begin(); it != mEmulateCompoundDiv.end(); it++)
>-        roundingHelperWriter->writeCompoundAssignmentHelper(sink, it->lType, it->rType, "/", "div");
>-    for (it = mEmulateCompoundMul.begin(); it != mEmulateCompoundMul.end(); it++)
>-        roundingHelperWriter->writeCompoundAssignmentHelper(sink, it->lType, it->rType, "*", "mul");
>-}
>-
>-// static
>-bool EmulatePrecision::SupportedInLanguage(const ShShaderOutput outputLanguage)
>-{
>-    switch (outputLanguage)
>-    {
>-        case SH_HLSL_4_1_OUTPUT:
>-        case SH_ESSL_OUTPUT:
>-            return true;
>-        default:
>-            // Other languages not yet supported
>-            return (outputLanguage == SH_GLSL_COMPATIBILITY_OUTPUT ||
>-                    sh::IsGLSL130OrNewer(outputLanguage));
>-    }
>-}
>-
>-}  // namespace sh
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/EmulatePrecision.h b/Source/ThirdParty/ANGLE/src/compiler/translator/EmulatePrecision.h
>deleted file mode 100644
>index 80444654102..00000000000
>--- a/Source/ThirdParty/ANGLE/src/compiler/translator/EmulatePrecision.h
>+++ /dev/null
>@@ -1,73 +0,0 @@
>-//
>-// Copyright (c) 2002-2014 The ANGLE Project Authors. All rights reserved.
>-// Use of this source code is governed by a BSD-style license that can be
>-// found in the LICENSE file.
>-//
>-
>-#ifndef COMPILER_TRANSLATOR_EMULATE_PRECISION_H_
>-#define COMPILER_TRANSLATOR_EMULATE_PRECISION_H_
>-
>-#include "GLSLANG/ShaderLang.h"
>-#include "common/angleutils.h"
>-#include "compiler/translator/Compiler.h"
>-#include "compiler/translator/InfoSink.h"
>-#include "compiler/translator/IntermTraverse.h"
>-
>-// This class gathers all compound assignments from the AST and can then write
>-// the functions required for their precision emulation. This way there is no
>-// need to write a huge number of variations of the emulated compound assignment
>-// to every translated shader with emulation enabled.
>-
>-namespace sh
>-{
>-
>-class EmulatePrecision : public TLValueTrackingTraverser
>-{
>-  public:
>-    EmulatePrecision(TSymbolTable *symbolTable, int shaderVersion);
>-
>-    void visitSymbol(TIntermSymbol *node) override;
>-    bool visitBinary(Visit visit, TIntermBinary *node) override;
>-    bool visitUnary(Visit visit, TIntermUnary *node) override;
>-    bool visitAggregate(Visit visit, TIntermAggregate *node) override;
>-    bool visitInvariantDeclaration(Visit visit, TIntermInvariantDeclaration *node) override;
>-    bool visitDeclaration(Visit visit, TIntermDeclaration *node) override;
>-    bool visitFunctionPrototype(Visit visit, TIntermFunctionPrototype *node) override;
>-
>-    void writeEmulationHelpers(TInfoSinkBase &sink,
>-                               const int shaderVersion,
>-                               const ShShaderOutput outputLanguage);
>-
>-    static bool SupportedInLanguage(const ShShaderOutput outputLanguage);
>-
>-  private:
>-    struct TypePair
>-    {
>-        TypePair(const char *l, const char *r) : lType(l), rType(r) {}
>-
>-        const char *lType;
>-        const char *rType;
>-    };
>-
>-    struct TypePairComparator
>-    {
>-        bool operator()(const TypePair &l, const TypePair &r) const
>-        {
>-            if (l.lType == r.lType)
>-                return l.rType < r.rType;
>-            return l.lType < r.lType;
>-        }
>-    };
>-
>-    typedef std::set<TypePair, TypePairComparator> EmulationSet;
>-    EmulationSet mEmulateCompoundAdd;
>-    EmulationSet mEmulateCompoundSub;
>-    EmulationSet mEmulateCompoundMul;
>-    EmulationSet mEmulateCompoundDiv;
>-
>-    bool mDeclaringVariables;
>-};
>-
>-}  // namespace sh
>-
>-#endif  // COMPILER_TRANSLATOR_EMULATE_PRECISION_H_
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/ExpandIntegerPowExpressions.cpp b/Source/ThirdParty/ANGLE/src/compiler/translator/ExpandIntegerPowExpressions.cpp
>deleted file mode 100644
>index f17dd73657b..00000000000
>--- a/Source/ThirdParty/ANGLE/src/compiler/translator/ExpandIntegerPowExpressions.cpp
>+++ /dev/null
>@@ -1,153 +0,0 @@
>-//
>-// Copyright (c) 2016 The ANGLE Project Authors. All rights reserved.
>-// Use of this source code is governed by a BSD-style license that can be
>-// found in the LICENSE file.
>-//
>-// Implementation of the integer pow expressions HLSL bug workaround.
>-// See header for more info.
>-
>-#include "compiler/translator/ExpandIntegerPowExpressions.h"
>-
>-#include <cmath>
>-#include <cstdlib>
>-
>-#include "compiler/translator/IntermTraverse.h"
>-
>-namespace sh
>-{
>-
>-namespace
>-{
>-
>-class Traverser : public TIntermTraverser
>-{
>-  public:
>-    static void Apply(TIntermNode *root, TSymbolTable *symbolTable);
>-
>-  private:
>-    Traverser(TSymbolTable *symbolTable);
>-    bool visitAggregate(Visit visit, TIntermAggregate *node) override;
>-    void nextIteration();
>-
>-    bool mFound = false;
>-};
>-
>-// static
>-void Traverser::Apply(TIntermNode *root, TSymbolTable *symbolTable)
>-{
>-    Traverser traverser(symbolTable);
>-    do
>-    {
>-        traverser.nextIteration();
>-        root->traverse(&traverser);
>-        if (traverser.mFound)
>-        {
>-            traverser.updateTree();
>-        }
>-    } while (traverser.mFound);
>-}
>-
>-Traverser::Traverser(TSymbolTable *symbolTable) : TIntermTraverser(true, false, false, symbolTable)
>-{
>-}
>-
>-void Traverser::nextIteration()
>-{
>-    mFound = false;
>-    nextTemporaryId();
>-}
>-
>-bool Traverser::visitAggregate(Visit visit, TIntermAggregate *node)
>-{
>-    if (mFound)
>-    {
>-        return false;
>-    }
>-
>-    // Test 0: skip non-pow operators.
>-    if (node->getOp() != EOpPow)
>-    {
>-        return true;
>-    }
>-
>-    const TIntermSequence *sequence = node->getSequence();
>-    ASSERT(sequence->size() == 2u);
>-    const TIntermConstantUnion *constantNode = sequence->at(1)->getAsConstantUnion();
>-
>-    // Test 1: check for a single constant.
>-    if (!constantNode || constantNode->getNominalSize() != 1)
>-    {
>-        return true;
>-    }
>-
>-    const TConstantUnion *constant = constantNode->getUnionArrayPointer();
>-
>-    TConstantUnion asFloat;
>-    asFloat.cast(EbtFloat, *constant);
>-
>-    float value = asFloat.getFConst();
>-
>-    // Test 2: value is in the problematic range.
>-    if (value < -5.0f || value > 9.0f)
>-    {
>-        return true;
>-    }
>-
>-    // Test 3: value is integer or pretty close to an integer.
>-    float absval = std::abs(value);
>-    float frac   = absval - std::round(absval);
>-    if (frac > 0.0001f)
>-    {
>-        return true;
>-    }
>-
>-    // Test 4: skip -1, 0, and 1
>-    int exponent = static_cast<int>(value);
>-    int n        = std::abs(exponent);
>-    if (n < 2)
>-    {
>-        return true;
>-    }
>-
>-    // Potential problem case detected, apply workaround.
>-    nextTemporaryId();
>-
>-    TIntermTyped *lhs = sequence->at(0)->getAsTyped();
>-    ASSERT(lhs);
>-
>-    TIntermDeclaration *init = createTempInitDeclaration(lhs);
>-    TIntermTyped *current    = createTempSymbol(lhs->getType());
>-
>-    insertStatementInParentBlock(init);
>-
>-    // Create a chain of n-1 multiples.
>-    for (int i = 1; i < n; ++i)
>-    {
>-        TIntermBinary *mul = new TIntermBinary(EOpMul, current, createTempSymbol(lhs->getType()));
>-        mul->setLine(node->getLine());
>-        current = mul;
>-    }
>-
>-    // For negative pow, compute the reciprocal of the positive pow.
>-    if (exponent < 0)
>-    {
>-        TConstantUnion *oneVal = new TConstantUnion();
>-        oneVal->setFConst(1.0f);
>-        TIntermConstantUnion *oneNode = new TIntermConstantUnion(oneVal, node->getType());
>-        TIntermBinary *div            = new TIntermBinary(EOpDiv, oneNode, current);
>-        current                       = div;
>-    }
>-
>-    queueReplacement(current, OriginalNode::IS_DROPPED);
>-    mFound = true;
>-    return false;
>-}
>-
>-}  // anonymous namespace
>-
>-void ExpandIntegerPowExpressions(TIntermNode *root, TSymbolTable *symbolTable)
>-{
>-    Traverser::Apply(root, symbolTable);
>-}
>-
>-}  // namespace sh
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/ExpandIntegerPowExpressions.h b/Source/ThirdParty/ANGLE/src/compiler/translator/ExpandIntegerPowExpressions.h
>deleted file mode 100644
>index 0074e5d6635..00000000000
>--- a/Source/ThirdParty/ANGLE/src/compiler/translator/ExpandIntegerPowExpressions.h
>+++ /dev/null
>@@ -1,29 +0,0 @@
>-//
>-// Copyright (c) 2016 The ANGLE Project Authors. All rights reserved.
>-// Use of this source code is governed by a BSD-style license that can be
>-// found in the LICENSE file.
>-//
>-// This mutating tree traversal works around a bug in the HLSL compiler optimizer with "pow" that
>-// manifests under the following conditions:
>-//
>-// - If pow() has a literal exponent value
>-// - ... and this value is integer or within 10e-6 of an integer
>-// - ... and it is in {-4, -3, -2, 2, 3, 4, 5, 6, 7, 8}
>-//
>-// The workaround is to replace the pow with a series of multiplies.
>-// See http://anglebug.com/851
>-
>-#ifndef COMPILER_TRANSLATOR_EXPANDINTEGERPOWEXPRESSIONS_H_
>-#define COMPILER_TRANSLATOR_EXPANDINTEGERPOWEXPRESSIONS_H_
>-
>-namespace sh
>-{
>-
>-class TIntermNode;
>-class TSymbolTable;
>-
>-void ExpandIntegerPowExpressions(TIntermNode *root, TSymbolTable *symbolTable);
>-
>-}  // namespace sh
>-
>-#endif  // COMPILER_TRANSLATOR_EXPANDINTEGERPOWEXPRESSIONS_H_
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/ExtensionBehavior.cpp b/Source/ThirdParty/ANGLE/src/compiler/translator/ExtensionBehavior.cpp
>index 3f910b90500..e6028193986 100644
>--- a/Source/ThirdParty/ANGLE/src/compiler/translator/ExtensionBehavior.cpp
>+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/ExtensionBehavior.cpp
>@@ -12,23 +12,25 @@
> 
> #include <string.h>
> 
>-#define LIST_EXTENSIONS(OP)             \
>-    OP(ARB_texture_rectangle)           \
>-    OP(ARM_shader_framebuffer_fetch)    \
>-    OP(EXT_blend_func_extended)         \
>-    OP(EXT_draw_buffers)                \
>-    OP(EXT_frag_depth)                  \
>-    OP(EXT_geometry_shader)             \
>-    OP(EXT_shader_framebuffer_fetch)    \
>-    OP(EXT_shader_texture_lod)          \
>-    OP(EXT_YUV_target)                  \
>-    OP(NV_EGL_stream_consumer_external) \
>-    OP(NV_shader_framebuffer_fetch)     \
>-    OP(OES_EGL_image_external)          \
>-    OP(OES_EGL_image_external_essl3)    \
>-    OP(OES_geometry_shader)             \
>-    OP(OES_standard_derivatives)        \
>-    OP(OVR_multiview)
>+#define LIST_EXTENSIONS(OP)                      \
>+    OP(ARB_texture_rectangle)                    \
>+    OP(ANGLE_texture_multisample)                \
>+    OP(ARM_shader_framebuffer_fetch)             \
>+    OP(EXT_blend_func_extended)                  \
>+    OP(EXT_draw_buffers)                         \
>+    OP(EXT_frag_depth)                           \
>+    OP(EXT_geometry_shader)                      \
>+    OP(EXT_shader_framebuffer_fetch)             \
>+    OP(EXT_shader_texture_lod)                   \
>+    OP(EXT_YUV_target)                           \
>+    OP(NV_EGL_stream_consumer_external)          \
>+    OP(NV_shader_framebuffer_fetch)              \
>+    OP(OES_EGL_image_external)                   \
>+    OP(OES_EGL_image_external_essl3)             \
>+    OP(OES_standard_derivatives)                 \
>+    OP(OES_texture_storage_multisample_2d_array) \
>+    OP(OVR_multiview2)                           \
>+    OP(ANGLE_multi_draw)
> 
> namespace sh
> {
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/ExtensionBehavior.h b/Source/ThirdParty/ANGLE/src/compiler/translator/ExtensionBehavior.h
>index 09cc03f10f0..161cc664775 100644
>--- a/Source/ThirdParty/ANGLE/src/compiler/translator/ExtensionBehavior.h
>+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/ExtensionBehavior.h
>@@ -19,6 +19,7 @@ enum class TExtension
>     UNDEFINED,  // Special value used to indicate no extension.
> 
>     ARB_texture_rectangle,
>+    ANGLE_texture_multisample,
>     ARM_shader_framebuffer_fetch,
>     EXT_blend_func_extended,
>     EXT_draw_buffers,
>@@ -31,9 +32,10 @@ enum class TExtension
>     NV_shader_framebuffer_fetch,
>     OES_EGL_image_external,
>     OES_EGL_image_external_essl3,
>-    OES_geometry_shader,
>     OES_standard_derivatives,
>-    OVR_multiview
>+    OES_texture_storage_multisample_2d_array,
>+    OVR_multiview2,
>+    ANGLE_multi_draw,
> };
> 
> enum TBehavior
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/ExtensionGLSL.cpp b/Source/ThirdParty/ANGLE/src/compiler/translator/ExtensionGLSL.cpp
>index 5b5dc580e9a..8a7aca95f2c 100644
>--- a/Source/ThirdParty/ANGLE/src/compiler/translator/ExtensionGLSL.cpp
>+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/ExtensionGLSL.cpp
>@@ -15,8 +15,7 @@ namespace sh
> 
> TExtensionGLSL::TExtensionGLSL(ShShaderOutput output)
>     : TIntermTraverser(true, false, false), mTargetVersion(ShaderOutputTypeToGLSLVersion(output))
>-{
>-}
>+{}
> 
> const std::set<std::string> &TExtensionGLSL::getEnabledExtensions() const
> {
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/ExtensionGLSL.h b/Source/ThirdParty/ANGLE/src/compiler/translator/ExtensionGLSL.h
>index a1b9cb2225d..9d752c4eaf9 100644
>--- a/Source/ThirdParty/ANGLE/src/compiler/translator/ExtensionGLSL.h
>+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/ExtensionGLSL.h
>@@ -12,7 +12,7 @@
> #include <set>
> #include <string>
> 
>-#include "compiler/translator/IntermTraverse.h"
>+#include "compiler/translator/tree_util/IntermTraverse.h"
> 
> namespace sh
> {
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/FindMain.cpp b/Source/ThirdParty/ANGLE/src/compiler/translator/FindMain.cpp
>deleted file mode 100644
>index 7417fbac8ae..00000000000
>--- a/Source/ThirdParty/ANGLE/src/compiler/translator/FindMain.cpp
>+++ /dev/null
>@@ -1,38 +0,0 @@
>-//
>-// Copyright (c) 2017 The ANGLE Project Authors. All rights reserved.
>-// Use of this source code is governed by a BSD-style license that can be
>-// found in the LICENSE file.
>-//
>-
>-// FindMain.cpp: Find the main() function definition in a given AST.
>-
>-#include "compiler/translator/FindMain.h"
>-
>-#include "compiler/translator/IntermNode.h"
>-
>-namespace sh
>-{
>-
>-TIntermFunctionDefinition *FindMain(TIntermBlock *root)
>-{
>-    for (TIntermNode *node : *root->getSequence())
>-    {
>-        TIntermFunctionDefinition *nodeFunction = node->getAsFunctionDefinition();
>-        if (nodeFunction != nullptr && nodeFunction->getFunctionSymbolInfo()->isMain())
>-        {
>-            return nodeFunction;
>-        }
>-    }
>-    return nullptr;
>-}
>-
>-TIntermBlock *FindMainBody(TIntermBlock *root)
>-{
>-    TIntermFunctionDefinition *main = FindMain(root);
>-    ASSERT(main != nullptr);
>-    TIntermBlock *mainBody = main->getBody();
>-    ASSERT(mainBody != nullptr);
>-    return mainBody;
>-}
>-
>-}  // namespace sh
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/FindMain.h b/Source/ThirdParty/ANGLE/src/compiler/translator/FindMain.h
>deleted file mode 100644
>index bf2c45d871e..00000000000
>--- a/Source/ThirdParty/ANGLE/src/compiler/translator/FindMain.h
>+++ /dev/null
>@@ -1,23 +0,0 @@
>-//
>-// Copyright (c) 2017 The ANGLE Project Authors. All rights reserved.
>-// Use of this source code is governed by a BSD-style license that can be
>-// found in the LICENSE file.
>-//
>-
>-// FindMain.h: Adds functions to get the main function definition and its body.
>-
>-#ifndef COMPILER_TRANSLATOR_FINDMAIN_H_
>-#define COMPILER_TRANSLATOR_FINDMAIN_H_
>-
>-namespace sh
>-{
>-
>-class TIntermBlock;
>-class TIntermFunctionDefinition;
>-
>-TIntermFunctionDefinition *FindMain(TIntermBlock *root);
>-TIntermBlock *FindMainBody(TIntermBlock *root);
>-
>-}  // namespace sh
>-
>-#endif  // COMPILER_TRANSLATOR_FINDMAIN_H_
>\ No newline at end of file
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/FindSymbolNode.cpp b/Source/ThirdParty/ANGLE/src/compiler/translator/FindSymbolNode.cpp
>deleted file mode 100644
>index a2a10f128d6..00000000000
>--- a/Source/ThirdParty/ANGLE/src/compiler/translator/FindSymbolNode.cpp
>+++ /dev/null
>@@ -1,58 +0,0 @@
>-//
>-// Copyright (c) 2015 The ANGLE Project Authors. All rights reserved.
>-// Use of this source code is governed by a BSD-style license that can be
>-// found in the LICENSE file.
>-//
>-// FindSymbol.cpp:
>-//     Utility for finding a symbol node inside an AST tree.
>-
>-#include "compiler/translator/FindSymbolNode.h"
>-
>-#include "compiler/translator/IntermTraverse.h"
>-
>-namespace sh
>-{
>-
>-namespace
>-{
>-
>-class SymbolFinder : public TIntermTraverser
>-{
>-  public:
>-    SymbolFinder(const TString &symbolName, TBasicType basicType)
>-        : TIntermTraverser(true, false, false),
>-          mSymbolName(symbolName),
>-          mNodeFound(nullptr),
>-          mBasicType(basicType)
>-    {
>-    }
>-
>-    void visitSymbol(TIntermSymbol *node)
>-    {
>-        if (node->getBasicType() == mBasicType && node->getSymbol() == mSymbolName)
>-        {
>-            mNodeFound = node;
>-        }
>-    }
>-
>-    bool isFound() const { return mNodeFound != nullptr; }
>-    const TIntermSymbol *getNode() const { return mNodeFound; }
>-
>-  private:
>-    TString mSymbolName;
>-    TIntermSymbol *mNodeFound;
>-    TBasicType mBasicType;
>-};
>-
>-}  // anonymous namespace
>-
>-const TIntermSymbol *FindSymbolNode(TIntermNode *root,
>-                                    const TString &symbolName,
>-                                    TBasicType basicType)
>-{
>-    SymbolFinder finder(symbolName, basicType);
>-    root->traverse(&finder);
>-    return finder.getNode();
>-}
>-
>-}  // namespace sh
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/FindSymbolNode.h b/Source/ThirdParty/ANGLE/src/compiler/translator/FindSymbolNode.h
>deleted file mode 100644
>index 08dfb9a2224..00000000000
>--- a/Source/ThirdParty/ANGLE/src/compiler/translator/FindSymbolNode.h
>+++ /dev/null
>@@ -1,27 +0,0 @@
>-//
>-// Copyright (c) 2015 The ANGLE Project Authors. All rights reserved.
>-// Use of this source code is governed by a BSD-style license that can be
>-// found in the LICENSE file.
>-//
>-// FindSymbolNode.h:
>-//     Utility for finding a symbol node inside an AST tree.
>-
>-#ifndef COMPILER_TRANSLATOR_FIND_SYMBOL_H_
>-#define COMPILER_TRANSLATOR_FIND_SYMBOL_H_
>-
>-#include "compiler/translator/BaseTypes.h"
>-#include "compiler/translator/Common.h"
>-
>-namespace sh
>-{
>-
>-class TIntermNode;
>-class TIntermSymbol;
>-
>-const TIntermSymbol *FindSymbolNode(TIntermNode *root,
>-                                    const TString &symbolName,
>-                                    TBasicType basicType);
>-
>-}  // namespace sh
>-
>-#endif  // COMPILER_TRANSLATOR_FIND_SYMBOL_H_
>\ No newline at end of file
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/FlagStd140Structs.cpp b/Source/ThirdParty/ANGLE/src/compiler/translator/FlagStd140Structs.cpp
>index fba837f55c7..368854f0682 100644
>--- a/Source/ThirdParty/ANGLE/src/compiler/translator/FlagStd140Structs.cpp
>+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/FlagStd140Structs.cpp
>@@ -8,7 +8,8 @@
> 
> #include "compiler/translator/FlagStd140Structs.h"
> 
>-#include "compiler/translator/IntermTraverse.h"
>+#include "compiler/translator/SymbolTable.h"
>+#include "compiler/translator/tree_util/IntermTraverse.h"
> 
> namespace sh
> {
>@@ -27,13 +28,13 @@ class FlagStd140StructsTraverser : public TIntermTraverser
>     bool visitDeclaration(Visit visit, TIntermDeclaration *node) override;
> 
>   private:
>-    void mapBlockStructMembers(TIntermSymbol *blockDeclarator, TInterfaceBlock *block);
>+    void mapBlockStructMembers(TIntermSymbol *blockDeclarator, const TInterfaceBlock *block);
> 
>     std::vector<MappedStruct> mMappedStructs;
> };
> 
> void FlagStd140StructsTraverser::mapBlockStructMembers(TIntermSymbol *blockDeclarator,
>-                                                       TInterfaceBlock *block)
>+                                                       const TInterfaceBlock *block)
> {
>     for (auto *field : block->fields())
>     {
>@@ -52,7 +53,7 @@ bool FlagStd140StructsTraverser::visitDeclaration(Visit visit, TIntermDeclaratio
>     TIntermTyped *declarator = node->getSequence()->back()->getAsTyped();
>     if (declarator->getBasicType() == EbtInterfaceBlock)
>     {
>-        TInterfaceBlock *block = declarator->getType().getInterfaceBlock();
>+        const TInterfaceBlock *block = declarator->getType().getInterfaceBlock();
>         if (block->blockStorage() == EbsStd140)
>         {
>             mapBlockStructMembers(declarator->getAsSymbolNode(), block);
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/FlagStd140Structs.h b/Source/ThirdParty/ANGLE/src/compiler/translator/FlagStd140Structs.h
>index f548d8b6ed1..ce035d91850 100644
>--- a/Source/ThirdParty/ANGLE/src/compiler/translator/FlagStd140Structs.h
>+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/FlagStd140Structs.h
>@@ -25,6 +25,6 @@ struct MappedStruct
> };
> 
> std::vector<MappedStruct> FlagStd140Structs(TIntermNode *node);
>-}
>+}  // namespace sh
> 
> #endif  // COMPILER_TRANSLATOR_FLAGSTD140STRUCTS_H_
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/FunctionLookup.cpp b/Source/ThirdParty/ANGLE/src/compiler/translator/FunctionLookup.cpp
>new file mode 100644
>index 00000000000..e49d2ace339
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/FunctionLookup.cpp
>@@ -0,0 +1,103 @@
>+//
>+// Copyright (c) 2018 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// FunctionLookup.cpp: Used for storing function calls that have not yet been resolved during
>+// parsing.
>+//
>+
>+#include "compiler/translator/FunctionLookup.h"
>+
>+namespace sh
>+{
>+
>+namespace
>+{
>+
>+const char kFunctionMangledNameSeparator = '(';
>+
>+constexpr const ImmutableString kEmptyName("");
>+
>+}  // anonymous namespace
>+
>+TFunctionLookup::TFunctionLookup(const ImmutableString &name,
>+                                 const TType *constructorType,
>+                                 const TSymbol *symbol)
>+    : mName(name), mConstructorType(constructorType), mThisNode(nullptr), mSymbol(symbol)
>+{}
>+
>+// static
>+TFunctionLookup *TFunctionLookup::CreateConstructor(const TType *type)
>+{
>+    ASSERT(type != nullptr);
>+    return new TFunctionLookup(kEmptyName, type, nullptr);
>+}
>+
>+// static
>+TFunctionLookup *TFunctionLookup::CreateFunctionCall(const ImmutableString &name,
>+                                                     const TSymbol *symbol)
>+{
>+    ASSERT(name != "");
>+    return new TFunctionLookup(name, nullptr, symbol);
>+}
>+
>+const ImmutableString &TFunctionLookup::name() const
>+{
>+    return mName;
>+}
>+
>+ImmutableString TFunctionLookup::getMangledName() const
>+{
>+    return GetMangledName(mName.data(), mArguments);
>+}
>+
>+ImmutableString TFunctionLookup::GetMangledName(const char *functionName,
>+                                                const TIntermSequence &arguments)
>+{
>+    std::string newName(functionName);
>+    newName += kFunctionMangledNameSeparator;
>+
>+    for (TIntermNode *argument : arguments)
>+    {
>+        newName += argument->getAsTyped()->getType().getMangledName();
>+    }
>+    return ImmutableString(newName);
>+}
>+
>+bool TFunctionLookup::isConstructor() const
>+{
>+    return mConstructorType != nullptr;
>+}
>+
>+const TType &TFunctionLookup::constructorType() const
>+{
>+    return *mConstructorType;
>+}
>+
>+void TFunctionLookup::setThisNode(TIntermTyped *thisNode)
>+{
>+    mThisNode = thisNode;
>+}
>+
>+TIntermTyped *TFunctionLookup::thisNode() const
>+{
>+    return mThisNode;
>+}
>+
>+void TFunctionLookup::addArgument(TIntermTyped *argument)
>+{
>+    mArguments.push_back(argument);
>+}
>+
>+TIntermSequence &TFunctionLookup::arguments()
>+{
>+    return mArguments;
>+}
>+
>+const TSymbol *TFunctionLookup::symbol() const
>+{
>+    return mSymbol;
>+}
>+
>+}  // namespace sh
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/FunctionLookup.h b/Source/ThirdParty/ANGLE/src/compiler/translator/FunctionLookup.h
>new file mode 100644
>index 00000000000..62b07f23a17
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/FunctionLookup.h
>@@ -0,0 +1,59 @@
>+//
>+// Copyright (c) 2018 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// FunctionLookup.h: Used for storing function calls that have not yet been resolved during parsing.
>+//
>+
>+#ifndef COMPILER_TRANSLATOR_FUNCTIONLOOKUP_H_
>+#define COMPILER_TRANSLATOR_FUNCTIONLOOKUP_H_
>+
>+#include "compiler/translator/ImmutableString.h"
>+#include "compiler/translator/IntermNode.h"
>+
>+namespace sh
>+{
>+
>+// A function look-up.
>+class TFunctionLookup : angle::NonCopyable
>+{
>+  public:
>+    POOL_ALLOCATOR_NEW_DELETE
>+
>+    static TFunctionLookup *CreateConstructor(const TType *type);
>+    static TFunctionLookup *CreateFunctionCall(const ImmutableString &name, const TSymbol *symbol);
>+
>+    const ImmutableString &name() const;
>+    ImmutableString getMangledName() const;
>+    static ImmutableString GetMangledName(const char *functionName,
>+                                          const TIntermSequence &arguments);
>+
>+    bool isConstructor() const;
>+    const TType &constructorType() const;
>+
>+    void setThisNode(TIntermTyped *thisNode);
>+    TIntermTyped *thisNode() const;
>+
>+    void addArgument(TIntermTyped *argument);
>+    TIntermSequence &arguments();
>+
>+    // Symbol looked up in the lexical phase using only the name of the function.
>+    // This does not necessarily correspond to the correct overloaded function.
>+    const TSymbol *symbol() const;
>+
>+  private:
>+    TFunctionLookup(const ImmutableString &name,
>+                    const TType *constructorType,
>+                    const TSymbol *symbol);
>+
>+    const ImmutableString mName;
>+    const TType *const mConstructorType;
>+    TIntermTyped *mThisNode;
>+    TIntermSequence mArguments;
>+    const TSymbol *mSymbol;
>+};
>+
>+}  // namespace sh
>+
>+#endif  // COMPILER_TRANSLATOR_FUNCTIONLOOKUP_H_
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/HashNames.cpp b/Source/ThirdParty/ANGLE/src/compiler/translator/HashNames.cpp
>index 6bc90faf94c..6994c10afaf 100644
>--- a/Source/ThirdParty/ANGLE/src/compiler/translator/HashNames.cpp
>+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/HashNames.cpp
>@@ -6,67 +6,89 @@
> 
> #include "compiler/translator/HashNames.h"
> 
>+#include "compiler/translator/ImmutableString.h"
>+#include "compiler/translator/ImmutableStringBuilder.h"
> #include "compiler/translator/IntermNode.h"
>+#include "compiler/translator/Symbol.h"
> 
> namespace sh
> {
> 
> namespace
> {
>-
>-// GLSL ES 3.00.6 section 3.9: the maximum length of an identifier is 1024 characters.
>-static const unsigned int kESSLMaxIdentifierLength = 1024u;
>-
>-static const char *kHashedNamePrefix = "webgl_";
>+constexpr const ImmutableString kHashedNamePrefix("webgl_");
> 
> // Can't prefix with just _ because then we might introduce a double underscore, which is not safe
> // in GLSL (ESSL 3.00.6 section 3.8: All identifiers containing a double underscore are reserved for
> // use by the underlying implementation). u is short for user-defined.
>-static const char *kUnhashedNamePrefix              = "_u";
>-static const unsigned int kUnhashedNamePrefixLength = 2u;
>+constexpr const ImmutableString kUnhashedNamePrefix("_u");
> 
>-TString HashName(const TString &name, ShHashFunction64 hashFunction)
>+ImmutableString HashName(const ImmutableString &name, ShHashFunction64 hashFunction)
> {
>     ASSERT(!name.empty());
>     ASSERT(hashFunction);
>-    khronos_uint64_t number = (*hashFunction)(name.c_str(), name.length());
>-    TStringStream stream;
>-    stream << kHashedNamePrefix << std::hex << number;
>-    TString hashedName = stream.str();
>+    khronos_uint64_t number = (*hashFunction)(name.data(), name.length());
>+
>+    // Build the hashed name in place.
>+    static const unsigned int kHexStrMaxLength = sizeof(number) * 2;
>+    static const size_t kHashedNameMaxLength   = kHashedNamePrefix.length() + kHexStrMaxLength;
>+
>+    ImmutableStringBuilder hashedName(kHashedNameMaxLength);
>+    hashedName << kHashedNamePrefix;
>+
>+    hashedName.appendHex(number);
>+
>     return hashedName;
> }
> 
> }  // anonymous namespace
> 
>-TString HashName(const TName &name, ShHashFunction64 hashFunction, NameMap *nameMap)
>+ImmutableString HashName(const ImmutableString &name,
>+                         ShHashFunction64 hashFunction,
>+                         NameMap *nameMap)
> {
>-    if (name.getString().empty() || name.isInternal())
>-    {
>-        return name.getString();
>-    }
>     if (hashFunction == nullptr)
>     {
>-        if (name.getString().length() + kUnhashedNamePrefixLength > kESSLMaxIdentifierLength)
>+        if (name.length() + kUnhashedNamePrefix.length() > kESSLMaxIdentifierLength)
>         {
>             // If the identifier length is already close to the limit, we can't prefix it. This is
>             // not a problem since there are no builtins or ANGLE's internal variables that would
>             // have as long names and could conflict.
>-            return name.getString();
>+            return name;
>         }
>-        return kUnhashedNamePrefix + name.getString();
>+        ImmutableStringBuilder prefixedName(kUnhashedNamePrefix.length() + name.length());
>+        prefixedName << kUnhashedNamePrefix << name;
>+        return prefixedName;
>     }
>     if (nameMap)
>     {
>-        NameMap::const_iterator it = nameMap->find(name.getString().c_str());
>+        NameMap::const_iterator it = nameMap->find(name.data());
>         if (it != nameMap->end())
>-            return it->second.c_str();
>+        {
>+            // TODO(oetuaho): Would be nice if we didn't need to allocate a string here.
>+            return ImmutableString(it->second);
>+        }
>     }
>-    TString hashedName = HashName(name.getString(), hashFunction);
>+    ImmutableString hashedName = HashName(name, hashFunction);
>     if (nameMap)
>     {
>-        (*nameMap)[name.getString().c_str()] = hashedName.c_str();
>+        (*nameMap)[name.data()] = hashedName.data();
>     }
>     return hashedName;
> }
> 
>+ImmutableString HashName(const TSymbol *symbol, ShHashFunction64 hashFunction, NameMap *nameMap)
>+{
>+    if (symbol->symbolType() == SymbolType::Empty)
>+    {
>+        return kEmptyImmutableString;
>+    }
>+    if (symbol->symbolType() == SymbolType::AngleInternal ||
>+        symbol->symbolType() == SymbolType::BuiltIn)
>+    {
>+        return symbol->name();
>+    }
>+    return HashName(symbol->name(), hashFunction, nameMap);
>+}
>+
> }  // namespace sh
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/HashNames.h b/Source/ThirdParty/ANGLE/src/compiler/translator/HashNames.h
>index 28e861b3098..132cb593374 100644
>--- a/Source/ThirdParty/ANGLE/src/compiler/translator/HashNames.h
>+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/HashNames.h
>@@ -17,11 +17,16 @@ namespace sh
> 
> typedef std::map<TPersistString, TPersistString> NameMap;
> 
>-class TName;
>+class ImmutableString;
>+class TSymbol;
>+
>+ImmutableString HashName(const ImmutableString &name,
>+                         ShHashFunction64 hashFunction,
>+                         NameMap *nameMap);
> 
> // Hash user-defined name for GLSL output, with special handling for internal names.
> // The nameMap parameter is optional and is used to cache hashed names if set.
>-TString HashName(const TName &name, ShHashFunction64 hashFunction, NameMap *nameMap);
>+ImmutableString HashName(const TSymbol *symbol, ShHashFunction64 hashFunction, NameMap *nameMap);
> 
> }  // namespace sh
> 
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/ImageFunctionHLSL.cpp b/Source/ThirdParty/ANGLE/src/compiler/translator/ImageFunctionHLSL.cpp
>index 40b5e1f1e2a..d60cce09e51 100644
>--- a/Source/ThirdParty/ANGLE/src/compiler/translator/ImageFunctionHLSL.cpp
>+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/ImageFunctionHLSL.cpp
>@@ -7,24 +7,48 @@
> //
> 
> #include "compiler/translator/ImageFunctionHLSL.h"
>+#include "compiler/translator/ImmutableStringBuilder.h"
> #include "compiler/translator/UtilsHLSL.h"
> 
> namespace sh
> {
> 
> // static
>-void ImageFunctionHLSL::OutputImageFunctionArgumentList(
>+ImmutableString ImageFunctionHLSL::GetImageReference(
>     TInfoSinkBase &out,
>     const ImageFunctionHLSL::ImageFunction &imageFunction)
> {
>+    static const ImmutableString kImageIndexStr("[index]");
>     if (imageFunction.readonly)
>     {
>-        out << TextureString(imageFunction.image, imageFunction.imageInternalFormat) << " tex";
>+        static const ImmutableString kReadonlyImagesStr("readonlyImages");
>+        ImmutableString suffix(
>+            TextureGroupSuffix(imageFunction.image, imageFunction.imageInternalFormat));
>+        out << "    const uint index = imageIndex - readonlyImageIndexOffset" << suffix.data()
>+            << ";\n";
>+        ImmutableStringBuilder imageRefBuilder(kReadonlyImagesStr.length() + suffix.length() +
>+                                               kImageIndexStr.length());
>+        imageRefBuilder << kReadonlyImagesStr << suffix << kImageIndexStr;
>+        return imageRefBuilder;
>     }
>     else
>     {
>-        out << RWTextureString(imageFunction.image, imageFunction.imageInternalFormat) << " tex";
>+        static const ImmutableString kImagesStr("images");
>+        ImmutableString suffix(
>+            RWTextureGroupSuffix(imageFunction.image, imageFunction.imageInternalFormat));
>+        out << "    const uint index = imageIndex - imageIndexOffset" << suffix.data() << ";\n";
>+        ImmutableStringBuilder imageRefBuilder(kImagesStr.length() + suffix.length() +
>+                                               kImageIndexStr.length());
>+        imageRefBuilder << kImagesStr << suffix << kImageIndexStr;
>+        return imageRefBuilder;
>     }
>+}
>+
>+void ImageFunctionHLSL::OutputImageFunctionArgumentList(
>+    TInfoSinkBase &out,
>+    const ImageFunctionHLSL::ImageFunction &imageFunction)
>+{
>+    out << "uint imageIndex";
> 
>     if (imageFunction.method == ImageFunctionHLSL::ImageFunction::Method::LOAD ||
>         imageFunction.method == ImageFunctionHLSL::ImageFunction::Method::STORE)
>@@ -84,7 +108,7 @@ void ImageFunctionHLSL::OutputImageFunctionArgumentList(
> void ImageFunctionHLSL::OutputImageSizeFunctionBody(
>     TInfoSinkBase &out,
>     const ImageFunctionHLSL::ImageFunction &imageFunction,
>-    const TString &imageReference)
>+    const ImmutableString &imageReference)
> {
>     if (IsImage3D(imageFunction.image) || IsImage2DArray(imageFunction.image) ||
>         IsImageCube(imageFunction.image))
>@@ -115,7 +139,7 @@ void ImageFunctionHLSL::OutputImageSizeFunctionBody(
> void ImageFunctionHLSL::OutputImageLoadFunctionBody(
>     TInfoSinkBase &out,
>     const ImageFunctionHLSL::ImageFunction &imageFunction,
>-    const TString &imageReference)
>+    const ImmutableString &imageReference)
> {
>     if (IsImage3D(imageFunction.image) || IsImage2DArray(imageFunction.image) ||
>         IsImageCube(imageFunction.image))
>@@ -134,7 +158,7 @@ void ImageFunctionHLSL::OutputImageLoadFunctionBody(
> void ImageFunctionHLSL::OutputImageStoreFunctionBody(
>     TInfoSinkBase &out,
>     const ImageFunctionHLSL::ImageFunction &imageFunction,
>-    const TString &imageReference)
>+    const ImmutableString &imageReference)
> {
>     if (IsImage3D(imageFunction.image) || IsImage2DArray(imageFunction.image) ||
>         IsImage2D(imageFunction.image) || IsImageCube(imageFunction.image))
>@@ -145,28 +169,34 @@ void ImageFunctionHLSL::OutputImageStoreFunctionBody(
>         UNREACHABLE();
> }
> 
>-TString ImageFunctionHLSL::ImageFunction::name() const
>+ImmutableString ImageFunctionHLSL::ImageFunction::name() const
> {
>-    TString name = "gl_image";
>+    static const ImmutableString kGlImageName("gl_image");
>+
>+    ImmutableString suffix(nullptr);
>     if (readonly)
>     {
>-        name += TextureTypeSuffix(image, imageInternalFormat);
>+        suffix = ImmutableString(TextureTypeSuffix(image, imageInternalFormat));
>     }
>     else
>     {
>-        name += RWTextureTypeSuffix(image, imageInternalFormat);
>+        suffix = ImmutableString(RWTextureTypeSuffix(image, imageInternalFormat));
>     }
> 
>+    ImmutableStringBuilder name(kGlImageName.length() + suffix.length() + 5u);
>+
>+    name << kGlImageName << suffix;
>+
>     switch (method)
>     {
>         case Method::SIZE:
>-            name += "Size";
>+            name << "Size";
>             break;
>         case Method::LOAD:
>-            name += "Load";
>+            name << "Load";
>             break;
>         case Method::STORE:
>-            name += "Store";
>+            name << "Store";
>             break;
>         default:
>             UNREACHABLE();
>@@ -175,6 +205,36 @@ TString ImageFunctionHLSL::ImageFunction::name() const
>     return name;
> }
> 
>+ImageFunctionHLSL::ImageFunction::DataType ImageFunctionHLSL::ImageFunction::getDataType(
>+    TLayoutImageInternalFormat format) const
>+{
>+    switch (format)
>+    {
>+        case EiifRGBA32F:
>+        case EiifRGBA16F:
>+        case EiifR32F:
>+            return ImageFunction::DataType::FLOAT4;
>+        case EiifRGBA32UI:
>+        case EiifRGBA16UI:
>+        case EiifRGBA8UI:
>+        case EiifR32UI:
>+            return ImageFunction::DataType::UINT4;
>+        case EiifRGBA32I:
>+        case EiifRGBA16I:
>+        case EiifRGBA8I:
>+        case EiifR32I:
>+            return ImageFunction::DataType::INT4;
>+        case EiifRGBA8:
>+            return ImageFunction::DataType::UNORM_FLOAT4;
>+        case EiifRGBA8_SNORM:
>+            return ImageFunction::DataType::SNORM_FLOAT4;
>+        default:
>+            UNREACHABLE();
>+    }
>+
>+    return ImageFunction::DataType::NONE;
>+}
>+
> const char *ImageFunctionHLSL::ImageFunction::getReturnType() const
> {
>     if (method == ImageFunction::Method::SIZE)
>@@ -235,20 +295,21 @@ const char *ImageFunctionHLSL::ImageFunction::getReturnType() const
> 
> bool ImageFunctionHLSL::ImageFunction::operator<(const ImageFunction &rhs) const
> {
>-    return std::tie(image, imageInternalFormat, readonly, method) <
>-           std::tie(rhs.image, rhs.imageInternalFormat, rhs.readonly, rhs.method);
>+    return std::tie(image, type, method, readonly) <
>+           std::tie(rhs.image, rhs.type, rhs.method, rhs.readonly);
> }
> 
>-TString ImageFunctionHLSL::useImageFunction(const TString &name,
>-                                            const TBasicType &type,
>-                                            TLayoutImageInternalFormat imageInternalFormat,
>-                                            bool readonly)
>+ImmutableString ImageFunctionHLSL::useImageFunction(const ImmutableString &name,
>+                                                    const TBasicType &type,
>+                                                    TLayoutImageInternalFormat imageInternalFormat,
>+                                                    bool readonly)
> {
>     ASSERT(IsImage(type));
>     ImageFunction imageFunction;
>     imageFunction.image               = type;
>     imageFunction.imageInternalFormat = imageInternalFormat;
>     imageFunction.readonly            = readonly;
>+    imageFunction.type                = imageFunction.getDataType(imageInternalFormat);
> 
>     if (name == "imageSize")
>     {
>@@ -273,6 +334,13 @@ void ImageFunctionHLSL::imageFunctionHeader(TInfoSinkBase &out)
> {
>     for (const ImageFunction &imageFunction : mUsesImage)
>     {
>+        // Skip to generate image2D functions here, dynamically generate these
>+        // functions when linking, or after dispatch or draw.
>+        if (IsImage2D(imageFunction.image))
>+        {
>+            mUsedImage2DFunctionNames.insert(imageFunction.name().data());
>+            continue;
>+        }
>         // Function header
>         out << imageFunction.getReturnType() << " " << imageFunction.name() << "(";
> 
>@@ -281,8 +349,7 @@ void ImageFunctionHLSL::imageFunctionHeader(TInfoSinkBase &out)
>         out << ")\n"
>                "{\n";
> 
>-        TString imageReference("tex");
>-
>+        ImmutableString imageReference = GetImageReference(out, imageFunction);
>         if (imageFunction.method == ImageFunction::Method::SIZE)
>         {
>             OutputImageSizeFunctionBody(out, imageFunction, imageReference);
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/ImageFunctionHLSL.h b/Source/ThirdParty/ANGLE/src/compiler/translator/ImageFunctionHLSL.h
>index 9db17a6bbf0..56c1dcc8e08 100644
>--- a/Source/ThirdParty/ANGLE/src/compiler/translator/ImageFunctionHLSL.h
>+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/ImageFunctionHLSL.h
>@@ -25,12 +25,16 @@ class ImageFunctionHLSL final : angle::NonCopyable
>   public:
>     // Returns the name of the image function implementation to caller.
>     // The name that's passed in is the name of the GLSL image function that it should implement.
>-    TString useImageFunction(const TString &name,
>-                             const TBasicType &type,
>-                             TLayoutImageInternalFormat imageInternalFormat,
>-                             bool readonly);
>+    ImmutableString useImageFunction(const ImmutableString &name,
>+                                     const TBasicType &type,
>+                                     TLayoutImageInternalFormat imageInternalFormat,
>+                                     bool readonly);
> 
>     void imageFunctionHeader(TInfoSinkBase &out);
>+    const std::set<std::string> &getUsedImage2DFunctionNames() const
>+    {
>+        return mUsedImage2DFunctionNames;
>+    }
> 
>   private:
>     struct ImageFunction
>@@ -43,32 +47,48 @@ class ImageFunctionHLSL final : angle::NonCopyable
>             STORE
>         };
> 
>-        TString name() const;
>+        enum class DataType
>+        {
>+            NONE,
>+            FLOAT4,
>+            UINT4,
>+            INT4,
>+            UNORM_FLOAT4,
>+            SNORM_FLOAT4
>+        };
>+
>+        ImmutableString name() const;
> 
>         bool operator<(const ImageFunction &rhs) const;
> 
>+        DataType getDataType(TLayoutImageInternalFormat format) const;
>+
>         const char *getReturnType() const;
> 
>         TBasicType image;
>         TLayoutImageInternalFormat imageInternalFormat;
>         bool readonly;
>         Method method;
>+        DataType type;
>     };
> 
>+    static ImmutableString GetImageReference(TInfoSinkBase &out,
>+                                             const ImageFunctionHLSL::ImageFunction &imageFunction);
>     static void OutputImageFunctionArgumentList(
>         TInfoSinkBase &out,
>         const ImageFunctionHLSL::ImageFunction &imageFunction);
>     static void OutputImageSizeFunctionBody(TInfoSinkBase &out,
>                                             const ImageFunctionHLSL::ImageFunction &imageFunction,
>-                                            const TString &imageReference);
>+                                            const ImmutableString &imageReference);
>     static void OutputImageLoadFunctionBody(TInfoSinkBase &out,
>                                             const ImageFunctionHLSL::ImageFunction &imageFunction,
>-                                            const TString &imageReference);
>+                                            const ImmutableString &imageReference);
>     static void OutputImageStoreFunctionBody(TInfoSinkBase &out,
>                                              const ImageFunctionHLSL::ImageFunction &imageFunction,
>-                                             const TString &imageReference);
>+                                             const ImmutableString &imageReference);
>     using ImageFunctionSet = std::set<ImageFunction>;
>     ImageFunctionSet mUsesImage;
>+    std::set<std::string> mUsedImage2DFunctionNames;
> };
> 
> }  // namespace sh
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/ImmutableString.cpp b/Source/ThirdParty/ANGLE/src/compiler/translator/ImmutableString.cpp
>new file mode 100644
>index 00000000000..38f3fa052ce
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/ImmutableString.cpp
>@@ -0,0 +1,69 @@
>+//
>+// Copyright (c) 2018 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// ImmutableString.cpp: Wrapper for static or pool allocated char arrays, that are guaranteed to be
>+// valid and unchanged for the duration of the compilation.
>+//
>+
>+#include "compiler/translator/ImmutableString.h"
>+
>+std::ostream &operator<<(std::ostream &os, const sh::ImmutableString &str)
>+{
>+    return os.write(str.data(), str.length());
>+}
>+
>+#if defined(_MSC_VER)
>+#    pragma warning(disable : 4309)  // truncation of constant value
>+#endif
>+
>+namespace sh
>+{
>+
>+template <>
>+const size_t ImmutableString::FowlerNollVoHash<4>::kFnvPrime = 16777619u;
>+
>+template <>
>+const size_t ImmutableString::FowlerNollVoHash<4>::kFnvOffsetBasis = 0x811c9dc5u;
>+
>+template <>
>+const size_t ImmutableString::FowlerNollVoHash<8>::kFnvPrime =
>+    static_cast<size_t>(1099511628211ull);
>+
>+template <>
>+const size_t ImmutableString::FowlerNollVoHash<8>::kFnvOffsetBasis =
>+    static_cast<size_t>(0xcbf29ce484222325ull);
>+
>+uint32_t ImmutableString::mangledNameHash() const
>+{
>+    const char *dataPtr              = data();
>+    uint32_t hash                    = static_cast<uint32_t>(FowlerNollVoHash<4>::kFnvOffsetBasis);
>+    const uint32_t kMaxSixBitValue   = (1u << 6) - 1u;
>+    uint32_t parenLocation           = kMaxSixBitValue;
>+    uint32_t hasArrayOrBlockParamBit = 0u;
>+    uint32_t index                   = 0;
>+    while (dataPtr[index] != '\0')
>+    {
>+        hash = hash ^ dataPtr[index];
>+        hash = hash * static_cast<uint32_t>(FowlerNollVoHash<4>::kFnvPrime);
>+        if (dataPtr[index] == '(')
>+        {
>+            // We should only reach here once, since this function should not be called with invalid
>+            // mangled names.
>+            ASSERT(parenLocation == kMaxSixBitValue);
>+            parenLocation = index;
>+        }
>+        else if (dataPtr[index] == '{' || dataPtr[index] == '[')
>+        {
>+            hasArrayOrBlockParamBit = 1u;
>+        }
>+        ++index;
>+    }
>+    // Should not be called with strings longer than 63 characters.
>+    ASSERT(index <= kMaxSixBitValue);
>+    return ((hash >> 13) ^ (hash & 0x1fff)) | (index << 19) | (parenLocation << 25) |
>+           (hasArrayOrBlockParamBit << 31);
>+}
>+
>+}  // namespace sh
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/ImmutableString.h b/Source/ThirdParty/ANGLE/src/compiler/translator/ImmutableString.h
>new file mode 100644
>index 00000000000..5f08ea06cc2
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/ImmutableString.h
>@@ -0,0 +1,144 @@
>+//
>+// Copyright (c) 2018 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// ImmutableString.h: Wrapper for static or pool allocated char arrays, that are guaranteed to be
>+// valid and unchanged for the duration of the compilation.
>+//
>+
>+#ifndef COMPILER_TRANSLATOR_IMMUTABLESTRING_H_
>+#define COMPILER_TRANSLATOR_IMMUTABLESTRING_H_
>+
>+#include <string>
>+
>+#include "common/string_utils.h"
>+#include "compiler/translator/Common.h"
>+
>+namespace sh
>+{
>+
>+namespace
>+{
>+constexpr size_t constStrlen(const char *str)
>+{
>+    if (str == nullptr)
>+    {
>+        return 0u;
>+    }
>+    size_t len = 0u;
>+    while (*(str + len) != '\0')
>+    {
>+        ++len;
>+    }
>+    return len;
>+}
>+}  // namespace
>+
>+class ImmutableString
>+{
>+  public:
>+    // The data pointer passed in must be one of:
>+    //  1. nullptr (only valid with length 0).
>+    //  2. a null-terminated static char array like a string literal.
>+    //  3. a null-terminated pool allocated char array. This can't be c_str() of a local TString,
>+    //     since when a TString goes out of scope it clears its first character.
>+    explicit constexpr ImmutableString(const char *data) : mData(data), mLength(constStrlen(data))
>+    {}
>+
>+    constexpr ImmutableString(const char *data, size_t length) : mData(data), mLength(length) {}
>+
>+    ImmutableString(const std::string &str)
>+        : mData(AllocatePoolCharArray(str.c_str(), str.size())), mLength(str.size())
>+    {}
>+
>+    constexpr ImmutableString(const ImmutableString &) = default;
>+
>+    ImmutableString &operator=(const ImmutableString &) = default;
>+
>+    constexpr const char *data() const { return mData ? mData : ""; }
>+    constexpr size_t length() const { return mLength; }
>+
>+    char operator[](size_t index) const { return data()[index]; }
>+
>+    constexpr bool empty() const { return mLength == 0; }
>+    bool beginsWith(const char *prefix) const { return angle::BeginsWith(data(), prefix); }
>+    constexpr bool beginsWith(const ImmutableString &prefix) const
>+    {
>+        return mLength >= prefix.length() && memcmp(data(), prefix.data(), prefix.length()) == 0;
>+    }
>+    bool contains(const char *substr) const { return strstr(data(), substr) != nullptr; }
>+
>+    constexpr bool operator==(const ImmutableString &b) const
>+    {
>+        if (mLength != b.mLength)
>+        {
>+            return false;
>+        }
>+        return memcmp(data(), b.data(), mLength) == 0;
>+    }
>+    constexpr bool operator!=(const ImmutableString &b) const { return !(*this == b); }
>+    constexpr bool operator==(const char *b) const
>+    {
>+        if (b == nullptr)
>+        {
>+            return empty();
>+        }
>+        return strcmp(data(), b) == 0;
>+    }
>+    constexpr bool operator!=(const char *b) const { return !(*this == b); }
>+    bool operator==(const std::string &b) const
>+    {
>+        return mLength == b.length() && memcmp(data(), b.c_str(), mLength) == 0;
>+    }
>+    bool operator!=(const std::string &b) const { return !(*this == b); }
>+
>+    constexpr bool operator<(const ImmutableString &b) const
>+    {
>+        if (mLength < b.mLength)
>+        {
>+            return true;
>+        }
>+        if (mLength > b.mLength)
>+        {
>+            return false;
>+        }
>+        return (memcmp(data(), b.data(), mLength) < 0);
>+    }
>+
>+    template <size_t hashBytes>
>+    struct FowlerNollVoHash
>+    {
>+        static const size_t kFnvOffsetBasis;
>+        static const size_t kFnvPrime;
>+
>+        constexpr size_t operator()(const ImmutableString &a) const
>+        {
>+            const char *data = a.data();
>+            size_t hash      = kFnvOffsetBasis;
>+            while ((*data) != '\0')
>+            {
>+                hash = hash ^ (*data);
>+                hash = hash * kFnvPrime;
>+                ++data;
>+            }
>+            return hash;
>+        }
>+    };
>+
>+    // This hash encodes the opening parentheses location (if any), name length and whether the name
>+    // contains { or [ characters in addition to a 19-bit hash. This way the hash is more useful for
>+    // lookups. The string passed in should be at most 63 characters.
>+    uint32_t mangledNameHash() const;
>+
>+  private:
>+    const char *mData;
>+    size_t mLength;
>+};
>+
>+constexpr ImmutableString kEmptyImmutableString("");
>+}  // namespace sh
>+
>+std::ostream &operator<<(std::ostream &os, const sh::ImmutableString &str);
>+
>+#endif  // COMPILER_TRANSLATOR_IMMUTABLESTRING_H_
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/ImmutableStringBuilder.cpp b/Source/ThirdParty/ANGLE/src/compiler/translator/ImmutableStringBuilder.cpp
>new file mode 100644
>index 00000000000..d7d0a0135d1
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/ImmutableStringBuilder.cpp
>@@ -0,0 +1,63 @@
>+//
>+// Copyright (c) 2018 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// ImmutableStringBuilder.cpp: Stringstream-like utility for building pool allocated strings where
>+// the maximum length is known in advance.
>+//
>+
>+#include "compiler/translator/ImmutableStringBuilder.h"
>+
>+#include <stdio.h>
>+
>+namespace sh
>+{
>+
>+ImmutableStringBuilder &ImmutableStringBuilder::operator<<(const ImmutableString &str)
>+{
>+    ASSERT(mData != nullptr);
>+    ASSERT(mPos + str.length() <= mMaxLength);
>+    memcpy(mData + mPos, str.data(), str.length());
>+    mPos += str.length();
>+    return *this;
>+}
>+
>+ImmutableStringBuilder &ImmutableStringBuilder::operator<<(const char *str)
>+{
>+    ASSERT(mData != nullptr);
>+    size_t len = strlen(str);
>+    ASSERT(mPos + len <= mMaxLength);
>+    memcpy(mData + mPos, str, len);
>+    mPos += len;
>+    return *this;
>+}
>+
>+ImmutableStringBuilder &ImmutableStringBuilder::operator<<(const char &c)
>+{
>+    ASSERT(mData != nullptr);
>+    ASSERT(mPos + 1 <= mMaxLength);
>+    mData[mPos++] = c;
>+    return *this;
>+}
>+
>+void ImmutableStringBuilder::appendDecimal(const uint32_t &u)
>+{
>+    int numChars = snprintf(mData + mPos, mMaxLength - mPos, "%d", u);
>+    ASSERT(numChars >= 0);
>+    ASSERT(mPos + numChars <= mMaxLength);
>+    mPos += numChars;
>+}
>+
>+ImmutableStringBuilder::operator ImmutableString()
>+{
>+    mData[mPos] = '\0';
>+    ImmutableString str(static_cast<const char *>(mData), mPos);
>+#if defined(ANGLE_ENABLE_ASSERTS)
>+    // Make sure that nothing is added to the string after it is finalized.
>+    mData = nullptr;
>+#endif
>+    return str;
>+}
>+
>+}  // namespace sh
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/ImmutableStringBuilder.h b/Source/ThirdParty/ANGLE/src/compiler/translator/ImmutableStringBuilder.h
>new file mode 100644
>index 00000000000..e68459169f4
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/ImmutableStringBuilder.h
>@@ -0,0 +1,80 @@
>+//
>+// Copyright (c) 2018 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// ImmutableStringBuilder.h: Stringstream-like utility for building pool allocated strings where the
>+// maximum length is known in advance.
>+//
>+
>+#ifndef COMPILER_TRANSLATOR_IMMUTABLESTRINGBUILDER_H_
>+#define COMPILER_TRANSLATOR_IMMUTABLESTRINGBUILDER_H_
>+
>+#include "compiler/translator/ImmutableString.h"
>+
>+namespace sh
>+{
>+
>+class ImmutableStringBuilder
>+{
>+  public:
>+    ImmutableStringBuilder(size_t maxLength)
>+        : mPos(0u), mMaxLength(maxLength), mData(AllocateEmptyPoolCharArray(maxLength))
>+    {}
>+
>+    ImmutableStringBuilder &operator<<(const ImmutableString &str);
>+
>+    ImmutableStringBuilder &operator<<(const char *str);
>+
>+    ImmutableStringBuilder &operator<<(const char &c);
>+
>+    // This invalidates the ImmutableStringBuilder, so it should only be called once.
>+    operator ImmutableString();
>+
>+    void appendDecimal(const uint32_t &i);
>+
>+    template <typename T>
>+    void appendHex(T number)
>+    {
>+        ASSERT(mData != nullptr);
>+        ASSERT(mPos + sizeof(T) * 2u <= mMaxLength);
>+        int index = static_cast<int>(sizeof(T)) * 2 - 1;
>+        // Loop through leading zeroes.
>+        while (((number >> (index * 4)) & 0xfu) == 0 && index > 0)
>+        {
>+            --index;
>+        }
>+        // Write the rest of the hex digits.
>+        while (index >= 0)
>+        {
>+            char digit     = static_cast<char>((number >> (index * 4)) & 0xfu);
>+            char digitChar = (digit < 10) ? (digit + '0') : (digit + ('a' - 10));
>+            mData[mPos++]  = digitChar;
>+            --index;
>+        }
>+    }
>+
>+    template <typename T>
>+    static constexpr size_t GetHexCharCount()
>+    {
>+        return sizeof(T) * 2;
>+    }
>+
>+  private:
>+    inline static char *AllocateEmptyPoolCharArray(size_t strLength)
>+    {
>+        size_t requiredSize = strLength + 1u;
>+        return static_cast<char *>(GetGlobalPoolAllocator()->allocate(requiredSize));
>+    }
>+
>+    size_t mPos;
>+    size_t mMaxLength;
>+    char *mData;
>+};
>+
>+// GLSL ES 3.00.6 section 3.9: the maximum length of an identifier is 1024 characters.
>+constexpr unsigned int kESSLMaxIdentifierLength = 1024u;
>+
>+}  // namespace sh
>+
>+#endif  // COMPILER_TRANSLATOR_IMMUTABLESTRINGBUILDER_H_
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/InfoSink.cpp b/Source/ThirdParty/ANGLE/src/compiler/translator/InfoSink.cpp
>index db26aa67e83..e8a84530818 100644
>--- a/Source/ThirdParty/ANGLE/src/compiler/translator/InfoSink.cpp
>+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/InfoSink.cpp
>@@ -6,6 +6,9 @@
> 
> #include "compiler/translator/InfoSink.h"
> 
>+#include "compiler/translator/ImmutableString.h"
>+#include "compiler/translator/Types.h"
>+
> namespace sh
> {
> 
>@@ -25,9 +28,48 @@ void TInfoSinkBase::prefix(Severity severity)
>     }
> }
> 
>+TInfoSinkBase &TInfoSinkBase::operator<<(const ImmutableString &str)
>+{
>+    sink.append(str.data());
>+    return *this;
>+}
>+
>+TInfoSinkBase &TInfoSinkBase::operator<<(const TType &type)
>+{
>+    if (type.isInvariant())
>+        sink.append("invariant ");
>+    if (type.getQualifier() != EvqTemporary && type.getQualifier() != EvqGlobal)
>+    {
>+        sink.append(type.getQualifierString());
>+        sink.append(" ");
>+    }
>+    if (type.getPrecision() != EbpUndefined)
>+    {
>+        sink.append(type.getPrecisionString());
>+        sink.append(" ");
>+    }
>+    if (type.isArray())
>+    {
>+        for (auto arraySizeIter = type.getArraySizes()->rbegin();
>+             arraySizeIter != type.getArraySizes()->rend(); ++arraySizeIter)
>+        {
>+            *this << "array[" << (*arraySizeIter) << "] of ";
>+        }
>+    }
>+    if (type.isMatrix())
>+    {
>+        *this << type.getCols() << "X" << type.getRows() << " matrix of ";
>+    }
>+    else if (type.isVector())
>+        *this << type.getNominalSize() << "-component vector of ";
>+
>+    sink.append(type.getBasicString());
>+    return *this;
>+}
>+
> void TInfoSinkBase::location(int file, int line)
> {
>-    TPersistStringStream stream;
>+    TPersistStringStream stream = sh::InitializeStream<TPersistStringStream>();
>     if (line)
>         stream << file << ":" << line;
>     else
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/InfoSink.h b/Source/ThirdParty/ANGLE/src/compiler/translator/InfoSink.h
>index 2705f48d599..100d06ec6bf 100644
>--- a/Source/ThirdParty/ANGLE/src/compiler/translator/InfoSink.h
>+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/InfoSink.h
>@@ -15,6 +15,9 @@
> namespace sh
> {
> 
>+class ImmutableString;
>+class TType;
>+
> // Returns the fractional part of the given floating-point number.
> inline float fractionalPart(float f)
> {
>@@ -22,6 +25,8 @@ inline float fractionalPart(float f)
>     return modff(f, &intPart);
> }
> 
>+class ImmutableString;
>+
> //
> // Encapsulate info logs for all objects that have them.
> //
>@@ -36,7 +41,7 @@ class TInfoSinkBase
>     template <typename T>
>     TInfoSinkBase &operator<<(const T &t)
>     {
>-        TPersistStringStream stream;
>+        TPersistStringStream stream = sh::InitializeStream<TPersistStringStream>();
>         stream << t;
>         sink.append(stream.str());
>         return *this;
>@@ -63,6 +68,10 @@ class TInfoSinkBase
>         sink.append(str.c_str());
>         return *this;
>     }
>+    TInfoSinkBase &operator<<(const ImmutableString &str);
>+
>+    TInfoSinkBase &operator<<(const TType &type);
>+
>     // Make sure floats are written with correct precision.
>     TInfoSinkBase &operator<<(float f)
>     {
>@@ -70,7 +79,7 @@ class TInfoSinkBase
>         // does not have a fractional part, the default precision format does
>         // not write the decimal portion which gets interpreted as integer by
>         // the compiler.
>-        TPersistStringStream stream;
>+        TPersistStringStream stream = sh::InitializeStream<TPersistStringStream>();
>         if (fractionalPart(f) == 0.0f)
>         {
>             stream.precision(1);
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/Initialize.cpp b/Source/ThirdParty/ANGLE/src/compiler/translator/Initialize.cpp
>index 6f8baee96b2..aec19c960c0 100644
>--- a/Source/ThirdParty/ANGLE/src/compiler/translator/Initialize.cpp
>+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/Initialize.cpp
>@@ -4,1052 +4,11 @@
> // found in the LICENSE file.
> //
> 
>-//
>-// Create symbols that declare built-in definitions, add built-ins that
>-// cannot be expressed in the files, and establish mappings between
>-// built-in functions and operators.
>-//
>-
> #include "compiler/translator/Initialize.h"
>-#include "compiler/translator/Cache.h"
>-
>-#include "compiler/translator/IntermNode.h"
>-#include "angle_gl.h"
> 
> namespace sh
> {
> 
>-void InsertBuiltInFunctions(sh::GLenum type,
>-                            ShShaderSpec spec,
>-                            const ShBuiltInResources &resources,
>-                            TSymbolTable &symbolTable)
>-{
>-    const TType *voidType = TCache::getType(EbtVoid);
>-    const TType *float1   = TCache::getType(EbtFloat);
>-    const TType *float2   = TCache::getType(EbtFloat, 2);
>-    const TType *float3   = TCache::getType(EbtFloat, 3);
>-    const TType *float4   = TCache::getType(EbtFloat, 4);
>-    const TType *int1     = TCache::getType(EbtInt);
>-    const TType *int2     = TCache::getType(EbtInt, 2);
>-    const TType *int3     = TCache::getType(EbtInt, 3);
>-    const TType *uint1    = TCache::getType(EbtUInt);
>-    const TType *bool1    = TCache::getType(EbtBool);
>-    const TType *genType  = TCache::getType(EbtGenType);
>-    const TType *genIType = TCache::getType(EbtGenIType);
>-    const TType *genUType = TCache::getType(EbtGenUType);
>-    const TType *genBType = TCache::getType(EbtGenBType);
>-
>-    //
>-    // Angle and Trigonometric Functions.
>-    //
>-    symbolTable.insertBuiltInOp(COMMON_BUILTINS, EOpRadians, genType, genType);
>-    symbolTable.insertBuiltInOp(COMMON_BUILTINS, EOpDegrees, genType, genType);
>-    symbolTable.insertBuiltInOp(COMMON_BUILTINS, EOpSin, genType, genType);
>-    symbolTable.insertBuiltInOp(COMMON_BUILTINS, EOpCos, genType, genType);
>-    symbolTable.insertBuiltInOp(COMMON_BUILTINS, EOpTan, genType, genType);
>-    symbolTable.insertBuiltInOp(COMMON_BUILTINS, EOpAsin, genType, genType);
>-    symbolTable.insertBuiltInOp(COMMON_BUILTINS, EOpAcos, genType, genType);
>-    symbolTable.insertBuiltInOp(COMMON_BUILTINS, EOpAtan, genType, genType, genType);
>-    symbolTable.insertBuiltInOp(COMMON_BUILTINS, EOpAtan, genType, genType);
>-    symbolTable.insertBuiltInOp(ESSL3_BUILTINS, EOpSinh, genType, genType);
>-    symbolTable.insertBuiltInOp(ESSL3_BUILTINS, EOpCosh, genType, genType);
>-    symbolTable.insertBuiltInOp(ESSL3_BUILTINS, EOpTanh, genType, genType);
>-    symbolTable.insertBuiltInOp(ESSL3_BUILTINS, EOpAsinh, genType, genType);
>-    symbolTable.insertBuiltInOp(ESSL3_BUILTINS, EOpAcosh, genType, genType);
>-    symbolTable.insertBuiltInOp(ESSL3_BUILTINS, EOpAtanh, genType, genType);
>-
>-    //
>-    // Exponential Functions.
>-    //
>-    symbolTable.insertBuiltInOp(COMMON_BUILTINS, EOpPow, genType, genType, genType);
>-    symbolTable.insertBuiltInOp(COMMON_BUILTINS, EOpExp, genType, genType);
>-    symbolTable.insertBuiltInOp(COMMON_BUILTINS, EOpLog, genType, genType);
>-    symbolTable.insertBuiltInOp(COMMON_BUILTINS, EOpExp2, genType, genType);
>-    symbolTable.insertBuiltInOp(COMMON_BUILTINS, EOpLog2, genType, genType);
>-    symbolTable.insertBuiltInOp(COMMON_BUILTINS, EOpSqrt, genType, genType);
>-    symbolTable.insertBuiltInOp(COMMON_BUILTINS, EOpInverseSqrt, genType, genType);
>-
>-    //
>-    // Common Functions.
>-    //
>-    symbolTable.insertBuiltInOp(COMMON_BUILTINS, EOpAbs, genType, genType);
>-    symbolTable.insertBuiltInOp(ESSL3_BUILTINS, EOpAbs, genIType, genIType);
>-    symbolTable.insertBuiltInOp(COMMON_BUILTINS, EOpSign, genType, genType);
>-    symbolTable.insertBuiltInOp(ESSL3_BUILTINS, EOpSign, genIType, genIType);
>-    symbolTable.insertBuiltInOp(COMMON_BUILTINS, EOpFloor, genType, genType);
>-    symbolTable.insertBuiltInOp(ESSL3_BUILTINS, EOpTrunc, genType, genType);
>-    symbolTable.insertBuiltInOp(ESSL3_BUILTINS, EOpRound, genType, genType);
>-    symbolTable.insertBuiltInOp(ESSL3_BUILTINS, EOpRoundEven, genType, genType);
>-    symbolTable.insertBuiltInOp(COMMON_BUILTINS, EOpCeil, genType, genType);
>-    symbolTable.insertBuiltInOp(COMMON_BUILTINS, EOpFract, genType, genType);
>-    symbolTable.insertBuiltInOp(COMMON_BUILTINS, EOpMod, genType, genType, float1);
>-    symbolTable.insertBuiltInOp(COMMON_BUILTINS, EOpMod, genType, genType, genType);
>-    symbolTable.insertBuiltInOp(COMMON_BUILTINS, EOpMin, genType, genType, float1);
>-    symbolTable.insertBuiltInOp(COMMON_BUILTINS, EOpMin, genType, genType, genType);
>-    symbolTable.insertBuiltInOp(ESSL3_BUILTINS, EOpMin, genIType, genIType, genIType);
>-    symbolTable.insertBuiltInOp(ESSL3_BUILTINS, EOpMin, genIType, genIType, int1);
>-    symbolTable.insertBuiltInOp(ESSL3_BUILTINS, EOpMin, genUType, genUType, genUType);
>-    symbolTable.insertBuiltInOp(ESSL3_BUILTINS, EOpMin, genUType, genUType, uint1);
>-    symbolTable.insertBuiltInOp(COMMON_BUILTINS, EOpMax, genType, genType, float1);
>-    symbolTable.insertBuiltInOp(COMMON_BUILTINS, EOpMax, genType, genType, genType);
>-    symbolTable.insertBuiltInOp(ESSL3_BUILTINS, EOpMax, genIType, genIType, genIType);
>-    symbolTable.insertBuiltInOp(ESSL3_BUILTINS, EOpMax, genIType, genIType, int1);
>-    symbolTable.insertBuiltInOp(ESSL3_BUILTINS, EOpMax, genUType, genUType, genUType);
>-    symbolTable.insertBuiltInOp(ESSL3_BUILTINS, EOpMax, genUType, genUType, uint1);
>-    symbolTable.insertBuiltInOp(COMMON_BUILTINS, EOpClamp, genType, genType, float1, float1);
>-    symbolTable.insertBuiltInOp(COMMON_BUILTINS, EOpClamp, genType, genType, genType, genType);
>-    symbolTable.insertBuiltInOp(ESSL3_BUILTINS, EOpClamp, genIType, genIType, int1, int1);
>-    symbolTable.insertBuiltInOp(ESSL3_BUILTINS, EOpClamp, genIType, genIType, genIType, genIType);
>-    symbolTable.insertBuiltInOp(ESSL3_BUILTINS, EOpClamp, genUType, genUType, uint1, uint1);
>-    symbolTable.insertBuiltInOp(ESSL3_BUILTINS, EOpClamp, genUType, genUType, genUType, genUType);
>-    symbolTable.insertBuiltInOp(COMMON_BUILTINS, EOpMix, genType, genType, genType, float1);
>-    symbolTable.insertBuiltInOp(COMMON_BUILTINS, EOpMix, genType, genType, genType, genType);
>-    symbolTable.insertBuiltInOp(ESSL3_BUILTINS, EOpMix, genType, genType, genType, genBType);
>-    symbolTable.insertBuiltInOp(COMMON_BUILTINS, EOpStep, genType, genType, genType);
>-    symbolTable.insertBuiltInOp(COMMON_BUILTINS, EOpStep, genType, float1, genType);
>-    symbolTable.insertBuiltInOp(COMMON_BUILTINS, EOpSmoothStep, genType, genType, genType, genType);
>-    symbolTable.insertBuiltInOp(COMMON_BUILTINS, EOpSmoothStep, genType, float1, float1, genType);
>-
>-    const TType *outGenType = TCache::getType(EbtGenType, EvqOut);
>-    const TType *outGenIType = TCache::getType(EbtGenIType, EvqOut);
>-
>-    symbolTable.insertBuiltInOp(ESSL3_BUILTINS, EOpModf, genType, genType, outGenType);
>-
>-    symbolTable.insertBuiltInOp(ESSL3_BUILTINS, EOpIsNan, genBType, genType);
>-    symbolTable.insertBuiltInOp(ESSL3_BUILTINS, EOpIsInf, genBType, genType);
>-    symbolTable.insertBuiltInOp(ESSL3_BUILTINS, EOpFloatBitsToInt, genIType, genType);
>-    symbolTable.insertBuiltInOp(ESSL3_BUILTINS, EOpFloatBitsToUint, genUType, genType);
>-    symbolTable.insertBuiltInOp(ESSL3_BUILTINS, EOpIntBitsToFloat, genType, genIType);
>-    symbolTable.insertBuiltInOp(ESSL3_BUILTINS, EOpUintBitsToFloat, genType, genUType);
>-
>-    symbolTable.insertBuiltInOp(ESSL3_1_BUILTINS, EOpFrexp, genType, genType, outGenIType);
>-    symbolTable.insertBuiltInOp(ESSL3_1_BUILTINS, EOpLdexp, genType, genType, genIType);
>-
>-    symbolTable.insertBuiltInOp(ESSL3_BUILTINS, EOpPackSnorm2x16, uint1, float2);
>-    symbolTable.insertBuiltInOp(ESSL3_BUILTINS, EOpPackUnorm2x16, uint1, float2);
>-    symbolTable.insertBuiltInOp(ESSL3_BUILTINS, EOpPackHalf2x16, uint1, float2);
>-    symbolTable.insertBuiltInOp(ESSL3_BUILTINS, EOpUnpackSnorm2x16, float2, uint1);
>-    symbolTable.insertBuiltInOp(ESSL3_BUILTINS, EOpUnpackUnorm2x16, float2, uint1);
>-    symbolTable.insertBuiltInOp(ESSL3_BUILTINS, EOpUnpackHalf2x16, float2, uint1);
>-
>-    symbolTable.insertBuiltInOp(ESSL3_1_BUILTINS, EOpPackUnorm4x8, uint1, float4);
>-    symbolTable.insertBuiltInOp(ESSL3_1_BUILTINS, EOpPackSnorm4x8, uint1, float4);
>-    symbolTable.insertBuiltInOp(ESSL3_1_BUILTINS, EOpUnpackUnorm4x8, float4, uint1);
>-    symbolTable.insertBuiltInOp(ESSL3_1_BUILTINS, EOpUnpackSnorm4x8, float4, uint1);
>-
>-    //
>-    // Geometric Functions.
>-    //
>-    symbolTable.insertBuiltInOp(COMMON_BUILTINS, EOpLength, float1, genType);
>-    symbolTable.insertBuiltInOp(COMMON_BUILTINS, EOpDistance, float1, genType, genType);
>-    symbolTable.insertBuiltInOp(COMMON_BUILTINS, EOpDot, float1, genType, genType);
>-    symbolTable.insertBuiltInOp(COMMON_BUILTINS, EOpCross, float3, float3, float3);
>-    symbolTable.insertBuiltInOp(COMMON_BUILTINS, EOpNormalize, genType, genType);
>-    symbolTable.insertBuiltInOp(COMMON_BUILTINS, EOpFaceforward, genType, genType, genType,
>-                                genType);
>-    symbolTable.insertBuiltInOp(COMMON_BUILTINS, EOpReflect, genType, genType, genType);
>-    symbolTable.insertBuiltInOp(COMMON_BUILTINS, EOpRefract, genType, genType, genType, float1);
>-
>-    const TType *mat2   = TCache::getType(EbtFloat, 2, 2);
>-    const TType *mat3   = TCache::getType(EbtFloat, 3, 3);
>-    const TType *mat4   = TCache::getType(EbtFloat, 4, 4);
>-    const TType *mat2x3 = TCache::getType(EbtFloat, 2, 3);
>-    const TType *mat3x2 = TCache::getType(EbtFloat, 3, 2);
>-    const TType *mat2x4 = TCache::getType(EbtFloat, 2, 4);
>-    const TType *mat4x2 = TCache::getType(EbtFloat, 4, 2);
>-    const TType *mat3x4 = TCache::getType(EbtFloat, 3, 4);
>-    const TType *mat4x3 = TCache::getType(EbtFloat, 4, 3);
>-
>-    //
>-    // Matrix Functions.
>-    //
>-    symbolTable.insertBuiltInOp(COMMON_BUILTINS, EOpMulMatrixComponentWise, mat2, mat2, mat2);
>-    symbolTable.insertBuiltInOp(COMMON_BUILTINS, EOpMulMatrixComponentWise, mat3, mat3, mat3);
>-    symbolTable.insertBuiltInOp(COMMON_BUILTINS, EOpMulMatrixComponentWise, mat4, mat4, mat4);
>-    symbolTable.insertBuiltInOp(ESSL3_BUILTINS, EOpMulMatrixComponentWise, mat2x3, mat2x3, mat2x3);
>-    symbolTable.insertBuiltInOp(ESSL3_BUILTINS, EOpMulMatrixComponentWise, mat3x2, mat3x2, mat3x2);
>-    symbolTable.insertBuiltInOp(ESSL3_BUILTINS, EOpMulMatrixComponentWise, mat2x4, mat2x4, mat2x4);
>-    symbolTable.insertBuiltInOp(ESSL3_BUILTINS, EOpMulMatrixComponentWise, mat4x2, mat4x2, mat4x2);
>-    symbolTable.insertBuiltInOp(ESSL3_BUILTINS, EOpMulMatrixComponentWise, mat3x4, mat3x4, mat3x4);
>-    symbolTable.insertBuiltInOp(ESSL3_BUILTINS, EOpMulMatrixComponentWise, mat4x3, mat4x3, mat4x3);
>-
>-    symbolTable.insertBuiltInOp(ESSL3_BUILTINS, EOpOuterProduct, mat2, float2, float2);
>-    symbolTable.insertBuiltInOp(ESSL3_BUILTINS, EOpOuterProduct, mat3, float3, float3);
>-    symbolTable.insertBuiltInOp(ESSL3_BUILTINS, EOpOuterProduct, mat4, float4, float4);
>-    symbolTable.insertBuiltInOp(ESSL3_BUILTINS, EOpOuterProduct, mat2x3, float3, float2);
>-    symbolTable.insertBuiltInOp(ESSL3_BUILTINS, EOpOuterProduct, mat3x2, float2, float3);
>-    symbolTable.insertBuiltInOp(ESSL3_BUILTINS, EOpOuterProduct, mat2x4, float4, float2);
>-    symbolTable.insertBuiltInOp(ESSL3_BUILTINS, EOpOuterProduct, mat4x2, float2, float4);
>-    symbolTable.insertBuiltInOp(ESSL3_BUILTINS, EOpOuterProduct, mat3x4, float4, float3);
>-    symbolTable.insertBuiltInOp(ESSL3_BUILTINS, EOpOuterProduct, mat4x3, float3, float4);
>-
>-    symbolTable.insertBuiltInOp(ESSL3_BUILTINS, EOpTranspose, mat2, mat2);
>-    symbolTable.insertBuiltInOp(ESSL3_BUILTINS, EOpTranspose, mat3, mat3);
>-    symbolTable.insertBuiltInOp(ESSL3_BUILTINS, EOpTranspose, mat4, mat4);
>-    symbolTable.insertBuiltInOp(ESSL3_BUILTINS, EOpTranspose, mat2x3, mat3x2);
>-    symbolTable.insertBuiltInOp(ESSL3_BUILTINS, EOpTranspose, mat3x2, mat2x3);
>-    symbolTable.insertBuiltInOp(ESSL3_BUILTINS, EOpTranspose, mat2x4, mat4x2);
>-    symbolTable.insertBuiltInOp(ESSL3_BUILTINS, EOpTranspose, mat4x2, mat2x4);
>-    symbolTable.insertBuiltInOp(ESSL3_BUILTINS, EOpTranspose, mat3x4, mat4x3);
>-    symbolTable.insertBuiltInOp(ESSL3_BUILTINS, EOpTranspose, mat4x3, mat3x4);
>-
>-    symbolTable.insertBuiltInOp(ESSL3_BUILTINS, EOpDeterminant, float1, mat2);
>-    symbolTable.insertBuiltInOp(ESSL3_BUILTINS, EOpDeterminant, float1, mat3);
>-    symbolTable.insertBuiltInOp(ESSL3_BUILTINS, EOpDeterminant, float1, mat4);
>-
>-    symbolTable.insertBuiltInOp(ESSL3_BUILTINS, EOpInverse, mat2, mat2);
>-    symbolTable.insertBuiltInOp(ESSL3_BUILTINS, EOpInverse, mat3, mat3);
>-    symbolTable.insertBuiltInOp(ESSL3_BUILTINS, EOpInverse, mat4, mat4);
>-
>-    const TType *vec  = TCache::getType(EbtVec);
>-    const TType *ivec = TCache::getType(EbtIVec);
>-    const TType *uvec = TCache::getType(EbtUVec);
>-    const TType *bvec = TCache::getType(EbtBVec);
>-
>-    //
>-    // Vector relational functions.
>-    //
>-    symbolTable.insertBuiltInOp(COMMON_BUILTINS, EOpLessThanComponentWise, bvec, vec, vec);
>-    symbolTable.insertBuiltInOp(COMMON_BUILTINS, EOpLessThanComponentWise, bvec, ivec, ivec);
>-    symbolTable.insertBuiltInOp(ESSL3_BUILTINS, EOpLessThanComponentWise, bvec, uvec, uvec);
>-    symbolTable.insertBuiltInOp(COMMON_BUILTINS, EOpLessThanEqualComponentWise, bvec, vec, vec);
>-    symbolTable.insertBuiltInOp(COMMON_BUILTINS, EOpLessThanEqualComponentWise, bvec, ivec, ivec);
>-    symbolTable.insertBuiltInOp(ESSL3_BUILTINS, EOpLessThanEqualComponentWise, bvec, uvec, uvec);
>-    symbolTable.insertBuiltInOp(COMMON_BUILTINS, EOpGreaterThanComponentWise, bvec, vec, vec);
>-    symbolTable.insertBuiltInOp(COMMON_BUILTINS, EOpGreaterThanComponentWise, bvec, ivec, ivec);
>-    symbolTable.insertBuiltInOp(ESSL3_BUILTINS, EOpGreaterThanComponentWise, bvec, uvec, uvec);
>-    symbolTable.insertBuiltInOp(COMMON_BUILTINS, EOpGreaterThanEqualComponentWise, bvec, vec, vec);
>-    symbolTable.insertBuiltInOp(COMMON_BUILTINS, EOpGreaterThanEqualComponentWise, bvec, ivec,
>-                                ivec);
>-    symbolTable.insertBuiltInOp(ESSL3_BUILTINS, EOpGreaterThanEqualComponentWise, bvec, uvec, uvec);
>-    symbolTable.insertBuiltInOp(COMMON_BUILTINS, EOpEqualComponentWise, bvec, vec, vec);
>-    symbolTable.insertBuiltInOp(COMMON_BUILTINS, EOpEqualComponentWise, bvec, ivec, ivec);
>-    symbolTable.insertBuiltInOp(ESSL3_BUILTINS, EOpEqualComponentWise, bvec, uvec, uvec);
>-    symbolTable.insertBuiltInOp(COMMON_BUILTINS, EOpEqualComponentWise, bvec, bvec, bvec);
>-    symbolTable.insertBuiltInOp(COMMON_BUILTINS, EOpNotEqualComponentWise, bvec, vec, vec);
>-    symbolTable.insertBuiltInOp(COMMON_BUILTINS, EOpNotEqualComponentWise, bvec, ivec, ivec);
>-    symbolTable.insertBuiltInOp(ESSL3_BUILTINS, EOpNotEqualComponentWise, bvec, uvec, uvec);
>-    symbolTable.insertBuiltInOp(COMMON_BUILTINS, EOpNotEqualComponentWise, bvec, bvec, bvec);
>-    symbolTable.insertBuiltInOp(COMMON_BUILTINS, EOpAny, bool1, bvec);
>-    symbolTable.insertBuiltInOp(COMMON_BUILTINS, EOpAll, bool1, bvec);
>-    symbolTable.insertBuiltInOp(COMMON_BUILTINS, EOpLogicalNotComponentWise, bvec, bvec);
>-
>-    //
>-    // Integer functions
>-    //
>-    const TType *outGenUType = TCache::getType(EbtGenUType, EvqOut);
>-
>-    symbolTable.insertBuiltInOp(ESSL3_1_BUILTINS, EOpBitfieldExtract, genIType, genIType, int1,
>-                                int1);
>-    symbolTable.insertBuiltInOp(ESSL3_1_BUILTINS, EOpBitfieldExtract, genUType, genUType, int1,
>-                                int1);
>-    symbolTable.insertBuiltInOp(ESSL3_1_BUILTINS, EOpBitfieldInsert, genIType, genIType, genIType,
>-                                int1, int1);
>-    symbolTable.insertBuiltInOp(ESSL3_1_BUILTINS, EOpBitfieldInsert, genUType, genUType, genUType,
>-                                int1, int1);
>-    symbolTable.insertBuiltInOp(ESSL3_1_BUILTINS, EOpBitfieldReverse, genIType, genIType);
>-    symbolTable.insertBuiltInOp(ESSL3_1_BUILTINS, EOpBitfieldReverse, genUType, genUType);
>-    symbolTable.insertBuiltInOp(ESSL3_1_BUILTINS, EOpBitCount, genIType, genIType);
>-    symbolTable.insertBuiltInOp(ESSL3_1_BUILTINS, EOpBitCount, genIType, genUType);
>-    symbolTable.insertBuiltInOp(ESSL3_1_BUILTINS, EOpFindLSB, genIType, genIType);
>-    symbolTable.insertBuiltInOp(ESSL3_1_BUILTINS, EOpFindLSB, genIType, genUType);
>-    symbolTable.insertBuiltInOp(ESSL3_1_BUILTINS, EOpFindMSB, genIType, genIType);
>-    symbolTable.insertBuiltInOp(ESSL3_1_BUILTINS, EOpFindMSB, genIType, genUType);
>-    symbolTable.insertBuiltInOp(ESSL3_1_BUILTINS, EOpUaddCarry, genUType, genUType, genUType,
>-                                outGenUType);
>-    symbolTable.insertBuiltInOp(ESSL3_1_BUILTINS, EOpUsubBorrow, genUType, genUType, genUType,
>-                                outGenUType);
>-    symbolTable.insertBuiltInOp(ESSL3_1_BUILTINS, EOpUmulExtended, voidType, genUType, genUType,
>-                                outGenUType, outGenUType);
>-    symbolTable.insertBuiltInOp(ESSL3_1_BUILTINS, EOpImulExtended, voidType, genIType, genIType,
>-                                outGenIType, outGenIType);
>-
>-    const TType *sampler2D   = TCache::getType(EbtSampler2D);
>-    const TType *samplerCube = TCache::getType(EbtSamplerCube);
>-
>-    //
>-    // Texture Functions for GLSL ES 1.0
>-    //
>-    symbolTable.insertBuiltIn(ESSL1_BUILTINS, float4, "texture2D", sampler2D, float2);
>-    symbolTable.insertBuiltIn(ESSL1_BUILTINS, float4, "texture2DProj", sampler2D, float3);
>-    symbolTable.insertBuiltIn(ESSL1_BUILTINS, float4, "texture2DProj", sampler2D, float4);
>-    symbolTable.insertBuiltIn(ESSL1_BUILTINS, float4, "textureCube", samplerCube, float3);
>-
>-    if (resources.OES_EGL_image_external || resources.NV_EGL_stream_consumer_external)
>-    {
>-        const TType *samplerExternalOES = TCache::getType(EbtSamplerExternalOES);
>-
>-        symbolTable.insertBuiltIn(ESSL1_BUILTINS, float4, "texture2D", samplerExternalOES, float2);
>-        symbolTable.insertBuiltIn(ESSL1_BUILTINS, float4, "texture2DProj", samplerExternalOES,
>-                                  float3);
>-        symbolTable.insertBuiltIn(ESSL1_BUILTINS, float4, "texture2DProj", samplerExternalOES,
>-                                  float4);
>-    }
>-
>-    if (resources.ARB_texture_rectangle)
>-    {
>-        const TType *sampler2DRect = TCache::getType(EbtSampler2DRect);
>-
>-        symbolTable.insertBuiltIn(ESSL1_BUILTINS, float4, "texture2DRect", sampler2DRect, float2);
>-        symbolTable.insertBuiltIn(ESSL1_BUILTINS, float4, "texture2DRectProj", sampler2DRect,
>-                                  float3);
>-        symbolTable.insertBuiltIn(ESSL1_BUILTINS, float4, "texture2DRectProj", sampler2DRect,
>-                                  float4);
>-    }
>-
>-    if (resources.EXT_shader_texture_lod)
>-    {
>-        /* The *Grad* variants are new to both vertex and fragment shaders; the fragment
>-         * shader specific pieces are added separately below.
>-         */
>-        symbolTable.insertBuiltIn(ESSL1_BUILTINS, TExtension::EXT_shader_texture_lod, float4,
>-                                  "texture2DGradEXT", sampler2D, float2, float2, float2);
>-        symbolTable.insertBuiltIn(ESSL1_BUILTINS, TExtension::EXT_shader_texture_lod, float4,
>-                                  "texture2DProjGradEXT", sampler2D, float3, float2, float2);
>-        symbolTable.insertBuiltIn(ESSL1_BUILTINS, TExtension::EXT_shader_texture_lod, float4,
>-                                  "texture2DProjGradEXT", sampler2D, float4, float2, float2);
>-        symbolTable.insertBuiltIn(ESSL1_BUILTINS, TExtension::EXT_shader_texture_lod, float4,
>-                                  "textureCubeGradEXT", samplerCube, float3, float3, float3);
>-    }
>-
>-    if (type == GL_FRAGMENT_SHADER)
>-    {
>-        symbolTable.insertBuiltIn(ESSL1_BUILTINS, float4, "texture2D", sampler2D, float2, float1);
>-        symbolTable.insertBuiltIn(ESSL1_BUILTINS, float4, "texture2DProj", sampler2D, float3,
>-                                  float1);
>-        symbolTable.insertBuiltIn(ESSL1_BUILTINS, float4, "texture2DProj", sampler2D, float4,
>-                                  float1);
>-        symbolTable.insertBuiltIn(ESSL1_BUILTINS, float4, "textureCube", samplerCube, float3,
>-                                  float1);
>-
>-        if (resources.OES_standard_derivatives)
>-        {
>-            symbolTable.insertBuiltInOp(ESSL1_BUILTINS, EOpDFdx,
>-                                        TExtension::OES_standard_derivatives, genType, genType);
>-            symbolTable.insertBuiltInOp(ESSL1_BUILTINS, EOpDFdy,
>-                                        TExtension::OES_standard_derivatives, genType, genType);
>-            symbolTable.insertBuiltInOp(ESSL1_BUILTINS, EOpFwidth,
>-                                        TExtension::OES_standard_derivatives, genType, genType);
>-        }
>-
>-        if (resources.EXT_shader_texture_lod)
>-        {
>-            symbolTable.insertBuiltIn(ESSL1_BUILTINS, TExtension::EXT_shader_texture_lod, float4,
>-                                      "texture2DLodEXT", sampler2D, float2, float1);
>-            symbolTable.insertBuiltIn(ESSL1_BUILTINS, TExtension::EXT_shader_texture_lod, float4,
>-                                      "texture2DProjLodEXT", sampler2D, float3, float1);
>-            symbolTable.insertBuiltIn(ESSL1_BUILTINS, TExtension::EXT_shader_texture_lod, float4,
>-                                      "texture2DProjLodEXT", sampler2D, float4, float1);
>-            symbolTable.insertBuiltIn(ESSL1_BUILTINS, TExtension::EXT_shader_texture_lod, float4,
>-                                      "textureCubeLodEXT", samplerCube, float3, float1);
>-        }
>-    }
>-
>-    if (type == GL_VERTEX_SHADER)
>-    {
>-        symbolTable.insertBuiltIn(ESSL1_BUILTINS, float4, "texture2DLod", sampler2D, float2,
>-                                  float1);
>-        symbolTable.insertBuiltIn(ESSL1_BUILTINS, float4, "texture2DProjLod", sampler2D, float3,
>-                                  float1);
>-        symbolTable.insertBuiltIn(ESSL1_BUILTINS, float4, "texture2DProjLod", sampler2D, float4,
>-                                  float1);
>-        symbolTable.insertBuiltIn(ESSL1_BUILTINS, float4, "textureCubeLod", samplerCube, float3,
>-                                  float1);
>-    }
>-
>-    const TType *gvec4 = TCache::getType(EbtGVec4);
>-
>-    const TType *gsampler2D      = TCache::getType(EbtGSampler2D);
>-    const TType *gsamplerCube    = TCache::getType(EbtGSamplerCube);
>-    const TType *gsampler3D      = TCache::getType(EbtGSampler3D);
>-    const TType *gsampler2DArray = TCache::getType(EbtGSampler2DArray);
>-    const TType *gsampler2DMS    = TCache::getType(EbtGSampler2DMS);
>-
>-    //
>-    // Texture Functions for GLSL ES 3.0
>-    //
>-    symbolTable.insertBuiltIn(ESSL3_BUILTINS, gvec4, "texture", gsampler2D, float2);
>-    symbolTable.insertBuiltIn(ESSL3_BUILTINS, gvec4, "texture", gsampler3D, float3);
>-    symbolTable.insertBuiltIn(ESSL3_BUILTINS, gvec4, "texture", gsamplerCube, float3);
>-    symbolTable.insertBuiltIn(ESSL3_BUILTINS, gvec4, "texture", gsampler2DArray, float3);
>-    symbolTable.insertBuiltIn(ESSL3_BUILTINS, gvec4, "textureProj", gsampler2D, float3);
>-    symbolTable.insertBuiltIn(ESSL3_BUILTINS, gvec4, "textureProj", gsampler2D, float4);
>-    symbolTable.insertBuiltIn(ESSL3_BUILTINS, gvec4, "textureProj", gsampler3D, float4);
>-    symbolTable.insertBuiltIn(ESSL3_BUILTINS, gvec4, "textureLod", gsampler2D, float2, float1);
>-    symbolTable.insertBuiltIn(ESSL3_BUILTINS, gvec4, "textureLod", gsampler3D, float3, float1);
>-    symbolTable.insertBuiltIn(ESSL3_BUILTINS, gvec4, "textureLod", gsamplerCube, float3, float1);
>-    symbolTable.insertBuiltIn(ESSL3_BUILTINS, gvec4, "textureLod", gsampler2DArray, float3, float1);
>-
>-    if (resources.OES_EGL_image_external_essl3)
>-    {
>-        const TType *samplerExternalOES = TCache::getType(EbtSamplerExternalOES);
>-
>-        symbolTable.insertBuiltIn(ESSL3_BUILTINS, float4, "texture", samplerExternalOES, float2);
>-        symbolTable.insertBuiltIn(ESSL3_BUILTINS, float4, "textureProj", samplerExternalOES,
>-                                  float3);
>-        symbolTable.insertBuiltIn(ESSL3_BUILTINS, float4, "textureProj", samplerExternalOES,
>-                                  float4);
>-    }
>-
>-    if (resources.EXT_YUV_target)
>-    {
>-        const TType *samplerExternal2DY2YEXT = TCache::getType(EbtSamplerExternal2DY2YEXT);
>-
>-        symbolTable.insertBuiltIn(ESSL3_BUILTINS, TExtension::EXT_YUV_target, float4, "texture",
>-                                  samplerExternal2DY2YEXT, float2);
>-        symbolTable.insertBuiltIn(ESSL3_BUILTINS, TExtension::EXT_YUV_target, float4, "textureProj",
>-                                  samplerExternal2DY2YEXT, float3);
>-        symbolTable.insertBuiltIn(ESSL3_BUILTINS, TExtension::EXT_YUV_target, float4, "textureProj",
>-                                  samplerExternal2DY2YEXT, float4);
>-
>-        const TType *yuvCscStandardEXT = TCache::getType(EbtYuvCscStandardEXT);
>-
>-        symbolTable.insertBuiltIn(ESSL3_BUILTINS, TExtension::EXT_YUV_target, float3, "rgb_2_yuv",
>-                                  float3, yuvCscStandardEXT);
>-        symbolTable.insertBuiltIn(ESSL3_BUILTINS, TExtension::EXT_YUV_target, float3, "yuv_2_rgb",
>-                                  float3, yuvCscStandardEXT);
>-    }
>-
>-    if (type == GL_FRAGMENT_SHADER)
>-    {
>-        symbolTable.insertBuiltIn(ESSL3_BUILTINS, gvec4, "texture", gsampler2D, float2, float1);
>-        symbolTable.insertBuiltIn(ESSL3_BUILTINS, gvec4, "texture", gsampler3D, float3, float1);
>-        symbolTable.insertBuiltIn(ESSL3_BUILTINS, gvec4, "texture", gsamplerCube, float3, float1);
>-        symbolTable.insertBuiltIn(ESSL3_BUILTINS, gvec4, "texture", gsampler2DArray, float3,
>-                                  float1);
>-        symbolTable.insertBuiltIn(ESSL3_BUILTINS, gvec4, "textureProj", gsampler2D, float3, float1);
>-        symbolTable.insertBuiltIn(ESSL3_BUILTINS, gvec4, "textureProj", gsampler2D, float4, float1);
>-        symbolTable.insertBuiltIn(ESSL3_BUILTINS, gvec4, "textureProj", gsampler3D, float4, float1);
>-
>-        if (resources.OES_EGL_image_external_essl3)
>-        {
>-            const TType *samplerExternalOES = TCache::getType(EbtSamplerExternalOES);
>-
>-            symbolTable.insertBuiltIn(ESSL3_BUILTINS, float4, "texture", samplerExternalOES, float2,
>-                                      float1);
>-            symbolTable.insertBuiltIn(ESSL3_BUILTINS, float4, "textureProj", samplerExternalOES,
>-                                      float3, float1);
>-            symbolTable.insertBuiltIn(ESSL3_BUILTINS, float4, "textureProj", samplerExternalOES,
>-                                      float4, float1);
>-        }
>-
>-        if (resources.EXT_YUV_target)
>-        {
>-            const TType *samplerExternal2DY2YEXT = TCache::getType(EbtSamplerExternal2DY2YEXT);
>-
>-            symbolTable.insertBuiltIn(ESSL3_BUILTINS, TExtension::EXT_YUV_target, float4, "texture",
>-                                      samplerExternal2DY2YEXT, float2, float1);
>-            symbolTable.insertBuiltIn(ESSL3_BUILTINS, TExtension::EXT_YUV_target, float4,
>-                                      "textureProj", samplerExternal2DY2YEXT, float3, float1);
>-            symbolTable.insertBuiltIn(ESSL3_BUILTINS, TExtension::EXT_YUV_target, float4,
>-                                      "textureProj", samplerExternal2DY2YEXT, float4, float1);
>-        }
>-    }
>-
>-    const TType *sampler2DShadow      = TCache::getType(EbtSampler2DShadow);
>-    const TType *samplerCubeShadow    = TCache::getType(EbtSamplerCubeShadow);
>-    const TType *sampler2DArrayShadow = TCache::getType(EbtSampler2DArrayShadow);
>-
>-    symbolTable.insertBuiltIn(ESSL3_BUILTINS, float1, "texture", sampler2DShadow, float3);
>-    symbolTable.insertBuiltIn(ESSL3_BUILTINS, float1, "texture", samplerCubeShadow, float4);
>-    symbolTable.insertBuiltIn(ESSL3_BUILTINS, float1, "texture", sampler2DArrayShadow, float4);
>-    symbolTable.insertBuiltIn(ESSL3_BUILTINS, float1, "textureProj", sampler2DShadow, float4);
>-    symbolTable.insertBuiltIn(ESSL3_BUILTINS, float1, "textureLod", sampler2DShadow, float3,
>-                              float1);
>-
>-    if (type == GL_FRAGMENT_SHADER)
>-    {
>-        symbolTable.insertBuiltIn(ESSL3_BUILTINS, float1, "texture", sampler2DShadow, float3,
>-                                  float1);
>-        symbolTable.insertBuiltIn(ESSL3_BUILTINS, float1, "texture", samplerCubeShadow, float4,
>-                                  float1);
>-        symbolTable.insertBuiltIn(ESSL3_BUILTINS, float1, "textureProj", sampler2DShadow, float4,
>-                                  float1);
>-    }
>-
>-    symbolTable.insertBuiltIn(ESSL3_BUILTINS, int2, "textureSize", gsampler2D, int1);
>-    symbolTable.insertBuiltIn(ESSL3_BUILTINS, int3, "textureSize", gsampler3D, int1);
>-    symbolTable.insertBuiltIn(ESSL3_BUILTINS, int2, "textureSize", gsamplerCube, int1);
>-    symbolTable.insertBuiltIn(ESSL3_BUILTINS, int3, "textureSize", gsampler2DArray, int1);
>-    symbolTable.insertBuiltIn(ESSL3_BUILTINS, int2, "textureSize", sampler2DShadow, int1);
>-    symbolTable.insertBuiltIn(ESSL3_BUILTINS, int2, "textureSize", samplerCubeShadow, int1);
>-    symbolTable.insertBuiltIn(ESSL3_BUILTINS, int3, "textureSize", sampler2DArrayShadow, int1);
>-    symbolTable.insertBuiltIn(ESSL3_BUILTINS, int2, "textureSize", gsampler2DMS);
>-
>-    if (resources.OES_EGL_image_external_essl3)
>-    {
>-        const TType *samplerExternalOES = TCache::getType(EbtSamplerExternalOES);
>-
>-        symbolTable.insertBuiltIn(ESSL3_BUILTINS, int2, "textureSize", samplerExternalOES, int1);
>-    }
>-
>-    if (resources.EXT_YUV_target)
>-    {
>-        const TType *samplerExternal2DY2YEXT = TCache::getType(EbtSamplerExternal2DY2YEXT);
>-
>-        symbolTable.insertBuiltIn(ESSL3_BUILTINS, TExtension::EXT_YUV_target, int2, "textureSize",
>-                                  samplerExternal2DY2YEXT, int1);
>-    }
>-
>-    if (type == GL_FRAGMENT_SHADER)
>-    {
>-        symbolTable.insertBuiltInOp(ESSL3_BUILTINS, EOpDFdx, genType, genType);
>-        symbolTable.insertBuiltInOp(ESSL3_BUILTINS, EOpDFdy, genType, genType);
>-        symbolTable.insertBuiltInOp(ESSL3_BUILTINS, EOpFwidth, genType, genType);
>-    }
>-
>-    symbolTable.insertBuiltIn(ESSL3_BUILTINS, gvec4, "textureOffset", gsampler2D, float2, int2);
>-    symbolTable.insertBuiltIn(ESSL3_BUILTINS, gvec4, "textureOffset", gsampler3D, float3, int3);
>-    symbolTable.insertBuiltIn(ESSL3_BUILTINS, float1, "textureOffset", sampler2DShadow, float3,
>-                              int2);
>-    symbolTable.insertBuiltIn(ESSL3_BUILTINS, gvec4, "textureOffset", gsampler2DArray, float3,
>-                              int2);
>-
>-    if (type == GL_FRAGMENT_SHADER)
>-    {
>-        symbolTable.insertBuiltIn(ESSL3_BUILTINS, gvec4, "textureOffset", gsampler2D, float2, int2,
>-                                  float1);
>-        symbolTable.insertBuiltIn(ESSL3_BUILTINS, gvec4, "textureOffset", gsampler3D, float3, int3,
>-                                  float1);
>-        symbolTable.insertBuiltIn(ESSL3_BUILTINS, float1, "textureOffset", sampler2DShadow, float3,
>-                                  int2, float1);
>-        symbolTable.insertBuiltIn(ESSL3_BUILTINS, gvec4, "textureOffset", gsampler2DArray, float3,
>-                                  int2, float1);
>-    }
>-
>-    symbolTable.insertBuiltIn(ESSL3_BUILTINS, gvec4, "textureProjOffset", gsampler2D, float3, int2);
>-    symbolTable.insertBuiltIn(ESSL3_BUILTINS, gvec4, "textureProjOffset", gsampler2D, float4, int2);
>-    symbolTable.insertBuiltIn(ESSL3_BUILTINS, gvec4, "textureProjOffset", gsampler3D, float4, int3);
>-    symbolTable.insertBuiltIn(ESSL3_BUILTINS, float1, "textureProjOffset", sampler2DShadow, float4,
>-                              int2);
>-
>-    if (type == GL_FRAGMENT_SHADER)
>-    {
>-        symbolTable.insertBuiltIn(ESSL3_BUILTINS, gvec4, "textureProjOffset", gsampler2D, float3,
>-                                  int2, float1);
>-        symbolTable.insertBuiltIn(ESSL3_BUILTINS, gvec4, "textureProjOffset", gsampler2D, float4,
>-                                  int2, float1);
>-        symbolTable.insertBuiltIn(ESSL3_BUILTINS, gvec4, "textureProjOffset", gsampler3D, float4,
>-                                  int3, float1);
>-        symbolTable.insertBuiltIn(ESSL3_BUILTINS, float1, "textureProjOffset", sampler2DShadow,
>-                                  float4, int2, float1);
>-    }
>-
>-    symbolTable.insertBuiltIn(ESSL3_BUILTINS, gvec4, "textureLodOffset", gsampler2D, float2, float1,
>-                              int2);
>-    symbolTable.insertBuiltIn(ESSL3_BUILTINS, gvec4, "textureLodOffset", gsampler3D, float3, float1,
>-                              int3);
>-    symbolTable.insertBuiltIn(ESSL3_BUILTINS, float1, "textureLodOffset", sampler2DShadow, float3,
>-                              float1, int2);
>-    symbolTable.insertBuiltIn(ESSL3_BUILTINS, gvec4, "textureLodOffset", gsampler2DArray, float3,
>-                              float1, int2);
>-
>-    symbolTable.insertBuiltIn(ESSL3_BUILTINS, gvec4, "textureProjLod", gsampler2D, float3, float1);
>-    symbolTable.insertBuiltIn(ESSL3_BUILTINS, gvec4, "textureProjLod", gsampler2D, float4, float1);
>-    symbolTable.insertBuiltIn(ESSL3_BUILTINS, gvec4, "textureProjLod", gsampler3D, float4, float1);
>-    symbolTable.insertBuiltIn(ESSL3_BUILTINS, float1, "textureProjLod", sampler2DShadow, float4,
>-                              float1);
>-
>-    symbolTable.insertBuiltIn(ESSL3_BUILTINS, gvec4, "textureProjLodOffset", gsampler2D, float3,
>-                              float1, int2);
>-    symbolTable.insertBuiltIn(ESSL3_BUILTINS, gvec4, "textureProjLodOffset", gsampler2D, float4,
>-                              float1, int2);
>-    symbolTable.insertBuiltIn(ESSL3_BUILTINS, gvec4, "textureProjLodOffset", gsampler3D, float4,
>-                              float1, int3);
>-    symbolTable.insertBuiltIn(ESSL3_BUILTINS, float1, "textureProjLodOffset", sampler2DShadow,
>-                              float4, float1, int2);
>-
>-    symbolTable.insertBuiltIn(ESSL3_BUILTINS, gvec4, "texelFetch", gsampler2D, int2, int1);
>-    symbolTable.insertBuiltIn(ESSL3_BUILTINS, gvec4, "texelFetch", gsampler3D, int3, int1);
>-    symbolTable.insertBuiltIn(ESSL3_BUILTINS, gvec4, "texelFetch", gsampler2DArray, int3, int1);
>-
>-    if (resources.OES_EGL_image_external_essl3)
>-    {
>-        const TType *samplerExternalOES = TCache::getType(EbtSamplerExternalOES);
>-
>-        symbolTable.insertBuiltIn(ESSL3_BUILTINS, float4, "texelFetch", samplerExternalOES, int2,
>-                                  int1);
>-    }
>-
>-    if (resources.EXT_YUV_target)
>-    {
>-        const TType *samplerExternal2DY2YEXT = TCache::getType(EbtSamplerExternal2DY2YEXT);
>-
>-        symbolTable.insertBuiltIn(ESSL3_BUILTINS, TExtension::EXT_YUV_target, float4, "texelFetch",
>-                                  samplerExternal2DY2YEXT, int2, int1);
>-    }
>-
>-    symbolTable.insertBuiltIn(ESSL3_BUILTINS, gvec4, "texelFetchOffset", gsampler2D, int2, int1,
>-                              int2);
>-    symbolTable.insertBuiltIn(ESSL3_BUILTINS, gvec4, "texelFetchOffset", gsampler3D, int3, int1,
>-                              int3);
>-    symbolTable.insertBuiltIn(ESSL3_BUILTINS, gvec4, "texelFetchOffset", gsampler2DArray, int3,
>-                              int1, int2);
>-
>-    symbolTable.insertBuiltIn(ESSL3_BUILTINS, gvec4, "textureGrad", gsampler2D, float2, float2,
>-                              float2);
>-    symbolTable.insertBuiltIn(ESSL3_BUILTINS, gvec4, "textureGrad", gsampler3D, float3, float3,
>-                              float3);
>-    symbolTable.insertBuiltIn(ESSL3_BUILTINS, gvec4, "textureGrad", gsamplerCube, float3, float3,
>-                              float3);
>-    symbolTable.insertBuiltIn(ESSL3_BUILTINS, float1, "textureGrad", sampler2DShadow, float3,
>-                              float2, float2);
>-    symbolTable.insertBuiltIn(ESSL3_BUILTINS, float1, "textureGrad", samplerCubeShadow, float4,
>-                              float3, float3);
>-    symbolTable.insertBuiltIn(ESSL3_BUILTINS, gvec4, "textureGrad", gsampler2DArray, float3, float2,
>-                              float2);
>-    symbolTable.insertBuiltIn(ESSL3_BUILTINS, float1, "textureGrad", sampler2DArrayShadow, float4,
>-                              float2, float2);
>-
>-    symbolTable.insertBuiltIn(ESSL3_BUILTINS, gvec4, "textureGradOffset", gsampler2D, float2,
>-                              float2, float2, int2);
>-    symbolTable.insertBuiltIn(ESSL3_BUILTINS, gvec4, "textureGradOffset", gsampler3D, float3,
>-                              float3, float3, int3);
>-    symbolTable.insertBuiltIn(ESSL3_BUILTINS, float1, "textureGradOffset", sampler2DShadow, float3,
>-                              float2, float2, int2);
>-    symbolTable.insertBuiltIn(ESSL3_BUILTINS, gvec4, "textureGradOffset", gsampler2DArray, float3,
>-                              float2, float2, int2);
>-    symbolTable.insertBuiltIn(ESSL3_BUILTINS, float1, "textureGradOffset", sampler2DArrayShadow,
>-                              float4, float2, float2, int2);
>-
>-    symbolTable.insertBuiltIn(ESSL3_BUILTINS, gvec4, "textureProjGrad", gsampler2D, float3, float2,
>-                              float2);
>-    symbolTable.insertBuiltIn(ESSL3_BUILTINS, gvec4, "textureProjGrad", gsampler2D, float4, float2,
>-                              float2);
>-    symbolTable.insertBuiltIn(ESSL3_BUILTINS, gvec4, "textureProjGrad", gsampler3D, float4, float3,
>-                              float3);
>-    symbolTable.insertBuiltIn(ESSL3_BUILTINS, float1, "textureProjGrad", sampler2DShadow, float4,
>-                              float2, float2);
>-
>-    symbolTable.insertBuiltIn(ESSL3_BUILTINS, gvec4, "textureProjGradOffset", gsampler2D, float3,
>-                              float2, float2, int2);
>-    symbolTable.insertBuiltIn(ESSL3_BUILTINS, gvec4, "textureProjGradOffset", gsampler2D, float4,
>-                              float2, float2, int2);
>-    symbolTable.insertBuiltIn(ESSL3_BUILTINS, gvec4, "textureProjGradOffset", gsampler3D, float4,
>-                              float3, float3, int3);
>-    symbolTable.insertBuiltIn(ESSL3_BUILTINS, float1, "textureProjGradOffset", sampler2DShadow,
>-                              float4, float2, float2, int2);
>-
>-    const TType *atomicCounter = TCache::getType(EbtAtomicCounter);
>-    symbolTable.insertBuiltIn(ESSL3_1_BUILTINS, uint1, "atomicCounter", atomicCounter);
>-    symbolTable.insertBuiltIn(ESSL3_1_BUILTINS, uint1, "atomicCounterIncrement", atomicCounter);
>-    symbolTable.insertBuiltIn(ESSL3_1_BUILTINS, uint1, "atomicCounterDecrement", atomicCounter);
>-
>-    // Insert all atomic memory functions
>-    const TType *int1InOut  = TCache::getType(EbtInt, EvqInOut);
>-    const TType *uint1InOut = TCache::getType(EbtUInt, EvqInOut);
>-    symbolTable.insertBuiltIn(ESSL3_1_BUILTINS, uint1, "atomicAdd", uint1InOut, uint1);
>-    symbolTable.insertBuiltIn(ESSL3_1_BUILTINS, int1, "atomicAdd", int1InOut, int1);
>-    symbolTable.insertBuiltIn(ESSL3_1_BUILTINS, uint1, "atomicMin", uint1InOut, uint1);
>-    symbolTable.insertBuiltIn(ESSL3_1_BUILTINS, int1, "atomicMin", int1InOut, int1);
>-    symbolTable.insertBuiltIn(ESSL3_1_BUILTINS, uint1, "atomicMax", uint1InOut, uint1);
>-    symbolTable.insertBuiltIn(ESSL3_1_BUILTINS, int1, "atomicMax", int1InOut, int1);
>-    symbolTable.insertBuiltIn(ESSL3_1_BUILTINS, uint1, "atomicAnd", uint1InOut, uint1);
>-    symbolTable.insertBuiltIn(ESSL3_1_BUILTINS, int1, "atomicAnd", int1InOut, int1);
>-    symbolTable.insertBuiltIn(ESSL3_1_BUILTINS, uint1, "atomicOr", uint1InOut, uint1);
>-    symbolTable.insertBuiltIn(ESSL3_1_BUILTINS, int1, "atomicOr", int1InOut, int1);
>-    symbolTable.insertBuiltIn(ESSL3_1_BUILTINS, uint1, "atomicXor", uint1InOut, uint1);
>-    symbolTable.insertBuiltIn(ESSL3_1_BUILTINS, int1, "atomicXor", int1InOut, int1);
>-    symbolTable.insertBuiltIn(ESSL3_1_BUILTINS, uint1, "atomicExchange", uint1InOut, uint1);
>-    symbolTable.insertBuiltIn(ESSL3_1_BUILTINS, int1, "atomicExchange", int1InOut, int1);
>-    symbolTable.insertBuiltIn(ESSL3_1_BUILTINS, uint1, "atomicCompSwap", uint1InOut, uint1, uint1);
>-    symbolTable.insertBuiltIn(ESSL3_1_BUILTINS, int1, "atomicCompSwap", int1InOut, int1, int1);
>-
>-    const TType *gimage2D      = TCache::getType(EbtGImage2D);
>-    const TType *gimage3D      = TCache::getType(EbtGImage3D);
>-    const TType *gimage2DArray = TCache::getType(EbtGImage2DArray);
>-    const TType *gimageCube    = TCache::getType(EbtGImageCube);
>-
>-    symbolTable.insertBuiltIn(ESSL3_1_BUILTINS, voidType, "imageStore", gimage2D, int2, gvec4);
>-    symbolTable.insertBuiltIn(ESSL3_1_BUILTINS, voidType, "imageStore", gimage3D, int3, gvec4);
>-    symbolTable.insertBuiltIn(ESSL3_1_BUILTINS, voidType, "imageStore", gimage2DArray, int3, gvec4);
>-    symbolTable.insertBuiltIn(ESSL3_1_BUILTINS, voidType, "imageStore", gimageCube, int3, gvec4);
>-
>-    symbolTable.insertBuiltIn(ESSL3_1_BUILTINS, gvec4, "imageLoad", gimage2D, int2);
>-    symbolTable.insertBuiltIn(ESSL3_1_BUILTINS, gvec4, "imageLoad", gimage3D, int3);
>-    symbolTable.insertBuiltIn(ESSL3_1_BUILTINS, gvec4, "imageLoad", gimage2DArray, int3);
>-    symbolTable.insertBuiltIn(ESSL3_1_BUILTINS, gvec4, "imageLoad", gimageCube, int3);
>-
>-    symbolTable.insertBuiltIn(ESSL3_1_BUILTINS, int2, "imageSize", gimage2D);
>-    symbolTable.insertBuiltIn(ESSL3_1_BUILTINS, int3, "imageSize", gimage3D);
>-    symbolTable.insertBuiltIn(ESSL3_1_BUILTINS, int3, "imageSize", gimage2DArray);
>-    symbolTable.insertBuiltIn(ESSL3_1_BUILTINS, int2, "imageSize", gimageCube);
>-
>-    symbolTable.insertBuiltInFunctionNoParameters(ESSL3_1_BUILTINS, EOpMemoryBarrier, voidType,
>-                                                  "memoryBarrier");
>-    symbolTable.insertBuiltInFunctionNoParameters(ESSL3_1_BUILTINS, EOpMemoryBarrierAtomicCounter,
>-                                                  voidType, "memoryBarrierAtomicCounter");
>-    symbolTable.insertBuiltInFunctionNoParameters(ESSL3_1_BUILTINS, EOpMemoryBarrierBuffer,
>-                                                  voidType, "memoryBarrierBuffer");
>-    symbolTable.insertBuiltInFunctionNoParameters(ESSL3_1_BUILTINS, EOpMemoryBarrierImage, voidType,
>-                                                  "memoryBarrierImage");
>-
>-    symbolTable.insertBuiltIn(ESSL3_1_BUILTINS, gvec4, "texelFetch", gsampler2DMS, int2, int1);
>-
>-    // Insert all variations of textureGather.
>-    symbolTable.insertBuiltIn(ESSL3_1_BUILTINS, gvec4, "textureGather", gsampler2D, float2);
>-    symbolTable.insertBuiltIn(ESSL3_1_BUILTINS, gvec4, "textureGather", gsampler2D, float2, int1);
>-    symbolTable.insertBuiltIn(ESSL3_1_BUILTINS, gvec4, "textureGather", gsampler2DArray, float3);
>-    symbolTable.insertBuiltIn(ESSL3_1_BUILTINS, gvec4, "textureGather", gsampler2DArray, float3,
>-                              int1);
>-    symbolTable.insertBuiltIn(ESSL3_1_BUILTINS, gvec4, "textureGather", gsamplerCube, float3);
>-    symbolTable.insertBuiltIn(ESSL3_1_BUILTINS, gvec4, "textureGather", gsamplerCube, float3, int1);
>-    symbolTable.insertBuiltIn(ESSL3_1_BUILTINS, float4, "textureGather", sampler2DShadow, float2);
>-    symbolTable.insertBuiltIn(ESSL3_1_BUILTINS, float4, "textureGather", sampler2DShadow, float2,
>-                              float1);
>-    symbolTable.insertBuiltIn(ESSL3_1_BUILTINS, float4, "textureGather", sampler2DArrayShadow,
>-                              float3);
>-    symbolTable.insertBuiltIn(ESSL3_1_BUILTINS, float4, "textureGather", sampler2DArrayShadow,
>-                              float3, float1);
>-    symbolTable.insertBuiltIn(ESSL3_1_BUILTINS, float4, "textureGather", samplerCubeShadow, float3);
>-    symbolTable.insertBuiltIn(ESSL3_1_BUILTINS, float4, "textureGather", samplerCubeShadow, float3,
>-                              float1);
>-
>-    // Insert all variations of textureGatherOffset.
>-    symbolTable.insertBuiltIn(ESSL3_1_BUILTINS, gvec4, "textureGatherOffset", gsampler2D, float2,
>-                              int2);
>-    symbolTable.insertBuiltIn(ESSL3_1_BUILTINS, gvec4, "textureGatherOffset", gsampler2D, float2,
>-                              int2, int1);
>-    symbolTable.insertBuiltIn(ESSL3_1_BUILTINS, gvec4, "textureGatherOffset", gsampler2DArray,
>-                              float3, int2);
>-    symbolTable.insertBuiltIn(ESSL3_1_BUILTINS, gvec4, "textureGatherOffset", gsampler2DArray,
>-                              float3, int2, int1);
>-    symbolTable.insertBuiltIn(ESSL3_1_BUILTINS, float4, "textureGatherOffset", sampler2DShadow,
>-                              float2, float1, int2);
>-    symbolTable.insertBuiltIn(ESSL3_1_BUILTINS, float4, "textureGatherOffset", sampler2DArrayShadow,
>-                              float3, float1, int2);
>-
>-    if (type == GL_COMPUTE_SHADER)
>-    {
>-        symbolTable.insertBuiltInFunctionNoParameters(ESSL3_1_BUILTINS, EOpBarrier, voidType,
>-                                                      "barrier");
>-        symbolTable.insertBuiltInFunctionNoParameters(ESSL3_1_BUILTINS, EOpMemoryBarrierShared,
>-                                                      voidType, "memoryBarrierShared");
>-        symbolTable.insertBuiltInFunctionNoParameters(ESSL3_1_BUILTINS, EOpGroupMemoryBarrier,
>-                                                      voidType, "groupMemoryBarrier");
>-    }
>-
>-    if (type == GL_GEOMETRY_SHADER_OES)
>-    {
>-        TExtension extension = TExtension::OES_geometry_shader;
>-        symbolTable.insertBuiltInFunctionNoParametersExt(ESSL3_1_BUILTINS, extension, EOpEmitVertex,
>-                                                         voidType, "EmitVertex");
>-        symbolTable.insertBuiltInFunctionNoParametersExt(ESSL3_1_BUILTINS, extension,
>-                                                         EOpEndPrimitive, voidType, "EndPrimitive");
>-    }
>-
>-    //
>-    // Depth range in window coordinates
>-    //
>-    TFieldList *fields       = NewPoolTFieldList();
>-    TSourceLoc zeroSourceLoc = {0, 0, 0, 0};
>-    auto highpFloat1         = new TType(EbtFloat, EbpHigh, EvqGlobal, 1);
>-    TField *near             = new TField(highpFloat1, NewPoolTString("near"), zeroSourceLoc);
>-    TField *far              = new TField(highpFloat1, NewPoolTString("far"), zeroSourceLoc);
>-    TField *diff             = new TField(highpFloat1, NewPoolTString("diff"), zeroSourceLoc);
>-    fields->push_back(near);
>-    fields->push_back(far);
>-    fields->push_back(diff);
>-    TStructure *depthRangeStruct =
>-        new TStructure(&symbolTable, NewPoolTString("gl_DepthRangeParameters"), fields);
>-    symbolTable.insertStructType(COMMON_BUILTINS, depthRangeStruct);
>-    TType depthRangeType(depthRangeStruct);
>-    depthRangeType.setQualifier(EvqUniform);
>-    symbolTable.insertVariable(COMMON_BUILTINS, "gl_DepthRange", depthRangeType);
>-
>-    //
>-    // Implementation dependent built-in constants.
>-    //
>-    symbolTable.insertConstInt(COMMON_BUILTINS, "gl_MaxVertexAttribs", resources.MaxVertexAttribs,
>-                               EbpMedium);
>-    symbolTable.insertConstInt(COMMON_BUILTINS, "gl_MaxVertexUniformVectors",
>-                               resources.MaxVertexUniformVectors, EbpMedium);
>-    symbolTable.insertConstInt(COMMON_BUILTINS, "gl_MaxVertexTextureImageUnits",
>-                               resources.MaxVertexTextureImageUnits, EbpMedium);
>-    symbolTable.insertConstInt(COMMON_BUILTINS, "gl_MaxCombinedTextureImageUnits",
>-                               resources.MaxCombinedTextureImageUnits, EbpMedium);
>-    symbolTable.insertConstInt(COMMON_BUILTINS, "gl_MaxTextureImageUnits",
>-                               resources.MaxTextureImageUnits, EbpMedium);
>-    symbolTable.insertConstInt(COMMON_BUILTINS, "gl_MaxFragmentUniformVectors",
>-                               resources.MaxFragmentUniformVectors, EbpMedium);
>-
>-    symbolTable.insertConstInt(ESSL1_BUILTINS, "gl_MaxVaryingVectors", resources.MaxVaryingVectors,
>-                               EbpMedium);
>-
>-    symbolTable.insertConstInt(COMMON_BUILTINS, "gl_MaxDrawBuffers", resources.MaxDrawBuffers,
>-                               EbpMedium);
>-    if (resources.EXT_blend_func_extended)
>-    {
>-        symbolTable.insertConstIntExt(COMMON_BUILTINS, TExtension::EXT_blend_func_extended,
>-                                      "gl_MaxDualSourceDrawBuffersEXT",
>-                                      resources.MaxDualSourceDrawBuffers, EbpMedium);
>-    }
>-
>-    symbolTable.insertConstInt(ESSL3_BUILTINS, "gl_MaxVertexOutputVectors",
>-                               resources.MaxVertexOutputVectors, EbpMedium);
>-    symbolTable.insertConstInt(ESSL3_BUILTINS, "gl_MaxFragmentInputVectors",
>-                               resources.MaxFragmentInputVectors, EbpMedium);
>-    symbolTable.insertConstInt(ESSL3_BUILTINS, "gl_MinProgramTexelOffset",
>-                               resources.MinProgramTexelOffset, EbpMedium);
>-    symbolTable.insertConstInt(ESSL3_BUILTINS, "gl_MaxProgramTexelOffset",
>-                               resources.MaxProgramTexelOffset, EbpMedium);
>-
>-    symbolTable.insertConstInt(ESSL3_1_BUILTINS, "gl_MaxImageUnits", resources.MaxImageUnits,
>-                               EbpMedium);
>-    symbolTable.insertConstInt(ESSL3_1_BUILTINS, "gl_MaxVertexImageUniforms",
>-                               resources.MaxVertexImageUniforms, EbpMedium);
>-    symbolTable.insertConstInt(ESSL3_1_BUILTINS, "gl_MaxFragmentImageUniforms",
>-                               resources.MaxFragmentImageUniforms, EbpMedium);
>-    symbolTable.insertConstInt(ESSL3_1_BUILTINS, "gl_MaxComputeImageUniforms",
>-                               resources.MaxComputeImageUniforms, EbpMedium);
>-    symbolTable.insertConstInt(ESSL3_1_BUILTINS, "gl_MaxCombinedImageUniforms",
>-                               resources.MaxCombinedImageUniforms, EbpMedium);
>-
>-    symbolTable.insertConstInt(ESSL3_1_BUILTINS, "gl_MaxCombinedShaderOutputResources",
>-                               resources.MaxCombinedShaderOutputResources, EbpMedium);
>-
>-    symbolTable.insertConstIvec3(ESSL3_1_BUILTINS, "gl_MaxComputeWorkGroupCount",
>-                                 resources.MaxComputeWorkGroupCount, EbpHigh);
>-    symbolTable.insertConstIvec3(ESSL3_1_BUILTINS, "gl_MaxComputeWorkGroupSize",
>-                                 resources.MaxComputeWorkGroupSize, EbpHigh);
>-    symbolTable.insertConstInt(ESSL3_1_BUILTINS, "gl_MaxComputeUniformComponents",
>-                               resources.MaxComputeUniformComponents, EbpMedium);
>-    symbolTable.insertConstInt(ESSL3_1_BUILTINS, "gl_MaxComputeTextureImageUnits",
>-                               resources.MaxComputeTextureImageUnits, EbpMedium);
>-
>-    symbolTable.insertConstInt(ESSL3_1_BUILTINS, "gl_MaxComputeAtomicCounters",
>-                               resources.MaxComputeAtomicCounters, EbpMedium);
>-    symbolTable.insertConstInt(ESSL3_1_BUILTINS, "gl_MaxComputeAtomicCounterBuffers",
>-                               resources.MaxComputeAtomicCounterBuffers, EbpMedium);
>-
>-    symbolTable.insertConstInt(ESSL3_1_BUILTINS, "gl_MaxVertexAtomicCounters",
>-                               resources.MaxVertexAtomicCounters, EbpMedium);
>-    symbolTable.insertConstInt(ESSL3_1_BUILTINS, "gl_MaxFragmentAtomicCounters",
>-                               resources.MaxFragmentAtomicCounters, EbpMedium);
>-    symbolTable.insertConstInt(ESSL3_1_BUILTINS, "gl_MaxCombinedAtomicCounters",
>-                               resources.MaxCombinedAtomicCounters, EbpMedium);
>-    symbolTable.insertConstInt(ESSL3_1_BUILTINS, "gl_MaxAtomicCounterBindings",
>-                               resources.MaxAtomicCounterBindings, EbpMedium);
>-
>-    symbolTable.insertConstInt(ESSL3_1_BUILTINS, "gl_MaxVertexAtomicCounterBuffers",
>-                               resources.MaxVertexAtomicCounterBuffers, EbpMedium);
>-    symbolTable.insertConstInt(ESSL3_1_BUILTINS, "gl_MaxFragmentAtomicCounterBuffers",
>-                               resources.MaxFragmentAtomicCounterBuffers, EbpMedium);
>-    symbolTable.insertConstInt(ESSL3_1_BUILTINS, "gl_MaxCombinedAtomicCounterBuffers",
>-                               resources.MaxCombinedAtomicCounterBuffers, EbpMedium);
>-    symbolTable.insertConstInt(ESSL3_1_BUILTINS, "gl_MaxAtomicCounterBufferSize",
>-                               resources.MaxAtomicCounterBufferSize, EbpMedium);
>-
>-    if (resources.OES_geometry_shader)
>-    {
>-        TExtension ext = TExtension::OES_geometry_shader;
>-        symbolTable.insertConstIntExt(ESSL3_1_BUILTINS, ext, "gl_MaxGeometryInputComponents",
>-                                      resources.MaxGeometryInputComponents, EbpMedium);
>-        symbolTable.insertConstIntExt(ESSL3_1_BUILTINS, ext, "gl_MaxGeometryOutputComponents",
>-                                      resources.MaxGeometryOutputComponents, EbpMedium);
>-        symbolTable.insertConstIntExt(ESSL3_1_BUILTINS, ext, "gl_MaxGeometryImageUniforms",
>-                                      resources.MaxGeometryImageUniforms, EbpMedium);
>-        symbolTable.insertConstIntExt(ESSL3_1_BUILTINS, ext, "gl_MaxGeometryTextureImageUnits",
>-                                      resources.MaxGeometryTextureImageUnits, EbpMedium);
>-        symbolTable.insertConstIntExt(ESSL3_1_BUILTINS, ext, "gl_MaxGeometryOutputVertices",
>-                                      resources.MaxGeometryOutputVertices, EbpMedium);
>-        symbolTable.insertConstIntExt(ESSL3_1_BUILTINS, ext, "gl_MaxGeometryTotalOutputComponents",
>-                                      resources.MaxGeometryTotalOutputComponents, EbpMedium);
>-        symbolTable.insertConstIntExt(ESSL3_1_BUILTINS, ext, "gl_MaxGeometryUniformComponents",
>-                                      resources.MaxGeometryUniformComponents, EbpMedium);
>-        symbolTable.insertConstIntExt(ESSL3_1_BUILTINS, ext, "gl_MaxGeometryAtomicCounters",
>-                                      resources.MaxGeometryAtomicCounters, EbpMedium);
>-        symbolTable.insertConstIntExt(ESSL3_1_BUILTINS, ext, "gl_MaxGeometryAtomicCounterBuffers",
>-                                      resources.MaxGeometryAtomicCounterBuffers, EbpMedium);
>-    }
>-}
>-
>-void IdentifyBuiltIns(sh::GLenum type,
>-                      ShShaderSpec spec,
>-                      const ShBuiltInResources &resources,
>-                      TSymbolTable &symbolTable)
>-{
>-    //
>-    // Insert some special built-in variables that are not in
>-    // the built-in header files.
>-    //
>-
>-    if (resources.OVR_multiview && type != GL_COMPUTE_SHADER)
>-    {
>-        symbolTable.insertVariableExt(ESSL3_BUILTINS, TExtension::OVR_multiview, "gl_ViewID_OVR",
>-                                      TType(EbtUInt, EbpHigh, EvqViewIDOVR, 1));
>-
>-        // ESSL 1.00 doesn't have unsigned integers, so gl_ViewID_OVR is a signed integer in ESSL
>-        // 1.00. This is specified in the WEBGL_multiview spec.
>-        symbolTable.insertVariableExt(ESSL1_BUILTINS, TExtension::OVR_multiview, "gl_ViewID_OVR",
>-                                      TType(EbtInt, EbpHigh, EvqViewIDOVR, 1));
>-    }
>-
>-    switch (type)
>-    {
>-        case GL_FRAGMENT_SHADER:
>-        {
>-            symbolTable.insertVariable(COMMON_BUILTINS, "gl_FragCoord",
>-                                       TType(EbtFloat, EbpMedium, EvqFragCoord, 4));
>-            symbolTable.insertVariable(COMMON_BUILTINS, "gl_FrontFacing",
>-                                       TType(EbtBool, EbpUndefined, EvqFrontFacing, 1));
>-            symbolTable.insertVariable(COMMON_BUILTINS, "gl_PointCoord",
>-                                       TType(EbtFloat, EbpMedium, EvqPointCoord, 2));
>-
>-            symbolTable.insertVariable(ESSL1_BUILTINS, "gl_FragColor",
>-                                       TType(EbtFloat, EbpMedium, EvqFragColor, 4));
>-            TType fragData(EbtFloat, EbpMedium, EvqFragData, 4);
>-            if (spec != SH_WEBGL2_SPEC && spec != SH_WEBGL3_SPEC)
>-            {
>-                fragData.makeArray(resources.MaxDrawBuffers);
>-            }
>-            else
>-            {
>-                fragData.makeArray(1u);
>-            }
>-            symbolTable.insertVariable(ESSL1_BUILTINS, "gl_FragData", fragData);
>-
>-            if (resources.EXT_blend_func_extended)
>-            {
>-                symbolTable.insertVariableExt(
>-                    ESSL1_BUILTINS, TExtension::EXT_blend_func_extended, "gl_SecondaryFragColorEXT",
>-                    TType(EbtFloat, EbpMedium, EvqSecondaryFragColorEXT, 4));
>-                TType secondaryFragData(EbtFloat, EbpMedium, EvqSecondaryFragDataEXT, 4, 1);
>-                secondaryFragData.makeArray(resources.MaxDualSourceDrawBuffers);
>-                symbolTable.insertVariableExt(ESSL1_BUILTINS, TExtension::EXT_blend_func_extended,
>-                                              "gl_SecondaryFragDataEXT", secondaryFragData);
>-            }
>-
>-            if (resources.EXT_frag_depth)
>-            {
>-                symbolTable.insertVariableExt(
>-                    ESSL1_BUILTINS, TExtension::EXT_frag_depth, "gl_FragDepthEXT",
>-                    TType(EbtFloat, resources.FragmentPrecisionHigh ? EbpHigh : EbpMedium,
>-                          EvqFragDepthEXT, 1));
>-            }
>-
>-            symbolTable.insertVariable(ESSL3_BUILTINS, "gl_FragDepth",
>-                                       TType(EbtFloat, EbpHigh, EvqFragDepth, 1));
>-
>-            if (resources.EXT_shader_framebuffer_fetch || resources.NV_shader_framebuffer_fetch)
>-            {
>-                TType lastFragData(EbtFloat, EbpMedium, EvqLastFragData, 4, 1);
>-                lastFragData.makeArray(resources.MaxDrawBuffers);
>-
>-                if (resources.EXT_shader_framebuffer_fetch)
>-                {
>-                    symbolTable.insertVariableExt(ESSL1_BUILTINS,
>-                                                  TExtension::EXT_shader_framebuffer_fetch,
>-                                                  "gl_LastFragData", lastFragData);
>-                }
>-                else if (resources.NV_shader_framebuffer_fetch)
>-                {
>-                    symbolTable.insertVariableExt(
>-                        ESSL1_BUILTINS, TExtension::NV_shader_framebuffer_fetch, "gl_LastFragColor",
>-                        TType(EbtFloat, EbpMedium, EvqLastFragColor, 4));
>-                    symbolTable.insertVariableExt(ESSL1_BUILTINS,
>-                                                  TExtension::NV_shader_framebuffer_fetch,
>-                                                  "gl_LastFragData", lastFragData);
>-                }
>-            }
>-            else if (resources.ARM_shader_framebuffer_fetch)
>-            {
>-                symbolTable.insertVariableExt(
>-                    ESSL1_BUILTINS, TExtension::ARM_shader_framebuffer_fetch, "gl_LastFragColorARM",
>-                    TType(EbtFloat, EbpMedium, EvqLastFragColor, 4));
>-            }
>-
>-            if (resources.OES_geometry_shader)
>-            {
>-                TExtension extension = TExtension::OES_geometry_shader;
>-                symbolTable.insertVariableExt(ESSL3_1_BUILTINS, extension, "gl_PrimitiveID",
>-                                              TType(EbtInt, EbpHigh, EvqPrimitiveID, 1));
>-                symbolTable.insertVariableExt(ESSL3_1_BUILTINS, extension, "gl_Layer",
>-                                              TType(EbtInt, EbpHigh, EvqLayer, 1));
>-            }
>-
>-            break;
>-        }
>-        case GL_VERTEX_SHADER:
>-        {
>-            symbolTable.insertVariable(COMMON_BUILTINS, "gl_Position",
>-                                       TType(EbtFloat, EbpHigh, EvqPosition, 4));
>-            symbolTable.insertVariable(COMMON_BUILTINS, "gl_PointSize",
>-                                       TType(EbtFloat, EbpMedium, EvqPointSize, 1));
>-            symbolTable.insertVariable(ESSL3_BUILTINS, "gl_InstanceID",
>-                                       TType(EbtInt, EbpHigh, EvqInstanceID, 1));
>-            symbolTable.insertVariable(ESSL3_BUILTINS, "gl_VertexID",
>-                                       TType(EbtInt, EbpHigh, EvqVertexID, 1));
>-
>-            // For internal use by ANGLE - not exposed to the parser.
>-            symbolTable.insertVariable(GLSL_BUILTINS, "gl_ViewportIndex",
>-                                       TType(EbtInt, EbpHigh, EvqViewportIndex));
>-            // gl_Layer exists in other shader stages in ESSL, but not in vertex shader so far.
>-            symbolTable.insertVariable(GLSL_BUILTINS, "gl_Layer", TType(EbtInt, EbpHigh, EvqLayer));
>-            break;
>-        }
>-        case GL_COMPUTE_SHADER:
>-        {
>-            symbolTable.insertVariable(ESSL3_1_BUILTINS, "gl_NumWorkGroups",
>-                                       TType(EbtUInt, EbpUndefined, EvqNumWorkGroups, 3));
>-            symbolTable.insertVariable(ESSL3_1_BUILTINS, "gl_WorkGroupSize",
>-                                       TType(EbtUInt, EbpUndefined, EvqWorkGroupSize, 3));
>-            symbolTable.insertVariable(ESSL3_1_BUILTINS, "gl_WorkGroupID",
>-                                       TType(EbtUInt, EbpUndefined, EvqWorkGroupID, 3));
>-            symbolTable.insertVariable(ESSL3_1_BUILTINS, "gl_LocalInvocationID",
>-                                       TType(EbtUInt, EbpUndefined, EvqLocalInvocationID, 3));
>-            symbolTable.insertVariable(ESSL3_1_BUILTINS, "gl_GlobalInvocationID",
>-                                       TType(EbtUInt, EbpUndefined, EvqGlobalInvocationID, 3));
>-            symbolTable.insertVariable(ESSL3_1_BUILTINS, "gl_LocalInvocationIndex",
>-                                       TType(EbtUInt, EbpUndefined, EvqLocalInvocationIndex, 1));
>-            break;
>-        }
>-
>-        case GL_GEOMETRY_SHADER_OES:
>-        {
>-            TExtension extension = TExtension::OES_geometry_shader;
>-
>-            // Add built-in interface block gl_PerVertex and the built-in array gl_in.
>-            // TODO(jiawei.shao@intel.com): implement GL_OES_geometry_point_size.
>-            const TString *glPerVertexString = NewPoolTString("gl_PerVertex");
>-            symbolTable.insertInterfaceBlockNameExt(ESSL3_1_BUILTINS, extension, glPerVertexString);
>-
>-            TFieldList *fieldList    = NewPoolTFieldList();
>-            TSourceLoc zeroSourceLoc = {0, 0, 0, 0};
>-            TField *glPositionField  = new TField(new TType(EbtFloat, EbpHigh, EvqPosition, 4),
>-                                                 NewPoolTString("gl_Position"), zeroSourceLoc);
>-            fieldList->push_back(glPositionField);
>-
>-            TInterfaceBlock *glInBlock = new TInterfaceBlock(
>-                glPerVertexString, fieldList, NewPoolTString("gl_in"), TLayoutQualifier::Create());
>-
>-            // The array size of gl_in is undefined until we get a valid input primitive
>-            // declaration.
>-            TType glInType(glInBlock, EvqPerVertexIn, TLayoutQualifier::Create());
>-            glInType.makeArray(0u);
>-            symbolTable.insertVariableExt(ESSL3_1_BUILTINS, extension, "gl_in", glInType);
>-
>-            TType glPositionType(EbtFloat, EbpHigh, EvqPosition, 4);
>-            glPositionType.setInterfaceBlock(new TInterfaceBlock(
>-                glPerVertexString, fieldList, nullptr, TLayoutQualifier::Create()));
>-            symbolTable.insertVariableExt(ESSL3_1_BUILTINS, extension, "gl_Position",
>-                                          glPositionType);
>-            symbolTable.insertVariableExt(ESSL3_1_BUILTINS, extension, "gl_PrimitiveIDIn",
>-                                          TType(EbtInt, EbpHigh, EvqPrimitiveIDIn, 1));
>-            symbolTable.insertVariableExt(ESSL3_1_BUILTINS, extension, "gl_InvocationID",
>-                                          TType(EbtInt, EbpHigh, EvqInvocationID, 1));
>-            symbolTable.insertVariableExt(ESSL3_1_BUILTINS, extension, "gl_PrimitiveID",
>-                                          TType(EbtInt, EbpHigh, EvqPrimitiveID, 1));
>-            symbolTable.insertVariableExt(ESSL3_1_BUILTINS, extension, "gl_Layer",
>-                                          TType(EbtInt, EbpHigh, EvqLayer, 1));
>-
>-            break;
>-        }
>-        default:
>-            UNREACHABLE();
>-    }
>-}
>-
> void InitExtensionBehavior(const ShBuiltInResources &resources, TExtensionBehavior &extBehavior)
> {
>     if (resources.OES_standard_derivatives)
>@@ -1102,19 +61,30 @@ void InitExtensionBehavior(const ShBuiltInResources &resources, TExtensionBehavi
>     {
>         extBehavior[TExtension::ARM_shader_framebuffer_fetch] = EBhUndefined;
>     }
>-    if (resources.OVR_multiview)
>+    if (resources.OVR_multiview2)
>     {
>-        extBehavior[TExtension::OVR_multiview] = EBhUndefined;
>+        extBehavior[TExtension::OVR_multiview2] = EBhUndefined;
>     }
>     if (resources.EXT_YUV_target)
>     {
>         extBehavior[TExtension::EXT_YUV_target] = EBhUndefined;
>     }
>-    if (resources.OES_geometry_shader)
>+    if (resources.EXT_geometry_shader)
>     {
>-        extBehavior[TExtension::OES_geometry_shader] = EBhUndefined;
>         extBehavior[TExtension::EXT_geometry_shader] = EBhUndefined;
>     }
>+    if (resources.OES_texture_storage_multisample_2d_array)
>+    {
>+        extBehavior[TExtension::OES_texture_storage_multisample_2d_array] = EBhUndefined;
>+    }
>+    if (resources.ANGLE_texture_multisample)
>+    {
>+        extBehavior[TExtension::ANGLE_texture_multisample] = EBhUndefined;
>+    }
>+    if (resources.ANGLE_multi_draw)
>+    {
>+        extBehavior[TExtension::ANGLE_multi_draw] = EBhUndefined;
>+    }
> }
> 
> void ResetExtensionBehavior(TExtensionBehavior &extBehavior)
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/Initialize.h b/Source/ThirdParty/ANGLE/src/compiler/translator/Initialize.h
>index 2e61218a0f1..290af566847 100644
>--- a/Source/ThirdParty/ANGLE/src/compiler/translator/Initialize.h
>+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/Initialize.h
>@@ -14,16 +14,6 @@
> namespace sh
> {
> 
>-void InsertBuiltInFunctions(sh::GLenum type,
>-                            ShShaderSpec spec,
>-                            const ShBuiltInResources &resources,
>-                            TSymbolTable &table);
>-
>-void IdentifyBuiltIns(sh::GLenum type,
>-                      ShShaderSpec spec,
>-                      const ShBuiltInResources &resources,
>-                      TSymbolTable &symbolTable);
>-
> void InitExtensionBehavior(const ShBuiltInResources &resources,
>                            TExtensionBehavior &extensionBehavior);
> 
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/InitializeDll.cpp b/Source/ThirdParty/ANGLE/src/compiler/translator/InitializeDll.cpp
>index 43c215f52b5..06983645008 100644
>--- a/Source/ThirdParty/ANGLE/src/compiler/translator/InitializeDll.cpp
>+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/InitializeDll.cpp
>@@ -4,7 +4,6 @@
> // found in the LICENSE file.
> //
> 
>-#include "compiler/translator/Cache.h"
> #include "compiler/translator/InitializeDll.h"
> #include "compiler/translator/InitializeGlobals.h"
> 
>@@ -23,15 +22,12 @@ bool InitProcess()
>         return false;
>     }
> 
>-    TCache::initialize();
>-
>     return true;
> }
> 
> void DetachProcess()
> {
>     FreePoolIndex();
>-    TCache::destroy();
> }
> 
> }  // namespace sh
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/InitializeVariables.cpp b/Source/ThirdParty/ANGLE/src/compiler/translator/InitializeVariables.cpp
>deleted file mode 100644
>index aa1a042facd..00000000000
>--- a/Source/ThirdParty/ANGLE/src/compiler/translator/InitializeVariables.cpp
>+++ /dev/null
>@@ -1,290 +0,0 @@
>-//
>-// Copyright (c) 2002-2013 The ANGLE Project Authors. All rights reserved.
>-// Use of this source code is governed by a BSD-style license that can be
>-// found in the LICENSE file.
>-//
>-
>-#include "compiler/translator/InitializeVariables.h"
>-
>-#include "angle_gl.h"
>-#include "common/debug.h"
>-#include "compiler/translator/FindMain.h"
>-#include "compiler/translator/IntermNode_util.h"
>-#include "compiler/translator/IntermTraverse.h"
>-#include "compiler/translator/SymbolTable.h"
>-#include "compiler/translator/util.h"
>-
>-namespace sh
>-{
>-
>-namespace
>-{
>-
>-void AddArrayZeroInitSequence(const TIntermTyped *initializedNode,
>-                              bool canUseLoopsToInitialize,
>-                              TIntermSequence *initSequenceOut,
>-                              TSymbolTable *symbolTable);
>-
>-void AddStructZeroInitSequence(const TIntermTyped *initializedNode,
>-                               bool canUseLoopsToInitialize,
>-                               TIntermSequence *initSequenceOut,
>-                               TSymbolTable *symbolTable);
>-
>-TIntermBinary *CreateZeroInitAssignment(const TIntermTyped *initializedNode)
>-{
>-    TIntermTyped *zero = CreateZeroNode(initializedNode->getType());
>-    return new TIntermBinary(EOpAssign, initializedNode->deepCopy(), zero);
>-}
>-
>-void AddZeroInitSequence(const TIntermTyped *initializedNode,
>-                         bool canUseLoopsToInitialize,
>-                         TIntermSequence *initSequenceOut,
>-                         TSymbolTable *symbolTable)
>-{
>-    if (initializedNode->isArray())
>-    {
>-        AddArrayZeroInitSequence(initializedNode, canUseLoopsToInitialize, initSequenceOut,
>-                                 symbolTable);
>-    }
>-    else if (initializedNode->getType().isStructureContainingArrays() ||
>-             initializedNode->getType().isNamelessStruct())
>-    {
>-        AddStructZeroInitSequence(initializedNode, canUseLoopsToInitialize, initSequenceOut,
>-                                  symbolTable);
>-    }
>-    else
>-    {
>-        initSequenceOut->push_back(CreateZeroInitAssignment(initializedNode));
>-    }
>-}
>-
>-void AddStructZeroInitSequence(const TIntermTyped *initializedNode,
>-                               bool canUseLoopsToInitialize,
>-                               TIntermSequence *initSequenceOut,
>-                               TSymbolTable *symbolTable)
>-{
>-    ASSERT(initializedNode->getBasicType() == EbtStruct);
>-    const TStructure *structType = initializedNode->getType().getStruct();
>-    for (int i = 0; i < static_cast<int>(structType->fields().size()); ++i)
>-    {
>-        TIntermBinary *element = new TIntermBinary(EOpIndexDirectStruct,
>-                                                   initializedNode->deepCopy(), CreateIndexNode(i));
>-        // Structs can't be defined inside structs, so the type of a struct field can't be a
>-        // nameless struct.
>-        ASSERT(!element->getType().isNamelessStruct());
>-        AddZeroInitSequence(element, canUseLoopsToInitialize, initSequenceOut, symbolTable);
>-    }
>-}
>-
>-void AddArrayZeroInitStatementList(const TIntermTyped *initializedNode,
>-                                   bool canUseLoopsToInitialize,
>-                                   TIntermSequence *initSequenceOut,
>-                                   TSymbolTable *symbolTable)
>-{
>-    for (unsigned int i = 0; i < initializedNode->getOutermostArraySize(); ++i)
>-    {
>-        TIntermBinary *element =
>-            new TIntermBinary(EOpIndexDirect, initializedNode->deepCopy(), CreateIndexNode(i));
>-        AddZeroInitSequence(element, canUseLoopsToInitialize, initSequenceOut, symbolTable);
>-    }
>-}
>-
>-void AddArrayZeroInitForLoop(const TIntermTyped *initializedNode,
>-                             TIntermSequence *initSequenceOut,
>-                             TSymbolTable *symbolTable)
>-{
>-    ASSERT(initializedNode->isArray());
>-    TSymbolUniqueId indexSymbol(symbolTable);
>-
>-    TIntermSymbol *indexSymbolNode = CreateTempSymbolNode(indexSymbol, TType(EbtInt), EvqTemporary);
>-    TIntermDeclaration *indexInit =
>-        CreateTempInitDeclarationNode(indexSymbol, CreateZeroNode(TType(EbtInt)), EvqTemporary);
>-    TIntermConstantUnion *arraySizeNode = CreateIndexNode(initializedNode->getOutermostArraySize());
>-    TIntermBinary *indexSmallerThanSize =
>-        new TIntermBinary(EOpLessThan, indexSymbolNode->deepCopy(), arraySizeNode);
>-    TIntermUnary *indexIncrement = new TIntermUnary(EOpPreIncrement, indexSymbolNode->deepCopy());
>-
>-    TIntermBlock *forLoopBody       = new TIntermBlock();
>-    TIntermSequence *forLoopBodySeq = forLoopBody->getSequence();
>-
>-    TIntermBinary *element = new TIntermBinary(EOpIndexIndirect, initializedNode->deepCopy(),
>-                                               indexSymbolNode->deepCopy());
>-    AddZeroInitSequence(element, true, forLoopBodySeq, symbolTable);
>-
>-    TIntermLoop *forLoop =
>-        new TIntermLoop(ELoopFor, indexInit, indexSmallerThanSize, indexIncrement, forLoopBody);
>-    initSequenceOut->push_back(forLoop);
>-}
>-
>-void AddArrayZeroInitSequence(const TIntermTyped *initializedNode,
>-                              bool canUseLoopsToInitialize,
>-                              TIntermSequence *initSequenceOut,
>-                              TSymbolTable *symbolTable)
>-{
>-    // The array elements are assigned one by one to keep the AST compatible with ESSL 1.00 which
>-    // doesn't have array assignment. We'll do this either with a for loop or just a list of
>-    // statements assigning to each array index. Note that it is important to have the array init in
>-    // the right order to workaround http://crbug.com/709317
>-    bool isSmallArray = initializedNode->getOutermostArraySize() <= 1u ||
>-                        (initializedNode->getBasicType() != EbtStruct &&
>-                         !initializedNode->getType().isArrayOfArrays() &&
>-                         initializedNode->getOutermostArraySize() <= 3u);
>-    if (initializedNode->getQualifier() == EvqFragData ||
>-        initializedNode->getQualifier() == EvqFragmentOut || isSmallArray ||
>-        !canUseLoopsToInitialize)
>-    {
>-        // Fragment outputs should not be indexed by non-constant indices.
>-        // Also it doesn't make sense to use loops to initialize very small arrays.
>-        AddArrayZeroInitStatementList(initializedNode, canUseLoopsToInitialize, initSequenceOut,
>-                                      symbolTable);
>-    }
>-    else
>-    {
>-        AddArrayZeroInitForLoop(initializedNode, initSequenceOut, symbolTable);
>-    }
>-}
>-
>-void InsertInitCode(TIntermSequence *mainBody,
>-                    const InitVariableList &variables,
>-                    TSymbolTable *symbolTable,
>-                    int shaderVersion,
>-                    const TExtensionBehavior &extensionBehavior,
>-                    bool canUseLoopsToInitialize)
>-{
>-    for (const auto &var : variables)
>-    {
>-        TString name = TString(var.name.c_str());
>-        size_t pos   = name.find_last_of('[');
>-        if (pos != TString::npos)
>-        {
>-            name = name.substr(0, pos);
>-        }
>-
>-        TIntermTyped *initializedSymbol = nullptr;
>-        if (var.isBuiltIn())
>-        {
>-            initializedSymbol = ReferenceBuiltInVariable(name, *symbolTable, shaderVersion);
>-            if (initializedSymbol->getQualifier() == EvqFragData &&
>-                !IsExtensionEnabled(extensionBehavior, TExtension::EXT_draw_buffers))
>-            {
>-                // If GL_EXT_draw_buffers is disabled, only the 0th index of gl_FragData can be
>-                // written to.
>-                // TODO(oetuaho): This is a bit hacky and would be better to remove, if we came up
>-                // with a good way to do it. Right now "gl_FragData" in symbol table is initialized
>-                // to have the array size of MaxDrawBuffers, and the initialization happens before
>-                // the shader sets the extensions it is using.
>-                initializedSymbol =
>-                    new TIntermBinary(EOpIndexDirect, initializedSymbol, CreateIndexNode(0));
>-            }
>-        }
>-        else
>-        {
>-            initializedSymbol = ReferenceGlobalVariable(name, *symbolTable);
>-        }
>-        ASSERT(initializedSymbol != nullptr);
>-
>-        TIntermSequence *initCode =
>-            CreateInitCode(initializedSymbol, canUseLoopsToInitialize, symbolTable);
>-        mainBody->insert(mainBody->begin(), initCode->begin(), initCode->end());
>-    }
>-}
>-
>-class InitializeLocalsTraverser : public TIntermTraverser
>-{
>-  public:
>-    InitializeLocalsTraverser(int shaderVersion,
>-                              TSymbolTable *symbolTable,
>-                              bool canUseLoopsToInitialize)
>-        : TIntermTraverser(true, false, false, symbolTable),
>-          mShaderVersion(shaderVersion),
>-          mCanUseLoopsToInitialize(canUseLoopsToInitialize)
>-    {
>-    }
>-
>-  protected:
>-    bool visitDeclaration(Visit visit, TIntermDeclaration *node) override
>-    {
>-        for (TIntermNode *declarator : *node->getSequence())
>-        {
>-            if (!mInGlobalScope && !declarator->getAsBinaryNode())
>-            {
>-                TIntermSymbol *symbol = declarator->getAsSymbolNode();
>-                ASSERT(symbol);
>-                if (symbol->getSymbol() == "")
>-                {
>-                    continue;
>-                }
>-
>-                // Arrays may need to be initialized one element at a time, since ESSL 1.00 does not
>-                // support array constructors or assigning arrays.
>-                bool arrayConstructorUnavailable =
>-                    (symbol->isArray() || symbol->getType().isStructureContainingArrays()) &&
>-                    mShaderVersion == 100;
>-                // Nameless struct constructors can't be referred to, so they also need to be
>-                // initialized one element at a time.
>-                // TODO(oetuaho): Check if it makes sense to initialize using a loop, even if we
>-                // could use an initializer. It could at least reduce code size for very large
>-                // arrays, but could hurt runtime performance.
>-                if (arrayConstructorUnavailable || symbol->getType().isNamelessStruct())
>-                {
>-                    // SimplifyLoopConditions should have been run so the parent node of this node
>-                    // should not be a loop.
>-                    ASSERT(getParentNode()->getAsLoopNode() == nullptr);
>-                    // SeparateDeclarations should have already been run, so we don't need to worry
>-                    // about further declarators in this declaration depending on the effects of
>-                    // this declarator.
>-                    ASSERT(node->getSequence()->size() == 1);
>-                    insertStatementsInParentBlock(
>-                        TIntermSequence(),
>-                        *CreateInitCode(symbol, mCanUseLoopsToInitialize, mSymbolTable));
>-                }
>-                else
>-                {
>-                    TIntermBinary *init =
>-                        new TIntermBinary(EOpInitialize, symbol, CreateZeroNode(symbol->getType()));
>-                    queueReplacementWithParent(node, symbol, init, OriginalNode::BECOMES_CHILD);
>-                }
>-            }
>-        }
>-        return false;
>-    }
>-
>-  private:
>-    int mShaderVersion;
>-    bool mCanUseLoopsToInitialize;
>-};
>-
>-}  // namespace anonymous
>-
>-TIntermSequence *CreateInitCode(const TIntermTyped *initializedSymbol,
>-                                bool canUseLoopsToInitialize,
>-                                TSymbolTable *symbolTable)
>-{
>-    TIntermSequence *initCode = new TIntermSequence();
>-    AddZeroInitSequence(initializedSymbol, canUseLoopsToInitialize, initCode, symbolTable);
>-    return initCode;
>-}
>-
>-void InitializeUninitializedLocals(TIntermBlock *root,
>-                                   int shaderVersion,
>-                                   bool canUseLoopsToInitialize,
>-                                   TSymbolTable *symbolTable)
>-{
>-    InitializeLocalsTraverser traverser(shaderVersion, symbolTable, canUseLoopsToInitialize);
>-    root->traverse(&traverser);
>-    traverser.updateTree();
>-}
>-
>-void InitializeVariables(TIntermBlock *root,
>-                         const InitVariableList &vars,
>-                         TSymbolTable *symbolTable,
>-                         int shaderVersion,
>-                         const TExtensionBehavior &extensionBehavior,
>-                         bool canUseLoopsToInitialize)
>-{
>-    TIntermBlock *body = FindMainBody(root);
>-    InsertInitCode(body->getSequence(), vars, symbolTable, shaderVersion, extensionBehavior,
>-                   canUseLoopsToInitialize);
>-}
>-
>-}  // namespace sh
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/InitializeVariables.h b/Source/ThirdParty/ANGLE/src/compiler/translator/InitializeVariables.h
>deleted file mode 100644
>index 1a7b3c0f241..00000000000
>--- a/Source/ThirdParty/ANGLE/src/compiler/translator/InitializeVariables.h
>+++ /dev/null
>@@ -1,53 +0,0 @@
>-//
>-// Copyright (c) 2002-2013 The ANGLE Project Authors. All rights reserved.
>-// Use of this source code is governed by a BSD-style license that can be
>-// found in the LICENSE file.
>-//
>-
>-#ifndef COMPILER_TRANSLATOR_INITIALIZEVARIABLES_H_
>-#define COMPILER_TRANSLATOR_INITIALIZEVARIABLES_H_
>-
>-#include <GLSLANG/ShaderLang.h>
>-
>-#include "compiler/translator/ExtensionBehavior.h"
>-#include "compiler/translator/IntermNode.h"
>-
>-namespace sh
>-{
>-class TSymbolTable;
>-
>-typedef std::vector<sh::ShaderVariable> InitVariableList;
>-
>-// For all of the functions below: If canUseLoopsToInitialize is set, for loops are used instead of
>-// a large number of initializers where it can make sense, such as for initializing large arrays.
>-
>-// Return a sequence of assignment operations to initialize "initializedSymbol". initializedSymbol
>-// may be an array, struct or any combination of these, as long as it contains only basic types.
>-TIntermSequence *CreateInitCode(const TIntermTyped *initializedSymbol,
>-                                bool canUseLoopsToInitialize,
>-                                TSymbolTable *symbolTable);
>-
>-// Initialize all uninitialized local variables, so that undefined behavior is avoided.
>-void InitializeUninitializedLocals(TIntermBlock *root,
>-                                   int shaderVersion,
>-                                   bool canUseLoopsToInitialize,
>-                                   TSymbolTable *symbolTable);
>-
>-// This function can initialize all the types that CreateInitCode is able to initialize. All
>-// variables must be globals which can be found in the symbol table. For now it is used for the
>-// following two scenarios:
>-//   1. Initializing gl_Position;
>-//   2. Initializing output variables referred to in the shader source.
>-// Note: The type of each lvalue in an initializer is retrieved from the symbol table. gl_FragData
>-// requires special handling because the number of indices which can be initialized is determined by
>-// enabled extensions.
>-void InitializeVariables(TIntermBlock *root,
>-                         const InitVariableList &vars,
>-                         TSymbolTable *symbolTable,
>-                         int shaderVersion,
>-                         const TExtensionBehavior &extensionBehavior,
>-                         bool canUseLoopsToInitialize);
>-
>-}  // namespace sh
>-
>-#endif  // COMPILER_TRANSLATOR_INITIALIZEVARIABLES_H_
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/IntermNode.cpp b/Source/ThirdParty/ANGLE/src/compiler/translator/IntermNode.cpp
>index a57ffcb4bc4..f460174d5b1 100644
>--- a/Source/ThirdParty/ANGLE/src/compiler/translator/IntermNode.cpp
>+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/IntermNode.cpp
>@@ -18,6 +18,7 @@
> #include "common/mathutil.h"
> #include "common/matrix_utils.h"
> #include "compiler/translator/Diagnostics.h"
>+#include "compiler/translator/ImmutableString.h"
> #include "compiler/translator/IntermNode.h"
> #include "compiler/translator/SymbolTable.h"
> #include "compiler/translator/util.h"
>@@ -41,7 +42,7 @@ TConstantUnion *Vectorize(const TConstantUnion &constant, size_t size)
> {
>     TConstantUnion *constUnion = new TConstantUnion[size];
>     for (unsigned int i = 0; i < size; ++i)
>-        constUnion[i]   = constant;
>+        constUnion[i] = constant;
> 
>     return constUnion;
> }
>@@ -95,23 +96,19 @@ float VectorDotProduct(const TConstantUnion *paramArray1,
>     return result;
> }
> 
>-TIntermTyped *CreateFoldedNode(const TConstantUnion *constArray,
>-                               const TIntermTyped *originalNode,
>-                               TQualifier qualifier)
>+TIntermTyped *CreateFoldedNode(const TConstantUnion *constArray, const TIntermTyped *originalNode)
> {
>-    if (constArray == nullptr)
>-    {
>-        return nullptr;
>-    }
>+    ASSERT(constArray != nullptr);
>+    // Note that we inherit whatever qualifier the folded node had. Nodes may be constant folded
>+    // without being qualified as constant.
>     TIntermTyped *folded = new TIntermConstantUnion(constArray, originalNode->getType());
>-    folded->getTypePointer()->setQualifier(qualifier);
>     folded->setLine(originalNode->getLine());
>     return folded;
> }
> 
> angle::Matrix<float> GetMatrix(const TConstantUnion *paramArray,
>-                               const unsigned int &rows,
>-                               const unsigned int &cols)
>+                               const unsigned int rows,
>+                               const unsigned int cols)
> {
>     std::vector<float> elements;
>     for (size_t i = 0; i < rows * cols; i++)
>@@ -122,7 +119,7 @@ angle::Matrix<float> GetMatrix(const TConstantUnion *paramArray,
>     return angle::Matrix<float>(elements, cols, rows).transpose();
> }
> 
>-angle::Matrix<float> GetMatrix(const TConstantUnion *paramArray, const unsigned int &size)
>+angle::Matrix<float> GetMatrix(const TConstantUnion *paramArray, const unsigned int size)
> {
>     std::vector<float> elements;
>     for (size_t i = 0; i < size * size; i++)
>@@ -142,7 +139,43 @@ void SetUnionArrayFromMatrix(const angle::Matrix<float> &m, TConstantUnion *resu
>         resultArray[i].setFConst(resultElements[i]);
> }
> 
>-}  // namespace anonymous
>+bool CanFoldAggregateBuiltInOp(TOperator op)
>+{
>+    switch (op)
>+    {
>+        case EOpAtan:
>+        case EOpPow:
>+        case EOpMod:
>+        case EOpMin:
>+        case EOpMax:
>+        case EOpClamp:
>+        case EOpMix:
>+        case EOpStep:
>+        case EOpSmoothstep:
>+        case EOpLdexp:
>+        case EOpMulMatrixComponentWise:
>+        case EOpOuterProduct:
>+        case EOpEqualComponentWise:
>+        case EOpNotEqualComponentWise:
>+        case EOpLessThanComponentWise:
>+        case EOpLessThanEqualComponentWise:
>+        case EOpGreaterThanComponentWise:
>+        case EOpGreaterThanEqualComponentWise:
>+        case EOpDistance:
>+        case EOpDot:
>+        case EOpCross:
>+        case EOpFaceforward:
>+        case EOpReflect:
>+        case EOpRefract:
>+        case EOpBitfieldExtract:
>+        case EOpBitfieldInsert:
>+            return true;
>+        default:
>+            return false;
>+    }
>+}
>+
>+}  // namespace
> 
> ////////////////////////////////////////////////////////////////
> //
>@@ -150,7 +183,9 @@ void SetUnionArrayFromMatrix(const angle::Matrix<float> &m, TConstantUnion *resu
> //
> ////////////////////////////////////////////////////////////////
> 
>-void TIntermTyped::setTypePreservePrecision(const TType &t)
>+TIntermExpression::TIntermExpression(const TType &t) : TIntermTyped(), mType(t) {}
>+
>+void TIntermExpression::setTypePreservePrecision(const TType &t)
> {
>     TPrecision precision = getPrecision();
>     mType                = t;
>@@ -159,11 +194,69 @@ void TIntermTyped::setTypePreservePrecision(const TType &t)
> }
> 
> #define REPLACE_IF_IS(node, type, original, replacement) \
>-    if (node == original)                                \
>+    do                                                   \
>     {                                                    \
>-        node = static_cast<type *>(replacement);         \
>-        return true;                                     \
>+        if (node == original)                            \
>+        {                                                \
>+            node = static_cast<type *>(replacement);     \
>+            return true;                                 \
>+        }                                                \
>+    } while (0)
>+
>+size_t TIntermSymbol::getChildCount() const
>+{
>+    return 0;
>+}
>+
>+TIntermNode *TIntermSymbol::getChildNode(size_t index) const
>+{
>+    UNREACHABLE();
>+    return nullptr;
>+}
>+
>+size_t TIntermConstantUnion::getChildCount() const
>+{
>+    return 0;
>+}
>+
>+TIntermNode *TIntermConstantUnion::getChildNode(size_t index) const
>+{
>+    UNREACHABLE();
>+    return nullptr;
>+}
>+
>+size_t TIntermLoop::getChildCount() const
>+{
>+    return (mInit ? 1 : 0) + (mCond ? 1 : 0) + (mExpr ? 1 : 0) + (mBody ? 1 : 0);
>+}
>+
>+TIntermNode *TIntermLoop::getChildNode(size_t index) const
>+{
>+    TIntermNode *children[4];
>+    unsigned int childIndex = 0;
>+    if (mInit)
>+    {
>+        children[childIndex] = mInit;
>+        ++childIndex;
>+    }
>+    if (mCond)
>+    {
>+        children[childIndex] = mCond;
>+        ++childIndex;
>+    }
>+    if (mExpr)
>+    {
>+        children[childIndex] = mExpr;
>+        ++childIndex;
>     }
>+    if (mBody)
>+    {
>+        children[childIndex] = mBody;
>+        ++childIndex;
>+    }
>+    ASSERT(index < childIndex);
>+    return children[index];
>+}
> 
> bool TIntermLoop::replaceChildNode(TIntermNode *original, TIntermNode *replacement)
> {
>@@ -175,12 +268,36 @@ bool TIntermLoop::replaceChildNode(TIntermNode *original, TIntermNode *replaceme
>     return false;
> }
> 
>+size_t TIntermBranch::getChildCount() const
>+{
>+    return (mExpression ? 1 : 0);
>+}
>+
>+TIntermNode *TIntermBranch::getChildNode(size_t index) const
>+{
>+    ASSERT(mExpression);
>+    ASSERT(index == 0);
>+    return mExpression;
>+}
>+
> bool TIntermBranch::replaceChildNode(TIntermNode *original, TIntermNode *replacement)
> {
>     REPLACE_IF_IS(mExpression, TIntermTyped, original, replacement);
>     return false;
> }
> 
>+size_t TIntermSwizzle::getChildCount() const
>+{
>+    return 1;
>+}
>+
>+TIntermNode *TIntermSwizzle::getChildNode(size_t index) const
>+{
>+    ASSERT(mOperand);
>+    ASSERT(index == 0);
>+    return mOperand;
>+}
>+
> bool TIntermSwizzle::replaceChildNode(TIntermNode *original, TIntermNode *replacement)
> {
>     ASSERT(original->getAsTyped()->getType() == replacement->getAsTyped()->getType());
>@@ -188,6 +305,21 @@ bool TIntermSwizzle::replaceChildNode(TIntermNode *original, TIntermNode *replac
>     return false;
> }
> 
>+size_t TIntermBinary::getChildCount() const
>+{
>+    return 2;
>+}
>+
>+TIntermNode *TIntermBinary::getChildNode(size_t index) const
>+{
>+    ASSERT(index < 2);
>+    if (index == 0)
>+    {
>+        return mLeft;
>+    }
>+    return mRight;
>+}
>+
> bool TIntermBinary::replaceChildNode(TIntermNode *original, TIntermNode *replacement)
> {
>     REPLACE_IF_IS(mLeft, TIntermTyped, original, replacement);
>@@ -195,6 +327,18 @@ bool TIntermBinary::replaceChildNode(TIntermNode *original, TIntermNode *replace
>     return false;
> }
> 
>+size_t TIntermUnary::getChildCount() const
>+{
>+    return 1;
>+}
>+
>+TIntermNode *TIntermUnary::getChildNode(size_t index) const
>+{
>+    ASSERT(mOperand);
>+    ASSERT(index == 0);
>+    return mOperand;
>+}
>+
> bool TIntermUnary::replaceChildNode(TIntermNode *original, TIntermNode *replacement)
> {
>     ASSERT(original->getAsTyped()->getType() == replacement->getAsTyped()->getType());
>@@ -202,12 +346,39 @@ bool TIntermUnary::replaceChildNode(TIntermNode *original, TIntermNode *replacem
>     return false;
> }
> 
>+size_t TIntermInvariantDeclaration::getChildCount() const
>+{
>+    return 1;
>+}
>+
>+TIntermNode *TIntermInvariantDeclaration::getChildNode(size_t index) const
>+{
>+    ASSERT(mSymbol);
>+    ASSERT(index == 0);
>+    return mSymbol;
>+}
>+
> bool TIntermInvariantDeclaration::replaceChildNode(TIntermNode *original, TIntermNode *replacement)
> {
>     REPLACE_IF_IS(mSymbol, TIntermSymbol, original, replacement);
>     return false;
> }
> 
>+size_t TIntermFunctionDefinition::getChildCount() const
>+{
>+    return 2;
>+}
>+
>+TIntermNode *TIntermFunctionDefinition::getChildNode(size_t index) const
>+{
>+    ASSERT(index < 2);
>+    if (index == 0)
>+    {
>+        return mPrototype;
>+    }
>+    return mBody;
>+}
>+
> bool TIntermFunctionDefinition::replaceChildNode(TIntermNode *original, TIntermNode *replacement)
> {
>     REPLACE_IF_IS(mPrototype, TIntermFunctionPrototype, original, replacement);
>@@ -215,19 +386,60 @@ bool TIntermFunctionDefinition::replaceChildNode(TIntermNode *original, TIntermN
>     return false;
> }
> 
>+size_t TIntermAggregate::getChildCount() const
>+{
>+    return mArguments.size();
>+}
>+
>+TIntermNode *TIntermAggregate::getChildNode(size_t index) const
>+{
>+    return mArguments[index];
>+}
>+
> bool TIntermAggregate::replaceChildNode(TIntermNode *original, TIntermNode *replacement)
> {
>     return replaceChildNodeInternal(original, replacement);
> }
> 
>+size_t TIntermBlock::getChildCount() const
>+{
>+    return mStatements.size();
>+}
>+
>+TIntermNode *TIntermBlock::getChildNode(size_t index) const
>+{
>+    return mStatements[index];
>+}
>+
> bool TIntermBlock::replaceChildNode(TIntermNode *original, TIntermNode *replacement)
> {
>     return replaceChildNodeInternal(original, replacement);
> }
> 
>+size_t TIntermFunctionPrototype::getChildCount() const
>+{
>+    return 0;
>+}
>+
>+TIntermNode *TIntermFunctionPrototype::getChildNode(size_t index) const
>+{
>+    UNREACHABLE();
>+    return nullptr;
>+}
>+
> bool TIntermFunctionPrototype::replaceChildNode(TIntermNode *original, TIntermNode *replacement)
> {
>-    return replaceChildNodeInternal(original, replacement);
>+    return false;
>+}
>+
>+size_t TIntermDeclaration::getChildCount() const
>+{
>+    return mDeclarators.size();
>+}
>+
>+TIntermNode *TIntermDeclaration::getChildNode(size_t index) const
>+{
>+    return mDeclarators[index];
> }
> 
> bool TIntermDeclaration::replaceChildNode(TIntermNode *original, TIntermNode *replacement)
>@@ -271,69 +483,83 @@ bool TIntermAggregateBase::insertChildNodes(TIntermSequence::size_type position,
>     return true;
> }
> 
>-TIntermAggregate *TIntermAggregate::CreateFunctionCall(const TFunction &func,
>-                                                       TIntermSequence *arguments)
>+TIntermSymbol::TIntermSymbol(const TVariable *variable) : TIntermTyped(), mVariable(variable) {}
>+
>+bool TIntermSymbol::hasConstantValue() const
> {
>-    TIntermAggregate *callNode =
>-        new TIntermAggregate(func.getReturnType(), EOpCallFunctionInAST, arguments);
>-    callNode->getFunctionSymbolInfo()->setFromFunction(func);
>-    return callNode;
>+    return variable().getConstPointer() != nullptr;
> }
> 
>-TIntermAggregate *TIntermAggregate::CreateFunctionCall(const TType &type,
>-                                                       const TSymbolUniqueId &id,
>-                                                       const TName &name,
>+const TConstantUnion *TIntermSymbol::getConstantValue() const
>+{
>+    return variable().getConstPointer();
>+}
>+
>+const TSymbolUniqueId &TIntermSymbol::uniqueId() const
>+{
>+    return mVariable->uniqueId();
>+}
>+
>+ImmutableString TIntermSymbol::getName() const
>+{
>+    return mVariable->name();
>+}
>+
>+const TType &TIntermSymbol::getType() const
>+{
>+    return mVariable->getType();
>+}
>+
>+TIntermAggregate *TIntermAggregate::CreateFunctionCall(const TFunction &func,
>                                                        TIntermSequence *arguments)
> {
>-    TIntermAggregate *callNode = new TIntermAggregate(type, EOpCallFunctionInAST, arguments);
>-    callNode->getFunctionSymbolInfo()->setId(id);
>-    callNode->getFunctionSymbolInfo()->setNameObj(name);
>-    return callNode;
>+    return new TIntermAggregate(&func, func.getReturnType(), EOpCallFunctionInAST, arguments);
> }
> 
>-TIntermAggregate *TIntermAggregate::CreateBuiltInFunctionCall(const TFunction &func,
>-                                                              TIntermSequence *arguments)
>+TIntermAggregate *TIntermAggregate::CreateRawFunctionCall(const TFunction &func,
>+                                                          TIntermSequence *arguments)
> {
>-    TIntermAggregate *callNode =
>-        new TIntermAggregate(func.getReturnType(), EOpCallBuiltInFunction, arguments);
>-    callNode->getFunctionSymbolInfo()->setFromFunction(func);
>-    // Note that name needs to be set before texture function type is determined.
>-    callNode->setBuiltInFunctionPrecision();
>-    return callNode;
>+    return new TIntermAggregate(&func, func.getReturnType(), EOpCallInternalRawFunction, arguments);
> }
> 
>-TIntermAggregate *TIntermAggregate::CreateConstructor(const TType &type,
>-                                                      TIntermSequence *arguments)
>+TIntermAggregate *TIntermAggregate::CreateBuiltInFunctionCall(const TFunction &func,
>+                                                              TIntermSequence *arguments)
> {
>-    return new TIntermAggregate(type, EOpConstruct, arguments);
>+    // op should be either EOpCallBuiltInFunction or a specific math op.
>+    ASSERT(func.getBuiltInOp() != EOpNull);
>+    return new TIntermAggregate(&func, func.getReturnType(), func.getBuiltInOp(), arguments);
> }
> 
>-TIntermAggregate *TIntermAggregate::Create(const TType &type,
>-                                           TOperator op,
>-                                           TIntermSequence *arguments)
>+TIntermAggregate *TIntermAggregate::CreateConstructor(const TType &type, TIntermSequence *arguments)
> {
>-    TIntermAggregate *node = new TIntermAggregate(type, op, arguments);
>-    ASSERT(op != EOpCallFunctionInAST);    // Should use CreateFunctionCall
>-    ASSERT(op != EOpCallBuiltInFunction);  // Should use CreateBuiltInFunctionCall
>-    ASSERT(!node->isConstructor());        // Should use CreateConstructor
>-    return node;
>+    return new TIntermAggregate(nullptr, type, EOpConstruct, arguments);
> }
> 
>-TIntermAggregate::TIntermAggregate(const TType &type, TOperator op, TIntermSequence *arguments)
>-    : TIntermOperator(op), mUseEmulatedFunction(false), mGotPrecisionFromChildren(false)
>+TIntermAggregate::TIntermAggregate(const TFunction *func,
>+                                   const TType &type,
>+                                   TOperator op,
>+                                   TIntermSequence *arguments)
>+    : TIntermOperator(op, type),
>+      mUseEmulatedFunction(false),
>+      mGotPrecisionFromChildren(false),
>+      mFunction(func)
> {
>     if (arguments != nullptr)
>     {
>         mArguments.swap(*arguments);
>     }
>-    setTypePrecisionAndQualifier(type);
>+    ASSERT(mFunction == nullptr || mFunction->symbolType() != SymbolType::Empty);
>+    setPrecisionAndQualifier();
> }
> 
>-void TIntermAggregate::setTypePrecisionAndQualifier(const TType &type)
>+void TIntermAggregate::setPrecisionAndQualifier()
> {
>-    setType(type);
>     mType.setQualifier(EvqTemporary);
>-    if (!isFunctionCall())
>+    if (mOp == EOpCallBuiltInFunction)
>+    {
>+        setBuiltInFunctionPrecision();
>+    }
>+    else if (!isFunctionCall())
>     {
>         if (isConstructor())
>         {
>@@ -440,13 +666,13 @@ void TIntermAggregate::setBuiltInFunctionPrecision()
>     }
>     // ESSL 3.0 spec section 8: textureSize always gets highp precision.
>     // All other functions that take a sampler are assumed to be texture functions.
>-    if (mFunctionInfo.getName().find("textureSize") == 0)
>+    if (mFunction->name() == "textureSize")
>         mType.setPrecision(EbpHigh);
>     else
>         mType.setPrecision(precision);
> }
> 
>-TString TIntermAggregate::getSymbolTableMangledName() const
>+const char *TIntermAggregate::functionName() const
> {
>     ASSERT(!isConstructor());
>     switch (mOp)
>@@ -454,16 +680,161 @@ TString TIntermAggregate::getSymbolTableMangledName() const
>         case EOpCallInternalRawFunction:
>         case EOpCallBuiltInFunction:
>         case EOpCallFunctionInAST:
>-            return TFunction::GetMangledNameFromCall(mFunctionInfo.getName(), mArguments);
>+            return mFunction->name().data();
>         default:
>-            TString opString = GetOperatorString(mOp);
>-            return TFunction::GetMangledNameFromCall(opString, mArguments);
>+            return GetOperatorString(mOp);
>+    }
>+}
>+
>+bool TIntermAggregate::hasConstantValue() const
>+{
>+    if (!isConstructor())
>+    {
>+        return false;
>+    }
>+    for (TIntermNode *constructorArg : mArguments)
>+    {
>+        if (!constructorArg->getAsTyped()->hasConstantValue())
>+        {
>+            return false;
>+        }
>+    }
>+    return true;
>+}
>+
>+const TConstantUnion *TIntermAggregate::getConstantValue() const
>+{
>+    if (!hasConstantValue())
>+    {
>+        return nullptr;
>+    }
>+    ASSERT(isConstructor());
>+    ASSERT(mArguments.size() > 0u);
>+
>+    TConstantUnion *constArray = nullptr;
>+    if (isArray())
>+    {
>+        size_t elementSize = mArguments.front()->getAsTyped()->getType().getObjectSize();
>+        constArray         = new TConstantUnion[elementSize * getOutermostArraySize()];
>+
>+        size_t elementOffset = 0u;
>+        for (TIntermNode *constructorArg : mArguments)
>+        {
>+            const TConstantUnion *elementConstArray =
>+                constructorArg->getAsTyped()->getConstantValue();
>+            ASSERT(elementConstArray);
>+            size_t elementSizeBytes = sizeof(TConstantUnion) * elementSize;
>+            memcpy(static_cast<void *>(&constArray[elementOffset]),
>+                   static_cast<const void *>(elementConstArray), elementSizeBytes);
>+            elementOffset += elementSize;
>+        }
>+        return constArray;
>+    }
>+
>+    size_t resultSize    = getType().getObjectSize();
>+    constArray           = new TConstantUnion[resultSize];
>+    TBasicType basicType = getBasicType();
>+
>+    size_t resultIndex = 0u;
>+
>+    if (mArguments.size() == 1u)
>+    {
>+        TIntermNode *argument                       = mArguments.front();
>+        TIntermTyped *argumentTyped                 = argument->getAsTyped();
>+        const TConstantUnion *argumentConstantValue = argumentTyped->getConstantValue();
>+        // Check the special case of constructing a matrix diagonal from a single scalar,
>+        // or a vector from a single scalar.
>+        if (argumentTyped->getType().getObjectSize() == 1u)
>+        {
>+            if (isMatrix())
>+            {
>+                int resultCols = getType().getCols();
>+                int resultRows = getType().getRows();
>+                for (int col = 0; col < resultCols; ++col)
>+                {
>+                    for (int row = 0; row < resultRows; ++row)
>+                    {
>+                        if (col == row)
>+                        {
>+                            constArray[resultIndex].cast(basicType, argumentConstantValue[0]);
>+                        }
>+                        else
>+                        {
>+                            constArray[resultIndex].setFConst(0.0f);
>+                        }
>+                        ++resultIndex;
>+                    }
>+                }
>+            }
>+            else
>+            {
>+                while (resultIndex < resultSize)
>+                {
>+                    constArray[resultIndex].cast(basicType, argumentConstantValue[0]);
>+                    ++resultIndex;
>+                }
>+            }
>+            ASSERT(resultIndex == resultSize);
>+            return constArray;
>+        }
>+        else if (isMatrix() && argumentTyped->isMatrix())
>+        {
>+            // The special case of constructing a matrix from a matrix.
>+            int argumentCols = argumentTyped->getType().getCols();
>+            int argumentRows = argumentTyped->getType().getRows();
>+            int resultCols   = getType().getCols();
>+            int resultRows   = getType().getRows();
>+            for (int col = 0; col < resultCols; ++col)
>+            {
>+                for (int row = 0; row < resultRows; ++row)
>+                {
>+                    if (col < argumentCols && row < argumentRows)
>+                    {
>+                        constArray[resultIndex].cast(
>+                            basicType, argumentConstantValue[col * argumentRows + row]);
>+                    }
>+                    else if (col == row)
>+                    {
>+                        constArray[resultIndex].setFConst(1.0f);
>+                    }
>+                    else
>+                    {
>+                        constArray[resultIndex].setFConst(0.0f);
>+                    }
>+                    ++resultIndex;
>+                }
>+            }
>+            ASSERT(resultIndex == resultSize);
>+            return constArray;
>+        }
>+    }
>+
>+    for (TIntermNode *argument : mArguments)
>+    {
>+        TIntermTyped *argumentTyped                 = argument->getAsTyped();
>+        size_t argumentSize                         = argumentTyped->getType().getObjectSize();
>+        const TConstantUnion *argumentConstantValue = argumentTyped->getConstantValue();
>+        for (size_t i = 0u; i < argumentSize; ++i)
>+        {
>+            if (resultIndex >= resultSize)
>+                break;
>+            constArray[resultIndex].cast(basicType, argumentConstantValue[i]);
>+            ++resultIndex;
>+        }
>     }
>+    ASSERT(resultIndex == resultSize);
>+    return constArray;
> }
> 
> bool TIntermAggregate::hasSideEffects() const
> {
>-    if (isFunctionCall() && mFunctionInfo.isKnownToNotHaveSideEffects())
>+    if (getQualifier() == EvqConst)
>+    {
>+        return false;
>+    }
>+    bool calledFunctionHasNoSideEffects =
>+        isFunctionCall() && mFunction != nullptr && mFunction->isKnownToNotHaveSideEffects();
>+    if (calledFunctionHasNoSideEffects || isConstructor())
>     {
>         for (TIntermNode *arg : mArguments)
>         {
>@@ -490,10 +861,10 @@ void TIntermBlock::appendStatement(TIntermNode *statement)
>     }
> }
> 
>-void TIntermFunctionPrototype::appendParameter(TIntermSymbol *parameter)
>+void TIntermBlock::insertStatement(size_t insertPosition, TIntermNode *statement)
> {
>-    ASSERT(parameter != nullptr);
>-    mParameters.push_back(parameter);
>+    ASSERT(statement != nullptr);
>+    mStatements.insert(mStatements.begin() + insertPosition, statement);
> }
> 
> void TIntermDeclaration::appendDeclarator(TIntermTyped *declarator)
>@@ -507,6 +878,25 @@ void TIntermDeclaration::appendDeclarator(TIntermTyped *declarator)
>     mDeclarators.push_back(declarator);
> }
> 
>+size_t TIntermTernary::getChildCount() const
>+{
>+    return 3;
>+}
>+
>+TIntermNode *TIntermTernary::getChildNode(size_t index) const
>+{
>+    ASSERT(index < 3);
>+    if (index == 0)
>+    {
>+        return mCondition;
>+    }
>+    if (index == 1)
>+    {
>+        return mTrueExpression;
>+    }
>+    return mFalseExpression;
>+}
>+
> bool TIntermTernary::replaceChildNode(TIntermNode *original, TIntermNode *replacement)
> {
>     REPLACE_IF_IS(mCondition, TIntermTyped, original, replacement);
>@@ -515,6 +905,24 @@ bool TIntermTernary::replaceChildNode(TIntermNode *original, TIntermNode *replac
>     return false;
> }
> 
>+size_t TIntermIfElse::getChildCount() const
>+{
>+    return 1 + (mTrueBlock ? 1 : 0) + (mFalseBlock ? 1 : 0);
>+}
>+
>+TIntermNode *TIntermIfElse::getChildNode(size_t index) const
>+{
>+    if (index == 0)
>+    {
>+        return mCondition;
>+    }
>+    if (mTrueBlock && index == 1)
>+    {
>+        return mTrueBlock;
>+    }
>+    return mFalseBlock;
>+}
>+
> bool TIntermIfElse::replaceChildNode(TIntermNode *original, TIntermNode *replacement)
> {
>     REPLACE_IF_IS(mCondition, TIntermTyped, original, replacement);
>@@ -523,6 +931,21 @@ bool TIntermIfElse::replaceChildNode(TIntermNode *original, TIntermNode *replace
>     return false;
> }
> 
>+size_t TIntermSwitch::getChildCount() const
>+{
>+    return 2;
>+}
>+
>+TIntermNode *TIntermSwitch::getChildNode(size_t index) const
>+{
>+    ASSERT(index < 2);
>+    if (index == 0)
>+    {
>+        return mInit;
>+    }
>+    return mStatementList;
>+}
>+
> bool TIntermSwitch::replaceChildNode(TIntermNode *original, TIntermNode *replacement)
> {
>     REPLACE_IF_IS(mInit, TIntermTyped, original, replacement);
>@@ -531,90 +954,64 @@ bool TIntermSwitch::replaceChildNode(TIntermNode *original, TIntermNode *replace
>     return false;
> }
> 
>-bool TIntermCase::replaceChildNode(TIntermNode *original, TIntermNode *replacement)
>-{
>-    REPLACE_IF_IS(mCondition, TIntermTyped, original, replacement);
>-    return false;
>-}
>-
>-TIntermTyped::TIntermTyped(const TIntermTyped &node) : TIntermNode(), mType(node.mType)
>+size_t TIntermCase::getChildCount() const
> {
>-    // Copy constructor is disallowed for TIntermNode in order to disallow it for subclasses that
>-    // don't explicitly allow it, so normal TIntermNode constructor is used to construct the copy.
>-    // We need to manually copy any fields of TIntermNode besides handling fields in TIntermTyped.
>-    mLine = node.mLine;
>+    return (mCondition ? 1 : 0);
> }
> 
>-bool TIntermTyped::isConstructorWithOnlyConstantUnionParameters()
>+TIntermNode *TIntermCase::getChildNode(size_t index) const
> {
>-    TIntermAggregate *constructor = getAsAggregate();
>-    if (!constructor || !constructor->isConstructor())
>-    {
>-        return false;
>-    }
>-    for (TIntermNode *&node : *constructor->getSequence())
>-    {
>-        if (!node->getAsConstantUnion())
>-            return false;
>-    }
>-    return true;
>+    ASSERT(index == 0);
>+    ASSERT(mCondition);
>+    return mCondition;
> }
> 
>-TIntermConstantUnion::TIntermConstantUnion(const TIntermConstantUnion &node) : TIntermTyped(node)
>+bool TIntermCase::replaceChildNode(TIntermNode *original, TIntermNode *replacement)
> {
>-    mUnionArrayPointer = node.mUnionArrayPointer;
>+    REPLACE_IF_IS(mCondition, TIntermTyped, original, replacement);
>+    return false;
> }
> 
>-void TFunctionSymbolInfo::setFromFunction(const TFunction &function)
>+TIntermTyped::TIntermTyped(const TIntermTyped &node) : TIntermNode()
> {
>-    setName(function.getName());
>-    setId(TSymbolUniqueId(function));
>+    // Copy constructor is disallowed for TIntermNode in order to disallow it for subclasses that
>+    // don't explicitly allow it, so normal TIntermNode constructor is used to construct the copy.
>+    // We need to manually copy any fields of TIntermNode.
>+    mLine = node.mLine;
> }
> 
>-TFunctionSymbolInfo::TFunctionSymbolInfo(const TSymbolUniqueId &id)
>-    : mId(new TSymbolUniqueId(id)), mKnownToNotHaveSideEffects(false)
>+bool TIntermTyped::hasConstantValue() const
> {
>+    return false;
> }
> 
>-TFunctionSymbolInfo::TFunctionSymbolInfo(const TFunctionSymbolInfo &info)
>-    : mName(info.mName), mId(nullptr), mKnownToNotHaveSideEffects(info.mKnownToNotHaveSideEffects)
>+const TConstantUnion *TIntermTyped::getConstantValue() const
> {
>-    if (info.mId)
>-    {
>-        mId = new TSymbolUniqueId(*info.mId);
>-    }
>+    return nullptr;
> }
> 
>-TFunctionSymbolInfo &TFunctionSymbolInfo::operator=(const TFunctionSymbolInfo &info)
>+TIntermConstantUnion::TIntermConstantUnion(const TIntermConstantUnion &node)
>+    : TIntermExpression(node)
> {
>-    mName = info.mName;
>-    if (info.mId)
>-    {
>-        mId = new TSymbolUniqueId(*info.mId);
>-    }
>-    else
>-    {
>-        mId = nullptr;
>-    }
>-    return *this;
>+    mUnionArrayPointer = node.mUnionArrayPointer;
> }
> 
>-void TFunctionSymbolInfo::setId(const TSymbolUniqueId &id)
>+TIntermFunctionPrototype::TIntermFunctionPrototype(const TFunction *function)
>+    : TIntermTyped(), mFunction(function)
> {
>-    mId = new TSymbolUniqueId(id);
>+    ASSERT(mFunction->symbolType() != SymbolType::Empty);
> }
> 
>-const TSymbolUniqueId &TFunctionSymbolInfo::getId() const
>+const TType &TIntermFunctionPrototype::getType() const
> {
>-    ASSERT(mId);
>-    return *mId;
>+    return mFunction->getReturnType();
> }
> 
> TIntermAggregate::TIntermAggregate(const TIntermAggregate &node)
>     : TIntermOperator(node),
>       mUseEmulatedFunction(node.mUseEmulatedFunction),
>       mGotPrecisionFromChildren(node.mGotPrecisionFromChildren),
>-      mFunctionInfo(node.mFunctionInfo)
>+      mFunction(node.mFunction)
> {
>     for (TIntermNode *arg : node.mArguments)
>     {
>@@ -629,18 +1026,18 @@ TIntermAggregate *TIntermAggregate::shallowCopy() const
> {
>     TIntermSequence *copySeq = new TIntermSequence();
>     copySeq->insert(copySeq->begin(), getSequence()->begin(), getSequence()->end());
>-    TIntermAggregate *copyNode         = new TIntermAggregate(mType, mOp, copySeq);
>-    *copyNode->getFunctionSymbolInfo() = mFunctionInfo;
>+    TIntermAggregate *copyNode = new TIntermAggregate(mFunction, mType, mOp, copySeq);
>     copyNode->setLine(mLine);
>     return copyNode;
> }
> 
>-TIntermSwizzle::TIntermSwizzle(const TIntermSwizzle &node) : TIntermTyped(node)
>+TIntermSwizzle::TIntermSwizzle(const TIntermSwizzle &node) : TIntermExpression(node)
> {
>     TIntermTyped *operandCopy = node.mOperand->deepCopy();
>     ASSERT(operandCopy != nullptr);
>-    mOperand = operandCopy;
>-    mSwizzleOffsets = node.mSwizzleOffsets;
>+    mOperand                   = operandCopy;
>+    mSwizzleOffsets            = node.mSwizzleOffsets;
>+    mHasFoldedDuplicateOffsets = node.mHasFoldedDuplicateOffsets;
> }
> 
> TIntermBinary::TIntermBinary(const TIntermBinary &node)
>@@ -654,14 +1051,16 @@ TIntermBinary::TIntermBinary(const TIntermBinary &node)
> }
> 
> TIntermUnary::TIntermUnary(const TIntermUnary &node)
>-    : TIntermOperator(node), mUseEmulatedFunction(node.mUseEmulatedFunction)
>+    : TIntermOperator(node),
>+      mUseEmulatedFunction(node.mUseEmulatedFunction),
>+      mFunction(node.mFunction)
> {
>     TIntermTyped *operandCopy = node.mOperand->deepCopy();
>     ASSERT(operandCopy != nullptr);
>     mOperand = operandCopy;
> }
> 
>-TIntermTernary::TIntermTernary(const TIntermTernary &node) : TIntermTyped(node)
>+TIntermTernary::TIntermTernary(const TIntermTernary &node) : TIntermExpression(node)
> {
>     TIntermTyped *conditionCopy = node.mCondition->deepCopy();
>     TIntermTyped *trueCopy      = node.mTrueExpression->deepCopy();
>@@ -861,8 +1260,8 @@ void TIntermUnary::promote()
>                           static_cast<unsigned char>(mOperand->getType().getRows()),
>                           static_cast<unsigned char>(mOperand->getType().getCols())));
>             break;
>-        case EOpIsInf:
>-        case EOpIsNan:
>+        case EOpIsinf:
>+        case EOpIsnan:
>             setType(TType(EbtBool, EbpUndefined, resultQualifier, operandPrimarySize));
>             break;
>         case EOpBitfieldReverse:
>@@ -885,27 +1284,42 @@ void TIntermUnary::promote()
> }
> 
> TIntermSwizzle::TIntermSwizzle(TIntermTyped *operand, const TVector<int> &swizzleOffsets)
>-    : TIntermTyped(TType(EbtFloat, EbpUndefined)),
>+    : TIntermExpression(TType(EbtFloat, EbpUndefined)),
>       mOperand(operand),
>-      mSwizzleOffsets(swizzleOffsets)
>+      mSwizzleOffsets(swizzleOffsets),
>+      mHasFoldedDuplicateOffsets(false)
> {
>+    ASSERT(mOperand);
>     ASSERT(mSwizzleOffsets.size() <= 4);
>     promote();
> }
> 
>-TIntermUnary::TIntermUnary(TOperator op, TIntermTyped *operand)
>-    : TIntermOperator(op), mOperand(operand), mUseEmulatedFunction(false)
>+TIntermUnary::TIntermUnary(TOperator op, TIntermTyped *operand, const TFunction *function)
>+    : TIntermOperator(op), mOperand(operand), mUseEmulatedFunction(false), mFunction(function)
> {
>+    ASSERT(mOperand);
>     promote();
> }
> 
> TIntermBinary::TIntermBinary(TOperator op, TIntermTyped *left, TIntermTyped *right)
>     : TIntermOperator(op), mLeft(left), mRight(right), mAddIndexClamp(false)
> {
>+    ASSERT(mLeft);
>+    ASSERT(mRight);
>     promote();
> }
> 
>-TIntermInvariantDeclaration::TIntermInvariantDeclaration(TIntermSymbol *symbol, const TSourceLoc &line)
>+TIntermBinary *TIntermBinary::CreateComma(TIntermTyped *left,
>+                                          TIntermTyped *right,
>+                                          int shaderVersion)
>+{
>+    TIntermBinary *node = new TIntermBinary(EOpComma, left, right);
>+    node->getTypePointer()->setQualifier(GetCommaQualifier(shaderVersion, left, right));
>+    return node;
>+}
>+
>+TIntermInvariantDeclaration::TIntermInvariantDeclaration(TIntermSymbol *symbol,
>+                                                         const TSourceLoc &line)
>     : TIntermNode(), mSymbol(symbol)
> {
>     ASSERT(symbol);
>@@ -915,11 +1329,14 @@ TIntermInvariantDeclaration::TIntermInvariantDeclaration(TIntermSymbol *symbol,
> TIntermTernary::TIntermTernary(TIntermTyped *cond,
>                                TIntermTyped *trueExpression,
>                                TIntermTyped *falseExpression)
>-    : TIntermTyped(trueExpression->getType()),
>+    : TIntermExpression(trueExpression->getType()),
>       mCondition(cond),
>       mTrueExpression(trueExpression),
>       mFalseExpression(falseExpression)
> {
>+    ASSERT(mCondition);
>+    ASSERT(mTrueExpression);
>+    ASSERT(mFalseExpression);
>     getTypePointer()->setQualifier(
>         TIntermTernary::DetermineQualifier(cond, trueExpression, falseExpression));
> }
>@@ -943,6 +1360,7 @@ TIntermLoop::TIntermLoop(TLoopType type,
> TIntermIfElse::TIntermIfElse(TIntermTyped *cond, TIntermBlock *trueB, TIntermBlock *falseB)
>     : TIntermNode(), mCondition(cond), mTrueBlock(trueB), mFalseBlock(falseB)
> {
>+    ASSERT(mCondition);
>     // Prune empty false blocks so that there won't be unnecessary operations done on it.
>     if (mFalseBlock && mFalseBlock->getSequence()->empty())
>     {
>@@ -953,6 +1371,7 @@ TIntermIfElse::TIntermIfElse(TIntermTyped *cond, TIntermBlock *trueB, TIntermBlo
> TIntermSwitch::TIntermSwitch(TIntermTyped *init, TIntermBlock *statementList)
>     : TIntermNode(), mInit(init), mStatementList(statementList)
> {
>+    ASSERT(mInit);
>     ASSERT(mStatementList);
> }
> 
>@@ -975,18 +1394,16 @@ TQualifier TIntermTernary::DetermineQualifier(TIntermTyped *cond,
>     return EvqTemporary;
> }
> 
>-TIntermTyped *TIntermTernary::fold()
>+TIntermTyped *TIntermTernary::fold(TDiagnostics * /* diagnostics */)
> {
>     if (mCondition->getAsConstantUnion())
>     {
>         if (mCondition->getAsConstantUnion()->getBConst(0))
>         {
>-            mTrueExpression->getTypePointer()->setQualifier(mType.getQualifier());
>             return mTrueExpression;
>         }
>         else
>         {
>-            mFalseExpression->getTypePointer()->setQualifier(mType.getQualifier());
>             return mFalseExpression;
>         }
>     }
>@@ -1006,6 +1423,10 @@ void TIntermSwizzle::promote()
> 
> bool TIntermSwizzle::hasDuplicateOffsets() const
> {
>+    if (mHasFoldedDuplicateOffsets)
>+    {
>+        return true;
>+    }
>     int offsetCount[4] = {0u, 0u, 0u, 0u};
>     for (const auto offset : mSwizzleOffsets)
>     {
>@@ -1018,6 +1439,11 @@ bool TIntermSwizzle::hasDuplicateOffsets() const
>     return false;
> }
> 
>+void TIntermSwizzle::setHasFoldedDuplicateOffsets(bool hasFoldedDuplicateOffsets)
>+{
>+    mHasFoldedDuplicateOffsets = hasFoldedDuplicateOffsets;
>+}
>+
> bool TIntermSwizzle::offsetsMatch(int offset) const
> {
>     return mSwizzleOffsets.size() == 1 && mSwizzleOffsets[0] == offset;
>@@ -1269,26 +1695,38 @@ void TIntermBinary::promote()
>     }
> }
> 
>-const TConstantUnion *TIntermConstantUnion::foldIndexing(int index)
>+bool TIntermConstantUnion::hasConstantValue() const
> {
>-    if (isArray())
>+    return true;
>+}
>+
>+const TConstantUnion *TIntermConstantUnion::getConstantValue() const
>+{
>+    return mUnionArrayPointer;
>+}
>+
>+const TConstantUnion *TIntermConstantUnion::FoldIndexing(const TType &type,
>+                                                         const TConstantUnion *constArray,
>+                                                         int index)
>+{
>+    if (type.isArray())
>     {
>-        ASSERT(index < static_cast<int>(getType().getOutermostArraySize()));
>-        TType arrayElementType = getType();
>+        ASSERT(index < static_cast<int>(type.getOutermostArraySize()));
>+        TType arrayElementType(type);
>         arrayElementType.toArrayElementType();
>         size_t arrayElementSize = arrayElementType.getObjectSize();
>-        return &mUnionArrayPointer[arrayElementSize * index];
>+        return &constArray[arrayElementSize * index];
>     }
>-    else if (isMatrix())
>+    else if (type.isMatrix())
>     {
>-        ASSERT(index < getType().getCols());
>-        int size = getType().getRows();
>-        return &mUnionArrayPointer[size * index];
>+        ASSERT(index < type.getCols());
>+        int size = type.getRows();
>+        return &constArray[size * index];
>     }
>-    else if (isVector())
>+    else if (type.isVector())
>     {
>-        ASSERT(index < getType().getNominalSize());
>-        return &mUnionArrayPointer[index];
>+        ASSERT(index < type.getNominalSize());
>+        return &constArray[index];
>     }
>     else
>     {
>@@ -1297,8 +1735,26 @@ const TConstantUnion *TIntermConstantUnion::foldIndexing(int index)
>     }
> }
> 
>-TIntermTyped *TIntermSwizzle::fold()
>+TIntermTyped *TIntermSwizzle::fold(TDiagnostics * /* diagnostics */)
> {
>+    TIntermSwizzle *operandSwizzle = mOperand->getAsSwizzleNode();
>+    if (operandSwizzle)
>+    {
>+        // We need to fold the two swizzles into one, so that repeated swizzling can't cause stack
>+        // overflow in ParseContext::checkCanBeLValue().
>+        bool hadDuplicateOffsets = operandSwizzle->hasDuplicateOffsets();
>+        TVector<int> foldedOffsets;
>+        for (int offset : mSwizzleOffsets)
>+        {
>+            // Offset should already be validated.
>+            ASSERT(static_cast<size_t>(offset) < operandSwizzle->mSwizzleOffsets.size());
>+            foldedOffsets.push_back(operandSwizzle->mSwizzleOffsets[offset]);
>+        }
>+        operandSwizzle->mSwizzleOffsets = foldedOffsets;
>+        operandSwizzle->setType(getType());
>+        operandSwizzle->setHasFoldedDuplicateOffsets(hadDuplicateOffsets);
>+        return operandSwizzle;
>+    }
>     TIntermConstantUnion *operandConstant = mOperand->getAsConstantUnion();
>     if (operandConstant == nullptr)
>     {
>@@ -1308,15 +1764,15 @@ TIntermTyped *TIntermSwizzle::fold()
>     TConstantUnion *constArray = new TConstantUnion[mSwizzleOffsets.size()];
>     for (size_t i = 0; i < mSwizzleOffsets.size(); ++i)
>     {
>-        constArray[i] = *operandConstant->foldIndexing(mSwizzleOffsets.at(i));
>+        constArray[i] = *TIntermConstantUnion::FoldIndexing(
>+            operandConstant->getType(), operandConstant->getConstantValue(), mSwizzleOffsets.at(i));
>     }
>-    return CreateFoldedNode(constArray, this, mType.getQualifier());
>+    return CreateFoldedNode(constArray, this);
> }
> 
> TIntermTyped *TIntermBinary::fold(TDiagnostics *diagnostics)
> {
>-    TIntermConstantUnion *leftConstant  = mLeft->getAsConstantUnion();
>-    TIntermConstantUnion *rightConstant = mRight->getAsConstantUnion();
>+    const TConstantUnion *rightConstant = mRight->getConstantValue();
>     switch (mOp)
>     {
>         case EOpComma:
>@@ -1325,63 +1781,127 @@ TIntermTyped *TIntermBinary::fold(TDiagnostics *diagnostics)
>             {
>                 return this;
>             }
>-            mRight->getTypePointer()->setQualifier(mType.getQualifier());
>             return mRight;
>         }
>         case EOpIndexDirect:
>+        case EOpIndexDirectStruct:
>         {
>-            if (leftConstant == nullptr || rightConstant == nullptr)
>-            {
>-                return this;
>-            }
>-            int index = rightConstant->getIConst(0);
>-
>-            const TConstantUnion *constArray = leftConstant->foldIndexing(index);
>-            if (!constArray)
>+            if (rightConstant == nullptr)
>             {
>                 return this;
>             }
>-            return CreateFoldedNode(constArray, this, mType.getQualifier());
>-        }
>-        case EOpIndexDirectStruct:
>-        {
>-            if (leftConstant == nullptr || rightConstant == nullptr)
>+            size_t index                    = static_cast<size_t>(rightConstant->getIConst());
>+            TIntermAggregate *leftAggregate = mLeft->getAsAggregate();
>+            if (leftAggregate && leftAggregate->isConstructor() && leftAggregate->isArray() &&
>+                !leftAggregate->hasSideEffects())
>             {
>-                return this;
>+                ASSERT(index < leftAggregate->getSequence()->size());
>+                // This transformation can't add complexity as we're eliminating the constructor
>+                // entirely.
>+                return leftAggregate->getSequence()->at(index)->getAsTyped();
>             }
>-            const TFieldList &fields = mLeft->getType().getStruct()->fields();
>-            size_t index             = static_cast<size_t>(rightConstant->getIConst(0));
> 
>-            size_t previousFieldsSize = 0;
>-            for (size_t i = 0; i < index; ++i)
>+            // If the indexed value is already a constant union, we can't increase duplication of
>+            // data by folding the indexing. Also fold the node in case it's generally beneficial to
>+            // replace this type of node with a constant union even if that would mean duplicating
>+            // data.
>+            if (mLeft->getAsConstantUnion() || getType().canReplaceWithConstantUnion())
>             {
>-                previousFieldsSize += fields[i]->type()->getObjectSize();
>+                const TConstantUnion *constantValue = getConstantValue();
>+                if (constantValue == nullptr)
>+                {
>+                    return this;
>+                }
>+                return CreateFoldedNode(constantValue, this);
>             }
>-
>-            const TConstantUnion *constArray = leftConstant->getUnionArrayPointer();
>-            return CreateFoldedNode(constArray + previousFieldsSize, this, mType.getQualifier());
>+            return this;
>         }
>         case EOpIndexIndirect:
>         case EOpIndexDirectInterfaceBlock:
>+        case EOpInitialize:
>             // Can never be constant folded.
>             return this;
>         default:
>         {
>-            if (leftConstant == nullptr || rightConstant == nullptr)
>+            if (rightConstant == nullptr)
>+            {
>+                return this;
>+            }
>+            const TConstantUnion *leftConstant = mLeft->getConstantValue();
>+            if (leftConstant == nullptr)
>             {
>                 return this;
>             }
>-            TConstantUnion *constArray =
>-                leftConstant->foldBinary(mOp, rightConstant, diagnostics, mLeft->getLine());
>+            const TConstantUnion *constArray =
>+                TIntermConstantUnion::FoldBinary(mOp, leftConstant, mLeft->getType(), rightConstant,
>+                                                 mRight->getType(), diagnostics, mLeft->getLine());
>             if (!constArray)
>             {
>                 return this;
>             }
>+            return CreateFoldedNode(constArray, this);
>+        }
>+    }
>+}
>+
>+bool TIntermBinary::hasConstantValue() const
>+{
>+    switch (mOp)
>+    {
>+        case EOpIndexDirect:
>+        case EOpIndexDirectStruct:
>+        {
>+            if (mLeft->hasConstantValue() && mRight->hasConstantValue())
>+            {
>+                return true;
>+            }
>+            break;
>+        }
>+        default:
>+            break;
>+    }
>+    return false;
>+}
> 
>-            // Nodes may be constant folded without being qualified as constant.
>-            return CreateFoldedNode(constArray, this, mType.getQualifier());
>+const TConstantUnion *TIntermBinary::getConstantValue() const
>+{
>+    if (!hasConstantValue())
>+    {
>+        return nullptr;
>+    }
>+
>+    const TConstantUnion *leftConstantValue   = mLeft->getConstantValue();
>+    int index                                 = mRight->getConstantValue()->getIConst();
>+    const TConstantUnion *constIndexingResult = nullptr;
>+    if (mOp == EOpIndexDirect)
>+    {
>+        constIndexingResult =
>+            TIntermConstantUnion::FoldIndexing(mLeft->getType(), leftConstantValue, index);
>+    }
>+    else
>+    {
>+        ASSERT(mOp == EOpIndexDirectStruct);
>+        const TFieldList &fields = mLeft->getType().getStruct()->fields();
>+
>+        size_t previousFieldsSize = 0;
>+        for (int i = 0; i < index; ++i)
>+        {
>+            previousFieldsSize += fields[i]->type()->getObjectSize();
>         }
>+        constIndexingResult = leftConstantValue + previousFieldsSize;
>     }
>+    return constIndexingResult;
>+}
>+
>+const ImmutableString &TIntermBinary::getIndexStructFieldName() const
>+{
>+    ASSERT(mOp == EOpIndexDirectStruct);
>+
>+    const TType &lhsType        = mLeft->getType();
>+    const TStructure *structure = lhsType.getStruct();
>+    const int index             = mRight->getAsConstantUnion()->getIConst(0);
>+
>+    return structure->fields()[index]->name();
> }
> 
> TIntermTyped *TIntermUnary::fold(TDiagnostics *diagnostics)
>@@ -1435,9 +1955,7 @@ TIntermTyped *TIntermUnary::fold(TDiagnostics *diagnostics)
>     {
>         return this;
>     }
>-
>-    // Nodes may be constant folded without being qualified as constant.
>-    return CreateFoldedNode(constArray, this, mType.getQualifier());
>+    return CreateFoldedNode(constArray, this);
> }
> 
> TIntermTyped *TIntermAggregate::fold(TDiagnostics *diagnostics)
>@@ -1450,14 +1968,49 @@ TIntermTyped *TIntermAggregate::fold(TDiagnostics *diagnostics)
>             return this;
>         }
>     }
>-    TConstantUnion *constArray = nullptr;
>+    const TConstantUnion *constArray = nullptr;
>     if (isConstructor())
>-        constArray = TIntermConstantUnion::FoldAggregateConstructor(this);
>-    else
>+    {
>+        if (mType.canReplaceWithConstantUnion())
>+        {
>+            constArray = getConstantValue();
>+            if (constArray && mType.getBasicType() == EbtUInt)
>+            {
>+                // Check if we converted a negative float to uint and issue a warning in that case.
>+                size_t sizeRemaining = mType.getObjectSize();
>+                for (TIntermNode *arg : mArguments)
>+                {
>+                    TIntermTyped *typedArg = arg->getAsTyped();
>+                    if (typedArg->getBasicType() == EbtFloat)
>+                    {
>+                        const TConstantUnion *argValue = typedArg->getConstantValue();
>+                        size_t castSize =
>+                            std::min(typedArg->getType().getObjectSize(), sizeRemaining);
>+                        for (size_t i = 0; i < castSize; ++i)
>+                        {
>+                            if (argValue[i].getFConst() < 0.0f)
>+                            {
>+                                // ESSL 3.00.6 section 5.4.1.
>+                                diagnostics->warning(
>+                                    mLine, "casting a negative float to uint is undefined",
>+                                    mType.getBuiltInTypeNameString());
>+                            }
>+                        }
>+                    }
>+                    sizeRemaining -= typedArg->getType().getObjectSize();
>+                }
>+            }
>+        }
>+    }
>+    else if (CanFoldAggregateBuiltInOp(mOp))
>+    {
>         constArray = TIntermConstantUnion::FoldAggregateBuiltIn(this, diagnostics);
>-
>-    // Nodes may be constant folded without being qualified as constant.
>-    return CreateFoldedNode(constArray, this, getQualifier());
>+    }
>+    if (constArray == nullptr)
>+    {
>+        return this;
>+    }
>+    return CreateFoldedNode(constArray, this);
> }
> 
> //
>@@ -1466,28 +2019,28 @@ TIntermTyped *TIntermAggregate::fold(TDiagnostics *diagnostics)
> //
> // Returns the constant value to keep using or nullptr.
> //
>-TConstantUnion *TIntermConstantUnion::foldBinary(TOperator op,
>-                                                 TIntermConstantUnion *rightNode,
>-                                                 TDiagnostics *diagnostics,
>-                                                 const TSourceLoc &line)
>+const TConstantUnion *TIntermConstantUnion::FoldBinary(TOperator op,
>+                                                       const TConstantUnion *leftArray,
>+                                                       const TType &leftType,
>+                                                       const TConstantUnion *rightArray,
>+                                                       const TType &rightType,
>+                                                       TDiagnostics *diagnostics,
>+                                                       const TSourceLoc &line)
> {
>-    const TConstantUnion *leftArray  = getUnionArrayPointer();
>-    const TConstantUnion *rightArray = rightNode->getUnionArrayPointer();
>-
>     ASSERT(leftArray && rightArray);
> 
>-    size_t objectSize = getType().getObjectSize();
>+    size_t objectSize = leftType.getObjectSize();
> 
>     // for a case like float f = vec4(2, 3, 4, 5) + 1.2;
>-    if (rightNode->getType().getObjectSize() == 1 && objectSize > 1)
>+    if (rightType.getObjectSize() == 1 && objectSize > 1)
>     {
>-        rightArray = Vectorize(*rightNode->getUnionArrayPointer(), objectSize);
>+        rightArray = Vectorize(*rightArray, objectSize);
>     }
>-    else if (rightNode->getType().getObjectSize() > 1 && objectSize == 1)
>+    else if (rightType.getObjectSize() > 1 && objectSize == 1)
>     {
>         // for a case like float f = 1.2 + vec4(2, 3, 4, 5);
>-        leftArray  = Vectorize(*getUnionArrayPointer(), rightNode->getType().getObjectSize());
>-        objectSize = rightNode->getType().getObjectSize();
>+        leftArray  = Vectorize(*leftArray, rightType.getObjectSize());
>+        objectSize = rightType.getObjectSize();
>     }
> 
>     TConstantUnion *resultArray = nullptr;
>@@ -1519,12 +2072,12 @@ TConstantUnion *TIntermConstantUnion::foldBinary(TOperator op,
>         case EOpMatrixTimesMatrix:
>         {
>             // TODO(jmadll): This code should check for overflows.
>-            ASSERT(getType().getBasicType() == EbtFloat && rightNode->getBasicType() == EbtFloat);
>+            ASSERT(leftType.getBasicType() == EbtFloat && rightType.getBasicType() == EbtFloat);
> 
>-            const int leftCols   = getCols();
>-            const int leftRows   = getRows();
>-            const int rightCols  = rightNode->getType().getCols();
>-            const int rightRows  = rightNode->getType().getRows();
>+            const int leftCols   = leftType.getCols();
>+            const int leftRows   = leftType.getRows();
>+            const int rightCols  = rightType.getCols();
>+            const int rightRows  = rightType.getRows();
>             const int resultCols = rightCols;
>             const int resultRows = leftRows;
> 
>@@ -1552,7 +2105,7 @@ TConstantUnion *TIntermConstantUnion::foldBinary(TOperator op,
>             resultArray = new TConstantUnion[objectSize];
>             for (size_t i = 0; i < objectSize; i++)
>             {
>-                switch (getType().getBasicType())
>+                switch (leftType.getBasicType())
>                 {
>                     case EbtFloat:
>                     {
>@@ -1564,15 +2117,15 @@ TConstantUnion *TIntermConstantUnion::foldBinary(TOperator op,
>                             if (dividend == 0.0f)
>                             {
>                                 diagnostics->warning(
>-                                    getLine(),
>+                                    line,
>                                     "Zero divided by zero during constant folding generated NaN",
>                                     "/");
>                                 resultArray[i].setFConst(std::numeric_limits<float>::quiet_NaN());
>                             }
>                             else
>                             {
>-                                diagnostics->warning(getLine(),
>-                                                     "Divide by zero during constant folding", "/");
>+                                diagnostics->warning(line, "Divide by zero during constant folding",
>+                                                     "/");
>                                 bool negativeResult =
>                                     std::signbit(dividend) != std::signbit(divisor);
>                                 resultArray[i].setFConst(
>@@ -1582,7 +2135,7 @@ TConstantUnion *TIntermConstantUnion::foldBinary(TOperator op,
>                         }
>                         else if (gl::isInf(dividend) && gl::isInf(divisor))
>                         {
>-                            diagnostics->warning(getLine(),
>+                            diagnostics->warning(line,
>                                                  "Infinity divided by infinity during constant "
>                                                  "folding generated NaN",
>                                                  "/");
>@@ -1594,8 +2147,7 @@ TConstantUnion *TIntermConstantUnion::foldBinary(TOperator op,
>                             if (!gl::isInf(dividend) && gl::isInf(result))
>                             {
>                                 diagnostics->warning(
>-                                    getLine(), "Constant folded division overflowed to infinity",
>-                                    "/");
>+                                    line, "Constant folded division overflowed to infinity", "/");
>                             }
>                             resultArray[i].setFConst(result);
>                         }
>@@ -1605,7 +2157,7 @@ TConstantUnion *TIntermConstantUnion::foldBinary(TOperator op,
>                         if (rightArray[i] == 0)
>                         {
>                             diagnostics->warning(
>-                                getLine(), "Divide by zero error during constant folding", "/");
>+                                line, "Divide by zero error during constant folding", "/");
>                             resultArray[i].setIConst(INT_MAX);
>                         }
>                         else
>@@ -1637,11 +2189,11 @@ TConstantUnion *TIntermConstantUnion::foldBinary(TOperator op,
>                                 if (lhs < 0 || divisor < 0)
>                                 {
>                                     // ESSL 3.00.6 section 5.9: Results of modulus are undefined
>-                                    // when
>-                                    // either one of the operands is negative.
>-                                    diagnostics->warning(getLine(),
>+                                    // when either one of the operands is negative.
>+                                    diagnostics->warning(line,
>                                                          "Negative modulus operator operand "
>-                                                         "encountered during constant folding",
>+                                                         "encountered during constant folding. "
>+                                                         "Results are undefined.",
>                                                          "%");
>                                     resultArray[i].setIConst(0);
>                                 }
>@@ -1657,7 +2209,7 @@ TConstantUnion *TIntermConstantUnion::foldBinary(TOperator op,
>                         if (rightArray[i] == 0)
>                         {
>                             diagnostics->warning(
>-                                getLine(), "Divide by zero error during constant folding", "/");
>+                                line, "Divide by zero error during constant folding", "/");
>                             resultArray[i].setUConst(UINT_MAX);
>                         }
>                         else
>@@ -1687,10 +2239,10 @@ TConstantUnion *TIntermConstantUnion::foldBinary(TOperator op,
>         case EOpMatrixTimesVector:
>         {
>             // TODO(jmadll): This code should check for overflows.
>-            ASSERT(rightNode->getBasicType() == EbtFloat);
>+            ASSERT(rightType.getBasicType() == EbtFloat);
> 
>-            const int matrixCols = getCols();
>-            const int matrixRows = getRows();
>+            const int matrixCols = leftType.getCols();
>+            const int matrixRows = leftType.getRows();
> 
>             resultArray = new TConstantUnion[matrixRows];
> 
>@@ -1711,10 +2263,10 @@ TConstantUnion *TIntermConstantUnion::foldBinary(TOperator op,
>         case EOpVectorTimesMatrix:
>         {
>             // TODO(jmadll): This code should check for overflows.
>-            ASSERT(getType().getBasicType() == EbtFloat);
>+            ASSERT(leftType.getBasicType() == EbtFloat);
> 
>-            const int matrixCols = rightNode->getType().getCols();
>-            const int matrixRows = rightNode->getType().getRows();
>+            const int matrixCols = rightType.getCols();
>+            const int matrixRows = rightType.getRows();
> 
>             resultArray = new TConstantUnion[matrixCols];
> 
>@@ -1754,7 +2306,7 @@ TConstantUnion *TIntermConstantUnion::foldBinary(TOperator op,
> 
>         case EOpLogicalXor:
>         {
>-            ASSERT(getType().getBasicType() == EbtBool);
>+            ASSERT(leftType.getBasicType() == EbtBool);
>             resultArray = new TConstantUnion[objectSize];
>             for (size_t i = 0; i < objectSize; i++)
>             {
>@@ -1765,17 +2317,17 @@ TConstantUnion *TIntermConstantUnion::foldBinary(TOperator op,
> 
>         case EOpBitwiseAnd:
>             resultArray = new TConstantUnion[objectSize];
>-            for (size_t i      = 0; i < objectSize; i++)
>+            for (size_t i = 0; i < objectSize; i++)
>                 resultArray[i] = leftArray[i] & rightArray[i];
>             break;
>         case EOpBitwiseXor:
>             resultArray = new TConstantUnion[objectSize];
>-            for (size_t i      = 0; i < objectSize; i++)
>+            for (size_t i = 0; i < objectSize; i++)
>                 resultArray[i] = leftArray[i] ^ rightArray[i];
>             break;
>         case EOpBitwiseOr:
>             resultArray = new TConstantUnion[objectSize];
>-            for (size_t i      = 0; i < objectSize; i++)
>+            for (size_t i = 0; i < objectSize; i++)
>                 resultArray[i] = leftArray[i] | rightArray[i];
>             break;
>         case EOpBitShiftLeft:
>@@ -1853,7 +2405,7 @@ TConstantUnion *TIntermConstantUnion::foldUnaryNonComponentWise(TOperator op)
>     // Do operations where the return type may have a different number of components compared to the
>     // operand type.
> 
>-    const TConstantUnion *operandArray = getUnionArrayPointer();
>+    const TConstantUnion *operandArray = getConstantValue();
>     ASSERT(operandArray);
> 
>     size_t objectSize           = getType().getObjectSize();
>@@ -2040,7 +2592,7 @@ TConstantUnion *TIntermConstantUnion::foldUnaryComponentWise(TOperator op,
>     // component of the operand. Also folds normalize, though the divisor in that case takes all
>     // components into account.
> 
>-    const TConstantUnion *operandArray = getUnionArrayPointer();
>+    const TConstantUnion *operandArray = getConstantValue();
>     ASSERT(operandArray);
> 
>     size_t objectSize = getType().getObjectSize();
>@@ -2299,12 +2851,12 @@ TConstantUnion *TIntermConstantUnion::foldUnaryComponentWise(TOperator op,
>                 break;
>             }
> 
>-            case EOpIsNan:
>+            case EOpIsnan:
>                 ASSERT(getType().getBasicType() == EbtFloat);
>                 resultArray[i].setBConst(gl::isNaN(operandArray[0].getFConst()));
>                 break;
> 
>-            case EOpIsInf:
>+            case EOpIsinf:
>                 ASSERT(getType().getBasicType() == EbtFloat);
>                 resultArray[i].setBConst(gl::isInf(operandArray[0].getFConst()));
>                 break;
>@@ -2369,7 +2921,7 @@ TConstantUnion *TIntermConstantUnion::foldUnaryComponentWise(TOperator op,
>                     foldFloatTypeUnary(operandArray[i], &sqrtf, &resultArray[i]);
>                 break;
> 
>-            case EOpInverseSqrt:
>+            case EOpInversesqrt:
>                 // There is no stdlib built-in function equavalent for GLES built-in inversesqrt(),
>                 // so getting the square root first using builtin function sqrt() and then taking
>                 // its inverse.
>@@ -2504,146 +3056,11 @@ void TIntermConstantUnion::foldFloatTypeUnary(const TConstantUnion &parameter,
>     result->setFConst(builtinFunc(parameter.getFConst()));
> }
> 
>-// static
>-TConstantUnion *TIntermConstantUnion::FoldAggregateConstructor(TIntermAggregate *aggregate)
>-{
>-    ASSERT(aggregate->getSequence()->size() > 0u);
>-    size_t resultSize           = aggregate->getType().getObjectSize();
>-    TConstantUnion *resultArray = new TConstantUnion[resultSize];
>-    TBasicType basicType        = aggregate->getBasicType();
>-
>-    size_t resultIndex = 0u;
>-
>-    if (aggregate->getSequence()->size() == 1u)
>-    {
>-        TIntermNode *argument                    = aggregate->getSequence()->front();
>-        TIntermConstantUnion *argumentConstant   = argument->getAsConstantUnion();
>-        const TConstantUnion *argumentUnionArray = argumentConstant->getUnionArrayPointer();
>-        // Check the special case of constructing a matrix diagonal from a single scalar,
>-        // or a vector from a single scalar.
>-        if (argumentConstant->getType().getObjectSize() == 1u)
>-        {
>-            if (aggregate->isMatrix())
>-            {
>-                int resultCols = aggregate->getType().getCols();
>-                int resultRows = aggregate->getType().getRows();
>-                for (int col = 0; col < resultCols; ++col)
>-                {
>-                    for (int row = 0; row < resultRows; ++row)
>-                    {
>-                        if (col == row)
>-                        {
>-                            resultArray[resultIndex].cast(basicType, argumentUnionArray[0]);
>-                        }
>-                        else
>-                        {
>-                            resultArray[resultIndex].setFConst(0.0f);
>-                        }
>-                        ++resultIndex;
>-                    }
>-                }
>-            }
>-            else
>-            {
>-                while (resultIndex < resultSize)
>-                {
>-                    resultArray[resultIndex].cast(basicType, argumentUnionArray[0]);
>-                    ++resultIndex;
>-                }
>-            }
>-            ASSERT(resultIndex == resultSize);
>-            return resultArray;
>-        }
>-        else if (aggregate->isMatrix() && argumentConstant->isMatrix())
>-        {
>-            // The special case of constructing a matrix from a matrix.
>-            int argumentCols = argumentConstant->getType().getCols();
>-            int argumentRows = argumentConstant->getType().getRows();
>-            int resultCols   = aggregate->getType().getCols();
>-            int resultRows   = aggregate->getType().getRows();
>-            for (int col = 0; col < resultCols; ++col)
>-            {
>-                for (int row = 0; row < resultRows; ++row)
>-                {
>-                    if (col < argumentCols && row < argumentRows)
>-                    {
>-                        resultArray[resultIndex].cast(basicType,
>-                                                      argumentUnionArray[col * argumentRows + row]);
>-                    }
>-                    else if (col == row)
>-                    {
>-                        resultArray[resultIndex].setFConst(1.0f);
>-                    }
>-                    else
>-                    {
>-                        resultArray[resultIndex].setFConst(0.0f);
>-                    }
>-                    ++resultIndex;
>-                }
>-            }
>-            ASSERT(resultIndex == resultSize);
>-            return resultArray;
>-        }
>-    }
>-
>-    for (TIntermNode *&argument : *aggregate->getSequence())
>-    {
>-        TIntermConstantUnion *argumentConstant   = argument->getAsConstantUnion();
>-        size_t argumentSize                      = argumentConstant->getType().getObjectSize();
>-        const TConstantUnion *argumentUnionArray = argumentConstant->getUnionArrayPointer();
>-        for (size_t i = 0u; i < argumentSize; ++i)
>-        {
>-            if (resultIndex >= resultSize)
>-                break;
>-            resultArray[resultIndex].cast(basicType, argumentUnionArray[i]);
>-            ++resultIndex;
>-        }
>-    }
>-    ASSERT(resultIndex == resultSize);
>-    return resultArray;
>-}
>-
>-bool TIntermAggregate::CanFoldAggregateBuiltInOp(TOperator op)
>-{
>-    switch (op)
>-    {
>-        case EOpAtan:
>-        case EOpPow:
>-        case EOpMod:
>-        case EOpMin:
>-        case EOpMax:
>-        case EOpClamp:
>-        case EOpMix:
>-        case EOpStep:
>-        case EOpSmoothStep:
>-        case EOpLdexp:
>-        case EOpMulMatrixComponentWise:
>-        case EOpOuterProduct:
>-        case EOpEqualComponentWise:
>-        case EOpNotEqualComponentWise:
>-        case EOpLessThanComponentWise:
>-        case EOpLessThanEqualComponentWise:
>-        case EOpGreaterThanComponentWise:
>-        case EOpGreaterThanEqualComponentWise:
>-        case EOpDistance:
>-        case EOpDot:
>-        case EOpCross:
>-        case EOpFaceforward:
>-        case EOpReflect:
>-        case EOpRefract:
>-        case EOpBitfieldExtract:
>-        case EOpBitfieldInsert:
>-            return true;
>-        default:
>-            return false;
>-    }
>-}
>-
> // static
> TConstantUnion *TIntermConstantUnion::FoldAggregateBuiltIn(TIntermAggregate *aggregate,
>                                                            TDiagnostics *diagnostics)
> {
>-    TOperator op              = aggregate->getOp();
>+    TOperator op               = aggregate->getOp();
>     TIntermSequence *arguments = aggregate->getSequence();
>     unsigned int argsCount     = static_cast<unsigned int>(arguments->size());
>     std::vector<const TConstantUnion *> unionArrays(argsCount);
>@@ -2661,7 +3078,7 @@ TConstantUnion *TIntermConstantUnion::FoldAggregateBuiltIn(TIntermAggregate *agg
>             basicType = argConstant->getType().getBasicType();
>             loc       = argConstant->getLine();
>         }
>-        unionArrays[i] = argConstant->getUnionArrayPointer();
>+        unionArrays[i] = argConstant->getConstantValue();
>         objectSizes[i] = argConstant->getType().getObjectSize();
>         if (objectSizes[i] > maxObjectSize)
>             maxObjectSize = objectSizes[i];
>@@ -3021,10 +3438,12 @@ TConstantUnion *TIntermConstantUnion::FoldAggregateBuiltIn(TIntermAggregate *agg
>             ASSERT(basicType == EbtFloat && (*arguments)[0]->getAsTyped()->isMatrix() &&
>                    (*arguments)[1]->getAsTyped()->isMatrix());
>             // Perform component-wise matrix multiplication.
>-            resultArray = new TConstantUnion[maxObjectSize];
>-            int size    = (*arguments)[0]->getAsTyped()->getNominalSize();
>-            angle::Matrix<float> result =
>-                GetMatrix(unionArrays[0], size).compMult(GetMatrix(unionArrays[1], size));
>+            resultArray                 = new TConstantUnion[maxObjectSize];
>+            int rows                    = (*arguments)[0]->getAsTyped()->getRows();
>+            int cols                    = (*arguments)[0]->getAsTyped()->getCols();
>+            angle::Matrix<float> lhs    = GetMatrix(unionArrays[0], rows, cols);
>+            angle::Matrix<float> rhs    = GetMatrix(unionArrays[1], rows, cols);
>+            angle::Matrix<float> result = lhs.compMult(rhs);
>             SetUnionArrayFromMatrix(result, resultArray);
>             break;
>         }
>@@ -3127,7 +3546,7 @@ TConstantUnion *TIntermConstantUnion::FoldAggregateBuiltIn(TIntermAggregate *agg
>             break;
>         }
> 
>-        case EOpSmoothStep:
>+        case EOpSmoothstep:
>         {
>             ASSERT(basicType == EbtFloat);
>             resultArray = new TConstantUnion[maxObjectSize];
>@@ -3327,4 +3746,22 @@ TConstantUnion *TIntermConstantUnion::FoldAggregateBuiltIn(TIntermAggregate *agg
>     return resultArray;
> }
> 
>+// TIntermPreprocessorDirective implementation.
>+TIntermPreprocessorDirective::TIntermPreprocessorDirective(PreprocessorDirective directive,
>+                                                           ImmutableString command)
>+    : mDirective(directive), mCommand(std::move(command))
>+{}
>+
>+TIntermPreprocessorDirective::~TIntermPreprocessorDirective() = default;
>+
>+size_t TIntermPreprocessorDirective::getChildCount() const
>+{
>+    return 0;
>+}
>+
>+TIntermNode *TIntermPreprocessorDirective::getChildNode(size_t index) const
>+{
>+    UNREACHABLE();
>+    return nullptr;
>+}
> }  // namespace sh
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/IntermNode.h b/Source/ThirdParty/ANGLE/src/compiler/translator/IntermNode.h
>index 2170916201b..2380599a09f 100644
>--- a/Source/ThirdParty/ANGLE/src/compiler/translator/IntermNode.h
>+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/IntermNode.h
>@@ -24,9 +24,11 @@
> #include "common/angleutils.h"
> #include "compiler/translator/Common.h"
> #include "compiler/translator/ConstantUnion.h"
>+#include "compiler/translator/ImmutableString.h"
> #include "compiler/translator/Operator.h"
> #include "compiler/translator/SymbolUniqueId.h"
> #include "compiler/translator/Types.h"
>+#include "compiler/translator/tree_util/Visit.h"
> 
> namespace sh
> {
>@@ -53,32 +55,12 @@ class TIntermSymbol;
> class TIntermLoop;
> class TInfoSink;
> class TInfoSinkBase;
>-class TIntermRaw;
> class TIntermBranch;
>+class TIntermPreprocessorDirective;
> 
> class TSymbolTable;
> class TFunction;
>-
>-// Encapsulate an identifier string and track whether it is coming from the original shader code
>-// (not internal) or from ANGLE (internal). Usually internal names shouldn't be decorated or hashed.
>-class TName
>-{
>-  public:
>-    POOL_ALLOCATOR_NEW_DELETE();
>-    explicit TName(const TString &name) : mName(name), mIsInternal(false) {}
>-    TName() : mName(), mIsInternal(false) {}
>-    TName(const TName &) = default;
>-    TName &operator=(const TName &) = default;
>-
>-    const TString &getString() const { return mName; }
>-    void setString(const TString &string) { mName = string; }
>-    bool isInternal() const { return mIsInternal; }
>-    void setInternal(bool isInternal) { mIsInternal = isInternal; }
>-
>-  private:
>-    TString mName;
>-    bool mIsInternal;
>-};
>+class TVariable;
> 
> //
> // Base class for the tree nodes
>@@ -86,7 +68,7 @@ class TName
> class TIntermNode : angle::NonCopyable
> {
>   public:
>-    POOL_ALLOCATOR_NEW_DELETE();
>+    POOL_ALLOCATOR_NEW_DELETE
>     TIntermNode()
>     {
>         // TODO: Move this to TSourceLoc constructor
>@@ -99,27 +81,31 @@ class TIntermNode : angle::NonCopyable
>     const TSourceLoc &getLine() const { return mLine; }
>     void setLine(const TSourceLoc &l) { mLine = l; }
> 
>-    virtual void traverse(TIntermTraverser *) = 0;
>-    virtual TIntermTyped *getAsTyped() { return 0; }
>-    virtual TIntermConstantUnion *getAsConstantUnion() { return 0; }
>+    virtual void traverse(TIntermTraverser *it);
>+    virtual bool visit(Visit visit, TIntermTraverser *it) = 0;
>+
>+    virtual TIntermTyped *getAsTyped() { return nullptr; }
>+    virtual TIntermConstantUnion *getAsConstantUnion() { return nullptr; }
>     virtual TIntermFunctionDefinition *getAsFunctionDefinition() { return nullptr; }
>-    virtual TIntermAggregate *getAsAggregate() { return 0; }
>+    virtual TIntermAggregate *getAsAggregate() { return nullptr; }
>     virtual TIntermBlock *getAsBlock() { return nullptr; }
>     virtual TIntermFunctionPrototype *getAsFunctionPrototypeNode() { return nullptr; }
>     virtual TIntermInvariantDeclaration *getAsInvariantDeclarationNode() { return nullptr; }
>     virtual TIntermDeclaration *getAsDeclarationNode() { return nullptr; }
>     virtual TIntermSwizzle *getAsSwizzleNode() { return nullptr; }
>-    virtual TIntermBinary *getAsBinaryNode() { return 0; }
>-    virtual TIntermUnary *getAsUnaryNode() { return 0; }
>+    virtual TIntermBinary *getAsBinaryNode() { return nullptr; }
>+    virtual TIntermUnary *getAsUnaryNode() { return nullptr; }
>     virtual TIntermTernary *getAsTernaryNode() { return nullptr; }
>     virtual TIntermIfElse *getAsIfElseNode() { return nullptr; }
>-    virtual TIntermSwitch *getAsSwitchNode() { return 0; }
>-    virtual TIntermCase *getAsCaseNode() { return 0; }
>-    virtual TIntermSymbol *getAsSymbolNode() { return 0; }
>-    virtual TIntermLoop *getAsLoopNode() { return 0; }
>-    virtual TIntermRaw *getAsRawNode() { return 0; }
>-    virtual TIntermBranch *getAsBranchNode() { return 0; }
>-
>+    virtual TIntermSwitch *getAsSwitchNode() { return nullptr; }
>+    virtual TIntermCase *getAsCaseNode() { return nullptr; }
>+    virtual TIntermSymbol *getAsSymbolNode() { return nullptr; }
>+    virtual TIntermLoop *getAsLoopNode() { return nullptr; }
>+    virtual TIntermBranch *getAsBranchNode() { return nullptr; }
>+    virtual TIntermPreprocessorDirective *getAsPreprocessorDirective() { return nullptr; }
>+
>+    virtual size_t getChildCount() const                  = 0;
>+    virtual TIntermNode *getChildNode(size_t index) const = 0;
>     // Replace a child node. Return true if |original| is a child
>     // node and it is replaced; otherwise, return false.
>     virtual bool replaceChildNode(TIntermNode *original, TIntermNode *replacement) = 0;
>@@ -143,47 +129,47 @@ struct TIntermNodePair
> class TIntermTyped : public TIntermNode
> {
>   public:
>-    TIntermTyped(const TType &t) : mType(t) {}
>+    TIntermTyped() {}
> 
>     virtual TIntermTyped *deepCopy() const = 0;
> 
>     TIntermTyped *getAsTyped() override { return this; }
> 
>+    virtual TIntermTyped *fold(TDiagnostics *diagnostics) { return this; }
>+
>+    // getConstantValue() returns the constant value that this node represents, if any. It
>+    // should only be used after nodes have been replaced with their folded versions returned
>+    // from fold(). hasConstantValue() returns true if getConstantValue() will return a value.
>+    virtual bool hasConstantValue() const;
>+    virtual const TConstantUnion *getConstantValue() const;
>+
>     // True if executing the expression represented by this node affects state, like values of
>     // variables. False if the executing the expression only computes its return value without
>     // affecting state. May return true conservatively.
>     virtual bool hasSideEffects() const = 0;
> 
>-    void setType(const TType &t) { mType = t; }
>-    void setTypePreservePrecision(const TType &t);
>-    const TType &getType() const { return mType; }
>-    TType *getTypePointer() { return &mType; }
>-
>-    TBasicType getBasicType() const { return mType.getBasicType(); }
>-    TQualifier getQualifier() const { return mType.getQualifier(); }
>-    TPrecision getPrecision() const { return mType.getPrecision(); }
>-    TMemoryQualifier getMemoryQualifier() const { return mType.getMemoryQualifier(); }
>-    int getCols() const { return mType.getCols(); }
>-    int getRows() const { return mType.getRows(); }
>-    int getNominalSize() const { return mType.getNominalSize(); }
>-    int getSecondarySize() const { return mType.getSecondarySize(); }
>+    virtual const TType &getType() const = 0;
> 
>-    bool isInterfaceBlock() const { return mType.isInterfaceBlock(); }
>-    bool isMatrix() const { return mType.isMatrix(); }
>-    bool isArray() const { return mType.isArray(); }
>-    bool isVector() const { return mType.isVector(); }
>-    bool isScalar() const { return mType.isScalar(); }
>-    bool isScalarInt() const { return mType.isScalarInt(); }
>-    const char *getBasicString() const { return mType.getBasicString(); }
>-    TString getCompleteString() const { return mType.getCompleteString(); }
>+    TBasicType getBasicType() const { return getType().getBasicType(); }
>+    TQualifier getQualifier() const { return getType().getQualifier(); }
>+    TPrecision getPrecision() const { return getType().getPrecision(); }
>+    TMemoryQualifier getMemoryQualifier() const { return getType().getMemoryQualifier(); }
>+    int getCols() const { return getType().getCols(); }
>+    int getRows() const { return getType().getRows(); }
>+    int getNominalSize() const { return getType().getNominalSize(); }
>+    int getSecondarySize() const { return getType().getSecondarySize(); }
> 
>-    unsigned int getOutermostArraySize() const { return mType.getOutermostArraySize(); }
>+    bool isInterfaceBlock() const { return getType().isInterfaceBlock(); }
>+    bool isMatrix() const { return getType().isMatrix(); }
>+    bool isArray() const { return getType().isArray(); }
>+    bool isVector() const { return getType().isVector(); }
>+    bool isScalar() const { return getType().isScalar(); }
>+    bool isScalarInt() const { return getType().isScalarInt(); }
>+    const char *getBasicString() const { return getType().getBasicString(); }
> 
>-    bool isConstructorWithOnlyConstantUnionParameters();
>+    unsigned int getOutermostArraySize() const { return getType().getOutermostArraySize(); }
> 
>   protected:
>-    TType mType;
>-
>     TIntermTyped(const TIntermTyped &node);
> };
> 
>@@ -207,7 +193,11 @@ class TIntermLoop : public TIntermNode
>                 TIntermBlock *body);
> 
>     TIntermLoop *getAsLoopNode() override { return this; }
>-    void traverse(TIntermTraverser *it) override;
>+    void traverse(TIntermTraverser *it) final;
>+    bool visit(Visit visit, TIntermTraverser *it) final;
>+
>+    size_t getChildCount() const final;
>+    TIntermNode *getChildNode(size_t index) const final;
>     bool replaceChildNode(TIntermNode *original, TIntermNode *replacement) override;
> 
>     TLoopType getType() const { return mType; }
>@@ -237,8 +227,11 @@ class TIntermBranch : public TIntermNode
>   public:
>     TIntermBranch(TOperator op, TIntermTyped *e) : mFlowOp(op), mExpression(e) {}
> 
>-    void traverse(TIntermTraverser *it) override;
>     TIntermBranch *getAsBranchNode() override { return this; }
>+    bool visit(Visit visit, TIntermTraverser *it) final;
>+
>+    size_t getChildCount() const final;
>+    TIntermNode *getChildNode(size_t index) const final;
>     bool replaceChildNode(TIntermNode *original, TIntermNode *replacement) override;
> 
>     TOperator getFlowOp() { return mFlowOp; }
>@@ -246,72 +239,60 @@ class TIntermBranch : public TIntermNode
> 
>   protected:
>     TOperator mFlowOp;
>-    TIntermTyped *mExpression;  // non-zero except for "return exp;" statements
>+    TIntermTyped *mExpression;  // zero except for "return exp;" statements
> };
> 
>-//
>-// Nodes that correspond to symbols or constants in the source code.
>-//
>+// Nodes that correspond to variable symbols in the source code. These may be regular variables or
>+// interface block instances. In declarations that only declare a struct type but no variables, a
>+// TIntermSymbol node with an empty variable is used to store the type.
> class TIntermSymbol : public TIntermTyped
> {
>   public:
>-    // if symbol is initialized as symbol(sym), the memory comes from the poolallocator of sym.
>-    // If sym comes from per process globalpoolallocator, then it causes increased memory usage
>-    // per compile it is essential to use "symbol = sym" to assign to symbol
>-    TIntermSymbol(const TSymbolUniqueId &id, const TString &symbol, const TType &type)
>-        : TIntermTyped(type), mId(id), mSymbol(symbol)
>-    {
>-    }
>+    TIntermSymbol(const TVariable *variable);
> 
>     TIntermTyped *deepCopy() const override { return new TIntermSymbol(*this); }
> 
>+    bool hasConstantValue() const override;
>+    const TConstantUnion *getConstantValue() const override;
>+
>     bool hasSideEffects() const override { return false; }
> 
>-    int getId() const { return mId.get(); }
>-    const TString &getSymbol() const { return mSymbol.getString(); }
>-    const TName &getName() const { return mSymbol; }
>-    TName &getName() { return mSymbol; }
>+    const TType &getType() const override;
> 
>-    void setInternal(bool internal) { mSymbol.setInternal(internal); }
>+    const TSymbolUniqueId &uniqueId() const;
>+    ImmutableString getName() const;
>+    const TVariable &variable() const { return *mVariable; }
> 
>-    void traverse(TIntermTraverser *it) override;
>     TIntermSymbol *getAsSymbolNode() override { return this; }
>-    bool replaceChildNode(TIntermNode *, TIntermNode *) override { return false; }
>+    void traverse(TIntermTraverser *it) final;
>+    bool visit(Visit visit, TIntermTraverser *it) final;
> 
>-  protected:
>-    const TSymbolUniqueId mId;
>-    TName mSymbol;
>+    size_t getChildCount() const final;
>+    TIntermNode *getChildNode(size_t index) const final;
>+    bool replaceChildNode(TIntermNode *, TIntermNode *) override { return false; }
> 
>   private:
>     TIntermSymbol(const TIntermSymbol &) = default;  // Note: not deleted, just private!
>+
>+    const TVariable *const mVariable;  // Guaranteed to be non-null
> };
> 
>-// A Raw node stores raw code, that the translator will insert verbatim
>-// into the output stream. Useful for transformation operations that make
>-// complex code that might not fit naturally into the GLSL model.
>-class TIntermRaw : public TIntermTyped
>+// A typed expression that is not just representing a symbol table symbol.
>+class TIntermExpression : public TIntermTyped
> {
>   public:
>-    TIntermRaw(const TType &type, const TString &rawText) : TIntermTyped(type), mRawText(rawText) {}
>-    TIntermRaw(const TIntermRaw &) = delete;
>+    TIntermExpression(const TType &t);
> 
>-    TIntermTyped *deepCopy() const override
>-    {
>-        UNREACHABLE();
>-        return nullptr;
>-    }
>+    const TType &getType() const override { return mType; }
> 
>-    bool hasSideEffects() const override { return false; }
>-
>-    TString getRawText() const { return mRawText; }
>-
>-    void traverse(TIntermTraverser *it) override;
>+  protected:
>+    TType *getTypePointer() { return &mType; }
>+    void setType(const TType &t) { mType = t; }
>+    void setTypePreservePrecision(const TType &t);
> 
>-    TIntermRaw *getAsRawNode() override { return this; }
>-    bool replaceChildNode(TIntermNode *, TIntermNode *) override { return false; }
>+    TIntermExpression(const TIntermExpression &node) = default;
> 
>-  protected:
>-    TString mRawText;
>+    TType mType;
> };
> 
> // Constant folded node.
>@@ -320,20 +301,21 @@ class TIntermRaw : public TIntermTyped
> // "true ? 1.0 : non_constant"
> // Other nodes than TIntermConstantUnion may also be constant expressions.
> //
>-class TIntermConstantUnion : public TIntermTyped
>+class TIntermConstantUnion : public TIntermExpression
> {
>   public:
>     TIntermConstantUnion(const TConstantUnion *unionPointer, const TType &type)
>-        : TIntermTyped(type), mUnionArrayPointer(unionPointer)
>+        : TIntermExpression(type), mUnionArrayPointer(unionPointer)
>     {
>         ASSERT(unionPointer);
>     }
> 
>     TIntermTyped *deepCopy() const override { return new TIntermConstantUnion(*this); }
> 
>-    bool hasSideEffects() const override { return false; }
>+    bool hasConstantValue() const override;
>+    const TConstantUnion *getConstantValue() const override;
> 
>-    const TConstantUnion *getUnionArrayPointer() const { return mUnionArrayPointer; }
>+    bool hasSideEffects() const override { return false; }
> 
>     int getIConst(size_t index) const
>     {
>@@ -352,26 +334,28 @@ class TIntermConstantUnion : public TIntermTyped
>         return mUnionArrayPointer ? mUnionArrayPointer[index].getBConst() : false;
>     }
> 
>-    void replaceConstantUnion(const TConstantUnion *safeConstantUnion)
>-    {
>-        ASSERT(safeConstantUnion);
>-        // Previous union pointer freed on pool deallocation.
>-        mUnionArrayPointer = safeConstantUnion;
>-    }
>-
>     TIntermConstantUnion *getAsConstantUnion() override { return this; }
>-    void traverse(TIntermTraverser *it) override;
>+    void traverse(TIntermTraverser *it) final;
>+    bool visit(Visit visit, TIntermTraverser *it) final;
>+
>+    size_t getChildCount() const final;
>+    TIntermNode *getChildNode(size_t index) const final;
>     bool replaceChildNode(TIntermNode *, TIntermNode *) override { return false; }
> 
>-    TConstantUnion *foldBinary(TOperator op,
>-                               TIntermConstantUnion *rightNode,
>-                               TDiagnostics *diagnostics,
>-                               const TSourceLoc &line);
>-    const TConstantUnion *foldIndexing(int index);
>     TConstantUnion *foldUnaryNonComponentWise(TOperator op);
>     TConstantUnion *foldUnaryComponentWise(TOperator op, TDiagnostics *diagnostics);
> 
>-    static TConstantUnion *FoldAggregateConstructor(TIntermAggregate *aggregate);
>+    static const TConstantUnion *FoldBinary(TOperator op,
>+                                            const TConstantUnion *leftArray,
>+                                            const TType &leftType,
>+                                            const TConstantUnion *rightArray,
>+                                            const TType &rightType,
>+                                            TDiagnostics *diagnostics,
>+                                            const TSourceLoc &line);
>+
>+    static const TConstantUnion *FoldIndexing(const TType &type,
>+                                              const TConstantUnion *constArray,
>+                                              int index);
>     static TConstantUnion *FoldAggregateBuiltIn(TIntermAggregate *aggregate,
>                                                 TDiagnostics *diagnostics);
> 
>@@ -391,7 +375,7 @@ class TIntermConstantUnion : public TIntermTyped
> //
> // Intermediate class for node types that hold operators.
> //
>-class TIntermOperator : public TIntermTyped
>+class TIntermOperator : public TIntermExpression
> {
>   public:
>     TOperator getOp() const { return mOp; }
>@@ -407,8 +391,8 @@ class TIntermOperator : public TIntermTyped
>     bool hasSideEffects() const override { return isAssignment(); }
> 
>   protected:
>-    TIntermOperator(TOperator op) : TIntermTyped(TType(EbtFloat, EbpUndefined)), mOp(op) {}
>-    TIntermOperator(TOperator op, const TType &type) : TIntermTyped(type), mOp(op) {}
>+    TIntermOperator(TOperator op) : TIntermExpression(TType(EbtFloat, EbpUndefined)), mOp(op) {}
>+    TIntermOperator(TOperator op, const TType &type) : TIntermExpression(type), mOp(op) {}
> 
>     TIntermOperator(const TIntermOperator &) = default;
> 
>@@ -416,7 +400,7 @@ class TIntermOperator : public TIntermTyped
> };
> 
> // Node for vector swizzles.
>-class TIntermSwizzle : public TIntermTyped
>+class TIntermSwizzle : public TIntermExpression
> {
>   public:
>     // This constructor determines the type of the node based on the operand.
>@@ -424,8 +408,11 @@ class TIntermSwizzle : public TIntermTyped
> 
>     TIntermTyped *deepCopy() const override { return new TIntermSwizzle(*this); }
> 
>-    TIntermSwizzle *getAsSwizzleNode() override { return this; };
>-    void traverse(TIntermTraverser *it) override;
>+    TIntermSwizzle *getAsSwizzleNode() override { return this; }
>+    bool visit(Visit visit, TIntermTraverser *it) final;
>+
>+    size_t getChildCount() const final;
>+    TIntermNode *getChildNode(size_t index) const final;
>     bool replaceChildNode(TIntermNode *original, TIntermNode *replacement) override;
> 
>     bool hasSideEffects() const override { return mOperand->hasSideEffects(); }
>@@ -433,14 +420,18 @@ class TIntermSwizzle : public TIntermTyped
>     TIntermTyped *getOperand() { return mOperand; }
>     void writeOffsetsAsXYZW(TInfoSinkBase *out) const;
> 
>+    const TVector<int> &getSwizzleOffsets() { return mSwizzleOffsets; }
>+
>     bool hasDuplicateOffsets() const;
>+    void setHasFoldedDuplicateOffsets(bool hasFoldedDuplicateOffsets);
>     bool offsetsMatch(int offset) const;
> 
>-    TIntermTyped *fold();
>+    TIntermTyped *fold(TDiagnostics *diagnostics) override;
> 
>   protected:
>     TIntermTyped *mOperand;
>     TVector<int> mSwizzleOffsets;
>+    bool mHasFoldedDuplicateOffsets;
> 
>   private:
>     void promote();
>@@ -456,17 +447,23 @@ class TIntermBinary : public TIntermOperator
>   public:
>     // This constructor determines the type of the binary node based on the operands and op.
>     TIntermBinary(TOperator op, TIntermTyped *left, TIntermTyped *right);
>+    // Comma qualifier depends on the shader version, so use this to create comma nodes:
>+    static TIntermBinary *CreateComma(TIntermTyped *left, TIntermTyped *right, int shaderVersion);
> 
>     TIntermTyped *deepCopy() const override { return new TIntermBinary(*this); }
> 
>+    bool hasConstantValue() const override;
>+    const TConstantUnion *getConstantValue() const override;
>+
>     static TOperator GetMulOpBasedOnOperands(const TType &left, const TType &right);
>     static TOperator GetMulAssignOpBasedOnOperands(const TType &left, const TType &right);
>-    static TQualifier GetCommaQualifier(int shaderVersion,
>-                                        const TIntermTyped *left,
>-                                        const TIntermTyped *right);
> 
>-    TIntermBinary *getAsBinaryNode() override { return this; };
>-    void traverse(TIntermTraverser *it) override;
>+    TIntermBinary *getAsBinaryNode() override { return this; }
>+    void traverse(TIntermTraverser *it) final;
>+    bool visit(Visit visit, TIntermTraverser *it) final;
>+
>+    size_t getChildCount() const final;
>+    TIntermNode *getChildNode(size_t index) const final;
>     bool replaceChildNode(TIntermNode *original, TIntermNode *replacement) override;
> 
>     bool hasSideEffects() const override
>@@ -476,10 +473,13 @@ class TIntermBinary : public TIntermOperator
> 
>     TIntermTyped *getLeft() const { return mLeft; }
>     TIntermTyped *getRight() const { return mRight; }
>-    TIntermTyped *fold(TDiagnostics *diagnostics);
>+    TIntermTyped *fold(TDiagnostics *diagnostics) override;
> 
>     void setAddIndexClamp() { mAddIndexClamp = true; }
>-    bool getAddIndexClamp() { return mAddIndexClamp; }
>+    bool getAddIndexClamp() const { return mAddIndexClamp; }
>+
>+    // This method is only valid for EOpIndexDirectStruct. It returns the name of the field.
>+    const ImmutableString &getIndexStructFieldName() const;
> 
>   protected:
>     TIntermTyped *mLeft;
>@@ -491,6 +491,10 @@ class TIntermBinary : public TIntermOperator
>   private:
>     void promote();
> 
>+    static TQualifier GetCommaQualifier(int shaderVersion,
>+                                        const TIntermTyped *left,
>+                                        const TIntermTyped *right);
>+
>     TIntermBinary(const TIntermBinary &node);  // Note: not deleted, just private!
> };
> 
>@@ -500,18 +504,24 @@ class TIntermBinary : public TIntermOperator
> class TIntermUnary : public TIntermOperator
> {
>   public:
>-    TIntermUnary(TOperator op, TIntermTyped *operand);
>+    TIntermUnary(TOperator op, TIntermTyped *operand, const TFunction *function);
> 
>     TIntermTyped *deepCopy() const override { return new TIntermUnary(*this); }
> 
>-    void traverse(TIntermTraverser *it) override;
>     TIntermUnary *getAsUnaryNode() override { return this; }
>+    void traverse(TIntermTraverser *it) final;
>+    bool visit(Visit visit, TIntermTraverser *it) final;
>+
>+    size_t getChildCount() const final;
>+    TIntermNode *getChildNode(size_t index) const final;
>     bool replaceChildNode(TIntermNode *original, TIntermNode *replacement) override;
> 
>     bool hasSideEffects() const override { return isAssignment() || mOperand->hasSideEffects(); }
> 
>     TIntermTyped *getOperand() { return mOperand; }
>-    TIntermTyped *fold(TDiagnostics *diagnostics);
>+    TIntermTyped *fold(TDiagnostics *diagnostics) override;
>+
>+    const TFunction *getFunction() const { return mFunction; }
> 
>     void setUseEmulatedFunction() { mUseEmulatedFunction = true; }
>     bool getUseEmulatedFunction() { return mUseEmulatedFunction; }
>@@ -523,63 +533,17 @@ class TIntermUnary : public TIntermOperator
>     // to work around driver bugs.
>     bool mUseEmulatedFunction;
> 
>+    const TFunction *const mFunction;
>+
>   private:
>     void promote();
> 
>     TIntermUnary(const TIntermUnary &node);  // note: not deleted, just private!
> };
> 
>-class TFunctionSymbolInfo
>-{
>-  public:
>-    POOL_ALLOCATOR_NEW_DELETE();
>-    TFunctionSymbolInfo(const TSymbolUniqueId &id);
>-    TFunctionSymbolInfo() : mId(nullptr), mKnownToNotHaveSideEffects(false) {}
>-
>-    TFunctionSymbolInfo(const TFunctionSymbolInfo &info);
>-    TFunctionSymbolInfo &operator=(const TFunctionSymbolInfo &info);
>-
>-    void setFromFunction(const TFunction &function);
>-
>-    void setNameObj(const TName &name) { mName = name; }
>-    const TName &getNameObj() const { return mName; }
>-
>-    const TString &getName() const { return mName.getString(); }
>-    void setName(const TString &name) { mName.setString(name); }
>-    bool isMain() const { return mName.getString() == "main"; }
>-
>-    void setKnownToNotHaveSideEffects(bool knownToNotHaveSideEffects)
>-    {
>-        mKnownToNotHaveSideEffects = knownToNotHaveSideEffects;
>-    }
>-    bool isKnownToNotHaveSideEffects() const { return mKnownToNotHaveSideEffects; }
>-
>-    void setId(const TSymbolUniqueId &functionId);
>-    const TSymbolUniqueId &getId() const;
>-
>-    bool isImageFunction() const
>-    {
>-        return getName() == "imageSize" || getName() == "imageLoad" || getName() == "imageStore";
>-    }
>-
>-  private:
>-    TName mName;
>-    TSymbolUniqueId *mId;
>-    bool mKnownToNotHaveSideEffects;
>-};
>-
> typedef TVector<TIntermNode *> TIntermSequence;
> typedef TVector<int> TQualifierList;
> 
>-//
>-// This is just to help yacc.
>-//
>-struct TIntermFunctionCallOrMethod
>-{
>-    TIntermSequence *arguments;
>-    TIntermNode *thisNode;
>-};
>-
> // Interface for node classes that have an arbitrarily sized set of children.
> class TIntermAggregateBase
> {
>@@ -606,18 +570,13 @@ class TIntermAggregate : public TIntermOperator, public TIntermAggregateBase
>   public:
>     static TIntermAggregate *CreateFunctionCall(const TFunction &func, TIntermSequence *arguments);
> 
>-    // If using this, ensure that there's a consistent function definition with the same symbol id
>-    // added to the AST.
>-    static TIntermAggregate *CreateFunctionCall(const TType &type,
>-                                                const TSymbolUniqueId &id,
>-                                                const TName &name,
>-                                                TIntermSequence *arguments);
>+    static TIntermAggregate *CreateRawFunctionCall(const TFunction &func,
>+                                                   TIntermSequence *arguments);
> 
>+    // This covers all built-in function calls - whether they are associated with an op or not.
>     static TIntermAggregate *CreateBuiltInFunctionCall(const TFunction &func,
>                                                        TIntermSequence *arguments);
>-    static TIntermAggregate *CreateConstructor(const TType &type,
>-                                               TIntermSequence *arguments);
>-    static TIntermAggregate *Create(const TType &type, TOperator op, TIntermSequence *arguments);
>+    static TIntermAggregate *CreateConstructor(const TType &type, TIntermSequence *arguments);
>     ~TIntermAggregate() {}
> 
>     // Note: only supported for nodes that can be a part of an expression.
>@@ -625,28 +584,34 @@ class TIntermAggregate : public TIntermOperator, public TIntermAggregateBase
> 
>     TIntermAggregate *shallowCopy() const;
> 
>+    bool hasConstantValue() const override;
>+    const TConstantUnion *getConstantValue() const override;
>+
>     TIntermAggregate *getAsAggregate() override { return this; }
>-    void traverse(TIntermTraverser *it) override;
>+    void traverse(TIntermTraverser *it) final;
>+    bool visit(Visit visit, TIntermTraverser *it) final;
>+
>+    size_t getChildCount() const final;
>+    TIntermNode *getChildNode(size_t index) const final;
>     bool replaceChildNode(TIntermNode *original, TIntermNode *replacement) override;
> 
>     bool hasSideEffects() const override;
> 
>-    static bool CanFoldAggregateBuiltInOp(TOperator op);
>-    TIntermTyped *fold(TDiagnostics *diagnostics);
>+    TIntermTyped *fold(TDiagnostics *diagnostics) override;
> 
>     TIntermSequence *getSequence() override { return &mArguments; }
>     const TIntermSequence *getSequence() const override { return &mArguments; }
> 
>-    TString getSymbolTableMangledName() const;
>-
>     void setUseEmulatedFunction() { mUseEmulatedFunction = true; }
>     bool getUseEmulatedFunction() { return mUseEmulatedFunction; }
> 
>     // Returns true if changing parameter precision may affect the return value.
>     bool gotPrecisionFromChildren() const { return mGotPrecisionFromChildren; }
> 
>-    TFunctionSymbolInfo *getFunctionSymbolInfo() { return &mFunctionInfo; }
>-    const TFunctionSymbolInfo *getFunctionSymbolInfo() const { return &mFunctionInfo; }
>+    const TFunction *getFunction() const { return mFunction; }
>+
>+    // Get the function name to display to the user in an error message.
>+    const char *functionName() const;
> 
>   protected:
>     TIntermSequence mArguments;
>@@ -657,14 +622,17 @@ class TIntermAggregate : public TIntermOperator, public TIntermAggregateBase
> 
>     bool mGotPrecisionFromChildren;
> 
>-    TFunctionSymbolInfo mFunctionInfo;
>+    const TFunction *const mFunction;
> 
>   private:
>-    TIntermAggregate(const TType &type, TOperator op, TIntermSequence *arguments);
>+    TIntermAggregate(const TFunction *func,
>+                     const TType &type,
>+                     TOperator op,
>+                     TIntermSequence *arguments);
> 
>     TIntermAggregate(const TIntermAggregate &node);  // note: not deleted, just private!
> 
>-    void setTypePrecisionAndQualifier(const TType &type);
>+    void setPrecisionAndQualifier();
> 
>     bool areChildrenConstQualified();
> 
>@@ -689,11 +657,16 @@ class TIntermBlock : public TIntermNode, public TIntermAggregateBase
>     ~TIntermBlock() {}
> 
>     TIntermBlock *getAsBlock() override { return this; }
>-    void traverse(TIntermTraverser *it) override;
>+    void traverse(TIntermTraverser *it) final;
>+    bool visit(Visit visit, TIntermTraverser *it) final;
>+
>+    size_t getChildCount() const final;
>+    TIntermNode *getChildNode(size_t index) const final;
>     bool replaceChildNode(TIntermNode *original, TIntermNode *replacement) override;
> 
>     // Only intended for initially building the block.
>     void appendStatement(TIntermNode *statement);
>+    void insertStatement(size_t insertPosition, TIntermNode *statement);
> 
>     TIntermSequence *getSequence() override { return &mStatements; }
>     const TIntermSequence *getSequence() const override { return &mStatements; }
>@@ -704,21 +677,22 @@ class TIntermBlock : public TIntermNode, public TIntermAggregateBase
> 
> // Function prototype. May be in the AST either as a function prototype declaration or as a part of
> // a function definition. The type of the node is the function return type.
>-class TIntermFunctionPrototype : public TIntermTyped, public TIntermAggregateBase
>+class TIntermFunctionPrototype : public TIntermTyped
> {
>   public:
>-    // TODO(oetuaho@nvidia.com): See if TFunctionSymbolInfo could be added to constructor
>-    // parameters.
>-    TIntermFunctionPrototype(const TType &type, const TSymbolUniqueId &id)
>-        : TIntermTyped(type), mFunctionInfo(id)
>-    {
>-    }
>+    TIntermFunctionPrototype(const TFunction *function);
>     ~TIntermFunctionPrototype() {}
> 
>     TIntermFunctionPrototype *getAsFunctionPrototypeNode() override { return this; }
>-    void traverse(TIntermTraverser *it) override;
>+    void traverse(TIntermTraverser *it) final;
>+    bool visit(Visit visit, TIntermTraverser *it) final;
>+
>+    size_t getChildCount() const final;
>+    TIntermNode *getChildNode(size_t index) const final;
>     bool replaceChildNode(TIntermNode *original, TIntermNode *replacement) override;
> 
>+    const TType &getType() const override;
>+
>     TIntermTyped *deepCopy() const override
>     {
>         UNREACHABLE();
>@@ -730,19 +704,10 @@ class TIntermFunctionPrototype : public TIntermTyped, public TIntermAggregateBas
>         return true;
>     }
> 
>-    // Only intended for initially building the declaration.
>-    void appendParameter(TIntermSymbol *parameter);
>-
>-    TIntermSequence *getSequence() override { return &mParameters; }
>-    const TIntermSequence *getSequence() const override { return &mParameters; }
>-
>-    TFunctionSymbolInfo *getFunctionSymbolInfo() { return &mFunctionInfo; }
>-    const TFunctionSymbolInfo *getFunctionSymbolInfo() const { return &mFunctionInfo; }
>+    const TFunction *getFunction() const { return mFunction; }
> 
>   protected:
>-    TIntermSequence mParameters;
>-
>-    TFunctionSymbolInfo mFunctionInfo;
>+    const TFunction *const mFunction;
> };
> 
> // Node for function definitions. The prototype child node stores the function header including
>@@ -758,16 +723,17 @@ class TIntermFunctionDefinition : public TIntermNode
>     }
> 
>     TIntermFunctionDefinition *getAsFunctionDefinition() override { return this; }
>-    void traverse(TIntermTraverser *it) override;
>+    void traverse(TIntermTraverser *it) final;
>+    bool visit(Visit visit, TIntermTraverser *it) final;
>+
>+    size_t getChildCount() const final;
>+    TIntermNode *getChildNode(size_t index) const final;
>     bool replaceChildNode(TIntermNode *original, TIntermNode *replacement) override;
> 
>     TIntermFunctionPrototype *getFunctionPrototype() const { return mPrototype; }
>     TIntermBlock *getBody() const { return mBody; }
> 
>-    const TFunctionSymbolInfo *getFunctionSymbolInfo() const
>-    {
>-        return mPrototype->getFunctionSymbolInfo();
>-    }
>+    const TFunction *getFunction() const { return mPrototype->getFunction(); }
> 
>   private:
>     TIntermFunctionPrototype *mPrototype;
>@@ -782,7 +748,10 @@ class TIntermDeclaration : public TIntermNode, public TIntermAggregateBase
>     ~TIntermDeclaration() {}
> 
>     TIntermDeclaration *getAsDeclarationNode() override { return this; }
>-    void traverse(TIntermTraverser *it) override;
>+    bool visit(Visit visit, TIntermTraverser *it) final;
>+
>+    size_t getChildCount() const final;
>+    TIntermNode *getChildNode(size_t index) const final;
>     bool replaceChildNode(TIntermNode *original, TIntermNode *replacement) override;
> 
>     // Only intended for initially building the declaration.
>@@ -792,6 +761,7 @@ class TIntermDeclaration : public TIntermNode, public TIntermAggregateBase
> 
>     TIntermSequence *getSequence() override { return &mDeclarators; }
>     const TIntermSequence *getSequence() const override { return &mDeclarators; }
>+
>   protected:
>     TIntermSequence mDeclarators;
> };
>@@ -803,10 +773,12 @@ class TIntermInvariantDeclaration : public TIntermNode
>     TIntermInvariantDeclaration(TIntermSymbol *symbol, const TSourceLoc &line);
> 
>     virtual TIntermInvariantDeclaration *getAsInvariantDeclarationNode() override { return this; }
>+    bool visit(Visit visit, TIntermTraverser *it) final;
> 
>     TIntermSymbol *getSymbol() { return mSymbol; }
> 
>-    void traverse(TIntermTraverser *it) override;
>+    size_t getChildCount() const final;
>+    TIntermNode *getChildNode(size_t index) const final;
>     bool replaceChildNode(TIntermNode *original, TIntermNode *replacement) override;
> 
>   private:
>@@ -814,18 +786,21 @@ class TIntermInvariantDeclaration : public TIntermNode
> };
> 
> // For ternary operators like a ? b : c.
>-class TIntermTernary : public TIntermTyped
>+class TIntermTernary : public TIntermExpression
> {
>   public:
>     TIntermTernary(TIntermTyped *cond, TIntermTyped *trueExpression, TIntermTyped *falseExpression);
> 
>-    void traverse(TIntermTraverser *it) override;
>+    TIntermTernary *getAsTernaryNode() override { return this; }
>+    bool visit(Visit visit, TIntermTraverser *it) final;
>+
>+    size_t getChildCount() const final;
>+    TIntermNode *getChildNode(size_t index) const final;
>     bool replaceChildNode(TIntermNode *original, TIntermNode *replacement) override;
> 
>     TIntermTyped *getCondition() const { return mCondition; }
>     TIntermTyped *getTrueExpression() const { return mTrueExpression; }
>     TIntermTyped *getFalseExpression() const { return mFalseExpression; }
>-    TIntermTernary *getAsTernaryNode() override { return this; }
> 
>     TIntermTyped *deepCopy() const override { return new TIntermTernary(*this); }
> 
>@@ -835,7 +810,7 @@ class TIntermTernary : public TIntermTyped
>                mFalseExpression->hasSideEffects();
>     }
> 
>-    TIntermTyped *fold();
>+    TIntermTyped *fold(TDiagnostics *diagnostics) override;
> 
>   private:
>     TIntermTernary(const TIntermTernary &node);  // Note: not deleted, just private!
>@@ -854,13 +829,16 @@ class TIntermIfElse : public TIntermNode
>   public:
>     TIntermIfElse(TIntermTyped *cond, TIntermBlock *trueB, TIntermBlock *falseB);
> 
>-    void traverse(TIntermTraverser *it) override;
>+    TIntermIfElse *getAsIfElseNode() override { return this; }
>+    bool visit(Visit visit, TIntermTraverser *it) final;
>+
>+    size_t getChildCount() const final;
>+    TIntermNode *getChildNode(size_t index) const final;
>     bool replaceChildNode(TIntermNode *original, TIntermNode *replacement) override;
> 
>     TIntermTyped *getCondition() const { return mCondition; }
>     TIntermBlock *getTrueBlock() const { return mTrueBlock; }
>     TIntermBlock *getFalseBlock() const { return mFalseBlock; }
>-    TIntermIfElse *getAsIfElseNode() override { return this; }
> 
>   protected:
>     TIntermTyped *mCondition;
>@@ -876,10 +854,12 @@ class TIntermSwitch : public TIntermNode
>   public:
>     TIntermSwitch(TIntermTyped *init, TIntermBlock *statementList);
> 
>-    void traverse(TIntermTraverser *it) override;
>-    bool replaceChildNode(TIntermNode *original, TIntermNode *replacement) override;
>-
>     TIntermSwitch *getAsSwitchNode() override { return this; }
>+    bool visit(Visit visit, TIntermTraverser *it) final;
>+
>+    size_t getChildCount() const final;
>+    TIntermNode *getChildNode(size_t index) const final;
>+    bool replaceChildNode(TIntermNode *original, TIntermNode *replacement) override;
> 
>     TIntermTyped *getInit() { return mInit; }
>     TIntermBlock *getStatementList() { return mStatementList; }
>@@ -900,10 +880,12 @@ class TIntermCase : public TIntermNode
>   public:
>     TIntermCase(TIntermTyped *condition) : TIntermNode(), mCondition(condition) {}
> 
>-    void traverse(TIntermTraverser *it) override;
>-    bool replaceChildNode(TIntermNode *original, TIntermNode *replacement) override;
>-
>     TIntermCase *getAsCaseNode() override { return this; }
>+    bool visit(Visit visit, TIntermTraverser *it) final;
>+
>+    size_t getChildCount() const final;
>+    TIntermNode *getChildNode(size_t index) const final;
>+    bool replaceChildNode(TIntermNode *original, TIntermNode *replacement) override;
> 
>     bool hasCondition() const { return mCondition != nullptr; }
>     TIntermTyped *getCondition() const { return mCondition; }
>@@ -912,6 +894,42 @@ class TIntermCase : public TIntermNode
>     TIntermTyped *mCondition;
> };
> 
>+//
>+// Preprocessor Directive.
>+//  #ifdef, #define, #if, #endif, etc.
>+//
>+
>+enum class PreprocessorDirective
>+{
>+    Define,
>+    Ifdef,
>+    If,
>+    Endif,
>+};
>+
>+class TIntermPreprocessorDirective : public TIntermNode
>+{
>+  public:
>+    // This could also take an ImmutbleString as an argument.
>+    TIntermPreprocessorDirective(PreprocessorDirective directive, ImmutableString command);
>+    ~TIntermPreprocessorDirective() final;
>+
>+    void traverse(TIntermTraverser *it) final;
>+    bool visit(Visit visit, TIntermTraverser *it) final;
>+    bool replaceChildNode(TIntermNode *, TIntermNode *) final { return false; }
>+
>+    TIntermPreprocessorDirective *getAsPreprocessorDirective() final { return this; }
>+    size_t getChildCount() const final;
>+    TIntermNode *getChildNode(size_t index) const final;
>+
>+    PreprocessorDirective getDirective() const { return mDirective; }
>+    const ImmutableString &getCommand() const { return mCommand; }
>+
>+  private:
>+    PreprocessorDirective mDirective;
>+    ImmutableString mCommand;
>+};
>+
> }  // namespace sh
> 
> #endif  // COMPILER_TRANSLATOR_INTERMNODE_H_
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/IntermNodePatternMatcher.cpp b/Source/ThirdParty/ANGLE/src/compiler/translator/IntermNodePatternMatcher.cpp
>deleted file mode 100644
>index 567e8f74405..00000000000
>--- a/Source/ThirdParty/ANGLE/src/compiler/translator/IntermNodePatternMatcher.cpp
>+++ /dev/null
>@@ -1,157 +0,0 @@
>-//
>-// Copyright (c) 2016 The ANGLE Project Authors. All rights reserved.
>-// Use of this source code is governed by a BSD-style license that can be
>-// found in the LICENSE file.
>-//
>-// IntermNodePatternMatcher is a helper class for matching node trees to given patterns.
>-// It can be used whenever the same checks for certain node structures are common to multiple AST
>-// traversers.
>-//
>-
>-#include "compiler/translator/IntermNodePatternMatcher.h"
>-
>-#include "compiler/translator/IntermNode.h"
>-
>-namespace sh
>-{
>-
>-IntermNodePatternMatcher::IntermNodePatternMatcher(const unsigned int mask) : mMask(mask)
>-{
>-}
>-
>-// static
>-bool IntermNodePatternMatcher::IsDynamicIndexingOfVectorOrMatrix(TIntermBinary *node)
>-{
>-    return node->getOp() == EOpIndexIndirect && !node->getLeft()->isArray() &&
>-           node->getLeft()->getBasicType() != EbtStruct;
>-}
>-
>-bool IntermNodePatternMatcher::matchInternal(TIntermBinary *node, TIntermNode *parentNode)
>-{
>-    if ((mMask & kExpressionReturningArray) != 0)
>-    {
>-        if (node->isArray() && node->getOp() == EOpAssign && parentNode != nullptr &&
>-            !parentNode->getAsBlock())
>-        {
>-            return true;
>-        }
>-    }
>-
>-    if ((mMask & kUnfoldedShortCircuitExpression) != 0)
>-    {
>-        if (node->getRight()->hasSideEffects() &&
>-            (node->getOp() == EOpLogicalOr || node->getOp() == EOpLogicalAnd))
>-        {
>-            return true;
>-        }
>-    }
>-    return false;
>-}
>-
>-bool IntermNodePatternMatcher::match(TIntermUnary *node)
>-{
>-    if ((mMask & kArrayLengthMethod) != 0)
>-    {
>-        if (node->getOp() == EOpArrayLength)
>-        {
>-            return true;
>-        }
>-    }
>-    return false;
>-}
>-
>-bool IntermNodePatternMatcher::match(TIntermBinary *node, TIntermNode *parentNode)
>-{
>-    // L-value tracking information is needed to check for dynamic indexing in L-value.
>-    // Traversers that don't track l-values can still use this class and match binary nodes with
>-    // this variation of this method if they don't need to check for dynamic indexing in l-values.
>-    ASSERT((mMask & kDynamicIndexingOfVectorOrMatrixInLValue) == 0);
>-    return matchInternal(node, parentNode);
>-}
>-
>-bool IntermNodePatternMatcher::match(TIntermBinary *node,
>-                                     TIntermNode *parentNode,
>-                                     bool isLValueRequiredHere)
>-{
>-    if (matchInternal(node, parentNode))
>-    {
>-        return true;
>-    }
>-    if ((mMask & kDynamicIndexingOfVectorOrMatrixInLValue) != 0)
>-    {
>-        if (isLValueRequiredHere && IsDynamicIndexingOfVectorOrMatrix(node))
>-        {
>-            return true;
>-        }
>-    }
>-    return false;
>-}
>-
>-bool IntermNodePatternMatcher::match(TIntermAggregate *node, TIntermNode *parentNode)
>-{
>-    if ((mMask & kExpressionReturningArray) != 0)
>-    {
>-        if (parentNode != nullptr)
>-        {
>-            TIntermBinary *parentBinary = parentNode->getAsBinaryNode();
>-            bool parentIsAssignment =
>-                (parentBinary != nullptr &&
>-                 (parentBinary->getOp() == EOpAssign || parentBinary->getOp() == EOpInitialize));
>-
>-            if (node->getType().isArray() && !parentIsAssignment &&
>-                (node->isConstructor() || node->isFunctionCall()) && !parentNode->getAsBlock())
>-            {
>-                return true;
>-            }
>-        }
>-    }
>-    return false;
>-}
>-
>-bool IntermNodePatternMatcher::match(TIntermTernary *node)
>-{
>-    if ((mMask & kUnfoldedShortCircuitExpression) != 0)
>-    {
>-        return true;
>-    }
>-    return false;
>-}
>-
>-bool IntermNodePatternMatcher::match(TIntermDeclaration *node)
>-{
>-    if ((mMask & kMultiDeclaration) != 0)
>-    {
>-        if (node->getSequence()->size() > 1)
>-        {
>-            return true;
>-        }
>-    }
>-    if ((mMask & kArrayDeclaration) != 0)
>-    {
>-        if (node->getSequence()->front()->getAsTyped()->getType().isStructureContainingArrays())
>-        {
>-            return true;
>-        }
>-        // Need to check from all declarators whether they are arrays since that may vary between
>-        // declarators.
>-        for (TIntermNode *declarator : *node->getSequence())
>-        {
>-            if (declarator->getAsTyped()->isArray())
>-            {
>-                return true;
>-            }
>-        }
>-    }
>-    if ((mMask & kNamelessStructDeclaration) != 0)
>-    {
>-        TIntermTyped *declarator = node->getSequence()->front()->getAsTyped();
>-        if (declarator->getBasicType() == EbtStruct &&
>-            declarator->getType().getStruct()->name() == "")
>-        {
>-            return true;
>-        }
>-    }
>-    return false;
>-}
>-
>-}  // namespace sh
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/IntermNodePatternMatcher.h b/Source/ThirdParty/ANGLE/src/compiler/translator/IntermNodePatternMatcher.h
>deleted file mode 100644
>index 997fc2ef10d..00000000000
>--- a/Source/ThirdParty/ANGLE/src/compiler/translator/IntermNodePatternMatcher.h
>+++ /dev/null
>@@ -1,75 +0,0 @@
>-//
>-// Copyright (c) 2016 The ANGLE Project Authors. All rights reserved.
>-// Use of this source code is governed by a BSD-style license that can be
>-// found in the LICENSE file.
>-//
>-// IntermNodePatternMatcher is a helper class for matching node trees to given patterns.
>-// It can be used whenever the same checks for certain node structures are common to multiple AST
>-// traversers.
>-//
>-
>-#ifndef COMPILER_TRANSLATOR_INTERMNODEPATTERNMATCHER_H_
>-#define COMPILER_TRANSLATOR_INTERMNODEPATTERNMATCHER_H_
>-
>-namespace sh
>-{
>-
>-class TIntermAggregate;
>-class TIntermBinary;
>-class TIntermDeclaration;
>-class TIntermNode;
>-class TIntermTernary;
>-class TIntermUnary;
>-
>-class IntermNodePatternMatcher
>-{
>-  public:
>-    static bool IsDynamicIndexingOfVectorOrMatrix(TIntermBinary *node);
>-
>-    enum PatternType
>-    {
>-        // Matches expressions that are unfolded to if statements by UnfoldShortCircuitToIf
>-        kUnfoldedShortCircuitExpression = 0x0001,
>-
>-        // Matches expressions that return arrays with the exception of simple statements where a
>-        // constructor or function call result is assigned.
>-        kExpressionReturningArray = 0x0001 << 1,
>-
>-        // Matches dynamic indexing of vectors or matrices in l-values.
>-        kDynamicIndexingOfVectorOrMatrixInLValue = 0x0001 << 2,
>-
>-        // Matches declarations with more than one declared variables.
>-        kMultiDeclaration = 0x0001 << 3,
>-
>-        // Matches declarations of arrays.
>-        kArrayDeclaration = 0x0001 << 4,
>-
>-        // Matches declarations of structs where the struct type does not have a name.
>-        kNamelessStructDeclaration = 0x0001 << 5,
>-
>-        // Matches array length() method.
>-        kArrayLengthMethod = 0x0001 << 6
>-    };
>-    IntermNodePatternMatcher(const unsigned int mask);
>-
>-    bool match(TIntermUnary *node);
>-
>-    bool match(TIntermBinary *node, TIntermNode *parentNode);
>-
>-    // Use this version for checking binary node matches in case you're using flag
>-    // kDynamicIndexingOfVectorOrMatrixInLValue.
>-    bool match(TIntermBinary *node, TIntermNode *parentNode, bool isLValueRequiredHere);
>-
>-    bool match(TIntermAggregate *node, TIntermNode *parentNode);
>-    bool match(TIntermTernary *node);
>-    bool match(TIntermDeclaration *node);
>-
>-  private:
>-    const unsigned int mMask;
>-
>-    bool matchInternal(TIntermBinary *node, TIntermNode *parentNode);
>-};
>-
>-}  // namespace sh
>-
>-#endif
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/IntermNode_util.cpp b/Source/ThirdParty/ANGLE/src/compiler/translator/IntermNode_util.cpp
>deleted file mode 100644
>index 9f1f596c43b..00000000000
>--- a/Source/ThirdParty/ANGLE/src/compiler/translator/IntermNode_util.cpp
>+++ /dev/null
>@@ -1,254 +0,0 @@
>-//
>-// Copyright (c) 2017 The ANGLE Project Authors. All rights reserved.
>-// Use of this source code is governed by a BSD-style license that can be
>-// found in the LICENSE file.
>-//
>-// IntermNode_util.cpp: High-level utilities for creating AST nodes and node hierarchies. Mostly
>-// meant to be used in AST transforms.
>-
>-#include "compiler/translator/IntermNode_util.h"
>-
>-#include "compiler/translator/SymbolTable.h"
>-
>-namespace sh
>-{
>-
>-namespace
>-{
>-
>-TName GetInternalFunctionName(const char *name)
>-{
>-    TString nameStr(name);
>-    TName nameObj(nameStr);
>-    nameObj.setInternal(true);
>-    return nameObj;
>-}
>-
>-const TFunction *LookUpBuiltInFunction(const TString &name,
>-                                       const TIntermSequence *arguments,
>-                                       const TSymbolTable &symbolTable,
>-                                       int shaderVersion)
>-{
>-    TString mangledName = TFunction::GetMangledNameFromCall(name, *arguments);
>-    TSymbol *symbol     = symbolTable.findBuiltIn(mangledName, shaderVersion);
>-    if (symbol)
>-    {
>-        ASSERT(symbol->isFunction());
>-        return static_cast<const TFunction *>(symbol);
>-    }
>-    return nullptr;
>-}
>-
>-}  // anonymous namespace
>-
>-TIntermFunctionPrototype *CreateInternalFunctionPrototypeNode(const TType &returnType,
>-                                                              const char *name,
>-                                                              const TSymbolUniqueId &functionId)
>-{
>-    TIntermFunctionPrototype *functionNode = new TIntermFunctionPrototype(returnType, functionId);
>-    functionNode->getFunctionSymbolInfo()->setNameObj(GetInternalFunctionName(name));
>-    return functionNode;
>-}
>-
>-TIntermFunctionDefinition *CreateInternalFunctionDefinitionNode(const TType &returnType,
>-                                                                const char *name,
>-                                                                TIntermBlock *functionBody,
>-                                                                const TSymbolUniqueId &functionId)
>-{
>-    TIntermFunctionPrototype *prototypeNode =
>-        CreateInternalFunctionPrototypeNode(returnType, name, functionId);
>-    return new TIntermFunctionDefinition(prototypeNode, functionBody);
>-}
>-
>-TIntermAggregate *CreateInternalFunctionCallNode(const TType &returnType,
>-                                                 const char *name,
>-                                                 const TSymbolUniqueId &functionId,
>-                                                 TIntermSequence *arguments)
>-{
>-    TIntermAggregate *functionNode = TIntermAggregate::CreateFunctionCall(
>-        returnType, functionId, GetInternalFunctionName(name), arguments);
>-    return functionNode;
>-}
>-
>-TIntermTyped *CreateZeroNode(const TType &type)
>-{
>-    TType constType(type);
>-    constType.setQualifier(EvqConst);
>-
>-    if (!type.isArray() && type.getBasicType() != EbtStruct)
>-    {
>-        size_t size       = constType.getObjectSize();
>-        TConstantUnion *u = new TConstantUnion[size];
>-        for (size_t i = 0; i < size; ++i)
>-        {
>-            switch (type.getBasicType())
>-            {
>-                case EbtFloat:
>-                    u[i].setFConst(0.0f);
>-                    break;
>-                case EbtInt:
>-                    u[i].setIConst(0);
>-                    break;
>-                case EbtUInt:
>-                    u[i].setUConst(0u);
>-                    break;
>-                case EbtBool:
>-                    u[i].setBConst(false);
>-                    break;
>-                default:
>-                    // CreateZeroNode is called by ParseContext that keeps parsing even when an
>-                    // error occurs, so it is possible for CreateZeroNode to be called with
>-                    // non-basic types. This happens only on error condition but CreateZeroNode
>-                    // needs to return a value with the correct type to continue the typecheck.
>-                    // That's why we handle non-basic type by setting whatever value, we just need
>-                    // the type to be right.
>-                    u[i].setIConst(42);
>-                    break;
>-            }
>-        }
>-
>-        TIntermConstantUnion *node = new TIntermConstantUnion(u, constType);
>-        return node;
>-    }
>-
>-    if (type.getBasicType() == EbtVoid)
>-    {
>-        // Void array. This happens only on error condition, similarly to the case above. We don't
>-        // have a constructor operator for void, so this needs special handling. We'll end up with a
>-        // value without the array type, but that should not be a problem.
>-        while (constType.isArray())
>-        {
>-            constType.toArrayElementType();
>-        }
>-        return CreateZeroNode(constType);
>-    }
>-
>-    TIntermSequence *arguments = new TIntermSequence();
>-
>-    if (type.isArray())
>-    {
>-        TType elementType(type);
>-        elementType.toArrayElementType();
>-
>-        size_t arraySize = type.getOutermostArraySize();
>-        for (size_t i = 0; i < arraySize; ++i)
>-        {
>-            arguments->push_back(CreateZeroNode(elementType));
>-        }
>-    }
>-    else
>-    {
>-        ASSERT(type.getBasicType() == EbtStruct);
>-
>-        const TStructure *structure = type.getStruct();
>-        for (const auto &field : structure->fields())
>-        {
>-            arguments->push_back(CreateZeroNode(*field->type()));
>-        }
>-    }
>-
>-    return TIntermAggregate::CreateConstructor(constType, arguments);
>-}
>-
>-TIntermConstantUnion *CreateIndexNode(int index)
>-{
>-    TConstantUnion *u = new TConstantUnion[1];
>-    u[0].setIConst(index);
>-
>-    TType type(EbtInt, EbpUndefined, EvqConst, 1);
>-    TIntermConstantUnion *node = new TIntermConstantUnion(u, type);
>-    return node;
>-}
>-
>-TIntermConstantUnion *CreateBoolNode(bool value)
>-{
>-    TConstantUnion *u = new TConstantUnion[1];
>-    u[0].setBConst(value);
>-
>-    TType type(EbtBool, EbpUndefined, EvqConst, 1);
>-    TIntermConstantUnion *node = new TIntermConstantUnion(u, type);
>-    return node;
>-}
>-
>-TIntermSymbol *CreateTempSymbolNode(const TSymbolUniqueId &id,
>-                                    const TType &type,
>-                                    TQualifier qualifier)
>-{
>-    TInfoSinkBase symbolNameOut;
>-    symbolNameOut << "s" << id.get();
>-    TString symbolName = symbolNameOut.c_str();
>-
>-    TIntermSymbol *node = new TIntermSymbol(id, symbolName, type);
>-    node->setInternal(true);
>-
>-    ASSERT(qualifier == EvqTemporary || qualifier == EvqConst || qualifier == EvqGlobal);
>-    node->getTypePointer()->setQualifier(qualifier);
>-
>-    // TODO(oetuaho): Might be useful to sanitize layout qualifier etc. on the type of the created
>-    // symbol. This might need to be done in other places as well.
>-    return node;
>-}
>-
>-TIntermDeclaration *CreateTempInitDeclarationNode(const TSymbolUniqueId &id,
>-                                                  TIntermTyped *initializer,
>-                                                  TQualifier qualifier)
>-{
>-    ASSERT(initializer != nullptr);
>-    TIntermSymbol *tempSymbol = CreateTempSymbolNode(id, initializer->getType(), qualifier);
>-    TIntermDeclaration *tempDeclaration = new TIntermDeclaration();
>-    TIntermBinary *tempInit             = new TIntermBinary(EOpInitialize, tempSymbol, initializer);
>-    tempDeclaration->appendDeclarator(tempInit);
>-    return tempDeclaration;
>-}
>-
>-TIntermBlock *EnsureBlock(TIntermNode *node)
>-{
>-    if (node == nullptr)
>-        return nullptr;
>-    TIntermBlock *blockNode = node->getAsBlock();
>-    if (blockNode != nullptr)
>-        return blockNode;
>-
>-    blockNode = new TIntermBlock();
>-    blockNode->setLine(node->getLine());
>-    blockNode->appendStatement(node);
>-    return blockNode;
>-}
>-
>-TIntermSymbol *ReferenceGlobalVariable(const TString &name, const TSymbolTable &symbolTable)
>-{
>-    TVariable *var = reinterpret_cast<TVariable *>(symbolTable.findGlobal(name));
>-    ASSERT(var);
>-    return new TIntermSymbol(var->getUniqueId(), name, var->getType());
>-}
>-
>-TIntermSymbol *ReferenceBuiltInVariable(const TString &name,
>-                                        const TSymbolTable &symbolTable,
>-                                        int shaderVersion)
>-{
>-    const TVariable *var =
>-        reinterpret_cast<const TVariable *>(symbolTable.findBuiltIn(name, shaderVersion, true));
>-    ASSERT(var);
>-    return new TIntermSymbol(var->getUniqueId(), name, var->getType());
>-}
>-
>-TIntermTyped *CreateBuiltInFunctionCallNode(const TString &name,
>-                                            TIntermSequence *arguments,
>-                                            const TSymbolTable &symbolTable,
>-                                            int shaderVersion)
>-{
>-    const TFunction *fn = LookUpBuiltInFunction(name, arguments, symbolTable, shaderVersion);
>-    ASSERT(fn);
>-    TOperator op = fn->getBuiltInOp();
>-    if (op != EOpNull)
>-    {
>-        if (arguments->size() == 1)
>-        {
>-            return new TIntermUnary(op, arguments->at(0)->getAsTyped());
>-        }
>-        return TIntermAggregate::Create(fn->getReturnType(), op, arguments);
>-    }
>-    return TIntermAggregate::CreateBuiltInFunctionCall(*fn, arguments);
>-}
>-
>-}  // namespace sh
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/IntermNode_util.h b/Source/ThirdParty/ANGLE/src/compiler/translator/IntermNode_util.h
>deleted file mode 100644
>index 6f3b0674f03..00000000000
>--- a/Source/ThirdParty/ANGLE/src/compiler/translator/IntermNode_util.h
>+++ /dev/null
>@@ -1,60 +0,0 @@
>-//
>-// Copyright (c) 2017 The ANGLE Project Authors. All rights reserved.
>-// Use of this source code is governed by a BSD-style license that can be
>-// found in the LICENSE file.
>-//
>-// IntermNode_util.h: High-level utilities for creating AST nodes and node hierarchies. Mostly meant
>-// to be used in AST transforms.
>-
>-#ifndef COMPILER_TRANSLATOR_INTERMNODEUTIL_H_
>-#define COMPILER_TRANSLATOR_INTERMNODEUTIL_H_
>-
>-#include "compiler/translator/IntermNode.h"
>-
>-namespace sh
>-{
>-
>-TIntermFunctionPrototype *CreateInternalFunctionPrototypeNode(const TType &returnType,
>-                                                              const char *name,
>-                                                              const TSymbolUniqueId &functionId);
>-TIntermFunctionDefinition *CreateInternalFunctionDefinitionNode(const TType &returnType,
>-                                                                const char *name,
>-                                                                TIntermBlock *functionBody,
>-                                                                const TSymbolUniqueId &functionId);
>-TIntermAggregate *CreateInternalFunctionCallNode(const TType &returnType,
>-                                                 const char *name,
>-                                                 const TSymbolUniqueId &functionId,
>-                                                 TIntermSequence *arguments);
>-
>-TIntermTyped *CreateZeroNode(const TType &type);
>-TIntermConstantUnion *CreateIndexNode(int index);
>-TIntermConstantUnion *CreateBoolNode(bool value);
>-
>-TIntermSymbol *CreateTempSymbolNode(const TSymbolUniqueId &id,
>-                                    const TType &type,
>-                                    TQualifier qualifier);
>-TIntermDeclaration *CreateTempInitDeclarationNode(const TSymbolUniqueId &id,
>-                                                  TIntermTyped *initializer,
>-                                                  TQualifier qualifier);
>-
>-// If the input node is nullptr, return nullptr.
>-// If the input node is a block node, return it.
>-// If the input node is not a block node, put it inside a block node and return that.
>-TIntermBlock *EnsureBlock(TIntermNode *node);
>-
>-// Should be called from inside Compiler::compileTreeImpl() where the global level is in scope.
>-TIntermSymbol *ReferenceGlobalVariable(const TString &name, const TSymbolTable &symbolTable);
>-
>-// Note: this can access desktop GLSL built-ins that are hidden from the parser.
>-TIntermSymbol *ReferenceBuiltInVariable(const TString &name,
>-                                        const TSymbolTable &symbolTable,
>-                                        int shaderVersion);
>-
>-TIntermTyped *CreateBuiltInFunctionCallNode(const TString &name,
>-                                            TIntermSequence *arguments,
>-                                            const TSymbolTable &symbolTable,
>-                                            int shaderVersion);
>-
>-}  // namespace sh
>-
>-#endif  // COMPILER_TRANSLATOR_INTERMNODEUTIL_H_
>\ No newline at end of file
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/IntermTraverse.cpp b/Source/ThirdParty/ANGLE/src/compiler/translator/IntermTraverse.cpp
>deleted file mode 100644
>index 6c25c6c35a5..00000000000
>--- a/Source/ThirdParty/ANGLE/src/compiler/translator/IntermTraverse.cpp
>+++ /dev/null
>@@ -1,983 +0,0 @@
>-//
>-// Copyright (c) 2002-2010 The ANGLE Project Authors. All rights reserved.
>-// Use of this source code is governed by a BSD-style license that can be
>-// found in the LICENSE file.
>-//
>-
>-#include "compiler/translator/IntermTraverse.h"
>-
>-#include "compiler/translator/InfoSink.h"
>-#include "compiler/translator/IntermNode_util.h"
>-#include "compiler/translator/SymbolTable.h"
>-
>-namespace sh
>-{
>-
>-void TIntermSymbol::traverse(TIntermTraverser *it)
>-{
>-    it->traverseSymbol(this);
>-}
>-
>-void TIntermRaw::traverse(TIntermTraverser *it)
>-{
>-    it->traverseRaw(this);
>-}
>-
>-void TIntermConstantUnion::traverse(TIntermTraverser *it)
>-{
>-    it->traverseConstantUnion(this);
>-}
>-
>-void TIntermSwizzle::traverse(TIntermTraverser *it)
>-{
>-    it->traverseSwizzle(this);
>-}
>-
>-void TIntermBinary::traverse(TIntermTraverser *it)
>-{
>-    it->traverseBinary(this);
>-}
>-
>-void TIntermUnary::traverse(TIntermTraverser *it)
>-{
>-    it->traverseUnary(this);
>-}
>-
>-void TIntermTernary::traverse(TIntermTraverser *it)
>-{
>-    it->traverseTernary(this);
>-}
>-
>-void TIntermIfElse::traverse(TIntermTraverser *it)
>-{
>-    it->traverseIfElse(this);
>-}
>-
>-void TIntermSwitch::traverse(TIntermTraverser *it)
>-{
>-    it->traverseSwitch(this);
>-}
>-
>-void TIntermCase::traverse(TIntermTraverser *it)
>-{
>-    it->traverseCase(this);
>-}
>-
>-void TIntermFunctionDefinition::traverse(TIntermTraverser *it)
>-{
>-    it->traverseFunctionDefinition(this);
>-}
>-
>-void TIntermBlock::traverse(TIntermTraverser *it)
>-{
>-    it->traverseBlock(this);
>-}
>-
>-void TIntermInvariantDeclaration::traverse(TIntermTraverser *it)
>-{
>-    it->traverseInvariantDeclaration(this);
>-}
>-
>-void TIntermDeclaration::traverse(TIntermTraverser *it)
>-{
>-    it->traverseDeclaration(this);
>-}
>-
>-void TIntermFunctionPrototype::traverse(TIntermTraverser *it)
>-{
>-    it->traverseFunctionPrototype(this);
>-}
>-
>-void TIntermAggregate::traverse(TIntermTraverser *it)
>-{
>-    it->traverseAggregate(this);
>-}
>-
>-void TIntermLoop::traverse(TIntermTraverser *it)
>-{
>-    it->traverseLoop(this);
>-}
>-
>-void TIntermBranch::traverse(TIntermTraverser *it)
>-{
>-    it->traverseBranch(this);
>-}
>-
>-TIntermTraverser::TIntermTraverser(bool preVisit,
>-                                   bool inVisit,
>-                                   bool postVisit,
>-                                   TSymbolTable *symbolTable)
>-    : preVisit(preVisit),
>-      inVisit(inVisit),
>-      postVisit(postVisit),
>-      mDepth(-1),
>-      mMaxDepth(0),
>-      mInGlobalScope(true),
>-      mSymbolTable(symbolTable),
>-      mTemporaryId(nullptr)
>-{
>-}
>-
>-TIntermTraverser::~TIntermTraverser()
>-{
>-}
>-
>-const TIntermBlock *TIntermTraverser::getParentBlock() const
>-{
>-    if (!mParentBlockStack.empty())
>-    {
>-        return mParentBlockStack.back().node;
>-    }
>-    return nullptr;
>-}
>-
>-void TIntermTraverser::pushParentBlock(TIntermBlock *node)
>-{
>-    mParentBlockStack.push_back(ParentBlock(node, 0));
>-}
>-
>-void TIntermTraverser::incrementParentBlockPos()
>-{
>-    ++mParentBlockStack.back().pos;
>-}
>-
>-void TIntermTraverser::popParentBlock()
>-{
>-    ASSERT(!mParentBlockStack.empty());
>-    mParentBlockStack.pop_back();
>-}
>-
>-void TIntermTraverser::insertStatementsInParentBlock(const TIntermSequence &insertions)
>-{
>-    TIntermSequence emptyInsertionsAfter;
>-    insertStatementsInParentBlock(insertions, emptyInsertionsAfter);
>-}
>-
>-void TIntermTraverser::insertStatementsInParentBlock(const TIntermSequence &insertionsBefore,
>-                                                     const TIntermSequence &insertionsAfter)
>-{
>-    ASSERT(!mParentBlockStack.empty());
>-    ParentBlock &parentBlock = mParentBlockStack.back();
>-    if (mPath.back() == parentBlock.node)
>-    {
>-        ASSERT(mParentBlockStack.size() >= 2u);
>-        // The current node is a block node, so the parent block is not the topmost one in the block
>-        // stack, but the one below that.
>-        parentBlock = mParentBlockStack.at(mParentBlockStack.size() - 2u);
>-    }
>-    NodeInsertMultipleEntry insert(parentBlock.node, parentBlock.pos, insertionsBefore,
>-                                   insertionsAfter);
>-    mInsertions.push_back(insert);
>-}
>-
>-void TIntermTraverser::insertStatementInParentBlock(TIntermNode *statement)
>-{
>-    TIntermSequence insertions;
>-    insertions.push_back(statement);
>-    insertStatementsInParentBlock(insertions);
>-}
>-
>-TIntermSymbol *TIntermTraverser::createTempSymbol(const TType &type, TQualifier qualifier)
>-{
>-    ASSERT(mTemporaryId != nullptr);
>-    // nextTemporaryId() needs to be called when the code wants to start using another temporary
>-    // symbol.
>-    return CreateTempSymbolNode(*mTemporaryId, type, qualifier);
>-}
>-
>-TIntermSymbol *TIntermTraverser::createTempSymbol(const TType &type)
>-{
>-    return createTempSymbol(type, EvqTemporary);
>-}
>-
>-TIntermDeclaration *TIntermTraverser::createTempDeclaration(const TType &type)
>-{
>-    ASSERT(mTemporaryId != nullptr);
>-    TIntermDeclaration *tempDeclaration = new TIntermDeclaration();
>-    tempDeclaration->appendDeclarator(CreateTempSymbolNode(*mTemporaryId, type, EvqTemporary));
>-    return tempDeclaration;
>-}
>-
>-TIntermDeclaration *TIntermTraverser::createTempInitDeclaration(TIntermTyped *initializer,
>-                                                                TQualifier qualifier)
>-{
>-    ASSERT(mTemporaryId != nullptr);
>-    return CreateTempInitDeclarationNode(*mTemporaryId, initializer, qualifier);
>-}
>-
>-TIntermDeclaration *TIntermTraverser::createTempInitDeclaration(TIntermTyped *initializer)
>-{
>-    return createTempInitDeclaration(initializer, EvqTemporary);
>-}
>-
>-TIntermBinary *TIntermTraverser::createTempAssignment(TIntermTyped *rightNode)
>-{
>-    ASSERT(rightNode != nullptr);
>-    TIntermSymbol *tempSymbol = createTempSymbol(rightNode->getType());
>-    TIntermBinary *assignment = new TIntermBinary(EOpAssign, tempSymbol, rightNode);
>-    return assignment;
>-}
>-
>-void TIntermTraverser::nextTemporaryId()
>-{
>-    ASSERT(mSymbolTable);
>-    if (!mTemporaryId)
>-    {
>-        mTemporaryId = new TSymbolUniqueId(mSymbolTable);
>-        return;
>-    }
>-    *mTemporaryId = TSymbolUniqueId(mSymbolTable);
>-}
>-
>-void TLValueTrackingTraverser::addToFunctionMap(const TSymbolUniqueId &id,
>-                                                TIntermSequence *paramSequence)
>-{
>-    mFunctionMap[id.get()] = paramSequence;
>-}
>-
>-bool TLValueTrackingTraverser::isInFunctionMap(const TIntermAggregate *callNode) const
>-{
>-    ASSERT(callNode->getOp() == EOpCallFunctionInAST);
>-    return (mFunctionMap.find(callNode->getFunctionSymbolInfo()->getId().get()) !=
>-            mFunctionMap.end());
>-}
>-
>-TIntermSequence *TLValueTrackingTraverser::getFunctionParameters(const TIntermAggregate *callNode)
>-{
>-    ASSERT(isInFunctionMap(callNode));
>-    return mFunctionMap[callNode->getFunctionSymbolInfo()->getId().get()];
>-}
>-
>-void TLValueTrackingTraverser::setInFunctionCallOutParameter(bool inOutParameter)
>-{
>-    mInFunctionCallOutParameter = inOutParameter;
>-}
>-
>-bool TLValueTrackingTraverser::isInFunctionCallOutParameter() const
>-{
>-    return mInFunctionCallOutParameter;
>-}
>-
>-//
>-// Traverse the intermediate representation tree, and
>-// call a node type specific function for each node.
>-// Done recursively through the member function Traverse().
>-// Node types can be skipped if their function to call is 0,
>-// but their subtree will still be traversed.
>-// Nodes with children can have their whole subtree skipped
>-// if preVisit is turned on and the type specific function
>-// returns false.
>-//
>-
>-//
>-// Traversal functions for terminals are straighforward....
>-//
>-void TIntermTraverser::traverseSymbol(TIntermSymbol *node)
>-{
>-    ScopedNodeInTraversalPath addToPath(this, node);
>-    visitSymbol(node);
>-}
>-
>-void TIntermTraverser::traverseConstantUnion(TIntermConstantUnion *node)
>-{
>-    ScopedNodeInTraversalPath addToPath(this, node);
>-    visitConstantUnion(node);
>-}
>-
>-void TIntermTraverser::traverseSwizzle(TIntermSwizzle *node)
>-{
>-    ScopedNodeInTraversalPath addToPath(this, node);
>-
>-    bool visit = true;
>-
>-    if (preVisit)
>-        visit = visitSwizzle(PreVisit, node);
>-
>-    if (visit)
>-    {
>-        node->getOperand()->traverse(this);
>-    }
>-
>-    if (visit && postVisit)
>-        visitSwizzle(PostVisit, node);
>-}
>-
>-//
>-// Traverse a binary node.
>-//
>-void TIntermTraverser::traverseBinary(TIntermBinary *node)
>-{
>-    ScopedNodeInTraversalPath addToPath(this, node);
>-
>-    bool visit = true;
>-
>-    //
>-    // visit the node before children if pre-visiting.
>-    //
>-    if (preVisit)
>-        visit = visitBinary(PreVisit, node);
>-
>-    //
>-    // Visit the children, in the right order.
>-    //
>-    if (visit)
>-    {
>-        if (node->getLeft())
>-            node->getLeft()->traverse(this);
>-
>-        if (inVisit)
>-            visit = visitBinary(InVisit, node);
>-
>-        if (visit && node->getRight())
>-            node->getRight()->traverse(this);
>-    }
>-
>-    //
>-    // Visit the node after the children, if requested and the traversal
>-    // hasn't been cancelled yet.
>-    //
>-    if (visit && postVisit)
>-        visitBinary(PostVisit, node);
>-}
>-
>-void TLValueTrackingTraverser::traverseBinary(TIntermBinary *node)
>-{
>-    ScopedNodeInTraversalPath addToPath(this, node);
>-
>-    bool visit = true;
>-
>-    //
>-    // visit the node before children if pre-visiting.
>-    //
>-    if (preVisit)
>-        visit = visitBinary(PreVisit, node);
>-
>-    //
>-    // Visit the children, in the right order.
>-    //
>-    if (visit)
>-    {
>-        // Some binary operations like indexing can be inside an expression which must be an
>-        // l-value.
>-        bool parentOperatorRequiresLValue     = operatorRequiresLValue();
>-        bool parentInFunctionCallOutParameter = isInFunctionCallOutParameter();
>-        if (node->isAssignment())
>-        {
>-            ASSERT(!isLValueRequiredHere());
>-            setOperatorRequiresLValue(true);
>-        }
>-
>-        if (node->getLeft())
>-            node->getLeft()->traverse(this);
>-
>-        if (inVisit)
>-            visit = visitBinary(InVisit, node);
>-
>-        if (node->isAssignment())
>-            setOperatorRequiresLValue(false);
>-
>-        // Index is not required to be an l-value even when the surrounding expression is required
>-        // to be an l-value.
>-        TOperator op = node->getOp();
>-        if (op == EOpIndexDirect || op == EOpIndexDirectInterfaceBlock ||
>-            op == EOpIndexDirectStruct || op == EOpIndexIndirect)
>-        {
>-            setOperatorRequiresLValue(false);
>-            setInFunctionCallOutParameter(false);
>-        }
>-
>-        if (visit && node->getRight())
>-            node->getRight()->traverse(this);
>-
>-        setOperatorRequiresLValue(parentOperatorRequiresLValue);
>-        setInFunctionCallOutParameter(parentInFunctionCallOutParameter);
>-    }
>-
>-    //
>-    // Visit the node after the children, if requested and the traversal
>-    // hasn't been cancelled yet.
>-    //
>-    if (visit && postVisit)
>-        visitBinary(PostVisit, node);
>-}
>-
>-//
>-// Traverse a unary node.  Same comments in binary node apply here.
>-//
>-void TIntermTraverser::traverseUnary(TIntermUnary *node)
>-{
>-    ScopedNodeInTraversalPath addToPath(this, node);
>-
>-    bool visit = true;
>-
>-    if (preVisit)
>-        visit = visitUnary(PreVisit, node);
>-
>-    if (visit)
>-    {
>-        node->getOperand()->traverse(this);
>-    }
>-
>-    if (visit && postVisit)
>-        visitUnary(PostVisit, node);
>-}
>-
>-void TLValueTrackingTraverser::traverseUnary(TIntermUnary *node)
>-{
>-    ScopedNodeInTraversalPath addToPath(this, node);
>-
>-    bool visit = true;
>-
>-    if (preVisit)
>-        visit = visitUnary(PreVisit, node);
>-
>-    if (visit)
>-    {
>-        ASSERT(!operatorRequiresLValue());
>-        switch (node->getOp())
>-        {
>-            case EOpPostIncrement:
>-            case EOpPostDecrement:
>-            case EOpPreIncrement:
>-            case EOpPreDecrement:
>-                setOperatorRequiresLValue(true);
>-                break;
>-            default:
>-                break;
>-        }
>-
>-        node->getOperand()->traverse(this);
>-
>-        setOperatorRequiresLValue(false);
>-    }
>-
>-    if (visit && postVisit)
>-        visitUnary(PostVisit, node);
>-}
>-
>-// Traverse a function definition node.
>-void TIntermTraverser::traverseFunctionDefinition(TIntermFunctionDefinition *node)
>-{
>-    ScopedNodeInTraversalPath addToPath(this, node);
>-
>-    bool visit = true;
>-
>-    if (preVisit)
>-        visit = visitFunctionDefinition(PreVisit, node);
>-
>-    if (visit)
>-    {
>-        mInGlobalScope = false;
>-
>-        node->getFunctionPrototype()->traverse(this);
>-        if (inVisit)
>-            visit = visitFunctionDefinition(InVisit, node);
>-        node->getBody()->traverse(this);
>-
>-        mInGlobalScope = true;
>-    }
>-
>-    if (visit && postVisit)
>-        visitFunctionDefinition(PostVisit, node);
>-}
>-
>-// Traverse a block node.
>-void TIntermTraverser::traverseBlock(TIntermBlock *node)
>-{
>-    ScopedNodeInTraversalPath addToPath(this, node);
>-    pushParentBlock(node);
>-
>-    bool visit = true;
>-
>-    TIntermSequence *sequence = node->getSequence();
>-
>-    if (preVisit)
>-        visit = visitBlock(PreVisit, node);
>-
>-    if (visit)
>-    {
>-        for (auto *child : *sequence)
>-        {
>-            child->traverse(this);
>-            if (visit && inVisit)
>-            {
>-                if (child != sequence->back())
>-                    visit = visitBlock(InVisit, node);
>-            }
>-
>-            incrementParentBlockPos();
>-        }
>-    }
>-
>-    if (visit && postVisit)
>-        visitBlock(PostVisit, node);
>-
>-    popParentBlock();
>-}
>-
>-void TIntermTraverser::traverseInvariantDeclaration(TIntermInvariantDeclaration *node)
>-{
>-    ScopedNodeInTraversalPath addToPath(this, node);
>-
>-    bool visit = true;
>-
>-    if (preVisit)
>-    {
>-        visit = visitInvariantDeclaration(PreVisit, node);
>-    }
>-
>-    if (visit)
>-    {
>-        node->getSymbol()->traverse(this);
>-        if (postVisit)
>-        {
>-            visitInvariantDeclaration(PostVisit, node);
>-        }
>-    }
>-}
>-
>-// Traverse a declaration node.
>-void TIntermTraverser::traverseDeclaration(TIntermDeclaration *node)
>-{
>-    ScopedNodeInTraversalPath addToPath(this, node);
>-
>-    bool visit = true;
>-
>-    TIntermSequence *sequence = node->getSequence();
>-
>-    if (preVisit)
>-        visit = visitDeclaration(PreVisit, node);
>-
>-    if (visit)
>-    {
>-        for (auto *child : *sequence)
>-        {
>-            child->traverse(this);
>-            if (visit && inVisit)
>-            {
>-                if (child != sequence->back())
>-                    visit = visitDeclaration(InVisit, node);
>-            }
>-        }
>-    }
>-
>-    if (visit && postVisit)
>-        visitDeclaration(PostVisit, node);
>-}
>-
>-void TIntermTraverser::traverseFunctionPrototype(TIntermFunctionPrototype *node)
>-{
>-    ScopedNodeInTraversalPath addToPath(this, node);
>-
>-    bool visit = true;
>-
>-    TIntermSequence *sequence = node->getSequence();
>-
>-    if (preVisit)
>-        visit = visitFunctionPrototype(PreVisit, node);
>-
>-    if (visit)
>-    {
>-        for (auto *child : *sequence)
>-        {
>-            child->traverse(this);
>-            if (visit && inVisit)
>-            {
>-                if (child != sequence->back())
>-                    visit = visitFunctionPrototype(InVisit, node);
>-            }
>-        }
>-    }
>-
>-    if (visit && postVisit)
>-        visitFunctionPrototype(PostVisit, node);
>-}
>-
>-// Traverse an aggregate node.  Same comments in binary node apply here.
>-void TIntermTraverser::traverseAggregate(TIntermAggregate *node)
>-{
>-    ScopedNodeInTraversalPath addToPath(this, node);
>-
>-    bool visit = true;
>-
>-    TIntermSequence *sequence = node->getSequence();
>-
>-    if (preVisit)
>-        visit = visitAggregate(PreVisit, node);
>-
>-    if (visit)
>-    {
>-        for (auto *child : *sequence)
>-        {
>-            child->traverse(this);
>-            if (visit && inVisit)
>-            {
>-                if (child != sequence->back())
>-                    visit = visitAggregate(InVisit, node);
>-            }
>-        }
>-    }
>-
>-    if (visit && postVisit)
>-        visitAggregate(PostVisit, node);
>-}
>-
>-bool TIntermTraverser::CompareInsertion(const NodeInsertMultipleEntry &a,
>-                                        const NodeInsertMultipleEntry &b)
>-{
>-    if (a.parent != b.parent)
>-    {
>-        return a.parent > b.parent;
>-    }
>-    return a.position > b.position;
>-}
>-
>-void TIntermTraverser::updateTree()
>-{
>-    // Sort the insertions so that insertion position is decreasing. This way multiple insertions to
>-    // the same parent node are handled correctly.
>-    std::sort(mInsertions.begin(), mInsertions.end(), CompareInsertion);
>-    for (size_t ii = 0; ii < mInsertions.size(); ++ii)
>-    {
>-        // We can't know here what the intended ordering of two insertions to the same position is,
>-        // so it is not supported.
>-        ASSERT(ii == 0 || mInsertions[ii].position != mInsertions[ii - 1].position ||
>-               mInsertions[ii].parent != mInsertions[ii - 1].parent);
>-        const NodeInsertMultipleEntry &insertion = mInsertions[ii];
>-        ASSERT(insertion.parent);
>-        if (!insertion.insertionsAfter.empty())
>-        {
>-            bool inserted = insertion.parent->insertChildNodes(insertion.position + 1,
>-                                                               insertion.insertionsAfter);
>-            ASSERT(inserted);
>-        }
>-        if (!insertion.insertionsBefore.empty())
>-        {
>-            bool inserted =
>-                insertion.parent->insertChildNodes(insertion.position, insertion.insertionsBefore);
>-            ASSERT(inserted);
>-        }
>-    }
>-    for (size_t ii = 0; ii < mReplacements.size(); ++ii)
>-    {
>-        const NodeUpdateEntry &replacement = mReplacements[ii];
>-        ASSERT(replacement.parent);
>-        bool replaced =
>-            replacement.parent->replaceChildNode(replacement.original, replacement.replacement);
>-        ASSERT(replaced);
>-
>-        if (!replacement.originalBecomesChildOfReplacement)
>-        {
>-            // In AST traversing, a parent is visited before its children.
>-            // After we replace a node, if its immediate child is to
>-            // be replaced, we need to make sure we don't update the replaced
>-            // node; instead, we update the replacement node.
>-            for (size_t jj = ii + 1; jj < mReplacements.size(); ++jj)
>-            {
>-                NodeUpdateEntry &replacement2 = mReplacements[jj];
>-                if (replacement2.parent == replacement.original)
>-                    replacement2.parent = replacement.replacement;
>-            }
>-        }
>-    }
>-    for (size_t ii = 0; ii < mMultiReplacements.size(); ++ii)
>-    {
>-        const NodeReplaceWithMultipleEntry &replacement = mMultiReplacements[ii];
>-        ASSERT(replacement.parent);
>-        bool replaced = replacement.parent->replaceChildNodeWithMultiple(replacement.original,
>-                                                                         replacement.replacements);
>-        ASSERT(replaced);
>-    }
>-
>-    clearReplacementQueue();
>-}
>-
>-void TIntermTraverser::clearReplacementQueue()
>-{
>-    mReplacements.clear();
>-    mMultiReplacements.clear();
>-    mInsertions.clear();
>-}
>-
>-void TIntermTraverser::queueReplacement(TIntermNode *replacement, OriginalNode originalStatus)
>-{
>-    queueReplacementWithParent(getParentNode(), mPath.back(), replacement, originalStatus);
>-}
>-
>-void TIntermTraverser::queueReplacementWithParent(TIntermNode *parent,
>-                                                  TIntermNode *original,
>-                                                  TIntermNode *replacement,
>-                                                  OriginalNode originalStatus)
>-{
>-    bool originalBecomesChild = (originalStatus == OriginalNode::BECOMES_CHILD);
>-    mReplacements.push_back(NodeUpdateEntry(parent, original, replacement, originalBecomesChild));
>-}
>-
>-TLValueTrackingTraverser::TLValueTrackingTraverser(bool preVisit,
>-                                                   bool inVisit,
>-                                                   bool postVisit,
>-                                                   TSymbolTable *symbolTable,
>-                                                   int shaderVersion)
>-    : TIntermTraverser(preVisit, inVisit, postVisit, symbolTable),
>-      mOperatorRequiresLValue(false),
>-      mInFunctionCallOutParameter(false),
>-      mShaderVersion(shaderVersion)
>-{
>-    ASSERT(symbolTable);
>-}
>-
>-void TLValueTrackingTraverser::traverseFunctionPrototype(TIntermFunctionPrototype *node)
>-{
>-    TIntermSequence *sequence = node->getSequence();
>-    addToFunctionMap(node->getFunctionSymbolInfo()->getId(), sequence);
>-
>-    TIntermTraverser::traverseFunctionPrototype(node);
>-}
>-
>-void TLValueTrackingTraverser::traverseAggregate(TIntermAggregate *node)
>-{
>-    ScopedNodeInTraversalPath addToPath(this, node);
>-
>-    bool visit = true;
>-
>-    TIntermSequence *sequence = node->getSequence();
>-
>-    if (preVisit)
>-        visit = visitAggregate(PreVisit, node);
>-
>-    if (visit)
>-    {
>-        if (node->getOp() == EOpCallFunctionInAST)
>-        {
>-            if (isInFunctionMap(node))
>-            {
>-                TIntermSequence *params             = getFunctionParameters(node);
>-                TIntermSequence::iterator paramIter = params->begin();
>-                for (auto *child : *sequence)
>-                {
>-                    ASSERT(paramIter != params->end());
>-                    TQualifier qualifier = (*paramIter)->getAsTyped()->getQualifier();
>-                    setInFunctionCallOutParameter(qualifier == EvqOut || qualifier == EvqInOut);
>-
>-                    child->traverse(this);
>-                    if (visit && inVisit)
>-                    {
>-                        if (child != sequence->back())
>-                            visit = visitAggregate(InVisit, node);
>-                    }
>-
>-                    ++paramIter;
>-                }
>-            }
>-            else
>-            {
>-                // The node might not be in the function map in case we're in the middle of
>-                // transforming the AST, and have inserted function call nodes without inserting the
>-                // function definitions yet.
>-                setInFunctionCallOutParameter(false);
>-                for (auto *child : *sequence)
>-                {
>-                    child->traverse(this);
>-                    if (visit && inVisit)
>-                    {
>-                        if (child != sequence->back())
>-                            visit = visitAggregate(InVisit, node);
>-                    }
>-                }
>-            }
>-
>-            setInFunctionCallOutParameter(false);
>-        }
>-        else
>-        {
>-            // Find the built-in function corresponding to this op so that we can determine the
>-            // in/out qualifiers of its parameters.
>-            TFunction *builtInFunc = nullptr;
>-            if (!node->isFunctionCall() && !node->isConstructor())
>-            {
>-                builtInFunc = static_cast<TFunction *>(
>-                    mSymbolTable->findBuiltIn(node->getSymbolTableMangledName(), mShaderVersion));
>-            }
>-
>-            size_t paramIndex = 0;
>-
>-            for (auto *child : *sequence)
>-            {
>-                // This assumes that raw functions called with
>-                // EOpCallInternalRawFunction don't have out parameters.
>-                TQualifier qualifier = EvqIn;
>-                if (builtInFunc != nullptr)
>-                    qualifier = builtInFunc->getParam(paramIndex).type->getQualifier();
>-                setInFunctionCallOutParameter(qualifier == EvqOut || qualifier == EvqInOut);
>-                child->traverse(this);
>-
>-                if (visit && inVisit)
>-                {
>-                    if (child != sequence->back())
>-                        visit = visitAggregate(InVisit, node);
>-                }
>-
>-                ++paramIndex;
>-            }
>-
>-            setInFunctionCallOutParameter(false);
>-        }
>-    }
>-
>-    if (visit && postVisit)
>-        visitAggregate(PostVisit, node);
>-}
>-
>-//
>-// Traverse a ternary node.  Same comments in binary node apply here.
>-//
>-void TIntermTraverser::traverseTernary(TIntermTernary *node)
>-{
>-    ScopedNodeInTraversalPath addToPath(this, node);
>-
>-    bool visit = true;
>-
>-    if (preVisit)
>-        visit = visitTernary(PreVisit, node);
>-
>-    if (visit)
>-    {
>-        node->getCondition()->traverse(this);
>-        if (node->getTrueExpression())
>-            node->getTrueExpression()->traverse(this);
>-        if (node->getFalseExpression())
>-            node->getFalseExpression()->traverse(this);
>-    }
>-
>-    if (visit && postVisit)
>-        visitTernary(PostVisit, node);
>-}
>-
>-// Traverse an if-else node.  Same comments in binary node apply here.
>-void TIntermTraverser::traverseIfElse(TIntermIfElse *node)
>-{
>-    ScopedNodeInTraversalPath addToPath(this, node);
>-
>-    bool visit = true;
>-
>-    if (preVisit)
>-        visit = visitIfElse(PreVisit, node);
>-
>-    if (visit)
>-    {
>-        node->getCondition()->traverse(this);
>-        if (node->getTrueBlock())
>-            node->getTrueBlock()->traverse(this);
>-        if (node->getFalseBlock())
>-            node->getFalseBlock()->traverse(this);
>-    }
>-
>-    if (visit && postVisit)
>-        visitIfElse(PostVisit, node);
>-}
>-
>-//
>-// Traverse a switch node.  Same comments in binary node apply here.
>-//
>-void TIntermTraverser::traverseSwitch(TIntermSwitch *node)
>-{
>-    ScopedNodeInTraversalPath addToPath(this, node);
>-
>-    bool visit = true;
>-
>-    if (preVisit)
>-        visit = visitSwitch(PreVisit, node);
>-
>-    if (visit)
>-    {
>-        node->getInit()->traverse(this);
>-        if (inVisit)
>-            visit = visitSwitch(InVisit, node);
>-        if (visit && node->getStatementList())
>-            node->getStatementList()->traverse(this);
>-    }
>-
>-    if (visit && postVisit)
>-        visitSwitch(PostVisit, node);
>-}
>-
>-//
>-// Traverse a case node.  Same comments in binary node apply here.
>-//
>-void TIntermTraverser::traverseCase(TIntermCase *node)
>-{
>-    ScopedNodeInTraversalPath addToPath(this, node);
>-
>-    bool visit = true;
>-
>-    if (preVisit)
>-        visit = visitCase(PreVisit, node);
>-
>-    if (visit && node->getCondition())
>-    {
>-        node->getCondition()->traverse(this);
>-    }
>-
>-    if (visit && postVisit)
>-        visitCase(PostVisit, node);
>-}
>-
>-//
>-// Traverse a loop node.  Same comments in binary node apply here.
>-//
>-void TIntermTraverser::traverseLoop(TIntermLoop *node)
>-{
>-    ScopedNodeInTraversalPath addToPath(this, node);
>-
>-    bool visit = true;
>-
>-    if (preVisit)
>-        visit = visitLoop(PreVisit, node);
>-
>-    if (visit)
>-    {
>-        if (node->getInit())
>-            node->getInit()->traverse(this);
>-
>-        if (node->getCondition())
>-            node->getCondition()->traverse(this);
>-
>-        if (node->getBody())
>-            node->getBody()->traverse(this);
>-
>-        if (node->getExpression())
>-            node->getExpression()->traverse(this);
>-    }
>-
>-    if (visit && postVisit)
>-        visitLoop(PostVisit, node);
>-}
>-
>-//
>-// Traverse a branch node.  Same comments in binary node apply here.
>-//
>-void TIntermTraverser::traverseBranch(TIntermBranch *node)
>-{
>-    ScopedNodeInTraversalPath addToPath(this, node);
>-
>-    bool visit = true;
>-
>-    if (preVisit)
>-        visit = visitBranch(PreVisit, node);
>-
>-    if (visit && node->getExpression())
>-    {
>-        node->getExpression()->traverse(this);
>-    }
>-
>-    if (visit && postVisit)
>-        visitBranch(PostVisit, node);
>-}
>-
>-void TIntermTraverser::traverseRaw(TIntermRaw *node)
>-{
>-    ScopedNodeInTraversalPath addToPath(this, node);
>-    visitRaw(node);
>-}
>-
>-}  // namespace sh
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/IntermTraverse.h b/Source/ThirdParty/ANGLE/src/compiler/translator/IntermTraverse.h
>deleted file mode 100644
>index f0300b586bd..00000000000
>--- a/Source/ThirdParty/ANGLE/src/compiler/translator/IntermTraverse.h
>+++ /dev/null
>@@ -1,355 +0,0 @@
>-//
>-// Copyright (c) 2017 The ANGLE Project Authors. All rights reserved.
>-// Use of this source code is governed by a BSD-style license that can be
>-// found in the LICENSE file.
>-//
>-// IntermTraverse.h : base classes for AST traversers that walk the AST and
>-//   also have the ability to transform it by replacing nodes.
>-
>-#ifndef COMPILER_TRANSLATOR_INTERMTRAVERSE_H_
>-#define COMPILER_TRANSLATOR_INTERMTRAVERSE_H_
>-
>-#include "compiler/translator/IntermNode.h"
>-
>-namespace sh
>-{
>-
>-class TSymbolTable;
>-class TSymbolUniqueId;
>-
>-enum Visit
>-{
>-    PreVisit,
>-    InVisit,
>-    PostVisit
>-};
>-
>-// For traversing the tree.  User should derive from this class overriding the visit functions,
>-// and then pass an object of the subclass to a traverse method of a node.
>-//
>-// The traverse*() functions may also be overridden to do other bookkeeping on the tree to provide
>-// contextual information to the visit functions, such as whether the node is the target of an
>-// assignment. This is complex to maintain and so should only be done in special cases.
>-//
>-// When using this, just fill in the methods for nodes you want visited.
>-// Return false from a pre-visit to skip visiting that node's subtree.
>-class TIntermTraverser : angle::NonCopyable
>-{
>-  public:
>-    POOL_ALLOCATOR_NEW_DELETE();
>-    TIntermTraverser(bool preVisit,
>-                     bool inVisit,
>-                     bool postVisit,
>-                     TSymbolTable *symbolTable = nullptr);
>-    virtual ~TIntermTraverser();
>-
>-    virtual void visitSymbol(TIntermSymbol *node) {}
>-    virtual void visitRaw(TIntermRaw *node) {}
>-    virtual void visitConstantUnion(TIntermConstantUnion *node) {}
>-    virtual bool visitSwizzle(Visit visit, TIntermSwizzle *node) { return true; }
>-    virtual bool visitBinary(Visit visit, TIntermBinary *node) { return true; }
>-    virtual bool visitUnary(Visit visit, TIntermUnary *node) { return true; }
>-    virtual bool visitTernary(Visit visit, TIntermTernary *node) { return true; }
>-    virtual bool visitIfElse(Visit visit, TIntermIfElse *node) { return true; }
>-    virtual bool visitSwitch(Visit visit, TIntermSwitch *node) { return true; }
>-    virtual bool visitCase(Visit visit, TIntermCase *node) { return true; }
>-    virtual bool visitFunctionPrototype(Visit visit, TIntermFunctionPrototype *node)
>-    {
>-        return true;
>-    }
>-    virtual bool visitFunctionDefinition(Visit visit, TIntermFunctionDefinition *node)
>-    {
>-        return true;
>-    }
>-    virtual bool visitAggregate(Visit visit, TIntermAggregate *node) { return true; }
>-    virtual bool visitBlock(Visit visit, TIntermBlock *node) { return true; }
>-    virtual bool visitInvariantDeclaration(Visit visit, TIntermInvariantDeclaration *node)
>-    {
>-        return true;
>-    }
>-    virtual bool visitDeclaration(Visit visit, TIntermDeclaration *node) { return true; }
>-    virtual bool visitLoop(Visit visit, TIntermLoop *node) { return true; }
>-    virtual bool visitBranch(Visit visit, TIntermBranch *node) { return true; }
>-
>-    // The traverse functions contain logic for iterating over the children of the node
>-    // and calling the visit functions in the appropriate places. They also track some
>-    // context that may be used by the visit functions.
>-    virtual void traverseSymbol(TIntermSymbol *node);
>-    virtual void traverseRaw(TIntermRaw *node);
>-    virtual void traverseConstantUnion(TIntermConstantUnion *node);
>-    virtual void traverseSwizzle(TIntermSwizzle *node);
>-    virtual void traverseBinary(TIntermBinary *node);
>-    virtual void traverseUnary(TIntermUnary *node);
>-    virtual void traverseTernary(TIntermTernary *node);
>-    virtual void traverseIfElse(TIntermIfElse *node);
>-    virtual void traverseSwitch(TIntermSwitch *node);
>-    virtual void traverseCase(TIntermCase *node);
>-    virtual void traverseFunctionPrototype(TIntermFunctionPrototype *node);
>-    virtual void traverseFunctionDefinition(TIntermFunctionDefinition *node);
>-    virtual void traverseAggregate(TIntermAggregate *node);
>-    virtual void traverseBlock(TIntermBlock *node);
>-    virtual void traverseInvariantDeclaration(TIntermInvariantDeclaration *node);
>-    virtual void traverseDeclaration(TIntermDeclaration *node);
>-    virtual void traverseLoop(TIntermLoop *node);
>-    virtual void traverseBranch(TIntermBranch *node);
>-
>-    int getMaxDepth() const { return mMaxDepth; }
>-
>-    // If traversers need to replace nodes, they can add the replacements in
>-    // mReplacements/mMultiReplacements during traversal and the user of the traverser should call
>-    // this function after traversal to perform them.
>-    void updateTree();
>-
>-  protected:
>-    // Should only be called from traverse*() functions
>-    void incrementDepth(TIntermNode *current)
>-    {
>-        mDepth++;
>-        mMaxDepth = std::max(mMaxDepth, mDepth);
>-        mPath.push_back(current);
>-    }
>-
>-    // Should only be called from traverse*() functions
>-    void decrementDepth()
>-    {
>-        mDepth--;
>-        mPath.pop_back();
>-    }
>-
>-    // RAII helper for incrementDepth/decrementDepth
>-    class ScopedNodeInTraversalPath
>-    {
>-      public:
>-        ScopedNodeInTraversalPath(TIntermTraverser *traverser, TIntermNode *current)
>-            : mTraverser(traverser)
>-        {
>-            mTraverser->incrementDepth(current);
>-        }
>-        ~ScopedNodeInTraversalPath() { mTraverser->decrementDepth(); }
>-
>-      private:
>-        TIntermTraverser *mTraverser;
>-    };
>-
>-    TIntermNode *getParentNode() { return mPath.size() <= 1 ? nullptr : mPath[mPath.size() - 2u]; }
>-
>-    // Return the nth ancestor of the node being traversed. getAncestorNode(0) == getParentNode()
>-    TIntermNode *getAncestorNode(unsigned int n)
>-    {
>-        if (mPath.size() > n + 1u)
>-        {
>-            return mPath[mPath.size() - n - 2u];
>-        }
>-        return nullptr;
>-    }
>-
>-    const TIntermBlock *getParentBlock() const;
>-
>-    void pushParentBlock(TIntermBlock *node);
>-    void incrementParentBlockPos();
>-    void popParentBlock();
>-
>-    // To replace a single node with multiple nodes in the parent aggregate. May be used with blocks
>-    // but also with other nodes like declarations.
>-    struct NodeReplaceWithMultipleEntry
>-    {
>-        NodeReplaceWithMultipleEntry(TIntermAggregateBase *_parent,
>-                                     TIntermNode *_original,
>-                                     TIntermSequence _replacements)
>-            : parent(_parent), original(_original), replacements(_replacements)
>-        {
>-        }
>-
>-        TIntermAggregateBase *parent;
>-        TIntermNode *original;
>-        TIntermSequence replacements;
>-    };
>-
>-    // Helper to insert statements in the parent block of the node currently being traversed.
>-    // The statements will be inserted before the node being traversed once updateTree is called.
>-    // Should only be called during PreVisit or PostVisit if called from block nodes.
>-    // Note that two insertions to the same position in the same block are not supported.
>-    void insertStatementsInParentBlock(const TIntermSequence &insertions);
>-
>-    // Same as above, but supports simultaneous insertion of statements before and after the node
>-    // currently being traversed.
>-    void insertStatementsInParentBlock(const TIntermSequence &insertionsBefore,
>-                                       const TIntermSequence &insertionsAfter);
>-
>-    // Helper to insert a single statement.
>-    void insertStatementInParentBlock(TIntermNode *statement);
>-
>-    // Helper to create a temporary symbol node with the given qualifier.
>-    TIntermSymbol *createTempSymbol(const TType &type, TQualifier qualifier);
>-    // Helper to create a temporary symbol node.
>-    TIntermSymbol *createTempSymbol(const TType &type);
>-    // Create a node that declares but doesn't initialize a temporary symbol.
>-    TIntermDeclaration *createTempDeclaration(const TType &type);
>-    // Create a node that initializes the current temporary symbol with initializer. The symbol will
>-    // have the given qualifier.
>-    TIntermDeclaration *createTempInitDeclaration(TIntermTyped *initializer, TQualifier qualifier);
>-    // Create a node that initializes the current temporary symbol with initializer.
>-    TIntermDeclaration *createTempInitDeclaration(TIntermTyped *initializer);
>-    // Create a node that assigns rightNode to the current temporary symbol.
>-    TIntermBinary *createTempAssignment(TIntermTyped *rightNode);
>-    // Increment temporary symbol index.
>-    void nextTemporaryId();
>-
>-    enum class OriginalNode
>-    {
>-        BECOMES_CHILD,
>-        IS_DROPPED
>-    };
>-
>-    void clearReplacementQueue();
>-
>-    // Replace the node currently being visited with replacement.
>-    void queueReplacement(TIntermNode *replacement, OriginalNode originalStatus);
>-    // Explicitly specify a node to replace with replacement.
>-    void queueReplacementWithParent(TIntermNode *parent,
>-                                    TIntermNode *original,
>-                                    TIntermNode *replacement,
>-                                    OriginalNode originalStatus);
>-
>-    const bool preVisit;
>-    const bool inVisit;
>-    const bool postVisit;
>-
>-    int mDepth;
>-    int mMaxDepth;
>-
>-    bool mInGlobalScope;
>-
>-    // During traversing, save all the changes that need to happen into
>-    // mReplacements/mMultiReplacements, then do them by calling updateTree().
>-    // Multi replacements are processed after single replacements.
>-    std::vector<NodeReplaceWithMultipleEntry> mMultiReplacements;
>-
>-    TSymbolTable *mSymbolTable;
>-
>-  private:
>-    // To insert multiple nodes into the parent block.
>-    struct NodeInsertMultipleEntry
>-    {
>-        NodeInsertMultipleEntry(TIntermBlock *_parent,
>-                                TIntermSequence::size_type _position,
>-                                TIntermSequence _insertionsBefore,
>-                                TIntermSequence _insertionsAfter)
>-            : parent(_parent),
>-              position(_position),
>-              insertionsBefore(_insertionsBefore),
>-              insertionsAfter(_insertionsAfter)
>-        {
>-        }
>-
>-        TIntermBlock *parent;
>-        TIntermSequence::size_type position;
>-        TIntermSequence insertionsBefore;
>-        TIntermSequence insertionsAfter;
>-    };
>-
>-    static bool CompareInsertion(const NodeInsertMultipleEntry &a,
>-                                 const NodeInsertMultipleEntry &b);
>-
>-    // To replace a single node with another on the parent node
>-    struct NodeUpdateEntry
>-    {
>-        NodeUpdateEntry(TIntermNode *_parent,
>-                        TIntermNode *_original,
>-                        TIntermNode *_replacement,
>-                        bool _originalBecomesChildOfReplacement)
>-            : parent(_parent),
>-              original(_original),
>-              replacement(_replacement),
>-              originalBecomesChildOfReplacement(_originalBecomesChildOfReplacement)
>-        {
>-        }
>-
>-        TIntermNode *parent;
>-        TIntermNode *original;
>-        TIntermNode *replacement;
>-        bool originalBecomesChildOfReplacement;
>-    };
>-
>-    struct ParentBlock
>-    {
>-        ParentBlock(TIntermBlock *nodeIn, TIntermSequence::size_type posIn)
>-            : node(nodeIn), pos(posIn)
>-        {
>-        }
>-
>-        TIntermBlock *node;
>-        TIntermSequence::size_type pos;
>-    };
>-
>-    std::vector<NodeInsertMultipleEntry> mInsertions;
>-    std::vector<NodeUpdateEntry> mReplacements;
>-
>-    // All the nodes from root to the current node during traversing.
>-    TVector<TIntermNode *> mPath;
>-
>-    // All the code blocks from the root to the current node's parent during traversal.
>-    std::vector<ParentBlock> mParentBlockStack;
>-
>-    TSymbolUniqueId *mTemporaryId;
>-};
>-
>-// Traverser parent class that tracks where a node is a destination of a write operation and so is
>-// required to be an l-value.
>-class TLValueTrackingTraverser : public TIntermTraverser
>-{
>-  public:
>-    TLValueTrackingTraverser(bool preVisit,
>-                             bool inVisit,
>-                             bool postVisit,
>-                             TSymbolTable *symbolTable,
>-                             int shaderVersion);
>-    virtual ~TLValueTrackingTraverser() {}
>-
>-    void traverseBinary(TIntermBinary *node) final;
>-    void traverseUnary(TIntermUnary *node) final;
>-    void traverseFunctionPrototype(TIntermFunctionPrototype *node) final;
>-    void traverseAggregate(TIntermAggregate *node) final;
>-
>-  protected:
>-    bool isLValueRequiredHere() const
>-    {
>-        return mOperatorRequiresLValue || mInFunctionCallOutParameter;
>-    }
>-
>-  private:
>-    // Track whether an l-value is required in the node that is currently being traversed by the
>-    // surrounding operator.
>-    // Use isLValueRequiredHere to check all conditions which require an l-value.
>-    void setOperatorRequiresLValue(bool lValueRequired)
>-    {
>-        mOperatorRequiresLValue = lValueRequired;
>-    }
>-    bool operatorRequiresLValue() const { return mOperatorRequiresLValue; }
>-
>-    // Add a function encountered during traversal to the function map.
>-    void addToFunctionMap(const TSymbolUniqueId &id, TIntermSequence *paramSequence);
>-
>-    // Return true if the prototype or definition of the function being called has been encountered
>-    // during traversal.
>-    bool isInFunctionMap(const TIntermAggregate *callNode) const;
>-
>-    // Return the parameters sequence from the function definition or prototype.
>-    TIntermSequence *getFunctionParameters(const TIntermAggregate *callNode);
>-
>-    // Track whether an l-value is required inside a function call.
>-    void setInFunctionCallOutParameter(bool inOutParameter);
>-    bool isInFunctionCallOutParameter() const;
>-
>-    bool mOperatorRequiresLValue;
>-    bool mInFunctionCallOutParameter;
>-
>-    // Map from function symbol id values to their parameter sequences
>-    TMap<int, TIntermSequence *> mFunctionMap;
>-
>-    const int mShaderVersion;
>-};
>-
>-}  // namespace sh
>-
>-#endif  // COMPILER_TRANSLATOR_INTERMTRAVERSE_H_
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/IsASTDepthBelowLimit.cpp b/Source/ThirdParty/ANGLE/src/compiler/translator/IsASTDepthBelowLimit.cpp
>index aaad4f3c68f..73cb9d18331 100644
>--- a/Source/ThirdParty/ANGLE/src/compiler/translator/IsASTDepthBelowLimit.cpp
>+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/IsASTDepthBelowLimit.cpp
>@@ -6,7 +6,7 @@
> 
> #include "compiler/translator/IsASTDepthBelowLimit.h"
> 
>-#include "compiler/translator/IntermTraverse.h"
>+#include "compiler/translator/tree_util/IntermTraverse.h"
> 
> namespace sh
> {
>@@ -18,24 +18,10 @@ namespace
> class MaxDepthTraverser : public TIntermTraverser
> {
>   public:
>-    MaxDepthTraverser(int depthLimit) : TIntermTraverser(true, true, false), mDepthLimit(depthLimit)
>+    MaxDepthTraverser(int depthLimit) : TIntermTraverser(true, false, false, nullptr)
>     {
>+        setMaxAllowedDepth(depthLimit);
>     }
>-
>-    bool visitBinary(Visit, TIntermBinary *) override { return depthCheck(); }
>-    bool visitUnary(Visit, TIntermUnary *) override { return depthCheck(); }
>-    bool visitTernary(Visit, TIntermTernary *) override { return depthCheck(); }
>-    bool visitSwizzle(Visit, TIntermSwizzle *) override { return depthCheck(); }
>-    bool visitIfElse(Visit, TIntermIfElse *) override { return depthCheck(); }
>-    bool visitAggregate(Visit, TIntermAggregate *) override { return depthCheck(); }
>-    bool visitBlock(Visit, TIntermBlock *) override { return depthCheck(); }
>-    bool visitLoop(Visit, TIntermLoop *) override { return depthCheck(); }
>-    bool visitBranch(Visit, TIntermBranch *) override { return depthCheck(); }
>-
>-  protected:
>-    bool depthCheck() const { return mMaxDepth < mDepthLimit; }
>-
>-    int mDepthLimit;
> };
> 
> }  // anonymous namespace
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/NodeSearch.h b/Source/ThirdParty/ANGLE/src/compiler/translator/NodeSearch.h
>deleted file mode 100644
>index af86b8bde46..00000000000
>--- a/Source/ThirdParty/ANGLE/src/compiler/translator/NodeSearch.h
>+++ /dev/null
>@@ -1,56 +0,0 @@
>-//
>-// Copyright (c) 2002-2013 The ANGLE Project Authors. All rights reserved.
>-// Use of this source code is governed by a BSD-style license that can be
>-// found in the LICENSE file.
>-//
>-// NodeSearch.h: Utilities for searching translator node graphs
>-//
>-
>-#ifndef COMPILER_TRANSLATOR_NODESEARCH_H_
>-#define COMPILER_TRANSLATOR_NODESEARCH_H_
>-
>-#include "compiler/translator/IntermTraverse.h"
>-
>-namespace sh
>-{
>-
>-template <class Parent>
>-class NodeSearchTraverser : public TIntermTraverser
>-{
>-  public:
>-    NodeSearchTraverser() : TIntermTraverser(true, false, false), mFound(false) {}
>-
>-    bool found() const { return mFound; }
>-
>-    static bool search(TIntermNode *node)
>-    {
>-        Parent searchTraverser;
>-        node->traverse(&searchTraverser);
>-        return searchTraverser.found();
>-    }
>-
>-  protected:
>-    bool mFound;
>-};
>-
>-class FindDiscard : public NodeSearchTraverser<FindDiscard>
>-{
>-  public:
>-    virtual bool visitBranch(Visit visit, TIntermBranch *node)
>-    {
>-        switch (node->getFlowOp())
>-        {
>-            case EOpKill:
>-                mFound = true;
>-                break;
>-
>-            default:
>-                break;
>-        }
>-
>-        return !mFound;
>-    }
>-};
>-}
>-
>-#endif  // COMPILER_TRANSLATOR_NODESEARCH_H_
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/Operator.cpp b/Source/ThirdParty/ANGLE/src/compiler/translator/Operator.cpp
>index 7a2156611aa..090455c89c4 100644
>--- a/Source/ThirdParty/ANGLE/src/compiler/translator/Operator.cpp
>+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/Operator.cpp
>@@ -10,7 +10,7 @@ const char *GetOperatorString(TOperator op)
> {
>     switch (op)
>     {
>-        // Note: EOpNull and EOpCall* can't be handled here.
>+            // Note: EOpNull and EOpCall* can't be handled here.
> 
>         case EOpNegative:
>             return "-";
>@@ -151,7 +151,7 @@ const char *GetOperatorString(TOperator op)
>             return "log2";
>         case EOpSqrt:
>             return "sqrt";
>-        case EOpInverseSqrt:
>+        case EOpInversesqrt:
>             return "inversesqrt";
> 
>         case EOpAbs:
>@@ -184,11 +184,11 @@ const char *GetOperatorString(TOperator op)
>             return "mix";
>         case EOpStep:
>             return "step";
>-        case EOpSmoothStep:
>+        case EOpSmoothstep:
>             return "smoothstep";
>-        case EOpIsNan:
>+        case EOpIsnan:
>             return "isnan";
>-        case EOpIsInf:
>+        case EOpIsinf:
>             return "isinf";
> 
>         case EOpFloatBitsToInt:
>@@ -345,6 +345,23 @@ const char *GetOperatorString(TOperator op)
>         case EOpGroupMemoryBarrier:
>             return "groupMemoryBarrier";
> 
>+        case EOpAtomicAdd:
>+            return "atomicAdd";
>+        case EOpAtomicMin:
>+            return "atomicMin";
>+        case EOpAtomicMax:
>+            return "atomicMax";
>+        case EOpAtomicAnd:
>+            return "atomicAnd";
>+        case EOpAtomicOr:
>+            return "atomicOr";
>+        case EOpAtomicXor:
>+            return "atomicXor";
>+        case EOpAtomicExchange:
>+            return "atomicExchange";
>+        case EOpAtomicCompSwap:
>+            return "atomicCompSwap";
>+
>         case EOpEmitVertex:
>             return "EmitVertex";
>         case EOpEndPrimitive:
>@@ -382,4 +399,22 @@ bool IsAssignment(TOperator op)
>         default:
>             return false;
>     }
>-}
>\ No newline at end of file
>+}
>+
>+bool IsAtomicFunction(TOperator op)
>+{
>+    switch (op)
>+    {
>+        case EOpAtomicAdd:
>+        case EOpAtomicMin:
>+        case EOpAtomicMax:
>+        case EOpAtomicAnd:
>+        case EOpAtomicOr:
>+        case EOpAtomicXor:
>+        case EOpAtomicExchange:
>+        case EOpAtomicCompSwap:
>+            return true;
>+        default:
>+            return false;
>+    }
>+}
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/Operator.h b/Source/ThirdParty/ANGLE/src/compiler/translator/Operator.h
>index 72f3dbf3f62..e1540faa44f 100644
>--- a/Source/ThirdParty/ANGLE/src/compiler/translator/Operator.h
>+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/Operator.h
>@@ -119,7 +119,7 @@ enum TOperator
>     EOpExp2,
>     EOpLog2,
>     EOpSqrt,
>-    EOpInverseSqrt,
>+    EOpInversesqrt,
> 
>     EOpAbs,
>     EOpSign,
>@@ -136,9 +136,9 @@ enum TOperator
>     EOpClamp,
>     EOpMix,
>     EOpStep,
>-    EOpSmoothStep,
>-    EOpIsNan,
>-    EOpIsInf,
>+    EOpSmoothstep,
>+    EOpIsnan,
>+    EOpIsinf,
> 
>     EOpFloatBitsToInt,
>     EOpFloatBitsToUint,
>@@ -241,6 +241,16 @@ enum TOperator
>     EOpMemoryBarrierShared,
>     EOpGroupMemoryBarrier,
> 
>+    // Atomic functions
>+    EOpAtomicAdd,
>+    EOpAtomicMin,
>+    EOpAtomicMax,
>+    EOpAtomicAnd,
>+    EOpAtomicOr,
>+    EOpAtomicXor,
>+    EOpAtomicExchange,
>+    EOpAtomicCompSwap,
>+
>     //  Geometry only
>     EOpEmitVertex,
>     EOpEndPrimitive
>@@ -252,4 +262,7 @@ const char *GetOperatorString(TOperator op);
> // Say whether or not a binary or unary operation changes the value of a variable.
> bool IsAssignment(TOperator op);
> 
>+// Say whether or not an operator represents an atomic function.
>+bool IsAtomicFunction(TOperator op);
>+
> #endif  // COMPILER_TRANSLATOR_OPERATOR_H_
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/OutputESSL.cpp b/Source/ThirdParty/ANGLE/src/compiler/translator/OutputESSL.cpp
>index 50626c91c08..8d57eeae840 100644
>--- a/Source/ThirdParty/ANGLE/src/compiler/translator/OutputESSL.cpp
>+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/OutputESSL.cpp
>@@ -28,8 +28,7 @@ TOutputESSL::TOutputESSL(TInfoSinkBase &objSink,
>                       SH_ESSL_OUTPUT,
>                       compileOptions),
>       mForceHighp(forceHighp)
>-{
>-}
>+{}
> 
> bool TOutputESSL::writeVariablePrecision(TPrecision precision)
> {
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/OutputGLSL.cpp b/Source/ThirdParty/ANGLE/src/compiler/translator/OutputGLSL.cpp
>index 1bad05dab93..35989a0c665 100644
>--- a/Source/ThirdParty/ANGLE/src/compiler/translator/OutputGLSL.cpp
>+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/OutputGLSL.cpp
>@@ -29,8 +29,7 @@ TOutputGLSL::TOutputGLSL(TInfoSinkBase &objSink,
>                       shaderVersion,
>                       output,
>                       compileOptions)
>-{
>-}
>+{}
> 
> bool TOutputGLSL::writeVariablePrecision(TPrecision)
> {
>@@ -41,24 +40,32 @@ void TOutputGLSL::visitSymbol(TIntermSymbol *node)
> {
>     TInfoSinkBase &out = objSink();
> 
>-    const TString &symbol = node->getSymbol();
>-    if (symbol == "gl_FragDepthEXT")
>+    // All the special cases are built-ins, so if it's not a built-in we can return early.
>+    if (node->variable().symbolType() != SymbolType::BuiltIn)
>+    {
>+        TOutputGLSLBase::visitSymbol(node);
>+        return;
>+    }
>+
>+    // Some built-ins get a special translation.
>+    const ImmutableString &name = node->getName();
>+    if (name == "gl_FragDepthEXT")
>     {
>         out << "gl_FragDepth";
>     }
>-    else if (symbol == "gl_FragColor" && sh::IsGLSL130OrNewer(getShaderOutput()))
>+    else if (name == "gl_FragColor" && sh::IsGLSL130OrNewer(getShaderOutput()))
>     {
>         out << "webgl_FragColor";
>     }
>-    else if (symbol == "gl_FragData" && sh::IsGLSL130OrNewer(getShaderOutput()))
>+    else if (name == "gl_FragData" && sh::IsGLSL130OrNewer(getShaderOutput()))
>     {
>         out << "webgl_FragData";
>     }
>-    else if (symbol == "gl_SecondaryFragColorEXT")
>+    else if (name == "gl_SecondaryFragColorEXT")
>     {
>         out << "angle_SecondaryFragColor";
>     }
>-    else if (symbol == "gl_SecondaryFragDataEXT")
>+    else if (name == "gl_SecondaryFragDataEXT")
>     {
>         out << "angle_SecondaryFragData";
>     }
>@@ -68,9 +75,9 @@ void TOutputGLSL::visitSymbol(TIntermSymbol *node)
>     }
> }
> 
>-TString TOutputGLSL::translateTextureFunction(const TString &name)
>+ImmutableString TOutputGLSL::translateTextureFunction(const ImmutableString &name)
> {
>-    static const char *simpleRename[] = {"texture2DLodEXT",
>+    static const char *simpleRename[]       = {"texture2DLodEXT",
>                                          "texture2DLod",
>                                          "texture2DProjLodEXT",
>                                          "texture2DProjLod",
>@@ -86,8 +93,8 @@ TString TOutputGLSL::translateTextureFunction(const TString &name)
>                                          nullptr};
>     static const char *legacyToCoreRename[] = {
>         "texture2D", "texture", "texture2DProj", "textureProj", "texture2DLod", "textureLod",
>-        "texture2DProjLod", "textureProjLod", "texture2DRect", "texture", "textureCube", "texture",
>-        "textureCubeLod", "textureLod",
>+        "texture2DProjLod", "textureProjLod", "texture2DRect", "texture", "texture2DRectProj",
>+        "textureProj", "textureCube", "texture", "textureCubeLod", "textureLod",
>         // Extensions
>         "texture2DLodEXT", "textureLod", "texture2DProjLodEXT", "textureProjLod",
>         "textureCubeLodEXT", "textureLod", "texture2DGradEXT", "textureGrad",
>@@ -100,7 +107,7 @@ TString TOutputGLSL::translateTextureFunction(const TString &name)
>     {
>         if (name == mapping[i])
>         {
>-            return mapping[i + 1];
>+            return ImmutableString(mapping[i + 1]);
>         }
>     }
> 
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/OutputGLSL.h b/Source/ThirdParty/ANGLE/src/compiler/translator/OutputGLSL.h
>index c80abec1a66..b676a799326 100644
>--- a/Source/ThirdParty/ANGLE/src/compiler/translator/OutputGLSL.h
>+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/OutputGLSL.h
>@@ -28,7 +28,7 @@ class TOutputGLSL : public TOutputGLSLBase
>   protected:
>     bool writeVariablePrecision(TPrecision) override;
>     void visitSymbol(TIntermSymbol *node) override;
>-    TString translateTextureFunction(const TString &name) override;
>+    ImmutableString translateTextureFunction(const ImmutableString &name) override;
> };
> 
> }  // namespace sh
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/OutputGLSLBase.cpp b/Source/ThirdParty/ANGLE/src/compiler/translator/OutputGLSLBase.cpp
>index edaf2ebebf2..21396ea41f9 100644
>--- a/Source/ThirdParty/ANGLE/src/compiler/translator/OutputGLSLBase.cpp
>+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/OutputGLSLBase.cpp
>@@ -46,6 +46,10 @@ bool isSingleStatement(TIntermNode *node)
>     {
>         return false;
>     }
>+    else if (node->getAsPreprocessorDirective())
>+    {
>+        return false;
>+    }
>     return true;
> }
> 
>@@ -53,6 +57,7 @@ class CommaSeparatedListItemPrefixGenerator
> {
>   public:
>     CommaSeparatedListItemPrefixGenerator() : mFirst(true) {}
>+
>   private:
>     bool mFirst;
> 
>@@ -94,8 +99,7 @@ TOutputGLSLBase::TOutputGLSLBase(TInfoSinkBase &objSink,
>       mShaderVersion(shaderVersion),
>       mOutput(output),
>       mCompileOptions(compileOptions)
>-{
>-}
>+{}
> 
> void TOutputGLSLBase::writeInvariantQualifier(const TType &type)
> {
>@@ -165,6 +169,13 @@ void TOutputGLSLBase::writeLayoutQualifier(TIntermTyped *variable)
>         return;
>     }
> 
>+    if (type.getBasicType() == EbtInterfaceBlock)
>+    {
>+        const TInterfaceBlock *interfaceBlock = type.getInterfaceBlock();
>+        declareInterfaceBlockLayout(interfaceBlock);
>+        return;
>+    }
>+
>     TInfoSinkBase &out                      = objSink();
>     const TLayoutQualifier &layoutQualifier = type.getLayoutQualifier();
>     out << "layout(";
>@@ -178,6 +189,10 @@ void TOutputGLSLBase::writeLayoutQualifier(TIntermTyped *variable)
>         {
>             out << listItemPrefix << "location = " << layoutQualifier.location;
>         }
>+        if (type.getQualifier() == EvqFragmentOut && layoutQualifier.index >= 0)
>+        {
>+            out << listItemPrefix << "index = " << layoutQualifier.index;
>+        }
>     }
> 
>     if (type.getQualifier() == EvqFragmentOut)
>@@ -214,6 +229,15 @@ void TOutputGLSLBase::writeLayoutQualifier(TIntermTyped *variable)
>     out << ") ";
> }
> 
>+void TOutputGLSLBase::writeQualifier(TQualifier qualifier, const TSymbol *symbol)
>+{
>+    const char *result = mapQualifierToString(qualifier);
>+    if (result && result[0] != '\0')
>+    {
>+        objSink() << result << " ";
>+    }
>+}
>+
> const char *TOutputGLSLBase::mapQualifierToString(TQualifier qualifier)
> {
>     if (sh::IsGLSL410OrOlder(mOutput) && mShaderVersion >= 300 &&
>@@ -250,7 +274,7 @@ const char *TOutputGLSLBase::mapQualifierToString(TQualifier qualifier)
>     return sh::getQualifierString(qualifier);
> }
> 
>-void TOutputGLSLBase::writeVariableType(const TType &type)
>+void TOutputGLSLBase::writeVariableType(const TType &type, const TSymbol *symbol)
> {
>     TQualifier qualifier = type.getQualifier();
>     TInfoSinkBase &out   = objSink();
>@@ -258,18 +282,9 @@ void TOutputGLSLBase::writeVariableType(const TType &type)
>     {
>         writeInvariantQualifier(type);
>     }
>-    if (type.getBasicType() == EbtInterfaceBlock)
>-    {
>-        TInterfaceBlock *interfaceBlock = type.getInterfaceBlock();
>-        declareInterfaceBlockLayout(interfaceBlock);
>-    }
>     if (qualifier != EvqTemporary && qualifier != EvqGlobal)
>     {
>-        const char *qualifierString = mapQualifierToString(qualifier);
>-        if (qualifierString && qualifierString[0] != '\0')
>-        {
>-            out << qualifierString << " ";
>-        }
>+        writeQualifier(qualifier, symbol);
>     }
> 
>     const TMemoryQualifier &memoryQualifier = type.getMemoryQualifier();
>@@ -309,15 +324,10 @@ void TOutputGLSLBase::writeVariableType(const TType &type)
>         const TStructure *structure = type.getStruct();
> 
>         declareStruct(structure);
>-
>-        if (!structure->name().empty())
>-        {
>-            mDeclaredStructs.insert(structure->uniqueId());
>-        }
>     }
>     else if (type.getBasicType() == EbtInterfaceBlock)
>     {
>-        TInterfaceBlock *interfaceBlock = type.getInterfaceBlock();
>+        const TInterfaceBlock *interfaceBlock = type.getInterfaceBlock();
>         declareInterfaceBlock(interfaceBlock);
>     }
>     else
>@@ -328,24 +338,23 @@ void TOutputGLSLBase::writeVariableType(const TType &type)
>     }
> }
> 
>-void TOutputGLSLBase::writeFunctionParameters(const TIntermSequence &args)
>+void TOutputGLSLBase::writeFunctionParameters(const TFunction *func)
> {
>     TInfoSinkBase &out = objSink();
>-    for (TIntermSequence::const_iterator iter = args.begin(); iter != args.end(); ++iter)
>+    size_t paramCount  = func->getParamCount();
>+    for (size_t i = 0; i < paramCount; ++i)
>     {
>-        const TIntermSymbol *arg = (*iter)->getAsSymbolNode();
>-        ASSERT(arg != nullptr);
>-
>-        const TType &type = arg->getType();
>-        writeVariableType(type);
>+        const TVariable *param = func->getParam(i);
>+        const TType &type      = param->getType();
>+        writeVariableType(type, param);
> 
>-        if (!arg->getName().getString().empty())
>-            out << " " << hashName(arg->getName());
>+        if (param->symbolType() != SymbolType::Empty)
>+            out << " " << hashName(param);
>         if (type.isArray())
>             out << ArrayString(type);
> 
>         // Put a comma if this is not the last argument.
>-        if (iter != args.end() - 1)
>+        if (i != paramCount - 1)
>             out << ", ";
>     }
> }
>@@ -358,7 +367,7 @@ const TConstantUnion *TOutputGLSLBase::writeConstantUnion(const TType &type,
>     if (type.getBasicType() == EbtStruct)
>     {
>         const TStructure *structure = type.getStruct();
>-        out << hashName(TName(structure->name())) << "(";
>+        out << hashName(structure) << "(";
> 
>         const TFieldList &fields = structure->fields();
>         for (size_t i = 0; i < fields.size(); ++i)
>@@ -433,7 +442,7 @@ void TOutputGLSLBase::writeConstructorTriplet(Visit visit, const TType &type)
> void TOutputGLSLBase::visitSymbol(TIntermSymbol *node)
> {
>     TInfoSinkBase &out = objSink();
>-    out << hashVariableName(node->getName());
>+    out << hashName(&node->variable());
> 
>     if (mDeclaringVariable && node->getType().isArray())
>         out << ArrayString(node->getType());
>@@ -441,7 +450,7 @@ void TOutputGLSLBase::visitSymbol(TIntermSymbol *node)
> 
> void TOutputGLSLBase::visitConstantUnion(TIntermConstantUnion *node)
> {
>-    writeConstantUnion(node->getType(), node->getUnionArrayPointer());
>+    writeConstantUnion(node->getType(), node->getConstantValue());
> }
> 
> bool TOutputGLSLBase::visitSwizzle(Visit visit, TIntermSwizzle *node)
>@@ -582,11 +591,7 @@ bool TOutputGLSLBase::visitBinary(Visit visit, TIntermBinary *node)
>                 const TIntermConstantUnion *index = node->getRight()->getAsConstantUnion();
>                 const TField *field               = structure->fields()[index->getIConst(0)];
> 
>-                TString fieldName = field->name();
>-                if (!mSymbolTable->findBuiltIn(structure->name(), mShaderVersion))
>-                    fieldName = hashName(TName(fieldName));
>-
>-                out << fieldName;
>+                out << hashFieldName(field);
>                 visitChildren = false;
>             }
>             break;
>@@ -598,18 +603,7 @@ bool TOutputGLSLBase::visitBinary(Visit visit, TIntermBinary *node)
>                     node->getLeft()->getType().getInterfaceBlock();
>                 const TIntermConstantUnion *index = node->getRight()->getAsConstantUnion();
>                 const TField *field               = interfaceBlock->fields()[index->getIConst(0)];
>-
>-                TString fieldName = field->name();
>-                if (!mSymbolTable->findBuiltIn(interfaceBlock->name(), mShaderVersion))
>-                {
>-                    fieldName = hashName(TName(fieldName));
>-                }
>-                else
>-                {
>-                    ASSERT(interfaceBlock->name() == "gl_PerVertex");
>-                }
>-
>-                out << fieldName;
>+                out << hashFieldName(field);
>                 visitChildren = false;
>             }
>             break;
>@@ -691,8 +685,8 @@ bool TOutputGLSLBase::visitBinary(Visit visit, TIntermBinary *node)
> 
> bool TOutputGLSLBase::visitUnary(Visit visit, TIntermUnary *node)
> {
>-    TString preString;
>-    TString postString = ")";
>+    const char *preString  = "";
>+    const char *postString = ")";
> 
>     switch (node->getOp())
>     {
>@@ -747,7 +741,7 @@ bool TOutputGLSLBase::visitUnary(Visit visit, TIntermUnary *node)
>         case EOpExp2:
>         case EOpLog2:
>         case EOpSqrt:
>-        case EOpInverseSqrt:
>+        case EOpInversesqrt:
>         case EOpAbs:
>         case EOpSign:
>         case EOpFloor:
>@@ -756,8 +750,8 @@ bool TOutputGLSLBase::visitUnary(Visit visit, TIntermUnary *node)
>         case EOpRoundEven:
>         case EOpCeil:
>         case EOpFract:
>-        case EOpIsNan:
>-        case EOpIsInf:
>+        case EOpIsnan:
>+        case EOpIsinf:
>         case EOpFloatBitsToInt:
>         case EOpFloatBitsToUint:
>         case EOpIntBitsToFloat:
>@@ -793,7 +787,7 @@ bool TOutputGLSLBase::visitUnary(Visit visit, TIntermUnary *node)
>             UNREACHABLE();
>     }
> 
>-    writeTriplet(visit, preString.c_str(), nullptr, postString.c_str());
>+    writeTriplet(visit, preString, nullptr, postString);
> 
>     return true;
> }
>@@ -860,7 +854,7 @@ bool TOutputGLSLBase::visitBlock(Visit visit, TIntermBlock *node)
> {
>     TInfoSinkBase &out = objSink();
>     // Scope the blocks except when at the global scope.
>-    if (mDepth > 0)
>+    if (getCurrentTraversalDepth() > 0)
>     {
>         out << "{\n";
>     }
>@@ -877,7 +871,7 @@ bool TOutputGLSLBase::visitBlock(Visit visit, TIntermBlock *node)
>     }
> 
>     // Scope the blocks except when at the global scope.
>-    if (mDepth > 0)
>+    if (getCurrentTraversalDepth() > 0)
>     {
>         out << "}\n";
>     }
>@@ -899,33 +893,30 @@ bool TOutputGLSLBase::visitInvariantDeclaration(Visit visit, TIntermInvariantDec
>     TInfoSinkBase &out = objSink();
>     ASSERT(visit == PreVisit);
>     const TIntermSymbol *symbol = node->getSymbol();
>-    out << "invariant " << hashVariableName(symbol->getName());
>+    out << "invariant " << hashName(&symbol->variable());
>     return false;
> }
> 
>-bool TOutputGLSLBase::visitFunctionPrototype(Visit visit, TIntermFunctionPrototype *node)
>+void TOutputGLSLBase::visitFunctionPrototype(TIntermFunctionPrototype *node)
> {
>     TInfoSinkBase &out = objSink();
>-    ASSERT(visit == PreVisit);
> 
>     const TType &type = node->getType();
>-    writeVariableType(type);
>+    writeVariableType(type, node->getFunction());
>     if (type.isArray())
>         out << ArrayString(type);
> 
>-    out << " " << hashFunctionNameIfNeeded(*node->getFunctionSymbolInfo());
>+    out << " " << hashFunctionNameIfNeeded(node->getFunction());
> 
>     out << "(";
>-    writeFunctionParameters(*(node->getSequence()));
>+    writeFunctionParameters(node->getFunction());
>     out << ")";
>-
>-    return false;
> }
> 
> bool TOutputGLSLBase::visitAggregate(Visit visit, TIntermAggregate *node)
> {
>-    bool visitChildren       = true;
>-    TInfoSinkBase &out       = objSink();
>+    bool visitChildren = true;
>+    TInfoSinkBase &out = objSink();
>     switch (node->getOp())
>     {
>         case EOpCallFunctionInAST:
>@@ -936,11 +927,11 @@ bool TOutputGLSLBase::visitAggregate(Visit visit, TIntermAggregate *node)
>             {
>                 if (node->getOp() == EOpCallBuiltInFunction)
>                 {
>-                    out << translateTextureFunction(node->getFunctionSymbolInfo()->getName());
>+                    out << translateTextureFunction(node->getFunction()->name());
>                 }
>                 else
>                 {
>-                    out << hashFunctionNameIfNeeded(*node->getFunctionSymbolInfo());
>+                    out << hashFunctionNameIfNeeded(node->getFunction());
>                 }
>                 out << "(";
>             }
>@@ -968,7 +959,7 @@ bool TOutputGLSLBase::visitAggregate(Visit visit, TIntermAggregate *node)
>         case EOpClamp:
>         case EOpMix:
>         case EOpStep:
>-        case EOpSmoothStep:
>+        case EOpSmoothstep:
>         case EOpFrexp:
>         case EOpLdexp:
>         case EOpDistance:
>@@ -992,6 +983,14 @@ bool TOutputGLSLBase::visitAggregate(Visit visit, TIntermAggregate *node)
>         case EOpMemoryBarrierImage:
>         case EOpMemoryBarrierShared:
>         case EOpGroupMemoryBarrier:
>+        case EOpAtomicAdd:
>+        case EOpAtomicMin:
>+        case EOpAtomicMax:
>+        case EOpAtomicAnd:
>+        case EOpAtomicOr:
>+        case EOpAtomicXor:
>+        case EOpAtomicExchange:
>+        case EOpAtomicCompSwap:
>         case EOpEmitVertex:
>         case EOpEndPrimitive:
>             writeBuiltInFunctionTriplet(visit, node->getOp(), node->getUseEmulatedFunction());
>@@ -1012,9 +1011,10 @@ bool TOutputGLSLBase::visitDeclaration(Visit visit, TIntermDeclaration *node)
>         const TIntermSequence &sequence = *(node->getSequence());
>         TIntermTyped *variable          = sequence.front()->getAsTyped();
>         writeLayoutQualifier(variable);
>-        writeVariableType(variable->getType());
>+        TIntermSymbol *symbolNode = variable->getAsSymbolNode();
>+        writeVariableType(variable->getType(), symbolNode ? &symbolNode->variable() : nullptr);
>         if (variable->getAsSymbolNode() == nullptr ||
>-            !variable->getAsSymbolNode()->getSymbol().empty())
>+            variable->getAsSymbolNode()->variable().symbolType() != SymbolType::Empty)
>         {
>             out << " ";
>         }
>@@ -1121,73 +1121,112 @@ void TOutputGLSLBase::visitCodeBlock(TIntermBlock *node)
>     }
> }
> 
>-TString TOutputGLSLBase::getTypeName(const TType &type)
>+void TOutputGLSLBase::visitPreprocessorDirective(TIntermPreprocessorDirective *node)
>+{
>+    TInfoSinkBase &out = objSink();
>+
>+    out << "\n";
>+
>+    switch (node->getDirective())
>+    {
>+        case PreprocessorDirective::Define:
>+            out << "#define";
>+            break;
>+        case PreprocessorDirective::Endif:
>+            out << "#endif";
>+            break;
>+        case PreprocessorDirective::If:
>+            out << "#if";
>+            break;
>+        case PreprocessorDirective::Ifdef:
>+            out << "#ifdef";
>+            break;
>+
>+        default:
>+            UNREACHABLE();
>+            break;
>+    }
>+
>+    if (!node->getCommand().empty())
>+    {
>+        out << " " << node->getCommand();
>+    }
>+
>+    out << "\n";
>+}
>+
>+ImmutableString TOutputGLSLBase::getTypeName(const TType &type)
> {
>     return GetTypeName(type, mHashFunction, &mNameMap);
> }
> 
>-TString TOutputGLSLBase::hashName(const TName &name)
>+ImmutableString TOutputGLSLBase::hashName(const TSymbol *symbol)
> {
>-    return HashName(name, mHashFunction, &mNameMap);
>+    return HashName(symbol, mHashFunction, &mNameMap);
> }
> 
>-TString TOutputGLSLBase::hashVariableName(const TName &name)
>+ImmutableString TOutputGLSLBase::hashFieldName(const TField *field)
> {
>-    if (mSymbolTable->findBuiltIn(name.getString(), mShaderVersion) != nullptr ||
>-        name.getString().substr(0, 3) == "gl_")
>+    ASSERT(field->symbolType() != SymbolType::Empty);
>+    if (field->symbolType() == SymbolType::UserDefined)
>     {
>-        if (mCompileOptions & SH_TRANSLATE_VIEWID_OVR_TO_UNIFORM &&
>-            name.getString() == "gl_ViewID_OVR")
>-        {
>-            TName uniformName(TString("ViewID_OVR"));
>-            uniformName.setInternal(true);
>-            return hashName(uniformName);
>-        }
>-        return name.getString();
>+        return HashName(field->name(), mHashFunction, &mNameMap);
>     }
>-    return hashName(name);
>+
>+    return field->name();
> }
> 
>-TString TOutputGLSLBase::hashFunctionNameIfNeeded(const TFunctionSymbolInfo &info)
>+ImmutableString TOutputGLSLBase::hashFunctionNameIfNeeded(const TFunction *func)
> {
>-    if (info.isMain())
>+    if (func->isMain())
>     {
>-        return info.getName();
>+        return func->name();
>     }
>     else
>     {
>-        return hashName(info.getNameObj());
>+        return hashName(func);
>     }
> }
> 
> bool TOutputGLSLBase::structDeclared(const TStructure *structure) const
> {
>     ASSERT(structure);
>-    if (structure->name().empty())
>+    if (structure->symbolType() == SymbolType::Empty)
>     {
>         return false;
>     }
> 
>-    return (mDeclaredStructs.count(structure->uniqueId()) > 0);
>+    return (mDeclaredStructs.count(structure->uniqueId().get()) > 0);
> }
> 
> void TOutputGLSLBase::declareStruct(const TStructure *structure)
> {
>     TInfoSinkBase &out = objSink();
> 
>-    out << "struct " << hashName(TName(structure->name())) << "{\n";
>+    out << "struct ";
>+
>+    if (structure->symbolType() != SymbolType::Empty)
>+    {
>+        out << hashName(structure) << " ";
>+    }
>+    out << "{\n";
>     const TFieldList &fields = structure->fields();
>     for (size_t i = 0; i < fields.size(); ++i)
>     {
>         const TField *field = fields[i];
>         if (writeVariablePrecision(field->type()->getPrecision()))
>             out << " ";
>-        out << getTypeName(*field->type()) << " " << hashName(TName(field->name()));
>+        out << getTypeName(*field->type()) << " " << hashFieldName(field);
>         if (field->type()->isArray())
>             out << ArrayString(*field->type());
>         out << ";\n";
>     }
>     out << "}";
>+
>+    if (structure->symbolType() != SymbolType::Empty)
>+    {
>+        mDeclaredStructs.insert(structure->uniqueId().get());
>+    }
> }
> 
> void TOutputGLSLBase::declareInterfaceBlockLayout(const TInterfaceBlock *interfaceBlock)
>@@ -1221,29 +1260,10 @@ void TOutputGLSLBase::declareInterfaceBlockLayout(const TInterfaceBlock *interfa
>             break;
>     }
> 
>-    out << ", ";
>-
>-    if (interfaceBlock->blockBinding() > 0)
>+    if (interfaceBlock->blockBinding() >= 0)
>     {
>-        out << "binding = " << interfaceBlock->blockBinding();
>         out << ", ";
>-    }
>-
>-    switch (interfaceBlock->matrixPacking())
>-    {
>-        case EmpUnspecified:
>-        case EmpColumnMajor:
>-            // Default matrix packing is column major.
>-            out << "column_major";
>-            break;
>-
>-        case EmpRowMajor:
>-            out << "row_major";
>-            break;
>-
>-        default:
>-            UNREACHABLE();
>-            break;
>+        out << "binding = " << interfaceBlock->blockBinding();
>     }
> 
>     out << ") ";
>@@ -1253,14 +1273,35 @@ void TOutputGLSLBase::declareInterfaceBlock(const TInterfaceBlock *interfaceBloc
> {
>     TInfoSinkBase &out = objSink();
> 
>-    out << hashName(TName(interfaceBlock->name())) << "{\n";
>+    out << hashName(interfaceBlock) << "{\n";
>     const TFieldList &fields = interfaceBlock->fields();
>-    for (size_t i = 0; i < fields.size(); ++i)
>+    for (const TField *field : fields)
>     {
>-        const TField *field = fields[i];
>+        if (field->type()->isMatrix() || field->type()->isStructureContainingMatrices())
>+        {
>+            out << "layout(";
>+            switch (field->type()->getLayoutQualifier().matrixPacking)
>+            {
>+                case EmpUnspecified:
>+                case EmpColumnMajor:
>+                    // Default matrix packing is column major.
>+                    out << "column_major";
>+                    break;
>+
>+                case EmpRowMajor:
>+                    out << "row_major";
>+                    break;
>+
>+                default:
>+                    UNREACHABLE();
>+                    break;
>+            }
>+            out << ") ";
>+        }
>+
>         if (writeVariablePrecision(field->type()->getPrecision()))
>             out << " ";
>-        out << getTypeName(*field->type()) << " " << hashName(TName(field->name()));
>+        out << getTypeName(*field->type()) << " " << hashFieldName(field);
>         if (field->type()->isArray())
>             out << ArrayString(*field->type());
>         out << ";\n";
>@@ -1325,7 +1366,7 @@ bool NeedsToWriteLayoutQualifier(const TType &type)
> {
>     if (type.getBasicType() == EbtInterfaceBlock)
>     {
>-        return false;
>+        return true;
>     }
> 
>     const TLayoutQualifier &layoutQualifier = type.getLayoutQualifier();
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/OutputGLSLBase.h b/Source/ThirdParty/ANGLE/src/compiler/translator/OutputGLSLBase.h
>index 592a310be47..96f767ebd73 100644
>--- a/Source/ThirdParty/ANGLE/src/compiler/translator/OutputGLSLBase.h
>+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/OutputGLSLBase.h
>@@ -11,7 +11,7 @@
> 
> #include "compiler/translator/HashNames.h"
> #include "compiler/translator/InfoSink.h"
>-#include "compiler/translator/IntermTraverse.h"
>+#include "compiler/translator/tree_util/IntermTraverse.h"
> 
> namespace sh
> {
>@@ -32,9 +32,9 @@ class TOutputGLSLBase : public TIntermTraverser
>     ShShaderOutput getShaderOutput() const { return mOutput; }
> 
>     // Return the original name if hash function pointer is NULL;
>-    // otherwise return the hashed name. Has special handling for internal names, which are not
>-    // hashed.
>-    TString hashName(const TName &name);
>+    // otherwise return the hashed name. Has special handling for internal names and built-ins,
>+    // which are not hashed.
>+    ImmutableString hashName(const TSymbol *symbol);
> 
>   protected:
>     TInfoSinkBase &objSink() { return mObjSink; }
>@@ -42,12 +42,12 @@ class TOutputGLSLBase : public TIntermTraverser
>     void writeTriplet(Visit visit, const char *preStr, const char *inStr, const char *postStr);
>     virtual void writeLayoutQualifier(TIntermTyped *variable);
>     void writeInvariantQualifier(const TType &type);
>-    void writeVariableType(const TType &type);
>+    virtual void writeVariableType(const TType &type, const TSymbol *symbol);
>     virtual bool writeVariablePrecision(TPrecision precision) = 0;
>-    void writeFunctionParameters(const TIntermSequence &args);
>+    void writeFunctionParameters(const TFunction *func);
>     const TConstantUnion *writeConstantUnion(const TType &type, const TConstantUnion *pConstUnion);
>     void writeConstructorTriplet(Visit visit, const TType &type);
>-    TString getTypeName(const TType &type);
>+    ImmutableString getTypeName(const TType &type);
> 
>     void visitSymbol(TIntermSymbol *node) override;
>     void visitConstantUnion(TIntermConstantUnion *node) override;
>@@ -58,7 +58,7 @@ class TOutputGLSLBase : public TIntermTraverser
>     bool visitIfElse(Visit visit, TIntermIfElse *node) override;
>     bool visitSwitch(Visit visit, TIntermSwitch *node) override;
>     bool visitCase(Visit visit, TIntermCase *node) override;
>-    bool visitFunctionPrototype(Visit visit, TIntermFunctionPrototype *node) override;
>+    void visitFunctionPrototype(TIntermFunctionPrototype *node) override;
>     bool visitFunctionDefinition(Visit visit, TIntermFunctionDefinition *node) override;
>     bool visitAggregate(Visit visit, TIntermAggregate *node) override;
>     bool visitBlock(Visit visit, TIntermBlock *node) override;
>@@ -66,26 +66,27 @@ class TOutputGLSLBase : public TIntermTraverser
>     bool visitDeclaration(Visit visit, TIntermDeclaration *node) override;
>     bool visitLoop(Visit visit, TIntermLoop *node) override;
>     bool visitBranch(Visit visit, TIntermBranch *node) override;
>+    void visitPreprocessorDirective(TIntermPreprocessorDirective *node) override;
> 
>     void visitCodeBlock(TIntermBlock *node);
> 
>-    // Same as hashName(), but without hashing built-in variables.
>-    TString hashVariableName(const TName &name);
>-    // Same as hashName(), but without hashing internal functions or "main".
>-    TString hashFunctionNameIfNeeded(const TFunctionSymbolInfo &info);
>+    ImmutableString hashFieldName(const TField *field);
>+    // Same as hashName(), but without hashing "main".
>+    ImmutableString hashFunctionNameIfNeeded(const TFunction *func);
>     // Used to translate function names for differences between ESSL and GLSL
>-    virtual TString translateTextureFunction(const TString &name) { return name; }
>+    virtual ImmutableString translateTextureFunction(const ImmutableString &name) { return name; }
> 
>-  private:
>-    bool structDeclared(const TStructure *structure) const;
>     void declareStruct(const TStructure *structure);
>+    virtual void writeQualifier(TQualifier qualifier, const TSymbol *symbol);
>+    bool structDeclared(const TStructure *structure) const;
> 
>+  private:
>     void declareInterfaceBlockLayout(const TInterfaceBlock *interfaceBlock);
>     void declareInterfaceBlock(const TInterfaceBlock *interfaceBlock);
> 
>     void writeBuiltInFunctionTriplet(Visit visit, TOperator op, bool useEmulatedFunction);
> 
>-    const char *mapQualifierToString(TQualifier qialifier);
>+    const char *mapQualifierToString(TQualifier qualifier);
> 
>     TInfoSinkBase &mObjSink;
>     bool mDeclaringVariable;
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/OutputHLSL.cpp b/Source/ThirdParty/ANGLE/src/compiler/translator/OutputHLSL.cpp
>index d5ff761430e..273f326eac8 100644
>--- a/Source/ThirdParty/ANGLE/src/compiler/translator/OutputHLSL.cpp
>+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/OutputHLSL.cpp
>@@ -6,26 +6,27 @@
> 
> #include "compiler/translator/OutputHLSL.h"
> 
>+#include <stdio.h>
> #include <algorithm>
> #include <cfloat>
>-#include <stdio.h>
> 
> #include "common/angleutils.h"
> #include "common/debug.h"
> #include "common/utilities.h"
>+#include "compiler/translator/AtomicCounterFunctionHLSL.h"
> #include "compiler/translator/BuiltInFunctionEmulator.h"
> #include "compiler/translator/BuiltInFunctionEmulatorHLSL.h"
> #include "compiler/translator/ImageFunctionHLSL.h"
> #include "compiler/translator/InfoSink.h"
>-#include "compiler/translator/NodeSearch.h"
>-#include "compiler/translator/RemoveSwitchFallThrough.h"
>-#include "compiler/translator/SearchSymbol.h"
>+#include "compiler/translator/ResourcesHLSL.h"
> #include "compiler/translator/StructureHLSL.h"
> #include "compiler/translator/TextureFunctionHLSL.h"
> #include "compiler/translator/TranslatorHLSL.h"
>-#include "compiler/translator/UniformHLSL.h"
> #include "compiler/translator/UtilsHLSL.h"
> #include "compiler/translator/blocklayout.h"
>+#include "compiler/translator/tree_ops/RemoveSwitchFallThrough.h"
>+#include "compiler/translator/tree_util/FindSymbolNode.h"
>+#include "compiler/translator/tree_util/NodeSearch.h"
> #include "compiler/translator/util.h"
> 
> namespace sh
>@@ -34,9 +35,11 @@ namespace sh
> namespace
> {
> 
>+constexpr const char kImage2DFunctionString[] = "// @@ IMAGE2D DECLARATION FUNCTION STRING @@";
>+
> TString ArrayHelperFunctionName(const char *prefix, const TType &type)
> {
>-    TStringStream fnName;
>+    TStringStream fnName = sh::InitializeStream<TStringStream>();
>     fnName << prefix << "_";
>     if (type.isArray())
>     {
>@@ -56,32 +59,120 @@ bool IsDeclarationWrittenOut(TIntermDeclaration *node)
>     ASSERT(sequence->size() == 1);
>     ASSERT(variable);
>     return (variable->getQualifier() == EvqTemporary || variable->getQualifier() == EvqGlobal ||
>-            variable->getQualifier() == EvqConst);
>+            variable->getQualifier() == EvqConst || variable->getQualifier() == EvqShared);
> }
> 
>-bool IsInStd140InterfaceBlock(TIntermTyped *node)
>+bool IsInStd140UniformBlock(TIntermTyped *node)
> {
>     TIntermBinary *binaryNode = node->getAsBinaryNode();
> 
>     if (binaryNode)
>     {
>-        return IsInStd140InterfaceBlock(binaryNode->getLeft());
>+        return IsInStd140UniformBlock(binaryNode->getLeft());
>     }
> 
>     const TType &type = node->getType();
> 
>-    // determine if we are in the standard layout
>-    const TInterfaceBlock *interfaceBlock = type.getInterfaceBlock();
>-    if (interfaceBlock)
>+    if (type.getQualifier() == EvqUniform)
>+    {
>+        // determine if we are in the standard layout
>+        const TInterfaceBlock *interfaceBlock = type.getInterfaceBlock();
>+        if (interfaceBlock)
>+        {
>+            return (interfaceBlock->blockStorage() == EbsStd140);
>+        }
>+    }
>+
>+    return false;
>+}
>+
>+const char *GetHLSLAtomicFunctionStringAndLeftParenthesis(TOperator op)
>+{
>+    switch (op)
>+    {
>+        case EOpAtomicAdd:
>+            return "InterlockedAdd(";
>+        case EOpAtomicMin:
>+            return "InterlockedMin(";
>+        case EOpAtomicMax:
>+            return "InterlockedMax(";
>+        case EOpAtomicAnd:
>+            return "InterlockedAnd(";
>+        case EOpAtomicOr:
>+            return "InterlockedOr(";
>+        case EOpAtomicXor:
>+            return "InterlockedXor(";
>+        case EOpAtomicExchange:
>+            return "InterlockedExchange(";
>+        case EOpAtomicCompSwap:
>+            return "InterlockedCompareExchange(";
>+        default:
>+            UNREACHABLE();
>+            return "";
>+    }
>+}
>+
>+bool IsAtomicFunctionForSharedVariableDirectAssign(const TIntermBinary &node)
>+{
>+    TIntermAggregate *aggregateNode = node.getRight()->getAsAggregate();
>+    if (aggregateNode == nullptr)
>+    {
>+        return false;
>+    }
>+
>+    if (node.getOp() == EOpAssign && IsAtomicFunction(aggregateNode->getOp()))
>     {
>-        return (interfaceBlock->blockStorage() == EbsStd140);
>+        return !IsInShaderStorageBlock((*aggregateNode->getSequence())[0]->getAsTyped());
>     }
> 
>     return false;
> }
> 
>+const char *kZeros       = "_ANGLE_ZEROS_";
>+constexpr int kZeroCount = 256;
>+std::string DefineZeroArray()
>+{
>+    std::stringstream ss = sh::InitializeStream<std::stringstream>();
>+    // For 'static', if the declaration does not include an initializer, the value is set to zero.
>+    // https://docs.microsoft.com/en-us/windows/desktop/direct3dhlsl/dx-graphics-hlsl-variable-syntax
>+    ss << "static uint " << kZeros << "[" << kZeroCount << "];\n";
>+    return ss.str();
>+}
>+
>+std::string GetZeroInitializer(size_t size)
>+{
>+    std::stringstream ss = sh::InitializeStream<std::stringstream>();
>+    size_t quotient      = size / kZeroCount;
>+    size_t reminder      = size % kZeroCount;
>+
>+    for (size_t i = 0; i < quotient; ++i)
>+    {
>+        if (i != 0)
>+        {
>+            ss << ", ";
>+        }
>+        ss << kZeros;
>+    }
>+
>+    for (size_t i = 0; i < reminder; ++i)
>+    {
>+        if (quotient != 0 || i != 0)
>+        {
>+            ss << ", ";
>+        }
>+        ss << "0";
>+    }
>+
>+    return ss.str();
>+}
>+
> }  // anonymous namespace
> 
>+TReferencedBlock::TReferencedBlock(const TInterfaceBlock *aBlock,
>+                                   const TVariable *aInstanceVariable)
>+    : block(aBlock), instanceVariable(aInstanceVariable)
>+{}
>+
> void OutputHLSL::writeFloat(TInfoSinkBase &out, float f)
> {
>     // This is known not to work for NaN on all drivers but make the best effort to output NaNs
>@@ -144,8 +235,10 @@ OutputHLSL::OutputHLSL(sh::GLenum shaderType,
>                        int numRenderTargets,
>                        const std::vector<Uniform> &uniforms,
>                        ShCompileOptions compileOptions,
>+                       sh::WorkGroupSize workGroupSize,
>                        TSymbolTable *symbolTable,
>-                       PerformanceDiagnostics *perfDiagnostics)
>+                       PerformanceDiagnostics *perfDiagnostics,
>+                       const std::vector<InterfaceBlock> &shaderStorageBlocks)
>     : TIntermTraverser(true, true, true, symbolTable),
>       mShaderType(shaderType),
>       mShaderVersion(shaderVersion),
>@@ -153,22 +246,23 @@ OutputHLSL::OutputHLSL(sh::GLenum shaderType,
>       mSourcePath(sourcePath),
>       mOutputType(outputType),
>       mCompileOptions(compileOptions),
>+      mInsideFunction(false),
>+      mInsideMain(false),
>       mNumRenderTargets(numRenderTargets),
>       mCurrentFunctionMetadata(nullptr),
>+      mWorkGroupSize(workGroupSize),
>       mPerfDiagnostics(perfDiagnostics)
> {
>-    mInsideFunction = false;
>-
>-    mUsesFragColor               = false;
>-    mUsesFragData                = false;
>-    mUsesDepthRange              = false;
>-    mUsesFragCoord               = false;
>-    mUsesPointCoord              = false;
>-    mUsesFrontFacing             = false;
>-    mUsesPointSize               = false;
>-    mUsesInstanceID              = false;
>+    mUsesFragColor   = false;
>+    mUsesFragData    = false;
>+    mUsesDepthRange  = false;
>+    mUsesFragCoord   = false;
>+    mUsesPointCoord  = false;
>+    mUsesFrontFacing = false;
>+    mUsesPointSize   = false;
>+    mUsesInstanceID  = false;
>     mHasMultiviewExtensionEnabled =
>-        IsExtensionEnabled(mExtensionBehavior, TExtension::OVR_multiview);
>+        IsExtensionEnabled(mExtensionBehavior, TExtension::OVR_multiview2);
>     mUsesViewID                  = false;
>     mUsesVertexID                = false;
>     mUsesFragDepth               = false;
>@@ -181,6 +275,7 @@ OutputHLSL::OutputHLSL(sh::GLenum shaderType,
>     mUsesDiscardRewriting        = false;
>     mUsesNestedBreak             = false;
>     mRequiresIEEEStrictCompiling = false;
>+    mUseZeroArray                = false;
> 
>     mUniqueIndex = 0;
> 
>@@ -191,9 +286,14 @@ OutputHLSL::OutputHLSL(sh::GLenum shaderType,
>     mExcessiveLoopIndex = nullptr;
> 
>     mStructureHLSL       = new StructureHLSL;
>-    mUniformHLSL         = new UniformHLSL(shaderType, mStructureHLSL, outputType, uniforms);
>     mTextureFunctionHLSL = new TextureFunctionHLSL;
>     mImageFunctionHLSL   = new ImageFunctionHLSL;
>+    mAtomicCounterFunctionHLSL =
>+        new AtomicCounterFunctionHLSL((compileOptions & SH_FORCE_ATOMIC_VALUE_RESOLUTION) != 0);
>+
>+    unsigned int firstUniformRegister =
>+        ((compileOptions & SH_SKIP_D3D_CONSTANT_REGISTER_ZERO) != 0) ? 1u : 0u;
>+    mResourcesHLSL = new ResourcesHLSL(mStructureHLSL, outputType, uniforms, firstUniformRegister);
> 
>     if (mOutputType == SH_HLSL_3_0_OUTPUT)
>     {
>@@ -201,19 +301,24 @@ OutputHLSL::OutputHLSL(sh::GLenum shaderType,
>         // Vertex shaders need a slightly different set: dx_DepthRange, dx_ViewCoords and
>         // dx_ViewAdjust.
>         // In both cases total 3 uniform registers need to be reserved.
>-        mUniformHLSL->reserveUniformRegisters(3);
>+        mResourcesHLSL->reserveUniformRegisters(3);
>     }
> 
>     // Reserve registers for the default uniform block and driver constants
>-    mUniformHLSL->reserveUniformBlockRegisters(2);
>+    mResourcesHLSL->reserveUniformBlockRegisters(2);
>+
>+    mSSBOOutputHLSL =
>+        new ShaderStorageBlockOutputHLSL(this, symbolTable, mResourcesHLSL, shaderStorageBlocks);
> }
> 
> OutputHLSL::~OutputHLSL()
> {
>+    SafeDelete(mSSBOOutputHLSL);
>     SafeDelete(mStructureHLSL);
>-    SafeDelete(mUniformHLSL);
>+    SafeDelete(mResourcesHLSL);
>     SafeDelete(mTextureFunctionHLSL);
>     SafeDelete(mImageFunctionHLSL);
>+    SafeDelete(mAtomicCounterFunctionHLSL);
>     for (auto &eqFunction : mStructEqualityFunctions)
>     {
>         SafeDelete(eqFunction);
>@@ -265,14 +370,34 @@ void OutputHLSL::output(TIntermNode *treeRoot, TInfoSinkBase &objSink)
>     builtInFunctionEmulator.cleanup();
> }
> 
>+const std::map<std::string, unsigned int> &OutputHLSL::getShaderStorageBlockRegisterMap() const
>+{
>+    return mResourcesHLSL->getShaderStorageBlockRegisterMap();
>+}
>+
> const std::map<std::string, unsigned int> &OutputHLSL::getUniformBlockRegisterMap() const
> {
>-    return mUniformHLSL->getUniformBlockRegisterMap();
>+    return mResourcesHLSL->getUniformBlockRegisterMap();
> }
> 
> const std::map<std::string, unsigned int> &OutputHLSL::getUniformRegisterMap() const
> {
>-    return mUniformHLSL->getUniformRegisterMap();
>+    return mResourcesHLSL->getUniformRegisterMap();
>+}
>+
>+unsigned int OutputHLSL::getReadonlyImage2DRegisterIndex() const
>+{
>+    return mResourcesHLSL->getReadonlyImage2DRegisterIndex();
>+}
>+
>+unsigned int OutputHLSL::getImage2DRegisterIndex() const
>+{
>+    return mResourcesHLSL->getImage2DRegisterIndex();
>+}
>+
>+const std::set<std::string> &OutputHLSL::getUsedImage2DFunctionNames() const
>+{
>+    return mImageFunctionHLSL->getUsedImage2DFunctionNames();
> }
> 
> TString OutputHLSL::structInitializerString(int indent,
>@@ -292,7 +417,7 @@ TString OutputHLSL::structInitializerString(int indent,
>         init += indentString + "{\n";
>         for (unsigned int arrayIndex = 0u; arrayIndex < type.getOutermostArraySize(); ++arrayIndex)
>         {
>-            TStringStream indexedString;
>+            TStringStream indexedString = sh::InitializeStream<TStringStream>();
>             indexedString << name << "[" << arrayIndex << "]";
>             TType elementType = type;
>             elementType.toArrayElementType();
>@@ -339,15 +464,22 @@ TString OutputHLSL::generateStructMapping(const std::vector<MappedStruct> &std14
> 
>     for (auto &mappedStruct : std140Structs)
>     {
>-        TInterfaceBlock *interfaceBlock =
>+        const TInterfaceBlock *interfaceBlock =
>             mappedStruct.blockDeclarator->getType().getInterfaceBlock();
>-        const TString &interfaceBlockName = interfaceBlock->name();
>-        const TName &instanceName         = mappedStruct.blockDeclarator->getName();
>-        if (mReferencedUniformBlocks.count(interfaceBlockName) == 0 &&
>-            (instanceName.getString() == "" ||
>-             mReferencedUniformBlocks.count(instanceName.getString()) == 0))
>+        TQualifier qualifier = mappedStruct.blockDeclarator->getType().getQualifier();
>+        switch (qualifier)
>         {
>-            continue;
>+            case EvqUniform:
>+                if (mReferencedUniformBlocks.count(interfaceBlock->uniqueId().get()) == 0)
>+                {
>+                    continue;
>+                }
>+                break;
>+            case EvqBuffer:
>+                continue;
>+            default:
>+                UNREACHABLE();
>+                return mappedStructs;
>         }
> 
>         unsigned int instanceCount = 1u;
>@@ -363,13 +495,15 @@ TString OutputHLSL::generateStructMapping(const std::vector<MappedStruct> &std14
>             TString originalName;
>             TString mappedName("map");
> 
>-            if (instanceName.getString() != "")
>+            if (mappedStruct.blockDeclarator->variable().symbolType() != SymbolType::Empty)
>             {
>+                const ImmutableString &instanceName =
>+                    mappedStruct.blockDeclarator->variable().name();
>                 unsigned int instanceStringArrayIndex = GL_INVALID_INDEX;
>                 if (isInstanceArray)
>                     instanceStringArrayIndex = instanceArrayIndex;
>-                TString instanceString = mUniformHLSL->uniformBlockInstanceString(
>-                    *interfaceBlock, instanceStringArrayIndex);
>+                TString instanceString = mResourcesHLSL->InterfaceBlockInstanceString(
>+                    instanceName, instanceStringArrayIndex);
>                 originalName += instanceString;
>                 mappedName += instanceString;
>                 originalName += ".";
>@@ -386,7 +520,7 @@ TString OutputHLSL::generateStructMapping(const std::vector<MappedStruct> &std14
> 
>             if (structType->isArray())
>             {
>-                mappedStructs += ArrayString(*mappedStruct.field->type());
>+                mappedStructs += ArrayString(*mappedStruct.field->type()).data();
>             }
> 
>             mappedStructs += " =\n";
>@@ -397,39 +531,42 @@ TString OutputHLSL::generateStructMapping(const std::vector<MappedStruct> &std14
>     return mappedStructs;
> }
> 
>-void OutputHLSL::header(TInfoSinkBase &out,
>-                        const std::vector<MappedStruct> &std140Structs,
>-                        const BuiltInFunctionEmulator *builtInFunctionEmulator) const
>+void OutputHLSL::writeReferencedAttributes(TInfoSinkBase &out) const
> {
>-    TString varyings;
>-    TString attributes;
>-    TString mappedStructs = generateStructMapping(std140Structs);
>-
>-    for (ReferencedSymbols::const_iterator varying = mReferencedVaryings.begin();
>-         varying != mReferencedVaryings.end(); varying++)
>+    for (const auto &attribute : mReferencedAttributes)
>     {
>-        const TType &type   = varying->second->getType();
>-        const TString &name = varying->second->getSymbol();
>+        const TType &type           = attribute.second->getType();
>+        const ImmutableString &name = attribute.second->name();
> 
>-        // Program linking depends on this exact format
>-        varyings += "static " + InterpolationString(type.getQualifier()) + " " + TypeString(type) +
>-                    " " + Decorate(name) + ArrayString(type) + " = " + initializer(type) + ";\n";
>+        out << "static " << TypeString(type) << " " << Decorate(name) << ArrayString(type) << " = "
>+            << zeroInitializer(type) << ";\n";
>     }
>+}
> 
>-    for (ReferencedSymbols::const_iterator attribute = mReferencedAttributes.begin();
>-         attribute != mReferencedAttributes.end(); attribute++)
>+void OutputHLSL::writeReferencedVaryings(TInfoSinkBase &out) const
>+{
>+    for (const auto &varying : mReferencedVaryings)
>     {
>-        const TType &type   = attribute->second->getType();
>-        const TString &name = attribute->second->getSymbol();
>+        const TType &type = varying.second->getType();
> 
>-        attributes += "static " + TypeString(type) + " " + Decorate(name) + ArrayString(type) +
>-                      " = " + initializer(type) + ";\n";
>+        // Program linking depends on this exact format
>+        out << "static " << InterpolationString(type.getQualifier()) << " " << TypeString(type)
>+            << " " << DecorateVariableIfNeeded(*varying.second) << ArrayString(type) << " = "
>+            << zeroInitializer(type) << ";\n";
>     }
>+}
>+
>+void OutputHLSL::header(TInfoSinkBase &out,
>+                        const std::vector<MappedStruct> &std140Structs,
>+                        const BuiltInFunctionEmulator *builtInFunctionEmulator) const
>+{
>+    TString mappedStructs = generateStructMapping(std140Structs);
> 
>     out << mStructureHLSL->structsHeader();
> 
>-    mUniformHLSL->uniformsHeader(out, mOutputType, mReferencedUniforms, mSymbolTable);
>-    out << mUniformHLSL->uniformBlocksHeader(mReferencedUniformBlocks);
>+    mResourcesHLSL->uniformsHeader(out, mOutputType, mReferencedUniforms, mSymbolTable);
>+    out << mResourcesHLSL->uniformBlocksHeader(mReferencedUniformBlocks);
>+    mSSBOOutputHLSL->writeShaderStorageBlocksHeader(out);
> 
>     if (!mEqualityFunctions.empty())
>     {
>@@ -479,34 +616,43 @@ void OutputHLSL::header(TInfoSinkBase &out,
>            "#define FLATTEN\n"
>            "#endif\n";
> 
>+    // array stride for atomic counter buffers is always 4 per original extension
>+    // ARB_shader_atomic_counters and discussion on
>+    // https://github.com/KhronosGroup/OpenGL-API/issues/5
>+    out << "\n#define ATOMIC_COUNTER_ARRAY_STRIDE 4\n\n";
>+
>+    if (mUseZeroArray)
>+    {
>+        out << DefineZeroArray() << "\n";
>+    }
>+
>     if (mShaderType == GL_FRAGMENT_SHADER)
>     {
>         const bool usingMRTExtension =
>             IsExtensionEnabled(mExtensionBehavior, TExtension::EXT_draw_buffers);
> 
>         out << "// Varyings\n";
>-        out << varyings;
>+        writeReferencedVaryings(out);
>         out << "\n";
> 
>         if (mShaderVersion >= 300)
>         {
>-            for (ReferencedSymbols::const_iterator outputVariableIt =
>-                     mReferencedOutputVariables.begin();
>-                 outputVariableIt != mReferencedOutputVariables.end(); outputVariableIt++)
>+            for (const auto &outputVariable : mReferencedOutputVariables)
>             {
>-                const TString &variableName = outputVariableIt->first;
>-                const TType &variableType   = outputVariableIt->second->getType();
>+                const ImmutableString &variableName = outputVariable.second->name();
>+                const TType &variableType           = outputVariable.second->getType();
> 
>-                out << "static " + TypeString(variableType) + " out_" + variableName +
>-                           ArrayString(variableType) + " = " + initializer(variableType) + ";\n";
>+                out << "static " << TypeString(variableType) << " out_" << variableName
>+                    << ArrayString(variableType) << " = " << zeroInitializer(variableType) << ";\n";
>             }
>         }
>         else
>         {
>             const unsigned int numColorValues = usingMRTExtension ? mNumRenderTargets : 1;
> 
>-            out << "static float4 gl_Color[" << numColorValues << "] =\n"
>-                                                                  "{\n";
>+            out << "static float4 gl_Color[" << numColorValues
>+                << "] =\n"
>+                   "{\n";
>             for (unsigned int i = 0; i < numColorValues; i++)
>             {
>                 out << "    float4(0, 0, 0, 0)";
>@@ -589,7 +735,7 @@ void OutputHLSL::header(TInfoSinkBase &out,
> 
>             if (mOutputType == SH_HLSL_4_1_OUTPUT)
>             {
>-                mUniformHLSL->samplerMetadataUniforms(out, "c4");
>+                mResourcesHLSL->samplerMetadataUniforms(out, 4);
>             }
> 
>             out << "};\n";
>@@ -621,14 +767,6 @@ void OutputHLSL::header(TInfoSinkBase &out,
>                    "\n";
>         }
> 
>-        if (!mappedStructs.empty())
>-        {
>-            out << "// Structures from std140 blocks with padding removed\n";
>-            out << "\n";
>-            out << mappedStructs;
>-            out << "\n";
>-        }
>-
>         if (usingMRTExtension && mNumRenderTargets > 1)
>         {
>             out << "#define GL_USES_MRT\n";
>@@ -647,7 +785,7 @@ void OutputHLSL::header(TInfoSinkBase &out,
>     else if (mShaderType == GL_VERTEX_SHADER)
>     {
>         out << "// Attributes\n";
>-        out << attributes;
>+        writeReferencedAttributes(out);
>         out << "\n"
>                "static float4 gl_Position = float4(0, 0, 0, 0);\n";
> 
>@@ -668,7 +806,7 @@ void OutputHLSL::header(TInfoSinkBase &out,
> 
>         out << "\n"
>                "// Varyings\n";
>-        out << varyings;
>+        writeReferencedVaryings(out);
>         out << "\n";
> 
>         if (mUsesDepthRange)
>@@ -709,7 +847,12 @@ void OutputHLSL::header(TInfoSinkBase &out,
> 
>             if (mOutputType == SH_HLSL_4_1_OUTPUT)
>             {
>-                mUniformHLSL->samplerMetadataUniforms(out, "c4");
>+                mResourcesHLSL->samplerMetadataUniforms(out, 4);
>+            }
>+
>+            if (mUsesVertexID)
>+            {
>+                out << "    uint dx_VertexID : packoffset(c3.w);\n";
>             }
> 
>             out << "};\n"
>@@ -733,14 +876,6 @@ void OutputHLSL::header(TInfoSinkBase &out,
>                    "dx_DepthRange.y, dx_DepthRange.z};\n"
>                    "\n";
>         }
>-
>-        if (!mappedStructs.empty())
>-        {
>-            out << "// Structures from std140 blocks with padding removed\n";
>-            out << "\n";
>-            out << mappedStructs;
>-            out << "\n";
>-        }
>     }
>     else  // Compute shader
>     {
>@@ -753,37 +888,75 @@ void OutputHLSL::header(TInfoSinkBase &out,
>             out << "    uint3 gl_NumWorkGroups : packoffset(c0);\n";
>         }
>         ASSERT(mOutputType == SH_HLSL_4_1_OUTPUT);
>-        mUniformHLSL->samplerMetadataUniforms(out, "c1");
>+        unsigned int registerIndex = 1;
>+        mResourcesHLSL->samplerMetadataUniforms(out, registerIndex);
>+        // Sampler metadata struct must be two 4-vec, 32 bytes.
>+        registerIndex += mResourcesHLSL->getSamplerCount() * 2;
>+        mResourcesHLSL->imageMetadataUniforms(out, registerIndex);
>         out << "};\n";
> 
>-        // Follow built-in variables would be initialized in
>-        // DynamicHLSL::generateComputeShaderLinkHLSL, if they
>-        // are used in compute shader.
>+        out << kImage2DFunctionString << "\n";
>+
>+        std::ostringstream systemValueDeclaration  = sh::InitializeStream<std::ostringstream>();
>+        std::ostringstream glBuiltinInitialization = sh::InitializeStream<std::ostringstream>();
>+
>+        systemValueDeclaration << "\nstruct CS_INPUT\n{\n";
>+        glBuiltinInitialization << "\nvoid initGLBuiltins(CS_INPUT input)\n"
>+                                << "{\n";
>+
>         if (mUsesWorkGroupID)
>         {
>             out << "static uint3 gl_WorkGroupID = uint3(0, 0, 0);\n";
>+            systemValueDeclaration << "    uint3 dx_WorkGroupID : "
>+                                   << "SV_GroupID;\n";
>+            glBuiltinInitialization << "    gl_WorkGroupID = input.dx_WorkGroupID;\n";
>         }
> 
>         if (mUsesLocalInvocationID)
>         {
>             out << "static uint3 gl_LocalInvocationID = uint3(0, 0, 0);\n";
>+            systemValueDeclaration << "    uint3 dx_LocalInvocationID : "
>+                                   << "SV_GroupThreadID;\n";
>+            glBuiltinInitialization << "    gl_LocalInvocationID = input.dx_LocalInvocationID;\n";
>         }
> 
>         if (mUsesGlobalInvocationID)
>         {
>             out << "static uint3 gl_GlobalInvocationID = uint3(0, 0, 0);\n";
>+            systemValueDeclaration << "    uint3 dx_GlobalInvocationID : "
>+                                   << "SV_DispatchThreadID;\n";
>+            glBuiltinInitialization << "    gl_GlobalInvocationID = input.dx_GlobalInvocationID;\n";
>         }
> 
>         if (mUsesLocalInvocationIndex)
>         {
>             out << "static uint gl_LocalInvocationIndex = uint(0);\n";
>+            systemValueDeclaration << "    uint dx_LocalInvocationIndex : "
>+                                   << "SV_GroupIndex;\n";
>+            glBuiltinInitialization
>+                << "    gl_LocalInvocationIndex = input.dx_LocalInvocationIndex;\n";
>         }
>+
>+        systemValueDeclaration << "};\n\n";
>+        glBuiltinInitialization << "};\n\n";
>+
>+        out << systemValueDeclaration.str();
>+        out << glBuiltinInitialization.str();
>+    }
>+
>+    if (!mappedStructs.empty())
>+    {
>+        out << "// Structures from std140 blocks with padding removed\n";
>+        out << "\n";
>+        out << mappedStructs;
>+        out << "\n";
>     }
> 
>     bool getDimensionsIgnoresBaseLevel =
>         (mCompileOptions & SH_HLSL_GET_DIMENSIONS_IGNORES_BASE_LEVEL) != 0;
>     mTextureFunctionHLSL->textureFunctionHeader(out, mOutputType, getDimensionsIgnoresBaseLevel);
>     mImageFunctionHLSL->imageFunctionHeader(out);
>+    mAtomicCounterFunctionHLSL->atomicCounterFunctionHeader(out);
> 
>     if (mUsesFragCoord)
>     {
>@@ -810,6 +983,11 @@ void OutputHLSL::header(TInfoSinkBase &out,
>         out << "#define GL_ANGLE_MULTIVIEW_ENABLED\n";
>     }
> 
>+    if (mUsesVertexID)
>+    {
>+        out << "#define GL_USES_VERTEX_ID\n";
>+    }
>+
>     if (mUsesViewID)
>     {
>         out << "#define GL_USES_VIEW_ID\n";
>@@ -825,31 +1003,6 @@ void OutputHLSL::header(TInfoSinkBase &out,
>         out << "#define GL_USES_DEPTH_RANGE\n";
>     }
> 
>-    if (mUsesNumWorkGroups)
>-    {
>-        out << "#define GL_USES_NUM_WORK_GROUPS\n";
>-    }
>-
>-    if (mUsesWorkGroupID)
>-    {
>-        out << "#define GL_USES_WORK_GROUP_ID\n";
>-    }
>-
>-    if (mUsesLocalInvocationID)
>-    {
>-        out << "#define GL_USES_LOCAL_INVOCATION_ID\n";
>-    }
>-
>-    if (mUsesGlobalInvocationID)
>-    {
>-        out << "#define GL_USES_GLOBAL_INVOCATION_ID\n";
>-    }
>-
>-    if (mUsesLocalInvocationIndex)
>-    {
>-        out << "#define GL_USES_LOCAL_INVOCATION_INDEX\n";
>-    }
>-
>     if (mUsesXor)
>     {
>         out << "bool xor(bool p, bool q)\n"
>@@ -864,60 +1017,95 @@ void OutputHLSL::header(TInfoSinkBase &out,
> 
> void OutputHLSL::visitSymbol(TIntermSymbol *node)
> {
>+    const TVariable &variable = node->variable();
>+
>+    // Empty symbols can only appear in declarations and function arguments, and in either of those
>+    // cases the symbol nodes are not visited.
>+    ASSERT(variable.symbolType() != SymbolType::Empty);
>+
>     TInfoSinkBase &out = getInfoSink();
> 
>     // Handle accessing std140 structs by value
>-    if (IsInStd140InterfaceBlock(node) && node->getBasicType() == EbtStruct)
>+    if (IsInStd140UniformBlock(node) && node->getBasicType() == EbtStruct)
>     {
>         out << "map";
>     }
> 
>-    TString name = node->getSymbol();
>+    const ImmutableString &name     = variable.name();
>+    const TSymbolUniqueId &uniqueId = variable.uniqueId();
> 
>     if (name == "gl_DepthRange")
>     {
>         mUsesDepthRange = true;
>         out << name;
>     }
>+    else if (IsAtomicCounter(variable.getType().getBasicType()))
>+    {
>+        const TType &variableType = variable.getType();
>+        if (variableType.getQualifier() == EvqUniform)
>+        {
>+            TLayoutQualifier layout             = variableType.getLayoutQualifier();
>+            mReferencedUniforms[uniqueId.get()] = &variable;
>+            out << getAtomicCounterNameForBinding(layout.binding) << ", " << layout.offset;
>+        }
>+        else
>+        {
>+            TString varName = DecorateVariableIfNeeded(variable);
>+            out << varName << ", " << varName << "_offset";
>+        }
>+    }
>     else
>     {
>-        const TType &nodeType = node->getType();
>-        TQualifier qualifier = node->getQualifier();
>+        const TType &variableType = variable.getType();
>+        TQualifier qualifier      = variable.getType().getQualifier();
> 
>-        ensureStructDefined(nodeType);
>+        ensureStructDefined(variableType);
> 
>         if (qualifier == EvqUniform)
>         {
>-            const TInterfaceBlock *interfaceBlock = nodeType.getInterfaceBlock();
>+            const TInterfaceBlock *interfaceBlock = variableType.getInterfaceBlock();
> 
>             if (interfaceBlock)
>             {
>-                mReferencedUniformBlocks[interfaceBlock->name()] = node;
>+                if (mReferencedUniformBlocks.count(interfaceBlock->uniqueId().get()) == 0)
>+                {
>+                    const TVariable *instanceVariable = nullptr;
>+                    if (variableType.isInterfaceBlock())
>+                    {
>+                        instanceVariable = &variable;
>+                    }
>+                    mReferencedUniformBlocks[interfaceBlock->uniqueId().get()] =
>+                        new TReferencedBlock(interfaceBlock, instanceVariable);
>+                }
>             }
>             else
>             {
>-                mReferencedUniforms[name] = node;
>+                mReferencedUniforms[uniqueId.get()] = &variable;
>             }
> 
>-            out << DecorateVariableIfNeeded(node->getName());
>+            out << DecorateVariableIfNeeded(variable);
>+        }
>+        else if (qualifier == EvqBuffer)
>+        {
>+            UNREACHABLE();
>         }
>         else if (qualifier == EvqAttribute || qualifier == EvqVertexIn)
>         {
>-            mReferencedAttributes[name] = node;
>+            mReferencedAttributes[uniqueId.get()] = &variable;
>             out << Decorate(name);
>         }
>         else if (IsVarying(qualifier))
>         {
>-            mReferencedVaryings[name] = node;
>-            out << Decorate(name);
>-            if (name == "ViewID_OVR")
>+            mReferencedVaryings[uniqueId.get()] = &variable;
>+            out << DecorateVariableIfNeeded(variable);
>+            if (variable.symbolType() == SymbolType::AngleInternal && name == "ViewID_OVR")
>             {
>                 mUsesViewID = true;
>             }
>         }
>         else if (qualifier == EvqFragmentOut)
>         {
>-            mReferencedOutputVariables[name] = node;
>+            mReferencedOutputVariables[uniqueId.get()] = &variable;
>             out << "out_" << name;
>         }
>         else if (qualifier == EvqFragColor)
>@@ -992,16 +1180,11 @@ void OutputHLSL::visitSymbol(TIntermSymbol *node)
>         }
>         else
>         {
>-            out << DecorateVariableIfNeeded(node->getName());
>+            out << DecorateVariableIfNeeded(variable);
>         }
>     }
> }
> 
>-void OutputHLSL::visitRaw(TIntermRaw *node)
>-{
>-    getInfoSink() << node->getRawText();
>-}
>-
> void OutputHLSL::outputEqual(Visit visit, const TType &type, TOperator op, TInfoSinkBase &out)
> {
>     if (type.isScalar() && !type.isArray())
>@@ -1130,6 +1313,50 @@ bool OutputHLSL::visitBinary(Visit visit, TIntermBinary *node)
>                 // function call is assigned.
>                 ASSERT(rightAgg == nullptr);
>             }
>+            // Assignment expressions with atomic functions should be transformed into atomic
>+            // function calls in HLSL.
>+            // e.g. original_value = atomicAdd(dest, value) should be translated into
>+            //      InterlockedAdd(dest, value, original_value);
>+            else if (IsAtomicFunctionForSharedVariableDirectAssign(*node))
>+            {
>+                TIntermAggregate *atomicFunctionNode = node->getRight()->getAsAggregate();
>+                TOperator atomicFunctionOp           = atomicFunctionNode->getOp();
>+                out << GetHLSLAtomicFunctionStringAndLeftParenthesis(atomicFunctionOp);
>+                TIntermSequence *argumentSeq = atomicFunctionNode->getSequence();
>+                ASSERT(argumentSeq->size() >= 2u);
>+                for (auto &argument : *argumentSeq)
>+                {
>+                    argument->traverse(this);
>+                    out << ", ";
>+                }
>+                node->getLeft()->traverse(this);
>+                out << ")";
>+                return false;
>+            }
>+            else if (IsInShaderStorageBlock(node->getLeft()))
>+            {
>+                mSSBOOutputHLSL->outputStoreFunctionCallPrefix(node->getLeft());
>+                out << ", ";
>+                if (IsInShaderStorageBlock(node->getRight()))
>+                {
>+                    mSSBOOutputHLSL->outputLoadFunctionCall(node->getRight());
>+                }
>+                else
>+                {
>+                    node->getRight()->traverse(this);
>+                }
>+
>+                out << ")";
>+                return false;
>+            }
>+            else if (IsInShaderStorageBlock(node->getRight()))
>+            {
>+                node->getLeft()->traverse(this);
>+                out << " = ";
>+                mSSBOOutputHLSL->outputLoadFunctionCall(node->getRight());
>+                return false;
>+            }
>+
>             outputAssign(visit, node->getType(), out);
>             break;
>         case EOpInitialize:
>@@ -1137,23 +1364,22 @@ bool OutputHLSL::visitBinary(Visit visit, TIntermBinary *node)
>             {
>                 TIntermSymbol *symbolNode = node->getLeft()->getAsSymbolNode();
>                 ASSERT(symbolNode);
>-                TIntermTyped *expression = node->getRight();
>+                TIntermTyped *initializer = node->getRight();
> 
>                 // Global initializers must be constant at this point.
>-                ASSERT(symbolNode->getQualifier() != EvqGlobal ||
>-                       canWriteAsHLSLLiteral(expression));
>+                ASSERT(symbolNode->getQualifier() != EvqGlobal || initializer->hasConstantValue());
> 
>                 // GLSL allows to write things like "float x = x;" where a new variable x is defined
>                 // and the value of an existing variable x is assigned. HLSL uses C semantics (the
>                 // new variable is created before the assignment is evaluated), so we need to
>                 // convert
>                 // this to "float t = x, x = t;".
>-                if (writeSameSymbolInitializer(out, symbolNode, expression))
>+                if (writeSameSymbolInitializer(out, symbolNode, initializer))
>                 {
>                     // Skip initializing the rest of the expression
>                     return false;
>                 }
>-                else if (writeConstantInitialization(out, symbolNode, expression))
>+                else if (writeConstantInitialization(out, symbolNode, initializer))
>                 {
>                     return false;
>                 }
>@@ -1161,6 +1387,11 @@ bool OutputHLSL::visitBinary(Visit visit, TIntermBinary *node)
>             else if (visit == InVisit)
>             {
>                 out << " = ";
>+                if (IsInShaderStorageBlock(node->getRight()))
>+                {
>+                    mSSBOOutputHLSL->outputLoadFunctionCall(node->getRight());
>+                    return false;
>+                }
>             }
>             break;
>         case EOpAddAssign:
>@@ -1238,11 +1469,18 @@ bool OutputHLSL::visitBinary(Visit visit, TIntermBinary *node)
>             {
>                 if (visit == PreVisit)
>                 {
>-                    TInterfaceBlock *interfaceBlock = leftType.getInterfaceBlock();
>+                    TIntermSymbol *instanceArraySymbol    = node->getLeft()->getAsSymbolNode();
>+                    const TInterfaceBlock *interfaceBlock = leftType.getInterfaceBlock();
>+
>+                    ASSERT(leftType.getQualifier() == EvqUniform);
>+                    if (mReferencedUniformBlocks.count(interfaceBlock->uniqueId().get()) == 0)
>+                    {
>+                        mReferencedUniformBlocks[interfaceBlock->uniqueId().get()] =
>+                            new TReferencedBlock(interfaceBlock, &instanceArraySymbol->variable());
>+                    }
>                     const int arrayIndex = node->getRight()->getAsConstantUnion()->getIConst(0);
>-                    mReferencedUniformBlocks[interfaceBlock->instanceName()] =
>-                        node->getLeft()->getAsSymbolNode();
>-                    out << mUniformHLSL->uniformBlockInstanceString(*interfaceBlock, arrayIndex);
>+                    out << mResourcesHLSL->InterfaceBlockInstanceString(
>+                        instanceArraySymbol->getName(), arrayIndex);
>                     return false;
>                 }
>             }
>@@ -1252,6 +1490,10 @@ bool OutputHLSL::visitBinary(Visit visit, TIntermBinary *node)
>                 // separator to access the sampler variable that has been moved out of the struct.
>                 outputTriplet(out, visit, "", "_", "");
>             }
>+            else if (IsAtomicCounter(leftType.getBasicType()))
>+            {
>+                outputTriplet(out, visit, "", " + (", ") * ATOMIC_COUNTER_ARRAY_STRIDE");
>+            }
>             else
>             {
>                 outputTriplet(out, visit, "", "[", "]");
>@@ -1259,10 +1501,21 @@ bool OutputHLSL::visitBinary(Visit visit, TIntermBinary *node)
>         }
>         break;
>         case EOpIndexIndirect:
>+        {
>             // We do not currently support indirect references to interface blocks
>             ASSERT(node->getLeft()->getBasicType() != EbtInterfaceBlock);
>-            outputTriplet(out, visit, "", "[", "]");
>+
>+            const TType &leftType = node->getLeft()->getType();
>+            if (IsAtomicCounter(leftType.getBasicType()))
>+            {
>+                outputTriplet(out, visit, "", " + (", ") * ATOMIC_COUNTER_ARRAY_STRIDE");
>+            }
>+            else
>+            {
>+                outputTriplet(out, visit, "", "[", "]");
>+            }
>             break;
>+        }
>         case EOpIndexDirectStruct:
>         {
>             const TStructure *structure       = node->getLeft()->getType().getStruct();
>@@ -1289,11 +1542,11 @@ bool OutputHLSL::visitBinary(Visit visit, TIntermBinary *node)
>             {
>                 if (indexingReturnsSampler)
>                 {
>-                    out << "_" + field->name();
>+                    out << "_" << field->name();
>                 }
>                 else
>                 {
>-                    out << "." + DecorateField(field->name(), *structure);
>+                    out << "." << DecorateField(field->name(), *structure);
>                 }
> 
>                 return false;
>@@ -1302,9 +1555,10 @@ bool OutputHLSL::visitBinary(Visit visit, TIntermBinary *node)
>         break;
>         case EOpIndexDirectInterfaceBlock:
>         {
>-            bool structInStd140Block =
>-                node->getBasicType() == EbtStruct && IsInStd140InterfaceBlock(node->getLeft());
>-            if (visit == PreVisit && structInStd140Block)
>+            ASSERT(!IsInShaderStorageBlock(node->getLeft()));
>+            bool structInStd140UniformBlock =
>+                node->getBasicType() == EbtStruct && IsInStd140UniformBlock(node->getLeft());
>+            if (visit == PreVisit && structInStd140UniformBlock)
>             {
>                 out << "map";
>             }
>@@ -1314,7 +1568,7 @@ bool OutputHLSL::visitBinary(Visit visit, TIntermBinary *node)
>                     node->getLeft()->getType().getInterfaceBlock();
>                 const TIntermConstantUnion *index = node->getRight()->getAsConstantUnion();
>                 const TField *field               = interfaceBlock->fields()[index->getIConst(0)];
>-                if (structInStd140Block)
>+                if (structInStd140UniformBlock)
>                 {
>                     out << "_";
>                 }
>@@ -1473,8 +1727,6 @@ bool OutputHLSL::visitUnary(Visit visit, TIntermUnary *node)
>             outputTriplet(out, visit, "cosh(", "", ")");
>             break;
>         case EOpTanh:
>-            outputTriplet(out, visit, "tanh(", "", ")");
>-            break;
>         case EOpAsinh:
>         case EOpAcosh:
>         case EOpAtanh:
>@@ -1496,7 +1748,7 @@ bool OutputHLSL::visitUnary(Visit visit, TIntermUnary *node)
>         case EOpSqrt:
>             outputTriplet(out, visit, "sqrt(", "", ")");
>             break;
>-        case EOpInverseSqrt:
>+        case EOpInversesqrt:
>             outputTriplet(out, visit, "rsqrt(", "", ")");
>             break;
>         case EOpAbs:
>@@ -1524,14 +1776,14 @@ bool OutputHLSL::visitUnary(Visit visit, TIntermUnary *node)
>         case EOpFract:
>             outputTriplet(out, visit, "frac(", "", ")");
>             break;
>-        case EOpIsNan:
>+        case EOpIsnan:
>             if (node->getUseEmulatedFunction())
>                 writeEmulatedFunctionTriplet(out, visit, node->getOp());
>             else
>                 outputTriplet(out, visit, "isnan(", "", ")");
>             mRequiresIEEEStrictCompiling = true;
>             break;
>-        case EOpIsInf:
>+        case EOpIsinf:
>             outputTriplet(out, visit, "isinf(", "", ")");
>             break;
>         case EOpFloatBitsToInt:
>@@ -1631,6 +1883,13 @@ bool OutputHLSL::visitUnary(Visit visit, TIntermUnary *node)
>             // tested in GLSLTest and results are consistent with GL.
>             outputTriplet(out, visit, "firstbithigh(", "", ")");
>             break;
>+        case EOpArrayLength:
>+        {
>+            TIntermTyped *operand = node->getOperand();
>+            ASSERT(IsInShaderStorageBlock(operand));
>+            mSSBOOutputHLSL->outputLengthFunctionCall(operand);
>+            return false;
>+        }
>         default:
>             UNREACHABLE();
>     }
>@@ -1638,11 +1897,12 @@ bool OutputHLSL::visitUnary(Visit visit, TIntermUnary *node)
>     return true;
> }
> 
>-TString OutputHLSL::samplerNamePrefixFromStruct(TIntermTyped *node)
>+ImmutableString OutputHLSL::samplerNamePrefixFromStruct(TIntermTyped *node)
> {
>     if (node->getAsSymbolNode())
>     {
>-        return node->getAsSymbolNode()->getSymbol();
>+        ASSERT(node->getAsSymbolNode()->variable().symbolType() != SymbolType::Empty);
>+        return node->getAsSymbolNode()->getName();
>     }
>     TIntermBinary *nodeBinary = node->getAsBinaryNode();
>     switch (nodeBinary->getOp())
>@@ -1651,9 +1911,9 @@ TString OutputHLSL::samplerNamePrefixFromStruct(TIntermTyped *node)
>         {
>             int index = nodeBinary->getRight()->getAsConstantUnion()->getIConst(0);
> 
>-            TInfoSinkBase prefixSink;
>+            std::stringstream prefixSink = sh::InitializeStream<std::stringstream>();
>             prefixSink << samplerNamePrefixFromStruct(nodeBinary->getLeft()) << "_" << index;
>-            return TString(prefixSink.c_str());
>+            return ImmutableString(prefixSink.str());
>         }
>         case EOpIndexDirectStruct:
>         {
>@@ -1661,14 +1921,14 @@ TString OutputHLSL::samplerNamePrefixFromStruct(TIntermTyped *node)
>             int index           = nodeBinary->getRight()->getAsConstantUnion()->getIConst(0);
>             const TField *field = s->fields()[index];
> 
>-            TInfoSinkBase prefixSink;
>+            std::stringstream prefixSink = sh::InitializeStream<std::stringstream>();
>             prefixSink << samplerNamePrefixFromStruct(nodeBinary->getLeft()) << "_"
>                        << field->name();
>-            return TString(prefixSink.c_str());
>+            return ImmutableString(prefixSink.str());
>         }
>         default:
>             UNREACHABLE();
>-            return TString("");
>+            return kEmptyImmutableString;
>     }
> }
> 
>@@ -1676,10 +1936,23 @@ bool OutputHLSL::visitBlock(Visit visit, TIntermBlock *node)
> {
>     TInfoSinkBase &out = getInfoSink();
> 
>+    bool isMainBlock = mInsideMain && getParentNode()->getAsFunctionDefinition();
>+
>     if (mInsideFunction)
>     {
>         outputLineDirective(out, node->getLine().first_line);
>         out << "{\n";
>+        if (isMainBlock)
>+        {
>+            if (mShaderType == GL_COMPUTE_SHADER)
>+            {
>+                out << "initGLBuiltins(input);\n";
>+            }
>+            else
>+            {
>+                out << "@@ MAIN PROLOGUE @@\n";
>+            }
>+        }
>     }
> 
>     for (TIntermNode *statement : *node->getSequence())
>@@ -1714,6 +1987,19 @@ bool OutputHLSL::visitBlock(Visit visit, TIntermBlock *node)
>     if (mInsideFunction)
>     {
>         outputLineDirective(out, node->getLine().last_line);
>+        if (isMainBlock && shaderNeedsGenerateOutput())
>+        {
>+            // We could have an empty main, a main function without a branch at the end, or a main
>+            // function with a discard statement at the end. In these cases we need to add a return
>+            // statement.
>+            bool needReturnStatement =
>+                node->getSequence()->empty() || !node->getSequence()->back()->getAsBranchNode() ||
>+                node->getSequence()->back()->getAsBranchNode()->getFlowOp() != EOpReturn;
>+            if (needReturnStatement)
>+            {
>+                out << "return " << generateOutputCall() << ";\n";
>+            }
>+        }
>         out << "}\n";
>     }
> 
>@@ -1726,56 +2012,75 @@ bool OutputHLSL::visitFunctionDefinition(Visit visit, TIntermFunctionDefinition
> 
>     ASSERT(mCurrentFunctionMetadata == nullptr);
> 
>-    size_t index = mCallDag.findIndex(node->getFunctionSymbolInfo());
>+    size_t index = mCallDag.findIndex(node->getFunction()->uniqueId());
>     ASSERT(index != CallDAG::InvalidIndex);
>     mCurrentFunctionMetadata = &mASTMetadataList[index];
> 
>-    out << TypeString(node->getFunctionPrototype()->getType()) << " ";
>+    const TFunction *func = node->getFunction();
> 
>-    TIntermSequence *parameters = node->getFunctionPrototype()->getSequence();
>-
>-    if (node->getFunctionSymbolInfo()->isMain())
>+    if (func->isMain())
>     {
>-        out << "gl_main(";
>+        // The stub strings below are replaced when shader is dynamically defined by its layout:
>+        switch (mShaderType)
>+        {
>+            case GL_VERTEX_SHADER:
>+                out << "@@ VERTEX ATTRIBUTES @@\n\n"
>+                    << "@@ VERTEX OUTPUT @@\n\n"
>+                    << "VS_OUTPUT main(VS_INPUT input)";
>+                break;
>+            case GL_FRAGMENT_SHADER:
>+                out << "@@ PIXEL OUTPUT @@\n\n"
>+                    << "PS_OUTPUT main(@@ PIXEL MAIN PARAMETERS @@)";
>+                break;
>+            case GL_COMPUTE_SHADER:
>+                out << "[numthreads(" << mWorkGroupSize[0] << ", " << mWorkGroupSize[1] << ", "
>+                    << mWorkGroupSize[2] << ")]\n";
>+                out << "void main(CS_INPUT input)";
>+                break;
>+            default:
>+                UNREACHABLE();
>+                break;
>+        }
>     }
>     else
>     {
>-        out << DecorateFunctionIfNeeded(node->getFunctionSymbolInfo()->getNameObj())
>-            << DisambiguateFunctionName(parameters) << (mOutputLod0Function ? "Lod0(" : "(");
>-    }
>+        out << TypeString(node->getFunctionPrototype()->getType()) << " ";
>+        out << DecorateFunctionIfNeeded(func) << DisambiguateFunctionName(func)
>+            << (mOutputLod0Function ? "Lod0(" : "(");
> 
>-    for (unsigned int i = 0; i < parameters->size(); i++)
>-    {
>-        TIntermSymbol *symbol = (*parameters)[i]->getAsSymbolNode();
>-
>-        if (symbol)
>+        size_t paramCount = func->getParamCount();
>+        for (unsigned int i = 0; i < paramCount; i++)
>         {
>-            ensureStructDefined(symbol->getType());
>+            const TVariable *param = func->getParam(i);
>+            ensureStructDefined(param->getType());
> 
>-            out << argumentString(symbol);
>+            writeParameter(param, out);
> 
>-            if (i < parameters->size() - 1)
>+            if (i < paramCount - 1)
>             {
>                 out << ", ";
>             }
>         }
>-        else
>-            UNREACHABLE();
>-    }
> 
>-    out << ")\n";
>+        out << ")\n";
>+    }
> 
>     mInsideFunction = true;
>+    if (func->isMain())
>+    {
>+        mInsideMain = true;
>+    }
>     // The function body node will output braces.
>     node->getBody()->traverse(this);
>     mInsideFunction = false;
>+    mInsideMain     = false;
> 
>     mCurrentFunctionMetadata = nullptr;
> 
>     bool needsLod0 = mASTMetadataList[index].mNeedsLod0;
>     if (needsLod0 && !mOutputLod0Function && mShaderType == GL_FRAGMENT_SHADER)
>     {
>-        ASSERT(!node->getFunctionSymbolInfo()->isMain());
>+        ASSERT(!node->getFunction()->isMain());
>         mOutputLod0Function = true;
>         node->traverse(this);
>         mOutputLod0Function = false;
>@@ -1789,55 +2094,64 @@ bool OutputHLSL::visitDeclaration(Visit visit, TIntermDeclaration *node)
>     if (visit == PreVisit)
>     {
>         TIntermSequence *sequence = node->getSequence();
>-        TIntermTyped *variable    = (*sequence)[0]->getAsTyped();
>+        TIntermTyped *declarator  = (*sequence)[0]->getAsTyped();
>         ASSERT(sequence->size() == 1);
>-        ASSERT(variable);
>+        ASSERT(declarator);
> 
>         if (IsDeclarationWrittenOut(node))
>         {
>             TInfoSinkBase &out = getInfoSink();
>-            ensureStructDefined(variable->getType());
>+            ensureStructDefined(declarator->getType());
> 
>-            if (!variable->getAsSymbolNode() ||
>-                variable->getAsSymbolNode()->getSymbol() != "")  // Variable declaration
>+            if (!declarator->getAsSymbolNode() ||
>+                declarator->getAsSymbolNode()->variable().symbolType() !=
>+                    SymbolType::Empty)  // Variable declaration
>             {
>-                if (!mInsideFunction)
>+                if (declarator->getQualifier() == EvqShared)
>+                {
>+                    out << "groupshared ";
>+                }
>+                else if (!mInsideFunction)
>                 {
>                     out << "static ";
>                 }
> 
>-                out << TypeString(variable->getType()) + " ";
>+                out << TypeString(declarator->getType()) + " ";
> 
>-                TIntermSymbol *symbol = variable->getAsSymbolNode();
>+                TIntermSymbol *symbol = declarator->getAsSymbolNode();
> 
>                 if (symbol)
>                 {
>                     symbol->traverse(this);
>                     out << ArrayString(symbol->getType());
>-                    out << " = " + initializer(symbol->getType());
>+                    // Temporarily disable shadred memory initialization. It is very slow for D3D11
>+                    // drivers to compile a compute shader if we add code to initialize a
>+                    // groupshared array variable with a large array size. And maybe produce
>+                    // incorrect result. See http://anglebug.com/3226.
>+                    if (declarator->getQualifier() != EvqShared)
>+                    {
>+                        out << " = " + zeroInitializer(symbol->getType());
>+                    }
>                 }
>                 else
>                 {
>-                    variable->traverse(this);
>+                    declarator->traverse(this);
>                 }
>             }
>-            else if (variable->getAsSymbolNode() &&
>-                     variable->getAsSymbolNode()->getSymbol() == "")  // Type (struct) declaration
>-            {
>-                ASSERT(variable->getBasicType() == EbtStruct);
>-                // ensureStructDefined has already been called.
>-            }
>-            else
>-                UNREACHABLE();
>         }
>-        else if (IsVaryingOut(variable->getQualifier()))
>+        else if (IsVaryingOut(declarator->getQualifier()))
>         {
>-            TIntermSymbol *symbol = variable->getAsSymbolNode();
>+            TIntermSymbol *symbol = declarator->getAsSymbolNode();
>             ASSERT(symbol);  // Varying declarations can't have initializers.
> 
>-            // Vertex outputs which are declared but not written to should still be declared to
>-            // allow successful linking.
>-            mReferencedVaryings[symbol->getSymbol()] = symbol;
>+            const TVariable &variable = symbol->variable();
>+
>+            if (variable.symbolType() != SymbolType::Empty)
>+            {
>+                // Vertex outputs which are declared but not written to should still be declared to
>+                // allow successful linking.
>+                mReferencedVaryings[symbol->uniqueId().get()] = &variable;
>+            }
>         }
>     }
>     return false;
>@@ -1849,32 +2163,29 @@ bool OutputHLSL::visitInvariantDeclaration(Visit visit, TIntermInvariantDeclarat
>     return false;
> }
> 
>-bool OutputHLSL::visitFunctionPrototype(Visit visit, TIntermFunctionPrototype *node)
>+void OutputHLSL::visitFunctionPrototype(TIntermFunctionPrototype *node)
> {
>     TInfoSinkBase &out = getInfoSink();
> 
>-    ASSERT(visit == PreVisit);
>-    size_t index = mCallDag.findIndex(node->getFunctionSymbolInfo());
>+    size_t index = mCallDag.findIndex(node->getFunction()->uniqueId());
>     // Skip the prototype if it is not implemented (and thus not used)
>     if (index == CallDAG::InvalidIndex)
>     {
>-        return false;
>+        return;
>     }
> 
>-    TIntermSequence *arguments = node->getSequence();
>+    const TFunction *func = node->getFunction();
> 
>-    TString name = DecorateFunctionIfNeeded(node->getFunctionSymbolInfo()->getNameObj());
>-    out << TypeString(node->getType()) << " " << name << DisambiguateFunctionName(arguments)
>+    TString name = DecorateFunctionIfNeeded(func);
>+    out << TypeString(node->getType()) << " " << name << DisambiguateFunctionName(func)
>         << (mOutputLod0Function ? "Lod0(" : "(");
> 
>-    for (unsigned int i = 0; i < arguments->size(); i++)
>+    size_t paramCount = func->getParamCount();
>+    for (unsigned int i = 0; i < paramCount; i++)
>     {
>-        TIntermSymbol *symbol = (*arguments)[i]->getAsSymbolNode();
>-        ASSERT(symbol != nullptr);
>+        writeParameter(func->getParam(i), out);
> 
>-        out << argumentString(symbol);
>-
>-        if (i < arguments->size() - 1)
>+        if (i < paramCount - 1)
>         {
>             out << ", ";
>         }
>@@ -1890,8 +2201,6 @@ bool OutputHLSL::visitFunctionPrototype(Visit visit, TIntermFunctionPrototype *n
>         node->traverse(this);
>         mOutputLod0Function = false;
>     }
>-
>-    return false;
> }
> 
> bool OutputHLSL::visitAggregate(Visit visit, TIntermAggregate *node)
>@@ -1913,11 +2222,11 @@ bool OutputHLSL::visitAggregate(Visit visit, TIntermAggregate *node)
>                 {
>                     UNIMPLEMENTED();
>                 }
>-                size_t index = mCallDag.findIndex(node->getFunctionSymbolInfo());
>+                size_t index = mCallDag.findIndex(node->getFunction()->uniqueId());
>                 ASSERT(index != CallDAG::InvalidIndex);
>                 lod0 &= mASTMetadataList[index].mNeedsLod0;
> 
>-                out << DecorateFunctionIfNeeded(node->getFunctionSymbolInfo()->getNameObj());
>+                out << DecorateFunctionIfNeeded(node->getFunction());
>                 out << DisambiguateFunctionName(node->getSequence());
>                 out << (lod0 ? "Lod0(" : "(");
>             }
>@@ -1925,28 +2234,36 @@ bool OutputHLSL::visitAggregate(Visit visit, TIntermAggregate *node)
>             {
>                 // This path is used for internal functions that don't have their definitions in the
>                 // AST, such as precision emulation functions.
>-                out << DecorateFunctionIfNeeded(node->getFunctionSymbolInfo()->getNameObj()) << "(";
>+                out << DecorateFunctionIfNeeded(node->getFunction()) << "(";
>             }
>-            else if (node->getFunctionSymbolInfo()->isImageFunction())
>+            else if (node->getFunction()->isImageFunction())
>             {
>-                TString name              = node->getFunctionSymbolInfo()->getName();
>-                TType type                = (*arguments)[0]->getAsTyped()->getType();
>-                TString imageFunctionName = mImageFunctionHLSL->useImageFunction(
>+                const ImmutableString &name              = node->getFunction()->name();
>+                TType type                               = (*arguments)[0]->getAsTyped()->getType();
>+                const ImmutableString &imageFunctionName = mImageFunctionHLSL->useImageFunction(
>                     name, type.getBasicType(), type.getLayoutQualifier().imageInternalFormat,
>                     type.getMemoryQualifier().readonly);
>                 out << imageFunctionName << "(";
>             }
>+            else if (node->getFunction()->isAtomicCounterFunction())
>+            {
>+                const ImmutableString &name = node->getFunction()->name();
>+                ImmutableString atomicFunctionName =
>+                    mAtomicCounterFunctionHLSL->useAtomicCounterFunction(name);
>+                out << atomicFunctionName << "(";
>+            }
>             else
>             {
>-                const TString &name    = node->getFunctionSymbolInfo()->getName();
>+                const ImmutableString &name = node->getFunction()->name();
>                 TBasicType samplerType = (*arguments)[0]->getAsTyped()->getType().getBasicType();
>                 int coords = 0;  // textureSize(gsampler2DMS) doesn't have a second argument.
>                 if (arguments->size() > 1)
>                 {
>                     coords = (*arguments)[1]->getAsTyped()->getNominalSize();
>                 }
>-                TString textureFunctionName = mTextureFunctionHLSL->useTextureFunction(
>-                    name, samplerType, coords, arguments->size(), lod0, mShaderType);
>+                const ImmutableString &textureFunctionName =
>+                    mTextureFunctionHLSL->useTextureFunction(name, samplerType, coords,
>+                                                             arguments->size(), lod0, mShaderType);
>                 out << textureFunctionName << "(";
>             }
> 
>@@ -1965,22 +2282,24 @@ bool OutputHLSL::visitAggregate(Visit visit, TIntermAggregate *node)
>                 if (typedArg->getType().isStructureContainingSamplers())
>                 {
>                     const TType &argType = typedArg->getType();
>-                    TVector<TIntermSymbol *> samplerSymbols;
>-                    TString structName = samplerNamePrefixFromStruct(typedArg);
>-                    argType.createSamplerSymbols("angle_" + structName, "", &samplerSymbols,
>+                    TVector<const TVariable *> samplerSymbols;
>+                    ImmutableString structName = samplerNamePrefixFromStruct(typedArg);
>+                    std::string namePrefix     = "angle_";
>+                    namePrefix += structName.data();
>+                    argType.createSamplerSymbols(ImmutableString(namePrefix), "", &samplerSymbols,
>                                                  nullptr, mSymbolTable);
>-                    for (const TIntermSymbol *sampler : samplerSymbols)
>+                    for (const TVariable *sampler : samplerSymbols)
>                     {
>                         if (mOutputType == SH_HLSL_4_0_FL9_3_OUTPUT)
>                         {
>-                            out << ", texture_" << sampler->getSymbol();
>-                            out << ", sampler_" << sampler->getSymbol();
>+                            out << ", texture_" << sampler->name();
>+                            out << ", sampler_" << sampler->name();
>                         }
>                         else
>                         {
>                             // In case of HLSL 4.1+, this symbol is the sampler index, and in case
>                             // of D3D9, it's the sampler variable.
>-                            out << ", " + sampler->getSymbol();
>+                            out << ", " << sampler->name();
>                         }
>                     }
>                 }
>@@ -2060,7 +2379,7 @@ bool OutputHLSL::visitAggregate(Visit visit, TIntermAggregate *node)
>         case EOpStep:
>             outputTriplet(out, visit, "step(", ", ", ")");
>             break;
>-        case EOpSmoothStep:
>+        case EOpSmoothstep:
>             outputTriplet(out, visit, "smoothstep(", ", ", ")");
>             break;
>         case EOpFrexp:
>@@ -2103,6 +2422,87 @@ bool OutputHLSL::visitAggregate(Visit visit, TIntermAggregate *node)
>             ASSERT(node->getUseEmulatedFunction());
>             writeEmulatedFunctionTriplet(out, visit, node->getOp());
>             break;
>+        case EOpBarrier:
>+            // barrier() is translated to GroupMemoryBarrierWithGroupSync(), which is the
>+            // cheapest *WithGroupSync() function, without any functionality loss, but
>+            // with the potential for severe performance loss.
>+            outputTriplet(out, visit, "GroupMemoryBarrierWithGroupSync(", "", ")");
>+            break;
>+        case EOpMemoryBarrierShared:
>+            outputTriplet(out, visit, "GroupMemoryBarrier(", "", ")");
>+            break;
>+        case EOpMemoryBarrierAtomicCounter:
>+        case EOpMemoryBarrierBuffer:
>+        case EOpMemoryBarrierImage:
>+            outputTriplet(out, visit, "DeviceMemoryBarrier(", "", ")");
>+            break;
>+        case EOpGroupMemoryBarrier:
>+        case EOpMemoryBarrier:
>+            outputTriplet(out, visit, "AllMemoryBarrier(", "", ")");
>+            break;
>+
>+        // Single atomic function calls without return value.
>+        // e.g. atomicAdd(dest, value) should be translated into InterlockedAdd(dest, value).
>+        case EOpAtomicAdd:
>+        case EOpAtomicMin:
>+        case EOpAtomicMax:
>+        case EOpAtomicAnd:
>+        case EOpAtomicOr:
>+        case EOpAtomicXor:
>+        // The parameter 'original_value' of InterlockedExchange(dest, value, original_value)
>+        // and InterlockedCompareExchange(dest, compare_value, value, original_value) is not
>+        // optional.
>+        // https://docs.microsoft.com/en-us/windows/desktop/direct3dhlsl/interlockedexchange
>+        // https://docs.microsoft.com/en-us/windows/desktop/direct3dhlsl/interlockedcompareexchange
>+        // So all the call of atomicExchange(dest, value) and atomicCompSwap(dest,
>+        // compare_value, value) should all be modified into the form of "int temp; temp =
>+        // atomicExchange(dest, value);" and "int temp; temp = atomicCompSwap(dest,
>+        // compare_value, value);" in the intermediate tree before traversing outputHLSL.
>+        case EOpAtomicExchange:
>+        case EOpAtomicCompSwap:
>+        {
>+            ASSERT(node->getChildCount() > 1);
>+            TIntermTyped *memNode = (*node->getSequence())[0]->getAsTyped();
>+            if (IsInShaderStorageBlock(memNode))
>+            {
>+                // Atomic memory functions for SSBO.
>+                // "_ssbo_atomicXXX_TYPE(RWByteAddressBuffer buffer, uint loc" is written to |out|.
>+                mSSBOOutputHLSL->outputAtomicMemoryFunctionCallPrefix(memNode, node->getOp());
>+                // Write the rest argument list to |out|.
>+                for (size_t i = 1; i < node->getChildCount(); i++)
>+                {
>+                    out << ", ";
>+                    TIntermTyped *argument = (*node->getSequence())[i]->getAsTyped();
>+                    if (IsInShaderStorageBlock(argument))
>+                    {
>+                        mSSBOOutputHLSL->outputLoadFunctionCall(argument);
>+                    }
>+                    else
>+                    {
>+                        argument->traverse(this);
>+                    }
>+                }
>+
>+                out << ")";
>+                return false;
>+            }
>+            else
>+            {
>+                // Atomic memory functions for shared variable.
>+                if (node->getOp() != EOpAtomicExchange && node->getOp() != EOpAtomicCompSwap)
>+                {
>+                    outputTriplet(out, visit,
>+                                  GetHLSLAtomicFunctionStringAndLeftParenthesis(node->getOp()), ",",
>+                                  ")");
>+                }
>+                else
>+                {
>+                    UNREACHABLE();
>+                }
>+            }
>+
>+            break;
>+        }
>         default:
>             UNREACHABLE();
>     }
>@@ -2219,7 +2619,7 @@ bool OutputHLSL::visitCase(Visit visit, TIntermCase *node)
> void OutputHLSL::visitConstantUnion(TIntermConstantUnion *node)
> {
>     TInfoSinkBase &out = getInfoSink();
>-    writeConstantUnion(out, node->getType(), node->getUnionArrayPointer());
>+    writeConstantUnion(out, node->getType(), node->getConstantValue());
> }
> 
> bool OutputHLSL::visitLoop(Visit visit, TIntermLoop *node)
>@@ -2344,11 +2744,19 @@ bool OutputHLSL::visitBranch(Visit visit, TIntermBranch *node)
>             case EOpReturn:
>                 if (node->getExpression())
>                 {
>+                    ASSERT(!mInsideMain);
>                     out << "return ";
>                 }
>                 else
>                 {
>-                    out << "return";
>+                    if (mInsideMain && shaderNeedsGenerateOutput())
>+                    {
>+                        out << "return " << generateOutputCall();
>+                    }
>+                    else
>+                    {
>+                        out << "return";
>+                    }
>                 }
>                 break;
>             default:
>@@ -2411,7 +2819,7 @@ bool OutputHLSL::handleExcessiveLoop(TInfoSinkBase &out, TIntermLoop *node)
>     {
>         TIntermBinary *test = node->getCondition()->getAsBinaryNode();
> 
>-        if (test && test->getLeft()->getAsSymbolNode()->getId() == index->getId())
>+        if (test && test->getLeft()->getAsSymbolNode()->uniqueId() == index->uniqueId())
>         {
>             TIntermConstantUnion *constant = test->getRight()->getAsConstantUnion();
> 
>@@ -2617,21 +3025,13 @@ void OutputHLSL::outputLineDirective(TInfoSinkBase &out, int line)
>     }
> }
> 
>-TString OutputHLSL::argumentString(const TIntermSymbol *symbol)
>+void OutputHLSL::writeParameter(const TVariable *param, TInfoSinkBase &out)
> {
>-    TQualifier qualifier = symbol->getQualifier();
>-    const TType &type    = symbol->getType();
>-    const TName &name    = symbol->getName();
>-    TString nameStr;
>+    const TType &type    = param->getType();
>+    TQualifier qualifier = type.getQualifier();
> 
>-    if (name.getString().empty())  // HLSL demands named arguments, also for prototypes
>-    {
>-        nameStr = "x" + str(mUniqueIndex++);
>-    }
>-    else
>-    {
>-        nameStr = DecorateVariableIfNeeded(name);
>-    }
>+    TString nameStr = DecorateVariableIfNeeded(*param);
>+    ASSERT(nameStr != "");  // HLSL demands named arguments, also for prototypes
> 
>     if (IsSampler(type.getBasicType()))
>     {
>@@ -2639,71 +3039,78 @@ TString OutputHLSL::argumentString(const TIntermSymbol *symbol)
>         {
>             // Samplers are passed as indices to the sampler array.
>             ASSERT(qualifier != EvqOut && qualifier != EvqInOut);
>-            return "const uint " + nameStr + ArrayString(type);
>+            out << "const uint " << nameStr << ArrayString(type);
>+            return;
>         }
>         if (mOutputType == SH_HLSL_4_0_FL9_3_OUTPUT)
>         {
>-            return QualifierString(qualifier) + " " + TextureString(type.getBasicType()) +
>-                   " texture_" + nameStr + ArrayString(type) + ", " + QualifierString(qualifier) +
>-                   " " + SamplerString(type.getBasicType()) + " sampler_" + nameStr +
>-                   ArrayString(type);
>+            out << QualifierString(qualifier) << " " << TextureString(type.getBasicType())
>+                << " texture_" << nameStr << ArrayString(type) << ", " << QualifierString(qualifier)
>+                << " " << SamplerString(type.getBasicType()) << " sampler_" << nameStr
>+                << ArrayString(type);
>+            return;
>         }
>     }
> 
>-    TStringStream argString;
>-    argString << QualifierString(qualifier) << " " << TypeString(type) << " " << nameStr
>-              << ArrayString(type);
>+    // If the parameter is an atomic counter, we need to add an extra parameter to keep track of the
>+    // buffer offset.
>+    if (IsAtomicCounter(type.getBasicType()))
>+    {
>+        out << QualifierString(qualifier) << " " << TypeString(type) << " " << nameStr << ", int "
>+            << nameStr << "_offset";
>+    }
>+    else
>+    {
>+        out << QualifierString(qualifier) << " " << TypeString(type) << " " << nameStr
>+            << ArrayString(type);
>+    }
> 
>     // If the structure parameter contains samplers, they need to be passed into the function as
>     // separate parameters. HLSL doesn't natively support samplers in structs.
>     if (type.isStructureContainingSamplers())
>     {
>         ASSERT(qualifier != EvqOut && qualifier != EvqInOut);
>-        TVector<TIntermSymbol *> samplerSymbols;
>-        type.createSamplerSymbols("angle" + nameStr, "", &samplerSymbols, nullptr, mSymbolTable);
>-        for (const TIntermSymbol *sampler : samplerSymbols)
>+        TVector<const TVariable *> samplerSymbols;
>+        std::string namePrefix = "angle";
>+        namePrefix += nameStr.c_str();
>+        type.createSamplerSymbols(ImmutableString(namePrefix), "", &samplerSymbols, nullptr,
>+                                  mSymbolTable);
>+        for (const TVariable *sampler : samplerSymbols)
>         {
>             const TType &samplerType = sampler->getType();
>             if (mOutputType == SH_HLSL_4_1_OUTPUT)
>             {
>-                argString << ", const uint " << sampler->getSymbol() << ArrayString(samplerType);
>+                out << ", const uint " << sampler->name() << ArrayString(samplerType);
>             }
>             else if (mOutputType == SH_HLSL_4_0_FL9_3_OUTPUT)
>             {
>                 ASSERT(IsSampler(samplerType.getBasicType()));
>-                argString << ", " << QualifierString(qualifier) << " "
>-                          << TextureString(samplerType.getBasicType()) << " texture_"
>-                          << sampler->getSymbol() << ArrayString(samplerType) << ", "
>-                          << QualifierString(qualifier) << " "
>-                          << SamplerString(samplerType.getBasicType()) << " sampler_"
>-                          << sampler->getSymbol() << ArrayString(samplerType);
>+                out << ", " << QualifierString(qualifier) << " "
>+                    << TextureString(samplerType.getBasicType()) << " texture_" << sampler->name()
>+                    << ArrayString(samplerType) << ", " << QualifierString(qualifier) << " "
>+                    << SamplerString(samplerType.getBasicType()) << " sampler_" << sampler->name()
>+                    << ArrayString(samplerType);
>             }
>             else
>             {
>                 ASSERT(IsSampler(samplerType.getBasicType()));
>-                argString << ", " << QualifierString(qualifier) << " " << TypeString(samplerType)
>-                          << " " << sampler->getSymbol() << ArrayString(samplerType);
>+                out << ", " << QualifierString(qualifier) << " " << TypeString(samplerType) << " "
>+                    << sampler->name() << ArrayString(samplerType);
>             }
>         }
>     }
>-
>-    return argString.str();
> }
> 
>-TString OutputHLSL::initializer(const TType &type)
>+TString OutputHLSL::zeroInitializer(const TType &type) const
> {
>     TString string;
> 
>     size_t size = type.getObjectSize();
>-    for (size_t component = 0; component < size; component++)
>+    if (size >= kZeroCount)
>     {
>-        string += "0";
>-
>-        if (component + 1 < size)
>-        {
>-            string += ", ";
>-        }
>+        mUseZeroArray = true;
>     }
>+    string = GetZeroInitializer(size).c_str();
> 
>     return "{" + string + "}";
> }
>@@ -2741,6 +3148,8 @@ const TConstantUnion *OutputHLSL::writeConstantUnion(TInfoSinkBase &out,
>                                                      const TType &type,
>                                                      const TConstantUnion *const constUnion)
> {
>+    ASSERT(!type.isArray());
>+
>     const TConstantUnion *constUnionIterated = constUnion;
> 
>     const TStructure *structure = type.getStruct();
>@@ -2800,10 +3209,10 @@ bool OutputHLSL::writeSameSymbolInitializer(TInfoSinkBase &out,
>                                             TIntermSymbol *symbolNode,
>                                             TIntermTyped *expression)
> {
>-    sh::SearchSymbol searchSymbol(symbolNode->getSymbol());
>-    expression->traverse(&searchSymbol);
>+    ASSERT(symbolNode->variable().symbolType() != SymbolType::Empty);
>+    const TIntermSymbol *symbolInInitializer = FindSymbolNode(expression, symbolNode->getName());
> 
>-    if (searchSymbol.foundMatch())
>+    if (symbolInInitializer)
>     {
>         // Type already printed
>         out << "t" + str(mUniqueIndex) + " = ";
>@@ -2819,50 +3228,17 @@ bool OutputHLSL::writeSameSymbolInitializer(TInfoSinkBase &out,
>     return false;
> }
> 
>-bool OutputHLSL::canWriteAsHLSLLiteral(TIntermTyped *expression)
>-{
>-    // We support writing constant unions and constructors that only take constant unions as
>-    // parameters as HLSL literals.
>-    return !expression->getType().isArrayOfArrays() &&
>-           (expression->getAsConstantUnion() ||
>-            expression->isConstructorWithOnlyConstantUnionParameters());
>-}
>-
> bool OutputHLSL::writeConstantInitialization(TInfoSinkBase &out,
>                                              TIntermSymbol *symbolNode,
>                                              TIntermTyped *initializer)
> {
>-    if (canWriteAsHLSLLiteral(initializer))
>+    if (initializer->hasConstantValue())
>     {
>         symbolNode->traverse(this);
>-        ASSERT(!symbolNode->getType().isArrayOfArrays());
>-        if (symbolNode->getType().isArray())
>-        {
>-            out << "[" << symbolNode->getType().getOutermostArraySize() << "]";
>-        }
>+        out << ArrayString(symbolNode->getType());
>         out << " = {";
>-        if (initializer->getAsConstantUnion())
>-        {
>-            TIntermConstantUnion *nodeConst  = initializer->getAsConstantUnion();
>-            const TConstantUnion *constUnion = nodeConst->getUnionArrayPointer();
>-            writeConstantUnionArray(out, constUnion, nodeConst->getType().getObjectSize());
>-        }
>-        else
>-        {
>-            TIntermAggregate *constructor = initializer->getAsAggregate();
>-            ASSERT(constructor != nullptr);
>-            for (TIntermNode *&node : *constructor->getSequence())
>-            {
>-                TIntermConstantUnion *nodeConst = node->getAsConstantUnion();
>-                ASSERT(nodeConst);
>-                const TConstantUnion *constUnion = nodeConst->getUnionArrayPointer();
>-                writeConstantUnionArray(out, constUnion, nodeConst->getType().getObjectSize());
>-                if (node != constructor->getSequence()->back())
>-                {
>-                    out << ", ";
>-                }
>-            }
>-        }
>+        writeConstantUnionArray(out, initializer->getConstantValue(),
>+                                initializer->getType().getObjectSize());
>         out << "}";
>         return true;
>     }
>@@ -3081,4 +3457,21 @@ void OutputHLSL::ensureStructDefined(const TType &type)
>     }
> }
> 
>+bool OutputHLSL::shaderNeedsGenerateOutput() const
>+{
>+    return mShaderType == GL_VERTEX_SHADER || mShaderType == GL_FRAGMENT_SHADER;
>+}
>+
>+const char *OutputHLSL::generateOutputCall() const
>+{
>+    if (mShaderType == GL_VERTEX_SHADER)
>+    {
>+        return "generateOutput(input)";
>+    }
>+    else
>+    {
>+        return "generateOutput()";
>+    }
>+}
>+
> }  // namespace sh
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/OutputHLSL.h b/Source/ThirdParty/ANGLE/src/compiler/translator/OutputHLSL.h
>index 014f4f5002f..f43e157575a 100644
>--- a/Source/ThirdParty/ANGLE/src/compiler/translator/OutputHLSL.h
>+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/OutputHLSL.h
>@@ -15,20 +15,24 @@
> #include "compiler/translator/ASTMetadataHLSL.h"
> #include "compiler/translator/Compiler.h"
> #include "compiler/translator/FlagStd140Structs.h"
>-#include "compiler/translator/IntermTraverse.h"
>+#include "compiler/translator/ImmutableString.h"
>+#include "compiler/translator/ShaderStorageBlockOutputHLSL.h"
>+#include "compiler/translator/tree_util/IntermTraverse.h"
> 
> class BuiltInFunctionEmulator;
> 
> namespace sh
> {
>+class AtomicCounterFunctionHLSL;
>+class ImageFunctionHLSL;
>+class ResourcesHLSL;
> class StructureHLSL;
> class TextureFunctionHLSL;
> class TSymbolTable;
>-class ImageFunctionHLSL;
>+class TVariable;
> class UnfoldShortCircuit;
>-class UniformHLSL;
> 
>-typedef std::map<TString, TIntermSymbol *> ReferencedSymbols;
>+using ReferencedVariables = std::map<int, const TVariable *>;
> 
> class OutputHLSL : public TIntermTraverser
> {
>@@ -41,17 +45,21 @@ class OutputHLSL : public TIntermTraverser
>                int numRenderTargets,
>                const std::vector<Uniform> &uniforms,
>                ShCompileOptions compileOptions,
>+               sh::WorkGroupSize workGroupSize,
>                TSymbolTable *symbolTable,
>-               PerformanceDiagnostics *perfDiagnostics);
>+               PerformanceDiagnostics *perfDiagnostics,
>+               const std::vector<InterfaceBlock> &shaderStorageBlocks);
> 
>     ~OutputHLSL();
> 
>     void output(TIntermNode *treeRoot, TInfoSinkBase &objSink);
> 
>+    const std::map<std::string, unsigned int> &getShaderStorageBlockRegisterMap() const;
>     const std::map<std::string, unsigned int> &getUniformBlockRegisterMap() const;
>     const std::map<std::string, unsigned int> &getUniformRegisterMap() const;
>-
>-    static TString initializer(const TType &type);
>+    unsigned int getReadonlyImage2DRegisterIndex() const;
>+    unsigned int getImage2DRegisterIndex() const;
>+    const std::set<std::string> &getUsedImage2DFunctionNames() const;
> 
>     TInfoSinkBase &getInfoSink()
>     {
>@@ -59,9 +67,13 @@ class OutputHLSL : public TIntermTraverser
>         return *mInfoSinkStack.top();
>     }
> 
>-    static bool canWriteAsHLSLLiteral(TIntermTyped *expression);
>-
>   protected:
>+    friend class ShaderStorageBlockOutputHLSL;
>+
>+    TString zeroInitializer(const TType &type) const;
>+
>+    void writeReferencedAttributes(TInfoSinkBase &out) const;
>+    void writeReferencedVaryings(TInfoSinkBase &out) const;
>     void header(TInfoSinkBase &out,
>                 const std::vector<MappedStruct> &std140Structs,
>                 const BuiltInFunctionEmulator *builtInFunctionEmulator) const;
>@@ -74,7 +86,6 @@ class OutputHLSL : public TIntermTraverser
> 
>     // Visit AST nodes and output their code to the body stream
>     void visitSymbol(TIntermSymbol *) override;
>-    void visitRaw(TIntermRaw *) override;
>     void visitConstantUnion(TIntermConstantUnion *) override;
>     bool visitSwizzle(Visit visit, TIntermSwizzle *node) override;
>     bool visitBinary(Visit visit, TIntermBinary *) override;
>@@ -83,7 +94,7 @@ class OutputHLSL : public TIntermTraverser
>     bool visitIfElse(Visit visit, TIntermIfElse *) override;
>     bool visitSwitch(Visit visit, TIntermSwitch *) override;
>     bool visitCase(Visit visit, TIntermCase *) override;
>-    bool visitFunctionPrototype(Visit visit, TIntermFunctionPrototype *node) override;
>+    void visitFunctionPrototype(TIntermFunctionPrototype *node) override;
>     bool visitFunctionDefinition(Visit visit, TIntermFunctionDefinition *node) override;
>     bool visitAggregate(Visit visit, TIntermAggregate *) override;
>     bool visitBlock(Visit visit, TIntermBlock *node) override;
>@@ -102,7 +113,7 @@ class OutputHLSL : public TIntermTraverser
>                        const char *inString,
>                        const char *postString);
>     void outputLineDirective(TInfoSinkBase &out, int line);
>-    TString argumentString(const TIntermSymbol *symbol);
>+    void writeParameter(const TVariable *param, TInfoSinkBase &out);
> 
>     void outputConstructor(TInfoSinkBase &out, Visit visit, TIntermAggregate *node);
>     const TConstantUnion *writeConstantUnion(TInfoSinkBase &out,
>@@ -135,6 +146,9 @@ class OutputHLSL : public TIntermTraverser
>     // Ensures if the type is a struct, the struct is defined
>     void ensureStructDefined(const TType &type);
> 
>+    bool shaderNeedsGenerateOutput() const;
>+    const char *generateOutputCall() const;
>+
>     sh::GLenum mShaderType;
>     int mShaderVersion;
>     const TExtensionBehavior &mExtensionBehavior;
>@@ -143,6 +157,7 @@ class OutputHLSL : public TIntermTraverser
>     ShCompileOptions mCompileOptions;
> 
>     bool mInsideFunction;
>+    bool mInsideMain;
> 
>     // Output streams
>     TInfoSinkBase mHeader;
>@@ -154,16 +169,20 @@ class OutputHLSL : public TIntermTraverser
>     // TODO (jmadill): Just passing an InfoSink in function parameters would be simpler.
>     std::stack<TInfoSinkBase *> mInfoSinkStack;
> 
>-    ReferencedSymbols mReferencedUniforms;
>-    ReferencedSymbols mReferencedUniformBlocks;
>-    ReferencedSymbols mReferencedAttributes;
>-    ReferencedSymbols mReferencedVaryings;
>-    ReferencedSymbols mReferencedOutputVariables;
>+    ReferencedVariables mReferencedUniforms;
>+
>+    // Indexed by block id, not instance id.
>+    ReferencedInterfaceBlocks mReferencedUniformBlocks;
>+
>+    ReferencedVariables mReferencedAttributes;
>+    ReferencedVariables mReferencedVaryings;
>+    ReferencedVariables mReferencedOutputVariables;
> 
>     StructureHLSL *mStructureHLSL;
>-    UniformHLSL *mUniformHLSL;
>+    ResourcesHLSL *mResourcesHLSL;
>     TextureFunctionHLSL *mTextureFunctionHLSL;
>     ImageFunctionHLSL *mImageFunctionHLSL;
>+    AtomicCounterFunctionHLSL *mAtomicCounterFunctionHLSL;
> 
>     // Parameters determining what goes in the header output
>     bool mUsesFragColor;
>@@ -187,6 +206,7 @@ class OutputHLSL : public TIntermTraverser
>     bool mUsesDiscardRewriting;
>     bool mUsesNestedBreak;
>     bool mRequiresIEEEStrictCompiling;
>+    mutable bool mUseZeroArray;
> 
>     int mNumRenderTargets;
> 
>@@ -236,13 +256,16 @@ class OutputHLSL : public TIntermTraverser
>     // arrays can't be return values in HLSL.
>     std::vector<ArrayHelperFunction> mArrayConstructIntoFunctions;
> 
>+    sh::WorkGroupSize mWorkGroupSize;
>+
>     PerformanceDiagnostics *mPerfDiagnostics;
> 
>   private:
>     TString generateStructMapping(const std::vector<MappedStruct> &std140Structs) const;
>-    TString samplerNamePrefixFromStruct(TIntermTyped *node);
>+    ImmutableString samplerNamePrefixFromStruct(TIntermTyped *node);
>     bool ancestorEvaluatesToSamplerInStruct();
>+    ShaderStorageBlockOutputHLSL *mSSBOOutputHLSL;
> };
>-}
>+}  // namespace sh
> 
> #endif  // COMPILER_TRANSLATOR_OUTPUTHLSL_H_
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/OutputTree.cpp b/Source/ThirdParty/ANGLE/src/compiler/translator/OutputTree.cpp
>index 25e8298af32..6de64a660a6 100644
>--- a/Source/ThirdParty/ANGLE/src/compiler/translator/OutputTree.cpp
>+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/OutputTree.cpp
>@@ -4,8 +4,8 @@
> // found in the LICENSE file.
> //
> 
>-#include "compiler/translator/IntermTraverse.h"
> #include "compiler/translator/SymbolTable.h"
>+#include "compiler/translator/tree_util/IntermTraverse.h"
> 
> namespace sh
> {
>@@ -13,11 +13,12 @@ namespace sh
> namespace
> {
> 
>-void OutputFunction(TInfoSinkBase &out, const char *str, TFunctionSymbolInfo *info)
>+void OutputFunction(TInfoSinkBase &out, const char *str, const TFunction *func)
> {
>-    const char *internal = info->getNameObj().isInternal() ? " (internal function)" : "";
>-    out << str << internal << ": " << info->getNameObj().getString() << " (symbol id "
>-        << info->getId().get() << ")";
>+    const char *internal =
>+        (func->symbolType() == SymbolType::AngleInternal) ? " (internal function)" : "";
>+    out << str << internal << ": " << func->name() << " (symbol id " << func->uniqueId().get()
>+        << ")";
> }
> 
> // Two purposes:
>@@ -30,7 +31,9 @@ void OutputFunction(TInfoSinkBase &out, const char *str, TFunctionSymbolInfo *in
> class TOutputTraverser : public TIntermTraverser
> {
>   public:
>-    TOutputTraverser(TInfoSinkBase &out) : TIntermTraverser(true, false, false), mOut(out) {}
>+    TOutputTraverser(TInfoSinkBase &out)
>+        : TIntermTraverser(true, false, false), mOut(out), mIndentDepth(0)
>+    {}
> 
>   protected:
>     void visitSymbol(TIntermSymbol *) override;
>@@ -42,7 +45,7 @@ class TOutputTraverser : public TIntermTraverser
>     bool visitIfElse(Visit visit, TIntermIfElse *node) override;
>     bool visitSwitch(Visit visit, TIntermSwitch *node) override;
>     bool visitCase(Visit visit, TIntermCase *node) override;
>-    bool visitFunctionPrototype(Visit visit, TIntermFunctionPrototype *node) override;
>+    void visitFunctionPrototype(TIntermFunctionPrototype *node) override;
>     bool visitFunctionDefinition(Visit visit, TIntermFunctionDefinition *node) override;
>     bool visitAggregate(Visit visit, TIntermAggregate *) override;
>     bool visitBlock(Visit visit, TIntermBlock *) override;
>@@ -51,7 +54,10 @@ class TOutputTraverser : public TIntermTraverser
>     bool visitLoop(Visit visit, TIntermLoop *) override;
>     bool visitBranch(Visit visit, TIntermBranch *) override;
> 
>+    int getCurrentIndentDepth() const { return mIndentDepth + getCurrentTraversalDepth(); }
>+
>     TInfoSinkBase &mOut;
>+    int mIndentDepth;
> };
> 
> //
>@@ -78,29 +84,36 @@ void OutputTreeText(TInfoSinkBase &out, TIntermNode *node, const int depth)
> 
> void TOutputTraverser::visitSymbol(TIntermSymbol *node)
> {
>-    OutputTreeText(mOut, node, mDepth);
>+    OutputTreeText(mOut, node, getCurrentIndentDepth());
> 
>-    mOut << "'" << node->getSymbol() << "' ";
>-    mOut << "(symbol id " << node->getId() << ") ";
>-    mOut << "(" << node->getCompleteString() << ")";
>+    if (node->variable().symbolType() == SymbolType::Empty)
>+    {
>+        mOut << "''";
>+    }
>+    else
>+    {
>+        mOut << "'" << node->getName() << "' ";
>+    }
>+    mOut << "(symbol id " << node->uniqueId().get() << ") ";
>+    mOut << "(" << node->getType() << ")";
>     mOut << "\n";
> }
> 
> bool TOutputTraverser::visitSwizzle(Visit visit, TIntermSwizzle *node)
> {
>-    OutputTreeText(mOut, node, mDepth);
>+    OutputTreeText(mOut, node, getCurrentIndentDepth());
>     mOut << "vector swizzle (";
>     node->writeOffsetsAsXYZW(&mOut);
>     mOut << ")";
> 
>-    mOut << " (" << node->getCompleteString() << ")";
>+    mOut << " (" << node->getType() << ")";
>     mOut << "\n";
>     return true;
> }
> 
> bool TOutputTraverser::visitBinary(Visit visit, TIntermBinary *node)
> {
>-    OutputTreeText(mOut, node, mDepth);
>+    OutputTreeText(mOut, node, getCurrentIndentDepth());
> 
>     switch (node->getOp())
>     {
>@@ -248,7 +261,7 @@ bool TOutputTraverser::visitBinary(Visit visit, TIntermBinary *node)
>             mOut << "<unknown op>";
>     }
> 
>-    mOut << " (" << node->getCompleteString() << ")";
>+    mOut << " (" << node->getType() << ")";
> 
>     mOut << "\n";
> 
>@@ -262,10 +275,10 @@ bool TOutputTraverser::visitBinary(Visit visit, TIntermBinary *node)
>         TIntermConstantUnion *intermConstantUnion = node->getRight()->getAsConstantUnion();
>         ASSERT(intermConstantUnion);
> 
>-        OutputTreeText(mOut, intermConstantUnion, mDepth + 1);
>+        OutputTreeText(mOut, intermConstantUnion, getCurrentIndentDepth() + 1);
> 
>         // The following code finds the field name from the constant union
>-        const TConstantUnion *constantUnion   = intermConstantUnion->getUnionArrayPointer();
>+        const TConstantUnion *constantUnion   = intermConstantUnion->getConstantValue();
>         const TStructure *structure           = node->getLeft()->getType().getStruct();
>         const TInterfaceBlock *interfaceBlock = node->getLeft()->getType().getInterfaceBlock();
>         ASSERT(structure || interfaceBlock);
>@@ -286,7 +299,7 @@ bool TOutputTraverser::visitBinary(Visit visit, TIntermBinary *node)
> 
> bool TOutputTraverser::visitUnary(Visit visit, TIntermUnary *node)
> {
>-    OutputTreeText(mOut, node, mDepth);
>+    OutputTreeText(mOut, node, getCurrentIndentDepth());
> 
>     switch (node->getOp())
>     {
>@@ -331,7 +344,7 @@ bool TOutputTraverser::visitUnary(Visit visit, TIntermUnary *node)
>             break;
>     }
> 
>-    mOut << " (" << node->getCompleteString() << ")";
>+    mOut << " (" << node->getType() << ")";
> 
>     mOut << "\n";
> 
>@@ -340,32 +353,36 @@ bool TOutputTraverser::visitUnary(Visit visit, TIntermUnary *node)
> 
> bool TOutputTraverser::visitFunctionDefinition(Visit visit, TIntermFunctionDefinition *node)
> {
>-    OutputTreeText(mOut, node, mDepth);
>+    OutputTreeText(mOut, node, getCurrentIndentDepth());
>     mOut << "Function Definition:\n";
>-    mOut << "\n";
>     return true;
> }
> 
> bool TOutputTraverser::visitInvariantDeclaration(Visit visit, TIntermInvariantDeclaration *node)
> {
>-    OutputTreeText(mOut, node, mDepth);
>+    OutputTreeText(mOut, node, getCurrentIndentDepth());
>     mOut << "Invariant Declaration:\n";
>     return true;
> }
> 
>-bool TOutputTraverser::visitFunctionPrototype(Visit visit, TIntermFunctionPrototype *node)
>+void TOutputTraverser::visitFunctionPrototype(TIntermFunctionPrototype *node)
> {
>-    OutputTreeText(mOut, node, mDepth);
>-    OutputFunction(mOut, "Function Prototype", node->getFunctionSymbolInfo());
>-    mOut << " (" << node->getCompleteString() << ")";
>+    OutputTreeText(mOut, node, getCurrentIndentDepth());
>+    OutputFunction(mOut, "Function Prototype", node->getFunction());
>+    mOut << " (" << node->getType() << ")";
>     mOut << "\n";
>-
>-    return true;
>+    size_t paramCount = node->getFunction()->getParamCount();
>+    for (size_t i = 0; i < paramCount; ++i)
>+    {
>+        const TVariable *param = node->getFunction()->getParam(i);
>+        OutputTreeText(mOut, node, getCurrentIndentDepth() + 1);
>+        mOut << "parameter: " << param->name() << " (" << param->getType() << ")";
>+    }
> }
> 
> bool TOutputTraverser::visitAggregate(Visit visit, TIntermAggregate *node)
> {
>-    OutputTreeText(mOut, node, mDepth);
>+    OutputTreeText(mOut, node, getCurrentIndentDepth());
> 
>     if (node->getOp() == EOpNull)
>     {
>@@ -379,14 +396,14 @@ bool TOutputTraverser::visitAggregate(Visit visit, TIntermAggregate *node)
>     switch (node->getOp())
>     {
>         case EOpCallFunctionInAST:
>-            OutputFunction(mOut, "Call an user-defined function", node->getFunctionSymbolInfo());
>+            OutputFunction(mOut, "Call an user-defined function", node->getFunction());
>             break;
>         case EOpCallInternalRawFunction:
>             OutputFunction(mOut, "Call an internal function with raw implementation",
>-                           node->getFunctionSymbolInfo());
>+                           node->getFunction());
>             break;
>         case EOpCallBuiltInFunction:
>-            OutputFunction(mOut, "Call a built-in function", node->getFunctionSymbolInfo());
>+            OutputFunction(mOut, "Call a built-in function", node->getFunction());
>             break;
> 
>         case EOpConstruct:
>@@ -428,7 +445,7 @@ bool TOutputTraverser::visitAggregate(Visit visit, TIntermAggregate *node)
>             break;
>     }
> 
>-    mOut << " (" << node->getCompleteString() << ")";
>+    mOut << " (" << node->getType() << ")";
> 
>     mOut << "\n";
> 
>@@ -437,7 +454,7 @@ bool TOutputTraverser::visitAggregate(Visit visit, TIntermAggregate *node)
> 
> bool TOutputTraverser::visitBlock(Visit visit, TIntermBlock *node)
> {
>-    OutputTreeText(mOut, node, mDepth);
>+    OutputTreeText(mOut, node, getCurrentIndentDepth());
>     mOut << "Code block\n";
> 
>     return true;
>@@ -445,7 +462,7 @@ bool TOutputTraverser::visitBlock(Visit visit, TIntermBlock *node)
> 
> bool TOutputTraverser::visitDeclaration(Visit visit, TIntermDeclaration *node)
> {
>-    OutputTreeText(mOut, node, mDepth);
>+    OutputTreeText(mOut, node, getCurrentIndentDepth());
>     mOut << "Declaration\n";
> 
>     return true;
>@@ -453,18 +470,18 @@ bool TOutputTraverser::visitDeclaration(Visit visit, TIntermDeclaration *node)
> 
> bool TOutputTraverser::visitTernary(Visit visit, TIntermTernary *node)
> {
>-    OutputTreeText(mOut, node, mDepth);
>+    OutputTreeText(mOut, node, getCurrentIndentDepth());
> 
>     mOut << "Ternary selection";
>-    mOut << " (" << node->getCompleteString() << ")\n";
>+    mOut << " (" << node->getType() << ")\n";
> 
>-    ++mDepth;
>+    ++mIndentDepth;
> 
>-    OutputTreeText(mOut, node, mDepth);
>+    OutputTreeText(mOut, node, getCurrentIndentDepth());
>     mOut << "Condition\n";
>     node->getCondition()->traverse(this);
> 
>-    OutputTreeText(mOut, node, mDepth);
>+    OutputTreeText(mOut, node, getCurrentIndentDepth());
>     if (node->getTrueExpression())
>     {
>         mOut << "true case\n";
>@@ -472,29 +489,29 @@ bool TOutputTraverser::visitTernary(Visit visit, TIntermTernary *node)
>     }
>     if (node->getFalseExpression())
>     {
>-        OutputTreeText(mOut, node, mDepth);
>+        OutputTreeText(mOut, node, getCurrentIndentDepth());
>         mOut << "false case\n";
>         node->getFalseExpression()->traverse(this);
>     }
> 
>-    --mDepth;
>+    --mIndentDepth;
> 
>     return false;
> }
> 
> bool TOutputTraverser::visitIfElse(Visit visit, TIntermIfElse *node)
> {
>-    OutputTreeText(mOut, node, mDepth);
>+    OutputTreeText(mOut, node, getCurrentIndentDepth());
> 
>     mOut << "If test\n";
> 
>-    ++mDepth;
>+    ++mIndentDepth;
> 
>-    OutputTreeText(mOut, node, mDepth);
>+    OutputTreeText(mOut, node, getCurrentIndentDepth());
>     mOut << "Condition\n";
>     node->getCondition()->traverse(this);
> 
>-    OutputTreeText(mOut, node, mDepth);
>+    OutputTreeText(mOut, node, getCurrentIndentDepth());
>     if (node->getTrueBlock())
>     {
>         mOut << "true case\n";
>@@ -507,19 +524,19 @@ bool TOutputTraverser::visitIfElse(Visit visit, TIntermIfElse *node)
> 
>     if (node->getFalseBlock())
>     {
>-        OutputTreeText(mOut, node, mDepth);
>+        OutputTreeText(mOut, node, getCurrentIndentDepth());
>         mOut << "false case\n";
>         node->getFalseBlock()->traverse(this);
>     }
> 
>-    --mDepth;
>+    --mIndentDepth;
> 
>     return false;
> }
> 
> bool TOutputTraverser::visitSwitch(Visit visit, TIntermSwitch *node)
> {
>-    OutputTreeText(mOut, node, mDepth);
>+    OutputTreeText(mOut, node, getCurrentIndentDepth());
> 
>     mOut << "Switch\n";
> 
>@@ -528,7 +545,7 @@ bool TOutputTraverser::visitSwitch(Visit visit, TIntermSwitch *node)
> 
> bool TOutputTraverser::visitCase(Visit visit, TIntermCase *node)
> {
>-    OutputTreeText(mOut, node, mDepth);
>+    OutputTreeText(mOut, node, getCurrentIndentDepth());
> 
>     if (node->getCondition() == nullptr)
>     {
>@@ -548,11 +565,11 @@ void TOutputTraverser::visitConstantUnion(TIntermConstantUnion *node)
> 
>     for (size_t i = 0; i < size; i++)
>     {
>-        OutputTreeText(mOut, node, mDepth);
>-        switch (node->getUnionArrayPointer()[i].getType())
>+        OutputTreeText(mOut, node, getCurrentIndentDepth());
>+        switch (node->getConstantValue()[i].getType())
>         {
>             case EbtBool:
>-                if (node->getUnionArrayPointer()[i].getBConst())
>+                if (node->getConstantValue()[i].getBConst())
>                     mOut << "true";
>                 else
>                     mOut << "false";
>@@ -563,20 +580,20 @@ void TOutputTraverser::visitConstantUnion(TIntermConstantUnion *node)
>                 mOut << "\n";
>                 break;
>             case EbtFloat:
>-                mOut << node->getUnionArrayPointer()[i].getFConst();
>+                mOut << node->getConstantValue()[i].getFConst();
>                 mOut << " (const float)\n";
>                 break;
>             case EbtInt:
>-                mOut << node->getUnionArrayPointer()[i].getIConst();
>+                mOut << node->getConstantValue()[i].getIConst();
>                 mOut << " (const int)\n";
>                 break;
>             case EbtUInt:
>-                mOut << node->getUnionArrayPointer()[i].getUConst();
>+                mOut << node->getConstantValue()[i].getUConst();
>                 mOut << " (const uint)\n";
>                 break;
>             case EbtYuvCscStandardEXT:
>                 mOut << getYuvCscStandardEXTString(
>-                    node->getUnionArrayPointer()[i].getYuvCscStandardEXTConst());
>+                    node->getConstantValue()[i].getYuvCscStandardEXTConst());
>                 mOut << " (const yuvCscStandardEXT)\n";
>                 break;
>             default:
>@@ -589,16 +606,16 @@ void TOutputTraverser::visitConstantUnion(TIntermConstantUnion *node)
> 
> bool TOutputTraverser::visitLoop(Visit visit, TIntermLoop *node)
> {
>-    OutputTreeText(mOut, node, mDepth);
>+    OutputTreeText(mOut, node, getCurrentIndentDepth());
> 
>     mOut << "Loop with condition ";
>     if (node->getType() == ELoopDoWhile)
>         mOut << "not ";
>     mOut << "tested first\n";
> 
>-    ++mDepth;
>+    ++mIndentDepth;
> 
>-    OutputTreeText(mOut, node, mDepth);
>+    OutputTreeText(mOut, node, getCurrentIndentDepth());
>     if (node->getCondition())
>     {
>         mOut << "Loop Condition\n";
>@@ -609,7 +626,7 @@ bool TOutputTraverser::visitLoop(Visit visit, TIntermLoop *node)
>         mOut << "No loop condition\n";
>     }
> 
>-    OutputTreeText(mOut, node, mDepth);
>+    OutputTreeText(mOut, node, getCurrentIndentDepth());
>     if (node->getBody())
>     {
>         mOut << "Loop Body\n";
>@@ -622,19 +639,19 @@ bool TOutputTraverser::visitLoop(Visit visit, TIntermLoop *node)
> 
>     if (node->getExpression())
>     {
>-        OutputTreeText(mOut, node, mDepth);
>+        OutputTreeText(mOut, node, getCurrentIndentDepth());
>         mOut << "Loop Terminal Expression\n";
>         node->getExpression()->traverse(this);
>     }
> 
>-    --mDepth;
>+    --mIndentDepth;
> 
>     return false;
> }
> 
> bool TOutputTraverser::visitBranch(Visit visit, TIntermBranch *node)
> {
>-    OutputTreeText(mOut, node, mDepth);
>+    OutputTreeText(mOut, node, getCurrentIndentDepth());
> 
>     switch (node->getFlowOp())
>     {
>@@ -658,9 +675,9 @@ bool TOutputTraverser::visitBranch(Visit visit, TIntermBranch *node)
>     if (node->getExpression())
>     {
>         mOut << " with expression\n";
>-        ++mDepth;
>+        ++mIndentDepth;
>         node->getExpression()->traverse(this);
>-        --mDepth;
>+        --mIndentDepth;
>     }
>     else
>     {
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/OutputVulkanGLSL.cpp b/Source/ThirdParty/ANGLE/src/compiler/translator/OutputVulkanGLSL.cpp
>index 6d11deb8988..d7b9fbb2364 100644
>--- a/Source/ThirdParty/ANGLE/src/compiler/translator/OutputVulkanGLSL.cpp
>+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/OutputVulkanGLSL.cpp
>@@ -11,6 +11,8 @@
> 
> #include "compiler/translator/OutputVulkanGLSL.h"
> 
>+#include "compiler/translator/BaseTypes.h"
>+#include "compiler/translator/Symbol.h"
> #include "compiler/translator/util.h"
> 
> namespace sh
>@@ -34,8 +36,7 @@ TOutputVulkanGLSL::TOutputVulkanGLSL(TInfoSinkBase &objSink,
>                   shaderVersion,
>                   output,
>                   compileOptions)
>-{
>-}
>+{}
> 
> // TODO(jmadill): This is not complete.
> void TOutputVulkanGLSL::writeLayoutQualifier(TIntermTyped *variable)
>@@ -45,7 +46,7 @@ void TOutputVulkanGLSL::writeLayoutQualifier(TIntermTyped *variable)
>     bool needsCustomLayout =
>         (type.getQualifier() == EvqAttribute || type.getQualifier() == EvqFragmentOut ||
>          type.getQualifier() == EvqVertexIn || IsVarying(type.getQualifier()) ||
>-         IsSampler(type.getBasicType()));
>+         IsSampler(type.getBasicType()) || type.isInterfaceBlock());
> 
>     if (!NeedsToWriteLayoutQualifier(type) && !needsCustomLayout)
>     {
>@@ -54,18 +55,19 @@ void TOutputVulkanGLSL::writeLayoutQualifier(TIntermTyped *variable)
> 
>     TInfoSinkBase &out                      = objSink();
>     const TLayoutQualifier &layoutQualifier = type.getLayoutQualifier();
>-    out << "layout(";
> 
>     // This isn't super clean, but it gets the job done.
>     // See corresponding code in GlslangWrapper.cpp.
>-    // TODO(jmadill): Ensure declarations are separated.
>-
>     TIntermSymbol *symbol = variable->getAsSymbolNode();
>     ASSERT(symbol);
> 
>     if (needsCustomLayout)
>     {
>-        out << "@@ LAYOUT-" << symbol->getName().getString() << " @@";
>+        out << "@@ LAYOUT-" << symbol->getName() << " @@";
>+    }
>+    else
>+    {
>+        out << "layout(";
>     }
> 
>     if (IsImage(type.getBasicType()) && layoutQualifier.imageInternalFormat != EiifUnspecified)
>@@ -74,7 +76,49 @@ void TOutputVulkanGLSL::writeLayoutQualifier(TIntermTyped *variable)
>         out << getImageInternalFormatString(layoutQualifier.imageInternalFormat);
>     }
> 
>-    out << ") ";
>+    if (!needsCustomLayout)
>+    {
>+        out << ") ";
>+    }
> }
> 
>+void TOutputVulkanGLSL::writeQualifier(TQualifier qualifier, const TSymbol *symbol)
>+{
>+    if (qualifier != EvqUniform && qualifier != EvqVaryingIn && qualifier != EvqVaryingOut &&
>+        qualifier != EvqAttribute)
>+    {
>+        TOutputGLSLBase::writeQualifier(qualifier, symbol);
>+        return;
>+    }
>+
>+    if (symbol == nullptr)
>+    {
>+        return;
>+    }
>+
>+    TInfoSinkBase &out = objSink();
>+    out << "@@ QUALIFIER-" << symbol->name().data() << " @@ ";
>+}
>+
>+void TOutputVulkanGLSL::writeVariableType(const TType &type, const TSymbol *symbol)
>+{
>+    TType overrideType(type);
>+
>+    // External textures are treated as 2D textures in the vulkan back-end
>+    if (type.getBasicType() == EbtSamplerExternalOES)
>+    {
>+        overrideType.setBasicType(EbtSampler2D);
>+    }
>+
>+    TOutputGLSL::writeVariableType(overrideType, symbol);
>+}
>+
>+void TOutputVulkanGLSL::writeStructType(const TStructure *structure)
>+{
>+    if (!structDeclared(structure))
>+    {
>+        declareStruct(structure);
>+        objSink() << ";\n";
>+    }
>+}
> }  // namespace sh
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/OutputVulkanGLSL.h b/Source/ThirdParty/ANGLE/src/compiler/translator/OutputVulkanGLSL.h
>index 6e5da8b53eb..ef49c97abea 100644
>--- a/Source/ThirdParty/ANGLE/src/compiler/translator/OutputVulkanGLSL.h
>+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/OutputVulkanGLSL.h
>@@ -27,8 +27,12 @@ class TOutputVulkanGLSL : public TOutputGLSL
>                       ShShaderOutput output,
>                       ShCompileOptions compileOptions);
> 
>+    void writeStructType(const TStructure *structure);
>+
>   protected:
>     void writeLayoutQualifier(TIntermTyped *variable) override;
>+    void writeQualifier(TQualifier qualifier, const TSymbol *symbol) override;
>+    void writeVariableType(const TType &type, const TSymbol *symbol) override;
> };
> 
> }  // namespace sh
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/ParamType.h b/Source/ThirdParty/ANGLE/src/compiler/translator/ParamType.h
>deleted file mode 100644
>index dddb4e9901f..00000000000
>--- a/Source/ThirdParty/ANGLE/src/compiler/translator/ParamType.h
>+++ /dev/null
>@@ -1,102 +0,0 @@
>-//
>-// Copyright 2017 The ANGLE Project Authors. All rights reserved.
>-// Use of this source code is governed by a BSD-style license that can be
>-// found in the LICENSE file.
>-//
>-// ParamType:
>-//   Helper type for built-in function emulator tables. Defines types for parameters.
>-
>-#ifndef COMPILER_TRANSLATOR_PARAMTYPE_H_
>-#define COMPILER_TRANSLATOR_PARAMTYPE_H_
>-
>-#include "common/angleutils.h"
>-#include "compiler/translator/BaseTypes.h"
>-
>-namespace sh
>-{
>-
>-enum class ParamType : uint8_t
>-{
>-    Void,
>-    Bool1,
>-    Bool2,
>-    Bool3,
>-    Bool4,
>-    Float1,
>-    Float2,
>-    Float3,
>-    Float4,
>-    Int1,
>-    Int2,
>-    Int3,
>-    Int4,
>-    Mat2,
>-    Mat3,
>-    Mat4,
>-    Uint1,
>-    Uint2,
>-    Uint3,
>-    Uint4,
>-    Last,
>-};
>-
>-struct ParamTypeInfo
>-{
>-    ParamType self;
>-    TBasicType basicType;
>-    int primarySize;
>-    int secondarySize;
>-};
>-
>-constexpr ParamTypeInfo g_ParamTypeInfo[] = {
>-    {ParamType::Void, EbtVoid, 1, 1},    {ParamType::Bool1, EbtBool, 1, 1},
>-    {ParamType::Bool2, EbtBool, 2, 1},   {ParamType::Bool3, EbtBool, 3, 1},
>-    {ParamType::Bool4, EbtBool, 4, 1},   {ParamType::Float1, EbtFloat, 1, 1},
>-    {ParamType::Float2, EbtFloat, 2, 1}, {ParamType::Float3, EbtFloat, 3, 1},
>-    {ParamType::Float4, EbtFloat, 4, 1}, {ParamType::Int1, EbtInt, 1, 1},
>-    {ParamType::Int2, EbtInt, 2, 1},     {ParamType::Int3, EbtInt, 3, 1},
>-    {ParamType::Int4, EbtInt, 4, 1},     {ParamType::Mat2, EbtFloat, 2, 2},
>-    {ParamType::Mat3, EbtFloat, 3, 3},   {ParamType::Mat4, EbtFloat, 4, 4},
>-    {ParamType::Uint1, EbtUInt, 1, 1},   {ParamType::Uint2, EbtUInt, 2, 1},
>-    {ParamType::Uint3, EbtUInt, 3, 1},   {ParamType::Uint4, EbtUInt, 4, 1},
>-};
>-
>-constexpr size_t ParamTypeIndex(ParamType paramType)
>-{
>-    return static_cast<size_t>(paramType);
>-}
>-
>-constexpr size_t NumParamTypes()
>-{
>-    return ParamTypeIndex(ParamType::Last);
>-}
>-
>-static_assert(ArraySize(g_ParamTypeInfo) == NumParamTypes(), "Invalid array size");
>-
>-constexpr TBasicType GetBasicType(ParamType paramType)
>-{
>-    return g_ParamTypeInfo[ParamTypeIndex(paramType)].basicType;
>-}
>-
>-constexpr int GetPrimarySize(ParamType paramType)
>-{
>-    return g_ParamTypeInfo[ParamTypeIndex(paramType)].primarySize;
>-}
>-
>-constexpr int GetSecondarySize(ParamType paramType)
>-{
>-    return g_ParamTypeInfo[ParamTypeIndex(paramType)].secondarySize;
>-}
>-
>-constexpr bool SameParamType(ParamType paramType,
>-                             TBasicType basicType,
>-                             int primarySize,
>-                             int secondarySize)
>-{
>-    return GetBasicType(paramType) == basicType && primarySize == GetPrimarySize(paramType) &&
>-           secondarySize == GetSecondarySize(paramType);
>-}
>-
>-}  // namespace sh
>-
>-#endif  // COMPILER_TRANSLATOR_PARAMTYPE_H_
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/ParseContext.cpp b/Source/ThirdParty/ANGLE/src/compiler/translator/ParseContext.cpp
>index d0a4f6aeb28..17f241f1af9 100644
>--- a/Source/ThirdParty/ANGLE/src/compiler/translator/ParseContext.cpp
>+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/ParseContext.cpp
>@@ -11,11 +11,13 @@
> 
> #include "common/mathutil.h"
> #include "compiler/preprocessor/SourceLocation.h"
>-#include "compiler/translator/Cache.h"
>-#include "compiler/translator/IntermNode_util.h"
>+#include "compiler/translator/Declarator.h"
>+#include "compiler/translator/ParseContext_autogen.h"
>+#include "compiler/translator/StaticType.h"
> #include "compiler/translator/ValidateGlobalInitializer.h"
> #include "compiler/translator/ValidateSwitch.h"
> #include "compiler/translator/glslang.h"
>+#include "compiler/translator/tree_util/IntermNode_util.h"
> #include "compiler/translator/util.h"
> 
> namespace sh
>@@ -32,22 +34,6 @@ namespace
> 
> const int kWebGLMaxStructNesting = 4;
> 
>-const std::array<const char *, 8> kAtomicBuiltin = {{"atomicAdd", "atomicMin", "atomicMax",
>-                                                     "atomicAnd", "atomicOr", "atomicXor",
>-                                                     "atomicExchange", "atomicCompSwap"}};
>-
>-bool IsAtomicBuiltin(const TString &name)
>-{
>-    for (size_t i = 0; i < kAtomicBuiltin.size(); ++i)
>-    {
>-        if (name.compare(kAtomicBuiltin[i]) == 0)
>-        {
>-            return true;
>-        }
>-    }
>-    return false;
>-}
>-
> bool ContainsSampler(const TStructure *structType);
> 
> bool ContainsSampler(const TType &type)
>@@ -87,7 +73,7 @@ const char *GetImageArgumentToken(TIntermTyped *imageNode)
>     TIntermSymbol *imageSymbol = imageNode->getAsSymbolNode();
>     if (imageSymbol)
>     {
>-        return imageSymbol->getSymbol().c_str();
>+        return imageSymbol->getName().data();
>     }
>     return "image";
> }
>@@ -208,11 +194,8 @@ TParseContext::TParseContext(TSymbolTable &symt,
>                         mShaderVersion,
>                         mShaderType,
>                         resources.WEBGL_debug_shader_precision == 1),
>-      mPreprocessor(mDiagnostics, &mDirectiveHandler, pp::PreprocessorSettings()),
>+      mPreprocessor(mDiagnostics, &mDirectiveHandler, angle::pp::PreprocessorSettings(spec)),
>       mScanner(nullptr),
>-      mUsesFragData(false),
>-      mUsesFragColor(false),
>-      mUsesSecondaryOutputs(false),
>       mMinProgramTexelOffset(resources.MinProgramTexelOffset),
>       mMaxProgramTexelOffset(resources.MaxProgramTexelOffset),
>       mMinProgramTextureGatherOffset(resources.MinProgramTextureGatherOffset),
>@@ -233,25 +216,21 @@ TParseContext::TParseContext(TSymbolTable &symt,
>       mGeometryShaderInvocations(0),
>       mGeometryShaderMaxVertices(-1),
>       mMaxGeometryShaderInvocations(resources.MaxGeometryShaderInvocations),
>-      mMaxGeometryShaderMaxVertices(resources.MaxGeometryOutputVertices),
>-      mGeometryShaderInputArraySize(0u)
>-{
>-}
>+      mMaxGeometryShaderMaxVertices(resources.MaxGeometryOutputVertices)
>+{}
> 
>-TParseContext::~TParseContext()
>-{
>-}
>+TParseContext::~TParseContext() {}
> 
> bool TParseContext::parseVectorFields(const TSourceLoc &line,
>-                                      const TString &compString,
>+                                      const ImmutableString &compString,
>                                       int vecSize,
>                                       TVector<int> *fieldOffsets)
> {
>     ASSERT(fieldOffsets);
>-    size_t fieldCount = compString.size();
>+    size_t fieldCount = compString.length();
>     if (fieldCount > 4u)
>     {
>-        error(line, "illegal vector field selection", compString.c_str());
>+        error(line, "illegal vector field selection", compString);
>         return false;
>     }
>     fieldOffsets->resize(fieldCount);
>@@ -269,55 +248,55 @@ bool TParseContext::parseVectorFields(const TSourceLoc &line,
>         {
>             case 'x':
>                 (*fieldOffsets)[i] = 0;
>-                fieldSet[i]       = exyzw;
>+                fieldSet[i]        = exyzw;
>                 break;
>             case 'r':
>                 (*fieldOffsets)[i] = 0;
>-                fieldSet[i]       = ergba;
>+                fieldSet[i]        = ergba;
>                 break;
>             case 's':
>                 (*fieldOffsets)[i] = 0;
>-                fieldSet[i]       = estpq;
>+                fieldSet[i]        = estpq;
>                 break;
>             case 'y':
>                 (*fieldOffsets)[i] = 1;
>-                fieldSet[i]       = exyzw;
>+                fieldSet[i]        = exyzw;
>                 break;
>             case 'g':
>                 (*fieldOffsets)[i] = 1;
>-                fieldSet[i]       = ergba;
>+                fieldSet[i]        = ergba;
>                 break;
>             case 't':
>                 (*fieldOffsets)[i] = 1;
>-                fieldSet[i]       = estpq;
>+                fieldSet[i]        = estpq;
>                 break;
>             case 'z':
>                 (*fieldOffsets)[i] = 2;
>-                fieldSet[i]       = exyzw;
>+                fieldSet[i]        = exyzw;
>                 break;
>             case 'b':
>                 (*fieldOffsets)[i] = 2;
>-                fieldSet[i]       = ergba;
>+                fieldSet[i]        = ergba;
>                 break;
>             case 'p':
>                 (*fieldOffsets)[i] = 2;
>-                fieldSet[i]       = estpq;
>+                fieldSet[i]        = estpq;
>                 break;
> 
>             case 'w':
>                 (*fieldOffsets)[i] = 3;
>-                fieldSet[i]       = exyzw;
>+                fieldSet[i]        = exyzw;
>                 break;
>             case 'a':
>                 (*fieldOffsets)[i] = 3;
>-                fieldSet[i]       = ergba;
>+                fieldSet[i]        = ergba;
>                 break;
>             case 'q':
>                 (*fieldOffsets)[i] = 3;
>-                fieldSet[i]       = estpq;
>+                fieldSet[i]        = estpq;
>                 break;
>             default:
>-                error(line, "illegal vector field selection", compString.c_str());
>+                error(line, "illegal vector field selection", compString);
>                 return false;
>         }
>     }
>@@ -326,7 +305,7 @@ bool TParseContext::parseVectorFields(const TSourceLoc &line,
>     {
>         if ((*fieldOffsets)[i] >= vecSize)
>         {
>-            error(line, "vector field selection out of range", compString.c_str());
>+            error(line, "vector field selection out of range", compString);
>             return false;
>         }
> 
>@@ -334,8 +313,7 @@ bool TParseContext::parseVectorFields(const TSourceLoc &line,
>         {
>             if (fieldSet[i] != fieldSet[i - 1])
>             {
>-                error(line, "illegal - vector component fields not from the same set",
>-                      compString.c_str());
>+                error(line, "illegal - vector component fields not from the same set", compString);
>                 return false;
>             }
>         }
>@@ -358,6 +336,11 @@ void TParseContext::error(const TSourceLoc &loc, const char *reason, const char
>     mDiagnostics->error(loc, reason, token);
> }
> 
>+void TParseContext::error(const TSourceLoc &loc, const char *reason, const ImmutableString &token)
>+{
>+    mDiagnostics->error(loc, reason, token.data());
>+}
>+
> void TParseContext::warning(const TSourceLoc &loc, const char *reason, const char *token)
> {
>     mDiagnostics->warning(loc, reason, token);
>@@ -381,25 +364,26 @@ void TParseContext::outOfRangeError(bool isError,
> //
> // Same error message for all places assignments don't work.
> //
>-void TParseContext::assignError(const TSourceLoc &line, const char *op, TString left, TString right)
>+void TParseContext::assignError(const TSourceLoc &line,
>+                                const char *op,
>+                                const TType &left,
>+                                const TType &right)
> {
>-    std::stringstream reasonStream;
>+    TInfoSinkBase reasonStream;
>     reasonStream << "cannot convert from '" << right << "' to '" << left << "'";
>-    std::string reason = reasonStream.str();
>-    error(line, reason.c_str(), op);
>+    error(line, reasonStream.c_str(), op);
> }
> 
> //
> // Same error message for all places unary operations don't work.
> //
>-void TParseContext::unaryOpError(const TSourceLoc &line, const char *op, TString operand)
>+void TParseContext::unaryOpError(const TSourceLoc &line, const char *op, const TType &operand)
> {
>-    std::stringstream reasonStream;
>+    TInfoSinkBase reasonStream;
>     reasonStream << "wrong operand type - no operation '" << op
>                  << "' exists that takes an operand of type " << operand
>                  << " (or there is no acceptable conversion)";
>-    std::string reason = reasonStream.str();
>-    error(line, reason.c_str(), op);
>+    error(line, reasonStream.c_str(), op);
> }
> 
> //
>@@ -407,16 +391,15 @@ void TParseContext::unaryOpError(const TSourceLoc &line, const char *op, TString
> //
> void TParseContext::binaryOpError(const TSourceLoc &line,
>                                   const char *op,
>-                                  TString left,
>-                                  TString right)
>+                                  const TType &left,
>+                                  const TType &right)
> {
>-    std::stringstream reasonStream;
>+    TInfoSinkBase reasonStream;
>     reasonStream << "wrong operand types - no operation '" << op
>                  << "' exists that takes a left-hand operand of type '" << left
>                  << "' and a right operand of type '" << right
>                  << "' (or there is no acceptable conversion)";
>-    std::string reason = reasonStream.str();
>-    error(line, reason.c_str(), op);
>+    error(line, reasonStream.c_str(), op);
> }
> 
> void TParseContext::checkPrecisionSpecified(const TSourceLoc &line,
>@@ -453,14 +436,41 @@ void TParseContext::checkPrecisionSpecified(const TSourceLoc &line,
>     }
> }
> 
>+void TParseContext::markStaticReadIfSymbol(TIntermNode *node)
>+{
>+    TIntermSwizzle *swizzleNode = node->getAsSwizzleNode();
>+    if (swizzleNode)
>+    {
>+        markStaticReadIfSymbol(swizzleNode->getOperand());
>+        return;
>+    }
>+    TIntermBinary *binaryNode = node->getAsBinaryNode();
>+    if (binaryNode)
>+    {
>+        switch (binaryNode->getOp())
>+        {
>+            case EOpIndexDirect:
>+            case EOpIndexIndirect:
>+            case EOpIndexDirectStruct:
>+            case EOpIndexDirectInterfaceBlock:
>+                markStaticReadIfSymbol(binaryNode->getLeft());
>+                return;
>+            default:
>+                return;
>+        }
>+    }
>+    TIntermSymbol *symbolNode = node->getAsSymbolNode();
>+    if (symbolNode)
>+    {
>+        symbolTable.markStaticRead(symbolNode->variable());
>+    }
>+}
>+
> // Both test and if necessary, spit out an error, to see if the node is really
> // an l-value that can be operated on this way.
> bool TParseContext::checkCanBeLValue(const TSourceLoc &line, const char *op, TIntermTyped *node)
> {
>-    TIntermSymbol *symNode      = node->getAsSymbolNode();
>-    TIntermBinary *binaryNode   = node->getAsBinaryNode();
>     TIntermSwizzle *swizzleNode = node->getAsSwizzleNode();
>-
>     if (swizzleNode)
>     {
>         bool ok = checkCanBeLValue(line, op, swizzleNode->getOperand());
>@@ -472,6 +482,7 @@ bool TParseContext::checkCanBeLValue(const TSourceLoc &line, const char *op, TIn
>         return ok;
>     }
> 
>+    TIntermBinary *binaryNode = node->getAsBinaryNode();
>     if (binaryNode)
>     {
>         switch (binaryNode->getOp())
>@@ -480,6 +491,11 @@ bool TParseContext::checkCanBeLValue(const TSourceLoc &line, const char *op, TIn
>             case EOpIndexIndirect:
>             case EOpIndexDirectStruct:
>             case EOpIndexDirectInterfaceBlock:
>+                if (node->getMemoryQualifier().readonly)
>+                {
>+                    error(line, "can't modify a readonly variable", op);
>+                    return false;
>+                }
>                 return checkCanBeLValue(line, op, binaryNode->getLeft());
>             default:
>                 break;
>@@ -587,37 +603,32 @@ bool TParseContext::checkCanBeLValue(const TSourceLoc &line, const char *op, TIn
>             }
>     }
> 
>-    if (message.empty() && binaryNode == 0 && symNode == 0)
>+    ASSERT(binaryNode == nullptr && swizzleNode == nullptr);
>+    TIntermSymbol *symNode = node->getAsSymbolNode();
>+    if (message.empty() && symNode != nullptr)
>     {
>-        error(line, "l-value required", op);
>-
>-        return false;
>-    }
>-
>-    //
>-    // Everything else is okay, no error.
>-    //
>-    if (message.empty())
>+        symbolTable.markStaticWrite(symNode->variable());
>         return true;
>-
>-    //
>-    // If we get here, we have an error and a message.
>-    //
>-    if (symNode)
>-    {
>-        const char *symbol = symNode->getSymbol().c_str();
>-        std::stringstream reasonStream;
>-        reasonStream << "l-value required (" << message << " \"" << symbol << "\")";
>-        std::string reason = reasonStream.str();
>-        error(line, reason.c_str(), op);
>     }
>-    else
>+
>+    std::stringstream reasonStream = sh::InitializeStream<std::stringstream>();
>+    reasonStream << "l-value required";
>+    if (!message.empty())
>     {
>-        std::stringstream reasonStream;
>-        reasonStream << "l-value required (" << message << ")";
>-        std::string reason = reasonStream.str();
>-        error(line, reason.c_str(), op);
>+        if (symNode)
>+        {
>+            // Symbol inside an expression can't be nameless.
>+            ASSERT(symNode->variable().symbolType() != SymbolType::Empty);
>+            const ImmutableString &symbol = symNode->getName();
>+            reasonStream << " (" << message << " \"" << symbol << "\")";
>+        }
>+        else
>+        {
>+            reasonStream << " (" << message << ")";
>+        }
>     }
>+    std::string reason = reasonStream.str();
>+    error(line, reason.c_str(), op);
> 
>     return false;
> }
>@@ -657,33 +668,33 @@ bool TParseContext::checkIsAtGlobalLevel(const TSourceLoc &line, const char *tok
> // ESSL 3.00.5 sections 3.8 and 3.9.
> // If it starts "gl_" or contains two consecutive underscores, it's reserved.
> // Also checks for "webgl_" and "_webgl_" reserved identifiers if parsing a webgl shader.
>-bool TParseContext::checkIsNotReserved(const TSourceLoc &line, const TString &identifier)
>+bool TParseContext::checkIsNotReserved(const TSourceLoc &line, const ImmutableString &identifier)
> {
>     static const char *reservedErrMsg = "reserved built-in name";
>-    if (identifier.compare(0, 3, "gl_") == 0)
>+    if (identifier.beginsWith("gl_"))
>     {
>         error(line, reservedErrMsg, "gl_");
>         return false;
>     }
>     if (sh::IsWebGLBasedSpec(mShaderSpec))
>     {
>-        if (identifier.compare(0, 6, "webgl_") == 0)
>+        if (identifier.beginsWith("webgl_"))
>         {
>             error(line, reservedErrMsg, "webgl_");
>             return false;
>         }
>-        if (identifier.compare(0, 7, "_webgl_") == 0)
>+        if (identifier.beginsWith("_webgl_"))
>         {
>             error(line, reservedErrMsg, "_webgl_");
>             return false;
>         }
>     }
>-    if (identifier.find("__") != TString::npos)
>+    if (identifier.contains("__"))
>     {
>         error(line,
>               "identifiers containing two consecutive underscores (__) are reserved as "
>               "possible future keywords",
>-              identifier.c_str());
>+              identifier);
>         return false;
>     }
>     return true;
>@@ -691,17 +702,18 @@ bool TParseContext::checkIsNotReserved(const TSourceLoc &line, const TString &id
> 
> // Make sure the argument types are correct for constructing a specific type.
> bool TParseContext::checkConstructorArguments(const TSourceLoc &line,
>-                                              const TIntermSequence *arguments,
>+                                              const TIntermSequence &arguments,
>                                               const TType &type)
> {
>-    if (arguments->empty())
>+    if (arguments.empty())
>     {
>         error(line, "constructor does not have any arguments", "constructor");
>         return false;
>     }
> 
>-    for (TIntermNode *arg : *arguments)
>+    for (TIntermNode *arg : arguments)
>     {
>+        markStaticReadIfSymbol(arg);
>         const TIntermTyped *argTyped = arg->getAsTyped();
>         ASSERT(argTyped != nullptr);
>         if (type.getBasicType() != EbtStruct && IsOpaqueType(argTyped->getBasicType()))
>@@ -727,14 +739,14 @@ bool TParseContext::checkConstructorArguments(const TSourceLoc &line,
>     {
>         // The size of an unsized constructor should already have been determined.
>         ASSERT(!type.isUnsizedArray());
>-        if (static_cast<size_t>(type.getOutermostArraySize()) != arguments->size())
>+        if (static_cast<size_t>(type.getOutermostArraySize()) != arguments.size())
>         {
>             error(line, "array constructor needs one argument per array element", "constructor");
>             return false;
>         }
>         // GLSL ES 3.00 section 5.4.4: Each argument must be the same type as the element type of
>         // the array.
>-        for (TIntermNode *const &argNode : *arguments)
>+        for (TIntermNode *const &argNode : arguments)
>         {
>             const TType &argType = argNode->getAsTyped()->getType();
>             if (mShaderVersion < 310 && argType.isArray())
>@@ -752,7 +764,7 @@ bool TParseContext::checkConstructorArguments(const TSourceLoc &line,
>     else if (type.getBasicType() == EbtStruct)
>     {
>         const TFieldList &fields = type.getStruct()->fields();
>-        if (fields.size() != arguments->size())
>+        if (fields.size() != arguments.size())
>         {
>             error(line,
>                   "Number of constructor parameters does not match the number of structure fields",
>@@ -762,8 +774,8 @@ bool TParseContext::checkConstructorArguments(const TSourceLoc &line,
> 
>         for (size_t i = 0; i < fields.size(); i++)
>         {
>-            if (i >= arguments->size() ||
>-                (*arguments)[i]->getAsTyped()->getType() != *fields[i]->type())
>+            if (i >= arguments.size() ||
>+                arguments[i]->getAsTyped()->getType() != *fields[i]->type())
>             {
>                 error(line, "Structure constructor arguments do not match structure fields",
>                       "constructor");
>@@ -783,7 +795,7 @@ bool TParseContext::checkConstructorArguments(const TSourceLoc &line,
>         bool full      = false;
>         bool overFull  = false;
>         bool matrixArg = false;
>-        for (TIntermNode *arg : *arguments)
>+        for (TIntermNode *arg : arguments)
>         {
>             const TIntermTyped *argTyped = arg->getAsTyped();
>             ASSERT(argTyped != nullptr);
>@@ -817,7 +829,7 @@ bool TParseContext::checkConstructorArguments(const TSourceLoc &line,
> 
>         if (type.isMatrix() && matrixArg)
>         {
>-            if (arguments->size() != 1)
>+            if (arguments.size() != 1)
>             {
>                 error(line, "constructing matrix from matrix can only take one argument",
>                       "constructor");
>@@ -848,12 +860,12 @@ bool TParseContext::checkConstructorArguments(const TSourceLoc &line,
> // returns true in case of an error
> //
> bool TParseContext::checkIsNonVoid(const TSourceLoc &line,
>-                                   const TString &identifier,
>+                                   const ImmutableString &identifier,
>                                    const TBasicType &type)
> {
>     if (type == EbtVoid)
>     {
>-        error(line, "illegal use of type 'void'", identifier.c_str());
>+        error(line, "illegal use of type 'void'", identifier);
>         return false;
>     }
> 
>@@ -890,7 +902,7 @@ bool TParseContext::checkIsNotOpaqueType(const TSourceLoc &line,
>     {
>         if (ContainsSampler(pType.userDef))
>         {
>-            std::stringstream reasonStream;
>+            std::stringstream reasonStream = sh::InitializeStream<std::stringstream>();
>             reasonStream << reason << " (structure contains a sampler)";
>             std::string reasonStr = reasonStream.str();
>             error(line, reasonStr.c_str(), getBasicString(pType.type));
>@@ -960,9 +972,10 @@ unsigned int TParseContext::checkIsValidArraySize(const TSourceLoc &line, TInter
> {
>     TIntermConstantUnion *constant = expr->getAsConstantUnion();
> 
>-    // TODO(oetuaho@nvidia.com): Get rid of the constant == nullptr check here once all constant
>-    // expressions can be folded. Right now we don't allow constant expressions that ANGLE can't
>-    // fold as array size.
>+    // ANGLE should be able to fold any EvqConst expressions resulting in an integer - but to be
>+    // safe against corner cases we still check for constant folding. Some interpretations of the
>+    // spec have allowed constant expressions with side effects - like array length() method on a
>+    // non-constant array.
>     if (expr->getQualifier() != EvqConst || constant == nullptr || !constant->isScalarInt())
>     {
>         error(line, "array size must be a constant integer expression", "");
>@@ -1030,8 +1043,9 @@ bool TParseContext::checkArrayElementIsNotArray(const TSourceLoc &line,
> {
>     if (mShaderVersion < 310 && elementType.isArray())
>     {
>-        error(line, "cannot declare arrays of arrays",
>-              TType(elementType).getCompleteString().c_str());
>+        TInfoSinkBase typeString;
>+        typeString << TType(elementType);
>+        error(line, "cannot declare arrays of arrays", typeString.c_str());
>         return false;
>     }
>     return true;
>@@ -1053,11 +1067,18 @@ bool TParseContext::checkIsValidTypeAndQualifierForArray(const TSourceLoc &index
>     // In ESSL1.00 shaders, structs cannot be varying (section 4.3.5). This is checked elsewhere.
>     // In ESSL3.00 shaders, struct inputs/outputs are allowed but not arrays of structs (section
>     // 4.3.4).
>+    // Geometry shader requires each user-defined input be declared as arrays or inside input
>+    // blocks declared as arrays (GL_EXT_geometry_shader section 11.1gs.4.3). For the purposes of
>+    // interface matching, such variables and blocks are treated as though they were not declared
>+    // as arrays (GL_EXT_geometry_shader section 7.4.1).
>     if (mShaderVersion >= 300 && elementType.getBasicType() == EbtStruct &&
>-        sh::IsVarying(elementType.qualifier))
>+        sh::IsVarying(elementType.qualifier) &&
>+        !IsGeometryShaderInput(mShaderType, elementType.qualifier))
>     {
>+        TInfoSinkBase typeString;
>+        typeString << TType(elementType);
>         error(indexLocation, "cannot declare arrays of structs of this qualifier",
>-              TType(elementType).getCompleteString().c_str());
>+              typeString.c_str());
>         return false;
>     }
>     return checkIsValidQualifierForArray(indexLocation, elementType);
>@@ -1065,7 +1086,7 @@ bool TParseContext::checkIsValidTypeAndQualifierForArray(const TSourceLoc &index
> 
> // Enforce non-initializer type/qualifier rules.
> void TParseContext::checkCanBeDeclaredWithoutInitializer(const TSourceLoc &line,
>-                                                         const TString &identifier,
>+                                                         const ImmutableString &identifier,
>                                                          TType *type)
> {
>     ASSERT(type != nullptr);
>@@ -1081,16 +1102,16 @@ void TParseContext::checkCanBeDeclaredWithoutInitializer(const TSourceLoc &line,
>             error(line,
>                   "structures containing arrays may not be declared constant since they cannot be "
>                   "initialized",
>-                  identifier.c_str());
>+                  identifier);
>         }
>         else
>         {
>-            error(line, "variables with qualifier 'const' must be initialized", identifier.c_str());
>+            error(line, "variables with qualifier 'const' must be initialized", identifier);
>         }
>     }
>     // This will make the type sized if it isn't sized yet.
>-    checkIsNotUnsizedArray(line, "implicitly sized arrays need to be initialized",
>-                           identifier.c_str(), type);
>+    checkIsNotUnsizedArray(line, "implicitly sized arrays need to be initialized", identifier,
>+                           type);
> }
> 
> // Do some simple checks that are shared between all variable declarations,
>@@ -1099,39 +1120,59 @@ void TParseContext::checkCanBeDeclaredWithoutInitializer(const TSourceLoc &line,
> // Returns true if declaring the variable succeeded.
> //
> bool TParseContext::declareVariable(const TSourceLoc &line,
>-                                    const TString &identifier,
>-                                    const TType &type,
>+                                    const ImmutableString &identifier,
>+                                    const TType *type,
>                                     TVariable **variable)
> {
>     ASSERT((*variable) == nullptr);
> 
>-    checkBindingIsValid(line, type);
>+    (*variable) = new TVariable(&symbolTable, identifier, type, SymbolType::UserDefined);
>+
>+    ASSERT(type->getLayoutQualifier().index == -1 ||
>+           (isExtensionEnabled(TExtension::EXT_blend_func_extended) &&
>+            mShaderType == GL_FRAGMENT_SHADER && mShaderVersion >= 300));
>+    if (type->getQualifier() == EvqFragmentOut)
>+    {
>+        if (type->getLayoutQualifier().index != -1 && type->getLayoutQualifier().location == -1)
>+        {
>+            error(line,
>+                  "If index layout qualifier is specified for a fragment output, location must "
>+                  "also be specified.",
>+                  "index");
>+            return false;
>+        }
>+    }
>+    else
>+    {
>+        checkIndexIsNotSpecified(line, type->getLayoutQualifier().index);
>+    }
>+
>+    checkBindingIsValid(line, *type);
> 
>     bool needsReservedCheck = true;
> 
>     // gl_LastFragData may be redeclared with a new precision qualifier
>-    if (type.isArray() && identifier.compare(0, 15, "gl_LastFragData") == 0)
>+    if (type->isArray() && identifier.beginsWith("gl_LastFragData"))
>     {
>         const TVariable *maxDrawBuffers = static_cast<const TVariable *>(
>-            symbolTable.findBuiltIn("gl_MaxDrawBuffers", mShaderVersion));
>-        if (type.isArrayOfArrays())
>+            symbolTable.findBuiltIn(ImmutableString("gl_MaxDrawBuffers"), mShaderVersion));
>+        if (type->isArrayOfArrays())
>         {
>-            error(line, "redeclaration of gl_LastFragData as an array of arrays",
>-                  identifier.c_str());
>+            error(line, "redeclaration of gl_LastFragData as an array of arrays", identifier);
>             return false;
>         }
>-        else if (static_cast<int>(type.getOutermostArraySize()) ==
>+        else if (static_cast<int>(type->getOutermostArraySize()) ==
>                  maxDrawBuffers->getConstPointer()->getIConst())
>         {
>-            if (TSymbol *builtInSymbol = symbolTable.findBuiltIn(identifier, mShaderVersion))
>+            if (const TSymbol *builtInSymbol = symbolTable.findBuiltIn(identifier, mShaderVersion))
>             {
>-                needsReservedCheck = !checkCanUseExtension(line, builtInSymbol->getExtension());
>+                needsReservedCheck = !checkCanUseExtension(line, builtInSymbol->extension());
>             }
>         }
>         else
>         {
>             error(line, "redeclaration of gl_LastFragData with size != gl_MaxDrawBuffers",
>-                  identifier.c_str());
>+                  identifier);
>             return false;
>         }
>     }
>@@ -1139,14 +1180,13 @@ bool TParseContext::declareVariable(const TSourceLoc &line,
>     if (needsReservedCheck && !checkIsNotReserved(line, identifier))
>         return false;
> 
>-    (*variable) = symbolTable.declareVariable(&identifier, type);
>-    if (!(*variable))
>+    if (!symbolTable.declare(*variable))
>     {
>-        error(line, "redefinition", identifier.c_str());
>+        error(line, "redefinition", identifier);
>         return false;
>     }
> 
>-    if (!checkIsNonVoid(line, identifier, type.getBasicType()))
>+    if (!checkIsNonVoid(line, identifier, type->getBasicType()))
>         return false;
> 
>     return true;
>@@ -1262,14 +1302,6 @@ template bool TParseContext::checkCanUseOneOfExtensions(
> bool TParseContext::checkCanUseExtension(const TSourceLoc &line, TExtension extension)
> {
>     ASSERT(extension != TExtension::UNDEFINED);
>-    ASSERT(extension != TExtension::EXT_geometry_shader);
>-    if (extension == TExtension::OES_geometry_shader)
>-    {
>-        // OES_geometry_shader and EXT_geometry_shader are always interchangeable.
>-        constexpr std::array<TExtension, 2u> extensions{
>-            {TExtension::EXT_geometry_shader, TExtension::OES_geometry_shader}};
>-        return checkCanUseOneOfExtensions(line, extensions);
>-    }
>     return checkCanUseOneOfExtensions(line, std::array<TExtension, 1u>{{extension}});
> }
> 
>@@ -1315,7 +1347,7 @@ void TParseContext::declarationQualifierErrorCheck(const sh::TQualifier qualifie
> 
>     // If multiview extension is enabled, "in" qualifier is allowed in the vertex shader in previous
>     // parsing steps. So it needs to be checked here.
>-    if (isExtensionEnabled(TExtension::OVR_multiview) && mShaderVersion < 300 &&
>+    if (isExtensionEnabled(TExtension::OVR_multiview2) && mShaderVersion < 300 &&
>         qualifier == EvqVertexIn)
>     {
>         error(location, "storage qualifier supported in GLSL ES 3.00 and above only", "in");
>@@ -1361,6 +1393,11 @@ void TParseContext::emptyDeclarationErrorCheck(const TType &type, const TSourceL
>         // error. It is assumed that this applies to empty declarations as well.
>         error(location, "empty array declaration needs to specify a size", "");
>     }
>+
>+    if (type.getQualifier() != EvqFragmentOut)
>+    {
>+        checkIndexIsNotSpecified(location, type.getLayoutQualifier().index);
>+    }
> }
> 
> // These checks are done for all declarations that are non-empty. They're done for non-empty
>@@ -1542,13 +1579,13 @@ void TParseContext::checkBindingIsValid(const TSourceLoc &identifierLocation, co
> }
> 
> void TParseContext::checkLayoutQualifierSupported(const TSourceLoc &location,
>-                                                  const TString &layoutQualifierName,
>+                                                  const ImmutableString &layoutQualifierName,
>                                                   int versionRequired)
> {
> 
>     if (mShaderVersion < versionRequired)
>     {
>-        error(location, "invalid layout qualifier: not supported", layoutQualifierName.c_str());
>+        error(location, "invalid layout qualifier: not supported", layoutQualifierName);
>     }
> }
> 
>@@ -1581,6 +1618,17 @@ void TParseContext::checkInternalFormatIsNotSpecified(const TSourceLoc &location
>     }
> }
> 
>+void TParseContext::checkIndexIsNotSpecified(const TSourceLoc &location, int index)
>+{
>+    if (index != -1)
>+    {
>+        error(location,
>+              "invalid layout qualifier: only valid when used with a fragment shader output in "
>+              "ESSL version >= 3.00 and EXT_blend_func_extended is enabled",
>+              "index");
>+    }
>+}
>+
> void TParseContext::checkBindingIsNotSpecified(const TSourceLoc &location, int binding)
> {
>     if (binding != -1)
>@@ -1679,17 +1727,22 @@ void TParseContext::functionCallRValueLValueErrorCheck(const TFunction *fnCandid
> {
>     for (size_t i = 0; i < fnCandidate->getParamCount(); ++i)
>     {
>-        TQualifier qual = fnCandidate->getParam(i).type->getQualifier();
>+        TQualifier qual        = fnCandidate->getParam(i)->getType().getQualifier();
>         TIntermTyped *argument = (*(fnCall->getSequence()))[i]->getAsTyped();
>-        if (!IsImage(argument->getBasicType()) && (IsQualifierUnspecified(qual) || qual == EvqIn ||
>-                                                   qual == EvqInOut || qual == EvqConstReadOnly))
>+        bool argumentIsRead = (IsQualifierUnspecified(qual) || qual == EvqIn || qual == EvqInOut ||
>+                               qual == EvqConstReadOnly);
>+        if (argumentIsRead)
>         {
>-            if (argument->getMemoryQualifier().writeonly)
>+            markStaticReadIfSymbol(argument);
>+            if (!IsImage(argument->getBasicType()))
>             {
>-                error(argument->getLine(),
>-                      "Writeonly value cannot be passed for 'in' or 'inout' parameters.",
>-                      fnCall->getFunctionSymbolInfo()->getName().c_str());
>-                return;
>+                if (argument->getMemoryQualifier().writeonly)
>+                {
>+                    error(argument->getLine(),
>+                          "Writeonly value cannot be passed for 'in' or 'inout' parameters.",
>+                          fnCall->functionName());
>+                    return;
>+                }
>             }
>         }
>         if (qual == EvqOut || qual == EvqInOut)
>@@ -1698,7 +1751,7 @@ void TParseContext::functionCallRValueLValueErrorCheck(const TFunction *fnCandid
>             {
>                 error(argument->getLine(),
>                       "Constant value cannot be passed for 'out' or 'inout' parameters.",
>-                      fnCall->getFunctionSymbolInfo()->getName().c_str());
>+                      fnCall->functionName());
>                 return;
>             }
>         }
>@@ -1738,7 +1791,7 @@ void TParseContext::handleExtensionDirective(const TSourceLoc &loc,
>                                              const char *extName,
>                                              const char *behavior)
> {
>-    pp::SourceLocation srcLoc;
>+    angle::pp::SourceLocation srcLoc;
>     srcLoc.file = loc.first_file;
>     srcLoc.line = loc.first_line;
>     mDirectiveHandler.handleExtension(srcLoc, extName, behavior);
>@@ -1749,7 +1802,7 @@ void TParseContext::handlePragmaDirective(const TSourceLoc &loc,
>                                           const char *value,
>                                           bool stdgl)
> {
>-    pp::SourceLocation srcLoc;
>+    angle::pp::SourceLocation srcLoc;
>     srcLoc.file = loc.first_file;
>     srcLoc.line = loc.first_line;
>     mDirectiveHandler.handlePragma(srcLoc, name, value, stdgl);
>@@ -1788,62 +1841,31 @@ TIntermConstantUnion *TParseContext::addScalarLiteral(const TConstantUnion *cons
> /////////////////////////////////////////////////////////////////////////////////
> 
> const TVariable *TParseContext::getNamedVariable(const TSourceLoc &location,
>-                                                 const TString *name,
>+                                                 const ImmutableString &name,
>                                                  const TSymbol *symbol)
> {
>     if (!symbol)
>     {
>-        error(location, "undeclared identifier", name->c_str());
>+        error(location, "undeclared identifier", name);
>         return nullptr;
>     }
> 
>     if (!symbol->isVariable())
>     {
>-        error(location, "variable expected", name->c_str());
>+        error(location, "variable expected", name);
>         return nullptr;
>     }
> 
>     const TVariable *variable = static_cast<const TVariable *>(symbol);
> 
>-    if (variable->getExtension() != TExtension::UNDEFINED)
>-    {
>-        checkCanUseExtension(location, variable->getExtension());
>-    }
>-
>-    // Reject shaders using both gl_FragData and gl_FragColor
>-    TQualifier qualifier = variable->getType().getQualifier();
>-    if (qualifier == EvqFragData || qualifier == EvqSecondaryFragDataEXT)
>-    {
>-        mUsesFragData = true;
>-    }
>-    else if (qualifier == EvqFragColor || qualifier == EvqSecondaryFragColorEXT)
>-    {
>-        mUsesFragColor = true;
>-    }
>-    if (qualifier == EvqSecondaryFragDataEXT || qualifier == EvqSecondaryFragColorEXT)
>-    {
>-        mUsesSecondaryOutputs = true;
>-    }
>-
>-    // This validation is not quite correct - it's only an error to write to
>-    // both FragData and FragColor. For simplicity, and because users shouldn't
>-    // be rewarded for reading from undefined varaibles, return an error
>-    // if they are both referenced, rather than assigned.
>-    if (mUsesFragData && mUsesFragColor)
>+    if (variable->extension() != TExtension::UNDEFINED)
>     {
>-        const char *errorMessage = "cannot use both gl_FragData and gl_FragColor";
>-        if (mUsesSecondaryOutputs)
>-        {
>-            errorMessage =
>-                "cannot use both output variable sets (gl_FragData, gl_SecondaryFragDataEXT)"
>-                " and (gl_FragColor, gl_SecondaryFragColorEXT)";
>-        }
>-        error(location, errorMessage, name->c_str());
>+        checkCanUseExtension(location, variable->extension());
>     }
> 
>     // GLSL ES 3.1 Revision 4, 7.1.3 Compute Shader Special Variables
>     if (getShaderType() == GL_COMPUTE_SHADER && !mComputeShaderLocalSizeDeclared &&
>-        qualifier == EvqWorkGroupSize)
>+        variable->getType().getQualifier() == EvqWorkGroupSize)
>     {
>         error(location,
>               "It is an error to use gl_WorkGroupSize before declaring the local group size",
>@@ -1853,7 +1875,7 @@ const TVariable *TParseContext::getNamedVariable(const TSourceLoc &location,
> }
> 
> TIntermTyped *TParseContext::parseVariableIdentifier(const TSourceLoc &location,
>-                                                     const TString *name,
>+                                                     const ImmutableString &name,
>                                                      const TSymbol *symbol)
> {
>     const TVariable *variable = getNamedVariable(location, name, symbol);
>@@ -1866,9 +1888,9 @@ TIntermTyped *TParseContext::parseVariableIdentifier(const TSourceLoc &location,
>     }
> 
>     const TType &variableType = variable->getType();
>-    TIntermTyped *node = nullptr;
>+    TIntermTyped *node        = nullptr;
> 
>-    if (variable->getConstPointer())
>+    if (variable->getConstPointer() && variableType.canReplaceWithConstantUnion())
>     {
>         const TConstantUnion *constArray = variable->getConstPointer();
>         node                             = new TIntermConstantUnion(constArray, variableType);
>@@ -1894,14 +1916,12 @@ TIntermTyped *TParseContext::parseVariableIdentifier(const TSourceLoc &location,
>     else if ((mGeometryShaderInputPrimitiveType != EptUndefined) &&
>              (variableType.getQualifier() == EvqPerVertexIn))
>     {
>-        ASSERT(mGeometryShaderInputArraySize > 0u);
>-
>-        node = new TIntermSymbol(variable->getUniqueId(), variable->getName(), variableType);
>-        node->getTypePointer()->sizeOutermostUnsizedArray(mGeometryShaderInputArraySize);
>+        ASSERT(symbolTable.getGlInVariableWithArraySize() != nullptr);
>+        node = new TIntermSymbol(symbolTable.getGlInVariableWithArraySize());
>     }
>     else
>     {
>-        node = new TIntermSymbol(variable->getUniqueId(), variable->getName(), variableType);
>+        node = new TIntermSymbol(variable);
>     }
>     ASSERT(node != nullptr);
>     node->setLine(location);
>@@ -1913,32 +1933,55 @@ TIntermTyped *TParseContext::parseVariableIdentifier(const TSourceLoc &location,
> //
> // Returns true on success.
> bool TParseContext::executeInitializer(const TSourceLoc &line,
>-                                       const TString &identifier,
>-                                       TType type,
>+                                       const ImmutableString &identifier,
>+                                       TType *type,
>                                        TIntermTyped *initializer,
>                                        TIntermBinary **initNode)
> {
>     ASSERT(initNode != nullptr);
>     ASSERT(*initNode == nullptr);
> 
>-    TVariable *variable = nullptr;
>-    if (type.isUnsizedArray())
>+    if (type->isUnsizedArray())
>     {
>         // In case initializer is not an array or type has more dimensions than initializer, this
>         // will default to setting array sizes to 1. We have not checked yet whether the initializer
>         // actually is an array or not. Having a non-array initializer for an unsized array will
>         // result in an error later, so we don't generate an error message here.
>         auto *arraySizes = initializer->getType().getArraySizes();
>-        type.sizeUnsizedArrays(arraySizes);
>+        type->sizeUnsizedArrays(arraySizes);
>+    }
>+
>+    const TQualifier qualifier = type->getQualifier();
>+
>+    bool constError = false;
>+    if (qualifier == EvqConst)
>+    {
>+        if (EvqConst != initializer->getType().getQualifier())
>+        {
>+            TInfoSinkBase reasonStream;
>+            reasonStream << "assigning non-constant to '" << *type << "'";
>+            error(line, reasonStream.c_str(), "=");
>+
>+            // We're still going to declare the variable to avoid extra error messages.
>+            type->setQualifier(EvqTemporary);
>+            constError = true;
>+        }
>     }
>+
>+    TVariable *variable = nullptr;
>     if (!declareVariable(line, identifier, type, &variable))
>     {
>         return false;
>     }
> 
>+    if (constError)
>+    {
>+        return false;
>+    }
>+
>     bool globalInitWarning = false;
>     if (symbolTable.atGlobalLevel() &&
>-        !ValidateGlobalInitializer(initializer, this, &globalInitWarning))
>+        !ValidateGlobalInitializer(initializer, mShaderVersion, &globalInitWarning))
>     {
>         // Error message does not completely match behavior with ESSL 1.00, but
>         // we want to steer developers towards only using constant expressions.
>@@ -1954,88 +1997,52 @@ bool TParseContext::executeInitializer(const TSourceLoc &line,
>             "=");
>     }
> 
>-    //
>     // identifier must be of type constant, a global, or a temporary
>-    //
>-    TQualifier qualifier = variable->getType().getQualifier();
>     if ((qualifier != EvqTemporary) && (qualifier != EvqGlobal) && (qualifier != EvqConst))
>     {
>         error(line, " cannot initialize this type of qualifier ",
>               variable->getType().getQualifierString());
>         return false;
>     }
>-    //
>-    // test for and propagate constant
>-    //
> 
>-    if (qualifier == EvqConst)
>+    TIntermSymbol *intermSymbol = new TIntermSymbol(variable);
>+    intermSymbol->setLine(line);
>+
>+    if (!binaryOpCommonCheck(EOpInitialize, intermSymbol, initializer, line))
>     {
>-        if (qualifier != initializer->getType().getQualifier())
>-        {
>-            std::stringstream reasonStream;
>-            reasonStream << "assigning non-constant to '" << variable->getType().getCompleteString()
>-                         << "'";
>-            std::string reason = reasonStream.str();
>-            error(line, reason.c_str(), "=");
>-            variable->getType().setQualifier(EvqTemporary);
>-            return false;
>-        }
>-        if (type != initializer->getType())
>-        {
>-            error(line, " non-matching types for const initializer ",
>-                  variable->getType().getQualifierString());
>-            variable->getType().setQualifier(EvqTemporary);
>-            return false;
>-        }
>+        assignError(line, "=", variable->getType(), initializer->getType());
>+        return false;
>+    }
> 
>-        // Save the constant folded value to the variable if possible. For example array
>-        // initializers are not folded, since that way copying the array literal to multiple places
>-        // in the shader is avoided.
>-        // TODO(oetuaho@nvidia.com): Consider constant folding array initialization in cases where
>-        // it would be beneficial.
>-        if (initializer->getAsConstantUnion())
>-        {
>-            variable->shareConstPointer(initializer->getAsConstantUnion()->getUnionArrayPointer());
>-            ASSERT(*initNode == nullptr);
>-            return true;
>-        }
>-        else if (initializer->getAsSymbolNode())
>+    if (qualifier == EvqConst)
>+    {
>+        // Save the constant folded value to the variable if possible.
>+        const TConstantUnion *constArray = initializer->getConstantValue();
>+        if (constArray)
>         {
>-            const TSymbol *symbol =
>-                symbolTable.find(initializer->getAsSymbolNode()->getSymbol(), 0);
>-            const TVariable *tVar = static_cast<const TVariable *>(symbol);
>-
>-            const TConstantUnion *constArray = tVar->getConstPointer();
>-            if (constArray)
>+            variable->shareConstPointer(constArray);
>+            if (initializer->getType().canReplaceWithConstantUnion())
>             {
>-                variable->shareConstPointer(constArray);
>                 ASSERT(*initNode == nullptr);
>                 return true;
>             }
>         }
>     }
> 
>-    TIntermSymbol *intermSymbol =
>-        new TIntermSymbol(variable->getUniqueId(), variable->getName(), variable->getType());
>-    intermSymbol->setLine(line);
>-    *initNode = createAssign(EOpInitialize, intermSymbol, initializer, line);
>-    if (*initNode == nullptr)
>-    {
>-        assignError(line, "=", intermSymbol->getCompleteString(), initializer->getCompleteString());
>-        return false;
>-    }
>-
>+    *initNode = new TIntermBinary(EOpInitialize, intermSymbol, initializer);
>+    markStaticReadIfSymbol(initializer);
>+    (*initNode)->setLine(line);
>     return true;
> }
> 
> TIntermNode *TParseContext::addConditionInitializer(const TPublicType &pType,
>-                                                    const TString &identifier,
>+                                                    const ImmutableString &identifier,
>                                                     TIntermTyped *initializer,
>                                                     const TSourceLoc &loc)
> {
>     checkIsScalarBool(loc, pType);
>     TIntermBinary *initNode = nullptr;
>-    TType type(pType);
>+    TType *type             = new TType(pType);
>     if (executeInitializer(loc, identifier, type, initializer, &initNode))
>     {
>         // The initializer is valid. The init condition needs to have a node - either the
>@@ -2066,8 +2073,19 @@ TIntermNode *TParseContext::addLoop(TLoopType type,
>     TIntermTyped *typedCond = nullptr;
>     if (cond)
>     {
>+        markStaticReadIfSymbol(cond);
>         typedCond = cond->getAsTyped();
>     }
>+    if (expr)
>+    {
>+        markStaticReadIfSymbol(expr);
>+    }
>+    // In case the loop body was not parsed as a block and contains a statement that simply refers
>+    // to a variable, we need to mark it as statically used.
>+    if (body)
>+    {
>+        markStaticReadIfSymbol(body);
>+    }
>     if (cond == nullptr || typedCond)
>     {
>         if (type == ELoopDoWhile)
>@@ -2114,6 +2132,16 @@ TIntermNode *TParseContext::addIfElse(TIntermTyped *cond,
>                                       const TSourceLoc &loc)
> {
>     bool isScalarBool = checkIsScalarBool(loc, cond);
>+    // In case the conditional statements were not parsed as blocks and contain a statement that
>+    // simply refers to a variable, we need to mark them as statically used.
>+    if (code.node1)
>+    {
>+        markStaticReadIfSymbol(code.node1);
>+    }
>+    if (code.node2)
>+    {
>+        markStaticReadIfSymbol(code.node2);
>+    }
> 
>     // For compile time constant conditions, prune the code now.
>     if (isScalarBool && cond->getAsConstantUnion())
>@@ -2129,6 +2157,7 @@ TIntermNode *TParseContext::addIfElse(TIntermTyped *cond,
>     }
> 
>     TIntermIfElse *node = new TIntermIfElse(cond, EnsureBlock(code.node1), EnsureBlock(code.node2));
>+    markStaticReadIfSymbol(cond);
>     node->setLine(loc);
> 
>     return node;
>@@ -2298,7 +2327,7 @@ void TParseContext::checkLocalVariableConstStorageQualifier(const TQualifierWrap
>         {
>             error(storageQualifier.getLine(),
>                   "Local variables can only use the const storage qualifier.",
>-                  storageQualifier.getQualifierString().c_str());
>+                  storageQualifier.getQualifierString());
>         }
>     }
> }
>@@ -2337,11 +2366,6 @@ void TParseContext::checkAtomicCounterOffsetDoesNotOverlap(bool forceAppend,
>                                                            const TSourceLoc &loc,
>                                                            TType *type)
> {
>-    if (!IsAtomicCounter(type->getBasicType()))
>-    {
>-        return;
>-    }
>-
>     const size_t size = type->isArray() ? kAtomicCounterArrayStride * type->getArraySizeProduct()
>                                         : kAtomicCounterSize;
>     TLayoutQualifier layoutQualifier = type->getLayoutQualifier();
>@@ -2364,8 +2388,19 @@ void TParseContext::checkAtomicCounterOffsetDoesNotOverlap(bool forceAppend,
>     type->setLayoutQualifier(layoutQualifier);
> }
> 
>+void TParseContext::checkAtomicCounterOffsetAlignment(const TSourceLoc &location, const TType &type)
>+{
>+    TLayoutQualifier layoutQualifier = type.getLayoutQualifier();
>+
>+    // OpenGL ES 3.1 Table 6.5, Atomic counter offset must be a multiple of 4
>+    if (layoutQualifier.offset % 4 != 0)
>+    {
>+        error(location, "Offset must be multiple of 4", "atomic counter");
>+    }
>+}
>+
> void TParseContext::checkGeometryShaderInputAndSetArraySize(const TSourceLoc &location,
>-                                                            const char *token,
>+                                                            const ImmutableString &token,
>                                                             TType *type)
> {
>     if (IsGeometryShaderInput(mShaderType, type->getQualifier()))
>@@ -2376,8 +2411,9 @@ void TParseContext::checkGeometryShaderInputAndSetArraySize(const TSourceLoc &lo
>             // input primitive declaration.
>             if (mGeometryShaderInputPrimitiveType != EptUndefined)
>             {
>-                ASSERT(mGeometryShaderInputArraySize > 0u);
>-                type->sizeOutermostUnsizedArray(mGeometryShaderInputArraySize);
>+                ASSERT(symbolTable.getGlInVariableWithArraySize() != nullptr);
>+                type->sizeOutermostUnsizedArray(
>+                    symbolTable.getGlInVariableWithArraySize()->getType().getOutermostArraySize());
>             }
>             else
>             {
>@@ -2404,13 +2440,13 @@ void TParseContext::checkGeometryShaderInputAndSetArraySize(const TSourceLoc &lo
> TIntermDeclaration *TParseContext::parseSingleDeclaration(
>     TPublicType &publicType,
>     const TSourceLoc &identifierOrTypeLocation,
>-    const TString &identifier)
>+    const ImmutableString &identifier)
> {
>-    TType type(publicType);
>+    TType *type = new TType(publicType);
>     if ((mCompileOptions & SH_FLATTEN_PRAGMA_STDGL_INVARIANT_ALL) &&
>         mDirectiveHandler.pragma().stdgl.invariantAll)
>     {
>-        TQualifier qualifier = type.getQualifier();
>+        TQualifier qualifier = type->getQualifier();
> 
>         // The directive handler has already taken care of rejecting invalid uses of this pragma
>         // (for example, in ESSL 3.00 fragment shaders), so at this point, flatten it into all
>@@ -2430,27 +2466,29 @@ TIntermDeclaration *TParseContext::parseSingleDeclaration(
>         // behavior of the #pragma when specified in ESSL 1.00 fragment shaders.
>         if (qualifier == EvqVaryingOut || qualifier == EvqVertexOut || qualifier == EvqVaryingIn)
>         {
>-            type.setInvariant(true);
>+            type->setInvariant(true);
>         }
>     }
> 
>-    checkGeometryShaderInputAndSetArraySize(identifierOrTypeLocation, identifier.c_str(), &type);
>+    checkGeometryShaderInputAndSetArraySize(identifierOrTypeLocation, identifier, type);
> 
>     declarationQualifierErrorCheck(publicType.qualifier, publicType.layoutQualifier,
>                                    identifierOrTypeLocation);
> 
>-    bool emptyDeclaration = (identifier == "");
>+    bool emptyDeclaration                  = (identifier == "");
>     mDeferredNonEmptyDeclarationErrorCheck = emptyDeclaration;
> 
>     TIntermSymbol *symbol = nullptr;
>     if (emptyDeclaration)
>     {
>-        emptyDeclarationErrorCheck(type, identifierOrTypeLocation);
>+        emptyDeclarationErrorCheck(*type, identifierOrTypeLocation);
>         // In most cases we don't need to create a symbol node for an empty declaration.
>         // But if the empty declaration is declaring a struct type, the symbol node will store that.
>-        if (type.getBasicType() == EbtStruct)
>+        if (type->getBasicType() == EbtStruct)
>         {
>-            symbol = new TIntermSymbol(symbolTable.getEmptySymbolId(), "", type);
>+            TVariable *emptyVariable =
>+                new TVariable(&symbolTable, kEmptyImmutableString, type, SymbolType::Empty);
>+            symbol = new TIntermSymbol(emptyVariable);
>         }
>         else if (IsAtomicCounter(publicType.getBasicType()))
>         {
>@@ -2461,16 +2499,19 @@ TIntermDeclaration *TParseContext::parseSingleDeclaration(
>     {
>         nonEmptyDeclarationErrorCheck(publicType, identifierOrTypeLocation);
> 
>-        checkCanBeDeclaredWithoutInitializer(identifierOrTypeLocation, identifier, &type);
>+        checkCanBeDeclaredWithoutInitializer(identifierOrTypeLocation, identifier, type);
> 
>-        checkAtomicCounterOffsetDoesNotOverlap(false, identifierOrTypeLocation, &type);
>+        if (IsAtomicCounter(type->getBasicType()))
>+        {
>+            checkAtomicCounterOffsetDoesNotOverlap(false, identifierOrTypeLocation, type);
> 
>-        TVariable *variable = nullptr;
>-        declareVariable(identifierOrTypeLocation, identifier, type, &variable);
>+            checkAtomicCounterOffsetAlignment(identifierOrTypeLocation, *type);
>+        }
> 
>-        if (variable)
>+        TVariable *variable = nullptr;
>+        if (declareVariable(identifierOrTypeLocation, identifier, type, &variable))
>         {
>-            symbol = new TIntermSymbol(variable->getUniqueId(), identifier, type);
>+            symbol = new TIntermSymbol(variable);
>         }
>     }
> 
>@@ -2487,7 +2528,7 @@ TIntermDeclaration *TParseContext::parseSingleDeclaration(
> TIntermDeclaration *TParseContext::parseSingleArrayDeclaration(
>     TPublicType &elementType,
>     const TSourceLoc &identifierLocation,
>-    const TString &identifier,
>+    const ImmutableString &identifier,
>     const TSourceLoc &indexLocation,
>     const TVector<unsigned int> &arraySizes)
> {
>@@ -2500,24 +2541,27 @@ TIntermDeclaration *TParseContext::parseSingleArrayDeclaration(
> 
>     checkIsValidTypeAndQualifierForArray(indexLocation, elementType);
> 
>-    TType arrayType(elementType);
>-    arrayType.makeArrays(arraySizes);
>+    TType *arrayType = new TType(elementType);
>+    arrayType->makeArrays(arraySizes);
> 
>-    checkGeometryShaderInputAndSetArraySize(indexLocation, identifier.c_str(), &arrayType);
>+    checkGeometryShaderInputAndSetArraySize(indexLocation, identifier, arrayType);
> 
>-    checkCanBeDeclaredWithoutInitializer(identifierLocation, identifier, &arrayType);
>+    checkCanBeDeclaredWithoutInitializer(identifierLocation, identifier, arrayType);
> 
>-    checkAtomicCounterOffsetDoesNotOverlap(false, identifierLocation, &arrayType);
>+    if (IsAtomicCounter(arrayType->getBasicType()))
>+    {
>+        checkAtomicCounterOffsetDoesNotOverlap(false, identifierLocation, arrayType);
> 
>-    TVariable *variable = nullptr;
>-    declareVariable(identifierLocation, identifier, arrayType, &variable);
>+        checkAtomicCounterOffsetAlignment(identifierLocation, *arrayType);
>+    }
> 
>     TIntermDeclaration *declaration = new TIntermDeclaration();
>     declaration->setLine(identifierLocation);
> 
>-    if (variable)
>+    TVariable *variable = nullptr;
>+    if (declareVariable(identifierLocation, identifier, arrayType, &variable))
>     {
>-        TIntermSymbol *symbol = new TIntermSymbol(variable->getUniqueId(), identifier, arrayType);
>+        TIntermSymbol *symbol = new TIntermSymbol(variable);
>         symbol->setLine(identifierLocation);
>         declaration->appendDeclarator(symbol);
>     }
>@@ -2527,7 +2571,7 @@ TIntermDeclaration *TParseContext::parseSingleArrayDeclaration(
> 
> TIntermDeclaration *TParseContext::parseSingleInitDeclaration(const TPublicType &publicType,
>                                                               const TSourceLoc &identifierLocation,
>-                                                              const TString &identifier,
>+                                                              const ImmutableString &identifier,
>                                                               const TSourceLoc &initLocation,
>                                                               TIntermTyped *initializer)
> {
>@@ -2542,7 +2586,7 @@ TIntermDeclaration *TParseContext::parseSingleInitDeclaration(const TPublicType
>     declaration->setLine(identifierLocation);
> 
>     TIntermBinary *initNode = nullptr;
>-    TType type(publicType);
>+    TType *type             = new TType(publicType);
>     if (executeInitializer(identifierLocation, identifier, type, initializer, &initNode))
>     {
>         if (initNode)
>@@ -2556,7 +2600,7 @@ TIntermDeclaration *TParseContext::parseSingleInitDeclaration(const TPublicType
> TIntermDeclaration *TParseContext::parseSingleArrayInitDeclaration(
>     TPublicType &elementType,
>     const TSourceLoc &identifierLocation,
>-    const TString &identifier,
>+    const ImmutableString &identifier,
>     const TSourceLoc &indexLocation,
>     const TVector<unsigned int> &arraySizes,
>     const TSourceLoc &initLocation,
>@@ -2571,8 +2615,8 @@ TIntermDeclaration *TParseContext::parseSingleArrayInitDeclaration(
> 
>     checkIsValidTypeAndQualifierForArray(indexLocation, elementType);
> 
>-    TType arrayType(elementType);
>-    arrayType.makeArrays(arraySizes);
>+    TType *arrayType = new TType(elementType);
>+    arrayType->makeArrays(arraySizes);
> 
>     TIntermDeclaration *declaration = new TIntermDeclaration();
>     declaration->setLine(identifierLocation);
>@@ -2593,14 +2637,14 @@ TIntermDeclaration *TParseContext::parseSingleArrayInitDeclaration(
> TIntermInvariantDeclaration *TParseContext::parseInvariantDeclaration(
>     const TTypeQualifierBuilder &typeQualifierBuilder,
>     const TSourceLoc &identifierLoc,
>-    const TString *identifier,
>+    const ImmutableString &identifier,
>     const TSymbol *symbol)
> {
>     TTypeQualifier typeQualifier = typeQualifierBuilder.getVariableTypeQualifier(mDiagnostics);
> 
>     if (!typeQualifier.invariant)
>     {
>-        error(identifierLoc, "Expected invariant", identifier->c_str());
>+        error(identifierLoc, "Expected invariant", identifier);
>         return nullptr;
>     }
>     if (!checkIsAtGlobalLevel(identifierLoc, "invariant varying"))
>@@ -2609,7 +2653,7 @@ TIntermInvariantDeclaration *TParseContext::parseInvariantDeclaration(
>     }
>     if (!symbol)
>     {
>-        error(identifierLoc, "undeclared identifier declared as invariant", identifier->c_str());
>+        error(identifierLoc, "undeclared identifier declared as invariant", identifier);
>         return nullptr;
>     }
>     if (!IsQualifierUnspecified(typeQualifier.qualifier))
>@@ -2638,9 +2682,9 @@ TIntermInvariantDeclaration *TParseContext::parseInvariantDeclaration(
>                                     typeQualifier.line);
>     checkMemoryQualifierIsNotSpecified(typeQualifier.memoryQualifier, typeQualifier.line);
> 
>-    symbolTable.addInvariantVarying(std::string(identifier->c_str()));
>+    symbolTable.addInvariantVarying(*variable);
> 
>-    TIntermSymbol *intermSymbol = new TIntermSymbol(variable->getUniqueId(), *identifier, type);
>+    TIntermSymbol *intermSymbol = new TIntermSymbol(variable);
>     intermSymbol->setLine(identifierLoc);
> 
>     return new TIntermInvariantDeclaration(intermSymbol, identifierLoc);
>@@ -2648,7 +2692,7 @@ TIntermInvariantDeclaration *TParseContext::parseInvariantDeclaration(
> 
> void TParseContext::parseDeclarator(TPublicType &publicType,
>                                     const TSourceLoc &identifierLocation,
>-                                    const TString &identifier,
>+                                    const ImmutableString &identifier,
>                                     TIntermDeclaration *declarationOut)
> {
>     // If the declaration starting this declarator list was empty (example: int,), some checks were
>@@ -2661,20 +2705,23 @@ void TParseContext::parseDeclarator(TPublicType &publicType,
> 
>     checkDeclaratorLocationIsNotSpecified(identifierLocation, publicType);
> 
>-    TVariable *variable = nullptr;
>-    TType type(publicType);
>+    TType *type = new TType(publicType);
> 
>-    checkGeometryShaderInputAndSetArraySize(identifierLocation, identifier.c_str(), &type);
>+    checkGeometryShaderInputAndSetArraySize(identifierLocation, identifier, type);
> 
>-    checkCanBeDeclaredWithoutInitializer(identifierLocation, identifier, &type);
>+    checkCanBeDeclaredWithoutInitializer(identifierLocation, identifier, type);
> 
>-    checkAtomicCounterOffsetDoesNotOverlap(true, identifierLocation, &type);
>+    if (IsAtomicCounter(type->getBasicType()))
>+    {
>+        checkAtomicCounterOffsetDoesNotOverlap(true, identifierLocation, type);
> 
>-    declareVariable(identifierLocation, identifier, type, &variable);
>+        checkAtomicCounterOffsetAlignment(identifierLocation, *type);
>+    }
> 
>-    if (variable)
>+    TVariable *variable = nullptr;
>+    if (declareVariable(identifierLocation, identifier, type, &variable))
>     {
>-        TIntermSymbol *symbol = new TIntermSymbol(variable->getUniqueId(), identifier, type);
>+        TIntermSymbol *symbol = new TIntermSymbol(variable);
>         symbol->setLine(identifierLocation);
>         declarationOut->appendDeclarator(symbol);
>     }
>@@ -2682,7 +2729,7 @@ void TParseContext::parseDeclarator(TPublicType &publicType,
> 
> void TParseContext::parseArrayDeclarator(TPublicType &elementType,
>                                          const TSourceLoc &identifierLocation,
>-                                         const TString &identifier,
>+                                         const ImmutableString &identifier,
>                                          const TSourceLoc &arrayLocation,
>                                          const TVector<unsigned int> &arraySizes,
>                                          TIntermDeclaration *declarationOut)
>@@ -2699,22 +2746,24 @@ void TParseContext::parseArrayDeclarator(TPublicType &elementType,
> 
>     if (checkIsValidTypeAndQualifierForArray(arrayLocation, elementType))
>     {
>-        TType arrayType(elementType);
>-        arrayType.makeArrays(arraySizes);
>+        TType *arrayType = new TType(elementType);
>+        arrayType->makeArrays(arraySizes);
> 
>-        checkGeometryShaderInputAndSetArraySize(identifierLocation, identifier.c_str(), &arrayType);
>+        checkGeometryShaderInputAndSetArraySize(identifierLocation, identifier, arrayType);
> 
>-        checkCanBeDeclaredWithoutInitializer(identifierLocation, identifier, &arrayType);
>+        checkCanBeDeclaredWithoutInitializer(identifierLocation, identifier, arrayType);
> 
>-        checkAtomicCounterOffsetDoesNotOverlap(true, identifierLocation, &arrayType);
>+        if (IsAtomicCounter(arrayType->getBasicType()))
>+        {
>+            checkAtomicCounterOffsetDoesNotOverlap(true, identifierLocation, arrayType);
> 
>-        TVariable *variable = nullptr;
>-        declareVariable(identifierLocation, identifier, arrayType, &variable);
>+            checkAtomicCounterOffsetAlignment(identifierLocation, *arrayType);
>+        }
> 
>-        if (variable)
>+        TVariable *variable = nullptr;
>+        if (declareVariable(identifierLocation, identifier, arrayType, &variable))
>         {
>-            TIntermSymbol *symbol =
>-                new TIntermSymbol(variable->getUniqueId(), identifier, arrayType);
>+            TIntermSymbol *symbol = new TIntermSymbol(variable);
>             symbol->setLine(identifierLocation);
>             declarationOut->appendDeclarator(symbol);
>         }
>@@ -2723,7 +2772,7 @@ void TParseContext::parseArrayDeclarator(TPublicType &elementType,
> 
> void TParseContext::parseInitDeclarator(const TPublicType &publicType,
>                                         const TSourceLoc &identifierLocation,
>-                                        const TString &identifier,
>+                                        const ImmutableString &identifier,
>                                         const TSourceLoc &initLocation,
>                                         TIntermTyped *initializer,
>                                         TIntermDeclaration *declarationOut)
>@@ -2739,7 +2788,7 @@ void TParseContext::parseInitDeclarator(const TPublicType &publicType,
>     checkDeclaratorLocationIsNotSpecified(identifierLocation, publicType);
> 
>     TIntermBinary *initNode = nullptr;
>-    TType type(publicType);
>+    TType *type             = new TType(publicType);
>     if (executeInitializer(identifierLocation, identifier, type, initializer, &initNode))
>     {
>         //
>@@ -2754,7 +2803,7 @@ void TParseContext::parseInitDeclarator(const TPublicType &publicType,
> 
> void TParseContext::parseArrayInitDeclarator(const TPublicType &elementType,
>                                              const TSourceLoc &identifierLocation,
>-                                             const TString &identifier,
>+                                             const ImmutableString &identifier,
>                                              const TSourceLoc &indexLocation,
>                                              const TVector<unsigned int> &arraySizes,
>                                              const TSourceLoc &initLocation,
>@@ -2773,8 +2822,8 @@ void TParseContext::parseArrayInitDeclarator(const TPublicType &elementType,
> 
>     checkIsValidTypeAndQualifierForArray(indexLocation, elementType);
> 
>-    TType arrayType(elementType);
>-    arrayType.makeArrays(arraySizes);
>+    TType *arrayType = new TType(elementType);
>+    arrayType->makeArrays(arraySizes);
> 
>     // initNode will correspond to the whole of "b[n] = initializer".
>     TIntermBinary *initNode = nullptr;
>@@ -2854,11 +2903,7 @@ bool TParseContext::checkPrimitiveTypeMatchesTypeQualifier(const TTypeQualifier
> void TParseContext::setGeometryShaderInputArraySize(unsigned int inputArraySize,
>                                                     const TSourceLoc &line)
> {
>-    if (mGeometryShaderInputArraySize == 0u)
>-    {
>-        mGeometryShaderInputArraySize = inputArraySize;
>-    }
>-    else if (mGeometryShaderInputArraySize != inputArraySize)
>+    if (!symbolTable.setGlInArraySize(inputArraySize))
>     {
>         error(line,
>               "Array size or input primitive declaration doesn't match the size of earlier sized "
>@@ -2995,6 +3040,8 @@ void TParseContext::parseGlobalLayoutQualifier(const TTypeQualifierBuilder &type
>         return;
>     }
> 
>+    checkIndexIsNotSpecified(typeQualifier.line, layoutQualifier.index);
>+
>     checkBindingIsNotSpecified(typeQualifier.line, layoutQualifier.binding);
> 
>     checkMemoryQualifierIsNotSpecified(typeQualifier.memoryQualifier, typeQualifier.line);
>@@ -3031,7 +3078,7 @@ void TParseContext::parseGlobalLayoutQualifier(const TTypeQualifierBuilder &type
>         }
> 
>         const TVariable *maxComputeWorkGroupSize = static_cast<const TVariable *>(
>-            symbolTable.findBuiltIn("gl_MaxComputeWorkGroupSize", mShaderVersion));
>+            symbolTable.findBuiltIn(ImmutableString("gl_MaxComputeWorkGroupSize"), mShaderVersion));
> 
>         const TConstantUnion *maxComputeWorkGroupSizeData =
>             maxComputeWorkGroupSize->getConstPointer();
>@@ -3045,7 +3092,7 @@ void TParseContext::parseGlobalLayoutQualifier(const TTypeQualifierBuilder &type
>                 if (mComputeShaderLocalSize[i] < 1 ||
>                     mComputeShaderLocalSize[i] > maxComputeWorkGroupSizeValue)
>                 {
>-                    std::stringstream reasonStream;
>+                    std::stringstream reasonStream = sh::InitializeStream<std::stringstream>();
>                     reasonStream << "invalid value: Value must be at least 1 and no greater than "
>                                  << maxComputeWorkGroupSizeValue;
>                     const std::string &reason = reasonStream.str();
>@@ -3085,7 +3132,7 @@ void TParseContext::parseGlobalLayoutQualifier(const TTypeQualifierBuilder &type
>             return;
>         }
>     }
>-    else if (isExtensionEnabled(TExtension::OVR_multiview) &&
>+    else if (isExtensionEnabled(TExtension::OVR_multiview2) &&
>              typeQualifier.qualifier == EvqVertexIn)
>     {
>         // This error is only specified in WebGL, but tightens unspecified behavior in the native
>@@ -3166,59 +3213,38 @@ TIntermFunctionPrototype *TParseContext::createPrototypeNodeFromFunction(
>     const TSourceLoc &location,
>     bool insertParametersToSymbolTable)
> {
>-    checkIsNotReserved(location, function.getName());
>+    checkIsNotReserved(location, function.name());
> 
>-    TIntermFunctionPrototype *prototype =
>-        new TIntermFunctionPrototype(function.getReturnType(), TSymbolUniqueId(function));
>-    // TODO(oetuaho@nvidia.com): Instead of converting the function information here, the node could
>-    // point to the data that already exists in the symbol table.
>-    prototype->getFunctionSymbolInfo()->setFromFunction(function);
>+    TIntermFunctionPrototype *prototype = new TIntermFunctionPrototype(&function);
>     prototype->setLine(location);
> 
>     for (size_t i = 0; i < function.getParamCount(); i++)
>     {
>-        const TConstParameter &param = function.getParam(i);
>-
>-        TIntermSymbol *symbol = nullptr;
>+        const TVariable *param = function.getParam(i);
> 
>         // If the parameter has no name, it's not an error, just don't add it to symbol table (could
>         // be used for unused args).
>-        if (param.name != nullptr)
>+        if (param->symbolType() != SymbolType::Empty)
>         {
>-            // Insert the parameter in the symbol table.
>             if (insertParametersToSymbolTable)
>             {
>-                TVariable *variable = symbolTable.declareVariable(param.name, *param.type);
>-                if (variable)
>-                {
>-                    symbol = new TIntermSymbol(variable->getUniqueId(), variable->getName(),
>-                                               variable->getType());
>-                }
>-                else
>+                if (!symbolTable.declare(const_cast<TVariable *>(param)))
>                 {
>-                    error(location, "redefinition", param.name->c_str());
>+                    error(location, "redefinition", param->name());
>                 }
>             }
>             // Unsized type of a named parameter should have already been checked and sanitized.
>-            ASSERT(!param.type->isUnsizedArray());
>+            ASSERT(!param->getType().isUnsizedArray());
>         }
>         else
>         {
>-            if (param.type->isUnsizedArray())
>+            if (param->getType().isUnsizedArray())
>             {
>                 error(location, "function parameter array must be sized at compile time", "[]");
>                 // We don't need to size the arrays since the parameter is unnamed and hence
>                 // inaccessible.
>             }
>         }
>-        if (!symbol)
>-        {
>-            // The parameter had no name or declaring the symbol failed - either way, add a nameless
>-            // symbol.
>-            symbol = new TIntermSymbol(symbolTable.getEmptySymbolId(), "", *param.type);
>-        }
>-        symbol->setLine(location);
>-        prototype->appendParameter(symbol);
>     }
>     return prototype;
> }
>@@ -3230,21 +3256,19 @@ TIntermFunctionPrototype *TParseContext::addFunctionPrototypeDeclaration(
>     // Note: function found from the symbol table could be the same as parsedFunction if this is the
>     // first declaration. Either way the instance in the symbol table is used to track whether the
>     // function is declared multiple times.
>-    TFunction *function = static_cast<TFunction *>(
>-        symbolTable.find(parsedFunction.getMangledName(), getShaderVersion()));
>-    if (function->hasPrototypeDeclaration() && mShaderVersion == 100)
>+    bool hadPrototypeDeclaration = false;
>+    const TFunction *function    = symbolTable.markFunctionHasPrototypeDeclaration(
>+        parsedFunction.getMangledName(), &hadPrototypeDeclaration);
>+
>+    if (hadPrototypeDeclaration && mShaderVersion == 100)
>     {
>         // ESSL 1.00.17 section 4.2.7.
>         // Doesn't apply to ESSL 3.00.4: see section 4.2.3.
>         error(location, "duplicate function prototype declarations are not allowed", "function");
>     }
>-    function->setHasPrototypeDeclaration();
> 
>-    // WebKit note: We currently pass true instead of false for the last parameter
>-    // here because some compilers have an issue with nameless parameters in function
>-    // declarations.
>     TIntermFunctionPrototype *prototype =
>-        createPrototypeNodeFromFunction(*function, location, true);
>+        createPrototypeNodeFromFunction(*function, location, false);
> 
>     symbolTable.pop();
> 
>@@ -3265,8 +3289,8 @@ TIntermFunctionDefinition *TParseContext::addFunctionDefinition(
>     // Check that non-void functions have at least one return statement.
>     if (mCurrentFunctionType->getBasicType() != EbtVoid && !mFunctionReturnsValue)
>     {
>-        error(location, "function does not return a value:",
>-              functionPrototype->getFunctionSymbolInfo()->getName().c_str());
>+        error(location,
>+              "function does not return a value:", functionPrototype->getFunction()->name());
>     }
> 
>     if (functionBody == nullptr)
>@@ -3283,49 +3307,23 @@ TIntermFunctionDefinition *TParseContext::addFunctionDefinition(
> }
> 
> void TParseContext::parseFunctionDefinitionHeader(const TSourceLoc &location,
>-                                                  TFunction **function,
>+                                                  const TFunction *function,
>                                                   TIntermFunctionPrototype **prototypeOut)
> {
>     ASSERT(function);
>-    ASSERT(*function);
>-    const TSymbol *builtIn =
>-        symbolTable.findBuiltIn((*function)->getMangledName(), getShaderVersion());
> 
>-    if (builtIn)
>-    {
>-        error(location, "built-in functions cannot be redefined", (*function)->getName().c_str());
>-    }
>-    else
>+    bool wasDefined = false;
>+    function        = symbolTable.setFunctionParameterNamesFromDefinition(function, &wasDefined);
>+    if (wasDefined)
>     {
>-        TFunction *prevDec = static_cast<TFunction *>(
>-            symbolTable.find((*function)->getMangledName(), getShaderVersion()));
>-
>-        // Note: 'prevDec' could be 'function' if this is the first time we've seen function as it
>-        // would have just been put in the symbol table. Otherwise, we're looking up an earlier
>-        // occurance.
>-        if (*function != prevDec)
>-        {
>-            // Swap the parameters of the previous declaration to the parameters of the function
>-            // definition (parameter names may differ).
>-            prevDec->swapParameters(**function);
>-
>-            // The function definition will share the same symbol as any previous declaration.
>-            *function = prevDec;
>-        }
>-
>-        if ((*function)->isDefined())
>-        {
>-            error(location, "function already has a body", (*function)->getName().c_str());
>-        }
>-
>-        (*function)->setDefined();
>+        error(location, "function already has a body", function->name());
>     }
> 
>     // Remember the return type for later checking for return statements.
>-    mCurrentFunctionType  = &((*function)->getReturnType());
>+    mCurrentFunctionType  = &(function->getReturnType());
>     mFunctionReturnsValue = false;
> 
>-    *prototypeOut = createPrototypeNodeFromFunction(**function, location, true);
>+    *prototypeOut = createPrototypeNodeFromFunction(*function, location, true);
>     setLoopNestingLevel(0);
> }
> 
>@@ -3336,33 +3334,48 @@ TFunction *TParseContext::parseFunctionDeclarator(const TSourceLoc &location, TF
>     // The definition production code will check for redefinitions.
>     // In the case of ESSL 1.00 the prototype production code will also check for redeclarations.
>     //
>-    // Return types and parameter qualifiers must match in all redeclarations, so those are checked
>-    // here.
>-    //
>-    TFunction *prevDec =
>-        static_cast<TFunction *>(symbolTable.find(function->getMangledName(), getShaderVersion()));
> 
>     for (size_t i = 0u; i < function->getParamCount(); ++i)
>     {
>-        auto &param = function->getParam(i);
>-        if (param.type->isStructSpecifier())
>+        const TVariable *param = function->getParam(i);
>+        if (param->getType().isStructSpecifier())
>         {
>             // ESSL 3.00.6 section 12.10.
>             error(location, "Function parameter type cannot be a structure definition",
>-                  function->getName().c_str());
>+                  function->name());
>         }
>     }
> 
>-    if (getShaderVersion() >= 300 &&
>-        symbolTable.hasUnmangledBuiltInForShaderVersion(function->getName().c_str(),
>-                                                        getShaderVersion()))
>+    if (getShaderVersion() >= 300)
>+    {
>+        const UnmangledBuiltIn *builtIn =
>+            symbolTable.getUnmangledBuiltInForShaderVersion(function->name(), getShaderVersion());
>+        if (builtIn &&
>+            (builtIn->extension == TExtension::UNDEFINED || isExtensionEnabled(builtIn->extension)))
>+        {
>+            // With ESSL 3.00 and above, names of built-in functions cannot be redeclared as
>+            // functions. Therefore overloading or redefining builtin functions is an error.
>+            error(location, "Name of a built-in function cannot be redeclared as function",
>+                  function->name());
>+        }
>+    }
>+    else
>     {
>-        // With ESSL 3.00 and above, names of built-in functions cannot be redeclared as functions.
>-        // Therefore overloading or redefining builtin functions is an error.
>-        error(location, "Name of a built-in function cannot be redeclared as function",
>-              function->getName().c_str());
>+        // ESSL 1.00.17 section 4.2.6: built-ins can be overloaded but not redefined. We assume that
>+        // this applies to redeclarations as well.
>+        const TSymbol *builtIn =
>+            symbolTable.findBuiltIn(function->getMangledName(), getShaderVersion());
>+        if (builtIn)
>+        {
>+            error(location, "built-in functions cannot be redefined", function->name());
>+        }
>     }
>-    else if (prevDec)
>+
>+    // Return types and parameter qualifiers must match in all redeclarations, so those are checked
>+    // here.
>+    const TFunction *prevDec =
>+        static_cast<const TFunction *>(symbolTable.findGlobal(function->getMangledName()));
>+    if (prevDec)
>     {
>         if (prevDec->getReturnType() != function->getReturnType())
>         {
>@@ -3371,39 +3384,34 @@ TFunction *TParseContext::parseFunctionDeclarator(const TSourceLoc &location, TF
>         }
>         for (size_t i = 0; i < prevDec->getParamCount(); ++i)
>         {
>-            if (prevDec->getParam(i).type->getQualifier() !=
>-                function->getParam(i).type->getQualifier())
>+            if (prevDec->getParam(i)->getType().getQualifier() !=
>+                function->getParam(i)->getType().getQualifier())
>             {
>                 error(location,
>                       "function must have the same parameter qualifiers in all of its declarations",
>-                      function->getParam(i).type->getQualifierString());
>+                      function->getParam(i)->getType().getQualifierString());
>             }
>         }
>     }
> 
>-    //
>     // Check for previously declared variables using the same name.
>-    //
>-    TSymbol *prevSym = symbolTable.find(function->getName(), getShaderVersion());
>+    const TSymbol *prevSym   = symbolTable.find(function->name(), getShaderVersion());
>+    bool insertUnmangledName = true;
>     if (prevSym)
>     {
>         if (!prevSym->isFunction())
>         {
>-            error(location, "redefinition of a function", function->getName().c_str());
>+            error(location, "redefinition of a function", function->name());
>         }
>+        insertUnmangledName = false;
>     }
>-    else
>-    {
>-        // Insert the unmangled name to detect potential future redefinition as a variable.
>-        symbolTable.getOuterLevel()->insertUnmangled(function);
>-    }
>-
>-    // We're at the inner scope level of the function's arguments and body statement.
>-    // Add the function prototype to the surrounding scope instead.
>-    symbolTable.getOuterLevel()->insert(function);
>+    // Parsing is at the inner scope level of the function's arguments and body statement at this
>+    // point, but declareUserDefinedFunction takes care of declaring the function at the global
>+    // scope.
>+    symbolTable.declareUserDefinedFunction(function, insertUnmangledName);
> 
>     // Raise error message if main function takes any parameters or return anything other than void
>-    if (function->getName() == "main")
>+    if (function->isMain())
>     {
>         if (function->getParamCount() > 0)
>         {
>@@ -3425,7 +3433,7 @@ TFunction *TParseContext::parseFunctionDeclarator(const TSourceLoc &location, TF
> }
> 
> TFunction *TParseContext::parseFunctionHeader(const TPublicType &type,
>-                                              const TString *name,
>+                                              const ImmutableString &name,
>                                               const TSourceLoc &location)
> {
>     if (type.qualifier != EvqGlobal && type.qualifier != EvqTemporary)
>@@ -3450,22 +3458,24 @@ TFunction *TParseContext::parseFunctionHeader(const TPublicType &type,
>         if (type.isStructureContainingArrays())
>         {
>             // ESSL 1.00.17 section 6.1 Function Definitions
>+            TInfoSinkBase typeString;
>+            typeString << TType(type);
>             error(location, "structures containing arrays can't be function return values",
>-                  TType(type).getCompleteString().c_str());
>+                  typeString.c_str());
>         }
>     }
> 
>     // Add the function as a prototype after parsing it (we do not support recursion)
>-    return new TFunction(&symbolTable, name, new TType(type));
>+    return new TFunction(&symbolTable, name, SymbolType::UserDefined, new TType(type), false);
> }
> 
>-TFunction *TParseContext::addNonConstructorFunc(const TString *name, const TSourceLoc &loc)
>+TFunctionLookup *TParseContext::addNonConstructorFunc(const ImmutableString &name,
>+                                                      const TSymbol *symbol)
> {
>-    const TType *returnType = TCache::getType(EbtVoid, EbpUndefined);
>-    return new TFunction(&symbolTable, name, returnType);
>+    return TFunctionLookup::CreateFunctionCall(name, symbol);
> }
> 
>-TFunction *TParseContext::addConstructorFunc(const TPublicType &publicType)
>+TFunctionLookup *TParseContext::addConstructorFunc(const TPublicType &publicType)
> {
>     if (mShaderVersion < 300 && publicType.isArray())
>     {
>@@ -3485,13 +3495,12 @@ TFunction *TParseContext::addConstructorFunc(const TPublicType &publicType)
>               getBasicString(publicType.getBasicType()));
>         type->setBasicType(EbtFloat);
>     }
>-
>-    return new TFunction(&symbolTable, nullptr, type, EOpConstruct);
>+    return TFunctionLookup::CreateConstructor(type);
> }
> 
> void TParseContext::checkIsNotUnsizedArray(const TSourceLoc &line,
>                                            const char *errorMessage,
>-                                           const char *token,
>+                                           const ImmutableString &token,
>                                            TType *arrayType)
> {
>     if (arrayType->isUnsizedArray())
>@@ -3502,30 +3511,29 @@ void TParseContext::checkIsNotUnsizedArray(const TSourceLoc &line,
> }
> 
> TParameter TParseContext::parseParameterDeclarator(TType *type,
>-                                                   const TString *name,
>+                                                   const ImmutableString &name,
>                                                    const TSourceLoc &nameLoc)
> {
>     ASSERT(type);
>-    checkIsNotUnsizedArray(nameLoc, "function parameter array must specify a size", name->c_str(),
>-                           type);
>+    checkIsNotUnsizedArray(nameLoc, "function parameter array must specify a size", name, type);
>     if (type->getBasicType() == EbtVoid)
>     {
>-        error(nameLoc, "illegal use of type 'void'", name->c_str());
>+        error(nameLoc, "illegal use of type 'void'", name);
>     }
>-    checkIsNotReserved(nameLoc, *name);
>-    TParameter param = {name, type};
>+    checkIsNotReserved(nameLoc, name);
>+    TParameter param = {name.data(), type};
>     return param;
> }
> 
> TParameter TParseContext::parseParameterDeclarator(const TPublicType &publicType,
>-                                                   const TString *name,
>+                                                   const ImmutableString &name,
>                                                    const TSourceLoc &nameLoc)
> {
>     TType *type = new TType(publicType);
>     return parseParameterDeclarator(type, name, nameLoc);
> }
> 
>-TParameter TParseContext::parseParameterArrayDeclarator(const TString *name,
>+TParameter TParseContext::parseParameterArrayDeclarator(const ImmutableString &name,
>                                                         const TSourceLoc &nameLoc,
>                                                         const TVector<unsigned int> &arraySizes,
>                                                         const TSourceLoc &arrayLoc,
>@@ -3537,18 +3545,19 @@ TParameter TParseContext::parseParameterArrayDeclarator(const TString *name,
>     return parseParameterDeclarator(arrayType, name, nameLoc);
> }
> 
>-bool TParseContext::checkUnsizedArrayConstructorArgumentDimensionality(TIntermSequence *arguments,
>-                                                                       TType type,
>-                                                                       const TSourceLoc &line)
>+bool TParseContext::checkUnsizedArrayConstructorArgumentDimensionality(
>+    const TIntermSequence &arguments,
>+    TType type,
>+    const TSourceLoc &line)
> {
>-    if (arguments->empty())
>+    if (arguments.empty())
>     {
>         error(line, "implicitly sized array constructor must have at least one argument", "[]");
>         return false;
>     }
>-    for (TIntermNode *arg : *arguments)
>+    for (TIntermNode *arg : arguments)
>     {
>-        TIntermTyped *element = arg->getAsTyped();
>+        const TIntermTyped *element = arg->getAsTyped();
>         ASSERT(element);
>         size_t dimensionalityFromElement = element->getType().getNumArraySizes() + 1u;
>         if (dimensionalityFromElement > type.getNumArraySizes())
>@@ -3581,10 +3590,10 @@ bool TParseContext::checkUnsizedArrayConstructorArgumentDimensionality(TIntermSe
> //
> // Returns a node to add to the tree regardless of if an error was generated or not.
> //
>-TIntermTyped *TParseContext::addConstructor(TIntermSequence *arguments,
>-                                            TType type,
>-                                            const TSourceLoc &line)
>+TIntermTyped *TParseContext::addConstructor(TFunctionLookup *fnCall, const TSourceLoc &line)
> {
>+    TType type                 = fnCall->constructorType();
>+    TIntermSequence &arguments = fnCall->arguments();
>     if (type.isUnsizedArray())
>     {
>         if (!checkUnsizedArrayConstructorArgumentDimensionality(arguments, type, line))
>@@ -3592,11 +3601,11 @@ TIntermTyped *TParseContext::addConstructor(TIntermSequence *arguments,
>             type.sizeUnsizedArrays(nullptr);
>             return CreateZeroNode(type);
>         }
>-        TIntermTyped *firstElement = arguments->at(0)->getAsTyped();
>+        TIntermTyped *firstElement = arguments.at(0)->getAsTyped();
>         ASSERT(firstElement);
>         if (type.getOutermostArraySize() == 0u)
>         {
>-            type.sizeOutermostUnsizedArray(static_cast<unsigned int>(arguments->size()));
>+            type.sizeOutermostUnsizedArray(static_cast<unsigned int>(arguments.size()));
>         }
>         for (size_t i = 0; i < firstElement->getType().getNumArraySizes(); ++i)
>         {
>@@ -3613,27 +3622,22 @@ TIntermTyped *TParseContext::addConstructor(TIntermSequence *arguments,
>         return CreateZeroNode(type);
>     }
> 
>-    TIntermAggregate *constructorNode = TIntermAggregate::CreateConstructor(type, arguments);
>+    TIntermAggregate *constructorNode = TIntermAggregate::CreateConstructor(type, &arguments);
>     constructorNode->setLine(line);
> 
>-    // TODO(oetuaho@nvidia.com): Add support for folding array constructors.
>-    if (!constructorNode->isArray())
>-    {
>-        return constructorNode->fold(mDiagnostics);
>-    }
>-    return constructorNode;
>+    return constructorNode->fold(mDiagnostics);
> }
> 
> //
> // Interface/uniform blocks
>-// TODO(jiawei.shao@intel.com): implement GL_OES_shader_io_blocks.
>+// TODO(jiawei.shao@intel.com): implement GL_EXT_shader_io_blocks.
> //
> TIntermDeclaration *TParseContext::addInterfaceBlock(
>     const TTypeQualifierBuilder &typeQualifierBuilder,
>     const TSourceLoc &nameLine,
>-    const TString &blockName,
>+    const ImmutableString &blockName,
>     TFieldList *fieldList,
>-    const TString *instanceName,
>+    const ImmutableString &instanceName,
>     const TSourceLoc &instanceLine,
>     TIntermTyped *arrayIndex,
>     const TSourceLoc &arrayIndexLine)
>@@ -3672,6 +3676,8 @@ TIntermDeclaration *TParseContext::addInterfaceBlock(
>         arraySize = checkIsValidArraySize(arrayIndexLine, arrayIndex);
>     }
> 
>+    checkIndexIsNotSpecified(typeQualifier.line, typeQualifier.layoutQualifier.index);
>+
>     if (mShaderVersion < 310)
>     {
>         checkBindingIsNotSpecified(typeQualifier.line, typeQualifier.layoutQualifier.binding);
>@@ -3717,11 +3723,6 @@ TIntermDeclaration *TParseContext::addInterfaceBlock(
> 
>     checkInternalFormatIsNotSpecified(nameLine, blockLayoutQualifier.imageInternalFormat);
> 
>-    if (!symbolTable.declareInterfaceBlockName(&blockName))
>-    {
>-        error(nameLine, "redefinition of an interface block name", blockName.c_str());
>-    }
>-
>     // check for sampler types and apply layout qualifiers
>     for (size_t memberIndex = 0; memberIndex < fieldList->size(); ++memberIndex)
>     {
>@@ -3768,6 +3769,7 @@ TIntermDeclaration *TParseContext::addInterfaceBlock(
>         // check layout qualifiers
>         TLayoutQualifier fieldLayoutQualifier = fieldType->getLayoutQualifier();
>         checkLocationIsNotSpecified(field->line(), fieldLayoutQualifier);
>+        checkIndexIsNotSpecified(field->line(), fieldLayoutQualifier.index);
>         checkBindingIsNotSpecified(field->line(), fieldLayoutQualifier.binding);
> 
>         if (fieldLayoutQualifier.blockStorage != EbsUnspecified)
>@@ -3795,7 +3797,7 @@ TIntermDeclaration *TParseContext::addInterfaceBlock(
>             // ESSL 3.10 spec section 4.1.9 allows for runtime-sized arrays.
>             checkIsNotUnsizedArray(field->line(),
>                                    "array members of interface blocks must specify a size",
>-                                   field->name().c_str(), field->type());
>+                                   field->name(), field->type());
>         }
> 
>         if (typeQualifier.qualifier == EvqBuffer)
>@@ -3817,77 +3819,72 @@ TIntermDeclaration *TParseContext::addInterfaceBlock(
>         }
>     }
> 
>-    TInterfaceBlock *interfaceBlock =
>-        new TInterfaceBlock(&blockName, fieldList, instanceName, blockLayoutQualifier);
>-    TType interfaceBlockType(interfaceBlock, typeQualifier.qualifier, blockLayoutQualifier);
>+    TInterfaceBlock *interfaceBlock = new TInterfaceBlock(
>+        &symbolTable, blockName, fieldList, blockLayoutQualifier, SymbolType::UserDefined);
>+    if (!symbolTable.declare(interfaceBlock))
>+    {
>+        error(nameLine, "redefinition of an interface block name", blockName);
>+    }
>+
>+    TType *interfaceBlockType =
>+        new TType(interfaceBlock, typeQualifier.qualifier, blockLayoutQualifier);
>     if (arrayIndex != nullptr)
>     {
>-        interfaceBlockType.makeArray(arraySize);
>+        interfaceBlockType->makeArray(arraySize);
>     }
> 
>-    TString symbolName = "";
>-    const TSymbolUniqueId *symbolId = nullptr;
>+    // The instance variable gets created to refer to the interface block type from the AST
>+    // regardless of if there's an instance name. It's created as an empty symbol if there is no
>+    // instance name.
>+    TVariable *instanceVariable =
>+        new TVariable(&symbolTable, instanceName, interfaceBlockType,
>+                      instanceName.empty() ? SymbolType::Empty : SymbolType::UserDefined);
> 
>-    if (!instanceName)
>+    if (instanceVariable->symbolType() == SymbolType::Empty)
>     {
>         // define symbols for the members of the interface block
>         for (size_t memberIndex = 0; memberIndex < fieldList->size(); ++memberIndex)
>         {
>             TField *field    = (*fieldList)[memberIndex];
>-            TType *fieldType = field->type();
>+            TType *fieldType = new TType(*field->type());
> 
>             // set parent pointer of the field variable
>             fieldType->setInterfaceBlock(interfaceBlock);
> 
>-            TVariable *fieldVariable = symbolTable.declareVariable(&field->name(), *fieldType);
>+            fieldType->setQualifier(typeQualifier.qualifier);
> 
>-            if (fieldVariable)
>-            {
>-                fieldVariable->setQualifier(typeQualifier.qualifier);
>-            }
>-            else
>+            TVariable *fieldVariable =
>+                new TVariable(&symbolTable, field->name(), fieldType, SymbolType::UserDefined);
>+            if (!symbolTable.declare(fieldVariable))
>             {
>                 error(field->line(), "redefinition of an interface block member name",
>-                      field->name().c_str());
>+                      field->name());
>             }
>         }
>-        symbolId = &symbolTable.getEmptySymbolId();
>     }
>     else
>     {
>-        checkIsNotReserved(instanceLine, *instanceName);
>+        checkIsNotReserved(instanceLine, instanceName);
> 
>         // add a symbol for this interface block
>-        TVariable *instanceTypeDef = symbolTable.declareVariable(instanceName, interfaceBlockType);
>-        if (instanceTypeDef)
>-        {
>-            instanceTypeDef->setQualifier(typeQualifier.qualifier);
>-            symbolId = &instanceTypeDef->getUniqueId();
>-        }
>-        else
>+        if (!symbolTable.declare(instanceVariable))
>         {
>-            error(instanceLine, "redefinition of an interface block instance name",
>-                  instanceName->c_str());
>+            error(instanceLine, "redefinition of an interface block instance name", instanceName);
>         }
>-        symbolName = *instanceName;
>     }
> 
>-    TIntermDeclaration *declaration = nullptr;
>-
>-    if (symbolId)
>-    {
>-        TIntermSymbol *blockSymbol = new TIntermSymbol(*symbolId, symbolName, interfaceBlockType);
>-        blockSymbol->setLine(typeQualifier.line);
>-        declaration = new TIntermDeclaration();
>-        declaration->appendDeclarator(blockSymbol);
>-        declaration->setLine(nameLine);
>-    }
>+    TIntermSymbol *blockSymbol = new TIntermSymbol(instanceVariable);
>+    blockSymbol->setLine(typeQualifier.line);
>+    TIntermDeclaration *declaration = new TIntermDeclaration();
>+    declaration->appendDeclarator(blockSymbol);
>+    declaration->setLine(nameLine);
> 
>     exitStructDeclaration();
>     return declaration;
> }
> 
>-void TParseContext::enterStructDeclaration(const TSourceLoc &line, const TString &identifier)
>+void TParseContext::enterStructDeclaration(const TSourceLoc &line,
>+                                           const ImmutableString &identifier)
> {
>     ++mStructNestingLevel;
> 
>@@ -3920,11 +3917,20 @@ void TParseContext::checkIsBelowStructNestingLimit(const TSourceLoc &line, const
>     // one to the field's struct nesting.
>     if (1 + field.type()->getDeepestStructNesting() > kWebGLMaxStructNesting)
>     {
>-        std::stringstream reasonStream;
>-        reasonStream << "Reference of struct type " << field.type()->getStruct()->name().c_str()
>-                     << " exceeds maximum allowed nesting level of " << kWebGLMaxStructNesting;
>+        std::stringstream reasonStream = sh::InitializeStream<std::stringstream>();
>+        if (field.type()->getStruct()->symbolType() == SymbolType::Empty)
>+        {
>+            // This may happen in case there are nested struct definitions. While they are also
>+            // invalid GLSL, they don't cause a syntax error.
>+            reasonStream << "Struct nesting";
>+        }
>+        else
>+        {
>+            reasonStream << "Reference of struct type " << field.type()->getStruct()->name();
>+        }
>+        reasonStream << " exceeds maximum allowed nesting level of " << kWebGLMaxStructNesting;
>         std::string reason = reasonStream.str();
>-        error(line, reason.c_str(), field.name().c_str());
>+        error(line, reason.c_str(), field.name());
>         return;
>     }
> }
>@@ -3941,7 +3947,7 @@ TIntermTyped *TParseContext::addIndexExpression(TIntermTyped *baseExpression,
>         if (baseExpression->getAsSymbolNode())
>         {
>             error(location, " left of '[' is not of type array, matrix, or vector ",
>-                  baseExpression->getAsSymbolNode()->getSymbol().c_str());
>+                  baseExpression->getAsSymbolNode()->getName());
>         }
>         else
>         {
>@@ -3953,7 +3959,7 @@ TIntermTyped *TParseContext::addIndexExpression(TIntermTyped *baseExpression,
> 
>     if (baseExpression->getQualifier() == EvqPerVertexIn)
>     {
>-        ASSERT(mShaderType == GL_GEOMETRY_SHADER_OES);
>+        ASSERT(mShaderType == GL_GEOMETRY_SHADER_EXT);
>         if (mGeometryShaderInputPrimitiveType == EptUndefined)
>         {
>             error(location, "missing input primitive declaration before indexing gl_in.", "[");
>@@ -3963,15 +3969,15 @@ TIntermTyped *TParseContext::addIndexExpression(TIntermTyped *baseExpression,
> 
>     TIntermConstantUnion *indexConstantUnion = indexExpression->getAsConstantUnion();
> 
>-    // TODO(oetuaho@nvidia.com): Get rid of indexConstantUnion == nullptr below once ANGLE is able
>-    // to constant fold all constant expressions. Right now we don't allow indexing interface blocks
>-    // or fragment outputs with expressions that ANGLE is not able to constant fold, even if the
>-    // index is a constant expression.
>+    // ANGLE should be able to fold any constant expressions resulting in an integer - but to be
>+    // safe we don't treat "EvqConst" that's evaluated according to the spec as being sufficient
>+    // for constness. Some interpretations of the spec have allowed constant expressions with side
>+    // effects - like array length() method on a non-constant array.
>     if (indexExpression->getQualifier() != EvqConst || indexConstantUnion == nullptr)
>     {
>         if (baseExpression->isInterfaceBlock())
>         {
>-            // TODO(jiawei.shao@intel.com): implement GL_OES_shader_io_blocks.
>+            // TODO(jiawei.shao@intel.com): implement GL_EXT_shader_io_blocks.
>             switch (baseExpression->getQualifier())
>             {
>                 case EvqPerVertexIn:
>@@ -4041,25 +4047,29 @@ TIntermTyped *TParseContext::addIndexExpression(TIntermTyped *baseExpression,
>                         safeIndex = 0;
>                     }
>                 }
>-                // Only do generic out-of-range check if similar error hasn't already been reported.
>-                if (safeIndex < 0)
>+            }
>+            // Only do generic out-of-range check if similar error hasn't already been reported.
>+            if (safeIndex < 0)
>+            {
>+                if (baseExpression->isArray())
>                 {
>                     safeIndex = checkIndexLessThan(outOfRangeIndexIsError, location, index,
>                                                    baseExpression->getOutermostArraySize(),
>                                                    "array index out of range");
>                 }
>-            }
>-            else if (baseExpression->isMatrix())
>-            {
>-                safeIndex = checkIndexLessThan(outOfRangeIndexIsError, location, index,
>-                                               baseExpression->getType().getCols(),
>-                                               "matrix field selection out of range");
>-            }
>-            else if (baseExpression->isVector())
>-            {
>-                safeIndex = checkIndexLessThan(outOfRangeIndexIsError, location, index,
>-                                               baseExpression->getType().getNominalSize(),
>-                                               "vector field selection out of range");
>+                else if (baseExpression->isMatrix())
>+                {
>+                    safeIndex = checkIndexLessThan(outOfRangeIndexIsError, location, index,
>+                                                   baseExpression->getType().getCols(),
>+                                                   "matrix field selection out of range");
>+                }
>+                else
>+                {
>+                    ASSERT(baseExpression->isVector());
>+                    safeIndex = checkIndexLessThan(outOfRangeIndexIsError, location, index,
>+                                                   baseExpression->getType().getNominalSize(),
>+                                                   "vector field selection out of range");
>+                }
>             }
> 
>             ASSERT(safeIndex >= 0);
>@@ -4070,17 +4080,19 @@ TIntermTyped *TParseContext::addIndexExpression(TIntermTyped *baseExpression,
>             {
>                 TConstantUnion *safeConstantUnion = new TConstantUnion();
>                 safeConstantUnion->setIConst(safeIndex);
>-                indexConstantUnion->replaceConstantUnion(safeConstantUnion);
>-                indexConstantUnion->getTypePointer()->setBasicType(EbtInt);
>+                indexExpression = new TIntermConstantUnion(
>+                    safeConstantUnion, TType(EbtInt, indexExpression->getPrecision(),
>+                                             indexExpression->getQualifier()));
>             }
> 
>             TIntermBinary *node =
>                 new TIntermBinary(EOpIndexDirect, baseExpression, indexExpression);
>             node->setLine(location);
>-            return node->fold(mDiagnostics);
>+            return expressionOrFoldedResult(node);
>         }
>     }
> 
>+    markStaticReadIfSymbol(indexExpression);
>     TIntermBinary *node = new TIntermBinary(EOpIndexIndirect, baseExpression, indexExpression);
>     node->setLine(location);
>     // Indirect indexing can never be constant folded.
>@@ -4095,9 +4107,11 @@ int TParseContext::checkIndexLessThan(bool outOfRangeIndexIsError,
> {
>     // Should not reach here with an unsized / runtime-sized array.
>     ASSERT(arraySize > 0);
>+    // A negative index should already have been checked.
>+    ASSERT(index >= 0);
>     if (index >= arraySize)
>     {
>-        std::stringstream reasonStream;
>+        std::stringstream reasonStream = sh::InitializeStream<std::stringstream>();
>         reasonStream << reason << " '" << index << "'";
>         std::string token = reasonStream.str();
>         outOfRangeError(outOfRangeIndexIsError, location, reason, "[]");
>@@ -4108,7 +4122,7 @@ int TParseContext::checkIndexLessThan(bool outOfRangeIndexIsError,
> 
> TIntermTyped *TParseContext::addFieldSelectionExpression(TIntermTyped *baseExpression,
>                                                          const TSourceLoc &dotLocation,
>-                                                         const TString &fieldString,
>+                                                         const ImmutableString &fieldString,
>                                                          const TSourceLoc &fieldLocation)
> {
>     if (baseExpression->isArray())
>@@ -4129,7 +4143,7 @@ TIntermTyped *TParseContext::addFieldSelectionExpression(TIntermTyped *baseExpre
>         TIntermSwizzle *node = new TIntermSwizzle(baseExpression, fieldOffsets);
>         node->setLine(dotLocation);
> 
>-        return node->fold();
>+        return node->fold(mDiagnostics);
>     }
>     else if (baseExpression->getBasicType() == EbtStruct)
>     {
>@@ -4158,11 +4172,11 @@ TIntermTyped *TParseContext::addFieldSelectionExpression(TIntermTyped *baseExpre
>                 TIntermBinary *node =
>                     new TIntermBinary(EOpIndexDirectStruct, baseExpression, index);
>                 node->setLine(dotLocation);
>-                return node->fold(mDiagnostics);
>+                return expressionOrFoldedResult(node);
>             }
>             else
>             {
>-                error(dotLocation, " no such field in structure", fieldString.c_str());
>+                error(dotLocation, " no such field in structure", fieldString);
>                 return baseExpression;
>             }
>         }
>@@ -4199,7 +4213,7 @@ TIntermTyped *TParseContext::addFieldSelectionExpression(TIntermTyped *baseExpre
>             }
>             else
>             {
>-                error(dotLocation, " no such field in interface block", fieldString.c_str());
>+                error(dotLocation, " no such field in interface block", fieldString);
>                 return baseExpression;
>             }
>         }
>@@ -4209,20 +4223,20 @@ TIntermTyped *TParseContext::addFieldSelectionExpression(TIntermTyped *baseExpre
>         if (mShaderVersion < 300)
>         {
>             error(dotLocation, " field selection requires structure or vector on left hand side",
>-                  fieldString.c_str());
>+                  fieldString);
>         }
>         else
>         {
>             error(dotLocation,
>                   " field selection requires structure, vector, or interface block on left hand "
>                   "side",
>-                  fieldString.c_str());
>+                  fieldString);
>         }
>         return baseExpression;
>     }
> }
> 
>-TLayoutQualifier TParseContext::parseLayoutQualifier(const TString &qualifierType,
>+TLayoutQualifier TParseContext::parseLayoutQualifier(const ImmutableString &qualifierType,
>                                                      const TSourceLoc &qualifierTypeLine)
> {
>     TLayoutQualifier qualifier = TLayoutQualifier::Create();
>@@ -4263,7 +4277,7 @@ TLayoutQualifier TParseContext::parseLayoutQualifier(const TString &qualifierTyp
>     else if (qualifierType == "location")
>     {
>         error(qualifierTypeLine, "invalid layout qualifier: location requires an argument",
>-              qualifierType.c_str());
>+              qualifierType);
>     }
>     else if (qualifierType == "yuv" && mShaderType == GL_FRAGMENT_SHADER)
>     {
>@@ -4337,44 +4351,44 @@ TLayoutQualifier TParseContext::parseLayoutQualifier(const TString &qualifierTyp
>         checkLayoutQualifierSupported(qualifierTypeLine, qualifierType, 310);
>         qualifier.imageInternalFormat = EiifR32UI;
>     }
>-    else if (qualifierType == "points" && mShaderType == GL_GEOMETRY_SHADER_OES &&
>-             checkCanUseExtension(qualifierTypeLine, TExtension::OES_geometry_shader))
>+    else if (qualifierType == "points" && mShaderType == GL_GEOMETRY_SHADER_EXT &&
>+             checkCanUseExtension(qualifierTypeLine, TExtension::EXT_geometry_shader))
>     {
>         checkLayoutQualifierSupported(qualifierTypeLine, qualifierType, 310);
>         qualifier.primitiveType = EptPoints;
>     }
>-    else if (qualifierType == "lines" && mShaderType == GL_GEOMETRY_SHADER_OES &&
>-             checkCanUseExtension(qualifierTypeLine, TExtension::OES_geometry_shader))
>+    else if (qualifierType == "lines" && mShaderType == GL_GEOMETRY_SHADER_EXT &&
>+             checkCanUseExtension(qualifierTypeLine, TExtension::EXT_geometry_shader))
>     {
>         checkLayoutQualifierSupported(qualifierTypeLine, qualifierType, 310);
>         qualifier.primitiveType = EptLines;
>     }
>-    else if (qualifierType == "lines_adjacency" && mShaderType == GL_GEOMETRY_SHADER_OES &&
>-             checkCanUseExtension(qualifierTypeLine, TExtension::OES_geometry_shader))
>+    else if (qualifierType == "lines_adjacency" && mShaderType == GL_GEOMETRY_SHADER_EXT &&
>+             checkCanUseExtension(qualifierTypeLine, TExtension::EXT_geometry_shader))
>     {
>         checkLayoutQualifierSupported(qualifierTypeLine, qualifierType, 310);
>         qualifier.primitiveType = EptLinesAdjacency;
>     }
>-    else if (qualifierType == "triangles" && mShaderType == GL_GEOMETRY_SHADER_OES &&
>-             checkCanUseExtension(qualifierTypeLine, TExtension::OES_geometry_shader))
>+    else if (qualifierType == "triangles" && mShaderType == GL_GEOMETRY_SHADER_EXT &&
>+             checkCanUseExtension(qualifierTypeLine, TExtension::EXT_geometry_shader))
>     {
>         checkLayoutQualifierSupported(qualifierTypeLine, qualifierType, 310);
>         qualifier.primitiveType = EptTriangles;
>     }
>-    else if (qualifierType == "triangles_adjacency" && mShaderType == GL_GEOMETRY_SHADER_OES &&
>-             checkCanUseExtension(qualifierTypeLine, TExtension::OES_geometry_shader))
>+    else if (qualifierType == "triangles_adjacency" && mShaderType == GL_GEOMETRY_SHADER_EXT &&
>+             checkCanUseExtension(qualifierTypeLine, TExtension::EXT_geometry_shader))
>     {
>         checkLayoutQualifierSupported(qualifierTypeLine, qualifierType, 310);
>         qualifier.primitiveType = EptTrianglesAdjacency;
>     }
>-    else if (qualifierType == "line_strip" && mShaderType == GL_GEOMETRY_SHADER_OES &&
>-             checkCanUseExtension(qualifierTypeLine, TExtension::OES_geometry_shader))
>+    else if (qualifierType == "line_strip" && mShaderType == GL_GEOMETRY_SHADER_EXT &&
>+             checkCanUseExtension(qualifierTypeLine, TExtension::EXT_geometry_shader))
>     {
>         checkLayoutQualifierSupported(qualifierTypeLine, qualifierType, 310);
>         qualifier.primitiveType = EptLineStrip;
>     }
>-    else if (qualifierType == "triangle_strip" && mShaderType == GL_GEOMETRY_SHADER_OES &&
>-             checkCanUseExtension(qualifierTypeLine, TExtension::OES_geometry_shader))
>+    else if (qualifierType == "triangle_strip" && mShaderType == GL_GEOMETRY_SHADER_EXT &&
>+             checkCanUseExtension(qualifierTypeLine, TExtension::EXT_geometry_shader))
>     {
>         checkLayoutQualifierSupported(qualifierTypeLine, qualifierType, 310);
>         qualifier.primitiveType = EptTriangleStrip;
>@@ -4382,13 +4396,13 @@ TLayoutQualifier TParseContext::parseLayoutQualifier(const TString &qualifierTyp
> 
>     else
>     {
>-        error(qualifierTypeLine, "invalid layout qualifier", qualifierType.c_str());
>+        error(qualifierTypeLine, "invalid layout qualifier", qualifierType);
>     }
> 
>     return qualifier;
> }
> 
>-void TParseContext::parseLocalSize(const TString &qualifierType,
>+void TParseContext::parseLocalSize(const ImmutableString &qualifierType,
>                                    const TSourceLoc &qualifierTypeLine,
>                                    int intValue,
>                                    const TSourceLoc &intValueLine,
>@@ -4399,7 +4413,7 @@ void TParseContext::parseLocalSize(const TString &qualifierType,
>     checkLayoutQualifierSupported(qualifierTypeLine, qualifierType, 310);
>     if (intValue < 1)
>     {
>-        std::stringstream reasonStream;
>+        std::stringstream reasonStream = sh::InitializeStream<std::stringstream>();
>         reasonStream << "out of range: " << getWorkGroupSizeString(index) << " must be positive";
>         std::string reason = reasonStream.str();
>         error(intValueLine, reason.c_str(), intValueString.c_str());
>@@ -4461,7 +4475,27 @@ void TParseContext::parseMaxVertices(int intValue,
>     }
> }
> 
>-TLayoutQualifier TParseContext::parseLayoutQualifier(const TString &qualifierType,
>+void TParseContext::parseIndexLayoutQualifier(int intValue,
>+                                              const TSourceLoc &intValueLine,
>+                                              const std::string &intValueString,
>+                                              int *index)
>+{
>+    // EXT_blend_func_extended specifies that most validation should happen at link time, but since
>+    // we're validating output variable locations at compile time, it makes sense to validate that
>+    // index is 0 or 1 also at compile time. Also since we use "-1" as a placeholder for unspecified
>+    // index, we can't accept it here.
>+    if (intValue < 0 || intValue > 1)
>+    {
>+        error(intValueLine, "out of range: index layout qualifier can only be 0 or 1",
>+              intValueString.c_str());
>+    }
>+    else
>+    {
>+        *index = intValue;
>+    }
>+}
>+
>+TLayoutQualifier TParseContext::parseLayoutQualifier(const ImmutableString &qualifierType,
>                                                      const TSourceLoc &qualifierTypeLine,
>                                                      int intValue,
>                                                      const TSourceLoc &intValueLine)
>@@ -4527,25 +4561,29 @@ TLayoutQualifier TParseContext::parseLayoutQualifier(const TString &qualifierTyp
>     }
>     else if (qualifierType == "num_views" && mShaderType == GL_VERTEX_SHADER)
>     {
>-        if (checkCanUseExtension(qualifierTypeLine, TExtension::OVR_multiview))
>+        if (checkCanUseExtension(qualifierTypeLine, TExtension::OVR_multiview2))
>         {
>             parseNumViews(intValue, intValueLine, intValueString, &qualifier.numViews);
>         }
>     }
>-    else if (qualifierType == "invocations" && mShaderType == GL_GEOMETRY_SHADER_OES &&
>-             checkCanUseExtension(qualifierTypeLine, TExtension::OES_geometry_shader))
>+    else if (qualifierType == "invocations" && mShaderType == GL_GEOMETRY_SHADER_EXT &&
>+             checkCanUseExtension(qualifierTypeLine, TExtension::EXT_geometry_shader))
>     {
>         parseInvocations(intValue, intValueLine, intValueString, &qualifier.invocations);
>     }
>-    else if (qualifierType == "max_vertices" && mShaderType == GL_GEOMETRY_SHADER_OES &&
>-             checkCanUseExtension(qualifierTypeLine, TExtension::OES_geometry_shader))
>+    else if (qualifierType == "max_vertices" && mShaderType == GL_GEOMETRY_SHADER_EXT &&
>+             checkCanUseExtension(qualifierTypeLine, TExtension::EXT_geometry_shader))
>     {
>         parseMaxVertices(intValue, intValueLine, intValueString, &qualifier.maxVertices);
>     }
>-
>+    else if (qualifierType == "index" && mShaderType == GL_FRAGMENT_SHADER &&
>+             checkCanUseExtension(qualifierTypeLine, TExtension::EXT_blend_func_extended))
>+    {
>+        parseIndexLayoutQualifier(intValue, intValueLine, intValueString, &qualifier.index);
>+    }
>     else
>     {
>-        error(qualifierTypeLine, "invalid layout qualifier", qualifierType.c_str());
>+        error(qualifierTypeLine, "invalid layout qualifier", qualifierType);
>     }
> 
>     return qualifier;
>@@ -4585,7 +4623,7 @@ TStorageQualifierWrapper *TParseContext::parseInQualifier(const TSourceLoc &loc)
>     {
>         case GL_VERTEX_SHADER:
>         {
>-            if (mShaderVersion < 300 && !isExtensionEnabled(TExtension::OVR_multiview))
>+            if (mShaderVersion < 300 && !isExtensionEnabled(TExtension::OVR_multiview2))
>             {
>                 error(loc, "storage qualifier supported in GLSL ES 3.00 and above only", "in");
>             }
>@@ -4603,7 +4641,7 @@ TStorageQualifierWrapper *TParseContext::parseInQualifier(const TSourceLoc &loc)
>         {
>             return new TStorageQualifierWrapper(EvqComputeIn, loc);
>         }
>-        case GL_GEOMETRY_SHADER_OES:
>+        case GL_GEOMETRY_SHADER_EXT:
>         {
>             return new TStorageQualifierWrapper(EvqGeometryIn, loc);
>         }
>@@ -4644,7 +4682,7 @@ TStorageQualifierWrapper *TParseContext::parseOutQualifier(const TSourceLoc &loc
>             error(loc, "storage qualifier isn't supported in compute shaders", "out");
>             return new TStorageQualifierWrapper(EvqLast, loc);
>         }
>-        case GL_GEOMETRY_SHADER_OES:
>+        case GL_GEOMETRY_SHADER_EXT:
>         {
>             return new TStorageQualifierWrapper(EvqGeometryOut, loc);
>         }
>@@ -4673,36 +4711,31 @@ TLayoutQualifier TParseContext::joinLayoutQualifiers(TLayoutQualifier leftQualif
>                                     mDiagnostics);
> }
> 
>-TField *TParseContext::parseStructDeclarator(TString *identifier, const TSourceLoc &loc)
>+TDeclarator *TParseContext::parseStructDeclarator(const ImmutableString &identifier,
>+                                                  const TSourceLoc &loc)
> {
>-    checkIsNotReserved(loc, *identifier);
>-    TType *type = new TType(EbtVoid, EbpUndefined);
>-    return new TField(type, identifier, loc);
>+    checkIsNotReserved(loc, identifier);
>+    return new TDeclarator(identifier, loc);
> }
> 
>-TField *TParseContext::parseStructArrayDeclarator(TString *identifier,
>-                                                  const TSourceLoc &loc,
>-                                                  const TVector<unsigned int> &arraySizes,
>-                                                  const TSourceLoc &arraySizeLoc)
>+TDeclarator *TParseContext::parseStructArrayDeclarator(const ImmutableString &identifier,
>+                                                       const TSourceLoc &loc,
>+                                                       const TVector<unsigned int> *arraySizes)
> {
>-    checkIsNotReserved(loc, *identifier);
>-
>-    TType *type       = new TType(EbtVoid, EbpUndefined);
>-    type->makeArrays(arraySizes);
>-
>-    return new TField(type, identifier, loc);
>+    checkIsNotReserved(loc, identifier);
>+    return new TDeclarator(identifier, arraySizes, loc);
> }
> 
> void TParseContext::checkDoesNotHaveDuplicateFieldName(const TFieldList::const_iterator begin,
>                                                        const TFieldList::const_iterator end,
>-                                                       const TString &name,
>+                                                       const ImmutableString &name,
>                                                        const TSourceLoc &location)
> {
>     for (auto fieldIter = begin; fieldIter != end; ++fieldIter)
>     {
>         if ((*fieldIter)->name() == name)
>         {
>-            error(location, "duplicate field name in structure", name.c_str());
>+            error(location, "duplicate field name in structure", name);
>         }
>     }
> }
>@@ -4734,7 +4767,7 @@ TFieldList *TParseContext::combineStructFieldLists(TFieldList *processedFields,
> TFieldList *TParseContext::addStructDeclaratorListWithQualifiers(
>     const TTypeQualifierBuilder &typeQualifierBuilder,
>     TPublicType *typeSpecifier,
>-    TFieldList *fieldList)
>+    const TDeclaratorList *declaratorList)
> {
>     TTypeQualifier typeQualifier = typeQualifierBuilder.getVariableTypeQualifier(mDiagnostics);
> 
>@@ -4746,11 +4779,11 @@ TFieldList *TParseContext::addStructDeclaratorListWithQualifiers(
>     {
>         typeSpecifier->precision = typeQualifier.precision;
>     }
>-    return addStructDeclaratorList(*typeSpecifier, fieldList);
>+    return addStructDeclaratorList(*typeSpecifier, declaratorList);
> }
> 
> TFieldList *TParseContext::addStructDeclaratorList(const TPublicType &typeSpecifier,
>-                                                   TFieldList *declaratorList)
>+                                                   const TDeclaratorList *declaratorList)
> {
>     checkPrecisionSpecified(typeSpecifier.getLine(), typeSpecifier.precision,
>                             typeSpecifier.getBasicType());
>@@ -4760,49 +4793,49 @@ TFieldList *TParseContext::addStructDeclaratorList(const TPublicType &typeSpecif
> 
>     checkWorkGroupSizeIsNotSpecified(typeSpecifier.getLine(), typeSpecifier.layoutQualifier);
> 
>-    for (TField *declarator : *declaratorList)
>+    TFieldList *fieldList = new TFieldList();
>+
>+    for (const TDeclarator *declarator : *declaratorList)
>     {
>-        // Don't allow arrays of arrays in ESSL < 3.10.
>-        if (declarator->type()->isArray())
>+        TType *type = new TType(typeSpecifier);
>+        if (declarator->isArray())
>         {
>+            // Don't allow arrays of arrays in ESSL < 3.10.
>             checkArrayElementIsNotArray(typeSpecifier.getLine(), typeSpecifier);
>+            type->makeArrays(*declarator->arraySizes());
>         }
> 
>-        auto *declaratorArraySizes = declarator->type()->getArraySizes();
>-
>-        TType *type = declarator->type();
>-        *type       = TType(typeSpecifier);
>-        if (declaratorArraySizes != nullptr)
>-        {
>-            for (unsigned int arraySize : *declaratorArraySizes)
>-            {
>-                type->makeArray(arraySize);
>-            }
>-        }
>-
>-        checkIsBelowStructNestingLimit(typeSpecifier.getLine(), *declarator);
>+        TField *field =
>+            new TField(type, declarator->name(), declarator->line(), SymbolType::UserDefined);
>+        checkIsBelowStructNestingLimit(typeSpecifier.getLine(), *field);
>+        fieldList->push_back(field);
>     }
> 
>-    return declaratorList;
>+    return fieldList;
> }
> 
> TTypeSpecifierNonArray TParseContext::addStructure(const TSourceLoc &structLine,
>                                                    const TSourceLoc &nameLine,
>-                                                   const TString *structName,
>+                                                   const ImmutableString &structName,
>                                                    TFieldList *fieldList)
> {
>-    TStructure *structure = new TStructure(&symbolTable, structName, fieldList);
>+    SymbolType structSymbolType = SymbolType::UserDefined;
>+    if (structName.empty())
>+    {
>+        structSymbolType = SymbolType::Empty;
>+    }
>+    TStructure *structure = new TStructure(&symbolTable, structName, fieldList, structSymbolType);
> 
>     // Store a bool in the struct if we're at global scope, to allow us to
>     // skip the local struct scoping workaround in HLSL.
>     structure->setAtGlobalScope(symbolTable.atGlobalLevel());
> 
>-    if (!structName->empty())
>+    if (structSymbolType != SymbolType::Empty)
>     {
>-        checkIsNotReserved(nameLine, *structName);
>-        if (!symbolTable.declareStructType(structure))
>+        checkIsNotReserved(nameLine, structName);
>+        if (!symbolTable.declare(structure))
>         {
>-            error(nameLine, "redefinition of a struct", structName->c_str());
>+            error(nameLine, "redefinition of a struct", structName);
>         }
>     }
> 
>@@ -4832,10 +4865,12 @@ TTypeSpecifierNonArray TParseContext::addStructure(const TSourceLoc &structLine,
>         }
> 
>         checkIsNotUnsizedArray(field.line(), "array members of structs must specify a size",
>-                               field.name().c_str(), field.type());
>+                               field.name(), field.type());
> 
>         checkMemoryQualifierIsNotSpecified(field.type()->getMemoryQualifier(), field.line());
> 
>+        checkIndexIsNotSpecified(field.line(), field.type()->getLayoutQualifier().index);
>+
>         checkBindingIsNotSpecified(field.line(), field.type()->getLayoutQualifier().binding);
> 
>         checkLocationIsNotSpecified(field.line(), field.type()->getLayoutQualifier());
>@@ -4862,12 +4897,13 @@ TIntermSwitch *TParseContext::addSwitch(TIntermTyped *init,
>     }
> 
>     ASSERT(statementList);
>-    if (!ValidateSwitchStatementList(switchType, mShaderVersion, mDiagnostics, statementList, loc))
>+    if (!ValidateSwitchStatementList(switchType, mDiagnostics, statementList, loc))
>     {
>         ASSERT(mDiagnostics->numErrors() > 0);
>         return nullptr;
>     }
> 
>+    markStaticReadIfSymbol(init);
>     TIntermSwitch *node = new TIntermSwitch(init, statementList);
>     node->setLine(loc);
>     return node;
>@@ -4891,9 +4927,10 @@ TIntermCase *TParseContext::addCase(TIntermTyped *condition, const TSourceLoc &l
>         error(condition->getLine(), "case label must be a scalar integer", "case");
>     }
>     TIntermConstantUnion *conditionConst = condition->getAsConstantUnion();
>-    // TODO(oetuaho@nvidia.com): Get rid of the conditionConst == nullptr check once all constant
>-    // expressions can be folded. Right now we don't allow constant expressions that ANGLE can't
>-    // fold in case labels.
>+    // ANGLE should be able to fold any EvqConst expressions resulting in an integer - but to be
>+    // safe against corner cases we still check for conditionConst. Some interpretations of the
>+    // spec have allowed constant expressions with side effects - like array length() method on a
>+    // non-constant array.
>     if (condition->getQualifier() != EvqConst || conditionConst == nullptr)
>     {
>         error(condition->getLine(), "case label must be constant", "case");
>@@ -4917,7 +4954,8 @@ TIntermCase *TParseContext::addDefault(const TSourceLoc &loc)
> 
> TIntermTyped *TParseContext::createUnaryMath(TOperator op,
>                                              TIntermTyped *child,
>-                                             const TSourceLoc &loc)
>+                                             const TSourceLoc &loc,
>+                                             const TFunction *func)
> {
>     ASSERT(child != nullptr);
> 
>@@ -4927,7 +4965,7 @@ TIntermTyped *TParseContext::createUnaryMath(TOperator op,
>             if (child->getBasicType() != EbtBool || child->isMatrix() || child->isArray() ||
>                 child->isVector())
>             {
>-                unaryOpError(loc, GetOperatorString(op), child->getCompleteString());
>+                unaryOpError(loc, GetOperatorString(op), child->getType());
>                 return nullptr;
>             }
>             break;
>@@ -4935,7 +4973,7 @@ TIntermTyped *TParseContext::createUnaryMath(TOperator op,
>             if ((child->getBasicType() != EbtInt && child->getBasicType() != EbtUInt) ||
>                 child->isMatrix() || child->isArray())
>             {
>-                unaryOpError(loc, GetOperatorString(op), child->getCompleteString());
>+                unaryOpError(loc, GetOperatorString(op), child->getType());
>                 return nullptr;
>             }
>             break;
>@@ -4947,11 +4985,12 @@ TIntermTyped *TParseContext::createUnaryMath(TOperator op,
>         case EOpPositive:
>             if (child->getBasicType() == EbtStruct || child->isInterfaceBlock() ||
>                 child->getBasicType() == EbtBool || child->isArray() ||
>-                IsOpaqueType(child->getBasicType()))
>+                child->getBasicType() == EbtVoid || IsOpaqueType(child->getBasicType()))
>             {
>-                unaryOpError(loc, GetOperatorString(op), child->getCompleteString());
>+                unaryOpError(loc, GetOperatorString(op), child->getType());
>                 return nullptr;
>             }
>+            break;
>         // Operators for built-ins are already type checked against their prototype.
>         default:
>             break;
>@@ -4959,11 +4998,12 @@ TIntermTyped *TParseContext::createUnaryMath(TOperator op,
> 
>     if (child->getMemoryQualifier().writeonly)
>     {
>-        unaryOpError(loc, GetOperatorString(op), child->getCompleteString());
>+        unaryOpError(loc, GetOperatorString(op), child->getType());
>         return nullptr;
>     }
> 
>-    TIntermUnary *node = new TIntermUnary(op, child);
>+    markStaticReadIfSymbol(child);
>+    TIntermUnary *node = new TIntermUnary(op, child, func);
>     node->setLine(loc);
> 
>     return node->fold(mDiagnostics);
>@@ -4972,7 +5012,7 @@ TIntermTyped *TParseContext::createUnaryMath(TOperator op,
> TIntermTyped *TParseContext::addUnaryMath(TOperator op, TIntermTyped *child, const TSourceLoc &loc)
> {
>     ASSERT(op != EOpNull);
>-    TIntermTyped *node = createUnaryMath(op, child, loc);
>+    TIntermTyped *node = createUnaryMath(op, child, loc, nullptr);
>     if (node == nullptr)
>     {
>         return child;
>@@ -4988,6 +5028,30 @@ TIntermTyped *TParseContext::addUnaryMathLValue(TOperator op,
>     return addUnaryMath(op, child, loc);
> }
> 
>+TIntermTyped *TParseContext::expressionOrFoldedResult(TIntermTyped *expression)
>+{
>+    // If we can, we should return the folded version of the expression for subsequent parsing. This
>+    // enables folding the containing expression during parsing as well, instead of the separate
>+    // FoldExpressions() step where folding nested expressions requires multiple full AST
>+    // traversals.
>+
>+    // Even if folding fails the fold() functions return some node representing the expression,
>+    // typically the original node. So "folded" can be assumed to be non-null.
>+    TIntermTyped *folded = expression->fold(mDiagnostics);
>+    ASSERT(folded != nullptr);
>+    if (folded->getQualifier() == expression->getQualifier())
>+    {
>+        // We need this expression to have the correct qualifier when validating the consuming
>+        // expression. So we can only return the folded node from here in case it has the same
>+        // qualifier as the original expression. In this kind of a cases the qualifier of the folded
>+        // node is EvqConst, whereas the qualifier of the expression is EvqTemporary:
>+        //  1. (true ? 1.0 : non_constant)
>+        //  2. (non_constant, 1.0)
>+        return folded;
>+    }
>+    return expression;
>+}
>+
> bool TParseContext::binaryOpCommonCheck(TOperator op,
>                                         TIntermTyped *left,
>                                         TIntermTyped *right,
>@@ -5002,10 +5066,9 @@ bool TParseContext::binaryOpCommonCheck(TOperator op,
>             case EOpIndexDirect:
>             case EOpIndexIndirect:
>                 break;
>-            case EOpIndexDirectStruct:
>-                UNREACHABLE();
> 
>             default:
>+                ASSERT(op != EOpIndexDirectStruct);
>                 error(loc, "Invalid operation for variables with an opaque type",
>                       GetOperatorString(op));
>                 return false;
>@@ -5343,10 +5406,11 @@ TIntermTyped *TParseContext::addBinaryMathInternal(TOperator op,
>     }
> 
>     TIntermBinary *node = new TIntermBinary(op, left, right);
>+    ASSERT(op != EOpAssign);
>+    markStaticReadIfSymbol(left);
>+    markStaticReadIfSymbol(right);
>     node->setLine(loc);
>-
>-    // See if we can fold constants.
>-    return node->fold(mDiagnostics);
>+    return expressionOrFoldedResult(node);
> }
> 
> TIntermTyped *TParseContext::addBinaryMath(TOperator op,
>@@ -5357,8 +5421,7 @@ TIntermTyped *TParseContext::addBinaryMath(TOperator op,
>     TIntermTyped *node = addBinaryMathInternal(op, left, right, loc);
>     if (node == 0)
>     {
>-        binaryOpError(loc, GetOperatorString(op), left->getCompleteString(),
>-                      right->getCompleteString());
>+        binaryOpError(loc, GetOperatorString(op), left->getType(), right->getType());
>         return left;
>     }
>     return node;
>@@ -5372,49 +5435,46 @@ TIntermTyped *TParseContext::addBinaryMathBooleanResult(TOperator op,
>     TIntermTyped *node = addBinaryMathInternal(op, left, right, loc);
>     if (node == nullptr)
>     {
>-        binaryOpError(loc, GetOperatorString(op), left->getCompleteString(),
>-                      right->getCompleteString());
>+        binaryOpError(loc, GetOperatorString(op), left->getType(), right->getType());
>         node = CreateBoolNode(false);
>         node->setLine(loc);
>     }
>     return node;
> }
> 
>-TIntermBinary *TParseContext::createAssign(TOperator op,
>-                                           TIntermTyped *left,
>-                                           TIntermTyped *right,
>-                                           const TSourceLoc &loc)
>+TIntermTyped *TParseContext::addAssign(TOperator op,
>+                                       TIntermTyped *left,
>+                                       TIntermTyped *right,
>+                                       const TSourceLoc &loc)
> {
>+    checkCanBeLValue(loc, "assign", left);
>+    TIntermBinary *node = nullptr;
>     if (binaryOpCommonCheck(op, left, right, loc))
>     {
>         if (op == EOpMulAssign)
>         {
>             op = TIntermBinary::GetMulAssignOpBasedOnOperands(left->getType(), right->getType());
>-            if (!isMultiplicationTypeCombinationValid(op, left->getType(), right->getType()))
>+            if (isMultiplicationTypeCombinationValid(op, left->getType(), right->getType()))
>             {
>-                return nullptr;
>+                node = new TIntermBinary(op, left, right);
>             }
>         }
>-        TIntermBinary *node = new TIntermBinary(op, left, right);
>-        node->setLine(loc);
>-
>-        return node;
>+        else
>+        {
>+            node = new TIntermBinary(op, left, right);
>+        }
>     }
>-    return nullptr;
>-}
>-
>-TIntermTyped *TParseContext::addAssign(TOperator op,
>-                                       TIntermTyped *left,
>-                                       TIntermTyped *right,
>-                                       const TSourceLoc &loc)
>-{
>-    checkCanBeLValue(loc, "assign", left);
>-    TIntermTyped *node = createAssign(op, left, right, loc);
>     if (node == nullptr)
>     {
>-        assignError(loc, "assign", left->getCompleteString(), right->getCompleteString());
>+        assignError(loc, "assign", left->getType(), right->getType());
>         return left;
>     }
>+    if (op != EOpAssign)
>+    {
>+        markStaticReadIfSymbol(left);
>+    }
>+    markStaticReadIfSymbol(right);
>+    node->setLine(loc);
>     return node;
> }
> 
>@@ -5434,10 +5494,12 @@ TIntermTyped *TParseContext::addComma(TIntermTyped *left,
>               ",");
>     }
> 
>-    TIntermBinary *commaNode   = new TIntermBinary(EOpComma, left, right);
>-    TQualifier resultQualifier = TIntermBinary::GetCommaQualifier(mShaderVersion, left, right);
>-    commaNode->getTypePointer()->setQualifier(resultQualifier);
>-    return commaNode->fold(mDiagnostics);
>+    TIntermBinary *commaNode = TIntermBinary::CreateComma(left, right, mShaderVersion);
>+    markStaticReadIfSymbol(left);
>+    markStaticReadIfSymbol(right);
>+    commaNode->setLine(loc);
>+
>+    return expressionOrFoldedResult(commaNode);
> }
> 
> TIntermBranch *TParseContext::addBranch(TOperator op, const TSourceLoc &loc)
>@@ -5481,6 +5543,7 @@ TIntermBranch *TParseContext::addBranch(TOperator op,
> {
>     if (expression != nullptr)
>     {
>+        markStaticReadIfSymbol(expression);
>         ASSERT(op == EOpReturn);
>         mFunctionReturnsValue = true;
>         if (mCurrentFunctionType->getBasicType() == EbtVoid)
>@@ -5497,14 +5560,22 @@ TIntermBranch *TParseContext::addBranch(TOperator op,
>     return node;
> }
> 
>+void TParseContext::appendStatement(TIntermBlock *block, TIntermNode *statement)
>+{
>+    if (statement != nullptr)
>+    {
>+        markStaticReadIfSymbol(statement);
>+        block->appendStatement(statement);
>+    }
>+}
>+
> void TParseContext::checkTextureGather(TIntermAggregate *functionCall)
> {
>     ASSERT(functionCall->getOp() == EOpCallBuiltInFunction);
>-    const TString &name        = functionCall->getFunctionSymbolInfo()->getName();
>-    bool isTextureGather       = (name == "textureGather");
>-    bool isTextureGatherOffset = (name == "textureGatherOffset");
>-    if (isTextureGather || isTextureGatherOffset)
>+    const TFunction *func = functionCall->getFunction();
>+    if (BuiltInGroup::isTextureGather(func))
>     {
>+        bool isTextureGatherOffset = BuiltInGroup::isTextureGatherOffset(func);
>         TIntermNode *componentNode = nullptr;
>         TIntermSequence *arguments = functionCall->getSequence();
>         ASSERT(arguments->size() >= 2u && arguments->size() <= 4u);
>@@ -5518,7 +5589,7 @@ void TParseContext::checkTextureGather(TIntermAggregate *functionCall)
>             case EbtSampler2DArray:
>             case EbtISampler2DArray:
>             case EbtUSampler2DArray:
>-                if ((isTextureGather && arguments->size() == 3u) ||
>+                if ((!isTextureGatherOffset && arguments->size() == 3u) ||
>                     (isTextureGatherOffset && arguments->size() == 4u))
>                 {
>                     componentNode = arguments->back();
>@@ -5548,7 +5619,7 @@ void TParseContext::checkTextureGather(TIntermAggregate *functionCall)
>             if (componentNode->getAsTyped()->getQualifier() != EvqConst || !componentConstantUnion)
>             {
>                 error(functionCall->getLine(), "Texture component must be a constant expression",
>-                      name.c_str());
>+                      func->name());
>             }
>             else
>             {
>@@ -5556,7 +5627,7 @@ void TParseContext::checkTextureGather(TIntermAggregate *functionCall)
>                 if (component < 0 || component > 3)
>                 {
>                     error(functionCall->getLine(), "Component must be in the range [0;3]",
>-                          name.c_str());
>+                          func->name());
>                 }
>             }
>         }
>@@ -5566,23 +5637,21 @@ void TParseContext::checkTextureGather(TIntermAggregate *functionCall)
> void TParseContext::checkTextureOffsetConst(TIntermAggregate *functionCall)
> {
>     ASSERT(functionCall->getOp() == EOpCallBuiltInFunction);
>-    const TString &name        = functionCall->getFunctionSymbolInfo()->getName();
>-    TIntermNode *offset        = nullptr;
>-    TIntermSequence *arguments = functionCall->getSequence();
>+    const TFunction *func                  = functionCall->getFunction();
>+    TIntermNode *offset                    = nullptr;
>+    TIntermSequence *arguments             = functionCall->getSequence();
>     bool useTextureGatherOffsetConstraints = false;
>-    if (name == "texelFetchOffset" || name == "textureLodOffset" ||
>-        name == "textureProjLodOffset" || name == "textureGradOffset" ||
>-        name == "textureProjGradOffset")
>+    if (BuiltInGroup::isTextureOffsetNoBias(func))
>     {
>         offset = arguments->back();
>     }
>-    else if (name == "textureOffset" || name == "textureProjOffset")
>+    else if (BuiltInGroup::isTextureOffsetBias(func))
>     {
>-        // A bias parameter might follow the offset parameter.
>+        // A bias parameter follows the offset parameter.
>         ASSERT(arguments->size() >= 3);
>         offset = (*arguments)[2];
>     }
>-    else if (name == "textureGatherOffset")
>+    else if (BuiltInGroup::isTextureGatherOffset(func))
>     {
>         ASSERT(arguments->size() >= 3u);
>         const TIntermTyped *sampler = arguments->front()->getAsTyped();
>@@ -5613,13 +5682,13 @@ void TParseContext::checkTextureOffsetConst(TIntermAggregate *functionCall)
>         if (offset->getAsTyped()->getQualifier() != EvqConst || !offsetConstantUnion)
>         {
>             error(functionCall->getLine(), "Texture offset must be a constant expression",
>-                  name.c_str());
>+                  func->name());
>         }
>         else
>         {
>             ASSERT(offsetConstantUnion->getBasicType() == EbtInt);
>             size_t size                  = offsetConstantUnion->getType().getObjectSize();
>-            const TConstantUnion *values = offsetConstantUnion->getUnionArrayPointer();
>+            const TConstantUnion *values = offsetConstantUnion->getConstantValue();
>             int minOffsetValue = useTextureGatherOffsetConstraints ? mMinProgramTextureGatherOffset
>                                                                    : mMinProgramTexelOffset;
>             int maxOffsetValue = useTextureGatherOffsetConstraints ? mMaxProgramTextureGatherOffset
>@@ -5629,7 +5698,7 @@ void TParseContext::checkTextureOffsetConst(TIntermAggregate *functionCall)
>                 int offsetValue = values[i].getIConst();
>                 if (offsetValue > maxOffsetValue || offsetValue < minOffsetValue)
>                 {
>-                    std::stringstream tokenStream;
>+                    std::stringstream tokenStream = sh::InitializeStream<std::stringstream>();
>                     tokenStream << offsetValue;
>                     std::string token = tokenStream.str();
>                     error(offset->getLine(), "Texture offset value out of valid range",
>@@ -5642,9 +5711,10 @@ void TParseContext::checkTextureOffsetConst(TIntermAggregate *functionCall)
> 
> void TParseContext::checkAtomicMemoryBuiltinFunctions(TIntermAggregate *functionCall)
> {
>-    const TString &name = functionCall->getFunctionSymbolInfo()->getName();
>-    if (IsAtomicBuiltin(name))
>+    const TFunction *func = functionCall->getFunction();
>+    if (BuiltInGroup::isAtomicMemory(func))
>     {
>+        ASSERT(IsAtomicFunction(functionCall->getOp()));
>         TIntermSequence *arguments = functionCall->getSequence();
>         TIntermTyped *memNode      = (*arguments)[0]->getAsTyped();
> 
>@@ -5665,7 +5735,7 @@ void TParseContext::checkAtomicMemoryBuiltinFunctions(TIntermAggregate *function
>         error(memNode->getLine(),
>               "The value passed to the mem argument of an atomic memory function does not "
>               "correspond to a buffer or shared variable.",
>-              functionCall->getFunctionSymbolInfo()->getName().c_str());
>+              func->name());
>     }
> }
> 
>@@ -5673,16 +5743,17 @@ void TParseContext::checkAtomicMemoryBuiltinFunctions(TIntermAggregate *function
> void TParseContext::checkImageMemoryAccessForBuiltinFunctions(TIntermAggregate *functionCall)
> {
>     ASSERT(functionCall->getOp() == EOpCallBuiltInFunction);
>-    const TString &name = functionCall->getFunctionSymbolInfo()->getName();
> 
>-    if (name.compare(0, 5, "image") == 0)
>+    const TFunction *func = functionCall->getFunction();
>+
>+    if (BuiltInGroup::isImage(func))
>     {
>         TIntermSequence *arguments = functionCall->getSequence();
>         TIntermTyped *imageNode    = (*arguments)[0]->getAsTyped();
> 
>         const TMemoryQualifier &memoryQualifier = imageNode->getMemoryQualifier();
> 
>-        if (name.compare(5, 5, "Store") == 0)
>+        if (BuiltInGroup::isImageStore(func))
>         {
>             if (memoryQualifier.readonly)
>             {
>@@ -5691,7 +5762,7 @@ void TParseContext::checkImageMemoryAccessForBuiltinFunctions(TIntermAggregate *
>                       GetImageArgumentToken(imageNode));
>             }
>         }
>-        else if (name.compare(5, 4, "Load") == 0)
>+        else if (BuiltInGroup::isImageLoad(func))
>         {
>             if (memoryQualifier.writeonly)
>             {
>@@ -5718,7 +5789,7 @@ void TParseContext::checkImageMemoryAccessForUserDefinedFunctions(
>     {
>         TIntermTyped *typedArgument        = arguments[i]->getAsTyped();
>         const TType &functionArgumentType  = typedArgument->getType();
>-        const TType &functionParameterType = *functionDefinition->getParam(i).type;
>+        const TType &functionParameterType = functionDefinition->getParam(i)->getType();
>         ASSERT(functionArgumentType.getBasicType() == functionParameterType.getBasicType());
> 
>         if (IsImage(functionArgumentType.getBasicType()))
>@@ -5762,163 +5833,134 @@ void TParseContext::checkImageMemoryAccessForUserDefinedFunctions(
>     }
> }
> 
>-TIntermSequence *TParseContext::createEmptyArgumentsList()
>-{
>-    return new TIntermSequence();
>-}
>-
>-TIntermTyped *TParseContext::addFunctionCallOrMethod(TFunction *fnCall,
>-                                                     TIntermSequence *arguments,
>-                                                     TIntermNode *thisNode,
>-                                                     const TSourceLoc &loc)
>+TIntermTyped *TParseContext::addFunctionCallOrMethod(TFunctionLookup *fnCall, const TSourceLoc &loc)
> {
>-    if (thisNode != nullptr)
>-    {
>-        return addMethod(fnCall, arguments, thisNode, loc);
>-    }
>-
>-    TOperator op = fnCall->getBuiltInOp();
>-    if (op == EOpConstruct)
>+    if (fnCall->thisNode() != nullptr)
>     {
>-        return addConstructor(arguments, fnCall->getReturnType(), loc);
>+        return addMethod(fnCall, loc);
>     }
>-    else
>+    if (fnCall->isConstructor())
>     {
>-        ASSERT(op == EOpNull);
>-        return addNonConstructorFunctionCall(fnCall, arguments, loc);
>+        return addConstructor(fnCall, loc);
>     }
>+    return addNonConstructorFunctionCall(fnCall, loc);
> }
> 
>-TIntermTyped *TParseContext::addMethod(TFunction *fnCall,
>-                                       TIntermSequence *arguments,
>-                                       TIntermNode *thisNode,
>-                                       const TSourceLoc &loc)
>+TIntermTyped *TParseContext::addMethod(TFunctionLookup *fnCall, const TSourceLoc &loc)
> {
>-    TIntermTyped *typedThis    = thisNode->getAsTyped();
>+    TIntermTyped *thisNode = fnCall->thisNode();
>     // It's possible for the name pointer in the TFunction to be null in case it gets parsed as
>     // a constructor. But such a TFunction can't reach here, since the lexer goes into FIELDS
>     // mode after a dot, which makes type identifiers to be parsed as FIELD_SELECTION instead.
>-    // So accessing fnCall->getName() below is safe.
>-    if (fnCall->getName() != "length")
>+    // So accessing fnCall->name() below is safe.
>+    if (fnCall->name() != "length")
>     {
>-        error(loc, "invalid method", fnCall->getName().c_str());
>+        error(loc, "invalid method", fnCall->name());
>     }
>-    else if (!arguments->empty())
>+    else if (!fnCall->arguments().empty())
>     {
>         error(loc, "method takes no parameters", "length");
>     }
>-    else if (typedThis == nullptr || !typedThis->isArray())
>+    else if (!thisNode->isArray())
>     {
>         error(loc, "length can only be called on arrays", "length");
>     }
>-    else if (typedThis->getQualifier() == EvqPerVertexIn &&
>+    else if (thisNode->getQualifier() == EvqPerVertexIn &&
>              mGeometryShaderInputPrimitiveType == EptUndefined)
>     {
>-        ASSERT(mShaderType == GL_GEOMETRY_SHADER_OES);
>+        ASSERT(mShaderType == GL_GEOMETRY_SHADER_EXT);
>         error(loc, "missing input primitive declaration before calling length on gl_in", "length");
>     }
>     else
>     {
>-        TIntermUnary *node = new TIntermUnary(EOpArrayLength, typedThis);
>+        TIntermUnary *node = new TIntermUnary(EOpArrayLength, thisNode, nullptr);
>+        markStaticReadIfSymbol(thisNode);
>         node->setLine(loc);
>         return node->fold(mDiagnostics);
>     }
>     return CreateZeroNode(TType(EbtInt, EbpUndefined, EvqConst));
> }
> 
>-TIntermTyped *TParseContext::addNonConstructorFunctionCall(TFunction *fnCall,
>-                                                           TIntermSequence *arguments,
>+TIntermTyped *TParseContext::addNonConstructorFunctionCall(TFunctionLookup *fnCall,
>                                                            const TSourceLoc &loc)
> {
>-    // First find by unmangled name to check whether the function name has been
>-    // hidden by a variable name or struct typename.
>-    // If a function is found, check for one with a matching argument list.
>-    bool builtIn;
>-    const TSymbol *symbol = symbolTable.find(fnCall->getName(), mShaderVersion, &builtIn);
>-    if (symbol != nullptr && !symbol->isFunction())
>+    // First check whether the function has been hidden by a variable name or struct typename by
>+    // using the symbol looked up in the lexical phase. If the function is not hidden, look for one
>+    // with a matching argument list.
>+    if (fnCall->symbol() != nullptr && !fnCall->symbol()->isFunction())
>     {
>-        error(loc, "function name expected", fnCall->getName().c_str());
>+        error(loc, "function name expected", fnCall->name());
>     }
>     else
>     {
>-        symbol = symbolTable.find(TFunction::GetMangledNameFromCall(fnCall->getName(), *arguments),
>-                                  mShaderVersion, &builtIn);
>+        // There are no inner functions, so it's enough to look for user-defined functions in the
>+        // global scope.
>+        const TSymbol *symbol = symbolTable.findGlobal(fnCall->getMangledName());
>+        if (symbol != nullptr)
>+        {
>+            // A user-defined function - could be an overloaded built-in as well.
>+            ASSERT(symbol->symbolType() == SymbolType::UserDefined);
>+            const TFunction *fnCandidate = static_cast<const TFunction *>(symbol);
>+            TIntermAggregate *callNode =
>+                TIntermAggregate::CreateFunctionCall(*fnCandidate, &fnCall->arguments());
>+            callNode->setLine(loc);
>+            checkImageMemoryAccessForUserDefinedFunctions(fnCandidate, callNode);
>+            functionCallRValueLValueErrorCheck(fnCandidate, callNode);
>+            return callNode;
>+        }
>+
>+        symbol = symbolTable.findBuiltIn(fnCall->getMangledName(), mShaderVersion);
>         if (symbol == nullptr)
>         {
>-            error(loc, "no matching overloaded function found", fnCall->getName().c_str());
>+            error(loc, "no matching overloaded function found", fnCall->name());
>         }
>         else
>         {
>+            // A built-in function.
>+            ASSERT(symbol->symbolType() == SymbolType::BuiltIn);
>             const TFunction *fnCandidate = static_cast<const TFunction *>(symbol);
>-            //
>-            // A declared function.
>-            //
>-            if (builtIn && fnCandidate->getExtension() != TExtension::UNDEFINED)
>+
>+            if (fnCandidate->extension() != TExtension::UNDEFINED)
>             {
>-                checkCanUseExtension(loc, fnCandidate->getExtension());
>+                checkCanUseExtension(loc, fnCandidate->extension());
>             }
>             TOperator op = fnCandidate->getBuiltInOp();
>-            if (builtIn && op != EOpNull)
>+            if (op != EOpCallBuiltInFunction)
>             {
>                 // A function call mapped to a built-in operation.
>                 if (fnCandidate->getParamCount() == 1)
>                 {
>                     // Treat it like a built-in unary operator.
>-                    TIntermNode *unaryParamNode = arguments->front();
>-                    TIntermTyped *callNode = createUnaryMath(op, unaryParamNode->getAsTyped(), loc);
>+                    TIntermNode *unaryParamNode = fnCall->arguments().front();
>+                    TIntermTyped *callNode =
>+                        createUnaryMath(op, unaryParamNode->getAsTyped(), loc, fnCandidate);
>                     ASSERT(callNode != nullptr);
>                     return callNode;
>                 }
>-                else
>-                {
>-                    TIntermAggregate *callNode =
>-                        TIntermAggregate::Create(fnCandidate->getReturnType(), op, arguments);
>-                    callNode->setLine(loc);
> 
>-                    // Some built-in functions have out parameters too.
>-                    functionCallRValueLValueErrorCheck(fnCandidate, callNode);
>+                TIntermAggregate *callNode =
>+                    TIntermAggregate::CreateBuiltInFunctionCall(*fnCandidate, &fnCall->arguments());
>+                callNode->setLine(loc);
> 
>-                    if (TIntermAggregate::CanFoldAggregateBuiltInOp(callNode->getOp()))
>-                    {
>-                        // See if we can constant fold a built-in. Note that this may be possible
>-                        // even if it is not const-qualified.
>-                        return callNode->fold(mDiagnostics);
>-                    }
>-                    else
>-                    {
>-                        return callNode;
>-                    }
>-                }
>-            }
>-            else
>-            {
>-                // This is a real function call
>-                TIntermAggregate *callNode = nullptr;
>-
>-                // If builtIn == false, the function is user defined - could be an overloaded
>-                // built-in as well.
>-                // if builtIn == true, it's a builtIn function with no op associated with it.
>-                // This needs to happen after the function info including name is set.
>-                if (builtIn)
>-                {
>-                    callNode = TIntermAggregate::CreateBuiltInFunctionCall(*fnCandidate, arguments);
>-                    checkTextureOffsetConst(callNode);
>-                    checkTextureGather(callNode);
>-                    checkImageMemoryAccessForBuiltinFunctions(callNode);
>-                    checkAtomicMemoryBuiltinFunctions(callNode);
>-                }
>-                else
>-                {
>-                    callNode = TIntermAggregate::CreateFunctionCall(*fnCandidate, arguments);
>-                    checkImageMemoryAccessForUserDefinedFunctions(fnCandidate, callNode);
>-                }
>+                checkAtomicMemoryBuiltinFunctions(callNode);
> 
>+                // Some built-in functions have out parameters too.
>                 functionCallRValueLValueErrorCheck(fnCandidate, callNode);
> 
>-                callNode->setLine(loc);
>-
>-                return callNode;
>+                // See if we can constant fold a built-in. Note that this may be possible
>+                // even if it is not const-qualified.
>+                return callNode->fold(mDiagnostics);
>             }
>+
>+            // This is a built-in function with no op associated with it.
>+            TIntermAggregate *callNode =
>+                TIntermAggregate::CreateBuiltInFunctionCall(*fnCandidate, &fnCall->arguments());
>+            callNode->setLine(loc);
>+            checkTextureOffsetConst(callNode);
>+            checkTextureGather(callNode);
>+            checkImageMemoryAccessForBuiltinFunctions(callNode);
>+            functionCallRValueLValueErrorCheck(fnCandidate, callNode);
>+            return callNode;
>         }
>     }
> 
>@@ -5938,12 +5980,10 @@ TIntermTyped *TParseContext::addTernarySelection(TIntermTyped *cond,
> 
>     if (trueExpression->getType() != falseExpression->getType())
>     {
>-        std::stringstream reasonStream;
>-        reasonStream << "mismatching ternary operator operand types '"
>-                     << trueExpression->getCompleteString() << " and '"
>-                     << falseExpression->getCompleteString() << "'";
>-        std::string reason = reasonStream.str();
>-        error(loc, reason.c_str(), "?:");
>+        TInfoSinkBase reasonStream;
>+        reasonStream << "mismatching ternary operator operand types '" << trueExpression->getType()
>+                     << " and '" << falseExpression->getType() << "'";
>+        error(loc, reasonStream.c_str(), "?:");
>         return falseExpression;
>     }
>     if (IsOpaqueType(trueExpression->getBasicType()))
>@@ -5989,12 +6029,12 @@ TIntermTyped *TParseContext::addTernarySelection(TIntermTyped *cond,
>         return falseExpression;
>     }
> 
>-    // Note that the node resulting from here can be a constant union without being qualified as
>-    // constant.
>     TIntermTernary *node = new TIntermTernary(cond, trueExpression, falseExpression);
>+    markStaticReadIfSymbol(cond);
>+    markStaticReadIfSymbol(trueExpression);
>+    markStaticReadIfSymbol(falseExpression);
>     node->setLine(loc);
>-
>-    return node->fold();
>+    return expressionOrFoldedResult(node);
> }
> 
> //
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/ParseContext.h b/Source/ThirdParty/ANGLE/src/compiler/translator/ParseContext.h
>index 8bfdbd5e3f9..035e8c7788b 100644
>--- a/Source/ThirdParty/ANGLE/src/compiler/translator/ParseContext.h
>+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/ParseContext.h
>@@ -6,12 +6,14 @@
> #ifndef COMPILER_TRANSLATOR_PARSECONTEXT_H_
> #define COMPILER_TRANSLATOR_PARSECONTEXT_H_
> 
>+#include "compiler/preprocessor/Preprocessor.h"
> #include "compiler/translator/Compiler.h"
>+#include "compiler/translator/Declarator.h"
> #include "compiler/translator/Diagnostics.h"
> #include "compiler/translator/DirectiveHandler.h"
>-#include "compiler/translator/SymbolTable.h"
>+#include "compiler/translator/FunctionLookup.h"
> #include "compiler/translator/QualifierTypes.h"
>-#include "compiler/preprocessor/Preprocessor.h"
>+#include "compiler/translator/SymbolTable.h"
> 
> namespace sh
> {
>@@ -41,8 +43,8 @@ class TParseContext : angle::NonCopyable
>                   const ShBuiltInResources &resources);
>     ~TParseContext();
> 
>-    const pp::Preprocessor &getPreprocessor() const { return mPreprocessor; }
>-    pp::Preprocessor &getPreprocessor() { return mPreprocessor; }
>+    const angle::pp::Preprocessor &getPreprocessor() const { return mPreprocessor; }
>+    angle::pp::Preprocessor &getPreprocessor() { return mPreprocessor; }
>     void *getScanner() const { return mScanner; }
>     void setScanner(void *scanner) { mScanner = scanner; }
>     int getShaderVersion() const { return mShaderVersion; }
>@@ -50,6 +52,7 @@ class TParseContext : angle::NonCopyable
>     ShShaderSpec getShaderSpec() const { return mShaderSpec; }
>     int numErrors() const { return mDiagnostics->numErrors(); }
>     void error(const TSourceLoc &loc, const char *reason, const char *token);
>+    void error(const TSourceLoc &loc, const char *reason, const ImmutableString &token);
>     void warning(const TSourceLoc &loc, const char *reason, const char *token);
> 
>     // If isError is false, a warning will be reported instead.
>@@ -94,39 +97,44 @@ class TParseContext : angle::NonCopyable
> 
>     // This method is guaranteed to succeed, even if no variable with 'name' exists.
>     const TVariable *getNamedVariable(const TSourceLoc &location,
>-                                      const TString *name,
>+                                      const ImmutableString &name,
>                                       const TSymbol *symbol);
>     TIntermTyped *parseVariableIdentifier(const TSourceLoc &location,
>-                                          const TString *name,
>+                                          const ImmutableString &name,
>                                           const TSymbol *symbol);
> 
>     // Look at a '.' field selector string and change it into offsets for a vector.
>     bool parseVectorFields(const TSourceLoc &line,
>-                           const TString &compString,
>+                           const ImmutableString &compString,
>                            int vecSize,
>                            TVector<int> *fieldOffsets);
> 
>-    void assignError(const TSourceLoc &line, const char *op, TString left, TString right);
>-    void unaryOpError(const TSourceLoc &line, const char *op, TString operand);
>-    void binaryOpError(const TSourceLoc &line, const char *op, TString left, TString right);
>+    void assignError(const TSourceLoc &line, const char *op, const TType &left, const TType &right);
>+    void unaryOpError(const TSourceLoc &line, const char *op, const TType &operand);
>+    void binaryOpError(const TSourceLoc &line,
>+                       const char *op,
>+                       const TType &left,
>+                       const TType &right);
> 
>     // Check functions - the ones that return bool return false if an error was generated.
> 
>-    bool checkIsNotReserved(const TSourceLoc &line, const TString &identifier);
>+    bool checkIsNotReserved(const TSourceLoc &line, const ImmutableString &identifier);
>     void checkPrecisionSpecified(const TSourceLoc &line, TPrecision precision, TBasicType type);
>     bool checkCanBeLValue(const TSourceLoc &line, const char *op, TIntermTyped *node);
>     void checkIsConst(TIntermTyped *node);
>     void checkIsScalarInteger(TIntermTyped *node, const char *token);
>     bool checkIsAtGlobalLevel(const TSourceLoc &line, const char *token);
>     bool checkConstructorArguments(const TSourceLoc &line,
>-                                   const TIntermSequence *arguments,
>+                                   const TIntermSequence &arguments,
>                                    const TType &type);
> 
>     // Returns a sanitized array size to use (the size is at least 1).
>     unsigned int checkIsValidArraySize(const TSourceLoc &line, TIntermTyped *expr);
>     bool checkIsValidQualifierForArray(const TSourceLoc &line, const TPublicType &elementQualifier);
>     bool checkArrayElementIsNotArray(const TSourceLoc &line, const TPublicType &elementType);
>-    bool checkIsNonVoid(const TSourceLoc &line, const TString &identifier, const TBasicType &type);
>+    bool checkIsNonVoid(const TSourceLoc &line,
>+                        const ImmutableString &identifier,
>+                        const TBasicType &type);
>     bool checkIsScalarBool(const TSourceLoc &line, const TIntermTyped *type);
>     void checkIsScalarBool(const TSourceLoc &line, const TPublicType &pType);
>     bool checkIsNotOpaqueType(const TSourceLoc &line,
>@@ -163,7 +171,7 @@ class TParseContext : angle::NonCopyable
>     void emptyDeclarationErrorCheck(const TType &type, const TSourceLoc &location);
> 
>     void checkLayoutQualifierSupported(const TSourceLoc &location,
>-                                       const TString &layoutQualifierName,
>+                                       const ImmutableString &layoutQualifierName,
>                                        int versionRequired);
>     bool checkWorkGroupSizeIsNotSpecified(const TSourceLoc &location,
>                                           const TLayoutQualifier &layoutQualifier);
>@@ -191,12 +199,12 @@ class TParseContext : angle::NonCopyable
>     // Returns true on success. *initNode may still be nullptr on success in case the initialization
>     // is not needed in the AST.
>     bool executeInitializer(const TSourceLoc &line,
>-                            const TString &identifier,
>-                            TType type,
>+                            const ImmutableString &identifier,
>+                            TType *type,
>                             TIntermTyped *initializer,
>                             TIntermBinary **initNode);
>     TIntermNode *addConditionInitializer(const TPublicType &pType,
>-                                         const TString &identifier,
>+                                         const ImmutableString &identifier,
>                                          TIntermTyped *initializer,
>                                          const TSourceLoc &loc);
>     TIntermNode *addLoop(TLoopType type,
>@@ -216,15 +224,15 @@ class TParseContext : angle::NonCopyable
> 
>     TIntermDeclaration *parseSingleDeclaration(TPublicType &publicType,
>                                                const TSourceLoc &identifierOrTypeLocation,
>-                                               const TString &identifier);
>+                                               const ImmutableString &identifier);
>     TIntermDeclaration *parseSingleArrayDeclaration(TPublicType &elementType,
>                                                     const TSourceLoc &identifierLocation,
>-                                                    const TString &identifier,
>+                                                    const ImmutableString &identifier,
>                                                     const TSourceLoc &indexLocation,
>                                                     const TVector<unsigned int> &arraySizes);
>     TIntermDeclaration *parseSingleInitDeclaration(const TPublicType &publicType,
>                                                    const TSourceLoc &identifierLocation,
>-                                                   const TString &identifier,
>+                                                   const ImmutableString &identifier,
>                                                    const TSourceLoc &initLocation,
>                                                    TIntermTyped *initializer);
> 
>@@ -232,7 +240,7 @@ class TParseContext : angle::NonCopyable
>     // Note that this does not apply to declarations like "type[n] a = initializer"
>     TIntermDeclaration *parseSingleArrayInitDeclaration(TPublicType &elementType,
>                                                         const TSourceLoc &identifierLocation,
>-                                                        const TString &identifier,
>+                                                        const ImmutableString &identifier,
>                                                         const TSourceLoc &indexLocation,
>                                                         const TVector<unsigned int> &arraySizes,
>                                                         const TSourceLoc &initLocation,
>@@ -241,22 +249,22 @@ class TParseContext : angle::NonCopyable
>     TIntermInvariantDeclaration *parseInvariantDeclaration(
>         const TTypeQualifierBuilder &typeQualifierBuilder,
>         const TSourceLoc &identifierLoc,
>-        const TString *identifier,
>+        const ImmutableString &identifier,
>         const TSymbol *symbol);
> 
>     void parseDeclarator(TPublicType &publicType,
>                          const TSourceLoc &identifierLocation,
>-                         const TString &identifier,
>+                         const ImmutableString &identifier,
>                          TIntermDeclaration *declarationOut);
>     void parseArrayDeclarator(TPublicType &elementType,
>                               const TSourceLoc &identifierLocation,
>-                              const TString &identifier,
>+                              const ImmutableString &identifier,
>                               const TSourceLoc &arrayLocation,
>                               const TVector<unsigned int> &arraySizes,
>                               TIntermDeclaration *declarationOut);
>     void parseInitDeclarator(const TPublicType &publicType,
>                              const TSourceLoc &identifierLocation,
>-                             const TString &identifier,
>+                             const ImmutableString &identifier,
>                              const TSourceLoc &initLocation,
>                              TIntermTyped *initializer,
>                              TIntermDeclaration *declarationOut);
>@@ -264,7 +272,7 @@ class TParseContext : angle::NonCopyable
>     // Parse a declarator like "a[n] = initializer"
>     void parseArrayInitDeclarator(const TPublicType &elementType,
>                                   const TSourceLoc &identifierLocation,
>-                                  const TString &identifier,
>+                                  const ImmutableString &identifier,
>                                   const TSourceLoc &indexLocation,
>                                   const TVector<unsigned int> &arraySizes,
>                                   const TSourceLoc &initLocation,
>@@ -284,19 +292,21 @@ class TParseContext : angle::NonCopyable
>                                                      TIntermBlock *functionBody,
>                                                      const TSourceLoc &location);
>     void parseFunctionDefinitionHeader(const TSourceLoc &location,
>-                                       TFunction **function,
>+                                       const TFunction *function,
>                                        TIntermFunctionPrototype **prototypeOut);
>     TFunction *parseFunctionDeclarator(const TSourceLoc &location, TFunction *function);
>     TFunction *parseFunctionHeader(const TPublicType &type,
>-                                   const TString *name,
>+                                   const ImmutableString &name,
>                                    const TSourceLoc &location);
>-    TFunction *addNonConstructorFunc(const TString *name, const TSourceLoc &loc);
>-    TFunction *addConstructorFunc(const TPublicType &publicType);
>+
>+    TFunctionLookup *addNonConstructorFunc(const ImmutableString &name, const TSymbol *symbol);
>+    TFunctionLookup *addConstructorFunc(const TPublicType &publicType);
>+
>     TParameter parseParameterDeclarator(const TPublicType &publicType,
>-                                        const TString *name,
>+                                        const ImmutableString &name,
>                                         const TSourceLoc &nameLoc);
> 
>-    TParameter parseParameterArrayDeclarator(const TString *name,
>+    TParameter parseParameterArrayDeclarator(const ImmutableString &name,
>                                              const TSourceLoc &nameLoc,
>                                              const TVector<unsigned int> &arraySizes,
>                                              const TSourceLoc &arrayLoc,
>@@ -307,19 +317,18 @@ class TParseContext : angle::NonCopyable
>                                      TIntermTyped *indexExpression);
>     TIntermTyped *addFieldSelectionExpression(TIntermTyped *baseExpression,
>                                               const TSourceLoc &dotLocation,
>-                                              const TString &fieldString,
>+                                              const ImmutableString &fieldString,
>                                               const TSourceLoc &fieldLocation);
> 
>     // Parse declarator for a single field
>-    TField *parseStructDeclarator(TString *identifier, const TSourceLoc &loc);
>-    TField *parseStructArrayDeclarator(TString *identifier,
>-                                       const TSourceLoc &loc,
>-                                       const TVector<unsigned int> &arraySizes,
>-                                       const TSourceLoc &arraySizeLoc);
>+    TDeclarator *parseStructDeclarator(const ImmutableString &identifier, const TSourceLoc &loc);
>+    TDeclarator *parseStructArrayDeclarator(const ImmutableString &identifier,
>+                                            const TSourceLoc &loc,
>+                                            const TVector<unsigned int> *arraySizes);
> 
>     void checkDoesNotHaveDuplicateFieldName(const TFieldList::const_iterator begin,
>                                             const TFieldList::const_iterator end,
>-                                            const TString &name,
>+                                            const ImmutableString &name,
>                                             const TSourceLoc &location);
>     TFieldList *addStructFieldList(TFieldList *fields, const TSourceLoc &location);
>     TFieldList *combineStructFieldLists(TFieldList *processedFields,
>@@ -328,23 +337,24 @@ class TParseContext : angle::NonCopyable
>     TFieldList *addStructDeclaratorListWithQualifiers(
>         const TTypeQualifierBuilder &typeQualifierBuilder,
>         TPublicType *typeSpecifier,
>-        TFieldList *fieldList);
>-    TFieldList *addStructDeclaratorList(const TPublicType &typeSpecifier, TFieldList *fieldList);
>+        const TDeclaratorList *declaratorList);
>+    TFieldList *addStructDeclaratorList(const TPublicType &typeSpecifier,
>+                                        const TDeclaratorList *declaratorList);
>     TTypeSpecifierNonArray addStructure(const TSourceLoc &structLine,
>                                         const TSourceLoc &nameLine,
>-                                        const TString *structName,
>+                                        const ImmutableString &structName,
>                                         TFieldList *fieldList);
> 
>     TIntermDeclaration *addInterfaceBlock(const TTypeQualifierBuilder &typeQualifierBuilder,
>                                           const TSourceLoc &nameLine,
>-                                          const TString &blockName,
>+                                          const ImmutableString &blockName,
>                                           TFieldList *fieldList,
>-                                          const TString *instanceName,
>+                                          const ImmutableString &instanceName,
>                                           const TSourceLoc &instanceLine,
>                                           TIntermTyped *arrayIndex,
>                                           const TSourceLoc &arrayIndexLine);
> 
>-    void parseLocalSize(const TString &qualifierType,
>+    void parseLocalSize(const ImmutableString &qualifierType,
>                         const TSourceLoc &qualifierTypeLine,
>                         int intValue,
>                         const TSourceLoc &intValueLine,
>@@ -363,9 +373,13 @@ class TParseContext : angle::NonCopyable
>                           const TSourceLoc &intValueLine,
>                           const std::string &intValueString,
>                           int *numMaxVertices);
>-    TLayoutQualifier parseLayoutQualifier(const TString &qualifierType,
>+    void parseIndexLayoutQualifier(int intValue,
>+                                   const TSourceLoc &intValueLine,
>+                                   const std::string &intValueString,
>+                                   int *index);
>+    TLayoutQualifier parseLayoutQualifier(const ImmutableString &qualifierType,
>                                           const TSourceLoc &qualifierTypeLine);
>-    TLayoutQualifier parseLayoutQualifier(const TString &qualifierType,
>+    TLayoutQualifier parseLayoutQualifier(const ImmutableString &qualifierType,
>                                           const TSourceLoc &qualifierTypeLine,
>                                           int intValue,
>                                           const TSourceLoc &intValueLine);
>@@ -381,7 +395,7 @@ class TParseContext : angle::NonCopyable
>                                           const TSourceLoc &rightQualifierLocation);
> 
>     // Performs an error check for embedded struct declarations.
>-    void enterStructDeclaration(const TSourceLoc &line, const TString &identifier);
>+    void enterStructDeclaration(const TSourceLoc &line, const ImmutableString &identifier);
>     void exitStructDeclaration();
> 
>     void checkIsBelowStructNestingLimit(const TSourceLoc &line, const TField &field);
>@@ -412,20 +426,18 @@ class TParseContext : angle::NonCopyable
>     TIntermBranch *addBranch(TOperator op, const TSourceLoc &loc);
>     TIntermBranch *addBranch(TOperator op, TIntermTyped *expression, const TSourceLoc &loc);
> 
>+    void appendStatement(TIntermBlock *block, TIntermNode *statement);
>+
>     void checkTextureGather(TIntermAggregate *functionCall);
>     void checkTextureOffsetConst(TIntermAggregate *functionCall);
>     void checkImageMemoryAccessForBuiltinFunctions(TIntermAggregate *functionCall);
>     void checkImageMemoryAccessForUserDefinedFunctions(const TFunction *functionDefinition,
>                                                        const TIntermAggregate *functionCall);
>     void checkAtomicMemoryBuiltinFunctions(TIntermAggregate *functionCall);
>-    TIntermSequence *createEmptyArgumentsList();
> 
>     // fnCall is only storing the built-in op, and function name or constructor type. arguments
>     // has the arguments.
>-    TIntermTyped *addFunctionCallOrMethod(TFunction *fnCall,
>-                                          TIntermSequence *arguments,
>-                                          TIntermNode *thisNode,
>-                                          const TSourceLoc &loc);
>+    TIntermTyped *addFunctionCallOrMethod(TFunctionLookup *fnCall, const TSourceLoc &loc);
> 
>     TIntermTyped *addTernarySelection(TIntermTyped *cond,
>                                       TIntermTyped *trueExpression,
>@@ -447,7 +459,7 @@ class TParseContext : angle::NonCopyable
>     }
> 
>     // TODO(jmadill): make this private
>-    TSymbolTable &symbolTable;   // symbol table that goes with the language currently being parsed
>+    TSymbolTable &symbolTable;  // symbol table that goes with the language currently being parsed
> 
>   private:
>     class AtomicCounterBindingState;
>@@ -461,6 +473,8 @@ class TParseContext : angle::NonCopyable
>     // Note that there may be tests in AtomicCounter_test that will need to be updated as well.
>     constexpr static size_t kAtomicCounterArrayStride = 4;
> 
>+    void markStaticReadIfSymbol(TIntermNode *node);
>+
>     // Returns a clamped index. If it prints out an error message, the token is "[]".
>     int checkIndexLessThan(bool outOfRangeIndexIsError,
>                            const TSourceLoc &location,
>@@ -469,16 +483,16 @@ class TParseContext : angle::NonCopyable
>                            const char *reason);
> 
>     bool declareVariable(const TSourceLoc &line,
>-                         const TString &identifier,
>-                         const TType &type,
>+                         const ImmutableString &identifier,
>+                         const TType *type,
>                          TVariable **variable);
> 
>     void checkCanBeDeclaredWithoutInitializer(const TSourceLoc &line,
>-                                              const TString &identifier,
>+                                              const ImmutableString &identifier,
>                                               TType *type);
> 
>     TParameter parseParameterDeclarator(TType *type,
>-                                        const TString *name,
>+                                        const ImmutableString &name,
>                                         const TSourceLoc &nameLoc);
> 
>     bool checkIsValidTypeAndQualifierForArray(const TSourceLoc &indexLocation,
>@@ -501,6 +515,9 @@ class TParseContext : angle::NonCopyable
>     void checkAtomicCounterOffsetDoesNotOverlap(bool forceAppend,
>                                                 const TSourceLoc &loc,
>                                                 TType *type);
>+    void checkAtomicCounterOffsetAlignment(const TSourceLoc &location, const TType &type);
>+
>+    void checkIndexIsNotSpecified(const TSourceLoc &location, int index);
>     void checkBindingIsValid(const TSourceLoc &identifierLocation, const TType &type);
>     void checkBindingIsNotSpecified(const TSourceLoc &location, int binding);
>     void checkOffsetIsNotSpecified(const TSourceLoc &location, int offset);
>@@ -522,42 +539,38 @@ class TParseContext : angle::NonCopyable
> 
>     void checkYuvIsNotSpecified(const TSourceLoc &location, bool yuv);
> 
>-    bool checkUnsizedArrayConstructorArgumentDimensionality(TIntermSequence *arguments,
>+    bool checkUnsizedArrayConstructorArgumentDimensionality(const TIntermSequence &arguments,
>                                                             TType type,
>                                                             const TSourceLoc &line);
> 
>     // Will set the size of the outermost array according to geometry shader input layout.
>     void checkGeometryShaderInputAndSetArraySize(const TSourceLoc &location,
>-                                                 const char *token,
>+                                                 const ImmutableString &token,
>                                                  TType *type);
> 
>     // Will size any unsized array type so unsized arrays won't need to be taken into account
>     // further along the line in parsing.
>     void checkIsNotUnsizedArray(const TSourceLoc &line,
>                                 const char *errorMessage,
>-                                const char *token,
>+                                const ImmutableString &token,
>                                 TType *arrayType);
> 
>     TIntermTyped *addBinaryMathInternal(TOperator op,
>                                         TIntermTyped *left,
>                                         TIntermTyped *right,
>                                         const TSourceLoc &loc);
>-    TIntermBinary *createAssign(TOperator op,
>-                                TIntermTyped *left,
>-                                TIntermTyped *right,
>-                                const TSourceLoc &loc);
>-    TIntermTyped *createUnaryMath(TOperator op, TIntermTyped *child, const TSourceLoc &loc);
>+    TIntermTyped *createUnaryMath(TOperator op,
>+                                  TIntermTyped *child,
>+                                  const TSourceLoc &loc,
>+                                  const TFunction *func);
> 
>-    TIntermTyped *addMethod(TFunction *fnCall,
>-                            TIntermSequence *arguments,
>-                            TIntermNode *thisNode,
>-                            const TSourceLoc &loc);
>-    TIntermTyped *addConstructor(TIntermSequence *arguments,
>-                                 TType type,
>-                                 const TSourceLoc &line);
>-    TIntermTyped *addNonConstructorFunctionCall(TFunction *fnCall,
>-                                                TIntermSequence *arguments,
>-                                                const TSourceLoc &loc);
>+    TIntermTyped *addMethod(TFunctionLookup *fnCall, const TSourceLoc &loc);
>+    TIntermTyped *addConstructor(TFunctionLookup *fnCall, const TSourceLoc &line);
>+    TIntermTyped *addNonConstructorFunctionCall(TFunctionLookup *fnCall, const TSourceLoc &loc);
>+
>+    // Return either the original expression or the folded version of the expression in case the
>+    // folded node will validate the same way during subsequent parsing.
>+    TIntermTyped *expressionOrFoldedResult(TIntermTyped *expression);
> 
>     // Return true if the checks pass
>     bool binaryOpCommonCheck(TOperator op,
>@@ -604,12 +617,8 @@ class TParseContext : angle::NonCopyable
>     TString mHashErrMsg;
>     TDiagnostics *mDiagnostics;
>     TDirectiveHandler mDirectiveHandler;
>-    pp::Preprocessor mPreprocessor;
>+    angle::pp::Preprocessor mPreprocessor;
>     void *mScanner;
>-    bool mUsesFragData;  // track if we are using both gl_FragData and gl_FragColor
>-    bool mUsesFragColor;
>-    bool mUsesSecondaryOutputs;  // Track if we are using either gl_SecondaryFragData or
>-                                 // gl_Secondary FragColor or both.
>     int mMinProgramTexelOffset;
>     int mMaxProgramTexelOffset;
> 
>@@ -642,9 +651,6 @@ class TParseContext : angle::NonCopyable
>     int mGeometryShaderMaxVertices;
>     int mMaxGeometryShaderInvocations;
>     int mMaxGeometryShaderMaxVertices;
>-
>-    // Track if all input array sizes are same and matches the latter input primitive declaration.
>-    unsigned int mGeometryShaderInputArraySize;
> };
> 
> int PaParseStrings(size_t count,
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/ParseContext_autogen.h b/Source/ThirdParty/ANGLE/src/compiler/translator/ParseContext_autogen.h
>new file mode 100644
>index 00000000000..f5eafd8cf67
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/ParseContext_autogen.h
>@@ -0,0 +1,66 @@
>+// GENERATED FILE - DO NOT EDIT.
>+// Generated by gen_builtin_symbols.py using data from builtin_variables.json and
>+// builtin_function_declarations.txt.
>+//
>+// Copyright 2019 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// ParseContext_autogen.h:
>+//   Helpers for built-in related checks.
>+
>+#ifndef COMPILER_TRANSLATOR_PARSECONTEXT_AUTOGEN_H_
>+#define COMPILER_TRANSLATOR_PARSECONTEXT_AUTOGEN_H_
>+
>+namespace sh
>+{
>+
>+namespace BuiltInGroup
>+{
>+
>+bool isTextureOffsetNoBias(const TFunction *func)
>+{
>+    int id = func->uniqueId().get();
>+    return id >= 671 && id <= 740;
>+}
>+bool isTextureOffsetBias(const TFunction *func)
>+{
>+    int id = func->uniqueId().get();
>+    return id >= 741 && id <= 760;
>+}
>+bool isTextureGatherOffset(const TFunction *func)
>+{
>+    int id = func->uniqueId().get();
>+    return id >= 838 && id <= 851;
>+}
>+bool isTextureGather(const TFunction *func)
>+{
>+    int id = func->uniqueId().get();
>+    return id >= 814 && id <= 851;
>+}
>+bool isAtomicMemory(const TFunction *func)
>+{
>+    int id = func->uniqueId().get();
>+    return id >= 868 && id <= 885;
>+}
>+bool isImageLoad(const TFunction *func)
>+{
>+    int id = func->uniqueId().get();
>+    return id >= 910 && id <= 921;
>+}
>+bool isImageStore(const TFunction *func)
>+{
>+    int id = func->uniqueId().get();
>+    return id >= 922 && id <= 933;
>+}
>+bool isImage(const TFunction *func)
>+{
>+    int id = func->uniqueId().get();
>+    return id >= 886 && id <= 933;
>+}
>+
>+}  // namespace BuiltInGroup
>+
>+}  // namespace sh
>+
>+#endif  // COMPILER_TRANSLATOR_PARSECONTEXT_AUTOGEN_H_
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/PoolAlloc.cpp b/Source/ThirdParty/ANGLE/src/compiler/translator/PoolAlloc.cpp
>index 0f1cd8b5c9d..7a95658e7bd 100644
>--- a/Source/ThirdParty/ANGLE/src/compiler/translator/PoolAlloc.cpp
>+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/PoolAlloc.cpp
>@@ -6,15 +6,8 @@
> 
> #include "compiler/translator/PoolAlloc.h"
> 
>-#include <stdint.h>
>-#include <stdio.h>
> #include <assert.h>
>-
>-#include "common/angleutils.h"
>-#include "common/debug.h"
>-#include "common/platform.h"
> #include "common/tls.h"
>-#include "compiler/translator/InitializeGlobals.h"
> 
> TLSIndex PoolIndex = TLS_INVALID_INDEX;
> 
>@@ -34,327 +27,14 @@ void FreePoolIndex()
>     PoolIndex = TLS_INVALID_INDEX;
> }
> 
>-TPoolAllocator *GetGlobalPoolAllocator()
>+angle::PoolAllocator *GetGlobalPoolAllocator()
> {
>     assert(PoolIndex != TLS_INVALID_INDEX);
>-    return static_cast<TPoolAllocator *>(GetTLSValue(PoolIndex));
>+    return static_cast<angle::PoolAllocator *>(GetTLSValue(PoolIndex));
> }
> 
>-void SetGlobalPoolAllocator(TPoolAllocator *poolAllocator)
>+void SetGlobalPoolAllocator(angle::PoolAllocator *poolAllocator)
> {
>     assert(PoolIndex != TLS_INVALID_INDEX);
>     SetTLSValue(PoolIndex, poolAllocator);
> }
>-
>-//
>-// Implement the functionality of the TPoolAllocator class, which
>-// is documented in PoolAlloc.h.
>-//
>-TPoolAllocator::TPoolAllocator(int growthIncrement, int allocationAlignment)
>-    : alignment(allocationAlignment),
>-#if !defined(ANGLE_TRANSLATOR_DISABLE_POOL_ALLOC)
>-      pageSize(growthIncrement),
>-      freeList(0),
>-      inUseList(0),
>-      numCalls(0),
>-      totalBytes(0),
>-#endif
>-      mLocked(false)
>-{
>-    //
>-    // Adjust alignment to be at least pointer aligned and
>-    // power of 2.
>-    //
>-    size_t minAlign = sizeof(void *);
>-    alignment &= ~(minAlign - 1);
>-    if (alignment < minAlign)
>-        alignment = minAlign;
>-    size_t a      = 1;
>-    while (a < alignment)
>-        a <<= 1;
>-    alignment     = a;
>-    alignmentMask = a - 1;
>-
>-#if !defined(ANGLE_TRANSLATOR_DISABLE_POOL_ALLOC)
>-    //
>-    // Don't allow page sizes we know are smaller than all common
>-    // OS page sizes.
>-    //
>-    if (pageSize < 4 * 1024)
>-        pageSize = 4 * 1024;
>-
>-    //
>-    // A large currentPageOffset indicates a new page needs to
>-    // be obtained to allocate memory.
>-    //
>-    currentPageOffset = pageSize;
>-
>-    //
>-    // Align header skip
>-    //
>-    headerSkip = minAlign;
>-    if (headerSkip < sizeof(tHeader))
>-    {
>-        headerSkip = (sizeof(tHeader) + alignmentMask) & ~alignmentMask;
>-    }
>-#else  // !defined(ANGLE_TRANSLATOR_DISABLE_POOL_ALLOC)
>-    mStack.push_back({});
>-#endif
>-}
>-
>-TPoolAllocator::~TPoolAllocator()
>-{
>-#if !defined(ANGLE_TRANSLATOR_DISABLE_POOL_ALLOC)
>-    while (inUseList)
>-    {
>-        tHeader *next = inUseList->nextPage;
>-        inUseList->~tHeader();
>-        delete[] reinterpret_cast<char *>(inUseList);
>-        inUseList = next;
>-    }
>-
>-    // We should not check the guard blocks
>-    // here, because we did it already when the block was
>-    // placed into the free list.
>-    //
>-    while (freeList)
>-    {
>-        tHeader *next = freeList->nextPage;
>-        delete[] reinterpret_cast<char *>(freeList);
>-        freeList = next;
>-    }
>-#else  // !defined(ANGLE_TRANSLATOR_DISABLE_POOL_ALLOC)
>-    for (auto &allocs : mStack)
>-    {
>-        for (auto alloc : allocs)
>-        {
>-            free(alloc);
>-        }
>-    }
>-    mStack.clear();
>-#endif
>-}
>-
>-// Support MSVC++ 6.0
>-const unsigned char TAllocation::guardBlockBeginVal = 0xfb;
>-const unsigned char TAllocation::guardBlockEndVal   = 0xfe;
>-const unsigned char TAllocation::userDataFill       = 0xcd;
>-
>-#ifdef GUARD_BLOCKS
>-const size_t TAllocation::guardBlockSize = 16;
>-#else
>-const size_t TAllocation::guardBlockSize = 0;
>-#endif
>-
>-//
>-// Check a single guard block for damage
>-//
>-void TAllocation::checkGuardBlock(unsigned char *blockMem,
>-                                  unsigned char val,
>-                                  const char *locText) const
>-{
>-#ifdef GUARD_BLOCKS
>-    for (size_t x = 0; x < guardBlockSize; x++)
>-    {
>-        if (blockMem[x] != val)
>-        {
>-            char assertMsg[80];
>-
>-// We don't print the assert message.  It's here just to be helpful.
>-#if defined(_MSC_VER)
>-            snprintf(assertMsg, sizeof(assertMsg),
>-                     "PoolAlloc: Damage %s %Iu byte allocation at 0x%p\n", locText, size, data());
>-#else
>-            snprintf(assertMsg, sizeof(assertMsg),
>-                     "PoolAlloc: Damage %s %zu byte allocation at 0x%p\n", locText, size, data());
>-#endif
>-            assert(0 && "PoolAlloc: Damage in guard block");
>-        }
>-    }
>-#endif
>-}
>-
>-void TPoolAllocator::push()
>-{
>-#if !defined(ANGLE_TRANSLATOR_DISABLE_POOL_ALLOC)
>-    tAllocState state = {currentPageOffset, inUseList};
>-
>-    mStack.push_back(state);
>-
>-    //
>-    // Indicate there is no current page to allocate from.
>-    //
>-    currentPageOffset = pageSize;
>-#else  // !defined(ANGLE_TRANSLATOR_DISABLE_POOL_ALLOC)
>-    mStack.push_back({});
>-#endif
>-}
>-
>-//
>-// Do a mass-deallocation of all the individual allocations
>-// that have occurred since the last push(), or since the
>-// last pop(), or since the object's creation.
>-//
>-// The deallocated pages are saved for future allocations.
>-//
>-void TPoolAllocator::pop()
>-{
>-    if (mStack.size() < 1)
>-        return;
>-
>-#if !defined(ANGLE_TRANSLATOR_DISABLE_POOL_ALLOC)
>-    tHeader *page     = mStack.back().page;
>-    currentPageOffset = mStack.back().offset;
>-
>-    while (inUseList != page)
>-    {
>-        // invoke destructor to free allocation list
>-        inUseList->~tHeader();
>-
>-        tHeader *nextInUse = inUseList->nextPage;
>-        if (inUseList->pageCount > 1)
>-            delete[] reinterpret_cast<char *>(inUseList);
>-        else
>-        {
>-            inUseList->nextPage = freeList;
>-            freeList            = inUseList;
>-        }
>-        inUseList = nextInUse;
>-    }
>-
>-    mStack.pop_back();
>-#else  // !defined(ANGLE_TRANSLATOR_DISABLE_POOL_ALLOC)
>-    for (auto &alloc : mStack.back())
>-    {
>-        free(alloc);
>-    }
>-    mStack.pop_back();
>-#endif
>-}
>-
>-//
>-// Do a mass-deallocation of all the individual allocations
>-// that have occurred.
>-//
>-void TPoolAllocator::popAll()
>-{
>-    while (mStack.size() > 0)
>-        pop();
>-}
>-
>-void *TPoolAllocator::allocate(size_t numBytes)
>-{
>-    ASSERT(!mLocked);
>-
>-#if !defined(ANGLE_TRANSLATOR_DISABLE_POOL_ALLOC)
>-    //
>-    // Just keep some interesting statistics.
>-    //
>-    ++numCalls;
>-    totalBytes += numBytes;
>-
>-    // If we are using guard blocks, all allocations are bracketed by
>-    // them: [guardblock][allocation][guardblock].  numBytes is how
>-    // much memory the caller asked for.  allocationSize is the total
>-    // size including guard blocks.  In release build,
>-    // guardBlockSize=0 and this all gets optimized away.
>-    size_t allocationSize = TAllocation::allocationSize(numBytes);
>-    // Detect integer overflow.
>-    if (allocationSize < numBytes)
>-        return 0;
>-
>-    //
>-    // Do the allocation, most likely case first, for efficiency.
>-    // This step could be moved to be inline sometime.
>-    //
>-    if (allocationSize <= pageSize - currentPageOffset)
>-    {
>-        //
>-        // Safe to allocate from currentPageOffset.
>-        //
>-        unsigned char *memory = reinterpret_cast<unsigned char *>(inUseList) + currentPageOffset;
>-        currentPageOffset += allocationSize;
>-        currentPageOffset = (currentPageOffset + alignmentMask) & ~alignmentMask;
>-
>-        return initializeAllocation(inUseList, memory, numBytes);
>-    }
>-
>-    if (allocationSize > pageSize - headerSkip)
>-    {
>-        //
>-        // Do a multi-page allocation.  Don't mix these with the others.
>-        // The OS is efficient and allocating and free-ing multiple pages.
>-        //
>-        size_t numBytesToAlloc = allocationSize + headerSkip;
>-        // Detect integer overflow.
>-        if (numBytesToAlloc < allocationSize)
>-            return 0;
>-
>-        tHeader *memory = reinterpret_cast<tHeader *>(::new char[numBytesToAlloc]);
>-        if (memory == 0)
>-            return 0;
>-
>-        // Use placement-new to initialize header
>-        new (memory) tHeader(inUseList, (numBytesToAlloc + pageSize - 1) / pageSize);
>-        inUseList = memory;
>-
>-        currentPageOffset = pageSize;  // make next allocation come from a new page
>-
>-        // No guard blocks for multi-page allocations (yet)
>-        return reinterpret_cast<void *>(reinterpret_cast<uintptr_t>(memory) + headerSkip);
>-    }
>-
>-    //
>-    // Need a simple page to allocate from.
>-    //
>-    tHeader *memory;
>-    if (freeList)
>-    {
>-        memory   = freeList;
>-        freeList = freeList->nextPage;
>-    }
>-    else
>-    {
>-        memory = reinterpret_cast<tHeader *>(::new char[pageSize]);
>-        if (memory == 0)
>-            return 0;
>-    }
>-
>-    // Use placement-new to initialize header
>-    new (memory) tHeader(inUseList, 1);
>-    inUseList = memory;
>-
>-    unsigned char *ret = reinterpret_cast<unsigned char *>(inUseList) + headerSkip;
>-    currentPageOffset  = (headerSkip + allocationSize + alignmentMask) & ~alignmentMask;
>-
>-    return initializeAllocation(inUseList, ret, numBytes);
>-#else  // !defined(ANGLE_TRANSLATOR_DISABLE_POOL_ALLOC)
>-    void *alloc = malloc(numBytes + alignmentMask);
>-    mStack.back().push_back(alloc);
>-
>-    intptr_t intAlloc = reinterpret_cast<intptr_t>(alloc);
>-    intAlloc          = (intAlloc + alignmentMask) & ~alignmentMask;
>-    return reinterpret_cast<void *>(intAlloc);
>-#endif
>-}
>-
>-void TPoolAllocator::lock()
>-{
>-    ASSERT(!mLocked);
>-    mLocked = true;
>-}
>-
>-void TPoolAllocator::unlock()
>-{
>-    ASSERT(mLocked);
>-    mLocked = false;
>-}
>-
>-//
>-// Check all allocations in a list for damage by calling check on each.
>-//
>-void TAllocation::checkAllocList() const
>-{
>-    for (const TAllocation *alloc = this; alloc != 0; alloc = alloc->prevAlloc)
>-        alloc->check();
>-}
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/PoolAlloc.h b/Source/ThirdParty/ANGLE/src/compiler/translator/PoolAlloc.h
>index ad63bc4cd66..86980b43a12 100644
>--- a/Source/ThirdParty/ANGLE/src/compiler/translator/PoolAlloc.h
>+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/PoolAlloc.h
>@@ -7,243 +7,27 @@
> #ifndef COMPILER_TRANSLATOR_POOLALLOC_H_
> #define COMPILER_TRANSLATOR_POOLALLOC_H_
> 
>-#ifdef _DEBUG
>-#define GUARD_BLOCKS  // define to enable guard block sanity checking
>-#endif
>-
>-//
>-// This header defines an allocator that can be used to efficiently
>-// allocate a large number of small requests for heap memory, with the
>-// intention that they are not individually deallocated, but rather
>-// collectively deallocated at one time.
>-//
>-// This simultaneously
>-//
>-// * Makes each individual allocation much more efficient; the
>-//     typical allocation is trivial.
>-// * Completely avoids the cost of doing individual deallocation.
>-// * Saves the trouble of tracking down and plugging a large class of leaks.
> //
>-// Individual classes can use this allocator by supplying their own
>-// new and delete methods.
>-//
>-// STL containers can use this allocator by using the pool_allocator
>+// This header defines the pool_allocator class that allows STL containers
>+// to use the angle::PoolAllocator class by using the pool_allocator
> // class as the allocator (second) template argument.
> //
>+// It also defines functions for managing the GlobalPoolAllocator used by the compiler.
>+//
> 
> #include <stddef.h>
> #include <string.h>
> #include <vector>
> 
>-// If we are using guard blocks, we must track each indivual
>-// allocation.  If we aren't using guard blocks, these
>-// never get instantiated, so won't have any impact.
>-//
>-
>-class TAllocation
>-{
>-  public:
>-    TAllocation(size_t size, unsigned char *mem, TAllocation *prev = 0)
>-        : size(size), mem(mem), prevAlloc(prev)
>-    {
>-// Allocations are bracketed:
>-//    [allocationHeader][initialGuardBlock][userData][finalGuardBlock]
>-// This would be cleaner with if (guardBlockSize)..., but that
>-// makes the compiler print warnings about 0 length memsets,
>-// even with the if() protecting them.
>-#ifdef GUARD_BLOCKS
>-        memset(preGuard(), guardBlockBeginVal, guardBlockSize);
>-        memset(data(), userDataFill, size);
>-        memset(postGuard(), guardBlockEndVal, guardBlockSize);
>-#endif
>-    }
>-
>-    void check() const
>-    {
>-        checkGuardBlock(preGuard(), guardBlockBeginVal, "before");
>-        checkGuardBlock(postGuard(), guardBlockEndVal, "after");
>-    }
>-
>-    void checkAllocList() const;
>-
>-    // Return total size needed to accomodate user buffer of 'size',
>-    // plus our tracking data.
>-    inline static size_t allocationSize(size_t size)
>-    {
>-        return size + 2 * guardBlockSize + headerSize();
>-    }
>-
>-    // Offset from surrounding buffer to get to user data buffer.
>-    inline static unsigned char *offsetAllocation(unsigned char *m)
>-    {
>-        return m + guardBlockSize + headerSize();
>-    }
>-
>-  private:
>-    void checkGuardBlock(unsigned char *blockMem, unsigned char val, const char *locText) const;
>-
>-    // Find offsets to pre and post guard blocks, and user data buffer
>-    unsigned char *preGuard() const { return mem + headerSize(); }
>-    unsigned char *data() const { return preGuard() + guardBlockSize; }
>-    unsigned char *postGuard() const { return data() + size; }
>-
>-    size_t size;             // size of the user data area
>-    unsigned char *mem;      // beginning of our allocation (pts to header)
>-    TAllocation *prevAlloc;  // prior allocation in the chain
>-
>-    // Support MSVC++ 6.0
>-    const static unsigned char guardBlockBeginVal;
>-    const static unsigned char guardBlockEndVal;
>-    const static unsigned char userDataFill;
>-
>-    const static size_t guardBlockSize;
>-#ifdef GUARD_BLOCKS
>-    inline static size_t headerSize() { return sizeof(TAllocation); }
>-#else
>-    inline static size_t headerSize() { return 0; }
>-#endif
>-};
>-
>-//
>-// There are several stacks.  One is to track the pushing and popping
>-// of the user, and not yet implemented.  The others are simply a
>-// repositories of free pages or used pages.
>-//
>-// Page stacks are linked together with a simple header at the beginning
>-// of each allocation obtained from the underlying OS.  Multi-page allocations
>-// are returned to the OS.  Individual page allocations are kept for future
>-// re-use.
>-//
>-// The "page size" used is not, nor must it match, the underlying OS
>-// page size.  But, having it be about that size or equal to a set of
>-// pages is likely most optimal.
>-//
>-class TPoolAllocator
>-{
>-  public:
>-    TPoolAllocator(int growthIncrement = 8 * 1024, int allocationAlignment = 16);
>-
>-    //
>-    // Don't call the destructor just to free up the memory, call pop()
>-    //
>-    ~TPoolAllocator();
>-
>-    //
>-    // Call push() to establish a new place to pop memory too.  Does not
>-    // have to be called to get things started.
>-    //
>-    void push();
>-
>-    //
>-    // Call pop() to free all memory allocated since the last call to push(),
>-    // or if no last call to push, frees all memory since first allocation.
>-    //
>-    void pop();
>-
>-    //
>-    // Call popAll() to free all memory allocated.
>-    //
>-    void popAll();
>-
>-    //
>-    // Call allocate() to actually acquire memory.  Returns 0 if no memory
>-    // available, otherwise a properly aligned pointer to 'numBytes' of memory.
>-    //
>-    void *allocate(size_t numBytes);
>-
>-    //
>-    // There is no deallocate.  The point of this class is that
>-    // deallocation can be skipped by the user of it, as the model
>-    // of use is to simultaneously deallocate everything at once
>-    // by calling pop(), and to not have to solve memory leak problems.
>-    //
>-
>-    // Catch unwanted allocations.
>-    // TODO(jmadill): Remove this when we remove the global allocator.
>-    void lock();
>-    void unlock();
>-
>-  private:
>-    size_t alignment;  // all returned allocations will be aligned at
>-                       // this granularity, which will be a power of 2
>-    size_t alignmentMask;
>-
>-#if !defined(ANGLE_TRANSLATOR_DISABLE_POOL_ALLOC)
>-    friend struct tHeader;
>-
>-    struct tHeader
>-    {
>-        tHeader(tHeader *nextPage, size_t pageCount)
>-            : nextPage(nextPage),
>-              pageCount(pageCount)
>-#ifdef GUARD_BLOCKS
>-              ,
>-              lastAllocation(0)
>-#endif
>-        {
>-        }
>-
>-        ~tHeader()
>-        {
>-#ifdef GUARD_BLOCKS
>-            if (lastAllocation)
>-                lastAllocation->checkAllocList();
>-#endif
>-        }
>-
>-        tHeader *nextPage;
>-        size_t pageCount;
>-#ifdef GUARD_BLOCKS
>-        TAllocation *lastAllocation;
>-#endif
>-    };
>-
>-    struct tAllocState
>-    {
>-        size_t offset;
>-        tHeader *page;
>-    };
>-    typedef std::vector<tAllocState> tAllocStack;
>-
>-    // Track allocations if and only if we're using guard blocks
>-    void *initializeAllocation(tHeader *block, unsigned char *memory, size_t numBytes)
>-    {
>-#ifdef GUARD_BLOCKS
>-        new (memory) TAllocation(numBytes, memory, block->lastAllocation);
>-        block->lastAllocation = reinterpret_cast<TAllocation *>(memory);
>-#endif
>-        // This is optimized entirely away if GUARD_BLOCKS is not defined.
>-        return TAllocation::offsetAllocation(memory);
>-    }
>-
>-    size_t pageSize;           // granularity of allocation from the OS
>-    size_t headerSkip;         // amount of memory to skip to make room for the
>-                               //      header (basically, size of header, rounded
>-                               //      up to make it aligned
>-    size_t currentPageOffset;  // next offset in top of inUseList to allocate from
>-    tHeader *freeList;         // list of popped memory
>-    tHeader *inUseList;        // list of all memory currently being used
>-    tAllocStack mStack;        // stack of where to allocate from, to partition pool
>-
>-    int numCalls;       // just an interesting statistic
>-    size_t totalBytes;  // just an interesting statistic
>-
>-#else  // !defined(ANGLE_TRANSLATOR_DISABLE_POOL_ALLOC)
>-    std::vector<std::vector<void *>> mStack;
>-#endif
>-
>-    TPoolAllocator &operator=(const TPoolAllocator &);  // dont allow assignment operator
>-    TPoolAllocator(const TPoolAllocator &);             // dont allow default copy constructor
>-    bool mLocked;
>-};
>+#include "common/PoolAlloc.h"
> 
> //
> // There could potentially be many pools with pops happening at
> // different times.  But a simple use is to have a global pop
> // with everyone using the same global allocator.
> //
>-extern TPoolAllocator *GetGlobalPoolAllocator();
>-extern void SetGlobalPoolAllocator(TPoolAllocator *poolAllocator);
>+extern angle::PoolAllocator *GetGlobalPoolAllocator();
>+extern void SetGlobalPoolAllocator(angle::PoolAllocator *poolAllocator);
> 
> //
> // This STL compatible allocator is intended to be used as the allocator
>@@ -276,8 +60,7 @@ class pool_allocator
> 
>     template <class Other>
>     pool_allocator(const pool_allocator<Other> &p)
>-    {
>-    }
>+    {}
> 
>     template <class Other>
>     pool_allocator<T> &operator=(const pool_allocator<Other> &p)
>@@ -295,11 +78,11 @@ class pool_allocator
> #else
>     pointer allocate(size_type n)
>     {
>-        return reinterpret_cast<pointer>(getAllocator().allocate(n * sizeof(T)));
>+        return static_cast<pointer>(getAllocator().allocate(n * sizeof(T)));
>     }
>     pointer allocate(size_type n, const void *)
>     {
>-        return reinterpret_cast<pointer>(getAllocator().allocate(n * sizeof(T)));
>+        return static_cast<pointer>(getAllocator().allocate(n * sizeof(T)));
>     }
>     void deallocate(pointer, size_type) {}
> #endif  // _RWSTD_ALLOCATOR
>@@ -313,7 +96,7 @@ class pool_allocator
>     size_type max_size() const { return static_cast<size_type>(-1) / sizeof(T); }
>     size_type max_size(int size) const { return static_cast<size_type>(-1) / size; }
> 
>-    TPoolAllocator &getAllocator() const { return *GetGlobalPoolAllocator(); }
>+    angle::PoolAllocator &getAllocator() const { return *GetGlobalPoolAllocator(); }
> };
> 
> #endif  // COMPILER_TRANSLATOR_POOLALLOC_H_
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/PruneNoOps.cpp b/Source/ThirdParty/ANGLE/src/compiler/translator/PruneNoOps.cpp
>deleted file mode 100644
>index 6c9a02cd1cd..00000000000
>--- a/Source/ThirdParty/ANGLE/src/compiler/translator/PruneNoOps.cpp
>+++ /dev/null
>@@ -1,156 +0,0 @@
>-//
>-// Copyright (c) 2002-2015 The ANGLE Project Authors. All rights reserved.
>-// Use of this source code is governed by a BSD-style license that can be
>-// found in the LICENSE file.
>-//
>-// PruneNoOps.cpp: The PruneNoOps function prunes:
>-//   1. Empty declarations "int;". Empty declarators will be pruned as well, so for example:
>-//        int , a;
>-//      is turned into
>-//        int a;
>-//   2. Literal statements: "1.0;". The ESSL output doesn't define a default precision for float,
>-//      so float literal statements would end up with no precision which is invalid ESSL.
>-
>-#include "compiler/translator/PruneNoOps.h"
>-
>-#include "compiler/translator/IntermTraverse.h"
>-
>-namespace sh
>-{
>-
>-namespace
>-{
>-
>-bool IsNoOp(TIntermNode *node)
>-{
>-    if (node->getAsConstantUnion() != nullptr)
>-    {
>-        return true;
>-    }
>-    bool isEmptyDeclaration = node->getAsDeclarationNode() != nullptr &&
>-                              node->getAsDeclarationNode()->getSequence()->empty();
>-    if (isEmptyDeclaration)
>-    {
>-        return true;
>-    }
>-    return false;
>-}
>-
>-class PruneNoOpsTraverser : private TIntermTraverser
>-{
>-  public:
>-    static void apply(TIntermBlock *root);
>-
>-  private:
>-    PruneNoOpsTraverser();
>-    bool visitDeclaration(Visit, TIntermDeclaration *node) override;
>-    bool visitBlock(Visit visit, TIntermBlock *node) override;
>-    bool visitLoop(Visit visit, TIntermLoop *loop) override;
>-};
>-
>-void PruneNoOpsTraverser::apply(TIntermBlock *root)
>-{
>-    PruneNoOpsTraverser prune;
>-    root->traverse(&prune);
>-    prune.updateTree();
>-}
>-
>-PruneNoOpsTraverser::PruneNoOpsTraverser() : TIntermTraverser(true, false, false)
>-{
>-}
>-
>-bool PruneNoOpsTraverser::visitDeclaration(Visit, TIntermDeclaration *node)
>-{
>-    TIntermSequence *sequence = node->getSequence();
>-    if (sequence->size() >= 1)
>-    {
>-        TIntermSymbol *sym = sequence->front()->getAsSymbolNode();
>-        // Prune declarations without a variable name, unless it's an interface block declaration.
>-        if (sym != nullptr && sym->getSymbol() == "" && !sym->isInterfaceBlock())
>-        {
>-            if (sequence->size() > 1)
>-            {
>-                // Generate a replacement that will remove the empty declarator in the beginning of
>-                // a declarator list. Example of a declaration that will be changed:
>-                // float, a;
>-                // will be changed to
>-                // float a;
>-                // This applies also to struct declarations.
>-                TIntermSequence emptyReplacement;
>-                mMultiReplacements.push_back(
>-                    NodeReplaceWithMultipleEntry(node, sym, emptyReplacement));
>-            }
>-            else if (sym->getBasicType() != EbtStruct)
>-            {
>-                // If there are entirely empty non-struct declarations, they result in
>-                // TIntermDeclaration nodes without any children in the parsing stage. These are
>-                // handled in visitBlock and visitLoop.
>-                UNREACHABLE();
>-            }
>-            else if (sym->getType().getQualifier() != EvqGlobal &&
>-                     sym->getType().getQualifier() != EvqTemporary)
>-            {
>-                // Single struct declarations may just declare the struct type and no variables, so
>-                // they should not be pruned. Here we handle an empty struct declaration with a
>-                // qualifier, for example like this:
>-                //   const struct a { int i; };
>-                // NVIDIA GL driver version 367.27 doesn't accept this kind of declarations, so we
>-                // convert the declaration to a regular struct declaration. This is okay, since ESSL
>-                // 1.00 spec section 4.1.8 says about structs that "The optional qualifiers only
>-                // apply to any declarators, and are not part of the type being defined for name."
>-
>-                if (mInGlobalScope)
>-                {
>-                    sym->getTypePointer()->setQualifier(EvqGlobal);
>-                }
>-                else
>-                {
>-                    sym->getTypePointer()->setQualifier(EvqTemporary);
>-                }
>-            }
>-        }
>-    }
>-    return false;
>-}
>-
>-bool PruneNoOpsTraverser::visitBlock(Visit visit, TIntermBlock *node)
>-{
>-    TIntermSequence *statements = node->getSequence();
>-
>-    for (TIntermNode *statement : *statements)
>-    {
>-        if (IsNoOp(statement))
>-        {
>-            TIntermSequence emptyReplacement;
>-            mMultiReplacements.push_back(
>-                NodeReplaceWithMultipleEntry(node, statement, emptyReplacement));
>-        }
>-    }
>-
>-    return true;
>-}
>-
>-bool PruneNoOpsTraverser::visitLoop(Visit visit, TIntermLoop *loop)
>-{
>-    TIntermTyped *expr = loop->getExpression();
>-    if (expr != nullptr && IsNoOp(expr))
>-    {
>-        loop->setExpression(nullptr);
>-    }
>-    TIntermNode *init = loop->getInit();
>-    if (init != nullptr && IsNoOp(init))
>-    {
>-        loop->setInit(nullptr);
>-    }
>-
>-    return true;
>-}
>-
>-}  // namespace
>-
>-void PruneNoOps(TIntermBlock *root)
>-{
>-    PruneNoOpsTraverser::apply(root);
>-}
>-
>-}  // namespace sh
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/PruneNoOps.h b/Source/ThirdParty/ANGLE/src/compiler/translator/PruneNoOps.h
>deleted file mode 100644
>index c421cecca45..00000000000
>--- a/Source/ThirdParty/ANGLE/src/compiler/translator/PruneNoOps.h
>+++ /dev/null
>@@ -1,24 +0,0 @@
>-//
>-// Copyright (c) 2002-2015 The ANGLE Project Authors. All rights reserved.
>-// Use of this source code is governed by a BSD-style license that can be
>-// found in the LICENSE file.
>-//
>-// PruneNoOps.h: The PruneNoOps function prunes:
>-//   1. Empty declarations "int;". Empty declarators will be pruned as well, so for example:
>-//        int , a;
>-//      is turned into
>-//        int a;
>-//   2. Literal statements: "1.0;". The ESSL output doesn't define a default precision for float,
>-//      so float literal statements would end up with no precision which is invalid ESSL.
>-
>-#ifndef COMPILER_TRANSLATOR_PRUNENOOPS_H_
>-#define COMPILER_TRANSLATOR_PRUNENOOPS_H_
>-
>-namespace sh
>-{
>-class TIntermBlock;
>-
>-void PruneNoOps(TIntermBlock *root);
>-}
>-
>-#endif  // COMPILER_TRANSLATOR_PRUNENOOPS_H_
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/QualifierTypes.cpp b/Source/ThirdParty/ANGLE/src/compiler/translator/QualifierTypes.cpp
>index f7481759579..f9b4474b508 100644
>--- a/Source/ThirdParty/ANGLE/src/compiler/translator/QualifierTypes.cpp
>+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/QualifierTypes.cpp
>@@ -7,6 +7,7 @@
> #include "compiler/translator/QualifierTypes.h"
> 
> #include "compiler/translator/Diagnostics.h"
>+#include "compiler/translator/ImmutableStringBuilder.h"
> 
> #include <algorithm>
> 
>@@ -16,6 +17,35 @@ namespace sh
> namespace
> {
> 
>+constexpr const ImmutableString kSpecifiedMultipleTimes(" specified multiple times");
>+constexpr const ImmutableString kInvariantMultipleTimes(
>+    "The invariant qualifier specified multiple times.");
>+constexpr const ImmutableString kPrecisionMultipleTimes(
>+    "The precision qualifier specified multiple times.");
>+constexpr const ImmutableString kLayoutMultipleTimes(
>+    "The layout qualifier specified multiple times.");
>+constexpr const ImmutableString kLayoutAndInvariantDisallowed(
>+    "The layout qualifier and invariant qualifier cannot coexist in the same "
>+    "declaration according to the grammar.");
>+constexpr const ImmutableString kInterpolationMultipleTimes(
>+    "The interpolation qualifier specified multiple times.");
>+constexpr const ImmutableString kOutputLayoutMultipleTimes(
>+    "Output layout location specified multiple times.");
>+constexpr const ImmutableString kInvariantQualifierFirst(
>+    "The invariant qualifier has to be first in the expression.");
>+constexpr const ImmutableString kStorageAfterInterpolation(
>+    "Storage qualifiers have to be after interpolation qualifiers.");
>+constexpr const ImmutableString kPrecisionAfterInterpolation(
>+    "Precision qualifiers have to be after interpolation qualifiers.");
>+constexpr const ImmutableString kStorageAfterLayout(
>+    "Storage qualifiers have to be after layout qualifiers.");
>+constexpr const ImmutableString kPrecisionAfterLayout(
>+    "Precision qualifiers have to be after layout qualifiers.");
>+constexpr const ImmutableString kPrecisionAfterStorage(
>+    "Precision qualifiers have to be after storage qualifiers.");
>+constexpr const ImmutableString kPrecisionAfterMemory(
>+    "Precision qualifiers have to be after memory qualifiers.");
>+
> // GLSL ES 3.10 does not impose a strict order on type qualifiers and allows multiple layout
> // declarations.
> // GLSL ES 3.10 Revision 4, 4.10 Order of Qualification
>@@ -47,11 +77,18 @@ bool IsInvariantCorrect(const TTypeQualifierBuilder::QualifierSequence &qualifie
>     return qualifiers.size() >= 1 && IsScopeQualifierWrapper(qualifiers[0]);
> }
> 
>+ImmutableString QualifierSpecifiedMultipleTimesErrorMessage(const ImmutableString &qualifierString)
>+{
>+    ImmutableStringBuilder errorMsg(qualifierString.length() + kSpecifiedMultipleTimes.length());
>+    errorMsg << qualifierString << kSpecifiedMultipleTimes;
>+    return errorMsg;
>+}
>+
> // Returns true if there are qualifiers which have been specified multiple times
> // If areQualifierChecksRelaxed is set to true, then layout qualifier repetition is allowed.
> bool HasRepeatingQualifiers(const TTypeQualifierBuilder::QualifierSequence &qualifiers,
>                             bool areQualifierChecksRelaxed,
>-                            std::string *errorMessage)
>+                            ImmutableString *errorMessage)
> {
>     bool invariantFound     = false;
>     bool precisionFound     = false;
>@@ -71,7 +108,7 @@ bool HasRepeatingQualifiers(const TTypeQualifierBuilder::QualifierSequence &qual
>             {
>                 if (invariantFound)
>                 {
>-                    *errorMessage = "The invariant qualifier specified multiple times.";
>+                    *errorMessage = kInvariantMultipleTimes;
>                     return true;
>                 }
>                 invariantFound = true;
>@@ -81,7 +118,7 @@ bool HasRepeatingQualifiers(const TTypeQualifierBuilder::QualifierSequence &qual
>             {
>                 if (precisionFound)
>                 {
>-                    *errorMessage = "The precision qualifier specified multiple times.";
>+                    *errorMessage = kPrecisionMultipleTimes;
>                     return true;
>                 }
>                 precisionFound = true;
>@@ -91,7 +128,7 @@ bool HasRepeatingQualifiers(const TTypeQualifierBuilder::QualifierSequence &qual
>             {
>                 if (layoutFound && !areQualifierChecksRelaxed)
>                 {
>-                    *errorMessage = "The layout qualifier specified multiple times.";
>+                    *errorMessage = kLayoutMultipleTimes;
>                     return true;
>                 }
>                 if (invariantFound && !areQualifierChecksRelaxed)
>@@ -99,9 +136,7 @@ bool HasRepeatingQualifiers(const TTypeQualifierBuilder::QualifierSequence &qual
>                     // This combination is not correct according to the syntax specified in the
>                     // formal grammar in the ESSL 3.00 spec. In ESSL 3.10 the grammar does not have
>                     // a similar restriction.
>-                    *errorMessage =
>-                        "The layout qualifier and invariant qualifier cannot coexist in the same "
>-                        "declaration according to the grammar.";
>+                    *errorMessage = kLayoutAndInvariantDisallowed;
>                     return true;
>                 }
>                 layoutFound = true;
>@@ -117,7 +152,7 @@ bool HasRepeatingQualifiers(const TTypeQualifierBuilder::QualifierSequence &qual
>                 // 'smooth centroid' will be squashed to 'centroid'
>                 if (interpolationFound)
>                 {
>-                    *errorMessage = "The interpolation qualifier specified multiple times.";
>+                    *errorMessage = kInterpolationMultipleTimes;
>                     return true;
>                 }
>                 interpolationFound = true;
>@@ -142,8 +177,8 @@ bool HasRepeatingQualifiers(const TTypeQualifierBuilder::QualifierSequence &qual
>                         TQualifier previousQualifier = previousQualifierWrapper->getQualifier();
>                         if (currentQualifier == previousQualifier)
>                         {
>-                            *errorMessage = previousQualifierWrapper->getQualifierString().c_str();
>-                            *errorMessage += " specified multiple times";
>+                            *errorMessage = QualifierSpecifiedMultipleTimesErrorMessage(
>+                                previousQualifierWrapper->getQualifierString());
>                             return true;
>                         }
>                     }
>@@ -167,8 +202,8 @@ bool HasRepeatingQualifiers(const TTypeQualifierBuilder::QualifierSequence &qual
>                         TQualifier previousQualifier = previousQualifierWrapper->getQualifier();
>                         if (currentQualifier == previousQualifier)
>                         {
>-                            *errorMessage = previousQualifierWrapper->getQualifierString().c_str();
>-                            *errorMessage += " specified multiple times";
>+                            *errorMessage = QualifierSpecifiedMultipleTimesErrorMessage(
>+                                previousQualifierWrapper->getQualifierString());
>                             return true;
>                         }
>                     }
>@@ -185,7 +220,7 @@ bool HasRepeatingQualifiers(const TTypeQualifierBuilder::QualifierSequence &qual
>         // GLSL ES 3.00.6 section 4.3.8.2 Output Layout Qualifiers
>         // GLSL ES 3.10 section 4.4.2 Output Layout Qualifiers
>         // "The qualifier may appear at most once within a declaration."
>-        *errorMessage = "Output layout location specified multiple times.";
>+        *errorMessage = kOutputLayoutMultipleTimes;
>         return true;
>     }
> 
>@@ -197,7 +232,7 @@ bool HasRepeatingQualifiers(const TTypeQualifierBuilder::QualifierSequence &qual
> // invariant-qualifier interpolation-qualifier storage-qualifier precision-qualifier
> // layout-qualifier has to be before storage-qualifier.
> bool AreQualifiersInOrder(const TTypeQualifierBuilder::QualifierSequence &qualifiers,
>-                          std::string *errorMessage)
>+                          ImmutableString *errorMessage)
> {
>     bool foundInterpolation = false;
>     bool foundStorage       = false;
>@@ -209,20 +244,19 @@ bool AreQualifiersInOrder(const TTypeQualifierBuilder::QualifierSequence &qualif
>             case QtInvariant:
>                 if (foundInterpolation || foundStorage || foundPrecision)
>                 {
>-                    *errorMessage = "The invariant qualifier has to be first in the expression.";
>+                    *errorMessage = kInvariantQualifierFirst;
>                     return false;
>                 }
>                 break;
>             case QtInterpolation:
>                 if (foundStorage)
>                 {
>-                    *errorMessage = "Storage qualifiers have to be after interpolation qualifiers.";
>+                    *errorMessage = kStorageAfterInterpolation;
>                     return false;
>                 }
>                 else if (foundPrecision)
>                 {
>-                    *errorMessage =
>-                        "Precision qualifiers have to be after interpolation qualifiers.";
>+                    *errorMessage = kPrecisionAfterInterpolation;
>                     return false;
>                 }
>                 foundInterpolation = true;
>@@ -230,19 +264,19 @@ bool AreQualifiersInOrder(const TTypeQualifierBuilder::QualifierSequence &qualif
>             case QtLayout:
>                 if (foundStorage)
>                 {
>-                    *errorMessage = "Storage qualifiers have to be after layout qualifiers.";
>+                    *errorMessage = kStorageAfterLayout;
>                     return false;
>                 }
>                 else if (foundPrecision)
>                 {
>-                    *errorMessage = "Precision qualifiers have to be after layout qualifiers.";
>+                    *errorMessage = kPrecisionAfterLayout;
>                     return false;
>                 }
>                 break;
>             case QtStorage:
>                 if (foundPrecision)
>                 {
>-                    *errorMessage = "Precision qualifiers have to be after storage qualifiers.";
>+                    *errorMessage = kPrecisionAfterStorage;
>                     return false;
>                 }
>                 foundStorage = true;
>@@ -250,7 +284,7 @@ bool AreQualifiersInOrder(const TTypeQualifierBuilder::QualifierSequence &qualif
>             case QtMemory:
>                 if (foundPrecision)
>                 {
>-                    *errorMessage = "Precision qualifiers have to be after memory qualifiers.";
>+                    *errorMessage = kPrecisionAfterMemory;
>                     return false;
>                 }
>                 break;
>@@ -480,9 +514,9 @@ TTypeQualifier GetVariableTypeQualifierFromSortedSequence(
>         }
>         if (!isQualifierValid)
>         {
>-            const TString &qualifierString = qualifier->getQualifierString();
>+            const ImmutableString &qualifierString = qualifier->getQualifierString();
>             diagnostics->error(qualifier->getLine(), "invalid qualifier combination",
>-                               qualifierString.c_str());
>+                               qualifierString.data());
>             break;
>         }
>     }
>@@ -525,9 +559,9 @@ TTypeQualifier GetParameterTypeQualifierFromSortedSequence(
>         }
>         if (!isQualifierValid)
>         {
>-            const TString &qualifierString = qualifier->getQualifierString();
>+            const ImmutableString &qualifierString = qualifier->getQualifierString();
>             diagnostics->error(qualifier->getLine(), "invalid parameter qualifier",
>-                               qualifierString.c_str());
>+                               qualifierString.data());
>             break;
>         }
>     }
>@@ -648,6 +682,17 @@ TLayoutQualifier JoinLayoutQualifiers(TLayoutQualifier leftQualifier,
>         joinedQualifier.maxVertices = rightQualifier.maxVertices;
>     }
> 
>+    if (rightQualifier.index != -1)
>+    {
>+        if (joinedQualifier.index != -1)
>+        {
>+            // EXT_blend_func_extended spec: "Each of these qualifiers may appear at most once"
>+            diagnostics->error(rightQualifierLocation, "Cannot have multiple index specifiers",
>+                               "index");
>+        }
>+        joinedQualifier.index = rightQualifier.index;
>+    }
>+
>     return joinedQualifier;
> }
> 
>@@ -717,16 +762,16 @@ void TTypeQualifierBuilder::appendQualifier(const TQualifierWrapperBase *qualifi
> bool TTypeQualifierBuilder::checkSequenceIsValid(TDiagnostics *diagnostics) const
> {
>     bool areQualifierChecksRelaxed = AreTypeQualifierChecksRelaxed(mShaderVersion);
>-    std::string errorMessage;
>+    ImmutableString errorMessage("");
>     if (HasRepeatingQualifiers(mQualifiers, areQualifierChecksRelaxed, &errorMessage))
>     {
>-        diagnostics->error(mQualifiers[0]->getLine(), errorMessage.c_str(), "qualifier sequence");
>+        diagnostics->error(mQualifiers[0]->getLine(), errorMessage.data(), "qualifier sequence");
>         return false;
>     }
> 
>     if (!areQualifierChecksRelaxed && !AreQualifiersInOrder(mQualifiers, &errorMessage))
>     {
>-        diagnostics->error(mQualifiers[0]->getLine(), errorMessage.c_str(), "qualifier sequence");
>+        diagnostics->error(mQualifiers[0]->getLine(), errorMessage.data(), "qualifier sequence");
>         return false;
>     }
> 
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/QualifierTypes.h b/Source/ThirdParty/ANGLE/src/compiler/translator/QualifierTypes.h
>index 10bdeed89db..950ba5f93ed 100644
>--- a/Source/ThirdParty/ANGLE/src/compiler/translator/QualifierTypes.h
>+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/QualifierTypes.h
>@@ -9,6 +9,7 @@
> 
> #include "common/angleutils.h"
> #include "compiler/translator/BaseTypes.h"
>+#include "compiler/translator/ImmutableString.h"
> #include "compiler/translator/Types.h"
> 
> namespace sh
>@@ -33,13 +34,14 @@ enum TQualifierType
> class TQualifierWrapperBase : angle::NonCopyable
> {
>   public:
>-    POOL_ALLOCATOR_NEW_DELETE();
>+    POOL_ALLOCATOR_NEW_DELETE
>     TQualifierWrapperBase(const TSourceLoc &line) : mLine(line) {}
>-    virtual ~TQualifierWrapperBase(){};
>-    virtual TQualifierType getType() const     = 0;
>-    virtual TString getQualifierString() const = 0;
>-    virtual unsigned int getRank() const       = 0;
>+    virtual ~TQualifierWrapperBase() {}
>+    virtual TQualifierType getType() const             = 0;
>+    virtual ImmutableString getQualifierString() const = 0;
>+    virtual unsigned int getRank() const               = 0;
>     const TSourceLoc &getLine() const { return mLine; }
>+
>   private:
>     TSourceLoc mLine;
> };
>@@ -50,9 +52,9 @@ class TInvariantQualifierWrapper final : public TQualifierWrapperBase
>     TInvariantQualifierWrapper(const TSourceLoc &line) : TQualifierWrapperBase(line) {}
>     ~TInvariantQualifierWrapper() {}
> 
>-    TQualifierType getType() const { return QtInvariant; }
>-    TString getQualifierString() const { return "invariant"; }
>-    unsigned int getRank() const;
>+    TQualifierType getType() const override { return QtInvariant; }
>+    ImmutableString getQualifierString() const override { return ImmutableString("invariant"); }
>+    unsigned int getRank() const override;
> };
> 
> class TInterpolationQualifierWrapper final : public TQualifierWrapperBase
>@@ -60,14 +62,16 @@ class TInterpolationQualifierWrapper final : public TQualifierWrapperBase
>   public:
>     TInterpolationQualifierWrapper(TQualifier interpolationQualifier, const TSourceLoc &line)
>         : TQualifierWrapperBase(line), mInterpolationQualifier(interpolationQualifier)
>-    {
>-    }
>+    {}
>     ~TInterpolationQualifierWrapper() {}
> 
>-    TQualifierType getType() const { return QtInterpolation; }
>-    TString getQualifierString() const { return sh::getQualifierString(mInterpolationQualifier); }
>+    TQualifierType getType() const override { return QtInterpolation; }
>+    ImmutableString getQualifierString() const override
>+    {
>+        return ImmutableString(sh::getQualifierString(mInterpolationQualifier));
>+    }
>     TQualifier getQualifier() const { return mInterpolationQualifier; }
>-    unsigned int getRank() const;
>+    unsigned int getRank() const override;
> 
>   private:
>     TQualifier mInterpolationQualifier;
>@@ -78,14 +82,13 @@ class TLayoutQualifierWrapper final : public TQualifierWrapperBase
>   public:
>     TLayoutQualifierWrapper(TLayoutQualifier layoutQualifier, const TSourceLoc &line)
>         : TQualifierWrapperBase(line), mLayoutQualifier(layoutQualifier)
>-    {
>-    }
>+    {}
>     ~TLayoutQualifierWrapper() {}
> 
>-    TQualifierType getType() const { return QtLayout; }
>-    TString getQualifierString() const { return "layout"; }
>+    TQualifierType getType() const override { return QtLayout; }
>+    ImmutableString getQualifierString() const override { return ImmutableString("layout"); }
>     const TLayoutQualifier &getQualifier() const { return mLayoutQualifier; }
>-    unsigned int getRank() const;
>+    unsigned int getRank() const override;
> 
>   private:
>     TLayoutQualifier mLayoutQualifier;
>@@ -96,14 +99,16 @@ class TStorageQualifierWrapper final : public TQualifierWrapperBase
>   public:
>     TStorageQualifierWrapper(TQualifier storageQualifier, const TSourceLoc &line)
>         : TQualifierWrapperBase(line), mStorageQualifier(storageQualifier)
>-    {
>-    }
>+    {}
>     ~TStorageQualifierWrapper() {}
> 
>-    TQualifierType getType() const { return QtStorage; }
>-    TString getQualifierString() const { return sh::getQualifierString(mStorageQualifier); }
>+    TQualifierType getType() const override { return QtStorage; }
>+    ImmutableString getQualifierString() const override
>+    {
>+        return ImmutableString(sh::getQualifierString(mStorageQualifier));
>+    }
>     TQualifier getQualifier() const { return mStorageQualifier; }
>-    unsigned int getRank() const;
>+    unsigned int getRank() const override;
> 
>   private:
>     TQualifier mStorageQualifier;
>@@ -114,14 +119,16 @@ class TPrecisionQualifierWrapper final : public TQualifierWrapperBase
>   public:
>     TPrecisionQualifierWrapper(TPrecision precisionQualifier, const TSourceLoc &line)
>         : TQualifierWrapperBase(line), mPrecisionQualifier(precisionQualifier)
>-    {
>-    }
>+    {}
>     ~TPrecisionQualifierWrapper() {}
> 
>-    TQualifierType getType() const { return QtPrecision; }
>-    TString getQualifierString() const { return sh::getPrecisionString(mPrecisionQualifier); }
>+    TQualifierType getType() const override { return QtPrecision; }
>+    ImmutableString getQualifierString() const override
>+    {
>+        return ImmutableString(sh::getPrecisionString(mPrecisionQualifier));
>+    }
>     TPrecision getQualifier() const { return mPrecisionQualifier; }
>-    unsigned int getRank() const;
>+    unsigned int getRank() const override;
> 
>   private:
>     TPrecision mPrecisionQualifier;
>@@ -132,14 +139,16 @@ class TMemoryQualifierWrapper final : public TQualifierWrapperBase
>   public:
>     TMemoryQualifierWrapper(TQualifier memoryQualifier, const TSourceLoc &line)
>         : TQualifierWrapperBase(line), mMemoryQualifier(memoryQualifier)
>-    {
>-    }
>+    {}
>     ~TMemoryQualifierWrapper() {}
> 
>-    TQualifierType getType() const { return QtMemory; }
>-    TString getQualifierString() const { return sh::getQualifierString(mMemoryQualifier); }
>+    TQualifierType getType() const override { return QtMemory; }
>+    ImmutableString getQualifierString() const override
>+    {
>+        return ImmutableString(sh::getQualifierString(mMemoryQualifier));
>+    }
>     TQualifier getQualifier() const { return mMemoryQualifier; }
>-    unsigned int getRank() const;
>+    unsigned int getRank() const override;
> 
>   private:
>     TQualifier mMemoryQualifier;
>@@ -167,7 +176,7 @@ class TTypeQualifierBuilder : angle::NonCopyable
>     using QualifierSequence = TVector<const TQualifierWrapperBase *>;
> 
>   public:
>-    POOL_ALLOCATOR_NEW_DELETE();
>+    POOL_ALLOCATOR_NEW_DELETE
>     TTypeQualifierBuilder(const TStorageQualifierWrapper *scope, int shaderVersion);
>     // Adds the passed qualifier to the end of the sequence.
>     void appendQualifier(const TQualifierWrapperBase *qualifier);
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/RecordConstantPrecision.cpp b/Source/ThirdParty/ANGLE/src/compiler/translator/RecordConstantPrecision.cpp
>deleted file mode 100644
>index 5233a29f195..00000000000
>--- a/Source/ThirdParty/ANGLE/src/compiler/translator/RecordConstantPrecision.cpp
>+++ /dev/null
>@@ -1,167 +0,0 @@
>-//
>-// Copyright (c) 2002-2015 The ANGLE Project Authors. All rights reserved.
>-// Use of this source code is governed by a BSD-style license that can be
>-// found in the LICENSE file.
>-//
>-// During parsing, all constant expressions are folded to constant union nodes. The expressions that
>-// have been folded may have had precision qualifiers, which should affect the precision of the
>-// consuming operation. If the folded constant union nodes are written to output as such they won't
>-// have any precision qualifiers, and their effect on the precision of the consuming operation is
>-// lost.
>-//
>-// RecordConstantPrecision is an AST traverser that inspects the precision qualifiers of constants
>-// and hoists the constants outside the containing expression as precision qualified named variables
>-// in case that is required for correct precision propagation.
>-//
>-
>-#include "compiler/translator/RecordConstantPrecision.h"
>-
>-#include "compiler/translator/InfoSink.h"
>-#include "compiler/translator/IntermTraverse.h"
>-
>-namespace sh
>-{
>-
>-namespace
>-{
>-
>-class RecordConstantPrecisionTraverser : public TIntermTraverser
>-{
>-  public:
>-    RecordConstantPrecisionTraverser(TSymbolTable *symbolTable);
>-
>-    void visitConstantUnion(TIntermConstantUnion *node) override;
>-
>-    void nextIteration();
>-
>-    bool foundHigherPrecisionConstant() const { return mFoundHigherPrecisionConstant; }
>-  protected:
>-    bool operandAffectsParentOperationPrecision(TIntermTyped *operand);
>-
>-    bool mFoundHigherPrecisionConstant;
>-};
>-
>-RecordConstantPrecisionTraverser::RecordConstantPrecisionTraverser(TSymbolTable *symbolTable)
>-    : TIntermTraverser(true, false, true, symbolTable), mFoundHigherPrecisionConstant(false)
>-{
>-}
>-
>-bool RecordConstantPrecisionTraverser::operandAffectsParentOperationPrecision(TIntermTyped *operand)
>-{
>-    if (getParentNode()->getAsCaseNode() || getParentNode()->getAsBlock())
>-    {
>-        return false;
>-    }
>-
>-    const TIntermBinary *parentAsBinary = getParentNode()->getAsBinaryNode();
>-    if (parentAsBinary != nullptr)
>-    {
>-        // If the constant is assigned or is used to initialize a variable, or if it's an index,
>-        // its precision has no effect.
>-        switch (parentAsBinary->getOp())
>-        {
>-            case EOpInitialize:
>-            case EOpAssign:
>-            case EOpIndexDirect:
>-            case EOpIndexDirectStruct:
>-            case EOpIndexDirectInterfaceBlock:
>-            case EOpIndexIndirect:
>-                return false;
>-            default:
>-                break;
>-        }
>-
>-        TIntermTyped *otherOperand = parentAsBinary->getRight();
>-        if (otherOperand == operand)
>-        {
>-            otherOperand = parentAsBinary->getLeft();
>-        }
>-        // If the precision of the other child is at least as high as the precision of the constant,
>-        // the precision of the constant has no effect.
>-        if (otherOperand->getAsConstantUnion() == nullptr &&
>-            otherOperand->getPrecision() >= operand->getPrecision())
>-        {
>-            return false;
>-        }
>-    }
>-
>-    TIntermAggregate *parentAsAggregate = getParentNode()->getAsAggregate();
>-    if (parentAsAggregate != nullptr)
>-    {
>-        if (!parentAsAggregate->gotPrecisionFromChildren())
>-        {
>-            // This can be either:
>-            // * a call to an user-defined function
>-            // * a call to a texture function
>-            // * some other kind of aggregate
>-            // In any of these cases the constant precision has no effect.
>-            return false;
>-        }
>-        if (parentAsAggregate->isConstructor() && parentAsAggregate->getBasicType() == EbtBool)
>-        {
>-            return false;
>-        }
>-        // If the precision of operands does affect the result, but the precision of any of the
>-        // other children has a precision that's at least as high as the precision of the constant,
>-        // the precision of the constant has no effect.
>-        TIntermSequence *parameters = parentAsAggregate->getSequence();
>-        for (TIntermNode *parameter : *parameters)
>-        {
>-            const TIntermTyped *typedParameter = parameter->getAsTyped();
>-            if (parameter != operand && typedParameter != nullptr &&
>-                parameter->getAsConstantUnion() == nullptr &&
>-                typedParameter->getPrecision() >= operand->getPrecision())
>-            {
>-                return false;
>-            }
>-        }
>-    }
>-    return true;
>-}
>-
>-void RecordConstantPrecisionTraverser::visitConstantUnion(TIntermConstantUnion *node)
>-{
>-    if (mFoundHigherPrecisionConstant)
>-        return;
>-
>-    // If the constant has lowp or undefined precision, it can't increase the precision of consuming
>-    // operations.
>-    if (node->getPrecision() < EbpMedium)
>-        return;
>-
>-    // It's possible the node has no effect on the precision of the consuming expression, depending
>-    // on the consuming expression, and the precision of the other parameters of the expression.
>-    if (!operandAffectsParentOperationPrecision(node))
>-        return;
>-
>-    // Make the constant a precision-qualified named variable to make sure it affects the precision
>-    // of the consuming expression.
>-    TIntermSequence insertions;
>-    insertions.push_back(createTempInitDeclaration(node, EvqConst));
>-    insertStatementsInParentBlock(insertions);
>-    queueReplacement(createTempSymbol(node->getType()), OriginalNode::IS_DROPPED);
>-    mFoundHigherPrecisionConstant = true;
>-}
>-
>-void RecordConstantPrecisionTraverser::nextIteration()
>-{
>-    nextTemporaryId();
>-    mFoundHigherPrecisionConstant = false;
>-}
>-
>-}  // namespace
>-
>-void RecordConstantPrecision(TIntermNode *root, TSymbolTable *symbolTable)
>-{
>-    RecordConstantPrecisionTraverser traverser(symbolTable);
>-    // Iterate as necessary, and reset the traverser between iterations.
>-    do
>-    {
>-        traverser.nextIteration();
>-        root->traverse(&traverser);
>-        if (traverser.foundHigherPrecisionConstant())
>-            traverser.updateTree();
>-    } while (traverser.foundHigherPrecisionConstant());
>-}
>-
>-}  // namespace sh
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/RecordConstantPrecision.h b/Source/ThirdParty/ANGLE/src/compiler/translator/RecordConstantPrecision.h
>deleted file mode 100644
>index f86c2a86939..00000000000
>--- a/Source/ThirdParty/ANGLE/src/compiler/translator/RecordConstantPrecision.h
>+++ /dev/null
>@@ -1,28 +0,0 @@
>-//
>-// Copyright (c) 2002-2015 The ANGLE Project Authors. All rights reserved.
>-// Use of this source code is governed by a BSD-style license that can be
>-// found in the LICENSE file.
>-//
>-// During parsing, all constant expressions are folded to constant union nodes. The expressions that
>-// have been folded may have had precision qualifiers, which should affect the precision of the
>-// consuming operation. If the folded constant union nodes are written to output as such they won't
>-// have any precision qualifiers, and their effect on the precision of the consuming operation is
>-// lost.
>-//
>-// RecordConstantPrecision is an AST traverser that inspects the precision qualifiers of constants
>-// and hoists the constants outside the containing expression as precision qualified named variables
>-// in case that is required for correct precision propagation.
>-//
>-
>-#ifndef COMPILER_TRANSLATOR_RECORDCONSTANTPRECISION_H_
>-#define COMPILER_TRANSLATOR_RECORDCONSTANTPRECISION_H_
>-
>-namespace sh
>-{
>-class TIntermNode;
>-class TSymbolTable;
>-
>-void RecordConstantPrecision(TIntermNode *root, TSymbolTable *symbolTable);
>-}  // namespace sh
>-
>-#endif  // COMPILER_TRANSLATOR_RECORDCONSTANTPRECISION_H_
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/RegenerateStructNames.cpp b/Source/ThirdParty/ANGLE/src/compiler/translator/RegenerateStructNames.cpp
>deleted file mode 100644
>index 55fb124a42a..00000000000
>--- a/Source/ThirdParty/ANGLE/src/compiler/translator/RegenerateStructNames.cpp
>+++ /dev/null
>@@ -1,76 +0,0 @@
>-//
>-// Copyright (c) 2002-2014 The ANGLE Project Authors. All rights reserved.
>-// Use of this source code is governed by a BSD-style license that can be
>-// found in the LICENSE file.
>-//
>-
>-#include "common/debug.h"
>-#include "compiler/translator/RegenerateStructNames.h"
>-
>-namespace sh
>-{
>-
>-void RegenerateStructNames::visitSymbol(TIntermSymbol *symbol)
>-{
>-    ASSERT(symbol);
>-    TType *type = symbol->getTypePointer();
>-    ASSERT(type);
>-    TStructure *userType = type->getStruct();
>-    if (!userType)
>-        return;
>-
>-    if (mSymbolTable->findBuiltIn(userType->name(), mShaderVersion))
>-    {
>-        // Built-in struct, do not touch it.
>-        return;
>-    }
>-
>-    int uniqueId = userType->uniqueId();
>-
>-    ASSERT(mScopeDepth > 0);
>-    if (mScopeDepth == 1)
>-    {
>-        // If a struct is defined at global scope, we don't map its name.
>-        // This is because at global level, the struct might be used to
>-        // declare a uniform, so the same name needs to stay the same for
>-        // vertex/fragment shaders. However, our mapping uses internal ID,
>-        // which will be different for the same struct in vertex/fragment
>-        // shaders.
>-        // This is OK because names for any structs defined in other scopes
>-        // will begin with "_webgl", which is reserved. So there will be
>-        // no conflicts among unmapped struct names from global scope and
>-        // mapped struct names from other scopes.
>-        // However, we need to keep track of these global structs, so if a
>-        // variable is used in a local scope, we don't try to modify the
>-        // struct name through that variable.
>-        mDeclaredGlobalStructs.insert(uniqueId);
>-        return;
>-    }
>-    if (mDeclaredGlobalStructs.count(uniqueId) > 0)
>-        return;
>-    // Map {name} to _webgl_struct_{uniqueId}_{name}.
>-    const char kPrefix[] = "_webgl_struct_";
>-    if (userType->name().find(kPrefix) == 0)
>-    {
>-        // The name has already been regenerated.
>-        return;
>-    }
>-    std::string id = Str(uniqueId);
>-    TString tmp    = kPrefix + TString(id.c_str());
>-    tmp += "_" + userType->name();
>-    userType->setName(tmp);
>-}
>-
>-bool RegenerateStructNames::visitBlock(Visit, TIntermBlock *block)
>-{
>-    ++mScopeDepth;
>-    TIntermSequence &sequence = *(block->getSequence());
>-    for (TIntermNode *node : sequence)
>-    {
>-        node->traverse(this);
>-    }
>-    --mScopeDepth;
>-    return false;
>-}
>-
>-}  // namespace sh
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/RegenerateStructNames.h b/Source/ThirdParty/ANGLE/src/compiler/translator/RegenerateStructNames.h
>deleted file mode 100644
>index 293720b6a44..00000000000
>--- a/Source/ThirdParty/ANGLE/src/compiler/translator/RegenerateStructNames.h
>+++ /dev/null
>@@ -1,45 +0,0 @@
>-//
>-// Copyright (c) 2002-2014 The ANGLE Project Authors. All rights reserved.
>-// Use of this source code is governed by a BSD-style license that can be
>-// found in the LICENSE file.
>-//
>-
>-#ifndef COMPILER_TRANSLATOR_REGENERATESTRUCTNAMES_H_
>-#define COMPILER_TRANSLATOR_REGENERATESTRUCTNAMES_H_
>-
>-#include "compiler/translator/IntermTraverse.h"
>-#include "compiler/translator/SymbolTable.h"
>-
>-#include <set>
>-
>-namespace sh
>-{
>-
>-class RegenerateStructNames : public TIntermTraverser
>-{
>-  public:
>-    RegenerateStructNames(TSymbolTable *symbolTable, int shaderVersion)
>-        : TIntermTraverser(true, false, false, symbolTable),
>-          mShaderVersion(shaderVersion),
>-          mScopeDepth(0)
>-    {
>-    }
>-
>-  protected:
>-    void visitSymbol(TIntermSymbol *) override;
>-    bool visitBlock(Visit, TIntermBlock *block) override;
>-
>-  private:
>-    int mShaderVersion;
>-
>-    // Indicating the depth of the current scope.
>-    // The global scope is 1.
>-    int mScopeDepth;
>-
>-    // If a struct's declared globally, push its ID in this set.
>-    std::set<int> mDeclaredGlobalStructs;
>-};
>-
>-}  // namespace sh
>-
>-#endif  // COMPILER_TRANSLATOR_REGENERATESTRUCTNAMES_H_
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/RemoveArrayLengthMethod.cpp b/Source/ThirdParty/ANGLE/src/compiler/translator/RemoveArrayLengthMethod.cpp
>deleted file mode 100644
>index e9e6a170131..00000000000
>--- a/Source/ThirdParty/ANGLE/src/compiler/translator/RemoveArrayLengthMethod.cpp
>+++ /dev/null
>@@ -1,83 +0,0 @@
>-//
>-// Copyright (c) 2017 The ANGLE Project Authors. All rights reserved.
>-// Use of this source code is governed by a BSD-style license that can be
>-// found in the LICENSE file.
>-//
>-// RemoveArrayLengthMethod.cpp:
>-//   Fold array length expressions, including cases where the "this" node has side effects.
>-//   Example:
>-//     int i = (a = b).length();
>-//     int j = (func()).length();
>-//   becomes:
>-//     (a = b);
>-//     int i = <constant array length>;
>-//     func();
>-//     int j = <constant array length>;
>-//
>-//   Must be run after SplitSequenceOperator, SimplifyLoopConditions and SeparateDeclarations steps
>-//   have been done to expressions containing calls of the array length method.
>-//
>-//   Does nothing to length method calls done on runtime-sized arrays.
>-
>-#include "compiler/translator/RemoveArrayLengthMethod.h"
>-
>-#include "compiler/translator/IntermNode.h"
>-#include "compiler/translator/IntermTraverse.h"
>-
>-namespace sh
>-{
>-
>-namespace
>-{
>-
>-class RemoveArrayLengthTraverser : public TIntermTraverser
>-{
>-  public:
>-    RemoveArrayLengthTraverser() : TIntermTraverser(true, false, false), mFoundArrayLength(false) {}
>-
>-    bool visitUnary(Visit visit, TIntermUnary *node) override;
>-
>-    void nextIteration() { mFoundArrayLength = false; }
>-
>-    bool foundArrayLength() const { return mFoundArrayLength; }
>-
>-  private:
>-    bool mFoundArrayLength;
>-};
>-
>-bool RemoveArrayLengthTraverser::visitUnary(Visit visit, TIntermUnary *node)
>-{
>-    // The only case where we leave array length() in place is for runtime-sized arrays.
>-    if (node->getOp() == EOpArrayLength && !node->getOperand()->getType().isUnsizedArray())
>-    {
>-        mFoundArrayLength = true;
>-        if (!node->getOperand()->hasSideEffects())
>-        {
>-            queueReplacement(node->fold(nullptr), OriginalNode::IS_DROPPED);
>-            return false;
>-        }
>-        insertStatementInParentBlock(node->getOperand()->deepCopy());
>-        TConstantUnion *constArray = new TConstantUnion[1];
>-        constArray->setIConst(node->getOperand()->getOutermostArraySize());
>-        queueReplacement(new TIntermConstantUnion(constArray, node->getType()),
>-                         OriginalNode::IS_DROPPED);
>-        return false;
>-    }
>-    return true;
>-}
>-
>-}  // anonymous namespace
>-
>-void RemoveArrayLengthMethod(TIntermBlock *root)
>-{
>-    RemoveArrayLengthTraverser traverser;
>-    do
>-    {
>-        traverser.nextIteration();
>-        root->traverse(&traverser);
>-        if (traverser.foundArrayLength())
>-            traverser.updateTree();
>-    } while (traverser.foundArrayLength());
>-}
>-
>-}  // namespace sh
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/RemoveArrayLengthMethod.h b/Source/ThirdParty/ANGLE/src/compiler/translator/RemoveArrayLengthMethod.h
>deleted file mode 100644
>index 3b2c6df8242..00000000000
>--- a/Source/ThirdParty/ANGLE/src/compiler/translator/RemoveArrayLengthMethod.h
>+++ /dev/null
>@@ -1,29 +0,0 @@
>-//
>-// Copyright (c) 2017 The ANGLE Project Authors. All rights reserved.
>-// Use of this source code is governed by a BSD-style license that can be
>-// found in the LICENSE file.
>-//
>-// RemoveArrayLengthMethod.h:
>-//   Fold array length expressions, including cases where the "this" node has side effects.
>-//   Example:
>-//     int i = (a = b).length();
>-//     int j = (func()).length();
>-//   becomes:
>-//     (a = b);
>-//     int i = <constant array length>;
>-//     func();
>-//     int j = <constant array length>;
>-//
>-//   Must be run after SplitSequenceOperator, SimplifyLoopConditions and SeparateDeclarations steps
>-//   have been done to expressions containing calls of the array length method.
>-//
>-//   Does nothing to length method calls done on runtime-sized arrays.
>-
>-namespace sh
>-{
>-
>-class TIntermBlock;
>-
>-void RemoveArrayLengthMethod(TIntermBlock *root);
>-
>-}  // namespace sh
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/RemoveDynamicIndexing.cpp b/Source/ThirdParty/ANGLE/src/compiler/translator/RemoveDynamicIndexing.cpp
>deleted file mode 100644
>index 7766c1abc63..00000000000
>--- a/Source/ThirdParty/ANGLE/src/compiler/translator/RemoveDynamicIndexing.cpp
>+++ /dev/null
>@@ -1,550 +0,0 @@
>-//
>-// Copyright (c) 2002-2015 The ANGLE Project Authors. All rights reserved.
>-// Use of this source code is governed by a BSD-style license that can be
>-// found in the LICENSE file.
>-//
>-// RemoveDynamicIndexing is an AST traverser to remove dynamic indexing of vectors and matrices,
>-// replacing them with calls to functions that choose which component to return or write.
>-//
>-
>-#include "compiler/translator/RemoveDynamicIndexing.h"
>-
>-#include "compiler/translator/Diagnostics.h"
>-#include "compiler/translator/InfoSink.h"
>-#include "compiler/translator/IntermNodePatternMatcher.h"
>-#include "compiler/translator/IntermNode_util.h"
>-#include "compiler/translator/IntermTraverse.h"
>-#include "compiler/translator/SymbolTable.h"
>-
>-namespace sh
>-{
>-
>-namespace
>-{
>-
>-std::string GetIndexFunctionName(const TType &type, bool write)
>-{
>-    TInfoSinkBase nameSink;
>-    nameSink << "dyn_index_";
>-    if (write)
>-    {
>-        nameSink << "write_";
>-    }
>-    if (type.isMatrix())
>-    {
>-        nameSink << "mat" << type.getCols() << "x" << type.getRows();
>-    }
>-    else
>-    {
>-        switch (type.getBasicType())
>-        {
>-            case EbtInt:
>-                nameSink << "ivec";
>-                break;
>-            case EbtBool:
>-                nameSink << "bvec";
>-                break;
>-            case EbtUInt:
>-                nameSink << "uvec";
>-                break;
>-            case EbtFloat:
>-                nameSink << "vec";
>-                break;
>-            default:
>-                UNREACHABLE();
>-        }
>-        nameSink << type.getNominalSize();
>-    }
>-    return nameSink.str();
>-}
>-
>-TIntermSymbol *CreateBaseSymbol(const TType &type, TQualifier qualifier, TSymbolTable *symbolTable)
>-{
>-    TIntermSymbol *symbol = new TIntermSymbol(symbolTable->nextUniqueId(), "base", type);
>-    symbol->setInternal(true);
>-    symbol->getTypePointer()->setQualifier(qualifier);
>-    return symbol;
>-}
>-
>-TIntermSymbol *CreateIndexSymbol(TSymbolTable *symbolTable)
>-{
>-    TIntermSymbol *symbol =
>-        new TIntermSymbol(symbolTable->nextUniqueId(), "index", TType(EbtInt, EbpHigh));
>-    symbol->setInternal(true);
>-    symbol->getTypePointer()->setQualifier(EvqIn);
>-    return symbol;
>-}
>-
>-TIntermSymbol *CreateValueSymbol(const TType &type, TSymbolTable *symbolTable)
>-{
>-    TIntermSymbol *symbol = new TIntermSymbol(symbolTable->nextUniqueId(), "value", type);
>-    symbol->setInternal(true);
>-    symbol->getTypePointer()->setQualifier(EvqIn);
>-    return symbol;
>-}
>-
>-TIntermConstantUnion *CreateIntConstantNode(int i)
>-{
>-    TConstantUnion *constant = new TConstantUnion();
>-    constant->setIConst(i);
>-    return new TIntermConstantUnion(constant, TType(EbtInt, EbpHigh));
>-}
>-
>-TIntermTyped *EnsureSignedInt(TIntermTyped *node)
>-{
>-    if (node->getBasicType() == EbtInt)
>-        return node;
>-
>-    TIntermSequence *arguments = new TIntermSequence();
>-    arguments->push_back(node);
>-    return TIntermAggregate::CreateConstructor(TType(EbtInt), arguments);
>-}
>-
>-TType GetFieldType(const TType &indexedType)
>-{
>-    if (indexedType.isMatrix())
>-    {
>-        TType fieldType = TType(indexedType.getBasicType(), indexedType.getPrecision());
>-        fieldType.setPrimarySize(static_cast<unsigned char>(indexedType.getRows()));
>-        return fieldType;
>-    }
>-    else
>-    {
>-        return TType(indexedType.getBasicType(), indexedType.getPrecision());
>-    }
>-}
>-
>-// Generate a read or write function for one field in a vector/matrix.
>-// Out-of-range indices are clamped. This is consistent with how ANGLE handles out-of-range
>-// indices in other places.
>-// Note that indices can be either int or uint. We create only int versions of the functions,
>-// and convert uint indices to int at the call site.
>-// read function example:
>-// float dyn_index_vec2(in vec2 base, in int index)
>-// {
>-//    switch(index)
>-//    {
>-//      case (0):
>-//        return base[0];
>-//      case (1):
>-//        return base[1];
>-//      default:
>-//        break;
>-//    }
>-//    if (index < 0)
>-//      return base[0];
>-//    return base[1];
>-// }
>-// write function example:
>-// void dyn_index_write_vec2(inout vec2 base, in int index, in float value)
>-// {
>-//    switch(index)
>-//    {
>-//      case (0):
>-//        base[0] = value;
>-//        return;
>-//      case (1):
>-//        base[1] = value;
>-//        return;
>-//      default:
>-//        break;
>-//    }
>-//    if (index < 0)
>-//    {
>-//      base[0] = value;
>-//      return;
>-//    }
>-//    base[1] = value;
>-// }
>-// Note that else is not used in above functions to avoid the RewriteElseBlocks transformation.
>-TIntermFunctionDefinition *GetIndexFunctionDefinition(TType type,
>-                                                      bool write,
>-                                                      const TSymbolUniqueId &functionId,
>-                                                      TSymbolTable *symbolTable)
>-{
>-    ASSERT(!type.isArray());
>-    // Conservatively use highp here, even if the indexed type is not highp. That way the code can't
>-    // end up using mediump version of an indexing function for a highp value, if both mediump and
>-    // highp values are being indexed in the shader. For HLSL precision doesn't matter, but in
>-    // principle this code could be used with multiple backends.
>-    type.setPrecision(EbpHigh);
>-
>-    TType fieldType = GetFieldType(type);
>-    int numCases    = 0;
>-    if (type.isMatrix())
>-    {
>-        numCases = type.getCols();
>-    }
>-    else
>-    {
>-        numCases = type.getNominalSize();
>-    }
>-
>-    TType returnType(EbtVoid);
>-    if (!write)
>-    {
>-        returnType = fieldType;
>-    }
>-
>-    std::string functionName                = GetIndexFunctionName(type, write);
>-    TIntermFunctionPrototype *prototypeNode =
>-        CreateInternalFunctionPrototypeNode(returnType, functionName.c_str(), functionId);
>-
>-    TQualifier baseQualifier     = EvqInOut;
>-    if (!write)
>-        baseQualifier        = EvqIn;
>-    TIntermSymbol *baseParam = CreateBaseSymbol(type, baseQualifier, symbolTable);
>-    prototypeNode->getSequence()->push_back(baseParam);
>-    TIntermSymbol *indexParam = CreateIndexSymbol(symbolTable);
>-    prototypeNode->getSequence()->push_back(indexParam);
>-    TIntermSymbol *valueParam = nullptr;
>-    if (write)
>-    {
>-        valueParam = CreateValueSymbol(fieldType, symbolTable);
>-        prototypeNode->getSequence()->push_back(valueParam);
>-    }
>-
>-    TIntermBlock *statementList = new TIntermBlock();
>-    for (int i = 0; i < numCases; ++i)
>-    {
>-        TIntermCase *caseNode = new TIntermCase(CreateIntConstantNode(i));
>-        statementList->getSequence()->push_back(caseNode);
>-
>-        TIntermBinary *indexNode =
>-            new TIntermBinary(EOpIndexDirect, baseParam->deepCopy(), CreateIndexNode(i));
>-        if (write)
>-        {
>-            TIntermBinary *assignNode =
>-                new TIntermBinary(EOpAssign, indexNode, valueParam->deepCopy());
>-            statementList->getSequence()->push_back(assignNode);
>-            TIntermBranch *returnNode = new TIntermBranch(EOpReturn, nullptr);
>-            statementList->getSequence()->push_back(returnNode);
>-        }
>-        else
>-        {
>-            TIntermBranch *returnNode = new TIntermBranch(EOpReturn, indexNode);
>-            statementList->getSequence()->push_back(returnNode);
>-        }
>-    }
>-
>-    // Default case
>-    TIntermCase *defaultNode = new TIntermCase(nullptr);
>-    statementList->getSequence()->push_back(defaultNode);
>-    TIntermBranch *breakNode = new TIntermBranch(EOpBreak, nullptr);
>-    statementList->getSequence()->push_back(breakNode);
>-
>-    TIntermSwitch *switchNode = new TIntermSwitch(indexParam->deepCopy(), statementList);
>-
>-    TIntermBlock *bodyNode = new TIntermBlock();
>-    bodyNode->getSequence()->push_back(switchNode);
>-
>-    TIntermBinary *cond =
>-        new TIntermBinary(EOpLessThan, indexParam->deepCopy(), CreateIntConstantNode(0));
>-    cond->setType(TType(EbtBool, EbpUndefined));
>-
>-    // Two blocks: one accesses (either reads or writes) the first element and returns,
>-    // the other accesses the last element.
>-    TIntermBlock *useFirstBlock = new TIntermBlock();
>-    TIntermBlock *useLastBlock  = new TIntermBlock();
>-    TIntermBinary *indexFirstNode =
>-        new TIntermBinary(EOpIndexDirect, baseParam->deepCopy(), CreateIndexNode(0));
>-    TIntermBinary *indexLastNode =
>-        new TIntermBinary(EOpIndexDirect, baseParam->deepCopy(), CreateIndexNode(numCases - 1));
>-    if (write)
>-    {
>-        TIntermBinary *assignFirstNode =
>-            new TIntermBinary(EOpAssign, indexFirstNode, valueParam->deepCopy());
>-        useFirstBlock->getSequence()->push_back(assignFirstNode);
>-        TIntermBranch *returnNode = new TIntermBranch(EOpReturn, nullptr);
>-        useFirstBlock->getSequence()->push_back(returnNode);
>-
>-        TIntermBinary *assignLastNode =
>-            new TIntermBinary(EOpAssign, indexLastNode, valueParam->deepCopy());
>-        useLastBlock->getSequence()->push_back(assignLastNode);
>-    }
>-    else
>-    {
>-        TIntermBranch *returnFirstNode = new TIntermBranch(EOpReturn, indexFirstNode);
>-        useFirstBlock->getSequence()->push_back(returnFirstNode);
>-
>-        TIntermBranch *returnLastNode = new TIntermBranch(EOpReturn, indexLastNode);
>-        useLastBlock->getSequence()->push_back(returnLastNode);
>-    }
>-    TIntermIfElse *ifNode = new TIntermIfElse(cond, useFirstBlock, nullptr);
>-    bodyNode->getSequence()->push_back(ifNode);
>-    bodyNode->getSequence()->push_back(useLastBlock);
>-
>-    TIntermFunctionDefinition *indexingFunction =
>-        new TIntermFunctionDefinition(prototypeNode, bodyNode);
>-    return indexingFunction;
>-}
>-
>-class RemoveDynamicIndexingTraverser : public TLValueTrackingTraverser
>-{
>-  public:
>-    RemoveDynamicIndexingTraverser(TSymbolTable *symbolTable,
>-                                   int shaderVersion,
>-                                   PerformanceDiagnostics *perfDiagnostics);
>-
>-    bool visitBinary(Visit visit, TIntermBinary *node) override;
>-
>-    void insertHelperDefinitions(TIntermNode *root);
>-
>-    void nextIteration();
>-
>-    bool usedTreeInsertion() const { return mUsedTreeInsertion; }
>-
>-  protected:
>-    // Maps of types that are indexed to the indexing function ids used for them. Note that these
>-    // can not store multiple variants of the same type with different precisions - only one
>-    // precision gets stored.
>-    std::map<TType, TSymbolUniqueId *> mIndexedVecAndMatrixTypes;
>-    std::map<TType, TSymbolUniqueId *> mWrittenVecAndMatrixTypes;
>-
>-    bool mUsedTreeInsertion;
>-
>-    // When true, the traverser will remove side effects from any indexing expression.
>-    // This is done so that in code like
>-    //   V[j++][i]++.
>-    // where V is an array of vectors, j++ will only be evaluated once.
>-    bool mRemoveIndexSideEffectsInSubtree;
>-
>-    PerformanceDiagnostics *mPerfDiagnostics;
>-};
>-
>-RemoveDynamicIndexingTraverser::RemoveDynamicIndexingTraverser(
>-    TSymbolTable *symbolTable,
>-    int shaderVersion,
>-    PerformanceDiagnostics *perfDiagnostics)
>-    : TLValueTrackingTraverser(true, false, false, symbolTable, shaderVersion),
>-      mUsedTreeInsertion(false),
>-      mRemoveIndexSideEffectsInSubtree(false),
>-      mPerfDiagnostics(perfDiagnostics)
>-{
>-}
>-
>-void RemoveDynamicIndexingTraverser::insertHelperDefinitions(TIntermNode *root)
>-{
>-    TIntermBlock *rootBlock = root->getAsBlock();
>-    ASSERT(rootBlock != nullptr);
>-    TIntermSequence insertions;
>-    for (auto &type : mIndexedVecAndMatrixTypes)
>-    {
>-        insertions.push_back(
>-            GetIndexFunctionDefinition(type.first, false, *type.second, mSymbolTable));
>-    }
>-    for (auto &type : mWrittenVecAndMatrixTypes)
>-    {
>-        insertions.push_back(
>-            GetIndexFunctionDefinition(type.first, true, *type.second, mSymbolTable));
>-    }
>-    rootBlock->insertChildNodes(0, insertions);
>-}
>-
>-// Create a call to dyn_index_*() based on an indirect indexing op node
>-TIntermAggregate *CreateIndexFunctionCall(TIntermBinary *node,
>-                                          TIntermTyped *index,
>-                                          const TSymbolUniqueId &functionId)
>-{
>-    ASSERT(node->getOp() == EOpIndexIndirect);
>-    TIntermSequence *arguments = new TIntermSequence();
>-    arguments->push_back(node->getLeft());
>-    arguments->push_back(index);
>-
>-    TType fieldType                = GetFieldType(node->getLeft()->getType());
>-    std::string functionName       = GetIndexFunctionName(node->getLeft()->getType(), false);
>-    TIntermAggregate *indexingCall =
>-        CreateInternalFunctionCallNode(fieldType, functionName.c_str(), functionId, arguments);
>-    indexingCall->setLine(node->getLine());
>-    indexingCall->getFunctionSymbolInfo()->setKnownToNotHaveSideEffects(true);
>-    return indexingCall;
>-}
>-
>-TIntermAggregate *CreateIndexedWriteFunctionCall(TIntermBinary *node,
>-                                                 TIntermTyped *index,
>-                                                 TIntermTyped *writtenValue,
>-                                                 const TSymbolUniqueId &functionId)
>-{
>-    ASSERT(node->getOp() == EOpIndexIndirect);
>-    TIntermSequence *arguments = new TIntermSequence();
>-    // Deep copy the child nodes so that two pointers to the same node don't end up in the tree.
>-    arguments->push_back(node->getLeft()->deepCopy());
>-    arguments->push_back(index->deepCopy());
>-    arguments->push_back(writtenValue);
>-
>-    std::string functionName           = GetIndexFunctionName(node->getLeft()->getType(), true);
>-    TIntermAggregate *indexedWriteCall =
>-        CreateInternalFunctionCallNode(TType(EbtVoid), functionName.c_str(), functionId, arguments);
>-    indexedWriteCall->setLine(node->getLine());
>-    return indexedWriteCall;
>-}
>-
>-bool RemoveDynamicIndexingTraverser::visitBinary(Visit visit, TIntermBinary *node)
>-{
>-    if (mUsedTreeInsertion)
>-        return false;
>-
>-    if (node->getOp() == EOpIndexIndirect)
>-    {
>-        if (mRemoveIndexSideEffectsInSubtree)
>-        {
>-            ASSERT(node->getRight()->hasSideEffects());
>-            // In case we're just removing index side effects, convert
>-            //   v_expr[index_expr]
>-            // to this:
>-            //   int s0 = index_expr; v_expr[s0];
>-            // Now v_expr[s0] can be safely executed several times without unintended side effects.
>-
>-            // Init the temp variable holding the index
>-            TIntermDeclaration *initIndex = createTempInitDeclaration(node->getRight());
>-            insertStatementInParentBlock(initIndex);
>-            mUsedTreeInsertion = true;
>-
>-            // Replace the index with the temp variable
>-            TIntermSymbol *tempIndex = createTempSymbol(node->getRight()->getType());
>-            queueReplacementWithParent(node, node->getRight(), tempIndex, OriginalNode::IS_DROPPED);
>-        }
>-        else if (IntermNodePatternMatcher::IsDynamicIndexingOfVectorOrMatrix(node))
>-        {
>-            mPerfDiagnostics->warning(node->getLine(),
>-                                      "Performance: dynamic indexing of vectors and "
>-                                      "matrices is emulated and can be slow.",
>-                                      "[]");
>-            bool write = isLValueRequiredHere();
>-
>-#if defined(ANGLE_ENABLE_ASSERTS)
>-            // Make sure that IntermNodePatternMatcher is consistent with the slightly differently
>-            // implemented checks in this traverser.
>-            IntermNodePatternMatcher matcher(
>-                IntermNodePatternMatcher::kDynamicIndexingOfVectorOrMatrixInLValue);
>-            ASSERT(matcher.match(node, getParentNode(), isLValueRequiredHere()) == write);
>-#endif
>-
>-            const TType &type = node->getLeft()->getType();
>-            TSymbolUniqueId *indexingFunctionId = new TSymbolUniqueId(mSymbolTable);
>-            if (mIndexedVecAndMatrixTypes.find(type) == mIndexedVecAndMatrixTypes.end())
>-            {
>-                mIndexedVecAndMatrixTypes[type] = indexingFunctionId;
>-            }
>-            else
>-            {
>-                indexingFunctionId = mIndexedVecAndMatrixTypes[type];
>-            }
>-
>-            if (write)
>-            {
>-                // Convert:
>-                //   v_expr[index_expr]++;
>-                // to this:
>-                //   int s0 = index_expr; float s1 = dyn_index(v_expr, s0); s1++;
>-                //   dyn_index_write(v_expr, s0, s1);
>-                // This works even if index_expr has some side effects.
>-                if (node->getLeft()->hasSideEffects())
>-                {
>-                    // If v_expr has side effects, those need to be removed before proceeding.
>-                    // Otherwise the side effects of v_expr would be evaluated twice.
>-                    // The only case where an l-value can have side effects is when it is
>-                    // indexing. For example, it can be V[j++] where V is an array of vectors.
>-                    mRemoveIndexSideEffectsInSubtree = true;
>-                    return true;
>-                }
>-
>-                TIntermBinary *leftBinary = node->getLeft()->getAsBinaryNode();
>-                if (leftBinary != nullptr &&
>-                    IntermNodePatternMatcher::IsDynamicIndexingOfVectorOrMatrix(leftBinary))
>-                {
>-                    // This is a case like:
>-                    // mat2 m;
>-                    // m[a][b]++;
>-                    // Process the child node m[a] first.
>-                    return true;
>-                }
>-
>-                // TODO(oetuaho@nvidia.com): This is not optimal if the expression using the value
>-                // only writes it and doesn't need the previous value. http://anglebug.com/1116
>-
>-                TSymbolUniqueId *indexedWriteFunctionId = new TSymbolUniqueId(mSymbolTable);
>-                if (mWrittenVecAndMatrixTypes.find(type) == mWrittenVecAndMatrixTypes.end())
>-                {
>-                    mWrittenVecAndMatrixTypes[type] = indexedWriteFunctionId;
>-                }
>-                else
>-                {
>-                    indexedWriteFunctionId = mWrittenVecAndMatrixTypes[type];
>-                }
>-                TType fieldType = GetFieldType(type);
>-
>-                TIntermSequence insertionsBefore;
>-                TIntermSequence insertionsAfter;
>-
>-                // Store the index in a temporary signed int variable.
>-                TIntermTyped *indexInitializer = EnsureSignedInt(node->getRight());
>-                TIntermDeclaration *initIndex  = createTempInitDeclaration(indexInitializer);
>-                initIndex->setLine(node->getLine());
>-                insertionsBefore.push_back(initIndex);
>-
>-                // Create a node for referring to the index after the nextTemporaryId() call
>-                // below.
>-                TIntermSymbol *tempIndex = createTempSymbol(indexInitializer->getType());
>-
>-                TIntermAggregate *indexingCall =
>-                    CreateIndexFunctionCall(node, tempIndex, *indexingFunctionId);
>-
>-                nextTemporaryId();  // From now on, creating temporary symbols that refer to the
>-                                    // field value.
>-                insertionsBefore.push_back(createTempInitDeclaration(indexingCall));
>-
>-                TIntermAggregate *indexedWriteCall = CreateIndexedWriteFunctionCall(
>-                    node, tempIndex, createTempSymbol(fieldType), *indexedWriteFunctionId);
>-                insertionsAfter.push_back(indexedWriteCall);
>-                insertStatementsInParentBlock(insertionsBefore, insertionsAfter);
>-                queueReplacement(createTempSymbol(fieldType), OriginalNode::IS_DROPPED);
>-                mUsedTreeInsertion = true;
>-            }
>-            else
>-            {
>-                // The indexed value is not being written, so we can simply convert
>-                //   v_expr[index_expr]
>-                // into
>-                //   dyn_index(v_expr, index_expr)
>-                // If the index_expr is unsigned, we'll convert it to signed.
>-                ASSERT(!mRemoveIndexSideEffectsInSubtree);
>-                TIntermAggregate *indexingCall = CreateIndexFunctionCall(
>-                    node, EnsureSignedInt(node->getRight()), *indexingFunctionId);
>-                queueReplacement(indexingCall, OriginalNode::IS_DROPPED);
>-            }
>-        }
>-    }
>-    return !mUsedTreeInsertion;
>-}
>-
>-void RemoveDynamicIndexingTraverser::nextIteration()
>-{
>-    mUsedTreeInsertion               = false;
>-    mRemoveIndexSideEffectsInSubtree = false;
>-    nextTemporaryId();
>-}
>-
>-}  // namespace
>-
>-void RemoveDynamicIndexing(TIntermNode *root,
>-                           TSymbolTable *symbolTable,
>-                           int shaderVersion,
>-                           PerformanceDiagnostics *perfDiagnostics)
>-{
>-    RemoveDynamicIndexingTraverser traverser(symbolTable, shaderVersion, perfDiagnostics);
>-    do
>-    {
>-        traverser.nextIteration();
>-        root->traverse(&traverser);
>-        traverser.updateTree();
>-    } while (traverser.usedTreeInsertion());
>-    // TODO(oetuaho@nvidia.com): It might be nicer to add the helper definitions also in the middle
>-    // of traversal. Now the tree ends up in an inconsistent state in the middle, since there are
>-    // function call nodes with no corresponding definition nodes. This needs special handling in
>-    // TIntermLValueTrackingTraverser, and creates intricacies that are not easily apparent from a
>-    // superficial reading of the code.
>-    traverser.insertHelperDefinitions(root);
>-}
>-
>-}  // namespace sh
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/RemoveDynamicIndexing.h b/Source/ThirdParty/ANGLE/src/compiler/translator/RemoveDynamicIndexing.h
>deleted file mode 100644
>index 543cf569a61..00000000000
>--- a/Source/ThirdParty/ANGLE/src/compiler/translator/RemoveDynamicIndexing.h
>+++ /dev/null
>@@ -1,27 +0,0 @@
>-//
>-// Copyright (c) 2002-2015 The ANGLE Project Authors. All rights reserved.
>-// Use of this source code is governed by a BSD-style license that can be
>-// found in the LICENSE file.
>-//
>-// RemoveDynamicIndexing is an AST traverser to remove dynamic indexing of vectors and matrices,
>-// replacing them with calls to functions that choose which component to return or write.
>-//
>-
>-#ifndef COMPILER_TRANSLATOR_REMOVEDYNAMICINDEXING_H_
>-#define COMPILER_TRANSLATOR_REMOVEDYNAMICINDEXING_H_
>-
>-namespace sh
>-{
>-
>-class TIntermNode;
>-class TSymbolTable;
>-class PerformanceDiagnostics;
>-
>-void RemoveDynamicIndexing(TIntermNode *root,
>-                           TSymbolTable *symbolTable,
>-                           int shaderVersion,
>-                           PerformanceDiagnostics *perfDiagnostics);
>-
>-}  // namespace sh
>-
>-#endif  // COMPILER_TRANSLATOR_REMOVEDYNAMICINDEXING_H_
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/RemoveEmptySwitchStatements.cpp b/Source/ThirdParty/ANGLE/src/compiler/translator/RemoveEmptySwitchStatements.cpp
>deleted file mode 100644
>index b39c912e9ca..00000000000
>--- a/Source/ThirdParty/ANGLE/src/compiler/translator/RemoveEmptySwitchStatements.cpp
>+++ /dev/null
>@@ -1,56 +0,0 @@
>-//
>-// Copyright (c) 2017 The ANGLE Project Authors. All rights reserved.
>-// Use of this source code is governed by a BSD-style license that can be
>-// found in the LICENSE file.
>-//
>-// RemoveEmptySwitchStatements.cpp: Remove switch statements that have an empty statement list.
>-
>-#include "compiler/translator/RemoveEmptySwitchStatements.h"
>-
>-#include "compiler/translator/IntermTraverse.h"
>-
>-namespace sh
>-{
>-
>-namespace
>-{
>-
>-class RemoveEmptySwitchStatementsTraverser : public TIntermTraverser
>-{
>-  public:
>-    RemoveEmptySwitchStatementsTraverser() : TIntermTraverser(true, false, false) {}
>-
>-    bool visitSwitch(Visit visit, TIntermSwitch *node);
>-};
>-
>-bool RemoveEmptySwitchStatementsTraverser::visitSwitch(Visit visit, TIntermSwitch *node)
>-{
>-    if (node->getStatementList()->getSequence()->empty())
>-    {
>-        // Just output the init statement.
>-        if (node->getInit()->hasSideEffects())
>-        {
>-            queueReplacement(node->getInit(), OriginalNode::IS_DROPPED);
>-        }
>-        else
>-        {
>-            TIntermSequence emptyReplacement;
>-            ASSERT(getParentNode()->getAsBlock());
>-            mMultiReplacements.push_back(NodeReplaceWithMultipleEntry(getParentNode()->getAsBlock(),
>-                                                                      node, emptyReplacement));
>-        }
>-        return false;  // Nothing inside the child nodes to traverse.
>-    }
>-    return true;
>-}
>-
>-}  // anonymous namespace
>-
>-void RemoveEmptySwitchStatements(TIntermBlock *root)
>-{
>-    RemoveEmptySwitchStatementsTraverser traverser;
>-    root->traverse(&traverser);
>-    traverser.updateTree();
>-}
>-
>-}  // namespace sh
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/RemoveEmptySwitchStatements.h b/Source/ThirdParty/ANGLE/src/compiler/translator/RemoveEmptySwitchStatements.h
>deleted file mode 100644
>index 1018a50d822..00000000000
>--- a/Source/ThirdParty/ANGLE/src/compiler/translator/RemoveEmptySwitchStatements.h
>+++ /dev/null
>@@ -1,18 +0,0 @@
>-//
>-// Copyright (c) 2017 The ANGLE Project Authors. All rights reserved.
>-// Use of this source code is governed by a BSD-style license that can be
>-// found in the LICENSE file.
>-//
>-// RemoveEmptySwitchStatements.h: Remove switch statements that have an empty statement list.
>-
>-#ifndef COMPILER_TRANSLATOR_REMOVEEMPTYSWITCHSTATEMENTS_H_
>-#define COMPILER_TRANSLATOR_REMOVEEMPTYSWITCHSTATEMENTS_H_
>-
>-namespace sh
>-{
>-class TIntermBlock;
>-
>-void RemoveEmptySwitchStatements(TIntermBlock *root);
>-}
>-
>-#endif  // COMPILER_TRANSLATOR_REMOVEEMPTYSWITCHSTATEMENTS_H_
>\ No newline at end of file
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/RemoveInvariantDeclaration.cpp b/Source/ThirdParty/ANGLE/src/compiler/translator/RemoveInvariantDeclaration.cpp
>deleted file mode 100644
>index 4b533dc7b56..00000000000
>--- a/Source/ThirdParty/ANGLE/src/compiler/translator/RemoveInvariantDeclaration.cpp
>+++ /dev/null
>@@ -1,43 +0,0 @@
>-//
>-// Copyright (c) 2016 The ANGLE Project Authors. All rights reserved.
>-// Use of this source code is governed by a BSD-style license that can be
>-// found in the LICENSE file.
>-//
>-
>-#include "compiler/translator/RemoveInvariantDeclaration.h"
>-
>-#include "compiler/translator/IntermTraverse.h"
>-
>-namespace sh
>-{
>-
>-namespace
>-{
>-
>-// An AST traverser that removes invariant declaration for input in fragment shader
>-// when GLSL >= 4.20 and for output in vertex shader when GLSL < 4.2.
>-class RemoveInvariantDeclarationTraverser : public TIntermTraverser
>-{
>-  public:
>-    RemoveInvariantDeclarationTraverser() : TIntermTraverser(true, false, false) {}
>-
>-  private:
>-    bool visitInvariantDeclaration(Visit visit, TIntermInvariantDeclaration *node) override
>-    {
>-        TIntermSequence emptyReplacement;
>-        mMultiReplacements.push_back(
>-            NodeReplaceWithMultipleEntry(getParentNode()->getAsBlock(), node, emptyReplacement));
>-        return false;
>-    }
>-};
>-
>-}  // anonymous namespace
>-
>-void RemoveInvariantDeclaration(TIntermNode *root)
>-{
>-    RemoveInvariantDeclarationTraverser traverser;
>-    root->traverse(&traverser);
>-    traverser.updateTree();
>-}
>-
>-}  // namespace sh
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/RemoveInvariantDeclaration.h b/Source/ThirdParty/ANGLE/src/compiler/translator/RemoveInvariantDeclaration.h
>deleted file mode 100644
>index cf9d4aa4c27..00000000000
>--- a/Source/ThirdParty/ANGLE/src/compiler/translator/RemoveInvariantDeclaration.h
>+++ /dev/null
>@@ -1,18 +0,0 @@
>-//
>-// Copyright (c) 2016 The ANGLE Project Authors. All rights reserved.
>-// Use of this source code is governed by a BSD-style license that can be
>-// found in the LICENSE file.
>-//
>-
>-#ifndef COMPILER_TRANSLATOR_REMOVEINVARIANTDECLARATION_H_
>-#define COMPILER_TRANSLATOR_REMOVEINVARIANTDECLARATION_H_
>-
>-class TIntermNode;
>-namespace sh
>-{
>-
>-void RemoveInvariantDeclaration(TIntermNode *root);
>-
>-}  // namespace sh
>-
>-#endif  // COMPILER_TRANSLATOR_REMOVEINVARIANTDECLARATION_H_
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/RemoveNoOpCasesFromEndOfSwitchStatements.cpp b/Source/ThirdParty/ANGLE/src/compiler/translator/RemoveNoOpCasesFromEndOfSwitchStatements.cpp
>deleted file mode 100644
>index b86d64d7a38..00000000000
>--- a/Source/ThirdParty/ANGLE/src/compiler/translator/RemoveNoOpCasesFromEndOfSwitchStatements.cpp
>+++ /dev/null
>@@ -1,116 +0,0 @@
>-//
>-// Copyright (c) 2017 The ANGLE Project Authors. All rights reserved.
>-// Use of this source code is governed by a BSD-style license that can be
>-// found in the LICENSE file.
>-//
>-// RemoveNoOpCasesFromEndOfSwitchStatements.cpp: Clean up cases from the end of a switch statement
>-// that only contain no-ops.
>-
>-#include "compiler/translator/RemoveNoOpCasesFromEndOfSwitchStatements.h"
>-
>-#include "compiler/translator/IntermNode.h"
>-#include "compiler/translator/IntermNode_util.h"
>-#include "compiler/translator/IntermTraverse.h"
>-#include "compiler/translator/SymbolTable.h"
>-
>-namespace sh
>-{
>-
>-namespace
>-{
>-
>-bool AreEmptyBlocks(TIntermSequence *statements, size_t i);
>-
>-bool IsEmptyBlock(TIntermNode *node)
>-{
>-    TIntermBlock *asBlock = node->getAsBlock();
>-    if (asBlock)
>-    {
>-        if (asBlock->getSequence()->empty())
>-        {
>-            return true;
>-        }
>-        return AreEmptyBlocks(asBlock->getSequence(), 0u);
>-    }
>-    // Empty declarations should have already been pruned, otherwise they would need to be handled
>-    // here. Note that declarations for struct types do contain a nameless child node.
>-    ASSERT(node->getAsDeclarationNode() == nullptr ||
>-           !node->getAsDeclarationNode()->getSequence()->empty());
>-    // Pure literal statements should also already be pruned.
>-    ASSERT(node->getAsConstantUnion() == nullptr);
>-    return false;
>-}
>-
>-// Return true if all statements in "statements" starting from index i consist only of empty blocks
>-// and no-op statements. Returns true also if there are no statements.
>-bool AreEmptyBlocks(TIntermSequence *statements, size_t i)
>-{
>-    for (; i < statements->size(); ++i)
>-    {
>-        if (!IsEmptyBlock(statements->at(i)))
>-        {
>-            return false;
>-        }
>-    }
>-    return true;
>-}
>-
>-void RemoveNoOpCasesFromEndOfStatementList(TIntermBlock *statementList, TSymbolTable *symbolTable)
>-{
>-    TIntermSequence *statements = statementList->getSequence();
>-
>-    bool foundDeadCase = false;
>-    do
>-    {
>-        if (statements->empty())
>-        {
>-            return;
>-        }
>-
>-        // Find the last case label.
>-        size_t i = statements->size();
>-        while (i > 0u && !(*statements)[i - 1]->getAsCaseNode())
>-        {
>-            --i;
>-        }
>-        // Now i is the index of the first statement following the last label inside the switch
>-        // statement.
>-        ASSERT(i > 0u);
>-
>-        foundDeadCase = AreEmptyBlocks(statements, i);
>-        if (foundDeadCase)
>-        {
>-            statements->erase(statements->begin() + (i - 1u), statements->end());
>-        }
>-    } while (foundDeadCase);
>-}
>-
>-class RemoveNoOpCasesFromEndOfSwitchTraverser : public TIntermTraverser
>-{
>-  public:
>-    RemoveNoOpCasesFromEndOfSwitchTraverser(TSymbolTable *symbolTable)
>-        : TIntermTraverser(true, false, false, symbolTable)
>-    {
>-    }
>-
>-    bool visitSwitch(Visit visit, TIntermSwitch *node) override;
>-};
>-
>-bool RemoveNoOpCasesFromEndOfSwitchTraverser::visitSwitch(Visit visit, TIntermSwitch *node)
>-{
>-    // Here we may mutate the statement list, but it's safe since traversal has not yet reached
>-    // there.
>-    RemoveNoOpCasesFromEndOfStatementList(node->getStatementList(), mSymbolTable);
>-    // Handle also nested switch statements.
>-    return true;
>-}
>-
>-}  // anonymous namespace
>-
>-void RemoveNoOpCasesFromEndOfSwitchStatements(TIntermBlock *root, TSymbolTable *symbolTable)
>-{
>-    RemoveNoOpCasesFromEndOfSwitchTraverser traverser(symbolTable);
>-    root->traverse(&traverser);
>-}
>-
>-}  // namespace sh
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/RemoveNoOpCasesFromEndOfSwitchStatements.h b/Source/ThirdParty/ANGLE/src/compiler/translator/RemoveNoOpCasesFromEndOfSwitchStatements.h
>deleted file mode 100644
>index ebd75eb7749..00000000000
>--- a/Source/ThirdParty/ANGLE/src/compiler/translator/RemoveNoOpCasesFromEndOfSwitchStatements.h
>+++ /dev/null
>@@ -1,21 +0,0 @@
>-//
>-// Copyright (c) 2017 The ANGLE Project Authors. All rights reserved.
>-// Use of this source code is governed by a BSD-style license that can be
>-// found in the LICENSE file.
>-//
>-// RemoveNoOpCasesFromEndOfSwitchStatements.h: Clean up cases from the end of a switch statement
>-// that only contain no-ops.
>-
>-#ifndef COMPILER_TRANSLATOR_REMOVENOOPCASESFROMENDOFSWITCHSTATEMENTS_H_
>-#define COMPILER_TRANSLATOR_REMOVENOOPCASESFROMENDOFSWITCHSTATEMENTS_H_
>-
>-namespace sh
>-{
>-class TIntermBlock;
>-class TSymbolTable;
>-
>-void RemoveNoOpCasesFromEndOfSwitchStatements(TIntermBlock *root, TSymbolTable *symbolTable);
>-
>-}  // namespace sh
>-
>-#endif  // COMPILER_TRANSLATOR_REMOVENOOPCASESFROMENDOFSWITCHSTATEMENTS_H_
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/RemovePow.cpp b/Source/ThirdParty/ANGLE/src/compiler/translator/RemovePow.cpp
>deleted file mode 100644
>index b2cdac55f00..00000000000
>--- a/Source/ThirdParty/ANGLE/src/compiler/translator/RemovePow.cpp
>+++ /dev/null
>@@ -1,97 +0,0 @@
>-//
>-// Copyright (c) 2002-2015 The ANGLE Project Authors. All rights reserved.
>-// Use of this source code is governed by a BSD-style license that can be
>-// found in the LICENSE file.
>-//
>-// RemovePow is an AST traverser to convert pow(x, y) built-in calls where y is a
>-// constant to exp2(y * log2(x)). This works around an issue in NVIDIA 311 series
>-// OpenGL drivers.
>-//
>-
>-#include "compiler/translator/RemovePow.h"
>-
>-#include "compiler/translator/InfoSink.h"
>-#include "compiler/translator/IntermTraverse.h"
>-
>-namespace sh
>-{
>-
>-namespace
>-{
>-
>-bool IsProblematicPow(TIntermTyped *node)
>-{
>-    TIntermAggregate *agg = node->getAsAggregate();
>-    if (agg != nullptr && agg->getOp() == EOpPow)
>-    {
>-        ASSERT(agg->getSequence()->size() == 2);
>-        return agg->getSequence()->at(1)->getAsConstantUnion() != nullptr;
>-    }
>-    return false;
>-}
>-
>-// Traverser that converts all pow operations simultaneously.
>-class RemovePowTraverser : public TIntermTraverser
>-{
>-  public:
>-    RemovePowTraverser();
>-
>-    bool visitAggregate(Visit visit, TIntermAggregate *node) override;
>-
>-    void nextIteration() { mNeedAnotherIteration = false; }
>-    bool needAnotherIteration() const { return mNeedAnotherIteration; }
>-
>-  protected:
>-    bool mNeedAnotherIteration;
>-};
>-
>-RemovePowTraverser::RemovePowTraverser()
>-    : TIntermTraverser(true, false, false), mNeedAnotherIteration(false)
>-{
>-}
>-
>-bool RemovePowTraverser::visitAggregate(Visit visit, TIntermAggregate *node)
>-{
>-    if (IsProblematicPow(node))
>-    {
>-        TIntermTyped *x = node->getSequence()->at(0)->getAsTyped();
>-        TIntermTyped *y = node->getSequence()->at(1)->getAsTyped();
>-
>-        TIntermUnary *log = new TIntermUnary(EOpLog2, x);
>-        log->setLine(node->getLine());
>-
>-        TOperator op       = TIntermBinary::GetMulOpBasedOnOperands(y->getType(), log->getType());
>-        TIntermBinary *mul = new TIntermBinary(op, y, log);
>-        mul->setLine(node->getLine());
>-
>-        TIntermUnary *exp = new TIntermUnary(EOpExp2, mul);
>-        exp->setLine(node->getLine());
>-
>-        queueReplacement(exp, OriginalNode::IS_DROPPED);
>-
>-        // If the x parameter also needs to be replaced, we need to do that in another traversal,
>-        // since it's parent node will change in a way that's not handled correctly by updateTree().
>-        if (IsProblematicPow(x))
>-        {
>-            mNeedAnotherIteration = true;
>-            return false;
>-        }
>-    }
>-    return true;
>-}
>-
>-}  // namespace
>-
>-void RemovePow(TIntermNode *root)
>-{
>-    RemovePowTraverser traverser;
>-    // Iterate as necessary, and reset the traverser between iterations.
>-    do
>-    {
>-        traverser.nextIteration();
>-        root->traverse(&traverser);
>-        traverser.updateTree();
>-    } while (traverser.needAnotherIteration());
>-}
>-
>-}  // namespace sh
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/RemovePow.h b/Source/ThirdParty/ANGLE/src/compiler/translator/RemovePow.h
>deleted file mode 100644
>index 3cd84988a99..00000000000
>--- a/Source/ThirdParty/ANGLE/src/compiler/translator/RemovePow.h
>+++ /dev/null
>@@ -1,21 +0,0 @@
>-//
>-// Copyright (c) 2002-2015 The ANGLE Project Authors. All rights reserved.
>-// Use of this source code is governed by a BSD-style license that can be
>-// found in the LICENSE file.
>-//
>-// RemovePow is an AST traverser to convert pow(x, y) built-in calls where y is a
>-// constant to exp2(y * log2(x)). This works around an issue in NVIDIA 311 series
>-// OpenGL drivers.
>-//
>-
>-#ifndef COMPILER_TRANSLATOR_REMOVEPOW_H_
>-#define COMPILER_TRANSLATOR_REMOVEPOW_H_
>-
>-namespace sh
>-{
>-class TIntermNode;
>-
>-void RemovePow(TIntermNode *root);
>-}  // namespace sh
>-
>-#endif  // COMPILER_TRANSLATOR_REMOVEPOW_H_
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/RemoveSwitchFallThrough.cpp b/Source/ThirdParty/ANGLE/src/compiler/translator/RemoveSwitchFallThrough.cpp
>deleted file mode 100644
>index dea949f4484..00000000000
>--- a/Source/ThirdParty/ANGLE/src/compiler/translator/RemoveSwitchFallThrough.cpp
>+++ /dev/null
>@@ -1,270 +0,0 @@
>-//
>-// Copyright (c) 2002-2015 The ANGLE Project Authors. All rights reserved.
>-// Use of this source code is governed by a BSD-style license that can be
>-// found in the LICENSE file.
>-//
>-// RemoveSwitchFallThrough.cpp: Remove fall-through from switch statements.
>-// Note that it is unsafe to do further AST transformations on the AST generated
>-// by this function. It leaves duplicate nodes in the AST making replacements
>-// unreliable.
>-
>-#include "compiler/translator/RemoveSwitchFallThrough.h"
>-
>-#include "compiler/translator/Diagnostics.h"
>-#include "compiler/translator/IntermTraverse.h"
>-
>-namespace sh
>-{
>-
>-namespace
>-{
>-
>-class RemoveSwitchFallThroughTraverser : public TIntermTraverser
>-{
>-  public:
>-    static TIntermBlock *removeFallThrough(TIntermBlock *statementList,
>-                                           PerformanceDiagnostics *perfDiagnostics);
>-
>-  private:
>-    RemoveSwitchFallThroughTraverser(TIntermBlock *statementList,
>-                                     PerformanceDiagnostics *perfDiagnostics);
>-
>-    void visitSymbol(TIntermSymbol *node) override;
>-    void visitConstantUnion(TIntermConstantUnion *node) override;
>-    bool visitDeclaration(Visit, TIntermDeclaration *node) override;
>-    bool visitBinary(Visit, TIntermBinary *node) override;
>-    bool visitUnary(Visit, TIntermUnary *node) override;
>-    bool visitTernary(Visit visit, TIntermTernary *node) override;
>-    bool visitSwizzle(Visit, TIntermSwizzle *node) override;
>-    bool visitIfElse(Visit visit, TIntermIfElse *node) override;
>-    bool visitSwitch(Visit, TIntermSwitch *node) override;
>-    bool visitCase(Visit, TIntermCase *node) override;
>-    bool visitAggregate(Visit, TIntermAggregate *node) override;
>-    bool visitBlock(Visit, TIntermBlock *node) override;
>-    bool visitLoop(Visit, TIntermLoop *node) override;
>-    bool visitBranch(Visit, TIntermBranch *node) override;
>-
>-    void outputSequence(TIntermSequence *sequence, size_t startIndex);
>-    void handlePreviousCase();
>-
>-    TIntermBlock *mStatementList;
>-    TIntermBlock *mStatementListOut;
>-    bool mLastStatementWasBreak;
>-    TIntermBlock *mPreviousCase;
>-    std::vector<TIntermBlock *> mCasesSharingBreak;
>-    PerformanceDiagnostics *mPerfDiagnostics;
>-};
>-
>-TIntermBlock *RemoveSwitchFallThroughTraverser::removeFallThrough(
>-    TIntermBlock *statementList,
>-    PerformanceDiagnostics *perfDiagnostics)
>-{
>-    RemoveSwitchFallThroughTraverser rm(statementList, perfDiagnostics);
>-    ASSERT(statementList);
>-    statementList->traverse(&rm);
>-    ASSERT(rm.mPreviousCase || statementList->getSequence()->empty());
>-    if (!rm.mLastStatementWasBreak && rm.mPreviousCase)
>-    {
>-        // Make sure that there's a branch at the end of the final case inside the switch statement.
>-        // This also ensures that any cases that fall through to the final case will get the break.
>-        TIntermBranch *finalBreak = new TIntermBranch(EOpBreak, nullptr);
>-        rm.mPreviousCase->getSequence()->push_back(finalBreak);
>-        rm.mLastStatementWasBreak = true;
>-    }
>-    rm.handlePreviousCase();
>-    return rm.mStatementListOut;
>-}
>-
>-RemoveSwitchFallThroughTraverser::RemoveSwitchFallThroughTraverser(
>-    TIntermBlock *statementList,
>-    PerformanceDiagnostics *perfDiagnostics)
>-    : TIntermTraverser(true, false, false),
>-      mStatementList(statementList),
>-      mLastStatementWasBreak(false),
>-      mPreviousCase(nullptr),
>-      mPerfDiagnostics(perfDiagnostics)
>-{
>-    mStatementListOut = new TIntermBlock();
>-}
>-
>-void RemoveSwitchFallThroughTraverser::visitSymbol(TIntermSymbol *node)
>-{
>-    // Note that this assumes that switch statements which don't begin by a case statement
>-    // have already been weeded out in validation.
>-    mPreviousCase->getSequence()->push_back(node);
>-    mLastStatementWasBreak = false;
>-}
>-
>-void RemoveSwitchFallThroughTraverser::visitConstantUnion(TIntermConstantUnion *node)
>-{
>-    // Conditions of case labels are not traversed, so this is a constant statement like "0;".
>-    // These are no-ops so there's no need to add them back to the statement list. Should have
>-    // already been pruned out of the AST, in fact.
>-    UNREACHABLE();
>-}
>-
>-bool RemoveSwitchFallThroughTraverser::visitDeclaration(Visit, TIntermDeclaration *node)
>-{
>-    mPreviousCase->getSequence()->push_back(node);
>-    mLastStatementWasBreak = false;
>-    return false;
>-}
>-
>-bool RemoveSwitchFallThroughTraverser::visitBinary(Visit, TIntermBinary *node)
>-{
>-    mPreviousCase->getSequence()->push_back(node);
>-    mLastStatementWasBreak = false;
>-    return false;
>-}
>-
>-bool RemoveSwitchFallThroughTraverser::visitUnary(Visit, TIntermUnary *node)
>-{
>-    mPreviousCase->getSequence()->push_back(node);
>-    mLastStatementWasBreak = false;
>-    return false;
>-}
>-
>-bool RemoveSwitchFallThroughTraverser::visitTernary(Visit, TIntermTernary *node)
>-{
>-    mPreviousCase->getSequence()->push_back(node);
>-    mLastStatementWasBreak = false;
>-    return false;
>-}
>-
>-bool RemoveSwitchFallThroughTraverser::visitSwizzle(Visit, TIntermSwizzle *node)
>-{
>-    mPreviousCase->getSequence()->push_back(node);
>-    mLastStatementWasBreak = false;
>-    return false;
>-}
>-
>-bool RemoveSwitchFallThroughTraverser::visitIfElse(Visit, TIntermIfElse *node)
>-{
>-    mPreviousCase->getSequence()->push_back(node);
>-    mLastStatementWasBreak = false;
>-    return false;
>-}
>-
>-bool RemoveSwitchFallThroughTraverser::visitSwitch(Visit, TIntermSwitch *node)
>-{
>-    mPreviousCase->getSequence()->push_back(node);
>-    mLastStatementWasBreak = false;
>-    // Don't go into nested switch statements
>-    return false;
>-}
>-
>-void RemoveSwitchFallThroughTraverser::outputSequence(TIntermSequence *sequence, size_t startIndex)
>-{
>-    for (size_t i = startIndex; i < sequence->size(); ++i)
>-    {
>-        mStatementListOut->getSequence()->push_back(sequence->at(i));
>-    }
>-}
>-
>-void RemoveSwitchFallThroughTraverser::handlePreviousCase()
>-{
>-    if (mPreviousCase)
>-        mCasesSharingBreak.push_back(mPreviousCase);
>-    if (mLastStatementWasBreak)
>-    {
>-        for (size_t i = 0; i < mCasesSharingBreak.size(); ++i)
>-        {
>-            ASSERT(!mCasesSharingBreak.at(i)->getSequence()->empty());
>-            if (mCasesSharingBreak.at(i)->getSequence()->size() == 1)
>-            {
>-                // Fall-through is allowed in case the label has no statements.
>-                outputSequence(mCasesSharingBreak.at(i)->getSequence(), 0);
>-            }
>-            else
>-            {
>-                // Include all the statements that this case can fall through under the same label.
>-                if (mCasesSharingBreak.size() > i + 1u)
>-                {
>-                    mPerfDiagnostics->warning(mCasesSharingBreak.at(i)->getLine(),
>-                                              "Performance: non-empty fall-through cases in "
>-                                              "switch statements generate extra code.",
>-                                              "switch");
>-                }
>-                for (size_t j = i; j < mCasesSharingBreak.size(); ++j)
>-                {
>-                    size_t startIndex =
>-                        j > i ? 1 : 0;  // Add the label only from the first sequence.
>-                    outputSequence(mCasesSharingBreak.at(j)->getSequence(), startIndex);
>-                }
>-            }
>-        }
>-        mCasesSharingBreak.clear();
>-    }
>-    mLastStatementWasBreak = false;
>-    mPreviousCase          = nullptr;
>-}
>-
>-bool RemoveSwitchFallThroughTraverser::visitCase(Visit, TIntermCase *node)
>-{
>-    handlePreviousCase();
>-    mPreviousCase = new TIntermBlock();
>-    mPreviousCase->getSequence()->push_back(node);
>-    mPreviousCase->setLine(node->getLine());
>-    // Don't traverse the condition of the case statement
>-    return false;
>-}
>-
>-bool RemoveSwitchFallThroughTraverser::visitAggregate(Visit, TIntermAggregate *node)
>-{
>-    mPreviousCase->getSequence()->push_back(node);
>-    mLastStatementWasBreak = false;
>-    return false;
>-}
>-
>-bool DoesBlockAlwaysBreak(TIntermBlock *node)
>-{
>-    if (node->getSequence()->empty())
>-    {
>-        return false;
>-    }
>-
>-    TIntermBlock *lastStatementAsBlock = node->getSequence()->back()->getAsBlock();
>-    if (lastStatementAsBlock)
>-    {
>-        return DoesBlockAlwaysBreak(lastStatementAsBlock);
>-    }
>-
>-    TIntermBranch *lastStatementAsBranch = node->getSequence()->back()->getAsBranchNode();
>-    return lastStatementAsBranch != nullptr;
>-}
>-
>-bool RemoveSwitchFallThroughTraverser::visitBlock(Visit, TIntermBlock *node)
>-{
>-    if (node != mStatementList)
>-    {
>-        mPreviousCase->getSequence()->push_back(node);
>-        mLastStatementWasBreak = DoesBlockAlwaysBreak(node);
>-        return false;
>-    }
>-    return true;
>-}
>-
>-bool RemoveSwitchFallThroughTraverser::visitLoop(Visit, TIntermLoop *node)
>-{
>-    mPreviousCase->getSequence()->push_back(node);
>-    mLastStatementWasBreak = false;
>-    return false;
>-}
>-
>-bool RemoveSwitchFallThroughTraverser::visitBranch(Visit, TIntermBranch *node)
>-{
>-    mPreviousCase->getSequence()->push_back(node);
>-    // TODO: Verify that accepting return or continue statements here doesn't cause problems.
>-    mLastStatementWasBreak = true;
>-    return false;
>-}
>-
>-}  // anonymous namespace
>-
>-TIntermBlock *RemoveSwitchFallThrough(TIntermBlock *statementList,
>-                                      PerformanceDiagnostics *perfDiagnostics)
>-{
>-    return RemoveSwitchFallThroughTraverser::removeFallThrough(statementList, perfDiagnostics);
>-}
>-
>-}  // namespace sh
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/RemoveSwitchFallThrough.h b/Source/ThirdParty/ANGLE/src/compiler/translator/RemoveSwitchFallThrough.h
>deleted file mode 100644
>index 7a3b1963f25..00000000000
>--- a/Source/ThirdParty/ANGLE/src/compiler/translator/RemoveSwitchFallThrough.h
>+++ /dev/null
>@@ -1,27 +0,0 @@
>-//
>-// Copyright (c) 2002-2015 The ANGLE Project Authors. All rights reserved.
>-// Use of this source code is governed by a BSD-style license that can be
>-// found in the LICENSE file.
>-//
>-// RemoveSwitchFallThrough.h: Remove fall-through from switch statements.
>-// Note that it is unsafe to do further AST transformations on the AST generated
>-// by this function. It leaves duplicate nodes in the AST making replacements
>-// unreliable.
>-
>-#ifndef COMPILER_TRANSLATOR_REMOVESWITCHFALLTHROUGH_H_
>-#define COMPILER_TRANSLATOR_REMOVESWITCHFALLTHROUGH_H_
>-
>-namespace sh
>-{
>-
>-class TIntermBlock;
>-class PerformanceDiagnostics;
>-
>-// When given a statementList from a switch AST node, return an updated
>-// statementList that has fall-through removed.
>-TIntermBlock *RemoveSwitchFallThrough(TIntermBlock *statementList,
>-                                      PerformanceDiagnostics *perfDiagnostics);
>-
>-}  // namespace sh
>-
>-#endif  // COMPILER_TRANSLATOR_REMOVESWITCHFALLTHROUGH_H_
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/RemoveUnreferencedVariables.cpp b/Source/ThirdParty/ANGLE/src/compiler/translator/RemoveUnreferencedVariables.cpp
>deleted file mode 100644
>index 74b5e73f719..00000000000
>--- a/Source/ThirdParty/ANGLE/src/compiler/translator/RemoveUnreferencedVariables.cpp
>+++ /dev/null
>@@ -1,358 +0,0 @@
>-//
>-// Copyright (c) 2017 The ANGLE Project Authors. All rights reserved.
>-// Use of this source code is governed by a BSD-style license that can be
>-// found in the LICENSE file.
>-//
>-// RemoveUnreferencedVariables.cpp:
>-//  Drop variables that are declared but never referenced in the AST. This avoids adding unnecessary
>-//  initialization code for them. Also removes unreferenced struct types.
>-//
>-
>-#include "compiler/translator/RemoveUnreferencedVariables.h"
>-
>-#include "compiler/translator/IntermTraverse.h"
>-#include "compiler/translator/SymbolTable.h"
>-
>-namespace sh
>-{
>-
>-namespace
>-{
>-
>-class CollectVariableRefCountsTraverser : public TIntermTraverser
>-{
>-  public:
>-    CollectVariableRefCountsTraverser();
>-
>-    using RefCountMap = std::unordered_map<int, unsigned int>;
>-    RefCountMap &getSymbolIdRefCounts() { return mSymbolIdRefCounts; }
>-    RefCountMap &getStructIdRefCounts() { return mStructIdRefCounts; }
>-
>-    void visitSymbol(TIntermSymbol *node) override;
>-    bool visitAggregate(Visit visit, TIntermAggregate *node) override;
>-    bool visitFunctionPrototype(Visit visit, TIntermFunctionPrototype *node) override;
>-
>-  private:
>-    void incrementStructTypeRefCount(const TType &type);
>-
>-    RefCountMap mSymbolIdRefCounts;
>-
>-    // Structure reference counts are counted from symbols, constructors, function calls, function
>-    // return values and from interface block and structure fields. We need to track both function
>-    // calls and function return values since there's a compiler option not to prune unused
>-    // functions. The type of a constant union may also be a struct, but statements that are just a
>-    // constant union are always pruned, and if the constant union is used somehow it will get
>-    // counted by something else.
>-    RefCountMap mStructIdRefCounts;
>-};
>-
>-CollectVariableRefCountsTraverser::CollectVariableRefCountsTraverser()
>-    : TIntermTraverser(true, false, false)
>-{
>-}
>-
>-void CollectVariableRefCountsTraverser::incrementStructTypeRefCount(const TType &type)
>-{
>-    if (type.isInterfaceBlock())
>-    {
>-        const auto *block = type.getInterfaceBlock();
>-        ASSERT(block);
>-
>-        // We can end up incrementing ref counts of struct types referenced from an interface block
>-        // multiple times for the same block. This doesn't matter, because interface blocks can't be
>-        // pruned so we'll never do the reverse operation.
>-        for (const auto &field : block->fields())
>-        {
>-            ASSERT(!field->type()->isInterfaceBlock());
>-            incrementStructTypeRefCount(*field->type());
>-        }
>-        return;
>-    }
>-
>-    const auto *structure = type.getStruct();
>-    if (structure != nullptr)
>-    {
>-        auto structIter = mStructIdRefCounts.find(structure->uniqueId());
>-        if (structIter == mStructIdRefCounts.end())
>-        {
>-            mStructIdRefCounts[structure->uniqueId()] = 1u;
>-
>-            for (const auto &field : structure->fields())
>-            {
>-                incrementStructTypeRefCount(*field->type());
>-            }
>-
>-            return;
>-        }
>-        ++(structIter->second);
>-    }
>-}
>-
>-void CollectVariableRefCountsTraverser::visitSymbol(TIntermSymbol *node)
>-{
>-    incrementStructTypeRefCount(node->getType());
>-
>-    auto iter = mSymbolIdRefCounts.find(node->getId());
>-    if (iter == mSymbolIdRefCounts.end())
>-    {
>-        mSymbolIdRefCounts[node->getId()] = 1u;
>-        return;
>-    }
>-    ++(iter->second);
>-}
>-
>-bool CollectVariableRefCountsTraverser::visitAggregate(Visit visit, TIntermAggregate *node)
>-{
>-    // This tracks struct references in both function calls and constructors.
>-    incrementStructTypeRefCount(node->getType());
>-    return true;
>-}
>-
>-bool CollectVariableRefCountsTraverser::visitFunctionPrototype(Visit visit,
>-                                                               TIntermFunctionPrototype *node)
>-{
>-    incrementStructTypeRefCount(node->getType());
>-    return true;
>-}
>-
>-// Traverser that removes all unreferenced variables on one traversal.
>-class RemoveUnreferencedVariablesTraverser : public TIntermTraverser
>-{
>-  public:
>-    RemoveUnreferencedVariablesTraverser(
>-        CollectVariableRefCountsTraverser::RefCountMap *symbolIdRefCounts,
>-        CollectVariableRefCountsTraverser::RefCountMap *structIdRefCounts,
>-        TSymbolTable *symbolTable);
>-
>-    bool visitDeclaration(Visit visit, TIntermDeclaration *node) override;
>-    void visitSymbol(TIntermSymbol *node) override;
>-    bool visitAggregate(Visit visit, TIntermAggregate *node) override;
>-
>-    // Traverse loop and block nodes in reverse order. Note that this traverser does not track
>-    // parent block positions, so insertStatementInParentBlock is unusable!
>-    void traverseBlock(TIntermBlock *block) override;
>-    void traverseLoop(TIntermLoop *loop) override;
>-
>-  private:
>-    void removeVariableDeclaration(TIntermDeclaration *node, TIntermTyped *declarator);
>-    void decrementStructTypeRefCount(const TType &type);
>-
>-    CollectVariableRefCountsTraverser::RefCountMap *mSymbolIdRefCounts;
>-    CollectVariableRefCountsTraverser::RefCountMap *mStructIdRefCounts;
>-    bool mRemoveReferences;
>-};
>-
>-RemoveUnreferencedVariablesTraverser::RemoveUnreferencedVariablesTraverser(
>-    CollectVariableRefCountsTraverser::RefCountMap *symbolIdRefCounts,
>-    CollectVariableRefCountsTraverser::RefCountMap *structIdRefCounts,
>-    TSymbolTable *symbolTable)
>-    : TIntermTraverser(true, false, true, symbolTable),
>-      mSymbolIdRefCounts(symbolIdRefCounts),
>-      mStructIdRefCounts(structIdRefCounts),
>-      mRemoveReferences(false)
>-{
>-}
>-
>-void RemoveUnreferencedVariablesTraverser::decrementStructTypeRefCount(const TType &type)
>-{
>-    auto *structure = type.getStruct();
>-    if (structure != nullptr)
>-    {
>-        ASSERT(mStructIdRefCounts->find(structure->uniqueId()) != mStructIdRefCounts->end());
>-        unsigned int structRefCount = --(*mStructIdRefCounts)[structure->uniqueId()];
>-
>-        if (structRefCount == 0)
>-        {
>-            for (const auto &field : structure->fields())
>-            {
>-                decrementStructTypeRefCount(*field->type());
>-            }
>-        }
>-    }
>-}
>-
>-void RemoveUnreferencedVariablesTraverser::removeVariableDeclaration(TIntermDeclaration *node,
>-                                                                     TIntermTyped *declarator)
>-{
>-    if (declarator->getType().isStructSpecifier() && !declarator->getType().isNamelessStruct())
>-    {
>-        unsigned int structId = declarator->getType().getStruct()->uniqueId();
>-        if ((*mStructIdRefCounts)[structId] > 1u)
>-        {
>-            // If this declaration declares a named struct type that is used elsewhere, we need to
>-            // keep it. We can still change the declarator though so that it doesn't declare an
>-            // unreferenced variable.
>-
>-            // Note that since we're not removing the entire declaration, the struct's reference
>-            // count will end up being one less than the correct refcount. But since the struct
>-            // declaration is kept, the incorrect refcount can't cause any other problems.
>-
>-            if (declarator->getAsSymbolNode() && declarator->getAsSymbolNode()->getSymbol().empty())
>-            {
>-                // Already an empty declaration - nothing to do.
>-                return;
>-            }
>-            queueReplacementWithParent(node, declarator,
>-                                       new TIntermSymbol(mSymbolTable->getEmptySymbolId(),
>-                                                         TString(""), declarator->getType()),
>-                                       OriginalNode::IS_DROPPED);
>-            return;
>-        }
>-    }
>-
>-    if (getParentNode()->getAsBlock())
>-    {
>-        TIntermSequence emptyReplacement;
>-        mMultiReplacements.push_back(
>-            NodeReplaceWithMultipleEntry(getParentNode()->getAsBlock(), node, emptyReplacement));
>-    }
>-    else
>-    {
>-        ASSERT(getParentNode()->getAsLoopNode());
>-        queueReplacement(nullptr, OriginalNode::IS_DROPPED);
>-    }
>-}
>-
>-bool RemoveUnreferencedVariablesTraverser::visitDeclaration(Visit visit, TIntermDeclaration *node)
>-{
>-    if (visit == PreVisit)
>-    {
>-        // SeparateDeclarations should have already been run.
>-        ASSERT(node->getSequence()->size() == 1u);
>-
>-        TIntermTyped *declarator = node->getSequence()->back()->getAsTyped();
>-        ASSERT(declarator);
>-
>-        // We can only remove variables that are not a part of the shader interface.
>-        TQualifier qualifier = declarator->getQualifier();
>-        if (qualifier != EvqTemporary && qualifier != EvqGlobal)
>-        {
>-            return true;
>-        }
>-
>-        bool canRemoveVariable    = false;
>-        TIntermSymbol *symbolNode = declarator->getAsSymbolNode();
>-        if (symbolNode != nullptr)
>-        {
>-            canRemoveVariable =
>-                (*mSymbolIdRefCounts)[symbolNode->getId()] == 1u || symbolNode->getSymbol().empty();
>-        }
>-        TIntermBinary *initNode = declarator->getAsBinaryNode();
>-        if (initNode != nullptr)
>-        {
>-            ASSERT(initNode->getLeft()->getAsSymbolNode());
>-            int symbolId = initNode->getLeft()->getAsSymbolNode()->getId();
>-            canRemoveVariable =
>-                (*mSymbolIdRefCounts)[symbolId] == 1u && !initNode->getRight()->hasSideEffects();
>-        }
>-
>-        if (canRemoveVariable)
>-        {
>-            removeVariableDeclaration(node, declarator);
>-            mRemoveReferences = true;
>-        }
>-        return true;
>-    }
>-    ASSERT(visit == PostVisit);
>-    mRemoveReferences = false;
>-    return true;
>-}
>-
>-void RemoveUnreferencedVariablesTraverser::visitSymbol(TIntermSymbol *node)
>-{
>-    if (mRemoveReferences)
>-    {
>-        ASSERT(mSymbolIdRefCounts->find(node->getId()) != mSymbolIdRefCounts->end());
>-        --(*mSymbolIdRefCounts)[node->getId()];
>-
>-        decrementStructTypeRefCount(node->getType());
>-    }
>-}
>-
>-bool RemoveUnreferencedVariablesTraverser::visitAggregate(Visit visit, TIntermAggregate *node)
>-{
>-    if (mRemoveReferences)
>-    {
>-        decrementStructTypeRefCount(node->getType());
>-    }
>-    return true;
>-}
>-
>-void RemoveUnreferencedVariablesTraverser::traverseBlock(TIntermBlock *node)
>-{
>-    // We traverse blocks in reverse order.  This way reference counts can be decremented when
>-    // removing initializers, and variables that become unused when initializers are removed can be
>-    // removed on the same traversal.
>-
>-    ScopedNodeInTraversalPath addToPath(this, node);
>-
>-    bool visit = true;
>-
>-    TIntermSequence *sequence = node->getSequence();
>-
>-    if (preVisit)
>-        visit = visitBlock(PreVisit, node);
>-
>-    if (visit)
>-    {
>-        for (auto iter = sequence->rbegin(); iter != sequence->rend(); ++iter)
>-        {
>-            (*iter)->traverse(this);
>-            if (visit && inVisit)
>-            {
>-                if ((iter + 1) != sequence->rend())
>-                    visit = visitBlock(InVisit, node);
>-            }
>-        }
>-    }
>-
>-    if (visit && postVisit)
>-        visitBlock(PostVisit, node);
>-}
>-
>-void RemoveUnreferencedVariablesTraverser::traverseLoop(TIntermLoop *node)
>-{
>-    // We traverse loops in reverse order as well. The loop body gets traversed before the init
>-    // node.
>-
>-    ScopedNodeInTraversalPath addToPath(this, node);
>-
>-    bool visit = true;
>-
>-    if (preVisit)
>-        visit = visitLoop(PreVisit, node);
>-
>-    if (visit)
>-    {
>-        // We don't need to traverse loop expressions or conditions since they can't be declarations
>-        // in the AST (loops which have a declaration in their condition get transformed in the
>-        // parsing stage).
>-        ASSERT(node->getExpression() == nullptr ||
>-               node->getExpression()->getAsDeclarationNode() == nullptr);
>-        ASSERT(node->getCondition() == nullptr ||
>-               node->getCondition()->getAsDeclarationNode() == nullptr);
>-
>-        if (node->getBody())
>-            node->getBody()->traverse(this);
>-
>-        if (node->getInit())
>-            node->getInit()->traverse(this);
>-    }
>-
>-    if (visit && postVisit)
>-        visitLoop(PostVisit, node);
>-}
>-
>-}  // namespace
>-
>-void RemoveUnreferencedVariables(TIntermBlock *root, TSymbolTable *symbolTable)
>-{
>-    CollectVariableRefCountsTraverser collector;
>-    root->traverse(&collector);
>-    RemoveUnreferencedVariablesTraverser traverser(&collector.getSymbolIdRefCounts(),
>-                                                   &collector.getStructIdRefCounts(), symbolTable);
>-    root->traverse(&traverser);
>-    traverser.updateTree();
>-}
>-
>-}  // namespace sh
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/RemoveUnreferencedVariables.h b/Source/ThirdParty/ANGLE/src/compiler/translator/RemoveUnreferencedVariables.h
>deleted file mode 100644
>index 39c8327776e..00000000000
>--- a/Source/ThirdParty/ANGLE/src/compiler/translator/RemoveUnreferencedVariables.h
>+++ /dev/null
>@@ -1,24 +0,0 @@
>-//
>-// Copyright (c) 2017 The ANGLE Project Authors. All rights reserved.
>-// Use of this source code is governed by a BSD-style license that can be
>-// found in the LICENSE file.
>-//
>-// RemoveUnreferencedVariables.h:
>-//  Drop variables that are declared but never referenced in the AST. This avoids adding unnecessary
>-//  initialization code for them. Also removes unreferenced struct types.
>-//
>-
>-#ifndef COMPILER_TRANSLATOR_REMOVEUNREFERENCEDVARIABLES_H_
>-#define COMPILER_TRANSLATOR_REMOVEUNREFERENCEDVARIABLES_H_
>-
>-namespace sh
>-{
>-
>-class TIntermBlock;
>-class TSymbolTable;
>-
>-void RemoveUnreferencedVariables(TIntermBlock *root, TSymbolTable *symbolTable);
>-
>-}  // namespace sh
>-
>-#endif  // COMPILER_TRANSLATOR_REMOVEUNREFERENCEDVARIABLES_H_
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/ResourcesHLSL.cpp b/Source/ThirdParty/ANGLE/src/compiler/translator/ResourcesHLSL.cpp
>new file mode 100644
>index 00000000000..95e98deb122
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/ResourcesHLSL.cpp
>@@ -0,0 +1,789 @@
>+//
>+// Copyright (c) 2014 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// ResourcesHLSL.cpp:
>+//   Methods for GLSL to HLSL translation for uniforms and interface blocks.
>+//
>+
>+#include "compiler/translator/ResourcesHLSL.h"
>+
>+#include "common/utilities.h"
>+#include "compiler/translator/AtomicCounterFunctionHLSL.h"
>+#include "compiler/translator/ImmutableStringBuilder.h"
>+#include "compiler/translator/StructureHLSL.h"
>+#include "compiler/translator/UtilsHLSL.h"
>+#include "compiler/translator/blocklayoutHLSL.h"
>+#include "compiler/translator/util.h"
>+
>+namespace sh
>+{
>+
>+namespace
>+{
>+
>+constexpr const ImmutableString kAngleDecorString("angle_");
>+
>+static const char *UniformRegisterPrefix(const TType &type)
>+{
>+    if (IsSampler(type.getBasicType()))
>+    {
>+        return "s";
>+    }
>+    else
>+    {
>+        return "c";
>+    }
>+}
>+
>+static TString InterfaceBlockFieldTypeString(const TField &field, TLayoutBlockStorage blockStorage)
>+{
>+    const TType &fieldType                   = *field.type();
>+    const TLayoutMatrixPacking matrixPacking = fieldType.getLayoutQualifier().matrixPacking;
>+    ASSERT(matrixPacking != EmpUnspecified);
>+    const TStructure *structure = fieldType.getStruct();
>+
>+    if (fieldType.isMatrix())
>+    {
>+        // Use HLSL row-major packing for GLSL column-major matrices
>+        const TString &matrixPackString =
>+            (matrixPacking == EmpRowMajor ? "column_major" : "row_major");
>+        return matrixPackString + " " + TypeString(fieldType);
>+    }
>+    else if (structure)
>+    {
>+        // Use HLSL row-major packing for GLSL column-major matrices
>+        return QualifiedStructNameString(*structure, matrixPacking == EmpColumnMajor,
>+                                         blockStorage == EbsStd140);
>+    }
>+    else
>+    {
>+        return TypeString(fieldType);
>+    }
>+}
>+
>+static TString InterfaceBlockStructName(const TInterfaceBlock &interfaceBlock)
>+{
>+    return DecoratePrivate(interfaceBlock.name()) + "_type";
>+}
>+
>+void OutputUniformIndexArrayInitializer(TInfoSinkBase &out,
>+                                        const TType &type,
>+                                        unsigned int startIndex)
>+{
>+    out << "{";
>+    TType elementType(type);
>+    elementType.toArrayElementType();
>+    for (unsigned int i = 0u; i < type.getOutermostArraySize(); ++i)
>+    {
>+        if (i > 0u)
>+        {
>+            out << ", ";
>+        }
>+        if (elementType.isArray())
>+        {
>+            OutputUniformIndexArrayInitializer(out, elementType,
>+                                               startIndex + i * elementType.getArraySizeProduct());
>+        }
>+        else
>+        {
>+            out << (startIndex + i);
>+        }
>+    }
>+    out << "}";
>+}
>+
>+}  // anonymous namespace
>+
>+ResourcesHLSL::ResourcesHLSL(StructureHLSL *structureHLSL,
>+                             ShShaderOutput outputType,
>+                             const std::vector<Uniform> &uniforms,
>+                             unsigned int firstUniformRegister)
>+    : mUniformRegister(firstUniformRegister),
>+      mUniformBlockRegister(0),
>+      mTextureRegister(0),
>+      mUAVRegister(0),
>+      mSamplerCount(0),
>+      mStructureHLSL(structureHLSL),
>+      mOutputType(outputType),
>+      mUniforms(uniforms)
>+{}
>+
>+void ResourcesHLSL::reserveUniformRegisters(unsigned int registerCount)
>+{
>+    mUniformRegister = registerCount;
>+}
>+
>+void ResourcesHLSL::reserveUniformBlockRegisters(unsigned int registerCount)
>+{
>+    mUniformBlockRegister = registerCount;
>+}
>+
>+const Uniform *ResourcesHLSL::findUniformByName(const ImmutableString &name) const
>+{
>+    for (size_t uniformIndex = 0; uniformIndex < mUniforms.size(); ++uniformIndex)
>+    {
>+        if (name == mUniforms[uniformIndex].name)
>+        {
>+            return &mUniforms[uniformIndex];
>+        }
>+    }
>+
>+    return nullptr;
>+}
>+
>+unsigned int ResourcesHLSL::assignUniformRegister(const TType &type,
>+                                                  const ImmutableString &name,
>+                                                  unsigned int *outRegisterCount)
>+{
>+    unsigned int registerIndex;
>+    const Uniform *uniform = findUniformByName(name);
>+    ASSERT(uniform);
>+
>+    if (IsSampler(type.getBasicType()) ||
>+        (IsImage(type.getBasicType()) && type.getMemoryQualifier().readonly))
>+    {
>+        registerIndex = mTextureRegister;
>+    }
>+    else if (IsImage(type.getBasicType()))
>+    {
>+        registerIndex = mUAVRegister;
>+    }
>+    else
>+    {
>+        registerIndex = mUniformRegister;
>+    }
>+
>+    if (uniform->name == "angle_DrawID" && uniform->mappedName == "angle_DrawID")
>+    {
>+        mUniformRegisterMap["gl_DrawID"] = registerIndex;
>+    }
>+    else
>+    {
>+        mUniformRegisterMap[uniform->name] = registerIndex;
>+    }
>+
>+    unsigned int registerCount = HLSLVariableRegisterCount(*uniform, mOutputType);
>+
>+    if (IsSampler(type.getBasicType()) ||
>+        (IsImage(type.getBasicType()) && type.getMemoryQualifier().readonly))
>+    {
>+        mTextureRegister += registerCount;
>+    }
>+    else if (IsImage(type.getBasicType()))
>+    {
>+        mUAVRegister += registerCount;
>+    }
>+    else
>+    {
>+        mUniformRegister += registerCount;
>+    }
>+    if (outRegisterCount)
>+    {
>+        *outRegisterCount = registerCount;
>+    }
>+    return registerIndex;
>+}
>+
>+unsigned int ResourcesHLSL::assignSamplerInStructUniformRegister(const TType &type,
>+                                                                 const TString &name,
>+                                                                 unsigned int *outRegisterCount)
>+{
>+    // Sampler that is a field of a uniform structure.
>+    ASSERT(IsSampler(type.getBasicType()));
>+    unsigned int registerIndex                     = mTextureRegister;
>+    mUniformRegisterMap[std::string(name.c_str())] = registerIndex;
>+    unsigned int registerCount = type.isArray() ? type.getArraySizeProduct() : 1u;
>+    mTextureRegister += registerCount;
>+    if (outRegisterCount)
>+    {
>+        *outRegisterCount = registerCount;
>+    }
>+    return registerIndex;
>+}
>+
>+void ResourcesHLSL::outputHLSLSamplerUniformGroup(
>+    TInfoSinkBase &out,
>+    const HLSLTextureGroup textureGroup,
>+    const TVector<const TVariable *> &group,
>+    const TMap<const TVariable *, TString> &samplerInStructSymbolsToAPINames,
>+    unsigned int *groupTextureRegisterIndex)
>+{
>+    if (group.empty())
>+    {
>+        return;
>+    }
>+    unsigned int groupRegisterCount = 0;
>+    for (const TVariable *uniform : group)
>+    {
>+        const TType &type           = uniform->getType();
>+        const ImmutableString &name = uniform->name();
>+        unsigned int registerCount;
>+
>+        // The uniform might be just a regular sampler or one extracted from a struct.
>+        unsigned int samplerArrayIndex = 0u;
>+        const Uniform *uniformByName   = findUniformByName(name);
>+        if (uniformByName)
>+        {
>+            samplerArrayIndex = assignUniformRegister(type, name, &registerCount);
>+        }
>+        else
>+        {
>+            ASSERT(samplerInStructSymbolsToAPINames.find(uniform) !=
>+                   samplerInStructSymbolsToAPINames.end());
>+            samplerArrayIndex = assignSamplerInStructUniformRegister(
>+                type, samplerInStructSymbolsToAPINames.at(uniform), &registerCount);
>+        }
>+        groupRegisterCount += registerCount;
>+
>+        if (type.isArray())
>+        {
>+            out << "static const uint " << DecorateVariableIfNeeded(*uniform) << ArrayString(type)
>+                << " = ";
>+            OutputUniformIndexArrayInitializer(out, type, samplerArrayIndex);
>+            out << ";\n";
>+        }
>+        else
>+        {
>+            out << "static const uint " << DecorateVariableIfNeeded(*uniform) << " = "
>+                << samplerArrayIndex << ";\n";
>+        }
>+    }
>+    TString suffix = TextureGroupSuffix(textureGroup);
>+    // Since HLSL_TEXTURE_2D is the first group, it has a fixed offset of zero.
>+    if (textureGroup != HLSL_TEXTURE_2D)
>+    {
>+        out << "static const uint textureIndexOffset" << suffix << " = "
>+            << (*groupTextureRegisterIndex) << ";\n";
>+        out << "static const uint samplerIndexOffset" << suffix << " = "
>+            << (*groupTextureRegisterIndex) << ";\n";
>+    }
>+    out << "uniform " << TextureString(textureGroup) << " textures" << suffix << "["
>+        << groupRegisterCount << "]"
>+        << " : register(t" << (*groupTextureRegisterIndex) << ");\n";
>+    out << "uniform " << SamplerString(textureGroup) << " samplers" << suffix << "["
>+        << groupRegisterCount << "]"
>+        << " : register(s" << (*groupTextureRegisterIndex) << ");\n";
>+    *groupTextureRegisterIndex += groupRegisterCount;
>+}
>+
>+void ResourcesHLSL::outputHLSLImageUniformIndices(TInfoSinkBase &out,
>+                                                  const TVector<const TVariable *> &group,
>+                                                  unsigned int imageArrayIndex,
>+                                                  unsigned int *groupRegisterCount)
>+{
>+    for (const TVariable *uniform : group)
>+    {
>+        const TType &type           = uniform->getType();
>+        const ImmutableString &name = uniform->name();
>+        unsigned int registerCount  = 0;
>+
>+        assignUniformRegister(type, name, &registerCount);
>+        *groupRegisterCount += registerCount;
>+
>+        if (type.isArray())
>+        {
>+            out << "static const uint " << DecorateVariableIfNeeded(*uniform) << ArrayString(type)
>+                << " = ";
>+            OutputUniformIndexArrayInitializer(out, type, imageArrayIndex);
>+            out << ";\n";
>+        }
>+        else
>+        {
>+            out << "static const uint " << DecorateVariableIfNeeded(*uniform) << " = "
>+                << imageArrayIndex << ";\n";
>+        }
>+
>+        imageArrayIndex += registerCount;
>+    }
>+}
>+
>+void ResourcesHLSL::outputHLSLReadonlyImageUniformGroup(TInfoSinkBase &out,
>+                                                        const HLSLTextureGroup textureGroup,
>+                                                        const TVector<const TVariable *> &group,
>+                                                        unsigned int *groupTextureRegisterIndex)
>+{
>+    if (group.empty())
>+    {
>+        return;
>+    }
>+
>+    unsigned int groupRegisterCount = 0;
>+    outputHLSLImageUniformIndices(out, group, *groupTextureRegisterIndex, &groupRegisterCount);
>+
>+    TString suffix = TextureGroupSuffix(textureGroup);
>+    out << "static const uint readonlyImageIndexOffset" << suffix << " = "
>+        << (*groupTextureRegisterIndex) << ";\n";
>+    out << "uniform " << TextureString(textureGroup) << " readonlyImages" << suffix << "["
>+        << groupRegisterCount << "]"
>+        << " : register(t" << (*groupTextureRegisterIndex) << ");\n";
>+    *groupTextureRegisterIndex += groupRegisterCount;
>+}
>+
>+void ResourcesHLSL::outputHLSLImageUniformGroup(TInfoSinkBase &out,
>+                                                const HLSLRWTextureGroup textureGroup,
>+                                                const TVector<const TVariable *> &group,
>+                                                unsigned int *groupTextureRegisterIndex)
>+{
>+    if (group.empty())
>+    {
>+        return;
>+    }
>+
>+    unsigned int groupRegisterCount = 0;
>+    outputHLSLImageUniformIndices(out, group, *groupTextureRegisterIndex, &groupRegisterCount);
>+
>+    TString suffix = RWTextureGroupSuffix(textureGroup);
>+    out << "static const uint imageIndexOffset" << suffix << " = " << (*groupTextureRegisterIndex)
>+        << ";\n";
>+    out << "uniform " << RWTextureString(textureGroup) << " images" << suffix << "["
>+        << groupRegisterCount << "]"
>+        << " : register(u" << (*groupTextureRegisterIndex) << ");\n";
>+    *groupTextureRegisterIndex += groupRegisterCount;
>+}
>+
>+void ResourcesHLSL::outputHLSL4_0_FL9_3Sampler(TInfoSinkBase &out,
>+                                               const TType &type,
>+                                               const TVariable &variable,
>+                                               const unsigned int registerIndex)
>+{
>+    out << "uniform " << SamplerString(type.getBasicType()) << " sampler_"
>+        << DecorateVariableIfNeeded(variable) << ArrayString(type) << " : register(s"
>+        << str(registerIndex) << ");\n";
>+    out << "uniform " << TextureString(type.getBasicType()) << " texture_"
>+        << DecorateVariableIfNeeded(variable) << ArrayString(type) << " : register(t"
>+        << str(registerIndex) << ");\n";
>+}
>+
>+void ResourcesHLSL::outputUniform(TInfoSinkBase &out,
>+                                  const TType &type,
>+                                  const TVariable &variable,
>+                                  const unsigned int registerIndex)
>+{
>+    const TStructure *structure = type.getStruct();
>+    // If this is a nameless struct, we need to use its full definition, rather than its (empty)
>+    // name.
>+    // TypeString() will invoke defineNameless in this case; qualifier prefixes are unnecessary for
>+    // nameless structs in ES, as nameless structs cannot be used anywhere that layout qualifiers
>+    // are permitted.
>+    const TString &typeName = ((structure && structure->symbolType() != SymbolType::Empty)
>+                                   ? QualifiedStructNameString(*structure, false, false)
>+                                   : TypeString(type));
>+
>+    const TString &registerString =
>+        TString("register(") + UniformRegisterPrefix(type) + str(registerIndex) + ")";
>+
>+    out << "uniform " << typeName << " ";
>+
>+    out << DecorateVariableIfNeeded(variable);
>+
>+    out << ArrayString(type) << " : " << registerString << ";\n";
>+}
>+
>+void ResourcesHLSL::outputAtomicCounterBuffer(TInfoSinkBase &out,
>+                                              const int binding,
>+                                              const unsigned int registerIndex)
>+{
>+    // Atomic counter memory access is not incoherent
>+    out << "uniform globallycoherent RWByteAddressBuffer "
>+        << getAtomicCounterNameForBinding(binding) << " : register(u" << registerIndex << ");\n";
>+}
>+
>+void ResourcesHLSL::uniformsHeader(TInfoSinkBase &out,
>+                                   ShShaderOutput outputType,
>+                                   const ReferencedVariables &referencedUniforms,
>+                                   TSymbolTable *symbolTable)
>+{
>+    if (!referencedUniforms.empty())
>+    {
>+        out << "// Uniforms\n\n";
>+    }
>+    // In the case of HLSL 4, sampler uniforms need to be grouped by type before the code is
>+    // written. They are grouped based on the combination of the HLSL texture type and
>+    // HLSL sampler type, enumerated in HLSLTextureSamplerGroup.
>+    TVector<TVector<const TVariable *>> groupedSamplerUniforms(HLSL_TEXTURE_MAX + 1);
>+    TMap<const TVariable *, TString> samplerInStructSymbolsToAPINames;
>+    TVector<TVector<const TVariable *>> groupedReadonlyImageUniforms(HLSL_TEXTURE_MAX + 1);
>+    TVector<TVector<const TVariable *>> groupedImageUniforms(HLSL_RWTEXTURE_MAX + 1);
>+
>+    TUnorderedMap<int, unsigned int> assignedAtomicCounterBindings;
>+    unsigned int reservedReadonlyImageRegisterCount = 0, reservedImageRegisterCount = 0;
>+    for (auto &uniformIt : referencedUniforms)
>+    {
>+        // Output regular uniforms. Group sampler uniforms by type.
>+        const TVariable &variable = *uniformIt.second;
>+        const TType &type         = variable.getType();
>+
>+        if (outputType == SH_HLSL_4_1_OUTPUT && IsSampler(type.getBasicType()))
>+        {
>+            HLSLTextureGroup group = TextureGroup(type.getBasicType());
>+            groupedSamplerUniforms[group].push_back(&variable);
>+        }
>+        else if (outputType == SH_HLSL_4_0_FL9_3_OUTPUT && IsSampler(type.getBasicType()))
>+        {
>+            unsigned int registerIndex = assignUniformRegister(type, variable.name(), nullptr);
>+            outputHLSL4_0_FL9_3Sampler(out, type, variable, registerIndex);
>+        }
>+        else if (outputType == SH_HLSL_4_1_OUTPUT && IsImage(type.getBasicType()))
>+        {
>+            if (IsImage2D(type.getBasicType()))
>+            {
>+                const Uniform *uniform = findUniformByName(variable.name());
>+                if (type.getMemoryQualifier().readonly)
>+                {
>+                    reservedReadonlyImageRegisterCount +=
>+                        HLSLVariableRegisterCount(*uniform, mOutputType);
>+                }
>+                else
>+                {
>+                    reservedImageRegisterCount += HLSLVariableRegisterCount(*uniform, mOutputType);
>+                }
>+                continue;
>+            }
>+            if (type.getMemoryQualifier().readonly)
>+            {
>+                HLSLTextureGroup group = TextureGroup(
>+                    type.getBasicType(), type.getLayoutQualifier().imageInternalFormat);
>+                groupedReadonlyImageUniforms[group].push_back(&variable);
>+            }
>+            else
>+            {
>+                HLSLRWTextureGroup group = RWTextureGroup(
>+                    type.getBasicType(), type.getLayoutQualifier().imageInternalFormat);
>+                groupedImageUniforms[group].push_back(&variable);
>+            }
>+        }
>+        else if (outputType == SH_HLSL_4_1_OUTPUT && IsAtomicCounter(type.getBasicType()))
>+        {
>+            TLayoutQualifier layout = type.getLayoutQualifier();
>+            int binding             = layout.binding;
>+            unsigned int registerIndex;
>+            if (assignedAtomicCounterBindings.find(binding) == assignedAtomicCounterBindings.end())
>+            {
>+                registerIndex                          = mUAVRegister++;
>+                assignedAtomicCounterBindings[binding] = registerIndex;
>+                outputAtomicCounterBuffer(out, binding, registerIndex);
>+            }
>+            else
>+            {
>+                registerIndex = assignedAtomicCounterBindings[binding];
>+            }
>+            const Uniform *uniform             = findUniformByName(variable.name());
>+            mUniformRegisterMap[uniform->name] = registerIndex;
>+        }
>+        else
>+        {
>+            if (type.isStructureContainingSamplers())
>+            {
>+                TVector<const TVariable *> samplerSymbols;
>+                TMap<const TVariable *, TString> symbolsToAPINames;
>+                ImmutableStringBuilder namePrefix(kAngleDecorString.length() +
>+                                                  variable.name().length());
>+                namePrefix << kAngleDecorString;
>+                namePrefix << variable.name();
>+                type.createSamplerSymbols(namePrefix, TString(variable.name().data()),
>+                                          &samplerSymbols, &symbolsToAPINames, symbolTable);
>+                for (const TVariable *sampler : samplerSymbols)
>+                {
>+                    const TType &samplerType = sampler->getType();
>+
>+                    if (outputType == SH_HLSL_4_1_OUTPUT)
>+                    {
>+                        HLSLTextureGroup group = TextureGroup(samplerType.getBasicType());
>+                        groupedSamplerUniforms[group].push_back(sampler);
>+                        samplerInStructSymbolsToAPINames[sampler] = symbolsToAPINames[sampler];
>+                    }
>+                    else if (outputType == SH_HLSL_4_0_FL9_3_OUTPUT)
>+                    {
>+                        unsigned int registerIndex = assignSamplerInStructUniformRegister(
>+                            samplerType, symbolsToAPINames[sampler], nullptr);
>+                        outputHLSL4_0_FL9_3Sampler(out, samplerType, *sampler, registerIndex);
>+                    }
>+                    else
>+                    {
>+                        ASSERT(outputType == SH_HLSL_3_0_OUTPUT);
>+                        unsigned int registerIndex = assignSamplerInStructUniformRegister(
>+                            samplerType, symbolsToAPINames[sampler], nullptr);
>+                        outputUniform(out, samplerType, *sampler, registerIndex);
>+                    }
>+                }
>+            }
>+            unsigned int registerIndex = assignUniformRegister(type, variable.name(), nullptr);
>+            outputUniform(out, type, variable, registerIndex);
>+        }
>+    }
>+
>+    if (outputType == SH_HLSL_4_1_OUTPUT)
>+    {
>+        unsigned int groupTextureRegisterIndex = 0;
>+        // Atomic counters and RW texture share the same resources. Therefore, RW texture need to
>+        // start counting after the last atomic counter.
>+        unsigned int groupRWTextureRegisterIndex = mUAVRegister;
>+        // TEXTURE_2D is special, index offset is assumed to be 0 and omitted in that case.
>+        ASSERT(HLSL_TEXTURE_MIN == HLSL_TEXTURE_2D);
>+        for (int groupId = HLSL_TEXTURE_MIN; groupId < HLSL_TEXTURE_MAX; ++groupId)
>+        {
>+            outputHLSLSamplerUniformGroup(
>+                out, HLSLTextureGroup(groupId), groupedSamplerUniforms[groupId],
>+                samplerInStructSymbolsToAPINames, &groupTextureRegisterIndex);
>+        }
>+        mSamplerCount = groupTextureRegisterIndex;
>+
>+        // Reserve t type register for readonly image2D variables.
>+        mReadonlyImage2DRegisterIndex = mTextureRegister;
>+        groupTextureRegisterIndex += reservedReadonlyImageRegisterCount;
>+        mTextureRegister += reservedReadonlyImageRegisterCount;
>+
>+        for (int groupId = HLSL_TEXTURE_MIN; groupId < HLSL_TEXTURE_MAX; ++groupId)
>+        {
>+            outputHLSLReadonlyImageUniformGroup(out, HLSLTextureGroup(groupId),
>+                                                groupedReadonlyImageUniforms[groupId],
>+                                                &groupTextureRegisterIndex);
>+        }
>+        mReadonlyImageCount = groupTextureRegisterIndex - mReadonlyImage2DRegisterIndex;
>+        if (mReadonlyImageCount)
>+        {
>+            out << "static const uint readonlyImageIndexStart = " << mReadonlyImage2DRegisterIndex
>+                << ";\n";
>+        }
>+
>+        // Reserve u type register for writable image2D variables.
>+        mImage2DRegisterIndex = mUAVRegister;
>+        groupRWTextureRegisterIndex += reservedImageRegisterCount;
>+        mUAVRegister += reservedImageRegisterCount;
>+
>+        for (int groupId = HLSL_RWTEXTURE_MIN; groupId < HLSL_RWTEXTURE_MAX; ++groupId)
>+        {
>+            outputHLSLImageUniformGroup(out, HLSLRWTextureGroup(groupId),
>+                                        groupedImageUniforms[groupId],
>+                                        &groupRWTextureRegisterIndex);
>+        }
>+        mImageCount = groupRWTextureRegisterIndex - mImage2DRegisterIndex;
>+        if (mImageCount)
>+        {
>+            out << "static const uint imageIndexStart = " << mImage2DRegisterIndex << ";\n";
>+        }
>+    }
>+}
>+
>+void ResourcesHLSL::samplerMetadataUniforms(TInfoSinkBase &out, unsigned int regIndex)
>+{
>+    // If mSamplerCount is 0 the shader doesn't use any textures for samplers.
>+    if (mSamplerCount > 0)
>+    {
>+        out << "    struct SamplerMetadata\n"
>+               "    {\n"
>+               "        int baseLevel;\n"
>+               "        int internalFormatBits;\n"
>+               "        int wrapModes;\n"
>+               "        int padding;\n"
>+               "        int4 intBorderColor;\n"
>+               "    };\n"
>+               "    SamplerMetadata samplerMetadata["
>+            << mSamplerCount << "] : packoffset(c" << regIndex << ");\n";
>+    }
>+}
>+
>+void ResourcesHLSL::imageMetadataUniforms(TInfoSinkBase &out, unsigned int regIndex)
>+{
>+    if (mReadonlyImageCount > 0 || mImageCount > 0)
>+    {
>+        out << "    struct ImageMetadata\n"
>+               "    {\n"
>+               "        int layer;\n"
>+               "        int3 padding;\n"
>+               "    };\n";
>+
>+        if (mReadonlyImageCount > 0)
>+        {
>+            out << "    ImageMetadata readonlyImageMetadata[" << mReadonlyImageCount
>+                << "] : packoffset(c" << regIndex << ");\n";
>+        }
>+
>+        if (mImageCount > 0)
>+        {
>+            out << "    ImageMetadata imageMetadata[" << mImageCount << "] : packoffset(c"
>+                << regIndex + mReadonlyImageCount << ");\n";
>+        }
>+    }
>+}
>+
>+TString ResourcesHLSL::uniformBlocksHeader(
>+    const ReferencedInterfaceBlocks &referencedInterfaceBlocks)
>+{
>+    TString interfaceBlocks;
>+
>+    for (const auto &blockReference : referencedInterfaceBlocks)
>+    {
>+        const TInterfaceBlock &interfaceBlock = *blockReference.second->block;
>+        const TVariable *instanceVariable     = blockReference.second->instanceVariable;
>+        if (instanceVariable != nullptr)
>+        {
>+            interfaceBlocks += uniformBlockStructString(interfaceBlock);
>+        }
>+
>+        unsigned int activeRegister                            = mUniformBlockRegister;
>+        mUniformBlockRegisterMap[interfaceBlock.name().data()] = activeRegister;
>+
>+        if (instanceVariable != nullptr && instanceVariable->getType().isArray())
>+        {
>+            unsigned int instanceArraySize = instanceVariable->getType().getOutermostArraySize();
>+            for (unsigned int arrayIndex = 0; arrayIndex < instanceArraySize; arrayIndex++)
>+            {
>+                interfaceBlocks += uniformBlockString(interfaceBlock, instanceVariable,
>+                                                      activeRegister + arrayIndex, arrayIndex);
>+            }
>+            mUniformBlockRegister += instanceArraySize;
>+        }
>+        else
>+        {
>+            interfaceBlocks += uniformBlockString(interfaceBlock, instanceVariable, activeRegister,
>+                                                  GL_INVALID_INDEX);
>+            mUniformBlockRegister += 1u;
>+        }
>+    }
>+
>+    return (interfaceBlocks.empty() ? "" : ("// Uniform Blocks\n\n" + interfaceBlocks));
>+}
>+
>+TString ResourcesHLSL::shaderStorageBlocksHeader(
>+    const ReferencedInterfaceBlocks &referencedInterfaceBlocks)
>+{
>+    TString interfaceBlocks;
>+
>+    for (const auto &interfaceBlockReference : referencedInterfaceBlocks)
>+    {
>+        const TInterfaceBlock &interfaceBlock = *interfaceBlockReference.second->block;
>+        const TVariable *instanceVariable     = interfaceBlockReference.second->instanceVariable;
>+
>+        unsigned int activeRegister                                  = mUAVRegister;
>+        mShaderStorageBlockRegisterMap[interfaceBlock.name().data()] = activeRegister;
>+
>+        if (instanceVariable != nullptr && instanceVariable->getType().isArray())
>+        {
>+            unsigned int instanceArraySize = instanceVariable->getType().getOutermostArraySize();
>+            for (unsigned int arrayIndex = 0; arrayIndex < instanceArraySize; arrayIndex++)
>+            {
>+                interfaceBlocks += shaderStorageBlockString(
>+                    interfaceBlock, instanceVariable, activeRegister + arrayIndex, arrayIndex);
>+            }
>+            mUAVRegister += instanceArraySize;
>+        }
>+        else
>+        {
>+            interfaceBlocks += shaderStorageBlockString(interfaceBlock, instanceVariable,
>+                                                        activeRegister, GL_INVALID_INDEX);
>+            mUAVRegister += 1u;
>+        }
>+    }
>+
>+    return (interfaceBlocks.empty() ? "" : ("// Shader Storage Blocks\n\n" + interfaceBlocks));
>+}
>+
>+TString ResourcesHLSL::uniformBlockString(const TInterfaceBlock &interfaceBlock,
>+                                          const TVariable *instanceVariable,
>+                                          unsigned int registerIndex,
>+                                          unsigned int arrayIndex)
>+{
>+    const TString &arrayIndexString = (arrayIndex != GL_INVALID_INDEX ? str(arrayIndex) : "");
>+    const TString &blockName        = TString(interfaceBlock.name().data()) + arrayIndexString;
>+    TString hlsl;
>+
>+    hlsl += "cbuffer " + blockName + " : register(b" + str(registerIndex) +
>+            ")\n"
>+            "{\n";
>+
>+    if (instanceVariable != nullptr)
>+    {
>+        hlsl += "    " + InterfaceBlockStructName(interfaceBlock) + " " +
>+                InterfaceBlockInstanceString(instanceVariable->name(), arrayIndex) + ";\n";
>+    }
>+    else
>+    {
>+        const TLayoutBlockStorage blockStorage = interfaceBlock.blockStorage();
>+        hlsl += uniformBlockMembersString(interfaceBlock, blockStorage);
>+    }
>+
>+    hlsl += "};\n\n";
>+
>+    return hlsl;
>+}
>+
>+TString ResourcesHLSL::shaderStorageBlockString(const TInterfaceBlock &interfaceBlock,
>+                                                const TVariable *instanceVariable,
>+                                                unsigned int registerIndex,
>+                                                unsigned int arrayIndex)
>+{
>+    TString hlsl;
>+    if (instanceVariable != nullptr)
>+    {
>+        hlsl += "RWByteAddressBuffer " +
>+                InterfaceBlockInstanceString(instanceVariable->name(), arrayIndex) +
>+                ": register(u" + str(registerIndex) + ");\n";
>+    }
>+    else
>+    {
>+        hlsl += "RWByteAddressBuffer " + Decorate(interfaceBlock.name()) + ": register(u" +
>+                str(registerIndex) + ");\n";
>+    }
>+    return hlsl;
>+}
>+
>+TString ResourcesHLSL::InterfaceBlockInstanceString(const ImmutableString &instanceName,
>+                                                    unsigned int arrayIndex)
>+{
>+    if (arrayIndex != GL_INVALID_INDEX)
>+    {
>+        return DecoratePrivate(instanceName) + "_" + str(arrayIndex);
>+    }
>+    else
>+    {
>+        return Decorate(instanceName);
>+    }
>+}
>+
>+TString ResourcesHLSL::uniformBlockMembersString(const TInterfaceBlock &interfaceBlock,
>+                                                 TLayoutBlockStorage blockStorage)
>+{
>+    TString hlsl;
>+
>+    Std140PaddingHelper padHelper = mStructureHLSL->getPaddingHelper();
>+
>+    for (unsigned int typeIndex = 0; typeIndex < interfaceBlock.fields().size(); typeIndex++)
>+    {
>+        const TField &field    = *interfaceBlock.fields()[typeIndex];
>+        const TType &fieldType = *field.type();
>+
>+        if (blockStorage == EbsStd140)
>+        {
>+            // 2 and 3 component vector types in some cases need pre-padding
>+            hlsl += padHelper.prePaddingString(fieldType);
>+        }
>+
>+        hlsl += "    " + InterfaceBlockFieldTypeString(field, blockStorage) + " " +
>+                Decorate(field.name()) + ArrayString(fieldType).data() + ";\n";
>+
>+        // must pad out after matrices and arrays, where HLSL usually allows itself room to pack
>+        // stuff
>+        if (blockStorage == EbsStd140)
>+        {
>+            const bool useHLSLRowMajorPacking =
>+                (fieldType.getLayoutQualifier().matrixPacking == EmpColumnMajor);
>+            hlsl += padHelper.postPaddingString(fieldType, useHLSLRowMajorPacking);
>+        }
>+    }
>+
>+    return hlsl;
>+}
>+
>+TString ResourcesHLSL::uniformBlockStructString(const TInterfaceBlock &interfaceBlock)
>+{
>+    const TLayoutBlockStorage blockStorage = interfaceBlock.blockStorage();
>+
>+    return "struct " + InterfaceBlockStructName(interfaceBlock) +
>+           "\n"
>+           "{\n" +
>+           uniformBlockMembersString(interfaceBlock, blockStorage) + "};\n\n";
>+}
>+}  // namespace sh
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/ResourcesHLSL.h b/Source/ThirdParty/ANGLE/src/compiler/translator/ResourcesHLSL.h
>new file mode 100644
>index 00000000000..0c028224b00
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/ResourcesHLSL.h
>@@ -0,0 +1,139 @@
>+//
>+// Copyright (c) 2014 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// ResourcesHLSL.h:
>+//   Methods for GLSL to HLSL translation for uniforms and interface blocks.
>+//
>+
>+#ifndef COMPILER_TRANSLATOR_RESOURCESHLSL_H_
>+#define COMPILER_TRANSLATOR_RESOURCESHLSL_H_
>+
>+#include "compiler/translator/OutputHLSL.h"
>+#include "compiler/translator/UtilsHLSL.h"
>+
>+namespace sh
>+{
>+class ImmutableString;
>+class StructureHLSL;
>+class TSymbolTable;
>+
>+class ResourcesHLSL : angle::NonCopyable
>+{
>+  public:
>+    ResourcesHLSL(StructureHLSL *structureHLSL,
>+                  ShShaderOutput outputType,
>+                  const std::vector<Uniform> &uniforms,
>+                  unsigned int firstUniformRegister);
>+
>+    void reserveUniformRegisters(unsigned int registerCount);
>+    void reserveUniformBlockRegisters(unsigned int registerCount);
>+    void uniformsHeader(TInfoSinkBase &out,
>+                        ShShaderOutput outputType,
>+                        const ReferencedVariables &referencedUniforms,
>+                        TSymbolTable *symbolTable);
>+
>+    // Must be called after uniformsHeader
>+    void samplerMetadataUniforms(TInfoSinkBase &out, unsigned int regIndex);
>+    unsigned int getSamplerCount() const { return mSamplerCount; }
>+    void imageMetadataUniforms(TInfoSinkBase &out, unsigned int regIndex);
>+    TString uniformBlocksHeader(const ReferencedInterfaceBlocks &referencedInterfaceBlocks);
>+    TString shaderStorageBlocksHeader(const ReferencedInterfaceBlocks &referencedInterfaceBlocks);
>+
>+    // Used for direct index references
>+    static TString InterfaceBlockInstanceString(const ImmutableString &instanceName,
>+                                                unsigned int arrayIndex);
>+
>+    const std::map<std::string, unsigned int> &getShaderStorageBlockRegisterMap() const
>+    {
>+        return mShaderStorageBlockRegisterMap;
>+    }
>+
>+    const std::map<std::string, unsigned int> &getUniformBlockRegisterMap() const
>+    {
>+        return mUniformBlockRegisterMap;
>+    }
>+    const std::map<std::string, unsigned int> &getUniformRegisterMap() const
>+    {
>+        return mUniformRegisterMap;
>+    }
>+
>+    unsigned int getReadonlyImage2DRegisterIndex() const { return mReadonlyImage2DRegisterIndex; }
>+    unsigned int getImage2DRegisterIndex() const { return mImage2DRegisterIndex; }
>+
>+  private:
>+    TString uniformBlockString(const TInterfaceBlock &interfaceBlock,
>+                               const TVariable *instanceVariable,
>+                               unsigned int registerIndex,
>+                               unsigned int arrayIndex);
>+
>+    TString shaderStorageBlockString(const TInterfaceBlock &interfaceBlock,
>+                                     const TVariable *instanceVariable,
>+                                     unsigned int registerIndex,
>+                                     unsigned int arrayIndex);
>+    TString uniformBlockMembersString(const TInterfaceBlock &interfaceBlock,
>+                                      TLayoutBlockStorage blockStorage);
>+    TString uniformBlockStructString(const TInterfaceBlock &interfaceBlock);
>+    const Uniform *findUniformByName(const ImmutableString &name) const;
>+
>+    void outputHLSL4_0_FL9_3Sampler(TInfoSinkBase &out,
>+                                    const TType &type,
>+                                    const TVariable &variable,
>+                                    const unsigned int registerIndex);
>+    void outputUniform(TInfoSinkBase &out,
>+                       const TType &type,
>+                       const TVariable &variable,
>+                       const unsigned int registerIndex);
>+    void outputAtomicCounterBuffer(TInfoSinkBase &out,
>+                                   const int binding,
>+                                   const unsigned int registerIndex);
>+
>+    // Returns the uniform's register index
>+    unsigned int assignUniformRegister(const TType &type,
>+                                       const ImmutableString &name,
>+                                       unsigned int *outRegisterCount);
>+    unsigned int assignSamplerInStructUniformRegister(const TType &type,
>+                                                      const TString &name,
>+                                                      unsigned int *outRegisterCount);
>+
>+    void outputHLSLSamplerUniformGroup(
>+        TInfoSinkBase &out,
>+        const HLSLTextureGroup textureGroup,
>+        const TVector<const TVariable *> &group,
>+        const TMap<const TVariable *, TString> &samplerInStructSymbolsToAPINames,
>+        unsigned int *groupTextureRegisterIndex);
>+
>+    void outputHLSLImageUniformIndices(TInfoSinkBase &out,
>+                                       const TVector<const TVariable *> &group,
>+                                       unsigned int imageArrayIndex,
>+                                       unsigned int *groupRegisterCount);
>+    void outputHLSLReadonlyImageUniformGroup(TInfoSinkBase &out,
>+                                             const HLSLTextureGroup textureGroup,
>+                                             const TVector<const TVariable *> &group,
>+                                             unsigned int *groupTextureRegisterIndex);
>+    void outputHLSLImageUniformGroup(TInfoSinkBase &out,
>+                                     const HLSLRWTextureGroup textureGroup,
>+                                     const TVector<const TVariable *> &group,
>+                                     unsigned int *groupTextureRegisterIndex);
>+
>+    unsigned int mUniformRegister;
>+    unsigned int mUniformBlockRegister;
>+    unsigned int mTextureRegister;
>+    unsigned int mUAVRegister;
>+    unsigned int mSamplerCount;
>+    unsigned int mReadonlyImageCount;
>+    unsigned int mImageCount;
>+    StructureHLSL *mStructureHLSL;
>+    ShShaderOutput mOutputType;
>+
>+    const std::vector<Uniform> &mUniforms;
>+    std::map<std::string, unsigned int> mUniformBlockRegisterMap;
>+    std::map<std::string, unsigned int> mShaderStorageBlockRegisterMap;
>+    std::map<std::string, unsigned int> mUniformRegisterMap;
>+    unsigned int mReadonlyImage2DRegisterIndex;
>+    unsigned int mImage2DRegisterIndex;
>+};
>+}  // namespace sh
>+
>+#endif  // COMPILER_TRANSLATOR_RESOURCESHLSL_H_
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/RewriteDoWhile.cpp b/Source/ThirdParty/ANGLE/src/compiler/translator/RewriteDoWhile.cpp
>deleted file mode 100644
>index dc3fb7a74eb..00000000000
>--- a/Source/ThirdParty/ANGLE/src/compiler/translator/RewriteDoWhile.cpp
>+++ /dev/null
>@@ -1,159 +0,0 @@
>-//
>-// Copyright (c) 2015 The ANGLE Project Authors. All rights reserved.
>-// Use of this source code is governed by a BSD-style license that can be
>-// found in the LICENSE file.
>-//
>-
>-// RewriteDoWhile.cpp: rewrites do-while loops using another equivalent
>-// construct.
>-
>-#include "compiler/translator/RewriteDoWhile.h"
>-
>-#include "compiler/translator/IntermTraverse.h"
>-
>-namespace sh
>-{
>-
>-namespace
>-{
>-
>-// An AST traverser that rewrites loops of the form
>-//   do {
>-//     CODE;
>-//   } while (CONDITION)
>-//
>-// to loops of the form
>-//   bool temp = false;
>-//   while (true) {
>-//     if (temp) {
>-//       if (!CONDITION) {
>-//         break;
>-//       }
>-//     }
>-//     temp = true;
>-//     CODE;
>-//   }
>-//
>-// The reason we don't use a simpler form, with for example just (temp && !CONDITION) in the
>-// while condition, is that short-circuit is often badly supported by driver shader compiler.
>-// The double if has the same effect, but forces shader compilers to behave.
>-//
>-// TODO(cwallez) when UnfoldShortCircuitIntoIf handles loops correctly, revisit this as we might
>-// be able to use while (temp || CONDITION) with temp initially set to true then run
>-// UnfoldShortCircuitIntoIf
>-class DoWhileRewriter : public TIntermTraverser
>-{
>-  public:
>-    DoWhileRewriter(TSymbolTable *symbolTable) : TIntermTraverser(true, false, false, symbolTable)
>-    {
>-    }
>-
>-    bool visitBlock(Visit, TIntermBlock *node) override
>-    {
>-        // A well-formed AST can only have do-while inside TIntermBlock. By doing a prefix traversal
>-        // we are able to replace the do-while in the sequence directly as the content of the
>-        // do-while will be traversed later.
>-
>-        TIntermSequence *statements = node->getSequence();
>-
>-        // The statements vector will have new statements inserted when we encounter a do-while,
>-        // which prevents us from using a range-based for loop. Using the usual i++ works, as
>-        // the (two) new statements inserted replace the statement at the current position.
>-        for (size_t i = 0; i < statements->size(); i++)
>-        {
>-            TIntermNode *statement = (*statements)[i];
>-            TIntermLoop *loop      = statement->getAsLoopNode();
>-
>-            if (loop == nullptr || loop->getType() != ELoopDoWhile)
>-            {
>-                continue;
>-            }
>-
>-            // Found a loop to change.
>-            nextTemporaryId();
>-
>-            TType boolType = TType(EbtBool);
>-
>-            // bool temp = false;
>-            TIntermDeclaration *tempDeclaration = nullptr;
>-            {
>-                TConstantUnion *falseConstant = new TConstantUnion();
>-                falseConstant->setBConst(false);
>-                TIntermTyped *falseValue = new TIntermConstantUnion(falseConstant, boolType);
>-
>-                tempDeclaration = createTempInitDeclaration(falseValue);
>-            }
>-
>-            // temp = true;
>-            TIntermBinary *assignTrue = nullptr;
>-            {
>-                TConstantUnion *trueConstant = new TConstantUnion();
>-                trueConstant->setBConst(true);
>-                TIntermTyped *trueValue = new TIntermConstantUnion(trueConstant, boolType);
>-
>-                assignTrue = createTempAssignment(trueValue);
>-            }
>-
>-            // if (temp) {
>-            //   if (!CONDITION) {
>-            //     break;
>-            //   }
>-            // }
>-            TIntermIfElse *breakIf = nullptr;
>-            {
>-                TIntermBranch *breakStatement = new TIntermBranch(EOpBreak, nullptr);
>-
>-                TIntermBlock *breakBlock = new TIntermBlock();
>-                breakBlock->getSequence()->push_back(breakStatement);
>-
>-                TIntermUnary *negatedCondition =
>-                    new TIntermUnary(EOpLogicalNot, loop->getCondition());
>-
>-                TIntermIfElse *innerIf = new TIntermIfElse(negatedCondition, breakBlock, nullptr);
>-
>-                TIntermBlock *innerIfBlock = new TIntermBlock();
>-                innerIfBlock->getSequence()->push_back(innerIf);
>-
>-                breakIf = new TIntermIfElse(createTempSymbol(boolType), innerIfBlock, nullptr);
>-            }
>-
>-            // Assemble the replacement loops, reusing the do-while loop's body and inserting our
>-            // statements at the front.
>-            TIntermLoop *newLoop = nullptr;
>-            {
>-                TConstantUnion *trueConstant = new TConstantUnion();
>-                trueConstant->setBConst(true);
>-                TIntermTyped *trueValue = new TIntermConstantUnion(trueConstant, boolType);
>-
>-                TIntermBlock *body = loop->getBody();
>-                if (body == nullptr)
>-                {
>-                    body = new TIntermBlock();
>-                }
>-                auto sequence = body->getSequence();
>-                sequence->insert(sequence->begin(), assignTrue);
>-                sequence->insert(sequence->begin(), breakIf);
>-
>-                newLoop = new TIntermLoop(ELoopWhile, nullptr, trueValue, nullptr, body);
>-            }
>-
>-            TIntermSequence replacement;
>-            replacement.push_back(tempDeclaration);
>-            replacement.push_back(newLoop);
>-
>-            node->replaceChildNodeWithMultiple(loop, replacement);
>-        }
>-        return true;
>-    }
>-};
>-
>-}  // anonymous namespace
>-
>-void RewriteDoWhile(TIntermNode *root, TSymbolTable *symbolTable)
>-{
>-    DoWhileRewriter rewriter(symbolTable);
>-
>-    root->traverse(&rewriter);
>-}
>-
>-}  // namespace sh
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/RewriteDoWhile.h b/Source/ThirdParty/ANGLE/src/compiler/translator/RewriteDoWhile.h
>deleted file mode 100644
>index e83bfc4b568..00000000000
>--- a/Source/ThirdParty/ANGLE/src/compiler/translator/RewriteDoWhile.h
>+++ /dev/null
>@@ -1,23 +0,0 @@
>-//
>-// Copyright (c) 2015 The ANGLE Project Authors. All rights reserved.
>-// Use of this source code is governed by a BSD-style license that can be
>-// found in the LICENSE file.
>-//
>-
>-// RewriteDoWhile.h: rewrite do-while loops as while loops to work around
>-// driver bugs
>-
>-#ifndef COMPILER_TRANSLATOR_REWRITEDOWHILE_H_
>-#define COMPILER_TRANSLATOR_REWRITEDOWHILE_H_
>-
>-namespace sh
>-{
>-
>-class TIntermNode;
>-class TSymbolTable;
>-
>-void RewriteDoWhile(TIntermNode *root, TSymbolTable *symbolTable);
>-
>-}  // namespace sh
>-
>-#endif  // COMPILER_TRANSLATOR_REWRITEDOWHILE_H_
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/RewriteElseBlocks.cpp b/Source/ThirdParty/ANGLE/src/compiler/translator/RewriteElseBlocks.cpp
>deleted file mode 100644
>index ed1bfad8a83..00000000000
>--- a/Source/ThirdParty/ANGLE/src/compiler/translator/RewriteElseBlocks.cpp
>+++ /dev/null
>@@ -1,120 +0,0 @@
>-//
>-// Copyright (c) 2014 The ANGLE Project Authors. All rights reserved.
>-// Use of this source code is governed by a BSD-style license that can be
>-// found in the LICENSE file.
>-//
>-// RewriteElseBlocks.cpp: Implementation for tree transform to change
>-//   all if-else blocks to if-if blocks.
>-//
>-
>-#include "compiler/translator/RewriteElseBlocks.h"
>-
>-#include "compiler/translator/IntermNode.h"
>-#include "compiler/translator/IntermNode_util.h"
>-#include "compiler/translator/NodeSearch.h"
>-#include "compiler/translator/SymbolTable.h"
>-
>-namespace sh
>-{
>-
>-namespace
>-{
>-
>-class ElseBlockRewriter : public TIntermTraverser
>-{
>-  public:
>-    ElseBlockRewriter(TSymbolTable *symbolTable);
>-
>-  protected:
>-    bool visitFunctionDefinition(Visit visit, TIntermFunctionDefinition *aggregate) override;
>-    bool visitBlock(Visit visit, TIntermBlock *block) override;
>-
>-  private:
>-    TIntermNode *rewriteIfElse(TIntermIfElse *ifElse);
>-
>-    const TType *mFunctionType;
>-};
>-
>-ElseBlockRewriter::ElseBlockRewriter(TSymbolTable *symbolTable)
>-    : TIntermTraverser(true, false, true, symbolTable), mFunctionType(nullptr)
>-{
>-}
>-
>-bool ElseBlockRewriter::visitFunctionDefinition(Visit visit, TIntermFunctionDefinition *node)
>-{
>-    // Store the current function context (see comment below)
>-    mFunctionType = ((visit == PreVisit) ? &node->getFunctionPrototype()->getType() : nullptr);
>-    return true;
>-}
>-
>-bool ElseBlockRewriter::visitBlock(Visit visit, TIntermBlock *node)
>-{
>-    if (visit == PostVisit)
>-    {
>-        for (size_t statementIndex = 0; statementIndex != node->getSequence()->size();
>-             statementIndex++)
>-        {
>-            TIntermNode *statement = (*node->getSequence())[statementIndex];
>-            TIntermIfElse *ifElse  = statement->getAsIfElseNode();
>-            if (ifElse && ifElse->getFalseBlock() != nullptr)
>-            {
>-                (*node->getSequence())[statementIndex] = rewriteIfElse(ifElse);
>-            }
>-        }
>-    }
>-    return true;
>-}
>-
>-TIntermNode *ElseBlockRewriter::rewriteIfElse(TIntermIfElse *ifElse)
>-{
>-    ASSERT(ifElse != nullptr);
>-
>-    nextTemporaryId();
>-
>-    TIntermDeclaration *storeCondition = createTempInitDeclaration(ifElse->getCondition());
>-
>-    TIntermBlock *falseBlock = nullptr;
>-
>-    TType boolType(EbtBool, EbpUndefined, EvqTemporary);
>-
>-    if (ifElse->getFalseBlock())
>-    {
>-        TIntermBlock *negatedElse = nullptr;
>-        // crbug.com/346463
>-        // D3D generates error messages claiming a function has no return value, when rewriting
>-        // an if-else clause that returns something non-void in a function. By appending dummy
>-        // returns (that are unreachable) we can silence this compile error.
>-        if (mFunctionType && mFunctionType->getBasicType() != EbtVoid)
>-        {
>-            TIntermNode *returnNode = new TIntermBranch(EOpReturn, CreateZeroNode(*mFunctionType));
>-            negatedElse = new TIntermBlock();
>-            negatedElse->appendStatement(returnNode);
>-        }
>-
>-        TIntermSymbol *conditionSymbolElse = createTempSymbol(boolType);
>-        TIntermUnary *negatedCondition     = new TIntermUnary(EOpLogicalNot, conditionSymbolElse);
>-        TIntermIfElse *falseIfElse =
>-            new TIntermIfElse(negatedCondition, ifElse->getFalseBlock(), negatedElse);
>-        falseBlock = EnsureBlock(falseIfElse);
>-    }
>-
>-    TIntermSymbol *conditionSymbolSel = createTempSymbol(boolType);
>-    TIntermIfElse *newIfElse =
>-        new TIntermIfElse(conditionSymbolSel, ifElse->getTrueBlock(), falseBlock);
>-
>-    TIntermBlock *block = new TIntermBlock();
>-    block->getSequence()->push_back(storeCondition);
>-    block->getSequence()->push_back(newIfElse);
>-
>-    return block;
>-}
>-
>-}  // anonymous namespace
>-
>-void RewriteElseBlocks(TIntermNode *node, TSymbolTable *symbolTable)
>-{
>-    ElseBlockRewriter rewriter(symbolTable);
>-    node->traverse(&rewriter);
>-}
>-
>-}  // namespace sh
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/RewriteElseBlocks.h b/Source/ThirdParty/ANGLE/src/compiler/translator/RewriteElseBlocks.h
>deleted file mode 100644
>index 2586b5405c4..00000000000
>--- a/Source/ThirdParty/ANGLE/src/compiler/translator/RewriteElseBlocks.h
>+++ /dev/null
>@@ -1,22 +0,0 @@
>-//
>-// Copyright (c) 2014 The ANGLE Project Authors. All rights reserved.
>-// Use of this source code is governed by a BSD-style license that can be
>-// found in the LICENSE file.
>-//
>-// RewriteElseBlocks.h: Prototype for tree transform to change
>-//   all if-else blocks to if-if blocks.
>-//
>-
>-#ifndef COMPILER_TRANSLATOR_REWRITEELSEBLOCKS_H_
>-#define COMPILER_TRANSLATOR_REWRITEELSEBLOCKS_H_
>-
>-namespace sh
>-{
>-
>-class TIntermNode;
>-class TSymbolTable;
>-
>-void RewriteElseBlocks(TIntermNode *node, TSymbolTable *symbolTable);
>-}
>-
>-#endif  // COMPILER_TRANSLATOR_REWRITEELSEBLOCKS_H_
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/RewriteTexelFetchOffset.cpp b/Source/ThirdParty/ANGLE/src/compiler/translator/RewriteTexelFetchOffset.cpp
>deleted file mode 100644
>index b602e0c9230..00000000000
>--- a/Source/ThirdParty/ANGLE/src/compiler/translator/RewriteTexelFetchOffset.cpp
>+++ /dev/null
>@@ -1,154 +0,0 @@
>-//
>-// Copyright (c) 2016 The ANGLE Project Authors. All rights reserved.
>-// Use of this source code is governed by a BSD-style license that can be
>-// found in the LICENSE file.
>-//
>-// Implementation of texelFetchOffset translation issue workaround.
>-// See header for more info.
>-
>-#include "compiler/translator/RewriteTexelFetchOffset.h"
>-
>-#include "common/angleutils.h"
>-#include "compiler/translator/IntermNode_util.h"
>-#include "compiler/translator/IntermTraverse.h"
>-#include "compiler/translator/SymbolTable.h"
>-
>-namespace sh
>-{
>-
>-namespace
>-{
>-
>-class Traverser : public TIntermTraverser
>-{
>-  public:
>-    static void Apply(TIntermNode *root, const TSymbolTable &symbolTable, int shaderVersion);
>-
>-  private:
>-    Traverser(const TSymbolTable &symbolTable, int shaderVersion);
>-    bool visitAggregate(Visit visit, TIntermAggregate *node) override;
>-    void nextIteration();
>-
>-    const TSymbolTable *symbolTable;
>-    const int shaderVersion;
>-    bool mFound = false;
>-};
>-
>-Traverser::Traverser(const TSymbolTable &symbolTable, int shaderVersion)
>-    : TIntermTraverser(true, false, false), symbolTable(&symbolTable), shaderVersion(shaderVersion)
>-{
>-}
>-
>-// static
>-void Traverser::Apply(TIntermNode *root, const TSymbolTable &symbolTable, int shaderVersion)
>-{
>-    Traverser traverser(symbolTable, shaderVersion);
>-    do
>-    {
>-        traverser.nextIteration();
>-        root->traverse(&traverser);
>-        if (traverser.mFound)
>-        {
>-            traverser.updateTree();
>-        }
>-    } while (traverser.mFound);
>-}
>-
>-void Traverser::nextIteration()
>-{
>-    mFound = false;
>-}
>-
>-bool Traverser::visitAggregate(Visit visit, TIntermAggregate *node)
>-{
>-    if (mFound)
>-    {
>-        return false;
>-    }
>-
>-    // Decide if the node represents the call of texelFetchOffset.
>-    if (node->getOp() != EOpCallBuiltInFunction)
>-    {
>-        return true;
>-    }
>-
>-    if (node->getFunctionSymbolInfo()->getName() != "texelFetchOffset")
>-    {
>-        return true;
>-    }
>-
>-    // Potential problem case detected, apply workaround.
>-    const TIntermSequence *sequence = node->getSequence();
>-    ASSERT(sequence->size() == 4u);
>-
>-    // Decide if the sampler is a 2DArray sampler. In that case position is ivec3 and offset is
>-    // ivec2.
>-    bool is2DArray = sequence->at(1)->getAsTyped()->getNominalSize() == 3 &&
>-                     sequence->at(3)->getAsTyped()->getNominalSize() == 2;
>-
>-    // Create new node that represents the call of function texelFetch.
>-    // Its argument list will be: texelFetch(sampler, Position+offset, lod).
>-
>-    TIntermSequence *texelFetchArguments = new TIntermSequence();
>-
>-    // sampler
>-    texelFetchArguments->push_back(sequence->at(0));
>-
>-    // Position
>-    TIntermTyped *texCoordNode = sequence->at(1)->getAsTyped();
>-    ASSERT(texCoordNode);
>-
>-    // offset
>-    TIntermTyped *offsetNode = nullptr;
>-    ASSERT(sequence->at(3)->getAsTyped());
>-    if (is2DArray)
>-    {
>-        // For 2DArray samplers, Position is ivec3 and offset is ivec2;
>-        // So offset must be converted into an ivec3 before being added to Position.
>-        TIntermSequence *constructOffsetIvecArguments = new TIntermSequence();
>-        constructOffsetIvecArguments->push_back(sequence->at(3)->getAsTyped());
>-
>-        TIntermTyped *zeroNode = CreateZeroNode(TType(EbtInt));
>-        constructOffsetIvecArguments->push_back(zeroNode);
>-
>-        offsetNode = TIntermAggregate::CreateConstructor(texCoordNode->getType(),
>-                                                         constructOffsetIvecArguments);
>-        offsetNode->setLine(texCoordNode->getLine());
>-    }
>-    else
>-    {
>-        offsetNode = sequence->at(3)->getAsTyped();
>-    }
>-
>-    // Position+offset
>-    TIntermBinary *add = new TIntermBinary(EOpAdd, texCoordNode, offsetNode);
>-    add->setLine(texCoordNode->getLine());
>-    texelFetchArguments->push_back(add);
>-
>-    // lod
>-    texelFetchArguments->push_back(sequence->at(2));
>-
>-    ASSERT(texelFetchArguments->size() == 3u);
>-
>-    TIntermTyped *texelFetchNode = CreateBuiltInFunctionCallNode("texelFetch", texelFetchArguments,
>-                                                                 *symbolTable, shaderVersion);
>-    texelFetchNode->setLine(node->getLine());
>-
>-    // Replace the old node by this new node.
>-    queueReplacement(texelFetchNode, OriginalNode::IS_DROPPED);
>-    mFound = true;
>-    return false;
>-}
>-
>-}  // anonymous namespace
>-
>-void RewriteTexelFetchOffset(TIntermNode *root, const TSymbolTable &symbolTable, int shaderVersion)
>-{
>-    // texelFetchOffset is only valid in GLSL 3.0 and later.
>-    if (shaderVersion < 300)
>-        return;
>-
>-    Traverser::Apply(root, symbolTable, shaderVersion);
>-}
>-
>-}  // namespace sh
>\ No newline at end of file
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/RewriteTexelFetchOffset.h b/Source/ThirdParty/ANGLE/src/compiler/translator/RewriteTexelFetchOffset.h
>deleted file mode 100644
>index 694d709f8e6..00000000000
>--- a/Source/ThirdParty/ANGLE/src/compiler/translator/RewriteTexelFetchOffset.h
>+++ /dev/null
>@@ -1,28 +0,0 @@
>-//
>-// Copyright (c) 2016 The ANGLE Project Authors. All rights reserved.
>-// Use of this source code is governed by a BSD-style license that can be
>-// found in the LICENSE file.
>-//
>-// This mutating tree traversal works around an issue on the translation
>-// from texelFetchOffset into HLSL function Load on INTEL drivers. It
>-// works by translating texelFetchOffset into texelFetch:
>-//
>-// - From: texelFetchOffset(sampler, Position, lod, offset)
>-// - To: texelFetch(sampler, Position+offset, lod)
>-//
>-// See http://anglebug.com/1469
>-
>-#ifndef COMPILER_TRANSLATOR_REWRITE_TEXELFETCHOFFSET_H_
>-#define COMPILER_TRANSLATOR_REWRITE_TEXELFETCHOFFSET_H_
>-
>-class TIntermNode;
>-class TSymbolTable;
>-
>-namespace sh
>-{
>-
>-void RewriteTexelFetchOffset(TIntermNode *root, const TSymbolTable &symbolTable, int shaderVersion);
>-
>-}  // namespace sh
>-
>-#endif  // COMPILER_TRANSLATOR_REWRITE_TEXELFETCHOFFSET_H_
>\ No newline at end of file
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/RewriteUnaryMinusOperatorFloat.cpp b/Source/ThirdParty/ANGLE/src/compiler/translator/RewriteUnaryMinusOperatorFloat.cpp
>deleted file mode 100644
>index 696a49536c1..00000000000
>--- a/Source/ThirdParty/ANGLE/src/compiler/translator/RewriteUnaryMinusOperatorFloat.cpp
>+++ /dev/null
>@@ -1,94 +0,0 @@
>-//
>-// Copyright (c) 2016 The ANGLE Project Authors. All rights reserved.
>-// Use of this source code is governed by a BSD-style license that can be
>-// found in the LICENSE file.
>-//
>-
>-#include "compiler/translator/RewriteUnaryMinusOperatorFloat.h"
>-
>-#include "compiler/translator/IntermNode_util.h"
>-#include "compiler/translator/IntermTraverse.h"
>-
>-namespace sh
>-{
>-
>-namespace
>-{
>-
>-class Traverser : public TIntermTraverser
>-{
>-  public:
>-    static void Apply(TIntermNode *root);
>-
>-  private:
>-    Traverser();
>-    bool visitUnary(Visit visit, TIntermUnary *node) override;
>-    void nextIteration();
>-
>-    bool mFound = false;
>-};
>-
>-// static
>-void Traverser::Apply(TIntermNode *root)
>-{
>-    Traverser traverser;
>-    do
>-    {
>-        traverser.nextIteration();
>-        root->traverse(&traverser);
>-        if (traverser.mFound)
>-        {
>-            traverser.updateTree();
>-        }
>-    } while (traverser.mFound);
>-}
>-
>-Traverser::Traverser() : TIntermTraverser(true, false, false)
>-{
>-}
>-
>-void Traverser::nextIteration()
>-{
>-    mFound = false;
>-}
>-
>-bool Traverser::visitUnary(Visit visit, TIntermUnary *node)
>-{
>-    if (mFound)
>-    {
>-        return false;
>-    }
>-
>-    // Detect if the current operator is unary minus operator.
>-    if (node->getOp() != EOpNegative)
>-    {
>-        return true;
>-    }
>-
>-    // Detect if the current operand is a float variable.
>-    TIntermTyped *fValue = node->getOperand();
>-    if (!fValue->getType().isScalarFloat())
>-    {
>-        return true;
>-    }
>-
>-    // 0.0 - float
>-    TIntermTyped *zero = CreateZeroNode(fValue->getType());
>-    zero->setLine(fValue->getLine());
>-    TIntermBinary *sub = new TIntermBinary(EOpSub, zero, fValue);
>-    sub->setLine(fValue->getLine());
>-
>-    queueReplacement(sub, OriginalNode::IS_DROPPED);
>-
>-    mFound = true;
>-    return false;
>-}
>-
>-}  // anonymous namespace
>-
>-void RewriteUnaryMinusOperatorFloat(TIntermNode *root)
>-{
>-    Traverser::Apply(root);
>-}
>-
>-}  // namespace sh
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/RewriteUnaryMinusOperatorFloat.h b/Source/ThirdParty/ANGLE/src/compiler/translator/RewriteUnaryMinusOperatorFloat.h
>deleted file mode 100644
>index ccbfbcbd9e5..00000000000
>--- a/Source/ThirdParty/ANGLE/src/compiler/translator/RewriteUnaryMinusOperatorFloat.h
>+++ /dev/null
>@@ -1,19 +0,0 @@
>-// Copyright (c) 2016 The ANGLE Project Authors. All rights reserved.
>-// Use of this source code is governed by a BSD-style license that can be
>-// found in the LICENSE file.
>-//
>-// Rewrite "-float" to "0.0 - float" to work around unary minus operator on float issue on Intel Mac
>-// OSX 10.11.
>-
>-#ifndef COMPILER_TRANSLATOR_REWRITEUNARYMINUSOPERATORFLOAT_H_
>-#define COMPILER_TRANSLATOR_REWRITEUNARYMINUSOPERATORFLOAT_H_
>-
>-class TIntermNode;
>-namespace sh
>-{
>-
>-void RewriteUnaryMinusOperatorFloat(TIntermNode *root);
>-
>-}  // namespace sh
>-
>-#endif  // COMPILER_TRANSLATOR_REWRITEUNARYMINUSOPERATORFLOAT_H_
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/RewriteUnaryMinusOperatorInt.cpp b/Source/ThirdParty/ANGLE/src/compiler/translator/RewriteUnaryMinusOperatorInt.cpp
>deleted file mode 100644
>index fe2ef948b45..00000000000
>--- a/Source/ThirdParty/ANGLE/src/compiler/translator/RewriteUnaryMinusOperatorInt.cpp
>+++ /dev/null
>@@ -1,112 +0,0 @@
>-//
>-// Copyright (c) 2016 The ANGLE Project Authors. All rights reserved.
>-// Use of this source code is governed by a BSD-style license that can be
>-// found in the LICENSE file.
>-//
>-// Implementation of evaluating unary integer variable bug workaround.
>-// See header for more info.
>-
>-#include "compiler/translator/RewriteUnaryMinusOperatorInt.h"
>-
>-#include "compiler/translator/IntermTraverse.h"
>-
>-namespace sh
>-{
>-
>-namespace
>-{
>-
>-class Traverser : public TIntermTraverser
>-{
>-  public:
>-    static void Apply(TIntermNode *root);
>-
>-  private:
>-    Traverser();
>-    bool visitUnary(Visit visit, TIntermUnary *node) override;
>-    void nextIteration();
>-
>-    bool mFound = false;
>-};
>-
>-// static
>-void Traverser::Apply(TIntermNode *root)
>-{
>-    Traverser traverser;
>-    do
>-    {
>-        traverser.nextIteration();
>-        root->traverse(&traverser);
>-        if (traverser.mFound)
>-        {
>-            traverser.updateTree();
>-        }
>-    } while (traverser.mFound);
>-}
>-
>-Traverser::Traverser() : TIntermTraverser(true, false, false)
>-{
>-}
>-
>-void Traverser::nextIteration()
>-{
>-    mFound = false;
>-}
>-
>-bool Traverser::visitUnary(Visit visit, TIntermUnary *node)
>-{
>-    if (mFound)
>-    {
>-        return false;
>-    }
>-
>-    // Decide if the current unary operator is unary minus.
>-    if (node->getOp() != EOpNegative)
>-    {
>-        return true;
>-    }
>-
>-    // Decide if the current operand is an integer variable.
>-    TIntermTyped *opr = node->getOperand();
>-    if (!opr->getType().isScalarInt())
>-    {
>-        return true;
>-    }
>-
>-    // Potential problem case detected, apply workaround: -(int) -> ~(int) + 1.
>-    // ~(int)
>-    TIntermUnary *bitwiseNot = new TIntermUnary(EOpBitwiseNot, opr);
>-    bitwiseNot->setLine(opr->getLine());
>-
>-    // Constant 1 (or 1u)
>-    TConstantUnion *one = new TConstantUnion();
>-    if (opr->getType().getBasicType() == EbtInt)
>-    {
>-        one->setIConst(1);
>-    }
>-    else
>-    {
>-        one->setUConst(1u);
>-    }
>-    TIntermConstantUnion *oneNode = new TIntermConstantUnion(one, opr->getType());
>-    oneNode->getTypePointer()->setQualifier(EvqConst);
>-    oneNode->setLine(opr->getLine());
>-
>-    // ~(int) + 1
>-    TIntermBinary *add = new TIntermBinary(EOpAdd, bitwiseNot, oneNode);
>-    add->setLine(opr->getLine());
>-
>-    queueReplacement(add, OriginalNode::IS_DROPPED);
>-
>-    mFound = true;
>-    return false;
>-}
>-
>-}  // anonymous namespace
>-
>-void RewriteUnaryMinusOperatorInt(TIntermNode *root)
>-{
>-    Traverser::Apply(root);
>-}
>-
>-}  // namespace sh
>\ No newline at end of file
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/RewriteUnaryMinusOperatorInt.h b/Source/ThirdParty/ANGLE/src/compiler/translator/RewriteUnaryMinusOperatorInt.h
>deleted file mode 100644
>index 50f0c442a73..00000000000
>--- a/Source/ThirdParty/ANGLE/src/compiler/translator/RewriteUnaryMinusOperatorInt.h
>+++ /dev/null
>@@ -1,20 +0,0 @@
>-// Copyright (c) 2016 The ANGLE Project Authors. All rights reserved.
>-// Use of this source code is governed by a BSD-style license that can be
>-// found in the LICENSE file.
>-//
>-// This mutating tree traversal works around a bug on evaluating unary
>-// integer variable on Intel D3D driver. It works by rewriting -(int) to
>-// ~(int) + 1 when evaluating unary integer variables.
>-
>-#ifndef COMPILER_TRANSLATOR_REWRITEUNARYMINUSOPERATORINT_H_
>-#define COMPILER_TRANSLATOR_REWRITEUNARYMINUSOPERATORINT_H_
>-
>-class TIntermNode;
>-namespace sh
>-{
>-
>-void RewriteUnaryMinusOperatorInt(TIntermNode *root);
>-
>-}  // namespace sh
>-
>-#endif  // COMPILER_TRANSLATOR_REWRITEUNARYMINUSOPERATORINT_H_
>\ No newline at end of file
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/RunAtTheEndOfShader.cpp b/Source/ThirdParty/ANGLE/src/compiler/translator/RunAtTheEndOfShader.cpp
>deleted file mode 100644
>index 3c4209c539d..00000000000
>--- a/Source/ThirdParty/ANGLE/src/compiler/translator/RunAtTheEndOfShader.cpp
>+++ /dev/null
>@@ -1,112 +0,0 @@
>-//
>-// Copyright (c) 2017 The ANGLE Project Authors. All rights reserved.
>-// Use of this source code is governed by a BSD-style license that can be
>-// found in the LICENSE file.
>-//
>-// RunAtTheEndOfShader.cpp: Add code to be run at the end of the shader. In case main() contains a
>-// return statement, this is done by replacing the main() function with another function that calls
>-// the old main, like this:
>-//
>-// void main() { body }
>-// =>
>-// void main0() { body }
>-// void main()
>-// {
>-//     main0();
>-//     codeToRun
>-// }
>-//
>-// This way the code will get run even if the return statement inside main is executed.
>-//
>-
>-#include "compiler/translator/RunAtTheEndOfShader.h"
>-
>-#include "compiler/translator/FindMain.h"
>-#include "compiler/translator/IntermNode.h"
>-#include "compiler/translator/IntermNode_util.h"
>-#include "compiler/translator/IntermTraverse.h"
>-#include "compiler/translator/SymbolTable.h"
>-
>-namespace sh
>-{
>-
>-namespace
>-{
>-
>-class ContainsReturnTraverser : public TIntermTraverser
>-{
>-  public:
>-    ContainsReturnTraverser() : TIntermTraverser(true, false, false), mContainsReturn(false) {}
>-
>-    bool visitBranch(Visit visit, TIntermBranch *node) override
>-    {
>-        if (node->getFlowOp() == EOpReturn)
>-        {
>-            mContainsReturn = true;
>-        }
>-        return false;
>-    }
>-
>-    bool containsReturn() { return mContainsReturn; }
>-
>-  private:
>-    bool mContainsReturn;
>-};
>-
>-bool ContainsReturn(TIntermNode *node)
>-{
>-    ContainsReturnTraverser traverser;
>-    node->traverse(&traverser);
>-    return traverser.containsReturn();
>-}
>-
>-void WrapMainAndAppend(TIntermBlock *root,
>-                       TIntermFunctionDefinition *main,
>-                       TIntermNode *codeToRun,
>-                       TSymbolTable *symbolTable)
>-{
>-    // Replace main() with main0() with the same body.
>-    TSymbolUniqueId oldMainId(symbolTable);
>-    std::stringstream oldMainName;
>-    oldMainName << "main" << oldMainId.get();
>-    TIntermFunctionDefinition *oldMain = CreateInternalFunctionDefinitionNode(
>-        TType(EbtVoid), oldMainName.str().c_str(), main->getBody(), oldMainId);
>-
>-    bool replaced = root->replaceChildNode(main, oldMain);
>-    ASSERT(replaced);
>-
>-    // void main()
>-    TIntermFunctionPrototype *newMainProto = new TIntermFunctionPrototype(
>-        TType(EbtVoid), main->getFunctionPrototype()->getFunctionSymbolInfo()->getId());
>-    newMainProto->getFunctionSymbolInfo()->setName("main");
>-
>-    // {
>-    //     main0();
>-    //     codeToRun
>-    // }
>-    TIntermBlock *newMainBody     = new TIntermBlock();
>-    TIntermAggregate *oldMainCall = CreateInternalFunctionCallNode(
>-        TType(EbtVoid), oldMainName.str().c_str(), oldMainId, new TIntermSequence());
>-    newMainBody->appendStatement(oldMainCall);
>-    newMainBody->appendStatement(codeToRun);
>-
>-    // Add the new main() to the root node.
>-    TIntermFunctionDefinition *newMain = new TIntermFunctionDefinition(newMainProto, newMainBody);
>-    root->appendStatement(newMain);
>-}
>-
>-}  // anonymous namespace
>-
>-void RunAtTheEndOfShader(TIntermBlock *root, TIntermNode *codeToRun, TSymbolTable *symbolTable)
>-{
>-    TIntermFunctionDefinition *main = FindMain(root);
>-    if (!ContainsReturn(main))
>-    {
>-        main->getBody()->appendStatement(codeToRun);
>-        return;
>-    }
>-
>-    WrapMainAndAppend(root, main, codeToRun, symbolTable);
>-}
>-
>-}  // namespace sh
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/RunAtTheEndOfShader.h b/Source/ThirdParty/ANGLE/src/compiler/translator/RunAtTheEndOfShader.h
>deleted file mode 100644
>index ed94c28daec..00000000000
>--- a/Source/ThirdParty/ANGLE/src/compiler/translator/RunAtTheEndOfShader.h
>+++ /dev/null
>@@ -1,23 +0,0 @@
>-//
>-// Copyright (c) 2017 The ANGLE Project Authors. All rights reserved.
>-// Use of this source code is governed by a BSD-style license that can be
>-// found in the LICENSE file.
>-//
>-// RunAtTheEndOfShader.h: Add code to be run at the end of the shader.
>-//
>-
>-#ifndef COMPILER_TRANSLATOR_RUNATTHEENDOFSHADER_H_
>-#define COMPILER_TRANSLATOR_RUNATTHEENDOFSHADER_H_
>-
>-namespace sh
>-{
>-
>-class TIntermBlock;
>-class TIntermNode;
>-class TSymbolTable;
>-
>-void RunAtTheEndOfShader(TIntermBlock *root, TIntermNode *codeToRun, TSymbolTable *symbolTable);
>-
>-}  // namespace sh
>-
>-#endif  // COMPILER_TRANSLATOR_RUNATTHEENDOFSHADER_H_
>\ No newline at end of file
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/ScalarizeVecAndMatConstructorArgs.cpp b/Source/ThirdParty/ANGLE/src/compiler/translator/ScalarizeVecAndMatConstructorArgs.cpp
>deleted file mode 100644
>index 746c16e2e66..00000000000
>--- a/Source/ThirdParty/ANGLE/src/compiler/translator/ScalarizeVecAndMatConstructorArgs.cpp
>+++ /dev/null
>@@ -1,238 +0,0 @@
>-//
>-// Copyright (c) 2002-2014 The ANGLE Project Authors. All rights reserved.
>-// Use of this source code is governed by a BSD-style license that can be
>-// found in the LICENSE file.
>-//
>-// Scalarize vector and matrix constructor args, so that vectors built from components don't have
>-// matrix arguments, and matrices built from components don't have vector arguments. This avoids
>-// driver bugs around vector and matrix constructors.
>-//
>-
>-#include "common/debug.h"
>-#include "compiler/translator/ScalarizeVecAndMatConstructorArgs.h"
>-
>-#include <algorithm>
>-
>-#include "angle_gl.h"
>-#include "common/angleutils.h"
>-#include "compiler/translator/IntermNode_util.h"
>-#include "compiler/translator/IntermTraverse.h"
>-
>-namespace sh
>-{
>-
>-namespace
>-{
>-
>-bool ContainsMatrixNode(const TIntermSequence &sequence)
>-{
>-    for (size_t ii = 0; ii < sequence.size(); ++ii)
>-    {
>-        TIntermTyped *node = sequence[ii]->getAsTyped();
>-        if (node && node->isMatrix())
>-            return true;
>-    }
>-    return false;
>-}
>-
>-bool ContainsVectorNode(const TIntermSequence &sequence)
>-{
>-    for (size_t ii = 0; ii < sequence.size(); ++ii)
>-    {
>-        TIntermTyped *node = sequence[ii]->getAsTyped();
>-        if (node && node->isVector())
>-            return true;
>-    }
>-    return false;
>-}
>-
>-TIntermBinary *ConstructVectorIndexBinaryNode(TIntermSymbol *symbolNode, int index)
>-{
>-    return new TIntermBinary(EOpIndexDirect, symbolNode, CreateIndexNode(index));
>-}
>-
>-TIntermBinary *ConstructMatrixIndexBinaryNode(TIntermSymbol *symbolNode, int colIndex, int rowIndex)
>-{
>-    TIntermBinary *colVectorNode = ConstructVectorIndexBinaryNode(symbolNode, colIndex);
>-
>-    return new TIntermBinary(EOpIndexDirect, colVectorNode, CreateIndexNode(rowIndex));
>-}
>-
>-class ScalarizeArgsTraverser : public TIntermTraverser
>-{
>-  public:
>-    ScalarizeArgsTraverser(sh::GLenum shaderType,
>-                           bool fragmentPrecisionHigh,
>-                           TSymbolTable *symbolTable)
>-        : TIntermTraverser(true, false, false, symbolTable),
>-          mShaderType(shaderType),
>-          mFragmentPrecisionHigh(fragmentPrecisionHigh)
>-    {
>-    }
>-
>-  protected:
>-    bool visitAggregate(Visit visit, TIntermAggregate *node) override;
>-    bool visitBlock(Visit visit, TIntermBlock *node) override;
>-
>-  private:
>-    void scalarizeArgs(TIntermAggregate *aggregate, bool scalarizeVector, bool scalarizeMatrix);
>-
>-    // If we have the following code:
>-    //   mat4 m(0);
>-    //   vec4 v(1, m);
>-    // We will rewrite to:
>-    //   mat4 m(0);
>-    //   mat4 s0 = m;
>-    //   vec4 v(1, s0[0][0], s0[0][1], s0[0][2]);
>-    // This function is to create nodes for "mat4 s0 = m;" and insert it to the code sequence. This
>-    // way the possible side effects of the constructor argument will only be evaluated once.
>-    void createTempVariable(TIntermTyped *original);
>-
>-    std::vector<TIntermSequence> mBlockStack;
>-
>-    sh::GLenum mShaderType;
>-    bool mFragmentPrecisionHigh;
>-};
>-
>-bool ScalarizeArgsTraverser::visitAggregate(Visit visit, TIntermAggregate *node)
>-{
>-    if (visit == PreVisit && node->getOp() == EOpConstruct)
>-    {
>-        if (node->getType().isVector() && ContainsMatrixNode(*(node->getSequence())))
>-            scalarizeArgs(node, false, true);
>-        else if (node->getType().isMatrix() && ContainsVectorNode(*(node->getSequence())))
>-            scalarizeArgs(node, true, false);
>-    }
>-    return true;
>-}
>-
>-bool ScalarizeArgsTraverser::visitBlock(Visit visit, TIntermBlock *node)
>-{
>-    mBlockStack.push_back(TIntermSequence());
>-    {
>-        for (TIntermNode *child : *node->getSequence())
>-        {
>-            ASSERT(child != nullptr);
>-            child->traverse(this);
>-            mBlockStack.back().push_back(child);
>-        }
>-    }
>-    if (mBlockStack.back().size() > node->getSequence()->size())
>-    {
>-        node->getSequence()->clear();
>-        *(node->getSequence()) = mBlockStack.back();
>-    }
>-    mBlockStack.pop_back();
>-    return false;
>-}
>-
>-void ScalarizeArgsTraverser::scalarizeArgs(TIntermAggregate *aggregate,
>-                                           bool scalarizeVector,
>-                                           bool scalarizeMatrix)
>-{
>-    ASSERT(aggregate);
>-    ASSERT(!aggregate->isArray());
>-    int size                  = static_cast<int>(aggregate->getType().getObjectSize());
>-    TIntermSequence *sequence = aggregate->getSequence();
>-    TIntermSequence original(*sequence);
>-    sequence->clear();
>-    for (size_t ii = 0; ii < original.size(); ++ii)
>-    {
>-        ASSERT(size > 0);
>-        TIntermTyped *node = original[ii]->getAsTyped();
>-        ASSERT(node);
>-        createTempVariable(node);
>-        if (node->isScalar())
>-        {
>-            sequence->push_back(createTempSymbol(node->getType()));
>-            size--;
>-        }
>-        else if (node->isVector())
>-        {
>-            if (scalarizeVector)
>-            {
>-                int repeat = std::min(size, node->getNominalSize());
>-                size -= repeat;
>-                for (int index = 0; index < repeat; ++index)
>-                {
>-                    TIntermSymbol *symbolNode = createTempSymbol(node->getType());
>-                    TIntermBinary *newNode    = ConstructVectorIndexBinaryNode(symbolNode, index);
>-                    sequence->push_back(newNode);
>-                }
>-            }
>-            else
>-            {
>-                TIntermSymbol *symbolNode = createTempSymbol(node->getType());
>-                sequence->push_back(symbolNode);
>-                size -= node->getNominalSize();
>-            }
>-        }
>-        else
>-        {
>-            ASSERT(node->isMatrix());
>-            if (scalarizeMatrix)
>-            {
>-                int colIndex = 0, rowIndex = 0;
>-                int repeat = std::min(size, node->getCols() * node->getRows());
>-                size -= repeat;
>-                while (repeat > 0)
>-                {
>-                    TIntermSymbol *symbolNode = createTempSymbol(node->getType());
>-                    TIntermBinary *newNode =
>-                        ConstructMatrixIndexBinaryNode(symbolNode, colIndex, rowIndex);
>-                    sequence->push_back(newNode);
>-                    rowIndex++;
>-                    if (rowIndex >= node->getRows())
>-                    {
>-                        rowIndex = 0;
>-                        colIndex++;
>-                    }
>-                    repeat--;
>-                }
>-            }
>-            else
>-            {
>-                TIntermSymbol *symbolNode = createTempSymbol(node->getType());
>-                sequence->push_back(symbolNode);
>-                size -= node->getCols() * node->getRows();
>-            }
>-        }
>-    }
>-}
>-
>-void ScalarizeArgsTraverser::createTempVariable(TIntermTyped *original)
>-{
>-    ASSERT(original);
>-    nextTemporaryId();
>-    TIntermDeclaration *decl = createTempInitDeclaration(original);
>-
>-    TType type = original->getType();
>-    if (mShaderType == GL_FRAGMENT_SHADER && type.getBasicType() == EbtFloat &&
>-        type.getPrecision() == EbpUndefined)
>-    {
>-        // We use the highest available precision for the temporary variable
>-        // to avoid computing the actual precision using the rules defined
>-        // in GLSL ES 1.0 Section 4.5.2.
>-        TIntermBinary *init = decl->getSequence()->at(0)->getAsBinaryNode();
>-        init->getTypePointer()->setPrecision(mFragmentPrecisionHigh ? EbpHigh : EbpMedium);
>-        init->getLeft()->getTypePointer()->setPrecision(mFragmentPrecisionHigh ? EbpHigh
>-                                                                               : EbpMedium);
>-    }
>-
>-    ASSERT(mBlockStack.size() > 0);
>-    TIntermSequence &sequence = mBlockStack.back();
>-    sequence.push_back(decl);
>-}
>-
>-}  // namespace anonymous
>-
>-void ScalarizeVecAndMatConstructorArgs(TIntermBlock *root,
>-                                       sh::GLenum shaderType,
>-                                       bool fragmentPrecisionHigh,
>-                                       TSymbolTable *symbolTable)
>-{
>-    ScalarizeArgsTraverser scalarizer(shaderType, fragmentPrecisionHigh, symbolTable);
>-    root->traverse(&scalarizer);
>-}
>-
>-}  // namespace sh
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/ScalarizeVecAndMatConstructorArgs.h b/Source/ThirdParty/ANGLE/src/compiler/translator/ScalarizeVecAndMatConstructorArgs.h
>deleted file mode 100644
>index b8f782d1eca..00000000000
>--- a/Source/ThirdParty/ANGLE/src/compiler/translator/ScalarizeVecAndMatConstructorArgs.h
>+++ /dev/null
>@@ -1,27 +0,0 @@
>-//
>-// Copyright (c) 2002-2014 The ANGLE Project Authors. All rights reserved.
>-// Use of this source code is governed by a BSD-style license that can be
>-// found in the LICENSE file.
>-//
>-// Scalarize vector and matrix constructor args, so that vectors built from components don't have
>-// matrix arguments, and matrices built from components don't have vector arguments. This avoids
>-// driver bugs around vector and matrix constructors.
>-//
>-
>-#ifndef COMPILER_TRANSLATOR_SCALARIZEVECANDMATCONSTRUCTORARGS_H_
>-#define COMPILER_TRANSLATOR_SCALARIZEVECANDMATCONSTRUCTORARGS_H_
>-
>-#include "GLSLANG/ShaderLang.h"
>-
>-namespace sh
>-{
>-class TIntermBlock;
>-class TSymbolTable;
>-
>-void ScalarizeVecAndMatConstructorArgs(TIntermBlock *root,
>-                                       sh::GLenum shaderType,
>-                                       bool fragmentPrecisionHigh,
>-                                       TSymbolTable *symbolTable);
>-}  // namespace sh
>-
>-#endif  // COMPILER_TRANSLATOR_SCALARIZEVECANDMATCONSTRUCTORARGS_H_
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/SearchSymbol.cpp b/Source/ThirdParty/ANGLE/src/compiler/translator/SearchSymbol.cpp
>deleted file mode 100644
>index 34c644d0284..00000000000
>--- a/Source/ThirdParty/ANGLE/src/compiler/translator/SearchSymbol.cpp
>+++ /dev/null
>@@ -1,38 +0,0 @@
>-//
>-// Copyright (c) 2002-2010 The ANGLE Project Authors. All rights reserved.
>-// Use of this source code is governed by a BSD-style license that can be
>-// found in the LICENSE file.
>-//
>-// SearchSymbol is an AST traverser to detect the use of a given symbol name
>-//
>-
>-#include "compiler/translator/SearchSymbol.h"
>-
>-#include "compiler/translator/InfoSink.h"
>-
>-namespace sh
>-{
>-SearchSymbol::SearchSymbol(const TString &symbol)
>-    : TIntermTraverser(true, false, false), mSymbol(symbol)
>-{
>-    match = false;
>-}
>-
>-void SearchSymbol::traverse(TIntermNode *node)
>-{
>-    node->traverse(this);
>-}
>-
>-void SearchSymbol::visitSymbol(TIntermSymbol *symbolNode)
>-{
>-    if (symbolNode->getSymbol() == mSymbol)
>-    {
>-        match = true;
>-    }
>-}
>-
>-bool SearchSymbol::foundMatch() const
>-{
>-    return match;
>-}
>-}
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/SearchSymbol.h b/Source/ThirdParty/ANGLE/src/compiler/translator/SearchSymbol.h
>deleted file mode 100644
>index b8379e041ff..00000000000
>--- a/Source/ThirdParty/ANGLE/src/compiler/translator/SearchSymbol.h
>+++ /dev/null
>@@ -1,33 +0,0 @@
>-//
>-// Copyright (c) 2002-2010 The ANGLE Project Authors. All rights reserved.
>-// Use of this source code is governed by a BSD-style license that can be
>-// found in the LICENSE file.
>-//
>-// SearchSymbol is an AST traverser to detect the use of a given symbol name
>-//
>-
>-#ifndef COMPILER_TRANSLATOR_SEARCHSYMBOL_H_
>-#define COMPILER_TRANSLATOR_SEARCHSYMBOL_H_
>-
>-#include "compiler/translator/IntermTraverse.h"
>-#include "compiler/translator/ParseContext.h"
>-
>-namespace sh
>-{
>-class SearchSymbol : public TIntermTraverser
>-{
>-  public:
>-    SearchSymbol(const TString &symbol);
>-
>-    void traverse(TIntermNode *node);
>-    void visitSymbol(TIntermSymbol *symbolNode) override;
>-
>-    bool foundMatch() const;
>-
>-  protected:
>-    const TString &mSymbol;
>-    bool match;
>-};
>-}
>-
>-#endif  // COMPILER_TRANSLATOR_SEARCHSYMBOL_H_
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/SeparateArrayInitialization.cpp b/Source/ThirdParty/ANGLE/src/compiler/translator/SeparateArrayInitialization.cpp
>deleted file mode 100644
>index fe25823e38a..00000000000
>--- a/Source/ThirdParty/ANGLE/src/compiler/translator/SeparateArrayInitialization.cpp
>+++ /dev/null
>@@ -1,92 +0,0 @@
>-//
>-// Copyright (c) 2002-2015 The ANGLE Project Authors. All rights reserved.
>-// Use of this source code is governed by a BSD-style license that can be
>-// found in the LICENSE file.
>-//
>-// The SeparateArrayInitialization function splits each array initialization into a declaration and
>-// an assignment.
>-// Example:
>-//     type[n] a = initializer;
>-// will effectively become
>-//     type[n] a;
>-//     a = initializer;
>-//
>-// Note that if the array is declared as const, the initialization may still be split, making the
>-// AST technically invalid. Because of that this transformation should only be used when subsequent
>-// stages don't care about const qualifiers. However, the initialization will not be split if the
>-// initializer can be written as a HLSL literal.
>-
>-#include "compiler/translator/SeparateArrayInitialization.h"
>-
>-#include "compiler/translator/IntermNode.h"
>-#include "compiler/translator/OutputHLSL.h"
>-
>-namespace sh
>-{
>-
>-namespace
>-{
>-
>-class SeparateArrayInitTraverser : private TIntermTraverser
>-{
>-  public:
>-    static void apply(TIntermNode *root);
>-
>-  private:
>-    SeparateArrayInitTraverser();
>-    bool visitDeclaration(Visit, TIntermDeclaration *node) override;
>-};
>-
>-void SeparateArrayInitTraverser::apply(TIntermNode *root)
>-{
>-    SeparateArrayInitTraverser separateInit;
>-    root->traverse(&separateInit);
>-    separateInit.updateTree();
>-}
>-
>-SeparateArrayInitTraverser::SeparateArrayInitTraverser() : TIntermTraverser(true, false, false)
>-{
>-}
>-
>-bool SeparateArrayInitTraverser::visitDeclaration(Visit, TIntermDeclaration *node)
>-{
>-    TIntermSequence *sequence = node->getSequence();
>-    TIntermBinary *initNode   = sequence->back()->getAsBinaryNode();
>-    if (initNode != nullptr && initNode->getOp() == EOpInitialize)
>-    {
>-        TIntermTyped *initializer = initNode->getRight();
>-        if (initializer->isArray() && !sh::OutputHLSL::canWriteAsHLSLLiteral(initializer))
>-        {
>-            // We rely on that array declarations have been isolated to single declarations.
>-            ASSERT(sequence->size() == 1);
>-            TIntermTyped *symbol      = initNode->getLeft();
>-            TIntermBlock *parentBlock = getParentNode()->getAsBlock();
>-            ASSERT(parentBlock != nullptr);
>-
>-            TIntermSequence replacements;
>-
>-            TIntermDeclaration *replacementDeclaration = new TIntermDeclaration();
>-            replacementDeclaration->appendDeclarator(symbol);
>-            replacementDeclaration->setLine(symbol->getLine());
>-            replacements.push_back(replacementDeclaration);
>-
>-            TIntermBinary *replacementAssignment =
>-                new TIntermBinary(EOpAssign, symbol, initializer);
>-            replacementAssignment->setLine(symbol->getLine());
>-            replacements.push_back(replacementAssignment);
>-
>-            mMultiReplacements.push_back(
>-                NodeReplaceWithMultipleEntry(parentBlock, node, replacements));
>-        }
>-    }
>-    return false;
>-}
>-
>-}  // namespace
>-
>-void SeparateArrayInitialization(TIntermNode *root)
>-{
>-    SeparateArrayInitTraverser::apply(root);
>-}
>-
>-}  // namespace sh
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/SeparateArrayInitialization.h b/Source/ThirdParty/ANGLE/src/compiler/translator/SeparateArrayInitialization.h
>deleted file mode 100644
>index 3a9bb55dd12..00000000000
>--- a/Source/ThirdParty/ANGLE/src/compiler/translator/SeparateArrayInitialization.h
>+++ /dev/null
>@@ -1,29 +0,0 @@
>-//
>-// Copyright (c) 2002-2015 The ANGLE Project Authors. All rights reserved.
>-// Use of this source code is governed by a BSD-style license that can be
>-// found in the LICENSE file.
>-//
>-// The SeparateArrayInitialization function splits each array initialization into a declaration and
>-// an assignment.
>-// Example:
>-//     type[n] a = initializer;
>-// will effectively become
>-//     type[n] a;
>-//     a = initializer;
>-//
>-// Note that if the array is declared as const, the initialization may still be split, making the
>-// AST technically invalid. Because of that this transformation should only be used when subsequent
>-// stages don't care about const qualifiers. However, the initialization will not be split if the
>-// initializer can be written as a HLSL literal.
>-
>-#ifndef COMPILER_TRANSLATOR_SEPARATEARRAYINITIALIZATION_H_
>-#define COMPILER_TRANSLATOR_SEPARATEARRAYINITIALIZATION_H_
>-
>-namespace sh
>-{
>-class TIntermNode;
>-
>-void SeparateArrayInitialization(TIntermNode *root);
>-}  // namespace sh
>-
>-#endif  // COMPILER_TRANSLATOR_SEPARATEARRAYINITIALIZATION_H_
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/SeparateDeclarations.cpp b/Source/ThirdParty/ANGLE/src/compiler/translator/SeparateDeclarations.cpp
>deleted file mode 100644
>index 9a066075c04..00000000000
>--- a/Source/ThirdParty/ANGLE/src/compiler/translator/SeparateDeclarations.cpp
>+++ /dev/null
>@@ -1,79 +0,0 @@
>-//
>-// Copyright (c) 2002-2015 The ANGLE Project Authors. All rights reserved.
>-// Use of this source code is governed by a BSD-style license that can be
>-// found in the LICENSE file.
>-//
>-// The SeparateDeclarations function processes declarations, so that in the end each declaration
>-// contains only one declarator.
>-// This is useful as an intermediate step when initialization needs to be separated from
>-// declaration, or when things need to be unfolded out of the initializer.
>-// Example:
>-//     int a[1] = int[1](1), b[1] = int[1](2);
>-// gets transformed when run through this class into the AST equivalent of:
>-//     int a[1] = int[1](1);
>-//     int b[1] = int[1](2);
>-
>-#include "compiler/translator/SeparateDeclarations.h"
>-
>-#include "compiler/translator/IntermTraverse.h"
>-
>-namespace sh
>-{
>-
>-namespace
>-{
>-
>-class SeparateDeclarationsTraverser : private TIntermTraverser
>-{
>-  public:
>-    static void apply(TIntermNode *root);
>-
>-  private:
>-    SeparateDeclarationsTraverser();
>-    bool visitDeclaration(Visit, TIntermDeclaration *node) override;
>-};
>-
>-void SeparateDeclarationsTraverser::apply(TIntermNode *root)
>-{
>-    SeparateDeclarationsTraverser separateDecl;
>-    root->traverse(&separateDecl);
>-    separateDecl.updateTree();
>-}
>-
>-SeparateDeclarationsTraverser::SeparateDeclarationsTraverser()
>-    : TIntermTraverser(true, false, false)
>-{
>-}
>-
>-bool SeparateDeclarationsTraverser::visitDeclaration(Visit, TIntermDeclaration *node)
>-{
>-    TIntermSequence *sequence = node->getSequence();
>-    if (sequence->size() > 1)
>-    {
>-        TIntermBlock *parentBlock = getParentNode()->getAsBlock();
>-        ASSERT(parentBlock != nullptr);
>-
>-        TIntermSequence replacementDeclarations;
>-        for (size_t ii = 0; ii < sequence->size(); ++ii)
>-        {
>-            TIntermDeclaration *replacementDeclaration = new TIntermDeclaration();
>-
>-            replacementDeclaration->appendDeclarator(sequence->at(ii)->getAsTyped());
>-            replacementDeclaration->setLine(sequence->at(ii)->getLine());
>-            replacementDeclarations.push_back(replacementDeclaration);
>-        }
>-
>-        mMultiReplacements.push_back(
>-            NodeReplaceWithMultipleEntry(parentBlock, node, replacementDeclarations));
>-    }
>-    return false;
>-}
>-
>-}  // namespace
>-
>-void SeparateDeclarations(TIntermNode *root)
>-{
>-    SeparateDeclarationsTraverser::apply(root);
>-}
>-
>-}  // namespace sh
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/SeparateDeclarations.h b/Source/ThirdParty/ANGLE/src/compiler/translator/SeparateDeclarations.h
>deleted file mode 100644
>index 8142faea1cc..00000000000
>--- a/Source/ThirdParty/ANGLE/src/compiler/translator/SeparateDeclarations.h
>+++ /dev/null
>@@ -1,26 +0,0 @@
>-//
>-// Copyright (c) 2002-2015 The ANGLE Project Authors. All rights reserved.
>-// Use of this source code is governed by a BSD-style license that can be
>-// found in the LICENSE file.
>-//
>-// The SeparateDeclarations function processes declarations, so that in the end each declaration
>-// contains only one declarator.
>-// This is useful as an intermediate step when initialization needs to be separated from
>-// declaration, or when things need to be unfolded out of the initializer.
>-// Example:
>-//     int a[1] = int[1](1), b[1] = int[1](2);
>-// gets transformed when run through this class into the AST equivalent of:
>-//     int a[1] = int[1](1);
>-//     int b[1] = int[1](2);
>-
>-#ifndef COMPILER_TRANSLATOR_SEPARATEDECLARATIONS_H_
>-#define COMPILER_TRANSLATOR_SEPARATEDECLARATIONS_H_
>-
>-namespace sh
>-{
>-class TIntermNode;
>-
>-void SeparateDeclarations(TIntermNode *root);
>-}  // namespace sh
>-
>-#endif  // COMPILER_TRANSLATOR_SEPARATEDECLARATIONS_H_
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/SeparateExpressionsReturningArrays.cpp b/Source/ThirdParty/ANGLE/src/compiler/translator/SeparateExpressionsReturningArrays.cpp
>deleted file mode 100644
>index 01d627937cd..00000000000
>--- a/Source/ThirdParty/ANGLE/src/compiler/translator/SeparateExpressionsReturningArrays.cpp
>+++ /dev/null
>@@ -1,126 +0,0 @@
>-//
>-// Copyright (c) 2002-2015 The ANGLE Project Authors. All rights reserved.
>-// Use of this source code is governed by a BSD-style license that can be
>-// found in the LICENSE file.
>-//
>-// SeparateExpressionsReturningArrays splits array-returning expressions that are not array names
>-// from more complex expressions, assigning them to a temporary variable a#.
>-// Examples where a, b and c are all arrays:
>-// (a = b) == (a = c) is split into a = b; type[n] a1 = a; a = c; type[n] a2 = a; a1 == a2;
>-// type d = type[n](...)[i]; is split into type[n] a1 = type[n](...); type d = a1[i];
>-
>-#include "compiler/translator/SeparateExpressionsReturningArrays.h"
>-
>-#include "compiler/translator/IntermNodePatternMatcher.h"
>-#include "compiler/translator/IntermTraverse.h"
>-
>-namespace sh
>-{
>-
>-namespace
>-{
>-
>-// Traverser that separates one array expression into a statement at a time.
>-class SeparateExpressionsTraverser : public TIntermTraverser
>-{
>-  public:
>-    SeparateExpressionsTraverser(TSymbolTable *symbolTable);
>-
>-    bool visitBinary(Visit visit, TIntermBinary *node) override;
>-    bool visitAggregate(Visit visit, TIntermAggregate *node) override;
>-
>-    void nextIteration();
>-    bool foundArrayExpression() const { return mFoundArrayExpression; }
>-
>-  protected:
>-    // Marked to true once an operation that needs to be hoisted out of the expression has been
>-    // found. After that, no more AST updates are performed on that traversal.
>-    bool mFoundArrayExpression;
>-
>-    IntermNodePatternMatcher mPatternToSeparateMatcher;
>-};
>-
>-SeparateExpressionsTraverser::SeparateExpressionsTraverser(TSymbolTable *symbolTable)
>-    : TIntermTraverser(true, false, false, symbolTable),
>-      mFoundArrayExpression(false),
>-      mPatternToSeparateMatcher(IntermNodePatternMatcher::kExpressionReturningArray)
>-{
>-}
>-
>-// Performs a shallow copy of an assignment node.
>-// These shallow copies are useful when a node gets inserted into an aggregate node
>-// and also needs to be replaced in its original location by a different node.
>-TIntermBinary *CopyAssignmentNode(TIntermBinary *node)
>-{
>-    return new TIntermBinary(node->getOp(), node->getLeft(), node->getRight());
>-}
>-
>-bool SeparateExpressionsTraverser::visitBinary(Visit visit, TIntermBinary *node)
>-{
>-    if (mFoundArrayExpression)
>-        return false;
>-
>-    // Return if the expression is not an array or if we're not inside a complex expression.
>-    if (!mPatternToSeparateMatcher.match(node, getParentNode()))
>-        return true;
>-
>-    ASSERT(node->getOp() == EOpAssign);
>-
>-    mFoundArrayExpression = true;
>-
>-    TIntermSequence insertions;
>-    insertions.push_back(CopyAssignmentNode(node));
>-    // TODO(oetuaho): In some cases it would be more optimal to not add the temporary node, but just
>-    // use the original target of the assignment. Care must be taken so that this doesn't happen
>-    // when the same array symbol is a target of assignment more than once in one expression.
>-    insertions.push_back(createTempInitDeclaration(node->getLeft()));
>-    insertStatementsInParentBlock(insertions);
>-
>-    queueReplacement(createTempSymbol(node->getType()), OriginalNode::IS_DROPPED);
>-
>-    return false;
>-}
>-
>-bool SeparateExpressionsTraverser::visitAggregate(Visit visit, TIntermAggregate *node)
>-{
>-    if (mFoundArrayExpression)
>-        return false;  // No need to traverse further
>-
>-    if (!mPatternToSeparateMatcher.match(node, getParentNode()))
>-        return true;
>-
>-    ASSERT(node->isConstructor() || node->getOp() == EOpCallFunctionInAST);
>-
>-    mFoundArrayExpression = true;
>-
>-    TIntermSequence insertions;
>-    insertions.push_back(createTempInitDeclaration(node->shallowCopy()));
>-    insertStatementsInParentBlock(insertions);
>-
>-    queueReplacement(createTempSymbol(node->getType()), OriginalNode::IS_DROPPED);
>-
>-    return false;
>-}
>-
>-void SeparateExpressionsTraverser::nextIteration()
>-{
>-    mFoundArrayExpression = false;
>-    nextTemporaryId();
>-}
>-
>-}  // namespace
>-
>-void SeparateExpressionsReturningArrays(TIntermNode *root, TSymbolTable *symbolTable)
>-{
>-    SeparateExpressionsTraverser traverser(symbolTable);
>-    // Separate one expression at a time, and reset the traverser between iterations.
>-    do
>-    {
>-        traverser.nextIteration();
>-        root->traverse(&traverser);
>-        if (traverser.foundArrayExpression())
>-            traverser.updateTree();
>-    } while (traverser.foundArrayExpression());
>-}
>-
>-}  // namespace sh
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/SeparateExpressionsReturningArrays.h b/Source/ThirdParty/ANGLE/src/compiler/translator/SeparateExpressionsReturningArrays.h
>deleted file mode 100644
>index f8eb4387488..00000000000
>--- a/Source/ThirdParty/ANGLE/src/compiler/translator/SeparateExpressionsReturningArrays.h
>+++ /dev/null
>@@ -1,23 +0,0 @@
>-//
>-// Copyright (c) 2002-2015 The ANGLE Project Authors. All rights reserved.
>-// Use of this source code is governed by a BSD-style license that can be
>-// found in the LICENSE file.
>-//
>-// SeparateExpressionsReturningArrays splits array-returning expressions that are not array names
>-// from more complex expressions, assigning them to a temporary variable a#.
>-// Examples where a, b and c are all arrays:
>-// (a = b) == (a = c) is split into a = b; type[n] a1 = a; a = c; type[n] a2 = a; a1 == a2;
>-// type d = type[n](...)[i]; is split into type[n] a1 = type[n](...); type d = a1[i];
>-
>-#ifndef COMPILER_TRANSLATOR_SEPARATEEXPRESSIONSRETURNINGARRAYS_H_
>-#define COMPILER_TRANSLATOR_SEPARATEEXPRESSIONSRETURNINGARRAYS_H_
>-
>-namespace sh
>-{
>-class TIntermNode;
>-class TSymbolTable;
>-
>-void SeparateExpressionsReturningArrays(TIntermNode *root, TSymbolTable *symbolTable);
>-}  // namespace sh
>-
>-#endif  // COMPILER_TRANSLATOR_SEPARATEEXPRESSIONSRETURNINGARRAYS_H_
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/ShaderLang.cpp b/Source/ThirdParty/ANGLE/src/compiler/translator/ShaderLang.cpp
>index eeb13f2ec01..a79c506ec3c 100644
>--- a/Source/ThirdParty/ANGLE/src/compiler/translator/ShaderLang.cpp
>+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/ShaderLang.cpp
>@@ -15,10 +15,10 @@
> #include "compiler/translator/InitializeDll.h"
> #include "compiler/translator/length_limits.h"
> #ifdef ANGLE_ENABLE_HLSL
>-#include "compiler/translator/TranslatorHLSL.h"
>+#    include "compiler/translator/TranslatorHLSL.h"
> #endif  // ANGLE_ENABLE_HLSL
>-#include "compiler/translator/VariablePacker.h"
> #include "angle_gl.h"
>+#include "compiler/translator/VariablePacker.h"
> 
> namespace sh
> {
>@@ -133,8 +133,6 @@ GLenum GetGeometryShaderPrimitiveTypeEnum(sh::TLayoutPrimitiveType primitiveType
>             return GL_TRIANGLE_STRIP;
> 
>         case EptUndefined:
>-            return GL_INVALID_VALUE;
>-
>         default:
>             UNREACHABLE();
>             return GL_INVALID_VALUE;
>@@ -188,22 +186,25 @@ void InitBuiltInResources(ShBuiltInResources *resources)
>     resources->MaxDrawBuffers               = 1;
> 
>     // Extensions.
>-    resources->OES_standard_derivatives        = 0;
>-    resources->OES_EGL_image_external          = 0;
>-    resources->OES_EGL_image_external_essl3    = 0;
>-    resources->NV_EGL_stream_consumer_external = 0;
>-    resources->ARB_texture_rectangle           = 0;
>-    resources->EXT_blend_func_extended         = 0;
>-    resources->EXT_draw_buffers                = 0;
>-    resources->EXT_frag_depth                  = 0;
>-    resources->EXT_shader_texture_lod          = 0;
>-    resources->WEBGL_debug_shader_precision    = 0;
>-    resources->EXT_shader_framebuffer_fetch    = 0;
>-    resources->NV_shader_framebuffer_fetch     = 0;
>-    resources->ARM_shader_framebuffer_fetch    = 0;
>-    resources->OVR_multiview                   = 0;
>-    resources->EXT_YUV_target                  = 0;
>-    resources->OES_geometry_shader             = 0;
>+    resources->OES_standard_derivatives                 = 0;
>+    resources->OES_EGL_image_external                   = 0;
>+    resources->OES_EGL_image_external_essl3             = 0;
>+    resources->NV_EGL_stream_consumer_external          = 0;
>+    resources->ARB_texture_rectangle                    = 0;
>+    resources->EXT_blend_func_extended                  = 0;
>+    resources->EXT_draw_buffers                         = 0;
>+    resources->EXT_frag_depth                           = 0;
>+    resources->EXT_shader_texture_lod                   = 0;
>+    resources->WEBGL_debug_shader_precision             = 0;
>+    resources->EXT_shader_framebuffer_fetch             = 0;
>+    resources->NV_shader_framebuffer_fetch              = 0;
>+    resources->ARM_shader_framebuffer_fetch             = 0;
>+    resources->OVR_multiview2                           = 0;
>+    resources->EXT_YUV_target                           = 0;
>+    resources->EXT_geometry_shader                      = 0;
>+    resources->OES_texture_storage_multisample_2d_array = 0;
>+    resources->ANGLE_texture_multisample                = 0;
>+    resources->ANGLE_multi_draw                         = 0;
> 
>     resources->NV_draw_buffers = 0;
> 
>@@ -271,7 +272,7 @@ void InitBuiltInResources(ShBuiltInResources *resources)
>     resources->MaxCombinedAtomicCounterBuffers = 1;
>     resources->MaxAtomicCounterBufferSize      = 32;
> 
>-    resources->MaxUniformBufferBindings = 32;
>+    resources->MaxUniformBufferBindings       = 32;
>     resources->MaxShaderStorageBufferBindings = 4;
> 
>     resources->MaxGeometryUniformComponents     = 1024;
>@@ -315,7 +316,7 @@ ShHandle ConstructCompiler(sh::GLenum type,
>         return 0;
>     }
> 
>-    return reinterpret_cast<void *>(base);
>+    return base;
> }
> 
> void Destruct(ShHandle handle)
>@@ -497,6 +498,28 @@ bool CheckVariablesWithinPackingLimits(int maxVectors, const std::vector<ShaderV
>     return CheckVariablesInPackingLimits(maxVectors, variables);
> }
> 
>+bool GetShaderStorageBlockRegister(const ShHandle handle,
>+                                   const std::string &shaderStorageBlockName,
>+                                   unsigned int *indexOut)
>+{
>+#ifdef ANGLE_ENABLE_HLSL
>+    ASSERT(indexOut);
>+
>+    TranslatorHLSL *translator = GetTranslatorHLSLFromHandle(handle);
>+    ASSERT(translator);
>+
>+    if (!translator->hasShaderStorageBlock(shaderStorageBlockName))
>+    {
>+        return false;
>+    }
>+
>+    *indexOut = translator->getShaderStorageBlockRegister(shaderStorageBlockName);
>+    return true;
>+#else
>+    return false;
>+#endif  // ANGLE_ENABLE_HLSL
>+}
>+
> bool GetUniformBlockRegister(const ShHandle handle,
>                              const std::string &uniformBlockName,
>                              unsigned int *indexOut)
>@@ -531,6 +554,75 @@ const std::map<std::string, unsigned int> *GetUniformRegisterMap(const ShHandle
> #endif  // ANGLE_ENABLE_HLSL
> }
> 
>+unsigned int GetReadonlyImage2DRegisterIndex(const ShHandle handle)
>+{
>+#ifdef ANGLE_ENABLE_HLSL
>+    TranslatorHLSL *translator = GetTranslatorHLSLFromHandle(handle);
>+    ASSERT(translator);
>+
>+    return translator->getReadonlyImage2DRegisterIndex();
>+#else
>+    return 0;
>+#endif  // ANGLE_ENABLE_HLSL
>+}
>+
>+unsigned int GetImage2DRegisterIndex(const ShHandle handle)
>+{
>+#ifdef ANGLE_ENABLE_HLSL
>+    TranslatorHLSL *translator = GetTranslatorHLSLFromHandle(handle);
>+    ASSERT(translator);
>+
>+    return translator->getImage2DRegisterIndex();
>+#else
>+    return 0;
>+#endif  // ANGLE_ENABLE_HLSL
>+}
>+
>+const std::set<std::string> *GetUsedImage2DFunctionNames(const ShHandle handle)
>+{
>+#ifdef ANGLE_ENABLE_HLSL
>+    TranslatorHLSL *translator = GetTranslatorHLSLFromHandle(handle);
>+    ASSERT(translator);
>+
>+    return translator->getUsedImage2DFunctionNames();
>+#else
>+    return nullptr;
>+#endif  // ANGLE_ENABLE_HLSL
>+}
>+
>+bool HasValidGeometryShaderInputPrimitiveType(const ShHandle handle)
>+{
>+    ASSERT(handle);
>+
>+    TShHandleBase *base = static_cast<TShHandleBase *>(handle);
>+    TCompiler *compiler = base->getAsCompiler();
>+    ASSERT(compiler);
>+
>+    return compiler->getGeometryShaderInputPrimitiveType() != EptUndefined;
>+}
>+
>+bool HasValidGeometryShaderOutputPrimitiveType(const ShHandle handle)
>+{
>+    ASSERT(handle);
>+
>+    TShHandleBase *base = static_cast<TShHandleBase *>(handle);
>+    TCompiler *compiler = base->getAsCompiler();
>+    ASSERT(compiler);
>+
>+    return compiler->getGeometryShaderOutputPrimitiveType() != EptUndefined;
>+}
>+
>+bool HasValidGeometryShaderMaxVertices(const ShHandle handle)
>+{
>+    ASSERT(handle);
>+
>+    TShHandleBase *base = static_cast<TShHandleBase *>(handle);
>+    TCompiler *compiler = base->getAsCompiler();
>+    ASSERT(compiler);
>+
>+    return compiler->getGeometryShaderMaxVertices() >= 0;
>+}
>+
> GLenum GetGeometryShaderInputPrimitiveType(const ShHandle handle)
> {
>     ASSERT(handle);
>@@ -572,7 +664,9 @@ int GetGeometryShaderMaxVertices(const ShHandle handle)
>     TCompiler *compiler = base->getAsCompiler();
>     ASSERT(compiler);
> 
>-    return compiler->getGeometryShaderMaxVertices();
>+    int maxVertices = compiler->getGeometryShaderMaxVertices();
>+    ASSERT(maxVertices >= 0);
>+    return maxVertices;
> }
> 
> }  // namespace sh
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/ShaderStorageBlockFunctionHLSL.cpp b/Source/ThirdParty/ANGLE/src/compiler/translator/ShaderStorageBlockFunctionHLSL.cpp
>new file mode 100644
>index 00000000000..01b246d1d75
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/ShaderStorageBlockFunctionHLSL.cpp
>@@ -0,0 +1,435 @@
>+//
>+// Copyright 2018 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// ShaderStorageBlockFunctionHLSL: Wrapper functions for RWByteAddressBuffer Load/Store functions.
>+//
>+
>+#include "compiler/translator/ShaderStorageBlockFunctionHLSL.h"
>+
>+#include "common/utilities.h"
>+#include "compiler/translator/UtilsHLSL.h"
>+#include "compiler/translator/blocklayout.h"
>+#include "compiler/translator/blocklayoutHLSL.h"
>+#include "compiler/translator/util.h"
>+
>+namespace sh
>+{
>+
>+// static
>+void ShaderStorageBlockFunctionHLSL::OutputSSBOLoadFunctionBody(
>+    TInfoSinkBase &out,
>+    const ShaderStorageBlockFunction &ssboFunction)
>+{
>+    const char *convertString;
>+    switch (ssboFunction.type.getBasicType())
>+    {
>+        case EbtFloat:
>+            convertString = "asfloat(";
>+            break;
>+        case EbtInt:
>+            convertString = "asint(";
>+            break;
>+        case EbtUInt:
>+            convertString = "asuint(";
>+            break;
>+        case EbtBool:
>+            convertString = "asint(";
>+            break;
>+        default:
>+            UNREACHABLE();
>+            return;
>+    }
>+
>+    size_t bytesPerComponent =
>+        gl::VariableComponentSize(gl::VariableComponentType(GLVariableType(ssboFunction.type)));
>+    out << "    " << ssboFunction.typeString << " result";
>+    if (ssboFunction.type.isScalar())
>+    {
>+        size_t offset = ssboFunction.swizzleOffsets[0] * bytesPerComponent;
>+        out << " = " << convertString << "buffer.Load(loc + " << offset << "));\n ";
>+    }
>+    else if (ssboFunction.type.isVector())
>+    {
>+        if (ssboFunction.rowMajor || !ssboFunction.isDefaultSwizzle)
>+        {
>+            size_t componentStride = bytesPerComponent;
>+            if (ssboFunction.rowMajor)
>+            {
>+                componentStride = ssboFunction.matrixStride;
>+            }
>+
>+            out << " = {";
>+            for (const int offset : ssboFunction.swizzleOffsets)
>+            {
>+                size_t offsetInBytes = offset * componentStride;
>+                out << convertString << "buffer.Load(loc + " << offsetInBytes << ")),";
>+            }
>+            out << "};\n";
>+        }
>+        else
>+        {
>+            out << " = " << convertString << "buffer.Load" << ssboFunction.type.getNominalSize()
>+                << "(loc));\n";
>+        }
>+    }
>+    else if (ssboFunction.type.isMatrix())
>+    {
>+        if (ssboFunction.rowMajor)
>+        {
>+            out << ";";
>+            out << "    float" << ssboFunction.type.getRows() << "x" << ssboFunction.type.getCols()
>+                << " tmp_ = {";
>+            for (int rowIndex = 0; rowIndex < ssboFunction.type.getRows(); rowIndex++)
>+            {
>+                out << "asfloat(buffer.Load" << ssboFunction.type.getCols() << "(loc + "
>+                    << rowIndex * ssboFunction.matrixStride << ")), ";
>+            }
>+            out << "};\n";
>+            out << "    result = transpose(tmp_);\n";
>+        }
>+        else
>+        {
>+            out << " = {";
>+            for (int columnIndex = 0; columnIndex < ssboFunction.type.getCols(); columnIndex++)
>+            {
>+                out << "asfloat(buffer.Load" << ssboFunction.type.getRows() << "(loc + "
>+                    << columnIndex * ssboFunction.matrixStride << ")), ";
>+            }
>+            out << "};\n";
>+        }
>+    }
>+    else
>+    {
>+        // TODO(jiajia.qin@intel.com): Process all possible return types. http://anglebug.com/1951
>+        out << ";\n";
>+    }
>+
>+    out << "    return result;\n";
>+    return;
>+}
>+
>+// static
>+void ShaderStorageBlockFunctionHLSL::OutputSSBOStoreFunctionBody(
>+    TInfoSinkBase &out,
>+    const ShaderStorageBlockFunction &ssboFunction)
>+{
>+    size_t bytesPerComponent =
>+        gl::VariableComponentSize(gl::VariableComponentType(GLVariableType(ssboFunction.type)));
>+    if (ssboFunction.type.isScalar())
>+    {
>+        size_t offset = ssboFunction.swizzleOffsets[0] * bytesPerComponent;
>+        if (ssboFunction.type.getBasicType() == EbtBool)
>+        {
>+            out << "    buffer.Store(loc + " << offset << ", uint(value));\n";
>+        }
>+        else
>+        {
>+            out << "    buffer.Store(loc + " << offset << ", asuint(value));\n";
>+        }
>+    }
>+    else if (ssboFunction.type.isVector())
>+    {
>+        out << "    uint" << ssboFunction.type.getNominalSize() << " _value;\n";
>+        if (ssboFunction.type.getBasicType() == EbtBool)
>+        {
>+            out << "    _value = uint" << ssboFunction.type.getNominalSize() << "(value);\n";
>+        }
>+        else
>+        {
>+            out << "    _value = asuint(value);\n";
>+        }
>+
>+        if (ssboFunction.rowMajor || !ssboFunction.isDefaultSwizzle)
>+        {
>+            size_t componentStride = bytesPerComponent;
>+            if (ssboFunction.rowMajor)
>+            {
>+                componentStride = ssboFunction.matrixStride;
>+            }
>+            const TVector<int> &swizzleOffsets = ssboFunction.swizzleOffsets;
>+            for (int index = 0; index < static_cast<int>(swizzleOffsets.size()); index++)
>+            {
>+                size_t offsetInBytes = swizzleOffsets[index] * componentStride;
>+                out << "buffer.Store(loc + " << offsetInBytes << ", _value[" << index << "]);\n";
>+            }
>+        }
>+        else
>+        {
>+            out << "    buffer.Store" << ssboFunction.type.getNominalSize() << "(loc, _value);\n";
>+        }
>+    }
>+    else if (ssboFunction.type.isMatrix())
>+    {
>+        if (ssboFunction.rowMajor)
>+        {
>+            out << "    float" << ssboFunction.type.getRows() << "x" << ssboFunction.type.getCols()
>+                << " tmp_ = transpose(value);\n";
>+            for (int rowIndex = 0; rowIndex < ssboFunction.type.getRows(); rowIndex++)
>+            {
>+                out << "    buffer.Store" << ssboFunction.type.getCols() << "(loc + "
>+                    << rowIndex * ssboFunction.matrixStride << ", asuint(tmp_[" << rowIndex
>+                    << "]));\n";
>+            }
>+        }
>+        else
>+        {
>+            for (int columnIndex = 0; columnIndex < ssboFunction.type.getCols(); columnIndex++)
>+            {
>+                out << "    buffer.Store" << ssboFunction.type.getRows() << "(loc + "
>+                    << columnIndex * ssboFunction.matrixStride << ", asuint(value[" << columnIndex
>+                    << "]));\n";
>+            }
>+        }
>+    }
>+    else
>+    {
>+        // TODO(jiajia.qin@intel.com): Process all possible return types. http://anglebug.com/1951
>+    }
>+}
>+
>+// static
>+void ShaderStorageBlockFunctionHLSL::OutputSSBOLengthFunctionBody(TInfoSinkBase &out,
>+                                                                  int unsizedArrayStride)
>+{
>+    out << "    uint dim = 0;\n";
>+    out << "    buffer.GetDimensions(dim);\n";
>+    out << "    return int((dim - loc)/uint(" << unsizedArrayStride << "));\n";
>+}
>+
>+// static
>+void ShaderStorageBlockFunctionHLSL::OutputSSBOAtomicMemoryFunctionBody(
>+    TInfoSinkBase &out,
>+    const ShaderStorageBlockFunction &ssboFunction)
>+{
>+    out << "    " << ssboFunction.typeString << " original_value;\n";
>+    switch (ssboFunction.method)
>+    {
>+        case SSBOMethod::ATOMIC_ADD:
>+            out << "    buffer.InterlockedAdd(loc, value, original_value);\n";
>+            break;
>+        case SSBOMethod::ATOMIC_MIN:
>+            out << "    buffer.InterlockedMin(loc, value, original_value);\n";
>+            break;
>+        case SSBOMethod::ATOMIC_MAX:
>+            out << "    buffer.InterlockedMax(loc, value, original_value);\n";
>+            break;
>+        case SSBOMethod::ATOMIC_AND:
>+            out << "    buffer.InterlockedAnd(loc, value, original_value);\n";
>+            break;
>+        case SSBOMethod::ATOMIC_OR:
>+            out << "    buffer.InterlockedOr(loc, value, original_value);\n";
>+            break;
>+        case SSBOMethod::ATOMIC_XOR:
>+            out << "    buffer.InterlockedXor(loc, value, original_value);\n";
>+            break;
>+        case SSBOMethod::ATOMIC_EXCHANGE:
>+            out << "    buffer.InterlockedExchange(loc, value, original_value);\n";
>+            break;
>+        case SSBOMethod::ATOMIC_COMPSWAP:
>+            out << "    buffer.InterlockedCompareExchange(loc, compare_value, value, "
>+                   "original_value);\n";
>+            break;
>+        default:
>+            UNREACHABLE();
>+    }
>+    out << "    return original_value;\n";
>+}
>+
>+bool ShaderStorageBlockFunctionHLSL::ShaderStorageBlockFunction::operator<(
>+    const ShaderStorageBlockFunction &rhs) const
>+{
>+    return functionName < rhs.functionName;
>+}
>+
>+TString ShaderStorageBlockFunctionHLSL::registerShaderStorageBlockFunction(
>+    const TType &type,
>+    SSBOMethod method,
>+    TLayoutBlockStorage storage,
>+    bool rowMajor,
>+    int matrixStride,
>+    int unsizedArrayStride,
>+    TIntermSwizzle *swizzleNode)
>+{
>+    ShaderStorageBlockFunction ssboFunction;
>+    ssboFunction.typeString = TypeString(type);
>+    ssboFunction.method     = method;
>+    switch (method)
>+    {
>+        case SSBOMethod::LOAD:
>+            ssboFunction.functionName = "_Load_";
>+            break;
>+        case SSBOMethod::STORE:
>+            ssboFunction.functionName = "_Store_";
>+            break;
>+        case SSBOMethod::LENGTH:
>+            ssboFunction.unsizedArrayStride = unsizedArrayStride;
>+            ssboFunction.functionName       = "_Length_" + str(unsizedArrayStride);
>+            mRegisteredShaderStorageBlockFunctions.insert(ssboFunction);
>+            return ssboFunction.functionName;
>+        case SSBOMethod::ATOMIC_ADD:
>+            ssboFunction.functionName = "_ssbo_atomicAdd_" + ssboFunction.typeString;
>+            mRegisteredShaderStorageBlockFunctions.insert(ssboFunction);
>+            return ssboFunction.functionName;
>+        case SSBOMethod::ATOMIC_MIN:
>+            ssboFunction.functionName = "_ssbo_atomicMin_" + ssboFunction.typeString;
>+            mRegisteredShaderStorageBlockFunctions.insert(ssboFunction);
>+            return ssboFunction.functionName;
>+        case SSBOMethod::ATOMIC_MAX:
>+            ssboFunction.functionName = "_ssbo_atomicMax_" + ssboFunction.typeString;
>+            mRegisteredShaderStorageBlockFunctions.insert(ssboFunction);
>+            return ssboFunction.functionName;
>+        case SSBOMethod::ATOMIC_AND:
>+            ssboFunction.functionName = "_ssbo_atomicAnd_" + ssboFunction.typeString;
>+            mRegisteredShaderStorageBlockFunctions.insert(ssboFunction);
>+            return ssboFunction.functionName;
>+        case SSBOMethod::ATOMIC_OR:
>+            ssboFunction.functionName = "_ssbo_atomicOr_" + ssboFunction.typeString;
>+            mRegisteredShaderStorageBlockFunctions.insert(ssboFunction);
>+            return ssboFunction.functionName;
>+        case SSBOMethod::ATOMIC_XOR:
>+            ssboFunction.functionName = "_ssbo_atomicXor_" + ssboFunction.typeString;
>+            mRegisteredShaderStorageBlockFunctions.insert(ssboFunction);
>+            return ssboFunction.functionName;
>+        case SSBOMethod::ATOMIC_EXCHANGE:
>+            ssboFunction.functionName = "_ssbo_atomicExchange_" + ssboFunction.typeString;
>+            mRegisteredShaderStorageBlockFunctions.insert(ssboFunction);
>+            return ssboFunction.functionName;
>+        case SSBOMethod::ATOMIC_COMPSWAP:
>+            ssboFunction.functionName = "_ssbo_atomicCompSwap_" + ssboFunction.typeString;
>+            mRegisteredShaderStorageBlockFunctions.insert(ssboFunction);
>+            return ssboFunction.functionName;
>+        default:
>+            UNREACHABLE();
>+    }
>+
>+    ssboFunction.functionName += ssboFunction.typeString;
>+    ssboFunction.type = type;
>+    if (swizzleNode != nullptr)
>+    {
>+        ssboFunction.swizzleOffsets   = swizzleNode->getSwizzleOffsets();
>+        ssboFunction.isDefaultSwizzle = false;
>+    }
>+    else
>+    {
>+        if (ssboFunction.type.getNominalSize() > 1)
>+        {
>+            for (int index = 0; index < ssboFunction.type.getNominalSize(); index++)
>+            {
>+                ssboFunction.swizzleOffsets.push_back(index);
>+            }
>+        }
>+        else
>+        {
>+            ssboFunction.swizzleOffsets.push_back(0);
>+        }
>+
>+        ssboFunction.isDefaultSwizzle = true;
>+    }
>+    ssboFunction.rowMajor     = rowMajor;
>+    ssboFunction.matrixStride = matrixStride;
>+    ssboFunction.functionName += "_" + TString(getBlockStorageString(storage));
>+
>+    if (rowMajor)
>+    {
>+        ssboFunction.functionName += "_rm_";
>+    }
>+    else
>+    {
>+        ssboFunction.functionName += "_cm_";
>+    }
>+
>+    for (const int offset : ssboFunction.swizzleOffsets)
>+    {
>+        switch (offset)
>+        {
>+            case 0:
>+                ssboFunction.functionName += "x";
>+                break;
>+            case 1:
>+                ssboFunction.functionName += "y";
>+                break;
>+            case 2:
>+                ssboFunction.functionName += "z";
>+                break;
>+            case 3:
>+                ssboFunction.functionName += "w";
>+                break;
>+            default:
>+                UNREACHABLE();
>+        }
>+    }
>+
>+    mRegisteredShaderStorageBlockFunctions.insert(ssboFunction);
>+    return ssboFunction.functionName;
>+}
>+
>+void ShaderStorageBlockFunctionHLSL::shaderStorageBlockFunctionHeader(TInfoSinkBase &out)
>+{
>+    for (const ShaderStorageBlockFunction &ssboFunction : mRegisteredShaderStorageBlockFunctions)
>+    {
>+        switch (ssboFunction.method)
>+        {
>+            case SSBOMethod::LOAD:
>+            {
>+                // Function header
>+                out << ssboFunction.typeString << " " << ssboFunction.functionName
>+                    << "(RWByteAddressBuffer buffer, uint loc)\n";
>+                out << "{\n";
>+                OutputSSBOLoadFunctionBody(out, ssboFunction);
>+                break;
>+            }
>+            case SSBOMethod::STORE:
>+            {
>+                // Function header
>+                out << "void " << ssboFunction.functionName
>+                    << "(RWByteAddressBuffer buffer, uint loc, " << ssboFunction.typeString
>+                    << " value)\n";
>+                out << "{\n";
>+                OutputSSBOStoreFunctionBody(out, ssboFunction);
>+                break;
>+            }
>+            case SSBOMethod::LENGTH:
>+            {
>+                out << "int " << ssboFunction.functionName
>+                    << "(RWByteAddressBuffer buffer, uint loc)\n";
>+                out << "{\n";
>+                OutputSSBOLengthFunctionBody(out, ssboFunction.unsizedArrayStride);
>+                break;
>+            }
>+            case SSBOMethod::ATOMIC_ADD:
>+            case SSBOMethod::ATOMIC_MIN:
>+            case SSBOMethod::ATOMIC_MAX:
>+            case SSBOMethod::ATOMIC_AND:
>+            case SSBOMethod::ATOMIC_OR:
>+            case SSBOMethod::ATOMIC_XOR:
>+            case SSBOMethod::ATOMIC_EXCHANGE:
>+            {
>+                out << ssboFunction.typeString << " " << ssboFunction.functionName
>+                    << "(RWByteAddressBuffer buffer, uint loc, " << ssboFunction.typeString
>+                    << " value)\n";
>+                out << "{\n";
>+
>+                OutputSSBOAtomicMemoryFunctionBody(out, ssboFunction);
>+                break;
>+            }
>+            case SSBOMethod::ATOMIC_COMPSWAP:
>+            {
>+                out << ssboFunction.typeString << " " << ssboFunction.functionName
>+                    << "(RWByteAddressBuffer buffer, uint loc, " << ssboFunction.typeString
>+                    << " compare_value, " << ssboFunction.typeString << " value)\n";
>+                out << "{\n";
>+                OutputSSBOAtomicMemoryFunctionBody(out, ssboFunction);
>+                break;
>+            }
>+            default:
>+                UNREACHABLE();
>+        }
>+
>+        out << "}\n"
>+               "\n";
>+    }
>+}
>+
>+}  // namespace sh
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/ShaderStorageBlockFunctionHLSL.h b/Source/ThirdParty/ANGLE/src/compiler/translator/ShaderStorageBlockFunctionHLSL.h
>new file mode 100644
>index 00000000000..0d3cd0291ba
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/ShaderStorageBlockFunctionHLSL.h
>@@ -0,0 +1,94 @@
>+//
>+// Copyright 2018 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// ShaderStorageBlockOutputHLSL: A traverser to translate a ssbo_access_chain to an offset of
>+// RWByteAddressBuffer.
>+//     //EOpIndexDirectInterfaceBlock
>+//     ssbo_variable :=
>+//       | the name of the SSBO
>+//       | the name of a variable in an SSBO backed interface block
>+
>+//     // EOpIndexInDirect
>+//     // EOpIndexDirect
>+//     ssbo_array_indexing := ssbo_access_chain[expr_no_ssbo]
>+
>+//     // EOpIndexDirectStruct
>+//     ssbo_structure_access := ssbo_access_chain.identifier
>+
>+//     ssbo_access_chain :=
>+//       | ssbo_variable
>+//       | ssbo_array_indexing
>+//       | ssbo_structure_access
>+//
>+
>+#ifndef COMPILER_TRANSLATOR_SHADERSTORAGEBLOCKFUNCTIONHLSL_H_
>+#define COMPILER_TRANSLATOR_SHADERSTORAGEBLOCKFUNCTIONHLSL_H_
>+
>+#include <set>
>+
>+#include "compiler/translator/InfoSink.h"
>+#include "compiler/translator/Types.h"
>+
>+namespace sh
>+{
>+
>+class TIntermSwizzle;
>+enum class SSBOMethod
>+{
>+    LOAD,
>+    STORE,
>+    LENGTH,
>+    ATOMIC_ADD,
>+    ATOMIC_MIN,
>+    ATOMIC_MAX,
>+    ATOMIC_AND,
>+    ATOMIC_OR,
>+    ATOMIC_XOR,
>+    ATOMIC_EXCHANGE,
>+    ATOMIC_COMPSWAP
>+};
>+
>+class ShaderStorageBlockFunctionHLSL final : angle::NonCopyable
>+{
>+  public:
>+    TString registerShaderStorageBlockFunction(const TType &type,
>+                                               SSBOMethod method,
>+                                               TLayoutBlockStorage storage,
>+                                               bool rowMajor,
>+                                               int matrixStride,
>+                                               int unsizedArrayStride,
>+                                               TIntermSwizzle *node);
>+
>+    void shaderStorageBlockFunctionHeader(TInfoSinkBase &out);
>+
>+  private:
>+    struct ShaderStorageBlockFunction
>+    {
>+        bool operator<(const ShaderStorageBlockFunction &rhs) const;
>+        TString functionName;
>+        TString typeString;
>+        SSBOMethod method;
>+        TType type;
>+        bool rowMajor;
>+        int matrixStride;
>+        int unsizedArrayStride;
>+        TVector<int> swizzleOffsets;
>+        bool isDefaultSwizzle;
>+    };
>+
>+    static void OutputSSBOLoadFunctionBody(TInfoSinkBase &out,
>+                                           const ShaderStorageBlockFunction &ssboFunction);
>+    static void OutputSSBOStoreFunctionBody(TInfoSinkBase &out,
>+                                            const ShaderStorageBlockFunction &ssboFunction);
>+    static void OutputSSBOLengthFunctionBody(TInfoSinkBase &out, int unsizedArrayStride);
>+    static void OutputSSBOAtomicMemoryFunctionBody(TInfoSinkBase &out,
>+                                                   const ShaderStorageBlockFunction &ssboFunction);
>+    using ShaderStorageBlockFunctionSet = std::set<ShaderStorageBlockFunction>;
>+    ShaderStorageBlockFunctionSet mRegisteredShaderStorageBlockFunctions;
>+};
>+
>+}  // namespace sh
>+
>+#endif  // COMPILER_TRANSLATOR_SHADERSTORAGEBLOCKFUNCTIONHLSL_H_
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/ShaderStorageBlockOutputHLSL.cpp b/Source/ThirdParty/ANGLE/src/compiler/translator/ShaderStorageBlockOutputHLSL.cpp
>new file mode 100644
>index 00000000000..bef88db386f
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/ShaderStorageBlockOutputHLSL.cpp
>@@ -0,0 +1,762 @@
>+//
>+// Copyright 2018 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// ShaderStorageBlockOutputHLSL: A traverser to translate a ssbo_access_chain to an offset of
>+// RWByteAddressBuffer.
>+//     //EOpIndexDirectInterfaceBlock
>+//     ssbo_variable :=
>+//       | the name of the SSBO
>+//       | the name of a variable in an SSBO backed interface block
>+
>+//     // EOpIndexInDirect
>+//     // EOpIndexDirect
>+//     ssbo_array_indexing := ssbo_access_chain[expr_no_ssbo]
>+
>+//     // EOpIndexDirectStruct
>+//     ssbo_structure_access := ssbo_access_chain.identifier
>+
>+//     ssbo_access_chain :=
>+//       | ssbo_variable
>+//       | ssbo_array_indexing
>+//       | ssbo_structure_access
>+//
>+
>+#include "compiler/translator/ShaderStorageBlockOutputHLSL.h"
>+
>+#include "compiler/translator/ResourcesHLSL.h"
>+#include "compiler/translator/blocklayoutHLSL.h"
>+#include "compiler/translator/util.h"
>+
>+namespace sh
>+{
>+
>+namespace
>+{
>+
>+void GetBlockLayoutInfo(TIntermTyped *node,
>+                        bool rowMajorAlreadyAssigned,
>+                        TLayoutBlockStorage *storage,
>+                        bool *rowMajor)
>+{
>+    TIntermSwizzle *swizzleNode = node->getAsSwizzleNode();
>+    if (swizzleNode)
>+    {
>+        return GetBlockLayoutInfo(swizzleNode->getOperand(), rowMajorAlreadyAssigned, storage,
>+                                  rowMajor);
>+    }
>+
>+    TIntermBinary *binaryNode = node->getAsBinaryNode();
>+    if (binaryNode)
>+    {
>+        switch (binaryNode->getOp())
>+        {
>+            case EOpIndexDirectInterfaceBlock:
>+            {
>+                // The column_major/row_major qualifier of a field member overrides the interface
>+                // block's row_major/column_major. So we can assign rowMajor here and don't need to
>+                // assign it again. But we still need to call recursively to get the storage's
>+                // value.
>+                const TType &type = node->getType();
>+                *rowMajor         = type.getLayoutQualifier().matrixPacking == EmpRowMajor;
>+                return GetBlockLayoutInfo(binaryNode->getLeft(), true, storage, rowMajor);
>+            }
>+            case EOpIndexIndirect:
>+            case EOpIndexDirect:
>+            case EOpIndexDirectStruct:
>+                return GetBlockLayoutInfo(binaryNode->getLeft(), rowMajorAlreadyAssigned, storage,
>+                                          rowMajor);
>+            default:
>+                UNREACHABLE();
>+                return;
>+        }
>+    }
>+
>+    const TType &type = node->getType();
>+    ASSERT(type.getQualifier() == EvqBuffer);
>+    const TInterfaceBlock *interfaceBlock = type.getInterfaceBlock();
>+    ASSERT(interfaceBlock);
>+    *storage = interfaceBlock->blockStorage();
>+    // If the block doesn't have an instance name, rowMajorAlreadyAssigned will be false. In
>+    // this situation, we still need to set rowMajor's value.
>+    if (!rowMajorAlreadyAssigned)
>+    {
>+        *rowMajor = type.getLayoutQualifier().matrixPacking == EmpRowMajor;
>+    }
>+}
>+
>+// It's possible that the current type has lost the original layout information. So we should pass
>+// the right layout information to GetBlockMemberInfoByType.
>+const BlockMemberInfo GetBlockMemberInfoByType(const TType &type,
>+                                               TLayoutBlockStorage storage,
>+                                               bool rowMajor)
>+{
>+    sh::Std140BlockEncoder std140Encoder;
>+    sh::Std430BlockEncoder std430Encoder;
>+    sh::HLSLBlockEncoder hlslEncoder(sh::HLSLBlockEncoder::ENCODE_PACKED, false);
>+    sh::BlockLayoutEncoder *encoder = nullptr;
>+
>+    if (storage == EbsStd140)
>+    {
>+        encoder = &std140Encoder;
>+    }
>+    else if (storage == EbsStd430)
>+    {
>+        encoder = &std430Encoder;
>+    }
>+    else
>+    {
>+        encoder = &hlslEncoder;
>+    }
>+
>+    std::vector<unsigned int> arraySizes;
>+    auto *typeArraySizes = type.getArraySizes();
>+    if (typeArraySizes != nullptr)
>+    {
>+        arraySizes.assign(typeArraySizes->begin(), typeArraySizes->end());
>+    }
>+    return encoder->encodeType(GLVariableType(type), arraySizes, rowMajor);
>+}
>+
>+const TField *GetFieldMemberInShaderStorageBlock(const TInterfaceBlock *interfaceBlock,
>+                                                 const ImmutableString &variableName)
>+{
>+    for (const TField *field : interfaceBlock->fields())
>+    {
>+        if (field->name() == variableName)
>+        {
>+            return field;
>+        }
>+    }
>+    return nullptr;
>+}
>+
>+const InterfaceBlock *FindInterfaceBlock(const TInterfaceBlock *needle,
>+                                         const std::vector<InterfaceBlock> &haystack)
>+{
>+    for (const InterfaceBlock &block : haystack)
>+    {
>+        if (strcmp(block.name.c_str(), needle->name().data()) == 0)
>+        {
>+            ASSERT(block.fields.size() == needle->fields().size());
>+            return &block;
>+        }
>+    }
>+
>+    UNREACHABLE();
>+    return nullptr;
>+}
>+
>+std::string StripArrayIndices(const std::string &nameIn)
>+{
>+    std::string name = nameIn;
>+    size_t pos       = name.find('[');
>+    while (pos != std::string::npos)
>+    {
>+        size_t closePos = name.find(']', pos);
>+        ASSERT(closePos != std::string::npos);
>+        name.erase(pos, closePos - pos + 1);
>+        pos = name.find('[', pos);
>+    }
>+    ASSERT(name.find(']') == std::string::npos);
>+    return name;
>+}
>+
>+// Does not include any array indices.
>+void MapVariableToField(const ShaderVariable &variable,
>+                        const TField *field,
>+                        std::string currentName,
>+                        ShaderVarToFieldMap *shaderVarToFieldMap)
>+{
>+    ASSERT((field->type()->getStruct() == nullptr) == variable.fields.empty());
>+    (*shaderVarToFieldMap)[currentName] = field;
>+
>+    if (!variable.fields.empty())
>+    {
>+        const TStructure *subStruct = field->type()->getStruct();
>+        ASSERT(variable.fields.size() == subStruct->fields().size());
>+
>+        for (size_t index = 0; index < variable.fields.size(); ++index)
>+        {
>+            const TField *subField            = subStruct->fields()[index];
>+            const ShaderVariable &subVariable = variable.fields[index];
>+            std::string subName               = currentName + "." + subVariable.name;
>+            MapVariableToField(subVariable, subField, subName, shaderVarToFieldMap);
>+        }
>+    }
>+}
>+
>+class BlockInfoVisitor final : public BlockEncoderVisitor
>+{
>+  public:
>+    BlockInfoVisitor(const std::string &prefix,
>+                     TLayoutBlockStorage storage,
>+                     const ShaderVarToFieldMap &shaderVarToFieldMap,
>+                     BlockMemberInfoMap *blockInfoOut)
>+        : BlockEncoderVisitor(prefix, "", getEncoder(storage)),
>+          mShaderVarToFieldMap(shaderVarToFieldMap),
>+          mBlockInfoOut(blockInfoOut),
>+          mHLSLEncoder(HLSLBlockEncoder::ENCODE_PACKED, false),
>+          mStorage(storage)
>+    {}
>+
>+    BlockLayoutEncoder *getEncoder(TLayoutBlockStorage storage)
>+    {
>+        switch (storage)
>+        {
>+            case EbsStd140:
>+                return &mStd140Encoder;
>+            case EbsStd430:
>+                return &mStd430Encoder;
>+            default:
>+                return &mHLSLEncoder;
>+        }
>+    }
>+
>+    void enterStructAccess(const ShaderVariable &structVar, bool isRowMajor) override
>+    {
>+        BlockEncoderVisitor::enterStructAccess(structVar, isRowMajor);
>+
>+        std::string variableName = StripArrayIndices(collapseNameStack());
>+
>+        // Remove the trailing "."
>+        variableName.pop_back();
>+
>+        BlockInfoVisitor childVisitor(variableName, mStorage, mShaderVarToFieldMap, mBlockInfoOut);
>+        childVisitor.getEncoder(mStorage)->enterAggregateType(structVar);
>+        TraverseShaderVariables(structVar.fields, isRowMajor, &childVisitor);
>+        childVisitor.getEncoder(mStorage)->exitAggregateType(structVar);
>+
>+        int offset      = getEncoder(mStorage)->getCurrentOffset();
>+        int arrayStride = childVisitor.getEncoder(mStorage)->getCurrentOffset();
>+
>+        auto iter = mShaderVarToFieldMap.find(variableName);
>+        if (iter == mShaderVarToFieldMap.end())
>+            return;
>+
>+        const TField *structField = iter->second;
>+        if (mBlockInfoOut->count(structField) == 0)
>+        {
>+            mBlockInfoOut->emplace(structField, BlockMemberInfo(offset, arrayStride, -1, false));
>+        }
>+    }
>+
>+    void encodeVariable(const ShaderVariable &variable,
>+                        const BlockMemberInfo &variableInfo,
>+                        const std::string &name,
>+                        const std::string &mappedName) override
>+    {
>+        auto iter = mShaderVarToFieldMap.find(StripArrayIndices(name));
>+        if (iter == mShaderVarToFieldMap.end())
>+            return;
>+
>+        const TField *field = iter->second;
>+        if (mBlockInfoOut->count(field) == 0)
>+        {
>+            mBlockInfoOut->emplace(field, variableInfo);
>+        }
>+    }
>+
>+  private:
>+    const ShaderVarToFieldMap &mShaderVarToFieldMap;
>+    BlockMemberInfoMap *mBlockInfoOut;
>+    Std140BlockEncoder mStd140Encoder;
>+    Std430BlockEncoder mStd430Encoder;
>+    HLSLBlockEncoder mHLSLEncoder;
>+    TLayoutBlockStorage mStorage;
>+};
>+
>+void GetShaderStorageBlockMembersInfo(const TInterfaceBlock *interfaceBlock,
>+                                      const std::vector<InterfaceBlock> &shaderStorageBlocks,
>+                                      BlockMemberInfoMap *blockInfoOut)
>+{
>+    // Find the sh::InterfaceBlock.
>+    const InterfaceBlock *block = FindInterfaceBlock(interfaceBlock, shaderStorageBlocks);
>+    ASSERT(block);
>+
>+    // Map ShaderVariable to TField.
>+    ShaderVarToFieldMap shaderVarToFieldMap;
>+    for (size_t index = 0; index < block->fields.size(); ++index)
>+    {
>+        const TField *field            = interfaceBlock->fields()[index];
>+        const ShaderVariable &variable = block->fields[index];
>+        MapVariableToField(variable, field, variable.name, &shaderVarToFieldMap);
>+    }
>+
>+    BlockInfoVisitor visitor("", interfaceBlock->blockStorage(), shaderVarToFieldMap, blockInfoOut);
>+    TraverseShaderVariables(block->fields, false, &visitor);
>+}
>+
>+bool IsInArrayOfArraysChain(TIntermTyped *node)
>+{
>+    if (node->getType().isArrayOfArrays())
>+        return true;
>+    TIntermBinary *binaryNode = node->getAsBinaryNode();
>+    if (binaryNode)
>+    {
>+        if (binaryNode->getLeft()->getType().isArrayOfArrays())
>+            return true;
>+    }
>+
>+    return false;
>+}
>+}  // anonymous namespace
>+
>+ShaderStorageBlockOutputHLSL::ShaderStorageBlockOutputHLSL(
>+    OutputHLSL *outputHLSL,
>+    TSymbolTable *symbolTable,
>+    ResourcesHLSL *resourcesHLSL,
>+    const std::vector<InterfaceBlock> &shaderStorageBlocks)
>+    : TIntermTraverser(true, true, true, symbolTable),
>+      mMatrixStride(0),
>+      mRowMajor(false),
>+      mLocationAsTheLastArgument(false),
>+      mOutputHLSL(outputHLSL),
>+      mResourcesHLSL(resourcesHLSL),
>+      mShaderStorageBlocks(shaderStorageBlocks)
>+{
>+    mSSBOFunctionHLSL = new ShaderStorageBlockFunctionHLSL;
>+}
>+
>+ShaderStorageBlockOutputHLSL::~ShaderStorageBlockOutputHLSL()
>+{
>+    SafeDelete(mSSBOFunctionHLSL);
>+}
>+
>+void ShaderStorageBlockOutputHLSL::outputStoreFunctionCallPrefix(TIntermTyped *node)
>+{
>+    mLocationAsTheLastArgument = false;
>+    traverseSSBOAccess(node, SSBOMethod::STORE);
>+}
>+
>+void ShaderStorageBlockOutputHLSL::outputLoadFunctionCall(TIntermTyped *node)
>+{
>+    mLocationAsTheLastArgument = true;
>+    traverseSSBOAccess(node, SSBOMethod::LOAD);
>+}
>+
>+void ShaderStorageBlockOutputHLSL::outputLengthFunctionCall(TIntermTyped *node)
>+{
>+    mLocationAsTheLastArgument = true;
>+    traverseSSBOAccess(node, SSBOMethod::LENGTH);
>+}
>+
>+void ShaderStorageBlockOutputHLSL::outputAtomicMemoryFunctionCallPrefix(TIntermTyped *node,
>+                                                                        TOperator op)
>+{
>+    mLocationAsTheLastArgument = false;
>+
>+    switch (op)
>+    {
>+        case EOpAtomicAdd:
>+            traverseSSBOAccess(node, SSBOMethod::ATOMIC_ADD);
>+            break;
>+        case EOpAtomicMin:
>+            traverseSSBOAccess(node, SSBOMethod::ATOMIC_MIN);
>+            break;
>+        case EOpAtomicMax:
>+            traverseSSBOAccess(node, SSBOMethod::ATOMIC_MAX);
>+            break;
>+        case EOpAtomicAnd:
>+            traverseSSBOAccess(node, SSBOMethod::ATOMIC_AND);
>+            break;
>+        case EOpAtomicOr:
>+            traverseSSBOAccess(node, SSBOMethod::ATOMIC_OR);
>+            break;
>+        case EOpAtomicXor:
>+            traverseSSBOAccess(node, SSBOMethod::ATOMIC_XOR);
>+            break;
>+        case EOpAtomicExchange:
>+            traverseSSBOAccess(node, SSBOMethod::ATOMIC_EXCHANGE);
>+            break;
>+        case EOpAtomicCompSwap:
>+            traverseSSBOAccess(node, SSBOMethod::ATOMIC_COMPSWAP);
>+            break;
>+        default:
>+            UNREACHABLE();
>+            break;
>+    }
>+}
>+
>+// Note that we must calculate the matrix stride here instead of ShaderStorageBlockFunctionHLSL.
>+// It's because that if the current node's type is a vector which comes from a matrix, we will
>+// lose the matrix type info once we enter ShaderStorageBlockFunctionHLSL.
>+void ShaderStorageBlockOutputHLSL::setMatrixStride(TIntermTyped *node,
>+                                                   TLayoutBlockStorage storage,
>+                                                   bool rowMajor)
>+{
>+    if (node->getType().isMatrix())
>+    {
>+        mMatrixStride = GetBlockMemberInfoByType(node->getType(), storage, rowMajor).matrixStride;
>+        mRowMajor     = rowMajor;
>+        return;
>+    }
>+
>+    if (node->getType().isVector())
>+    {
>+        TIntermBinary *binaryNode = node->getAsBinaryNode();
>+        if (binaryNode)
>+        {
>+            return setMatrixStride(binaryNode->getLeft(), storage, rowMajor);
>+        }
>+        else
>+        {
>+            TIntermSwizzle *swizzleNode = node->getAsSwizzleNode();
>+            if (swizzleNode)
>+            {
>+                return setMatrixStride(swizzleNode->getOperand(), storage, rowMajor);
>+            }
>+        }
>+    }
>+}
>+
>+void ShaderStorageBlockOutputHLSL::traverseSSBOAccess(TIntermTyped *node, SSBOMethod method)
>+{
>+    mMatrixStride = 0;
>+    mRowMajor     = false;
>+
>+    // Note that we don't have correct BlockMemberInfo from mBlockMemberInfoMap at the current
>+    // point. But we must use those information to generate the right function name. So here we have
>+    // to calculate them again.
>+    TLayoutBlockStorage storage;
>+    bool rowMajor;
>+    GetBlockLayoutInfo(node, false, &storage, &rowMajor);
>+    int unsizedArrayStride = 0;
>+    if (node->getType().isUnsizedArray())
>+    {
>+        unsizedArrayStride =
>+            GetBlockMemberInfoByType(node->getType(), storage, rowMajor).arrayStride;
>+    }
>+    setMatrixStride(node, storage, rowMajor);
>+
>+    const TString &functionName = mSSBOFunctionHLSL->registerShaderStorageBlockFunction(
>+        node->getType(), method, storage, mRowMajor, mMatrixStride, unsizedArrayStride,
>+        node->getAsSwizzleNode());
>+    TInfoSinkBase &out = mOutputHLSL->getInfoSink();
>+    out << functionName;
>+    out << "(";
>+    node->traverse(this);
>+}
>+
>+void ShaderStorageBlockOutputHLSL::writeShaderStorageBlocksHeader(TInfoSinkBase &out) const
>+{
>+    out << mResourcesHLSL->shaderStorageBlocksHeader(mReferencedShaderStorageBlocks);
>+    mSSBOFunctionHLSL->shaderStorageBlockFunctionHeader(out);
>+}
>+
>+// Check if the current node is the end of the SSBO access chain. If true, we should output ')' for
>+// Load method.
>+bool ShaderStorageBlockOutputHLSL::isEndOfSSBOAccessChain()
>+{
>+    TIntermNode *parent = getParentNode();
>+    if (parent)
>+    {
>+        TIntermBinary *parentBinary = parent->getAsBinaryNode();
>+        if (parentBinary != nullptr)
>+        {
>+            switch (parentBinary->getOp())
>+            {
>+                case EOpIndexDirectStruct:
>+                case EOpIndexDirect:
>+                case EOpIndexIndirect:
>+                {
>+                    return false;
>+                }
>+                default:
>+                    return true;
>+            }
>+        }
>+
>+        const TIntermSwizzle *parentSwizzle = parent->getAsSwizzleNode();
>+        if (parentSwizzle)
>+        {
>+            return false;
>+        }
>+    }
>+    return true;
>+}
>+
>+void ShaderStorageBlockOutputHLSL::visitSymbol(TIntermSymbol *node)
>+{
>+    TInfoSinkBase &out        = mOutputHLSL->getInfoSink();
>+    const TVariable &variable = node->variable();
>+    TQualifier qualifier      = variable.getType().getQualifier();
>+
>+    if (qualifier == EvqBuffer)
>+    {
>+        const TType &variableType             = variable.getType();
>+        const TInterfaceBlock *interfaceBlock = variableType.getInterfaceBlock();
>+        ASSERT(interfaceBlock);
>+        if (mReferencedShaderStorageBlocks.count(interfaceBlock->uniqueId().get()) == 0)
>+        {
>+            const TVariable *instanceVariable = nullptr;
>+            if (variableType.isInterfaceBlock())
>+            {
>+                instanceVariable = &variable;
>+            }
>+            mReferencedShaderStorageBlocks[interfaceBlock->uniqueId().get()] =
>+                new TReferencedBlock(interfaceBlock, instanceVariable);
>+            GetShaderStorageBlockMembersInfo(interfaceBlock, mShaderStorageBlocks,
>+                                             &mBlockMemberInfoMap);
>+        }
>+        if (variableType.isInterfaceBlock())
>+        {
>+            out << DecorateVariableIfNeeded(variable);
>+        }
>+        else
>+        {
>+            out << Decorate(interfaceBlock->name());
>+            out << ", ";
>+
>+            const TField *field =
>+                GetFieldMemberInShaderStorageBlock(interfaceBlock, variable.name());
>+            writeDotOperatorOutput(out, field);
>+        }
>+    }
>+    else
>+    {
>+        return mOutputHLSL->visitSymbol(node);
>+    }
>+}
>+
>+void ShaderStorageBlockOutputHLSL::visitConstantUnion(TIntermConstantUnion *node)
>+{
>+    mOutputHLSL->visitConstantUnion(node);
>+}
>+
>+bool ShaderStorageBlockOutputHLSL::visitAggregate(Visit visit, TIntermAggregate *node)
>+{
>+    return mOutputHLSL->visitAggregate(visit, node);
>+}
>+
>+bool ShaderStorageBlockOutputHLSL::visitTernary(Visit visit, TIntermTernary *node)
>+{
>+    return mOutputHLSL->visitTernary(visit, node);
>+}
>+
>+bool ShaderStorageBlockOutputHLSL::visitUnary(Visit visit, TIntermUnary *node)
>+{
>+    return mOutputHLSL->visitUnary(visit, node);
>+}
>+
>+bool ShaderStorageBlockOutputHLSL::visitSwizzle(Visit visit, TIntermSwizzle *node)
>+{
>+    if (visit == PostVisit)
>+    {
>+        if (!IsInShaderStorageBlock(node))
>+        {
>+            return mOutputHLSL->visitSwizzle(visit, node);
>+        }
>+
>+        TInfoSinkBase &out = mOutputHLSL->getInfoSink();
>+        // TODO(jiajia.qin@intel.com): add swizzle process if the swizzle node is not the last node
>+        // of ssbo access chain. Such as, data.xy[0]
>+        if (mLocationAsTheLastArgument && isEndOfSSBOAccessChain())
>+        {
>+            out << ")";
>+        }
>+    }
>+    return true;
>+}
>+
>+bool ShaderStorageBlockOutputHLSL::visitBinary(Visit visit, TIntermBinary *node)
>+{
>+    TInfoSinkBase &out = mOutputHLSL->getInfoSink();
>+
>+    switch (node->getOp())
>+    {
>+        case EOpIndexDirect:
>+        {
>+            if (!IsInShaderStorageBlock(node->getLeft()))
>+            {
>+                return mOutputHLSL->visitBinary(visit, node);
>+            }
>+
>+            const TType &leftType = node->getLeft()->getType();
>+            if (leftType.isInterfaceBlock())
>+            {
>+                if (visit == PreVisit)
>+                {
>+                    ASSERT(leftType.getQualifier() == EvqBuffer);
>+                    TIntermSymbol *instanceArraySymbol    = node->getLeft()->getAsSymbolNode();
>+                    const TInterfaceBlock *interfaceBlock = leftType.getInterfaceBlock();
>+
>+                    if (mReferencedShaderStorageBlocks.count(interfaceBlock->uniqueId().get()) == 0)
>+                    {
>+                        mReferencedShaderStorageBlocks[interfaceBlock->uniqueId().get()] =
>+                            new TReferencedBlock(interfaceBlock, &instanceArraySymbol->variable());
>+                        GetShaderStorageBlockMembersInfo(interfaceBlock, mShaderStorageBlocks,
>+                                                         &mBlockMemberInfoMap);
>+                    }
>+
>+                    const int arrayIndex = node->getRight()->getAsConstantUnion()->getIConst(0);
>+                    out << mResourcesHLSL->InterfaceBlockInstanceString(
>+                        instanceArraySymbol->getName(), arrayIndex);
>+                    return false;
>+                }
>+            }
>+            else
>+            {
>+                writeEOpIndexDirectOrIndirectOutput(out, visit, node);
>+            }
>+            break;
>+        }
>+        case EOpIndexIndirect:
>+        {
>+            if (!IsInShaderStorageBlock(node->getLeft()))
>+            {
>+                return mOutputHLSL->visitBinary(visit, node);
>+            }
>+
>+            // We do not currently support indirect references to interface blocks
>+            ASSERT(node->getLeft()->getBasicType() != EbtInterfaceBlock);
>+            writeEOpIndexDirectOrIndirectOutput(out, visit, node);
>+            break;
>+        }
>+        case EOpIndexDirectStruct:
>+        {
>+            if (!IsInShaderStorageBlock(node->getLeft()))
>+            {
>+                return mOutputHLSL->visitBinary(visit, node);
>+            }
>+
>+            if (visit == InVisit)
>+            {
>+                ASSERT(IsInShaderStorageBlock(node->getLeft()));
>+                const TStructure *structure       = node->getLeft()->getType().getStruct();
>+                const TIntermConstantUnion *index = node->getRight()->getAsConstantUnion();
>+                const TField *field               = structure->fields()[index->getIConst(0)];
>+                out << " + ";
>+                writeDotOperatorOutput(out, field);
>+                return false;
>+            }
>+            break;
>+        }
>+        case EOpIndexDirectInterfaceBlock:
>+            if (!IsInShaderStorageBlock(node->getLeft()))
>+            {
>+                return mOutputHLSL->visitBinary(visit, node);
>+            }
>+
>+            if (visit == InVisit)
>+            {
>+                ASSERT(IsInShaderStorageBlock(node->getLeft()));
>+                out << ", ";
>+                const TInterfaceBlock *interfaceBlock =
>+                    node->getLeft()->getType().getInterfaceBlock();
>+                const TIntermConstantUnion *index = node->getRight()->getAsConstantUnion();
>+                const TField *field               = interfaceBlock->fields()[index->getIConst(0)];
>+                writeDotOperatorOutput(out, field);
>+                return false;
>+            }
>+            break;
>+        default:
>+            // It may have other operators in EOpIndexIndirect. Such as buffer.attribs[(y * gridSize
>+            // + x) * 6u + 0u]
>+            return mOutputHLSL->visitBinary(visit, node);
>+    }
>+
>+    return true;
>+}
>+
>+void ShaderStorageBlockOutputHLSL::writeEOpIndexDirectOrIndirectOutput(TInfoSinkBase &out,
>+                                                                       Visit visit,
>+                                                                       TIntermBinary *node)
>+{
>+    ASSERT(IsInShaderStorageBlock(node->getLeft()));
>+    if (visit == InVisit)
>+    {
>+        const TType &type = node->getLeft()->getType();
>+        // For array of arrays, we calculate the offset using the formula below:
>+        // elementStride * (a3 * a2 * a1 * i0 + a3 * a2 * i1 + a3 * i2 + i3)
>+        // Note: assume that there are 4 dimensions.
>+        //       a0, a1, a2, a3 is the size of the array in each dimension. (S s[a0][a1][a2][a3])
>+        //       i0, i1, i2, i3 is the index of the array in each dimension. (s[i0][i1][i2][i3])
>+        if (IsInArrayOfArraysChain(node->getLeft()))
>+        {
>+            if (type.isArrayOfArrays())
>+            {
>+                const TVector<unsigned int> &arraySizes = *type.getArraySizes();
>+                // Don't need to concern the tail comma which will be used to multiply the index.
>+                for (unsigned int i = 0; i < (arraySizes.size() - 1); i++)
>+                {
>+                    out << arraySizes[i];
>+                    out << " * ";
>+                }
>+            }
>+        }
>+        else
>+        {
>+            if (node->getType().isVector() && type.isMatrix())
>+            {
>+                if (mRowMajor)
>+                {
>+                    out << " + " << str(BlockLayoutEncoder::kBytesPerComponent);
>+                }
>+                else
>+                {
>+                    out << " + " << str(mMatrixStride);
>+                }
>+            }
>+            else if (node->getType().isScalar() && !type.isArray())
>+            {
>+                if (mRowMajor)
>+                {
>+                    out << " + " << str(mMatrixStride);
>+                }
>+                else
>+                {
>+                    out << " + " << str(BlockLayoutEncoder::kBytesPerComponent);
>+                }
>+            }
>+
>+            out << " * ";
>+        }
>+    }
>+    else if (visit == PostVisit)
>+    {
>+        // This is used to output the '+' in the array of arrays formula in above.
>+        if (node->getType().isArray() && !isEndOfSSBOAccessChain())
>+        {
>+            out << " + ";
>+        }
>+        // This corresponds to '(' in writeDotOperatorOutput when fieldType.isArrayOfArrays() is
>+        // true.
>+        if (IsInArrayOfArraysChain(node->getLeft()) && !node->getType().isArray())
>+        {
>+            out << ")";
>+        }
>+        if (mLocationAsTheLastArgument && isEndOfSSBOAccessChain())
>+        {
>+            out << ")";
>+        }
>+    }
>+}
>+
>+void ShaderStorageBlockOutputHLSL::writeDotOperatorOutput(TInfoSinkBase &out, const TField *field)
>+{
>+    auto fieldInfoIter = mBlockMemberInfoMap.find(field);
>+    ASSERT(fieldInfoIter != mBlockMemberInfoMap.end());
>+    const BlockMemberInfo &memberInfo = fieldInfoIter->second;
>+    mMatrixStride                     = memberInfo.matrixStride;
>+    mRowMajor                         = memberInfo.isRowMajorMatrix;
>+    out << memberInfo.offset;
>+
>+    const TType &fieldType = *field->type();
>+    if (fieldType.isArray() && !isEndOfSSBOAccessChain())
>+    {
>+        out << " + ";
>+        out << memberInfo.arrayStride;
>+        if (fieldType.isArrayOfArrays())
>+        {
>+            out << " * (";
>+        }
>+    }
>+    if (mLocationAsTheLastArgument && isEndOfSSBOAccessChain())
>+    {
>+        out << ")";
>+    }
>+}
>+
>+}  // namespace sh
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/ShaderStorageBlockOutputHLSL.h b/Source/ThirdParty/ANGLE/src/compiler/translator/ShaderStorageBlockOutputHLSL.h
>new file mode 100644
>index 00000000000..2ef23641290
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/ShaderStorageBlockOutputHLSL.h
>@@ -0,0 +1,92 @@
>+//
>+// Copyright 2018 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// ShaderStorageBlockOutputHLSL: A traverser to translate a buffer variable of shader storage block
>+// to an offset of RWByteAddressBuffer.
>+//
>+
>+#ifndef COMPILER_TRANSLATOR_SHADERSTORAGEBLOCKOUTPUTHLSL_H_
>+#define COMPILER_TRANSLATOR_SHADERSTORAGEBLOCKOUTPUTHLSL_H_
>+
>+#include "compiler/translator/ShaderStorageBlockFunctionHLSL.h"
>+#include "compiler/translator/blocklayout.h"
>+#include "compiler/translator/tree_util/IntermTraverse.h"
>+
>+namespace sh
>+{
>+class ResourcesHLSL;
>+class OutputHLSL;
>+class TSymbolTable;
>+
>+struct TReferencedBlock : angle::NonCopyable
>+{
>+    POOL_ALLOCATOR_NEW_DELETE
>+    TReferencedBlock(const TInterfaceBlock *block, const TVariable *instanceVariable);
>+    const TInterfaceBlock *block;
>+    const TVariable *instanceVariable;  // May be nullptr if the block is not instanced.
>+};
>+
>+// Maps from uniqueId to a variable.
>+using ReferencedInterfaceBlocks = std::map<int, const TReferencedBlock *>;
>+
>+// Used to save shader storage block field member information.
>+using BlockMemberInfoMap = std::map<const TField *, BlockMemberInfo>;
>+
>+using ShaderVarToFieldMap = std::map<std::string, const TField *>;
>+
>+class ShaderStorageBlockOutputHLSL : public TIntermTraverser
>+{
>+  public:
>+    ShaderStorageBlockOutputHLSL(OutputHLSL *outputHLSL,
>+                                 TSymbolTable *symbolTable,
>+                                 ResourcesHLSL *resourcesHLSL,
>+                                 const std::vector<InterfaceBlock> &shaderStorageBlocks);
>+
>+    ~ShaderStorageBlockOutputHLSL();
>+
>+    // This writes part of the function call to store a value to a SSBO to the output stream. After
>+    // calling this, ", <stored value>)" should be written to the output stream to complete the
>+    // function call.
>+    void outputStoreFunctionCallPrefix(TIntermTyped *node);
>+    // This writes the function call to load a SSBO value to the output stream.
>+    void outputLoadFunctionCall(TIntermTyped *node);
>+    // This writes the function call to get the lengh of unsized array member of SSBO.
>+    void outputLengthFunctionCall(TIntermTyped *node);
>+    // Writes the atomic memory function calls for SSBO.
>+    void outputAtomicMemoryFunctionCallPrefix(TIntermTyped *node, TOperator op);
>+
>+    void writeShaderStorageBlocksHeader(TInfoSinkBase &out) const;
>+
>+  protected:
>+    void visitSymbol(TIntermSymbol *) override;
>+    void visitConstantUnion(TIntermConstantUnion *) override;
>+    bool visitSwizzle(Visit visit, TIntermSwizzle *node) override;
>+    bool visitBinary(Visit visit, TIntermBinary *) override;
>+    bool visitAggregate(Visit visit, TIntermAggregate *node) override;
>+    bool visitTernary(Visit visit, TIntermTernary *) override;
>+    bool visitUnary(Visit visit, TIntermUnary *) override;
>+
>+  private:
>+    void traverseSSBOAccess(TIntermTyped *node, SSBOMethod method);
>+    void setMatrixStride(TIntermTyped *node, TLayoutBlockStorage storage, bool rowMajor);
>+    bool isEndOfSSBOAccessChain();
>+    void writeEOpIndexDirectOrIndirectOutput(TInfoSinkBase &out, Visit visit, TIntermBinary *node);
>+    // Common part in dot operations.
>+    void writeDotOperatorOutput(TInfoSinkBase &out, const TField *field);
>+
>+    int mMatrixStride;
>+    bool mRowMajor;
>+    bool mLocationAsTheLastArgument;
>+    OutputHLSL *mOutputHLSL;
>+    ShaderStorageBlockFunctionHLSL *mSSBOFunctionHLSL;
>+    ResourcesHLSL *mResourcesHLSL;
>+    ReferencedInterfaceBlocks mReferencedShaderStorageBlocks;
>+
>+    BlockMemberInfoMap mBlockMemberInfoMap;
>+    const std::vector<InterfaceBlock> &mShaderStorageBlocks;
>+};
>+}  // namespace sh
>+
>+#endif  // COMPILER_TRANSLATOR_SHADERSTORAGEBLOCKOUTPUTHLSL_H_
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/ShaderVars.cpp b/Source/ThirdParty/ANGLE/src/compiler/translator/ShaderVars.cpp
>index 4ab574e9351..202ed21119d 100644
>--- a/Source/ThirdParty/ANGLE/src/compiler/translator/ShaderVars.cpp
>+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/ShaderVars.cpp
>@@ -22,7 +22,7 @@ InterpolationType GetNonAuxiliaryInterpolationType(InterpolationType interpolati
> {
>     return (interpolation == INTERPOLATION_CENTROID ? INTERPOLATION_SMOOTH : interpolation);
> }
>-}
>+}  // namespace
> // The ES 3.0 spec is not clear on this point, but the ES 3.1 spec, and discussion
> // on Khronos.org, clarifies that a smooth/flat mismatch produces a link error,
> // but auxiliary qualifier mismatch (centroid) does not.
>@@ -31,26 +31,24 @@ bool InterpolationTypesMatch(InterpolationType a, InterpolationType b)
>     return (GetNonAuxiliaryInterpolationType(a) == GetNonAuxiliaryInterpolationType(b));
> }
> 
>-ShaderVariable::ShaderVariable()
>-    : type(0), precision(0), flattenedOffsetInParentArrays(0), staticUse(false)
>-{
>-}
>+ShaderVariable::ShaderVariable() : ShaderVariable(GL_NONE) {}
> 
> ShaderVariable::ShaderVariable(GLenum typeIn)
>-    : type(typeIn), precision(0), flattenedOffsetInParentArrays(0), staticUse(false)
>-{
>-}
>+    : type(typeIn),
>+      precision(0),
>+      staticUse(false),
>+      active(false),
>+      isRowMajorLayout(false),
>+      flattenedOffsetInParentArrays(-1)
>+{}
> 
>-ShaderVariable::ShaderVariable(GLenum typeIn, unsigned int arraySizeIn)
>-    : type(typeIn), precision(0), flattenedOffsetInParentArrays(0), staticUse(false)
>+ShaderVariable::ShaderVariable(GLenum typeIn, unsigned int arraySizeIn) : ShaderVariable(typeIn)
> {
>     ASSERT(arraySizeIn != 0);
>     arraySizes.push_back(arraySizeIn);
> }
> 
>-ShaderVariable::~ShaderVariable()
>-{
>-}
>+ShaderVariable::~ShaderVariable() {}
> 
> ShaderVariable::ShaderVariable(const ShaderVariable &other)
>     : type(other.type),
>@@ -58,24 +56,27 @@ ShaderVariable::ShaderVariable(const ShaderVariable &other)
>       name(other.name),
>       mappedName(other.mappedName),
>       arraySizes(other.arraySizes),
>-      flattenedOffsetInParentArrays(other.flattenedOffsetInParentArrays),
>       staticUse(other.staticUse),
>+      active(other.active),
>       fields(other.fields),
>-      structName(other.structName)
>-{
>-}
>+      structName(other.structName),
>+      isRowMajorLayout(other.isRowMajorLayout),
>+      flattenedOffsetInParentArrays(other.flattenedOffsetInParentArrays)
>+{}
> 
> ShaderVariable &ShaderVariable::operator=(const ShaderVariable &other)
> {
>-    type       = other.type;
>-    precision  = other.precision;
>-    name       = other.name;
>-    mappedName = other.mappedName;
>+    type                          = other.type;
>+    precision                     = other.precision;
>+    name                          = other.name;
>+    mappedName                    = other.mappedName;
>     arraySizes                    = other.arraySizes;
>-    staticUse  = other.staticUse;
>+    staticUse                     = other.staticUse;
>+    active                        = other.active;
>+    fields                        = other.fields;
>+    structName                    = other.structName;
>+    isRowMajorLayout              = other.isRowMajorLayout;
>     flattenedOffsetInParentArrays = other.flattenedOffsetInParentArrays;
>-    fields     = other.fields;
>-    structName = other.structName;
>     return *this;
> }
> 
>@@ -83,8 +84,9 @@ bool ShaderVariable::operator==(const ShaderVariable &other) const
> {
>     if (type != other.type || precision != other.precision || name != other.name ||
>         mappedName != other.mappedName || arraySizes != other.arraySizes ||
>-        staticUse != other.staticUse || fields.size() != other.fields.size() ||
>-        structName != other.structName)
>+        staticUse != other.staticUse || active != other.active ||
>+        fields.size() != other.fields.size() || structName != other.structName ||
>+        isRowMajorLayout != other.isRowMajorLayout)
>     {
>         return false;
>     }
>@@ -105,6 +107,16 @@ void ShaderVariable::setArraySize(unsigned int size)
>     }
> }
> 
>+unsigned int ShaderVariable::getInnerArraySizeProduct() const
>+{
>+    unsigned int arraySizeProduct = 1u;
>+    for (size_t index = 1; index < arraySizes.size(); ++index)
>+    {
>+        arraySizeProduct *= getNestedArraySize(index);
>+    }
>+    return arraySizeProduct;
>+}
>+
> unsigned int ShaderVariable::getArraySizeProduct() const
> {
>     return gl::ArraySizeProduct(arraySizes);
>@@ -113,8 +125,7 @@ unsigned int ShaderVariable::getArraySizeProduct() const
> void ShaderVariable::indexIntoArray(unsigned int arrayIndex)
> {
>     ASSERT(isArray());
>-    flattenedOffsetInParentArrays =
>-        arrayIndex + getOutermostArraySize() * flattenedOffsetInParentArrays;
>+    flattenedOffsetInParentArrays = arrayIndex + getOutermostArraySize() * parentArrayIndex();
>     arraySizes.pop_back();
> }
> 
>@@ -214,6 +225,11 @@ bool ShaderVariable::isBuiltIn() const
>     return (name.size() >= 4 && name[0] == 'g' && name[1] == 'l' && name[2] == '_');
> }
> 
>+bool ShaderVariable::isEmulatedBuiltIn() const
>+{
>+    return isBuiltIn() && name != mappedName;
>+}
>+
> bool ShaderVariable::isSameVariableAtLinkTime(const ShaderVariable &other,
>                                               bool matchPrecision,
>                                               bool matchName) const
>@@ -227,6 +243,8 @@ bool ShaderVariable::isSameVariableAtLinkTime(const ShaderVariable &other,
>     ASSERT(!matchName || mappedName == other.mappedName);
>     if (arraySizes != other.arraySizes)
>         return false;
>+    if (isRowMajorLayout != other.isRowMajorLayout)
>+        return false;
>     if (fields.size() != other.fields.size())
>         return false;
> 
>@@ -245,31 +263,37 @@ bool ShaderVariable::isSameVariableAtLinkTime(const ShaderVariable &other,
>     return true;
> }
> 
>-Uniform::Uniform() : binding(-1), offset(-1)
>-{
>-}
>+Uniform::Uniform()
>+    : binding(-1), imageUnitFormat(GL_NONE), offset(-1), readonly(false), writeonly(false)
>+{}
> 
>-Uniform::~Uniform()
>-{
>-}
>+Uniform::~Uniform() {}
> 
> Uniform::Uniform(const Uniform &other)
>-    : VariableWithLocation(other), binding(other.binding), offset(other.offset)
>-{
>-}
>+    : VariableWithLocation(other),
>+      binding(other.binding),
>+      imageUnitFormat(other.imageUnitFormat),
>+      offset(other.offset),
>+      readonly(other.readonly),
>+      writeonly(other.writeonly)
>+{}
> 
> Uniform &Uniform::operator=(const Uniform &other)
> {
>     VariableWithLocation::operator=(other);
>-    binding                 = other.binding;
>+    binding                       = other.binding;
>+    imageUnitFormat               = other.imageUnitFormat;
>     offset                        = other.offset;
>+    readonly                      = other.readonly;
>+    writeonly                     = other.writeonly;
>     return *this;
> }
> 
> bool Uniform::operator==(const Uniform &other) const
> {
>     return VariableWithLocation::operator==(other) && binding == other.binding &&
>-           offset == other.offset;
>+           imageUnitFormat == other.imageUnitFormat && offset == other.offset &&
>+           readonly == other.readonly && writeonly == other.writeonly;
> }
> 
> bool Uniform::isSameUniformAtLinkTime(const Uniform &other) const
>@@ -280,6 +304,10 @@ bool Uniform::isSameUniformAtLinkTime(const Uniform &other) const
>     {
>         return false;
>     }
>+    if (imageUnitFormat != other.imageUnitFormat)
>+    {
>+        return false;
>+    }
>     if (location != -1 && other.location != -1 && location != other.location)
>     {
>         return false;
>@@ -288,21 +316,20 @@ bool Uniform::isSameUniformAtLinkTime(const Uniform &other) const
>     {
>         return false;
>     }
>+    if (readonly != other.readonly || writeonly != other.writeonly)
>+    {
>+        return false;
>+    }
>     return VariableWithLocation::isSameVariableAtLinkTime(other, true, true);
> }
> 
>-VariableWithLocation::VariableWithLocation() : location(-1)
>-{
>-}
>+VariableWithLocation::VariableWithLocation() : location(-1) {}
> 
>-VariableWithLocation::~VariableWithLocation()
>-{
>-}
>+VariableWithLocation::~VariableWithLocation() {}
> 
> VariableWithLocation::VariableWithLocation(const VariableWithLocation &other)
>     : ShaderVariable(other), location(other.location)
>-{
>-}
>+{}
> 
> VariableWithLocation &VariableWithLocation::operator=(const VariableWithLocation &other)
> {
>@@ -316,17 +343,11 @@ bool VariableWithLocation::operator==(const VariableWithLocation &other) const
>     return (ShaderVariable::operator==(other) && location == other.location);
> }
> 
>-Attribute::Attribute()
>-{
>-}
>+Attribute::Attribute() {}
> 
>-Attribute::~Attribute()
>-{
>-}
>+Attribute::~Attribute() {}
> 
>-Attribute::Attribute(const Attribute &other) : VariableWithLocation(other)
>-{
>-}
>+Attribute::Attribute(const Attribute &other) : VariableWithLocation(other) {}
> 
> Attribute &Attribute::operator=(const Attribute &other)
> {
>@@ -339,81 +360,57 @@ bool Attribute::operator==(const Attribute &other) const
>     return VariableWithLocation::operator==(other);
> }
> 
>-OutputVariable::OutputVariable()
>-{
>-}
>+OutputVariable::OutputVariable() : index(-1) {}
> 
>-OutputVariable::~OutputVariable()
>-{
>-}
>-
>-OutputVariable::OutputVariable(const OutputVariable &other) : VariableWithLocation(other)
>-{
>-}
>+OutputVariable::~OutputVariable() {}
> 
>-OutputVariable &OutputVariable::operator=(const OutputVariable &other)
>-{
>-    VariableWithLocation::operator=(other);
>-    return *this;
>-}
>+OutputVariable::OutputVariable(const OutputVariable &other) = default;
>+OutputVariable &OutputVariable::operator=(const OutputVariable &other) = default;
> 
> bool OutputVariable::operator==(const OutputVariable &other) const
> {
>-    return VariableWithLocation::operator==(other);
>+    return VariableWithLocation::operator==(other) && index == other.index;
> }
> 
>-InterfaceBlockField::InterfaceBlockField() : isRowMajorLayout(false)
>-{
>-}
>+InterfaceBlockField::InterfaceBlockField() {}
> 
>-InterfaceBlockField::~InterfaceBlockField()
>-{
>-}
>+InterfaceBlockField::~InterfaceBlockField() {}
> 
>-InterfaceBlockField::InterfaceBlockField(const InterfaceBlockField &other)
>-    : ShaderVariable(other), isRowMajorLayout(other.isRowMajorLayout)
>-{
>-}
>+InterfaceBlockField::InterfaceBlockField(const InterfaceBlockField &other) : ShaderVariable(other)
>+{}
> 
> InterfaceBlockField &InterfaceBlockField::operator=(const InterfaceBlockField &other)
> {
>     ShaderVariable::operator=(other);
>-    isRowMajorLayout        = other.isRowMajorLayout;
>     return *this;
> }
> 
> bool InterfaceBlockField::operator==(const InterfaceBlockField &other) const
> {
>-    return (ShaderVariable::operator==(other) && isRowMajorLayout == other.isRowMajorLayout);
>+    return ShaderVariable::operator==(other);
> }
> 
> bool InterfaceBlockField::isSameInterfaceBlockFieldAtLinkTime(
>     const InterfaceBlockField &other) const
> {
>-    return (ShaderVariable::isSameVariableAtLinkTime(other, true, true) &&
>-            isRowMajorLayout == other.isRowMajorLayout);
>+    return (ShaderVariable::isSameVariableAtLinkTime(other, true, true));
> }
> 
>-Varying::Varying() : interpolation(INTERPOLATION_SMOOTH), isInvariant(false)
>-{
>-}
>+Varying::Varying() : interpolation(INTERPOLATION_SMOOTH), isInvariant(false) {}
> 
>-Varying::~Varying()
>-{
>-}
>+Varying::~Varying() {}
> 
> Varying::Varying(const Varying &other)
>     : VariableWithLocation(other),
>       interpolation(other.interpolation),
>       isInvariant(other.isInvariant)
>-{
>-}
>+{}
> 
> Varying &Varying::operator=(const Varying &other)
> {
>     VariableWithLocation::operator=(other);
>-    interpolation           = other.interpolation;
>-    isInvariant             = other.isInvariant;
>+    interpolation                 = other.interpolation;
>+    isInvariant                   = other.isInvariant;
>     return *this;
> }
> 
>@@ -443,13 +440,11 @@ InterfaceBlock::InterfaceBlock()
>       isRowMajorLayout(false),
>       binding(-1),
>       staticUse(false),
>+      active(false),
>       blockType(BlockType::BLOCK_UNIFORM)
>-{
>-}
>+{}
> 
>-InterfaceBlock::~InterfaceBlock()
>-{
>-}
>+InterfaceBlock::~InterfaceBlock() {}
> 
> InterfaceBlock::InterfaceBlock(const InterfaceBlock &other)
>     : name(other.name),
>@@ -460,10 +455,10 @@ InterfaceBlock::InterfaceBlock(const InterfaceBlock &other)
>       isRowMajorLayout(other.isRowMajorLayout),
>       binding(other.binding),
>       staticUse(other.staticUse),
>+      active(other.active),
>       blockType(other.blockType),
>       fields(other.fields)
>-{
>-}
>+{}
> 
> InterfaceBlock &InterfaceBlock::operator=(const InterfaceBlock &other)
> {
>@@ -475,6 +470,7 @@ InterfaceBlock &InterfaceBlock::operator=(const InterfaceBlock &other)
>     isRowMajorLayout = other.isRowMajorLayout;
>     binding          = other.binding;
>     staticUse        = other.staticUse;
>+    active           = other.active;
>     blockType        = other.blockType;
>     fields           = other.fields;
>     return *this;
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/SimplifyLoopConditions.cpp b/Source/ThirdParty/ANGLE/src/compiler/translator/SimplifyLoopConditions.cpp
>deleted file mode 100644
>index 97040468396..00000000000
>--- a/Source/ThirdParty/ANGLE/src/compiler/translator/SimplifyLoopConditions.cpp
>+++ /dev/null
>@@ -1,300 +0,0 @@
>-//
>-// Copyright (c) 2016 The ANGLE Project Authors. All rights reserved.
>-// Use of this source code is governed by a BSD-style license that can be
>-// found in the LICENSE file.
>-//
>-// SimplifyLoopConditions is an AST traverser that converts loop conditions and loop expressions
>-// to regular statements inside the loop. This way further transformations that generate statements
>-// from loop conditions and loop expressions work correctly.
>-//
>-
>-#include "compiler/translator/SimplifyLoopConditions.h"
>-
>-#include "compiler/translator/IntermNodePatternMatcher.h"
>-#include "compiler/translator/IntermNode_util.h"
>-#include "compiler/translator/IntermTraverse.h"
>-
>-namespace sh
>-{
>-
>-namespace
>-{
>-
>-class SimplifyLoopConditionsTraverser : public TLValueTrackingTraverser
>-{
>-  public:
>-    SimplifyLoopConditionsTraverser(unsigned int conditionsToSimplifyMask,
>-                                    TSymbolTable *symbolTable,
>-                                    int shaderVersion);
>-
>-    void traverseLoop(TIntermLoop *node) override;
>-
>-    bool visitUnary(Visit visit, TIntermUnary *node) override;
>-    bool visitBinary(Visit visit, TIntermBinary *node) override;
>-    bool visitAggregate(Visit visit, TIntermAggregate *node) override;
>-    bool visitTernary(Visit visit, TIntermTernary *node) override;
>-    bool visitDeclaration(Visit visit, TIntermDeclaration *node) override;
>-
>-    bool foundLoopToChange() const { return mFoundLoopToChange; }
>-
>-  protected:
>-    // Marked to true once an operation that needs to be hoisted out of a loop expression has been
>-    // found.
>-    bool mFoundLoopToChange;
>-    bool mInsideLoopInitConditionOrExpression;
>-    IntermNodePatternMatcher mConditionsToSimplify;
>-};
>-
>-SimplifyLoopConditionsTraverser::SimplifyLoopConditionsTraverser(
>-    unsigned int conditionsToSimplifyMask,
>-    TSymbolTable *symbolTable,
>-    int shaderVersion)
>-    : TLValueTrackingTraverser(true, false, false, symbolTable, shaderVersion),
>-      mFoundLoopToChange(false),
>-      mInsideLoopInitConditionOrExpression(false),
>-      mConditionsToSimplify(conditionsToSimplifyMask)
>-{
>-}
>-
>-// If we're inside a loop initialization, condition, or expression, we check for expressions that
>-// should be moved out of the loop condition or expression. If one is found, the loop is
>-// transformed.
>-// If we're not inside loop initialization, condition, or expression, we only need to traverse nodes
>-// that may contain loops.
>-
>-bool SimplifyLoopConditionsTraverser::visitUnary(Visit visit, TIntermUnary *node)
>-{
>-    if (!mInsideLoopInitConditionOrExpression)
>-        return false;
>-
>-    if (mFoundLoopToChange)
>-        return false;  // Already decided to change this loop.
>-
>-    mFoundLoopToChange = mConditionsToSimplify.match(node);
>-    return !mFoundLoopToChange;
>-}
>-
>-bool SimplifyLoopConditionsTraverser::visitBinary(Visit visit, TIntermBinary *node)
>-{
>-    if (!mInsideLoopInitConditionOrExpression)
>-        return false;
>-
>-    if (mFoundLoopToChange)
>-        return false;  // Already decided to change this loop.
>-
>-    mFoundLoopToChange = mConditionsToSimplify.match(node, getParentNode(), isLValueRequiredHere());
>-    return !mFoundLoopToChange;
>-}
>-
>-bool SimplifyLoopConditionsTraverser::visitAggregate(Visit visit, TIntermAggregate *node)
>-{
>-    if (!mInsideLoopInitConditionOrExpression)
>-        return false;
>-
>-    if (mFoundLoopToChange)
>-        return false;  // Already decided to change this loop.
>-
>-    mFoundLoopToChange = mConditionsToSimplify.match(node, getParentNode());
>-    return !mFoundLoopToChange;
>-}
>-
>-bool SimplifyLoopConditionsTraverser::visitTernary(Visit visit, TIntermTernary *node)
>-{
>-    if (!mInsideLoopInitConditionOrExpression)
>-        return false;
>-
>-    if (mFoundLoopToChange)
>-        return false;  // Already decided to change this loop.
>-
>-    mFoundLoopToChange = mConditionsToSimplify.match(node);
>-    return !mFoundLoopToChange;
>-}
>-
>-bool SimplifyLoopConditionsTraverser::visitDeclaration(Visit visit, TIntermDeclaration *node)
>-{
>-    if (!mInsideLoopInitConditionOrExpression)
>-        return false;
>-
>-    if (mFoundLoopToChange)
>-        return false;  // Already decided to change this loop.
>-
>-    mFoundLoopToChange = mConditionsToSimplify.match(node);
>-    return !mFoundLoopToChange;
>-}
>-
>-void SimplifyLoopConditionsTraverser::traverseLoop(TIntermLoop *node)
>-{
>-    // Mark that we're inside a loop condition or expression, and determine if the loop needs to be
>-    // transformed.
>-
>-    ScopedNodeInTraversalPath addToPath(this, node);
>-
>-    mInsideLoopInitConditionOrExpression = true;
>-    mFoundLoopToChange                   = false;
>-
>-    if (!mFoundLoopToChange && node->getInit())
>-    {
>-        node->getInit()->traverse(this);
>-    }
>-
>-    if (!mFoundLoopToChange && node->getCondition())
>-    {
>-        node->getCondition()->traverse(this);
>-    }
>-
>-    if (!mFoundLoopToChange && node->getExpression())
>-    {
>-        node->getExpression()->traverse(this);
>-    }
>-
>-    mInsideLoopInitConditionOrExpression = false;
>-
>-    if (mFoundLoopToChange)
>-    {
>-        nextTemporaryId();
>-
>-        // Replace the loop condition with a boolean variable that's updated on each iteration.
>-        TLoopType loopType = node->getType();
>-        if (loopType == ELoopWhile)
>-        {
>-            // Transform:
>-            //   while (expr) { body; }
>-            // into
>-            //   bool s0 = expr;
>-            //   while (s0) { { body; } s0 = expr; }
>-            TIntermSequence tempInitSeq;
>-            tempInitSeq.push_back(createTempInitDeclaration(node->getCondition()->deepCopy()));
>-            insertStatementsInParentBlock(tempInitSeq);
>-
>-            TIntermBlock *newBody = new TIntermBlock();
>-            if (node->getBody())
>-            {
>-                newBody->getSequence()->push_back(node->getBody());
>-            }
>-            newBody->getSequence()->push_back(
>-                createTempAssignment(node->getCondition()->deepCopy()));
>-
>-            // Can't use queueReplacement to replace old body, since it may have been nullptr.
>-            // It's safe to do the replacements in place here - the new body will still be
>-            // traversed, but that won't create any problems.
>-            node->setBody(newBody);
>-            node->setCondition(createTempSymbol(node->getCondition()->getType()));
>-        }
>-        else if (loopType == ELoopDoWhile)
>-        {
>-            // Transform:
>-            //   do {
>-            //     body;
>-            //   } while (expr);
>-            // into
>-            //   bool s0 = true;
>-            //   do {
>-            //     { body; }
>-            //     s0 = expr;
>-            //   } while (s0);
>-            TIntermSequence tempInitSeq;
>-            tempInitSeq.push_back(createTempInitDeclaration(CreateBoolNode(true)));
>-            insertStatementsInParentBlock(tempInitSeq);
>-
>-            TIntermBlock *newBody = new TIntermBlock();
>-            if (node->getBody())
>-            {
>-                newBody->getSequence()->push_back(node->getBody());
>-            }
>-            newBody->getSequence()->push_back(
>-                createTempAssignment(node->getCondition()->deepCopy()));
>-
>-            // Can't use queueReplacement to replace old body, since it may have been nullptr.
>-            // It's safe to do the replacements in place here - the new body will still be
>-            // traversed, but that won't create any problems.
>-            node->setBody(newBody);
>-            node->setCondition(createTempSymbol(node->getCondition()->getType()));
>-        }
>-        else if (loopType == ELoopFor)
>-        {
>-            // Move the loop condition inside the loop.
>-            // Transform:
>-            //   for (init; expr; exprB) { body; }
>-            // into
>-            //   {
>-            //     init;
>-            //     bool s0 = expr;
>-            //     while (s0) {
>-            //       { body; }
>-            //       exprB;
>-            //       s0 = expr;
>-            //     }
>-            //   }
>-            TIntermBlock *loopScope            = new TIntermBlock();
>-            TIntermSequence *loopScopeSequence = loopScope->getSequence();
>-
>-            // Insert "init;"
>-            if (node->getInit())
>-            {
>-                loopScopeSequence->push_back(node->getInit());
>-            }
>-
>-            // Insert "bool s0 = expr;" if applicable, "bool s0 = true;" otherwise
>-            TIntermTyped *conditionInitializer = nullptr;
>-            if (node->getCondition())
>-            {
>-                conditionInitializer = node->getCondition()->deepCopy();
>-            }
>-            else
>-            {
>-                conditionInitializer = CreateBoolNode(true);
>-            }
>-            loopScopeSequence->push_back(createTempInitDeclaration(conditionInitializer));
>-
>-            // Insert "{ body; }" in the while loop
>-            TIntermBlock *whileLoopBody = new TIntermBlock();
>-            if (node->getBody())
>-            {
>-                whileLoopBody->getSequence()->push_back(node->getBody());
>-            }
>-            // Insert "exprB;" in the while loop
>-            if (node->getExpression())
>-            {
>-                whileLoopBody->getSequence()->push_back(node->getExpression());
>-            }
>-            // Insert "s0 = expr;" in the while loop
>-            if (node->getCondition())
>-            {
>-                whileLoopBody->getSequence()->push_back(
>-                    createTempAssignment(node->getCondition()->deepCopy()));
>-            }
>-
>-            // Create "while(s0) { whileLoopBody }"
>-            TIntermLoop *whileLoop = new TIntermLoop(
>-                ELoopWhile, nullptr, createTempSymbol(conditionInitializer->getType()), nullptr,
>-                whileLoopBody);
>-            loopScope->getSequence()->push_back(whileLoop);
>-            queueReplacement(loopScope, OriginalNode::IS_DROPPED);
>-
>-            // After this the old body node will be traversed and loops inside it may be
>-            // transformed. This is fine, since the old body node will still be in the AST after the
>-            // transformation that's queued here, and transforming loops inside it doesn't need to
>-            // know the exact post-transform path to it.
>-        }
>-    }
>-
>-    mFoundLoopToChange = false;
>-
>-    // We traverse the body of the loop even if the loop is transformed.
>-    if (node->getBody())
>-        node->getBody()->traverse(this);
>-}
>-
>-}  // namespace
>-
>-void SimplifyLoopConditions(TIntermNode *root,
>-                            unsigned int conditionsToSimplifyMask,
>-                            TSymbolTable *symbolTable,
>-                            int shaderVersion)
>-{
>-    SimplifyLoopConditionsTraverser traverser(conditionsToSimplifyMask, symbolTable, shaderVersion);
>-    root->traverse(&traverser);
>-    traverser.updateTree();
>-}
>-
>-}  // namespace sh
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/SimplifyLoopConditions.h b/Source/ThirdParty/ANGLE/src/compiler/translator/SimplifyLoopConditions.h
>deleted file mode 100644
>index d8f95cd2c8a..00000000000
>--- a/Source/ThirdParty/ANGLE/src/compiler/translator/SimplifyLoopConditions.h
>+++ /dev/null
>@@ -1,25 +0,0 @@
>-//
>-// Copyright (c) 2016 The ANGLE Project Authors. All rights reserved.
>-// Use of this source code is governed by a BSD-style license that can be
>-// found in the LICENSE file.
>-//
>-// SimplifyLoopConditions is an AST traverser that converts loop conditions and loop expressions
>-// to regular statements inside the loop. This way further transformations that generate statements
>-// from loop conditions and loop expressions work correctly.
>-//
>-
>-#ifndef COMPILER_TRANSLATOR_SIMPLIFYLOOPCONDITIONS_H_
>-#define COMPILER_TRANSLATOR_SIMPLIFYLOOPCONDITIONS_H_
>-
>-namespace sh
>-{
>-class TIntermNode;
>-class TSymbolTable;
>-
>-void SimplifyLoopConditions(TIntermNode *root,
>-                            unsigned int conditionsToSimplify,
>-                            TSymbolTable *symbolTable,
>-                            int shaderVersion);
>-}  // namespace sh
>-
>-#endif  // COMPILER_TRANSLATOR_SIMPLIFYLOOPCONDITIONS_H_
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/SplitSequenceOperator.cpp b/Source/ThirdParty/ANGLE/src/compiler/translator/SplitSequenceOperator.cpp
>deleted file mode 100644
>index 5df3154560c..00000000000
>--- a/Source/ThirdParty/ANGLE/src/compiler/translator/SplitSequenceOperator.cpp
>+++ /dev/null
>@@ -1,171 +0,0 @@
>-//
>-// Copyright (c) 2016 The ANGLE Project Authors. All rights reserved.
>-// Use of this source code is governed by a BSD-style license that can be
>-// found in the LICENSE file.
>-//
>-// SplitSequenceOperator is an AST traverser that detects sequence operator expressions that
>-// go through further AST transformations that generate statements, and splits them so that
>-// possible side effects of earlier parts of the sequence operator expression are guaranteed to be
>-// evaluated before the latter parts of the sequence operator expression are evaluated.
>-//
>-
>-#include "compiler/translator/SplitSequenceOperator.h"
>-
>-#include "compiler/translator/IntermNodePatternMatcher.h"
>-#include "compiler/translator/IntermTraverse.h"
>-
>-namespace sh
>-{
>-
>-namespace
>-{
>-
>-class SplitSequenceOperatorTraverser : public TLValueTrackingTraverser
>-{
>-  public:
>-    SplitSequenceOperatorTraverser(unsigned int patternsToSplitMask,
>-                                   TSymbolTable *symbolTable,
>-                                   int shaderVersion);
>-
>-    bool visitUnary(Visit visit, TIntermUnary *node) override;
>-    bool visitBinary(Visit visit, TIntermBinary *node) override;
>-    bool visitAggregate(Visit visit, TIntermAggregate *node) override;
>-    bool visitTernary(Visit visit, TIntermTernary *node) override;
>-
>-    void nextIteration();
>-    bool foundExpressionToSplit() const { return mFoundExpressionToSplit; }
>-
>-  protected:
>-    // Marked to true once an operation that needs to be hoisted out of the expression has been
>-    // found. After that, no more AST updates are performed on that traversal.
>-    bool mFoundExpressionToSplit;
>-    int mInsideSequenceOperator;
>-
>-    IntermNodePatternMatcher mPatternToSplitMatcher;
>-};
>-
>-SplitSequenceOperatorTraverser::SplitSequenceOperatorTraverser(unsigned int patternsToSplitMask,
>-                                                               TSymbolTable *symbolTable,
>-                                                               int shaderVersion)
>-    : TLValueTrackingTraverser(true, false, true, symbolTable, shaderVersion),
>-      mFoundExpressionToSplit(false),
>-      mInsideSequenceOperator(0),
>-      mPatternToSplitMatcher(patternsToSplitMask)
>-{
>-}
>-
>-void SplitSequenceOperatorTraverser::nextIteration()
>-{
>-    mFoundExpressionToSplit = false;
>-    mInsideSequenceOperator = 0;
>-    nextTemporaryId();
>-}
>-
>-bool SplitSequenceOperatorTraverser::visitAggregate(Visit visit, TIntermAggregate *node)
>-{
>-    if (mFoundExpressionToSplit)
>-        return false;
>-
>-    if (mInsideSequenceOperator > 0 && visit == PreVisit)
>-    {
>-        // Detect expressions that need to be simplified
>-        mFoundExpressionToSplit = mPatternToSplitMatcher.match(node, getParentNode());
>-        return !mFoundExpressionToSplit;
>-    }
>-
>-    return true;
>-}
>-
>-bool SplitSequenceOperatorTraverser::visitUnary(Visit visit, TIntermUnary *node)
>-{
>-    if (mFoundExpressionToSplit)
>-        return false;
>-
>-    if (mInsideSequenceOperator > 0 && visit == PreVisit)
>-    {
>-        // Detect expressions that need to be simplified
>-        mFoundExpressionToSplit = mPatternToSplitMatcher.match(node);
>-        return !mFoundExpressionToSplit;
>-    }
>-
>-    return true;
>-}
>-
>-bool SplitSequenceOperatorTraverser::visitBinary(Visit visit, TIntermBinary *node)
>-{
>-    if (node->getOp() == EOpComma)
>-    {
>-        if (visit == PreVisit)
>-        {
>-            if (mFoundExpressionToSplit)
>-            {
>-                return false;
>-            }
>-            mInsideSequenceOperator++;
>-        }
>-        else if (visit == PostVisit)
>-        {
>-            // Split sequence operators starting from the outermost one to preserve correct
>-            // execution order.
>-            if (mFoundExpressionToSplit && mInsideSequenceOperator == 1)
>-            {
>-                // Move the left side operand into a separate statement in the parent block.
>-                TIntermSequence insertions;
>-                insertions.push_back(node->getLeft());
>-                insertStatementsInParentBlock(insertions);
>-                // Replace the comma node with its right side operand.
>-                queueReplacement(node->getRight(), OriginalNode::IS_DROPPED);
>-            }
>-            mInsideSequenceOperator--;
>-        }
>-        return true;
>-    }
>-
>-    if (mFoundExpressionToSplit)
>-        return false;
>-
>-    if (mInsideSequenceOperator > 0 && visit == PreVisit)
>-    {
>-        // Detect expressions that need to be simplified
>-        mFoundExpressionToSplit =
>-            mPatternToSplitMatcher.match(node, getParentNode(), isLValueRequiredHere());
>-        return !mFoundExpressionToSplit;
>-    }
>-
>-    return true;
>-}
>-
>-bool SplitSequenceOperatorTraverser::visitTernary(Visit visit, TIntermTernary *node)
>-{
>-    if (mFoundExpressionToSplit)
>-        return false;
>-
>-    if (mInsideSequenceOperator > 0 && visit == PreVisit)
>-    {
>-        // Detect expressions that need to be simplified
>-        mFoundExpressionToSplit = mPatternToSplitMatcher.match(node);
>-        return !mFoundExpressionToSplit;
>-    }
>-
>-    return true;
>-}
>-
>-}  // namespace
>-
>-void SplitSequenceOperator(TIntermNode *root,
>-                           int patternsToSplitMask,
>-                           TSymbolTable *symbolTable,
>-                           int shaderVersion)
>-{
>-    SplitSequenceOperatorTraverser traverser(patternsToSplitMask, symbolTable, shaderVersion);
>-    // Separate one expression at a time, and reset the traverser between iterations.
>-    do
>-    {
>-        traverser.nextIteration();
>-        root->traverse(&traverser);
>-        if (traverser.foundExpressionToSplit())
>-            traverser.updateTree();
>-    } while (traverser.foundExpressionToSplit());
>-}
>-
>-}  // namespace sh
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/SplitSequenceOperator.h b/Source/ThirdParty/ANGLE/src/compiler/translator/SplitSequenceOperator.h
>deleted file mode 100644
>index 8f1a766775e..00000000000
>--- a/Source/ThirdParty/ANGLE/src/compiler/translator/SplitSequenceOperator.h
>+++ /dev/null
>@@ -1,28 +0,0 @@
>-//
>-// Copyright (c) 2016 The ANGLE Project Authors. All rights reserved.
>-// Use of this source code is governed by a BSD-style license that can be
>-// found in the LICENSE file.
>-//
>-// SplitSequenceOperator is an AST traverser that detects sequence operator expressions that
>-// go through further AST transformations that generate statements, and splits them so that
>-// possible side effects of earlier parts of the sequence operator expression are guaranteed to be
>-// evaluated before the latter parts of the sequence operator expression are evaluated.
>-//
>-
>-#ifndef COMPILER_TRANSLATOR_SPLITSEQUENCEOPERATOR_H_
>-#define COMPILER_TRANSLATOR_SPLITSEQUENCEOPERATOR_H_
>-
>-namespace sh
>-{
>-
>-class TIntermNode;
>-class TSymbolTable;
>-
>-void SplitSequenceOperator(TIntermNode *root,
>-                           int patternsToSplitMask,
>-                           TSymbolTable *symbolTable,
>-                           int shaderVersion);
>-
>-}  // namespace sh
>-
>-#endif  // COMPILER_TRANSLATOR_SPLITSEQUENCEOPERATOR_H_
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/StaticType.h b/Source/ThirdParty/ANGLE/src/compiler/translator/StaticType.h
>new file mode 100644
>index 00000000000..7587e85b42f
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/StaticType.h
>@@ -0,0 +1,198 @@
>+//
>+// Copyright (c) 2017 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// Compile-time instances of many common TType values. These are looked up
>+// (statically or dynamically) through the methods defined in the namespace.
>+//
>+
>+#ifndef COMPILER_TRANSLATOR_STATIC_TYPE_H_
>+#define COMPILER_TRANSLATOR_STATIC_TYPE_H_
>+
>+#include "compiler/translator/Types.h"
>+
>+namespace sh
>+{
>+
>+namespace StaticType
>+{
>+
>+namespace Helpers
>+{
>+
>+//
>+// Generation and static allocation of type mangled name values.
>+//
>+
>+// Size of the constexpr-generated mangled name.
>+// If this value is too small, the compiler will produce errors.
>+static constexpr size_t kStaticMangledNameLength = 2;
>+
>+// Type which holds the mangled names for constexpr-generated TTypes.
>+// This simple struct is needed so that a char array can be returned by value.
>+struct StaticMangledName
>+{
>+    // If this array is too small, the compiler will produce errors.
>+    char name[kStaticMangledNameLength + 1] = {};
>+};
>+
>+// Generates a mangled name for a TType given its parameters.
>+constexpr StaticMangledName BuildStaticMangledName(TBasicType basicType,
>+                                                   TPrecision precision,
>+                                                   TQualifier qualifier,
>+                                                   unsigned char primarySize,
>+                                                   unsigned char secondarySize)
>+{
>+    StaticMangledName name = {};
>+    name.name[0]           = TType::GetSizeMangledName(primarySize, secondarySize);
>+    name.name[1]           = GetBasicMangledName(basicType);
>+    name.name[2]           = '\0';
>+    return name;
>+}
>+
>+// This "variable" contains the mangled names for every constexpr-generated TType.
>+// If kMangledNameInstance<B, P, Q, PS, SS> is used anywhere (specifally
>+// in kInstance, below), this is where the appropriate type will be stored.
>+template <TBasicType basicType,
>+          TPrecision precision,
>+          TQualifier qualifier,
>+          unsigned char primarySize,
>+          unsigned char secondarySize>
>+static constexpr StaticMangledName kMangledNameInstance =
>+    BuildStaticMangledName(basicType, precision, qualifier, primarySize, secondarySize);
>+
>+//
>+// Generation and static allocation of TType values.
>+//
>+
>+// This "variable" contains every constexpr-generated TType.
>+// If kInstance<B, P, Q, PS, SS> is used anywhere (specifally
>+// in Get, below), this is where the appropriate type will be stored.
>+template <TBasicType basicType,
>+          TPrecision precision,
>+          TQualifier qualifier,
>+          unsigned char primarySize,
>+          unsigned char secondarySize>
>+static constexpr TType kInstance =
>+    TType(basicType,
>+          precision,
>+          qualifier,
>+          primarySize,
>+          secondarySize,
>+          kMangledNameInstance<basicType, precision, qualifier, primarySize, secondarySize>.name);
>+
>+}  // namespace Helpers
>+
>+//
>+// Fully-qualified type lookup.
>+//
>+
>+template <TBasicType basicType,
>+          TPrecision precision,
>+          TQualifier qualifier,
>+          unsigned char primarySize,
>+          unsigned char secondarySize>
>+constexpr const TType *Get()
>+{
>+    static_assert(1 <= primarySize && primarySize <= 4, "primarySize out of bounds");
>+    static_assert(1 <= secondarySize && secondarySize <= 4, "secondarySize out of bounds");
>+    return &Helpers::kInstance<basicType, precision, qualifier, primarySize, secondarySize>;
>+}
>+
>+//
>+// Overloads
>+//
>+
>+template <TBasicType basicType, unsigned char primarySize = 1, unsigned char secondarySize = 1>
>+constexpr const TType *GetBasic()
>+{
>+    return Get<basicType, EbpUndefined, EvqGlobal, primarySize, secondarySize>();
>+}
>+
>+template <TBasicType basicType,
>+          TQualifier qualifier,
>+          unsigned char primarySize   = 1,
>+          unsigned char secondarySize = 1>
>+const TType *GetQualified()
>+{
>+    return Get<basicType, EbpUndefined, qualifier, primarySize, secondarySize>();
>+}
>+
>+// Dynamic lookup methods (convert runtime values to template args)
>+
>+namespace Helpers
>+{
>+
>+// Helper which takes secondarySize statically but primarySize dynamically.
>+template <TBasicType basicType,
>+          TPrecision precision,
>+          TQualifier qualifier,
>+          unsigned char secondarySize>
>+constexpr const TType *GetForVecMatHelper(unsigned char primarySize)
>+{
>+    static_assert(basicType == EbtFloat || basicType == EbtInt || basicType == EbtUInt ||
>+                      basicType == EbtBool,
>+                  "unsupported basicType");
>+    switch (primarySize)
>+    {
>+        case 1:
>+            return Get<basicType, precision, qualifier, 1, secondarySize>();
>+        case 2:
>+            return Get<basicType, precision, qualifier, 2, secondarySize>();
>+        case 3:
>+            return Get<basicType, precision, qualifier, 3, secondarySize>();
>+        case 4:
>+            return Get<basicType, precision, qualifier, 4, secondarySize>();
>+        default:
>+            UNREACHABLE();
>+            return GetBasic<EbtVoid>();
>+    }
>+}
>+
>+}  // namespace Helpers
>+
>+template <TBasicType basicType,
>+          TPrecision precision = EbpUndefined,
>+          TQualifier qualifier = EvqGlobal>
>+constexpr const TType *GetForVecMat(unsigned char primarySize, unsigned char secondarySize = 1)
>+{
>+    static_assert(basicType == EbtFloat || basicType == EbtInt || basicType == EbtUInt ||
>+                      basicType == EbtBool,
>+                  "unsupported basicType");
>+    switch (secondarySize)
>+    {
>+        case 1:
>+            return Helpers::GetForVecMatHelper<basicType, precision, qualifier, 1>(primarySize);
>+        case 2:
>+            return Helpers::GetForVecMatHelper<basicType, precision, qualifier, 2>(primarySize);
>+        case 3:
>+            return Helpers::GetForVecMatHelper<basicType, precision, qualifier, 3>(primarySize);
>+        case 4:
>+            return Helpers::GetForVecMatHelper<basicType, precision, qualifier, 4>(primarySize);
>+        default:
>+            UNREACHABLE();
>+            return GetBasic<EbtVoid>();
>+    }
>+}
>+
>+template <TBasicType basicType, TPrecision precision = EbpUndefined>
>+constexpr const TType *GetForVec(TQualifier qualifier, unsigned char size)
>+{
>+    switch (qualifier)
>+    {
>+        case EvqGlobal:
>+            return Helpers::GetForVecMatHelper<basicType, precision, EvqGlobal, 1>(size);
>+        case EvqOut:
>+            return Helpers::GetForVecMatHelper<basicType, precision, EvqOut, 1>(size);
>+        default:
>+            UNREACHABLE();
>+            return GetBasic<EbtVoid>();
>+    }
>+}
>+
>+}  // namespace StaticType
>+
>+}  // namespace sh
>+
>+#endif  // COMPILER_TRANSLATOR_STATIC_TYPE_H_
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/StructureHLSL.cpp b/Source/ThirdParty/ANGLE/src/compiler/translator/StructureHLSL.cpp
>index 61a9431cebb..172ca07fc06 100644
>--- a/Source/ThirdParty/ANGLE/src/compiler/translator/StructureHLSL.cpp
>+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/StructureHLSL.cpp
>@@ -11,8 +11,8 @@
> #include "common/utilities.h"
> #include "compiler/translator/OutputHLSL.h"
> #include "compiler/translator/Types.h"
>-#include "compiler/translator/util.h"
> #include "compiler/translator/UtilsHLSL.h"
>+#include "compiler/translator/util.h"
> 
> namespace sh
> {
>@@ -26,7 +26,7 @@ TString Define(const TStructure &structure,
>                Std140PaddingHelper *padHelper)
> {
>     const TFieldList &fields = structure.fields();
>-    const bool isNameless    = (structure.name() == "");
>+    const bool isNameless    = (structure.symbolType() == SymbolType::Empty);
>     const TString &structName =
>         QualifiedStructNameString(structure, useHLSLRowMajorPacking, useStd140Packing);
>     const TString declareString = (isNameless ? "struct" : "struct " + structName);
>@@ -53,7 +53,7 @@ TString Define(const TStructure &structure,
>             }
> 
>             string += "    " + fieldTypeString + " " + DecorateField(field->name(), structure) +
>-                      ArrayString(fieldType) + ";\n";
>+                      ArrayString(fieldType).data() + ";\n";
> 
>             if (padHelper)
>             {
>@@ -76,7 +76,8 @@ TString WriteParameterList(const std::vector<TType> &parameters)
>     {
>         const TType &paramType = parameters[parameter];
> 
>-        parameterList += TypeString(paramType) + " x" + str(parameter) + ArrayString(paramType);
>+        parameterList +=
>+            TypeString(paramType) + " x" + str(parameter) + ArrayString(paramType).data();
> 
>         if (parameter < parameters.size() - 1u)
>         {
>@@ -91,15 +92,13 @@ TString WriteParameterList(const std::vector<TType> &parameters)
> Std140PaddingHelper::Std140PaddingHelper(const std::map<TString, int> &structElementIndexes,
>                                          unsigned *uniqueCounter)
>     : mPaddingCounter(uniqueCounter), mElementIndex(0), mStructElementIndexes(&structElementIndexes)
>-{
>-}
>+{}
> 
> Std140PaddingHelper::Std140PaddingHelper(const Std140PaddingHelper &other)
>     : mPaddingCounter(other.mPaddingCounter),
>       mElementIndex(other.mElementIndex),
>       mStructElementIndexes(other.mStructElementIndexes)
>-{
>-}
>+{}
> 
> Std140PaddingHelper &Std140PaddingHelper::operator=(const Std140PaddingHelper &other)
> {
>@@ -173,7 +172,7 @@ TString Std140PaddingHelper::postPaddingString(const TType &type, bool useHLSLRo
>         return "";
>     }
> 
>-    int numComponents     = 0;
>+    int numComponents           = 0;
>     const TStructure *structure = type.getStruct();
> 
>     if (type.isMatrix())
>@@ -214,9 +213,7 @@ TString Std140PaddingHelper::postPaddingString(const TType &type, bool useHLSLRo
>     return padding;
> }
> 
>-StructureHLSL::StructureHLSL() : mUniquePaddingCounter(0)
>-{
>-}
>+StructureHLSL::StructureHLSL() : mUniquePaddingCounter(0) {}
> 
> Std140PaddingHelper StructureHLSL::getPaddingHelper()
> {
>@@ -441,7 +438,7 @@ TString StructureHLSL::addBuiltInConstructor(const TType &type, const TIntermSeq
>     else
>     {
>         size_t remainingComponents = ctorType.getObjectSize();
>-        size_t parameterIndex = 0;
>+        size_t parameterIndex      = 0;
> 
>         while (remainingComponents > 0)
>         {
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/StructureHLSL.h b/Source/ThirdParty/ANGLE/src/compiler/translator/StructureHLSL.h
>index daced8f8d1f..ba4a8d11bce 100644
>--- a/Source/ThirdParty/ANGLE/src/compiler/translator/StructureHLSL.h
>+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/StructureHLSL.h
>@@ -67,7 +67,7 @@ class StructureHLSL : angle::NonCopyable
> 
>     struct TStructProperties : public angle::NonCopyable
>     {
>-        POOL_ALLOCATOR_NEW_DELETE();
>+        POOL_ALLOCATOR_NEW_DELETE
> 
>         TStructProperties() {}
> 
>@@ -93,6 +93,6 @@ class StructureHLSL : angle::NonCopyable
>                             bool useStd140Packing);
>     DefinedStructs::iterator defineVariants(const TStructure &structure, const TString &name);
> };
>-}
>+}  // namespace sh
> 
> #endif  // COMPILER_TRANSLATOR_STRUCTUREHLSL_H_
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/Symbol.cpp b/Source/ThirdParty/ANGLE/src/compiler/translator/Symbol.cpp
>new file mode 100644
>index 00000000000..52ad4f319d1
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/Symbol.cpp
>@@ -0,0 +1,238 @@
>+//
>+// Copyright (c) 2017 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// Symbol.cpp: Symbols representing variables, functions, structures and interface blocks.
>+//
>+
>+#if defined(_MSC_VER)
>+#    pragma warning(disable : 4718)
>+#endif
>+
>+#include "compiler/translator/Symbol.h"
>+
>+#include "compiler/translator/ImmutableStringBuilder.h"
>+#include "compiler/translator/SymbolTable.h"
>+
>+namespace sh
>+{
>+
>+namespace
>+{
>+
>+constexpr const ImmutableString kMainName("main");
>+constexpr const ImmutableString kImageLoadName("imageLoad");
>+constexpr const ImmutableString kImageStoreName("imageStore");
>+constexpr const ImmutableString kImageSizeName("imageSize");
>+constexpr const ImmutableString kAtomicCounterName("atomicCounter");
>+
>+static const char kFunctionMangledNameSeparator = '(';
>+
>+}  // anonymous namespace
>+
>+TSymbol::TSymbol(TSymbolTable *symbolTable,
>+                 const ImmutableString &name,
>+                 SymbolType symbolType,
>+                 SymbolClass symbolClass,
>+                 TExtension extension)
>+    : mName(name),
>+      mUniqueId(symbolTable->nextUniqueId()),
>+      mSymbolType(symbolType),
>+      mExtension(extension),
>+      mSymbolClass(symbolClass)
>+{
>+    ASSERT(mSymbolType == SymbolType::BuiltIn || mExtension == TExtension::UNDEFINED);
>+    ASSERT(mName != "" || mSymbolType == SymbolType::AngleInternal ||
>+           mSymbolType == SymbolType::Empty);
>+}
>+
>+ImmutableString TSymbol::name() const
>+{
>+    if (!mName.empty())
>+    {
>+        return mName;
>+    }
>+    // This can be called for nameless function parameters in HLSL.
>+    ASSERT(mSymbolType == SymbolType::AngleInternal ||
>+           (mSymbolType == SymbolType::Empty && isVariable()));
>+    int uniqueId = mUniqueId.get();
>+    ImmutableStringBuilder symbolNameOut(sizeof(uniqueId) * 2u + 1u);
>+    symbolNameOut << 's';
>+    symbolNameOut.appendHex(mUniqueId.get());
>+    return symbolNameOut;
>+}
>+
>+ImmutableString TSymbol::getMangledName() const
>+{
>+    if (mSymbolClass == SymbolClass::Function)
>+    {
>+        // We do this instead of using proper virtual functions so that we can better support
>+        // constexpr symbols.
>+        return static_cast<const TFunction *>(this)->getFunctionMangledName();
>+    }
>+    ASSERT(mSymbolType != SymbolType::Empty);
>+    return name();
>+}
>+
>+TVariable::TVariable(TSymbolTable *symbolTable,
>+                     const ImmutableString &name,
>+                     const TType *type,
>+                     SymbolType symbolType,
>+                     TExtension extension)
>+    : TSymbol(symbolTable, name, symbolType, SymbolClass::Variable, extension),
>+      mType(type),
>+      unionArray(nullptr)
>+{
>+    ASSERT(mType);
>+    ASSERT(name.empty() || symbolType != SymbolType::Empty);
>+}
>+
>+TStructure::TStructure(TSymbolTable *symbolTable,
>+                       const ImmutableString &name,
>+                       const TFieldList *fields,
>+                       SymbolType symbolType)
>+    : TSymbol(symbolTable, name, symbolType, SymbolClass::Struct), TFieldListCollection(fields)
>+{}
>+
>+TStructure::TStructure(const TSymbolUniqueId &id,
>+                       const ImmutableString &name,
>+                       TExtension extension,
>+                       const TFieldList *fields)
>+    : TSymbol(id, name, SymbolType::BuiltIn, extension, SymbolClass::Struct),
>+      TFieldListCollection(fields)
>+{}
>+
>+void TStructure::createSamplerSymbols(const char *namePrefix,
>+                                      const TString &apiNamePrefix,
>+                                      TVector<const TVariable *> *outputSymbols,
>+                                      TMap<const TVariable *, TString> *outputSymbolsToAPINames,
>+                                      TSymbolTable *symbolTable) const
>+{
>+    ASSERT(containsSamplers());
>+    for (const auto *field : *mFields)
>+    {
>+        const TType *fieldType = field->type();
>+        if (IsSampler(fieldType->getBasicType()) || fieldType->isStructureContainingSamplers())
>+        {
>+            std::stringstream fieldName = sh::InitializeStream<std::stringstream>();
>+            fieldName << namePrefix << "_" << field->name();
>+            TString fieldApiName = apiNamePrefix + ".";
>+            fieldApiName += field->name().data();
>+            fieldType->createSamplerSymbols(ImmutableString(fieldName.str()), fieldApiName,
>+                                            outputSymbols, outputSymbolsToAPINames, symbolTable);
>+        }
>+    }
>+}
>+
>+void TStructure::setName(const ImmutableString &name)
>+{
>+    ImmutableString *mutableName = const_cast<ImmutableString *>(&mName);
>+    *mutableName                 = name;
>+}
>+
>+TInterfaceBlock::TInterfaceBlock(TSymbolTable *symbolTable,
>+                                 const ImmutableString &name,
>+                                 const TFieldList *fields,
>+                                 const TLayoutQualifier &layoutQualifier,
>+                                 SymbolType symbolType,
>+                                 TExtension extension)
>+    : TSymbol(symbolTable, name, symbolType, SymbolClass::InterfaceBlock, extension),
>+      TFieldListCollection(fields),
>+      mBlockStorage(layoutQualifier.blockStorage),
>+      mBinding(layoutQualifier.binding)
>+{
>+    ASSERT(name != nullptr);
>+}
>+
>+TInterfaceBlock::TInterfaceBlock(const TSymbolUniqueId &id,
>+                                 const ImmutableString &name,
>+                                 TExtension extension,
>+                                 const TFieldList *fields)
>+    : TSymbol(id, name, SymbolType::BuiltIn, extension, SymbolClass::InterfaceBlock),
>+      TFieldListCollection(fields),
>+      mBlockStorage(EbsUnspecified),
>+      mBinding(0)
>+{}
>+
>+TFunction::TFunction(TSymbolTable *symbolTable,
>+                     const ImmutableString &name,
>+                     SymbolType symbolType,
>+                     const TType *retType,
>+                     bool knownToNotHaveSideEffects)
>+    : TSymbol(symbolTable, name, symbolType, SymbolClass::Function, TExtension::UNDEFINED),
>+      mParametersVector(new TParamVector()),
>+      mParameters(nullptr),
>+      mParamCount(0u),
>+      returnType(retType),
>+      mMangledName(""),
>+      mOp(EOpNull),
>+      defined(false),
>+      mHasPrototypeDeclaration(false),
>+      mKnownToNotHaveSideEffects(knownToNotHaveSideEffects)
>+{
>+    // Functions with an empty name are not allowed.
>+    ASSERT(symbolType != SymbolType::Empty);
>+    ASSERT(name != nullptr || symbolType == SymbolType::AngleInternal);
>+}
>+
>+void TFunction::addParameter(const TVariable *p)
>+{
>+    ASSERT(mParametersVector);
>+    mParametersVector->push_back(p);
>+    mParameters  = mParametersVector->data();
>+    mParamCount  = mParametersVector->size();
>+    mMangledName = kEmptyImmutableString;
>+}
>+
>+void TFunction::shareParameters(const TFunction &parametersSource)
>+{
>+    mParametersVector = nullptr;
>+    mParameters       = parametersSource.mParameters;
>+    mParamCount       = parametersSource.mParamCount;
>+    ASSERT(parametersSource.name() == name());
>+    mMangledName = parametersSource.mMangledName;
>+}
>+
>+ImmutableString TFunction::buildMangledName() const
>+{
>+    std::string newName(name().data(), name().length());
>+    newName += kFunctionMangledNameSeparator;
>+
>+    for (size_t i = 0u; i < mParamCount; ++i)
>+    {
>+        newName += mParameters[i]->getType().getMangledName();
>+    }
>+    return ImmutableString(newName);
>+}
>+
>+bool TFunction::isMain() const
>+{
>+    return symbolType() == SymbolType::UserDefined && name() == kMainName;
>+}
>+
>+bool TFunction::isImageFunction() const
>+{
>+    return symbolType() == SymbolType::BuiltIn &&
>+           (name() == kImageSizeName || name() == kImageLoadName || name() == kImageStoreName);
>+}
>+
>+bool TFunction::isAtomicCounterFunction() const
>+{
>+    return SymbolType() == SymbolType::BuiltIn && name().beginsWith(kAtomicCounterName);
>+}
>+
>+bool TFunction::hasSamplerInStructParams() const
>+{
>+    for (size_t paramIndex = 0; paramIndex < mParamCount; ++paramIndex)
>+    {
>+        const TVariable *param = getParam(paramIndex);
>+        if (param->getType().isStructureContainingSamplers())
>+        {
>+            return true;
>+        }
>+    }
>+
>+    return false;
>+}
>+}  // namespace sh
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/Symbol.h b/Source/ThirdParty/ANGLE/src/compiler/translator/Symbol.h
>new file mode 100644
>index 00000000000..3b74a0baa4f
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/Symbol.h
>@@ -0,0 +1,277 @@
>+//
>+// Copyright (c) 2017 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// Symbol.h: Symbols representing variables, functions, structures and interface blocks.
>+//
>+
>+#ifndef COMPILER_TRANSLATOR_SYMBOL_H_
>+#define COMPILER_TRANSLATOR_SYMBOL_H_
>+
>+#include "common/angleutils.h"
>+#include "compiler/translator/ExtensionBehavior.h"
>+#include "compiler/translator/ImmutableString.h"
>+#include "compiler/translator/IntermNode.h"
>+#include "compiler/translator/SymbolUniqueId.h"
>+
>+namespace sh
>+{
>+
>+class TSymbolTable;
>+
>+// Symbol base class. (Can build functions or variables out of these...)
>+class TSymbol : angle::NonCopyable
>+{
>+  public:
>+    POOL_ALLOCATOR_NEW_DELETE
>+    TSymbol(TSymbolTable *symbolTable,
>+            const ImmutableString &name,
>+            SymbolType symbolType,
>+            SymbolClass symbolClass,
>+            TExtension extension = TExtension::UNDEFINED);
>+
>+    // Note that we can't have a virtual destructor in order to support constexpr symbols. Data is
>+    // either statically allocated or pool allocated.
>+    ~TSymbol() = default;
>+
>+    // Calling name() for empty symbols (symbolType == SymbolType::Empty) generates a similar name
>+    // as for internal variables.
>+    ImmutableString name() const;
>+    // Don't call getMangledName() for empty symbols (symbolType == SymbolType::Empty).
>+    ImmutableString getMangledName() const;
>+
>+    bool isFunction() const { return mSymbolClass == SymbolClass::Function; }
>+    bool isVariable() const { return mSymbolClass == SymbolClass::Variable; }
>+    bool isStruct() const { return mSymbolClass == SymbolClass::Struct; }
>+    bool isInterfaceBlock() const { return mSymbolClass == SymbolClass::InterfaceBlock; }
>+
>+    const TSymbolUniqueId &uniqueId() const { return mUniqueId; }
>+    SymbolType symbolType() const { return mSymbolType; }
>+    TExtension extension() const { return mExtension; }
>+
>+  protected:
>+    constexpr TSymbol(const TSymbolUniqueId &id,
>+                      const ImmutableString &name,
>+                      SymbolType symbolType,
>+                      TExtension extension,
>+                      SymbolClass symbolClass)
>+        : mName(name),
>+          mUniqueId(id),
>+          mSymbolType(symbolType),
>+          mExtension(extension),
>+          mSymbolClass(symbolClass)
>+    {}
>+
>+    const ImmutableString mName;
>+
>+  private:
>+    const TSymbolUniqueId mUniqueId;
>+    const SymbolType mSymbolType;
>+    const TExtension mExtension;
>+
>+    // We use this instead of having virtual functions for querying the class in order to support
>+    // constexpr symbols.
>+    const SymbolClass mSymbolClass;
>+};
>+
>+// Variable.
>+// May store the value of a constant variable of any type (float, int, bool or struct).
>+class TVariable : public TSymbol
>+{
>+  public:
>+    TVariable(TSymbolTable *symbolTable,
>+              const ImmutableString &name,
>+              const TType *type,
>+              SymbolType symbolType,
>+              TExtension ext = TExtension::UNDEFINED);
>+
>+    const TType &getType() const { return *mType; }
>+
>+    const TConstantUnion *getConstPointer() const { return unionArray; }
>+
>+    void shareConstPointer(const TConstantUnion *constArray) { unionArray = constArray; }
>+
>+    // Note: only to be used for built-in variables with autogenerated ids!
>+    constexpr TVariable(const TSymbolUniqueId &id,
>+                        const ImmutableString &name,
>+                        SymbolType symbolType,
>+                        TExtension extension,
>+                        const TType *type)
>+        : TSymbol(id, name, symbolType, extension, SymbolClass::Variable),
>+          mType(type),
>+          unionArray(nullptr)
>+    {}
>+
>+  private:
>+    const TType *mType;
>+    const TConstantUnion *unionArray;
>+};
>+
>+// Struct type.
>+class TStructure : public TSymbol, public TFieldListCollection
>+{
>+  public:
>+    TStructure(TSymbolTable *symbolTable,
>+               const ImmutableString &name,
>+               const TFieldList *fields,
>+               SymbolType symbolType);
>+
>+    // The char arrays passed in must be pool allocated or static.
>+    void createSamplerSymbols(const char *namePrefix,
>+                              const TString &apiNamePrefix,
>+                              TVector<const TVariable *> *outputSymbols,
>+                              TMap<const TVariable *, TString> *outputSymbolsToAPINames,
>+                              TSymbolTable *symbolTable) const;
>+
>+    void setAtGlobalScope(bool atGlobalScope) { mAtGlobalScope = atGlobalScope; }
>+    bool atGlobalScope() const { return mAtGlobalScope; }
>+
>+  private:
>+    friend class TSymbolTable;
>+    // For creating built-in structs.
>+    TStructure(const TSymbolUniqueId &id,
>+               const ImmutableString &name,
>+               TExtension extension,
>+               const TFieldList *fields);
>+
>+    // TODO(zmo): Find a way to get rid of the const_cast in function
>+    // setName().  At the moment keep this function private so only
>+    // friend class RegenerateStructNames may call it.
>+    friend class RegenerateStructNames;
>+    void setName(const ImmutableString &name);
>+
>+    bool mAtGlobalScope;
>+};
>+
>+// Interface block. Note that this contains the block name, not the instance name. Interface block
>+// instances are stored as TVariable.
>+class TInterfaceBlock : public TSymbol, public TFieldListCollection
>+{
>+  public:
>+    TInterfaceBlock(TSymbolTable *symbolTable,
>+                    const ImmutableString &name,
>+                    const TFieldList *fields,
>+                    const TLayoutQualifier &layoutQualifier,
>+                    SymbolType symbolType,
>+                    TExtension extension = TExtension::UNDEFINED);
>+
>+    TLayoutBlockStorage blockStorage() const { return mBlockStorage; }
>+    int blockBinding() const { return mBinding; }
>+
>+  private:
>+    friend class TSymbolTable;
>+    // For creating built-in interface blocks.
>+    TInterfaceBlock(const TSymbolUniqueId &id,
>+                    const ImmutableString &name,
>+                    TExtension extension,
>+                    const TFieldList *fields);
>+
>+    TLayoutBlockStorage mBlockStorage;
>+    int mBinding;
>+
>+    // Note that we only record matrix packing on a per-field granularity.
>+};
>+
>+// Parameter class used for parsing user-defined function parameters.
>+struct TParameter
>+{
>+    // Destructively converts to TVariable.
>+    // This method resets name and type to nullptrs to make sure
>+    // their content cannot be modified after the call.
>+    const TVariable *createVariable(TSymbolTable *symbolTable)
>+    {
>+        const ImmutableString constName(name);
>+        const TType *constType = type;
>+        name                   = nullptr;
>+        type                   = nullptr;
>+        return new TVariable(symbolTable, constName, constType,
>+                             constName.empty() ? SymbolType::Empty : SymbolType::UserDefined);
>+    }
>+
>+    const char *name;  // either pool allocated or static.
>+    TType *type;
>+};
>+
>+// The function sub-class of a symbol.
>+class TFunction : public TSymbol
>+{
>+  public:
>+    // User-defined function
>+    TFunction(TSymbolTable *symbolTable,
>+              const ImmutableString &name,
>+              SymbolType symbolType,
>+              const TType *retType,
>+              bool knownToNotHaveSideEffects);
>+
>+    void addParameter(const TVariable *p);
>+    void shareParameters(const TFunction &parametersSource);
>+
>+    ImmutableString getFunctionMangledName() const
>+    {
>+        ASSERT(symbolType() != SymbolType::BuiltIn);
>+        if (mMangledName.empty())
>+        {
>+            mMangledName = buildMangledName();
>+        }
>+        return mMangledName;
>+    }
>+
>+    const TType &getReturnType() const { return *returnType; }
>+
>+    TOperator getBuiltInOp() const { return mOp; }
>+
>+    void setDefined() { defined = true; }
>+    bool isDefined() { return defined; }
>+    void setHasPrototypeDeclaration() { mHasPrototypeDeclaration = true; }
>+    bool hasPrototypeDeclaration() const { return mHasPrototypeDeclaration; }
>+
>+    size_t getParamCount() const { return mParamCount; }
>+    const TVariable *getParam(size_t i) const { return mParameters[i]; }
>+
>+    bool isKnownToNotHaveSideEffects() const { return mKnownToNotHaveSideEffects; }
>+
>+    bool isMain() const;
>+    bool isImageFunction() const;
>+    bool isAtomicCounterFunction() const;
>+    bool hasSamplerInStructParams() const;
>+
>+    // Note: Only to be used for static built-in functions!
>+    constexpr TFunction(const TSymbolUniqueId &id,
>+                        const ImmutableString &name,
>+                        TExtension extension,
>+                        const TVariable *const *parameters,
>+                        size_t paramCount,
>+                        const TType *retType,
>+                        TOperator op,
>+                        bool knownToNotHaveSideEffects)
>+        : TSymbol(id, name, SymbolType::BuiltIn, extension, SymbolClass::Function),
>+          mParametersVector(nullptr),
>+          mParameters(parameters),
>+          mParamCount(paramCount),
>+          returnType(retType),
>+          mMangledName(nullptr),
>+          mOp(op),
>+          defined(false),
>+          mHasPrototypeDeclaration(false),
>+          mKnownToNotHaveSideEffects(knownToNotHaveSideEffects)
>+    {}
>+
>+  private:
>+    ImmutableString buildMangledName() const;
>+
>+    typedef TVector<const TVariable *> TParamVector;
>+    TParamVector *mParametersVector;
>+    const TVariable *const *mParameters;
>+    size_t mParamCount;
>+    const TType *const returnType;
>+    mutable ImmutableString mMangledName;
>+    const TOperator mOp;  // Only set for built-ins
>+    bool defined;
>+    bool mHasPrototypeDeclaration;
>+    bool mKnownToNotHaveSideEffects;
>+};
>+
>+}  // namespace sh
>+
>+#endif  // COMPILER_TRANSLATOR_SYMBOL_H_
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/SymbolTable.cpp b/Source/ThirdParty/ANGLE/src/compiler/translator/SymbolTable.cpp
>index 6c384614698..73e40d88c41 100644
>--- a/Source/ThirdParty/ANGLE/src/compiler/translator/SymbolTable.cpp
>+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/SymbolTable.cpp
>@@ -8,551 +8,281 @@
> //
> 
> #if defined(_MSC_VER)
>-#pragma warning(disable : 4718)
>+#    pragma warning(disable : 4718)
> #endif
> 
> #include "compiler/translator/SymbolTable.h"
> 
>-#include "compiler/translator/Cache.h"
>+#include "angle_gl.h"
>+#include "compiler/translator/ImmutableString.h"
> #include "compiler/translator/IntermNode.h"
>-
>-#include <stdio.h>
>-#include <algorithm>
>+#include "compiler/translator/StaticType.h"
> 
> namespace sh
> {
> 
>-namespace
>+class TSymbolTable::TSymbolTableLevel
> {
>+  public:
>+    TSymbolTableLevel() = default;
> 
>-static const char kFunctionMangledNameSeparator = '(';
>+    bool insert(TSymbol *symbol);
> 
>-}  // anonymous namespace
>+    // Insert a function using its unmangled name as the key.
>+    void insertUnmangled(TFunction *function);
> 
>-TSymbol::TSymbol(TSymbolTable *symbolTable, const TString *n)
>-    : uniqueId(symbolTable->nextUniqueId()), name(n), extension(TExtension::UNDEFINED)
>-{
>-}
>+    TSymbol *find(const ImmutableString &name) const;
> 
>-//
>-// Functions have buried pointers to delete.
>-//
>-TFunction::~TFunction()
>-{
>-    clearParameters();
>-}
>+  private:
>+    using tLevel        = TUnorderedMap<ImmutableString,
>+                                 TSymbol *,
>+                                 ImmutableString::FowlerNollVoHash<sizeof(size_t)>>;
>+    using tLevelPair    = const tLevel::value_type;
>+    using tInsertResult = std::pair<tLevel::iterator, bool>;
> 
>-void TFunction::clearParameters()
>-{
>-    for (TParamList::iterator i = parameters.begin(); i != parameters.end(); ++i)
>-        delete (*i).type;
>-    parameters.clear();
>-    mangledName = nullptr;
>-}
>+    tLevel level;
>+};
> 
>-void TFunction::swapParameters(const TFunction &parametersSource)
>-{
>-    clearParameters();
>-    for (auto parameter : parametersSource.parameters)
>-    {
>-        addParameter(parameter);
>-    }
>-}
>-
>-const TString *TFunction::buildMangledName() const
>-{
>-    std::string newName = getName().c_str();
>-    newName += kFunctionMangledNameSeparator;
>-
>-    for (const auto &p : parameters)
>-    {
>-        newName += p.type->getMangledName();
>-    }
>-    return NewPoolTString(newName.c_str());
>-}
>-
>-const TString &TFunction::GetMangledNameFromCall(const TString &functionName,
>-                                                 const TIntermSequence &arguments)
>-{
>-    std::string newName = functionName.c_str();
>-    newName += kFunctionMangledNameSeparator;
>-
>-    for (TIntermNode *argument : arguments)
>-    {
>-        newName += argument->getAsTyped()->getType().getMangledName();
>-    }
>-    return *NewPoolTString(newName.c_str());
>-}
>-
>-//
>-// Symbol table levels are a map of pointers to symbols that have to be deleted.
>-//
>-TSymbolTableLevel::~TSymbolTableLevel()
>-{
>-    for (tLevel::iterator it = level.begin(); it != level.end(); ++it)
>-        delete (*it).second;
>-}
>-
>-bool TSymbolTableLevel::insert(TSymbol *symbol)
>+bool TSymbolTable::TSymbolTableLevel::insert(TSymbol *symbol)
> {
>     // returning true means symbol was added to the table
>     tInsertResult result = level.insert(tLevelPair(symbol->getMangledName(), symbol));
>-
>     return result.second;
> }
> 
>-bool TSymbolTableLevel::insertUnmangled(TFunction *function)
>+void TSymbolTable::TSymbolTableLevel::insertUnmangled(TFunction *function)
> {
>-    // returning true means symbol was added to the table
>-    tInsertResult result = level.insert(tLevelPair(function->getName(), function));
>-
>-    return result.second;
>+    level.insert(tLevelPair(function->name(), function));
> }
> 
>-TSymbol *TSymbolTableLevel::find(const TString &name) const
>+TSymbol *TSymbolTable::TSymbolTableLevel::find(const ImmutableString &name) const
> {
>     tLevel::const_iterator it = level.find(name);
>     if (it == level.end())
>-        return 0;
>+        return nullptr;
>     else
>         return (*it).second;
> }
> 
>-TSymbol *TSymbolTable::find(const TString &name,
>-                            int shaderVersion,
>-                            bool *builtIn,
>-                            bool *sameScope) const
>-{
>-    int level = currentLevel();
>-    TSymbol *symbol;
>+TSymbolTable::TSymbolTable()
>+    : mGlobalInvariant(false),
>+      mUniqueIdCounter(0),
>+      mShaderType(GL_FRAGMENT_SHADER),
>+      mGlInVariableWithArraySize(nullptr)
>+{}
> 
>-    do
>-    {
>-        if (level == GLSL_BUILTINS)
>-            level--;
>-        if (level == ESSL3_1_BUILTINS && shaderVersion != 310)
>-            level--;
>-        if (level == ESSL3_BUILTINS && shaderVersion < 300)
>-            level--;
>-        if (level == ESSL1_BUILTINS && shaderVersion != 100)
>-            level--;
>-
>-        symbol = table[level]->find(name);
>-    } while (symbol == 0 && --level >= 0);
>-
>-    if (builtIn)
>-        *builtIn = (level <= LAST_BUILTIN_LEVEL);
>-    if (sameScope)
>-        *sameScope = (level == currentLevel());
>+TSymbolTable::~TSymbolTable() = default;
> 
>-    return symbol;
>+bool TSymbolTable::isEmpty() const
>+{
>+    return mTable.empty();
> }
> 
>-TSymbol *TSymbolTable::findGlobal(const TString &name) const
>+bool TSymbolTable::atGlobalLevel() const
> {
>-    ASSERT(table.size() > GLOBAL_LEVEL);
>-    return table[GLOBAL_LEVEL]->find(name);
>+    return mTable.size() == 1u;
> }
> 
>-TSymbol *TSymbolTable::findBuiltIn(const TString &name, int shaderVersion) const
>+void TSymbolTable::push()
> {
>-    return findBuiltIn(name, shaderVersion, false);
>+    mTable.emplace_back(new TSymbolTableLevel);
>+    mPrecisionStack.emplace_back(new PrecisionStackLevel);
> }
> 
>-TSymbol *TSymbolTable::findBuiltIn(const TString &name,
>-                                   int shaderVersion,
>-                                   bool includeGLSLBuiltins) const
>+void TSymbolTable::pop()
> {
>-    for (int level = LAST_BUILTIN_LEVEL; level >= 0; level--)
>-    {
>-        if (level == GLSL_BUILTINS && !includeGLSLBuiltins)
>-            level--;
>-        if (level == ESSL3_1_BUILTINS && shaderVersion != 310)
>-            level--;
>-        if (level == ESSL3_BUILTINS && shaderVersion < 300)
>-            level--;
>-        if (level == ESSL1_BUILTINS && shaderVersion != 100)
>-            level--;
>-
>-        TSymbol *symbol = table[level]->find(name);
>-
>-        if (symbol)
>-            return symbol;
>-    }
>-
>-    return nullptr;
>+    mTable.pop_back();
>+    mPrecisionStack.pop_back();
> }
> 
>-TSymbolTable::~TSymbolTable()
>+const TFunction *TSymbolTable::markFunctionHasPrototypeDeclaration(
>+    const ImmutableString &mangledName,
>+    bool *hadPrototypeDeclarationOut) const
> {
>-    while (table.size() > 0)
>-        pop();
>+    TFunction *function         = findUserDefinedFunction(mangledName);
>+    *hadPrototypeDeclarationOut = function->hasPrototypeDeclaration();
>+    function->setHasPrototypeDeclaration();
>+    return function;
> }
> 
>-bool IsGenType(const TType *type)
>+const TFunction *TSymbolTable::setFunctionParameterNamesFromDefinition(const TFunction *function,
>+                                                                       bool *wasDefinedOut) const
> {
>-    if (type)
>+    TFunction *firstDeclaration = findUserDefinedFunction(function->getMangledName());
>+    ASSERT(firstDeclaration);
>+    // Note: 'firstDeclaration' could be 'function' if this is the first time we've seen function as
>+    // it would have just been put in the symbol table. Otherwise, we're looking up an earlier
>+    // occurance.
>+    if (function != firstDeclaration)
>     {
>-        TBasicType basicType = type->getBasicType();
>-        return basicType == EbtGenType || basicType == EbtGenIType || basicType == EbtGenUType ||
>-               basicType == EbtGenBType;
>+        // The previous declaration should have the same parameters as the function definition
>+        // (parameter names may differ).
>+        firstDeclaration->shareParameters(*function);
>     }
> 
>-    return false;
>+    *wasDefinedOut = firstDeclaration->isDefined();
>+    firstDeclaration->setDefined();
>+    return firstDeclaration;
> }
> 
>-bool IsVecType(const TType *type)
>+bool TSymbolTable::setGlInArraySize(unsigned int inputArraySize)
> {
>-    if (type)
>+    if (mGlInVariableWithArraySize)
>     {
>-        TBasicType basicType = type->getBasicType();
>-        return basicType == EbtVec || basicType == EbtIVec || basicType == EbtUVec ||
>-               basicType == EbtBVec;
>+        return mGlInVariableWithArraySize->getType().getOutermostArraySize() == inputArraySize;
>     }
>-
>-    return false;
>+    const TInterfaceBlock *glPerVertex = mVar_gl_PerVertex;
>+    TType *glInType = new TType(glPerVertex, EvqPerVertexIn, TLayoutQualifier::Create());
>+    glInType->makeArray(inputArraySize);
>+    mGlInVariableWithArraySize =
>+        new TVariable(this, ImmutableString("gl_in"), glInType, SymbolType::BuiltIn,
>+                      TExtension::EXT_geometry_shader);
>+    return true;
> }
> 
>-const TType *SpecificType(const TType *type, int size)
>+TVariable *TSymbolTable::getGlInVariableWithArraySize() const
> {
>-    ASSERT(size >= 1 && size <= 4);
>-
>-    if (!type)
>-    {
>-        return nullptr;
>-    }
>-
>-    ASSERT(!IsVecType(type));
>+    return mGlInVariableWithArraySize;
>+}
> 
>-    switch (type->getBasicType())
>-    {
>-        case EbtGenType:
>-            return TCache::getType(EbtFloat, type->getQualifier(),
>-                                   static_cast<unsigned char>(size));
>-        case EbtGenIType:
>-            return TCache::getType(EbtInt, type->getQualifier(), static_cast<unsigned char>(size));
>-        case EbtGenUType:
>-            return TCache::getType(EbtUInt, type->getQualifier(), static_cast<unsigned char>(size));
>-        case EbtGenBType:
>-            return TCache::getType(EbtBool, type->getQualifier(), static_cast<unsigned char>(size));
>-        default:
>-            return type;
>-    }
>+const TVariable *TSymbolTable::gl_FragData() const
>+{
>+    return mVar_gl_FragData;
> }
> 
>-const TType *VectorType(const TType *type, int size)
>+const TVariable *TSymbolTable::gl_SecondaryFragDataEXT() const
> {
>-    ASSERT(size >= 2 && size <= 4);
>+    return mVar_gl_SecondaryFragDataEXT;
>+}
> 
>-    if (!type)
>+TSymbolTable::VariableMetadata *TSymbolTable::getOrCreateVariableMetadata(const TVariable &variable)
>+{
>+    int id    = variable.uniqueId().get();
>+    auto iter = mVariableMetadata.find(id);
>+    if (iter == mVariableMetadata.end())
>     {
>-        return nullptr;
>+        iter = mVariableMetadata.insert(std::make_pair(id, VariableMetadata())).first;
>     }
>+    return &iter->second;
>+}
> 
>-    ASSERT(!IsGenType(type));
>-
>-    switch (type->getBasicType())
>-    {
>-        case EbtVec:
>-            return TCache::getType(EbtFloat, static_cast<unsigned char>(size));
>-        case EbtIVec:
>-            return TCache::getType(EbtInt, static_cast<unsigned char>(size));
>-        case EbtUVec:
>-            return TCache::getType(EbtUInt, static_cast<unsigned char>(size));
>-        case EbtBVec:
>-            return TCache::getType(EbtBool, static_cast<unsigned char>(size));
>-        default:
>-            return type;
>-    }
>+void TSymbolTable::markStaticWrite(const TVariable &variable)
>+{
>+    auto metadata         = getOrCreateVariableMetadata(variable);
>+    metadata->staticWrite = true;
> }
> 
>-TVariable *TSymbolTable::declareVariable(const TString *name, const TType &type)
>+void TSymbolTable::markStaticRead(const TVariable &variable)
> {
>-    return insertVariable(currentLevel(), name, type);
>+    auto metadata        = getOrCreateVariableMetadata(variable);
>+    metadata->staticRead = true;
> }
> 
>-TVariable *TSymbolTable::declareStructType(TStructure *str)
>+bool TSymbolTable::isStaticallyUsed(const TVariable &variable) const
> {
>-    return insertStructType(currentLevel(), str);
>+    ASSERT(!variable.getConstPointer());
>+    int id    = variable.uniqueId().get();
>+    auto iter = mVariableMetadata.find(id);
>+    return iter != mVariableMetadata.end() && (iter->second.staticRead || iter->second.staticWrite);
> }
> 
>-TInterfaceBlockName *TSymbolTable::declareInterfaceBlockName(const TString *name)
>+void TSymbolTable::addInvariantVarying(const TVariable &variable)
> {
>-    TInterfaceBlockName *blockNameSymbol = new TInterfaceBlockName(this, name);
>-    if (insert(currentLevel(), blockNameSymbol))
>-    {
>-        return blockNameSymbol;
>-    }
>-    return nullptr;
>+    ASSERT(atGlobalLevel());
>+    auto metadata       = getOrCreateVariableMetadata(variable);
>+    metadata->invariant = true;
> }
> 
>-TInterfaceBlockName *TSymbolTable::insertInterfaceBlockNameExt(ESymbolLevel level,
>-                                                               TExtension ext,
>-                                                               const TString *name)
>+bool TSymbolTable::isVaryingInvariant(const TVariable &variable) const
> {
>-    TInterfaceBlockName *blockNameSymbol = new TInterfaceBlockName(this, name);
>-    if (insert(level, ext, blockNameSymbol))
>+    ASSERT(atGlobalLevel());
>+    if (mGlobalInvariant)
>     {
>-        return blockNameSymbol;
>+        return true;
>     }
>-    return nullptr;
>+    int id    = variable.uniqueId().get();
>+    auto iter = mVariableMetadata.find(id);
>+    return iter != mVariableMetadata.end() && iter->second.invariant;
> }
> 
>-TVariable *TSymbolTable::insertVariable(ESymbolLevel level, const char *name, const TType &type)
>+void TSymbolTable::setGlobalInvariant(bool invariant)
> {
>-    return insertVariable(level, NewPoolTString(name), type);
>+    ASSERT(atGlobalLevel());
>+    mGlobalInvariant = invariant;
> }
> 
>-TVariable *TSymbolTable::insertVariable(ESymbolLevel level, const TString *name, const TType &type)
>+const TSymbol *TSymbolTable::find(const ImmutableString &name, int shaderVersion) const
> {
>-    TVariable *var = new TVariable(this, name, type);
>-    if (insert(level, var))
>+    const TSymbol *userSymbol = findUserDefined(name);
>+    if (userSymbol)
>     {
>-        // Do lazy initialization for struct types, so we allocate to the current scope.
>-        if (var->getType().getBasicType() == EbtStruct)
>-        {
>-            var->getType().realize();
>-        }
>-        return var;
>+        return userSymbol;
>     }
>-    return nullptr;
>+
>+    return findBuiltIn(name, shaderVersion);
> }
> 
>-TVariable *TSymbolTable::insertVariableExt(ESymbolLevel level,
>-                                           TExtension ext,
>-                                           const char *name,
>-                                           const TType &type)
>+const TSymbol *TSymbolTable::findUserDefined(const ImmutableString &name) const
> {
>-    TVariable *var = new TVariable(this, NewPoolTString(name), type);
>-    if (insert(level, ext, var))
>+    int userDefinedLevel = static_cast<int>(mTable.size()) - 1;
>+    while (userDefinedLevel >= 0)
>     {
>-        if (var->getType().getBasicType() == EbtStruct)
>+        const TSymbol *symbol = mTable[userDefinedLevel]->find(name);
>+        if (symbol)
>         {
>-            var->getType().realize();
>+            return symbol;
>         }
>-        return var;
>+        userDefinedLevel--;
>     }
>+
>     return nullptr;
> }
> 
>-TVariable *TSymbolTable::insertStructType(ESymbolLevel level, TStructure *str)
>+TFunction *TSymbolTable::findUserDefinedFunction(const ImmutableString &name) const
> {
>-    TVariable *var = new TVariable(this, &str->name(), TType(str), true);
>-    if (insert(level, var))
>-    {
>-        var->getType().realize();
>-        return var;
>-    }
>-    return nullptr;
>+    // User-defined functions are always declared at the global level.
>+    ASSERT(!mTable.empty());
>+    return static_cast<TFunction *>(mTable[0]->find(name));
> }
> 
>-void TSymbolTable::insertBuiltIn(ESymbolLevel level,
>-                                 TOperator op,
>-                                 TExtension ext,
>-                                 const TType *rvalue,
>-                                 const char *name,
>-                                 const TType *ptype1,
>-                                 const TType *ptype2,
>-                                 const TType *ptype3,
>-                                 const TType *ptype4,
>-                                 const TType *ptype5)
>+const TSymbol *TSymbolTable::findGlobal(const ImmutableString &name) const
> {
>-    if (ptype1->getBasicType() == EbtGSampler2D)
>-    {
>-        insertUnmangledBuiltInName(name, level);
>-        bool gvec4 = (rvalue->getBasicType() == EbtGVec4);
>-        insertBuiltIn(level, gvec4 ? TCache::getType(EbtFloat, 4) : rvalue, name,
>-                      TCache::getType(EbtSampler2D), ptype2, ptype3, ptype4, ptype5);
>-        insertBuiltIn(level, gvec4 ? TCache::getType(EbtInt, 4) : rvalue, name,
>-                      TCache::getType(EbtISampler2D), ptype2, ptype3, ptype4, ptype5);
>-        insertBuiltIn(level, gvec4 ? TCache::getType(EbtUInt, 4) : rvalue, name,
>-                      TCache::getType(EbtUSampler2D), ptype2, ptype3, ptype4, ptype5);
>-    }
>-    else if (ptype1->getBasicType() == EbtGSampler3D)
>-    {
>-        insertUnmangledBuiltInName(name, level);
>-        bool gvec4 = (rvalue->getBasicType() == EbtGVec4);
>-        insertBuiltIn(level, gvec4 ? TCache::getType(EbtFloat, 4) : rvalue, name,
>-                      TCache::getType(EbtSampler3D), ptype2, ptype3, ptype4, ptype5);
>-        insertBuiltIn(level, gvec4 ? TCache::getType(EbtInt, 4) : rvalue, name,
>-                      TCache::getType(EbtISampler3D), ptype2, ptype3, ptype4, ptype5);
>-        insertBuiltIn(level, gvec4 ? TCache::getType(EbtUInt, 4) : rvalue, name,
>-                      TCache::getType(EbtUSampler3D), ptype2, ptype3, ptype4, ptype5);
>-    }
>-    else if (ptype1->getBasicType() == EbtGSamplerCube)
>-    {
>-        insertUnmangledBuiltInName(name, level);
>-        bool gvec4 = (rvalue->getBasicType() == EbtGVec4);
>-        insertBuiltIn(level, gvec4 ? TCache::getType(EbtFloat, 4) : rvalue, name,
>-                      TCache::getType(EbtSamplerCube), ptype2, ptype3, ptype4, ptype5);
>-        insertBuiltIn(level, gvec4 ? TCache::getType(EbtInt, 4) : rvalue, name,
>-                      TCache::getType(EbtISamplerCube), ptype2, ptype3, ptype4, ptype5);
>-        insertBuiltIn(level, gvec4 ? TCache::getType(EbtUInt, 4) : rvalue, name,
>-                      TCache::getType(EbtUSamplerCube), ptype2, ptype3, ptype4, ptype5);
>-    }
>-    else if (ptype1->getBasicType() == EbtGSampler2DArray)
>-    {
>-        insertUnmangledBuiltInName(name, level);
>-        bool gvec4 = (rvalue->getBasicType() == EbtGVec4);
>-        insertBuiltIn(level, gvec4 ? TCache::getType(EbtFloat, 4) : rvalue, name,
>-                      TCache::getType(EbtSampler2DArray), ptype2, ptype3, ptype4, ptype5);
>-        insertBuiltIn(level, gvec4 ? TCache::getType(EbtInt, 4) : rvalue, name,
>-                      TCache::getType(EbtISampler2DArray), ptype2, ptype3, ptype4, ptype5);
>-        insertBuiltIn(level, gvec4 ? TCache::getType(EbtUInt, 4) : rvalue, name,
>-                      TCache::getType(EbtUSampler2DArray), ptype2, ptype3, ptype4, ptype5);
>-    }
>-    else if (ptype1->getBasicType() == EbtGSampler2DMS)
>-    {
>-        insertUnmangledBuiltInName(name, level);
>-        bool gvec4 = (rvalue->getBasicType() == EbtGVec4);
>-        insertBuiltIn(level, gvec4 ? TCache::getType(EbtFloat, 4) : rvalue, name,
>-                      TCache::getType(EbtSampler2DMS), ptype2, ptype3, ptype4, ptype5);
>-        insertBuiltIn(level, gvec4 ? TCache::getType(EbtInt, 4) : rvalue, name,
>-                      TCache::getType(EbtISampler2DMS), ptype2, ptype3, ptype4, ptype5);
>-        insertBuiltIn(level, gvec4 ? TCache::getType(EbtUInt, 4) : rvalue, name,
>-                      TCache::getType(EbtUSampler2DMS), ptype2, ptype3, ptype4, ptype5);
>-    }
>-    else if (IsGImage(ptype1->getBasicType()))
>-    {
>-        insertUnmangledBuiltInName(name, level);
>-
>-        const TType *floatType    = TCache::getType(EbtFloat, 4);
>-        const TType *intType      = TCache::getType(EbtInt, 4);
>-        const TType *unsignedType = TCache::getType(EbtUInt, 4);
>-
>-        const TType *floatImage =
>-            TCache::getType(convertGImageToFloatImage(ptype1->getBasicType()));
>-        const TType *intImage = TCache::getType(convertGImageToIntImage(ptype1->getBasicType()));
>-        const TType *unsignedImage =
>-            TCache::getType(convertGImageToUnsignedImage(ptype1->getBasicType()));
>-
>-        // GLSL ES 3.10, Revision 4, 8.12 Image Functions
>-        if (rvalue->getBasicType() == EbtGVec4)
>-        {
>-            // imageLoad
>-            insertBuiltIn(level, floatType, name, floatImage, ptype2, ptype3, ptype4, ptype5);
>-            insertBuiltIn(level, intType, name, intImage, ptype2, ptype3, ptype4, ptype5);
>-            insertBuiltIn(level, unsignedType, name, unsignedImage, ptype2, ptype3, ptype4, ptype5);
>-        }
>-        else if (rvalue->getBasicType() == EbtVoid)
>-        {
>-            // imageStore
>-            insertBuiltIn(level, rvalue, name, floatImage, ptype2, floatType, ptype4, ptype5);
>-            insertBuiltIn(level, rvalue, name, intImage, ptype2, intType, ptype4, ptype5);
>-            insertBuiltIn(level, rvalue, name, unsignedImage, ptype2, unsignedType, ptype4, ptype5);
>-        }
>-        else
>-        {
>-            // imageSize
>-            insertBuiltIn(level, rvalue, name, floatImage, ptype2, ptype3, ptype4, ptype5);
>-            insertBuiltIn(level, rvalue, name, intImage, ptype2, ptype3, ptype4, ptype5);
>-            insertBuiltIn(level, rvalue, name, unsignedImage, ptype2, ptype3, ptype4, ptype5);
>-        }
>-    }
>-    else if (IsGenType(rvalue) || IsGenType(ptype1) || IsGenType(ptype2) || IsGenType(ptype3) ||
>-             IsGenType(ptype4))
>-    {
>-        ASSERT(!ptype5);
>-        insertUnmangledBuiltInName(name, level);
>-        insertBuiltIn(level, op, ext, SpecificType(rvalue, 1), name, SpecificType(ptype1, 1),
>-                      SpecificType(ptype2, 1), SpecificType(ptype3, 1), SpecificType(ptype4, 1));
>-        insertBuiltIn(level, op, ext, SpecificType(rvalue, 2), name, SpecificType(ptype1, 2),
>-                      SpecificType(ptype2, 2), SpecificType(ptype3, 2), SpecificType(ptype4, 2));
>-        insertBuiltIn(level, op, ext, SpecificType(rvalue, 3), name, SpecificType(ptype1, 3),
>-                      SpecificType(ptype2, 3), SpecificType(ptype3, 3), SpecificType(ptype4, 3));
>-        insertBuiltIn(level, op, ext, SpecificType(rvalue, 4), name, SpecificType(ptype1, 4),
>-                      SpecificType(ptype2, 4), SpecificType(ptype3, 4), SpecificType(ptype4, 4));
>-    }
>-    else if (IsVecType(rvalue) || IsVecType(ptype1) || IsVecType(ptype2) || IsVecType(ptype3))
>-    {
>-        ASSERT(!ptype4 && !ptype5);
>-        insertUnmangledBuiltInName(name, level);
>-        insertBuiltIn(level, op, ext, VectorType(rvalue, 2), name, VectorType(ptype1, 2),
>-                      VectorType(ptype2, 2), VectorType(ptype3, 2));
>-        insertBuiltIn(level, op, ext, VectorType(rvalue, 3), name, VectorType(ptype1, 3),
>-                      VectorType(ptype2, 3), VectorType(ptype3, 3));
>-        insertBuiltIn(level, op, ext, VectorType(rvalue, 4), name, VectorType(ptype1, 4),
>-                      VectorType(ptype2, 4), VectorType(ptype3, 4));
>-    }
>-    else
>-    {
>-        TFunction *function = new TFunction(this, NewPoolTString(name), rvalue, op, ext);
>-
>-        function->addParameter(TConstParameter(ptype1));
>-
>-        if (ptype2)
>-        {
>-            function->addParameter(TConstParameter(ptype2));
>-        }
>-
>-        if (ptype3)
>-        {
>-            function->addParameter(TConstParameter(ptype3));
>-        }
>-
>-        if (ptype4)
>-        {
>-            function->addParameter(TConstParameter(ptype4));
>-        }
>-
>-        if (ptype5)
>-        {
>-            function->addParameter(TConstParameter(ptype5));
>-        }
>-
>-        ASSERT(hasUnmangledBuiltInAtLevel(name, level));
>-        insert(level, function);
>-    }
>+    ASSERT(!mTable.empty());
>+    return mTable[0]->find(name);
> }
> 
>-void TSymbolTable::insertBuiltInOp(ESymbolLevel level,
>-                                   TOperator op,
>-                                   const TType *rvalue,
>-                                   const TType *ptype1,
>-                                   const TType *ptype2,
>-                                   const TType *ptype3,
>-                                   const TType *ptype4,
>-                                   const TType *ptype5)
>+bool TSymbolTable::declare(TSymbol *symbol)
> {
>-    const char *name = GetOperatorString(op);
>-    ASSERT(strlen(name) > 0);
>-    insertUnmangledBuiltInName(name, level);
>-    insertBuiltIn(level, op, TExtension::UNDEFINED, rvalue, name, ptype1, ptype2, ptype3, ptype4,
>-                  ptype5);
>+    ASSERT(!mTable.empty());
>+    ASSERT(symbol->symbolType() == SymbolType::UserDefined);
>+    ASSERT(!symbol->isFunction());
>+    return mTable.back()->insert(symbol);
> }
> 
>-void TSymbolTable::insertBuiltInOp(ESymbolLevel level,
>-                                   TOperator op,
>-                                   TExtension ext,
>-                                   const TType *rvalue,
>-                                   const TType *ptype1,
>-                                   const TType *ptype2,
>-                                   const TType *ptype3,
>-                                   const TType *ptype4,
>-                                   const TType *ptype5)
>+bool TSymbolTable::declareInternal(TSymbol *symbol)
> {
>-    const char *name = GetOperatorString(op);
>-    insertUnmangledBuiltInName(name, level);
>-    insertBuiltIn(level, op, ext, rvalue, name, ptype1, ptype2, ptype3, ptype4, ptype5);
>+    ASSERT(!mTable.empty());
>+    ASSERT(symbol->symbolType() == SymbolType::AngleInternal);
>+    ASSERT(!symbol->isFunction());
>+    return mTable.back()->insert(symbol);
> }
> 
>-void TSymbolTable::insertBuiltInFunctionNoParameters(ESymbolLevel level,
>-                                                     TOperator op,
>-                                                     const TType *rvalue,
>-                                                     const char *name)
>+void TSymbolTable::declareUserDefinedFunction(TFunction *function, bool insertUnmangledName)
> {
>-    insertUnmangledBuiltInName(name, level);
>-    insert(level, new TFunction(this, NewPoolTString(name), rvalue, op));
>+    ASSERT(!mTable.empty());
>+    if (insertUnmangledName)
>+    {
>+        // Insert the unmangled name to detect potential future redefinition as a variable.
>+        mTable[0]->insertUnmangled(function);
>+    }
>+    mTable[0]->insert(function);
> }
> 
>-void TSymbolTable::insertBuiltInFunctionNoParametersExt(ESymbolLevel level,
>-                                                        TExtension ext,
>-                                                        TOperator op,
>-                                                        const TType *rvalue,
>-                                                        const char *name)
>+void TSymbolTable::setDefaultPrecision(TBasicType type, TPrecision prec)
> {
>-    insertUnmangledBuiltInName(name, level);
>-    insert(level, new TFunction(this, NewPoolTString(name), rvalue, op, ext));
>+    int indexOfLastElement = static_cast<int>(mPrecisionStack.size()) - 1;
>+    // Uses map operator [], overwrites the current value
>+    (*mPrecisionStack[indexOfLastElement])[type] = prec;
> }
> 
> TPrecision TSymbolTable::getDefaultPrecision(TBasicType type) const
>@@ -563,14 +293,14 @@ TPrecision TSymbolTable::getDefaultPrecision(TBasicType type) const
>     // unsigned integers use the same precision as signed
>     TBasicType baseType = (type == EbtUInt) ? EbtInt : type;
> 
>-    int level = static_cast<int>(precisionStack.size()) - 1;
>-    assert(level >= 0);  // Just to be safe. Should not happen.
>+    int level = static_cast<int>(mPrecisionStack.size()) - 1;
>+    ASSERT(level >= 0);  // Just to be safe. Should not happen.
>     // If we dont find anything we return this. Some types don't have predefined default precision.
>     TPrecision prec = EbpUndefined;
>     while (level >= 0)
>     {
>-        PrecisionStackLevel::iterator it = precisionStack[level]->find(baseType);
>-        if (it != precisionStack[level]->end())
>+        PrecisionStackLevel::iterator it = mPrecisionStack[level]->find(baseType);
>+        if (it != mPrecisionStack[level]->end())
>         {
>             prec = (*it).second;
>             break;
>@@ -580,43 +310,72 @@ TPrecision TSymbolTable::getDefaultPrecision(TBasicType type) const
>     return prec;
> }
> 
>-void TSymbolTable::insertUnmangledBuiltInName(const char *name, ESymbolLevel level)
>+void TSymbolTable::clearCompilationResults()
> {
>-    ASSERT(level >= 0 && level < static_cast<ESymbolLevel>(table.size()));
>-    table[level]->insertUnmangledBuiltInName(std::string(name));
>+    mGlobalInvariant = false;
>+    mUniqueIdCounter = kLastBuiltInId + 1;
>+    mVariableMetadata.clear();
>+    mGlInVariableWithArraySize = nullptr;
>+
>+    // User-defined scopes should have already been cleared when the compilation finished.
>+    ASSERT(mTable.empty());
> }
> 
>-bool TSymbolTable::hasUnmangledBuiltInAtLevel(const char *name, ESymbolLevel level)
>+int TSymbolTable::nextUniqueIdValue()
> {
>-    ASSERT(level >= 0 && level < static_cast<ESymbolLevel>(table.size()));
>-    return table[level]->hasUnmangledBuiltIn(std::string(name));
>+    ASSERT(mUniqueIdCounter < std::numeric_limits<int>::max());
>+    return ++mUniqueIdCounter;
> }
> 
>-bool TSymbolTable::hasUnmangledBuiltInForShaderVersion(const char *name, int shaderVersion)
>+void TSymbolTable::initializeBuiltIns(sh::GLenum type,
>+                                      ShShaderSpec spec,
>+                                      const ShBuiltInResources &resources)
> {
>-    ASSERT(static_cast<ESymbolLevel>(table.size()) > LAST_BUILTIN_LEVEL);
>+    mShaderType = type;
>+    mResources  = resources;
> 
>-    for (int level = LAST_BUILTIN_LEVEL; level >= 0; --level)
>-    {
>-        if (level == ESSL3_1_BUILTINS && shaderVersion != 310)
>-        {
>-            --level;
>-        }
>-        if (level == ESSL3_BUILTINS && shaderVersion < 300)
>-        {
>-            --level;
>-        }
>-        if (level == ESSL1_BUILTINS && shaderVersion != 100)
>-        {
>-            --level;
>-        }
>+    // We need just one precision stack level for predefined precisions.
>+    mPrecisionStack.emplace_back(new PrecisionStackLevel);
> 
>-        if (table[level]->hasUnmangledBuiltIn(name))
>-        {
>-            return true;
>-        }
>+    switch (type)
>+    {
>+        case GL_FRAGMENT_SHADER:
>+            setDefaultPrecision(EbtInt, EbpMedium);
>+            break;
>+        case GL_VERTEX_SHADER:
>+        case GL_COMPUTE_SHADER:
>+        case GL_GEOMETRY_SHADER_EXT:
>+            setDefaultPrecision(EbtInt, EbpHigh);
>+            setDefaultPrecision(EbtFloat, EbpHigh);
>+            break;
>+        default:
>+            UNREACHABLE();
>     }
>-    return false;
>+    // Set defaults for sampler types that have default precision, even those that are
>+    // only available if an extension exists.
>+    // New sampler types in ESSL3 don't have default precision. ESSL1 types do.
>+    initSamplerDefaultPrecision(EbtSampler2D);
>+    initSamplerDefaultPrecision(EbtSamplerCube);
>+    // SamplerExternalOES is specified in the extension to have default precision.
>+    initSamplerDefaultPrecision(EbtSamplerExternalOES);
>+    // SamplerExternal2DY2YEXT is specified in the extension to have default precision.
>+    initSamplerDefaultPrecision(EbtSamplerExternal2DY2YEXT);
>+    // It isn't specified whether Sampler2DRect has default precision.
>+    initSamplerDefaultPrecision(EbtSampler2DRect);
>+
>+    setDefaultPrecision(EbtAtomicCounter, EbpHigh);
>+
>+    initializeBuiltInVariables(type, spec, resources);
>+    mUniqueIdCounter = kLastBuiltInId + 1;
>+}
>+
>+void TSymbolTable::initSamplerDefaultPrecision(TBasicType samplerType)
>+{
>+    ASSERT(samplerType >= EbtGuardSamplerBegin && samplerType <= EbtGuardSamplerEnd);
>+    setDefaultPrecision(samplerType, EbpLow);
> }
> 
>+TSymbolTable::VariableMetadata::VariableMetadata()
>+    : staticRead(false), staticWrite(false), invariant(false)
>+{}
> }  // namespace sh
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/SymbolTable.h b/Source/ThirdParty/ANGLE/src/compiler/translator/SymbolTable.h
>index 5d792ec188b..f984b9e694e 100644
>--- a/Source/ThirdParty/ANGLE/src/compiler/translator/SymbolTable.h
>+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/SymbolTable.h
>@@ -30,514 +30,167 @@
> //   are tracked in the intermediate representation, not the symbol table.
> //
> 
>-#include <array>
>-#include <assert.h>
>+#include <memory>
> #include <set>
> 
> #include "common/angleutils.h"
> #include "compiler/translator/ExtensionBehavior.h"
>+#include "compiler/translator/ImmutableString.h"
> #include "compiler/translator/InfoSink.h"
> #include "compiler/translator/IntermNode.h"
>-#include "compiler/translator/SymbolUniqueId.h"
>+#include "compiler/translator/Symbol.h"
>+#include "compiler/translator/SymbolTable_autogen.h"
> 
> namespace sh
> {
> 
>-// Symbol base class. (Can build functions or variables out of these...)
>-class TSymbol : angle::NonCopyable
>-{
>-  public:
>-    POOL_ALLOCATOR_NEW_DELETE();
>-    TSymbol(TSymbolTable *symbolTable, const TString *n);
>-
>-    virtual ~TSymbol()
>-    {
>-        // don't delete name, it's from the pool
>-    }
>-
>-    const TString &getName() const { return *name; }
>-    virtual const TString &getMangledName() const { return getName(); }
>-    virtual bool isFunction() const { return false; }
>-    virtual bool isVariable() const { return false; }
>-    const TSymbolUniqueId &getUniqueId() const { return uniqueId; }
>-    void relateToExtension(TExtension ext) { extension = ext; }
>-    TExtension getExtension() const { return extension; }
>-
>-  private:
>-    const TSymbolUniqueId uniqueId;
>-    const TString *name;
>-    TExtension extension;
>-};
>-
>-// Variable, meaning a symbol that's not a function.
>-//
>-// May store the value of a constant variable of any type (float, int, bool or struct).
>-class TVariable : public TSymbol
>-{
>-  public:
>-    ~TVariable() override {}
>-    bool isVariable() const override { return true; }
>-    TType &getType() { return type; }
>-    const TType &getType() const { return type; }
>-    bool isUserType() const { return userType; }
>-    void setQualifier(TQualifier qualifier) { type.setQualifier(qualifier); }
>-
>-    const TConstantUnion *getConstPointer() const { return unionArray; }
>-
>-    void shareConstPointer(const TConstantUnion *constArray) { unionArray = constArray; }
>-
>-  private:
>-    friend class TSymbolTable;
>-
>-    TVariable(TSymbolTable *symbolTable,
>-              const TString *name,
>-              const TType &t,
>-              bool isUserTypeDefinition = false)
>-        : TSymbol(symbolTable, name), type(t), userType(isUserTypeDefinition), unionArray(0)
>-    {
>-    }
>-
>-    TType type;
>-
>-    // Set to true if this represents a struct type, as opposed to a variable.
>-    bool userType;
>-
>-    // we are assuming that Pool Allocator will free the memory
>-    // allocated to unionArray when this object is destroyed.
>-    const TConstantUnion *unionArray;
>-};
>-
>-// Immutable version of TParameter.
>-struct TConstParameter
>-{
>-    TConstParameter() : name(nullptr), type(nullptr) {}
>-    explicit TConstParameter(const TString *n) : name(n), type(nullptr) {}
>-    explicit TConstParameter(const TType *t) : name(nullptr), type(t) {}
>-    TConstParameter(const TString *n, const TType *t) : name(n), type(t) {}
>-
>-    // Both constructor arguments must be const.
>-    TConstParameter(TString *n, TType *t)       = delete;
>-    TConstParameter(const TString *n, TType *t) = delete;
>-    TConstParameter(TString *n, const TType *t) = delete;
>-
>-    const TString *const name;
>-    const TType *const type;
>-};
>-
>-// The function sub-class of symbols and the parser will need to
>-// share this definition of a function parameter.
>-struct TParameter
>-{
>-    // Destructively converts to TConstParameter.
>-    // This method resets name and type to nullptrs to make sure
>-    // their content cannot be modified after the call.
>-    TConstParameter turnToConst()
>-    {
>-        const TString *constName = name;
>-        const TType *constType   = type;
>-        name                     = nullptr;
>-        type                     = nullptr;
>-        return TConstParameter(constName, constType);
>-    }
>-
>-    const TString *name;
>-    TType *type;
>-};
>-
>-// The function sub-class of a symbol.
>-class TFunction : public TSymbol
>-{
>-  public:
>-    TFunction(TSymbolTable *symbolTable,
>-              const TString *name,
>-              const TType *retType,
>-              TOperator tOp  = EOpNull,
>-              TExtension ext = TExtension::UNDEFINED)
>-        : TSymbol(symbolTable, name),
>-          returnType(retType),
>-          mangledName(nullptr),
>-          op(tOp),
>-          defined(false),
>-          mHasPrototypeDeclaration(false)
>-    {
>-        relateToExtension(ext);
>-    }
>-    ~TFunction() override;
>-    bool isFunction() const override { return true; }
>-
>-    void addParameter(const TConstParameter &p)
>-    {
>-        parameters.push_back(p);
>-        mangledName = nullptr;
>-    }
>-
>-    void swapParameters(const TFunction &parametersSource);
>-
>-    const TString &getMangledName() const override
>-    {
>-        if (mangledName == nullptr)
>-        {
>-            mangledName = buildMangledName();
>-        }
>-        return *mangledName;
>-    }
>-
>-    static const TString &GetMangledNameFromCall(const TString &functionName,
>-                                                 const TIntermSequence &arguments);
>-
>-    const TType &getReturnType() const { return *returnType; }
>-
>-    TOperator getBuiltInOp() const { return op; }
>-
>-    void setDefined() { defined = true; }
>-    bool isDefined() { return defined; }
>-    void setHasPrototypeDeclaration() { mHasPrototypeDeclaration = true; }
>-    bool hasPrototypeDeclaration() const { return mHasPrototypeDeclaration; }
>-
>-    size_t getParamCount() const { return parameters.size(); }
>-    const TConstParameter &getParam(size_t i) const { return parameters[i]; }
>-
>-  private:
>-    void clearParameters();
>-
>-    const TString *buildMangledName() const;
>-
>-    typedef TVector<TConstParameter> TParamList;
>-    TParamList parameters;
>-    const TType *returnType;
>-    mutable const TString *mangledName;
>-    TOperator op;
>-    bool defined;
>-    bool mHasPrototypeDeclaration;
>-};
>+// Define ESymbolLevel as int rather than an enum so that we can do arithmetic on it.
>+typedef int ESymbolLevel;
>+const int COMMON_BUILTINS  = 0;
>+const int ESSL1_BUILTINS   = 1;
>+const int ESSL3_BUILTINS   = 2;
>+const int ESSL3_1_BUILTINS = 3;
>+// GLSL_BUILTINS are desktop GLSL builtins that don't exist in ESSL but are used to implement
>+// features in ANGLE's GLSL backend. They're not visible to the parser.
>+const int GLSL_BUILTINS      = 4;
>+const int LAST_BUILTIN_LEVEL = GLSL_BUILTINS;
> 
>-// Interface block name sub-symbol
>-class TInterfaceBlockName : public TSymbol
>+struct UnmangledBuiltIn
> {
>-  public:
>-    virtual ~TInterfaceBlockName() {}
>+    constexpr UnmangledBuiltIn(TExtension extension) : extension(extension) {}
> 
>-  private:
>-    friend class TSymbolTable;
>-    TInterfaceBlockName(TSymbolTable *symbolTable, const TString *name) : TSymbol(symbolTable, name)
>-    {
>-    }
>+    TExtension extension;
> };
> 
>-class TSymbolTableLevel
>+class TSymbolTable : angle::NonCopyable, TSymbolTableBase
> {
>   public:
>-    typedef TUnorderedMap<TString, TSymbol *> tLevel;
>-    typedef tLevel::const_iterator const_iterator;
>-    typedef const tLevel::value_type tLevelPair;
>-    typedef std::pair<tLevel::iterator, bool> tInsertResult;
>+    TSymbolTable();
>+    // To start using the symbol table after construction:
>+    // * initializeBuiltIns() needs to be called.
>+    // * push() needs to be called to push the global level.
> 
>-    TSymbolTableLevel() : mGlobalInvariant(false) {}
>-    ~TSymbolTableLevel();
>+    ~TSymbolTable();
> 
>-    bool insert(TSymbol *symbol);
>+    bool isEmpty() const;
>+    bool atGlobalLevel() const;
> 
>-    // Insert a function using its unmangled name as the key.
>-    bool insertUnmangled(TFunction *function);
>+    void push();
>+    void pop();
> 
>-    TSymbol *find(const TString &name) const;
>+    // Declare a non-function symbol at the current scope. Return true in case the declaration was
>+    // successful, and false if the declaration failed due to redefinition.
>+    bool declare(TSymbol *symbol);
> 
>-    void addInvariantVarying(const std::string &name) { mInvariantVaryings.insert(name); }
>+    // Only used to declare internal variables.
>+    bool declareInternal(TSymbol *symbol);
> 
>-    bool isVaryingInvariant(const std::string &name)
>-    {
>-        return (mGlobalInvariant || mInvariantVaryings.count(name) > 0);
>-    }
>+    // Functions are always declared at global scope.
>+    void declareUserDefinedFunction(TFunction *function, bool insertUnmangledName);
> 
>-    void setGlobalInvariant(bool invariant) { mGlobalInvariant = invariant; }
>+    // These return the TFunction pointer to keep using to refer to this function.
>+    const TFunction *markFunctionHasPrototypeDeclaration(const ImmutableString &mangledName,
>+                                                         bool *hadPrototypeDeclarationOut) const;
>+    const TFunction *setFunctionParameterNamesFromDefinition(const TFunction *function,
>+                                                             bool *wasDefinedOut) const;
> 
>-    void insertUnmangledBuiltInName(const std::string &name)
>-    {
>-        mUnmangledBuiltInNames.insert(name);
>-    }
>+    // Return false if the gl_in array size has already been initialized with a mismatching value.
>+    bool setGlInArraySize(unsigned int inputArraySize);
>+    TVariable *getGlInVariableWithArraySize() const;
> 
>-    bool hasUnmangledBuiltIn(const std::string &name)
>-    {
>-        return mUnmangledBuiltInNames.count(name) > 0;
>-    }
>+    const TVariable *gl_FragData() const;
>+    const TVariable *gl_SecondaryFragDataEXT() const;
> 
>-  protected:
>-    tLevel level;
>-    std::set<std::string> mInvariantVaryings;
>-    bool mGlobalInvariant;
>+    void markStaticRead(const TVariable &variable);
>+    void markStaticWrite(const TVariable &variable);
> 
>-  private:
>-    std::set<std::string> mUnmangledBuiltInNames;
>-};
>+    // Note: Should not call this for constant variables.
>+    bool isStaticallyUsed(const TVariable &variable) const;
> 
>-// Define ESymbolLevel as int rather than an enum since level can go
>-// above GLOBAL_LEVEL and cause atBuiltInLevel() to fail if the
>-// compiler optimizes the >= of the last element to ==.
>-typedef int ESymbolLevel;
>-const int COMMON_BUILTINS    = 0;
>-const int ESSL1_BUILTINS     = 1;
>-const int ESSL3_BUILTINS     = 2;
>-const int ESSL3_1_BUILTINS   = 3;
>-// GLSL_BUILTINS are desktop GLSL builtins that don't exist in ESSL but are used to implement
>-// features in ANGLE's GLSL backend. They're not visible to the parser.
>-const int GLSL_BUILTINS      = 4;
>-const int LAST_BUILTIN_LEVEL = GLSL_BUILTINS;
>-const int GLOBAL_LEVEL       = 5;
>+    // find() is guaranteed not to retain a reference to the ImmutableString, so an ImmutableString
>+    // with a reference to a short-lived char * is fine to pass here.
>+    const TSymbol *find(const ImmutableString &name, int shaderVersion) const;
> 
>-class TSymbolTable : angle::NonCopyable
>-{
>-  public:
>-    TSymbolTable() : mUniqueIdCounter(0), mEmptySymbolId(this)
>-    {
>-        // The symbol table cannot be used until push() is called, but
>-        // the lack of an initial call to push() can be used to detect
>-        // that the symbol table has not been preloaded with built-ins.
>-    }
>+    const TSymbol *findUserDefined(const ImmutableString &name) const;
> 
>-    ~TSymbolTable();
>+    TFunction *findUserDefinedFunction(const ImmutableString &name) const;
> 
>-    // When the symbol table is initialized with the built-ins, there should
>-    // 'push' calls, so that built-ins are at level 0 and the shader
>-    // globals are at level 1.
>-    bool isEmpty() const { return table.empty(); }
>-    bool atBuiltInLevel() const { return currentLevel() <= LAST_BUILTIN_LEVEL; }
>-    bool atGlobalLevel() const { return currentLevel() == GLOBAL_LEVEL; }
>-    void push()
>-    {
>-        table.push_back(new TSymbolTableLevel);
>-        precisionStack.push_back(new PrecisionStackLevel);
>-    }
>+    const TSymbol *findGlobal(const ImmutableString &name) const;
> 
>-    void pop()
>-    {
>-        delete table.back();
>-        table.pop_back();
>-
>-        delete precisionStack.back();
>-        precisionStack.pop_back();
>-    }
>-
>-    // The declare* entry points are used when parsing and declare symbols at the current scope.
>-    // They return the created symbol in case the declaration was successful, and nullptr if the
>-    // declaration failed due to redefinition.
>-    TVariable *declareVariable(const TString *name, const TType &type);
>-    TVariable *declareStructType(TStructure *str);
>-    TInterfaceBlockName *declareInterfaceBlockName(const TString *name);
>-
>-    // The insert* entry points are used when initializing the symbol table with built-ins.
>-    // They return the created symbol in case the declaration was successful, and nullptr if the
>-    // declaration failed due to redefinition.
>-    TVariable *insertVariable(ESymbolLevel level, const char *name, const TType &type);
>-    TVariable *insertVariableExt(ESymbolLevel level,
>-                                 TExtension ext,
>-                                 const char *name,
>-                                 const TType &type);
>-    TVariable *insertStructType(ESymbolLevel level, TStructure *str);
>-    TInterfaceBlockName *insertInterfaceBlockNameExt(ESymbolLevel level,
>-                                                     TExtension ext,
>-                                                     const TString *name);
>-
>-    bool insertConstInt(ESymbolLevel level, const char *name, int value, TPrecision precision)
>-    {
>-        TVariable *constant =
>-            new TVariable(this, NewPoolTString(name), TType(EbtInt, precision, EvqConst, 1));
>-        TConstantUnion *unionArray = new TConstantUnion[1];
>-        unionArray[0].setIConst(value);
>-        constant->shareConstPointer(unionArray);
>-        return insert(level, constant);
>-    }
>-
>-    bool insertConstIntExt(ESymbolLevel level,
>-                           TExtension ext,
>-                           const char *name,
>-                           int value,
>-                           TPrecision precision)
>-    {
>-        TVariable *constant =
>-            new TVariable(this, NewPoolTString(name), TType(EbtInt, precision, EvqConst, 1));
>-        TConstantUnion *unionArray = new TConstantUnion[1];
>-        unionArray[0].setIConst(value);
>-        constant->shareConstPointer(unionArray);
>-        return insert(level, ext, constant);
>-    }
>-
>-    bool insertConstIvec3(ESymbolLevel level,
>-                          const char *name,
>-                          const std::array<int, 3> &values,
>-                          TPrecision precision)
>-    {
>-        TVariable *constantIvec3 =
>-            new TVariable(this, NewPoolTString(name), TType(EbtInt, precision, EvqConst, 3));
>-
>-        TConstantUnion *unionArray = new TConstantUnion[3];
>-        for (size_t index = 0u; index < 3u; ++index)
>-        {
>-            unionArray[index].setIConst(values[index]);
>-        }
>-        constantIvec3->shareConstPointer(unionArray);
>-
>-        return insert(level, constantIvec3);
>-    }
>-
>-    void insertBuiltIn(ESymbolLevel level,
>-                       TOperator op,
>-                       TExtension ext,
>-                       const TType *rvalue,
>-                       const char *name,
>-                       const TType *ptype1,
>-                       const TType *ptype2 = 0,
>-                       const TType *ptype3 = 0,
>-                       const TType *ptype4 = 0,
>-                       const TType *ptype5 = 0);
>-
>-    void insertBuiltIn(ESymbolLevel level,
>-                       const TType *rvalue,
>-                       const char *name,
>-                       const TType *ptype1,
>-                       const TType *ptype2 = 0,
>-                       const TType *ptype3 = 0,
>-                       const TType *ptype4 = 0,
>-                       const TType *ptype5 = 0)
>-    {
>-        insertUnmangledBuiltInName(name, level);
>-        insertBuiltIn(level, EOpNull, TExtension::UNDEFINED, rvalue, name, ptype1, ptype2, ptype3,
>-                      ptype4, ptype5);
>-    }
>-
>-    void insertBuiltIn(ESymbolLevel level,
>-                       TExtension ext,
>-                       const TType *rvalue,
>-                       const char *name,
>-                       const TType *ptype1,
>-                       const TType *ptype2 = 0,
>-                       const TType *ptype3 = 0,
>-                       const TType *ptype4 = 0,
>-                       const TType *ptype5 = 0)
>-    {
>-        insertUnmangledBuiltInName(name, level);
>-        insertBuiltIn(level, EOpNull, ext, rvalue, name, ptype1, ptype2, ptype3, ptype4, ptype5);
>-    }
>-
>-    void insertBuiltInOp(ESymbolLevel level,
>-                         TOperator op,
>-                         const TType *rvalue,
>-                         const TType *ptype1,
>-                         const TType *ptype2 = 0,
>-                         const TType *ptype3 = 0,
>-                         const TType *ptype4 = 0,
>-                         const TType *ptype5 = 0);
>-
>-    void insertBuiltInOp(ESymbolLevel level,
>-                         TOperator op,
>-                         TExtension ext,
>-                         const TType *rvalue,
>-                         const TType *ptype1,
>-                         const TType *ptype2 = 0,
>-                         const TType *ptype3 = 0,
>-                         const TType *ptype4 = 0,
>-                         const TType *ptype5 = 0);
>-
>-    void insertBuiltInFunctionNoParameters(ESymbolLevel level,
>-                                           TOperator op,
>-                                           const TType *rvalue,
>-                                           const char *name);
>-
>-    void insertBuiltInFunctionNoParametersExt(ESymbolLevel level,
>-                                              TExtension ext,
>-                                              TOperator op,
>-                                              const TType *rvalue,
>-                                              const char *name);
>-
>-    TSymbol *find(const TString &name,
>-                  int shaderVersion,
>-                  bool *builtIn   = nullptr,
>-                  bool *sameScope = nullptr) const;
>-
>-    TSymbol *findGlobal(const TString &name) const;
>-
>-    TSymbol *findBuiltIn(const TString &name, int shaderVersion) const;
>-
>-    TSymbol *findBuiltIn(const TString &name, int shaderVersion, bool includeGLSLBuiltins) const;
>-
>-    TSymbolTableLevel *getOuterLevel()
>-    {
>-        assert(currentLevel() >= 1);
>-        return table[currentLevel() - 1];
>-    }
>+    const TSymbol *findBuiltIn(const ImmutableString &name, int shaderVersion) const;
> 
>-    void setDefaultPrecision(TBasicType type, TPrecision prec)
>-    {
>-        int indexOfLastElement = static_cast<int>(precisionStack.size()) - 1;
>-        // Uses map operator [], overwrites the current value
>-        (*precisionStack[indexOfLastElement])[type] = prec;
>-    }
>+    void setDefaultPrecision(TBasicType type, TPrecision prec);
> 
>     // Searches down the precisionStack for a precision qualifier
>     // for the specified TBasicType
>     TPrecision getDefaultPrecision(TBasicType type) const;
> 
>-    // This records invariant varyings declared through
>-    // "invariant varying_name;".
>-    void addInvariantVarying(const std::string &originalName)
>-    {
>-        ASSERT(atGlobalLevel());
>-        table[currentLevel()]->addInvariantVarying(originalName);
>-    }
>-    // If this returns false, the varying could still be invariant
>-    // if it is set as invariant during the varying variable
>-    // declaration - this piece of information is stored in the
>-    // variable's type, not here.
>-    bool isVaryingInvariant(const std::string &originalName) const
>-    {
>-        ASSERT(atGlobalLevel());
>-        return table[currentLevel()]->isVaryingInvariant(originalName);
>-    }
>+    // This records invariant varyings declared through "invariant varying_name;".
>+    void addInvariantVarying(const TVariable &variable);
> 
>-    void setGlobalInvariant(bool invariant)
>-    {
>-        ASSERT(atGlobalLevel());
>-        table[currentLevel()]->setGlobalInvariant(invariant);
>-    }
>+    // If this returns false, the varying could still be invariant if it is set as invariant during
>+    // the varying variable declaration - this piece of information is stored in the variable's
>+    // type, not here.
>+    bool isVaryingInvariant(const TVariable &variable) const;
>+
>+    void setGlobalInvariant(bool invariant);
> 
>     const TSymbolUniqueId nextUniqueId() { return TSymbolUniqueId(this); }
> 
>-    // The empty symbol id is shared between all empty string ("") symbols. They are used in the
>-    // AST for unused function parameters and struct type declarations that don't declare a
>-    // variable, for example.
>-    const TSymbolUniqueId &getEmptySymbolId() { return mEmptySymbolId; }
>+    // Gets the built-in accessible by a shader with the specified version, if any.
>+    const UnmangledBuiltIn *getUnmangledBuiltInForShaderVersion(const ImmutableString &name,
>+                                                                int shaderVersion);
> 
>-    // Checks whether there is a built-in accessible by a shader with the specified version.
>-    bool hasUnmangledBuiltInForShaderVersion(const char *name, int shaderVersion);
>+    void initializeBuiltIns(sh::GLenum type,
>+                            ShShaderSpec spec,
>+                            const ShBuiltInResources &resources);
>+    void clearCompilationResults();
> 
>   private:
>     friend class TSymbolUniqueId;
>-    int nextUniqueIdValue() { return ++mUniqueIdCounter; }
> 
>-    ESymbolLevel currentLevel() const { return static_cast<ESymbolLevel>(table.size() - 1); }
>+    struct VariableMetadata
>+    {
>+        VariableMetadata();
>+        bool staticRead;
>+        bool staticWrite;
>+        bool invariant;
>+    };
> 
>-    TVariable *insertVariable(ESymbolLevel level, const TString *name, const TType &type);
>+    int nextUniqueIdValue();
> 
>-    bool insert(ESymbolLevel level, TSymbol *symbol) { return table[level]->insert(symbol); }
>+    class TSymbolTableLevel;
> 
>-    bool insert(ESymbolLevel level, TExtension ext, TSymbol *symbol)
>-    {
>-        symbol->relateToExtension(ext);
>-        return table[level]->insert(symbol);
>-    }
>+    void initSamplerDefaultPrecision(TBasicType samplerType);
>+
>+    void initializeBuiltInVariables(sh::GLenum shaderType,
>+                                    ShShaderSpec spec,
>+                                    const ShBuiltInResources &resources);
> 
>-    // Used to insert unmangled functions to check redeclaration of built-ins in ESSL 3.00 and
>-    // above.
>-    void insertUnmangledBuiltInName(const char *name, ESymbolLevel level);
>+    VariableMetadata *getOrCreateVariableMetadata(const TVariable &variable);
> 
>-    bool hasUnmangledBuiltInAtLevel(const char *name, ESymbolLevel level);
>+    std::vector<std::unique_ptr<TSymbolTableLevel>> mTable;
> 
>-    std::vector<TSymbolTableLevel *> table;
>+    // There's one precision stack level for predefined precisions and then one level for each scope
>+    // in table.
>     typedef TMap<TBasicType, TPrecision> PrecisionStackLevel;
>-    std::vector<PrecisionStackLevel *> precisionStack;
>+    std::vector<std::unique_ptr<PrecisionStackLevel>> mPrecisionStack;
>+
>+    bool mGlobalInvariant;
> 
>     int mUniqueIdCounter;
> 
>-    const TSymbolUniqueId mEmptySymbolId;
>+    static const int kLastBuiltInId;
>+
>+    sh::GLenum mShaderType;
>+    ShBuiltInResources mResources;
>+
>+    // Indexed by unique id. Map instead of vector since the variables are fairly sparse.
>+    std::map<int, VariableMetadata> mVariableMetadata;
>+
>+    // Store gl_in variable with its array size once the array size can be determined. The array
>+    // size can also be checked against latter input primitive type declaration.
>+    TVariable *mGlInVariableWithArraySize;
> };
> 
> }  // namespace sh
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/SymbolTable_autogen.cpp b/Source/ThirdParty/ANGLE/src/compiler/translator/SymbolTable_autogen.cpp
>new file mode 100644
>index 00000000000..da9696232b3
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/SymbolTable_autogen.cpp
>@@ -0,0 +1,20758 @@
>+// GENERATED FILE - DO NOT EDIT.
>+// Generated by gen_builtin_symbols.py using data from builtin_variables.json and
>+// builtin_function_declarations.txt.
>+//
>+// Copyright 2019 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// SymbolTable_autogen.cpp:
>+//   Compile-time initialized built-ins.
>+
>+#include "compiler/translator/SymbolTable.h"
>+
>+#include "angle_gl.h"
>+#include "compiler/translator/ImmutableString.h"
>+#include "compiler/translator/StaticType.h"
>+#include "compiler/translator/Symbol.h"
>+#include "compiler/translator/SymbolTable.h"
>+#include "compiler/translator/tree_util/BuiltIn_autogen.h"
>+
>+namespace sh
>+{
>+
>+// Since some of the BuiltInId declarations are used outside of constexpr expressions, we need to
>+// have these definitions without an initializer. C++17 should eventually remove the need for this.
>+constexpr const TSymbolUniqueId BuiltInId::radians_Float1;
>+constexpr const TSymbolUniqueId BuiltInId::radians_Float2;
>+constexpr const TSymbolUniqueId BuiltInId::radians_Float3;
>+constexpr const TSymbolUniqueId BuiltInId::radians_Float4;
>+constexpr const TSymbolUniqueId BuiltInId::degrees_Float1;
>+constexpr const TSymbolUniqueId BuiltInId::degrees_Float2;
>+constexpr const TSymbolUniqueId BuiltInId::degrees_Float3;
>+constexpr const TSymbolUniqueId BuiltInId::degrees_Float4;
>+constexpr const TSymbolUniqueId BuiltInId::sin_Float1;
>+constexpr const TSymbolUniqueId BuiltInId::sin_Float2;
>+constexpr const TSymbolUniqueId BuiltInId::sin_Float3;
>+constexpr const TSymbolUniqueId BuiltInId::sin_Float4;
>+constexpr const TSymbolUniqueId BuiltInId::cos_Float1;
>+constexpr const TSymbolUniqueId BuiltInId::cos_Float2;
>+constexpr const TSymbolUniqueId BuiltInId::cos_Float3;
>+constexpr const TSymbolUniqueId BuiltInId::cos_Float4;
>+constexpr const TSymbolUniqueId BuiltInId::tan_Float1;
>+constexpr const TSymbolUniqueId BuiltInId::tan_Float2;
>+constexpr const TSymbolUniqueId BuiltInId::tan_Float3;
>+constexpr const TSymbolUniqueId BuiltInId::tan_Float4;
>+constexpr const TSymbolUniqueId BuiltInId::asin_Float1;
>+constexpr const TSymbolUniqueId BuiltInId::asin_Float2;
>+constexpr const TSymbolUniqueId BuiltInId::asin_Float3;
>+constexpr const TSymbolUniqueId BuiltInId::asin_Float4;
>+constexpr const TSymbolUniqueId BuiltInId::acos_Float1;
>+constexpr const TSymbolUniqueId BuiltInId::acos_Float2;
>+constexpr const TSymbolUniqueId BuiltInId::acos_Float3;
>+constexpr const TSymbolUniqueId BuiltInId::acos_Float4;
>+constexpr const TSymbolUniqueId BuiltInId::atan_Float1_Float1;
>+constexpr const TSymbolUniqueId BuiltInId::atan_Float2_Float2;
>+constexpr const TSymbolUniqueId BuiltInId::atan_Float3_Float3;
>+constexpr const TSymbolUniqueId BuiltInId::atan_Float4_Float4;
>+constexpr const TSymbolUniqueId BuiltInId::atan_Float1;
>+constexpr const TSymbolUniqueId BuiltInId::atan_Float2;
>+constexpr const TSymbolUniqueId BuiltInId::atan_Float3;
>+constexpr const TSymbolUniqueId BuiltInId::atan_Float4;
>+constexpr const TSymbolUniqueId BuiltInId::sinh_Float1;
>+constexpr const TSymbolUniqueId BuiltInId::sinh_Float2;
>+constexpr const TSymbolUniqueId BuiltInId::sinh_Float3;
>+constexpr const TSymbolUniqueId BuiltInId::sinh_Float4;
>+constexpr const TSymbolUniqueId BuiltInId::cosh_Float1;
>+constexpr const TSymbolUniqueId BuiltInId::cosh_Float2;
>+constexpr const TSymbolUniqueId BuiltInId::cosh_Float3;
>+constexpr const TSymbolUniqueId BuiltInId::cosh_Float4;
>+constexpr const TSymbolUniqueId BuiltInId::tanh_Float1;
>+constexpr const TSymbolUniqueId BuiltInId::tanh_Float2;
>+constexpr const TSymbolUniqueId BuiltInId::tanh_Float3;
>+constexpr const TSymbolUniqueId BuiltInId::tanh_Float4;
>+constexpr const TSymbolUniqueId BuiltInId::asinh_Float1;
>+constexpr const TSymbolUniqueId BuiltInId::asinh_Float2;
>+constexpr const TSymbolUniqueId BuiltInId::asinh_Float3;
>+constexpr const TSymbolUniqueId BuiltInId::asinh_Float4;
>+constexpr const TSymbolUniqueId BuiltInId::acosh_Float1;
>+constexpr const TSymbolUniqueId BuiltInId::acosh_Float2;
>+constexpr const TSymbolUniqueId BuiltInId::acosh_Float3;
>+constexpr const TSymbolUniqueId BuiltInId::acosh_Float4;
>+constexpr const TSymbolUniqueId BuiltInId::atanh_Float1;
>+constexpr const TSymbolUniqueId BuiltInId::atanh_Float2;
>+constexpr const TSymbolUniqueId BuiltInId::atanh_Float3;
>+constexpr const TSymbolUniqueId BuiltInId::atanh_Float4;
>+constexpr const TSymbolUniqueId BuiltInId::pow_Float1_Float1;
>+constexpr const TSymbolUniqueId BuiltInId::pow_Float2_Float2;
>+constexpr const TSymbolUniqueId BuiltInId::pow_Float3_Float3;
>+constexpr const TSymbolUniqueId BuiltInId::pow_Float4_Float4;
>+constexpr const TSymbolUniqueId BuiltInId::exp_Float1;
>+constexpr const TSymbolUniqueId BuiltInId::exp_Float2;
>+constexpr const TSymbolUniqueId BuiltInId::exp_Float3;
>+constexpr const TSymbolUniqueId BuiltInId::exp_Float4;
>+constexpr const TSymbolUniqueId BuiltInId::log_Float1;
>+constexpr const TSymbolUniqueId BuiltInId::log_Float2;
>+constexpr const TSymbolUniqueId BuiltInId::log_Float3;
>+constexpr const TSymbolUniqueId BuiltInId::log_Float4;
>+constexpr const TSymbolUniqueId BuiltInId::exp2_Float1;
>+constexpr const TSymbolUniqueId BuiltInId::exp2_Float2;
>+constexpr const TSymbolUniqueId BuiltInId::exp2_Float3;
>+constexpr const TSymbolUniqueId BuiltInId::exp2_Float4;
>+constexpr const TSymbolUniqueId BuiltInId::log2_Float1;
>+constexpr const TSymbolUniqueId BuiltInId::log2_Float2;
>+constexpr const TSymbolUniqueId BuiltInId::log2_Float3;
>+constexpr const TSymbolUniqueId BuiltInId::log2_Float4;
>+constexpr const TSymbolUniqueId BuiltInId::sqrt_Float1;
>+constexpr const TSymbolUniqueId BuiltInId::sqrt_Float2;
>+constexpr const TSymbolUniqueId BuiltInId::sqrt_Float3;
>+constexpr const TSymbolUniqueId BuiltInId::sqrt_Float4;
>+constexpr const TSymbolUniqueId BuiltInId::inversesqrt_Float1;
>+constexpr const TSymbolUniqueId BuiltInId::inversesqrt_Float2;
>+constexpr const TSymbolUniqueId BuiltInId::inversesqrt_Float3;
>+constexpr const TSymbolUniqueId BuiltInId::inversesqrt_Float4;
>+constexpr const TSymbolUniqueId BuiltInId::abs_Float1;
>+constexpr const TSymbolUniqueId BuiltInId::abs_Float2;
>+constexpr const TSymbolUniqueId BuiltInId::abs_Float3;
>+constexpr const TSymbolUniqueId BuiltInId::abs_Float4;
>+constexpr const TSymbolUniqueId BuiltInId::abs_Int1;
>+constexpr const TSymbolUniqueId BuiltInId::abs_Int2;
>+constexpr const TSymbolUniqueId BuiltInId::abs_Int3;
>+constexpr const TSymbolUniqueId BuiltInId::abs_Int4;
>+constexpr const TSymbolUniqueId BuiltInId::sign_Float1;
>+constexpr const TSymbolUniqueId BuiltInId::sign_Float2;
>+constexpr const TSymbolUniqueId BuiltInId::sign_Float3;
>+constexpr const TSymbolUniqueId BuiltInId::sign_Float4;
>+constexpr const TSymbolUniqueId BuiltInId::sign_Int1;
>+constexpr const TSymbolUniqueId BuiltInId::sign_Int2;
>+constexpr const TSymbolUniqueId BuiltInId::sign_Int3;
>+constexpr const TSymbolUniqueId BuiltInId::sign_Int4;
>+constexpr const TSymbolUniqueId BuiltInId::floor_Float1;
>+constexpr const TSymbolUniqueId BuiltInId::floor_Float2;
>+constexpr const TSymbolUniqueId BuiltInId::floor_Float3;
>+constexpr const TSymbolUniqueId BuiltInId::floor_Float4;
>+constexpr const TSymbolUniqueId BuiltInId::trunc_Float1;
>+constexpr const TSymbolUniqueId BuiltInId::trunc_Float2;
>+constexpr const TSymbolUniqueId BuiltInId::trunc_Float3;
>+constexpr const TSymbolUniqueId BuiltInId::trunc_Float4;
>+constexpr const TSymbolUniqueId BuiltInId::round_Float1;
>+constexpr const TSymbolUniqueId BuiltInId::round_Float2;
>+constexpr const TSymbolUniqueId BuiltInId::round_Float3;
>+constexpr const TSymbolUniqueId BuiltInId::round_Float4;
>+constexpr const TSymbolUniqueId BuiltInId::roundEven_Float1;
>+constexpr const TSymbolUniqueId BuiltInId::roundEven_Float2;
>+constexpr const TSymbolUniqueId BuiltInId::roundEven_Float3;
>+constexpr const TSymbolUniqueId BuiltInId::roundEven_Float4;
>+constexpr const TSymbolUniqueId BuiltInId::ceil_Float1;
>+constexpr const TSymbolUniqueId BuiltInId::ceil_Float2;
>+constexpr const TSymbolUniqueId BuiltInId::ceil_Float3;
>+constexpr const TSymbolUniqueId BuiltInId::ceil_Float4;
>+constexpr const TSymbolUniqueId BuiltInId::fract_Float1;
>+constexpr const TSymbolUniqueId BuiltInId::fract_Float2;
>+constexpr const TSymbolUniqueId BuiltInId::fract_Float3;
>+constexpr const TSymbolUniqueId BuiltInId::fract_Float4;
>+constexpr const TSymbolUniqueId BuiltInId::mod_Float1_Float1;
>+constexpr const TSymbolUniqueId BuiltInId::mod_Float2_Float1;
>+constexpr const TSymbolUniqueId BuiltInId::mod_Float3_Float1;
>+constexpr const TSymbolUniqueId BuiltInId::mod_Float4_Float1;
>+constexpr const TSymbolUniqueId BuiltInId::mod_Float2_Float2;
>+constexpr const TSymbolUniqueId BuiltInId::mod_Float3_Float3;
>+constexpr const TSymbolUniqueId BuiltInId::mod_Float4_Float4;
>+constexpr const TSymbolUniqueId BuiltInId::min_Float1_Float1;
>+constexpr const TSymbolUniqueId BuiltInId::min_Float2_Float1;
>+constexpr const TSymbolUniqueId BuiltInId::min_Float3_Float1;
>+constexpr const TSymbolUniqueId BuiltInId::min_Float4_Float1;
>+constexpr const TSymbolUniqueId BuiltInId::min_Float2_Float2;
>+constexpr const TSymbolUniqueId BuiltInId::min_Float3_Float3;
>+constexpr const TSymbolUniqueId BuiltInId::min_Float4_Float4;
>+constexpr const TSymbolUniqueId BuiltInId::min_Int1_Int1;
>+constexpr const TSymbolUniqueId BuiltInId::min_Int2_Int2;
>+constexpr const TSymbolUniqueId BuiltInId::min_Int3_Int3;
>+constexpr const TSymbolUniqueId BuiltInId::min_Int4_Int4;
>+constexpr const TSymbolUniqueId BuiltInId::min_Int2_Int1;
>+constexpr const TSymbolUniqueId BuiltInId::min_Int3_Int1;
>+constexpr const TSymbolUniqueId BuiltInId::min_Int4_Int1;
>+constexpr const TSymbolUniqueId BuiltInId::min_UInt1_UInt1;
>+constexpr const TSymbolUniqueId BuiltInId::min_UInt2_UInt2;
>+constexpr const TSymbolUniqueId BuiltInId::min_UInt3_UInt3;
>+constexpr const TSymbolUniqueId BuiltInId::min_UInt4_UInt4;
>+constexpr const TSymbolUniqueId BuiltInId::min_UInt2_UInt1;
>+constexpr const TSymbolUniqueId BuiltInId::min_UInt3_UInt1;
>+constexpr const TSymbolUniqueId BuiltInId::min_UInt4_UInt1;
>+constexpr const TSymbolUniqueId BuiltInId::max_Float1_Float1;
>+constexpr const TSymbolUniqueId BuiltInId::max_Float2_Float1;
>+constexpr const TSymbolUniqueId BuiltInId::max_Float3_Float1;
>+constexpr const TSymbolUniqueId BuiltInId::max_Float4_Float1;
>+constexpr const TSymbolUniqueId BuiltInId::max_Float2_Float2;
>+constexpr const TSymbolUniqueId BuiltInId::max_Float3_Float3;
>+constexpr const TSymbolUniqueId BuiltInId::max_Float4_Float4;
>+constexpr const TSymbolUniqueId BuiltInId::max_Int1_Int1;
>+constexpr const TSymbolUniqueId BuiltInId::max_Int2_Int2;
>+constexpr const TSymbolUniqueId BuiltInId::max_Int3_Int3;
>+constexpr const TSymbolUniqueId BuiltInId::max_Int4_Int4;
>+constexpr const TSymbolUniqueId BuiltInId::max_Int2_Int1;
>+constexpr const TSymbolUniqueId BuiltInId::max_Int3_Int1;
>+constexpr const TSymbolUniqueId BuiltInId::max_Int4_Int1;
>+constexpr const TSymbolUniqueId BuiltInId::max_UInt1_UInt1;
>+constexpr const TSymbolUniqueId BuiltInId::max_UInt2_UInt2;
>+constexpr const TSymbolUniqueId BuiltInId::max_UInt3_UInt3;
>+constexpr const TSymbolUniqueId BuiltInId::max_UInt4_UInt4;
>+constexpr const TSymbolUniqueId BuiltInId::max_UInt2_UInt1;
>+constexpr const TSymbolUniqueId BuiltInId::max_UInt3_UInt1;
>+constexpr const TSymbolUniqueId BuiltInId::max_UInt4_UInt1;
>+constexpr const TSymbolUniqueId BuiltInId::clamp_Float1_Float1_Float1;
>+constexpr const TSymbolUniqueId BuiltInId::clamp_Float2_Float1_Float1;
>+constexpr const TSymbolUniqueId BuiltInId::clamp_Float3_Float1_Float1;
>+constexpr const TSymbolUniqueId BuiltInId::clamp_Float4_Float1_Float1;
>+constexpr const TSymbolUniqueId BuiltInId::clamp_Float2_Float2_Float2;
>+constexpr const TSymbolUniqueId BuiltInId::clamp_Float3_Float3_Float3;
>+constexpr const TSymbolUniqueId BuiltInId::clamp_Float4_Float4_Float4;
>+constexpr const TSymbolUniqueId BuiltInId::clamp_Int1_Int1_Int1;
>+constexpr const TSymbolUniqueId BuiltInId::clamp_Int2_Int1_Int1;
>+constexpr const TSymbolUniqueId BuiltInId::clamp_Int3_Int1_Int1;
>+constexpr const TSymbolUniqueId BuiltInId::clamp_Int4_Int1_Int1;
>+constexpr const TSymbolUniqueId BuiltInId::clamp_Int2_Int2_Int2;
>+constexpr const TSymbolUniqueId BuiltInId::clamp_Int3_Int3_Int3;
>+constexpr const TSymbolUniqueId BuiltInId::clamp_Int4_Int4_Int4;
>+constexpr const TSymbolUniqueId BuiltInId::clamp_UInt1_UInt1_UInt1;
>+constexpr const TSymbolUniqueId BuiltInId::clamp_UInt2_UInt1_UInt1;
>+constexpr const TSymbolUniqueId BuiltInId::clamp_UInt3_UInt1_UInt1;
>+constexpr const TSymbolUniqueId BuiltInId::clamp_UInt4_UInt1_UInt1;
>+constexpr const TSymbolUniqueId BuiltInId::clamp_UInt2_UInt2_UInt2;
>+constexpr const TSymbolUniqueId BuiltInId::clamp_UInt3_UInt3_UInt3;
>+constexpr const TSymbolUniqueId BuiltInId::clamp_UInt4_UInt4_UInt4;
>+constexpr const TSymbolUniqueId BuiltInId::mix_Float1_Float1_Float1;
>+constexpr const TSymbolUniqueId BuiltInId::mix_Float2_Float2_Float1;
>+constexpr const TSymbolUniqueId BuiltInId::mix_Float3_Float3_Float1;
>+constexpr const TSymbolUniqueId BuiltInId::mix_Float4_Float4_Float1;
>+constexpr const TSymbolUniqueId BuiltInId::mix_Float2_Float2_Float2;
>+constexpr const TSymbolUniqueId BuiltInId::mix_Float3_Float3_Float3;
>+constexpr const TSymbolUniqueId BuiltInId::mix_Float4_Float4_Float4;
>+constexpr const TSymbolUniqueId BuiltInId::mix_Float1_Float1_Bool1;
>+constexpr const TSymbolUniqueId BuiltInId::mix_Float2_Float2_Bool2;
>+constexpr const TSymbolUniqueId BuiltInId::mix_Float3_Float3_Bool3;
>+constexpr const TSymbolUniqueId BuiltInId::mix_Float4_Float4_Bool4;
>+constexpr const TSymbolUniqueId BuiltInId::step_Float1_Float1;
>+constexpr const TSymbolUniqueId BuiltInId::step_Float2_Float2;
>+constexpr const TSymbolUniqueId BuiltInId::step_Float3_Float3;
>+constexpr const TSymbolUniqueId BuiltInId::step_Float4_Float4;
>+constexpr const TSymbolUniqueId BuiltInId::step_Float1_Float2;
>+constexpr const TSymbolUniqueId BuiltInId::step_Float1_Float3;
>+constexpr const TSymbolUniqueId BuiltInId::step_Float1_Float4;
>+constexpr const TSymbolUniqueId BuiltInId::smoothstep_Float1_Float1_Float1;
>+constexpr const TSymbolUniqueId BuiltInId::smoothstep_Float2_Float2_Float2;
>+constexpr const TSymbolUniqueId BuiltInId::smoothstep_Float3_Float3_Float3;
>+constexpr const TSymbolUniqueId BuiltInId::smoothstep_Float4_Float4_Float4;
>+constexpr const TSymbolUniqueId BuiltInId::smoothstep_Float1_Float1_Float2;
>+constexpr const TSymbolUniqueId BuiltInId::smoothstep_Float1_Float1_Float3;
>+constexpr const TSymbolUniqueId BuiltInId::smoothstep_Float1_Float1_Float4;
>+constexpr const TSymbolUniqueId BuiltInId::modf_Float1_Float1;
>+constexpr const TSymbolUniqueId BuiltInId::modf_Float2_Float2;
>+constexpr const TSymbolUniqueId BuiltInId::modf_Float3_Float3;
>+constexpr const TSymbolUniqueId BuiltInId::modf_Float4_Float4;
>+constexpr const TSymbolUniqueId BuiltInId::isnan_Float1;
>+constexpr const TSymbolUniqueId BuiltInId::isnan_Float2;
>+constexpr const TSymbolUniqueId BuiltInId::isnan_Float3;
>+constexpr const TSymbolUniqueId BuiltInId::isnan_Float4;
>+constexpr const TSymbolUniqueId BuiltInId::isinf_Float1;
>+constexpr const TSymbolUniqueId BuiltInId::isinf_Float2;
>+constexpr const TSymbolUniqueId BuiltInId::isinf_Float3;
>+constexpr const TSymbolUniqueId BuiltInId::isinf_Float4;
>+constexpr const TSymbolUniqueId BuiltInId::floatBitsToInt_Float1;
>+constexpr const TSymbolUniqueId BuiltInId::floatBitsToInt_Float2;
>+constexpr const TSymbolUniqueId BuiltInId::floatBitsToInt_Float3;
>+constexpr const TSymbolUniqueId BuiltInId::floatBitsToInt_Float4;
>+constexpr const TSymbolUniqueId BuiltInId::floatBitsToUint_Float1;
>+constexpr const TSymbolUniqueId BuiltInId::floatBitsToUint_Float2;
>+constexpr const TSymbolUniqueId BuiltInId::floatBitsToUint_Float3;
>+constexpr const TSymbolUniqueId BuiltInId::floatBitsToUint_Float4;
>+constexpr const TSymbolUniqueId BuiltInId::intBitsToFloat_Int1;
>+constexpr const TSymbolUniqueId BuiltInId::intBitsToFloat_Int2;
>+constexpr const TSymbolUniqueId BuiltInId::intBitsToFloat_Int3;
>+constexpr const TSymbolUniqueId BuiltInId::intBitsToFloat_Int4;
>+constexpr const TSymbolUniqueId BuiltInId::uintBitsToFloat_UInt1;
>+constexpr const TSymbolUniqueId BuiltInId::uintBitsToFloat_UInt2;
>+constexpr const TSymbolUniqueId BuiltInId::uintBitsToFloat_UInt3;
>+constexpr const TSymbolUniqueId BuiltInId::uintBitsToFloat_UInt4;
>+constexpr const TSymbolUniqueId BuiltInId::frexp_Float1_Int1;
>+constexpr const TSymbolUniqueId BuiltInId::frexp_Float2_Int2;
>+constexpr const TSymbolUniqueId BuiltInId::frexp_Float3_Int3;
>+constexpr const TSymbolUniqueId BuiltInId::frexp_Float4_Int4;
>+constexpr const TSymbolUniqueId BuiltInId::ldexp_Float1_Int1;
>+constexpr const TSymbolUniqueId BuiltInId::ldexp_Float2_Int2;
>+constexpr const TSymbolUniqueId BuiltInId::ldexp_Float3_Int3;
>+constexpr const TSymbolUniqueId BuiltInId::ldexp_Float4_Int4;
>+constexpr const TSymbolUniqueId BuiltInId::packSnorm2x16_Float2;
>+constexpr const TSymbolUniqueId BuiltInId::packUnorm2x16_Float2;
>+constexpr const TSymbolUniqueId BuiltInId::packHalf2x16_Float2;
>+constexpr const TSymbolUniqueId BuiltInId::unpackSnorm2x16_UInt1;
>+constexpr const TSymbolUniqueId BuiltInId::unpackUnorm2x16_UInt1;
>+constexpr const TSymbolUniqueId BuiltInId::unpackHalf2x16_UInt1;
>+constexpr const TSymbolUniqueId BuiltInId::packUnorm4x8_Float4;
>+constexpr const TSymbolUniqueId BuiltInId::packSnorm4x8_Float4;
>+constexpr const TSymbolUniqueId BuiltInId::unpackUnorm4x8_UInt1;
>+constexpr const TSymbolUniqueId BuiltInId::unpackSnorm4x8_UInt1;
>+constexpr const TSymbolUniqueId BuiltInId::length_Float1;
>+constexpr const TSymbolUniqueId BuiltInId::length_Float2;
>+constexpr const TSymbolUniqueId BuiltInId::length_Float3;
>+constexpr const TSymbolUniqueId BuiltInId::length_Float4;
>+constexpr const TSymbolUniqueId BuiltInId::distance_Float1_Float1;
>+constexpr const TSymbolUniqueId BuiltInId::distance_Float2_Float2;
>+constexpr const TSymbolUniqueId BuiltInId::distance_Float3_Float3;
>+constexpr const TSymbolUniqueId BuiltInId::distance_Float4_Float4;
>+constexpr const TSymbolUniqueId BuiltInId::dot_Float1_Float1;
>+constexpr const TSymbolUniqueId BuiltInId::dot_Float2_Float2;
>+constexpr const TSymbolUniqueId BuiltInId::dot_Float3_Float3;
>+constexpr const TSymbolUniqueId BuiltInId::dot_Float4_Float4;
>+constexpr const TSymbolUniqueId BuiltInId::cross_Float3_Float3;
>+constexpr const TSymbolUniqueId BuiltInId::normalize_Float1;
>+constexpr const TSymbolUniqueId BuiltInId::normalize_Float2;
>+constexpr const TSymbolUniqueId BuiltInId::normalize_Float3;
>+constexpr const TSymbolUniqueId BuiltInId::normalize_Float4;
>+constexpr const TSymbolUniqueId BuiltInId::faceforward_Float1_Float1_Float1;
>+constexpr const TSymbolUniqueId BuiltInId::faceforward_Float2_Float2_Float2;
>+constexpr const TSymbolUniqueId BuiltInId::faceforward_Float3_Float3_Float3;
>+constexpr const TSymbolUniqueId BuiltInId::faceforward_Float4_Float4_Float4;
>+constexpr const TSymbolUniqueId BuiltInId::reflect_Float1_Float1;
>+constexpr const TSymbolUniqueId BuiltInId::reflect_Float2_Float2;
>+constexpr const TSymbolUniqueId BuiltInId::reflect_Float3_Float3;
>+constexpr const TSymbolUniqueId BuiltInId::reflect_Float4_Float4;
>+constexpr const TSymbolUniqueId BuiltInId::refract_Float1_Float1_Float1;
>+constexpr const TSymbolUniqueId BuiltInId::refract_Float2_Float2_Float1;
>+constexpr const TSymbolUniqueId BuiltInId::refract_Float3_Float3_Float1;
>+constexpr const TSymbolUniqueId BuiltInId::refract_Float4_Float4_Float1;
>+constexpr const TSymbolUniqueId BuiltInId::matrixCompMult_Float2x2_Float2x2;
>+constexpr const TSymbolUniqueId BuiltInId::matrixCompMult_Float3x3_Float3x3;
>+constexpr const TSymbolUniqueId BuiltInId::matrixCompMult_Float4x4_Float4x4;
>+constexpr const TSymbolUniqueId BuiltInId::matrixCompMult_Float2x3_Float2x3;
>+constexpr const TSymbolUniqueId BuiltInId::matrixCompMult_Float3x2_Float3x2;
>+constexpr const TSymbolUniqueId BuiltInId::matrixCompMult_Float2x4_Float2x4;
>+constexpr const TSymbolUniqueId BuiltInId::matrixCompMult_Float4x2_Float4x2;
>+constexpr const TSymbolUniqueId BuiltInId::matrixCompMult_Float3x4_Float3x4;
>+constexpr const TSymbolUniqueId BuiltInId::matrixCompMult_Float4x3_Float4x3;
>+constexpr const TSymbolUniqueId BuiltInId::outerProduct_Float2_Float2;
>+constexpr const TSymbolUniqueId BuiltInId::outerProduct_Float3_Float3;
>+constexpr const TSymbolUniqueId BuiltInId::outerProduct_Float4_Float4;
>+constexpr const TSymbolUniqueId BuiltInId::outerProduct_Float3_Float2;
>+constexpr const TSymbolUniqueId BuiltInId::outerProduct_Float2_Float3;
>+constexpr const TSymbolUniqueId BuiltInId::outerProduct_Float4_Float2;
>+constexpr const TSymbolUniqueId BuiltInId::outerProduct_Float2_Float4;
>+constexpr const TSymbolUniqueId BuiltInId::outerProduct_Float4_Float3;
>+constexpr const TSymbolUniqueId BuiltInId::outerProduct_Float3_Float4;
>+constexpr const TSymbolUniqueId BuiltInId::transpose_Float2x2;
>+constexpr const TSymbolUniqueId BuiltInId::transpose_Float3x3;
>+constexpr const TSymbolUniqueId BuiltInId::transpose_Float4x4;
>+constexpr const TSymbolUniqueId BuiltInId::transpose_Float3x2;
>+constexpr const TSymbolUniqueId BuiltInId::transpose_Float2x3;
>+constexpr const TSymbolUniqueId BuiltInId::transpose_Float4x2;
>+constexpr const TSymbolUniqueId BuiltInId::transpose_Float2x4;
>+constexpr const TSymbolUniqueId BuiltInId::transpose_Float4x3;
>+constexpr const TSymbolUniqueId BuiltInId::transpose_Float3x4;
>+constexpr const TSymbolUniqueId BuiltInId::determinant_Float2x2;
>+constexpr const TSymbolUniqueId BuiltInId::determinant_Float3x3;
>+constexpr const TSymbolUniqueId BuiltInId::determinant_Float4x4;
>+constexpr const TSymbolUniqueId BuiltInId::inverse_Float2x2;
>+constexpr const TSymbolUniqueId BuiltInId::inverse_Float3x3;
>+constexpr const TSymbolUniqueId BuiltInId::inverse_Float4x4;
>+constexpr const TSymbolUniqueId BuiltInId::lessThan_Float2_Float2;
>+constexpr const TSymbolUniqueId BuiltInId::lessThan_Float3_Float3;
>+constexpr const TSymbolUniqueId BuiltInId::lessThan_Float4_Float4;
>+constexpr const TSymbolUniqueId BuiltInId::lessThan_Int2_Int2;
>+constexpr const TSymbolUniqueId BuiltInId::lessThan_Int3_Int3;
>+constexpr const TSymbolUniqueId BuiltInId::lessThan_Int4_Int4;
>+constexpr const TSymbolUniqueId BuiltInId::lessThan_UInt2_UInt2;
>+constexpr const TSymbolUniqueId BuiltInId::lessThan_UInt3_UInt3;
>+constexpr const TSymbolUniqueId BuiltInId::lessThan_UInt4_UInt4;
>+constexpr const TSymbolUniqueId BuiltInId::lessThanEqual_Float2_Float2;
>+constexpr const TSymbolUniqueId BuiltInId::lessThanEqual_Float3_Float3;
>+constexpr const TSymbolUniqueId BuiltInId::lessThanEqual_Float4_Float4;
>+constexpr const TSymbolUniqueId BuiltInId::lessThanEqual_Int2_Int2;
>+constexpr const TSymbolUniqueId BuiltInId::lessThanEqual_Int3_Int3;
>+constexpr const TSymbolUniqueId BuiltInId::lessThanEqual_Int4_Int4;
>+constexpr const TSymbolUniqueId BuiltInId::lessThanEqual_UInt2_UInt2;
>+constexpr const TSymbolUniqueId BuiltInId::lessThanEqual_UInt3_UInt3;
>+constexpr const TSymbolUniqueId BuiltInId::lessThanEqual_UInt4_UInt4;
>+constexpr const TSymbolUniqueId BuiltInId::greaterThan_Float2_Float2;
>+constexpr const TSymbolUniqueId BuiltInId::greaterThan_Float3_Float3;
>+constexpr const TSymbolUniqueId BuiltInId::greaterThan_Float4_Float4;
>+constexpr const TSymbolUniqueId BuiltInId::greaterThan_Int2_Int2;
>+constexpr const TSymbolUniqueId BuiltInId::greaterThan_Int3_Int3;
>+constexpr const TSymbolUniqueId BuiltInId::greaterThan_Int4_Int4;
>+constexpr const TSymbolUniqueId BuiltInId::greaterThan_UInt2_UInt2;
>+constexpr const TSymbolUniqueId BuiltInId::greaterThan_UInt3_UInt3;
>+constexpr const TSymbolUniqueId BuiltInId::greaterThan_UInt4_UInt4;
>+constexpr const TSymbolUniqueId BuiltInId::greaterThanEqual_Float2_Float2;
>+constexpr const TSymbolUniqueId BuiltInId::greaterThanEqual_Float3_Float3;
>+constexpr const TSymbolUniqueId BuiltInId::greaterThanEqual_Float4_Float4;
>+constexpr const TSymbolUniqueId BuiltInId::greaterThanEqual_Int2_Int2;
>+constexpr const TSymbolUniqueId BuiltInId::greaterThanEqual_Int3_Int3;
>+constexpr const TSymbolUniqueId BuiltInId::greaterThanEqual_Int4_Int4;
>+constexpr const TSymbolUniqueId BuiltInId::greaterThanEqual_UInt2_UInt2;
>+constexpr const TSymbolUniqueId BuiltInId::greaterThanEqual_UInt3_UInt3;
>+constexpr const TSymbolUniqueId BuiltInId::greaterThanEqual_UInt4_UInt4;
>+constexpr const TSymbolUniqueId BuiltInId::equal_Float2_Float2;
>+constexpr const TSymbolUniqueId BuiltInId::equal_Float3_Float3;
>+constexpr const TSymbolUniqueId BuiltInId::equal_Float4_Float4;
>+constexpr const TSymbolUniqueId BuiltInId::equal_Int2_Int2;
>+constexpr const TSymbolUniqueId BuiltInId::equal_Int3_Int3;
>+constexpr const TSymbolUniqueId BuiltInId::equal_Int4_Int4;
>+constexpr const TSymbolUniqueId BuiltInId::equal_UInt2_UInt2;
>+constexpr const TSymbolUniqueId BuiltInId::equal_UInt3_UInt3;
>+constexpr const TSymbolUniqueId BuiltInId::equal_UInt4_UInt4;
>+constexpr const TSymbolUniqueId BuiltInId::equal_Bool2_Bool2;
>+constexpr const TSymbolUniqueId BuiltInId::equal_Bool3_Bool3;
>+constexpr const TSymbolUniqueId BuiltInId::equal_Bool4_Bool4;
>+constexpr const TSymbolUniqueId BuiltInId::notEqual_Float2_Float2;
>+constexpr const TSymbolUniqueId BuiltInId::notEqual_Float3_Float3;
>+constexpr const TSymbolUniqueId BuiltInId::notEqual_Float4_Float4;
>+constexpr const TSymbolUniqueId BuiltInId::notEqual_Int2_Int2;
>+constexpr const TSymbolUniqueId BuiltInId::notEqual_Int3_Int3;
>+constexpr const TSymbolUniqueId BuiltInId::notEqual_Int4_Int4;
>+constexpr const TSymbolUniqueId BuiltInId::notEqual_UInt2_UInt2;
>+constexpr const TSymbolUniqueId BuiltInId::notEqual_UInt3_UInt3;
>+constexpr const TSymbolUniqueId BuiltInId::notEqual_UInt4_UInt4;
>+constexpr const TSymbolUniqueId BuiltInId::notEqual_Bool2_Bool2;
>+constexpr const TSymbolUniqueId BuiltInId::notEqual_Bool3_Bool3;
>+constexpr const TSymbolUniqueId BuiltInId::notEqual_Bool4_Bool4;
>+constexpr const TSymbolUniqueId BuiltInId::any_Bool2;
>+constexpr const TSymbolUniqueId BuiltInId::any_Bool3;
>+constexpr const TSymbolUniqueId BuiltInId::any_Bool4;
>+constexpr const TSymbolUniqueId BuiltInId::all_Bool2;
>+constexpr const TSymbolUniqueId BuiltInId::all_Bool3;
>+constexpr const TSymbolUniqueId BuiltInId::all_Bool4;
>+constexpr const TSymbolUniqueId BuiltInId::notFunc_Bool2;
>+constexpr const TSymbolUniqueId BuiltInId::notFunc_Bool3;
>+constexpr const TSymbolUniqueId BuiltInId::notFunc_Bool4;
>+constexpr const TSymbolUniqueId BuiltInId::bitfieldExtract_Int1_Int1_Int1;
>+constexpr const TSymbolUniqueId BuiltInId::bitfieldExtract_Int2_Int1_Int1;
>+constexpr const TSymbolUniqueId BuiltInId::bitfieldExtract_Int3_Int1_Int1;
>+constexpr const TSymbolUniqueId BuiltInId::bitfieldExtract_Int4_Int1_Int1;
>+constexpr const TSymbolUniqueId BuiltInId::bitfieldExtract_UInt1_Int1_Int1;
>+constexpr const TSymbolUniqueId BuiltInId::bitfieldExtract_UInt2_Int1_Int1;
>+constexpr const TSymbolUniqueId BuiltInId::bitfieldExtract_UInt3_Int1_Int1;
>+constexpr const TSymbolUniqueId BuiltInId::bitfieldExtract_UInt4_Int1_Int1;
>+constexpr const TSymbolUniqueId BuiltInId::bitfieldInsert_Int1_Int1_Int1_Int1;
>+constexpr const TSymbolUniqueId BuiltInId::bitfieldInsert_Int2_Int2_Int1_Int1;
>+constexpr const TSymbolUniqueId BuiltInId::bitfieldInsert_Int3_Int3_Int1_Int1;
>+constexpr const TSymbolUniqueId BuiltInId::bitfieldInsert_Int4_Int4_Int1_Int1;
>+constexpr const TSymbolUniqueId BuiltInId::bitfieldInsert_UInt1_UInt1_Int1_Int1;
>+constexpr const TSymbolUniqueId BuiltInId::bitfieldInsert_UInt2_UInt2_Int1_Int1;
>+constexpr const TSymbolUniqueId BuiltInId::bitfieldInsert_UInt3_UInt3_Int1_Int1;
>+constexpr const TSymbolUniqueId BuiltInId::bitfieldInsert_UInt4_UInt4_Int1_Int1;
>+constexpr const TSymbolUniqueId BuiltInId::bitfieldReverse_Int1;
>+constexpr const TSymbolUniqueId BuiltInId::bitfieldReverse_Int2;
>+constexpr const TSymbolUniqueId BuiltInId::bitfieldReverse_Int3;
>+constexpr const TSymbolUniqueId BuiltInId::bitfieldReverse_Int4;
>+constexpr const TSymbolUniqueId BuiltInId::bitfieldReverse_UInt1;
>+constexpr const TSymbolUniqueId BuiltInId::bitfieldReverse_UInt2;
>+constexpr const TSymbolUniqueId BuiltInId::bitfieldReverse_UInt3;
>+constexpr const TSymbolUniqueId BuiltInId::bitfieldReverse_UInt4;
>+constexpr const TSymbolUniqueId BuiltInId::bitCount_Int1;
>+constexpr const TSymbolUniqueId BuiltInId::bitCount_Int2;
>+constexpr const TSymbolUniqueId BuiltInId::bitCount_Int3;
>+constexpr const TSymbolUniqueId BuiltInId::bitCount_Int4;
>+constexpr const TSymbolUniqueId BuiltInId::bitCount_UInt1;
>+constexpr const TSymbolUniqueId BuiltInId::bitCount_UInt2;
>+constexpr const TSymbolUniqueId BuiltInId::bitCount_UInt3;
>+constexpr const TSymbolUniqueId BuiltInId::bitCount_UInt4;
>+constexpr const TSymbolUniqueId BuiltInId::findLSB_Int1;
>+constexpr const TSymbolUniqueId BuiltInId::findLSB_Int2;
>+constexpr const TSymbolUniqueId BuiltInId::findLSB_Int3;
>+constexpr const TSymbolUniqueId BuiltInId::findLSB_Int4;
>+constexpr const TSymbolUniqueId BuiltInId::findLSB_UInt1;
>+constexpr const TSymbolUniqueId BuiltInId::findLSB_UInt2;
>+constexpr const TSymbolUniqueId BuiltInId::findLSB_UInt3;
>+constexpr const TSymbolUniqueId BuiltInId::findLSB_UInt4;
>+constexpr const TSymbolUniqueId BuiltInId::findMSB_Int1;
>+constexpr const TSymbolUniqueId BuiltInId::findMSB_Int2;
>+constexpr const TSymbolUniqueId BuiltInId::findMSB_Int3;
>+constexpr const TSymbolUniqueId BuiltInId::findMSB_Int4;
>+constexpr const TSymbolUniqueId BuiltInId::findMSB_UInt1;
>+constexpr const TSymbolUniqueId BuiltInId::findMSB_UInt2;
>+constexpr const TSymbolUniqueId BuiltInId::findMSB_UInt3;
>+constexpr const TSymbolUniqueId BuiltInId::findMSB_UInt4;
>+constexpr const TSymbolUniqueId BuiltInId::uaddCarry_UInt1_UInt1_UInt1;
>+constexpr const TSymbolUniqueId BuiltInId::uaddCarry_UInt2_UInt2_UInt2;
>+constexpr const TSymbolUniqueId BuiltInId::uaddCarry_UInt3_UInt3_UInt3;
>+constexpr const TSymbolUniqueId BuiltInId::uaddCarry_UInt4_UInt4_UInt4;
>+constexpr const TSymbolUniqueId BuiltInId::usubBorrow_UInt1_UInt1_UInt1;
>+constexpr const TSymbolUniqueId BuiltInId::usubBorrow_UInt2_UInt2_UInt2;
>+constexpr const TSymbolUniqueId BuiltInId::usubBorrow_UInt3_UInt3_UInt3;
>+constexpr const TSymbolUniqueId BuiltInId::usubBorrow_UInt4_UInt4_UInt4;
>+constexpr const TSymbolUniqueId BuiltInId::umulExtended_UInt1_UInt1_UInt1_UInt1;
>+constexpr const TSymbolUniqueId BuiltInId::umulExtended_UInt2_UInt2_UInt2_UInt2;
>+constexpr const TSymbolUniqueId BuiltInId::umulExtended_UInt3_UInt3_UInt3_UInt3;
>+constexpr const TSymbolUniqueId BuiltInId::umulExtended_UInt4_UInt4_UInt4_UInt4;
>+constexpr const TSymbolUniqueId BuiltInId::imulExtended_Int1_Int1_Int1_Int1;
>+constexpr const TSymbolUniqueId BuiltInId::imulExtended_Int2_Int2_Int2_Int2;
>+constexpr const TSymbolUniqueId BuiltInId::imulExtended_Int3_Int3_Int3_Int3;
>+constexpr const TSymbolUniqueId BuiltInId::imulExtended_Int4_Int4_Int4_Int4;
>+constexpr const TSymbolUniqueId BuiltInId::texture2D_Sampler2D1_Float2;
>+constexpr const TSymbolUniqueId BuiltInId::texture2DProj_Sampler2D1_Float3;
>+constexpr const TSymbolUniqueId BuiltInId::texture2DProj_Sampler2D1_Float4;
>+constexpr const TSymbolUniqueId BuiltInId::textureCube_SamplerCube1_Float3;
>+constexpr const TSymbolUniqueId BuiltInId::texture2D_SamplerExternalOES1_Float2;
>+constexpr const TSymbolUniqueId BuiltInId::texture2DProj_SamplerExternalOES1_Float3;
>+constexpr const TSymbolUniqueId BuiltInId::texture2DProj_SamplerExternalOES1_Float4;
>+constexpr const TSymbolUniqueId BuiltInId::texture2DRect_Sampler2DRect1_Float2;
>+constexpr const TSymbolUniqueId BuiltInId::texture2DRectProj_Sampler2DRect1_Float3;
>+constexpr const TSymbolUniqueId BuiltInId::texture2DRectProj_Sampler2DRect1_Float4;
>+constexpr const TSymbolUniqueId BuiltInId::texture_Sampler2DRect1_Float2;
>+constexpr const TSymbolUniqueId BuiltInId::textureProj_Sampler2DRect1_Float3;
>+constexpr const TSymbolUniqueId BuiltInId::textureProj_Sampler2DRect1_Float4;
>+constexpr const TSymbolUniqueId BuiltInId::texture2DGradEXT_Sampler2D1_Float2_Float2_Float2;
>+constexpr const TSymbolUniqueId BuiltInId::texture2DProjGradEXT_Sampler2D1_Float3_Float2_Float2;
>+constexpr const TSymbolUniqueId BuiltInId::texture2DProjGradEXT_Sampler2D1_Float4_Float2_Float2;
>+constexpr const TSymbolUniqueId BuiltInId::textureCubeGradEXT_SamplerCube1_Float3_Float3_Float3;
>+constexpr const TSymbolUniqueId BuiltInId::texture2D_Sampler2D1_Float2_Float1;
>+constexpr const TSymbolUniqueId BuiltInId::texture2DProj_Sampler2D1_Float3_Float1;
>+constexpr const TSymbolUniqueId BuiltInId::texture2DProj_Sampler2D1_Float4_Float1;
>+constexpr const TSymbolUniqueId BuiltInId::textureCube_SamplerCube1_Float3_Float1;
>+constexpr const TSymbolUniqueId BuiltInId::dFdxExt_Float1;
>+constexpr const TSymbolUniqueId BuiltInId::dFdxExt_Float2;
>+constexpr const TSymbolUniqueId BuiltInId::dFdxExt_Float3;
>+constexpr const TSymbolUniqueId BuiltInId::dFdxExt_Float4;
>+constexpr const TSymbolUniqueId BuiltInId::dFdyExt_Float1;
>+constexpr const TSymbolUniqueId BuiltInId::dFdyExt_Float2;
>+constexpr const TSymbolUniqueId BuiltInId::dFdyExt_Float3;
>+constexpr const TSymbolUniqueId BuiltInId::dFdyExt_Float4;
>+constexpr const TSymbolUniqueId BuiltInId::fwidthExt_Float1;
>+constexpr const TSymbolUniqueId BuiltInId::fwidthExt_Float2;
>+constexpr const TSymbolUniqueId BuiltInId::fwidthExt_Float3;
>+constexpr const TSymbolUniqueId BuiltInId::fwidthExt_Float4;
>+constexpr const TSymbolUniqueId BuiltInId::texture2DLodEXT_Sampler2D1_Float2_Float1;
>+constexpr const TSymbolUniqueId BuiltInId::texture2DProjLodEXT_Sampler2D1_Float3_Float1;
>+constexpr const TSymbolUniqueId BuiltInId::texture2DProjLodEXT_Sampler2D1_Float4_Float1;
>+constexpr const TSymbolUniqueId BuiltInId::textureCubeLodEXT_SamplerCube1_Float3_Float1;
>+constexpr const TSymbolUniqueId BuiltInId::texture2DLod_Sampler2D1_Float2_Float1;
>+constexpr const TSymbolUniqueId BuiltInId::texture2DProjLod_Sampler2D1_Float3_Float1;
>+constexpr const TSymbolUniqueId BuiltInId::texture2DProjLod_Sampler2D1_Float4_Float1;
>+constexpr const TSymbolUniqueId BuiltInId::textureCubeLod_SamplerCube1_Float3_Float1;
>+constexpr const TSymbolUniqueId BuiltInId::texture_Sampler2D1_Float2;
>+constexpr const TSymbolUniqueId BuiltInId::texture_ISampler2D1_Float2;
>+constexpr const TSymbolUniqueId BuiltInId::texture_USampler2D1_Float2;
>+constexpr const TSymbolUniqueId BuiltInId::texture_Sampler3D1_Float3;
>+constexpr const TSymbolUniqueId BuiltInId::texture_ISampler3D1_Float3;
>+constexpr const TSymbolUniqueId BuiltInId::texture_USampler3D1_Float3;
>+constexpr const TSymbolUniqueId BuiltInId::texture_SamplerCube1_Float3;
>+constexpr const TSymbolUniqueId BuiltInId::texture_ISamplerCube1_Float3;
>+constexpr const TSymbolUniqueId BuiltInId::texture_USamplerCube1_Float3;
>+constexpr const TSymbolUniqueId BuiltInId::texture_Sampler2DArray1_Float3;
>+constexpr const TSymbolUniqueId BuiltInId::texture_ISampler2DArray1_Float3;
>+constexpr const TSymbolUniqueId BuiltInId::texture_USampler2DArray1_Float3;
>+constexpr const TSymbolUniqueId BuiltInId::textureProj_Sampler2D1_Float3;
>+constexpr const TSymbolUniqueId BuiltInId::textureProj_ISampler2D1_Float3;
>+constexpr const TSymbolUniqueId BuiltInId::textureProj_USampler2D1_Float3;
>+constexpr const TSymbolUniqueId BuiltInId::textureProj_Sampler2D1_Float4;
>+constexpr const TSymbolUniqueId BuiltInId::textureProj_ISampler2D1_Float4;
>+constexpr const TSymbolUniqueId BuiltInId::textureProj_USampler2D1_Float4;
>+constexpr const TSymbolUniqueId BuiltInId::textureProj_Sampler3D1_Float4;
>+constexpr const TSymbolUniqueId BuiltInId::textureProj_ISampler3D1_Float4;
>+constexpr const TSymbolUniqueId BuiltInId::textureProj_USampler3D1_Float4;
>+constexpr const TSymbolUniqueId BuiltInId::textureLod_Sampler2D1_Float2_Float1;
>+constexpr const TSymbolUniqueId BuiltInId::textureLod_ISampler2D1_Float2_Float1;
>+constexpr const TSymbolUniqueId BuiltInId::textureLod_USampler2D1_Float2_Float1;
>+constexpr const TSymbolUniqueId BuiltInId::textureLod_Sampler3D1_Float3_Float1;
>+constexpr const TSymbolUniqueId BuiltInId::textureLod_ISampler3D1_Float3_Float1;
>+constexpr const TSymbolUniqueId BuiltInId::textureLod_USampler3D1_Float3_Float1;
>+constexpr const TSymbolUniqueId BuiltInId::textureLod_SamplerCube1_Float3_Float1;
>+constexpr const TSymbolUniqueId BuiltInId::textureLod_ISamplerCube1_Float3_Float1;
>+constexpr const TSymbolUniqueId BuiltInId::textureLod_USamplerCube1_Float3_Float1;
>+constexpr const TSymbolUniqueId BuiltInId::textureLod_Sampler2DArray1_Float3_Float1;
>+constexpr const TSymbolUniqueId BuiltInId::textureLod_ISampler2DArray1_Float3_Float1;
>+constexpr const TSymbolUniqueId BuiltInId::textureLod_USampler2DArray1_Float3_Float1;
>+constexpr const TSymbolUniqueId BuiltInId::texture_Sampler2DShadow1_Float3;
>+constexpr const TSymbolUniqueId BuiltInId::texture_SamplerCubeShadow1_Float4;
>+constexpr const TSymbolUniqueId BuiltInId::texture_Sampler2DArrayShadow1_Float4;
>+constexpr const TSymbolUniqueId BuiltInId::textureProj_Sampler2DShadow1_Float4;
>+constexpr const TSymbolUniqueId BuiltInId::textureLod_Sampler2DShadow1_Float3_Float1;
>+constexpr const TSymbolUniqueId BuiltInId::textureSize_Sampler2D1_Int1;
>+constexpr const TSymbolUniqueId BuiltInId::textureSize_ISampler2D1_Int1;
>+constexpr const TSymbolUniqueId BuiltInId::textureSize_USampler2D1_Int1;
>+constexpr const TSymbolUniqueId BuiltInId::textureSize_Sampler3D1_Int1;
>+constexpr const TSymbolUniqueId BuiltInId::textureSize_ISampler3D1_Int1;
>+constexpr const TSymbolUniqueId BuiltInId::textureSize_USampler3D1_Int1;
>+constexpr const TSymbolUniqueId BuiltInId::textureSize_SamplerCube1_Int1;
>+constexpr const TSymbolUniqueId BuiltInId::textureSize_ISamplerCube1_Int1;
>+constexpr const TSymbolUniqueId BuiltInId::textureSize_USamplerCube1_Int1;
>+constexpr const TSymbolUniqueId BuiltInId::textureSize_Sampler2DArray1_Int1;
>+constexpr const TSymbolUniqueId BuiltInId::textureSize_ISampler2DArray1_Int1;
>+constexpr const TSymbolUniqueId BuiltInId::textureSize_USampler2DArray1_Int1;
>+constexpr const TSymbolUniqueId BuiltInId::textureSize_Sampler2DShadow1_Int1;
>+constexpr const TSymbolUniqueId BuiltInId::textureSize_SamplerCubeShadow1_Int1;
>+constexpr const TSymbolUniqueId BuiltInId::textureSize_Sampler2DArrayShadow1_Int1;
>+constexpr const TSymbolUniqueId BuiltInId::textureProjLod_Sampler2D1_Float3_Float1;
>+constexpr const TSymbolUniqueId BuiltInId::textureProjLod_ISampler2D1_Float3_Float1;
>+constexpr const TSymbolUniqueId BuiltInId::textureProjLod_USampler2D1_Float3_Float1;
>+constexpr const TSymbolUniqueId BuiltInId::textureProjLod_Sampler2D1_Float4_Float1;
>+constexpr const TSymbolUniqueId BuiltInId::textureProjLod_ISampler2D1_Float4_Float1;
>+constexpr const TSymbolUniqueId BuiltInId::textureProjLod_USampler2D1_Float4_Float1;
>+constexpr const TSymbolUniqueId BuiltInId::textureProjLod_Sampler3D1_Float4_Float1;
>+constexpr const TSymbolUniqueId BuiltInId::textureProjLod_ISampler3D1_Float4_Float1;
>+constexpr const TSymbolUniqueId BuiltInId::textureProjLod_USampler3D1_Float4_Float1;
>+constexpr const TSymbolUniqueId BuiltInId::textureProjLod_Sampler2DShadow1_Float4_Float1;
>+constexpr const TSymbolUniqueId BuiltInId::texelFetch_Sampler2D1_Int2_Int1;
>+constexpr const TSymbolUniqueId BuiltInId::texelFetch_ISampler2D1_Int2_Int1;
>+constexpr const TSymbolUniqueId BuiltInId::texelFetch_USampler2D1_Int2_Int1;
>+constexpr const TSymbolUniqueId BuiltInId::texelFetch_Sampler3D1_Int3_Int1;
>+constexpr const TSymbolUniqueId BuiltInId::texelFetch_ISampler3D1_Int3_Int1;
>+constexpr const TSymbolUniqueId BuiltInId::texelFetch_USampler3D1_Int3_Int1;
>+constexpr const TSymbolUniqueId BuiltInId::texelFetch_Sampler2DArray1_Int3_Int1;
>+constexpr const TSymbolUniqueId BuiltInId::texelFetch_ISampler2DArray1_Int3_Int1;
>+constexpr const TSymbolUniqueId BuiltInId::texelFetch_USampler2DArray1_Int3_Int1;
>+constexpr const TSymbolUniqueId BuiltInId::textureGrad_Sampler2D1_Float2_Float2_Float2;
>+constexpr const TSymbolUniqueId BuiltInId::textureGrad_ISampler2D1_Float2_Float2_Float2;
>+constexpr const TSymbolUniqueId BuiltInId::textureGrad_USampler2D1_Float2_Float2_Float2;
>+constexpr const TSymbolUniqueId BuiltInId::textureGrad_Sampler3D1_Float3_Float3_Float3;
>+constexpr const TSymbolUniqueId BuiltInId::textureGrad_ISampler3D1_Float3_Float3_Float3;
>+constexpr const TSymbolUniqueId BuiltInId::textureGrad_USampler3D1_Float3_Float3_Float3;
>+constexpr const TSymbolUniqueId BuiltInId::textureGrad_SamplerCube1_Float3_Float3_Float3;
>+constexpr const TSymbolUniqueId BuiltInId::textureGrad_ISamplerCube1_Float3_Float3_Float3;
>+constexpr const TSymbolUniqueId BuiltInId::textureGrad_USamplerCube1_Float3_Float3_Float3;
>+constexpr const TSymbolUniqueId BuiltInId::textureGrad_Sampler2DShadow1_Float3_Float2_Float2;
>+constexpr const TSymbolUniqueId BuiltInId::textureGrad_SamplerCubeShadow1_Float4_Float3_Float3;
>+constexpr const TSymbolUniqueId BuiltInId::textureGrad_Sampler2DArray1_Float3_Float2_Float2;
>+constexpr const TSymbolUniqueId BuiltInId::textureGrad_ISampler2DArray1_Float3_Float2_Float2;
>+constexpr const TSymbolUniqueId BuiltInId::textureGrad_USampler2DArray1_Float3_Float2_Float2;
>+constexpr const TSymbolUniqueId BuiltInId::textureGrad_Sampler2DArrayShadow1_Float4_Float2_Float2;
>+constexpr const TSymbolUniqueId BuiltInId::textureProjGrad_Sampler2D1_Float3_Float2_Float2;
>+constexpr const TSymbolUniqueId BuiltInId::textureProjGrad_ISampler2D1_Float3_Float2_Float2;
>+constexpr const TSymbolUniqueId BuiltInId::textureProjGrad_USampler2D1_Float3_Float2_Float2;
>+constexpr const TSymbolUniqueId BuiltInId::textureProjGrad_Sampler2D1_Float4_Float2_Float2;
>+constexpr const TSymbolUniqueId BuiltInId::textureProjGrad_ISampler2D1_Float4_Float2_Float2;
>+constexpr const TSymbolUniqueId BuiltInId::textureProjGrad_USampler2D1_Float4_Float2_Float2;
>+constexpr const TSymbolUniqueId BuiltInId::textureProjGrad_Sampler3D1_Float4_Float3_Float3;
>+constexpr const TSymbolUniqueId BuiltInId::textureProjGrad_ISampler3D1_Float4_Float3_Float3;
>+constexpr const TSymbolUniqueId BuiltInId::textureProjGrad_USampler3D1_Float4_Float3_Float3;
>+constexpr const TSymbolUniqueId BuiltInId::textureProjGrad_Sampler2DShadow1_Float4_Float2_Float2;
>+constexpr const TSymbolUniqueId BuiltInId::textureSize_Sampler2DMS1;
>+constexpr const TSymbolUniqueId BuiltInId::textureSize_ISampler2DMS1;
>+constexpr const TSymbolUniqueId BuiltInId::textureSize_USampler2DMS1;
>+constexpr const TSymbolUniqueId BuiltInId::textureSizeExt_Sampler2DMS1;
>+constexpr const TSymbolUniqueId BuiltInId::textureSizeExt_ISampler2DMS1;
>+constexpr const TSymbolUniqueId BuiltInId::textureSizeExt_USampler2DMS1;
>+constexpr const TSymbolUniqueId BuiltInId::textureSize_Sampler2DMSArray1;
>+constexpr const TSymbolUniqueId BuiltInId::textureSize_ISampler2DMSArray1;
>+constexpr const TSymbolUniqueId BuiltInId::textureSize_USampler2DMSArray1;
>+constexpr const TSymbolUniqueId BuiltInId::textureOffset_Sampler2D1_Float2_Int2;
>+constexpr const TSymbolUniqueId BuiltInId::textureOffset_ISampler2D1_Float2_Int2;
>+constexpr const TSymbolUniqueId BuiltInId::textureOffset_USampler2D1_Float2_Int2;
>+constexpr const TSymbolUniqueId BuiltInId::textureOffset_Sampler3D1_Float3_Int3;
>+constexpr const TSymbolUniqueId BuiltInId::textureOffset_ISampler3D1_Float3_Int3;
>+constexpr const TSymbolUniqueId BuiltInId::textureOffset_USampler3D1_Float3_Int3;
>+constexpr const TSymbolUniqueId BuiltInId::textureOffset_Sampler2DShadow1_Float3_Int2;
>+constexpr const TSymbolUniqueId BuiltInId::textureOffset_Sampler2DArray1_Float3_Int2;
>+constexpr const TSymbolUniqueId BuiltInId::textureOffset_ISampler2DArray1_Float3_Int2;
>+constexpr const TSymbolUniqueId BuiltInId::textureOffset_USampler2DArray1_Float3_Int2;
>+constexpr const TSymbolUniqueId BuiltInId::textureProjOffset_Sampler2D1_Float3_Int2;
>+constexpr const TSymbolUniqueId BuiltInId::textureProjOffset_ISampler2D1_Float3_Int2;
>+constexpr const TSymbolUniqueId BuiltInId::textureProjOffset_USampler2D1_Float3_Int2;
>+constexpr const TSymbolUniqueId BuiltInId::textureProjOffset_Sampler2D1_Float4_Int2;
>+constexpr const TSymbolUniqueId BuiltInId::textureProjOffset_ISampler2D1_Float4_Int2;
>+constexpr const TSymbolUniqueId BuiltInId::textureProjOffset_USampler2D1_Float4_Int2;
>+constexpr const TSymbolUniqueId BuiltInId::textureProjOffset_Sampler3D1_Float4_Int3;
>+constexpr const TSymbolUniqueId BuiltInId::textureProjOffset_ISampler3D1_Float4_Int3;
>+constexpr const TSymbolUniqueId BuiltInId::textureProjOffset_USampler3D1_Float4_Int3;
>+constexpr const TSymbolUniqueId BuiltInId::textureProjOffset_Sampler2DShadow1_Float4_Int2;
>+constexpr const TSymbolUniqueId BuiltInId::textureLodOffset_Sampler2D1_Float2_Float1_Int2;
>+constexpr const TSymbolUniqueId BuiltInId::textureLodOffset_ISampler2D1_Float2_Float1_Int2;
>+constexpr const TSymbolUniqueId BuiltInId::textureLodOffset_USampler2D1_Float2_Float1_Int2;
>+constexpr const TSymbolUniqueId BuiltInId::textureLodOffset_Sampler3D1_Float3_Float1_Int3;
>+constexpr const TSymbolUniqueId BuiltInId::textureLodOffset_ISampler3D1_Float3_Float1_Int3;
>+constexpr const TSymbolUniqueId BuiltInId::textureLodOffset_USampler3D1_Float3_Float1_Int3;
>+constexpr const TSymbolUniqueId BuiltInId::textureLodOffset_Sampler2DShadow1_Float3_Float1_Int2;
>+constexpr const TSymbolUniqueId BuiltInId::textureLodOffset_Sampler2DArray1_Float3_Float1_Int2;
>+constexpr const TSymbolUniqueId BuiltInId::textureLodOffset_ISampler2DArray1_Float3_Float1_Int2;
>+constexpr const TSymbolUniqueId BuiltInId::textureLodOffset_USampler2DArray1_Float3_Float1_Int2;
>+constexpr const TSymbolUniqueId BuiltInId::textureProjLodOffset_Sampler2D1_Float3_Float1_Int2;
>+constexpr const TSymbolUniqueId BuiltInId::textureProjLodOffset_ISampler2D1_Float3_Float1_Int2;
>+constexpr const TSymbolUniqueId BuiltInId::textureProjLodOffset_USampler2D1_Float3_Float1_Int2;
>+constexpr const TSymbolUniqueId BuiltInId::textureProjLodOffset_Sampler2D1_Float4_Float1_Int2;
>+constexpr const TSymbolUniqueId BuiltInId::textureProjLodOffset_ISampler2D1_Float4_Float1_Int2;
>+constexpr const TSymbolUniqueId BuiltInId::textureProjLodOffset_USampler2D1_Float4_Float1_Int2;
>+constexpr const TSymbolUniqueId BuiltInId::textureProjLodOffset_Sampler3D1_Float4_Float1_Int3;
>+constexpr const TSymbolUniqueId BuiltInId::textureProjLodOffset_ISampler3D1_Float4_Float1_Int3;
>+constexpr const TSymbolUniqueId BuiltInId::textureProjLodOffset_USampler3D1_Float4_Float1_Int3;
>+constexpr const TSymbolUniqueId BuiltInId::textureProjLodOffset_Sampler2DShadow1_Float4_Float1_Int2;
>+constexpr const TSymbolUniqueId BuiltInId::texelFetchOffset_Sampler2D1_Int2_Int1_Int2;
>+constexpr const TSymbolUniqueId BuiltInId::texelFetchOffset_ISampler2D1_Int2_Int1_Int2;
>+constexpr const TSymbolUniqueId BuiltInId::texelFetchOffset_USampler2D1_Int2_Int1_Int2;
>+constexpr const TSymbolUniqueId BuiltInId::texelFetchOffset_Sampler3D1_Int3_Int1_Int3;
>+constexpr const TSymbolUniqueId BuiltInId::texelFetchOffset_ISampler3D1_Int3_Int1_Int3;
>+constexpr const TSymbolUniqueId BuiltInId::texelFetchOffset_USampler3D1_Int3_Int1_Int3;
>+constexpr const TSymbolUniqueId BuiltInId::texelFetchOffset_Sampler2DArray1_Int3_Int1_Int2;
>+constexpr const TSymbolUniqueId BuiltInId::texelFetchOffset_ISampler2DArray1_Int3_Int1_Int2;
>+constexpr const TSymbolUniqueId BuiltInId::texelFetchOffset_USampler2DArray1_Int3_Int1_Int2;
>+constexpr const TSymbolUniqueId BuiltInId::textureGradOffset_Sampler2D1_Float2_Float2_Float2_Int2;
>+constexpr const TSymbolUniqueId BuiltInId::textureGradOffset_ISampler2D1_Float2_Float2_Float2_Int2;
>+constexpr const TSymbolUniqueId BuiltInId::textureGradOffset_USampler2D1_Float2_Float2_Float2_Int2;
>+constexpr const TSymbolUniqueId BuiltInId::textureGradOffset_Sampler3D1_Float3_Float3_Float3_Int3;
>+constexpr const TSymbolUniqueId BuiltInId::textureGradOffset_ISampler3D1_Float3_Float3_Float3_Int3;
>+constexpr const TSymbolUniqueId BuiltInId::textureGradOffset_USampler3D1_Float3_Float3_Float3_Int3;
>+constexpr const TSymbolUniqueId
>+    BuiltInId::textureGradOffset_Sampler2DShadow1_Float3_Float2_Float2_Int2;
>+constexpr const TSymbolUniqueId
>+    BuiltInId::textureGradOffset_Sampler2DArray1_Float3_Float2_Float2_Int2;
>+constexpr const TSymbolUniqueId
>+    BuiltInId::textureGradOffset_ISampler2DArray1_Float3_Float2_Float2_Int2;
>+constexpr const TSymbolUniqueId
>+    BuiltInId::textureGradOffset_USampler2DArray1_Float3_Float2_Float2_Int2;
>+constexpr const TSymbolUniqueId
>+    BuiltInId::textureGradOffset_Sampler2DArrayShadow1_Float4_Float2_Float2_Int2;
>+constexpr const TSymbolUniqueId
>+    BuiltInId::textureProjGradOffset_Sampler2D1_Float3_Float2_Float2_Int2;
>+constexpr const TSymbolUniqueId
>+    BuiltInId::textureProjGradOffset_ISampler2D1_Float3_Float2_Float2_Int2;
>+constexpr const TSymbolUniqueId
>+    BuiltInId::textureProjGradOffset_USampler2D1_Float3_Float2_Float2_Int2;
>+constexpr const TSymbolUniqueId
>+    BuiltInId::textureProjGradOffset_Sampler2D1_Float4_Float2_Float2_Int2;
>+constexpr const TSymbolUniqueId
>+    BuiltInId::textureProjGradOffset_ISampler2D1_Float4_Float2_Float2_Int2;
>+constexpr const TSymbolUniqueId
>+    BuiltInId::textureProjGradOffset_USampler2D1_Float4_Float2_Float2_Int2;
>+constexpr const TSymbolUniqueId
>+    BuiltInId::textureProjGradOffset_Sampler3D1_Float4_Float3_Float3_Int3;
>+constexpr const TSymbolUniqueId
>+    BuiltInId::textureProjGradOffset_ISampler3D1_Float4_Float3_Float3_Int3;
>+constexpr const TSymbolUniqueId
>+    BuiltInId::textureProjGradOffset_USampler3D1_Float4_Float3_Float3_Int3;
>+constexpr const TSymbolUniqueId
>+    BuiltInId::textureProjGradOffset_Sampler2DShadow1_Float4_Float2_Float2_Int2;
>+constexpr const TSymbolUniqueId BuiltInId::textureOffset_Sampler2D1_Float2_Int2_Float1;
>+constexpr const TSymbolUniqueId BuiltInId::textureOffset_ISampler2D1_Float2_Int2_Float1;
>+constexpr const TSymbolUniqueId BuiltInId::textureOffset_USampler2D1_Float2_Int2_Float1;
>+constexpr const TSymbolUniqueId BuiltInId::textureOffset_Sampler3D1_Float3_Int3_Float1;
>+constexpr const TSymbolUniqueId BuiltInId::textureOffset_ISampler3D1_Float3_Int3_Float1;
>+constexpr const TSymbolUniqueId BuiltInId::textureOffset_USampler3D1_Float3_Int3_Float1;
>+constexpr const TSymbolUniqueId BuiltInId::textureOffset_Sampler2DShadow1_Float3_Int2_Float1;
>+constexpr const TSymbolUniqueId BuiltInId::textureOffset_Sampler2DArray1_Float3_Int2_Float1;
>+constexpr const TSymbolUniqueId BuiltInId::textureOffset_ISampler2DArray1_Float3_Int2_Float1;
>+constexpr const TSymbolUniqueId BuiltInId::textureOffset_USampler2DArray1_Float3_Int2_Float1;
>+constexpr const TSymbolUniqueId BuiltInId::textureProjOffset_Sampler2D1_Float3_Int2_Float1;
>+constexpr const TSymbolUniqueId BuiltInId::textureProjOffset_ISampler2D1_Float3_Int2_Float1;
>+constexpr const TSymbolUniqueId BuiltInId::textureProjOffset_USampler2D1_Float3_Int2_Float1;
>+constexpr const TSymbolUniqueId BuiltInId::textureProjOffset_Sampler2D1_Float4_Int2_Float1;
>+constexpr const TSymbolUniqueId BuiltInId::textureProjOffset_ISampler2D1_Float4_Int2_Float1;
>+constexpr const TSymbolUniqueId BuiltInId::textureProjOffset_USampler2D1_Float4_Int2_Float1;
>+constexpr const TSymbolUniqueId BuiltInId::textureProjOffset_Sampler3D1_Float4_Int3_Float1;
>+constexpr const TSymbolUniqueId BuiltInId::textureProjOffset_ISampler3D1_Float4_Int3_Float1;
>+constexpr const TSymbolUniqueId BuiltInId::textureProjOffset_USampler3D1_Float4_Int3_Float1;
>+constexpr const TSymbolUniqueId BuiltInId::textureProjOffset_Sampler2DShadow1_Float4_Int2_Float1;
>+constexpr const TSymbolUniqueId BuiltInId::texture_SamplerExternalOES1_Float2;
>+constexpr const TSymbolUniqueId BuiltInId::textureProj_SamplerExternalOES1_Float3;
>+constexpr const TSymbolUniqueId BuiltInId::textureProj_SamplerExternalOES1_Float4;
>+constexpr const TSymbolUniqueId BuiltInId::textureSize_SamplerExternalOES1_Int1;
>+constexpr const TSymbolUniqueId BuiltInId::texelFetch_SamplerExternalOES1_Int2_Int1;
>+constexpr const TSymbolUniqueId BuiltInId::texture_SamplerExternal2DY2YEXT1_Float2;
>+constexpr const TSymbolUniqueId BuiltInId::textureProj_SamplerExternal2DY2YEXT1_Float3;
>+constexpr const TSymbolUniqueId BuiltInId::textureProj_SamplerExternal2DY2YEXT1_Float4;
>+constexpr const TSymbolUniqueId BuiltInId::rgb_2_yuv_Float3_YuvCscStandardEXT1;
>+constexpr const TSymbolUniqueId BuiltInId::yuv_2_rgb_Float3_YuvCscStandardEXT1;
>+constexpr const TSymbolUniqueId BuiltInId::textureSize_SamplerExternal2DY2YEXT1_Int1;
>+constexpr const TSymbolUniqueId BuiltInId::texelFetch_SamplerExternal2DY2YEXT1_Int2_Int1;
>+constexpr const TSymbolUniqueId BuiltInId::texture_Sampler2D1_Float2_Float1;
>+constexpr const TSymbolUniqueId BuiltInId::texture_ISampler2D1_Float2_Float1;
>+constexpr const TSymbolUniqueId BuiltInId::texture_USampler2D1_Float2_Float1;
>+constexpr const TSymbolUniqueId BuiltInId::texture_Sampler3D1_Float3_Float1;
>+constexpr const TSymbolUniqueId BuiltInId::texture_ISampler3D1_Float3_Float1;
>+constexpr const TSymbolUniqueId BuiltInId::texture_USampler3D1_Float3_Float1;
>+constexpr const TSymbolUniqueId BuiltInId::texture_SamplerCube1_Float3_Float1;
>+constexpr const TSymbolUniqueId BuiltInId::texture_ISamplerCube1_Float3_Float1;
>+constexpr const TSymbolUniqueId BuiltInId::texture_USamplerCube1_Float3_Float1;
>+constexpr const TSymbolUniqueId BuiltInId::texture_Sampler2DArray1_Float3_Float1;
>+constexpr const TSymbolUniqueId BuiltInId::texture_ISampler2DArray1_Float3_Float1;
>+constexpr const TSymbolUniqueId BuiltInId::texture_USampler2DArray1_Float3_Float1;
>+constexpr const TSymbolUniqueId BuiltInId::textureProj_Sampler2D1_Float3_Float1;
>+constexpr const TSymbolUniqueId BuiltInId::textureProj_ISampler2D1_Float3_Float1;
>+constexpr const TSymbolUniqueId BuiltInId::textureProj_USampler2D1_Float3_Float1;
>+constexpr const TSymbolUniqueId BuiltInId::textureProj_Sampler2D1_Float4_Float1;
>+constexpr const TSymbolUniqueId BuiltInId::textureProj_ISampler2D1_Float4_Float1;
>+constexpr const TSymbolUniqueId BuiltInId::textureProj_USampler2D1_Float4_Float1;
>+constexpr const TSymbolUniqueId BuiltInId::textureProj_Sampler3D1_Float4_Float1;
>+constexpr const TSymbolUniqueId BuiltInId::textureProj_ISampler3D1_Float4_Float1;
>+constexpr const TSymbolUniqueId BuiltInId::textureProj_USampler3D1_Float4_Float1;
>+constexpr const TSymbolUniqueId BuiltInId::texture_Sampler2DShadow1_Float3_Float1;
>+constexpr const TSymbolUniqueId BuiltInId::texture_SamplerCubeShadow1_Float4_Float1;
>+constexpr const TSymbolUniqueId BuiltInId::textureProj_Sampler2DShadow1_Float4_Float1;
>+constexpr const TSymbolUniqueId BuiltInId::texture_SamplerExternalOES1_Float2_Float1;
>+constexpr const TSymbolUniqueId BuiltInId::textureProj_SamplerExternalOES1_Float3_Float1;
>+constexpr const TSymbolUniqueId BuiltInId::textureProj_SamplerExternalOES1_Float4_Float1;
>+constexpr const TSymbolUniqueId BuiltInId::texture_SamplerExternal2DY2YEXT1_Float2_Float1;
>+constexpr const TSymbolUniqueId BuiltInId::textureProj_SamplerExternal2DY2YEXT1_Float3_Float1;
>+constexpr const TSymbolUniqueId BuiltInId::textureProj_SamplerExternal2DY2YEXT1_Float4_Float1;
>+constexpr const TSymbolUniqueId BuiltInId::texelFetch_Sampler2DMS1_Int2_Int1;
>+constexpr const TSymbolUniqueId BuiltInId::texelFetch_ISampler2DMS1_Int2_Int1;
>+constexpr const TSymbolUniqueId BuiltInId::texelFetch_USampler2DMS1_Int2_Int1;
>+constexpr const TSymbolUniqueId BuiltInId::texelFetchExt_Sampler2DMS1_Int2_Int1;
>+constexpr const TSymbolUniqueId BuiltInId::texelFetchExt_ISampler2DMS1_Int2_Int1;
>+constexpr const TSymbolUniqueId BuiltInId::texelFetchExt_USampler2DMS1_Int2_Int1;
>+constexpr const TSymbolUniqueId BuiltInId::texelFetch_Sampler2DMSArray1_Int3_Int1;
>+constexpr const TSymbolUniqueId BuiltInId::texelFetch_ISampler2DMSArray1_Int3_Int1;
>+constexpr const TSymbolUniqueId BuiltInId::texelFetch_USampler2DMSArray1_Int3_Int1;
>+constexpr const TSymbolUniqueId BuiltInId::textureGather_Sampler2D1_Float2;
>+constexpr const TSymbolUniqueId BuiltInId::textureGather_ISampler2D1_Float2;
>+constexpr const TSymbolUniqueId BuiltInId::textureGather_USampler2D1_Float2;
>+constexpr const TSymbolUniqueId BuiltInId::textureGather_Sampler2D1_Float2_Int1;
>+constexpr const TSymbolUniqueId BuiltInId::textureGather_ISampler2D1_Float2_Int1;
>+constexpr const TSymbolUniqueId BuiltInId::textureGather_USampler2D1_Float2_Int1;
>+constexpr const TSymbolUniqueId BuiltInId::textureGather_Sampler2DArray1_Float3;
>+constexpr const TSymbolUniqueId BuiltInId::textureGather_ISampler2DArray1_Float3;
>+constexpr const TSymbolUniqueId BuiltInId::textureGather_USampler2DArray1_Float3;
>+constexpr const TSymbolUniqueId BuiltInId::textureGather_Sampler2DArray1_Float3_Int1;
>+constexpr const TSymbolUniqueId BuiltInId::textureGather_ISampler2DArray1_Float3_Int1;
>+constexpr const TSymbolUniqueId BuiltInId::textureGather_USampler2DArray1_Float3_Int1;
>+constexpr const TSymbolUniqueId BuiltInId::textureGather_SamplerCube1_Float3;
>+constexpr const TSymbolUniqueId BuiltInId::textureGather_ISamplerCube1_Float3;
>+constexpr const TSymbolUniqueId BuiltInId::textureGather_USamplerCube1_Float3;
>+constexpr const TSymbolUniqueId BuiltInId::textureGather_SamplerCube1_Float3_Int1;
>+constexpr const TSymbolUniqueId BuiltInId::textureGather_ISamplerCube1_Float3_Int1;
>+constexpr const TSymbolUniqueId BuiltInId::textureGather_USamplerCube1_Float3_Int1;
>+constexpr const TSymbolUniqueId BuiltInId::textureGather_Sampler2DShadow1_Float2;
>+constexpr const TSymbolUniqueId BuiltInId::textureGather_Sampler2DShadow1_Float2_Float1;
>+constexpr const TSymbolUniqueId BuiltInId::textureGather_Sampler2DArrayShadow1_Float3;
>+constexpr const TSymbolUniqueId BuiltInId::textureGather_Sampler2DArrayShadow1_Float3_Float1;
>+constexpr const TSymbolUniqueId BuiltInId::textureGather_SamplerCubeShadow1_Float3;
>+constexpr const TSymbolUniqueId BuiltInId::textureGather_SamplerCubeShadow1_Float3_Float1;
>+constexpr const TSymbolUniqueId BuiltInId::textureGatherOffset_Sampler2D1_Float2_Int2;
>+constexpr const TSymbolUniqueId BuiltInId::textureGatherOffset_ISampler2D1_Float2_Int2;
>+constexpr const TSymbolUniqueId BuiltInId::textureGatherOffset_USampler2D1_Float2_Int2;
>+constexpr const TSymbolUniqueId BuiltInId::textureGatherOffset_Sampler2D1_Float2_Int2_Int1;
>+constexpr const TSymbolUniqueId BuiltInId::textureGatherOffset_ISampler2D1_Float2_Int2_Int1;
>+constexpr const TSymbolUniqueId BuiltInId::textureGatherOffset_USampler2D1_Float2_Int2_Int1;
>+constexpr const TSymbolUniqueId BuiltInId::textureGatherOffset_Sampler2DArray1_Float3_Int2;
>+constexpr const TSymbolUniqueId BuiltInId::textureGatherOffset_ISampler2DArray1_Float3_Int2;
>+constexpr const TSymbolUniqueId BuiltInId::textureGatherOffset_USampler2DArray1_Float3_Int2;
>+constexpr const TSymbolUniqueId BuiltInId::textureGatherOffset_Sampler2DArray1_Float3_Int2_Int1;
>+constexpr const TSymbolUniqueId BuiltInId::textureGatherOffset_ISampler2DArray1_Float3_Int2_Int1;
>+constexpr const TSymbolUniqueId BuiltInId::textureGatherOffset_USampler2DArray1_Float3_Int2_Int1;
>+constexpr const TSymbolUniqueId BuiltInId::textureGatherOffset_Sampler2DShadow1_Float2_Float1_Int2;
>+constexpr const TSymbolUniqueId
>+    BuiltInId::textureGatherOffset_Sampler2DArrayShadow1_Float3_Float1_Int2;
>+constexpr const TSymbolUniqueId BuiltInId::dFdx_Float1;
>+constexpr const TSymbolUniqueId BuiltInId::dFdx_Float2;
>+constexpr const TSymbolUniqueId BuiltInId::dFdx_Float3;
>+constexpr const TSymbolUniqueId BuiltInId::dFdx_Float4;
>+constexpr const TSymbolUniqueId BuiltInId::dFdy_Float1;
>+constexpr const TSymbolUniqueId BuiltInId::dFdy_Float2;
>+constexpr const TSymbolUniqueId BuiltInId::dFdy_Float3;
>+constexpr const TSymbolUniqueId BuiltInId::dFdy_Float4;
>+constexpr const TSymbolUniqueId BuiltInId::fwidth_Float1;
>+constexpr const TSymbolUniqueId BuiltInId::fwidth_Float2;
>+constexpr const TSymbolUniqueId BuiltInId::fwidth_Float3;
>+constexpr const TSymbolUniqueId BuiltInId::fwidth_Float4;
>+constexpr const TSymbolUniqueId BuiltInId::atomicCounter_AtomicCounter1;
>+constexpr const TSymbolUniqueId BuiltInId::atomicCounterIncrement_AtomicCounter1;
>+constexpr const TSymbolUniqueId BuiltInId::atomicCounterDecrement_AtomicCounter1;
>+constexpr const TSymbolUniqueId BuiltInId::atomicAdd_UInt1_UInt1;
>+constexpr const TSymbolUniqueId BuiltInId::atomicAdd_Int1_Int1;
>+constexpr const TSymbolUniqueId BuiltInId::atomicMin_UInt1_UInt1;
>+constexpr const TSymbolUniqueId BuiltInId::atomicMin_Int1_Int1;
>+constexpr const TSymbolUniqueId BuiltInId::atomicMax_UInt1_UInt1;
>+constexpr const TSymbolUniqueId BuiltInId::atomicMax_Int1_Int1;
>+constexpr const TSymbolUniqueId BuiltInId::atomicAnd_UInt1_UInt1;
>+constexpr const TSymbolUniqueId BuiltInId::atomicAnd_Int1_Int1;
>+constexpr const TSymbolUniqueId BuiltInId::atomicOr_UInt1_UInt1;
>+constexpr const TSymbolUniqueId BuiltInId::atomicOr_Int1_Int1;
>+constexpr const TSymbolUniqueId BuiltInId::atomicXor_UInt1_UInt1;
>+constexpr const TSymbolUniqueId BuiltInId::atomicXor_Int1_Int1;
>+constexpr const TSymbolUniqueId BuiltInId::atomicExchange_UInt1_UInt1;
>+constexpr const TSymbolUniqueId BuiltInId::atomicExchange_Int1_Int1;
>+constexpr const TSymbolUniqueId BuiltInId::atomicCompSwap_UInt1_UInt1_UInt1;
>+constexpr const TSymbolUniqueId BuiltInId::atomicCompSwap_Int1_Int1_Int1;
>+constexpr const TSymbolUniqueId BuiltInId::imageSize_Image2D1;
>+constexpr const TSymbolUniqueId BuiltInId::imageSize_IImage2D1;
>+constexpr const TSymbolUniqueId BuiltInId::imageSize_UImage2D1;
>+constexpr const TSymbolUniqueId BuiltInId::imageSize_Image3D1;
>+constexpr const TSymbolUniqueId BuiltInId::imageSize_IImage3D1;
>+constexpr const TSymbolUniqueId BuiltInId::imageSize_UImage3D1;
>+constexpr const TSymbolUniqueId BuiltInId::imageSize_Image2DArray1;
>+constexpr const TSymbolUniqueId BuiltInId::imageSize_IImage2DArray1;
>+constexpr const TSymbolUniqueId BuiltInId::imageSize_UImage2DArray1;
>+constexpr const TSymbolUniqueId BuiltInId::imageSize_ImageCube1;
>+constexpr const TSymbolUniqueId BuiltInId::imageSize_IImageCube1;
>+constexpr const TSymbolUniqueId BuiltInId::imageSize_UImageCube1;
>+constexpr const TSymbolUniqueId BuiltInId::imageLoad_Image2D1_Int2;
>+constexpr const TSymbolUniqueId BuiltInId::imageLoad_IImage2D1_Int2;
>+constexpr const TSymbolUniqueId BuiltInId::imageLoad_UImage2D1_Int2;
>+constexpr const TSymbolUniqueId BuiltInId::imageLoad_Image3D1_Int3;
>+constexpr const TSymbolUniqueId BuiltInId::imageLoad_IImage3D1_Int3;
>+constexpr const TSymbolUniqueId BuiltInId::imageLoad_UImage3D1_Int3;
>+constexpr const TSymbolUniqueId BuiltInId::imageLoad_Image2DArray1_Int3;
>+constexpr const TSymbolUniqueId BuiltInId::imageLoad_IImage2DArray1_Int3;
>+constexpr const TSymbolUniqueId BuiltInId::imageLoad_UImage2DArray1_Int3;
>+constexpr const TSymbolUniqueId BuiltInId::imageLoad_ImageCube1_Int3;
>+constexpr const TSymbolUniqueId BuiltInId::imageLoad_IImageCube1_Int3;
>+constexpr const TSymbolUniqueId BuiltInId::imageLoad_UImageCube1_Int3;
>+constexpr const TSymbolUniqueId BuiltInId::imageStore_Image2D1_Int2_Float4;
>+constexpr const TSymbolUniqueId BuiltInId::imageStore_IImage2D1_Int2_Int4;
>+constexpr const TSymbolUniqueId BuiltInId::imageStore_UImage2D1_Int2_UInt4;
>+constexpr const TSymbolUniqueId BuiltInId::imageStore_Image3D1_Int3_Float4;
>+constexpr const TSymbolUniqueId BuiltInId::imageStore_IImage3D1_Int3_Int4;
>+constexpr const TSymbolUniqueId BuiltInId::imageStore_UImage3D1_Int3_UInt4;
>+constexpr const TSymbolUniqueId BuiltInId::imageStore_Image2DArray1_Int3_Float4;
>+constexpr const TSymbolUniqueId BuiltInId::imageStore_IImage2DArray1_Int3_Int4;
>+constexpr const TSymbolUniqueId BuiltInId::imageStore_UImage2DArray1_Int3_UInt4;
>+constexpr const TSymbolUniqueId BuiltInId::imageStore_ImageCube1_Int3_Float4;
>+constexpr const TSymbolUniqueId BuiltInId::imageStore_IImageCube1_Int3_Int4;
>+constexpr const TSymbolUniqueId BuiltInId::imageStore_UImageCube1_Int3_UInt4;
>+constexpr const TSymbolUniqueId BuiltInId::memoryBarrier;
>+constexpr const TSymbolUniqueId BuiltInId::memoryBarrierAtomicCounter;
>+constexpr const TSymbolUniqueId BuiltInId::memoryBarrierBuffer;
>+constexpr const TSymbolUniqueId BuiltInId::memoryBarrierImage;
>+constexpr const TSymbolUniqueId BuiltInId::barrier;
>+constexpr const TSymbolUniqueId BuiltInId::memoryBarrierShared;
>+constexpr const TSymbolUniqueId BuiltInId::groupMemoryBarrier;
>+constexpr const TSymbolUniqueId BuiltInId::EmitVertex;
>+constexpr const TSymbolUniqueId BuiltInId::EndPrimitive;
>+constexpr const TSymbolUniqueId BuiltInId::gl_DepthRangeParameters;
>+constexpr const TSymbolUniqueId BuiltInId::gl_DepthRange;
>+constexpr const TSymbolUniqueId BuiltInId::gl_MaxVertexAttribs;
>+constexpr const TSymbolUniqueId BuiltInId::gl_MaxVertexUniformVectors;
>+constexpr const TSymbolUniqueId BuiltInId::gl_MaxVertexTextureImageUnits;
>+constexpr const TSymbolUniqueId BuiltInId::gl_MaxCombinedTextureImageUnits;
>+constexpr const TSymbolUniqueId BuiltInId::gl_MaxTextureImageUnits;
>+constexpr const TSymbolUniqueId BuiltInId::gl_MaxFragmentUniformVectors;
>+constexpr const TSymbolUniqueId BuiltInId::gl_MaxVaryingVectors;
>+constexpr const TSymbolUniqueId BuiltInId::gl_MaxDrawBuffers;
>+constexpr const TSymbolUniqueId BuiltInId::gl_MaxDualSourceDrawBuffersEXT;
>+constexpr const TSymbolUniqueId BuiltInId::gl_MaxVertexOutputVectors;
>+constexpr const TSymbolUniqueId BuiltInId::gl_MaxFragmentInputVectors;
>+constexpr const TSymbolUniqueId BuiltInId::gl_MinProgramTexelOffset;
>+constexpr const TSymbolUniqueId BuiltInId::gl_MaxProgramTexelOffset;
>+constexpr const TSymbolUniqueId BuiltInId::gl_MaxImageUnits;
>+constexpr const TSymbolUniqueId BuiltInId::gl_MaxVertexImageUniforms;
>+constexpr const TSymbolUniqueId BuiltInId::gl_MaxFragmentImageUniforms;
>+constexpr const TSymbolUniqueId BuiltInId::gl_MaxComputeImageUniforms;
>+constexpr const TSymbolUniqueId BuiltInId::gl_MaxCombinedImageUniforms;
>+constexpr const TSymbolUniqueId BuiltInId::gl_MaxCombinedShaderOutputResources;
>+constexpr const TSymbolUniqueId BuiltInId::gl_MaxComputeWorkGroupCount;
>+constexpr const TSymbolUniqueId BuiltInId::gl_MaxComputeWorkGroupSize;
>+constexpr const TSymbolUniqueId BuiltInId::gl_MaxComputeUniformComponents;
>+constexpr const TSymbolUniqueId BuiltInId::gl_MaxComputeTextureImageUnits;
>+constexpr const TSymbolUniqueId BuiltInId::gl_MaxComputeAtomicCounters;
>+constexpr const TSymbolUniqueId BuiltInId::gl_MaxComputeAtomicCounterBuffers;
>+constexpr const TSymbolUniqueId BuiltInId::gl_MaxVertexAtomicCounters;
>+constexpr const TSymbolUniqueId BuiltInId::gl_MaxFragmentAtomicCounters;
>+constexpr const TSymbolUniqueId BuiltInId::gl_MaxCombinedAtomicCounters;
>+constexpr const TSymbolUniqueId BuiltInId::gl_MaxAtomicCounterBindings;
>+constexpr const TSymbolUniqueId BuiltInId::gl_MaxVertexAtomicCounterBuffers;
>+constexpr const TSymbolUniqueId BuiltInId::gl_MaxFragmentAtomicCounterBuffers;
>+constexpr const TSymbolUniqueId BuiltInId::gl_MaxCombinedAtomicCounterBuffers;
>+constexpr const TSymbolUniqueId BuiltInId::gl_MaxAtomicCounterBufferSize;
>+constexpr const TSymbolUniqueId BuiltInId::gl_MaxGeometryInputComponents;
>+constexpr const TSymbolUniqueId BuiltInId::gl_MaxGeometryOutputComponents;
>+constexpr const TSymbolUniqueId BuiltInId::gl_MaxGeometryImageUniforms;
>+constexpr const TSymbolUniqueId BuiltInId::gl_MaxGeometryTextureImageUnits;
>+constexpr const TSymbolUniqueId BuiltInId::gl_MaxGeometryOutputVertices;
>+constexpr const TSymbolUniqueId BuiltInId::gl_MaxGeometryTotalOutputComponents;
>+constexpr const TSymbolUniqueId BuiltInId::gl_MaxGeometryUniformComponents;
>+constexpr const TSymbolUniqueId BuiltInId::gl_MaxGeometryAtomicCounters;
>+constexpr const TSymbolUniqueId BuiltInId::gl_MaxGeometryAtomicCounterBuffers;
>+constexpr const TSymbolUniqueId BuiltInId::gl_FragCoord;
>+constexpr const TSymbolUniqueId BuiltInId::gl_FrontFacing;
>+constexpr const TSymbolUniqueId BuiltInId::gl_PointCoord;
>+constexpr const TSymbolUniqueId BuiltInId::gl_FragColor;
>+constexpr const TSymbolUniqueId BuiltInId::gl_FragData;
>+constexpr const TSymbolUniqueId BuiltInId::gl_FragDepth;
>+constexpr const TSymbolUniqueId BuiltInId::gl_SecondaryFragColorEXT;
>+constexpr const TSymbolUniqueId BuiltInId::gl_SecondaryFragDataEXT;
>+constexpr const TSymbolUniqueId BuiltInId::gl_FragDepthEXT;
>+constexpr const TSymbolUniqueId BuiltInId::gl_LastFragData;
>+constexpr const TSymbolUniqueId BuiltInId::gl_LastFragColor;
>+constexpr const TSymbolUniqueId BuiltInId::gl_LastFragDataNV;
>+constexpr const TSymbolUniqueId BuiltInId::gl_LastFragColorARM;
>+constexpr const TSymbolUniqueId BuiltInId::gl_PrimitiveID;
>+constexpr const TSymbolUniqueId BuiltInId::gl_Layer;
>+constexpr const TSymbolUniqueId BuiltInId::gl_Position;
>+constexpr const TSymbolUniqueId BuiltInId::gl_PointSize;
>+constexpr const TSymbolUniqueId BuiltInId::gl_InstanceID;
>+constexpr const TSymbolUniqueId BuiltInId::gl_VertexID;
>+constexpr const TSymbolUniqueId BuiltInId::gl_ViewportIndex;
>+constexpr const TSymbolUniqueId BuiltInId::gl_LayerVS;
>+constexpr const TSymbolUniqueId BuiltInId::gl_DrawID;
>+constexpr const TSymbolUniqueId BuiltInId::gl_DrawIDESSL1;
>+constexpr const TSymbolUniqueId BuiltInId::gl_NumWorkGroups;
>+constexpr const TSymbolUniqueId BuiltInId::gl_WorkGroupSize;
>+constexpr const TSymbolUniqueId BuiltInId::gl_WorkGroupID;
>+constexpr const TSymbolUniqueId BuiltInId::gl_LocalInvocationID;
>+constexpr const TSymbolUniqueId BuiltInId::gl_GlobalInvocationID;
>+constexpr const TSymbolUniqueId BuiltInId::gl_LocalInvocationIndex;
>+constexpr const TSymbolUniqueId BuiltInId::gl_PrimitiveIDIn;
>+constexpr const TSymbolUniqueId BuiltInId::gl_InvocationID;
>+constexpr const TSymbolUniqueId BuiltInId::gl_PrimitiveIDGS;
>+constexpr const TSymbolUniqueId BuiltInId::gl_LayerGS;
>+constexpr const TSymbolUniqueId BuiltInId::gl_PerVertex;
>+constexpr const TSymbolUniqueId BuiltInId::gl_in;
>+constexpr const TSymbolUniqueId BuiltInId::gl_PerVertexOutBlock;
>+constexpr const TSymbolUniqueId BuiltInId::gl_PositionGS;
>+constexpr const TSymbolUniqueId BuiltInId::gl_ViewID_OVR;
>+constexpr const TSymbolUniqueId BuiltInId::gl_ViewID_OVRESSL1;
>+
>+const int TSymbolTable::kLastBuiltInId = 1025;
>+
>+namespace BuiltInName
>+{
>+
>+constexpr const ImmutableString _empty("");
>+constexpr const ImmutableString EmitVertex("EmitVertex");
>+constexpr const ImmutableString EndPrimitive("EndPrimitive");
>+constexpr const ImmutableString abs("abs");
>+constexpr const ImmutableString acos("acos");
>+constexpr const ImmutableString acosh("acosh");
>+constexpr const ImmutableString all("all");
>+constexpr const ImmutableString any("any");
>+constexpr const ImmutableString asin("asin");
>+constexpr const ImmutableString asinh("asinh");
>+constexpr const ImmutableString atan("atan");
>+constexpr const ImmutableString atanh("atanh");
>+constexpr const ImmutableString atomicAdd("atomicAdd");
>+constexpr const ImmutableString atomicAnd("atomicAnd");
>+constexpr const ImmutableString atomicCompSwap("atomicCompSwap");
>+constexpr const ImmutableString atomicCompSwap_0D0D0D("atomicCompSwap(0D0D0D");
>+constexpr const ImmutableString atomicCounter("atomicCounter");
>+constexpr const ImmutableString atomicCounterDecrement("atomicCounterDecrement");
>+constexpr const ImmutableString atomicCounterIncrement("atomicCounterIncrement");
>+constexpr const ImmutableString atomicExchange("atomicExchange");
>+constexpr const ImmutableString atomicMax("atomicMax");
>+constexpr const ImmutableString atomicMin("atomicMin");
>+constexpr const ImmutableString atomicOr("atomicOr");
>+constexpr const ImmutableString atomicXor("atomicXor");
>+constexpr const ImmutableString barrier("barrier");
>+constexpr const ImmutableString bitCount("bitCount");
>+constexpr const ImmutableString bitfieldExtract("bitfieldExtract");
>+constexpr const ImmutableString bitfieldExtract_0D0C0C("bitfieldExtract(0D0C0C");
>+constexpr const ImmutableString bitfieldExtract_1C0C0C("bitfieldExtract(1C0C0C");
>+constexpr const ImmutableString bitfieldExtract_3C0C0C("bitfieldExtract(3C0C0C");
>+constexpr const ImmutableString bitfieldInsert("bitfieldInsert");
>+constexpr const ImmutableString bitfieldInsert_0C0C0C0C("bitfieldInsert(0C0C0C0C");
>+constexpr const ImmutableString bitfieldInsert_0D0D0C0C("bitfieldInsert(0D0D0C0C");
>+constexpr const ImmutableString bitfieldInsert_1C1C0C0C("bitfieldInsert(1C1C0C0C");
>+constexpr const ImmutableString bitfieldInsert_1D1D0C0C("bitfieldInsert(1D1D0C0C");
>+constexpr const ImmutableString bitfieldInsert_2C2C0C0C("bitfieldInsert(2C2C0C0C");
>+constexpr const ImmutableString bitfieldInsert_2D2D0C0C("bitfieldInsert(2D2D0C0C");
>+constexpr const ImmutableString bitfieldInsert_3C3C0C0C("bitfieldInsert(3C3C0C0C");
>+constexpr const ImmutableString bitfieldInsert_3D3D0C0C("bitfieldInsert(3D3D0C0C");
>+constexpr const ImmutableString bitfieldReverse("bitfieldReverse");
>+constexpr const ImmutableString ceil("ceil");
>+constexpr const ImmutableString clamp("clamp");
>+constexpr const ImmutableString clamp_0D0D0D("clamp(0D0D0D");
>+constexpr const ImmutableString clamp_1B0B0B("clamp(1B0B0B");
>+constexpr const ImmutableString clamp_1B1B1B("clamp(1B1B1B");
>+constexpr const ImmutableString clamp_1C0C0C("clamp(1C0C0C");
>+constexpr const ImmutableString clamp_1C1C1C("clamp(1C1C1C");
>+constexpr const ImmutableString clamp_1D1D1D("clamp(1D1D1D");
>+constexpr const ImmutableString clamp_2C2C2C("clamp(2C2C2C");
>+constexpr const ImmutableString clamp_3B0B0B("clamp(3B0B0B");
>+constexpr const ImmutableString clamp_3C0C0C("clamp(3C0C0C");
>+constexpr const ImmutableString clamp_3D0D0D("clamp(3D0D0D");
>+constexpr const ImmutableString cos("cos");
>+constexpr const ImmutableString cosh("cosh");
>+constexpr const ImmutableString cross("cross");
>+constexpr const ImmutableString dFdx("dFdx");
>+constexpr const ImmutableString dFdxExt("dFdx");
>+constexpr const ImmutableString dFdy("dFdy");
>+constexpr const ImmutableString dFdyExt("dFdy");
>+constexpr const ImmutableString degrees("degrees");
>+constexpr const ImmutableString determinant("determinant");
>+constexpr const ImmutableString diff("diff");
>+constexpr const ImmutableString distance("distance");
>+constexpr const ImmutableString dot("dot");
>+constexpr const ImmutableString equal("equal");
>+constexpr const ImmutableString exp("exp");
>+constexpr const ImmutableString exp2("exp2");
>+constexpr const ImmutableString faceforward("faceforward");
>+constexpr const ImmutableString faceforward_1B1B1B("faceforward(1B1B1B");
>+constexpr const ImmutableString faceforward_2B2B2B("faceforward(2B2B2B");
>+constexpr const ImmutableString faceforward_3B3B3B("faceforward(3B3B3B");
>+constexpr const ImmutableString far("far");
>+constexpr const ImmutableString findLSB("findLSB");
>+constexpr const ImmutableString findMSB("findMSB");
>+constexpr const ImmutableString floatBitsToInt("floatBitsToInt");
>+constexpr const ImmutableString floatBitsToUint("floatBitsToUint");
>+constexpr const ImmutableString floor("floor");
>+constexpr const ImmutableString fract("fract");
>+constexpr const ImmutableString frexp("frexp");
>+constexpr const ImmutableString frexp_3B3C("frexp(3B3C");
>+constexpr const ImmutableString fwidth("fwidth");
>+constexpr const ImmutableString fwidthExt("fwidth");
>+constexpr const ImmutableString gl_DepthRange("gl_DepthRange");
>+constexpr const ImmutableString gl_DepthRangeParameters("gl_DepthRangeParameters");
>+constexpr const ImmutableString gl_DrawID("gl_DrawID");
>+constexpr const ImmutableString gl_FragColor("gl_FragColor");
>+constexpr const ImmutableString gl_FragCoord("gl_FragCoord");
>+constexpr const ImmutableString gl_FragData("gl_FragData");
>+constexpr const ImmutableString gl_FragDepth("gl_FragDepth");
>+constexpr const ImmutableString gl_FragDepthEXT("gl_FragDepthEXT");
>+constexpr const ImmutableString gl_FrontFacing("gl_FrontFacing");
>+constexpr const ImmutableString gl_GlobalInvocationID("gl_GlobalInvocationID");
>+constexpr const ImmutableString gl_InstanceID("gl_InstanceID");
>+constexpr const ImmutableString gl_InvocationID("gl_InvocationID");
>+constexpr const ImmutableString gl_LastFragColor("gl_LastFragColor");
>+constexpr const ImmutableString gl_LastFragColorARM("gl_LastFragColorARM");
>+constexpr const ImmutableString gl_LastFragData("gl_LastFragData");
>+constexpr const ImmutableString gl_Layer("gl_Layer");
>+constexpr const ImmutableString gl_LocalInvocationID("gl_LocalInvocationID");
>+constexpr const ImmutableString gl_LocalInvocationIndex("gl_LocalInvocationIndex");
>+constexpr const ImmutableString gl_MaxAtomicCounterBindings("gl_MaxAtomicCounterBindings");
>+constexpr const ImmutableString gl_MaxAtomicCounterBufferSize("gl_MaxAtomicCounterBufferSize");
>+constexpr const ImmutableString gl_MaxCombinedAtomicCounterBuffers(
>+    "gl_MaxCombinedAtomicCounterBuffers");
>+constexpr const ImmutableString gl_MaxCombinedAtomicCounters("gl_MaxCombinedAtomicCounters");
>+constexpr const ImmutableString gl_MaxCombinedImageUniforms("gl_MaxCombinedImageUniforms");
>+constexpr const ImmutableString gl_MaxCombinedShaderOutputResources(
>+    "gl_MaxCombinedShaderOutputResources");
>+constexpr const ImmutableString gl_MaxCombinedTextureImageUnits("gl_MaxCombinedTextureImageUnits");
>+constexpr const ImmutableString gl_MaxComputeAtomicCounterBuffers(
>+    "gl_MaxComputeAtomicCounterBuffers");
>+constexpr const ImmutableString gl_MaxComputeAtomicCounters("gl_MaxComputeAtomicCounters");
>+constexpr const ImmutableString gl_MaxComputeImageUniforms("gl_MaxComputeImageUniforms");
>+constexpr const ImmutableString gl_MaxComputeTextureImageUnits("gl_MaxComputeTextureImageUnits");
>+constexpr const ImmutableString gl_MaxComputeUniformComponents("gl_MaxComputeUniformComponents");
>+constexpr const ImmutableString gl_MaxComputeWorkGroupCount("gl_MaxComputeWorkGroupCount");
>+constexpr const ImmutableString gl_MaxComputeWorkGroupSize("gl_MaxComputeWorkGroupSize");
>+constexpr const ImmutableString gl_MaxDrawBuffers("gl_MaxDrawBuffers");
>+constexpr const ImmutableString gl_MaxDualSourceDrawBuffersEXT("gl_MaxDualSourceDrawBuffersEXT");
>+constexpr const ImmutableString gl_MaxFragmentAtomicCounterBuffers(
>+    "gl_MaxFragmentAtomicCounterBuffers");
>+constexpr const ImmutableString gl_MaxFragmentAtomicCounters("gl_MaxFragmentAtomicCounters");
>+constexpr const ImmutableString gl_MaxFragmentImageUniforms("gl_MaxFragmentImageUniforms");
>+constexpr const ImmutableString gl_MaxFragmentInputVectors("gl_MaxFragmentInputVectors");
>+constexpr const ImmutableString gl_MaxFragmentUniformVectors("gl_MaxFragmentUniformVectors");
>+constexpr const ImmutableString gl_MaxGeometryAtomicCounterBuffers(
>+    "gl_MaxGeometryAtomicCounterBuffers");
>+constexpr const ImmutableString gl_MaxGeometryAtomicCounters("gl_MaxGeometryAtomicCounters");
>+constexpr const ImmutableString gl_MaxGeometryImageUniforms("gl_MaxGeometryImageUniforms");
>+constexpr const ImmutableString gl_MaxGeometryInputComponents("gl_MaxGeometryInputComponents");
>+constexpr const ImmutableString gl_MaxGeometryOutputComponents("gl_MaxGeometryOutputComponents");
>+constexpr const ImmutableString gl_MaxGeometryOutputVertices("gl_MaxGeometryOutputVertices");
>+constexpr const ImmutableString gl_MaxGeometryTextureImageUnits("gl_MaxGeometryTextureImageUnits");
>+constexpr const ImmutableString gl_MaxGeometryTotalOutputComponents(
>+    "gl_MaxGeometryTotalOutputComponents");
>+constexpr const ImmutableString gl_MaxGeometryUniformComponents("gl_MaxGeometryUniformComponents");
>+constexpr const ImmutableString gl_MaxImageUnits("gl_MaxImageUnits");
>+constexpr const ImmutableString gl_MaxProgramTexelOffset("gl_MaxProgramTexelOffset");
>+constexpr const ImmutableString gl_MaxTextureImageUnits("gl_MaxTextureImageUnits");
>+constexpr const ImmutableString gl_MaxVaryingVectors("gl_MaxVaryingVectors");
>+constexpr const ImmutableString gl_MaxVertexAtomicCounterBuffers(
>+    "gl_MaxVertexAtomicCounterBuffers");
>+constexpr const ImmutableString gl_MaxVertexAtomicCounters("gl_MaxVertexAtomicCounters");
>+constexpr const ImmutableString gl_MaxVertexAttribs("gl_MaxVertexAttribs");
>+constexpr const ImmutableString gl_MaxVertexImageUniforms("gl_MaxVertexImageUniforms");
>+constexpr const ImmutableString gl_MaxVertexOutputVectors("gl_MaxVertexOutputVectors");
>+constexpr const ImmutableString gl_MaxVertexTextureImageUnits("gl_MaxVertexTextureImageUnits");
>+constexpr const ImmutableString gl_MaxVertexUniformVectors("gl_MaxVertexUniformVectors");
>+constexpr const ImmutableString gl_MinProgramTexelOffset("gl_MinProgramTexelOffset");
>+constexpr const ImmutableString gl_NumWorkGroups("gl_NumWorkGroups");
>+constexpr const ImmutableString gl_PerVertex("gl_PerVertex");
>+constexpr const ImmutableString gl_PointCoord("gl_PointCoord");
>+constexpr const ImmutableString gl_PointSize("gl_PointSize");
>+constexpr const ImmutableString gl_Position("gl_Position");
>+constexpr const ImmutableString gl_PrimitiveID("gl_PrimitiveID");
>+constexpr const ImmutableString gl_PrimitiveIDIn("gl_PrimitiveIDIn");
>+constexpr const ImmutableString gl_SecondaryFragColorEXT("gl_SecondaryFragColorEXT");
>+constexpr const ImmutableString gl_SecondaryFragDataEXT("gl_SecondaryFragDataEXT");
>+constexpr const ImmutableString gl_VertexID("gl_VertexID");
>+constexpr const ImmutableString gl_ViewID_OVR("gl_ViewID_OVR");
>+constexpr const ImmutableString gl_ViewportIndex("gl_ViewportIndex");
>+constexpr const ImmutableString gl_WorkGroupID("gl_WorkGroupID");
>+constexpr const ImmutableString gl_WorkGroupSize("gl_WorkGroupSize");
>+constexpr const ImmutableString gl_in("gl_in");
>+constexpr const ImmutableString greaterThan("greaterThan");
>+constexpr const ImmutableString greaterThanEqual("greaterThanEqual");
>+constexpr const ImmutableString groupMemoryBarrier("groupMemoryBarrier");
>+constexpr const ImmutableString imageLoad("imageLoad");
>+constexpr const ImmutableString imageSize("imageSize");
>+constexpr const ImmutableString imageStore("imageStore");
>+constexpr const ImmutableString imageStore_0h1C3D("imageStore(0h1C3D");
>+constexpr const ImmutableString imageStore_0j2C3C("imageStore(0j2C3C");
>+constexpr const ImmutableString imageStore_0l2C3B("imageStore(0l2C3B");
>+constexpr const ImmutableString imageStore_0n2C3D("imageStore(0n2C3D");
>+constexpr const ImmutableString imageStore_0p2C3C("imageStore(0p2C3C");
>+constexpr const ImmutableString imulExtended("imulExtended");
>+constexpr const ImmutableString imulExtended_0C0C0C0C("imulExtended(0C0C0C0C");
>+constexpr const ImmutableString imulExtended_1C1C1C1C("imulExtended(1C1C1C1C");
>+constexpr const ImmutableString imulExtended_2C2C2C2C("imulExtended(2C2C2C2C");
>+constexpr const ImmutableString imulExtended_3C3C3C3C("imulExtended(3C3C3C3C");
>+constexpr const ImmutableString intBitsToFloat("intBitsToFloat");
>+constexpr const ImmutableString inverse("inverse");
>+constexpr const ImmutableString inversesqrt("inversesqrt");
>+constexpr const ImmutableString isinf("isinf");
>+constexpr const ImmutableString isnan("isnan");
>+constexpr const ImmutableString ldexp("ldexp");
>+constexpr const ImmutableString length("length");
>+constexpr const ImmutableString lessThan("lessThan");
>+constexpr const ImmutableString lessThanEqual("lessThanEqual");
>+constexpr const ImmutableString log("log");
>+constexpr const ImmutableString log2("log2");
>+constexpr const ImmutableString matrixCompMult("matrixCompMult");
>+constexpr const ImmutableString max("max");
>+constexpr const ImmutableString memoryBarrier("memoryBarrier");
>+constexpr const ImmutableString memoryBarrierAtomicCounter("memoryBarrierAtomicCounter");
>+constexpr const ImmutableString memoryBarrierBuffer("memoryBarrierBuffer");
>+constexpr const ImmutableString memoryBarrierImage("memoryBarrierImage");
>+constexpr const ImmutableString memoryBarrierShared("memoryBarrierShared");
>+constexpr const ImmutableString min("min");
>+constexpr const ImmutableString mix("mix");
>+constexpr const ImmutableString mix_0B0B0E("mix(0B0B0E");
>+constexpr const ImmutableString mix_1B1B1B("mix(1B1B1B");
>+constexpr const ImmutableString mix_1B1B1E("mix(1B1B1E");
>+constexpr const ImmutableString mix_3B3B0B("mix(3B3B0B");
>+constexpr const ImmutableString mix_3B3B3B("mix(3B3B3B");
>+constexpr const ImmutableString mod("mod");
>+constexpr const ImmutableString modf("modf");
>+constexpr const ImmutableString near("near");
>+constexpr const ImmutableString normalize("normalize");
>+constexpr const ImmutableString notEqual("notEqual");
>+constexpr const ImmutableString notFunc("not");
>+constexpr const ImmutableString outerProduct("outerProduct");
>+constexpr const ImmutableString packHalf2x16("packHalf2x16");
>+constexpr const ImmutableString packSnorm2x16("packSnorm2x16");
>+constexpr const ImmutableString packSnorm4x8("packSnorm4x8");
>+constexpr const ImmutableString packUnorm2x16("packUnorm2x16");
>+constexpr const ImmutableString packUnorm4x8("packUnorm4x8");
>+constexpr const ImmutableString pow("pow");
>+constexpr const ImmutableString radians("radians");
>+constexpr const ImmutableString reflect("reflect");
>+constexpr const ImmutableString refract("refract");
>+constexpr const ImmutableString refract_3B3B0B("refract(3B3B0B");
>+constexpr const ImmutableString rgb_2_yuv("rgb_2_yuv");
>+constexpr const ImmutableString round("round");
>+constexpr const ImmutableString roundEven("roundEven");
>+constexpr const ImmutableString sign("sign");
>+constexpr const ImmutableString sin("sin");
>+constexpr const ImmutableString sinh("sinh");
>+constexpr const ImmutableString smoothstep("smoothstep");
>+constexpr const ImmutableString smoothstep_0B0B3B("smoothstep(0B0B3B");
>+constexpr const ImmutableString smoothstep_1B1B1B("smoothstep(1B1B1B");
>+constexpr const ImmutableString smoothstep_3B3B3B("smoothstep(3B3B3B");
>+constexpr const ImmutableString sqrt("sqrt");
>+constexpr const ImmutableString step("step");
>+constexpr const ImmutableString tan("tan");
>+constexpr const ImmutableString tanh("tanh");
>+constexpr const ImmutableString texelFetch("texelFetch");
>+constexpr const ImmutableString texelFetchExt("texelFetch");
>+constexpr const ImmutableString texelFetchExt_0O1C0C("texelFetch(0O1C0C");
>+constexpr const ImmutableString texelFetchOffset("texelFetchOffset");
>+constexpr const ImmutableString texelFetchOffset_0H1C0C1C("texelFetchOffset(0H1C0C1C");
>+constexpr const ImmutableString texelFetchOffset_0I2C0C2C("texelFetchOffset(0I2C0C2C");
>+constexpr const ImmutableString texelFetchOffset_0K2C0C1C("texelFetchOffset(0K2C0C1C");
>+constexpr const ImmutableString texelFetchOffset_0Q1C0C1C("texelFetchOffset(0Q1C0C1C");
>+constexpr const ImmutableString texelFetchOffset_0R2C0C2C("texelFetchOffset(0R2C0C2C");
>+constexpr const ImmutableString texelFetchOffset_0T2C0C1C("texelFetchOffset(0T2C0C1C");
>+constexpr const ImmutableString texelFetchOffset_0W1C0C1C("texelFetchOffset(0W1C0C1C");
>+constexpr const ImmutableString texelFetchOffset_0X2C0C2C("texelFetchOffset(0X2C0C2C");
>+constexpr const ImmutableString texelFetchOffset_0Z2C0C1C("texelFetchOffset(0Z2C0C1C");
>+constexpr const ImmutableString texelFetch_0H1C0C("texelFetch(0H1C0C");
>+constexpr const ImmutableString texelFetch_0I2C0C("texelFetch(0I2C0C");
>+constexpr const ImmutableString texelFetch_0K2C0C("texelFetch(0K2C0C");
>+constexpr const ImmutableString texelFetch_0L1C0C("texelFetch(0L1C0C");
>+constexpr const ImmutableString texelFetch_0O1C0C("texelFetch(0O1C0C");
>+constexpr const ImmutableString texelFetch_0P2C0C("texelFetch(0P2C0C");
>+constexpr const ImmutableString texelFetch_0Q1C0C("texelFetch(0Q1C0C");
>+constexpr const ImmutableString texelFetch_0T2C0C("texelFetch(0T2C0C");
>+constexpr const ImmutableString texelFetch_0V2C0C("texelFetch(0V2C0C");
>+constexpr const ImmutableString texelFetch_0X2C0C("texelFetch(0X2C0C");
>+constexpr const ImmutableString texelFetch_0Z2C0C("texelFetch(0Z2C0C");
>+constexpr const ImmutableString texture("texture");
>+constexpr const ImmutableString texture2D("texture2D");
>+constexpr const ImmutableString texture2DGradEXT("texture2DGradEXT");
>+constexpr const ImmutableString texture2DGradEXT_0H1B1B1B("texture2DGradEXT(0H1B1B1B");
>+constexpr const ImmutableString texture2DLod("texture2DLod");
>+constexpr const ImmutableString texture2DLodEXT("texture2DLodEXT");
>+constexpr const ImmutableString texture2DLodEXT_0H1B0B("texture2DLodEXT(0H1B0B");
>+constexpr const ImmutableString texture2DLod_0H1B0B("texture2DLod(0H1B0B");
>+constexpr const ImmutableString texture2DProj("texture2DProj");
>+constexpr const ImmutableString texture2DProjGradEXT("texture2DProjGradEXT");
>+constexpr const ImmutableString texture2DProjGradEXT_0H2B1B1B("texture2DProjGradEXT(0H2B1B1B");
>+constexpr const ImmutableString texture2DProjGradEXT_0H3B1B1B("texture2DProjGradEXT(0H3B1B1B");
>+constexpr const ImmutableString texture2DProjLod("texture2DProjLod");
>+constexpr const ImmutableString texture2DProjLodEXT("texture2DProjLodEXT");
>+constexpr const ImmutableString texture2DProjLodEXT_0H2B0B("texture2DProjLodEXT(0H2B0B");
>+constexpr const ImmutableString texture2DProjLod_0H2B0B("texture2DProjLod(0H2B0B");
>+constexpr const ImmutableString texture2DProj_0H2B0B("texture2DProj(0H2B0B");
>+constexpr const ImmutableString texture2DRect("texture2DRect");
>+constexpr const ImmutableString texture2DRectProj("texture2DRectProj");
>+constexpr const ImmutableString textureCube("textureCube");
>+constexpr const ImmutableString textureCubeGradEXT("textureCubeGradEXT");
>+constexpr const ImmutableString textureCubeGradEXT_0J2B2B2B("textureCubeGradEXT(0J2B2B2B");
>+constexpr const ImmutableString textureCubeLod("textureCubeLod");
>+constexpr const ImmutableString textureCubeLodEXT("textureCubeLodEXT");
>+constexpr const ImmutableString textureGather("textureGather");
>+constexpr const ImmutableString textureGatherOffset("textureGatherOffset");
>+constexpr const ImmutableString textureGatherOffset_0H1B1C0C("textureGatherOffset(0H1B1C0C");
>+constexpr const ImmutableString textureGatherOffset_0K2B1C0C("textureGatherOffset(0K2B1C0C");
>+constexpr const ImmutableString textureGatherOffset_0Q1B1C0C("textureGatherOffset(0Q1B1C0C");
>+constexpr const ImmutableString textureGatherOffset_0T2B1C("textureGatherOffset(0T2B1C");
>+constexpr const ImmutableString textureGatherOffset_0T2B1C0C("textureGatherOffset(0T2B1C0C");
>+constexpr const ImmutableString textureGatherOffset_0W1B1C("textureGatherOffset(0W1B1C");
>+constexpr const ImmutableString textureGatherOffset_0W1B1C0C("textureGatherOffset(0W1B1C0C");
>+constexpr const ImmutableString textureGatherOffset_0Z2B1C0C("textureGatherOffset(0Z2B1C0C");
>+constexpr const ImmutableString textureGatherOffset_0c1B0B1C("textureGatherOffset(0c1B0B1C");
>+constexpr const ImmutableString textureGatherOffset_0e2B0B1C("textureGatherOffset(0e2B0B1C");
>+constexpr const ImmutableString textureGather_0J2B0C("textureGather(0J2B0C");
>+constexpr const ImmutableString textureGather_0S2B0C("textureGather(0S2B0C");
>+constexpr const ImmutableString textureGather_0T2B0C("textureGather(0T2B0C");
>+constexpr const ImmutableString textureGather_0Z2B0C("textureGather(0Z2B0C");
>+constexpr const ImmutableString textureGrad("textureGrad");
>+constexpr const ImmutableString textureGradOffset("textureGradOffset");
>+constexpr const ImmutableString textureGradOffset_0H1B1B1B1C("textureGradOffset(0H1B1B1B1C");
>+constexpr const ImmutableString textureGradOffset_0I2B2B2B2C("textureGradOffset(0I2B2B2B2C");
>+constexpr const ImmutableString textureGradOffset_0K2B1B1B1C("textureGradOffset(0K2B1B1B1C");
>+constexpr const ImmutableString textureGradOffset_0Q1B1B1B1C("textureGradOffset(0Q1B1B1B1C");
>+constexpr const ImmutableString textureGradOffset_0R2B2B2B2C("textureGradOffset(0R2B2B2B2C");
>+constexpr const ImmutableString textureGradOffset_0T2B1B1B1C("textureGradOffset(0T2B1B1B1C");
>+constexpr const ImmutableString textureGradOffset_0W1B1B1B1C("textureGradOffset(0W1B1B1B1C");
>+constexpr const ImmutableString textureGradOffset_0X2B2B2B2C("textureGradOffset(0X2B2B2B2C");
>+constexpr const ImmutableString textureGradOffset_0Z2B1B1B1C("textureGradOffset(0Z2B1B1B1C");
>+constexpr const ImmutableString textureGradOffset_0c2B1B1B1C("textureGradOffset(0c2B1B1B1C");
>+constexpr const ImmutableString textureGradOffset_0e3B1B1B1C("textureGradOffset(0e3B1B1B1C");
>+constexpr const ImmutableString textureGrad_0H1B1B1B("textureGrad(0H1B1B1B");
>+constexpr const ImmutableString textureGrad_0I2B2B2B("textureGrad(0I2B2B2B");
>+constexpr const ImmutableString textureGrad_0J2B2B2B("textureGrad(0J2B2B2B");
>+constexpr const ImmutableString textureGrad_0K2B1B1B("textureGrad(0K2B1B1B");
>+constexpr const ImmutableString textureGrad_0Q1B1B1B("textureGrad(0Q1B1B1B");
>+constexpr const ImmutableString textureGrad_0R2B2B2B("textureGrad(0R2B2B2B");
>+constexpr const ImmutableString textureGrad_0S2B2B2B("textureGrad(0S2B2B2B");
>+constexpr const ImmutableString textureGrad_0T2B1B1B("textureGrad(0T2B1B1B");
>+constexpr const ImmutableString textureGrad_0W1B1B1B("textureGrad(0W1B1B1B");
>+constexpr const ImmutableString textureGrad_0X2B2B2B("textureGrad(0X2B2B2B");
>+constexpr const ImmutableString textureGrad_0Y2B2B2B("textureGrad(0Y2B2B2B");
>+constexpr const ImmutableString textureGrad_0Z2B1B1B("textureGrad(0Z2B1B1B");
>+constexpr const ImmutableString textureGrad_0c2B1B1B("textureGrad(0c2B1B1B");
>+constexpr const ImmutableString textureGrad_0d3B2B2B("textureGrad(0d3B2B2B");
>+constexpr const ImmutableString textureGrad_0e3B1B1B("textureGrad(0e3B1B1B");
>+constexpr const ImmutableString textureLod("textureLod");
>+constexpr const ImmutableString textureLodOffset("textureLodOffset");
>+constexpr const ImmutableString textureLodOffset_0H1B0B1C("textureLodOffset(0H1B0B1C");
>+constexpr const ImmutableString textureLodOffset_0I2B0B2C("textureLodOffset(0I2B0B2C");
>+constexpr const ImmutableString textureLodOffset_0K2B0B1C("textureLodOffset(0K2B0B1C");
>+constexpr const ImmutableString textureLodOffset_0Q1B0B1C("textureLodOffset(0Q1B0B1C");
>+constexpr const ImmutableString textureLodOffset_0R2B0B2C("textureLodOffset(0R2B0B2C");
>+constexpr const ImmutableString textureLodOffset_0T2B0B1C("textureLodOffset(0T2B0B1C");
>+constexpr const ImmutableString textureLodOffset_0W1B0B1C("textureLodOffset(0W1B0B1C");
>+constexpr const ImmutableString textureLodOffset_0X2B0B2C("textureLodOffset(0X2B0B2C");
>+constexpr const ImmutableString textureLodOffset_0Z2B0B1C("textureLodOffset(0Z2B0B1C");
>+constexpr const ImmutableString textureLodOffset_0c2B0B1C("textureLodOffset(0c2B0B1C");
>+constexpr const ImmutableString textureLod_0J2B0B("textureLod(0J2B0B");
>+constexpr const ImmutableString textureLod_0Q1B0B("textureLod(0Q1B0B");
>+constexpr const ImmutableString textureLod_0S2B0B("textureLod(0S2B0B");
>+constexpr const ImmutableString textureLod_0W1B0B("textureLod(0W1B0B");
>+constexpr const ImmutableString textureLod_0Y2B0B("textureLod(0Y2B0B");
>+constexpr const ImmutableString textureLod_0Z2B0B("textureLod(0Z2B0B");
>+constexpr const ImmutableString textureOffset("textureOffset");
>+constexpr const ImmutableString textureOffset_0H1B1C0B("textureOffset(0H1B1C0B");
>+constexpr const ImmutableString textureOffset_0I2B2C0B("textureOffset(0I2B2C0B");
>+constexpr const ImmutableString textureOffset_0K2B1C0B("textureOffset(0K2B1C0B");
>+constexpr const ImmutableString textureOffset_0Q1B1C0B("textureOffset(0Q1B1C0B");
>+constexpr const ImmutableString textureOffset_0R2B2C0B("textureOffset(0R2B2C0B");
>+constexpr const ImmutableString textureOffset_0T2B1C0B("textureOffset(0T2B1C0B");
>+constexpr const ImmutableString textureOffset_0W1B1C0B("textureOffset(0W1B1C0B");
>+constexpr const ImmutableString textureOffset_0X2B2C("textureOffset(0X2B2C");
>+constexpr const ImmutableString textureOffset_0X2B2C0B("textureOffset(0X2B2C0B");
>+constexpr const ImmutableString textureOffset_0Z2B1C0B("textureOffset(0Z2B1C0B");
>+constexpr const ImmutableString textureOffset_0c2B1C0B("textureOffset(0c2B1C0B");
>+constexpr const ImmutableString textureProj("textureProj");
>+constexpr const ImmutableString textureProjGrad("textureProjGrad");
>+constexpr const ImmutableString textureProjGradOffset("textureProjGradOffset");
>+constexpr const ImmutableString textureProjGradOffset_0H2B1B1B1C(
>+    "textureProjGradOffset(0H2B1B1B1C");
>+constexpr const ImmutableString textureProjGradOffset_0H3B1B1B1C(
>+    "textureProjGradOffset(0H3B1B1B1C");
>+constexpr const ImmutableString textureProjGradOffset_0I3B2B2B2C(
>+    "textureProjGradOffset(0I3B2B2B2C");
>+constexpr const ImmutableString textureProjGradOffset_0Q2B1B1B1C(
>+    "textureProjGradOffset(0Q2B1B1B1C");
>+constexpr const ImmutableString textureProjGradOffset_0Q3B1B1B1C(
>+    "textureProjGradOffset(0Q3B1B1B1C");
>+constexpr const ImmutableString textureProjGradOffset_0R3B2B2B2C(
>+    "textureProjGradOffset(0R3B2B2B2C");
>+constexpr const ImmutableString textureProjGradOffset_0W2B1B1B1C(
>+    "textureProjGradOffset(0W2B1B1B1C");
>+constexpr const ImmutableString textureProjGradOffset_0W3B1B1B1C(
>+    "textureProjGradOffset(0W3B1B1B1C");
>+constexpr const ImmutableString textureProjGradOffset_0X3B2B2B2C(
>+    "textureProjGradOffset(0X3B2B2B2C");
>+constexpr const ImmutableString textureProjGradOffset_0c3B1B1B1C(
>+    "textureProjGradOffset(0c3B1B1B1C");
>+constexpr const ImmutableString textureProjGrad_0H2B1B1B("textureProjGrad(0H2B1B1B");
>+constexpr const ImmutableString textureProjGrad_0H3B1B1B("textureProjGrad(0H3B1B1B");
>+constexpr const ImmutableString textureProjGrad_0I3B2B2B("textureProjGrad(0I3B2B2B");
>+constexpr const ImmutableString textureProjGrad_0Q2B1B1B("textureProjGrad(0Q2B1B1B");
>+constexpr const ImmutableString textureProjGrad_0Q3B1B1B("textureProjGrad(0Q3B1B1B");
>+constexpr const ImmutableString textureProjGrad_0R3B2B2B("textureProjGrad(0R3B2B2B");
>+constexpr const ImmutableString textureProjGrad_0W2B1B1B("textureProjGrad(0W2B1B1B");
>+constexpr const ImmutableString textureProjGrad_0W3B1B1B("textureProjGrad(0W3B1B1B");
>+constexpr const ImmutableString textureProjGrad_0X3B2B2B("textureProjGrad(0X3B2B2B");
>+constexpr const ImmutableString textureProjGrad_0c3B1B1B("textureProjGrad(0c3B1B1B");
>+constexpr const ImmutableString textureProjLod("textureProjLod");
>+constexpr const ImmutableString textureProjLodOffset("textureProjLodOffset");
>+constexpr const ImmutableString textureProjLodOffset_0H2B0B1C("textureProjLodOffset(0H2B0B1C");
>+constexpr const ImmutableString textureProjLodOffset_0H3B0B1C("textureProjLodOffset(0H3B0B1C");
>+constexpr const ImmutableString textureProjLodOffset_0I3B0B2C("textureProjLodOffset(0I3B0B2C");
>+constexpr const ImmutableString textureProjLodOffset_0Q2B0B1C("textureProjLodOffset(0Q2B0B1C");
>+constexpr const ImmutableString textureProjLodOffset_0Q3B0B1C("textureProjLodOffset(0Q3B0B1C");
>+constexpr const ImmutableString textureProjLodOffset_0R3B0B2C("textureProjLodOffset(0R3B0B2C");
>+constexpr const ImmutableString textureProjLodOffset_0W2B0B1C("textureProjLodOffset(0W2B0B1C");
>+constexpr const ImmutableString textureProjLodOffset_0W3B0B1C("textureProjLodOffset(0W3B0B1C");
>+constexpr const ImmutableString textureProjLodOffset_0X3B0B2C("textureProjLodOffset(0X3B0B2C");
>+constexpr const ImmutableString textureProjLodOffset_0c3B0B1C("textureProjLodOffset(0c3B0B1C");
>+constexpr const ImmutableString textureProjLod_0H3B0B("textureProjLod(0H3B0B");
>+constexpr const ImmutableString textureProjLod_0I3B0B("textureProjLod(0I3B0B");
>+constexpr const ImmutableString textureProjLod_0Q2B0B("textureProjLod(0Q2B0B");
>+constexpr const ImmutableString textureProjLod_0Q3B0B("textureProjLod(0Q3B0B");
>+constexpr const ImmutableString textureProjOffset("textureProjOffset");
>+constexpr const ImmutableString textureProjOffset_0H2B1C("textureProjOffset(0H2B1C");
>+constexpr const ImmutableString textureProjOffset_0H2B1C0B("textureProjOffset(0H2B1C0B");
>+constexpr const ImmutableString textureProjOffset_0H3B1C("textureProjOffset(0H3B1C");
>+constexpr const ImmutableString textureProjOffset_0H3B1C0B("textureProjOffset(0H3B1C0B");
>+constexpr const ImmutableString textureProjOffset_0I3B2C0B("textureProjOffset(0I3B2C0B");
>+constexpr const ImmutableString textureProjOffset_0Q2B1C("textureProjOffset(0Q2B1C");
>+constexpr const ImmutableString textureProjOffset_0Q2B1C0B("textureProjOffset(0Q2B1C0B");
>+constexpr const ImmutableString textureProjOffset_0Q3B1C("textureProjOffset(0Q3B1C");
>+constexpr const ImmutableString textureProjOffset_0Q3B1C0B("textureProjOffset(0Q3B1C0B");
>+constexpr const ImmutableString textureProjOffset_0R3B2C0B("textureProjOffset(0R3B2C0B");
>+constexpr const ImmutableString textureProjOffset_0W2B1C0B("textureProjOffset(0W2B1C0B");
>+constexpr const ImmutableString textureProjOffset_0W3B1C("textureProjOffset(0W3B1C");
>+constexpr const ImmutableString textureProjOffset_0W3B1C0B("textureProjOffset(0W3B1C0B");
>+constexpr const ImmutableString textureProjOffset_0X3B2C("textureProjOffset(0X3B2C");
>+constexpr const ImmutableString textureProjOffset_0X3B2C0B("textureProjOffset(0X3B2C0B");
>+constexpr const ImmutableString textureProjOffset_0c3B1C0B("textureProjOffset(0c3B1C0B");
>+constexpr const ImmutableString textureProj_0Q2B0B("textureProj(0Q2B0B");
>+constexpr const ImmutableString textureProj_0R3B0B("textureProj(0R3B0B");
>+constexpr const ImmutableString textureProj_0X3B0B("textureProj(0X3B0B");
>+constexpr const ImmutableString textureSize("textureSize");
>+constexpr const ImmutableString textureSizeExt("textureSize");
>+constexpr const ImmutableString texture_0Q1B0B("texture(0Q1B0B");
>+constexpr const ImmutableString texture_0c2B0B("texture(0c2B0B");
>+constexpr const ImmutableString texture_0d3B0B("texture(0d3B0B");
>+constexpr const ImmutableString transpose("transpose");
>+constexpr const ImmutableString trunc("trunc");
>+constexpr const ImmutableString uaddCarry("uaddCarry");
>+constexpr const ImmutableString uaddCarry_2D2D2D("uaddCarry(2D2D2D");
>+constexpr const ImmutableString uaddCarry_3D3D3D("uaddCarry(3D3D3D");
>+constexpr const ImmutableString uintBitsToFloat("uintBitsToFloat");
>+constexpr const ImmutableString umulExtended("umulExtended");
>+constexpr const ImmutableString umulExtended_0D0D0D0D("umulExtended(0D0D0D0D");
>+constexpr const ImmutableString umulExtended_1D1D1D1D("umulExtended(1D1D1D1D");
>+constexpr const ImmutableString umulExtended_2D2D2D2D("umulExtended(2D2D2D2D");
>+constexpr const ImmutableString umulExtended_3D3D3D3D("umulExtended(3D3D3D3D");
>+constexpr const ImmutableString unpackHalf2x16("unpackHalf2x16");
>+constexpr const ImmutableString unpackSnorm2x16("unpackSnorm2x16");
>+constexpr const ImmutableString unpackSnorm4x8("unpackSnorm4x8");
>+constexpr const ImmutableString unpackUnorm2x16("unpackUnorm2x16");
>+constexpr const ImmutableString unpackUnorm4x8("unpackUnorm4x8");
>+constexpr const ImmutableString usubBorrow("usubBorrow");
>+constexpr const ImmutableString usubBorrow_0D0D0D("usubBorrow(0D0D0D");
>+constexpr const ImmutableString usubBorrow_1D1D1D("usubBorrow(1D1D1D");
>+constexpr const ImmutableString usubBorrow_3D3D3D("usubBorrow(3D3D3D");
>+constexpr const ImmutableString yuv_2_rgb("yuv_2_rgb");
>+
>+}  // namespace BuiltInName
>+
>+// TODO(oetuaho): Would be nice to make this a class instead of a namespace so that we could friend
>+// this from TVariable. Now symbol constructors taking an id have to be public even though they're
>+// not supposed to be accessible from outside of here. http://anglebug.com/2390
>+namespace BuiltInVariable
>+{
>+
>+constexpr const TVariable kVar_gl_DrawID(BuiltInId::gl_DrawID,
>+                                         BuiltInName::gl_DrawID,
>+                                         SymbolType::BuiltIn,
>+                                         TExtension::ANGLE_multi_draw,
>+                                         StaticType::Get<EbtInt, EbpHigh, EvqDrawID, 1, 1>());
>+constexpr const TVariable kVar_gl_DrawIDESSL1(BuiltInId::gl_DrawIDESSL1,
>+                                              BuiltInName::gl_DrawID,
>+                                              SymbolType::BuiltIn,
>+                                              TExtension::ANGLE_multi_draw,
>+                                              StaticType::Get<EbtInt, EbpHigh, EvqDrawID, 1, 1>());
>+constexpr const TVariable kVar_gl_FragColor(
>+    BuiltInId::gl_FragColor,
>+    BuiltInName::gl_FragColor,
>+    SymbolType::BuiltIn,
>+    TExtension::UNDEFINED,
>+    StaticType::Get<EbtFloat, EbpMedium, EvqFragColor, 4, 1>());
>+constexpr const TVariable kVar_gl_FragCoord(
>+    BuiltInId::gl_FragCoord,
>+    BuiltInName::gl_FragCoord,
>+    SymbolType::BuiltIn,
>+    TExtension::UNDEFINED,
>+    StaticType::Get<EbtFloat, EbpMedium, EvqFragCoord, 4, 1>());
>+constexpr const TVariable kVar_gl_FragDepth(
>+    BuiltInId::gl_FragDepth,
>+    BuiltInName::gl_FragDepth,
>+    SymbolType::BuiltIn,
>+    TExtension::UNDEFINED,
>+    StaticType::Get<EbtFloat, EbpHigh, EvqFragDepth, 1, 1>());
>+constexpr const TVariable kVar_gl_FrontFacing(
>+    BuiltInId::gl_FrontFacing,
>+    BuiltInName::gl_FrontFacing,
>+    SymbolType::BuiltIn,
>+    TExtension::UNDEFINED,
>+    StaticType::Get<EbtBool, EbpUndefined, EvqFrontFacing, 1, 1>());
>+constexpr const TVariable kVar_gl_GlobalInvocationID(
>+    BuiltInId::gl_GlobalInvocationID,
>+    BuiltInName::gl_GlobalInvocationID,
>+    SymbolType::BuiltIn,
>+    TExtension::UNDEFINED,
>+    StaticType::Get<EbtUInt, EbpUndefined, EvqGlobalInvocationID, 3, 1>());
>+constexpr const TVariable kVar_gl_InstanceID(
>+    BuiltInId::gl_InstanceID,
>+    BuiltInName::gl_InstanceID,
>+    SymbolType::BuiltIn,
>+    TExtension::UNDEFINED,
>+    StaticType::Get<EbtInt, EbpHigh, EvqInstanceID, 1, 1>());
>+constexpr const TVariable kVar_gl_InvocationID(
>+    BuiltInId::gl_InvocationID,
>+    BuiltInName::gl_InvocationID,
>+    SymbolType::BuiltIn,
>+    TExtension::EXT_geometry_shader,
>+    StaticType::Get<EbtInt, EbpHigh, EvqInvocationID, 1, 1>());
>+constexpr const TVariable kVar_gl_LastFragColor(
>+    BuiltInId::gl_LastFragColor,
>+    BuiltInName::gl_LastFragColor,
>+    SymbolType::BuiltIn,
>+    TExtension::NV_shader_framebuffer_fetch,
>+    StaticType::Get<EbtFloat, EbpMedium, EvqLastFragColor, 4, 1>());
>+constexpr const TVariable kVar_gl_LastFragColorARM(
>+    BuiltInId::gl_LastFragColorARM,
>+    BuiltInName::gl_LastFragColorARM,
>+    SymbolType::BuiltIn,
>+    TExtension::ARM_shader_framebuffer_fetch,
>+    StaticType::Get<EbtFloat, EbpMedium, EvqLastFragColor, 4, 1>());
>+constexpr const TVariable kVar_gl_Layer(BuiltInId::gl_Layer,
>+                                        BuiltInName::gl_Layer,
>+                                        SymbolType::BuiltIn,
>+                                        TExtension::EXT_geometry_shader,
>+                                        StaticType::Get<EbtInt, EbpHigh, EvqLayer, 1, 1>());
>+constexpr const TVariable kVar_gl_LayerGS(BuiltInId::gl_LayerGS,
>+                                          BuiltInName::gl_Layer,
>+                                          SymbolType::BuiltIn,
>+                                          TExtension::EXT_geometry_shader,
>+                                          StaticType::Get<EbtInt, EbpHigh, EvqLayer, 1, 1>());
>+constexpr const TVariable kVar_gl_LayerVS(BuiltInId::gl_LayerVS,
>+                                          BuiltInName::gl_Layer,
>+                                          SymbolType::BuiltIn,
>+                                          TExtension::UNDEFINED,
>+                                          StaticType::Get<EbtInt, EbpHigh, EvqLayer, 1, 1>());
>+constexpr const TVariable kVar_gl_LocalInvocationID(
>+    BuiltInId::gl_LocalInvocationID,
>+    BuiltInName::gl_LocalInvocationID,
>+    SymbolType::BuiltIn,
>+    TExtension::UNDEFINED,
>+    StaticType::Get<EbtUInt, EbpUndefined, EvqLocalInvocationID, 3, 1>());
>+constexpr const TVariable kVar_gl_LocalInvocationIndex(
>+    BuiltInId::gl_LocalInvocationIndex,
>+    BuiltInName::gl_LocalInvocationIndex,
>+    SymbolType::BuiltIn,
>+    TExtension::UNDEFINED,
>+    StaticType::Get<EbtUInt, EbpUndefined, EvqLocalInvocationIndex, 1, 1>());
>+constexpr const TVariable kVar_gl_NumWorkGroups(
>+    BuiltInId::gl_NumWorkGroups,
>+    BuiltInName::gl_NumWorkGroups,
>+    SymbolType::BuiltIn,
>+    TExtension::UNDEFINED,
>+    StaticType::Get<EbtUInt, EbpUndefined, EvqNumWorkGroups, 3, 1>());
>+constexpr const TVariable kVar_gl_PointCoord(
>+    BuiltInId::gl_PointCoord,
>+    BuiltInName::gl_PointCoord,
>+    SymbolType::BuiltIn,
>+    TExtension::UNDEFINED,
>+    StaticType::Get<EbtFloat, EbpMedium, EvqPointCoord, 2, 1>());
>+constexpr const TVariable kVar_gl_PointSize(
>+    BuiltInId::gl_PointSize,
>+    BuiltInName::gl_PointSize,
>+    SymbolType::BuiltIn,
>+    TExtension::UNDEFINED,
>+    StaticType::Get<EbtFloat, EbpMedium, EvqPointSize, 1, 1>());
>+constexpr const TVariable kVar_gl_Position(BuiltInId::gl_Position,
>+                                           BuiltInName::gl_Position,
>+                                           SymbolType::BuiltIn,
>+                                           TExtension::UNDEFINED,
>+                                           StaticType::Get<EbtFloat, EbpHigh, EvqPosition, 4, 1>());
>+constexpr const TVariable kVar_gl_PrimitiveID(
>+    BuiltInId::gl_PrimitiveID,
>+    BuiltInName::gl_PrimitiveID,
>+    SymbolType::BuiltIn,
>+    TExtension::EXT_geometry_shader,
>+    StaticType::Get<EbtInt, EbpHigh, EvqPrimitiveID, 1, 1>());
>+constexpr const TVariable kVar_gl_PrimitiveIDGS(
>+    BuiltInId::gl_PrimitiveIDGS,
>+    BuiltInName::gl_PrimitiveID,
>+    SymbolType::BuiltIn,
>+    TExtension::EXT_geometry_shader,
>+    StaticType::Get<EbtInt, EbpHigh, EvqPrimitiveID, 1, 1>());
>+constexpr const TVariable kVar_gl_PrimitiveIDIn(
>+    BuiltInId::gl_PrimitiveIDIn,
>+    BuiltInName::gl_PrimitiveIDIn,
>+    SymbolType::BuiltIn,
>+    TExtension::EXT_geometry_shader,
>+    StaticType::Get<EbtInt, EbpHigh, EvqPrimitiveIDIn, 1, 1>());
>+constexpr const TVariable kVar_gl_SecondaryFragColorEXT(
>+    BuiltInId::gl_SecondaryFragColorEXT,
>+    BuiltInName::gl_SecondaryFragColorEXT,
>+    SymbolType::BuiltIn,
>+    TExtension::EXT_blend_func_extended,
>+    StaticType::Get<EbtFloat, EbpMedium, EvqSecondaryFragColorEXT, 4, 1>());
>+constexpr const TVariable kVar_gl_VertexID(BuiltInId::gl_VertexID,
>+                                           BuiltInName::gl_VertexID,
>+                                           SymbolType::BuiltIn,
>+                                           TExtension::UNDEFINED,
>+                                           StaticType::Get<EbtInt, EbpHigh, EvqVertexID, 1, 1>());
>+constexpr const TVariable kVar_gl_ViewID_OVR(
>+    BuiltInId::gl_ViewID_OVR,
>+    BuiltInName::gl_ViewID_OVR,
>+    SymbolType::BuiltIn,
>+    TExtension::OVR_multiview2,
>+    StaticType::Get<EbtUInt, EbpHigh, EvqViewIDOVR, 1, 1>());
>+constexpr const TVariable kVar_gl_ViewID_OVRESSL1(
>+    BuiltInId::gl_ViewID_OVRESSL1,
>+    BuiltInName::gl_ViewID_OVR,
>+    SymbolType::BuiltIn,
>+    TExtension::OVR_multiview2,
>+    StaticType::Get<EbtInt, EbpHigh, EvqViewIDOVR, 1, 1>());
>+constexpr const TVariable kVar_gl_ViewportIndex(
>+    BuiltInId::gl_ViewportIndex,
>+    BuiltInName::gl_ViewportIndex,
>+    SymbolType::BuiltIn,
>+    TExtension::UNDEFINED,
>+    StaticType::Get<EbtInt, EbpHigh, EvqViewportIndex, 1, 1>());
>+constexpr const TVariable kVar_gl_WorkGroupID(
>+    BuiltInId::gl_WorkGroupID,
>+    BuiltInName::gl_WorkGroupID,
>+    SymbolType::BuiltIn,
>+    TExtension::UNDEFINED,
>+    StaticType::Get<EbtUInt, EbpUndefined, EvqWorkGroupID, 3, 1>());
>+constexpr const TVariable kVar_gl_WorkGroupSize(
>+    BuiltInId::gl_WorkGroupSize,
>+    BuiltInName::gl_WorkGroupSize,
>+    SymbolType::BuiltIn,
>+    TExtension::UNDEFINED,
>+    StaticType::Get<EbtUInt, EbpUndefined, EvqWorkGroupSize, 3, 1>());
>+constexpr const TVariable kVar_pt0B(BuiltInId::pt0B,
>+                                    BuiltInName::_empty,
>+                                    SymbolType::BuiltIn,
>+                                    TExtension::UNDEFINED,
>+                                    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 1, 1>());
>+constexpr const TVariable kVar_pt0C(BuiltInId::pt0C,
>+                                    BuiltInName::_empty,
>+                                    SymbolType::BuiltIn,
>+                                    TExtension::UNDEFINED,
>+                                    StaticType::Get<EbtInt, EbpUndefined, EvqGlobal, 1, 1>());
>+constexpr const TVariable kVar_pt0D(BuiltInId::pt0D,
>+                                    BuiltInName::_empty,
>+                                    SymbolType::BuiltIn,
>+                                    TExtension::UNDEFINED,
>+                                    StaticType::Get<EbtUInt, EbpUndefined, EvqGlobal, 1, 1>());
>+constexpr const TVariable kVar_pt0E(BuiltInId::pt0E,
>+                                    BuiltInName::_empty,
>+                                    SymbolType::BuiltIn,
>+                                    TExtension::UNDEFINED,
>+                                    StaticType::Get<EbtBool, EbpUndefined, EvqGlobal, 1, 1>());
>+constexpr const TVariable kVar_pt0F(
>+    BuiltInId::pt0F,
>+    BuiltInName::_empty,
>+    SymbolType::BuiltIn,
>+    TExtension::UNDEFINED,
>+    StaticType::Get<EbtAtomicCounter, EbpUndefined, EvqGlobal, 1, 1>());
>+constexpr const TVariable kVar_pt0G(
>+    BuiltInId::pt0G,
>+    BuiltInName::_empty,
>+    SymbolType::BuiltIn,
>+    TExtension::UNDEFINED,
>+    StaticType::Get<EbtYuvCscStandardEXT, EbpUndefined, EvqGlobal, 1, 1>());
>+constexpr const TVariable kVar_pt0H(BuiltInId::pt0H,
>+                                    BuiltInName::_empty,
>+                                    SymbolType::BuiltIn,
>+                                    TExtension::UNDEFINED,
>+                                    StaticType::Get<EbtSampler2D, EbpUndefined, EvqGlobal, 1, 1>());
>+constexpr const TVariable kVar_pt0I(BuiltInId::pt0I,
>+                                    BuiltInName::_empty,
>+                                    SymbolType::BuiltIn,
>+                                    TExtension::UNDEFINED,
>+                                    StaticType::Get<EbtSampler3D, EbpUndefined, EvqGlobal, 1, 1>());
>+constexpr const TVariable kVar_pt0J(
>+    BuiltInId::pt0J,
>+    BuiltInName::_empty,
>+    SymbolType::BuiltIn,
>+    TExtension::UNDEFINED,
>+    StaticType::Get<EbtSamplerCube, EbpUndefined, EvqGlobal, 1, 1>());
>+constexpr const TVariable kVar_pt0K(
>+    BuiltInId::pt0K,
>+    BuiltInName::_empty,
>+    SymbolType::BuiltIn,
>+    TExtension::UNDEFINED,
>+    StaticType::Get<EbtSampler2DArray, EbpUndefined, EvqGlobal, 1, 1>());
>+constexpr const TVariable kVar_pt0L(
>+    BuiltInId::pt0L,
>+    BuiltInName::_empty,
>+    SymbolType::BuiltIn,
>+    TExtension::UNDEFINED,
>+    StaticType::Get<EbtSamplerExternalOES, EbpUndefined, EvqGlobal, 1, 1>());
>+constexpr const TVariable kVar_pt0M(
>+    BuiltInId::pt0M,
>+    BuiltInName::_empty,
>+    SymbolType::BuiltIn,
>+    TExtension::UNDEFINED,
>+    StaticType::Get<EbtSamplerExternal2DY2YEXT, EbpUndefined, EvqGlobal, 1, 1>());
>+constexpr const TVariable kVar_pt0N(
>+    BuiltInId::pt0N,
>+    BuiltInName::_empty,
>+    SymbolType::BuiltIn,
>+    TExtension::UNDEFINED,
>+    StaticType::Get<EbtSampler2DRect, EbpUndefined, EvqGlobal, 1, 1>());
>+constexpr const TVariable kVar_pt0O(
>+    BuiltInId::pt0O,
>+    BuiltInName::_empty,
>+    SymbolType::BuiltIn,
>+    TExtension::UNDEFINED,
>+    StaticType::Get<EbtSampler2DMS, EbpUndefined, EvqGlobal, 1, 1>());
>+constexpr const TVariable kVar_pt0P(
>+    BuiltInId::pt0P,
>+    BuiltInName::_empty,
>+    SymbolType::BuiltIn,
>+    TExtension::UNDEFINED,
>+    StaticType::Get<EbtSampler2DMSArray, EbpUndefined, EvqGlobal, 1, 1>());
>+constexpr const TVariable kVar_pt0Q(
>+    BuiltInId::pt0Q,
>+    BuiltInName::_empty,
>+    SymbolType::BuiltIn,
>+    TExtension::UNDEFINED,
>+    StaticType::Get<EbtISampler2D, EbpUndefined, EvqGlobal, 1, 1>());
>+constexpr const TVariable kVar_pt0R(
>+    BuiltInId::pt0R,
>+    BuiltInName::_empty,
>+    SymbolType::BuiltIn,
>+    TExtension::UNDEFINED,
>+    StaticType::Get<EbtISampler3D, EbpUndefined, EvqGlobal, 1, 1>());
>+constexpr const TVariable kVar_pt0S(
>+    BuiltInId::pt0S,
>+    BuiltInName::_empty,
>+    SymbolType::BuiltIn,
>+    TExtension::UNDEFINED,
>+    StaticType::Get<EbtISamplerCube, EbpUndefined, EvqGlobal, 1, 1>());
>+constexpr const TVariable kVar_pt0T(
>+    BuiltInId::pt0T,
>+    BuiltInName::_empty,
>+    SymbolType::BuiltIn,
>+    TExtension::UNDEFINED,
>+    StaticType::Get<EbtISampler2DArray, EbpUndefined, EvqGlobal, 1, 1>());
>+constexpr const TVariable kVar_pt0U(
>+    BuiltInId::pt0U,
>+    BuiltInName::_empty,
>+    SymbolType::BuiltIn,
>+    TExtension::UNDEFINED,
>+    StaticType::Get<EbtISampler2DMS, EbpUndefined, EvqGlobal, 1, 1>());
>+constexpr const TVariable kVar_pt0V(
>+    BuiltInId::pt0V,
>+    BuiltInName::_empty,
>+    SymbolType::BuiltIn,
>+    TExtension::UNDEFINED,
>+    StaticType::Get<EbtISampler2DMSArray, EbpUndefined, EvqGlobal, 1, 1>());
>+constexpr const TVariable kVar_pt0W(
>+    BuiltInId::pt0W,
>+    BuiltInName::_empty,
>+    SymbolType::BuiltIn,
>+    TExtension::UNDEFINED,
>+    StaticType::Get<EbtUSampler2D, EbpUndefined, EvqGlobal, 1, 1>());
>+constexpr const TVariable kVar_pt0X(
>+    BuiltInId::pt0X,
>+    BuiltInName::_empty,
>+    SymbolType::BuiltIn,
>+    TExtension::UNDEFINED,
>+    StaticType::Get<EbtUSampler3D, EbpUndefined, EvqGlobal, 1, 1>());
>+constexpr const TVariable kVar_pt0Y(
>+    BuiltInId::pt0Y,
>+    BuiltInName::_empty,
>+    SymbolType::BuiltIn,
>+    TExtension::UNDEFINED,
>+    StaticType::Get<EbtUSamplerCube, EbpUndefined, EvqGlobal, 1, 1>());
>+constexpr const TVariable kVar_pt0Z(
>+    BuiltInId::pt0Z,
>+    BuiltInName::_empty,
>+    SymbolType::BuiltIn,
>+    TExtension::UNDEFINED,
>+    StaticType::Get<EbtUSampler2DArray, EbpUndefined, EvqGlobal, 1, 1>());
>+constexpr const TVariable kVar_pt0a(
>+    BuiltInId::pt0a,
>+    BuiltInName::_empty,
>+    SymbolType::BuiltIn,
>+    TExtension::UNDEFINED,
>+    StaticType::Get<EbtUSampler2DMS, EbpUndefined, EvqGlobal, 1, 1>());
>+constexpr const TVariable kVar_pt0b(
>+    BuiltInId::pt0b,
>+    BuiltInName::_empty,
>+    SymbolType::BuiltIn,
>+    TExtension::UNDEFINED,
>+    StaticType::Get<EbtUSampler2DMSArray, EbpUndefined, EvqGlobal, 1, 1>());
>+constexpr const TVariable kVar_pt0c(
>+    BuiltInId::pt0c,
>+    BuiltInName::_empty,
>+    SymbolType::BuiltIn,
>+    TExtension::UNDEFINED,
>+    StaticType::Get<EbtSampler2DShadow, EbpUndefined, EvqGlobal, 1, 1>());
>+constexpr const TVariable kVar_pt0d(
>+    BuiltInId::pt0d,
>+    BuiltInName::_empty,
>+    SymbolType::BuiltIn,
>+    TExtension::UNDEFINED,
>+    StaticType::Get<EbtSamplerCubeShadow, EbpUndefined, EvqGlobal, 1, 1>());
>+constexpr const TVariable kVar_pt0e(
>+    BuiltInId::pt0e,
>+    BuiltInName::_empty,
>+    SymbolType::BuiltIn,
>+    TExtension::UNDEFINED,
>+    StaticType::Get<EbtSampler2DArrayShadow, EbpUndefined, EvqGlobal, 1, 1>());
>+constexpr const TVariable kVar_pt0f(BuiltInId::pt0f,
>+                                    BuiltInName::_empty,
>+                                    SymbolType::BuiltIn,
>+                                    TExtension::UNDEFINED,
>+                                    StaticType::Get<EbtImage2D, EbpUndefined, EvqGlobal, 1, 1>());
>+constexpr const TVariable kVar_pt0g(BuiltInId::pt0g,
>+                                    BuiltInName::_empty,
>+                                    SymbolType::BuiltIn,
>+                                    TExtension::UNDEFINED,
>+                                    StaticType::Get<EbtIImage2D, EbpUndefined, EvqGlobal, 1, 1>());
>+constexpr const TVariable kVar_pt0h(BuiltInId::pt0h,
>+                                    BuiltInName::_empty,
>+                                    SymbolType::BuiltIn,
>+                                    TExtension::UNDEFINED,
>+                                    StaticType::Get<EbtUImage2D, EbpUndefined, EvqGlobal, 1, 1>());
>+constexpr const TVariable kVar_pt0i(BuiltInId::pt0i,
>+                                    BuiltInName::_empty,
>+                                    SymbolType::BuiltIn,
>+                                    TExtension::UNDEFINED,
>+                                    StaticType::Get<EbtImage3D, EbpUndefined, EvqGlobal, 1, 1>());
>+constexpr const TVariable kVar_pt0j(BuiltInId::pt0j,
>+                                    BuiltInName::_empty,
>+                                    SymbolType::BuiltIn,
>+                                    TExtension::UNDEFINED,
>+                                    StaticType::Get<EbtIImage3D, EbpUndefined, EvqGlobal, 1, 1>());
>+constexpr const TVariable kVar_pt0k(BuiltInId::pt0k,
>+                                    BuiltInName::_empty,
>+                                    SymbolType::BuiltIn,
>+                                    TExtension::UNDEFINED,
>+                                    StaticType::Get<EbtUImage3D, EbpUndefined, EvqGlobal, 1, 1>());
>+constexpr const TVariable kVar_pt0l(
>+    BuiltInId::pt0l,
>+    BuiltInName::_empty,
>+    SymbolType::BuiltIn,
>+    TExtension::UNDEFINED,
>+    StaticType::Get<EbtImage2DArray, EbpUndefined, EvqGlobal, 1, 1>());
>+constexpr const TVariable kVar_pt0m(
>+    BuiltInId::pt0m,
>+    BuiltInName::_empty,
>+    SymbolType::BuiltIn,
>+    TExtension::UNDEFINED,
>+    StaticType::Get<EbtIImage2DArray, EbpUndefined, EvqGlobal, 1, 1>());
>+constexpr const TVariable kVar_pt0n(
>+    BuiltInId::pt0n,
>+    BuiltInName::_empty,
>+    SymbolType::BuiltIn,
>+    TExtension::UNDEFINED,
>+    StaticType::Get<EbtUImage2DArray, EbpUndefined, EvqGlobal, 1, 1>());
>+constexpr const TVariable kVar_pt0o(BuiltInId::pt0o,
>+                                    BuiltInName::_empty,
>+                                    SymbolType::BuiltIn,
>+                                    TExtension::UNDEFINED,
>+                                    StaticType::Get<EbtImageCube, EbpUndefined, EvqGlobal, 1, 1>());
>+constexpr const TVariable kVar_pt0p(
>+    BuiltInId::pt0p,
>+    BuiltInName::_empty,
>+    SymbolType::BuiltIn,
>+    TExtension::UNDEFINED,
>+    StaticType::Get<EbtIImageCube, EbpUndefined, EvqGlobal, 1, 1>());
>+constexpr const TVariable kVar_pt0q(
>+    BuiltInId::pt0q,
>+    BuiltInName::_empty,
>+    SymbolType::BuiltIn,
>+    TExtension::UNDEFINED,
>+    StaticType::Get<EbtUImageCube, EbpUndefined, EvqGlobal, 1, 1>());
>+constexpr const TVariable kVar_pt1B(BuiltInId::pt1B,
>+                                    BuiltInName::_empty,
>+                                    SymbolType::BuiltIn,
>+                                    TExtension::UNDEFINED,
>+                                    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 2, 1>());
>+constexpr const TVariable kVar_pt1C(BuiltInId::pt1C,
>+                                    BuiltInName::_empty,
>+                                    SymbolType::BuiltIn,
>+                                    TExtension::UNDEFINED,
>+                                    StaticType::Get<EbtInt, EbpUndefined, EvqGlobal, 2, 1>());
>+constexpr const TVariable kVar_pt1D(BuiltInId::pt1D,
>+                                    BuiltInName::_empty,
>+                                    SymbolType::BuiltIn,
>+                                    TExtension::UNDEFINED,
>+                                    StaticType::Get<EbtUInt, EbpUndefined, EvqGlobal, 2, 1>());
>+constexpr const TVariable kVar_pt1E(BuiltInId::pt1E,
>+                                    BuiltInName::_empty,
>+                                    SymbolType::BuiltIn,
>+                                    TExtension::UNDEFINED,
>+                                    StaticType::Get<EbtBool, EbpUndefined, EvqGlobal, 2, 1>());
>+constexpr const TVariable kVar_pt2B(BuiltInId::pt2B,
>+                                    BuiltInName::_empty,
>+                                    SymbolType::BuiltIn,
>+                                    TExtension::UNDEFINED,
>+                                    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 3, 1>());
>+constexpr const TVariable kVar_pt2C(BuiltInId::pt2C,
>+                                    BuiltInName::_empty,
>+                                    SymbolType::BuiltIn,
>+                                    TExtension::UNDEFINED,
>+                                    StaticType::Get<EbtInt, EbpUndefined, EvqGlobal, 3, 1>());
>+constexpr const TVariable kVar_pt2D(BuiltInId::pt2D,
>+                                    BuiltInName::_empty,
>+                                    SymbolType::BuiltIn,
>+                                    TExtension::UNDEFINED,
>+                                    StaticType::Get<EbtUInt, EbpUndefined, EvqGlobal, 3, 1>());
>+constexpr const TVariable kVar_pt2E(BuiltInId::pt2E,
>+                                    BuiltInName::_empty,
>+                                    SymbolType::BuiltIn,
>+                                    TExtension::UNDEFINED,
>+                                    StaticType::Get<EbtBool, EbpUndefined, EvqGlobal, 3, 1>());
>+constexpr const TVariable kVar_pt3B(BuiltInId::pt3B,
>+                                    BuiltInName::_empty,
>+                                    SymbolType::BuiltIn,
>+                                    TExtension::UNDEFINED,
>+                                    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 4, 1>());
>+constexpr const TVariable kVar_pt3C(BuiltInId::pt3C,
>+                                    BuiltInName::_empty,
>+                                    SymbolType::BuiltIn,
>+                                    TExtension::UNDEFINED,
>+                                    StaticType::Get<EbtInt, EbpUndefined, EvqGlobal, 4, 1>());
>+constexpr const TVariable kVar_pt3D(BuiltInId::pt3D,
>+                                    BuiltInName::_empty,
>+                                    SymbolType::BuiltIn,
>+                                    TExtension::UNDEFINED,
>+                                    StaticType::Get<EbtUInt, EbpUndefined, EvqGlobal, 4, 1>());
>+constexpr const TVariable kVar_pt3E(BuiltInId::pt3E,
>+                                    BuiltInName::_empty,
>+                                    SymbolType::BuiltIn,
>+                                    TExtension::UNDEFINED,
>+                                    StaticType::Get<EbtBool, EbpUndefined, EvqGlobal, 4, 1>());
>+constexpr const TVariable kVar_pt5B(BuiltInId::pt5B,
>+                                    BuiltInName::_empty,
>+                                    SymbolType::BuiltIn,
>+                                    TExtension::UNDEFINED,
>+                                    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 2, 2>());
>+constexpr const TVariable kVar_pt6B(BuiltInId::pt6B,
>+                                    BuiltInName::_empty,
>+                                    SymbolType::BuiltIn,
>+                                    TExtension::UNDEFINED,
>+                                    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 3, 2>());
>+constexpr const TVariable kVar_pt7B(BuiltInId::pt7B,
>+                                    BuiltInName::_empty,
>+                                    SymbolType::BuiltIn,
>+                                    TExtension::UNDEFINED,
>+                                    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 4, 2>());
>+constexpr const TVariable kVar_pt9B(BuiltInId::pt9B,
>+                                    BuiltInName::_empty,
>+                                    SymbolType::BuiltIn,
>+                                    TExtension::UNDEFINED,
>+                                    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 2, 3>());
>+constexpr const TVariable kVar_ptAB(BuiltInId::ptAB,
>+                                    BuiltInName::_empty,
>+                                    SymbolType::BuiltIn,
>+                                    TExtension::UNDEFINED,
>+                                    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 3, 3>());
>+constexpr const TVariable kVar_ptBB(BuiltInId::ptBB,
>+                                    BuiltInName::_empty,
>+                                    SymbolType::BuiltIn,
>+                                    TExtension::UNDEFINED,
>+                                    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 4, 3>());
>+constexpr const TVariable kVar_ptDB(BuiltInId::ptDB,
>+                                    BuiltInName::_empty,
>+                                    SymbolType::BuiltIn,
>+                                    TExtension::UNDEFINED,
>+                                    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 2, 4>());
>+constexpr const TVariable kVar_ptEB(BuiltInId::ptEB,
>+                                    BuiltInName::_empty,
>+                                    SymbolType::BuiltIn,
>+                                    TExtension::UNDEFINED,
>+                                    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 3, 4>());
>+constexpr const TVariable kVar_ptFB(BuiltInId::ptFB,
>+                                    BuiltInName::_empty,
>+                                    SymbolType::BuiltIn,
>+                                    TExtension::UNDEFINED,
>+                                    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 4, 4>());
>+constexpr const TVariable kVar_pt_io_0C(BuiltInId::pt_io_0C,
>+                                        BuiltInName::_empty,
>+                                        SymbolType::BuiltIn,
>+                                        TExtension::UNDEFINED,
>+                                        StaticType::Get<EbtInt, EbpUndefined, EvqInOut, 1, 1>());
>+constexpr const TVariable kVar_pt_io_0D(BuiltInId::pt_io_0D,
>+                                        BuiltInName::_empty,
>+                                        SymbolType::BuiltIn,
>+                                        TExtension::UNDEFINED,
>+                                        StaticType::Get<EbtUInt, EbpUndefined, EvqInOut, 1, 1>());
>+constexpr const TVariable kVar_pt_o_0B(BuiltInId::pt_o_0B,
>+                                       BuiltInName::_empty,
>+                                       SymbolType::BuiltIn,
>+                                       TExtension::UNDEFINED,
>+                                       StaticType::Get<EbtFloat, EbpUndefined, EvqOut, 1, 1>());
>+constexpr const TVariable kVar_pt_o_0C(BuiltInId::pt_o_0C,
>+                                       BuiltInName::_empty,
>+                                       SymbolType::BuiltIn,
>+                                       TExtension::UNDEFINED,
>+                                       StaticType::Get<EbtInt, EbpUndefined, EvqOut, 1, 1>());
>+constexpr const TVariable kVar_pt_o_0D(BuiltInId::pt_o_0D,
>+                                       BuiltInName::_empty,
>+                                       SymbolType::BuiltIn,
>+                                       TExtension::UNDEFINED,
>+                                       StaticType::Get<EbtUInt, EbpUndefined, EvqOut, 1, 1>());
>+constexpr const TVariable kVar_pt_o_1B(BuiltInId::pt_o_1B,
>+                                       BuiltInName::_empty,
>+                                       SymbolType::BuiltIn,
>+                                       TExtension::UNDEFINED,
>+                                       StaticType::Get<EbtFloat, EbpUndefined, EvqOut, 2, 1>());
>+constexpr const TVariable kVar_pt_o_1C(BuiltInId::pt_o_1C,
>+                                       BuiltInName::_empty,
>+                                       SymbolType::BuiltIn,
>+                                       TExtension::UNDEFINED,
>+                                       StaticType::Get<EbtInt, EbpUndefined, EvqOut, 2, 1>());
>+constexpr const TVariable kVar_pt_o_1D(BuiltInId::pt_o_1D,
>+                                       BuiltInName::_empty,
>+                                       SymbolType::BuiltIn,
>+                                       TExtension::UNDEFINED,
>+                                       StaticType::Get<EbtUInt, EbpUndefined, EvqOut, 2, 1>());
>+constexpr const TVariable kVar_pt_o_2B(BuiltInId::pt_o_2B,
>+                                       BuiltInName::_empty,
>+                                       SymbolType::BuiltIn,
>+                                       TExtension::UNDEFINED,
>+                                       StaticType::Get<EbtFloat, EbpUndefined, EvqOut, 3, 1>());
>+constexpr const TVariable kVar_pt_o_2C(BuiltInId::pt_o_2C,
>+                                       BuiltInName::_empty,
>+                                       SymbolType::BuiltIn,
>+                                       TExtension::UNDEFINED,
>+                                       StaticType::Get<EbtInt, EbpUndefined, EvqOut, 3, 1>());
>+constexpr const TVariable kVar_pt_o_2D(BuiltInId::pt_o_2D,
>+                                       BuiltInName::_empty,
>+                                       SymbolType::BuiltIn,
>+                                       TExtension::UNDEFINED,
>+                                       StaticType::Get<EbtUInt, EbpUndefined, EvqOut, 3, 1>());
>+constexpr const TVariable kVar_pt_o_3B(BuiltInId::pt_o_3B,
>+                                       BuiltInName::_empty,
>+                                       SymbolType::BuiltIn,
>+                                       TExtension::UNDEFINED,
>+                                       StaticType::Get<EbtFloat, EbpUndefined, EvqOut, 4, 1>());
>+constexpr const TVariable kVar_pt_o_3C(BuiltInId::pt_o_3C,
>+                                       BuiltInName::_empty,
>+                                       SymbolType::BuiltIn,
>+                                       TExtension::UNDEFINED,
>+                                       StaticType::Get<EbtInt, EbpUndefined, EvqOut, 4, 1>());
>+constexpr const TVariable kVar_pt_o_3D(BuiltInId::pt_o_3D,
>+                                       BuiltInName::_empty,
>+                                       SymbolType::BuiltIn,
>+                                       TExtension::UNDEFINED,
>+                                       StaticType::Get<EbtUInt, EbpUndefined, EvqOut, 4, 1>());
>+
>+const TVariable *gl_DrawID()
>+{
>+    return &kVar_gl_DrawID;
>+}
>+
>+const TVariable *gl_DrawIDESSL1()
>+{
>+    return &kVar_gl_DrawIDESSL1;
>+}
>+
>+const TVariable *gl_FragColor()
>+{
>+    return &kVar_gl_FragColor;
>+}
>+
>+const TVariable *gl_FragCoord()
>+{
>+    return &kVar_gl_FragCoord;
>+}
>+
>+const TVariable *gl_FragDepth()
>+{
>+    return &kVar_gl_FragDepth;
>+}
>+
>+const TVariable *gl_FrontFacing()
>+{
>+    return &kVar_gl_FrontFacing;
>+}
>+
>+const TVariable *gl_GlobalInvocationID()
>+{
>+    return &kVar_gl_GlobalInvocationID;
>+}
>+
>+const TVariable *gl_InstanceID()
>+{
>+    return &kVar_gl_InstanceID;
>+}
>+
>+const TVariable *gl_InvocationID()
>+{
>+    return &kVar_gl_InvocationID;
>+}
>+
>+const TVariable *gl_LastFragColor()
>+{
>+    return &kVar_gl_LastFragColor;
>+}
>+
>+const TVariable *gl_LastFragColorARM()
>+{
>+    return &kVar_gl_LastFragColorARM;
>+}
>+
>+const TVariable *gl_Layer()
>+{
>+    return &kVar_gl_Layer;
>+}
>+
>+const TVariable *gl_LayerGS()
>+{
>+    return &kVar_gl_LayerGS;
>+}
>+
>+const TVariable *gl_LayerVS()
>+{
>+    return &kVar_gl_LayerVS;
>+}
>+
>+const TVariable *gl_LocalInvocationID()
>+{
>+    return &kVar_gl_LocalInvocationID;
>+}
>+
>+const TVariable *gl_LocalInvocationIndex()
>+{
>+    return &kVar_gl_LocalInvocationIndex;
>+}
>+
>+const TVariable *gl_NumWorkGroups()
>+{
>+    return &kVar_gl_NumWorkGroups;
>+}
>+
>+const TVariable *gl_PointCoord()
>+{
>+    return &kVar_gl_PointCoord;
>+}
>+
>+const TVariable *gl_PointSize()
>+{
>+    return &kVar_gl_PointSize;
>+}
>+
>+const TVariable *gl_Position()
>+{
>+    return &kVar_gl_Position;
>+}
>+
>+const TVariable *gl_PrimitiveID()
>+{
>+    return &kVar_gl_PrimitiveID;
>+}
>+
>+const TVariable *gl_PrimitiveIDGS()
>+{
>+    return &kVar_gl_PrimitiveIDGS;
>+}
>+
>+const TVariable *gl_PrimitiveIDIn()
>+{
>+    return &kVar_gl_PrimitiveIDIn;
>+}
>+
>+const TVariable *gl_SecondaryFragColorEXT()
>+{
>+    return &kVar_gl_SecondaryFragColorEXT;
>+}
>+
>+const TVariable *gl_VertexID()
>+{
>+    return &kVar_gl_VertexID;
>+}
>+
>+const TVariable *gl_ViewID_OVR()
>+{
>+    return &kVar_gl_ViewID_OVR;
>+}
>+
>+const TVariable *gl_ViewID_OVRESSL1()
>+{
>+    return &kVar_gl_ViewID_OVRESSL1;
>+}
>+
>+const TVariable *gl_ViewportIndex()
>+{
>+    return &kVar_gl_ViewportIndex;
>+}
>+
>+const TVariable *gl_WorkGroupID()
>+{
>+    return &kVar_gl_WorkGroupID;
>+}
>+
>+const TVariable *gl_WorkGroupSize()
>+{
>+    return &kVar_gl_WorkGroupSize;
>+}
>+
>+}  // namespace BuiltInVariable
>+
>+namespace BuiltInParameters
>+{
>+
>+constexpr const TVariable **empty      = nullptr;
>+constexpr const TVariable *p0B0B0B[3]  = {&BuiltInVariable::kVar_pt0B, &BuiltInVariable::kVar_pt0B,
>+                                         &BuiltInVariable::kVar_pt0B};
>+constexpr const TVariable *p0B0B0E[3]  = {&BuiltInVariable::kVar_pt0B, &BuiltInVariable::kVar_pt0B,
>+                                         &BuiltInVariable::kVar_pt0E};
>+constexpr const TVariable *p0B0B1B[3]  = {&BuiltInVariable::kVar_pt0B, &BuiltInVariable::kVar_pt0B,
>+                                         &BuiltInVariable::kVar_pt1B};
>+constexpr const TVariable *p0B0B2B[3]  = {&BuiltInVariable::kVar_pt0B, &BuiltInVariable::kVar_pt0B,
>+                                         &BuiltInVariable::kVar_pt2B};
>+constexpr const TVariable *p0B0B3B[3]  = {&BuiltInVariable::kVar_pt0B, &BuiltInVariable::kVar_pt0B,
>+                                         &BuiltInVariable::kVar_pt3B};
>+constexpr const TVariable *p0B0C[2]    = {&BuiltInVariable::kVar_pt0B, &BuiltInVariable::kVar_pt0C};
>+constexpr const TVariable *p0B1B[2]    = {&BuiltInVariable::kVar_pt0B, &BuiltInVariable::kVar_pt1B};
>+constexpr const TVariable *p0B2B[2]    = {&BuiltInVariable::kVar_pt0B, &BuiltInVariable::kVar_pt2B};
>+constexpr const TVariable *p0B3B[2]    = {&BuiltInVariable::kVar_pt0B, &BuiltInVariable::kVar_pt3B};
>+constexpr const TVariable *p0B_o_0B[2] = {&BuiltInVariable::kVar_pt0B,
>+                                          &BuiltInVariable::kVar_pt_o_0B};
>+constexpr const TVariable *p0B_o_0C[2] = {&BuiltInVariable::kVar_pt0B,
>+                                          &BuiltInVariable::kVar_pt_o_0C};
>+constexpr const TVariable *p0C0C0C0C[4] = {&BuiltInVariable::kVar_pt0C, &BuiltInVariable::kVar_pt0C,
>+                                           &BuiltInVariable::kVar_pt0C,
>+                                           &BuiltInVariable::kVar_pt0C};
>+constexpr const TVariable *p0C0C_o_0C_o_0C[4] = {
>+    &BuiltInVariable::kVar_pt0C, &BuiltInVariable::kVar_pt0C, &BuiltInVariable::kVar_pt_o_0C,
>+    &BuiltInVariable::kVar_pt_o_0C};
>+constexpr const TVariable *p0D0C0C[3]   = {&BuiltInVariable::kVar_pt0D, &BuiltInVariable::kVar_pt0C,
>+                                         &BuiltInVariable::kVar_pt0C};
>+constexpr const TVariable *p0D0D0C0C[4] = {&BuiltInVariable::kVar_pt0D, &BuiltInVariable::kVar_pt0D,
>+                                           &BuiltInVariable::kVar_pt0C,
>+                                           &BuiltInVariable::kVar_pt0C};
>+constexpr const TVariable *p0D0D0D[3]   = {&BuiltInVariable::kVar_pt0D, &BuiltInVariable::kVar_pt0D,
>+                                         &BuiltInVariable::kVar_pt0D};
>+constexpr const TVariable *p0D0D_o_0D_o_0D[4] = {
>+    &BuiltInVariable::kVar_pt0D, &BuiltInVariable::kVar_pt0D, &BuiltInVariable::kVar_pt_o_0D,
>+    &BuiltInVariable::kVar_pt_o_0D};
>+constexpr const TVariable *p0F[1]   = {&BuiltInVariable::kVar_pt0F};
>+constexpr const TVariable *p0H0C[2] = {&BuiltInVariable::kVar_pt0H, &BuiltInVariable::kVar_pt0C};
>+constexpr const TVariable *p0H1B0B1C[4] = {&BuiltInVariable::kVar_pt0H, &BuiltInVariable::kVar_pt1B,
>+                                           &BuiltInVariable::kVar_pt0B,
>+                                           &BuiltInVariable::kVar_pt1C};
>+constexpr const TVariable *p0H1B0C[3]   = {&BuiltInVariable::kVar_pt0H, &BuiltInVariable::kVar_pt1B,
>+                                         &BuiltInVariable::kVar_pt0C};
>+constexpr const TVariable *p0H1B1B1B1C[5] = {
>+    &BuiltInVariable::kVar_pt0H, &BuiltInVariable::kVar_pt1B, &BuiltInVariable::kVar_pt1B,
>+    &BuiltInVariable::kVar_pt1B, &BuiltInVariable::kVar_pt1C};
>+constexpr const TVariable *p0H1B1C0B[4] = {&BuiltInVariable::kVar_pt0H, &BuiltInVariable::kVar_pt1B,
>+                                           &BuiltInVariable::kVar_pt1C,
>+                                           &BuiltInVariable::kVar_pt0B};
>+constexpr const TVariable *p0H1B1C0C[4] = {&BuiltInVariable::kVar_pt0H, &BuiltInVariable::kVar_pt1B,
>+                                           &BuiltInVariable::kVar_pt1C,
>+                                           &BuiltInVariable::kVar_pt0C};
>+constexpr const TVariable *p0H1C0C1C[4] = {&BuiltInVariable::kVar_pt0H, &BuiltInVariable::kVar_pt1C,
>+                                           &BuiltInVariable::kVar_pt0C,
>+                                           &BuiltInVariable::kVar_pt1C};
>+constexpr const TVariable *p0H2B0B1C[4] = {&BuiltInVariable::kVar_pt0H, &BuiltInVariable::kVar_pt2B,
>+                                           &BuiltInVariable::kVar_pt0B,
>+                                           &BuiltInVariable::kVar_pt1C};
>+constexpr const TVariable *p0H2B1B1B1C[5] = {
>+    &BuiltInVariable::kVar_pt0H, &BuiltInVariable::kVar_pt2B, &BuiltInVariable::kVar_pt1B,
>+    &BuiltInVariable::kVar_pt1B, &BuiltInVariable::kVar_pt1C};
>+constexpr const TVariable *p0H2B1C0B[4] = {&BuiltInVariable::kVar_pt0H, &BuiltInVariable::kVar_pt2B,
>+                                           &BuiltInVariable::kVar_pt1C,
>+                                           &BuiltInVariable::kVar_pt0B};
>+constexpr const TVariable *p0H3B0B1C[4] = {&BuiltInVariable::kVar_pt0H, &BuiltInVariable::kVar_pt3B,
>+                                           &BuiltInVariable::kVar_pt0B,
>+                                           &BuiltInVariable::kVar_pt1C};
>+constexpr const TVariable *p0H3B1B1B1C[5] = {
>+    &BuiltInVariable::kVar_pt0H, &BuiltInVariable::kVar_pt3B, &BuiltInVariable::kVar_pt1B,
>+    &BuiltInVariable::kVar_pt1B, &BuiltInVariable::kVar_pt1C};
>+constexpr const TVariable *p0H3B1C0B[4] = {&BuiltInVariable::kVar_pt0H, &BuiltInVariable::kVar_pt3B,
>+                                           &BuiltInVariable::kVar_pt1C,
>+                                           &BuiltInVariable::kVar_pt0B};
>+constexpr const TVariable *p0I0C[2] = {&BuiltInVariable::kVar_pt0I, &BuiltInVariable::kVar_pt0C};
>+constexpr const TVariable *p0I2B0B2C[4] = {&BuiltInVariable::kVar_pt0I, &BuiltInVariable::kVar_pt2B,
>+                                           &BuiltInVariable::kVar_pt0B,
>+                                           &BuiltInVariable::kVar_pt2C};
>+constexpr const TVariable *p0I2B2B2B2C[5] = {
>+    &BuiltInVariable::kVar_pt0I, &BuiltInVariable::kVar_pt2B, &BuiltInVariable::kVar_pt2B,
>+    &BuiltInVariable::kVar_pt2B, &BuiltInVariable::kVar_pt2C};
>+constexpr const TVariable *p0I2B2C0B[4] = {&BuiltInVariable::kVar_pt0I, &BuiltInVariable::kVar_pt2B,
>+                                           &BuiltInVariable::kVar_pt2C,
>+                                           &BuiltInVariable::kVar_pt0B};
>+constexpr const TVariable *p0I2C0C2C[4] = {&BuiltInVariable::kVar_pt0I, &BuiltInVariable::kVar_pt2C,
>+                                           &BuiltInVariable::kVar_pt0C,
>+                                           &BuiltInVariable::kVar_pt2C};
>+constexpr const TVariable *p0I3B0B2C[4] = {&BuiltInVariable::kVar_pt0I, &BuiltInVariable::kVar_pt3B,
>+                                           &BuiltInVariable::kVar_pt0B,
>+                                           &BuiltInVariable::kVar_pt2C};
>+constexpr const TVariable *p0I3B2B2B2C[5] = {
>+    &BuiltInVariable::kVar_pt0I, &BuiltInVariable::kVar_pt3B, &BuiltInVariable::kVar_pt2B,
>+    &BuiltInVariable::kVar_pt2B, &BuiltInVariable::kVar_pt2C};
>+constexpr const TVariable *p0I3B2C0B[4] = {&BuiltInVariable::kVar_pt0I, &BuiltInVariable::kVar_pt3B,
>+                                           &BuiltInVariable::kVar_pt2C,
>+                                           &BuiltInVariable::kVar_pt0B};
>+constexpr const TVariable *p0J0C[2]   = {&BuiltInVariable::kVar_pt0J, &BuiltInVariable::kVar_pt0C};
>+constexpr const TVariable *p0J2B0B[3] = {&BuiltInVariable::kVar_pt0J, &BuiltInVariable::kVar_pt2B,
>+                                         &BuiltInVariable::kVar_pt0B};
>+constexpr const TVariable *p0J2B0C[3] = {&BuiltInVariable::kVar_pt0J, &BuiltInVariable::kVar_pt2B,
>+                                         &BuiltInVariable::kVar_pt0C};
>+constexpr const TVariable *p0J2B2B2B[4] = {&BuiltInVariable::kVar_pt0J, &BuiltInVariable::kVar_pt2B,
>+                                           &BuiltInVariable::kVar_pt2B,
>+                                           &BuiltInVariable::kVar_pt2B};
>+constexpr const TVariable *p0K0C[2] = {&BuiltInVariable::kVar_pt0K, &BuiltInVariable::kVar_pt0C};
>+constexpr const TVariable *p0K2B0B1C[4] = {&BuiltInVariable::kVar_pt0K, &BuiltInVariable::kVar_pt2B,
>+                                           &BuiltInVariable::kVar_pt0B,
>+                                           &BuiltInVariable::kVar_pt1C};
>+constexpr const TVariable *p0K2B0C[3]   = {&BuiltInVariable::kVar_pt0K, &BuiltInVariable::kVar_pt2B,
>+                                         &BuiltInVariable::kVar_pt0C};
>+constexpr const TVariable *p0K2B1B1B1C[5] = {
>+    &BuiltInVariable::kVar_pt0K, &BuiltInVariable::kVar_pt2B, &BuiltInVariable::kVar_pt1B,
>+    &BuiltInVariable::kVar_pt1B, &BuiltInVariable::kVar_pt1C};
>+constexpr const TVariable *p0K2B1C0B[4] = {&BuiltInVariable::kVar_pt0K, &BuiltInVariable::kVar_pt2B,
>+                                           &BuiltInVariable::kVar_pt1C,
>+                                           &BuiltInVariable::kVar_pt0B};
>+constexpr const TVariable *p0K2B1C0C[4] = {&BuiltInVariable::kVar_pt0K, &BuiltInVariable::kVar_pt2B,
>+                                           &BuiltInVariable::kVar_pt1C,
>+                                           &BuiltInVariable::kVar_pt0C};
>+constexpr const TVariable *p0K2C0C1C[4] = {&BuiltInVariable::kVar_pt0K, &BuiltInVariable::kVar_pt2C,
>+                                           &BuiltInVariable::kVar_pt0C,
>+                                           &BuiltInVariable::kVar_pt1C};
>+constexpr const TVariable *p0L0C[2]   = {&BuiltInVariable::kVar_pt0L, &BuiltInVariable::kVar_pt0C};
>+constexpr const TVariable *p0L1B0B[3] = {&BuiltInVariable::kVar_pt0L, &BuiltInVariable::kVar_pt1B,
>+                                         &BuiltInVariable::kVar_pt0B};
>+constexpr const TVariable *p0L1C0C[3] = {&BuiltInVariable::kVar_pt0L, &BuiltInVariable::kVar_pt1C,
>+                                         &BuiltInVariable::kVar_pt0C};
>+constexpr const TVariable *p0L2B0B[3] = {&BuiltInVariable::kVar_pt0L, &BuiltInVariable::kVar_pt2B,
>+                                         &BuiltInVariable::kVar_pt0B};
>+constexpr const TVariable *p0L3B0B[3] = {&BuiltInVariable::kVar_pt0L, &BuiltInVariable::kVar_pt3B,
>+                                         &BuiltInVariable::kVar_pt0B};
>+constexpr const TVariable *p0M0C[2]   = {&BuiltInVariable::kVar_pt0M, &BuiltInVariable::kVar_pt0C};
>+constexpr const TVariable *p0M1B0B[3] = {&BuiltInVariable::kVar_pt0M, &BuiltInVariable::kVar_pt1B,
>+                                         &BuiltInVariable::kVar_pt0B};
>+constexpr const TVariable *p0M1C0C[3] = {&BuiltInVariable::kVar_pt0M, &BuiltInVariable::kVar_pt1C,
>+                                         &BuiltInVariable::kVar_pt0C};
>+constexpr const TVariable *p0M2B0B[3] = {&BuiltInVariable::kVar_pt0M, &BuiltInVariable::kVar_pt2B,
>+                                         &BuiltInVariable::kVar_pt0B};
>+constexpr const TVariable *p0M3B0B[3] = {&BuiltInVariable::kVar_pt0M, &BuiltInVariable::kVar_pt3B,
>+                                         &BuiltInVariable::kVar_pt0B};
>+constexpr const TVariable *p0N1B[2]   = {&BuiltInVariable::kVar_pt0N, &BuiltInVariable::kVar_pt1B};
>+constexpr const TVariable *p0N2B[2]   = {&BuiltInVariable::kVar_pt0N, &BuiltInVariable::kVar_pt2B};
>+constexpr const TVariable *p0N3B[2]   = {&BuiltInVariable::kVar_pt0N, &BuiltInVariable::kVar_pt3B};
>+constexpr const TVariable *p0O1C0C[3] = {&BuiltInVariable::kVar_pt0O, &BuiltInVariable::kVar_pt1C,
>+                                         &BuiltInVariable::kVar_pt0C};
>+constexpr const TVariable *p0P2C0C[3] = {&BuiltInVariable::kVar_pt0P, &BuiltInVariable::kVar_pt2C,
>+                                         &BuiltInVariable::kVar_pt0C};
>+constexpr const TVariable *p0Q0C[2]   = {&BuiltInVariable::kVar_pt0Q, &BuiltInVariable::kVar_pt0C};
>+constexpr const TVariable *p0Q1B0B1C[4] = {&BuiltInVariable::kVar_pt0Q, &BuiltInVariable::kVar_pt1B,
>+                                           &BuiltInVariable::kVar_pt0B,
>+                                           &BuiltInVariable::kVar_pt1C};
>+constexpr const TVariable *p0Q1B0C[3]   = {&BuiltInVariable::kVar_pt0Q, &BuiltInVariable::kVar_pt1B,
>+                                         &BuiltInVariable::kVar_pt0C};
>+constexpr const TVariable *p0Q1B1B1B1C[5] = {
>+    &BuiltInVariable::kVar_pt0Q, &BuiltInVariable::kVar_pt1B, &BuiltInVariable::kVar_pt1B,
>+    &BuiltInVariable::kVar_pt1B, &BuiltInVariable::kVar_pt1C};
>+constexpr const TVariable *p0Q1B1C0B[4] = {&BuiltInVariable::kVar_pt0Q, &BuiltInVariable::kVar_pt1B,
>+                                           &BuiltInVariable::kVar_pt1C,
>+                                           &BuiltInVariable::kVar_pt0B};
>+constexpr const TVariable *p0Q1B1C0C[4] = {&BuiltInVariable::kVar_pt0Q, &BuiltInVariable::kVar_pt1B,
>+                                           &BuiltInVariable::kVar_pt1C,
>+                                           &BuiltInVariable::kVar_pt0C};
>+constexpr const TVariable *p0Q1C0C1C[4] = {&BuiltInVariable::kVar_pt0Q, &BuiltInVariable::kVar_pt1C,
>+                                           &BuiltInVariable::kVar_pt0C,
>+                                           &BuiltInVariable::kVar_pt1C};
>+constexpr const TVariable *p0Q2B0B1C[4] = {&BuiltInVariable::kVar_pt0Q, &BuiltInVariable::kVar_pt2B,
>+                                           &BuiltInVariable::kVar_pt0B,
>+                                           &BuiltInVariable::kVar_pt1C};
>+constexpr const TVariable *p0Q2B1B1B1C[5] = {
>+    &BuiltInVariable::kVar_pt0Q, &BuiltInVariable::kVar_pt2B, &BuiltInVariable::kVar_pt1B,
>+    &BuiltInVariable::kVar_pt1B, &BuiltInVariable::kVar_pt1C};
>+constexpr const TVariable *p0Q2B1C0B[4] = {&BuiltInVariable::kVar_pt0Q, &BuiltInVariable::kVar_pt2B,
>+                                           &BuiltInVariable::kVar_pt1C,
>+                                           &BuiltInVariable::kVar_pt0B};
>+constexpr const TVariable *p0Q3B0B1C[4] = {&BuiltInVariable::kVar_pt0Q, &BuiltInVariable::kVar_pt3B,
>+                                           &BuiltInVariable::kVar_pt0B,
>+                                           &BuiltInVariable::kVar_pt1C};
>+constexpr const TVariable *p0Q3B1B1B1C[5] = {
>+    &BuiltInVariable::kVar_pt0Q, &BuiltInVariable::kVar_pt3B, &BuiltInVariable::kVar_pt1B,
>+    &BuiltInVariable::kVar_pt1B, &BuiltInVariable::kVar_pt1C};
>+constexpr const TVariable *p0Q3B1C0B[4] = {&BuiltInVariable::kVar_pt0Q, &BuiltInVariable::kVar_pt3B,
>+                                           &BuiltInVariable::kVar_pt1C,
>+                                           &BuiltInVariable::kVar_pt0B};
>+constexpr const TVariable *p0R0C[2] = {&BuiltInVariable::kVar_pt0R, &BuiltInVariable::kVar_pt0C};
>+constexpr const TVariable *p0R2B0B2C[4] = {&BuiltInVariable::kVar_pt0R, &BuiltInVariable::kVar_pt2B,
>+                                           &BuiltInVariable::kVar_pt0B,
>+                                           &BuiltInVariable::kVar_pt2C};
>+constexpr const TVariable *p0R2B2B2B2C[5] = {
>+    &BuiltInVariable::kVar_pt0R, &BuiltInVariable::kVar_pt2B, &BuiltInVariable::kVar_pt2B,
>+    &BuiltInVariable::kVar_pt2B, &BuiltInVariable::kVar_pt2C};
>+constexpr const TVariable *p0R2B2C0B[4] = {&BuiltInVariable::kVar_pt0R, &BuiltInVariable::kVar_pt2B,
>+                                           &BuiltInVariable::kVar_pt2C,
>+                                           &BuiltInVariable::kVar_pt0B};
>+constexpr const TVariable *p0R2C0C2C[4] = {&BuiltInVariable::kVar_pt0R, &BuiltInVariable::kVar_pt2C,
>+                                           &BuiltInVariable::kVar_pt0C,
>+                                           &BuiltInVariable::kVar_pt2C};
>+constexpr const TVariable *p0R3B0B2C[4] = {&BuiltInVariable::kVar_pt0R, &BuiltInVariable::kVar_pt3B,
>+                                           &BuiltInVariable::kVar_pt0B,
>+                                           &BuiltInVariable::kVar_pt2C};
>+constexpr const TVariable *p0R3B2B2B2C[5] = {
>+    &BuiltInVariable::kVar_pt0R, &BuiltInVariable::kVar_pt3B, &BuiltInVariable::kVar_pt2B,
>+    &BuiltInVariable::kVar_pt2B, &BuiltInVariable::kVar_pt2C};
>+constexpr const TVariable *p0R3B2C0B[4] = {&BuiltInVariable::kVar_pt0R, &BuiltInVariable::kVar_pt3B,
>+                                           &BuiltInVariable::kVar_pt2C,
>+                                           &BuiltInVariable::kVar_pt0B};
>+constexpr const TVariable *p0S0C[2]   = {&BuiltInVariable::kVar_pt0S, &BuiltInVariable::kVar_pt0C};
>+constexpr const TVariable *p0S2B0B[3] = {&BuiltInVariable::kVar_pt0S, &BuiltInVariable::kVar_pt2B,
>+                                         &BuiltInVariable::kVar_pt0B};
>+constexpr const TVariable *p0S2B0C[3] = {&BuiltInVariable::kVar_pt0S, &BuiltInVariable::kVar_pt2B,
>+                                         &BuiltInVariable::kVar_pt0C};
>+constexpr const TVariable *p0S2B2B2B[4] = {&BuiltInVariable::kVar_pt0S, &BuiltInVariable::kVar_pt2B,
>+                                           &BuiltInVariable::kVar_pt2B,
>+                                           &BuiltInVariable::kVar_pt2B};
>+constexpr const TVariable *p0T0C[2] = {&BuiltInVariable::kVar_pt0T, &BuiltInVariable::kVar_pt0C};
>+constexpr const TVariable *p0T2B0B1C[4] = {&BuiltInVariable::kVar_pt0T, &BuiltInVariable::kVar_pt2B,
>+                                           &BuiltInVariable::kVar_pt0B,
>+                                           &BuiltInVariable::kVar_pt1C};
>+constexpr const TVariable *p0T2B0C[3]   = {&BuiltInVariable::kVar_pt0T, &BuiltInVariable::kVar_pt2B,
>+                                         &BuiltInVariable::kVar_pt0C};
>+constexpr const TVariable *p0T2B1B1B1C[5] = {
>+    &BuiltInVariable::kVar_pt0T, &BuiltInVariable::kVar_pt2B, &BuiltInVariable::kVar_pt1B,
>+    &BuiltInVariable::kVar_pt1B, &BuiltInVariable::kVar_pt1C};
>+constexpr const TVariable *p0T2B1C0B[4] = {&BuiltInVariable::kVar_pt0T, &BuiltInVariable::kVar_pt2B,
>+                                           &BuiltInVariable::kVar_pt1C,
>+                                           &BuiltInVariable::kVar_pt0B};
>+constexpr const TVariable *p0T2B1C0C[4] = {&BuiltInVariable::kVar_pt0T, &BuiltInVariable::kVar_pt2B,
>+                                           &BuiltInVariable::kVar_pt1C,
>+                                           &BuiltInVariable::kVar_pt0C};
>+constexpr const TVariable *p0T2C0C1C[4] = {&BuiltInVariable::kVar_pt0T, &BuiltInVariable::kVar_pt2C,
>+                                           &BuiltInVariable::kVar_pt0C,
>+                                           &BuiltInVariable::kVar_pt1C};
>+constexpr const TVariable *p0U1C0C[3]   = {&BuiltInVariable::kVar_pt0U, &BuiltInVariable::kVar_pt1C,
>+                                         &BuiltInVariable::kVar_pt0C};
>+constexpr const TVariable *p0V2C0C[3]   = {&BuiltInVariable::kVar_pt0V, &BuiltInVariable::kVar_pt2C,
>+                                         &BuiltInVariable::kVar_pt0C};
>+constexpr const TVariable *p0W0C[2] = {&BuiltInVariable::kVar_pt0W, &BuiltInVariable::kVar_pt0C};
>+constexpr const TVariable *p0W1B0B1C[4] = {&BuiltInVariable::kVar_pt0W, &BuiltInVariable::kVar_pt1B,
>+                                           &BuiltInVariable::kVar_pt0B,
>+                                           &BuiltInVariable::kVar_pt1C};
>+constexpr const TVariable *p0W1B0C[3]   = {&BuiltInVariable::kVar_pt0W, &BuiltInVariable::kVar_pt1B,
>+                                         &BuiltInVariable::kVar_pt0C};
>+constexpr const TVariable *p0W1B1B1B1C[5] = {
>+    &BuiltInVariable::kVar_pt0W, &BuiltInVariable::kVar_pt1B, &BuiltInVariable::kVar_pt1B,
>+    &BuiltInVariable::kVar_pt1B, &BuiltInVariable::kVar_pt1C};
>+constexpr const TVariable *p0W1B1C0B[4] = {&BuiltInVariable::kVar_pt0W, &BuiltInVariable::kVar_pt1B,
>+                                           &BuiltInVariable::kVar_pt1C,
>+                                           &BuiltInVariable::kVar_pt0B};
>+constexpr const TVariable *p0W1B1C0C[4] = {&BuiltInVariable::kVar_pt0W, &BuiltInVariable::kVar_pt1B,
>+                                           &BuiltInVariable::kVar_pt1C,
>+                                           &BuiltInVariable::kVar_pt0C};
>+constexpr const TVariable *p0W1C0C1C[4] = {&BuiltInVariable::kVar_pt0W, &BuiltInVariable::kVar_pt1C,
>+                                           &BuiltInVariable::kVar_pt0C,
>+                                           &BuiltInVariable::kVar_pt1C};
>+constexpr const TVariable *p0W2B0B1C[4] = {&BuiltInVariable::kVar_pt0W, &BuiltInVariable::kVar_pt2B,
>+                                           &BuiltInVariable::kVar_pt0B,
>+                                           &BuiltInVariable::kVar_pt1C};
>+constexpr const TVariable *p0W2B1B1B1C[5] = {
>+    &BuiltInVariable::kVar_pt0W, &BuiltInVariable::kVar_pt2B, &BuiltInVariable::kVar_pt1B,
>+    &BuiltInVariable::kVar_pt1B, &BuiltInVariable::kVar_pt1C};
>+constexpr const TVariable *p0W2B1C0B[4] = {&BuiltInVariable::kVar_pt0W, &BuiltInVariable::kVar_pt2B,
>+                                           &BuiltInVariable::kVar_pt1C,
>+                                           &BuiltInVariable::kVar_pt0B};
>+constexpr const TVariable *p0W3B0B1C[4] = {&BuiltInVariable::kVar_pt0W, &BuiltInVariable::kVar_pt3B,
>+                                           &BuiltInVariable::kVar_pt0B,
>+                                           &BuiltInVariable::kVar_pt1C};
>+constexpr const TVariable *p0W3B1B1B1C[5] = {
>+    &BuiltInVariable::kVar_pt0W, &BuiltInVariable::kVar_pt3B, &BuiltInVariable::kVar_pt1B,
>+    &BuiltInVariable::kVar_pt1B, &BuiltInVariable::kVar_pt1C};
>+constexpr const TVariable *p0W3B1C0B[4] = {&BuiltInVariable::kVar_pt0W, &BuiltInVariable::kVar_pt3B,
>+                                           &BuiltInVariable::kVar_pt1C,
>+                                           &BuiltInVariable::kVar_pt0B};
>+constexpr const TVariable *p0X0C[2] = {&BuiltInVariable::kVar_pt0X, &BuiltInVariable::kVar_pt0C};
>+constexpr const TVariable *p0X2B0B2C[4] = {&BuiltInVariable::kVar_pt0X, &BuiltInVariable::kVar_pt2B,
>+                                           &BuiltInVariable::kVar_pt0B,
>+                                           &BuiltInVariable::kVar_pt2C};
>+constexpr const TVariable *p0X2B2B2B2C[5] = {
>+    &BuiltInVariable::kVar_pt0X, &BuiltInVariable::kVar_pt2B, &BuiltInVariable::kVar_pt2B,
>+    &BuiltInVariable::kVar_pt2B, &BuiltInVariable::kVar_pt2C};
>+constexpr const TVariable *p0X2B2C0B[4] = {&BuiltInVariable::kVar_pt0X, &BuiltInVariable::kVar_pt2B,
>+                                           &BuiltInVariable::kVar_pt2C,
>+                                           &BuiltInVariable::kVar_pt0B};
>+constexpr const TVariable *p0X2C0C2C[4] = {&BuiltInVariable::kVar_pt0X, &BuiltInVariable::kVar_pt2C,
>+                                           &BuiltInVariable::kVar_pt0C,
>+                                           &BuiltInVariable::kVar_pt2C};
>+constexpr const TVariable *p0X3B0B2C[4] = {&BuiltInVariable::kVar_pt0X, &BuiltInVariable::kVar_pt3B,
>+                                           &BuiltInVariable::kVar_pt0B,
>+                                           &BuiltInVariable::kVar_pt2C};
>+constexpr const TVariable *p0X3B2B2B2C[5] = {
>+    &BuiltInVariable::kVar_pt0X, &BuiltInVariable::kVar_pt3B, &BuiltInVariable::kVar_pt2B,
>+    &BuiltInVariable::kVar_pt2B, &BuiltInVariable::kVar_pt2C};
>+constexpr const TVariable *p0X3B2C0B[4] = {&BuiltInVariable::kVar_pt0X, &BuiltInVariable::kVar_pt3B,
>+                                           &BuiltInVariable::kVar_pt2C,
>+                                           &BuiltInVariable::kVar_pt0B};
>+constexpr const TVariable *p0Y0C[2]   = {&BuiltInVariable::kVar_pt0Y, &BuiltInVariable::kVar_pt0C};
>+constexpr const TVariable *p0Y2B0B[3] = {&BuiltInVariable::kVar_pt0Y, &BuiltInVariable::kVar_pt2B,
>+                                         &BuiltInVariable::kVar_pt0B};
>+constexpr const TVariable *p0Y2B0C[3] = {&BuiltInVariable::kVar_pt0Y, &BuiltInVariable::kVar_pt2B,
>+                                         &BuiltInVariable::kVar_pt0C};
>+constexpr const TVariable *p0Y2B2B2B[4] = {&BuiltInVariable::kVar_pt0Y, &BuiltInVariable::kVar_pt2B,
>+                                           &BuiltInVariable::kVar_pt2B,
>+                                           &BuiltInVariable::kVar_pt2B};
>+constexpr const TVariable *p0Z0C[2] = {&BuiltInVariable::kVar_pt0Z, &BuiltInVariable::kVar_pt0C};
>+constexpr const TVariable *p0Z2B0B1C[4] = {&BuiltInVariable::kVar_pt0Z, &BuiltInVariable::kVar_pt2B,
>+                                           &BuiltInVariable::kVar_pt0B,
>+                                           &BuiltInVariable::kVar_pt1C};
>+constexpr const TVariable *p0Z2B0C[3]   = {&BuiltInVariable::kVar_pt0Z, &BuiltInVariable::kVar_pt2B,
>+                                         &BuiltInVariable::kVar_pt0C};
>+constexpr const TVariable *p0Z2B1B1B1C[5] = {
>+    &BuiltInVariable::kVar_pt0Z, &BuiltInVariable::kVar_pt2B, &BuiltInVariable::kVar_pt1B,
>+    &BuiltInVariable::kVar_pt1B, &BuiltInVariable::kVar_pt1C};
>+constexpr const TVariable *p0Z2B1C0B[4] = {&BuiltInVariable::kVar_pt0Z, &BuiltInVariable::kVar_pt2B,
>+                                           &BuiltInVariable::kVar_pt1C,
>+                                           &BuiltInVariable::kVar_pt0B};
>+constexpr const TVariable *p0Z2B1C0C[4] = {&BuiltInVariable::kVar_pt0Z, &BuiltInVariable::kVar_pt2B,
>+                                           &BuiltInVariable::kVar_pt1C,
>+                                           &BuiltInVariable::kVar_pt0C};
>+constexpr const TVariable *p0Z2C0C1C[4] = {&BuiltInVariable::kVar_pt0Z, &BuiltInVariable::kVar_pt2C,
>+                                           &BuiltInVariable::kVar_pt0C,
>+                                           &BuiltInVariable::kVar_pt1C};
>+constexpr const TVariable *p0a1C0C[3]   = {&BuiltInVariable::kVar_pt0a, &BuiltInVariable::kVar_pt1C,
>+                                         &BuiltInVariable::kVar_pt0C};
>+constexpr const TVariable *p0b2C0C[3]   = {&BuiltInVariable::kVar_pt0b, &BuiltInVariable::kVar_pt2C,
>+                                         &BuiltInVariable::kVar_pt0C};
>+constexpr const TVariable *p0c0C[2] = {&BuiltInVariable::kVar_pt0c, &BuiltInVariable::kVar_pt0C};
>+constexpr const TVariable *p0c1B0B1C[4] = {&BuiltInVariable::kVar_pt0c, &BuiltInVariable::kVar_pt1B,
>+                                           &BuiltInVariable::kVar_pt0B,
>+                                           &BuiltInVariable::kVar_pt1C};
>+constexpr const TVariable *p0c2B0B1C[4] = {&BuiltInVariable::kVar_pt0c, &BuiltInVariable::kVar_pt2B,
>+                                           &BuiltInVariable::kVar_pt0B,
>+                                           &BuiltInVariable::kVar_pt1C};
>+constexpr const TVariable *p0c2B1B1B1C[5] = {
>+    &BuiltInVariable::kVar_pt0c, &BuiltInVariable::kVar_pt2B, &BuiltInVariable::kVar_pt1B,
>+    &BuiltInVariable::kVar_pt1B, &BuiltInVariable::kVar_pt1C};
>+constexpr const TVariable *p0c2B1C0B[4] = {&BuiltInVariable::kVar_pt0c, &BuiltInVariable::kVar_pt2B,
>+                                           &BuiltInVariable::kVar_pt1C,
>+                                           &BuiltInVariable::kVar_pt0B};
>+constexpr const TVariable *p0c3B0B1C[4] = {&BuiltInVariable::kVar_pt0c, &BuiltInVariable::kVar_pt3B,
>+                                           &BuiltInVariable::kVar_pt0B,
>+                                           &BuiltInVariable::kVar_pt1C};
>+constexpr const TVariable *p0c3B1B1B1C[5] = {
>+    &BuiltInVariable::kVar_pt0c, &BuiltInVariable::kVar_pt3B, &BuiltInVariable::kVar_pt1B,
>+    &BuiltInVariable::kVar_pt1B, &BuiltInVariable::kVar_pt1C};
>+constexpr const TVariable *p0c3B1C0B[4] = {&BuiltInVariable::kVar_pt0c, &BuiltInVariable::kVar_pt3B,
>+                                           &BuiltInVariable::kVar_pt1C,
>+                                           &BuiltInVariable::kVar_pt0B};
>+constexpr const TVariable *p0d0C[2]   = {&BuiltInVariable::kVar_pt0d, &BuiltInVariable::kVar_pt0C};
>+constexpr const TVariable *p0d2B0B[3] = {&BuiltInVariable::kVar_pt0d, &BuiltInVariable::kVar_pt2B,
>+                                         &BuiltInVariable::kVar_pt0B};
>+constexpr const TVariable *p0d3B0B[3] = {&BuiltInVariable::kVar_pt0d, &BuiltInVariable::kVar_pt3B,
>+                                         &BuiltInVariable::kVar_pt0B};
>+constexpr const TVariable *p0d3B2B2B[4] = {&BuiltInVariable::kVar_pt0d, &BuiltInVariable::kVar_pt3B,
>+                                           &BuiltInVariable::kVar_pt2B,
>+                                           &BuiltInVariable::kVar_pt2B};
>+constexpr const TVariable *p0e0C[2] = {&BuiltInVariable::kVar_pt0e, &BuiltInVariable::kVar_pt0C};
>+constexpr const TVariable *p0e2B0B1C[4] = {&BuiltInVariable::kVar_pt0e, &BuiltInVariable::kVar_pt2B,
>+                                           &BuiltInVariable::kVar_pt0B,
>+                                           &BuiltInVariable::kVar_pt1C};
>+constexpr const TVariable *p0e3B1B1B1C[5] = {
>+    &BuiltInVariable::kVar_pt0e, &BuiltInVariable::kVar_pt3B, &BuiltInVariable::kVar_pt1B,
>+    &BuiltInVariable::kVar_pt1B, &BuiltInVariable::kVar_pt1C};
>+constexpr const TVariable *p0f1C3B[3]  = {&BuiltInVariable::kVar_pt0f, &BuiltInVariable::kVar_pt1C,
>+                                         &BuiltInVariable::kVar_pt3B};
>+constexpr const TVariable *p0g1C3C[3]  = {&BuiltInVariable::kVar_pt0g, &BuiltInVariable::kVar_pt1C,
>+                                         &BuiltInVariable::kVar_pt3C};
>+constexpr const TVariable *p0h1C3D[3]  = {&BuiltInVariable::kVar_pt0h, &BuiltInVariable::kVar_pt1C,
>+                                         &BuiltInVariable::kVar_pt3D};
>+constexpr const TVariable *p0i2C3B[3]  = {&BuiltInVariable::kVar_pt0i, &BuiltInVariable::kVar_pt2C,
>+                                         &BuiltInVariable::kVar_pt3B};
>+constexpr const TVariable *p0j2C3C[3]  = {&BuiltInVariable::kVar_pt0j, &BuiltInVariable::kVar_pt2C,
>+                                         &BuiltInVariable::kVar_pt3C};
>+constexpr const TVariable *p0k2C3D[3]  = {&BuiltInVariable::kVar_pt0k, &BuiltInVariable::kVar_pt2C,
>+                                         &BuiltInVariable::kVar_pt3D};
>+constexpr const TVariable *p0l2C3B[3]  = {&BuiltInVariable::kVar_pt0l, &BuiltInVariable::kVar_pt2C,
>+                                         &BuiltInVariable::kVar_pt3B};
>+constexpr const TVariable *p0m2C3C[3]  = {&BuiltInVariable::kVar_pt0m, &BuiltInVariable::kVar_pt2C,
>+                                         &BuiltInVariable::kVar_pt3C};
>+constexpr const TVariable *p0n2C3D[3]  = {&BuiltInVariable::kVar_pt0n, &BuiltInVariable::kVar_pt2C,
>+                                         &BuiltInVariable::kVar_pt3D};
>+constexpr const TVariable *p0o2C3B[3]  = {&BuiltInVariable::kVar_pt0o, &BuiltInVariable::kVar_pt2C,
>+                                         &BuiltInVariable::kVar_pt3B};
>+constexpr const TVariable *p0p2C3C[3]  = {&BuiltInVariable::kVar_pt0p, &BuiltInVariable::kVar_pt2C,
>+                                         &BuiltInVariable::kVar_pt3C};
>+constexpr const TVariable *p0q2C3D[3]  = {&BuiltInVariable::kVar_pt0q, &BuiltInVariable::kVar_pt2C,
>+                                         &BuiltInVariable::kVar_pt3D};
>+constexpr const TVariable *p1B0B0B[3]  = {&BuiltInVariable::kVar_pt1B, &BuiltInVariable::kVar_pt0B,
>+                                         &BuiltInVariable::kVar_pt0B};
>+constexpr const TVariable *p1B1B0B[3]  = {&BuiltInVariable::kVar_pt1B, &BuiltInVariable::kVar_pt1B,
>+                                         &BuiltInVariable::kVar_pt0B};
>+constexpr const TVariable *p1B1B1B[3]  = {&BuiltInVariable::kVar_pt1B, &BuiltInVariable::kVar_pt1B,
>+                                         &BuiltInVariable::kVar_pt1B};
>+constexpr const TVariable *p1B1B1E[3]  = {&BuiltInVariable::kVar_pt1B, &BuiltInVariable::kVar_pt1B,
>+                                         &BuiltInVariable::kVar_pt1E};
>+constexpr const TVariable *p1B1C[2]    = {&BuiltInVariable::kVar_pt1B, &BuiltInVariable::kVar_pt1C};
>+constexpr const TVariable *p1B2B[2]    = {&BuiltInVariable::kVar_pt1B, &BuiltInVariable::kVar_pt2B};
>+constexpr const TVariable *p1B3B[2]    = {&BuiltInVariable::kVar_pt1B, &BuiltInVariable::kVar_pt3B};
>+constexpr const TVariable *p1B_o_1B[2] = {&BuiltInVariable::kVar_pt1B,
>+                                          &BuiltInVariable::kVar_pt_o_1B};
>+constexpr const TVariable *p1B_o_1C[2] = {&BuiltInVariable::kVar_pt1B,
>+                                          &BuiltInVariable::kVar_pt_o_1C};
>+constexpr const TVariable *p1C0C0C[3]  = {&BuiltInVariable::kVar_pt1C, &BuiltInVariable::kVar_pt0C,
>+                                         &BuiltInVariable::kVar_pt0C};
>+constexpr const TVariable *p1C1C0C0C[4] = {&BuiltInVariable::kVar_pt1C, &BuiltInVariable::kVar_pt1C,
>+                                           &BuiltInVariable::kVar_pt0C,
>+                                           &BuiltInVariable::kVar_pt0C};
>+constexpr const TVariable *p1C1C1C[3]   = {&BuiltInVariable::kVar_pt1C, &BuiltInVariable::kVar_pt1C,
>+                                         &BuiltInVariable::kVar_pt1C};
>+constexpr const TVariable *p1C1C_o_1C_o_1C[4] = {
>+    &BuiltInVariable::kVar_pt1C, &BuiltInVariable::kVar_pt1C, &BuiltInVariable::kVar_pt_o_1C,
>+    &BuiltInVariable::kVar_pt_o_1C};
>+constexpr const TVariable *p1D0C0C[3]   = {&BuiltInVariable::kVar_pt1D, &BuiltInVariable::kVar_pt0C,
>+                                         &BuiltInVariable::kVar_pt0C};
>+constexpr const TVariable *p1D0D0D[3]   = {&BuiltInVariable::kVar_pt1D, &BuiltInVariable::kVar_pt0D,
>+                                         &BuiltInVariable::kVar_pt0D};
>+constexpr const TVariable *p1D1D0C0C[4] = {&BuiltInVariable::kVar_pt1D, &BuiltInVariable::kVar_pt1D,
>+                                           &BuiltInVariable::kVar_pt0C,
>+                                           &BuiltInVariable::kVar_pt0C};
>+constexpr const TVariable *p1D1D1D[3]   = {&BuiltInVariable::kVar_pt1D, &BuiltInVariable::kVar_pt1D,
>+                                         &BuiltInVariable::kVar_pt1D};
>+constexpr const TVariable *p1D1D_o_1D_o_1D[4] = {
>+    &BuiltInVariable::kVar_pt1D, &BuiltInVariable::kVar_pt1D, &BuiltInVariable::kVar_pt_o_1D,
>+    &BuiltInVariable::kVar_pt_o_1D};
>+constexpr const TVariable *p1E1E[2]    = {&BuiltInVariable::kVar_pt1E, &BuiltInVariable::kVar_pt1E};
>+constexpr const TVariable *p2B0B0B[3]  = {&BuiltInVariable::kVar_pt2B, &BuiltInVariable::kVar_pt0B,
>+                                         &BuiltInVariable::kVar_pt0B};
>+constexpr const TVariable *p2B0G[2]    = {&BuiltInVariable::kVar_pt2B, &BuiltInVariable::kVar_pt0G};
>+constexpr const TVariable *p2B1B[2]    = {&BuiltInVariable::kVar_pt2B, &BuiltInVariable::kVar_pt1B};
>+constexpr const TVariable *p2B2B0B[3]  = {&BuiltInVariable::kVar_pt2B, &BuiltInVariable::kVar_pt2B,
>+                                         &BuiltInVariable::kVar_pt0B};
>+constexpr const TVariable *p2B2B2B[3]  = {&BuiltInVariable::kVar_pt2B, &BuiltInVariable::kVar_pt2B,
>+                                         &BuiltInVariable::kVar_pt2B};
>+constexpr const TVariable *p2B2B2E[3]  = {&BuiltInVariable::kVar_pt2B, &BuiltInVariable::kVar_pt2B,
>+                                         &BuiltInVariable::kVar_pt2E};
>+constexpr const TVariable *p2B2C[2]    = {&BuiltInVariable::kVar_pt2B, &BuiltInVariable::kVar_pt2C};
>+constexpr const TVariable *p2B3B[2]    = {&BuiltInVariable::kVar_pt2B, &BuiltInVariable::kVar_pt3B};
>+constexpr const TVariable *p2B_o_2B[2] = {&BuiltInVariable::kVar_pt2B,
>+                                          &BuiltInVariable::kVar_pt_o_2B};
>+constexpr const TVariable *p2B_o_2C[2] = {&BuiltInVariable::kVar_pt2B,
>+                                          &BuiltInVariable::kVar_pt_o_2C};
>+constexpr const TVariable *p2C0C0C[3]  = {&BuiltInVariable::kVar_pt2C, &BuiltInVariable::kVar_pt0C,
>+                                         &BuiltInVariable::kVar_pt0C};
>+constexpr const TVariable *p2C2C0C0C[4] = {&BuiltInVariable::kVar_pt2C, &BuiltInVariable::kVar_pt2C,
>+                                           &BuiltInVariable::kVar_pt0C,
>+                                           &BuiltInVariable::kVar_pt0C};
>+constexpr const TVariable *p2C2C2C[3]   = {&BuiltInVariable::kVar_pt2C, &BuiltInVariable::kVar_pt2C,
>+                                         &BuiltInVariable::kVar_pt2C};
>+constexpr const TVariable *p2C2C_o_2C_o_2C[4] = {
>+    &BuiltInVariable::kVar_pt2C, &BuiltInVariable::kVar_pt2C, &BuiltInVariable::kVar_pt_o_2C,
>+    &BuiltInVariable::kVar_pt_o_2C};
>+constexpr const TVariable *p2D0C0C[3]   = {&BuiltInVariable::kVar_pt2D, &BuiltInVariable::kVar_pt0C,
>+                                         &BuiltInVariable::kVar_pt0C};
>+constexpr const TVariable *p2D0D0D[3]   = {&BuiltInVariable::kVar_pt2D, &BuiltInVariable::kVar_pt0D,
>+                                         &BuiltInVariable::kVar_pt0D};
>+constexpr const TVariable *p2D2D0C0C[4] = {&BuiltInVariable::kVar_pt2D, &BuiltInVariable::kVar_pt2D,
>+                                           &BuiltInVariable::kVar_pt0C,
>+                                           &BuiltInVariable::kVar_pt0C};
>+constexpr const TVariable *p2D2D2D[3]   = {&BuiltInVariable::kVar_pt2D, &BuiltInVariable::kVar_pt2D,
>+                                         &BuiltInVariable::kVar_pt2D};
>+constexpr const TVariable *p2D2D_o_2D_o_2D[4] = {
>+    &BuiltInVariable::kVar_pt2D, &BuiltInVariable::kVar_pt2D, &BuiltInVariable::kVar_pt_o_2D,
>+    &BuiltInVariable::kVar_pt_o_2D};
>+constexpr const TVariable *p2E2E[2]    = {&BuiltInVariable::kVar_pt2E, &BuiltInVariable::kVar_pt2E};
>+constexpr const TVariable *p3B0B0B[3]  = {&BuiltInVariable::kVar_pt3B, &BuiltInVariable::kVar_pt0B,
>+                                         &BuiltInVariable::kVar_pt0B};
>+constexpr const TVariable *p3B1B[2]    = {&BuiltInVariable::kVar_pt3B, &BuiltInVariable::kVar_pt1B};
>+constexpr const TVariable *p3B2B[2]    = {&BuiltInVariable::kVar_pt3B, &BuiltInVariable::kVar_pt2B};
>+constexpr const TVariable *p3B3B0B[3]  = {&BuiltInVariable::kVar_pt3B, &BuiltInVariable::kVar_pt3B,
>+                                         &BuiltInVariable::kVar_pt0B};
>+constexpr const TVariable *p3B3B3B[3]  = {&BuiltInVariable::kVar_pt3B, &BuiltInVariable::kVar_pt3B,
>+                                         &BuiltInVariable::kVar_pt3B};
>+constexpr const TVariable *p3B3B3E[3]  = {&BuiltInVariable::kVar_pt3B, &BuiltInVariable::kVar_pt3B,
>+                                         &BuiltInVariable::kVar_pt3E};
>+constexpr const TVariable *p3B3C[2]    = {&BuiltInVariable::kVar_pt3B, &BuiltInVariable::kVar_pt3C};
>+constexpr const TVariable *p3B_o_3B[2] = {&BuiltInVariable::kVar_pt3B,
>+                                          &BuiltInVariable::kVar_pt_o_3B};
>+constexpr const TVariable *p3B_o_3C[2] = {&BuiltInVariable::kVar_pt3B,
>+                                          &BuiltInVariable::kVar_pt_o_3C};
>+constexpr const TVariable *p3C0C0C[3]  = {&BuiltInVariable::kVar_pt3C, &BuiltInVariable::kVar_pt0C,
>+                                         &BuiltInVariable::kVar_pt0C};
>+constexpr const TVariable *p3C3C0C0C[4] = {&BuiltInVariable::kVar_pt3C, &BuiltInVariable::kVar_pt3C,
>+                                           &BuiltInVariable::kVar_pt0C,
>+                                           &BuiltInVariable::kVar_pt0C};
>+constexpr const TVariable *p3C3C3C[3]   = {&BuiltInVariable::kVar_pt3C, &BuiltInVariable::kVar_pt3C,
>+                                         &BuiltInVariable::kVar_pt3C};
>+constexpr const TVariable *p3C3C_o_3C_o_3C[4] = {
>+    &BuiltInVariable::kVar_pt3C, &BuiltInVariable::kVar_pt3C, &BuiltInVariable::kVar_pt_o_3C,
>+    &BuiltInVariable::kVar_pt_o_3C};
>+constexpr const TVariable *p3D0C0C[3]   = {&BuiltInVariable::kVar_pt3D, &BuiltInVariable::kVar_pt0C,
>+                                         &BuiltInVariable::kVar_pt0C};
>+constexpr const TVariable *p3D0D0D[3]   = {&BuiltInVariable::kVar_pt3D, &BuiltInVariable::kVar_pt0D,
>+                                         &BuiltInVariable::kVar_pt0D};
>+constexpr const TVariable *p3D3D0C0C[4] = {&BuiltInVariable::kVar_pt3D, &BuiltInVariable::kVar_pt3D,
>+                                           &BuiltInVariable::kVar_pt0C,
>+                                           &BuiltInVariable::kVar_pt0C};
>+constexpr const TVariable *p3D3D3D[3]   = {&BuiltInVariable::kVar_pt3D, &BuiltInVariable::kVar_pt3D,
>+                                         &BuiltInVariable::kVar_pt3D};
>+constexpr const TVariable *p3D3D_o_3D_o_3D[4] = {
>+    &BuiltInVariable::kVar_pt3D, &BuiltInVariable::kVar_pt3D, &BuiltInVariable::kVar_pt_o_3D,
>+    &BuiltInVariable::kVar_pt_o_3D};
>+constexpr const TVariable *p3E3E[2] = {&BuiltInVariable::kVar_pt3E, &BuiltInVariable::kVar_pt3E};
>+constexpr const TVariable *p5B5B[2] = {&BuiltInVariable::kVar_pt5B, &BuiltInVariable::kVar_pt5B};
>+constexpr const TVariable *p6B6B[2] = {&BuiltInVariable::kVar_pt6B, &BuiltInVariable::kVar_pt6B};
>+constexpr const TVariable *p7B7B[2] = {&BuiltInVariable::kVar_pt7B, &BuiltInVariable::kVar_pt7B};
>+constexpr const TVariable *p9B9B[2] = {&BuiltInVariable::kVar_pt9B, &BuiltInVariable::kVar_pt9B};
>+constexpr const TVariable *pABAB[2] = {&BuiltInVariable::kVar_ptAB, &BuiltInVariable::kVar_ptAB};
>+constexpr const TVariable *pBBBB[2] = {&BuiltInVariable::kVar_ptBB, &BuiltInVariable::kVar_ptBB};
>+constexpr const TVariable *pDBDB[2] = {&BuiltInVariable::kVar_ptDB, &BuiltInVariable::kVar_ptDB};
>+constexpr const TVariable *pEBEB[2] = {&BuiltInVariable::kVar_ptEB, &BuiltInVariable::kVar_ptEB};
>+constexpr const TVariable *pFBFB[2] = {&BuiltInVariable::kVar_ptFB, &BuiltInVariable::kVar_ptFB};
>+constexpr const TVariable *p_io_0C0C0C[3] = {
>+    &BuiltInVariable::kVar_pt_io_0C, &BuiltInVariable::kVar_pt0C, &BuiltInVariable::kVar_pt0C};
>+constexpr const TVariable *p_io_0D0D0D[3] = {
>+    &BuiltInVariable::kVar_pt_io_0D, &BuiltInVariable::kVar_pt0D, &BuiltInVariable::kVar_pt0D};
>+
>+}  // namespace BuiltInParameters
>+
>+namespace UnmangledBuiltIns
>+{
>+
>+constexpr const UnmangledBuiltIn ARB_texture_rectangle(TExtension::ARB_texture_rectangle);
>+constexpr const UnmangledBuiltIn EXT_YUV_target(TExtension::EXT_YUV_target);
>+constexpr const UnmangledBuiltIn EXT_geometry_shader(TExtension::EXT_geometry_shader);
>+constexpr const UnmangledBuiltIn EXT_shader_texture_lod(TExtension::EXT_shader_texture_lod);
>+constexpr const UnmangledBuiltIn OES_standard_derivatives(TExtension::OES_standard_derivatives);
>+constexpr const UnmangledBuiltIn UNDEFINED(TExtension::UNDEFINED);
>+
>+}  // namespace UnmangledBuiltIns
>+
>+// TODO(oetuaho): Would be nice to make this a class instead of a namespace so that we could friend
>+// this from TFunction. Now symbol constructors taking an id have to be public even though they're
>+// not supposed to be accessible from outside of here. http://anglebug.com/2390
>+namespace BuiltInFunction
>+{
>+
>+constexpr const TFunction kFunction_radians_0B(
>+    BuiltInId::radians_Float1,
>+    BuiltInName::radians,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0B0C,
>+    1,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 1, 1>(),
>+    EOpRadians,
>+    true);
>+constexpr const TFunction kFunction_radians_1B(
>+    BuiltInId::radians_Float2,
>+    BuiltInName::radians,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p1B1B0B,
>+    1,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 2, 1>(),
>+    EOpRadians,
>+    true);
>+constexpr const TFunction kFunction_radians_2B(
>+    BuiltInId::radians_Float3,
>+    BuiltInName::radians,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p2B_o_2C,
>+    1,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 3, 1>(),
>+    EOpRadians,
>+    true);
>+constexpr const TFunction kFunction_radians_3B(
>+    BuiltInId::radians_Float4,
>+    BuiltInName::radians,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p3B0B0B,
>+    1,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpRadians,
>+    true);
>+constexpr const TFunction kFunction_degrees_0B(
>+    BuiltInId::degrees_Float1,
>+    BuiltInName::degrees,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0B0C,
>+    1,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 1, 1>(),
>+    EOpDegrees,
>+    true);
>+constexpr const TFunction kFunction_degrees_1B(
>+    BuiltInId::degrees_Float2,
>+    BuiltInName::degrees,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p1B1B0B,
>+    1,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 2, 1>(),
>+    EOpDegrees,
>+    true);
>+constexpr const TFunction kFunction_degrees_2B(
>+    BuiltInId::degrees_Float3,
>+    BuiltInName::degrees,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p2B_o_2C,
>+    1,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 3, 1>(),
>+    EOpDegrees,
>+    true);
>+constexpr const TFunction kFunction_degrees_3B(
>+    BuiltInId::degrees_Float4,
>+    BuiltInName::degrees,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p3B0B0B,
>+    1,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpDegrees,
>+    true);
>+constexpr const TFunction kFunction_sin_0B(
>+    BuiltInId::sin_Float1,
>+    BuiltInName::sin,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0B0C,
>+    1,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 1, 1>(),
>+    EOpSin,
>+    true);
>+constexpr const TFunction kFunction_sin_1B(
>+    BuiltInId::sin_Float2,
>+    BuiltInName::sin,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p1B1B0B,
>+    1,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 2, 1>(),
>+    EOpSin,
>+    true);
>+constexpr const TFunction kFunction_sin_2B(
>+    BuiltInId::sin_Float3,
>+    BuiltInName::sin,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p2B_o_2C,
>+    1,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 3, 1>(),
>+    EOpSin,
>+    true);
>+constexpr const TFunction kFunction_sin_3B(
>+    BuiltInId::sin_Float4,
>+    BuiltInName::sin,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p3B0B0B,
>+    1,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpSin,
>+    true);
>+constexpr const TFunction kFunction_cos_0B(
>+    BuiltInId::cos_Float1,
>+    BuiltInName::cos,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0B0C,
>+    1,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 1, 1>(),
>+    EOpCos,
>+    true);
>+constexpr const TFunction kFunction_cos_1B(
>+    BuiltInId::cos_Float2,
>+    BuiltInName::cos,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p1B1B0B,
>+    1,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 2, 1>(),
>+    EOpCos,
>+    true);
>+constexpr const TFunction kFunction_cos_2B(
>+    BuiltInId::cos_Float3,
>+    BuiltInName::cos,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p2B_o_2C,
>+    1,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 3, 1>(),
>+    EOpCos,
>+    true);
>+constexpr const TFunction kFunction_cos_3B(
>+    BuiltInId::cos_Float4,
>+    BuiltInName::cos,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p3B0B0B,
>+    1,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCos,
>+    true);
>+constexpr const TFunction kFunction_tan_0B(
>+    BuiltInId::tan_Float1,
>+    BuiltInName::tan,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0B0C,
>+    1,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 1, 1>(),
>+    EOpTan,
>+    true);
>+constexpr const TFunction kFunction_tan_1B(
>+    BuiltInId::tan_Float2,
>+    BuiltInName::tan,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p1B1B0B,
>+    1,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 2, 1>(),
>+    EOpTan,
>+    true);
>+constexpr const TFunction kFunction_tan_2B(
>+    BuiltInId::tan_Float3,
>+    BuiltInName::tan,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p2B_o_2C,
>+    1,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 3, 1>(),
>+    EOpTan,
>+    true);
>+constexpr const TFunction kFunction_tan_3B(
>+    BuiltInId::tan_Float4,
>+    BuiltInName::tan,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p3B0B0B,
>+    1,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpTan,
>+    true);
>+constexpr const TFunction kFunction_asin_0B(
>+    BuiltInId::asin_Float1,
>+    BuiltInName::asin,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0B0C,
>+    1,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 1, 1>(),
>+    EOpAsin,
>+    true);
>+constexpr const TFunction kFunction_asin_1B(
>+    BuiltInId::asin_Float2,
>+    BuiltInName::asin,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p1B1B0B,
>+    1,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 2, 1>(),
>+    EOpAsin,
>+    true);
>+constexpr const TFunction kFunction_asin_2B(
>+    BuiltInId::asin_Float3,
>+    BuiltInName::asin,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p2B_o_2C,
>+    1,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 3, 1>(),
>+    EOpAsin,
>+    true);
>+constexpr const TFunction kFunction_asin_3B(
>+    BuiltInId::asin_Float4,
>+    BuiltInName::asin,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p3B0B0B,
>+    1,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpAsin,
>+    true);
>+constexpr const TFunction kFunction_acos_0B(
>+    BuiltInId::acos_Float1,
>+    BuiltInName::acos,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0B0C,
>+    1,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 1, 1>(),
>+    EOpAcos,
>+    true);
>+constexpr const TFunction kFunction_acos_1B(
>+    BuiltInId::acos_Float2,
>+    BuiltInName::acos,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p1B1B0B,
>+    1,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 2, 1>(),
>+    EOpAcos,
>+    true);
>+constexpr const TFunction kFunction_acos_2B(
>+    BuiltInId::acos_Float3,
>+    BuiltInName::acos,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p2B_o_2C,
>+    1,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 3, 1>(),
>+    EOpAcos,
>+    true);
>+constexpr const TFunction kFunction_acos_3B(
>+    BuiltInId::acos_Float4,
>+    BuiltInName::acos,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p3B0B0B,
>+    1,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpAcos,
>+    true);
>+constexpr const TFunction kFunction_atan_0B0B(
>+    BuiltInId::atan_Float1_Float1,
>+    BuiltInName::atan,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0B0B1B,
>+    2,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 1, 1>(),
>+    EOpAtan,
>+    true);
>+constexpr const TFunction kFunction_atan_1B1B(
>+    BuiltInId::atan_Float2_Float2,
>+    BuiltInName::atan,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p1B1B0B,
>+    2,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 2, 1>(),
>+    EOpAtan,
>+    true);
>+constexpr const TFunction kFunction_atan_2B2B(
>+    BuiltInId::atan_Float3_Float3,
>+    BuiltInName::atan,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p2B2B0B,
>+    2,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 3, 1>(),
>+    EOpAtan,
>+    true);
>+constexpr const TFunction kFunction_atan_3B3B(
>+    BuiltInId::atan_Float4_Float4,
>+    BuiltInName::atan,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p3B3B0B,
>+    2,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpAtan,
>+    true);
>+constexpr const TFunction kFunction_atan_0B(
>+    BuiltInId::atan_Float1,
>+    BuiltInName::atan,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0B0C,
>+    1,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 1, 1>(),
>+    EOpAtan,
>+    true);
>+constexpr const TFunction kFunction_atan_1B(
>+    BuiltInId::atan_Float2,
>+    BuiltInName::atan,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p1B1B0B,
>+    1,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 2, 1>(),
>+    EOpAtan,
>+    true);
>+constexpr const TFunction kFunction_atan_2B(
>+    BuiltInId::atan_Float3,
>+    BuiltInName::atan,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p2B_o_2C,
>+    1,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 3, 1>(),
>+    EOpAtan,
>+    true);
>+constexpr const TFunction kFunction_atan_3B(
>+    BuiltInId::atan_Float4,
>+    BuiltInName::atan,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p3B0B0B,
>+    1,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpAtan,
>+    true);
>+constexpr const TFunction kFunction_sinh_0B(
>+    BuiltInId::sinh_Float1,
>+    BuiltInName::sinh,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0B0C,
>+    1,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 1, 1>(),
>+    EOpSinh,
>+    true);
>+constexpr const TFunction kFunction_sinh_1B(
>+    BuiltInId::sinh_Float2,
>+    BuiltInName::sinh,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p1B1B0B,
>+    1,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 2, 1>(),
>+    EOpSinh,
>+    true);
>+constexpr const TFunction kFunction_sinh_2B(
>+    BuiltInId::sinh_Float3,
>+    BuiltInName::sinh,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p2B_o_2C,
>+    1,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 3, 1>(),
>+    EOpSinh,
>+    true);
>+constexpr const TFunction kFunction_sinh_3B(
>+    BuiltInId::sinh_Float4,
>+    BuiltInName::sinh,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p3B0B0B,
>+    1,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpSinh,
>+    true);
>+constexpr const TFunction kFunction_cosh_0B(
>+    BuiltInId::cosh_Float1,
>+    BuiltInName::cosh,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0B0C,
>+    1,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 1, 1>(),
>+    EOpCosh,
>+    true);
>+constexpr const TFunction kFunction_cosh_1B(
>+    BuiltInId::cosh_Float2,
>+    BuiltInName::cosh,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p1B1B0B,
>+    1,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 2, 1>(),
>+    EOpCosh,
>+    true);
>+constexpr const TFunction kFunction_cosh_2B(
>+    BuiltInId::cosh_Float3,
>+    BuiltInName::cosh,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p2B_o_2C,
>+    1,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 3, 1>(),
>+    EOpCosh,
>+    true);
>+constexpr const TFunction kFunction_cosh_3B(
>+    BuiltInId::cosh_Float4,
>+    BuiltInName::cosh,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p3B0B0B,
>+    1,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCosh,
>+    true);
>+constexpr const TFunction kFunction_tanh_0B(
>+    BuiltInId::tanh_Float1,
>+    BuiltInName::tanh,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0B0C,
>+    1,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 1, 1>(),
>+    EOpTanh,
>+    true);
>+constexpr const TFunction kFunction_tanh_1B(
>+    BuiltInId::tanh_Float2,
>+    BuiltInName::tanh,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p1B1B0B,
>+    1,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 2, 1>(),
>+    EOpTanh,
>+    true);
>+constexpr const TFunction kFunction_tanh_2B(
>+    BuiltInId::tanh_Float3,
>+    BuiltInName::tanh,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p2B_o_2C,
>+    1,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 3, 1>(),
>+    EOpTanh,
>+    true);
>+constexpr const TFunction kFunction_tanh_3B(
>+    BuiltInId::tanh_Float4,
>+    BuiltInName::tanh,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p3B0B0B,
>+    1,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpTanh,
>+    true);
>+constexpr const TFunction kFunction_asinh_0B(
>+    BuiltInId::asinh_Float1,
>+    BuiltInName::asinh,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0B0C,
>+    1,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 1, 1>(),
>+    EOpAsinh,
>+    true);
>+constexpr const TFunction kFunction_asinh_1B(
>+    BuiltInId::asinh_Float2,
>+    BuiltInName::asinh,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p1B1B0B,
>+    1,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 2, 1>(),
>+    EOpAsinh,
>+    true);
>+constexpr const TFunction kFunction_asinh_2B(
>+    BuiltInId::asinh_Float3,
>+    BuiltInName::asinh,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p2B_o_2C,
>+    1,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 3, 1>(),
>+    EOpAsinh,
>+    true);
>+constexpr const TFunction kFunction_asinh_3B(
>+    BuiltInId::asinh_Float4,
>+    BuiltInName::asinh,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p3B0B0B,
>+    1,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpAsinh,
>+    true);
>+constexpr const TFunction kFunction_acosh_0B(
>+    BuiltInId::acosh_Float1,
>+    BuiltInName::acosh,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0B0C,
>+    1,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 1, 1>(),
>+    EOpAcosh,
>+    true);
>+constexpr const TFunction kFunction_acosh_1B(
>+    BuiltInId::acosh_Float2,
>+    BuiltInName::acosh,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p1B1B0B,
>+    1,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 2, 1>(),
>+    EOpAcosh,
>+    true);
>+constexpr const TFunction kFunction_acosh_2B(
>+    BuiltInId::acosh_Float3,
>+    BuiltInName::acosh,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p2B_o_2C,
>+    1,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 3, 1>(),
>+    EOpAcosh,
>+    true);
>+constexpr const TFunction kFunction_acosh_3B(
>+    BuiltInId::acosh_Float4,
>+    BuiltInName::acosh,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p3B0B0B,
>+    1,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpAcosh,
>+    true);
>+constexpr const TFunction kFunction_atanh_0B(
>+    BuiltInId::atanh_Float1,
>+    BuiltInName::atanh,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0B0C,
>+    1,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 1, 1>(),
>+    EOpAtanh,
>+    true);
>+constexpr const TFunction kFunction_atanh_1B(
>+    BuiltInId::atanh_Float2,
>+    BuiltInName::atanh,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p1B1B0B,
>+    1,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 2, 1>(),
>+    EOpAtanh,
>+    true);
>+constexpr const TFunction kFunction_atanh_2B(
>+    BuiltInId::atanh_Float3,
>+    BuiltInName::atanh,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p2B_o_2C,
>+    1,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 3, 1>(),
>+    EOpAtanh,
>+    true);
>+constexpr const TFunction kFunction_atanh_3B(
>+    BuiltInId::atanh_Float4,
>+    BuiltInName::atanh,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p3B0B0B,
>+    1,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpAtanh,
>+    true);
>+constexpr const TFunction kFunction_pow_0B0B(
>+    BuiltInId::pow_Float1_Float1,
>+    BuiltInName::pow,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0B0B1B,
>+    2,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 1, 1>(),
>+    EOpPow,
>+    true);
>+constexpr const TFunction kFunction_pow_1B1B(
>+    BuiltInId::pow_Float2_Float2,
>+    BuiltInName::pow,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p1B1B0B,
>+    2,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 2, 1>(),
>+    EOpPow,
>+    true);
>+constexpr const TFunction kFunction_pow_2B2B(
>+    BuiltInId::pow_Float3_Float3,
>+    BuiltInName::pow,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p2B2B0B,
>+    2,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 3, 1>(),
>+    EOpPow,
>+    true);
>+constexpr const TFunction kFunction_pow_3B3B(
>+    BuiltInId::pow_Float4_Float4,
>+    BuiltInName::pow,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p3B3B0B,
>+    2,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpPow,
>+    true);
>+constexpr const TFunction kFunction_exp_0B(
>+    BuiltInId::exp_Float1,
>+    BuiltInName::exp,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0B0C,
>+    1,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 1, 1>(),
>+    EOpExp,
>+    true);
>+constexpr const TFunction kFunction_exp_1B(
>+    BuiltInId::exp_Float2,
>+    BuiltInName::exp,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p1B1B0B,
>+    1,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 2, 1>(),
>+    EOpExp,
>+    true);
>+constexpr const TFunction kFunction_exp_2B(
>+    BuiltInId::exp_Float3,
>+    BuiltInName::exp,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p2B_o_2C,
>+    1,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 3, 1>(),
>+    EOpExp,
>+    true);
>+constexpr const TFunction kFunction_exp_3B(
>+    BuiltInId::exp_Float4,
>+    BuiltInName::exp,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p3B0B0B,
>+    1,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpExp,
>+    true);
>+constexpr const TFunction kFunction_log_0B(
>+    BuiltInId::log_Float1,
>+    BuiltInName::log,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0B0C,
>+    1,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 1, 1>(),
>+    EOpLog,
>+    true);
>+constexpr const TFunction kFunction_log_1B(
>+    BuiltInId::log_Float2,
>+    BuiltInName::log,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p1B1B0B,
>+    1,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 2, 1>(),
>+    EOpLog,
>+    true);
>+constexpr const TFunction kFunction_log_2B(
>+    BuiltInId::log_Float3,
>+    BuiltInName::log,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p2B_o_2C,
>+    1,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 3, 1>(),
>+    EOpLog,
>+    true);
>+constexpr const TFunction kFunction_log_3B(
>+    BuiltInId::log_Float4,
>+    BuiltInName::log,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p3B0B0B,
>+    1,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpLog,
>+    true);
>+constexpr const TFunction kFunction_exp2_0B(
>+    BuiltInId::exp2_Float1,
>+    BuiltInName::exp2,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0B0C,
>+    1,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 1, 1>(),
>+    EOpExp2,
>+    true);
>+constexpr const TFunction kFunction_exp2_1B(
>+    BuiltInId::exp2_Float2,
>+    BuiltInName::exp2,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p1B1B0B,
>+    1,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 2, 1>(),
>+    EOpExp2,
>+    true);
>+constexpr const TFunction kFunction_exp2_2B(
>+    BuiltInId::exp2_Float3,
>+    BuiltInName::exp2,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p2B_o_2C,
>+    1,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 3, 1>(),
>+    EOpExp2,
>+    true);
>+constexpr const TFunction kFunction_exp2_3B(
>+    BuiltInId::exp2_Float4,
>+    BuiltInName::exp2,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p3B0B0B,
>+    1,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpExp2,
>+    true);
>+constexpr const TFunction kFunction_log2_0B(
>+    BuiltInId::log2_Float1,
>+    BuiltInName::log2,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0B0C,
>+    1,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 1, 1>(),
>+    EOpLog2,
>+    true);
>+constexpr const TFunction kFunction_log2_1B(
>+    BuiltInId::log2_Float2,
>+    BuiltInName::log2,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p1B1B0B,
>+    1,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 2, 1>(),
>+    EOpLog2,
>+    true);
>+constexpr const TFunction kFunction_log2_2B(
>+    BuiltInId::log2_Float3,
>+    BuiltInName::log2,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p2B_o_2C,
>+    1,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 3, 1>(),
>+    EOpLog2,
>+    true);
>+constexpr const TFunction kFunction_log2_3B(
>+    BuiltInId::log2_Float4,
>+    BuiltInName::log2,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p3B0B0B,
>+    1,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpLog2,
>+    true);
>+constexpr const TFunction kFunction_sqrt_0B(
>+    BuiltInId::sqrt_Float1,
>+    BuiltInName::sqrt,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0B0C,
>+    1,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 1, 1>(),
>+    EOpSqrt,
>+    true);
>+constexpr const TFunction kFunction_sqrt_1B(
>+    BuiltInId::sqrt_Float2,
>+    BuiltInName::sqrt,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p1B1B0B,
>+    1,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 2, 1>(),
>+    EOpSqrt,
>+    true);
>+constexpr const TFunction kFunction_sqrt_2B(
>+    BuiltInId::sqrt_Float3,
>+    BuiltInName::sqrt,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p2B_o_2C,
>+    1,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 3, 1>(),
>+    EOpSqrt,
>+    true);
>+constexpr const TFunction kFunction_sqrt_3B(
>+    BuiltInId::sqrt_Float4,
>+    BuiltInName::sqrt,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p3B0B0B,
>+    1,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpSqrt,
>+    true);
>+constexpr const TFunction kFunction_inversesqrt_0B(
>+    BuiltInId::inversesqrt_Float1,
>+    BuiltInName::inversesqrt,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0B0C,
>+    1,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 1, 1>(),
>+    EOpInversesqrt,
>+    true);
>+constexpr const TFunction kFunction_inversesqrt_1B(
>+    BuiltInId::inversesqrt_Float2,
>+    BuiltInName::inversesqrt,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p1B1B0B,
>+    1,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 2, 1>(),
>+    EOpInversesqrt,
>+    true);
>+constexpr const TFunction kFunction_inversesqrt_2B(
>+    BuiltInId::inversesqrt_Float3,
>+    BuiltInName::inversesqrt,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p2B_o_2C,
>+    1,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 3, 1>(),
>+    EOpInversesqrt,
>+    true);
>+constexpr const TFunction kFunction_inversesqrt_3B(
>+    BuiltInId::inversesqrt_Float4,
>+    BuiltInName::inversesqrt,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p3B0B0B,
>+    1,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpInversesqrt,
>+    true);
>+constexpr const TFunction kFunction_abs_0B(
>+    BuiltInId::abs_Float1,
>+    BuiltInName::abs,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0B0C,
>+    1,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 1, 1>(),
>+    EOpAbs,
>+    true);
>+constexpr const TFunction kFunction_abs_1B(
>+    BuiltInId::abs_Float2,
>+    BuiltInName::abs,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p1B1B0B,
>+    1,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 2, 1>(),
>+    EOpAbs,
>+    true);
>+constexpr const TFunction kFunction_abs_2B(
>+    BuiltInId::abs_Float3,
>+    BuiltInName::abs,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p2B_o_2C,
>+    1,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 3, 1>(),
>+    EOpAbs,
>+    true);
>+constexpr const TFunction kFunction_abs_3B(
>+    BuiltInId::abs_Float4,
>+    BuiltInName::abs,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p3B0B0B,
>+    1,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpAbs,
>+    true);
>+constexpr const TFunction kFunction_abs_0C(BuiltInId::abs_Int1,
>+                                           BuiltInName::abs,
>+                                           TExtension::UNDEFINED,
>+                                           BuiltInParameters::p0C0C_o_0C_o_0C,
>+                                           1,
>+                                           StaticType::Get<EbtInt, EbpUndefined, EvqGlobal, 1, 1>(),
>+                                           EOpAbs,
>+                                           true);
>+constexpr const TFunction kFunction_abs_1C(BuiltInId::abs_Int2,
>+                                           BuiltInName::abs,
>+                                           TExtension::UNDEFINED,
>+                                           BuiltInParameters::p1C1C_o_1C_o_1C,
>+                                           1,
>+                                           StaticType::Get<EbtInt, EbpUndefined, EvqGlobal, 2, 1>(),
>+                                           EOpAbs,
>+                                           true);
>+constexpr const TFunction kFunction_abs_2C(BuiltInId::abs_Int3,
>+                                           BuiltInName::abs,
>+                                           TExtension::UNDEFINED,
>+                                           BuiltInParameters::p2C2C0C0C,
>+                                           1,
>+                                           StaticType::Get<EbtInt, EbpUndefined, EvqGlobal, 3, 1>(),
>+                                           EOpAbs,
>+                                           true);
>+constexpr const TFunction kFunction_abs_3C(BuiltInId::abs_Int4,
>+                                           BuiltInName::abs,
>+                                           TExtension::UNDEFINED,
>+                                           BuiltInParameters::p3C0C0C,
>+                                           1,
>+                                           StaticType::Get<EbtInt, EbpUndefined, EvqGlobal, 4, 1>(),
>+                                           EOpAbs,
>+                                           true);
>+constexpr const TFunction kFunction_sign_0B(
>+    BuiltInId::sign_Float1,
>+    BuiltInName::sign,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0B0C,
>+    1,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 1, 1>(),
>+    EOpSign,
>+    true);
>+constexpr const TFunction kFunction_sign_1B(
>+    BuiltInId::sign_Float2,
>+    BuiltInName::sign,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p1B1B0B,
>+    1,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 2, 1>(),
>+    EOpSign,
>+    true);
>+constexpr const TFunction kFunction_sign_2B(
>+    BuiltInId::sign_Float3,
>+    BuiltInName::sign,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p2B_o_2C,
>+    1,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 3, 1>(),
>+    EOpSign,
>+    true);
>+constexpr const TFunction kFunction_sign_3B(
>+    BuiltInId::sign_Float4,
>+    BuiltInName::sign,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p3B0B0B,
>+    1,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpSign,
>+    true);
>+constexpr const TFunction kFunction_sign_0C(
>+    BuiltInId::sign_Int1,
>+    BuiltInName::sign,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0C0C_o_0C_o_0C,
>+    1,
>+    StaticType::Get<EbtInt, EbpUndefined, EvqGlobal, 1, 1>(),
>+    EOpSign,
>+    true);
>+constexpr const TFunction kFunction_sign_1C(
>+    BuiltInId::sign_Int2,
>+    BuiltInName::sign,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p1C1C_o_1C_o_1C,
>+    1,
>+    StaticType::Get<EbtInt, EbpUndefined, EvqGlobal, 2, 1>(),
>+    EOpSign,
>+    true);
>+constexpr const TFunction kFunction_sign_2C(
>+    BuiltInId::sign_Int3,
>+    BuiltInName::sign,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p2C2C0C0C,
>+    1,
>+    StaticType::Get<EbtInt, EbpUndefined, EvqGlobal, 3, 1>(),
>+    EOpSign,
>+    true);
>+constexpr const TFunction kFunction_sign_3C(
>+    BuiltInId::sign_Int4,
>+    BuiltInName::sign,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p3C0C0C,
>+    1,
>+    StaticType::Get<EbtInt, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpSign,
>+    true);
>+constexpr const TFunction kFunction_floor_0B(
>+    BuiltInId::floor_Float1,
>+    BuiltInName::floor,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0B0C,
>+    1,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 1, 1>(),
>+    EOpFloor,
>+    true);
>+constexpr const TFunction kFunction_floor_1B(
>+    BuiltInId::floor_Float2,
>+    BuiltInName::floor,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p1B1B0B,
>+    1,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 2, 1>(),
>+    EOpFloor,
>+    true);
>+constexpr const TFunction kFunction_floor_2B(
>+    BuiltInId::floor_Float3,
>+    BuiltInName::floor,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p2B_o_2C,
>+    1,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 3, 1>(),
>+    EOpFloor,
>+    true);
>+constexpr const TFunction kFunction_floor_3B(
>+    BuiltInId::floor_Float4,
>+    BuiltInName::floor,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p3B0B0B,
>+    1,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpFloor,
>+    true);
>+constexpr const TFunction kFunction_trunc_0B(
>+    BuiltInId::trunc_Float1,
>+    BuiltInName::trunc,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0B0C,
>+    1,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 1, 1>(),
>+    EOpTrunc,
>+    true);
>+constexpr const TFunction kFunction_trunc_1B(
>+    BuiltInId::trunc_Float2,
>+    BuiltInName::trunc,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p1B1B0B,
>+    1,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 2, 1>(),
>+    EOpTrunc,
>+    true);
>+constexpr const TFunction kFunction_trunc_2B(
>+    BuiltInId::trunc_Float3,
>+    BuiltInName::trunc,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p2B_o_2C,
>+    1,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 3, 1>(),
>+    EOpTrunc,
>+    true);
>+constexpr const TFunction kFunction_trunc_3B(
>+    BuiltInId::trunc_Float4,
>+    BuiltInName::trunc,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p3B0B0B,
>+    1,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpTrunc,
>+    true);
>+constexpr const TFunction kFunction_round_0B(
>+    BuiltInId::round_Float1,
>+    BuiltInName::round,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0B0C,
>+    1,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 1, 1>(),
>+    EOpRound,
>+    true);
>+constexpr const TFunction kFunction_round_1B(
>+    BuiltInId::round_Float2,
>+    BuiltInName::round,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p1B1B0B,
>+    1,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 2, 1>(),
>+    EOpRound,
>+    true);
>+constexpr const TFunction kFunction_round_2B(
>+    BuiltInId::round_Float3,
>+    BuiltInName::round,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p2B_o_2C,
>+    1,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 3, 1>(),
>+    EOpRound,
>+    true);
>+constexpr const TFunction kFunction_round_3B(
>+    BuiltInId::round_Float4,
>+    BuiltInName::round,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p3B0B0B,
>+    1,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpRound,
>+    true);
>+constexpr const TFunction kFunction_roundEven_0B(
>+    BuiltInId::roundEven_Float1,
>+    BuiltInName::roundEven,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0B0C,
>+    1,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 1, 1>(),
>+    EOpRoundEven,
>+    true);
>+constexpr const TFunction kFunction_roundEven_1B(
>+    BuiltInId::roundEven_Float2,
>+    BuiltInName::roundEven,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p1B1B0B,
>+    1,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 2, 1>(),
>+    EOpRoundEven,
>+    true);
>+constexpr const TFunction kFunction_roundEven_2B(
>+    BuiltInId::roundEven_Float3,
>+    BuiltInName::roundEven,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p2B_o_2C,
>+    1,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 3, 1>(),
>+    EOpRoundEven,
>+    true);
>+constexpr const TFunction kFunction_roundEven_3B(
>+    BuiltInId::roundEven_Float4,
>+    BuiltInName::roundEven,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p3B0B0B,
>+    1,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpRoundEven,
>+    true);
>+constexpr const TFunction kFunction_ceil_0B(
>+    BuiltInId::ceil_Float1,
>+    BuiltInName::ceil,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0B0C,
>+    1,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 1, 1>(),
>+    EOpCeil,
>+    true);
>+constexpr const TFunction kFunction_ceil_1B(
>+    BuiltInId::ceil_Float2,
>+    BuiltInName::ceil,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p1B1B0B,
>+    1,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 2, 1>(),
>+    EOpCeil,
>+    true);
>+constexpr const TFunction kFunction_ceil_2B(
>+    BuiltInId::ceil_Float3,
>+    BuiltInName::ceil,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p2B_o_2C,
>+    1,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 3, 1>(),
>+    EOpCeil,
>+    true);
>+constexpr const TFunction kFunction_ceil_3B(
>+    BuiltInId::ceil_Float4,
>+    BuiltInName::ceil,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p3B0B0B,
>+    1,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCeil,
>+    true);
>+constexpr const TFunction kFunction_fract_0B(
>+    BuiltInId::fract_Float1,
>+    BuiltInName::fract,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0B0C,
>+    1,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 1, 1>(),
>+    EOpFract,
>+    true);
>+constexpr const TFunction kFunction_fract_1B(
>+    BuiltInId::fract_Float2,
>+    BuiltInName::fract,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p1B1B0B,
>+    1,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 2, 1>(),
>+    EOpFract,
>+    true);
>+constexpr const TFunction kFunction_fract_2B(
>+    BuiltInId::fract_Float3,
>+    BuiltInName::fract,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p2B_o_2C,
>+    1,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 3, 1>(),
>+    EOpFract,
>+    true);
>+constexpr const TFunction kFunction_fract_3B(
>+    BuiltInId::fract_Float4,
>+    BuiltInName::fract,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p3B0B0B,
>+    1,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpFract,
>+    true);
>+constexpr const TFunction kFunction_mod_0B0B(
>+    BuiltInId::mod_Float1_Float1,
>+    BuiltInName::mod,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0B0B1B,
>+    2,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 1, 1>(),
>+    EOpMod,
>+    true);
>+constexpr const TFunction kFunction_mod_1B0B(
>+    BuiltInId::mod_Float2_Float1,
>+    BuiltInName::mod,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p1B0B0B,
>+    2,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 2, 1>(),
>+    EOpMod,
>+    true);
>+constexpr const TFunction kFunction_mod_2B0B(
>+    BuiltInId::mod_Float3_Float1,
>+    BuiltInName::mod,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p2B0B0B,
>+    2,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 3, 1>(),
>+    EOpMod,
>+    true);
>+constexpr const TFunction kFunction_mod_3B0B(
>+    BuiltInId::mod_Float4_Float1,
>+    BuiltInName::mod,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p3B0B0B,
>+    2,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpMod,
>+    true);
>+constexpr const TFunction kFunction_mod_1B1B(
>+    BuiltInId::mod_Float2_Float2,
>+    BuiltInName::mod,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p1B1B0B,
>+    2,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 2, 1>(),
>+    EOpMod,
>+    true);
>+constexpr const TFunction kFunction_mod_2B2B(
>+    BuiltInId::mod_Float3_Float3,
>+    BuiltInName::mod,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p2B2B0B,
>+    2,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 3, 1>(),
>+    EOpMod,
>+    true);
>+constexpr const TFunction kFunction_mod_3B3B(
>+    BuiltInId::mod_Float4_Float4,
>+    BuiltInName::mod,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p3B3B0B,
>+    2,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpMod,
>+    true);
>+constexpr const TFunction kFunction_min_0B0B(
>+    BuiltInId::min_Float1_Float1,
>+    BuiltInName::min,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0B0B1B,
>+    2,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 1, 1>(),
>+    EOpMin,
>+    true);
>+constexpr const TFunction kFunction_min_1B0B(
>+    BuiltInId::min_Float2_Float1,
>+    BuiltInName::min,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p1B0B0B,
>+    2,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 2, 1>(),
>+    EOpMin,
>+    true);
>+constexpr const TFunction kFunction_min_2B0B(
>+    BuiltInId::min_Float3_Float1,
>+    BuiltInName::min,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p2B0B0B,
>+    2,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 3, 1>(),
>+    EOpMin,
>+    true);
>+constexpr const TFunction kFunction_min_3B0B(
>+    BuiltInId::min_Float4_Float1,
>+    BuiltInName::min,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p3B0B0B,
>+    2,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpMin,
>+    true);
>+constexpr const TFunction kFunction_min_1B1B(
>+    BuiltInId::min_Float2_Float2,
>+    BuiltInName::min,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p1B1B0B,
>+    2,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 2, 1>(),
>+    EOpMin,
>+    true);
>+constexpr const TFunction kFunction_min_2B2B(
>+    BuiltInId::min_Float3_Float3,
>+    BuiltInName::min,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p2B2B0B,
>+    2,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 3, 1>(),
>+    EOpMin,
>+    true);
>+constexpr const TFunction kFunction_min_3B3B(
>+    BuiltInId::min_Float4_Float4,
>+    BuiltInName::min,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p3B3B0B,
>+    2,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpMin,
>+    true);
>+constexpr const TFunction kFunction_min_0C0C(
>+    BuiltInId::min_Int1_Int1,
>+    BuiltInName::min,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0C0C_o_0C_o_0C,
>+    2,
>+    StaticType::Get<EbtInt, EbpUndefined, EvqGlobal, 1, 1>(),
>+    EOpMin,
>+    true);
>+constexpr const TFunction kFunction_min_1C1C(
>+    BuiltInId::min_Int2_Int2,
>+    BuiltInName::min,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p1C1C_o_1C_o_1C,
>+    2,
>+    StaticType::Get<EbtInt, EbpUndefined, EvqGlobal, 2, 1>(),
>+    EOpMin,
>+    true);
>+constexpr const TFunction kFunction_min_2C2C(
>+    BuiltInId::min_Int3_Int3,
>+    BuiltInName::min,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p2C2C0C0C,
>+    2,
>+    StaticType::Get<EbtInt, EbpUndefined, EvqGlobal, 3, 1>(),
>+    EOpMin,
>+    true);
>+constexpr const TFunction kFunction_min_3C3C(
>+    BuiltInId::min_Int4_Int4,
>+    BuiltInName::min,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p3C3C3C,
>+    2,
>+    StaticType::Get<EbtInt, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpMin,
>+    true);
>+constexpr const TFunction kFunction_min_1C0C(
>+    BuiltInId::min_Int2_Int1,
>+    BuiltInName::min,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p1C0C0C,
>+    2,
>+    StaticType::Get<EbtInt, EbpUndefined, EvqGlobal, 2, 1>(),
>+    EOpMin,
>+    true);
>+constexpr const TFunction kFunction_min_2C0C(
>+    BuiltInId::min_Int3_Int1,
>+    BuiltInName::min,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p2C0C0C,
>+    2,
>+    StaticType::Get<EbtInt, EbpUndefined, EvqGlobal, 3, 1>(),
>+    EOpMin,
>+    true);
>+constexpr const TFunction kFunction_min_3C0C(
>+    BuiltInId::min_Int4_Int1,
>+    BuiltInName::min,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p3C0C0C,
>+    2,
>+    StaticType::Get<EbtInt, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpMin,
>+    true);
>+constexpr const TFunction kFunction_min_0D0D(
>+    BuiltInId::min_UInt1_UInt1,
>+    BuiltInName::min,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0D0D0C0C,
>+    2,
>+    StaticType::Get<EbtUInt, EbpUndefined, EvqGlobal, 1, 1>(),
>+    EOpMin,
>+    true);
>+constexpr const TFunction kFunction_min_1D1D(
>+    BuiltInId::min_UInt2_UInt2,
>+    BuiltInName::min,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p1D1D0C0C,
>+    2,
>+    StaticType::Get<EbtUInt, EbpUndefined, EvqGlobal, 2, 1>(),
>+    EOpMin,
>+    true);
>+constexpr const TFunction kFunction_min_2D2D(
>+    BuiltInId::min_UInt3_UInt3,
>+    BuiltInName::min,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p2D2D0C0C,
>+    2,
>+    StaticType::Get<EbtUInt, EbpUndefined, EvqGlobal, 3, 1>(),
>+    EOpMin,
>+    true);
>+constexpr const TFunction kFunction_min_3D3D(
>+    BuiltInId::min_UInt4_UInt4,
>+    BuiltInName::min,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p3D3D0C0C,
>+    2,
>+    StaticType::Get<EbtUInt, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpMin,
>+    true);
>+constexpr const TFunction kFunction_min_1D0D(
>+    BuiltInId::min_UInt2_UInt1,
>+    BuiltInName::min,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p1D0D0D,
>+    2,
>+    StaticType::Get<EbtUInt, EbpUndefined, EvqGlobal, 2, 1>(),
>+    EOpMin,
>+    true);
>+constexpr const TFunction kFunction_min_2D0D(
>+    BuiltInId::min_UInt3_UInt1,
>+    BuiltInName::min,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p2D0D0D,
>+    2,
>+    StaticType::Get<EbtUInt, EbpUndefined, EvqGlobal, 3, 1>(),
>+    EOpMin,
>+    true);
>+constexpr const TFunction kFunction_min_3D0D(
>+    BuiltInId::min_UInt4_UInt1,
>+    BuiltInName::min,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p3D0D0D,
>+    2,
>+    StaticType::Get<EbtUInt, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpMin,
>+    true);
>+constexpr const TFunction kFunction_max_0B0B(
>+    BuiltInId::max_Float1_Float1,
>+    BuiltInName::max,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0B0B1B,
>+    2,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 1, 1>(),
>+    EOpMax,
>+    true);
>+constexpr const TFunction kFunction_max_1B0B(
>+    BuiltInId::max_Float2_Float1,
>+    BuiltInName::max,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p1B0B0B,
>+    2,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 2, 1>(),
>+    EOpMax,
>+    true);
>+constexpr const TFunction kFunction_max_2B0B(
>+    BuiltInId::max_Float3_Float1,
>+    BuiltInName::max,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p2B0B0B,
>+    2,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 3, 1>(),
>+    EOpMax,
>+    true);
>+constexpr const TFunction kFunction_max_3B0B(
>+    BuiltInId::max_Float4_Float1,
>+    BuiltInName::max,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p3B0B0B,
>+    2,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpMax,
>+    true);
>+constexpr const TFunction kFunction_max_1B1B(
>+    BuiltInId::max_Float2_Float2,
>+    BuiltInName::max,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p1B1B0B,
>+    2,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 2, 1>(),
>+    EOpMax,
>+    true);
>+constexpr const TFunction kFunction_max_2B2B(
>+    BuiltInId::max_Float3_Float3,
>+    BuiltInName::max,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p2B2B0B,
>+    2,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 3, 1>(),
>+    EOpMax,
>+    true);
>+constexpr const TFunction kFunction_max_3B3B(
>+    BuiltInId::max_Float4_Float4,
>+    BuiltInName::max,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p3B3B0B,
>+    2,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpMax,
>+    true);
>+constexpr const TFunction kFunction_max_0C0C(
>+    BuiltInId::max_Int1_Int1,
>+    BuiltInName::max,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0C0C_o_0C_o_0C,
>+    2,
>+    StaticType::Get<EbtInt, EbpUndefined, EvqGlobal, 1, 1>(),
>+    EOpMax,
>+    true);
>+constexpr const TFunction kFunction_max_1C1C(
>+    BuiltInId::max_Int2_Int2,
>+    BuiltInName::max,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p1C1C_o_1C_o_1C,
>+    2,
>+    StaticType::Get<EbtInt, EbpUndefined, EvqGlobal, 2, 1>(),
>+    EOpMax,
>+    true);
>+constexpr const TFunction kFunction_max_2C2C(
>+    BuiltInId::max_Int3_Int3,
>+    BuiltInName::max,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p2C2C0C0C,
>+    2,
>+    StaticType::Get<EbtInt, EbpUndefined, EvqGlobal, 3, 1>(),
>+    EOpMax,
>+    true);
>+constexpr const TFunction kFunction_max_3C3C(
>+    BuiltInId::max_Int4_Int4,
>+    BuiltInName::max,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p3C3C3C,
>+    2,
>+    StaticType::Get<EbtInt, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpMax,
>+    true);
>+constexpr const TFunction kFunction_max_1C0C(
>+    BuiltInId::max_Int2_Int1,
>+    BuiltInName::max,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p1C0C0C,
>+    2,
>+    StaticType::Get<EbtInt, EbpUndefined, EvqGlobal, 2, 1>(),
>+    EOpMax,
>+    true);
>+constexpr const TFunction kFunction_max_2C0C(
>+    BuiltInId::max_Int3_Int1,
>+    BuiltInName::max,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p2C0C0C,
>+    2,
>+    StaticType::Get<EbtInt, EbpUndefined, EvqGlobal, 3, 1>(),
>+    EOpMax,
>+    true);
>+constexpr const TFunction kFunction_max_3C0C(
>+    BuiltInId::max_Int4_Int1,
>+    BuiltInName::max,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p3C0C0C,
>+    2,
>+    StaticType::Get<EbtInt, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpMax,
>+    true);
>+constexpr const TFunction kFunction_max_0D0D(
>+    BuiltInId::max_UInt1_UInt1,
>+    BuiltInName::max,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0D0D0C0C,
>+    2,
>+    StaticType::Get<EbtUInt, EbpUndefined, EvqGlobal, 1, 1>(),
>+    EOpMax,
>+    true);
>+constexpr const TFunction kFunction_max_1D1D(
>+    BuiltInId::max_UInt2_UInt2,
>+    BuiltInName::max,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p1D1D0C0C,
>+    2,
>+    StaticType::Get<EbtUInt, EbpUndefined, EvqGlobal, 2, 1>(),
>+    EOpMax,
>+    true);
>+constexpr const TFunction kFunction_max_2D2D(
>+    BuiltInId::max_UInt3_UInt3,
>+    BuiltInName::max,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p2D2D0C0C,
>+    2,
>+    StaticType::Get<EbtUInt, EbpUndefined, EvqGlobal, 3, 1>(),
>+    EOpMax,
>+    true);
>+constexpr const TFunction kFunction_max_3D3D(
>+    BuiltInId::max_UInt4_UInt4,
>+    BuiltInName::max,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p3D3D0C0C,
>+    2,
>+    StaticType::Get<EbtUInt, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpMax,
>+    true);
>+constexpr const TFunction kFunction_max_1D0D(
>+    BuiltInId::max_UInt2_UInt1,
>+    BuiltInName::max,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p1D0D0D,
>+    2,
>+    StaticType::Get<EbtUInt, EbpUndefined, EvqGlobal, 2, 1>(),
>+    EOpMax,
>+    true);
>+constexpr const TFunction kFunction_max_2D0D(
>+    BuiltInId::max_UInt3_UInt1,
>+    BuiltInName::max,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p2D0D0D,
>+    2,
>+    StaticType::Get<EbtUInt, EbpUndefined, EvqGlobal, 3, 1>(),
>+    EOpMax,
>+    true);
>+constexpr const TFunction kFunction_max_3D0D(
>+    BuiltInId::max_UInt4_UInt1,
>+    BuiltInName::max,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p3D0D0D,
>+    2,
>+    StaticType::Get<EbtUInt, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpMax,
>+    true);
>+constexpr const TFunction kFunction_clamp_0B0B0B(
>+    BuiltInId::clamp_Float1_Float1_Float1,
>+    BuiltInName::clamp,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0B0B0B,
>+    3,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 1, 1>(),
>+    EOpClamp,
>+    true);
>+constexpr const TFunction kFunction_clamp_1B0B0B(
>+    BuiltInId::clamp_Float2_Float1_Float1,
>+    BuiltInName::clamp,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p1B0B0B,
>+    3,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 2, 1>(),
>+    EOpClamp,
>+    true);
>+constexpr const TFunction kFunction_clamp_2B0B0B(
>+    BuiltInId::clamp_Float3_Float1_Float1,
>+    BuiltInName::clamp,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p2B0B0B,
>+    3,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 3, 1>(),
>+    EOpClamp,
>+    true);
>+constexpr const TFunction kFunction_clamp_3B0B0B(
>+    BuiltInId::clamp_Float4_Float1_Float1,
>+    BuiltInName::clamp,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p3B0B0B,
>+    3,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpClamp,
>+    true);
>+constexpr const TFunction kFunction_clamp_1B1B1B(
>+    BuiltInId::clamp_Float2_Float2_Float2,
>+    BuiltInName::clamp,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p1B1B1B,
>+    3,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 2, 1>(),
>+    EOpClamp,
>+    true);
>+constexpr const TFunction kFunction_clamp_2B2B2B(
>+    BuiltInId::clamp_Float3_Float3_Float3,
>+    BuiltInName::clamp,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p2B2B2B,
>+    3,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 3, 1>(),
>+    EOpClamp,
>+    true);
>+constexpr const TFunction kFunction_clamp_3B3B3B(
>+    BuiltInId::clamp_Float4_Float4_Float4,
>+    BuiltInName::clamp,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p3B3B3B,
>+    3,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpClamp,
>+    true);
>+constexpr const TFunction kFunction_clamp_0C0C0C(
>+    BuiltInId::clamp_Int1_Int1_Int1,
>+    BuiltInName::clamp,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0C0C0C0C,
>+    3,
>+    StaticType::Get<EbtInt, EbpUndefined, EvqGlobal, 1, 1>(),
>+    EOpClamp,
>+    true);
>+constexpr const TFunction kFunction_clamp_1C0C0C(
>+    BuiltInId::clamp_Int2_Int1_Int1,
>+    BuiltInName::clamp,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p1C0C0C,
>+    3,
>+    StaticType::Get<EbtInt, EbpUndefined, EvqGlobal, 2, 1>(),
>+    EOpClamp,
>+    true);
>+constexpr const TFunction kFunction_clamp_2C0C0C(
>+    BuiltInId::clamp_Int3_Int1_Int1,
>+    BuiltInName::clamp,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p2C0C0C,
>+    3,
>+    StaticType::Get<EbtInt, EbpUndefined, EvqGlobal, 3, 1>(),
>+    EOpClamp,
>+    true);
>+constexpr const TFunction kFunction_clamp_3C0C0C(
>+    BuiltInId::clamp_Int4_Int1_Int1,
>+    BuiltInName::clamp,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p3C0C0C,
>+    3,
>+    StaticType::Get<EbtInt, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpClamp,
>+    true);
>+constexpr const TFunction kFunction_clamp_1C1C1C(
>+    BuiltInId::clamp_Int2_Int2_Int2,
>+    BuiltInName::clamp,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p1C1C1C,
>+    3,
>+    StaticType::Get<EbtInt, EbpUndefined, EvqGlobal, 2, 1>(),
>+    EOpClamp,
>+    true);
>+constexpr const TFunction kFunction_clamp_2C2C2C(
>+    BuiltInId::clamp_Int3_Int3_Int3,
>+    BuiltInName::clamp,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p2C2C2C,
>+    3,
>+    StaticType::Get<EbtInt, EbpUndefined, EvqGlobal, 3, 1>(),
>+    EOpClamp,
>+    true);
>+constexpr const TFunction kFunction_clamp_3C3C3C(
>+    BuiltInId::clamp_Int4_Int4_Int4,
>+    BuiltInName::clamp,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p3C3C3C,
>+    3,
>+    StaticType::Get<EbtInt, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpClamp,
>+    true);
>+constexpr const TFunction kFunction_clamp_0D0D0D(
>+    BuiltInId::clamp_UInt1_UInt1_UInt1,
>+    BuiltInName::clamp,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0D0D0D,
>+    3,
>+    StaticType::Get<EbtUInt, EbpUndefined, EvqGlobal, 1, 1>(),
>+    EOpClamp,
>+    true);
>+constexpr const TFunction kFunction_clamp_1D0D0D(
>+    BuiltInId::clamp_UInt2_UInt1_UInt1,
>+    BuiltInName::clamp,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p1D0D0D,
>+    3,
>+    StaticType::Get<EbtUInt, EbpUndefined, EvqGlobal, 2, 1>(),
>+    EOpClamp,
>+    true);
>+constexpr const TFunction kFunction_clamp_2D0D0D(
>+    BuiltInId::clamp_UInt3_UInt1_UInt1,
>+    BuiltInName::clamp,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p2D0D0D,
>+    3,
>+    StaticType::Get<EbtUInt, EbpUndefined, EvqGlobal, 3, 1>(),
>+    EOpClamp,
>+    true);
>+constexpr const TFunction kFunction_clamp_3D0D0D(
>+    BuiltInId::clamp_UInt4_UInt1_UInt1,
>+    BuiltInName::clamp,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p3D0D0D,
>+    3,
>+    StaticType::Get<EbtUInt, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpClamp,
>+    true);
>+constexpr const TFunction kFunction_clamp_1D1D1D(
>+    BuiltInId::clamp_UInt2_UInt2_UInt2,
>+    BuiltInName::clamp,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p1D1D1D,
>+    3,
>+    StaticType::Get<EbtUInt, EbpUndefined, EvqGlobal, 2, 1>(),
>+    EOpClamp,
>+    true);
>+constexpr const TFunction kFunction_clamp_2D2D2D(
>+    BuiltInId::clamp_UInt3_UInt3_UInt3,
>+    BuiltInName::clamp,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p2D2D2D,
>+    3,
>+    StaticType::Get<EbtUInt, EbpUndefined, EvqGlobal, 3, 1>(),
>+    EOpClamp,
>+    true);
>+constexpr const TFunction kFunction_clamp_3D3D3D(
>+    BuiltInId::clamp_UInt4_UInt4_UInt4,
>+    BuiltInName::clamp,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p3D3D3D,
>+    3,
>+    StaticType::Get<EbtUInt, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpClamp,
>+    true);
>+constexpr const TFunction kFunction_mix_0B0B0B(
>+    BuiltInId::mix_Float1_Float1_Float1,
>+    BuiltInName::mix,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0B0B0B,
>+    3,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 1, 1>(),
>+    EOpMix,
>+    true);
>+constexpr const TFunction kFunction_mix_1B1B0B(
>+    BuiltInId::mix_Float2_Float2_Float1,
>+    BuiltInName::mix,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p1B1B0B,
>+    3,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 2, 1>(),
>+    EOpMix,
>+    true);
>+constexpr const TFunction kFunction_mix_2B2B0B(
>+    BuiltInId::mix_Float3_Float3_Float1,
>+    BuiltInName::mix,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p2B2B0B,
>+    3,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 3, 1>(),
>+    EOpMix,
>+    true);
>+constexpr const TFunction kFunction_mix_3B3B0B(
>+    BuiltInId::mix_Float4_Float4_Float1,
>+    BuiltInName::mix,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p3B3B0B,
>+    3,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpMix,
>+    true);
>+constexpr const TFunction kFunction_mix_1B1B1B(
>+    BuiltInId::mix_Float2_Float2_Float2,
>+    BuiltInName::mix,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p1B1B1B,
>+    3,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 2, 1>(),
>+    EOpMix,
>+    true);
>+constexpr const TFunction kFunction_mix_2B2B2B(
>+    BuiltInId::mix_Float3_Float3_Float3,
>+    BuiltInName::mix,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p2B2B2B,
>+    3,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 3, 1>(),
>+    EOpMix,
>+    true);
>+constexpr const TFunction kFunction_mix_3B3B3B(
>+    BuiltInId::mix_Float4_Float4_Float4,
>+    BuiltInName::mix,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p3B3B3B,
>+    3,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpMix,
>+    true);
>+constexpr const TFunction kFunction_mix_0B0B0E(
>+    BuiltInId::mix_Float1_Float1_Bool1,
>+    BuiltInName::mix,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0B0B0E,
>+    3,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 1, 1>(),
>+    EOpMix,
>+    true);
>+constexpr const TFunction kFunction_mix_1B1B1E(
>+    BuiltInId::mix_Float2_Float2_Bool2,
>+    BuiltInName::mix,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p1B1B1E,
>+    3,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 2, 1>(),
>+    EOpMix,
>+    true);
>+constexpr const TFunction kFunction_mix_2B2B2E(
>+    BuiltInId::mix_Float3_Float3_Bool3,
>+    BuiltInName::mix,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p2B2B2E,
>+    3,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 3, 1>(),
>+    EOpMix,
>+    true);
>+constexpr const TFunction kFunction_mix_3B3B3E(
>+    BuiltInId::mix_Float4_Float4_Bool4,
>+    BuiltInName::mix,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p3B3B3E,
>+    3,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpMix,
>+    true);
>+constexpr const TFunction kFunction_step_0B0B(
>+    BuiltInId::step_Float1_Float1,
>+    BuiltInName::step,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0B0B1B,
>+    2,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 1, 1>(),
>+    EOpStep,
>+    true);
>+constexpr const TFunction kFunction_step_1B1B(
>+    BuiltInId::step_Float2_Float2,
>+    BuiltInName::step,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p1B1B0B,
>+    2,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 2, 1>(),
>+    EOpStep,
>+    true);
>+constexpr const TFunction kFunction_step_2B2B(
>+    BuiltInId::step_Float3_Float3,
>+    BuiltInName::step,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p2B2B0B,
>+    2,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 3, 1>(),
>+    EOpStep,
>+    true);
>+constexpr const TFunction kFunction_step_3B3B(
>+    BuiltInId::step_Float4_Float4,
>+    BuiltInName::step,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p3B3B0B,
>+    2,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpStep,
>+    true);
>+constexpr const TFunction kFunction_step_0B1B(
>+    BuiltInId::step_Float1_Float2,
>+    BuiltInName::step,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0B1B,
>+    2,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 2, 1>(),
>+    EOpStep,
>+    true);
>+constexpr const TFunction kFunction_step_0B2B(
>+    BuiltInId::step_Float1_Float3,
>+    BuiltInName::step,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0B2B,
>+    2,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 3, 1>(),
>+    EOpStep,
>+    true);
>+constexpr const TFunction kFunction_step_0B3B(
>+    BuiltInId::step_Float1_Float4,
>+    BuiltInName::step,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0B3B,
>+    2,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpStep,
>+    true);
>+constexpr const TFunction kFunction_smoothstep_0B0B0B(
>+    BuiltInId::smoothstep_Float1_Float1_Float1,
>+    BuiltInName::smoothstep,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0B0B0B,
>+    3,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 1, 1>(),
>+    EOpSmoothstep,
>+    true);
>+constexpr const TFunction kFunction_smoothstep_1B1B1B(
>+    BuiltInId::smoothstep_Float2_Float2_Float2,
>+    BuiltInName::smoothstep,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p1B1B1B,
>+    3,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 2, 1>(),
>+    EOpSmoothstep,
>+    true);
>+constexpr const TFunction kFunction_smoothstep_2B2B2B(
>+    BuiltInId::smoothstep_Float3_Float3_Float3,
>+    BuiltInName::smoothstep,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p2B2B2B,
>+    3,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 3, 1>(),
>+    EOpSmoothstep,
>+    true);
>+constexpr const TFunction kFunction_smoothstep_3B3B3B(
>+    BuiltInId::smoothstep_Float4_Float4_Float4,
>+    BuiltInName::smoothstep,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p3B3B3B,
>+    3,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpSmoothstep,
>+    true);
>+constexpr const TFunction kFunction_smoothstep_0B0B1B(
>+    BuiltInId::smoothstep_Float1_Float1_Float2,
>+    BuiltInName::smoothstep,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0B0B1B,
>+    3,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 2, 1>(),
>+    EOpSmoothstep,
>+    true);
>+constexpr const TFunction kFunction_smoothstep_0B0B2B(
>+    BuiltInId::smoothstep_Float1_Float1_Float3,
>+    BuiltInName::smoothstep,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0B0B2B,
>+    3,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 3, 1>(),
>+    EOpSmoothstep,
>+    true);
>+constexpr const TFunction kFunction_smoothstep_0B0B3B(
>+    BuiltInId::smoothstep_Float1_Float1_Float4,
>+    BuiltInName::smoothstep,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0B0B3B,
>+    3,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpSmoothstep,
>+    true);
>+constexpr const TFunction kFunction_modf_0B0B(
>+    BuiltInId::modf_Float1_Float1,
>+    BuiltInName::modf,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0B_o_0B,
>+    2,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 1, 1>(),
>+    EOpModf,
>+    false);
>+constexpr const TFunction kFunction_modf_1B1B(
>+    BuiltInId::modf_Float2_Float2,
>+    BuiltInName::modf,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p1B_o_1B,
>+    2,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 2, 1>(),
>+    EOpModf,
>+    false);
>+constexpr const TFunction kFunction_modf_2B2B(
>+    BuiltInId::modf_Float3_Float3,
>+    BuiltInName::modf,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p2B_o_2B,
>+    2,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 3, 1>(),
>+    EOpModf,
>+    false);
>+constexpr const TFunction kFunction_modf_3B3B(
>+    BuiltInId::modf_Float4_Float4,
>+    BuiltInName::modf,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p3B_o_3B,
>+    2,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpModf,
>+    false);
>+constexpr const TFunction kFunction_isnan_0B(
>+    BuiltInId::isnan_Float1,
>+    BuiltInName::isnan,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0B0C,
>+    1,
>+    StaticType::Get<EbtBool, EbpUndefined, EvqGlobal, 1, 1>(),
>+    EOpIsnan,
>+    true);
>+constexpr const TFunction kFunction_isnan_1B(
>+    BuiltInId::isnan_Float2,
>+    BuiltInName::isnan,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p1B1B0B,
>+    1,
>+    StaticType::Get<EbtBool, EbpUndefined, EvqGlobal, 2, 1>(),
>+    EOpIsnan,
>+    true);
>+constexpr const TFunction kFunction_isnan_2B(
>+    BuiltInId::isnan_Float3,
>+    BuiltInName::isnan,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p2B_o_2C,
>+    1,
>+    StaticType::Get<EbtBool, EbpUndefined, EvqGlobal, 3, 1>(),
>+    EOpIsnan,
>+    true);
>+constexpr const TFunction kFunction_isnan_3B(
>+    BuiltInId::isnan_Float4,
>+    BuiltInName::isnan,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p3B0B0B,
>+    1,
>+    StaticType::Get<EbtBool, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpIsnan,
>+    true);
>+constexpr const TFunction kFunction_isinf_0B(
>+    BuiltInId::isinf_Float1,
>+    BuiltInName::isinf,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0B0C,
>+    1,
>+    StaticType::Get<EbtBool, EbpUndefined, EvqGlobal, 1, 1>(),
>+    EOpIsinf,
>+    true);
>+constexpr const TFunction kFunction_isinf_1B(
>+    BuiltInId::isinf_Float2,
>+    BuiltInName::isinf,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p1B1B0B,
>+    1,
>+    StaticType::Get<EbtBool, EbpUndefined, EvqGlobal, 2, 1>(),
>+    EOpIsinf,
>+    true);
>+constexpr const TFunction kFunction_isinf_2B(
>+    BuiltInId::isinf_Float3,
>+    BuiltInName::isinf,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p2B_o_2C,
>+    1,
>+    StaticType::Get<EbtBool, EbpUndefined, EvqGlobal, 3, 1>(),
>+    EOpIsinf,
>+    true);
>+constexpr const TFunction kFunction_isinf_3B(
>+    BuiltInId::isinf_Float4,
>+    BuiltInName::isinf,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p3B0B0B,
>+    1,
>+    StaticType::Get<EbtBool, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpIsinf,
>+    true);
>+constexpr const TFunction kFunction_floatBitsToInt_0B(
>+    BuiltInId::floatBitsToInt_Float1,
>+    BuiltInName::floatBitsToInt,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0B0C,
>+    1,
>+    StaticType::Get<EbtInt, EbpUndefined, EvqGlobal, 1, 1>(),
>+    EOpFloatBitsToInt,
>+    true);
>+constexpr const TFunction kFunction_floatBitsToInt_1B(
>+    BuiltInId::floatBitsToInt_Float2,
>+    BuiltInName::floatBitsToInt,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p1B1B0B,
>+    1,
>+    StaticType::Get<EbtInt, EbpUndefined, EvqGlobal, 2, 1>(),
>+    EOpFloatBitsToInt,
>+    true);
>+constexpr const TFunction kFunction_floatBitsToInt_2B(
>+    BuiltInId::floatBitsToInt_Float3,
>+    BuiltInName::floatBitsToInt,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p2B_o_2C,
>+    1,
>+    StaticType::Get<EbtInt, EbpUndefined, EvqGlobal, 3, 1>(),
>+    EOpFloatBitsToInt,
>+    true);
>+constexpr const TFunction kFunction_floatBitsToInt_3B(
>+    BuiltInId::floatBitsToInt_Float4,
>+    BuiltInName::floatBitsToInt,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p3B0B0B,
>+    1,
>+    StaticType::Get<EbtInt, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpFloatBitsToInt,
>+    true);
>+constexpr const TFunction kFunction_floatBitsToUint_0B(
>+    BuiltInId::floatBitsToUint_Float1,
>+    BuiltInName::floatBitsToUint,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0B0C,
>+    1,
>+    StaticType::Get<EbtUInt, EbpUndefined, EvqGlobal, 1, 1>(),
>+    EOpFloatBitsToUint,
>+    true);
>+constexpr const TFunction kFunction_floatBitsToUint_1B(
>+    BuiltInId::floatBitsToUint_Float2,
>+    BuiltInName::floatBitsToUint,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p1B1B0B,
>+    1,
>+    StaticType::Get<EbtUInt, EbpUndefined, EvqGlobal, 2, 1>(),
>+    EOpFloatBitsToUint,
>+    true);
>+constexpr const TFunction kFunction_floatBitsToUint_2B(
>+    BuiltInId::floatBitsToUint_Float3,
>+    BuiltInName::floatBitsToUint,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p2B_o_2C,
>+    1,
>+    StaticType::Get<EbtUInt, EbpUndefined, EvqGlobal, 3, 1>(),
>+    EOpFloatBitsToUint,
>+    true);
>+constexpr const TFunction kFunction_floatBitsToUint_3B(
>+    BuiltInId::floatBitsToUint_Float4,
>+    BuiltInName::floatBitsToUint,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p3B0B0B,
>+    1,
>+    StaticType::Get<EbtUInt, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpFloatBitsToUint,
>+    true);
>+constexpr const TFunction kFunction_intBitsToFloat_0C(
>+    BuiltInId::intBitsToFloat_Int1,
>+    BuiltInName::intBitsToFloat,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0C0C_o_0C_o_0C,
>+    1,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 1, 1>(),
>+    EOpIntBitsToFloat,
>+    true);
>+constexpr const TFunction kFunction_intBitsToFloat_1C(
>+    BuiltInId::intBitsToFloat_Int2,
>+    BuiltInName::intBitsToFloat,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p1C1C_o_1C_o_1C,
>+    1,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 2, 1>(),
>+    EOpIntBitsToFloat,
>+    true);
>+constexpr const TFunction kFunction_intBitsToFloat_2C(
>+    BuiltInId::intBitsToFloat_Int3,
>+    BuiltInName::intBitsToFloat,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p2C2C0C0C,
>+    1,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 3, 1>(),
>+    EOpIntBitsToFloat,
>+    true);
>+constexpr const TFunction kFunction_intBitsToFloat_3C(
>+    BuiltInId::intBitsToFloat_Int4,
>+    BuiltInName::intBitsToFloat,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p3C0C0C,
>+    1,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpIntBitsToFloat,
>+    true);
>+constexpr const TFunction kFunction_uintBitsToFloat_0D(
>+    BuiltInId::uintBitsToFloat_UInt1,
>+    BuiltInName::uintBitsToFloat,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0D0C0C,
>+    1,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 1, 1>(),
>+    EOpUintBitsToFloat,
>+    true);
>+constexpr const TFunction kFunction_uintBitsToFloat_1D(
>+    BuiltInId::uintBitsToFloat_UInt2,
>+    BuiltInName::uintBitsToFloat,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p1D0C0C,
>+    1,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 2, 1>(),
>+    EOpUintBitsToFloat,
>+    true);
>+constexpr const TFunction kFunction_uintBitsToFloat_2D(
>+    BuiltInId::uintBitsToFloat_UInt3,
>+    BuiltInName::uintBitsToFloat,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p2D2D0C0C,
>+    1,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 3, 1>(),
>+    EOpUintBitsToFloat,
>+    true);
>+constexpr const TFunction kFunction_uintBitsToFloat_3D(
>+    BuiltInId::uintBitsToFloat_UInt4,
>+    BuiltInName::uintBitsToFloat,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p3D0C0C,
>+    1,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpUintBitsToFloat,
>+    true);
>+constexpr const TFunction kFunction_frexp_0B0C(
>+    BuiltInId::frexp_Float1_Int1,
>+    BuiltInName::frexp,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0B_o_0C,
>+    2,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 1, 1>(),
>+    EOpFrexp,
>+    false);
>+constexpr const TFunction kFunction_frexp_1B1C(
>+    BuiltInId::frexp_Float2_Int2,
>+    BuiltInName::frexp,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p1B_o_1C,
>+    2,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 2, 1>(),
>+    EOpFrexp,
>+    false);
>+constexpr const TFunction kFunction_frexp_2B2C(
>+    BuiltInId::frexp_Float3_Int3,
>+    BuiltInName::frexp,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p2B_o_2C,
>+    2,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 3, 1>(),
>+    EOpFrexp,
>+    false);
>+constexpr const TFunction kFunction_frexp_3B3C(
>+    BuiltInId::frexp_Float4_Int4,
>+    BuiltInName::frexp,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p3B_o_3C,
>+    2,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpFrexp,
>+    false);
>+constexpr const TFunction kFunction_ldexp_0B0C(
>+    BuiltInId::ldexp_Float1_Int1,
>+    BuiltInName::ldexp,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0B0C,
>+    2,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 1, 1>(),
>+    EOpLdexp,
>+    true);
>+constexpr const TFunction kFunction_ldexp_1B1C(
>+    BuiltInId::ldexp_Float2_Int2,
>+    BuiltInName::ldexp,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p1B1C,
>+    2,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 2, 1>(),
>+    EOpLdexp,
>+    true);
>+constexpr const TFunction kFunction_ldexp_2B2C(
>+    BuiltInId::ldexp_Float3_Int3,
>+    BuiltInName::ldexp,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p2B2C,
>+    2,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 3, 1>(),
>+    EOpLdexp,
>+    true);
>+constexpr const TFunction kFunction_ldexp_3B3C(
>+    BuiltInId::ldexp_Float4_Int4,
>+    BuiltInName::ldexp,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p3B3C,
>+    2,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpLdexp,
>+    true);
>+constexpr const TFunction kFunction_packSnorm2x16_1B(
>+    BuiltInId::packSnorm2x16_Float2,
>+    BuiltInName::packSnorm2x16,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p1B1B0B,
>+    1,
>+    StaticType::Get<EbtUInt, EbpUndefined, EvqGlobal, 1, 1>(),
>+    EOpPackSnorm2x16,
>+    true);
>+constexpr const TFunction kFunction_packUnorm2x16_1B(
>+    BuiltInId::packUnorm2x16_Float2,
>+    BuiltInName::packUnorm2x16,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p1B1B0B,
>+    1,
>+    StaticType::Get<EbtUInt, EbpUndefined, EvqGlobal, 1, 1>(),
>+    EOpPackUnorm2x16,
>+    true);
>+constexpr const TFunction kFunction_packHalf2x16_1B(
>+    BuiltInId::packHalf2x16_Float2,
>+    BuiltInName::packHalf2x16,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p1B1B0B,
>+    1,
>+    StaticType::Get<EbtUInt, EbpUndefined, EvqGlobal, 1, 1>(),
>+    EOpPackHalf2x16,
>+    true);
>+constexpr const TFunction kFunction_unpackSnorm2x16_0D(
>+    BuiltInId::unpackSnorm2x16_UInt1,
>+    BuiltInName::unpackSnorm2x16,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0D0C0C,
>+    1,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 2, 1>(),
>+    EOpUnpackSnorm2x16,
>+    true);
>+constexpr const TFunction kFunction_unpackUnorm2x16_0D(
>+    BuiltInId::unpackUnorm2x16_UInt1,
>+    BuiltInName::unpackUnorm2x16,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0D0C0C,
>+    1,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 2, 1>(),
>+    EOpUnpackUnorm2x16,
>+    true);
>+constexpr const TFunction kFunction_unpackHalf2x16_0D(
>+    BuiltInId::unpackHalf2x16_UInt1,
>+    BuiltInName::unpackHalf2x16,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0D0C0C,
>+    1,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 2, 1>(),
>+    EOpUnpackHalf2x16,
>+    true);
>+constexpr const TFunction kFunction_packUnorm4x8_3B(
>+    BuiltInId::packUnorm4x8_Float4,
>+    BuiltInName::packUnorm4x8,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p3B0B0B,
>+    1,
>+    StaticType::Get<EbtUInt, EbpUndefined, EvqGlobal, 1, 1>(),
>+    EOpPackUnorm4x8,
>+    true);
>+constexpr const TFunction kFunction_packSnorm4x8_3B(
>+    BuiltInId::packSnorm4x8_Float4,
>+    BuiltInName::packSnorm4x8,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p3B0B0B,
>+    1,
>+    StaticType::Get<EbtUInt, EbpUndefined, EvqGlobal, 1, 1>(),
>+    EOpPackSnorm4x8,
>+    true);
>+constexpr const TFunction kFunction_unpackUnorm4x8_0D(
>+    BuiltInId::unpackUnorm4x8_UInt1,
>+    BuiltInName::unpackUnorm4x8,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0D0C0C,
>+    1,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpUnpackUnorm4x8,
>+    true);
>+constexpr const TFunction kFunction_unpackSnorm4x8_0D(
>+    BuiltInId::unpackSnorm4x8_UInt1,
>+    BuiltInName::unpackSnorm4x8,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0D0C0C,
>+    1,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpUnpackSnorm4x8,
>+    true);
>+constexpr const TFunction kFunction_length_0B(
>+    BuiltInId::length_Float1,
>+    BuiltInName::length,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0B0C,
>+    1,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 1, 1>(),
>+    EOpLength,
>+    true);
>+constexpr const TFunction kFunction_length_1B(
>+    BuiltInId::length_Float2,
>+    BuiltInName::length,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p1B1B0B,
>+    1,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 1, 1>(),
>+    EOpLength,
>+    true);
>+constexpr const TFunction kFunction_length_2B(
>+    BuiltInId::length_Float3,
>+    BuiltInName::length,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p2B_o_2C,
>+    1,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 1, 1>(),
>+    EOpLength,
>+    true);
>+constexpr const TFunction kFunction_length_3B(
>+    BuiltInId::length_Float4,
>+    BuiltInName::length,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p3B0B0B,
>+    1,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 1, 1>(),
>+    EOpLength,
>+    true);
>+constexpr const TFunction kFunction_distance_0B0B(
>+    BuiltInId::distance_Float1_Float1,
>+    BuiltInName::distance,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0B0B1B,
>+    2,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 1, 1>(),
>+    EOpDistance,
>+    true);
>+constexpr const TFunction kFunction_distance_1B1B(
>+    BuiltInId::distance_Float2_Float2,
>+    BuiltInName::distance,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p1B1B0B,
>+    2,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 1, 1>(),
>+    EOpDistance,
>+    true);
>+constexpr const TFunction kFunction_distance_2B2B(
>+    BuiltInId::distance_Float3_Float3,
>+    BuiltInName::distance,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p2B2B0B,
>+    2,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 1, 1>(),
>+    EOpDistance,
>+    true);
>+constexpr const TFunction kFunction_distance_3B3B(
>+    BuiltInId::distance_Float4_Float4,
>+    BuiltInName::distance,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p3B3B0B,
>+    2,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 1, 1>(),
>+    EOpDistance,
>+    true);
>+constexpr const TFunction kFunction_dot_0B0B(
>+    BuiltInId::dot_Float1_Float1,
>+    BuiltInName::dot,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0B0B1B,
>+    2,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 1, 1>(),
>+    EOpDot,
>+    true);
>+constexpr const TFunction kFunction_dot_1B1B(
>+    BuiltInId::dot_Float2_Float2,
>+    BuiltInName::dot,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p1B1B0B,
>+    2,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 1, 1>(),
>+    EOpDot,
>+    true);
>+constexpr const TFunction kFunction_dot_2B2B(
>+    BuiltInId::dot_Float3_Float3,
>+    BuiltInName::dot,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p2B2B0B,
>+    2,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 1, 1>(),
>+    EOpDot,
>+    true);
>+constexpr const TFunction kFunction_dot_3B3B(
>+    BuiltInId::dot_Float4_Float4,
>+    BuiltInName::dot,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p3B3B0B,
>+    2,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 1, 1>(),
>+    EOpDot,
>+    true);
>+constexpr const TFunction kFunction_cross_2B2B(
>+    BuiltInId::cross_Float3_Float3,
>+    BuiltInName::cross,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p2B2B0B,
>+    2,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 3, 1>(),
>+    EOpCross,
>+    true);
>+constexpr const TFunction kFunction_normalize_0B(
>+    BuiltInId::normalize_Float1,
>+    BuiltInName::normalize,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0B0C,
>+    1,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 1, 1>(),
>+    EOpNormalize,
>+    true);
>+constexpr const TFunction kFunction_normalize_1B(
>+    BuiltInId::normalize_Float2,
>+    BuiltInName::normalize,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p1B1B0B,
>+    1,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 2, 1>(),
>+    EOpNormalize,
>+    true);
>+constexpr const TFunction kFunction_normalize_2B(
>+    BuiltInId::normalize_Float3,
>+    BuiltInName::normalize,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p2B_o_2C,
>+    1,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 3, 1>(),
>+    EOpNormalize,
>+    true);
>+constexpr const TFunction kFunction_normalize_3B(
>+    BuiltInId::normalize_Float4,
>+    BuiltInName::normalize,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p3B0B0B,
>+    1,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpNormalize,
>+    true);
>+constexpr const TFunction kFunction_faceforward_0B0B0B(
>+    BuiltInId::faceforward_Float1_Float1_Float1,
>+    BuiltInName::faceforward,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0B0B0B,
>+    3,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 1, 1>(),
>+    EOpFaceforward,
>+    true);
>+constexpr const TFunction kFunction_faceforward_1B1B1B(
>+    BuiltInId::faceforward_Float2_Float2_Float2,
>+    BuiltInName::faceforward,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p1B1B1B,
>+    3,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 2, 1>(),
>+    EOpFaceforward,
>+    true);
>+constexpr const TFunction kFunction_faceforward_2B2B2B(
>+    BuiltInId::faceforward_Float3_Float3_Float3,
>+    BuiltInName::faceforward,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p2B2B2B,
>+    3,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 3, 1>(),
>+    EOpFaceforward,
>+    true);
>+constexpr const TFunction kFunction_faceforward_3B3B3B(
>+    BuiltInId::faceforward_Float4_Float4_Float4,
>+    BuiltInName::faceforward,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p3B3B3B,
>+    3,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpFaceforward,
>+    true);
>+constexpr const TFunction kFunction_reflect_0B0B(
>+    BuiltInId::reflect_Float1_Float1,
>+    BuiltInName::reflect,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0B0B1B,
>+    2,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 1, 1>(),
>+    EOpReflect,
>+    true);
>+constexpr const TFunction kFunction_reflect_1B1B(
>+    BuiltInId::reflect_Float2_Float2,
>+    BuiltInName::reflect,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p1B1B0B,
>+    2,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 2, 1>(),
>+    EOpReflect,
>+    true);
>+constexpr const TFunction kFunction_reflect_2B2B(
>+    BuiltInId::reflect_Float3_Float3,
>+    BuiltInName::reflect,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p2B2B0B,
>+    2,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 3, 1>(),
>+    EOpReflect,
>+    true);
>+constexpr const TFunction kFunction_reflect_3B3B(
>+    BuiltInId::reflect_Float4_Float4,
>+    BuiltInName::reflect,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p3B3B0B,
>+    2,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpReflect,
>+    true);
>+constexpr const TFunction kFunction_refract_0B0B0B(
>+    BuiltInId::refract_Float1_Float1_Float1,
>+    BuiltInName::refract,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0B0B0B,
>+    3,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 1, 1>(),
>+    EOpRefract,
>+    true);
>+constexpr const TFunction kFunction_refract_1B1B0B(
>+    BuiltInId::refract_Float2_Float2_Float1,
>+    BuiltInName::refract,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p1B1B0B,
>+    3,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 2, 1>(),
>+    EOpRefract,
>+    true);
>+constexpr const TFunction kFunction_refract_2B2B0B(
>+    BuiltInId::refract_Float3_Float3_Float1,
>+    BuiltInName::refract,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p2B2B0B,
>+    3,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 3, 1>(),
>+    EOpRefract,
>+    true);
>+constexpr const TFunction kFunction_refract_3B3B0B(
>+    BuiltInId::refract_Float4_Float4_Float1,
>+    BuiltInName::refract,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p3B3B0B,
>+    3,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpRefract,
>+    true);
>+constexpr const TFunction kFunction_matrixCompMult_5B5B(
>+    BuiltInId::matrixCompMult_Float2x2_Float2x2,
>+    BuiltInName::matrixCompMult,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p5B5B,
>+    2,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 2, 2>(),
>+    EOpMulMatrixComponentWise,
>+    true);
>+constexpr const TFunction kFunction_matrixCompMult_ABAB(
>+    BuiltInId::matrixCompMult_Float3x3_Float3x3,
>+    BuiltInName::matrixCompMult,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::pABAB,
>+    2,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 3, 3>(),
>+    EOpMulMatrixComponentWise,
>+    true);
>+constexpr const TFunction kFunction_matrixCompMult_FBFB(
>+    BuiltInId::matrixCompMult_Float4x4_Float4x4,
>+    BuiltInName::matrixCompMult,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::pFBFB,
>+    2,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 4, 4>(),
>+    EOpMulMatrixComponentWise,
>+    true);
>+constexpr const TFunction kFunction_matrixCompMult_9B9B(
>+    BuiltInId::matrixCompMult_Float2x3_Float2x3,
>+    BuiltInName::matrixCompMult,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p9B9B,
>+    2,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 2, 3>(),
>+    EOpMulMatrixComponentWise,
>+    true);
>+constexpr const TFunction kFunction_matrixCompMult_6B6B(
>+    BuiltInId::matrixCompMult_Float3x2_Float3x2,
>+    BuiltInName::matrixCompMult,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p6B6B,
>+    2,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 3, 2>(),
>+    EOpMulMatrixComponentWise,
>+    true);
>+constexpr const TFunction kFunction_matrixCompMult_DBDB(
>+    BuiltInId::matrixCompMult_Float2x4_Float2x4,
>+    BuiltInName::matrixCompMult,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::pDBDB,
>+    2,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 2, 4>(),
>+    EOpMulMatrixComponentWise,
>+    true);
>+constexpr const TFunction kFunction_matrixCompMult_7B7B(
>+    BuiltInId::matrixCompMult_Float4x2_Float4x2,
>+    BuiltInName::matrixCompMult,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p7B7B,
>+    2,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 4, 2>(),
>+    EOpMulMatrixComponentWise,
>+    true);
>+constexpr const TFunction kFunction_matrixCompMult_EBEB(
>+    BuiltInId::matrixCompMult_Float3x4_Float3x4,
>+    BuiltInName::matrixCompMult,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::pEBEB,
>+    2,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 3, 4>(),
>+    EOpMulMatrixComponentWise,
>+    true);
>+constexpr const TFunction kFunction_matrixCompMult_BBBB(
>+    BuiltInId::matrixCompMult_Float4x3_Float4x3,
>+    BuiltInName::matrixCompMult,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::pBBBB,
>+    2,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 4, 3>(),
>+    EOpMulMatrixComponentWise,
>+    true);
>+constexpr const TFunction kFunction_outerProduct_1B1B(
>+    BuiltInId::outerProduct_Float2_Float2,
>+    BuiltInName::outerProduct,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p1B1B0B,
>+    2,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 2, 2>(),
>+    EOpOuterProduct,
>+    true);
>+constexpr const TFunction kFunction_outerProduct_2B2B(
>+    BuiltInId::outerProduct_Float3_Float3,
>+    BuiltInName::outerProduct,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p2B2B0B,
>+    2,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 3, 3>(),
>+    EOpOuterProduct,
>+    true);
>+constexpr const TFunction kFunction_outerProduct_3B3B(
>+    BuiltInId::outerProduct_Float4_Float4,
>+    BuiltInName::outerProduct,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p3B3B0B,
>+    2,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 4, 4>(),
>+    EOpOuterProduct,
>+    true);
>+constexpr const TFunction kFunction_outerProduct_2B1B(
>+    BuiltInId::outerProduct_Float3_Float2,
>+    BuiltInName::outerProduct,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p2B1B,
>+    2,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 2, 3>(),
>+    EOpOuterProduct,
>+    true);
>+constexpr const TFunction kFunction_outerProduct_1B2B(
>+    BuiltInId::outerProduct_Float2_Float3,
>+    BuiltInName::outerProduct,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p1B2B,
>+    2,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 3, 2>(),
>+    EOpOuterProduct,
>+    true);
>+constexpr const TFunction kFunction_outerProduct_3B1B(
>+    BuiltInId::outerProduct_Float4_Float2,
>+    BuiltInName::outerProduct,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p3B1B,
>+    2,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 2, 4>(),
>+    EOpOuterProduct,
>+    true);
>+constexpr const TFunction kFunction_outerProduct_1B3B(
>+    BuiltInId::outerProduct_Float2_Float4,
>+    BuiltInName::outerProduct,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p1B3B,
>+    2,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 4, 2>(),
>+    EOpOuterProduct,
>+    true);
>+constexpr const TFunction kFunction_outerProduct_3B2B(
>+    BuiltInId::outerProduct_Float4_Float3,
>+    BuiltInName::outerProduct,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p3B2B,
>+    2,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 3, 4>(),
>+    EOpOuterProduct,
>+    true);
>+constexpr const TFunction kFunction_outerProduct_2B3B(
>+    BuiltInId::outerProduct_Float3_Float4,
>+    BuiltInName::outerProduct,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p2B3B,
>+    2,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 4, 3>(),
>+    EOpOuterProduct,
>+    true);
>+constexpr const TFunction kFunction_transpose_5B(
>+    BuiltInId::transpose_Float2x2,
>+    BuiltInName::transpose,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p5B5B,
>+    1,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 2, 2>(),
>+    EOpTranspose,
>+    true);
>+constexpr const TFunction kFunction_transpose_AB(
>+    BuiltInId::transpose_Float3x3,
>+    BuiltInName::transpose,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::pABAB,
>+    1,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 3, 3>(),
>+    EOpTranspose,
>+    true);
>+constexpr const TFunction kFunction_transpose_FB(
>+    BuiltInId::transpose_Float4x4,
>+    BuiltInName::transpose,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::pFBFB,
>+    1,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 4, 4>(),
>+    EOpTranspose,
>+    true);
>+constexpr const TFunction kFunction_transpose_6B(
>+    BuiltInId::transpose_Float3x2,
>+    BuiltInName::transpose,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p6B6B,
>+    1,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 2, 3>(),
>+    EOpTranspose,
>+    true);
>+constexpr const TFunction kFunction_transpose_9B(
>+    BuiltInId::transpose_Float2x3,
>+    BuiltInName::transpose,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p9B9B,
>+    1,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 3, 2>(),
>+    EOpTranspose,
>+    true);
>+constexpr const TFunction kFunction_transpose_7B(
>+    BuiltInId::transpose_Float4x2,
>+    BuiltInName::transpose,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p7B7B,
>+    1,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 2, 4>(),
>+    EOpTranspose,
>+    true);
>+constexpr const TFunction kFunction_transpose_DB(
>+    BuiltInId::transpose_Float2x4,
>+    BuiltInName::transpose,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::pDBDB,
>+    1,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 4, 2>(),
>+    EOpTranspose,
>+    true);
>+constexpr const TFunction kFunction_transpose_BB(
>+    BuiltInId::transpose_Float4x3,
>+    BuiltInName::transpose,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::pBBBB,
>+    1,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 3, 4>(),
>+    EOpTranspose,
>+    true);
>+constexpr const TFunction kFunction_transpose_EB(
>+    BuiltInId::transpose_Float3x4,
>+    BuiltInName::transpose,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::pEBEB,
>+    1,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 4, 3>(),
>+    EOpTranspose,
>+    true);
>+constexpr const TFunction kFunction_determinant_5B(
>+    BuiltInId::determinant_Float2x2,
>+    BuiltInName::determinant,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p5B5B,
>+    1,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 1, 1>(),
>+    EOpDeterminant,
>+    true);
>+constexpr const TFunction kFunction_determinant_AB(
>+    BuiltInId::determinant_Float3x3,
>+    BuiltInName::determinant,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::pABAB,
>+    1,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 1, 1>(),
>+    EOpDeterminant,
>+    true);
>+constexpr const TFunction kFunction_determinant_FB(
>+    BuiltInId::determinant_Float4x4,
>+    BuiltInName::determinant,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::pFBFB,
>+    1,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 1, 1>(),
>+    EOpDeterminant,
>+    true);
>+constexpr const TFunction kFunction_inverse_5B(
>+    BuiltInId::inverse_Float2x2,
>+    BuiltInName::inverse,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p5B5B,
>+    1,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 2, 2>(),
>+    EOpInverse,
>+    true);
>+constexpr const TFunction kFunction_inverse_AB(
>+    BuiltInId::inverse_Float3x3,
>+    BuiltInName::inverse,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::pABAB,
>+    1,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 3, 3>(),
>+    EOpInverse,
>+    true);
>+constexpr const TFunction kFunction_inverse_FB(
>+    BuiltInId::inverse_Float4x4,
>+    BuiltInName::inverse,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::pFBFB,
>+    1,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 4, 4>(),
>+    EOpInverse,
>+    true);
>+constexpr const TFunction kFunction_lessThan_1B1B(
>+    BuiltInId::lessThan_Float2_Float2,
>+    BuiltInName::lessThan,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p1B1B0B,
>+    2,
>+    StaticType::Get<EbtBool, EbpUndefined, EvqGlobal, 2, 1>(),
>+    EOpLessThanComponentWise,
>+    true);
>+constexpr const TFunction kFunction_lessThan_2B2B(
>+    BuiltInId::lessThan_Float3_Float3,
>+    BuiltInName::lessThan,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p2B2B0B,
>+    2,
>+    StaticType::Get<EbtBool, EbpUndefined, EvqGlobal, 3, 1>(),
>+    EOpLessThanComponentWise,
>+    true);
>+constexpr const TFunction kFunction_lessThan_3B3B(
>+    BuiltInId::lessThan_Float4_Float4,
>+    BuiltInName::lessThan,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p3B3B0B,
>+    2,
>+    StaticType::Get<EbtBool, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpLessThanComponentWise,
>+    true);
>+constexpr const TFunction kFunction_lessThan_1C1C(
>+    BuiltInId::lessThan_Int2_Int2,
>+    BuiltInName::lessThan,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p1C1C_o_1C_o_1C,
>+    2,
>+    StaticType::Get<EbtBool, EbpUndefined, EvqGlobal, 2, 1>(),
>+    EOpLessThanComponentWise,
>+    true);
>+constexpr const TFunction kFunction_lessThan_2C2C(
>+    BuiltInId::lessThan_Int3_Int3,
>+    BuiltInName::lessThan,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p2C2C0C0C,
>+    2,
>+    StaticType::Get<EbtBool, EbpUndefined, EvqGlobal, 3, 1>(),
>+    EOpLessThanComponentWise,
>+    true);
>+constexpr const TFunction kFunction_lessThan_3C3C(
>+    BuiltInId::lessThan_Int4_Int4,
>+    BuiltInName::lessThan,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p3C3C3C,
>+    2,
>+    StaticType::Get<EbtBool, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpLessThanComponentWise,
>+    true);
>+constexpr const TFunction kFunction_lessThan_1D1D(
>+    BuiltInId::lessThan_UInt2_UInt2,
>+    BuiltInName::lessThan,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p1D1D0C0C,
>+    2,
>+    StaticType::Get<EbtBool, EbpUndefined, EvqGlobal, 2, 1>(),
>+    EOpLessThanComponentWise,
>+    true);
>+constexpr const TFunction kFunction_lessThan_2D2D(
>+    BuiltInId::lessThan_UInt3_UInt3,
>+    BuiltInName::lessThan,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p2D2D0C0C,
>+    2,
>+    StaticType::Get<EbtBool, EbpUndefined, EvqGlobal, 3, 1>(),
>+    EOpLessThanComponentWise,
>+    true);
>+constexpr const TFunction kFunction_lessThan_3D3D(
>+    BuiltInId::lessThan_UInt4_UInt4,
>+    BuiltInName::lessThan,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p3D3D0C0C,
>+    2,
>+    StaticType::Get<EbtBool, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpLessThanComponentWise,
>+    true);
>+constexpr const TFunction kFunction_lessThanEqual_1B1B(
>+    BuiltInId::lessThanEqual_Float2_Float2,
>+    BuiltInName::lessThanEqual,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p1B1B0B,
>+    2,
>+    StaticType::Get<EbtBool, EbpUndefined, EvqGlobal, 2, 1>(),
>+    EOpLessThanEqualComponentWise,
>+    true);
>+constexpr const TFunction kFunction_lessThanEqual_2B2B(
>+    BuiltInId::lessThanEqual_Float3_Float3,
>+    BuiltInName::lessThanEqual,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p2B2B0B,
>+    2,
>+    StaticType::Get<EbtBool, EbpUndefined, EvqGlobal, 3, 1>(),
>+    EOpLessThanEqualComponentWise,
>+    true);
>+constexpr const TFunction kFunction_lessThanEqual_3B3B(
>+    BuiltInId::lessThanEqual_Float4_Float4,
>+    BuiltInName::lessThanEqual,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p3B3B0B,
>+    2,
>+    StaticType::Get<EbtBool, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpLessThanEqualComponentWise,
>+    true);
>+constexpr const TFunction kFunction_lessThanEqual_1C1C(
>+    BuiltInId::lessThanEqual_Int2_Int2,
>+    BuiltInName::lessThanEqual,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p1C1C_o_1C_o_1C,
>+    2,
>+    StaticType::Get<EbtBool, EbpUndefined, EvqGlobal, 2, 1>(),
>+    EOpLessThanEqualComponentWise,
>+    true);
>+constexpr const TFunction kFunction_lessThanEqual_2C2C(
>+    BuiltInId::lessThanEqual_Int3_Int3,
>+    BuiltInName::lessThanEqual,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p2C2C0C0C,
>+    2,
>+    StaticType::Get<EbtBool, EbpUndefined, EvqGlobal, 3, 1>(),
>+    EOpLessThanEqualComponentWise,
>+    true);
>+constexpr const TFunction kFunction_lessThanEqual_3C3C(
>+    BuiltInId::lessThanEqual_Int4_Int4,
>+    BuiltInName::lessThanEqual,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p3C3C3C,
>+    2,
>+    StaticType::Get<EbtBool, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpLessThanEqualComponentWise,
>+    true);
>+constexpr const TFunction kFunction_lessThanEqual_1D1D(
>+    BuiltInId::lessThanEqual_UInt2_UInt2,
>+    BuiltInName::lessThanEqual,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p1D1D0C0C,
>+    2,
>+    StaticType::Get<EbtBool, EbpUndefined, EvqGlobal, 2, 1>(),
>+    EOpLessThanEqualComponentWise,
>+    true);
>+constexpr const TFunction kFunction_lessThanEqual_2D2D(
>+    BuiltInId::lessThanEqual_UInt3_UInt3,
>+    BuiltInName::lessThanEqual,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p2D2D0C0C,
>+    2,
>+    StaticType::Get<EbtBool, EbpUndefined, EvqGlobal, 3, 1>(),
>+    EOpLessThanEqualComponentWise,
>+    true);
>+constexpr const TFunction kFunction_lessThanEqual_3D3D(
>+    BuiltInId::lessThanEqual_UInt4_UInt4,
>+    BuiltInName::lessThanEqual,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p3D3D0C0C,
>+    2,
>+    StaticType::Get<EbtBool, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpLessThanEqualComponentWise,
>+    true);
>+constexpr const TFunction kFunction_greaterThan_1B1B(
>+    BuiltInId::greaterThan_Float2_Float2,
>+    BuiltInName::greaterThan,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p1B1B0B,
>+    2,
>+    StaticType::Get<EbtBool, EbpUndefined, EvqGlobal, 2, 1>(),
>+    EOpGreaterThanComponentWise,
>+    true);
>+constexpr const TFunction kFunction_greaterThan_2B2B(
>+    BuiltInId::greaterThan_Float3_Float3,
>+    BuiltInName::greaterThan,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p2B2B0B,
>+    2,
>+    StaticType::Get<EbtBool, EbpUndefined, EvqGlobal, 3, 1>(),
>+    EOpGreaterThanComponentWise,
>+    true);
>+constexpr const TFunction kFunction_greaterThan_3B3B(
>+    BuiltInId::greaterThan_Float4_Float4,
>+    BuiltInName::greaterThan,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p3B3B0B,
>+    2,
>+    StaticType::Get<EbtBool, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpGreaterThanComponentWise,
>+    true);
>+constexpr const TFunction kFunction_greaterThan_1C1C(
>+    BuiltInId::greaterThan_Int2_Int2,
>+    BuiltInName::greaterThan,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p1C1C_o_1C_o_1C,
>+    2,
>+    StaticType::Get<EbtBool, EbpUndefined, EvqGlobal, 2, 1>(),
>+    EOpGreaterThanComponentWise,
>+    true);
>+constexpr const TFunction kFunction_greaterThan_2C2C(
>+    BuiltInId::greaterThan_Int3_Int3,
>+    BuiltInName::greaterThan,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p2C2C0C0C,
>+    2,
>+    StaticType::Get<EbtBool, EbpUndefined, EvqGlobal, 3, 1>(),
>+    EOpGreaterThanComponentWise,
>+    true);
>+constexpr const TFunction kFunction_greaterThan_3C3C(
>+    BuiltInId::greaterThan_Int4_Int4,
>+    BuiltInName::greaterThan,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p3C3C3C,
>+    2,
>+    StaticType::Get<EbtBool, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpGreaterThanComponentWise,
>+    true);
>+constexpr const TFunction kFunction_greaterThan_1D1D(
>+    BuiltInId::greaterThan_UInt2_UInt2,
>+    BuiltInName::greaterThan,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p1D1D0C0C,
>+    2,
>+    StaticType::Get<EbtBool, EbpUndefined, EvqGlobal, 2, 1>(),
>+    EOpGreaterThanComponentWise,
>+    true);
>+constexpr const TFunction kFunction_greaterThan_2D2D(
>+    BuiltInId::greaterThan_UInt3_UInt3,
>+    BuiltInName::greaterThan,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p2D2D0C0C,
>+    2,
>+    StaticType::Get<EbtBool, EbpUndefined, EvqGlobal, 3, 1>(),
>+    EOpGreaterThanComponentWise,
>+    true);
>+constexpr const TFunction kFunction_greaterThan_3D3D(
>+    BuiltInId::greaterThan_UInt4_UInt4,
>+    BuiltInName::greaterThan,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p3D3D0C0C,
>+    2,
>+    StaticType::Get<EbtBool, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpGreaterThanComponentWise,
>+    true);
>+constexpr const TFunction kFunction_greaterThanEqual_1B1B(
>+    BuiltInId::greaterThanEqual_Float2_Float2,
>+    BuiltInName::greaterThanEqual,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p1B1B0B,
>+    2,
>+    StaticType::Get<EbtBool, EbpUndefined, EvqGlobal, 2, 1>(),
>+    EOpGreaterThanEqualComponentWise,
>+    true);
>+constexpr const TFunction kFunction_greaterThanEqual_2B2B(
>+    BuiltInId::greaterThanEqual_Float3_Float3,
>+    BuiltInName::greaterThanEqual,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p2B2B0B,
>+    2,
>+    StaticType::Get<EbtBool, EbpUndefined, EvqGlobal, 3, 1>(),
>+    EOpGreaterThanEqualComponentWise,
>+    true);
>+constexpr const TFunction kFunction_greaterThanEqual_3B3B(
>+    BuiltInId::greaterThanEqual_Float4_Float4,
>+    BuiltInName::greaterThanEqual,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p3B3B0B,
>+    2,
>+    StaticType::Get<EbtBool, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpGreaterThanEqualComponentWise,
>+    true);
>+constexpr const TFunction kFunction_greaterThanEqual_1C1C(
>+    BuiltInId::greaterThanEqual_Int2_Int2,
>+    BuiltInName::greaterThanEqual,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p1C1C_o_1C_o_1C,
>+    2,
>+    StaticType::Get<EbtBool, EbpUndefined, EvqGlobal, 2, 1>(),
>+    EOpGreaterThanEqualComponentWise,
>+    true);
>+constexpr const TFunction kFunction_greaterThanEqual_2C2C(
>+    BuiltInId::greaterThanEqual_Int3_Int3,
>+    BuiltInName::greaterThanEqual,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p2C2C0C0C,
>+    2,
>+    StaticType::Get<EbtBool, EbpUndefined, EvqGlobal, 3, 1>(),
>+    EOpGreaterThanEqualComponentWise,
>+    true);
>+constexpr const TFunction kFunction_greaterThanEqual_3C3C(
>+    BuiltInId::greaterThanEqual_Int4_Int4,
>+    BuiltInName::greaterThanEqual,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p3C3C3C,
>+    2,
>+    StaticType::Get<EbtBool, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpGreaterThanEqualComponentWise,
>+    true);
>+constexpr const TFunction kFunction_greaterThanEqual_1D1D(
>+    BuiltInId::greaterThanEqual_UInt2_UInt2,
>+    BuiltInName::greaterThanEqual,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p1D1D0C0C,
>+    2,
>+    StaticType::Get<EbtBool, EbpUndefined, EvqGlobal, 2, 1>(),
>+    EOpGreaterThanEqualComponentWise,
>+    true);
>+constexpr const TFunction kFunction_greaterThanEqual_2D2D(
>+    BuiltInId::greaterThanEqual_UInt3_UInt3,
>+    BuiltInName::greaterThanEqual,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p2D2D0C0C,
>+    2,
>+    StaticType::Get<EbtBool, EbpUndefined, EvqGlobal, 3, 1>(),
>+    EOpGreaterThanEqualComponentWise,
>+    true);
>+constexpr const TFunction kFunction_greaterThanEqual_3D3D(
>+    BuiltInId::greaterThanEqual_UInt4_UInt4,
>+    BuiltInName::greaterThanEqual,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p3D3D0C0C,
>+    2,
>+    StaticType::Get<EbtBool, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpGreaterThanEqualComponentWise,
>+    true);
>+constexpr const TFunction kFunction_equal_1B1B(
>+    BuiltInId::equal_Float2_Float2,
>+    BuiltInName::equal,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p1B1B0B,
>+    2,
>+    StaticType::Get<EbtBool, EbpUndefined, EvqGlobal, 2, 1>(),
>+    EOpEqualComponentWise,
>+    true);
>+constexpr const TFunction kFunction_equal_2B2B(
>+    BuiltInId::equal_Float3_Float3,
>+    BuiltInName::equal,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p2B2B0B,
>+    2,
>+    StaticType::Get<EbtBool, EbpUndefined, EvqGlobal, 3, 1>(),
>+    EOpEqualComponentWise,
>+    true);
>+constexpr const TFunction kFunction_equal_3B3B(
>+    BuiltInId::equal_Float4_Float4,
>+    BuiltInName::equal,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p3B3B0B,
>+    2,
>+    StaticType::Get<EbtBool, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpEqualComponentWise,
>+    true);
>+constexpr const TFunction kFunction_equal_1C1C(
>+    BuiltInId::equal_Int2_Int2,
>+    BuiltInName::equal,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p1C1C_o_1C_o_1C,
>+    2,
>+    StaticType::Get<EbtBool, EbpUndefined, EvqGlobal, 2, 1>(),
>+    EOpEqualComponentWise,
>+    true);
>+constexpr const TFunction kFunction_equal_2C2C(
>+    BuiltInId::equal_Int3_Int3,
>+    BuiltInName::equal,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p2C2C0C0C,
>+    2,
>+    StaticType::Get<EbtBool, EbpUndefined, EvqGlobal, 3, 1>(),
>+    EOpEqualComponentWise,
>+    true);
>+constexpr const TFunction kFunction_equal_3C3C(
>+    BuiltInId::equal_Int4_Int4,
>+    BuiltInName::equal,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p3C3C3C,
>+    2,
>+    StaticType::Get<EbtBool, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpEqualComponentWise,
>+    true);
>+constexpr const TFunction kFunction_equal_1D1D(
>+    BuiltInId::equal_UInt2_UInt2,
>+    BuiltInName::equal,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p1D1D0C0C,
>+    2,
>+    StaticType::Get<EbtBool, EbpUndefined, EvqGlobal, 2, 1>(),
>+    EOpEqualComponentWise,
>+    true);
>+constexpr const TFunction kFunction_equal_2D2D(
>+    BuiltInId::equal_UInt3_UInt3,
>+    BuiltInName::equal,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p2D2D0C0C,
>+    2,
>+    StaticType::Get<EbtBool, EbpUndefined, EvqGlobal, 3, 1>(),
>+    EOpEqualComponentWise,
>+    true);
>+constexpr const TFunction kFunction_equal_3D3D(
>+    BuiltInId::equal_UInt4_UInt4,
>+    BuiltInName::equal,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p3D3D0C0C,
>+    2,
>+    StaticType::Get<EbtBool, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpEqualComponentWise,
>+    true);
>+constexpr const TFunction kFunction_equal_1E1E(
>+    BuiltInId::equal_Bool2_Bool2,
>+    BuiltInName::equal,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p1E1E,
>+    2,
>+    StaticType::Get<EbtBool, EbpUndefined, EvqGlobal, 2, 1>(),
>+    EOpEqualComponentWise,
>+    true);
>+constexpr const TFunction kFunction_equal_2E2E(
>+    BuiltInId::equal_Bool3_Bool3,
>+    BuiltInName::equal,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p2E2E,
>+    2,
>+    StaticType::Get<EbtBool, EbpUndefined, EvqGlobal, 3, 1>(),
>+    EOpEqualComponentWise,
>+    true);
>+constexpr const TFunction kFunction_equal_3E3E(
>+    BuiltInId::equal_Bool4_Bool4,
>+    BuiltInName::equal,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p3E3E,
>+    2,
>+    StaticType::Get<EbtBool, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpEqualComponentWise,
>+    true);
>+constexpr const TFunction kFunction_notEqual_1B1B(
>+    BuiltInId::notEqual_Float2_Float2,
>+    BuiltInName::notEqual,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p1B1B0B,
>+    2,
>+    StaticType::Get<EbtBool, EbpUndefined, EvqGlobal, 2, 1>(),
>+    EOpNotEqualComponentWise,
>+    true);
>+constexpr const TFunction kFunction_notEqual_2B2B(
>+    BuiltInId::notEqual_Float3_Float3,
>+    BuiltInName::notEqual,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p2B2B0B,
>+    2,
>+    StaticType::Get<EbtBool, EbpUndefined, EvqGlobal, 3, 1>(),
>+    EOpNotEqualComponentWise,
>+    true);
>+constexpr const TFunction kFunction_notEqual_3B3B(
>+    BuiltInId::notEqual_Float4_Float4,
>+    BuiltInName::notEqual,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p3B3B0B,
>+    2,
>+    StaticType::Get<EbtBool, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpNotEqualComponentWise,
>+    true);
>+constexpr const TFunction kFunction_notEqual_1C1C(
>+    BuiltInId::notEqual_Int2_Int2,
>+    BuiltInName::notEqual,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p1C1C_o_1C_o_1C,
>+    2,
>+    StaticType::Get<EbtBool, EbpUndefined, EvqGlobal, 2, 1>(),
>+    EOpNotEqualComponentWise,
>+    true);
>+constexpr const TFunction kFunction_notEqual_2C2C(
>+    BuiltInId::notEqual_Int3_Int3,
>+    BuiltInName::notEqual,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p2C2C0C0C,
>+    2,
>+    StaticType::Get<EbtBool, EbpUndefined, EvqGlobal, 3, 1>(),
>+    EOpNotEqualComponentWise,
>+    true);
>+constexpr const TFunction kFunction_notEqual_3C3C(
>+    BuiltInId::notEqual_Int4_Int4,
>+    BuiltInName::notEqual,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p3C3C3C,
>+    2,
>+    StaticType::Get<EbtBool, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpNotEqualComponentWise,
>+    true);
>+constexpr const TFunction kFunction_notEqual_1D1D(
>+    BuiltInId::notEqual_UInt2_UInt2,
>+    BuiltInName::notEqual,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p1D1D0C0C,
>+    2,
>+    StaticType::Get<EbtBool, EbpUndefined, EvqGlobal, 2, 1>(),
>+    EOpNotEqualComponentWise,
>+    true);
>+constexpr const TFunction kFunction_notEqual_2D2D(
>+    BuiltInId::notEqual_UInt3_UInt3,
>+    BuiltInName::notEqual,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p2D2D0C0C,
>+    2,
>+    StaticType::Get<EbtBool, EbpUndefined, EvqGlobal, 3, 1>(),
>+    EOpNotEqualComponentWise,
>+    true);
>+constexpr const TFunction kFunction_notEqual_3D3D(
>+    BuiltInId::notEqual_UInt4_UInt4,
>+    BuiltInName::notEqual,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p3D3D0C0C,
>+    2,
>+    StaticType::Get<EbtBool, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpNotEqualComponentWise,
>+    true);
>+constexpr const TFunction kFunction_notEqual_1E1E(
>+    BuiltInId::notEqual_Bool2_Bool2,
>+    BuiltInName::notEqual,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p1E1E,
>+    2,
>+    StaticType::Get<EbtBool, EbpUndefined, EvqGlobal, 2, 1>(),
>+    EOpNotEqualComponentWise,
>+    true);
>+constexpr const TFunction kFunction_notEqual_2E2E(
>+    BuiltInId::notEqual_Bool3_Bool3,
>+    BuiltInName::notEqual,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p2E2E,
>+    2,
>+    StaticType::Get<EbtBool, EbpUndefined, EvqGlobal, 3, 1>(),
>+    EOpNotEqualComponentWise,
>+    true);
>+constexpr const TFunction kFunction_notEqual_3E3E(
>+    BuiltInId::notEqual_Bool4_Bool4,
>+    BuiltInName::notEqual,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p3E3E,
>+    2,
>+    StaticType::Get<EbtBool, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpNotEqualComponentWise,
>+    true);
>+constexpr const TFunction kFunction_any_1E(
>+    BuiltInId::any_Bool2,
>+    BuiltInName::any,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p1E1E,
>+    1,
>+    StaticType::Get<EbtBool, EbpUndefined, EvqGlobal, 1, 1>(),
>+    EOpAny,
>+    true);
>+constexpr const TFunction kFunction_any_2E(
>+    BuiltInId::any_Bool3,
>+    BuiltInName::any,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p2E2E,
>+    1,
>+    StaticType::Get<EbtBool, EbpUndefined, EvqGlobal, 1, 1>(),
>+    EOpAny,
>+    true);
>+constexpr const TFunction kFunction_any_3E(
>+    BuiltInId::any_Bool4,
>+    BuiltInName::any,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p3E3E,
>+    1,
>+    StaticType::Get<EbtBool, EbpUndefined, EvqGlobal, 1, 1>(),
>+    EOpAny,
>+    true);
>+constexpr const TFunction kFunction_all_1E(
>+    BuiltInId::all_Bool2,
>+    BuiltInName::all,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p1E1E,
>+    1,
>+    StaticType::Get<EbtBool, EbpUndefined, EvqGlobal, 1, 1>(),
>+    EOpAll,
>+    true);
>+constexpr const TFunction kFunction_all_2E(
>+    BuiltInId::all_Bool3,
>+    BuiltInName::all,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p2E2E,
>+    1,
>+    StaticType::Get<EbtBool, EbpUndefined, EvqGlobal, 1, 1>(),
>+    EOpAll,
>+    true);
>+constexpr const TFunction kFunction_all_3E(
>+    BuiltInId::all_Bool4,
>+    BuiltInName::all,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p3E3E,
>+    1,
>+    StaticType::Get<EbtBool, EbpUndefined, EvqGlobal, 1, 1>(),
>+    EOpAll,
>+    true);
>+constexpr const TFunction kFunction_notFunc_1E(
>+    BuiltInId::notFunc_Bool2,
>+    BuiltInName::notFunc,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p1E1E,
>+    1,
>+    StaticType::Get<EbtBool, EbpUndefined, EvqGlobal, 2, 1>(),
>+    EOpLogicalNotComponentWise,
>+    true);
>+constexpr const TFunction kFunction_notFunc_2E(
>+    BuiltInId::notFunc_Bool3,
>+    BuiltInName::notFunc,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p2E2E,
>+    1,
>+    StaticType::Get<EbtBool, EbpUndefined, EvqGlobal, 3, 1>(),
>+    EOpLogicalNotComponentWise,
>+    true);
>+constexpr const TFunction kFunction_notFunc_3E(
>+    BuiltInId::notFunc_Bool4,
>+    BuiltInName::notFunc,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p3E3E,
>+    1,
>+    StaticType::Get<EbtBool, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpLogicalNotComponentWise,
>+    true);
>+constexpr const TFunction kFunction_bitfieldExtract_0C0C0C(
>+    BuiltInId::bitfieldExtract_Int1_Int1_Int1,
>+    BuiltInName::bitfieldExtract,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0C0C0C0C,
>+    3,
>+    StaticType::Get<EbtInt, EbpUndefined, EvqGlobal, 1, 1>(),
>+    EOpBitfieldExtract,
>+    true);
>+constexpr const TFunction kFunction_bitfieldExtract_1C0C0C(
>+    BuiltInId::bitfieldExtract_Int2_Int1_Int1,
>+    BuiltInName::bitfieldExtract,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p1C0C0C,
>+    3,
>+    StaticType::Get<EbtInt, EbpUndefined, EvqGlobal, 2, 1>(),
>+    EOpBitfieldExtract,
>+    true);
>+constexpr const TFunction kFunction_bitfieldExtract_2C0C0C(
>+    BuiltInId::bitfieldExtract_Int3_Int1_Int1,
>+    BuiltInName::bitfieldExtract,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p2C0C0C,
>+    3,
>+    StaticType::Get<EbtInt, EbpUndefined, EvqGlobal, 3, 1>(),
>+    EOpBitfieldExtract,
>+    true);
>+constexpr const TFunction kFunction_bitfieldExtract_3C0C0C(
>+    BuiltInId::bitfieldExtract_Int4_Int1_Int1,
>+    BuiltInName::bitfieldExtract,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p3C0C0C,
>+    3,
>+    StaticType::Get<EbtInt, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpBitfieldExtract,
>+    true);
>+constexpr const TFunction kFunction_bitfieldExtract_0D0C0C(
>+    BuiltInId::bitfieldExtract_UInt1_Int1_Int1,
>+    BuiltInName::bitfieldExtract,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0D0C0C,
>+    3,
>+    StaticType::Get<EbtUInt, EbpUndefined, EvqGlobal, 1, 1>(),
>+    EOpBitfieldExtract,
>+    true);
>+constexpr const TFunction kFunction_bitfieldExtract_1D0C0C(
>+    BuiltInId::bitfieldExtract_UInt2_Int1_Int1,
>+    BuiltInName::bitfieldExtract,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p1D0C0C,
>+    3,
>+    StaticType::Get<EbtUInt, EbpUndefined, EvqGlobal, 2, 1>(),
>+    EOpBitfieldExtract,
>+    true);
>+constexpr const TFunction kFunction_bitfieldExtract_2D0C0C(
>+    BuiltInId::bitfieldExtract_UInt3_Int1_Int1,
>+    BuiltInName::bitfieldExtract,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p2D0C0C,
>+    3,
>+    StaticType::Get<EbtUInt, EbpUndefined, EvqGlobal, 3, 1>(),
>+    EOpBitfieldExtract,
>+    true);
>+constexpr const TFunction kFunction_bitfieldExtract_3D0C0C(
>+    BuiltInId::bitfieldExtract_UInt4_Int1_Int1,
>+    BuiltInName::bitfieldExtract,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p3D0C0C,
>+    3,
>+    StaticType::Get<EbtUInt, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpBitfieldExtract,
>+    true);
>+constexpr const TFunction kFunction_bitfieldInsert_0C0C0C0C(
>+    BuiltInId::bitfieldInsert_Int1_Int1_Int1_Int1,
>+    BuiltInName::bitfieldInsert,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0C0C0C0C,
>+    4,
>+    StaticType::Get<EbtInt, EbpUndefined, EvqGlobal, 1, 1>(),
>+    EOpBitfieldInsert,
>+    true);
>+constexpr const TFunction kFunction_bitfieldInsert_1C1C0C0C(
>+    BuiltInId::bitfieldInsert_Int2_Int2_Int1_Int1,
>+    BuiltInName::bitfieldInsert,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p1C1C0C0C,
>+    4,
>+    StaticType::Get<EbtInt, EbpUndefined, EvqGlobal, 2, 1>(),
>+    EOpBitfieldInsert,
>+    true);
>+constexpr const TFunction kFunction_bitfieldInsert_2C2C0C0C(
>+    BuiltInId::bitfieldInsert_Int3_Int3_Int1_Int1,
>+    BuiltInName::bitfieldInsert,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p2C2C0C0C,
>+    4,
>+    StaticType::Get<EbtInt, EbpUndefined, EvqGlobal, 3, 1>(),
>+    EOpBitfieldInsert,
>+    true);
>+constexpr const TFunction kFunction_bitfieldInsert_3C3C0C0C(
>+    BuiltInId::bitfieldInsert_Int4_Int4_Int1_Int1,
>+    BuiltInName::bitfieldInsert,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p3C3C0C0C,
>+    4,
>+    StaticType::Get<EbtInt, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpBitfieldInsert,
>+    true);
>+constexpr const TFunction kFunction_bitfieldInsert_0D0D0C0C(
>+    BuiltInId::bitfieldInsert_UInt1_UInt1_Int1_Int1,
>+    BuiltInName::bitfieldInsert,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0D0D0C0C,
>+    4,
>+    StaticType::Get<EbtUInt, EbpUndefined, EvqGlobal, 1, 1>(),
>+    EOpBitfieldInsert,
>+    true);
>+constexpr const TFunction kFunction_bitfieldInsert_1D1D0C0C(
>+    BuiltInId::bitfieldInsert_UInt2_UInt2_Int1_Int1,
>+    BuiltInName::bitfieldInsert,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p1D1D0C0C,
>+    4,
>+    StaticType::Get<EbtUInt, EbpUndefined, EvqGlobal, 2, 1>(),
>+    EOpBitfieldInsert,
>+    true);
>+constexpr const TFunction kFunction_bitfieldInsert_2D2D0C0C(
>+    BuiltInId::bitfieldInsert_UInt3_UInt3_Int1_Int1,
>+    BuiltInName::bitfieldInsert,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p2D2D0C0C,
>+    4,
>+    StaticType::Get<EbtUInt, EbpUndefined, EvqGlobal, 3, 1>(),
>+    EOpBitfieldInsert,
>+    true);
>+constexpr const TFunction kFunction_bitfieldInsert_3D3D0C0C(
>+    BuiltInId::bitfieldInsert_UInt4_UInt4_Int1_Int1,
>+    BuiltInName::bitfieldInsert,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p3D3D0C0C,
>+    4,
>+    StaticType::Get<EbtUInt, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpBitfieldInsert,
>+    true);
>+constexpr const TFunction kFunction_bitfieldReverse_0C(
>+    BuiltInId::bitfieldReverse_Int1,
>+    BuiltInName::bitfieldReverse,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0C0C_o_0C_o_0C,
>+    1,
>+    StaticType::Get<EbtInt, EbpUndefined, EvqGlobal, 1, 1>(),
>+    EOpBitfieldReverse,
>+    true);
>+constexpr const TFunction kFunction_bitfieldReverse_1C(
>+    BuiltInId::bitfieldReverse_Int2,
>+    BuiltInName::bitfieldReverse,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p1C1C_o_1C_o_1C,
>+    1,
>+    StaticType::Get<EbtInt, EbpUndefined, EvqGlobal, 2, 1>(),
>+    EOpBitfieldReverse,
>+    true);
>+constexpr const TFunction kFunction_bitfieldReverse_2C(
>+    BuiltInId::bitfieldReverse_Int3,
>+    BuiltInName::bitfieldReverse,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p2C2C0C0C,
>+    1,
>+    StaticType::Get<EbtInt, EbpUndefined, EvqGlobal, 3, 1>(),
>+    EOpBitfieldReverse,
>+    true);
>+constexpr const TFunction kFunction_bitfieldReverse_3C(
>+    BuiltInId::bitfieldReverse_Int4,
>+    BuiltInName::bitfieldReverse,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p3C0C0C,
>+    1,
>+    StaticType::Get<EbtInt, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpBitfieldReverse,
>+    true);
>+constexpr const TFunction kFunction_bitfieldReverse_0D(
>+    BuiltInId::bitfieldReverse_UInt1,
>+    BuiltInName::bitfieldReverse,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0D0C0C,
>+    1,
>+    StaticType::Get<EbtUInt, EbpUndefined, EvqGlobal, 1, 1>(),
>+    EOpBitfieldReverse,
>+    true);
>+constexpr const TFunction kFunction_bitfieldReverse_1D(
>+    BuiltInId::bitfieldReverse_UInt2,
>+    BuiltInName::bitfieldReverse,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p1D0C0C,
>+    1,
>+    StaticType::Get<EbtUInt, EbpUndefined, EvqGlobal, 2, 1>(),
>+    EOpBitfieldReverse,
>+    true);
>+constexpr const TFunction kFunction_bitfieldReverse_2D(
>+    BuiltInId::bitfieldReverse_UInt3,
>+    BuiltInName::bitfieldReverse,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p2D2D0C0C,
>+    1,
>+    StaticType::Get<EbtUInt, EbpUndefined, EvqGlobal, 3, 1>(),
>+    EOpBitfieldReverse,
>+    true);
>+constexpr const TFunction kFunction_bitfieldReverse_3D(
>+    BuiltInId::bitfieldReverse_UInt4,
>+    BuiltInName::bitfieldReverse,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p3D0C0C,
>+    1,
>+    StaticType::Get<EbtUInt, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpBitfieldReverse,
>+    true);
>+constexpr const TFunction kFunction_bitCount_0C(
>+    BuiltInId::bitCount_Int1,
>+    BuiltInName::bitCount,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0C0C_o_0C_o_0C,
>+    1,
>+    StaticType::Get<EbtInt, EbpUndefined, EvqGlobal, 1, 1>(),
>+    EOpBitCount,
>+    true);
>+constexpr const TFunction kFunction_bitCount_1C(
>+    BuiltInId::bitCount_Int2,
>+    BuiltInName::bitCount,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p1C1C_o_1C_o_1C,
>+    1,
>+    StaticType::Get<EbtInt, EbpUndefined, EvqGlobal, 2, 1>(),
>+    EOpBitCount,
>+    true);
>+constexpr const TFunction kFunction_bitCount_2C(
>+    BuiltInId::bitCount_Int3,
>+    BuiltInName::bitCount,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p2C2C0C0C,
>+    1,
>+    StaticType::Get<EbtInt, EbpUndefined, EvqGlobal, 3, 1>(),
>+    EOpBitCount,
>+    true);
>+constexpr const TFunction kFunction_bitCount_3C(
>+    BuiltInId::bitCount_Int4,
>+    BuiltInName::bitCount,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p3C0C0C,
>+    1,
>+    StaticType::Get<EbtInt, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpBitCount,
>+    true);
>+constexpr const TFunction kFunction_bitCount_0D(
>+    BuiltInId::bitCount_UInt1,
>+    BuiltInName::bitCount,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0D0C0C,
>+    1,
>+    StaticType::Get<EbtInt, EbpUndefined, EvqGlobal, 1, 1>(),
>+    EOpBitCount,
>+    true);
>+constexpr const TFunction kFunction_bitCount_1D(
>+    BuiltInId::bitCount_UInt2,
>+    BuiltInName::bitCount,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p1D0C0C,
>+    1,
>+    StaticType::Get<EbtInt, EbpUndefined, EvqGlobal, 2, 1>(),
>+    EOpBitCount,
>+    true);
>+constexpr const TFunction kFunction_bitCount_2D(
>+    BuiltInId::bitCount_UInt3,
>+    BuiltInName::bitCount,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p2D2D0C0C,
>+    1,
>+    StaticType::Get<EbtInt, EbpUndefined, EvqGlobal, 3, 1>(),
>+    EOpBitCount,
>+    true);
>+constexpr const TFunction kFunction_bitCount_3D(
>+    BuiltInId::bitCount_UInt4,
>+    BuiltInName::bitCount,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p3D0C0C,
>+    1,
>+    StaticType::Get<EbtInt, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpBitCount,
>+    true);
>+constexpr const TFunction kFunction_findLSB_0C(
>+    BuiltInId::findLSB_Int1,
>+    BuiltInName::findLSB,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0C0C_o_0C_o_0C,
>+    1,
>+    StaticType::Get<EbtInt, EbpUndefined, EvqGlobal, 1, 1>(),
>+    EOpFindLSB,
>+    true);
>+constexpr const TFunction kFunction_findLSB_1C(
>+    BuiltInId::findLSB_Int2,
>+    BuiltInName::findLSB,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p1C1C_o_1C_o_1C,
>+    1,
>+    StaticType::Get<EbtInt, EbpUndefined, EvqGlobal, 2, 1>(),
>+    EOpFindLSB,
>+    true);
>+constexpr const TFunction kFunction_findLSB_2C(
>+    BuiltInId::findLSB_Int3,
>+    BuiltInName::findLSB,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p2C2C0C0C,
>+    1,
>+    StaticType::Get<EbtInt, EbpUndefined, EvqGlobal, 3, 1>(),
>+    EOpFindLSB,
>+    true);
>+constexpr const TFunction kFunction_findLSB_3C(
>+    BuiltInId::findLSB_Int4,
>+    BuiltInName::findLSB,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p3C0C0C,
>+    1,
>+    StaticType::Get<EbtInt, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpFindLSB,
>+    true);
>+constexpr const TFunction kFunction_findLSB_0D(
>+    BuiltInId::findLSB_UInt1,
>+    BuiltInName::findLSB,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0D0C0C,
>+    1,
>+    StaticType::Get<EbtInt, EbpUndefined, EvqGlobal, 1, 1>(),
>+    EOpFindLSB,
>+    true);
>+constexpr const TFunction kFunction_findLSB_1D(
>+    BuiltInId::findLSB_UInt2,
>+    BuiltInName::findLSB,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p1D0C0C,
>+    1,
>+    StaticType::Get<EbtInt, EbpUndefined, EvqGlobal, 2, 1>(),
>+    EOpFindLSB,
>+    true);
>+constexpr const TFunction kFunction_findLSB_2D(
>+    BuiltInId::findLSB_UInt3,
>+    BuiltInName::findLSB,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p2D2D0C0C,
>+    1,
>+    StaticType::Get<EbtInt, EbpUndefined, EvqGlobal, 3, 1>(),
>+    EOpFindLSB,
>+    true);
>+constexpr const TFunction kFunction_findLSB_3D(
>+    BuiltInId::findLSB_UInt4,
>+    BuiltInName::findLSB,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p3D0C0C,
>+    1,
>+    StaticType::Get<EbtInt, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpFindLSB,
>+    true);
>+constexpr const TFunction kFunction_findMSB_0C(
>+    BuiltInId::findMSB_Int1,
>+    BuiltInName::findMSB,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0C0C_o_0C_o_0C,
>+    1,
>+    StaticType::Get<EbtInt, EbpUndefined, EvqGlobal, 1, 1>(),
>+    EOpFindMSB,
>+    true);
>+constexpr const TFunction kFunction_findMSB_1C(
>+    BuiltInId::findMSB_Int2,
>+    BuiltInName::findMSB,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p1C1C_o_1C_o_1C,
>+    1,
>+    StaticType::Get<EbtInt, EbpUndefined, EvqGlobal, 2, 1>(),
>+    EOpFindMSB,
>+    true);
>+constexpr const TFunction kFunction_findMSB_2C(
>+    BuiltInId::findMSB_Int3,
>+    BuiltInName::findMSB,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p2C2C0C0C,
>+    1,
>+    StaticType::Get<EbtInt, EbpUndefined, EvqGlobal, 3, 1>(),
>+    EOpFindMSB,
>+    true);
>+constexpr const TFunction kFunction_findMSB_3C(
>+    BuiltInId::findMSB_Int4,
>+    BuiltInName::findMSB,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p3C0C0C,
>+    1,
>+    StaticType::Get<EbtInt, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpFindMSB,
>+    true);
>+constexpr const TFunction kFunction_findMSB_0D(
>+    BuiltInId::findMSB_UInt1,
>+    BuiltInName::findMSB,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0D0C0C,
>+    1,
>+    StaticType::Get<EbtInt, EbpUndefined, EvqGlobal, 1, 1>(),
>+    EOpFindMSB,
>+    true);
>+constexpr const TFunction kFunction_findMSB_1D(
>+    BuiltInId::findMSB_UInt2,
>+    BuiltInName::findMSB,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p1D0C0C,
>+    1,
>+    StaticType::Get<EbtInt, EbpUndefined, EvqGlobal, 2, 1>(),
>+    EOpFindMSB,
>+    true);
>+constexpr const TFunction kFunction_findMSB_2D(
>+    BuiltInId::findMSB_UInt3,
>+    BuiltInName::findMSB,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p2D2D0C0C,
>+    1,
>+    StaticType::Get<EbtInt, EbpUndefined, EvqGlobal, 3, 1>(),
>+    EOpFindMSB,
>+    true);
>+constexpr const TFunction kFunction_findMSB_3D(
>+    BuiltInId::findMSB_UInt4,
>+    BuiltInName::findMSB,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p3D0C0C,
>+    1,
>+    StaticType::Get<EbtInt, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpFindMSB,
>+    true);
>+constexpr const TFunction kFunction_uaddCarry_0D0D0D(
>+    BuiltInId::uaddCarry_UInt1_UInt1_UInt1,
>+    BuiltInName::uaddCarry,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0D0D_o_0D_o_0D,
>+    3,
>+    StaticType::Get<EbtUInt, EbpUndefined, EvqGlobal, 1, 1>(),
>+    EOpUaddCarry,
>+    false);
>+constexpr const TFunction kFunction_uaddCarry_1D1D1D(
>+    BuiltInId::uaddCarry_UInt2_UInt2_UInt2,
>+    BuiltInName::uaddCarry,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p1D1D_o_1D_o_1D,
>+    3,
>+    StaticType::Get<EbtUInt, EbpUndefined, EvqGlobal, 2, 1>(),
>+    EOpUaddCarry,
>+    false);
>+constexpr const TFunction kFunction_uaddCarry_2D2D2D(
>+    BuiltInId::uaddCarry_UInt3_UInt3_UInt3,
>+    BuiltInName::uaddCarry,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p2D2D_o_2D_o_2D,
>+    3,
>+    StaticType::Get<EbtUInt, EbpUndefined, EvqGlobal, 3, 1>(),
>+    EOpUaddCarry,
>+    false);
>+constexpr const TFunction kFunction_uaddCarry_3D3D3D(
>+    BuiltInId::uaddCarry_UInt4_UInt4_UInt4,
>+    BuiltInName::uaddCarry,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p3D3D_o_3D_o_3D,
>+    3,
>+    StaticType::Get<EbtUInt, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpUaddCarry,
>+    false);
>+constexpr const TFunction kFunction_usubBorrow_0D0D0D(
>+    BuiltInId::usubBorrow_UInt1_UInt1_UInt1,
>+    BuiltInName::usubBorrow,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0D0D_o_0D_o_0D,
>+    3,
>+    StaticType::Get<EbtUInt, EbpUndefined, EvqGlobal, 1, 1>(),
>+    EOpUsubBorrow,
>+    false);
>+constexpr const TFunction kFunction_usubBorrow_1D1D1D(
>+    BuiltInId::usubBorrow_UInt2_UInt2_UInt2,
>+    BuiltInName::usubBorrow,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p1D1D_o_1D_o_1D,
>+    3,
>+    StaticType::Get<EbtUInt, EbpUndefined, EvqGlobal, 2, 1>(),
>+    EOpUsubBorrow,
>+    false);
>+constexpr const TFunction kFunction_usubBorrow_2D2D2D(
>+    BuiltInId::usubBorrow_UInt3_UInt3_UInt3,
>+    BuiltInName::usubBorrow,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p2D2D_o_2D_o_2D,
>+    3,
>+    StaticType::Get<EbtUInt, EbpUndefined, EvqGlobal, 3, 1>(),
>+    EOpUsubBorrow,
>+    false);
>+constexpr const TFunction kFunction_usubBorrow_3D3D3D(
>+    BuiltInId::usubBorrow_UInt4_UInt4_UInt4,
>+    BuiltInName::usubBorrow,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p3D3D_o_3D_o_3D,
>+    3,
>+    StaticType::Get<EbtUInt, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpUsubBorrow,
>+    false);
>+constexpr const TFunction kFunction_umulExtended_0D0D0D0D(
>+    BuiltInId::umulExtended_UInt1_UInt1_UInt1_UInt1,
>+    BuiltInName::umulExtended,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0D0D_o_0D_o_0D,
>+    4,
>+    StaticType::Get<EbtVoid, EbpUndefined, EvqGlobal, 1, 1>(),
>+    EOpUmulExtended,
>+    false);
>+constexpr const TFunction kFunction_umulExtended_1D1D1D1D(
>+    BuiltInId::umulExtended_UInt2_UInt2_UInt2_UInt2,
>+    BuiltInName::umulExtended,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p1D1D_o_1D_o_1D,
>+    4,
>+    StaticType::Get<EbtVoid, EbpUndefined, EvqGlobal, 1, 1>(),
>+    EOpUmulExtended,
>+    false);
>+constexpr const TFunction kFunction_umulExtended_2D2D2D2D(
>+    BuiltInId::umulExtended_UInt3_UInt3_UInt3_UInt3,
>+    BuiltInName::umulExtended,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p2D2D_o_2D_o_2D,
>+    4,
>+    StaticType::Get<EbtVoid, EbpUndefined, EvqGlobal, 1, 1>(),
>+    EOpUmulExtended,
>+    false);
>+constexpr const TFunction kFunction_umulExtended_3D3D3D3D(
>+    BuiltInId::umulExtended_UInt4_UInt4_UInt4_UInt4,
>+    BuiltInName::umulExtended,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p3D3D_o_3D_o_3D,
>+    4,
>+    StaticType::Get<EbtVoid, EbpUndefined, EvqGlobal, 1, 1>(),
>+    EOpUmulExtended,
>+    false);
>+constexpr const TFunction kFunction_imulExtended_0C0C0C0C(
>+    BuiltInId::imulExtended_Int1_Int1_Int1_Int1,
>+    BuiltInName::imulExtended,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0C0C_o_0C_o_0C,
>+    4,
>+    StaticType::Get<EbtVoid, EbpUndefined, EvqGlobal, 1, 1>(),
>+    EOpImulExtended,
>+    false);
>+constexpr const TFunction kFunction_imulExtended_1C1C1C1C(
>+    BuiltInId::imulExtended_Int2_Int2_Int2_Int2,
>+    BuiltInName::imulExtended,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p1C1C_o_1C_o_1C,
>+    4,
>+    StaticType::Get<EbtVoid, EbpUndefined, EvqGlobal, 1, 1>(),
>+    EOpImulExtended,
>+    false);
>+constexpr const TFunction kFunction_imulExtended_2C2C2C2C(
>+    BuiltInId::imulExtended_Int3_Int3_Int3_Int3,
>+    BuiltInName::imulExtended,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p2C2C_o_2C_o_2C,
>+    4,
>+    StaticType::Get<EbtVoid, EbpUndefined, EvqGlobal, 1, 1>(),
>+    EOpImulExtended,
>+    false);
>+constexpr const TFunction kFunction_imulExtended_3C3C3C3C(
>+    BuiltInId::imulExtended_Int4_Int4_Int4_Int4,
>+    BuiltInName::imulExtended,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p3C3C_o_3C_o_3C,
>+    4,
>+    StaticType::Get<EbtVoid, EbpUndefined, EvqGlobal, 1, 1>(),
>+    EOpImulExtended,
>+    false);
>+constexpr const TFunction kFunction_texture2D_0H1B(
>+    BuiltInId::texture2D_Sampler2D1_Float2,
>+    BuiltInName::texture2D,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0H1B1B1B1C,
>+    2,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_texture2DProj_0H2B(
>+    BuiltInId::texture2DProj_Sampler2D1_Float3,
>+    BuiltInName::texture2DProj,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0H2B0B1C,
>+    2,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_texture2DProj_0H3B(
>+    BuiltInId::texture2DProj_Sampler2D1_Float4,
>+    BuiltInName::texture2DProj,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0H3B0B1C,
>+    2,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_textureCube_0J2B(
>+    BuiltInId::textureCube_SamplerCube1_Float3,
>+    BuiltInName::textureCube,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0J2B2B2B,
>+    2,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_texture2D_0L1B(
>+    BuiltInId::texture2D_SamplerExternalOES1_Float2,
>+    BuiltInName::texture2D,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0L1B0B,
>+    2,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_texture2DProj_0L2B(
>+    BuiltInId::texture2DProj_SamplerExternalOES1_Float3,
>+    BuiltInName::texture2DProj,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0L2B0B,
>+    2,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_texture2DProj_0L3B(
>+    BuiltInId::texture2DProj_SamplerExternalOES1_Float4,
>+    BuiltInName::texture2DProj,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0L3B0B,
>+    2,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_texture2DRect_0N1B(
>+    BuiltInId::texture2DRect_Sampler2DRect1_Float2,
>+    BuiltInName::texture2DRect,
>+    TExtension::ARB_texture_rectangle,
>+    BuiltInParameters::p0N1B,
>+    2,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_texture2DRectProj_0N2B(
>+    BuiltInId::texture2DRectProj_Sampler2DRect1_Float3,
>+    BuiltInName::texture2DRectProj,
>+    TExtension::ARB_texture_rectangle,
>+    BuiltInParameters::p0N2B,
>+    2,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_texture2DRectProj_0N3B(
>+    BuiltInId::texture2DRectProj_Sampler2DRect1_Float4,
>+    BuiltInName::texture2DRectProj,
>+    TExtension::ARB_texture_rectangle,
>+    BuiltInParameters::p0N3B,
>+    2,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_texture_0N1B(
>+    BuiltInId::texture_Sampler2DRect1_Float2,
>+    BuiltInName::texture,
>+    TExtension::ARB_texture_rectangle,
>+    BuiltInParameters::p0N1B,
>+    2,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_textureProj_0N2B(
>+    BuiltInId::textureProj_Sampler2DRect1_Float3,
>+    BuiltInName::textureProj,
>+    TExtension::ARB_texture_rectangle,
>+    BuiltInParameters::p0N2B,
>+    2,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_textureProj_0N3B(
>+    BuiltInId::textureProj_Sampler2DRect1_Float4,
>+    BuiltInName::textureProj,
>+    TExtension::ARB_texture_rectangle,
>+    BuiltInParameters::p0N3B,
>+    2,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_texture2DGradEXT_0H1B1B1B(
>+    BuiltInId::texture2DGradEXT_Sampler2D1_Float2_Float2_Float2,
>+    BuiltInName::texture2DGradEXT,
>+    TExtension::EXT_shader_texture_lod,
>+    BuiltInParameters::p0H1B1B1B1C,
>+    4,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_texture2DProjGradEXT_0H2B1B1B(
>+    BuiltInId::texture2DProjGradEXT_Sampler2D1_Float3_Float2_Float2,
>+    BuiltInName::texture2DProjGradEXT,
>+    TExtension::EXT_shader_texture_lod,
>+    BuiltInParameters::p0H2B1B1B1C,
>+    4,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_texture2DProjGradEXT_0H3B1B1B(
>+    BuiltInId::texture2DProjGradEXT_Sampler2D1_Float4_Float2_Float2,
>+    BuiltInName::texture2DProjGradEXT,
>+    TExtension::EXT_shader_texture_lod,
>+    BuiltInParameters::p0H3B1B1B1C,
>+    4,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_textureCubeGradEXT_0J2B2B2B(
>+    BuiltInId::textureCubeGradEXT_SamplerCube1_Float3_Float3_Float3,
>+    BuiltInName::textureCubeGradEXT,
>+    TExtension::EXT_shader_texture_lod,
>+    BuiltInParameters::p0J2B2B2B,
>+    4,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_texture2D_0H1B0B(
>+    BuiltInId::texture2D_Sampler2D1_Float2_Float1,
>+    BuiltInName::texture2D,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0H1B0B1C,
>+    3,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_texture2DProj_0H2B0B(
>+    BuiltInId::texture2DProj_Sampler2D1_Float3_Float1,
>+    BuiltInName::texture2DProj,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0H2B0B1C,
>+    3,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_texture2DProj_0H3B0B(
>+    BuiltInId::texture2DProj_Sampler2D1_Float4_Float1,
>+    BuiltInName::texture2DProj,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0H3B0B1C,
>+    3,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_textureCube_0J2B0B(
>+    BuiltInId::textureCube_SamplerCube1_Float3_Float1,
>+    BuiltInName::textureCube,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0J2B0B,
>+    3,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_dFdxExt_0B(
>+    BuiltInId::dFdxExt_Float1,
>+    BuiltInName::dFdxExt,
>+    TExtension::OES_standard_derivatives,
>+    BuiltInParameters::p0B0C,
>+    1,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 1, 1>(),
>+    EOpDFdx,
>+    false);
>+constexpr const TFunction kFunction_dFdxExt_1B(
>+    BuiltInId::dFdxExt_Float2,
>+    BuiltInName::dFdxExt,
>+    TExtension::OES_standard_derivatives,
>+    BuiltInParameters::p1B1B0B,
>+    1,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 2, 1>(),
>+    EOpDFdx,
>+    false);
>+constexpr const TFunction kFunction_dFdxExt_2B(
>+    BuiltInId::dFdxExt_Float3,
>+    BuiltInName::dFdxExt,
>+    TExtension::OES_standard_derivatives,
>+    BuiltInParameters::p2B_o_2C,
>+    1,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 3, 1>(),
>+    EOpDFdx,
>+    false);
>+constexpr const TFunction kFunction_dFdxExt_3B(
>+    BuiltInId::dFdxExt_Float4,
>+    BuiltInName::dFdxExt,
>+    TExtension::OES_standard_derivatives,
>+    BuiltInParameters::p3B0B0B,
>+    1,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpDFdx,
>+    false);
>+constexpr const TFunction kFunction_dFdyExt_0B(
>+    BuiltInId::dFdyExt_Float1,
>+    BuiltInName::dFdyExt,
>+    TExtension::OES_standard_derivatives,
>+    BuiltInParameters::p0B0C,
>+    1,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 1, 1>(),
>+    EOpDFdy,
>+    false);
>+constexpr const TFunction kFunction_dFdyExt_1B(
>+    BuiltInId::dFdyExt_Float2,
>+    BuiltInName::dFdyExt,
>+    TExtension::OES_standard_derivatives,
>+    BuiltInParameters::p1B1B0B,
>+    1,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 2, 1>(),
>+    EOpDFdy,
>+    false);
>+constexpr const TFunction kFunction_dFdyExt_2B(
>+    BuiltInId::dFdyExt_Float3,
>+    BuiltInName::dFdyExt,
>+    TExtension::OES_standard_derivatives,
>+    BuiltInParameters::p2B_o_2C,
>+    1,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 3, 1>(),
>+    EOpDFdy,
>+    false);
>+constexpr const TFunction kFunction_dFdyExt_3B(
>+    BuiltInId::dFdyExt_Float4,
>+    BuiltInName::dFdyExt,
>+    TExtension::OES_standard_derivatives,
>+    BuiltInParameters::p3B0B0B,
>+    1,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpDFdy,
>+    false);
>+constexpr const TFunction kFunction_fwidthExt_0B(
>+    BuiltInId::fwidthExt_Float1,
>+    BuiltInName::fwidthExt,
>+    TExtension::OES_standard_derivatives,
>+    BuiltInParameters::p0B0C,
>+    1,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 1, 1>(),
>+    EOpFwidth,
>+    false);
>+constexpr const TFunction kFunction_fwidthExt_1B(
>+    BuiltInId::fwidthExt_Float2,
>+    BuiltInName::fwidthExt,
>+    TExtension::OES_standard_derivatives,
>+    BuiltInParameters::p1B1B0B,
>+    1,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 2, 1>(),
>+    EOpFwidth,
>+    false);
>+constexpr const TFunction kFunction_fwidthExt_2B(
>+    BuiltInId::fwidthExt_Float3,
>+    BuiltInName::fwidthExt,
>+    TExtension::OES_standard_derivatives,
>+    BuiltInParameters::p2B_o_2C,
>+    1,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 3, 1>(),
>+    EOpFwidth,
>+    false);
>+constexpr const TFunction kFunction_fwidthExt_3B(
>+    BuiltInId::fwidthExt_Float4,
>+    BuiltInName::fwidthExt,
>+    TExtension::OES_standard_derivatives,
>+    BuiltInParameters::p3B0B0B,
>+    1,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpFwidth,
>+    false);
>+constexpr const TFunction kFunction_texture2DLodEXT_0H1B0B(
>+    BuiltInId::texture2DLodEXT_Sampler2D1_Float2_Float1,
>+    BuiltInName::texture2DLodEXT,
>+    TExtension::EXT_shader_texture_lod,
>+    BuiltInParameters::p0H1B0B1C,
>+    3,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_texture2DProjLodEXT_0H2B0B(
>+    BuiltInId::texture2DProjLodEXT_Sampler2D1_Float3_Float1,
>+    BuiltInName::texture2DProjLodEXT,
>+    TExtension::EXT_shader_texture_lod,
>+    BuiltInParameters::p0H2B0B1C,
>+    3,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_texture2DProjLodEXT_0H3B0B(
>+    BuiltInId::texture2DProjLodEXT_Sampler2D1_Float4_Float1,
>+    BuiltInName::texture2DProjLodEXT,
>+    TExtension::EXT_shader_texture_lod,
>+    BuiltInParameters::p0H3B0B1C,
>+    3,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_textureCubeLodEXT_0J2B0B(
>+    BuiltInId::textureCubeLodEXT_SamplerCube1_Float3_Float1,
>+    BuiltInName::textureCubeLodEXT,
>+    TExtension::EXT_shader_texture_lod,
>+    BuiltInParameters::p0J2B0B,
>+    3,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_texture2DLod_0H1B0B(
>+    BuiltInId::texture2DLod_Sampler2D1_Float2_Float1,
>+    BuiltInName::texture2DLod,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0H1B0B1C,
>+    3,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_texture2DProjLod_0H2B0B(
>+    BuiltInId::texture2DProjLod_Sampler2D1_Float3_Float1,
>+    BuiltInName::texture2DProjLod,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0H2B0B1C,
>+    3,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_texture2DProjLod_0H3B0B(
>+    BuiltInId::texture2DProjLod_Sampler2D1_Float4_Float1,
>+    BuiltInName::texture2DProjLod,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0H3B0B1C,
>+    3,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_textureCubeLod_0J2B0B(
>+    BuiltInId::textureCubeLod_SamplerCube1_Float3_Float1,
>+    BuiltInName::textureCubeLod,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0J2B0B,
>+    3,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_texture_0H1B(
>+    BuiltInId::texture_Sampler2D1_Float2,
>+    BuiltInName::texture,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0H1B1B1B1C,
>+    2,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_texture_0Q1B(
>+    BuiltInId::texture_ISampler2D1_Float2,
>+    BuiltInName::texture,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0Q1B1B1B1C,
>+    2,
>+    StaticType::Get<EbtInt, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_texture_0W1B(
>+    BuiltInId::texture_USampler2D1_Float2,
>+    BuiltInName::texture,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0W1B1C0C,
>+    2,
>+    StaticType::Get<EbtUInt, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_texture_0I2B(
>+    BuiltInId::texture_Sampler3D1_Float3,
>+    BuiltInName::texture,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0I2B0B2C,
>+    2,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_texture_0R2B(
>+    BuiltInId::texture_ISampler3D1_Float3,
>+    BuiltInName::texture,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0R2B0B2C,
>+    2,
>+    StaticType::Get<EbtInt, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_texture_0X2B(
>+    BuiltInId::texture_USampler3D1_Float3,
>+    BuiltInName::texture,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0X2B0B2C,
>+    2,
>+    StaticType::Get<EbtUInt, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_texture_0J2B(
>+    BuiltInId::texture_SamplerCube1_Float3,
>+    BuiltInName::texture,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0J2B2B2B,
>+    2,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_texture_0S2B(
>+    BuiltInId::texture_ISamplerCube1_Float3,
>+    BuiltInName::texture,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0S2B0B,
>+    2,
>+    StaticType::Get<EbtInt, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_texture_0Y2B(
>+    BuiltInId::texture_USamplerCube1_Float3,
>+    BuiltInName::texture,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0Y2B0B,
>+    2,
>+    StaticType::Get<EbtUInt, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_texture_0K2B(
>+    BuiltInId::texture_Sampler2DArray1_Float3,
>+    BuiltInName::texture,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0K2B0B1C,
>+    2,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_texture_0T2B(
>+    BuiltInId::texture_ISampler2DArray1_Float3,
>+    BuiltInName::texture,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0T2B1B1B1C,
>+    2,
>+    StaticType::Get<EbtInt, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_texture_0Z2B(
>+    BuiltInId::texture_USampler2DArray1_Float3,
>+    BuiltInName::texture,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0Z2B1B1B1C,
>+    2,
>+    StaticType::Get<EbtUInt, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_textureProj_0H2B(
>+    BuiltInId::textureProj_Sampler2D1_Float3,
>+    BuiltInName::textureProj,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0H2B0B1C,
>+    2,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_textureProj_0Q2B(
>+    BuiltInId::textureProj_ISampler2D1_Float3,
>+    BuiltInName::textureProj,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0Q2B1B1B1C,
>+    2,
>+    StaticType::Get<EbtInt, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_textureProj_0W2B(
>+    BuiltInId::textureProj_USampler2D1_Float3,
>+    BuiltInName::textureProj,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0W2B1C0B,
>+    2,
>+    StaticType::Get<EbtUInt, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_textureProj_0H3B(
>+    BuiltInId::textureProj_Sampler2D1_Float4,
>+    BuiltInName::textureProj,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0H3B0B1C,
>+    2,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_textureProj_0Q3B(
>+    BuiltInId::textureProj_ISampler2D1_Float4,
>+    BuiltInName::textureProj,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0Q3B1B1B1C,
>+    2,
>+    StaticType::Get<EbtInt, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_textureProj_0W3B(
>+    BuiltInId::textureProj_USampler2D1_Float4,
>+    BuiltInName::textureProj,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0W3B1B1B1C,
>+    2,
>+    StaticType::Get<EbtUInt, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_textureProj_0I3B(
>+    BuiltInId::textureProj_Sampler3D1_Float4,
>+    BuiltInName::textureProj,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0I3B2C0B,
>+    2,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_textureProj_0R3B(
>+    BuiltInId::textureProj_ISampler3D1_Float4,
>+    BuiltInName::textureProj,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0R3B0B2C,
>+    2,
>+    StaticType::Get<EbtInt, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_textureProj_0X3B(
>+    BuiltInId::textureProj_USampler3D1_Float4,
>+    BuiltInName::textureProj,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0X3B2B2B2C,
>+    2,
>+    StaticType::Get<EbtUInt, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_textureLod_0H1B0B(
>+    BuiltInId::textureLod_Sampler2D1_Float2_Float1,
>+    BuiltInName::textureLod,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0H1B0B1C,
>+    3,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_textureLod_0Q1B0B(
>+    BuiltInId::textureLod_ISampler2D1_Float2_Float1,
>+    BuiltInName::textureLod,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0Q1B0B1C,
>+    3,
>+    StaticType::Get<EbtInt, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_textureLod_0W1B0B(
>+    BuiltInId::textureLod_USampler2D1_Float2_Float1,
>+    BuiltInName::textureLod,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0W1B0B1C,
>+    3,
>+    StaticType::Get<EbtUInt, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_textureLod_0I2B0B(
>+    BuiltInId::textureLod_Sampler3D1_Float3_Float1,
>+    BuiltInName::textureLod,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0I2B0B2C,
>+    3,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_textureLod_0R2B0B(
>+    BuiltInId::textureLod_ISampler3D1_Float3_Float1,
>+    BuiltInName::textureLod,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0R2B0B2C,
>+    3,
>+    StaticType::Get<EbtInt, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_textureLod_0X2B0B(
>+    BuiltInId::textureLod_USampler3D1_Float3_Float1,
>+    BuiltInName::textureLod,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0X2B0B2C,
>+    3,
>+    StaticType::Get<EbtUInt, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_textureLod_0J2B0B(
>+    BuiltInId::textureLod_SamplerCube1_Float3_Float1,
>+    BuiltInName::textureLod,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0J2B0B,
>+    3,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_textureLod_0S2B0B(
>+    BuiltInId::textureLod_ISamplerCube1_Float3_Float1,
>+    BuiltInName::textureLod,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0S2B0B,
>+    3,
>+    StaticType::Get<EbtInt, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_textureLod_0Y2B0B(
>+    BuiltInId::textureLod_USamplerCube1_Float3_Float1,
>+    BuiltInName::textureLod,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0Y2B0B,
>+    3,
>+    StaticType::Get<EbtUInt, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_textureLod_0K2B0B(
>+    BuiltInId::textureLod_Sampler2DArray1_Float3_Float1,
>+    BuiltInName::textureLod,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0K2B0B1C,
>+    3,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_textureLod_0T2B0B(
>+    BuiltInId::textureLod_ISampler2DArray1_Float3_Float1,
>+    BuiltInName::textureLod,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0T2B0B1C,
>+    3,
>+    StaticType::Get<EbtInt, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_textureLod_0Z2B0B(
>+    BuiltInId::textureLod_USampler2DArray1_Float3_Float1,
>+    BuiltInName::textureLod,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0Z2B0B1C,
>+    3,
>+    StaticType::Get<EbtUInt, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_texture_0c2B(
>+    BuiltInId::texture_Sampler2DShadow1_Float3,
>+    BuiltInName::texture,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0c2B1B1B1C,
>+    2,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 1, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_texture_0d3B(
>+    BuiltInId::texture_SamplerCubeShadow1_Float4,
>+    BuiltInName::texture,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0d3B2B2B,
>+    2,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 1, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_texture_0e3B(
>+    BuiltInId::texture_Sampler2DArrayShadow1_Float4,
>+    BuiltInName::texture,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0e3B1B1B1C,
>+    2,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 1, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_textureProj_0c3B(
>+    BuiltInId::textureProj_Sampler2DShadow1_Float4,
>+    BuiltInName::textureProj,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0c3B0B1C,
>+    2,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 1, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_textureLod_0c2B0B(
>+    BuiltInId::textureLod_Sampler2DShadow1_Float3_Float1,
>+    BuiltInName::textureLod,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0c2B0B1C,
>+    3,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 1, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_textureSize_0H0C(
>+    BuiltInId::textureSize_Sampler2D1_Int1,
>+    BuiltInName::textureSize,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0H0C,
>+    2,
>+    StaticType::Get<EbtInt, EbpUndefined, EvqGlobal, 2, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_textureSize_0Q0C(
>+    BuiltInId::textureSize_ISampler2D1_Int1,
>+    BuiltInName::textureSize,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0Q0C,
>+    2,
>+    StaticType::Get<EbtInt, EbpUndefined, EvqGlobal, 2, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_textureSize_0W0C(
>+    BuiltInId::textureSize_USampler2D1_Int1,
>+    BuiltInName::textureSize,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0W0C,
>+    2,
>+    StaticType::Get<EbtInt, EbpUndefined, EvqGlobal, 2, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_textureSize_0I0C(
>+    BuiltInId::textureSize_Sampler3D1_Int1,
>+    BuiltInName::textureSize,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0I0C,
>+    2,
>+    StaticType::Get<EbtInt, EbpUndefined, EvqGlobal, 3, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_textureSize_0R0C(
>+    BuiltInId::textureSize_ISampler3D1_Int1,
>+    BuiltInName::textureSize,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0R0C,
>+    2,
>+    StaticType::Get<EbtInt, EbpUndefined, EvqGlobal, 3, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_textureSize_0X0C(
>+    BuiltInId::textureSize_USampler3D1_Int1,
>+    BuiltInName::textureSize,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0X0C,
>+    2,
>+    StaticType::Get<EbtInt, EbpUndefined, EvqGlobal, 3, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_textureSize_0J0C(
>+    BuiltInId::textureSize_SamplerCube1_Int1,
>+    BuiltInName::textureSize,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0J0C,
>+    2,
>+    StaticType::Get<EbtInt, EbpUndefined, EvqGlobal, 2, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_textureSize_0S0C(
>+    BuiltInId::textureSize_ISamplerCube1_Int1,
>+    BuiltInName::textureSize,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0S0C,
>+    2,
>+    StaticType::Get<EbtInt, EbpUndefined, EvqGlobal, 2, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_textureSize_0Y0C(
>+    BuiltInId::textureSize_USamplerCube1_Int1,
>+    BuiltInName::textureSize,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0Y0C,
>+    2,
>+    StaticType::Get<EbtInt, EbpUndefined, EvqGlobal, 2, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_textureSize_0K0C(
>+    BuiltInId::textureSize_Sampler2DArray1_Int1,
>+    BuiltInName::textureSize,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0K0C,
>+    2,
>+    StaticType::Get<EbtInt, EbpUndefined, EvqGlobal, 3, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_textureSize_0T0C(
>+    BuiltInId::textureSize_ISampler2DArray1_Int1,
>+    BuiltInName::textureSize,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0T0C,
>+    2,
>+    StaticType::Get<EbtInt, EbpUndefined, EvqGlobal, 3, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_textureSize_0Z0C(
>+    BuiltInId::textureSize_USampler2DArray1_Int1,
>+    BuiltInName::textureSize,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0Z0C,
>+    2,
>+    StaticType::Get<EbtInt, EbpUndefined, EvqGlobal, 3, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_textureSize_0c0C(
>+    BuiltInId::textureSize_Sampler2DShadow1_Int1,
>+    BuiltInName::textureSize,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0c0C,
>+    2,
>+    StaticType::Get<EbtInt, EbpUndefined, EvqGlobal, 2, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_textureSize_0d0C(
>+    BuiltInId::textureSize_SamplerCubeShadow1_Int1,
>+    BuiltInName::textureSize,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0d0C,
>+    2,
>+    StaticType::Get<EbtInt, EbpUndefined, EvqGlobal, 2, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_textureSize_0e0C(
>+    BuiltInId::textureSize_Sampler2DArrayShadow1_Int1,
>+    BuiltInName::textureSize,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0e0C,
>+    2,
>+    StaticType::Get<EbtInt, EbpUndefined, EvqGlobal, 3, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_textureProjLod_0H2B0B(
>+    BuiltInId::textureProjLod_Sampler2D1_Float3_Float1,
>+    BuiltInName::textureProjLod,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0H2B0B1C,
>+    3,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_textureProjLod_0Q2B0B(
>+    BuiltInId::textureProjLod_ISampler2D1_Float3_Float1,
>+    BuiltInName::textureProjLod,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0Q2B0B1C,
>+    3,
>+    StaticType::Get<EbtInt, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_textureProjLod_0W2B0B(
>+    BuiltInId::textureProjLod_USampler2D1_Float3_Float1,
>+    BuiltInName::textureProjLod,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0W2B0B1C,
>+    3,
>+    StaticType::Get<EbtUInt, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_textureProjLod_0H3B0B(
>+    BuiltInId::textureProjLod_Sampler2D1_Float4_Float1,
>+    BuiltInName::textureProjLod,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0H3B0B1C,
>+    3,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_textureProjLod_0Q3B0B(
>+    BuiltInId::textureProjLod_ISampler2D1_Float4_Float1,
>+    BuiltInName::textureProjLod,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0Q3B0B1C,
>+    3,
>+    StaticType::Get<EbtInt, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_textureProjLod_0W3B0B(
>+    BuiltInId::textureProjLod_USampler2D1_Float4_Float1,
>+    BuiltInName::textureProjLod,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0W3B0B1C,
>+    3,
>+    StaticType::Get<EbtUInt, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_textureProjLod_0I3B0B(
>+    BuiltInId::textureProjLod_Sampler3D1_Float4_Float1,
>+    BuiltInName::textureProjLod,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0I3B0B2C,
>+    3,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_textureProjLod_0R3B0B(
>+    BuiltInId::textureProjLod_ISampler3D1_Float4_Float1,
>+    BuiltInName::textureProjLod,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0R3B0B2C,
>+    3,
>+    StaticType::Get<EbtInt, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_textureProjLod_0X3B0B(
>+    BuiltInId::textureProjLod_USampler3D1_Float4_Float1,
>+    BuiltInName::textureProjLod,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0X3B0B2C,
>+    3,
>+    StaticType::Get<EbtUInt, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_textureProjLod_0c3B0B(
>+    BuiltInId::textureProjLod_Sampler2DShadow1_Float4_Float1,
>+    BuiltInName::textureProjLod,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0c3B0B1C,
>+    3,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 1, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_texelFetch_0H1C0C(
>+    BuiltInId::texelFetch_Sampler2D1_Int2_Int1,
>+    BuiltInName::texelFetch,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0H1C0C1C,
>+    3,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_texelFetch_0Q1C0C(
>+    BuiltInId::texelFetch_ISampler2D1_Int2_Int1,
>+    BuiltInName::texelFetch,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0Q1C0C1C,
>+    3,
>+    StaticType::Get<EbtInt, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_texelFetch_0W1C0C(
>+    BuiltInId::texelFetch_USampler2D1_Int2_Int1,
>+    BuiltInName::texelFetch,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0W1C0C1C,
>+    3,
>+    StaticType::Get<EbtUInt, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_texelFetch_0I2C0C(
>+    BuiltInId::texelFetch_Sampler3D1_Int3_Int1,
>+    BuiltInName::texelFetch,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0I2C0C2C,
>+    3,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_texelFetch_0R2C0C(
>+    BuiltInId::texelFetch_ISampler3D1_Int3_Int1,
>+    BuiltInName::texelFetch,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0R2C0C2C,
>+    3,
>+    StaticType::Get<EbtInt, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_texelFetch_0X2C0C(
>+    BuiltInId::texelFetch_USampler3D1_Int3_Int1,
>+    BuiltInName::texelFetch,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0X2C0C2C,
>+    3,
>+    StaticType::Get<EbtUInt, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_texelFetch_0K2C0C(
>+    BuiltInId::texelFetch_Sampler2DArray1_Int3_Int1,
>+    BuiltInName::texelFetch,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0K2C0C1C,
>+    3,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_texelFetch_0T2C0C(
>+    BuiltInId::texelFetch_ISampler2DArray1_Int3_Int1,
>+    BuiltInName::texelFetch,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0T2C0C1C,
>+    3,
>+    StaticType::Get<EbtInt, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_texelFetch_0Z2C0C(
>+    BuiltInId::texelFetch_USampler2DArray1_Int3_Int1,
>+    BuiltInName::texelFetch,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0Z2C0C1C,
>+    3,
>+    StaticType::Get<EbtUInt, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_textureGrad_0H1B1B1B(
>+    BuiltInId::textureGrad_Sampler2D1_Float2_Float2_Float2,
>+    BuiltInName::textureGrad,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0H1B1B1B1C,
>+    4,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_textureGrad_0Q1B1B1B(
>+    BuiltInId::textureGrad_ISampler2D1_Float2_Float2_Float2,
>+    BuiltInName::textureGrad,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0Q1B1B1B1C,
>+    4,
>+    StaticType::Get<EbtInt, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_textureGrad_0W1B1B1B(
>+    BuiltInId::textureGrad_USampler2D1_Float2_Float2_Float2,
>+    BuiltInName::textureGrad,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0W1B1B1B1C,
>+    4,
>+    StaticType::Get<EbtUInt, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_textureGrad_0I2B2B2B(
>+    BuiltInId::textureGrad_Sampler3D1_Float3_Float3_Float3,
>+    BuiltInName::textureGrad,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0I2B2B2B2C,
>+    4,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_textureGrad_0R2B2B2B(
>+    BuiltInId::textureGrad_ISampler3D1_Float3_Float3_Float3,
>+    BuiltInName::textureGrad,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0R2B2B2B2C,
>+    4,
>+    StaticType::Get<EbtInt, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_textureGrad_0X2B2B2B(
>+    BuiltInId::textureGrad_USampler3D1_Float3_Float3_Float3,
>+    BuiltInName::textureGrad,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0X2B2B2B2C,
>+    4,
>+    StaticType::Get<EbtUInt, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_textureGrad_0J2B2B2B(
>+    BuiltInId::textureGrad_SamplerCube1_Float3_Float3_Float3,
>+    BuiltInName::textureGrad,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0J2B2B2B,
>+    4,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_textureGrad_0S2B2B2B(
>+    BuiltInId::textureGrad_ISamplerCube1_Float3_Float3_Float3,
>+    BuiltInName::textureGrad,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0S2B2B2B,
>+    4,
>+    StaticType::Get<EbtInt, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_textureGrad_0Y2B2B2B(
>+    BuiltInId::textureGrad_USamplerCube1_Float3_Float3_Float3,
>+    BuiltInName::textureGrad,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0Y2B2B2B,
>+    4,
>+    StaticType::Get<EbtUInt, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_textureGrad_0c2B1B1B(
>+    BuiltInId::textureGrad_Sampler2DShadow1_Float3_Float2_Float2,
>+    BuiltInName::textureGrad,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0c2B1B1B1C,
>+    4,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 1, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_textureGrad_0d3B2B2B(
>+    BuiltInId::textureGrad_SamplerCubeShadow1_Float4_Float3_Float3,
>+    BuiltInName::textureGrad,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0d3B2B2B,
>+    4,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 1, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_textureGrad_0K2B1B1B(
>+    BuiltInId::textureGrad_Sampler2DArray1_Float3_Float2_Float2,
>+    BuiltInName::textureGrad,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0K2B1B1B1C,
>+    4,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_textureGrad_0T2B1B1B(
>+    BuiltInId::textureGrad_ISampler2DArray1_Float3_Float2_Float2,
>+    BuiltInName::textureGrad,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0T2B1B1B1C,
>+    4,
>+    StaticType::Get<EbtInt, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_textureGrad_0Z2B1B1B(
>+    BuiltInId::textureGrad_USampler2DArray1_Float3_Float2_Float2,
>+    BuiltInName::textureGrad,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0Z2B1B1B1C,
>+    4,
>+    StaticType::Get<EbtUInt, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_textureGrad_0e3B1B1B(
>+    BuiltInId::textureGrad_Sampler2DArrayShadow1_Float4_Float2_Float2,
>+    BuiltInName::textureGrad,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0e3B1B1B1C,
>+    4,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 1, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_textureProjGrad_0H2B1B1B(
>+    BuiltInId::textureProjGrad_Sampler2D1_Float3_Float2_Float2,
>+    BuiltInName::textureProjGrad,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0H2B1B1B1C,
>+    4,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_textureProjGrad_0Q2B1B1B(
>+    BuiltInId::textureProjGrad_ISampler2D1_Float3_Float2_Float2,
>+    BuiltInName::textureProjGrad,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0Q2B1B1B1C,
>+    4,
>+    StaticType::Get<EbtInt, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_textureProjGrad_0W2B1B1B(
>+    BuiltInId::textureProjGrad_USampler2D1_Float3_Float2_Float2,
>+    BuiltInName::textureProjGrad,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0W2B1B1B1C,
>+    4,
>+    StaticType::Get<EbtUInt, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_textureProjGrad_0H3B1B1B(
>+    BuiltInId::textureProjGrad_Sampler2D1_Float4_Float2_Float2,
>+    BuiltInName::textureProjGrad,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0H3B1B1B1C,
>+    4,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_textureProjGrad_0Q3B1B1B(
>+    BuiltInId::textureProjGrad_ISampler2D1_Float4_Float2_Float2,
>+    BuiltInName::textureProjGrad,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0Q3B1B1B1C,
>+    4,
>+    StaticType::Get<EbtInt, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_textureProjGrad_0W3B1B1B(
>+    BuiltInId::textureProjGrad_USampler2D1_Float4_Float2_Float2,
>+    BuiltInName::textureProjGrad,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0W3B1B1B1C,
>+    4,
>+    StaticType::Get<EbtUInt, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_textureProjGrad_0I3B2B2B(
>+    BuiltInId::textureProjGrad_Sampler3D1_Float4_Float3_Float3,
>+    BuiltInName::textureProjGrad,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0I3B2B2B2C,
>+    4,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_textureProjGrad_0R3B2B2B(
>+    BuiltInId::textureProjGrad_ISampler3D1_Float4_Float3_Float3,
>+    BuiltInName::textureProjGrad,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0R3B2B2B2C,
>+    4,
>+    StaticType::Get<EbtInt, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_textureProjGrad_0X3B2B2B(
>+    BuiltInId::textureProjGrad_USampler3D1_Float4_Float3_Float3,
>+    BuiltInName::textureProjGrad,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0X3B2B2B2C,
>+    4,
>+    StaticType::Get<EbtUInt, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_textureProjGrad_0c3B1B1B(
>+    BuiltInId::textureProjGrad_Sampler2DShadow1_Float4_Float2_Float2,
>+    BuiltInName::textureProjGrad,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0c3B1B1B1C,
>+    4,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 1, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_textureSize_0O(
>+    BuiltInId::textureSize_Sampler2DMS1,
>+    BuiltInName::textureSize,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0O1C0C,
>+    1,
>+    StaticType::Get<EbtInt, EbpUndefined, EvqGlobal, 2, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_textureSize_0U(
>+    BuiltInId::textureSize_ISampler2DMS1,
>+    BuiltInName::textureSize,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0U1C0C,
>+    1,
>+    StaticType::Get<EbtInt, EbpUndefined, EvqGlobal, 2, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_textureSize_0a(
>+    BuiltInId::textureSize_USampler2DMS1,
>+    BuiltInName::textureSize,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0a1C0C,
>+    1,
>+    StaticType::Get<EbtInt, EbpUndefined, EvqGlobal, 2, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_textureSizeExt_0O(
>+    BuiltInId::textureSizeExt_Sampler2DMS1,
>+    BuiltInName::textureSizeExt,
>+    TExtension::ANGLE_texture_multisample,
>+    BuiltInParameters::p0O1C0C,
>+    1,
>+    StaticType::Get<EbtInt, EbpUndefined, EvqGlobal, 2, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_textureSizeExt_0U(
>+    BuiltInId::textureSizeExt_ISampler2DMS1,
>+    BuiltInName::textureSizeExt,
>+    TExtension::ANGLE_texture_multisample,
>+    BuiltInParameters::p0U1C0C,
>+    1,
>+    StaticType::Get<EbtInt, EbpUndefined, EvqGlobal, 2, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_textureSizeExt_0a(
>+    BuiltInId::textureSizeExt_USampler2DMS1,
>+    BuiltInName::textureSizeExt,
>+    TExtension::ANGLE_texture_multisample,
>+    BuiltInParameters::p0a1C0C,
>+    1,
>+    StaticType::Get<EbtInt, EbpUndefined, EvqGlobal, 2, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_textureSize_0P(
>+    BuiltInId::textureSize_Sampler2DMSArray1,
>+    BuiltInName::textureSize,
>+    TExtension::OES_texture_storage_multisample_2d_array,
>+    BuiltInParameters::p0P2C0C,
>+    1,
>+    StaticType::Get<EbtInt, EbpUndefined, EvqGlobal, 3, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_textureSize_0V(
>+    BuiltInId::textureSize_ISampler2DMSArray1,
>+    BuiltInName::textureSize,
>+    TExtension::OES_texture_storage_multisample_2d_array,
>+    BuiltInParameters::p0V2C0C,
>+    1,
>+    StaticType::Get<EbtInt, EbpUndefined, EvqGlobal, 3, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_textureSize_0b(
>+    BuiltInId::textureSize_USampler2DMSArray1,
>+    BuiltInName::textureSize,
>+    TExtension::OES_texture_storage_multisample_2d_array,
>+    BuiltInParameters::p0b2C0C,
>+    1,
>+    StaticType::Get<EbtInt, EbpUndefined, EvqGlobal, 3, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_textureOffset_0H1B1C(
>+    BuiltInId::textureOffset_Sampler2D1_Float2_Int2,
>+    BuiltInName::textureOffset,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0H1B1C0B,
>+    3,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_textureOffset_0Q1B1C(
>+    BuiltInId::textureOffset_ISampler2D1_Float2_Int2,
>+    BuiltInName::textureOffset,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0Q1B1C0C,
>+    3,
>+    StaticType::Get<EbtInt, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_textureOffset_0W1B1C(
>+    BuiltInId::textureOffset_USampler2D1_Float2_Int2,
>+    BuiltInName::textureOffset,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0W1B1C0C,
>+    3,
>+    StaticType::Get<EbtUInt, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_textureOffset_0I2B2C(
>+    BuiltInId::textureOffset_Sampler3D1_Float3_Int3,
>+    BuiltInName::textureOffset,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0I2B2C0B,
>+    3,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_textureOffset_0R2B2C(
>+    BuiltInId::textureOffset_ISampler3D1_Float3_Int3,
>+    BuiltInName::textureOffset,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0R2B2C0B,
>+    3,
>+    StaticType::Get<EbtInt, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_textureOffset_0X2B2C(
>+    BuiltInId::textureOffset_USampler3D1_Float3_Int3,
>+    BuiltInName::textureOffset,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0X2B2C0B,
>+    3,
>+    StaticType::Get<EbtUInt, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_textureOffset_0c2B1C(
>+    BuiltInId::textureOffset_Sampler2DShadow1_Float3_Int2,
>+    BuiltInName::textureOffset,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0c2B1C0B,
>+    3,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 1, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_textureOffset_0K2B1C(
>+    BuiltInId::textureOffset_Sampler2DArray1_Float3_Int2,
>+    BuiltInName::textureOffset,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0K2B1C0C,
>+    3,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_textureOffset_0T2B1C(
>+    BuiltInId::textureOffset_ISampler2DArray1_Float3_Int2,
>+    BuiltInName::textureOffset,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0T2B1C0C,
>+    3,
>+    StaticType::Get<EbtInt, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_textureOffset_0Z2B1C(
>+    BuiltInId::textureOffset_USampler2DArray1_Float3_Int2,
>+    BuiltInName::textureOffset,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0Z2B1C0C,
>+    3,
>+    StaticType::Get<EbtUInt, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_textureProjOffset_0H2B1C(
>+    BuiltInId::textureProjOffset_Sampler2D1_Float3_Int2,
>+    BuiltInName::textureProjOffset,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0H2B1C0B,
>+    3,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_textureProjOffset_0Q2B1C(
>+    BuiltInId::textureProjOffset_ISampler2D1_Float3_Int2,
>+    BuiltInName::textureProjOffset,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0Q2B1C0B,
>+    3,
>+    StaticType::Get<EbtInt, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_textureProjOffset_0W2B1C(
>+    BuiltInId::textureProjOffset_USampler2D1_Float3_Int2,
>+    BuiltInName::textureProjOffset,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0W2B1C0B,
>+    3,
>+    StaticType::Get<EbtUInt, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_textureProjOffset_0H3B1C(
>+    BuiltInId::textureProjOffset_Sampler2D1_Float4_Int2,
>+    BuiltInName::textureProjOffset,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0H3B1C0B,
>+    3,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_textureProjOffset_0Q3B1C(
>+    BuiltInId::textureProjOffset_ISampler2D1_Float4_Int2,
>+    BuiltInName::textureProjOffset,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0Q3B1C0B,
>+    3,
>+    StaticType::Get<EbtInt, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_textureProjOffset_0W3B1C(
>+    BuiltInId::textureProjOffset_USampler2D1_Float4_Int2,
>+    BuiltInName::textureProjOffset,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0W3B1C0B,
>+    3,
>+    StaticType::Get<EbtUInt, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_textureProjOffset_0I3B2C(
>+    BuiltInId::textureProjOffset_Sampler3D1_Float4_Int3,
>+    BuiltInName::textureProjOffset,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0I3B2C0B,
>+    3,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_textureProjOffset_0R3B2C(
>+    BuiltInId::textureProjOffset_ISampler3D1_Float4_Int3,
>+    BuiltInName::textureProjOffset,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0R3B2C0B,
>+    3,
>+    StaticType::Get<EbtInt, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_textureProjOffset_0X3B2C(
>+    BuiltInId::textureProjOffset_USampler3D1_Float4_Int3,
>+    BuiltInName::textureProjOffset,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0X3B2C0B,
>+    3,
>+    StaticType::Get<EbtUInt, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_textureProjOffset_0c3B1C(
>+    BuiltInId::textureProjOffset_Sampler2DShadow1_Float4_Int2,
>+    BuiltInName::textureProjOffset,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0c3B1C0B,
>+    3,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 1, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_textureLodOffset_0H1B0B1C(
>+    BuiltInId::textureLodOffset_Sampler2D1_Float2_Float1_Int2,
>+    BuiltInName::textureLodOffset,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0H1B0B1C,
>+    4,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_textureLodOffset_0Q1B0B1C(
>+    BuiltInId::textureLodOffset_ISampler2D1_Float2_Float1_Int2,
>+    BuiltInName::textureLodOffset,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0Q1B0B1C,
>+    4,
>+    StaticType::Get<EbtInt, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_textureLodOffset_0W1B0B1C(
>+    BuiltInId::textureLodOffset_USampler2D1_Float2_Float1_Int2,
>+    BuiltInName::textureLodOffset,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0W1B0B1C,
>+    4,
>+    StaticType::Get<EbtUInt, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_textureLodOffset_0I2B0B2C(
>+    BuiltInId::textureLodOffset_Sampler3D1_Float3_Float1_Int3,
>+    BuiltInName::textureLodOffset,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0I2B0B2C,
>+    4,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_textureLodOffset_0R2B0B2C(
>+    BuiltInId::textureLodOffset_ISampler3D1_Float3_Float1_Int3,
>+    BuiltInName::textureLodOffset,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0R2B0B2C,
>+    4,
>+    StaticType::Get<EbtInt, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_textureLodOffset_0X2B0B2C(
>+    BuiltInId::textureLodOffset_USampler3D1_Float3_Float1_Int3,
>+    BuiltInName::textureLodOffset,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0X2B0B2C,
>+    4,
>+    StaticType::Get<EbtUInt, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_textureLodOffset_0c2B0B1C(
>+    BuiltInId::textureLodOffset_Sampler2DShadow1_Float3_Float1_Int2,
>+    BuiltInName::textureLodOffset,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0c2B0B1C,
>+    4,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 1, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_textureLodOffset_0K2B0B1C(
>+    BuiltInId::textureLodOffset_Sampler2DArray1_Float3_Float1_Int2,
>+    BuiltInName::textureLodOffset,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0K2B0B1C,
>+    4,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_textureLodOffset_0T2B0B1C(
>+    BuiltInId::textureLodOffset_ISampler2DArray1_Float3_Float1_Int2,
>+    BuiltInName::textureLodOffset,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0T2B0B1C,
>+    4,
>+    StaticType::Get<EbtInt, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_textureLodOffset_0Z2B0B1C(
>+    BuiltInId::textureLodOffset_USampler2DArray1_Float3_Float1_Int2,
>+    BuiltInName::textureLodOffset,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0Z2B0B1C,
>+    4,
>+    StaticType::Get<EbtUInt, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_textureProjLodOffset_0H2B0B1C(
>+    BuiltInId::textureProjLodOffset_Sampler2D1_Float3_Float1_Int2,
>+    BuiltInName::textureProjLodOffset,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0H2B0B1C,
>+    4,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_textureProjLodOffset_0Q2B0B1C(
>+    BuiltInId::textureProjLodOffset_ISampler2D1_Float3_Float1_Int2,
>+    BuiltInName::textureProjLodOffset,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0Q2B0B1C,
>+    4,
>+    StaticType::Get<EbtInt, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_textureProjLodOffset_0W2B0B1C(
>+    BuiltInId::textureProjLodOffset_USampler2D1_Float3_Float1_Int2,
>+    BuiltInName::textureProjLodOffset,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0W2B0B1C,
>+    4,
>+    StaticType::Get<EbtUInt, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_textureProjLodOffset_0H3B0B1C(
>+    BuiltInId::textureProjLodOffset_Sampler2D1_Float4_Float1_Int2,
>+    BuiltInName::textureProjLodOffset,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0H3B0B1C,
>+    4,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_textureProjLodOffset_0Q3B0B1C(
>+    BuiltInId::textureProjLodOffset_ISampler2D1_Float4_Float1_Int2,
>+    BuiltInName::textureProjLodOffset,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0Q3B0B1C,
>+    4,
>+    StaticType::Get<EbtInt, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_textureProjLodOffset_0W3B0B1C(
>+    BuiltInId::textureProjLodOffset_USampler2D1_Float4_Float1_Int2,
>+    BuiltInName::textureProjLodOffset,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0W3B0B1C,
>+    4,
>+    StaticType::Get<EbtUInt, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_textureProjLodOffset_0I3B0B2C(
>+    BuiltInId::textureProjLodOffset_Sampler3D1_Float4_Float1_Int3,
>+    BuiltInName::textureProjLodOffset,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0I3B0B2C,
>+    4,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_textureProjLodOffset_0R3B0B2C(
>+    BuiltInId::textureProjLodOffset_ISampler3D1_Float4_Float1_Int3,
>+    BuiltInName::textureProjLodOffset,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0R3B0B2C,
>+    4,
>+    StaticType::Get<EbtInt, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_textureProjLodOffset_0X3B0B2C(
>+    BuiltInId::textureProjLodOffset_USampler3D1_Float4_Float1_Int3,
>+    BuiltInName::textureProjLodOffset,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0X3B0B2C,
>+    4,
>+    StaticType::Get<EbtUInt, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_textureProjLodOffset_0c3B0B1C(
>+    BuiltInId::textureProjLodOffset_Sampler2DShadow1_Float4_Float1_Int2,
>+    BuiltInName::textureProjLodOffset,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0c3B0B1C,
>+    4,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 1, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_texelFetchOffset_0H1C0C1C(
>+    BuiltInId::texelFetchOffset_Sampler2D1_Int2_Int1_Int2,
>+    BuiltInName::texelFetchOffset,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0H1C0C1C,
>+    4,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_texelFetchOffset_0Q1C0C1C(
>+    BuiltInId::texelFetchOffset_ISampler2D1_Int2_Int1_Int2,
>+    BuiltInName::texelFetchOffset,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0Q1C0C1C,
>+    4,
>+    StaticType::Get<EbtInt, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_texelFetchOffset_0W1C0C1C(
>+    BuiltInId::texelFetchOffset_USampler2D1_Int2_Int1_Int2,
>+    BuiltInName::texelFetchOffset,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0W1C0C1C,
>+    4,
>+    StaticType::Get<EbtUInt, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_texelFetchOffset_0I2C0C2C(
>+    BuiltInId::texelFetchOffset_Sampler3D1_Int3_Int1_Int3,
>+    BuiltInName::texelFetchOffset,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0I2C0C2C,
>+    4,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_texelFetchOffset_0R2C0C2C(
>+    BuiltInId::texelFetchOffset_ISampler3D1_Int3_Int1_Int3,
>+    BuiltInName::texelFetchOffset,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0R2C0C2C,
>+    4,
>+    StaticType::Get<EbtInt, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_texelFetchOffset_0X2C0C2C(
>+    BuiltInId::texelFetchOffset_USampler3D1_Int3_Int1_Int3,
>+    BuiltInName::texelFetchOffset,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0X2C0C2C,
>+    4,
>+    StaticType::Get<EbtUInt, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_texelFetchOffset_0K2C0C1C(
>+    BuiltInId::texelFetchOffset_Sampler2DArray1_Int3_Int1_Int2,
>+    BuiltInName::texelFetchOffset,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0K2C0C1C,
>+    4,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_texelFetchOffset_0T2C0C1C(
>+    BuiltInId::texelFetchOffset_ISampler2DArray1_Int3_Int1_Int2,
>+    BuiltInName::texelFetchOffset,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0T2C0C1C,
>+    4,
>+    StaticType::Get<EbtInt, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_texelFetchOffset_0Z2C0C1C(
>+    BuiltInId::texelFetchOffset_USampler2DArray1_Int3_Int1_Int2,
>+    BuiltInName::texelFetchOffset,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0Z2C0C1C,
>+    4,
>+    StaticType::Get<EbtUInt, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_textureGradOffset_0H1B1B1B1C(
>+    BuiltInId::textureGradOffset_Sampler2D1_Float2_Float2_Float2_Int2,
>+    BuiltInName::textureGradOffset,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0H1B1B1B1C,
>+    5,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_textureGradOffset_0Q1B1B1B1C(
>+    BuiltInId::textureGradOffset_ISampler2D1_Float2_Float2_Float2_Int2,
>+    BuiltInName::textureGradOffset,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0Q1B1B1B1C,
>+    5,
>+    StaticType::Get<EbtInt, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_textureGradOffset_0W1B1B1B1C(
>+    BuiltInId::textureGradOffset_USampler2D1_Float2_Float2_Float2_Int2,
>+    BuiltInName::textureGradOffset,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0W1B1B1B1C,
>+    5,
>+    StaticType::Get<EbtUInt, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_textureGradOffset_0I2B2B2B2C(
>+    BuiltInId::textureGradOffset_Sampler3D1_Float3_Float3_Float3_Int3,
>+    BuiltInName::textureGradOffset,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0I2B2B2B2C,
>+    5,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_textureGradOffset_0R2B2B2B2C(
>+    BuiltInId::textureGradOffset_ISampler3D1_Float3_Float3_Float3_Int3,
>+    BuiltInName::textureGradOffset,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0R2B2B2B2C,
>+    5,
>+    StaticType::Get<EbtInt, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_textureGradOffset_0X2B2B2B2C(
>+    BuiltInId::textureGradOffset_USampler3D1_Float3_Float3_Float3_Int3,
>+    BuiltInName::textureGradOffset,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0X2B2B2B2C,
>+    5,
>+    StaticType::Get<EbtUInt, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_textureGradOffset_0c2B1B1B1C(
>+    BuiltInId::textureGradOffset_Sampler2DShadow1_Float3_Float2_Float2_Int2,
>+    BuiltInName::textureGradOffset,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0c2B1B1B1C,
>+    5,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 1, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_textureGradOffset_0K2B1B1B1C(
>+    BuiltInId::textureGradOffset_Sampler2DArray1_Float3_Float2_Float2_Int2,
>+    BuiltInName::textureGradOffset,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0K2B1B1B1C,
>+    5,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_textureGradOffset_0T2B1B1B1C(
>+    BuiltInId::textureGradOffset_ISampler2DArray1_Float3_Float2_Float2_Int2,
>+    BuiltInName::textureGradOffset,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0T2B1B1B1C,
>+    5,
>+    StaticType::Get<EbtInt, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_textureGradOffset_0Z2B1B1B1C(
>+    BuiltInId::textureGradOffset_USampler2DArray1_Float3_Float2_Float2_Int2,
>+    BuiltInName::textureGradOffset,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0Z2B1B1B1C,
>+    5,
>+    StaticType::Get<EbtUInt, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_textureGradOffset_0e3B1B1B1C(
>+    BuiltInId::textureGradOffset_Sampler2DArrayShadow1_Float4_Float2_Float2_Int2,
>+    BuiltInName::textureGradOffset,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0e3B1B1B1C,
>+    5,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 1, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_textureProjGradOffset_0H2B1B1B1C(
>+    BuiltInId::textureProjGradOffset_Sampler2D1_Float3_Float2_Float2_Int2,
>+    BuiltInName::textureProjGradOffset,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0H2B1B1B1C,
>+    5,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_textureProjGradOffset_0Q2B1B1B1C(
>+    BuiltInId::textureProjGradOffset_ISampler2D1_Float3_Float2_Float2_Int2,
>+    BuiltInName::textureProjGradOffset,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0Q2B1B1B1C,
>+    5,
>+    StaticType::Get<EbtInt, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_textureProjGradOffset_0W2B1B1B1C(
>+    BuiltInId::textureProjGradOffset_USampler2D1_Float3_Float2_Float2_Int2,
>+    BuiltInName::textureProjGradOffset,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0W2B1B1B1C,
>+    5,
>+    StaticType::Get<EbtUInt, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_textureProjGradOffset_0H3B1B1B1C(
>+    BuiltInId::textureProjGradOffset_Sampler2D1_Float4_Float2_Float2_Int2,
>+    BuiltInName::textureProjGradOffset,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0H3B1B1B1C,
>+    5,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_textureProjGradOffset_0Q3B1B1B1C(
>+    BuiltInId::textureProjGradOffset_ISampler2D1_Float4_Float2_Float2_Int2,
>+    BuiltInName::textureProjGradOffset,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0Q3B1B1B1C,
>+    5,
>+    StaticType::Get<EbtInt, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_textureProjGradOffset_0W3B1B1B1C(
>+    BuiltInId::textureProjGradOffset_USampler2D1_Float4_Float2_Float2_Int2,
>+    BuiltInName::textureProjGradOffset,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0W3B1B1B1C,
>+    5,
>+    StaticType::Get<EbtUInt, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_textureProjGradOffset_0I3B2B2B2C(
>+    BuiltInId::textureProjGradOffset_Sampler3D1_Float4_Float3_Float3_Int3,
>+    BuiltInName::textureProjGradOffset,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0I3B2B2B2C,
>+    5,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_textureProjGradOffset_0R3B2B2B2C(
>+    BuiltInId::textureProjGradOffset_ISampler3D1_Float4_Float3_Float3_Int3,
>+    BuiltInName::textureProjGradOffset,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0R3B2B2B2C,
>+    5,
>+    StaticType::Get<EbtInt, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_textureProjGradOffset_0X3B2B2B2C(
>+    BuiltInId::textureProjGradOffset_USampler3D1_Float4_Float3_Float3_Int3,
>+    BuiltInName::textureProjGradOffset,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0X3B2B2B2C,
>+    5,
>+    StaticType::Get<EbtUInt, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_textureProjGradOffset_0c3B1B1B1C(
>+    BuiltInId::textureProjGradOffset_Sampler2DShadow1_Float4_Float2_Float2_Int2,
>+    BuiltInName::textureProjGradOffset,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0c3B1B1B1C,
>+    5,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 1, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_textureOffset_0H1B1C0B(
>+    BuiltInId::textureOffset_Sampler2D1_Float2_Int2_Float1,
>+    BuiltInName::textureOffset,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0H1B1C0B,
>+    4,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_textureOffset_0Q1B1C0B(
>+    BuiltInId::textureOffset_ISampler2D1_Float2_Int2_Float1,
>+    BuiltInName::textureOffset,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0Q1B1C0B,
>+    4,
>+    StaticType::Get<EbtInt, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_textureOffset_0W1B1C0B(
>+    BuiltInId::textureOffset_USampler2D1_Float2_Int2_Float1,
>+    BuiltInName::textureOffset,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0W1B1C0B,
>+    4,
>+    StaticType::Get<EbtUInt, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_textureOffset_0I2B2C0B(
>+    BuiltInId::textureOffset_Sampler3D1_Float3_Int3_Float1,
>+    BuiltInName::textureOffset,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0I2B2C0B,
>+    4,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_textureOffset_0R2B2C0B(
>+    BuiltInId::textureOffset_ISampler3D1_Float3_Int3_Float1,
>+    BuiltInName::textureOffset,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0R2B2C0B,
>+    4,
>+    StaticType::Get<EbtInt, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_textureOffset_0X2B2C0B(
>+    BuiltInId::textureOffset_USampler3D1_Float3_Int3_Float1,
>+    BuiltInName::textureOffset,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0X2B2C0B,
>+    4,
>+    StaticType::Get<EbtUInt, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_textureOffset_0c2B1C0B(
>+    BuiltInId::textureOffset_Sampler2DShadow1_Float3_Int2_Float1,
>+    BuiltInName::textureOffset,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0c2B1C0B,
>+    4,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 1, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_textureOffset_0K2B1C0B(
>+    BuiltInId::textureOffset_Sampler2DArray1_Float3_Int2_Float1,
>+    BuiltInName::textureOffset,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0K2B1C0B,
>+    4,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_textureOffset_0T2B1C0B(
>+    BuiltInId::textureOffset_ISampler2DArray1_Float3_Int2_Float1,
>+    BuiltInName::textureOffset,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0T2B1C0B,
>+    4,
>+    StaticType::Get<EbtInt, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_textureOffset_0Z2B1C0B(
>+    BuiltInId::textureOffset_USampler2DArray1_Float3_Int2_Float1,
>+    BuiltInName::textureOffset,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0Z2B1C0B,
>+    4,
>+    StaticType::Get<EbtUInt, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_textureProjOffset_0H2B1C0B(
>+    BuiltInId::textureProjOffset_Sampler2D1_Float3_Int2_Float1,
>+    BuiltInName::textureProjOffset,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0H2B1C0B,
>+    4,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_textureProjOffset_0Q2B1C0B(
>+    BuiltInId::textureProjOffset_ISampler2D1_Float3_Int2_Float1,
>+    BuiltInName::textureProjOffset,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0Q2B1C0B,
>+    4,
>+    StaticType::Get<EbtInt, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_textureProjOffset_0W2B1C0B(
>+    BuiltInId::textureProjOffset_USampler2D1_Float3_Int2_Float1,
>+    BuiltInName::textureProjOffset,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0W2B1C0B,
>+    4,
>+    StaticType::Get<EbtUInt, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_textureProjOffset_0H3B1C0B(
>+    BuiltInId::textureProjOffset_Sampler2D1_Float4_Int2_Float1,
>+    BuiltInName::textureProjOffset,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0H3B1C0B,
>+    4,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_textureProjOffset_0Q3B1C0B(
>+    BuiltInId::textureProjOffset_ISampler2D1_Float4_Int2_Float1,
>+    BuiltInName::textureProjOffset,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0Q3B1C0B,
>+    4,
>+    StaticType::Get<EbtInt, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_textureProjOffset_0W3B1C0B(
>+    BuiltInId::textureProjOffset_USampler2D1_Float4_Int2_Float1,
>+    BuiltInName::textureProjOffset,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0W3B1C0B,
>+    4,
>+    StaticType::Get<EbtUInt, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_textureProjOffset_0I3B2C0B(
>+    BuiltInId::textureProjOffset_Sampler3D1_Float4_Int3_Float1,
>+    BuiltInName::textureProjOffset,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0I3B2C0B,
>+    4,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_textureProjOffset_0R3B2C0B(
>+    BuiltInId::textureProjOffset_ISampler3D1_Float4_Int3_Float1,
>+    BuiltInName::textureProjOffset,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0R3B2C0B,
>+    4,
>+    StaticType::Get<EbtInt, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_textureProjOffset_0X3B2C0B(
>+    BuiltInId::textureProjOffset_USampler3D1_Float4_Int3_Float1,
>+    BuiltInName::textureProjOffset,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0X3B2C0B,
>+    4,
>+    StaticType::Get<EbtUInt, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_textureProjOffset_0c3B1C0B(
>+    BuiltInId::textureProjOffset_Sampler2DShadow1_Float4_Int2_Float1,
>+    BuiltInName::textureProjOffset,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0c3B1C0B,
>+    4,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 1, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_texture_0L1B(
>+    BuiltInId::texture_SamplerExternalOES1_Float2,
>+    BuiltInName::texture,
>+    TExtension::OES_EGL_image_external_essl3,
>+    BuiltInParameters::p0L1B0B,
>+    2,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_textureProj_0L2B(
>+    BuiltInId::textureProj_SamplerExternalOES1_Float3,
>+    BuiltInName::textureProj,
>+    TExtension::OES_EGL_image_external_essl3,
>+    BuiltInParameters::p0L2B0B,
>+    2,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_textureProj_0L3B(
>+    BuiltInId::textureProj_SamplerExternalOES1_Float4,
>+    BuiltInName::textureProj,
>+    TExtension::OES_EGL_image_external_essl3,
>+    BuiltInParameters::p0L3B0B,
>+    2,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_textureSize_0L0C(
>+    BuiltInId::textureSize_SamplerExternalOES1_Int1,
>+    BuiltInName::textureSize,
>+    TExtension::OES_EGL_image_external_essl3,
>+    BuiltInParameters::p0L0C,
>+    2,
>+    StaticType::Get<EbtInt, EbpUndefined, EvqGlobal, 2, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_texelFetch_0L1C0C(
>+    BuiltInId::texelFetch_SamplerExternalOES1_Int2_Int1,
>+    BuiltInName::texelFetch,
>+    TExtension::OES_EGL_image_external_essl3,
>+    BuiltInParameters::p0L1C0C,
>+    3,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_texture_0M1B(
>+    BuiltInId::texture_SamplerExternal2DY2YEXT1_Float2,
>+    BuiltInName::texture,
>+    TExtension::EXT_YUV_target,
>+    BuiltInParameters::p0M1B0B,
>+    2,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_textureProj_0M2B(
>+    BuiltInId::textureProj_SamplerExternal2DY2YEXT1_Float3,
>+    BuiltInName::textureProj,
>+    TExtension::EXT_YUV_target,
>+    BuiltInParameters::p0M2B0B,
>+    2,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_textureProj_0M3B(
>+    BuiltInId::textureProj_SamplerExternal2DY2YEXT1_Float4,
>+    BuiltInName::textureProj,
>+    TExtension::EXT_YUV_target,
>+    BuiltInParameters::p0M3B0B,
>+    2,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_rgb_2_yuv_2B0G(
>+    BuiltInId::rgb_2_yuv_Float3_YuvCscStandardEXT1,
>+    BuiltInName::rgb_2_yuv,
>+    TExtension::EXT_YUV_target,
>+    BuiltInParameters::p2B0G,
>+    2,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 3, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_yuv_2_rgb_2B0G(
>+    BuiltInId::yuv_2_rgb_Float3_YuvCscStandardEXT1,
>+    BuiltInName::yuv_2_rgb,
>+    TExtension::EXT_YUV_target,
>+    BuiltInParameters::p2B0G,
>+    2,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 3, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_textureSize_0M0C(
>+    BuiltInId::textureSize_SamplerExternal2DY2YEXT1_Int1,
>+    BuiltInName::textureSize,
>+    TExtension::EXT_YUV_target,
>+    BuiltInParameters::p0M0C,
>+    2,
>+    StaticType::Get<EbtInt, EbpUndefined, EvqGlobal, 2, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_texelFetch_0M1C0C(
>+    BuiltInId::texelFetch_SamplerExternal2DY2YEXT1_Int2_Int1,
>+    BuiltInName::texelFetch,
>+    TExtension::EXT_YUV_target,
>+    BuiltInParameters::p0M1C0C,
>+    3,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_texture_0H1B0B(
>+    BuiltInId::texture_Sampler2D1_Float2_Float1,
>+    BuiltInName::texture,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0H1B0B1C,
>+    3,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_texture_0Q1B0B(
>+    BuiltInId::texture_ISampler2D1_Float2_Float1,
>+    BuiltInName::texture,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0Q1B0B1C,
>+    3,
>+    StaticType::Get<EbtInt, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_texture_0W1B0B(
>+    BuiltInId::texture_USampler2D1_Float2_Float1,
>+    BuiltInName::texture,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0W1B0B1C,
>+    3,
>+    StaticType::Get<EbtUInt, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_texture_0I2B0B(
>+    BuiltInId::texture_Sampler3D1_Float3_Float1,
>+    BuiltInName::texture,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0I2B0B2C,
>+    3,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_texture_0R2B0B(
>+    BuiltInId::texture_ISampler3D1_Float3_Float1,
>+    BuiltInName::texture,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0R2B0B2C,
>+    3,
>+    StaticType::Get<EbtInt, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_texture_0X2B0B(
>+    BuiltInId::texture_USampler3D1_Float3_Float1,
>+    BuiltInName::texture,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0X2B0B2C,
>+    3,
>+    StaticType::Get<EbtUInt, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_texture_0J2B0B(
>+    BuiltInId::texture_SamplerCube1_Float3_Float1,
>+    BuiltInName::texture,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0J2B0B,
>+    3,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_texture_0S2B0B(
>+    BuiltInId::texture_ISamplerCube1_Float3_Float1,
>+    BuiltInName::texture,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0S2B0B,
>+    3,
>+    StaticType::Get<EbtInt, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_texture_0Y2B0B(
>+    BuiltInId::texture_USamplerCube1_Float3_Float1,
>+    BuiltInName::texture,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0Y2B0B,
>+    3,
>+    StaticType::Get<EbtUInt, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_texture_0K2B0B(
>+    BuiltInId::texture_Sampler2DArray1_Float3_Float1,
>+    BuiltInName::texture,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0K2B0B1C,
>+    3,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_texture_0T2B0B(
>+    BuiltInId::texture_ISampler2DArray1_Float3_Float1,
>+    BuiltInName::texture,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0T2B0B1C,
>+    3,
>+    StaticType::Get<EbtInt, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_texture_0Z2B0B(
>+    BuiltInId::texture_USampler2DArray1_Float3_Float1,
>+    BuiltInName::texture,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0Z2B0B1C,
>+    3,
>+    StaticType::Get<EbtUInt, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_textureProj_0H2B0B(
>+    BuiltInId::textureProj_Sampler2D1_Float3_Float1,
>+    BuiltInName::textureProj,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0H2B0B1C,
>+    3,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_textureProj_0Q2B0B(
>+    BuiltInId::textureProj_ISampler2D1_Float3_Float1,
>+    BuiltInName::textureProj,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0Q2B0B1C,
>+    3,
>+    StaticType::Get<EbtInt, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_textureProj_0W2B0B(
>+    BuiltInId::textureProj_USampler2D1_Float3_Float1,
>+    BuiltInName::textureProj,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0W2B0B1C,
>+    3,
>+    StaticType::Get<EbtUInt, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_textureProj_0H3B0B(
>+    BuiltInId::textureProj_Sampler2D1_Float4_Float1,
>+    BuiltInName::textureProj,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0H3B0B1C,
>+    3,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_textureProj_0Q3B0B(
>+    BuiltInId::textureProj_ISampler2D1_Float4_Float1,
>+    BuiltInName::textureProj,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0Q3B0B1C,
>+    3,
>+    StaticType::Get<EbtInt, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_textureProj_0W3B0B(
>+    BuiltInId::textureProj_USampler2D1_Float4_Float1,
>+    BuiltInName::textureProj,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0W3B0B1C,
>+    3,
>+    StaticType::Get<EbtUInt, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_textureProj_0I3B0B(
>+    BuiltInId::textureProj_Sampler3D1_Float4_Float1,
>+    BuiltInName::textureProj,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0I3B0B2C,
>+    3,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_textureProj_0R3B0B(
>+    BuiltInId::textureProj_ISampler3D1_Float4_Float1,
>+    BuiltInName::textureProj,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0R3B0B2C,
>+    3,
>+    StaticType::Get<EbtInt, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_textureProj_0X3B0B(
>+    BuiltInId::textureProj_USampler3D1_Float4_Float1,
>+    BuiltInName::textureProj,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0X3B0B2C,
>+    3,
>+    StaticType::Get<EbtUInt, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_texture_0c2B0B(
>+    BuiltInId::texture_Sampler2DShadow1_Float3_Float1,
>+    BuiltInName::texture,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0c2B0B1C,
>+    3,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 1, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_texture_0d3B0B(
>+    BuiltInId::texture_SamplerCubeShadow1_Float4_Float1,
>+    BuiltInName::texture,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0d3B0B,
>+    3,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 1, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_textureProj_0c3B0B(
>+    BuiltInId::textureProj_Sampler2DShadow1_Float4_Float1,
>+    BuiltInName::textureProj,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0c3B0B1C,
>+    3,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 1, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_texture_0L1B0B(
>+    BuiltInId::texture_SamplerExternalOES1_Float2_Float1,
>+    BuiltInName::texture,
>+    TExtension::OES_EGL_image_external_essl3,
>+    BuiltInParameters::p0L1B0B,
>+    3,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_textureProj_0L2B0B(
>+    BuiltInId::textureProj_SamplerExternalOES1_Float3_Float1,
>+    BuiltInName::textureProj,
>+    TExtension::OES_EGL_image_external_essl3,
>+    BuiltInParameters::p0L2B0B,
>+    3,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_textureProj_0L3B0B(
>+    BuiltInId::textureProj_SamplerExternalOES1_Float4_Float1,
>+    BuiltInName::textureProj,
>+    TExtension::OES_EGL_image_external_essl3,
>+    BuiltInParameters::p0L3B0B,
>+    3,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_texture_0M1B0B(
>+    BuiltInId::texture_SamplerExternal2DY2YEXT1_Float2_Float1,
>+    BuiltInName::texture,
>+    TExtension::EXT_YUV_target,
>+    BuiltInParameters::p0M1B0B,
>+    3,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_textureProj_0M2B0B(
>+    BuiltInId::textureProj_SamplerExternal2DY2YEXT1_Float3_Float1,
>+    BuiltInName::textureProj,
>+    TExtension::EXT_YUV_target,
>+    BuiltInParameters::p0M2B0B,
>+    3,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_textureProj_0M3B0B(
>+    BuiltInId::textureProj_SamplerExternal2DY2YEXT1_Float4_Float1,
>+    BuiltInName::textureProj,
>+    TExtension::EXT_YUV_target,
>+    BuiltInParameters::p0M3B0B,
>+    3,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_texelFetch_0O1C0C(
>+    BuiltInId::texelFetch_Sampler2DMS1_Int2_Int1,
>+    BuiltInName::texelFetch,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0O1C0C,
>+    3,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_texelFetch_0U1C0C(
>+    BuiltInId::texelFetch_ISampler2DMS1_Int2_Int1,
>+    BuiltInName::texelFetch,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0U1C0C,
>+    3,
>+    StaticType::Get<EbtInt, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_texelFetch_0a1C0C(
>+    BuiltInId::texelFetch_USampler2DMS1_Int2_Int1,
>+    BuiltInName::texelFetch,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0a1C0C,
>+    3,
>+    StaticType::Get<EbtUInt, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_texelFetchExt_0O1C0C(
>+    BuiltInId::texelFetchExt_Sampler2DMS1_Int2_Int1,
>+    BuiltInName::texelFetchExt,
>+    TExtension::ANGLE_texture_multisample,
>+    BuiltInParameters::p0O1C0C,
>+    3,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_texelFetchExt_0U1C0C(
>+    BuiltInId::texelFetchExt_ISampler2DMS1_Int2_Int1,
>+    BuiltInName::texelFetchExt,
>+    TExtension::ANGLE_texture_multisample,
>+    BuiltInParameters::p0U1C0C,
>+    3,
>+    StaticType::Get<EbtInt, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_texelFetchExt_0a1C0C(
>+    BuiltInId::texelFetchExt_USampler2DMS1_Int2_Int1,
>+    BuiltInName::texelFetchExt,
>+    TExtension::ANGLE_texture_multisample,
>+    BuiltInParameters::p0a1C0C,
>+    3,
>+    StaticType::Get<EbtUInt, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_texelFetch_0P2C0C(
>+    BuiltInId::texelFetch_Sampler2DMSArray1_Int3_Int1,
>+    BuiltInName::texelFetch,
>+    TExtension::OES_texture_storage_multisample_2d_array,
>+    BuiltInParameters::p0P2C0C,
>+    3,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_texelFetch_0V2C0C(
>+    BuiltInId::texelFetch_ISampler2DMSArray1_Int3_Int1,
>+    BuiltInName::texelFetch,
>+    TExtension::OES_texture_storage_multisample_2d_array,
>+    BuiltInParameters::p0V2C0C,
>+    3,
>+    StaticType::Get<EbtInt, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_texelFetch_0b2C0C(
>+    BuiltInId::texelFetch_USampler2DMSArray1_Int3_Int1,
>+    BuiltInName::texelFetch,
>+    TExtension::OES_texture_storage_multisample_2d_array,
>+    BuiltInParameters::p0b2C0C,
>+    3,
>+    StaticType::Get<EbtUInt, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_textureGather_0H1B(
>+    BuiltInId::textureGather_Sampler2D1_Float2,
>+    BuiltInName::textureGather,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0H1B1B1B1C,
>+    2,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_textureGather_0Q1B(
>+    BuiltInId::textureGather_ISampler2D1_Float2,
>+    BuiltInName::textureGather,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0Q1B1B1B1C,
>+    2,
>+    StaticType::Get<EbtInt, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_textureGather_0W1B(
>+    BuiltInId::textureGather_USampler2D1_Float2,
>+    BuiltInName::textureGather,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0W1B1C0C,
>+    2,
>+    StaticType::Get<EbtUInt, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_textureGather_0H1B0C(
>+    BuiltInId::textureGather_Sampler2D1_Float2_Int1,
>+    BuiltInName::textureGather,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0H1B0C,
>+    3,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_textureGather_0Q1B0C(
>+    BuiltInId::textureGather_ISampler2D1_Float2_Int1,
>+    BuiltInName::textureGather,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0Q1B0C,
>+    3,
>+    StaticType::Get<EbtInt, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_textureGather_0W1B0C(
>+    BuiltInId::textureGather_USampler2D1_Float2_Int1,
>+    BuiltInName::textureGather,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0W1B0C,
>+    3,
>+    StaticType::Get<EbtUInt, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_textureGather_0K2B(
>+    BuiltInId::textureGather_Sampler2DArray1_Float3,
>+    BuiltInName::textureGather,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0K2B0B1C,
>+    2,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_textureGather_0T2B(
>+    BuiltInId::textureGather_ISampler2DArray1_Float3,
>+    BuiltInName::textureGather,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0T2B1B1B1C,
>+    2,
>+    StaticType::Get<EbtInt, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_textureGather_0Z2B(
>+    BuiltInId::textureGather_USampler2DArray1_Float3,
>+    BuiltInName::textureGather,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0Z2B1B1B1C,
>+    2,
>+    StaticType::Get<EbtUInt, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_textureGather_0K2B0C(
>+    BuiltInId::textureGather_Sampler2DArray1_Float3_Int1,
>+    BuiltInName::textureGather,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0K2B0C,
>+    3,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_textureGather_0T2B0C(
>+    BuiltInId::textureGather_ISampler2DArray1_Float3_Int1,
>+    BuiltInName::textureGather,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0T2B0C,
>+    3,
>+    StaticType::Get<EbtInt, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_textureGather_0Z2B0C(
>+    BuiltInId::textureGather_USampler2DArray1_Float3_Int1,
>+    BuiltInName::textureGather,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0Z2B0C,
>+    3,
>+    StaticType::Get<EbtUInt, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_textureGather_0J2B(
>+    BuiltInId::textureGather_SamplerCube1_Float3,
>+    BuiltInName::textureGather,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0J2B2B2B,
>+    2,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_textureGather_0S2B(
>+    BuiltInId::textureGather_ISamplerCube1_Float3,
>+    BuiltInName::textureGather,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0S2B0B,
>+    2,
>+    StaticType::Get<EbtInt, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_textureGather_0Y2B(
>+    BuiltInId::textureGather_USamplerCube1_Float3,
>+    BuiltInName::textureGather,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0Y2B0B,
>+    2,
>+    StaticType::Get<EbtUInt, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_textureGather_0J2B0C(
>+    BuiltInId::textureGather_SamplerCube1_Float3_Int1,
>+    BuiltInName::textureGather,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0J2B0C,
>+    3,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_textureGather_0S2B0C(
>+    BuiltInId::textureGather_ISamplerCube1_Float3_Int1,
>+    BuiltInName::textureGather,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0S2B0C,
>+    3,
>+    StaticType::Get<EbtInt, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_textureGather_0Y2B0C(
>+    BuiltInId::textureGather_USamplerCube1_Float3_Int1,
>+    BuiltInName::textureGather,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0Y2B0C,
>+    3,
>+    StaticType::Get<EbtUInt, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_textureGather_0c1B(
>+    BuiltInId::textureGather_Sampler2DShadow1_Float2,
>+    BuiltInName::textureGather,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0c1B0B1C,
>+    2,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_textureGather_0c1B0B(
>+    BuiltInId::textureGather_Sampler2DShadow1_Float2_Float1,
>+    BuiltInName::textureGather,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0c1B0B1C,
>+    3,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_textureGather_0e2B(
>+    BuiltInId::textureGather_Sampler2DArrayShadow1_Float3,
>+    BuiltInName::textureGather,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0e2B0B1C,
>+    2,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_textureGather_0e2B0B(
>+    BuiltInId::textureGather_Sampler2DArrayShadow1_Float3_Float1,
>+    BuiltInName::textureGather,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0e2B0B1C,
>+    3,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_textureGather_0d2B(
>+    BuiltInId::textureGather_SamplerCubeShadow1_Float3,
>+    BuiltInName::textureGather,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0d2B0B,
>+    2,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_textureGather_0d2B0B(
>+    BuiltInId::textureGather_SamplerCubeShadow1_Float3_Float1,
>+    BuiltInName::textureGather,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0d2B0B,
>+    3,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_textureGatherOffset_0H1B1C(
>+    BuiltInId::textureGatherOffset_Sampler2D1_Float2_Int2,
>+    BuiltInName::textureGatherOffset,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0H1B1C0B,
>+    3,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_textureGatherOffset_0Q1B1C(
>+    BuiltInId::textureGatherOffset_ISampler2D1_Float2_Int2,
>+    BuiltInName::textureGatherOffset,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0Q1B1C0C,
>+    3,
>+    StaticType::Get<EbtInt, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_textureGatherOffset_0W1B1C(
>+    BuiltInId::textureGatherOffset_USampler2D1_Float2_Int2,
>+    BuiltInName::textureGatherOffset,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0W1B1C0C,
>+    3,
>+    StaticType::Get<EbtUInt, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_textureGatherOffset_0H1B1C0C(
>+    BuiltInId::textureGatherOffset_Sampler2D1_Float2_Int2_Int1,
>+    BuiltInName::textureGatherOffset,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0H1B1C0C,
>+    4,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_textureGatherOffset_0Q1B1C0C(
>+    BuiltInId::textureGatherOffset_ISampler2D1_Float2_Int2_Int1,
>+    BuiltInName::textureGatherOffset,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0Q1B1C0C,
>+    4,
>+    StaticType::Get<EbtInt, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_textureGatherOffset_0W1B1C0C(
>+    BuiltInId::textureGatherOffset_USampler2D1_Float2_Int2_Int1,
>+    BuiltInName::textureGatherOffset,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0W1B1C0C,
>+    4,
>+    StaticType::Get<EbtUInt, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_textureGatherOffset_0K2B1C(
>+    BuiltInId::textureGatherOffset_Sampler2DArray1_Float3_Int2,
>+    BuiltInName::textureGatherOffset,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0K2B1C0C,
>+    3,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_textureGatherOffset_0T2B1C(
>+    BuiltInId::textureGatherOffset_ISampler2DArray1_Float3_Int2,
>+    BuiltInName::textureGatherOffset,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0T2B1C0C,
>+    3,
>+    StaticType::Get<EbtInt, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_textureGatherOffset_0Z2B1C(
>+    BuiltInId::textureGatherOffset_USampler2DArray1_Float3_Int2,
>+    BuiltInName::textureGatherOffset,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0Z2B1C0C,
>+    3,
>+    StaticType::Get<EbtUInt, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_textureGatherOffset_0K2B1C0C(
>+    BuiltInId::textureGatherOffset_Sampler2DArray1_Float3_Int2_Int1,
>+    BuiltInName::textureGatherOffset,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0K2B1C0C,
>+    4,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_textureGatherOffset_0T2B1C0C(
>+    BuiltInId::textureGatherOffset_ISampler2DArray1_Float3_Int2_Int1,
>+    BuiltInName::textureGatherOffset,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0T2B1C0C,
>+    4,
>+    StaticType::Get<EbtInt, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_textureGatherOffset_0Z2B1C0C(
>+    BuiltInId::textureGatherOffset_USampler2DArray1_Float3_Int2_Int1,
>+    BuiltInName::textureGatherOffset,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0Z2B1C0C,
>+    4,
>+    StaticType::Get<EbtUInt, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_textureGatherOffset_0c1B0B1C(
>+    BuiltInId::textureGatherOffset_Sampler2DShadow1_Float2_Float1_Int2,
>+    BuiltInName::textureGatherOffset,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0c1B0B1C,
>+    4,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_textureGatherOffset_0e2B0B1C(
>+    BuiltInId::textureGatherOffset_Sampler2DArrayShadow1_Float3_Float1_Int2,
>+    BuiltInName::textureGatherOffset,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0e2B0B1C,
>+    4,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_dFdx_0B(
>+    BuiltInId::dFdx_Float1,
>+    BuiltInName::dFdx,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0B0C,
>+    1,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 1, 1>(),
>+    EOpDFdx,
>+    false);
>+constexpr const TFunction kFunction_dFdx_1B(
>+    BuiltInId::dFdx_Float2,
>+    BuiltInName::dFdx,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p1B1B0B,
>+    1,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 2, 1>(),
>+    EOpDFdx,
>+    false);
>+constexpr const TFunction kFunction_dFdx_2B(
>+    BuiltInId::dFdx_Float3,
>+    BuiltInName::dFdx,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p2B_o_2C,
>+    1,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 3, 1>(),
>+    EOpDFdx,
>+    false);
>+constexpr const TFunction kFunction_dFdx_3B(
>+    BuiltInId::dFdx_Float4,
>+    BuiltInName::dFdx,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p3B0B0B,
>+    1,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpDFdx,
>+    false);
>+constexpr const TFunction kFunction_dFdy_0B(
>+    BuiltInId::dFdy_Float1,
>+    BuiltInName::dFdy,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0B0C,
>+    1,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 1, 1>(),
>+    EOpDFdy,
>+    false);
>+constexpr const TFunction kFunction_dFdy_1B(
>+    BuiltInId::dFdy_Float2,
>+    BuiltInName::dFdy,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p1B1B0B,
>+    1,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 2, 1>(),
>+    EOpDFdy,
>+    false);
>+constexpr const TFunction kFunction_dFdy_2B(
>+    BuiltInId::dFdy_Float3,
>+    BuiltInName::dFdy,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p2B_o_2C,
>+    1,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 3, 1>(),
>+    EOpDFdy,
>+    false);
>+constexpr const TFunction kFunction_dFdy_3B(
>+    BuiltInId::dFdy_Float4,
>+    BuiltInName::dFdy,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p3B0B0B,
>+    1,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpDFdy,
>+    false);
>+constexpr const TFunction kFunction_fwidth_0B(
>+    BuiltInId::fwidth_Float1,
>+    BuiltInName::fwidth,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0B0C,
>+    1,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 1, 1>(),
>+    EOpFwidth,
>+    false);
>+constexpr const TFunction kFunction_fwidth_1B(
>+    BuiltInId::fwidth_Float2,
>+    BuiltInName::fwidth,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p1B1B0B,
>+    1,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 2, 1>(),
>+    EOpFwidth,
>+    false);
>+constexpr const TFunction kFunction_fwidth_2B(
>+    BuiltInId::fwidth_Float3,
>+    BuiltInName::fwidth,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p2B_o_2C,
>+    1,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 3, 1>(),
>+    EOpFwidth,
>+    false);
>+constexpr const TFunction kFunction_fwidth_3B(
>+    BuiltInId::fwidth_Float4,
>+    BuiltInName::fwidth,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p3B0B0B,
>+    1,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpFwidth,
>+    false);
>+constexpr const TFunction kFunction_atomicCounter_0F(
>+    BuiltInId::atomicCounter_AtomicCounter1,
>+    BuiltInName::atomicCounter,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0F,
>+    1,
>+    StaticType::Get<EbtUInt, EbpUndefined, EvqGlobal, 1, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_atomicCounterIncrement_0F(
>+    BuiltInId::atomicCounterIncrement_AtomicCounter1,
>+    BuiltInName::atomicCounterIncrement,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0F,
>+    1,
>+    StaticType::Get<EbtUInt, EbpUndefined, EvqGlobal, 1, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_atomicCounterDecrement_0F(
>+    BuiltInId::atomicCounterDecrement_AtomicCounter1,
>+    BuiltInName::atomicCounterDecrement,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0F,
>+    1,
>+    StaticType::Get<EbtUInt, EbpUndefined, EvqGlobal, 1, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_atomicAdd_0D0D(
>+    BuiltInId::atomicAdd_UInt1_UInt1,
>+    BuiltInName::atomicAdd,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p_io_0D0D0D,
>+    2,
>+    StaticType::Get<EbtUInt, EbpUndefined, EvqGlobal, 1, 1>(),
>+    EOpAtomicAdd,
>+    false);
>+constexpr const TFunction kFunction_atomicAdd_0C0C(
>+    BuiltInId::atomicAdd_Int1_Int1,
>+    BuiltInName::atomicAdd,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p_io_0C0C0C,
>+    2,
>+    StaticType::Get<EbtInt, EbpUndefined, EvqGlobal, 1, 1>(),
>+    EOpAtomicAdd,
>+    false);
>+constexpr const TFunction kFunction_atomicMin_0D0D(
>+    BuiltInId::atomicMin_UInt1_UInt1,
>+    BuiltInName::atomicMin,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p_io_0D0D0D,
>+    2,
>+    StaticType::Get<EbtUInt, EbpUndefined, EvqGlobal, 1, 1>(),
>+    EOpAtomicMin,
>+    false);
>+constexpr const TFunction kFunction_atomicMin_0C0C(
>+    BuiltInId::atomicMin_Int1_Int1,
>+    BuiltInName::atomicMin,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p_io_0C0C0C,
>+    2,
>+    StaticType::Get<EbtInt, EbpUndefined, EvqGlobal, 1, 1>(),
>+    EOpAtomicMin,
>+    false);
>+constexpr const TFunction kFunction_atomicMax_0D0D(
>+    BuiltInId::atomicMax_UInt1_UInt1,
>+    BuiltInName::atomicMax,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p_io_0D0D0D,
>+    2,
>+    StaticType::Get<EbtUInt, EbpUndefined, EvqGlobal, 1, 1>(),
>+    EOpAtomicMax,
>+    false);
>+constexpr const TFunction kFunction_atomicMax_0C0C(
>+    BuiltInId::atomicMax_Int1_Int1,
>+    BuiltInName::atomicMax,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p_io_0C0C0C,
>+    2,
>+    StaticType::Get<EbtInt, EbpUndefined, EvqGlobal, 1, 1>(),
>+    EOpAtomicMax,
>+    false);
>+constexpr const TFunction kFunction_atomicAnd_0D0D(
>+    BuiltInId::atomicAnd_UInt1_UInt1,
>+    BuiltInName::atomicAnd,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p_io_0D0D0D,
>+    2,
>+    StaticType::Get<EbtUInt, EbpUndefined, EvqGlobal, 1, 1>(),
>+    EOpAtomicAnd,
>+    false);
>+constexpr const TFunction kFunction_atomicAnd_0C0C(
>+    BuiltInId::atomicAnd_Int1_Int1,
>+    BuiltInName::atomicAnd,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p_io_0C0C0C,
>+    2,
>+    StaticType::Get<EbtInt, EbpUndefined, EvqGlobal, 1, 1>(),
>+    EOpAtomicAnd,
>+    false);
>+constexpr const TFunction kFunction_atomicOr_0D0D(
>+    BuiltInId::atomicOr_UInt1_UInt1,
>+    BuiltInName::atomicOr,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p_io_0D0D0D,
>+    2,
>+    StaticType::Get<EbtUInt, EbpUndefined, EvqGlobal, 1, 1>(),
>+    EOpAtomicOr,
>+    false);
>+constexpr const TFunction kFunction_atomicOr_0C0C(
>+    BuiltInId::atomicOr_Int1_Int1,
>+    BuiltInName::atomicOr,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p_io_0C0C0C,
>+    2,
>+    StaticType::Get<EbtInt, EbpUndefined, EvqGlobal, 1, 1>(),
>+    EOpAtomicOr,
>+    false);
>+constexpr const TFunction kFunction_atomicXor_0D0D(
>+    BuiltInId::atomicXor_UInt1_UInt1,
>+    BuiltInName::atomicXor,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p_io_0D0D0D,
>+    2,
>+    StaticType::Get<EbtUInt, EbpUndefined, EvqGlobal, 1, 1>(),
>+    EOpAtomicXor,
>+    false);
>+constexpr const TFunction kFunction_atomicXor_0C0C(
>+    BuiltInId::atomicXor_Int1_Int1,
>+    BuiltInName::atomicXor,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p_io_0C0C0C,
>+    2,
>+    StaticType::Get<EbtInt, EbpUndefined, EvqGlobal, 1, 1>(),
>+    EOpAtomicXor,
>+    false);
>+constexpr const TFunction kFunction_atomicExchange_0D0D(
>+    BuiltInId::atomicExchange_UInt1_UInt1,
>+    BuiltInName::atomicExchange,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p_io_0D0D0D,
>+    2,
>+    StaticType::Get<EbtUInt, EbpUndefined, EvqGlobal, 1, 1>(),
>+    EOpAtomicExchange,
>+    false);
>+constexpr const TFunction kFunction_atomicExchange_0C0C(
>+    BuiltInId::atomicExchange_Int1_Int1,
>+    BuiltInName::atomicExchange,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p_io_0C0C0C,
>+    2,
>+    StaticType::Get<EbtInt, EbpUndefined, EvqGlobal, 1, 1>(),
>+    EOpAtomicExchange,
>+    false);
>+constexpr const TFunction kFunction_atomicCompSwap_0D0D0D(
>+    BuiltInId::atomicCompSwap_UInt1_UInt1_UInt1,
>+    BuiltInName::atomicCompSwap,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p_io_0D0D0D,
>+    3,
>+    StaticType::Get<EbtUInt, EbpUndefined, EvqGlobal, 1, 1>(),
>+    EOpAtomicCompSwap,
>+    false);
>+constexpr const TFunction kFunction_atomicCompSwap_0C0C0C(
>+    BuiltInId::atomicCompSwap_Int1_Int1_Int1,
>+    BuiltInName::atomicCompSwap,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p_io_0C0C0C,
>+    3,
>+    StaticType::Get<EbtInt, EbpUndefined, EvqGlobal, 1, 1>(),
>+    EOpAtomicCompSwap,
>+    false);
>+constexpr const TFunction kFunction_imageSize_0f(
>+    BuiltInId::imageSize_Image2D1,
>+    BuiltInName::imageSize,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0f1C3B,
>+    1,
>+    StaticType::Get<EbtInt, EbpUndefined, EvqGlobal, 2, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_imageSize_0g(
>+    BuiltInId::imageSize_IImage2D1,
>+    BuiltInName::imageSize,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0g1C3C,
>+    1,
>+    StaticType::Get<EbtInt, EbpUndefined, EvqGlobal, 2, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_imageSize_0h(
>+    BuiltInId::imageSize_UImage2D1,
>+    BuiltInName::imageSize,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0h1C3D,
>+    1,
>+    StaticType::Get<EbtInt, EbpUndefined, EvqGlobal, 2, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_imageSize_0i(
>+    BuiltInId::imageSize_Image3D1,
>+    BuiltInName::imageSize,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0i2C3B,
>+    1,
>+    StaticType::Get<EbtInt, EbpUndefined, EvqGlobal, 3, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_imageSize_0j(
>+    BuiltInId::imageSize_IImage3D1,
>+    BuiltInName::imageSize,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0j2C3C,
>+    1,
>+    StaticType::Get<EbtInt, EbpUndefined, EvqGlobal, 3, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_imageSize_0k(
>+    BuiltInId::imageSize_UImage3D1,
>+    BuiltInName::imageSize,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0k2C3D,
>+    1,
>+    StaticType::Get<EbtInt, EbpUndefined, EvqGlobal, 3, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_imageSize_0l(
>+    BuiltInId::imageSize_Image2DArray1,
>+    BuiltInName::imageSize,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0l2C3B,
>+    1,
>+    StaticType::Get<EbtInt, EbpUndefined, EvqGlobal, 3, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_imageSize_0m(
>+    BuiltInId::imageSize_IImage2DArray1,
>+    BuiltInName::imageSize,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0m2C3C,
>+    1,
>+    StaticType::Get<EbtInt, EbpUndefined, EvqGlobal, 3, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_imageSize_0n(
>+    BuiltInId::imageSize_UImage2DArray1,
>+    BuiltInName::imageSize,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0n2C3D,
>+    1,
>+    StaticType::Get<EbtInt, EbpUndefined, EvqGlobal, 3, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_imageSize_0o(
>+    BuiltInId::imageSize_ImageCube1,
>+    BuiltInName::imageSize,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0o2C3B,
>+    1,
>+    StaticType::Get<EbtInt, EbpUndefined, EvqGlobal, 2, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_imageSize_0p(
>+    BuiltInId::imageSize_IImageCube1,
>+    BuiltInName::imageSize,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0p2C3C,
>+    1,
>+    StaticType::Get<EbtInt, EbpUndefined, EvqGlobal, 2, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_imageSize_0q(
>+    BuiltInId::imageSize_UImageCube1,
>+    BuiltInName::imageSize,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0q2C3D,
>+    1,
>+    StaticType::Get<EbtInt, EbpUndefined, EvqGlobal, 2, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_imageLoad_0f1C(
>+    BuiltInId::imageLoad_Image2D1_Int2,
>+    BuiltInName::imageLoad,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0f1C3B,
>+    2,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_imageLoad_0g1C(
>+    BuiltInId::imageLoad_IImage2D1_Int2,
>+    BuiltInName::imageLoad,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0g1C3C,
>+    2,
>+    StaticType::Get<EbtInt, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_imageLoad_0h1C(
>+    BuiltInId::imageLoad_UImage2D1_Int2,
>+    BuiltInName::imageLoad,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0h1C3D,
>+    2,
>+    StaticType::Get<EbtUInt, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_imageLoad_0i2C(
>+    BuiltInId::imageLoad_Image3D1_Int3,
>+    BuiltInName::imageLoad,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0i2C3B,
>+    2,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_imageLoad_0j2C(
>+    BuiltInId::imageLoad_IImage3D1_Int3,
>+    BuiltInName::imageLoad,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0j2C3C,
>+    2,
>+    StaticType::Get<EbtInt, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_imageLoad_0k2C(
>+    BuiltInId::imageLoad_UImage3D1_Int3,
>+    BuiltInName::imageLoad,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0k2C3D,
>+    2,
>+    StaticType::Get<EbtUInt, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_imageLoad_0l2C(
>+    BuiltInId::imageLoad_Image2DArray1_Int3,
>+    BuiltInName::imageLoad,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0l2C3B,
>+    2,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_imageLoad_0m2C(
>+    BuiltInId::imageLoad_IImage2DArray1_Int3,
>+    BuiltInName::imageLoad,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0m2C3C,
>+    2,
>+    StaticType::Get<EbtInt, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_imageLoad_0n2C(
>+    BuiltInId::imageLoad_UImage2DArray1_Int3,
>+    BuiltInName::imageLoad,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0n2C3D,
>+    2,
>+    StaticType::Get<EbtUInt, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_imageLoad_0o2C(
>+    BuiltInId::imageLoad_ImageCube1_Int3,
>+    BuiltInName::imageLoad,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0o2C3B,
>+    2,
>+    StaticType::Get<EbtFloat, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_imageLoad_0p2C(
>+    BuiltInId::imageLoad_IImageCube1_Int3,
>+    BuiltInName::imageLoad,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0p2C3C,
>+    2,
>+    StaticType::Get<EbtInt, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_imageLoad_0q2C(
>+    BuiltInId::imageLoad_UImageCube1_Int3,
>+    BuiltInName::imageLoad,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0q2C3D,
>+    2,
>+    StaticType::Get<EbtUInt, EbpUndefined, EvqGlobal, 4, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_imageStore_0f1C3B(
>+    BuiltInId::imageStore_Image2D1_Int2_Float4,
>+    BuiltInName::imageStore,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0f1C3B,
>+    3,
>+    StaticType::Get<EbtVoid, EbpUndefined, EvqGlobal, 1, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_imageStore_0g1C3C(
>+    BuiltInId::imageStore_IImage2D1_Int2_Int4,
>+    BuiltInName::imageStore,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0g1C3C,
>+    3,
>+    StaticType::Get<EbtVoid, EbpUndefined, EvqGlobal, 1, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_imageStore_0h1C3D(
>+    BuiltInId::imageStore_UImage2D1_Int2_UInt4,
>+    BuiltInName::imageStore,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0h1C3D,
>+    3,
>+    StaticType::Get<EbtVoid, EbpUndefined, EvqGlobal, 1, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_imageStore_0i2C3B(
>+    BuiltInId::imageStore_Image3D1_Int3_Float4,
>+    BuiltInName::imageStore,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0i2C3B,
>+    3,
>+    StaticType::Get<EbtVoid, EbpUndefined, EvqGlobal, 1, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_imageStore_0j2C3C(
>+    BuiltInId::imageStore_IImage3D1_Int3_Int4,
>+    BuiltInName::imageStore,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0j2C3C,
>+    3,
>+    StaticType::Get<EbtVoid, EbpUndefined, EvqGlobal, 1, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_imageStore_0k2C3D(
>+    BuiltInId::imageStore_UImage3D1_Int3_UInt4,
>+    BuiltInName::imageStore,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0k2C3D,
>+    3,
>+    StaticType::Get<EbtVoid, EbpUndefined, EvqGlobal, 1, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_imageStore_0l2C3B(
>+    BuiltInId::imageStore_Image2DArray1_Int3_Float4,
>+    BuiltInName::imageStore,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0l2C3B,
>+    3,
>+    StaticType::Get<EbtVoid, EbpUndefined, EvqGlobal, 1, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_imageStore_0m2C3C(
>+    BuiltInId::imageStore_IImage2DArray1_Int3_Int4,
>+    BuiltInName::imageStore,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0m2C3C,
>+    3,
>+    StaticType::Get<EbtVoid, EbpUndefined, EvqGlobal, 1, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_imageStore_0n2C3D(
>+    BuiltInId::imageStore_UImage2DArray1_Int3_UInt4,
>+    BuiltInName::imageStore,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0n2C3D,
>+    3,
>+    StaticType::Get<EbtVoid, EbpUndefined, EvqGlobal, 1, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_imageStore_0o2C3B(
>+    BuiltInId::imageStore_ImageCube1_Int3_Float4,
>+    BuiltInName::imageStore,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0o2C3B,
>+    3,
>+    StaticType::Get<EbtVoid, EbpUndefined, EvqGlobal, 1, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_imageStore_0p2C3C(
>+    BuiltInId::imageStore_IImageCube1_Int3_Int4,
>+    BuiltInName::imageStore,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0p2C3C,
>+    3,
>+    StaticType::Get<EbtVoid, EbpUndefined, EvqGlobal, 1, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_imageStore_0q2C3D(
>+    BuiltInId::imageStore_UImageCube1_Int3_UInt4,
>+    BuiltInName::imageStore,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::p0q2C3D,
>+    3,
>+    StaticType::Get<EbtVoid, EbpUndefined, EvqGlobal, 1, 1>(),
>+    EOpCallBuiltInFunction,
>+    false);
>+constexpr const TFunction kFunction_memoryBarrier_(
>+    BuiltInId::memoryBarrier,
>+    BuiltInName::memoryBarrier,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::empty,
>+    0,
>+    StaticType::Get<EbtVoid, EbpUndefined, EvqGlobal, 1, 1>(),
>+    EOpMemoryBarrier,
>+    false);
>+constexpr const TFunction kFunction_memoryBarrierAtomicCounter_(
>+    BuiltInId::memoryBarrierAtomicCounter,
>+    BuiltInName::memoryBarrierAtomicCounter,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::empty,
>+    0,
>+    StaticType::Get<EbtVoid, EbpUndefined, EvqGlobal, 1, 1>(),
>+    EOpMemoryBarrierAtomicCounter,
>+    false);
>+constexpr const TFunction kFunction_memoryBarrierBuffer_(
>+    BuiltInId::memoryBarrierBuffer,
>+    BuiltInName::memoryBarrierBuffer,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::empty,
>+    0,
>+    StaticType::Get<EbtVoid, EbpUndefined, EvqGlobal, 1, 1>(),
>+    EOpMemoryBarrierBuffer,
>+    false);
>+constexpr const TFunction kFunction_memoryBarrierImage_(
>+    BuiltInId::memoryBarrierImage,
>+    BuiltInName::memoryBarrierImage,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::empty,
>+    0,
>+    StaticType::Get<EbtVoid, EbpUndefined, EvqGlobal, 1, 1>(),
>+    EOpMemoryBarrierImage,
>+    false);
>+constexpr const TFunction kFunction_barrier_(
>+    BuiltInId::barrier,
>+    BuiltInName::barrier,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::empty,
>+    0,
>+    StaticType::Get<EbtVoid, EbpUndefined, EvqGlobal, 1, 1>(),
>+    EOpBarrier,
>+    false);
>+constexpr const TFunction kFunction_memoryBarrierShared_(
>+    BuiltInId::memoryBarrierShared,
>+    BuiltInName::memoryBarrierShared,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::empty,
>+    0,
>+    StaticType::Get<EbtVoid, EbpUndefined, EvqGlobal, 1, 1>(),
>+    EOpMemoryBarrierShared,
>+    false);
>+constexpr const TFunction kFunction_groupMemoryBarrier_(
>+    BuiltInId::groupMemoryBarrier,
>+    BuiltInName::groupMemoryBarrier,
>+    TExtension::UNDEFINED,
>+    BuiltInParameters::empty,
>+    0,
>+    StaticType::Get<EbtVoid, EbpUndefined, EvqGlobal, 1, 1>(),
>+    EOpGroupMemoryBarrier,
>+    false);
>+constexpr const TFunction kFunction_EmitVertex_(
>+    BuiltInId::EmitVertex,
>+    BuiltInName::EmitVertex,
>+    TExtension::EXT_geometry_shader,
>+    BuiltInParameters::empty,
>+    0,
>+    StaticType::Get<EbtVoid, EbpUndefined, EvqGlobal, 1, 1>(),
>+    EOpEmitVertex,
>+    false);
>+constexpr const TFunction kFunction_EndPrimitive_(
>+    BuiltInId::EndPrimitive,
>+    BuiltInName::EndPrimitive,
>+    TExtension::EXT_geometry_shader,
>+    BuiltInParameters::empty,
>+    0,
>+    StaticType::Get<EbtVoid, EbpUndefined, EvqGlobal, 1, 1>(),
>+    EOpEndPrimitive,
>+    false);
>+
>+}  // namespace BuiltInFunction
>+
>+void TSymbolTable::initializeBuiltInVariables(sh::GLenum shaderType,
>+                                              ShShaderSpec spec,
>+                                              const ShBuiltInResources &resources)
>+{
>+    const TSourceLoc zeroSourceLoc             = {0, 0, 0, 0};
>+    TFieldList *fields_gl_DepthRangeParameters = new TFieldList();
>+    fields_gl_DepthRangeParameters->push_back(
>+        new TField(new TType(EbtFloat, EbpHigh, EvqGlobal, 1, 1), BuiltInName::near, zeroSourceLoc,
>+                   SymbolType::BuiltIn));
>+    fields_gl_DepthRangeParameters->push_back(
>+        new TField(new TType(EbtFloat, EbpHigh, EvqGlobal, 1, 1), BuiltInName::far, zeroSourceLoc,
>+                   SymbolType::BuiltIn));
>+    fields_gl_DepthRangeParameters->push_back(
>+        new TField(new TType(EbtFloat, EbpHigh, EvqGlobal, 1, 1), BuiltInName::diff, zeroSourceLoc,
>+                   SymbolType::BuiltIn));
>+    TStructure *gl_DepthRangeParameters =
>+        new TStructure(BuiltInId::gl_DepthRangeParameters, BuiltInName::gl_DepthRangeParameters,
>+                       TExtension::UNDEFINED, fields_gl_DepthRangeParameters);
>+    mVar_gl_DepthRangeParameters = gl_DepthRangeParameters;
>+    TType *type_gl_DepthRange    = new TType(gl_DepthRangeParameters, false);
>+    type_gl_DepthRange->setQualifier(EvqUniform);
>+    type_gl_DepthRange->realize();
>+    mVar_gl_DepthRange =
>+        new TVariable(BuiltInId::gl_DepthRange, BuiltInName::gl_DepthRange, SymbolType::BuiltIn,
>+                      TExtension::UNDEFINED, type_gl_DepthRange);
>+    mVar_gl_MaxVertexAttribs = new TVariable(
>+        BuiltInId::gl_MaxVertexAttribs, BuiltInName::gl_MaxVertexAttribs, SymbolType::BuiltIn,
>+        TExtension::UNDEFINED, StaticType::Get<EbtInt, EbpMedium, EvqConst, 1, 1>());
>+    {
>+        TConstantUnion *unionArray = new TConstantUnion[1];
>+        unionArray[0].setIConst(resources.MaxVertexAttribs);
>+        mVar_gl_MaxVertexAttribs->shareConstPointer(unionArray);
>+    }
>+    mVar_gl_MaxVertexUniformVectors =
>+        new TVariable(BuiltInId::gl_MaxVertexUniformVectors,
>+                      BuiltInName::gl_MaxVertexUniformVectors, SymbolType::BuiltIn,
>+                      TExtension::UNDEFINED, StaticType::Get<EbtInt, EbpMedium, EvqConst, 1, 1>());
>+    {
>+        TConstantUnion *unionArray = new TConstantUnion[1];
>+        unionArray[0].setIConst(resources.MaxVertexUniformVectors);
>+        mVar_gl_MaxVertexUniformVectors->shareConstPointer(unionArray);
>+    }
>+    mVar_gl_MaxVertexTextureImageUnits =
>+        new TVariable(BuiltInId::gl_MaxVertexTextureImageUnits,
>+                      BuiltInName::gl_MaxVertexTextureImageUnits, SymbolType::BuiltIn,
>+                      TExtension::UNDEFINED, StaticType::Get<EbtInt, EbpMedium, EvqConst, 1, 1>());
>+    {
>+        TConstantUnion *unionArray = new TConstantUnion[1];
>+        unionArray[0].setIConst(resources.MaxVertexTextureImageUnits);
>+        mVar_gl_MaxVertexTextureImageUnits->shareConstPointer(unionArray);
>+    }
>+    mVar_gl_MaxCombinedTextureImageUnits =
>+        new TVariable(BuiltInId::gl_MaxCombinedTextureImageUnits,
>+                      BuiltInName::gl_MaxCombinedTextureImageUnits, SymbolType::BuiltIn,
>+                      TExtension::UNDEFINED, StaticType::Get<EbtInt, EbpMedium, EvqConst, 1, 1>());
>+    {
>+        TConstantUnion *unionArray = new TConstantUnion[1];
>+        unionArray[0].setIConst(resources.MaxCombinedTextureImageUnits);
>+        mVar_gl_MaxCombinedTextureImageUnits->shareConstPointer(unionArray);
>+    }
>+    mVar_gl_MaxTextureImageUnits =
>+        new TVariable(BuiltInId::gl_MaxTextureImageUnits, BuiltInName::gl_MaxTextureImageUnits,
>+                      SymbolType::BuiltIn, TExtension::UNDEFINED,
>+                      StaticType::Get<EbtInt, EbpMedium, EvqConst, 1, 1>());
>+    {
>+        TConstantUnion *unionArray = new TConstantUnion[1];
>+        unionArray[0].setIConst(resources.MaxTextureImageUnits);
>+        mVar_gl_MaxTextureImageUnits->shareConstPointer(unionArray);
>+    }
>+    mVar_gl_MaxFragmentUniformVectors =
>+        new TVariable(BuiltInId::gl_MaxFragmentUniformVectors,
>+                      BuiltInName::gl_MaxFragmentUniformVectors, SymbolType::BuiltIn,
>+                      TExtension::UNDEFINED, StaticType::Get<EbtInt, EbpMedium, EvqConst, 1, 1>());
>+    {
>+        TConstantUnion *unionArray = new TConstantUnion[1];
>+        unionArray[0].setIConst(resources.MaxFragmentUniformVectors);
>+        mVar_gl_MaxFragmentUniformVectors->shareConstPointer(unionArray);
>+    }
>+    mVar_gl_MaxVaryingVectors = new TVariable(
>+        BuiltInId::gl_MaxVaryingVectors, BuiltInName::gl_MaxVaryingVectors, SymbolType::BuiltIn,
>+        TExtension::UNDEFINED, StaticType::Get<EbtInt, EbpMedium, EvqConst, 1, 1>());
>+    {
>+        TConstantUnion *unionArray = new TConstantUnion[1];
>+        unionArray[0].setIConst(resources.MaxVaryingVectors);
>+        mVar_gl_MaxVaryingVectors->shareConstPointer(unionArray);
>+    }
>+    mVar_gl_MaxDrawBuffers = new TVariable(
>+        BuiltInId::gl_MaxDrawBuffers, BuiltInName::gl_MaxDrawBuffers, SymbolType::BuiltIn,
>+        TExtension::UNDEFINED, StaticType::Get<EbtInt, EbpMedium, EvqConst, 1, 1>());
>+    {
>+        TConstantUnion *unionArray = new TConstantUnion[1];
>+        unionArray[0].setIConst(resources.MaxDrawBuffers);
>+        mVar_gl_MaxDrawBuffers->shareConstPointer(unionArray);
>+    }
>+    mVar_gl_MaxDualSourceDrawBuffersEXT = new TVariable(
>+        BuiltInId::gl_MaxDualSourceDrawBuffersEXT, BuiltInName::gl_MaxDualSourceDrawBuffersEXT,
>+        SymbolType::BuiltIn, TExtension::EXT_blend_func_extended,
>+        StaticType::Get<EbtInt, EbpMedium, EvqConst, 1, 1>());
>+    {
>+        TConstantUnion *unionArray = new TConstantUnion[1];
>+        unionArray[0].setIConst(resources.MaxDualSourceDrawBuffers);
>+        mVar_gl_MaxDualSourceDrawBuffersEXT->shareConstPointer(unionArray);
>+    }
>+    mVar_gl_MaxVertexOutputVectors =
>+        new TVariable(BuiltInId::gl_MaxVertexOutputVectors, BuiltInName::gl_MaxVertexOutputVectors,
>+                      SymbolType::BuiltIn, TExtension::UNDEFINED,
>+                      StaticType::Get<EbtInt, EbpMedium, EvqConst, 1, 1>());
>+    {
>+        TConstantUnion *unionArray = new TConstantUnion[1];
>+        unionArray[0].setIConst(resources.MaxVertexOutputVectors);
>+        mVar_gl_MaxVertexOutputVectors->shareConstPointer(unionArray);
>+    }
>+    mVar_gl_MaxFragmentInputVectors =
>+        new TVariable(BuiltInId::gl_MaxFragmentInputVectors,
>+                      BuiltInName::gl_MaxFragmentInputVectors, SymbolType::BuiltIn,
>+                      TExtension::UNDEFINED, StaticType::Get<EbtInt, EbpMedium, EvqConst, 1, 1>());
>+    {
>+        TConstantUnion *unionArray = new TConstantUnion[1];
>+        unionArray[0].setIConst(resources.MaxFragmentInputVectors);
>+        mVar_gl_MaxFragmentInputVectors->shareConstPointer(unionArray);
>+    }
>+    mVar_gl_MinProgramTexelOffset =
>+        new TVariable(BuiltInId::gl_MinProgramTexelOffset, BuiltInName::gl_MinProgramTexelOffset,
>+                      SymbolType::BuiltIn, TExtension::UNDEFINED,
>+                      StaticType::Get<EbtInt, EbpMedium, EvqConst, 1, 1>());
>+    {
>+        TConstantUnion *unionArray = new TConstantUnion[1];
>+        unionArray[0].setIConst(resources.MinProgramTexelOffset);
>+        mVar_gl_MinProgramTexelOffset->shareConstPointer(unionArray);
>+    }
>+    mVar_gl_MaxProgramTexelOffset =
>+        new TVariable(BuiltInId::gl_MaxProgramTexelOffset, BuiltInName::gl_MaxProgramTexelOffset,
>+                      SymbolType::BuiltIn, TExtension::UNDEFINED,
>+                      StaticType::Get<EbtInt, EbpMedium, EvqConst, 1, 1>());
>+    {
>+        TConstantUnion *unionArray = new TConstantUnion[1];
>+        unionArray[0].setIConst(resources.MaxProgramTexelOffset);
>+        mVar_gl_MaxProgramTexelOffset->shareConstPointer(unionArray);
>+    }
>+    mVar_gl_MaxImageUnits = new TVariable(
>+        BuiltInId::gl_MaxImageUnits, BuiltInName::gl_MaxImageUnits, SymbolType::BuiltIn,
>+        TExtension::UNDEFINED, StaticType::Get<EbtInt, EbpMedium, EvqConst, 1, 1>());
>+    {
>+        TConstantUnion *unionArray = new TConstantUnion[1];
>+        unionArray[0].setIConst(resources.MaxImageUnits);
>+        mVar_gl_MaxImageUnits->shareConstPointer(unionArray);
>+    }
>+    mVar_gl_MaxVertexImageUniforms =
>+        new TVariable(BuiltInId::gl_MaxVertexImageUniforms, BuiltInName::gl_MaxVertexImageUniforms,
>+                      SymbolType::BuiltIn, TExtension::UNDEFINED,
>+                      StaticType::Get<EbtInt, EbpMedium, EvqConst, 1, 1>());
>+    {
>+        TConstantUnion *unionArray = new TConstantUnion[1];
>+        unionArray[0].setIConst(resources.MaxVertexImageUniforms);
>+        mVar_gl_MaxVertexImageUniforms->shareConstPointer(unionArray);
>+    }
>+    mVar_gl_MaxFragmentImageUniforms =
>+        new TVariable(BuiltInId::gl_MaxFragmentImageUniforms,
>+                      BuiltInName::gl_MaxFragmentImageUniforms, SymbolType::BuiltIn,
>+                      TExtension::UNDEFINED, StaticType::Get<EbtInt, EbpMedium, EvqConst, 1, 1>());
>+    {
>+        TConstantUnion *unionArray = new TConstantUnion[1];
>+        unionArray[0].setIConst(resources.MaxFragmentImageUniforms);
>+        mVar_gl_MaxFragmentImageUniforms->shareConstPointer(unionArray);
>+    }
>+    mVar_gl_MaxComputeImageUniforms =
>+        new TVariable(BuiltInId::gl_MaxComputeImageUniforms,
>+                      BuiltInName::gl_MaxComputeImageUniforms, SymbolType::BuiltIn,
>+                      TExtension::UNDEFINED, StaticType::Get<EbtInt, EbpMedium, EvqConst, 1, 1>());
>+    {
>+        TConstantUnion *unionArray = new TConstantUnion[1];
>+        unionArray[0].setIConst(resources.MaxComputeImageUniforms);
>+        mVar_gl_MaxComputeImageUniforms->shareConstPointer(unionArray);
>+    }
>+    mVar_gl_MaxCombinedImageUniforms =
>+        new TVariable(BuiltInId::gl_MaxCombinedImageUniforms,
>+                      BuiltInName::gl_MaxCombinedImageUniforms, SymbolType::BuiltIn,
>+                      TExtension::UNDEFINED, StaticType::Get<EbtInt, EbpMedium, EvqConst, 1, 1>());
>+    {
>+        TConstantUnion *unionArray = new TConstantUnion[1];
>+        unionArray[0].setIConst(resources.MaxCombinedImageUniforms);
>+        mVar_gl_MaxCombinedImageUniforms->shareConstPointer(unionArray);
>+    }
>+    mVar_gl_MaxCombinedShaderOutputResources =
>+        new TVariable(BuiltInId::gl_MaxCombinedShaderOutputResources,
>+                      BuiltInName::gl_MaxCombinedShaderOutputResources, SymbolType::BuiltIn,
>+                      TExtension::UNDEFINED, StaticType::Get<EbtInt, EbpMedium, EvqConst, 1, 1>());
>+    {
>+        TConstantUnion *unionArray = new TConstantUnion[1];
>+        unionArray[0].setIConst(resources.MaxCombinedShaderOutputResources);
>+        mVar_gl_MaxCombinedShaderOutputResources->shareConstPointer(unionArray);
>+    }
>+    mVar_gl_MaxComputeWorkGroupCount =
>+        new TVariable(BuiltInId::gl_MaxComputeWorkGroupCount,
>+                      BuiltInName::gl_MaxComputeWorkGroupCount, SymbolType::BuiltIn,
>+                      TExtension::UNDEFINED, StaticType::Get<EbtInt, EbpHigh, EvqConst, 3, 1>());
>+    {
>+        TConstantUnion *unionArray = new TConstantUnion[3];
>+        for (size_t index = 0u; index < 3; ++index)
>+        {
>+            unionArray[index].setIConst(resources.MaxComputeWorkGroupCount[index]);
>+        }
>+        mVar_gl_MaxComputeWorkGroupCount->shareConstPointer(unionArray);
>+    }
>+    mVar_gl_MaxComputeWorkGroupSize =
>+        new TVariable(BuiltInId::gl_MaxComputeWorkGroupSize,
>+                      BuiltInName::gl_MaxComputeWorkGroupSize, SymbolType::BuiltIn,
>+                      TExtension::UNDEFINED, StaticType::Get<EbtInt, EbpHigh, EvqConst, 3, 1>());
>+    {
>+        TConstantUnion *unionArray = new TConstantUnion[3];
>+        for (size_t index = 0u; index < 3; ++index)
>+        {
>+            unionArray[index].setIConst(resources.MaxComputeWorkGroupSize[index]);
>+        }
>+        mVar_gl_MaxComputeWorkGroupSize->shareConstPointer(unionArray);
>+    }
>+    mVar_gl_MaxComputeUniformComponents =
>+        new TVariable(BuiltInId::gl_MaxComputeUniformComponents,
>+                      BuiltInName::gl_MaxComputeUniformComponents, SymbolType::BuiltIn,
>+                      TExtension::UNDEFINED, StaticType::Get<EbtInt, EbpMedium, EvqConst, 1, 1>());
>+    {
>+        TConstantUnion *unionArray = new TConstantUnion[1];
>+        unionArray[0].setIConst(resources.MaxComputeUniformComponents);
>+        mVar_gl_MaxComputeUniformComponents->shareConstPointer(unionArray);
>+    }
>+    mVar_gl_MaxComputeTextureImageUnits =
>+        new TVariable(BuiltInId::gl_MaxComputeTextureImageUnits,
>+                      BuiltInName::gl_MaxComputeTextureImageUnits, SymbolType::BuiltIn,
>+                      TExtension::UNDEFINED, StaticType::Get<EbtInt, EbpMedium, EvqConst, 1, 1>());
>+    {
>+        TConstantUnion *unionArray = new TConstantUnion[1];
>+        unionArray[0].setIConst(resources.MaxComputeTextureImageUnits);
>+        mVar_gl_MaxComputeTextureImageUnits->shareConstPointer(unionArray);
>+    }
>+    mVar_gl_MaxComputeAtomicCounters =
>+        new TVariable(BuiltInId::gl_MaxComputeAtomicCounters,
>+                      BuiltInName::gl_MaxComputeAtomicCounters, SymbolType::BuiltIn,
>+                      TExtension::UNDEFINED, StaticType::Get<EbtInt, EbpMedium, EvqConst, 1, 1>());
>+    {
>+        TConstantUnion *unionArray = new TConstantUnion[1];
>+        unionArray[0].setIConst(resources.MaxComputeAtomicCounters);
>+        mVar_gl_MaxComputeAtomicCounters->shareConstPointer(unionArray);
>+    }
>+    mVar_gl_MaxComputeAtomicCounterBuffers =
>+        new TVariable(BuiltInId::gl_MaxComputeAtomicCounterBuffers,
>+                      BuiltInName::gl_MaxComputeAtomicCounterBuffers, SymbolType::BuiltIn,
>+                      TExtension::UNDEFINED, StaticType::Get<EbtInt, EbpMedium, EvqConst, 1, 1>());
>+    {
>+        TConstantUnion *unionArray = new TConstantUnion[1];
>+        unionArray[0].setIConst(resources.MaxComputeAtomicCounterBuffers);
>+        mVar_gl_MaxComputeAtomicCounterBuffers->shareConstPointer(unionArray);
>+    }
>+    mVar_gl_MaxVertexAtomicCounters =
>+        new TVariable(BuiltInId::gl_MaxVertexAtomicCounters,
>+                      BuiltInName::gl_MaxVertexAtomicCounters, SymbolType::BuiltIn,
>+                      TExtension::UNDEFINED, StaticType::Get<EbtInt, EbpMedium, EvqConst, 1, 1>());
>+    {
>+        TConstantUnion *unionArray = new TConstantUnion[1];
>+        unionArray[0].setIConst(resources.MaxVertexAtomicCounters);
>+        mVar_gl_MaxVertexAtomicCounters->shareConstPointer(unionArray);
>+    }
>+    mVar_gl_MaxFragmentAtomicCounters =
>+        new TVariable(BuiltInId::gl_MaxFragmentAtomicCounters,
>+                      BuiltInName::gl_MaxFragmentAtomicCounters, SymbolType::BuiltIn,
>+                      TExtension::UNDEFINED, StaticType::Get<EbtInt, EbpMedium, EvqConst, 1, 1>());
>+    {
>+        TConstantUnion *unionArray = new TConstantUnion[1];
>+        unionArray[0].setIConst(resources.MaxFragmentAtomicCounters);
>+        mVar_gl_MaxFragmentAtomicCounters->shareConstPointer(unionArray);
>+    }
>+    mVar_gl_MaxCombinedAtomicCounters =
>+        new TVariable(BuiltInId::gl_MaxCombinedAtomicCounters,
>+                      BuiltInName::gl_MaxCombinedAtomicCounters, SymbolType::BuiltIn,
>+                      TExtension::UNDEFINED, StaticType::Get<EbtInt, EbpMedium, EvqConst, 1, 1>());
>+    {
>+        TConstantUnion *unionArray = new TConstantUnion[1];
>+        unionArray[0].setIConst(resources.MaxCombinedAtomicCounters);
>+        mVar_gl_MaxCombinedAtomicCounters->shareConstPointer(unionArray);
>+    }
>+    mVar_gl_MaxAtomicCounterBindings =
>+        new TVariable(BuiltInId::gl_MaxAtomicCounterBindings,
>+                      BuiltInName::gl_MaxAtomicCounterBindings, SymbolType::BuiltIn,
>+                      TExtension::UNDEFINED, StaticType::Get<EbtInt, EbpMedium, EvqConst, 1, 1>());
>+    {
>+        TConstantUnion *unionArray = new TConstantUnion[1];
>+        unionArray[0].setIConst(resources.MaxAtomicCounterBindings);
>+        mVar_gl_MaxAtomicCounterBindings->shareConstPointer(unionArray);
>+    }
>+    mVar_gl_MaxVertexAtomicCounterBuffers =
>+        new TVariable(BuiltInId::gl_MaxVertexAtomicCounterBuffers,
>+                      BuiltInName::gl_MaxVertexAtomicCounterBuffers, SymbolType::BuiltIn,
>+                      TExtension::UNDEFINED, StaticType::Get<EbtInt, EbpMedium, EvqConst, 1, 1>());
>+    {
>+        TConstantUnion *unionArray = new TConstantUnion[1];
>+        unionArray[0].setIConst(resources.MaxVertexAtomicCounterBuffers);
>+        mVar_gl_MaxVertexAtomicCounterBuffers->shareConstPointer(unionArray);
>+    }
>+    mVar_gl_MaxFragmentAtomicCounterBuffers =
>+        new TVariable(BuiltInId::gl_MaxFragmentAtomicCounterBuffers,
>+                      BuiltInName::gl_MaxFragmentAtomicCounterBuffers, SymbolType::BuiltIn,
>+                      TExtension::UNDEFINED, StaticType::Get<EbtInt, EbpMedium, EvqConst, 1, 1>());
>+    {
>+        TConstantUnion *unionArray = new TConstantUnion[1];
>+        unionArray[0].setIConst(resources.MaxFragmentAtomicCounterBuffers);
>+        mVar_gl_MaxFragmentAtomicCounterBuffers->shareConstPointer(unionArray);
>+    }
>+    mVar_gl_MaxCombinedAtomicCounterBuffers =
>+        new TVariable(BuiltInId::gl_MaxCombinedAtomicCounterBuffers,
>+                      BuiltInName::gl_MaxCombinedAtomicCounterBuffers, SymbolType::BuiltIn,
>+                      TExtension::UNDEFINED, StaticType::Get<EbtInt, EbpMedium, EvqConst, 1, 1>());
>+    {
>+        TConstantUnion *unionArray = new TConstantUnion[1];
>+        unionArray[0].setIConst(resources.MaxCombinedAtomicCounterBuffers);
>+        mVar_gl_MaxCombinedAtomicCounterBuffers->shareConstPointer(unionArray);
>+    }
>+    mVar_gl_MaxAtomicCounterBufferSize =
>+        new TVariable(BuiltInId::gl_MaxAtomicCounterBufferSize,
>+                      BuiltInName::gl_MaxAtomicCounterBufferSize, SymbolType::BuiltIn,
>+                      TExtension::UNDEFINED, StaticType::Get<EbtInt, EbpMedium, EvqConst, 1, 1>());
>+    {
>+        TConstantUnion *unionArray = new TConstantUnion[1];
>+        unionArray[0].setIConst(resources.MaxAtomicCounterBufferSize);
>+        mVar_gl_MaxAtomicCounterBufferSize->shareConstPointer(unionArray);
>+    }
>+    mVar_gl_MaxGeometryInputComponents = new TVariable(
>+        BuiltInId::gl_MaxGeometryInputComponents, BuiltInName::gl_MaxGeometryInputComponents,
>+        SymbolType::BuiltIn, TExtension::EXT_geometry_shader,
>+        StaticType::Get<EbtInt, EbpMedium, EvqConst, 1, 1>());
>+    {
>+        TConstantUnion *unionArray = new TConstantUnion[1];
>+        unionArray[0].setIConst(resources.MaxGeometryInputComponents);
>+        mVar_gl_MaxGeometryInputComponents->shareConstPointer(unionArray);
>+    }
>+    mVar_gl_MaxGeometryOutputComponents = new TVariable(
>+        BuiltInId::gl_MaxGeometryOutputComponents, BuiltInName::gl_MaxGeometryOutputComponents,
>+        SymbolType::BuiltIn, TExtension::EXT_geometry_shader,
>+        StaticType::Get<EbtInt, EbpMedium, EvqConst, 1, 1>());
>+    {
>+        TConstantUnion *unionArray = new TConstantUnion[1];
>+        unionArray[0].setIConst(resources.MaxGeometryOutputComponents);
>+        mVar_gl_MaxGeometryOutputComponents->shareConstPointer(unionArray);
>+    }
>+    mVar_gl_MaxGeometryImageUniforms = new TVariable(
>+        BuiltInId::gl_MaxGeometryImageUniforms, BuiltInName::gl_MaxGeometryImageUniforms,
>+        SymbolType::BuiltIn, TExtension::EXT_geometry_shader,
>+        StaticType::Get<EbtInt, EbpMedium, EvqConst, 1, 1>());
>+    {
>+        TConstantUnion *unionArray = new TConstantUnion[1];
>+        unionArray[0].setIConst(resources.MaxGeometryImageUniforms);
>+        mVar_gl_MaxGeometryImageUniforms->shareConstPointer(unionArray);
>+    }
>+    mVar_gl_MaxGeometryTextureImageUnits = new TVariable(
>+        BuiltInId::gl_MaxGeometryTextureImageUnits, BuiltInName::gl_MaxGeometryTextureImageUnits,
>+        SymbolType::BuiltIn, TExtension::EXT_geometry_shader,
>+        StaticType::Get<EbtInt, EbpMedium, EvqConst, 1, 1>());
>+    {
>+        TConstantUnion *unionArray = new TConstantUnion[1];
>+        unionArray[0].setIConst(resources.MaxGeometryTextureImageUnits);
>+        mVar_gl_MaxGeometryTextureImageUnits->shareConstPointer(unionArray);
>+    }
>+    mVar_gl_MaxGeometryOutputVertices = new TVariable(
>+        BuiltInId::gl_MaxGeometryOutputVertices, BuiltInName::gl_MaxGeometryOutputVertices,
>+        SymbolType::BuiltIn, TExtension::EXT_geometry_shader,
>+        StaticType::Get<EbtInt, EbpMedium, EvqConst, 1, 1>());
>+    {
>+        TConstantUnion *unionArray = new TConstantUnion[1];
>+        unionArray[0].setIConst(resources.MaxGeometryOutputVertices);
>+        mVar_gl_MaxGeometryOutputVertices->shareConstPointer(unionArray);
>+    }
>+    mVar_gl_MaxGeometryTotalOutputComponents = new TVariable(
>+        BuiltInId::gl_MaxGeometryTotalOutputComponents,
>+        BuiltInName::gl_MaxGeometryTotalOutputComponents, SymbolType::BuiltIn,
>+        TExtension::EXT_geometry_shader, StaticType::Get<EbtInt, EbpMedium, EvqConst, 1, 1>());
>+    {
>+        TConstantUnion *unionArray = new TConstantUnion[1];
>+        unionArray[0].setIConst(resources.MaxGeometryTotalOutputComponents);
>+        mVar_gl_MaxGeometryTotalOutputComponents->shareConstPointer(unionArray);
>+    }
>+    mVar_gl_MaxGeometryUniformComponents = new TVariable(
>+        BuiltInId::gl_MaxGeometryUniformComponents, BuiltInName::gl_MaxGeometryUniformComponents,
>+        SymbolType::BuiltIn, TExtension::EXT_geometry_shader,
>+        StaticType::Get<EbtInt, EbpMedium, EvqConst, 1, 1>());
>+    {
>+        TConstantUnion *unionArray = new TConstantUnion[1];
>+        unionArray[0].setIConst(resources.MaxGeometryUniformComponents);
>+        mVar_gl_MaxGeometryUniformComponents->shareConstPointer(unionArray);
>+    }
>+    mVar_gl_MaxGeometryAtomicCounters = new TVariable(
>+        BuiltInId::gl_MaxGeometryAtomicCounters, BuiltInName::gl_MaxGeometryAtomicCounters,
>+        SymbolType::BuiltIn, TExtension::EXT_geometry_shader,
>+        StaticType::Get<EbtInt, EbpMedium, EvqConst, 1, 1>());
>+    {
>+        TConstantUnion *unionArray = new TConstantUnion[1];
>+        unionArray[0].setIConst(resources.MaxGeometryAtomicCounters);
>+        mVar_gl_MaxGeometryAtomicCounters->shareConstPointer(unionArray);
>+    }
>+    mVar_gl_MaxGeometryAtomicCounterBuffers = new TVariable(
>+        BuiltInId::gl_MaxGeometryAtomicCounterBuffers,
>+        BuiltInName::gl_MaxGeometryAtomicCounterBuffers, SymbolType::BuiltIn,
>+        TExtension::EXT_geometry_shader, StaticType::Get<EbtInt, EbpMedium, EvqConst, 1, 1>());
>+    {
>+        TConstantUnion *unionArray = new TConstantUnion[1];
>+        unionArray[0].setIConst(resources.MaxGeometryAtomicCounterBuffers);
>+        mVar_gl_MaxGeometryAtomicCounterBuffers->shareConstPointer(unionArray);
>+    }
>+    if (shaderType == GL_FRAGMENT_SHADER)
>+    {
>+        TType *type_gl_FragData = new TType(EbtFloat, EbpMedium, EvqFragData, 4);
>+        if (spec != SH_WEBGL2_SPEC && spec != SH_WEBGL3_SPEC)
>+        {
>+            type_gl_FragData->makeArray(resources.MaxDrawBuffers);
>+        }
>+        else
>+        {
>+            type_gl_FragData->makeArray(1u);
>+        }
>+        type_gl_FragData->realize();
>+        mVar_gl_FragData =
>+            new TVariable(BuiltInId::gl_FragData, BuiltInName::gl_FragData, SymbolType::BuiltIn,
>+                          TExtension::UNDEFINED, type_gl_FragData);
>+    }
>+    if ((shaderType == GL_FRAGMENT_SHADER) && (mResources.EXT_blend_func_extended))
>+    {
>+        TType *type_gl_SecondaryFragDataEXT =
>+            new TType(EbtFloat, EbpMedium, EvqSecondaryFragDataEXT, 4, 1);
>+        type_gl_SecondaryFragDataEXT->makeArray(resources.MaxDualSourceDrawBuffers);
>+        type_gl_SecondaryFragDataEXT->realize();
>+        mVar_gl_SecondaryFragDataEXT = new TVariable(
>+            BuiltInId::gl_SecondaryFragDataEXT, BuiltInName::gl_SecondaryFragDataEXT,
>+            SymbolType::BuiltIn, TExtension::EXT_blend_func_extended, type_gl_SecondaryFragDataEXT);
>+    }
>+    if ((shaderType == GL_FRAGMENT_SHADER) && (mResources.EXT_frag_depth))
>+    {
>+        TType *type_gl_FragDepthEXT = new TType(
>+            EbtFloat, resources.FragmentPrecisionHigh ? EbpHigh : EbpMedium, EvqFragDepthEXT, 1);
>+        type_gl_FragDepthEXT->realize();
>+        mVar_gl_FragDepthEXT =
>+            new TVariable(BuiltInId::gl_FragDepthEXT, BuiltInName::gl_FragDepthEXT,
>+                          SymbolType::BuiltIn, TExtension::EXT_frag_depth, type_gl_FragDepthEXT);
>+    }
>+    TType *type_gl_LastFragData = new TType(EbtFloat, EbpMedium, EvqLastFragData, 4, 1);
>+    type_gl_LastFragData->makeArray(resources.MaxDrawBuffers);
>+    type_gl_LastFragData->realize();
>+    mVar_gl_LastFragData =
>+        new TVariable(BuiltInId::gl_LastFragData, BuiltInName::gl_LastFragData, SymbolType::BuiltIn,
>+                      TExtension::EXT_shader_framebuffer_fetch, type_gl_LastFragData);
>+    TType *type_gl_LastFragDataNV = new TType(EbtFloat, EbpMedium, EvqLastFragData, 4, 1);
>+    type_gl_LastFragDataNV->makeArray(resources.MaxDrawBuffers);
>+    type_gl_LastFragDataNV->realize();
>+    mVar_gl_LastFragDataNV = new TVariable(
>+        BuiltInId::gl_LastFragDataNV, BuiltInName::gl_LastFragData, SymbolType::BuiltIn,
>+        TExtension::NV_shader_framebuffer_fetch, type_gl_LastFragDataNV);
>+    TFieldList *fields_gl_PerVertex = new TFieldList();
>+    fields_gl_PerVertex->push_back(new TField(new TType(EbtFloat, EbpHigh, EvqPosition, 4, 1),
>+                                              BuiltInName::gl_Position, zeroSourceLoc,
>+                                              SymbolType::BuiltIn));
>+    TInterfaceBlock *gl_PerVertex =
>+        new TInterfaceBlock(BuiltInId::gl_PerVertex, BuiltInName::gl_PerVertex,
>+                            TExtension::EXT_geometry_shader, fields_gl_PerVertex);
>+    mVar_gl_PerVertex = gl_PerVertex;
>+    if (shaderType == GL_GEOMETRY_SHADER_EXT)
>+    {
>+        TType *type_gl_in = new TType(gl_PerVertex, EvqPerVertexIn, TLayoutQualifier::Create());
>+        type_gl_in->makeArray(0u);
>+        type_gl_in->realize();
>+        mVar_gl_in = new TVariable(BuiltInId::gl_in, BuiltInName::gl_in, SymbolType::BuiltIn,
>+                                   TExtension::EXT_geometry_shader, type_gl_in);
>+    }
>+    TFieldList *fields_gl_PerVertexOutBlock = new TFieldList();
>+    fields_gl_PerVertexOutBlock->push_back(
>+        new TField(new TType(EbtFloat, EbpHigh, EvqPosition, 4, 1), BuiltInName::gl_Position,
>+                   zeroSourceLoc, SymbolType::BuiltIn));
>+    TInterfaceBlock *gl_PerVertexOutBlock =
>+        new TInterfaceBlock(BuiltInId::gl_PerVertexOutBlock, BuiltInName::gl_PerVertex,
>+                            TExtension::EXT_geometry_shader, fields_gl_PerVertexOutBlock);
>+    TType *type_gl_PositionGS = new TType(EbtFloat, EbpHigh, EvqPosition, 4);
>+    type_gl_PositionGS->setInterfaceBlock(gl_PerVertexOutBlock);
>+    type_gl_PositionGS->realize();
>+    mVar_gl_PositionGS =
>+        new TVariable(BuiltInId::gl_PositionGS, BuiltInName::gl_Position, SymbolType::BuiltIn,
>+                      TExtension::EXT_geometry_shader, type_gl_PositionGS);
>+}
>+
>+const TSymbol *TSymbolTable::findBuiltIn(const ImmutableString &name, int shaderVersion) const
>+{
>+    if (name.length() > 35)
>+    {
>+        return nullptr;
>+    }
>+    uint32_t nameHash = name.mangledNameHash();
>+    if ((nameHash >> 31) != 0)
>+    {
>+        // The name contains [ or {.
>+        return nullptr;
>+    }
>+    if (shaderVersion >= 310)
>+    {
>+        switch (nameHash)
>+        {
>+            case 0x0a50832eu:
>+            {
>+                if (name.beginsWith(BuiltInName::ldexp))
>+                {
>+                    ASSERT(name.length() == 10);
>+                    return &BuiltInFunction::kFunction_ldexp_1B1C;
>+                }
>+                break;
>+            }
>+            case 0x0a50a6eeu:
>+            {
>+                if (name.beginsWith(BuiltInName::frexp))
>+                {
>+                    ASSERT(name.length() == 10);
>+                    return &BuiltInFunction::kFunction_frexp_2B2C;
>+                }
>+                break;
>+            }
>+            case 0x0a52bed1u:
>+            {
>+                if (name.beginsWith(BuiltInName::ldexp))
>+                {
>+                    ASSERT(name.length() == 10);
>+                    return &BuiltInFunction::kFunction_ldexp_0B0C;
>+                }
>+                break;
>+            }
>+            case 0x0a53e9c4u:
>+            {
>+                if (name == BuiltInName::frexp_3B3C)
>+                {
>+                    return &BuiltInFunction::kFunction_frexp_3B3C;
>+                }
>+                break;
>+            }
>+            case 0x0a54aa52u:
>+            {
>+                if (name.beginsWith(BuiltInName::ldexp))
>+                {
>+                    ASSERT(name.length() == 10);
>+                    return &BuiltInFunction::kFunction_ldexp_2B2C;
>+                }
>+                break;
>+            }
>+            case 0x0a55008fu:
>+            {
>+                if (name.beginsWith(BuiltInName::frexp))
>+                {
>+                    ASSERT(name.length() == 10);
>+                    return &BuiltInFunction::kFunction_frexp_1B1C;
>+                }
>+                break;
>+            }
>+            case 0x0a5799e7u:
>+            {
>+                if (name.beginsWith(BuiltInName::frexp))
>+                {
>+                    ASSERT(name.length() == 10);
>+                    return &BuiltInFunction::kFunction_frexp_0B0C;
>+                }
>+                break;
>+            }
>+            case 0x0a57c201u:
>+            {
>+                if (name.beginsWith(BuiltInName::ldexp))
>+                {
>+                    ASSERT(name.length() == 10);
>+                    return &BuiltInFunction::kFunction_ldexp_3B3C;
>+                }
>+                break;
>+            }
>+            case 0x0e500330u:
>+            {
>+                if (name.beginsWith(BuiltInName::findMSB))
>+                {
>+                    ASSERT(name.length() == 10);
>+                    return &BuiltInFunction::kFunction_findMSB_3C;
>+                }
>+                break;
>+            }
>+            case 0x0e503089u:
>+            {
>+                if (name.beginsWith(BuiltInName::findMSB))
>+                {
>+                    ASSERT(name.length() == 10);
>+                    return &BuiltInFunction::kFunction_findMSB_3D;
>+                }
>+                break;
>+            }
>+            case 0x0e508070u:
>+            {
>+                if (name.beginsWith(BuiltInName::findMSB))
>+                {
>+                    ASSERT(name.length() == 10);
>+                    return &BuiltInFunction::kFunction_findMSB_0C;
>+                }
>+                break;
>+            }
>+            case 0x0e508a05u:
>+            {
>+                if (name.beginsWith(BuiltInName::findMSB))
>+                {
>+                    ASSERT(name.length() == 10);
>+                    return &BuiltInFunction::kFunction_findMSB_0D;
>+                }
>+                break;
>+            }
>+            case 0x0e51917du:
>+            {
>+                if (name.beginsWith(BuiltInName::findMSB))
>+                {
>+                    ASSERT(name.length() == 10);
>+                    return &BuiltInFunction::kFunction_findMSB_1C;
>+                }
>+                break;
>+            }
>+            case 0x0e51dc78u:
>+            {
>+                if (name.beginsWith(BuiltInName::findMSB))
>+                {
>+                    ASSERT(name.length() == 10);
>+                    return &BuiltInFunction::kFunction_findMSB_1D;
>+                }
>+                break;
>+            }
>+            case 0x0e54832eu:
>+            {
>+                if (name.beginsWith(BuiltInName::findLSB))
>+                {
>+                    ASSERT(name.length() == 10);
>+                    return &BuiltInFunction::kFunction_findLSB_2C;
>+                }
>+                break;
>+            }
>+            case 0x0e54b667u:
>+            {
>+                if (name.beginsWith(BuiltInName::findLSB))
>+                {
>+                    ASSERT(name.length() == 10);
>+                    return &BuiltInFunction::kFunction_findLSB_2D;
>+                }
>+                break;
>+            }
>+            case 0x0e550f72u:
>+            {
>+                if (name.beginsWith(BuiltInName::findLSB))
>+                {
>+                    ASSERT(name.length() == 10);
>+                    return &BuiltInFunction::kFunction_findLSB_1D;
>+                }
>+                break;
>+            }
>+            case 0x0e5514e7u:
>+            {
>+                if (name.beginsWith(BuiltInName::findLSB))
>+                {
>+                    ASSERT(name.length() == 10);
>+                    return &BuiltInFunction::kFunction_findLSB_1C;
>+                }
>+                break;
>+            }
>+            case 0x0e5607c2u:
>+            {
>+                if (name.beginsWith(BuiltInName::findLSB))
>+                {
>+                    ASSERT(name.length() == 10);
>+                    return &BuiltInFunction::kFunction_findLSB_0C;
>+                }
>+                break;
>+            }
>+            case 0x0e5650c7u:
>+            {
>+                if (name.beginsWith(BuiltInName::findLSB))
>+                {
>+                    ASSERT(name.length() == 10);
>+                    return &BuiltInFunction::kFunction_findLSB_0D;
>+                }
>+                break;
>+            }
>+            case 0x0e56a99cu:
>+            {
>+                if (name.beginsWith(BuiltInName::findMSB))
>+                {
>+                    ASSERT(name.length() == 10);
>+                    return &BuiltInFunction::kFunction_findMSB_2D;
>+                }
>+                break;
>+            }
>+            case 0x0e56cd55u:
>+            {
>+                if (name.beginsWith(BuiltInName::findMSB))
>+                {
>+                    ASSERT(name.length() == 10);
>+                    return &BuiltInFunction::kFunction_findMSB_2C;
>+                }
>+                break;
>+            }
>+            case 0x0e573680u:
>+            {
>+                if (name.beginsWith(BuiltInName::findLSB))
>+                {
>+                    ASSERT(name.length() == 10);
>+                    return &BuiltInFunction::kFunction_findLSB_3D;
>+                }
>+                break;
>+            }
>+            case 0x0e574a59u:
>+            {
>+                if (name.beginsWith(BuiltInName::findLSB))
>+                {
>+                    ASSERT(name.length() == 10);
>+                    return &BuiltInFunction::kFunction_findLSB_3C;
>+                }
>+                break;
>+            }
>+            case 0x10581cccu:
>+            {
>+                if (name.beginsWith(BuiltInName::bitCount))
>+                {
>+                    ASSERT(name.length() == 11);
>+                    return &BuiltInFunction::kFunction_bitCount_2D;
>+                }
>+                break;
>+            }
>+            case 0x10584c2du:
>+            {
>+                if (name.beginsWith(BuiltInName::bitCount))
>+                {
>+                    ASSERT(name.length() == 11);
>+                    return &BuiltInFunction::kFunction_bitCount_2C;
>+                }
>+                break;
>+            }
>+            case 0x105896f1u:
>+            {
>+                if (name.beginsWith(BuiltInName::bitCount))
>+                {
>+                    ASSERT(name.length() == 11);
>+                    return &BuiltInFunction::kFunction_bitCount_1D;
>+                }
>+                break;
>+            }
>+            case 0x1058cbf7u:
>+            {
>+                if (name.beginsWith(BuiltInName::bitCount))
>+                {
>+                    ASSERT(name.length() == 11);
>+                    return &BuiltInFunction::kFunction_bitCount_1C;
>+                }
>+                break;
>+            }
>+            case 0x1059a37cu:
>+            {
>+                if (name.beginsWith(BuiltInName::bitCount))
>+                {
>+                    ASSERT(name.length() == 11);
>+                    return &BuiltInFunction::kFunction_bitCount_0D;
>+                }
>+                break;
>+            }
>+            case 0x1059dae9u:
>+            {
>+                if (name.beginsWith(BuiltInName::bitCount))
>+                {
>+                    ASSERT(name.length() == 11);
>+                    return &BuiltInFunction::kFunction_bitCount_0C;
>+                }
>+                break;
>+            }
>+            case 0x105b1832u:
>+            {
>+                if (name.beginsWith(BuiltInName::bitCount))
>+                {
>+                    ASSERT(name.length() == 11);
>+                    return &BuiltInFunction::kFunction_bitCount_3C;
>+                }
>+                break;
>+            }
>+            case 0x105b2810u:
>+            {
>+                if (name.beginsWith(BuiltInName::bitCount))
>+                {
>+                    ASSERT(name.length() == 11);
>+                    return &BuiltInFunction::kFunction_bitCount_3D;
>+                }
>+                break;
>+            }
>+            case 0x106a2daeu:
>+            {
>+                if (name.beginsWith(BuiltInName::atomicOr))
>+                {
>+                    ASSERT(name.length() == 13);
>+                    return &BuiltInFunction::kFunction_atomicOr_0D0D;
>+                }
>+                break;
>+            }
>+            case 0x106bd5b6u:
>+            {
>+                if (name.beginsWith(BuiltInName::atomicOr))
>+                {
>+                    ASSERT(name.length() == 13);
>+                    return &BuiltInFunction::kFunction_atomicOr_0C0C;
>+                }
>+                break;
>+            }
>+            case 0x126520f8u:
>+            {
>+                if (name.beginsWith(BuiltInName::imageSize))
>+                {
>+                    ASSERT(name.length() == 12);
>+                    return &BuiltInFunction::kFunction_imageSize_0p;
>+                }
>+                break;
>+            }
>+            case 0x12653967u:
>+            {
>+                if (name.beginsWith(BuiltInName::imageSize))
>+                {
>+                    ASSERT(name.length() == 12);
>+                    return &BuiltInFunction::kFunction_imageSize_0q;
>+                }
>+                break;
>+            }
>+            case 0x1265b53eu:
>+            {
>+                if (name.beginsWith(BuiltInName::imageSize))
>+                {
>+                    ASSERT(name.length() == 12);
>+                    return &BuiltInFunction::kFunction_imageSize_0g;
>+                }
>+                break;
>+            }
>+            case 0x1265cbcau:
>+            {
>+                if (name.beginsWith(BuiltInName::imageSize))
>+                {
>+                    ASSERT(name.length() == 12);
>+                    return &BuiltInFunction::kFunction_imageSize_0k;
>+                }
>+                break;
>+            }
>+            case 0x1265cc8du:
>+            {
>+                if (name.beginsWith(BuiltInName::imageSize))
>+                {
>+                    ASSERT(name.length() == 12);
>+                    return &BuiltInFunction::kFunction_imageSize_0f;
>+                }
>+                break;
>+            }
>+            case 0x1265e196u:
>+            {
>+                if (name.beginsWith(BuiltInName::imageSize))
>+                {
>+                    ASSERT(name.length() == 12);
>+                    return &BuiltInFunction::kFunction_imageSize_0o;
>+                }
>+                break;
>+            }
>+            case 0x1265e603u:
>+            {
>+                if (name.beginsWith(BuiltInName::imageSize))
>+                {
>+                    ASSERT(name.length() == 12);
>+                    return &BuiltInFunction::kFunction_imageSize_0h;
>+                }
>+                break;
>+            }
>+            case 0x1265f559u:
>+            {
>+                if (name.beginsWith(BuiltInName::imageSize))
>+                {
>+                    ASSERT(name.length() == 12);
>+                    return &BuiltInFunction::kFunction_imageSize_0j;
>+                }
>+                break;
>+            }
>+            case 0x1265fcacu:
>+            {
>+                if (name.beginsWith(BuiltInName::imageSize))
>+                {
>+                    ASSERT(name.length() == 12);
>+                    return &BuiltInFunction::kFunction_imageSize_0i;
>+                }
>+                break;
>+            }
>+            case 0x12660ccfu:
>+            {
>+                if (name.beginsWith(BuiltInName::imageSize))
>+                {
>+                    ASSERT(name.length() == 12);
>+                    return &BuiltInFunction::kFunction_imageSize_0l;
>+                }
>+                break;
>+            }
>+            case 0x12661578u:
>+            {
>+                if (name.beginsWith(BuiltInName::imageSize))
>+                {
>+                    ASSERT(name.length() == 12);
>+                    return &BuiltInFunction::kFunction_imageSize_0m;
>+                }
>+                break;
>+            }
>+            case 0x12661be5u:
>+            {
>+                if (name.beginsWith(BuiltInName::imageSize))
>+                {
>+                    ASSERT(name.length() == 12);
>+                    return &BuiltInFunction::kFunction_imageSize_0n;
>+                }
>+                break;
>+            }
>+            case 0x12700109u:
>+            {
>+                if (name.beginsWith(BuiltInName::imageLoad))
>+                {
>+                    ASSERT(name.length() == 14);
>+                    return &BuiltInFunction::kFunction_imageLoad_0h1C;
>+                }
>+                break;
>+            }
>+            case 0x1270b3f8u:
>+            {
>+                if (name.beginsWith(BuiltInName::atomicAdd))
>+                {
>+                    ASSERT(name.length() == 14);
>+                    return &BuiltInFunction::kFunction_atomicAdd_0C0C;
>+                }
>+                break;
>+            }
>+            case 0x1270b766u:
>+            {
>+                if (name.beginsWith(BuiltInName::atomicXor))
>+                {
>+                    ASSERT(name.length() == 14);
>+                    return &BuiltInFunction::kFunction_atomicXor_0C0C;
>+                }
>+                break;
>+            }
>+            case 0x12712664u:
>+            {
>+                if (name.beginsWith(BuiltInName::imageLoad))
>+                {
>+                    ASSERT(name.length() == 14);
>+                    return &BuiltInFunction::kFunction_imageLoad_0n2C;
>+                }
>+                break;
>+            }
>+            case 0x12715f47u:
>+            {
>+                if (name.beginsWith(BuiltInName::imageLoad))
>+                {
>+                    ASSERT(name.length() == 14);
>+                    return &BuiltInFunction::kFunction_imageLoad_0j2C;
>+                }
>+                break;
>+            }
>+            case 0x12717c89u:
>+            {
>+                if (name.beginsWith(BuiltInName::atomicMin))
>+                {
>+                    ASSERT(name.length() == 14);
>+                    return &BuiltInFunction::kFunction_atomicMin_0C0C;
>+                }
>+                break;
>+            }
>+            case 0x127258f0u:
>+            {
>+                if (name.beginsWith(BuiltInName::atomicAdd))
>+                {
>+                    ASSERT(name.length() == 14);
>+                    return &BuiltInFunction::kFunction_atomicAdd_0D0D;
>+                }
>+                break;
>+            }
>+            case 0x12731984u:
>+            {
>+                if (name.beginsWith(BuiltInName::imageLoad))
>+                {
>+                    ASSERT(name.length() == 14);
>+                    return &BuiltInFunction::kFunction_imageLoad_0m2C;
>+                }
>+                break;
>+            }
>+            case 0x12737ed6u:
>+            {
>+                if (name.beginsWith(BuiltInName::imageLoad))
>+                {
>+                    ASSERT(name.length() == 14);
>+                    return &BuiltInFunction::kFunction_imageLoad_0q2C;
>+                }
>+                break;
>+            }
>+            case 0x12739c87u:
>+            {
>+                if (name.beginsWith(BuiltInName::imageLoad))
>+                {
>+                    ASSERT(name.length() == 14);
>+                    return &BuiltInFunction::kFunction_imageLoad_0f1C;
>+                }
>+                break;
>+            }
>+            case 0x1273d1adu:
>+            {
>+                if (name.beginsWith(BuiltInName::atomicMax))
>+                {
>+                    ASSERT(name.length() == 14);
>+                    return &BuiltInFunction::kFunction_atomicMax_0D0D;
>+                }
>+                break;
>+            }
>+            case 0x1273e62au:
>+            {
>+                if (name.beginsWith(BuiltInName::atomicMin))
>+                {
>+                    ASSERT(name.length() == 14);
>+                    return &BuiltInFunction::kFunction_atomicMin_0D0D;
>+                }
>+                break;
>+            }
>+            case 0x12744c0du:
>+            {
>+                if (name.beginsWith(BuiltInName::imageLoad))
>+                {
>+                    ASSERT(name.length() == 14);
>+                    return &BuiltInFunction::kFunction_imageLoad_0o2C;
>+                }
>+                break;
>+            }
>+            case 0x127474cau:
>+            {
>+                if (name.beginsWith(BuiltInName::imageLoad))
>+                {
>+                    ASSERT(name.length() == 14);
>+                    return &BuiltInFunction::kFunction_imageLoad_0k2C;
>+                }
>+                break;
>+            }
>+            case 0x127478d9u:
>+            {
>+                if (name.beginsWith(BuiltInName::atomicAnd))
>+                {
>+                    ASSERT(name.length() == 14);
>+                    return &BuiltInFunction::kFunction_atomicAnd_0C0C;
>+                }
>+                break;
>+            }
>+            case 0x1274d54bu:
>+            {
>+                if (name.beginsWith(BuiltInName::imageLoad))
>+                {
>+                    ASSERT(name.length() == 14);
>+                    return &BuiltInFunction::kFunction_imageLoad_0p2C;
>+                }
>+                break;
>+            }
>+            case 0x127539b2u:
>+            {
>+                if (name.beginsWith(BuiltInName::imageLoad))
>+                {
>+                    ASSERT(name.length() == 14);
>+                    return &BuiltInFunction::kFunction_imageLoad_0i2C;
>+                }
>+                break;
>+            }
>+            case 0x12755603u:
>+            {
>+                if (name.beginsWith(BuiltInName::imageLoad))
>+                {
>+                    ASSERT(name.length() == 14);
>+                    return &BuiltInFunction::kFunction_imageLoad_0g1C;
>+                }
>+                break;
>+            }
>+            case 0x127648cau:
>+            {
>+                if (name.beginsWith(BuiltInName::atomicAnd))
>+                {
>+                    ASSERT(name.length() == 14);
>+                    return &BuiltInFunction::kFunction_atomicAnd_0D0D;
>+                }
>+                break;
>+            }
>+            case 0x1276656cu:
>+            {
>+                if (name.beginsWith(BuiltInName::imageLoad))
>+                {
>+                    ASSERT(name.length() == 14);
>+                    return &BuiltInFunction::kFunction_imageLoad_0l2C;
>+                }
>+                break;
>+            }
>+            case 0x12771119u:
>+            {
>+                if (name.beginsWith(BuiltInName::atomicXor))
>+                {
>+                    ASSERT(name.length() == 14);
>+                    return &BuiltInFunction::kFunction_atomicXor_0D0D;
>+                }
>+                break;
>+            }
>+            case 0x1277882au:
>+            {
>+                if (name.beginsWith(BuiltInName::atomicMax))
>+                {
>+                    ASSERT(name.length() == 14);
>+                    return &BuiltInFunction::kFunction_atomicMax_0C0C;
>+                }
>+                break;
>+            }
>+            case 0x1283ba95u:
>+            {
>+                if (name.beginsWith(BuiltInName::uaddCarry))
>+                {
>+                    ASSERT(name.length() == 16);
>+                    return &BuiltInFunction::kFunction_uaddCarry_0D0D0D;
>+                }
>+                break;
>+            }
>+            case 0x12840dfbu:
>+            {
>+                if (name == BuiltInName::uaddCarry_2D2D2D)
>+                {
>+                    return &BuiltInFunction::kFunction_uaddCarry_2D2D2D;
>+                }
>+                break;
>+            }
>+            case 0x12842566u:
>+            {
>+                if (name == BuiltInName::uaddCarry_3D3D3D)
>+                {
>+                    return &BuiltInFunction::kFunction_uaddCarry_3D3D3D;
>+                }
>+                break;
>+            }
>+            case 0x12843bc0u:
>+            {
>+                if (name.beginsWith(BuiltInName::uaddCarry))
>+                {
>+                    ASSERT(name.length() == 16);
>+                    return &BuiltInFunction::kFunction_uaddCarry_1D1D1D;
>+                }
>+                break;
>+            }
>+            case 0x1488078cu:
>+            {
>+                if (name.beginsWith(BuiltInName::imageStore))
>+                {
>+                    ASSERT(name.length() == 17);
>+                    return &BuiltInFunction::kFunction_imageStore_0k2C3D;
>+                }
>+                break;
>+            }
>+            case 0x14880e11u:
>+            {
>+                if (name == BuiltInName::texelFetch_0V2C0C)
>+                {
>+                    return &BuiltInFunction::kFunction_texelFetch_0V2C0C;
>+                }
>+                break;
>+            }
>+            case 0x1488ffa7u:
>+            {
>+                if (name == BuiltInName::usubBorrow_3D3D3D)
>+                {
>+                    return &BuiltInFunction::kFunction_usubBorrow_3D3D3D;
>+                }
>+                break;
>+            }
>+            case 0x1489244fu:
>+            {
>+                if (name.beginsWith(BuiltInName::texelFetch))
>+                {
>+                    ASSERT(name.length() == 17);
>+                    return &BuiltInFunction::kFunction_texelFetch_0b2C0C;
>+                }
>+                break;
>+            }
>+            case 0x14896692u:
>+            {
>+                if (name.beginsWith(BuiltInName::usubBorrow))
>+                {
>+                    ASSERT(name.length() == 17);
>+                    return &BuiltInFunction::kFunction_usubBorrow_2D2D2D;
>+                }
>+                break;
>+            }
>+            case 0x14896e41u:
>+            {
>+                if (name == BuiltInName::texelFetch_0O1C0C)
>+                {
>+                    return &BuiltInFunction::kFunction_texelFetch_0O1C0C;
>+                }
>+                break;
>+            }
>+            case 0x148a0cecu:
>+            {
>+                if (name == BuiltInName::imageStore_0p2C3C)
>+                {
>+                    return &BuiltInFunction::kFunction_imageStore_0p2C3C;
>+                }
>+                break;
>+            }
>+            case 0x148ab5f1u:
>+            {
>+                if (name == BuiltInName::usubBorrow_1D1D1D)
>+                {
>+                    return &BuiltInFunction::kFunction_usubBorrow_1D1D1D;
>+                }
>+                break;
>+            }
>+            case 0x148bb1bdu:
>+            {
>+                if (name.beginsWith(BuiltInName::imageStore))
>+                {
>+                    ASSERT(name.length() == 17);
>+                    return &BuiltInFunction::kFunction_imageStore_0g1C3C;
>+                }
>+                break;
>+            }
>+            case 0x148c1e41u:
>+            {
>+                if (name.beginsWith(BuiltInName::imageStore))
>+                {
>+                    ASSERT(name.length() == 17);
>+                    return &BuiltInFunction::kFunction_imageStore_0q2C3D;
>+                }
>+                break;
>+            }
>+            case 0x148d86dcu:
>+            {
>+                if (name.beginsWith(BuiltInName::imageStore))
>+                {
>+                    ASSERT(name.length() == 17);
>+                    return &BuiltInFunction::kFunction_imageStore_0f1C3B;
>+                }
>+                break;
>+            }
>+            case 0x148dcfd5u:
>+            {
>+                if (name == BuiltInName::imageStore_0l2C3B)
>+                {
>+                    return &BuiltInFunction::kFunction_imageStore_0l2C3B;
>+                }
>+                break;
>+            }
>+            case 0x148ddb10u:
>+            {
>+                if (name.beginsWith(BuiltInName::texelFetch))
>+                {
>+                    ASSERT(name.length() == 17);
>+                    return &BuiltInFunction::kFunction_texelFetch_0a1C0C;
>+                }
>+                break;
>+            }
>+            case 0x148e37b8u:
>+            {
>+                if (name.beginsWith(BuiltInName::imageStore))
>+                {
>+                    ASSERT(name.length() == 17);
>+                    return &BuiltInFunction::kFunction_imageStore_0m2C3C;
>+                }
>+                break;
>+            }
>+            case 0x148e668au:
>+            {
>+                if (name == BuiltInName::imageStore_0j2C3C)
>+                {
>+                    return &BuiltInFunction::kFunction_imageStore_0j2C3C;
>+                }
>+                break;
>+            }
>+            case 0x148e872bu:
>+            {
>+                if (name == BuiltInName::texelFetch_0P2C0C)
>+                {
>+                    return &BuiltInFunction::kFunction_texelFetch_0P2C0C;
>+                }
>+                break;
>+            }
>+            case 0x148ed16fu:
>+            {
>+                if (name.beginsWith(BuiltInName::texelFetch))
>+                {
>+                    ASSERT(name.length() == 17);
>+                    return &BuiltInFunction::kFunction_texelFetch_0U1C0C;
>+                }
>+                break;
>+            }
>+            case 0x148ed534u:
>+            {
>+                if (name == BuiltInName::imageStore_0n2C3D)
>+                {
>+                    return &BuiltInFunction::kFunction_imageStore_0n2C3D;
>+                }
>+                break;
>+            }
>+            case 0x148f6fe1u:
>+            {
>+                if (name == BuiltInName::usubBorrow_0D0D0D)
>+                {
>+                    return &BuiltInFunction::kFunction_usubBorrow_0D0D0D;
>+                }
>+                break;
>+            }
>+            case 0x148f7a82u:
>+            {
>+                if (name.beginsWith(BuiltInName::imageStore))
>+                {
>+                    ASSERT(name.length() == 17);
>+                    return &BuiltInFunction::kFunction_imageStore_0o2C3B;
>+                }
>+                break;
>+            }
>+            case 0x148fd5f1u:
>+            {
>+                if (name.beginsWith(BuiltInName::imageStore))
>+                {
>+                    ASSERT(name.length() == 17);
>+                    return &BuiltInFunction::kFunction_imageStore_0i2C3B;
>+                }
>+                break;
>+            }
>+            case 0x148ffee8u:
>+            {
>+                if (name == BuiltInName::imageStore_0h1C3D)
>+                {
>+                    return &BuiltInFunction::kFunction_imageStore_0h1C3D;
>+                }
>+                break;
>+            }
>+            case 0x167394d8u:
>+            {
>+                if (name.beginsWith(BuiltInName::textureSize))
>+                {
>+                    ASSERT(name.length() == 14);
>+                    return &BuiltInFunction::kFunction_textureSize_0U;
>+                }
>+                break;
>+            }
>+            case 0x1673a791u:
>+            {
>+                if (name.beginsWith(BuiltInName::textureSize))
>+                {
>+                    ASSERT(name.length() == 14);
>+                    return &BuiltInFunction::kFunction_textureSize_0V;
>+                }
>+                break;
>+            }
>+            case 0x1673b4b7u:
>+            {
>+                if (name.beginsWith(BuiltInName::textureSize))
>+                {
>+                    ASSERT(name.length() == 14);
>+                    return &BuiltInFunction::kFunction_textureSize_0P;
>+                }
>+                break;
>+            }
>+            case 0x1673f496u:
>+            {
>+                if (name.beginsWith(BuiltInName::textureSize))
>+                {
>+                    ASSERT(name.length() == 14);
>+                    return &BuiltInFunction::kFunction_textureSize_0O;
>+                }
>+                break;
>+            }
>+            case 0x16752ab6u:
>+            {
>+                if (name.beginsWith(BuiltInName::textureSize))
>+                {
>+                    ASSERT(name.length() == 14);
>+                    return &BuiltInFunction::kFunction_textureSize_0a;
>+                }
>+                break;
>+            }
>+            case 0x1675566fu:
>+            {
>+                if (name.beginsWith(BuiltInName::textureSize))
>+                {
>+                    ASSERT(name.length() == 14);
>+                    return &BuiltInFunction::kFunction_textureSize_0b;
>+                }
>+                break;
>+            }
>+            case 0x187b7b7cu:
>+            {
>+                if (name.beginsWith(BuiltInName::packSnorm4x8))
>+                {
>+                    ASSERT(name.length() == 15);
>+                    return &BuiltInFunction::kFunction_packSnorm4x8_3B;
>+                }
>+                break;
>+            }
>+            case 0x187c1f3fu:
>+            {
>+                if (name.beginsWith(BuiltInName::packUnorm4x8))
>+                {
>+                    ASSERT(name.length() == 15);
>+                    return &BuiltInFunction::kFunction_packUnorm4x8_3B;
>+                }
>+                break;
>+            }
>+            case 0x18a851efu:
>+            {
>+                if (name == BuiltInName::imulExtended_2C2C2C2C)
>+                {
>+                    return &BuiltInFunction::kFunction_imulExtended_2C2C2C2C;
>+                }
>+                break;
>+            }
>+            case 0x18a93bdcu:
>+            {
>+                if (name == BuiltInName::umulExtended_0D0D0D0D)
>+                {
>+                    return &BuiltInFunction::kFunction_umulExtended_0D0D0D0D;
>+                }
>+                break;
>+            }
>+            case 0x18a94b63u:
>+            {
>+                if (name == BuiltInName::umulExtended_3D3D3D3D)
>+                {
>+                    return &BuiltInFunction::kFunction_umulExtended_3D3D3D3D;
>+                }
>+                break;
>+            }
>+            case 0x18aa71ceu:
>+            {
>+                if (name == BuiltInName::umulExtended_2D2D2D2D)
>+                {
>+                    return &BuiltInFunction::kFunction_umulExtended_2D2D2D2D;
>+                }
>+                break;
>+            }
>+            case 0x18ab4baeu:
>+            {
>+                if (name == BuiltInName::umulExtended_1D1D1D1D)
>+                {
>+                    return &BuiltInFunction::kFunction_umulExtended_1D1D1D1D;
>+                }
>+                break;
>+            }
>+            case 0x18ac1df0u:
>+            {
>+                if (name == BuiltInName::imulExtended_3C3C3C3C)
>+                {
>+                    return &BuiltInFunction::kFunction_imulExtended_3C3C3C3C;
>+                }
>+                break;
>+            }
>+            case 0x18ac377fu:
>+            {
>+                if (name == BuiltInName::imulExtended_0C0C0C0C)
>+                {
>+                    return &BuiltInFunction::kFunction_imulExtended_0C0C0C0C;
>+                }
>+                break;
>+            }
>+            case 0x18ae7b8cu:
>+            {
>+                if (name == BuiltInName::imulExtended_1C1C1C1C)
>+                {
>+                    return &BuiltInFunction::kFunction_imulExtended_1C1C1C1C;
>+                }
>+                break;
>+            }
>+            case 0x1a7538dfu:
>+            {
>+                if (name.beginsWith(BuiltInName::memoryBarrier))
>+                {
>+                    ASSERT(name.length() == 14);
>+                    return &BuiltInFunction::kFunction_memoryBarrier_;
>+                }
>+                break;
>+            }
>+            case 0x1a805162u:
>+            {
>+                if (name.beginsWith(BuiltInName::atomicCounter))
>+                {
>+                    ASSERT(name.length() == 16);
>+                    return &BuiltInFunction::kFunction_atomicCounter_0F;
>+                }
>+                break;
>+            }
>+            case 0x1a910beau:
>+            {
>+                if (name.beginsWith(BuiltInName::textureGather))
>+                {
>+                    ASSERT(name.length() == 18);
>+                    return &BuiltInFunction::kFunction_textureGather_0Y2B;
>+                }
>+                break;
>+            }
>+            case 0x1a91963cu:
>+            {
>+                if (name.beginsWith(BuiltInName::textureGather))
>+                {
>+                    ASSERT(name.length() == 18);
>+                    return &BuiltInFunction::kFunction_textureGather_0d2B;
>+                }
>+                break;
>+            }
>+            case 0x1a926b0du:
>+            {
>+                if (name.beginsWith(BuiltInName::textureGather))
>+                {
>+                    ASSERT(name.length() == 18);
>+                    return &BuiltInFunction::kFunction_textureGather_0c1B;
>+                }
>+                break;
>+            }
>+            case 0x1a92a168u:
>+            {
>+                if (name.beginsWith(BuiltInName::textureGather))
>+                {
>+                    ASSERT(name.length() == 18);
>+                    return &BuiltInFunction::kFunction_textureGather_0W1B;
>+                }
>+                break;
>+            }
>+            case 0x1a92a1ceu:
>+            {
>+                if (name.beginsWith(BuiltInName::textureGather))
>+                {
>+                    ASSERT(name.length() == 18);
>+                    return &BuiltInFunction::kFunction_textureGather_0H1B;
>+                }
>+                break;
>+            }
>+            case 0x1a92c882u:
>+            {
>+                if (name.beginsWith(BuiltInName::textureGather))
>+                {
>+                    ASSERT(name.length() == 18);
>+                    return &BuiltInFunction::kFunction_textureGather_0Q1B;
>+                }
>+                break;
>+            }
>+            case 0x1a9418e8u:
>+            {
>+                if (name.beginsWith(BuiltInName::textureGather))
>+                {
>+                    ASSERT(name.length() == 18);
>+                    return &BuiltInFunction::kFunction_textureGather_0S2B;
>+                }
>+                break;
>+            }
>+            case 0x1a94543du:
>+            {
>+                if (name.beginsWith(BuiltInName::textureGather))
>+                {
>+                    ASSERT(name.length() == 18);
>+                    return &BuiltInFunction::kFunction_textureGather_0K2B;
>+                }
>+                break;
>+            }
>+            case 0x1a94d27du:
>+            {
>+                if (name.beginsWith(BuiltInName::textureGather))
>+                {
>+                    ASSERT(name.length() == 18);
>+                    return &BuiltInFunction::kFunction_textureGather_0e2B;
>+                }
>+                break;
>+            }
>+            case 0x1a94eb48u:
>+            {
>+                if (name.beginsWith(BuiltInName::textureGather))
>+                {
>+                    ASSERT(name.length() == 18);
>+                    return &BuiltInFunction::kFunction_textureGather_0Z2B;
>+                }
>+                break;
>+            }
>+            case 0x1a95f707u:
>+            {
>+                if (name.beginsWith(BuiltInName::textureGather))
>+                {
>+                    ASSERT(name.length() == 18);
>+                    return &BuiltInFunction::kFunction_textureGather_0T2B;
>+                }
>+                break;
>+            }
>+            case 0x1a979ae3u:
>+            {
>+                if (name.beginsWith(BuiltInName::textureGather))
>+                {
>+                    ASSERT(name.length() == 18);
>+                    return &BuiltInFunction::kFunction_textureGather_0J2B;
>+                }
>+                break;
>+            }
>+            case 0x1aa039c7u:
>+            {
>+                if (name.beginsWith(BuiltInName::textureGather))
>+                {
>+                    ASSERT(name.length() == 20);
>+                    return &BuiltInFunction::kFunction_textureGather_0e2B0B;
>+                }
>+                break;
>+            }
>+            case 0x1aa133bcu:
>+            {
>+                if (name.beginsWith(BuiltInName::textureGather))
>+                {
>+                    ASSERT(name.length() == 20);
>+                    return &BuiltInFunction::kFunction_textureGather_0Q1B0C;
>+                }
>+                break;
>+            }
>+            case 0x1aa17115u:
>+            {
>+                if (name == BuiltInName::textureGather_0Z2B0C)
>+                {
>+                    return &BuiltInFunction::kFunction_textureGather_0Z2B0C;
>+                }
>+                break;
>+            }
>+            case 0x1aa182eeu:
>+            {
>+                if (name.beginsWith(BuiltInName::textureGather))
>+                {
>+                    ASSERT(name.length() == 20);
>+                    return &BuiltInFunction::kFunction_textureGather_0c1B0B;
>+                }
>+                break;
>+            }
>+            case 0x1aa220b0u:
>+            {
>+                if (name.beginsWith(BuiltInName::textureGather))
>+                {
>+                    ASSERT(name.length() == 20);
>+                    return &BuiltInFunction::kFunction_textureGather_0W1B0C;
>+                }
>+                break;
>+            }
>+            case 0x1aa2aafeu:
>+            {
>+                if (name == BuiltInName::textureGather_0T2B0C)
>+                {
>+                    return &BuiltInFunction::kFunction_textureGather_0T2B0C;
>+                }
>+                break;
>+            }
>+            case 0x1aa353f8u:
>+            {
>+                if (name.beginsWith(BuiltInName::textureGather))
>+                {
>+                    ASSERT(name.length() == 20);
>+                    return &BuiltInFunction::kFunction_textureGather_0d2B0B;
>+                }
>+                break;
>+            }
>+            case 0x1aa3ef46u:
>+            {
>+                if (name == BuiltInName::textureGather_0S2B0C)
>+                {
>+                    return &BuiltInFunction::kFunction_textureGather_0S2B0C;
>+                }
>+                break;
>+            }
>+            case 0x1aa4986bu:
>+            {
>+                if (name == BuiltInName::textureGather_0J2B0C)
>+                {
>+                    return &BuiltInFunction::kFunction_textureGather_0J2B0C;
>+                }
>+                break;
>+            }
>+            case 0x1aa4c59du:
>+            {
>+                if (name.beginsWith(BuiltInName::textureGather))
>+                {
>+                    ASSERT(name.length() == 20);
>+                    return &BuiltInFunction::kFunction_textureGather_0H1B0C;
>+                }
>+                break;
>+            }
>+            case 0x1aa78b86u:
>+            {
>+                if (name.beginsWith(BuiltInName::textureGather))
>+                {
>+                    ASSERT(name.length() == 20);
>+                    return &BuiltInFunction::kFunction_textureGather_0K2B0C;
>+                }
>+                break;
>+            }
>+            case 0x1aa7fa48u:
>+            {
>+                if (name.beginsWith(BuiltInName::textureGather))
>+                {
>+                    ASSERT(name.length() == 20);
>+                    return &BuiltInFunction::kFunction_textureGather_0Y2B0C;
>+                }
>+                break;
>+            }
>+            case 0x1c894fb3u:
>+            {
>+                if (name.beginsWith(BuiltInName::unpackSnorm4x8))
>+                {
>+                    ASSERT(name.length() == 17);
>+                    return &BuiltInFunction::kFunction_unpackSnorm4x8_0D;
>+                }
>+                break;
>+            }
>+            case 0x1c8be3bau:
>+            {
>+                if (name.beginsWith(BuiltInName::unpackUnorm4x8))
>+                {
>+                    ASSERT(name.length() == 17);
>+                    return &BuiltInFunction::kFunction_unpackUnorm4x8_0D;
>+                }
>+                break;
>+            }
>+            case 0x1c9986beu:
>+            {
>+                if (name.beginsWith(BuiltInName::atomicExchange))
>+                {
>+                    ASSERT(name.length() == 19);
>+                    return &BuiltInFunction::kFunction_atomicExchange_0D0D;
>+                }
>+                break;
>+            }
>+            case 0x1c9b5eecu:
>+            {
>+                if (name.beginsWith(BuiltInName::atomicExchange))
>+                {
>+                    ASSERT(name.length() == 19);
>+                    return &BuiltInFunction::kFunction_atomicExchange_0C0C;
>+                }
>+                break;
>+            }
>+            case 0x1ca86085u:
>+            {
>+                if (name.beginsWith(BuiltInName::atomicCompSwap))
>+                {
>+                    ASSERT(name.length() == 21);
>+                    return &BuiltInFunction::kFunction_atomicCompSwap_0C0C0C;
>+                }
>+                break;
>+            }
>+            case 0x1caa900cu:
>+            {
>+                if (name == BuiltInName::atomicCompSwap_0D0D0D)
>+                {
>+                    return &BuiltInFunction::kFunction_atomicCompSwap_0D0D0D;
>+                }
>+                break;
>+            }
>+            case 0x1cb84b0cu:
>+            {
>+                if (name == BuiltInName::bitfieldInsert_3D3D0C0C)
>+                {
>+                    return &BuiltInFunction::kFunction_bitfieldInsert_3D3D0C0C;
>+                }
>+                break;
>+            }
>+            case 0x1cb880bfu:
>+            {
>+                if (name == BuiltInName::bitfieldInsert_3C3C0C0C)
>+                {
>+                    return &BuiltInFunction::kFunction_bitfieldInsert_3C3C0C0C;
>+                }
>+                break;
>+            }
>+            case 0x1cb90fd0u:
>+            {
>+                if (name == BuiltInName::bitfieldInsert_1C1C0C0C)
>+                {
>+                    return &BuiltInFunction::kFunction_bitfieldInsert_1C1C0C0C;
>+                }
>+                break;
>+            }
>+            case 0x1cb9fb13u:
>+            {
>+                if (name == BuiltInName::bitfieldInsert_1D1D0C0C)
>+                {
>+                    return &BuiltInFunction::kFunction_bitfieldInsert_1D1D0C0C;
>+                }
>+                break;
>+            }
>+            case 0x1cbb43f5u:
>+            {
>+                if (name == BuiltInName::bitfieldInsert_0D0D0C0C)
>+                {
>+                    return &BuiltInFunction::kFunction_bitfieldInsert_0D0D0C0C;
>+                }
>+                break;
>+            }
>+            case 0x1cbb9db3u:
>+            {
>+                if (name == BuiltInName::bitfieldInsert_2D2D0C0C)
>+                {
>+                    return &BuiltInFunction::kFunction_bitfieldInsert_2D2D0C0C;
>+                }
>+                break;
>+            }
>+            case 0x1cbdf898u:
>+            {
>+                if (name == BuiltInName::bitfieldInsert_0C0C0C0C)
>+                {
>+                    return &BuiltInFunction::kFunction_bitfieldInsert_0C0C0C0C;
>+                }
>+                break;
>+            }
>+            case 0x1cbfaf73u:
>+            {
>+                if (name == BuiltInName::bitfieldInsert_2C2C0C0C)
>+                {
>+                    return &BuiltInFunction::kFunction_bitfieldInsert_2C2C0C0C;
>+                }
>+                break;
>+            }
>+            case 0x1e907f62u:
>+            {
>+                if (name.beginsWith(BuiltInName::bitfieldReverse))
>+                {
>+                    ASSERT(name.length() == 18);
>+                    return &BuiltInFunction::kFunction_bitfieldReverse_3D;
>+                }
>+                break;
>+            }
>+            case 0x1e9088f7u:
>+            {
>+                if (name.beginsWith(BuiltInName::bitfieldReverse))
>+                {
>+                    ASSERT(name.length() == 18);
>+                    return &BuiltInFunction::kFunction_bitfieldReverse_3C;
>+                }
>+                break;
>+            }
>+            case 0x1e91c654u:
>+            {
>+                if (name.beginsWith(BuiltInName::bitfieldReverse))
>+                {
>+                    ASSERT(name.length() == 18);
>+                    return &BuiltInFunction::kFunction_bitfieldReverse_0C;
>+                }
>+                break;
>+            }
>+            case 0x1e91e675u:
>+            {
>+                if (name.beginsWith(BuiltInName::bitfieldReverse))
>+                {
>+                    ASSERT(name.length() == 18);
>+                    return &BuiltInFunction::kFunction_bitfieldReverse_0D;
>+                }
>+                break;
>+            }
>+            case 0x1e96ddc2u:
>+            {
>+                if (name.beginsWith(BuiltInName::bitfieldReverse))
>+                {
>+                    ASSERT(name.length() == 18);
>+                    return &BuiltInFunction::kFunction_bitfieldReverse_1D;
>+                }
>+                break;
>+            }
>+            case 0x1e970da3u:
>+            {
>+                if (name.beginsWith(BuiltInName::bitfieldReverse))
>+                {
>+                    ASSERT(name.length() == 18);
>+                    return &BuiltInFunction::kFunction_bitfieldReverse_1C;
>+                }
>+                break;
>+            }
>+            case 0x1e9744d7u:
>+            {
>+                if (name.beginsWith(BuiltInName::bitfieldReverse))
>+                {
>+                    ASSERT(name.length() == 18);
>+                    return &BuiltInFunction::kFunction_bitfieldReverse_2D;
>+                }
>+                break;
>+            }
>+            case 0x1e9797d2u:
>+            {
>+                if (name.beginsWith(BuiltInName::bitfieldReverse))
>+                {
>+                    ASSERT(name.length() == 18);
>+                    return &BuiltInFunction::kFunction_bitfieldReverse_2C;
>+                }
>+                break;
>+            }
>+            case 0x1eb0c64fu:
>+            {
>+                if (name.beginsWith(BuiltInName::bitfieldExtract))
>+                {
>+                    ASSERT(name.length() == 22);
>+                    return &BuiltInFunction::kFunction_bitfieldExtract_2C0C0C;
>+                }
>+                break;
>+            }
>+            case 0x1eb0f9fau:
>+            {
>+                if (name == BuiltInName::bitfieldExtract_0D0C0C)
>+                {
>+                    return &BuiltInFunction::kFunction_bitfieldExtract_0D0C0C;
>+                }
>+                break;
>+            }
>+            case 0x1eb12f29u:
>+            {
>+                if (name.beginsWith(BuiltInName::bitfieldExtract))
>+                {
>+                    ASSERT(name.length() == 22);
>+                    return &BuiltInFunction::kFunction_bitfieldExtract_3D0C0C;
>+                }
>+                break;
>+            }
>+            case 0x1eb17d11u:
>+            {
>+                if (name == BuiltInName::bitfieldExtract_3C0C0C)
>+                {
>+                    return &BuiltInFunction::kFunction_bitfieldExtract_3C0C0C;
>+                }
>+                break;
>+            }
>+            case 0x1eb17f7du:
>+            {
>+                if (name.beginsWith(BuiltInName::bitfieldExtract))
>+                {
>+                    ASSERT(name.length() == 22);
>+                    return &BuiltInFunction::kFunction_bitfieldExtract_0C0C0C;
>+                }
>+                break;
>+            }
>+            case 0x1eb19a50u:
>+            {
>+                if (name == BuiltInName::bitfieldExtract_1C0C0C)
>+                {
>+                    return &BuiltInFunction::kFunction_bitfieldExtract_1C0C0C;
>+                }
>+                break;
>+            }
>+            case 0x1eb28b55u:
>+            {
>+                if (name.beginsWith(BuiltInName::bitfieldExtract))
>+                {
>+                    ASSERT(name.length() == 22);
>+                    return &BuiltInFunction::kFunction_bitfieldExtract_2D0C0C;
>+                }
>+                break;
>+            }
>+            case 0x1eb5f0c8u:
>+            {
>+                if (name.beginsWith(BuiltInName::bitfieldExtract))
>+                {
>+                    ASSERT(name.length() == 22);
>+                    return &BuiltInFunction::kFunction_bitfieldExtract_1D0C0C;
>+                }
>+                break;
>+            }
>+            case 0x249e7359u:
>+            {
>+                if (name.beginsWith(BuiltInName::memoryBarrierImage))
>+                {
>+                    ASSERT(name.length() == 19);
>+                    return &BuiltInFunction::kFunction_memoryBarrierImage_;
>+                }
>+                break;
>+            }
>+            case 0x26a7e24bu:
>+            {
>+                if (name.beginsWith(BuiltInName::memoryBarrierBuffer))
>+                {
>+                    ASSERT(name.length() == 20);
>+                    return &BuiltInFunction::kFunction_memoryBarrierBuffer_;
>+                }
>+                break;
>+            }
>+            case 0x26d00e91u:
>+            {
>+                if (name == BuiltInName::textureGatherOffset_0W1B1C)
>+                {
>+                    return &BuiltInFunction::kFunction_textureGatherOffset_0W1B1C;
>+                }
>+                break;
>+            }
>+            case 0x26d0b451u:
>+            {
>+                if (name.beginsWith(BuiltInName::textureGatherOffset))
>+                {
>+                    ASSERT(name.length() == 26);
>+                    return &BuiltInFunction::kFunction_textureGatherOffset_0Q1B1C;
>+                }
>+                break;
>+            }
>+            case 0x26d0db41u:
>+            {
>+                if (name.beginsWith(BuiltInName::textureGatherOffset))
>+                {
>+                    ASSERT(name.length() == 26);
>+                    return &BuiltInFunction::kFunction_textureGatherOffset_0Z2B1C;
>+                }
>+                break;
>+            }
>+            case 0x26d1f440u:
>+            {
>+                if (name.beginsWith(BuiltInName::textureGatherOffset))
>+                {
>+                    ASSERT(name.length() == 26);
>+                    return &BuiltInFunction::kFunction_textureGatherOffset_0K2B1C;
>+                }
>+                break;
>+            }
>+            case 0x26d2d875u:
>+            {
>+                if (name == BuiltInName::textureGatherOffset_0T2B1C)
>+                {
>+                    return &BuiltInFunction::kFunction_textureGatherOffset_0T2B1C;
>+                }
>+                break;
>+            }
>+            case 0x26d71952u:
>+            {
>+                if (name.beginsWith(BuiltInName::textureGatherOffset))
>+                {
>+                    ASSERT(name.length() == 26);
>+                    return &BuiltInFunction::kFunction_textureGatherOffset_0H1B1C;
>+                }
>+                break;
>+            }
>+            case 0x26e1982cu:
>+            {
>+                if (name == BuiltInName::textureGatherOffset_0T2B1C0C)
>+                {
>+                    return &BuiltInFunction::kFunction_textureGatherOffset_0T2B1C0C;
>+                }
>+                break;
>+            }
>+            case 0x26e459f8u:
>+            {
>+                if (name == BuiltInName::textureGatherOffset_0K2B1C0C)
>+                {
>+                    return &BuiltInFunction::kFunction_textureGatherOffset_0K2B1C0C;
>+                }
>+                break;
>+            }
>+            case 0x26e476d0u:
>+            {
>+                if (name == BuiltInName::textureGatherOffset_0H1B1C0C)
>+                {
>+                    return &BuiltInFunction::kFunction_textureGatherOffset_0H1B1C0C;
>+                }
>+                break;
>+            }
>+            case 0x26e47c82u:
>+            {
>+                if (name == BuiltInName::textureGatherOffset_0Z2B1C0C)
>+                {
>+                    return &BuiltInFunction::kFunction_textureGatherOffset_0Z2B1C0C;
>+                }
>+                break;
>+            }
>+            case 0x26e53ca1u:
>+            {
>+                if (name == BuiltInName::textureGatherOffset_0e2B0B1C)
>+                {
>+                    return &BuiltInFunction::kFunction_textureGatherOffset_0e2B0B1C;
>+                }
>+                break;
>+            }
>+            case 0x26e567feu:
>+            {
>+                if (name == BuiltInName::textureGatherOffset_0Q1B1C0C)
>+                {
>+                    return &BuiltInFunction::kFunction_textureGatherOffset_0Q1B1C0C;
>+                }
>+                break;
>+            }
>+            case 0x26e580eau:
>+            {
>+                if (name == BuiltInName::textureGatherOffset_0c1B0B1C)
>+                {
>+                    return &BuiltInFunction::kFunction_textureGatherOffset_0c1B0B1C;
>+                }
>+                break;
>+            }
>+            case 0x26e737a0u:
>+            {
>+                if (name == BuiltInName::textureGatherOffset_0W1B1C0C)
>+                {
>+                    return &BuiltInFunction::kFunction_textureGatherOffset_0W1B1C0C;
>+                }
>+                break;
>+            }
>+            case 0x2ccf8f34u:
>+            {
>+                if (name.beginsWith(BuiltInName::atomicCounterIncrement))
>+                {
>+                    ASSERT(name.length() == 25);
>+                    return &BuiltInFunction::kFunction_atomicCounterIncrement_0F;
>+                }
>+                break;
>+            }
>+            case 0x2ccfbbbeu:
>+            {
>+                if (name.beginsWith(BuiltInName::atomicCounterDecrement))
>+                {
>+                    ASSERT(name.length() == 25);
>+                    return &BuiltInFunction::kFunction_atomicCounterDecrement_0F;
>+                }
>+                break;
>+            }
>+            case 0x34ded18du:
>+            {
>+                if (name.beginsWith(BuiltInName::memoryBarrierAtomicCounter))
>+                {
>+                    ASSERT(name.length() == 27);
>+                    return &BuiltInFunction::kFunction_memoryBarrierAtomicCounter_;
>+                }
>+                break;
>+            }
>+            case 0x7e2bef7au:
>+            {
>+                if (name == BuiltInName::gl_in)
>+                {
>+                    // Only initialized if shaderType == GL_GEOMETRY_SHADER_EXT
>+                    return mVar_gl_in;
>+                }
>+                break;
>+            }
>+            case 0x7e8166efu:
>+            {
>+                if (name == BuiltInName::gl_MaxImageUnits)
>+                {
>+                    return mVar_gl_MaxImageUnits;
>+                }
>+                break;
>+            }
>+            case 0x7ecf4a1bu:
>+            {
>+                if (name == BuiltInName::gl_MaxVertexImageUniforms)
>+                {
>+                    return mVar_gl_MaxVertexImageUniforms;
>+                }
>+                break;
>+            }
>+            case 0x7ed27574u:
>+            {
>+                if (name == BuiltInName::gl_MaxVertexAtomicCounters)
>+                {
>+                    return mVar_gl_MaxVertexAtomicCounters;
>+                }
>+                break;
>+            }
>+            case 0x7ed2bd5cu:
>+            {
>+                if (name == BuiltInName::gl_MaxComputeImageUniforms)
>+                {
>+                    return mVar_gl_MaxComputeImageUniforms;
>+                }
>+                break;
>+            }
>+            case 0x7ed77973u:
>+            {
>+                if (name == BuiltInName::gl_MaxComputeWorkGroupSize)
>+                {
>+                    return mVar_gl_MaxComputeWorkGroupSize;
>+                }
>+                break;
>+            }
>+            case 0x7ed9ae57u:
>+            {
>+                if (name == BuiltInName::gl_MaxCombinedImageUniforms)
>+                {
>+                    return mVar_gl_MaxCombinedImageUniforms;
>+                }
>+                break;
>+            }
>+            case 0x7ed9f437u:
>+            {
>+                if (name == BuiltInName::gl_MaxGeometryImageUniforms)
>+                {
>+                    return mVar_gl_MaxGeometryImageUniforms;
>+                }
>+                break;
>+            }
>+            case 0x7edacc17u:
>+            {
>+                if (name == BuiltInName::gl_MaxAtomicCounterBindings)
>+                {
>+                    return mVar_gl_MaxAtomicCounterBindings;
>+                }
>+                break;
>+            }
>+            case 0x7ede0db3u:
>+            {
>+                if (name == BuiltInName::gl_MaxComputeAtomicCounters)
>+                {
>+                    return mVar_gl_MaxComputeAtomicCounters;
>+                }
>+                break;
>+            }
>+            case 0x7edeadeeu:
>+            {
>+                if (name == BuiltInName::gl_MaxComputeWorkGroupCount)
>+                {
>+                    return mVar_gl_MaxComputeWorkGroupCount;
>+                }
>+                break;
>+            }
>+            case 0x7edf534au:
>+            {
>+                if (name == BuiltInName::gl_MaxFragmentImageUniforms)
>+                {
>+                    return mVar_gl_MaxFragmentImageUniforms;
>+                }
>+                break;
>+            }
>+            case 0x7ee1b439u:
>+            {
>+                if (name == BuiltInName::gl_MaxGeometryOutputVertices)
>+                {
>+                    return mVar_gl_MaxGeometryOutputVertices;
>+                }
>+                break;
>+            }
>+            case 0x7ee23dcau:
>+            {
>+                if (name == BuiltInName::gl_MaxFragmentAtomicCounters)
>+                {
>+                    return mVar_gl_MaxFragmentAtomicCounters;
>+                }
>+                break;
>+            }
>+            case 0x7ee400c5u:
>+            {
>+                if (name == BuiltInName::gl_MaxCombinedAtomicCounters)
>+                {
>+                    return mVar_gl_MaxCombinedAtomicCounters;
>+                }
>+                break;
>+            }
>+            case 0x7ee6d3cfu:
>+            {
>+                if (name == BuiltInName::gl_MaxGeometryAtomicCounters)
>+                {
>+                    return mVar_gl_MaxGeometryAtomicCounters;
>+                }
>+                break;
>+            }
>+            case 0x7eec3ae1u:
>+            {
>+                if (name == BuiltInName::gl_MaxGeometryInputComponents)
>+                {
>+                    return mVar_gl_MaxGeometryInputComponents;
>+                }
>+                break;
>+            }
>+            case 0x7eecdfadu:
>+            {
>+                if (name == BuiltInName::gl_MaxAtomicCounterBufferSize)
>+                {
>+                    return mVar_gl_MaxAtomicCounterBufferSize;
>+                }
>+                break;
>+            }
>+            case 0x7ef00fc2u:
>+            {
>+                if (name == BuiltInName::gl_MaxComputeTextureImageUnits)
>+                {
>+                    return mVar_gl_MaxComputeTextureImageUnits;
>+                }
>+                break;
>+            }
>+            case 0x7ef3740bu:
>+            {
>+                if (name == BuiltInName::gl_MaxComputeUniformComponents)
>+                {
>+                    return mVar_gl_MaxComputeUniformComponents;
>+                }
>+                break;
>+            }
>+            case 0x7ef69ab4u:
>+            {
>+                if (name == BuiltInName::gl_MaxGeometryOutputComponents)
>+                {
>+                    return mVar_gl_MaxGeometryOutputComponents;
>+                }
>+                break;
>+            }
>+            case 0x7ef9b17du:
>+            {
>+                if (name == BuiltInName::gl_MaxGeometryTextureImageUnits)
>+                {
>+                    return mVar_gl_MaxGeometryTextureImageUnits;
>+                }
>+                break;
>+            }
>+            case 0x7efe1865u:
>+            {
>+                if (name == BuiltInName::gl_MaxGeometryUniformComponents)
>+                {
>+                    return mVar_gl_MaxGeometryUniformComponents;
>+                }
>+                break;
>+            }
>+            case 0x7f008375u:
>+            {
>+                if (name == BuiltInName::gl_MaxVertexAtomicCounterBuffers)
>+                {
>+                    return mVar_gl_MaxVertexAtomicCounterBuffers;
>+                }
>+                break;
>+            }
>+            case 0x7f0d626fu:
>+            {
>+                if (name == BuiltInName::gl_MaxComputeAtomicCounterBuffers)
>+                {
>+                    return mVar_gl_MaxComputeAtomicCounterBuffers;
>+                }
>+                break;
>+            }
>+            case 0x7f11e359u:
>+            {
>+                if (name == BuiltInName::gl_MaxCombinedAtomicCounterBuffers)
>+                {
>+                    return mVar_gl_MaxCombinedAtomicCounterBuffers;
>+                }
>+                break;
>+            }
>+            case 0x7f170f84u:
>+            {
>+                if (name == BuiltInName::gl_MaxGeometryAtomicCounterBuffers)
>+                {
>+                    return mVar_gl_MaxGeometryAtomicCounterBuffers;
>+                }
>+                break;
>+            }
>+            case 0x7f17bd18u:
>+            {
>+                if (name == BuiltInName::gl_MaxFragmentAtomicCounterBuffers)
>+                {
>+                    return mVar_gl_MaxFragmentAtomicCounterBuffers;
>+                }
>+                break;
>+            }
>+            case 0x7f1c60f8u:
>+            {
>+                if (name == BuiltInName::gl_MaxCombinedShaderOutputResources)
>+                {
>+                    return mVar_gl_MaxCombinedShaderOutputResources;
>+                }
>+                break;
>+            }
>+            case 0x7f1cd073u:
>+            {
>+                if (name == BuiltInName::gl_MaxGeometryTotalOutputComponents)
>+                {
>+                    return mVar_gl_MaxGeometryTotalOutputComponents;
>+                }
>+                break;
>+            }
>+        }
>+        if (mShaderType == GL_COMPUTE_SHADER)
>+        {
>+            switch (nameHash)
>+            {
>+                case 0x0e41a660u:
>+                {
>+                    if (name.beginsWith(BuiltInName::barrier))
>+                    {
>+                        ASSERT(name.length() == 8);
>+                        return &BuiltInFunction::kFunction_barrier_;
>+                    }
>+                    break;
>+                }
>+                case 0x249ee97cu:
>+                {
>+                    if (name.beginsWith(BuiltInName::groupMemoryBarrier))
>+                    {
>+                        ASSERT(name.length() == 19);
>+                        return &BuiltInFunction::kFunction_groupMemoryBarrier_;
>+                    }
>+                    break;
>+                }
>+                case 0x26a4d8e6u:
>+                {
>+                    if (name.beginsWith(BuiltInName::memoryBarrierShared))
>+                    {
>+                        ASSERT(name.length() == 20);
>+                        return &BuiltInFunction::kFunction_memoryBarrierShared_;
>+                    }
>+                    break;
>+                }
>+                case 0x7e736b62u:
>+                {
>+                    if (name == BuiltInName::gl_WorkGroupID)
>+                    {
>+                        return &BuiltInVariable::kVar_gl_WorkGroupID;
>+                    }
>+                    break;
>+                }
>+                case 0x7e808e8fu:
>+                {
>+                    if (name == BuiltInName::gl_WorkGroupSize)
>+                    {
>+                        return &BuiltInVariable::kVar_gl_WorkGroupSize;
>+                    }
>+                    break;
>+                }
>+                case 0x7e82b146u:
>+                {
>+                    if (name == BuiltInName::gl_NumWorkGroups)
>+                    {
>+                        return &BuiltInVariable::kVar_gl_NumWorkGroups;
>+                    }
>+                    break;
>+                }
>+                case 0x7ea251edu:
>+                {
>+                    if (name == BuiltInName::gl_LocalInvocationID)
>+                    {
>+                        return &BuiltInVariable::kVar_gl_LocalInvocationID;
>+                    }
>+                    break;
>+                }
>+                case 0x7ead13a8u:
>+                {
>+                    if (name == BuiltInName::gl_GlobalInvocationID)
>+                    {
>+                        return &BuiltInVariable::kVar_gl_GlobalInvocationID;
>+                    }
>+                    break;
>+                }
>+                case 0x7ebcd395u:
>+                {
>+                    if (name == BuiltInName::gl_LocalInvocationIndex)
>+                    {
>+                        return &BuiltInVariable::kVar_gl_LocalInvocationIndex;
>+                    }
>+                    break;
>+                }
>+            }
>+        }
>+        if (mShaderType == GL_GEOMETRY_SHADER_EXT)
>+        {
>+            switch (nameHash)
>+            {
>+                case 0x145d55c9u:
>+                {
>+                    if (name.beginsWith(BuiltInName::EmitVertex))
>+                    {
>+                        ASSERT(name.length() == 11);
>+                        return &BuiltInFunction::kFunction_EmitVertex_;
>+                    }
>+                    break;
>+                }
>+                case 0x186fcde2u:
>+                {
>+                    if (name.beginsWith(BuiltInName::EndPrimitive))
>+                    {
>+                        ASSERT(name.length() == 13);
>+                        return &BuiltInFunction::kFunction_EndPrimitive_;
>+                    }
>+                    break;
>+                }
>+                case 0x7e400f84u:
>+                {
>+                    if (name == BuiltInName::gl_Layer)
>+                    {
>+                        return &BuiltInVariable::kVar_gl_LayerGS;
>+                    }
>+                    break;
>+                }
>+                case 0x7e580bc5u:
>+                {
>+                    if (name == BuiltInName::gl_Position)
>+                    {
>+                        return mVar_gl_PositionGS;
>+                    }
>+                    break;
>+                }
>+                case 0x7e67167au:
>+                {
>+                    if (name == BuiltInName::gl_PerVertex)
>+                    {
>+                        return mVar_gl_PerVertex;
>+                    }
>+                    break;
>+                }
>+                case 0x7e742076u:
>+                {
>+                    if (name == BuiltInName::gl_PrimitiveID)
>+                    {
>+                        return &BuiltInVariable::kVar_gl_PrimitiveIDGS;
>+                    }
>+                    break;
>+                }
>+                case 0x7e7fe684u:
>+                {
>+                    if (name == BuiltInName::gl_InvocationID)
>+                    {
>+                        return &BuiltInVariable::kVar_gl_InvocationID;
>+                    }
>+                    break;
>+                }
>+                case 0x7e865240u:
>+                {
>+                    if (name == BuiltInName::gl_PrimitiveIDIn)
>+                    {
>+                        return &BuiltInVariable::kVar_gl_PrimitiveIDIn;
>+                    }
>+                    break;
>+                }
>+            }
>+        }
>+        if ((mShaderType == GL_FRAGMENT_SHADER) && (mResources.EXT_geometry_shader))
>+        {
>+            switch (nameHash)
>+            {
>+                case 0x7e400f84u:
>+                {
>+                    if (name == BuiltInName::gl_Layer)
>+                    {
>+                        return &BuiltInVariable::kVar_gl_Layer;
>+                    }
>+                    break;
>+                }
>+                case 0x7e742076u:
>+                {
>+                    if (name == BuiltInName::gl_PrimitiveID)
>+                    {
>+                        return &BuiltInVariable::kVar_gl_PrimitiveID;
>+                    }
>+                    break;
>+                }
>+            }
>+        }
>+    }
>+    if (shaderVersion >= 300)
>+    {
>+        switch (nameHash)
>+        {
>+            case 0x06309dbcu:
>+            {
>+                if (name.beginsWith(BuiltInName::abs))
>+                {
>+                    ASSERT(name.length() == 6);
>+                    return &BuiltInFunction::kFunction_abs_0C;
>+                }
>+                break;
>+            }
>+            case 0x0631d85fu:
>+            {
>+                if (name.beginsWith(BuiltInName::abs))
>+                {
>+                    ASSERT(name.length() == 6);
>+                    return &BuiltInFunction::kFunction_abs_3C;
>+                }
>+                break;
>+            }
>+            case 0x06370c70u:
>+            {
>+                if (name.beginsWith(BuiltInName::abs))
>+                {
>+                    ASSERT(name.length() == 6);
>+                    return &BuiltInFunction::kFunction_abs_2C;
>+                }
>+                break;
>+            }
>+            case 0x06378eb0u:
>+            {
>+                if (name.beginsWith(BuiltInName::abs))
>+                {
>+                    ASSERT(name.length() == 6);
>+                    return &BuiltInFunction::kFunction_abs_1C;
>+                }
>+                break;
>+            }
>+            case 0x06408ba2u:
>+            {
>+                if (name.beginsWith(BuiltInName::min))
>+                {
>+                    ASSERT(name.length() == 8);
>+                    return &BuiltInFunction::kFunction_min_2D0D;
>+                }
>+                break;
>+            }
>+            case 0x0640f128u:
>+            {
>+                if (name.beginsWith(BuiltInName::max))
>+                {
>+                    ASSERT(name.length() == 8);
>+                    return &BuiltInFunction::kFunction_max_1C0C;
>+                }
>+                break;
>+            }
>+            case 0x06420bb0u:
>+            {
>+                if (name.beginsWith(BuiltInName::min))
>+                {
>+                    ASSERT(name.length() == 8);
>+                    return &BuiltInFunction::kFunction_min_0D0D;
>+                }
>+                break;
>+            }
>+            case 0x064236d1u:
>+            {
>+                if (name.beginsWith(BuiltInName::min))
>+                {
>+                    ASSERT(name.length() == 8);
>+                    return &BuiltInFunction::kFunction_min_2D2D;
>+                }
>+                break;
>+            }
>+            case 0x06425522u:
>+            {
>+                if (name.beginsWith(BuiltInName::min))
>+                {
>+                    ASSERT(name.length() == 8);
>+                    return &BuiltInFunction::kFunction_min_3C0C;
>+                }
>+                break;
>+            }
>+            case 0x06425db3u:
>+            {
>+                if (name.beginsWith(BuiltInName::min))
>+                {
>+                    ASSERT(name.length() == 8);
>+                    return &BuiltInFunction::kFunction_min_2C0C;
>+                }
>+                break;
>+            }
>+            case 0x06429550u:
>+            {
>+                if (name.beginsWith(BuiltInName::max))
>+                {
>+                    ASSERT(name.length() == 8);
>+                    return &BuiltInFunction::kFunction_max_2D2D;
>+                }
>+                break;
>+            }
>+            case 0x06429e9cu:
>+            {
>+                if (name.beginsWith(BuiltInName::max))
>+                {
>+                    ASSERT(name.length() == 8);
>+                    return &BuiltInFunction::kFunction_max_2C0C;
>+                }
>+                break;
>+            }
>+            case 0x0642c869u:
>+            {
>+                if (name.beginsWith(BuiltInName::max))
>+                {
>+                    ASSERT(name.length() == 8);
>+                    return &BuiltInFunction::kFunction_max_3D3D;
>+                }
>+                break;
>+            }
>+            case 0x0642dbfeu:
>+            {
>+                if (name.beginsWith(BuiltInName::min))
>+                {
>+                    ASSERT(name.length() == 8);
>+                    return &BuiltInFunction::kFunction_min_3C3C;
>+                }
>+                break;
>+            }
>+            case 0x064305b5u:
>+            {
>+                if (name.beginsWith(BuiltInName::min))
>+                {
>+                    ASSERT(name.length() == 8);
>+                    return &BuiltInFunction::kFunction_min_3D3D;
>+                }
>+                break;
>+            }
>+            case 0x06436c9au:
>+            {
>+                if (name.beginsWith(BuiltInName::min))
>+                {
>+                    ASSERT(name.length() == 8);
>+                    return &BuiltInFunction::kFunction_min_1D0D;
>+                }
>+                break;
>+            }
>+            case 0x0643ebd5u:
>+            {
>+                if (name.beginsWith(BuiltInName::min))
>+                {
>+                    ASSERT(name.length() == 8);
>+                    return &BuiltInFunction::kFunction_min_3D0D;
>+                }
>+                break;
>+            }
>+            case 0x06441467u:
>+            {
>+                if (name.beginsWith(BuiltInName::min))
>+                {
>+                    ASSERT(name.length() == 8);
>+                    return &BuiltInFunction::kFunction_min_2C2C;
>+                }
>+                break;
>+            }
>+            case 0x0644176eu:
>+            {
>+                if (name.beginsWith(BuiltInName::min))
>+                {
>+                    ASSERT(name.length() == 8);
>+                    return &BuiltInFunction::kFunction_min_1C1C;
>+                }
>+                break;
>+            }
>+            case 0x06443b94u:
>+            {
>+                if (name.beginsWith(BuiltInName::max))
>+                {
>+                    ASSERT(name.length() == 8);
>+                    return &BuiltInFunction::kFunction_max_2D0D;
>+                }
>+                break;
>+            }
>+            case 0x06448798u:
>+            {
>+                if (name.beginsWith(BuiltInName::max))
>+                {
>+                    ASSERT(name.length() == 8);
>+                    return &BuiltInFunction::kFunction_max_3C3C;
>+                }
>+                break;
>+            }
>+            case 0x0644a6dfu:
>+            {
>+                if (name.beginsWith(BuiltInName::min))
>+                {
>+                    ASSERT(name.length() == 8);
>+                    return &BuiltInFunction::kFunction_min_1D1D;
>+                }
>+                break;
>+            }
>+            case 0x0644cd73u:
>+            {
>+                if (name.beginsWith(BuiltInName::max))
>+                {
>+                    ASSERT(name.length() == 8);
>+                    return &BuiltInFunction::kFunction_max_2C2C;
>+                }
>+                break;
>+            }
>+            case 0x06450593u:
>+            {
>+                if (name.beginsWith(BuiltInName::min))
>+                {
>+                    ASSERT(name.length() == 8);
>+                    return &BuiltInFunction::kFunction_min_1C0C;
>+                }
>+                break;
>+            }
>+            case 0x06452105u:
>+            {
>+                if (name.beginsWith(BuiltInName::max))
>+                {
>+                    ASSERT(name.length() == 8);
>+                    return &BuiltInFunction::kFunction_max_1D0D;
>+                }
>+                break;
>+            }
>+            case 0x06454045u:
>+            {
>+                if (name.beginsWith(BuiltInName::max))
>+                {
>+                    ASSERT(name.length() == 8);
>+                    return &BuiltInFunction::kFunction_max_0C0C;
>+                }
>+                break;
>+            }
>+            case 0x0645e25du:
>+            {
>+                if (name.beginsWith(BuiltInName::min))
>+                {
>+                    ASSERT(name.length() == 8);
>+                    return &BuiltInFunction::kFunction_min_0C0C;
>+                }
>+                break;
>+            }
>+            case 0x06460349u:
>+            {
>+                if (name.beginsWith(BuiltInName::max))
>+                {
>+                    ASSERT(name.length() == 8);
>+                    return &BuiltInFunction::kFunction_max_1D1D;
>+                }
>+                break;
>+            }
>+            case 0x06472b16u:
>+            {
>+                if (name.beginsWith(BuiltInName::max))
>+                {
>+                    ASSERT(name.length() == 8);
>+                    return &BuiltInFunction::kFunction_max_3D0D;
>+                }
>+                break;
>+            }
>+            case 0x06473146u:
>+            {
>+                if (name.beginsWith(BuiltInName::max))
>+                {
>+                    ASSERT(name.length() == 8);
>+                    return &BuiltInFunction::kFunction_max_0D0D;
>+                }
>+                break;
>+            }
>+            case 0x06475b89u:
>+            {
>+                if (name.beginsWith(BuiltInName::max))
>+                {
>+                    ASSERT(name.length() == 8);
>+                    return &BuiltInFunction::kFunction_max_3C0C;
>+                }
>+                break;
>+            }
>+            case 0x0647bc75u:
>+            {
>+                if (name.beginsWith(BuiltInName::max))
>+                {
>+                    ASSERT(name.length() == 8);
>+                    return &BuiltInFunction::kFunction_max_1C1C;
>+                }
>+                break;
>+            }
>+            case 0x0654b2f8u:
>+            {
>+                if (name.beginsWith(BuiltInName::mix))
>+                {
>+                    ASSERT(name.length() == 10);
>+                    return &BuiltInFunction::kFunction_mix_2B2B2E;
>+                }
>+                break;
>+            }
>+            case 0x0655a7e2u:
>+            {
>+                if (name == BuiltInName::mix_0B0B0E)
>+                {
>+                    return &BuiltInFunction::kFunction_mix_0B0B0E;
>+                }
>+                break;
>+            }
>+            case 0x06567d08u:
>+            {
>+                if (name.beginsWith(BuiltInName::mix))
>+                {
>+                    ASSERT(name.length() == 10);
>+                    return &BuiltInFunction::kFunction_mix_3B3B3E;
>+                }
>+                break;
>+            }
>+            case 0x0657f3adu:
>+            {
>+                if (name == BuiltInName::mix_1B1B1E)
>+                {
>+                    return &BuiltInFunction::kFunction_mix_1B1B1E;
>+                }
>+                break;
>+            }
>+            case 0x0838025eu:
>+            {
>+                if (name.beginsWith(BuiltInName::tanh))
>+                {
>+                    ASSERT(name.length() == 7);
>+                    return &BuiltInFunction::kFunction_tanh_3B;
>+                }
>+                break;
>+            }
>+            case 0x0838944cu:
>+            {
>+                if (name.beginsWith(BuiltInName::tanh))
>+                {
>+                    ASSERT(name.length() == 7);
>+                    return &BuiltInFunction::kFunction_tanh_0B;
>+                }
>+                break;
>+            }
>+            case 0x08392747u:
>+            {
>+                if (name.beginsWith(BuiltInName::sinh))
>+                {
>+                    ASSERT(name.length() == 7);
>+                    return &BuiltInFunction::kFunction_sinh_2B;
>+                }
>+                break;
>+            }
>+            case 0x08398f4au:
>+            {
>+                if (name.beginsWith(BuiltInName::sinh))
>+                {
>+                    ASSERT(name.length() == 7);
>+                    return &BuiltInFunction::kFunction_sinh_1B;
>+                }
>+                break;
>+            }
>+            case 0x083991ddu:
>+            {
>+                if (name.beginsWith(BuiltInName::tanh))
>+                {
>+                    ASSERT(name.length() == 7);
>+                    return &BuiltInFunction::kFunction_tanh_1B;
>+                }
>+                break;
>+            }
>+            case 0x083aa373u:
>+            {
>+                if (name.beginsWith(BuiltInName::sinh))
>+                {
>+                    ASSERT(name.length() == 7);
>+                    return &BuiltInFunction::kFunction_sinh_0B;
>+                }
>+                break;
>+            }
>+            case 0x083acb5eu:
>+            {
>+                if (name.beginsWith(BuiltInName::tanh))
>+                {
>+                    ASSERT(name.length() == 7);
>+                    return &BuiltInFunction::kFunction_tanh_2B;
>+                }
>+                break;
>+            }
>+            case 0x083acbf5u:
>+            {
>+                if (name.beginsWith(BuiltInName::sign))
>+                {
>+                    ASSERT(name.length() == 7);
>+                    return &BuiltInFunction::kFunction_sign_1C;
>+                }
>+                break;
>+            }
>+            case 0x083b5c45u:
>+            {
>+                if (name.beginsWith(BuiltInName::cosh))
>+                {
>+                    ASSERT(name.length() == 7);
>+                    return &BuiltInFunction::kFunction_cosh_0B;
>+                }
>+                break;
>+            }
>+            case 0x083bd9f8u:
>+            {
>+                if (name.beginsWith(BuiltInName::sinh))
>+                {
>+                    ASSERT(name.length() == 7);
>+                    return &BuiltInFunction::kFunction_sinh_3B;
>+                }
>+                break;
>+            }
>+            case 0x083c1656u:
>+            {
>+                if (name.beginsWith(BuiltInName::sign))
>+                {
>+                    ASSERT(name.length() == 7);
>+                    return &BuiltInFunction::kFunction_sign_2C;
>+                }
>+                break;
>+            }
>+            case 0x083c57c4u:
>+            {
>+                if (name.beginsWith(BuiltInName::cosh))
>+                {
>+                    ASSERT(name.length() == 7);
>+                    return &BuiltInFunction::kFunction_cosh_1B;
>+                }
>+                break;
>+            }
>+            case 0x083d503bu:
>+            {
>+                if (name.beginsWith(BuiltInName::sign))
>+                {
>+                    ASSERT(name.length() == 7);
>+                    return &BuiltInFunction::kFunction_sign_3C;
>+                }
>+                break;
>+            }
>+            case 0x083d8227u:
>+            {
>+                if (name.beginsWith(BuiltInName::cosh))
>+                {
>+                    ASSERT(name.length() == 7);
>+                    return &BuiltInFunction::kFunction_cosh_2B;
>+                }
>+                break;
>+            }
>+            case 0x083dd369u:
>+            {
>+                if (name.beginsWith(BuiltInName::sign))
>+                {
>+                    ASSERT(name.length() == 7);
>+                    return &BuiltInFunction::kFunction_sign_0C;
>+                }
>+                break;
>+            }
>+            case 0x083ed2deu:
>+            {
>+                if (name.beginsWith(BuiltInName::cosh))
>+                {
>+                    ASSERT(name.length() == 7);
>+                    return &BuiltInFunction::kFunction_cosh_3B;
>+                }
>+                break;
>+            }
>+            case 0x084807e9u:
>+            {
>+                if (name.beginsWith(BuiltInName::modf))
>+                {
>+                    ASSERT(name.length() == 9);
>+                    return &BuiltInFunction::kFunction_modf_3B3B;
>+                }
>+                break;
>+            }
>+            case 0x084a908au:
>+            {
>+                if (name.beginsWith(BuiltInName::modf))
>+                {
>+                    ASSERT(name.length() == 9);
>+                    return &BuiltInFunction::kFunction_modf_1B1B;
>+                }
>+                break;
>+            }
>+            case 0x084bf445u:
>+            {
>+                if (name.beginsWith(BuiltInName::modf))
>+                {
>+                    ASSERT(name.length() == 9);
>+                    return &BuiltInFunction::kFunction_modf_0B0B;
>+                }
>+                break;
>+            }
>+            case 0x084fa835u:
>+            {
>+                if (name.beginsWith(BuiltInName::modf))
>+                {
>+                    ASSERT(name.length() == 9);
>+                    return &BuiltInFunction::kFunction_modf_2B2B;
>+                }
>+                break;
>+            }
>+            case 0x0a400148u:
>+            {
>+                if (name.beginsWith(BuiltInName::asinh))
>+                {
>+                    ASSERT(name.length() == 8);
>+                    return &BuiltInFunction::kFunction_asinh_2B;
>+                }
>+                break;
>+            }
>+            case 0x0a406460u:
>+            {
>+                if (name.beginsWith(BuiltInName::isnan))
>+                {
>+                    ASSERT(name.length() == 8);
>+                    return &BuiltInFunction::kFunction_isnan_2B;
>+                }
>+                break;
>+            }
>+            case 0x0a407c52u:
>+            {
>+                if (name.beginsWith(BuiltInName::round))
>+                {
>+                    ASSERT(name.length() == 8);
>+                    return &BuiltInFunction::kFunction_round_0B;
>+                }
>+                break;
>+            }
>+            case 0x0a412446u:
>+            {
>+                if (name.beginsWith(BuiltInName::trunc))
>+                {
>+                    ASSERT(name.length() == 8);
>+                    return &BuiltInFunction::kFunction_trunc_0B;
>+                }
>+                break;
>+            }
>+            case 0x0a4125d1u:
>+            {
>+                if (name.beginsWith(BuiltInName::asinh))
>+                {
>+                    ASSERT(name.length() == 8);
>+                    return &BuiltInFunction::kFunction_asinh_3B;
>+                }
>+                break;
>+            }
>+            case 0x0a4189d9u:
>+            {
>+                if (name.beginsWith(BuiltInName::round))
>+                {
>+                    ASSERT(name.length() == 8);
>+                    return &BuiltInFunction::kFunction_round_3B;
>+                }
>+                break;
>+            }
>+            case 0x0a41bc4bu:
>+            {
>+                if (name.beginsWith(BuiltInName::trunc))
>+                {
>+                    ASSERT(name.length() == 8);
>+                    return &BuiltInFunction::kFunction_trunc_3B;
>+                }
>+                break;
>+            }
>+            case 0x0a4262ceu:
>+            {
>+                if (name.beginsWith(BuiltInName::isinf))
>+                {
>+                    ASSERT(name.length() == 8);
>+                    return &BuiltInFunction::kFunction_isinf_2B;
>+                }
>+                break;
>+            }
>+            case 0x0a42b872u:
>+            {
>+                if (name.beginsWith(BuiltInName::trunc))
>+                {
>+                    ASSERT(name.length() == 8);
>+                    return &BuiltInFunction::kFunction_trunc_2B;
>+                }
>+                break;
>+            }
>+            case 0x0a430643u:
>+            {
>+                if (name.beginsWith(BuiltInName::atanh))
>+                {
>+                    ASSERT(name.length() == 8);
>+                    return &BuiltInFunction::kFunction_atanh_2B;
>+                }
>+                break;
>+            }
>+            case 0x0a43b397u:
>+            {
>+                if (name.beginsWith(BuiltInName::isinf))
>+                {
>+                    ASSERT(name.length() == 8);
>+                    return &BuiltInFunction::kFunction_isinf_3B;
>+                }
>+                break;
>+            }
>+            case 0x0a43edf9u:
>+            {
>+                if (name.beginsWith(BuiltInName::trunc))
>+                {
>+                    ASSERT(name.length() == 8);
>+                    return &BuiltInFunction::kFunction_trunc_1B;
>+                }
>+                break;
>+            }
>+            case 0x0a4431a8u:
>+            {
>+                if (name.beginsWith(BuiltInName::atanh))
>+                {
>+                    ASSERT(name.length() == 8);
>+                    return &BuiltInFunction::kFunction_atanh_1B;
>+                }
>+                break;
>+            }
>+            case 0x0a443a26u:
>+            {
>+                if (name.beginsWith(BuiltInName::isinf))
>+                {
>+                    ASSERT(name.length() == 8);
>+                    return &BuiltInFunction::kFunction_isinf_0B;
>+                }
>+                break;
>+            }
>+            case 0x0a44ad91u:
>+            {
>+                if (name.beginsWith(BuiltInName::acosh))
>+                {
>+                    ASSERT(name.length() == 8);
>+                    return &BuiltInFunction::kFunction_acosh_1B;
>+                }
>+                break;
>+            }
>+            case 0x0a452617u:
>+            {
>+                if (name.beginsWith(BuiltInName::isinf))
>+                {
>+                    ASSERT(name.length() == 8);
>+                    return &BuiltInFunction::kFunction_isinf_1B;
>+                }
>+                break;
>+            }
>+            case 0x0a4561b0u:
>+            {
>+                if (name.beginsWith(BuiltInName::isnan))
>+                {
>+                    ASSERT(name.length() == 8);
>+                    return &BuiltInFunction::kFunction_isnan_3B;
>+                }
>+                break;
>+            }
>+            case 0x0a4582c9u:
>+            {
>+                if (name.beginsWith(BuiltInName::atanh))
>+                {
>+                    ASSERT(name.length() == 8);
>+                    return &BuiltInFunction::kFunction_atanh_0B;
>+                }
>+                break;
>+            }
>+            case 0x0a45fcfdu:
>+            {
>+                if (name.beginsWith(BuiltInName::atanh))
>+                {
>+                    ASSERT(name.length() == 8);
>+                    return &BuiltInFunction::kFunction_atanh_3B;
>+                }
>+                break;
>+            }
>+            case 0x0a461d10u:
>+            {
>+                if (name.beginsWith(BuiltInName::acosh))
>+                {
>+                    ASSERT(name.length() == 8);
>+                    return &BuiltInFunction::kFunction_acosh_0B;
>+                }
>+                break;
>+            }
>+            case 0x0a464ad3u:
>+            {
>+                if (name.beginsWith(BuiltInName::asinh))
>+                {
>+                    ASSERT(name.length() == 8);
>+                    return &BuiltInFunction::kFunction_asinh_0B;
>+                }
>+                break;
>+            }
>+            case 0x0a46778au:
>+            {
>+                if (name.beginsWith(BuiltInName::acosh))
>+                {
>+                    ASSERT(name.length() == 8);
>+                    return &BuiltInFunction::kFunction_acosh_3B;
>+                }
>+                break;
>+            }
>+            case 0x0a46ab3bu:
>+            {
>+                if (name.beginsWith(BuiltInName::isnan))
>+                {
>+                    ASSERT(name.length() == 8);
>+                    return &BuiltInFunction::kFunction_isnan_0B;
>+                }
>+                break;
>+            }
>+            case 0x0a46f2d2u:
>+            {
>+                if (name.beginsWith(BuiltInName::round))
>+                {
>+                    ASSERT(name.length() == 8);
>+                    return &BuiltInFunction::kFunction_round_2B;
>+                }
>+                break;
>+            }
>+            case 0x0a4758c8u:
>+            {
>+                if (name.beginsWith(BuiltInName::round))
>+                {
>+                    ASSERT(name.length() == 8);
>+                    return &BuiltInFunction::kFunction_round_1B;
>+                }
>+                break;
>+            }
>+            case 0x0a478c93u:
>+            {
>+                if (name.beginsWith(BuiltInName::acosh))
>+                {
>+                    ASSERT(name.length() == 8);
>+                    return &BuiltInFunction::kFunction_acosh_2B;
>+                }
>+                break;
>+            }
>+            case 0x0a47bb52u:
>+            {
>+                if (name.beginsWith(BuiltInName::asinh))
>+                {
>+                    ASSERT(name.length() == 8);
>+                    return &BuiltInFunction::kFunction_asinh_1B;
>+                }
>+                break;
>+            }
>+            case 0x0a47fa7au:
>+            {
>+                if (name.beginsWith(BuiltInName::isnan))
>+                {
>+                    ASSERT(name.length() == 8);
>+                    return &BuiltInFunction::kFunction_isnan_1B;
>+                }
>+                break;
>+            }
>+            case 0x0a524bc4u:
>+            {
>+                if (name.beginsWith(BuiltInName::equal))
>+                {
>+                    ASSERT(name.length() == 10);
>+                    return &BuiltInFunction::kFunction_equal_2D2D;
>+                }
>+                break;
>+            }
>+            case 0x0a5613e7u:
>+            {
>+                if (name.beginsWith(BuiltInName::equal))
>+                {
>+                    ASSERT(name.length() == 10);
>+                    return &BuiltInFunction::kFunction_equal_1D1D;
>+                }
>+                break;
>+            }
>+            case 0x0a56ba24u:
>+            {
>+                if (name.beginsWith(BuiltInName::equal))
>+                {
>+                    ASSERT(name.length() == 10);
>+                    return &BuiltInFunction::kFunction_equal_3D3D;
>+                }
>+                break;
>+            }
>+            case 0x0a601dd8u:
>+            {
>+                if (name == BuiltInName::clamp_2C2C2C)
>+                {
>+                    return &BuiltInFunction::kFunction_clamp_2C2C2C;
>+                }
>+                break;
>+            }
>+            case 0x0a60570du:
>+            {
>+                if (name.beginsWith(BuiltInName::clamp))
>+                {
>+                    ASSERT(name.length() == 12);
>+                    return &BuiltInFunction::kFunction_clamp_1D0D0D;
>+                }
>+                break;
>+            }
>+            case 0x0a60d0c5u:
>+            {
>+                if (name == BuiltInName::clamp_1C0C0C)
>+                {
>+                    return &BuiltInFunction::kFunction_clamp_1C0C0C;
>+                }
>+                break;
>+            }
>+            case 0x0a621a2bu:
>+            {
>+                if (name.beginsWith(BuiltInName::clamp))
>+                {
>+                    ASSERT(name.length() == 12);
>+                    return &BuiltInFunction::kFunction_clamp_0C0C0C;
>+                }
>+                break;
>+            }
>+            case 0x0a623042u:
>+            {
>+                if (name.beginsWith(BuiltInName::clamp))
>+                {
>+                    ASSERT(name.length() == 12);
>+                    return &BuiltInFunction::kFunction_clamp_2D0D0D;
>+                }
>+                break;
>+            }
>+            case 0x0a624f01u:
>+            {
>+                if (name == BuiltInName::clamp_3C0C0C)
>+                {
>+                    return &BuiltInFunction::kFunction_clamp_3C0C0C;
>+                }
>+                break;
>+            }
>+            case 0x0a62ab50u:
>+            {
>+                if (name == BuiltInName::clamp_1C1C1C)
>+                {
>+                    return &BuiltInFunction::kFunction_clamp_1C1C1C;
>+                }
>+                break;
>+            }
>+            case 0x0a631d0bu:
>+            {
>+                if (name == BuiltInName::clamp_1D1D1D)
>+                {
>+                    return &BuiltInFunction::kFunction_clamp_1D1D1D;
>+                }
>+                break;
>+            }
>+            case 0x0a64f567u:
>+            {
>+                if (name.beginsWith(BuiltInName::clamp))
>+                {
>+                    ASSERT(name.length() == 12);
>+                    return &BuiltInFunction::kFunction_clamp_2D2D2D;
>+                }
>+                break;
>+            }
>+            case 0x0a656274u:
>+            {
>+                if (name.beginsWith(BuiltInName::clamp))
>+                {
>+                    ASSERT(name.length() == 12);
>+                    return &BuiltInFunction::kFunction_clamp_3C3C3C;
>+                }
>+                break;
>+            }
>+            case 0x0a65a625u:
>+            {
>+                if (name == BuiltInName::clamp_3D0D0D)
>+                {
>+                    return &BuiltInFunction::kFunction_clamp_3D0D0D;
>+                }
>+                break;
>+            }
>+            case 0x0a660047u:
>+            {
>+                if (name.beginsWith(BuiltInName::clamp))
>+                {
>+                    ASSERT(name.length() == 12);
>+                    return &BuiltInFunction::kFunction_clamp_2C0C0C;
>+                }
>+                break;
>+            }
>+            case 0x0a660f60u:
>+            {
>+                if (name == BuiltInName::clamp_0D0D0D)
>+                {
>+                    return &BuiltInFunction::kFunction_clamp_0D0D0D;
>+                }
>+                break;
>+            }
>+            case 0x0a674065u:
>+            {
>+                if (name.beginsWith(BuiltInName::clamp))
>+                {
>+                    ASSERT(name.length() == 12);
>+                    return &BuiltInFunction::kFunction_clamp_3D3D3D;
>+                }
>+                break;
>+            }
>+            case 0x0e503084u:
>+            {
>+                if (name.beginsWith(BuiltInName::inverse))
>+                {
>+                    ASSERT(name.length() == 10);
>+                    return &BuiltInFunction::kFunction_inverse_5B;
>+                }
>+                break;
>+            }
>+            case 0x0e507cbdu:
>+            {
>+                if (name.beginsWith(BuiltInName::inverse))
>+                {
>+                    ASSERT(name.length() == 10);
>+                    return &BuiltInFunction::kFunction_inverse_AB;
>+                }
>+                break;
>+            }
>+            case 0x0e50cc43u:
>+            {
>+                if (name.beginsWith(BuiltInName::inverse))
>+                {
>+                    ASSERT(name.length() == 10);
>+                    return &BuiltInFunction::kFunction_inverse_FB;
>+                }
>+                break;
>+            }
>+            case 0x0e600d82u:
>+            {
>+                if (name.beginsWith(BuiltInName::texture))
>+                {
>+                    ASSERT(name.length() == 12);
>+                    return &BuiltInFunction::kFunction_texture_0c2B;
>+                }
>+                break;
>+            }
>+            case 0x0e60445cu:
>+            {
>+                if (name.beginsWith(BuiltInName::texture))
>+                {
>+                    ASSERT(name.length() == 12);
>+                    return &BuiltInFunction::kFunction_texture_0S2B;
>+                }
>+                break;
>+            }
>+            case 0x0e6044aeu:
>+            {
>+                if (name.beginsWith(BuiltInName::texture))
>+                {
>+                    ASSERT(name.length() == 12);
>+                    return &BuiltInFunction::kFunction_texture_0e3B;
>+                }
>+                break;
>+            }
>+            case 0x0e60bb56u:
>+            {
>+                if (name.beginsWith(BuiltInName::texture))
>+                {
>+                    ASSERT(name.length() == 12);
>+                    return &BuiltInFunction::kFunction_texture_0Q1B;
>+                }
>+                break;
>+            }
>+            case 0x0e61222eu:
>+            {
>+                if (name.beginsWith(BuiltInName::texture))
>+                {
>+                    ASSERT(name.length() == 12);
>+                    return &BuiltInFunction::kFunction_texture_0K2B;
>+                }
>+                break;
>+            }
>+            case 0x0e61e49du:
>+            {
>+                if (name.beginsWith(BuiltInName::texture))
>+                {
>+                    ASSERT(name.length() == 12);
>+                    return &BuiltInFunction::kFunction_texture_0Z2B;
>+                }
>+                break;
>+            }
>+            case 0x0e625169u:
>+            {
>+                if (name.beginsWith(BuiltInName::texture))
>+                {
>+                    ASSERT(name.length() == 12);
>+                    return &BuiltInFunction::kFunction_texture_0I2B;
>+                }
>+                break;
>+            }
>+            case 0x0e62790eu:
>+            {
>+                if (name.beginsWith(BuiltInName::texture))
>+                {
>+                    ASSERT(name.length() == 12);
>+                    return &BuiltInFunction::kFunction_texture_0T2B;
>+                }
>+                break;
>+            }
>+            case 0x0e63b9efu:
>+            {
>+                if (name.beginsWith(BuiltInName::texture))
>+                {
>+                    ASSERT(name.length() == 12);
>+                    return &BuiltInFunction::kFunction_texture_0M1B;
>+                }
>+                break;
>+            }
>+            case 0x0e6470f1u:
>+            {
>+                if (name.beginsWith(BuiltInName::texture))
>+                {
>+                    ASSERT(name.length() == 12);
>+                    return &BuiltInFunction::kFunction_texture_0J2B;
>+                }
>+                break;
>+            }
>+            case 0x0e64854cu:
>+            {
>+                if (name.beginsWith(BuiltInName::texture))
>+                {
>+                    ASSERT(name.length() == 12);
>+                    return &BuiltInFunction::kFunction_texture_0X2B;
>+                }
>+                break;
>+            }
>+            case 0x0e64ec86u:
>+            {
>+                if (name.beginsWith(BuiltInName::texture))
>+                {
>+                    ASSERT(name.length() == 12);
>+                    return &BuiltInFunction::kFunction_texture_0W1B;
>+                }
>+                break;
>+            }
>+            case 0x0e65ea73u:
>+            {
>+                if (name.beginsWith(BuiltInName::texture))
>+                {
>+                    ASSERT(name.length() == 12);
>+                    return &BuiltInFunction::kFunction_texture_0H1B;
>+                }
>+                break;
>+            }
>+            case 0x0e661665u:
>+            {
>+                if (name.beginsWith(BuiltInName::texture))
>+                {
>+                    ASSERT(name.length() == 12);
>+                    return &BuiltInFunction::kFunction_texture_0L1B;
>+                }
>+                break;
>+            }
>+            case 0x0e663be3u:
>+            {
>+                if (name.beginsWith(BuiltInName::texture))
>+                {
>+                    ASSERT(name.length() == 12);
>+                    return &BuiltInFunction::kFunction_texture_0N1B;
>+                }
>+                break;
>+            }
>+            case 0x0e67665bu:
>+            {
>+                if (name.beginsWith(BuiltInName::texture))
>+                {
>+                    ASSERT(name.length() == 12);
>+                    return &BuiltInFunction::kFunction_texture_0d3B;
>+                }
>+                break;
>+            }
>+            case 0x0e67a979u:
>+            {
>+                if (name.beginsWith(BuiltInName::texture))
>+                {
>+                    ASSERT(name.length() == 12);
>+                    return &BuiltInFunction::kFunction_texture_0R2B;
>+                }
>+                break;
>+            }
>+            case 0x0e67dce5u:
>+            {
>+                if (name.beginsWith(BuiltInName::texture))
>+                {
>+                    ASSERT(name.length() == 12);
>+                    return &BuiltInFunction::kFunction_texture_0Y2B;
>+                }
>+                break;
>+            }
>+            case 0x106843efu:
>+            {
>+                if (name.beginsWith(BuiltInName::lessThan))
>+                {
>+                    ASSERT(name.length() == 13);
>+                    return &BuiltInFunction::kFunction_lessThan_3D3D;
>+                }
>+                break;
>+            }
>+            case 0x10697de8u:
>+            {
>+                if (name.beginsWith(BuiltInName::lessThan))
>+                {
>+                    ASSERT(name.length() == 13);
>+                    return &BuiltInFunction::kFunction_lessThan_2D2D;
>+                }
>+                break;
>+            }
>+            case 0x106ad530u:
>+            {
>+                if (name.beginsWith(BuiltInName::notEqual))
>+                {
>+                    ASSERT(name.length() == 13);
>+                    return &BuiltInFunction::kFunction_notEqual_1D1D;
>+                }
>+                break;
>+            }
>+            case 0x106d7bd6u:
>+            {
>+                if (name.beginsWith(BuiltInName::lessThan))
>+                {
>+                    ASSERT(name.length() == 13);
>+                    return &BuiltInFunction::kFunction_lessThan_1D1D;
>+                }
>+                break;
>+            }
>+            case 0x106e2903u:
>+            {
>+                if (name.beginsWith(BuiltInName::notEqual))
>+                {
>+                    ASSERT(name.length() == 13);
>+                    return &BuiltInFunction::kFunction_notEqual_3D3D;
>+                }
>+                break;
>+            }
>+            case 0x106e7a45u:
>+            {
>+                if (name.beginsWith(BuiltInName::notEqual))
>+                {
>+                    ASSERT(name.length() == 13);
>+                    return &BuiltInFunction::kFunction_notEqual_2D2D;
>+                }
>+                break;
>+            }
>+            case 0x12601c9du:
>+            {
>+                if (name.beginsWith(BuiltInName::roundEven))
>+                {
>+                    ASSERT(name.length() == 12);
>+                    return &BuiltInFunction::kFunction_roundEven_3B;
>+                }
>+                break;
>+            }
>+            case 0x12602fd7u:
>+            {
>+                if (name.beginsWith(BuiltInName::transpose))
>+                {
>+                    ASSERT(name.length() == 12);
>+                    return &BuiltInFunction::kFunction_transpose_AB;
>+                }
>+                break;
>+            }
>+            case 0x12614fd4u:
>+            {
>+                if (name.beginsWith(BuiltInName::roundEven))
>+                {
>+                    ASSERT(name.length() == 12);
>+                    return &BuiltInFunction::kFunction_roundEven_2B;
>+                }
>+                break;
>+            }
>+            case 0x1264f5e4u:
>+            {
>+                if (name.beginsWith(BuiltInName::transpose))
>+                {
>+                    ASSERT(name.length() == 12);
>+                    return &BuiltInFunction::kFunction_transpose_EB;
>+                }
>+                break;
>+            }
>+            case 0x12650771u:
>+            {
>+                if (name.beginsWith(BuiltInName::transpose))
>+                {
>+                    ASSERT(name.length() == 12);
>+                    return &BuiltInFunction::kFunction_transpose_6B;
>+                }
>+                break;
>+            }
>+            case 0x12655b22u:
>+            {
>+                if (name.beginsWith(BuiltInName::transpose))
>+                {
>+                    ASSERT(name.length() == 12);
>+                    return &BuiltInFunction::kFunction_transpose_BB;
>+                }
>+                break;
>+            }
>+            case 0x12658f24u:
>+            {
>+                if (name.beginsWith(BuiltInName::transpose))
>+                {
>+                    ASSERT(name.length() == 12);
>+                    return &BuiltInFunction::kFunction_transpose_9B;
>+                }
>+                break;
>+            }
>+            case 0x1265cf4cu:
>+            {
>+                if (name.beginsWith(BuiltInName::roundEven))
>+                {
>+                    ASSERT(name.length() == 12);
>+                    return &BuiltInFunction::kFunction_roundEven_1B;
>+                }
>+                break;
>+            }
>+            case 0x12661b07u:
>+            {
>+                if (name.beginsWith(BuiltInName::transpose))
>+                {
>+                    ASSERT(name.length() == 12);
>+                    return &BuiltInFunction::kFunction_transpose_FB;
>+                }
>+                break;
>+            }
>+            case 0x12665430u:
>+            {
>+                if (name.beginsWith(BuiltInName::transpose))
>+                {
>+                    ASSERT(name.length() == 12);
>+                    return &BuiltInFunction::kFunction_transpose_7B;
>+                }
>+                break;
>+            }
>+            case 0x1266c2deu:
>+            {
>+                if (name.beginsWith(BuiltInName::roundEven))
>+                {
>+                    ASSERT(name.length() == 12);
>+                    return &BuiltInFunction::kFunction_roundEven_0B;
>+                }
>+                break;
>+            }
>+            case 0x1267db60u:
>+            {
>+                if (name.beginsWith(BuiltInName::transpose))
>+                {
>+                    ASSERT(name.length() == 12);
>+                    return &BuiltInFunction::kFunction_transpose_5B;
>+                }
>+                break;
>+            }
>+            case 0x1267de6cu:
>+            {
>+                if (name.beginsWith(BuiltInName::transpose))
>+                {
>+                    ASSERT(name.length() == 12);
>+                    return &BuiltInFunction::kFunction_transpose_DB;
>+                }
>+                break;
>+            }
>+            case 0x1273f9dbu:
>+            {
>+                if (name.beginsWith(BuiltInName::yuv_2_rgb))
>+                {
>+                    ASSERT(name.length() == 14);
>+                    return &BuiltInFunction::kFunction_yuv_2_rgb_2B0G;
>+                }
>+                break;
>+            }
>+            case 0x127589a7u:
>+            {
>+                if (name.beginsWith(BuiltInName::rgb_2_yuv))
>+                {
>+                    ASSERT(name.length() == 14);
>+                    return &BuiltInFunction::kFunction_rgb_2_yuv_2B0G;
>+                }
>+                break;
>+            }
>+            case 0x14882ba7u:
>+            {
>+                if (name.beginsWith(BuiltInName::textureLod))
>+                {
>+                    ASSERT(name.length() == 17);
>+                    return &BuiltInFunction::kFunction_textureLod_0X2B0B;
>+                }
>+                break;
>+            }
>+            case 0x14885983u:
>+            {
>+                if (name.beginsWith(BuiltInName::texelFetch))
>+                {
>+                    ASSERT(name.length() == 17);
>+                    return &BuiltInFunction::kFunction_texelFetch_0R2C0C;
>+                }
>+                break;
>+            }
>+            case 0x14885e67u:
>+            {
>+                if (name == BuiltInName::texelFetch_0Z2C0C)
>+                {
>+                    return &BuiltInFunction::kFunction_texelFetch_0Z2C0C;
>+                }
>+                break;
>+            }
>+            case 0x1488a5bfu:
>+            {
>+                if (name == BuiltInName::textureLod_0W1B0B)
>+                {
>+                    return &BuiltInFunction::kFunction_textureLod_0W1B0B;
>+                }
>+                break;
>+            }
>+            case 0x14896e41u:
>+            {
>+                if (name == BuiltInName::texelFetchExt_0O1C0C)
>+                {
>+                    return &BuiltInFunction::kFunction_texelFetchExt_0O1C0C;
>+                }
>+                break;
>+            }
>+            case 0x1489e510u:
>+            {
>+                if (name.beginsWith(BuiltInName::textureLod))
>+                {
>+                    ASSERT(name.length() == 17);
>+                    return &BuiltInFunction::kFunction_textureLod_0T2B0B;
>+                }
>+                break;
>+            }
>+            case 0x148a14a7u:
>+            {
>+                if (name.beginsWith(BuiltInName::texelFetch))
>+                {
>+                    ASSERT(name.length() == 17);
>+                    return &BuiltInFunction::kFunction_texelFetch_0M1C0C;
>+                }
>+                break;
>+            }
>+            case 0x148a66beu:
>+            {
>+                if (name == BuiltInName::textureLod_0S2B0B)
>+                {
>+                    return &BuiltInFunction::kFunction_textureLod_0S2B0B;
>+                }
>+                break;
>+            }
>+            case 0x148a95e7u:
>+            {
>+                if (name.beginsWith(BuiltInName::textureLod))
>+                {
>+                    ASSERT(name.length() == 17);
>+                    return &BuiltInFunction::kFunction_textureLod_0c2B0B;
>+                }
>+                break;
>+            }
>+            case 0x148b00dbu:
>+            {
>+                if (name == BuiltInName::textureLod_0J2B0B)
>+                {
>+                    return &BuiltInFunction::kFunction_textureLod_0J2B0B;
>+                }
>+                break;
>+            }
>+            case 0x148b33b6u:
>+            {
>+                if (name.beginsWith(BuiltInName::textureLod))
>+                {
>+                    ASSERT(name.length() == 17);
>+                    return &BuiltInFunction::kFunction_textureLod_0H1B0B;
>+                }
>+                break;
>+            }
>+            case 0x148bab65u:
>+            {
>+                if (name == BuiltInName::texelFetch_0I2C0C)
>+                {
>+                    return &BuiltInFunction::kFunction_texelFetch_0I2C0C;
>+                }
>+                break;
>+            }
>+            case 0x148cccafu:
>+            {
>+                if (name.beginsWith(BuiltInName::textureLod))
>+                {
>+                    ASSERT(name.length() == 17);
>+                    return &BuiltInFunction::kFunction_textureLod_0R2B0B;
>+                }
>+                break;
>+            }
>+            case 0x148d0a7bu:
>+            {
>+                if (name == BuiltInName::texelFetch_0K2C0C)
>+                {
>+                    return &BuiltInFunction::kFunction_texelFetch_0K2C0C;
>+                }
>+                break;
>+            }
>+            case 0x148d335cu:
>+            {
>+                if (name.beginsWith(BuiltInName::textureLod))
>+                {
>+                    ASSERT(name.length() == 17);
>+                    return &BuiltInFunction::kFunction_textureLod_0I2B0B;
>+                }
>+                break;
>+            }
>+            case 0x148ddb10u:
>+            {
>+                if (name.beginsWith(BuiltInName::texelFetchExt))
>+                {
>+                    ASSERT(name.length() == 17);
>+                    return &BuiltInFunction::kFunction_texelFetchExt_0a1C0C;
>+                }
>+                break;
>+            }
>+            case 0x148e100eu:
>+            {
>+                if (name == BuiltInName::texelFetch_0X2C0C)
>+                {
>+                    return &BuiltInFunction::kFunction_texelFetch_0X2C0C;
>+                }
>+                break;
>+            }
>+            case 0x148e44d3u:
>+            {
>+                if (name == BuiltInName::textureLod_0Y2B0B)
>+                {
>+                    return &BuiltInFunction::kFunction_textureLod_0Y2B0B;
>+                }
>+                break;
>+            }
>+            case 0x148e5d86u:
>+            {
>+                if (name == BuiltInName::texelFetch_0Q1C0C)
>+                {
>+                    return &BuiltInFunction::kFunction_texelFetch_0Q1C0C;
>+                }
>+                break;
>+            }
>+            case 0x148e6d96u:
>+            {
>+                if (name.beginsWith(BuiltInName::texelFetch))
>+                {
>+                    ASSERT(name.length() == 17);
>+                    return &BuiltInFunction::kFunction_texelFetch_0W1C0C;
>+                }
>+                break;
>+            }
>+            case 0x148ed16fu:
>+            {
>+                if (name.beginsWith(BuiltInName::texelFetchExt))
>+                {
>+                    ASSERT(name.length() == 17);
>+                    return &BuiltInFunction::kFunction_texelFetchExt_0U1C0C;
>+                }
>+                break;
>+            }
>+            case 0x148ed87fu:
>+            {
>+                if (name.beginsWith(BuiltInName::textureLod))
>+                {
>+                    ASSERT(name.length() == 17);
>+                    return &BuiltInFunction::kFunction_textureLod_0K2B0B;
>+                }
>+                break;
>+            }
>+            case 0x148eff58u:
>+            {
>+                if (name == BuiltInName::texelFetch_0L1C0C)
>+                {
>+                    return &BuiltInFunction::kFunction_texelFetch_0L1C0C;
>+                }
>+                break;
>+            }
>+            case 0x148fa8bbu:
>+            {
>+                if (name == BuiltInName::textureLod_0Q1B0B)
>+                {
>+                    return &BuiltInFunction::kFunction_textureLod_0Q1B0B;
>+                }
>+                break;
>+            }
>+            case 0x148fb13cu:
>+            {
>+                if (name == BuiltInName::texelFetch_0T2C0C)
>+                {
>+                    return &BuiltInFunction::kFunction_texelFetch_0T2C0C;
>+                }
>+                break;
>+            }
>+            case 0x148fd5b6u:
>+            {
>+                if (name == BuiltInName::texelFetch_0H1C0C)
>+                {
>+                    return &BuiltInFunction::kFunction_texelFetch_0H1C0C;
>+                }
>+                break;
>+            }
>+            case 0x148fe911u:
>+            {
>+                if (name == BuiltInName::textureLod_0Z2B0B)
>+                {
>+                    return &BuiltInFunction::kFunction_textureLod_0Z2B0B;
>+                }
>+                break;
>+            }
>+            case 0x167394d8u:
>+            {
>+                if (name.beginsWith(BuiltInName::textureSizeExt))
>+                {
>+                    ASSERT(name.length() == 14);
>+                    return &BuiltInFunction::kFunction_textureSizeExt_0U;
>+                }
>+                break;
>+            }
>+            case 0x1673f496u:
>+            {
>+                if (name.beginsWith(BuiltInName::textureSizeExt))
>+                {
>+                    ASSERT(name.length() == 14);
>+                    return &BuiltInFunction::kFunction_textureSizeExt_0O;
>+                }
>+                break;
>+            }
>+            case 0x1674ed12u:
>+            {
>+                if (name.beginsWith(BuiltInName::determinant))
>+                {
>+                    ASSERT(name.length() == 14);
>+                    return &BuiltInFunction::kFunction_determinant_FB;
>+                }
>+                break;
>+            }
>+            case 0x16752ab6u:
>+            {
>+                if (name.beginsWith(BuiltInName::textureSizeExt))
>+                {
>+                    ASSERT(name.length() == 14);
>+                    return &BuiltInFunction::kFunction_textureSizeExt_0a;
>+                }
>+                break;
>+            }
>+            case 0x1676ad75u:
>+            {
>+                if (name.beginsWith(BuiltInName::determinant))
>+                {
>+                    ASSERT(name.length() == 14);
>+                    return &BuiltInFunction::kFunction_determinant_5B;
>+                }
>+                break;
>+            }
>+            case 0x167719ccu:
>+            {
>+                if (name.beginsWith(BuiltInName::determinant))
>+                {
>+                    ASSERT(name.length() == 14);
>+                    return &BuiltInFunction::kFunction_determinant_AB;
>+                }
>+                break;
>+            }
>+            case 0x16803d05u:
>+            {
>+                if (name.beginsWith(BuiltInName::textureSize))
>+                {
>+                    ASSERT(name.length() == 16);
>+                    return &BuiltInFunction::kFunction_textureSize_0I0C;
>+                }
>+                break;
>+            }
>+            case 0x168046b0u:
>+            {
>+                if (name.beginsWith(BuiltInName::textureSize))
>+                {
>+                    ASSERT(name.length() == 16);
>+                    return &BuiltInFunction::kFunction_textureSize_0M0C;
>+                }
>+                break;
>+            }
>+            case 0x168093aau:
>+            {
>+                if (name.beginsWith(BuiltInName::textureSize))
>+                {
>+                    ASSERT(name.length() == 16);
>+                    return &BuiltInFunction::kFunction_textureSize_0T0C;
>+                }
>+                break;
>+            }
>+            case 0x168115fbu:
>+            {
>+                if (name.beginsWith(BuiltInName::textureSize))
>+                {
>+                    ASSERT(name.length() == 16);
>+                    return &BuiltInFunction::kFunction_textureSize_0e0C;
>+                }
>+                break;
>+            }
>+            case 0x16812c54u:
>+            {
>+                if (name.beginsWith(BuiltInName::greaterThan))
>+                {
>+                    ASSERT(name.length() == 16);
>+                    return &BuiltInFunction::kFunction_greaterThan_3D3D;
>+                }
>+                break;
>+            }
>+            case 0x16812eeeu:
>+            {
>+                if (name.beginsWith(BuiltInName::textureProj))
>+                {
>+                    ASSERT(name.length() == 16);
>+                    return &BuiltInFunction::kFunction_textureProj_0W3B;
>+                }
>+                break;
>+            }
>+            case 0x168174f7u:
>+            {
>+                if (name.beginsWith(BuiltInName::greaterThan))
>+                {
>+                    ASSERT(name.length() == 16);
>+                    return &BuiltInFunction::kFunction_greaterThan_1D1D;
>+                }
>+                break;
>+            }
>+            case 0x168178c7u:
>+            {
>+                if (name.beginsWith(BuiltInName::textureProj))
>+                {
>+                    ASSERT(name.length() == 16);
>+                    return &BuiltInFunction::kFunction_textureProj_0H2B;
>+                }
>+                break;
>+            }
>+            case 0x1681d6b4u:
>+            {
>+                if (name.beginsWith(BuiltInName::greaterThan))
>+                {
>+                    ASSERT(name.length() == 16);
>+                    return &BuiltInFunction::kFunction_greaterThan_2D2D;
>+                }
>+                break;
>+            }
>+            case 0x1681f153u:
>+            {
>+                if (name.beginsWith(BuiltInName::textureSize))
>+                {
>+                    ASSERT(name.length() == 16);
>+                    return &BuiltInFunction::kFunction_textureSize_0J0C;
>+                }
>+                break;
>+            }
>+            case 0x168245a4u:
>+            {
>+                if (name.beginsWith(BuiltInName::textureSize))
>+                {
>+                    ASSERT(name.length() == 16);
>+                    return &BuiltInFunction::kFunction_textureSize_0S0C;
>+                }
>+                break;
>+            }
>+            case 0x1682b6c4u:
>+            {
>+                if (name.beginsWith(BuiltInName::textureProj))
>+                {
>+                    ASSERT(name.length() == 16);
>+                    return &BuiltInFunction::kFunction_textureProj_0X3B;
>+                }
>+                break;
>+            }
>+            case 0x1682d0c8u:
>+            {
>+                if (name.beginsWith(BuiltInName::textureProj))
>+                {
>+                    ASSERT(name.length() == 16);
>+                    return &BuiltInFunction::kFunction_textureProj_0M2B;
>+                }
>+                break;
>+            }
>+            case 0x1682d660u:
>+            {
>+                if (name.beginsWith(BuiltInName::textureSize))
>+                {
>+                    ASSERT(name.length() == 16);
>+                    return &BuiltInFunction::kFunction_textureSize_0Y0C;
>+                }
>+                break;
>+            }
>+            case 0x16838d15u:
>+            {
>+                if (name.beginsWith(BuiltInName::textureProj))
>+                {
>+                    ASSERT(name.length() == 16);
>+                    return &BuiltInFunction::kFunction_textureProj_0L2B;
>+                }
>+                break;
>+            }
>+            case 0x1683ecb1u:
>+            {
>+                if (name.beginsWith(BuiltInName::textureProj))
>+                {
>+                    ASSERT(name.length() == 16);
>+                    return &BuiltInFunction::kFunction_textureProj_0M3B;
>+                }
>+                break;
>+            }
>+            case 0x16840064u:
>+            {
>+                if (name.beginsWith(BuiltInName::textureProj))
>+                {
>+                    ASSERT(name.length() == 16);
>+                    return &BuiltInFunction::kFunction_textureProj_0H3B;
>+                }
>+                break;
>+            }
>+            case 0x168434eeu:
>+            {
>+                if (name.beginsWith(BuiltInName::textureSize))
>+                {
>+                    ASSERT(name.length() == 16);
>+                    return &BuiltInFunction::kFunction_textureSize_0H0C;
>+                }
>+                break;
>+            }
>+            case 0x16845c90u:
>+            {
>+                if (name.beginsWith(BuiltInName::textureSize))
>+                {
>+                    ASSERT(name.length() == 16);
>+                    return &BuiltInFunction::kFunction_textureSize_0L0C;
>+                }
>+                break;
>+            }
>+            case 0x16846c6cu:
>+            {
>+                if (name.beginsWith(BuiltInName::textureSize))
>+                {
>+                    ASSERT(name.length() == 16);
>+                    return &BuiltInFunction::kFunction_textureSize_0W0C;
>+                }
>+                break;
>+            }
>+            case 0x16849618u:
>+            {
>+                if (name.beginsWith(BuiltInName::textureSize))
>+                {
>+                    ASSERT(name.length() == 16);
>+                    return &BuiltInFunction::kFunction_textureSize_0Z0C;
>+                }
>+                break;
>+            }
>+            case 0x1684f1b3u:
>+            {
>+                if (name.beginsWith(BuiltInName::textureSize))
>+                {
>+                    ASSERT(name.length() == 16);
>+                    return &BuiltInFunction::kFunction_textureSize_0d0C;
>+                }
>+                break;
>+            }
>+            case 0x1685011eu:
>+            {
>+                if (name.beginsWith(BuiltInName::textureProj))
>+                {
>+                    ASSERT(name.length() == 16);
>+                    return &BuiltInFunction::kFunction_textureProj_0Q2B;
>+                }
>+                break;
>+            }
>+            case 0x1685b785u:
>+            {
>+                if (name.beginsWith(BuiltInName::textureProj))
>+                {
>+                    ASSERT(name.length() == 16);
>+                    return &BuiltInFunction::kFunction_textureProj_0N3B;
>+                }
>+                break;
>+            }
>+            case 0x1685ca01u:
>+            {
>+                if (name.beginsWith(BuiltInName::textureProj))
>+                {
>+                    ASSERT(name.length() == 16);
>+                    return &BuiltInFunction::kFunction_textureProj_0I3B;
>+                }
>+                break;
>+            }
>+            case 0x16860d28u:
>+            {
>+                if (name.beginsWith(BuiltInName::textureProj))
>+                {
>+                    ASSERT(name.length() == 16);
>+                    return &BuiltInFunction::kFunction_textureProj_0Q3B;
>+                }
>+                break;
>+            }
>+            case 0x16861104u:
>+            {
>+                if (name.beginsWith(BuiltInName::textureSize))
>+                {
>+                    ASSERT(name.length() == 16);
>+                    return &BuiltInFunction::kFunction_textureSize_0K0C;
>+                }
>+                break;
>+            }
>+            case 0x16863c73u:
>+            {
>+                if (name.beginsWith(BuiltInName::textureSize))
>+                {
>+                    ASSERT(name.length() == 16);
>+                    return &BuiltInFunction::kFunction_textureSize_0R0C;
>+                }
>+                break;
>+            }
>+            case 0x16865716u:
>+            {
>+                if (name.beginsWith(BuiltInName::textureProj))
>+                {
>+                    ASSERT(name.length() == 16);
>+                    return &BuiltInFunction::kFunction_textureProj_0L3B;
>+                }
>+                break;
>+            }
>+            case 0x16869d00u:
>+            {
>+                if (name.beginsWith(BuiltInName::textureSize))
>+                {
>+                    ASSERT(name.length() == 16);
>+                    return &BuiltInFunction::kFunction_textureSize_0Q0C;
>+                }
>+                break;
>+            }
>+            case 0x1686a82au:
>+            {
>+                if (name.beginsWith(BuiltInName::textureSize))
>+                {
>+                    ASSERT(name.length() == 16);
>+                    return &BuiltInFunction::kFunction_textureSize_0X0C;
>+                }
>+                break;
>+            }
>+            case 0x1686aa87u:
>+            {
>+                if (name.beginsWith(BuiltInName::textureSize))
>+                {
>+                    ASSERT(name.length() == 16);
>+                    return &BuiltInFunction::kFunction_textureSize_0c0C;
>+                }
>+                break;
>+            }
>+            case 0x1686cb94u:
>+            {
>+                if (name.beginsWith(BuiltInName::textureProj))
>+                {
>+                    ASSERT(name.length() == 16);
>+                    return &BuiltInFunction::kFunction_textureProj_0N2B;
>+                }
>+                break;
>+            }
>+            case 0x16875a59u:
>+            {
>+                if (name.beginsWith(BuiltInName::textureProj))
>+                {
>+                    ASSERT(name.length() == 16);
>+                    return &BuiltInFunction::kFunction_textureProj_0c3B;
>+                }
>+                break;
>+            }
>+            case 0x1687c54du:
>+            {
>+                if (name.beginsWith(BuiltInName::textureProj))
>+                {
>+                    ASSERT(name.length() == 16);
>+                    return &BuiltInFunction::kFunction_textureProj_0R3B;
>+                }
>+                break;
>+            }
>+            case 0x1687d107u:
>+            {
>+                if (name.beginsWith(BuiltInName::textureProj))
>+                {
>+                    ASSERT(name.length() == 16);
>+                    return &BuiltInFunction::kFunction_textureProj_0W2B;
>+                }
>+                break;
>+            }
>+            case 0x16a00e04u:
>+            {
>+                if (name == BuiltInName::textureGrad_0I2B2B2B)
>+                {
>+                    return &BuiltInFunction::kFunction_textureGrad_0I2B2B2B;
>+                }
>+                break;
>+            }
>+            case 0x16a04ad9u:
>+            {
>+                if (name == BuiltInName::textureGrad_0X2B2B2B)
>+                {
>+                    return &BuiltInFunction::kFunction_textureGrad_0X2B2B2B;
>+                }
>+                break;
>+            }
>+            case 0x16a1478fu:
>+            {
>+                if (name == BuiltInName::textureGrad_0e3B1B1B)
>+                {
>+                    return &BuiltInFunction::kFunction_textureGrad_0e3B1B1B;
>+                }
>+                break;
>+            }
>+            case 0x16a19c8du:
>+            {
>+                if (name == BuiltInName::textureGrad_0H1B1B1B)
>+                {
>+                    return &BuiltInFunction::kFunction_textureGrad_0H1B1B1B;
>+                }
>+                break;
>+            }
>+            case 0x16a1ec87u:
>+            {
>+                if (name == BuiltInName::textureGrad_0J2B2B2B)
>+                {
>+                    return &BuiltInFunction::kFunction_textureGrad_0J2B2B2B;
>+                }
>+                break;
>+            }
>+            case 0x16a2ff3du:
>+            {
>+                if (name == BuiltInName::textureGrad_0Q1B1B1B)
>+                {
>+                    return &BuiltInFunction::kFunction_textureGrad_0Q1B1B1B;
>+                }
>+                break;
>+            }
>+            case 0x16a34692u:
>+            {
>+                if (name == BuiltInName::textureGrad_0R2B2B2B)
>+                {
>+                    return &BuiltInFunction::kFunction_textureGrad_0R2B2B2B;
>+                }
>+                break;
>+            }
>+            case 0x16a3a842u:
>+            {
>+                if (name == BuiltInName::textureGrad_0c2B1B1B)
>+                {
>+                    return &BuiltInFunction::kFunction_textureGrad_0c2B1B1B;
>+                }
>+                break;
>+            }
>+            case 0x16a3b8f6u:
>+            {
>+                if (name == BuiltInName::textureGrad_0Y2B2B2B)
>+                {
>+                    return &BuiltInFunction::kFunction_textureGrad_0Y2B2B2B;
>+                }
>+                break;
>+            }
>+            case 0x16a4a66cu:
>+            {
>+                if (name == BuiltInName::textureGrad_0W1B1B1B)
>+                {
>+                    return &BuiltInFunction::kFunction_textureGrad_0W1B1B1B;
>+                }
>+                break;
>+            }
>+            case 0x16a4e27cu:
>+            {
>+                if (name == BuiltInName::textureGrad_0d3B2B2B)
>+                {
>+                    return &BuiltInFunction::kFunction_textureGrad_0d3B2B2B;
>+                }
>+                break;
>+            }
>+            case 0x16a66883u:
>+            {
>+                if (name == BuiltInName::textureGrad_0T2B1B1B)
>+                {
>+                    return &BuiltInFunction::kFunction_textureGrad_0T2B1B1B;
>+                }
>+                break;
>+            }
>+            case 0x16a68a81u:
>+            {
>+                if (name == BuiltInName::textureGrad_0S2B2B2B)
>+                {
>+                    return &BuiltInFunction::kFunction_textureGrad_0S2B2B2B;
>+                }
>+                break;
>+            }
>+            case 0x16a6a742u:
>+            {
>+                if (name == BuiltInName::textureGrad_0Z2B1B1B)
>+                {
>+                    return &BuiltInFunction::kFunction_textureGrad_0Z2B1B1B;
>+                }
>+                break;
>+            }
>+            case 0x16a71104u:
>+            {
>+                if (name == BuiltInName::textureGrad_0K2B1B1B)
>+                {
>+                    return &BuiltInFunction::kFunction_textureGrad_0K2B1B1B;
>+                }
>+                break;
>+            }
>+            case 0x187df788u:
>+            {
>+                if (name.beginsWith(BuiltInName::packHalf2x16))
>+                {
>+                    ASSERT(name.length() == 15);
>+                    return &BuiltInFunction::kFunction_packHalf2x16_1B;
>+                }
>+                break;
>+            }
>+            case 0x18887331u:
>+            {
>+                if (name.beginsWith(BuiltInName::outerProduct))
>+                {
>+                    ASSERT(name.length() == 17);
>+                    return &BuiltInFunction::kFunction_outerProduct_2B3B;
>+                }
>+                break;
>+            }
>+            case 0x188880cbu:
>+            {
>+                if (name.beginsWith(BuiltInName::outerProduct))
>+                {
>+                    ASSERT(name.length() == 17);
>+                    return &BuiltInFunction::kFunction_outerProduct_1B1B;
>+                }
>+                break;
>+            }
>+            case 0x1888c44du:
>+            {
>+                if (name.beginsWith(BuiltInName::outerProduct))
>+                {
>+                    ASSERT(name.length() == 17);
>+                    return &BuiltInFunction::kFunction_outerProduct_3B2B;
>+                }
>+                break;
>+            }
>+            case 0x188916c3u:
>+            {
>+                if (name.beginsWith(BuiltInName::outerProduct))
>+                {
>+                    ASSERT(name.length() == 17);
>+                    return &BuiltInFunction::kFunction_outerProduct_1B2B;
>+                }
>+                break;
>+            }
>+            case 0x188a12cau:
>+            {
>+                if (name.beginsWith(BuiltInName::outerProduct))
>+                {
>+                    ASSERT(name.length() == 17);
>+                    return &BuiltInFunction::kFunction_outerProduct_1B3B;
>+                }
>+                break;
>+            }
>+            case 0x188db87au:
>+            {
>+                if (name.beginsWith(BuiltInName::outerProduct))
>+                {
>+                    ASSERT(name.length() == 17);
>+                    return &BuiltInFunction::kFunction_outerProduct_2B2B;
>+                }
>+                break;
>+            }
>+            case 0x188e0232u:
>+            {
>+                if (name.beginsWith(BuiltInName::outerProduct))
>+                {
>+                    ASSERT(name.length() == 17);
>+                    return &BuiltInFunction::kFunction_outerProduct_3B3B;
>+                }
>+                break;
>+            }
>+            case 0x188e2270u:
>+            {
>+                if (name.beginsWith(BuiltInName::outerProduct))
>+                {
>+                    ASSERT(name.length() == 17);
>+                    return &BuiltInFunction::kFunction_outerProduct_2B1B;
>+                }
>+                break;
>+            }
>+            case 0x188f8feeu:
>+            {
>+                if (name.beginsWith(BuiltInName::outerProduct))
>+                {
>+                    ASSERT(name.length() == 17);
>+                    return &BuiltInFunction::kFunction_outerProduct_3B1B;
>+                }
>+                break;
>+            }
>+            case 0x1a84fa77u:
>+            {
>+                if (name.beginsWith(BuiltInName::packSnorm2x16))
>+                {
>+                    ASSERT(name.length() == 16);
>+                    return &BuiltInFunction::kFunction_packSnorm2x16_1B;
>+                }
>+                break;
>+            }
>+            case 0x1a873678u:
>+            {
>+                if (name.beginsWith(BuiltInName::packUnorm2x16))
>+                {
>+                    ASSERT(name.length() == 16);
>+                    return &BuiltInFunction::kFunction_packUnorm2x16_1B;
>+                }
>+                break;
>+            }
>+            case 0x1a92589du:
>+            {
>+                if (name.beginsWith(BuiltInName::lessThanEqual))
>+                {
>+                    ASSERT(name.length() == 18);
>+                    return &BuiltInFunction::kFunction_lessThanEqual_2D2D;
>+                }
>+                break;
>+            }
>+            case 0x1a95efdcu:
>+            {
>+                if (name.beginsWith(BuiltInName::lessThanEqual))
>+                {
>+                    ASSERT(name.length() == 18);
>+                    return &BuiltInFunction::kFunction_lessThanEqual_1D1D;
>+                }
>+                break;
>+            }
>+            case 0x1a96ec62u:
>+            {
>+                if (name.beginsWith(BuiltInName::lessThanEqual))
>+                {
>+                    ASSERT(name.length() == 18);
>+                    return &BuiltInFunction::kFunction_lessThanEqual_3D3D;
>+                }
>+                break;
>+            }
>+            case 0x1aa01270u:
>+            {
>+                if (name.beginsWith(BuiltInName::textureOffset))
>+                {
>+                    ASSERT(name.length() == 20);
>+                    return &BuiltInFunction::kFunction_textureOffset_0Q1B1C;
>+                }
>+                break;
>+            }
>+            case 0x1aa05156u:
>+            {
>+                if (name.beginsWith(BuiltInName::textureOffset))
>+                {
>+                    ASSERT(name.length() == 20);
>+                    return &BuiltInFunction::kFunction_textureOffset_0c2B1C;
>+                }
>+                break;
>+            }
>+            case 0x1aa11785u:
>+            {
>+                if (name.beginsWith(BuiltInName::textureOffset))
>+                {
>+                    ASSERT(name.length() == 20);
>+                    return &BuiltInFunction::kFunction_textureOffset_0H1B1C;
>+                }
>+                break;
>+            }
>+            case 0x1aa26095u:
>+            {
>+                if (name.beginsWith(BuiltInName::textureOffset))
>+                {
>+                    ASSERT(name.length() == 20);
>+                    return &BuiltInFunction::kFunction_textureOffset_0T2B1C;
>+                }
>+                break;
>+            }
>+            case 0x1aa31637u:
>+            {
>+                if (name == BuiltInName::textureOffset_0X2B2C)
>+                {
>+                    return &BuiltInFunction::kFunction_textureOffset_0X2B2C;
>+                }
>+                break;
>+            }
>+            case 0x1aa385c2u:
>+            {
>+                if (name.beginsWith(BuiltInName::textureOffset))
>+                {
>+                    ASSERT(name.length() == 20);
>+                    return &BuiltInFunction::kFunction_textureOffset_0Z2B1C;
>+                }
>+                break;
>+            }
>+            case 0x1aa41f4au:
>+            {
>+                if (name.beginsWith(BuiltInName::textureOffset))
>+                {
>+                    ASSERT(name.length() == 20);
>+                    return &BuiltInFunction::kFunction_textureOffset_0K2B1C;
>+                }
>+                break;
>+            }
>+            case 0x1aa541b7u:
>+            {
>+                if (name.beginsWith(BuiltInName::textureOffset))
>+                {
>+                    ASSERT(name.length() == 20);
>+                    return &BuiltInFunction::kFunction_textureOffset_0W1B1C;
>+                }
>+                break;
>+            }
>+            case 0x1aa64995u:
>+            {
>+                if (name.beginsWith(BuiltInName::textureOffset))
>+                {
>+                    ASSERT(name.length() == 20);
>+                    return &BuiltInFunction::kFunction_textureOffset_0I2B2C;
>+                }
>+                break;
>+            }
>+            case 0x1aa7a781u:
>+            {
>+                if (name.beginsWith(BuiltInName::textureOffset))
>+                {
>+                    ASSERT(name.length() == 20);
>+                    return &BuiltInFunction::kFunction_textureOffset_0R2B2C;
>+                }
>+                break;
>+            }
>+            case 0x1c887424u:
>+            {
>+                if (name.beginsWith(BuiltInName::intBitsToFloat))
>+                {
>+                    ASSERT(name.length() == 17);
>+                    return &BuiltInFunction::kFunction_intBitsToFloat_2C;
>+                }
>+                break;
>+            }
>+            case 0x1c887f5eu:
>+            {
>+                if (name.beginsWith(BuiltInName::floatBitsToInt))
>+                {
>+                    ASSERT(name.length() == 17);
>+                    return &BuiltInFunction::kFunction_floatBitsToInt_2B;
>+                }
>+                break;
>+            }
>+            case 0x1c88f18cu:
>+            {
>+                if (name.beginsWith(BuiltInName::intBitsToFloat))
>+                {
>+                    ASSERT(name.length() == 17);
>+                    return &BuiltInFunction::kFunction_intBitsToFloat_1C;
>+                }
>+                break;
>+            }
>+            case 0x1c89b11cu:
>+            {
>+                if (name.beginsWith(BuiltInName::floatBitsToInt))
>+                {
>+                    ASSERT(name.length() == 17);
>+                    return &BuiltInFunction::kFunction_floatBitsToInt_1B;
>+                }
>+                break;
>+            }
>+            case 0x1c89e261u:
>+            {
>+                if (name.beginsWith(BuiltInName::intBitsToFloat))
>+                {
>+                    ASSERT(name.length() == 17);
>+                    return &BuiltInFunction::kFunction_intBitsToFloat_0C;
>+                }
>+                break;
>+            }
>+            case 0x1c8ae0a5u:
>+            {
>+                if (name.beginsWith(BuiltInName::floatBitsToInt))
>+                {
>+                    ASSERT(name.length() == 17);
>+                    return &BuiltInFunction::kFunction_floatBitsToInt_0B;
>+                }
>+                break;
>+            }
>+            case 0x1c8b20dau:
>+            {
>+                if (name.beginsWith(BuiltInName::intBitsToFloat))
>+                {
>+                    ASSERT(name.length() == 17);
>+                    return &BuiltInFunction::kFunction_intBitsToFloat_3C;
>+                }
>+                break;
>+            }
>+            case 0x1c8dd4e6u:
>+            {
>+                if (name.beginsWith(BuiltInName::unpackHalf2x16))
>+                {
>+                    ASSERT(name.length() == 17);
>+                    return &BuiltInFunction::kFunction_unpackHalf2x16_0D;
>+                }
>+                break;
>+            }
>+            case 0x1c8f60afu:
>+            {
>+                if (name.beginsWith(BuiltInName::floatBitsToInt))
>+                {
>+                    ASSERT(name.length() == 17);
>+                    return &BuiltInFunction::kFunction_floatBitsToInt_3B;
>+                }
>+                break;
>+            }
>+            case 0x1c9876e4u:
>+            {
>+                if (name.beginsWith(BuiltInName::matrixCompMult))
>+                {
>+                    ASSERT(name.length() == 19);
>+                    return &BuiltInFunction::kFunction_matrixCompMult_9B9B;
>+                }
>+                break;
>+            }
>+            case 0x1c99affcu:
>+            {
>+                if (name.beginsWith(BuiltInName::matrixCompMult))
>+                {
>+                    ASSERT(name.length() == 19);
>+                    return &BuiltInFunction::kFunction_matrixCompMult_7B7B;
>+                }
>+                break;
>+            }
>+            case 0x1c9c8697u:
>+            {
>+                if (name.beginsWith(BuiltInName::matrixCompMult))
>+                {
>+                    ASSERT(name.length() == 19);
>+                    return &BuiltInFunction::kFunction_matrixCompMult_6B6B;
>+                }
>+                break;
>+            }
>+            case 0x1c9ccd5au:
>+            {
>+                if (name.beginsWith(BuiltInName::matrixCompMult))
>+                {
>+                    ASSERT(name.length() == 19);
>+                    return &BuiltInFunction::kFunction_matrixCompMult_BBBB;
>+                }
>+                break;
>+            }
>+            case 0x1c9ea241u:
>+            {
>+                if (name.beginsWith(BuiltInName::matrixCompMult))
>+                {
>+                    ASSERT(name.length() == 19);
>+                    return &BuiltInFunction::kFunction_matrixCompMult_DBDB;
>+                }
>+                break;
>+            }
>+            case 0x1c9fa571u:
>+            {
>+                if (name.beginsWith(BuiltInName::matrixCompMult))
>+                {
>+                    ASSERT(name.length() == 19);
>+                    return &BuiltInFunction::kFunction_matrixCompMult_EBEB;
>+                }
>+                break;
>+            }
>+            case 0x1ca81af6u:
>+            {
>+                if (name.beginsWith(BuiltInName::textureProjLod))
>+                {
>+                    ASSERT(name.length() == 21);
>+                    return &BuiltInFunction::kFunction_textureProjLod_0c3B0B;
>+                }
>+                break;
>+            }
>+            case 0x1ca85d55u:
>+            {
>+                if (name == BuiltInName::textureProjLod_0Q3B0B)
>+                {
>+                    return &BuiltInFunction::kFunction_textureProjLod_0Q3B0B;
>+                }
>+                break;
>+            }
>+            case 0x1ca8c89au:
>+            {
>+                if (name == BuiltInName::textureProjLod_0H3B0B)
>+                {
>+                    return &BuiltInFunction::kFunction_textureProjLod_0H3B0B;
>+                }
>+                break;
>+            }
>+            case 0x1ca9ff27u:
>+            {
>+                if (name.beginsWith(BuiltInName::textureProjLod))
>+                {
>+                    ASSERT(name.length() == 21);
>+                    return &BuiltInFunction::kFunction_textureProjLod_0W2B0B;
>+                }
>+                break;
>+            }
>+            case 0x1caa108bu:
>+            {
>+                if (name.beginsWith(BuiltInName::textureProjLod))
>+                {
>+                    ASSERT(name.length() == 21);
>+                    return &BuiltInFunction::kFunction_textureProjLod_0H2B0B;
>+                }
>+                break;
>+            }
>+            case 0x1caa957cu:
>+            {
>+                if (name == BuiltInName::textureProjLod_0Q2B0B)
>+                {
>+                    return &BuiltInFunction::kFunction_textureProjLod_0Q2B0B;
>+                }
>+                break;
>+            }
>+            case 0x1cab3a35u:
>+            {
>+                if (name.beginsWith(BuiltInName::textureProjLod))
>+                {
>+                    ASSERT(name.length() == 21);
>+                    return &BuiltInFunction::kFunction_textureProjLod_0W3B0B;
>+                }
>+                break;
>+            }
>+            case 0x1cadb5feu:
>+            {
>+                if (name.beginsWith(BuiltInName::textureProjLod))
>+                {
>+                    ASSERT(name.length() == 21);
>+                    return &BuiltInFunction::kFunction_textureProjLod_0X3B0B;
>+                }
>+                break;
>+            }
>+            case 0x1cae6ef8u:
>+            {
>+                if (name.beginsWith(BuiltInName::textureProjLod))
>+                {
>+                    ASSERT(name.length() == 21);
>+                    return &BuiltInFunction::kFunction_textureProjLod_0R3B0B;
>+                }
>+                break;
>+            }
>+            case 0x1caf96afu:
>+            {
>+                if (name == BuiltInName::textureProjLod_0I3B0B)
>+                {
>+                    return &BuiltInFunction::kFunction_textureProjLod_0I3B0B;
>+                }
>+                break;
>+            }
>+            case 0x1e903284u:
>+            {
>+                if (name.beginsWith(BuiltInName::floatBitsToUint))
>+                {
>+                    ASSERT(name.length() == 18);
>+                    return &BuiltInFunction::kFunction_floatBitsToUint_0B;
>+                }
>+                break;
>+            }
>+            case 0x1e92e353u:
>+            {
>+                if (name.beginsWith(BuiltInName::uintBitsToFloat))
>+                {
>+                    ASSERT(name.length() == 18);
>+                    return &BuiltInFunction::kFunction_uintBitsToFloat_3D;
>+                }
>+                break;
>+            }
>+            case 0x1e93c13fu:
>+            {
>+                if (name.beginsWith(BuiltInName::uintBitsToFloat))
>+                {
>+                    ASSERT(name.length() == 18);
>+                    return &BuiltInFunction::kFunction_uintBitsToFloat_0D;
>+                }
>+                break;
>+            }
>+            case 0x1e95201fu:
>+            {
>+                if (name.beginsWith(BuiltInName::floatBitsToUint))
>+                {
>+                    ASSERT(name.length() == 18);
>+                    return &BuiltInFunction::kFunction_floatBitsToUint_1B;
>+                }
>+                break;
>+            }
>+            case 0x1e95511bu:
>+            {
>+                if (name.beginsWith(BuiltInName::unpackSnorm2x16))
>+                {
>+                    ASSERT(name.length() == 18);
>+                    return &BuiltInFunction::kFunction_unpackSnorm2x16_0D;
>+                }
>+                break;
>+            }
>+            case 0x1e95582au:
>+            {
>+                if (name.beginsWith(BuiltInName::uintBitsToFloat))
>+                {
>+                    ASSERT(name.length() == 18);
>+                    return &BuiltInFunction::kFunction_uintBitsToFloat_1D;
>+                }
>+                break;
>+            }
>+            case 0x1e95b0a7u:
>+            {
>+                if (name.beginsWith(BuiltInName::uintBitsToFloat))
>+                {
>+                    ASSERT(name.length() == 18);
>+                    return &BuiltInFunction::kFunction_uintBitsToFloat_2D;
>+                }
>+                break;
>+            }
>+            case 0x1e966adcu:
>+            {
>+                if (name.beginsWith(BuiltInName::floatBitsToUint))
>+                {
>+                    ASSERT(name.length() == 18);
>+                    return &BuiltInFunction::kFunction_floatBitsToUint_2B;
>+                }
>+                break;
>+            }
>+            case 0x1e9718ffu:
>+            {
>+                if (name.beginsWith(BuiltInName::unpackUnorm2x16))
>+                {
>+                    ASSERT(name.length() == 18);
>+                    return &BuiltInFunction::kFunction_unpackUnorm2x16_0D;
>+                }
>+                break;
>+            }
>+            case 0x1e97a505u:
>+            {
>+                if (name.beginsWith(BuiltInName::floatBitsToUint))
>+                {
>+                    ASSERT(name.length() == 18);
>+                    return &BuiltInFunction::kFunction_floatBitsToUint_3B;
>+                }
>+                break;
>+            }
>+            case 0x1ec1a98bu:
>+            {
>+                if (name == BuiltInName::textureProjGrad_0Q2B1B1B)
>+                {
>+                    return &BuiltInFunction::kFunction_textureProjGrad_0Q2B1B1B;
>+                }
>+                break;
>+            }
>+            case 0x1ec2304bu:
>+            {
>+                if (name == BuiltInName::textureProjGrad_0X3B2B2B)
>+                {
>+                    return &BuiltInFunction::kFunction_textureProjGrad_0X3B2B2B;
>+                }
>+                break;
>+            }
>+            case 0x1ec25826u:
>+            {
>+                if (name == BuiltInName::textureProjGrad_0W2B1B1B)
>+                {
>+                    return &BuiltInFunction::kFunction_textureProjGrad_0W2B1B1B;
>+                }
>+                break;
>+            }
>+            case 0x1ec323fdu:
>+            {
>+                if (name == BuiltInName::textureProjGrad_0H3B1B1B)
>+                {
>+                    return &BuiltInFunction::kFunction_textureProjGrad_0H3B1B1B;
>+                }
>+                break;
>+            }
>+            case 0x1ec3ee61u:
>+            {
>+                if (name == BuiltInName::textureProjGrad_0I3B2B2B)
>+                {
>+                    return &BuiltInFunction::kFunction_textureProjGrad_0I3B2B2B;
>+                }
>+                break;
>+            }
>+            case 0x1ec578cfu:
>+            {
>+                if (name == BuiltInName::textureProjGrad_0R3B2B2B)
>+                {
>+                    return &BuiltInFunction::kFunction_textureProjGrad_0R3B2B2B;
>+                }
>+                break;
>+            }
>+            case 0x1ec5ab9du:
>+            {
>+                if (name == BuiltInName::textureProjGrad_0H2B1B1B)
>+                {
>+                    return &BuiltInFunction::kFunction_textureProjGrad_0H2B1B1B;
>+                }
>+                break;
>+            }
>+            case 0x1ec5fc9fu:
>+            {
>+                if (name == BuiltInName::textureProjGrad_0Q3B1B1B)
>+                {
>+                    return &BuiltInFunction::kFunction_textureProjGrad_0Q3B1B1B;
>+                }
>+                break;
>+            }
>+            case 0x1ec67b05u:
>+            {
>+                if (name == BuiltInName::textureProjGrad_0W3B1B1B)
>+                {
>+                    return &BuiltInFunction::kFunction_textureProjGrad_0W3B1B1B;
>+                }
>+                break;
>+            }
>+            case 0x1ec719d1u:
>+            {
>+                if (name == BuiltInName::textureProjGrad_0c3B1B1B)
>+                {
>+                    return &BuiltInFunction::kFunction_textureProjGrad_0c3B1B1B;
>+                }
>+                break;
>+            }
>+            case 0x20a92dc6u:
>+            {
>+                if (name.beginsWith(BuiltInName::greaterThanEqual))
>+                {
>+                    ASSERT(name.length() == 21);
>+                    return &BuiltInFunction::kFunction_greaterThanEqual_2D2D;
>+                }
>+                break;
>+            }
>+            case 0x20ae96edu:
>+            {
>+                if (name.beginsWith(BuiltInName::greaterThanEqual))
>+                {
>+                    ASSERT(name.length() == 21);
>+                    return &BuiltInFunction::kFunction_greaterThanEqual_3D3D;
>+                }
>+                break;
>+            }
>+            case 0x20aedbacu:
>+            {
>+                if (name.beginsWith(BuiltInName::greaterThanEqual))
>+                {
>+                    ASSERT(name.length() == 21);
>+                    return &BuiltInFunction::kFunction_greaterThanEqual_1D1D;
>+                }
>+                break;
>+            }
>+            case 0x20c8fa96u:
>+            {
>+                if (name == BuiltInName::texelFetchOffset_0I2C0C2C)
>+                {
>+                    return &BuiltInFunction::kFunction_texelFetchOffset_0I2C0C2C;
>+                }
>+                break;
>+            }
>+            case 0x20c9733bu:
>+            {
>+                if (name == BuiltInName::textureLodOffset_0c2B0B1C)
>+                {
>+                    return &BuiltInFunction::kFunction_textureLodOffset_0c2B0B1C;
>+                }
>+                break;
>+            }
>+            case 0x20c9a178u:
>+            {
>+                if (name == BuiltInName::texelFetchOffset_0X2C0C2C)
>+                {
>+                    return &BuiltInFunction::kFunction_texelFetchOffset_0X2C0C2C;
>+                }
>+                break;
>+            }
>+            case 0x20ca4914u:
>+            {
>+                if (name == BuiltInName::textureLodOffset_0Z2B0B1C)
>+                {
>+                    return &BuiltInFunction::kFunction_textureLodOffset_0Z2B0B1C;
>+                }
>+                break;
>+            }
>+            case 0x20cac068u:
>+            {
>+                if (name == BuiltInName::texelFetchOffset_0K2C0C1C)
>+                {
>+                    return &BuiltInFunction::kFunction_texelFetchOffset_0K2C0C1C;
>+                }
>+                break;
>+            }
>+            case 0x20cb3102u:
>+            {
>+                if (name == BuiltInName::texelFetchOffset_0H1C0C1C)
>+                {
>+                    return &BuiltInFunction::kFunction_texelFetchOffset_0H1C0C1C;
>+                }
>+                break;
>+            }
>+            case 0x20cb952du:
>+            {
>+                if (name == BuiltInName::texelFetchOffset_0Z2C0C1C)
>+                {
>+                    return &BuiltInFunction::kFunction_texelFetchOffset_0Z2C0C1C;
>+                }
>+                break;
>+            }
>+            case 0x20cbf8d9u:
>+            {
>+                if (name == BuiltInName::texelFetchOffset_0W1C0C1C)
>+                {
>+                    return &BuiltInFunction::kFunction_texelFetchOffset_0W1C0C1C;
>+                }
>+                break;
>+            }
>+            case 0x20cbfefau:
>+            {
>+                if (name == BuiltInName::texelFetchOffset_0R2C0C2C)
>+                {
>+                    return &BuiltInFunction::kFunction_texelFetchOffset_0R2C0C2C;
>+                }
>+                break;
>+            }
>+            case 0x20cc1a52u:
>+            {
>+                if (name == BuiltInName::texelFetchOffset_0Q1C0C1C)
>+                {
>+                    return &BuiltInFunction::kFunction_texelFetchOffset_0Q1C0C1C;
>+                }
>+                break;
>+            }
>+            case 0x20cc9477u:
>+            {
>+                if (name == BuiltInName::textureLodOffset_0H1B0B1C)
>+                {
>+                    return &BuiltInFunction::kFunction_textureLodOffset_0H1B0B1C;
>+                }
>+                break;
>+            }
>+            case 0x20ccf3edu:
>+            {
>+                if (name == BuiltInName::textureLodOffset_0Q1B0B1C)
>+                {
>+                    return &BuiltInFunction::kFunction_textureLodOffset_0Q1B0B1C;
>+                }
>+                break;
>+            }
>+            case 0x20cd0de3u:
>+            {
>+                if (name == BuiltInName::textureLodOffset_0K2B0B1C)
>+                {
>+                    return &BuiltInFunction::kFunction_textureLodOffset_0K2B0B1C;
>+                }
>+                break;
>+            }
>+            case 0x20cd8d8du:
>+            {
>+                if (name == BuiltInName::textureLodOffset_0T2B0B1C)
>+                {
>+                    return &BuiltInFunction::kFunction_textureLodOffset_0T2B0B1C;
>+                }
>+                break;
>+            }
>+            case 0x20cdc61au:
>+            {
>+                if (name == BuiltInName::textureLodOffset_0W1B0B1C)
>+                {
>+                    return &BuiltInFunction::kFunction_textureLodOffset_0W1B0B1C;
>+                }
>+                break;
>+            }
>+            case 0x20cde370u:
>+            {
>+                if (name == BuiltInName::textureLodOffset_0X2B0B2C)
>+                {
>+                    return &BuiltInFunction::kFunction_textureLodOffset_0X2B0B2C;
>+                }
>+                break;
>+            }
>+            case 0x20cde748u:
>+            {
>+                if (name == BuiltInName::textureLodOffset_0I2B0B2C)
>+                {
>+                    return &BuiltInFunction::kFunction_textureLodOffset_0I2B0B2C;
>+                }
>+                break;
>+            }
>+            case 0x20ceb3dau:
>+            {
>+                if (name == BuiltInName::textureLodOffset_0R2B0B2C)
>+                {
>+                    return &BuiltInFunction::kFunction_textureLodOffset_0R2B0B2C;
>+                }
>+                break;
>+            }
>+            case 0x20cfe609u:
>+            {
>+                if (name == BuiltInName::texelFetchOffset_0T2C0C1C)
>+                {
>+                    return &BuiltInFunction::kFunction_texelFetchOffset_0T2C0C1C;
>+                }
>+                break;
>+            }
>+            case 0x22c03489u:
>+            {
>+                if (name.beginsWith(BuiltInName::textureProjOffset))
>+                {
>+                    ASSERT(name.length() == 24);
>+                    return &BuiltInFunction::kFunction_textureProjOffset_0W2B1C;
>+                }
>+                break;
>+            }
>+            case 0x22c0a359u:
>+            {
>+                if (name == BuiltInName::textureProjOffset_0H2B1C)
>+                {
>+                    return &BuiltInFunction::kFunction_textureProjOffset_0H2B1C;
>+                }
>+                break;
>+            }
>+            case 0x22c19992u:
>+            {
>+                if (name.beginsWith(BuiltInName::textureProjOffset))
>+                {
>+                    ASSERT(name.length() == 24);
>+                    return &BuiltInFunction::kFunction_textureProjOffset_0c3B1C;
>+                }
>+                break;
>+            }
>+            case 0x22c246a2u:
>+            {
>+                if (name == BuiltInName::textureProjOffset_0Q3B1C)
>+                {
>+                    return &BuiltInFunction::kFunction_textureProjOffset_0Q3B1C;
>+                }
>+                break;
>+            }
>+            case 0x22c29005u:
>+            {
>+                if (name == BuiltInName::textureProjOffset_0Q2B1C)
>+                {
>+                    return &BuiltInFunction::kFunction_textureProjOffset_0Q2B1C;
>+                }
>+                break;
>+            }
>+            case 0x22c2da46u:
>+            {
>+                if (name == BuiltInName::textureProjOffset_0H3B1C)
>+                {
>+                    return &BuiltInFunction::kFunction_textureProjOffset_0H3B1C;
>+                }
>+                break;
>+            }
>+            case 0x22c3e359u:
>+            {
>+                if (name == BuiltInName::textureProjOffset_0W3B1C)
>+                {
>+                    return &BuiltInFunction::kFunction_textureProjOffset_0W3B1C;
>+                }
>+                break;
>+            }
>+            case 0x22c43880u:
>+            {
>+                if (name.beginsWith(BuiltInName::textureProjOffset))
>+                {
>+                    ASSERT(name.length() == 24);
>+                    return &BuiltInFunction::kFunction_textureProjOffset_0R3B2C;
>+                }
>+                break;
>+            }
>+            case 0x22c458dcu:
>+            {
>+                if (name.beginsWith(BuiltInName::textureProjOffset))
>+                {
>+                    ASSERT(name.length() == 24);
>+                    return &BuiltInFunction::kFunction_textureProjOffset_0I3B2C;
>+                }
>+                break;
>+            }
>+            case 0x22c47909u:
>+            {
>+                if (name == BuiltInName::textureProjOffset_0X3B2C)
>+                {
>+                    return &BuiltInFunction::kFunction_textureProjOffset_0X3B2C;
>+                }
>+                break;
>+            }
>+            case 0x22e0fe8cu:
>+            {
>+                if (name == BuiltInName::textureGradOffset_0W1B1B1B1C)
>+                {
>+                    return &BuiltInFunction::kFunction_textureGradOffset_0W1B1B1B1C;
>+                }
>+                break;
>+            }
>+            case 0x22e165b8u:
>+            {
>+                if (name == BuiltInName::textureGradOffset_0K2B1B1B1C)
>+                {
>+                    return &BuiltInFunction::kFunction_textureGradOffset_0K2B1B1B1C;
>+                }
>+                break;
>+            }
>+            case 0x22e28d80u:
>+            {
>+                if (name == BuiltInName::textureGradOffset_0T2B1B1B1C)
>+                {
>+                    return &BuiltInFunction::kFunction_textureGradOffset_0T2B1B1B1C;
>+                }
>+                break;
>+            }
>+            case 0x22e3ab1cu:
>+            {
>+                if (name == BuiltInName::textureGradOffset_0e3B1B1B1C)
>+                {
>+                    return &BuiltInFunction::kFunction_textureGradOffset_0e3B1B1B1C;
>+                }
>+                break;
>+            }
>+            case 0x22e3e9eau:
>+            {
>+                if (name == BuiltInName::textureGradOffset_0I2B2B2B2C)
>+                {
>+                    return &BuiltInFunction::kFunction_textureGradOffset_0I2B2B2B2C;
>+                }
>+                break;
>+            }
>+            case 0x22e5bb38u:
>+            {
>+                if (name == BuiltInName::textureGradOffset_0R2B2B2B2C)
>+                {
>+                    return &BuiltInFunction::kFunction_textureGradOffset_0R2B2B2B2C;
>+                }
>+                break;
>+            }
>+            case 0x22e5c876u:
>+            {
>+                if (name == BuiltInName::textureGradOffset_0Q1B1B1B1C)
>+                {
>+                    return &BuiltInFunction::kFunction_textureGradOffset_0Q1B1B1B1C;
>+                }
>+                break;
>+            }
>+            case 0x22e61729u:
>+            {
>+                if (name == BuiltInName::textureGradOffset_0X2B2B2B2C)
>+                {
>+                    return &BuiltInFunction::kFunction_textureGradOffset_0X2B2B2B2C;
>+                }
>+                break;
>+            }
>+            case 0x22e68293u:
>+            {
>+                if (name == BuiltInName::textureGradOffset_0Z2B1B1B1C)
>+                {
>+                    return &BuiltInFunction::kFunction_textureGradOffset_0Z2B1B1B1C;
>+                }
>+                break;
>+            }
>+            case 0x22e71012u:
>+            {
>+                if (name == BuiltInName::textureGradOffset_0H1B1B1B1C)
>+                {
>+                    return &BuiltInFunction::kFunction_textureGradOffset_0H1B1B1B1C;
>+                }
>+                break;
>+            }
>+            case 0x22e7429eu:
>+            {
>+                if (name == BuiltInName::textureGradOffset_0c2B1B1B1C)
>+                {
>+                    return &BuiltInFunction::kFunction_textureGradOffset_0c2B1B1B1C;
>+                }
>+                break;
>+            }
>+            case 0x28e8b7d0u:
>+            {
>+                if (name == BuiltInName::textureProjLodOffset_0W3B0B1C)
>+                {
>+                    return &BuiltInFunction::kFunction_textureProjLodOffset_0W3B0B1C;
>+                }
>+                break;
>+            }
>+            case 0x28e91d51u:
>+            {
>+                if (name == BuiltInName::textureProjLodOffset_0R3B0B2C)
>+                {
>+                    return &BuiltInFunction::kFunction_textureProjLodOffset_0R3B0B2C;
>+                }
>+                break;
>+            }
>+            case 0x28e9a246u:
>+            {
>+                if (name == BuiltInName::textureProjLodOffset_0W2B0B1C)
>+                {
>+                    return &BuiltInFunction::kFunction_textureProjLodOffset_0W2B0B1C;
>+                }
>+                break;
>+            }
>+            case 0x28eab462u:
>+            {
>+                if (name == BuiltInName::textureProjLodOffset_0H2B0B1C)
>+                {
>+                    return &BuiltInFunction::kFunction_textureProjLodOffset_0H2B0B1C;
>+                }
>+                break;
>+            }
>+            case 0x28eb8605u:
>+            {
>+                if (name == BuiltInName::textureProjLodOffset_0I3B0B2C)
>+                {
>+                    return &BuiltInFunction::kFunction_textureProjLodOffset_0I3B0B2C;
>+                }
>+                break;
>+            }
>+            case 0x28ebf99eu:
>+            {
>+                if (name == BuiltInName::textureProjLodOffset_0H3B0B1C)
>+                {
>+                    return &BuiltInFunction::kFunction_textureProjLodOffset_0H3B0B1C;
>+                }
>+                break;
>+            }
>+            case 0x28ec29a7u:
>+            {
>+                if (name == BuiltInName::textureProjLodOffset_0Q3B0B1C)
>+                {
>+                    return &BuiltInFunction::kFunction_textureProjLodOffset_0Q3B0B1C;
>+                }
>+                break;
>+            }
>+            case 0x28eecd92u:
>+            {
>+                if (name == BuiltInName::textureProjLodOffset_0X3B0B2C)
>+                {
>+                    return &BuiltInFunction::kFunction_textureProjLodOffset_0X3B0B2C;
>+                }
>+                break;
>+            }
>+            case 0x28ef956cu:
>+            {
>+                if (name == BuiltInName::textureProjLodOffset_0Q2B0B1C)
>+                {
>+                    return &BuiltInFunction::kFunction_textureProjLodOffset_0Q2B0B1C;
>+                }
>+                break;
>+            }
>+            case 0x28efb13bu:
>+            {
>+                if (name == BuiltInName::textureProjLodOffset_0c3B0B1C)
>+                {
>+                    return &BuiltInFunction::kFunction_textureProjLodOffset_0c3B0B1C;
>+                }
>+                break;
>+            }
>+            case 0x2b00aacdu:
>+            {
>+                if (name == BuiltInName::textureProjGradOffset_0c3B1B1B1C)
>+                {
>+                    return &BuiltInFunction::kFunction_textureProjGradOffset_0c3B1B1B1C;
>+                }
>+                break;
>+            }
>+            case 0x2b022418u:
>+            {
>+                if (name == BuiltInName::textureProjGradOffset_0H3B1B1B1C)
>+                {
>+                    return &BuiltInFunction::kFunction_textureProjGradOffset_0H3B1B1B1C;
>+                }
>+                break;
>+            }
>+            case 0x2b0252ccu:
>+            {
>+                if (name == BuiltInName::textureProjGradOffset_0X3B2B2B2C)
>+                {
>+                    return &BuiltInFunction::kFunction_textureProjGradOffset_0X3B2B2B2C;
>+                }
>+                break;
>+            }
>+            case 0x2b02af8fu:
>+            {
>+                if (name == BuiltInName::textureProjGradOffset_0I3B2B2B2C)
>+                {
>+                    return &BuiltInFunction::kFunction_textureProjGradOffset_0I3B2B2B2C;
>+                }
>+                break;
>+            }
>+            case 0x2b03ccf9u:
>+            {
>+                if (name == BuiltInName::textureProjGradOffset_0Q2B1B1B1C)
>+                {
>+                    return &BuiltInFunction::kFunction_textureProjGradOffset_0Q2B1B1B1C;
>+                }
>+                break;
>+            }
>+            case 0x2b03db51u:
>+            {
>+                if (name == BuiltInName::textureProjGradOffset_0W2B1B1B1C)
>+                {
>+                    return &BuiltInFunction::kFunction_textureProjGradOffset_0W2B1B1B1C;
>+                }
>+                break;
>+            }
>+            case 0x2b047dfau:
>+            {
>+                if (name == BuiltInName::textureProjGradOffset_0R3B2B2B2C)
>+                {
>+                    return &BuiltInFunction::kFunction_textureProjGradOffset_0R3B2B2B2C;
>+                }
>+                break;
>+            }
>+            case 0x2b06f874u:
>+            {
>+                if (name == BuiltInName::textureProjGradOffset_0Q3B1B1B1C)
>+                {
>+                    return &BuiltInFunction::kFunction_textureProjGradOffset_0Q3B1B1B1C;
>+                }
>+                break;
>+            }
>+            case 0x2b077535u:
>+            {
>+                if (name == BuiltInName::textureProjGradOffset_0H2B1B1B1C)
>+                {
>+                    return &BuiltInFunction::kFunction_textureProjGradOffset_0H2B1B1B1C;
>+                }
>+                break;
>+            }
>+            case 0x2b07f768u:
>+            {
>+                if (name == BuiltInName::textureProjGradOffset_0W3B1B1B1C)
>+                {
>+                    return &BuiltInFunction::kFunction_textureProjGradOffset_0W3B1B1B1C;
>+                }
>+                break;
>+            }
>+            case 0x7ec10648u:
>+            {
>+                if (name == BuiltInName::gl_MaxProgramTexelOffset)
>+                {
>+                    return mVar_gl_MaxProgramTexelOffset;
>+                }
>+                break;
>+            }
>+            case 0x7ec3c4d1u:
>+            {
>+                if (name == BuiltInName::gl_MinProgramTexelOffset)
>+                {
>+                    return mVar_gl_MinProgramTexelOffset;
>+                }
>+                break;
>+            }
>+            case 0x7ec8d677u:
>+            {
>+                if (name == BuiltInName::gl_MaxVertexOutputVectors)
>+                {
>+                    return mVar_gl_MaxVertexOutputVectors;
>+                }
>+                break;
>+            }
>+            case 0x7ed1aaebu:
>+            {
>+                if (name == BuiltInName::gl_MaxFragmentInputVectors)
>+                {
>+                    return mVar_gl_MaxFragmentInputVectors;
>+                }
>+                break;
>+            }
>+        }
>+        if (mShaderType == GL_FRAGMENT_SHADER)
>+        {
>+            switch (nameHash)
>+            {
>+                case 0x08394c88u:
>+                {
>+                    if (name.beginsWith(BuiltInName::dFdy))
>+                    {
>+                        ASSERT(name.length() == 7);
>+                        return &BuiltInFunction::kFunction_dFdy_0B;
>+                    }
>+                    break;
>+                }
>+                case 0x08398819u:
>+                {
>+                    if (name.beginsWith(BuiltInName::dFdx))
>+                    {
>+                        ASSERT(name.length() == 7);
>+                        return &BuiltInFunction::kFunction_dFdx_0B;
>+                    }
>+                    break;
>+                }
>+                case 0x083a7081u:
>+                {
>+                    if (name.beginsWith(BuiltInName::dFdy))
>+                    {
>+                        ASSERT(name.length() == 7);
>+                        return &BuiltInFunction::kFunction_dFdy_1B;
>+                    }
>+                    break;
>+                }
>+                case 0x083abe52u:
>+                {
>+                    if (name.beginsWith(BuiltInName::dFdx))
>+                    {
>+                        ASSERT(name.length() == 7);
>+                        return &BuiltInFunction::kFunction_dFdx_3B;
>+                    }
>+                    break;
>+                }
>+                case 0x083b9d7au:
>+                {
>+                    if (name.beginsWith(BuiltInName::dFdy))
>+                    {
>+                        ASSERT(name.length() == 7);
>+                        return &BuiltInFunction::kFunction_dFdy_2B;
>+                    }
>+                    break;
>+                }
>+                case 0x083c0d13u:
>+                {
>+                    if (name.beginsWith(BuiltInName::dFdx))
>+                    {
>+                        ASSERT(name.length() == 7);
>+                        return &BuiltInFunction::kFunction_dFdx_2B;
>+                    }
>+                    break;
>+                }
>+                case 0x083c6796u:
>+                {
>+                    if (name.beginsWith(BuiltInName::dFdx))
>+                    {
>+                        ASSERT(name.length() == 7);
>+                        return &BuiltInFunction::kFunction_dFdx_1B;
>+                    }
>+                    break;
>+                }
>+                case 0x083ced8bu:
>+                {
>+                    if (name.beginsWith(BuiltInName::dFdy))
>+                    {
>+                        ASSERT(name.length() == 7);
>+                        return &BuiltInFunction::kFunction_dFdy_3B;
>+                    }
>+                    break;
>+                }
>+                case 0x0c483e39u:
>+                {
>+                    if (name.beginsWith(BuiltInName::fwidth))
>+                    {
>+                        ASSERT(name.length() == 9);
>+                        return &BuiltInFunction::kFunction_fwidth_1B;
>+                    }
>+                    break;
>+                }
>+                case 0x0c4d354eu:
>+                {
>+                    if (name.beginsWith(BuiltInName::fwidth))
>+                    {
>+                        ASSERT(name.length() == 9);
>+                        return &BuiltInFunction::kFunction_fwidth_0B;
>+                    }
>+                    break;
>+                }
>+                case 0x0c4e7b0cu:
>+                {
>+                    if (name.beginsWith(BuiltInName::fwidth))
>+                    {
>+                        ASSERT(name.length() == 9);
>+                        return &BuiltInFunction::kFunction_fwidth_3B;
>+                    }
>+                    break;
>+                }
>+                case 0x0c4fa8b5u:
>+                {
>+                    if (name.beginsWith(BuiltInName::fwidth))
>+                    {
>+                        ASSERT(name.length() == 9);
>+                        return &BuiltInFunction::kFunction_fwidth_2B;
>+                    }
>+                    break;
>+                }
>+                case 0x0e7013d9u:
>+                {
>+                    if (name.beginsWith(BuiltInName::texture))
>+                    {
>+                        ASSERT(name.length() == 14);
>+                        return &BuiltInFunction::kFunction_texture_0T2B0B;
>+                    }
>+                    break;
>+                }
>+                case 0x0e70d11du:
>+                {
>+                    if (name.beginsWith(BuiltInName::texture))
>+                    {
>+                        ASSERT(name.length() == 14);
>+                        return &BuiltInFunction::kFunction_texture_0W1B0B;
>+                    }
>+                    break;
>+                }
>+                case 0x0e70eff9u:
>+                {
>+                    if (name.beginsWith(BuiltInName::texture))
>+                    {
>+                        ASSERT(name.length() == 14);
>+                        return &BuiltInFunction::kFunction_texture_0X2B0B;
>+                    }
>+                    break;
>+                }
>+                case 0x0e716d8fu:
>+                {
>+                    if (name == BuiltInName::texture_0c2B0B)
>+                    {
>+                        return &BuiltInFunction::kFunction_texture_0c2B0B;
>+                    }
>+                    break;
>+                }
>+                case 0x0e71856cu:
>+                {
>+                    if (name.beginsWith(BuiltInName::texture))
>+                    {
>+                        ASSERT(name.length() == 14);
>+                        return &BuiltInFunction::kFunction_texture_0M1B0B;
>+                    }
>+                    break;
>+                }
>+                case 0x0e723219u:
>+                {
>+                    if (name.beginsWith(BuiltInName::texture))
>+                    {
>+                        ASSERT(name.length() == 14);
>+                        return &BuiltInFunction::kFunction_texture_0L1B0B;
>+                    }
>+                    break;
>+                }
>+                case 0x0e734ff8u:
>+                {
>+                    if (name.beginsWith(BuiltInName::texture))
>+                    {
>+                        ASSERT(name.length() == 14);
>+                        return &BuiltInFunction::kFunction_texture_0Z2B0B;
>+                    }
>+                    break;
>+                }
>+                case 0x0e7386b0u:
>+                {
>+                    if (name == BuiltInName::texture_0Q1B0B)
>+                    {
>+                        return &BuiltInFunction::kFunction_texture_0Q1B0B;
>+                    }
>+                    break;
>+                }
>+                case 0x0e740087u:
>+                {
>+                    if (name == BuiltInName::texture_0d3B0B)
>+                    {
>+                        return &BuiltInFunction::kFunction_texture_0d3B0B;
>+                    }
>+                    break;
>+                }
>+                case 0x0e742a66u:
>+                {
>+                    if (name.beginsWith(BuiltInName::texture))
>+                    {
>+                        ASSERT(name.length() == 14);
>+                        return &BuiltInFunction::kFunction_texture_0K2B0B;
>+                    }
>+                    break;
>+                }
>+                case 0x0e75399eu:
>+                {
>+                    if (name.beginsWith(BuiltInName::texture))
>+                    {
>+                        ASSERT(name.length() == 14);
>+                        return &BuiltInFunction::kFunction_texture_0S2B0B;
>+                    }
>+                    break;
>+                }
>+                case 0x0e755c73u:
>+                {
>+                    if (name.beginsWith(BuiltInName::texture))
>+                    {
>+                        ASSERT(name.length() == 14);
>+                        return &BuiltInFunction::kFunction_texture_0Y2B0B;
>+                    }
>+                    break;
>+                }
>+                case 0x0e75d15fu:
>+                {
>+                    if (name.beginsWith(BuiltInName::texture))
>+                    {
>+                        ASSERT(name.length() == 14);
>+                        return &BuiltInFunction::kFunction_texture_0J2B0B;
>+                    }
>+                    break;
>+                }
>+                case 0x0e76e7c1u:
>+                {
>+                    if (name.beginsWith(BuiltInName::texture))
>+                    {
>+                        ASSERT(name.length() == 14);
>+                        return &BuiltInFunction::kFunction_texture_0H1B0B;
>+                    }
>+                    break;
>+                }
>+                case 0x0e7720c0u:
>+                {
>+                    if (name.beginsWith(BuiltInName::texture))
>+                    {
>+                        ASSERT(name.length() == 14);
>+                        return &BuiltInFunction::kFunction_texture_0R2B0B;
>+                    }
>+                    break;
>+                }
>+                case 0x0e77d1c8u:
>+                {
>+                    if (name.beginsWith(BuiltInName::texture))
>+                    {
>+                        ASSERT(name.length() == 14);
>+                        return &BuiltInFunction::kFunction_texture_0I2B0B;
>+                    }
>+                    break;
>+                }
>+                case 0x16900558u:
>+                {
>+                    if (name.beginsWith(BuiltInName::textureProj))
>+                    {
>+                        ASSERT(name.length() == 18);
>+                        return &BuiltInFunction::kFunction_textureProj_0L3B0B;
>+                    }
>+                    break;
>+                }
>+                case 0x1690a3cfu:
>+                {
>+                    if (name.beginsWith(BuiltInName::textureProj))
>+                    {
>+                        ASSERT(name.length() == 18);
>+                        return &BuiltInFunction::kFunction_textureProj_0W3B0B;
>+                    }
>+                    break;
>+                }
>+                case 0x1690ae9fu:
>+                {
>+                    if (name.beginsWith(BuiltInName::textureProj))
>+                    {
>+                        ASSERT(name.length() == 18);
>+                        return &BuiltInFunction::kFunction_textureProj_0M3B0B;
>+                    }
>+                    break;
>+                }
>+                case 0x1691c2edu:
>+                {
>+                    if (name.beginsWith(BuiltInName::textureProj))
>+                    {
>+                        ASSERT(name.length() == 18);
>+                        return &BuiltInFunction::kFunction_textureProj_0M2B0B;
>+                    }
>+                    break;
>+                }
>+                case 0x16925badu:
>+                {
>+                    if (name.beginsWith(BuiltInName::textureProj))
>+                    {
>+                        ASSERT(name.length() == 18);
>+                        return &BuiltInFunction::kFunction_textureProj_0Q3B0B;
>+                    }
>+                    break;
>+                }
>+                case 0x1692d089u:
>+                {
>+                    if (name.beginsWith(BuiltInName::textureProj))
>+                    {
>+                        ASSERT(name.length() == 18);
>+                        return &BuiltInFunction::kFunction_textureProj_0c3B0B;
>+                    }
>+                    break;
>+                }
>+                case 0x169350d8u:
>+                {
>+                    if (name.beginsWith(BuiltInName::textureProj))
>+                    {
>+                        ASSERT(name.length() == 18);
>+                        return &BuiltInFunction::kFunction_textureProj_0I3B0B;
>+                    }
>+                    break;
>+                }
>+                case 0x16939955u:
>+                {
>+                    if (name == BuiltInName::textureProj_0Q2B0B)
>+                    {
>+                        return &BuiltInFunction::kFunction_textureProj_0Q2B0B;
>+                    }
>+                    break;
>+                }
>+                case 0x1694622au:
>+                {
>+                    if (name == BuiltInName::textureProj_0R3B0B)
>+                    {
>+                        return &BuiltInFunction::kFunction_textureProj_0R3B0B;
>+                    }
>+                    break;
>+                }
>+                case 0x169465e2u:
>+                {
>+                    if (name.beginsWith(BuiltInName::textureProj))
>+                    {
>+                        ASSERT(name.length() == 18);
>+                        return &BuiltInFunction::kFunction_textureProj_0W2B0B;
>+                    }
>+                    break;
>+                }
>+                case 0x1695f573u:
>+                {
>+                    if (name == BuiltInName::textureProj_0X3B0B)
>+                    {
>+                        return &BuiltInFunction::kFunction_textureProj_0X3B0B;
>+                    }
>+                    break;
>+                }
>+                case 0x16965fd9u:
>+                {
>+                    if (name.beginsWith(BuiltInName::textureProj))
>+                    {
>+                        ASSERT(name.length() == 18);
>+                        return &BuiltInFunction::kFunction_textureProj_0H3B0B;
>+                    }
>+                    break;
>+                }
>+                case 0x1696f029u:
>+                {
>+                    if (name.beginsWith(BuiltInName::textureProj))
>+                    {
>+                        ASSERT(name.length() == 18);
>+                        return &BuiltInFunction::kFunction_textureProj_0H2B0B;
>+                    }
>+                    break;
>+                }
>+                case 0x1697e9b9u:
>+                {
>+                    if (name.beginsWith(BuiltInName::textureProj))
>+                    {
>+                        ASSERT(name.length() == 18);
>+                        return &BuiltInFunction::kFunction_textureProj_0L2B0B;
>+                    }
>+                    break;
>+                }
>+                case 0x1ab0a952u:
>+                {
>+                    if (name == BuiltInName::textureOffset_0X2B2C0B)
>+                    {
>+                        return &BuiltInFunction::kFunction_textureOffset_0X2B2C0B;
>+                    }
>+                    break;
>+                }
>+                case 0x1ab29724u:
>+                {
>+                    if (name == BuiltInName::textureOffset_0Z2B1C0B)
>+                    {
>+                        return &BuiltInFunction::kFunction_textureOffset_0Z2B1C0B;
>+                    }
>+                    break;
>+                }
>+                case 0x1ab55c9du:
>+                {
>+                    if (name == BuiltInName::textureOffset_0Q1B1C0B)
>+                    {
>+                        return &BuiltInFunction::kFunction_textureOffset_0Q1B1C0B;
>+                    }
>+                    break;
>+                }
>+                case 0x1ab5753fu:
>+                {
>+                    if (name == BuiltInName::textureOffset_0T2B1C0B)
>+                    {
>+                        return &BuiltInFunction::kFunction_textureOffset_0T2B1C0B;
>+                    }
>+                    break;
>+                }
>+                case 0x1ab57bbcu:
>+                {
>+                    if (name == BuiltInName::textureOffset_0H1B1C0B)
>+                    {
>+                        return &BuiltInFunction::kFunction_textureOffset_0H1B1C0B;
>+                    }
>+                    break;
>+                }
>+                case 0x1ab59b6cu:
>+                {
>+                    if (name == BuiltInName::textureOffset_0I2B2C0B)
>+                    {
>+                        return &BuiltInFunction::kFunction_textureOffset_0I2B2C0B;
>+                    }
>+                    break;
>+                }
>+                case 0x1ab5d795u:
>+                {
>+                    if (name == BuiltInName::textureOffset_0W1B1C0B)
>+                    {
>+                        return &BuiltInFunction::kFunction_textureOffset_0W1B1C0B;
>+                    }
>+                    break;
>+                }
>+                case 0x1ab63ddau:
>+                {
>+                    if (name == BuiltInName::textureOffset_0K2B1C0B)
>+                    {
>+                        return &BuiltInFunction::kFunction_textureOffset_0K2B1C0B;
>+                    }
>+                    break;
>+                }
>+                case 0x1ab63f72u:
>+                {
>+                    if (name == BuiltInName::textureOffset_0R2B2C0B)
>+                    {
>+                        return &BuiltInFunction::kFunction_textureOffset_0R2B2C0B;
>+                    }
>+                    break;
>+                }
>+                case 0x1ab7e533u:
>+                {
>+                    if (name == BuiltInName::textureOffset_0c2B1C0B)
>+                    {
>+                        return &BuiltInFunction::kFunction_textureOffset_0c2B1C0B;
>+                    }
>+                    break;
>+                }
>+                case 0x22d11d67u:
>+                {
>+                    if (name == BuiltInName::textureProjOffset_0Q3B1C0B)
>+                    {
>+                        return &BuiltInFunction::kFunction_textureProjOffset_0Q3B1C0B;
>+                    }
>+                    break;
>+                }
>+                case 0x22d1425bu:
>+                {
>+                    if (name == BuiltInName::textureProjOffset_0W2B1C0B)
>+                    {
>+                        return &BuiltInFunction::kFunction_textureProjOffset_0W2B1C0B;
>+                    }
>+                    break;
>+                }
>+                case 0x22d17100u:
>+                {
>+                    if (name == BuiltInName::textureProjOffset_0W3B1C0B)
>+                    {
>+                        return &BuiltInFunction::kFunction_textureProjOffset_0W3B1C0B;
>+                    }
>+                    break;
>+                }
>+                case 0x22d1ca54u:
>+                {
>+                    if (name == BuiltInName::textureProjOffset_0c3B1C0B)
>+                    {
>+                        return &BuiltInFunction::kFunction_textureProjOffset_0c3B1C0B;
>+                    }
>+                    break;
>+                }
>+                case 0x22d6074cu:
>+                {
>+                    if (name == BuiltInName::textureProjOffset_0R3B2C0B)
>+                    {
>+                        return &BuiltInFunction::kFunction_textureProjOffset_0R3B2C0B;
>+                    }
>+                    break;
>+                }
>+                case 0x22d60cd3u:
>+                {
>+                    if (name == BuiltInName::textureProjOffset_0X3B2C0B)
>+                    {
>+                        return &BuiltInFunction::kFunction_textureProjOffset_0X3B2C0B;
>+                    }
>+                    break;
>+                }
>+                case 0x22d60e91u:
>+                {
>+                    if (name == BuiltInName::textureProjOffset_0Q2B1C0B)
>+                    {
>+                        return &BuiltInFunction::kFunction_textureProjOffset_0Q2B1C0B;
>+                    }
>+                    break;
>+                }
>+                case 0x22d62e81u:
>+                {
>+                    if (name == BuiltInName::textureProjOffset_0H3B1C0B)
>+                    {
>+                        return &BuiltInFunction::kFunction_textureProjOffset_0H3B1C0B;
>+                    }
>+                    break;
>+                }
>+                case 0x22d6b2e8u:
>+                {
>+                    if (name == BuiltInName::textureProjOffset_0I3B2C0B)
>+                    {
>+                        return &BuiltInFunction::kFunction_textureProjOffset_0I3B2C0B;
>+                    }
>+                    break;
>+                }
>+                case 0x22d6ee53u:
>+                {
>+                    if (name == BuiltInName::textureProjOffset_0H2B1C0B)
>+                    {
>+                        return &BuiltInFunction::kFunction_textureProjOffset_0H2B1C0B;
>+                    }
>+                    break;
>+                }
>+                case 0x7e645c89u:
>+                {
>+                    if (name == BuiltInName::gl_FragDepth)
>+                    {
>+                        return &BuiltInVariable::kVar_gl_FragDepth;
>+                    }
>+                    break;
>+                }
>+            }
>+        }
>+        if (mShaderType == GL_VERTEX_SHADER)
>+        {
>+            switch (nameHash)
>+            {
>+                case 0x7e5f8987u:
>+                {
>+                    if (name == BuiltInName::gl_VertexID)
>+                    {
>+                        return &BuiltInVariable::kVar_gl_VertexID;
>+                    }
>+                    break;
>+                }
>+                case 0x7e6be47fu:
>+                {
>+                    if (name == BuiltInName::gl_InstanceID)
>+                    {
>+                        return &BuiltInVariable::kVar_gl_InstanceID;
>+                    }
>+                    break;
>+                }
>+            }
>+        }
>+        if ((mShaderType == GL_VERTEX_SHADER) && (mResources.ANGLE_multi_draw))
>+        {
>+            switch (nameHash)
>+            {
>+                case 0x7e4c3c42u:
>+                {
>+                    if (name == BuiltInName::gl_DrawID)
>+                    {
>+                        return &BuiltInVariable::kVar_gl_DrawID;
>+                    }
>+                    break;
>+                }
>+            }
>+        }
>+        if (mResources.OVR_multiview2 && mShaderType != GL_COMPUTE_SHADER)
>+        {
>+            switch (nameHash)
>+            {
>+                case 0x7e6f6de9u:
>+                {
>+                    if (name == BuiltInName::gl_ViewID_OVR)
>+                    {
>+                        return &BuiltInVariable::kVar_gl_ViewID_OVR;
>+                    }
>+                    break;
>+                }
>+            }
>+        }
>+    }
>+    if (shaderVersion == 100)
>+    {
>+        switch (nameHash)
>+        {
>+            case 0x1271689cu:
>+            {
>+                if (name.beginsWith(BuiltInName::texture2D))
>+                {
>+                    ASSERT(name.length() == 14);
>+                    return &BuiltInFunction::kFunction_texture2D_0H1B;
>+                }
>+                break;
>+            }
>+            case 0x127728cau:
>+            {
>+                if (name.beginsWith(BuiltInName::texture2D))
>+                {
>+                    ASSERT(name.length() == 14);
>+                    return &BuiltInFunction::kFunction_texture2D_0L1B;
>+                }
>+                break;
>+            }
>+            case 0x1680927du:
>+            {
>+                if (name.beginsWith(BuiltInName::textureCube))
>+                {
>+                    ASSERT(name.length() == 16);
>+                    return &BuiltInFunction::kFunction_textureCube_0J2B;
>+                }
>+                break;
>+            }
>+            case 0x1a902408u:
>+            {
>+                if (name.beginsWith(BuiltInName::texture2DRect))
>+                {
>+                    ASSERT(name.length() == 18);
>+                    return &BuiltInFunction::kFunction_texture2DRect_0N1B;
>+                }
>+                break;
>+            }
>+            case 0x1a92969du:
>+            {
>+                if (name.beginsWith(BuiltInName::texture2DProj))
>+                {
>+                    ASSERT(name.length() == 18);
>+                    return &BuiltInFunction::kFunction_texture2DProj_0L2B;
>+                }
>+                break;
>+            }
>+            case 0x1a9584eau:
>+            {
>+                if (name.beginsWith(BuiltInName::texture2DProj))
>+                {
>+                    ASSERT(name.length() == 18);
>+                    return &BuiltInFunction::kFunction_texture2DProj_0L3B;
>+                }
>+                break;
>+            }
>+            case 0x1a95bcc7u:
>+            {
>+                if (name.beginsWith(BuiltInName::texture2DProj))
>+                {
>+                    ASSERT(name.length() == 18);
>+                    return &BuiltInFunction::kFunction_texture2DProj_0H3B;
>+                }
>+                break;
>+            }
>+            case 0x1a96b8d6u:
>+            {
>+                if (name.beginsWith(BuiltInName::texture2DProj))
>+                {
>+                    ASSERT(name.length() == 18);
>+                    return &BuiltInFunction::kFunction_texture2DProj_0H2B;
>+                }
>+                break;
>+            }
>+            case 0x20cb8d71u:
>+            {
>+                if (name == BuiltInName::texture2DGradEXT_0H1B1B1B)
>+                {
>+                    return &BuiltInFunction::kFunction_texture2DGradEXT_0H1B1B1B;
>+                }
>+                break;
>+            }
>+            case 0x22b53a05u:
>+            {
>+                if (name.beginsWith(BuiltInName::texture2DRectProj))
>+                {
>+                    ASSERT(name.length() == 22);
>+                    return &BuiltInFunction::kFunction_texture2DRectProj_0N3B;
>+                }
>+                break;
>+            }
>+            case 0x22b65e05u:
>+            {
>+                if (name.beginsWith(BuiltInName::texture2DRectProj))
>+                {
>+                    ASSERT(name.length() == 22);
>+                    return &BuiltInFunction::kFunction_texture2DRectProj_0N2B;
>+                }
>+                break;
>+            }
>+            case 0x24dbd51eu:
>+            {
>+                if (name == BuiltInName::textureCubeGradEXT_0J2B2B2B)
>+                {
>+                    return &BuiltInFunction::kFunction_textureCubeGradEXT_0J2B2B2B;
>+                }
>+                break;
>+            }
>+            case 0x28e995cbu:
>+            {
>+                if (name == BuiltInName::texture2DProjGradEXT_0H3B1B1B)
>+                {
>+                    return &BuiltInFunction::kFunction_texture2DProjGradEXT_0H3B1B1B;
>+                }
>+                break;
>+            }
>+            case 0x28ed5178u:
>+            {
>+                if (name == BuiltInName::texture2DProjGradEXT_0H2B1B1B)
>+                {
>+                    return &BuiltInFunction::kFunction_texture2DProjGradEXT_0H2B1B1B;
>+                }
>+                break;
>+            }
>+            case 0x7e5a0c08u:
>+            {
>+                if (name == BuiltInName::gl_FragData)
>+                {
>+                    // Only initialized if shaderType == GL_FRAGMENT_SHADER
>+                    return mVar_gl_FragData;
>+                }
>+                break;
>+            }
>+            case 0x7e7c38efu:
>+            {
>+                if (name == BuiltInName::gl_FragDepthEXT)
>+                {
>+                    // Only initialized if (shaderType == GL_FRAGMENT_SHADER) &&
>+                    // (mResources.EXT_frag_depth)
>+                    return mVar_gl_FragDepthEXT;
>+                }
>+                break;
>+            }
>+            case 0x7ea6cdf6u:
>+            {
>+                if (name == BuiltInName::gl_MaxVaryingVectors)
>+                {
>+                    return mVar_gl_MaxVaryingVectors;
>+                }
>+                break;
>+            }
>+            case 0x7ebce486u:
>+            {
>+                if (name == BuiltInName::gl_SecondaryFragDataEXT)
>+                {
>+                    // Only initialized if (shaderType == GL_FRAGMENT_SHADER) &&
>+                    // (mResources.EXT_blend_func_extended)
>+                    return mVar_gl_SecondaryFragDataEXT;
>+                }
>+                break;
>+            }
>+        }
>+        if (mShaderType == GL_FRAGMENT_SHADER)
>+        {
>+            switch (nameHash)
>+            {
>+                case 0x08394c88u:
>+                {
>+                    if (name.beginsWith(BuiltInName::dFdyExt))
>+                    {
>+                        ASSERT(name.length() == 7);
>+                        return &BuiltInFunction::kFunction_dFdyExt_0B;
>+                    }
>+                    break;
>+                }
>+                case 0x08398819u:
>+                {
>+                    if (name.beginsWith(BuiltInName::dFdxExt))
>+                    {
>+                        ASSERT(name.length() == 7);
>+                        return &BuiltInFunction::kFunction_dFdxExt_0B;
>+                    }
>+                    break;
>+                }
>+                case 0x083a7081u:
>+                {
>+                    if (name.beginsWith(BuiltInName::dFdyExt))
>+                    {
>+                        ASSERT(name.length() == 7);
>+                        return &BuiltInFunction::kFunction_dFdyExt_1B;
>+                    }
>+                    break;
>+                }
>+                case 0x083abe52u:
>+                {
>+                    if (name.beginsWith(BuiltInName::dFdxExt))
>+                    {
>+                        ASSERT(name.length() == 7);
>+                        return &BuiltInFunction::kFunction_dFdxExt_3B;
>+                    }
>+                    break;
>+                }
>+                case 0x083b9d7au:
>+                {
>+                    if (name.beginsWith(BuiltInName::dFdyExt))
>+                    {
>+                        ASSERT(name.length() == 7);
>+                        return &BuiltInFunction::kFunction_dFdyExt_2B;
>+                    }
>+                    break;
>+                }
>+                case 0x083c0d13u:
>+                {
>+                    if (name.beginsWith(BuiltInName::dFdxExt))
>+                    {
>+                        ASSERT(name.length() == 7);
>+                        return &BuiltInFunction::kFunction_dFdxExt_2B;
>+                    }
>+                    break;
>+                }
>+                case 0x083c6796u:
>+                {
>+                    if (name.beginsWith(BuiltInName::dFdxExt))
>+                    {
>+                        ASSERT(name.length() == 7);
>+                        return &BuiltInFunction::kFunction_dFdxExt_1B;
>+                    }
>+                    break;
>+                }
>+                case 0x083ced8bu:
>+                {
>+                    if (name.beginsWith(BuiltInName::dFdyExt))
>+                    {
>+                        ASSERT(name.length() == 7);
>+                        return &BuiltInFunction::kFunction_dFdyExt_3B;
>+                    }
>+                    break;
>+                }
>+                case 0x0c483e39u:
>+                {
>+                    if (name.beginsWith(BuiltInName::fwidthExt))
>+                    {
>+                        ASSERT(name.length() == 9);
>+                        return &BuiltInFunction::kFunction_fwidthExt_1B;
>+                    }
>+                    break;
>+                }
>+                case 0x0c4d354eu:
>+                {
>+                    if (name.beginsWith(BuiltInName::fwidthExt))
>+                    {
>+                        ASSERT(name.length() == 9);
>+                        return &BuiltInFunction::kFunction_fwidthExt_0B;
>+                    }
>+                    break;
>+                }
>+                case 0x0c4e7b0cu:
>+                {
>+                    if (name.beginsWith(BuiltInName::fwidthExt))
>+                    {
>+                        ASSERT(name.length() == 9);
>+                        return &BuiltInFunction::kFunction_fwidthExt_3B;
>+                    }
>+                    break;
>+                }
>+                case 0x0c4fa8b5u:
>+                {
>+                    if (name.beginsWith(BuiltInName::fwidthExt))
>+                    {
>+                        ASSERT(name.length() == 9);
>+                        return &BuiltInFunction::kFunction_fwidthExt_2B;
>+                    }
>+                    break;
>+                }
>+                case 0x12846ba6u:
>+                {
>+                    if (name.beginsWith(BuiltInName::texture2D))
>+                    {
>+                        ASSERT(name.length() == 16);
>+                        return &BuiltInFunction::kFunction_texture2D_0H1B0B;
>+                    }
>+                    break;
>+                }
>+                case 0x1696a314u:
>+                {
>+                    if (name.beginsWith(BuiltInName::textureCube))
>+                    {
>+                        ASSERT(name.length() == 18);
>+                        return &BuiltInFunction::kFunction_textureCube_0J2B0B;
>+                    }
>+                    break;
>+                }
>+                case 0x1aa197a7u:
>+                {
>+                    if (name.beginsWith(BuiltInName::texture2DProj))
>+                    {
>+                        ASSERT(name.length() == 20);
>+                        return &BuiltInFunction::kFunction_texture2DProj_0H3B0B;
>+                    }
>+                    break;
>+                }
>+                case 0x1aa44389u:
>+                {
>+                    if (name == BuiltInName::texture2DProj_0H2B0B)
>+                    {
>+                        return &BuiltInFunction::kFunction_texture2DProj_0H2B0B;
>+                    }
>+                    break;
>+                }
>+                case 0x1eb43b6cu:
>+                {
>+                    if (name == BuiltInName::texture2DLodEXT_0H1B0B)
>+                    {
>+                        return &BuiltInFunction::kFunction_texture2DLodEXT_0H1B0B;
>+                    }
>+                    break;
>+                }
>+                case 0x22c206a5u:
>+                {
>+                    if (name.beginsWith(BuiltInName::textureCubeLodEXT))
>+                    {
>+                        ASSERT(name.length() == 24);
>+                        return &BuiltInFunction::kFunction_textureCubeLodEXT_0J2B0B;
>+                    }
>+                    break;
>+                }
>+                case 0x26d1d3beu:
>+                {
>+                    if (name.beginsWith(BuiltInName::texture2DProjLodEXT))
>+                    {
>+                        ASSERT(name.length() == 26);
>+                        return &BuiltInFunction::kFunction_texture2DProjLodEXT_0H3B0B;
>+                    }
>+                    break;
>+                }
>+                case 0x26d60d82u:
>+                {
>+                    if (name == BuiltInName::texture2DProjLodEXT_0H2B0B)
>+                    {
>+                        return &BuiltInFunction::kFunction_texture2DProjLodEXT_0H2B0B;
>+                    }
>+                    break;
>+                }
>+                case 0x7e60c438u:
>+                {
>+                    if (name == BuiltInName::gl_FragColor)
>+                    {
>+                        return &BuiltInVariable::kVar_gl_FragColor;
>+                    }
>+                    break;
>+                }
>+            }
>+        }
>+        if (mShaderType == GL_VERTEX_SHADER)
>+        {
>+            switch (nameHash)
>+            {
>+                case 0x18986fc2u:
>+                {
>+                    if (name == BuiltInName::texture2DLod_0H1B0B)
>+                    {
>+                        return &BuiltInFunction::kFunction_texture2DLod_0H1B0B;
>+                    }
>+                    break;
>+                }
>+                case 0x1cac1f4du:
>+                {
>+                    if (name.beginsWith(BuiltInName::textureCubeLod))
>+                    {
>+                        ASSERT(name.length() == 21);
>+                        return &BuiltInFunction::kFunction_textureCubeLod_0J2B0B;
>+                    }
>+                    break;
>+                }
>+                case 0x20b8a0c3u:
>+                {
>+                    if (name.beginsWith(BuiltInName::texture2DProjLod))
>+                    {
>+                        ASSERT(name.length() == 23);
>+                        return &BuiltInFunction::kFunction_texture2DProjLod_0H3B0B;
>+                    }
>+                    break;
>+                }
>+                case 0x20bc6337u:
>+                {
>+                    if (name == BuiltInName::texture2DProjLod_0H2B0B)
>+                    {
>+                        return &BuiltInFunction::kFunction_texture2DProjLod_0H2B0B;
>+                    }
>+                    break;
>+                }
>+            }
>+        }
>+        if ((mShaderType == GL_FRAGMENT_SHADER) && (mResources.EXT_blend_func_extended))
>+        {
>+            switch (nameHash)
>+            {
>+                case 0x7ec56cbeu:
>+                {
>+                    if (name == BuiltInName::gl_SecondaryFragColorEXT)
>+                    {
>+                        return &BuiltInVariable::kVar_gl_SecondaryFragColorEXT;
>+                    }
>+                    break;
>+                }
>+            }
>+        }
>+        if ((mShaderType == GL_FRAGMENT_SHADER) && (mResources.EXT_shader_framebuffer_fetch))
>+        {
>+            switch (nameHash)
>+            {
>+                case 0x7e7970c2u:
>+                {
>+                    if (name == BuiltInName::gl_LastFragData)
>+                    {
>+                        return mVar_gl_LastFragData;
>+                    }
>+                    break;
>+                }
>+            }
>+        }
>+        if ((mShaderType == GL_FRAGMENT_SHADER) && (mResources.NV_shader_framebuffer_fetch))
>+        {
>+            switch (nameHash)
>+            {
>+                case 0x7e7970c2u:
>+                {
>+                    if (name == BuiltInName::gl_LastFragData)
>+                    {
>+                        return mVar_gl_LastFragDataNV;
>+                    }
>+                    break;
>+                }
>+                case 0x7e802016u:
>+                {
>+                    if (name == BuiltInName::gl_LastFragColor)
>+                    {
>+                        return &BuiltInVariable::kVar_gl_LastFragColor;
>+                    }
>+                    break;
>+                }
>+            }
>+        }
>+        if ((mShaderType == GL_FRAGMENT_SHADER) &&
>+            (!mResources.EXT_shader_framebuffer_fetch && !mResources.NV_shader_framebuffer_fetch &&
>+             mResources.ARM_shader_framebuffer_fetch))
>+        {
>+            switch (nameHash)
>+            {
>+                case 0x7e9f0a88u:
>+                {
>+                    if (name == BuiltInName::gl_LastFragColorARM)
>+                    {
>+                        return &BuiltInVariable::kVar_gl_LastFragColorARM;
>+                    }
>+                    break;
>+                }
>+            }
>+        }
>+        if ((mShaderType == GL_VERTEX_SHADER) && (mResources.ANGLE_multi_draw))
>+        {
>+            switch (nameHash)
>+            {
>+                case 0x7e4c3c42u:
>+                {
>+                    if (name == BuiltInName::gl_DrawID)
>+                    {
>+                        return &BuiltInVariable::kVar_gl_DrawIDESSL1;
>+                    }
>+                    break;
>+                }
>+            }
>+        }
>+        if (mResources.OVR_multiview2 && mShaderType != GL_COMPUTE_SHADER)
>+        {
>+            switch (nameHash)
>+            {
>+                case 0x7e6f6de9u:
>+                {
>+                    if (name == BuiltInName::gl_ViewID_OVR)
>+                    {
>+                        return &BuiltInVariable::kVar_gl_ViewID_OVRESSL1;
>+                    }
>+                    break;
>+                }
>+            }
>+        }
>+    }
>+    switch (nameHash)
>+    {
>+        case 0x063055e6u:
>+        {
>+            if (name.beginsWith(BuiltInName::log))
>+            {
>+                ASSERT(name.length() == 6);
>+                return &BuiltInFunction::kFunction_log_0B;
>+            }
>+            break;
>+        }
>+        case 0x06307fbcu:
>+        {
>+            if (name.beginsWith(BuiltInName::all))
>+            {
>+                ASSERT(name.length() == 6);
>+                return &BuiltInFunction::kFunction_all_1E;
>+            }
>+            break;
>+        }
>+        case 0x0630826fu:
>+        {
>+            if (name.beginsWith(BuiltInName::notFunc))
>+            {
>+                ASSERT(name.length() == 6);
>+                return &BuiltInFunction::kFunction_notFunc_3E;
>+            }
>+            break;
>+        }
>+        case 0x0630942fu:
>+        {
>+            if (name.beginsWith(BuiltInName::abs))
>+            {
>+                ASSERT(name.length() == 6);
>+                return &BuiltInFunction::kFunction_abs_0B;
>+            }
>+            break;
>+        }
>+        case 0x06309ccau:
>+        {
>+            if (name.beginsWith(BuiltInName::tan))
>+            {
>+                ASSERT(name.length() == 6);
>+                return &BuiltInFunction::kFunction_tan_1B;
>+            }
>+            break;
>+        }
>+        case 0x0630bc6au:
>+        {
>+            if (name.beginsWith(BuiltInName::cos))
>+            {
>+                ASSERT(name.length() == 6);
>+                return &BuiltInFunction::kFunction_cos_2B;
>+            }
>+            break;
>+        }
>+        case 0x0630dce3u:
>+        {
>+            if (name.beginsWith(BuiltInName::log))
>+            {
>+                ASSERT(name.length() == 6);
>+                return &BuiltInFunction::kFunction_log_3B;
>+            }
>+            break;
>+        }
>+        case 0x063194bfu:
>+        {
>+            if (name.beginsWith(BuiltInName::any))
>+            {
>+                ASSERT(name.length() == 6);
>+                return &BuiltInFunction::kFunction_any_1E;
>+            }
>+            break;
>+        }
>+        case 0x0631a1ccu:
>+        {
>+            if (name.beginsWith(BuiltInName::abs))
>+            {
>+                ASSERT(name.length() == 6);
>+                return &BuiltInFunction::kFunction_abs_3B;
>+            }
>+            break;
>+        }
>+        case 0x0631d12au:
>+        {
>+            if (name.beginsWith(BuiltInName::log))
>+            {
>+                ASSERT(name.length() == 6);
>+                return &BuiltInFunction::kFunction_log_2B;
>+            }
>+            break;
>+        }
>+        case 0x06320b8bu:
>+        {
>+            if (name.beginsWith(BuiltInName::cos))
>+            {
>+                ASSERT(name.length() == 6);
>+                return &BuiltInFunction::kFunction_cos_3B;
>+            }
>+            break;
>+        }
>+        case 0x0632fcb3u:
>+        {
>+            if (name.beginsWith(BuiltInName::any))
>+            {
>+                ASSERT(name.length() == 6);
>+                return &BuiltInFunction::kFunction_any_3E;
>+            }
>+            break;
>+        }
>+        case 0x06330b41u:
>+        {
>+            if (name.beginsWith(BuiltInName::log))
>+            {
>+                ASSERT(name.length() == 6);
>+                return &BuiltInFunction::kFunction_log_1B;
>+            }
>+            break;
>+        }
>+        case 0x063314b1u:
>+        {
>+            if (name.beginsWith(BuiltInName::sin))
>+            {
>+                ASSERT(name.length() == 6);
>+                return &BuiltInFunction::kFunction_sin_1B;
>+            }
>+            break;
>+        }
>+        case 0x063415e2u:
>+        {
>+            if (name.beginsWith(BuiltInName::any))
>+            {
>+                ASSERT(name.length() == 6);
>+                return &BuiltInFunction::kFunction_any_2E;
>+            }
>+            break;
>+        }
>+        case 0x06344570u:
>+        {
>+            if (name.beginsWith(BuiltInName::sin))
>+            {
>+                ASSERT(name.length() == 6);
>+                return &BuiltInFunction::kFunction_sin_0B;
>+            }
>+            break;
>+        }
>+        case 0x0634cf9au:
>+        {
>+            if (name.beginsWith(BuiltInName::sin))
>+            {
>+                ASSERT(name.length() == 6);
>+                return &BuiltInFunction::kFunction_sin_3B;
>+            }
>+            break;
>+        }
>+        case 0x06352335u:
>+        {
>+            if (name.beginsWith(BuiltInName::exp))
>+            {
>+                ASSERT(name.length() == 6);
>+                return &BuiltInFunction::kFunction_exp_3B;
>+            }
>+            break;
>+        }
>+        case 0x063595b9u:
>+        {
>+            if (name.beginsWith(BuiltInName::exp))
>+            {
>+                ASSERT(name.length() == 6);
>+                return &BuiltInFunction::kFunction_exp_0B;
>+            }
>+            break;
>+        }
>+        case 0x0635a80fu:
>+        {
>+            if (name.beginsWith(BuiltInName::tan))
>+            {
>+                ASSERT(name.length() == 6);
>+                return &BuiltInFunction::kFunction_tan_2B;
>+            }
>+            break;
>+        }
>+        case 0x0635d3b3u:
>+        {
>+            if (name.beginsWith(BuiltInName::sin))
>+            {
>+                ASSERT(name.length() == 6);
>+                return &BuiltInFunction::kFunction_sin_2B;
>+            }
>+            break;
>+        }
>+        case 0x0635eb79u:
>+        {
>+            if (name.beginsWith(BuiltInName::all))
>+            {
>+                ASSERT(name.length() == 6);
>+                return &BuiltInFunction::kFunction_all_2E;
>+            }
>+            break;
>+        }
>+        case 0x06366a98u:
>+        {
>+            if (name.beginsWith(BuiltInName::cos))
>+            {
>+                ASSERT(name.length() == 6);
>+                return &BuiltInFunction::kFunction_cos_0B;
>+            }
>+            break;
>+        }
>+        case 0x0636b1f1u:
>+        {
>+            if (name.beginsWith(BuiltInName::exp))
>+            {
>+                ASSERT(name.length() == 6);
>+                return &BuiltInFunction::kFunction_exp_1B;
>+            }
>+            break;
>+        }
>+        case 0x0636dda0u:
>+        {
>+            if (name.beginsWith(BuiltInName::all))
>+            {
>+                ASSERT(name.length() == 6);
>+                return &BuiltInFunction::kFunction_all_3E;
>+            }
>+            break;
>+        }
>+        case 0x0636e0efu:
>+        {
>+            if (name.beginsWith(BuiltInName::notFunc))
>+            {
>+                ASSERT(name.length() == 6);
>+                return &BuiltInFunction::kFunction_notFunc_1E;
>+            }
>+            break;
>+        }
>+        case 0x063719d6u:
>+        {
>+            if (name.beginsWith(BuiltInName::tan))
>+            {
>+                ASSERT(name.length() == 6);
>+                return &BuiltInFunction::kFunction_tan_3B;
>+            }
>+            break;
>+        }
>+        case 0x06371aefu:
>+        {
>+            if (name.beginsWith(BuiltInName::abs))
>+            {
>+                ASSERT(name.length() == 6);
>+                return &BuiltInFunction::kFunction_abs_2B;
>+            }
>+            break;
>+        }
>+        case 0x06376a86u:
>+        {
>+            if (name.beginsWith(BuiltInName::notFunc))
>+            {
>+                ASSERT(name.length() == 6);
>+                return &BuiltInFunction::kFunction_notFunc_2E;
>+            }
>+            break;
>+        }
>+        case 0x063770d0u:
>+        {
>+            if (name.beginsWith(BuiltInName::tan))
>+            {
>+                ASSERT(name.length() == 6);
>+                return &BuiltInFunction::kFunction_tan_0B;
>+            }
>+            break;
>+        }
>+        case 0x063770dfu:
>+        {
>+            if (name.beginsWith(BuiltInName::abs))
>+            {
>+                ASSERT(name.length() == 6);
>+                return &BuiltInFunction::kFunction_abs_1B;
>+            }
>+            break;
>+        }
>+        case 0x063786f1u:
>+        {
>+            if (name.beginsWith(BuiltInName::cos))
>+            {
>+                ASSERT(name.length() == 6);
>+                return &BuiltInFunction::kFunction_cos_1B;
>+            }
>+            break;
>+        }
>+        case 0x0637ca4au:
>+        {
>+            if (name.beginsWith(BuiltInName::exp))
>+            {
>+                ASSERT(name.length() == 6);
>+                return &BuiltInFunction::kFunction_exp_2B;
>+            }
>+            break;
>+        }
>+        case 0x06400261u:
>+        {
>+            if (name.beginsWith(BuiltInName::max))
>+            {
>+                ASSERT(name.length() == 8);
>+                return &BuiltInFunction::kFunction_max_2B2B;
>+            }
>+            break;
>+        }
>+        case 0x06403847u:
>+        {
>+            if (name.beginsWith(BuiltInName::mod))
>+            {
>+                ASSERT(name.length() == 8);
>+                return &BuiltInFunction::kFunction_mod_2B0B;
>+            }
>+            break;
>+        }
>+        case 0x064082ceu:
>+        {
>+            if (name.beginsWith(BuiltInName::mod))
>+            {
>+                ASSERT(name.length() == 8);
>+                return &BuiltInFunction::kFunction_mod_1B0B;
>+            }
>+            break;
>+        }
>+        case 0x0640a98au:
>+        {
>+            if (name.beginsWith(BuiltInName::min))
>+            {
>+                ASSERT(name.length() == 8);
>+                return &BuiltInFunction::kFunction_min_2B2B;
>+            }
>+            break;
>+        }
>+        case 0x064107b7u:
>+        {
>+            if (name.beginsWith(BuiltInName::min))
>+            {
>+                ASSERT(name.length() == 8);
>+                return &BuiltInFunction::kFunction_min_1B0B;
>+            }
>+            break;
>+        }
>+        case 0x06415ae6u:
>+        {
>+            if (name.beginsWith(BuiltInName::dot))
>+            {
>+                ASSERT(name.length() == 8);
>+                return &BuiltInFunction::kFunction_dot_3B3B;
>+            }
>+            break;
>+        }
>+        case 0x06418e42u:
>+        {
>+            if (name.beginsWith(BuiltInName::pow))
>+            {
>+                ASSERT(name.length() == 8);
>+                return &BuiltInFunction::kFunction_pow_3B3B;
>+            }
>+            break;
>+        }
>+        case 0x0641ceeeu:
>+        {
>+            if (name.beginsWith(BuiltInName::min))
>+            {
>+                ASSERT(name.length() == 8);
>+                return &BuiltInFunction::kFunction_min_0B0B;
>+            }
>+            break;
>+        }
>+        case 0x0641f1d7u:
>+        {
>+            if (name.beginsWith(BuiltInName::mod))
>+            {
>+                ASSERT(name.length() == 8);
>+                return &BuiltInFunction::kFunction_mod_1B1B;
>+            }
>+            break;
>+        }
>+        case 0x06421555u:
>+        {
>+            if (name.beginsWith(BuiltInName::dot))
>+            {
>+                ASSERT(name.length() == 8);
>+                return &BuiltInFunction::kFunction_dot_1B1B;
>+            }
>+            break;
>+        }
>+        case 0x064225ceu:
>+        {
>+            if (name.beginsWith(BuiltInName::max))
>+            {
>+                ASSERT(name.length() == 8);
>+                return &BuiltInFunction::kFunction_max_3B3B;
>+            }
>+            break;
>+        }
>+        case 0x064274eeu:
>+        {
>+            if (name.beginsWith(BuiltInName::min))
>+            {
>+                ASSERT(name.length() == 8);
>+                return &BuiltInFunction::kFunction_min_1B1B;
>+            }
>+            break;
>+        }
>+        case 0x0642b54du:
>+        {
>+            if (name.beginsWith(BuiltInName::mod))
>+            {
>+                ASSERT(name.length() == 8);
>+                return &BuiltInFunction::kFunction_mod_2B2B;
>+            }
>+            break;
>+        }
>+        case 0x064318fcu:
>+        {
>+            if (name.beginsWith(BuiltInName::pow))
>+            {
>+                ASSERT(name.length() == 8);
>+                return &BuiltInFunction::kFunction_pow_2B2B;
>+            }
>+            break;
>+        }
>+        case 0x0643486cu:
>+        {
>+            if (name.beginsWith(BuiltInName::max))
>+            {
>+                ASSERT(name.length() == 8);
>+                return &BuiltInFunction::kFunction_max_3B0B;
>+            }
>+            break;
>+        }
>+        case 0x06439435u:
>+        {
>+            if (name.beginsWith(BuiltInName::pow))
>+            {
>+                ASSERT(name.length() == 8);
>+                return &BuiltInFunction::kFunction_pow_1B1B;
>+            }
>+            break;
>+        }
>+        case 0x06450933u:
>+        {
>+            if (name.beginsWith(BuiltInName::dot))
>+            {
>+                ASSERT(name.length() == 8);
>+                return &BuiltInFunction::kFunction_dot_0B0B;
>+            }
>+            break;
>+        }
>+        case 0x0645114fu:
>+        {
>+            if (name.beginsWith(BuiltInName::max))
>+            {
>+                ASSERT(name.length() == 8);
>+                return &BuiltInFunction::kFunction_max_1B0B;
>+            }
>+            break;
>+        }
>+        case 0x06457883u:
>+        {
>+            if (name.beginsWith(BuiltInName::mod))
>+            {
>+                ASSERT(name.length() == 8);
>+                return &BuiltInFunction::kFunction_mod_3B3B;
>+            }
>+            break;
>+        }
>+        case 0x0645f03eu:
>+        {
>+            if (name.beginsWith(BuiltInName::mod))
>+            {
>+                ASSERT(name.length() == 8);
>+                return &BuiltInFunction::kFunction_mod_3B0B;
>+            }
>+            break;
>+        }
>+        case 0x0645fd82u:
>+        {
>+            if (name.beginsWith(BuiltInName::min))
>+            {
>+                ASSERT(name.length() == 8);
>+                return &BuiltInFunction::kFunction_min_3B3B;
>+            }
>+            break;
>+        }
>+        case 0x0646155eu:
>+        {
>+            if (name.beginsWith(BuiltInName::max))
>+            {
>+                ASSERT(name.length() == 8);
>+                return &BuiltInFunction::kFunction_max_1B1B;
>+            }
>+            break;
>+        }
>+        case 0x06462cf0u:
>+        {
>+            if (name.beginsWith(BuiltInName::min))
>+            {
>+                ASSERT(name.length() == 8);
>+                return &BuiltInFunction::kFunction_min_2B0B;
>+            }
>+            break;
>+        }
>+        case 0x06463219u:
>+        {
>+            if (name.beginsWith(BuiltInName::dot))
>+            {
>+                ASSERT(name.length() == 8);
>+                return &BuiltInFunction::kFunction_dot_2B2B;
>+            }
>+            break;
>+        }
>+        case 0x06467507u:
>+        {
>+            if (name.beginsWith(BuiltInName::min))
>+            {
>+                ASSERT(name.length() == 8);
>+                return &BuiltInFunction::kFunction_min_3B0B;
>+            }
>+            break;
>+        }
>+        case 0x06468fb1u:
>+        {
>+            if (name.beginsWith(BuiltInName::max))
>+            {
>+                ASSERT(name.length() == 8);
>+                return &BuiltInFunction::kFunction_max_2B0B;
>+            }
>+            break;
>+        }
>+        case 0x0646b392u:
>+        {
>+            if (name.beginsWith(BuiltInName::pow))
>+            {
>+                ASSERT(name.length() == 8);
>+                return &BuiltInFunction::kFunction_pow_0B0B;
>+            }
>+            break;
>+        }
>+        case 0x06472996u:
>+        {
>+            if (name.beginsWith(BuiltInName::max))
>+            {
>+                ASSERT(name.length() == 8);
>+                return &BuiltInFunction::kFunction_max_0B0B;
>+            }
>+            break;
>+        }
>+        case 0x064778feu:
>+        {
>+            if (name.beginsWith(BuiltInName::mod))
>+            {
>+                ASSERT(name.length() == 8);
>+                return &BuiltInFunction::kFunction_mod_0B0B;
>+            }
>+            break;
>+        }
>+        case 0x0650f1c9u:
>+        {
>+            if (name.beginsWith(BuiltInName::mix))
>+            {
>+                ASSERT(name.length() == 10);
>+                return &BuiltInFunction::kFunction_mix_1B1B0B;
>+            }
>+            break;
>+        }
>+        case 0x0653049du:
>+        {
>+            if (name.beginsWith(BuiltInName::mix))
>+            {
>+                ASSERT(name.length() == 10);
>+                return &BuiltInFunction::kFunction_mix_2B2B0B;
>+            }
>+            break;
>+        }
>+        case 0x06549219u:
>+        {
>+            if (name.beginsWith(BuiltInName::mix))
>+            {
>+                ASSERT(name.length() == 10);
>+                return &BuiltInFunction::kFunction_mix_2B2B2B;
>+            }
>+            break;
>+        }
>+        case 0x0655be57u:
>+        {
>+            if (name.beginsWith(BuiltInName::mix))
>+            {
>+                ASSERT(name.length() == 10);
>+                return &BuiltInFunction::kFunction_mix_0B0B0B;
>+            }
>+            break;
>+        }
>+        case 0x06561bdcu:
>+        {
>+            if (name == BuiltInName::mix_3B3B0B)
>+            {
>+                return &BuiltInFunction::kFunction_mix_3B3B0B;
>+            }
>+            break;
>+        }
>+        case 0x06568deeu:
>+        {
>+            if (name == BuiltInName::mix_3B3B3B)
>+            {
>+                return &BuiltInFunction::kFunction_mix_3B3B3B;
>+            }
>+            break;
>+        }
>+        case 0x0657a0a8u:
>+        {
>+            if (name == BuiltInName::mix_1B1B1B)
>+            {
>+                return &BuiltInFunction::kFunction_mix_1B1B1B;
>+            }
>+            break;
>+        }
>+        case 0x08383aacu:
>+        {
>+            if (name.beginsWith(BuiltInName::acos))
>+            {
>+                ASSERT(name.length() == 7);
>+                return &BuiltInFunction::kFunction_acos_3B;
>+            }
>+            break;
>+        }
>+        case 0x0838a17eu:
>+        {
>+            if (name.beginsWith(BuiltInName::ceil))
>+            {
>+                ASSERT(name.length() == 7);
>+                return &BuiltInFunction::kFunction_ceil_2B;
>+            }
>+            break;
>+        }
>+        case 0x0838ac89u:
>+        {
>+            if (name.beginsWith(BuiltInName::exp2))
>+            {
>+                ASSERT(name.length() == 7);
>+                return &BuiltInFunction::kFunction_exp2_3B;
>+            }
>+            break;
>+        }
>+        case 0x0838dc31u:
>+        {
>+            if (name.beginsWith(BuiltInName::sqrt))
>+            {
>+                ASSERT(name.length() == 7);
>+                return &BuiltInFunction::kFunction_sqrt_0B;
>+            }
>+            break;
>+        }
>+        case 0x08396a55u:
>+        {
>+            if (name.beginsWith(BuiltInName::acos))
>+            {
>+                ASSERT(name.length() == 7);
>+                return &BuiltInFunction::kFunction_acos_2B;
>+            }
>+            break;
>+        }
>+        case 0x0839daf2u:
>+        {
>+            if (name.beginsWith(BuiltInName::exp2))
>+            {
>+                ASSERT(name.length() == 7);
>+                return &BuiltInFunction::kFunction_exp2_0B;
>+            }
>+            break;
>+        }
>+        case 0x0839e751u:
>+        {
>+            if (name.beginsWith(BuiltInName::acos))
>+            {
>+                ASSERT(name.length() == 7);
>+                return &BuiltInFunction::kFunction_acos_1B;
>+            }
>+            break;
>+        }
>+        case 0x0839f1a7u:
>+        {
>+            if (name.beginsWith(BuiltInName::ceil))
>+            {
>+                ASSERT(name.length() == 7);
>+                return &BuiltInFunction::kFunction_ceil_3B;
>+            }
>+            break;
>+        }
>+        case 0x083a07bau:
>+        {
>+            if (name.beginsWith(BuiltInName::sqrt))
>+            {
>+                ASSERT(name.length() == 7);
>+                return &BuiltInFunction::kFunction_sqrt_3B;
>+            }
>+            break;
>+        }
>+        case 0x083a7922u:
>+        {
>+            if (name.beginsWith(BuiltInName::ceil))
>+            {
>+                ASSERT(name.length() == 7);
>+                return &BuiltInFunction::kFunction_ceil_0B;
>+            }
>+            break;
>+        }
>+        case 0x083aea5fu:
>+        {
>+            if (name.beginsWith(BuiltInName::atan))
>+            {
>+                ASSERT(name.length() == 7);
>+                return &BuiltInFunction::kFunction_atan_2B;
>+            }
>+            break;
>+        }
>+        case 0x083af266u:
>+        {
>+            if (name.beginsWith(BuiltInName::sign))
>+            {
>+                ASSERT(name.length() == 7);
>+                return &BuiltInFunction::kFunction_sign_1B;
>+            }
>+            break;
>+        }
>+        case 0x083afbc8u:
>+        {
>+            if (name.beginsWith(BuiltInName::acos))
>+            {
>+                ASSERT(name.length() == 7);
>+                return &BuiltInFunction::kFunction_acos_0B;
>+            }
>+            break;
>+        }
>+        case 0x083b2b93u:
>+        {
>+            if (name.beginsWith(BuiltInName::exp2))
>+            {
>+                ASSERT(name.length() == 7);
>+                return &BuiltInFunction::kFunction_exp2_1B;
>+            }
>+            break;
>+        }
>+        case 0x083b577bu:
>+        {
>+            if (name.beginsWith(BuiltInName::sqrt))
>+            {
>+                ASSERT(name.length() == 7);
>+                return &BuiltInFunction::kFunction_sqrt_2B;
>+            }
>+            break;
>+        }
>+        case 0x083b7e52u:
>+        {
>+            if (name.beginsWith(BuiltInName::atan))
>+            {
>+                ASSERT(name.length() == 7);
>+                return &BuiltInFunction::kFunction_atan_1B;
>+            }
>+            break;
>+        }
>+        case 0x083bcf76u:
>+        {
>+            if (name.beginsWith(BuiltInName::sqrt))
>+            {
>+                ASSERT(name.length() == 7);
>+                return &BuiltInFunction::kFunction_sqrt_1B;
>+            }
>+            break;
>+        }
>+        case 0x083c1fc5u:
>+        {
>+            if (name.beginsWith(BuiltInName::sign))
>+            {
>+                ASSERT(name.length() == 7);
>+                return &BuiltInFunction::kFunction_sign_2B;
>+            }
>+            break;
>+        }
>+        case 0x083c624bu:
>+        {
>+            if (name.beginsWith(BuiltInName::atan))
>+            {
>+                ASSERT(name.length() == 7);
>+                return &BuiltInFunction::kFunction_atan_0B;
>+            }
>+            break;
>+        }
>+        case 0x083ca453u:
>+        {
>+            if (name.beginsWith(BuiltInName::asin))
>+            {
>+                ASSERT(name.length() == 7);
>+                return &BuiltInFunction::kFunction_asin_0B;
>+            }
>+            break;
>+        }
>+        case 0x083cc6e1u:
>+        {
>+            if (name.beginsWith(BuiltInName::log2))
>+            {
>+                ASSERT(name.length() == 7);
>+                return &BuiltInFunction::kFunction_log2_2B;
>+            }
>+            break;
>+        }
>+        case 0x083d6eacu:
>+        {
>+            if (name.beginsWith(BuiltInName::sign))
>+            {
>+                ASSERT(name.length() == 7);
>+                return &BuiltInFunction::kFunction_sign_3B;
>+            }
>+            break;
>+        }
>+        case 0x083dac10u:
>+        {
>+            if (name.beginsWith(BuiltInName::atan))
>+            {
>+                ASSERT(name.length() == 7);
>+                return &BuiltInFunction::kFunction_atan_3B;
>+            }
>+            break;
>+        }
>+        case 0x083dd4deu:
>+        {
>+            if (name.beginsWith(BuiltInName::sign))
>+            {
>+                ASSERT(name.length() == 7);
>+                return &BuiltInFunction::kFunction_sign_0B;
>+            }
>+            break;
>+        }
>+        case 0x083df752u:
>+        {
>+            if (name.beginsWith(BuiltInName::asin))
>+            {
>+                ASSERT(name.length() == 7);
>+                return &BuiltInFunction::kFunction_asin_1B;
>+            }
>+            break;
>+        }
>+        case 0x083e1b7au:
>+        {
>+            if (name.beginsWith(BuiltInName::log2))
>+            {
>+                ASSERT(name.length() == 7);
>+                return &BuiltInFunction::kFunction_log2_1B;
>+            }
>+            break;
>+        }
>+        case 0x083e6948u:
>+        {
>+            if (name.beginsWith(BuiltInName::asin))
>+            {
>+                ASSERT(name.length() == 7);
>+                return &BuiltInFunction::kFunction_asin_2B;
>+            }
>+            break;
>+        }
>+        case 0x083f4babu:
>+        {
>+            if (name.beginsWith(BuiltInName::log2))
>+            {
>+                ASSERT(name.length() == 7);
>+                return &BuiltInFunction::kFunction_log2_0B;
>+            }
>+            break;
>+        }
>+        case 0x083f6552u:
>+        {
>+            if (name.beginsWith(BuiltInName::asin))
>+            {
>+                ASSERT(name.length() == 7);
>+                return &BuiltInFunction::kFunction_asin_3B;
>+            }
>+            break;
>+        }
>+        case 0x083f6afdu:
>+        {
>+            if (name.beginsWith(BuiltInName::ceil))
>+            {
>+                ASSERT(name.length() == 7);
>+                return &BuiltInFunction::kFunction_ceil_1B;
>+            }
>+            break;
>+        }
>+        case 0x083f8b90u:
>+        {
>+            if (name.beginsWith(BuiltInName::exp2))
>+            {
>+                ASSERT(name.length() == 7);
>+                return &BuiltInFunction::kFunction_exp2_2B;
>+            }
>+            break;
>+        }
>+        case 0x083fd32eu:
>+        {
>+            if (name.beginsWith(BuiltInName::log2))
>+            {
>+                ASSERT(name.length() == 7);
>+                return &BuiltInFunction::kFunction_log2_3B;
>+            }
>+            break;
>+        }
>+        case 0x08482806u:
>+        {
>+            if (name.beginsWith(BuiltInName::atan))
>+            {
>+                ASSERT(name.length() == 9);
>+                return &BuiltInFunction::kFunction_atan_3B3B;
>+            }
>+            break;
>+        }
>+        case 0x08491304u:
>+        {
>+            if (name.beginsWith(BuiltInName::step))
>+            {
>+                ASSERT(name.length() == 9);
>+                return &BuiltInFunction::kFunction_step_0B1B;
>+            }
>+            break;
>+        }
>+        case 0x0849bcfdu:
>+        {
>+            if (name.beginsWith(BuiltInName::step))
>+            {
>+                ASSERT(name.length() == 9);
>+                return &BuiltInFunction::kFunction_step_2B2B;
>+            }
>+            break;
>+        }
>+        case 0x084aa6bfu:
>+        {
>+            if (name.beginsWith(BuiltInName::atan))
>+            {
>+                ASSERT(name.length() == 9);
>+                return &BuiltInFunction::kFunction_atan_1B1B;
>+            }
>+            break;
>+        }
>+        case 0x084c10fau:
>+        {
>+            if (name.beginsWith(BuiltInName::atan))
>+            {
>+                ASSERT(name.length() == 9);
>+                return &BuiltInFunction::kFunction_atan_0B0B;
>+            }
>+            break;
>+        }
>+        case 0x084c9765u:
>+        {
>+            if (name.beginsWith(BuiltInName::step))
>+            {
>+                ASSERT(name.length() == 9);
>+                return &BuiltInFunction::kFunction_step_1B1B;
>+            }
>+            break;
>+        }
>+        case 0x084e7af1u:
>+        {
>+            if (name.beginsWith(BuiltInName::step))
>+            {
>+                ASSERT(name.length() == 9);
>+                return &BuiltInFunction::kFunction_step_3B3B;
>+            }
>+            break;
>+        }
>+        case 0x084e7be4u:
>+        {
>+            if (name.beginsWith(BuiltInName::step))
>+            {
>+                ASSERT(name.length() == 9);
>+                return &BuiltInFunction::kFunction_step_0B0B;
>+            }
>+            break;
>+        }
>+        case 0x084ec1e6u:
>+        {
>+            if (name.beginsWith(BuiltInName::step))
>+            {
>+                ASSERT(name.length() == 9);
>+                return &BuiltInFunction::kFunction_step_0B3B;
>+            }
>+            break;
>+        }
>+        case 0x084ee899u:
>+        {
>+            if (name.beginsWith(BuiltInName::atan))
>+            {
>+                ASSERT(name.length() == 9);
>+                return &BuiltInFunction::kFunction_atan_2B2B;
>+            }
>+            break;
>+        }
>+        case 0x084feda7u:
>+        {
>+            if (name.beginsWith(BuiltInName::step))
>+            {
>+                ASSERT(name.length() == 9);
>+                return &BuiltInFunction::kFunction_step_0B2B;
>+            }
>+            break;
>+        }
>+        case 0x0a402a9cu:
>+        {
>+            if (name.beginsWith(BuiltInName::fract))
>+            {
>+                ASSERT(name.length() == 8);
>+                return &BuiltInFunction::kFunction_fract_0B;
>+            }
>+            break;
>+        }
>+        case 0x0a41745fu:
>+        {
>+            if (name.beginsWith(BuiltInName::fract))
>+            {
>+                ASSERT(name.length() == 8);
>+                return &BuiltInFunction::kFunction_fract_3B;
>+            }
>+            break;
>+        }
>+        case 0x0a42a596u:
>+        {
>+            if (name.beginsWith(BuiltInName::fract))
>+            {
>+                ASSERT(name.length() == 8);
>+                return &BuiltInFunction::kFunction_fract_2B;
>+            }
>+            break;
>+        }
>+        case 0x0a43465eu:
>+        {
>+            if (name.beginsWith(BuiltInName::floor))
>+            {
>+                ASSERT(name.length() == 8);
>+                return &BuiltInFunction::kFunction_floor_0B;
>+            }
>+            break;
>+        }
>+        case 0x0a43be63u:
>+        {
>+            if (name.beginsWith(BuiltInName::floor))
>+            {
>+                ASSERT(name.length() == 8);
>+                return &BuiltInFunction::kFunction_floor_3B;
>+            }
>+            break;
>+        }
>+        case 0x0a44da6bu:
>+        {
>+            if (name.beginsWith(BuiltInName::floor))
>+            {
>+                ASSERT(name.length() == 8);
>+                return &BuiltInFunction::kFunction_floor_2B;
>+            }
>+            break;
>+        }
>+        case 0x0a45ecc0u:
>+        {
>+            if (name.beginsWith(BuiltInName::floor))
>+            {
>+                ASSERT(name.length() == 8);
>+                return &BuiltInFunction::kFunction_floor_1B;
>+            }
>+            break;
>+        }
>+        case 0x0a4726f2u:
>+        {
>+            if (name.beginsWith(BuiltInName::fract))
>+            {
>+                ASSERT(name.length() == 8);
>+                return &BuiltInFunction::kFunction_fract_1B;
>+            }
>+            break;
>+        }
>+        case 0x0a513a26u:
>+        {
>+            if (name.beginsWith(BuiltInName::equal))
>+            {
>+                ASSERT(name.length() == 10);
>+                return &BuiltInFunction::kFunction_equal_3E3E;
>+            }
>+            break;
>+        }
>+        case 0x0a51bddcu:
>+        {
>+            if (name.beginsWith(BuiltInName::equal))
>+            {
>+                ASSERT(name.length() == 10);
>+                return &BuiltInFunction::kFunction_equal_3B3B;
>+            }
>+            break;
>+        }
>+        case 0x0a527d10u:
>+        {
>+            if (name.beginsWith(BuiltInName::cross))
>+            {
>+                ASSERT(name.length() == 10);
>+                return &BuiltInFunction::kFunction_cross_2B2B;
>+            }
>+            break;
>+        }
>+        case 0x0a542036u:
>+        {
>+            if (name.beginsWith(BuiltInName::equal))
>+            {
>+                ASSERT(name.length() == 10);
>+                return &BuiltInFunction::kFunction_equal_2C2C;
>+            }
>+            break;
>+        }
>+        case 0x0a54c30cu:
>+        {
>+            if (name.beginsWith(BuiltInName::equal))
>+            {
>+                ASSERT(name.length() == 10);
>+                return &BuiltInFunction::kFunction_equal_2B2B;
>+            }
>+            break;
>+        }
>+        case 0x0a554046u:
>+        {
>+            if (name.beginsWith(BuiltInName::equal))
>+            {
>+                ASSERT(name.length() == 10);
>+                return &BuiltInFunction::kFunction_equal_1C1C;
>+            }
>+            break;
>+        }
>+        case 0x0a56874bu:
>+        {
>+            if (name.beginsWith(BuiltInName::equal))
>+            {
>+                ASSERT(name.length() == 10);
>+                return &BuiltInFunction::kFunction_equal_3C3C;
>+            }
>+            break;
>+        }
>+        case 0x0a56fc88u:
>+        {
>+            if (name.beginsWith(BuiltInName::equal))
>+            {
>+                ASSERT(name.length() == 10);
>+                return &BuiltInFunction::kFunction_equal_2E2E;
>+            }
>+            break;
>+        }
>+        case 0x0a5744dcu:
>+        {
>+            if (name.beginsWith(BuiltInName::equal))
>+            {
>+                ASSERT(name.length() == 10);
>+                return &BuiltInFunction::kFunction_equal_1E1E;
>+            }
>+            break;
>+        }
>+        case 0x0a57a8f5u:
>+        {
>+            if (name.beginsWith(BuiltInName::equal))
>+            {
>+                ASSERT(name.length() == 10);
>+                return &BuiltInFunction::kFunction_equal_1B1B;
>+            }
>+            break;
>+        }
>+        case 0x0a619e65u:
>+        {
>+            if (name.beginsWith(BuiltInName::clamp))
>+            {
>+                ASSERT(name.length() == 12);
>+                return &BuiltInFunction::kFunction_clamp_3B3B3B;
>+            }
>+            break;
>+        }
>+        case 0x0a62e0c3u:
>+        {
>+            if (name == BuiltInName::clamp_1B0B0B)
>+            {
>+                return &BuiltInFunction::kFunction_clamp_1B0B0B;
>+            }
>+            break;
>+        }
>+        case 0x0a635d1au:
>+        {
>+            if (name == BuiltInName::clamp_1B1B1B)
>+            {
>+                return &BuiltInFunction::kFunction_clamp_1B1B1B;
>+            }
>+            break;
>+        }
>+        case 0x0a658fc9u:
>+        {
>+            if (name == BuiltInName::clamp_3B0B0B)
>+            {
>+                return &BuiltInFunction::kFunction_clamp_3B0B0B;
>+            }
>+            break;
>+        }
>+        case 0x0a65f6b4u:
>+        {
>+            if (name.beginsWith(BuiltInName::clamp))
>+            {
>+                ASSERT(name.length() == 12);
>+                return &BuiltInFunction::kFunction_clamp_0B0B0B;
>+            }
>+            break;
>+        }
>+        case 0x0a6670deu:
>+        {
>+            if (name.beginsWith(BuiltInName::clamp))
>+            {
>+                ASSERT(name.length() == 12);
>+                return &BuiltInFunction::kFunction_clamp_2B0B0B;
>+            }
>+            break;
>+        }
>+        case 0x0a679af4u:
>+        {
>+            if (name.beginsWith(BuiltInName::clamp))
>+            {
>+                ASSERT(name.length() == 12);
>+                return &BuiltInFunction::kFunction_clamp_2B2B2B;
>+            }
>+            break;
>+        }
>+        case 0x0c48bffau:
>+        {
>+            if (name.beginsWith(BuiltInName::length))
>+            {
>+                ASSERT(name.length() == 9);
>+                return &BuiltInFunction::kFunction_length_0B;
>+            }
>+            break;
>+        }
>+        case 0x0c4924f7u:
>+        {
>+            if (name.beginsWith(BuiltInName::length))
>+            {
>+                ASSERT(name.length() == 9);
>+                return &BuiltInFunction::kFunction_length_3B;
>+            }
>+            break;
>+        }
>+        case 0x0c4a38b6u:
>+        {
>+            if (name.beginsWith(BuiltInName::length))
>+            {
>+                ASSERT(name.length() == 9);
>+                return &BuiltInFunction::kFunction_length_2B;
>+            }
>+            break;
>+        }
>+        case 0x0c4f6cbbu:
>+        {
>+            if (name.beginsWith(BuiltInName::length))
>+            {
>+                ASSERT(name.length() == 9);
>+                return &BuiltInFunction::kFunction_length_1B;
>+            }
>+            break;
>+        }
>+        case 0x0e507f22u:
>+        {
>+            if (name.beginsWith(BuiltInName::degrees))
>+            {
>+                ASSERT(name.length() == 10);
>+                return &BuiltInFunction::kFunction_degrees_2B;
>+            }
>+            break;
>+        }
>+        case 0x0e519bd4u:
>+        {
>+            if (name.beginsWith(BuiltInName::degrees))
>+            {
>+                ASSERT(name.length() == 10);
>+                return &BuiltInFunction::kFunction_degrees_3B;
>+            }
>+            break;
>+        }
>+        case 0x0e52b187u:
>+        {
>+            if (name.beginsWith(BuiltInName::degrees))
>+            {
>+                ASSERT(name.length() == 10);
>+                return &BuiltInFunction::kFunction_degrees_0B;
>+            }
>+            break;
>+        }
>+        case 0x0e52e500u:
>+        {
>+            if (name.beginsWith(BuiltInName::radians))
>+            {
>+                ASSERT(name.length() == 10);
>+                return &BuiltInFunction::kFunction_radians_0B;
>+            }
>+            break;
>+        }
>+        case 0x0e537b7au:
>+        {
>+            if (name.beginsWith(BuiltInName::radians))
>+            {
>+                ASSERT(name.length() == 10);
>+                return &BuiltInFunction::kFunction_radians_3B;
>+            }
>+            break;
>+        }
>+        case 0x0e541edeu:
>+        {
>+            if (name.beginsWith(BuiltInName::degrees))
>+            {
>+                ASSERT(name.length() == 10);
>+                return &BuiltInFunction::kFunction_degrees_1B;
>+            }
>+            break;
>+        }
>+        case 0x0e547683u:
>+        {
>+            if (name.beginsWith(BuiltInName::radians))
>+            {
>+                ASSERT(name.length() == 10);
>+                return &BuiltInFunction::kFunction_radians_2B;
>+            }
>+            break;
>+        }
>+        case 0x0e55ac28u:
>+        {
>+            if (name.beginsWith(BuiltInName::radians))
>+            {
>+                ASSERT(name.length() == 10);
>+                return &BuiltInFunction::kFunction_radians_1B;
>+            }
>+            break;
>+        }
>+        case 0x0e620f44u:
>+        {
>+            if (name.beginsWith(BuiltInName::reflect))
>+            {
>+                ASSERT(name.length() == 12);
>+                return &BuiltInFunction::kFunction_reflect_2B2B;
>+            }
>+            break;
>+        }
>+        case 0x0e631c50u:
>+        {
>+            if (name.beginsWith(BuiltInName::reflect))
>+            {
>+                ASSERT(name.length() == 12);
>+                return &BuiltInFunction::kFunction_reflect_3B3B;
>+            }
>+            break;
>+        }
>+        case 0x0e63358eu:
>+        {
>+            if (name.beginsWith(BuiltInName::reflect))
>+            {
>+                ASSERT(name.length() == 12);
>+                return &BuiltInFunction::kFunction_reflect_0B0B;
>+            }
>+            break;
>+        }
>+        case 0x0e665b7bu:
>+        {
>+            if (name.beginsWith(BuiltInName::reflect))
>+            {
>+                ASSERT(name.length() == 12);
>+                return &BuiltInFunction::kFunction_reflect_1B1B;
>+            }
>+            break;
>+        }
>+        case 0x0e706684u:
>+        {
>+            if (name.beginsWith(BuiltInName::refract))
>+            {
>+                ASSERT(name.length() == 14);
>+                return &BuiltInFunction::kFunction_refract_1B1B0B;
>+            }
>+            break;
>+        }
>+        case 0x0e71a4fcu:
>+        {
>+            if (name.beginsWith(BuiltInName::refract))
>+            {
>+                ASSERT(name.length() == 14);
>+                return &BuiltInFunction::kFunction_refract_2B2B0B;
>+            }
>+            break;
>+        }
>+        case 0x0e71b28du:
>+        {
>+            if (name == BuiltInName::refract_3B3B0B)
>+            {
>+                return &BuiltInFunction::kFunction_refract_3B3B0B;
>+            }
>+            break;
>+        }
>+        case 0x0e73b594u:
>+        {
>+            if (name.beginsWith(BuiltInName::refract))
>+            {
>+                ASSERT(name.length() == 14);
>+                return &BuiltInFunction::kFunction_refract_0B0B0B;
>+            }
>+            break;
>+        }
>+        case 0x1068425fu:
>+        {
>+            if (name.beginsWith(BuiltInName::distance))
>+            {
>+                ASSERT(name.length() == 13);
>+                return &BuiltInFunction::kFunction_distance_3B3B;
>+            }
>+            break;
>+        }
>+        case 0x1068c0bfu:
>+        {
>+            if (name.beginsWith(BuiltInName::distance))
>+            {
>+                ASSERT(name.length() == 13);
>+                return &BuiltInFunction::kFunction_distance_2B2B;
>+            }
>+            break;
>+        }
>+        case 0x1068f060u:
>+        {
>+            if (name.beginsWith(BuiltInName::notEqual))
>+            {
>+                ASSERT(name.length() == 13);
>+                return &BuiltInFunction::kFunction_notEqual_1E1E;
>+            }
>+            break;
>+        }
>+        case 0x10695fe7u:
>+        {
>+            if (name.beginsWith(BuiltInName::notEqual))
>+            {
>+                ASSERT(name.length() == 13);
>+                return &BuiltInFunction::kFunction_notEqual_2E2E;
>+            }
>+            break;
>+        }
>+        case 0x1069b2c0u:
>+        {
>+            if (name.beginsWith(BuiltInName::lessThan))
>+            {
>+                ASSERT(name.length() == 13);
>+                return &BuiltInFunction::kFunction_lessThan_1B1B;
>+            }
>+            break;
>+        }
>+        case 0x106a110cu:
>+        {
>+            if (name.beginsWith(BuiltInName::lessThan))
>+            {
>+                ASSERT(name.length() == 13);
>+                return &BuiltInFunction::kFunction_lessThan_3C3C;
>+            }
>+            break;
>+        }
>+        case 0x106a63f2u:
>+        {
>+            if (name.beginsWith(BuiltInName::notEqual))
>+            {
>+                ASSERT(name.length() == 13);
>+                return &BuiltInFunction::kFunction_notEqual_2C2C;
>+            }
>+            break;
>+        }
>+        case 0x106a713eu:
>+        {
>+            if (name.beginsWith(BuiltInName::lessThan))
>+            {
>+                ASSERT(name.length() == 13);
>+                return &BuiltInFunction::kFunction_lessThan_2B2B;
>+            }
>+            break;
>+        }
>+        case 0x106ade94u:
>+        {
>+            if (name.beginsWith(BuiltInName::notEqual))
>+            {
>+                ASSERT(name.length() == 13);
>+                return &BuiltInFunction::kFunction_notEqual_1B1B;
>+            }
>+            break;
>+        }
>+        case 0x106b25c9u:
>+        {
>+            if (name.beginsWith(BuiltInName::notEqual))
>+            {
>+                ASSERT(name.length() == 13);
>+                return &BuiltInFunction::kFunction_notEqual_1C1C;
>+            }
>+            break;
>+        }
>+        case 0x106b4468u:
>+        {
>+            if (name.beginsWith(BuiltInName::lessThan))
>+            {
>+                ASSERT(name.length() == 13);
>+                return &BuiltInFunction::kFunction_lessThan_1C1C;
>+            }
>+            break;
>+        }
>+        case 0x106b8219u:
>+        {
>+            if (name.beginsWith(BuiltInName::notEqual))
>+            {
>+                ASSERT(name.length() == 13);
>+                return &BuiltInFunction::kFunction_notEqual_3B3B;
>+            }
>+            break;
>+        }
>+        case 0x106bc4fcu:
>+        {
>+            if (name.beginsWith(BuiltInName::notEqual))
>+            {
>+                ASSERT(name.length() == 13);
>+                return &BuiltInFunction::kFunction_notEqual_3E3E;
>+            }
>+            break;
>+        }
>+        case 0x106caf4fu:
>+        {
>+            if (name.beginsWith(BuiltInName::distance))
>+            {
>+                ASSERT(name.length() == 13);
>+                return &BuiltInFunction::kFunction_distance_0B0B;
>+            }
>+            break;
>+        }
>+        case 0x106d2c39u:
>+        {
>+            if (name.beginsWith(BuiltInName::lessThan))
>+            {
>+                ASSERT(name.length() == 13);
>+                return &BuiltInFunction::kFunction_lessThan_3B3B;
>+            }
>+            break;
>+        }
>+        case 0x106dabccu:
>+        {
>+            if (name.beginsWith(BuiltInName::notEqual))
>+            {
>+                ASSERT(name.length() == 13);
>+                return &BuiltInFunction::kFunction_notEqual_2B2B;
>+            }
>+            break;
>+        }
>+        case 0x106eaf65u:
>+        {
>+            if (name.beginsWith(BuiltInName::notEqual))
>+            {
>+                ASSERT(name.length() == 13);
>+                return &BuiltInFunction::kFunction_notEqual_3C3C;
>+            }
>+            break;
>+        }
>+        case 0x106faaeau:
>+        {
>+            if (name.beginsWith(BuiltInName::lessThan))
>+            {
>+                ASSERT(name.length() == 13);
>+                return &BuiltInFunction::kFunction_lessThan_2C2C;
>+            }
>+            break;
>+        }
>+        case 0x106ff564u:
>+        {
>+            if (name.beginsWith(BuiltInName::distance))
>+            {
>+                ASSERT(name.length() == 13);
>+                return &BuiltInFunction::kFunction_distance_1B1B;
>+            }
>+            break;
>+        }
>+        case 0x126235c4u:
>+        {
>+            if (name.beginsWith(BuiltInName::normalize))
>+            {
>+                ASSERT(name.length() == 12);
>+                return &BuiltInFunction::kFunction_normalize_1B;
>+            }
>+            break;
>+        }
>+        case 0x12635a67u:
>+        {
>+            if (name.beginsWith(BuiltInName::normalize))
>+            {
>+                ASSERT(name.length() == 12);
>+                return &BuiltInFunction::kFunction_normalize_2B;
>+            }
>+            break;
>+        }
>+        case 0x1264aa3eu:
>+        {
>+            if (name.beginsWith(BuiltInName::normalize))
>+            {
>+                ASSERT(name.length() == 12);
>+                return &BuiltInFunction::kFunction_normalize_3B;
>+            }
>+            break;
>+        }
>+        case 0x12650243u:
>+        {
>+            if (name.beginsWith(BuiltInName::normalize))
>+            {
>+                ASSERT(name.length() == 12);
>+                return &BuiltInFunction::kFunction_normalize_0B;
>+            }
>+            break;
>+        }
>+        case 0x14888e72u:
>+        {
>+            if (name.beginsWith(BuiltInName::smoothstep))
>+            {
>+                ASSERT(name.length() == 17);
>+                return &BuiltInFunction::kFunction_smoothstep_0B0B1B;
>+            }
>+            break;
>+        }
>+        case 0x1489436du:
>+        {
>+            if (name == BuiltInName::smoothstep_1B1B1B)
>+            {
>+                return &BuiltInFunction::kFunction_smoothstep_1B1B1B;
>+            }
>+            break;
>+        }
>+        case 0x1489bfb6u:
>+        {
>+            if (name == BuiltInName::smoothstep_3B3B3B)
>+            {
>+                return &BuiltInFunction::kFunction_smoothstep_3B3B3B;
>+            }
>+            break;
>+        }
>+        case 0x148a33b9u:
>+        {
>+            if (name.beginsWith(BuiltInName::smoothstep))
>+            {
>+                ASSERT(name.length() == 17);
>+                return &BuiltInFunction::kFunction_smoothstep_2B2B2B;
>+            }
>+            break;
>+        }
>+        case 0x148de9b5u:
>+        {
>+            if (name.beginsWith(BuiltInName::smoothstep))
>+            {
>+                ASSERT(name.length() == 17);
>+                return &BuiltInFunction::kFunction_smoothstep_0B0B0B;
>+            }
>+            break;
>+        }
>+        case 0x148e5c11u:
>+        {
>+            if (name == BuiltInName::smoothstep_0B0B3B)
>+            {
>+                return &BuiltInFunction::kFunction_smoothstep_0B0B3B;
>+            }
>+            break;
>+        }
>+        case 0x148f7bf9u:
>+        {
>+            if (name.beginsWith(BuiltInName::smoothstep))
>+            {
>+                ASSERT(name.length() == 17);
>+                return &BuiltInFunction::kFunction_smoothstep_0B0B2B;
>+            }
>+            break;
>+        }
>+        case 0x1670b92du:
>+        {
>+            if (name.beginsWith(BuiltInName::inversesqrt))
>+            {
>+                ASSERT(name.length() == 14);
>+                return &BuiltInFunction::kFunction_inversesqrt_2B;
>+            }
>+            break;
>+        }
>+        case 0x1671d38eu:
>+        {
>+            if (name.beginsWith(BuiltInName::inversesqrt))
>+            {
>+                ASSERT(name.length() == 14);
>+                return &BuiltInFunction::kFunction_inversesqrt_1B;
>+            }
>+            break;
>+        }
>+        case 0x16772b69u:
>+        {
>+            if (name.beginsWith(BuiltInName::inversesqrt))
>+            {
>+                ASSERT(name.length() == 14);
>+                return &BuiltInFunction::kFunction_inversesqrt_0B;
>+            }
>+            break;
>+        }
>+        case 0x1677857cu:
>+        {
>+            if (name.beginsWith(BuiltInName::inversesqrt))
>+            {
>+                ASSERT(name.length() == 14);
>+                return &BuiltInFunction::kFunction_inversesqrt_3B;
>+            }
>+            break;
>+        }
>+        case 0x16817df9u:
>+        {
>+            if (name.beginsWith(BuiltInName::greaterThan))
>+            {
>+                ASSERT(name.length() == 16);
>+                return &BuiltInFunction::kFunction_greaterThan_1B1B;
>+            }
>+            break;
>+        }
>+        case 0x1681b963u:
>+        {
>+            if (name.beginsWith(BuiltInName::greaterThan))
>+            {
>+                ASSERT(name.length() == 16);
>+                return &BuiltInFunction::kFunction_greaterThan_3C3C;
>+            }
>+            break;
>+        }
>+        case 0x16829d5du:
>+        {
>+            if (name.beginsWith(BuiltInName::greaterThan))
>+            {
>+                ASSERT(name.length() == 16);
>+                return &BuiltInFunction::kFunction_greaterThan_3B3B;
>+            }
>+            break;
>+        }
>+        case 0x16853112u:
>+        {
>+            if (name.beginsWith(BuiltInName::greaterThan))
>+            {
>+                ASSERT(name.length() == 16);
>+                return &BuiltInFunction::kFunction_greaterThan_2B2B;
>+            }
>+            break;
>+        }
>+        case 0x1685d025u:
>+        {
>+            if (name.beginsWith(BuiltInName::greaterThan))
>+            {
>+                ASSERT(name.length() == 16);
>+                return &BuiltInFunction::kFunction_greaterThan_2C2C;
>+            }
>+            break;
>+        }
>+        case 0x1685db46u:
>+        {
>+            if (name.beginsWith(BuiltInName::greaterThan))
>+            {
>+                ASSERT(name.length() == 16);
>+                return &BuiltInFunction::kFunction_greaterThan_1C1C;
>+            }
>+            break;
>+        }
>+        case 0x1690b84du:
>+        {
>+            if (name == BuiltInName::faceforward_3B3B3B)
>+            {
>+                return &BuiltInFunction::kFunction_faceforward_3B3B3B;
>+            }
>+            break;
>+        }
>+        case 0x1691c40bu:
>+        {
>+            if (name == BuiltInName::faceforward_1B1B1B)
>+            {
>+                return &BuiltInFunction::kFunction_faceforward_1B1B1B;
>+            }
>+            break;
>+        }
>+        case 0x1696babeu:
>+        {
>+            if (name == BuiltInName::faceforward_2B2B2B)
>+            {
>+                return &BuiltInFunction::kFunction_faceforward_2B2B2B;
>+            }
>+            break;
>+        }
>+        case 0x1697cde8u:
>+        {
>+            if (name.beginsWith(BuiltInName::faceforward))
>+            {
>+                ASSERT(name.length() == 18);
>+                return &BuiltInFunction::kFunction_faceforward_0B0B0B;
>+            }
>+            break;
>+        }
>+        case 0x1a9481a8u:
>+        {
>+            if (name.beginsWith(BuiltInName::lessThanEqual))
>+            {
>+                ASSERT(name.length() == 18);
>+                return &BuiltInFunction::kFunction_lessThanEqual_2C2C;
>+            }
>+            break;
>+        }
>+        case 0x1a94a164u:
>+        {
>+            if (name.beginsWith(BuiltInName::lessThanEqual))
>+            {
>+                ASSERT(name.length() == 18);
>+                return &BuiltInFunction::kFunction_lessThanEqual_3C3C;
>+            }
>+            break;
>+        }
>+        case 0x1a95c72au:
>+        {
>+            if (name.beginsWith(BuiltInName::lessThanEqual))
>+            {
>+                ASSERT(name.length() == 18);
>+                return &BuiltInFunction::kFunction_lessThanEqual_1B1B;
>+            }
>+            break;
>+        }
>+        case 0x1a9642f7u:
>+        {
>+            if (name.beginsWith(BuiltInName::lessThanEqual))
>+            {
>+                ASSERT(name.length() == 18);
>+                return &BuiltInFunction::kFunction_lessThanEqual_3B3B;
>+            }
>+            break;
>+        }
>+        case 0x1a977782u:
>+        {
>+            if (name.beginsWith(BuiltInName::lessThanEqual))
>+            {
>+                ASSERT(name.length() == 18);
>+                return &BuiltInFunction::kFunction_lessThanEqual_1C1C;
>+            }
>+            break;
>+        }
>+        case 0x1a97d055u:
>+        {
>+            if (name.beginsWith(BuiltInName::lessThanEqual))
>+            {
>+                ASSERT(name.length() == 18);
>+                return &BuiltInFunction::kFunction_lessThanEqual_2B2B;
>+            }
>+            break;
>+        }
>+        case 0x1c993bdfu:
>+        {
>+            if (name.beginsWith(BuiltInName::matrixCompMult))
>+            {
>+                ASSERT(name.length() == 19);
>+                return &BuiltInFunction::kFunction_matrixCompMult_5B5B;
>+            }
>+            break;
>+        }
>+        case 0x1c9b357cu:
>+        {
>+            if (name.beginsWith(BuiltInName::matrixCompMult))
>+            {
>+                ASSERT(name.length() == 19);
>+                return &BuiltInFunction::kFunction_matrixCompMult_FBFB;
>+            }
>+            break;
>+        }
>+        case 0x1c9e72dbu:
>+        {
>+            if (name.beginsWith(BuiltInName::matrixCompMult))
>+            {
>+                ASSERT(name.length() == 19);
>+                return &BuiltInFunction::kFunction_matrixCompMult_ABAB;
>+            }
>+            break;
>+        }
>+        case 0x20ab1dc0u:
>+        {
>+            if (name.beginsWith(BuiltInName::greaterThanEqual))
>+            {
>+                ASSERT(name.length() == 21);
>+                return &BuiltInFunction::kFunction_greaterThanEqual_2C2C;
>+            }
>+            break;
>+        }
>+        case 0x20acdd3au:
>+        {
>+            if (name.beginsWith(BuiltInName::greaterThanEqual))
>+            {
>+                ASSERT(name.length() == 21);
>+                return &BuiltInFunction::kFunction_greaterThanEqual_1B1B;
>+            }
>+            break;
>+        }
>+        case 0x20ad192cu:
>+        {
>+            if (name.beginsWith(BuiltInName::greaterThanEqual))
>+            {
>+                ASSERT(name.length() == 21);
>+                return &BuiltInFunction::kFunction_greaterThanEqual_3C3C;
>+            }
>+            break;
>+        }
>+        case 0x20adfc96u:
>+        {
>+            if (name.beginsWith(BuiltInName::greaterThanEqual))
>+            {
>+                ASSERT(name.length() == 21);
>+                return &BuiltInFunction::kFunction_greaterThanEqual_3B3B;
>+            }
>+            break;
>+        }
>+        case 0x20ae6ffbu:
>+        {
>+            if (name.beginsWith(BuiltInName::greaterThanEqual))
>+            {
>+                ASSERT(name.length() == 21);
>+                return &BuiltInFunction::kFunction_greaterThanEqual_2B2B;
>+            }
>+            break;
>+        }
>+        case 0x20af1dd4u:
>+        {
>+            if (name.beginsWith(BuiltInName::greaterThanEqual))
>+            {
>+                ASSERT(name.length() == 21);
>+                return &BuiltInFunction::kFunction_greaterThanEqual_1C1C;
>+            }
>+            break;
>+        }
>+        case 0x7e6af03cu:
>+        {
>+            if (name == BuiltInName::gl_DepthRange)
>+            {
>+                return mVar_gl_DepthRange;
>+            }
>+            break;
>+        }
>+        case 0x7e8ab02eu:
>+        {
>+            if (name == BuiltInName::gl_MaxDrawBuffers)
>+            {
>+                return mVar_gl_MaxDrawBuffers;
>+            }
>+            break;
>+        }
>+        case 0x7e9ad799u:
>+        {
>+            if (name == BuiltInName::gl_MaxVertexAttribs)
>+            {
>+                return mVar_gl_MaxVertexAttribs;
>+            }
>+            break;
>+        }
>+        case 0x7ebaa8e5u:
>+        {
>+            if (name == BuiltInName::gl_MaxTextureImageUnits)
>+            {
>+                return mVar_gl_MaxTextureImageUnits;
>+            }
>+            break;
>+        }
>+        case 0x7ebeff64u:
>+        {
>+            if (name == BuiltInName::gl_DepthRangeParameters)
>+            {
>+                return mVar_gl_DepthRangeParameters;
>+            }
>+            break;
>+        }
>+        case 0x7ed35151u:
>+        {
>+            if (name == BuiltInName::gl_MaxVertexUniformVectors)
>+            {
>+                return mVar_gl_MaxVertexUniformVectors;
>+            }
>+            break;
>+        }
>+        case 0x7ee45ba1u:
>+        {
>+            if (name == BuiltInName::gl_MaxFragmentUniformVectors)
>+            {
>+                return mVar_gl_MaxFragmentUniformVectors;
>+            }
>+            break;
>+        }
>+        case 0x7eea039au:
>+        {
>+            if (name == BuiltInName::gl_MaxVertexTextureImageUnits)
>+            {
>+                return mVar_gl_MaxVertexTextureImageUnits;
>+            }
>+            break;
>+        }
>+        case 0x7ef1e608u:
>+        {
>+            if (name == BuiltInName::gl_MaxDualSourceDrawBuffersEXT)
>+            {
>+                return mVar_gl_MaxDualSourceDrawBuffersEXT;
>+            }
>+            break;
>+        }
>+        case 0x7ef84293u:
>+        {
>+            if (name == BuiltInName::gl_MaxCombinedTextureImageUnits)
>+            {
>+                return mVar_gl_MaxCombinedTextureImageUnits;
>+            }
>+            break;
>+        }
>+    }
>+    if (mShaderType == GL_FRAGMENT_SHADER)
>+    {
>+        switch (nameHash)
>+        {
>+            case 0x7e64c010u:
>+            {
>+                if (name == BuiltInName::gl_FragCoord)
>+                {
>+                    return &BuiltInVariable::kVar_gl_FragCoord;
>+                }
>+                break;
>+            }
>+            case 0x7e6c2088u:
>+            {
>+                if (name == BuiltInName::gl_PointCoord)
>+                {
>+                    return &BuiltInVariable::kVar_gl_PointCoord;
>+                }
>+                break;
>+            }
>+            case 0x7e73011eu:
>+            {
>+                if (name == BuiltInName::gl_FrontFacing)
>+                {
>+                    return &BuiltInVariable::kVar_gl_FrontFacing;
>+                }
>+                break;
>+            }
>+        }
>+    }
>+    if (mShaderType == GL_VERTEX_SHADER)
>+    {
>+        switch (nameHash)
>+        {
>+            case 0x7e580bc5u:
>+            {
>+                if (name == BuiltInName::gl_Position)
>+                {
>+                    return &BuiltInVariable::kVar_gl_Position;
>+                }
>+                break;
>+            }
>+            case 0x7e63931cu:
>+            {
>+                if (name == BuiltInName::gl_PointSize)
>+                {
>+                    return &BuiltInVariable::kVar_gl_PointSize;
>+                }
>+                break;
>+            }
>+        }
>+    }
>+    return nullptr;
>+}
>+
>+const UnmangledBuiltIn *TSymbolTable::getUnmangledBuiltInForShaderVersion(
>+    const ImmutableString &name,
>+    int shaderVersion)
>+{
>+    if (name.length() > 26)
>+    {
>+        return nullptr;
>+    }
>+    uint32_t nameHash = name.mangledNameHash();
>+    if (shaderVersion >= 310)
>+    {
>+        switch (nameHash)
>+        {
>+            case 0x7e2c727fu:
>+            {
>+                if (name == BuiltInName::ldexp)
>+                {
>+                    return &UnmangledBuiltIns::UNDEFINED;
>+                }
>+                break;
>+            }
>+            case 0x7e2d0692u:
>+            {
>+                if (name == BuiltInName::frexp)
>+                {
>+                    return &UnmangledBuiltIns::UNDEFINED;
>+                }
>+                break;
>+            }
>+            case 0x7e399596u:
>+            {
>+                if (name == BuiltInName::findLSB)
>+                {
>+                    return &UnmangledBuiltIns::UNDEFINED;
>+                }
>+                break;
>+            }
>+            case 0x7e3bdf3fu:
>+            {
>+                if (name == BuiltInName::findMSB)
>+                {
>+                    return &UnmangledBuiltIns::UNDEFINED;
>+                }
>+                break;
>+            }
>+            case 0x7e41283bu:
>+            {
>+                if (name == BuiltInName::bitCount)
>+                {
>+                    return &UnmangledBuiltIns::UNDEFINED;
>+                }
>+                break;
>+            }
>+            case 0x7e4690b3u:
>+            {
>+                if (name == BuiltInName::atomicOr)
>+                {
>+                    return &UnmangledBuiltIns::UNDEFINED;
>+                }
>+                break;
>+            }
>+            case 0x7e4800e3u:
>+            {
>+                if (name == BuiltInName::atomicAdd)
>+                {
>+                    return &UnmangledBuiltIns::UNDEFINED;
>+                }
>+                break;
>+            }
>+            case 0x7e4893a8u:
>+            {
>+                if (name == BuiltInName::atomicMax)
>+                {
>+                    return &UnmangledBuiltIns::UNDEFINED;
>+                }
>+                break;
>+            }
>+            case 0x7e49061fu:
>+            {
>+                if (name == BuiltInName::atomicMin)
>+                {
>+                    return &UnmangledBuiltIns::UNDEFINED;
>+                }
>+                break;
>+            }
>+            case 0x7e4a45b6u:
>+            {
>+                if (name == BuiltInName::imageLoad)
>+                {
>+                    return &UnmangledBuiltIns::UNDEFINED;
>+                }
>+                break;
>+            }
>+            case 0x7e4b6656u:
>+            {
>+                if (name == BuiltInName::imageSize)
>+                {
>+                    return &UnmangledBuiltIns::UNDEFINED;
>+                }
>+                break;
>+            }
>+            case 0x7e4dea77u:
>+            {
>+                if (name == BuiltInName::atomicXor)
>+                {
>+                    return &UnmangledBuiltIns::UNDEFINED;
>+                }
>+                break;
>+            }
>+            case 0x7e4e5094u:
>+            {
>+                if (name == BuiltInName::uaddCarry)
>+                {
>+                    return &UnmangledBuiltIns::UNDEFINED;
>+                }
>+                break;
>+            }
>+            case 0x7e4f21aeu:
>+            {
>+                if (name == BuiltInName::atomicAnd)
>+                {
>+                    return &UnmangledBuiltIns::UNDEFINED;
>+                }
>+                break;
>+            }
>+            case 0x7e5237e1u:
>+            {
>+                if (name == BuiltInName::texelFetch)
>+                {
>+                    return &UnmangledBuiltIns::UNDEFINED;
>+                }
>+                break;
>+            }
>+            case 0x7e5276efu:
>+            {
>+                if (name == BuiltInName::imageStore)
>+                {
>+                    return &UnmangledBuiltIns::UNDEFINED;
>+                }
>+                break;
>+            }
>+            case 0x7e55de86u:
>+            {
>+                if (name == BuiltInName::usubBorrow)
>+                {
>+                    return &UnmangledBuiltIns::UNDEFINED;
>+                }
>+                break;
>+            }
>+            case 0x7e5e217eu:
>+            {
>+                if (name == BuiltInName::textureSize)
>+                {
>+                    return &UnmangledBuiltIns::UNDEFINED;
>+                }
>+                break;
>+            }
>+            case 0x7e6273e5u:
>+            {
>+                if (name == BuiltInName::packSnorm4x8)
>+                {
>+                    return &UnmangledBuiltIns::UNDEFINED;
>+                }
>+                break;
>+            }
>+            case 0x7e62a9a0u:
>+            {
>+                if (name == BuiltInName::imulExtended)
>+                {
>+                    return &UnmangledBuiltIns::UNDEFINED;
>+                }
>+                break;
>+            }
>+            case 0x7e657e29u:
>+            {
>+                if (name == BuiltInName::packUnorm4x8)
>+                {
>+                    return &UnmangledBuiltIns::UNDEFINED;
>+                }
>+                break;
>+            }
>+            case 0x7e6746f4u:
>+            {
>+                if (name == BuiltInName::umulExtended)
>+                {
>+                    return &UnmangledBuiltIns::UNDEFINED;
>+                }
>+                break;
>+            }
>+            case 0x7e69d0dbu:
>+            {
>+                if (name == BuiltInName::memoryBarrier)
>+                {
>+                    return &UnmangledBuiltIns::UNDEFINED;
>+                }
>+                break;
>+            }
>+            case 0x7e6d0f32u:
>+            {
>+                if (name == BuiltInName::textureGather)
>+                {
>+                    return &UnmangledBuiltIns::UNDEFINED;
>+                }
>+                break;
>+            }
>+            case 0x7e6e00a5u:
>+            {
>+                if (name == BuiltInName::atomicCounter)
>+                {
>+                    return &UnmangledBuiltIns::UNDEFINED;
>+                }
>+                break;
>+            }
>+            case 0x7e71963eu:
>+            {
>+                if (name == BuiltInName::unpackUnorm4x8)
>+                {
>+                    return &UnmangledBuiltIns::UNDEFINED;
>+                }
>+                break;
>+            }
>+            case 0x7e73f1d1u:
>+            {
>+                if (name == BuiltInName::unpackSnorm4x8)
>+                {
>+                    return &UnmangledBuiltIns::UNDEFINED;
>+                }
>+                break;
>+            }
>+            case 0x7e75cfb1u:
>+            {
>+                if (name == BuiltInName::atomicExchange)
>+                {
>+                    return &UnmangledBuiltIns::UNDEFINED;
>+                }
>+                break;
>+            }
>+            case 0x7e778ffcu:
>+            {
>+                if (name == BuiltInName::atomicCompSwap)
>+                {
>+                    return &UnmangledBuiltIns::UNDEFINED;
>+                }
>+                break;
>+            }
>+            case 0x7e77c121u:
>+            {
>+                if (name == BuiltInName::bitfieldInsert)
>+                {
>+                    return &UnmangledBuiltIns::UNDEFINED;
>+                }
>+                break;
>+            }
>+            case 0x7e7f2cb2u:
>+            {
>+                if (name == BuiltInName::bitfieldReverse)
>+                {
>+                    return &UnmangledBuiltIns::UNDEFINED;
>+                }
>+                break;
>+            }
>+            case 0x7e7fa0c1u:
>+            {
>+                if (name == BuiltInName::bitfieldExtract)
>+                {
>+                    return &UnmangledBuiltIns::UNDEFINED;
>+                }
>+                break;
>+            }
>+            case 0x7e9269d7u:
>+            {
>+                if (name == BuiltInName::memoryBarrierImage)
>+                {
>+                    return &UnmangledBuiltIns::UNDEFINED;
>+                }
>+                break;
>+            }
>+            case 0x7e9b7f32u:
>+            {
>+                if (name == BuiltInName::memoryBarrierBuffer)
>+                {
>+                    return &UnmangledBuiltIns::UNDEFINED;
>+                }
>+                break;
>+            }
>+            case 0x7e9d8ad9u:
>+            {
>+                if (name == BuiltInName::textureGatherOffset)
>+                {
>+                    return &UnmangledBuiltIns::UNDEFINED;
>+                }
>+                break;
>+            }
>+            case 0x7eb323ddu:
>+            {
>+                if (name == BuiltInName::atomicCounterIncrement)
>+                {
>+                    return &UnmangledBuiltIns::UNDEFINED;
>+                }
>+                break;
>+            }
>+            case 0x7eb6aed0u:
>+            {
>+                if (name == BuiltInName::atomicCounterDecrement)
>+                {
>+                    return &UnmangledBuiltIns::UNDEFINED;
>+                }
>+                break;
>+            }
>+            case 0x7ed5b06bu:
>+            {
>+                if (name == BuiltInName::memoryBarrierAtomicCounter)
>+                {
>+                    return &UnmangledBuiltIns::UNDEFINED;
>+                }
>+                break;
>+            }
>+        }
>+        if (mShaderType == GL_COMPUTE_SHADER)
>+        {
>+            switch (nameHash)
>+            {
>+                case 0x7e39f4e9u:
>+                {
>+                    if (name == BuiltInName::barrier)
>+                    {
>+                        return &UnmangledBuiltIns::UNDEFINED;
>+                    }
>+                    break;
>+                }
>+                case 0x7e93c6b9u:
>+                {
>+                    if (name == BuiltInName::groupMemoryBarrier)
>+                    {
>+                        return &UnmangledBuiltIns::UNDEFINED;
>+                    }
>+                    break;
>+                }
>+                case 0x7e9f4b19u:
>+                {
>+                    if (name == BuiltInName::memoryBarrierShared)
>+                    {
>+                        return &UnmangledBuiltIns::UNDEFINED;
>+                    }
>+                    break;
>+                }
>+            }
>+        }
>+        if (mShaderType == GL_GEOMETRY_SHADER_EXT)
>+        {
>+            switch (nameHash)
>+            {
>+                case 0x7e55adc2u:
>+                {
>+                    if (name == BuiltInName::EmitVertex)
>+                    {
>+                        return &UnmangledBuiltIns::EXT_geometry_shader;
>+                    }
>+                    break;
>+                }
>+                case 0x7e65b2cau:
>+                {
>+                    if (name == BuiltInName::EndPrimitive)
>+                    {
>+                        return &UnmangledBuiltIns::EXT_geometry_shader;
>+                    }
>+                    break;
>+                }
>+            }
>+        }
>+    }
>+    if (shaderVersion >= 300)
>+    {
>+        switch (nameHash)
>+        {
>+            case 0x7e19507bu:
>+            {
>+                if (name == BuiltInName::abs)
>+                {
>+                    return &UnmangledBuiltIns::UNDEFINED;
>+                }
>+                break;
>+            }
>+            case 0x7e1e492du:
>+            {
>+                if (name == BuiltInName::min)
>+                {
>+                    return &UnmangledBuiltIns::UNDEFINED;
>+                }
>+                break;
>+            }
>+            case 0x7e1ea71bu:
>+            {
>+                if (name == BuiltInName::mix)
>+                {
>+                    return &UnmangledBuiltIns::UNDEFINED;
>+                }
>+                break;
>+            }
>+            case 0x7e1ebe0eu:
>+            {
>+                if (name == BuiltInName::max)
>+                {
>+                    return &UnmangledBuiltIns::UNDEFINED;
>+                }
>+                break;
>+            }
>+            case 0x7e205c92u:
>+            {
>+                if (name == BuiltInName::tanh)
>+                {
>+                    return &UnmangledBuiltIns::UNDEFINED;
>+                }
>+                break;
>+            }
>+            case 0x7e206e40u:
>+            {
>+                if (name == BuiltInName::sign)
>+                {
>+                    return &UnmangledBuiltIns::UNDEFINED;
>+                }
>+                break;
>+            }
>+            case 0x7e209eadu:
>+            {
>+                if (name == BuiltInName::sinh)
>+                {
>+                    return &UnmangledBuiltIns::UNDEFINED;
>+                }
>+                break;
>+            }
>+            case 0x7e274509u:
>+            {
>+                if (name == BuiltInName::modf)
>+                {
>+                    return &UnmangledBuiltIns::UNDEFINED;
>+                }
>+                break;
>+            }
>+            case 0x7e27a4feu:
>+            {
>+                if (name == BuiltInName::cosh)
>+                {
>+                    return &UnmangledBuiltIns::UNDEFINED;
>+                }
>+                break;
>+            }
>+            case 0x7e28294fu:
>+            {
>+                if (name == BuiltInName::atanh)
>+                {
>+                    return &UnmangledBuiltIns::UNDEFINED;
>+                }
>+                break;
>+            }
>+            case 0x7e2924b8u:
>+            {
>+                if (name == BuiltInName::isinf)
>+                {
>+                    return &UnmangledBuiltIns::UNDEFINED;
>+                }
>+                break;
>+            }
>+            case 0x7e297347u:
>+            {
>+                if (name == BuiltInName::equal)
>+                {
>+                    return &UnmangledBuiltIns::UNDEFINED;
>+                }
>+                break;
>+            }
>+            case 0x7e2a7a64u:
>+            {
>+                if (name == BuiltInName::round)
>+                {
>+                    return &UnmangledBuiltIns::UNDEFINED;
>+                }
>+                break;
>+            }
>+            case 0x7e2d5dcbu:
>+            {
>+                if (name == BuiltInName::clamp)
>+                {
>+                    return &UnmangledBuiltIns::UNDEFINED;
>+                }
>+                break;
>+            }
>+            case 0x7e2d8df4u:
>+            {
>+                if (name == BuiltInName::isnan)
>+                {
>+                    return &UnmangledBuiltIns::UNDEFINED;
>+                }
>+                break;
>+            }
>+            case 0x7e2dcbc6u:
>+            {
>+                if (name == BuiltInName::asinh)
>+                {
>+                    return &UnmangledBuiltIns::UNDEFINED;
>+                }
>+                break;
>+            }
>+            case 0x7e2eab16u:
>+            {
>+                if (name == BuiltInName::trunc)
>+                {
>+                    return &UnmangledBuiltIns::UNDEFINED;
>+                }
>+                break;
>+            }
>+            case 0x7e2f67c3u:
>+            {
>+                if (name == BuiltInName::acosh)
>+                {
>+                    return &UnmangledBuiltIns::UNDEFINED;
>+                }
>+                break;
>+            }
>+            case 0x7e39ebd7u:
>+            {
>+                if (name == BuiltInName::texture)
>+                {
>+                    return &UnmangledBuiltIns::UNDEFINED;
>+                }
>+                break;
>+            }
>+            case 0x7e3d828cu:
>+            {
>+                if (name == BuiltInName::inverse)
>+                {
>+                    return &UnmangledBuiltIns::UNDEFINED;
>+                }
>+                break;
>+            }
>+            case 0x7e403a20u:
>+            {
>+                if (name == BuiltInName::lessThan)
>+                {
>+                    return &UnmangledBuiltIns::UNDEFINED;
>+                }
>+                break;
>+            }
>+            case 0x7e413f93u:
>+            {
>+                if (name == BuiltInName::notEqual)
>+                {
>+                    return &UnmangledBuiltIns::UNDEFINED;
>+                }
>+                break;
>+            }
>+            case 0x7e4d27c2u:
>+            {
>+                if (name == BuiltInName::rgb_2_yuv)
>+                {
>+                    return &UnmangledBuiltIns::EXT_YUV_target;
>+                }
>+                break;
>+            }
>+            case 0x7e4d323bu:
>+            {
>+                if (name == BuiltInName::roundEven)
>+                {
>+                    return &UnmangledBuiltIns::UNDEFINED;
>+                }
>+                break;
>+            }
>+            case 0x7e4e024cu:
>+            {
>+                if (name == BuiltInName::transpose)
>+                {
>+                    return &UnmangledBuiltIns::UNDEFINED;
>+                }
>+                break;
>+            }
>+            case 0x7e4e33aeu:
>+            {
>+                if (name == BuiltInName::yuv_2_rgb)
>+                {
>+                    return &UnmangledBuiltIns::EXT_YUV_target;
>+                }
>+                break;
>+            }
>+            case 0x7e501e0cu:
>+            {
>+                if (name == BuiltInName::textureLod)
>+                {
>+                    return &UnmangledBuiltIns::UNDEFINED;
>+                }
>+                break;
>+            }
>+            case 0x7e5237e1u:
>+            {
>+                if (name == BuiltInName::texelFetch)
>+                {
>+                    return &UnmangledBuiltIns::UNDEFINED;
>+                }
>+                break;
>+            }
>+            case 0x7e582ffcu:
>+            {
>+                if (name == BuiltInName::greaterThan)
>+                {
>+                    return &UnmangledBuiltIns::UNDEFINED;
>+                }
>+                break;
>+            }
>+            case 0x7e599347u:
>+            {
>+                if (name == BuiltInName::textureGrad)
>+                {
>+                    return &UnmangledBuiltIns::UNDEFINED;
>+                }
>+                break;
>+            }
>+            case 0x7e5ba531u:
>+            {
>+                if (name == BuiltInName::determinant)
>+                {
>+                    return &UnmangledBuiltIns::UNDEFINED;
>+                }
>+                break;
>+            }
>+            case 0x7e5caafbu:
>+            {
>+                if (name == BuiltInName::textureProj)
>+                {
>+                    return &UnmangledBuiltIns::UNDEFINED;
>+                }
>+                break;
>+            }
>+            case 0x7e5e217eu:
>+            {
>+                if (name == BuiltInName::textureSize)
>+                {
>+                    return &UnmangledBuiltIns::UNDEFINED;
>+                }
>+                break;
>+            }
>+            case 0x7e62daa3u:
>+            {
>+                if (name == BuiltInName::packHalf2x16)
>+                {
>+                    return &UnmangledBuiltIns::UNDEFINED;
>+                }
>+                break;
>+            }
>+            case 0x7e646b9bu:
>+            {
>+                if (name == BuiltInName::outerProduct)
>+                {
>+                    return &UnmangledBuiltIns::UNDEFINED;
>+                }
>+                break;
>+            }
>+            case 0x7e683586u:
>+            {
>+                if (name == BuiltInName::lessThanEqual)
>+                {
>+                    return &UnmangledBuiltIns::UNDEFINED;
>+                }
>+                break;
>+            }
>+            case 0x7e6a013du:
>+            {
>+                if (name == BuiltInName::packSnorm2x16)
>+                {
>+                    return &UnmangledBuiltIns::UNDEFINED;
>+                }
>+                break;
>+            }
>+            case 0x7e6b72b8u:
>+            {
>+                if (name == BuiltInName::packUnorm2x16)
>+                {
>+                    return &UnmangledBuiltIns::UNDEFINED;
>+                }
>+                break;
>+            }
>+            case 0x7e6c5187u:
>+            {
>+                if (name == BuiltInName::textureOffset)
>+                {
>+                    return &UnmangledBuiltIns::UNDEFINED;
>+                }
>+                break;
>+            }
>+            case 0x7e715db5u:
>+            {
>+                if (name == BuiltInName::unpackHalf2x16)
>+                {
>+                    return &UnmangledBuiltIns::UNDEFINED;
>+                }
>+                break;
>+            }
>+            case 0x7e759618u:
>+            {
>+                if (name == BuiltInName::floatBitsToInt)
>+                {
>+                    return &UnmangledBuiltIns::UNDEFINED;
>+                }
>+                break;
>+            }
>+            case 0x7e75ae2fu:
>+            {
>+                if (name == BuiltInName::textureProjLod)
>+                {
>+                    return &UnmangledBuiltIns::UNDEFINED;
>+                }
>+                break;
>+            }
>+            case 0x7e76bea7u:
>+            {
>+                if (name == BuiltInName::matrixCompMult)
>+                {
>+                    return &UnmangledBuiltIns::UNDEFINED;
>+                }
>+                break;
>+            }
>+            case 0x7e77fc97u:
>+            {
>+                if (name == BuiltInName::intBitsToFloat)
>+                {
>+                    return &UnmangledBuiltIns::UNDEFINED;
>+                }
>+                break;
>+            }
>+            case 0x7e792d39u:
>+            {
>+                if (name == BuiltInName::unpackUnorm2x16)
>+                {
>+                    return &UnmangledBuiltIns::UNDEFINED;
>+                }
>+                break;
>+            }
>+            case 0x7e7b6a0eu:
>+            {
>+                if (name == BuiltInName::unpackSnorm2x16)
>+                {
>+                    return &UnmangledBuiltIns::UNDEFINED;
>+                }
>+                break;
>+            }
>+            case 0x7e7bc1fdu:
>+            {
>+                if (name == BuiltInName::textureProjGrad)
>+                {
>+                    return &UnmangledBuiltIns::UNDEFINED;
>+                }
>+                break;
>+            }
>+            case 0x7e7e0e81u:
>+            {
>+                if (name == BuiltInName::uintBitsToFloat)
>+                {
>+                    return &UnmangledBuiltIns::UNDEFINED;
>+                }
>+                break;
>+            }
>+            case 0x7e7e5132u:
>+            {
>+                if (name == BuiltInName::floatBitsToUint)
>+                {
>+                    return &UnmangledBuiltIns::UNDEFINED;
>+                }
>+                break;
>+            }
>+            case 0x7e80919du:
>+            {
>+                if (name == BuiltInName::texelFetchOffset)
>+                {
>+                    return &UnmangledBuiltIns::UNDEFINED;
>+                }
>+                break;
>+            }
>+            case 0x7e81c71au:
>+            {
>+                if (name == BuiltInName::textureLodOffset)
>+                {
>+                    return &UnmangledBuiltIns::UNDEFINED;
>+                }
>+                break;
>+            }
>+            case 0x7e876cccu:
>+            {
>+                if (name == BuiltInName::greaterThanEqual)
>+                {
>+                    return &UnmangledBuiltIns::UNDEFINED;
>+                }
>+                break;
>+            }
>+            case 0x7e8b5832u:
>+            {
>+                if (name == BuiltInName::textureGradOffset)
>+                {
>+                    return &UnmangledBuiltIns::UNDEFINED;
>+                }
>+                break;
>+            }
>+            case 0x7e8d2d2du:
>+            {
>+                if (name == BuiltInName::textureProjOffset)
>+                {
>+                    return &UnmangledBuiltIns::UNDEFINED;
>+                }
>+                break;
>+            }
>+            case 0x7ea0be08u:
>+            {
>+                if (name == BuiltInName::textureProjLodOffset)
>+                {
>+                    return &UnmangledBuiltIns::UNDEFINED;
>+                }
>+                break;
>+            }
>+            case 0x7eac5717u:
>+            {
>+                if (name == BuiltInName::textureProjGradOffset)
>+                {
>+                    return &UnmangledBuiltIns::UNDEFINED;
>+                }
>+                break;
>+            }
>+        }
>+        if (mShaderType == GL_FRAGMENT_SHADER)
>+        {
>+            switch (nameHash)
>+            {
>+                case 0x7e2624d4u:
>+                {
>+                    if (name == BuiltInName::dFdy)
>+                    {
>+                        return &UnmangledBuiltIns::UNDEFINED;
>+                    }
>+                    break;
>+                }
>+                case 0x7e265ea7u:
>+                {
>+                    if (name == BuiltInName::dFdx)
>+                    {
>+                        return &UnmangledBuiltIns::UNDEFINED;
>+                    }
>+                    break;
>+                }
>+                case 0x7e324ea1u:
>+                {
>+                    if (name == BuiltInName::fwidth)
>+                    {
>+                        return &UnmangledBuiltIns::UNDEFINED;
>+                    }
>+                    break;
>+                }
>+            }
>+        }
>+    }
>+    if (shaderVersion == 100)
>+    {
>+        switch (nameHash)
>+        {
>+            case 0x7e48c50cu:
>+            {
>+                if (name == BuiltInName::texture2D)
>+                {
>+                    return &UnmangledBuiltIns::UNDEFINED;
>+                }
>+                break;
>+            }
>+            case 0x7e5ffc48u:
>+            {
>+                if (name == BuiltInName::textureCube)
>+                {
>+                    return &UnmangledBuiltIns::UNDEFINED;
>+                }
>+                break;
>+            }
>+            case 0x7e69f545u:
>+            {
>+                if (name == BuiltInName::texture2DRect)
>+                {
>+                    return &UnmangledBuiltIns::ARB_texture_rectangle;
>+                }
>+                break;
>+            }
>+            case 0x7e6e3735u:
>+            {
>+                if (name == BuiltInName::texture2DProj)
>+                {
>+                    return &UnmangledBuiltIns::UNDEFINED;
>+                }
>+                break;
>+            }
>+            case 0x7e868a22u:
>+            {
>+                if (name == BuiltInName::texture2DGradEXT)
>+                {
>+                    return &UnmangledBuiltIns::EXT_shader_texture_lod;
>+                }
>+                break;
>+            }
>+            case 0x7e8b66e4u:
>+            {
>+                if (name == BuiltInName::texture2DRectProj)
>+                {
>+                    return &UnmangledBuiltIns::ARB_texture_rectangle;
>+                }
>+                break;
>+            }
>+            case 0x7e90fa5bu:
>+            {
>+                if (name == BuiltInName::textureCubeGradEXT)
>+                {
>+                    return &UnmangledBuiltIns::EXT_shader_texture_lod;
>+                }
>+                break;
>+            }
>+            case 0x7ea20b8fu:
>+            {
>+                if (name == BuiltInName::texture2DProjGradEXT)
>+                {
>+                    return &UnmangledBuiltIns::EXT_shader_texture_lod;
>+                }
>+                break;
>+            }
>+        }
>+        if (mShaderType == GL_FRAGMENT_SHADER)
>+        {
>+            switch (nameHash)
>+            {
>+                case 0x7e2624d4u:
>+                {
>+                    if (name == BuiltInName::dFdyExt)
>+                    {
>+                        return &UnmangledBuiltIns::OES_standard_derivatives;
>+                    }
>+                    break;
>+                }
>+                case 0x7e265ea7u:
>+                {
>+                    if (name == BuiltInName::dFdxExt)
>+                    {
>+                        return &UnmangledBuiltIns::OES_standard_derivatives;
>+                    }
>+                    break;
>+                }
>+                case 0x7e324ea1u:
>+                {
>+                    if (name == BuiltInName::fwidthExt)
>+                    {
>+                        return &UnmangledBuiltIns::OES_standard_derivatives;
>+                    }
>+                    break;
>+                }
>+                case 0x7e7b843eu:
>+                {
>+                    if (name == BuiltInName::texture2DLodEXT)
>+                    {
>+                        return &UnmangledBuiltIns::EXT_shader_texture_lod;
>+                    }
>+                    break;
>+                }
>+                case 0x7e8b81cau:
>+                {
>+                    if (name == BuiltInName::textureCubeLodEXT)
>+                    {
>+                        return &UnmangledBuiltIns::EXT_shader_texture_lod;
>+                    }
>+                    break;
>+                }
>+                case 0x7e9ddba0u:
>+                {
>+                    if (name == BuiltInName::texture2DProjLodEXT)
>+                    {
>+                        return &UnmangledBuiltIns::EXT_shader_texture_lod;
>+                    }
>+                    break;
>+                }
>+            }
>+        }
>+        if (mShaderType == GL_VERTEX_SHADER)
>+        {
>+            switch (nameHash)
>+            {
>+                case 0x7e67c7ceu:
>+                {
>+                    if (name == BuiltInName::texture2DLod)
>+                    {
>+                        return &UnmangledBuiltIns::UNDEFINED;
>+                    }
>+                    break;
>+                }
>+                case 0x7e758eddu:
>+                {
>+                    if (name == BuiltInName::textureCubeLod)
>+                    {
>+                        return &UnmangledBuiltIns::UNDEFINED;
>+                    }
>+                    break;
>+                }
>+                case 0x7e819b90u:
>+                {
>+                    if (name == BuiltInName::texture2DProjLod)
>+                    {
>+                        return &UnmangledBuiltIns::UNDEFINED;
>+                    }
>+                    break;
>+                }
>+            }
>+        }
>+    }
>+    switch (nameHash)
>+    {
>+        case 0x7e1892eeu:
>+        {
>+            if (name == BuiltInName::all)
>+            {
>+                return &UnmangledBuiltIns::UNDEFINED;
>+            }
>+            break;
>+        }
>+        case 0x7e19507bu:
>+        {
>+            if (name == BuiltInName::abs)
>+            {
>+                return &UnmangledBuiltIns::UNDEFINED;
>+            }
>+            break;
>+        }
>+        case 0x7e195106u:
>+        {
>+            if (name == BuiltInName::notFunc)
>+            {
>+                return &UnmangledBuiltIns::UNDEFINED;
>+            }
>+            break;
>+        }
>+        case 0x7e197102u:
>+        {
>+            if (name == BuiltInName::any)
>+            {
>+                return &UnmangledBuiltIns::UNDEFINED;
>+            }
>+            break;
>+        }
>+        case 0x7e19ebdbu:
>+        {
>+            if (name == BuiltInName::log)
>+            {
>+                return &UnmangledBuiltIns::UNDEFINED;
>+            }
>+            break;
>+        }
>+        case 0x7e1acb4eu:
>+        {
>+            if (name == BuiltInName::pow)
>+            {
>+                return &UnmangledBuiltIns::UNDEFINED;
>+            }
>+            break;
>+        }
>+        case 0x7e1b921cu:
>+        {
>+            if (name == BuiltInName::exp)
>+            {
>+                return &UnmangledBuiltIns::UNDEFINED;
>+            }
>+            break;
>+        }
>+        case 0x7e1cf321u:
>+        {
>+            if (name == BuiltInName::tan)
>+            {
>+                return &UnmangledBuiltIns::UNDEFINED;
>+            }
>+            break;
>+        }
>+        case 0x7e1e492du:
>+        {
>+            if (name == BuiltInName::min)
>+            {
>+                return &UnmangledBuiltIns::UNDEFINED;
>+            }
>+            break;
>+        }
>+        case 0x7e1e8464u:
>+        {
>+            if (name == BuiltInName::dot)
>+            {
>+                return &UnmangledBuiltIns::UNDEFINED;
>+            }
>+            break;
>+        }
>+        case 0x7e1ea71bu:
>+        {
>+            if (name == BuiltInName::mix)
>+            {
>+                return &UnmangledBuiltIns::UNDEFINED;
>+            }
>+            break;
>+        }
>+        case 0x7e1ebe0eu:
>+        {
>+            if (name == BuiltInName::max)
>+            {
>+                return &UnmangledBuiltIns::UNDEFINED;
>+            }
>+            break;
>+        }
>+        case 0x7e1eee70u:
>+        {
>+            if (name == BuiltInName::mod)
>+            {
>+                return &UnmangledBuiltIns::UNDEFINED;
>+            }
>+            break;
>+        }
>+        case 0x7e1f0bccu:
>+        {
>+            if (name == BuiltInName::sin)
>+            {
>+                return &UnmangledBuiltIns::UNDEFINED;
>+            }
>+            break;
>+        }
>+        case 0x7e1fdef3u:
>+        {
>+            if (name == BuiltInName::cos)
>+            {
>+                return &UnmangledBuiltIns::UNDEFINED;
>+            }
>+            break;
>+        }
>+        case 0x7e203979u:
>+        {
>+            if (name == BuiltInName::atan)
>+            {
>+                return &UnmangledBuiltIns::UNDEFINED;
>+            }
>+            break;
>+        }
>+        case 0x7e206e40u:
>+        {
>+            if (name == BuiltInName::sign)
>+            {
>+                return &UnmangledBuiltIns::UNDEFINED;
>+            }
>+            break;
>+        }
>+        case 0x7e209ec1u:
>+        {
>+            if (name == BuiltInName::log2)
>+            {
>+                return &UnmangledBuiltIns::UNDEFINED;
>+            }
>+            break;
>+        }
>+        case 0x7e21ff11u:
>+        {
>+            if (name == BuiltInName::acos)
>+            {
>+                return &UnmangledBuiltIns::UNDEFINED;
>+            }
>+            break;
>+        }
>+        case 0x7e23152fu:
>+        {
>+            if (name == BuiltInName::ceil)
>+            {
>+                return &UnmangledBuiltIns::UNDEFINED;
>+            }
>+            break;
>+        }
>+        case 0x7e23f4beu:
>+        {
>+            if (name == BuiltInName::sqrt)
>+            {
>+                return &UnmangledBuiltIns::UNDEFINED;
>+            }
>+            break;
>+        }
>+        case 0x7e24bcdbu:
>+        {
>+            if (name == BuiltInName::exp2)
>+            {
>+                return &UnmangledBuiltIns::UNDEFINED;
>+            }
>+            break;
>+        }
>+        case 0x7e26202fu:
>+        {
>+            if (name == BuiltInName::step)
>+            {
>+                return &UnmangledBuiltIns::UNDEFINED;
>+            }
>+            break;
>+        }
>+        case 0x7e27ebd5u:
>+        {
>+            if (name == BuiltInName::asin)
>+            {
>+                return &UnmangledBuiltIns::UNDEFINED;
>+            }
>+            break;
>+        }
>+        case 0x7e295733u:
>+        {
>+            if (name == BuiltInName::cross)
>+            {
>+                return &UnmangledBuiltIns::UNDEFINED;
>+            }
>+            break;
>+        }
>+        case 0x7e297347u:
>+        {
>+            if (name == BuiltInName::equal)
>+            {
>+                return &UnmangledBuiltIns::UNDEFINED;
>+            }
>+            break;
>+        }
>+        case 0x7e2d5dcbu:
>+        {
>+            if (name == BuiltInName::clamp)
>+            {
>+                return &UnmangledBuiltIns::UNDEFINED;
>+            }
>+            break;
>+        }
>+        case 0x7e2dcb25u:
>+        {
>+            if (name == BuiltInName::floor)
>+            {
>+                return &UnmangledBuiltIns::UNDEFINED;
>+            }
>+            break;
>+        }
>+        case 0x7e2f6df3u:
>+        {
>+            if (name == BuiltInName::fract)
>+            {
>+                return &UnmangledBuiltIns::UNDEFINED;
>+            }
>+            break;
>+        }
>+        case 0x7e340894u:
>+        {
>+            if (name == BuiltInName::length)
>+            {
>+                return &UnmangledBuiltIns::UNDEFINED;
>+            }
>+            break;
>+        }
>+        case 0x7e38233fu:
>+        {
>+            if (name == BuiltInName::refract)
>+            {
>+                return &UnmangledBuiltIns::UNDEFINED;
>+            }
>+            break;
>+        }
>+        case 0x7e3c3cb3u:
>+        {
>+            if (name == BuiltInName::radians)
>+            {
>+                return &UnmangledBuiltIns::UNDEFINED;
>+            }
>+            break;
>+        }
>+        case 0x7e3c8e91u:
>+        {
>+            if (name == BuiltInName::reflect)
>+            {
>+                return &UnmangledBuiltIns::UNDEFINED;
>+            }
>+            break;
>+        }
>+        case 0x7e3d784cu:
>+        {
>+            if (name == BuiltInName::degrees)
>+            {
>+                return &UnmangledBuiltIns::UNDEFINED;
>+            }
>+            break;
>+        }
>+        case 0x7e403a20u:
>+        {
>+            if (name == BuiltInName::lessThan)
>+            {
>+                return &UnmangledBuiltIns::UNDEFINED;
>+            }
>+            break;
>+        }
>+        case 0x7e413f93u:
>+        {
>+            if (name == BuiltInName::notEqual)
>+            {
>+                return &UnmangledBuiltIns::UNDEFINED;
>+            }
>+            break;
>+        }
>+        case 0x7e4161fau:
>+        {
>+            if (name == BuiltInName::distance)
>+            {
>+                return &UnmangledBuiltIns::UNDEFINED;
>+            }
>+            break;
>+        }
>+        case 0x7e4e7aa5u:
>+        {
>+            if (name == BuiltInName::normalize)
>+            {
>+                return &UnmangledBuiltIns::UNDEFINED;
>+            }
>+            break;
>+        }
>+        case 0x7e54a2cfu:
>+        {
>+            if (name == BuiltInName::smoothstep)
>+            {
>+                return &UnmangledBuiltIns::UNDEFINED;
>+            }
>+            break;
>+        }
>+        case 0x7e582ffcu:
>+        {
>+            if (name == BuiltInName::greaterThan)
>+            {
>+                return &UnmangledBuiltIns::UNDEFINED;
>+            }
>+            break;
>+        }
>+        case 0x7e5ae14bu:
>+        {
>+            if (name == BuiltInName::faceforward)
>+            {
>+                return &UnmangledBuiltIns::UNDEFINED;
>+            }
>+            break;
>+        }
>+        case 0x7e5f4d0fu:
>+        {
>+            if (name == BuiltInName::inversesqrt)
>+            {
>+                return &UnmangledBuiltIns::UNDEFINED;
>+            }
>+            break;
>+        }
>+        case 0x7e683586u:
>+        {
>+            if (name == BuiltInName::lessThanEqual)
>+            {
>+                return &UnmangledBuiltIns::UNDEFINED;
>+            }
>+            break;
>+        }
>+        case 0x7e76bea7u:
>+        {
>+            if (name == BuiltInName::matrixCompMult)
>+            {
>+                return &UnmangledBuiltIns::UNDEFINED;
>+            }
>+            break;
>+        }
>+        case 0x7e876cccu:
>+        {
>+            if (name == BuiltInName::greaterThanEqual)
>+            {
>+                return &UnmangledBuiltIns::UNDEFINED;
>+            }
>+            break;
>+        }
>+    }
>+    return nullptr;
>+}
>+
>+}  // namespace sh
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/SymbolTable_autogen.h b/Source/ThirdParty/ANGLE/src/compiler/translator/SymbolTable_autogen.h
>new file mode 100644
>index 00000000000..2168743e299
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/SymbolTable_autogen.h
>@@ -0,0 +1,78 @@
>+// GENERATED FILE - DO NOT EDIT.
>+// Generated by gen_builtin_symbols.py using data from builtin_variables.json and
>+// builtin_function_declarations.txt.
>+//
>+// Copyright 2019 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// SymbolTable_autogen.h:
>+//   Autogenerated member variables of TSymbolTable.
>+
>+#ifndef COMPILER_TRANSLATOR_SYMBOLTABLE_AUTOGEN_H_
>+#define COMPILER_TRANSLATOR_SYMBOLTABLE_AUTOGEN_H_
>+
>+namespace sh
>+{
>+
>+class TSymbolTableBase
>+{
>+  protected:
>+    TSymbolTableBase()                                  = default;
>+    TStructure *mVar_gl_DepthRangeParameters            = nullptr;
>+    TVariable *mVar_gl_DepthRange                       = nullptr;
>+    TVariable *mVar_gl_MaxVertexAttribs                 = nullptr;
>+    TVariable *mVar_gl_MaxVertexUniformVectors          = nullptr;
>+    TVariable *mVar_gl_MaxVertexTextureImageUnits       = nullptr;
>+    TVariable *mVar_gl_MaxCombinedTextureImageUnits     = nullptr;
>+    TVariable *mVar_gl_MaxTextureImageUnits             = nullptr;
>+    TVariable *mVar_gl_MaxFragmentUniformVectors        = nullptr;
>+    TVariable *mVar_gl_MaxVaryingVectors                = nullptr;
>+    TVariable *mVar_gl_MaxDrawBuffers                   = nullptr;
>+    TVariable *mVar_gl_MaxDualSourceDrawBuffersEXT      = nullptr;
>+    TVariable *mVar_gl_MaxVertexOutputVectors           = nullptr;
>+    TVariable *mVar_gl_MaxFragmentInputVectors          = nullptr;
>+    TVariable *mVar_gl_MinProgramTexelOffset            = nullptr;
>+    TVariable *mVar_gl_MaxProgramTexelOffset            = nullptr;
>+    TVariable *mVar_gl_MaxImageUnits                    = nullptr;
>+    TVariable *mVar_gl_MaxVertexImageUniforms           = nullptr;
>+    TVariable *mVar_gl_MaxFragmentImageUniforms         = nullptr;
>+    TVariable *mVar_gl_MaxComputeImageUniforms          = nullptr;
>+    TVariable *mVar_gl_MaxCombinedImageUniforms         = nullptr;
>+    TVariable *mVar_gl_MaxCombinedShaderOutputResources = nullptr;
>+    TVariable *mVar_gl_MaxComputeWorkGroupCount         = nullptr;
>+    TVariable *mVar_gl_MaxComputeWorkGroupSize          = nullptr;
>+    TVariable *mVar_gl_MaxComputeUniformComponents      = nullptr;
>+    TVariable *mVar_gl_MaxComputeTextureImageUnits      = nullptr;
>+    TVariable *mVar_gl_MaxComputeAtomicCounters         = nullptr;
>+    TVariable *mVar_gl_MaxComputeAtomicCounterBuffers   = nullptr;
>+    TVariable *mVar_gl_MaxVertexAtomicCounters          = nullptr;
>+    TVariable *mVar_gl_MaxFragmentAtomicCounters        = nullptr;
>+    TVariable *mVar_gl_MaxCombinedAtomicCounters        = nullptr;
>+    TVariable *mVar_gl_MaxAtomicCounterBindings         = nullptr;
>+    TVariable *mVar_gl_MaxVertexAtomicCounterBuffers    = nullptr;
>+    TVariable *mVar_gl_MaxFragmentAtomicCounterBuffers  = nullptr;
>+    TVariable *mVar_gl_MaxCombinedAtomicCounterBuffers  = nullptr;
>+    TVariable *mVar_gl_MaxAtomicCounterBufferSize       = nullptr;
>+    TVariable *mVar_gl_MaxGeometryInputComponents       = nullptr;
>+    TVariable *mVar_gl_MaxGeometryOutputComponents      = nullptr;
>+    TVariable *mVar_gl_MaxGeometryImageUniforms         = nullptr;
>+    TVariable *mVar_gl_MaxGeometryTextureImageUnits     = nullptr;
>+    TVariable *mVar_gl_MaxGeometryOutputVertices        = nullptr;
>+    TVariable *mVar_gl_MaxGeometryTotalOutputComponents = nullptr;
>+    TVariable *mVar_gl_MaxGeometryUniformComponents     = nullptr;
>+    TVariable *mVar_gl_MaxGeometryAtomicCounters        = nullptr;
>+    TVariable *mVar_gl_MaxGeometryAtomicCounterBuffers  = nullptr;
>+    TVariable *mVar_gl_FragData                         = nullptr;
>+    TVariable *mVar_gl_SecondaryFragDataEXT             = nullptr;
>+    TVariable *mVar_gl_FragDepthEXT                     = nullptr;
>+    TVariable *mVar_gl_LastFragData                     = nullptr;
>+    TVariable *mVar_gl_LastFragDataNV                   = nullptr;
>+    TInterfaceBlock *mVar_gl_PerVertex                  = nullptr;
>+    TVariable *mVar_gl_in                               = nullptr;
>+    TVariable *mVar_gl_PositionGS                       = nullptr;
>+};
>+
>+}  // namespace sh
>+
>+#endif  // COMPILER_TRANSLATOR_SYMBOLTABLE_AUTOGEN_H_
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/SymbolUniqueId.cpp b/Source/ThirdParty/ANGLE/src/compiler/translator/SymbolUniqueId.cpp
>index 2a68ae3e70c..3aeb80b708a 100644
>--- a/Source/ThirdParty/ANGLE/src/compiler/translator/SymbolUniqueId.cpp
>+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/SymbolUniqueId.cpp
>@@ -13,16 +13,15 @@ namespace sh
> {
> 
> TSymbolUniqueId::TSymbolUniqueId(TSymbolTable *symbolTable) : mId(symbolTable->nextUniqueIdValue())
>-{
>-}
>+{}
> 
>-TSymbolUniqueId::TSymbolUniqueId(const TSymbol &symbol) : mId(symbol.getUniqueId().get())
>-{
>-}
>+TSymbolUniqueId::TSymbolUniqueId(const TSymbol &symbol) : mId(symbol.uniqueId().get()) {}
>+
>+TSymbolUniqueId &TSymbolUniqueId::operator=(const TSymbolUniqueId &) = default;
> 
>-int TSymbolUniqueId::get() const
>+bool TSymbolUniqueId::operator==(const TSymbolUniqueId &other) const
> {
>-    return mId;
>+    return mId == other.mId;
> }
> 
> }  // namespace sh
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/SymbolUniqueId.h b/Source/ThirdParty/ANGLE/src/compiler/translator/SymbolUniqueId.h
>index 4bd5604246c..7d0979e2666 100644
>--- a/Source/ThirdParty/ANGLE/src/compiler/translator/SymbolUniqueId.h
>+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/SymbolUniqueId.h
>@@ -19,18 +19,40 @@ class TSymbol;
> class TSymbolUniqueId
> {
>   public:
>-    POOL_ALLOCATOR_NEW_DELETE();
>-    explicit TSymbolUniqueId(TSymbolTable *symbolTable);
>+    POOL_ALLOCATOR_NEW_DELETE
>     explicit TSymbolUniqueId(const TSymbol &symbol);
>-    TSymbolUniqueId(const TSymbolUniqueId &) = default;
>-    TSymbolUniqueId &operator=(const TSymbolUniqueId &) = default;
>+    constexpr TSymbolUniqueId(const TSymbolUniqueId &) = default;
>+    TSymbolUniqueId &operator                          =(const TSymbolUniqueId &);
>+    bool operator==(const TSymbolUniqueId &) const;
> 
>-    int get() const;
>+    constexpr int get() const { return mId; }
> 
>   private:
>+    friend class TSymbolTable;
>+    explicit TSymbolUniqueId(TSymbolTable *symbolTable);
>+
>+    friend class BuiltInId;
>+    constexpr TSymbolUniqueId(int staticId) : mId(staticId) {}
>+
>     int mId;
> };
> 
>+enum class SymbolType
>+{
>+    BuiltIn,
>+    UserDefined,
>+    AngleInternal,
>+    Empty  // Meaning symbol without a name.
>+};
>+
>+enum class SymbolClass
>+{
>+    Function,
>+    Variable,
>+    Struct,
>+    InterfaceBlock
>+};
>+
> }  // namespace sh
> 
> #endif  // COMPILER_TRANSLATOR_SYMBOLUNIQUEID_H_
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/TextureFunctionHLSL.cpp b/Source/ThirdParty/ANGLE/src/compiler/translator/TextureFunctionHLSL.cpp
>index d2b65a6c568..28208bcae82 100644
>--- a/Source/ThirdParty/ANGLE/src/compiler/translator/TextureFunctionHLSL.cpp
>+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/TextureFunctionHLSL.cpp
>@@ -11,6 +11,7 @@
> 
> #include "compiler/translator/TextureFunctionHLSL.h"
> 
>+#include "compiler/translator/ImmutableStringBuilder.h"
> #include "compiler/translator/UtilsHLSL.h"
> 
> namespace sh
>@@ -22,8 +23,8 @@ namespace
> void OutputIntTexCoordWrap(TInfoSinkBase &out,
>                            const char *wrapMode,
>                            const char *size,
>-                           const TString &texCoord,
>-                           const TString &texCoordOffset,
>+                           const ImmutableString &texCoord,
>+                           const char *texCoordOffset,
>                            const char *texCoordOutName)
> {
>     // GLES 3.0.4 table 3.22 specifies how the wrap modes work. We don't use the formulas verbatim
>@@ -31,17 +32,27 @@ void OutputIntTexCoordWrap(TInfoSinkBase &out,
>     out << "int " << texCoordOutName << ";\n";
>     out << "float " << texCoordOutName << "Offset = " << texCoord << " + float(" << texCoordOffset
>         << ") / " << size << ";\n";
>+    out << "bool " << texCoordOutName << "UseBorderColor = false;\n";
> 
>     // CLAMP_TO_EDGE
>-    out << "if (" << wrapMode << " == 1)\n";
>+    out << "if (" << wrapMode << " == 0)\n";
>     out << "{\n";
>     out << "    " << texCoordOutName << " = clamp(int(floor(" << size << " * " << texCoordOutName
>         << "Offset)), 0, int(" << size << ") - 1);\n";
>     out << "}\n";
> 
>-    // MIRRORED_REPEAT
>+    // CLAMP_TO_BORDER
>     out << "else if (" << wrapMode << " == 3)\n";
>     out << "{\n";
>+    out << "    int texCoordInt = int(floor(" << size << " * " << texCoordOutName << "Offset));\n";
>+    out << "    " << texCoordOutName << " = clamp(texCoordInt, 0, int(" << size << ") - 1);\n";
>+    out << "    " << texCoordOutName << "UseBorderColor = (texCoordInt != " << texCoordOutName
>+        << ");\n";
>+    out << "}\n";
>+
>+    // MIRRORED_REPEAT
>+    out << "else if (" << wrapMode << " == 2)\n";
>+    out << "{\n";
>     out << "    float coordWrapped = 1.0 - abs(frac(abs(" << texCoordOutName
>         << "Offset) * 0.5) * 2.0 - 1.0);\n";
>     out << "    " << texCoordOutName << " = int(floor(" << size << " * coordWrapped));\n";
>@@ -57,9 +68,9 @@ void OutputIntTexCoordWrap(TInfoSinkBase &out,
> 
> void OutputIntTexCoordWraps(TInfoSinkBase &out,
>                             const TextureFunctionHLSL::TextureFunction &textureFunction,
>-                            TString *texCoordX,
>-                            TString *texCoordY,
>-                            TString *texCoordZ)
>+                            ImmutableString *texCoordX,
>+                            ImmutableString *texCoordY,
>+                            ImmutableString *texCoordZ)
> {
>     // Convert from normalized floating-point to integer
>     out << "int wrapS = samplerMetadata[samplerIndex].wrapModes & 0x3;\n";
>@@ -71,7 +82,7 @@ void OutputIntTexCoordWraps(TInfoSinkBase &out,
>     {
>         OutputIntTexCoordWrap(out, "wrapS", "width", *texCoordX, "0", "tix");
>     }
>-    *texCoordX = "tix";
>+    *texCoordX = ImmutableString("tix");
>     out << "int wrapT = (samplerMetadata[samplerIndex].wrapModes >> 2) & 0x3;\n";
>     if (textureFunction.offset)
>     {
>@@ -81,11 +92,13 @@ void OutputIntTexCoordWraps(TInfoSinkBase &out,
>     {
>         OutputIntTexCoordWrap(out, "wrapT", "height", *texCoordY, "0", "tiy");
>     }
>-    *texCoordY = "tiy";
>+    *texCoordY = ImmutableString("tiy");
>+
>+    bool tizAvailable = false;
> 
>     if (IsSamplerArray(textureFunction.sampler))
>     {
>-        *texCoordZ = "int(max(0, min(layers - 1, floor(0.5 + t.z))))";
>+        *texCoordZ = ImmutableString("int(max(0, min(layers - 1, floor(0.5 + t.z))))");
>     }
>     else if (!IsSamplerCube(textureFunction.sampler) && !IsSampler2D(textureFunction.sampler))
>     {
>@@ -98,14 +111,18 @@ void OutputIntTexCoordWraps(TInfoSinkBase &out,
>         {
>             OutputIntTexCoordWrap(out, "wrapR", "depth", *texCoordZ, "0", "tiz");
>         }
>-        *texCoordZ = "tiz";
>+        *texCoordZ   = ImmutableString("tiz");
>+        tizAvailable = true;
>     }
>+
>+    out << "bool useBorderColor = tixUseBorderColor || tiyUseBorderColor"
>+        << (tizAvailable ? " || tizUseBorderColor" : "") << ";\n";
> }
> 
> void OutputHLSL4SampleFunctionPrefix(TInfoSinkBase &out,
>                                      const TextureFunctionHLSL::TextureFunction &textureFunction,
>-                                     const TString &textureReference,
>-                                     const TString &samplerReference)
>+                                     const ImmutableString &textureReference,
>+                                     const ImmutableString &samplerReference)
> {
>     out << textureReference;
>     if (IsIntegerSampler(textureFunction.sampler) ||
>@@ -162,20 +179,33 @@ const char *GetSamplerCoordinateTypeString(
>     const TextureFunctionHLSL::TextureFunction &textureFunction,
>     int hlslCoords)
> {
>-    if (IsIntegerSampler(textureFunction.sampler) ||
>+    // Gather[Red|Green|Blue|Alpha] accepts float texture coordinates on textures in integer or
>+    // unsigned integer formats.
>+    // https://docs.microsoft.com/en-us/windows/desktop/direct3dhlsl/dx-graphics-hlsl-to-gather
>+    if ((IsIntegerSampler(textureFunction.sampler) &&
>+         textureFunction.method != TextureFunctionHLSL::TextureFunction::GATHER) ||
>         textureFunction.method == TextureFunctionHLSL::TextureFunction::FETCH)
>     {
>         switch (hlslCoords)
>         {
>             case 2:
>-                if (textureFunction.sampler == EbtSampler2DMS ||
>-                    textureFunction.sampler == EbtISampler2DMS ||
>-                    textureFunction.sampler == EbtUSampler2DMS)
>+                if (IsSampler2DMS(textureFunction.sampler))
>+                {
>                     return "int2";
>+                }
>                 else
>+                {
>                     return "int3";
>+                }
>             case 3:
>-                return "int4";
>+                if (IsSampler2DMSArray(textureFunction.sampler))
>+                {
>+                    return "int3";
>+                }
>+                else
>+                {
>+                    return "int4";
>+                }
>             default:
>                 UNREACHABLE();
>         }
>@@ -233,49 +263,13 @@ int GetHLSLCoordCount(const TextureFunctionHLSL::TextureFunction &textureFunctio
>     }
>     else
>     {
>-        switch (textureFunction.sampler)
>+        if (IsSampler3D(textureFunction.sampler) || IsSamplerArray(textureFunction.sampler) ||
>+            IsSamplerCube(textureFunction.sampler))
>         {
>-            case EbtSampler2D:
>-                return 2;
>-            case EbtSampler2DMS:
>-                return 2;
>-            case EbtSampler3D:
>-                return 3;
>-            case EbtSamplerCube:
>-                return 3;
>-            case EbtSampler2DArray:
>-                return 3;
>-            case EbtSamplerExternalOES:
>-                return 2;
>-            case EbtISampler2D:
>-                return 2;
>-            case EbtISampler2DMS:
>-                return 2;
>-            case EbtISampler3D:
>-                return 3;
>-            case EbtISamplerCube:
>-                return 3;
>-            case EbtISampler2DArray:
>-                return 3;
>-            case EbtUSampler2D:
>-                return 2;
>-            case EbtUSampler2DMS:
>-                return 2;
>-            case EbtUSampler3D:
>-                return 3;
>-            case EbtUSamplerCube:
>-                return 3;
>-            case EbtUSampler2DArray:
>-                return 3;
>-            case EbtSampler2DShadow:
>-                return 2;
>-            case EbtSamplerCubeShadow:
>-                return 3;
>-            case EbtSampler2DArrayShadow:
>-                return 3;
>-            default:
>-                UNREACHABLE();
>+            return 3;
>         }
>+        ASSERT(IsSampler2D(textureFunction.sampler));
>+        return 2;
>     }
>     return 0;
> }
>@@ -399,19 +393,26 @@ void OutputTextureFunctionArgumentList(TInfoSinkBase &out,
>         case TextureFunctionHLSL::TextureFunction::SIZE:
>             break;
>         case TextureFunctionHLSL::TextureFunction::FETCH:
>-            if (textureFunction.sampler == EbtSampler2DMS ||
>-                textureFunction.sampler == EbtISampler2DMS ||
>-                textureFunction.sampler == EbtUSampler2DMS)
>+            if (IsSampler2DMS(textureFunction.sampler) ||
>+                IsSampler2DMSArray(textureFunction.sampler))
>                 out << ", int index";
>             else
>                 out << ", int mip";
>             break;
>         case TextureFunctionHLSL::TextureFunction::GRAD:
>             break;
>+        case TextureFunctionHLSL::TextureFunction::GATHER:
>+            break;
>         default:
>             UNREACHABLE();
>     }
> 
>+    if (textureFunction.method == TextureFunctionHLSL::TextureFunction::GATHER &&
>+        IsShadowSampler(textureFunction.sampler))
>+    {
>+        out << ", float refZ";
>+    }
>+
>     if (textureFunction.offset)
>     {
>         switch (textureFunction.sampler)
>@@ -429,13 +430,11 @@ void OutputTextureFunctionArgumentList(TInfoSinkBase &out,
>             case EbtUSampler2DArray:
>             case EbtSampler2DShadow:
>             case EbtSampler2DArrayShadow:
>-            case EbtSampler2DMS:
>-            case EbtISampler2DMS:
>-            case EbtUSampler2DMS:
>             case EbtSamplerExternalOES:
>                 out << ", int2 offset";
>                 break;
>             default:
>+                // Offset is not supported for multisampled textures.
>                 UNREACHABLE();
>         }
>     }
>@@ -445,42 +444,66 @@ void OutputTextureFunctionArgumentList(TInfoSinkBase &out,
>     {
>         out << ", float bias";
>     }
>+    else if (textureFunction.method == TextureFunctionHLSL::TextureFunction::GATHER &&
>+             !IsShadowSampler(textureFunction.sampler))
>+    {
>+        out << ", int comp = 0";
>+    }
> }
> 
> void GetTextureReference(TInfoSinkBase &out,
>                          const TextureFunctionHLSL::TextureFunction &textureFunction,
>                          const ShShaderOutput outputType,
>-                         TString *textureReference,
>-                         TString *samplerReference)
>+                         ImmutableString *textureReference,
>+                         ImmutableString *samplerReference)
> {
>     if (outputType == SH_HLSL_4_1_OUTPUT)
>     {
>-        TString suffix = TextureGroupSuffix(textureFunction.sampler);
>+        static const ImmutableString kTexturesStr("textures");
>+        static const ImmutableString kSamplersStr("samplers");
>+        static const ImmutableString kSamplerIndexStr("[samplerIndex]");
>+        static const ImmutableString kTextureIndexStr("[textureIndex]");
>+        static const ImmutableString kSamplerArrayIndexStr("[samplerArrayIndex]");
>+        ImmutableString suffix(TextureGroupSuffix(textureFunction.sampler));
>+
>         if (TextureGroup(textureFunction.sampler) == HLSL_TEXTURE_2D)
>         {
>-            *textureReference = TString("textures") + suffix + "[samplerIndex]";
>-            *samplerReference = TString("samplers") + suffix + "[samplerIndex]";
>+            ImmutableStringBuilder textureRefBuilder(kTexturesStr.length() + suffix.length() +
>+                                                     kSamplerIndexStr.length());
>+            textureRefBuilder << kTexturesStr << suffix << kSamplerIndexStr;
>+            *textureReference = textureRefBuilder;
>+            ImmutableStringBuilder samplerRefBuilder(kSamplersStr.length() + suffix.length() +
>+                                                     kSamplerIndexStr.length());
>+            samplerRefBuilder << kSamplersStr << suffix << kSamplerIndexStr;
>+            *samplerReference = samplerRefBuilder;
>         }
>         else
>         {
>-            out << "    const uint textureIndex = samplerIndex - textureIndexOffset" << suffix
>-                << ";\n";
>-            *textureReference = TString("textures") + suffix + "[textureIndex]";
>-            out << "    const uint samplerArrayIndex = samplerIndex - samplerIndexOffset" << suffix
>-                << ";\n";
>-            *samplerReference = TString("samplers") + suffix + "[samplerArrayIndex]";
>+            out << "    const uint textureIndex = samplerIndex - textureIndexOffset"
>+                << suffix.data() << ";\n";
>+            ImmutableStringBuilder textureRefBuilder(kTexturesStr.length() + suffix.length() +
>+                                                     kTextureIndexStr.length());
>+            textureRefBuilder << kTexturesStr << suffix << kTextureIndexStr;
>+            *textureReference = textureRefBuilder;
>+
>+            out << "    const uint samplerArrayIndex = samplerIndex - samplerIndexOffset"
>+                << suffix.data() << ";\n";
>+            ImmutableStringBuilder samplerRefBuilder(kSamplersStr.length() + suffix.length() +
>+                                                     kSamplerArrayIndexStr.length());
>+            samplerRefBuilder << kSamplersStr << suffix << kSamplerArrayIndexStr;
>+            *samplerReference = samplerRefBuilder;
>         }
>     }
>     else
>     {
>-        *textureReference = "x";
>-        *samplerReference = "s";
>+        *textureReference = ImmutableString("x");
>+        *samplerReference = ImmutableString("s");
>     }
> }
> 
> void OutputTextureSizeFunctionBody(TInfoSinkBase &out,
>                                    const TextureFunctionHLSL::TextureFunction &textureFunction,
>-                                   const TString &textureReference,
>+                                   const ImmutableString &textureReference,
>                                    bool getDimensionsIgnoresBaseLevel)
> {
>     if (IsSampler2DMS(textureFunction.sampler))
>@@ -488,6 +511,11 @@ void OutputTextureSizeFunctionBody(TInfoSinkBase &out,
>         out << "    uint width; uint height; uint samples;\n"
>             << "    " << textureReference << ".GetDimensions(width, height, samples);\n";
>     }
>+    else if (IsSampler2DMSArray(textureFunction.sampler))
>+    {
>+        out << "    uint width; uint height; uint depth; uint samples;\n"
>+            << "    " << textureReference << ".GetDimensions(width, height, depth, samples);\n";
>+    }
>     else
>     {
>         if (getDimensionsIgnoresBaseLevel)
>@@ -537,27 +565,33 @@ void OutputTextureSizeFunctionBody(TInfoSinkBase &out,
> }
> 
> void ProjectTextureCoordinates(const TextureFunctionHLSL::TextureFunction &textureFunction,
>-                               TString *texCoordX,
>-                               TString *texCoordY,
>-                               TString *texCoordZ)
>+                               ImmutableString *texCoordX,
>+                               ImmutableString *texCoordY,
>+                               ImmutableString *texCoordZ)
> {
>     if (textureFunction.proj)
>     {
>-        TString proj("");
>+        ImmutableString proj("");
>         switch (textureFunction.coords)
>         {
>             case 3:
>-                proj = " / t.z";
>+                proj = ImmutableString(" / t.z");
>                 break;
>             case 4:
>-                proj = " / t.w";
>+                proj = ImmutableString(" / t.w");
>                 break;
>             default:
>                 UNREACHABLE();
>         }
>-        *texCoordX = "(" + *texCoordX + proj + ")";
>-        *texCoordY = "(" + *texCoordY + proj + ")";
>-        *texCoordZ = "(" + *texCoordZ + proj + ")";
>+        ImmutableStringBuilder texCoordXBuilder(texCoordX->length() + proj.length() + 2u);
>+        texCoordXBuilder << '(' << *texCoordX << proj << ')';
>+        *texCoordX = texCoordXBuilder;
>+        ImmutableStringBuilder texCoordYBuilder(texCoordY->length() + proj.length() + 2u);
>+        texCoordYBuilder << '(' << *texCoordY << proj << ')';
>+        *texCoordY = texCoordYBuilder;
>+        ImmutableStringBuilder texCoordZBuilder(texCoordZ->length() + proj.length() + 2u);
>+        texCoordZBuilder << '(' << *texCoordZ << proj << ')';
>+        *texCoordZ = texCoordZBuilder;
>     }
> }
> 
>@@ -565,10 +599,10 @@ void OutputIntegerTextureSampleFunctionComputations(
>     TInfoSinkBase &out,
>     const TextureFunctionHLSL::TextureFunction &textureFunction,
>     const ShShaderOutput outputType,
>-    const TString &textureReference,
>-    TString *texCoordX,
>-    TString *texCoordY,
>-    TString *texCoordZ)
>+    const ImmutableString &textureReference,
>+    ImmutableString *texCoordX,
>+    ImmutableString *texCoordY,
>+    ImmutableString *texCoordZ)
> {
>     if (!IsIntegerSampler(textureFunction.sampler))
>     {
>@@ -656,104 +690,108 @@ void OutputIntegerTextureSampleFunctionComputations(
>         }
> 
>         // Convert from normalized floating-point to integer
>-        *texCoordX = "int(floor(width * frac(" + *texCoordX + ")))";
>-        *texCoordY = "int(floor(height * frac(" + *texCoordY + ")))";
>-        *texCoordZ = "face";
>+        static const ImmutableString kXPrefix("int(floor(width * frac(");
>+        static const ImmutableString kYPrefix("int(floor(height * frac(");
>+        static const ImmutableString kSuffix(")))");
>+        ImmutableStringBuilder texCoordXBuilder(kXPrefix.length() + texCoordX->length() +
>+                                                kSuffix.length());
>+        texCoordXBuilder << kXPrefix << *texCoordX << kSuffix;
>+        *texCoordX = texCoordXBuilder;
>+        ImmutableStringBuilder texCoordYBuilder(kYPrefix.length() + texCoordX->length() +
>+                                                kSuffix.length());
>+        texCoordYBuilder << kYPrefix << *texCoordY << kSuffix;
>+        *texCoordY = texCoordYBuilder;
>+        *texCoordZ = ImmutableString("face");
>     }
>     else if (textureFunction.method != TextureFunctionHLSL::TextureFunction::FETCH)
>     {
>-        if (IsSampler2D(textureFunction.sampler))
>+        if (IsSamplerArray(textureFunction.sampler))
>         {
>-            if (IsSamplerArray(textureFunction.sampler))
>+            out << "    float width; float height; float layers; float levels;\n";
>+
>+            if (textureFunction.method == TextureFunctionHLSL::TextureFunction::LOD0)
>+            {
>+                out << "    uint mip = 0;\n";
>+            }
>+            else if (textureFunction.method == TextureFunctionHLSL::TextureFunction::LOD0BIAS)
>+            {
>+                out << "    uint mip = bias;\n";
>+            }
>+            else
>             {
>-                out << "    float width; float height; float layers; float levels;\n";
> 
>-                if (textureFunction.method == TextureFunctionHLSL::TextureFunction::LOD0)
>+                out << "    " << textureReference
>+                    << ".GetDimensions(0, width, height, layers, levels);\n";
>+                if (textureFunction.method == TextureFunctionHLSL::TextureFunction::IMPLICIT ||
>+                    textureFunction.method == TextureFunctionHLSL::TextureFunction::BIAS)
>                 {
>-                    out << "    uint mip = 0;\n";
>+                    out << "    float2 tSized = float2(t.x * width, t.y * height);\n"
>+                           "    float dx = length(ddx(tSized));\n"
>+                           "    float dy = length(ddy(tSized));\n"
>+                           "    float lod = log2(max(dx, dy));\n";
>+
>+                    if (textureFunction.method == TextureFunctionHLSL::TextureFunction::BIAS)
>+                    {
>+                        out << "    lod += bias;\n";
>+                    }
>                 }
>-                else if (textureFunction.method == TextureFunctionHLSL::TextureFunction::LOD0BIAS)
>+                else if (textureFunction.method == TextureFunctionHLSL::TextureFunction::GRAD)
>                 {
>-                    out << "    uint mip = bias;\n";
>+                    out << "    float2 sizeVec = float2(width, height);\n"
>+                           "    float2 sizeDdx = ddx * sizeVec;\n"
>+                           "    float2 sizeDdy = ddy * sizeVec;\n"
>+                           "    float lod = log2(max(dot(sizeDdx, sizeDdx), "
>+                           "dot(sizeDdy, sizeDdy))) * 0.5f;\n";
>                 }
>-                else
>-                {
> 
>-                    out << "    " << textureReference
>-                        << ".GetDimensions(0, width, height, layers, levels);\n";
>-                    if (textureFunction.method == TextureFunctionHLSL::TextureFunction::IMPLICIT ||
>-                        textureFunction.method == TextureFunctionHLSL::TextureFunction::BIAS)
>-                    {
>-                        out << "    float2 tSized = float2(t.x * width, t.y * height);\n"
>-                               "    float dx = length(ddx(tSized));\n"
>-                               "    float dy = length(ddy(tSized));\n"
>-                               "    float lod = log2(max(dx, dy));\n";
>-
>-                        if (textureFunction.method == TextureFunctionHLSL::TextureFunction::BIAS)
>-                        {
>-                            out << "    lod += bias;\n";
>-                        }
>-                    }
>-                    else if (textureFunction.method == TextureFunctionHLSL::TextureFunction::GRAD)
>-                    {
>-                        out << "    float2 sizeVec = float2(width, height);\n"
>-                               "    float2 sizeDdx = ddx * sizeVec;\n"
>-                               "    float2 sizeDdy = ddy * sizeVec;\n"
>-                               "    float lod = log2(max(dot(sizeDdx, sizeDdx), "
>-                               "dot(sizeDdy, sizeDdy))) * 0.5f;\n";
>-                    }
>+                out << "    uint mip = uint(min(max(round(lod), 0), levels - 1));\n";
>+            }
> 
>-                    out << "    uint mip = uint(min(max(round(lod), 0), levels - 1));\n";
>-                }
>+            out << "    " << textureReference
>+                << ".GetDimensions(mip, width, height, layers, levels);\n";
>+        }
>+        else if (IsSampler2D(textureFunction.sampler))
>+        {
>+            out << "    float width; float height; float levels;\n";
> 
>-                out << "    " << textureReference
>-                    << ".GetDimensions(mip, width, height, layers, levels);\n";
>+            if (textureFunction.method == TextureFunctionHLSL::TextureFunction::LOD0)
>+            {
>+                out << "    uint mip = 0;\n";
>+            }
>+            else if (textureFunction.method == TextureFunctionHLSL::TextureFunction::LOD0BIAS)
>+            {
>+                out << "    uint mip = bias;\n";
>             }
>             else
>             {
>-                out << "    float width; float height; float levels;\n";
>+                out << "    " << textureReference << ".GetDimensions(0, width, height, levels);\n";
> 
>-                if (textureFunction.method == TextureFunctionHLSL::TextureFunction::LOD0)
>-                {
>-                    out << "    uint mip = 0;\n";
>-                }
>-                else if (textureFunction.method == TextureFunctionHLSL::TextureFunction::LOD0BIAS)
>-                {
>-                    out << "    uint mip = bias;\n";
>-                }
>-                else
>+                if (textureFunction.method == TextureFunctionHLSL::TextureFunction::IMPLICIT ||
>+                    textureFunction.method == TextureFunctionHLSL::TextureFunction::BIAS)
>                 {
>-                    out << "    " << textureReference
>-                        << ".GetDimensions(0, width, height, levels);\n";
>+                    out << "    float2 tSized = float2(t.x * width, t.y * height);\n"
>+                           "    float dx = length(ddx(tSized));\n"
>+                           "    float dy = length(ddy(tSized));\n"
>+                           "    float lod = log2(max(dx, dy));\n";
> 
>-                    if (textureFunction.method == TextureFunctionHLSL::TextureFunction::IMPLICIT ||
>-                        textureFunction.method == TextureFunctionHLSL::TextureFunction::BIAS)
>-                    {
>-                        out << "    float2 tSized = float2(t.x * width, t.y * height);\n"
>-                               "    float dx = length(ddx(tSized));\n"
>-                               "    float dy = length(ddy(tSized));\n"
>-                               "    float lod = log2(max(dx, dy));\n";
>-
>-                        if (textureFunction.method == TextureFunctionHLSL::TextureFunction::BIAS)
>-                        {
>-                            out << "    lod += bias;\n";
>-                        }
>-                    }
>-                    else if (textureFunction.method == TextureFunctionHLSL::TextureFunction::GRAD)
>+                    if (textureFunction.method == TextureFunctionHLSL::TextureFunction::BIAS)
>                     {
>-                        out << "    float2 sizeVec = float2(width, height);\n"
>-                               "    float2 sizeDdx = ddx * sizeVec;\n"
>-                               "    float2 sizeDdy = ddy * sizeVec;\n"
>-                               "    float lod = log2(max(dot(sizeDdx, sizeDdx), "
>-                               "dot(sizeDdy, sizeDdy))) * 0.5f;\n";
>+                        out << "    lod += bias;\n";
>                     }
>-
>-                    out << "    uint mip = uint(min(max(round(lod), 0), levels - 1));\n";
>+                }
>+                else if (textureFunction.method == TextureFunctionHLSL::TextureFunction::GRAD)
>+                {
>+                    out << "    float2 sizeVec = float2(width, height);\n"
>+                           "    float2 sizeDdx = ddx * sizeVec;\n"
>+                           "    float2 sizeDdy = ddy * sizeVec;\n"
>+                           "    float lod = log2(max(dot(sizeDdx, sizeDdx), "
>+                           "dot(sizeDdy, sizeDdy))) * 0.5f;\n";
>                 }
> 
>-                out << "    " << textureReference
>-                    << ".GetDimensions(mip, width, height, levels);\n";
>+                out << "    uint mip = uint(min(max(round(lod), 0), levels - 1));\n";
>             }
>+
>+            out << "    " << textureReference << ".GetDimensions(mip, width, height, levels);\n";
>         }
>         else if (IsSampler3D(textureFunction.sampler))
>         {
>@@ -807,18 +845,95 @@ void OutputIntegerTextureSampleFunctionComputations(
>     }
> }
> 
>+void OutputTextureGatherFunctionBody(TInfoSinkBase &out,
>+                                     const TextureFunctionHLSL::TextureFunction &textureFunction,
>+                                     ShShaderOutput outputType,
>+                                     const ImmutableString &textureReference,
>+                                     const ImmutableString &samplerReference,
>+                                     const ImmutableString &texCoordX,
>+                                     const ImmutableString &texCoordY,
>+                                     const ImmutableString &texCoordZ)
>+{
>+    const int hlslCoords = GetHLSLCoordCount(textureFunction, outputType);
>+    ImmutableString samplerCoordTypeString(
>+        GetSamplerCoordinateTypeString(textureFunction, hlslCoords));
>+    ImmutableStringBuilder samplerCoordBuilder(
>+        samplerCoordTypeString.length() + strlen("(") + texCoordX.length() + strlen(", ") +
>+        texCoordY.length() + strlen(", ") + texCoordZ.length() + strlen(")"));
>+
>+    samplerCoordBuilder << samplerCoordTypeString << "(" << texCoordX << ", " << texCoordY;
>+    if (hlslCoords >= 3)
>+    {
>+        if (textureFunction.coords < 3)
>+        {
>+            samplerCoordBuilder << ", 0";
>+        }
>+        else
>+        {
>+            samplerCoordBuilder << ", " << texCoordZ;
>+        }
>+    }
>+    samplerCoordBuilder << ")";
>+
>+    ImmutableString samplerCoordString(samplerCoordBuilder);
>+
>+    if (IsShadowSampler(textureFunction.sampler))
>+    {
>+        out << "return " << textureReference << ".GatherCmp(" << samplerReference << ", "
>+            << samplerCoordString << ", refZ";
>+        if (textureFunction.offset)
>+        {
>+            out << ", offset";
>+        }
>+        out << ");\n";
>+        return;
>+    }
>+
>+    constexpr std::array<const char *, 4> kHLSLGatherFunctions = {
>+        {"GatherRed", "GatherGreen", "GatherBlue", "GatherAlpha"}};
>+
>+    out << "    switch(comp)\n"
>+           "    {\n";
>+    for (size_t component = 0; component < kHLSLGatherFunctions.size(); ++component)
>+    {
>+        out << "        case " << component << ":\n"
>+            << "            return " << textureReference << "." << kHLSLGatherFunctions[component]
>+            << "(" << samplerReference << ", " << samplerCoordString;
>+        if (textureFunction.offset)
>+        {
>+            out << ", offset";
>+        }
>+        out << ");\n";
>+    }
>+
>+    out << "        default:\n"
>+           "            return float4(0.0, 0.0, 0.0, 1.0);\n"
>+           "    }\n";
>+}
>+
> void OutputTextureSampleFunctionReturnStatement(
>     TInfoSinkBase &out,
>     const TextureFunctionHLSL::TextureFunction &textureFunction,
>     const ShShaderOutput outputType,
>-    const TString &textureReference,
>-    const TString &samplerReference,
>-    const TString &texCoordX,
>-    const TString &texCoordY,
>-    const TString &texCoordZ)
>+    const ImmutableString &textureReference,
>+    const ImmutableString &samplerReference,
>+    const ImmutableString &texCoordX,
>+    const ImmutableString &texCoordY,
>+    const ImmutableString &texCoordZ)
> {
>     out << "    return ";
> 
>+    if (IsIntegerSampler(textureFunction.sampler) && !IsSamplerCube(textureFunction.sampler) &&
>+        textureFunction.method != TextureFunctionHLSL::TextureFunction::FETCH)
>+    {
>+        out << " useBorderColor ? ";
>+        if (IsIntegerSamplerUnsigned(textureFunction.sampler))
>+        {
>+            out << "asuint";
>+        }
>+        out << "(samplerMetadata[samplerIndex].intBorderColor) : ";
>+    }
>+
>     // HLSL intrinsic
>     if (outputType == SH_HLSL_3_0_OUTPUT)
>     {
>@@ -956,9 +1071,8 @@ void OutputTextureSampleFunctionReturnStatement(
>         else if (IsIntegerSampler(textureFunction.sampler) ||
>                  textureFunction.method == TextureFunctionHLSL::TextureFunction::FETCH)
>         {
>-            if (textureFunction.sampler == EbtSampler2DMS ||
>-                textureFunction.sampler == EbtISampler2DMS ||
>-                textureFunction.sampler == EbtUSampler2DMS)
>+            if (IsSampler2DMS(textureFunction.sampler) ||
>+                IsSampler2DMSArray(textureFunction.sampler))
>                 out << "), index";
>             else
>                 out << ", mip)";
>@@ -1026,22 +1140,28 @@ void OutputTextureSampleFunctionReturnStatement(
> 
> }  // Anonymous namespace
> 
>-TString TextureFunctionHLSL::TextureFunction::name() const
>+ImmutableString TextureFunctionHLSL::TextureFunction::name() const
> {
>-    TString name = "gl_texture";
>+    static const ImmutableString kGlTextureName("gl_texture");
>+
>+    ImmutableString suffix(TextureTypeSuffix(this->sampler));
>+
>+    ImmutableStringBuilder name(kGlTextureName.length() + suffix.length() + 4u + 6u + 5u);
>+
>+    name << kGlTextureName;
> 
>     // We need to include full the sampler type in the function name to make the signature unique
>     // on D3D11, where samplers are passed to texture functions as indices.
>-    name += TextureTypeSuffix(this->sampler);
>+    name << suffix;
> 
>     if (proj)
>     {
>-        name += "Proj";
>+        name << "Proj";
>     }
> 
>     if (offset)
>     {
>-        name += "Offset";
>+        name << "Offset";
>     }
> 
>     switch (method)
>@@ -1051,22 +1171,25 @@ TString TextureFunctionHLSL::TextureFunction::name() const
>         case BIAS:
>             break;  // Extra parameter makes the signature unique
>         case LOD:
>-            name += "Lod";
>+            name << "Lod";
>             break;
>         case LOD0:
>-            name += "Lod0";
>+            name << "Lod0";
>             break;
>         case LOD0BIAS:
>-            name += "Lod0";
>+            name << "Lod0";
>             break;  // Extra parameter makes the signature unique
>         case SIZE:
>-            name += "Size";
>+            name << "Size";
>             break;
>         case FETCH:
>-            name += "Fetch";
>+            name << "Fetch";
>             break;
>         case GRAD:
>-            name += "Grad";
>+            name << "Grad";
>+            break;
>+        case GATHER:
>+            name << "Gather";
>             break;
>         default:
>             UNREACHABLE();
>@@ -1100,6 +1223,9 @@ const char *TextureFunctionHLSL::TextureFunction::getReturnType() const
>             case EbtSampler2DArray:
>             case EbtISampler2DArray:
>             case EbtUSampler2DArray:
>+            case EbtSampler2DMSArray:
>+            case EbtISampler2DMSArray:
>+            case EbtUSampler2DMSArray:
>             case EbtSampler2DArrayShadow:
>                 return "int3";
>             default:
>@@ -1112,6 +1238,7 @@ const char *TextureFunctionHLSL::TextureFunction::getReturnType() const
>         {
>             case EbtSampler2D:
>             case EbtSampler2DMS:
>+            case EbtSampler2DMSArray:
>             case EbtSampler3D:
>             case EbtSamplerCube:
>             case EbtSampler2DArray:
>@@ -1119,12 +1246,14 @@ const char *TextureFunctionHLSL::TextureFunction::getReturnType() const
>                 return "float4";
>             case EbtISampler2D:
>             case EbtISampler2DMS:
>+            case EbtISampler2DMSArray:
>             case EbtISampler3D:
>             case EbtISamplerCube:
>             case EbtISampler2DArray:
>                 return "int4";
>             case EbtUSampler2D:
>             case EbtUSampler2DMS:
>+            case EbtUSampler2DMSArray:
>             case EbtUSampler3D:
>             case EbtUSamplerCube:
>             case EbtUSampler2DArray:
>@@ -1132,7 +1261,14 @@ const char *TextureFunctionHLSL::TextureFunction::getReturnType() const
>             case EbtSampler2DShadow:
>             case EbtSamplerCubeShadow:
>             case EbtSampler2DArrayShadow:
>-                return "float";
>+                if (method == TextureFunctionHLSL::TextureFunction::GATHER)
>+                {
>+                    return "float4";
>+                }
>+                else
>+                {
>+                    return "float";
>+                }
>             default:
>                 UNREACHABLE();
>         }
>@@ -1146,12 +1282,12 @@ bool TextureFunctionHLSL::TextureFunction::operator<(const TextureFunction &rhs)
>            std::tie(rhs.sampler, rhs.coords, rhs.proj, rhs.offset, rhs.method);
> }
> 
>-TString TextureFunctionHLSL::useTextureFunction(const TString &name,
>-                                                TBasicType samplerType,
>-                                                int coords,
>-                                                size_t argumentCount,
>-                                                bool lod0,
>-                                                sh::GLenum shaderType)
>+ImmutableString TextureFunctionHLSL::useTextureFunction(const ImmutableString &name,
>+                                                        TBasicType samplerType,
>+                                                        int coords,
>+                                                        size_t argumentCount,
>+                                                        bool lod0,
>+                                                        sh::GLenum shaderType)
> {
>     TextureFunction textureFunction;
>     textureFunction.sampler = samplerType;
>@@ -1236,6 +1372,15 @@ TString TextureFunctionHLSL::useTextureFunction(const TString &name,
>         textureFunction.proj   = true;
>         textureFunction.offset = true;
>     }
>+    else if (name == "textureGather")
>+    {
>+        textureFunction.method = TextureFunction::GATHER;
>+    }
>+    else if (name == "textureGatherOffset")
>+    {
>+        textureFunction.method = TextureFunction::GATHER;
>+        textureFunction.offset = true;
>+    }
>     else
>         UNREACHABLE();
> 
>@@ -1251,7 +1396,7 @@ TString TextureFunctionHLSL::useTextureFunction(const TString &name,
> 
>         bool bias = (argumentCount > mandatoryArgumentCount);  // Bias argument is optional
> 
>-        if (lod0 || shaderType == GL_VERTEX_SHADER)
>+        if (lod0 || shaderType == GL_VERTEX_SHADER || shaderType == GL_COMPUTE_SHADER)
>         {
>             if (bias)
>             {
>@@ -1291,8 +1436,8 @@ void TextureFunctionHLSL::textureFunctionHeader(TInfoSinkBase &out,
>         // sampling we need to call the function directly on references to the texture and sampler
>         // arrays. The bug was found using dEQP-GLES3.functional.shaders.discard*loop_texture*
>         // tests.
>-        TString textureReference;
>-        TString samplerReference;
>+        ImmutableString textureReference("");
>+        ImmutableString samplerReference("");
>         GetTextureReference(out, textureFunction, outputType, &textureReference, &samplerReference);
> 
>         if (textureFunction.method == TextureFunction::SIZE)
>@@ -1302,16 +1447,24 @@ void TextureFunctionHLSL::textureFunctionHeader(TInfoSinkBase &out,
>         }
>         else
>         {
>-            TString texCoordX("t.x");
>-            TString texCoordY("t.y");
>-            TString texCoordZ("t.z");
>-            ProjectTextureCoordinates(textureFunction, &texCoordX, &texCoordY, &texCoordZ);
>-            OutputIntegerTextureSampleFunctionComputations(out, textureFunction, outputType,
>-                                                           textureReference, &texCoordX, &texCoordY,
>-                                                           &texCoordZ);
>-            OutputTextureSampleFunctionReturnStatement(out, textureFunction, outputType,
>-                                                       textureReference, samplerReference,
>-                                                       texCoordX, texCoordY, texCoordZ);
>+            ImmutableString texCoordX("t.x");
>+            ImmutableString texCoordY("t.y");
>+            ImmutableString texCoordZ("t.z");
>+            if (textureFunction.method == TextureFunction::GATHER)
>+            {
>+                OutputTextureGatherFunctionBody(out, textureFunction, outputType, textureReference,
>+                                                samplerReference, texCoordX, texCoordY, texCoordZ);
>+            }
>+            else
>+            {
>+                ProjectTextureCoordinates(textureFunction, &texCoordX, &texCoordY, &texCoordZ);
>+                OutputIntegerTextureSampleFunctionComputations(out, textureFunction, outputType,
>+                                                               textureReference, &texCoordX,
>+                                                               &texCoordY, &texCoordZ);
>+                OutputTextureSampleFunctionReturnStatement(out, textureFunction, outputType,
>+                                                           textureReference, samplerReference,
>+                                                           texCoordX, texCoordY, texCoordZ);
>+            }
>         }
> 
>         out << "}\n"
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/TextureFunctionHLSL.h b/Source/ThirdParty/ANGLE/src/compiler/translator/TextureFunctionHLSL.h
>index 68bf8c0898c..98de98fff57 100644
>--- a/Source/ThirdParty/ANGLE/src/compiler/translator/TextureFunctionHLSL.h
>+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/TextureFunctionHLSL.h
>@@ -14,10 +14,10 @@
> 
> #include <set>
> 
>+#include "GLSLANG/ShaderLang.h"
> #include "compiler/translator/BaseTypes.h"
> #include "compiler/translator/Common.h"
> #include "compiler/translator/InfoSink.h"
>-#include "GLSLANG/ShaderLang.h"
> 
> namespace sh
> {
>@@ -37,10 +37,11 @@ class TextureFunctionHLSL final : angle::NonCopyable
>             LOD0BIAS,
>             SIZE,  // textureSize()
>             FETCH,
>-            GRAD
>+            GRAD,
>+            GATHER
>         };
> 
>-        TString name() const;
>+        ImmutableString name() const;
> 
>         bool operator<(const TextureFunction &rhs) const;
> 
>@@ -55,12 +56,12 @@ class TextureFunctionHLSL final : angle::NonCopyable
> 
>     // Returns the name of the texture function implementation to call.
>     // The name that's passed in is the name of the GLSL texture function that it should implement.
>-    TString useTextureFunction(const TString &name,
>-                               TBasicType samplerType,
>-                               int coords,
>-                               size_t argumentCount,
>-                               bool lod0,
>-                               sh::GLenum shaderType);
>+    ImmutableString useTextureFunction(const ImmutableString &name,
>+                                       TBasicType samplerType,
>+                                       int coords,
>+                                       size_t argumentCount,
>+                                       bool lod0,
>+                                       sh::GLenum shaderType);
> 
>     void textureFunctionHeader(TInfoSinkBase &out,
>                                const ShShaderOutput outputType,
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/TranslatorESSL.cpp b/Source/ThirdParty/ANGLE/src/compiler/translator/TranslatorESSL.cpp
>index 23c967f9444..786a291e2c2 100644
>--- a/Source/ThirdParty/ANGLE/src/compiler/translator/TranslatorESSL.cpp
>+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/TranslatorESSL.cpp
>@@ -6,19 +6,18 @@
> 
> #include "compiler/translator/TranslatorESSL.h"
> 
>+#include "angle_gl.h"
> #include "compiler/translator/BuiltInFunctionEmulatorGLSL.h"
>-#include "compiler/translator/EmulatePrecision.h"
>-#include "compiler/translator/RecordConstantPrecision.h"
> #include "compiler/translator/OutputESSL.h"
>-#include "angle_gl.h"
>+#include "compiler/translator/tree_ops/EmulatePrecision.h"
>+#include "compiler/translator/tree_ops/RecordConstantPrecision.h"
> 
> namespace sh
> {
> 
> TranslatorESSL::TranslatorESSL(sh::GLenum type, ShShaderSpec spec)
>     : TCompiler(type, spec, SH_ESSL_OUTPUT)
>-{
>-}
>+{}
> 
> void TranslatorESSL::initBuiltInFunctionEmulator(BuiltInFunctionEmulator *emu,
>                                                  ShCompileOptions compileOptions)
>@@ -53,7 +52,7 @@ void TranslatorESSL::translate(TIntermBlock *root,
> 
>     if (precisionEmulation)
>     {
>-        EmulatePrecision emulatePrecision(&getSymbolTable(), shaderVer);
>+        EmulatePrecision emulatePrecision(&getSymbolTable());
>         root->traverse(&emulatePrecision);
>         emulatePrecision.updateTree();
>         emulatePrecision.writeEmulationHelpers(sink, shaderVer, SH_ESSL_OUTPUT);
>@@ -92,7 +91,7 @@ void TranslatorESSL::translate(TIntermBlock *root,
>              << ", local_size_z=" << localSize[2] << ") in;\n";
>     }
> 
>-    if (getShaderType() == GL_GEOMETRY_SHADER_OES)
>+    if (getShaderType() == GL_GEOMETRY_SHADER_EXT)
>     {
>         WriteGeometryShaderLayoutQualifiers(
>             sink, getGeometryShaderInputPrimitiveType(), getGeometryShaderInvocations(),
>@@ -104,20 +103,21 @@ void TranslatorESSL::translate(TIntermBlock *root,
>                            &getSymbolTable(), getShaderType(), shaderVer, precisionEmulation,
>                            compileOptions);
> 
>-    if (compileOptions & SH_TRANSLATE_VIEWID_OVR_TO_UNIFORM)
>-    {
>-        TName uniformName(TString("ViewID_OVR"));
>-        uniformName.setInternal(true);
>-        sink << "highp uniform int " << outputESSL.hashName(uniformName) << ";\n";
>-    }
>-
>     root->traverse(&outputESSL);
> }
> 
> bool TranslatorESSL::shouldFlattenPragmaStdglInvariantAll()
> {
>-    // Not necessary when translating to ESSL.
>-    return false;
>+    // If following the spec to the letter, we should not flatten this pragma.
>+    // However, the spec's wording means that the pragma applies only to outputs.
>+    // This contradicts the spirit of using the pragma,
>+    // because if the pragma is used in a vertex shader,
>+    // the only way to be able to link it to a fragment shader
>+    // is to manually qualify each of fragment shader's inputs as invariant.
>+    // Which defeats the purpose of this pragma - temporarily make all varyings
>+    // invariant for debugging.
>+    // Thus, we should be non-conformant to spec's letter here and flatten.
>+    return true;
> }
> 
> void TranslatorESSL::writeExtensionBehavior(ShCompileOptions compileOptions)
>@@ -125,15 +125,14 @@ void TranslatorESSL::writeExtensionBehavior(ShCompileOptions compileOptions)
>     TInfoSinkBase &sink                   = getInfoSink().obj;
>     const TExtensionBehavior &extBehavior = getExtensionBehavior();
>     const bool isMultiviewExtEmulated =
>-        (compileOptions &
>-         (SH_TRANSLATE_VIEWID_OVR_TO_UNIFORM | SH_INITIALIZE_BUILTINS_FOR_INSTANCED_MULTIVIEW |
>-          SH_SELECT_VIEW_IN_NV_GLSL_VERTEX_SHADER)) != 0u;
>+        (compileOptions & (SH_INITIALIZE_BUILTINS_FOR_INSTANCED_MULTIVIEW |
>+                           SH_SELECT_VIEW_IN_NV_GLSL_VERTEX_SHADER)) != 0u;
>     for (TExtensionBehavior::const_iterator iter = extBehavior.begin(); iter != extBehavior.end();
>          ++iter)
>     {
>         if (iter->second != EBhUndefined)
>         {
>-            const bool isMultiview = (iter->first == TExtension::OVR_multiview);
>+            const bool isMultiview = (iter->first == TExtension::OVR_multiview2);
>             if (getResources().NV_shader_framebuffer_fetch &&
>                 iter->first == TExtension::EXT_shader_framebuffer_fetch)
>             {
>@@ -152,17 +151,17 @@ void TranslatorESSL::writeExtensionBehavior(ShCompileOptions compileOptions)
>                 {
>                     // Emit the NV_viewport_array2 extension in a vertex shader if the
>                     // SH_SELECT_VIEW_IN_NV_GLSL_VERTEX_SHADER option is set and the
>-                    // OVR_multiview(2) extension is requested.
>+                    // OVR_multiview2 extension is requested.
>                     sink << "#extension GL_NV_viewport_array2 : require\n";
>                 }
>             }
>-            else if (iter->first == TExtension::OES_geometry_shader)
>+            else if (iter->first == TExtension::EXT_geometry_shader)
>             {
>-                sink << "#ifdef GL_OES_geometry_shader\n"
>-                     << "#extension GL_OES_geometry_shader : " << GetBehaviorString(iter->second)
>-                     << "\n"
>-                     << "#elif defined GL_EXT_geometry_shader\n"
>+                sink << "#ifdef GL_EXT_geometry_shader\n"
>                      << "#extension GL_EXT_geometry_shader : " << GetBehaviorString(iter->second)
>+                     << "\n"
>+                     << "#elif defined GL_OES_geometry_shader\n"
>+                     << "#extension GL_OES_geometry_shader : " << GetBehaviorString(iter->second)
>                      << "\n";
>                 if (iter->second == EBhRequire)
>                 {
>@@ -172,6 +171,12 @@ void TranslatorESSL::writeExtensionBehavior(ShCompileOptions compileOptions)
>                 }
>                 sink << "#endif\n";
>             }
>+            else if (iter->first == TExtension::ANGLE_multi_draw)
>+            {
>+                // Don't emit anything. This extension is emulated
>+                ASSERT((compileOptions & SH_EMULATE_GL_DRAW_ID) != 0);
>+                continue;
>+            }
>             else
>             {
>                 sink << "#extension " << GetExtensionNameString(iter->first) << " : "
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/TranslatorGLSL.cpp b/Source/ThirdParty/ANGLE/src/compiler/translator/TranslatorGLSL.cpp
>index a14e69e5d5e..4bd8f548db6 100644
>--- a/Source/ThirdParty/ANGLE/src/compiler/translator/TranslatorGLSL.cpp
>+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/TranslatorGLSL.cpp
>@@ -8,20 +8,19 @@
> 
> #include "angle_gl.h"
> #include "compiler/translator/BuiltInFunctionEmulatorGLSL.h"
>-#include "compiler/translator/EmulatePrecision.h"
> #include "compiler/translator/ExtensionGLSL.h"
> #include "compiler/translator/OutputGLSL.h"
>-#include "compiler/translator/RewriteTexelFetchOffset.h"
>-#include "compiler/translator/RewriteUnaryMinusOperatorFloat.h"
> #include "compiler/translator/VersionGLSL.h"
>+#include "compiler/translator/tree_ops/EmulatePrecision.h"
>+#include "compiler/translator/tree_ops/RewriteTexelFetchOffset.h"
>+#include "compiler/translator/tree_ops/RewriteUnaryMinusOperatorFloat.h"
> 
> namespace sh
> {
> 
> TranslatorGLSL::TranslatorGLSL(sh::GLenum type, ShShaderSpec spec, ShShaderOutput output)
>     : TCompiler(type, spec, output)
>-{
>-}
>+{}
> 
> void TranslatorGLSL::initBuiltInFunctionEmulator(BuiltInFunctionEmulator *emu,
>                                                  ShCompileOptions compileOptions)
>@@ -109,7 +108,7 @@ void TranslatorGLSL::translate(TIntermBlock *root,
> 
>     if (precisionEmulation)
>     {
>-        EmulatePrecision emulatePrecision(&getSymbolTable(), getShaderVersion());
>+        EmulatePrecision emulatePrecision(&getSymbolTable());
>         root->traverse(&emulatePrecision);
>         emulatePrecision.updateTree();
>         emulatePrecision.writeEmulationHelpers(sink, getShaderVersion(), getOutputType());
>@@ -141,7 +140,7 @@ void TranslatorGLSL::translate(TIntermBlock *root,
>         bool hasGLSecondaryFragColor = false;
>         bool hasGLSecondaryFragData  = false;
> 
>-        for (const auto &outputVar : outputVariables)
>+        for (const auto &outputVar : mOutputVariables)
>         {
>             if (declareGLFragmentOutputs)
>             {
>@@ -202,7 +201,7 @@ void TranslatorGLSL::translate(TIntermBlock *root,
>              << ", local_size_z=" << localSize[2] << ") in;\n";
>     }
> 
>-    if (getShaderType() == GL_GEOMETRY_SHADER_OES)
>+    if (getShaderType() == GL_GEOMETRY_SHADER_EXT)
>     {
>         WriteGeometryShaderLayoutQualifiers(
>             sink, getGeometryShaderInputPrimitiveType(), getGeometryShaderInvocations(),
>@@ -214,13 +213,6 @@ void TranslatorGLSL::translate(TIntermBlock *root,
>                            &getSymbolTable(), getShaderType(), getShaderVersion(), getOutputType(),
>                            compileOptions);
> 
>-    if (compileOptions & SH_TRANSLATE_VIEWID_OVR_TO_UNIFORM)
>-    {
>-        TName uniformName(TString("ViewID_OVR"));
>-        uniformName.setInternal(true);
>-        sink << "uniform int " << outputGLSL.hashName(uniformName) << ";\n";
>-    }
>-
>     root->traverse(&outputGLSL);
> }
> 
>@@ -278,22 +270,30 @@ void TranslatorGLSL::writeExtensionBehavior(TIntermNode *root, ShCompileOptions
>                      << "\n";
>             }
> 
>-            if (iter.first == TExtension::OES_geometry_shader)
>+            if (iter.first == TExtension::EXT_geometry_shader)
>             {
>                 sink << "#extension GL_ARB_geometry_shader4 : " << GetBehaviorString(iter.second)
>                      << "\n";
>             }
>         }
> 
>-        const bool isMultiview = (iter.first == TExtension::OVR_multiview);
>+        const bool isMultiview = (iter.first == TExtension::OVR_multiview2);
>         if (isMultiview && getShaderType() == GL_VERTEX_SHADER &&
>             (compileOptions & SH_SELECT_VIEW_IN_NV_GLSL_VERTEX_SHADER) != 0u)
>         {
>             // Emit the NV_viewport_array2 extension in a vertex shader if the
>-            // SH_SELECT_VIEW_IN_NV_GLSL_VERTEX_SHADER option is set and the OVR_multiview(2)
>+            // SH_SELECT_VIEW_IN_NV_GLSL_VERTEX_SHADER option is set and the OVR_multiview2(2)
>             // extension is requested.
>             sink << "#extension GL_NV_viewport_array2 : require\n";
>         }
>+
>+        // Support ANGLE_texture_multisample extension on GLSL300
>+        if (getShaderVersion() >= 300 && iter.first == TExtension::ANGLE_texture_multisample &&
>+            getOutputType() < SH_GLSL_330_CORE_OUTPUT)
>+        {
>+            sink << "#extension GL_ARB_texture_multisample : " << GetBehaviorString(iter.second)
>+                 << "\n";
>+        }
>     }
> 
>     // GLSL ES 3 explicit location qualifiers need to use an extension before GLSL 330
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/TranslatorHLSL.cpp b/Source/ThirdParty/ANGLE/src/compiler/translator/TranslatorHLSL.cpp
>index 091a649cfcb..630188b5d7c 100644
>--- a/Source/ThirdParty/ANGLE/src/compiler/translator/TranslatorHLSL.cpp
>+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/TranslatorHLSL.cpp
>@@ -6,33 +6,35 @@
> 
> #include "compiler/translator/TranslatorHLSL.h"
> 
>-#include "compiler/translator/AddDefaultReturnStatements.h"
>-#include "compiler/translator/ArrayReturnValueToOutParameter.h"
>-#include "compiler/translator/BreakVariableAliasingInInnerLoops.h"
>-#include "compiler/translator/EmulatePrecision.h"
>-#include "compiler/translator/ExpandIntegerPowExpressions.h"
>-#include "compiler/translator/IntermNodePatternMatcher.h"
> #include "compiler/translator/OutputHLSL.h"
>-#include "compiler/translator/RemoveDynamicIndexing.h"
>-#include "compiler/translator/RemoveNoOpCasesFromEndOfSwitchStatements.h"
>-#include "compiler/translator/RewriteElseBlocks.h"
>-#include "compiler/translator/RewriteTexelFetchOffset.h"
>-#include "compiler/translator/RewriteUnaryMinusOperatorInt.h"
>-#include "compiler/translator/SeparateArrayInitialization.h"
>-#include "compiler/translator/SeparateDeclarations.h"
>-#include "compiler/translator/SeparateExpressionsReturningArrays.h"
>-#include "compiler/translator/SimplifyLoopConditions.h"
>-#include "compiler/translator/SplitSequenceOperator.h"
>-#include "compiler/translator/UnfoldShortCircuitToIf.h"
>-#include "compiler/translator/WrapSwitchStatementsInBlocks.h"
>+#include "compiler/translator/tree_ops/AddDefaultReturnStatements.h"
>+#include "compiler/translator/tree_ops/ArrayReturnValueToOutParameter.h"
>+#include "compiler/translator/tree_ops/BreakVariableAliasingInInnerLoops.h"
>+#include "compiler/translator/tree_ops/EmulatePrecision.h"
>+#include "compiler/translator/tree_ops/ExpandIntegerPowExpressions.h"
>+#include "compiler/translator/tree_ops/PruneEmptyCases.h"
>+#include "compiler/translator/tree_ops/RemoveDynamicIndexing.h"
>+#include "compiler/translator/tree_ops/RewriteAtomicFunctionExpressions.h"
>+#include "compiler/translator/tree_ops/RewriteElseBlocks.h"
>+#include "compiler/translator/tree_ops/RewriteExpressionsWithShaderStorageBlock.h"
>+#include "compiler/translator/tree_ops/RewriteTexelFetchOffset.h"
>+#include "compiler/translator/tree_ops/RewriteUnaryMinusOperatorInt.h"
>+#include "compiler/translator/tree_ops/SeparateArrayConstructorStatements.h"
>+#include "compiler/translator/tree_ops/SeparateArrayInitialization.h"
>+#include "compiler/translator/tree_ops/SeparateDeclarations.h"
>+#include "compiler/translator/tree_ops/SeparateExpressionsReturningArrays.h"
>+#include "compiler/translator/tree_ops/SimplifyLoopConditions.h"
>+#include "compiler/translator/tree_ops/SplitSequenceOperator.h"
>+#include "compiler/translator/tree_ops/UnfoldShortCircuitToIf.h"
>+#include "compiler/translator/tree_ops/WrapSwitchStatementsInBlocks.h"
>+#include "compiler/translator/tree_util/IntermNodePatternMatcher.h"
> 
> namespace sh
> {
> 
> TranslatorHLSL::TranslatorHLSL(sh::GLenum type, ShShaderSpec spec, ShShaderOutput output)
>     : TCompiler(type, spec, output)
>-{
>-}
>+{}
> 
> void TranslatorHLSL::translate(TIntermBlock *root,
>                                ShCompileOptions compileOptions,
>@@ -50,17 +52,19 @@ void TranslatorHLSL::translate(TIntermBlock *root,
>                            IntermNodePatternMatcher::kExpressionReturningArray |
>                                IntermNodePatternMatcher::kUnfoldedShortCircuitExpression |
>                                IntermNodePatternMatcher::kDynamicIndexingOfVectorOrMatrixInLValue,
>-                           &getSymbolTable(), getShaderVersion());
>+                           &getSymbolTable());
> 
>     SplitSequenceOperator(root,
>                           IntermNodePatternMatcher::kExpressionReturningArray |
>                               IntermNodePatternMatcher::kUnfoldedShortCircuitExpression |
>                               IntermNodePatternMatcher::kDynamicIndexingOfVectorOrMatrixInLValue,
>-                          &getSymbolTable(), getShaderVersion());
>+                          &getSymbolTable());
> 
>     // Note that SeparateDeclarations needs to be run before UnfoldShortCircuitToIf.
>     UnfoldShortCircuitToIf(root, &getSymbolTable());
> 
>+    SeparateArrayConstructorStatements(root);
>+
>     SeparateExpressionsReturningArrays(root, &getSymbolTable());
> 
>     // Note that SeparateDeclarations needs to be run before SeparateArrayInitialization.
>@@ -73,7 +77,7 @@ void TranslatorHLSL::translate(TIntermBlock *root,
>     if (!shouldRunLoopAndIndexingValidation(compileOptions))
>     {
>         // HLSL doesn't support dynamic indexing of vectors and matrices.
>-        RemoveDynamicIndexing(root, &getSymbolTable(), getShaderVersion(), perfDiagnostics);
>+        RemoveDynamicIndexing(root, &getSymbolTable(), perfDiagnostics);
>     }
> 
>     // Work around D3D9 bug that would manifest in vertex shaders with selection blocks which
>@@ -90,20 +94,17 @@ void TranslatorHLSL::translate(TIntermBlock *root,
>     sh::BreakVariableAliasingInInnerLoops(root);
> 
>     // WrapSwitchStatementsInBlocks should be called after any AST transformations that might
>-    // introduce variable declarations inside the main scope of any switch statement.
>-    if (WrapSwitchStatementsInBlocks(root))
>-    {
>-        // The WrapSwitchStatementsInBlocks step might introduce new no-op cases to the end of
>-        // switch statements, so make sure to clean up the AST.
>-        RemoveNoOpCasesFromEndOfSwitchStatements(root, &getSymbolTable());
>-    }
>+    // introduce variable declarations inside the main scope of any switch statement. It cannot
>+    // result in no-op cases at the end of switch statements, because unreferenced variables
>+    // have already been pruned.
>+    WrapSwitchStatementsInBlocks(root);
> 
>     bool precisionEmulation =
>         getResources().WEBGL_debug_shader_precision && getPragma().debugShaderPrecision;
> 
>     if (precisionEmulation)
>     {
>-        EmulatePrecision emulatePrecision(&getSymbolTable(), getShaderVersion());
>+        EmulatePrecision emulatePrecision(&getSymbolTable());
>         root->traverse(&emulatePrecision);
>         emulatePrecision.updateTree();
>         emulatePrecision.writeEmulationHelpers(getInfoSink().obj, getShaderVersion(),
>@@ -126,14 +127,27 @@ void TranslatorHLSL::translate(TIntermBlock *root,
>         sh::RewriteUnaryMinusOperatorInt(root);
>     }
> 
>+    if (getShaderVersion() >= 310)
>+    {
>+        // Due to ssbo also can be used as the argument of atomic memory functions, we should put
>+        // RewriteExpressionsWithShaderStorageBlock before RewriteAtomicFunctionExpressions.
>+        sh::RewriteExpressionsWithShaderStorageBlock(root, &getSymbolTable());
>+        sh::RewriteAtomicFunctionExpressions(root, &getSymbolTable(), getShaderVersion());
>+    }
>+
>     sh::OutputHLSL outputHLSL(getShaderType(), getShaderVersion(), getExtensionBehavior(),
>                               getSourcePath(), getOutputType(), numRenderTargets, getUniforms(),
>-                              compileOptions, &getSymbolTable(), perfDiagnostics);
>+                              compileOptions, getComputeShaderLocalSize(), &getSymbolTable(),
>+                              perfDiagnostics, mShaderStorageBlocks);
> 
>     outputHLSL.output(root, getInfoSink().obj);
> 
>-    mUniformBlockRegisterMap   = outputHLSL.getUniformBlockRegisterMap();
>-    mUniformRegisterMap        = outputHLSL.getUniformRegisterMap();
>+    mShaderStorageBlockRegisterMap = outputHLSL.getShaderStorageBlockRegisterMap();
>+    mUniformBlockRegisterMap       = outputHLSL.getUniformBlockRegisterMap();
>+    mUniformRegisterMap            = outputHLSL.getUniformRegisterMap();
>+    mReadonlyImage2DRegisterIndex  = outputHLSL.getReadonlyImage2DRegisterIndex();
>+    mImage2DRegisterIndex          = outputHLSL.getImage2DRegisterIndex();
>+    mUsedImage2DFunctionNames      = outputHLSL.getUsedImage2DFunctionNames();
> }
> 
> bool TranslatorHLSL::shouldFlattenPragmaStdglInvariantAll()
>@@ -142,6 +156,18 @@ bool TranslatorHLSL::shouldFlattenPragmaStdglInvariantAll()
>     return false;
> }
> 
>+bool TranslatorHLSL::hasShaderStorageBlock(const std::string &uniformBlockName) const
>+{
>+    return (mShaderStorageBlockRegisterMap.count(uniformBlockName) > 0);
>+}
>+
>+unsigned int TranslatorHLSL::getShaderStorageBlockRegister(
>+    const std::string &shaderStorageBlockName) const
>+{
>+    ASSERT(hasShaderStorageBlock(shaderStorageBlockName));
>+    return mShaderStorageBlockRegisterMap.find(shaderStorageBlockName)->second;
>+}
>+
> bool TranslatorHLSL::hasUniformBlock(const std::string &uniformBlockName) const
> {
>     return (mUniformBlockRegisterMap.count(uniformBlockName) > 0);
>@@ -158,4 +184,19 @@ const std::map<std::string, unsigned int> *TranslatorHLSL::getUniformRegisterMap
>     return &mUniformRegisterMap;
> }
> 
>+unsigned int TranslatorHLSL::getReadonlyImage2DRegisterIndex() const
>+{
>+    return mReadonlyImage2DRegisterIndex;
>+}
>+
>+unsigned int TranslatorHLSL::getImage2DRegisterIndex() const
>+{
>+    return mImage2DRegisterIndex;
>+}
>+
>+const std::set<std::string> *TranslatorHLSL::getUsedImage2DFunctionNames() const
>+{
>+    return &mUsedImage2DFunctionNames;
>+}
>+
> }  // namespace sh
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/TranslatorHLSL.h b/Source/ThirdParty/ANGLE/src/compiler/translator/TranslatorHLSL.h
>index e8436e98e3e..bb8b7f28554 100644
>--- a/Source/ThirdParty/ANGLE/src/compiler/translator/TranslatorHLSL.h
>+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/TranslatorHLSL.h
>@@ -16,12 +16,18 @@ class TranslatorHLSL : public TCompiler
> {
>   public:
>     TranslatorHLSL(sh::GLenum type, ShShaderSpec spec, ShShaderOutput output);
>-    TranslatorHLSL *getAsTranslatorHLSL() { return this; }
>+    TranslatorHLSL *getAsTranslatorHLSL() override { return this; }
>+
>+    bool hasShaderStorageBlock(const std::string &interfaceBlockName) const;
>+    unsigned int getShaderStorageBlockRegister(const std::string &interfaceBlockName) const;
> 
>     bool hasUniformBlock(const std::string &interfaceBlockName) const;
>     unsigned int getUniformBlockRegister(const std::string &interfaceBlockName) const;
> 
>     const std::map<std::string, unsigned int> *getUniformRegisterMap() const;
>+    unsigned int getReadonlyImage2DRegisterIndex() const;
>+    unsigned int getImage2DRegisterIndex() const;
>+    const std::set<std::string> *getUsedImage2DFunctionNames() const;
> 
>   protected:
>     void translate(TIntermBlock *root,
>@@ -32,8 +38,12 @@ class TranslatorHLSL : public TCompiler
>     // collectVariables needs to be run always so registers can be assigned.
>     bool shouldCollectVariables(ShCompileOptions compileOptions) override { return true; }
> 
>+    std::map<std::string, unsigned int> mShaderStorageBlockRegisterMap;
>     std::map<std::string, unsigned int> mUniformBlockRegisterMap;
>     std::map<std::string, unsigned int> mUniformRegisterMap;
>+    unsigned int mReadonlyImage2DRegisterIndex;
>+    unsigned int mImage2DRegisterIndex;
>+    std::set<std::string> mUsedImage2DFunctionNames;
> };
> 
> }  // namespace sh
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/TranslatorVulkan.cpp b/Source/ThirdParty/ANGLE/src/compiler/translator/TranslatorVulkan.cpp
>index 0fe2a21f90e..19b6847e472 100644
>--- a/Source/ThirdParty/ANGLE/src/compiler/translator/TranslatorVulkan.cpp
>+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/TranslatorVulkan.cpp
>@@ -13,12 +13,70 @@
> 
> #include "angle_gl.h"
> #include "common/utilities.h"
>+#include "compiler/translator/ImmutableStringBuilder.h"
> #include "compiler/translator/OutputVulkanGLSL.h"
>+#include "compiler/translator/StaticType.h"
>+#include "compiler/translator/tree_ops/NameEmbeddedUniformStructs.h"
>+#include "compiler/translator/tree_ops/RewriteStructSamplers.h"
>+#include "compiler/translator/tree_util/BuiltIn_autogen.h"
>+#include "compiler/translator/tree_util/FindMain.h"
>+#include "compiler/translator/tree_util/IntermNode_util.h"
>+#include "compiler/translator/tree_util/ReplaceVariable.h"
>+#include "compiler/translator/tree_util/RunAtTheEndOfShader.h"
> #include "compiler/translator/util.h"
> 
> namespace sh
> {
> 
>+namespace
>+{
>+// This traverses nodes, find the struct ones and add their declarations to the sink. It also
>+// removes the nodes from the tree as it processes them.
>+class DeclareStructTypesTraverser : public TIntermTraverser
>+{
>+  public:
>+    explicit DeclareStructTypesTraverser(TOutputVulkanGLSL *outputVulkanGLSL)
>+        : TIntermTraverser(true, false, false), mOutputVulkanGLSL(outputVulkanGLSL)
>+    {}
>+
>+    bool visitDeclaration(Visit visit, TIntermDeclaration *node) override
>+    {
>+        ASSERT(visit == PreVisit);
>+
>+        if (!mInGlobalScope)
>+        {
>+            return false;
>+        }
>+
>+        const TIntermSequence &sequence = *(node->getSequence());
>+        TIntermTyped *declarator        = sequence.front()->getAsTyped();
>+        const TType &type               = declarator->getType();
>+
>+        if (type.isStructSpecifier())
>+        {
>+            const TStructure *structure = type.getStruct();
>+
>+            // Embedded structs should be parsed away by now.
>+            ASSERT(structure->symbolType() != SymbolType::Empty);
>+            mOutputVulkanGLSL->writeStructType(structure);
>+
>+            TIntermSymbol *symbolNode = declarator->getAsSymbolNode();
>+            if (symbolNode && symbolNode->variable().symbolType() == SymbolType::Empty)
>+            {
>+                // Remove the struct specifier declaration from the tree so it isn't parsed again.
>+                TIntermSequence emptyReplacement;
>+                mMultiReplacements.emplace_back(getParentNode()->getAsBlock(), node,
>+                                                emptyReplacement);
>+            }
>+        }
>+
>+        return false;
>+    }
>+
>+  private:
>+    TOutputVulkanGLSL *mOutputVulkanGLSL;
>+};
>+
> class DeclareDefaultUniformsTraverser : public TIntermTraverser
> {
>   public:
>@@ -30,8 +88,7 @@ class DeclareDefaultUniformsTraverser : public TIntermTraverser
>           mHashFunction(hashFunction),
>           mNameMap(nameMap),
>           mInDefaultUniform(false)
>-    {
>-    }
>+    {}
> 
>     bool visitDeclaration(Visit visit, TIntermDeclaration *node) override
>     {
>@@ -64,8 +121,8 @@ class DeclareDefaultUniformsTraverser : public TIntermTraverser
> 
>                 // Remove the uniform declaration from the tree so it isn't parsed again.
>                 TIntermSequence emptyReplacement;
>-                mMultiReplacements.push_back(NodeReplaceWithMultipleEntry(
>-                    getParentNode()->getAsBlock(), node, emptyReplacement));
>+                mMultiReplacements.emplace_back(getParentNode()->getAsBlock(), node,
>+                                                emptyReplacement);
>             }
> 
>             mInDefaultUniform = false;
>@@ -77,9 +134,10 @@ class DeclareDefaultUniformsTraverser : public TIntermTraverser
>     {
>         if (mInDefaultUniform)
>         {
>-            const TName &name = symbol->getName();
>-            ASSERT(name.getString().substr(0, 3) != "gl_");
>-            (*mSink) << HashName(name, mHashFunction, mNameMap);
>+            const ImmutableString &name = symbol->variable().name();
>+            ASSERT(!name.beginsWith("gl_"));
>+            (*mSink) << HashName(&symbol->variable(), mHashFunction, mNameMap)
>+                     << ArrayString(symbol->getType());
>         }
>     }
> 
>@@ -90,27 +148,521 @@ class DeclareDefaultUniformsTraverser : public TIntermTraverser
>     bool mInDefaultUniform;
> };
> 
>-TranslatorVulkan::TranslatorVulkan(sh::GLenum type, ShShaderSpec spec)
>-    : TCompiler(type, spec, SH_GLSL_450_CORE_OUTPUT)
>+constexpr ImmutableString kFlippedPointCoordName    = ImmutableString("flippedPointCoord");
>+constexpr ImmutableString kFlippedFragCoordName     = ImmutableString("flippedFragCoord");
>+constexpr ImmutableString kEmulatedDepthRangeParams = ImmutableString("ANGLEDepthRangeParams");
>+
>+constexpr const char kViewport[]             = "viewport";
>+constexpr const char kHalfRenderAreaHeight[] = "halfRenderAreaHeight";
>+constexpr const char kViewportYScale[]       = "viewportYScale";
>+constexpr const char kNegViewportYScale[]    = "negViewportYScale";
>+constexpr const char kDepthRange[]           = "depthRange";
>+
>+constexpr size_t kNumDriverUniforms                                        = 6;
>+constexpr std::array<const char *, kNumDriverUniforms> kDriverUniformNames = {
>+    {kViewport, kHalfRenderAreaHeight, kViewportYScale, kNegViewportYScale, "padding",
>+     kDepthRange}};
>+
>+template <TBasicType BasicType = EbtFloat, unsigned char PrimarySize = 1>
>+TIntermConstantUnion *CreateBasicConstant(float value)
>+{
>+    const TType *constantType     = StaticType::GetBasic<BasicType, PrimarySize>();
>+    TConstantUnion *constantValue = new TConstantUnion[PrimarySize];
>+    for (unsigned char sizeIndex = 0; sizeIndex < PrimarySize; ++sizeIndex)
>+    {
>+        constantValue[sizeIndex].setFConst(value);
>+    }
>+    return new TIntermConstantUnion(constantValue, *constantType);
>+}
>+
>+size_t FindFieldIndex(const TFieldList &fieldList, const char *fieldName)
> {
>+    for (size_t fieldIndex = 0; fieldIndex < fieldList.size(); ++fieldIndex)
>+    {
>+        if (strcmp(fieldList[fieldIndex]->name().data(), fieldName) == 0)
>+        {
>+            return fieldIndex;
>+        }
>+    }
>+    UNREACHABLE();
>+    return 0;
>+}
>+
>+TIntermBinary *CreateDriverUniformRef(const TVariable *driverUniforms, const char *fieldName)
>+{
>+    size_t fieldIndex =
>+        FindFieldIndex(driverUniforms->getType().getInterfaceBlock()->fields(), fieldName);
>+
>+    TIntermSymbol *angleUniformsRef = new TIntermSymbol(driverUniforms);
>+    TConstantUnion *uniformIndex    = new TConstantUnion;
>+    uniformIndex->setIConst(fieldIndex);
>+    TIntermConstantUnion *indexRef =
>+        new TIntermConstantUnion(uniformIndex, *StaticType::GetBasic<EbtInt>());
>+    return new TIntermBinary(EOpIndexDirectInterfaceBlock, angleUniformsRef, indexRef);
> }
> 
>+// Replaces a builtin variable with a version that corrects the Y coordinate.
>+void FlipBuiltinVariable(TIntermBlock *root,
>+                         TIntermSequence *insertSequence,
>+                         TIntermTyped *viewportYScale,
>+                         TSymbolTable *symbolTable,
>+                         const TVariable *builtin,
>+                         const ImmutableString &flippedVariableName,
>+                         TIntermTyped *pivot)
>+{
>+    // Create a symbol reference to 'builtin'.
>+    TIntermSymbol *builtinRef = new TIntermSymbol(builtin);
>+
>+    // Create a swizzle to "builtin.y"
>+    TVector<int> swizzleOffsetY;
>+    swizzleOffsetY.push_back(1);
>+    TIntermSwizzle *builtinY = new TIntermSwizzle(builtinRef, swizzleOffsetY);
>+
>+    // Create a symbol reference to our new variable that will hold the modified builtin.
>+    const TType *type = StaticType::GetForVec<EbtFloat>(
>+        EvqGlobal, static_cast<unsigned char>(builtin->getType().getNominalSize()));
>+    TVariable *replacementVar =
>+        new TVariable(symbolTable, flippedVariableName, type, SymbolType::AngleInternal);
>+    DeclareGlobalVariable(root, replacementVar);
>+    TIntermSymbol *flippedBuiltinRef = new TIntermSymbol(replacementVar);
>+
>+    // Use this new variable instead of 'builtin' everywhere.
>+    ReplaceVariable(root, builtin, replacementVar);
>+
>+    // Create the expression "(builtin.y - pivot) * viewportYScale + pivot
>+    TIntermBinary *removePivot = new TIntermBinary(EOpSub, builtinY, pivot);
>+    TIntermBinary *inverseY    = new TIntermBinary(EOpMul, removePivot, viewportYScale);
>+    TIntermBinary *plusPivot   = new TIntermBinary(EOpAdd, inverseY, pivot->deepCopy());
>+
>+    // Create the corrected variable and copy the value of the original builtin.
>+    TIntermSequence *sequence = new TIntermSequence();
>+    sequence->push_back(builtinRef);
>+    TIntermAggregate *aggregate = TIntermAggregate::CreateConstructor(builtin->getType(), sequence);
>+    TIntermBinary *assignment   = new TIntermBinary(EOpInitialize, flippedBuiltinRef, aggregate);
>+
>+    // Create an assignment to the replaced variable's y.
>+    TIntermSwizzle *correctedY = new TIntermSwizzle(flippedBuiltinRef, swizzleOffsetY);
>+    TIntermBinary *assignToY   = new TIntermBinary(EOpAssign, correctedY, plusPivot);
>+
>+    // Add this assigment at the beginning of the main function
>+    insertSequence->insert(insertSequence->begin(), assignToY);
>+    insertSequence->insert(insertSequence->begin(), assignment);
>+}
>+
>+TIntermSequence *GetMainSequence(TIntermBlock *root)
>+{
>+    TIntermFunctionDefinition *main = FindMain(root);
>+    return main->getBody()->getSequence();
>+}
>+
>+// Declares a new variable to replace gl_DepthRange, its values are fed from a driver uniform.
>+void ReplaceGLDepthRangeWithDriverUniform(TIntermBlock *root,
>+                                          const TVariable *driverUniforms,
>+                                          TSymbolTable *symbolTable)
>+{
>+    // Create a symbol reference to "gl_DepthRange"
>+    const TVariable *depthRangeVar = static_cast<const TVariable *>(
>+        symbolTable->findBuiltIn(ImmutableString("gl_DepthRange"), 0));
>+
>+    // ANGLEUniforms.depthRange
>+    TIntermBinary *angleEmulatedDepthRangeRef = CreateDriverUniformRef(driverUniforms, kDepthRange);
>+
>+    // Use this variable instead of gl_DepthRange everywhere.
>+    ReplaceVariableWithTyped(root, depthRangeVar, angleEmulatedDepthRangeRef);
>+}
>+
>+// This operation performs the viewport depth translation needed by Vulkan. In GL the viewport
>+// transformation is slightly different - see the GL 2.0 spec section "2.12.1 Controlling the
>+// Viewport". In Vulkan the corresponding spec section is currently "23.4. Coordinate
>+// Transformations".
>+// The equations reduce to an expression:
>+//
>+//     z_vk = 0.5 * (w_gl + z_gl)
>+//
>+// where z_vk is the depth output of a Vulkan vertex shader and z_gl is the same for GL.
>+void AppendVertexShaderDepthCorrectionToMain(TIntermBlock *root, TSymbolTable *symbolTable)
>+{
>+    // Create a symbol reference to "gl_Position"
>+    const TVariable *position  = BuiltInVariable::gl_Position();
>+    TIntermSymbol *positionRef = new TIntermSymbol(position);
>+
>+    // Create a swizzle to "gl_Position.z"
>+    TVector<int> swizzleOffsetZ;
>+    swizzleOffsetZ.push_back(2);
>+    TIntermSwizzle *positionZ = new TIntermSwizzle(positionRef, swizzleOffsetZ);
>+
>+    // Create a constant "0.5"
>+    TIntermConstantUnion *oneHalf = CreateBasicConstant(0.5f);
>+
>+    // Create a swizzle to "gl_Position.w"
>+    TVector<int> swizzleOffsetW;
>+    swizzleOffsetW.push_back(3);
>+    TIntermSwizzle *positionW = new TIntermSwizzle(positionRef->deepCopy(), swizzleOffsetW);
>+
>+    // Create the expression "(gl_Position.z + gl_Position.w) * 0.5".
>+    TIntermBinary *zPlusW = new TIntermBinary(EOpAdd, positionZ->deepCopy(), positionW->deepCopy());
>+    TIntermBinary *halfZPlusW = new TIntermBinary(EOpMul, zPlusW, oneHalf->deepCopy());
>+
>+    // Create the assignment "gl_Position.z = (gl_Position.z + gl_Position.w) * 0.5"
>+    TIntermTyped *positionZLHS = positionZ->deepCopy();
>+    TIntermBinary *assignment  = new TIntermBinary(TOperator::EOpAssign, positionZLHS, halfZPlusW);
>+
>+    // Append the assignment as a statement at the end of the shader.
>+    RunAtTheEndOfShader(root, assignment, symbolTable);
>+}
>+
>+// The AddDriverUniformsToShader operation adds an internal uniform block to a shader. The driver
>+// block is used to implement Vulkan-specific features and workarounds. Returns the driver uniforms
>+// variable.
>+const TVariable *AddDriverUniformsToShader(TIntermBlock *root, TSymbolTable *symbolTable)
>+{
>+    // Init the depth range type.
>+    TFieldList *depthRangeParamsFields = new TFieldList();
>+    depthRangeParamsFields->push_back(new TField(new TType(EbtFloat, EbpHigh, EvqGlobal, 1, 1),
>+                                                 ImmutableString("near"), TSourceLoc(),
>+                                                 SymbolType::AngleInternal));
>+    depthRangeParamsFields->push_back(new TField(new TType(EbtFloat, EbpHigh, EvqGlobal, 1, 1),
>+                                                 ImmutableString("far"), TSourceLoc(),
>+                                                 SymbolType::AngleInternal));
>+    depthRangeParamsFields->push_back(new TField(new TType(EbtFloat, EbpHigh, EvqGlobal, 1, 1),
>+                                                 ImmutableString("diff"), TSourceLoc(),
>+                                                 SymbolType::AngleInternal));
>+    depthRangeParamsFields->push_back(new TField(new TType(EbtFloat, EbpHigh, EvqGlobal, 1, 1),
>+                                                 ImmutableString("dummyPacker"), TSourceLoc(),
>+                                                 SymbolType::AngleInternal));
>+    TStructure *emulatedDepthRangeParams = new TStructure(
>+        symbolTable, kEmulatedDepthRangeParams, depthRangeParamsFields, SymbolType::AngleInternal);
>+    TType *emulatedDepthRangeType = new TType(emulatedDepthRangeParams, false);
>+
>+    // Declare a global depth range variable.
>+    TVariable *depthRangeVar =
>+        new TVariable(symbolTable->nextUniqueId(), kEmptyImmutableString, SymbolType::Empty,
>+                      TExtension::UNDEFINED, emulatedDepthRangeType);
>+
>+    DeclareGlobalVariable(root, depthRangeVar);
>+
>+    // This field list mirrors the structure of ContextVk::DriverUniforms.
>+    TFieldList *driverFieldList = new TFieldList;
>+
>+    const std::array<TType *, kNumDriverUniforms> kDriverUniformTypes = {{
>+        new TType(EbtFloat, 4),
>+        new TType(EbtFloat),
>+        new TType(EbtFloat),
>+        new TType(EbtFloat),
>+        new TType(EbtFloat),
>+        emulatedDepthRangeType,
>+    }};
>+
>+    for (size_t uniformIndex = 0; uniformIndex < kNumDriverUniforms; ++uniformIndex)
>+    {
>+        TField *driverUniformField = new TField(kDriverUniformTypes[uniformIndex],
>+                                                ImmutableString(kDriverUniformNames[uniformIndex]),
>+                                                TSourceLoc(), SymbolType::AngleInternal);
>+        driverFieldList->push_back(driverUniformField);
>+    }
>+
>+    // Define a driver uniform block "ANGLEUniformBlock".
>+    TLayoutQualifier driverLayoutQualifier = TLayoutQualifier::Create();
>+    TInterfaceBlock *interfaceBlock =
>+        new TInterfaceBlock(symbolTable, ImmutableString("ANGLEUniformBlock"), driverFieldList,
>+                            driverLayoutQualifier, SymbolType::AngleInternal);
>+
>+    // Make the inteface block into a declaration. Use instance name "ANGLEUniforms".
>+    TType *interfaceBlockType = new TType(interfaceBlock, EvqUniform, driverLayoutQualifier);
>+    TIntermDeclaration *driverUniformsDecl = new TIntermDeclaration;
>+    TVariable *driverUniformsVar = new TVariable(symbolTable, ImmutableString("ANGLEUniforms"),
>+                                                 interfaceBlockType, SymbolType::AngleInternal);
>+    TIntermSymbol *driverUniformsDeclarator = new TIntermSymbol(driverUniformsVar);
>+    driverUniformsDecl->appendDeclarator(driverUniformsDeclarator);
>+
>+    // Insert the declarations before Main.
>+    TIntermSequence *insertSequence = new TIntermSequence;
>+    insertSequence->push_back(driverUniformsDecl);
>+
>+    size_t mainIndex = FindMainIndex(root);
>+    root->insertChildNodes(mainIndex, *insertSequence);
>+
>+    return driverUniformsVar;
>+}
>+
>+TIntermPreprocessorDirective *GenerateLineRasterIfDef()
>+{
>+    return new TIntermPreprocessorDirective(
>+        PreprocessorDirective::Ifdef, ImmutableString("ANGLE_ENABLE_LINE_SEGMENT_RASTERIZATION"));
>+}
>+
>+TIntermPreprocessorDirective *GenerateEndIf()
>+{
>+    return new TIntermPreprocessorDirective(PreprocessorDirective::Endif, kEmptyImmutableString);
>+}
>+
>+TVariable *AddANGLEPositionVaryingDeclaration(TIntermBlock *root,
>+                                              TSymbolTable *symbolTable,
>+                                              TQualifier qualifier)
>+{
>+    TIntermSequence *insertSequence = new TIntermSequence;
>+
>+    insertSequence->push_back(GenerateLineRasterIfDef());
>+
>+    // Define a driver varying vec2 "ANGLEPosition".
>+    TType *varyingType               = new TType(EbtFloat, EbpMedium, qualifier, 4);
>+    TVariable *varyingVar            = new TVariable(symbolTable, ImmutableString("ANGLEPosition"),
>+                                          varyingType, SymbolType::AngleInternal);
>+    TIntermSymbol *varyingDeclarator = new TIntermSymbol(varyingVar);
>+    TIntermDeclaration *varyingDecl  = new TIntermDeclaration;
>+    varyingDecl->appendDeclarator(varyingDeclarator);
>+    insertSequence->push_back(varyingDecl);
>+
>+    insertSequence->push_back(GenerateEndIf());
>+
>+    // Insert the declarations before Main.
>+    size_t mainIndex = FindMainIndex(root);
>+    root->insertChildNodes(mainIndex, *insertSequence);
>+
>+    return varyingVar;
>+}
>+
>+void AddANGLEPositionVarying(TIntermBlock *root, TSymbolTable *symbolTable)
>+{
>+    TVariable *anglePosition = AddANGLEPositionVaryingDeclaration(root, symbolTable, EvqVaryingOut);
>+
>+    // Create an assignment "ANGLEPosition = gl_Position".
>+    const TVariable *position = BuiltInVariable::gl_Position();
>+    TIntermSymbol *varyingRef = new TIntermSymbol(anglePosition);
>+    TIntermBinary *assignment =
>+        new TIntermBinary(EOpAssign, varyingRef, new TIntermSymbol(position));
>+
>+    // Ensure the assignment runs at the end of the main() function.
>+    TIntermFunctionDefinition *main = FindMain(root);
>+    TIntermBlock *mainBody          = main->getBody();
>+    mainBody->appendStatement(GenerateLineRasterIfDef());
>+    mainBody->appendStatement(assignment);
>+    mainBody->appendStatement(GenerateEndIf());
>+}
>+
>+void InsertFragCoordCorrection(TIntermBlock *root,
>+                               TIntermSequence *insertSequence,
>+                               TSymbolTable *symbolTable,
>+                               const TVariable *driverUniforms)
>+{
>+    TIntermBinary *viewportYScale = CreateDriverUniformRef(driverUniforms, kViewportYScale);
>+    TIntermBinary *pivot          = CreateDriverUniformRef(driverUniforms, kHalfRenderAreaHeight);
>+    FlipBuiltinVariable(root, insertSequence, viewportYScale, symbolTable,
>+                        BuiltInVariable::gl_FragCoord(), kFlippedFragCoordName, pivot);
>+}
>+
>+// This block adds OpenGL line segment rasterization emulation behind #ifdef guards.
>+// OpenGL's simple rasterization algorithm is a strict subset of the pixels generated by the Vulkan
>+// algorithm. Thus we can implement a shader patch that rejects pixels if they would not be
>+// generated by the OpenGL algorithm. OpenGL's algorithm is similar to Bresenham's line algorithm.
>+// It is implemented for each pixel by testing if the line segment crosses a small diamond inside
>+// the pixel. See the OpenGL ES 2.0 spec section "3.4.1 Basic Line Segment Rasterization". Also
>+// see the Vulkan spec section "24.6.1. Basic Line Segment Rasterization":
>+// https://khronos.org/registry/vulkan/specs/1.0/html/vkspec.html#primsrast-lines-basic
>+//
>+// Using trigonometric math and the fact that we know the size of the diamond we can derive a
>+// formula to test if the line segment crosses the pixel center. gl_FragCoord is used along with an
>+// internal position varying to determine the inputs to the formula.
>+//
>+// The implementation of the test code is similar to the following pseudocode:
>+//
>+// void main()
>+// {
>+//     vec2 b = (((position.xy / position.w) * 0.5) + 0.5) * gl_Viewport.zw + gl_Viewport.xy;
>+//     vec2 ba = abs(b - gl_FragCoord.xy);
>+//     vec2 ba2 = 2.0 * (ba * ba);
>+//     vec2 bp = ba2 + ba2.yx - ba;
>+//     if (bp.x > epsilon && bp.y > epsilon)
>+//         discard;
>+//     <otherwise run fragment shader main>
>+// }
>+void AddLineSegmentRasterizationEmulation(TInfoSinkBase &sink,
>+                                          TIntermBlock *root,
>+                                          TSymbolTable *symbolTable,
>+                                          const TVariable *driverUniforms,
>+                                          bool usesFragCoord)
>+{
>+    TVariable *anglePosition = AddANGLEPositionVaryingDeclaration(root, symbolTable, EvqVaryingIn);
>+
>+    const TType *vec2Type = StaticType::GetBasic<EbtFloat, 2>();
>+
>+    // Create a swizzle to "ANGLEUniforms.viewport.xy".
>+    TIntermBinary *viewportRef = CreateDriverUniformRef(driverUniforms, kViewport);
>+    TVector<int> swizzleOffsetXY;
>+    swizzleOffsetXY.push_back(0);
>+    swizzleOffsetXY.push_back(1);
>+    TIntermSwizzle *viewportXY = new TIntermSwizzle(viewportRef->deepCopy(), swizzleOffsetXY);
>+
>+    // Create a swizzle to "ANGLEUniforms.viewport.zw".
>+    TVector<int> swizzleOffsetZW;
>+    swizzleOffsetZW.push_back(2);
>+    swizzleOffsetZW.push_back(3);
>+    TIntermSwizzle *viewportZW = new TIntermSwizzle(viewportRef, swizzleOffsetZW);
>+
>+    // ANGLEPosition.xy / ANGLEPosition.w
>+    TIntermSymbol *position    = new TIntermSymbol(anglePosition);
>+    TIntermSwizzle *positionXY = new TIntermSwizzle(position, swizzleOffsetXY);
>+    TVector<int> swizzleOffsetW;
>+    swizzleOffsetW.push_back(3);
>+    TIntermSwizzle *positionW  = new TIntermSwizzle(position->deepCopy(), swizzleOffsetW);
>+    TIntermBinary *positionNDC = new TIntermBinary(EOpDiv, positionXY, positionW);
>+
>+    // ANGLEPosition * 0.5
>+    TIntermConstantUnion *oneHalf = CreateBasicConstant(0.5f);
>+    TIntermBinary *halfPosition   = new TIntermBinary(EOpVectorTimesScalar, positionNDC, oneHalf);
>+
>+    // (ANGLEPosition * 0.5) + 0.5
>+    TIntermBinary *offsetHalfPosition =
>+        new TIntermBinary(EOpAdd, halfPosition, oneHalf->deepCopy());
>+
>+    // ((ANGLEPosition * 0.5) + 0.5) * ANGLEUniforms.viewport.zw
>+    TIntermBinary *scaledPosition = new TIntermBinary(EOpMul, offsetHalfPosition, viewportZW);
>+
>+    // ((ANGLEPosition * 0.5) + 0.5) * ANGLEUniforms.viewport + ANGLEUniforms.viewport.xy
>+    TIntermBinary *windowPosition = new TIntermBinary(EOpAdd, scaledPosition, viewportXY);
>+
>+    // Assign to a temporary "b".
>+    TVariable *bTemp          = CreateTempVariable(symbolTable, vec2Type);
>+    TIntermDeclaration *bDecl = CreateTempInitDeclarationNode(bTemp, windowPosition);
>+
>+    // gl_FragCoord.xy
>+    const TVariable *fragCoord  = BuiltInVariable::gl_FragCoord();
>+    TIntermSymbol *fragCoordRef = new TIntermSymbol(fragCoord);
>+    TIntermSwizzle *fragCoordXY = new TIntermSwizzle(fragCoordRef, swizzleOffsetXY);
>+
>+    // b - gl_FragCoord.xy
>+    TIntermSymbol *bRef           = CreateTempSymbolNode(bTemp);
>+    TIntermBinary *differenceExpr = new TIntermBinary(EOpSub, bRef, fragCoordXY);
>+
>+    // abs(b - gl_FragCoord.xy)
>+    TIntermUnary *baAbs = new TIntermUnary(EOpAbs, differenceExpr, nullptr);
>+
>+    // Assign to a temporary "ba".
>+    TVariable *baTemp          = CreateTempVariable(symbolTable, vec2Type);
>+    TIntermDeclaration *baDecl = CreateTempInitDeclarationNode(baTemp, baAbs);
>+    TIntermSymbol *ba          = CreateTempSymbolNode(baTemp);
>+
>+    // ba * ba
>+    TIntermBinary *baSq = new TIntermBinary(EOpMul, ba, ba->deepCopy());
>+
>+    // 2.0 * ba * ba
>+    TIntermTyped *two      = CreateBasicConstant(2.0f);
>+    TIntermBinary *twoBaSq = new TIntermBinary(EOpVectorTimesScalar, baSq, two);
>+
>+    // Assign to a temporary "ba2".
>+    TVariable *ba2Temp          = CreateTempVariable(symbolTable, vec2Type);
>+    TIntermDeclaration *ba2Decl = CreateTempInitDeclarationNode(ba2Temp, twoBaSq);
>+
>+    // Create a swizzle to "ba2.yx".
>+    TVector<int> swizzleOffsetYX;
>+    swizzleOffsetYX.push_back(1);
>+    swizzleOffsetYX.push_back(0);
>+    TIntermSymbol *ba2    = CreateTempSymbolNode(ba2Temp);
>+    TIntermSwizzle *ba2YX = new TIntermSwizzle(ba2, swizzleOffsetYX);
>+
>+    // ba2 + ba2.yx - ba
>+    TIntermBinary *ba2PlusBaYX2 = new TIntermBinary(EOpAdd, ba2->deepCopy(), ba2YX);
>+    TIntermBinary *bpInit       = new TIntermBinary(EOpSub, ba2PlusBaYX2, ba->deepCopy());
>+
>+    // Assign to a temporary "bp".
>+    TVariable *bpTemp          = CreateTempVariable(symbolTable, vec2Type);
>+    TIntermDeclaration *bpDecl = CreateTempInitDeclarationNode(bpTemp, bpInit);
>+    TIntermSymbol *bp          = CreateTempSymbolNode(bpTemp);
>+
>+    // Create a swizzle to "bp.x".
>+    TVector<int> swizzleOffsetX;
>+    swizzleOffsetX.push_back(0);
>+    TIntermSwizzle *bpX = new TIntermSwizzle(bp, swizzleOffsetX);
>+
>+    // Using a small epsilon value ensures that we don't suffer from numerical instability when
>+    // lines are exactly vertical or horizontal.
>+    static constexpr float kEpisilon = 0.00001f;
>+    TIntermConstantUnion *epsilon    = CreateBasicConstant(kEpisilon);
>+
>+    // bp.x > epsilon
>+    TIntermBinary *checkX = new TIntermBinary(EOpGreaterThan, bpX, epsilon);
>+
>+    // Create a swizzle to "bp.y".
>+    TVector<int> swizzleOffsetY;
>+    swizzleOffsetY.push_back(1);
>+    TIntermSwizzle *bpY = new TIntermSwizzle(bp->deepCopy(), swizzleOffsetY);
>+
>+    // bp.y > epsilon
>+    TIntermBinary *checkY = new TIntermBinary(EOpGreaterThan, bpY, epsilon->deepCopy());
>+
>+    // (bp.x > epsilon) && (bp.y > epsilon)
>+    TIntermBinary *checkXY = new TIntermBinary(EOpLogicalAnd, checkX, checkY);
>+
>+    // discard
>+    TIntermBranch *discard     = new TIntermBranch(EOpKill, nullptr);
>+    TIntermBlock *discardBlock = new TIntermBlock;
>+    discardBlock->appendStatement(discard);
>+
>+    // if ((bp.x > epsilon) && (bp.y > epsilon)) discard;
>+    TIntermIfElse *ifStatement = new TIntermIfElse(checkXY, discardBlock, nullptr);
>+
>+    // Ensure the line raster code runs at the beginning of main().
>+    TIntermFunctionDefinition *main = FindMain(root);
>+    TIntermSequence *mainSequence   = main->getBody()->getSequence();
>+    ASSERT(mainSequence);
>+
>+    std::array<TIntermNode *, 6> nodes = {
>+        {bDecl, baDecl, ba2Decl, bpDecl, ifStatement, GenerateEndIf()}};
>+    mainSequence->insert(mainSequence->begin(), nodes.begin(), nodes.end());
>+
>+    // If the shader does not use frag coord, we should insert it inside the ifdef.
>+    if (!usesFragCoord)
>+    {
>+        InsertFragCoordCorrection(root, mainSequence, symbolTable, driverUniforms);
>+    }
>+
>+    mainSequence->insert(mainSequence->begin(), GenerateLineRasterIfDef());
>+}
>+}  // anonymous namespace
>+
>+TranslatorVulkan::TranslatorVulkan(sh::GLenum type, ShShaderSpec spec)
>+    : TCompiler(type, spec, SH_GLSL_450_CORE_OUTPUT)
>+{}
>+
> void TranslatorVulkan::translate(TIntermBlock *root,
>                                  ShCompileOptions compileOptions,
>                                  PerformanceDiagnostics * /*perfDiagnostics*/)
> {
>     TInfoSinkBase &sink = getInfoSink().obj;
>+    TOutputVulkanGLSL outputGLSL(sink, getArrayIndexClampingStrategy(), getHashFunction(),
>+                                 getNameMap(), &getSymbolTable(), getShaderType(),
>+                                 getShaderVersion(), getOutputType(), compileOptions);
> 
>     sink << "#version 450 core\n";
> 
>     // Write out default uniforms into a uniform block assigned to a specific set/binding.
>-    int defaultUniformCount = 0;
>+    int defaultUniformCount        = 0;
>+    int structTypesUsedForUniforms = 0;
>     for (const auto &uniform : getUniforms())
>     {
>         if (!uniform.isBuiltIn() && uniform.staticUse && !gl::IsOpaqueType(uniform.type))
>         {
>             ++defaultUniformCount;
>         }
>+
>+        if (uniform.isStruct())
>+        {
>+            ++structTypesUsedForUniforms;
>+        }
>+    }
>+
>+    // TODO(lucferron): Refactor this function to do less tree traversals.
>+    // http://anglebug.com/2461
>+    if (structTypesUsedForUniforms > 0)
>+    {
>+        NameEmbeddedStructUniforms(root, &getSymbolTable());
>+
>+        defaultUniformCount -= RewriteStructSamplers(root, &getSymbolTable());
>+
>+        // We must declare the struct types before using them.
>+        DeclareStructTypesTraverser structTypesTraverser(&outputGLSL);
>+        root->traverse(&structTypesTraverser);
>+        structTypesTraverser.updateTree();
>     }
> 
>     if (defaultUniformCount > 0)
>@@ -124,14 +676,45 @@ void TranslatorVulkan::translate(TIntermBlock *root,
>         sink << "};\n";
>     }
> 
>+    const TVariable *driverUniforms = AddDriverUniformsToShader(root, &getSymbolTable());
>+
>+    ReplaceGLDepthRangeWithDriverUniform(root, driverUniforms, &getSymbolTable());
>+
>     // Declare gl_FragColor and glFragData as webgl_FragColor and webgl_FragData
>     // if it's core profile shaders and they are used.
>     if (getShaderType() == GL_FRAGMENT_SHADER)
>     {
>+        bool usesPointCoord = false;
>+        bool usesFragCoord  = false;
>+
>+        // Search for the gl_PointCoord usage, if its used, we need to flip the y coordinate.
>+        for (const Varying &inputVarying : mInputVaryings)
>+        {
>+            if (!inputVarying.isBuiltIn())
>+            {
>+                continue;
>+            }
>+
>+            if (inputVarying.name == "gl_PointCoord")
>+            {
>+                usesPointCoord = true;
>+                break;
>+            }
>+
>+            if (inputVarying.name == "gl_FragCoord")
>+            {
>+                usesFragCoord = true;
>+                break;
>+            }
>+        }
>+
>+        AddLineSegmentRasterizationEmulation(sink, root, &getSymbolTable(), driverUniforms,
>+                                             usesFragCoord);
>+
>         bool hasGLFragColor = false;
>         bool hasGLFragData  = false;
> 
>-        for (const auto &outputVar : outputVariables)
>+        for (const OutputVariable &outputVar : mOutputVariables)
>         {
>             if (outputVar.name == "gl_FragColor")
>             {
>@@ -155,12 +738,33 @@ void TranslatorVulkan::translate(TIntermBlock *root,
>         {
>             sink << "layout(location = 0) out vec4 webgl_FragData[gl_MaxDrawBuffers];\n";
>         }
>+
>+        if (usesPointCoord)
>+        {
>+            TIntermBinary *viewportYScale =
>+                CreateDriverUniformRef(driverUniforms, kNegViewportYScale);
>+            TIntermConstantUnion *pivot = CreateBasicConstant(0.5f);
>+            FlipBuiltinVariable(root, GetMainSequence(root), viewportYScale, &getSymbolTable(),
>+                                BuiltInVariable::gl_PointCoord(), kFlippedPointCoordName, pivot);
>+        }
>+
>+        if (usesFragCoord)
>+        {
>+            InsertFragCoordCorrection(root, GetMainSequence(root), &getSymbolTable(),
>+                                      driverUniforms);
>+        }
>+    }
>+    else
>+    {
>+        ASSERT(getShaderType() == GL_VERTEX_SHADER);
>+
>+        AddANGLEPositionVarying(root, &getSymbolTable());
>+
>+        // Append depth range translation to main.
>+        AppendVertexShaderDepthCorrectionToMain(root, &getSymbolTable());
>     }
> 
>     // Write translated shader.
>-    TOutputVulkanGLSL outputGLSL(sink, getArrayIndexClampingStrategy(), getHashFunction(),
>-                                 getNameMap(), &getSymbolTable(), getShaderType(),
>-                                 getShaderVersion(), getOutputType(), compileOptions);
>     root->traverse(&outputGLSL);
> }
> 
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/Types.cpp b/Source/ThirdParty/ANGLE/src/compiler/translator/Types.cpp
>index 530ffe3aeb5..9d0374b170f 100644
>--- a/Source/ThirdParty/ANGLE/src/compiler/translator/Types.cpp
>+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/Types.cpp
>@@ -5,10 +5,11 @@
> //
> 
> #if defined(_MSC_VER)
>-#pragma warning(disable : 4718)
>+#    pragma warning(disable : 4718)
> #endif
> 
> #include "compiler/translator/Types.h"
>+#include "compiler/translator/ImmutableString.h"
> #include "compiler/translator/InfoSink.h"
> #include "compiler/translator/IntermNode.h"
> #include "compiler/translator/SymbolTable.h"
>@@ -51,6 +52,8 @@ const char *getBasicString(TBasicType t)
>             return "sampler2DArray";
>         case EbtSampler2DMS:
>             return "sampler2DMS";
>+        case EbtSampler2DMSArray:
>+            return "sampler2DMSArray";
>         case EbtISampler2D:
>             return "isampler2D";
>         case EbtISampler3D:
>@@ -61,6 +64,8 @@ const char *getBasicString(TBasicType t)
>             return "isampler2DArray";
>         case EbtISampler2DMS:
>             return "isampler2DMS";
>+        case EbtISampler2DMSArray:
>+            return "isampler2DMSArray";
>         case EbtUSampler2D:
>             return "usampler2D";
>         case EbtUSampler3D:
>@@ -71,6 +76,8 @@ const char *getBasicString(TBasicType t)
>             return "usampler2DArray";
>         case EbtUSampler2DMS:
>             return "usampler2DMS";
>+        case EbtUSampler2DMSArray:
>+            return "usampler2DMSArray";
>         case EbtSampler2DShadow:
>             return "sampler2DShadow";
>         case EbtSamplerCubeShadow:
>@@ -128,8 +135,7 @@ TType::TType()
>       mStructure(nullptr),
>       mIsStructSpecifier(false),
>       mMangledName(nullptr)
>-{
>-}
>+{}
> 
> TType::TType(TBasicType t, unsigned char ps, unsigned char ss)
>     : type(t),
>@@ -145,8 +151,7 @@ TType::TType(TBasicType t, unsigned char ps, unsigned char ss)
>       mStructure(nullptr),
>       mIsStructSpecifier(false),
>       mMangledName(nullptr)
>-{
>-}
>+{}
> 
> TType::TType(TBasicType t, TPrecision p, TQualifier q, unsigned char ps, unsigned char ss)
>     : type(t),
>@@ -162,8 +167,7 @@ TType::TType(TBasicType t, TPrecision p, TQualifier q, unsigned char ps, unsigne
>       mStructure(nullptr),
>       mIsStructSpecifier(false),
>       mMangledName(nullptr)
>-{
>-}
>+{}
> 
> TType::TType(const TPublicType &p)
>     : type(p.getBasicType()),
>@@ -193,7 +197,7 @@ TType::TType(const TPublicType &p)
>     }
> }
> 
>-TType::TType(TStructure *userDef)
>+TType::TType(const TStructure *userDef, bool isStructSpecifier)
>     : type(EbtStruct),
>       precision(EbpUndefined),
>       qualifier(EvqTemporary),
>@@ -205,12 +209,11 @@ TType::TType(TStructure *userDef)
>       mArraySizes(nullptr),
>       mInterfaceBlock(nullptr),
>       mStructure(userDef),
>-      mIsStructSpecifier(false),
>+      mIsStructSpecifier(isStructSpecifier),
>       mMangledName(nullptr)
>-{
>-}
>+{}
> 
>-TType::TType(TInterfaceBlock *interfaceBlockIn,
>+TType::TType(const TInterfaceBlock *interfaceBlockIn,
>              TQualifier qualifierIn,
>              TLayoutQualifier layoutQualifierIn)
>     : type(EbtInterfaceBlock),
>@@ -226,8 +229,7 @@ TType::TType(TInterfaceBlock *interfaceBlockIn,
>       mStructure(0),
>       mIsStructSpecifier(false),
>       mMangledName(nullptr)
>-{
>-}
>+{}
> 
> TType::TType(const TType &t)
>     : type(t.type),
>@@ -243,8 +245,7 @@ TType::TType(const TType &t)
>       mStructure(t.mStructure),
>       mIsStructSpecifier(t.mIsStructSpecifier),
>       mMangledName(t.mMangledName)
>-{
>-}
>+{}
> 
> TType &TType::operator=(const TType &t)
> {
>@@ -395,31 +396,55 @@ const char *TType::getBuiltInTypeNameString() const
>     return getBasicString();
> }
> 
>-TString TType::getCompleteString() const
>+int TType::getDeepestStructNesting() const
> {
>-    TStringStream stream;
>-
>-    if (invariant)
>-        stream << "invariant ";
>-    if (qualifier != EvqTemporary && qualifier != EvqGlobal)
>-        stream << getQualifierString() << " ";
>-    if (precision != EbpUndefined)
>-        stream << getPrecisionString() << " ";
>-    if (mArraySizes)
>+    return mStructure ? mStructure->deepestNesting() : 0;
>+}
>+
>+bool TType::isNamelessStruct() const
>+{
>+    return mStructure && mStructure->symbolType() == SymbolType::Empty;
>+}
>+
>+bool TType::isStructureContainingArrays() const
>+{
>+    return mStructure ? mStructure->containsArrays() : false;
>+}
>+
>+bool TType::isStructureContainingMatrices() const
>+{
>+    return mStructure ? mStructure->containsMatrices() : false;
>+}
>+
>+bool TType::isStructureContainingType(TBasicType t) const
>+{
>+    return mStructure ? mStructure->containsType(t) : false;
>+}
>+
>+bool TType::isStructureContainingSamplers() const
>+{
>+    return mStructure ? mStructure->containsSamplers() : false;
>+}
>+
>+bool TType::canReplaceWithConstantUnion() const
>+{
>+    if (isArray())
>     {
>-        for (auto arraySizeIter = mArraySizes->rbegin(); arraySizeIter != mArraySizes->rend();
>-             ++arraySizeIter)
>-        {
>-            stream << "array[" << (*arraySizeIter) << "] of ";
>-        }
>+        return false;
>     }
>-    if (isMatrix())
>-        stream << getCols() << "X" << getRows() << " matrix of ";
>-    else if (isVector())
>-        stream << getNominalSize() << "-component vector of ";
>-
>-    stream << getBasicString();
>-    return stream.str();
>+    if (!mStructure)
>+    {
>+        return true;
>+    }
>+    if (isStructureContainingArrays())
>+    {
>+        return false;
>+    }
>+    if (getObjectSize() > 16)
>+    {
>+        return false;
>+    }
>+    return true;
> }
> 
> //
>@@ -427,151 +452,37 @@ TString TType::getCompleteString() const
> //
> const char *TType::buildMangledName() const
> {
>-    TString mangledName;
>-    if (isMatrix())
>-        mangledName += 'm';
>-    else if (isVector())
>-        mangledName += 'v';
>-
>-    switch (type)
>-    {
>-        case EbtFloat:
>-            mangledName += 'f';
>-            break;
>-        case EbtInt:
>-            mangledName += 'i';
>-            break;
>-        case EbtUInt:
>-            mangledName += 'u';
>-            break;
>-        case EbtBool:
>-            mangledName += 'b';
>-            break;
>-        case EbtYuvCscStandardEXT:
>-            mangledName += "ycs";
>-            break;
>-        case EbtSampler2D:
>-            mangledName += "s2";
>-            break;
>-        case EbtSampler3D:
>-            mangledName += "s3";
>-            break;
>-        case EbtSamplerCube:
>-            mangledName += "sC";
>-            break;
>-        case EbtSampler2DArray:
>-            mangledName += "s2a";
>-            break;
>-        case EbtSamplerExternalOES:
>-            mangledName += "sext";
>-            break;
>-        case EbtSamplerExternal2DY2YEXT:
>-            mangledName += "sext2y2y";
>-            break;
>-        case EbtSampler2DRect:
>-            mangledName += "s2r";
>-            break;
>-        case EbtSampler2DMS:
>-            mangledName += "s2ms";
>-            break;
>-        case EbtISampler2D:
>-            mangledName += "is2";
>-            break;
>-        case EbtISampler3D:
>-            mangledName += "is3";
>-            break;
>-        case EbtISamplerCube:
>-            mangledName += "isC";
>-            break;
>-        case EbtISampler2DArray:
>-            mangledName += "is2a";
>-            break;
>-        case EbtISampler2DMS:
>-            mangledName += "is2ms";
>-            break;
>-        case EbtUSampler2D:
>-            mangledName += "us2";
>-            break;
>-        case EbtUSampler3D:
>-            mangledName += "us3";
>-            break;
>-        case EbtUSamplerCube:
>-            mangledName += "usC";
>-            break;
>-        case EbtUSampler2DArray:
>-            mangledName += "us2a";
>-            break;
>-        case EbtUSampler2DMS:
>-            mangledName += "us2ms";
>-            break;
>-        case EbtSampler2DShadow:
>-            mangledName += "s2s";
>-            break;
>-        case EbtSamplerCubeShadow:
>-            mangledName += "sCs";
>-            break;
>-        case EbtSampler2DArrayShadow:
>-            mangledName += "s2as";
>-            break;
>-        case EbtImage2D:
>-            mangledName += "im2";
>-            break;
>-        case EbtIImage2D:
>-            mangledName += "iim2";
>-            break;
>-        case EbtUImage2D:
>-            mangledName += "uim2";
>-            break;
>-        case EbtImage3D:
>-            mangledName += "im3";
>-            break;
>-        case EbtIImage3D:
>-            mangledName += "iim3";
>-            break;
>-        case EbtUImage3D:
>-            mangledName += "uim3";
>-            break;
>-        case EbtImage2DArray:
>-            mangledName += "im2a";
>-            break;
>-        case EbtIImage2DArray:
>-            mangledName += "iim2a";
>-            break;
>-        case EbtUImage2DArray:
>-            mangledName += "uim2a";
>-            break;
>-        case EbtImageCube:
>-            mangledName += "imc";
>-            break;
>-        case EbtIImageCube:
>-            mangledName += "iimc";
>-            break;
>-        case EbtUImageCube:
>-            mangledName += "uimc";
>-            break;
>-        case EbtAtomicCounter:
>-            mangledName += "ac";
>-            break;
>-        case EbtStruct:
>-            mangledName += mStructure->mangledName();
>-            break;
>-        case EbtInterfaceBlock:
>-            mangledName += mInterfaceBlock->mangledName();
>-            break;
>-        default:
>-            // EbtVoid, EbtAddress and non types
>-            break;
>-    }
>+    TString mangledName(1, GetSizeMangledName(primarySize, secondarySize));
> 
>-    if (isMatrix())
>+    char basicMangledName = GetBasicMangledName(type);
>+    if (basicMangledName != '{')
>     {
>-        mangledName += static_cast<char>('0' + getCols());
>-        mangledName += static_cast<char>('x');
>-        mangledName += static_cast<char>('0' + getRows());
>+        mangledName += basicMangledName;
>     }
>     else
>     {
>-        mangledName += static_cast<char>('0' + getNominalSize());
>+        ASSERT(type == EbtStruct || type == EbtInterfaceBlock);
>+        switch (type)
>+        {
>+            case EbtStruct:
>+                mangledName += "{s";
>+                if (mStructure->symbolType() != SymbolType::Empty)
>+                {
>+                    mangledName += mStructure->name().data();
>+                }
>+                mangledName += mStructure->mangledFieldList();
>+                mangledName += '}';
>+                break;
>+            case EbtInterfaceBlock:
>+                mangledName += "{i";
>+                mangledName += mInterfaceBlock->name().data();
>+                mangledName += mInterfaceBlock->mangledFieldList();
>+                mangledName += '}';
>+                break;
>+            default:
>+                UNREACHABLE();
>+                break;
>+        }
>     }
> 
>     if (mArraySizes)
>@@ -586,13 +497,8 @@ const char *TType::buildMangledName() const
>         }
>     }
> 
>-    mangledName += ';';
>-
>     // Copy string contents into a pool-allocated buffer, so we never need to call delete.
>-    size_t requiredSize = mangledName.size() + 1;
>-    char *buffer = reinterpret_cast<char *>(GetGlobalPoolAllocator()->allocate(requiredSize));
>-    memcpy(buffer, mangledName.c_str(), requiredSize);
>-    return buffer;
>+    return AllocatePoolCharArray(mangledName.c_str(), mangledName.size());
> }
> 
> size_t TType::getObjectSize() const
>@@ -807,7 +713,7 @@ void TType::toArrayElementType()
>     }
> }
> 
>-void TType::setInterfaceBlock(TInterfaceBlock *interfaceBlockIn)
>+void TType::setInterfaceBlock(const TInterfaceBlock *interfaceBlockIn)
> {
>     if (mInterfaceBlock != interfaceBlockIn)
>     {
>@@ -816,15 +722,6 @@ void TType::setInterfaceBlock(TInterfaceBlock *interfaceBlockIn)
>     }
> }
> 
>-void TType::setStruct(TStructure *s)
>-{
>-    if (mStructure != s)
>-    {
>-        mStructure = s;
>-        invalidateMangledName();
>-    }
>-}
>-
> const char *TType::getMangledName() const
> {
>     if (mMangledName == nullptr)
>@@ -845,57 +742,10 @@ void TType::invalidateMangledName()
>     mMangledName = nullptr;
> }
> 
>-// TStructure implementation.
>-TStructure::TStructure(TSymbolTable *symbolTable, const TString *name, TFieldList *fields)
>-    : TFieldListCollection(name, fields),
>-      mDeepestNesting(0),
>-      mUniqueId(symbolTable->nextUniqueId()),
>-      mAtGlobalScope(false)
>-{
>-}
>-
>-bool TStructure::equals(const TStructure &other) const
>-{
>-    return (uniqueId() == other.uniqueId());
>-}
>-
>-bool TStructure::containsArrays() const
>-{
>-    for (size_t i = 0; i < mFields->size(); ++i)
>-    {
>-        const TType *fieldType = (*mFields)[i]->type();
>-        if (fieldType->isArray() || fieldType->isStructureContainingArrays())
>-            return true;
>-    }
>-    return false;
>-}
>-
>-bool TStructure::containsType(TBasicType type) const
>-{
>-    for (size_t i = 0; i < mFields->size(); ++i)
>-    {
>-        const TType *fieldType = (*mFields)[i]->type();
>-        if (fieldType->getBasicType() == type || fieldType->isStructureContainingType(type))
>-            return true;
>-    }
>-    return false;
>-}
>-
>-bool TStructure::containsSamplers() const
>-{
>-    for (size_t i = 0; i < mFields->size(); ++i)
>-    {
>-        const TType *fieldType = (*mFields)[i]->type();
>-        if (IsSampler(fieldType->getBasicType()) || fieldType->isStructureContainingSamplers())
>-            return true;
>-    }
>-    return false;
>-}
>-
>-void TType::createSamplerSymbols(const TString &namePrefix,
>+void TType::createSamplerSymbols(const ImmutableString &namePrefix,
>                                  const TString &apiNamePrefix,
>-                                 TVector<TIntermSymbol *> *outputSymbols,
>-                                 TMap<TIntermSymbol *, TString> *outputSymbolsToAPINames,
>+                                 TVector<const TVariable *> *outputSymbols,
>+                                 TMap<const TVariable *, TString> *outputSymbolsToAPINames,
>                                  TSymbolTable *symbolTable) const
> {
>     if (isStructureContainingSamplers())
>@@ -906,60 +756,87 @@ void TType::createSamplerSymbols(const TString &namePrefix,
>             elementType.toArrayElementType();
>             for (unsigned int arrayIndex = 0u; arrayIndex < getOutermostArraySize(); ++arrayIndex)
>             {
>-                TStringStream elementName;
>+                std::stringstream elementName = sh::InitializeStream<std::stringstream>();
>                 elementName << namePrefix << "_" << arrayIndex;
>                 TStringStream elementApiName;
>                 elementApiName << apiNamePrefix << "[" << arrayIndex << "]";
>-                elementType.createSamplerSymbols(elementName.str(), elementApiName.str(),
>-                                                 outputSymbols, outputSymbolsToAPINames,
>-                                                 symbolTable);
>+                elementType.createSamplerSymbols(ImmutableString(elementName.str()),
>+                                                 elementApiName.str(), outputSymbols,
>+                                                 outputSymbolsToAPINames, symbolTable);
>             }
>         }
>         else
>         {
>-            mStructure->createSamplerSymbols(namePrefix, apiNamePrefix, outputSymbols,
>+            mStructure->createSamplerSymbols(namePrefix.data(), apiNamePrefix, outputSymbols,
>                                              outputSymbolsToAPINames, symbolTable);
>         }
>         return;
>     }
> 
>     ASSERT(IsSampler(type));
>-    TIntermSymbol *symbol = new TIntermSymbol(symbolTable->nextUniqueId(), namePrefix, *this);
>-    outputSymbols->push_back(symbol);
>+    TVariable *variable =
>+        new TVariable(symbolTable, namePrefix, new TType(*this), SymbolType::AngleInternal);
>+    outputSymbols->push_back(variable);
>     if (outputSymbolsToAPINames)
>     {
>-        (*outputSymbolsToAPINames)[symbol] = apiNamePrefix;
>+        (*outputSymbolsToAPINames)[variable] = apiNamePrefix;
>+    }
>+}
>+
>+TFieldListCollection::TFieldListCollection(const TFieldList *fields)
>+    : mFields(fields), mObjectSize(0), mDeepestNesting(0)
>+{}
>+
>+bool TFieldListCollection::containsArrays() const
>+{
>+    for (const auto *field : *mFields)
>+    {
>+        const TType *fieldType = field->type();
>+        if (fieldType->isArray() || fieldType->isStructureContainingArrays())
>+            return true;
>+    }
>+    return false;
>+}
>+
>+bool TFieldListCollection::containsMatrices() const
>+{
>+    for (const auto *field : *mFields)
>+    {
>+        const TType *fieldType = field->type();
>+        if (fieldType->isMatrix() || fieldType->isStructureContainingMatrices())
>+            return true;
>+    }
>+    return false;
>+}
>+
>+bool TFieldListCollection::containsType(TBasicType type) const
>+{
>+    for (const auto *field : *mFields)
>+    {
>+        const TType *fieldType = field->type();
>+        if (fieldType->getBasicType() == type || fieldType->isStructureContainingType(type))
>+            return true;
>     }
>+    return false;
> }
> 
>-void TStructure::createSamplerSymbols(const TString &namePrefix,
>-                                      const TString &apiNamePrefix,
>-                                      TVector<TIntermSymbol *> *outputSymbols,
>-                                      TMap<TIntermSymbol *, TString> *outputSymbolsToAPINames,
>-                                      TSymbolTable *symbolTable) const
>+bool TFieldListCollection::containsSamplers() const
> {
>-    ASSERT(containsSamplers());
>-    for (auto &field : *mFields)
>+    for (const auto *field : *mFields)
>     {
>         const TType *fieldType = field->type();
>         if (IsSampler(fieldType->getBasicType()) || fieldType->isStructureContainingSamplers())
>-        {
>-            TString fieldName    = namePrefix + "_" + field->name();
>-            TString fieldApiName = apiNamePrefix + "." + field->name();
>-            fieldType->createSamplerSymbols(fieldName, fieldApiName, outputSymbols,
>-                                            outputSymbolsToAPINames, symbolTable);
>-        }
>+            return true;
>     }
>+    return false;
> }
> 
>-TString TFieldListCollection::buildMangledName(const TString &mangledNamePrefix) const
>+TString TFieldListCollection::buildMangledFieldList() const
> {
>-    TString mangledName(mangledNamePrefix);
>-    mangledName += *mName;
>-    for (size_t i = 0; i < mFields->size(); ++i)
>+    TString mangledName;
>+    for (const auto *field : *mFields)
>     {
>-        mangledName += '-';
>-        mangledName += (*mFields)[i]->type()->getMangledName();
>+        mangledName += field->type()->getMangledName();
>     }
>     return mangledName;
> }
>@@ -978,6 +855,13 @@ size_t TFieldListCollection::calculateObjectSize() const
>     return size;
> }
> 
>+size_t TFieldListCollection::objectSize() const
>+{
>+    if (mObjectSize == 0)
>+        mObjectSize = calculateObjectSize();
>+    return mObjectSize;
>+}
>+
> int TFieldListCollection::getLocationCount() const
> {
>     int count = 0;
>@@ -996,7 +880,21 @@ int TFieldListCollection::getLocationCount() const
>     return count;
> }
> 
>-int TStructure::calculateDeepestNesting() const
>+int TFieldListCollection::deepestNesting() const
>+{
>+    if (mDeepestNesting == 0)
>+        mDeepestNesting = calculateDeepestNesting();
>+    return mDeepestNesting;
>+}
>+
>+const TString &TFieldListCollection::mangledFieldList() const
>+{
>+    if (mMangledFieldList.empty())
>+        mMangledFieldList = buildMangledFieldList();
>+    return mMangledFieldList;
>+}
>+
>+int TFieldListCollection::calculateDeepestNesting() const
> {
>     int maxNesting = 0;
>     for (size_t i = 0; i < mFields->size(); ++i)
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/Types.h b/Source/ThirdParty/ANGLE/src/compiler/translator/Types.h
>index 7dc84c5b1c3..e6bfd1cdbae 100644
>--- a/Source/ThirdParty/ANGLE/src/compiler/translator/Types.h
>+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/Types.h
>@@ -12,6 +12,7 @@
> 
> #include "compiler/translator/BaseTypes.h"
> #include "compiler/translator/Common.h"
>+#include "compiler/translator/ImmutableString.h"
> #include "compiler/translator/SymbolUniqueId.h"
> 
> namespace sh
>@@ -19,160 +20,69 @@ namespace sh
> 
> struct TPublicType;
> class TType;
>+class TInterfaceBlock;
>+class TStructure;
> class TSymbol;
>+class TVariable;
> class TIntermSymbol;
> class TSymbolTable;
> 
> class TField : angle::NonCopyable
> {
>   public:
>-    POOL_ALLOCATOR_NEW_DELETE();
>-    TField(TType *type, TString *name, const TSourceLoc &line)
>-        : mType(type), mName(name), mLine(line)
>+    POOL_ALLOCATOR_NEW_DELETE
>+    TField(TType *type, const ImmutableString &name, const TSourceLoc &line, SymbolType symbolType)
>+        : mType(type), mName(name), mLine(line), mSymbolType(symbolType)
>     {
>+        ASSERT(mSymbolType != SymbolType::Empty);
>     }
> 
>     // TODO(alokp): We should only return const type.
>     // Fix it by tweaking grammar.
>     TType *type() { return mType; }
>     const TType *type() const { return mType; }
>-
>-    const TString &name() const { return *mName; }
>+    const ImmutableString &name() const { return mName; }
>     const TSourceLoc &line() const { return mLine; }
>+    SymbolType symbolType() const { return mSymbolType; }
> 
>   private:
>     TType *mType;
>-    TString *mName;
>-    TSourceLoc mLine;
>+    const ImmutableString mName;
>+    const TSourceLoc mLine;
>+    const SymbolType mSymbolType;
> };
> 
> typedef TVector<TField *> TFieldList;
>-inline TFieldList *NewPoolTFieldList()
>-{
>-    void *memory = GetGlobalPoolAllocator()->allocate(sizeof(TFieldList));
>-    return new (memory) TFieldList;
>-}
> 
> class TFieldListCollection : angle::NonCopyable
> {
>   public:
>-    const TString &name() const { return *mName; }
>     const TFieldList &fields() const { return *mFields; }
> 
>-    size_t objectSize() const
>-    {
>-        if (mObjectSize == 0)
>-            mObjectSize = calculateObjectSize();
>-        return mObjectSize;
>-    }
>-
>-    // How many locations the field list consumes as a uniform.
>-    int getLocationCount() const;
>-
>-  protected:
>-    TFieldListCollection(const TString *name, TFieldList *fields)
>-        : mName(name), mFields(fields), mObjectSize(0)
>-    {
>-    }
>-    TString buildMangledName(const TString &mangledNamePrefix) const;
>-    size_t calculateObjectSize() const;
>-
>-    const TString *mName;
>-    TFieldList *mFields;
>-
>-    mutable TString mMangledName;
>-    mutable size_t mObjectSize;
>-};
>-
>-// May also represent interface blocks
>-class TStructure : public TFieldListCollection
>-{
>-  public:
>-    POOL_ALLOCATOR_NEW_DELETE();
>-    TStructure(TSymbolTable *symbolTable, const TString *name, TFieldList *fields);
>-
>-    int deepestNesting() const
>-    {
>-        if (mDeepestNesting == 0)
>-            mDeepestNesting = calculateDeepestNesting();
>-        return mDeepestNesting;
>-    }
>     bool containsArrays() const;
>+    bool containsMatrices() const;
>     bool containsType(TBasicType t) const;
>     bool containsSamplers() const;
> 
>-    void createSamplerSymbols(const TString &namePrefix,
>-                              const TString &apiNamePrefix,
>-                              TVector<TIntermSymbol *> *outputSymbols,
>-                              TMap<TIntermSymbol *, TString> *outputSymbolsToAPINames,
>-                              TSymbolTable *symbolTable) const;
>-
>-    bool equals(const TStructure &other) const;
>-
>-    int uniqueId() const { return mUniqueId.get(); }
>-
>-    void setAtGlobalScope(bool atGlobalScope) { mAtGlobalScope = atGlobalScope; }
>+    size_t objectSize() const;
>+    // How many locations the field list consumes as a uniform.
>+    int getLocationCount() const;
>+    int deepestNesting() const;
>+    const TString &mangledFieldList() const;
> 
>-    bool atGlobalScope() const { return mAtGlobalScope; }
>+  protected:
>+    TFieldListCollection(const TFieldList *fields);
> 
>-    const TString &mangledName() const
>-    {
>-        if (mMangledName.empty())
>-            mMangledName = buildMangledName("struct-");
>-        return mMangledName;
>-    }
>+    const TFieldList *mFields;
> 
>   private:
>-    // TODO(zmo): Find a way to get rid of the const_cast in function
>-    // setName().  At the moment keep this function private so only
>-    // friend class RegenerateStructNames may call it.
>-    friend class RegenerateStructNames;
>-    void setName(const TString &name)
>-    {
>-        TString *mutableName = const_cast<TString *>(mName);
>-        *mutableName         = name;
>-    }
>-
>+    size_t calculateObjectSize() const;
>     int calculateDeepestNesting() const;
>+    TString buildMangledFieldList() const;
> 
>+    mutable size_t mObjectSize;
>     mutable int mDeepestNesting;
>-    const TSymbolUniqueId mUniqueId;
>-    bool mAtGlobalScope;
>-};
>-
>-class TInterfaceBlock : public TFieldListCollection
>-{
>-  public:
>-    POOL_ALLOCATOR_NEW_DELETE();
>-    TInterfaceBlock(const TString *name,
>-                    TFieldList *fields,
>-                    const TString *instanceName,
>-                    const TLayoutQualifier &layoutQualifier)
>-        : TFieldListCollection(name, fields),
>-          mInstanceName(instanceName),
>-          mBlockStorage(layoutQualifier.blockStorage),
>-          mMatrixPacking(layoutQualifier.matrixPacking),
>-          mBinding(layoutQualifier.binding)
>-    {
>-    }
>-
>-    const TString &instanceName() const { return *mInstanceName; }
>-    bool hasInstanceName() const { return mInstanceName != nullptr; }
>-    TLayoutBlockStorage blockStorage() const { return mBlockStorage; }
>-    TLayoutMatrixPacking matrixPacking() const { return mMatrixPacking; }
>-    int blockBinding() const { return mBinding; }
>-    const TString &mangledName() const
>-    {
>-        if (mMangledName.empty())
>-            mMangledName = buildMangledName("iblock-");
>-        return mMangledName;
>-    }
>-
>-  private:
>-    const TString *mInstanceName;  // for interface block instance names
>-    TLayoutBlockStorage mBlockStorage;
>-    TLayoutMatrixPacking mMatrixPacking;
>-    int mBinding;
>+    mutable TString mMangledFieldList;
> };
> 
> //
>@@ -181,7 +91,7 @@ class TInterfaceBlock : public TFieldListCollection
> class TType
> {
>   public:
>-    POOL_ALLOCATOR_NEW_DELETE();
>+    POOL_ALLOCATOR_NEW_DELETE
>     TType();
>     explicit TType(TBasicType t, unsigned char ps = 1, unsigned char ss = 1);
>     TType(TBasicType t,
>@@ -190,20 +100,57 @@ class TType
>           unsigned char ps = 1,
>           unsigned char ss = 1);
>     explicit TType(const TPublicType &p);
>-    explicit TType(TStructure *userDef);
>-    TType(TInterfaceBlock *interfaceBlockIn,
>+    TType(const TStructure *userDef, bool isStructSpecifier);
>+    TType(const TInterfaceBlock *interfaceBlockIn,
>           TQualifier qualifierIn,
>           TLayoutQualifier layoutQualifierIn);
>     TType(const TType &t);
>     TType &operator=(const TType &t);
> 
>-    TBasicType getBasicType() const { return type; }
>+    constexpr TType(TBasicType t,
>+                    TPrecision p,
>+                    TQualifier q,
>+                    unsigned char ps,
>+                    unsigned char ss,
>+                    const char *mangledName)
>+        : type(t),
>+          precision(p),
>+          qualifier(q),
>+          invariant(false),
>+          memoryQualifier(TMemoryQualifier::Create()),
>+          layoutQualifier(TLayoutQualifier::Create()),
>+          primarySize(ps),
>+          secondarySize(ss),
>+          mArraySizes(nullptr),
>+          mInterfaceBlock(nullptr),
>+          mStructure(nullptr),
>+          mIsStructSpecifier(false),
>+          mMangledName(mangledName)
>+    {}
>+
>+    constexpr TType(TType &&t)
>+        : type(t.type),
>+          precision(t.precision),
>+          qualifier(t.qualifier),
>+          invariant(t.invariant),
>+          memoryQualifier(t.memoryQualifier),
>+          layoutQualifier(t.layoutQualifier),
>+          primarySize(t.primarySize),
>+          secondarySize(t.secondarySize),
>+          mArraySizes(t.mArraySizes),
>+          mInterfaceBlock(t.mInterfaceBlock),
>+          mStructure(t.mStructure),
>+          mIsStructSpecifier(t.mIsStructSpecifier),
>+          mMangledName(t.mMangledName)
>+    {}
>+
>+    constexpr TBasicType getBasicType() const { return type; }
>     void setBasicType(TBasicType t);
> 
>     TPrecision getPrecision() const { return precision; }
>     void setPrecision(TPrecision p) { precision = p; }
> 
>-    TQualifier getQualifier() const { return qualifier; }
>+    constexpr TQualifier getQualifier() const { return qualifier; }
>     void setQualifier(TQualifier q) { qualifier = q; }
> 
>     bool isInvariant() const { return invariant; }
>@@ -245,9 +192,10 @@ class TType
>     const TVector<unsigned int> *getArraySizes() const { return mArraySizes; }
>     unsigned int getArraySizeProduct() const;
>     bool isUnsizedArray() const;
>-    unsigned int getOutermostArraySize() const {
>-         ASSERT(isArray());
>-         return mArraySizes->back();
>+    unsigned int getOutermostArraySize() const
>+    {
>+        ASSERT(isArray());
>+        return mArraySizes->back();
>     }
>     void makeArray(unsigned int s);
> 
>@@ -267,8 +215,8 @@ class TType
>     // Note that the array element type might still be an array type in GLSL ES version >= 3.10.
>     void toArrayElementType();
> 
>-    TInterfaceBlock *getInterfaceBlock() const { return mInterfaceBlock; }
>-    void setInterfaceBlock(TInterfaceBlock *interfaceBlockIn);
>+    const TInterfaceBlock *getInterfaceBlock() const { return mInterfaceBlock; }
>+    void setInterfaceBlock(const TInterfaceBlock *interfaceBlockIn);
>     bool isInterfaceBlock() const { return type == EbtInterfaceBlock; }
> 
>     bool isVector() const { return primarySize > 1 && secondarySize == 1; }
>@@ -281,10 +229,17 @@ class TType
> 
>     bool canBeConstructed() const;
> 
>-    TStructure *getStruct() { return mStructure; }
>     const TStructure *getStruct() const { return mStructure; }
>-    void setStruct(TStructure *s);
> 
>+    static constexpr char GetSizeMangledName(unsigned char primarySize, unsigned char secondarySize)
>+    {
>+        unsigned int sizeKey = (secondarySize - 1u) * 4u + primarySize - 1u;
>+        if (sizeKey < 10u)
>+        {
>+            return static_cast<char>('0' + sizeKey);
>+        }
>+        return static_cast<char>('A' + sizeKey - 10);
>+    }
>     const char *getMangledName() const;
> 
>     bool sameNonArrayType(const TType &right) const;
>@@ -334,8 +289,6 @@ class TType
> 
>     const char *getBuiltInTypeNameString() const;
> 
>-    TString getCompleteString() const;
>-
>     // If this type is a struct, returns the deepest struct nesting of
>     // any field in the struct. For example:
>     //   struct nesting1 {
>@@ -348,36 +301,35 @@ class TType
>     // For type "nesting2", this method would return 2 -- the number
>     // of structures through which indirection must occur to reach the
>     // deepest field (nesting2.field1.position).
>-    int getDeepestStructNesting() const { return mStructure ? mStructure->deepestNesting() : 0; }
>-
>-    bool isNamelessStruct() const { return mStructure && mStructure->name() == ""; }
>-
>-    bool isStructureContainingArrays() const
>-    {
>-        return mStructure ? mStructure->containsArrays() : false;
>-    }
>+    int getDeepestStructNesting() const;
> 
>-    bool isStructureContainingType(TBasicType t) const
>-    {
>-        return mStructure ? mStructure->containsType(t) : false;
>-    }
>+    bool isNamelessStruct() const;
> 
>-    bool isStructureContainingSamplers() const
>-    {
>-        return mStructure ? mStructure->containsSamplers() : false;
>-    }
>+    bool isStructureContainingArrays() const;
>+    bool isStructureContainingMatrices() const;
>+    bool isStructureContainingType(TBasicType t) const;
>+    bool isStructureContainingSamplers() const;
> 
>     bool isStructSpecifier() const { return mIsStructSpecifier; }
> 
>-    void createSamplerSymbols(const TString &namePrefix,
>+    // Return true if variables of this type should be replaced with an inline constant value if
>+    // such is available. False will be returned in cases where output doesn't support
>+    // TIntermConstantUnion nodes of the type, or if the type contains a lot of fields and creating
>+    // several copies of it in the output code is undesirable for performance.
>+    bool canReplaceWithConstantUnion() const;
>+
>+    // The char arrays passed in must be pool allocated or static.
>+    void createSamplerSymbols(const ImmutableString &namePrefix,
>                               const TString &apiNamePrefix,
>-                              TVector<TIntermSymbol *> *outputSymbols,
>-                              TMap<TIntermSymbol *, TString> *outputSymbolsToAPINames,
>+                              TVector<const TVariable *> *outputSymbols,
>+                              TMap<const TVariable *, TString> *outputSymbolsToAPINames,
>                               TSymbolTable *symbolTable) const;
> 
>     // Initializes all lazily-initialized members.
>     void realize();
> 
>+    bool isSampler() const { return IsSampler(type); }
>+
>   private:
>     void invalidateMangledName();
>     const char *buildMangledName() const;
>@@ -399,10 +351,10 @@ class TType
>     // 1) Represents an interface block.
>     // 2) Represents the member variable of an unnamed interface block.
>     // It's nullptr also for members of named interface blocks.
>-    TInterfaceBlock *mInterfaceBlock;
>+    const TInterfaceBlock *mInterfaceBlock;
> 
>-    // 0 unless this is a struct
>-    TStructure *mStructure;
>+    // nullptr unless this is a struct
>+    const TStructure *mStructure;
>     bool mIsStructSpecifier;
> 
>     mutable const char *mMangledName;
>@@ -415,7 +367,7 @@ struct TTypeSpecifierNonArray
>     TBasicType type;
>     unsigned char primarySize;    // size of vector or cols of matrix
>     unsigned char secondarySize;  // rows of matrix
>-    TStructure *userDef;
>+    const TStructure *userDef;
>     TSourceLoc line;
> 
>     // true if the type was defined by a struct specifier rather than a reference to a type name.
>@@ -432,7 +384,9 @@ struct TTypeSpecifierNonArray
>         isStructSpecifier = false;
>     }
> 
>-    void initializeStruct(TStructure *aUserDef, bool aIsStructSpecifier, const TSourceLoc &aLine)
>+    void initializeStruct(const TStructure *aUserDef,
>+                          bool aIsStructSpecifier,
>+                          const TSourceLoc &aLine)
>     {
>         type              = EbtStruct;
>         primarySize       = 1;
>@@ -479,7 +433,7 @@ struct TPublicType
>     unsigned char getPrimarySize() const { return typeSpecifierNonArray.primarySize; }
>     unsigned char getSecondarySize() const { return typeSpecifierNonArray.secondarySize; }
> 
>-    TStructure *getUserDef() const { return typeSpecifierNonArray.userDef; }
>+    const TStructure *getUserDef() const { return typeSpecifierNonArray.userDef; }
>     const TSourceLoc &getLine() const { return typeSpecifierNonArray.line; }
> 
>     bool isStructSpecifier() const { return typeSpecifierNonArray.isStructSpecifier; }
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/UnfoldShortCircuitAST.cpp b/Source/ThirdParty/ANGLE/src/compiler/translator/UnfoldShortCircuitAST.cpp
>deleted file mode 100644
>index 4e4653bbe5b..00000000000
>--- a/Source/ThirdParty/ANGLE/src/compiler/translator/UnfoldShortCircuitAST.cpp
>+++ /dev/null
>@@ -1,59 +0,0 @@
>-//
>-// Copyright (c) 2002-2013 The ANGLE Project Authors. All rights reserved.
>-// Use of this source code is governed by a BSD-style license that can be
>-// found in the LICENSE file.
>-//
>-
>-#include "compiler/translator/UnfoldShortCircuitAST.h"
>-
>-namespace sh
>-{
>-
>-namespace
>-{
>-
>-// "x || y" is equivalent to "x ? true : y".
>-TIntermTernary *UnfoldOR(TIntermTyped *x, TIntermTyped *y)
>-{
>-    TConstantUnion *u = new TConstantUnion;
>-    u->setBConst(true);
>-    TIntermConstantUnion *trueNode =
>-        new TIntermConstantUnion(u, TType(EbtBool, EbpUndefined, EvqConst, 1));
>-    return new TIntermTernary(x, trueNode, y);
>-}
>-
>-// "x && y" is equivalent to "x ? y : false".
>-TIntermTernary *UnfoldAND(TIntermTyped *x, TIntermTyped *y)
>-{
>-    TConstantUnion *u = new TConstantUnion;
>-    u->setBConst(false);
>-    TIntermConstantUnion *falseNode =
>-        new TIntermConstantUnion(u, TType(EbtBool, EbpUndefined, EvqConst, 1));
>-    return new TIntermTernary(x, y, falseNode);
>-}
>-
>-}  // namespace anonymous
>-
>-bool UnfoldShortCircuitAST::visitBinary(Visit visit, TIntermBinary *node)
>-{
>-    TIntermTernary *replacement = nullptr;
>-
>-    switch (node->getOp())
>-    {
>-        case EOpLogicalOr:
>-            replacement = UnfoldOR(node->getLeft(), node->getRight());
>-            break;
>-        case EOpLogicalAnd:
>-            replacement = UnfoldAND(node->getLeft(), node->getRight());
>-            break;
>-        default:
>-            break;
>-    }
>-    if (replacement)
>-    {
>-        queueReplacement(replacement, OriginalNode::IS_DROPPED);
>-    }
>-    return true;
>-}
>-
>-}  // namespace sh
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/UnfoldShortCircuitAST.h b/Source/ThirdParty/ANGLE/src/compiler/translator/UnfoldShortCircuitAST.h
>deleted file mode 100644
>index 7f377e6f152..00000000000
>--- a/Source/ThirdParty/ANGLE/src/compiler/translator/UnfoldShortCircuitAST.h
>+++ /dev/null
>@@ -1,33 +0,0 @@
>-//
>-// Copyright (c) 2002-2013 The ANGLE Project Authors. All rights reserved.
>-// Use of this source code is governed by a BSD-style license that can be
>-// found in the LICENSE file.
>-//
>-// UnfoldShortCircuitAST is an AST traverser to replace short-circuiting
>-// operations with ternary operations.
>-//
>-
>-#ifndef COMPILER_TRANSLATOR_UNFOLDSHORTCIRCUITAST_H_
>-#define COMPILER_TRANSLATOR_UNFOLDSHORTCIRCUITAST_H_
>-
>-#include "common/angleutils.h"
>-#include "compiler/translator/IntermTraverse.h"
>-
>-namespace sh
>-{
>-
>-// This traverser identifies all the short circuit binary  nodes that need to
>-// be replaced, and creates the corresponding replacement nodes. However,
>-// the actual replacements happen after the traverse through updateTree().
>-
>-class UnfoldShortCircuitAST : public TIntermTraverser
>-{
>-  public:
>-    UnfoldShortCircuitAST() : TIntermTraverser(true, false, false) {}
>-
>-    bool visitBinary(Visit visit, TIntermBinary *) override;
>-};
>-
>-}  // namespace sh
>-
>-#endif  // COMPILER_TRANSLATOR_UNFOLDSHORTCIRCUITAST_H_
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/UnfoldShortCircuitToIf.cpp b/Source/ThirdParty/ANGLE/src/compiler/translator/UnfoldShortCircuitToIf.cpp
>deleted file mode 100644
>index 774f1fc704b..00000000000
>--- a/Source/ThirdParty/ANGLE/src/compiler/translator/UnfoldShortCircuitToIf.cpp
>+++ /dev/null
>@@ -1,186 +0,0 @@
>-//
>-// Copyright (c) 2002-2013 The ANGLE Project Authors. All rights reserved.
>-// Use of this source code is governed by a BSD-style license that can be
>-// found in the LICENSE file.
>-//
>-// UnfoldShortCircuitToIf is an AST traverser to convert short-circuiting operators to if-else
>-// statements.
>-// The results are assigned to s# temporaries, which are used by the main translator instead of
>-// the original expression.
>-//
>-
>-#include "compiler/translator/UnfoldShortCircuitToIf.h"
>-
>-#include "compiler/translator/IntermNodePatternMatcher.h"
>-#include "compiler/translator/IntermTraverse.h"
>-
>-namespace sh
>-{
>-
>-namespace
>-{
>-
>-// Traverser that unfolds one short-circuiting operation at a time.
>-class UnfoldShortCircuitTraverser : public TIntermTraverser
>-{
>-  public:
>-    UnfoldShortCircuitTraverser(TSymbolTable *symbolTable);
>-
>-    bool visitBinary(Visit visit, TIntermBinary *node) override;
>-    bool visitTernary(Visit visit, TIntermTernary *node) override;
>-
>-    void nextIteration();
>-    bool foundShortCircuit() const { return mFoundShortCircuit; }
>-
>-  protected:
>-    // Marked to true once an operation that needs to be unfolded has been found.
>-    // After that, no more unfolding is performed on that traversal.
>-    bool mFoundShortCircuit;
>-
>-    IntermNodePatternMatcher mPatternToUnfoldMatcher;
>-};
>-
>-UnfoldShortCircuitTraverser::UnfoldShortCircuitTraverser(TSymbolTable *symbolTable)
>-    : TIntermTraverser(true, false, true, symbolTable),
>-      mFoundShortCircuit(false),
>-      mPatternToUnfoldMatcher(IntermNodePatternMatcher::kUnfoldedShortCircuitExpression)
>-{
>-}
>-
>-bool UnfoldShortCircuitTraverser::visitBinary(Visit visit, TIntermBinary *node)
>-{
>-    if (mFoundShortCircuit)
>-        return false;
>-
>-    if (visit != PreVisit)
>-        return true;
>-
>-    if (!mPatternToUnfoldMatcher.match(node, getParentNode()))
>-        return true;
>-
>-    // If our right node doesn't have side effects, we know we don't need to unfold this
>-    // expression: there will be no short-circuiting side effects to avoid
>-    // (note: unfolding doesn't depend on the left node -- it will always be evaluated)
>-    ASSERT(node->getRight()->hasSideEffects());
>-
>-    mFoundShortCircuit = true;
>-
>-    switch (node->getOp())
>-    {
>-        case EOpLogicalOr:
>-        {
>-            // "x || y" is equivalent to "x ? true : y", which unfolds to "bool s; if(x) s = true;
>-            // else s = y;",
>-            // and then further simplifies down to "bool s = x; if(!s) s = y;".
>-
>-            TIntermSequence insertions;
>-            TType boolType(EbtBool, EbpUndefined, EvqTemporary);
>-
>-            ASSERT(node->getLeft()->getType() == boolType);
>-            insertions.push_back(createTempInitDeclaration(node->getLeft()));
>-
>-            TIntermBlock *assignRightBlock = new TIntermBlock();
>-            ASSERT(node->getRight()->getType() == boolType);
>-            assignRightBlock->getSequence()->push_back(createTempAssignment(node->getRight()));
>-
>-            TIntermUnary *notTempSymbol =
>-                new TIntermUnary(EOpLogicalNot, createTempSymbol(boolType));
>-            TIntermIfElse *ifNode = new TIntermIfElse(notTempSymbol, assignRightBlock, nullptr);
>-            insertions.push_back(ifNode);
>-
>-            insertStatementsInParentBlock(insertions);
>-
>-            queueReplacement(createTempSymbol(boolType), OriginalNode::IS_DROPPED);
>-            return false;
>-        }
>-        case EOpLogicalAnd:
>-        {
>-            // "x && y" is equivalent to "x ? y : false", which unfolds to "bool s; if(x) s = y;
>-            // else s = false;",
>-            // and then further simplifies down to "bool s = x; if(s) s = y;".
>-            TIntermSequence insertions;
>-            TType boolType(EbtBool, EbpUndefined, EvqTemporary);
>-
>-            ASSERT(node->getLeft()->getType() == boolType);
>-            insertions.push_back(createTempInitDeclaration(node->getLeft()));
>-
>-            TIntermBlock *assignRightBlock = new TIntermBlock();
>-            ASSERT(node->getRight()->getType() == boolType);
>-            assignRightBlock->getSequence()->push_back(createTempAssignment(node->getRight()));
>-
>-            TIntermIfElse *ifNode =
>-                new TIntermIfElse(createTempSymbol(boolType), assignRightBlock, nullptr);
>-            insertions.push_back(ifNode);
>-
>-            insertStatementsInParentBlock(insertions);
>-
>-            queueReplacement(createTempSymbol(boolType), OriginalNode::IS_DROPPED);
>-            return false;
>-        }
>-        default:
>-            UNREACHABLE();
>-            return true;
>-    }
>-}
>-
>-bool UnfoldShortCircuitTraverser::visitTernary(Visit visit, TIntermTernary *node)
>-{
>-    if (mFoundShortCircuit)
>-        return false;
>-
>-    if (visit != PreVisit)
>-        return true;
>-
>-    if (!mPatternToUnfoldMatcher.match(node))
>-        return true;
>-
>-    mFoundShortCircuit = true;
>-
>-    // Unfold "b ? x : y" into "type s; if(b) s = x; else s = y;"
>-    TIntermSequence insertions;
>-
>-    TIntermDeclaration *tempDeclaration = createTempDeclaration(node->getType());
>-    insertions.push_back(tempDeclaration);
>-
>-    TIntermBlock *trueBlock       = new TIntermBlock();
>-    TIntermBinary *trueAssignment = createTempAssignment(node->getTrueExpression());
>-    trueBlock->getSequence()->push_back(trueAssignment);
>-
>-    TIntermBlock *falseBlock       = new TIntermBlock();
>-    TIntermBinary *falseAssignment = createTempAssignment(node->getFalseExpression());
>-    falseBlock->getSequence()->push_back(falseAssignment);
>-
>-    TIntermIfElse *ifNode =
>-        new TIntermIfElse(node->getCondition()->getAsTyped(), trueBlock, falseBlock);
>-    insertions.push_back(ifNode);
>-
>-    insertStatementsInParentBlock(insertions);
>-
>-    TIntermSymbol *ternaryResult = createTempSymbol(node->getType());
>-    queueReplacement(ternaryResult, OriginalNode::IS_DROPPED);
>-
>-    return false;
>-}
>-
>-void UnfoldShortCircuitTraverser::nextIteration()
>-{
>-    mFoundShortCircuit = false;
>-    nextTemporaryId();
>-}
>-
>-}  // namespace
>-
>-void UnfoldShortCircuitToIf(TIntermNode *root, TSymbolTable *symbolTable)
>-{
>-    UnfoldShortCircuitTraverser traverser(symbolTable);
>-    // Unfold one operator at a time, and reset the traverser between iterations.
>-    do
>-    {
>-        traverser.nextIteration();
>-        root->traverse(&traverser);
>-        if (traverser.foundShortCircuit())
>-            traverser.updateTree();
>-    } while (traverser.foundShortCircuit());
>-}
>-
>-}  // namespace sh
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/UnfoldShortCircuitToIf.h b/Source/ThirdParty/ANGLE/src/compiler/translator/UnfoldShortCircuitToIf.h
>deleted file mode 100644
>index 37dd83a8cfa..00000000000
>--- a/Source/ThirdParty/ANGLE/src/compiler/translator/UnfoldShortCircuitToIf.h
>+++ /dev/null
>@@ -1,25 +0,0 @@
>-//
>-// Copyright (c) 2002-2012 The ANGLE Project Authors. All rights reserved.
>-// Use of this source code is governed by a BSD-style license that can be
>-// found in the LICENSE file.
>-//
>-// UnfoldShortCircuitToIf is an AST traverser to convert short-circuiting operators to if-else
>-// statements.
>-// The results are assigned to s# temporaries, which are used by the main translator instead of
>-// the original expression.
>-//
>-
>-#ifndef COMPILER_TRANSLATOR_UNFOLDSHORTCIRCUIT_H_
>-#define COMPILER_TRANSLATOR_UNFOLDSHORTCIRCUIT_H_
>-
>-namespace sh
>-{
>-
>-class TIntermNode;
>-class TSymbolTable;
>-
>-void UnfoldShortCircuitToIf(TIntermNode *root, TSymbolTable *symbolTable);
>-
>-}  // namespace sh
>-
>-#endif  // COMPILER_TRANSLATOR_UNFOLDSHORTCIRCUIT_H_
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/UniformHLSL.cpp b/Source/ThirdParty/ANGLE/src/compiler/translator/UniformHLSL.cpp
>deleted file mode 100644
>index 9f18509438e..00000000000
>--- a/Source/ThirdParty/ANGLE/src/compiler/translator/UniformHLSL.cpp
>+++ /dev/null
>@@ -1,600 +0,0 @@
>-//
>-// Copyright (c) 2014 The ANGLE Project Authors. All rights reserved.
>-// Use of this source code is governed by a BSD-style license that can be
>-// found in the LICENSE file.
>-//
>-// UniformHLSL.cpp:
>-//   Methods for GLSL to HLSL translation for uniforms and uniform blocks.
>-//
>-
>-#include "compiler/translator/UniformHLSL.h"
>-
>-#include "common/utilities.h"
>-#include "compiler/translator/StructureHLSL.h"
>-#include "compiler/translator/UtilsHLSL.h"
>-#include "compiler/translator/blocklayoutHLSL.h"
>-#include "compiler/translator/util.h"
>-
>-namespace sh
>-{
>-
>-namespace
>-{
>-
>-static const char *UniformRegisterPrefix(const TType &type)
>-{
>-    if (IsSampler(type.getBasicType()))
>-    {
>-        return "s";
>-    }
>-    else
>-    {
>-        return "c";
>-    }
>-}
>-
>-static TString InterfaceBlockFieldTypeString(const TField &field, TLayoutBlockStorage blockStorage)
>-{
>-    const TType &fieldType                   = *field.type();
>-    const TLayoutMatrixPacking matrixPacking = fieldType.getLayoutQualifier().matrixPacking;
>-    ASSERT(matrixPacking != EmpUnspecified);
>-    const TStructure *structure = fieldType.getStruct();
>-
>-    if (fieldType.isMatrix())
>-    {
>-        // Use HLSL row-major packing for GLSL column-major matrices
>-        const TString &matrixPackString =
>-            (matrixPacking == EmpRowMajor ? "column_major" : "row_major");
>-        return matrixPackString + " " + TypeString(fieldType);
>-    }
>-    else if (structure)
>-    {
>-        // Use HLSL row-major packing for GLSL column-major matrices
>-        return QualifiedStructNameString(*structure, matrixPacking == EmpColumnMajor,
>-                                         blockStorage == EbsStd140);
>-    }
>-    else
>-    {
>-        return TypeString(fieldType);
>-    }
>-}
>-
>-static TString InterfaceBlockStructName(const TInterfaceBlock &interfaceBlock)
>-{
>-    return DecoratePrivate(interfaceBlock.name()) + "_type";
>-}
>-
>-void OutputSamplerIndexArrayInitializer(TInfoSinkBase &out,
>-                                        const TType &type,
>-                                        unsigned int startIndex)
>-{
>-    out << "{";
>-    TType elementType(type);
>-    elementType.toArrayElementType();
>-    for (unsigned int i = 0u; i < type.getOutermostArraySize(); ++i)
>-    {
>-        if (i > 0u)
>-        {
>-            out << ", ";
>-        }
>-        if (elementType.isArray())
>-        {
>-            OutputSamplerIndexArrayInitializer(out, elementType,
>-                                               startIndex + i * elementType.getArraySizeProduct());
>-        }
>-        else
>-        {
>-            out << (startIndex + i);
>-        }
>-    }
>-    out << "}";
>-}
>-
>-}  // anonymous namespace
>-
>-UniformHLSL::UniformHLSL(sh::GLenum shaderType,
>-                         StructureHLSL *structureHLSL,
>-                         ShShaderOutput outputType,
>-                         const std::vector<Uniform> &uniforms)
>-    : mUniformRegister(0),
>-      mUniformBlockRegister(0),
>-      mTextureRegister(0),
>-      mRWTextureRegister(0),
>-      mSamplerCount(0),
>-      mShaderType(shaderType),
>-      mStructureHLSL(structureHLSL),
>-      mOutputType(outputType),
>-      mUniforms(uniforms)
>-{
>-}
>-
>-void UniformHLSL::reserveUniformRegisters(unsigned int registerCount)
>-{
>-    mUniformRegister = registerCount;
>-}
>-
>-void UniformHLSL::reserveUniformBlockRegisters(unsigned int registerCount)
>-{
>-    mUniformBlockRegister = registerCount;
>-}
>-
>-const Uniform *UniformHLSL::findUniformByName(const TString &name) const
>-{
>-    for (size_t uniformIndex = 0; uniformIndex < mUniforms.size(); ++uniformIndex)
>-    {
>-        if (mUniforms[uniformIndex].name == name.c_str())
>-        {
>-            return &mUniforms[uniformIndex];
>-        }
>-    }
>-
>-    return nullptr;
>-}
>-
>-unsigned int UniformHLSL::assignUniformRegister(const TType &type,
>-                                                const TString &name,
>-                                                unsigned int *outRegisterCount)
>-{
>-    unsigned int registerIndex;
>-    const Uniform *uniform = findUniformByName(name);
>-    ASSERT(uniform);
>-
>-    if (IsSampler(type.getBasicType()) ||
>-        (IsImage(type.getBasicType()) && type.getMemoryQualifier().readonly))
>-    {
>-        registerIndex = mTextureRegister;
>-    }
>-    else if (IsImage(type.getBasicType()))
>-    {
>-        registerIndex = mRWTextureRegister;
>-    }
>-    else
>-    {
>-        registerIndex = mUniformRegister;
>-    }
>-
>-    mUniformRegisterMap[uniform->name] = registerIndex;
>-
>-    unsigned int registerCount = HLSLVariableRegisterCount(*uniform, mOutputType);
>-
>-    if (IsSampler(type.getBasicType()) ||
>-        (IsImage(type.getBasicType()) && type.getMemoryQualifier().readonly))
>-    {
>-        mTextureRegister += registerCount;
>-    }
>-    else if (IsImage(type.getBasicType()))
>-    {
>-        mRWTextureRegister += registerCount;
>-    }
>-    else
>-    {
>-        mUniformRegister += registerCount;
>-    }
>-    if (outRegisterCount)
>-    {
>-        *outRegisterCount = registerCount;
>-    }
>-    return registerIndex;
>-}
>-
>-unsigned int UniformHLSL::assignSamplerInStructUniformRegister(const TType &type,
>-                                                               const TString &name,
>-                                                               unsigned int *outRegisterCount)
>-{
>-    // Sampler that is a field of a uniform structure.
>-    ASSERT(IsSampler(type.getBasicType()));
>-    unsigned int registerIndex                     = mTextureRegister;
>-    mUniformRegisterMap[std::string(name.c_str())] = registerIndex;
>-    unsigned int registerCount = type.isArray() ? type.getArraySizeProduct() : 1u;
>-    mTextureRegister += registerCount;
>-    if (outRegisterCount)
>-    {
>-        *outRegisterCount = registerCount;
>-    }
>-    return registerIndex;
>-}
>-
>-void UniformHLSL::outputHLSLSamplerUniformGroup(
>-    TInfoSinkBase &out,
>-    const HLSLTextureGroup textureGroup,
>-    const TVector<const TIntermSymbol *> &group,
>-    const TMap<const TIntermSymbol *, TString> &samplerInStructSymbolsToAPINames,
>-    unsigned int *groupTextureRegisterIndex)
>-{
>-    if (group.empty())
>-    {
>-        return;
>-    }
>-    unsigned int groupRegisterCount = 0;
>-    for (const TIntermSymbol *uniform : group)
>-    {
>-        const TType &type   = uniform->getType();
>-        const TString &name = uniform->getSymbol();
>-        unsigned int registerCount;
>-
>-        // The uniform might be just a regular sampler or one extracted from a struct.
>-        unsigned int samplerArrayIndex = 0u;
>-        const Uniform *uniformByName   = findUniformByName(name);
>-        if (uniformByName)
>-        {
>-            samplerArrayIndex = assignUniformRegister(type, name, &registerCount);
>-        }
>-        else
>-        {
>-            ASSERT(samplerInStructSymbolsToAPINames.find(uniform) !=
>-                   samplerInStructSymbolsToAPINames.end());
>-            samplerArrayIndex = assignSamplerInStructUniformRegister(
>-                type, samplerInStructSymbolsToAPINames.at(uniform), &registerCount);
>-        }
>-        groupRegisterCount += registerCount;
>-
>-        if (type.isArray())
>-        {
>-            out << "static const uint " << DecorateVariableIfNeeded(uniform->getName())
>-                << ArrayString(type) << " = ";
>-            OutputSamplerIndexArrayInitializer(out, type, samplerArrayIndex);
>-            out << ";\n";
>-        }
>-        else
>-        {
>-            out << "static const uint " << DecorateVariableIfNeeded(uniform->getName()) << " = "
>-                << samplerArrayIndex << ";\n";
>-        }
>-    }
>-    TString suffix = TextureGroupSuffix(textureGroup);
>-    // Since HLSL_TEXTURE_2D is the first group, it has a fixed offset of zero.
>-    if (textureGroup != HLSL_TEXTURE_2D)
>-    {
>-        out << "static const uint textureIndexOffset" << suffix << " = "
>-            << (*groupTextureRegisterIndex) << ";\n";
>-        out << "static const uint samplerIndexOffset" << suffix << " = "
>-            << (*groupTextureRegisterIndex) << ";\n";
>-    }
>-    out << "uniform " << TextureString(textureGroup) << " textures" << suffix << "["
>-        << groupRegisterCount << "]"
>-        << " : register(t" << (*groupTextureRegisterIndex) << ");\n";
>-    out << "uniform " << SamplerString(textureGroup) << " samplers" << suffix << "["
>-        << groupRegisterCount << "]"
>-        << " : register(s" << (*groupTextureRegisterIndex) << ");\n";
>-    *groupTextureRegisterIndex += groupRegisterCount;
>-}
>-
>-void UniformHLSL::outputHLSL4_0_FL9_3Sampler(TInfoSinkBase &out,
>-                                             const TType &type,
>-                                             const TName &name,
>-                                             const unsigned int registerIndex)
>-{
>-    out << "uniform " << SamplerString(type.getBasicType()) << " sampler_"
>-        << DecorateVariableIfNeeded(name) << ArrayString(type) << " : register(s"
>-        << str(registerIndex) << ");\n";
>-    out << "uniform " << TextureString(type.getBasicType()) << " texture_"
>-        << DecorateVariableIfNeeded(name) << ArrayString(type) << " : register(t"
>-        << str(registerIndex) << ");\n";
>-}
>-
>-void UniformHLSL::outputHLSL4_1_FL11Texture(TInfoSinkBase &out,
>-                                            const TType &type,
>-                                            const TName &name,
>-                                            const unsigned int registerIndex)
>-{
>-    // TODO(xinghua.cao@intel.com): if image2D variable is bound on one layer of Texture3D or
>-    // Texture2DArray. Translate this variable to HLSL Texture3D object or HLSL Texture2DArray
>-    // object, or create a temporary Texture2D to save content of the layer and bind the
>-    // temporary Texture2D to image2D variable.
>-    out << "uniform "
>-        << TextureString(type.getBasicType(), type.getLayoutQualifier().imageInternalFormat) << " "
>-        << DecorateVariableIfNeeded(name) << ArrayString(type) << " : register(t"
>-        << str(registerIndex) << ");\n";
>-    return;
>-}
>-
>-void UniformHLSL::outputHLSL4_1_FL11RWTexture(TInfoSinkBase &out,
>-                                              const TType &type,
>-                                              const TName &name,
>-                                              const unsigned int registerIndex)
>-{
>-    // TODO(xinghua.cao@intel.com): if image2D variable is bound on one layer of Texture3D or
>-    // Texture2DArray. Translate this variable to HLSL RWTexture3D object or HLSL RWTexture2DArray
>-    // object, or create a temporary Texture2D to save content of the layer and bind the
>-    // temporary Texture2D to image2D variable.
>-    if (mShaderType == GL_COMPUTE_SHADER)
>-    {
>-        out << "uniform "
>-            << RWTextureString(type.getBasicType(), type.getLayoutQualifier().imageInternalFormat)
>-            << " " << DecorateVariableIfNeeded(name) << ArrayString(type) << " : register(u"
>-            << str(registerIndex) << ");\n";
>-    }
>-    else
>-    {
>-        // TODO(xinghua.cao@intel.com): Support images in vertex shader and fragment shader,
>-        // which are needed to sync binding value when linking program.
>-    }
>-    return;
>-}
>-
>-void UniformHLSL::outputUniform(TInfoSinkBase &out,
>-                                const TType &type,
>-                                const TName &name,
>-                                const unsigned int registerIndex)
>-{
>-    const TStructure *structure = type.getStruct();
>-    // If this is a nameless struct, we need to use its full definition, rather than its (empty)
>-    // name.
>-    // TypeString() will invoke defineNameless in this case; qualifier prefixes are unnecessary for
>-    // nameless structs in ES, as nameless structs cannot be used anywhere that layout qualifiers
>-    // are permitted.
>-    const TString &typeName = ((structure && !structure->name().empty())
>-                                   ? QualifiedStructNameString(*structure, false, false)
>-                                   : TypeString(type));
>-
>-    const TString &registerString =
>-        TString("register(") + UniformRegisterPrefix(type) + str(registerIndex) + ")";
>-
>-    out << "uniform " << typeName << " ";
>-
>-    out << DecorateVariableIfNeeded(name);
>-
>-    out << ArrayString(type) << " : " << registerString << ";\n";
>-}
>-
>-void UniformHLSL::uniformsHeader(TInfoSinkBase &out,
>-                                 ShShaderOutput outputType,
>-                                 const ReferencedSymbols &referencedUniforms,
>-                                 TSymbolTable *symbolTable)
>-{
>-    if (!referencedUniforms.empty())
>-    {
>-        out << "// Uniforms\n\n";
>-    }
>-    // In the case of HLSL 4, sampler uniforms need to be grouped by type before the code is
>-    // written. They are grouped based on the combination of the HLSL texture type and
>-    // HLSL sampler type, enumerated in HLSLTextureSamplerGroup.
>-    TVector<TVector<const TIntermSymbol *>> groupedSamplerUniforms(HLSL_TEXTURE_MAX + 1);
>-    TMap<const TIntermSymbol *, TString> samplerInStructSymbolsToAPINames;
>-    TVector<const TIntermSymbol *> imageUniformsHLSL41Output;
>-    for (auto &uniformIt : referencedUniforms)
>-    {
>-        // Output regular uniforms. Group sampler uniforms by type.
>-        const TIntermSymbol &uniform = *uniformIt.second;
>-        const TType &type            = uniform.getType();
>-        const TName &name            = uniform.getName();
>-
>-        if (outputType == SH_HLSL_4_1_OUTPUT && IsSampler(type.getBasicType()))
>-        {
>-            HLSLTextureGroup group = TextureGroup(type.getBasicType());
>-            groupedSamplerUniforms[group].push_back(&uniform);
>-        }
>-        else if (outputType == SH_HLSL_4_0_FL9_3_OUTPUT && IsSampler(type.getBasicType()))
>-        {
>-            unsigned int registerIndex = assignUniformRegister(type, name.getString(), nullptr);
>-            outputHLSL4_0_FL9_3Sampler(out, type, name, registerIndex);
>-        }
>-        else if (outputType == SH_HLSL_4_1_OUTPUT && IsImage(type.getBasicType()))
>-        {
>-            imageUniformsHLSL41Output.push_back(&uniform);
>-        }
>-        else
>-        {
>-            if (type.isStructureContainingSamplers())
>-            {
>-                TVector<TIntermSymbol *> samplerSymbols;
>-                TMap<TIntermSymbol *, TString> symbolsToAPINames;
>-                type.createSamplerSymbols("angle_" + name.getString(), name.getString(),
>-                                          &samplerSymbols, &symbolsToAPINames, symbolTable);
>-                for (TIntermSymbol *sampler : samplerSymbols)
>-                {
>-                    const TType &samplerType = sampler->getType();
>-
>-                    // Will use angle_ prefix instead of regular prefix.
>-                    sampler->setInternal(true);
>-                    const TName &samplerName = sampler->getName();
>-
>-                    if (outputType == SH_HLSL_4_1_OUTPUT)
>-                    {
>-                        HLSLTextureGroup group = TextureGroup(samplerType.getBasicType());
>-                        groupedSamplerUniforms[group].push_back(sampler);
>-                        samplerInStructSymbolsToAPINames[sampler] = symbolsToAPINames[sampler];
>-                    }
>-                    else if (outputType == SH_HLSL_4_0_FL9_3_OUTPUT)
>-                    {
>-                        unsigned int registerIndex = assignSamplerInStructUniformRegister(
>-                            samplerType, symbolsToAPINames[sampler], nullptr);
>-                        outputHLSL4_0_FL9_3Sampler(out, samplerType, samplerName, registerIndex);
>-                    }
>-                    else
>-                    {
>-                        ASSERT(outputType == SH_HLSL_3_0_OUTPUT);
>-                        unsigned int registerIndex = assignSamplerInStructUniformRegister(
>-                            samplerType, symbolsToAPINames[sampler], nullptr);
>-                        outputUniform(out, samplerType, samplerName, registerIndex);
>-                    }
>-                }
>-            }
>-            unsigned int registerIndex = assignUniformRegister(type, name.getString(), nullptr);
>-            outputUniform(out, type, name, registerIndex);
>-        }
>-    }
>-
>-    if (outputType == SH_HLSL_4_1_OUTPUT)
>-    {
>-        unsigned int groupTextureRegisterIndex = 0;
>-        // TEXTURE_2D is special, index offset is assumed to be 0 and omitted in that case.
>-        ASSERT(HLSL_TEXTURE_MIN == HLSL_TEXTURE_2D);
>-        for (int groupId = HLSL_TEXTURE_MIN; groupId < HLSL_TEXTURE_MAX; ++groupId)
>-        {
>-            outputHLSLSamplerUniformGroup(
>-                out, HLSLTextureGroup(groupId), groupedSamplerUniforms[groupId],
>-                samplerInStructSymbolsToAPINames, &groupTextureRegisterIndex);
>-        }
>-        mSamplerCount = groupTextureRegisterIndex;
>-
>-        for (const TIntermSymbol *image : imageUniformsHLSL41Output)
>-        {
>-            const TType &type          = image->getType();
>-            const TName &name          = image->getName();
>-            unsigned int registerIndex = assignUniformRegister(type, name.getString(), nullptr);
>-            if (type.getMemoryQualifier().readonly)
>-            {
>-                outputHLSL4_1_FL11Texture(out, type, name, registerIndex);
>-            }
>-            else
>-            {
>-                outputHLSL4_1_FL11RWTexture(out, type, name, registerIndex);
>-            }
>-        }
>-    }
>-}
>-
>-void UniformHLSL::samplerMetadataUniforms(TInfoSinkBase &out, const char *reg)
>-{
>-    // If mSamplerCount is 0 the shader doesn't use any textures for samplers.
>-    if (mSamplerCount > 0)
>-    {
>-        out << "    struct SamplerMetadata\n"
>-               "    {\n"
>-               "        int baseLevel;\n"
>-               "        int internalFormatBits;\n"
>-               "        int wrapModes;\n"
>-               "        int padding;\n"
>-               "    };\n"
>-               "    SamplerMetadata samplerMetadata["
>-            << mSamplerCount << "] : packoffset(" << reg << ");\n";
>-    }
>-}
>-
>-TString UniformHLSL::uniformBlocksHeader(const ReferencedSymbols &referencedInterfaceBlocks)
>-{
>-    TString interfaceBlocks;
>-
>-    for (ReferencedSymbols::const_iterator interfaceBlockIt = referencedInterfaceBlocks.begin();
>-         interfaceBlockIt != referencedInterfaceBlocks.end(); interfaceBlockIt++)
>-    {
>-        const TType &nodeType                 = interfaceBlockIt->second->getType();
>-        const TInterfaceBlock &interfaceBlock = *nodeType.getInterfaceBlock();
>-
>-        // nodeType.isInterfaceBlock() == false means the node is a field of a uniform block which
>-        // doesn't have instance name, so this block cannot be an array.
>-        unsigned int interfaceBlockArraySize = 0u;
>-        if (nodeType.isInterfaceBlock() && nodeType.isArray())
>-        {
>-            interfaceBlockArraySize = nodeType.getOutermostArraySize();
>-        }
>-        unsigned int activeRegister = mUniformBlockRegister;
>-
>-        mUniformBlockRegisterMap[interfaceBlock.name().c_str()] = activeRegister;
>-        mUniformBlockRegister += std::max(1u, interfaceBlockArraySize);
>-
>-        // FIXME: interface block field names
>-
>-        if (interfaceBlock.hasInstanceName())
>-        {
>-            interfaceBlocks += uniformBlockStructString(interfaceBlock);
>-        }
>-
>-        if (interfaceBlockArraySize > 0)
>-        {
>-            for (unsigned int arrayIndex = 0; arrayIndex < interfaceBlockArraySize; arrayIndex++)
>-            {
>-                interfaceBlocks +=
>-                    uniformBlockString(interfaceBlock, activeRegister + arrayIndex, arrayIndex);
>-            }
>-        }
>-        else
>-        {
>-            interfaceBlocks += uniformBlockString(interfaceBlock, activeRegister, GL_INVALID_INDEX);
>-        }
>-    }
>-
>-    return (interfaceBlocks.empty() ? "" : ("// Uniform Blocks\n\n" + interfaceBlocks));
>-}
>-
>-TString UniformHLSL::uniformBlockString(const TInterfaceBlock &interfaceBlock,
>-                                        unsigned int registerIndex,
>-                                        unsigned int arrayIndex)
>-{
>-    const TString &arrayIndexString =
>-        (arrayIndex != GL_INVALID_INDEX ? Decorate(str(arrayIndex)) : "");
>-    const TString &blockName = interfaceBlock.name() + arrayIndexString;
>-    TString hlsl;
>-
>-    hlsl += "cbuffer " + blockName + " : register(b" + str(registerIndex) +
>-            ")\n"
>-            "{\n";
>-
>-    if (interfaceBlock.hasInstanceName())
>-    {
>-        hlsl += "    " + InterfaceBlockStructName(interfaceBlock) + " " +
>-                uniformBlockInstanceString(interfaceBlock, arrayIndex) + ";\n";
>-    }
>-    else
>-    {
>-        const TLayoutBlockStorage blockStorage = interfaceBlock.blockStorage();
>-        hlsl += uniformBlockMembersString(interfaceBlock, blockStorage);
>-    }
>-
>-    hlsl += "};\n\n";
>-
>-    return hlsl;
>-}
>-
>-TString UniformHLSL::uniformBlockInstanceString(const TInterfaceBlock &interfaceBlock,
>-                                                unsigned int arrayIndex)
>-{
>-    if (!interfaceBlock.hasInstanceName())
>-    {
>-        return "";
>-    }
>-    else if (arrayIndex != GL_INVALID_INDEX)
>-    {
>-        return DecoratePrivate(interfaceBlock.instanceName()) + "_" + str(arrayIndex);
>-    }
>-    else
>-    {
>-        return Decorate(interfaceBlock.instanceName());
>-    }
>-}
>-
>-TString UniformHLSL::uniformBlockMembersString(const TInterfaceBlock &interfaceBlock,
>-                                               TLayoutBlockStorage blockStorage)
>-{
>-    TString hlsl;
>-
>-    Std140PaddingHelper padHelper = mStructureHLSL->getPaddingHelper();
>-
>-    for (unsigned int typeIndex = 0; typeIndex < interfaceBlock.fields().size(); typeIndex++)
>-    {
>-        const TField &field    = *interfaceBlock.fields()[typeIndex];
>-        const TType &fieldType = *field.type();
>-
>-        if (blockStorage == EbsStd140)
>-        {
>-            // 2 and 3 component vector types in some cases need pre-padding
>-            hlsl += padHelper.prePaddingString(fieldType);
>-        }
>-
>-        hlsl += "    " + InterfaceBlockFieldTypeString(field, blockStorage) + " " +
>-                Decorate(field.name()) + ArrayString(fieldType) + ";\n";
>-
>-        // must pad out after matrices and arrays, where HLSL usually allows itself room to pack
>-        // stuff
>-        if (blockStorage == EbsStd140)
>-        {
>-            const bool useHLSLRowMajorPacking =
>-                (fieldType.getLayoutQualifier().matrixPacking == EmpColumnMajor);
>-            hlsl += padHelper.postPaddingString(fieldType, useHLSLRowMajorPacking);
>-        }
>-    }
>-
>-    return hlsl;
>-}
>-
>-TString UniformHLSL::uniformBlockStructString(const TInterfaceBlock &interfaceBlock)
>-{
>-    const TLayoutBlockStorage blockStorage = interfaceBlock.blockStorage();
>-
>-    return "struct " + InterfaceBlockStructName(interfaceBlock) +
>-           "\n"
>-           "{\n" +
>-           uniformBlockMembersString(interfaceBlock, blockStorage) + "};\n\n";
>-}
>-}
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/UniformHLSL.h b/Source/ThirdParty/ANGLE/src/compiler/translator/UniformHLSL.h
>deleted file mode 100644
>index 8784e505330..00000000000
>--- a/Source/ThirdParty/ANGLE/src/compiler/translator/UniformHLSL.h
>+++ /dev/null
>@@ -1,110 +0,0 @@
>-//
>-// Copyright (c) 2014 The ANGLE Project Authors. All rights reserved.
>-// Use of this source code is governed by a BSD-style license that can be
>-// found in the LICENSE file.
>-//
>-// UniformHLSL.h:
>-//   Methods for GLSL to HLSL translation for uniforms and uniform blocks.
>-//
>-
>-#ifndef COMPILER_TRANSLATOR_UNIFORMHLSL_H_
>-#define COMPILER_TRANSLATOR_UNIFORMHLSL_H_
>-
>-#include "compiler/translator/OutputHLSL.h"
>-#include "compiler/translator/UtilsHLSL.h"
>-
>-namespace sh
>-{
>-class StructureHLSL;
>-class TSymbolTable;
>-
>-class UniformHLSL : angle::NonCopyable
>-{
>-  public:
>-    UniformHLSL(sh::GLenum shaderType,
>-                StructureHLSL *structureHLSL,
>-                ShShaderOutput outputType,
>-                const std::vector<Uniform> &uniforms);
>-
>-    void reserveUniformRegisters(unsigned int registerCount);
>-    void reserveUniformBlockRegisters(unsigned int registerCount);
>-    void uniformsHeader(TInfoSinkBase &out,
>-                        ShShaderOutput outputType,
>-                        const ReferencedSymbols &referencedUniforms,
>-                        TSymbolTable *symbolTable);
>-
>-    // Must be called after uniformsHeader
>-    void samplerMetadataUniforms(TInfoSinkBase &out, const char *reg);
>-
>-    TString uniformBlocksHeader(const ReferencedSymbols &referencedInterfaceBlocks);
>-
>-    // Used for direct index references
>-    static TString uniformBlockInstanceString(const TInterfaceBlock &interfaceBlock,
>-                                              unsigned int arrayIndex);
>-
>-    const std::map<std::string, unsigned int> &getUniformBlockRegisterMap() const
>-    {
>-        return mUniformBlockRegisterMap;
>-    }
>-    const std::map<std::string, unsigned int> &getUniformRegisterMap() const
>-    {
>-        return mUniformRegisterMap;
>-    }
>-
>-  private:
>-    TString uniformBlockString(const TInterfaceBlock &interfaceBlock,
>-                               unsigned int registerIndex,
>-                               unsigned int arrayIndex);
>-    TString uniformBlockMembersString(const TInterfaceBlock &interfaceBlock,
>-                                      TLayoutBlockStorage blockStorage);
>-    TString uniformBlockStructString(const TInterfaceBlock &interfaceBlock);
>-    const Uniform *findUniformByName(const TString &name) const;
>-
>-    void outputHLSL4_0_FL9_3Sampler(TInfoSinkBase &out,
>-                                    const TType &type,
>-                                    const TName &name,
>-                                    const unsigned int registerIndex);
>-    void outputHLSL4_1_FL11Texture(TInfoSinkBase &out,
>-                                   const TType &type,
>-                                   const TName &name,
>-                                   const unsigned int registerIndex);
>-    void outputHLSL4_1_FL11RWTexture(TInfoSinkBase &out,
>-                                     const TType &type,
>-                                     const TName &name,
>-                                     const unsigned int registerIndex);
>-    void outputUniform(TInfoSinkBase &out,
>-                       const TType &type,
>-                       const TName &name,
>-                       const unsigned int registerIndex);
>-
>-    // Returns the uniform's register index
>-    unsigned int assignUniformRegister(const TType &type,
>-                                       const TString &name,
>-                                       unsigned int *outRegisterCount);
>-    unsigned int assignSamplerInStructUniformRegister(const TType &type,
>-                                                      const TString &name,
>-                                                      unsigned int *outRegisterCount);
>-
>-    void outputHLSLSamplerUniformGroup(
>-        TInfoSinkBase &out,
>-        const HLSLTextureGroup textureGroup,
>-        const TVector<const TIntermSymbol *> &group,
>-        const TMap<const TIntermSymbol *, TString> &samplerInStructSymbolsToAPINames,
>-        unsigned int *groupTextureRegisterIndex);
>-
>-    unsigned int mUniformRegister;
>-    unsigned int mUniformBlockRegister;
>-    unsigned int mTextureRegister;
>-    unsigned int mRWTextureRegister;
>-    unsigned int mSamplerCount;
>-    sh::GLenum mShaderType;
>-    StructureHLSL *mStructureHLSL;
>-    ShShaderOutput mOutputType;
>-
>-    const std::vector<Uniform> &mUniforms;
>-    std::map<std::string, unsigned int> mUniformBlockRegisterMap;
>-    std::map<std::string, unsigned int> mUniformRegisterMap;
>-};
>-}
>-
>-#endif  // COMPILER_TRANSLATOR_UNIFORMHLSL_H_
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/UseInterfaceBlockFields.cpp b/Source/ThirdParty/ANGLE/src/compiler/translator/UseInterfaceBlockFields.cpp
>deleted file mode 100644
>index 40bd42afad8..00000000000
>--- a/Source/ThirdParty/ANGLE/src/compiler/translator/UseInterfaceBlockFields.cpp
>+++ /dev/null
>@@ -1,105 +0,0 @@
>-//
>-// Copyright 2016 The ANGLE Project Authors. All rights reserved.
>-// Use of this source code is governed by a BSD-style license that can be
>-// found in the LICENSE file.
>-//
>-
>-// UseInterfaceBlockFields.cpp: insert statements to reference all members in InterfaceBlock list at
>-// the beginning of main. This is to work around a Mac driver that treats unused standard/shared
>-// uniform blocks as inactive.
>-
>-#include "compiler/translator/UseInterfaceBlockFields.h"
>-
>-#include "compiler/translator/FindMain.h"
>-#include "compiler/translator/IntermNode.h"
>-#include "compiler/translator/IntermNode_util.h"
>-#include "compiler/translator/SymbolTable.h"
>-#include "compiler/translator/util.h"
>-
>-namespace sh
>-{
>-
>-namespace
>-{
>-
>-void AddNodeUseStatements(TIntermTyped *node, TIntermSequence *sequence)
>-{
>-    if (node->isArray())
>-    {
>-        for (unsigned int i = 0u; i < node->getOutermostArraySize(); ++i)
>-        {
>-            TIntermBinary *element =
>-                new TIntermBinary(EOpIndexDirect, node->deepCopy(), CreateIndexNode(i));
>-            AddNodeUseStatements(element, sequence);
>-        }
>-    }
>-    else
>-    {
>-        sequence->insert(sequence->begin(), node);
>-    }
>-}
>-
>-void AddFieldUseStatements(const ShaderVariable &var,
>-                           TIntermSequence *sequence,
>-                           const TSymbolTable &symbolTable)
>-{
>-    TString name = TString(var.name.c_str());
>-    ASSERT(name.find_last_of('[') == TString::npos);
>-    TIntermSymbol *symbol = ReferenceGlobalVariable(name, symbolTable);
>-    AddNodeUseStatements(symbol, sequence);
>-}
>-
>-void InsertUseCode(const InterfaceBlock &block, TIntermTyped *blockNode, TIntermSequence *sequence)
>-{
>-    for (unsigned int i = 0; i < block.fields.size(); ++i)
>-    {
>-        TIntermBinary *element = new TIntermBinary(EOpIndexDirectInterfaceBlock,
>-                                                   blockNode->deepCopy(), CreateIndexNode(i));
>-        sequence->insert(sequence->begin(), element);
>-    }
>-}
>-
>-void InsertUseCode(TIntermSequence *sequence,
>-                   const InterfaceBlockList &blocks,
>-                   const TSymbolTable &symbolTable)
>-{
>-    for (const auto &block : blocks)
>-    {
>-        if (block.instanceName.empty())
>-        {
>-            for (const auto &var : block.fields)
>-            {
>-                AddFieldUseStatements(var, sequence, symbolTable);
>-            }
>-        }
>-        else if (block.arraySize > 0u)
>-        {
>-            TString name(block.instanceName.c_str());
>-            TIntermSymbol *arraySymbol = ReferenceGlobalVariable(name, symbolTable);
>-            for (unsigned int i = 0u; i < block.arraySize; ++i)
>-            {
>-                TIntermBinary *elementSymbol =
>-                    new TIntermBinary(EOpIndexDirect, arraySymbol->deepCopy(), CreateIndexNode(i));
>-                InsertUseCode(block, elementSymbol, sequence);
>-            }
>-        }
>-        else
>-        {
>-            TString name(block.instanceName.c_str());
>-            TIntermSymbol *blockSymbol = ReferenceGlobalVariable(name, symbolTable);
>-            InsertUseCode(block, blockSymbol, sequence);
>-        }
>-    }
>-}
>-
>-}  // namespace anonymous
>-
>-void UseInterfaceBlockFields(TIntermBlock *root,
>-                             const InterfaceBlockList &blocks,
>-                             const TSymbolTable &symbolTable)
>-{
>-    TIntermBlock *mainBody = FindMainBody(root);
>-    InsertUseCode(mainBody->getSequence(), blocks, symbolTable);
>-}
>-
>-}  // namespace sh
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/UseInterfaceBlockFields.h b/Source/ThirdParty/ANGLE/src/compiler/translator/UseInterfaceBlockFields.h
>deleted file mode 100644
>index 3e2a4815d49..00000000000
>--- a/Source/ThirdParty/ANGLE/src/compiler/translator/UseInterfaceBlockFields.h
>+++ /dev/null
>@@ -1,30 +0,0 @@
>-//
>-// Copyright 2016 The ANGLE Project Authors. All rights reserved.
>-// Use of this source code is governed by a BSD-style license that can be
>-// found in the LICENSE file.
>-//
>-
>-// UseInterfaceBlockFields.h: insert statements to reference all members in InterfaceBlock list at
>-// the beginning of main. This is to work around a Mac driver that treats unused standard/shared
>-// uniform blocks as inactive.
>-
>-#ifndef COMPILER_TRANSLATOR_USEINTERFACEBLOCKFIELDS_H_
>-#define COMPILER_TRANSLATOR_USEINTERFACEBLOCKFIELDS_H_
>-
>-#include <GLSLANG/ShaderLang.h>
>-
>-namespace sh
>-{
>-
>-class TIntermBlock;
>-class TSymbolTable;
>-
>-using InterfaceBlockList = std::vector<sh::InterfaceBlock>;
>-
>-void UseInterfaceBlockFields(TIntermBlock *root,
>-                             const InterfaceBlockList &blocks,
>-                             const TSymbolTable &symbolTable);
>-
>-}  // namespace sh
>-
>-#endif  // COMPILER_TRANSLATOR_USEINTERFACEBLOCKFIELDS_H_
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/UtilsHLSL.cpp b/Source/ThirdParty/ANGLE/src/compiler/translator/UtilsHLSL.cpp
>index 8a77f0049a6..11e337dabd0 100644
>--- a/Source/ThirdParty/ANGLE/src/compiler/translator/UtilsHLSL.cpp
>+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/UtilsHLSL.cpp
>@@ -11,11 +11,39 @@
> #include "compiler/translator/IntermNode.h"
> #include "compiler/translator/StructureHLSL.h"
> #include "compiler/translator/SymbolTable.h"
>+#include "compiler/translator/util.h"
> 
> namespace sh
> {
> 
>-TString SamplerString(const TBasicType type)
>+namespace
>+{
>+
>+void DisambiguateFunctionNameForParameterType(const TType &paramType,
>+                                              TString *disambiguatingStringOut)
>+{
>+    // Parameter types are only added to function names if they are ambiguous according to the
>+    // native HLSL compiler. Other parameter types are not added to function names to avoid
>+    // making function names longer.
>+    if (paramType.getObjectSize() == 4 && paramType.getBasicType() == EbtFloat)
>+    {
>+        // Disambiguation is needed for float2x2 and float4 parameters. These are the only
>+        // built-in types that HLSL thinks are identical. float2x3 and float3x2 are different
>+        // types, for example.
>+        *disambiguatingStringOut += "_" + TypeString(paramType);
>+    }
>+    else if (paramType.getBasicType() == EbtStruct)
>+    {
>+        // Disambiguation is needed for struct parameters, since HLSL thinks that structs with
>+        // the same fields but a different name are identical.
>+        ASSERT(paramType.getStruct()->symbolType() != SymbolType::Empty);
>+        *disambiguatingStringOut += "_" + TypeString(paramType);
>+    }
>+}
>+
>+}  // anonymous namespace
>+
>+const char *SamplerString(const TBasicType type)
> {
>     if (IsShadowSampler(type))
>     {
>@@ -27,7 +55,7 @@ TString SamplerString(const TBasicType type)
>     }
> }
> 
>-TString SamplerString(HLSLTextureGroup type)
>+const char *SamplerString(HLSLTextureGroup type)
> {
>     if (type >= HLSL_COMPARISON_SAMPLER_GROUP_BEGIN && type <= HLSL_COMPARISON_SAMPLER_GROUP_END)
>     {
>@@ -56,6 +84,8 @@ HLSLTextureGroup TextureGroup(const TBasicType type, TLayoutImageInternalFormat
>             return HLSL_TEXTURE_3D;
>         case EbtSampler2DMS:
>             return HLSL_TEXTURE_2D_MS;
>+        case EbtSampler2DMSArray:
>+            return HLSL_TEXTURE_2D_MS_ARRAY;
>         case EbtISampler2D:
>             return HLSL_TEXTURE_2D_INT4;
>         case EbtISampler3D:
>@@ -66,6 +96,8 @@ HLSLTextureGroup TextureGroup(const TBasicType type, TLayoutImageInternalFormat
>             return HLSL_TEXTURE_2D_ARRAY_INT4;
>         case EbtISampler2DMS:
>             return HLSL_TEXTURE_2D_MS_INT4;
>+        case EbtISampler2DMSArray:
>+            return HLSL_TEXTURE_2D_MS_ARRAY_INT4;
>         case EbtUSampler2D:
>             return HLSL_TEXTURE_2D_UINT4;
>         case EbtUSampler3D:
>@@ -76,6 +108,8 @@ HLSLTextureGroup TextureGroup(const TBasicType type, TLayoutImageInternalFormat
>             return HLSL_TEXTURE_2D_ARRAY_UINT4;
>         case EbtUSampler2DMS:
>             return HLSL_TEXTURE_2D_MS_UINT4;
>+        case EbtUSampler2DMSArray:
>+            return HLSL_TEXTURE_2D_MS_ARRAY_UINT4;
>         case EbtSampler2DShadow:
>             return HLSL_TEXTURE_2D_COMPARISON;
>         case EbtSamplerCubeShadow:
>@@ -96,6 +130,9 @@ HLSLTextureGroup TextureGroup(const TBasicType type, TLayoutImageInternalFormat
>                     return HLSL_TEXTURE_2D_SNORM;
>                 default:
>                     UNREACHABLE();
>+#if !UNREACHABLE_IS_NORETURN
>+                    return HLSL_TEXTURE_UNKNOWN;
>+#endif
>             }
>         }
>         case EbtIImage2D:
>@@ -109,6 +146,9 @@ HLSLTextureGroup TextureGroup(const TBasicType type, TLayoutImageInternalFormat
>                     return HLSL_TEXTURE_2D_INT4;
>                 default:
>                     UNREACHABLE();
>+#if !UNREACHABLE_IS_NORETURN
>+                    return HLSL_TEXTURE_UNKNOWN;
>+#endif
>             }
>         }
>         case EbtUImage2D:
>@@ -123,6 +163,9 @@ HLSLTextureGroup TextureGroup(const TBasicType type, TLayoutImageInternalFormat
>                     return HLSL_TEXTURE_2D_UINT4;
>                 default:
>                     UNREACHABLE();
>+#if !UNREACHABLE_IS_NORETURN
>+                    return HLSL_TEXTURE_UNKNOWN;
>+#endif
>             }
>         }
>         case EbtImage3D:
>@@ -139,6 +182,9 @@ HLSLTextureGroup TextureGroup(const TBasicType type, TLayoutImageInternalFormat
>                     return HLSL_TEXTURE_3D_SNORM;
>                 default:
>                     UNREACHABLE();
>+#if !UNREACHABLE_IS_NORETURN
>+                    return HLSL_TEXTURE_UNKNOWN;
>+#endif
>             }
>         }
>         case EbtIImage3D:
>@@ -152,6 +198,9 @@ HLSLTextureGroup TextureGroup(const TBasicType type, TLayoutImageInternalFormat
>                     return HLSL_TEXTURE_3D_INT4;
>                 default:
>                     UNREACHABLE();
>+#if !UNREACHABLE_IS_NORETURN
>+                    return HLSL_TEXTURE_UNKNOWN;
>+#endif
>             }
>         }
>         case EbtUImage3D:
>@@ -165,6 +214,9 @@ HLSLTextureGroup TextureGroup(const TBasicType type, TLayoutImageInternalFormat
>                     return HLSL_TEXTURE_3D_UINT4;
>                 default:
>                     UNREACHABLE();
>+#if !UNREACHABLE_IS_NORETURN
>+                    return HLSL_TEXTURE_UNKNOWN;
>+#endif
>             }
>         }
>         case EbtImage2DArray:
>@@ -182,6 +234,9 @@ HLSLTextureGroup TextureGroup(const TBasicType type, TLayoutImageInternalFormat
>                     return HLSL_TEXTURE_2D_ARRAY_SNORM;
>                 default:
>                     UNREACHABLE();
>+#if !UNREACHABLE_IS_NORETURN
>+                    return HLSL_TEXTURE_UNKNOWN;
>+#endif
>             }
>         }
>         case EbtIImage2DArray:
>@@ -196,6 +251,9 @@ HLSLTextureGroup TextureGroup(const TBasicType type, TLayoutImageInternalFormat
>                     return HLSL_TEXTURE_2D_ARRAY_INT4;
>                 default:
>                     UNREACHABLE();
>+#if !UNREACHABLE_IS_NORETURN
>+                    return HLSL_TEXTURE_UNKNOWN;
>+#endif
>             }
>         }
>         case EbtUImage2DArray:
>@@ -210,15 +268,20 @@ HLSLTextureGroup TextureGroup(const TBasicType type, TLayoutImageInternalFormat
>                     return HLSL_TEXTURE_2D_ARRAY_UINT4;
>                 default:
>                     UNREACHABLE();
>+#if !UNREACHABLE_IS_NORETURN
>+                    return HLSL_TEXTURE_UNKNOWN;
>+#endif
>             }
>         }
>         default:
>             UNREACHABLE();
>+#if !UNREACHABLE_IS_NORETURN
>+            return HLSL_TEXTURE_UNKNOWN;
>+#endif
>     }
>-    return HLSL_TEXTURE_UNKNOWN;
> }
> 
>-TString TextureString(const HLSLTextureGroup textureGroup)
>+const char *TextureString(const HLSLTextureGroup textureGroup)
> {
>     switch (textureGroup)
>     {
>@@ -248,6 +311,8 @@ TString TextureString(const HLSLTextureGroup textureGroup)
>             return "Texture3D<snorm float4>";
>         case HLSL_TEXTURE_2D_MS:
>             return "Texture2DMS<float4>";
>+        case HLSL_TEXTURE_2D_MS_ARRAY:
>+            return "Texture2DMSArray<float4>";
>         case HLSL_TEXTURE_2D_INT4:
>             return "Texture2D<int4>";
>         case HLSL_TEXTURE_3D_INT4:
>@@ -256,6 +321,8 @@ TString TextureString(const HLSLTextureGroup textureGroup)
>             return "Texture2DArray<int4>";
>         case HLSL_TEXTURE_2D_MS_INT4:
>             return "Texture2DMS<int4>";
>+        case HLSL_TEXTURE_2D_MS_ARRAY_INT4:
>+            return "Texture2DMSArray<int4>";
>         case HLSL_TEXTURE_2D_UINT4:
>             return "Texture2D<uint4>";
>         case HLSL_TEXTURE_3D_UINT4:
>@@ -264,6 +331,8 @@ TString TextureString(const HLSLTextureGroup textureGroup)
>             return "Texture2DArray<uint4>";
>         case HLSL_TEXTURE_2D_MS_UINT4:
>             return "Texture2DMS<uint4>";
>+        case HLSL_TEXTURE_2D_MS_ARRAY_UINT4:
>+            return "Texture2DMSArray<uint4>";
>         case HLSL_TEXTURE_2D_COMPARISON:
>             return "Texture2D";
>         case HLSL_TEXTURE_CUBE_COMPARISON:
>@@ -277,12 +346,12 @@ TString TextureString(const HLSLTextureGroup textureGroup)
>     return "<unknown read texture type>";
> }
> 
>-TString TextureString(const TBasicType type, TLayoutImageInternalFormat imageInternalFormat)
>+const char *TextureString(const TBasicType type, TLayoutImageInternalFormat imageInternalFormat)
> {
>     return TextureString(TextureGroup(type, imageInternalFormat));
> }
> 
>-TString TextureGroupSuffix(const HLSLTextureGroup type)
>+const char *TextureGroupSuffix(const HLSLTextureGroup type)
> {
>     switch (type)
>     {
>@@ -312,6 +381,8 @@ TString TextureGroupSuffix(const HLSLTextureGroup type)
>             return "3D_snorm_float4_";
>         case HLSL_TEXTURE_2D_MS:
>             return "2DMS";
>+        case HLSL_TEXTURE_2D_MS_ARRAY:
>+            return "2DMSArray";
>         case HLSL_TEXTURE_2D_INT4:
>             return "2D_int4_";
>         case HLSL_TEXTURE_3D_INT4:
>@@ -320,6 +391,8 @@ TString TextureGroupSuffix(const HLSLTextureGroup type)
>             return "2DArray_int4_";
>         case HLSL_TEXTURE_2D_MS_INT4:
>             return "2DMS_int4_";
>+        case HLSL_TEXTURE_2D_MS_ARRAY_INT4:
>+            return "2DMSArray_int4_";
>         case HLSL_TEXTURE_2D_UINT4:
>             return "2D_uint4_";
>         case HLSL_TEXTURE_3D_UINT4:
>@@ -328,6 +401,8 @@ TString TextureGroupSuffix(const HLSLTextureGroup type)
>             return "2DArray_uint4_";
>         case HLSL_TEXTURE_2D_MS_UINT4:
>             return "2DMS_uint4_";
>+        case HLSL_TEXTURE_2D_MS_ARRAY_UINT4:
>+            return "2DMSArray_uint4_";
>         case HLSL_TEXTURE_2D_COMPARISON:
>             return "2D_comparison";
>         case HLSL_TEXTURE_CUBE_COMPARISON:
>@@ -341,12 +416,13 @@ TString TextureGroupSuffix(const HLSLTextureGroup type)
>     return "<unknown texture type>";
> }
> 
>-TString TextureGroupSuffix(const TBasicType type, TLayoutImageInternalFormat imageInternalFormat)
>+const char *TextureGroupSuffix(const TBasicType type,
>+                               TLayoutImageInternalFormat imageInternalFormat)
> {
>     return TextureGroupSuffix(TextureGroup(type, imageInternalFormat));
> }
> 
>-TString TextureTypeSuffix(const TBasicType type, TLayoutImageInternalFormat imageInternalFormat)
>+const char *TextureTypeSuffix(const TBasicType type, TLayoutImageInternalFormat imageInternalFormat)
> {
>     switch (type)
>     {
>@@ -371,6 +447,9 @@ TString TextureTypeSuffix(const TBasicType type, TLayoutImageInternalFormat imag
>                 default:
>                     UNREACHABLE();
>             }
>+#if !UNREACHABLE_IS_NORETURN
>+            break;
>+#endif
>         }
>         case EbtIImageCube:
>         {
>@@ -384,6 +463,9 @@ TString TextureTypeSuffix(const TBasicType type, TLayoutImageInternalFormat imag
>                 default:
>                     UNREACHABLE();
>             }
>+#if !UNREACHABLE_IS_NORETURN
>+            break;
>+#endif
>         }
>         case EbtUImageCube:
>         {
>@@ -397,11 +479,18 @@ TString TextureTypeSuffix(const TBasicType type, TLayoutImageInternalFormat imag
>                 default:
>                     UNREACHABLE();
>             }
>+#if !UNREACHABLE_IS_NORETURN
>+            break;
>+#endif
>         }
>         default:
>             // All other types are identified by their group suffix
>             return TextureGroupSuffix(type, imageInternalFormat);
>     }
>+#if !UNREACHABLE_IS_NORETURN
>+    UNREACHABLE();
>+    return "_TTS_invalid_";
>+#endif
> }
> 
> HLSLRWTextureGroup RWTextureGroup(const TBasicType type,
>@@ -425,6 +514,9 @@ HLSLRWTextureGroup RWTextureGroup(const TBasicType type,
>                 default:
>                     UNREACHABLE();
>             }
>+#if !UNREACHABLE_IS_NORETURN
>+            break;
>+#endif
>         }
>         case EbtIImage2D:
>         {
>@@ -438,6 +530,9 @@ HLSLRWTextureGroup RWTextureGroup(const TBasicType type,
>                 default:
>                     UNREACHABLE();
>             }
>+#if !UNREACHABLE_IS_NORETURN
>+            break;
>+#endif
>         }
>         case EbtUImage2D:
>         {
>@@ -452,6 +547,9 @@ HLSLRWTextureGroup RWTextureGroup(const TBasicType type,
>                 default:
>                     UNREACHABLE();
>             }
>+#if !UNREACHABLE_IS_NORETURN
>+            break;
>+#endif
>         }
>         case EbtImage3D:
>         {
>@@ -468,6 +566,9 @@ HLSLRWTextureGroup RWTextureGroup(const TBasicType type,
>                 default:
>                     UNREACHABLE();
>             }
>+#if !UNREACHABLE_IS_NORETURN
>+            break;
>+#endif
>         }
>         case EbtIImage3D:
>         {
>@@ -481,6 +582,9 @@ HLSLRWTextureGroup RWTextureGroup(const TBasicType type,
>                 default:
>                     UNREACHABLE();
>             }
>+#if !UNREACHABLE_IS_NORETURN
>+            break;
>+#endif
>         }
>         case EbtUImage3D:
>         {
>@@ -494,6 +598,9 @@ HLSLRWTextureGroup RWTextureGroup(const TBasicType type,
>                 default:
>                     UNREACHABLE();
>             }
>+#if !UNREACHABLE_IS_NORETURN
>+            break;
>+#endif
>         }
>         case EbtImage2DArray:
>         case EbtImageCube:
>@@ -511,6 +618,9 @@ HLSLRWTextureGroup RWTextureGroup(const TBasicType type,
>                 default:
>                     UNREACHABLE();
>             }
>+#if !UNREACHABLE_IS_NORETURN
>+            break;
>+#endif
>         }
>         case EbtIImage2DArray:
>         case EbtIImageCube:
>@@ -525,6 +635,9 @@ HLSLRWTextureGroup RWTextureGroup(const TBasicType type,
>                 default:
>                     UNREACHABLE();
>             }
>+#if !UNREACHABLE_IS_NORETURN
>+            break;
>+#endif
>         }
>         case EbtUImage2DArray:
>         case EbtUImageCube:
>@@ -539,6 +652,9 @@ HLSLRWTextureGroup RWTextureGroup(const TBasicType type,
>                 default:
>                     UNREACHABLE();
>             }
>+#if !UNREACHABLE_IS_NORETURN
>+            break;
>+#endif
>         }
>         default:
>             UNREACHABLE();
>@@ -546,7 +662,7 @@ HLSLRWTextureGroup RWTextureGroup(const TBasicType type,
>     return HLSL_RWTEXTURE_UNKNOWN;
> }
> 
>-TString RWTextureString(const HLSLRWTextureGroup RWTextureGroup)
>+const char *RWTextureString(const HLSLRWTextureGroup RWTextureGroup)
> {
>     switch (RWTextureGroup)
>     {
>@@ -587,12 +703,12 @@ TString RWTextureString(const HLSLRWTextureGroup RWTextureGroup)
>     return "<unknown read and write texture type>";
> }
> 
>-TString RWTextureString(const TBasicType type, TLayoutImageInternalFormat imageInternalFormat)
>+const char *RWTextureString(const TBasicType type, TLayoutImageInternalFormat imageInternalFormat)
> {
>     return RWTextureString(RWTextureGroup(type, imageInternalFormat));
> }
> 
>-TString RWTextureGroupSuffix(const HLSLRWTextureGroup type)
>+const char *RWTextureGroupSuffix(const HLSLRWTextureGroup type)
> {
>     switch (type)
>     {
>@@ -633,12 +749,14 @@ TString RWTextureGroupSuffix(const HLSLRWTextureGroup type)
>     return "<unknown read and write resource>";
> }
> 
>-TString RWTextureGroupSuffix(const TBasicType type, TLayoutImageInternalFormat imageInternalFormat)
>+const char *RWTextureGroupSuffix(const TBasicType type,
>+                                 TLayoutImageInternalFormat imageInternalFormat)
> {
>     return RWTextureGroupSuffix(RWTextureGroup(type, imageInternalFormat));
> }
> 
>-TString RWTextureTypeSuffix(const TBasicType type, TLayoutImageInternalFormat imageInternalFormat)
>+const char *RWTextureTypeSuffix(const TBasicType type,
>+                                TLayoutImageInternalFormat imageInternalFormat)
> {
>     switch (type)
>     {
>@@ -657,6 +775,9 @@ TString RWTextureTypeSuffix(const TBasicType type, TLayoutImageInternalFormat im
>                 default:
>                     UNREACHABLE();
>             }
>+#if !UNREACHABLE_IS_NORETURN
>+            break;
>+#endif
>         }
>         case EbtIImageCube:
>         {
>@@ -670,6 +791,9 @@ TString RWTextureTypeSuffix(const TBasicType type, TLayoutImageInternalFormat im
>                 default:
>                     UNREACHABLE();
>             }
>+#if !UNREACHABLE_IS_NORETURN
>+            break;
>+#endif
>         }
>         case EbtUImageCube:
>         {
>@@ -683,67 +807,84 @@ TString RWTextureTypeSuffix(const TBasicType type, TLayoutImageInternalFormat im
>                 default:
>                     UNREACHABLE();
>             }
>+#if !UNREACHABLE_IS_NORETURN
>+            break;
>+#endif
>         }
>         default:
>             // All other types are identified by their group suffix
>-            return TextureGroupSuffix(type, imageInternalFormat);
>+            return RWTextureGroupSuffix(type, imageInternalFormat);
>     }
>+#if !UNREACHABLE_IS_NORETURN
>+    UNREACHABLE();
>+    return "_RWTS_invalid_";
>+#endif
> }
> 
>-TString DecorateField(const TString &string, const TStructure &structure)
>+TString DecorateField(const ImmutableString &string, const TStructure &structure)
> {
>-    if (structure.name().compare(0, 3, "gl_") != 0)
>+    if (structure.symbolType() != SymbolType::BuiltIn)
>     {
>         return Decorate(string);
>     }
> 
>-    return string;
>+    return TString(string.data());
> }
> 
>-TString DecoratePrivate(const TString &privateText)
>+TString DecoratePrivate(const ImmutableString &privateText)
> {
>-    return "dx_" + privateText;
>+    return "dx_" + TString(privateText.data());
> }
> 
>-TString Decorate(const TString &string)
>+TString Decorate(const ImmutableString &string)
> {
>-    if (string.compare(0, 3, "gl_") != 0)
>+    if (!string.beginsWith("gl_"))
>     {
>-        return "_" + string;
>+        return "_" + TString(string.data());
>     }
> 
>-    return string;
>+    return TString(string.data());
> }
> 
>-TString DecorateVariableIfNeeded(const TName &name)
>+TString DecorateVariableIfNeeded(const TVariable &variable)
> {
>-    if (name.isInternal())
>+    if (variable.symbolType() == SymbolType::AngleInternal ||
>+        variable.symbolType() == SymbolType::Empty)
>     {
>+        // Besides handling internal variables, we generate names for nameless parameters here.
>+        const ImmutableString &name = variable.name();
>         // The name should not have a prefix reserved for user-defined variables or functions.
>-        ASSERT(name.getString().compare(0, 2, "f_") != 0);
>-        ASSERT(name.getString().compare(0, 1, "_") != 0);
>-        return name.getString();
>+        ASSERT(!name.beginsWith("f_"));
>+        ASSERT(!name.beginsWith("_"));
>+        return TString(name.data());
>+    }
>+    // For user defined variables, combine variable name with unique id
>+    // so variables of the same name in different scopes do not get overwritten.
>+    else if (variable.symbolType() == SymbolType::UserDefined &&
>+             variable.getType().getQualifier() == EvqTemporary)
>+    {
>+        return Decorate(variable.name()) + str(variable.uniqueId().get());
>     }
>     else
>     {
>-        return Decorate(name.getString());
>+        return Decorate(variable.name());
>     }
> }
> 
>-TString DecorateFunctionIfNeeded(const TName &name)
>+TString DecorateFunctionIfNeeded(const TFunction *func)
> {
>-    if (name.isInternal())
>+    if (func->symbolType() == SymbolType::AngleInternal)
>     {
>         // The name should not have a prefix reserved for user-defined variables or functions.
>-        ASSERT(name.getString().compare(0, 2, "f_") != 0);
>-        ASSERT(name.getString().compare(0, 1, "_") != 0);
>-        return name.getString();
>+        ASSERT(!func->name().beginsWith("f_"));
>+        ASSERT(!func->name().beginsWith("_"));
>+        return TString(func->name().data());
>     }
>-    ASSERT(name.getString().compare(0, 3, "gl_") != 0);
>+    ASSERT(!func->name().beginsWith("gl_"));
>     // Add an additional f prefix to functions so that they're always disambiguated from variables.
>     // This is necessary in the corner case where a variable declaration hides a function that it
>     // uses in its initializer.
>-    return "f_" + name.getString();
>+    return "f_" + TString(func->name().data());
> }
> 
> TString TypeString(const TType &type)
>@@ -751,8 +892,7 @@ TString TypeString(const TType &type)
>     const TStructure *structure = type.getStruct();
>     if (structure)
>     {
>-        const TString &typeName = structure->name();
>-        if (typeName != "")
>+        if (structure->symbolType() != SymbolType::Empty)
>         {
>             return StructNameString(*structure);
>         }
>@@ -835,7 +975,8 @@ TString TypeString(const TType &type)
>             case EbtSamplerExternalOES:
>                 return "sampler2D";
>             case EbtAtomicCounter:
>-                return "atomic_uint";
>+                // Multiple atomic_uints will be implemented as a single RWByteAddressBuffer
>+                return "RWByteAddressBuffer";
>             default:
>                 break;
>         }
>@@ -847,7 +988,7 @@ TString TypeString(const TType &type)
> 
> TString StructNameString(const TStructure &structure)
> {
>-    if (structure.name().empty())
>+    if (structure.symbolType() == SymbolType::Empty)
>     {
>         return "";
>     }
>@@ -859,14 +1000,14 @@ TString StructNameString(const TStructure &structure)
>         return Decorate(structure.name());
>     }
> 
>-    return "ss" + str(structure.uniqueId()) + "_" + structure.name();
>+    return "ss" + str(structure.uniqueId().get()) + "_" + TString(structure.name().data());
> }
> 
> TString QualifiedStructNameString(const TStructure &structure,
>                                   bool useHLSLRowMajorPacking,
>                                   bool useStd140Packing)
> {
>-    if (structure.name() == "")
>+    if (structure.symbolType() == SymbolType::Empty)
>     {
>         return "";
>     }
>@@ -889,7 +1030,7 @@ TString QualifiedStructNameString(const TStructure &structure,
>     return prefix + StructNameString(structure);
> }
> 
>-TString InterpolationString(TQualifier qualifier)
>+const char *InterpolationString(TQualifier qualifier)
> {
>     switch (qualifier)
>     {
>@@ -920,7 +1061,7 @@ TString InterpolationString(TQualifier qualifier)
>     return "";
> }
> 
>-TString QualifierString(TQualifier qualifier)
>+const char *QualifierString(TQualifier qualifier)
> {
>     switch (qualifier)
>     {
>@@ -940,29 +1081,26 @@ TString QualifierString(TQualifier qualifier)
>     return "";
> }
> 
>-TString DisambiguateFunctionName(const TIntermSequence *parameters)
>+TString DisambiguateFunctionName(const TFunction *func)
> {
>     TString disambiguatingString;
>-    for (auto parameter : *parameters)
>+    size_t paramCount = func->getParamCount();
>+    for (size_t i = 0; i < paramCount; ++i)
>     {
>-        const TType &paramType = parameter->getAsTyped()->getType();
>-        // Parameter types are only added to function names if they are ambiguous according to the
>-        // native HLSL compiler. Other parameter types are not added to function names to avoid
>-        // making function names longer.
>-        if (paramType.getObjectSize() == 4 && paramType.getBasicType() == EbtFloat)
>-        {
>-            // Disambiguation is needed for float2x2 and float4 parameters. These are the only
>-            // built-in types that HLSL thinks are identical. float2x3 and float3x2 are different
>-            // types, for example.
>-            disambiguatingString += "_" + TypeString(paramType);
>-        }
>-        else if (paramType.getBasicType() == EbtStruct)
>-        {
>-            // Disambiguation is needed for struct parameters, since HLSL thinks that structs with
>-            // the same fields but a different name are identical.
>-            ASSERT(paramType.getStruct()->name() != "");
>-            disambiguatingString += "_" + TypeString(paramType);
>-        }
>+        DisambiguateFunctionNameForParameterType(func->getParam(i)->getType(),
>+                                                 &disambiguatingString);
>+    }
>+    return disambiguatingString;
>+}
>+
>+TString DisambiguateFunctionName(const TIntermSequence *args)
>+{
>+    TString disambiguatingString;
>+    for (TIntermNode *arg : *args)
>+    {
>+        ASSERT(arg->getAsTyped());
>+        DisambiguateFunctionNameForParameterType(arg->getAsTyped()->getType(),
>+                                                 &disambiguatingString);
>     }
>     return disambiguatingString;
> }
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/UtilsHLSL.h b/Source/ThirdParty/ANGLE/src/compiler/translator/UtilsHLSL.h
>index daeec8de41a..ebd7ab3dc0c 100644
>--- a/Source/ThirdParty/ANGLE/src/compiler/translator/UtilsHLSL.h
>+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/UtilsHLSL.h
>@@ -16,11 +16,11 @@
> 
> #include "angle_gl.h"
> 
>-class TName;
>-
> namespace sh
> {
> 
>+class TFunction;
>+
> // HLSL Texture type for GLSL sampler type and readonly image type.
> enum HLSLTextureGroup
> {
>@@ -40,14 +40,17 @@ enum HLSLTextureGroup
>     HLSL_TEXTURE_2D_ARRAY_SNORM,
>     HLSL_TEXTURE_3D_SNORM,
>     HLSL_TEXTURE_2D_MS,
>+    HLSL_TEXTURE_2D_MS_ARRAY,
>     HLSL_TEXTURE_2D_INT4,
>     HLSL_TEXTURE_3D_INT4,
>     HLSL_TEXTURE_2D_ARRAY_INT4,
>     HLSL_TEXTURE_2D_MS_INT4,
>+    HLSL_TEXTURE_2D_MS_ARRAY_INT4,
>     HLSL_TEXTURE_2D_UINT4,
>     HLSL_TEXTURE_3D_UINT4,
>     HLSL_TEXTURE_2D_ARRAY_UINT4,
>     HLSL_TEXTURE_2D_MS_UINT4,
>+    HLSL_TEXTURE_2D_MS_ARRAY_UINT4,
> 
>     // Comparison samplers
> 
>@@ -89,41 +92,44 @@ enum HLSLRWTextureGroup
> 
> HLSLTextureGroup TextureGroup(const TBasicType type,
>                               TLayoutImageInternalFormat imageInternalFormat = EiifUnspecified);
>-TString TextureString(const HLSLTextureGroup textureGroup);
>-TString TextureString(const TBasicType type,
>-                      TLayoutImageInternalFormat imageInternalFormat = EiifUnspecified);
>-TString TextureGroupSuffix(const HLSLTextureGroup type);
>-TString TextureGroupSuffix(const TBasicType type,
>-                           TLayoutImageInternalFormat imageInternalFormat = EiifUnspecified);
>-TString TextureTypeSuffix(const TBasicType type,
>+const char *TextureString(const HLSLTextureGroup textureGroup);
>+const char *TextureString(const TBasicType type,
>                           TLayoutImageInternalFormat imageInternalFormat = EiifUnspecified);
>+const char *TextureGroupSuffix(const HLSLTextureGroup type);
>+const char *TextureGroupSuffix(const TBasicType type,
>+                               TLayoutImageInternalFormat imageInternalFormat = EiifUnspecified);
>+const char *TextureTypeSuffix(const TBasicType type,
>+                              TLayoutImageInternalFormat imageInternalFormat = EiifUnspecified);
> HLSLRWTextureGroup RWTextureGroup(const TBasicType type,
>                                   TLayoutImageInternalFormat imageInternalFormat);
>-TString RWTextureString(const HLSLRWTextureGroup textureGroup);
>-TString RWTextureString(const TBasicType type, TLayoutImageInternalFormat imageInternalFormat);
>-TString RWTextureGroupSuffix(const HLSLRWTextureGroup type);
>-TString RWTextureGroupSuffix(const TBasicType type, TLayoutImageInternalFormat imageInternalFormat);
>-TString RWTextureTypeSuffix(const TBasicType type, TLayoutImageInternalFormat imageInternalFormat);
>+const char *RWTextureString(const HLSLRWTextureGroup textureGroup);
>+const char *RWTextureString(const TBasicType type, TLayoutImageInternalFormat imageInternalFormat);
>+const char *RWTextureGroupSuffix(const HLSLRWTextureGroup type);
>+const char *RWTextureGroupSuffix(const TBasicType type,
>+                                 TLayoutImageInternalFormat imageInternalFormat);
>+const char *RWTextureTypeSuffix(const TBasicType type,
>+                                TLayoutImageInternalFormat imageInternalFormat);
> 
>-TString SamplerString(const TBasicType type);
>-TString SamplerString(HLSLTextureGroup type);
>+const char *SamplerString(const TBasicType type);
>+const char *SamplerString(HLSLTextureGroup type);
> 
> // Adds a prefix to user-defined names to avoid naming clashes.
>-TString Decorate(const TString &string);
>-TString DecorateVariableIfNeeded(const TName &name);
>-TString DecorateFunctionIfNeeded(const TName &name);
>-TString DecorateField(const TString &string, const TStructure &structure);
>-TString DecoratePrivate(const TString &privateText);
>+TString Decorate(const ImmutableString &string);
>+TString DecorateVariableIfNeeded(const TVariable &variable);
>+TString DecorateFunctionIfNeeded(const TFunction *func);
>+TString DecorateField(const ImmutableString &string, const TStructure &structure);
>+TString DecoratePrivate(const ImmutableString &privateText);
> TString TypeString(const TType &type);
> TString StructNameString(const TStructure &structure);
> TString QualifiedStructNameString(const TStructure &structure,
>                                   bool useHLSLRowMajorPacking,
>                                   bool useStd140Packing);
>-TString InterpolationString(TQualifier qualifier);
>-TString QualifierString(TQualifier qualifier);
>+const char *InterpolationString(TQualifier qualifier);
>+const char *QualifierString(TQualifier qualifier);
> // Parameters may need to be included in function names to disambiguate between overloaded
> // functions.
>-TString DisambiguateFunctionName(const TIntermSequence *parameters);
>-}
>+TString DisambiguateFunctionName(const TFunction *func);
>+TString DisambiguateFunctionName(const TIntermSequence *args);
>+}  // namespace sh
> 
> #endif  // COMPILER_TRANSLATOR_UTILSHLSL_H_
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/ValidateAST.cpp b/Source/ThirdParty/ANGLE/src/compiler/translator/ValidateAST.cpp
>new file mode 100644
>index 00000000000..c0ec114741b
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/ValidateAST.cpp
>@@ -0,0 +1,251 @@
>+//
>+// Copyright 2019 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+
>+#include "compiler/translator/ValidateAST.h"
>+
>+#include "compiler/translator/Diagnostics.h"
>+#include "compiler/translator/tree_util/IntermTraverse.h"
>+
>+namespace sh
>+{
>+
>+namespace
>+{
>+
>+class ValidateAST : public TIntermTraverser
>+{
>+  public:
>+    static bool validate(TIntermNode *root,
>+                         TDiagnostics *diagnostics,
>+                         const ValidateASTOptions &options);
>+
>+    void visitSymbol(TIntermSymbol *node) override;
>+    void visitConstantUnion(TIntermConstantUnion *node) override;
>+    bool visitSwizzle(Visit visit, TIntermSwizzle *node) override;
>+    bool visitBinary(Visit visit, TIntermBinary *node) override;
>+    bool visitUnary(Visit visit, TIntermUnary *node) override;
>+    bool visitTernary(Visit visit, TIntermTernary *node) override;
>+    bool visitIfElse(Visit visit, TIntermIfElse *node) override;
>+    bool visitSwitch(Visit visit, TIntermSwitch *node) override;
>+    bool visitCase(Visit visit, TIntermCase *node) override;
>+    void visitFunctionPrototype(TIntermFunctionPrototype *node) override;
>+    bool visitFunctionDefinition(Visit visit, TIntermFunctionDefinition *node) override;
>+    bool visitAggregate(Visit visit, TIntermAggregate *node) override;
>+    bool visitBlock(Visit visit, TIntermBlock *node) override;
>+    bool visitInvariantDeclaration(Visit visit, TIntermInvariantDeclaration *node) override;
>+    bool visitDeclaration(Visit visit, TIntermDeclaration *node) override;
>+    bool visitLoop(Visit visit, TIntermLoop *node) override;
>+    bool visitBranch(Visit visit, TIntermBranch *node) override;
>+    void visitPreprocessorDirective(TIntermPreprocessorDirective *node) override;
>+
>+  private:
>+    ValidateAST(TIntermNode *root, TDiagnostics *diagnostics, const ValidateASTOptions &options);
>+
>+    // Visit as a generic node
>+    void visitNode(Visit visit, TIntermNode *node);
>+
>+    void expectNonNullChildren(Visit visit, TIntermNode *node, size_t least_count);
>+
>+    bool validateInternal();
>+
>+    ValidateASTOptions mOptions;
>+    TDiagnostics *mDiagnostics;
>+
>+    // For validateSingleParent:
>+    std::map<TIntermNode *, TIntermNode *> mParent;
>+    bool mSingleParentFailed = false;
>+
>+    // For validateNullNodes
>+    bool mNullNodesFailed = false;
>+};
>+
>+bool ValidateAST::validate(TIntermNode *root,
>+                           TDiagnostics *diagnostics,
>+                           const ValidateASTOptions &options)
>+{
>+    ValidateAST validate(root, diagnostics, options);
>+    root->traverse(&validate);
>+    return validate.validateInternal();
>+}
>+
>+ValidateAST::ValidateAST(TIntermNode *root,
>+                         TDiagnostics *diagnostics,
>+                         const ValidateASTOptions &options)
>+    : TIntermTraverser(true, false, true, nullptr), mOptions(options), mDiagnostics(diagnostics)
>+{
>+    if (mOptions.validateSingleParent)
>+    {
>+        mParent[root] = nullptr;
>+    }
>+}
>+
>+void ValidateAST::visitNode(Visit visit, TIntermNode *node)
>+{
>+    if (visit == PreVisit && mOptions.validateSingleParent)
>+    {
>+        size_t childCount = node->getChildCount();
>+        for (size_t i = 0; i < childCount; ++i)
>+        {
>+            TIntermNode *child = node->getChildNode(i);
>+            if (mParent.find(child) != mParent.end())
>+            {
>+                // If child is visited twice but through the same parent, the problem is in one of
>+                // the ancestors.
>+                if (mParent[child] != node)
>+                {
>+                    mDiagnostics->error(node->getLine(), "Found child with two parents",
>+                                        "<validateSingleParent>");
>+                    mSingleParentFailed = true;
>+                }
>+            }
>+
>+            mParent[child] = node;
>+        }
>+    }
>+}
>+
>+void ValidateAST::expectNonNullChildren(Visit visit, TIntermNode *node, size_t least_count)
>+{
>+    if (visit == PreVisit && mOptions.validateNullNodes)
>+    {
>+        size_t childCount = node->getChildCount();
>+        if (childCount < least_count)
>+        {
>+            mDiagnostics->error(node->getLine(), "Too few children", "<validateNullNodes>");
>+            mNullNodesFailed = true;
>+        }
>+
>+        for (size_t i = 0; i < childCount; ++i)
>+        {
>+            if (node->getChildNode(i) == nullptr)
>+            {
>+                mDiagnostics->error(node->getLine(), "Found nullptr child", "<validateNullNodes>");
>+                mNullNodesFailed = true;
>+            }
>+        }
>+    }
>+}
>+
>+void ValidateAST::visitSymbol(TIntermSymbol *node)
>+{
>+    visitNode(PreVisit, node);
>+}
>+
>+void ValidateAST::visitConstantUnion(TIntermConstantUnion *node)
>+{
>+    visitNode(PreVisit, node);
>+}
>+
>+bool ValidateAST::visitSwizzle(Visit visit, TIntermSwizzle *node)
>+{
>+    visitNode(visit, node);
>+    return true;
>+}
>+
>+bool ValidateAST::visitBinary(Visit visit, TIntermBinary *node)
>+{
>+    visitNode(visit, node);
>+    return true;
>+}
>+
>+bool ValidateAST::visitUnary(Visit visit, TIntermUnary *node)
>+{
>+    visitNode(visit, node);
>+    return true;
>+}
>+
>+bool ValidateAST::visitTernary(Visit visit, TIntermTernary *node)
>+{
>+    visitNode(visit, node);
>+    return true;
>+}
>+
>+bool ValidateAST::visitIfElse(Visit visit, TIntermIfElse *node)
>+{
>+    visitNode(visit, node);
>+    return true;
>+}
>+
>+bool ValidateAST::visitSwitch(Visit visit, TIntermSwitch *node)
>+{
>+    visitNode(visit, node);
>+    return true;
>+}
>+
>+bool ValidateAST::visitCase(Visit visit, TIntermCase *node)
>+{
>+    visitNode(visit, node);
>+    return true;
>+}
>+
>+void ValidateAST::visitFunctionPrototype(TIntermFunctionPrototype *node)
>+{
>+    visitNode(PreVisit, node);
>+}
>+
>+bool ValidateAST::visitFunctionDefinition(Visit visit, TIntermFunctionDefinition *node)
>+{
>+    visitNode(visit, node);
>+    return true;
>+}
>+
>+bool ValidateAST::visitAggregate(Visit visit, TIntermAggregate *node)
>+{
>+    visitNode(visit, node);
>+    expectNonNullChildren(visit, node, 0);
>+    return true;
>+}
>+
>+bool ValidateAST::visitBlock(Visit visit, TIntermBlock *node)
>+{
>+    visitNode(visit, node);
>+    expectNonNullChildren(visit, node, 0);
>+    return true;
>+}
>+
>+bool ValidateAST::visitInvariantDeclaration(Visit visit, TIntermInvariantDeclaration *node)
>+{
>+    visitNode(visit, node);
>+    return true;
>+}
>+
>+bool ValidateAST::visitDeclaration(Visit visit, TIntermDeclaration *node)
>+{
>+    visitNode(visit, node);
>+    expectNonNullChildren(visit, node, 0);
>+    return true;
>+}
>+
>+bool ValidateAST::visitLoop(Visit visit, TIntermLoop *node)
>+{
>+    visitNode(visit, node);
>+    return true;
>+}
>+
>+bool ValidateAST::visitBranch(Visit visit, TIntermBranch *node)
>+{
>+    visitNode(visit, node);
>+    return true;
>+}
>+
>+void ValidateAST::visitPreprocessorDirective(TIntermPreprocessorDirective *node)
>+{
>+    visitNode(PreVisit, node);
>+}
>+
>+bool ValidateAST::validateInternal()
>+{
>+    return !mSingleParentFailed && !mNullNodesFailed;
>+}
>+
>+}  // anonymous namespace
>+
>+bool ValidateAST(TIntermNode *root, TDiagnostics *diagnostics, const ValidateASTOptions &options)
>+{
>+    return ValidateAST::validate(root, diagnostics, options);
>+}
>+
>+}  // namespace sh
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/ValidateAST.h b/Source/ThirdParty/ANGLE/src/compiler/translator/ValidateAST.h
>new file mode 100644
>index 00000000000..7314f6e6531
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/ValidateAST.h
>@@ -0,0 +1,58 @@
>+//
>+// Copyright 2019 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+
>+#ifndef COMPILER_TRANSLATOR_VALIDATEAST_H_
>+#define COMPILER_TRANSLATOR_VALIDATEAST_H_
>+
>+#include "compiler/translator/BaseTypes.h"
>+#include "compiler/translator/Common.h"
>+
>+namespace sh
>+{
>+class TDiagnostics;
>+class TIntermNode;
>+
>+// The following options (stored in Compiler) tell the validator what to validate.  Some validations
>+// are conditional to certain passes.
>+struct ValidateASTOptions
>+{
>+    // TODO: add support for the flags marked with TODO. http://anglebug.com/2733
>+
>+    // Check that every node always has only one parent,
>+    bool validateSingleParent = true;
>+    // Check that all EOpCallFunctionInAST have their corresponding function definitions in the AST,
>+    // with matching symbol ids. There should also be at least a prototype declaration before the
>+    // function is called.
>+    bool validateFunctionCall = true;  // TODO
>+    // Check that there are no null nodes where they are not allowed, for example as children of
>+    // TIntermDeclaration or TIntermBlock.
>+    bool validateNullNodes = true;
>+    // Check that symbols that reference variables have consistent qualifiers and symbol ids with
>+    // the variable declaration. For example, references to function out parameters should be
>+    // EvqOut.
>+    bool validateQualifiers = true;  // TODO
>+    // Check that variable declarations that can't have initializers don't have initializers
>+    // (varyings, uniforms for example).
>+    bool validateInitializers = true;  // TODO
>+    // Check that there is only one TFunction with each function name referenced in the nodes (no
>+    // two TFunctions with the same name, taking internal/non-internal namespaces into account).
>+    bool validateUniqueFunctions = true;  // TODO
>+    // Check that references to user-defined structs are matched with the corresponding struct
>+    // declaration.
>+    bool validateStructUsage = true;  // TODO
>+    // Check that expression nodes have the correct type considering their operand(s).
>+    bool validateExpressionTypes = true;  // TODO
>+    // If SeparateDeclarations has been run, check for the absence of multi declarations as well.
>+    bool validateMultiDeclarations = false;  // TODO
>+};
>+
>+// Check for errors and output error messages on the context.
>+// Returns true if there are no errors.
>+bool ValidateAST(TIntermNode *root, TDiagnostics *diagnostics, const ValidateASTOptions &options);
>+
>+}  // namespace sh
>+
>+#endif  // COMPILER_TRANSLATOR_VALIDATESWITCH_H_
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/ValidateGlobalInitializer.cpp b/Source/ThirdParty/ANGLE/src/compiler/translator/ValidateGlobalInitializer.cpp
>index 492972b60db..4ffb832d99b 100644
>--- a/Source/ThirdParty/ANGLE/src/compiler/translator/ValidateGlobalInitializer.cpp
>+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/ValidateGlobalInitializer.cpp
>@@ -6,8 +6,7 @@
> 
> #include "compiler/translator/ValidateGlobalInitializer.h"
> 
>-#include "compiler/translator/IntermTraverse.h"
>-#include "compiler/translator/ParseContext.h"
>+#include "compiler/translator/tree_util/IntermTraverse.h"
> 
> namespace sh
> {
>@@ -15,56 +14,76 @@ namespace sh
> namespace
> {
> 
>+const int kMaxAllowedTraversalDepth = 256;
>+
> class ValidateGlobalInitializerTraverser : public TIntermTraverser
> {
>   public:
>-    ValidateGlobalInitializerTraverser(const TParseContext *context);
>+    ValidateGlobalInitializerTraverser(int shaderVersion);
> 
>     void visitSymbol(TIntermSymbol *node) override;
>+    void visitConstantUnion(TIntermConstantUnion *node) override;
>     bool visitAggregate(Visit visit, TIntermAggregate *node) override;
>     bool visitBinary(Visit visit, TIntermBinary *node) override;
>     bool visitUnary(Visit visit, TIntermUnary *node) override;
> 
>-    bool isValid() const { return mIsValid; }
>+    bool isValid() const { return mIsValid && mMaxDepth < mMaxAllowedDepth; }
>     bool issueWarning() const { return mIssueWarning; }
> 
>   private:
>-    const TParseContext *mContext;
>+    int mShaderVersion;
>     bool mIsValid;
>     bool mIssueWarning;
> };
> 
> void ValidateGlobalInitializerTraverser::visitSymbol(TIntermSymbol *node)
> {
>-    const TSymbol *sym =
>-        mContext->symbolTable.find(node->getSymbol(), mContext->getShaderVersion());
>-    if (sym->isVariable())
>+    // ESSL 1.00 section 4.3 (or ESSL 3.00 section 4.3):
>+    // Global initializers must be constant expressions.
>+    switch (node->getType().getQualifier())
>+    {
>+        case EvqConst:
>+            break;
>+        case EvqGlobal:
>+        case EvqTemporary:
>+        case EvqUniform:
>+            // We allow these cases to be compatible with legacy ESSL 1.00 content.
>+            // Implement stricter rules for ESSL 3.00 since there's no legacy content to deal
>+            // with.
>+            if (mShaderVersion >= 300)
>+            {
>+                mIsValid = false;
>+            }
>+            else
>+            {
>+                mIssueWarning = true;
>+            }
>+            break;
>+        default:
>+            mIsValid = false;
>+    }
>+}
>+
>+void ValidateGlobalInitializerTraverser::visitConstantUnion(TIntermConstantUnion *node)
>+{
>+    // Constant unions that are not constant expressions may result from folding a ternary
>+    // expression.
>+    switch (node->getType().getQualifier())
>     {
>-        // ESSL 1.00 section 4.3 (or ESSL 3.00 section 4.3):
>-        // Global initializers must be constant expressions.
>-        const TVariable *var = static_cast<const TVariable *>(sym);
>-        switch (var->getType().getQualifier())
>-        {
>-            case EvqConst:
>-                break;
>-            case EvqGlobal:
>-            case EvqTemporary:
>-            case EvqUniform:
>-                // We allow these cases to be compatible with legacy ESSL 1.00 content.
>-                // Implement stricter rules for ESSL 3.00 since there's no legacy content to deal
>-                // with.
>-                if (mContext->getShaderVersion() >= 300)
>-                {
>-                    mIsValid = false;
>-                }
>-                else
>-                {
>-                    mIssueWarning = true;
>-                }
>-                break;
>-            default:
>+        case EvqConst:
>+            break;
>+        case EvqTemporary:
>+            if (mShaderVersion >= 300)
>+            {
>                 mIsValid = false;
>-        }
>+            }
>+            else
>+            {
>+                mIssueWarning = true;
>+            }
>+            break;
>+        default:
>+            UNREACHABLE();
>     }
> }
> 
>@@ -99,18 +118,20 @@ bool ValidateGlobalInitializerTraverser::visitUnary(Visit visit, TIntermUnary *n
>     return true;
> }
> 
>-ValidateGlobalInitializerTraverser::ValidateGlobalInitializerTraverser(const TParseContext *context)
>-    : TIntermTraverser(true, false, false), mContext(context), mIsValid(true), mIssueWarning(false)
>+ValidateGlobalInitializerTraverser::ValidateGlobalInitializerTraverser(int shaderVersion)
>+    : TIntermTraverser(true, false, false, nullptr),
>+      mShaderVersion(shaderVersion),
>+      mIsValid(true),
>+      mIssueWarning(false)
> {
>+    setMaxAllowedDepth(kMaxAllowedTraversalDepth);
> }
> 
> }  // namespace
> 
>-bool ValidateGlobalInitializer(TIntermTyped *initializer,
>-                               const TParseContext *context,
>-                               bool *warning)
>+bool ValidateGlobalInitializer(TIntermTyped *initializer, int shaderVersion, bool *warning)
> {
>-    ValidateGlobalInitializerTraverser validate(context);
>+    ValidateGlobalInitializerTraverser validate(shaderVersion);
>     initializer->traverse(&validate);
>     ASSERT(warning != nullptr);
>     *warning = validate.issueWarning();
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/ValidateGlobalInitializer.h b/Source/ThirdParty/ANGLE/src/compiler/translator/ValidateGlobalInitializer.h
>index 2e7570667a4..b830760ca49 100644
>--- a/Source/ThirdParty/ANGLE/src/compiler/translator/ValidateGlobalInitializer.h
>+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/ValidateGlobalInitializer.h
>@@ -11,12 +11,9 @@ namespace sh
> {
> 
> class TIntermTyped;
>-class TParseContext;
> 
> // Returns true if the initializer is valid.
>-bool ValidateGlobalInitializer(TIntermTyped *initializer,
>-                               const TParseContext *context,
>-                               bool *warning);
>+bool ValidateGlobalInitializer(TIntermTyped *initializer, int shaderVersion, bool *warning);
> 
> }  // namespace sh
> 
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/ValidateLimitations.cpp b/Source/ThirdParty/ANGLE/src/compiler/translator/ValidateLimitations.cpp
>index 941f79ae513..ac8d5c14ed4 100644
>--- a/Source/ThirdParty/ANGLE/src/compiler/translator/ValidateLimitations.cpp
>+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/ValidateLimitations.cpp
>@@ -8,8 +8,8 @@
> 
> #include "angle_gl.h"
> #include "compiler/translator/Diagnostics.h"
>-#include "compiler/translator/IntermTraverse.h"
> #include "compiler/translator/ParseContext.h"
>+#include "compiler/translator/tree_util/IntermTraverse.h"
> 
> namespace sh
> {
>@@ -25,7 +25,7 @@ int GetLoopSymbolId(TIntermLoop *loop)
>     TIntermBinary *declInit  = (*declSeq)[0]->getAsBinaryNode();
>     TIntermSymbol *symbol    = declInit->getLeft()->getAsSymbolNode();
> 
>-    return symbol->getId();
>+    return symbol->uniqueId().get();
> }
> 
> // Traverses a node to check if it represents a constant index expression.
>@@ -42,8 +42,7 @@ class ValidateConstIndexExpr : public TIntermTraverser
>   public:
>     ValidateConstIndexExpr(const std::vector<int> &loopSymbols)
>         : TIntermTraverser(true, false, false), mValid(true), mLoopSymbolIds(loopSymbols)
>-    {
>-    }
>+    {}
> 
>     // Returns true if the parsed node represents a constant index expression.
>     bool isValid() const { return mValid; }
>@@ -55,8 +54,8 @@ class ValidateConstIndexExpr : public TIntermTraverser
>         if (mValid)
>         {
>             bool isLoopSymbol = std::find(mLoopSymbolIds.begin(), mLoopSymbolIds.end(),
>-                                          symbol->getId()) != mLoopSymbolIds.end();
>-            mValid = (symbol->getQualifier() == EvqConst) || isLoopSymbol;
>+                                          symbol->uniqueId().get()) != mLoopSymbolIds.end();
>+            mValid            = (symbol->getQualifier() == EvqConst) || isLoopSymbol;
>         }
>     }
> 
>@@ -72,7 +71,6 @@ class ValidateLimitationsTraverser : public TLValueTrackingTraverser
>   public:
>     ValidateLimitationsTraverser(sh::GLenum shaderType,
>                                  TSymbolTable *symbolTable,
>-                                 int shaderVersion,
>                                  TDiagnostics *diagnostics);
> 
>     void visitSymbol(TIntermSymbol *node) override;
>@@ -81,8 +79,8 @@ class ValidateLimitationsTraverser : public TLValueTrackingTraverser
> 
>   private:
>     void error(TSourceLoc loc, const char *reason, const char *token);
>+    void error(TSourceLoc loc, const char *reason, const ImmutableString &token);
> 
>-    bool withinLoopBody() const;
>     bool isLoopIndex(TIntermSymbol *symbol);
>     bool validateLoopType(TIntermLoop *node);
> 
>@@ -105,9 +103,8 @@ class ValidateLimitationsTraverser : public TLValueTrackingTraverser
> 
> ValidateLimitationsTraverser::ValidateLimitationsTraverser(sh::GLenum shaderType,
>                                                            TSymbolTable *symbolTable,
>-                                                           int shaderVersion,
>                                                            TDiagnostics *diagnostics)
>-    : TLValueTrackingTraverser(true, false, false, symbolTable, shaderVersion),
>+    : TLValueTrackingTraverser(true, false, false, symbolTable),
>       mShaderType(shaderType),
>       mDiagnostics(diagnostics)
> {
>@@ -120,7 +117,7 @@ void ValidateLimitationsTraverser::visitSymbol(TIntermSymbol *node)
>     {
>         error(node->getLine(),
>               "Loop index cannot be statically assigned to within the body of the loop",
>-              node->getSymbol().c_str());
>+              node->getName());
>     }
> }
> 
>@@ -164,14 +161,16 @@ void ValidateLimitationsTraverser::error(TSourceLoc loc, const char *reason, con
>     mDiagnostics->error(loc, reason, token);
> }
> 
>-bool ValidateLimitationsTraverser::withinLoopBody() const
>+void ValidateLimitationsTraverser::error(TSourceLoc loc,
>+                                         const char *reason,
>+                                         const ImmutableString &token)
> {
>-    return !mLoopSymbolIds.empty();
>+    error(loc, reason, token.data());
> }
> 
> bool ValidateLimitationsTraverser::isLoopIndex(TIntermSymbol *symbol)
> {
>-    return std::find(mLoopSymbolIds.begin(), mLoopSymbolIds.end(), symbol->getId()) !=
>+    return std::find(mLoopSymbolIds.begin(), mLoopSymbolIds.end(), symbol->uniqueId().get()) !=
>            mLoopSymbolIds.end();
> }
> 
>@@ -254,11 +253,11 @@ int ValidateLimitationsTraverser::validateForLoopInit(TIntermLoop *node)
>     if (!isConstExpr(declInit->getRight()))
>     {
>         error(declInit->getLine(), "Loop index cannot be initialized with non-constant expression",
>-              symbol->getSymbol().c_str());
>+              symbol->getName());
>         return -1;
>     }
> 
>-    return symbol->getId();
>+    return symbol->uniqueId().get();
> }
> 
> bool ValidateLimitationsTraverser::validateForLoopCond(TIntermLoop *node, int indexSymbolId)
>@@ -286,9 +285,9 @@ bool ValidateLimitationsTraverser::validateForLoopCond(TIntermLoop *node, int in
>         error(binOp->getLine(), "Invalid condition", "for");
>         return false;
>     }
>-    if (symbol->getId() != indexSymbolId)
>+    if (symbol->uniqueId().get() != indexSymbolId)
>     {
>-        error(symbol->getLine(), "Expected loop index", symbol->getSymbol().c_str());
>+        error(symbol->getLine(), "Expected loop index", symbol->getName());
>         return false;
>     }
>     // Relational operator is one of: > >= < <= == or !=.
>@@ -310,7 +309,7 @@ bool ValidateLimitationsTraverser::validateForLoopCond(TIntermLoop *node, int in
>     if (!isConstExpr(binOp->getRight()))
>     {
>         error(binOp->getLine(), "Loop index cannot be compared with non-constant expression",
>-              symbol->getSymbol().c_str());
>+              symbol->getName());
>         return false;
>     }
> 
>@@ -357,9 +356,9 @@ bool ValidateLimitationsTraverser::validateForLoopExpr(TIntermLoop *node, int in
>         error(expr->getLine(), "Invalid expression", "for");
>         return false;
>     }
>-    if (symbol->getId() != indexSymbolId)
>+    if (symbol->uniqueId().get() != indexSymbolId)
>     {
>-        error(symbol->getLine(), "Expected loop index", symbol->getSymbol().c_str());
>+        error(symbol->getLine(), "Expected loop index", symbol->getName());
>         return false;
>     }
> 
>@@ -387,7 +386,7 @@ bool ValidateLimitationsTraverser::validateForLoopExpr(TIntermLoop *node, int in
>         if (!isConstExpr(binOp->getRight()))
>         {
>             error(binOp->getLine(), "Loop index cannot be modified by non-constant expression",
>-                  symbol->getSymbol().c_str());
>+                  symbol->getName());
>             return false;
>         }
>     }
>@@ -428,15 +427,14 @@ bool ValidateLimitationsTraverser::validateIndexing(TIntermBinary *node)
>     return valid;
> }
> 
>-}  // namespace anonymous
>+}  // namespace
> 
> bool ValidateLimitations(TIntermNode *root,
>                          GLenum shaderType,
>                          TSymbolTable *symbolTable,
>-                         int shaderVersion,
>                          TDiagnostics *diagnostics)
> {
>-    ValidateLimitationsTraverser validate(shaderType, symbolTable, shaderVersion, diagnostics);
>+    ValidateLimitationsTraverser validate(shaderType, symbolTable, diagnostics);
>     root->traverse(&validate);
>     return diagnostics->numErrors() == 0;
> }
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/ValidateLimitations.h b/Source/ThirdParty/ANGLE/src/compiler/translator/ValidateLimitations.h
>index 9149b8c216f..d219ed680a8 100644
>--- a/Source/ThirdParty/ANGLE/src/compiler/translator/ValidateLimitations.h
>+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/ValidateLimitations.h
>@@ -19,7 +19,6 @@ class TDiagnostics;
> bool ValidateLimitations(TIntermNode *root,
>                          GLenum shaderType,
>                          TSymbolTable *symbolTable,
>-                         int shaderVersion,
>                          TDiagnostics *diagnostics);
> 
> }  // namespace sh
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/ValidateMaxParameters.cpp b/Source/ThirdParty/ANGLE/src/compiler/translator/ValidateMaxParameters.cpp
>index 9dccbf413f6..a06babd3bd5 100644
>--- a/Source/ThirdParty/ANGLE/src/compiler/translator/ValidateMaxParameters.cpp
>+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/ValidateMaxParameters.cpp
>@@ -8,6 +8,7 @@
> #include "compiler/translator/ValidateMaxParameters.h"
> 
> #include "compiler/translator/IntermNode.h"
>+#include "compiler/translator/Symbol.h"
> 
> namespace sh
> {
>@@ -18,7 +19,7 @@ bool ValidateMaxParameters(TIntermBlock *root, unsigned int maxParameters)
>     {
>         TIntermFunctionDefinition *definition = node->getAsFunctionDefinition();
>         if (definition != nullptr &&
>-            definition->getFunctionPrototype()->getSequence()->size() > maxParameters)
>+            definition->getFunctionPrototype()->getFunction()->getParamCount() > maxParameters)
>         {
>             return false;
>         }
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/ValidateOutputs.cpp b/Source/ThirdParty/ANGLE/src/compiler/translator/ValidateOutputs.cpp
>index 26f0e81ba77..98802554d6c 100644
>--- a/Source/ThirdParty/ANGLE/src/compiler/translator/ValidateOutputs.cpp
>+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/ValidateOutputs.cpp
>@@ -12,17 +12,18 @@
> #include <set>
> 
> #include "compiler/translator/InfoSink.h"
>-#include "compiler/translator/IntermTraverse.h"
> #include "compiler/translator/ParseContext.h"
>+#include "compiler/translator/tree_util/IntermTraverse.h"
> 
> namespace sh
> {
> 
> namespace
> {
>+
> void error(const TIntermSymbol &symbol, const char *reason, TDiagnostics *diagnostics)
> {
>-    diagnostics->error(symbol.getLine(), reason, symbol.getSymbol().c_str());
>+    diagnostics->error(symbol.getLine(), reason, symbol.getName().data());
> }
> 
> class ValidateOutputsTraverser : public TIntermTraverser
>@@ -43,7 +44,7 @@ class ValidateOutputsTraverser : public TIntermTraverser
>     OutputVector mOutputs;
>     OutputVector mUnspecifiedLocationOutputs;
>     OutputVector mYuvOutputs;
>-    std::set<std::string> mVisitedSymbols;
>+    std::set<int> mVisitedSymbols;  // Visited symbol ids.
> };
> 
> ValidateOutputsTraverser::ValidateOutputsTraverser(const TExtensionBehavior &extBehavior,
>@@ -53,19 +54,19 @@ ValidateOutputsTraverser::ValidateOutputsTraverser(const TExtensionBehavior &ext
>       mAllowUnspecifiedOutputLocationResolution(
>           IsExtensionEnabled(extBehavior, TExtension::EXT_blend_func_extended)),
>       mUsesFragDepth(false)
>-{
>-}
>+{}
> 
> void ValidateOutputsTraverser::visitSymbol(TIntermSymbol *symbol)
> {
>-    TString name         = symbol->getSymbol();
>-    TQualifier qualifier = symbol->getQualifier();
>+    if (symbol->variable().symbolType() == SymbolType::Empty)
>+        return;
> 
>-    if (mVisitedSymbols.count(name.c_str()) == 1)
>+    if (mVisitedSymbols.count(symbol->uniqueId().get()) == 1)
>         return;
> 
>-    mVisitedSymbols.insert(name.c_str());
>+    mVisitedSymbols.insert(symbol->uniqueId().get());
> 
>+    TQualifier qualifier = symbol->getQualifier();
>     if (qualifier == EvqFragmentOut)
>     {
>         if (symbol->getType().getLayoutQualifier().location != -1)
>@@ -90,33 +91,42 @@ void ValidateOutputsTraverser::visitSymbol(TIntermSymbol *symbol)
> void ValidateOutputsTraverser::validate(TDiagnostics *diagnostics) const
> {
>     ASSERT(diagnostics);
>-    OutputVector validOutputs(mMaxDrawBuffers);
>+    OutputVector validOutputs(mMaxDrawBuffers, nullptr);
>+    OutputVector validSecondaryOutputs(mMaxDrawBuffers, nullptr);
> 
>     for (const auto &symbol : mOutputs)
>     {
>-        const TType &type         = symbol->getType();
>+        const TType &type = symbol->getType();
>         ASSERT(!type.isArrayOfArrays());  // Disallowed in GLSL ES 3.10 section 4.3.6.
>         const size_t elementCount =
>             static_cast<size_t>(type.isArray() ? type.getOutermostArraySize() : 1u);
>-        const size_t location     = static_cast<size_t>(type.getLayoutQualifier().location);
>+        const size_t location = static_cast<size_t>(type.getLayoutQualifier().location);
> 
>         ASSERT(type.getLayoutQualifier().location != -1);
> 
>-        if (location + elementCount <= validOutputs.size())
>+        OutputVector *validOutputsToUse = &validOutputs;
>+        // The default index is 0, so we only assign the output to secondary outputs in case the
>+        // index is explicitly set to 1.
>+        if (type.getLayoutQualifier().index == 1)
>+        {
>+            validOutputsToUse = &validSecondaryOutputs;
>+        }
>+
>+        if (location + elementCount <= validOutputsToUse->size())
>         {
>             for (size_t elementIndex = 0; elementIndex < elementCount; elementIndex++)
>             {
>                 const size_t offsetLocation = location + elementIndex;
>-                if (validOutputs[offsetLocation])
>+                if ((*validOutputsToUse)[offsetLocation])
>                 {
>-                    std::stringstream strstr;
>+                    std::stringstream strstr = sh::InitializeStream<std::stringstream>();
>                     strstr << "conflicting output locations with previously defined output '"
>-                           << validOutputs[offsetLocation]->getSymbol() << "'";
>+                           << (*validOutputsToUse)[offsetLocation]->getName() << "'";
>                     error(*symbol, strstr.str().c_str(), diagnostics);
>                 }
>                 else
>                 {
>-                    validOutputs[offsetLocation] = symbol;
>+                    (*validOutputsToUse)[offsetLocation] = symbol;
>                 }
>             }
>         }
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/ValidateSwitch.cpp b/Source/ThirdParty/ANGLE/src/compiler/translator/ValidateSwitch.cpp
>index 9f7a264e582..37c33a867c0 100644
>--- a/Source/ThirdParty/ANGLE/src/compiler/translator/ValidateSwitch.cpp
>+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/ValidateSwitch.cpp
>@@ -7,7 +7,7 @@
> #include "compiler/translator/ValidateSwitch.h"
> 
> #include "compiler/translator/Diagnostics.h"
>-#include "compiler/translator/IntermTraverse.h"
>+#include "compiler/translator/tree_util/IntermTraverse.h"
> 
> namespace sh
> {
>@@ -15,11 +15,12 @@ namespace sh
> namespace
> {
> 
>+const int kMaxAllowedTraversalDepth = 256;
>+
> class ValidateSwitch : public TIntermTraverser
> {
>   public:
>     static bool validate(TBasicType switchType,
>-                         int shaderVersion,
>                          TDiagnostics *diagnostics,
>                          TIntermBlock *statementList,
>                          const TSourceLoc &loc);
>@@ -27,7 +28,7 @@ class ValidateSwitch : public TIntermTraverser
>     void visitSymbol(TIntermSymbol *) override;
>     void visitConstantUnion(TIntermConstantUnion *) override;
>     bool visitDeclaration(Visit, TIntermDeclaration *) override;
>-    bool visitBlock(Visit, TIntermBlock *) override;
>+    bool visitBlock(Visit visit, TIntermBlock *) override;
>     bool visitBinary(Visit, TIntermBinary *) override;
>     bool visitUnary(Visit, TIntermUnary *) override;
>     bool visitTernary(Visit, TIntermTernary *) override;
>@@ -40,12 +41,11 @@ class ValidateSwitch : public TIntermTraverser
>     bool visitBranch(Visit, TIntermBranch *) override;
> 
>   private:
>-    ValidateSwitch(TBasicType switchType, int shaderVersion, TDiagnostics *context);
>+    ValidateSwitch(TBasicType switchType, TDiagnostics *context);
> 
>     bool validateInternal(const TSourceLoc &loc);
> 
>     TBasicType mSwitchType;
>-    int mShaderVersion;
>     TDiagnostics *mDiagnostics;
>     bool mCaseTypeMismatch;
>     bool mFirstCaseFound;
>@@ -60,21 +60,19 @@ class ValidateSwitch : public TIntermTraverser
> };
> 
> bool ValidateSwitch::validate(TBasicType switchType,
>-                              int shaderVersion,
>                               TDiagnostics *diagnostics,
>                               TIntermBlock *statementList,
>                               const TSourceLoc &loc)
> {
>-    ValidateSwitch validate(switchType, shaderVersion, diagnostics);
>+    ValidateSwitch validate(switchType, diagnostics);
>     ASSERT(statementList);
>     statementList->traverse(&validate);
>     return validate.validateInternal(loc);
> }
> 
>-ValidateSwitch::ValidateSwitch(TBasicType switchType, int shaderVersion, TDiagnostics *diagnostics)
>-    : TIntermTraverser(true, false, true),
>+ValidateSwitch::ValidateSwitch(TBasicType switchType, TDiagnostics *diagnostics)
>+    : TIntermTraverser(true, false, true, nullptr),
>       mSwitchType(switchType),
>-      mShaderVersion(shaderVersion),
>       mDiagnostics(diagnostics),
>       mCaseTypeMismatch(false),
>       mFirstCaseFound(false),
>@@ -85,13 +83,14 @@ ValidateSwitch::ValidateSwitch(TBasicType switchType, int shaderVersion, TDiagno
>       mDefaultCount(0),
>       mDuplicateCases(false)
> {
>+    setMaxAllowedDepth(kMaxAllowedTraversalDepth);
> }
> 
> void ValidateSwitch::visitSymbol(TIntermSymbol *)
> {
>     if (!mFirstCaseFound)
>         mStatementBeforeCase = true;
>-    mLastStatementWasCase    = false;
>+    mLastStatementWasCase = false;
> }
> 
> void ValidateSwitch::visitConstantUnion(TIntermConstantUnion *)
>@@ -100,24 +99,28 @@ void ValidateSwitch::visitConstantUnion(TIntermConstantUnion *)
>     // Could be just a statement like "0;"
>     if (!mFirstCaseFound)
>         mStatementBeforeCase = true;
>-    mLastStatementWasCase    = false;
>+    mLastStatementWasCase = false;
> }
> 
> bool ValidateSwitch::visitDeclaration(Visit, TIntermDeclaration *)
> {
>     if (!mFirstCaseFound)
>         mStatementBeforeCase = true;
>-    mLastStatementWasCase    = false;
>+    mLastStatementWasCase = false;
>     return true;
> }
> 
>-bool ValidateSwitch::visitBlock(Visit, TIntermBlock *)
>+bool ValidateSwitch::visitBlock(Visit visit, TIntermBlock *)
> {
>     if (getParentNode() != nullptr)
>     {
>         if (!mFirstCaseFound)
>             mStatementBeforeCase = true;
>-        mLastStatementWasCase    = false;
>+        mLastStatementWasCase = false;
>+        if (visit == PreVisit)
>+            ++mControlFlowDepth;
>+        if (visit == PostVisit)
>+            --mControlFlowDepth;
>     }
>     return true;
> }
>@@ -126,7 +129,7 @@ bool ValidateSwitch::visitBinary(Visit, TIntermBinary *)
> {
>     if (!mFirstCaseFound)
>         mStatementBeforeCase = true;
>-    mLastStatementWasCase    = false;
>+    mLastStatementWasCase = false;
>     return true;
> }
> 
>@@ -134,7 +137,7 @@ bool ValidateSwitch::visitUnary(Visit, TIntermUnary *)
> {
>     if (!mFirstCaseFound)
>         mStatementBeforeCase = true;
>-    mLastStatementWasCase    = false;
>+    mLastStatementWasCase = false;
>     return true;
> }
> 
>@@ -142,7 +145,7 @@ bool ValidateSwitch::visitTernary(Visit, TIntermTernary *)
> {
>     if (!mFirstCaseFound)
>         mStatementBeforeCase = true;
>-    mLastStatementWasCase    = false;
>+    mLastStatementWasCase = false;
>     return true;
> }
> 
>@@ -150,7 +153,7 @@ bool ValidateSwitch::visitSwizzle(Visit, TIntermSwizzle *)
> {
>     if (!mFirstCaseFound)
>         mStatementBeforeCase = true;
>-    mLastStatementWasCase    = false;
>+    mLastStatementWasCase = false;
>     return true;
> }
> 
>@@ -162,7 +165,7 @@ bool ValidateSwitch::visitIfElse(Visit visit, TIntermIfElse *)
>         --mControlFlowDepth;
>     if (!mFirstCaseFound)
>         mStatementBeforeCase = true;
>-    mLastStatementWasCase    = false;
>+    mLastStatementWasCase = false;
>     return true;
> }
> 
>@@ -170,7 +173,7 @@ bool ValidateSwitch::visitSwitch(Visit, TIntermSwitch *)
> {
>     if (!mFirstCaseFound)
>         mStatementBeforeCase = true;
>-    mLastStatementWasCase    = false;
>+    mLastStatementWasCase = false;
>     // Don't go into nested switch statements
>     return false;
> }
>@@ -250,7 +253,7 @@ bool ValidateSwitch::visitAggregate(Visit visit, TIntermAggregate *)
>         // This is not the statementList node, but some other node.
>         if (!mFirstCaseFound)
>             mStatementBeforeCase = true;
>-        mLastStatementWasCase    = false;
>+        mLastStatementWasCase = false;
>     }
>     return true;
> }
>@@ -263,7 +266,7 @@ bool ValidateSwitch::visitLoop(Visit visit, TIntermLoop *)
>         --mControlFlowDepth;
>     if (!mFirstCaseFound)
>         mStatementBeforeCase = true;
>-    mLastStatementWasCase    = false;
>+    mLastStatementWasCase = false;
>     return true;
> }
> 
>@@ -271,7 +274,7 @@ bool ValidateSwitch::visitBranch(Visit, TIntermBranch *)
> {
>     if (!mFirstCaseFound)
>         mStatementBeforeCase = true;
>-    mLastStatementWasCase    = false;
>+    mLastStatementWasCase = false;
>     return true;
> }
> 
>@@ -281,39 +284,32 @@ bool ValidateSwitch::validateInternal(const TSourceLoc &loc)
>     {
>         mDiagnostics->error(loc, "statement before the first label", "switch");
>     }
>-    bool lastStatementWasCaseError = false;
>     if (mLastStatementWasCase)
>     {
>-        if (mShaderVersion == 300)
>-        {
>-            lastStatementWasCaseError = true;
>-            // This error has been proposed to be made optional in GLSL ES 3.00, but dEQP tests
>-            // still require it.
>-            mDiagnostics->error(
>-                loc, "no statement between the last label and the end of the switch statement",
>-                "switch");
>-        }
>-        else
>-        {
>-            // The error has been removed from GLSL ES 3.10.
>-            mDiagnostics->warning(
>-                loc, "no statement between the last label and the end of the switch statement",
>-                "switch");
>-        }
>+        // There have been some differences between versions of GLSL ES specs on whether this should
>+        // be an error or not, but as of early 2018 the latest discussion is that this is an error
>+        // also on GLSL ES versions newer than 3.00.
>+        mDiagnostics->error(
>+            loc, "no statement between the last label and the end of the switch statement",
>+            "switch");
>+    }
>+    if (getMaxDepth() >= kMaxAllowedTraversalDepth)
>+    {
>+        mDiagnostics->error(loc, "too complex expressions inside a switch statement", "switch");
>     }
>-    return !mStatementBeforeCase && !lastStatementWasCaseError && !mCaseInsideControlFlow &&
>-           !mCaseTypeMismatch && mDefaultCount <= 1 && !mDuplicateCases;
>+    return !mStatementBeforeCase && !mLastStatementWasCase && !mCaseInsideControlFlow &&
>+           !mCaseTypeMismatch && mDefaultCount <= 1 && !mDuplicateCases &&
>+           getMaxDepth() < kMaxAllowedTraversalDepth;
> }
> 
> }  // anonymous namespace
> 
> bool ValidateSwitchStatementList(TBasicType switchType,
>-                                 int shaderVersion,
>                                  TDiagnostics *diagnostics,
>                                  TIntermBlock *statementList,
>                                  const TSourceLoc &loc)
> {
>-    return ValidateSwitch::validate(switchType, shaderVersion, diagnostics, statementList, loc);
>+    return ValidateSwitch::validate(switchType, diagnostics, statementList, loc);
> }
> 
> }  // namespace sh
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/ValidateSwitch.h b/Source/ThirdParty/ANGLE/src/compiler/translator/ValidateSwitch.h
>index 2d2dd70f784..757820a164e 100644
>--- a/Source/ThirdParty/ANGLE/src/compiler/translator/ValidateSwitch.h
>+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/ValidateSwitch.h
>@@ -18,7 +18,6 @@ class TIntermBlock;
> // Check for errors and output error messages on the context.
> // Returns true if there are no errors.
> bool ValidateSwitchStatementList(TBasicType switchType,
>-                                 int shaderVersion,
>                                  TDiagnostics *diagnostics,
>                                  TIntermBlock *statementList,
>                                  const TSourceLoc &loc);
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/ValidateVaryingLocations.cpp b/Source/ThirdParty/ANGLE/src/compiler/translator/ValidateVaryingLocations.cpp
>index 9c36fcea789..394e35c8d85 100644
>--- a/Source/ThirdParty/ANGLE/src/compiler/translator/ValidateVaryingLocations.cpp
>+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/ValidateVaryingLocations.cpp
>@@ -10,7 +10,8 @@
> #include "ValidateVaryingLocations.h"
> 
> #include "compiler/translator/Diagnostics.h"
>-#include "compiler/translator/IntermTraverse.h"
>+#include "compiler/translator/SymbolTable.h"
>+#include "compiler/translator/tree_util/IntermTraverse.h"
> #include "compiler/translator/util.h"
> 
> namespace sh
>@@ -21,7 +22,7 @@ namespace
> 
> void error(const TIntermSymbol &symbol, const char *reason, TDiagnostics *diagnostics)
> {
>-    diagnostics->error(symbol.getLine(), reason, symbol.getSymbol().c_str());
>+    diagnostics->error(symbol.getLine(), reason, symbol.getName().data());
> }
> 
> int GetLocationCount(const TIntermSymbol *varying, bool ignoreVaryingArraySize)
>@@ -40,7 +41,7 @@ int GetLocationCount(const TIntermSymbol *varying, bool ignoreVaryingArraySize)
>         }
>         return totalLocation;
>     }
>-    // [GL_OES_shader_io_blocks SPEC Chapter 4.4.1]
>+    // [GL_EXT_shader_io_blocks SPEC Chapter 4.4.1]
>     // Geometry shader inputs, tessellation control shader inputs and outputs, and tessellation
>     // evaluation inputs all have an additional level of arrayness relative to other shader inputs
>     // and outputs. This outer array level is removed from the type before considering how many
>@@ -48,7 +49,7 @@ int GetLocationCount(const TIntermSymbol *varying, bool ignoreVaryingArraySize)
>     else if (ignoreVaryingArraySize)
>     {
>         // Array-of-arrays cannot be inputs or outputs of a geometry shader.
>-        // (GL_OES_geometry_shader SPEC issues(5))
>+        // (GL_EXT_geometry_shader SPEC issues(5))
>         ASSERT(!varyingType.isArrayOfArrays());
>         return varyingType.getSecondarySize();
>     }
>@@ -82,10 +83,10 @@ void ValidateShaderInterface(TDiagnostics *diagnostics,
>             const int offsetLocation = location + elementIndex;
>             if (locationMap.find(offsetLocation) != locationMap.end())
>             {
>-                std::stringstream strstr;
>-                strstr << "'" << varying->getSymbol()
>+                std::stringstream strstr = sh::InitializeStream<std::stringstream>();
>+                strstr << "'" << varying->getName()
>                        << "' conflicting location with previously defined '"
>-                       << locationMap[offsetLocation]->getSymbol() << "'";
>+                       << locationMap[offsetLocation]->getName() << "'";
>                 error(*varying, strstr.str().c_str(), diagnostics);
>             }
>             else
>@@ -113,8 +114,7 @@ class ValidateVaryingLocationsTraverser : public TIntermTraverser
> 
> ValidateVaryingLocationsTraverser::ValidateVaryingLocationsTraverser(GLenum shaderType)
>     : TIntermTraverser(true, false, false), mShaderType(shaderType)
>-{
>-}
>+{}
> 
> bool ValidateVaryingLocationsTraverser::visitDeclaration(Visit visit, TIntermDeclaration *node)
> {
>@@ -127,6 +127,11 @@ bool ValidateVaryingLocationsTraverser::visitDeclaration(Visit visit, TIntermDec
>         return false;
>     }
> 
>+    if (symbol->variable().symbolType() == SymbolType::Empty)
>+    {
>+        return false;
>+    }
>+
>     // Collect varyings that have explicit 'location' qualifiers.
>     const TQualifier qualifier = symbol->getQualifier();
>     if (symbol->getType().getLayoutQualifier().location != -1)
>@@ -156,7 +161,7 @@ void ValidateVaryingLocationsTraverser::validate(TDiagnostics *diagnostics)
>     ASSERT(diagnostics);
> 
>     ValidateShaderInterface(diagnostics, mInputVaryingsWithLocation,
>-                            mShaderType == GL_GEOMETRY_SHADER_OES);
>+                            mShaderType == GL_GEOMETRY_SHADER_EXT);
>     ValidateShaderInterface(diagnostics, mOutputVaryingsWithLocation, false);
> }
> 
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/VariablePacker.cpp b/Source/ThirdParty/ANGLE/src/compiler/translator/VariablePacker.cpp
>index 6dd396ff021..123da4b35eb 100644
>--- a/Source/ThirdParty/ANGLE/src/compiler/translator/VariablePacker.cpp
>+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/VariablePacker.cpp
>@@ -10,8 +10,8 @@
> 
> #include "angle_gl.h"
> 
>-#include "compiler/translator/VariablePacker.h"
> #include "common/utilities.h"
>+#include "compiler/translator/VariablePacker.h"
> 
> namespace sh
> {
>@@ -80,7 +80,7 @@ void ExpandVariable(const ShaderVariable &variable,
>     else
>     {
>         ShaderVariable expandedVar = variable;
>-        expandedVar.name       = name;
>+        expandedVar.name           = name;
> 
>         expanded->push_back(expandedVar);
>     }
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/VectorizeVectorScalarArithmetic.cpp b/Source/ThirdParty/ANGLE/src/compiler/translator/VectorizeVectorScalarArithmetic.cpp
>deleted file mode 100644
>index 1e79a609915..00000000000
>--- a/Source/ThirdParty/ANGLE/src/compiler/translator/VectorizeVectorScalarArithmetic.cpp
>+++ /dev/null
>@@ -1,284 +0,0 @@
>-// Copyright (c) 2017 The ANGLE Project Authors. All rights reserved.
>-// Use of this source code is governed by a BSD-style license that can be
>-// found in the LICENSE file.
>-//
>-// VectorizeVectorScalarArithmetic.cpp: Turn some arithmetic operations that operate on a float
>-// vector-scalar pair into vector-vector operations. This is done recursively. Some scalar binary
>-// operations inside vector constructors are also turned into vector operations.
>-//
>-// This is targeted to work around a bug in NVIDIA OpenGL drivers that was reproducible on NVIDIA
>-// driver version 387.92. It works around the most common occurrences of the bug.
>-
>-#include "compiler/translator/VectorizeVectorScalarArithmetic.h"
>-
>-#include <set>
>-
>-#include "compiler/translator/IntermNode.h"
>-#include "compiler/translator/IntermTraverse.h"
>-
>-namespace sh
>-{
>-
>-namespace
>-{
>-
>-class VectorizeVectorScalarArithmeticTraverser : public TIntermTraverser
>-{
>-  public:
>-    VectorizeVectorScalarArithmeticTraverser(TSymbolTable *symbolTable)
>-        : TIntermTraverser(true, false, false, symbolTable), mReplaced(false)
>-    {
>-    }
>-
>-    bool didReplaceScalarsWithVectors() { return mReplaced; }
>-    void nextIteration()
>-    {
>-        mReplaced = false;
>-        mModifiedBlocks.clear();
>-    }
>-
>-  protected:
>-    bool visitBinary(Visit visit, TIntermBinary *node) override;
>-    bool visitAggregate(Visit visit, TIntermAggregate *node) override;
>-
>-  private:
>-    // These helpers should only be called from visitAggregate when visiting a constructor.
>-    // argBinary is the only argument of the constructor.
>-    void replaceMathInsideConstructor(TIntermAggregate *node, TIntermBinary *argBinary);
>-    void replaceAssignInsideConstructor(const TIntermAggregate *node,
>-                                        const TIntermBinary *argBinary);
>-
>-    static TIntermTyped *Vectorize(TIntermTyped *node,
>-                                   TType vectorType,
>-                                   TIntermTraverser::OriginalNode *originalNodeFate);
>-
>-    bool mReplaced;
>-    std::set<const TIntermBlock *> mModifiedBlocks;
>-};
>-
>-TIntermTyped *VectorizeVectorScalarArithmeticTraverser::Vectorize(
>-    TIntermTyped *node,
>-    TType vectorType,
>-    TIntermTraverser::OriginalNode *originalNodeFate)
>-{
>-    ASSERT(node->isScalar());
>-    vectorType.setQualifier(EvqTemporary);
>-    TIntermSequence vectorConstructorArgs;
>-    vectorConstructorArgs.push_back(node);
>-    TIntermAggregate *vectorized =
>-        TIntermAggregate::CreateConstructor(vectorType, &vectorConstructorArgs);
>-    TIntermTyped *vectorizedFolded = vectorized->fold(nullptr);
>-    if (originalNodeFate != nullptr)
>-    {
>-        if (vectorizedFolded != vectorized)
>-        {
>-            *originalNodeFate = OriginalNode::IS_DROPPED;
>-        }
>-        else
>-        {
>-            *originalNodeFate = OriginalNode::BECOMES_CHILD;
>-        }
>-    }
>-    return vectorizedFolded;
>-}
>-
>-bool VectorizeVectorScalarArithmeticTraverser::visitBinary(Visit /*visit*/, TIntermBinary *node)
>-{
>-    TIntermTyped *left  = node->getLeft();
>-    TIntermTyped *right = node->getRight();
>-    ASSERT(left);
>-    ASSERT(right);
>-    switch (node->getOp())
>-    {
>-        case EOpAdd:
>-        case EOpAddAssign:
>-            // Only these specific ops are necessary to turn into vector ops.
>-            break;
>-        default:
>-            return true;
>-    }
>-    if (node->getBasicType() != EbtFloat)
>-    {
>-        // Only float ops have reproduced the bug.
>-        return true;
>-    }
>-    if (left->isScalar() && right->isVector())
>-    {
>-        ASSERT(!node->isAssignment());
>-        ASSERT(!right->isArray());
>-        OriginalNode originalNodeFate;
>-        TIntermTyped *leftVectorized = Vectorize(left, right->getType(), &originalNodeFate);
>-        queueReplacementWithParent(node, left, leftVectorized, originalNodeFate);
>-        mReplaced = true;
>-        // Don't replace more nodes in the same subtree on this traversal. However, nodes elsewhere
>-        // in the tree may still be replaced.
>-        return false;
>-    }
>-    else if (left->isVector() && right->isScalar())
>-    {
>-        OriginalNode originalNodeFate;
>-        TIntermTyped *rightVectorized = Vectorize(right, left->getType(), &originalNodeFate);
>-        queueReplacementWithParent(node, right, rightVectorized, originalNodeFate);
>-        mReplaced = true;
>-        // Don't replace more nodes in the same subtree on this traversal. However, nodes elsewhere
>-        // in the tree may still be replaced.
>-        return false;
>-    }
>-    return true;
>-}
>-
>-void VectorizeVectorScalarArithmeticTraverser::replaceMathInsideConstructor(
>-    TIntermAggregate *node,
>-    TIntermBinary *argBinary)
>-{
>-    // Turn:
>-    //   a * b
>-    // into:
>-    //   gvec(a) * gvec(b)
>-
>-    TIntermTyped *left  = argBinary->getLeft();
>-    TIntermTyped *right = argBinary->getRight();
>-    ASSERT(left->isScalar() && right->isScalar());
>-
>-    TType leftVectorizedType = left->getType();
>-    leftVectorizedType.setPrimarySize(static_cast<unsigned char>(node->getType().getNominalSize()));
>-    TIntermTyped *leftVectorized = Vectorize(left, leftVectorizedType, nullptr);
>-    TType rightVectorizedType    = right->getType();
>-    rightVectorizedType.setPrimarySize(
>-        static_cast<unsigned char>(node->getType().getNominalSize()));
>-    TIntermTyped *rightVectorized = Vectorize(right, rightVectorizedType, nullptr);
>-
>-    TIntermBinary *newArg = new TIntermBinary(argBinary->getOp(), leftVectorized, rightVectorized);
>-    queueReplacementWithParent(node, argBinary, newArg, OriginalNode::IS_DROPPED);
>-}
>-
>-void VectorizeVectorScalarArithmeticTraverser::replaceAssignInsideConstructor(
>-    const TIntermAggregate *node,
>-    const TIntermBinary *argBinary)
>-{
>-    // Turn:
>-    //   gvec(a *= b);
>-    // into:
>-    //   // This is inserted into the parent block:
>-    //   gvec s0 = gvec(a);
>-    //
>-    //   // This goes where the gvec constructor used to be:
>-    //   ((s0 *= b, a = s0.x), s0);
>-
>-    TIntermTyped *left  = argBinary->getLeft();
>-    TIntermTyped *right = argBinary->getRight();
>-    ASSERT(left->isScalar() && right->isScalar());
>-    ASSERT(!left->hasSideEffects());
>-
>-    TType vecType = node->getType();
>-    vecType.setQualifier(EvqTemporary);
>-
>-    nextTemporaryId();
>-    // gvec s0 = gvec(a);
>-    // s0 is called "tempAssignmentTarget" below.
>-    TIntermTyped *tempAssignmentTargetInitializer = Vectorize(left->deepCopy(), vecType, nullptr);
>-    TIntermDeclaration *tempAssignmentTargetDeclaration =
>-        createTempInitDeclaration(tempAssignmentTargetInitializer);
>-
>-    // s0 *= b
>-    TOperator compoundAssignmentOp = argBinary->getOp();
>-    if (compoundAssignmentOp == EOpMulAssign)
>-    {
>-        compoundAssignmentOp = EOpVectorTimesScalarAssign;
>-    }
>-    TIntermBinary *replacementCompoundAssignment =
>-        new TIntermBinary(compoundAssignmentOp, createTempSymbol(vecType), right->deepCopy());
>-
>-    // s0.x
>-    TVector<int> swizzleXOffset;
>-    swizzleXOffset.push_back(0);
>-    TIntermSwizzle *tempAssignmentTargetX =
>-        new TIntermSwizzle(createTempSymbol(vecType), swizzleXOffset);
>-    // a = s0.x
>-    TIntermBinary *replacementAssignBackToTarget =
>-        new TIntermBinary(EOpAssign, left->deepCopy(), tempAssignmentTargetX);
>-
>-    // s0 *= b, a = s0.x
>-    TIntermBinary *replacementSequenceLeft =
>-        new TIntermBinary(EOpComma, replacementCompoundAssignment, replacementAssignBackToTarget);
>-    // (s0 *= b, a = s0.x), s0
>-    TIntermBinary *replacementSequence =
>-        new TIntermBinary(EOpComma, replacementSequenceLeft, createTempSymbol(vecType));
>-
>-    insertStatementInParentBlock(tempAssignmentTargetDeclaration);
>-    queueReplacement(replacementSequence, OriginalNode::IS_DROPPED);
>-}
>-
>-bool VectorizeVectorScalarArithmeticTraverser::visitAggregate(Visit /*visit*/,
>-                                                              TIntermAggregate *node)
>-{
>-    // Transform scalar binary expressions inside vector constructors.
>-    if (!node->isConstructor() || !node->isVector() || node->getSequence()->size() != 1)
>-    {
>-        return true;
>-    }
>-    TIntermTyped *argument = node->getSequence()->back()->getAsTyped();
>-    ASSERT(argument);
>-    if (!argument->isScalar() || argument->getBasicType() != EbtFloat)
>-    {
>-        return true;
>-    }
>-    TIntermBinary *argBinary = argument->getAsBinaryNode();
>-    if (!argBinary)
>-    {
>-        return true;
>-    }
>-
>-    // Only specific ops are necessary to change.
>-    switch (argBinary->getOp())
>-    {
>-        case EOpMul:
>-        case EOpDiv:
>-        {
>-            replaceMathInsideConstructor(node, argBinary);
>-            mReplaced = true;
>-            // Don't replace more nodes in the same subtree on this traversal. However, nodes
>-            // elsewhere in the tree may still be replaced.
>-            return false;
>-        }
>-        case EOpMulAssign:
>-        case EOpDivAssign:
>-        {
>-            // The case where the left side has side effects is too complicated to deal with, so we
>-            // leave that be.
>-            if (!argBinary->getLeft()->hasSideEffects())
>-            {
>-                const TIntermBlock *parentBlock = getParentBlock();
>-                // We can't do more than one insertion to the same block on the same traversal.
>-                if (mModifiedBlocks.find(parentBlock) == mModifiedBlocks.end())
>-                {
>-                    replaceAssignInsideConstructor(node, argBinary);
>-                    mModifiedBlocks.insert(parentBlock);
>-                    mReplaced = true;
>-                    // Don't replace more nodes in the same subtree on this traversal.
>-                    // However, nodes elsewhere in the tree may still be replaced.
>-                    return false;
>-                }
>-            }
>-            break;
>-        }
>-        default:
>-            return true;
>-    }
>-    return true;
>-}
>-
>-}  // anonymous namespace
>-
>-void VectorizeVectorScalarArithmetic(TIntermBlock *root, TSymbolTable *symbolTable)
>-{
>-    VectorizeVectorScalarArithmeticTraverser traverser(symbolTable);
>-    do
>-    {
>-        traverser.nextIteration();
>-        root->traverse(&traverser);
>-        traverser.updateTree();
>-    } while (traverser.didReplaceScalarsWithVectors());
>-}
>-
>-}  // namespace sh
>\ No newline at end of file
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/VectorizeVectorScalarArithmetic.h b/Source/ThirdParty/ANGLE/src/compiler/translator/VectorizeVectorScalarArithmetic.h
>deleted file mode 100644
>index 69f092e039d..00000000000
>--- a/Source/ThirdParty/ANGLE/src/compiler/translator/VectorizeVectorScalarArithmetic.h
>+++ /dev/null
>@@ -1,25 +0,0 @@
>-// Copyright (c) 2017 The ANGLE Project Authors. All rights reserved.
>-// Use of this source code is governed by a BSD-style license that can be
>-// found in the LICENSE file.
>-//
>-// VectorizeVectorScalarArithmetic.h: Turn some arithmetic operations that operate on a float
>-// vector-scalar pair into vector-vector operations. This is done recursively. Some scalar binary
>-// operations inside vector constructors are also turned into vector operations.
>-//
>-// This is targeted to work around a bug in NVIDIA OpenGL drivers that was reproducible on NVIDIA
>-// driver version 387.92. It works around the most common occurrences of the bug.
>-
>-#ifndef COMPILER_TRANSLATOR_VECTORIZEVECTORSCALARARITHMETIC_H_
>-#define COMPILER_TRANSLATOR_VECTORIZEVECTORSCALARARITHMETIC_H_
>-
>-namespace sh
>-{
>-
>-class TIntermBlock;
>-class TSymbolTable;
>-
>-void VectorizeVectorScalarArithmetic(TIntermBlock *root, TSymbolTable *symbolTable);
>-
>-}  // namespace sh
>-
>-#endif  // COMPILER_TRANSLATOR_VECTORIZEVECTORSCALARARITHMETIC_H_
>\ No newline at end of file
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/VersionGLSL.cpp b/Source/ThirdParty/ANGLE/src/compiler/translator/VersionGLSL.cpp
>index 81688765b84..eb431c3117a 100644
>--- a/Source/ThirdParty/ANGLE/src/compiler/translator/VersionGLSL.cpp
>+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/VersionGLSL.cpp
>@@ -7,10 +7,16 @@
> #include "compiler/translator/VersionGLSL.h"
> 
> #include "angle_gl.h"
>+#include "compiler/translator/Symbol.h"
> 
> namespace sh
> {
> 
>+namespace
>+{
>+constexpr const ImmutableString kGlPointCoordString("gl_PointCoord");
>+}  // anonymous namespace
>+
> int ShaderOutputTypeToGLSLVersion(ShShaderOutput output)
> {
>     switch (output)
>@@ -76,7 +82,8 @@ TVersionGLSL::TVersionGLSL(sh::GLenum type, const TPragma &pragma, ShShaderOutpu
> 
> void TVersionGLSL::visitSymbol(TIntermSymbol *node)
> {
>-    if (node->getSymbol() == "gl_PointCoord")
>+    if (node->variable().symbolType() == SymbolType::BuiltIn &&
>+        node->getName() == kGlPointCoordString)
>     {
>         ensureVersionIsAtLeast(GLSL_VERSION_120);
>     }
>@@ -98,15 +105,16 @@ bool TVersionGLSL::visitInvariantDeclaration(Visit, TIntermInvariantDeclaration
>     return true;
> }
> 
>-bool TVersionGLSL::visitFunctionPrototype(Visit, TIntermFunctionPrototype *node)
>+void TVersionGLSL::visitFunctionPrototype(TIntermFunctionPrototype *node)
> {
>-    const TIntermSequence &params = *(node->getSequence());
>-    for (TIntermSequence::const_iterator iter = params.begin(); iter != params.end(); ++iter)
>+    size_t paramCount = node->getFunction()->getParamCount();
>+    for (size_t i = 0; i < paramCount; ++i)
>     {
>-        const TIntermTyped *param = (*iter)->getAsTyped();
>-        if (param->isArray())
>+        const TVariable *param = node->getFunction()->getParam(i);
>+        const TType &type      = param->getType();
>+        if (type.isArray())
>         {
>-            TQualifier qualifier = param->getQualifier();
>+            TQualifier qualifier = type.getQualifier();
>             if ((qualifier == EvqOut) || (qualifier == EvqInOut))
>             {
>                 ensureVersionIsAtLeast(GLSL_VERSION_120);
>@@ -114,8 +122,6 @@ bool TVersionGLSL::visitFunctionPrototype(Visit, TIntermFunctionPrototype *node)
>             }
>         }
>     }
>-    // Fully processed. No need to visit children.
>-    return false;
> }
> 
> bool TVersionGLSL::visitAggregate(Visit, TIntermAggregate *node)
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/VersionGLSL.h b/Source/ThirdParty/ANGLE/src/compiler/translator/VersionGLSL.h
>index 8b82eb9615a..f05da966f45 100644
>--- a/Source/ThirdParty/ANGLE/src/compiler/translator/VersionGLSL.h
>+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/VersionGLSL.h
>@@ -7,7 +7,7 @@
> #ifndef COMPILER_TRANSLATOR_VERSIONGLSL_H_
> #define COMPILER_TRANSLATOR_VERSIONGLSL_H_
> 
>-#include "compiler/translator/IntermTraverse.h"
>+#include "compiler/translator/tree_util/IntermTraverse.h"
> 
> #include "compiler/translator/Pragma.h"
> 
>@@ -62,7 +62,7 @@ class TVersionGLSL : public TIntermTraverser
>     void visitSymbol(TIntermSymbol *node) override;
>     bool visitAggregate(Visit, TIntermAggregate *node) override;
>     bool visitInvariantDeclaration(Visit, TIntermInvariantDeclaration *node) override;
>-    bool visitFunctionPrototype(Visit, TIntermFunctionPrototype *node) override;
>+    void visitFunctionPrototype(TIntermFunctionPrototype *node) override;
>     bool visitDeclaration(Visit, TIntermDeclaration *node) override;
> 
>   private:
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/WrapSwitchStatementsInBlocks.cpp b/Source/ThirdParty/ANGLE/src/compiler/translator/WrapSwitchStatementsInBlocks.cpp
>deleted file mode 100644
>index 85a11c998da..00000000000
>--- a/Source/ThirdParty/ANGLE/src/compiler/translator/WrapSwitchStatementsInBlocks.cpp
>+++ /dev/null
>@@ -1,132 +0,0 @@
>-//
>-// Copyright (c) 2017 The ANGLE Project Authors. All rights reserved.
>-// Use of this source code is governed by a BSD-style license that can be
>-// found in the LICENSE file.
>-//
>-// WrapSwitchStatementsInBlocks.cpp: Wrap switch statements in blocks and declare all switch-scoped
>-// variables there to make the AST compatible with HLSL output.
>-//
>-// switch (init)
>-// {
>-//     case 0:
>-//         float f;
>-//     default:
>-//         f = 1.0;
>-// }
>-//
>-// becomes
>-//
>-// {
>-//     float f;
>-//     switch (init)
>-//     {
>-//         case 0:
>-//         default:
>-//             f = 1.0;
>-//     }
>-// }
>-
>-#include "compiler/translator/WrapSwitchStatementsInBlocks.h"
>-
>-#include "compiler/translator/IntermNode.h"
>-#include "compiler/translator/IntermTraverse.h"
>-
>-namespace sh
>-{
>-
>-namespace
>-{
>-
>-class WrapSwitchStatementsInBlocksTraverser : public TIntermTraverser
>-{
>-  public:
>-    WrapSwitchStatementsInBlocksTraverser() : TIntermTraverser(true, false, false), mDidWrap(false)
>-    {
>-    }
>-
>-    bool visitSwitch(Visit visit, TIntermSwitch *node) override;
>-
>-    bool didWrap() const { return mDidWrap; }
>-
>-  private:
>-    bool mDidWrap;
>-};
>-
>-bool WrapSwitchStatementsInBlocksTraverser::visitSwitch(Visit, TIntermSwitch *node)
>-{
>-    std::vector<TIntermDeclaration *> declarations;
>-    TIntermSequence *statementList = node->getStatementList()->getSequence();
>-    for (TIntermNode *statement : *statementList)
>-    {
>-        TIntermDeclaration *asDeclaration = statement->getAsDeclarationNode();
>-        if (asDeclaration)
>-        {
>-            declarations.push_back(asDeclaration);
>-        }
>-    }
>-    if (declarations.empty())
>-    {
>-        // We don't need to wrap the switch if it doesn't contain declarations as its direct
>-        // descendants.
>-        return true;
>-    }
>-
>-    TIntermBlock *wrapperBlock = new TIntermBlock();
>-    for (TIntermDeclaration *declaration : declarations)
>-    {
>-        // SeparateDeclarations should have already been run.
>-        ASSERT(declaration->getSequence()->size() == 1);
>-
>-        TIntermDeclaration *declarationInBlock = new TIntermDeclaration();
>-        TIntermSymbol *declaratorAsSymbol = declaration->getSequence()->at(0)->getAsSymbolNode();
>-        if (declaratorAsSymbol)
>-        {
>-            // This is a simple declaration like: "float f;"
>-            // Remove the declaration from inside the switch and put it in the wrapping block.
>-            TIntermSequence emptyReplacement;
>-            mMultiReplacements.push_back(NodeReplaceWithMultipleEntry(
>-                node->getStatementList(), declaration, emptyReplacement));
>-
>-            declarationInBlock->appendDeclarator(declaratorAsSymbol->deepCopy());
>-        }
>-        else
>-        {
>-            // This is an init declaration like: "float f = 0.0;"
>-            // Change the init declaration inside the switch into an assignment and put a plain
>-            // declaration in the wrapping block.
>-            TIntermBinary *declaratorAsBinary =
>-                declaration->getSequence()->at(0)->getAsBinaryNode();
>-            ASSERT(declaratorAsBinary);
>-
>-            TIntermBinary *initAssignment = new TIntermBinary(
>-                EOpAssign, declaratorAsBinary->getLeft(), declaratorAsBinary->getRight());
>-
>-            queueReplacementWithParent(node->getStatementList(), declaration, initAssignment,
>-                                       OriginalNode::IS_DROPPED);
>-
>-            declarationInBlock->appendDeclarator(declaratorAsBinary->getLeft()->deepCopy());
>-        }
>-        wrapperBlock->appendStatement(declarationInBlock);
>-    }
>-
>-    wrapperBlock->appendStatement(node);
>-    queueReplacement(wrapperBlock, OriginalNode::BECOMES_CHILD);
>-    mDidWrap = true;
>-
>-    // Should be fine to process multiple switch statements, even nesting ones in the same
>-    // traversal.
>-    return true;
>-}
>-
>-}  // anonymous namespace
>-
>-// Wrap switch statements in the AST into blocks when needed.
>-bool WrapSwitchStatementsInBlocks(TIntermBlock *root)
>-{
>-    WrapSwitchStatementsInBlocksTraverser traverser;
>-    root->traverse(&traverser);
>-    traverser.updateTree();
>-    return traverser.didWrap();
>-}
>-
>-}  // namespace sh
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/WrapSwitchStatementsInBlocks.h b/Source/ThirdParty/ANGLE/src/compiler/translator/WrapSwitchStatementsInBlocks.h
>deleted file mode 100644
>index bc0179926d1..00000000000
>--- a/Source/ThirdParty/ANGLE/src/compiler/translator/WrapSwitchStatementsInBlocks.h
>+++ /dev/null
>@@ -1,22 +0,0 @@
>-//
>-// Copyright (c) 2017 The ANGLE Project Authors. All rights reserved.
>-// Use of this source code is governed by a BSD-style license that can be
>-// found in the LICENSE file.
>-//
>-// WrapSwitchStatementsInBlocks.h: Wrap switch statements in blocks and declare all switch-scoped
>-// variables there to make the AST compatible with HLSL output.
>-
>-#ifndef COMPILER_TRANSLATOR_WRAPSWITCHSTATEMENTSINBLOCKS_H_
>-#define COMPILER_TRANSLATOR_WRAPSWITCHSTATEMENTSINBLOCKS_H_
>-
>-namespace sh
>-{
>-
>-class TIntermBlock;
>-
>-// Wrap switch statements in the AST into blocks when needed. Returns true if the AST was changed.
>-bool WrapSwitchStatementsInBlocks(TIntermBlock *root);
>-
>-}  // namespace sh
>-
>-#endif  // COMPILER_TRANSLATOR_WRAPSWITCHSTATEMENTSINBLOCKS_H_
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/blocklayout.cpp b/Source/ThirdParty/ANGLE/src/compiler/translator/blocklayout.cpp
>index fd8c450c206..7d0609ec823 100644
>--- a/Source/ThirdParty/ANGLE/src/compiler/translator/blocklayout.cpp
>+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/blocklayout.cpp
>@@ -11,94 +11,164 @@
> 
> #include "common/mathutil.h"
> #include "common/utilities.h"
>+#include "compiler/translator/Common.h"
> 
> namespace sh
> {
> 
> namespace
> {
>-bool IsRowMajorLayout(const InterfaceBlockField &var)
>+class BlockLayoutMapVisitor : public BlockEncoderVisitor
> {
>-    return var.isRowMajorLayout;
>-}
>+  public:
>+    BlockLayoutMapVisitor(BlockLayoutMap *blockInfoOut,
>+                          const std::string &instanceName,
>+                          BlockLayoutEncoder *encoder)
>+        : BlockEncoderVisitor(instanceName, instanceName, encoder), mInfoOut(blockInfoOut)
>+    {}
>+
>+    void encodeVariable(const ShaderVariable &variable,
>+                        const BlockMemberInfo &variableInfo,
>+                        const std::string &name,
>+                        const std::string &mappedName) override
>+    {
>+        ASSERT(!gl::IsSamplerType(variable.type));
>+        (*mInfoOut)[name] = variableInfo;
>+    }
> 
>-bool IsRowMajorLayout(const ShaderVariable &var)
>+  private:
>+    BlockLayoutMap *mInfoOut;
>+};
>+
>+template <typename VarT>
>+void GetInterfaceBlockInfo(const std::vector<VarT> &fields,
>+                           const std::string &prefix,
>+                           BlockLayoutEncoder *encoder,
>+                           bool inRowMajorLayout,
>+                           BlockLayoutMap *blockInfoOut)
> {
>-    return false;
>+    BlockLayoutMapVisitor visitor(blockInfoOut, prefix, encoder);
>+    TraverseShaderVariables(fields, inRowMajorLayout, &visitor);
> }
> 
>-template <typename VarT>
>-void GetUniformBlockStructMemberInfo(const std::vector<VarT> &fields,
>-                                     const std::string &fieldName,
>-                                     sh::BlockLayoutEncoder *encoder,
>-                                     bool inRowMajorLayout,
>-                                     BlockLayoutMap *blockInfoOut)
>+void TraverseStructVariable(const ShaderVariable &variable,
>+                            bool isRowMajorLayout,
>+                            ShaderVariableVisitor *visitor)
> {
>-    encoder->enterAggregateType();
>-    GetUniformBlockInfo(fields, fieldName, encoder, inRowMajorLayout, blockInfoOut);
>-    encoder->exitAggregateType();
>+    const std::vector<ShaderVariable> &fields = variable.fields;
>+
>+    visitor->enterStructAccess(variable, isRowMajorLayout);
>+    TraverseShaderVariables(fields, isRowMajorLayout, visitor);
>+    visitor->exitStructAccess(variable, isRowMajorLayout);
> }
> 
>-template <typename VarT>
>-void GetUniformBlockStructArrayMemberInfo(const VarT &field,
>-                                          unsigned int arrayNestingIndex,
>-                                          const std::string &arrayName,
>-                                          sh::BlockLayoutEncoder *encoder,
>-                                          bool inRowMajorLayout,
>-                                          BlockLayoutMap *blockInfoOut)
>+void TraverseStructArrayVariable(const ShaderVariable &variable,
>+                                 bool inRowMajorLayout,
>+                                 ShaderVariableVisitor *visitor)
> {
>+    visitor->enterArray(variable);
>+
>     // Nested arrays are processed starting from outermost (arrayNestingIndex 0u) and ending at the
>-    // innermost.
>-    const unsigned int currentArraySize = field.getNestedArraySize(arrayNestingIndex);
>-    for (unsigned int arrayElement = 0u; arrayElement < currentArraySize; ++arrayElement)
>+    // innermost. We make a special case for unsized arrays.
>+    const unsigned int currentArraySize = variable.getNestedArraySize(0);
>+    unsigned int count                  = std::max(currentArraySize, 1u);
>+    for (unsigned int arrayElement = 0u; arrayElement < count; ++arrayElement)
>     {
>-        const std::string elementName = arrayName + ArrayString(arrayElement);
>-        if (arrayNestingIndex + 1u < field.arraySizes.size())
>+        visitor->enterArrayElement(variable, arrayElement);
>+        ShaderVariable elementVar = variable;
>+        elementVar.indexIntoArray(arrayElement);
>+
>+        if (variable.arraySizes.size() > 1u)
>         {
>-            GetUniformBlockStructArrayMemberInfo(field, arrayNestingIndex + 1u, elementName,
>-                                                 encoder, inRowMajorLayout, blockInfoOut);
>+            TraverseStructArrayVariable(elementVar, inRowMajorLayout, visitor);
>         }
>         else
>         {
>-            GetUniformBlockStructMemberInfo(field.fields, elementName, encoder, inRowMajorLayout,
>-                                            blockInfoOut);
>+            TraverseStructVariable(elementVar, inRowMajorLayout, visitor);
>         }
>+
>+        visitor->exitArrayElement(variable, arrayElement);
>     }
>+
>+    visitor->exitArray(variable);
> }
> 
>-template <typename VarT>
>-void GetUniformBlockArrayOfArraysMemberInfo(const VarT &field,
>-                                            unsigned int arrayNestingIndex,
>-                                            const std::string &arrayName,
>-                                            sh::BlockLayoutEncoder *encoder,
>-                                            bool inRowMajorLayout,
>-                                            BlockLayoutMap *blockInfoOut)
>-{
>-    const unsigned int currentArraySize = field.getNestedArraySize(arrayNestingIndex);
>-    for (unsigned int arrayElement = 0u; arrayElement < currentArraySize; ++arrayElement)
>+void TraverseArrayOfArraysVariable(const ShaderVariable &variable,
>+                                   unsigned int arrayNestingIndex,
>+                                   bool isRowMajorMatrix,
>+                                   ShaderVariableVisitor *visitor)
>+{
>+    visitor->enterArray(variable);
>+
>+    const unsigned int currentArraySize = variable.getNestedArraySize(arrayNestingIndex);
>+    unsigned int count                  = std::max(currentArraySize, 1u);
>+    for (unsigned int arrayElement = 0u; arrayElement < count; ++arrayElement)
>     {
>-        const std::string elementName = arrayName + ArrayString(arrayElement);
>-        if (arrayNestingIndex + 2u < field.arraySizes.size())
>+        visitor->enterArrayElement(variable, arrayElement);
>+
>+        ShaderVariable elementVar = variable;
>+        elementVar.indexIntoArray(arrayElement);
>+
>+        if (arrayNestingIndex + 2u < variable.arraySizes.size())
>         {
>-            GetUniformBlockArrayOfArraysMemberInfo(field, arrayNestingIndex + 1u, elementName,
>-                                                   encoder, inRowMajorLayout, blockInfoOut);
>+            TraverseArrayOfArraysVariable(elementVar, arrayNestingIndex, isRowMajorMatrix, visitor);
>         }
>         else
>         {
>-            std::vector<unsigned int> innermostArraySize(
>-                1u, field.getNestedArraySize(arrayNestingIndex + 1u));
>-            (*blockInfoOut)[elementName] =
>-                encoder->encodeType(field.type, innermostArraySize, inRowMajorLayout);
>+            if (gl::IsSamplerType(variable.type))
>+            {
>+                visitor->visitSampler(elementVar);
>+            }
>+            else
>+            {
>+                visitor->visitVariable(elementVar, isRowMajorMatrix);
>+            }
>         }
>+
>+        visitor->exitArrayElement(variable, arrayElement);
>     }
>+
>+    visitor->exitArray(variable);
> }
> 
>-}  // anonymous namespace
>+std::string CollapseNameStack(const std::vector<std::string> &nameStack)
>+{
>+    std::stringstream strstr = sh::InitializeStream<std::stringstream>();
>+    for (const std::string &part : nameStack)
>+    {
>+        strstr << part;
>+    }
>+    return strstr.str();
>+}
> 
>-BlockLayoutEncoder::BlockLayoutEncoder() : mCurrentOffset(0)
>+size_t GetStd430BaseAlignment(GLenum variableType, bool isRowMajor)
> {
>+    GLenum flippedType   = isRowMajor ? variableType : gl::TransposeMatrixType(variableType);
>+    size_t numComponents = static_cast<size_t>(gl::VariableColumnCount(flippedType));
>+    return ComponentAlignment(numComponents);
> }
> 
>+class BaseAlignmentVisitor : public ShaderVariableVisitor
>+{
>+  public:
>+    BaseAlignmentVisitor() = default;
>+    void visitVariable(const ShaderVariable &variable, bool isRowMajor) override
>+    {
>+        size_t baseAlignment = GetStd430BaseAlignment(variable.type, isRowMajor);
>+        mCurrentAlignment    = std::max(mCurrentAlignment, baseAlignment);
>+    }
>+
>+    // This is in components rather than bytes.
>+    size_t getBaseAlignment() const { return mCurrentAlignment; }
>+
>+  private:
>+    size_t mCurrentAlignment = 0;
>+};
>+}  // anonymous namespace
>+
>+// BlockLayoutEncoder implementation.
>+BlockLayoutEncoder::BlockLayoutEncoder() : mCurrentOffset(0) {}
>+
> BlockMemberInfo BlockLayoutEncoder::encodeType(GLenum type,
>                                                const std::vector<unsigned int> &arraySizes,
>                                                bool isRowMajorMatrix)
>@@ -108,9 +178,9 @@ BlockMemberInfo BlockLayoutEncoder::encodeType(GLenum type,
> 
>     getBlockLayoutInfo(type, arraySizes, isRowMajorMatrix, &arrayStride, &matrixStride);
> 
>-    const BlockMemberInfo memberInfo(static_cast<int>(mCurrentOffset * BytesPerComponent),
>-                                     static_cast<int>(arrayStride * BytesPerComponent),
>-                                     static_cast<int>(matrixStride * BytesPerComponent),
>+    const BlockMemberInfo memberInfo(static_cast<int>(mCurrentOffset * kBytesPerComponent),
>+                                     static_cast<int>(arrayStride * kBytesPerComponent),
>+                                     static_cast<int>(matrixStride * kBytesPerComponent),
>                                      isRowMajorMatrix);
> 
>     advanceOffset(type, arraySizes, isRowMajorMatrix, arrayStride, matrixStride);
>@@ -118,35 +188,58 @@ BlockMemberInfo BlockLayoutEncoder::encodeType(GLenum type,
>     return memberInfo;
> }
> 
>+size_t BlockLayoutEncoder::getShaderVariableSize(const ShaderVariable &structVar, bool isRowMajor)
>+{
>+    size_t currentOffset = mCurrentOffset;
>+    mCurrentOffset       = 0;
>+    BlockEncoderVisitor visitor("", "", this);
>+    enterAggregateType(structVar);
>+    TraverseShaderVariables(structVar.fields, isRowMajor, &visitor);
>+    exitAggregateType(structVar);
>+    size_t structVarSize = getCurrentOffset();
>+    mCurrentOffset       = currentOffset;
>+    return structVarSize;
>+}
>+
> // static
>-size_t BlockLayoutEncoder::getBlockRegister(const BlockMemberInfo &info)
>+size_t BlockLayoutEncoder::GetBlockRegister(const BlockMemberInfo &info)
> {
>-    return (info.offset / BytesPerComponent) / ComponentsPerRegister;
>+    return (info.offset / kBytesPerComponent) / kComponentsPerRegister;
> }
> 
> // static
>-size_t BlockLayoutEncoder::getBlockRegisterElement(const BlockMemberInfo &info)
>+size_t BlockLayoutEncoder::GetBlockRegisterElement(const BlockMemberInfo &info)
> {
>-    return (info.offset / BytesPerComponent) % ComponentsPerRegister;
>+    return (info.offset / kBytesPerComponent) % kComponentsPerRegister;
> }
> 
>-void BlockLayoutEncoder::nextRegister()
>+void BlockLayoutEncoder::align(size_t baseAlignment)
> {
>-    mCurrentOffset = rx::roundUp<size_t>(mCurrentOffset, ComponentsPerRegister);
>+    mCurrentOffset = rx::roundUp<size_t>(mCurrentOffset, baseAlignment);
> }
> 
>-Std140BlockEncoder::Std140BlockEncoder()
>+// DummyBlockEncoder implementation.
>+void DummyBlockEncoder::getBlockLayoutInfo(GLenum type,
>+                                           const std::vector<unsigned int> &arraySizes,
>+                                           bool isRowMajorMatrix,
>+                                           int *arrayStrideOut,
>+                                           int *matrixStrideOut)
> {
>+    *arrayStrideOut  = 0;
>+    *matrixStrideOut = 0;
> }
> 
>-void Std140BlockEncoder::enterAggregateType()
>+// Std140BlockEncoder implementation.
>+Std140BlockEncoder::Std140BlockEncoder() {}
>+
>+void Std140BlockEncoder::enterAggregateType(const ShaderVariable &structVar)
> {
>-    nextRegister();
>+    align(getBaseAlignment(structVar));
> }
> 
>-void Std140BlockEncoder::exitAggregateType()
>+void Std140BlockEncoder::exitAggregateType(const ShaderVariable &structVar)
> {
>-    nextRegister();
>+    align(getBaseAlignment(structVar));
> }
> 
> void Std140BlockEncoder::getBlockLayoutInfo(GLenum type,
>@@ -156,7 +249,7 @@ void Std140BlockEncoder::getBlockLayoutInfo(GLenum type,
>                                             int *matrixStrideOut)
> {
>     // We assume we are only dealing with 4 byte components (no doubles or half-words currently)
>-    ASSERT(gl::VariableComponentSize(gl::VariableComponentType(type)) == BytesPerComponent);
>+    ASSERT(gl::VariableComponentSize(gl::VariableComponentType(type)) == kBytesPerComponent);
> 
>     size_t baseAlignment = 0;
>     int matrixStride     = 0;
>@@ -164,24 +257,24 @@ void Std140BlockEncoder::getBlockLayoutInfo(GLenum type,
> 
>     if (gl::IsMatrixType(type))
>     {
>-        baseAlignment = ComponentsPerRegister;
>-        matrixStride  = ComponentsPerRegister;
>+        baseAlignment = getTypeBaseAlignment(type, isRowMajorMatrix);
>+        matrixStride  = getTypeBaseAlignment(type, isRowMajorMatrix);
> 
>         if (!arraySizes.empty())
>         {
>             const int numRegisters = gl::MatrixRegisterCount(type, isRowMajorMatrix);
>-            arrayStride            = ComponentsPerRegister * numRegisters;
>+            arrayStride            = getTypeBaseAlignment(type, isRowMajorMatrix) * numRegisters;
>         }
>     }
>     else if (!arraySizes.empty())
>     {
>-        baseAlignment = ComponentsPerRegister;
>-        arrayStride   = ComponentsPerRegister;
>+        baseAlignment = getTypeBaseAlignment(type, false);
>+        arrayStride   = getTypeBaseAlignment(type, false);
>     }
>     else
>     {
>-        const int numComponents = gl::VariableComponentCount(type);
>-        baseAlignment           = (numComponents == 3 ? 4u : static_cast<size_t>(numComponents));
>+        const size_t numComponents = static_cast<size_t>(gl::VariableComponentCount(type));
>+        baseAlignment              = ComponentAlignment(numComponents);
>     }
> 
>     mCurrentOffset = rx::roundUp(mCurrentOffset, baseAlignment);
>@@ -202,9 +295,8 @@ void Std140BlockEncoder::advanceOffset(GLenum type,
>     }
>     else if (gl::IsMatrixType(type))
>     {
>-        ASSERT(matrixStride == ComponentsPerRegister);
>         const int numRegisters = gl::MatrixRegisterCount(type, isRowMajorMatrix);
>-        mCurrentOffset += ComponentsPerRegister * numRegisters;
>+        mCurrentOffset += matrixStride * numRegisters;
>     }
>     else
>     {
>@@ -212,70 +304,303 @@ void Std140BlockEncoder::advanceOffset(GLenum type,
>     }
> }
> 
>-template <typename VarT>
>-void GetUniformBlockInfo(const std::vector<VarT> &fields,
>+size_t Std140BlockEncoder::getBaseAlignment(const ShaderVariable &variable) const
>+{
>+    return kComponentsPerRegister;
>+}
>+
>+size_t Std140BlockEncoder::getTypeBaseAlignment(GLenum type, bool isRowMajorMatrix) const
>+{
>+    return kComponentsPerRegister;
>+}
>+
>+// Std430BlockEncoder implementation.
>+Std430BlockEncoder::Std430BlockEncoder() {}
>+
>+size_t Std430BlockEncoder::getBaseAlignment(const ShaderVariable &shaderVar) const
>+{
>+    if (shaderVar.isStruct())
>+    {
>+        BaseAlignmentVisitor visitor;
>+        TraverseShaderVariables(shaderVar.fields, false, &visitor);
>+        return visitor.getBaseAlignment();
>+    }
>+
>+    return GetStd430BaseAlignment(shaderVar.type, shaderVar.isRowMajorLayout);
>+}
>+
>+size_t Std430BlockEncoder::getTypeBaseAlignment(GLenum type, bool isRowMajorMatrix) const
>+{
>+    return GetStd430BaseAlignment(type, isRowMajorMatrix);
>+}
>+
>+void GetInterfaceBlockInfo(const std::vector<InterfaceBlockField> &fields,
>+                           const std::string &prefix,
>+                           BlockLayoutEncoder *encoder,
>+                           BlockLayoutMap *blockInfoOut)
>+{
>+    // Matrix packing is always recorded in individual fields, so they'll set the row major layout
>+    // flag to true if needed.
>+    GetInterfaceBlockInfo(fields, prefix, encoder, false, blockInfoOut);
>+}
>+
>+void GetUniformBlockInfo(const std::vector<Uniform> &uniforms,
>                          const std::string &prefix,
>-                         sh::BlockLayoutEncoder *encoder,
>-                         bool inRowMajorLayout,
>+                         BlockLayoutEncoder *encoder,
>                          BlockLayoutMap *blockInfoOut)
> {
>-    for (const VarT &field : fields)
>+    // Matrix packing is always recorded in individual fields, so they'll set the row major layout
>+    // flag to true if needed.
>+    GetInterfaceBlockInfo(uniforms, prefix, encoder, false, blockInfoOut);
>+}
>+
>+// VariableNameVisitor implementation.
>+VariableNameVisitor::VariableNameVisitor(const std::string &namePrefix,
>+                                         const std::string &mappedNamePrefix)
>+{
>+    if (!namePrefix.empty())
>     {
>-        // Skip samplers. On Vulkan we use this for the default uniform block, so samplers may be
>-        // included.
>-        if (gl::IsSamplerType(field.type))
>-        {
>-            continue;
>-        }
>+        mNameStack.push_back(namePrefix + ".");
>+    }
> 
>-        const std::string &fieldName = (prefix.empty() ? field.name : prefix + "." + field.name);
>+    if (!mappedNamePrefix.empty())
>+    {
>+        mMappedNameStack.push_back(mappedNamePrefix + ".");
>+    }
>+}
> 
>-        if (field.isStruct())
>-        {
>-            bool rowMajorLayout = (inRowMajorLayout || IsRowMajorLayout(field));
>+VariableNameVisitor::~VariableNameVisitor() = default;
> 
>-            if (field.isArray())
>-            {
>-                GetUniformBlockStructArrayMemberInfo(field, 0u, fieldName, encoder, rowMajorLayout,
>-                                                     blockInfoOut);
>-            }
>-            else
>-            {
>-                GetUniformBlockStructMemberInfo(field.fields, fieldName, encoder, rowMajorLayout,
>-                                                blockInfoOut);
>-            }
>-        }
>-        else if (field.isArrayOfArrays())
>+void VariableNameVisitor::enterStruct(const ShaderVariable &structVar)
>+{
>+    mNameStack.push_back(structVar.name);
>+    mMappedNameStack.push_back(structVar.mappedName);
>+}
>+
>+void VariableNameVisitor::exitStruct(const ShaderVariable &structVar)
>+{
>+    mNameStack.pop_back();
>+    mMappedNameStack.pop_back();
>+}
>+
>+void VariableNameVisitor::enterStructAccess(const ShaderVariable &structVar, bool isRowMajor)
>+{
>+    mNameStack.push_back(".");
>+    mMappedNameStack.push_back(".");
>+}
>+
>+void VariableNameVisitor::exitStructAccess(const ShaderVariable &structVar, bool isRowMajor)
>+{
>+    mNameStack.pop_back();
>+    mMappedNameStack.pop_back();
>+}
>+
>+void VariableNameVisitor::enterArray(const ShaderVariable &arrayVar)
>+{
>+    if (!arrayVar.hasParentArrayIndex() && !arrayVar.isStruct())
>+    {
>+        mNameStack.push_back(arrayVar.name);
>+        mMappedNameStack.push_back(arrayVar.mappedName);
>+    }
>+}
>+
>+void VariableNameVisitor::exitArray(const ShaderVariable &arrayVar)
>+{
>+    if (!arrayVar.hasParentArrayIndex() && !arrayVar.isStruct())
>+    {
>+        mNameStack.pop_back();
>+        mMappedNameStack.pop_back();
>+    }
>+}
>+
>+void VariableNameVisitor::enterArrayElement(const ShaderVariable &arrayVar,
>+                                            unsigned int arrayElement)
>+{
>+    std::stringstream strstr = sh::InitializeStream<std::stringstream>();
>+    strstr << "[" << arrayElement << "]";
>+    std::string elementString = strstr.str();
>+    mNameStack.push_back(elementString);
>+    mMappedNameStack.push_back(elementString);
>+}
>+
>+void VariableNameVisitor::exitArrayElement(const ShaderVariable &arrayVar,
>+                                           unsigned int arrayElement)
>+{
>+    mNameStack.pop_back();
>+    mMappedNameStack.pop_back();
>+}
>+
>+std::string VariableNameVisitor::collapseNameStack() const
>+{
>+    return CollapseNameStack(mNameStack);
>+}
>+
>+std::string VariableNameVisitor::collapseMappedNameStack() const
>+{
>+    return CollapseNameStack(mMappedNameStack);
>+}
>+
>+void VariableNameVisitor::visitSampler(const sh::ShaderVariable &sampler)
>+{
>+    if (!sampler.hasParentArrayIndex())
>+    {
>+        mNameStack.push_back(sampler.name);
>+        mMappedNameStack.push_back(sampler.mappedName);
>+    }
>+
>+    std::string name       = collapseNameStack();
>+    std::string mappedName = collapseMappedNameStack();
>+
>+    if (!sampler.hasParentArrayIndex())
>+    {
>+        mNameStack.pop_back();
>+        mMappedNameStack.pop_back();
>+    }
>+
>+    visitNamedSampler(sampler, name, mappedName);
>+}
>+
>+void VariableNameVisitor::visitVariable(const ShaderVariable &variable, bool isRowMajor)
>+{
>+    if (!variable.hasParentArrayIndex())
>+    {
>+        mNameStack.push_back(variable.name);
>+        mMappedNameStack.push_back(variable.mappedName);
>+    }
>+
>+    std::string name       = collapseNameStack();
>+    std::string mappedName = collapseMappedNameStack();
>+
>+    if (!variable.hasParentArrayIndex())
>+    {
>+        mNameStack.pop_back();
>+        mMappedNameStack.pop_back();
>+    }
>+
>+    visitNamedVariable(variable, isRowMajor, name, mappedName);
>+}
>+
>+// BlockEncoderVisitor implementation.
>+BlockEncoderVisitor::BlockEncoderVisitor(const std::string &namePrefix,
>+                                         const std::string &mappedNamePrefix,
>+                                         BlockLayoutEncoder *encoder)
>+    : VariableNameVisitor(namePrefix, mappedNamePrefix), mEncoder(encoder)
>+{}
>+
>+BlockEncoderVisitor::~BlockEncoderVisitor() = default;
>+
>+void BlockEncoderVisitor::enterStructAccess(const ShaderVariable &structVar, bool isRowMajor)
>+{
>+    mStructStackSize++;
>+    if (!mIsTopLevelArrayStrideReady)
>+    {
>+        size_t structSize = mEncoder->getShaderVariableSize(structVar, isRowMajor);
>+        mTopLevelArrayStride *= structSize;
>+        mIsTopLevelArrayStrideReady = true;
>+    }
>+
>+    VariableNameVisitor::enterStructAccess(structVar, isRowMajor);
>+    mEncoder->enterAggregateType(structVar);
>+}
>+
>+void BlockEncoderVisitor::exitStructAccess(const ShaderVariable &structVar, bool isRowMajor)
>+{
>+    mStructStackSize--;
>+    mEncoder->exitAggregateType(structVar);
>+    VariableNameVisitor::exitStructAccess(structVar, isRowMajor);
>+}
>+
>+void BlockEncoderVisitor::enterArrayElement(const sh::ShaderVariable &arrayVar,
>+                                            unsigned int arrayElement)
>+{
>+    if (mStructStackSize == 0 && !arrayVar.hasParentArrayIndex())
>+    {
>+        // From the ES 3.1 spec "7.3.1.1 Naming Active Resources":
>+        // For an active shader storage block member declared as an array of an aggregate type,
>+        // an entry will be generated only for the first array element, regardless of its type.
>+        // Such block members are referred to as top-level arrays. If the block member is an
>+        // aggregate type, the enumeration rules are then applied recursively.
>+        if (arrayElement == 0)
>         {
>-            bool isRowMajorMatrix = (gl::IsMatrixType(field.type) && inRowMajorLayout);
>-            GetUniformBlockArrayOfArraysMemberInfo(field, 0u, fieldName, encoder, isRowMajorMatrix,
>-                                                   blockInfoOut);
>+            mTopLevelArraySize          = arrayVar.getOutermostArraySize();
>+            mTopLevelArrayStride        = arrayVar.getInnerArraySizeProduct();
>+            mIsTopLevelArrayStrideReady = false;
>         }
>         else
>         {
>-            bool isRowMajorMatrix = (gl::IsMatrixType(field.type) && inRowMajorLayout);
>-            (*blockInfoOut)[fieldName] =
>-                encoder->encodeType(field.type, field.arraySizes, isRowMajorMatrix);
>+            mSkipEnabled = true;
>         }
>     }
>+    VariableNameVisitor::enterArrayElement(arrayVar, arrayElement);
>+}
>+
>+void BlockEncoderVisitor::exitArrayElement(const sh::ShaderVariable &arrayVar,
>+                                           unsigned int arrayElement)
>+{
>+    if (mStructStackSize == 0 && !arrayVar.hasParentArrayIndex())
>+    {
>+        mTopLevelArraySize          = 1;
>+        mTopLevelArrayStride        = 0;
>+        mIsTopLevelArrayStrideReady = true;
>+        mSkipEnabled                = false;
>+    }
>+    VariableNameVisitor::exitArrayElement(arrayVar, arrayElement);
> }
> 
>-template void GetUniformBlockInfo(const std::vector<InterfaceBlockField> &,
>-                                  const std::string &,
>-                                  sh::BlockLayoutEncoder *,
>-                                  bool,
>-                                  BlockLayoutMap *);
>+void BlockEncoderVisitor::visitNamedVariable(const ShaderVariable &variable,
>+                                             bool isRowMajor,
>+                                             const std::string &name,
>+                                             const std::string &mappedName)
>+{
>+    std::vector<unsigned int> innermostArraySize;
> 
>-template void GetUniformBlockInfo(const std::vector<Uniform> &,
>-                                  const std::string &,
>-                                  sh::BlockLayoutEncoder *,
>-                                  bool,
>-                                  BlockLayoutMap *);
>+    if (variable.isArray())
>+    {
>+        innermostArraySize.push_back(variable.getNestedArraySize(0));
>+    }
>+    BlockMemberInfo variableInfo =
>+        mEncoder->encodeType(variable.type, innermostArraySize, isRowMajor);
>+    if (!mIsTopLevelArrayStrideReady)
>+    {
>+        ASSERT(mTopLevelArrayStride);
>+        mTopLevelArrayStride *= variableInfo.arrayStride;
>+        mIsTopLevelArrayStrideReady = true;
>+    }
>+    variableInfo.topLevelArrayStride = mTopLevelArrayStride;
>+    encodeVariable(variable, variableInfo, name, mappedName);
>+}
> 
>-template void GetUniformBlockInfo(const std::vector<ShaderVariable> &,
>-                                  const std::string &,
>-                                  sh::BlockLayoutEncoder *,
>-                                  bool,
>-                                  BlockLayoutMap *);
>+void TraverseShaderVariable(const ShaderVariable &variable,
>+                            bool isRowMajorLayout,
>+                            ShaderVariableVisitor *visitor)
>+{
>+    bool rowMajorLayout = (isRowMajorLayout || variable.isRowMajorLayout);
>+    bool isRowMajor     = rowMajorLayout && gl::IsMatrixType(variable.type);
> 
>+    if (variable.isStruct())
>+    {
>+        visitor->enterStruct(variable);
>+        if (variable.isArray())
>+        {
>+            TraverseStructArrayVariable(variable, rowMajorLayout, visitor);
>+        }
>+        else
>+        {
>+            TraverseStructVariable(variable, rowMajorLayout, visitor);
>+        }
>+        visitor->exitStruct(variable);
>+    }
>+    else if (variable.isArrayOfArrays())
>+    {
>+        TraverseArrayOfArraysVariable(variable, 0u, isRowMajor, visitor);
>+    }
>+    else if (gl::IsSamplerType(variable.type))
>+    {
>+        visitor->visitSampler(variable);
>+    }
>+    else
>+    {
>+        visitor->visitVariable(variable, isRowMajor);
>+    }
>+}
> }  // namespace sh
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/blocklayout.h b/Source/ThirdParty/ANGLE/src/compiler/translator/blocklayout.h
>index 2b7acf4e60f..30d5d1c3a5e 100644
>--- a/Source/ThirdParty/ANGLE/src/compiler/translator/blocklayout.h
>+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/blocklayout.h
>@@ -14,8 +14,8 @@
> #include <map>
> #include <vector>
> 
>-#include "angle_gl.h"
> #include <GLSLANG/ShaderLang.h>
>+#include "angle_gl.h"
> 
> namespace sh
> {
>@@ -27,46 +27,52 @@ struct InterfaceBlock;
> 
> struct BlockMemberInfo
> {
>-    BlockMemberInfo()
>-        : offset(-1),
>-          arrayStride(-1),
>-          matrixStride(-1),
>-          isRowMajorMatrix(false),
>-          topLevelArrayStride(-1)
>-    {
>-    }
>+    constexpr BlockMemberInfo() = default;
> 
>-    BlockMemberInfo(int offset, int arrayStride, int matrixStride, bool isRowMajorMatrix)
>+    constexpr BlockMemberInfo(int offset, int arrayStride, int matrixStride, bool isRowMajorMatrix)
>         : offset(offset),
>           arrayStride(arrayStride),
>           matrixStride(matrixStride),
>-          isRowMajorMatrix(isRowMajorMatrix),
>-          topLevelArrayStride(-1)
>-    {
>-    }
>+          isRowMajorMatrix(isRowMajorMatrix)
>+    {}
> 
>-    BlockMemberInfo(int offset,
>-                    int arrayStride,
>-                    int matrixStride,
>-                    bool isRowMajorMatrix,
>-                    int topLevelArrayStride)
>+    constexpr BlockMemberInfo(int offset,
>+                              int arrayStride,
>+                              int matrixStride,
>+                              bool isRowMajorMatrix,
>+                              int topLevelArrayStride)
>         : offset(offset),
>           arrayStride(arrayStride),
>           matrixStride(matrixStride),
>           isRowMajorMatrix(isRowMajorMatrix),
>           topLevelArrayStride(topLevelArrayStride)
>-    {
>-    }
>+    {}
>+
>+    // A single integer identifying the offset of an active variable.
>+    int offset = -1;
> 
>-    static BlockMemberInfo getDefaultBlockInfo() { return BlockMemberInfo(-1, -1, -1, false, -1); }
>+    // A single integer identifying the stride between array elements in an active variable.
>+    int arrayStride = -1;
> 
>-    int offset;
>-    int arrayStride;
>-    int matrixStride;
>-    bool isRowMajorMatrix;
>-    int topLevelArrayStride;  // Only used for shader storage block members.
>+    // A single integer identifying the stride between columns of a column-major matrix or rows of a
>+    // row-major matrix.
>+    int matrixStride = -1;
>+
>+    // A single integer identifying whether an active variable is a row-major matrix.
>+    bool isRowMajorMatrix = false;
>+
>+    // A single integer identifying the number of active array elements of the top-level shader
>+    // storage block member containing the active variable.
>+    int topLevelArrayStride = -1;
> };
> 
>+constexpr size_t ComponentAlignment(size_t numComponents)
>+{
>+    return (numComponents == 3u ? 4u : numComponents);
>+}
>+
>+constexpr BlockMemberInfo kDefaultBlockMemberInfo;
>+
> class BlockLayoutEncoder
> {
>   public:
>@@ -77,21 +83,21 @@ class BlockLayoutEncoder
>                                const std::vector<unsigned int> &arraySizes,
>                                bool isRowMajorMatrix);
> 
>-    size_t getBlockSize() const { return mCurrentOffset * BytesPerComponent; }
>+    size_t getCurrentOffset() const { return mCurrentOffset * kBytesPerComponent; }
>+    size_t getShaderVariableSize(const ShaderVariable &structVar, bool isRowMajor);
> 
>-    virtual void enterAggregateType() = 0;
>-    virtual void exitAggregateType()  = 0;
>+    // Called when entering/exiting a structure variable.
>+    virtual void enterAggregateType(const ShaderVariable &structVar) = 0;
>+    virtual void exitAggregateType(const ShaderVariable &structVar)  = 0;
> 
>-    static const size_t BytesPerComponent           = 4u;
>-    static const unsigned int ComponentsPerRegister = 4u;
>+    static constexpr size_t kBytesPerComponent           = 4u;
>+    static constexpr unsigned int kComponentsPerRegister = 4u;
> 
>-    static size_t getBlockRegister(const BlockMemberInfo &info);
>-    static size_t getBlockRegisterElement(const BlockMemberInfo &info);
>+    static size_t GetBlockRegister(const BlockMemberInfo &info);
>+    static size_t GetBlockRegisterElement(const BlockMemberInfo &info);
> 
>   protected:
>-    size_t mCurrentOffset;
>-
>-    void nextRegister();
>+    void align(size_t baseAlignment);
> 
>     virtual void getBlockLayoutInfo(GLenum type,
>                                     const std::vector<unsigned int> &arraySizes,
>@@ -103,6 +109,32 @@ class BlockLayoutEncoder
>                                bool isRowMajorMatrix,
>                                int arrayStride,
>                                int matrixStride)          = 0;
>+
>+    size_t mCurrentOffset;
>+};
>+
>+// Will return default values for everything.
>+class DummyBlockEncoder : public BlockLayoutEncoder
>+{
>+  public:
>+    DummyBlockEncoder() = default;
>+
>+    void enterAggregateType(const ShaderVariable &structVar) override {}
>+    void exitAggregateType(const ShaderVariable &structVar) override {}
>+
>+  protected:
>+    void getBlockLayoutInfo(GLenum type,
>+                            const std::vector<unsigned int> &arraySizes,
>+                            bool isRowMajorMatrix,
>+                            int *arrayStrideOut,
>+                            int *matrixStrideOut) override;
>+
>+    void advanceOffset(GLenum type,
>+                       const std::vector<unsigned int> &arraySizes,
>+                       bool isRowMajorMatrix,
>+                       int arrayStride,
>+                       int matrixStride) override
>+    {}
> };
> 
> // Block layout according to the std140 block layout
>@@ -113,8 +145,8 @@ class Std140BlockEncoder : public BlockLayoutEncoder
>   public:
>     Std140BlockEncoder();
> 
>-    void enterAggregateType() override;
>-    void exitAggregateType() override;
>+    void enterAggregateType(const ShaderVariable &structVar) override;
>+    void exitAggregateType(const ShaderVariable &structVar) override;
> 
>   protected:
>     void getBlockLayoutInfo(GLenum type,
>@@ -127,18 +159,144 @@ class Std140BlockEncoder : public BlockLayoutEncoder
>                        bool isRowMajorMatrix,
>                        int arrayStride,
>                        int matrixStride) override;
>+
>+    virtual size_t getBaseAlignment(const ShaderVariable &variable) const;
>+    virtual size_t getTypeBaseAlignment(GLenum type, bool isRowMajorMatrix) const;
>+};
>+
>+class Std430BlockEncoder : public Std140BlockEncoder
>+{
>+  public:
>+    Std430BlockEncoder();
>+
>+  protected:
>+    size_t getBaseAlignment(const ShaderVariable &variable) const override;
>+    size_t getTypeBaseAlignment(GLenum type, bool isRowMajorMatrix) const override;
> };
> 
> using BlockLayoutMap = std::map<std::string, BlockMemberInfo>;
> 
>-// Only valid to call with ShaderVariable, InterfaceBlockField and Uniform.
>-template <typename VarT>
>-void GetUniformBlockInfo(const std::vector<VarT> &fields,
>+void GetInterfaceBlockInfo(const std::vector<InterfaceBlockField> &fields,
>+                           const std::string &prefix,
>+                           BlockLayoutEncoder *encoder,
>+                           BlockLayoutMap *blockInfoOut);
>+
>+// Used for laying out the default uniform block on the Vulkan backend.
>+void GetUniformBlockInfo(const std::vector<Uniform> &uniforms,
>                          const std::string &prefix,
>-                         sh::BlockLayoutEncoder *encoder,
>-                         bool inRowMajorLayout,
>-                         BlockLayoutMap *blockLayoutMap);
>+                         BlockLayoutEncoder *encoder,
>+                         BlockLayoutMap *blockInfoOut);
>+
>+class ShaderVariableVisitor
>+{
>+  public:
>+    virtual ~ShaderVariableVisitor() {}
>+
>+    virtual void enterStruct(const ShaderVariable &structVar) {}
>+    virtual void exitStruct(const ShaderVariable &structVar) {}
>+
>+    virtual void enterStructAccess(const ShaderVariable &structVar, bool isRowMajor) {}
>+    virtual void exitStructAccess(const ShaderVariable &structVar, bool isRowMajor) {}
>+
>+    virtual void enterArray(const ShaderVariable &arrayVar) {}
>+    virtual void exitArray(const ShaderVariable &arrayVar) {}
>+
>+    virtual void enterArrayElement(const ShaderVariable &arrayVar, unsigned int arrayElement) {}
>+    virtual void exitArrayElement(const ShaderVariable &arrayVar, unsigned int arrayElement) {}
>+
>+    virtual void visitSampler(const sh::ShaderVariable &sampler) {}
>+
>+    virtual void visitVariable(const ShaderVariable &variable, bool isRowMajor) = 0;
>+
>+  protected:
>+    ShaderVariableVisitor() {}
>+};
>+
>+class VariableNameVisitor : public ShaderVariableVisitor
>+{
>+  public:
>+    VariableNameVisitor(const std::string &namePrefix, const std::string &mappedNamePrefix);
>+    ~VariableNameVisitor() override;
>+
>+    void enterStruct(const ShaderVariable &structVar) override;
>+    void exitStruct(const ShaderVariable &structVar) override;
>+    void enterStructAccess(const ShaderVariable &structVar, bool isRowMajor) override;
>+    void exitStructAccess(const ShaderVariable &structVar, bool isRowMajor) override;
>+    void enterArray(const ShaderVariable &arrayVar) override;
>+    void exitArray(const ShaderVariable &arrayVar) override;
>+    void enterArrayElement(const ShaderVariable &arrayVar, unsigned int arrayElement) override;
>+    void exitArrayElement(const ShaderVariable &arrayVar, unsigned int arrayElement) override;
> 
>+  protected:
>+    virtual void visitNamedSampler(const sh::ShaderVariable &sampler,
>+                                   const std::string &name,
>+                                   const std::string &mappedName)
>+    {}
>+    virtual void visitNamedVariable(const ShaderVariable &variable,
>+                                    bool isRowMajor,
>+                                    const std::string &name,
>+                                    const std::string &mappedName) = 0;
>+
>+    std::string collapseNameStack() const;
>+    std::string collapseMappedNameStack() const;
>+
>+  private:
>+    void visitSampler(const sh::ShaderVariable &sampler) final;
>+    void visitVariable(const ShaderVariable &variable, bool isRowMajor) final;
>+
>+    std::vector<std::string> mNameStack;
>+    std::vector<std::string> mMappedNameStack;
>+};
>+
>+class BlockEncoderVisitor : public VariableNameVisitor
>+{
>+  public:
>+    BlockEncoderVisitor(const std::string &namePrefix,
>+                        const std::string &mappedNamePrefix,
>+                        BlockLayoutEncoder *encoder);
>+    ~BlockEncoderVisitor() override;
>+
>+    void enterStructAccess(const ShaderVariable &structVar, bool isRowMajor) override;
>+    void exitStructAccess(const ShaderVariable &structVar, bool isRowMajor) override;
>+    void enterArrayElement(const ShaderVariable &arrayVar, unsigned int arrayElement) override;
>+    void exitArrayElement(const ShaderVariable &arrayVar, unsigned int arrayElement) override;
>+
>+    void visitNamedVariable(const ShaderVariable &variable,
>+                            bool isRowMajor,
>+                            const std::string &name,
>+                            const std::string &mappedName) override;
>+
>+    virtual void encodeVariable(const ShaderVariable &variable,
>+                                const BlockMemberInfo &variableInfo,
>+                                const std::string &name,
>+                                const std::string &mappedName)
>+    {}
>+
>+  protected:
>+    int mTopLevelArraySize           = 1;
>+    int mTopLevelArrayStride         = 0;
>+    bool mIsTopLevelArrayStrideReady = true;
>+    bool mSkipEnabled                = false;
>+
>+  private:
>+    BlockLayoutEncoder *mEncoder;
>+    unsigned int mStructStackSize = 0;
>+};
>+
>+void TraverseShaderVariable(const ShaderVariable &variable,
>+                            bool isRowMajorLayout,
>+                            ShaderVariableVisitor *visitor);
>+
>+template <typename T>
>+void TraverseShaderVariables(const std::vector<T> &vars,
>+                             bool isRowMajorLayout,
>+                             ShaderVariableVisitor *visitor)
>+{
>+    for (const T &var : vars)
>+    {
>+        TraverseShaderVariable(var, isRowMajorLayout, visitor);
>+    }
>+}
> }  // namespace sh
> 
> #endif  // COMMON_BLOCKLAYOUT_H_
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/blocklayoutHLSL.cpp b/Source/ThirdParty/ANGLE/src/compiler/translator/blocklayoutHLSL.cpp
>index 867821f1ead..dde403699ce 100644
>--- a/Source/ThirdParty/ANGLE/src/compiler/translator/blocklayoutHLSL.cpp
>+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/blocklayoutHLSL.cpp
>@@ -17,17 +17,14 @@ namespace sh
> 
> HLSLBlockEncoder::HLSLBlockEncoder(HLSLBlockEncoderStrategy strategy, bool transposeMatrices)
>     : mEncoderStrategy(strategy), mTransposeMatrices(transposeMatrices)
>-{
>-}
>+{}
> 
>-void HLSLBlockEncoder::enterAggregateType()
>+void HLSLBlockEncoder::enterAggregateType(const ShaderVariable &structVar)
> {
>-    nextRegister();
>+    align(kComponentsPerRegister);
> }
> 
>-void HLSLBlockEncoder::exitAggregateType()
>-{
>-}
>+void HLSLBlockEncoder::exitAggregateType(const ShaderVariable &structVar) {}
> 
> void HLSLBlockEncoder::getBlockLayoutInfo(GLenum typeIn,
>                                           const std::vector<unsigned int> &arraySizes,
>@@ -38,7 +35,7 @@ void HLSLBlockEncoder::getBlockLayoutInfo(GLenum typeIn,
>     GLenum type = (mTransposeMatrices ? gl::TransposeMatrixType(typeIn) : typeIn);
> 
>     // We assume we are only dealing with 4 byte components (no doubles or half-words currently)
>-    ASSERT(gl::VariableComponentSize(gl::VariableComponentType(type)) == BytesPerComponent);
>+    ASSERT(gl::VariableComponentSize(gl::VariableComponentType(type)) == kBytesPerComponent);
> 
>     int matrixStride = 0;
>     int arrayStride  = 0;
>@@ -48,29 +45,29 @@ void HLSLBlockEncoder::getBlockLayoutInfo(GLenum typeIn,
>     // register
>     if (!isPacked() || gl::IsMatrixType(type) || !arraySizes.empty())
>     {
>-        nextRegister();
>+        align(kComponentsPerRegister);
>     }
> 
>     if (gl::IsMatrixType(type))
>     {
>-        matrixStride = ComponentsPerRegister;
>+        matrixStride = kComponentsPerRegister;
> 
>         if (!arraySizes.empty())
>         {
>             const int numRegisters = gl::MatrixRegisterCount(type, isRowMajorMatrix);
>-            arrayStride            = ComponentsPerRegister * numRegisters;
>+            arrayStride            = kComponentsPerRegister * numRegisters;
>         }
>     }
>     else if (!arraySizes.empty())
>     {
>-        arrayStride = ComponentsPerRegister;
>+        arrayStride = kComponentsPerRegister;
>     }
>     else if (isPacked())
>     {
>         int numComponents = gl::VariableComponentCount(type);
>-        if ((numComponents + (mCurrentOffset % ComponentsPerRegister)) > ComponentsPerRegister)
>+        if ((numComponents + (mCurrentOffset % kComponentsPerRegister)) > kComponentsPerRegister)
>         {
>-            nextRegister();
>+            align(kComponentsPerRegister);
>         }
>     }
> 
>@@ -88,15 +85,19 @@ void HLSLBlockEncoder::advanceOffset(GLenum typeIn,
> 
>     if (!arraySizes.empty())
>     {
>-        mCurrentOffset += arrayStride * (gl::ArraySizeProduct(arraySizes) - 1);
>+        unsigned int arraySize = gl::ArraySizeProduct(arraySizes);
>+        if (arraySize > 0)
>+        {
>+            mCurrentOffset += arrayStride * (arraySize - 1);
>+        }
>     }
> 
>     if (gl::IsMatrixType(type))
>     {
>-        ASSERT(matrixStride == ComponentsPerRegister);
>+        ASSERT(matrixStride == kComponentsPerRegister);
>         const int numRegisters  = gl::MatrixRegisterCount(type, isRowMajorMatrix);
>         const int numComponents = gl::MatrixComponentCount(type, isRowMajorMatrix);
>-        mCurrentOffset += ComponentsPerRegister * (numRegisters - 1);
>+        mCurrentOffset += kComponentsPerRegister * (numRegisters - 1);
>         mCurrentOffset += numComponents;
>     }
>     else if (isPacked())
>@@ -105,13 +106,13 @@ void HLSLBlockEncoder::advanceOffset(GLenum typeIn,
>     }
>     else
>     {
>-        mCurrentOffset += ComponentsPerRegister;
>+        mCurrentOffset += kComponentsPerRegister;
>     }
> }
> 
> void HLSLBlockEncoder::skipRegisters(unsigned int numRegisters)
> {
>-    mCurrentOffset += (numRegisters * ComponentsPerRegister);
>+    mCurrentOffset += (numRegisters * kComponentsPerRegister);
> }
> 
> HLSLBlockEncoder::HLSLBlockEncoderStrategy HLSLBlockEncoder::GetStrategyFor(
>@@ -137,14 +138,14 @@ void HLSLVariableRegisterCount(const ShaderVarType &variable, HLSLBlockEncoder *
>     {
>         for (size_t arrayElement = 0; arrayElement < variable.getArraySizeProduct(); arrayElement++)
>         {
>-            encoder->enterAggregateType();
>+            encoder->enterAggregateType(variable);
> 
>-            for (size_t fieldIndex = 0; fieldIndex < variable.fields.size(); fieldIndex++)
>+            for (const ShaderVariable &field : variable.fields)
>             {
>-                HLSLVariableRegisterCount(variable.fields[fieldIndex], encoder);
>+                HLSLVariableRegisterCount(field, encoder);
>             }
> 
>-            encoder->exitAggregateType();
>+            encoder->exitAggregateType(variable);
>         }
>     }
>     else
>@@ -159,8 +160,8 @@ unsigned int HLSLVariableRegisterCount(const Uniform &variable, ShShaderOutput o
>     HLSLBlockEncoder encoder(HLSLBlockEncoder::GetStrategyFor(outputType), true);
>     HLSLVariableRegisterCount(variable, &encoder);
> 
>-    const size_t registerBytes = (encoder.BytesPerComponent * encoder.ComponentsPerRegister);
>-    return static_cast<unsigned int>(rx::roundUp<size_t>(encoder.getBlockSize(), registerBytes) /
>-                                     registerBytes);
>+    const size_t registerBytes = (encoder.kBytesPerComponent * encoder.kComponentsPerRegister);
>+    return static_cast<unsigned int>(
>+        rx::roundUp<size_t>(encoder.getCurrentOffset(), registerBytes) / registerBytes);
> }
> }  // namespace sh
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/blocklayoutHLSL.h b/Source/ThirdParty/ANGLE/src/compiler/translator/blocklayoutHLSL.h
>index 8f4a51a9068..98d93fccb08 100644
>--- a/Source/ThirdParty/ANGLE/src/compiler/translator/blocklayoutHLSL.h
>+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/blocklayoutHLSL.h
>@@ -13,9 +13,9 @@
> #include <cstddef>
> #include <vector>
> 
>+#include <GLSLANG/ShaderLang.h>
> #include "angle_gl.h"
> #include "blocklayout.h"
>-#include <GLSLANG/ShaderLang.h>
> 
> namespace sh
> {
>@@ -35,8 +35,8 @@ class HLSLBlockEncoder : public BlockLayoutEncoder
> 
>     HLSLBlockEncoder(HLSLBlockEncoderStrategy strategy, bool transposeMatrices);
> 
>-    void enterAggregateType() override;
>-    void exitAggregateType() override;
>+    void enterAggregateType(const ShaderVariable &structVar) override;
>+    void exitAggregateType(const ShaderVariable &structVar) override;
>     void skipRegisters(unsigned int numRegisters);
> 
>     bool isPacked() const { return mEncoderStrategy == ENCODE_PACKED; }
>@@ -63,6 +63,6 @@ class HLSLBlockEncoder : public BlockLayoutEncoder
> // HLSLBlockEncoder class to count the number of used registers in a struct (which are individually
> // packed according to the same rules).
> unsigned int HLSLVariableRegisterCount(const Uniform &variable, ShShaderOutput outputType);
>-}
>+}  // namespace sh
> 
> #endif  // COMMON_BLOCKLAYOUTHLSL_H_
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/builtin_function_declarations.txt b/Source/ThirdParty/ANGLE/src/compiler/translator/builtin_function_declarations.txt
>new file mode 100644
>index 00000000000..ce6ccb4cb07
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/builtin_function_declarations.txt
>@@ -0,0 +1,593 @@
>+// The format of this file:
>+//   C++ style single-line comments are supported.
>+//   Leading whitespace is only for formatting and doesn't have semantic meaning.
>+//
>+//   Grouping:
>+//   Groups of functions are denoted by "GROUP BEGIN" and "GROUP END". Groups can be nested.
>+//   Groups can have metadata related to the group itself. This is given at the end of the GROUP
>+//   BEGIN line in JSON object format.
>+//   Example:
>+//     GROUP BEGIN <group name> {"condition": "shaderType == GL_FRAGMENT_SHADER"}
>+//     GROUP END <group name>
>+//
>+//   Defaults:
>+//   Default metadata for functions can be set with "DEFAULT METADATA" followed by metadata in JSON
>+//   object format. The metadata is applied to all following functions regardless of grouping until
>+//   another "DEFAULT METADATA" line is encountered, or until the end of a top-level group.
>+//   Example:
>+//     DEFAULT METADATA {"op": "CallBuiltInFunction"}
>+//
>+//   Supported function metadata properties are:
>+//     "level"
>+//         string, one of COMMON_BUILTINS, ESSL1_BUILTINS, ESSL3_BUILTINS and ESSL3_1_BUILTINS.
>+//     "op"
>+//         string, either EOp code or "auto", in which case the op is derived from the function
>+//         name.
>+//     "suffix"
>+//         string, suffix that is used to disambiguate C++ variable names created based on the
>+//         function name from C++ keywords, or disambiguate two functions with the same name.
>+//     "extension"
>+//         string, GLSL extension where the function is defined.
>+//     "hasSideEffects"
>+//         boolean, can be used to mark a function as having side effects even if it has op other
>+//         than CallBuiltInFunction and it doesn't have out parameters. In case the op is
>+//         CallBuiltInFunction or the function has out parameters it is automatically treated as
>+//         having side effects.
>+//
>+//   Function declarations:
>+//   Lines that declare functions are in a similar format as in the GLSL spec:
>+//     <return type> <function name>(<param type>, ...);
>+//   Parameter types can have "out" or "inout" qualifiers.
>+
>+GROUP BEGIN Trigonometric
>+  DEFAULT METADATA {"level": "COMMON_BUILTINS", "op": "auto"}
>+    genType radians(genType);
>+    genType degrees(genType);
>+    genType sin(genType);
>+    genType cos(genType);
>+    genType tan(genType);
>+    genType asin(genType);
>+    genType acos(genType);
>+    genType atan(genType, genType);
>+    genType atan(genType);
>+  DEFAULT METADATA {"level": "ESSL3_BUILTINS", "op": "auto"}
>+    genType sinh(genType);
>+    genType cosh(genType);
>+    genType tanh(genType);
>+    genType asinh(genType);
>+    genType acosh(genType);
>+    genType atanh(genType);
>+GROUP END Trigonometric
>+
>+GROUP BEGIN Exponential
>+  DEFAULT METADATA {"level": "COMMON_BUILTINS", "op": "auto"}
>+    genType pow(genType, genType);
>+    genType exp(genType);
>+    genType log(genType);
>+    genType exp2(genType);
>+    genType log2(genType);
>+    genType sqrt(genType);
>+    genType inversesqrt(genType);
>+GROUP END Exponential
>+
>+GROUP BEGIN Common
>+  DEFAULT METADATA {"level": "COMMON_BUILTINS", "op": "auto"}
>+    genType abs(genType);
>+  DEFAULT METADATA {"level": "ESSL3_BUILTINS", "op": "auto"}
>+    genIType abs(genIType);
>+  DEFAULT METADATA {"level": "COMMON_BUILTINS", "op": "auto"}
>+    genType sign(genType);
>+  DEFAULT METADATA {"level": "ESSL3_BUILTINS", "op": "auto"}
>+    genIType sign(genIType);
>+  DEFAULT METADATA {"level": "COMMON_BUILTINS", "op": "auto"}
>+    genType floor(genType);
>+  DEFAULT METADATA {"level": "ESSL3_BUILTINS", "op": "auto"}
>+    genType trunc(genType);
>+    genType round(genType);
>+    genType roundEven(genType);
>+  DEFAULT METADATA {"level": "COMMON_BUILTINS", "op": "auto"}
>+    genType ceil(genType);
>+    genType fract(genType);
>+    genType mod(genType, float);
>+    genType mod(genType, genType);
>+    genType min(genType, float);
>+    genType min(genType, genType);
>+  DEFAULT METADATA {"level": "ESSL3_BUILTINS", "op": "auto"}
>+    genIType min(genIType, genIType);
>+    genIType min(genIType, int);
>+    genUType min(genUType, genUType);
>+    genUType min(genUType, uint);
>+  DEFAULT METADATA {"level": "COMMON_BUILTINS", "op": "auto"}
>+    genType max(genType, float);
>+    genType max(genType, genType);
>+  DEFAULT METADATA {"level": "ESSL3_BUILTINS", "op": "auto"}
>+    genIType max(genIType, genIType);
>+    genIType max(genIType, int);
>+    genUType max(genUType, genUType);
>+    genUType max(genUType, uint);
>+  DEFAULT METADATA {"level": "COMMON_BUILTINS", "op": "auto"}
>+    genType clamp(genType, float, float);
>+    genType clamp(genType, genType, genType);
>+  DEFAULT METADATA {"level": "ESSL3_BUILTINS", "op": "auto"}
>+    genIType clamp(genIType, int, int);
>+    genIType clamp(genIType, genIType, genIType);
>+    genUType clamp(genUType, uint, uint);
>+    genUType clamp(genUType, genUType, genUType);
>+  DEFAULT METADATA {"level": "COMMON_BUILTINS", "op": "auto"}
>+    genType mix(genType, genType, float);
>+    genType mix(genType, genType, genType);
>+  DEFAULT METADATA {"level": "ESSL3_BUILTINS", "op": "auto"}
>+    genType mix(genType, genType, genBType);
>+  DEFAULT METADATA {"level": "COMMON_BUILTINS", "op": "auto"}
>+    genType step(genType, genType);
>+    genType step(float, genType);
>+    genType smoothstep(genType, genType, genType);
>+    genType smoothstep(float, float, genType);
>+  DEFAULT METADATA {"level": "ESSL3_BUILTINS", "op": "auto"}
>+    genType modf(genType, out genType);
>+    genBType isnan(genType);
>+    genBType isinf(genType);
>+    genIType floatBitsToInt(genType);
>+    genUType floatBitsToUint(genType);
>+    genType intBitsToFloat(genIType);
>+    genType uintBitsToFloat(genUType);
>+  DEFAULT METADATA {"level": "ESSL3_1_BUILTINS", "op": "auto"}
>+    genType frexp(genType, out genIType);
>+    genType ldexp(genType, genIType);
>+  DEFAULT METADATA {"level": "ESSL3_BUILTINS", "op": "auto"}
>+    uint packSnorm2x16(vec2);
>+    uint packUnorm2x16(vec2);
>+    uint packHalf2x16(vec2);
>+    vec2 unpackSnorm2x16(uint);
>+    vec2 unpackUnorm2x16(uint);
>+    vec2 unpackHalf2x16(uint);
>+  DEFAULT METADATA {"level": "ESSL3_1_BUILTINS", "op": "auto"}
>+    uint packUnorm4x8(vec4);
>+    uint packSnorm4x8(vec4);
>+    vec4 unpackUnorm4x8(uint);
>+    vec4 unpackSnorm4x8(uint);
>+GROUP END Common
>+
>+GROUP BEGIN Geometric
>+  DEFAULT METADATA {"level": "COMMON_BUILTINS", "op": "auto"}
>+    float length(genType);
>+    float distance(genType, genType);
>+    float dot(genType, genType);
>+    vec3 cross(vec3, vec3);
>+    genType normalize(genType);
>+    genType faceforward(genType, genType, genType);
>+    genType reflect(genType, genType);
>+    genType refract(genType, genType, float);
>+GROUP END Geometric
>+
>+GROUP BEGIN Matrix
>+  DEFAULT METADATA {"level": "COMMON_BUILTINS", "op": "MulMatrixComponentWise"}
>+    mat2 matrixCompMult(mat2, mat2);
>+    mat3 matrixCompMult(mat3, mat3);
>+    mat4 matrixCompMult(mat4, mat4);
>+  DEFAULT METADATA {"level": "ESSL3_BUILTINS", "op": "MulMatrixComponentWise"}
>+    mat2x3 matrixCompMult(mat2x3, mat2x3);
>+    mat3x2 matrixCompMult(mat3x2, mat3x2);
>+    mat2x4 matrixCompMult(mat2x4, mat2x4);
>+    mat4x2 matrixCompMult(mat4x2, mat4x2);
>+    mat3x4 matrixCompMult(mat3x4, mat3x4);
>+    mat4x3 matrixCompMult(mat4x3, mat4x3);
>+  DEFAULT METADATA {"level": "ESSL3_BUILTINS", "op": "auto"}
>+    mat2 outerProduct(vec2, vec2);
>+    mat3 outerProduct(vec3, vec3);
>+    mat4 outerProduct(vec4, vec4);
>+    mat2x3 outerProduct(vec3, vec2);
>+    mat3x2 outerProduct(vec2, vec3);
>+    mat2x4 outerProduct(vec4, vec2);
>+    mat4x2 outerProduct(vec2, vec4);
>+    mat3x4 outerProduct(vec4, vec3);
>+    mat4x3 outerProduct(vec3, vec4);
>+    mat2 transpose(mat2);
>+    mat3 transpose(mat3);
>+    mat4 transpose(mat4);
>+    mat2x3 transpose(mat3x2);
>+    mat3x2 transpose(mat2x3);
>+    mat2x4 transpose(mat4x2);
>+    mat4x2 transpose(mat2x4);
>+    mat3x4 transpose(mat4x3);
>+    mat4x3 transpose(mat3x4);
>+    float determinant(mat2);
>+    float determinant(mat3);
>+    float determinant(mat4);
>+    mat2 inverse(mat2);
>+    mat3 inverse(mat3);
>+    mat4 inverse(mat4);
>+GROUP END Matrix
>+
>+GROUP BEGIN Vector
>+  DEFAULT METADATA {"level": "COMMON_BUILTINS", "op": "LessThanComponentWise"}
>+    bvec lessThan(vec, vec);
>+    bvec lessThan(ivec, ivec);
>+  DEFAULT METADATA {"level": "ESSL3_BUILTINS", "op": "LessThanComponentWise"}
>+    bvec lessThan(uvec, uvec);
>+  DEFAULT METADATA {"level": "COMMON_BUILTINS", "op": "LessThanEqualComponentWise"}
>+    bvec lessThanEqual(vec, vec);
>+    bvec lessThanEqual(ivec, ivec);
>+  DEFAULT METADATA {"level": "ESSL3_BUILTINS", "op": "LessThanEqualComponentWise"}
>+    bvec lessThanEqual(uvec, uvec);
>+  DEFAULT METADATA {"level": "COMMON_BUILTINS", "op": "GreaterThanComponentWise"}
>+    bvec greaterThan(vec, vec);
>+    bvec greaterThan(ivec, ivec);
>+  DEFAULT METADATA {"level": "ESSL3_BUILTINS", "op": "GreaterThanComponentWise"}
>+    bvec greaterThan(uvec, uvec);
>+  DEFAULT METADATA {"level": "COMMON_BUILTINS", "op": "GreaterThanEqualComponentWise"}
>+    bvec greaterThanEqual(vec, vec);
>+    bvec greaterThanEqual(ivec, ivec);
>+  DEFAULT METADATA {"level": "ESSL3_BUILTINS", "op": "GreaterThanEqualComponentWise"}
>+    bvec greaterThanEqual(uvec, uvec);
>+  DEFAULT METADATA {"level": "COMMON_BUILTINS", "op": "EqualComponentWise"}
>+    bvec equal(vec, vec);
>+    bvec equal(ivec, ivec);
>+  DEFAULT METADATA {"level": "ESSL3_BUILTINS", "op": "EqualComponentWise"}
>+    bvec equal(uvec, uvec);
>+  DEFAULT METADATA {"level": "COMMON_BUILTINS", "op": "EqualComponentWise"}
>+    bvec equal(bvec, bvec);
>+  DEFAULT METADATA {"level": "COMMON_BUILTINS", "op": "NotEqualComponentWise"}
>+    bvec notEqual(vec, vec);
>+    bvec notEqual(ivec, ivec);
>+  DEFAULT METADATA {"level": "ESSL3_BUILTINS", "op": "NotEqualComponentWise"}
>+    bvec notEqual(uvec, uvec);
>+  DEFAULT METADATA {"level": "COMMON_BUILTINS", "op": "NotEqualComponentWise"}
>+    bvec notEqual(bvec, bvec);
>+  DEFAULT METADATA {"level": "COMMON_BUILTINS", "op": "auto"}
>+    bool any(bvec);
>+    bool all(bvec);
>+  DEFAULT METADATA {"level": "COMMON_BUILTINS", "op": "LogicalNotComponentWise", "suffix": "Func"}
>+    bvec not(bvec);
>+GROUP END Vector
>+
>+GROUP BEGIN Integer
>+  DEFAULT METADATA {"level": "ESSL3_1_BUILTINS", "op": "auto"}
>+    genIType bitfieldExtract(genIType, int, int);
>+    genUType bitfieldExtract(genUType, int, int);
>+    genIType bitfieldInsert(genIType, genIType, int, int);
>+    genUType bitfieldInsert(genUType, genUType, int, int);
>+    genIType bitfieldReverse(genIType);
>+    genUType bitfieldReverse(genUType);
>+    genIType bitCount(genIType);
>+    genIType bitCount(genUType);
>+    genIType findLSB(genIType);
>+    genIType findLSB(genUType);
>+    genIType findMSB(genIType);
>+    genIType findMSB(genUType);
>+    genUType uaddCarry(genUType, genUType, out genUType);
>+    genUType usubBorrow(genUType, genUType, out genUType);
>+    void umulExtended(genUType, genUType, out genUType, out genUType);
>+    void imulExtended(genIType, genIType, out genIType, out genIType);
>+GROUP END Integer
>+
>+GROUP BEGIN TextureESSL100
>+  DEFAULT METADATA {"level": "ESSL1_BUILTINS", "op": "CallBuiltInFunction"}
>+    vec4 texture2D(sampler2D, vec2);
>+    vec4 texture2DProj(sampler2D, vec3);
>+    vec4 texture2DProj(sampler2D, vec4);
>+    vec4 textureCube(samplerCube, vec3);
>+GROUP END TextureESSL100
>+
>+// These are extension functions from OES_EGL_image_external and
>+// NV_EGL_stream_consumer_external. We don't have a way to mark a built-in with two alternative
>+// extensions, so these are marked with none. This is fine, since these functions overload core
>+// function names and the functions require a samplerExternalOES parameter, which can only be
>+// created if one of the extensions is enabled.
>+// TODO(oetuaho): Consider implementing a cleaner solution.
>+GROUP BEGIN EGL_image_external
>+  DEFAULT METADATA {"level": "ESSL1_BUILTINS", "op": "CallBuiltInFunction"}
>+    vec4 texture2D(samplerExternalOES, vec2);
>+    vec4 texture2DProj(samplerExternalOES, vec3);
>+    vec4 texture2DProj(samplerExternalOES, vec4);
>+GROUP END EGL_image_external
>+
>+GROUP BEGIN ARB_texture_rectangle
>+  DEFAULT METADATA {"level": "ESSL1_BUILTINS", "op": "CallBuiltInFunction", "extension": "ARB_texture_rectangle"}
>+    vec4 texture2DRect(sampler2DRect, vec2);
>+    vec4 texture2DRectProj(sampler2DRect, vec3);
>+    vec4 texture2DRectProj(sampler2DRect, vec4);
>+  DEFAULT METADATA {"level": "ESSL3_BUILTINS", "op": "CallBuiltInFunction", "extension": "ARB_texture_rectangle"}
>+    // We don't have a rectangle texture extension for OpenGL ES however based on the behavior of
>+    // rectangle texture in desktop OpenGL, they should be sampled with a "texture" overload in
>+    // GLSL version that have such an overload. This is the case for ESSL3 and above.
>+    vec4 texture(sampler2DRect, vec2);
>+    vec4 textureProj(sampler2DRect, vec3);
>+    vec4 textureProj(sampler2DRect, vec4);
>+GROUP END ARB_texture_rectangle
>+
>+// The *Grad* variants are new to both vertex and fragment shaders; the fragment
>+// shader specific pieces are added separately below.
>+GROUP BEGIN EXT_shader_texture_lod
>+  DEFAULT METADATA {"level": "ESSL1_BUILTINS", "op": "CallBuiltInFunction", "extension": "EXT_shader_texture_lod"}
>+    vec4 texture2DGradEXT(sampler2D, vec2, vec2, vec2);
>+    vec4 texture2DProjGradEXT(sampler2D, vec3, vec2, vec2);
>+    vec4 texture2DProjGradEXT(sampler2D, vec4, vec2, vec2);
>+    vec4 textureCubeGradEXT(samplerCube, vec3, vec3, vec3);
>+GROUP END EXT_shader_texture_lod
>+
>+GROUP BEGIN TextureESSL100FS {"condition": "shaderType == GL_FRAGMENT_SHADER"}
>+  DEFAULT METADATA {"level": "ESSL1_BUILTINS", "op": "CallBuiltInFunction"}
>+    vec4 texture2D(sampler2D, vec2, float);
>+    vec4 texture2DProj(sampler2D, vec3, float);
>+    vec4 texture2DProj(sampler2D, vec4, float);
>+    vec4 textureCube(samplerCube, vec3, float);
>+  DEFAULT METADATA {"level": "ESSL1_BUILTINS", "op": "auto", "extension": "OES_standard_derivatives", "hasSideEffects": "true", "suffix": "Ext"}
>+    genType dFdx(genType);
>+    genType dFdy(genType);
>+    genType fwidth(genType);
>+  DEFAULT METADATA {"level": "ESSL1_BUILTINS", "op": "CallBuiltInFunction", "extension": "EXT_shader_texture_lod"}
>+    vec4 texture2DLodEXT(sampler2D, vec2, float);
>+    vec4 texture2DProjLodEXT(sampler2D, vec3, float);
>+    vec4 texture2DProjLodEXT(sampler2D, vec4, float);
>+    vec4 textureCubeLodEXT(samplerCube, vec3, float);
>+GROUP END TextureESSL100FS
>+
>+GROUP BEGIN TextureESSL100VS {"condition": "shaderType == GL_VERTEX_SHADER"}
>+  DEFAULT METADATA {"level": "ESSL1_BUILTINS", "op": "CallBuiltInFunction"}
>+    vec4 texture2DLod(sampler2D, vec2, float);
>+    vec4 texture2DProjLod(sampler2D, vec3, float);
>+    vec4 texture2DProjLod(sampler2D, vec4, float);
>+    vec4 textureCubeLod(samplerCube, vec3, float);
>+GROUP END TextureESSL100VS
>+
>+GROUP BEGIN TextureESSL300
>+  DEFAULT METADATA {"level": "ESSL3_BUILTINS", "op": "CallBuiltInFunction"}
>+    gvec4 texture(gsampler2D, vec2);
>+    gvec4 texture(gsampler3D, vec3);
>+    gvec4 texture(gsamplerCube, vec3);
>+    gvec4 texture(gsampler2DArray, vec3);
>+    gvec4 textureProj(gsampler2D, vec3);
>+    gvec4 textureProj(gsampler2D, vec4);
>+    gvec4 textureProj(gsampler3D, vec4);
>+    gvec4 textureLod(gsampler2D, vec2, float);
>+    gvec4 textureLod(gsampler3D, vec3, float);
>+    gvec4 textureLod(gsamplerCube, vec3, float);
>+    gvec4 textureLod(gsampler2DArray, vec3, float);
>+    float texture(sampler2DShadow, vec3);
>+    float texture(samplerCubeShadow, vec4);
>+    float texture(sampler2DArrayShadow, vec4);
>+    float textureProj(sampler2DShadow, vec4);
>+    float textureLod(sampler2DShadow, vec3, float);
>+    ivec2 textureSize(gsampler2D, int);
>+    ivec3 textureSize(gsampler3D, int);
>+    ivec2 textureSize(gsamplerCube, int);
>+    ivec3 textureSize(gsampler2DArray, int);
>+    ivec2 textureSize(sampler2DShadow, int);
>+    ivec2 textureSize(samplerCubeShadow, int);
>+    ivec3 textureSize(sampler2DArrayShadow, int);
>+    gvec4 textureProjLod(gsampler2D, vec3, float);
>+    gvec4 textureProjLod(gsampler2D, vec4, float);
>+    gvec4 textureProjLod(gsampler3D, vec4, float);
>+    float textureProjLod(sampler2DShadow, vec4, float);
>+    gvec4 texelFetch(gsampler2D, ivec2, int);
>+    gvec4 texelFetch(gsampler3D, ivec3, int);
>+    gvec4 texelFetch(gsampler2DArray, ivec3, int);
>+    gvec4 textureGrad(gsampler2D, vec2, vec2, vec2);
>+    gvec4 textureGrad(gsampler3D, vec3, vec3, vec3);
>+    gvec4 textureGrad(gsamplerCube, vec3, vec3, vec3);
>+    float textureGrad(sampler2DShadow, vec3, vec2, vec2);
>+    float textureGrad(samplerCubeShadow, vec4, vec3, vec3);
>+    gvec4 textureGrad(gsampler2DArray, vec3, vec2, vec2);
>+    float textureGrad(sampler2DArrayShadow, vec4, vec2, vec2);
>+    gvec4 textureProjGrad(gsampler2D, vec3, vec2, vec2);
>+    gvec4 textureProjGrad(gsampler2D, vec4, vec2, vec2);
>+    gvec4 textureProjGrad(gsampler3D, vec4, vec3, vec3);
>+    float textureProjGrad(sampler2DShadow, vec4, vec2, vec2);
>+GROUP END TextureESSL300
>+
>+GROUP BEGIN TextureSizeMS
>+  DEFAULT METADATA {"level": "ESSL3_1_BUILTINS", "op": "CallBuiltInFunction"}
>+    ivec2 textureSize(gsampler2DMS);
>+GROUP END TextureSizeMS
>+
>+GROUP BEGIN TextureSizeMSExt
>+  DEFAULT METADATA {"level": "ESSL3_BUILTINS", "op": "CallBuiltInFunction", "extension": "ANGLE_texture_multisample", "suffix": "Ext"}
>+    ivec2 textureSize(gsampler2DMS);
>+GROUP END TextureSizeMSExt
>+
>+GROUP BEGIN TextureSizeMSArray
>+  DEFAULT METADATA {"level": "ESSL3_1_BUILTINS", "op": "CallBuiltInFunction", "extension": "OES_texture_storage_multisample_2d_array"}
>+    ivec3 textureSize(gsampler2DMSArray);
>+GROUP END TextureSizeMSArray
>+
>+GROUP BEGIN TextureOffsetNoBias {"queryFunction": true}
>+  DEFAULT METADATA {"level": "ESSL3_BUILTINS", "op": "CallBuiltInFunction"}
>+    gvec4 textureOffset(gsampler2D, vec2, ivec2);
>+    gvec4 textureOffset(gsampler3D, vec3, ivec3);
>+    float textureOffset(sampler2DShadow, vec3, ivec2);
>+    gvec4 textureOffset(gsampler2DArray, vec3, ivec2);
>+    gvec4 textureProjOffset(gsampler2D, vec3, ivec2);
>+    gvec4 textureProjOffset(gsampler2D, vec4, ivec2);
>+    gvec4 textureProjOffset(gsampler3D, vec4, ivec3);
>+    float textureProjOffset(sampler2DShadow, vec4, ivec2);
>+    gvec4 textureLodOffset(gsampler2D, vec2, float, ivec2);
>+    gvec4 textureLodOffset(gsampler3D, vec3, float, ivec3);
>+    float textureLodOffset(sampler2DShadow, vec3, float, ivec2);
>+    gvec4 textureLodOffset(gsampler2DArray, vec3, float, ivec2);
>+    gvec4 textureProjLodOffset(gsampler2D, vec3, float, ivec2);
>+    gvec4 textureProjLodOffset(gsampler2D, vec4, float, ivec2);
>+    gvec4 textureProjLodOffset(gsampler3D, vec4, float, ivec3);
>+    float textureProjLodOffset(sampler2DShadow, vec4, float, ivec2);
>+    gvec4 texelFetchOffset(gsampler2D, ivec2, int, ivec2);
>+    gvec4 texelFetchOffset(gsampler3D, ivec3, int, ivec3);
>+    gvec4 texelFetchOffset(gsampler2DArray, ivec3, int, ivec2);
>+    gvec4 textureGradOffset(gsampler2D, vec2, vec2, vec2, ivec2);
>+    gvec4 textureGradOffset(gsampler3D, vec3, vec3, vec3, ivec3);
>+    float textureGradOffset(sampler2DShadow, vec3, vec2, vec2, ivec2);
>+    gvec4 textureGradOffset(gsampler2DArray, vec3, vec2, vec2, ivec2);
>+    float textureGradOffset(sampler2DArrayShadow, vec4, vec2, vec2, ivec2);
>+    gvec4 textureProjGradOffset(gsampler2D, vec3, vec2, vec2, ivec2);
>+    gvec4 textureProjGradOffset(gsampler2D, vec4, vec2, vec2, ivec2);
>+    gvec4 textureProjGradOffset(gsampler3D, vec4, vec3, vec3, ivec3);
>+    float textureProjGradOffset(sampler2DShadow, vec4, vec2, vec2, ivec2);
>+GROUP END TextureOffsetNoBias
>+
>+GROUP BEGIN TextureOffsetBias {"queryFunction": true, "condition": "shaderType == GL_FRAGMENT_SHADER"}
>+  DEFAULT METADATA {"level": "ESSL3_BUILTINS", "op": "CallBuiltInFunction"}
>+    gvec4 textureOffset(gsampler2D, vec2, ivec2, float);
>+    gvec4 textureOffset(gsampler3D, vec3, ivec3, float);
>+    float textureOffset(sampler2DShadow, vec3, ivec2, float);
>+    gvec4 textureOffset(gsampler2DArray, vec3, ivec2, float);
>+    gvec4 textureProjOffset(gsampler2D, vec3, ivec2, float);
>+    gvec4 textureProjOffset(gsampler2D, vec4, ivec2, float);
>+    gvec4 textureProjOffset(gsampler3D, vec4, ivec3, float);
>+    float textureProjOffset(sampler2DShadow, vec4, ivec2, float);
>+GROUP END TextureOffsetBias
>+
>+GROUP BEGIN EGL_image_external_essl3
>+  DEFAULT METADATA {"level": "ESSL3_BUILTINS", "op": "CallBuiltInFunction", "extension": "OES_EGL_image_external_essl3"}
>+    vec4 texture(samplerExternalOES, vec2);
>+    vec4 textureProj(samplerExternalOES, vec3);
>+    vec4 textureProj(samplerExternalOES, vec4);
>+    ivec2 textureSize(samplerExternalOES, int);
>+    vec4 texelFetch(samplerExternalOES, ivec2, int);
>+GROUP END EGL_image_external_essl3
>+
>+GROUP BEGIN EXT_yuv_target
>+  DEFAULT METADATA {"level": "ESSL3_BUILTINS", "op": "CallBuiltInFunction", "extension": "EXT_YUV_target"}
>+    vec4 texture(samplerExternal2DY2YEXT, vec2);
>+    vec4 textureProj(samplerExternal2DY2YEXT, vec3);
>+    vec4 textureProj(samplerExternal2DY2YEXT, vec4);
>+    vec3 rgb_2_yuv(vec3, yuvCscStandardEXT);
>+    vec3 yuv_2_rgb(vec3, yuvCscStandardEXT);
>+    ivec2 textureSize(samplerExternal2DY2YEXT, int);
>+    vec4 texelFetch(samplerExternal2DY2YEXT, ivec2, int);
>+GROUP END EXT_yuv_target
>+
>+GROUP BEGIN TextureESSL300FS {"condition": "shaderType == GL_FRAGMENT_SHADER"}
>+  DEFAULT METADATA {"level": "ESSL3_BUILTINS", "op": "CallBuiltInFunction"}
>+    gvec4 texture(gsampler2D, vec2, float);
>+    gvec4 texture(gsampler3D, vec3, float);
>+    gvec4 texture(gsamplerCube, vec3, float);
>+    gvec4 texture(gsampler2DArray, vec3, float);
>+    gvec4 textureProj(gsampler2D, vec3, float);
>+    gvec4 textureProj(gsampler2D, vec4, float);
>+    gvec4 textureProj(gsampler3D, vec4, float);
>+    float texture(sampler2DShadow, vec3, float);
>+    float texture(samplerCubeShadow, vec4, float);
>+    float textureProj(sampler2DShadow, vec4, float);
>+  DEFAULT METADATA {"level": "ESSL3_BUILTINS", "op": "CallBuiltInFunction", "extension": "OES_EGL_image_external_essl3"}
>+    vec4 texture(samplerExternalOES, vec2, float);
>+    vec4 textureProj(samplerExternalOES, vec3, float);
>+    vec4 textureProj(samplerExternalOES, vec4, float);
>+  DEFAULT METADATA {"level": "ESSL3_BUILTINS", "op": "CallBuiltInFunction", "extension": "EXT_YUV_target"}
>+    vec4 texture(samplerExternal2DY2YEXT, vec2, float);
>+    vec4 textureProj(samplerExternal2DY2YEXT, vec3, float);
>+    vec4 textureProj(samplerExternal2DY2YEXT, vec4, float);
>+GROUP END TextureESSL300FS
>+
>+GROUP BEGIN TexelFetchMS
>+  DEFAULT METADATA {"level": "ESSL3_1_BUILTINS", "op": "CallBuiltInFunction"}
>+    gvec4 texelFetch(gsampler2DMS, ivec2, int);
>+GROUP END TexelFetchMS
>+
>+GROUP BEGIN TexelFetchMSExt
>+  DEFAULT METADATA {"level": "ESSL3_BUILTINS", "op": "CallBuiltInFunction", "extension": "ANGLE_texture_multisample", "suffix": "Ext"}
>+    gvec4 texelFetch(gsampler2DMS, ivec2, int);
>+GROUP END TexelFetchMSExt
>+
>+GROUP BEGIN TexelFetchMSArray
>+  DEFAULT METADATA {"level": "ESSL3_1_BUILTINS", "op": "CallBuiltInFunction", "extension": "OES_texture_storage_multisample_2d_array"}
>+    gvec4 texelFetch(gsampler2DMSArray, ivec3, int);
>+GROUP END TexelFetchMSArray
>+
>+GROUP BEGIN TextureGather {"queryFunction": true}
>+  DEFAULT METADATA {"level": "ESSL3_1_BUILTINS", "op": "CallBuiltInFunction"}
>+    gvec4 textureGather(gsampler2D, vec2);
>+    gvec4 textureGather(gsampler2D, vec2, int);
>+    gvec4 textureGather(gsampler2DArray, vec3);
>+    gvec4 textureGather(gsampler2DArray, vec3, int);
>+    gvec4 textureGather(gsamplerCube, vec3);
>+    gvec4 textureGather(gsamplerCube, vec3, int);
>+    vec4 textureGather(sampler2DShadow, vec2);
>+    vec4 textureGather(sampler2DShadow, vec2, float);
>+    vec4 textureGather(sampler2DArrayShadow, vec3);
>+    vec4 textureGather(sampler2DArrayShadow, vec3, float);
>+    vec4 textureGather(samplerCubeShadow, vec3);
>+    vec4 textureGather(samplerCubeShadow, vec3, float);
>+
>+    GROUP BEGIN Offset {"queryFunction": true}
>+        gvec4 textureGatherOffset(gsampler2D, vec2, ivec2);
>+        gvec4 textureGatherOffset(gsampler2D, vec2, ivec2, int);
>+        gvec4 textureGatherOffset(gsampler2DArray, vec3, ivec2);
>+        gvec4 textureGatherOffset(gsampler2DArray, vec3, ivec2, int);
>+        vec4 textureGatherOffset(sampler2DShadow, vec2, float, ivec2);
>+        vec4 textureGatherOffset(sampler2DArrayShadow, vec3, float, ivec2);
>+    GROUP END Offset
>+GROUP END TextureGather
>+
>+GROUP BEGIN DerivativesESSL300FS {"condition": "shaderType == GL_FRAGMENT_SHADER"}
>+  DEFAULT METADATA {"level": "ESSL3_BUILTINS", "op": "auto", "hasSideEffects": "true"}
>+    genType dFdx(genType);
>+    genType dFdy(genType);
>+    genType fwidth(genType);
>+GROUP END DerivativesESSL300FS
>+
>+GROUP BEGIN AtomicCounter
>+  DEFAULT METADATA {"level": "ESSL3_1_BUILTINS", "op": "CallBuiltInFunction"}
>+    uint atomicCounter(atomic_uint);
>+    uint atomicCounterIncrement(atomic_uint);
>+    uint atomicCounterDecrement(atomic_uint);
>+GROUP END AtomicCounter
>+
>+GROUP BEGIN AtomicMemory {"queryFunction": true}
>+  DEFAULT METADATA {"level": "ESSL3_1_BUILTINS", "op": "auto"}
>+    uint atomicAdd(inout uint, uint);
>+    int atomicAdd(inout int, int);
>+    uint atomicMin(inout uint, uint);
>+    int atomicMin(inout int, int);
>+    uint atomicMax(inout uint, uint);
>+    int atomicMax(inout int, int);
>+    uint atomicAnd(inout uint, uint);
>+    int atomicAnd(inout int, int);
>+    uint atomicOr(inout uint, uint);
>+    int atomicOr(inout int, int);
>+    uint atomicXor(inout uint, uint);
>+    int atomicXor(inout int, int);
>+    uint atomicExchange(inout uint, uint);
>+    int atomicExchange(inout int, int);
>+    uint atomicCompSwap(inout uint, uint, uint);
>+    int atomicCompSwap(inout int, int, int);
>+GROUP END AtomicMemory
>+
>+GROUP BEGIN Image {"queryFunction": true}
>+  DEFAULT METADATA {"level": "ESSL3_1_BUILTINS", "op": "CallBuiltInFunction"}
>+    GROUP BEGIN Store {"queryFunction": true}
>+        void imageStore(gimage2D, ivec2, gvec4);
>+        void imageStore(gimage3D, ivec3, gvec4);
>+        void imageStore(gimage2DArray, ivec3, gvec4);
>+        void imageStore(gimageCube, ivec3, gvec4);
>+    GROUP END Store
>+    GROUP BEGIN Load {"queryFunction": true}
>+        gvec4 imageLoad(gimage2D, ivec2);
>+        gvec4 imageLoad(gimage3D, ivec3);
>+        gvec4 imageLoad(gimage2DArray, ivec3);
>+        gvec4 imageLoad(gimageCube, ivec3);
>+    GROUP END Load
>+    ivec2 imageSize(gimage2D);
>+    ivec3 imageSize(gimage3D);
>+    ivec3 imageSize(gimage2DArray);
>+    ivec2 imageSize(gimageCube);
>+GROUP END Image
>+
>+GROUP BEGIN Barrier
>+  DEFAULT METADATA {"level": "ESSL3_1_BUILTINS", "op": "auto", "hasSideEffects": true}
>+    void memoryBarrier();
>+    void memoryBarrierAtomicCounter();
>+    void memoryBarrierBuffer();
>+    void memoryBarrierImage();
>+GROUP END Barrier
>+
>+GROUP BEGIN ESSL310CS {"condition": "shaderType == GL_COMPUTE_SHADER"}
>+  DEFAULT METADATA {"level": "ESSL3_1_BUILTINS", "op": "auto", "hasSideEffects": true}
>+    void barrier();
>+    void memoryBarrierShared();
>+    void groupMemoryBarrier();
>+GROUP END ESSL310CS
>+
>+GROUP BEGIN ESSL310GS {"condition": "shaderType == GL_GEOMETRY_SHADER_EXT"}
>+  DEFAULT METADATA {"level": "ESSL3_1_BUILTINS", "op": "auto", "extension": "EXT_geometry_shader", "hasSideEffects": true}
>+    void EmitVertex();
>+    void EndPrimitive();
>+GROUP END ESSL310GS
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/builtin_symbols_hash_autogen.txt b/Source/ThirdParty/ANGLE/src/compiler/translator/builtin_symbols_hash_autogen.txt
>new file mode 100644
>index 00000000000..9a717b41644
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/builtin_symbols_hash_autogen.txt
>@@ -0,0 +1 @@
>+0af87b7f37d8a5260c859e9169a91f6a
>\ No newline at end of file
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/builtin_variables.json b/Source/ThirdParty/ANGLE/src/compiler/translator/builtin_variables.json
>new file mode 100644
>index 00000000000..f9461b4bc6b
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/builtin_variables.json
>@@ -0,0 +1,890 @@
>+{
>+    "General":{
>+        "comment":[
>+            " Copyright 2018 The ANGLE Project Authors. All rights reserved.",
>+            " Use of this source code is governed by a BSD-style license that can be",
>+            " found in the LICENSE file.",
>+            "",
>+            " The schema of this JSON file is as follows:",
>+            "",
>+            " The top-level object contains variable groups. Each group can have the following",
>+            " properties:",
>+            "   variables: Object mapping variable names to variable properties.",
>+            "   subgroups: Object with more groups that fall under the top-level group.",
>+            "   condition: C++ code determining when these variables should be found from",
>+            "              the symbol table.",
>+            " Each variable can have the following properties:",
>+            "   level: Symbol table level where the variable is contained.",
>+            "   type: Object with properties of the type. Can be substituted with initDynamicType.",
>+            "   initDynamicType: Template string with C++ code for initializing a TType * with the",
>+            "                    name {type_name}. The name will be replaced when generating code.",
>+            "                    May refer to names of previously listed structs or interface",
>+            "                    blocks.",
>+            "   extension: Optional. Name of the extension where this variable is from.",
>+            "   value: Optional. String that has one valid value: 'resources'. Denotes that the",
>+            "          value of the variable should be based on the field of ShBuiltInResources",
>+            "          with the same name as the variable.",
>+            "   class: Optional. To be used for interface block or struct definitions. Valid",
>+            "          values are 'TStructure' or 'TInterfaceBlock'.",
>+            "   fields: Optional. Object to be used for storing fields of interface block and",
>+            "           struct definitions. Maps field names to field types.",
>+            "   suffix: Optional. Suffix to give C++ variables storing the properties of this",
>+            "           variable a unique name that doesn't conflict with C++ keywords.",
>+            " Each type can have the following properties:",
>+            "   basic: Basic type as in the TBasicType enum without the Ebt prefix.",
>+            "   precision: Precision as in TPrecision enum without the Ebp prefix.",
>+            "   qualifier: Optional. Qualifier as in the TQualifier enum without the Evq prefix.",
>+            "   primarySize: Optional. Vector size or matrix column count.",
>+            "   secondarySize: Optional. Matrix row count.",
>+            " Any group, variable or type can have the property 'comment'."
>+        ],
>+        "variables":{
>+            "gl_DepthRangeParameters":{
>+                "class":"TStructure",
>+                "level":"COMMON_BUILTINS",
>+                "fields":{
>+                    "near":{
>+                        "basic":"Float",
>+                        "precision":"High"
>+                    },
>+                    "far":{
>+                        "basic":"Float",
>+                        "precision":"High"
>+                    },
>+                    "diff":{
>+                        "basic":"Float",
>+                        "precision":"High"
>+                    }
>+                }
>+            },
>+            "gl_DepthRange":{
>+                "level":"COMMON_BUILTINS",
>+                "initDynamicType":"TType *{type_name} = new TType(gl_DepthRangeParameters, false); {type_name}->setQualifier(EvqUniform);"
>+            }
>+        }
>+    },
>+    "Constants":{
>+        "variables":{
>+            "gl_MaxVertexAttribs":{
>+                "level":"COMMON_BUILTINS",
>+                "type":{
>+                    "basic":"Int",
>+                    "precision":"Medium",
>+                    "qualifier":"Const"
>+                },
>+                "value":"resources"
>+            },
>+            "gl_MaxVertexUniformVectors":{
>+                "level":"COMMON_BUILTINS",
>+                "type":{
>+                    "basic":"Int",
>+                    "precision":"Medium",
>+                    "qualifier":"Const"
>+                },
>+                "value":"resources"
>+            },
>+            "gl_MaxVertexTextureImageUnits":{
>+                "level":"COMMON_BUILTINS",
>+                "type":{
>+                    "basic":"Int",
>+                    "precision":"Medium",
>+                    "qualifier":"Const"
>+                },
>+                "value":"resources"
>+            },
>+            "gl_MaxCombinedTextureImageUnits":{
>+                "level":"COMMON_BUILTINS",
>+                "type":{
>+                    "basic":"Int",
>+                    "precision":"Medium",
>+                    "qualifier":"Const"
>+                },
>+                "value":"resources"
>+            },
>+            "gl_MaxTextureImageUnits":{
>+                "level":"COMMON_BUILTINS",
>+                "type":{
>+                    "basic":"Int",
>+                    "precision":"Medium",
>+                    "qualifier":"Const"
>+                },
>+                "value":"resources"
>+            },
>+            "gl_MaxFragmentUniformVectors":{
>+                "level":"COMMON_BUILTINS",
>+                "type":{
>+                    "basic":"Int",
>+                    "precision":"Medium",
>+                    "qualifier":"Const"
>+                },
>+                "value":"resources"
>+            },
>+            "gl_MaxVaryingVectors":{
>+                "level":"ESSL1_BUILTINS",
>+                "type":{
>+                    "basic":"Int",
>+                    "precision":"Medium",
>+                    "qualifier":"Const"
>+                },
>+                "value":"resources"
>+            },
>+            "gl_MaxDrawBuffers":{
>+                "level":"COMMON_BUILTINS",
>+                "type":{
>+                    "basic":"Int",
>+                    "precision":"Medium",
>+                    "qualifier":"Const"
>+                },
>+                "value":"resources"
>+            },
>+            "gl_MaxDualSourceDrawBuffersEXT":{
>+                "level":"COMMON_BUILTINS",
>+                "type":{
>+                    "basic":"Int",
>+                    "precision":"Medium",
>+                    "qualifier":"Const"
>+                },
>+                "extension":"EXT_blend_func_extended",
>+                "value":"resources",
>+                "valueKey":"MaxDualSourceDrawBuffers"
>+            },
>+            "gl_MaxVertexOutputVectors":{
>+                "level":"ESSL3_BUILTINS",
>+                "type":{
>+                    "basic":"Int",
>+                    "precision":"Medium",
>+                    "qualifier":"Const"
>+                },
>+                "value":"resources"
>+            },
>+            "gl_MaxFragmentInputVectors":{
>+                "level":"ESSL3_BUILTINS",
>+                "type":{
>+                    "basic":"Int",
>+                    "precision":"Medium",
>+                    "qualifier":"Const"
>+                },
>+                "value":"resources"
>+            },
>+            "gl_MinProgramTexelOffset":{
>+                "level":"ESSL3_BUILTINS",
>+                "type":{
>+                    "basic":"Int",
>+                    "precision":"Medium",
>+                    "qualifier":"Const"
>+                },
>+                "value":"resources"
>+            },
>+            "gl_MaxProgramTexelOffset":{
>+                "level":"ESSL3_BUILTINS",
>+                "type":{
>+                    "basic":"Int",
>+                    "precision":"Medium",
>+                    "qualifier":"Const"
>+                },
>+                "value":"resources"
>+            },
>+            "gl_MaxImageUnits":{
>+                "level":"ESSL3_1_BUILTINS",
>+                "type":{
>+                    "basic":"Int",
>+                    "precision":"Medium",
>+                    "qualifier":"Const"
>+                },
>+                "value":"resources"
>+            },
>+            "gl_MaxVertexImageUniforms":{
>+                "level":"ESSL3_1_BUILTINS",
>+                "type":{
>+                    "basic":"Int",
>+                    "precision":"Medium",
>+                    "qualifier":"Const"
>+                },
>+                "value":"resources"
>+            },
>+            "gl_MaxFragmentImageUniforms":{
>+                "level":"ESSL3_1_BUILTINS",
>+                "type":{
>+                    "basic":"Int",
>+                    "precision":"Medium",
>+                    "qualifier":"Const"
>+                },
>+                "value":"resources"
>+            },
>+            "gl_MaxComputeImageUniforms":{
>+                "level":"ESSL3_1_BUILTINS",
>+                "type":{
>+                    "basic":"Int",
>+                    "precision":"Medium",
>+                    "qualifier":"Const"
>+                },
>+                "value":"resources"
>+            },
>+            "gl_MaxCombinedImageUniforms":{
>+                "level":"ESSL3_1_BUILTINS",
>+                "type":{
>+                    "basic":"Int",
>+                    "precision":"Medium",
>+                    "qualifier":"Const"
>+                },
>+                "value":"resources"
>+            },
>+            "gl_MaxCombinedShaderOutputResources":{
>+                "level":"ESSL3_1_BUILTINS",
>+                "type":{
>+                    "basic":"Int",
>+                    "precision":"Medium",
>+                    "qualifier":"Const"
>+                },
>+                "value":"resources"
>+            },
>+            "gl_MaxComputeWorkGroupCount":{
>+                "level":"ESSL3_1_BUILTINS",
>+                "type":{
>+                    "basic":"Int",
>+                    "precision":"High",
>+                    "qualifier":"Const",
>+                    "primarySize":3
>+                },
>+                "value":"resources"
>+            },
>+            "gl_MaxComputeWorkGroupSize":{
>+                "level":"ESSL3_1_BUILTINS",
>+                "type":{
>+                    "basic":"Int",
>+                    "precision":"High",
>+                    "qualifier":"Const",
>+                    "primarySize":3
>+                },
>+                "value":"resources"
>+            },
>+            "gl_MaxComputeUniformComponents":{
>+                "level":"ESSL3_1_BUILTINS",
>+                "type":{
>+                    "basic":"Int",
>+                    "precision":"Medium",
>+                    "qualifier":"Const"
>+                },
>+                "value":"resources"
>+            },
>+            "gl_MaxComputeTextureImageUnits":{
>+                "level":"ESSL3_1_BUILTINS",
>+                "type":{
>+                    "basic":"Int",
>+                    "precision":"Medium",
>+                    "qualifier":"Const"
>+                },
>+                "value":"resources"
>+            },
>+            "gl_MaxComputeAtomicCounters":{
>+                "level":"ESSL3_1_BUILTINS",
>+                "type":{
>+                    "basic":"Int",
>+                    "precision":"Medium",
>+                    "qualifier":"Const"
>+                },
>+                "value":"resources"
>+            },
>+            "gl_MaxComputeAtomicCounterBuffers":{
>+                "level":"ESSL3_1_BUILTINS",
>+                "type":{
>+                    "basic":"Int",
>+                    "precision":"Medium",
>+                    "qualifier":"Const"
>+                },
>+                "value":"resources"
>+            },
>+            "gl_MaxVertexAtomicCounters":{
>+                "level":"ESSL3_1_BUILTINS",
>+                "type":{
>+                    "basic":"Int",
>+                    "precision":"Medium",
>+                    "qualifier":"Const"
>+                },
>+                "value":"resources"
>+            },
>+            "gl_MaxFragmentAtomicCounters":{
>+                "level":"ESSL3_1_BUILTINS",
>+                "type":{
>+                    "basic":"Int",
>+                    "precision":"Medium",
>+                    "qualifier":"Const"
>+                },
>+                "value":"resources"
>+            },
>+            "gl_MaxCombinedAtomicCounters":{
>+                "level":"ESSL3_1_BUILTINS",
>+                "type":{
>+                    "basic":"Int",
>+                    "precision":"Medium",
>+                    "qualifier":"Const"
>+                },
>+                "value":"resources"
>+            },
>+            "gl_MaxAtomicCounterBindings":{
>+                "level":"ESSL3_1_BUILTINS",
>+                "type":{
>+                    "basic":"Int",
>+                    "precision":"Medium",
>+                    "qualifier":"Const"
>+                },
>+                "value":"resources"
>+            },
>+            "gl_MaxVertexAtomicCounterBuffers":{
>+                "level":"ESSL3_1_BUILTINS",
>+                "type":{
>+                    "basic":"Int",
>+                    "precision":"Medium",
>+                    "qualifier":"Const"
>+                },
>+                "value":"resources"
>+            },
>+            "gl_MaxFragmentAtomicCounterBuffers":{
>+                "level":"ESSL3_1_BUILTINS",
>+                "type":{
>+                    "basic":"Int",
>+                    "precision":"Medium",
>+                    "qualifier":"Const"
>+                },
>+                "value":"resources"
>+            },
>+            "gl_MaxCombinedAtomicCounterBuffers":{
>+                "level":"ESSL3_1_BUILTINS",
>+                "type":{
>+                    "basic":"Int",
>+                    "precision":"Medium",
>+                    "qualifier":"Const"
>+                },
>+                "value":"resources"
>+            },
>+            "gl_MaxAtomicCounterBufferSize":{
>+                "level":"ESSL3_1_BUILTINS",
>+                "type":{
>+                    "basic":"Int",
>+                    "precision":"Medium",
>+                    "qualifier":"Const"
>+                },
>+                "value":"resources"
>+            }
>+        },
>+        "subgroups":{
>+            "EXTGeometryShader":{
>+                "variables":{
>+                    "gl_MaxGeometryInputComponents":{
>+                        "level":"ESSL3_1_BUILTINS",
>+                        "type":{
>+                            "basic":"Int",
>+                            "precision":"Medium",
>+                            "qualifier":"Const"
>+                        },
>+                        "extension":"EXT_geometry_shader",
>+                        "value":"resources"
>+                    },
>+                    "gl_MaxGeometryOutputComponents":{
>+                        "level":"ESSL3_1_BUILTINS",
>+                        "type":{
>+                            "basic":"Int",
>+                            "precision":"Medium",
>+                            "qualifier":"Const"
>+                        },
>+                        "extension":"EXT_geometry_shader",
>+                        "value":"resources"
>+                    },
>+                    "gl_MaxGeometryImageUniforms":{
>+                        "level":"ESSL3_1_BUILTINS",
>+                        "type":{
>+                            "basic":"Int",
>+                            "precision":"Medium",
>+                            "qualifier":"Const"
>+                        },
>+                        "extension":"EXT_geometry_shader",
>+                        "value":"resources"
>+                    },
>+                    "gl_MaxGeometryTextureImageUnits":{
>+                        "level":"ESSL3_1_BUILTINS",
>+                        "type":{
>+                            "basic":"Int",
>+                            "precision":"Medium",
>+                            "qualifier":"Const"
>+                        },
>+                        "extension":"EXT_geometry_shader",
>+                        "value":"resources"
>+                    },
>+                    "gl_MaxGeometryOutputVertices":{
>+                        "level":"ESSL3_1_BUILTINS",
>+                        "type":{
>+                            "basic":"Int",
>+                            "precision":"Medium",
>+                            "qualifier":"Const"
>+                        },
>+                        "extension":"EXT_geometry_shader",
>+                        "value":"resources"
>+                    },
>+                    "gl_MaxGeometryTotalOutputComponents":{
>+                        "level":"ESSL3_1_BUILTINS",
>+                        "type":{
>+                            "basic":"Int",
>+                            "precision":"Medium",
>+                            "qualifier":"Const"
>+                        },
>+                        "extension":"EXT_geometry_shader",
>+                        "value":"resources"
>+                    },
>+                    "gl_MaxGeometryUniformComponents":{
>+                        "level":"ESSL3_1_BUILTINS",
>+                        "type":{
>+                            "basic":"Int",
>+                            "precision":"Medium",
>+                            "qualifier":"Const"
>+                        },
>+                        "extension":"EXT_geometry_shader",
>+                        "value":"resources"
>+                    },
>+                    "gl_MaxGeometryAtomicCounters":{
>+                        "level":"ESSL3_1_BUILTINS",
>+                        "type":{
>+                            "basic":"Int",
>+                            "precision":"Medium",
>+                            "qualifier":"Const"
>+                        },
>+                        "extension":"EXT_geometry_shader",
>+                        "value":"resources"
>+                    },
>+                    "gl_MaxGeometryAtomicCounterBuffers":{
>+                        "level":"ESSL3_1_BUILTINS",
>+                        "type":{
>+                            "basic":"Int",
>+                            "precision":"Medium",
>+                            "qualifier":"Const"
>+                        },
>+                        "extension":"EXT_geometry_shader",
>+                        "value":"resources"
>+                    }
>+                }
>+            }
>+        }
>+    },
>+    "FragShader":{
>+        "condition":"shaderType == GL_FRAGMENT_SHADER",
>+        "variables":{
>+            "gl_FragCoord":{
>+                "level":"COMMON_BUILTINS",
>+                "type":{
>+                    "basic":"Float",
>+                    "precision":"Medium",
>+                    "qualifier":"FragCoord",
>+                    "primarySize":4
>+                }
>+            },
>+            "gl_FrontFacing":{
>+                "level":"COMMON_BUILTINS",
>+                "type":{
>+                    "basic":"Bool",
>+                    "qualifier":"FrontFacing"
>+                }
>+            },
>+            "gl_PointCoord":{
>+                "level":"COMMON_BUILTINS",
>+                "type":{
>+                    "basic":"Float",
>+                    "precision":"Medium",
>+                    "qualifier":"PointCoord",
>+                    "primarySize":2
>+                }
>+            },
>+            "gl_FragColor":{
>+                "level":"ESSL1_BUILTINS",
>+                "type":{
>+                    "basic":"Float",
>+                    "precision":"Medium",
>+                    "qualifier":"FragColor",
>+                    "primarySize":4
>+                }
>+            },
>+            "gl_FragData":{
>+                "level":"ESSL1_BUILTINS",
>+                "initDynamicType":"TType *{type_name} = new TType(EbtFloat, EbpMedium, EvqFragData, 4); if (spec != SH_WEBGL2_SPEC && spec != SH_WEBGL3_SPEC) {{ {type_name}->makeArray(resources.MaxDrawBuffers); }} else {{ {type_name}->makeArray(1u); }}"
>+            },
>+            "gl_FragDepth":{
>+                "level":"ESSL3_BUILTINS",
>+                "type":{
>+                    "basic":"Float",
>+                    "precision":"High",
>+                    "qualifier":"FragDepth"
>+                }
>+            }
>+        },
>+        "subgroups":{
>+            "EXTBlendFuncExtended":{
>+                "condition":"mResources.EXT_blend_func_extended",
>+                "variables":{
>+                    "gl_SecondaryFragColorEXT":{
>+                        "level":"ESSL1_BUILTINS",
>+                        "extension":"EXT_blend_func_extended",
>+                        "type":{
>+                            "basic":"Float",
>+                            "precision":"Medium",
>+                            "qualifier":"SecondaryFragColorEXT",
>+                            "primarySize":4
>+                        }
>+                    },
>+                    "gl_SecondaryFragDataEXT":{
>+                        "level":"ESSL1_BUILTINS",
>+                        "extension":"EXT_blend_func_extended",
>+                        "initDynamicType":"TType *{type_name} = new TType(EbtFloat, EbpMedium, EvqSecondaryFragDataEXT, 4, 1); {type_name}->makeArray(resources.MaxDualSourceDrawBuffers);"
>+                    }
>+                }
>+            },
>+            "EXTFragDepth":{
>+                "condition":"mResources.EXT_frag_depth",
>+                "variables":{
>+                    "gl_FragDepthEXT":{
>+                        "level":"ESSL1_BUILTINS",
>+                        "extension":"EXT_frag_depth",
>+                        "initDynamicType":"TType *{type_name} = new TType(EbtFloat, resources.FragmentPrecisionHigh ? EbpHigh : EbpMedium, EvqFragDepthEXT, 1);"
>+                    }
>+                }
>+            },
>+            "EXTShaderFramebufferFetch":{
>+                "condition":"mResources.EXT_shader_framebuffer_fetch",
>+                "variables":{
>+                    "gl_LastFragData":{
>+                        "level":"ESSL1_BUILTINS",
>+                        "extension":"EXT_shader_framebuffer_fetch",
>+                        "initDynamicType":"TType *{type_name} = new TType(EbtFloat, EbpMedium, EvqLastFragData, 4, 1); {type_name}->makeArray(resources.MaxDrawBuffers);"
>+                    }
>+                }
>+            },
>+            "NVShaderFramebufferFetch":{
>+                "condition":"mResources.NV_shader_framebuffer_fetch",
>+                "variables":{
>+                    "gl_LastFragColor":{
>+                        "level":"ESSL1_BUILTINS",
>+                        "extension":"NV_shader_framebuffer_fetch",
>+                        "type":{
>+                            "basic":"Float",
>+                            "precision":"Medium",
>+                            "qualifier":"LastFragColor",
>+                            "primarySize":4
>+                        }
>+                    },
>+                    "gl_LastFragData":{
>+                        "level":"ESSL1_BUILTINS",
>+                        "suffix":"NV",
>+                        "extension":"NV_shader_framebuffer_fetch",
>+                        "initDynamicType":"TType *{type_name} = new TType(EbtFloat, EbpMedium, EvqLastFragData, 4, 1); {type_name}->makeArray(resources.MaxDrawBuffers);"
>+                    }
>+                }
>+            },
>+            "ARMShaderFramebufferFetch":{
>+                "condition":"!mResources.EXT_shader_framebuffer_fetch && !mResources.NV_shader_framebuffer_fetch && mResources.ARM_shader_framebuffer_fetch",
>+                "variables":{
>+                    "gl_LastFragColorARM":{
>+                        "level":"ESSL1_BUILTINS",
>+                        "extension":"ARM_shader_framebuffer_fetch",
>+                        "type":{
>+                            "basic":"Float",
>+                            "precision":"Medium",
>+                            "qualifier":"LastFragColor",
>+                            "primarySize":4
>+                        }
>+                    }
>+                }
>+            },
>+            "GeometryShaderSupported":{
>+                "condition":"mResources.EXT_geometry_shader",
>+                "variables":{
>+                    "gl_PrimitiveID":{
>+                        "level":"ESSL3_1_BUILTINS",
>+                        "extension":"EXT_geometry_shader",
>+                        "type":{
>+                            "basic":"Int",
>+                            "precision":"High",
>+                            "qualifier":"PrimitiveID"
>+                        }
>+                    },
>+                    "gl_Layer":{
>+                        "level":"ESSL3_1_BUILTINS",
>+                        "extension":"EXT_geometry_shader",
>+                        "type":{
>+                            "basic":"Int",
>+                            "precision":"High",
>+                            "qualifier":"Layer"
>+                        }
>+                    }
>+                }
>+            }
>+        }
>+    },
>+    "VertexShader":{
>+        "condition":"shaderType == GL_VERTEX_SHADER",
>+        "variables":{
>+            "gl_Position":{
>+                "level":"COMMON_BUILTINS",
>+                "type":{
>+                    "basic":"Float",
>+                    "precision":"High",
>+                    "qualifier":"Position",
>+                    "primarySize":4
>+                }
>+            },
>+            "gl_PointSize":{
>+                "level":"COMMON_BUILTINS",
>+                "type":{
>+                    "basic":"Float",
>+                    "precision":"Medium",
>+                    "qualifier":"PointSize"
>+                }
>+            },
>+            "gl_InstanceID":{
>+                "level":"ESSL3_BUILTINS",
>+                "type":{
>+                    "basic":"Int",
>+                    "precision":"High",
>+                    "qualifier":"InstanceID"
>+                }
>+            },
>+            "gl_VertexID":{
>+                "level":"ESSL3_BUILTINS",
>+                "type":{
>+                    "basic":"Int",
>+                    "precision":"High",
>+                    "qualifier":"VertexID"
>+                }
>+            },
>+            "gl_ViewportIndex":{
>+                "comment":"For internal use by ANGLE - not exposed to the parser.",
>+                "level":"GLSL_BUILTINS",
>+                "type":{
>+                    "basic":"Int",
>+                    "precision":"High",
>+                    "qualifier":"ViewportIndex"
>+                }
>+            },
>+            "gl_Layer":{
>+                "suffix":"VS",
>+                "comment":"gl_Layer exists in other shader stages in ESSL, but not in vertex shader so far.",
>+                "level":"GLSL_BUILTINS",
>+                "type":{
>+                    "basic":"Int",
>+                    "precision":"High",
>+                    "qualifier":"Layer"
>+                }
>+            }
>+        },
>+        "subgroups":{
>+            "ANGLEMultiDraw":{
>+                "condition": "mResources.ANGLE_multi_draw",
>+                "subgroups":{
>+                  "ESSL3":{
>+                        "variables":{
>+                            "gl_DrawID":{
>+                                "level":"ESSL3_BUILTINS",
>+                                "extension":"ANGLE_multi_draw",
>+                                "type":{
>+                                    "basic":"Int",
>+                                    "precision":"High",
>+                                    "qualifier":"DrawID"
>+                                }
>+                            }
>+                        }
>+                    },
>+                    "ESSL1":{
>+                        "variables":{
>+                            "gl_DrawID":{
>+                                "suffix":"ESSL1",
>+                                "level":"ESSL1_BUILTINS",
>+                                "extension":"ANGLE_multi_draw",
>+                                "type":{
>+                                    "basic":"Int",
>+                                    "precision":"High",
>+                                    "qualifier":"DrawID"
>+                                }
>+                            }
>+                        }
>+                    }
>+                }
>+
>+            }
>+        }
>+    },
>+    "ComputeShader":{
>+        "condition":"shaderType == GL_COMPUTE_SHADER",
>+        "variables":{
>+            "gl_NumWorkGroups":{
>+                "level":"ESSL3_1_BUILTINS",
>+                "type":{
>+                    "basic":"UInt",
>+                    "precision":"Undefined",
>+                    "qualifier":"NumWorkGroups",
>+                    "primarySize":3
>+                }
>+            },
>+            "gl_WorkGroupSize":{
>+                "level":"ESSL3_1_BUILTINS",
>+                "type":{
>+                    "basic":"UInt",
>+                    "precision":"Undefined",
>+                    "qualifier":"WorkGroupSize",
>+                    "primarySize":3
>+                }
>+            },
>+            "gl_WorkGroupID":{
>+                "level":"ESSL3_1_BUILTINS",
>+                "type":{
>+                    "basic":"UInt",
>+                    "precision":"Undefined",
>+                    "qualifier":"WorkGroupID",
>+                    "primarySize":3
>+                }
>+            },
>+            "gl_LocalInvocationID":{
>+                "level":"ESSL3_1_BUILTINS",
>+                "type":{
>+                    "basic":"UInt",
>+                    "precision":"Undefined",
>+                    "qualifier":"LocalInvocationID",
>+                    "primarySize":3
>+                }
>+            },
>+            "gl_GlobalInvocationID":{
>+                "level":"ESSL3_1_BUILTINS",
>+                "type":{
>+                    "basic":"UInt",
>+                    "precision":"Undefined",
>+                    "qualifier":"GlobalInvocationID",
>+                    "primarySize":3
>+                }
>+            },
>+            "gl_LocalInvocationIndex":{
>+                "level":"ESSL3_1_BUILTINS",
>+                "type":{
>+                    "basic":"UInt",
>+                    "precision":"Undefined",
>+                    "qualifier":"LocalInvocationIndex"
>+                }
>+            }
>+        }
>+    },
>+    "GeometryShader":{
>+        "condition":"shaderType == GL_GEOMETRY_SHADER_EXT",
>+        "variables":{
>+            "gl_PrimitiveIDIn":{
>+                "level":"ESSL3_1_BUILTINS",
>+                "extension":"EXT_geometry_shader",
>+                "type":{
>+                    "basic":"Int",
>+                    "precision":"High",
>+                    "qualifier":"PrimitiveIDIn"
>+                }
>+            },
>+            "gl_InvocationID":{
>+                "level":"ESSL3_1_BUILTINS",
>+                "extension":"EXT_geometry_shader",
>+                "type":{
>+                    "basic":"Int",
>+                    "precision":"High",
>+                    "qualifier":"InvocationID"
>+                }
>+            },
>+            "gl_PrimitiveID":{
>+                "suffix":"GS",
>+                "level":"ESSL3_1_BUILTINS",
>+                "extension":"EXT_geometry_shader",
>+                "type":{
>+                    "basic":"Int",
>+                    "precision":"High",
>+                    "qualifier":"PrimitiveID"
>+                }
>+            },
>+            "gl_Layer":{
>+                "suffix":"GS",
>+                "level":"ESSL3_1_BUILTINS",
>+                "extension":"EXT_geometry_shader",
>+                "type":{
>+                    "basic":"Int",
>+                    "precision":"High",
>+                    "qualifier":"Layer"
>+                }
>+            },
>+            "gl_PerVertex":{
>+                "level":"ESSL3_1_BUILTINS",
>+                "extension":"EXT_geometry_shader",
>+                "class":"TInterfaceBlock",
>+                "fields":{
>+                    "gl_Position":{
>+                        "basic":"Float",
>+                        "precision":"High",
>+                        "qualifier":"Position",
>+                        "primarySize":4
>+                    }
>+                }
>+            },
>+            "gl_in":{
>+                "level":"ESSL3_1_BUILTINS",
>+                "extension":"EXT_geometry_shader",
>+                "initDynamicType":"TType *{type_name} = new TType(gl_PerVertex, EvqPerVertexIn, TLayoutQualifier::Create()); {type_name}->makeArray(0u);",
>+                "comment":"The array size of gl_in is undefined until we get a valid input primitive declaration."
>+            }
>+        },
>+        "subgroups":{
>+            "Out":{
>+                "variables":{
>+                    "gl_PerVertex":{
>+                        "suffix":"OutBlock",
>+                        "level":"ESSL3_1_BUILTINS",
>+                        "extension":"EXT_geometry_shader",
>+                        "private":true,
>+                        "class":"TInterfaceBlock",
>+                        "fields":{
>+                            "gl_Position":{
>+                                "basic":"Float",
>+                                "precision":"High",
>+                                "qualifier":"Position",
>+                                "primarySize":4
>+                            }
>+                        }
>+                    },
>+                    "gl_Position":{
>+                        "suffix":"GS",
>+                        "level":"ESSL3_1_BUILTINS",
>+                        "extension":"EXT_geometry_shader",
>+                        "initDynamicType":"TType *{type_name} = new TType(EbtFloat, EbpHigh, EvqPosition, 4); {type_name}->setInterfaceBlock(gl_PerVertexOutBlock);"
>+                    }
>+                }
>+            }
>+        }
>+    },
>+    "Multiview":{
>+        "condition":"mResources.OVR_multiview2 && shaderType != GL_COMPUTE_SHADER",
>+        "subgroups":{
>+            "ESSL3":{
>+                "variables":{
>+                    "gl_ViewID_OVR":{
>+                        "level":"ESSL3_BUILTINS",
>+                        "extension":"OVR_multiview2",
>+                        "type":{
>+                            "basic":"UInt",
>+                            "precision":"High",
>+                            "qualifier":"ViewIDOVR"
>+                        }
>+                    }
>+                }
>+            },
>+            "ESSL1":{
>+                "variables":{
>+                    "gl_ViewID_OVR":{
>+                        "suffix":"ESSL1",
>+                        "level":"ESSL1_BUILTINS",
>+                        "extension":"OVR_multiview2",
>+                        "type":{
>+                            "basic":"Int",
>+                            "precision":"High",
>+                            "qualifier":"ViewIDOVR"
>+                        }
>+                    }
>+                }
>+            }
>+        }
>+    }
>+}
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/emulated_builtin_function_data_hlsl.json b/Source/ThirdParty/ANGLE/src/compiler/translator/emulated_builtin_function_data_hlsl.json
>index 32e500fe67a..99d24ef3c18 100644
>--- a/Source/ThirdParty/ANGLE/src/compiler/translator/emulated_builtin_function_data_hlsl.json
>+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/emulated_builtin_function_data_hlsl.json
>@@ -1378,5 +1378,48 @@
>          "borrow = uint4(x < y);",
>          "return x - y;"
>       ]
>+   },
>+   {
>+      "comment":[
>+         "We emulate tanh just to avoid overflow on large arguments."
>+      ],
>+      "op":"tanh",
>+      "return_type":"float",
>+      "args":[
>+         "float x"
>+      ],
>+      "body":[
>+         "return (abs(x) > 15.0) ? sign(x) : tanh(x);"
>+      ]
>+   },
>+   {
>+      "op":"tanh",
>+      "return_type":"float2",
>+      "args":[
>+         "float2 x"
>+      ],
>+      "body":[
>+         "return (abs(x) > 15.0) ? sign(x) : tanh(x);"
>+      ]
>+   },
>+   {
>+      "op":"tanh",
>+      "return_type":"float3",
>+      "args":[
>+         "float3 x"
>+      ],
>+      "body":[
>+         "return (abs(x) > 15.0) ? sign(x) : tanh(x);"
>+      ]
>+   },
>+   {
>+      "op":"tanh",
>+      "return_type":"float4",
>+      "args":[
>+         "float4 x"
>+      ],
>+      "body":[
>+         "return (abs(x) > 15.0) ? sign(x) : tanh(x);"
>+      ]
>    }
> ]
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/emulated_builtin_functions_hlsl_autogen.cpp b/Source/ThirdParty/ANGLE/src/compiler/translator/emulated_builtin_functions_hlsl_autogen.cpp
>index 288da5e0f58..c61e77a110e 100644
>--- a/Source/ThirdParty/ANGLE/src/compiler/translator/emulated_builtin_functions_hlsl_autogen.cpp
>+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/emulated_builtin_functions_hlsl_autogen.cpp
>@@ -2,7 +2,7 @@
> // Generated by gen_emulated_builtin_function_tables.py using data from
> // emulated_builtin_function_data_hlsl.json.
> //
>-// Copyright 2017 The ANGLE Project Authors. All rights reserved.
>+// Copyright 2019 The ANGLE Project Authors. All rights reserved.
> // Use of this source code is governed by a BSD-style license that can be
> // found in the LICENSE file.
> //
>@@ -10,6 +10,7 @@
> //   HLSL code for emulating GLSL builtin functions not present in HLSL.
> 
> #include "compiler/translator/BuiltInFunctionEmulator.h"
>+#include "compiler/translator/tree_util/BuiltIn_autogen.h"
> 
> namespace sh
> {
>@@ -19,51 +20,51 @@ namespace
> 
> struct FunctionPair
> {
>-    constexpr FunctionPair(const MiniFunctionId &idIn, const char *bodyIn) : id(idIn), body(bodyIn)
>-    {
>-    }
>+    constexpr FunctionPair(const TSymbolUniqueId &idIn, const char *bodyIn)
>+        : id(idIn.get()), body(bodyIn)
>+    {}
> 
>-    MiniFunctionId id;
>+    int id;
>     const char *body;
> };
> 
> constexpr FunctionPair g_hlslFunctions[] = {
>-    {{EOpMod, ParamType::Float1, ParamType::Float1},
>+    {BuiltInId::mod_Float1_Float1,
>      "float mod_emu(float x, float y)\n"
>      "{\n"
>      "    return x - y * floor(x / y);\n"
>      "}\n"},
>-    {{EOpMod, ParamType::Float2, ParamType::Float2},
>+    {BuiltInId::mod_Float2_Float2,
>      "float2 mod_emu(float2 x, float2 y)\n"
>      "{\n"
>      "    return x - y * floor(x / y);\n"
>      "}\n"},
>-    {{EOpMod, ParamType::Float2, ParamType::Float1},
>+    {BuiltInId::mod_Float2_Float1,
>      "float2 mod_emu(float2 x, float y)\n"
>      "{\n"
>      "    return x - y * floor(x / y);\n"
>      "}\n"},
>-    {{EOpMod, ParamType::Float3, ParamType::Float3},
>+    {BuiltInId::mod_Float3_Float3,
>      "float3 mod_emu(float3 x, float3 y)\n"
>      "{\n"
>      "    return x - y * floor(x / y);\n"
>      "}\n"},
>-    {{EOpMod, ParamType::Float3, ParamType::Float1},
>+    {BuiltInId::mod_Float3_Float1,
>      "float3 mod_emu(float3 x, float y)\n"
>      "{\n"
>      "    return x - y * floor(x / y);\n"
>      "}\n"},
>-    {{EOpMod, ParamType::Float4, ParamType::Float4},
>+    {BuiltInId::mod_Float4_Float4,
>      "float4 mod_emu(float4 x, float4 y)\n"
>      "{\n"
>      "    return x - y * floor(x / y);\n"
>      "}\n"},
>-    {{EOpMod, ParamType::Float4, ParamType::Float1},
>+    {BuiltInId::mod_Float4_Float1,
>      "float4 mod_emu(float4 x, float y)\n"
>      "{\n"
>      "    return x - y * floor(x / y);\n"
>      "}\n"},
>-    {{EOpFrexp, ParamType::Float1, ParamType::Int1},
>+    {BuiltInId::frexp_Float1_Int1,
>      "float frexp_emu(float x, out int exp)\n"
>      "{\n"
>      "    float fexp;\n"
>@@ -71,7 +72,7 @@ constexpr FunctionPair g_hlslFunctions[] = {
>      "    exp = int(fexp);\n"
>      "    return mantissa;\n"
>      "}\n"},
>-    {{EOpFrexp, ParamType::Float2, ParamType::Int2},
>+    {BuiltInId::frexp_Float2_Int2,
>      "float2 frexp_emu(float2 x, out int2 exp)\n"
>      "{\n"
>      "    float2 fexp;\n"
>@@ -79,7 +80,7 @@ constexpr FunctionPair g_hlslFunctions[] = {
>      "    exp = int2(fexp);\n"
>      "    return mantissa;\n"
>      "}\n"},
>-    {{EOpFrexp, ParamType::Float3, ParamType::Int3},
>+    {BuiltInId::frexp_Float3_Int3,
>      "float3 frexp_emu(float3 x, out int3 exp)\n"
>      "{\n"
>      "    float3 fexp;\n"
>@@ -87,7 +88,7 @@ constexpr FunctionPair g_hlslFunctions[] = {
>      "    exp = int3(fexp);\n"
>      "    return mantissa;\n"
>      "}\n"},
>-    {{EOpFrexp, ParamType::Float4, ParamType::Int4},
>+    {BuiltInId::frexp_Float4_Int4,
>      "float4 frexp_emu(float4 x, out int4 exp)\n"
>      "{\n"
>      "    float4 fexp;\n"
>@@ -95,27 +96,27 @@ constexpr FunctionPair g_hlslFunctions[] = {
>      "    exp = int4(fexp);\n"
>      "    return mantissa;\n"
>      "}\n"},
>-    {{EOpLdexp, ParamType::Float1, ParamType::Int1},
>+    {BuiltInId::ldexp_Float1_Int1,
>      "float ldexp_emu(float x, int exp)\n"
>      "{\n"
>      "    return ldexp(x, float(exp));\n"
>      "}\n"},
>-    {{EOpLdexp, ParamType::Float2, ParamType::Int2},
>+    {BuiltInId::ldexp_Float2_Int2,
>      "float2 ldexp_emu(float2 x, int2 exp)\n"
>      "{\n"
>      "    return ldexp(x, float2(exp));\n"
>      "}\n"},
>-    {{EOpLdexp, ParamType::Float3, ParamType::Int3},
>+    {BuiltInId::ldexp_Float3_Int3,
>      "float3 ldexp_emu(float3 x, int3 exp)\n"
>      "{\n"
>      "    return ldexp(x, float3(exp));\n"
>      "}\n"},
>-    {{EOpLdexp, ParamType::Float4, ParamType::Int4},
>+    {BuiltInId::ldexp_Float4_Int4,
>      "float4 ldexp_emu(float4 x, int4 exp)\n"
>      "{\n"
>      "    return ldexp(x, float4(exp));\n"
>      "}\n"},
>-    {{EOpFaceforward, ParamType::Float1, ParamType::Float1, ParamType::Float1},
>+    {BuiltInId::faceforward_Float1_Float1_Float1,
>      "float faceforward_emu(float N, float I, float Nref)\n"
>      "{\n"
>      "    if(dot(Nref, I) >= 0)\n"
>@@ -127,7 +128,7 @@ constexpr FunctionPair g_hlslFunctions[] = {
>      "        return N;\n"
>      "    }\n"
>      "}\n"},
>-    {{EOpFaceforward, ParamType::Float2, ParamType::Float2, ParamType::Float2},
>+    {BuiltInId::faceforward_Float2_Float2_Float2,
>      "float2 faceforward_emu(float2 N, float2 I, float2 Nref)\n"
>      "{\n"
>      "    if(dot(Nref, I) >= 0)\n"
>@@ -139,7 +140,7 @@ constexpr FunctionPair g_hlslFunctions[] = {
>      "        return N;\n"
>      "    }\n"
>      "}\n"},
>-    {{EOpFaceforward, ParamType::Float3, ParamType::Float3, ParamType::Float3},
>+    {BuiltInId::faceforward_Float3_Float3_Float3,
>      "float3 faceforward_emu(float3 N, float3 I, float3 Nref)\n"
>      "{\n"
>      "    if(dot(Nref, I) >= 0)\n"
>@@ -151,7 +152,7 @@ constexpr FunctionPair g_hlslFunctions[] = {
>      "        return N;\n"
>      "    }\n"
>      "}\n"},
>-    {{EOpFaceforward, ParamType::Float4, ParamType::Float4, ParamType::Float4},
>+    {BuiltInId::faceforward_Float4_Float4_Float4,
>      "float4 faceforward_emu(float4 N, float4 I, float4 Nref)\n"
>      "{\n"
>      "    if(dot(Nref, I) >= 0)\n"
>@@ -163,20 +164,20 @@ constexpr FunctionPair g_hlslFunctions[] = {
>      "        return N;\n"
>      "    }\n"
>      "}\n"},
>-    {{EOpAtan, ParamType::Float1, ParamType::Float1},
>+    {BuiltInId::atan_Float1_Float1,
>      "float atan_emu(float y, float x)\n"
>      "{\n"
>      "    if(x == 0 && y == 0) x = 1;\n"
>      "    return atan2(y, x);\n"
>      "}\n"},
>-    {{EOpAtan, ParamType::Float2, ParamType::Float2},
>+    {BuiltInId::atan_Float2_Float2,
>      "float2 atan_emu(float2 y, float2 x)\n"
>      "{\n"
>      "    if(x[0] == 0 && y[0] == 0) x[0] = 1;\n"
>      "    if(x[1] == 0 && y[1] == 0) x[1] = 1;\n"
>      "    return float2(atan2(y[0], x[0]), atan2(y[1], x[1]));\n"
>      "}\n"},
>-    {{EOpAtan, ParamType::Float3, ParamType::Float3},
>+    {BuiltInId::atan_Float3_Float3,
>      "float3 atan_emu(float3 y, float3 x)\n"
>      "{\n"
>      "    if(x[0] == 0 && y[0] == 0) x[0] = 1;\n"
>@@ -184,7 +185,7 @@ constexpr FunctionPair g_hlslFunctions[] = {
>      "    if(x[2] == 0 && y[2] == 0) x[2] = 1;\n"
>      "    return float3(atan2(y[0], x[0]), atan2(y[1], x[1]), atan2(y[2], x[2]));\n"
>      "}\n"},
>-    {{EOpAtan, ParamType::Float4, ParamType::Float4},
>+    {BuiltInId::atan_Float4_Float4,
>      "float4 atan_emu(float4 y, float4 x)\n"
>      "{\n"
>      "    if(x[0] == 0 && y[0] == 0) x[0] = 1;\n"
>@@ -194,72 +195,72 @@ constexpr FunctionPair g_hlslFunctions[] = {
>      "    return float4(atan2(y[0], x[0]), atan2(y[1], x[1]), atan2(y[2], \n"
>      "    x[2]), atan2(y[3], x[3]));\n"
>      "}\n"},
>-    {{EOpAsinh, ParamType::Float1},
>+    {BuiltInId::asinh_Float1,
>      "float asinh_emu(in float x)\n"
>      "{\n"
>      "    return log(x + sqrt(pow(x, 2.0) + 1.0));\n"
>      "}\n"},
>-    {{EOpAsinh, ParamType::Float2},
>+    {BuiltInId::asinh_Float2,
>      "float2 asinh_emu(in float2 x)\n"
>      "{\n"
>      "    return log(x + sqrt(pow(x, 2.0) + 1.0));\n"
>      "}\n"},
>-    {{EOpAsinh, ParamType::Float3},
>+    {BuiltInId::asinh_Float3,
>      "float3 asinh_emu(in float3 x)\n"
>      "{\n"
>      "    return log(x + sqrt(pow(x, 2.0) + 1.0));\n"
>      "}\n"},
>-    {{EOpAsinh, ParamType::Float4},
>+    {BuiltInId::asinh_Float4,
>      "float4 asinh_emu(in float4 x)\n"
>      "{\n"
>      "    return log(x + sqrt(pow(x, 2.0) + 1.0));\n"
>      "}\n"},
>-    {{EOpAcosh, ParamType::Float1},
>+    {BuiltInId::acosh_Float1,
>      "float acosh_emu(in float x)\n"
>      "{\n"
>      "    return log(x + sqrt(x + 1.0) * sqrt(x - 1.0));\n"
>      "}\n"},
>-    {{EOpAcosh, ParamType::Float2},
>+    {BuiltInId::acosh_Float2,
>      "float2 acosh_emu(in float2 x)\n"
>      "{\n"
>      "    return log(x + sqrt(x + 1.0) * sqrt(x - 1.0));\n"
>      "}\n"},
>-    {{EOpAcosh, ParamType::Float3},
>+    {BuiltInId::acosh_Float3,
>      "float3 acosh_emu(in float3 x)\n"
>      "{\n"
>      "    return log(x + sqrt(x + 1.0) * sqrt(x - 1.0));\n"
>      "}\n"},
>-    {{EOpAcosh, ParamType::Float4},
>+    {BuiltInId::acosh_Float4,
>      "float4 acosh_emu(in float4 x)\n"
>      "{\n"
>      "    return log(x + sqrt(x + 1.0) * sqrt(x - 1.0));\n"
>      "}\n"},
>-    {{EOpAtanh, ParamType::Float1},
>+    {BuiltInId::atanh_Float1,
>      "float atanh_emu(in float x)\n"
>      "{\n"
>      "    return 0.5 * log((1.0 + x) / (1.0 - x));\n"
>      "}\n"},
>-    {{EOpAtanh, ParamType::Float2},
>+    {BuiltInId::atanh_Float2,
>      "float2 atanh_emu(in float2 x)\n"
>      "{\n"
>      "    return 0.5 * log((1.0 + x) / (1.0 - x));\n"
>      "}\n"},
>-    {{EOpAtanh, ParamType::Float3},
>+    {BuiltInId::atanh_Float3,
>      "float3 atanh_emu(in float3 x)\n"
>      "{\n"
>      "    return 0.5 * log((1.0 + x) / (1.0 - x));\n"
>      "}\n"},
>-    {{EOpAtanh, ParamType::Float4},
>+    {BuiltInId::atanh_Float4,
>      "float4 atanh_emu(in float4 x)\n"
>      "{\n"
>      "    return 0.5 * log((1.0 + x) / (1.0 - x));\n"
>      "}\n"},
>-    {{EOpRoundEven, ParamType::Float1},
>+    {BuiltInId::roundEven_Float1,
>      "float roundEven_emu(in float x)\n"
>      "{\n"
>      "    return (frac(x) == 0.5 && trunc(x) % 2.0 == 0.0) ? trunc(x) : round(x);\n"
>      "}\n"},
>-    {{EOpRoundEven, ParamType::Float2},
>+    {BuiltInId::roundEven_Float2,
>      "float2 roundEven_emu(in float2 x)\n"
>      "{\n"
>      "    float2 v;\n"
>@@ -267,7 +268,7 @@ constexpr FunctionPair g_hlslFunctions[] = {
>      "    v[1] = (frac(x[1]) == 0.5 && trunc(x[1]) % 2.0 == 0.0) ? trunc(x[1]) : round(x[1]);\n"
>      "    return v;\n"
>      "}\n"},
>-    {{EOpRoundEven, ParamType::Float3},
>+    {BuiltInId::roundEven_Float3,
>      "float3 roundEven_emu(in float3 x)\n"
>      "{\n"
>      "    float3 v;\n"
>@@ -276,7 +277,7 @@ constexpr FunctionPair g_hlslFunctions[] = {
>      "    v[2] = (frac(x[2]) == 0.5 && trunc(x[2]) % 2.0 == 0.0) ? trunc(x[2]) : round(x[2]);\n"
>      "    return v;\n"
>      "}\n"},
>-    {{EOpRoundEven, ParamType::Float4},
>+    {BuiltInId::roundEven_Float4,
>      "float4 roundEven_emu(in float4 x)\n"
>      "{\n"
>      "    float4 v;\n"
>@@ -286,7 +287,7 @@ constexpr FunctionPair g_hlslFunctions[] = {
>      "    v[3] = (frac(x[3]) == 0.5 && trunc(x[3]) % 2.0 == 0.0) ? trunc(x[3]) : round(x[3]);\n"
>      "    return v;\n"
>      "}\n"},
>-    {{EOpPackSnorm2x16, ParamType::Float2},
>+    {BuiltInId::packSnorm2x16_Float2,
>      "int webgl_toSnorm16(in float x) {\n"
>      "    return int(round(clamp(x, -1.0, 1.0) * 32767.0));\n"
>      "}\n"
>@@ -296,7 +297,7 @@ constexpr FunctionPair g_hlslFunctions[] = {
>      "    int y = webgl_toSnorm16(v.y);\n"
>      "    return (asuint(y) << 16) | (asuint(x) & 0xffffu);\n"
>      "}\n"},
>-    {{EOpPackUnorm2x16, ParamType::Float2},
>+    {BuiltInId::packUnorm2x16_Float2,
>      "uint webgl_toUnorm16(in float x) {\n"
>      "    return uint(round(clamp(x, 0.0, 1.0) * 65535.0));\n"
>      "}\n"
>@@ -306,14 +307,14 @@ constexpr FunctionPair g_hlslFunctions[] = {
>      "    uint y = webgl_toUnorm16(v.y);\n"
>      "    return (y << 16) | x;\n"
>      "}\n"},
>-    {{EOpPackHalf2x16, ParamType::Float2},
>+    {BuiltInId::packHalf2x16_Float2,
>      "uint packHalf2x16_emu(in float2 v)\n"
>      "{\n"
>      "    uint x = f32tof16(v.x);\n"
>      "    uint y = f32tof16(v.y);\n"
>      "    return (y << 16) | x;\n"
>      "}\n"},
>-    {{EOpUnpackSnorm2x16, ParamType::Uint1},
>+    {BuiltInId::unpackSnorm2x16_UInt1,
>      "float webgl_fromSnorm16(in uint x) {\n"
>      "    int xi = asint(x & 0x7fffu) - asint(x & 0x8000u);\n"
>      "    return clamp(float(xi) / 32767.0, -1.0, 1.0);\n"
>@@ -324,7 +325,7 @@ constexpr FunctionPair g_hlslFunctions[] = {
>      "    uint x = u;\n"
>      "    return float2(webgl_fromSnorm16(x), webgl_fromSnorm16(y));\n"
>      "}\n"},
>-    {{EOpUnpackUnorm2x16, ParamType::Uint1},
>+    {BuiltInId::unpackUnorm2x16_UInt1,
>      "float webgl_fromUnorm16(in uint x) {\n"
>      "    return float(x) / 65535.0;\n"
>      "}\n"
>@@ -334,14 +335,14 @@ constexpr FunctionPair g_hlslFunctions[] = {
>      "    uint x = u & 0xffffu;\n"
>      "    return float2(webgl_fromUnorm16(x), webgl_fromUnorm16(y));\n"
>      "}\n"},
>-    {{EOpUnpackHalf2x16, ParamType::Uint1},
>+    {BuiltInId::unpackHalf2x16_UInt1,
>      "float2 unpackHalf2x16_emu(in uint u)\n"
>      "{\n"
>      "    uint y = (u >> 16);\n"
>      "    uint x = u & 0xffffu;\n"
>      "    return float2(f16tof32(x), f16tof32(y));\n"
>      "}\n"},
>-    {{EOpPackSnorm4x8, ParamType::Float4},
>+    {BuiltInId::packSnorm4x8_Float4,
>      "int webgl_toSnorm8(in float x) {\n"
>      "    return int(round(clamp(x, -1.0, 1.0) * 127.0));\n"
>      "}\n"
>@@ -354,7 +355,7 @@ constexpr FunctionPair g_hlslFunctions[] = {
>      "    return ((asuint(w) & 0xffu) << 24) | ((asuint(z) & 0xffu) << 16) \n"
>      "    | ((asuint(y) & 0xffu) << 8) | (asuint(x) & 0xffu);\n"
>      "}\n"},
>-    {{EOpPackUnorm4x8, ParamType::Float4},
>+    {BuiltInId::packUnorm4x8_Float4,
>      "uint webgl_toUnorm8(in float x) {\n"
>      "    return uint(round(clamp(x, 0.0, 1.0) * 255.0));\n"
>      "}\n"
>@@ -366,7 +367,7 @@ constexpr FunctionPair g_hlslFunctions[] = {
>      "    uint w = webgl_toUnorm8(v.w);\n"
>      "    return (w << 24) | (z << 16) | (y << 8) | x;\n"
>      "}\n"},
>-    {{EOpUnpackSnorm4x8, ParamType::Uint1},
>+    {BuiltInId::unpackSnorm4x8_UInt1,
>      "float webgl_fromSnorm8(in uint x) {\n"
>      "    int xi = asint(x & 0x7fu) - asint(x & 0x80u);\n"
>      "    return clamp(float(xi) / 127.0, -1.0, 1.0);\n"
>@@ -380,7 +381,7 @@ constexpr FunctionPair g_hlslFunctions[] = {
>      "    return float4(webgl_fromSnorm8(x), webgl_fromSnorm8(y), \n"
>      "    webgl_fromSnorm8(z), webgl_fromSnorm8(w));\n"
>      "}\n"},
>-    {{EOpUnpackUnorm4x8, ParamType::Uint1},
>+    {BuiltInId::unpackUnorm4x8_UInt1,
>      "float webgl_fromUnorm8(in uint x) {\n"
>      "    return float(x) / 255.0;\n"
>      "}\n"
>@@ -402,47 +403,47 @@ constexpr FunctionPair g_hlslFunctions[] = {
>     // transpose(r) and transpose(c) are in a sense free, since to get the
>     // transpose of r, we simply can build a column matrix out of the original
>     // vector instead of a row matrix.
>-    {{EOpOuterProduct, ParamType::Float2, ParamType::Float2},
>+    {BuiltInId::outerProduct_Float2_Float2,
>      "float2x2 outerProduct_emu(in float2 c, in float2 r)\n"
>      "{\n"
>      "    return mul(float2x1(r), float1x2(c));\n"
>      "}\n"},
>-    {{EOpOuterProduct, ParamType::Float3, ParamType::Float3},
>+    {BuiltInId::outerProduct_Float3_Float3,
>      "float3x3 outerProduct_emu(in float3 c, in float3 r)\n"
>      "{\n"
>      "    return mul(float3x1(r), float1x3(c));\n"
>      "}\n"},
>-    {{EOpOuterProduct, ParamType::Float4, ParamType::Float4},
>+    {BuiltInId::outerProduct_Float4_Float4,
>      "float4x4 outerProduct_emu(in float4 c, in float4 r)\n"
>      "{\n"
>      "    return mul(float4x1(r), float1x4(c));\n"
>      "}\n"},
>-    {{EOpOuterProduct, ParamType::Float3, ParamType::Float2},
>+    {BuiltInId::outerProduct_Float3_Float2,
>      "float2x3 outerProduct_emu(in float3 c, in float2 r)\n"
>      "{\n"
>      "    return mul(float2x1(r), float1x3(c));\n"
>      "}\n"},
>-    {{EOpOuterProduct, ParamType::Float2, ParamType::Float3},
>+    {BuiltInId::outerProduct_Float2_Float3,
>      "float3x2 outerProduct_emu(in float2 c, in float3 r)\n"
>      "{\n"
>      "    return mul(float3x1(r), float1x2(c));\n"
>      "}\n"},
>-    {{EOpOuterProduct, ParamType::Float4, ParamType::Float2},
>+    {BuiltInId::outerProduct_Float4_Float2,
>      "float2x4 outerProduct_emu(in float4 c, in float2 r)\n"
>      "{\n"
>      "    return mul(float2x1(r), float1x4(c));\n"
>      "}\n"},
>-    {{EOpOuterProduct, ParamType::Float2, ParamType::Float4},
>+    {BuiltInId::outerProduct_Float2_Float4,
>      "float4x2 outerProduct_emu(in float2 c, in float4 r)\n"
>      "{\n"
>      "    return mul(float4x1(r), float1x2(c));\n"
>      "}\n"},
>-    {{EOpOuterProduct, ParamType::Float4, ParamType::Float3},
>+    {BuiltInId::outerProduct_Float4_Float3,
>      "float3x4 outerProduct_emu(in float4 c, in float3 r)\n"
>      "{\n"
>      "    return mul(float3x1(r), float1x4(c));\n"
>      "}\n"},
>-    {{EOpOuterProduct, ParamType::Float3, ParamType::Float4},
>+    {BuiltInId::outerProduct_Float3_Float4,
>      "float4x3 outerProduct_emu(in float3 c, in float4 r)\n"
>      "{\n"
>      "    return mul(float4x1(r), float1x3(c));\n"
>@@ -458,14 +459,14 @@ constexpr FunctionPair g_hlslFunctions[] = {
>     // which happens to be the cofactor matrix. That's stored in 'cof'.
>     // We don't need to care about divide-by-zero since results are undefined
>     // for singular or poorly-conditioned matrices.
>-    {{EOpInverse, ParamType::Mat2},
>+    {BuiltInId::inverse_Float2x2,
>      "float2x2 inverse_emu(in float2x2 m)\n"
>      "{\n"
>      "    float2x2 cof = { m[1][1], -m[0][1], -m[1][0], m[0][0] };\n"
>      "    return cof / determinant(transpose(m));\n"
>      "}\n"},
>     // cofAB is the cofactor for column A and row B.
>-    {{EOpInverse, ParamType::Mat3},
>+    {BuiltInId::inverse_Float3x3,
>      "float3x3 inverse_emu(in float3x3 m)\n"
>      "{\n"
>      "    float cof00 = m[1][1] * m[2][2] - m[2][1] * m[1][2];\n"
>@@ -480,7 +481,7 @@ constexpr FunctionPair g_hlslFunctions[] = {
>      "    float3x3 cof = { cof00, cof10, cof20, cof01, cof11, cof21, cof02, cof12, cof22 };\n"
>      "    return cof / determinant(transpose(m));\n"
>      "}\n"},
>-    {{EOpInverse, ParamType::Mat4},
>+    {BuiltInId::inverse_Float4x4,
>      "float4x4 inverse_emu(in float4x4 m)\n"
>      "{\n"
>      "    float cof00 = m[1][1] * m[2][2] * m[3][3] + m[2][1] * m[3][2] * m[1][3] + m[3][1] * \n"
>@@ -556,27 +557,27 @@ constexpr FunctionPair g_hlslFunctions[] = {
>     // comes from. For a component of 'a' that is false, the corresponding component of 'x' is
>     // returned. For a component of 'a' that is true, the corresponding component of 'y' is
>     // returned.
>-    {{EOpMix, ParamType::Float1, ParamType::Float1, ParamType::Bool1},
>+    {BuiltInId::mix_Float1_Float1_Bool1,
>      "float mix_emu(float x, float y, bool a)\n"
>      "{\n"
>      "    return a ? y : x;\n"
>      "}\n"},
>-    {{EOpMix, ParamType::Float2, ParamType::Float2, ParamType::Bool2},
>+    {BuiltInId::mix_Float2_Float2_Bool2,
>      "float2 mix_emu(float2 x, float2 y, bool2 a)\n"
>      "{\n"
>      "    return a ? y : x;\n"
>      "}\n"},
>-    {{EOpMix, ParamType::Float3, ParamType::Float3, ParamType::Bool3},
>+    {BuiltInId::mix_Float3_Float3_Bool3,
>      "float3 mix_emu(float3 x, float3 y, bool3 a)\n"
>      "{\n"
>      "    return a ? y : x;\n"
>      "}\n"},
>-    {{EOpMix, ParamType::Float4, ParamType::Float4, ParamType::Bool4},
>+    {BuiltInId::mix_Float4_Float4_Bool4,
>      "float4 mix_emu(float4 x, float4 y, bool4 a)\n"
>      "{\n"
>      "    return a ? y : x;\n"
>      "}\n"},
>-    {{EOpBitfieldExtract, ParamType::Uint1, ParamType::Int1, ParamType::Int1},
>+    {BuiltInId::bitfieldExtract_UInt1_Int1_Int1,
>      "uint bitfieldExtract_emu(uint value, int offset, int bits)\n"
>      "{\n"
>      "    if (offset < 0 || bits <= 0 || offset >= 32 || bits > 32 || offset + bits > 32)\n"
>@@ -587,7 +588,7 @@ constexpr FunctionPair g_hlslFunctions[] = {
>      "    uint mask = ((maskMsb - 1u) | maskMsb) << offset;\n"
>      "    return (value & mask) >> offset;\n"
>      "}\n"},
>-    {{EOpBitfieldExtract, ParamType::Uint2, ParamType::Int1, ParamType::Int1},
>+    {BuiltInId::bitfieldExtract_UInt2_Int1_Int1,
>      "uint2 bitfieldExtract_emu(uint2 value, int offset, int bits)\n"
>      "{\n"
>      "    if (offset < 0 || bits <= 0 || offset >= 32 || bits > 32 || offset + bits > 32)\n"
>@@ -598,7 +599,7 @@ constexpr FunctionPair g_hlslFunctions[] = {
>      "    uint mask = ((maskMsb - 1u) | maskMsb) << offset;\n"
>      "    return (value & mask) >> offset;\n"
>      "}\n"},
>-    {{EOpBitfieldExtract, ParamType::Uint3, ParamType::Int1, ParamType::Int1},
>+    {BuiltInId::bitfieldExtract_UInt3_Int1_Int1,
>      "uint3 bitfieldExtract_emu(uint3 value, int offset, int bits)\n"
>      "{\n"
>      "    if (offset < 0 || bits <= 0 || offset >= 32 || bits > 32 || offset + bits > 32)\n"
>@@ -609,7 +610,7 @@ constexpr FunctionPair g_hlslFunctions[] = {
>      "    uint mask = ((maskMsb - 1u) | maskMsb) << offset;\n"
>      "    return (value & mask) >> offset;\n"
>      "}\n"},
>-    {{EOpBitfieldExtract, ParamType::Uint4, ParamType::Int1, ParamType::Int1},
>+    {BuiltInId::bitfieldExtract_UInt4_Int1_Int1,
>      "uint4 bitfieldExtract_emu(uint4 value, int offset, int bits)\n"
>      "{\n"
>      "    if (offset < 0 || bits <= 0 || offset >= 32 || bits > 32 || offset + bits > 32)\n"
>@@ -620,7 +621,7 @@ constexpr FunctionPair g_hlslFunctions[] = {
>      "    uint mask = ((maskMsb - 1u) | maskMsb) << offset;\n"
>      "    return (value & mask) >> offset;\n"
>      "}\n"},
>-    {{EOpBitfieldExtract, ParamType::Int1, ParamType::Int1, ParamType::Int1},
>+    {BuiltInId::bitfieldExtract_Int1_Int1_Int1,
>      "int bitfieldExtract_emu(int value, int offset, int bits)\n"
>      "{\n"
>      "    if (offset < 0 || bits <= 0 || offset >= 32 || bits > 32 || offset + bits > 32)\n"
>@@ -637,7 +638,7 @@ constexpr FunctionPair g_hlslFunctions[] = {
>      "    }\n"
>      "    return asint(resultUnsigned);\n"
>      "}\n"},
>-    {{EOpBitfieldExtract, ParamType::Int2, ParamType::Int1, ParamType::Int1},
>+    {BuiltInId::bitfieldExtract_Int2_Int1_Int1,
>      "int2 bitfieldExtract_emu(int2 value, int offset, int bits)\n"
>      "{\n"
>      "    if (offset < 0 || bits <= 0 || offset >= 32 || bits > 32 || offset + bits > 32)\n"
>@@ -654,7 +655,7 @@ constexpr FunctionPair g_hlslFunctions[] = {
>      "    }\n"
>      "    return asint(resultUnsigned);\n"
>      "}\n"},
>-    {{EOpBitfieldExtract, ParamType::Int3, ParamType::Int1, ParamType::Int1},
>+    {BuiltInId::bitfieldExtract_Int3_Int1_Int1,
>      "int3 bitfieldExtract_emu(int3 value, int offset, int bits)\n"
>      "{\n"
>      "    if (offset < 0 || bits <= 0 || offset >= 32 || bits > 32 || offset + bits > 32)\n"
>@@ -671,7 +672,7 @@ constexpr FunctionPair g_hlslFunctions[] = {
>      "    }\n"
>      "    return asint(resultUnsigned);\n"
>      "}\n"},
>-    {{EOpBitfieldExtract, ParamType::Int4, ParamType::Int1, ParamType::Int1},
>+    {BuiltInId::bitfieldExtract_Int4_Int1_Int1,
>      "int4 bitfieldExtract_emu(int4 value, int offset, int bits)\n"
>      "{\n"
>      "    if (offset < 0 || bits <= 0 || offset >= 32 || bits > 32 || offset + bits > 32)\n"
>@@ -688,7 +689,7 @@ constexpr FunctionPair g_hlslFunctions[] = {
>      "    }\n"
>      "    return asint(resultUnsigned);\n"
>      "}\n"},
>-    {{EOpBitfieldInsert, ParamType::Uint1, ParamType::Uint1, ParamType::Int1, ParamType::Int1},
>+    {BuiltInId::bitfieldInsert_UInt1_UInt1_Int1_Int1,
>      "uint bitfieldInsert_emu(uint base, uint insert, int offset, int bits)\n"
>      "{\n"
>      "    if (offset < 0 || bits <= 0 || offset >= 32 || bits > 32 || offset + bits > 32)\n"
>@@ -700,7 +701,7 @@ constexpr FunctionPair g_hlslFunctions[] = {
>      "    uint baseMask = ~insertMask;\n"
>      "    return (base & baseMask) | ((insert << offset) & insertMask);\n"
>      "}\n"},
>-    {{EOpBitfieldInsert, ParamType::Uint2, ParamType::Uint2, ParamType::Int1, ParamType::Int1},
>+    {BuiltInId::bitfieldInsert_UInt2_UInt2_Int1_Int1,
>      "uint2 bitfieldInsert_emu(uint2 base, uint2 insert, int offset, int bits)\n"
>      "{\n"
>      "    if (offset < 0 || bits <= 0 || offset >= 32 || bits > 32 || offset + bits > 32)\n"
>@@ -712,7 +713,7 @@ constexpr FunctionPair g_hlslFunctions[] = {
>      "    uint baseMask = ~insertMask;\n"
>      "    return (base & baseMask) | ((insert << offset) & insertMask);\n"
>      "}\n"},
>-    {{EOpBitfieldInsert, ParamType::Uint3, ParamType::Uint3, ParamType::Int1, ParamType::Int1},
>+    {BuiltInId::bitfieldInsert_UInt3_UInt3_Int1_Int1,
>      "uint3 bitfieldInsert_emu(uint3 base, uint3 insert, int offset, int bits)\n"
>      "{\n"
>      "    if (offset < 0 || bits <= 0 || offset >= 32 || bits > 32 || offset + bits > 32)\n"
>@@ -724,7 +725,7 @@ constexpr FunctionPair g_hlslFunctions[] = {
>      "    uint baseMask = ~insertMask;\n"
>      "    return (base & baseMask) | ((insert << offset) & insertMask);\n"
>      "}\n"},
>-    {{EOpBitfieldInsert, ParamType::Uint4, ParamType::Uint4, ParamType::Int1, ParamType::Int1},
>+    {BuiltInId::bitfieldInsert_UInt4_UInt4_Int1_Int1,
>      "uint4 bitfieldInsert_emu(uint4 base, uint4 insert, int offset, int bits)\n"
>      "{\n"
>      "    if (offset < 0 || bits <= 0 || offset >= 32 || bits > 32 || offset + bits > 32)\n"
>@@ -736,7 +737,7 @@ constexpr FunctionPair g_hlslFunctions[] = {
>      "    uint baseMask = ~insertMask;\n"
>      "    return (base & baseMask) | ((insert << offset) & insertMask);\n"
>      "}\n"},
>-    {{EOpBitfieldInsert, ParamType::Int1, ParamType::Int1, ParamType::Int1, ParamType::Int1},
>+    {BuiltInId::bitfieldInsert_Int1_Int1_Int1_Int1,
>      "int bitfieldInsert_emu(int base, int insert, int offset, int bits)\n"
>      "{\n"
>      "    if (offset < 0 || bits <= 0 || offset >= 32 || bits > 32 || offset + bits > 32)\n"
>@@ -750,7 +751,7 @@ constexpr FunctionPair g_hlslFunctions[] = {
>      "                           insertMask);\n"
>      "    return asint(resultUnsigned);\n"
>      "}\n"},
>-    {{EOpBitfieldInsert, ParamType::Int2, ParamType::Int2, ParamType::Int1, ParamType::Int1},
>+    {BuiltInId::bitfieldInsert_Int2_Int2_Int1_Int1,
>      "int2 bitfieldInsert_emu(int2 base, int2 insert, int offset, int bits)\n"
>      "{\n"
>      "    if (offset < 0 || bits <= 0 || offset >= 32 || bits > 32 || offset + bits > 32)\n"
>@@ -764,7 +765,7 @@ constexpr FunctionPair g_hlslFunctions[] = {
>      "                            insertMask);\n"
>      "    return asint(resultUnsigned);\n"
>      "}\n"},
>-    {{EOpBitfieldInsert, ParamType::Int3, ParamType::Int3, ParamType::Int1, ParamType::Int1},
>+    {BuiltInId::bitfieldInsert_Int3_Int3_Int1_Int1,
>      "int3 bitfieldInsert_emu(int3 base, int3 insert, int offset, int bits)\n"
>      "{\n"
>      "    if (offset < 0 || bits <= 0 || offset >= 32 || bits > 32 || offset + bits > 32)\n"
>@@ -778,7 +779,7 @@ constexpr FunctionPair g_hlslFunctions[] = {
>      "                            insertMask);\n"
>      "    return asint(resultUnsigned);\n"
>      "}\n"},
>-    {{EOpBitfieldInsert, ParamType::Int4, ParamType::Int4, ParamType::Int1, ParamType::Int1},
>+    {BuiltInId::bitfieldInsert_Int4_Int4_Int1_Int1,
>      "int4 bitfieldInsert_emu(int4 base, int4 insert, int offset, int bits)\n"
>      "{\n"
>      "    if (offset < 0 || bits <= 0 || offset >= 32 || bits > 32 || offset + bits > 32)\n"
>@@ -792,63 +793,84 @@ constexpr FunctionPair g_hlslFunctions[] = {
>      "    insertMask);\n"
>      "    return asint(resultUnsigned);\n"
>      "}\n"},
>-    {{EOpUaddCarry, ParamType::Uint1, ParamType::Uint1, ParamType::Uint1},
>+    {BuiltInId::uaddCarry_UInt1_UInt1_UInt1,
>      "uint uaddCarry_emu(uint x, uint y, out uint carry)\n"
>      "{\n"
>      "    carry = uint(x > (0xffffffffu - y));\n"
>      "    return x + y;\n"
>      "}\n"},
>-    {{EOpUaddCarry, ParamType::Uint2, ParamType::Uint2, ParamType::Uint2},
>+    {BuiltInId::uaddCarry_UInt2_UInt2_UInt2,
>      "uint2 uaddCarry_emu(uint2 x, uint2 y, out uint2 carry)\n"
>      "{\n"
>      "    carry = uint2(x > (0xffffffffu - y));\n"
>      "    return x + y;\n"
>      "}\n"},
>-    {{EOpUaddCarry, ParamType::Uint3, ParamType::Uint3, ParamType::Uint3},
>+    {BuiltInId::uaddCarry_UInt3_UInt3_UInt3,
>      "uint3 uaddCarry_emu(uint3 x, uint3 y, out uint3 carry)\n"
>      "{\n"
>      "    carry = uint3(x > (0xffffffffu - y));\n"
>      "    return x + y;\n"
>      "}\n"},
>-    {{EOpUaddCarry, ParamType::Uint4, ParamType::Uint4, ParamType::Uint4},
>+    {BuiltInId::uaddCarry_UInt4_UInt4_UInt4,
>      "uint4 uaddCarry_emu(uint4 x, uint4 y, out uint4 carry)\n"
>      "{\n"
>      "    carry = uint4(x > (0xffffffffu - y));\n"
>      "    return x + y;\n"
>      "}\n"},
>-    {{EOpUsubBorrow, ParamType::Uint1, ParamType::Uint1, ParamType::Uint1},
>+    {BuiltInId::usubBorrow_UInt1_UInt1_UInt1,
>      "uint usubBorrow_emu(uint x, uint y, out uint borrow)\n"
>      "{\n"
>      "    borrow = uint(x < y);\n"
>      "    return x - y;\n"
>      "}\n"},
>-    {{EOpUsubBorrow, ParamType::Uint2, ParamType::Uint2, ParamType::Uint2},
>+    {BuiltInId::usubBorrow_UInt2_UInt2_UInt2,
>      "uint2 usubBorrow_emu(uint2 x, uint2 y, out uint2 borrow)\n"
>      "{\n"
>      "    borrow = uint2(x < y);\n"
>      "    return x - y;\n"
>      "}\n"},
>-    {{EOpUsubBorrow, ParamType::Uint3, ParamType::Uint3, ParamType::Uint3},
>+    {BuiltInId::usubBorrow_UInt3_UInt3_UInt3,
>      "uint3 usubBorrow_emu(uint3 x, uint3 y, out uint3 borrow)\n"
>      "{\n"
>      "    borrow = uint3(x < y);\n"
>      "    return x - y;\n"
>      "}\n"},
>-    {{EOpUsubBorrow, ParamType::Uint4, ParamType::Uint4, ParamType::Uint4},
>+    {BuiltInId::usubBorrow_UInt4_UInt4_UInt4,
>      "uint4 usubBorrow_emu(uint4 x, uint4 y, out uint4 borrow)\n"
>      "{\n"
>      "    borrow = uint4(x < y);\n"
>      "    return x - y;\n"
>      "}\n"},
>+    // We emulate tanh just to avoid overflow on large arguments.
>+    {BuiltInId::tanh_Float1,
>+     "float tanh_emu(float x)\n"
>+     "{\n"
>+     "    return (abs(x) > 15.0) ? sign(x) : tanh(x);\n"
>+     "}\n"},
>+    {BuiltInId::tanh_Float2,
>+     "float2 tanh_emu(float2 x)\n"
>+     "{\n"
>+     "    return (abs(x) > 15.0) ? sign(x) : tanh(x);\n"
>+     "}\n"},
>+    {BuiltInId::tanh_Float3,
>+     "float3 tanh_emu(float3 x)\n"
>+     "{\n"
>+     "    return (abs(x) > 15.0) ? sign(x) : tanh(x);\n"
>+     "}\n"},
>+    {BuiltInId::tanh_Float4,
>+     "float4 tanh_emu(float4 x)\n"
>+     "{\n"
>+     "    return (abs(x) > 15.0) ? sign(x) : tanh(x);\n"
>+     "}\n"},
> };
> }  // anonymous namespace
> 
>-const char *FindHLSLFunction(const FunctionId &functionID)
>+const char *FindHLSLFunction(int uniqueId)
> {
>     for (size_t index = 0; index < ArraySize(g_hlslFunctions); ++index)
>     {
>         const auto &function = g_hlslFunctions[index];
>-        if (function.id == functionID)
>+        if (function.id == uniqueId)
>         {
>             return function.body;
>         }
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/gen_builtin_symbols.py b/Source/ThirdParty/ANGLE/src/compiler/translator/gen_builtin_symbols.py
>new file mode 100644
>index 00000000000..ff14b0a73e6
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/gen_builtin_symbols.py
>@@ -0,0 +1,1403 @@
>+#!/usr/bin/python
>+# Copyright 2018 The ANGLE Project Authors. All rights reserved.
>+# Use of this source code is governed by a BSD-style license that can be
>+# found in the LICENSE file.
>+#
>+# gen_builtin_symbols.py:
>+#  Code generation for the built-in symbol tables.
>+
>+from collections import OrderedDict
>+from datetime import date
>+import argparse
>+import hashlib
>+import json
>+import re
>+import os
>+import sys
>+
>+template_immutablestringtest_cpp = """// GENERATED FILE - DO NOT EDIT.
>+// Generated by {script_name} using data from {function_data_source_name}.
>+//
>+// Copyright {copyright_year} The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// ImmutableString_test_autogen.cpp:
>+//   Tests for matching script-generated hashes with runtime computed hashes.
>+
>+#include "compiler/translator/ImmutableString.h"
>+#include "gtest/gtest.h"
>+
>+namespace sh
>+{{
>+
>+TEST(ImmutableStringTest, ScriptGeneratedHashesMatch)
>+{{
>+{script_generated_hash_tests}
>+}}
>+
>+}}  // namespace sh
>+"""
>+
>+# The header file has a "get" function for each variable. They are used in traversers.
>+# It also declares id values of built-ins with human readable names, so they can be used to identify built-ins.
>+template_builtin_header = """// GENERATED FILE - DO NOT EDIT.
>+// Generated by {script_name} using data from {variable_data_source_name} and
>+// {function_data_source_name}.
>+//
>+// Copyright {copyright_year} The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// BuiltIn_autogen.h:
>+//   Compile-time initialized built-ins.
>+
>+#ifndef COMPILER_TRANSLATOR_TREEUTIL_BUILTIN_AUTOGEN_H_
>+#define COMPILER_TRANSLATOR_TREEUTIL_BUILTIN_AUTOGEN_H_
>+
>+#include "compiler/translator/SymbolUniqueId.h"
>+
>+namespace sh
>+{{
>+
>+class TVariable;
>+
>+class BuiltInId
>+{{
>+public:
>+
>+{builtin_id_declarations}
>+
>+}};  // class BuiltInId
>+
>+namespace BuiltInVariable
>+{{
>+
>+{get_variable_declarations}
>+
>+}}  // namespace BuiltInVariable
>+
>+}}  // namespace sh
>+
>+#endif  // COMPILER_TRANSLATOR_TREEUTIL_BUILTIN_AUTOGEN_H_
>+"""
>+
>+template_symboltable_h = """// GENERATED FILE - DO NOT EDIT.
>+// Generated by {script_name} using data from {variable_data_source_name} and
>+// {function_data_source_name}.
>+//
>+// Copyright {copyright_year} The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// SymbolTable_autogen.h:
>+//   Autogenerated member variables of TSymbolTable.
>+
>+#ifndef COMPILER_TRANSLATOR_SYMBOLTABLE_AUTOGEN_H_
>+#define COMPILER_TRANSLATOR_SYMBOLTABLE_AUTOGEN_H_
>+
>+namespace sh
>+{{
>+
>+class TSymbolTableBase
>+{{
>+  protected:
>+    TSymbolTableBase() = default;
>+{declare_member_variables}
>+}};
>+
>+}}  // namespace sh
>+
>+#endif  // COMPILER_TRANSLATOR_SYMBOLTABLE_AUTOGEN_H_
>+"""
>+
>+# By having the variables defined in a cpp file we ensure that there's just one instance of each of the declared variables.
>+template_symboltable_cpp = """// GENERATED FILE - DO NOT EDIT.
>+// Generated by {script_name} using data from {variable_data_source_name} and
>+// {function_data_source_name}.
>+//
>+// Copyright {copyright_year} The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// SymbolTable_autogen.cpp:
>+//   Compile-time initialized built-ins.
>+
>+#include "compiler/translator/SymbolTable.h"
>+
>+#include "angle_gl.h"
>+#include "compiler/translator/tree_util/BuiltIn_autogen.h"
>+#include "compiler/translator/ImmutableString.h"
>+#include "compiler/translator/StaticType.h"
>+#include "compiler/translator/Symbol.h"
>+#include "compiler/translator/SymbolTable.h"
>+
>+namespace sh
>+{{
>+
>+// Since some of the BuiltInId declarations are used outside of constexpr expressions, we need to
>+// have these definitions without an initializer. C++17 should eventually remove the need for this.
>+{builtin_id_definitions}
>+
>+const int TSymbolTable::kLastBuiltInId = {last_builtin_id};
>+
>+namespace BuiltInName
>+{{
>+
>+constexpr const ImmutableString _empty("");
>+{name_declarations}
>+
>+}}  // namespace BuiltInName
>+
>+// TODO(oetuaho): Would be nice to make this a class instead of a namespace so that we could friend
>+// this from TVariable. Now symbol constructors taking an id have to be public even though they're
>+// not supposed to be accessible from outside of here. http://anglebug.com/2390
>+namespace BuiltInVariable
>+{{
>+
>+{variable_declarations}
>+
>+{get_variable_definitions}
>+
>+}}  // namespace BuiltInVariable
>+
>+namespace BuiltInParameters
>+{{
>+
>+{parameter_declarations}
>+
>+}}  // namespace BuiltInParameters
>+
>+namespace UnmangledBuiltIns
>+{{
>+
>+{unmangled_builtin_declarations}
>+
>+}}  // namespace UnmangledBuiltIns
>+
>+// TODO(oetuaho): Would be nice to make this a class instead of a namespace so that we could friend
>+// this from TFunction. Now symbol constructors taking an id have to be public even though they're
>+// not supposed to be accessible from outside of here. http://anglebug.com/2390
>+namespace BuiltInFunction
>+{{
>+
>+{function_declarations}
>+
>+}}  // namespace BuiltInFunction
>+
>+void TSymbolTable::initializeBuiltInVariables(sh::GLenum shaderType,
>+                                              ShShaderSpec spec,
>+                                              const ShBuiltInResources &resources)
>+{{
>+    const TSourceLoc zeroSourceLoc = {{0, 0, 0, 0}};
>+{init_member_variables}
>+}}
>+
>+const TSymbol *TSymbolTable::findBuiltIn(const ImmutableString &name,
>+                                         int shaderVersion) const
>+{{
>+    if (name.length() > {max_mangled_name_length})
>+    {{
>+        return nullptr;
>+    }}
>+    uint32_t nameHash = name.mangledNameHash();
>+    if ((nameHash >> 31) != 0)
>+    {{
>+        // The name contains [ or {{.
>+        return nullptr;
>+    }}
>+{get_builtin}
>+}}
>+
>+const UnmangledBuiltIn *TSymbolTable::getUnmangledBuiltInForShaderVersion(const ImmutableString &name, int shaderVersion)
>+{{
>+    if (name.length() > {max_unmangled_name_length})
>+    {{
>+        return nullptr;
>+    }}
>+    uint32_t nameHash = name.mangledNameHash();
>+{get_unmangled_builtin}
>+}}
>+
>+}}  // namespace sh
>+"""
>+
>+template_parsecontext_header = """// GENERATED FILE - DO NOT EDIT.
>+// Generated by {script_name} using data from {variable_data_source_name} and
>+// {function_data_source_name}.
>+//
>+// Copyright {copyright_year} The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// ParseContext_autogen.h:
>+//   Helpers for built-in related checks.
>+
>+#ifndef COMPILER_TRANSLATOR_PARSECONTEXT_AUTOGEN_H_
>+#define COMPILER_TRANSLATOR_PARSECONTEXT_AUTOGEN_H_
>+
>+namespace sh
>+{{
>+
>+namespace BuiltInGroup
>+{{
>+
>+{is_in_group_definitions}
>+
>+}}  // namespace BuiltInGroup
>+
>+}}  // namespace sh
>+
>+#endif  // COMPILER_TRANSLATOR_PARSECONTEXT_AUTOGEN_H_
>+
>+"""
>+
>+parsed_variables = None
>+
>+basic_types_enumeration = [
>+    'Void',
>+    'Float',
>+    'Int',
>+    'UInt',
>+    'Bool',
>+    'AtomicCounter',
>+    'YuvCscStandardEXT',
>+    'Sampler2D',
>+    'Sampler3D',
>+    'SamplerCube',
>+    'Sampler2DArray',
>+    'SamplerExternalOES',
>+    'SamplerExternal2DY2YEXT',
>+    'Sampler2DRect',
>+    'Sampler2DMS',
>+    'Sampler2DMSArray',
>+    'ISampler2D',
>+    'ISampler3D',
>+    'ISamplerCube',
>+    'ISampler2DArray',
>+    'ISampler2DMS',
>+    'ISampler2DMSArray',
>+    'USampler2D',
>+    'USampler3D',
>+    'USamplerCube',
>+    'USampler2DArray',
>+    'USampler2DMS',
>+    'USampler2DMSArray',
>+    'Sampler2DShadow',
>+    'SamplerCubeShadow',
>+    'Sampler2DArrayShadow',
>+    'Image2D',
>+    'IImage2D',
>+    'UImage2D',
>+    'Image3D',
>+    'IImage3D',
>+    'UImage3D',
>+    'Image2DArray',
>+    'IImage2DArray',
>+    'UImage2DArray',
>+    'ImageCube',
>+    'IImageCube',
>+    'UImageCube'
>+]
>+
>+id_counter = 0
>+
>+def set_working_dir():
>+    script_dir = os.path.dirname(os.path.abspath(__file__))
>+    os.chdir(script_dir)
>+
>+def get_basic_mangled_name(basic):
>+    index = basic_types_enumeration.index(basic)
>+    if index < 26:
>+        return chr(ord('A') + index)
>+    return chr(ord('a') + index - 26)
>+
>+levels = ['ESSL3_1_BUILTINS', 'ESSL3_BUILTINS', 'ESSL1_BUILTINS', 'COMMON_BUILTINS']
>+
>+def get_shader_version_condition_for_level(level):
>+    if level == 'ESSL3_1_BUILTINS':
>+        return 'shaderVersion >= 310'
>+    elif level == 'ESSL3_BUILTINS':
>+        return 'shaderVersion >= 300'
>+    elif level == 'ESSL1_BUILTINS':
>+        return 'shaderVersion == 100'
>+    elif level == 'COMMON_BUILTINS':
>+        return ''
>+    else:
>+        raise Exception('Unsupported symbol table level')
>+
>+class GroupedList:
>+    """"Class for storing a list of objects grouped by symbol table level and condition."""
>+    def __init__(self):
>+        self.objs = OrderedDict()
>+        self.max_name_length = 0
>+        # We need to add all the levels here instead of lazily since they must be in a specific order.
>+        for l in levels:
>+            self.objs[l] = OrderedDict()
>+
>+    def add_obj(self, level, condition, name, obj):
>+        if (level not in levels):
>+            raise Exception('Unexpected level: ' + str(level))
>+        if condition not in self.objs[level]:
>+            self.objs[level][condition] = OrderedDict()
>+        self.objs[level][condition][name] = obj
>+        if len(name) > self.max_name_length:
>+            self.max_name_length = len(name)
>+
>+    def has_key(self, level, condition, name):
>+        if (level not in levels):
>+            raise Exception('Unexpected level: ' + str(level))
>+        if condition not in self.objs[level]:
>+            return False
>+        return (name in self.objs[level][condition])
>+
>+    def get(self, level, condition, name):
>+        if self.has_key(level, condition, name):
>+            return self.objs[level][condition][name]
>+        return None
>+
>+    def get_max_name_length(self):
>+        return self.max_name_length
>+
>+    def get_switch_code(self, script_generated_hash_tests):
>+        code = []
>+        for level in levels:
>+            if len(self.objs[level]) == 0:
>+                continue
>+            level_condition = get_shader_version_condition_for_level(level)
>+            if level_condition != '':
>+                code.append('if ({condition})\n {{'.format(condition = level_condition))
>+
>+            for condition, objs in self.objs[level].iteritems():
>+                if len(objs) > 0:
>+                    if condition != 'NO_CONDITION':
>+                        condition_header = '  if ({condition})\n {{'.format(condition = condition)
>+                        code.append(condition_header.replace('shaderType', 'mShaderType'))
>+
>+                    switch = {}
>+                    for name, obj in objs.iteritems():
>+                        name_hash = mangledNameHash(name, script_generated_hash_tests)
>+                        if name_hash not in switch:
>+                            switch[name_hash] = []
>+                        switch[name_hash].append(obj['hash_matched_code'])
>+
>+                    code.append('switch(nameHash) {')
>+                    for name_hash, obj in sorted(switch.iteritems()):
>+                        code.append('case 0x' + ('%08x' % name_hash) + 'u:\n{')
>+                        code += obj
>+                        code.append('break;\n}')
>+                    code.append('}')
>+
>+                    if condition != 'NO_CONDITION':
>+                        code.append('}')
>+
>+            if level_condition != '':
>+                code.append('}')
>+        code.append('return nullptr;')
>+        return '\n'.join(code)
>+
>+class TType:
>+    def __init__(self, glsl_header_type):
>+        if isinstance(glsl_header_type, basestring):
>+            self.data = self.parse_type(glsl_header_type)
>+        else:
>+            self.data = glsl_header_type
>+        self.normalize()
>+
>+    def normalize(self):
>+        # Note that this will set primarySize and secondarySize also on genTypes. In that case they
>+        # are overridden when the specific types are generated.
>+        if 'primarySize' not in self.data:
>+            if ('secondarySize' in self.data):
>+                raise Exception('Unexpected secondarySize on type that does not have primarySize set')
>+            self.data['primarySize'] = 1
>+        if 'secondarySize' not in self.data:
>+            self.data['secondarySize'] = 1
>+        if 'precision' not in self.data:
>+            self.data['precision'] = 'Undefined'
>+        if 'qualifier' not in self.data:
>+            self.data['qualifier'] = 'Global'
>+
>+    def get_statictype_string(self):
>+        template_type = 'StaticType::Get<Ebt{basic}, Ebp{precision}, Evq{qualifier}, {primarySize}, {secondarySize}>()'
>+        return template_type.format(**self.data)
>+
>+    def get_dynamic_type_string(self):
>+        template_type = 'new TType(Ebt{basic}, Ebp{precision}, Evq{qualifier}, {primarySize}, {secondarySize})'
>+        return template_type.format(**self.data)
>+
>+    def get_mangled_name(self):
>+        mangled_name = ''
>+
>+        size_key = (self.data['secondarySize'] - 1) * 4 + self.data['primarySize'] - 1
>+        if size_key < 10:
>+            mangled_name += chr(ord('0') + size_key)
>+        else:
>+            mangled_name += chr(ord('A') + size_key - 10)
>+
>+        mangled_name += get_basic_mangled_name(self.data['basic'])
>+        return mangled_name
>+
>+    def get_human_readable_name(self):
>+        name = self.data['basic']
>+        name += str(self.data['primarySize'])
>+        if self.data['secondarySize'] > 1:
>+            name += 'x' + str(self.data['secondarySize'])
>+        return name
>+
>+    def is_vector(self):
>+        return self.data['primarySize'] > 1 and self.data['secondarySize'] == 1
>+
>+    def is_matrix(self):
>+        return self.data['secondarySize'] > 1
>+
>+    def get_object_size(self):
>+        return self.data['primarySize'] * self.data['secondarySize']
>+
>+    def specific_sampler_or_image_type(self, basic_type_prefix):
>+        if 'genType' in self.data:
>+            type = {}
>+            if 'basic' not in self.data:
>+                type['basic'] = {'': 'Float', 'I': 'Int', 'U': 'UInt'}[basic_type_prefix]
>+                type['primarySize'] = self.data['primarySize']
>+            else:
>+                type['basic'] = basic_type_prefix + self.data['basic']
>+                type['primarySize'] = 1
>+            type['precision'] = 'Undefined'
>+            return TType(type)
>+        return self
>+
>+    def specific_type(self, vec_size):
>+        type = {}
>+        if 'genType' in self.data:
>+            type['basic'] = self.data['basic']
>+            type['precision'] = self.data['precision']
>+            type['qualifier'] = self.data['qualifier']
>+            type['primarySize'] = vec_size
>+            type['secondarySize'] = 1
>+            return TType(type)
>+        return self
>+
>+    def parse_type(self, glsl_header_type):
>+        if glsl_header_type.startswith('out '):
>+            type_obj = self.parse_type(glsl_header_type[4:])
>+            type_obj['qualifier'] = 'Out'
>+            return type_obj
>+        if glsl_header_type.startswith('inout '):
>+            type_obj = self.parse_type(glsl_header_type[6:])
>+            type_obj['qualifier'] = 'InOut'
>+            return type_obj
>+
>+        basic_type_map = {
>+            'float': 'Float',
>+            'int': 'Int',
>+            'uint': 'UInt',
>+            'bool': 'Bool',
>+            'void': 'Void',
>+            'atomic_uint': 'AtomicCounter',
>+            'yuvCscStandardEXT': 'YuvCscStandardEXT'
>+        }
>+
>+        if glsl_header_type in basic_type_map:
>+            return {'basic': basic_type_map[glsl_header_type]}
>+
>+        type_obj = {}
>+
>+        basic_type_prefix_map = {'': 'Float', 'i': 'Int', 'u': 'UInt', 'b': 'Bool', 'v': 'Void'}
>+
>+        vec_re = re.compile(r'^([iub]?)vec([234]?)$')
>+        vec_match = vec_re.match(glsl_header_type)
>+        if vec_match:
>+            type_obj['basic'] = basic_type_prefix_map[vec_match.group(1)]
>+            if vec_match.group(2) == '':
>+                # Type like "ivec" that represents either ivec2, ivec3 or ivec4
>+                type_obj['genType'] = 'vec'
>+            else:
>+                # vec with specific size
>+                type_obj['primarySize'] = int(vec_match.group(2))
>+            return type_obj
>+
>+        mat_re = re.compile(r'^mat([234])(x([234]))?$')
>+        mat_match = mat_re.match(glsl_header_type)
>+        if mat_match:
>+            type_obj['basic'] = 'Float'
>+            if len(glsl_header_type) == 4:
>+                mat_size = int(mat_match.group(1))
>+                type_obj['primarySize'] = mat_size
>+                type_obj['secondarySize'] = mat_size
>+            else:
>+                type_obj['primarySize'] = int(mat_match.group(1))
>+                type_obj['secondarySize'] = int(mat_match.group(3))
>+            return type_obj
>+
>+        gen_re = re.compile(r'^gen([IUB]?)Type$')
>+        gen_match = gen_re.match(glsl_header_type)
>+        if gen_match:
>+            type_obj['basic'] = basic_type_prefix_map[gen_match.group(1).lower()]
>+            type_obj['genType'] = 'yes'
>+            return type_obj
>+
>+        if glsl_header_type.startswith('sampler'):
>+            type_obj['basic'] = glsl_header_type[0].upper() + glsl_header_type[1:]
>+            return type_obj
>+
>+        if glsl_header_type.startswith('gsampler') or glsl_header_type.startswith('gimage'):
>+            type_obj['basic'] = glsl_header_type[1].upper() + glsl_header_type[2:]
>+            type_obj['genType'] = 'sampler_or_image'
>+            return type_obj
>+
>+        if glsl_header_type == 'gvec4':
>+            return {'primarySize': 4, 'genType': 'sampler_or_image'}
>+        if glsl_header_type == 'gvec3':
>+            return {'primarySize': 3, 'genType': 'sampler_or_image'}
>+
>+        raise Exception('Unrecognized type: ' + str(glsl_header_type))
>+
>+def get_parsed_functions(functions_txt_filename):
>+
>+    def parse_function_parameters(parameters):
>+        if parameters == '':
>+            return []
>+        parametersOut = []
>+        parameters = parameters.split(', ')
>+        for parameter in parameters:
>+            parametersOut.append(TType(parameter.strip()))
>+        return parametersOut
>+
>+    lines = []
>+    with open(functions_txt_filename) as f:
>+        lines = f.readlines()
>+    lines = [line.strip() for line in lines if line.strip() != '' and not line.strip().startswith('//')]
>+
>+    fun_re = re.compile(r'^(\w+) (\w+)$(.*)$;$')
>+
>+    parsed_functions = OrderedDict()
>+    group_stack = []
>+    default_metadata = {}
>+
>+    for line in lines:
>+        fun_match = fun_re.match(line)
>+        if line.startswith('GROUP BEGIN '):
>+            group_rest = line[12:].strip()
>+            group_parts = group_rest.split(' ', 1)
>+            current_group = {
>+                'functions': [],
>+                'name': group_parts[0],
>+                'subgroups': {}
>+            }
>+            if len(group_parts) > 1:
>+                group_metadata = json.loads(group_parts[1])
>+                current_group.update(group_metadata)
>+            group_stack.append(current_group)
>+        elif line.startswith('GROUP END '):
>+            group_end_name = line[10:].strip()
>+            current_group = group_stack[-1]
>+            if current_group['name'] != group_end_name:
>+                raise Exception('GROUP END: Unexpected function group name "' + group_end_name + '" was expecting "' + current_group['name'] + '"')
>+            group_stack.pop()
>+            is_top_level_group = (len(group_stack) == 0)
>+            if is_top_level_group:
>+                parsed_functions[current_group['name']] = current_group
>+                default_metadata = {}
>+            else:
>+                super_group = group_stack[-1]
>+                super_group['subgroups'][current_group['name']] = current_group
>+        elif line.startswith('DEFAULT METADATA'):
>+            line_rest = line[16:].strip()
>+            default_metadata = json.loads(line_rest)
>+        elif fun_match:
>+            return_type = fun_match.group(1)
>+            name = fun_match.group(2)
>+            parameters = fun_match.group(3)
>+            function_props = {
>+                'name': name,
>+                'returnType': TType(return_type),
>+                'parameters': parse_function_parameters(parameters)
>+            }
>+            function_props.update(default_metadata)
>+            group_stack[-1]['functions'].append(function_props)
>+        else:
>+            raise Exception('Unexpected function input line: ' + line)
>+
>+    return parsed_functions
>+
>+fnvPrime = 16777619
>+def hash32(str):
>+    fnvOffsetBasis = 0x811c9dc5
>+    hash = fnvOffsetBasis
>+    for c in str:
>+        hash = hash ^ ord(c)
>+        hash = (hash * fnvPrime) & 0xffffffff
>+    return hash
>+
>+def mangledNameHash(str, script_generated_hash_tests, save_test = True):
>+    hash = hash32(str)
>+    index = 0
>+    max_six_bit_value = (1 << 6) - 1
>+    paren_location = max_six_bit_value
>+    has_array_or_block_param_bit = 0
>+    for c in str:
>+        if c == '(':
>+            paren_location = index
>+        elif c == '{' or c == '[':
>+            has_array_or_block_param_bit = 1
>+        index += 1
>+    hash = ((hash >> 13) ^ (hash & 0x1fff)) | (index << 19) | (paren_location << 25) | (has_array_or_block_param_bit << 31)
>+    if save_test:
>+        sanity_check = '    ASSERT_EQ(0x{hash}u, ImmutableString("{str}").mangledNameHash());'.format(hash = ('%08x' % hash), str = str)
>+        script_generated_hash_tests.update({sanity_check: None})
>+    return hash
>+
>+def get_suffix(props):
>+    if 'suffix' in props:
>+        return props['suffix']
>+    return ''
>+
>+def get_extension(props):
>+    if 'extension' in props:
>+        return props['extension']
>+    return 'UNDEFINED'
>+
>+def get_op(name, function_props):
>+    if 'op' not in function_props:
>+        raise Exception('function op not defined')
>+    if function_props['op'] == 'auto':
>+        return name[0].upper() + name[1:]
>+    return function_props['op']
>+
>+def get_known_to_not_have_side_effects(function_props):
>+    if 'op' in function_props and function_props['op'] != 'CallBuiltInFunction':
>+        if 'hasSideEffects' in function_props:
>+            return 'false'
>+        else:
>+            for param in get_parameters(function_props):
>+                if 'qualifier' in param.data and (param.data['qualifier'] == 'Out' or param.data['qualifier'] == 'InOut'):
>+                    return 'false'
>+            return 'true'
>+    return 'false'
>+
>+def get_parameters(function_props):
>+    if 'parameters' in function_props:
>+        return function_props['parameters']
>+    return []
>+
>+def get_function_mangled_name(function_name, parameters):
>+    mangled_name = function_name + '('
>+    for param in parameters:
>+        mangled_name += param.get_mangled_name()
>+    return mangled_name
>+
>+def get_function_human_readable_name(function_name, parameters):
>+    name = function_name
>+    for param in parameters:
>+        name += '_' + param.get_human_readable_name()
>+    return name
>+
>+def gen_parameters_variant_ids(str_len, ttype_mangled_name_variants):
>+    # Note that this doesn't generate variants with array parameters or struct / interface block parameters. They are assumed to have been filtered out separately.
>+    if str_len % 2 != 0:
>+        raise Exception('Expecting parameters mangled name length to be divisible by two')
>+    num_variants = pow(len(ttype_mangled_name_variants), str_len / 2)
>+    return xrange(num_variants)
>+
>+def get_parameters_mangled_name_variant(variant_id, paren_location, total_length, ttype_mangled_name_variants):
>+    str_len = total_length - paren_location - 1
>+    if str_len % 2 != 0:
>+        raise Exception('Expecting parameters mangled name length to be divisible by two')
>+    variant = ''
>+    while (len(variant)) < str_len:
>+        parameter_index = len(variant) / 2
>+        parameter_variant_index = variant_id
>+        for i in xrange(parameter_index):
>+            parameter_variant_index = parameter_variant_index / len(ttype_mangled_name_variants)
>+        parameter_variant_index = parameter_variant_index % len(ttype_mangled_name_variants)
>+        variant += ttype_mangled_name_variants[parameter_variant_index]
>+    return variant
>+
>+# Calculate the mangled name hash of a common prefix string that's been pre-hashed with hash32()
>+# plus a variant of the parameters. This is faster than constructing the whole string and then
>+# calculating the hash for that.
>+def get_mangled_name_variant_hash(prefix_hash32, variant_id, paren_location, total_length,
>+        num_type_variants, ttype_mangled_name_variants):
>+    hash = prefix_hash32
>+    parameter_count = (total_length - paren_location) >> 1
>+    parameter_variant_id_base = variant_id
>+    for parameter_index in xrange(parameter_count):
>+        parameter_variant_index = parameter_variant_id_base % num_type_variants
>+        param_str = ttype_mangled_name_variants[parameter_variant_index]
>+        hash = hash ^ ord(param_str[0])
>+        hash = (hash * fnvPrime) & 0xffffffff
>+        hash = hash ^ ord(param_str[1])
>+        hash = (hash * fnvPrime) & 0xffffffff
>+        parameter_variant_id_base = parameter_variant_id_base / num_type_variants
>+    return ((hash >> 13) ^ (hash & 0x1fff)) | (total_length << 19) | (paren_location << 25)
>+
>+def mangled_name_hash_can_collide_with_different_parameters(function_variant_props, num_type_variants,
>+        ttype_mangled_name_variants, script_generated_hash_tests):
>+    # We exhaustively search through all possible lists of parameters and see if any other mangled
>+    # name has the same hash.
>+    mangled_name = function_variant_props['mangled_name']
>+    mangled_name_len = len(mangled_name)
>+    hash = mangledNameHash(mangled_name, script_generated_hash_tests)
>+    mangled_name_prefix = function_variant_props['name'] + '('
>+    paren_location = len(mangled_name_prefix) - 1
>+    prefix_hash32 = hash32(mangled_name_prefix)
>+    parameters_mangled_name_len = len(mangled_name) - len(mangled_name_prefix)
>+    parameters_mangled_name = mangled_name[len(mangled_name_prefix):]
>+    if (parameters_mangled_name_len > 6):
>+        # This increases the complexity of searching for hash collisions considerably, so rather than doing it we just conservatively assume that a hash collision may be possible.
>+        return True
>+    for variant_id in gen_parameters_variant_ids(parameters_mangled_name_len, ttype_mangled_name_variants):
>+        variant_hash = get_mangled_name_variant_hash(prefix_hash32, variant_id, paren_location, mangled_name_len,
>+             num_type_variants, ttype_mangled_name_variants)
>+        manged_name_variant = get_parameters_mangled_name_variant(variant_id, paren_location, mangled_name_len,
>+             ttype_mangled_name_variants)
>+        if variant_hash == hash and manged_name_variant != parameters_mangled_name:
>+            return True
>+    return False
>+
>+def get_unique_identifier_name(function_name, parameters):
>+    unique_name = function_name + '_'
>+    for param in parameters:
>+        unique_name += param.get_mangled_name()
>+    return unique_name
>+
>+def get_variable_name_to_store_parameter(param):
>+    unique_name = 'pt'
>+    if 'qualifier' in param.data:
>+        if param.data['qualifier'] == 'Out':
>+            unique_name += '_o_'
>+        if param.data['qualifier'] == 'InOut':
>+            unique_name += '_io_'
>+    unique_name += param.get_mangled_name()
>+    return unique_name
>+
>+def get_variable_name_to_store_parameters(parameters):
>+    if len(parameters) == 0:
>+        return 'empty'
>+    unique_name = 'p'
>+    for param in parameters:
>+        if 'qualifier' in param.data:
>+            if param.data['qualifier'] == 'Out':
>+                unique_name += '_o_'
>+            if param.data['qualifier'] == 'InOut':
>+                unique_name += '_io_'
>+        unique_name += param.get_mangled_name()
>+    return unique_name
>+
>+def define_constexpr_variable(template_args, variable_declarations):
>+    template_variable_declaration = 'constexpr const TVariable kVar_{name_with_suffix}(BuiltInId::{name_with_suffix}, BuiltInName::{name}, SymbolType::BuiltIn, TExtension::{extension}, {type});'
>+    variable_declarations.append(template_variable_declaration.format(**template_args))
>+
>+def gen_function_variants(function_name, function_props):
>+    function_variants = []
>+    parameters = get_parameters(function_props)
>+    function_is_gen_type = False
>+    gen_type = set()
>+    for param in parameters:
>+        if 'genType' in param.data:
>+            if param.data['genType'] not in ['sampler_or_image', 'vec', 'yes']:
>+                raise Exception('Unexpected value of genType "' + str(param.data['genType']) + '" should be "sampler_or_image", "vec", or "yes"')
>+            gen_type.add(param.data['genType'])
>+            if len(gen_type) > 1:
>+                raise Exception('Unexpected multiple values of genType set on the same function: ' + str(list(gen_type)))
>+    if len(gen_type) == 0:
>+        function_variants.append(function_props)
>+        return function_variants
>+
>+    # If we have a gsampler_or_image then we're generating variants for float, int and uint
>+    # samplers.
>+    if 'sampler_or_image' in gen_type:
>+        types = ['', 'I', 'U']
>+        for type in types:
>+            variant_props = function_props.copy()
>+            variant_parameters = []
>+            for param in parameters:
>+                variant_parameters.append(param.specific_sampler_or_image_type(type))
>+            variant_props['parameters'] = variant_parameters
>+            variant_props['returnType'] = function_props['returnType'].specific_sampler_or_image_type(type)
>+            function_variants.append(variant_props)
>+        return function_variants
>+
>+    # If we have a normal gentype then we're generating variants for different sizes of vectors.
>+    sizes = range(1, 5)
>+    if 'vec' in gen_type:
>+        sizes = range(2, 5)
>+    for size in sizes:
>+        variant_props = function_props.copy()
>+        variant_parameters = []
>+        for param in parameters:
>+            variant_parameters.append(param.specific_type(size))
>+        variant_props['parameters'] = variant_parameters
>+        variant_props['returnType'] = function_props['returnType'].specific_type(size)
>+        function_variants.append(variant_props)
>+    return function_variants
>+
>+def process_single_function_group(condition, group_name, group, num_type_variants, parameter_declarations, ttype_mangled_name_variants,
>+        name_declarations, unmangled_function_if_statements, unmangled_builtin_declarations, defined_function_variants,
>+        builtin_id_declarations, builtin_id_definitions, defined_parameter_names, variable_declarations, function_declarations,
>+        script_generated_hash_tests, get_builtin_if_statements):
>+    global id_counter
>+
>+    if 'functions' not in group:
>+        return
>+
>+    for function_props in group['functions']:
>+        function_name = function_props['name']
>+        level = function_props['level']
>+        extension = get_extension(function_props)
>+        template_args = {
>+            'name': function_name,
>+            'name_with_suffix': function_name + get_suffix(function_props),
>+            'level': level,
>+            'extension': extension,
>+            'op': get_op(function_name, function_props),
>+            'known_to_not_have_side_effects': get_known_to_not_have_side_effects(function_props)
>+        }
>+
>+        function_variants = gen_function_variants(function_name, function_props)
>+
>+        template_name_declaration = 'constexpr const ImmutableString {name_with_suffix}("{name}");'
>+        name_declaration = template_name_declaration.format(**template_args)
>+        if not name_declaration in name_declarations:
>+            name_declarations.add(name_declaration)
>+
>+        template_unmangled_if = """if (name == BuiltInName::{name_with_suffix})
>+{{
>+    return &UnmangledBuiltIns::{extension};
>+}}"""
>+        unmangled_if = template_unmangled_if.format(**template_args)
>+        unmangled_builtin_no_condition = unmangled_function_if_statements.get(level, 'NO_CONDITION', function_name)
>+        if unmangled_builtin_no_condition != None and unmangled_builtin_no_condition['extension'] == 'UNDEFINED':
>+            # We already have this unmangled name without a condition nor extension on the same level. No need to add a duplicate with a condition.
>+            pass
>+        elif (not unmangled_function_if_statements.has_key(level, condition, function_name)) or extension == 'UNDEFINED':
>+            # We don't have this unmangled builtin recorded yet or we might replace an unmangled builtin from an extension with one from core.
>+            unmangled_function_if_statements.add_obj(level, condition, function_name, {'hash_matched_code': unmangled_if, 'extension': extension})
>+            unmangled_builtin_declarations.add('constexpr const UnmangledBuiltIn {extension}(TExtension::{extension});'.format(**template_args))
>+
>+        for function_props in function_variants:
>+            template_args['id'] = id_counter
>+
>+            parameters = get_parameters(function_props)
>+
>+            template_args['unique_name'] = get_unique_identifier_name(template_args['name_with_suffix'], parameters)
>+
>+            if template_args['unique_name'] in defined_function_variants:
>+                continue
>+            defined_function_variants.add(template_args['unique_name'])
>+
>+            template_args['param_count'] = len(parameters)
>+            template_args['return_type'] = function_props['returnType'].get_statictype_string()
>+            template_args['mangled_name'] = get_function_mangled_name(function_name, parameters)
>+            template_args['human_readable_name'] = get_function_human_readable_name(template_args['name_with_suffix'], parameters)
>+            template_args['mangled_name_length'] = len(template_args['mangled_name'])
>+
>+            template_builtin_id_declaration = '    static constexpr const TSymbolUniqueId {human_readable_name} = TSymbolUniqueId({id});'
>+            builtin_id_declarations.append(template_builtin_id_declaration.format(**template_args))
>+            template_builtin_id_definition = 'constexpr const TSymbolUniqueId BuiltInId::{human_readable_name};'
>+            builtin_id_definitions.append(template_builtin_id_definition.format(**template_args))
>+
>+            parameters_list = []
>+            for param in parameters:
>+                unique_param_name = get_variable_name_to_store_parameter(param)
>+                param_template_args = {
>+                    'name': '_empty',
>+                    'name_with_suffix': unique_param_name,
>+                    'type': param.get_statictype_string(),
>+                    'extension': 'UNDEFINED'
>+                }
>+                if unique_param_name not in defined_parameter_names:
>+                    id_counter += 1
>+                    param_template_args['id'] = id_counter
>+                    template_builtin_id_declaration = '    static constexpr const TSymbolUniqueId {name_with_suffix} = TSymbolUniqueId({id});'
>+                    builtin_id_declarations.append(template_builtin_id_declaration.format(**param_template_args))
>+                    define_constexpr_variable(param_template_args, variable_declarations)
>+                    defined_parameter_names.add(unique_param_name)
>+                parameters_list.append('&BuiltInVariable::kVar_{name_with_suffix}'.format(**param_template_args));
>+
>+            template_args['parameters_var_name'] = get_variable_name_to_store_parameters(parameters)
>+            if len(parameters) > 0:
>+                template_args['parameters_list'] = ', '.join(parameters_list)
>+                template_parameter_list_declaration = 'constexpr const TVariable *{parameters_var_name}[{param_count}] = {{ {parameters_list} }};'
>+                parameter_declarations[template_args['parameters_var_name']] = template_parameter_list_declaration.format(**template_args)
>+            else:
>+                template_parameter_list_declaration = 'constexpr const TVariable **{parameters_var_name} = nullptr;'
>+                parameter_declarations[template_args['parameters_var_name']] = template_parameter_list_declaration.format(**template_args)
>+
>+            template_function_declaration = 'constexpr const TFunction kFunction_{unique_name}(BuiltInId::{human_readable_name}, BuiltInName::{name_with_suffix}, TExtension::{extension}, BuiltInParameters::{parameters_var_name}, {param_count}, {return_type}, EOp{op}, {known_to_not_have_side_effects});'
>+            function_declarations.append(template_function_declaration.format(**template_args))
>+
>+            # If we can make sure that there's no other mangled name with the same length, function
>+            # name and hash, then we can only check the mangled name length and the function name
>+            # instead of checking the whole mangled name.
>+            template_mangled_if = ''
>+            if mangled_name_hash_can_collide_with_different_parameters(template_args, num_type_variants,
>+                    ttype_mangled_name_variants, script_generated_hash_tests):
>+                template_mangled_name_declaration = 'constexpr const ImmutableString {unique_name}("{mangled_name}");'
>+                name_declarations.add(template_mangled_name_declaration.format(**template_args))
>+                template_mangled_if = """if (name == BuiltInName::{unique_name})
>+{{
>+    return &BuiltInFunction::kFunction_{unique_name};
>+}}"""
>+            else:
>+                template_mangled_if = """if (name.beginsWith(BuiltInName::{name_with_suffix}))
>+{{
>+    ASSERT(name.length() == {mangled_name_length});
>+    return &BuiltInFunction::kFunction_{unique_name};
>+}}"""
>+            mangled_if = template_mangled_if.format(**template_args)
>+            get_builtin_if_statements.add_obj(level, condition, template_args['mangled_name'], {'hash_matched_code': mangled_if})
>+
>+            id_counter += 1
>+
>+def process_function_group(group_name, group, num_type_variants, parameter_declarations, ttype_mangled_name_variants,
>+        name_declarations, unmangled_function_if_statements, unmangled_builtin_declarations,
>+        defined_function_variants, builtin_id_declarations, builtin_id_definitions, defined_parameter_names,
>+        variable_declarations, function_declarations, script_generated_hash_tests, get_builtin_if_statements,
>+        is_in_group_definitions):
>+    global id_counter
>+    first_id = id_counter
>+
>+    condition = 'NO_CONDITION'
>+    if 'condition' in group:
>+        condition = group['condition']
>+
>+    process_single_function_group(condition, group_name, group, num_type_variants, parameter_declarations,
>+        ttype_mangled_name_variants, name_declarations, unmangled_function_if_statements, unmangled_builtin_declarations,
>+        defined_function_variants, builtin_id_declarations, builtin_id_definitions, defined_parameter_names,
>+        variable_declarations, function_declarations, script_generated_hash_tests, get_builtin_if_statements)
>+
>+    if 'subgroups' in group:
>+        for subgroup_name, subgroup in group['subgroups'].iteritems():
>+            process_function_group(group_name + subgroup_name, subgroup, num_type_variants, parameter_declarations,
>+                ttype_mangled_name_variants, name_declarations, unmangled_function_if_statements,
>+                unmangled_builtin_declarations, defined_function_variants, builtin_id_declarations,
>+                builtin_id_definitions, defined_parameter_names, variable_declarations, function_declarations,
>+                script_generated_hash_tests, get_builtin_if_statements, is_in_group_definitions)
>+
>+    if 'queryFunction' in group:
>+        template_args = {
>+            'first_id': first_id,
>+            'last_id': id_counter - 1,
>+            'group_name': group_name
>+        }
>+        template_is_in_group_definition = """bool is{group_name}(const TFunction *func)
>+{{
>+    int id = func->uniqueId().get();
>+    return id >= {first_id} && id <= {last_id};
>+}}"""
>+        is_in_group_definitions.append(template_is_in_group_definition.format(**template_args))
>+
>+def prune_parameters_arrays(parameter_declarations, function_declarations):
>+    # We can share parameters arrays between functions in case one array is a subarray of another.
>+    parameter_variable_name_replacements = {}
>+    used_param_variable_names = set()
>+    for param_variable_name, param_declaration in sorted(parameter_declarations.iteritems(), key=lambda item: -len(item[0])):
>+        replaced = False
>+        for used in used_param_variable_names:
>+            if used.startswith(param_variable_name):
>+                parameter_variable_name_replacements[param_variable_name] = used
>+                replaced = True
>+                break
>+        if not replaced:
>+            used_param_variable_names.add(param_variable_name)
>+
>+    for i in xrange(len(function_declarations)):
>+        for replaced, replacement in parameter_variable_name_replacements.iteritems():
>+            function_declarations[i] = function_declarations[i].replace('BuiltInParameters::' + replaced + ',', 'BuiltInParameters::' + replacement + ',')
>+
>+    return [value for key, value in parameter_declarations.iteritems() if key in used_param_variable_names]
>+
>+def process_single_variable_group(condition, group_name, group, builtin_id_declarations, builtin_id_definitions, name_declarations,
>+        init_member_variables, get_variable_declarations, get_builtin_if_statements, declare_member_variables, variable_declarations,
>+        get_variable_definitions, variable_name_count):
>+    global id_counter
>+    if 'variables' not in group:
>+        return
>+    for variable_name, props in group['variables'].iteritems():
>+        level = props['level']
>+        template_args = {
>+            'id': id_counter,
>+            'name': variable_name,
>+            'name_with_suffix': variable_name + get_suffix(props),
>+            'level': props['level'],
>+            'extension': get_extension(props),
>+            'class': 'TVariable'
>+        }
>+
>+        template_builtin_id_declaration = '    static constexpr const TSymbolUniqueId {name_with_suffix} = TSymbolUniqueId({id});'
>+        builtin_id_declarations.append(template_builtin_id_declaration.format(**template_args))
>+        template_builtin_id_definition = 'constexpr const TSymbolUniqueId BuiltInId::{name_with_suffix};'
>+        builtin_id_definitions.append(template_builtin_id_definition.format(**template_args))
>+
>+        template_name_declaration = 'constexpr const ImmutableString {name}("{name}");'
>+        name_declarations.add(template_name_declaration.format(**template_args))
>+
>+        is_member = True
>+        template_init_variable = ''
>+
>+        if 'type' in props:
>+            if props['type']['basic'] != 'Bool' and 'precision' not in props['type']:
>+                raise Exception('Missing precision for variable ' + variable_name)
>+            template_args['type'] = TType(props['type']).get_statictype_string()
>+
>+        if 'fields' in props:
>+            # Handle struct and interface block definitions.
>+            template_args['class'] = props['class']
>+            template_args['fields'] = 'fields_{name_with_suffix}'.format(**template_args)
>+            init_member_variables.append('    TFieldList *{fields} = new TFieldList();'.format(**template_args))
>+            for field_name, field_type in props['fields'].iteritems():
>+                template_args['field_name'] = field_name
>+                template_args['field_type'] = TType(field_type).get_dynamic_type_string()
>+                template_name_declaration = 'constexpr const ImmutableString {field_name}("{field_name}");'
>+                name_declarations.add(template_name_declaration.format(**template_args))
>+                template_add_field = '    {fields}->push_back(new TField({field_type}, BuiltInName::{field_name}, zeroSourceLoc, SymbolType::BuiltIn));'
>+                init_member_variables.append(template_add_field.format(**template_args))
>+            template_init_temp_variable = '    {class} *{name_with_suffix} = new {class}(BuiltInId::{name_with_suffix}, BuiltInName::{name}, TExtension::{extension}, {fields});'
>+            init_member_variables.append(template_init_temp_variable.format(**template_args))
>+            if 'private' in props and props['private']:
>+                is_member = False
>+            else:
>+                template_init_variable = '    mVar_{name_with_suffix} = {name_with_suffix};'
>+
>+        elif 'initDynamicType' in props:
>+            # Handle variables whose type can't be expressed as TStaticType
>+            # (type is a struct or has variable array size for example).
>+            template_args['type_name'] = 'type_{name_with_suffix}'.format(**template_args)
>+            template_args['type'] = template_args['type_name']
>+            template_args['initDynamicType'] = props['initDynamicType'].format(**template_args)
>+            template_init_variable = """    {initDynamicType}
>+    {type_name}->realize();
>+    mVar_{name_with_suffix} = new TVariable(BuiltInId::{name_with_suffix}, BuiltInName::{name}, SymbolType::BuiltIn, TExtension::{extension}, {type});"""
>+
>+        elif 'value' in props:
>+            # Handle variables with constant value, such as gl_MaxDrawBuffers.
>+            if props['value'] != 'resources':
>+                raise Exception('Unrecognized value source in variable properties: ' + str(props['value']))
>+            resources_key = variable_name[3:]
>+            if 'valueKey' in props:
>+                resources_key = props['valueKey']
>+            template_args['value'] = 'resources.' + resources_key
>+            template_args['object_size'] = TType(props['type']).get_object_size()
>+            template_init_variable = """    mVar_{name_with_suffix} = new TVariable(BuiltInId::{name_with_suffix}, BuiltInName::{name}, SymbolType::BuiltIn, TExtension::{extension}, {type});
>+    {{
>+        TConstantUnion *unionArray = new TConstantUnion[{object_size}];
>+        unionArray[0].setIConst({value});
>+        mVar_{name_with_suffix}->shareConstPointer(unionArray);
>+    }}"""
>+            if template_args['object_size'] > 1:
>+                template_init_variable = """    mVar_{name_with_suffix} = new TVariable(BuiltInId::{name_with_suffix}, BuiltInName::{name}, SymbolType::BuiltIn, TExtension::{extension}, {type});
>+    {{
>+        TConstantUnion *unionArray = new TConstantUnion[{object_size}];
>+        for (size_t index = 0u; index < {object_size}; ++index)
>+        {{
>+            unionArray[index].setIConst({value}[index]);
>+        }}
>+        mVar_{name_with_suffix}->shareConstPointer(unionArray);
>+    }}"""
>+
>+        else:
>+            # Handle variables that can be stored as constexpr TVariable like
>+            # gl_Position, gl_FragColor etc.
>+            define_constexpr_variable(template_args, variable_declarations)
>+            is_member = False
>+
>+            template_get_variable_declaration = 'const TVariable *{name_with_suffix}();'
>+            get_variable_declarations.append(template_get_variable_declaration.format(**template_args))
>+
>+            template_get_variable_definition = """const TVariable *{name_with_suffix}()
>+{{
>+    return &kVar_{name_with_suffix};
>+}}
>+"""
>+            get_variable_definitions.append(template_get_variable_definition.format(**template_args))
>+
>+            if level != 'GLSL_BUILTINS':
>+                template_name_if = """if (name == BuiltInName::{name})
>+{{
>+    return &BuiltInVariable::kVar_{name_with_suffix};
>+}}"""
>+                name_if = template_name_if.format(**template_args)
>+                get_builtin_if_statements.add_obj(level, condition, template_args['name'], {'hash_matched_code': name_if})
>+
>+        if is_member:
>+            get_condition = condition
>+            init_conditionally = (condition != 'NO_CONDITION' and variable_name_count[variable_name] == 1)
>+            if init_conditionally:
>+                # Instead of having the condition if statement at lookup, it's cheaper to have it at initialization time.
>+                init_member_variables.append('    if ({condition})\n    {{'.format(condition = condition))
>+                template_args['condition_comment'] = '\n    // Only initialized if {condition}'.format(condition = condition)
>+                get_condition = 'NO_CONDITION'
>+            else:
>+                template_args['condition_comment'] = ''
>+            init_member_variables.append(template_init_variable.format(**template_args))
>+            if init_conditionally:
>+                init_member_variables.append('    }')
>+
>+            template_declare_member_variable = '{class} *mVar_{name_with_suffix} = nullptr;'
>+            declare_member_variables.append(template_declare_member_variable.format(**template_args))
>+
>+            if level != 'GLSL_BUILTINS':
>+                template_name_if = """if (name == BuiltInName::{name})
>+{{{condition_comment}
>+    return mVar_{name_with_suffix};
>+}}"""
>+                name_if = template_name_if.format(**template_args)
>+                get_builtin_if_statements.add_obj(level, get_condition, variable_name, {'hash_matched_code': name_if})
>+
>+        id_counter += 1
>+
>+def count_variable_names(group, variable_name_count):
>+    if 'variables' in group:
>+        for name in group['variables'].iterkeys():
>+            if name not in variable_name_count:
>+                variable_name_count[name] = 1
>+            else:
>+                variable_name_count[name] += 1
>+    if 'subgroups' in group:
>+        for subgroup_name, subgroup in group['subgroups'].iteritems():
>+            count_variable_names(subgroup, variable_name_count)
>+
>+def process_variable_group(parent_condition, group_name, group, builtin_id_declarations, builtin_id_definitions, name_declarations,
>+        init_member_variables, get_variable_declarations, get_builtin_if_statements, declare_member_variables, variable_declarations,
>+        get_variable_definitions, variable_name_count):
>+    global id_counter
>+    condition = 'NO_CONDITION'
>+    if 'condition' in group:
>+        condition = group['condition']
>+
>+    if parent_condition != 'NO_CONDITION':
>+        if condition == 'NO_CONDITION':
>+            condition = parent_condition
>+        else:
>+            condition = '({cond1}) && ({cond2})'.format(cond1 = parent_condition, cond2 = condition)
>+
>+    process_single_variable_group(condition, group_name, group, builtin_id_declarations, builtin_id_definitions, name_declarations,
>+        init_member_variables, get_variable_declarations, get_builtin_if_statements, declare_member_variables, variable_declarations,
>+        get_variable_definitions, variable_name_count)
>+
>+    if 'subgroups' in group:
>+        for subgroup_name, subgroup in group['subgroups'].iteritems():
>+            process_variable_group(condition, subgroup_name, subgroup, builtin_id_declarations, builtin_id_definitions, name_declarations,
>+            init_member_variables, get_variable_declarations, get_builtin_if_statements, declare_member_variables, variable_declarations,
>+            get_variable_definitions, variable_name_count)
>+
>+
>+def main():
>+
>+    set_working_dir()
>+
>+    parser = argparse.ArgumentParser()
>+    parser.add_argument('--dump-intermediate-json', help='Dump parsed function data as a JSON file builtin_functions.json', action="store_true")
>+    parser.add_argument('auto_script_command', nargs='?', default='')
>+    args = parser.parse_args()
>+
>+    test_filename = '../../tests/compiler_tests/ImmutableString_test_autogen.cpp'
>+    variables_json_filename = 'builtin_variables.json'
>+    functions_txt_filename = 'builtin_function_declarations.txt'
>+    hash_filename = 'builtin_symbols_hash_autogen.txt'
>+
>+    # auto_script parameters.
>+    if args.auto_script_command != '':
>+        inputs = [
>+            functions_txt_filename,
>+            variables_json_filename,
>+        ]
>+        outputs = [
>+            'ParseContext_autogen.h',
>+            'SymbolTable_autogen.cpp',
>+            'SymbolTable_autogen.h',
>+            'tree_util/BuiltIn_autogen.h',
>+            test_filename,
>+            hash_filename,
>+        ]
>+
>+        if args.auto_script_command == 'inputs':
>+            print ','.join(inputs)
>+        elif args.auto_script_command == 'outputs':
>+            print ','.join(outputs)
>+        else:
>+            print('Invalid script parameters')
>+            return 1
>+        return 0
>+
>+
>+    all_inputs = [os.path.abspath(__file__), variables_json_filename, functions_txt_filename]
>+    # This script takes a while to run since it searches for hash collisions of mangled names. To avoid
>+    # running it unnecessarily, we first check if we've already ran it with the same inputs.
>+    m = hashlib.md5()
>+    for input_path in all_inputs:
>+        with open(input_path, 'rU') as input_file:
>+            m.update(input_file.read())
>+    input_hash = m.hexdigest()
>+    if os.path.exists(hash_filename):
>+        with open(hash_filename) as hash_file:
>+            if input_hash == hash_file.read():
>+                print "Canceling ESSL static builtins code generator - generated hash matches inputs."
>+                sys.exit(0)
>+
>+    # Declarations of symbol unique ids
>+    builtin_id_declarations = []
>+
>+    # Definitions of symbol unique ids needed for those ids used outside of constexpr expressions.
>+    builtin_id_definitions = []
>+
>+    # Declarations of name string variables
>+    name_declarations = set()
>+
>+    # Declarations of builtin TVariables
>+    variable_declarations = []
>+
>+    # Declarations of builtin TFunctions
>+    function_declarations = []
>+
>+    # Functions for querying the pointer to a specific TVariable.
>+    get_variable_declarations = []
>+    get_variable_definitions = []
>+
>+    # Code for defining TVariables stored as members of TSymbolTable.
>+    declare_member_variables = []
>+    init_member_variables = []
>+
>+    # Code for querying builtins.
>+    get_builtin_if_statements = GroupedList()
>+
>+    # Declarations of UnmangledBuiltIn objects
>+    unmangled_builtin_declarations = set()
>+
>+    # Code for querying builtin function unmangled names.
>+    unmangled_function_if_statements = GroupedList()
>+
>+    # Code for testing that script-generated hashes match with runtime computed hashes.
>+    script_generated_hash_tests = OrderedDict()
>+
>+    # Functions for testing whether a builtin belongs in group.
>+    is_in_group_definitions = []
>+
>+    # Counts of variables with a certain name string:
>+    variable_name_count = {}
>+
>+    # Declarations of parameter arrays for builtin TFunctions. Map from C++ variable name to the full
>+    # declaration.
>+    parameter_declarations = {}
>+
>+    ttype_mangled_name_variants = []
>+
>+    defined_function_variants = set()
>+    defined_parameter_names = set()
>+
>+
>+    parsed_functions = get_parsed_functions(functions_txt_filename)
>+
>+    if args.dump_intermediate_json:
>+        with open('builtin_functions.json', 'w') as outfile:
>+            def serialize_obj(obj):
>+                if isinstance(obj, TType):
>+                    return obj.data
>+                else:
>+                    raise "Cannot serialize to JSON: " + str(obj)
>+            json.dump(parsed_functions, outfile, indent=4, separators=(',', ': '), default=serialize_obj)
>+
>+    with open(variables_json_filename) as f:
>+        parsed_variables = json.load(f, object_pairs_hook=OrderedDict)
>+
>+    for basic_type in basic_types_enumeration:
>+        primary_sizes = [1]
>+        secondary_sizes = [1]
>+        if basic_type in ['Float', 'Int', 'UInt', 'Bool']:
>+            primary_sizes = [1, 2, 3, 4]
>+        if basic_type == 'Float':
>+            secondary_sizes = [1, 2, 3, 4]
>+        for primary_size in primary_sizes:
>+            for secondary_size in secondary_sizes:
>+                type = TType({'basic': basic_type, 'primarySize': primary_size, 'secondarySize': secondary_size})
>+                ttype_mangled_name_variants.append(type.get_mangled_name())
>+
>+    num_type_variants = len(ttype_mangled_name_variants)
>+
>+    # Sanity check for get_mangled_name_variant_hash:
>+    variant_hash = get_mangled_name_variant_hash(hash32("atan("), 3, 4, len("atan(0123"), num_type_variants,
>+        ttype_mangled_name_variants)
>+    mangled_name_hash = mangledNameHash("atan(" + get_parameters_mangled_name_variant(3, 4, len("atan(0123"),
>+        ttype_mangled_name_variants), script_generated_hash_tests)
>+    if variant_hash != mangled_name_hash:
>+        raise Exception("get_mangled_name_variant_hash sanity check failed")
>+
>+    for group_name, group in parsed_functions.iteritems():
>+        process_function_group(group_name, group, num_type_variants, parameter_declarations, ttype_mangled_name_variants,
>+            name_declarations, unmangled_function_if_statements, unmangled_builtin_declarations,
>+            defined_function_variants, builtin_id_declarations, builtin_id_definitions, defined_parameter_names,
>+            variable_declarations, function_declarations, script_generated_hash_tests, get_builtin_if_statements,
>+            is_in_group_definitions)
>+
>+    parameter_declarations = prune_parameters_arrays(parameter_declarations, function_declarations)
>+
>+    for group_name, group in parsed_variables.iteritems():
>+        count_variable_names(group, variable_name_count)
>+
>+    for group_name, group in parsed_variables.iteritems():
>+        process_variable_group('NO_CONDITION', group_name, group, builtin_id_declarations, builtin_id_definitions, name_declarations,
>+            init_member_variables, get_variable_declarations, get_builtin_if_statements, declare_member_variables, variable_declarations,
>+            get_variable_definitions, variable_name_count)
>+
>+    output_strings = {
>+        'script_name': os.path.basename(__file__),
>+        'copyright_year': date.today().year,
>+
>+        'builtin_id_declarations': '\n'.join(builtin_id_declarations),
>+        'builtin_id_definitions': '\n'.join(builtin_id_definitions),
>+        'last_builtin_id': id_counter - 1,
>+        'name_declarations': '\n'.join(sorted(list(name_declarations))),
>+
>+        'function_data_source_name': functions_txt_filename,
>+        'function_declarations': '\n'.join(function_declarations),
>+        'parameter_declarations': '\n'.join(sorted(parameter_declarations)),
>+
>+        'is_in_group_definitions': '\n'.join(is_in_group_definitions),
>+
>+        'variable_data_source_name': variables_json_filename,
>+        'variable_declarations': '\n'.join(sorted(variable_declarations)),
>+        'get_variable_declarations': '\n'.join(sorted(get_variable_declarations)),
>+        'get_variable_definitions': '\n'.join(sorted(get_variable_definitions)),
>+        'unmangled_builtin_declarations': '\n'.join(sorted(unmangled_builtin_declarations)),
>+
>+        'declare_member_variables': '\n'.join(declare_member_variables),
>+        'init_member_variables': '\n'.join(init_member_variables),
>+
>+        'get_unmangled_builtin': unmangled_function_if_statements.get_switch_code(script_generated_hash_tests),
>+        'get_builtin': get_builtin_if_statements.get_switch_code(script_generated_hash_tests),
>+        'max_unmangled_name_length': unmangled_function_if_statements.get_max_name_length(),
>+        'max_mangled_name_length': get_builtin_if_statements.get_max_name_length(),
>+
>+        'script_generated_hash_tests': '\n'.join(script_generated_hash_tests.iterkeys())
>+    }
>+
>+    with open(test_filename, 'wt') as outfile_cpp:
>+        output_cpp = template_immutablestringtest_cpp.format(**output_strings)
>+        outfile_cpp.write(output_cpp)
>+
>+    with open('tree_util/BuiltIn_autogen.h', 'wt') as outfile_header:
>+        output_header = template_builtin_header.format(**output_strings)
>+        outfile_header.write(output_header)
>+
>+    with open('SymbolTable_autogen.cpp', 'wt') as outfile_cpp:
>+        output_cpp = template_symboltable_cpp.format(**output_strings)
>+        outfile_cpp.write(output_cpp)
>+
>+    with open('ParseContext_autogen.h', 'wt') as outfile_header:
>+        output_header = template_parsecontext_header.format(**output_strings)
>+        outfile_header.write(output_header)
>+
>+    with open('SymbolTable_autogen.h', 'wt') as outfile_h:
>+        output_h = template_symboltable_h.format(**output_strings)
>+        outfile_h.write(output_h)
>+
>+    with open(hash_filename, 'wt') as hash_file:
>+        hash_file.write(input_hash)
>+
>+    return 0
>+
>+
>+if __name__ == '__main__':
>+    sys.exit(main())
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/gen_emulated_builtin_function_tables.py b/Source/ThirdParty/ANGLE/src/compiler/translator/gen_emulated_builtin_function_tables.py
>index 3cb3f3b11c1..6f003a9b5e8 100644
>--- a/Source/ThirdParty/ANGLE/src/compiler/translator/gen_emulated_builtin_function_tables.py
>+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/gen_emulated_builtin_function_tables.py
>@@ -5,6 +5,7 @@
> #
> # gen_emulated_builtin_function_tables.py:
> #  Generator for the builtin function maps.
>+#  NOTE: don't run this script directly. Run scripts/run_code_generation.py.
> 
> from datetime import date
> import json
>@@ -21,6 +22,7 @@ template_emulated_builtin_functions_hlsl = """// GENERATED FILE - DO NOT EDIT.
> //   HLSL code for emulating GLSL builtin functions not present in HLSL.
> 
> #include "compiler/translator/BuiltInFunctionEmulator.h"
>+#include "compiler/translator/tree_util/BuiltIn_autogen.h"
> 
> namespace sh
> {{
>@@ -30,11 +32,11 @@ namespace
> 
> struct FunctionPair
> {{
>-   constexpr FunctionPair(const MiniFunctionId &idIn, const char *bodyIn) : id(idIn), body(bodyIn)
>+   constexpr FunctionPair(const TSymbolUniqueId &idIn, const char *bodyIn) : id(idIn.get()), body(bodyIn)
>    {{
>    }}
> 
>-   MiniFunctionId id;
>+   int id;
>    const char *body;
> }};
> 
>@@ -42,12 +44,12 @@ constexpr FunctionPair g_hlslFunctions[] = {{
> {emulated_functions}}};
> }}  // anonymous namespace
> 
>-const char *FindHLSLFunction(const FunctionId &functionID)
>+const char *FindHLSLFunction(int uniqueId)
> {{
>     for (size_t index = 0; index < ArraySize(g_hlslFunctions); ++index)
>     {{
>         const auto &function = g_hlslFunctions[index];
>-        if (function.id == functionID)
>+        if (function.id == uniqueId)
>         {{
>             return function.body;
>         }}
>@@ -74,30 +76,18 @@ def load_json(path):
>         return json.loads(file_data, object_pairs_hook=reject_duplicate_keys)
> 
> def enum_type(arg):
>-   # handle 'argtype argname' and 'out argtype argname'
>-   chunks = arg.split(' ')
>-   arg_type = chunks[0]
>-   if len(chunks) == 3:
>-      arg_type = chunks[1]
>-
>-   if arg_type == "float2x2":
>-      return "Mat2"
>-   elif arg_type == "float3x3":
>-      return "Mat3"
>-   elif arg_type == "float4x4":
>-      return "Mat4"
>-
>-   suffix = ""
>-   if not arg_type[-1].isdigit():
>-      suffix = '1'
>-   return arg_type.capitalize() + suffix
>-
>-def caps(op):
>-   return op[0].upper() + op[1:]
>-
>-input_script = "emulated_builtin_function_data_hlsl.json"
>-hlsl_json = load_json(input_script)
>-emulated_functions = []
>+    # handle 'argtype argname' and 'out argtype argname'
>+    chunks = arg.split(' ')
>+    arg_type = chunks[0]
>+    if len(chunks) == 3:
>+        arg_type = chunks[1]
>+
>+    suffix = ""
>+    if not arg_type[-1].isdigit():
>+        suffix = '1'
>+    if arg_type[0:4] == 'uint':
>+        return 'UI' + arg_type[2:] + suffix
>+    return arg_type.capitalize() + suffix
> 
> def gen_emulated_function(data):
> 
>@@ -109,24 +99,51 @@ def gen_emulated_function(data):
>    body = [ sig, '{' ] + ['    ' + line for line in data['body']] + ['}']
> 
>    func += "{\n"
>-   func += "{ EOp" + caps(data['op']) + ", " + ", ".join("ParamType::" + enum_type(arg) for arg in data['args']) + " },\n"
>+   func += "BuiltInId::" + data['op'] + "_" + "_".join([enum_type(arg) for arg in data['args']]) + ",\n"
>    if 'helper' in data:
>       func += '"' + '\\n"\n"'.join(data['helper']) + '\\n"\n'
>    func += '"' + '\\n"\n"'.join(body) + '\\n"\n'
>    func += "},\n"
>    return [ func ]
> 
>-for item in hlsl_json:
>-   emulated_functions += gen_emulated_function(item)
> 
>-hlsl_fname = "emulated_builtin_functions_hlsl_autogen.cpp"
>+def main():
> 
>-hlsl_gen = template_emulated_builtin_functions_hlsl.format(
>-   script_name = sys.argv[0],
>-   data_source_name = input_script,
>-   copyright_year = date.today().year,
>-   emulated_functions = "".join(emulated_functions))
>+    input_script = "emulated_builtin_function_data_hlsl.json"
>+    hlsl_fname = "emulated_builtin_functions_hlsl_autogen.cpp"
> 
>-with open(hlsl_fname, 'wt') as f:
>-   f.write(hlsl_gen)
>-   f.close()
>+    # auto_script parameters.
>+    if len(sys.argv) > 1:
>+        inputs = [input_script]
>+        outputs = [hlsl_fname]
>+
>+        if sys.argv[1] == 'inputs':
>+            print ','.join(inputs)
>+        elif sys.argv[1] == 'outputs':
>+            print ','.join(outputs)
>+        else:
>+            print('Invalid script parameters')
>+            return 1
>+        return 0
>+
>+    hlsl_json = load_json(input_script)
>+    emulated_functions = []
>+
>+    for item in hlsl_json:
>+       emulated_functions += gen_emulated_function(item)
>+
>+    hlsl_gen = template_emulated_builtin_functions_hlsl.format(
>+       script_name = sys.argv[0],
>+       data_source_name = input_script,
>+       copyright_year = date.today().year,
>+       emulated_functions = "".join(emulated_functions))
>+
>+    with open(hlsl_fname, 'wt') as f:
>+       f.write(hlsl_gen)
>+       f.close()
>+
>+    return 0
>+
>+
>+if __name__ == '__main__':
>+    sys.exit(main())
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/glslang.l b/Source/ThirdParty/ANGLE/src/compiler/translator/glslang.l
>index 858ffd96bb3..8af29a8a7c7 100644
>--- a/Source/ThirdParty/ANGLE/src/compiler/translator/glslang.l
>+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/glslang.l
>@@ -26,9 +26,9 @@ WHICH GENERATES THE GLSL ES LEXER (glslang_lex.cpp).
> 
> // Ignore errors in auto-generated code.
> #if defined(__GNUC__)
>+#pragma GCC diagnostic ignored "-Wswitch-enum"
> #pragma GCC diagnostic ignored "-Wunused-function"
> #pragma GCC diagnostic ignored "-Wunused-variable"
>-#pragma GCC diagnostic ignored "-Wswitch-enum"
> #elif defined(_MSC_VER)
> #pragma warning(disable: 4005)
> #pragma warning(disable: 4065)
>@@ -38,6 +38,11 @@ WHICH GENERATES THE GLSL ES LEXER (glslang_lex.cpp).
> #pragma warning(disable: 4701)
> #pragma warning(disable: 4702)
> #endif
>+#if defined(__clang__)
>+#pragma GCC diagnostic ignored "-Wimplicit-fallthrough"
>+// Flex isn't semi-colon clean.
>+#pragma clang diagnostic ignored "-Wextra-semi-stmt"
>+#endif
> }
> 
> %{
>@@ -63,6 +68,7 @@ using namespace sh;
> #endif
> #endif
> 
>+#define YY_NO_INPUT
> #define YY_USER_ACTION                                 \
>     yylloc->first_file = yylloc->last_file = yycolumn; \
>     yylloc->first_line = yylloc->last_line = yylineno;
>@@ -81,6 +87,8 @@ static int ES2_ident_ES3_reserved_ES3_1_keyword(TParseContext *context, int toke
> static int ES2_and_ES3_reserved_ES3_1_keyword(TParseContext *context, int token);
> static int ES2_and_ES3_ident_ES3_1_keyword(TParseContext *context, int token);
> static int ES3_extension_keyword_else_ident(TParseContext *context, TExtension extension, int token);
>+static int ES2_ident_ES3_reserved_ES3_1_extension_keyword(TParseContext *context, TExtension extension, int token);
>+static int ES3_extension_and_ES3_1_keyword_ES3_reserved_else_ident(TParseContext *context, TExtension extension, int token);
> static int uint_constant(TParseContext *context);
> static int int_constant(TParseContext *context);
> static int float_constant(yyscan_t yyscanner);
>@@ -184,21 +192,24 @@ O           [0-7]
> "sampler3DRect"        { return ES2_reserved_ES3_keyword(context, SAMPLER3DRECT); }
> "sampler2DRect"        { return SAMPLER2DRECT; }
> "sampler2DArray"       { return ES2_ident_ES3_keyword(context, SAMPLER2DARRAY); }
>-"sampler2DMS"          { return ES2_ident_ES3_reserved_ES3_1_keyword(context, SAMPLER2DMS); }
>+"sampler2DMS"          { return ES3_extension_and_ES3_1_keyword_ES3_reserved_else_ident(context, TExtension::ANGLE_texture_multisample, SAMPLER2DMS); }
> "isampler2D"           { return ES2_ident_ES3_keyword(context, ISAMPLER2D); }
> "isampler3D"           { return ES2_ident_ES3_keyword(context, ISAMPLER3D); }
> "isamplerCube"         { return ES2_ident_ES3_keyword(context, ISAMPLERCUBE); }
> "isampler2DArray"      { return ES2_ident_ES3_keyword(context, ISAMPLER2DARRAY); }
>-"isampler2DMS"         { return ES2_ident_ES3_reserved_ES3_1_keyword(context, ISAMPLER2DMS); }
>+"isampler2DMS"         { return ES3_extension_and_ES3_1_keyword_ES3_reserved_else_ident(context, TExtension::ANGLE_texture_multisample, ISAMPLER2DMS); }
> "usampler2D"           { return ES2_ident_ES3_keyword(context, USAMPLER2D); }
> "usampler3D"           { return ES2_ident_ES3_keyword(context, USAMPLER3D); }
> "usamplerCube"         { return ES2_ident_ES3_keyword(context, USAMPLERCUBE); }
> "usampler2DArray"      { return ES2_ident_ES3_keyword(context, USAMPLER2DARRAY); }
>-"usampler2DMS"         { return ES2_ident_ES3_reserved_ES3_1_keyword(context, USAMPLER2DMS); }
>+"usampler2DMS"         { return ES3_extension_and_ES3_1_keyword_ES3_reserved_else_ident(context, TExtension::ANGLE_texture_multisample, USAMPLER2DMS); }
> "sampler2DShadow"      { return ES2_reserved_ES3_keyword(context, SAMPLER2DSHADOW); }
> "samplerCubeShadow"    { return ES2_ident_ES3_keyword(context, SAMPLERCUBESHADOW); }
> "sampler2DArrayShadow" { return ES2_ident_ES3_keyword(context, SAMPLER2DARRAYSHADOW); }
> "__samplerExternal2DY2YEXT"   { return ES3_extension_keyword_else_ident(context, TExtension::EXT_YUV_target, SAMPLEREXTERNAL2DY2YEXT); }
>+"sampler2DMSArray"     { return ES2_ident_ES3_reserved_ES3_1_extension_keyword(context, TExtension::OES_texture_storage_multisample_2d_array, SAMPLER2DMSARRAY); }
>+"isampler2DMSArray"    { return ES2_ident_ES3_reserved_ES3_1_extension_keyword(context, TExtension::OES_texture_storage_multisample_2d_array, ISAMPLER2DMSARRAY); }
>+"usampler2DMSArray"    { return ES2_ident_ES3_reserved_ES3_1_extension_keyword(context, TExtension::OES_texture_storage_multisample_2d_array, USAMPLER2DMSARRAY); }
> 
> "struct"       { return STRUCT; }
> 
>@@ -263,22 +274,19 @@ O           [0-7]
> "usampler2DRect"    |
> "samplerBuffer"     |
> "isamplerBuffer"    |
>-"usamplerBuffer"    |
>-"sampler2DMSArray"  |
>-"isampler2DMSArray" |
>-"usampler2DMSArray" { 
>+"usamplerBuffer"    {
>     if (context->getShaderVersion() < 300) {
>-		yylval->lex.string = NewPoolTString(yytext); 
>-	    return check_type(yyscanner); 
>-	}
>-	return reserved_word(yyscanner);
>+        yylval->lex.string = AllocatePoolCharArray(yytext, yyleng);
>+        return check_type(yyscanner);
>+    }
>+    return reserved_word(yyscanner);
> }
> 
>     /* Reserved keywords in GLSL ES 1.00 that are not reserved in GLSL ES 3.00 */
> "packed"  {
>     if (context->getShaderVersion() >= 300)
>     {
>-        yylval->lex.string = NewPoolTString(yytext);
>+        yylval->lex.string = AllocatePoolCharArray(yytext, yyleng);
>         return check_type(yyscanner);
>     }
> 
>@@ -337,7 +345,7 @@ O           [0-7]
> "using"        { return reserved_word(yyscanner); }
> 
> {L}({L}|{D})*       {
>-   yylval->lex.string = NewPoolTString(yytext); 
>+   yylval->lex.string = AllocatePoolCharArray(yytext, yyleng);
>    return check_type(yyscanner);
> }
> 
>@@ -406,7 +414,7 @@ O           [0-7]
> 
> <FIELDS>{L}({L}|{D})* {
>     BEGIN(INITIAL);
>-    yylval->lex.string = NewPoolTString(yytext);
>+    yylval->lex.string = AllocatePoolCharArray(yytext, yyleng);
>     return FIELD_SELECTION;
> }
> <FIELDS>[ \t\v\f\r] {}
>@@ -422,9 +430,9 @@ O           [0-7]
> %%
> 
> yy_size_t string_input(char* buf, yy_size_t max_size, yyscan_t yyscanner) {
>-    pp::Token token;
>+    angle::pp::Token token;
>     yyget_extra(yyscanner)->getPreprocessor().lex(&token);
>-    yy_size_t len = token.type == pp::Token::LAST ? 0 : token.text.size();
>+    yy_size_t len = token.type == angle::pp::Token::LAST ? 0 : token.text.size();
>     if (len < max_size)
>         memcpy(buf, token.text.c_str(), len);
>     yyset_column(token.location.file, yyscanner);
>@@ -439,14 +447,13 @@ yy_size_t string_input(char* buf, yy_size_t max_size, yyscan_t yyscanner) {
> 
> int check_type(yyscan_t yyscanner) {
>     struct yyguts_t* yyg = (struct yyguts_t*) yyscanner;
>-    
>+
>     int token = IDENTIFIER;
>-    TSymbol* symbol = yyextra->symbolTable.find(yytext, yyextra->getShaderVersion());
>-    if (symbol && symbol->isVariable()) {
>-        TVariable* variable = static_cast<TVariable*>(symbol);
>-        if (variable->isUserType()) {
>-            token = TYPE_NAME;
>-        }
>+    // Note that the ImmutableString used here isn't static or pool allocated - but it's fine since yytext is valid for the duration of its use.
>+    const TSymbol* symbol = yyextra->symbolTable.find(ImmutableString(yytext, yyleng), yyextra->getShaderVersion());
>+    if (symbol && symbol->isStruct())
>+    {
>+        token = TYPE_NAME;
>     }
>     yylval->lex.symbol = symbol;
>     return token;
>@@ -490,7 +497,7 @@ int ES2_ident_ES3_reserved_ES3_1_keyword(TParseContext *context, int token)
> 
>     if (context->getShaderVersion() < 300)
>     {
>-        yylval->lex.string = NewPoolTString(yytext);
>+        yylval->lex.string = AllocatePoolCharArray(yytext, yyleng);
>         return check_type(yyscanner);
>     }
>     else if (context->getShaderVersion() == 300)
>@@ -509,7 +516,7 @@ int ES2_ident_ES3_keyword(TParseContext *context, int token)
>     // not a reserved word in GLSL ES 1.00, so could be used as an identifier/type name
>     if (context->getShaderVersion() < 300)
>     {
>-        yylval->lex.string = NewPoolTString(yytext);
>+        yylval->lex.string = AllocatePoolCharArray(yytext, yyleng);
>         return check_type(yyscanner);
>     }
> 
>@@ -525,7 +532,7 @@ int ES2_ident_ES3_keyword_multiview_keyword(TParseContext *context, int token)
>     // except when multiview extension is enabled
>     if (context->getShaderVersion() < 300 && !context->isExtensionEnabled(TExtension::OVR_multiview))
>     {
>-        yylval->lex.string = NewPoolTString(yytext);
>+        yylval->lex.string = AllocatePoolCharArray(yytext, yyleng);
>         return check_type(yyscanner);
>     }
> 
>@@ -552,7 +559,7 @@ int ES2_and_ES3_ident_ES3_1_keyword(TParseContext *context, int token)
>     // not a reserved word in GLSL ES 1.00 and GLSL ES 3.00, so could be used as an identifier/type name
>     if (context->getShaderVersion() < 310)
>     {
>-        yylval->lex.string = NewPoolTString(yytext);
>+        yylval->lex.string = AllocatePoolCharArray(yytext, yyleng);
>         return check_type(yyscanner);
>     }
> 
>@@ -570,7 +577,48 @@ int ES3_extension_keyword_else_ident(TParseContext *context, TExtension extensio
>         return token;
>     }
> 
>-    yylval->lex.string = NewPoolTString(yytext);
>+    yylval->lex.string = AllocatePoolCharArray(yytext, yyleng);
>+    return check_type(yyscanner);
>+}
>+
>+int ES2_ident_ES3_reserved_ES3_1_extension_keyword(TParseContext *context, TExtension extension, int token)
>+{
>+    struct yyguts_t* yyg = (struct yyguts_t*) context->getScanner();
>+    yyscan_t yyscanner = (yyscan_t) context->getScanner();
>+
>+    // a keyword in GLSL ES 3.10 with enabled extension
>+    if (context->getShaderVersion() >= 310 && context->isExtensionEnabled(extension))
>+    {
>+        return token;
>+    }
>+    // a reserved word in GLSL ES 3.00+
>+    if (context->getShaderVersion() >= 300)
>+    {
>+        return reserved_word(yyscanner);
>+    }
>+
>+    // Otherwise can be used as an identifier/type name
>+    yylval->lex.string = AllocatePoolCharArray(yytext, yyleng);
>+    return check_type(yyscanner);
>+}
>+
>+int ES3_extension_and_ES3_1_keyword_ES3_reserved_else_ident(TParseContext *context, TExtension extension, int token)
>+{
>+    struct yyguts_t* yyg = (struct yyguts_t*) context->getScanner();
>+    yyscan_t yyscanner = (yyscan_t) context->getScanner();
>+
>+    // A keyword in GLSL ES 3.00 with enabled extension or in GLSL ES 3.10
>+    if (context->getShaderVersion() >= 310 || (context->getShaderVersion() == 300 && context->isExtensionEnabled(extension)))
>+    {
>+        return token;
>+    }
>+
>+    if(context->getShaderVersion() == 300)
>+    {
>+        return reserved_word(yyscanner);
>+    }
>+
>+    yylval->lex.string = AllocatePoolCharArray(yytext, yyleng);
>     return check_type(yyscanner);
> }
> 
>@@ -643,11 +691,11 @@ int yuvcscstandardext_constant(TParseContext *context)
>     // a reserved word in GLSL ES 3.00 with enabled extension, otherwise could be used as an identifier/type name
>     if (context->getShaderVersion() >= 300 && context->isExtensionEnabled(TExtension::EXT_YUV_target))
>     {
>-        yylval->lex.string = NewPoolTString(yytext);
>+        yylval->lex.string = AllocatePoolCharArray(yytext, yyleng);
>         return YUVCSCSTANDARDEXTCONSTANT;
>     }
> 
>-    yylval->lex.string = NewPoolTString(yytext);
>+    yylval->lex.string = AllocatePoolCharArray(yytext, yyleng);
>     return check_type(yyscanner);
> }
> 
>@@ -677,7 +725,7 @@ int glslang_scan(size_t count, const char* const string[], const int length[],
>     yyset_lineno(1, context->getScanner());
> 
>     // Initialize preprocessor.
>-    pp::Preprocessor *preprocessor = &context->getPreprocessor();
>+    angle::pp::Preprocessor *preprocessor = &context->getPreprocessor();
> 
>     if (!preprocessor->init(count, string, length))
>         return 1;
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/glslang.y b/Source/ThirdParty/ANGLE/src/compiler/translator/glslang.y
>index 3e506caac84..5d113e39ae0 100644
>--- a/Source/ThirdParty/ANGLE/src/compiler/translator/glslang.y
>+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/glslang.y
>@@ -39,7 +39,7 @@ WHICH GENERATES THE GLSL ES PARSER (glslang_tab.cpp AND glslang_tab.h).
> #endif
> 
> #include "angle_gl.h"
>-#include "compiler/translator/Cache.h"
>+#include "compiler/translator/Declarator.h"
> #include "compiler/translator/SymbolTable.h"
> #include "compiler/translator/ParseContext.h"
> #include "GLSLANG/ShaderLang.h"
>@@ -63,20 +63,19 @@ using namespace sh;
> %union {
>     struct {
>         union {
>-            TString *string;
>+            const char *string;  // pool allocated.
>             float f;
>             int i;
>             unsigned int u;
>             bool b;
>         };
>-        TSymbol* symbol;
>+        const TSymbol* symbol;
>     } lex;
>     struct {
>         TOperator op;
>         union {
>             TIntermNode *intermNode;
>             TIntermNodePair nodePair;
>-            TIntermFunctionCallOrMethod callOrMethodPair;
>             TIntermTyped *intermTypedNode;
>             TIntermAggregate *intermAggregate;
>             TIntermBlock *intermBlock;
>@@ -93,8 +92,10 @@ using namespace sh;
>             TLayoutQualifier layoutQualifier;
>             TQualifier qualifier;
>             TFunction *function;
>+            TFunctionLookup *functionLookup;
>             TParameter param;
>-            TField *field;
>+            TDeclarator *declarator;
>+            TDeclaratorList *declaratorList;
>             TFieldList *fieldList;
>             TQualifierWrapperBase *qualifierWrapper;
>             TTypeQualifierBuilder *typeQualifierBuilder;
>@@ -122,41 +123,41 @@ extern void yyerror(YYLTYPE* yylloc, TParseContext* context, void *scanner, cons
>       }                                                      \
>   } while (0)
> 
>-#define VERTEX_ONLY(S, L) {  \
>+#define VERTEX_ONLY(S, L) do {  \
>     if (context->getShaderType() != GL_VERTEX_SHADER) {  \
>         context->error(L, " supported in vertex shaders only", S);  \
>     }  \
>-}
>+} while (0)
> 
>-#define COMPUTE_ONLY(S, L) {  \
>+#define COMPUTE_ONLY(S, L) do {  \
>     if (context->getShaderType() != GL_COMPUTE_SHADER) {  \
>         context->error(L, " supported in compute shaders only", S);  \
>     }  \
>-}
>+} while (0)
> 
> #define ES2_ONLY(S, L) {  \
>-    if (context->getShaderVersion() != 100) {  \
>+    if (context->getShaderVersion() != 100) do {  \
>         context->error(L, " supported in GLSL ES 1.00 only", S);  \
>     }  \
>-}
>+} while (0)
> 
>-#define ES3_OR_NEWER(TOKEN, LINE, REASON) {  \
>+#define ES3_OR_NEWER(TOKEN, LINE, REASON) do {  \
>     if (context->getShaderVersion() < 300) {  \
>         context->error(LINE, REASON " supported in GLSL ES 3.00 and above only", TOKEN);  \
>     }  \
>-}
>+} while (0)
> 
>-#define ES3_OR_NEWER_OR_MULTIVIEW(TOKEN, LINE, REASON) {  \
>+#define ES3_OR_NEWER_OR_MULTIVIEW(TOKEN, LINE, REASON) do {  \
>     if (context->getShaderVersion() < 300 && !context->isExtensionEnabled(TExtension::OVR_multiview)) {  \
>         context->error(LINE, REASON " supported in GLSL ES 3.00 and above only", TOKEN);  \
>     }  \
>-}
>+} while (0)
> 
>-#define ES3_1_ONLY(TOKEN, LINE, REASON) {  \
>+#define ES3_1_ONLY(TOKEN, LINE, REASON) do {  \
>     if (context->getShaderVersion() != 310) {  \
>         context->error(LINE, REASON " supported in GLSL ES 3.10 only", TOKEN);  \
>     }  \
>-}
>+} while (0)
> %}
> 
> %token <lex> INVARIANT HIGH_PRECISION MEDIUM_PRECISION LOW_PRECISION PRECISION
>@@ -172,6 +173,7 @@ extern void yyerror(YYLTYPE* yylloc, TParseContext* context, void *scanner, cons
> %token <lex> ISAMPLER2D ISAMPLER3D ISAMPLERCUBE ISAMPLER2DARRAY
> %token <lex> USAMPLER2D USAMPLER3D USAMPLERCUBE USAMPLER2DARRAY
> %token <lex> SAMPLER2DMS ISAMPLER2DMS USAMPLER2DMS
>+%token <lex> SAMPLER2DMSARRAY ISAMPLER2DMSARRAY USAMPLER2DMSARRAY
> %token <lex> SAMPLER3D SAMPLER3DRECT SAMPLER2DSHADOW SAMPLERCUBESHADOW SAMPLER2DARRAYSHADOW
> %token <lex> SAMPLEREXTERNAL2DY2YEXT
> %token <lex> IMAGE2D IIMAGE2D UIMAGE2D IMAGE3D IIMAGE3D UIMAGE3D IMAGE2DARRAY IIMAGE2DARRAY UIMAGE2DARRAY
>@@ -232,12 +234,15 @@ extern void yyerror(YYLTYPE* yylloc, TParseContext* context, void *scanner, cons
> 
> %type <interm.typeSpecifierNonArray> type_specifier_nonarray struct_specifier
> %type <interm.type> type_specifier_no_prec
>-%type <interm.field> struct_declarator
>-%type <interm.fieldList> struct_declarator_list struct_declaration struct_declaration_list
>-%type <interm.function> function_header function_declarator function_identifier
>-%type <interm.function> function_header_with_parameters function_call_header
>-%type <interm> function_call_header_with_parameters function_call_header_no_parameters function_call_generic function_prototype
>-%type <interm> function_call_or_method
>+%type <interm.declarator> struct_declarator
>+%type <interm.declaratorList> struct_declarator_list
>+%type <interm.fieldList> struct_declaration struct_declaration_list
>+%type <interm.function> function_header function_declarator
>+%type <interm.function> function_header_with_parameters
>+%type <interm.functionLookup> function_identifier function_call_header
>+%type <interm.functionLookup> function_call_header_with_parameters function_call_header_no_parameters
>+%type <interm.functionLookup> function_call_generic function_call_or_method
>+%type <interm> function_prototype
> 
> %type <lex> enter_struct
> 
>@@ -251,10 +256,7 @@ identifier
> variable_identifier
>     : IDENTIFIER {
>         // The symbol table search was done in the lexical phase
>-        $$ = context->parseVariableIdentifier(@1, $1.string, $1.symbol);
>-
>-        // don't delete $1.string, it's used by error recovery, and the pool
>-        // pop will reclaim the memory
>+        $$ = context->parseVariableIdentifier(@1, ImmutableString($1.string), $1.symbol);
>     }
>     ;
> 
>@@ -285,10 +287,10 @@ primary_expression
>     | YUVCSCSTANDARDEXTCONSTANT {
>         if (!context->checkCanUseExtension(@1, TExtension::EXT_YUV_target))
>         {
>-           context->error(@1, "unsupported value", $1.string->c_str());
>+           context->error(@1, "unsupported value", ImmutableString($1.string));
>         }
>         TConstantUnion *unionArray = new TConstantUnion[1];
>-        unionArray->setYuvCscStandardEXTConst(getYuvCscStandardEXT($1.string->c_str()));
>+        unionArray->setYuvCscStandardEXTConst(getYuvCscStandardEXT(ImmutableString($1.string)));
>         $$ = context->addScalarLiteral(unionArray, @1);
>     }
>     | LEFT_PAREN expression RIGHT_PAREN {
>@@ -307,7 +309,7 @@ postfix_expression
>         $$ = $1;
>     }
>     | postfix_expression DOT FIELD_SELECTION {
>-        $$ = context->addFieldSelectionExpression($1, @2, *$3.string, @3);
>+        $$ = context->addFieldSelectionExpression($1, @2, ImmutableString($3.string), @3);
>     }
>     | postfix_expression INC_OP {
>         $$ = context->addUnaryMathLValue(EOpPostIncrement, $1, @2);
>@@ -326,19 +328,18 @@ integer_expression
> 
> function_call
>     : function_call_or_method {
>-        $$ = context->addFunctionCallOrMethod($1.function, $1.callOrMethodPair.arguments, $1.callOrMethodPair.thisNode, @1);
>+        $$ = context->addFunctionCallOrMethod($1, @1);
>     }
>     ;
> 
> function_call_or_method
>     : function_call_generic {
>         $$ = $1;
>-        $$.callOrMethodPair.thisNode = nullptr;
>     }
>     | postfix_expression DOT function_call_generic {
>         ES3_OR_NEWER("", @3, "methods");
>         $$ = $3;
>-        $$.callOrMethodPair.thisNode = $1;
>+        $$->setThisNode($1);
>     }
>     ;
> 
>@@ -353,24 +354,21 @@ function_call_generic
> 
> function_call_header_no_parameters
>     : function_call_header VOID_TYPE {
>-        $$.function = $1;
>-        $$.callOrMethodPair.arguments = context->createEmptyArgumentsList();
>+        $$ = $1;
>     }
>     | function_call_header {
>-        $$.function = $1;
>-        $$.callOrMethodPair.arguments = context->createEmptyArgumentsList();
>+        $$ = $1;
>     }
>     ;
> 
> function_call_header_with_parameters
>     : function_call_header assignment_expression {
>-        $$.callOrMethodPair.arguments = context->createEmptyArgumentsList();
>-        $$.function = $1;
>-        $$.callOrMethodPair.arguments->push_back($2);
>+        $$ = $1;
>+        $$->addArgument($2);
>     }
>     | function_call_header_with_parameters COMMA assignment_expression {
>-        $$.function = $1.function;
>-        $$.callOrMethodPair.arguments->push_back($3);
>+        $$ = $1;
>+        $$->addArgument($3);
>     }
>     ;
> 
>@@ -387,10 +385,10 @@ function_identifier
>         $$ = context->addConstructorFunc($1);
>     }
>     | IDENTIFIER {
>-        $$ = context->addNonConstructorFunc($1.string, @1);
>+        $$ = context->addNonConstructorFunc(ImmutableString($1.string), $1.symbol);
>     }
>     | FIELD_SELECTION {
>-        $$ = context->addNonConstructorFunc($1.string, @1);
>+        $$ = context->addNonConstructorFunc(ImmutableString($1.string), $1.symbol);
>     }
>     ;
> 
>@@ -592,7 +590,7 @@ constant_expression
> 
> enter_struct
>     : IDENTIFIER LEFT_BRACE {
>-        context->enterStructDeclaration(@1, *$1.string);
>+        context->enterStructDeclaration(@1, ImmutableString($1.string));
>         $$ = $1;
>     }
>     ;
>@@ -609,16 +607,16 @@ declaration
>         $$ = nullptr;
>     }
>     | type_qualifier enter_struct struct_declaration_list RIGHT_BRACE SEMICOLON {
>-        ES3_OR_NEWER($2.string->c_str(), @1, "interface blocks");
>-        $$ = context->addInterfaceBlock(*$1, @2, *$2.string, $3, NULL, @$, NULL, @$);
>+        ES3_OR_NEWER(ImmutableString($2.string), @1, "interface blocks");
>+        $$ = context->addInterfaceBlock(*$1, @2, ImmutableString($2.string), $3, kEmptyImmutableString, @$, NULL, @$);
>     }
>     | type_qualifier enter_struct struct_declaration_list RIGHT_BRACE IDENTIFIER SEMICOLON {
>-        ES3_OR_NEWER($2.string->c_str(), @1, "interface blocks");
>-        $$ = context->addInterfaceBlock(*$1, @2, *$2.string, $3, $5.string, @5, NULL, @$);
>+        ES3_OR_NEWER(ImmutableString($2.string), @1, "interface blocks");
>+        $$ = context->addInterfaceBlock(*$1, @2, ImmutableString($2.string), $3, ImmutableString($5.string), @5, NULL, @$);
>     }
>     | type_qualifier enter_struct struct_declaration_list RIGHT_BRACE IDENTIFIER LEFT_BRACKET constant_expression RIGHT_BRACKET SEMICOLON {
>-        ES3_OR_NEWER($2.string->c_str(), @1, "interface blocks");
>-        $$ = context->addInterfaceBlock(*$1, @2, *$2.string, $3, $5.string, @5, $7, @6);
>+        ES3_OR_NEWER(ImmutableString($2.string), @1, "interface blocks");
>+        $$ = context->addInterfaceBlock(*$1, @2, ImmutableString($2.string), $3, ImmutableString($5.string), @5, $7, @6);
>     }
>     | type_qualifier SEMICOLON {
>         context->parseGlobalLayoutQualifier(*$1);
>@@ -626,7 +624,7 @@ declaration
>     }
>     | type_qualifier IDENTIFIER SEMICOLON // e.g. to qualify an existing variable as invariant
>     {
>-        $$ = context->parseInvariantDeclaration(*$1, @2, $2.string, $2.symbol);
>+        $$ = context->parseInvariantDeclaration(*$1, @2, ImmutableString($2.string), $2.symbol);
>     }
>     ;
> 
>@@ -653,7 +651,7 @@ function_header_with_parameters
>         $$ = $1;
>         if ($2.type->getBasicType() != EbtVoid)
>         {
>-            $1->addParameter($2.turnToConst());
>+            $1->addParameter($2.createVariable(&context->symbolTable));
>         }
>     }
>     | function_header_with_parameters COMMA parameter_declaration {
>@@ -667,14 +665,14 @@ function_header_with_parameters
>         }
>         else
>         {
>-            $1->addParameter($3.turnToConst());
>+            $1->addParameter($3.createVariable(&context->symbolTable));
>         }
>     }
>     ;
> 
> function_header
>     : fully_specified_type IDENTIFIER LEFT_PAREN {
>-        $$ = context->parseFunctionHeader($1, $2.string, @2);
>+        $$ = context->parseFunctionHeader($1, ImmutableString($2.string), @2);
> 
>         context->symbolTable.push();
>         context->enterFunctionDeclaration();
>@@ -684,10 +682,10 @@ function_header
> parameter_declarator
>     // Type + name
>     : type_specifier identifier {
>-        $$ = context->parseParameterDeclarator($1, $2.string, @2);
>+        $$ = context->parseParameterDeclarator($1, ImmutableString($2.string), @2);
>     }
>     | type_specifier identifier array_specifier {
>-        $$ = context->parseParameterArrayDeclarator($2.string, @2, *($3), @3, &$1);
>+        $$ = context->parseParameterArrayDeclarator(ImmutableString($2.string), @2, *($3), @3, &$1);
>     }
>     ;
> 
>@@ -723,44 +721,44 @@ init_declarator_list
>     }
>     | init_declarator_list COMMA identifier {
>         $$ = $1;
>-        context->parseDeclarator($$.type, @3, *$3.string, $$.intermDeclaration);
>+        context->parseDeclarator($$.type, @3, ImmutableString($3.string), $$.intermDeclaration);
>     }
>     | init_declarator_list COMMA identifier array_specifier {
>         $$ = $1;
>-        context->parseArrayDeclarator($$.type, @3, *$3.string, @4, *($4), $$.intermDeclaration);
>+        context->parseArrayDeclarator($$.type, @3, ImmutableString($3.string), @4, *($4), $$.intermDeclaration);
>     }
>     | init_declarator_list COMMA identifier array_specifier EQUAL initializer {
>         ES3_OR_NEWER("=", @5, "first-class arrays (array initializer)");
>         $$ = $1;
>-        context->parseArrayInitDeclarator($$.type, @3, *$3.string, @4, *($4), @5, $6, $$.intermDeclaration);
>+        context->parseArrayInitDeclarator($$.type, @3, ImmutableString($3.string), @4, *($4), @5, $6, $$.intermDeclaration);
>     }
>     | init_declarator_list COMMA identifier EQUAL initializer {
>         $$ = $1;
>-        context->parseInitDeclarator($$.type, @3, *$3.string, @4, $5, $$.intermDeclaration);
>+        context->parseInitDeclarator($$.type, @3, ImmutableString($3.string), @4, $5, $$.intermDeclaration);
>     }
>     ;
> 
> single_declaration
>     : fully_specified_type {
>         $$.type = $1;
>-        $$.intermDeclaration = context->parseSingleDeclaration($$.type, @1, "");
>+        $$.intermDeclaration = context->parseSingleDeclaration($$.type, @1, kEmptyImmutableString);
>     }
>     | fully_specified_type identifier {
>         $$.type = $1;
>-        $$.intermDeclaration = context->parseSingleDeclaration($$.type, @2, *$2.string);
>+        $$.intermDeclaration = context->parseSingleDeclaration($$.type, @2, ImmutableString($2.string));
>     }
>     | fully_specified_type identifier array_specifier {
>         $$.type = $1;
>-        $$.intermDeclaration = context->parseSingleArrayDeclaration($$.type, @2, *$2.string, @3, *($3));
>+        $$.intermDeclaration = context->parseSingleArrayDeclaration($$.type, @2, ImmutableString($2.string), @3, *($3));
>     }
>     | fully_specified_type identifier array_specifier EQUAL initializer {
>         ES3_OR_NEWER("[]", @3, "first-class arrays (array initializer)");
>         $$.type = $1;
>-        $$.intermDeclaration = context->parseSingleArrayInitDeclaration($$.type, @2, *$2.string, @3, *($3), @4, $5);
>+        $$.intermDeclaration = context->parseSingleArrayInitDeclaration($$.type, @2, ImmutableString($2.string), @3, *($3), @4, $5);
>     }
>     | fully_specified_type identifier EQUAL initializer {
>         $$.type = $1;
>-        $$.intermDeclaration = context->parseSingleInitDeclaration($$.type, @2, *$2.string, @3, $4);
>+        $$.intermDeclaration = context->parseSingleInitDeclaration($$.type, @2, ImmutableString($2.string), @3, $4);
>     }
>     ;
> 
>@@ -914,16 +912,16 @@ layout_qualifier_id_list
> 
> layout_qualifier_id
>     : IDENTIFIER {
>-        $$ = context->parseLayoutQualifier(*$1.string, @1);
>+        $$ = context->parseLayoutQualifier(ImmutableString($1.string), @1);
>     }
>     | IDENTIFIER EQUAL INTCONSTANT {
>-        $$ = context->parseLayoutQualifier(*$1.string, @1, $3.i, @3);
>+        $$ = context->parseLayoutQualifier(ImmutableString($1.string), @1, $3.i, @3);
>     }
>     | IDENTIFIER EQUAL UINTCONSTANT {
>-        $$ = context->parseLayoutQualifier(*$1.string, @1, $3.i, @3);
>+        $$ = context->parseLayoutQualifier(ImmutableString($1.string), @1, $3.i, @3);
>     }
>     | SHARED {
>-        $$ = context->parseLayoutQualifier("shared", @1);
>+        $$ = context->parseLayoutQualifier(ImmutableString("shared"), @1);
>     }
>     ;
> 
>@@ -1087,6 +1085,9 @@ type_specifier_nonarray
>     | SAMPLER2DMS {
>         $$.initialize(EbtSampler2DMS, @1);
>     }
>+    | SAMPLER2DMSARRAY {
>+        $$.initialize(EbtSampler2DMSArray, @1);
>+    }
>     | ISAMPLER2D {
>         $$.initialize(EbtISampler2D, @1);
>     }
>@@ -1102,6 +1103,9 @@ type_specifier_nonarray
>     | ISAMPLER2DMS {
>         $$.initialize(EbtISampler2DMS, @1);
>     }
>+    | ISAMPLER2DMSARRAY {
>+        $$.initialize(EbtISampler2DMSArray, @1);
>+    }
>     | USAMPLER2D {
>         $$.initialize(EbtUSampler2D, @1);
>     }
>@@ -1117,6 +1121,9 @@ type_specifier_nonarray
>     | USAMPLER2DMS {
>         $$.initialize(EbtUSampler2DMS, @1);
>     }
>+    | USAMPLER2DMSARRAY {
>+        $$.initialize(EbtUSampler2DMSArray, @1);
>+    }
>     | SAMPLER2DSHADOW {
>         $$.initialize(EbtSampler2DShadow, @1);
>     }
>@@ -1150,9 +1157,6 @@ type_specifier_nonarray
>         }
>         $$.initialize(EbtSampler2DRect, @1);
>     }
>-    | struct_specifier {
>-        $$ = $1;
>-    }
>     | IMAGE2D {
>         $$.initialize(EbtImage2D, @1);
>     }
>@@ -1192,19 +1196,22 @@ type_specifier_nonarray
>     | ATOMICUINT {
>         $$.initialize(EbtAtomicCounter, @1);
>     }
>+    | struct_specifier {
>+        $$ = $1;
>+    }
>     | TYPE_NAME {
>         // This is for user defined type names. The lexical phase looked up the type.
>-        TType& structure = static_cast<TVariable*>($1.symbol)->getType();
>-        $$.initializeStruct(structure.getStruct(), false, @1);
>+        const TStructure *structure = static_cast<const TStructure*>($1.symbol);
>+        $$.initializeStruct(structure, false, @1);
>     }
>     ;
> 
> struct_specifier
>-    : STRUCT identifier LEFT_BRACE { context->enterStructDeclaration(@2, *$2.string); } struct_declaration_list RIGHT_BRACE {
>-        $$ = context->addStructure(@1, @2, $2.string, $5);
>+    : STRUCT identifier LEFT_BRACE { context->enterStructDeclaration(@2, ImmutableString($2.string)); } struct_declaration_list RIGHT_BRACE {
>+        $$ = context->addStructure(@1, @2, ImmutableString($2.string), $5);
>     }
>-    | STRUCT LEFT_BRACE { context->enterStructDeclaration(@2, *$2.string); } struct_declaration_list RIGHT_BRACE {
>-        $$ = context->addStructure(@1, @$, NewPoolTString(""), $4);
>+    | STRUCT LEFT_BRACE { context->enterStructDeclaration(@2, kEmptyImmutableString); } struct_declaration_list RIGHT_BRACE {
>+        $$ = context->addStructure(@1, @$, kEmptyImmutableString, $4);
>     }
>     ;
> 
>@@ -1229,7 +1236,7 @@ struct_declaration
> 
> struct_declarator_list
>     : struct_declarator {
>-        $$ = NewPoolTFieldList();
>+        $$ = new TDeclaratorList();
>         $$->push_back($1);
>     }
>     | struct_declarator_list COMMA struct_declarator {
>@@ -1239,10 +1246,10 @@ struct_declarator_list
> 
> struct_declarator
>     : identifier {
>-        $$ = context->parseStructDeclarator($1.string, @1);
>+        $$ = context->parseStructDeclarator(ImmutableString($1.string), @1);
>     }
>     | identifier array_specifier {
>-        $$ = context->parseStructArrayDeclarator($1.string, @1, *($2), @2);
>+        $$ = context->parseStructArrayDeclarator(ImmutableString($1.string), @1, $2);
>     }
>     ;
> 
>@@ -1307,11 +1314,11 @@ compound_statement_no_new_scope
> statement_list
>     : statement {
>         $$ = new TIntermBlock();
>-        $$->appendStatement($1);
>+        context->appendStatement($$, $1);
>     }
>     | statement_list statement {
>         $$ = $1;
>-        $$->appendStatement($2);
>+        context->appendStatement($$, $2);
>     }
>     ;
> 
>@@ -1361,7 +1368,7 @@ condition
>         context->checkIsScalarBool($1->getLine(), $1);
>     }
>     | fully_specified_type identifier EQUAL initializer {
>-        $$ = context->addConditionInitializer($1, *$2.string, $4, @2);
>+        $$ = context->addConditionInitializer($1, ImmutableString($2.string), $4, @2);
>     }
>     ;
> 
>@@ -1454,7 +1461,7 @@ external_declaration
> 
> function_definition
>     : function_prototype {
>-        context->parseFunctionDefinitionHeader(@1, &($1.function), &($1.intermFunctionPrototype));
>+        context->parseFunctionDefinitionHeader(@1, $1.function, &($1.intermFunctionPrototype));
>     }
>     compound_statement_no_new_scope {
>         $$ = context->addFunctionDefinition($1.intermFunctionPrototype, $3, @1);
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/glslang_lex.cpp b/Source/ThirdParty/ANGLE/src/compiler/translator/glslang_lex.cpp
>index d2f991984ff..2bf0ab37b4d 100644
>--- a/Source/ThirdParty/ANGLE/src/compiler/translator/glslang_lex.cpp
>+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/glslang_lex.cpp
>@@ -11,9 +11,9 @@
> 
> // Ignore errors in auto-generated code.
> #if defined(__GNUC__)
>+#pragma GCC diagnostic ignored "-Wswitch-enum"
> #pragma GCC diagnostic ignored "-Wunused-function"
> #pragma GCC diagnostic ignored "-Wunused-variable"
>-#pragma GCC diagnostic ignored "-Wswitch-enum"
> #elif defined(_MSC_VER)
> #pragma warning(disable: 4005)
> #pragma warning(disable: 4065)
>@@ -23,6 +23,11 @@
> #pragma warning(disable: 4701)
> #pragma warning(disable: 4702)
> #endif
>+#if defined(__clang__)
>+#pragma GCC diagnostic ignored "-Wimplicit-fallthrough"
>+// Flex isn't semi-colon clean.
>+#pragma clang diagnostic ignored "-Wextra-semi-stmt"
>+#endif
> 
> 
> 
>@@ -107,10 +112,10 @@
> /* First, we deal with  platform-specific or compiler-specific issues. */
> 
> /* begin standard C headers. */
>-#include <stdio.h>
>-#include <string.h>
> #include <errno.h>
>+#include <stdio.h>
> #include <stdlib.h>
>+#include <string.h>
> 
> /* end standard C headers. */
> 
>@@ -570,58 +575,58 @@ static const flex_int16_t yy_accept[891] =
>       169,  170,  184,  184,  184,   26,  166,  184,  184,  184,
> 
>       184,  184,   52,   53,   54,  184,  184,  184,  184,  184,
>-      184,  184,  184,  184,  184,  184,  109,  184,  184,  184,
>+      184,  184,  184,  184,  184,  184,  112,  184,  184,  184,
>       184,  184,  184,  184,  184,  160,  184,  184,  184,  184,
>       184,  184,  184,  184,  184,  184,  184,  146,  184,  184,
>       183,   58,   59,   60,  184,  184,   15,  184,  184,  184,
>-      114,  184,  184,    9,  184,  184,  112,  184,  184,  184,
>-      161,  156,  115,  184,  184,  184,  184,  184,  184,  152,
>-      184,  184,  184,  184,  184,   84,   40,   43,   45,   44,
>+      117,  184,  184,    9,  184,  184,  115,  184,  184,  184,
>+      161,  156,  118,  184,  184,  184,  184,  184,  184,  152,
>+      184,  184,  184,  184,  184,   87,   40,   43,   45,   44,
>        41,   47,   46,   48,   42,  184,  184,  184,  184,  167,
>-      143,  184,  184,  154,  184,  184,  184,   36,  110,   27,
>+      143,  184,  184,  154,  184,  184,  184,   36,  113,   27,
> 
>-      180,   23,  155,   83,  184,  165,   18,  184,  184,  184,
>+      180,   23,  155,   86,  184,  165,   18,  184,  184,  184,
>       184,  184,  184,  184,  184,  184,  184,  184,  184,  184,
>       184,  184,  184,   20,   35,  184,  184,  184,  184,  184,
>-      184,  116,   89,   95,  184,  184,  184,  184,  184,   86,
>-       88,    3,  184,  184,  184,  184,  184,  184,  184,  184,
>+      184,  119,   92,   98,  184,  184,  184,  184,  184,   89,
>+       91,    3,  184,  184,  184,  184,  184,  184,  184,  184,
>       184,  184,  184,  148,  184,  184,  184,  184,  184,    8,
>       184,  184,   10,  184,  184,  184,  184,  184,  184,   21,
>-      103,   12,  157,  117,   90,   97,  184,  184,  184,  184,
>+      106,   12,  157,  120,   93,  100,  184,  184,  184,  184,
>       184,  184,  184,  184,  184,  184,  184,  184,  184,  153,
>-      184,  184,  184,  101,  107,  104,  184,  184,  184,  184,
>+      184,  184,  184,  104,  110,  107,  184,  184,  184,  184,
> 
>-      184,  184,  184,  149,  118,   91,   96,  184,  184,  164,
>-      184,  105,  184,  184,  184,  184,    6,  184,  184,  184,
>-      184,  184,  184,  184,  184,  184,  100,  158,    1,  184,
>-      184,  184,  184,  184,  184,  182,  184,  113,    5,  177,
>+      184,  184,  184,  149,  121,   94,   99,  184,  184,  164,
>+      184,  108,  184,  184,  184,  184,    6,  184,  184,  184,
>+      184,  184,  184,  184,  184,  184,  103,  158,    1,  184,
>+      184,  184,  184,  184,  184,  182,  184,  116,    5,  177,
>        61,   64,  184,  184,  184,  184,  184,  184,  184,  184,
>-      184,  184,  184,  184,  184,  102,  184,  184,  184,  184,
>-      184,  184,   98,  184,  184,  184,  184,  184,  131,   69,
>+      184,  184,  184,  184,  184,  105,  184,  184,  184,  184,
>+      184,  184,  101,  184,  184,  184,  184,  184,  134,   69,
>        70,  184,  184,  184,  184,  184,  184,  184,  184,  184,
>-      184,  184,  184,  184,  184,  111,  184,  184,  184,   99,
>-      133,   74,   75,  184,  184,  184,  184,  106,  184,  184,
>+      184,  184,  184,  184,  184,  114,  184,  184,  184,  102,
>+      136,   74,   75,  184,  184,  184,  184,  109,  184,  184,
> 
>-      184,  184,  184,  184,  184,  126,  184,  184,  184,  184,
>+      184,  184,  184,  184,  184,  129,  184,  184,  184,  184,
>       184,  184,  184,  184,  184,  184,  184,   68,  184,  184,
>       184,  184,   62,  184,  184,  184,  184,  184,  184,  184,
>-      184,  184,  184,  184,  184,  184,  184,  127,  119,  184,
>-       92,  184,  184,  184,   73,  184,  184,   71,  184,  184,
>+      184,  184,  184,  184,  184,  184,  184,  130,  122,  184,
>+       95,  184,  184,  184,   73,  184,  184,   71,  184,  184,
>       184,  184,  184,  184,  184,  184,  184,  184,  184,  184,
>-      184,  184,  128,  184,  184,   78,  184,  184,   76,  184,
>-      184,  120,   93,  184,  122,  184,  123,  184,  184,  184,
>-      184,  184,  184,  108,  184,  184,  184,  184,   66,  184,
>-       65,  137,  184,  184,  121,   94,  184,  184,  184,  184,
>-
>-      184,  184,  184,  184,  184,  184,  184,  184,  135,  138,
>-      184,  129,  184,   67,  184,  184,  184,  184,  184,  184,
>-      184,  184,  136,  139,  184,  184,  184,  184,  132,   72,
>+      184,  184,  131,  184,  184,   78,  184,  184,   76,  184,
>+      184,  123,   96,  184,  125,  184,  126,  184,  184,  184,
>+      184,  184,  184,  111,  184,  184,  184,  184,   66,  184,
>+       65,  140,  184,  184,  124,   97,  184,  184,  184,  184,
>+
>+      184,  184,  184,  184,  184,  184,  184,  184,  138,  141,
>+      184,  132,  184,   67,  184,  184,  184,  184,  184,  184,
>+      184,  184,  139,  142,  184,  184,  184,  184,  135,   72,
>       184,  184,  184,  178,  184,  184,  184,   79,  184,  184,
>-      134,   77,  184,  184,  184,  184,  184,  184,  184,  184,
>-      184,  140,  184,  184,  184,  184,  184,  184,  184,  184,
>-      141,  184,  184,  184,  184,   80,  184,  142,   85,  184,
>-      124,  125,   87,  184,  184,  184,   63,  184,  184,  184,
>-      179,  184,  130,   81,  184,  184,  184,  184,   82,    0
>+      137,   77,  184,  184,  184,  184,  184,  184,  184,  184,
>+      184,   83,  184,  184,  184,  184,  184,  184,  184,  184,
>+       84,  184,  184,  184,  184,   80,  184,   85,   88,  184,
>+      127,  128,   90,  184,  184,  184,   63,  184,  184,  184,
>+      179,  184,  133,   81,  184,  184,  184,  184,   82,    0
>     } ;
> 
> static const YY_CHAR yy_ec[256] =
>@@ -1180,11 +1185,11 @@ IF YOU MODIFY THIS FILE YOU ALSO NEED TO RUN generate_parser.sh,
> WHICH GENERATES THE GLSL ES LEXER (glslang_lex.cpp).
> */
> 
>-#include "compiler/translator/glslang.h"
>-#include "compiler/translator/ParseContext.h"
> #include "compiler/preprocessor/Token.h"
>-#include "compiler/translator/util.h"
>+#include "compiler/translator/ParseContext.h"
>+#include "compiler/translator/glslang.h"
> #include "compiler/translator/length_limits.h"
>+#include "compiler/translator/util.h"
> 
> using namespace sh;
> 
>@@ -1202,6 +1207,7 @@ using namespace sh;
> #endif
> #endif
> 
>+#define YY_NO_INPUT
> #define YY_USER_ACTION                                 \
>     yylloc->first_file = yylloc->last_file = yycolumn; \
>     yylloc->first_line = yylloc->last_line = yylineno;
>@@ -1220,6 +1226,8 @@ static int ES2_ident_ES3_reserved_ES3_1_keyword(TParseContext *context, int toke
> static int ES2_and_ES3_reserved_ES3_1_keyword(TParseContext *context, int token);
> static int ES2_and_ES3_ident_ES3_1_keyword(TParseContext *context, int token);
> static int ES3_extension_keyword_else_ident(TParseContext *context, TExtension extension, int token);
>+static int ES2_ident_ES3_reserved_ES3_1_extension_keyword(TParseContext *context, TExtension extension, int token);
>+static int ES3_extension_and_ES3_1_keyword_ES3_reserved_else_ident(TParseContext *context, TExtension extension, int token);
> static int uint_constant(TParseContext *context);
> static int int_constant(TParseContext *context);
> static int float_constant(yyscan_t yyscanner);
>@@ -1963,7 +1971,7 @@ YY_RULE_SETUP
> 	YY_BREAK
> case 68:
> YY_RULE_SETUP
>-{ return ES2_ident_ES3_reserved_ES3_1_keyword(context, SAMPLER2DMS); }
>+{ return ES3_extension_and_ES3_1_keyword_ES3_reserved_else_ident(context, TExtension::ANGLE_texture_multisample, SAMPLER2DMS); }
> 	YY_BREAK
> case 69:
> YY_RULE_SETUP
>@@ -1983,7 +1991,7 @@ YY_RULE_SETUP
> 	YY_BREAK
> case 73:
> YY_RULE_SETUP
>-{ return ES2_ident_ES3_reserved_ES3_1_keyword(context, ISAMPLER2DMS); }
>+{ return ES3_extension_and_ES3_1_keyword_ES3_reserved_else_ident(context, TExtension::ANGLE_texture_multisample, ISAMPLER2DMS); }
> 	YY_BREAK
> case 74:
> YY_RULE_SETUP
>@@ -2003,7 +2011,7 @@ YY_RULE_SETUP
> 	YY_BREAK
> case 78:
> YY_RULE_SETUP
>-{ return ES2_ident_ES3_reserved_ES3_1_keyword(context, USAMPLER2DMS); }
>+{ return ES3_extension_and_ES3_1_keyword_ES3_reserved_else_ident(context, TExtension::ANGLE_texture_multisample, USAMPLER2DMS); }
> 	YY_BREAK
> case 79:
> YY_RULE_SETUP
>@@ -2023,104 +2031,113 @@ YY_RULE_SETUP
> 	YY_BREAK
> case 83:
> YY_RULE_SETUP
>-{ return STRUCT; }
>+{ return ES2_ident_ES3_reserved_ES3_1_extension_keyword(context, TExtension::OES_texture_storage_multisample_2d_array, SAMPLER2DMSARRAY); }
> 	YY_BREAK
> case 84:
> YY_RULE_SETUP
>-{ return ES2_ident_ES3_keyword_multiview_keyword(context, LAYOUT); }
>+{ return ES2_ident_ES3_reserved_ES3_1_extension_keyword(context, TExtension::OES_texture_storage_multisample_2d_array, ISAMPLER2DMSARRAY); }
> 	YY_BREAK
> case 85:
> YY_RULE_SETUP
>-{ return ES3_extension_keyword_else_ident(context, TExtension::EXT_YUV_target, YUVCSCSTANDARDEXT); }
>+{ return ES2_ident_ES3_reserved_ES3_1_extension_keyword(context, TExtension::OES_texture_storage_multisample_2d_array, USAMPLER2DMSARRAY); }
> 	YY_BREAK
> case 86:
> YY_RULE_SETUP
>-{ return yuvcscstandardext_constant(context); }
>+{ return STRUCT; }
> 	YY_BREAK
> case 87:
> YY_RULE_SETUP
>-{ return yuvcscstandardext_constant(context); }
>+{ return ES2_ident_ES3_keyword_multiview_keyword(context, LAYOUT); }
> 	YY_BREAK
> case 88:
> YY_RULE_SETUP
>-{ return yuvcscstandardext_constant(context); }
>+{ return ES3_extension_keyword_else_ident(context, TExtension::EXT_YUV_target, YUVCSCSTANDARDEXT); }
> 	YY_BREAK
> case 89:
> YY_RULE_SETUP
>-{ return ES2_ident_ES3_reserved_ES3_1_keyword(context, IMAGE2D); }
>+{ return yuvcscstandardext_constant(context); }
> 	YY_BREAK
> case 90:
> YY_RULE_SETUP
>-{ return ES2_ident_ES3_reserved_ES3_1_keyword(context, IIMAGE2D); }
>+{ return yuvcscstandardext_constant(context); }
> 	YY_BREAK
> case 91:
> YY_RULE_SETUP
>-{ return ES2_ident_ES3_reserved_ES3_1_keyword(context, UIMAGE2D); }
>+{ return yuvcscstandardext_constant(context); }
> 	YY_BREAK
> case 92:
> YY_RULE_SETUP
>-{ return ES2_ident_ES3_reserved_ES3_1_keyword(context, IMAGE2DARRAY); }
>+{ return ES2_ident_ES3_reserved_ES3_1_keyword(context, IMAGE2D); }
> 	YY_BREAK
> case 93:
> YY_RULE_SETUP
>-{ return ES2_ident_ES3_reserved_ES3_1_keyword(context, IIMAGE2DARRAY); }
>+{ return ES2_ident_ES3_reserved_ES3_1_keyword(context, IIMAGE2D); }
> 	YY_BREAK
> case 94:
> YY_RULE_SETUP
>-{ return ES2_ident_ES3_reserved_ES3_1_keyword(context, UIMAGE2DARRAY); }
>+{ return ES2_ident_ES3_reserved_ES3_1_keyword(context, UIMAGE2D); }
> 	YY_BREAK
> case 95:
> YY_RULE_SETUP
>-{ return ES2_ident_ES3_reserved_ES3_1_keyword(context, IMAGE3D); }
>+{ return ES2_ident_ES3_reserved_ES3_1_keyword(context, IMAGE2DARRAY); }
> 	YY_BREAK
> case 96:
> YY_RULE_SETUP
>-{ return ES2_ident_ES3_reserved_ES3_1_keyword(context, UIMAGE3D); }
>+{ return ES2_ident_ES3_reserved_ES3_1_keyword(context, IIMAGE2DARRAY); }
> 	YY_BREAK
> case 97:
> YY_RULE_SETUP
>-{ return ES2_ident_ES3_reserved_ES3_1_keyword(context, IIMAGE3D); }
>+{ return ES2_ident_ES3_reserved_ES3_1_keyword(context, UIMAGE2DARRAY); }
> 	YY_BREAK
> case 98:
> YY_RULE_SETUP
>-{ return ES2_ident_ES3_reserved_ES3_1_keyword(context, IIMAGECUBE); }
>+{ return ES2_ident_ES3_reserved_ES3_1_keyword(context, IMAGE3D); }
> 	YY_BREAK
> case 99:
> YY_RULE_SETUP
>-{ return ES2_ident_ES3_reserved_ES3_1_keyword(context, UIMAGECUBE); }
>+{ return ES2_ident_ES3_reserved_ES3_1_keyword(context, UIMAGE3D); }
> 	YY_BREAK
> case 100:
> YY_RULE_SETUP
>-{ return ES2_ident_ES3_reserved_ES3_1_keyword(context, IMAGECUBE); }
>+{ return ES2_ident_ES3_reserved_ES3_1_keyword(context, IIMAGE3D); }
> 	YY_BREAK
> case 101:
> YY_RULE_SETUP
>-{ return ES2_ident_ES3_reserved_ES3_1_keyword(context, READONLY); }
>+{ return ES2_ident_ES3_reserved_ES3_1_keyword(context, IIMAGECUBE); }
> 	YY_BREAK
> case 102:
> YY_RULE_SETUP
>-{ return ES2_ident_ES3_reserved_ES3_1_keyword(context, WRITEONLY); }
>+{ return ES2_ident_ES3_reserved_ES3_1_keyword(context, UIMAGECUBE); }
> 	YY_BREAK
> case 103:
> YY_RULE_SETUP
>-{ return ES2_ident_ES3_reserved_ES3_1_keyword(context, COHERENT); }
>+{ return ES2_ident_ES3_reserved_ES3_1_keyword(context, IMAGECUBE); }
> 	YY_BREAK
> case 104:
> YY_RULE_SETUP
>-{ return ES2_ident_ES3_reserved_ES3_1_keyword(context, RESTRICT); }
>+{ return ES2_ident_ES3_reserved_ES3_1_keyword(context, READONLY); }
> 	YY_BREAK
> case 105:
> YY_RULE_SETUP
>-{ return ES2_and_ES3_reserved_ES3_1_keyword(context, VOLATILE); }
>+{ return ES2_ident_ES3_reserved_ES3_1_keyword(context, WRITEONLY); }
> 	YY_BREAK
> case 106:
> YY_RULE_SETUP
>-{ return ES2_ident_ES3_reserved_ES3_1_keyword(context, ATOMICUINT); }
>+{ return ES2_ident_ES3_reserved_ES3_1_keyword(context, COHERENT); }
> 	YY_BREAK
>-/* Reserved keywords for GLSL ES 3.00 that are not reserved for GLSL ES 1.00 */
> case 107:
>+YY_RULE_SETUP
>+{ return ES2_ident_ES3_reserved_ES3_1_keyword(context, RESTRICT); }
>+	YY_BREAK
> case 108:
>+YY_RULE_SETUP
>+{ return ES2_and_ES3_reserved_ES3_1_keyword(context, VOLATILE); }
>+	YY_BREAK
> case 109:
>+YY_RULE_SETUP
>+{ return ES2_ident_ES3_reserved_ES3_1_keyword(context, ATOMICUINT); }
>+	YY_BREAK
>+/* Reserved keywords for GLSL ES 3.00 that are not reserved for GLSL ES 1.00 */
> case 110:
> case 111:
> case 112:
>@@ -2155,12 +2172,12 @@ case 140:
> case 141:
> case 142:
> YY_RULE_SETUP
>-{ 
>+{
>     if (context->getShaderVersion() < 300) {
>-		yylval->lex.string = NewPoolTString(yytext); 
>-	    return check_type(yyscanner); 
>-	}
>-	return reserved_word(yyscanner);
>+        yylval->lex.string = AllocatePoolCharArray(yytext, yyleng);
>+        return check_type(yyscanner);
>+    }
>+    return reserved_word(yyscanner);
> }
> 	YY_BREAK
> /* Reserved keywords in GLSL ES 1.00 that are not reserved in GLSL ES 3.00 */
>@@ -2169,7 +2186,7 @@ YY_RULE_SETUP
> {
>     if (context->getShaderVersion() >= 300)
>     {
>-        yylval->lex.string = NewPoolTString(yytext);
>+        yylval->lex.string = AllocatePoolCharArray(yytext, yyleng);
>         return check_type(yyscanner);
>     }
> 
>@@ -2223,7 +2240,7 @@ YY_RULE_SETUP
> case 184:
> YY_RULE_SETUP
> {
>-   yylval->lex.string = NewPoolTString(yytext); 
>+   yylval->lex.string = AllocatePoolCharArray(yytext, yyleng);
>    return check_type(yyscanner);
> }
> 	YY_BREAK
>@@ -2459,7 +2476,7 @@ case 242:
> YY_RULE_SETUP
> {
>     BEGIN(INITIAL);
>-    yylval->lex.string = NewPoolTString(yytext);
>+    yylval->lex.string = AllocatePoolCharArray(yytext, yyleng);
>     return FIELD_SELECTION;
> }
> 	YY_BREAK
>@@ -3778,9 +3795,9 @@ void yyfree (void * ptr , yyscan_t yyscanner)
> 
> 
> yy_size_t string_input(char* buf, yy_size_t max_size, yyscan_t yyscanner) {
>-    pp::Token token;
>+    angle::pp::Token token;
>     yyget_extra(yyscanner)->getPreprocessor().lex(&token);
>-    yy_size_t len = token.type == pp::Token::LAST ? 0 : token.text.size();
>+    yy_size_t len = token.type == angle::pp::Token::LAST ? 0 : token.text.size();
>     if (len < max_size)
>         memcpy(buf, token.text.c_str(), len);
>     yyset_column(token.location.file, yyscanner);
>@@ -3795,14 +3812,13 @@ yy_size_t string_input(char* buf, yy_size_t max_size, yyscan_t yyscanner) {
> 
> int check_type(yyscan_t yyscanner) {
>     struct yyguts_t* yyg = (struct yyguts_t*) yyscanner;
>-    
>+
>     int token = IDENTIFIER;
>-    TSymbol* symbol = yyextra->symbolTable.find(yytext, yyextra->getShaderVersion());
>-    if (symbol && symbol->isVariable()) {
>-        TVariable* variable = static_cast<TVariable*>(symbol);
>-        if (variable->isUserType()) {
>-            token = TYPE_NAME;
>-        }
>+    // Note that the ImmutableString used here isn't static or pool allocated - but it's fine since yytext is valid for the duration of its use.
>+    const TSymbol* symbol = yyextra->symbolTable.find(ImmutableString(yytext, yyleng), yyextra->getShaderVersion());
>+    if (symbol && symbol->isStruct())
>+    {
>+        token = TYPE_NAME;
>     }
>     yylval->lex.symbol = symbol;
>     return token;
>@@ -3846,7 +3862,7 @@ int ES2_ident_ES3_reserved_ES3_1_keyword(TParseContext *context, int token)
> 
>     if (context->getShaderVersion() < 300)
>     {
>-        yylval->lex.string = NewPoolTString(yytext);
>+        yylval->lex.string = AllocatePoolCharArray(yytext, yyleng);
>         return check_type(yyscanner);
>     }
>     else if (context->getShaderVersion() == 300)
>@@ -3865,7 +3881,7 @@ int ES2_ident_ES3_keyword(TParseContext *context, int token)
>     // not a reserved word in GLSL ES 1.00, so could be used as an identifier/type name
>     if (context->getShaderVersion() < 300)
>     {
>-        yylval->lex.string = NewPoolTString(yytext);
>+        yylval->lex.string = AllocatePoolCharArray(yytext, yyleng);
>         return check_type(yyscanner);
>     }
> 
>@@ -3879,9 +3895,9 @@ int ES2_ident_ES3_keyword_multiview_keyword(TParseContext *context, int token)
> 
>     // not a reserved word in GLSL ES 1.00, so could be used as an identifier/type name
>     // except when multiview extension is enabled
>-    if (context->getShaderVersion() < 300 && !context->isExtensionEnabled(TExtension::OVR_multiview))
>+    if (context->getShaderVersion() < 300 && !context->isExtensionEnabled(TExtension::OVR_multiview2))
>     {
>-        yylval->lex.string = NewPoolTString(yytext);
>+        yylval->lex.string = AllocatePoolCharArray(yytext, yyleng);
>         return check_type(yyscanner);
>     }
> 
>@@ -3908,7 +3924,7 @@ int ES2_and_ES3_ident_ES3_1_keyword(TParseContext *context, int token)
>     // not a reserved word in GLSL ES 1.00 and GLSL ES 3.00, so could be used as an identifier/type name
>     if (context->getShaderVersion() < 310)
>     {
>-        yylval->lex.string = NewPoolTString(yytext);
>+        yylval->lex.string = AllocatePoolCharArray(yytext, yyleng);
>         return check_type(yyscanner);
>     }
> 
>@@ -3926,7 +3942,48 @@ int ES3_extension_keyword_else_ident(TParseContext *context, TExtension extensio
>         return token;
>     }
> 
>-    yylval->lex.string = NewPoolTString(yytext);
>+    yylval->lex.string = AllocatePoolCharArray(yytext, yyleng);
>+    return check_type(yyscanner);
>+}
>+
>+int ES2_ident_ES3_reserved_ES3_1_extension_keyword(TParseContext *context, TExtension extension, int token)
>+{
>+    struct yyguts_t* yyg = (struct yyguts_t*) context->getScanner();
>+    yyscan_t yyscanner = (yyscan_t) context->getScanner();
>+
>+    // a keyword in GLSL ES 3.10 with enabled extension
>+    if (context->getShaderVersion() >= 310 && context->isExtensionEnabled(extension))
>+    {
>+        return token;
>+    }
>+    // a reserved word in GLSL ES 3.00+
>+    if (context->getShaderVersion() >= 300)
>+    {
>+        return reserved_word(yyscanner);
>+    }
>+
>+    // Otherwise can be used as an identifier/type name
>+    yylval->lex.string = AllocatePoolCharArray(yytext, yyleng);
>+    return check_type(yyscanner);
>+}
>+
>+int ES3_extension_and_ES3_1_keyword_ES3_reserved_else_ident(TParseContext *context, TExtension extension, int token)
>+{
>+    struct yyguts_t* yyg = (struct yyguts_t*) context->getScanner();
>+    yyscan_t yyscanner = (yyscan_t) context->getScanner();
>+
>+    // A keyword in GLSL ES 3.00 with enabled extension or in GLSL ES 3.10
>+    if (context->getShaderVersion() >= 310 || (context->getShaderVersion() == 300 && context->isExtensionEnabled(extension)))
>+    {
>+        return token;
>+    }
>+
>+    if(context->getShaderVersion() == 300)
>+    {
>+        return reserved_word(yyscanner);
>+    }
>+
>+    yylval->lex.string = AllocatePoolCharArray(yytext, yyleng);
>     return check_type(yyscanner);
> }
> 
>@@ -3999,11 +4056,11 @@ int yuvcscstandardext_constant(TParseContext *context)
>     // a reserved word in GLSL ES 3.00 with enabled extension, otherwise could be used as an identifier/type name
>     if (context->getShaderVersion() >= 300 && context->isExtensionEnabled(TExtension::EXT_YUV_target))
>     {
>-        yylval->lex.string = NewPoolTString(yytext);
>+        yylval->lex.string = AllocatePoolCharArray(yytext, yyleng);
>         return YUVCSCSTANDARDEXTCONSTANT;
>     }
> 
>-    yylval->lex.string = NewPoolTString(yytext);
>+    yylval->lex.string = AllocatePoolCharArray(yytext, yyleng);
>     return check_type(yyscanner);
> }
> 
>@@ -4033,7 +4090,7 @@ int glslang_scan(size_t count, const char* const string[], const int length[],
>     yyset_lineno(1, context->getScanner());
> 
>     // Initialize preprocessor.
>-    pp::Preprocessor *preprocessor = &context->getPreprocessor();
>+    angle::pp::Preprocessor *preprocessor = &context->getPreprocessor();
> 
>     if (!preprocessor->init(count, string, length))
>         return 1;
>@@ -4052,3 +4109,4 @@ int glslang_scan(size_t count, const char* const string[], const int length[],
>     return 0;
> }
> 
>+ 
>\ No newline at end of file
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/glslang_tab.cpp b/Source/ThirdParty/ANGLE/src/compiler/translator/glslang_tab.cpp
>index 14cd5360c3c..a60203b85cb 100644
>--- a/Source/ThirdParty/ANGLE/src/compiler/translator/glslang_tab.cpp
>+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/glslang_tab.cpp
>@@ -1,7 +1,5 @@
> /* A Bison parser, made by GNU Bison 3.0.4.  */
> 
>-/* Apple Note: For the avoidance of doubt, Apple elects to distribute this file under the terms of the BSD license. */
>-
> /* Bison implementation for Yacc-like parsers in C
> 
>    Copyright (C) 1984, 1989-1990, 2000-2015 Free Software Foundation, Inc.
>@@ -60,12 +58,8 @@
> /* Pull parsers.  */
> #define YYPULL 1
> 
>-
>-
>-
> /* Copy the first part of user declarations.  */
> 
>-
> //
> // Copyright (c) 2002-2014 The ANGLE Project Authors. All rights reserved.
> // Use of this source code is governed by a BSD-style license that can be
>@@ -91,7 +85,7 @@
> #endif
> 
> #include "angle_gl.h"
>-#include "compiler/translator/Cache.h"
>+#include "compiler/translator/Declarator.h"
> #include "compiler/translator/SymbolTable.h"
> #include "compiler/translator/ParseContext.h"
> #include "GLSLANG/ShaderLang.h"
>@@ -220,80 +214,83 @@ extern int yydebug;
>     SAMPLER2DMS = 332,
>     ISAMPLER2DMS = 333,
>     USAMPLER2DMS = 334,
>-    SAMPLER3D = 335,
>-    SAMPLER3DRECT = 336,
>-    SAMPLER2DSHADOW = 337,
>-    SAMPLERCUBESHADOW = 338,
>-    SAMPLER2DARRAYSHADOW = 339,
>-    SAMPLEREXTERNAL2DY2YEXT = 340,
>-    IMAGE2D = 341,
>-    IIMAGE2D = 342,
>-    UIMAGE2D = 343,
>-    IMAGE3D = 344,
>-    IIMAGE3D = 345,
>-    UIMAGE3D = 346,
>-    IMAGE2DARRAY = 347,
>-    IIMAGE2DARRAY = 348,
>-    UIMAGE2DARRAY = 349,
>-    IMAGECUBE = 350,
>-    IIMAGECUBE = 351,
>-    UIMAGECUBE = 352,
>-    ATOMICUINT = 353,
>-    LAYOUT = 354,
>-    YUVCSCSTANDARDEXT = 355,
>-    YUVCSCSTANDARDEXTCONSTANT = 356,
>-    IDENTIFIER = 357,
>-    TYPE_NAME = 358,
>-    FLOATCONSTANT = 359,
>-    INTCONSTANT = 360,
>-    UINTCONSTANT = 361,
>-    BOOLCONSTANT = 362,
>-    FIELD_SELECTION = 363,
>-    LEFT_OP = 364,
>-    RIGHT_OP = 365,
>-    INC_OP = 366,
>-    DEC_OP = 367,
>-    LE_OP = 368,
>-    GE_OP = 369,
>-    EQ_OP = 370,
>-    NE_OP = 371,
>-    AND_OP = 372,
>-    OR_OP = 373,
>-    XOR_OP = 374,
>-    MUL_ASSIGN = 375,
>-    DIV_ASSIGN = 376,
>-    ADD_ASSIGN = 377,
>-    MOD_ASSIGN = 378,
>-    LEFT_ASSIGN = 379,
>-    RIGHT_ASSIGN = 380,
>-    AND_ASSIGN = 381,
>-    XOR_ASSIGN = 382,
>-    OR_ASSIGN = 383,
>-    SUB_ASSIGN = 384,
>-    LEFT_PAREN = 385,
>-    RIGHT_PAREN = 386,
>-    LEFT_BRACKET = 387,
>-    RIGHT_BRACKET = 388,
>-    LEFT_BRACE = 389,
>-    RIGHT_BRACE = 390,
>-    DOT = 391,
>-    COMMA = 392,
>-    COLON = 393,
>-    EQUAL = 394,
>-    SEMICOLON = 395,
>-    BANG = 396,
>-    DASH = 397,
>-    TILDE = 398,
>-    PLUS = 399,
>-    STAR = 400,
>-    SLASH = 401,
>-    PERCENT = 402,
>-    LEFT_ANGLE = 403,
>-    RIGHT_ANGLE = 404,
>-    VERTICAL_BAR = 405,
>-    CARET = 406,
>-    AMPERSAND = 407,
>-    QUESTION = 408
>+    SAMPLER2DMSARRAY = 335,
>+    ISAMPLER2DMSARRAY = 336,
>+    USAMPLER2DMSARRAY = 337,
>+    SAMPLER3D = 338,
>+    SAMPLER3DRECT = 339,
>+    SAMPLER2DSHADOW = 340,
>+    SAMPLERCUBESHADOW = 341,
>+    SAMPLER2DARRAYSHADOW = 342,
>+    SAMPLEREXTERNAL2DY2YEXT = 343,
>+    IMAGE2D = 344,
>+    IIMAGE2D = 345,
>+    UIMAGE2D = 346,
>+    IMAGE3D = 347,
>+    IIMAGE3D = 348,
>+    UIMAGE3D = 349,
>+    IMAGE2DARRAY = 350,
>+    IIMAGE2DARRAY = 351,
>+    UIMAGE2DARRAY = 352,
>+    IMAGECUBE = 353,
>+    IIMAGECUBE = 354,
>+    UIMAGECUBE = 355,
>+    ATOMICUINT = 356,
>+    LAYOUT = 357,
>+    YUVCSCSTANDARDEXT = 358,
>+    YUVCSCSTANDARDEXTCONSTANT = 359,
>+    IDENTIFIER = 360,
>+    TYPE_NAME = 361,
>+    FLOATCONSTANT = 362,
>+    INTCONSTANT = 363,
>+    UINTCONSTANT = 364,
>+    BOOLCONSTANT = 365,
>+    FIELD_SELECTION = 366,
>+    LEFT_OP = 367,
>+    RIGHT_OP = 368,
>+    INC_OP = 369,
>+    DEC_OP = 370,
>+    LE_OP = 371,
>+    GE_OP = 372,
>+    EQ_OP = 373,
>+    NE_OP = 374,
>+    AND_OP = 375,
>+    OR_OP = 376,
>+    XOR_OP = 377,
>+    MUL_ASSIGN = 378,
>+    DIV_ASSIGN = 379,
>+    ADD_ASSIGN = 380,
>+    MOD_ASSIGN = 381,
>+    LEFT_ASSIGN = 382,
>+    RIGHT_ASSIGN = 383,
>+    AND_ASSIGN = 384,
>+    XOR_ASSIGN = 385,
>+    OR_ASSIGN = 386,
>+    SUB_ASSIGN = 387,
>+    LEFT_PAREN = 388,
>+    RIGHT_PAREN = 389,
>+    LEFT_BRACKET = 390,
>+    RIGHT_BRACKET = 391,
>+    LEFT_BRACE = 392,
>+    RIGHT_BRACE = 393,
>+    DOT = 394,
>+    COMMA = 395,
>+    COLON = 396,
>+    EQUAL = 397,
>+    SEMICOLON = 398,
>+    BANG = 399,
>+    DASH = 400,
>+    TILDE = 401,
>+    PLUS = 402,
>+    STAR = 403,
>+    SLASH = 404,
>+    PERCENT = 405,
>+    LEFT_ANGLE = 406,
>+    RIGHT_ANGLE = 407,
>+    VERTICAL_BAR = 408,
>+    CARET = 409,
>+    AMPERSAND = 410,
>+    QUESTION = 411
>   };
> #endif
> 
>@@ -306,20 +303,19 @@ union YYSTYPE
> 
>     struct {
>         union {
>-            TString *string;
>+            const char *string;  // pool allocated.
>             float f;
>             int i;
>             unsigned int u;
>             bool b;
>         };
>-        TSymbol* symbol;
>+        const TSymbol* symbol;
>     } lex;
>     struct {
>         TOperator op;
>         union {
>             TIntermNode *intermNode;
>             TIntermNodePair nodePair;
>-            TIntermFunctionCallOrMethod callOrMethodPair;
>             TIntermTyped *intermTypedNode;
>             TIntermAggregate *intermAggregate;
>             TIntermBlock *intermBlock;
>@@ -336,8 +332,10 @@ union YYSTYPE
>             TLayoutQualifier layoutQualifier;
>             TQualifier qualifier;
>             TFunction *function;
>+            TFunctionLookup *functionLookup;
>             TParameter param;
>-            TField *field;
>+            TDeclarator *declarator;
>+            TDeclaratorList *declaratorList;
>             TFieldList *fieldList;
>             TQualifierWrapperBase *qualifierWrapper;
>             TTypeQualifierBuilder *typeQualifierBuilder;
>@@ -394,41 +392,35 @@ extern void yyerror(YYLTYPE* yylloc, TParseContext* context, void *scanner, cons
>       }                                                      \
>   } while (0)
> 
>-#define VERTEX_ONLY(S, L) {  \
>+#define VERTEX_ONLY(S, L) do {  \
>     if (context->getShaderType() != GL_VERTEX_SHADER) {  \
>         context->error(L, " supported in vertex shaders only", S);  \
>     }  \
>-}
>+} while (0)
> 
>-#define COMPUTE_ONLY(S, L) {  \
>+#define COMPUTE_ONLY(S, L) do {  \
>     if (context->getShaderType() != GL_COMPUTE_SHADER) {  \
>         context->error(L, " supported in compute shaders only", S);  \
>     }  \
>-}
>+} while (0)
> 
>-#define ES2_ONLY(S, L) {  \
>+#define ES2_ONLY(S, L) do {  \
>     if (context->getShaderVersion() != 100) {  \
>         context->error(L, " supported in GLSL ES 1.00 only", S);  \
>     }  \
>-}
>+} while (0)
> 
>-#define ES3_OR_NEWER(TOKEN, LINE, REASON) {  \
>+#define ES3_OR_NEWER(TOKEN, LINE, REASON) do {  \
>     if (context->getShaderVersion() < 300) {  \
>         context->error(LINE, REASON " supported in GLSL ES 3.00 and above only", TOKEN);  \
>     }  \
>-}
>-
>-#define ES3_OR_NEWER_OR_MULTIVIEW(TOKEN, LINE, REASON) {  \
>-    if (context->getShaderVersion() < 300 && !context->isExtensionEnabled(TExtension::OVR_multiview)) {  \
>-        context->error(LINE, REASON " supported in GLSL ES 3.00 and above only", TOKEN);  \
>-    }  \
>-}
>+} while (0)
> 
>-#define ES3_1_ONLY(TOKEN, LINE, REASON) {  \
>+#define ES3_1_ONLY(TOKEN, LINE, REASON) do {  \
>     if (context->getShaderVersion() != 310) {  \
>         context->error(LINE, REASON " supported in GLSL ES 3.10 only", TOKEN);  \
>     }  \
>-}
>+} while (0)
> 
> 
> 
>@@ -672,23 +664,23 @@ union yyalloc
> #endif /* !YYCOPY_NEEDED */
> 
> /* YYFINAL -- State number of the termination state.  */
>-#define YYFINAL  135
>+#define YYFINAL  138
> /* YYLAST -- Last index in YYTABLE.  */
>-#define YYLAST   2897
>+#define YYLAST   2973
> 
> /* YYNTOKENS -- Number of terminals.  */
>-#define YYNTOKENS  154
>+#define YYNTOKENS  157
> /* YYNNTS -- Number of nonterminals.  */
> #define YYNNTS  95
> /* YYNRULES -- Number of rules.  */
>-#define YYNRULES  297
>+#define YYNRULES  300
> /* YYNSTATES -- Number of states.  */
>-#define YYNSTATES  423
>+#define YYNSTATES  426
> 
> /* YYTRANSLATE[YYX] -- Symbol number corresponding to YYX as returned
>    by yylex, with out-of-bounds checking.  */
> #define YYUNDEFTOK  2
>-#define YYMAXUTOK   408
>+#define YYMAXUTOK   411
> 
> #define YYTRANSLATE(YYX)                                                \
>   ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
>@@ -737,43 +729,45 @@ static const yytype_uint8 yytranslate[] =
>      115,   116,   117,   118,   119,   120,   121,   122,   123,   124,
>      125,   126,   127,   128,   129,   130,   131,   132,   133,   134,
>      135,   136,   137,   138,   139,   140,   141,   142,   143,   144,
>-     145,   146,   147,   148,   149,   150,   151,   152,   153
>+     145,   146,   147,   148,   149,   150,   151,   152,   153,   154,
>+     155,   156
> };
> 
> #if YYDEBUG
>   /* YYRLINE[YYN] -- Source line where rule number YYN was defined.  */
> static const yytype_uint16 yyrline[] =
> {
>-       0,   248,   248,   249,   252,   262,   265,   270,   275,   280,
>-     285,   294,   300,   303,   306,   309,   312,   315,   321,   328,
>-     334,   338,   346,   349,   355,   359,   366,   371,   378,   386,
>-     389,   392,   398,   401,   404,   407,   414,   415,   416,   417,
>-     425,   426,   429,   432,   439,   440,   443,   449,   450,   454,
>-     461,   462,   465,   468,   471,   477,   478,   481,   487,   488,
>-     495,   496,   503,   504,   511,   512,   518,   519,   525,   526,
>-     532,   533,   539,   540,   546,   547,   548,   549,   553,   554,
>-     555,   559,   563,   567,   571,   578,   581,   587,   594,   601,
>-     604,   607,   611,   615,   619,   623,   627,   634,   641,   644,
>-     651,   659,   676,   686,   689,   695,   699,   703,   707,   714,
>-     721,   724,   728,   732,   737,   744,   748,   752,   756,   761,
>-     768,   772,   778,   781,   787,   791,   798,   804,   808,   812,
>-     815,   818,   827,   832,   836,   839,   842,   845,   848,   852,
>-     855,   859,   862,   865,   868,   871,   874,   881,   888,   891,
>-     894,   900,   907,   910,   916,   919,   922,   925,   931,   934,
>-     941,   946,   953,   958,   969,   972,   975,   978,   981,   984,
>-     988,   992,   996,  1000,  1004,  1008,  1012,  1016,  1020,  1024,
>-    1028,  1032,  1036,  1040,  1044,  1048,  1052,  1056,  1060,  1064,
>-    1068,  1075,  1078,  1081,  1084,  1087,  1090,  1093,  1096,  1099,
>-    1102,  1105,  1108,  1111,  1114,  1117,  1120,  1123,  1126,  1129,
>-    1139,  1146,  1153,  1156,  1159,  1162,  1165,  1168,  1171,  1174,
>-    1177,  1180,  1183,  1186,  1189,  1192,  1195,  1203,  1203,  1206,
>-    1206,  1212,  1215,  1221,  1224,  1231,  1235,  1241,  1244,  1250,
>-    1254,  1258,  1259,  1265,  1266,  1267,  1268,  1269,  1270,  1271,
>-    1275,  1279,  1279,  1279,  1286,  1287,  1291,  1291,  1292,  1292,
>-    1297,  1301,  1308,  1312,  1319,  1320,  1324,  1330,  1334,  1343,
>-    1343,  1350,  1353,  1359,  1363,  1369,  1369,  1374,  1374,  1378,
>-    1378,  1386,  1389,  1395,  1398,  1404,  1408,  1415,  1418,  1421,
>-    1424,  1427,  1435,  1441,  1447,  1450,  1456,  1456
>+       0,   253,   253,   254,   257,   264,   267,   272,   277,   282,
>+     287,   296,   302,   305,   308,   311,   314,   317,   323,   330,
>+     336,   339,   347,   350,   356,   359,   365,   369,   376,   384,
>+     387,   390,   396,   399,   402,   405,   412,   413,   414,   415,
>+     423,   424,   427,   430,   437,   438,   441,   447,   448,   452,
>+     459,   460,   463,   466,   469,   475,   476,   479,   485,   486,
>+     493,   494,   501,   502,   509,   510,   516,   517,   523,   524,
>+     530,   531,   537,   538,   544,   545,   546,   547,   551,   552,
>+     553,   557,   561,   565,   569,   576,   579,   585,   592,   599,
>+     602,   605,   609,   613,   617,   621,   625,   632,   639,   642,
>+     649,   657,   674,   684,   687,   693,   697,   701,   705,   712,
>+     719,   722,   726,   730,   735,   742,   746,   750,   754,   759,
>+     766,   770,   776,   779,   785,   789,   796,   802,   806,   810,
>+     813,   816,   825,   830,   834,   837,   840,   843,   846,   850,
>+     853,   857,   860,   863,   866,   869,   872,   879,   886,   889,
>+     892,   898,   905,   908,   914,   917,   920,   923,   929,   932,
>+     939,   944,   951,   956,   967,   970,   973,   976,   979,   982,
>+     986,   990,   994,   998,  1002,  1006,  1010,  1014,  1018,  1022,
>+    1026,  1030,  1034,  1038,  1042,  1046,  1050,  1054,  1058,  1062,
>+    1066,  1073,  1076,  1079,  1082,  1085,  1088,  1091,  1094,  1097,
>+    1100,  1103,  1106,  1109,  1112,  1115,  1118,  1121,  1124,  1127,
>+    1130,  1133,  1136,  1146,  1153,  1160,  1163,  1166,  1169,  1172,
>+    1175,  1178,  1181,  1184,  1187,  1190,  1193,  1196,  1199,  1202,
>+    1210,  1210,  1213,  1213,  1219,  1222,  1228,  1231,  1238,  1242,
>+    1248,  1251,  1257,  1261,  1265,  1266,  1272,  1273,  1274,  1275,
>+    1276,  1277,  1278,  1282,  1286,  1286,  1286,  1293,  1294,  1298,
>+    1298,  1299,  1299,  1304,  1308,  1315,  1319,  1326,  1327,  1331,
>+    1337,  1341,  1350,  1350,  1357,  1360,  1366,  1370,  1376,  1376,
>+    1381,  1381,  1385,  1385,  1393,  1396,  1402,  1405,  1411,  1415,
>+    1422,  1425,  1428,  1431,  1434,  1442,  1448,  1454,  1457,  1463,
>+    1463
> };
> #endif
> 
>@@ -796,7 +790,8 @@ static const char *const yytname[] =
>   "SAMPLER2DRECT", "SAMPLER2DARRAY", "ISAMPLER2D", "ISAMPLER3D",
>   "ISAMPLERCUBE", "ISAMPLER2DARRAY", "USAMPLER2D", "USAMPLER3D",
>   "USAMPLERCUBE", "USAMPLER2DARRAY", "SAMPLER2DMS", "ISAMPLER2DMS",
>-  "USAMPLER2DMS", "SAMPLER3D", "SAMPLER3DRECT", "SAMPLER2DSHADOW",
>+  "USAMPLER2DMS", "SAMPLER2DMSARRAY", "ISAMPLER2DMSARRAY",
>+  "USAMPLER2DMSARRAY", "SAMPLER3D", "SAMPLER3DRECT", "SAMPLER2DSHADOW",
>   "SAMPLERCUBESHADOW", "SAMPLER2DARRAYSHADOW", "SAMPLEREXTERNAL2DY2YEXT",
>   "IMAGE2D", "IIMAGE2D", "UIMAGE2D", "IMAGE3D", "IIMAGE3D", "UIMAGE3D",
>   "IMAGE2DARRAY", "IIMAGE2DARRAY", "UIMAGE2DARRAY", "IMAGECUBE",
>@@ -866,16 +861,16 @@ static const yytype_uint16 yytoknum[] =
>      375,   376,   377,   378,   379,   380,   381,   382,   383,   384,
>      385,   386,   387,   388,   389,   390,   391,   392,   393,   394,
>      395,   396,   397,   398,   399,   400,   401,   402,   403,   404,
>-     405,   406,   407,   408
>+     405,   406,   407,   408,   409,   410,   411
> };
> # endif
> 
>-#define YYPACT_NINF -366
>+#define YYPACT_NINF -361
> 
> #define yypact_value_is_default(Yystate) \
>-  (!!((Yystate) == (-366)))
>+  (!!((Yystate) == (-361)))
> 
>-#define YYTABLE_NINF -257
>+#define YYTABLE_NINF -260
> 
> #define yytable_value_is_error(Yytable_value) \
>   0
>@@ -884,49 +879,49 @@ static const yytype_uint16 yytoknum[] =
>      STATE-NUM.  */
> static const yytype_int16 yypact[] =
> {
>-    2505,  -366,  -366,  -366,  -366,   144,  -366,  -366,  -366,  -366,
>-    -366,  -366,  -366,  -366,  -366,  -366,  -366,  -366,  -366,  -366,
>-    -366,  -366,  -366,  -366,  -366,  -366,  -366,  -366,  -366,  -366,
>-    -366,  -366,  -366,  -366,  -366,  -366,  -366,  -366,  -366,  -366,
>-    -366,  -366,  -366,  -366,  -366,  -366,  -366,  -366,   -68,  -366,
>-    -366,  -366,  -366,  -366,  -366,  -366,  -366,  -366,  -366,  -366,
>-    -366,  -366,  -366,  -366,  -366,  -366,  -366,  -366,  -366,  -366,
>-    -366,  -366,  -366,  -366,  -366,  -366,  -366,  -366,  -366,  -366,
>-    -366,  -366,  -366,  -366,   -99,  -366,  -366,  -366,   -97,   -85,
>-     -87,  2606,   -45,  -366,   -32,  -366,  1363,  -366,  -366,  -366,
>-    -366,  -366,  -366,  -366,   -42,  -366,  2404,  -366,  -366,  2794,
>-    -366,  -366,  -366,   -40,   -41,  -366,   -31,  -366,  2606,  -366,
>-    -366,  -366,  2606,   -18,   -18,  -366,   -10,  -107,   -51,  -366,
>-    2606,  -366,  -366,  1458,   -20,  -366,  -366,   -13,  2606,  -366,
>-    -366,   -91,   -50,  -366,   407,  -366,  -366,  -366,  -366,   -42,
>-     -67,  -366,  1827,   -64,  -366,  -366,  2606,   -18,  2071,  -366,
>-    -366,    16,  -366,  -366,  -366,  -366,  -366,  1827,  1827,  1827,
>-    -366,  -366,  -366,  -366,  -366,  -366,  -366,   -58,  -366,  -366,
>-    -366,    57,   -38,  1948,    24,  -366,  1827,     6,    13,    60,
>-     -86,    58,    25,    38,    45,    79,    78,   -94,  -366,    65,
>-    -366,  1582,  -366,  2182,  2606,    74,  -366,   -41,    59,    62,
>-    -366,    70,    76,    67,  1706,    80,  1827,    71,    81,    73,
>-    -366,  -366,    39,  -366,  -366,   -21,  -366,   -97,    84,  -366,
>-    -366,  -366,  -366,   549,  -366,  -366,  -366,  -366,  -366,  -366,
>-     -20,  1827,   -53,  -366,  -366,  1827,   -18,   -42,   -16,  -366,
>-     -82,  -366,  -366,  -366,   -29,  -366,  -366,  1827,  2700,  -366,
>-    -366,  1827,    85,  -366,  -366,  -366,  1827,  1827,  1827,  1827,
>-    1827,  1827,  1827,  1827,  1827,  1827,  1827,  1827,  1827,  1827,
>-    1827,  1827,  1827,  1827,  1827,  1827,  -366,  -366,    82,  -366,
>-    2293,  -366,  -366,  -366,  -366,  -366,    83,  -366,  1827,  -366,
>-    -366,    -1,  1827,    86,  -366,  -366,  -366,   691,  -366,  -366,
>-    -366,  -366,  -366,  -366,  -366,  -366,  -366,  -366,  -366,  1827,
>-    1827,  -366,  -366,  -366,  -366,  1827,  -366,     3,   -20,   -18,
>-    -366,   -96,  -366,  -366,    88,    89,  -366,    92,  -366,  -366,
>-    -366,  -366,  -366,     6,     6,    13,    13,    60,    60,    60,
>-      60,   -86,   -86,    58,    25,    38,    45,    79,    78,    46,
>-    -366,  -366,   155,   -31,   975,  1117,   -27,  -366,   -26,  -366,
>-    1240,   691,  -366,  -366,  -366,  -366,  -366,  1827,  -366,  -366,
>-    1827,    93,  -366,  -366,  -366,  -366,  1240,    83,  -366,    89,
>-     -18,  2606,    94,    95,    98,  -366,  1827,  -366,    87,    97,
>-     202,  -366,   100,    96,   833,  -366,   101,   -24,  1827,   833,
>-      83,  -366,  1827,  -366,  -366,  -366,  -366,   102,    89,  -366,
>-    -366,  -366,  -366
>+    2569,  -361,  -361,  -361,  -361,   126,  -361,  -361,  -361,  -361,
>+    -361,  -361,  -361,  -361,  -361,  -361,  -361,  -361,  -361,  -361,
>+    -361,  -361,  -361,  -361,  -361,  -361,  -361,  -361,  -361,  -361,
>+    -361,  -361,  -361,  -361,  -361,  -361,  -361,  -361,  -361,  -361,
>+    -361,  -361,  -361,  -361,  -361,  -361,  -361,  -361,   -61,  -361,
>+    -361,  -361,  -361,  -361,  -361,  -361,  -361,  -361,  -361,  -361,
>+    -361,  -361,  -361,  -361,  -361,  -361,  -361,  -361,  -361,  -361,
>+    -361,  -361,  -361,  -361,  -361,  -361,  -361,  -361,  -361,  -361,
>+    -361,  -361,  -361,  -361,  -361,  -361,  -361,  -108,  -361,  -361,
>+    -361,   -69,   -99,   -45,  2673,  -119,  -361,     2,  -361,  1397,
>+    -361,  -361,  -361,  -361,  -361,  -361,  -361,   -80,  -361,  2465,
>+    -361,  -361,  2867,  -361,  -361,  -361,   -24,   -40,  -361,   -17,
>+    -361,  2673,  -361,  -361,  -361,  2673,    39,    39,  -361,    -5,
>+     -96,   -56,  -361,  2673,  -361,  -361,  1495,   -32,  -361,  -361,
>+      -9,  2673,  -361,  -361,    -2,   -51,  -361,   420,  -361,  -361,
>+    -361,  -361,   -80,   -65,  -361,  1873,   -60,  -361,  -361,  2673,
>+      39,  2123,  -361,  -361,    27,  -361,  -361,  -361,  -361,  -361,
>+    1873,  1873,  1873,  -361,  -361,  -361,  -361,  -361,  -361,  -361,
>+     -67,  -361,  -361,  -361,    28,   -48,  1997,    33,  -361,  1873,
>+      15,    22,    58,   -89,    54,    24,    34,    38,    67,    72,
>+     -95,  -361,    59,  -361,  1622,  -361,  2237,  2673,    66,  -361,
>+     -40,    53,    55,  -361,    64,    69,    56,  1749,    71,  1873,
>+      68,    75,    62,  -361,  -361,    26,  -361,  -361,   -86,  -361,
>+     -69,    77,  -361,  -361,  -361,  -361,   565,  -361,  -361,  -361,
>+    -361,  -361,  -361,   -32,  1873,   -57,  -361,  -361,  1873,    39,
>+     -80,   -50,  -361,   -83,  -361,  -361,  -361,   -43,  -361,  -361,
>+    1873,  2770,  -361,  -361,  1873,    81,  -361,  -361,  -361,  1873,
>+    1873,  1873,  1873,  1873,  1873,  1873,  1873,  1873,  1873,  1873,
>+    1873,  1873,  1873,  1873,  1873,  1873,  1873,  1873,  1873,  -361,
>+    -361,    80,  -361,  2351,  -361,  -361,  -361,  -361,  -361,    74,
>+    -361,  1873,  -361,  -361,   -21,  1873,    76,  -361,  -361,  -361,
>+     710,  -361,  -361,  -361,  -361,  -361,  -361,  -361,  -361,  -361,
>+    -361,  -361,  1873,  1873,  -361,  -361,  -361,  -361,  1873,  -361,
>+     -16,   -32,    39,  -361,  -101,  -361,  -361,    82,    65,  -361,
>+      86,  -361,  -361,  -361,  -361,  -361,    15,    15,    22,    22,
>+      58,    58,    58,    58,   -89,   -89,    54,    24,    34,    38,
>+      67,    72,    40,  -361,  -361,   157,   -17,  1000,  1145,   -34,
>+    -361,   -30,  -361,  1271,   710,  -361,  -361,  -361,  -361,  -361,
>+    1873,  -361,  -361,  1873,    88,  -361,  -361,  -361,  -361,  1271,
>+      74,  -361,    65,    39,  2673,    89,    84,    90,  -361,  1873,
>+    -361,    85,    91,   207,  -361,    92,    93,   855,  -361,    95,
>+     -29,  1873,   855,    74,  -361,  1873,  -361,  -361,  -361,  -361,
>+      96,    65,  -361,  -361,  -361,  -361
> };
> 
>   /* YYDEFACT[STATE-NUM] -- Default reduction number in state STATE-NUM.
>@@ -939,74 +934,74 @@ static const yytype_uint16 yydefact[] =
>      171,   178,   179,   180,   181,   182,   183,   135,   136,   137,
>      139,   140,   133,   184,   185,   186,   187,   188,   189,   138,
>      123,   122,   141,   142,   143,   144,   145,   146,     0,   164,
>-     191,   193,   209,   211,   194,   196,   197,   198,   199,   201,
>-     202,   203,   204,   195,   200,   205,   192,   206,   207,   208,
>-     210,   213,   214,   215,   216,   217,   218,   219,   220,   221,
>-     222,   223,   224,   225,     0,   190,   226,   295,   296,     0,
>-      99,    98,     0,   110,   115,   130,     0,   131,   124,   127,
>-     120,   129,   128,   147,   158,   212,     0,   292,   294,     0,
>-       2,     3,   229,     0,     0,    89,     0,    97,     0,   106,
>-     100,   108,     0,   109,     0,    90,     2,   116,     0,    95,
>-       0,   125,   121,     0,   159,     1,   293,     0,     0,   227,
>-     157,   154,     0,   152,     0,   297,   101,   105,   107,   103,
>-     111,   102,     0,   117,    88,    96,     0,     0,     0,   231,
>-      10,     4,     8,     6,     7,     9,    31,     0,     0,     0,
>-     160,    38,    37,    39,    36,     5,    12,    32,    14,    19,
>-      20,     0,     0,    25,     0,    40,     0,    44,    47,    50,
>-      55,    58,    60,    62,    64,    66,    68,    70,    87,     0,
>-      29,     0,    91,     0,     0,     0,   151,     0,     0,     0,
>-     277,     0,     0,     0,     0,     0,     0,     0,     0,   251,
>-     260,   264,    40,    72,    85,     0,   240,     0,   147,   243,
>-     262,   242,   241,     0,   244,   245,   246,   247,   248,   249,
>-     104,     0,   112,   239,   119,     0,     0,   237,     0,   235,
>-       0,   232,    33,    34,     0,    16,    17,     0,     0,    23,
>-      22,     0,   164,    26,    28,    35,     0,     0,     0,     0,
>+     191,   193,   212,   214,   194,   197,   198,   199,   200,   203,
>+     204,   205,   206,   195,   201,   207,   196,   202,   208,   192,
>+     209,   210,   211,   213,   215,   216,   217,   218,   219,   220,
>+     221,   222,   223,   224,   225,   226,   227,     0,   190,   229,
>+     298,   299,     0,    99,    98,     0,   110,   115,   130,     0,
>+     131,   124,   127,   120,   129,   128,   147,   158,   228,     0,
>+     295,   297,     0,     2,     3,   232,     0,     0,    89,     0,
>+      97,     0,   106,   100,   108,     0,   109,     0,    90,     2,
>+     116,     0,    95,     0,   125,   121,     0,   159,     1,   296,
>+       0,     0,   230,   157,   154,     0,   152,     0,   300,   101,
>+     105,   107,   103,   111,   102,     0,   117,    88,    96,     0,
>+       0,     0,   234,    10,     4,     8,     6,     7,     9,    31,
>+       0,     0,     0,   160,    38,    37,    39,    36,     5,    12,
>+      32,    14,    19,    20,     0,     0,    25,     0,    40,     0,
>+      44,    47,    50,    55,    58,    60,    62,    64,    66,    68,
>+      70,    87,     0,    29,     0,    91,     0,     0,     0,   151,
>+       0,     0,     0,   280,     0,     0,     0,     0,     0,     0,
>+       0,     0,   254,   263,   267,    40,    72,    85,     0,   243,
>+       0,   147,   246,   265,   245,   244,     0,   247,   248,   249,
>+     250,   251,   252,   104,     0,   112,   242,   119,     0,     0,
>+     240,     0,   238,     0,   235,    33,    34,     0,    16,    17,
>+       0,     0,    23,    22,     0,   164,    26,    28,    35,     0,
>        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
>-       0,     0,     0,     0,     0,     0,   161,   162,     0,   230,
>-       0,   155,   156,   153,   288,   287,   258,   279,     0,   291,
>-     289,     0,     0,     0,   272,   275,   250,     0,    75,    76,
>-      78,    77,    80,    81,    82,    83,    84,    79,    74,     0,
>-       0,   265,   261,   263,   114,     0,   118,     0,   238,     0,
>-     233,     0,    92,    11,     0,    18,    30,    15,    21,    27,
>-      41,    42,    43,    46,    45,    48,    49,    53,    54,    51,
>-      52,    56,    57,    59,    61,    63,    65,    67,    69,     0,
>-     163,   228,     0,     0,     0,     0,     0,   290,     0,   271,
>-       0,   252,    73,    86,   113,   234,   236,     0,    93,    13,
>-       0,     0,   257,   259,   282,   281,   284,   258,   269,   273,
>-       0,     0,     0,     0,     0,    71,     0,   283,     0,     0,
>-     268,   266,     0,     0,     0,   253,     0,     0,   285,     0,
>-     258,   270,     0,   255,   276,   254,    94,     0,   286,   280,
>-     267,   274,   278
>+       0,     0,     0,     0,     0,     0,     0,     0,     0,   161,
>+     162,     0,   233,     0,   155,   156,   153,   291,   290,   261,
>+     282,     0,   294,   292,     0,     0,     0,   275,   278,   253,
>+       0,    75,    76,    78,    77,    80,    81,    82,    83,    84,
>+      79,    74,     0,     0,   268,   264,   266,   114,     0,   118,
>+       0,   241,     0,   236,     0,    92,    11,     0,    18,    30,
>+      15,    21,    27,    41,    42,    43,    46,    45,    48,    49,
>+      53,    54,    51,    52,    56,    57,    59,    61,    63,    65,
>+      67,    69,     0,   163,   231,     0,     0,     0,     0,     0,
>+     293,     0,   274,     0,   255,    73,    86,   113,   237,   239,
>+       0,    93,    13,     0,     0,   260,   262,   285,   284,   287,
>+     261,   272,   276,     0,     0,     0,     0,     0,    71,     0,
>+     286,     0,     0,   271,   269,     0,     0,     0,   256,     0,
>+       0,   288,     0,   261,   273,     0,   258,   279,   257,    94,
>+       0,   289,   283,   270,   277,   281
> };
> 
>   /* YYPGOTO[NTERM-NUM].  */
> static const yytype_int16 yypgoto[] =
> {
>-    -366,   -47,  -366,  -366,  -366,  -366,  -366,  -366,   -15,  -366,
>-    -366,  -366,  -366,     4,  -366,   -83,   -80,  -142,   -84,   -39,
>-     -48,   -44,   -37,   -36,   -46,  -366,  -128,  -144,  -366,  -157,
>-    -195,  -366,    17,    23,  -366,  -366,  -366,   122,   128,   126,
>-    -366,  -366,  -344,  -366,   -78,  -366,   -92,  -366,   -89,   247,
>-    -366,  -366,    47,     0,  -112,  -366,  -366,  -366,  -366,  -122,
>-    -148,     7,   -74,  -227,  -109,  -224,  -353,  -145,  -366,  -366,
>-    -151,  -365,  -366,  -366,  -113,   -43,  -106,  -366,  -366,  -366,
>-    -366,  -366,  -126,  -366,  -366,  -366,  -366,  -366,  -366,  -366,
>-    -366,  -366,   156,  -366,  -366
>+    -361,   -47,  -361,  -361,  -361,  -361,  -361,  -361,   -28,  -361,
>+    -361,  -361,  -361,    42,  -361,   -87,   -85,  -140,   -88,   -55,
>+     -49,   -52,   -44,   -42,   -39,  -361,  -131,  -146,  -361,  -159,
>+    -196,  -361,    14,    17,  -361,  -361,  -361,   117,   122,   120,
>+    -361,  -361,  -337,  -361,   -90,  -361,   -93,  -361,   -92,   242,
>+    -361,  -361,    41,     0,  -115,  -361,  -361,  -361,  -361,  -123,
>+    -150,     4,   -78,  -232,  -113,  -226,  -348,  -149,  -361,  -361,
>+    -155,  -360,  -361,  -361,  -116,   -46,  -110,  -361,  -361,  -361,
>+    -361,  -361,  -130,  -361,  -361,  -361,  -361,  -361,  -361,  -361,
>+    -361,  -361,   151,  -361,  -361
> };
> 
>   /* YYDEFGOTO[NTERM-NUM].  */
> static const yytype_int16 yydefgoto[] =
> {
>-      -1,   247,   175,   176,   177,   334,   178,   179,   180,   181,
>-     182,   183,   184,   222,   186,   187,   188,   189,   190,   191,
>-     192,   193,   194,   195,   196,   197,   223,   224,   319,   225,
>-     199,   130,   226,   227,    89,    90,    91,   119,   120,   121,
>-      92,    93,    94,    95,    96,    97,    98,    99,   100,   101,
>-     102,   142,   143,   200,   134,   104,   105,   204,   138,   158,
>-     159,   248,   249,   244,   229,   230,   231,   232,   307,   393,
>-     414,   362,   363,   364,   415,   233,   234,   235,   401,   236,
>-     402,   237,   392,   238,   370,   296,   365,   386,   398,   399,
>-     239,   106,   107,   108,   116
>+      -1,   250,   178,   179,   180,   337,   181,   182,   183,   184,
>+     185,   186,   187,   225,   189,   190,   191,   192,   193,   194,
>+     195,   196,   197,   198,   199,   200,   226,   227,   322,   228,
>+     202,   133,   229,   230,    92,    93,    94,   122,   123,   124,
>+      95,    96,    97,    98,    99,   100,   101,   102,   103,   104,
>+     105,   145,   146,   203,   137,   107,   108,   207,   141,   161,
>+     162,   251,   252,   247,   232,   233,   234,   235,   310,   396,
>+     417,   365,   366,   367,   418,   236,   237,   238,   404,   239,
>+     405,   240,   395,   241,   373,   299,   368,   389,   401,   402,
>+     242,   109,   110,   111,   119
> };
> 
>   /* YYTABLE[YYPACT[STATE-NUM]] -- What to do in state STATE-NUM.  If
>@@ -1014,277 +1009,284 @@ static const yytype_int16 yydefgoto[] =
>      number is the opposite.  If YYTABLE_NINF, syntax error.  */
> static const yytype_int16 yytable[] =
> {
>-     103,   113,   123,   145,   131,   198,   288,   132,   243,   323,
>-     251,   383,   254,   122,   324,   153,   203,    87,   326,   140,
>-     331,   303,   400,    88,   284,   133,   390,   273,   274,   123,
>-     131,   114,   152,   123,   110,   111,   377,   240,   242,   263,
>-     122,   157,   390,   115,   378,   420,   117,   127,   205,   157,
>-     118,   413,   156,   255,   256,   251,   413,   301,   332,   285,
>-     156,   141,   275,   276,   131,   133,   112,   246,   201,   157,
>-     126,   111,   241,   198,   257,   245,   149,   150,   258,   201,
>-     156,   206,   290,   154,   110,   111,   325,   207,   198,   155,
>-     133,   103,   124,   260,   139,   125,   103,   243,   374,   261,
>-     335,   243,   333,   144,   387,   388,   103,   417,   320,   137,
>-     320,   320,   201,   320,   157,   157,   320,   339,   103,   321,
>-     151,   329,   103,    87,   330,   156,   156,   202,   359,    88,
>-     103,   347,   348,   349,   350,   328,   320,   185,   103,   367,
>-     329,   366,   251,   375,   228,   368,   -30,   323,     2,     3,
>-       4,   266,   267,   268,   264,   269,   103,   270,   103,   308,
>-     309,   310,   311,   312,   313,   314,   315,   316,   317,   271,
>-     272,   252,   253,   277,   278,   372,   373,   279,   318,   291,
>-     292,   243,   394,   320,   380,   421,   343,   344,   259,   280,
>-     265,   345,   346,   351,   352,   281,   282,   283,   286,   294,
>-     297,   157,   295,   103,   103,   185,   298,   299,   306,   304,
>-     302,   305,   156,   389,   -29,   360,   -24,  -256,   381,   410,
>-     185,   379,   -31,   396,   369,   404,   320,   408,   409,   389,
>-     405,   406,   354,   228,   219,   412,   395,   355,   358,   407,
>-     353,   416,   422,   338,   147,   356,   146,   357,   148,   198,
>-     382,   418,   109,   327,   293,   376,   384,   411,   419,   385,
>-     397,     0,   136,     0,   371,     0,     0,     0,   243,     0,
>-     340,   341,   342,   185,   185,   185,   185,   185,   185,   185,
>-     185,   185,   185,   185,   185,   185,   185,   185,   185,     0,
>-     103,     0,   391,     0,     0,     0,     0,     0,     0,   131,
>-       0,     0,   132,     0,     0,     0,     0,   228,   391,     0,
>+     106,   116,   126,   148,   125,   201,   134,   135,   291,   246,
>+     326,   254,   327,   257,    90,   156,   329,    91,   206,   386,
>+     143,   127,   334,   306,   128,   117,   287,   276,   277,   126,
>+     403,   125,   134,   126,   380,   120,   393,   243,   245,   136,
>+     266,   160,   381,   159,   113,   114,   155,   258,   259,   160,
>+     130,   159,   393,   423,   323,   136,   254,   324,   304,   416,
>+     335,   288,   278,   279,   416,   144,   134,   249,   260,   160,
>+     136,   159,   261,   201,   118,   204,   115,   244,   204,   152,
>+     153,   157,   248,   209,   293,   328,   263,   158,   201,   210,
>+     332,   336,   264,   333,   106,   121,   377,   323,   246,   106,
>+     390,   338,   246,   204,   391,   420,   323,   129,   114,   106,
>+     323,   323,   140,   142,   160,   160,   159,   159,   342,   323,
>+     147,   106,   370,    90,   332,   106,    91,   378,   154,   362,
>+       2,     3,     4,   106,   205,   331,   350,   351,   352,   353,
>+     208,   106,   369,   254,   113,   114,   371,   231,   326,   311,
>+     312,   313,   314,   315,   316,   317,   318,   319,   320,   106,
>+     -30,   106,   262,   269,   270,   271,   267,   272,   321,   273,
>+     274,   275,   280,   281,   294,   295,   375,   376,   188,   282,
>+     323,   383,   246,   424,   397,   346,   347,   285,   283,   348,
>+     349,   284,   354,   355,   286,   289,   297,   300,   298,   302,
>+     309,   160,   301,   159,   305,   323,   106,   106,   308,   307,
>+     -29,  -259,   255,   256,   392,   -24,   363,   372,   382,   -31,
>+     384,   399,   408,   407,   413,   412,   409,   356,   411,   222,
>+     392,   268,   358,   341,   357,   415,   231,   398,   419,   425,
>+     410,   359,   150,   149,   360,   151,   188,   112,   361,   201,
>+     385,   296,   421,   330,   379,   387,   414,   422,   388,   400,
>+     139,   188,     0,     0,   374,     0,     0,     0,     0,   246,
>        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
>+       0,     0,     0,   394,     0,     0,     0,     0,     0,     0,
>+       0,     0,     0,   106,     0,     0,     0,     0,     0,   394,
>+       0,   134,   135,     0,     0,     0,     0,     0,     0,     0,
>+     231,   343,   344,   345,   188,   188,   188,   188,   188,   188,
>+     188,   188,   188,   188,   188,   188,   188,   188,   188,   188,
>        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
>+       0,     0,     0,     0,     0,     0,   406,     0,     0,     0,
>        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
>-       0,     0,     0,   403,     0,     0,     0,     0,     0,     0,
>+       0,     0,     0,     0,     0,     0,     0,   231,   231,     0,
>+       0,     0,     0,   231,   231,     0,     0,     0,     0,     0,
>+       0,     0,     0,     0,     0,     0,     0,     0,     0,   231,
>+       0,     0,     0,     0,   106,     0,     0,     0,     0,     0,
>+       0,     0,     0,     0,     0,     0,     0,   231,     0,     0,
>+       0,     0,   231,     0,     0,     0,     0,     0,     0,     0,
>+       0,     0,   188,     1,     2,     3,     4,     5,     6,     7,
>+       8,     9,    10,    11,   211,   212,   213,     0,   214,   215,
>+     216,   217,   218,   219,   220,    12,    13,    14,    15,    16,
>+      17,    18,    19,    20,    21,    22,    23,    24,    25,    26,
>+      27,    28,    29,    30,    31,    32,    33,    34,    35,    36,
>+      37,    38,    39,    40,    41,    42,    43,    44,    45,    46,
>+      47,    48,    49,   221,    50,    51,    52,    53,    54,    55,
>+      56,    57,    58,    59,    60,    61,    62,    63,    64,    65,
>+      66,    67,    68,    69,     0,    70,    71,    72,    73,    74,
>+      75,    76,    77,    78,    79,    80,    81,    82,    83,    84,
>+      85,    86,    87,    88,   163,   164,    89,   165,   166,   167,
>+     168,   169,     0,     0,   170,   171,     0,     0,     0,     0,
>        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
>-       0,     0,     0,     0,   228,   228,     0,     0,     0,     0,
>-     228,   228,     0,     0,     0,     0,     0,     0,     0,     0,
>-       0,   185,     0,     0,     0,     0,   228,     0,     0,     0,
>-       0,   103,     0,     0,     0,     0,     0,     0,     0,     0,
>-       0,     0,     0,     0,   228,     0,     0,     0,     0,   228,
>-       1,     2,     3,     4,     5,     6,     7,     8,     9,    10,
>-      11,   208,   209,   210,     0,   211,   212,   213,   214,   215,
>-     216,   217,    12,    13,    14,    15,    16,    17,    18,    19,
>-      20,    21,    22,    23,    24,    25,    26,    27,    28,    29,
>-      30,    31,    32,    33,    34,    35,    36,    37,    38,    39,
>-      40,    41,    42,    43,    44,    45,    46,    47,    48,    49,
>-     218,    50,    51,    52,    53,    54,    55,    56,    57,    58,
>-      59,    60,    61,    62,    63,    64,    65,    66,     0,    67,
>-      68,    69,    70,    71,    72,    73,    74,    75,    76,    77,
>-      78,    79,    80,    81,    82,    83,    84,    85,   160,   161,
>-      86,   162,   163,   164,   165,   166,     0,     0,   167,   168,
>+       0,     0,     0,   172,     0,     0,     0,   222,   223,     0,
>+       0,     0,     0,   224,   174,   175,   176,   177,     1,     2,
>+       3,     4,     5,     6,     7,     8,     9,    10,    11,   211,
>+     212,   213,     0,   214,   215,   216,   217,   218,   219,   220,
>+      12,    13,    14,    15,    16,    17,    18,    19,    20,    21,
>+      22,    23,    24,    25,    26,    27,    28,    29,    30,    31,
>+      32,    33,    34,    35,    36,    37,    38,    39,    40,    41,
>+      42,    43,    44,    45,    46,    47,    48,    49,   221,    50,
>+      51,    52,    53,    54,    55,    56,    57,    58,    59,    60,
>+      61,    62,    63,    64,    65,    66,    67,    68,    69,     0,
>+      70,    71,    72,    73,    74,    75,    76,    77,    78,    79,
>+      80,    81,    82,    83,    84,    85,    86,    87,    88,   163,
>+     164,    89,   165,   166,   167,   168,   169,     0,     0,   170,
>+     171,     0,     0,     0,     0,     0,     0,     0,     0,     0,
>+       0,     0,     0,     0,     0,     0,     0,     0,   172,     0,
>+       0,     0,   222,   325,     0,     0,     0,     0,   224,   174,
>+     175,   176,   177,     1,     2,     3,     4,     5,     6,     7,
>+       8,     9,    10,    11,   211,   212,   213,     0,   214,   215,
>+     216,   217,   218,   219,   220,    12,    13,    14,    15,    16,
>+      17,    18,    19,    20,    21,    22,    23,    24,    25,    26,
>+      27,    28,    29,    30,    31,    32,    33,    34,    35,    36,
>+      37,    38,    39,    40,    41,    42,    43,    44,    45,    46,
>+      47,    48,    49,   221,    50,    51,    52,    53,    54,    55,
>+      56,    57,    58,    59,    60,    61,    62,    63,    64,    65,
>+      66,    67,    68,    69,     0,    70,    71,    72,    73,    74,
>+      75,    76,    77,    78,    79,    80,    81,    82,    83,    84,
>+      85,    86,    87,    88,   163,   164,    89,   165,   166,   167,
>+     168,   169,     0,     0,   170,   171,     0,     0,     0,     0,
>        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
>-       0,     0,     0,     0,     0,     0,     0,   169,     0,     0,
>-       0,   219,   220,     0,     0,     0,     0,   221,   171,   172,
>-     173,   174,     1,     2,     3,     4,     5,     6,     7,     8,
>-       9,    10,    11,   208,   209,   210,     0,   211,   212,   213,
>-     214,   215,   216,   217,    12,    13,    14,    15,    16,    17,
>-      18,    19,    20,    21,    22,    23,    24,    25,    26,    27,
>-      28,    29,    30,    31,    32,    33,    34,    35,    36,    37,
>-      38,    39,    40,    41,    42,    43,    44,    45,    46,    47,
>-      48,    49,   218,    50,    51,    52,    53,    54,    55,    56,
>-      57,    58,    59,    60,    61,    62,    63,    64,    65,    66,
>-       0,    67,    68,    69,    70,    71,    72,    73,    74,    75,
>-      76,    77,    78,    79,    80,    81,    82,    83,    84,    85,
>-     160,   161,    86,   162,   163,   164,   165,   166,     0,     0,
>-     167,   168,     0,     0,     0,     0,     0,     0,     0,     0,
>-       0,     0,     0,     0,     0,     0,     0,     0,     0,   169,
>-       0,     0,     0,   219,   322,     0,     0,     0,     0,   221,
>-     171,   172,   173,   174,     1,     2,     3,     4,     5,     6,
>-       7,     8,     9,    10,    11,   208,   209,   210,     0,   211,
>-     212,   213,   214,   215,   216,   217,    12,    13,    14,    15,
>-      16,    17,    18,    19,    20,    21,    22,    23,    24,    25,
>-      26,    27,    28,    29,    30,    31,    32,    33,    34,    35,
>-      36,    37,    38,    39,    40,    41,    42,    43,    44,    45,
>-      46,    47,    48,    49,   218,    50,    51,    52,    53,    54,
>-      55,    56,    57,    58,    59,    60,    61,    62,    63,    64,
>-      65,    66,     0,    67,    68,    69,    70,    71,    72,    73,
>-      74,    75,    76,    77,    78,    79,    80,    81,    82,    83,
>-      84,    85,   160,   161,    86,   162,   163,   164,   165,   166,
>-       0,     0,   167,   168,     0,     0,     0,     0,     0,     0,
>+       0,     0,     0,   172,     0,     0,     0,   222,     0,     0,
>+       0,     0,     0,   224,   174,   175,   176,   177,     1,     2,
>+       3,     4,     5,     6,     7,     8,     9,    10,    11,   211,
>+     212,   213,     0,   214,   215,   216,   217,   218,   219,   220,
>+      12,    13,    14,    15,    16,    17,    18,    19,    20,    21,
>+      22,    23,    24,    25,    26,    27,    28,    29,    30,    31,
>+      32,    33,    34,    35,    36,    37,    38,    39,    40,    41,
>+      42,    43,    44,    45,    46,    47,    48,    49,   221,    50,
>+      51,    52,    53,    54,    55,    56,    57,    58,    59,    60,
>+      61,    62,    63,    64,    65,    66,    67,    68,    69,     0,
>+      70,    71,    72,    73,    74,    75,    76,    77,    78,    79,
>+      80,    81,    82,    83,    84,    85,    86,    87,    88,   163,
>+     164,    89,   165,   166,   167,   168,   169,     0,     0,   170,
>+     171,     0,     0,     0,     0,     0,     0,     0,     0,     0,
>+       0,     0,     0,     0,     0,     0,     0,     0,   172,     0,
>+       0,     0,   147,     0,     0,     0,     0,     0,   224,   174,
>+     175,   176,   177,     1,     2,     3,     4,     5,     6,     7,
>+       8,     9,    10,    11,   211,   212,   213,     0,   214,   215,
>+     216,   217,   218,   219,   220,    12,    13,    14,    15,    16,
>+      17,    18,    19,    20,    21,    22,    23,    24,    25,    26,
>+      27,    28,    29,    30,    31,    32,    33,    34,    35,    36,
>+      37,    38,    39,    40,    41,    42,    43,    44,    45,    46,
>+      47,    48,    49,   221,    50,    51,    52,    53,    54,    55,
>+      56,    57,    58,    59,    60,    61,    62,    63,    64,    65,
>+      66,    67,    68,    69,     0,    70,    71,    72,    73,    74,
>+      75,    76,    77,    78,    79,    80,    81,    82,    83,    84,
>+      85,    86,    87,    88,   163,   164,    89,   165,   166,   167,
>+     168,   169,     0,     0,   170,   171,     0,     0,     0,     0,
>        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
>-       0,   169,     0,     0,     0,   219,     0,     0,     0,     0,
>-       0,   221,   171,   172,   173,   174,     1,     2,     3,     4,
>-       5,     6,     7,     8,     9,    10,    11,   208,   209,   210,
>-       0,   211,   212,   213,   214,   215,   216,   217,    12,    13,
>-      14,    15,    16,    17,    18,    19,    20,    21,    22,    23,
>-      24,    25,    26,    27,    28,    29,    30,    31,    32,    33,
>-      34,    35,    36,    37,    38,    39,    40,    41,    42,    43,
>-      44,    45,    46,    47,    48,    49,   218,    50,    51,    52,
>-      53,    54,    55,    56,    57,    58,    59,    60,    61,    62,
>-      63,    64,    65,    66,     0,    67,    68,    69,    70,    71,
>-      72,    73,    74,    75,    76,    77,    78,    79,    80,    81,
>-      82,    83,    84,    85,   160,   161,    86,   162,   163,   164,
>-     165,   166,     0,     0,   167,   168,     0,     0,     0,     0,
>+       0,     0,     0,   172,     0,     0,     0,     0,     0,     0,
>+       0,     0,     0,   224,   174,   175,   176,   177,     1,     2,
>+       3,     4,     5,     6,     7,     8,     9,    10,    11,     0,
>        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
>-       0,     0,     0,   169,     0,     0,     0,   144,     0,     0,
>-       0,     0,     0,   221,   171,   172,   173,   174,     1,     2,
>-       3,     4,     5,     6,     7,     8,     9,    10,    11,   208,
>-     209,   210,     0,   211,   212,   213,   214,   215,   216,   217,
>       12,    13,    14,    15,    16,    17,    18,    19,    20,    21,
>       22,    23,    24,    25,    26,    27,    28,    29,    30,    31,
>       32,    33,    34,    35,    36,    37,    38,    39,    40,    41,
>-      42,    43,    44,    45,    46,    47,    48,    49,   218,    50,
>+      42,    43,    44,    45,    46,    47,    48,    49,     0,    50,
>       51,    52,    53,    54,    55,    56,    57,    58,    59,    60,
>-      61,    62,    63,    64,    65,    66,     0,    67,    68,    69,
>+      61,    62,    63,    64,    65,    66,    67,    68,    69,     0,
>       70,    71,    72,    73,    74,    75,    76,    77,    78,    79,
>-      80,    81,    82,    83,    84,    85,   160,   161,    86,   162,
>-     163,   164,   165,   166,     0,     0,   167,   168,     0,     0,
>+      80,    81,    82,    83,    84,    85,    86,    87,    88,   163,
>+     164,    89,   165,   166,   167,   168,   169,     0,     0,   170,
>+     171,     0,     0,     0,     0,     0,     0,     0,     0,     0,
>+       0,     0,     0,     0,     1,     2,     3,     4,   172,     6,
>+       7,     8,     9,    10,    11,     0,     0,     0,   224,   174,
>+     175,   176,   177,     0,     0,     0,    12,    13,    14,    15,
>+      16,    17,    18,    19,    20,    21,    22,    23,    24,    25,
>+      26,    27,    28,    29,    30,    31,    32,    33,    34,    35,
>+      36,    37,    38,    39,    40,    41,    42,    43,    44,    45,
>+      46,    47,    48,    49,     0,    50,    51,    52,    53,    54,
>+      55,    56,    57,    58,    59,    60,    61,    62,    63,    64,
>+      65,    66,    67,    68,    69,     0,    70,    71,    72,    73,
>+      74,    75,    76,    77,    78,    79,    80,    81,    82,    83,
>+      84,    85,    86,    87,    88,   163,   164,    89,   165,   166,
>+     167,   168,   169,     0,     0,   170,   171,     0,     0,     0,
>        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
>-       0,     0,     0,     0,     0,   169,     0,     0,     0,     0,
>-       0,     0,     0,     0,     0,   221,   171,   172,   173,   174,
>-       1,     2,     3,     4,     5,     6,     7,     8,     9,    10,
>-      11,     0,     0,     0,     0,     0,     0,     0,     0,     0,
>+       1,     2,     3,     4,   172,     6,     7,     8,     9,    10,
>+      11,     0,     0,     0,     0,   174,   175,   176,   177,     0,
>        0,     0,    12,    13,    14,    15,    16,    17,    18,    19,
>       20,    21,    22,    23,    24,    25,    26,    27,    28,    29,
>       30,    31,    32,    33,    34,    35,    36,    37,    38,    39,
>       40,    41,    42,    43,    44,    45,    46,    47,    48,    49,
>        0,    50,    51,    52,    53,    54,    55,    56,    57,    58,
>-      59,    60,    61,    62,    63,    64,    65,    66,     0,    67,
>-      68,    69,    70,    71,    72,    73,    74,    75,    76,    77,
>-      78,    79,    80,    81,    82,    83,    84,    85,   160,   161,
>-      86,   162,   163,   164,   165,   166,     0,     0,   167,   168,
>+      59,    60,    61,    62,    63,    64,    65,    66,    67,    68,
>+      69,     0,    70,    71,    72,    73,    74,    75,    76,    77,
>+      78,    79,    80,    81,    82,    83,    84,    85,    86,    87,
>+      88,     0,   131,    89,     0,     8,     9,    10,    11,     0,
>        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
>-       0,     0,     0,     1,     2,     3,     4,   169,     6,     7,
>-       8,     9,    10,    11,     0,     0,     0,   221,   171,   172,
>-     173,   174,     0,     0,     0,    12,    13,    14,    15,    16,
>-      17,    18,    19,    20,    21,    22,    23,    24,    25,    26,
>-      27,    28,    29,    30,    31,    32,    33,    34,    35,    36,
>-      37,    38,    39,    40,    41,    42,    43,    44,    45,    46,
>-      47,    48,    49,     0,    50,    51,    52,    53,    54,    55,
>-      56,    57,    58,    59,    60,    61,    62,    63,    64,    65,
>-      66,     0,    67,    68,    69,    70,    71,    72,    73,    74,
>-      75,    76,    77,    78,    79,    80,    81,    82,    83,    84,
>-      85,   160,   161,    86,   162,   163,   164,   165,   166,     0,
>-       0,   167,   168,     0,     0,     0,     0,     0,     0,     0,
>-       0,     0,     0,     0,     0,     0,     1,     2,     3,     4,
>-     169,     6,     7,     8,     9,    10,    11,     0,     0,     0,
>-       0,   171,   172,   173,   174,     0,     0,     0,    12,    13,
>-      14,    15,    16,    17,    18,    19,    20,    21,    22,    23,
>-      24,    25,    26,    27,    28,    29,    30,    31,    32,    33,
>-      34,    35,    36,    37,    38,    39,    40,    41,    42,    43,
>-      44,    45,    46,    47,    48,    49,     0,    50,    51,    52,
>-      53,    54,    55,    56,    57,    58,    59,    60,    61,    62,
>-      63,    64,    65,    66,     0,    67,    68,    69,    70,    71,
>-      72,    73,    74,    75,    76,    77,    78,    79,    80,    81,
>-      82,    83,    84,    85,     0,   128,    86,     0,     8,     9,
>-      10,    11,     0,     0,     0,     0,     0,     0,     0,     0,
>-       0,     0,     0,    12,    13,    14,    15,    16,    17,    18,
>-      19,    20,    21,    22,    23,    24,    25,    26,     0,     0,
>-       0,     0,     0,   129,    33,    34,    35,    36,    37,    38,
>-       0,     0,     0,     0,     0,     0,     0,     0,     0,    48,
>-      49,     0,    50,    51,    52,    53,    54,    55,    56,    57,
>-      58,    59,    60,    61,    62,    63,    64,    65,    66,     0,
>-      67,    68,    69,    70,    71,    72,    73,    74,    75,    76,
>-      77,    78,    79,    80,    81,    82,    83,     0,    85,   160,
>-     161,    86,   162,   163,   164,   165,   166,     0,     0,   167,
>-     168,     0,     0,     0,     0,     0,     0,     0,     0,     0,
>-       0,     0,     0,     0,     0,     0,     0,     0,   169,     0,
>-       0,   170,     8,     9,    10,    11,     0,     0,     0,   171,
>-     172,   173,   174,     0,     0,     0,     0,    12,    13,    14,
>+      12,    13,    14,    15,    16,    17,    18,    19,    20,    21,
>+      22,    23,    24,    25,    26,     0,     0,     0,     0,     0,
>+     132,    33,    34,    35,    36,    37,    38,     0,     0,     0,
>+       0,     0,     0,     0,     0,     0,    48,    49,     0,    50,
>+      51,    52,    53,    54,    55,    56,    57,    58,    59,    60,
>+      61,    62,    63,    64,    65,    66,    67,    68,    69,     0,
>+      70,    71,    72,    73,    74,    75,    76,    77,    78,    79,
>+      80,    81,    82,    83,    84,    85,    86,     0,    88,   163,
>+     164,    89,   165,   166,   167,   168,   169,     0,     0,   170,
>+     171,     0,     0,     0,     0,     0,     0,     0,     0,     0,
>+       0,     0,     0,     0,     0,     0,     0,     0,   172,     0,
>+       0,   173,     8,     9,    10,    11,     0,     0,     0,   174,
>+     175,   176,   177,     0,     0,     0,     0,    12,    13,    14,
>       15,    16,    17,    18,    19,    20,    21,    22,    23,    24,
>       25,    26,     0,     0,     0,     0,     0,     0,    33,    34,
>       35,    36,    37,    38,     0,     0,     0,     0,     0,     0,
>        0,     0,     0,    48,    49,     0,    50,    51,    52,    53,
>       54,    55,    56,    57,    58,    59,    60,    61,    62,    63,
>-      64,    65,    66,     0,    67,    68,    69,    70,    71,    72,
>+      64,    65,    66,    67,    68,    69,     0,    70,    71,    72,
>       73,    74,    75,    76,    77,    78,    79,    80,    81,    82,
>-      83,     0,    85,   160,   161,    86,   162,   163,   164,   165,
>-     166,     0,     0,   167,   168,     0,     0,     0,     0,     0,
>+      83,    84,    85,    86,     0,    88,   163,   164,    89,   165,
>+     166,   167,   168,   169,     0,     0,   170,   171,     0,     0,
>        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
>-       0,     0,   169,     0,     0,   287,     8,     9,    10,    11,
>-       0,     0,     0,   171,   172,   173,   174,     0,     0,     0,
>-       0,    12,    13,    14,    15,    16,    17,    18,    19,    20,
>-      21,    22,    23,    24,    25,    26,     0,     0,     0,     0,
>-       0,     0,    33,    34,    35,    36,    37,    38,     0,     0,
>-       0,     0,     0,     0,     0,     0,     0,    48,    49,     0,
>-      50,    51,    52,    53,    54,    55,    56,    57,    58,    59,
>-      60,    61,    62,    63,    64,    65,    66,     0,    67,    68,
>-      69,    70,    71,    72,    73,    74,    75,    76,    77,    78,
>-      79,    80,    81,    82,    83,     0,    85,   160,   161,    86,
>-     162,   163,   164,   165,   166,     0,     0,   167,   168,     0,
>+       0,     0,     0,     0,     0,   172,     0,     0,   290,     8,
>+       9,    10,    11,     0,     0,     0,   174,   175,   176,   177,
>+       0,     0,     0,     0,    12,    13,    14,    15,    16,    17,
>+      18,    19,    20,    21,    22,    23,    24,    25,    26,     0,
>+       0,     0,     0,     0,     0,    33,    34,    35,    36,    37,
>+      38,     0,     0,     0,     0,     0,     0,     0,     0,     0,
>+      48,    49,     0,    50,    51,    52,    53,    54,    55,    56,
>+      57,    58,    59,    60,    61,    62,    63,    64,    65,    66,
>+      67,    68,    69,     0,    70,    71,    72,    73,    74,    75,
>+      76,    77,    78,    79,    80,    81,    82,    83,    84,    85,
>+      86,     0,    88,   163,   164,    89,   165,   166,   167,   168,
>+     169,     0,     0,   170,   171,     0,     0,     0,     0,     0,
>+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
>+       0,     0,   172,     8,     9,    10,    11,     0,     0,     0,
>+       0,     0,   303,   174,   175,   176,   177,     0,    12,    13,
>+      14,    15,    16,    17,    18,    19,    20,    21,    22,    23,
>+      24,    25,    26,     0,     0,     0,     0,     0,     0,    33,
>+      34,    35,    36,    37,    38,     0,     0,     0,     0,     0,
>+       0,     0,     0,     0,    48,    49,     0,    50,    51,    52,
>+      53,    54,    55,    56,    57,    58,    59,    60,    61,    62,
>+      63,    64,    65,    66,    67,    68,    69,     0,    70,    71,
>+      72,    73,    74,    75,    76,    77,    78,    79,    80,    81,
>+      82,    83,    84,    85,    86,     0,    88,   163,   164,    89,
>+     165,   166,   167,   168,   169,     0,     0,   170,   171,     0,
>        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
>-       0,     0,     0,     0,     0,     0,   169,     8,     9,    10,
>-      11,     0,     0,     0,     0,     0,   300,   171,   172,   173,
>-     174,     0,    12,    13,    14,    15,    16,    17,    18,    19,
>+       0,     0,     0,     0,     0,     0,   172,     8,     9,    10,
>+      11,     0,     0,     0,     0,     0,     0,   174,   175,   176,
>+     177,     0,    12,    13,    14,    15,    16,    17,    18,    19,
>       20,    21,    22,    23,    24,    25,    26,     0,     0,     0,
>        0,     0,     0,    33,    34,    35,    36,    37,    38,     0,
>-       0,     0,     0,     0,     0,     0,     0,     0,    48,    49,
>+       0,     0,     0,     0,     0,     0,     0,     0,    48,   265,
>        0,    50,    51,    52,    53,    54,    55,    56,    57,    58,
>-      59,    60,    61,    62,    63,    64,    65,    66,     0,    67,
>-      68,    69,    70,    71,    72,    73,    74,    75,    76,    77,
>-      78,    79,    80,    81,    82,    83,     0,    85,   160,   161,
>-      86,   162,   163,   164,   165,   166,     0,     0,   167,   168,
>-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
>-       0,     0,     0,     0,     0,     0,     0,   169,     8,     9,
>-      10,    11,     0,     0,     0,     0,     0,     0,   171,   172,
>-     173,   174,     0,    12,    13,    14,    15,    16,    17,    18,
>-      19,    20,    21,    22,    23,    24,    25,    26,     0,     0,
>-       0,     0,     0,     0,    33,    34,    35,    36,    37,    38,
>-       0,     0,     0,     0,     0,     0,     0,     0,     0,    48,
>-     262,     0,    50,    51,    52,    53,    54,    55,    56,    57,
>-      58,    59,    60,    61,    62,    63,    64,    65,    66,     0,
>-      67,    68,    69,    70,    71,    72,    73,    74,    75,    76,
>-      77,    78,    79,    80,    81,    82,    83,     0,    85,   160,
>-     161,    86,   162,   163,   164,   165,   166,     0,     0,   167,
>-     168,     0,     0,     0,     0,     0,     0,     0,     0,     0,
>-       0,     0,     0,     0,     1,     2,     3,     4,   169,     6,
>-       7,     8,     9,    10,    11,     0,     0,     0,     0,   171,
>-     172,   173,   174,     0,     0,     0,    12,    13,    14,    15,
>-      16,    17,    18,    19,    20,    21,    22,    23,    24,    25,
>-      26,    27,    28,    29,    30,    31,    32,    33,    34,    35,
>-      36,    37,    38,    39,    40,    41,    42,    43,    44,    45,
>-      46,    47,    48,    49,     0,    50,    51,    52,    53,    54,
>-      55,    56,    57,    58,    59,    60,    61,    62,    63,    64,
>-      65,    66,     0,    67,    68,    69,    70,    71,    72,    73,
>-      74,    75,    76,    77,    78,    79,    80,    81,    82,    83,
>-      84,    85,     0,     0,    86,     0,     0,     0,     0,     0,
>-       0,     0,     0,     0,     0,     1,     2,     3,     4,     0,
>-       6,     7,     8,     9,    10,    11,     0,     0,     0,     0,
>-       0,     0,     0,     0,     0,     0,   250,    12,    13,    14,
>-      15,    16,    17,    18,    19,    20,    21,    22,    23,    24,
>-      25,    26,    27,    28,    29,    30,    31,    32,    33,    34,
>-      35,    36,    37,    38,    39,    40,    41,    42,    43,    44,
>-      45,    46,    47,    48,    49,     0,    50,    51,    52,    53,
>-      54,    55,    56,    57,    58,    59,    60,    61,    62,    63,
>-      64,    65,    66,     0,    67,    68,    69,    70,    71,    72,
>-      73,    74,    75,    76,    77,    78,    79,    80,    81,    82,
>-      83,    84,    85,     0,     0,    86,     0,     0,     0,     0,
>+      59,    60,    61,    62,    63,    64,    65,    66,    67,    68,
>+      69,     0,    70,    71,    72,    73,    74,    75,    76,    77,
>+      78,    79,    80,    81,    82,    83,    84,    85,    86,     0,
>+      88,   163,   164,    89,   165,   166,   167,   168,   169,     0,
>+       0,   170,   171,     0,     0,     0,     0,     0,     0,     0,
>        0,     0,     0,     0,     0,     0,     1,     2,     3,     4,
>-       0,     6,     7,     8,     9,    10,    11,     0,     0,     0,
>-       0,     0,     0,     0,     0,     0,     0,   289,    12,    13,
>+     172,     6,     7,     8,     9,    10,    11,     0,     0,     0,
>+       0,   174,   175,   176,   177,     0,     0,     0,    12,    13,
>       14,    15,    16,    17,    18,    19,    20,    21,    22,    23,
>       24,    25,    26,    27,    28,    29,    30,    31,    32,    33,
>       34,    35,    36,    37,    38,    39,    40,    41,    42,    43,
>       44,    45,    46,    47,    48,    49,     0,    50,    51,    52,
>       53,    54,    55,    56,    57,    58,    59,    60,    61,    62,
>-      63,    64,    65,    66,     0,    67,    68,    69,    70,    71,
>+      63,    64,    65,    66,    67,    68,    69,     0,    70,    71,
>       72,    73,    74,    75,    76,    77,    78,    79,    80,    81,
>-      82,    83,    84,    85,     0,     0,    86,     0,     0,     0,
>-       0,     0,     0,     0,   135,     0,     0,     1,     2,     3,
>-       4,     5,     6,     7,     8,     9,    10,    11,     0,     0,
>-       0,     0,     0,     0,     0,     0,     0,     0,   361,    12,
>-      13,    14,    15,    16,    17,    18,    19,    20,    21,    22,
>-      23,    24,    25,    26,    27,    28,    29,    30,    31,    32,
>-      33,    34,    35,    36,    37,    38,    39,    40,    41,    42,
>-      43,    44,    45,    46,    47,    48,    49,     0,    50,    51,
>-      52,    53,    54,    55,    56,    57,    58,    59,    60,    61,
>-      62,    63,    64,    65,    66,     0,    67,    68,    69,    70,
>-      71,    72,    73,    74,    75,    76,    77,    78,    79,    80,
>-      81,    82,    83,    84,    85,     0,     0,    86,     1,     2,
>-       3,     4,     5,     6,     7,     8,     9,    10,    11,     0,
>+      82,    83,    84,    85,    86,    87,    88,     0,     0,    89,
>        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
>+       1,     2,     3,     4,     0,     6,     7,     8,     9,    10,
>+      11,     0,     0,     0,     0,     0,     0,     0,     0,     0,
>+       0,   253,    12,    13,    14,    15,    16,    17,    18,    19,
>+      20,    21,    22,    23,    24,    25,    26,    27,    28,    29,
>+      30,    31,    32,    33,    34,    35,    36,    37,    38,    39,
>+      40,    41,    42,    43,    44,    45,    46,    47,    48,    49,
>+       0,    50,    51,    52,    53,    54,    55,    56,    57,    58,
>+      59,    60,    61,    62,    63,    64,    65,    66,    67,    68,
>+      69,     0,    70,    71,    72,    73,    74,    75,    76,    77,
>+      78,    79,    80,    81,    82,    83,    84,    85,    86,    87,
>+      88,     0,     0,    89,     0,     0,     0,     0,     0,     0,
>+       0,     0,     0,     0,     1,     2,     3,     4,     0,     6,
>+       7,     8,     9,    10,    11,     0,     0,     0,     0,     0,
>+       0,     0,     0,     0,     0,   292,    12,    13,    14,    15,
>+      16,    17,    18,    19,    20,    21,    22,    23,    24,    25,
>+      26,    27,    28,    29,    30,    31,    32,    33,    34,    35,
>+      36,    37,    38,    39,    40,    41,    42,    43,    44,    45,
>+      46,    47,    48,    49,     0,    50,    51,    52,    53,    54,
>+      55,    56,    57,    58,    59,    60,    61,    62,    63,    64,
>+      65,    66,    67,    68,    69,     0,    70,    71,    72,    73,
>+      74,    75,    76,    77,    78,    79,    80,    81,    82,    83,
>+      84,    85,    86,    87,    88,     0,     0,    89,     0,     0,
>+       0,     0,     0,     0,     0,   138,     0,     0,     1,     2,
>+       3,     4,     5,     6,     7,     8,     9,    10,    11,     0,
>+       0,     0,     0,     0,     0,     0,     0,     0,     0,   364,
>       12,    13,    14,    15,    16,    17,    18,    19,    20,    21,
>       22,    23,    24,    25,    26,    27,    28,    29,    30,    31,
>       32,    33,    34,    35,    36,    37,    38,    39,    40,    41,
>       42,    43,    44,    45,    46,    47,    48,    49,     0,    50,
>       51,    52,    53,    54,    55,    56,    57,    58,    59,    60,
>-      61,    62,    63,    64,    65,    66,     0,    67,    68,    69,
>+      61,    62,    63,    64,    65,    66,    67,    68,    69,     0,
>       70,    71,    72,    73,    74,    75,    76,    77,    78,    79,
>-      80,    81,    82,    83,    84,    85,     0,     0,    86,     1,
>-       2,     3,     4,     0,     6,     7,     8,     9,    10,    11,
>-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
>-       0,    12,    13,    14,    15,    16,    17,    18,    19,    20,
>-      21,    22,    23,    24,    25,    26,    27,    28,    29,    30,
>-      31,    32,    33,    34,    35,    36,    37,    38,    39,    40,
>-      41,    42,    43,    44,    45,    46,    47,    48,    49,     0,
>-      50,    51,    52,    53,    54,    55,    56,    57,    58,    59,
>-      60,    61,    62,    63,    64,    65,    66,     0,    67,    68,
>-      69,    70,    71,    72,    73,    74,    75,    76,    77,    78,
>-      79,    80,    81,    82,    83,    84,    85,     0,     0,    86,
>+      80,    81,    82,    83,    84,    85,    86,    87,    88,     0,
>+       0,    89,     1,     2,     3,     4,     5,     6,     7,     8,
>+       9,    10,    11,     0,     0,     0,     0,     0,     0,     0,
>+       0,     0,     0,     0,    12,    13,    14,    15,    16,    17,
>+      18,    19,    20,    21,    22,    23,    24,    25,    26,    27,
>+      28,    29,    30,    31,    32,    33,    34,    35,    36,    37,
>+      38,    39,    40,    41,    42,    43,    44,    45,    46,    47,
>+      48,    49,     0,    50,    51,    52,    53,    54,    55,    56,
>+      57,    58,    59,    60,    61,    62,    63,    64,    65,    66,
>+      67,    68,    69,     0,    70,    71,    72,    73,    74,    75,
>+      76,    77,    78,    79,    80,    81,    82,    83,    84,    85,
>+      86,    87,    88,     0,     0,    89,     1,     2,     3,     4,
>+       0,     6,     7,     8,     9,    10,    11,     0,     0,     0,
>+       0,     0,     0,     0,     0,     0,     0,     0,    12,    13,
>+      14,    15,    16,    17,    18,    19,    20,    21,    22,    23,
>+      24,    25,    26,    27,    28,    29,    30,    31,    32,    33,
>+      34,    35,    36,    37,    38,    39,    40,    41,    42,    43,
>+      44,    45,    46,    47,    48,    49,     0,    50,    51,    52,
>+      53,    54,    55,    56,    57,    58,    59,    60,    61,    62,
>+      63,    64,    65,    66,    67,    68,    69,     0,    70,    71,
>+      72,    73,    74,    75,    76,    77,    78,    79,    80,    81,
>+      82,    83,    84,    85,    86,    87,    88,     0,     0,    89,
>        8,     9,    10,    11,     0,     0,     0,     0,     0,     0,
>        0,     0,     0,     0,     0,    12,    13,    14,    15,    16,
>       17,    18,    19,    20,    21,    22,    23,    24,    25,    26,
>@@ -1292,120 +1294,109 @@ static const yytype_int16 yytable[] =
>       37,    38,     0,     0,     0,     0,     0,     0,     0,     0,
>        0,    48,    49,     0,    50,    51,    52,    53,    54,    55,
>       56,    57,    58,    59,    60,    61,    62,    63,    64,    65,
>-      66,     0,    67,    68,    69,    70,    71,    72,    73,    74,
>-      75,    76,    77,    78,    79,    80,    81,    82,    83,     0,
>-      85,     0,   336,    86,     8,     9,    10,    11,   337,     0,
>-       0,     0,     0,     0,     0,     0,     0,     0,     0,    12,
>-      13,    14,    15,    16,    17,    18,    19,    20,    21,    22,
>-      23,    24,    25,    26,     0,     0,     0,     0,     0,     0,
>-      33,    34,    35,    36,    37,    38,     0,     0,     0,     0,
>-       0,     0,     0,     0,     0,    48,    49,     0,    50,    51,
>-      52,    53,    54,    55,    56,    57,    58,    59,    60,    61,
>-      62,    63,    64,    65,    66,     0,    67,    68,    69,    70,
>-      71,    72,    73,    74,    75,    76,    77,    78,    79,    80,
>-      81,    82,    83,     0,    85,     0,     0,    86
>+      66,    67,    68,    69,     0,    70,    71,    72,    73,    74,
>+      75,    76,    77,    78,    79,    80,    81,    82,    83,    84,
>+      85,    86,     0,    88,     0,   339,    89,     8,     9,    10,
>+      11,   340,     0,     0,     0,     0,     0,     0,     0,     0,
>+       0,     0,    12,    13,    14,    15,    16,    17,    18,    19,
>+      20,    21,    22,    23,    24,    25,    26,     0,     0,     0,
>+       0,     0,     0,    33,    34,    35,    36,    37,    38,     0,
>+       0,     0,     0,     0,     0,     0,     0,     0,    48,    49,
>+       0,    50,    51,    52,    53,    54,    55,    56,    57,    58,
>+      59,    60,    61,    62,    63,    64,    65,    66,    67,    68,
>+      69,     0,    70,    71,    72,    73,    74,    75,    76,    77,
>+      78,    79,    80,    81,    82,    83,    84,    85,    86,     0,
>+      88,     0,     0,    89
> };
> 
> static const yytype_int16 yycheck[] =
> {
>-       0,    48,    91,   116,    96,   133,   201,    96,   152,   233,
>-     158,   364,   169,    91,   241,   127,   138,     0,   245,    60,
>-     102,   216,   387,     0,   118,   132,   370,   113,   114,   118,
>-     122,   130,   139,   122,   102,   103,   132,   149,   150,   183,
>-     118,   130,   386,   140,   140,   410,   131,    94,   139,   138,
>-     137,   404,   130,   111,   112,   203,   409,   214,   140,   153,
>-     138,   102,   148,   149,   156,   132,   134,   156,   132,   158,
>-     102,   103,   139,   201,   132,   139,   123,   124,   136,   132,
>-     158,   131,   204,   134,   102,   103,   139,   137,   216,   140,
>-     132,    91,   137,   131,   134,   140,    96,   241,   325,   137,
>-     257,   245,   131,   134,   131,   131,   106,   131,   137,   109,
>-     137,   137,   132,   137,   203,   204,   137,   261,   118,   140,
>-     130,   137,   122,   106,   140,   203,   204,   140,   285,   106,
>-     130,   273,   274,   275,   276,   247,   137,   133,   138,   140,
>-     137,   298,   290,   140,   144,   302,   130,   371,     4,     5,
>-       6,   145,   146,   147,   130,   142,   156,   144,   158,   120,
>-     121,   122,   123,   124,   125,   126,   127,   128,   129,   109,
>-     110,   167,   168,   115,   116,   319,   320,   152,   139,   105,
>-     106,   325,   377,   137,   138,   412,   269,   270,   131,   151,
>-     186,   271,   272,   277,   278,   150,   117,   119,   133,   140,
>-     130,   290,   140,   203,   204,   201,   130,   140,   135,   138,
>-     130,   130,   290,   370,   130,   133,   131,   134,    63,    17,
>-     216,   133,   130,   130,   138,   131,   137,   140,   131,   386,
>-     135,   133,   280,   233,   134,   139,   380,   281,   284,   396,
>-     279,   140,   140,   258,   122,   282,   118,   283,   122,   377,
>-     363,   408,     5,   246,   207,   329,   365,   402,   409,   365,
>-     386,    -1,   106,    -1,   307,    -1,    -1,    -1,   412,    -1,
>-     266,   267,   268,   269,   270,   271,   272,   273,   274,   275,
>-     276,   277,   278,   279,   280,   281,   282,   283,   284,    -1,
>-     290,    -1,   370,    -1,    -1,    -1,    -1,    -1,    -1,   391,
>-      -1,    -1,   391,    -1,    -1,    -1,    -1,   307,   386,    -1,
>-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
>+       0,    48,    94,   119,    94,   136,    99,    99,   204,   155,
>+     236,   161,   244,   172,     0,   130,   248,     0,   141,   367,
>+      60,   140,   105,   219,   143,   133,   121,   116,   117,   121,
>+     390,   121,   125,   125,   135,   134,   373,   152,   153,   135,
>+     186,   133,   143,   133,   105,   106,   142,   114,   115,   141,
>+      97,   141,   389,   413,   140,   135,   206,   143,   217,   407,
>+     143,   156,   151,   152,   412,   105,   159,   159,   135,   161,
>+     135,   161,   139,   204,   143,   135,   137,   142,   135,   126,
>+     127,   137,   142,   134,   207,   142,   134,   143,   219,   140,
>+     140,   134,   140,   143,    94,   140,   328,   140,   244,    99,
>+     134,   260,   248,   135,   134,   134,   140,   105,   106,   109,
>+     140,   140,   112,   137,   206,   207,   206,   207,   264,   140,
>+     137,   121,   143,   109,   140,   125,   109,   143,   133,   288,
>+       4,     5,     6,   133,   143,   250,   276,   277,   278,   279,
>+     142,   141,   301,   293,   105,   106,   305,   147,   374,   123,
>+     124,   125,   126,   127,   128,   129,   130,   131,   132,   159,
>+     133,   161,   134,   148,   149,   150,   133,   145,   142,   147,
>+     112,   113,   118,   119,   108,   109,   322,   323,   136,   155,
>+     140,   141,   328,   415,   380,   272,   273,   120,   154,   274,
>+     275,   153,   280,   281,   122,   136,   143,   133,   143,   143,
>+     138,   293,   133,   293,   133,   140,   206,   207,   133,   141,
>+     133,   137,   170,   171,   373,   134,   136,   141,   136,   133,
>+      63,   133,   138,   134,    17,   134,   136,   282,   143,   137,
>+     389,   189,   284,   261,   283,   142,   236,   383,   143,   143,
>+     399,   285,   125,   121,   286,   125,   204,     5,   287,   380,
>+     366,   210,   411,   249,   332,   368,   405,   412,   368,   389,
>+     109,   219,    -1,    -1,   310,    -1,    -1,    -1,    -1,   415,
>       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
>+      -1,    -1,    -1,   373,    -1,    -1,    -1,    -1,    -1,    -1,
>+      -1,    -1,    -1,   293,    -1,    -1,    -1,    -1,    -1,   389,
>+      -1,   394,   394,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
>+     310,   269,   270,   271,   272,   273,   274,   275,   276,   277,
>+     278,   279,   280,   281,   282,   283,   284,   285,   286,   287,
>       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
>-      -1,    -1,    -1,   390,    -1,    -1,    -1,    -1,    -1,    -1,
>-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
>-      -1,    -1,    -1,    -1,   364,   365,    -1,    -1,    -1,    -1,
>-     370,   371,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
>-      -1,   377,    -1,    -1,    -1,    -1,   386,    -1,    -1,    -1,
>-      -1,   391,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
>-      -1,    -1,    -1,    -1,   404,    -1,    -1,    -1,    -1,   409,
>-       3,     4,     5,     6,     7,     8,     9,    10,    11,    12,
>-      13,    14,    15,    16,    -1,    18,    19,    20,    21,    22,
>-      23,    24,    25,    26,    27,    28,    29,    30,    31,    32,
>-      33,    34,    35,    36,    37,    38,    39,    40,    41,    42,
>-      43,    44,    45,    46,    47,    48,    49,    50,    51,    52,
>-      53,    54,    55,    56,    57,    58,    59,    60,    61,    62,
>-      63,    64,    65,    66,    67,    68,    69,    70,    71,    72,
>-      73,    74,    75,    76,    77,    78,    79,    80,    -1,    82,
>-      83,    84,    85,    86,    87,    88,    89,    90,    91,    92,
>-      93,    94,    95,    96,    97,    98,    99,   100,   101,   102,
>-     103,   104,   105,   106,   107,   108,    -1,    -1,   111,   112,
>+      -1,    -1,    -1,    -1,    -1,    -1,   393,    -1,    -1,    -1,
>       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
>-      -1,    -1,    -1,    -1,    -1,    -1,    -1,   130,    -1,    -1,
>-      -1,   134,   135,    -1,    -1,    -1,    -1,   140,   141,   142,
>-     143,   144,     3,     4,     5,     6,     7,     8,     9,    10,
>-      11,    12,    13,    14,    15,    16,    -1,    18,    19,    20,
>-      21,    22,    23,    24,    25,    26,    27,    28,    29,    30,
>-      31,    32,    33,    34,    35,    36,    37,    38,    39,    40,
>-      41,    42,    43,    44,    45,    46,    47,    48,    49,    50,
>-      51,    52,    53,    54,    55,    56,    57,    58,    59,    60,
>-      61,    62,    63,    64,    65,    66,    67,    68,    69,    70,
>-      71,    72,    73,    74,    75,    76,    77,    78,    79,    80,
>-      -1,    82,    83,    84,    85,    86,    87,    88,    89,    90,
>-      91,    92,    93,    94,    95,    96,    97,    98,    99,   100,
>-     101,   102,   103,   104,   105,   106,   107,   108,    -1,    -1,
>-     111,   112,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
>-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   130,
>-      -1,    -1,    -1,   134,   135,    -1,    -1,    -1,    -1,   140,
>-     141,   142,   143,   144,     3,     4,     5,     6,     7,     8,
>-       9,    10,    11,    12,    13,    14,    15,    16,    -1,    18,
>-      19,    20,    21,    22,    23,    24,    25,    26,    27,    28,
>-      29,    30,    31,    32,    33,    34,    35,    36,    37,    38,
>-      39,    40,    41,    42,    43,    44,    45,    46,    47,    48,
>-      49,    50,    51,    52,    53,    54,    55,    56,    57,    58,
>-      59,    60,    61,    62,    63,    64,    65,    66,    67,    68,
>-      69,    70,    71,    72,    73,    74,    75,    76,    77,    78,
>-      79,    80,    -1,    82,    83,    84,    85,    86,    87,    88,
>-      89,    90,    91,    92,    93,    94,    95,    96,    97,    98,
>-      99,   100,   101,   102,   103,   104,   105,   106,   107,   108,
>-      -1,    -1,   111,   112,    -1,    -1,    -1,    -1,    -1,    -1,
>+      -1,    -1,    -1,    -1,    -1,    -1,    -1,   367,   368,    -1,
>+      -1,    -1,    -1,   373,   374,    -1,    -1,    -1,    -1,    -1,
>+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   389,
>+      -1,    -1,    -1,    -1,   394,    -1,    -1,    -1,    -1,    -1,
>+      -1,    -1,    -1,    -1,    -1,    -1,    -1,   407,    -1,    -1,
>+      -1,    -1,   412,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
>+      -1,    -1,   380,     3,     4,     5,     6,     7,     8,     9,
>+      10,    11,    12,    13,    14,    15,    16,    -1,    18,    19,
>+      20,    21,    22,    23,    24,    25,    26,    27,    28,    29,
>+      30,    31,    32,    33,    34,    35,    36,    37,    38,    39,
>+      40,    41,    42,    43,    44,    45,    46,    47,    48,    49,
>+      50,    51,    52,    53,    54,    55,    56,    57,    58,    59,
>+      60,    61,    62,    63,    64,    65,    66,    67,    68,    69,
>+      70,    71,    72,    73,    74,    75,    76,    77,    78,    79,
>+      80,    81,    82,    83,    -1,    85,    86,    87,    88,    89,
>+      90,    91,    92,    93,    94,    95,    96,    97,    98,    99,
>+     100,   101,   102,   103,   104,   105,   106,   107,   108,   109,
>+     110,   111,    -1,    -1,   114,   115,    -1,    -1,    -1,    -1,
>       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
>-      -1,   130,    -1,    -1,    -1,   134,    -1,    -1,    -1,    -1,
>-      -1,   140,   141,   142,   143,   144,     3,     4,     5,     6,
>-       7,     8,     9,    10,    11,    12,    13,    14,    15,    16,
>-      -1,    18,    19,    20,    21,    22,    23,    24,    25,    26,
>-      27,    28,    29,    30,    31,    32,    33,    34,    35,    36,
>-      37,    38,    39,    40,    41,    42,    43,    44,    45,    46,
>-      47,    48,    49,    50,    51,    52,    53,    54,    55,    56,
>-      57,    58,    59,    60,    61,    62,    63,    64,    65,    66,
>-      67,    68,    69,    70,    71,    72,    73,    74,    75,    76,
>-      77,    78,    79,    80,    -1,    82,    83,    84,    85,    86,
>-      87,    88,    89,    90,    91,    92,    93,    94,    95,    96,
>-      97,    98,    99,   100,   101,   102,   103,   104,   105,   106,
>-     107,   108,    -1,    -1,   111,   112,    -1,    -1,    -1,    -1,
>+      -1,    -1,    -1,   133,    -1,    -1,    -1,   137,   138,    -1,
>+      -1,    -1,    -1,   143,   144,   145,   146,   147,     3,     4,
>+       5,     6,     7,     8,     9,    10,    11,    12,    13,    14,
>+      15,    16,    -1,    18,    19,    20,    21,    22,    23,    24,
>+      25,    26,    27,    28,    29,    30,    31,    32,    33,    34,
>+      35,    36,    37,    38,    39,    40,    41,    42,    43,    44,
>+      45,    46,    47,    48,    49,    50,    51,    52,    53,    54,
>+      55,    56,    57,    58,    59,    60,    61,    62,    63,    64,
>+      65,    66,    67,    68,    69,    70,    71,    72,    73,    74,
>+      75,    76,    77,    78,    79,    80,    81,    82,    83,    -1,
>+      85,    86,    87,    88,    89,    90,    91,    92,    93,    94,
>+      95,    96,    97,    98,    99,   100,   101,   102,   103,   104,
>+     105,   106,   107,   108,   109,   110,   111,    -1,    -1,   114,
>+     115,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
>+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   133,    -1,
>+      -1,    -1,   137,   138,    -1,    -1,    -1,    -1,   143,   144,
>+     145,   146,   147,     3,     4,     5,     6,     7,     8,     9,
>+      10,    11,    12,    13,    14,    15,    16,    -1,    18,    19,
>+      20,    21,    22,    23,    24,    25,    26,    27,    28,    29,
>+      30,    31,    32,    33,    34,    35,    36,    37,    38,    39,
>+      40,    41,    42,    43,    44,    45,    46,    47,    48,    49,
>+      50,    51,    52,    53,    54,    55,    56,    57,    58,    59,
>+      60,    61,    62,    63,    64,    65,    66,    67,    68,    69,
>+      70,    71,    72,    73,    74,    75,    76,    77,    78,    79,
>+      80,    81,    82,    83,    -1,    85,    86,    87,    88,    89,
>+      90,    91,    92,    93,    94,    95,    96,    97,    98,    99,
>+     100,   101,   102,   103,   104,   105,   106,   107,   108,   109,
>+     110,   111,    -1,    -1,   114,   115,    -1,    -1,    -1,    -1,
>       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
>-      -1,    -1,    -1,   130,    -1,    -1,    -1,   134,    -1,    -1,
>-      -1,    -1,    -1,   140,   141,   142,   143,   144,     3,     4,
>+      -1,    -1,    -1,   133,    -1,    -1,    -1,   137,    -1,    -1,
>+      -1,    -1,    -1,   143,   144,   145,   146,   147,     3,     4,
>        5,     6,     7,     8,     9,    10,    11,    12,    13,    14,
>       15,    16,    -1,    18,    19,    20,    21,    22,    23,    24,
>       25,    26,    27,    28,    29,    30,    31,    32,    33,    34,
>@@ -1413,172 +1404,191 @@ static const yytype_int16 yycheck[] =
>       45,    46,    47,    48,    49,    50,    51,    52,    53,    54,
>       55,    56,    57,    58,    59,    60,    61,    62,    63,    64,
>       65,    66,    67,    68,    69,    70,    71,    72,    73,    74,
>-      75,    76,    77,    78,    79,    80,    -1,    82,    83,    84,
>+      75,    76,    77,    78,    79,    80,    81,    82,    83,    -1,
>       85,    86,    87,    88,    89,    90,    91,    92,    93,    94,
>       95,    96,    97,    98,    99,   100,   101,   102,   103,   104,
>-     105,   106,   107,   108,    -1,    -1,   111,   112,    -1,    -1,
>+     105,   106,   107,   108,   109,   110,   111,    -1,    -1,   114,
>+     115,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
>+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   133,    -1,
>+      -1,    -1,   137,    -1,    -1,    -1,    -1,    -1,   143,   144,
>+     145,   146,   147,     3,     4,     5,     6,     7,     8,     9,
>+      10,    11,    12,    13,    14,    15,    16,    -1,    18,    19,
>+      20,    21,    22,    23,    24,    25,    26,    27,    28,    29,
>+      30,    31,    32,    33,    34,    35,    36,    37,    38,    39,
>+      40,    41,    42,    43,    44,    45,    46,    47,    48,    49,
>+      50,    51,    52,    53,    54,    55,    56,    57,    58,    59,
>+      60,    61,    62,    63,    64,    65,    66,    67,    68,    69,
>+      70,    71,    72,    73,    74,    75,    76,    77,    78,    79,
>+      80,    81,    82,    83,    -1,    85,    86,    87,    88,    89,
>+      90,    91,    92,    93,    94,    95,    96,    97,    98,    99,
>+     100,   101,   102,   103,   104,   105,   106,   107,   108,   109,
>+     110,   111,    -1,    -1,   114,   115,    -1,    -1,    -1,    -1,
>       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
>-      -1,    -1,    -1,    -1,    -1,   130,    -1,    -1,    -1,    -1,
>-      -1,    -1,    -1,    -1,    -1,   140,   141,   142,   143,   144,
>-       3,     4,     5,     6,     7,     8,     9,    10,    11,    12,
>-      13,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
>+      -1,    -1,    -1,   133,    -1,    -1,    -1,    -1,    -1,    -1,
>+      -1,    -1,    -1,   143,   144,   145,   146,   147,     3,     4,
>+       5,     6,     7,     8,     9,    10,    11,    12,    13,    -1,
>+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
>+      25,    26,    27,    28,    29,    30,    31,    32,    33,    34,
>+      35,    36,    37,    38,    39,    40,    41,    42,    43,    44,
>+      45,    46,    47,    48,    49,    50,    51,    52,    53,    54,
>+      55,    56,    57,    58,    59,    60,    61,    62,    -1,    64,
>+      65,    66,    67,    68,    69,    70,    71,    72,    73,    74,
>+      75,    76,    77,    78,    79,    80,    81,    82,    83,    -1,
>+      85,    86,    87,    88,    89,    90,    91,    92,    93,    94,
>+      95,    96,    97,    98,    99,   100,   101,   102,   103,   104,
>+     105,   106,   107,   108,   109,   110,   111,    -1,    -1,   114,
>+     115,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
>+      -1,    -1,    -1,    -1,     3,     4,     5,     6,   133,     8,
>+       9,    10,    11,    12,    13,    -1,    -1,    -1,   143,   144,
>+     145,   146,   147,    -1,    -1,    -1,    25,    26,    27,    28,
>+      29,    30,    31,    32,    33,    34,    35,    36,    37,    38,
>+      39,    40,    41,    42,    43,    44,    45,    46,    47,    48,
>+      49,    50,    51,    52,    53,    54,    55,    56,    57,    58,
>+      59,    60,    61,    62,    -1,    64,    65,    66,    67,    68,
>+      69,    70,    71,    72,    73,    74,    75,    76,    77,    78,
>+      79,    80,    81,    82,    83,    -1,    85,    86,    87,    88,
>+      89,    90,    91,    92,    93,    94,    95,    96,    97,    98,
>+      99,   100,   101,   102,   103,   104,   105,   106,   107,   108,
>+     109,   110,   111,    -1,    -1,   114,   115,    -1,    -1,    -1,
>+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
>+       3,     4,     5,     6,   133,     8,     9,    10,    11,    12,
>+      13,    -1,    -1,    -1,    -1,   144,   145,   146,   147,    -1,
>       -1,    -1,    25,    26,    27,    28,    29,    30,    31,    32,
>       33,    34,    35,    36,    37,    38,    39,    40,    41,    42,
>       43,    44,    45,    46,    47,    48,    49,    50,    51,    52,
>       53,    54,    55,    56,    57,    58,    59,    60,    61,    62,
>       -1,    64,    65,    66,    67,    68,    69,    70,    71,    72,
>-      73,    74,    75,    76,    77,    78,    79,    80,    -1,    82,
>-      83,    84,    85,    86,    87,    88,    89,    90,    91,    92,
>+      73,    74,    75,    76,    77,    78,    79,    80,    81,    82,
>+      83,    -1,    85,    86,    87,    88,    89,    90,    91,    92,
>       93,    94,    95,    96,    97,    98,    99,   100,   101,   102,
>-     103,   104,   105,   106,   107,   108,    -1,    -1,   111,   112,
>+     103,    -1,   105,   106,    -1,    10,    11,    12,    13,    -1,
>       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
>-      -1,    -1,    -1,     3,     4,     5,     6,   130,     8,     9,
>-      10,    11,    12,    13,    -1,    -1,    -1,   140,   141,   142,
>-     143,   144,    -1,    -1,    -1,    25,    26,    27,    28,    29,
>-      30,    31,    32,    33,    34,    35,    36,    37,    38,    39,
>-      40,    41,    42,    43,    44,    45,    46,    47,    48,    49,
>-      50,    51,    52,    53,    54,    55,    56,    57,    58,    59,
>-      60,    61,    62,    -1,    64,    65,    66,    67,    68,    69,
>-      70,    71,    72,    73,    74,    75,    76,    77,    78,    79,
>-      80,    -1,    82,    83,    84,    85,    86,    87,    88,    89,
>-      90,    91,    92,    93,    94,    95,    96,    97,    98,    99,
>-     100,   101,   102,   103,   104,   105,   106,   107,   108,    -1,
>-      -1,   111,   112,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
>-      -1,    -1,    -1,    -1,    -1,    -1,     3,     4,     5,     6,
>-     130,     8,     9,    10,    11,    12,    13,    -1,    -1,    -1,
>-      -1,   141,   142,   143,   144,    -1,    -1,    -1,    25,    26,
>-      27,    28,    29,    30,    31,    32,    33,    34,    35,    36,
>-      37,    38,    39,    40,    41,    42,    43,    44,    45,    46,
>-      47,    48,    49,    50,    51,    52,    53,    54,    55,    56,
>-      57,    58,    59,    60,    61,    62,    -1,    64,    65,    66,
>-      67,    68,    69,    70,    71,    72,    73,    74,    75,    76,
>-      77,    78,    79,    80,    -1,    82,    83,    84,    85,    86,
>-      87,    88,    89,    90,    91,    92,    93,    94,    95,    96,
>-      97,    98,    99,   100,    -1,   102,   103,    -1,    10,    11,
>-      12,    13,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
>-      -1,    -1,    -1,    25,    26,    27,    28,    29,    30,    31,
>-      32,    33,    34,    35,    36,    37,    38,    39,    -1,    -1,
>-      -1,    -1,    -1,   140,    46,    47,    48,    49,    50,    51,
>-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    61,
>-      62,    -1,    64,    65,    66,    67,    68,    69,    70,    71,
>-      72,    73,    74,    75,    76,    77,    78,    79,    80,    -1,
>-      82,    83,    84,    85,    86,    87,    88,    89,    90,    91,
>-      92,    93,    94,    95,    96,    97,    98,    -1,   100,   101,
>-     102,   103,   104,   105,   106,   107,   108,    -1,    -1,   111,
>-     112,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
>-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   130,    -1,
>-      -1,   133,    10,    11,    12,    13,    -1,    -1,    -1,   141,
>-     142,   143,   144,    -1,    -1,    -1,    -1,    25,    26,    27,
>+      25,    26,    27,    28,    29,    30,    31,    32,    33,    34,
>+      35,    36,    37,    38,    39,    -1,    -1,    -1,    -1,    -1,
>+     143,    46,    47,    48,    49,    50,    51,    -1,    -1,    -1,
>+      -1,    -1,    -1,    -1,    -1,    -1,    61,    62,    -1,    64,
>+      65,    66,    67,    68,    69,    70,    71,    72,    73,    74,
>+      75,    76,    77,    78,    79,    80,    81,    82,    83,    -1,
>+      85,    86,    87,    88,    89,    90,    91,    92,    93,    94,
>+      95,    96,    97,    98,    99,   100,   101,    -1,   103,   104,
>+     105,   106,   107,   108,   109,   110,   111,    -1,    -1,   114,
>+     115,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
>+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   133,    -1,
>+      -1,   136,    10,    11,    12,    13,    -1,    -1,    -1,   144,
>+     145,   146,   147,    -1,    -1,    -1,    -1,    25,    26,    27,
>       28,    29,    30,    31,    32,    33,    34,    35,    36,    37,
>       38,    39,    -1,    -1,    -1,    -1,    -1,    -1,    46,    47,
>       48,    49,    50,    51,    -1,    -1,    -1,    -1,    -1,    -1,
>       -1,    -1,    -1,    61,    62,    -1,    64,    65,    66,    67,
>       68,    69,    70,    71,    72,    73,    74,    75,    76,    77,
>-      78,    79,    80,    -1,    82,    83,    84,    85,    86,    87,
>+      78,    79,    80,    81,    82,    83,    -1,    85,    86,    87,
>       88,    89,    90,    91,    92,    93,    94,    95,    96,    97,
>-      98,    -1,   100,   101,   102,   103,   104,   105,   106,   107,
>-     108,    -1,    -1,   111,   112,    -1,    -1,    -1,    -1,    -1,
>+      98,    99,   100,   101,    -1,   103,   104,   105,   106,   107,
>+     108,   109,   110,   111,    -1,    -1,   114,   115,    -1,    -1,
>       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
>-      -1,    -1,   130,    -1,    -1,   133,    10,    11,    12,    13,
>-      -1,    -1,    -1,   141,   142,   143,   144,    -1,    -1,    -1,
>-      -1,    25,    26,    27,    28,    29,    30,    31,    32,    33,
>-      34,    35,    36,    37,    38,    39,    -1,    -1,    -1,    -1,
>-      -1,    -1,    46,    47,    48,    49,    50,    51,    -1,    -1,
>-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    61,    62,    -1,
>-      64,    65,    66,    67,    68,    69,    70,    71,    72,    73,
>-      74,    75,    76,    77,    78,    79,    80,    -1,    82,    83,
>-      84,    85,    86,    87,    88,    89,    90,    91,    92,    93,
>-      94,    95,    96,    97,    98,    -1,   100,   101,   102,   103,
>-     104,   105,   106,   107,   108,    -1,    -1,   111,   112,    -1,
>+      -1,    -1,    -1,    -1,    -1,   133,    -1,    -1,   136,    10,
>+      11,    12,    13,    -1,    -1,    -1,   144,   145,   146,   147,
>+      -1,    -1,    -1,    -1,    25,    26,    27,    28,    29,    30,
>+      31,    32,    33,    34,    35,    36,    37,    38,    39,    -1,
>+      -1,    -1,    -1,    -1,    -1,    46,    47,    48,    49,    50,
>+      51,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
>+      61,    62,    -1,    64,    65,    66,    67,    68,    69,    70,
>+      71,    72,    73,    74,    75,    76,    77,    78,    79,    80,
>+      81,    82,    83,    -1,    85,    86,    87,    88,    89,    90,
>+      91,    92,    93,    94,    95,    96,    97,    98,    99,   100,
>+     101,    -1,   103,   104,   105,   106,   107,   108,   109,   110,
>+     111,    -1,    -1,   114,   115,    -1,    -1,    -1,    -1,    -1,
>       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
>-      -1,    -1,    -1,    -1,    -1,    -1,   130,    10,    11,    12,
>-      13,    -1,    -1,    -1,    -1,    -1,   140,   141,   142,   143,
>-     144,    -1,    25,    26,    27,    28,    29,    30,    31,    32,
>+      -1,    -1,   133,    10,    11,    12,    13,    -1,    -1,    -1,
>+      -1,    -1,   143,   144,   145,   146,   147,    -1,    25,    26,
>+      27,    28,    29,    30,    31,    32,    33,    34,    35,    36,
>+      37,    38,    39,    -1,    -1,    -1,    -1,    -1,    -1,    46,
>+      47,    48,    49,    50,    51,    -1,    -1,    -1,    -1,    -1,
>+      -1,    -1,    -1,    -1,    61,    62,    -1,    64,    65,    66,
>+      67,    68,    69,    70,    71,    72,    73,    74,    75,    76,
>+      77,    78,    79,    80,    81,    82,    83,    -1,    85,    86,
>+      87,    88,    89,    90,    91,    92,    93,    94,    95,    96,
>+      97,    98,    99,   100,   101,    -1,   103,   104,   105,   106,
>+     107,   108,   109,   110,   111,    -1,    -1,   114,   115,    -1,
>+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
>+      -1,    -1,    -1,    -1,    -1,    -1,   133,    10,    11,    12,
>+      13,    -1,    -1,    -1,    -1,    -1,    -1,   144,   145,   146,
>+     147,    -1,    25,    26,    27,    28,    29,    30,    31,    32,
>       33,    34,    35,    36,    37,    38,    39,    -1,    -1,    -1,
>       -1,    -1,    -1,    46,    47,    48,    49,    50,    51,    -1,
>       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    61,    62,
>       -1,    64,    65,    66,    67,    68,    69,    70,    71,    72,
>-      73,    74,    75,    76,    77,    78,    79,    80,    -1,    82,
>-      83,    84,    85,    86,    87,    88,    89,    90,    91,    92,
>-      93,    94,    95,    96,    97,    98,    -1,   100,   101,   102,
>-     103,   104,   105,   106,   107,   108,    -1,    -1,   111,   112,
>-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
>-      -1,    -1,    -1,    -1,    -1,    -1,    -1,   130,    10,    11,
>-      12,    13,    -1,    -1,    -1,    -1,    -1,    -1,   141,   142,
>-     143,   144,    -1,    25,    26,    27,    28,    29,    30,    31,
>-      32,    33,    34,    35,    36,    37,    38,    39,    -1,    -1,
>-      -1,    -1,    -1,    -1,    46,    47,    48,    49,    50,    51,
>-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    61,
>-      62,    -1,    64,    65,    66,    67,    68,    69,    70,    71,
>-      72,    73,    74,    75,    76,    77,    78,    79,    80,    -1,
>-      82,    83,    84,    85,    86,    87,    88,    89,    90,    91,
>-      92,    93,    94,    95,    96,    97,    98,    -1,   100,   101,
>-     102,   103,   104,   105,   106,   107,   108,    -1,    -1,   111,
>-     112,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
>-      -1,    -1,    -1,    -1,     3,     4,     5,     6,   130,     8,
>-       9,    10,    11,    12,    13,    -1,    -1,    -1,    -1,   141,
>-     142,   143,   144,    -1,    -1,    -1,    25,    26,    27,    28,
>-      29,    30,    31,    32,    33,    34,    35,    36,    37,    38,
>-      39,    40,    41,    42,    43,    44,    45,    46,    47,    48,
>-      49,    50,    51,    52,    53,    54,    55,    56,    57,    58,
>-      59,    60,    61,    62,    -1,    64,    65,    66,    67,    68,
>-      69,    70,    71,    72,    73,    74,    75,    76,    77,    78,
>-      79,    80,    -1,    82,    83,    84,    85,    86,    87,    88,
>-      89,    90,    91,    92,    93,    94,    95,    96,    97,    98,
>-      99,   100,    -1,    -1,   103,    -1,    -1,    -1,    -1,    -1,
>-      -1,    -1,    -1,    -1,    -1,     3,     4,     5,     6,    -1,
>-       8,     9,    10,    11,    12,    13,    -1,    -1,    -1,    -1,
>-      -1,    -1,    -1,    -1,    -1,    -1,   135,    25,    26,    27,
>-      28,    29,    30,    31,    32,    33,    34,    35,    36,    37,
>-      38,    39,    40,    41,    42,    43,    44,    45,    46,    47,
>-      48,    49,    50,    51,    52,    53,    54,    55,    56,    57,
>-      58,    59,    60,    61,    62,    -1,    64,    65,    66,    67,
>-      68,    69,    70,    71,    72,    73,    74,    75,    76,    77,
>-      78,    79,    80,    -1,    82,    83,    84,    85,    86,    87,
>-      88,    89,    90,    91,    92,    93,    94,    95,    96,    97,
>-      98,    99,   100,    -1,    -1,   103,    -1,    -1,    -1,    -1,
>+      73,    74,    75,    76,    77,    78,    79,    80,    81,    82,
>+      83,    -1,    85,    86,    87,    88,    89,    90,    91,    92,
>+      93,    94,    95,    96,    97,    98,    99,   100,   101,    -1,
>+     103,   104,   105,   106,   107,   108,   109,   110,   111,    -1,
>+      -1,   114,   115,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
>       -1,    -1,    -1,    -1,    -1,    -1,     3,     4,     5,     6,
>-      -1,     8,     9,    10,    11,    12,    13,    -1,    -1,    -1,
>-      -1,    -1,    -1,    -1,    -1,    -1,    -1,   135,    25,    26,
>+     133,     8,     9,    10,    11,    12,    13,    -1,    -1,    -1,
>+      -1,   144,   145,   146,   147,    -1,    -1,    -1,    25,    26,
>       27,    28,    29,    30,    31,    32,    33,    34,    35,    36,
>       37,    38,    39,    40,    41,    42,    43,    44,    45,    46,
>       47,    48,    49,    50,    51,    52,    53,    54,    55,    56,
>       57,    58,    59,    60,    61,    62,    -1,    64,    65,    66,
>       67,    68,    69,    70,    71,    72,    73,    74,    75,    76,
>-      77,    78,    79,    80,    -1,    82,    83,    84,    85,    86,
>+      77,    78,    79,    80,    81,    82,    83,    -1,    85,    86,
>       87,    88,    89,    90,    91,    92,    93,    94,    95,    96,
>-      97,    98,    99,   100,    -1,    -1,   103,    -1,    -1,    -1,
>-      -1,    -1,    -1,    -1,     0,    -1,    -1,     3,     4,     5,
>-       6,     7,     8,     9,    10,    11,    12,    13,    -1,    -1,
>-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   135,    25,
>-      26,    27,    28,    29,    30,    31,    32,    33,    34,    35,
>-      36,    37,    38,    39,    40,    41,    42,    43,    44,    45,
>-      46,    47,    48,    49,    50,    51,    52,    53,    54,    55,
>-      56,    57,    58,    59,    60,    61,    62,    -1,    64,    65,
>-      66,    67,    68,    69,    70,    71,    72,    73,    74,    75,
>-      76,    77,    78,    79,    80,    -1,    82,    83,    84,    85,
>-      86,    87,    88,    89,    90,    91,    92,    93,    94,    95,
>-      96,    97,    98,    99,   100,    -1,    -1,   103,     3,     4,
>-       5,     6,     7,     8,     9,    10,    11,    12,    13,    -1,
>+      97,    98,    99,   100,   101,   102,   103,    -1,    -1,   106,
>       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
>+       3,     4,     5,     6,    -1,     8,     9,    10,    11,    12,
>+      13,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
>+      -1,   138,    25,    26,    27,    28,    29,    30,    31,    32,
>+      33,    34,    35,    36,    37,    38,    39,    40,    41,    42,
>+      43,    44,    45,    46,    47,    48,    49,    50,    51,    52,
>+      53,    54,    55,    56,    57,    58,    59,    60,    61,    62,
>+      -1,    64,    65,    66,    67,    68,    69,    70,    71,    72,
>+      73,    74,    75,    76,    77,    78,    79,    80,    81,    82,
>+      83,    -1,    85,    86,    87,    88,    89,    90,    91,    92,
>+      93,    94,    95,    96,    97,    98,    99,   100,   101,   102,
>+     103,    -1,    -1,   106,    -1,    -1,    -1,    -1,    -1,    -1,
>+      -1,    -1,    -1,    -1,     3,     4,     5,     6,    -1,     8,
>+       9,    10,    11,    12,    13,    -1,    -1,    -1,    -1,    -1,
>+      -1,    -1,    -1,    -1,    -1,   138,    25,    26,    27,    28,
>+      29,    30,    31,    32,    33,    34,    35,    36,    37,    38,
>+      39,    40,    41,    42,    43,    44,    45,    46,    47,    48,
>+      49,    50,    51,    52,    53,    54,    55,    56,    57,    58,
>+      59,    60,    61,    62,    -1,    64,    65,    66,    67,    68,
>+      69,    70,    71,    72,    73,    74,    75,    76,    77,    78,
>+      79,    80,    81,    82,    83,    -1,    85,    86,    87,    88,
>+      89,    90,    91,    92,    93,    94,    95,    96,    97,    98,
>+      99,   100,   101,   102,   103,    -1,    -1,   106,    -1,    -1,
>+      -1,    -1,    -1,    -1,    -1,     0,    -1,    -1,     3,     4,
>+       5,     6,     7,     8,     9,    10,    11,    12,    13,    -1,
>+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   138,
>       25,    26,    27,    28,    29,    30,    31,    32,    33,    34,
>       35,    36,    37,    38,    39,    40,    41,    42,    43,    44,
>       45,    46,    47,    48,    49,    50,    51,    52,    53,    54,
>       55,    56,    57,    58,    59,    60,    61,    62,    -1,    64,
>       65,    66,    67,    68,    69,    70,    71,    72,    73,    74,
>-      75,    76,    77,    78,    79,    80,    -1,    82,    83,    84,
>+      75,    76,    77,    78,    79,    80,    81,    82,    83,    -1,
>       85,    86,    87,    88,    89,    90,    91,    92,    93,    94,
>-      95,    96,    97,    98,    99,   100,    -1,    -1,   103,     3,
>-       4,     5,     6,    -1,     8,     9,    10,    11,    12,    13,
>-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
>-      -1,    25,    26,    27,    28,    29,    30,    31,    32,    33,
>-      34,    35,    36,    37,    38,    39,    40,    41,    42,    43,
>-      44,    45,    46,    47,    48,    49,    50,    51,    52,    53,
>-      54,    55,    56,    57,    58,    59,    60,    61,    62,    -1,
>-      64,    65,    66,    67,    68,    69,    70,    71,    72,    73,
>-      74,    75,    76,    77,    78,    79,    80,    -1,    82,    83,
>-      84,    85,    86,    87,    88,    89,    90,    91,    92,    93,
>-      94,    95,    96,    97,    98,    99,   100,    -1,    -1,   103,
>+      95,    96,    97,    98,    99,   100,   101,   102,   103,    -1,
>+      -1,   106,     3,     4,     5,     6,     7,     8,     9,    10,
>+      11,    12,    13,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
>+      -1,    -1,    -1,    -1,    25,    26,    27,    28,    29,    30,
>+      31,    32,    33,    34,    35,    36,    37,    38,    39,    40,
>+      41,    42,    43,    44,    45,    46,    47,    48,    49,    50,
>+      51,    52,    53,    54,    55,    56,    57,    58,    59,    60,
>+      61,    62,    -1,    64,    65,    66,    67,    68,    69,    70,
>+      71,    72,    73,    74,    75,    76,    77,    78,    79,    80,
>+      81,    82,    83,    -1,    85,    86,    87,    88,    89,    90,
>+      91,    92,    93,    94,    95,    96,    97,    98,    99,   100,
>+     101,   102,   103,    -1,    -1,   106,     3,     4,     5,     6,
>+      -1,     8,     9,    10,    11,    12,    13,    -1,    -1,    -1,
>+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    25,    26,
>+      27,    28,    29,    30,    31,    32,    33,    34,    35,    36,
>+      37,    38,    39,    40,    41,    42,    43,    44,    45,    46,
>+      47,    48,    49,    50,    51,    52,    53,    54,    55,    56,
>+      57,    58,    59,    60,    61,    62,    -1,    64,    65,    66,
>+      67,    68,    69,    70,    71,    72,    73,    74,    75,    76,
>+      77,    78,    79,    80,    81,    82,    83,    -1,    85,    86,
>+      87,    88,    89,    90,    91,    92,    93,    94,    95,    96,
>+      97,    98,    99,   100,   101,   102,   103,    -1,    -1,   106,
>       10,    11,    12,    13,    -1,    -1,    -1,    -1,    -1,    -1,
>       -1,    -1,    -1,    -1,    -1,    25,    26,    27,    28,    29,
>       30,    31,    32,    33,    34,    35,    36,    37,    38,    39,
>@@ -1586,18 +1596,19 @@ static const yytype_int16 yycheck[] =
>       50,    51,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
>       -1,    61,    62,    -1,    64,    65,    66,    67,    68,    69,
>       70,    71,    72,    73,    74,    75,    76,    77,    78,    79,
>-      80,    -1,    82,    83,    84,    85,    86,    87,    88,    89,
>-      90,    91,    92,    93,    94,    95,    96,    97,    98,    -1,
>-     100,    -1,   102,   103,    10,    11,    12,    13,   108,    -1,
>-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    25,
>-      26,    27,    28,    29,    30,    31,    32,    33,    34,    35,
>-      36,    37,    38,    39,    -1,    -1,    -1,    -1,    -1,    -1,
>-      46,    47,    48,    49,    50,    51,    -1,    -1,    -1,    -1,
>-      -1,    -1,    -1,    -1,    -1,    61,    62,    -1,    64,    65,
>-      66,    67,    68,    69,    70,    71,    72,    73,    74,    75,
>-      76,    77,    78,    79,    80,    -1,    82,    83,    84,    85,
>-      86,    87,    88,    89,    90,    91,    92,    93,    94,    95,
>-      96,    97,    98,    -1,   100,    -1,    -1,   103
>+      80,    81,    82,    83,    -1,    85,    86,    87,    88,    89,
>+      90,    91,    92,    93,    94,    95,    96,    97,    98,    99,
>+     100,   101,    -1,   103,    -1,   105,   106,    10,    11,    12,
>+      13,   111,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
>+      -1,    -1,    25,    26,    27,    28,    29,    30,    31,    32,
>+      33,    34,    35,    36,    37,    38,    39,    -1,    -1,    -1,
>+      -1,    -1,    -1,    46,    47,    48,    49,    50,    51,    -1,
>+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    61,    62,
>+      -1,    64,    65,    66,    67,    68,    69,    70,    71,    72,
>+      73,    74,    75,    76,    77,    78,    79,    80,    81,    82,
>+      83,    -1,    85,    86,    87,    88,    89,    90,    91,    92,
>+      93,    94,    95,    96,    97,    98,    99,   100,   101,    -1,
>+     103,    -1,    -1,   106
> };
> 
>   /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
>@@ -1610,78 +1621,79 @@ static const yytype_uint8 yystos[] =
>       43,    44,    45,    46,    47,    48,    49,    50,    51,    52,
>       53,    54,    55,    56,    57,    58,    59,    60,    61,    62,
>       64,    65,    66,    67,    68,    69,    70,    71,    72,    73,
>-      74,    75,    76,    77,    78,    79,    80,    82,    83,    84,
>+      74,    75,    76,    77,    78,    79,    80,    81,    82,    83,
>       85,    86,    87,    88,    89,    90,    91,    92,    93,    94,
>-      95,    96,    97,    98,    99,   100,   103,   186,   187,   188,
>-     189,   190,   194,   195,   196,   197,   198,   199,   200,   201,
>-     202,   203,   204,   207,   209,   210,   245,   246,   247,   203,
>-     102,   103,   134,   155,   130,   140,   248,   131,   137,   191,
>-     192,   193,   198,   202,   137,   140,   102,   155,   102,   140,
>-     185,   200,   202,   132,   208,     0,   246,   207,   212,   134,
>-      60,   102,   205,   206,   134,   228,   192,   191,   193,   155,
>-     155,   130,   139,   208,   134,   140,   198,   202,   213,   214,
>-     101,   102,   104,   105,   106,   107,   108,   111,   112,   130,
>-     133,   141,   142,   143,   144,   156,   157,   158,   160,   161,
>-     162,   163,   164,   165,   166,   167,   168,   169,   170,   171,
>-     172,   173,   174,   175,   176,   177,   178,   179,   180,   184,
>-     207,   132,   140,   213,   211,   139,   131,   137,    14,    15,
>-      16,    18,    19,    20,    21,    22,    23,    24,    63,   134,
>-     135,   140,   167,   180,   181,   183,   186,   187,   207,   218,
>-     219,   220,   221,   229,   230,   231,   233,   235,   237,   244,
>-     208,   139,   208,   181,   217,   139,   202,   155,   215,   216,
>-     135,   214,   167,   167,   183,   111,   112,   132,   136,   131,
>-     131,   137,    62,   181,   130,   167,   145,   146,   147,   142,
>-     144,   109,   110,   113,   114,   148,   149,   115,   116,   152,
>-     151,   150,   117,   119,   118,   153,   133,   133,   184,   135,
>-     213,   105,   106,   206,   140,   140,   239,   130,   130,   140,
>-     140,   183,   130,   184,   138,   130,   135,   222,   120,   121,
>-     122,   123,   124,   125,   126,   127,   128,   129,   139,   182,
>-     137,   140,   135,   219,   217,   139,   217,   215,   208,   137,
>-     140,   102,   140,   131,   159,   183,   102,   108,   162,   181,
>-     167,   167,   167,   169,   169,   170,   170,   171,   171,   171,
>-     171,   172,   172,   173,   174,   175,   176,   177,   178,   183,
>-     133,   135,   225,   226,   227,   240,   183,   140,   183,   138,
>-     238,   229,   181,   181,   217,   140,   216,   132,   140,   133,
>-     138,    63,   228,   220,   218,   230,   241,   131,   131,   183,
>-     196,   198,   236,   223,   184,   181,   130,   236,   242,   243,
>-     225,   232,   234,   155,   131,   135,   133,   183,   140,   131,
>-      17,   221,   139,   220,   224,   228,   140,   131,   183,   224,
>-     225,   217,   140
>+      95,    96,    97,    98,    99,   100,   101,   102,   103,   106,
>+     189,   190,   191,   192,   193,   197,   198,   199,   200,   201,
>+     202,   203,   204,   205,   206,   207,   210,   212,   213,   248,
>+     249,   250,   206,   105,   106,   137,   158,   133,   143,   251,
>+     134,   140,   194,   195,   196,   201,   205,   140,   143,   105,
>+     158,   105,   143,   188,   203,   205,   135,   211,     0,   249,
>+     210,   215,   137,    60,   105,   208,   209,   137,   231,   195,
>+     194,   196,   158,   158,   133,   142,   211,   137,   143,   201,
>+     205,   216,   217,   104,   105,   107,   108,   109,   110,   111,
>+     114,   115,   133,   136,   144,   145,   146,   147,   159,   160,
>+     161,   163,   164,   165,   166,   167,   168,   169,   170,   171,
>+     172,   173,   174,   175,   176,   177,   178,   179,   180,   181,
>+     182,   183,   187,   210,   135,   143,   216,   214,   142,   134,
>+     140,    14,    15,    16,    18,    19,    20,    21,    22,    23,
>+      24,    63,   137,   138,   143,   170,   183,   184,   186,   189,
>+     190,   210,   221,   222,   223,   224,   232,   233,   234,   236,
>+     238,   240,   247,   211,   142,   211,   184,   220,   142,   205,
>+     158,   218,   219,   138,   217,   170,   170,   186,   114,   115,
>+     135,   139,   134,   134,   140,    62,   184,   133,   170,   148,
>+     149,   150,   145,   147,   112,   113,   116,   117,   151,   152,
>+     118,   119,   155,   154,   153,   120,   122,   121,   156,   136,
>+     136,   187,   138,   216,   108,   109,   209,   143,   143,   242,
>+     133,   133,   143,   143,   186,   133,   187,   141,   133,   138,
>+     225,   123,   124,   125,   126,   127,   128,   129,   130,   131,
>+     132,   142,   185,   140,   143,   138,   222,   220,   142,   220,
>+     218,   211,   140,   143,   105,   143,   134,   162,   186,   105,
>+     111,   165,   184,   170,   170,   170,   172,   172,   173,   173,
>+     174,   174,   174,   174,   175,   175,   176,   177,   178,   179,
>+     180,   181,   186,   136,   138,   228,   229,   230,   243,   186,
>+     143,   186,   141,   241,   232,   184,   184,   220,   143,   219,
>+     135,   143,   136,   141,    63,   231,   223,   221,   233,   244,
>+     134,   134,   186,   199,   201,   239,   226,   187,   184,   133,
>+     239,   245,   246,   228,   235,   237,   158,   134,   138,   136,
>+     186,   143,   134,    17,   224,   142,   223,   227,   231,   143,
>+     134,   186,   227,   228,   220,   143
> };
> 
>   /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives.  */
> static const yytype_uint8 yyr1[] =
> {
>-       0,   154,   155,   155,   156,   157,   157,   157,   157,   157,
>-     157,   157,   158,   158,   158,   158,   158,   158,   159,   160,
>-     161,   161,   162,   162,   163,   163,   164,   164,   165,   166,
>-     166,   166,   167,   167,   167,   167,   168,   168,   168,   168,
>-     169,   169,   169,   169,   170,   170,   170,   171,   171,   171,
>-     172,   172,   172,   172,   172,   173,   173,   173,   174,   174,
>-     175,   175,   176,   176,   177,   177,   178,   178,   179,   179,
>-     180,   180,   181,   181,   182,   182,   182,   182,   182,   182,
>-     182,   182,   182,   182,   182,   183,   183,   184,   185,   186,
>-     186,   186,   186,   186,   186,   186,   186,   187,   188,   188,
>-     189,   189,   190,   191,   191,   192,   192,   192,   192,   193,
>-     194,   194,   194,   194,   194,   195,   195,   195,   195,   195,
>-     196,   196,   197,   197,   198,   198,   199,   200,   200,   200,
>-     200,   200,   201,   201,   201,   201,   201,   201,   201,   201,
>-     201,   201,   201,   201,   201,   201,   201,   202,   203,   203,
>-     203,   204,   205,   205,   206,   206,   206,   206,   207,   207,
>-     208,   208,   208,   208,   209,   209,   209,   209,   209,   209,
>-     209,   209,   209,   209,   209,   209,   209,   209,   209,   209,
>-     209,   209,   209,   209,   209,   209,   209,   209,   209,   209,
>-     209,   209,   209,   209,   209,   209,   209,   209,   209,   209,
>-     209,   209,   209,   209,   209,   209,   209,   209,   209,   209,
>-     209,   209,   209,   209,   209,   209,   209,   209,   209,   209,
>-     209,   209,   209,   209,   209,   209,   209,   211,   210,   212,
>-     210,   213,   213,   214,   214,   215,   215,   216,   216,   217,
>-     218,   219,   219,   220,   220,   220,   220,   220,   220,   220,
>-     221,   222,   223,   221,   224,   224,   226,   225,   227,   225,
>-     228,   228,   229,   229,   230,   230,   231,   232,   232,   234,
>-     233,   235,   235,   236,   236,   238,   237,   239,   237,   240,
>-     237,   241,   241,   242,   242,   243,   243,   244,   244,   244,
>-     244,   244,   245,   245,   246,   246,   248,   247
>+       0,   157,   158,   158,   159,   160,   160,   160,   160,   160,
>+     160,   160,   161,   161,   161,   161,   161,   161,   162,   163,
>+     164,   164,   165,   165,   166,   166,   167,   167,   168,   169,
>+     169,   169,   170,   170,   170,   170,   171,   171,   171,   171,
>+     172,   172,   172,   172,   173,   173,   173,   174,   174,   174,
>+     175,   175,   175,   175,   175,   176,   176,   176,   177,   177,
>+     178,   178,   179,   179,   180,   180,   181,   181,   182,   182,
>+     183,   183,   184,   184,   185,   185,   185,   185,   185,   185,
>+     185,   185,   185,   185,   185,   186,   186,   187,   188,   189,
>+     189,   189,   189,   189,   189,   189,   189,   190,   191,   191,
>+     192,   192,   193,   194,   194,   195,   195,   195,   195,   196,
>+     197,   197,   197,   197,   197,   198,   198,   198,   198,   198,
>+     199,   199,   200,   200,   201,   201,   202,   203,   203,   203,
>+     203,   203,   204,   204,   204,   204,   204,   204,   204,   204,
>+     204,   204,   204,   204,   204,   204,   204,   205,   206,   206,
>+     206,   207,   208,   208,   209,   209,   209,   209,   210,   210,
>+     211,   211,   211,   211,   212,   212,   212,   212,   212,   212,
>+     212,   212,   212,   212,   212,   212,   212,   212,   212,   212,
>+     212,   212,   212,   212,   212,   212,   212,   212,   212,   212,
>+     212,   212,   212,   212,   212,   212,   212,   212,   212,   212,
>+     212,   212,   212,   212,   212,   212,   212,   212,   212,   212,
>+     212,   212,   212,   212,   212,   212,   212,   212,   212,   212,
>+     212,   212,   212,   212,   212,   212,   212,   212,   212,   212,
>+     214,   213,   215,   213,   216,   216,   217,   217,   218,   218,
>+     219,   219,   220,   221,   222,   222,   223,   223,   223,   223,
>+     223,   223,   223,   224,   225,   226,   224,   227,   227,   229,
>+     228,   230,   228,   231,   231,   232,   232,   233,   233,   234,
>+     235,   235,   237,   236,   238,   238,   239,   239,   241,   240,
>+     242,   240,   243,   240,   244,   244,   245,   245,   246,   246,
>+     247,   247,   247,   247,   247,   248,   248,   249,   249,   251,
>+     250
> };
> 
>   /* YYR2[YYN] -- Number of symbols on the right hand side of rule YYN.  */
>@@ -1709,14 +1721,15 @@ static const yytype_uint8 yyr2[] =
>        1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
>        1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
>        1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
>-       1,     1,     1,     1,     1,     1,     1,     0,     6,     0,
>-       5,     1,     2,     3,     4,     1,     3,     1,     2,     1,
>        1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
>-       2,     0,     0,     5,     1,     1,     0,     2,     0,     2,
>-       2,     3,     1,     2,     1,     2,     5,     3,     1,     0,
>-       6,     3,     2,     1,     4,     0,     6,     0,     8,     0,
>-       7,     1,     1,     1,     0,     2,     3,     2,     2,     2,
>-       3,     2,     1,     2,     1,     1,     0,     3
>+       0,     6,     0,     5,     1,     2,     3,     4,     1,     3,
>+       1,     2,     1,     1,     1,     1,     1,     1,     1,     1,
>+       1,     1,     1,     2,     0,     0,     5,     1,     1,     0,
>+       2,     0,     2,     2,     3,     1,     2,     1,     2,     5,
>+       3,     1,     0,     6,     3,     2,     1,     4,     0,     6,
>+       0,     8,     0,     7,     1,     1,     1,     0,     2,     3,
>+       2,     2,     2,     3,     2,     1,     2,     1,     1,     0,
>+       3
> };
> 
> 
>@@ -2499,10 +2512,7 @@ yyreduce:
> 
>     {
>         // The symbol table search was done in the lexical phase
>-        (yyval.interm.intermTypedNode) = context->parseVariableIdentifier((yylsp[0]), (yyvsp[0].lex).string, (yyvsp[0].lex).symbol);
>-
>-        // don't delete $1.string, it's used by error recovery, and the pool
>-        // pop will reclaim the memory
>+        (yyval.interm.intermTypedNode) = context->parseVariableIdentifier((yylsp[0]), ImmutableString((yyvsp[0].lex).string), (yyvsp[0].lex).symbol);
>     }
> 
>     break;
>@@ -2560,10 +2570,10 @@ yyreduce:
>     {
>         if (!context->checkCanUseExtension((yylsp[0]), TExtension::EXT_YUV_target))
>         {
>-           context->error((yylsp[0]), "unsupported value", (yyvsp[0].lex).string->c_str());
>+           context->error((yylsp[0]), "unsupported value", ImmutableString((yyvsp[0].lex).string));
>         }
>         TConstantUnion *unionArray = new TConstantUnion[1];
>-        unionArray->setYuvCscStandardEXTConst(getYuvCscStandardEXT((yyvsp[0].lex).string->c_str()));
>+        unionArray->setYuvCscStandardEXTConst(getYuvCscStandardEXT(ImmutableString((yyvsp[0].lex).string)));
>         (yyval.interm.intermTypedNode) = context->addScalarLiteral(unionArray, (yylsp[0]));
>     }
> 
>@@ -2604,7 +2614,7 @@ yyreduce:
>   case 15:
> 
>     {
>-        (yyval.interm.intermTypedNode) = context->addFieldSelectionExpression((yyvsp[-2].interm.intermTypedNode), (yylsp[-1]), *(yyvsp[0].lex).string, (yylsp[0]));
>+        (yyval.interm.intermTypedNode) = context->addFieldSelectionExpression((yyvsp[-2].interm.intermTypedNode), (yylsp[-1]), ImmutableString((yyvsp[0].lex).string), (yylsp[0]));
>     }
> 
>     break;
>@@ -2637,7 +2647,7 @@ yyreduce:
>   case 19:
> 
>     {
>-        (yyval.interm.intermTypedNode) = context->addFunctionCallOrMethod((yyvsp[0].interm).function, (yyvsp[0].interm).callOrMethodPair.arguments, (yyvsp[0].interm).callOrMethodPair.thisNode, (yylsp[0]));
>+        (yyval.interm.intermTypedNode) = context->addFunctionCallOrMethod((yyvsp[0].interm.functionLookup), (yylsp[0]));
>     }
> 
>     break;
>@@ -2645,8 +2655,7 @@ yyreduce:
>   case 20:
> 
>     {
>-        (yyval.interm) = (yyvsp[0].interm);
>-        (yyval.interm).callOrMethodPair.thisNode = nullptr;
>+        (yyval.interm.functionLookup) = (yyvsp[0].interm.functionLookup);
>     }
> 
>     break;
>@@ -2655,8 +2664,8 @@ yyreduce:
> 
>     {
>         ES3_OR_NEWER("", (yylsp[0]), "methods");
>-        (yyval.interm) = (yyvsp[0].interm);
>-        (yyval.interm).callOrMethodPair.thisNode = (yyvsp[-2].interm.intermTypedNode);
>+        (yyval.interm.functionLookup) = (yyvsp[0].interm.functionLookup);
>+        (yyval.interm.functionLookup)->setThisNode((yyvsp[-2].interm.intermTypedNode));
>     }
> 
>     break;
>@@ -2664,7 +2673,7 @@ yyreduce:
>   case 22:
> 
>     {
>-        (yyval.interm) = (yyvsp[-1].interm);
>+        (yyval.interm.functionLookup) = (yyvsp[-1].interm.functionLookup);
>     }
> 
>     break;
>@@ -2672,7 +2681,7 @@ yyreduce:
>   case 23:
> 
>     {
>-        (yyval.interm) = (yyvsp[-1].interm);
>+        (yyval.interm.functionLookup) = (yyvsp[-1].interm.functionLookup);
>     }
> 
>     break;
>@@ -2680,8 +2689,7 @@ yyreduce:
>   case 24:
> 
>     {
>-        (yyval.interm).function = (yyvsp[-1].interm.function);
>-        (yyval.interm).callOrMethodPair.arguments = context->createEmptyArgumentsList();
>+        (yyval.interm.functionLookup) = (yyvsp[-1].interm.functionLookup);
>     }
> 
>     break;
>@@ -2689,8 +2697,7 @@ yyreduce:
>   case 25:
> 
>     {
>-        (yyval.interm).function = (yyvsp[0].interm.function);
>-        (yyval.interm).callOrMethodPair.arguments = context->createEmptyArgumentsList();
>+        (yyval.interm.functionLookup) = (yyvsp[0].interm.functionLookup);
>     }
> 
>     break;
>@@ -2698,9 +2705,8 @@ yyreduce:
>   case 26:
> 
>     {
>-        (yyval.interm).callOrMethodPair.arguments = context->createEmptyArgumentsList();
>-        (yyval.interm).function = (yyvsp[-1].interm.function);
>-        (yyval.interm).callOrMethodPair.arguments->push_back((yyvsp[0].interm.intermTypedNode));
>+        (yyval.interm.functionLookup) = (yyvsp[-1].interm.functionLookup);
>+        (yyval.interm.functionLookup)->addArgument((yyvsp[0].interm.intermTypedNode));
>     }
> 
>     break;
>@@ -2708,8 +2714,8 @@ yyreduce:
>   case 27:
> 
>     {
>-        (yyval.interm).function = (yyvsp[-2].interm).function;
>-        (yyval.interm).callOrMethodPair.arguments->push_back((yyvsp[0].interm.intermTypedNode));
>+        (yyval.interm.functionLookup) = (yyvsp[-2].interm.functionLookup);
>+        (yyval.interm.functionLookup)->addArgument((yyvsp[0].interm.intermTypedNode));
>     }
> 
>     break;
>@@ -2717,7 +2723,7 @@ yyreduce:
>   case 28:
> 
>     {
>-        (yyval.interm.function) = (yyvsp[-1].interm.function);
>+        (yyval.interm.functionLookup) = (yyvsp[-1].interm.functionLookup);
>     }
> 
>     break;
>@@ -2725,7 +2731,7 @@ yyreduce:
>   case 29:
> 
>     {
>-        (yyval.interm.function) = context->addConstructorFunc((yyvsp[0].interm.type));
>+        (yyval.interm.functionLookup) = context->addConstructorFunc((yyvsp[0].interm.type));
>     }
> 
>     break;
>@@ -2733,7 +2739,7 @@ yyreduce:
>   case 30:
> 
>     {
>-        (yyval.interm.function) = context->addNonConstructorFunc((yyvsp[0].lex).string, (yylsp[0]));
>+        (yyval.interm.functionLookup) = context->addNonConstructorFunc(ImmutableString((yyvsp[0].lex).string), (yyvsp[0].lex).symbol);
>     }
> 
>     break;
>@@ -2741,7 +2747,7 @@ yyreduce:
>   case 31:
> 
>     {
>-        (yyval.interm.function) = context->addNonConstructorFunc((yyvsp[0].lex).string, (yylsp[0]));
>+        (yyval.interm.functionLookup) = context->addNonConstructorFunc(ImmutableString((yyvsp[0].lex).string), (yyvsp[0].lex).symbol);
>     }
> 
>     break;
>@@ -3169,7 +3175,7 @@ yyreduce:
>   case 88:
> 
>     {
>-        context->enterStructDeclaration((yylsp[-1]), *(yyvsp[-1].lex).string);
>+        context->enterStructDeclaration((yylsp[-1]), ImmutableString((yyvsp[-1].lex).string));
>         (yyval.lex) = (yyvsp[-1].lex);
>     }
> 
>@@ -3203,8 +3209,8 @@ yyreduce:
>   case 92:
> 
>     {
>-        ES3_OR_NEWER((yyvsp[-3].lex).string->c_str(), (yylsp[-4]), "interface blocks");
>-        (yyval.interm.intermNode) = context->addInterfaceBlock(*(yyvsp[-4].interm.typeQualifierBuilder), (yylsp[-3]), *(yyvsp[-3].lex).string, (yyvsp[-2].interm.fieldList), NULL, (yyloc), NULL, (yyloc));
>+        ES3_OR_NEWER(ImmutableString((yyvsp[-3].lex).string), (yylsp[-4]), "interface blocks");
>+        (yyval.interm.intermNode) = context->addInterfaceBlock(*(yyvsp[-4].interm.typeQualifierBuilder), (yylsp[-3]), ImmutableString((yyvsp[-3].lex).string), (yyvsp[-2].interm.fieldList), kEmptyImmutableString, (yyloc), NULL, (yyloc));
>     }
> 
>     break;
>@@ -3212,8 +3218,8 @@ yyreduce:
>   case 93:
> 
>     {
>-        ES3_OR_NEWER((yyvsp[-4].lex).string->c_str(), (yylsp[-5]), "interface blocks");
>-        (yyval.interm.intermNode) = context->addInterfaceBlock(*(yyvsp[-5].interm.typeQualifierBuilder), (yylsp[-4]), *(yyvsp[-4].lex).string, (yyvsp[-3].interm.fieldList), (yyvsp[-1].lex).string, (yylsp[-1]), NULL, (yyloc));
>+        ES3_OR_NEWER(ImmutableString((yyvsp[-4].lex).string), (yylsp[-5]), "interface blocks");
>+        (yyval.interm.intermNode) = context->addInterfaceBlock(*(yyvsp[-5].interm.typeQualifierBuilder), (yylsp[-4]), ImmutableString((yyvsp[-4].lex).string), (yyvsp[-3].interm.fieldList), ImmutableString((yyvsp[-1].lex).string), (yylsp[-1]), NULL, (yyloc));
>     }
> 
>     break;
>@@ -3221,8 +3227,8 @@ yyreduce:
>   case 94:
> 
>     {
>-        ES3_OR_NEWER((yyvsp[-7].lex).string->c_str(), (yylsp[-8]), "interface blocks");
>-        (yyval.interm.intermNode) = context->addInterfaceBlock(*(yyvsp[-8].interm.typeQualifierBuilder), (yylsp[-7]), *(yyvsp[-7].lex).string, (yyvsp[-6].interm.fieldList), (yyvsp[-4].lex).string, (yylsp[-4]), (yyvsp[-2].interm.intermTypedNode), (yylsp[-3]));
>+        ES3_OR_NEWER(ImmutableString((yyvsp[-7].lex).string), (yylsp[-8]), "interface blocks");
>+        (yyval.interm.intermNode) = context->addInterfaceBlock(*(yyvsp[-8].interm.typeQualifierBuilder), (yylsp[-7]), ImmutableString((yyvsp[-7].lex).string), (yyvsp[-6].interm.fieldList), ImmutableString((yyvsp[-4].lex).string), (yylsp[-4]), (yyvsp[-2].interm.intermTypedNode), (yylsp[-3]));
>     }
> 
>     break;
>@@ -3239,7 +3245,7 @@ yyreduce:
>   case 96:
> 
>     {
>-        (yyval.interm.intermNode) = context->parseInvariantDeclaration(*(yyvsp[-2].interm.typeQualifierBuilder), (yylsp[-1]), (yyvsp[-1].lex).string, (yyvsp[-1].lex).symbol);
>+        (yyval.interm.intermNode) = context->parseInvariantDeclaration(*(yyvsp[-2].interm.typeQualifierBuilder), (yylsp[-1]), ImmutableString((yyvsp[-1].lex).string), (yyvsp[-1].lex).symbol);
>     }
> 
>     break;
>@@ -3276,7 +3282,7 @@ yyreduce:
>         (yyval.interm.function) = (yyvsp[-1].interm.function);
>         if ((yyvsp[0].interm.param).type->getBasicType() != EbtVoid)
>         {
>-            (yyvsp[-1].interm.function)->addParameter((yyvsp[0].interm.param).turnToConst());
>+            (yyvsp[-1].interm.function)->addParameter((yyvsp[0].interm.param).createVariable(&context->symbolTable));
>         }
>     }
> 
>@@ -3295,7 +3301,7 @@ yyreduce:
>         }
>         else
>         {
>-            (yyvsp[-2].interm.function)->addParameter((yyvsp[0].interm.param).turnToConst());
>+            (yyvsp[-2].interm.function)->addParameter((yyvsp[0].interm.param).createVariable(&context->symbolTable));
>         }
>     }
> 
>@@ -3304,7 +3310,7 @@ yyreduce:
>   case 102:
> 
>     {
>-        (yyval.interm.function) = context->parseFunctionHeader((yyvsp[-2].interm.type), (yyvsp[-1].lex).string, (yylsp[-1]));
>+        (yyval.interm.function) = context->parseFunctionHeader((yyvsp[-2].interm.type), ImmutableString((yyvsp[-1].lex).string), (yylsp[-1]));
> 
>         context->symbolTable.push();
>         context->enterFunctionDeclaration();
>@@ -3315,7 +3321,7 @@ yyreduce:
>   case 103:
> 
>     {
>-        (yyval.interm.param) = context->parseParameterDeclarator((yyvsp[-1].interm.type), (yyvsp[0].lex).string, (yylsp[0]));
>+        (yyval.interm.param) = context->parseParameterDeclarator((yyvsp[-1].interm.type), ImmutableString((yyvsp[0].lex).string), (yylsp[0]));
>     }
> 
>     break;
>@@ -3323,7 +3329,7 @@ yyreduce:
>   case 104:
> 
>     {
>-        (yyval.interm.param) = context->parseParameterArrayDeclarator((yyvsp[-1].lex).string, (yylsp[-1]), *((yyvsp[0].interm.arraySizes)), (yylsp[0]), &(yyvsp[-2].interm.type));
>+        (yyval.interm.param) = context->parseParameterArrayDeclarator(ImmutableString((yyvsp[-1].lex).string), (yylsp[-1]), *((yyvsp[0].interm.arraySizes)), (yylsp[0]), &(yyvsp[-2].interm.type));
>     }
> 
>     break;
>@@ -3385,7 +3391,7 @@ yyreduce:
> 
>     {
>         (yyval.interm) = (yyvsp[-2].interm);
>-        context->parseDeclarator((yyval.interm).type, (yylsp[0]), *(yyvsp[0].lex).string, (yyval.interm).intermDeclaration);
>+        context->parseDeclarator((yyval.interm).type, (yylsp[0]), ImmutableString((yyvsp[0].lex).string), (yyval.interm).intermDeclaration);
>     }
> 
>     break;
>@@ -3394,7 +3400,7 @@ yyreduce:
> 
>     {
>         (yyval.interm) = (yyvsp[-3].interm);
>-        context->parseArrayDeclarator((yyval.interm).type, (yylsp[-1]), *(yyvsp[-1].lex).string, (yylsp[0]), *((yyvsp[0].interm.arraySizes)), (yyval.interm).intermDeclaration);
>+        context->parseArrayDeclarator((yyval.interm).type, (yylsp[-1]), ImmutableString((yyvsp[-1].lex).string), (yylsp[0]), *((yyvsp[0].interm.arraySizes)), (yyval.interm).intermDeclaration);
>     }
> 
>     break;
>@@ -3404,7 +3410,7 @@ yyreduce:
>     {
>         ES3_OR_NEWER("=", (yylsp[-1]), "first-class arrays (array initializer)");
>         (yyval.interm) = (yyvsp[-5].interm);
>-        context->parseArrayInitDeclarator((yyval.interm).type, (yylsp[-3]), *(yyvsp[-3].lex).string, (yylsp[-2]), *((yyvsp[-2].interm.arraySizes)), (yylsp[-1]), (yyvsp[0].interm.intermTypedNode), (yyval.interm).intermDeclaration);
>+        context->parseArrayInitDeclarator((yyval.interm).type, (yylsp[-3]), ImmutableString((yyvsp[-3].lex).string), (yylsp[-2]), *((yyvsp[-2].interm.arraySizes)), (yylsp[-1]), (yyvsp[0].interm.intermTypedNode), (yyval.interm).intermDeclaration);
>     }
> 
>     break;
>@@ -3413,7 +3419,7 @@ yyreduce:
> 
>     {
>         (yyval.interm) = (yyvsp[-4].interm);
>-        context->parseInitDeclarator((yyval.interm).type, (yylsp[-2]), *(yyvsp[-2].lex).string, (yylsp[-1]), (yyvsp[0].interm.intermTypedNode), (yyval.interm).intermDeclaration);
>+        context->parseInitDeclarator((yyval.interm).type, (yylsp[-2]), ImmutableString((yyvsp[-2].lex).string), (yylsp[-1]), (yyvsp[0].interm.intermTypedNode), (yyval.interm).intermDeclaration);
>     }
> 
>     break;
>@@ -3422,7 +3428,7 @@ yyreduce:
> 
>     {
>         (yyval.interm).type = (yyvsp[0].interm.type);
>-        (yyval.interm).intermDeclaration = context->parseSingleDeclaration((yyval.interm).type, (yylsp[0]), "");
>+        (yyval.interm).intermDeclaration = context->parseSingleDeclaration((yyval.interm).type, (yylsp[0]), kEmptyImmutableString);
>     }
> 
>     break;
>@@ -3431,7 +3437,7 @@ yyreduce:
> 
>     {
>         (yyval.interm).type = (yyvsp[-1].interm.type);
>-        (yyval.interm).intermDeclaration = context->parseSingleDeclaration((yyval.interm).type, (yylsp[0]), *(yyvsp[0].lex).string);
>+        (yyval.interm).intermDeclaration = context->parseSingleDeclaration((yyval.interm).type, (yylsp[0]), ImmutableString((yyvsp[0].lex).string));
>     }
> 
>     break;
>@@ -3440,7 +3446,7 @@ yyreduce:
> 
>     {
>         (yyval.interm).type = (yyvsp[-2].interm.type);
>-        (yyval.interm).intermDeclaration = context->parseSingleArrayDeclaration((yyval.interm).type, (yylsp[-1]), *(yyvsp[-1].lex).string, (yylsp[0]), *((yyvsp[0].interm.arraySizes)));
>+        (yyval.interm).intermDeclaration = context->parseSingleArrayDeclaration((yyval.interm).type, (yylsp[-1]), ImmutableString((yyvsp[-1].lex).string), (yylsp[0]), *((yyvsp[0].interm.arraySizes)));
>     }
> 
>     break;
>@@ -3450,7 +3456,7 @@ yyreduce:
>     {
>         ES3_OR_NEWER("[]", (yylsp[-2]), "first-class arrays (array initializer)");
>         (yyval.interm).type = (yyvsp[-4].interm.type);
>-        (yyval.interm).intermDeclaration = context->parseSingleArrayInitDeclaration((yyval.interm).type, (yylsp[-3]), *(yyvsp[-3].lex).string, (yylsp[-2]), *((yyvsp[-2].interm.arraySizes)), (yylsp[-1]), (yyvsp[0].interm.intermTypedNode));
>+        (yyval.interm).intermDeclaration = context->parseSingleArrayInitDeclaration((yyval.interm).type, (yylsp[-3]), ImmutableString((yyvsp[-3].lex).string), (yylsp[-2]), *((yyvsp[-2].interm.arraySizes)), (yylsp[-1]), (yyvsp[0].interm.intermTypedNode));
>     }
> 
>     break;
>@@ -3459,7 +3465,7 @@ yyreduce:
> 
>     {
>         (yyval.interm).type = (yyvsp[-3].interm.type);
>-        (yyval.interm).intermDeclaration = context->parseSingleInitDeclaration((yyval.interm).type, (yylsp[-2]), *(yyvsp[-2].lex).string, (yylsp[-1]), (yyvsp[0].interm.intermTypedNode));
>+        (yyval.interm).intermDeclaration = context->parseSingleInitDeclaration((yyval.interm).type, (yylsp[-2]), ImmutableString((yyvsp[-2].lex).string), (yylsp[-1]), (yyvsp[0].interm.intermTypedNode));
>     }
> 
>     break;
>@@ -3728,7 +3734,7 @@ yyreduce:
>   case 151:
> 
>     {
>-        ES3_OR_NEWER_OR_MULTIVIEW("layout", (yylsp[-3]), "qualifier");
>+       ES3_OR_NEWER("layout", (yylsp[-3]), "qualifier");
>         (yyval.interm.layoutQualifier) = (yyvsp[-1].interm.layoutQualifier);
>     }
> 
>@@ -3753,7 +3759,7 @@ yyreduce:
>   case 154:
> 
>     {
>-        (yyval.interm.layoutQualifier) = context->parseLayoutQualifier(*(yyvsp[0].lex).string, (yylsp[0]));
>+        (yyval.interm.layoutQualifier) = context->parseLayoutQualifier(ImmutableString((yyvsp[0].lex).string), (yylsp[0]));
>     }
> 
>     break;
>@@ -3761,7 +3767,7 @@ yyreduce:
>   case 155:
> 
>     {
>-        (yyval.interm.layoutQualifier) = context->parseLayoutQualifier(*(yyvsp[-2].lex).string, (yylsp[-2]), (yyvsp[0].lex).i, (yylsp[0]));
>+        (yyval.interm.layoutQualifier) = context->parseLayoutQualifier(ImmutableString((yyvsp[-2].lex).string), (yylsp[-2]), (yyvsp[0].lex).i, (yylsp[0]));
>     }
> 
>     break;
>@@ -3769,7 +3775,7 @@ yyreduce:
>   case 156:
> 
>     {
>-        (yyval.interm.layoutQualifier) = context->parseLayoutQualifier(*(yyvsp[-2].lex).string, (yylsp[-2]), (yyvsp[0].lex).i, (yylsp[0]));
>+        (yyval.interm.layoutQualifier) = context->parseLayoutQualifier(ImmutableString((yyvsp[-2].lex).string), (yylsp[-2]), (yyvsp[0].lex).i, (yylsp[0]));
>     }
> 
>     break;
>@@ -3777,7 +3783,7 @@ yyreduce:
>   case 157:
> 
>     {
>-        (yyval.interm.layoutQualifier) = context->parseLayoutQualifier("shared", (yylsp[0]));
>+        (yyval.interm.layoutQualifier) = context->parseLayoutQualifier(ImmutableString("shared"), (yylsp[0]));
>     }
> 
>     break;
>@@ -4128,7 +4134,7 @@ yyreduce:
>   case 196:
> 
>     {
>-        (yyval.interm.typeSpecifierNonArray).initialize(EbtISampler2D, (yylsp[0]));
>+        (yyval.interm.typeSpecifierNonArray).initialize(EbtSampler2DMSArray, (yylsp[0]));
>     }
> 
>     break;
>@@ -4136,7 +4142,7 @@ yyreduce:
>   case 197:
> 
>     {
>-        (yyval.interm.typeSpecifierNonArray).initialize(EbtISampler3D, (yylsp[0]));
>+        (yyval.interm.typeSpecifierNonArray).initialize(EbtISampler2D, (yylsp[0]));
>     }
> 
>     break;
>@@ -4144,7 +4150,7 @@ yyreduce:
>   case 198:
> 
>     {
>-        (yyval.interm.typeSpecifierNonArray).initialize(EbtISamplerCube, (yylsp[0]));
>+        (yyval.interm.typeSpecifierNonArray).initialize(EbtISampler3D, (yylsp[0]));
>     }
> 
>     break;
>@@ -4152,7 +4158,7 @@ yyreduce:
>   case 199:
> 
>     {
>-        (yyval.interm.typeSpecifierNonArray).initialize(EbtISampler2DArray, (yylsp[0]));
>+        (yyval.interm.typeSpecifierNonArray).initialize(EbtISamplerCube, (yylsp[0]));
>     }
> 
>     break;
>@@ -4160,7 +4166,7 @@ yyreduce:
>   case 200:
> 
>     {
>-        (yyval.interm.typeSpecifierNonArray).initialize(EbtISampler2DMS, (yylsp[0]));
>+        (yyval.interm.typeSpecifierNonArray).initialize(EbtISampler2DArray, (yylsp[0]));
>     }
> 
>     break;
>@@ -4168,7 +4174,7 @@ yyreduce:
>   case 201:
> 
>     {
>-        (yyval.interm.typeSpecifierNonArray).initialize(EbtUSampler2D, (yylsp[0]));
>+        (yyval.interm.typeSpecifierNonArray).initialize(EbtISampler2DMS, (yylsp[0]));
>     }
> 
>     break;
>@@ -4176,7 +4182,7 @@ yyreduce:
>   case 202:
> 
>     {
>-        (yyval.interm.typeSpecifierNonArray).initialize(EbtUSampler3D, (yylsp[0]));
>+        (yyval.interm.typeSpecifierNonArray).initialize(EbtISampler2DMSArray, (yylsp[0]));
>     }
> 
>     break;
>@@ -4184,7 +4190,7 @@ yyreduce:
>   case 203:
> 
>     {
>-        (yyval.interm.typeSpecifierNonArray).initialize(EbtUSamplerCube, (yylsp[0]));
>+        (yyval.interm.typeSpecifierNonArray).initialize(EbtUSampler2D, (yylsp[0]));
>     }
> 
>     break;
>@@ -4192,7 +4198,7 @@ yyreduce:
>   case 204:
> 
>     {
>-        (yyval.interm.typeSpecifierNonArray).initialize(EbtUSampler2DArray, (yylsp[0]));
>+        (yyval.interm.typeSpecifierNonArray).initialize(EbtUSampler3D, (yylsp[0]));
>     }
> 
>     break;
>@@ -4200,7 +4206,7 @@ yyreduce:
>   case 205:
> 
>     {
>-        (yyval.interm.typeSpecifierNonArray).initialize(EbtUSampler2DMS, (yylsp[0]));
>+        (yyval.interm.typeSpecifierNonArray).initialize(EbtUSamplerCube, (yylsp[0]));
>     }
> 
>     break;
>@@ -4208,7 +4214,7 @@ yyreduce:
>   case 206:
> 
>     {
>-        (yyval.interm.typeSpecifierNonArray).initialize(EbtSampler2DShadow, (yylsp[0]));
>+        (yyval.interm.typeSpecifierNonArray).initialize(EbtUSampler2DArray, (yylsp[0]));
>     }
> 
>     break;
>@@ -4216,7 +4222,7 @@ yyreduce:
>   case 207:
> 
>     {
>-        (yyval.interm.typeSpecifierNonArray).initialize(EbtSamplerCubeShadow, (yylsp[0]));
>+        (yyval.interm.typeSpecifierNonArray).initialize(EbtUSampler2DMS, (yylsp[0]));
>     }
> 
>     break;
>@@ -4224,7 +4230,7 @@ yyreduce:
>   case 208:
> 
>     {
>-        (yyval.interm.typeSpecifierNonArray).initialize(EbtSampler2DArrayShadow, (yylsp[0]));
>+        (yyval.interm.typeSpecifierNonArray).initialize(EbtUSampler2DMSArray, (yylsp[0]));
>     }
> 
>     break;
>@@ -4232,14 +4238,7 @@ yyreduce:
>   case 209:
> 
>     {
>-        constexpr std::array<TExtension, 3u> extensions{ { TExtension::NV_EGL_stream_consumer_external,
>-                                                           TExtension::OES_EGL_image_external_essl3,
>-                                                           TExtension::OES_EGL_image_external } };
>-        if (!context->checkCanUseOneOfExtensions((yylsp[0]), extensions))
>-        {
>-            context->error((yylsp[0]), "unsupported type", "samplerExternalOES");
>-        }
>-        (yyval.interm.typeSpecifierNonArray).initialize(EbtSamplerExternalOES, (yylsp[0]));
>+        (yyval.interm.typeSpecifierNonArray).initialize(EbtSampler2DShadow, (yylsp[0]));
>     }
> 
>     break;
>@@ -4247,11 +4246,7 @@ yyreduce:
>   case 210:
> 
>     {
>-        if (!context->checkCanUseExtension((yylsp[0]), TExtension::EXT_YUV_target))
>-        {
>-            context->error((yylsp[0]), "unsupported type", "__samplerExternal2DY2YEXT");
>-        }
>-        (yyval.interm.typeSpecifierNonArray).initialize(EbtSamplerExternal2DY2YEXT, (yylsp[0]));
>+        (yyval.interm.typeSpecifierNonArray).initialize(EbtSamplerCubeShadow, (yylsp[0]));
>     }
> 
>     break;
>@@ -4259,11 +4254,7 @@ yyreduce:
>   case 211:
> 
>     {
>-        if (!context->checkCanUseExtension((yylsp[0]), TExtension::ARB_texture_rectangle))
>-        {
>-            context->error((yylsp[0]), "unsupported type", "sampler2DRect");
>-        }
>-        (yyval.interm.typeSpecifierNonArray).initialize(EbtSampler2DRect, (yylsp[0]));
>+        (yyval.interm.typeSpecifierNonArray).initialize(EbtSampler2DArrayShadow, (yylsp[0]));
>     }
> 
>     break;
>@@ -4271,7 +4262,14 @@ yyreduce:
>   case 212:
> 
>     {
>-        (yyval.interm.typeSpecifierNonArray) = (yyvsp[0].interm.typeSpecifierNonArray);
>+        constexpr std::array<TExtension, 3u> extensions{ { TExtension::NV_EGL_stream_consumer_external,
>+                                                           TExtension::OES_EGL_image_external_essl3,
>+                                                           TExtension::OES_EGL_image_external } };
>+        if (!context->checkCanUseOneOfExtensions((yylsp[0]), extensions))
>+        {
>+            context->error((yylsp[0]), "unsupported type", "samplerExternalOES");
>+        }
>+        (yyval.interm.typeSpecifierNonArray).initialize(EbtSamplerExternalOES, (yylsp[0]));
>     }
> 
>     break;
>@@ -4279,7 +4277,11 @@ yyreduce:
>   case 213:
> 
>     {
>-        (yyval.interm.typeSpecifierNonArray).initialize(EbtImage2D, (yylsp[0]));
>+        if (!context->checkCanUseExtension((yylsp[0]), TExtension::EXT_YUV_target))
>+        {
>+            context->error((yylsp[0]), "unsupported type", "__samplerExternal2DY2YEXT");
>+        }
>+        (yyval.interm.typeSpecifierNonArray).initialize(EbtSamplerExternal2DY2YEXT, (yylsp[0]));
>     }
> 
>     break;
>@@ -4287,7 +4289,11 @@ yyreduce:
>   case 214:
> 
>     {
>-        (yyval.interm.typeSpecifierNonArray).initialize(EbtIImage2D, (yylsp[0]));
>+        if (!context->checkCanUseExtension((yylsp[0]), TExtension::ARB_texture_rectangle))
>+        {
>+            context->error((yylsp[0]), "unsupported type", "sampler2DRect");
>+        }
>+        (yyval.interm.typeSpecifierNonArray).initialize(EbtSampler2DRect, (yylsp[0]));
>     }
> 
>     break;
>@@ -4295,7 +4301,7 @@ yyreduce:
>   case 215:
> 
>     {
>-        (yyval.interm.typeSpecifierNonArray).initialize(EbtUImage2D, (yylsp[0]));
>+        (yyval.interm.typeSpecifierNonArray).initialize(EbtImage2D, (yylsp[0]));
>     }
> 
>     break;
>@@ -4303,7 +4309,7 @@ yyreduce:
>   case 216:
> 
>     {
>-        (yyval.interm.typeSpecifierNonArray).initialize(EbtImage3D, (yylsp[0]));
>+        (yyval.interm.typeSpecifierNonArray).initialize(EbtIImage2D, (yylsp[0]));
>     }
> 
>     break;
>@@ -4311,7 +4317,7 @@ yyreduce:
>   case 217:
> 
>     {
>-        (yyval.interm.typeSpecifierNonArray).initialize(EbtIImage3D, (yylsp[0]));
>+        (yyval.interm.typeSpecifierNonArray).initialize(EbtUImage2D, (yylsp[0]));
>     }
> 
>     break;
>@@ -4319,7 +4325,7 @@ yyreduce:
>   case 218:
> 
>     {
>-        (yyval.interm.typeSpecifierNonArray).initialize(EbtUImage3D, (yylsp[0]));
>+        (yyval.interm.typeSpecifierNonArray).initialize(EbtImage3D, (yylsp[0]));
>     }
> 
>     break;
>@@ -4327,7 +4333,7 @@ yyreduce:
>   case 219:
> 
>     {
>-        (yyval.interm.typeSpecifierNonArray).initialize(EbtImage2DArray, (yylsp[0]));
>+        (yyval.interm.typeSpecifierNonArray).initialize(EbtIImage3D, (yylsp[0]));
>     }
> 
>     break;
>@@ -4335,7 +4341,7 @@ yyreduce:
>   case 220:
> 
>     {
>-        (yyval.interm.typeSpecifierNonArray).initialize(EbtIImage2DArray, (yylsp[0]));
>+        (yyval.interm.typeSpecifierNonArray).initialize(EbtUImage3D, (yylsp[0]));
>     }
> 
>     break;
>@@ -4343,7 +4349,7 @@ yyreduce:
>   case 221:
> 
>     {
>-        (yyval.interm.typeSpecifierNonArray).initialize(EbtUImage2DArray, (yylsp[0]));
>+        (yyval.interm.typeSpecifierNonArray).initialize(EbtImage2DArray, (yylsp[0]));
>     }
> 
>     break;
>@@ -4351,7 +4357,7 @@ yyreduce:
>   case 222:
> 
>     {
>-        (yyval.interm.typeSpecifierNonArray).initialize(EbtImageCube, (yylsp[0]));
>+        (yyval.interm.typeSpecifierNonArray).initialize(EbtIImage2DArray, (yylsp[0]));
>     }
> 
>     break;
>@@ -4359,7 +4365,7 @@ yyreduce:
>   case 223:
> 
>     {
>-        (yyval.interm.typeSpecifierNonArray).initialize(EbtIImageCube, (yylsp[0]));
>+        (yyval.interm.typeSpecifierNonArray).initialize(EbtUImage2DArray, (yylsp[0]));
>     }
> 
>     break;
>@@ -4367,7 +4373,7 @@ yyreduce:
>   case 224:
> 
>     {
>-        (yyval.interm.typeSpecifierNonArray).initialize(EbtUImageCube, (yylsp[0]));
>+        (yyval.interm.typeSpecifierNonArray).initialize(EbtImageCube, (yylsp[0]));
>     }
> 
>     break;
>@@ -4375,7 +4381,7 @@ yyreduce:
>   case 225:
> 
>     {
>-        (yyval.interm.typeSpecifierNonArray).initialize(EbtAtomicCounter, (yylsp[0]));
>+        (yyval.interm.typeSpecifierNonArray).initialize(EbtIImageCube, (yylsp[0]));
>     }
> 
>     break;
>@@ -4383,61 +4389,61 @@ yyreduce:
>   case 226:
> 
>     {
>-        // This is for user defined type names. The lexical phase looked up the type.
>-        TType& structure = static_cast<TVariable*>((yyvsp[0].lex).symbol)->getType();
>-        (yyval.interm.typeSpecifierNonArray).initializeStruct(structure.getStruct(), false, (yylsp[0]));
>+        (yyval.interm.typeSpecifierNonArray).initialize(EbtUImageCube, (yylsp[0]));
>     }
> 
>     break;
> 
>   case 227:
> 
>-    { context->enterStructDeclaration((yylsp[-1]), *(yyvsp[-1].lex).string); }
>+    {
>+        (yyval.interm.typeSpecifierNonArray).initialize(EbtAtomicCounter, (yylsp[0]));
>+    }
> 
>     break;
> 
>   case 228:
> 
>     {
>-        (yyval.interm.typeSpecifierNonArray) = context->addStructure((yylsp[-5]), (yylsp[-4]), (yyvsp[-4].lex).string, (yyvsp[-1].interm.fieldList));
>+        (yyval.interm.typeSpecifierNonArray) = (yyvsp[0].interm.typeSpecifierNonArray);
>     }
> 
>     break;
> 
>   case 229:
> 
>-    { context->enterStructDeclaration((yylsp[0]), *(yyvsp[0].lex).string); }
>+    {
>+        // This is for user defined type names. The lexical phase looked up the type.
>+        const TStructure *structure = static_cast<const TStructure*>((yyvsp[0].lex).symbol);
>+        (yyval.interm.typeSpecifierNonArray).initializeStruct(structure, false, (yylsp[0]));
>+    }
> 
>     break;
> 
>   case 230:
> 
>-    {
>-        (yyval.interm.typeSpecifierNonArray) = context->addStructure((yylsp[-4]), (yyloc), NewPoolTString(""), (yyvsp[-1].interm.fieldList));
>-    }
>+    { context->enterStructDeclaration((yylsp[-1]), ImmutableString((yyvsp[-1].lex).string)); }
> 
>     break;
> 
>   case 231:
> 
>     {
>-        (yyval.interm.fieldList) = context->addStructFieldList((yyvsp[0].interm.fieldList), (yylsp[0]));
>+        (yyval.interm.typeSpecifierNonArray) = context->addStructure((yylsp[-5]), (yylsp[-4]), ImmutableString((yyvsp[-4].lex).string), (yyvsp[-1].interm.fieldList));
>     }
> 
>     break;
> 
>   case 232:
> 
>-    {
>-        (yyval.interm.fieldList) = context->combineStructFieldLists((yyvsp[-1].interm.fieldList), (yyvsp[0].interm.fieldList), (yylsp[0]));
>-    }
>+    { context->enterStructDeclaration((yylsp[0]), kEmptyImmutableString); }
> 
>     break;
> 
>   case 233:
> 
>     {
>-        (yyval.interm.fieldList) = context->addStructDeclaratorList((yyvsp[-2].interm.type), (yyvsp[-1].interm.fieldList));
>+        (yyval.interm.typeSpecifierNonArray) = context->addStructure((yylsp[-4]), (yyloc), kEmptyImmutableString, (yyvsp[-1].interm.fieldList));
>     }
> 
>     break;
>@@ -4445,8 +4451,7 @@ yyreduce:
>   case 234:
> 
>     {
>-        // ES3 Only, but errors should be handled elsewhere
>-        (yyval.interm.fieldList) = context->addStructDeclaratorListWithQualifiers(*(yyvsp[-3].interm.typeQualifierBuilder), &(yyvsp[-2].interm.type), (yyvsp[-1].interm.fieldList));
>+        (yyval.interm.fieldList) = context->addStructFieldList((yyvsp[0].interm.fieldList), (yylsp[0]));
>     }
> 
>     break;
>@@ -4454,8 +4459,7 @@ yyreduce:
>   case 235:
> 
>     {
>-        (yyval.interm.fieldList) = NewPoolTFieldList();
>-        (yyval.interm.fieldList)->push_back((yyvsp[0].interm.field));
>+        (yyval.interm.fieldList) = context->combineStructFieldLists((yyvsp[-1].interm.fieldList), (yyvsp[0].interm.fieldList), (yylsp[0]));
>     }
> 
>     break;
>@@ -4463,7 +4467,7 @@ yyreduce:
>   case 236:
> 
>     {
>-        (yyval.interm.fieldList)->push_back((yyvsp[0].interm.field));
>+        (yyval.interm.fieldList) = context->addStructDeclaratorList((yyvsp[-2].interm.type), (yyvsp[-1].interm.declaratorList));
>     }
> 
>     break;
>@@ -4471,7 +4475,8 @@ yyreduce:
>   case 237:
> 
>     {
>-        (yyval.interm.field) = context->parseStructDeclarator((yyvsp[0].lex).string, (yylsp[0]));
>+        // ES3 Only, but errors should be handled elsewhere
>+        (yyval.interm.fieldList) = context->addStructDeclaratorListWithQualifiers(*(yyvsp[-3].interm.typeQualifierBuilder), &(yyvsp[-2].interm.type), (yyvsp[-1].interm.declaratorList));
>     }
> 
>     break;
>@@ -4479,32 +4484,39 @@ yyreduce:
>   case 238:
> 
>     {
>-        (yyval.interm.field) = context->parseStructArrayDeclarator((yyvsp[-1].lex).string, (yylsp[-1]), *((yyvsp[0].interm.arraySizes)), (yylsp[0]));
>+        (yyval.interm.declaratorList) = new TDeclaratorList();
>+        (yyval.interm.declaratorList)->push_back((yyvsp[0].interm.declarator));
>     }
> 
>     break;
> 
>   case 239:
> 
>-    { (yyval.interm.intermTypedNode) = (yyvsp[0].interm.intermTypedNode); }
>+    {
>+        (yyval.interm.declaratorList)->push_back((yyvsp[0].interm.declarator));
>+    }
> 
>     break;
> 
>   case 240:
> 
>-    { (yyval.interm.intermNode) = (yyvsp[0].interm.intermNode); }
>+    {
>+        (yyval.interm.declarator) = context->parseStructDeclarator(ImmutableString((yyvsp[0].lex).string), (yylsp[0]));
>+    }
> 
>     break;
> 
>   case 241:
> 
>-    { (yyval.interm.intermNode) = (yyvsp[0].interm.intermBlock); }
>+    {
>+        (yyval.interm.declarator) = context->parseStructArrayDeclarator(ImmutableString((yyvsp[-1].lex).string), (yylsp[-1]), (yyvsp[0].interm.arraySizes));
>+    }
> 
>     break;
> 
>   case 242:
> 
>-    { (yyval.interm.intermNode) = (yyvsp[0].interm.intermNode); }
>+    { (yyval.interm.intermTypedNode) = (yyvsp[0].interm.intermTypedNode); }
> 
>     break;
> 
>@@ -4516,7 +4528,7 @@ yyreduce:
> 
>   case 244:
> 
>-    { (yyval.interm.intermNode) = (yyvsp[0].interm.intermNode); }
>+    { (yyval.interm.intermNode) = (yyvsp[0].interm.intermBlock); }
> 
>     break;
> 
>@@ -4528,13 +4540,13 @@ yyreduce:
> 
>   case 246:
> 
>-    { (yyval.interm.intermNode) = (yyvsp[0].interm.intermSwitch); }
>+    { (yyval.interm.intermNode) = (yyvsp[0].interm.intermNode); }
> 
>     break;
> 
>   case 247:
> 
>-    { (yyval.interm.intermNode) = (yyvsp[0].interm.intermCase); }
>+    { (yyval.interm.intermNode) = (yyvsp[0].interm.intermNode); }
> 
>     break;
> 
>@@ -4546,12 +4558,30 @@ yyreduce:
> 
>   case 249:
> 
>-    { (yyval.interm.intermNode) = (yyvsp[0].interm.intermNode); }
>+    { (yyval.interm.intermNode) = (yyvsp[0].interm.intermSwitch); }
> 
>     break;
> 
>   case 250:
> 
>+    { (yyval.interm.intermNode) = (yyvsp[0].interm.intermCase); }
>+
>+    break;
>+
>+  case 251:
>+
>+    { (yyval.interm.intermNode) = (yyvsp[0].interm.intermNode); }
>+
>+    break;
>+
>+  case 252:
>+
>+    { (yyval.interm.intermNode) = (yyvsp[0].interm.intermNode); }
>+
>+    break;
>+
>+  case 253:
>+
>     {
>         (yyval.interm.intermBlock) = new TIntermBlock();
>         (yyval.interm.intermBlock)->setLine((yyloc));
>@@ -4559,19 +4589,19 @@ yyreduce:
> 
>     break;
> 
>-  case 251:
>+  case 254:
> 
>     { context->symbolTable.push(); }
> 
>     break;
> 
>-  case 252:
>+  case 255:
> 
>     { context->symbolTable.pop(); }
> 
>     break;
> 
>-  case 253:
>+  case 256:
> 
>     {
>         (yyvsp[-2].interm.intermBlock)->setLine((yyloc));
>@@ -4580,43 +4610,43 @@ yyreduce:
> 
>     break;
> 
>-  case 254:
>+  case 257:
> 
>     { (yyval.interm.intermNode) = (yyvsp[0].interm.intermBlock); }
> 
>     break;
> 
>-  case 255:
>+  case 258:
> 
>     { (yyval.interm.intermNode) = (yyvsp[0].interm.intermNode); }
> 
>     break;
> 
>-  case 256:
>+  case 259:
> 
>     { context->symbolTable.push(); }
> 
>     break;
> 
>-  case 257:
>+  case 260:
> 
>     { context->symbolTable.pop(); (yyval.interm.intermNode) = (yyvsp[0].interm.intermBlock); }
> 
>     break;
> 
>-  case 258:
>+  case 261:
> 
>     { context->symbolTable.push(); }
> 
>     break;
> 
>-  case 259:
>+  case 262:
> 
>     { context->symbolTable.pop(); (yyval.interm.intermNode) = (yyvsp[0].interm.intermNode); }
> 
>     break;
> 
>-  case 260:
>+  case 263:
> 
>     {
>         (yyval.interm.intermBlock) = new TIntermBlock();
>@@ -4625,7 +4655,7 @@ yyreduce:
> 
>     break;
> 
>-  case 261:
>+  case 264:
> 
>     {
>         (yyvsp[-1].interm.intermBlock)->setLine((yyloc));
>@@ -4634,37 +4664,37 @@ yyreduce:
> 
>     break;
> 
>-  case 262:
>+  case 265:
> 
>     {
>         (yyval.interm.intermBlock) = new TIntermBlock();
>-        (yyval.interm.intermBlock)->appendStatement((yyvsp[0].interm.intermNode));
>+        context->appendStatement((yyval.interm.intermBlock), (yyvsp[0].interm.intermNode));
>     }
> 
>     break;
> 
>-  case 263:
>+  case 266:
> 
>     {
>         (yyval.interm.intermBlock) = (yyvsp[-1].interm.intermBlock);
>-        (yyval.interm.intermBlock)->appendStatement((yyvsp[0].interm.intermNode));
>+        context->appendStatement((yyval.interm.intermBlock), (yyvsp[0].interm.intermNode));
>     }
> 
>     break;
> 
>-  case 264:
>+  case 267:
> 
>     { (yyval.interm.intermNode) = context->addEmptyStatement((yyloc)); }
> 
>     break;
> 
>-  case 265:
>+  case 268:
> 
>     { (yyval.interm.intermNode) = (yyvsp[-1].interm.intermTypedNode); }
> 
>     break;
> 
>-  case 266:
>+  case 269:
> 
>     {
>         (yyval.interm.intermNode) = context->addIfElse((yyvsp[-2].interm.intermTypedNode), (yyvsp[0].interm.nodePair), (yylsp[-4]));
>@@ -4672,7 +4702,7 @@ yyreduce:
> 
>     break;
> 
>-  case 267:
>+  case 270:
> 
>     {
>         (yyval.interm.nodePair).node1 = (yyvsp[-2].interm.intermNode);
>@@ -4681,7 +4711,7 @@ yyreduce:
> 
>     break;
> 
>-  case 268:
>+  case 271:
> 
>     {
>         (yyval.interm.nodePair).node1 = (yyvsp[0].interm.intermNode);
>@@ -4690,13 +4720,13 @@ yyreduce:
> 
>     break;
> 
>-  case 269:
>+  case 272:
> 
>     { context->incrSwitchNestingLevel(); }
> 
>     break;
> 
>-  case 270:
>+  case 273:
> 
>     {
>         (yyval.interm.intermSwitch) = context->addSwitch((yyvsp[-3].interm.intermTypedNode), (yyvsp[0].interm.intermBlock), (yylsp[-5]));
>@@ -4705,7 +4735,7 @@ yyreduce:
> 
>     break;
> 
>-  case 271:
>+  case 274:
> 
>     {
>         (yyval.interm.intermCase) = context->addCase((yyvsp[-1].interm.intermTypedNode), (yylsp[-2]));
>@@ -4713,7 +4743,7 @@ yyreduce:
> 
>     break;
> 
>-  case 272:
>+  case 275:
> 
>     {
>         (yyval.interm.intermCase) = context->addDefault((yylsp[-1]));
>@@ -4721,7 +4751,7 @@ yyreduce:
> 
>     break;
> 
>-  case 273:
>+  case 276:
> 
>     {
>         (yyval.interm.intermNode) = (yyvsp[0].interm.intermTypedNode);
>@@ -4730,21 +4760,21 @@ yyreduce:
> 
>     break;
> 
>-  case 274:
>+  case 277:
> 
>     {
>-        (yyval.interm.intermNode) = context->addConditionInitializer((yyvsp[-3].interm.type), *(yyvsp[-2].lex).string, (yyvsp[0].interm.intermTypedNode), (yylsp[-2]));
>+        (yyval.interm.intermNode) = context->addConditionInitializer((yyvsp[-3].interm.type), ImmutableString((yyvsp[-2].lex).string), (yyvsp[0].interm.intermTypedNode), (yylsp[-2]));
>     }
> 
>     break;
> 
>-  case 275:
>+  case 278:
> 
>     { context->symbolTable.push(); context->incrLoopNestingLevel(); }
> 
>     break;
> 
>-  case 276:
>+  case 279:
> 
>     {
>         context->symbolTable.pop();
>@@ -4754,13 +4784,13 @@ yyreduce:
> 
>     break;
> 
>-  case 277:
>+  case 280:
> 
>     { context->incrLoopNestingLevel(); }
> 
>     break;
> 
>-  case 278:
>+  case 281:
> 
>     {
>         (yyval.interm.intermNode) = context->addLoop(ELoopDoWhile, 0, (yyvsp[-2].interm.intermTypedNode), 0, (yyvsp[-5].interm.intermNode), (yylsp[-4]));
>@@ -4769,13 +4799,13 @@ yyreduce:
> 
>     break;
> 
>-  case 279:
>+  case 282:
> 
>     { context->symbolTable.push(); context->incrLoopNestingLevel(); }
> 
>     break;
> 
>-  case 280:
>+  case 283:
> 
>     {
>         context->symbolTable.pop();
>@@ -4785,7 +4815,7 @@ yyreduce:
> 
>     break;
> 
>-  case 281:
>+  case 284:
> 
>     {
>         (yyval.interm.intermNode) = (yyvsp[0].interm.intermNode);
>@@ -4793,7 +4823,7 @@ yyreduce:
> 
>     break;
> 
>-  case 282:
>+  case 285:
> 
>     {
>         (yyval.interm.intermNode) = (yyvsp[0].interm.intermNode);
>@@ -4801,7 +4831,7 @@ yyreduce:
> 
>     break;
> 
>-  case 283:
>+  case 286:
> 
>     {
>         (yyval.interm.intermNode) = (yyvsp[0].interm.intermNode);
>@@ -4809,7 +4839,7 @@ yyreduce:
> 
>     break;
> 
>-  case 284:
>+  case 287:
> 
>     {
>         (yyval.interm.intermNode) = nullptr;
>@@ -4817,7 +4847,7 @@ yyreduce:
> 
>     break;
> 
>-  case 285:
>+  case 288:
> 
>     {
>         (yyval.interm.nodePair).node1 = (yyvsp[-1].interm.intermNode);
>@@ -4826,7 +4856,7 @@ yyreduce:
> 
>     break;
> 
>-  case 286:
>+  case 289:
> 
>     {
>         (yyval.interm.nodePair).node1 = (yyvsp[-2].interm.intermNode);
>@@ -4835,7 +4865,7 @@ yyreduce:
> 
>     break;
> 
>-  case 287:
>+  case 290:
> 
>     {
>         (yyval.interm.intermNode) = context->addBranch(EOpContinue, (yylsp[-1]));
>@@ -4843,7 +4873,7 @@ yyreduce:
> 
>     break;
> 
>-  case 288:
>+  case 291:
> 
>     {
>         (yyval.interm.intermNode) = context->addBranch(EOpBreak, (yylsp[-1]));
>@@ -4851,7 +4881,7 @@ yyreduce:
> 
>     break;
> 
>-  case 289:
>+  case 292:
> 
>     {
>         (yyval.interm.intermNode) = context->addBranch(EOpReturn, (yylsp[-1]));
>@@ -4859,7 +4889,7 @@ yyreduce:
> 
>     break;
> 
>-  case 290:
>+  case 293:
> 
>     {
>         (yyval.interm.intermNode) = context->addBranch(EOpReturn, (yyvsp[-1].interm.intermTypedNode), (yylsp[-2]));
>@@ -4867,7 +4897,7 @@ yyreduce:
> 
>     break;
> 
>-  case 291:
>+  case 294:
> 
>     {
>         (yyval.interm.intermNode) = context->addBranch(EOpKill, (yylsp[-1]));
>@@ -4875,7 +4905,7 @@ yyreduce:
> 
>     break;
> 
>-  case 292:
>+  case 295:
> 
>     {
>         (yyval.interm.intermBlock) = new TIntermBlock();
>@@ -4886,7 +4916,7 @@ yyreduce:
> 
>     break;
> 
>-  case 293:
>+  case 296:
> 
>     {
>         (yyval.interm.intermBlock)->appendStatement((yyvsp[0].interm.intermNode));
>@@ -4894,7 +4924,7 @@ yyreduce:
> 
>     break;
> 
>-  case 294:
>+  case 297:
> 
>     {
>         (yyval.interm.intermNode) = (yyvsp[0].interm.intermNode);
>@@ -4902,7 +4932,7 @@ yyreduce:
> 
>     break;
> 
>-  case 295:
>+  case 298:
> 
>     {
>         (yyval.interm.intermNode) = (yyvsp[0].interm.intermNode);
>@@ -4910,15 +4940,15 @@ yyreduce:
> 
>     break;
> 
>-  case 296:
>+  case 299:
> 
>     {
>-        context->parseFunctionDefinitionHeader((yylsp[0]), &((yyvsp[0].interm).function), &((yyvsp[0].interm).intermFunctionPrototype));
>+        context->parseFunctionDefinitionHeader((yylsp[0]), (yyvsp[0].interm).function, &((yyvsp[0].interm).intermFunctionPrototype));
>     }
> 
>     break;
> 
>-  case 297:
>+  case 300:
> 
>     {
>         (yyval.interm.intermNode) = context->addFunctionDefinition((yyvsp[-2].interm).intermFunctionPrototype, (yyvsp[0].interm.intermBlock), (yylsp[-2]));
>@@ -5168,3 +5198,4 @@ yyreturn:
> int glslang_parse(TParseContext* context) {
>     return yyparse(context, context->getScanner());
> }
>+ 
>\ No newline at end of file
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/glslang_tab.h b/Source/ThirdParty/ANGLE/src/compiler/translator/glslang_tab.h
>index cb43a46dfb5..e05076fcb5e 100644
>--- a/Source/ThirdParty/ANGLE/src/compiler/translator/glslang_tab.h
>+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/glslang_tab.h
>@@ -1,7 +1,5 @@
> /* A Bison parser, made by GNU Bison 3.0.4.  */
> 
>-/* Apple Note: For the avoidance of doubt, Apple elects to distribute this file under the terms of the BSD license. */
>-
> /* Bison interface for Yacc-like parsers in C
> 
>    Copyright (C) 1984, 1989-1990, 2000-2015 Free Software Foundation, Inc.
>@@ -33,25 +31,22 @@
>    version 2.2 of Bison.  */
> 
> #ifndef YY_YY_GLSLANG_TAB_H_INCLUDED
>-# define YY_YY_GLSLANG_TAB_H_INCLUDED
>+#define YY_YY_GLSLANG_TAB_H_INCLUDED
> /* Debug traces.  */
> #ifndef YYDEBUG
>-# define YYDEBUG 0
>+#    define YYDEBUG 0
> #endif
> #if YYDEBUG
> extern int yydebug;
> #endif
> /* "%code requires" blocks.  */
> 
>-
> #define YYLTYPE TSourceLoc
> #define YYLTYPE_IS_DECLARED 1
> 
>-
>-
> /* Token type.  */
> #ifndef YYTOKENTYPE
>-# define YYTOKENTYPE
>+#    define YYTOKENTYPE
> enum yytokentype
> {
>     INVARIANT                 = 258,
>@@ -131,106 +126,111 @@ enum yytokentype
>     SAMPLER2DMS               = 332,
>     ISAMPLER2DMS              = 333,
>     USAMPLER2DMS              = 334,
>-    SAMPLER3D                 = 335,
>-    SAMPLER3DRECT             = 336,
>-    SAMPLER2DSHADOW           = 337,
>-    SAMPLERCUBESHADOW         = 338,
>-    SAMPLER2DARRAYSHADOW      = 339,
>-    SAMPLEREXTERNAL2DY2YEXT   = 340,
>-    IMAGE2D                   = 341,
>-    IIMAGE2D                  = 342,
>-    UIMAGE2D                  = 343,
>-    IMAGE3D                   = 344,
>-    IIMAGE3D                  = 345,
>-    UIMAGE3D                  = 346,
>-    IMAGE2DARRAY              = 347,
>-    IIMAGE2DARRAY             = 348,
>-    UIMAGE2DARRAY             = 349,
>-    IMAGECUBE                 = 350,
>-    IIMAGECUBE                = 351,
>-    UIMAGECUBE                = 352,
>-    ATOMICUINT                = 353,
>-    LAYOUT                    = 354,
>-    YUVCSCSTANDARDEXT         = 355,
>-    YUVCSCSTANDARDEXTCONSTANT = 356,
>-    IDENTIFIER                = 357,
>-    TYPE_NAME                 = 358,
>-    FLOATCONSTANT             = 359,
>-    INTCONSTANT               = 360,
>-    UINTCONSTANT              = 361,
>-    BOOLCONSTANT              = 362,
>-    FIELD_SELECTION           = 363,
>-    LEFT_OP                   = 364,
>-    RIGHT_OP                  = 365,
>-    INC_OP                    = 366,
>-    DEC_OP                    = 367,
>-    LE_OP                     = 368,
>-    GE_OP                     = 369,
>-    EQ_OP                     = 370,
>-    NE_OP                     = 371,
>-    AND_OP                    = 372,
>-    OR_OP                     = 373,
>-    XOR_OP                    = 374,
>-    MUL_ASSIGN                = 375,
>-    DIV_ASSIGN                = 376,
>-    ADD_ASSIGN                = 377,
>-    MOD_ASSIGN                = 378,
>-    LEFT_ASSIGN               = 379,
>-    RIGHT_ASSIGN              = 380,
>-    AND_ASSIGN                = 381,
>-    XOR_ASSIGN                = 382,
>-    OR_ASSIGN                 = 383,
>-    SUB_ASSIGN                = 384,
>-    LEFT_PAREN                = 385,
>-    RIGHT_PAREN               = 386,
>-    LEFT_BRACKET              = 387,
>-    RIGHT_BRACKET             = 388,
>-    LEFT_BRACE                = 389,
>-    RIGHT_BRACE               = 390,
>-    DOT                       = 391,
>-    COMMA                     = 392,
>-    COLON                     = 393,
>-    EQUAL                     = 394,
>-    SEMICOLON                 = 395,
>-    BANG                      = 396,
>-    DASH                      = 397,
>-    TILDE                     = 398,
>-    PLUS                      = 399,
>-    STAR                      = 400,
>-    SLASH                     = 401,
>-    PERCENT                   = 402,
>-    LEFT_ANGLE                = 403,
>-    RIGHT_ANGLE               = 404,
>-    VERTICAL_BAR              = 405,
>-    CARET                     = 406,
>-    AMPERSAND                 = 407,
>-    QUESTION                  = 408
>+    SAMPLER2DMSARRAY          = 335,
>+    ISAMPLER2DMSARRAY         = 336,
>+    USAMPLER2DMSARRAY         = 337,
>+    SAMPLER3D                 = 338,
>+    SAMPLER3DRECT             = 339,
>+    SAMPLER2DSHADOW           = 340,
>+    SAMPLERCUBESHADOW         = 341,
>+    SAMPLER2DARRAYSHADOW      = 342,
>+    SAMPLEREXTERNAL2DY2YEXT   = 343,
>+    IMAGE2D                   = 344,
>+    IIMAGE2D                  = 345,
>+    UIMAGE2D                  = 346,
>+    IMAGE3D                   = 347,
>+    IIMAGE3D                  = 348,
>+    UIMAGE3D                  = 349,
>+    IMAGE2DARRAY              = 350,
>+    IIMAGE2DARRAY             = 351,
>+    UIMAGE2DARRAY             = 352,
>+    IMAGECUBE                 = 353,
>+    IIMAGECUBE                = 354,
>+    UIMAGECUBE                = 355,
>+    ATOMICUINT                = 356,
>+    LAYOUT                    = 357,
>+    YUVCSCSTANDARDEXT         = 358,
>+    YUVCSCSTANDARDEXTCONSTANT = 359,
>+    IDENTIFIER                = 360,
>+    TYPE_NAME                 = 361,
>+    FLOATCONSTANT             = 362,
>+    INTCONSTANT               = 363,
>+    UINTCONSTANT              = 364,
>+    BOOLCONSTANT              = 365,
>+    FIELD_SELECTION           = 366,
>+    LEFT_OP                   = 367,
>+    RIGHT_OP                  = 368,
>+    INC_OP                    = 369,
>+    DEC_OP                    = 370,
>+    LE_OP                     = 371,
>+    GE_OP                     = 372,
>+    EQ_OP                     = 373,
>+    NE_OP                     = 374,
>+    AND_OP                    = 375,
>+    OR_OP                     = 376,
>+    XOR_OP                    = 377,
>+    MUL_ASSIGN                = 378,
>+    DIV_ASSIGN                = 379,
>+    ADD_ASSIGN                = 380,
>+    MOD_ASSIGN                = 381,
>+    LEFT_ASSIGN               = 382,
>+    RIGHT_ASSIGN              = 383,
>+    AND_ASSIGN                = 384,
>+    XOR_ASSIGN                = 385,
>+    OR_ASSIGN                 = 386,
>+    SUB_ASSIGN                = 387,
>+    LEFT_PAREN                = 388,
>+    RIGHT_PAREN               = 389,
>+    LEFT_BRACKET              = 390,
>+    RIGHT_BRACKET             = 391,
>+    LEFT_BRACE                = 392,
>+    RIGHT_BRACE               = 393,
>+    DOT                       = 394,
>+    COMMA                     = 395,
>+    COLON                     = 396,
>+    EQUAL                     = 397,
>+    SEMICOLON                 = 398,
>+    BANG                      = 399,
>+    DASH                      = 400,
>+    TILDE                     = 401,
>+    PLUS                      = 402,
>+    STAR                      = 403,
>+    SLASH                     = 404,
>+    PERCENT                   = 405,
>+    LEFT_ANGLE                = 406,
>+    RIGHT_ANGLE               = 407,
>+    VERTICAL_BAR              = 408,
>+    CARET                     = 409,
>+    AMPERSAND                 = 410,
>+    QUESTION                  = 411
> };
> #endif
> 
> /* Value type.  */
>-#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
>+#if !defined YYSTYPE && !defined YYSTYPE_IS_DECLARED
> 
> union YYSTYPE
> {
> 
>-
>-    struct {
>-        union {
>-            TString *string;
>+    struct
>+    {
>+        union
>+        {
>+            const char *string;  // pool allocated.
>             float f;
>             int i;
>             unsigned int u;
>             bool b;
>         };
>-        TSymbol* symbol;
>+        const TSymbol *symbol;
>     } lex;
>-    struct {
>+    struct
>+    {
>         TOperator op;
>-        union {
>+        union
>+        {
>             TIntermNode *intermNode;
>             TIntermNodePair nodePair;
>-            TIntermFunctionCallOrMethod callOrMethodPair;
>             TIntermTyped *intermTypedNode;
>             TIntermAggregate *intermAggregate;
>             TIntermBlock *intermBlock;
>@@ -239,7 +239,8 @@ union YYSTYPE
>             TIntermSwitch *intermSwitch;
>             TIntermCase *intermCase;
>         };
>-        union {
>+        union
>+        {
>             TVector<unsigned int> *arraySizes;
>             TTypeSpecifierNonArray typeSpecifierNonArray;
>             TPublicType type;
>@@ -247,38 +248,36 @@ union YYSTYPE
>             TLayoutQualifier layoutQualifier;
>             TQualifier qualifier;
>             TFunction *function;
>+            TFunctionLookup *functionLookup;
>             TParameter param;
>-            TField *field;
>+            TDeclarator *declarator;
>+            TDeclaratorList *declaratorList;
>             TFieldList *fieldList;
>             TQualifierWrapperBase *qualifierWrapper;
>             TTypeQualifierBuilder *typeQualifierBuilder;
>         };
>     } interm;
>-
>-
> };
> 
> typedef union YYSTYPE YYSTYPE;
>-# define YYSTYPE_IS_TRIVIAL 1
>-# define YYSTYPE_IS_DECLARED 1
>+#    define YYSTYPE_IS_TRIVIAL 1
>+#    define YYSTYPE_IS_DECLARED 1
> #endif
> 
> /* Location type.  */
>-#if ! defined YYLTYPE && ! defined YYLTYPE_IS_DECLARED
>+#if !defined YYLTYPE && !defined YYLTYPE_IS_DECLARED
> typedef struct YYLTYPE YYLTYPE;
> struct YYLTYPE
> {
>-  int first_line;
>-  int first_column;
>-  int last_line;
>-  int last_column;
>+    int first_line;
>+    int first_column;
>+    int last_line;
>+    int last_column;
> };
>-# define YYLTYPE_IS_DECLARED 1
>-# define YYLTYPE_IS_TRIVIAL 1
>+#    define YYLTYPE_IS_DECLARED 1
>+#    define YYLTYPE_IS_TRIVIAL 1
> #endif
> 
>-
>-
>-int yyparse (TParseContext* context, void *scanner);
>+int yyparse(TParseContext *context, void *scanner);
> 
> #endif /* !YY_YY_GLSLANG_TAB_H_INCLUDED  */
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/AddAndTrueToLoopCondition.cpp b/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/AddAndTrueToLoopCondition.cpp
>new file mode 100644
>index 00000000000..25a52983a30
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/AddAndTrueToLoopCondition.cpp
>@@ -0,0 +1,58 @@
>+//
>+// Copyright (c) 2016 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+
>+#include "compiler/translator/tree_ops/AddAndTrueToLoopCondition.h"
>+
>+#include "compiler/translator/tree_util/IntermNode_util.h"
>+#include "compiler/translator/tree_util/IntermTraverse.h"
>+
>+namespace sh
>+{
>+
>+namespace
>+{
>+
>+// An AST traverser that rewrites for and while loops by replacing "condition" with
>+// "condition && true" to work around condition bug on Intel Mac.
>+class AddAndTrueToLoopConditionTraverser : public TIntermTraverser
>+{
>+  public:
>+    AddAndTrueToLoopConditionTraverser() : TIntermTraverser(true, false, false) {}
>+
>+    bool visitLoop(Visit, TIntermLoop *loop) override
>+    {
>+        // do-while loop doesn't have this bug.
>+        if (loop->getType() != ELoopFor && loop->getType() != ELoopWhile)
>+        {
>+            return true;
>+        }
>+
>+        // For loop may not have a condition.
>+        if (loop->getCondition() == nullptr)
>+        {
>+            return true;
>+        }
>+
>+        // Constant true.
>+        TIntermTyped *trueValue = CreateBoolNode(true);
>+
>+        // CONDITION && true.
>+        TIntermBinary *andOp = new TIntermBinary(EOpLogicalAnd, loop->getCondition(), trueValue);
>+        loop->setCondition(andOp);
>+
>+        return true;
>+    }
>+};
>+
>+}  // anonymous namespace
>+
>+void AddAndTrueToLoopCondition(TIntermNode *root)
>+{
>+    AddAndTrueToLoopConditionTraverser traverser;
>+    root->traverse(&traverser);
>+}
>+
>+}  // namespace sh
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/AddAndTrueToLoopCondition.h b/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/AddAndTrueToLoopCondition.h
>new file mode 100644
>index 00000000000..3a9efc2133e
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/AddAndTrueToLoopCondition.h
>@@ -0,0 +1,20 @@
>+//
>+// Copyright (c) 2016 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+
>+// Rewrite condition in for and while loops to work around driver bug on Intel Mac.
>+
>+#ifndef COMPILER_TRANSLATOR_TREEOPS_ADDANDTRUETOLOOPCONDITION_H_
>+#define COMPILER_TRANSLATOR_TREEOPS_ADDANDTRUETOLOOPCONDITION_H_
>+
>+class TIntermNode;
>+namespace sh
>+{
>+
>+void AddAndTrueToLoopCondition(TIntermNode *root);
>+
>+}  // namespace sh
>+
>+#endif  // COMPILER_TRANSLATOR_TREEOPS_ADDANDTRUETOLOOPCONDITION_H_
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/AddDefaultReturnStatements.cpp b/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/AddDefaultReturnStatements.cpp
>new file mode 100644
>index 00000000000..636ce375067
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/AddDefaultReturnStatements.cpp
>@@ -0,0 +1,58 @@
>+//
>+// Copyright (c) 2016 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// AddDefaultReturnStatements.cpp: Add default return statements to functions that do not end in a
>+//                                 return.
>+//
>+
>+#include "compiler/translator/tree_ops/AddDefaultReturnStatements.h"
>+
>+#include "compiler/translator/IntermNode.h"
>+#include "compiler/translator/tree_util/IntermNode_util.h"
>+#include "compiler/translator/util.h"
>+
>+namespace sh
>+{
>+
>+namespace
>+{
>+
>+bool NeedsReturnStatement(TIntermFunctionDefinition *node, TType *returnType)
>+{
>+    *returnType = node->getFunctionPrototype()->getType();
>+    if (returnType->getBasicType() == EbtVoid)
>+    {
>+        return false;
>+    }
>+
>+    TIntermBlock *bodyNode    = node->getBody();
>+    TIntermBranch *returnNode = bodyNode->getSequence()->back()->getAsBranchNode();
>+    if (returnNode != nullptr && returnNode->getFlowOp() == EOpReturn)
>+    {
>+        return false;
>+    }
>+
>+    return true;
>+}
>+
>+}  // anonymous namespace
>+
>+void AddDefaultReturnStatements(TIntermBlock *root)
>+{
>+    TType returnType;
>+    for (TIntermNode *node : *root->getSequence())
>+    {
>+        TIntermFunctionDefinition *definition = node->getAsFunctionDefinition();
>+        if (definition != nullptr && NeedsReturnStatement(definition, &returnType))
>+        {
>+            TIntermBranch *branch = new TIntermBranch(EOpReturn, CreateZeroNode(returnType));
>+
>+            TIntermBlock *bodyNode = definition->getBody();
>+            bodyNode->getSequence()->push_back(branch);
>+        }
>+    }
>+}
>+
>+}  // namespace sh
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/AddDefaultReturnStatements.h b/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/AddDefaultReturnStatements.h
>new file mode 100644
>index 00000000000..6d537978f55
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/AddDefaultReturnStatements.h
>@@ -0,0 +1,22 @@
>+//
>+// Copyright (c) 2016 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// AddDefaultReturnStatements.h: Add default return statements to functions that do not end in a
>+//                               return.
>+//
>+
>+#ifndef COMPILER_TRANSLATOR_TREEOPS_ADDDEFAULTRETURNSTATEMENTS_H_
>+#define COMPILER_TRANSLATOR_TREEOPS_ADDDEFAULTRETURNSTATEMENTS_H_
>+
>+class TIntermBlock;
>+
>+namespace sh
>+{
>+
>+void AddDefaultReturnStatements(TIntermBlock *root);
>+
>+}  // namespace sh
>+
>+#endif  // COMPILER_TRANSLATOR_TREEOPS_ADDDEFAULTRETURNSTATEMENTS_H_
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/ArrayReturnValueToOutParameter.cpp b/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/ArrayReturnValueToOutParameter.cpp
>new file mode 100644
>index 00000000000..824908b0e6f
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/ArrayReturnValueToOutParameter.cpp
>@@ -0,0 +1,228 @@
>+//
>+// Copyright (c) 2002-2015 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// The ArrayReturnValueToOutParameter function changes return values of an array type to out
>+// parameters in function definitions, prototypes, and call sites.
>+
>+#include "compiler/translator/tree_ops/ArrayReturnValueToOutParameter.h"
>+
>+#include <map>
>+
>+#include "compiler/translator/StaticType.h"
>+#include "compiler/translator/SymbolTable.h"
>+#include "compiler/translator/tree_util/IntermNode_util.h"
>+#include "compiler/translator/tree_util/IntermTraverse.h"
>+
>+namespace sh
>+{
>+
>+namespace
>+{
>+
>+constexpr const ImmutableString kReturnValueVariableName("angle_return");
>+
>+class ArrayReturnValueToOutParameterTraverser : private TIntermTraverser
>+{
>+  public:
>+    static void apply(TIntermNode *root, TSymbolTable *symbolTable);
>+
>+  private:
>+    ArrayReturnValueToOutParameterTraverser(TSymbolTable *symbolTable);
>+
>+    void visitFunctionPrototype(TIntermFunctionPrototype *node) override;
>+    bool visitFunctionDefinition(Visit visit, TIntermFunctionDefinition *node) override;
>+    bool visitAggregate(Visit visit, TIntermAggregate *node) override;
>+    bool visitBranch(Visit visit, TIntermBranch *node) override;
>+    bool visitBinary(Visit visit, TIntermBinary *node) override;
>+
>+    TIntermAggregate *createReplacementCall(TIntermAggregate *originalCall,
>+                                            TIntermTyped *returnValueTarget);
>+
>+    // Set when traversal is inside a function with array return value.
>+    TIntermFunctionDefinition *mFunctionWithArrayReturnValue;
>+
>+    struct ChangedFunction
>+    {
>+        const TVariable *returnValueVariable;
>+        const TFunction *func;
>+    };
>+
>+    // Map from function symbol ids to the changed function.
>+    std::map<int, ChangedFunction> mChangedFunctions;
>+};
>+
>+TIntermAggregate *ArrayReturnValueToOutParameterTraverser::createReplacementCall(
>+    TIntermAggregate *originalCall,
>+    TIntermTyped *returnValueTarget)
>+{
>+    TIntermSequence *replacementArguments = new TIntermSequence();
>+    TIntermSequence *originalArguments    = originalCall->getSequence();
>+    for (auto &arg : *originalArguments)
>+    {
>+        replacementArguments->push_back(arg);
>+    }
>+    replacementArguments->push_back(returnValueTarget);
>+    ASSERT(originalCall->getFunction());
>+    const TSymbolUniqueId &originalId = originalCall->getFunction()->uniqueId();
>+    TIntermAggregate *replacementCall = TIntermAggregate::CreateFunctionCall(
>+        *mChangedFunctions[originalId.get()].func, replacementArguments);
>+    replacementCall->setLine(originalCall->getLine());
>+    return replacementCall;
>+}
>+
>+void ArrayReturnValueToOutParameterTraverser::apply(TIntermNode *root, TSymbolTable *symbolTable)
>+{
>+    ArrayReturnValueToOutParameterTraverser arrayReturnValueToOutParam(symbolTable);
>+    root->traverse(&arrayReturnValueToOutParam);
>+    arrayReturnValueToOutParam.updateTree();
>+}
>+
>+ArrayReturnValueToOutParameterTraverser::ArrayReturnValueToOutParameterTraverser(
>+    TSymbolTable *symbolTable)
>+    : TIntermTraverser(true, false, true, symbolTable), mFunctionWithArrayReturnValue(nullptr)
>+{}
>+
>+bool ArrayReturnValueToOutParameterTraverser::visitFunctionDefinition(
>+    Visit visit,
>+    TIntermFunctionDefinition *node)
>+{
>+    if (node->getFunctionPrototype()->isArray() && visit == PreVisit)
>+    {
>+        // Replacing the function header is done on visitFunctionPrototype().
>+        mFunctionWithArrayReturnValue = node;
>+    }
>+    if (visit == PostVisit)
>+    {
>+        mFunctionWithArrayReturnValue = nullptr;
>+    }
>+    return true;
>+}
>+
>+void ArrayReturnValueToOutParameterTraverser::visitFunctionPrototype(TIntermFunctionPrototype *node)
>+{
>+    if (node->isArray())
>+    {
>+        // Replace the whole prototype node with another node that has the out parameter
>+        // added. Also set the function to return void.
>+        const TSymbolUniqueId &functionId = node->getFunction()->uniqueId();
>+        if (mChangedFunctions.find(functionId.get()) == mChangedFunctions.end())
>+        {
>+            TType *returnValueVariableType = new TType(node->getType());
>+            returnValueVariableType->setQualifier(EvqOut);
>+            ChangedFunction changedFunction;
>+            changedFunction.returnValueVariable =
>+                new TVariable(mSymbolTable, kReturnValueVariableName, returnValueVariableType,
>+                              SymbolType::AngleInternal);
>+            TFunction *func = new TFunction(mSymbolTable, node->getFunction()->name(),
>+                                            node->getFunction()->symbolType(),
>+                                            StaticType::GetBasic<EbtVoid>(), false);
>+            for (size_t i = 0; i < node->getFunction()->getParamCount(); ++i)
>+            {
>+                func->addParameter(node->getFunction()->getParam(i));
>+            }
>+            func->addParameter(changedFunction.returnValueVariable);
>+            changedFunction.func                = func;
>+            mChangedFunctions[functionId.get()] = changedFunction;
>+        }
>+        TIntermFunctionPrototype *replacement =
>+            new TIntermFunctionPrototype(mChangedFunctions[functionId.get()].func);
>+        replacement->setLine(node->getLine());
>+
>+        queueReplacement(replacement, OriginalNode::IS_DROPPED);
>+    }
>+}
>+
>+bool ArrayReturnValueToOutParameterTraverser::visitAggregate(Visit visit, TIntermAggregate *node)
>+{
>+    ASSERT(!node->isArray() || node->getOp() != EOpCallInternalRawFunction);
>+    if (visit == PreVisit && node->isArray() && node->getOp() == EOpCallFunctionInAST)
>+    {
>+        // Handle call sites where the returned array is not assigned.
>+        // Examples where f() is a function returning an array:
>+        // 1. f();
>+        // 2. another_array == f();
>+        // 3. another_function(f());
>+        // 4. return f();
>+        // Cases 2 to 4 are already converted to simpler cases by
>+        // SeparateExpressionsReturningArrays, so we only need to worry about the case where a
>+        // function call returning an array forms an expression by itself.
>+        TIntermBlock *parentBlock = getParentNode()->getAsBlock();
>+        if (parentBlock)
>+        {
>+            // replace
>+            //   f();
>+            // with
>+            //   type s0[size]; f(s0);
>+            TIntermSequence replacements;
>+
>+            // type s0[size];
>+            TIntermDeclaration *returnValueDeclaration = nullptr;
>+            TVariable *returnValue = DeclareTempVariable(mSymbolTable, new TType(node->getType()),
>+                                                         EvqTemporary, &returnValueDeclaration);
>+            replacements.push_back(returnValueDeclaration);
>+
>+            // f(s0);
>+            TIntermSymbol *returnValueSymbol = CreateTempSymbolNode(returnValue);
>+            replacements.push_back(createReplacementCall(node, returnValueSymbol));
>+            mMultiReplacements.push_back(
>+                NodeReplaceWithMultipleEntry(parentBlock, node, replacements));
>+        }
>+        return false;
>+    }
>+    return true;
>+}
>+
>+bool ArrayReturnValueToOutParameterTraverser::visitBranch(Visit visit, TIntermBranch *node)
>+{
>+    if (mFunctionWithArrayReturnValue && node->getFlowOp() == EOpReturn)
>+    {
>+        // Instead of returning a value, assign to the out parameter and then return.
>+        TIntermSequence replacements;
>+
>+        TIntermTyped *expression = node->getExpression();
>+        ASSERT(expression != nullptr);
>+        const TSymbolUniqueId &functionId =
>+            mFunctionWithArrayReturnValue->getFunction()->uniqueId();
>+        ASSERT(mChangedFunctions.find(functionId.get()) != mChangedFunctions.end());
>+        TIntermSymbol *returnValueSymbol =
>+            new TIntermSymbol(mChangedFunctions[functionId.get()].returnValueVariable);
>+        TIntermBinary *replacementAssignment =
>+            new TIntermBinary(EOpAssign, returnValueSymbol, expression);
>+        replacementAssignment->setLine(expression->getLine());
>+        replacements.push_back(replacementAssignment);
>+
>+        TIntermBranch *replacementBranch = new TIntermBranch(EOpReturn, nullptr);
>+        replacementBranch->setLine(node->getLine());
>+        replacements.push_back(replacementBranch);
>+
>+        mMultiReplacements.push_back(
>+            NodeReplaceWithMultipleEntry(getParentNode()->getAsBlock(), node, replacements));
>+    }
>+    return false;
>+}
>+
>+bool ArrayReturnValueToOutParameterTraverser::visitBinary(Visit visit, TIntermBinary *node)
>+{
>+    if (node->getOp() == EOpAssign && node->getLeft()->isArray())
>+    {
>+        TIntermAggregate *rightAgg = node->getRight()->getAsAggregate();
>+        ASSERT(rightAgg == nullptr || rightAgg->getOp() != EOpCallInternalRawFunction);
>+        if (rightAgg != nullptr && rightAgg->getOp() == EOpCallFunctionInAST)
>+        {
>+            TIntermAggregate *replacementCall = createReplacementCall(rightAgg, node->getLeft());
>+            queueReplacement(replacementCall, OriginalNode::IS_DROPPED);
>+        }
>+    }
>+    return false;
>+}
>+
>+}  // namespace
>+
>+void ArrayReturnValueToOutParameter(TIntermNode *root, TSymbolTable *symbolTable)
>+{
>+    ArrayReturnValueToOutParameterTraverser::apply(root, symbolTable);
>+}
>+
>+}  // namespace sh
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/ArrayReturnValueToOutParameter.h b/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/ArrayReturnValueToOutParameter.h
>new file mode 100644
>index 00000000000..9ceb02c76a8
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/ArrayReturnValueToOutParameter.h
>@@ -0,0 +1,22 @@
>+//
>+// Copyright (c) 2002-2015 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// The ArrayReturnValueToOutParameter function changes return values of an array type to out
>+// parameters in function definitions, prototypes and call sites.
>+
>+#ifndef COMPILER_TRANSLATOR_TREEOPS_ARRAYRETURNVALUETOOUTPARAMETER_H_
>+#define COMPILER_TRANSLATOR_TREEOPS_ARRAYRETURNVALUETOOUTPARAMETER_H_
>+
>+namespace sh
>+{
>+
>+class TIntermNode;
>+class TSymbolTable;
>+
>+void ArrayReturnValueToOutParameter(TIntermNode *root, TSymbolTable *symbolTable);
>+
>+}  // namespace sh
>+
>+#endif  // COMPILER_TRANSLATOR_TREEOPS_ARRAYRETURNVALUETOOUTPARAMETER_H_
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/BreakVariableAliasingInInnerLoops.cpp b/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/BreakVariableAliasingInInnerLoops.cpp
>new file mode 100644
>index 00000000000..19f53a73834
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/BreakVariableAliasingInInnerLoops.cpp
>@@ -0,0 +1,107 @@
>+//
>+// Copyright (c) 2016 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+
>+// BreakVariableAliasingInInnerLoops.h: To optimize simple assignments, the HLSL compiler frontend
>+//      may record a variable as aliasing another. Sometimes the alias information gets garbled
>+//      so we work around this issue by breaking the aliasing chain in inner loops.
>+
>+#include "BreakVariableAliasingInInnerLoops.h"
>+
>+#include "compiler/translator/tree_util/IntermNode_util.h"
>+#include "compiler/translator/tree_util/IntermTraverse.h"
>+
>+// A HLSL compiler developer gave us more details on the root cause and the workaround needed:
>+//     The root problem is that if the HLSL compiler is applying aliasing information even on
>+//     incomplete simulations (in this case, a single pass). The bug is triggered by an assignment
>+//     that comes from a series of assignments, possibly with swizzled or ternary operators with
>+//     known conditionals, where the source is before the loop.
>+//     So, a workaround is to add a +0 term to variables the first time they are assigned to in
>+//     an inner loop (if they are declared in an outside scope, otherwise there is no need).
>+//     This will break the aliasing chain.
>+
>+// For simplicity here we add a +0 to any assignment that is in at least two nested loops. Because
>+// the bug only shows up with swizzles, and ternary assignment, whole array or whole structure
>+// assignment don't need a workaround.
>+
>+namespace sh
>+{
>+
>+namespace
>+{
>+
>+class AliasingBreaker : public TIntermTraverser
>+{
>+  public:
>+    AliasingBreaker() : TIntermTraverser(true, false, true) {}
>+
>+  protected:
>+    bool visitBinary(Visit visit, TIntermBinary *binary)
>+    {
>+        if (visit != PreVisit)
>+        {
>+            return false;
>+        }
>+
>+        if (mLoopLevel < 2 || !binary->isAssignment())
>+        {
>+            return true;
>+        }
>+
>+        TIntermTyped *B = binary->getRight();
>+        TType type      = B->getType();
>+
>+        if (!type.isScalar() && !type.isVector() && !type.isMatrix())
>+        {
>+            return true;
>+        }
>+
>+        if (type.isArray() || IsSampler(type.getBasicType()))
>+        {
>+            return true;
>+        }
>+
>+        // We have a scalar / vector / matrix assignment with loop depth 2.
>+        // Transform it from
>+        //    A = B
>+        // to
>+        //    A = (B + typeof<B>(0));
>+
>+        TIntermBinary *bPlusZero = new TIntermBinary(EOpAdd, B, CreateZeroNode(type));
>+        bPlusZero->setLine(B->getLine());
>+
>+        binary->replaceChildNode(B, bPlusZero);
>+
>+        return true;
>+    }
>+
>+    bool visitLoop(Visit visit, TIntermLoop *loop)
>+    {
>+        if (visit == PreVisit)
>+        {
>+            mLoopLevel++;
>+        }
>+        else
>+        {
>+            ASSERT(mLoopLevel > 0);
>+            mLoopLevel--;
>+        }
>+
>+        return true;
>+    }
>+
>+  private:
>+    int mLoopLevel = 0;
>+};
>+
>+}  // anonymous namespace
>+
>+void BreakVariableAliasingInInnerLoops(TIntermNode *root)
>+{
>+    AliasingBreaker breaker;
>+    root->traverse(&breaker);
>+}
>+
>+}  // namespace sh
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/BreakVariableAliasingInInnerLoops.h b/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/BreakVariableAliasingInInnerLoops.h
>new file mode 100644
>index 00000000000..cdbdb7aa963
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/BreakVariableAliasingInInnerLoops.h
>@@ -0,0 +1,23 @@
>+//
>+// Copyright (c) 2016 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+
>+// BreakVariableAliasingInInnerLoops.h: To optimize simple assignments, the HLSL compiler frontend
>+//      may record a variable as aliasing another. Sometimes the alias information gets garbled
>+//      so we work around this issue by breaking the aliasing chain in inner loops.
>+
>+#ifndef COMPILER_TRANSLATOR_TREEOPS_BREAKVARIABLEALIASINGININNERLOOPS_H_
>+#define COMPILER_TRANSLATOR_TREEOPS_BREAKVARIABLEALIASINGININNERLOOPS_H_
>+
>+class TIntermNode;
>+
>+namespace sh
>+{
>+
>+void BreakVariableAliasingInInnerLoops(TIntermNode *root);
>+
>+}  // namespace sh
>+
>+#endif  // COMPILER_TRANSLATOR_TREEOPS_BREAKVARIABLEALIASINGININNERLOOPS_H_
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/ClampFragDepth.cpp b/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/ClampFragDepth.cpp
>new file mode 100644
>index 00000000000..d721160a325
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/ClampFragDepth.cpp
>@@ -0,0 +1,54 @@
>+//
>+// Copyright (c) 2017 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// ClampFragDepth.cpp: Limit the value that is written to gl_FragDepth to the range [0.0, 1.0].
>+// The clamping is run at the very end of shader execution, and is only performed if the shader
>+// statically accesses gl_FragDepth.
>+//
>+
>+#include "compiler/translator/tree_ops/ClampFragDepth.h"
>+
>+#include "compiler/translator/ImmutableString.h"
>+#include "compiler/translator/SymbolTable.h"
>+#include "compiler/translator/tree_util/BuiltIn_autogen.h"
>+#include "compiler/translator/tree_util/FindSymbolNode.h"
>+#include "compiler/translator/tree_util/IntermNode_util.h"
>+#include "compiler/translator/tree_util/RunAtTheEndOfShader.h"
>+
>+namespace sh
>+{
>+
>+void ClampFragDepth(TIntermBlock *root, TSymbolTable *symbolTable)
>+{
>+    // Only clamp gl_FragDepth if it's used in the shader.
>+    if (!FindSymbolNode(root, ImmutableString("gl_FragDepth")))
>+    {
>+        return;
>+    }
>+
>+    TIntermSymbol *fragDepthNode = new TIntermSymbol(BuiltInVariable::gl_FragDepth());
>+
>+    TIntermTyped *minFragDepthNode = CreateZeroNode(TType(EbtFloat, EbpHigh, EvqConst));
>+
>+    TConstantUnion *maxFragDepthConstant = new TConstantUnion();
>+    maxFragDepthConstant->setFConst(1.0);
>+    TIntermConstantUnion *maxFragDepthNode =
>+        new TIntermConstantUnion(maxFragDepthConstant, TType(EbtFloat, EbpHigh, EvqConst));
>+
>+    // clamp(gl_FragDepth, 0.0, 1.0)
>+    TIntermSequence *clampArguments = new TIntermSequence();
>+    clampArguments->push_back(fragDepthNode->deepCopy());
>+    clampArguments->push_back(minFragDepthNode);
>+    clampArguments->push_back(maxFragDepthNode);
>+    TIntermTyped *clampedFragDepth =
>+        CreateBuiltInFunctionCallNode("clamp", clampArguments, *symbolTable, 100);
>+
>+    // gl_FragDepth = clamp(gl_FragDepth, 0.0, 1.0)
>+    TIntermBinary *assignFragDepth = new TIntermBinary(EOpAssign, fragDepthNode, clampedFragDepth);
>+
>+    RunAtTheEndOfShader(root, assignFragDepth, symbolTable);
>+}
>+
>+}  // namespace sh
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/ClampFragDepth.h b/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/ClampFragDepth.h
>new file mode 100644
>index 00000000000..70d1f7336ad
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/ClampFragDepth.h
>@@ -0,0 +1,24 @@
>+//
>+// Copyright (c) 2017 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// ClampFragDepth.h: Limit the value that is written to gl_FragDepth to the range [0.0, 1.0].
>+// The clamping is run at the very end of shader execution, and is only performed if the shader
>+// statically accesses gl_FragDepth.
>+//
>+
>+#ifndef COMPILER_TRANSLATOR_TREEOPS_CLAMPFRAGDEPTH_H_
>+#define COMPILER_TRANSLATOR_TREEOPS_CLAMPFRAGDEPTH_H_
>+
>+namespace sh
>+{
>+
>+class TIntermBlock;
>+class TSymbolTable;
>+
>+void ClampFragDepth(TIntermBlock *root, TSymbolTable *symbolTable);
>+
>+}  // namespace sh
>+
>+#endif  // COMPILER_TRANSLATOR_TREEOPS_CLAMPFRAGDEPTH_H_
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/ClampPointSize.cpp b/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/ClampPointSize.cpp
>new file mode 100644
>index 00000000000..3966aabd831
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/ClampPointSize.cpp
>@@ -0,0 +1,48 @@
>+//
>+// Copyright (c) 2017 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// ClampPointSize.cpp: Limit the value that is written to gl_PointSize.
>+//
>+
>+#include "compiler/translator/tree_ops/ClampPointSize.h"
>+
>+#include "compiler/translator/SymbolTable.h"
>+#include "compiler/translator/tree_util/BuiltIn_autogen.h"
>+#include "compiler/translator/tree_util/FindSymbolNode.h"
>+#include "compiler/translator/tree_util/IntermNode_util.h"
>+#include "compiler/translator/tree_util/RunAtTheEndOfShader.h"
>+
>+namespace sh
>+{
>+
>+void ClampPointSize(TIntermBlock *root, float maxPointSize, TSymbolTable *symbolTable)
>+{
>+    // Only clamp gl_PointSize if it's used in the shader.
>+    if (!FindSymbolNode(root, ImmutableString("gl_PointSize")))
>+    {
>+        return;
>+    }
>+
>+    TIntermSymbol *pointSizeNode = new TIntermSymbol(BuiltInVariable::gl_PointSize());
>+
>+    TConstantUnion *maxPointSizeConstant = new TConstantUnion();
>+    maxPointSizeConstant->setFConst(maxPointSize);
>+    TIntermConstantUnion *maxPointSizeNode =
>+        new TIntermConstantUnion(maxPointSizeConstant, TType(EbtFloat, EbpHigh, EvqConst));
>+
>+    // min(gl_PointSize, maxPointSize)
>+    TIntermSequence *minArguments = new TIntermSequence();
>+    minArguments->push_back(pointSizeNode->deepCopy());
>+    minArguments->push_back(maxPointSizeNode);
>+    TIntermTyped *clampedPointSize =
>+        CreateBuiltInFunctionCallNode("min", minArguments, *symbolTable, 100);
>+
>+    // gl_PointSize = min(gl_PointSize, maxPointSize)
>+    TIntermBinary *assignPointSize = new TIntermBinary(EOpAssign, pointSizeNode, clampedPointSize);
>+
>+    RunAtTheEndOfShader(root, assignPointSize, symbolTable);
>+}
>+
>+}  // namespace sh
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/ClampPointSize.h b/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/ClampPointSize.h
>new file mode 100644
>index 00000000000..5bc7cd4d438
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/ClampPointSize.h
>@@ -0,0 +1,22 @@
>+//
>+// Copyright (c) 2017 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// ClampPointSize.h: Limit the value that is written to gl_PointSize.
>+//
>+
>+#ifndef COMPILER_TRANSLATOR_TREEOPS_CLAMPPOINTSIZE_H_
>+#define COMPILER_TRANSLATOR_TREEOPS_CLAMPPOINTSIZE_H_
>+
>+namespace sh
>+{
>+
>+class TIntermBlock;
>+class TSymbolTable;
>+
>+void ClampPointSize(TIntermBlock *root, float maxPointSize, TSymbolTable *symbolTable);
>+
>+}  // namespace sh
>+
>+#endif  // COMPILER_TRANSLATOR_TREEOPS_CLAMPPOINTSIZE_H_
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/DeclareAndInitBuiltinsForInstancedMultiview.cpp b/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/DeclareAndInitBuiltinsForInstancedMultiview.cpp
>new file mode 100644
>index 00000000000..91ffe5966ac
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/DeclareAndInitBuiltinsForInstancedMultiview.cpp
>@@ -0,0 +1,186 @@
>+//
>+// Copyright (c) 2017 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// Applies the necessary AST transformations to support multiview rendering through instancing.
>+// Check the header file For more information.
>+//
>+
>+#include "compiler/translator/tree_ops/DeclareAndInitBuiltinsForInstancedMultiview.h"
>+
>+#include "compiler/translator/StaticType.h"
>+#include "compiler/translator/SymbolTable.h"
>+#include "compiler/translator/tree_ops/InitializeVariables.h"
>+#include "compiler/translator/tree_util/BuiltIn_autogen.h"
>+#include "compiler/translator/tree_util/FindMain.h"
>+#include "compiler/translator/tree_util/IntermNode_util.h"
>+#include "compiler/translator/tree_util/IntermTraverse.h"
>+#include "compiler/translator/tree_util/ReplaceVariable.h"
>+#include "compiler/translator/util.h"
>+
>+namespace sh
>+{
>+
>+namespace
>+{
>+
>+constexpr const ImmutableString kViewIDVariableName("ViewID_OVR");
>+constexpr const ImmutableString kInstanceIDVariableName("InstanceID");
>+constexpr const ImmutableString kMultiviewBaseViewLayerIndexVariableName(
>+    "multiviewBaseViewLayerIndex");
>+
>+// Adds the InstanceID and ViewID_OVR initializers to the end of the initializers' sequence.
>+void InitializeViewIDAndInstanceID(const TVariable *viewID,
>+                                   const TVariable *instanceID,
>+                                   unsigned numberOfViews,
>+                                   const TSymbolTable &symbolTable,
>+                                   TIntermSequence *initializers)
>+{
>+    // Create an unsigned numberOfViews node.
>+    TConstantUnion *numberOfViewsUnsignedConstant = new TConstantUnion();
>+    numberOfViewsUnsignedConstant->setUConst(numberOfViews);
>+    TIntermConstantUnion *numberOfViewsUint =
>+        new TIntermConstantUnion(numberOfViewsUnsignedConstant, TType(EbtUInt, EbpHigh, EvqConst));
>+
>+    // Create a uint(gl_InstanceID) node.
>+    TIntermSequence *glInstanceIDSymbolCastArguments = new TIntermSequence();
>+    glInstanceIDSymbolCastArguments->push_back(new TIntermSymbol(BuiltInVariable::gl_InstanceID()));
>+    TIntermAggregate *glInstanceIDAsUint = TIntermAggregate::CreateConstructor(
>+        TType(EbtUInt, EbpHigh, EvqTemporary), glInstanceIDSymbolCastArguments);
>+
>+    // Create a uint(gl_InstanceID) / numberOfViews node.
>+    TIntermBinary *normalizedInstanceID =
>+        new TIntermBinary(EOpDiv, glInstanceIDAsUint, numberOfViewsUint);
>+
>+    // Create an int(uint(gl_InstanceID) / numberOfViews) node.
>+    TIntermSequence *normalizedInstanceIDCastArguments = new TIntermSequence();
>+    normalizedInstanceIDCastArguments->push_back(normalizedInstanceID);
>+    TIntermAggregate *normalizedInstanceIDAsInt = TIntermAggregate::CreateConstructor(
>+        TType(EbtInt, EbpHigh, EvqTemporary), normalizedInstanceIDCastArguments);
>+
>+    // Create an InstanceID = int(uint(gl_InstanceID) / numberOfViews) node.
>+    TIntermBinary *instanceIDInitializer =
>+        new TIntermBinary(EOpAssign, new TIntermSymbol(instanceID), normalizedInstanceIDAsInt);
>+    initializers->push_back(instanceIDInitializer);
>+
>+    // Create a uint(gl_InstanceID) % numberOfViews node.
>+    TIntermBinary *normalizedViewID =
>+        new TIntermBinary(EOpIMod, glInstanceIDAsUint->deepCopy(), numberOfViewsUint->deepCopy());
>+
>+    // Create a ViewID_OVR = uint(gl_InstanceID) % numberOfViews node.
>+    TIntermBinary *viewIDInitializer =
>+        new TIntermBinary(EOpAssign, new TIntermSymbol(viewID), normalizedViewID);
>+    initializers->push_back(viewIDInitializer);
>+}
>+
>+// Adds a branch to write int(ViewID_OVR) to either gl_ViewportIndex or gl_Layer. The branch is
>+// added to the end of the initializers' sequence.
>+void SelectViewIndexInVertexShader(const TVariable *viewID,
>+                                   const TVariable *multiviewBaseViewLayerIndex,
>+                                   TIntermSequence *initializers,
>+                                   const TSymbolTable &symbolTable)
>+{
>+    // Create an int(ViewID_OVR) node.
>+    TIntermSequence *viewIDSymbolCastArguments = new TIntermSequence();
>+    viewIDSymbolCastArguments->push_back(new TIntermSymbol(viewID));
>+    TIntermAggregate *viewIDAsInt = TIntermAggregate::CreateConstructor(
>+        TType(EbtInt, EbpHigh, EvqTemporary), viewIDSymbolCastArguments);
>+
>+    // Create a gl_ViewportIndex node.
>+    TIntermSymbol *viewportIndexSymbol = new TIntermSymbol(BuiltInVariable::gl_ViewportIndex());
>+
>+    // Create a { gl_ViewportIndex = int(ViewID_OVR) } node.
>+    TIntermBlock *viewportIndexInitializerInBlock = new TIntermBlock();
>+    viewportIndexInitializerInBlock->appendStatement(
>+        new TIntermBinary(EOpAssign, viewportIndexSymbol, viewIDAsInt));
>+
>+    // Create a gl_Layer node.
>+    TIntermSymbol *layerSymbol = new TIntermSymbol(BuiltInVariable::gl_LayerVS());
>+
>+    // Create an int(ViewID_OVR) + multiviewBaseViewLayerIndex node
>+    TIntermBinary *sumOfViewIDAndBaseViewIndex = new TIntermBinary(
>+        EOpAdd, viewIDAsInt->deepCopy(), new TIntermSymbol(multiviewBaseViewLayerIndex));
>+
>+    // Create a { gl_Layer = int(ViewID_OVR) + multiviewBaseViewLayerIndex } node.
>+    TIntermBlock *layerInitializerInBlock = new TIntermBlock();
>+    layerInitializerInBlock->appendStatement(
>+        new TIntermBinary(EOpAssign, layerSymbol, sumOfViewIDAndBaseViewIndex));
>+
>+    // Create a node to compare whether the base view index uniform is less than zero.
>+    TIntermBinary *multiviewBaseViewLayerIndexZeroComparison =
>+        new TIntermBinary(EOpLessThan, new TIntermSymbol(multiviewBaseViewLayerIndex),
>+                          CreateZeroNode(TType(EbtInt, EbpHigh, EvqConst)));
>+
>+    // Create an if-else statement to select the code path.
>+    TIntermIfElse *multiviewBranch =
>+        new TIntermIfElse(multiviewBaseViewLayerIndexZeroComparison,
>+                          viewportIndexInitializerInBlock, layerInitializerInBlock);
>+
>+    initializers->push_back(multiviewBranch);
>+}
>+
>+}  // namespace
>+
>+void DeclareAndInitBuiltinsForInstancedMultiview(TIntermBlock *root,
>+                                                 unsigned numberOfViews,
>+                                                 GLenum shaderType,
>+                                                 ShCompileOptions compileOptions,
>+                                                 ShShaderOutput shaderOutput,
>+                                                 TSymbolTable *symbolTable)
>+{
>+    ASSERT(shaderType == GL_VERTEX_SHADER || shaderType == GL_FRAGMENT_SHADER);
>+
>+    TQualifier viewIDQualifier = (shaderType == GL_VERTEX_SHADER) ? EvqFlatOut : EvqFlatIn;
>+    const TVariable *viewID =
>+        new TVariable(symbolTable, kViewIDVariableName,
>+                      new TType(EbtUInt, EbpHigh, viewIDQualifier), SymbolType::AngleInternal);
>+
>+    DeclareGlobalVariable(root, viewID);
>+    ReplaceVariable(root, BuiltInVariable::gl_ViewID_OVR(), viewID);
>+    if (shaderType == GL_VERTEX_SHADER)
>+    {
>+        // Replacing gl_InstanceID with InstanceID should happen before adding the initializers of
>+        // InstanceID and ViewID.
>+        const TType *instanceIDVariableType = StaticType::Get<EbtInt, EbpHigh, EvqGlobal, 1, 1>();
>+        const TVariable *instanceID =
>+            new TVariable(symbolTable, kInstanceIDVariableName, instanceIDVariableType,
>+                          SymbolType::AngleInternal);
>+        DeclareGlobalVariable(root, instanceID);
>+        ReplaceVariable(root, BuiltInVariable::gl_InstanceID(), instanceID);
>+
>+        TIntermSequence *initializers = new TIntermSequence();
>+        InitializeViewIDAndInstanceID(viewID, instanceID, numberOfViews, *symbolTable,
>+                                      initializers);
>+
>+        // The AST transformation which adds the expression to select the viewport index should
>+        // be done only for the GLSL and ESSL output.
>+        const bool selectView = (compileOptions & SH_SELECT_VIEW_IN_NV_GLSL_VERTEX_SHADER) != 0u;
>+        // Assert that if the view is selected in the vertex shader, then the output is
>+        // either GLSL or ESSL.
>+        ASSERT(!selectView || IsOutputGLSL(shaderOutput) || IsOutputESSL(shaderOutput));
>+        if (selectView)
>+        {
>+            // Add a uniform to switch between side-by-side and layered rendering.
>+            const TType *baseLayerIndexVariableType =
>+                StaticType::Get<EbtInt, EbpHigh, EvqUniform, 1, 1>();
>+            const TVariable *multiviewBaseViewLayerIndex =
>+                new TVariable(symbolTable, kMultiviewBaseViewLayerIndexVariableName,
>+                              baseLayerIndexVariableType, SymbolType::AngleInternal);
>+            DeclareGlobalVariable(root, multiviewBaseViewLayerIndex);
>+
>+            // Setting a value to gl_ViewportIndex or gl_Layer should happen after ViewID_OVR's
>+            // initialization.
>+            SelectViewIndexInVertexShader(viewID, multiviewBaseViewLayerIndex, initializers,
>+                                          *symbolTable);
>+        }
>+
>+        // Insert initializers at the beginning of main().
>+        TIntermBlock *initializersBlock = new TIntermBlock();
>+        initializersBlock->getSequence()->swap(*initializers);
>+        TIntermBlock *mainBody = FindMainBody(root);
>+        mainBody->getSequence()->insert(mainBody->getSequence()->begin(), initializersBlock);
>+    }
>+}
>+
>+}  // namespace sh
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/DeclareAndInitBuiltinsForInstancedMultiview.h b/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/DeclareAndInitBuiltinsForInstancedMultiview.h
>new file mode 100644
>index 00000000000..9501ea58b31
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/DeclareAndInitBuiltinsForInstancedMultiview.h
>@@ -0,0 +1,48 @@
>+//
>+// Copyright (c) 2017 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// Regardless of the shader type, the following AST transformations are applied:
>+// - Add declaration of View_ID_OVR.
>+// - Replace every occurrence of gl_ViewID_OVR with ViewID_OVR, mark ViewID_OVR as internal and
>+// declare it as a flat varying.
>+//
>+// If the shader type is a vertex shader, the following AST transformations are applied:
>+// - Replace every occurrence of gl_InstanceID with InstanceID, mark InstanceID as internal and set
>+// its qualifier to EvqTemporary.
>+// - Add initializers of ViewID_OVR and InstanceID to the beginning of the body of main. The pass
>+// should be executed before any variables get collected so that usage of gl_InstanceID is recorded.
>+// - If the output is ESSL or GLSL and the SH_SELECT_VIEW_IN_NV_GLSL_VERTEX_SHADER option is
>+// enabled, the expression
>+// "if (multiviewBaseViewLayerIndex < 0) {
>+//      gl_ViewportIndex = int(ViewID_OVR);
>+//  } else {
>+//      gl_Layer = int(ViewID_OVR) + multiviewBaseViewLayerIndex;
>+//  }"
>+// is added after ViewID and InstanceID are initialized. Also, MultiviewRenderPath is added as a
>+// uniform.
>+//
>+
>+#ifndef COMPILER_TRANSLATOR_TREEOPS_DECLAREANDINITBUILTINSFORINSTANCEDMULTIVIEW_H_
>+#define COMPILER_TRANSLATOR_TREEOPS_DECLAREANDINITBUILTINSFORINSTANCEDMULTIVIEW_H_
>+
>+#include "GLSLANG/ShaderLang.h"
>+#include "angle_gl.h"
>+
>+namespace sh
>+{
>+
>+class TIntermBlock;
>+class TSymbolTable;
>+
>+void DeclareAndInitBuiltinsForInstancedMultiview(TIntermBlock *root,
>+                                                 unsigned numberOfViews,
>+                                                 GLenum shaderType,
>+                                                 ShCompileOptions compileOptions,
>+                                                 ShShaderOutput shaderOutput,
>+                                                 TSymbolTable *symbolTable);
>+
>+}  // namespace sh
>+
>+#endif  // COMPILER_TRANSLATOR_TREEOPS_DECLAREANDINITBUILTINSFORINSTANCEDMULTIVIEW_H_
>\ No newline at end of file
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/DeferGlobalInitializers.cpp b/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/DeferGlobalInitializers.cpp
>new file mode 100644
>index 00000000000..8f48d3e352b
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/DeferGlobalInitializers.cpp
>@@ -0,0 +1,167 @@
>+//
>+// Copyright (c) 2016 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// DeferGlobalInitializers is an AST traverser that moves global initializers into a separate
>+// function that is called in the beginning of main(). This enables initialization of globals with
>+// uniforms or non-constant globals, as allowed by the WebGL spec. Some initializers referencing
>+// non-constants may need to be unfolded into if statements in HLSL - this kind of steps should be
>+// done after DeferGlobalInitializers is run. Note that it's important that the function definition
>+// is at the end of the shader, as some globals may be declared after main().
>+//
>+// It can also initialize all uninitialized globals.
>+//
>+
>+#include "compiler/translator/tree_ops/DeferGlobalInitializers.h"
>+
>+#include <vector>
>+
>+#include "compiler/translator/IntermNode.h"
>+#include "compiler/translator/StaticType.h"
>+#include "compiler/translator/SymbolTable.h"
>+#include "compiler/translator/tree_ops/InitializeVariables.h"
>+#include "compiler/translator/tree_util/FindMain.h"
>+#include "compiler/translator/tree_util/IntermNode_util.h"
>+#include "compiler/translator/tree_util/ReplaceVariable.h"
>+
>+namespace sh
>+{
>+
>+namespace
>+{
>+
>+constexpr const ImmutableString kInitGlobalsString("initGlobals");
>+
>+void GetDeferredInitializers(TIntermDeclaration *declaration,
>+                             bool initializeUninitializedGlobals,
>+                             bool canUseLoopsToInitialize,
>+                             bool highPrecisionSupported,
>+                             TIntermSequence *deferredInitializersOut,
>+                             std::vector<const TVariable *> *variablesToReplaceOut,
>+                             TSymbolTable *symbolTable)
>+{
>+    // SeparateDeclarations should have already been run.
>+    ASSERT(declaration->getSequence()->size() == 1);
>+
>+    TIntermNode *declarator = declaration->getSequence()->back();
>+    TIntermBinary *init     = declarator->getAsBinaryNode();
>+    if (init)
>+    {
>+        TIntermSymbol *symbolNode = init->getLeft()->getAsSymbolNode();
>+        ASSERT(symbolNode);
>+        TIntermTyped *expression = init->getRight();
>+
>+        if (expression->getQualifier() != EvqConst || !expression->hasConstantValue())
>+        {
>+            // For variables which are not constant, defer their real initialization until
>+            // after we initialize uniforms.
>+            // Deferral is done also in any cases where the variable can not be converted to a
>+            // constant union, since otherwise there's a chance that HLSL output will generate extra
>+            // statements from the initializer expression.
>+
>+            // Change const global to a regular global if its initialization is deferred.
>+            // This can happen if ANGLE has not been able to fold the constant expression used
>+            // as an initializer.
>+            ASSERT(symbolNode->getQualifier() == EvqConst ||
>+                   symbolNode->getQualifier() == EvqGlobal);
>+            if (symbolNode->getQualifier() == EvqConst)
>+            {
>+                variablesToReplaceOut->push_back(&symbolNode->variable());
>+            }
>+
>+            TIntermBinary *deferredInit =
>+                new TIntermBinary(EOpAssign, symbolNode->deepCopy(), init->getRight());
>+            deferredInitializersOut->push_back(deferredInit);
>+
>+            // Remove the initializer from the global scope and just declare the global instead.
>+            declaration->replaceChildNode(init, symbolNode);
>+        }
>+    }
>+    else if (initializeUninitializedGlobals)
>+    {
>+        TIntermSymbol *symbolNode = declarator->getAsSymbolNode();
>+        ASSERT(symbolNode);
>+
>+        // Ignore ANGLE internal variables and nameless declarations.
>+        if (symbolNode->variable().symbolType() == SymbolType::AngleInternal ||
>+            symbolNode->variable().symbolType() == SymbolType::Empty)
>+            return;
>+
>+        if (symbolNode->getQualifier() == EvqGlobal)
>+        {
>+            TIntermSequence *initCode = CreateInitCode(symbolNode, canUseLoopsToInitialize,
>+                                                       highPrecisionSupported, symbolTable);
>+            deferredInitializersOut->insert(deferredInitializersOut->end(), initCode->begin(),
>+                                            initCode->end());
>+        }
>+    }
>+}
>+
>+void InsertInitCallToMain(TIntermBlock *root,
>+                          TIntermSequence *deferredInitializers,
>+                          TSymbolTable *symbolTable)
>+{
>+    TIntermBlock *initGlobalsBlock = new TIntermBlock();
>+    initGlobalsBlock->getSequence()->swap(*deferredInitializers);
>+
>+    TFunction *initGlobalsFunction =
>+        new TFunction(symbolTable, kInitGlobalsString, SymbolType::AngleInternal,
>+                      StaticType::GetBasic<EbtVoid>(), false);
>+
>+    TIntermFunctionPrototype *initGlobalsFunctionPrototype =
>+        CreateInternalFunctionPrototypeNode(*initGlobalsFunction);
>+    root->getSequence()->insert(root->getSequence()->begin(), initGlobalsFunctionPrototype);
>+    TIntermFunctionDefinition *initGlobalsFunctionDefinition =
>+        CreateInternalFunctionDefinitionNode(*initGlobalsFunction, initGlobalsBlock);
>+    root->appendStatement(initGlobalsFunctionDefinition);
>+
>+    TIntermAggregate *initGlobalsCall =
>+        TIntermAggregate::CreateFunctionCall(*initGlobalsFunction, new TIntermSequence());
>+
>+    TIntermBlock *mainBody = FindMainBody(root);
>+    mainBody->getSequence()->insert(mainBody->getSequence()->begin(), initGlobalsCall);
>+}
>+
>+}  // namespace
>+
>+void DeferGlobalInitializers(TIntermBlock *root,
>+                             bool initializeUninitializedGlobals,
>+                             bool canUseLoopsToInitialize,
>+                             bool highPrecisionSupported,
>+                             TSymbolTable *symbolTable)
>+{
>+    TIntermSequence *deferredInitializers = new TIntermSequence();
>+    std::vector<const TVariable *> variablesToReplace;
>+
>+    // Loop over all global statements and process the declarations. This is simpler than using a
>+    // traverser.
>+    for (TIntermNode *statement : *root->getSequence())
>+    {
>+        TIntermDeclaration *declaration = statement->getAsDeclarationNode();
>+        if (declaration)
>+        {
>+            GetDeferredInitializers(declaration, initializeUninitializedGlobals,
>+                                    canUseLoopsToInitialize, highPrecisionSupported,
>+                                    deferredInitializers, &variablesToReplace, symbolTable);
>+        }
>+    }
>+
>+    // Add the function with initialization and the call to that.
>+    if (!deferredInitializers->empty())
>+    {
>+        InsertInitCallToMain(root, deferredInitializers, symbolTable);
>+    }
>+
>+    // Replace constant variables with non-constant global variables.
>+    for (const TVariable *var : variablesToReplace)
>+    {
>+        TType *replacementType = new TType(var->getType());
>+        replacementType->setQualifier(EvqGlobal);
>+        TVariable *replacement =
>+            new TVariable(symbolTable, var->name(), replacementType, var->symbolType());
>+        ReplaceVariable(root, var, replacement);
>+    }
>+}
>+
>+}  // namespace sh
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/DeferGlobalInitializers.h b/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/DeferGlobalInitializers.h
>new file mode 100644
>index 00000000000..b0e45478579
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/DeferGlobalInitializers.h
>@@ -0,0 +1,33 @@
>+//
>+// Copyright (c) 2016 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// DeferGlobalInitializers is an AST traverser that moves global initializers into a separate
>+// function that is called in the beginning of main(). This enables initialization of globals with
>+// uniforms or non-constant globals, as allowed by the WebGL spec. Some initializers referencing
>+// non-constants may need to be unfolded into if statements in HLSL - this kind of steps should be
>+// done after DeferGlobalInitializers is run. Note that it's important that the function definition
>+// is at the end of the shader, as some globals may be declared after main().
>+//
>+// It can also initialize all uninitialized globals.
>+//
>+
>+#ifndef COMPILER_TRANSLATOR_TREEOPS_DEFERGLOBALINITIALIZERS_H_
>+#define COMPILER_TRANSLATOR_TREEOPS_DEFERGLOBALINITIALIZERS_H_
>+
>+namespace sh
>+{
>+
>+class TIntermBlock;
>+class TSymbolTable;
>+
>+void DeferGlobalInitializers(TIntermBlock *root,
>+                             bool initializeUninitializedGlobals,
>+                             bool canUseLoopsToInitialize,
>+                             bool highPrecisionSupported,
>+                             TSymbolTable *symbolTable);
>+
>+}  // namespace sh
>+
>+#endif  // COMPILER_TRANSLATOR_TREEOPS_DEFERGLOBALINITIALIZERS_H_
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/EmulateGLDrawID.cpp b/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/EmulateGLDrawID.cpp
>new file mode 100644
>index 00000000000..5776d2a31a3
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/EmulateGLDrawID.cpp
>@@ -0,0 +1,89 @@
>+//
>+// Copyright 2018 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// EmulateGLDrawID is an AST traverser to convert the gl_DrawID builtin
>+// to a uniform int
>+//
>+
>+#include "compiler/translator/tree_ops/EmulateGLDrawID.h"
>+
>+#include "angle_gl.h"
>+#include "compiler/translator/StaticType.h"
>+#include "compiler/translator/Symbol.h"
>+#include "compiler/translator/SymbolTable.h"
>+#include "compiler/translator/tree_util/BuiltIn_autogen.h"
>+#include "compiler/translator/tree_util/IntermTraverse.h"
>+#include "compiler/translator/tree_util/ReplaceVariable.h"
>+#include "compiler/translator/util.h"
>+
>+namespace sh
>+{
>+
>+namespace
>+{
>+
>+constexpr const ImmutableString kEmulatedGLDrawIDName("angle_DrawID");
>+
>+class FindGLDrawIDTraverser : public TIntermTraverser
>+{
>+  public:
>+    FindGLDrawIDTraverser() : TIntermTraverser(true, false, false), mVariable(nullptr) {}
>+
>+    const TVariable *getGLDrawIDBuiltinVariable() { return mVariable; }
>+
>+  protected:
>+    void visitSymbol(TIntermSymbol *node) override
>+    {
>+        if (&node->variable() == BuiltInVariable::gl_DrawID() ||
>+            &node->variable() == BuiltInVariable::gl_DrawIDESSL1())
>+        {
>+            mVariable = &node->variable();
>+        }
>+    }
>+
>+  private:
>+    const TVariable *mVariable;
>+};
>+
>+}  // namespace
>+
>+void EmulateGLDrawID(TIntermBlock *root,
>+                     TSymbolTable *symbolTable,
>+                     std::vector<sh::Uniform> *uniforms,
>+                     bool shouldCollect)
>+{
>+    FindGLDrawIDTraverser traverser;
>+    root->traverse(&traverser);
>+    const TVariable *builtInVariable = traverser.getGLDrawIDBuiltinVariable();
>+    if (builtInVariable)
>+    {
>+        const TType *type = StaticType::Get<EbtInt, EbpHigh, EvqUniform, 1, 1>();
>+        const TVariable *drawID =
>+            new TVariable(symbolTable, kEmulatedGLDrawIDName, type, SymbolType::AngleInternal);
>+
>+        // AngleInternal variables don't get collected
>+        if (shouldCollect)
>+        {
>+            Uniform uniform;
>+            uniform.name       = kEmulatedGLDrawIDName.data();
>+            uniform.mappedName = kEmulatedGLDrawIDName.data();
>+            uniform.type       = GLVariableType(*type);
>+            uniform.precision  = GLVariablePrecision(*type);
>+            uniform.staticUse  = symbolTable->isStaticallyUsed(*builtInVariable);
>+            uniform.active     = true;
>+            uniform.binding    = type->getLayoutQualifier().binding;
>+            uniform.location   = type->getLayoutQualifier().location;
>+            uniform.offset     = type->getLayoutQualifier().offset;
>+            uniform.readonly   = type->getMemoryQualifier().readonly;
>+            uniform.writeonly  = type->getMemoryQualifier().writeonly;
>+            uniforms->push_back(uniform);
>+        }
>+
>+        DeclareGlobalVariable(root, drawID);
>+        ReplaceVariable(root, builtInVariable, drawID);
>+    }
>+}
>+
>+}  // namespace sh
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/EmulateGLDrawID.h b/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/EmulateGLDrawID.h
>new file mode 100644
>index 00000000000..db295e9fded
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/EmulateGLDrawID.h
>@@ -0,0 +1,31 @@
>+//
>+// Copyright 2018 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// EmulateGLDrawID is an AST traverser to convert the gl_DrawID builtin
>+// to a uniform int
>+//
>+
>+#ifndef COMPILER_TRANSLATOR_TREEOPS_EMULATEGLDRAWID_H_
>+#define COMPILER_TRANSLATOR_TREEOPS_EMULATEGLDRAWID_H_
>+
>+#include <GLSLANG/ShaderLang.h>
>+#include <vector>
>+
>+#include "compiler/translator/HashNames.h"
>+
>+namespace sh
>+{
>+struct Uniform;
>+class TIntermBlock;
>+class TSymbolTable;
>+
>+void EmulateGLDrawID(TIntermBlock *root,
>+                     TSymbolTable *symbolTable,
>+                     std::vector<sh::Uniform> *uniforms,
>+                     bool shouldCollect);
>+
>+}  // namespace sh
>+
>+#endif  // COMPILER_TRANSLATOR_TREEOPS_EMULATEGLDRAWID_H_
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/EmulateGLFragColorBroadcast.cpp b/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/EmulateGLFragColorBroadcast.cpp
>new file mode 100644
>index 00000000000..d562136999c
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/EmulateGLFragColorBroadcast.cpp
>@@ -0,0 +1,131 @@
>+//
>+// Copyright (c) 2002-2016 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// gl_FragColor needs to broadcast to all color buffers in ES2 if
>+// GL_EXT_draw_buffers is explicitly enabled in a fragment shader.
>+//
>+// We emulate this by replacing all gl_FragColor with gl_FragData[0], and in the end
>+// of main() function, assigning gl_FragData[1], ..., gl_FragData[maxDrawBuffers-1]
>+// with gl_FragData[0].
>+//
>+
>+#include "compiler/translator/tree_ops/EmulateGLFragColorBroadcast.h"
>+
>+#include "compiler/translator/Symbol.h"
>+#include "compiler/translator/tree_util/IntermNode_util.h"
>+#include "compiler/translator/tree_util/IntermTraverse.h"
>+#include "compiler/translator/tree_util/RunAtTheEndOfShader.h"
>+
>+namespace sh
>+{
>+
>+namespace
>+{
>+
>+constexpr const ImmutableString kGlFragDataString("gl_FragData");
>+
>+class GLFragColorBroadcastTraverser : public TIntermTraverser
>+{
>+  public:
>+    GLFragColorBroadcastTraverser(int maxDrawBuffers, TSymbolTable *symbolTable, int shaderVersion)
>+        : TIntermTraverser(true, false, false, symbolTable),
>+          mGLFragColorUsed(false),
>+          mMaxDrawBuffers(maxDrawBuffers),
>+          mShaderVersion(shaderVersion)
>+    {}
>+
>+    void broadcastGLFragColor(TIntermBlock *root);
>+
>+    bool isGLFragColorUsed() const { return mGLFragColorUsed; }
>+
>+  protected:
>+    void visitSymbol(TIntermSymbol *node) override;
>+
>+    TIntermBinary *constructGLFragDataNode(int index) const;
>+    TIntermBinary *constructGLFragDataAssignNode(int index) const;
>+
>+  private:
>+    bool mGLFragColorUsed;
>+    int mMaxDrawBuffers;
>+    const int mShaderVersion;
>+};
>+
>+TIntermBinary *GLFragColorBroadcastTraverser::constructGLFragDataNode(int index) const
>+{
>+    TIntermSymbol *symbol =
>+        ReferenceBuiltInVariable(kGlFragDataString, *mSymbolTable, mShaderVersion);
>+    TIntermTyped *indexNode = CreateIndexNode(index);
>+
>+    TIntermBinary *binary = new TIntermBinary(EOpIndexDirect, symbol, indexNode);
>+    return binary;
>+}
>+
>+TIntermBinary *GLFragColorBroadcastTraverser::constructGLFragDataAssignNode(int index) const
>+{
>+    TIntermTyped *fragDataIndex = constructGLFragDataNode(index);
>+    TIntermTyped *fragDataZero  = constructGLFragDataNode(0);
>+
>+    return new TIntermBinary(EOpAssign, fragDataIndex, fragDataZero);
>+}
>+
>+void GLFragColorBroadcastTraverser::visitSymbol(TIntermSymbol *node)
>+{
>+    if (node->variable().symbolType() == SymbolType::BuiltIn && node->getName() == "gl_FragColor")
>+    {
>+        queueReplacement(constructGLFragDataNode(0), OriginalNode::IS_DROPPED);
>+        mGLFragColorUsed = true;
>+    }
>+}
>+
>+void GLFragColorBroadcastTraverser::broadcastGLFragColor(TIntermBlock *root)
>+{
>+    ASSERT(mMaxDrawBuffers > 1);
>+    if (!mGLFragColorUsed)
>+    {
>+        return;
>+    }
>+
>+    TIntermBlock *broadcastBlock = new TIntermBlock();
>+    // Now insert statements
>+    //   gl_FragData[1] = gl_FragData[0];
>+    //   ...
>+    //   gl_FragData[maxDrawBuffers - 1] = gl_FragData[0];
>+    for (int colorIndex = 1; colorIndex < mMaxDrawBuffers; ++colorIndex)
>+    {
>+        broadcastBlock->appendStatement(constructGLFragDataAssignNode(colorIndex));
>+    }
>+    RunAtTheEndOfShader(root, broadcastBlock, mSymbolTable);
>+}
>+
>+}  // namespace
>+
>+void EmulateGLFragColorBroadcast(TIntermBlock *root,
>+                                 int maxDrawBuffers,
>+                                 std::vector<sh::OutputVariable> *outputVariables,
>+                                 TSymbolTable *symbolTable,
>+                                 int shaderVersion)
>+{
>+    ASSERT(maxDrawBuffers > 1);
>+    GLFragColorBroadcastTraverser traverser(maxDrawBuffers, symbolTable, shaderVersion);
>+    root->traverse(&traverser);
>+    if (traverser.isGLFragColorUsed())
>+    {
>+        traverser.updateTree();
>+        traverser.broadcastGLFragColor(root);
>+        for (auto &var : *outputVariables)
>+        {
>+            if (var.name == "gl_FragColor")
>+            {
>+                // TODO(zmo): Find a way to keep the original variable information.
>+                var.name       = "gl_FragData";
>+                var.mappedName = "gl_FragData";
>+                var.arraySizes.push_back(maxDrawBuffers);
>+                ASSERT(var.arraySizes.size() == 1u);
>+            }
>+        }
>+    }
>+}
>+
>+}  // namespace sh
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/EmulateGLFragColorBroadcast.h b/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/EmulateGLFragColorBroadcast.h
>new file mode 100644
>index 00000000000..f6bf549bacc
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/EmulateGLFragColorBroadcast.h
>@@ -0,0 +1,31 @@
>+//
>+// Copyright (c) 2002-2016 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// Emulate gl_FragColor broadcast behaviors in ES2 where
>+// GL_EXT_draw_buffers is explicitly enabled in a fragment shader.
>+//
>+
>+#ifndef COMPILER_TRANSLATOR_TREEOPS_EMULATEGLFRAGCOLORBROADCAST_H_
>+#define COMPILER_TRANSLATOR_TREEOPS_EMULATEGLFRAGCOLORBROADCAST_H_
>+
>+#include <vector>
>+
>+namespace sh
>+{
>+struct OutputVariable;
>+class TIntermBlock;
>+class TSymbolTable;
>+
>+// Replace all gl_FragColor with gl_FragData[0], and in the end of main() function,
>+// assign gl_FragData[1] ... gl_FragData[maxDrawBuffers - 1] with gl_FragData[0].
>+// If gl_FragColor is in outputVariables, it is replaced by gl_FragData.
>+void EmulateGLFragColorBroadcast(TIntermBlock *root,
>+                                 int maxDrawBuffers,
>+                                 std::vector<OutputVariable> *outputVariables,
>+                                 TSymbolTable *symbolTable,
>+                                 int shaderVersion);
>+}  // namespace sh
>+
>+#endif  // COMPILER_TRANSLATOR_TREEOPS_EMULATEGLFRAGCOLORBROADCAST_H_
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/EmulatePrecision.cpp b/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/EmulatePrecision.cpp
>new file mode 100644
>index 00000000000..ba19bd112ef
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/EmulatePrecision.cpp
>@@ -0,0 +1,776 @@
>+//
>+// Copyright (c) 2002-2014 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+
>+#include "compiler/translator/tree_ops/EmulatePrecision.h"
>+
>+#include "compiler/translator/FunctionLookup.h"
>+
>+#include <memory>
>+
>+namespace sh
>+{
>+
>+namespace
>+{
>+
>+constexpr const ImmutableString kParamXName("x");
>+constexpr const ImmutableString kParamYName("y");
>+constexpr const ImmutableString kAngleFrmString("angle_frm");
>+constexpr const ImmutableString kAngleFrlString("angle_frl");
>+
>+class RoundingHelperWriter : angle::NonCopyable
>+{
>+  public:
>+    static RoundingHelperWriter *createHelperWriter(const ShShaderOutput outputLanguage);
>+
>+    void writeCommonRoundingHelpers(TInfoSinkBase &sink, const int shaderVersion);
>+    void writeCompoundAssignmentHelper(TInfoSinkBase &sink,
>+                                       const char *lType,
>+                                       const char *rType,
>+                                       const char *opStr,
>+                                       const char *opNameStr);
>+
>+    virtual ~RoundingHelperWriter() {}
>+
>+  protected:
>+    RoundingHelperWriter(const ShShaderOutput outputLanguage) : mOutputLanguage(outputLanguage) {}
>+    RoundingHelperWriter() = delete;
>+
>+    const ShShaderOutput mOutputLanguage;
>+
>+  private:
>+    virtual std::string getTypeString(const char *glslType)                               = 0;
>+    virtual void writeFloatRoundingHelpers(TInfoSinkBase &sink)                           = 0;
>+    virtual void writeVectorRoundingHelpers(TInfoSinkBase &sink, const unsigned int size) = 0;
>+    virtual void writeMatrixRoundingHelper(TInfoSinkBase &sink,
>+                                           const unsigned int columns,
>+                                           const unsigned int rows,
>+                                           const char *functionName)                      = 0;
>+};
>+
>+class RoundingHelperWriterGLSL : public RoundingHelperWriter
>+{
>+  public:
>+    RoundingHelperWriterGLSL(const ShShaderOutput outputLanguage)
>+        : RoundingHelperWriter(outputLanguage)
>+    {}
>+
>+  private:
>+    std::string getTypeString(const char *glslType) override;
>+    void writeFloatRoundingHelpers(TInfoSinkBase &sink) override;
>+    void writeVectorRoundingHelpers(TInfoSinkBase &sink, const unsigned int size) override;
>+    void writeMatrixRoundingHelper(TInfoSinkBase &sink,
>+                                   const unsigned int columns,
>+                                   const unsigned int rows,
>+                                   const char *functionName) override;
>+};
>+
>+class RoundingHelperWriterESSL : public RoundingHelperWriterGLSL
>+{
>+  public:
>+    RoundingHelperWriterESSL(const ShShaderOutput outputLanguage)
>+        : RoundingHelperWriterGLSL(outputLanguage)
>+    {}
>+
>+  private:
>+    std::string getTypeString(const char *glslType) override;
>+};
>+
>+class RoundingHelperWriterHLSL : public RoundingHelperWriter
>+{
>+  public:
>+    RoundingHelperWriterHLSL(const ShShaderOutput outputLanguage)
>+        : RoundingHelperWriter(outputLanguage)
>+    {}
>+
>+  private:
>+    std::string getTypeString(const char *glslType) override;
>+    void writeFloatRoundingHelpers(TInfoSinkBase &sink) override;
>+    void writeVectorRoundingHelpers(TInfoSinkBase &sink, const unsigned int size) override;
>+    void writeMatrixRoundingHelper(TInfoSinkBase &sink,
>+                                   const unsigned int columns,
>+                                   const unsigned int rows,
>+                                   const char *functionName) override;
>+};
>+
>+RoundingHelperWriter *RoundingHelperWriter::createHelperWriter(const ShShaderOutput outputLanguage)
>+{
>+    ASSERT(EmulatePrecision::SupportedInLanguage(outputLanguage));
>+    switch (outputLanguage)
>+    {
>+        case SH_HLSL_4_1_OUTPUT:
>+            return new RoundingHelperWriterHLSL(outputLanguage);
>+        case SH_ESSL_OUTPUT:
>+            return new RoundingHelperWriterESSL(outputLanguage);
>+        default:
>+            return new RoundingHelperWriterGLSL(outputLanguage);
>+    }
>+}
>+
>+void RoundingHelperWriter::writeCommonRoundingHelpers(TInfoSinkBase &sink, const int shaderVersion)
>+{
>+    // Write the angle_frm functions that round floating point numbers to
>+    // half precision, and angle_frl functions that round them to minimum lowp
>+    // precision.
>+
>+    writeFloatRoundingHelpers(sink);
>+    writeVectorRoundingHelpers(sink, 2);
>+    writeVectorRoundingHelpers(sink, 3);
>+    writeVectorRoundingHelpers(sink, 4);
>+    if (shaderVersion > 100)
>+    {
>+        for (unsigned int columns = 2; columns <= 4; ++columns)
>+        {
>+            for (unsigned int rows = 2; rows <= 4; ++rows)
>+            {
>+                writeMatrixRoundingHelper(sink, columns, rows, "angle_frm");
>+                writeMatrixRoundingHelper(sink, columns, rows, "angle_frl");
>+            }
>+        }
>+    }
>+    else
>+    {
>+        for (unsigned int size = 2; size <= 4; ++size)
>+        {
>+            writeMatrixRoundingHelper(sink, size, size, "angle_frm");
>+            writeMatrixRoundingHelper(sink, size, size, "angle_frl");
>+        }
>+    }
>+}
>+
>+void RoundingHelperWriter::writeCompoundAssignmentHelper(TInfoSinkBase &sink,
>+                                                         const char *lType,
>+                                                         const char *rType,
>+                                                         const char *opStr,
>+                                                         const char *opNameStr)
>+{
>+    std::string lTypeStr = getTypeString(lType);
>+    std::string rTypeStr = getTypeString(rType);
>+
>+    // Note that y should be passed through angle_frm at the function call site,
>+    // but x can't be passed through angle_frm there since it is an inout parameter.
>+    // So only pass x and the result through angle_frm here.
>+    // clang-format off
>+    sink <<
>+        lTypeStr << " angle_compound_" << opNameStr << "_frm(inout " << lTypeStr << " x, in " << rTypeStr << " y) {\n"
>+        "    x = angle_frm(angle_frm(x) " << opStr << " y);\n"
>+        "    return x;\n"
>+        "}\n";
>+    sink <<
>+        lTypeStr << " angle_compound_" << opNameStr << "_frl(inout " << lTypeStr << " x, in " << rTypeStr << " y) {\n"
>+        "    x = angle_frl(angle_frl(x) " << opStr << " y);\n"
>+        "    return x;\n"
>+        "}\n";
>+    // clang-format on
>+}
>+
>+std::string RoundingHelperWriterGLSL::getTypeString(const char *glslType)
>+{
>+    return glslType;
>+}
>+
>+std::string RoundingHelperWriterESSL::getTypeString(const char *glslType)
>+{
>+    std::stringstream typeStrStr = sh::InitializeStream<std::stringstream>();
>+    typeStrStr << "highp " << glslType;
>+    return typeStrStr.str();
>+}
>+
>+void RoundingHelperWriterGLSL::writeFloatRoundingHelpers(TInfoSinkBase &sink)
>+{
>+    // Unoptimized version of angle_frm for single floats:
>+    //
>+    // int webgl_maxNormalExponent(in int exponentBits)
>+    // {
>+    //     int possibleExponents = int(exp2(float(exponentBits)));
>+    //     int exponentBias = possibleExponents / 2 - 1;
>+    //     int allExponentBitsOne = possibleExponents - 1;
>+    //     return (allExponentBitsOne - 1) - exponentBias;
>+    // }
>+    //
>+    // float angle_frm(in float x)
>+    // {
>+    //     int mantissaBits = 10;
>+    //     int exponentBits = 5;
>+    //     float possibleMantissas = exp2(float(mantissaBits));
>+    //     float mantissaMax = 2.0 - 1.0 / possibleMantissas;
>+    //     int maxNE = webgl_maxNormalExponent(exponentBits);
>+    //     float max = exp2(float(maxNE)) * mantissaMax;
>+    //     if (x > max)
>+    //     {
>+    //         return max;
>+    //     }
>+    //     if (x < -max)
>+    //     {
>+    //         return -max;
>+    //     }
>+    //     float exponent = floor(log2(abs(x)));
>+    //     if (abs(x) == 0.0 || exponent < -float(maxNE))
>+    //     {
>+    //         return 0.0 * sign(x)
>+    //     }
>+    //     x = x * exp2(-(exponent - float(mantissaBits)));
>+    //     x = sign(x) * floor(abs(x));
>+    //     return x * exp2(exponent - float(mantissaBits));
>+    // }
>+
>+    // All numbers with a magnitude less than 2^-15 are subnormal, and are
>+    // flushed to zero.
>+
>+    // Note the constant numbers below:
>+    // a) 65504 is the maximum possible mantissa (1.1111111111 in binary) times
>+    //    2^15, the maximum normal exponent.
>+    // b) 10.0 is the number of mantissa bits.
>+    // c) -25.0 is the minimum normal half-float exponent -15.0 minus the number
>+    //    of mantissa bits.
>+    // d) + 1e-30 is to make sure the argument of log2() won't be zero. It can
>+    //    only affect the result of log2 on x where abs(x) < 1e-22. Since these
>+    //    numbers will be flushed to zero either way (2^-15 is the smallest
>+    //    normal positive number), this does not introduce any error.
>+
>+    std::string floatType = getTypeString("float");
>+
>+    // clang-format off
>+    sink <<
>+        floatType << " angle_frm(in " << floatType << " x) {\n"
>+        "    x = clamp(x, -65504.0, 65504.0);\n"
>+        "    " << floatType << " exponent = floor(log2(abs(x) + 1e-30)) - 10.0;\n"
>+        "    bool isNonZero = (exponent >= -25.0);\n"
>+        "    x = x * exp2(-exponent);\n"
>+        "    x = sign(x) * floor(abs(x));\n"
>+        "    return x * exp2(exponent) * float(isNonZero);\n"
>+        "}\n";
>+
>+    sink <<
>+        floatType << " angle_frl(in " << floatType << " x) {\n"
>+        "    x = clamp(x, -2.0, 2.0);\n"
>+        "    x = x * 256.0;\n"
>+        "    x = sign(x) * floor(abs(x));\n"
>+        "    return x * 0.00390625;\n"
>+        "}\n";
>+    // clang-format on
>+}
>+
>+void RoundingHelperWriterGLSL::writeVectorRoundingHelpers(TInfoSinkBase &sink,
>+                                                          const unsigned int size)
>+{
>+    std::stringstream vecTypeStrStr = sh::InitializeStream<std::stringstream>();
>+    vecTypeStrStr << "vec" << size;
>+    std::string vecType = getTypeString(vecTypeStrStr.str().c_str());
>+
>+    // clang-format off
>+    sink <<
>+        vecType << " angle_frm(in " << vecType << " v) {\n"
>+        "    v = clamp(v, -65504.0, 65504.0);\n"
>+        "    " << vecType << " exponent = floor(log2(abs(v) + 1e-30)) - 10.0;\n"
>+        "    bvec" << size << " isNonZero = greaterThanEqual(exponent, vec" << size << "(-25.0));\n"
>+        "    v = v * exp2(-exponent);\n"
>+        "    v = sign(v) * floor(abs(v));\n"
>+        "    return v * exp2(exponent) * vec" << size << "(isNonZero);\n"
>+        "}\n";
>+
>+    sink <<
>+        vecType << " angle_frl(in " << vecType << " v) {\n"
>+        "    v = clamp(v, -2.0, 2.0);\n"
>+        "    v = v * 256.0;\n"
>+        "    v = sign(v) * floor(abs(v));\n"
>+        "    return v * 0.00390625;\n"
>+        "}\n";
>+    // clang-format on
>+}
>+
>+void RoundingHelperWriterGLSL::writeMatrixRoundingHelper(TInfoSinkBase &sink,
>+                                                         const unsigned int columns,
>+                                                         const unsigned int rows,
>+                                                         const char *functionName)
>+{
>+    std::stringstream matTypeStrStr = sh::InitializeStream<std::stringstream>();
>+    matTypeStrStr << "mat" << columns;
>+    if (rows != columns)
>+    {
>+        matTypeStrStr << "x" << rows;
>+    }
>+    std::string matType = getTypeString(matTypeStrStr.str().c_str());
>+
>+    sink << matType << " " << functionName << "(in " << matType << " m) {\n"
>+         << "    " << matType << " rounded;\n";
>+
>+    for (unsigned int i = 0; i < columns; ++i)
>+    {
>+        sink << "    rounded[" << i << "] = " << functionName << "(m[" << i << "]);\n";
>+    }
>+
>+    sink << "    return rounded;\n"
>+            "}\n";
>+}
>+
>+static const char *GetHLSLTypeStr(const char *floatTypeStr)
>+{
>+    if (strcmp(floatTypeStr, "float") == 0)
>+    {
>+        return "float";
>+    }
>+    if (strcmp(floatTypeStr, "vec2") == 0)
>+    {
>+        return "float2";
>+    }
>+    if (strcmp(floatTypeStr, "vec3") == 0)
>+    {
>+        return "float3";
>+    }
>+    if (strcmp(floatTypeStr, "vec4") == 0)
>+    {
>+        return "float4";
>+    }
>+    if (strcmp(floatTypeStr, "mat2") == 0)
>+    {
>+        return "float2x2";
>+    }
>+    if (strcmp(floatTypeStr, "mat3") == 0)
>+    {
>+        return "float3x3";
>+    }
>+    if (strcmp(floatTypeStr, "mat4") == 0)
>+    {
>+        return "float4x4";
>+    }
>+    if (strcmp(floatTypeStr, "mat2x3") == 0)
>+    {
>+        return "float2x3";
>+    }
>+    if (strcmp(floatTypeStr, "mat2x4") == 0)
>+    {
>+        return "float2x4";
>+    }
>+    if (strcmp(floatTypeStr, "mat3x2") == 0)
>+    {
>+        return "float3x2";
>+    }
>+    if (strcmp(floatTypeStr, "mat3x4") == 0)
>+    {
>+        return "float3x4";
>+    }
>+    if (strcmp(floatTypeStr, "mat4x2") == 0)
>+    {
>+        return "float4x2";
>+    }
>+    if (strcmp(floatTypeStr, "mat4x3") == 0)
>+    {
>+        return "float4x3";
>+    }
>+    UNREACHABLE();
>+    return nullptr;
>+}
>+
>+std::string RoundingHelperWriterHLSL::getTypeString(const char *glslType)
>+{
>+    return GetHLSLTypeStr(glslType);
>+}
>+
>+void RoundingHelperWriterHLSL::writeFloatRoundingHelpers(TInfoSinkBase &sink)
>+{
>+    // In HLSL scalars are the same as 1-vectors.
>+    writeVectorRoundingHelpers(sink, 1);
>+}
>+
>+void RoundingHelperWriterHLSL::writeVectorRoundingHelpers(TInfoSinkBase &sink,
>+                                                          const unsigned int size)
>+{
>+    std::stringstream vecTypeStrStr = sh::InitializeStream<std::stringstream>();
>+    vecTypeStrStr << "float" << size;
>+    std::string vecType = vecTypeStrStr.str();
>+
>+    // clang-format off
>+    sink <<
>+        vecType << " angle_frm(" << vecType << " v) {\n"
>+        "    v = clamp(v, -65504.0, 65504.0);\n"
>+        "    " << vecType << " exponent = floor(log2(abs(v) + 1e-30)) - 10.0;\n"
>+        "    bool" << size << " isNonZero = exponent < -25.0;\n"
>+        "    v = v * exp2(-exponent);\n"
>+        "    v = sign(v) * floor(abs(v));\n"
>+        "    return v * exp2(exponent) * (float" << size << ")(isNonZero);\n"
>+        "}\n";
>+
>+    sink <<
>+        vecType << " angle_frl(" << vecType << " v) {\n"
>+        "    v = clamp(v, -2.0, 2.0);\n"
>+        "    v = v * 256.0;\n"
>+        "    v = sign(v) * floor(abs(v));\n"
>+        "    return v * 0.00390625;\n"
>+        "}\n";
>+    // clang-format on
>+}
>+
>+void RoundingHelperWriterHLSL::writeMatrixRoundingHelper(TInfoSinkBase &sink,
>+                                                         const unsigned int columns,
>+                                                         const unsigned int rows,
>+                                                         const char *functionName)
>+{
>+    std::stringstream matTypeStrStr = sh::InitializeStream<std::stringstream>();
>+    matTypeStrStr << "float" << columns << "x" << rows;
>+    std::string matType = matTypeStrStr.str();
>+
>+    sink << matType << " " << functionName << "(" << matType << " m) {\n"
>+         << "    " << matType << " rounded;\n";
>+
>+    for (unsigned int i = 0; i < columns; ++i)
>+    {
>+        sink << "    rounded[" << i << "] = " << functionName << "(m[" << i << "]);\n";
>+    }
>+
>+    sink << "    return rounded;\n"
>+            "}\n";
>+}
>+
>+bool canRoundFloat(const TType &type)
>+{
>+    return type.getBasicType() == EbtFloat && !type.isArray() &&
>+           (type.getPrecision() == EbpLow || type.getPrecision() == EbpMedium);
>+}
>+
>+bool ParentUsesResult(TIntermNode *parent, TIntermTyped *node)
>+{
>+    if (!parent)
>+    {
>+        return false;
>+    }
>+
>+    TIntermBlock *blockParent = parent->getAsBlock();
>+    // If the parent is a block, the result is not assigned anywhere,
>+    // so rounding it is not needed. In particular, this can avoid a lot of
>+    // unnecessary rounding of unused return values of assignment.
>+    if (blockParent)
>+    {
>+        return false;
>+    }
>+    TIntermBinary *binaryParent = parent->getAsBinaryNode();
>+    if (binaryParent && binaryParent->getOp() == EOpComma && (binaryParent->getRight() != node))
>+    {
>+        return false;
>+    }
>+    return true;
>+}
>+
>+bool ParentConstructorTakesCareOfRounding(TIntermNode *parent, TIntermTyped *node)
>+{
>+    if (!parent)
>+    {
>+        return false;
>+    }
>+    TIntermAggregate *parentConstructor = parent->getAsAggregate();
>+    if (!parentConstructor || parentConstructor->getOp() != EOpConstruct)
>+    {
>+        return false;
>+    }
>+    if (parentConstructor->getPrecision() != node->getPrecision())
>+    {
>+        return false;
>+    }
>+    return canRoundFloat(parentConstructor->getType());
>+}
>+
>+}  // namespace
>+
>+EmulatePrecision::EmulatePrecision(TSymbolTable *symbolTable)
>+    : TLValueTrackingTraverser(true, true, true, symbolTable), mDeclaringVariables(false)
>+{}
>+
>+void EmulatePrecision::visitSymbol(TIntermSymbol *node)
>+{
>+    TIntermNode *parent = getParentNode();
>+    if (canRoundFloat(node->getType()) && ParentUsesResult(parent, node) &&
>+        !ParentConstructorTakesCareOfRounding(parent, node) && !mDeclaringVariables &&
>+        !isLValueRequiredHere())
>+    {
>+        TIntermNode *replacement = createRoundingFunctionCallNode(node);
>+        queueReplacement(replacement, OriginalNode::BECOMES_CHILD);
>+    }
>+}
>+
>+bool EmulatePrecision::visitBinary(Visit visit, TIntermBinary *node)
>+{
>+    bool visitChildren = true;
>+
>+    TOperator op = node->getOp();
>+
>+    // RHS of initialize is not being declared.
>+    if (op == EOpInitialize && visit == InVisit)
>+        mDeclaringVariables = false;
>+
>+    if ((op == EOpIndexDirectStruct) && visit == InVisit)
>+        visitChildren = false;
>+
>+    if (visit != PreVisit)
>+        return visitChildren;
>+
>+    const TType &type = node->getType();
>+    bool roundFloat   = canRoundFloat(type);
>+
>+    if (roundFloat)
>+    {
>+        switch (op)
>+        {
>+            // Math operators that can result in a float may need to apply rounding to the return
>+            // value. Note that in the case of assignment, the rounding is applied to its return
>+            // value here, not the value being assigned.
>+            case EOpAssign:
>+            case EOpAdd:
>+            case EOpSub:
>+            case EOpMul:
>+            case EOpDiv:
>+            case EOpVectorTimesScalar:
>+            case EOpVectorTimesMatrix:
>+            case EOpMatrixTimesVector:
>+            case EOpMatrixTimesScalar:
>+            case EOpMatrixTimesMatrix:
>+            {
>+                TIntermNode *parent = getParentNode();
>+                if (!ParentUsesResult(parent, node) ||
>+                    ParentConstructorTakesCareOfRounding(parent, node))
>+                {
>+                    break;
>+                }
>+                TIntermNode *replacement = createRoundingFunctionCallNode(node);
>+                queueReplacement(replacement, OriginalNode::BECOMES_CHILD);
>+                break;
>+            }
>+
>+            // Compound assignment cases need to replace the operator with a function call.
>+            case EOpAddAssign:
>+            {
>+                mEmulateCompoundAdd.insert(
>+                    TypePair(type.getBuiltInTypeNameString(),
>+                             node->getRight()->getType().getBuiltInTypeNameString()));
>+                TIntermNode *replacement = createCompoundAssignmentFunctionCallNode(
>+                    node->getLeft(), node->getRight(), "add");
>+                queueReplacement(replacement, OriginalNode::IS_DROPPED);
>+                break;
>+            }
>+            case EOpSubAssign:
>+            {
>+                mEmulateCompoundSub.insert(
>+                    TypePair(type.getBuiltInTypeNameString(),
>+                             node->getRight()->getType().getBuiltInTypeNameString()));
>+                TIntermNode *replacement = createCompoundAssignmentFunctionCallNode(
>+                    node->getLeft(), node->getRight(), "sub");
>+                queueReplacement(replacement, OriginalNode::IS_DROPPED);
>+                break;
>+            }
>+            case EOpMulAssign:
>+            case EOpVectorTimesMatrixAssign:
>+            case EOpVectorTimesScalarAssign:
>+            case EOpMatrixTimesScalarAssign:
>+            case EOpMatrixTimesMatrixAssign:
>+            {
>+                mEmulateCompoundMul.insert(
>+                    TypePair(type.getBuiltInTypeNameString(),
>+                             node->getRight()->getType().getBuiltInTypeNameString()));
>+                TIntermNode *replacement = createCompoundAssignmentFunctionCallNode(
>+                    node->getLeft(), node->getRight(), "mul");
>+                queueReplacement(replacement, OriginalNode::IS_DROPPED);
>+                break;
>+            }
>+            case EOpDivAssign:
>+            {
>+                mEmulateCompoundDiv.insert(
>+                    TypePair(type.getBuiltInTypeNameString(),
>+                             node->getRight()->getType().getBuiltInTypeNameString()));
>+                TIntermNode *replacement = createCompoundAssignmentFunctionCallNode(
>+                    node->getLeft(), node->getRight(), "div");
>+                queueReplacement(replacement, OriginalNode::IS_DROPPED);
>+                break;
>+            }
>+            default:
>+                // The rest of the binary operations should not need precision emulation.
>+                break;
>+        }
>+    }
>+    return visitChildren;
>+}
>+
>+bool EmulatePrecision::visitDeclaration(Visit visit, TIntermDeclaration *node)
>+{
>+    // Variable or interface block declaration.
>+    if (visit == PreVisit)
>+    {
>+        mDeclaringVariables = true;
>+    }
>+    else if (visit == InVisit)
>+    {
>+        mDeclaringVariables = true;
>+    }
>+    else
>+    {
>+        mDeclaringVariables = false;
>+    }
>+    return true;
>+}
>+
>+bool EmulatePrecision::visitInvariantDeclaration(Visit visit, TIntermInvariantDeclaration *node)
>+{
>+    return false;
>+}
>+
>+bool EmulatePrecision::visitAggregate(Visit visit, TIntermAggregate *node)
>+{
>+    if (visit != PreVisit)
>+        return true;
>+
>+    // User-defined function return values are not rounded. The calculations that produced
>+    // the value inside the function definition should have been rounded.
>+    TOperator op = node->getOp();
>+    if (op == EOpCallInternalRawFunction || op == EOpCallFunctionInAST ||
>+        (op == EOpConstruct && node->getBasicType() == EbtStruct))
>+    {
>+        return true;
>+    }
>+
>+    TIntermNode *parent = getParentNode();
>+    if (canRoundFloat(node->getType()) && ParentUsesResult(parent, node) &&
>+        !ParentConstructorTakesCareOfRounding(parent, node))
>+    {
>+        TIntermNode *replacement = createRoundingFunctionCallNode(node);
>+        queueReplacement(replacement, OriginalNode::BECOMES_CHILD);
>+    }
>+    return true;
>+}
>+
>+bool EmulatePrecision::visitUnary(Visit visit, TIntermUnary *node)
>+{
>+    switch (node->getOp())
>+    {
>+        case EOpNegative:
>+        case EOpLogicalNot:
>+        case EOpPostIncrement:
>+        case EOpPostDecrement:
>+        case EOpPreIncrement:
>+        case EOpPreDecrement:
>+        case EOpLogicalNotComponentWise:
>+            break;
>+        default:
>+            if (canRoundFloat(node->getType()) && visit == PreVisit)
>+            {
>+                TIntermNode *replacement = createRoundingFunctionCallNode(node);
>+                queueReplacement(replacement, OriginalNode::BECOMES_CHILD);
>+            }
>+            break;
>+    }
>+
>+    return true;
>+}
>+
>+void EmulatePrecision::writeEmulationHelpers(TInfoSinkBase &sink,
>+                                             const int shaderVersion,
>+                                             const ShShaderOutput outputLanguage)
>+{
>+    std::unique_ptr<RoundingHelperWriter> roundingHelperWriter(
>+        RoundingHelperWriter::createHelperWriter(outputLanguage));
>+
>+    roundingHelperWriter->writeCommonRoundingHelpers(sink, shaderVersion);
>+
>+    EmulationSet::const_iterator it;
>+    for (it = mEmulateCompoundAdd.begin(); it != mEmulateCompoundAdd.end(); it++)
>+        roundingHelperWriter->writeCompoundAssignmentHelper(sink, it->lType, it->rType, "+", "add");
>+    for (it = mEmulateCompoundSub.begin(); it != mEmulateCompoundSub.end(); it++)
>+        roundingHelperWriter->writeCompoundAssignmentHelper(sink, it->lType, it->rType, "-", "sub");
>+    for (it = mEmulateCompoundDiv.begin(); it != mEmulateCompoundDiv.end(); it++)
>+        roundingHelperWriter->writeCompoundAssignmentHelper(sink, it->lType, it->rType, "/", "div");
>+    for (it = mEmulateCompoundMul.begin(); it != mEmulateCompoundMul.end(); it++)
>+        roundingHelperWriter->writeCompoundAssignmentHelper(sink, it->lType, it->rType, "*", "mul");
>+}
>+
>+// static
>+bool EmulatePrecision::SupportedInLanguage(const ShShaderOutput outputLanguage)
>+{
>+    switch (outputLanguage)
>+    {
>+        case SH_HLSL_4_1_OUTPUT:
>+        case SH_ESSL_OUTPUT:
>+            return true;
>+        default:
>+            // Other languages not yet supported
>+            return (outputLanguage == SH_GLSL_COMPATIBILITY_OUTPUT ||
>+                    sh::IsGLSL130OrNewer(outputLanguage));
>+    }
>+}
>+
>+const TFunction *EmulatePrecision::getInternalFunction(const ImmutableString &functionName,
>+                                                       const TType &returnType,
>+                                                       TIntermSequence *arguments,
>+                                                       const TVector<const TVariable *> &parameters,
>+                                                       bool knownToNotHaveSideEffects)
>+{
>+    ImmutableString mangledName = TFunctionLookup::GetMangledName(functionName.data(), *arguments);
>+    if (mInternalFunctions.find(mangledName) == mInternalFunctions.end())
>+    {
>+        TFunction *func = new TFunction(mSymbolTable, functionName, SymbolType::AngleInternal,
>+                                        new TType(returnType), knownToNotHaveSideEffects);
>+        ASSERT(parameters.size() == arguments->size());
>+        for (size_t i = 0; i < parameters.size(); ++i)
>+        {
>+            func->addParameter(parameters[i]);
>+        }
>+        mInternalFunctions[mangledName] = func;
>+    }
>+    return mInternalFunctions[mangledName];
>+}
>+
>+TIntermAggregate *EmulatePrecision::createRoundingFunctionCallNode(TIntermTyped *roundedChild)
>+{
>+    const ImmutableString *roundFunctionName = &kAngleFrmString;
>+    if (roundedChild->getPrecision() == EbpLow)
>+        roundFunctionName = &kAngleFrlString;
>+    TIntermSequence *arguments = new TIntermSequence();
>+    arguments->push_back(roundedChild);
>+
>+    TVector<const TVariable *> parameters;
>+    TType *paramType = new TType(roundedChild->getType());
>+    paramType->setPrecision(EbpHigh);
>+    paramType->setQualifier(EvqIn);
>+    parameters.push_back(new TVariable(mSymbolTable, kParamXName,
>+                                       static_cast<const TType *>(paramType),
>+                                       SymbolType::AngleInternal));
>+
>+    return TIntermAggregate::CreateRawFunctionCall(
>+        *getInternalFunction(*roundFunctionName, roundedChild->getType(), arguments, parameters,
>+                             true),
>+        arguments);
>+}
>+
>+TIntermAggregate *EmulatePrecision::createCompoundAssignmentFunctionCallNode(TIntermTyped *left,
>+                                                                             TIntermTyped *right,
>+                                                                             const char *opNameStr)
>+{
>+    std::stringstream strstr = sh::InitializeStream<std::stringstream>();
>+    if (left->getPrecision() == EbpMedium)
>+        strstr << "angle_compound_" << opNameStr << "_frm";
>+    else
>+        strstr << "angle_compound_" << opNameStr << "_frl";
>+    ImmutableString functionName = ImmutableString(strstr.str());
>+    TIntermSequence *arguments   = new TIntermSequence();
>+    arguments->push_back(left);
>+    arguments->push_back(right);
>+
>+    TVector<const TVariable *> parameters;
>+    TType *leftParamType = new TType(left->getType());
>+    leftParamType->setPrecision(EbpHigh);
>+    leftParamType->setQualifier(EvqOut);
>+    parameters.push_back(new TVariable(mSymbolTable, kParamXName,
>+                                       static_cast<const TType *>(leftParamType),
>+                                       SymbolType::AngleInternal));
>+    TType *rightParamType = new TType(right->getType());
>+    rightParamType->setPrecision(EbpHigh);
>+    rightParamType->setQualifier(EvqIn);
>+    parameters.push_back(new TVariable(mSymbolTable, kParamYName,
>+                                       static_cast<const TType *>(rightParamType),
>+                                       SymbolType::AngleInternal));
>+
>+    return TIntermAggregate::CreateRawFunctionCall(
>+        *getInternalFunction(functionName, left->getType(), arguments, parameters, false),
>+        arguments);
>+}
>+
>+}  // namespace sh
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/EmulatePrecision.h b/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/EmulatePrecision.h
>new file mode 100644
>index 00000000000..10501fa1d0b
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/EmulatePrecision.h
>@@ -0,0 +1,85 @@
>+//
>+// Copyright (c) 2002-2014 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+
>+#ifndef COMPILER_TRANSLATOR_TREEOPS_EMULATE_PRECISION_H_
>+#define COMPILER_TRANSLATOR_TREEOPS_EMULATE_PRECISION_H_
>+
>+#include "GLSLANG/ShaderLang.h"
>+#include "common/angleutils.h"
>+#include "compiler/translator/Compiler.h"
>+#include "compiler/translator/InfoSink.h"
>+#include "compiler/translator/tree_util/IntermTraverse.h"
>+
>+// This class gathers all compound assignments from the AST and can then write
>+// the functions required for their precision emulation. This way there is no
>+// need to write a huge number of variations of the emulated compound assignment
>+// to every translated shader with emulation enabled.
>+
>+namespace sh
>+{
>+
>+class EmulatePrecision : public TLValueTrackingTraverser
>+{
>+  public:
>+    EmulatePrecision(TSymbolTable *symbolTable);
>+
>+    void visitSymbol(TIntermSymbol *node) override;
>+    bool visitBinary(Visit visit, TIntermBinary *node) override;
>+    bool visitUnary(Visit visit, TIntermUnary *node) override;
>+    bool visitAggregate(Visit visit, TIntermAggregate *node) override;
>+    bool visitInvariantDeclaration(Visit visit, TIntermInvariantDeclaration *node) override;
>+    bool visitDeclaration(Visit visit, TIntermDeclaration *node) override;
>+
>+    void writeEmulationHelpers(TInfoSinkBase &sink,
>+                               const int shaderVersion,
>+                               const ShShaderOutput outputLanguage);
>+
>+    static bool SupportedInLanguage(const ShShaderOutput outputLanguage);
>+
>+  private:
>+    struct TypePair
>+    {
>+        TypePair(const char *l, const char *r) : lType(l), rType(r) {}
>+
>+        const char *lType;
>+        const char *rType;
>+    };
>+
>+    struct TypePairComparator
>+    {
>+        bool operator()(const TypePair &l, const TypePair &r) const
>+        {
>+            if (l.lType == r.lType)
>+                return l.rType < r.rType;
>+            return l.lType < r.lType;
>+        }
>+    };
>+
>+    const TFunction *getInternalFunction(const ImmutableString &functionName,
>+                                         const TType &returnType,
>+                                         TIntermSequence *arguments,
>+                                         const TVector<const TVariable *> &parameters,
>+                                         bool knownToNotHaveSideEffects);
>+    TIntermAggregate *createRoundingFunctionCallNode(TIntermTyped *roundedChild);
>+    TIntermAggregate *createCompoundAssignmentFunctionCallNode(TIntermTyped *left,
>+                                                               TIntermTyped *right,
>+                                                               const char *opNameStr);
>+
>+    typedef std::set<TypePair, TypePairComparator> EmulationSet;
>+    EmulationSet mEmulateCompoundAdd;
>+    EmulationSet mEmulateCompoundSub;
>+    EmulationSet mEmulateCompoundMul;
>+    EmulationSet mEmulateCompoundDiv;
>+
>+    // Map from mangled name to function.
>+    TMap<ImmutableString, const TFunction *> mInternalFunctions;
>+
>+    bool mDeclaringVariables;
>+};
>+
>+}  // namespace sh
>+
>+#endif  // COMPILER_TRANSLATOR_TREEOPS_EMULATE_PRECISION_H_
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/ExpandIntegerPowExpressions.cpp b/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/ExpandIntegerPowExpressions.cpp
>new file mode 100644
>index 00000000000..0dc7f03e0e1
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/ExpandIntegerPowExpressions.cpp
>@@ -0,0 +1,146 @@
>+//
>+// Copyright (c) 2016 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// Implementation of the integer pow expressions HLSL bug workaround.
>+// See header for more info.
>+
>+#include "compiler/translator/tree_ops/ExpandIntegerPowExpressions.h"
>+
>+#include <cmath>
>+#include <cstdlib>
>+
>+#include "compiler/translator/tree_util/IntermNode_util.h"
>+#include "compiler/translator/tree_util/IntermTraverse.h"
>+
>+namespace sh
>+{
>+
>+namespace
>+{
>+
>+class Traverser : public TIntermTraverser
>+{
>+  public:
>+    static void Apply(TIntermNode *root, TSymbolTable *symbolTable);
>+
>+  private:
>+    Traverser(TSymbolTable *symbolTable);
>+    bool visitAggregate(Visit visit, TIntermAggregate *node) override;
>+    void nextIteration();
>+
>+    bool mFound = false;
>+};
>+
>+// static
>+void Traverser::Apply(TIntermNode *root, TSymbolTable *symbolTable)
>+{
>+    Traverser traverser(symbolTable);
>+    do
>+    {
>+        traverser.nextIteration();
>+        root->traverse(&traverser);
>+        if (traverser.mFound)
>+        {
>+            traverser.updateTree();
>+        }
>+    } while (traverser.mFound);
>+}
>+
>+Traverser::Traverser(TSymbolTable *symbolTable) : TIntermTraverser(true, false, false, symbolTable)
>+{}
>+
>+void Traverser::nextIteration()
>+{
>+    mFound = false;
>+}
>+
>+bool Traverser::visitAggregate(Visit visit, TIntermAggregate *node)
>+{
>+    if (mFound)
>+    {
>+        return false;
>+    }
>+
>+    // Test 0: skip non-pow operators.
>+    if (node->getOp() != EOpPow)
>+    {
>+        return true;
>+    }
>+
>+    const TIntermSequence *sequence = node->getSequence();
>+    ASSERT(sequence->size() == 2u);
>+    const TIntermConstantUnion *constantExponent = sequence->at(1)->getAsConstantUnion();
>+
>+    // Test 1: check for a single constant.
>+    if (!constantExponent || constantExponent->getNominalSize() != 1)
>+    {
>+        return true;
>+    }
>+
>+    ASSERT(constantExponent->getBasicType() == EbtFloat);
>+    float exponentValue = constantExponent->getConstantValue()->getFConst();
>+
>+    // Test 2: exponentValue is in the problematic range.
>+    if (exponentValue < -5.0f || exponentValue > 9.0f)
>+    {
>+        return true;
>+    }
>+
>+    // Test 3: exponentValue is integer or pretty close to an integer.
>+    if (std::abs(exponentValue - std::round(exponentValue)) > 0.0001f)
>+    {
>+        return true;
>+    }
>+
>+    // Test 4: skip -1, 0, and 1
>+    int exponent = static_cast<int>(std::round(exponentValue));
>+    int n        = std::abs(exponent);
>+    if (n < 2)
>+    {
>+        return true;
>+    }
>+
>+    // Potential problem case detected, apply workaround.
>+
>+    TIntermTyped *lhs = sequence->at(0)->getAsTyped();
>+    ASSERT(lhs);
>+
>+    TIntermDeclaration *lhsVariableDeclaration = nullptr;
>+    TVariable *lhsVariable =
>+        DeclareTempVariable(mSymbolTable, lhs, EvqTemporary, &lhsVariableDeclaration);
>+    insertStatementInParentBlock(lhsVariableDeclaration);
>+
>+    // Create a chain of n-1 multiples.
>+    TIntermTyped *current = CreateTempSymbolNode(lhsVariable);
>+    for (int i = 1; i < n; ++i)
>+    {
>+        TIntermBinary *mul = new TIntermBinary(EOpMul, current, CreateTempSymbolNode(lhsVariable));
>+        mul->setLine(node->getLine());
>+        current = mul;
>+    }
>+
>+    // For negative pow, compute the reciprocal of the positive pow.
>+    if (exponent < 0)
>+    {
>+        TConstantUnion *oneVal = new TConstantUnion();
>+        oneVal->setFConst(1.0f);
>+        TIntermConstantUnion *oneNode = new TIntermConstantUnion(oneVal, node->getType());
>+        TIntermBinary *div            = new TIntermBinary(EOpDiv, oneNode, current);
>+        current                       = div;
>+    }
>+
>+    queueReplacement(current, OriginalNode::IS_DROPPED);
>+    mFound = true;
>+    return false;
>+}
>+
>+}  // anonymous namespace
>+
>+void ExpandIntegerPowExpressions(TIntermNode *root, TSymbolTable *symbolTable)
>+{
>+    Traverser::Apply(root, symbolTable);
>+}
>+
>+}  // namespace sh
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/ExpandIntegerPowExpressions.h b/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/ExpandIntegerPowExpressions.h
>new file mode 100644
>index 00000000000..7ee5adab3ca
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/ExpandIntegerPowExpressions.h
>@@ -0,0 +1,29 @@
>+//
>+// Copyright (c) 2016 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// This mutating tree traversal works around a bug in the HLSL compiler optimizer with "pow" that
>+// manifests under the following conditions:
>+//
>+// - If pow() has a literal exponent value
>+// - ... and this value is integer or within 10e-6 of an integer
>+// - ... and it is in {-4, -3, -2, 2, 3, 4, 5, 6, 7, 8}
>+//
>+// The workaround is to replace the pow with a series of multiplies.
>+// See http://anglebug.com/851
>+
>+#ifndef COMPILER_TRANSLATOR_TREEOPS_EXPANDINTEGERPOWEXPRESSIONS_H_
>+#define COMPILER_TRANSLATOR_TREEOPS_EXPANDINTEGERPOWEXPRESSIONS_H_
>+
>+namespace sh
>+{
>+
>+class TIntermNode;
>+class TSymbolTable;
>+
>+void ExpandIntegerPowExpressions(TIntermNode *root, TSymbolTable *symbolTable);
>+
>+}  // namespace sh
>+
>+#endif  // COMPILER_TRANSLATOR_TREEOPS_EXPANDINTEGERPOWEXPRESSIONS_H_
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/FoldExpressions.cpp b/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/FoldExpressions.cpp
>new file mode 100644
>index 00000000000..5d57e1e7163
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/FoldExpressions.cpp
>@@ -0,0 +1,115 @@
>+//
>+// Copyright (c) 2018 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// FoldExpressions.cpp: Fold expressions. This may fold expressions so that the qualifier of the
>+// folded node differs from the qualifier of the original expression, so it needs to be done after
>+// parsing and validation of qualifiers is complete. Expressions that are folded:
>+//  1. Ternary ops with a constant condition.
>+//  2. Sequence aka comma ops where the left side has no side effects.
>+//  3. Any expressions containing any of the above.
>+
>+#include "compiler/translator/tree_ops/FoldExpressions.h"
>+
>+#include "compiler/translator/Diagnostics.h"
>+#include "compiler/translator/IntermNode.h"
>+#include "compiler/translator/tree_util/IntermTraverse.h"
>+
>+namespace sh
>+{
>+
>+namespace
>+{
>+
>+class FoldExpressionsTraverser : public TIntermTraverser
>+{
>+  public:
>+    FoldExpressionsTraverser(TDiagnostics *diagnostics)
>+        : TIntermTraverser(true, false, false), mDiagnostics(diagnostics), mDidReplace(false)
>+    {}
>+
>+    bool didReplace() { return mDidReplace; }
>+
>+    void nextIteration() { mDidReplace = false; }
>+
>+  protected:
>+    bool visitTernary(Visit visit, TIntermTernary *node) override
>+    {
>+        TIntermTyped *folded = node->fold(mDiagnostics);
>+        if (folded != node)
>+        {
>+            queueReplacement(folded, OriginalNode::IS_DROPPED);
>+            mDidReplace = true;
>+            return false;
>+        }
>+        return true;
>+    }
>+
>+    bool visitAggregate(Visit visit, TIntermAggregate *node) override
>+    {
>+        TIntermTyped *folded = node->fold(mDiagnostics);
>+        if (folded != node)
>+        {
>+            queueReplacement(folded, OriginalNode::IS_DROPPED);
>+            mDidReplace = true;
>+            return false;
>+        }
>+        return true;
>+    }
>+
>+    bool visitBinary(Visit visit, TIntermBinary *node) override
>+    {
>+        TIntermTyped *folded = node->fold(mDiagnostics);
>+        if (folded != node)
>+        {
>+            queueReplacement(folded, OriginalNode::IS_DROPPED);
>+            mDidReplace = true;
>+            return false;
>+        }
>+        return true;
>+    }
>+
>+    bool visitUnary(Visit visit, TIntermUnary *node) override
>+    {
>+        TIntermTyped *folded = node->fold(mDiagnostics);
>+        if (folded != node)
>+        {
>+            queueReplacement(folded, OriginalNode::IS_DROPPED);
>+            mDidReplace = true;
>+            return false;
>+        }
>+        return true;
>+    }
>+
>+    bool visitSwizzle(Visit visit, TIntermSwizzle *node) override
>+    {
>+        TIntermTyped *folded = node->fold(mDiagnostics);
>+        if (folded != node)
>+        {
>+            queueReplacement(folded, OriginalNode::IS_DROPPED);
>+            mDidReplace = true;
>+            return false;
>+        }
>+        return true;
>+    }
>+
>+  private:
>+    TDiagnostics *mDiagnostics;
>+    bool mDidReplace;
>+};
>+
>+}  // anonymous namespace
>+
>+void FoldExpressions(TIntermBlock *root, TDiagnostics *diagnostics)
>+{
>+    FoldExpressionsTraverser traverser(diagnostics);
>+    do
>+    {
>+        traverser.nextIteration();
>+        root->traverse(&traverser);
>+        traverser.updateTree();
>+    } while (traverser.didReplace());
>+}
>+
>+}  // namespace sh
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/FoldExpressions.h b/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/FoldExpressions.h
>new file mode 100644
>index 00000000000..42d026afb85
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/FoldExpressions.h
>@@ -0,0 +1,24 @@
>+//
>+// Copyright (c) 2018 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// FoldExpressions.h: Fold expressions. This may fold expressions so that the qualifier of the
>+// folded node differs from the qualifier of the original expression, so it needs to be done after
>+// parsing and validation of qualifiers is complete. Expressions that are folded: 1. Ternary ops
>+// with a constant condition.
>+
>+#ifndef COMPILER_TRANSLATOR_TREEOPS_FOLDEXPRESSIONS_H_
>+#define COMPILER_TRANSLATOR_TREEOPS_FOLDEXPRESSIONS_H_
>+
>+namespace sh
>+{
>+
>+class TIntermBlock;
>+class TDiagnostics;
>+
>+void FoldExpressions(TIntermBlock *root, TDiagnostics *diagnostics);
>+
>+}  // namespace sh
>+
>+#endif  // COMPILER_TRANSLATOR_TREEOPS_FOLDEXPRESSIONS_H_
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/InitializeVariables.cpp b/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/InitializeVariables.cpp
>new file mode 100644
>index 00000000000..21b0bed6581
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/InitializeVariables.cpp
>@@ -0,0 +1,311 @@
>+//
>+// Copyright (c) 2002-2013 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+
>+#include "compiler/translator/tree_ops/InitializeVariables.h"
>+
>+#include "angle_gl.h"
>+#include "common/debug.h"
>+#include "compiler/translator/StaticType.h"
>+#include "compiler/translator/SymbolTable.h"
>+#include "compiler/translator/tree_util/FindMain.h"
>+#include "compiler/translator/tree_util/IntermNode_util.h"
>+#include "compiler/translator/tree_util/IntermTraverse.h"
>+#include "compiler/translator/util.h"
>+
>+namespace sh
>+{
>+
>+namespace
>+{
>+
>+void AddArrayZeroInitSequence(const TIntermTyped *initializedNode,
>+                              bool canUseLoopsToInitialize,
>+                              bool highPrecisionSupported,
>+                              TIntermSequence *initSequenceOut,
>+                              TSymbolTable *symbolTable);
>+
>+void AddStructZeroInitSequence(const TIntermTyped *initializedNode,
>+                               bool canUseLoopsToInitialize,
>+                               bool highPrecisionSupported,
>+                               TIntermSequence *initSequenceOut,
>+                               TSymbolTable *symbolTable);
>+
>+TIntermBinary *CreateZeroInitAssignment(const TIntermTyped *initializedNode)
>+{
>+    TIntermTyped *zero = CreateZeroNode(initializedNode->getType());
>+    return new TIntermBinary(EOpAssign, initializedNode->deepCopy(), zero);
>+}
>+
>+void AddZeroInitSequence(const TIntermTyped *initializedNode,
>+                         bool canUseLoopsToInitialize,
>+                         bool highPrecisionSupported,
>+                         TIntermSequence *initSequenceOut,
>+                         TSymbolTable *symbolTable)
>+{
>+    if (initializedNode->isArray())
>+    {
>+        AddArrayZeroInitSequence(initializedNode, canUseLoopsToInitialize, highPrecisionSupported,
>+                                 initSequenceOut, symbolTable);
>+    }
>+    else if (initializedNode->getType().isStructureContainingArrays() ||
>+             initializedNode->getType().isNamelessStruct())
>+    {
>+        AddStructZeroInitSequence(initializedNode, canUseLoopsToInitialize, highPrecisionSupported,
>+                                  initSequenceOut, symbolTable);
>+    }
>+    else
>+    {
>+        initSequenceOut->push_back(CreateZeroInitAssignment(initializedNode));
>+    }
>+}
>+
>+void AddStructZeroInitSequence(const TIntermTyped *initializedNode,
>+                               bool canUseLoopsToInitialize,
>+                               bool highPrecisionSupported,
>+                               TIntermSequence *initSequenceOut,
>+                               TSymbolTable *symbolTable)
>+{
>+    ASSERT(initializedNode->getBasicType() == EbtStruct);
>+    const TStructure *structType = initializedNode->getType().getStruct();
>+    for (int i = 0; i < static_cast<int>(structType->fields().size()); ++i)
>+    {
>+        TIntermBinary *element = new TIntermBinary(EOpIndexDirectStruct,
>+                                                   initializedNode->deepCopy(), CreateIndexNode(i));
>+        // Structs can't be defined inside structs, so the type of a struct field can't be a
>+        // nameless struct.
>+        ASSERT(!element->getType().isNamelessStruct());
>+        AddZeroInitSequence(element, canUseLoopsToInitialize, highPrecisionSupported,
>+                            initSequenceOut, symbolTable);
>+    }
>+}
>+
>+void AddArrayZeroInitStatementList(const TIntermTyped *initializedNode,
>+                                   bool canUseLoopsToInitialize,
>+                                   bool highPrecisionSupported,
>+                                   TIntermSequence *initSequenceOut,
>+                                   TSymbolTable *symbolTable)
>+{
>+    for (unsigned int i = 0; i < initializedNode->getOutermostArraySize(); ++i)
>+    {
>+        TIntermBinary *element =
>+            new TIntermBinary(EOpIndexDirect, initializedNode->deepCopy(), CreateIndexNode(i));
>+        AddZeroInitSequence(element, canUseLoopsToInitialize, highPrecisionSupported,
>+                            initSequenceOut, symbolTable);
>+    }
>+}
>+
>+void AddArrayZeroInitForLoop(const TIntermTyped *initializedNode,
>+                             bool highPrecisionSupported,
>+                             TIntermSequence *initSequenceOut,
>+                             TSymbolTable *symbolTable)
>+{
>+    ASSERT(initializedNode->isArray());
>+    const TType *mediumpIndexType = StaticType::Get<EbtInt, EbpMedium, EvqTemporary, 1, 1>();
>+    const TType *highpIndexType   = StaticType::Get<EbtInt, EbpHigh, EvqTemporary, 1, 1>();
>+    TVariable *indexVariable =
>+        CreateTempVariable(symbolTable, highPrecisionSupported ? highpIndexType : mediumpIndexType);
>+
>+    TIntermSymbol *indexSymbolNode = CreateTempSymbolNode(indexVariable);
>+    TIntermDeclaration *indexInit =
>+        CreateTempInitDeclarationNode(indexVariable, CreateZeroNode(indexVariable->getType()));
>+    TIntermConstantUnion *arraySizeNode = CreateIndexNode(initializedNode->getOutermostArraySize());
>+    TIntermBinary *indexSmallerThanSize =
>+        new TIntermBinary(EOpLessThan, indexSymbolNode->deepCopy(), arraySizeNode);
>+    TIntermUnary *indexIncrement =
>+        new TIntermUnary(EOpPreIncrement, indexSymbolNode->deepCopy(), nullptr);
>+
>+    TIntermBlock *forLoopBody       = new TIntermBlock();
>+    TIntermSequence *forLoopBodySeq = forLoopBody->getSequence();
>+
>+    TIntermBinary *element = new TIntermBinary(EOpIndexIndirect, initializedNode->deepCopy(),
>+                                               indexSymbolNode->deepCopy());
>+    AddZeroInitSequence(element, true, highPrecisionSupported, forLoopBodySeq, symbolTable);
>+
>+    TIntermLoop *forLoop =
>+        new TIntermLoop(ELoopFor, indexInit, indexSmallerThanSize, indexIncrement, forLoopBody);
>+    initSequenceOut->push_back(forLoop);
>+}
>+
>+void AddArrayZeroInitSequence(const TIntermTyped *initializedNode,
>+                              bool canUseLoopsToInitialize,
>+                              bool highPrecisionSupported,
>+                              TIntermSequence *initSequenceOut,
>+                              TSymbolTable *symbolTable)
>+{
>+    // The array elements are assigned one by one to keep the AST compatible with ESSL 1.00 which
>+    // doesn't have array assignment. We'll do this either with a for loop or just a list of
>+    // statements assigning to each array index. Note that it is important to have the array init in
>+    // the right order to workaround http://crbug.com/709317
>+    bool isSmallArray = initializedNode->getOutermostArraySize() <= 1u ||
>+                        (initializedNode->getBasicType() != EbtStruct &&
>+                         !initializedNode->getType().isArrayOfArrays() &&
>+                         initializedNode->getOutermostArraySize() <= 3u);
>+    if (initializedNode->getQualifier() == EvqFragData ||
>+        initializedNode->getQualifier() == EvqFragmentOut || isSmallArray ||
>+        !canUseLoopsToInitialize)
>+    {
>+        // Fragment outputs should not be indexed by non-constant indices.
>+        // Also it doesn't make sense to use loops to initialize very small arrays.
>+        AddArrayZeroInitStatementList(initializedNode, canUseLoopsToInitialize,
>+                                      highPrecisionSupported, initSequenceOut, symbolTable);
>+    }
>+    else
>+    {
>+        AddArrayZeroInitForLoop(initializedNode, highPrecisionSupported, initSequenceOut,
>+                                symbolTable);
>+    }
>+}
>+
>+void InsertInitCode(TIntermSequence *mainBody,
>+                    const InitVariableList &variables,
>+                    TSymbolTable *symbolTable,
>+                    int shaderVersion,
>+                    const TExtensionBehavior &extensionBehavior,
>+                    bool canUseLoopsToInitialize,
>+                    bool highPrecisionSupported)
>+{
>+    for (const auto &var : variables)
>+    {
>+        // Note that tempVariableName will reference a short-lived char array here - that's fine
>+        // since we're only using it to find symbols.
>+        ImmutableString tempVariableName(var.name.c_str(), var.name.length());
>+
>+        TIntermTyped *initializedSymbol = nullptr;
>+        if (var.isBuiltIn())
>+        {
>+            initializedSymbol =
>+                ReferenceBuiltInVariable(tempVariableName, *symbolTable, shaderVersion);
>+            if (initializedSymbol->getQualifier() == EvqFragData &&
>+                !IsExtensionEnabled(extensionBehavior, TExtension::EXT_draw_buffers))
>+            {
>+                // If GL_EXT_draw_buffers is disabled, only the 0th index of gl_FragData can be
>+                // written to.
>+                // TODO(oetuaho): This is a bit hacky and would be better to remove, if we came up
>+                // with a good way to do it. Right now "gl_FragData" in symbol table is initialized
>+                // to have the array size of MaxDrawBuffers, and the initialization happens before
>+                // the shader sets the extensions it is using.
>+                initializedSymbol =
>+                    new TIntermBinary(EOpIndexDirect, initializedSymbol, CreateIndexNode(0));
>+            }
>+        }
>+        else
>+        {
>+            initializedSymbol = ReferenceGlobalVariable(tempVariableName, *symbolTable);
>+        }
>+        ASSERT(initializedSymbol != nullptr);
>+
>+        TIntermSequence *initCode = CreateInitCode(initializedSymbol, canUseLoopsToInitialize,
>+                                                   highPrecisionSupported, symbolTable);
>+        mainBody->insert(mainBody->begin(), initCode->begin(), initCode->end());
>+    }
>+}
>+
>+class InitializeLocalsTraverser : public TIntermTraverser
>+{
>+  public:
>+    InitializeLocalsTraverser(int shaderVersion,
>+                              TSymbolTable *symbolTable,
>+                              bool canUseLoopsToInitialize,
>+                              bool highPrecisionSupported)
>+        : TIntermTraverser(true, false, false, symbolTable),
>+          mShaderVersion(shaderVersion),
>+          mCanUseLoopsToInitialize(canUseLoopsToInitialize),
>+          mHighPrecisionSupported(highPrecisionSupported)
>+    {}
>+
>+  protected:
>+    bool visitDeclaration(Visit visit, TIntermDeclaration *node) override
>+    {
>+        for (TIntermNode *declarator : *node->getSequence())
>+        {
>+            if (!mInGlobalScope && !declarator->getAsBinaryNode())
>+            {
>+                TIntermSymbol *symbol = declarator->getAsSymbolNode();
>+                ASSERT(symbol);
>+                if (symbol->variable().symbolType() == SymbolType::Empty)
>+                {
>+                    continue;
>+                }
>+
>+                // Arrays may need to be initialized one element at a time, since ESSL 1.00 does not
>+                // support array constructors or assigning arrays.
>+                bool arrayConstructorUnavailable =
>+                    (symbol->isArray() || symbol->getType().isStructureContainingArrays()) &&
>+                    mShaderVersion == 100;
>+                // Nameless struct constructors can't be referred to, so they also need to be
>+                // initialized one element at a time.
>+                // TODO(oetuaho): Check if it makes sense to initialize using a loop, even if we
>+                // could use an initializer. It could at least reduce code size for very large
>+                // arrays, but could hurt runtime performance.
>+                if (arrayConstructorUnavailable || symbol->getType().isNamelessStruct())
>+                {
>+                    // SimplifyLoopConditions should have been run so the parent node of this node
>+                    // should not be a loop.
>+                    ASSERT(getParentNode()->getAsLoopNode() == nullptr);
>+                    // SeparateDeclarations should have already been run, so we don't need to worry
>+                    // about further declarators in this declaration depending on the effects of
>+                    // this declarator.
>+                    ASSERT(node->getSequence()->size() == 1);
>+                    insertStatementsInParentBlock(
>+                        TIntermSequence(), *CreateInitCode(symbol, mCanUseLoopsToInitialize,
>+                                                           mHighPrecisionSupported, mSymbolTable));
>+                }
>+                else
>+                {
>+                    TIntermBinary *init =
>+                        new TIntermBinary(EOpInitialize, symbol, CreateZeroNode(symbol->getType()));
>+                    queueReplacementWithParent(node, symbol, init, OriginalNode::BECOMES_CHILD);
>+                }
>+            }
>+        }
>+        return false;
>+    }
>+
>+  private:
>+    int mShaderVersion;
>+    bool mCanUseLoopsToInitialize;
>+    bool mHighPrecisionSupported;
>+};
>+
>+}  // namespace
>+
>+TIntermSequence *CreateInitCode(const TIntermTyped *initializedSymbol,
>+                                bool canUseLoopsToInitialize,
>+                                bool highPrecisionSupported,
>+                                TSymbolTable *symbolTable)
>+{
>+    TIntermSequence *initCode = new TIntermSequence();
>+    AddZeroInitSequence(initializedSymbol, canUseLoopsToInitialize, highPrecisionSupported,
>+                        initCode, symbolTable);
>+    return initCode;
>+}
>+
>+void InitializeUninitializedLocals(TIntermBlock *root,
>+                                   int shaderVersion,
>+                                   bool canUseLoopsToInitialize,
>+                                   bool highPrecisionSupported,
>+                                   TSymbolTable *symbolTable)
>+{
>+    InitializeLocalsTraverser traverser(shaderVersion, symbolTable, canUseLoopsToInitialize,
>+                                        highPrecisionSupported);
>+    root->traverse(&traverser);
>+    traverser.updateTree();
>+}
>+
>+void InitializeVariables(TIntermBlock *root,
>+                         const InitVariableList &vars,
>+                         TSymbolTable *symbolTable,
>+                         int shaderVersion,
>+                         const TExtensionBehavior &extensionBehavior,
>+                         bool canUseLoopsToInitialize,
>+                         bool highPrecisionSupported)
>+{
>+    TIntermBlock *body = FindMainBody(root);
>+    InsertInitCode(body->getSequence(), vars, symbolTable, shaderVersion, extensionBehavior,
>+                   canUseLoopsToInitialize, highPrecisionSupported);
>+}
>+
>+}  // namespace sh
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/InitializeVariables.h b/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/InitializeVariables.h
>new file mode 100644
>index 00000000000..06695f93c91
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/InitializeVariables.h
>@@ -0,0 +1,56 @@
>+//
>+// Copyright (c) 2002-2013 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+
>+#ifndef COMPILER_TRANSLATOR_TREEOPS_INITIALIZEVARIABLES_H_
>+#define COMPILER_TRANSLATOR_TREEOPS_INITIALIZEVARIABLES_H_
>+
>+#include <GLSLANG/ShaderLang.h>
>+
>+#include "compiler/translator/ExtensionBehavior.h"
>+#include "compiler/translator/IntermNode.h"
>+
>+namespace sh
>+{
>+class TSymbolTable;
>+
>+typedef std::vector<sh::ShaderVariable> InitVariableList;
>+
>+// For all of the functions below: If canUseLoopsToInitialize is set, for loops are used instead of
>+// a large number of initializers where it can make sense, such as for initializing large arrays.
>+
>+// Return a sequence of assignment operations to initialize "initializedSymbol". initializedSymbol
>+// may be an array, struct or any combination of these, as long as it contains only basic types.
>+TIntermSequence *CreateInitCode(const TIntermTyped *initializedSymbol,
>+                                bool canUseLoopsToInitialize,
>+                                bool highPrecisionSupported,
>+                                TSymbolTable *symbolTable);
>+
>+// Initialize all uninitialized local variables, so that undefined behavior is avoided.
>+void InitializeUninitializedLocals(TIntermBlock *root,
>+                                   int shaderVersion,
>+                                   bool canUseLoopsToInitialize,
>+                                   bool highPrecisionSupported,
>+                                   TSymbolTable *symbolTable);
>+
>+// This function can initialize all the types that CreateInitCode is able to initialize. All
>+// variables must be globals which can be found in the symbol table. For now it is used for the
>+// following two scenarios:
>+//   1. Initializing gl_Position;
>+//   2. Initializing output variables referred to in the shader source.
>+// Note: The type of each lvalue in an initializer is retrieved from the symbol table. gl_FragData
>+// requires special handling because the number of indices which can be initialized is determined by
>+// enabled extensions.
>+void InitializeVariables(TIntermBlock *root,
>+                         const InitVariableList &vars,
>+                         TSymbolTable *symbolTable,
>+                         int shaderVersion,
>+                         const TExtensionBehavior &extensionBehavior,
>+                         bool canUseLoopsToInitialize,
>+                         bool highPrecisionSupported);
>+
>+}  // namespace sh
>+
>+#endif  // COMPILER_TRANSLATOR_TREEOPS_INITIALIZEVARIABLES_H_
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/NameEmbeddedUniformStructs.cpp b/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/NameEmbeddedUniformStructs.cpp
>new file mode 100644
>index 00000000000..9c544491ec1
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/NameEmbeddedUniformStructs.cpp
>@@ -0,0 +1,101 @@
>+//
>+// Copyright 2018 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// NameEmbeddedUniformStructs: Gives nameless uniform struct internal names.
>+//
>+
>+#include "compiler/translator/tree_ops/NameEmbeddedUniformStructs.h"
>+
>+#include "compiler/translator/SymbolTable.h"
>+#include "compiler/translator/tree_util/IntermTraverse.h"
>+
>+namespace sh
>+{
>+namespace
>+{
>+// This traverser translates embedded uniform structs into a specifier and declaration.
>+// This makes the declarations easier to move into uniform blocks.
>+class Traverser : public TIntermTraverser
>+{
>+  public:
>+    explicit Traverser(TSymbolTable *symbolTable)
>+        : TIntermTraverser(true, false, false, symbolTable)
>+    {}
>+
>+    bool visitDeclaration(Visit visit, TIntermDeclaration *decl) override
>+    {
>+        ASSERT(visit == PreVisit);
>+
>+        if (!mInGlobalScope)
>+        {
>+            return false;
>+        }
>+
>+        const TIntermSequence &sequence = *(decl->getSequence());
>+        ASSERT(sequence.size() == 1);
>+        TIntermTyped *declarator = sequence.front()->getAsTyped();
>+        const TType &type        = declarator->getType();
>+
>+        if (type.isStructSpecifier() && type.getQualifier() == EvqUniform)
>+        {
>+            const TStructure *structure = type.getStruct();
>+
>+            if (structure->symbolType() == SymbolType::Empty)
>+            {
>+                doReplacement(decl, declarator, structure);
>+            }
>+        }
>+
>+        return false;
>+    }
>+
>+  private:
>+    void doReplacement(TIntermDeclaration *decl,
>+                       TIntermTyped *declarator,
>+                       const TStructure *oldStructure)
>+    {
>+        // struct <structName> { ... };
>+        TStructure *structure = new TStructure(mSymbolTable, kEmptyImmutableString,
>+                                               &oldStructure->fields(), SymbolType::AngleInternal);
>+        TType *namedType      = new TType(structure, true);
>+        namedType->setQualifier(EvqGlobal);
>+
>+        TVariable *structVariable =
>+            new TVariable(mSymbolTable, kEmptyImmutableString, namedType, SymbolType::Empty);
>+        TIntermSymbol *structDeclarator       = new TIntermSymbol(structVariable);
>+        TIntermDeclaration *structDeclaration = new TIntermDeclaration;
>+        structDeclaration->appendDeclarator(structDeclarator);
>+
>+        TIntermSequence *newSequence = new TIntermSequence;
>+        newSequence->push_back(structDeclaration);
>+
>+        // uniform <structName> <structUniformName>;
>+        TIntermSymbol *asSymbol = declarator->getAsSymbolNode();
>+        if (asSymbol && asSymbol->variable().symbolType() != SymbolType::Empty)
>+        {
>+            TIntermDeclaration *namedDecl = new TIntermDeclaration;
>+            TType *uniformType            = new TType(structure, false);
>+            uniformType->setQualifier(EvqUniform);
>+
>+            TVariable *newVar        = new TVariable(mSymbolTable, asSymbol->getName(), uniformType,
>+                                              asSymbol->variable().symbolType());
>+            TIntermSymbol *newSymbol = new TIntermSymbol(newVar);
>+            namedDecl->appendDeclarator(newSymbol);
>+
>+            newSequence->push_back(namedDecl);
>+        }
>+
>+        mMultiReplacements.emplace_back(getParentNode()->getAsBlock(), decl, *newSequence);
>+    }
>+};
>+}  // anonymous namespace
>+
>+void NameEmbeddedStructUniforms(TIntermBlock *root, TSymbolTable *symbolTable)
>+{
>+    Traverser nameStructs(symbolTable);
>+    root->traverse(&nameStructs);
>+    nameStructs.updateTree();
>+}
>+}  // namespace sh
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/NameEmbeddedUniformStructs.h b/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/NameEmbeddedUniformStructs.h
>new file mode 100644
>index 00000000000..0ada1895012
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/NameEmbeddedUniformStructs.h
>@@ -0,0 +1,25 @@
>+//
>+// Copyright 2018 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// NameEmbeddedUniformStructs: Gives nameless uniform struct internal names.
>+//
>+// For example:
>+//   uniform struct { int a; } uni;
>+// becomes:
>+//   struct s1 { int a; };
>+//   uniform s1 uni;
>+//
>+
>+#ifndef COMPILER_TRANSLATOR_TREEOPS_NAMEEMBEDDEDUNIFORMSTRUCTS_H_
>+#define COMPILER_TRANSLATOR_TREEOPS_NAMEEMBEDDEDUNIFORMSTRUCTS_H_
>+
>+namespace sh
>+{
>+class TIntermBlock;
>+class TSymbolTable;
>+void NameEmbeddedStructUniforms(TIntermBlock *root, TSymbolTable *symbolTable);
>+}  // namespace sh
>+
>+#endif  // COMPILER_TRANSLATOR_TREEOPS_NAMEEMBEDDEDUNIFORMSTRUCTS_H_
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/PruneEmptyCases.cpp b/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/PruneEmptyCases.cpp
>new file mode 100644
>index 00000000000..7dd756ca2d9
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/PruneEmptyCases.cpp
>@@ -0,0 +1,127 @@
>+//
>+// Copyright (c) 2018 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// PruneEmptyCases.cpp: The PruneEmptyCases function prunes cases that are followed by nothing from
>+// the AST.
>+
>+#include "compiler/translator/tree_ops/PruneEmptyCases.h"
>+
>+#include "compiler/translator/Symbol.h"
>+#include "compiler/translator/tree_util/IntermTraverse.h"
>+
>+namespace sh
>+{
>+
>+namespace
>+{
>+
>+bool AreEmptyBlocks(TIntermSequence *statements);
>+
>+bool IsEmptyBlock(TIntermNode *node)
>+{
>+    TIntermBlock *asBlock = node->getAsBlock();
>+    if (asBlock)
>+    {
>+        return AreEmptyBlocks(asBlock->getSequence());
>+    }
>+    // Empty declarations should have already been pruned, otherwise they would need to be handled
>+    // here. Note that declarations for struct types do contain a nameless child node.
>+    ASSERT(node->getAsDeclarationNode() == nullptr ||
>+           !node->getAsDeclarationNode()->getSequence()->empty());
>+    // Pure literal statements should also already be pruned.
>+    ASSERT(node->getAsConstantUnion() == nullptr);
>+    return false;
>+}
>+
>+// Return true if all statements in "statements" consist only of empty blocks and no-op statements.
>+// Returns true also if there are no statements.
>+bool AreEmptyBlocks(TIntermSequence *statements)
>+{
>+    for (size_t i = 0u; i < statements->size(); ++i)
>+    {
>+        if (!IsEmptyBlock(statements->at(i)))
>+        {
>+            return false;
>+        }
>+    }
>+    return true;
>+}
>+
>+class PruneEmptyCasesTraverser : private TIntermTraverser
>+{
>+  public:
>+    static void apply(TIntermBlock *root);
>+
>+  private:
>+    PruneEmptyCasesTraverser();
>+    bool visitSwitch(Visit visit, TIntermSwitch *node) override;
>+};
>+
>+void PruneEmptyCasesTraverser::apply(TIntermBlock *root)
>+{
>+    PruneEmptyCasesTraverser prune;
>+    root->traverse(&prune);
>+    prune.updateTree();
>+}
>+
>+PruneEmptyCasesTraverser::PruneEmptyCasesTraverser() : TIntermTraverser(true, false, false) {}
>+
>+bool PruneEmptyCasesTraverser::visitSwitch(Visit visit, TIntermSwitch *node)
>+{
>+    // This may mutate the statementList, but that's okay, since traversal has not yet reached
>+    // there.
>+    TIntermBlock *statementList = node->getStatementList();
>+    TIntermSequence *statements = statementList->getSequence();
>+
>+    // Iterate block children in reverse order. Cases that are only followed by other cases or empty
>+    // blocks are marked for pruning.
>+    size_t i                       = statements->size();
>+    size_t lastNoOpInStatementList = i;
>+    while (i > 0)
>+    {
>+        --i;
>+        TIntermNode *statement = statements->at(i);
>+        if (statement->getAsCaseNode() || IsEmptyBlock(statement))
>+        {
>+            lastNoOpInStatementList = i;
>+        }
>+        else
>+        {
>+            break;
>+        }
>+    }
>+    if (lastNoOpInStatementList == 0)
>+    {
>+        // Remove the entire switch statement, extracting the init expression if needed.
>+        TIntermTyped *init = node->getInit();
>+        if (init->hasSideEffects())
>+        {
>+            queueReplacement(init, OriginalNode::IS_DROPPED);
>+        }
>+        else
>+        {
>+            TIntermSequence emptyReplacement;
>+            ASSERT(getParentNode()->getAsBlock());
>+            mMultiReplacements.push_back(NodeReplaceWithMultipleEntry(getParentNode()->getAsBlock(),
>+                                                                      node, emptyReplacement));
>+        }
>+        return false;
>+    }
>+    if (lastNoOpInStatementList < statements->size())
>+    {
>+        statements->erase(statements->begin() + lastNoOpInStatementList, statements->end());
>+    }
>+
>+    return true;
>+}
>+
>+}  // namespace
>+
>+void PruneEmptyCases(TIntermBlock *root)
>+{
>+    PruneEmptyCasesTraverser::apply(root);
>+}
>+
>+}  // namespace sh
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/PruneEmptyCases.h b/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/PruneEmptyCases.h
>new file mode 100644
>index 00000000000..0b88ac181c2
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/PruneEmptyCases.h
>@@ -0,0 +1,19 @@
>+//
>+// Copyright (c) 2018 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// PruneEmptyCases.h: The PruneEmptyCases function prunes cases that are followed by nothing from
>+// the AST.
>+
>+#ifndef COMPILER_TRANSLATOR_TREEOPS_PRUNEEMPTYCASES_H_
>+#define COMPILER_TRANSLATOR_TREEOPS_PRUNEEMPTYCASES_H_
>+
>+namespace sh
>+{
>+class TIntermBlock;
>+
>+void PruneEmptyCases(TIntermBlock *root);
>+}  // namespace sh
>+
>+#endif  // COMPILER_TRANSLATOR_TREEOPS_PRUNEEMPTYCASES_H_
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/PruneNoOps.cpp b/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/PruneNoOps.cpp
>new file mode 100644
>index 00000000000..620c3f481b6
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/PruneNoOps.cpp
>@@ -0,0 +1,166 @@
>+//
>+// Copyright (c) 2002-2015 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// PruneNoOps.cpp: The PruneNoOps function prunes:
>+//   1. Empty declarations "int;". Empty declarators will be pruned as well, so for example:
>+//        int , a;
>+//      is turned into
>+//        int a;
>+//   2. Literal statements: "1.0;". The ESSL output doesn't define a default precision for float,
>+//      so float literal statements would end up with no precision which is invalid ESSL.
>+
>+#include "compiler/translator/tree_ops/PruneNoOps.h"
>+
>+#include "compiler/translator/Symbol.h"
>+#include "compiler/translator/tree_util/IntermTraverse.h"
>+
>+namespace sh
>+{
>+
>+namespace
>+{
>+
>+bool IsNoOp(TIntermNode *node)
>+{
>+    if (node->getAsConstantUnion() != nullptr)
>+    {
>+        return true;
>+    }
>+    bool isEmptyDeclaration = node->getAsDeclarationNode() != nullptr &&
>+                              node->getAsDeclarationNode()->getSequence()->empty();
>+    if (isEmptyDeclaration)
>+    {
>+        return true;
>+    }
>+    return false;
>+}
>+
>+class PruneNoOpsTraverser : private TIntermTraverser
>+{
>+  public:
>+    static void apply(TIntermBlock *root, TSymbolTable *symbolTable);
>+
>+  private:
>+    PruneNoOpsTraverser(TSymbolTable *symbolTable);
>+    bool visitDeclaration(Visit, TIntermDeclaration *node) override;
>+    bool visitBlock(Visit visit, TIntermBlock *node) override;
>+    bool visitLoop(Visit visit, TIntermLoop *loop) override;
>+};
>+
>+void PruneNoOpsTraverser::apply(TIntermBlock *root, TSymbolTable *symbolTable)
>+{
>+    PruneNoOpsTraverser prune(symbolTable);
>+    root->traverse(&prune);
>+    prune.updateTree();
>+}
>+
>+PruneNoOpsTraverser::PruneNoOpsTraverser(TSymbolTable *symbolTable)
>+    : TIntermTraverser(true, false, false, symbolTable)
>+{}
>+
>+bool PruneNoOpsTraverser::visitDeclaration(Visit, TIntermDeclaration *node)
>+{
>+    TIntermSequence *sequence = node->getSequence();
>+    if (sequence->size() >= 1)
>+    {
>+        TIntermSymbol *declaratorSymbol = sequence->front()->getAsSymbolNode();
>+        // Prune declarations without a variable name, unless it's an interface block declaration.
>+        if (declaratorSymbol != nullptr &&
>+            declaratorSymbol->variable().symbolType() == SymbolType::Empty &&
>+            !declaratorSymbol->isInterfaceBlock())
>+        {
>+            if (sequence->size() > 1)
>+            {
>+                // Generate a replacement that will remove the empty declarator in the beginning of
>+                // a declarator list. Example of a declaration that will be changed:
>+                // float, a;
>+                // will be changed to
>+                // float a;
>+                // This applies also to struct declarations.
>+                TIntermSequence emptyReplacement;
>+                mMultiReplacements.push_back(
>+                    NodeReplaceWithMultipleEntry(node, declaratorSymbol, emptyReplacement));
>+            }
>+            else if (declaratorSymbol->getBasicType() != EbtStruct)
>+            {
>+                // If there are entirely empty non-struct declarations, they result in
>+                // TIntermDeclaration nodes without any children in the parsing stage. These are
>+                // handled in visitBlock and visitLoop.
>+                UNREACHABLE();
>+            }
>+            else if (declaratorSymbol->getQualifier() != EvqGlobal &&
>+                     declaratorSymbol->getQualifier() != EvqTemporary)
>+            {
>+                // Single struct declarations may just declare the struct type and no variables, so
>+                // they should not be pruned. Here we handle an empty struct declaration with a
>+                // qualifier, for example like this:
>+                //   const struct a { int i; };
>+                // NVIDIA GL driver version 367.27 doesn't accept this kind of declarations, so we
>+                // convert the declaration to a regular struct declaration. This is okay, since ESSL
>+                // 1.00 spec section 4.1.8 says about structs that "The optional qualifiers only
>+                // apply to any declarators, and are not part of the type being defined for name."
>+
>+                // Create a new variable to use in the declarator so that the variable and node
>+                // types are kept consistent.
>+                TType *type = new TType(declaratorSymbol->getType());
>+                if (mInGlobalScope)
>+                {
>+                    type->setQualifier(EvqGlobal);
>+                }
>+                else
>+                {
>+                    type->setQualifier(EvqTemporary);
>+                }
>+                TVariable *variable =
>+                    new TVariable(mSymbolTable, kEmptyImmutableString, type, SymbolType::Empty);
>+                queueReplacementWithParent(node, declaratorSymbol, new TIntermSymbol(variable),
>+                                           OriginalNode::IS_DROPPED);
>+            }
>+        }
>+    }
>+    return false;
>+}
>+
>+bool PruneNoOpsTraverser::visitBlock(Visit visit, TIntermBlock *node)
>+{
>+    TIntermSequence *statements = node->getSequence();
>+
>+    for (TIntermNode *statement : *statements)
>+    {
>+        if (IsNoOp(statement))
>+        {
>+            TIntermSequence emptyReplacement;
>+            mMultiReplacements.push_back(
>+                NodeReplaceWithMultipleEntry(node, statement, emptyReplacement));
>+        }
>+    }
>+
>+    return true;
>+}
>+
>+bool PruneNoOpsTraverser::visitLoop(Visit visit, TIntermLoop *loop)
>+{
>+    TIntermTyped *expr = loop->getExpression();
>+    if (expr != nullptr && IsNoOp(expr))
>+    {
>+        loop->setExpression(nullptr);
>+    }
>+    TIntermNode *init = loop->getInit();
>+    if (init != nullptr && IsNoOp(init))
>+    {
>+        loop->setInit(nullptr);
>+    }
>+
>+    return true;
>+}
>+
>+}  // namespace
>+
>+void PruneNoOps(TIntermBlock *root, TSymbolTable *symbolTable)
>+{
>+    PruneNoOpsTraverser::apply(root, symbolTable);
>+}
>+
>+}  // namespace sh
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/PruneNoOps.h b/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/PruneNoOps.h
>new file mode 100644
>index 00000000000..83a6c665898
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/PruneNoOps.h
>@@ -0,0 +1,25 @@
>+//
>+// Copyright (c) 2002-2015 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// PruneNoOps.h: The PruneNoOps function prunes:
>+//   1. Empty declarations "int;". Empty declarators will be pruned as well, so for example:
>+//        int , a;
>+//      is turned into
>+//        int a;
>+//   2. Literal statements: "1.0;". The ESSL output doesn't define a default precision for float,
>+//      so float literal statements would end up with no precision which is invalid ESSL.
>+
>+#ifndef COMPILER_TRANSLATOR_TREEOPS_PRUNENOOPS_H_
>+#define COMPILER_TRANSLATOR_TREEOPS_PRUNENOOPS_H_
>+
>+namespace sh
>+{
>+class TIntermBlock;
>+class TSymbolTable;
>+
>+void PruneNoOps(TIntermBlock *root, TSymbolTable *symbolTable);
>+}  // namespace sh
>+
>+#endif  // COMPILER_TRANSLATOR_TREEOPS_PRUNENOOPS_H_
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/RecordConstantPrecision.cpp b/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/RecordConstantPrecision.cpp
>new file mode 100644
>index 00000000000..9e7b0a03307
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/RecordConstantPrecision.cpp
>@@ -0,0 +1,167 @@
>+//
>+// Copyright (c) 2002-2015 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// During parsing, all constant expressions are folded to constant union nodes. The expressions that
>+// have been folded may have had precision qualifiers, which should affect the precision of the
>+// consuming operation. If the folded constant union nodes are written to output as such they won't
>+// have any precision qualifiers, and their effect on the precision of the consuming operation is
>+// lost.
>+//
>+// RecordConstantPrecision is an AST traverser that inspects the precision qualifiers of constants
>+// and hoists the constants outside the containing expression as precision qualified named variables
>+// in case that is required for correct precision propagation.
>+//
>+
>+#include "compiler/translator/tree_ops/RecordConstantPrecision.h"
>+
>+#include "compiler/translator/InfoSink.h"
>+#include "compiler/translator/tree_util/IntermNode_util.h"
>+#include "compiler/translator/tree_util/IntermTraverse.h"
>+
>+namespace sh
>+{
>+
>+namespace
>+{
>+
>+class RecordConstantPrecisionTraverser : public TIntermTraverser
>+{
>+  public:
>+    RecordConstantPrecisionTraverser(TSymbolTable *symbolTable);
>+
>+    void visitConstantUnion(TIntermConstantUnion *node) override;
>+
>+    void nextIteration();
>+
>+    bool foundHigherPrecisionConstant() const { return mFoundHigherPrecisionConstant; }
>+
>+  protected:
>+    bool operandAffectsParentOperationPrecision(TIntermTyped *operand);
>+
>+    bool mFoundHigherPrecisionConstant;
>+};
>+
>+RecordConstantPrecisionTraverser::RecordConstantPrecisionTraverser(TSymbolTable *symbolTable)
>+    : TIntermTraverser(true, false, true, symbolTable), mFoundHigherPrecisionConstant(false)
>+{}
>+
>+bool RecordConstantPrecisionTraverser::operandAffectsParentOperationPrecision(TIntermTyped *operand)
>+{
>+    if (getParentNode()->getAsCaseNode() || getParentNode()->getAsBlock())
>+    {
>+        return false;
>+    }
>+
>+    const TIntermBinary *parentAsBinary = getParentNode()->getAsBinaryNode();
>+    if (parentAsBinary != nullptr)
>+    {
>+        // If the constant is assigned or is used to initialize a variable, or if it's an index,
>+        // its precision has no effect.
>+        switch (parentAsBinary->getOp())
>+        {
>+            case EOpInitialize:
>+            case EOpAssign:
>+            case EOpIndexDirect:
>+            case EOpIndexDirectStruct:
>+            case EOpIndexDirectInterfaceBlock:
>+            case EOpIndexIndirect:
>+                return false;
>+            default:
>+                break;
>+        }
>+
>+        TIntermTyped *otherOperand = parentAsBinary->getRight();
>+        if (otherOperand == operand)
>+        {
>+            otherOperand = parentAsBinary->getLeft();
>+        }
>+        // If the precision of the other child is at least as high as the precision of the constant,
>+        // the precision of the constant has no effect.
>+        if (otherOperand->getAsConstantUnion() == nullptr &&
>+            otherOperand->getPrecision() >= operand->getPrecision())
>+        {
>+            return false;
>+        }
>+    }
>+
>+    TIntermAggregate *parentAsAggregate = getParentNode()->getAsAggregate();
>+    if (parentAsAggregate != nullptr)
>+    {
>+        if (!parentAsAggregate->gotPrecisionFromChildren())
>+        {
>+            // This can be either:
>+            // * a call to an user-defined function
>+            // * a call to a texture function
>+            // * some other kind of aggregate
>+            // In any of these cases the constant precision has no effect.
>+            return false;
>+        }
>+        if (parentAsAggregate->isConstructor() && parentAsAggregate->getBasicType() == EbtBool)
>+        {
>+            return false;
>+        }
>+        // If the precision of operands does affect the result, but the precision of any of the
>+        // other children has a precision that's at least as high as the precision of the constant,
>+        // the precision of the constant has no effect.
>+        TIntermSequence *parameters = parentAsAggregate->getSequence();
>+        for (TIntermNode *parameter : *parameters)
>+        {
>+            const TIntermTyped *typedParameter = parameter->getAsTyped();
>+            if (parameter != operand && typedParameter != nullptr &&
>+                parameter->getAsConstantUnion() == nullptr &&
>+                typedParameter->getPrecision() >= operand->getPrecision())
>+            {
>+                return false;
>+            }
>+        }
>+    }
>+    return true;
>+}
>+
>+void RecordConstantPrecisionTraverser::visitConstantUnion(TIntermConstantUnion *node)
>+{
>+    if (mFoundHigherPrecisionConstant)
>+        return;
>+
>+    // If the constant has lowp or undefined precision, it can't increase the precision of consuming
>+    // operations.
>+    if (node->getPrecision() < EbpMedium)
>+        return;
>+
>+    // It's possible the node has no effect on the precision of the consuming expression, depending
>+    // on the consuming expression, and the precision of the other parameters of the expression.
>+    if (!operandAffectsParentOperationPrecision(node))
>+        return;
>+
>+    // Make the constant a precision-qualified named variable to make sure it affects the precision
>+    // of the consuming expression.
>+    TIntermDeclaration *variableDeclaration = nullptr;
>+    TVariable *variable = DeclareTempVariable(mSymbolTable, node, EvqConst, &variableDeclaration);
>+    insertStatementInParentBlock(variableDeclaration);
>+    queueReplacement(CreateTempSymbolNode(variable), OriginalNode::IS_DROPPED);
>+    mFoundHigherPrecisionConstant = true;
>+}
>+
>+void RecordConstantPrecisionTraverser::nextIteration()
>+{
>+    mFoundHigherPrecisionConstant = false;
>+}
>+
>+}  // namespace
>+
>+void RecordConstantPrecision(TIntermNode *root, TSymbolTable *symbolTable)
>+{
>+    RecordConstantPrecisionTraverser traverser(symbolTable);
>+    // Iterate as necessary, and reset the traverser between iterations.
>+    do
>+    {
>+        traverser.nextIteration();
>+        root->traverse(&traverser);
>+        if (traverser.foundHigherPrecisionConstant())
>+            traverser.updateTree();
>+    } while (traverser.foundHigherPrecisionConstant());
>+}
>+
>+}  // namespace sh
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/RecordConstantPrecision.h b/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/RecordConstantPrecision.h
>new file mode 100644
>index 00000000000..5b15db5e48f
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/RecordConstantPrecision.h
>@@ -0,0 +1,28 @@
>+//
>+// Copyright (c) 2002-2015 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// During parsing, all constant expressions are folded to constant union nodes. The expressions that
>+// have been folded may have had precision qualifiers, which should affect the precision of the
>+// consuming operation. If the folded constant union nodes are written to output as such they won't
>+// have any precision qualifiers, and their effect on the precision of the consuming operation is
>+// lost.
>+//
>+// RecordConstantPrecision is an AST traverser that inspects the precision qualifiers of constants
>+// and hoists the constants outside the containing expression as precision qualified named variables
>+// in case that is required for correct precision propagation.
>+//
>+
>+#ifndef COMPILER_TRANSLATOR_TREEOPS_RECORDCONSTANTPRECISION_H_
>+#define COMPILER_TRANSLATOR_TREEOPS_RECORDCONSTANTPRECISION_H_
>+
>+namespace sh
>+{
>+class TIntermNode;
>+class TSymbolTable;
>+
>+void RecordConstantPrecision(TIntermNode *root, TSymbolTable *symbolTable);
>+}  // namespace sh
>+
>+#endif  // COMPILER_TRANSLATOR_TREEOPS_RECORDCONSTANTPRECISION_H_
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/RegenerateStructNames.cpp b/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/RegenerateStructNames.cpp
>new file mode 100644
>index 00000000000..dd700246db2
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/RegenerateStructNames.cpp
>@@ -0,0 +1,87 @@
>+//
>+// Copyright (c) 2002-2014 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+
>+#include "compiler/translator/tree_ops/RegenerateStructNames.h"
>+
>+#include "common/debug.h"
>+#include "compiler/translator/ImmutableStringBuilder.h"
>+
>+namespace sh
>+{
>+
>+namespace
>+{
>+constexpr const ImmutableString kPrefix("_webgl_struct_");
>+}  // anonymous namespace
>+
>+void RegenerateStructNames::visitSymbol(TIntermSymbol *symbol)
>+{
>+    ASSERT(symbol);
>+    const TType &type          = symbol->getType();
>+    const TStructure *userType = type.getStruct();
>+    if (!userType)
>+        return;
>+
>+    if (userType->symbolType() == SymbolType::BuiltIn ||
>+        userType->symbolType() == SymbolType::Empty)
>+    {
>+        // Built-in struct or nameless struct, do not touch it.
>+        return;
>+    }
>+
>+    int uniqueId = userType->uniqueId().get();
>+
>+    ASSERT(mScopeDepth > 0);
>+    if (mScopeDepth == 1)
>+    {
>+        // If a struct is defined at global scope, we don't map its name.
>+        // This is because at global level, the struct might be used to
>+        // declare a uniform, so the same name needs to stay the same for
>+        // vertex/fragment shaders. However, our mapping uses internal ID,
>+        // which will be different for the same struct in vertex/fragment
>+        // shaders.
>+        // This is OK because names for any structs defined in other scopes
>+        // will begin with "_webgl", which is reserved. So there will be
>+        // no conflicts among unmapped struct names from global scope and
>+        // mapped struct names from other scopes.
>+        // However, we need to keep track of these global structs, so if a
>+        // variable is used in a local scope, we don't try to modify the
>+        // struct name through that variable.
>+        mDeclaredGlobalStructs.insert(uniqueId);
>+        return;
>+    }
>+    if (mDeclaredGlobalStructs.count(uniqueId) > 0)
>+        return;
>+    // Map {name} to _webgl_struct_{uniqueId}_{name}.
>+    if (userType->name().beginsWith(kPrefix))
>+    {
>+        // The name has already been regenerated.
>+        return;
>+    }
>+    ImmutableStringBuilder tmp(kPrefix.length() + sizeof(uniqueId) * 2u + 1u +
>+                               userType->name().length());
>+    tmp << kPrefix;
>+    tmp.appendHex(uniqueId);
>+    tmp << '_' << userType->name();
>+
>+    // TODO(oetuaho): Add another mechanism to change symbol names so that the const_cast is not
>+    // needed.
>+    const_cast<TStructure *>(userType)->setName(tmp);
>+}
>+
>+bool RegenerateStructNames::visitBlock(Visit, TIntermBlock *block)
>+{
>+    ++mScopeDepth;
>+    TIntermSequence &sequence = *(block->getSequence());
>+    for (TIntermNode *node : sequence)
>+    {
>+        node->traverse(this);
>+    }
>+    --mScopeDepth;
>+    return false;
>+}
>+
>+}  // namespace sh
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/RegenerateStructNames.h b/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/RegenerateStructNames.h
>new file mode 100644
>index 00000000000..4c53cd50e8f
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/RegenerateStructNames.h
>@@ -0,0 +1,40 @@
>+//
>+// Copyright (c) 2002-2014 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+
>+#ifndef COMPILER_TRANSLATOR_TREEOPS_REGENERATESTRUCTNAMES_H_
>+#define COMPILER_TRANSLATOR_TREEOPS_REGENERATESTRUCTNAMES_H_
>+
>+#include "compiler/translator/SymbolTable.h"
>+#include "compiler/translator/tree_util/IntermTraverse.h"
>+
>+#include <set>
>+
>+namespace sh
>+{
>+
>+class RegenerateStructNames : public TIntermTraverser
>+{
>+  public:
>+    RegenerateStructNames(TSymbolTable *symbolTable)
>+        : TIntermTraverser(true, false, false, symbolTable), mScopeDepth(0)
>+    {}
>+
>+  protected:
>+    void visitSymbol(TIntermSymbol *) override;
>+    bool visitBlock(Visit, TIntermBlock *block) override;
>+
>+  private:
>+    // Indicating the depth of the current scope.
>+    // The global scope is 1.
>+    int mScopeDepth;
>+
>+    // If a struct's declared globally, push its ID in this set.
>+    std::set<int> mDeclaredGlobalStructs;
>+};
>+
>+}  // namespace sh
>+
>+#endif  // COMPILER_TRANSLATOR_TREEOPS_REGENERATESTRUCTNAMES_H_
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/RemoveArrayLengthMethod.cpp b/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/RemoveArrayLengthMethod.cpp
>new file mode 100644
>index 00000000000..473159f89c6
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/RemoveArrayLengthMethod.cpp
>@@ -0,0 +1,83 @@
>+//
>+// Copyright (c) 2017 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// RemoveArrayLengthMethod.cpp:
>+//   Fold array length expressions, including cases where the "this" node has side effects.
>+//   Example:
>+//     int i = (a = b).length();
>+//     int j = (func()).length();
>+//   becomes:
>+//     (a = b);
>+//     int i = <constant array length>;
>+//     func();
>+//     int j = <constant array length>;
>+//
>+//   Must be run after SplitSequenceOperator, SimplifyLoopConditions and SeparateDeclarations steps
>+//   have been done to expressions containing calls of the array length method.
>+//
>+//   Does nothing to length method calls done on runtime-sized arrays.
>+
>+#include "compiler/translator/tree_ops/RemoveArrayLengthMethod.h"
>+
>+#include "compiler/translator/IntermNode.h"
>+#include "compiler/translator/tree_util/IntermTraverse.h"
>+
>+namespace sh
>+{
>+
>+namespace
>+{
>+
>+class RemoveArrayLengthTraverser : public TIntermTraverser
>+{
>+  public:
>+    RemoveArrayLengthTraverser() : TIntermTraverser(true, false, false), mFoundArrayLength(false) {}
>+
>+    bool visitUnary(Visit visit, TIntermUnary *node) override;
>+
>+    void nextIteration() { mFoundArrayLength = false; }
>+
>+    bool foundArrayLength() const { return mFoundArrayLength; }
>+
>+  private:
>+    bool mFoundArrayLength;
>+};
>+
>+bool RemoveArrayLengthTraverser::visitUnary(Visit visit, TIntermUnary *node)
>+{
>+    // The only case where we leave array length() in place is for runtime-sized arrays.
>+    if (node->getOp() == EOpArrayLength && !node->getOperand()->getType().isUnsizedArray())
>+    {
>+        mFoundArrayLength = true;
>+        if (!node->getOperand()->hasSideEffects())
>+        {
>+            queueReplacement(node->fold(nullptr), OriginalNode::IS_DROPPED);
>+            return false;
>+        }
>+        insertStatementInParentBlock(node->getOperand()->deepCopy());
>+        TConstantUnion *constArray = new TConstantUnion[1];
>+        constArray->setIConst(node->getOperand()->getOutermostArraySize());
>+        queueReplacement(new TIntermConstantUnion(constArray, node->getType()),
>+                         OriginalNode::IS_DROPPED);
>+        return false;
>+    }
>+    return true;
>+}
>+
>+}  // anonymous namespace
>+
>+void RemoveArrayLengthMethod(TIntermBlock *root)
>+{
>+    RemoveArrayLengthTraverser traverser;
>+    do
>+    {
>+        traverser.nextIteration();
>+        root->traverse(&traverser);
>+        if (traverser.foundArrayLength())
>+            traverser.updateTree();
>+    } while (traverser.foundArrayLength());
>+}
>+
>+}  // namespace sh
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/RemoveArrayLengthMethod.h b/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/RemoveArrayLengthMethod.h
>new file mode 100644
>index 00000000000..63768287498
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/RemoveArrayLengthMethod.h
>@@ -0,0 +1,34 @@
>+//
>+// Copyright (c) 2017 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// RemoveArrayLengthMethod.h:
>+//   Fold array length expressions, including cases where the "this" node has side effects.
>+//   Example:
>+//     int i = (a = b).length();
>+//     int j = (func()).length();
>+//   becomes:
>+//     (a = b);
>+//     int i = <constant array length>;
>+//     func();
>+//     int j = <constant array length>;
>+//
>+//   Must be run after SplitSequenceOperator, SimplifyLoopConditions and SeparateDeclarations steps
>+//   have been done to expressions containing calls of the array length method.
>+//
>+//   Does nothing to length method calls done on runtime-sized arrays.
>+
>+#ifndef COMPILER_TRANSLATOR_TREEOPS_REMOVEARRAYLENGTHMETHOD_H_
>+#define COMPILER_TRANSLATOR_TREEOPS_REMOVEARRAYLENGTHMETHOD_H_
>+
>+namespace sh
>+{
>+
>+class TIntermBlock;
>+
>+void RemoveArrayLengthMethod(TIntermBlock *root);
>+
>+}  // namespace sh
>+
>+#endif  // COMPILER_TRANSLATOR_TREEOPS_REMOVEARRAYLENGTHMETHOD_H_
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/RemoveDynamicIndexing.cpp b/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/RemoveDynamicIndexing.cpp
>new file mode 100644
>index 00000000000..879d29eba07
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/RemoveDynamicIndexing.cpp
>@@ -0,0 +1,543 @@
>+//
>+// Copyright (c) 2002-2015 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// RemoveDynamicIndexing is an AST traverser to remove dynamic indexing of non-SSBO vectors and
>+// matrices, replacing them with calls to functions that choose which component to return or write.
>+// We don't need to consider dynamic indexing in SSBO since it can be directly as part of the offset
>+// of RWByteAddressBuffer.
>+//
>+
>+#include "compiler/translator/tree_ops/RemoveDynamicIndexing.h"
>+
>+#include "compiler/translator/Diagnostics.h"
>+#include "compiler/translator/InfoSink.h"
>+#include "compiler/translator/StaticType.h"
>+#include "compiler/translator/SymbolTable.h"
>+#include "compiler/translator/tree_util/IntermNodePatternMatcher.h"
>+#include "compiler/translator/tree_util/IntermNode_util.h"
>+#include "compiler/translator/tree_util/IntermTraverse.h"
>+
>+namespace sh
>+{
>+
>+namespace
>+{
>+
>+const TType *kIndexType = StaticType::Get<EbtInt, EbpHigh, EvqIn, 1, 1>();
>+
>+constexpr const ImmutableString kBaseName("base");
>+constexpr const ImmutableString kIndexName("index");
>+constexpr const ImmutableString kValueName("value");
>+
>+std::string GetIndexFunctionName(const TType &type, bool write)
>+{
>+    TInfoSinkBase nameSink;
>+    nameSink << "dyn_index_";
>+    if (write)
>+    {
>+        nameSink << "write_";
>+    }
>+    if (type.isMatrix())
>+    {
>+        nameSink << "mat" << type.getCols() << "x" << type.getRows();
>+    }
>+    else
>+    {
>+        switch (type.getBasicType())
>+        {
>+            case EbtInt:
>+                nameSink << "ivec";
>+                break;
>+            case EbtBool:
>+                nameSink << "bvec";
>+                break;
>+            case EbtUInt:
>+                nameSink << "uvec";
>+                break;
>+            case EbtFloat:
>+                nameSink << "vec";
>+                break;
>+            default:
>+                UNREACHABLE();
>+        }
>+        nameSink << type.getNominalSize();
>+    }
>+    return nameSink.str();
>+}
>+
>+TIntermConstantUnion *CreateIntConstantNode(int i)
>+{
>+    TConstantUnion *constant = new TConstantUnion();
>+    constant->setIConst(i);
>+    return new TIntermConstantUnion(constant, TType(EbtInt, EbpHigh));
>+}
>+
>+TIntermTyped *EnsureSignedInt(TIntermTyped *node)
>+{
>+    if (node->getBasicType() == EbtInt)
>+        return node;
>+
>+    TIntermSequence *arguments = new TIntermSequence();
>+    arguments->push_back(node);
>+    return TIntermAggregate::CreateConstructor(TType(EbtInt), arguments);
>+}
>+
>+TType *GetFieldType(const TType &indexedType)
>+{
>+    if (indexedType.isMatrix())
>+    {
>+        TType *fieldType = new TType(indexedType.getBasicType(), indexedType.getPrecision());
>+        fieldType->setPrimarySize(static_cast<unsigned char>(indexedType.getRows()));
>+        return fieldType;
>+    }
>+    else
>+    {
>+        return new TType(indexedType.getBasicType(), indexedType.getPrecision());
>+    }
>+}
>+
>+const TType *GetBaseType(const TType &type, bool write)
>+{
>+    TType *baseType = new TType(type);
>+    // Conservatively use highp here, even if the indexed type is not highp. That way the code can't
>+    // end up using mediump version of an indexing function for a highp value, if both mediump and
>+    // highp values are being indexed in the shader. For HLSL precision doesn't matter, but in
>+    // principle this code could be used with multiple backends.
>+    baseType->setPrecision(EbpHigh);
>+    baseType->setQualifier(EvqInOut);
>+    if (!write)
>+        baseType->setQualifier(EvqIn);
>+    return baseType;
>+}
>+
>+// Generate a read or write function for one field in a vector/matrix.
>+// Out-of-range indices are clamped. This is consistent with how ANGLE handles out-of-range
>+// indices in other places.
>+// Note that indices can be either int or uint. We create only int versions of the functions,
>+// and convert uint indices to int at the call site.
>+// read function example:
>+// float dyn_index_vec2(in vec2 base, in int index)
>+// {
>+//    switch(index)
>+//    {
>+//      case (0):
>+//        return base[0];
>+//      case (1):
>+//        return base[1];
>+//      default:
>+//        break;
>+//    }
>+//    if (index < 0)
>+//      return base[0];
>+//    return base[1];
>+// }
>+// write function example:
>+// void dyn_index_write_vec2(inout vec2 base, in int index, in float value)
>+// {
>+//    switch(index)
>+//    {
>+//      case (0):
>+//        base[0] = value;
>+//        return;
>+//      case (1):
>+//        base[1] = value;
>+//        return;
>+//      default:
>+//        break;
>+//    }
>+//    if (index < 0)
>+//    {
>+//      base[0] = value;
>+//      return;
>+//    }
>+//    base[1] = value;
>+// }
>+// Note that else is not used in above functions to avoid the RewriteElseBlocks transformation.
>+TIntermFunctionDefinition *GetIndexFunctionDefinition(const TType &type,
>+                                                      bool write,
>+                                                      const TFunction &func,
>+                                                      TSymbolTable *symbolTable)
>+{
>+    ASSERT(!type.isArray());
>+
>+    int numCases = 0;
>+    if (type.isMatrix())
>+    {
>+        numCases = type.getCols();
>+    }
>+    else
>+    {
>+        numCases = type.getNominalSize();
>+    }
>+
>+    std::string functionName                = GetIndexFunctionName(type, write);
>+    TIntermFunctionPrototype *prototypeNode = CreateInternalFunctionPrototypeNode(func);
>+
>+    TIntermSymbol *baseParam  = new TIntermSymbol(func.getParam(0));
>+    TIntermSymbol *indexParam = new TIntermSymbol(func.getParam(1));
>+    TIntermSymbol *valueParam = nullptr;
>+    if (write)
>+    {
>+        valueParam = new TIntermSymbol(func.getParam(2));
>+    }
>+
>+    TIntermBlock *statementList = new TIntermBlock();
>+    for (int i = 0; i < numCases; ++i)
>+    {
>+        TIntermCase *caseNode = new TIntermCase(CreateIntConstantNode(i));
>+        statementList->getSequence()->push_back(caseNode);
>+
>+        TIntermBinary *indexNode =
>+            new TIntermBinary(EOpIndexDirect, baseParam->deepCopy(), CreateIndexNode(i));
>+        if (write)
>+        {
>+            TIntermBinary *assignNode =
>+                new TIntermBinary(EOpAssign, indexNode, valueParam->deepCopy());
>+            statementList->getSequence()->push_back(assignNode);
>+            TIntermBranch *returnNode = new TIntermBranch(EOpReturn, nullptr);
>+            statementList->getSequence()->push_back(returnNode);
>+        }
>+        else
>+        {
>+            TIntermBranch *returnNode = new TIntermBranch(EOpReturn, indexNode);
>+            statementList->getSequence()->push_back(returnNode);
>+        }
>+    }
>+
>+    // Default case
>+    TIntermCase *defaultNode = new TIntermCase(nullptr);
>+    statementList->getSequence()->push_back(defaultNode);
>+    TIntermBranch *breakNode = new TIntermBranch(EOpBreak, nullptr);
>+    statementList->getSequence()->push_back(breakNode);
>+
>+    TIntermSwitch *switchNode = new TIntermSwitch(indexParam->deepCopy(), statementList);
>+
>+    TIntermBlock *bodyNode = new TIntermBlock();
>+    bodyNode->getSequence()->push_back(switchNode);
>+
>+    TIntermBinary *cond =
>+        new TIntermBinary(EOpLessThan, indexParam->deepCopy(), CreateIntConstantNode(0));
>+
>+    // Two blocks: one accesses (either reads or writes) the first element and returns,
>+    // the other accesses the last element.
>+    TIntermBlock *useFirstBlock = new TIntermBlock();
>+    TIntermBlock *useLastBlock  = new TIntermBlock();
>+    TIntermBinary *indexFirstNode =
>+        new TIntermBinary(EOpIndexDirect, baseParam->deepCopy(), CreateIndexNode(0));
>+    TIntermBinary *indexLastNode =
>+        new TIntermBinary(EOpIndexDirect, baseParam->deepCopy(), CreateIndexNode(numCases - 1));
>+    if (write)
>+    {
>+        TIntermBinary *assignFirstNode =
>+            new TIntermBinary(EOpAssign, indexFirstNode, valueParam->deepCopy());
>+        useFirstBlock->getSequence()->push_back(assignFirstNode);
>+        TIntermBranch *returnNode = new TIntermBranch(EOpReturn, nullptr);
>+        useFirstBlock->getSequence()->push_back(returnNode);
>+
>+        TIntermBinary *assignLastNode =
>+            new TIntermBinary(EOpAssign, indexLastNode, valueParam->deepCopy());
>+        useLastBlock->getSequence()->push_back(assignLastNode);
>+    }
>+    else
>+    {
>+        TIntermBranch *returnFirstNode = new TIntermBranch(EOpReturn, indexFirstNode);
>+        useFirstBlock->getSequence()->push_back(returnFirstNode);
>+
>+        TIntermBranch *returnLastNode = new TIntermBranch(EOpReturn, indexLastNode);
>+        useLastBlock->getSequence()->push_back(returnLastNode);
>+    }
>+    TIntermIfElse *ifNode = new TIntermIfElse(cond, useFirstBlock, nullptr);
>+    bodyNode->getSequence()->push_back(ifNode);
>+    bodyNode->getSequence()->push_back(useLastBlock);
>+
>+    TIntermFunctionDefinition *indexingFunction =
>+        new TIntermFunctionDefinition(prototypeNode, bodyNode);
>+    return indexingFunction;
>+}
>+
>+class RemoveDynamicIndexingTraverser : public TLValueTrackingTraverser
>+{
>+  public:
>+    RemoveDynamicIndexingTraverser(TSymbolTable *symbolTable,
>+                                   PerformanceDiagnostics *perfDiagnostics);
>+
>+    bool visitBinary(Visit visit, TIntermBinary *node) override;
>+
>+    void insertHelperDefinitions(TIntermNode *root);
>+
>+    void nextIteration();
>+
>+    bool usedTreeInsertion() const { return mUsedTreeInsertion; }
>+
>+  protected:
>+    // Maps of types that are indexed to the indexing function ids used for them. Note that these
>+    // can not store multiple variants of the same type with different precisions - only one
>+    // precision gets stored.
>+    std::map<TType, TFunction *> mIndexedVecAndMatrixTypes;
>+    std::map<TType, TFunction *> mWrittenVecAndMatrixTypes;
>+
>+    bool mUsedTreeInsertion;
>+
>+    // When true, the traverser will remove side effects from any indexing expression.
>+    // This is done so that in code like
>+    //   V[j++][i]++.
>+    // where V is an array of vectors, j++ will only be evaluated once.
>+    bool mRemoveIndexSideEffectsInSubtree;
>+
>+    PerformanceDiagnostics *mPerfDiagnostics;
>+};
>+
>+RemoveDynamicIndexingTraverser::RemoveDynamicIndexingTraverser(
>+    TSymbolTable *symbolTable,
>+    PerformanceDiagnostics *perfDiagnostics)
>+    : TLValueTrackingTraverser(true, false, false, symbolTable),
>+      mUsedTreeInsertion(false),
>+      mRemoveIndexSideEffectsInSubtree(false),
>+      mPerfDiagnostics(perfDiagnostics)
>+{}
>+
>+void RemoveDynamicIndexingTraverser::insertHelperDefinitions(TIntermNode *root)
>+{
>+    TIntermBlock *rootBlock = root->getAsBlock();
>+    ASSERT(rootBlock != nullptr);
>+    TIntermSequence insertions;
>+    for (auto &type : mIndexedVecAndMatrixTypes)
>+    {
>+        insertions.push_back(
>+            GetIndexFunctionDefinition(type.first, false, *type.second, mSymbolTable));
>+    }
>+    for (auto &type : mWrittenVecAndMatrixTypes)
>+    {
>+        insertions.push_back(
>+            GetIndexFunctionDefinition(type.first, true, *type.second, mSymbolTable));
>+    }
>+    rootBlock->insertChildNodes(0, insertions);
>+}
>+
>+// Create a call to dyn_index_*() based on an indirect indexing op node
>+TIntermAggregate *CreateIndexFunctionCall(TIntermBinary *node,
>+                                          TIntermTyped *index,
>+                                          TFunction *indexingFunction)
>+{
>+    ASSERT(node->getOp() == EOpIndexIndirect);
>+    TIntermSequence *arguments = new TIntermSequence();
>+    arguments->push_back(node->getLeft());
>+    arguments->push_back(index);
>+
>+    TIntermAggregate *indexingCall =
>+        TIntermAggregate::CreateFunctionCall(*indexingFunction, arguments);
>+    indexingCall->setLine(node->getLine());
>+    return indexingCall;
>+}
>+
>+TIntermAggregate *CreateIndexedWriteFunctionCall(TIntermBinary *node,
>+                                                 TVariable *index,
>+                                                 TVariable *writtenValue,
>+                                                 TFunction *indexedWriteFunction)
>+{
>+    ASSERT(node->getOp() == EOpIndexIndirect);
>+    TIntermSequence *arguments = new TIntermSequence();
>+    // Deep copy the child nodes so that two pointers to the same node don't end up in the tree.
>+    arguments->push_back(node->getLeft()->deepCopy());
>+    arguments->push_back(CreateTempSymbolNode(index));
>+    arguments->push_back(CreateTempSymbolNode(writtenValue));
>+
>+    TIntermAggregate *indexedWriteCall =
>+        TIntermAggregate::CreateFunctionCall(*indexedWriteFunction, arguments);
>+    indexedWriteCall->setLine(node->getLine());
>+    return indexedWriteCall;
>+}
>+
>+bool RemoveDynamicIndexingTraverser::visitBinary(Visit visit, TIntermBinary *node)
>+{
>+    if (mUsedTreeInsertion)
>+        return false;
>+
>+    if (node->getOp() == EOpIndexIndirect)
>+    {
>+        if (mRemoveIndexSideEffectsInSubtree)
>+        {
>+            ASSERT(node->getRight()->hasSideEffects());
>+            // In case we're just removing index side effects, convert
>+            //   v_expr[index_expr]
>+            // to this:
>+            //   int s0 = index_expr; v_expr[s0];
>+            // Now v_expr[s0] can be safely executed several times without unintended side effects.
>+            TIntermDeclaration *indexVariableDeclaration = nullptr;
>+            TVariable *indexVariable = DeclareTempVariable(mSymbolTable, node->getRight(),
>+                                                           EvqTemporary, &indexVariableDeclaration);
>+            insertStatementInParentBlock(indexVariableDeclaration);
>+            mUsedTreeInsertion = true;
>+
>+            // Replace the index with the temp variable
>+            TIntermSymbol *tempIndex = CreateTempSymbolNode(indexVariable);
>+            queueReplacementWithParent(node, node->getRight(), tempIndex, OriginalNode::IS_DROPPED);
>+        }
>+        else if (IntermNodePatternMatcher::IsDynamicIndexingOfNonSSBOVectorOrMatrix(node))
>+        {
>+            mPerfDiagnostics->warning(node->getLine(),
>+                                      "Performance: dynamic indexing of vectors and "
>+                                      "matrices is emulated and can be slow.",
>+                                      "[]");
>+            bool write = isLValueRequiredHere();
>+
>+#if defined(ANGLE_ENABLE_ASSERTS)
>+            // Make sure that IntermNodePatternMatcher is consistent with the slightly differently
>+            // implemented checks in this traverser.
>+            IntermNodePatternMatcher matcher(
>+                IntermNodePatternMatcher::kDynamicIndexingOfVectorOrMatrixInLValue);
>+            ASSERT(matcher.match(node, getParentNode(), isLValueRequiredHere()) == write);
>+#endif
>+
>+            const TType &type = node->getLeft()->getType();
>+            ImmutableString indexingFunctionName(GetIndexFunctionName(type, false));
>+            TFunction *indexingFunction = nullptr;
>+            if (mIndexedVecAndMatrixTypes.find(type) == mIndexedVecAndMatrixTypes.end())
>+            {
>+                indexingFunction =
>+                    new TFunction(mSymbolTable, indexingFunctionName, SymbolType::AngleInternal,
>+                                  GetFieldType(type), true);
>+                indexingFunction->addParameter(new TVariable(
>+                    mSymbolTable, kBaseName, GetBaseType(type, false), SymbolType::AngleInternal));
>+                indexingFunction->addParameter(
>+                    new TVariable(mSymbolTable, kIndexName, kIndexType, SymbolType::AngleInternal));
>+                mIndexedVecAndMatrixTypes[type] = indexingFunction;
>+            }
>+            else
>+            {
>+                indexingFunction = mIndexedVecAndMatrixTypes[type];
>+            }
>+
>+            if (write)
>+            {
>+                // Convert:
>+                //   v_expr[index_expr]++;
>+                // to this:
>+                //   int s0 = index_expr; float s1 = dyn_index(v_expr, s0); s1++;
>+                //   dyn_index_write(v_expr, s0, s1);
>+                // This works even if index_expr has some side effects.
>+                if (node->getLeft()->hasSideEffects())
>+                {
>+                    // If v_expr has side effects, those need to be removed before proceeding.
>+                    // Otherwise the side effects of v_expr would be evaluated twice.
>+                    // The only case where an l-value can have side effects is when it is
>+                    // indexing. For example, it can be V[j++] where V is an array of vectors.
>+                    mRemoveIndexSideEffectsInSubtree = true;
>+                    return true;
>+                }
>+
>+                TIntermBinary *leftBinary = node->getLeft()->getAsBinaryNode();
>+                if (leftBinary != nullptr &&
>+                    IntermNodePatternMatcher::IsDynamicIndexingOfNonSSBOVectorOrMatrix(leftBinary))
>+                {
>+                    // This is a case like:
>+                    // mat2 m;
>+                    // m[a][b]++;
>+                    // Process the child node m[a] first.
>+                    return true;
>+                }
>+
>+                // TODO(oetuaho@nvidia.com): This is not optimal if the expression using the value
>+                // only writes it and doesn't need the previous value. http://anglebug.com/1116
>+
>+                TFunction *indexedWriteFunction = nullptr;
>+                if (mWrittenVecAndMatrixTypes.find(type) == mWrittenVecAndMatrixTypes.end())
>+                {
>+                    ImmutableString functionName(
>+                        GetIndexFunctionName(node->getLeft()->getType(), true));
>+                    indexedWriteFunction =
>+                        new TFunction(mSymbolTable, functionName, SymbolType::AngleInternal,
>+                                      StaticType::GetBasic<EbtVoid>(), false);
>+                    indexedWriteFunction->addParameter(new TVariable(mSymbolTable, kBaseName,
>+                                                                     GetBaseType(type, true),
>+                                                                     SymbolType::AngleInternal));
>+                    indexedWriteFunction->addParameter(new TVariable(
>+                        mSymbolTable, kIndexName, kIndexType, SymbolType::AngleInternal));
>+                    TType *valueType = GetFieldType(type);
>+                    valueType->setQualifier(EvqIn);
>+                    indexedWriteFunction->addParameter(new TVariable(
>+                        mSymbolTable, kValueName, static_cast<const TType *>(valueType),
>+                        SymbolType::AngleInternal));
>+                    mWrittenVecAndMatrixTypes[type] = indexedWriteFunction;
>+                }
>+                else
>+                {
>+                    indexedWriteFunction = mWrittenVecAndMatrixTypes[type];
>+                }
>+
>+                TIntermSequence insertionsBefore;
>+                TIntermSequence insertionsAfter;
>+
>+                // Store the index in a temporary signed int variable.
>+                // s0 = index_expr;
>+                TIntermTyped *indexInitializer               = EnsureSignedInt(node->getRight());
>+                TIntermDeclaration *indexVariableDeclaration = nullptr;
>+                TVariable *indexVariable                     = DeclareTempVariable(
>+                    mSymbolTable, indexInitializer, EvqTemporary, &indexVariableDeclaration);
>+                insertionsBefore.push_back(indexVariableDeclaration);
>+
>+                // s1 = dyn_index(v_expr, s0);
>+                TIntermAggregate *indexingCall = CreateIndexFunctionCall(
>+                    node, CreateTempSymbolNode(indexVariable), indexingFunction);
>+                TIntermDeclaration *fieldVariableDeclaration = nullptr;
>+                TVariable *fieldVariable                     = DeclareTempVariable(
>+                    mSymbolTable, indexingCall, EvqTemporary, &fieldVariableDeclaration);
>+                insertionsBefore.push_back(fieldVariableDeclaration);
>+
>+                // dyn_index_write(v_expr, s0, s1);
>+                TIntermAggregate *indexedWriteCall = CreateIndexedWriteFunctionCall(
>+                    node, indexVariable, fieldVariable, indexedWriteFunction);
>+                insertionsAfter.push_back(indexedWriteCall);
>+                insertStatementsInParentBlock(insertionsBefore, insertionsAfter);
>+
>+                // replace the node with s1
>+                queueReplacement(CreateTempSymbolNode(fieldVariable), OriginalNode::IS_DROPPED);
>+                mUsedTreeInsertion = true;
>+            }
>+            else
>+            {
>+                // The indexed value is not being written, so we can simply convert
>+                //   v_expr[index_expr]
>+                // into
>+                //   dyn_index(v_expr, index_expr)
>+                // If the index_expr is unsigned, we'll convert it to signed.
>+                ASSERT(!mRemoveIndexSideEffectsInSubtree);
>+                TIntermAggregate *indexingCall = CreateIndexFunctionCall(
>+                    node, EnsureSignedInt(node->getRight()), indexingFunction);
>+                queueReplacement(indexingCall, OriginalNode::IS_DROPPED);
>+            }
>+        }
>+    }
>+    return !mUsedTreeInsertion;
>+}
>+
>+void RemoveDynamicIndexingTraverser::nextIteration()
>+{
>+    mUsedTreeInsertion               = false;
>+    mRemoveIndexSideEffectsInSubtree = false;
>+}
>+
>+}  // namespace
>+
>+void RemoveDynamicIndexing(TIntermNode *root,
>+                           TSymbolTable *symbolTable,
>+                           PerformanceDiagnostics *perfDiagnostics)
>+{
>+    RemoveDynamicIndexingTraverser traverser(symbolTable, perfDiagnostics);
>+    do
>+    {
>+        traverser.nextIteration();
>+        root->traverse(&traverser);
>+        traverser.updateTree();
>+    } while (traverser.usedTreeInsertion());
>+    // TODO(oetuaho@nvidia.com): It might be nicer to add the helper definitions also in the middle
>+    // of traversal. Now the tree ends up in an inconsistent state in the middle, since there are
>+    // function call nodes with no corresponding definition nodes. This needs special handling in
>+    // TIntermLValueTrackingTraverser, and creates intricacies that are not easily apparent from a
>+    // superficial reading of the code.
>+    traverser.insertHelperDefinitions(root);
>+}
>+
>+}  // namespace sh
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/RemoveDynamicIndexing.h b/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/RemoveDynamicIndexing.h
>new file mode 100644
>index 00000000000..500c88ed122
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/RemoveDynamicIndexing.h
>@@ -0,0 +1,28 @@
>+//
>+// Copyright (c) 2002-2015 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// RemoveDynamicIndexing is an AST traverser to remove dynamic indexing of non-SSBO vectors and
>+// matrices, replacing them with calls to functions that choose which component to return or write.
>+// We don't need to consider dynamic indexing in SSBO since it can be directly as part of the offset
>+// of RWByteAddressBuffer.
>+//
>+
>+#ifndef COMPILER_TRANSLATOR_TREEOPS_REMOVEDYNAMICINDEXING_H_
>+#define COMPILER_TRANSLATOR_TREEOPS_REMOVEDYNAMICINDEXING_H_
>+
>+namespace sh
>+{
>+
>+class TIntermNode;
>+class TSymbolTable;
>+class PerformanceDiagnostics;
>+
>+void RemoveDynamicIndexing(TIntermNode *root,
>+                           TSymbolTable *symbolTable,
>+                           PerformanceDiagnostics *perfDiagnostics);
>+
>+}  // namespace sh
>+
>+#endif  // COMPILER_TRANSLATOR_TREEOPS_REMOVEDYNAMICINDEXING_H_
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/RemoveInvariantDeclaration.cpp b/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/RemoveInvariantDeclaration.cpp
>new file mode 100644
>index 00000000000..e40fe959299
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/RemoveInvariantDeclaration.cpp
>@@ -0,0 +1,43 @@
>+//
>+// Copyright (c) 2016 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+
>+#include "compiler/translator/tree_ops/RemoveInvariantDeclaration.h"
>+
>+#include "compiler/translator/tree_util/IntermTraverse.h"
>+
>+namespace sh
>+{
>+
>+namespace
>+{
>+
>+// An AST traverser that removes invariant declaration for input in fragment shader
>+// when GLSL >= 4.20 and for output in vertex shader when GLSL < 4.2.
>+class RemoveInvariantDeclarationTraverser : public TIntermTraverser
>+{
>+  public:
>+    RemoveInvariantDeclarationTraverser() : TIntermTraverser(true, false, false) {}
>+
>+  private:
>+    bool visitInvariantDeclaration(Visit visit, TIntermInvariantDeclaration *node) override
>+    {
>+        TIntermSequence emptyReplacement;
>+        mMultiReplacements.push_back(
>+            NodeReplaceWithMultipleEntry(getParentNode()->getAsBlock(), node, emptyReplacement));
>+        return false;
>+    }
>+};
>+
>+}  // anonymous namespace
>+
>+void RemoveInvariantDeclaration(TIntermNode *root)
>+{
>+    RemoveInvariantDeclarationTraverser traverser;
>+    root->traverse(&traverser);
>+    traverser.updateTree();
>+}
>+
>+}  // namespace sh
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/RemoveInvariantDeclaration.h b/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/RemoveInvariantDeclaration.h
>new file mode 100644
>index 00000000000..3281014ad07
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/RemoveInvariantDeclaration.h
>@@ -0,0 +1,18 @@
>+//
>+// Copyright (c) 2016 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+
>+#ifndef COMPILER_TRANSLATOR_TREEOPS_REMOVEINVARIANTDECLARATION_H_
>+#define COMPILER_TRANSLATOR_TREEOPS_REMOVEINVARIANTDECLARATION_H_
>+
>+class TIntermNode;
>+namespace sh
>+{
>+
>+void RemoveInvariantDeclaration(TIntermNode *root);
>+
>+}  // namespace sh
>+
>+#endif  // COMPILER_TRANSLATOR_TREEOPS_REMOVEINVARIANTDECLARATION_H_
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/RemovePow.cpp b/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/RemovePow.cpp
>new file mode 100644
>index 00000000000..c270ff0f4ac
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/RemovePow.cpp
>@@ -0,0 +1,101 @@
>+//
>+// Copyright (c) 2002-2015 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// RemovePow is an AST traverser to convert pow(x, y) built-in calls where y is a
>+// constant to exp2(y * log2(x)). This works around an issue in NVIDIA 311 series
>+// OpenGL drivers.
>+//
>+
>+#include "compiler/translator/tree_ops/RemovePow.h"
>+
>+#include "compiler/translator/InfoSink.h"
>+#include "compiler/translator/tree_util/IntermNode_util.h"
>+#include "compiler/translator/tree_util/IntermTraverse.h"
>+
>+namespace sh
>+{
>+
>+namespace
>+{
>+
>+bool IsProblematicPow(TIntermTyped *node)
>+{
>+    TIntermAggregate *agg = node->getAsAggregate();
>+    if (agg != nullptr && agg->getOp() == EOpPow)
>+    {
>+        ASSERT(agg->getSequence()->size() == 2);
>+        return agg->getSequence()->at(1)->getAsConstantUnion() != nullptr;
>+    }
>+    return false;
>+}
>+
>+// Traverser that converts all pow operations simultaneously.
>+class RemovePowTraverser : public TIntermTraverser
>+{
>+  public:
>+    RemovePowTraverser(TSymbolTable *symbolTable);
>+
>+    bool visitAggregate(Visit visit, TIntermAggregate *node) override;
>+
>+    void nextIteration() { mNeedAnotherIteration = false; }
>+    bool needAnotherIteration() const { return mNeedAnotherIteration; }
>+
>+  protected:
>+    bool mNeedAnotherIteration;
>+};
>+
>+RemovePowTraverser::RemovePowTraverser(TSymbolTable *symbolTable)
>+    : TIntermTraverser(true, false, false, symbolTable), mNeedAnotherIteration(false)
>+{}
>+
>+bool RemovePowTraverser::visitAggregate(Visit visit, TIntermAggregate *node)
>+{
>+    if (IsProblematicPow(node))
>+    {
>+        TIntermTyped *x = node->getSequence()->at(0)->getAsTyped();
>+        TIntermTyped *y = node->getSequence()->at(1)->getAsTyped();
>+
>+        TIntermSequence *logArgs = new TIntermSequence();
>+        logArgs->push_back(x);
>+        TIntermTyped *log = CreateBuiltInFunctionCallNode("log2", logArgs, *mSymbolTable, 100);
>+        log->setLine(node->getLine());
>+
>+        TOperator op       = TIntermBinary::GetMulOpBasedOnOperands(y->getType(), log->getType());
>+        TIntermBinary *mul = new TIntermBinary(op, y, log);
>+        mul->setLine(node->getLine());
>+
>+        TIntermSequence *expArgs = new TIntermSequence();
>+        expArgs->push_back(mul);
>+        TIntermTyped *exp = CreateBuiltInFunctionCallNode("exp2", expArgs, *mSymbolTable, 100);
>+        exp->setLine(node->getLine());
>+
>+        queueReplacement(exp, OriginalNode::IS_DROPPED);
>+
>+        // If the x parameter also needs to be replaced, we need to do that in another traversal,
>+        // since it's parent node will change in a way that's not handled correctly by updateTree().
>+        if (IsProblematicPow(x))
>+        {
>+            mNeedAnotherIteration = true;
>+            return false;
>+        }
>+    }
>+    return true;
>+}
>+
>+}  // namespace
>+
>+void RemovePow(TIntermNode *root, TSymbolTable *symbolTable)
>+{
>+    RemovePowTraverser traverser(symbolTable);
>+    // Iterate as necessary, and reset the traverser between iterations.
>+    do
>+    {
>+        traverser.nextIteration();
>+        root->traverse(&traverser);
>+        traverser.updateTree();
>+    } while (traverser.needAnotherIteration());
>+}
>+
>+}  // namespace sh
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/RemovePow.h b/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/RemovePow.h
>new file mode 100644
>index 00000000000..bb0e990656c
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/RemovePow.h
>@@ -0,0 +1,22 @@
>+//
>+// Copyright (c) 2002-2015 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// RemovePow is an AST traverser to convert pow(x, y) built-in calls where y is a
>+// constant to exp2(y * log2(x)). This works around an issue in NVIDIA 311 series
>+// OpenGL drivers.
>+//
>+
>+#ifndef COMPILER_TRANSLATOR_TREEOPS_REMOVEPOW_H_
>+#define COMPILER_TRANSLATOR_TREEOPS_REMOVEPOW_H_
>+
>+namespace sh
>+{
>+class TIntermNode;
>+class TSymbolTable;
>+
>+void RemovePow(TIntermNode *root, TSymbolTable *symbolTable);
>+}  // namespace sh
>+
>+#endif  // COMPILER_TRANSLATOR_TREEOPS_REMOVEPOW_H_
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/RemoveSwitchFallThrough.cpp b/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/RemoveSwitchFallThrough.cpp
>new file mode 100644
>index 00000000000..9af46770f86
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/RemoveSwitchFallThrough.cpp
>@@ -0,0 +1,270 @@
>+//
>+// Copyright (c) 2002-2015 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// RemoveSwitchFallThrough.cpp: Remove fall-through from switch statements.
>+// Note that it is unsafe to do further AST transformations on the AST generated
>+// by this function. It leaves duplicate nodes in the AST making replacements
>+// unreliable.
>+
>+#include "compiler/translator/tree_ops/RemoveSwitchFallThrough.h"
>+
>+#include "compiler/translator/Diagnostics.h"
>+#include "compiler/translator/tree_util/IntermTraverse.h"
>+
>+namespace sh
>+{
>+
>+namespace
>+{
>+
>+class RemoveSwitchFallThroughTraverser : public TIntermTraverser
>+{
>+  public:
>+    static TIntermBlock *removeFallThrough(TIntermBlock *statementList,
>+                                           PerformanceDiagnostics *perfDiagnostics);
>+
>+  private:
>+    RemoveSwitchFallThroughTraverser(TIntermBlock *statementList,
>+                                     PerformanceDiagnostics *perfDiagnostics);
>+
>+    void visitSymbol(TIntermSymbol *node) override;
>+    void visitConstantUnion(TIntermConstantUnion *node) override;
>+    bool visitDeclaration(Visit, TIntermDeclaration *node) override;
>+    bool visitBinary(Visit, TIntermBinary *node) override;
>+    bool visitUnary(Visit, TIntermUnary *node) override;
>+    bool visitTernary(Visit visit, TIntermTernary *node) override;
>+    bool visitSwizzle(Visit, TIntermSwizzle *node) override;
>+    bool visitIfElse(Visit visit, TIntermIfElse *node) override;
>+    bool visitSwitch(Visit, TIntermSwitch *node) override;
>+    bool visitCase(Visit, TIntermCase *node) override;
>+    bool visitAggregate(Visit, TIntermAggregate *node) override;
>+    bool visitBlock(Visit, TIntermBlock *node) override;
>+    bool visitLoop(Visit, TIntermLoop *node) override;
>+    bool visitBranch(Visit, TIntermBranch *node) override;
>+
>+    void outputSequence(TIntermSequence *sequence, size_t startIndex);
>+    void handlePreviousCase();
>+
>+    TIntermBlock *mStatementList;
>+    TIntermBlock *mStatementListOut;
>+    bool mLastStatementWasBreak;
>+    TIntermBlock *mPreviousCase;
>+    std::vector<TIntermBlock *> mCasesSharingBreak;
>+    PerformanceDiagnostics *mPerfDiagnostics;
>+};
>+
>+TIntermBlock *RemoveSwitchFallThroughTraverser::removeFallThrough(
>+    TIntermBlock *statementList,
>+    PerformanceDiagnostics *perfDiagnostics)
>+{
>+    RemoveSwitchFallThroughTraverser rm(statementList, perfDiagnostics);
>+    ASSERT(statementList);
>+    statementList->traverse(&rm);
>+    ASSERT(rm.mPreviousCase || statementList->getSequence()->empty());
>+    if (!rm.mLastStatementWasBreak && rm.mPreviousCase)
>+    {
>+        // Make sure that there's a branch at the end of the final case inside the switch statement.
>+        // This also ensures that any cases that fall through to the final case will get the break.
>+        TIntermBranch *finalBreak = new TIntermBranch(EOpBreak, nullptr);
>+        rm.mPreviousCase->getSequence()->push_back(finalBreak);
>+        rm.mLastStatementWasBreak = true;
>+    }
>+    rm.handlePreviousCase();
>+    return rm.mStatementListOut;
>+}
>+
>+RemoveSwitchFallThroughTraverser::RemoveSwitchFallThroughTraverser(
>+    TIntermBlock *statementList,
>+    PerformanceDiagnostics *perfDiagnostics)
>+    : TIntermTraverser(true, false, false),
>+      mStatementList(statementList),
>+      mLastStatementWasBreak(false),
>+      mPreviousCase(nullptr),
>+      mPerfDiagnostics(perfDiagnostics)
>+{
>+    mStatementListOut = new TIntermBlock();
>+}
>+
>+void RemoveSwitchFallThroughTraverser::visitSymbol(TIntermSymbol *node)
>+{
>+    // Note that this assumes that switch statements which don't begin by a case statement
>+    // have already been weeded out in validation.
>+    mPreviousCase->getSequence()->push_back(node);
>+    mLastStatementWasBreak = false;
>+}
>+
>+void RemoveSwitchFallThroughTraverser::visitConstantUnion(TIntermConstantUnion *node)
>+{
>+    // Conditions of case labels are not traversed, so this is a constant statement like "0;".
>+    // These are no-ops so there's no need to add them back to the statement list. Should have
>+    // already been pruned out of the AST, in fact.
>+    UNREACHABLE();
>+}
>+
>+bool RemoveSwitchFallThroughTraverser::visitDeclaration(Visit, TIntermDeclaration *node)
>+{
>+    mPreviousCase->getSequence()->push_back(node);
>+    mLastStatementWasBreak = false;
>+    return false;
>+}
>+
>+bool RemoveSwitchFallThroughTraverser::visitBinary(Visit, TIntermBinary *node)
>+{
>+    mPreviousCase->getSequence()->push_back(node);
>+    mLastStatementWasBreak = false;
>+    return false;
>+}
>+
>+bool RemoveSwitchFallThroughTraverser::visitUnary(Visit, TIntermUnary *node)
>+{
>+    mPreviousCase->getSequence()->push_back(node);
>+    mLastStatementWasBreak = false;
>+    return false;
>+}
>+
>+bool RemoveSwitchFallThroughTraverser::visitTernary(Visit, TIntermTernary *node)
>+{
>+    mPreviousCase->getSequence()->push_back(node);
>+    mLastStatementWasBreak = false;
>+    return false;
>+}
>+
>+bool RemoveSwitchFallThroughTraverser::visitSwizzle(Visit, TIntermSwizzle *node)
>+{
>+    mPreviousCase->getSequence()->push_back(node);
>+    mLastStatementWasBreak = false;
>+    return false;
>+}
>+
>+bool RemoveSwitchFallThroughTraverser::visitIfElse(Visit, TIntermIfElse *node)
>+{
>+    mPreviousCase->getSequence()->push_back(node);
>+    mLastStatementWasBreak = false;
>+    return false;
>+}
>+
>+bool RemoveSwitchFallThroughTraverser::visitSwitch(Visit, TIntermSwitch *node)
>+{
>+    mPreviousCase->getSequence()->push_back(node);
>+    mLastStatementWasBreak = false;
>+    // Don't go into nested switch statements
>+    return false;
>+}
>+
>+void RemoveSwitchFallThroughTraverser::outputSequence(TIntermSequence *sequence, size_t startIndex)
>+{
>+    for (size_t i = startIndex; i < sequence->size(); ++i)
>+    {
>+        mStatementListOut->getSequence()->push_back(sequence->at(i));
>+    }
>+}
>+
>+void RemoveSwitchFallThroughTraverser::handlePreviousCase()
>+{
>+    if (mPreviousCase)
>+        mCasesSharingBreak.push_back(mPreviousCase);
>+    if (mLastStatementWasBreak)
>+    {
>+        for (size_t i = 0; i < mCasesSharingBreak.size(); ++i)
>+        {
>+            ASSERT(!mCasesSharingBreak.at(i)->getSequence()->empty());
>+            if (mCasesSharingBreak.at(i)->getSequence()->size() == 1)
>+            {
>+                // Fall-through is allowed in case the label has no statements.
>+                outputSequence(mCasesSharingBreak.at(i)->getSequence(), 0);
>+            }
>+            else
>+            {
>+                // Include all the statements that this case can fall through under the same label.
>+                if (mCasesSharingBreak.size() > i + 1u)
>+                {
>+                    mPerfDiagnostics->warning(mCasesSharingBreak.at(i)->getLine(),
>+                                              "Performance: non-empty fall-through cases in "
>+                                              "switch statements generate extra code.",
>+                                              "switch");
>+                }
>+                for (size_t j = i; j < mCasesSharingBreak.size(); ++j)
>+                {
>+                    size_t startIndex =
>+                        j > i ? 1 : 0;  // Add the label only from the first sequence.
>+                    outputSequence(mCasesSharingBreak.at(j)->getSequence(), startIndex);
>+                }
>+            }
>+        }
>+        mCasesSharingBreak.clear();
>+    }
>+    mLastStatementWasBreak = false;
>+    mPreviousCase          = nullptr;
>+}
>+
>+bool RemoveSwitchFallThroughTraverser::visitCase(Visit, TIntermCase *node)
>+{
>+    handlePreviousCase();
>+    mPreviousCase = new TIntermBlock();
>+    mPreviousCase->getSequence()->push_back(node);
>+    mPreviousCase->setLine(node->getLine());
>+    // Don't traverse the condition of the case statement
>+    return false;
>+}
>+
>+bool RemoveSwitchFallThroughTraverser::visitAggregate(Visit, TIntermAggregate *node)
>+{
>+    mPreviousCase->getSequence()->push_back(node);
>+    mLastStatementWasBreak = false;
>+    return false;
>+}
>+
>+bool DoesBlockAlwaysBreak(TIntermBlock *node)
>+{
>+    if (node->getSequence()->empty())
>+    {
>+        return false;
>+    }
>+
>+    TIntermBlock *lastStatementAsBlock = node->getSequence()->back()->getAsBlock();
>+    if (lastStatementAsBlock)
>+    {
>+        return DoesBlockAlwaysBreak(lastStatementAsBlock);
>+    }
>+
>+    TIntermBranch *lastStatementAsBranch = node->getSequence()->back()->getAsBranchNode();
>+    return lastStatementAsBranch != nullptr;
>+}
>+
>+bool RemoveSwitchFallThroughTraverser::visitBlock(Visit, TIntermBlock *node)
>+{
>+    if (node != mStatementList)
>+    {
>+        mPreviousCase->getSequence()->push_back(node);
>+        mLastStatementWasBreak = DoesBlockAlwaysBreak(node);
>+        return false;
>+    }
>+    return true;
>+}
>+
>+bool RemoveSwitchFallThroughTraverser::visitLoop(Visit, TIntermLoop *node)
>+{
>+    mPreviousCase->getSequence()->push_back(node);
>+    mLastStatementWasBreak = false;
>+    return false;
>+}
>+
>+bool RemoveSwitchFallThroughTraverser::visitBranch(Visit, TIntermBranch *node)
>+{
>+    mPreviousCase->getSequence()->push_back(node);
>+    // TODO: Verify that accepting return or continue statements here doesn't cause problems.
>+    mLastStatementWasBreak = true;
>+    return false;
>+}
>+
>+}  // anonymous namespace
>+
>+TIntermBlock *RemoveSwitchFallThrough(TIntermBlock *statementList,
>+                                      PerformanceDiagnostics *perfDiagnostics)
>+{
>+    return RemoveSwitchFallThroughTraverser::removeFallThrough(statementList, perfDiagnostics);
>+}
>+
>+}  // namespace sh
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/RemoveSwitchFallThrough.h b/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/RemoveSwitchFallThrough.h
>new file mode 100644
>index 00000000000..58cad0c8567
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/RemoveSwitchFallThrough.h
>@@ -0,0 +1,27 @@
>+//
>+// Copyright (c) 2002-2015 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// RemoveSwitchFallThrough.h: Remove fall-through from switch statements.
>+// Note that it is unsafe to do further AST transformations on the AST generated
>+// by this function. It leaves duplicate nodes in the AST making replacements
>+// unreliable.
>+
>+#ifndef COMPILER_TRANSLATOR_TREEOPS_REMOVESWITCHFALLTHROUGH_H_
>+#define COMPILER_TRANSLATOR_TREEOPS_REMOVESWITCHFALLTHROUGH_H_
>+
>+namespace sh
>+{
>+
>+class TIntermBlock;
>+class PerformanceDiagnostics;
>+
>+// When given a statementList from a switch AST node, return an updated
>+// statementList that has fall-through removed.
>+TIntermBlock *RemoveSwitchFallThrough(TIntermBlock *statementList,
>+                                      PerformanceDiagnostics *perfDiagnostics);
>+
>+}  // namespace sh
>+
>+#endif  // COMPILER_TRANSLATOR_TREEOPS_REMOVESWITCHFALLTHROUGH_H_
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/RemoveUnreferencedVariables.cpp b/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/RemoveUnreferencedVariables.cpp
>new file mode 100644
>index 00000000000..28471a309d5
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/RemoveUnreferencedVariables.cpp
>@@ -0,0 +1,371 @@
>+//
>+// Copyright (c) 2017 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// RemoveUnreferencedVariables.cpp:
>+//  Drop variables that are declared but never referenced in the AST. This avoids adding unnecessary
>+//  initialization code for them. Also removes unreferenced struct types.
>+//
>+
>+#include "compiler/translator/tree_ops/RemoveUnreferencedVariables.h"
>+
>+#include "compiler/translator/SymbolTable.h"
>+#include "compiler/translator/tree_util/IntermTraverse.h"
>+
>+namespace sh
>+{
>+
>+namespace
>+{
>+
>+class CollectVariableRefCountsTraverser : public TIntermTraverser
>+{
>+  public:
>+    CollectVariableRefCountsTraverser();
>+
>+    using RefCountMap = std::unordered_map<int, unsigned int>;
>+    RefCountMap &getSymbolIdRefCounts() { return mSymbolIdRefCounts; }
>+    RefCountMap &getStructIdRefCounts() { return mStructIdRefCounts; }
>+
>+    void visitSymbol(TIntermSymbol *node) override;
>+    bool visitAggregate(Visit visit, TIntermAggregate *node) override;
>+    void visitFunctionPrototype(TIntermFunctionPrototype *node) override;
>+
>+  private:
>+    void incrementStructTypeRefCount(const TType &type);
>+
>+    RefCountMap mSymbolIdRefCounts;
>+
>+    // Structure reference counts are counted from symbols, constructors, function calls, function
>+    // return values and from interface block and structure fields. We need to track both function
>+    // calls and function return values since there's a compiler option not to prune unused
>+    // functions. The type of a constant union may also be a struct, but statements that are just a
>+    // constant union are always pruned, and if the constant union is used somehow it will get
>+    // counted by something else.
>+    RefCountMap mStructIdRefCounts;
>+};
>+
>+CollectVariableRefCountsTraverser::CollectVariableRefCountsTraverser()
>+    : TIntermTraverser(true, false, false)
>+{}
>+
>+void CollectVariableRefCountsTraverser::incrementStructTypeRefCount(const TType &type)
>+{
>+    if (type.isInterfaceBlock())
>+    {
>+        const auto *block = type.getInterfaceBlock();
>+        ASSERT(block);
>+
>+        // We can end up incrementing ref counts of struct types referenced from an interface block
>+        // multiple times for the same block. This doesn't matter, because interface blocks can't be
>+        // pruned so we'll never do the reverse operation.
>+        for (const auto &field : block->fields())
>+        {
>+            ASSERT(!field->type()->isInterfaceBlock());
>+            incrementStructTypeRefCount(*field->type());
>+        }
>+        return;
>+    }
>+
>+    const auto *structure = type.getStruct();
>+    if (structure != nullptr)
>+    {
>+        auto structIter = mStructIdRefCounts.find(structure->uniqueId().get());
>+        if (structIter == mStructIdRefCounts.end())
>+        {
>+            mStructIdRefCounts[structure->uniqueId().get()] = 1u;
>+
>+            for (const auto &field : structure->fields())
>+            {
>+                incrementStructTypeRefCount(*field->type());
>+            }
>+
>+            return;
>+        }
>+        ++(structIter->second);
>+    }
>+}
>+
>+void CollectVariableRefCountsTraverser::visitSymbol(TIntermSymbol *node)
>+{
>+    incrementStructTypeRefCount(node->getType());
>+
>+    auto iter = mSymbolIdRefCounts.find(node->uniqueId().get());
>+    if (iter == mSymbolIdRefCounts.end())
>+    {
>+        mSymbolIdRefCounts[node->uniqueId().get()] = 1u;
>+        return;
>+    }
>+    ++(iter->second);
>+}
>+
>+bool CollectVariableRefCountsTraverser::visitAggregate(Visit visit, TIntermAggregate *node)
>+{
>+    // This tracks struct references in both function calls and constructors.
>+    incrementStructTypeRefCount(node->getType());
>+    return true;
>+}
>+
>+void CollectVariableRefCountsTraverser::visitFunctionPrototype(TIntermFunctionPrototype *node)
>+{
>+    incrementStructTypeRefCount(node->getType());
>+    size_t paramCount = node->getFunction()->getParamCount();
>+    for (size_t i = 0; i < paramCount; ++i)
>+    {
>+        incrementStructTypeRefCount(node->getFunction()->getParam(i)->getType());
>+    }
>+}
>+
>+// Traverser that removes all unreferenced variables on one traversal.
>+class RemoveUnreferencedVariablesTraverser : public TIntermTraverser
>+{
>+  public:
>+    RemoveUnreferencedVariablesTraverser(
>+        CollectVariableRefCountsTraverser::RefCountMap *symbolIdRefCounts,
>+        CollectVariableRefCountsTraverser::RefCountMap *structIdRefCounts,
>+        TSymbolTable *symbolTable);
>+
>+    bool visitDeclaration(Visit visit, TIntermDeclaration *node) override;
>+    void visitSymbol(TIntermSymbol *node) override;
>+    bool visitAggregate(Visit visit, TIntermAggregate *node) override;
>+
>+    // Traverse loop and block nodes in reverse order. Note that this traverser does not track
>+    // parent block positions, so insertStatementInParentBlock is unusable!
>+    void traverseBlock(TIntermBlock *block) override;
>+    void traverseLoop(TIntermLoop *loop) override;
>+
>+  private:
>+    void removeVariableDeclaration(TIntermDeclaration *node, TIntermTyped *declarator);
>+    void decrementStructTypeRefCount(const TType &type);
>+
>+    CollectVariableRefCountsTraverser::RefCountMap *mSymbolIdRefCounts;
>+    CollectVariableRefCountsTraverser::RefCountMap *mStructIdRefCounts;
>+    bool mRemoveReferences;
>+};
>+
>+RemoveUnreferencedVariablesTraverser::RemoveUnreferencedVariablesTraverser(
>+    CollectVariableRefCountsTraverser::RefCountMap *symbolIdRefCounts,
>+    CollectVariableRefCountsTraverser::RefCountMap *structIdRefCounts,
>+    TSymbolTable *symbolTable)
>+    : TIntermTraverser(true, false, true, symbolTable),
>+      mSymbolIdRefCounts(symbolIdRefCounts),
>+      mStructIdRefCounts(structIdRefCounts),
>+      mRemoveReferences(false)
>+{}
>+
>+void RemoveUnreferencedVariablesTraverser::decrementStructTypeRefCount(const TType &type)
>+{
>+    auto *structure = type.getStruct();
>+    if (structure != nullptr)
>+    {
>+        ASSERT(mStructIdRefCounts->find(structure->uniqueId().get()) != mStructIdRefCounts->end());
>+        unsigned int structRefCount = --(*mStructIdRefCounts)[structure->uniqueId().get()];
>+
>+        if (structRefCount == 0)
>+        {
>+            for (const auto &field : structure->fields())
>+            {
>+                decrementStructTypeRefCount(*field->type());
>+            }
>+        }
>+    }
>+}
>+
>+void RemoveUnreferencedVariablesTraverser::removeVariableDeclaration(TIntermDeclaration *node,
>+                                                                     TIntermTyped *declarator)
>+{
>+    if (declarator->getType().isStructSpecifier() && !declarator->getType().isNamelessStruct())
>+    {
>+        unsigned int structId = declarator->getType().getStruct()->uniqueId().get();
>+        unsigned int structRefCountInThisDeclarator = 1u;
>+        if (declarator->getAsBinaryNode() &&
>+            declarator->getAsBinaryNode()->getRight()->getAsAggregate())
>+        {
>+            ASSERT(declarator->getAsBinaryNode()->getLeft()->getType().getStruct() ==
>+                   declarator->getType().getStruct());
>+            ASSERT(declarator->getAsBinaryNode()->getRight()->getType().getStruct() ==
>+                   declarator->getType().getStruct());
>+            structRefCountInThisDeclarator = 2u;
>+        }
>+        if ((*mStructIdRefCounts)[structId] > structRefCountInThisDeclarator)
>+        {
>+            // If this declaration declares a named struct type that is used elsewhere, we need to
>+            // keep it. We can still change the declarator though so that it doesn't declare an
>+            // unreferenced variable.
>+
>+            // Note that since we're not removing the entire declaration, the struct's reference
>+            // count will end up being one less than the correct refcount. But since the struct
>+            // declaration is kept, the incorrect refcount can't cause any other problems.
>+
>+            if (declarator->getAsSymbolNode() &&
>+                declarator->getAsSymbolNode()->variable().symbolType() == SymbolType::Empty)
>+            {
>+                // Already an empty declaration - nothing to do.
>+                return;
>+            }
>+            TVariable *emptyVariable =
>+                new TVariable(mSymbolTable, kEmptyImmutableString, new TType(declarator->getType()),
>+                              SymbolType::Empty);
>+            queueReplacementWithParent(node, declarator, new TIntermSymbol(emptyVariable),
>+                                       OriginalNode::IS_DROPPED);
>+            return;
>+        }
>+    }
>+
>+    if (getParentNode()->getAsBlock())
>+    {
>+        TIntermSequence emptyReplacement;
>+        mMultiReplacements.push_back(
>+            NodeReplaceWithMultipleEntry(getParentNode()->getAsBlock(), node, emptyReplacement));
>+    }
>+    else
>+    {
>+        ASSERT(getParentNode()->getAsLoopNode());
>+        queueReplacement(nullptr, OriginalNode::IS_DROPPED);
>+    }
>+}
>+
>+bool RemoveUnreferencedVariablesTraverser::visitDeclaration(Visit visit, TIntermDeclaration *node)
>+{
>+    if (visit == PreVisit)
>+    {
>+        // SeparateDeclarations should have already been run.
>+        ASSERT(node->getSequence()->size() == 1u);
>+
>+        TIntermTyped *declarator = node->getSequence()->back()->getAsTyped();
>+        ASSERT(declarator);
>+
>+        // We can only remove variables that are not a part of the shader interface.
>+        TQualifier qualifier = declarator->getQualifier();
>+        if (qualifier != EvqTemporary && qualifier != EvqGlobal && qualifier != EvqConst)
>+        {
>+            return true;
>+        }
>+
>+        bool canRemoveVariable    = false;
>+        TIntermSymbol *symbolNode = declarator->getAsSymbolNode();
>+        if (symbolNode != nullptr)
>+        {
>+            canRemoveVariable = (*mSymbolIdRefCounts)[symbolNode->uniqueId().get()] == 1u ||
>+                                symbolNode->variable().symbolType() == SymbolType::Empty;
>+        }
>+        TIntermBinary *initNode = declarator->getAsBinaryNode();
>+        if (initNode != nullptr)
>+        {
>+            ASSERT(initNode->getLeft()->getAsSymbolNode());
>+            int symbolId = initNode->getLeft()->getAsSymbolNode()->uniqueId().get();
>+            canRemoveVariable =
>+                (*mSymbolIdRefCounts)[symbolId] == 1u && !initNode->getRight()->hasSideEffects();
>+        }
>+
>+        if (canRemoveVariable)
>+        {
>+            removeVariableDeclaration(node, declarator);
>+            mRemoveReferences = true;
>+        }
>+        return true;
>+    }
>+    ASSERT(visit == PostVisit);
>+    mRemoveReferences = false;
>+    return true;
>+}
>+
>+void RemoveUnreferencedVariablesTraverser::visitSymbol(TIntermSymbol *node)
>+{
>+    if (mRemoveReferences)
>+    {
>+        ASSERT(mSymbolIdRefCounts->find(node->uniqueId().get()) != mSymbolIdRefCounts->end());
>+        --(*mSymbolIdRefCounts)[node->uniqueId().get()];
>+
>+        decrementStructTypeRefCount(node->getType());
>+    }
>+}
>+
>+bool RemoveUnreferencedVariablesTraverser::visitAggregate(Visit visit, TIntermAggregate *node)
>+{
>+    if (visit == PreVisit && mRemoveReferences)
>+    {
>+        decrementStructTypeRefCount(node->getType());
>+    }
>+    return true;
>+}
>+
>+void RemoveUnreferencedVariablesTraverser::traverseBlock(TIntermBlock *node)
>+{
>+    // We traverse blocks in reverse order.  This way reference counts can be decremented when
>+    // removing initializers, and variables that become unused when initializers are removed can be
>+    // removed on the same traversal.
>+
>+    ScopedNodeInTraversalPath addToPath(this, node);
>+
>+    bool visit = true;
>+
>+    TIntermSequence *sequence = node->getSequence();
>+
>+    if (preVisit)
>+        visit = visitBlock(PreVisit, node);
>+
>+    if (visit)
>+    {
>+        for (auto iter = sequence->rbegin(); iter != sequence->rend(); ++iter)
>+        {
>+            (*iter)->traverse(this);
>+            if (visit && inVisit)
>+            {
>+                if ((iter + 1) != sequence->rend())
>+                    visit = visitBlock(InVisit, node);
>+            }
>+        }
>+    }
>+
>+    if (visit && postVisit)
>+        visitBlock(PostVisit, node);
>+}
>+
>+void RemoveUnreferencedVariablesTraverser::traverseLoop(TIntermLoop *node)
>+{
>+    // We traverse loops in reverse order as well. The loop body gets traversed before the init
>+    // node.
>+
>+    ScopedNodeInTraversalPath addToPath(this, node);
>+
>+    bool visit = true;
>+
>+    if (preVisit)
>+        visit = visitLoop(PreVisit, node);
>+
>+    if (visit)
>+    {
>+        // We don't need to traverse loop expressions or conditions since they can't be declarations
>+        // in the AST (loops which have a declaration in their condition get transformed in the
>+        // parsing stage).
>+        ASSERT(node->getExpression() == nullptr ||
>+               node->getExpression()->getAsDeclarationNode() == nullptr);
>+        ASSERT(node->getCondition() == nullptr ||
>+               node->getCondition()->getAsDeclarationNode() == nullptr);
>+
>+        if (node->getBody())
>+            node->getBody()->traverse(this);
>+
>+        if (node->getInit())
>+            node->getInit()->traverse(this);
>+    }
>+
>+    if (visit && postVisit)
>+        visitLoop(PostVisit, node);
>+}
>+
>+}  // namespace
>+
>+void RemoveUnreferencedVariables(TIntermBlock *root, TSymbolTable *symbolTable)
>+{
>+    CollectVariableRefCountsTraverser collector;
>+    root->traverse(&collector);
>+    RemoveUnreferencedVariablesTraverser traverser(&collector.getSymbolIdRefCounts(),
>+                                                   &collector.getStructIdRefCounts(), symbolTable);
>+    root->traverse(&traverser);
>+    traverser.updateTree();
>+}
>+
>+}  // namespace sh
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/RemoveUnreferencedVariables.h b/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/RemoveUnreferencedVariables.h
>new file mode 100644
>index 00000000000..6888b2f2a0b
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/RemoveUnreferencedVariables.h
>@@ -0,0 +1,24 @@
>+//
>+// Copyright (c) 2017 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// RemoveUnreferencedVariables.h:
>+//  Drop variables that are declared but never referenced in the AST. This avoids adding unnecessary
>+//  initialization code for them. Also removes unreferenced struct types.
>+//
>+
>+#ifndef COMPILER_TRANSLATOR_TREEOPS_REMOVEUNREFERENCEDVARIABLES_H_
>+#define COMPILER_TRANSLATOR_TREEOPS_REMOVEUNREFERENCEDVARIABLES_H_
>+
>+namespace sh
>+{
>+
>+class TIntermBlock;
>+class TSymbolTable;
>+
>+void RemoveUnreferencedVariables(TIntermBlock *root, TSymbolTable *symbolTable);
>+
>+}  // namespace sh
>+
>+#endif  // COMPILER_TRANSLATOR_TREEOPS_REMOVEUNREFERENCEDVARIABLES_H_
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/RewriteAtomicFunctionExpressions.cpp b/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/RewriteAtomicFunctionExpressions.cpp
>new file mode 100644
>index 00000000000..f47e790b0ae
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/RewriteAtomicFunctionExpressions.cpp
>@@ -0,0 +1,182 @@
>+//
>+// Copyright (c) 2018 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// Implementation of the function RewriteAtomicFunctionExpressions.
>+// See the header for more details.
>+
>+#include "RewriteAtomicFunctionExpressions.h"
>+
>+#include "compiler/translator/tree_util/IntermNodePatternMatcher.h"
>+#include "compiler/translator/tree_util/IntermNode_util.h"
>+#include "compiler/translator/tree_util/IntermTraverse.h"
>+#include "compiler/translator/util.h"
>+
>+namespace sh
>+{
>+namespace
>+{
>+// Traverser that simplifies all the atomic function expressions into the ones that can be directly
>+// translated into HLSL.
>+//
>+// case 1 (only for atomicExchange and atomicCompSwap):
>+//  original:
>+//      atomicExchange(counter, newValue);
>+//  new:
>+//      tempValue = atomicExchange(counter, newValue);
>+//
>+// case 2 (atomic function, temporary variable required):
>+//  original:
>+//      value = atomicAdd(counter, 1) * otherValue;
>+//      someArray[atomicAdd(counter, 1)] = someOtherValue;
>+//  new:
>+//      value = ((tempValue = atomicAdd(counter, 1)), tempValue) * otherValue;
>+//      someArray[((tempValue = atomicAdd(counter, 1)), tempValue)] = someOtherValue;
>+//
>+// case 3 (atomic function used directly initialize a variable):
>+//  original:
>+//      int value = atomicAdd(counter, 1);
>+//  new:
>+//      tempValue = atomicAdd(counter, 1);
>+//      int value = tempValue;
>+//
>+class RewriteAtomicFunctionExpressionsTraverser : public TIntermTraverser
>+{
>+  public:
>+    RewriteAtomicFunctionExpressionsTraverser(TSymbolTable *symbolTable, int shaderVersion);
>+
>+    bool visitAggregate(Visit visit, TIntermAggregate *node) override;
>+    bool visitBlock(Visit visit, TIntermBlock *node) override;
>+
>+  private:
>+    static bool IsAtomicExchangeOrCompSwapNoReturnValue(TIntermAggregate *node,
>+                                                        TIntermNode *parentNode);
>+    static bool IsAtomicFunctionInsideExpression(TIntermAggregate *node, TIntermNode *parentNode);
>+
>+    void rewriteAtomicFunctionCallNode(TIntermAggregate *oldAtomicFunctionNode);
>+
>+    const TVariable *getTempVariable(const TType *type);
>+
>+    int mShaderVersion;
>+    TIntermSequence mTempVariables;
>+};
>+
>+RewriteAtomicFunctionExpressionsTraverser::RewriteAtomicFunctionExpressionsTraverser(
>+    TSymbolTable *symbolTable,
>+    int shaderVersion)
>+    : TIntermTraverser(false, false, true, symbolTable), mShaderVersion(shaderVersion)
>+{}
>+
>+void RewriteAtomicFunctionExpressionsTraverser::rewriteAtomicFunctionCallNode(
>+    TIntermAggregate *oldAtomicFunctionNode)
>+{
>+    ASSERT(oldAtomicFunctionNode);
>+
>+    const TVariable *returnVariable = getTempVariable(&oldAtomicFunctionNode->getType());
>+
>+    TIntermBinary *rewrittenNode = new TIntermBinary(
>+        TOperator::EOpAssign, CreateTempSymbolNode(returnVariable), oldAtomicFunctionNode);
>+
>+    auto *parentNode = getParentNode();
>+
>+    auto *parentBinary = parentNode->getAsBinaryNode();
>+    if (parentBinary && parentBinary->getOp() == EOpInitialize)
>+    {
>+        insertStatementInParentBlock(rewrittenNode);
>+        queueReplacement(CreateTempSymbolNode(returnVariable), OriginalNode::IS_DROPPED);
>+    }
>+    else
>+    {
>+        // As all atomic function assignment will be converted to the last argument of an
>+        // interlocked function, if we need the return value, assignment needs to be wrapped with
>+        // the comma operator and the temporary variables.
>+        if (!parentNode->getAsBlock())
>+        {
>+            rewrittenNode = TIntermBinary::CreateComma(
>+                rewrittenNode, new TIntermSymbol(returnVariable), mShaderVersion);
>+        }
>+
>+        queueReplacement(rewrittenNode, OriginalNode::IS_DROPPED);
>+    }
>+}
>+
>+const TVariable *RewriteAtomicFunctionExpressionsTraverser::getTempVariable(const TType *type)
>+{
>+    TIntermDeclaration *variableDeclaration;
>+    TVariable *returnVariable =
>+        DeclareTempVariable(mSymbolTable, type, EvqTemporary, &variableDeclaration);
>+    mTempVariables.push_back(variableDeclaration);
>+    return returnVariable;
>+}
>+
>+bool RewriteAtomicFunctionExpressionsTraverser::IsAtomicExchangeOrCompSwapNoReturnValue(
>+    TIntermAggregate *node,
>+    TIntermNode *parentNode)
>+{
>+    ASSERT(node);
>+    return (node->getOp() == EOpAtomicExchange || node->getOp() == EOpAtomicCompSwap) &&
>+           parentNode && parentNode->getAsBlock();
>+}
>+
>+bool RewriteAtomicFunctionExpressionsTraverser::IsAtomicFunctionInsideExpression(
>+    TIntermAggregate *node,
>+    TIntermNode *parentNode)
>+{
>+    ASSERT(node);
>+    // We only need to handle atomic functions with a parent that it is not block nodes. If the
>+    // parent node is block, it means that the atomic function is not inside an expression.
>+    if (!IsAtomicFunction(node->getOp()) || parentNode->getAsBlock())
>+    {
>+        return false;
>+    }
>+
>+    auto *parentAsBinary = parentNode->getAsBinaryNode();
>+    // Assignments are handled in OutputHLSL
>+    return !parentAsBinary || parentAsBinary->getOp() != EOpAssign;
>+}
>+
>+bool RewriteAtomicFunctionExpressionsTraverser::visitAggregate(Visit visit, TIntermAggregate *node)
>+{
>+    ASSERT(visit == PostVisit);
>+    // Skip atomic memory functions for SSBO. They will be processed in the OutputHLSL traverser.
>+    if (IsAtomicFunction(node->getOp()) &&
>+        IsInShaderStorageBlock((*node->getSequence())[0]->getAsTyped()))
>+    {
>+        return false;
>+    }
>+
>+    TIntermNode *parentNode = getParentNode();
>+    if (IsAtomicExchangeOrCompSwapNoReturnValue(node, parentNode) ||
>+        IsAtomicFunctionInsideExpression(node, parentNode))
>+    {
>+        rewriteAtomicFunctionCallNode(node);
>+    }
>+
>+    return true;
>+}
>+
>+bool RewriteAtomicFunctionExpressionsTraverser::visitBlock(Visit visit, TIntermBlock *node)
>+{
>+    ASSERT(visit == PostVisit);
>+
>+    if (!mTempVariables.empty() && getParentNode()->getAsFunctionDefinition())
>+    {
>+        insertStatementsInBlockAtPosition(node, 0, mTempVariables, TIntermSequence());
>+        mTempVariables.clear();
>+    }
>+
>+    return true;
>+}
>+
>+}  // anonymous namespace
>+
>+void RewriteAtomicFunctionExpressions(TIntermNode *root,
>+                                      TSymbolTable *symbolTable,
>+                                      int shaderVersion)
>+{
>+    RewriteAtomicFunctionExpressionsTraverser traverser(symbolTable, shaderVersion);
>+    traverser.traverse(root);
>+    traverser.updateTree();
>+}
>+}  // namespace sh
>\ No newline at end of file
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/RewriteAtomicFunctionExpressions.h b/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/RewriteAtomicFunctionExpressions.h
>new file mode 100644
>index 00000000000..a54440536e3
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/RewriteAtomicFunctionExpressions.h
>@@ -0,0 +1,38 @@
>+//
>+// Copyright (c) 2018 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// RewriteAtomicFunctionExpressions rewrites the expressions that contain
>+// atomic function calls and cannot be directly translated into HLSL into
>+// several simple ones that can be easily handled in the HLSL translator.
>+//
>+// We need to rewite these expressions because:
>+// 1. All GLSL atomic functions have return values, which all represent the
>+//    original value of the shared or ssbo variable; while all HLSL atomic
>+//    functions don't, and the original value can be stored in the last
>+//    parameter of the function call.
>+// 2. For HLSL atomic functions, the last parameter that stores the original
>+//    value is optional except for InterlockedExchange and
>+//    InterlockedCompareExchange. Missing original_value in the call of
>+//    InterlockedExchange or InterlockedCompareExchange results in a compile
>+//    error from HLSL compiler.
>+//
>+// RewriteAtomicFunctionExpressions is a function that can modify the AST
>+// to ensure all the expressions that contain atomic function calls can be
>+// directly translated into HLSL expressions.
>+
>+#ifndef COMPILER_TRANSLATOR_TREEOPS_REWRITE_ATOMIC_FUNCTION_EXPRESSIONS_H_
>+#define COMPILER_TRANSLATOR_TREEOPS_REWRITE_ATOMIC_FUNCTION_EXPRESSIONS_H_
>+
>+namespace sh
>+{
>+class TIntermNode;
>+class TSymbolTable;
>+
>+void RewriteAtomicFunctionExpressions(TIntermNode *root,
>+                                      TSymbolTable *symbolTable,
>+                                      int shaderVersion);
>+}  // namespace sh
>+
>+#endif  // COMPILER_TRANSLATOR_TREEOPS_REWRITE_ATOMIC_FUNCTION_EXPRESSIONS_H_
>\ No newline at end of file
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/RewriteDoWhile.cpp b/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/RewriteDoWhile.cpp
>new file mode 100644
>index 00000000000..7956322a5a6
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/RewriteDoWhile.cpp
>@@ -0,0 +1,144 @@
>+//
>+// Copyright (c) 2015 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+
>+// RewriteDoWhile.cpp: rewrites do-while loops using another equivalent
>+// construct.
>+
>+#include "compiler/translator/tree_ops/RewriteDoWhile.h"
>+
>+#include "compiler/translator/StaticType.h"
>+#include "compiler/translator/tree_util/IntermNode_util.h"
>+#include "compiler/translator/tree_util/IntermTraverse.h"
>+
>+namespace sh
>+{
>+
>+namespace
>+{
>+
>+// An AST traverser that rewrites loops of the form
>+//   do {
>+//     CODE;
>+//   } while (CONDITION)
>+//
>+// to loops of the form
>+//   bool temp = false;
>+//   while (true) {
>+//     if (temp) {
>+//       if (!CONDITION) {
>+//         break;
>+//       }
>+//     }
>+//     temp = true;
>+//     CODE;
>+//   }
>+//
>+// The reason we don't use a simpler form, with for example just (temp && !CONDITION) in the
>+// while condition, is that short-circuit is often badly supported by driver shader compiler.
>+// The double if has the same effect, but forces shader compilers to behave.
>+//
>+// TODO(cwallez) when UnfoldShortCircuitIntoIf handles loops correctly, revisit this as we might
>+// be able to use while (temp || CONDITION) with temp initially set to true then run
>+// UnfoldShortCircuitIntoIf
>+class DoWhileRewriter : public TIntermTraverser
>+{
>+  public:
>+    DoWhileRewriter(TSymbolTable *symbolTable) : TIntermTraverser(true, false, false, symbolTable)
>+    {}
>+
>+    bool visitBlock(Visit, TIntermBlock *node) override
>+    {
>+        // A well-formed AST can only have do-while inside TIntermBlock. By doing a prefix traversal
>+        // we are able to replace the do-while in the sequence directly as the content of the
>+        // do-while will be traversed later.
>+
>+        TIntermSequence *statements = node->getSequence();
>+
>+        // The statements vector will have new statements inserted when we encounter a do-while,
>+        // which prevents us from using a range-based for loop. Using the usual i++ works, as
>+        // the (two) new statements inserted replace the statement at the current position.
>+        for (size_t i = 0; i < statements->size(); i++)
>+        {
>+            TIntermNode *statement = (*statements)[i];
>+            TIntermLoop *loop      = statement->getAsLoopNode();
>+
>+            if (loop == nullptr || loop->getType() != ELoopDoWhile)
>+            {
>+                continue;
>+            }
>+
>+            // Found a loop to change.
>+            const TType *boolType = StaticType::Get<EbtBool, EbpUndefined, EvqTemporary, 1, 1>();
>+            TVariable *conditionVariable = CreateTempVariable(mSymbolTable, boolType);
>+
>+            // bool temp = false;
>+            TIntermDeclaration *tempDeclaration =
>+                CreateTempInitDeclarationNode(conditionVariable, CreateBoolNode(false));
>+
>+            // temp = true;
>+            TIntermBinary *assignTrue =
>+                CreateTempAssignmentNode(conditionVariable, CreateBoolNode(true));
>+
>+            // if (temp) {
>+            //   if (!CONDITION) {
>+            //     break;
>+            //   }
>+            // }
>+            TIntermIfElse *breakIf = nullptr;
>+            {
>+                TIntermBranch *breakStatement = new TIntermBranch(EOpBreak, nullptr);
>+
>+                TIntermBlock *breakBlock = new TIntermBlock();
>+                breakBlock->getSequence()->push_back(breakStatement);
>+
>+                TIntermUnary *negatedCondition =
>+                    new TIntermUnary(EOpLogicalNot, loop->getCondition(), nullptr);
>+
>+                TIntermIfElse *innerIf = new TIntermIfElse(negatedCondition, breakBlock, nullptr);
>+
>+                TIntermBlock *innerIfBlock = new TIntermBlock();
>+                innerIfBlock->getSequence()->push_back(innerIf);
>+
>+                breakIf = new TIntermIfElse(CreateTempSymbolNode(conditionVariable), innerIfBlock,
>+                                            nullptr);
>+            }
>+
>+            // Assemble the replacement loops, reusing the do-while loop's body and inserting our
>+            // statements at the front.
>+            TIntermLoop *newLoop = nullptr;
>+            {
>+                TIntermBlock *body = loop->getBody();
>+                if (body == nullptr)
>+                {
>+                    body = new TIntermBlock();
>+                }
>+                auto sequence = body->getSequence();
>+                sequence->insert(sequence->begin(), assignTrue);
>+                sequence->insert(sequence->begin(), breakIf);
>+
>+                newLoop = new TIntermLoop(ELoopWhile, nullptr, CreateBoolNode(true), nullptr, body);
>+            }
>+
>+            TIntermSequence replacement;
>+            replacement.push_back(tempDeclaration);
>+            replacement.push_back(newLoop);
>+
>+            node->replaceChildNodeWithMultiple(loop, replacement);
>+        }
>+        return true;
>+    }
>+};
>+
>+}  // anonymous namespace
>+
>+void RewriteDoWhile(TIntermNode *root, TSymbolTable *symbolTable)
>+{
>+    DoWhileRewriter rewriter(symbolTable);
>+
>+    root->traverse(&rewriter);
>+}
>+
>+}  // namespace sh
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/RewriteDoWhile.h b/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/RewriteDoWhile.h
>new file mode 100644
>index 00000000000..c91d7deb062
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/RewriteDoWhile.h
>@@ -0,0 +1,23 @@
>+//
>+// Copyright (c) 2015 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+
>+// RewriteDoWhile.h: rewrite do-while loops as while loops to work around
>+// driver bugs
>+
>+#ifndef COMPILER_TRANSLATOR_TREEOPS_REWRITEDOWHILE_H_
>+#define COMPILER_TRANSLATOR_TREEOPS_REWRITEDOWHILE_H_
>+
>+namespace sh
>+{
>+
>+class TIntermNode;
>+class TSymbolTable;
>+
>+void RewriteDoWhile(TIntermNode *root, TSymbolTable *symbolTable);
>+
>+}  // namespace sh
>+
>+#endif  // COMPILER_TRANSLATOR_TREEOPS_REWRITEDOWHILE_H_
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/RewriteElseBlocks.cpp b/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/RewriteElseBlocks.cpp
>new file mode 100644
>index 00000000000..701e29aa9de
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/RewriteElseBlocks.cpp
>@@ -0,0 +1,120 @@
>+//
>+// Copyright (c) 2014 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// RewriteElseBlocks.cpp: Implementation for tree transform to change
>+//   all if-else blocks to if-if blocks.
>+//
>+
>+#include "compiler/translator/tree_ops/RewriteElseBlocks.h"
>+
>+#include "compiler/translator/IntermNode.h"
>+#include "compiler/translator/SymbolTable.h"
>+#include "compiler/translator/tree_util/IntermNode_util.h"
>+#include "compiler/translator/tree_util/NodeSearch.h"
>+
>+namespace sh
>+{
>+
>+namespace
>+{
>+
>+class ElseBlockRewriter : public TIntermTraverser
>+{
>+  public:
>+    ElseBlockRewriter(TSymbolTable *symbolTable);
>+
>+  protected:
>+    bool visitFunctionDefinition(Visit visit, TIntermFunctionDefinition *aggregate) override;
>+    bool visitBlock(Visit visit, TIntermBlock *block) override;
>+
>+  private:
>+    TIntermNode *rewriteIfElse(TIntermIfElse *ifElse);
>+
>+    const TType *mFunctionType;
>+};
>+
>+ElseBlockRewriter::ElseBlockRewriter(TSymbolTable *symbolTable)
>+    : TIntermTraverser(true, false, true, symbolTable), mFunctionType(nullptr)
>+{}
>+
>+bool ElseBlockRewriter::visitFunctionDefinition(Visit visit, TIntermFunctionDefinition *node)
>+{
>+    // Store the current function context (see comment below)
>+    mFunctionType = ((visit == PreVisit) ? &node->getFunctionPrototype()->getType() : nullptr);
>+    return true;
>+}
>+
>+bool ElseBlockRewriter::visitBlock(Visit visit, TIntermBlock *node)
>+{
>+    if (visit == PostVisit)
>+    {
>+        for (size_t statementIndex = 0; statementIndex != node->getSequence()->size();
>+             statementIndex++)
>+        {
>+            TIntermNode *statement = (*node->getSequence())[statementIndex];
>+            TIntermIfElse *ifElse  = statement->getAsIfElseNode();
>+            if (ifElse && ifElse->getFalseBlock() != nullptr)
>+            {
>+                (*node->getSequence())[statementIndex] = rewriteIfElse(ifElse);
>+            }
>+        }
>+    }
>+    return true;
>+}
>+
>+TIntermNode *ElseBlockRewriter::rewriteIfElse(TIntermIfElse *ifElse)
>+{
>+    ASSERT(ifElse != nullptr);
>+
>+    TIntermDeclaration *storeCondition = nullptr;
>+    TVariable *conditionVariable =
>+        DeclareTempVariable(mSymbolTable, ifElse->getCondition(), EvqTemporary, &storeCondition);
>+
>+    TIntermBlock *falseBlock = nullptr;
>+
>+    TType boolType(EbtBool, EbpUndefined, EvqTemporary);
>+
>+    if (ifElse->getFalseBlock())
>+    {
>+        TIntermBlock *negatedElse = nullptr;
>+        // crbug.com/346463
>+        // D3D generates error messages claiming a function has no return value, when rewriting
>+        // an if-else clause that returns something non-void in a function. By appending dummy
>+        // returns (that are unreachable) we can silence this compile error.
>+        if (mFunctionType && mFunctionType->getBasicType() != EbtVoid)
>+        {
>+            TIntermNode *returnNode = new TIntermBranch(EOpReturn, CreateZeroNode(*mFunctionType));
>+            negatedElse             = new TIntermBlock();
>+            negatedElse->appendStatement(returnNode);
>+        }
>+
>+        TIntermSymbol *conditionSymbolElse = CreateTempSymbolNode(conditionVariable);
>+        TIntermUnary *negatedCondition =
>+            new TIntermUnary(EOpLogicalNot, conditionSymbolElse, nullptr);
>+        TIntermIfElse *falseIfElse =
>+            new TIntermIfElse(negatedCondition, ifElse->getFalseBlock(), negatedElse);
>+        falseBlock = EnsureBlock(falseIfElse);
>+    }
>+
>+    TIntermSymbol *conditionSymbolSel = CreateTempSymbolNode(conditionVariable);
>+    TIntermIfElse *newIfElse =
>+        new TIntermIfElse(conditionSymbolSel, ifElse->getTrueBlock(), falseBlock);
>+
>+    TIntermBlock *block = new TIntermBlock();
>+    block->getSequence()->push_back(storeCondition);
>+    block->getSequence()->push_back(newIfElse);
>+
>+    return block;
>+}
>+
>+}  // anonymous namespace
>+
>+void RewriteElseBlocks(TIntermNode *node, TSymbolTable *symbolTable)
>+{
>+    ElseBlockRewriter rewriter(symbolTable);
>+    node->traverse(&rewriter);
>+}
>+
>+}  // namespace sh
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/RewriteElseBlocks.h b/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/RewriteElseBlocks.h
>new file mode 100644
>index 00000000000..3ae3b4a710f
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/RewriteElseBlocks.h
>@@ -0,0 +1,22 @@
>+//
>+// Copyright (c) 2014 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// RewriteElseBlocks.h: Prototype for tree transform to change
>+//   all if-else blocks to if-if blocks.
>+//
>+
>+#ifndef COMPILER_TRANSLATOR_TREEOPS_REWRITEELSEBLOCKS_H_
>+#define COMPILER_TRANSLATOR_TREEOPS_REWRITEELSEBLOCKS_H_
>+
>+namespace sh
>+{
>+
>+class TIntermNode;
>+class TSymbolTable;
>+
>+void RewriteElseBlocks(TIntermNode *node, TSymbolTable *symbolTable);
>+}  // namespace sh
>+
>+#endif  // COMPILER_TRANSLATOR_TREEOPS_REWRITEELSEBLOCKS_H_
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/RewriteExpressionsWithShaderStorageBlock.cpp b/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/RewriteExpressionsWithShaderStorageBlock.cpp
>new file mode 100644
>index 00000000000..9228f5b4ec7
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/RewriteExpressionsWithShaderStorageBlock.cpp
>@@ -0,0 +1,411 @@
>+//
>+// Copyright 2018 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// RewriteExpressionsWithShaderStorageBlock rewrites the expressions that contain shader storage
>+// block calls into several simple ones that can be easily handled in the HLSL translator. After the
>+// AST pass, all ssbo related blocks will be like below:
>+//     ssbo_access_chain = ssbo_access_chain;
>+//     ssbo_access_chain = expr_no_ssbo;
>+//     lvalue_no_ssbo    = ssbo_access_chain;
>+//
>+
>+#include "compiler/translator/tree_ops/RewriteExpressionsWithShaderStorageBlock.h"
>+
>+#include "compiler/translator/Symbol.h"
>+#include "compiler/translator/tree_util/IntermNode_util.h"
>+#include "compiler/translator/tree_util/IntermTraverse.h"
>+#include "compiler/translator/util.h"
>+
>+namespace sh
>+{
>+namespace
>+{
>+
>+bool IsIncrementOrDecrementOperator(TOperator op)
>+{
>+    switch (op)
>+    {
>+        case EOpPostIncrement:
>+        case EOpPostDecrement:
>+        case EOpPreIncrement:
>+        case EOpPreDecrement:
>+            return true;
>+        default:
>+            return false;
>+    }
>+}
>+
>+bool IsCompoundAssignment(TOperator op)
>+{
>+    switch (op)
>+    {
>+        case EOpAddAssign:
>+        case EOpSubAssign:
>+        case EOpMulAssign:
>+        case EOpVectorTimesMatrixAssign:
>+        case EOpVectorTimesScalarAssign:
>+        case EOpMatrixTimesScalarAssign:
>+        case EOpMatrixTimesMatrixAssign:
>+        case EOpDivAssign:
>+        case EOpIModAssign:
>+        case EOpBitShiftLeftAssign:
>+        case EOpBitShiftRightAssign:
>+        case EOpBitwiseAndAssign:
>+        case EOpBitwiseXorAssign:
>+        case EOpBitwiseOrAssign:
>+            return true;
>+        default:
>+            return false;
>+    }
>+}
>+
>+// EOpIndexDirect, EOpIndexIndirect, EOpIndexDirectStruct, EOpIndexDirectInterfaceBlock belong to
>+// operators in SSBO access chain.
>+bool IsReadonlyBinaryOperatorNotInSSBOAccessChain(TOperator op)
>+{
>+    switch (op)
>+    {
>+        case EOpComma:
>+        case EOpAdd:
>+        case EOpSub:
>+        case EOpMul:
>+        case EOpDiv:
>+        case EOpIMod:
>+        case EOpBitShiftLeft:
>+        case EOpBitShiftRight:
>+        case EOpBitwiseAnd:
>+        case EOpBitwiseXor:
>+        case EOpBitwiseOr:
>+        case EOpEqual:
>+        case EOpNotEqual:
>+        case EOpLessThan:
>+        case EOpGreaterThan:
>+        case EOpLessThanEqual:
>+        case EOpGreaterThanEqual:
>+        case EOpVectorTimesScalar:
>+        case EOpMatrixTimesScalar:
>+        case EOpVectorTimesMatrix:
>+        case EOpMatrixTimesVector:
>+        case EOpMatrixTimesMatrix:
>+        case EOpLogicalOr:
>+        case EOpLogicalXor:
>+        case EOpLogicalAnd:
>+            return true;
>+        default:
>+            return false;
>+    }
>+}
>+
>+bool HasSSBOAsFunctionArgument(TIntermSequence *arguments)
>+{
>+    for (TIntermNode *arg : *arguments)
>+    {
>+        TIntermTyped *typedArg = arg->getAsTyped();
>+        if (IsInShaderStorageBlock(typedArg))
>+        {
>+            return true;
>+        }
>+    }
>+    return false;
>+}
>+
>+class RewriteExpressionsWithShaderStorageBlockTraverser : public TIntermTraverser
>+{
>+  public:
>+    RewriteExpressionsWithShaderStorageBlockTraverser(TSymbolTable *symbolTable);
>+    void nextIteration();
>+    bool foundSSBO() const { return mFoundSSBO; }
>+
>+  private:
>+    bool visitBinary(Visit, TIntermBinary *node) override;
>+    bool visitAggregate(Visit visit, TIntermAggregate *node) override;
>+    bool visitUnary(Visit visit, TIntermUnary *node) override;
>+
>+    TIntermSymbol *insertInitStatementAndReturnTempSymbol(TIntermTyped *node,
>+                                                          TIntermSequence *insertions);
>+
>+    bool mFoundSSBO;
>+};
>+
>+RewriteExpressionsWithShaderStorageBlockTraverser::
>+    RewriteExpressionsWithShaderStorageBlockTraverser(TSymbolTable *symbolTable)
>+    : TIntermTraverser(true, true, false, symbolTable), mFoundSSBO(false)
>+{}
>+
>+TIntermSymbol *
>+RewriteExpressionsWithShaderStorageBlockTraverser::insertInitStatementAndReturnTempSymbol(
>+    TIntermTyped *node,
>+    TIntermSequence *insertions)
>+{
>+    TIntermDeclaration *variableDeclaration;
>+    TVariable *tempVariable =
>+        DeclareTempVariable(mSymbolTable, node, EvqTemporary, &variableDeclaration);
>+
>+    insertions->push_back(variableDeclaration);
>+    return CreateTempSymbolNode(tempVariable);
>+}
>+
>+bool RewriteExpressionsWithShaderStorageBlockTraverser::visitBinary(Visit visit,
>+                                                                    TIntermBinary *node)
>+{
>+    // Make sure that the expression is caculated from left to right.
>+    if (visit != InVisit)
>+    {
>+        return true;
>+    }
>+
>+    if (mFoundSSBO)
>+    {
>+        return false;
>+    }
>+
>+    bool rightSSBO = IsInShaderStorageBlock(node->getRight());
>+    bool leftSSBO  = IsInShaderStorageBlock(node->getLeft());
>+    if (!leftSSBO && !rightSSBO)
>+    {
>+        return true;
>+    }
>+
>+    // case 1: Compound assigment operator
>+    //  original:
>+    //      lssbo += expr;
>+    //  new:
>+    //      var rvalue = expr;
>+    //      var temp = lssbo;
>+    //      temp += rvalue;
>+    //      lssbo = temp;
>+    //
>+    //  original:
>+    //      lvalue_no_ssbo += rssbo;
>+    //  new:
>+    //      var rvalue = rssbo;
>+    //      lvalue_no_ssbo += rvalue;
>+    if (IsCompoundAssignment(node->getOp()))
>+    {
>+        mFoundSSBO = true;
>+        TIntermSequence insertions;
>+        TIntermTyped *rightNode =
>+            insertInitStatementAndReturnTempSymbol(node->getRight(), &insertions);
>+        if (leftSSBO)
>+        {
>+            TIntermSymbol *tempSymbol =
>+                insertInitStatementAndReturnTempSymbol(node->getLeft()->deepCopy(), &insertions);
>+            TIntermBinary *tempCompoundOperate =
>+                new TIntermBinary(node->getOp(), tempSymbol->deepCopy(), rightNode->deepCopy());
>+            insertions.push_back(tempCompoundOperate);
>+            insertStatementsInParentBlock(insertions);
>+
>+            TIntermBinary *assignTempValueToSSBO =
>+                new TIntermBinary(EOpAssign, node->getLeft(), tempSymbol->deepCopy());
>+            queueReplacement(assignTempValueToSSBO, OriginalNode::IS_DROPPED);
>+        }
>+        else
>+        {
>+            insertStatementsInParentBlock(insertions);
>+            TIntermBinary *compoundAssignRValueToLValue =
>+                new TIntermBinary(node->getOp(), node->getLeft(), rightNode->deepCopy());
>+            queueReplacement(compoundAssignRValueToLValue, OriginalNode::IS_DROPPED);
>+        }
>+    }
>+    // case 2: Readonly binary operator
>+    //  original:
>+    //      ssbo0 + ssbo1 + ssbo2;
>+    //  new:
>+    //      var temp0 = ssbo0;
>+    //      var temp1 = ssbo1;
>+    //      var temp2 = ssbo2;
>+    //      temp0 + temp1 + temp2;
>+    else if (IsReadonlyBinaryOperatorNotInSSBOAccessChain(node->getOp()) && (leftSSBO || rightSSBO))
>+    {
>+        mFoundSSBO              = true;
>+        TIntermTyped *rightNode = node->getRight();
>+        TIntermTyped *leftNode  = node->getLeft();
>+        TIntermSequence insertions;
>+        if (rightSSBO)
>+        {
>+            rightNode = insertInitStatementAndReturnTempSymbol(node->getRight(), &insertions);
>+        }
>+        if (leftSSBO)
>+        {
>+            leftNode = insertInitStatementAndReturnTempSymbol(node->getLeft(), &insertions);
>+        }
>+
>+        insertStatementsInParentBlock(insertions);
>+        TIntermBinary *newExpr =
>+            new TIntermBinary(node->getOp(), leftNode->deepCopy(), rightNode->deepCopy());
>+        queueReplacement(newExpr, OriginalNode::IS_DROPPED);
>+    }
>+    return !mFoundSSBO;
>+}
>+
>+// case 3: ssbo as the argument of aggregate type
>+//  original:
>+//      foo(ssbo);
>+//  new:
>+//      var tempArg = ssbo;
>+//      foo(tempArg);
>+//      ssbo = tempArg;  (Optional based on whether ssbo is an out|input argument)
>+//
>+//  original:
>+//      foo(ssbo) * expr;
>+//  new:
>+//      var tempArg = ssbo;
>+//      var tempReturn = foo(tempArg);
>+//      ssbo = tempArg;  (Optional based on whether ssbo is an out|input argument)
>+//      tempReturn * expr;
>+bool RewriteExpressionsWithShaderStorageBlockTraverser::visitAggregate(Visit visit,
>+                                                                       TIntermAggregate *node)
>+{
>+    // Make sure that visitAggregate is only executed once for same node.
>+    if (visit != PreVisit)
>+    {
>+        return true;
>+    }
>+
>+    if (mFoundSSBO)
>+    {
>+        return false;
>+    }
>+
>+    // We still need to process the ssbo as the non-first argument of atomic memory functions.
>+    if (IsAtomicFunction(node->getOp()) &&
>+        IsInShaderStorageBlock((*node->getSequence())[0]->getAsTyped()))
>+    {
>+        return true;
>+    }
>+
>+    if (!HasSSBOAsFunctionArgument(node->getSequence()))
>+    {
>+        return true;
>+    }
>+
>+    mFoundSSBO = true;
>+    TIntermSequence insertions;
>+    TIntermSequence readBackToSSBOs;
>+    TIntermSequence *originalArguments = node->getSequence();
>+    for (size_t i = 0; i < node->getChildCount(); ++i)
>+    {
>+        TIntermTyped *ssboArgument = (*originalArguments)[i]->getAsTyped();
>+        if (IsInShaderStorageBlock(ssboArgument))
>+        {
>+            TIntermSymbol *argumentCopy =
>+                insertInitStatementAndReturnTempSymbol(ssboArgument, &insertions);
>+            if (node->getFunction() != nullptr)
>+            {
>+                TQualifier qual = node->getFunction()->getParam(i)->getType().getQualifier();
>+                if (qual == EvqInOut || qual == EvqOut)
>+                {
>+                    TIntermBinary *readBackToSSBO = new TIntermBinary(
>+                        EOpAssign, ssboArgument->deepCopy(), argumentCopy->deepCopy());
>+                    readBackToSSBOs.push_back(readBackToSSBO);
>+                }
>+            }
>+            node->replaceChildNode(ssboArgument, argumentCopy);
>+        }
>+    }
>+
>+    TIntermBlock *parentBlock = getParentNode()->getAsBlock();
>+    if (parentBlock)
>+    {
>+        // Aggregate node is as a single sentence.
>+        insertions.push_back(node);
>+        if (!readBackToSSBOs.empty())
>+        {
>+            insertions.insert(insertions.end(), readBackToSSBOs.begin(), readBackToSSBOs.end());
>+        }
>+        mMultiReplacements.push_back(NodeReplaceWithMultipleEntry(parentBlock, node, insertions));
>+    }
>+    else
>+    {
>+        // Aggregate node is inside an expression.
>+        TIntermSymbol *tempSymbol = insertInitStatementAndReturnTempSymbol(node, &insertions);
>+        if (!readBackToSSBOs.empty())
>+        {
>+            insertions.insert(insertions.end(), readBackToSSBOs.begin(), readBackToSSBOs.end());
>+        }
>+        insertStatementsInParentBlock(insertions);
>+        queueReplacement(tempSymbol->deepCopy(), OriginalNode::IS_DROPPED);
>+    }
>+
>+    return false;
>+}
>+
>+bool RewriteExpressionsWithShaderStorageBlockTraverser::visitUnary(Visit visit, TIntermUnary *node)
>+{
>+    if (mFoundSSBO)
>+    {
>+        return false;
>+    }
>+
>+    if (!IsInShaderStorageBlock(node->getOperand()))
>+    {
>+        return true;
>+    }
>+
>+    // .length() is processed in OutputHLSL.
>+    if (node->getOp() == EOpArrayLength)
>+    {
>+        return true;
>+    }
>+
>+    mFoundSSBO = true;
>+
>+    // case 4: ssbo as the operand of ++/--
>+    //  original:
>+    //      ++ssbo * expr;
>+    //  new:
>+    //      var temp1 = ssbo;
>+    //      var temp2 = ++temp1;
>+    //      ssbo = temp1;
>+    //      temp2 * expr;
>+    if (IsIncrementOrDecrementOperator(node->getOp()))
>+    {
>+        TIntermSequence insertions;
>+        TIntermSymbol *temp1 =
>+            insertInitStatementAndReturnTempSymbol(node->getOperand(), &insertions);
>+        TIntermUnary *newUnary = new TIntermUnary(node->getOp(), temp1->deepCopy(), nullptr);
>+        TIntermSymbol *temp2   = insertInitStatementAndReturnTempSymbol(newUnary, &insertions);
>+        TIntermBinary *readBackToSSBO =
>+            new TIntermBinary(EOpAssign, node->getOperand()->deepCopy(), temp1->deepCopy());
>+        insertions.push_back(readBackToSSBO);
>+        insertStatementsInParentBlock(insertions);
>+        queueReplacement(temp2->deepCopy(), OriginalNode::IS_DROPPED);
>+    }
>+    // case 5: ssbo as the operand of readonly unary operator
>+    //  original:
>+    //      ~ssbo * expr;
>+    //  new:
>+    //      var temp = ssbo;
>+    //      ~temp * expr;
>+    else
>+    {
>+        TIntermSequence insertions;
>+        TIntermSymbol *temp =
>+            insertInitStatementAndReturnTempSymbol(node->getOperand(), &insertions);
>+        insertStatementsInParentBlock(insertions);
>+        node->replaceChildNode(node->getOperand(), temp->deepCopy());
>+    }
>+    return false;
>+}
>+
>+void RewriteExpressionsWithShaderStorageBlockTraverser::nextIteration()
>+{
>+    mFoundSSBO = false;
>+}
>+
>+}  // anonymous namespace
>+
>+void RewriteExpressionsWithShaderStorageBlock(TIntermNode *root, TSymbolTable *symbolTable)
>+{
>+    RewriteExpressionsWithShaderStorageBlockTraverser traverser(symbolTable);
>+    do
>+    {
>+        traverser.nextIteration();
>+        root->traverse(&traverser);
>+        if (traverser.foundSSBO())
>+            traverser.updateTree();
>+    } while (traverser.foundSSBO());
>+}
>+}  // namespace sh
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/RewriteExpressionsWithShaderStorageBlock.h b/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/RewriteExpressionsWithShaderStorageBlock.h
>new file mode 100644
>index 00000000000..957552e6fdc
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/RewriteExpressionsWithShaderStorageBlock.h
>@@ -0,0 +1,32 @@
>+//
>+// Copyright 2018 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// RewriteExpressionsWithShaderStorageBlock rewrites the expressions that contain shader storage
>+// block calls into several simple ones that can be easily handled in the HLSL translator. After the
>+// AST pass, all ssbo related blocks will be like below:
>+//     ssbo_access_chain = ssbo_access_chain;
>+//     ssbo_access_chain = expr_no_ssbo;
>+//     lvalue_no_ssbo    = ssbo_access_chain;
>+//
>+// Below situations are needed to be rewritten (Details can be found in .cpp file).
>+//     SSBO as the operand of compound assignment operators.
>+//     SSBO as the operand of ++/--.
>+//     SSBO as the operand of repeated assignment.
>+//     SSBO as the operand of readonly unary/binary/ternary operators.
>+//     SSBO as the argument of aggregate type.
>+//     SSBO as the condition of if/switch/while/do-while/for
>+
>+#ifndef COMPILER_TRANSLATOR_TREEOPS_REWRITE_EXPRESSIONS_WITH_SHADER_STORAGE_BLOCK_H_
>+#define COMPILER_TRANSLATOR_TREEOPS_REWRITE_EXPRESSIONS_WITH_SHADER_STORAGE_BLOCK_H_
>+
>+namespace sh
>+{
>+class TIntermNode;
>+class TSymbolTable;
>+
>+void RewriteExpressionsWithShaderStorageBlock(TIntermNode *root, TSymbolTable *symbolTable);
>+}  // namespace sh
>+
>+#endif  // COMPILER_TRANSLATOR_TREEOPS_REWRITE_EXPRESSIONS_WITH_SHADER_STORAGE_BLOCK_H_
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/RewriteRepeatedAssignToSwizzled.cpp b/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/RewriteRepeatedAssignToSwizzled.cpp
>new file mode 100644
>index 00000000000..3cc670e6881
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/RewriteRepeatedAssignToSwizzled.cpp
>@@ -0,0 +1,92 @@
>+//
>+// Copyright (c) 2018 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// RewriteRepeatedAssignToSwizzled.cpp: Rewrite expressions that assign an assignment to a swizzled
>+// vector, like:
>+//     v.x = z = expression;
>+// to:
>+//     z = expression;
>+//     v.x = z;
>+//
>+// Note that this doesn't handle some corner cases: expressions nested inside other expressions,
>+// inside loop headers, or inside if conditions.
>+
>+#include "compiler/translator/tree_ops/RewriteRepeatedAssignToSwizzled.h"
>+
>+#include "compiler/translator/tree_util/IntermNode_util.h"
>+#include "compiler/translator/tree_util/IntermTraverse.h"
>+
>+namespace sh
>+{
>+
>+namespace
>+{
>+
>+class RewriteAssignToSwizzledTraverser : public TIntermTraverser
>+{
>+  public:
>+    static void rewrite(TIntermBlock *root);
>+
>+  private:
>+    RewriteAssignToSwizzledTraverser();
>+
>+    bool visitBinary(Visit, TIntermBinary *node) override;
>+
>+    void nextIteration();
>+
>+    bool didRewrite() { return mDidRewrite; }
>+
>+    bool mDidRewrite;
>+};
>+
>+// static
>+void RewriteAssignToSwizzledTraverser::rewrite(TIntermBlock *root)
>+{
>+    RewriteAssignToSwizzledTraverser rewrite;
>+    do
>+    {
>+        rewrite.nextIteration();
>+        root->traverse(&rewrite);
>+        rewrite.updateTree();
>+    } while (rewrite.didRewrite());
>+}
>+
>+RewriteAssignToSwizzledTraverser::RewriteAssignToSwizzledTraverser()
>+    : TIntermTraverser(true, false, false), mDidRewrite(false)
>+{}
>+
>+void RewriteAssignToSwizzledTraverser::nextIteration()
>+{
>+    mDidRewrite = false;
>+}
>+
>+bool RewriteAssignToSwizzledTraverser::visitBinary(Visit, TIntermBinary *node)
>+{
>+    TIntermBinary *rightBinary = node->getRight()->getAsBinaryNode();
>+    TIntermBlock *parentBlock  = getParentNode()->getAsBlock();
>+    if (parentBlock && node->isAssignment() && node->getLeft()->getAsSwizzleNode() && rightBinary &&
>+        rightBinary->isAssignment())
>+    {
>+        TIntermSequence replacements;
>+        replacements.push_back(rightBinary);
>+        TIntermTyped *rightAssignmentTargetCopy = rightBinary->getLeft()->deepCopy();
>+        TIntermBinary *lastAssign =
>+            new TIntermBinary(EOpAssign, node->getLeft(), rightAssignmentTargetCopy);
>+        replacements.push_back(lastAssign);
>+        mMultiReplacements.push_back(NodeReplaceWithMultipleEntry(parentBlock, node, replacements));
>+        mDidRewrite = true;
>+        return false;
>+    }
>+    return true;
>+}
>+
>+}  // anonymous namespace
>+
>+void RewriteRepeatedAssignToSwizzled(TIntermBlock *root)
>+{
>+    RewriteAssignToSwizzledTraverser::rewrite(root);
>+}
>+
>+}  // namespace sh
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/RewriteRepeatedAssignToSwizzled.h b/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/RewriteRepeatedAssignToSwizzled.h
>new file mode 100644
>index 00000000000..2f2d3b9f80c
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/RewriteRepeatedAssignToSwizzled.h
>@@ -0,0 +1,28 @@
>+//
>+// Copyright (c) 2018 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// RewriteRepeatedAssignToSwizzled.h: Rewrite expressions that assign an assignment to a swizzled
>+// vector, like:
>+//     v.x = z = expression;
>+// to:
>+//     z = expression;
>+//     v.x = z;
>+//
>+// Note that this doesn't handle some corner cases: expressions nested inside other expressions,
>+// inside loop headers, or inside if conditions.
>+
>+#ifndef COMPILER_TRANSLATOR_TREEOPS_REWRITEREPEATEDASSIGNTOSWIZZLED_H_
>+#define COMPILER_TRANSLATOR_TREEOPS_REWRITEREPEATEDASSIGNTOSWIZZLED_H_
>+
>+namespace sh
>+{
>+
>+class TIntermBlock;
>+
>+void RewriteRepeatedAssignToSwizzled(TIntermBlock *root);
>+
>+}  // namespace sh
>+
>+#endif  // COMPILER_TRANSLATOR_TREEOPS_REWRITEREPEATEDASSIGNTOSWIZZLED_H_
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/RewriteStructSamplers.cpp b/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/RewriteStructSamplers.cpp
>new file mode 100644
>index 00000000000..8d5bdd0bae4
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/RewriteStructSamplers.cpp
>@@ -0,0 +1,699 @@
>+//
>+// Copyright 2018 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// RewriteStructSamplers: Extract structs from samplers.
>+//
>+
>+#include "compiler/translator/tree_ops/RewriteStructSamplers.h"
>+
>+#include "compiler/translator/ImmutableStringBuilder.h"
>+#include "compiler/translator/SymbolTable.h"
>+#include "compiler/translator/tree_util/IntermTraverse.h"
>+
>+namespace sh
>+{
>+namespace
>+{
>+// Helper method to get the sampler extracted struct type of a parameter.
>+TType *GetStructSamplerParameterType(TSymbolTable *symbolTable, const TVariable &param)
>+{
>+    const TStructure *structure = param.getType().getStruct();
>+    const TSymbol *structSymbol = symbolTable->findUserDefined(structure->name());
>+    ASSERT(structSymbol && structSymbol->isStruct());
>+    const TStructure *structVar = static_cast<const TStructure *>(structSymbol);
>+    TType *structType           = new TType(structVar, false);
>+
>+    if (param.getType().isArray())
>+    {
>+        structType->makeArrays(*param.getType().getArraySizes());
>+    }
>+
>+    ASSERT(!structType->isStructureContainingSamplers());
>+
>+    return structType;
>+}
>+
>+TIntermSymbol *ReplaceTypeOfSymbolNode(TIntermSymbol *symbolNode, TSymbolTable *symbolTable)
>+{
>+    const TVariable &oldVariable = symbolNode->variable();
>+
>+    TType *newType = GetStructSamplerParameterType(symbolTable, oldVariable);
>+
>+    TVariable *newVariable =
>+        new TVariable(oldVariable.uniqueId(), oldVariable.name(), oldVariable.symbolType(),
>+                      oldVariable.extension(), newType);
>+    return new TIntermSymbol(newVariable);
>+}
>+
>+TIntermTyped *ReplaceTypeOfTypedStructNode(TIntermTyped *argument, TSymbolTable *symbolTable)
>+{
>+    TIntermSymbol *asSymbol = argument->getAsSymbolNode();
>+    if (asSymbol)
>+    {
>+        ASSERT(asSymbol->getType().getStruct());
>+        return ReplaceTypeOfSymbolNode(asSymbol, symbolTable);
>+    }
>+
>+    TIntermTyped *replacement = argument->deepCopy();
>+    TIntermBinary *binary     = replacement->getAsBinaryNode();
>+    ASSERT(binary);
>+
>+    while (binary)
>+    {
>+        ASSERT(binary->getOp() == EOpIndexDirectStruct || binary->getOp() == EOpIndexDirect);
>+
>+        asSymbol = binary->getLeft()->getAsSymbolNode();
>+
>+        if (asSymbol)
>+        {
>+            ASSERT(asSymbol->getType().getStruct());
>+            TIntermSymbol *newSymbol = ReplaceTypeOfSymbolNode(asSymbol, symbolTable);
>+            binary->replaceChildNode(binary->getLeft(), newSymbol);
>+            return replacement;
>+        }
>+
>+        binary = binary->getLeft()->getAsBinaryNode();
>+    }
>+
>+    UNREACHABLE();
>+    return nullptr;
>+}
>+
>+// Maximum string size of a hex unsigned int.
>+constexpr size_t kHexSize = ImmutableStringBuilder::GetHexCharCount<unsigned int>();
>+
>+class Traverser final : public TIntermTraverser
>+{
>+  public:
>+    explicit Traverser(TSymbolTable *symbolTable)
>+        : TIntermTraverser(true, false, true, symbolTable), mRemovedUniformsCount(0)
>+    {
>+        mSymbolTable->push();
>+    }
>+
>+    ~Traverser() override { mSymbolTable->pop(); }
>+
>+    int removedUniformsCount() const { return mRemovedUniformsCount; }
>+
>+    // Each struct sampler declaration is stripped of its samplers. New uniforms are added for each
>+    // stripped struct sampler.
>+    bool visitDeclaration(Visit visit, TIntermDeclaration *decl) override
>+    {
>+        if (visit != PreVisit)
>+            return true;
>+
>+        if (!mInGlobalScope)
>+        {
>+            return true;
>+        }
>+
>+        const TIntermSequence &sequence = *(decl->getSequence());
>+        TIntermTyped *declarator        = sequence.front()->getAsTyped();
>+        const TType &type               = declarator->getType();
>+
>+        if (type.isStructureContainingSamplers())
>+        {
>+            TIntermSequence *newSequence = new TIntermSequence;
>+
>+            if (type.isStructSpecifier())
>+            {
>+                stripStructSpecifierSamplers(type.getStruct(), newSequence);
>+            }
>+            else
>+            {
>+                TIntermSymbol *asSymbol = declarator->getAsSymbolNode();
>+                ASSERT(asSymbol);
>+                const TVariable &variable = asSymbol->variable();
>+                ASSERT(variable.symbolType() != SymbolType::Empty);
>+                extractStructSamplerUniforms(decl, variable, type.getStruct(), newSequence);
>+            }
>+
>+            mMultiReplacements.emplace_back(getParentNode()->getAsBlock(), decl, *newSequence);
>+        }
>+
>+        return true;
>+    }
>+
>+    // Each struct sampler reference is replaced with a reference to the new extracted sampler.
>+    bool visitBinary(Visit visit, TIntermBinary *node) override
>+    {
>+        if (visit != PreVisit)
>+            return true;
>+
>+        if (node->getOp() == EOpIndexDirectStruct && node->getType().isSampler())
>+        {
>+            ImmutableString newName = GetStructSamplerNameFromTypedNode(node);
>+            const TVariable *samplerReplacement =
>+                static_cast<const TVariable *>(mSymbolTable->findUserDefined(newName));
>+            ASSERT(samplerReplacement);
>+
>+            TIntermSymbol *replacement = new TIntermSymbol(samplerReplacement);
>+
>+            queueReplacement(replacement, OriginalNode::IS_DROPPED);
>+            return true;
>+        }
>+
>+        return true;
>+    }
>+
>+    // In we are passing references to structs containing samplers we must new additional
>+    // arguments. For each extracted struct sampler a new argument is added. This chains to nested
>+    // structs.
>+    void visitFunctionPrototype(TIntermFunctionPrototype *node) override
>+    {
>+        const TFunction *function = node->getFunction();
>+
>+        if (!function->hasSamplerInStructParams())
>+        {
>+            return;
>+        }
>+
>+        const TSymbol *foundFunction = mSymbolTable->findUserDefined(function->name());
>+        if (foundFunction)
>+        {
>+            ASSERT(foundFunction->isFunction());
>+            function = static_cast<const TFunction *>(foundFunction);
>+        }
>+        else
>+        {
>+            TFunction *newFunction = createStructSamplerFunction(function);
>+            mSymbolTable->declareUserDefinedFunction(newFunction, true);
>+            function = newFunction;
>+        }
>+
>+        ASSERT(!function->hasSamplerInStructParams());
>+        TIntermFunctionPrototype *newProto = new TIntermFunctionPrototype(function);
>+        queueReplacement(newProto, OriginalNode::IS_DROPPED);
>+    }
>+
>+    // We insert a new scope for each function definition so we can track the new parameters.
>+    bool visitFunctionDefinition(Visit visit, TIntermFunctionDefinition *node) override
>+    {
>+        if (visit == PreVisit)
>+        {
>+            mSymbolTable->push();
>+        }
>+        else
>+        {
>+            ASSERT(visit == PostVisit);
>+            mSymbolTable->pop();
>+        }
>+        return true;
>+    }
>+
>+    // For function call nodes we pass references to the extracted struct samplers in that scope.
>+    bool visitAggregate(Visit visit, TIntermAggregate *node) override
>+    {
>+        if (visit != PreVisit)
>+            return true;
>+
>+        if (!node->isFunctionCall())
>+            return true;
>+
>+        const TFunction *function = node->getFunction();
>+        if (!function->hasSamplerInStructParams())
>+            return true;
>+
>+        ASSERT(node->getOp() == EOpCallFunctionInAST);
>+        TFunction *newFunction        = mSymbolTable->findUserDefinedFunction(function->name());
>+        TIntermSequence *newArguments = getStructSamplerArguments(function, node->getSequence());
>+
>+        TIntermAggregate *newCall =
>+            TIntermAggregate::CreateFunctionCall(*newFunction, newArguments);
>+        queueReplacement(newCall, OriginalNode::IS_DROPPED);
>+        return true;
>+    }
>+
>+  private:
>+    // This returns the name of a struct sampler reference. References are always TIntermBinary.
>+    static ImmutableString GetStructSamplerNameFromTypedNode(TIntermTyped *node)
>+    {
>+        std::string stringBuilder;
>+
>+        TIntermTyped *currentNode = node;
>+        while (currentNode->getAsBinaryNode())
>+        {
>+            TIntermBinary *asBinary = currentNode->getAsBinaryNode();
>+
>+            switch (asBinary->getOp())
>+            {
>+                case EOpIndexDirect:
>+                {
>+                    const int index = asBinary->getRight()->getAsConstantUnion()->getIConst(0);
>+                    const std::string strInt = Str(index);
>+                    stringBuilder.insert(0, strInt);
>+                    stringBuilder.insert(0, "_");
>+                    break;
>+                }
>+                case EOpIndexDirectStruct:
>+                {
>+                    stringBuilder.insert(0, asBinary->getIndexStructFieldName().data());
>+                    stringBuilder.insert(0, "_");
>+                    break;
>+                }
>+
>+                default:
>+                    UNREACHABLE();
>+                    break;
>+            }
>+
>+            currentNode = asBinary->getLeft();
>+        }
>+
>+        const ImmutableString &variableName = currentNode->getAsSymbolNode()->variable().name();
>+        stringBuilder.insert(0, variableName.data());
>+
>+        return stringBuilder;
>+    }
>+
>+    // Removes all the struct samplers from a struct specifier.
>+    void stripStructSpecifierSamplers(const TStructure *structure, TIntermSequence *newSequence)
>+    {
>+        TFieldList *newFieldList = new TFieldList;
>+        ASSERT(structure->containsSamplers());
>+
>+        for (const TField *field : structure->fields())
>+        {
>+            const TType &fieldType = *field->type();
>+            if (!fieldType.isSampler() && !isRemovedStructType(fieldType))
>+            {
>+                TType *newType = nullptr;
>+
>+                if (fieldType.isStructureContainingSamplers())
>+                {
>+                    const TSymbol *structSymbol =
>+                        mSymbolTable->findUserDefined(fieldType.getStruct()->name());
>+                    ASSERT(structSymbol && structSymbol->isStruct());
>+                    const TStructure *fieldStruct = static_cast<const TStructure *>(structSymbol);
>+                    newType                       = new TType(fieldStruct, true);
>+                    if (fieldType.isArray())
>+                    {
>+                        newType->makeArrays(*fieldType.getArraySizes());
>+                    }
>+                }
>+                else
>+                {
>+                    newType = new TType(fieldType);
>+                }
>+
>+                TField *newField =
>+                    new TField(newType, field->name(), field->line(), field->symbolType());
>+                newFieldList->push_back(newField);
>+            }
>+        }
>+
>+        // Prune empty structs.
>+        if (newFieldList->empty())
>+        {
>+            mRemovedStructs.insert(structure->name());
>+            return;
>+        }
>+
>+        TStructure *newStruct =
>+            new TStructure(mSymbolTable, structure->name(), newFieldList, structure->symbolType());
>+        TType *newStructType = new TType(newStruct, true);
>+        TVariable *newStructVar =
>+            new TVariable(mSymbolTable, kEmptyImmutableString, newStructType, SymbolType::Empty);
>+        TIntermSymbol *newStructRef = new TIntermSymbol(newStructVar);
>+
>+        TIntermDeclaration *structDecl = new TIntermDeclaration;
>+        structDecl->appendDeclarator(newStructRef);
>+
>+        newSequence->push_back(structDecl);
>+
>+        mSymbolTable->declare(newStruct);
>+    }
>+
>+    // Returns true if the type is a struct that was removed because we extracted all the members.
>+    bool isRemovedStructType(const TType &type) const
>+    {
>+        const TStructure *structure = type.getStruct();
>+        return (structure && (mRemovedStructs.count(structure->name()) > 0));
>+    }
>+
>+    // Removes samplers from struct uniforms. For each sampler removed also adds a new globally
>+    // defined sampler uniform.
>+    void extractStructSamplerUniforms(TIntermDeclaration *oldDeclaration,
>+                                      const TVariable &variable,
>+                                      const TStructure *structure,
>+                                      TIntermSequence *newSequence)
>+    {
>+        ASSERT(structure->containsSamplers());
>+
>+        size_t nonSamplerCount = 0;
>+
>+        for (const TField *field : structure->fields())
>+        {
>+            nonSamplerCount +=
>+                extractFieldSamplers(variable.name(), field, variable.getType(), newSequence);
>+        }
>+
>+        if (nonSamplerCount > 0)
>+        {
>+            // Keep the old declaration around if it has other members.
>+            newSequence->push_back(oldDeclaration);
>+        }
>+        else
>+        {
>+            mRemovedUniformsCount++;
>+        }
>+    }
>+
>+    // Extracts samplers from a field of a struct. Works with nested structs and arrays.
>+    size_t extractFieldSamplers(const ImmutableString &prefix,
>+                                const TField *field,
>+                                const TType &containingType,
>+                                TIntermSequence *newSequence)
>+    {
>+        if (containingType.isArray())
>+        {
>+            size_t nonSamplerCount = 0;
>+
>+            // Name the samplers internally as varName_<index>_fieldName
>+            const TVector<unsigned int> &arraySizes = *containingType.getArraySizes();
>+            for (unsigned int arrayElement = 0; arrayElement < arraySizes[0]; ++arrayElement)
>+            {
>+                ImmutableStringBuilder stringBuilder(prefix.length() + kHexSize + 1);
>+                stringBuilder << prefix << "_";
>+                stringBuilder.appendHex(arrayElement);
>+                nonSamplerCount = extractFieldSamplersImpl(stringBuilder, field, newSequence);
>+            }
>+
>+            return nonSamplerCount;
>+        }
>+
>+        return extractFieldSamplersImpl(prefix, field, newSequence);
>+    }
>+
>+    // Extracts samplers from a field of a struct. Works with nested structs and arrays.
>+    size_t extractFieldSamplersImpl(const ImmutableString &prefix,
>+                                    const TField *field,
>+                                    TIntermSequence *newSequence)
>+    {
>+        size_t nonSamplerCount = 0;
>+
>+        const TType &fieldType = *field->type();
>+        if (fieldType.isSampler() || fieldType.isStructureContainingSamplers())
>+        {
>+            ImmutableStringBuilder stringBuilder(prefix.length() + field->name().length() + 1);
>+            stringBuilder << prefix << "_" << field->name();
>+            ImmutableString newPrefix(stringBuilder);
>+
>+            if (fieldType.isSampler())
>+            {
>+                extractSampler(newPrefix, fieldType, newSequence);
>+            }
>+            else
>+            {
>+                const TStructure *structure = fieldType.getStruct();
>+                for (const TField *nestedField : structure->fields())
>+                {
>+                    nonSamplerCount +=
>+                        extractFieldSamplers(newPrefix, nestedField, fieldType, newSequence);
>+                }
>+            }
>+        }
>+        else
>+        {
>+            nonSamplerCount++;
>+        }
>+
>+        return nonSamplerCount;
>+    }
>+
>+    // Extracts a sampler from a struct. Declares the new extracted sampler.
>+    void extractSampler(const ImmutableString &newName,
>+                        const TType &fieldType,
>+                        TIntermSequence *newSequence) const
>+    {
>+        TType *newType = new TType(fieldType);
>+        newType->setQualifier(EvqUniform);
>+        TVariable *newVariable =
>+            new TVariable(mSymbolTable, newName, newType, SymbolType::AngleInternal);
>+        TIntermSymbol *newRef = new TIntermSymbol(newVariable);
>+
>+        TIntermDeclaration *samplerDecl = new TIntermDeclaration;
>+        samplerDecl->appendDeclarator(newRef);
>+
>+        newSequence->push_back(samplerDecl);
>+
>+        mSymbolTable->declareInternal(newVariable);
>+    }
>+
>+    // Returns the chained name of a sampler uniform field.
>+    static ImmutableString GetFieldName(const ImmutableString &paramName,
>+                                        const TField *field,
>+                                        unsigned arrayIndex)
>+    {
>+        ImmutableStringBuilder nameBuilder(paramName.length() + kHexSize + 2 +
>+                                           field->name().length());
>+        nameBuilder << paramName << "_";
>+
>+        if (arrayIndex < std::numeric_limits<unsigned>::max())
>+        {
>+            nameBuilder.appendHex(arrayIndex);
>+            nameBuilder << "_";
>+        }
>+        nameBuilder << field->name();
>+
>+        return nameBuilder;
>+    }
>+
>+    // A pattern that visits every parameter of a function call. Uses different handlers for struct
>+    // parameters, struct sampler parameters, and non-struct parameters.
>+    class StructSamplerFunctionVisitor : angle::NonCopyable
>+    {
>+      public:
>+        StructSamplerFunctionVisitor()          = default;
>+        virtual ~StructSamplerFunctionVisitor() = default;
>+
>+        virtual void traverse(const TFunction *function)
>+        {
>+            size_t paramCount = function->getParamCount();
>+
>+            for (size_t paramIndex = 0; paramIndex < paramCount; ++paramIndex)
>+            {
>+                const TVariable *param = function->getParam(paramIndex);
>+                const TType &paramType = param->getType();
>+
>+                if (paramType.isStructureContainingSamplers())
>+                {
>+                    const ImmutableString &baseName = getNameFromIndex(function, paramIndex);
>+                    if (traverseStructContainingSamplers(baseName, paramType))
>+                    {
>+                        visitStructParam(function, paramIndex);
>+                    }
>+                }
>+                else
>+                {
>+                    visitNonStructParam(function, paramIndex);
>+                }
>+            }
>+        }
>+
>+        virtual ImmutableString getNameFromIndex(const TFunction *function, size_t paramIndex) = 0;
>+        virtual void visitSamplerInStructParam(const ImmutableString &name,
>+                                               const TField *field)                            = 0;
>+        virtual void visitStructParam(const TFunction *function, size_t paramIndex)            = 0;
>+        virtual void visitNonStructParam(const TFunction *function, size_t paramIndex)         = 0;
>+
>+      private:
>+        bool traverseStructContainingSamplers(const ImmutableString &baseName,
>+                                              const TType &structType)
>+        {
>+            bool hasNonSamplerFields    = false;
>+            const TStructure *structure = structType.getStruct();
>+            for (const TField *field : structure->fields())
>+            {
>+                if (field->type()->isStructureContainingSamplers() || field->type()->isSampler())
>+                {
>+                    if (traverseSamplerInStruct(baseName, structType, field))
>+                    {
>+                        hasNonSamplerFields = true;
>+                    }
>+                }
>+                else
>+                {
>+                    hasNonSamplerFields = true;
>+                }
>+            }
>+            return hasNonSamplerFields;
>+        }
>+
>+        bool traverseSamplerInStruct(const ImmutableString &baseName,
>+                                     const TType &baseType,
>+                                     const TField *field)
>+        {
>+            bool hasNonSamplerParams = false;
>+
>+            if (baseType.isArray())
>+            {
>+                const TVector<unsigned int> &arraySizes = *baseType.getArraySizes();
>+                ASSERT(arraySizes.size() == 1);
>+
>+                for (unsigned int arrayIndex = 0; arrayIndex < arraySizes[0]; ++arrayIndex)
>+                {
>+                    ImmutableString name = GetFieldName(baseName, field, arrayIndex);
>+
>+                    if (field->type()->isStructureContainingSamplers())
>+                    {
>+                        if (traverseStructContainingSamplers(name, *field->type()))
>+                        {
>+                            hasNonSamplerParams = true;
>+                        }
>+                    }
>+                    else
>+                    {
>+                        ASSERT(field->type()->isSampler());
>+                        visitSamplerInStructParam(name, field);
>+                    }
>+                }
>+            }
>+            else if (field->type()->isStructureContainingSamplers())
>+            {
>+                ImmutableString name =
>+                    GetFieldName(baseName, field, std::numeric_limits<unsigned>::max());
>+                hasNonSamplerParams = traverseStructContainingSamplers(name, *field->type());
>+            }
>+            else
>+            {
>+                ASSERT(field->type()->isSampler());
>+                ImmutableString name =
>+                    GetFieldName(baseName, field, std::numeric_limits<unsigned>::max());
>+                visitSamplerInStructParam(name, field);
>+            }
>+
>+            return hasNonSamplerParams;
>+        }
>+    };
>+
>+    // A visitor that replaces functions with struct sampler references. The struct sampler
>+    // references are expanded to include new fields for the structs.
>+    class CreateStructSamplerFunctionVisitor final : public StructSamplerFunctionVisitor
>+    {
>+      public:
>+        CreateStructSamplerFunctionVisitor(TSymbolTable *symbolTable)
>+            : mSymbolTable(symbolTable), mNewFunction(nullptr)
>+        {}
>+
>+        ImmutableString getNameFromIndex(const TFunction *function, size_t paramIndex) override
>+        {
>+            const TVariable *param = function->getParam(paramIndex);
>+            return param->name();
>+        }
>+
>+        void traverse(const TFunction *function) override
>+        {
>+            mNewFunction =
>+                new TFunction(mSymbolTable, function->name(), function->symbolType(),
>+                              &function->getReturnType(), function->isKnownToNotHaveSideEffects());
>+
>+            StructSamplerFunctionVisitor::traverse(function);
>+        }
>+
>+        void visitSamplerInStructParam(const ImmutableString &name, const TField *field) override
>+        {
>+            TVariable *fieldSampler =
>+                new TVariable(mSymbolTable, name, field->type(), SymbolType::AngleInternal);
>+            mNewFunction->addParameter(fieldSampler);
>+            mSymbolTable->declareInternal(fieldSampler);
>+        }
>+
>+        void visitStructParam(const TFunction *function, size_t paramIndex) override
>+        {
>+            const TVariable *param = function->getParam(paramIndex);
>+            TType *structType      = GetStructSamplerParameterType(mSymbolTable, *param);
>+            TVariable *newParam =
>+                new TVariable(mSymbolTable, param->name(), structType, param->symbolType());
>+            mNewFunction->addParameter(newParam);
>+        }
>+
>+        void visitNonStructParam(const TFunction *function, size_t paramIndex) override
>+        {
>+            const TVariable *param = function->getParam(paramIndex);
>+            mNewFunction->addParameter(param);
>+        }
>+
>+        TFunction *getNewFunction() const { return mNewFunction; }
>+
>+      private:
>+        TSymbolTable *mSymbolTable;
>+        TFunction *mNewFunction;
>+    };
>+
>+    TFunction *createStructSamplerFunction(const TFunction *function) const
>+    {
>+        CreateStructSamplerFunctionVisitor visitor(mSymbolTable);
>+        visitor.traverse(function);
>+        return visitor.getNewFunction();
>+    }
>+
>+    // A visitor that replaces function calls with expanded struct sampler parameters.
>+    class GetSamplerArgumentsVisitor final : public StructSamplerFunctionVisitor
>+    {
>+      public:
>+        GetSamplerArgumentsVisitor(TSymbolTable *symbolTable, const TIntermSequence *arguments)
>+            : mSymbolTable(symbolTable), mArguments(arguments), mNewArguments(new TIntermSequence)
>+        {}
>+
>+        ImmutableString getNameFromIndex(const TFunction *function, size_t paramIndex) override
>+        {
>+            TIntermTyped *argument = (*mArguments)[paramIndex]->getAsTyped();
>+            return GetStructSamplerNameFromTypedNode(argument);
>+        }
>+
>+        void visitSamplerInStructParam(const ImmutableString &name, const TField *field) override
>+        {
>+            TVariable *argSampler =
>+                new TVariable(mSymbolTable, name, field->type(), SymbolType::AngleInternal);
>+            TIntermSymbol *argSymbol = new TIntermSymbol(argSampler);
>+            mNewArguments->push_back(argSymbol);
>+        }
>+
>+        void visitStructParam(const TFunction *function, size_t paramIndex) override
>+        {
>+            // The tree structure of the parameter is modified to point to the new type. This leaves
>+            // the tree in a consistent state.
>+            TIntermTyped *argument    = (*mArguments)[paramIndex]->getAsTyped();
>+            TIntermTyped *replacement = ReplaceTypeOfTypedStructNode(argument, mSymbolTable);
>+            mNewArguments->push_back(replacement);
>+        }
>+
>+        void visitNonStructParam(const TFunction *function, size_t paramIndex) override
>+        {
>+            TIntermTyped *argument = (*mArguments)[paramIndex]->getAsTyped();
>+            mNewArguments->push_back(argument);
>+        }
>+
>+        TIntermSequence *getNewArguments() const { return mNewArguments; }
>+
>+      private:
>+        TSymbolTable *mSymbolTable;
>+        const TIntermSequence *mArguments;
>+        TIntermSequence *mNewArguments;
>+    };
>+
>+    TIntermSequence *getStructSamplerArguments(const TFunction *function,
>+                                               const TIntermSequence *arguments) const
>+    {
>+        GetSamplerArgumentsVisitor visitor(mSymbolTable, arguments);
>+        visitor.traverse(function);
>+        return visitor.getNewArguments();
>+    }
>+
>+    int mRemovedUniformsCount;
>+    std::set<ImmutableString> mRemovedStructs;
>+};
>+}  // anonymous namespace
>+
>+int RewriteStructSamplers(TIntermBlock *root, TSymbolTable *symbolTable)
>+{
>+    Traverser rewriteStructSamplers(symbolTable);
>+    root->traverse(&rewriteStructSamplers);
>+    rewriteStructSamplers.updateTree();
>+
>+    return rewriteStructSamplers.removedUniformsCount();
>+}
>+}  // namespace sh
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/RewriteStructSamplers.h b/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/RewriteStructSamplers.h
>new file mode 100644
>index 00000000000..2b7aa6e1c4a
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/RewriteStructSamplers.h
>@@ -0,0 +1,31 @@
>+//
>+// Copyright 2018 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// RewriteStructSamplers: Extract structs from samplers.
>+//
>+// This traverser is designed to strip out samplers from structs. It moves them into
>+// separate uniform sampler declarations. This allows the struct to be stored in the
>+// default uniform block. It also requires that we rewrite any functions that take the
>+// struct as an argument. The struct is split into two arguments.
>+//
>+// For example:
>+//   struct S { sampler2D samp; int i; };
>+//   uniform S uni;
>+// Is rewritten as:
>+//   struct S { int i; };
>+//   uniform S uni;
>+//   uniform sampler2D uni_i;
>+
>+#ifndef COMPILER_TRANSLATOR_TREEOPS_REWRITESTRUCTSAMPLERS_H_
>+#define COMPILER_TRANSLATOR_TREEOPS_REWRITESTRUCTSAMPLERS_H_
>+
>+namespace sh
>+{
>+class TIntermBlock;
>+class TSymbolTable;
>+int RewriteStructSamplers(TIntermBlock *root, TSymbolTable *symbolTable);
>+}  // namespace sh
>+
>+#endif  // COMPILER_TRANSLATOR_TREEOPS_REWRITESTRUCTSAMPLERS_H_
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/RewriteTexelFetchOffset.cpp b/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/RewriteTexelFetchOffset.cpp
>new file mode 100644
>index 00000000000..3587fd65384
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/RewriteTexelFetchOffset.cpp
>@@ -0,0 +1,154 @@
>+//
>+// Copyright (c) 2016 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// Implementation of texelFetchOffset translation issue workaround.
>+// See header for more info.
>+
>+#include "compiler/translator/tree_ops/RewriteTexelFetchOffset.h"
>+
>+#include "common/angleutils.h"
>+#include "compiler/translator/SymbolTable.h"
>+#include "compiler/translator/tree_util/IntermNode_util.h"
>+#include "compiler/translator/tree_util/IntermTraverse.h"
>+
>+namespace sh
>+{
>+
>+namespace
>+{
>+
>+class Traverser : public TIntermTraverser
>+{
>+  public:
>+    static void Apply(TIntermNode *root, const TSymbolTable &symbolTable, int shaderVersion);
>+
>+  private:
>+    Traverser(const TSymbolTable &symbolTable, int shaderVersion);
>+    bool visitAggregate(Visit visit, TIntermAggregate *node) override;
>+    void nextIteration();
>+
>+    const TSymbolTable *symbolTable;
>+    const int shaderVersion;
>+    bool mFound = false;
>+};
>+
>+Traverser::Traverser(const TSymbolTable &symbolTable, int shaderVersion)
>+    : TIntermTraverser(true, false, false), symbolTable(&symbolTable), shaderVersion(shaderVersion)
>+{}
>+
>+// static
>+void Traverser::Apply(TIntermNode *root, const TSymbolTable &symbolTable, int shaderVersion)
>+{
>+    Traverser traverser(symbolTable, shaderVersion);
>+    do
>+    {
>+        traverser.nextIteration();
>+        root->traverse(&traverser);
>+        if (traverser.mFound)
>+        {
>+            traverser.updateTree();
>+        }
>+    } while (traverser.mFound);
>+}
>+
>+void Traverser::nextIteration()
>+{
>+    mFound = false;
>+}
>+
>+bool Traverser::visitAggregate(Visit visit, TIntermAggregate *node)
>+{
>+    if (mFound)
>+    {
>+        return false;
>+    }
>+
>+    // Decide if the node represents the call of texelFetchOffset.
>+    if (node->getOp() != EOpCallBuiltInFunction)
>+    {
>+        return true;
>+    }
>+
>+    ASSERT(node->getFunction()->symbolType() == SymbolType::BuiltIn);
>+    if (node->getFunction()->name() != "texelFetchOffset")
>+    {
>+        return true;
>+    }
>+
>+    // Potential problem case detected, apply workaround.
>+    const TIntermSequence *sequence = node->getSequence();
>+    ASSERT(sequence->size() == 4u);
>+
>+    // Decide if the sampler is a 2DArray sampler. In that case position is ivec3 and offset is
>+    // ivec2.
>+    bool is2DArray = sequence->at(1)->getAsTyped()->getNominalSize() == 3 &&
>+                     sequence->at(3)->getAsTyped()->getNominalSize() == 2;
>+
>+    // Create new node that represents the call of function texelFetch.
>+    // Its argument list will be: texelFetch(sampler, Position+offset, lod).
>+
>+    TIntermSequence *texelFetchArguments = new TIntermSequence();
>+
>+    // sampler
>+    texelFetchArguments->push_back(sequence->at(0));
>+
>+    // Position
>+    TIntermTyped *texCoordNode = sequence->at(1)->getAsTyped();
>+    ASSERT(texCoordNode);
>+
>+    // offset
>+    TIntermTyped *offsetNode = nullptr;
>+    ASSERT(sequence->at(3)->getAsTyped());
>+    if (is2DArray)
>+    {
>+        // For 2DArray samplers, Position is ivec3 and offset is ivec2;
>+        // So offset must be converted into an ivec3 before being added to Position.
>+        TIntermSequence *constructOffsetIvecArguments = new TIntermSequence();
>+        constructOffsetIvecArguments->push_back(sequence->at(3)->getAsTyped());
>+
>+        TIntermTyped *zeroNode = CreateZeroNode(TType(EbtInt));
>+        constructOffsetIvecArguments->push_back(zeroNode);
>+
>+        offsetNode = TIntermAggregate::CreateConstructor(texCoordNode->getType(),
>+                                                         constructOffsetIvecArguments);
>+        offsetNode->setLine(texCoordNode->getLine());
>+    }
>+    else
>+    {
>+        offsetNode = sequence->at(3)->getAsTyped();
>+    }
>+
>+    // Position+offset
>+    TIntermBinary *add = new TIntermBinary(EOpAdd, texCoordNode, offsetNode);
>+    add->setLine(texCoordNode->getLine());
>+    texelFetchArguments->push_back(add);
>+
>+    // lod
>+    texelFetchArguments->push_back(sequence->at(2));
>+
>+    ASSERT(texelFetchArguments->size() == 3u);
>+
>+    TIntermTyped *texelFetchNode = CreateBuiltInFunctionCallNode("texelFetch", texelFetchArguments,
>+                                                                 *symbolTable, shaderVersion);
>+    texelFetchNode->setLine(node->getLine());
>+
>+    // Replace the old node by this new node.
>+    queueReplacement(texelFetchNode, OriginalNode::IS_DROPPED);
>+    mFound = true;
>+    return false;
>+}
>+
>+}  // anonymous namespace
>+
>+void RewriteTexelFetchOffset(TIntermNode *root, const TSymbolTable &symbolTable, int shaderVersion)
>+{
>+    // texelFetchOffset is only valid in GLSL 3.0 and later.
>+    if (shaderVersion < 300)
>+        return;
>+
>+    Traverser::Apply(root, symbolTable, shaderVersion);
>+}
>+
>+}  // namespace sh
>\ No newline at end of file
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/RewriteTexelFetchOffset.h b/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/RewriteTexelFetchOffset.h
>new file mode 100644
>index 00000000000..45e224dd620
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/RewriteTexelFetchOffset.h
>@@ -0,0 +1,28 @@
>+//
>+// Copyright (c) 2016 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// This mutating tree traversal works around an issue on the translation
>+// from texelFetchOffset into HLSL function Load on INTEL drivers. It
>+// works by translating texelFetchOffset into texelFetch:
>+//
>+// - From: texelFetchOffset(sampler, Position, lod, offset)
>+// - To: texelFetch(sampler, Position+offset, lod)
>+//
>+// See http://anglebug.com/1469
>+
>+#ifndef COMPILER_TRANSLATOR_TREEOPS_REWRITE_TEXELFETCHOFFSET_H_
>+#define COMPILER_TRANSLATOR_TREEOPS_REWRITE_TEXELFETCHOFFSET_H_
>+
>+class TIntermNode;
>+class TSymbolTable;
>+
>+namespace sh
>+{
>+
>+void RewriteTexelFetchOffset(TIntermNode *root, const TSymbolTable &symbolTable, int shaderVersion);
>+
>+}  // namespace sh
>+
>+#endif  // COMPILER_TRANSLATOR_TREEOPS_REWRITE_TEXELFETCHOFFSET_H_
>\ No newline at end of file
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/RewriteUnaryMinusOperatorFloat.cpp b/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/RewriteUnaryMinusOperatorFloat.cpp
>new file mode 100644
>index 00000000000..e95dde2a769
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/RewriteUnaryMinusOperatorFloat.cpp
>@@ -0,0 +1,92 @@
>+//
>+// Copyright (c) 2016 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+
>+#include "compiler/translator/tree_ops/RewriteUnaryMinusOperatorFloat.h"
>+
>+#include "compiler/translator/tree_util/IntermNode_util.h"
>+#include "compiler/translator/tree_util/IntermTraverse.h"
>+
>+namespace sh
>+{
>+
>+namespace
>+{
>+
>+class Traverser : public TIntermTraverser
>+{
>+  public:
>+    static void Apply(TIntermNode *root);
>+
>+  private:
>+    Traverser();
>+    bool visitUnary(Visit visit, TIntermUnary *node) override;
>+    void nextIteration();
>+
>+    bool mFound = false;
>+};
>+
>+// static
>+void Traverser::Apply(TIntermNode *root)
>+{
>+    Traverser traverser;
>+    do
>+    {
>+        traverser.nextIteration();
>+        root->traverse(&traverser);
>+        if (traverser.mFound)
>+        {
>+            traverser.updateTree();
>+        }
>+    } while (traverser.mFound);
>+}
>+
>+Traverser::Traverser() : TIntermTraverser(true, false, false) {}
>+
>+void Traverser::nextIteration()
>+{
>+    mFound = false;
>+}
>+
>+bool Traverser::visitUnary(Visit visit, TIntermUnary *node)
>+{
>+    if (mFound)
>+    {
>+        return false;
>+    }
>+
>+    // Detect if the current operator is unary minus operator.
>+    if (node->getOp() != EOpNegative)
>+    {
>+        return true;
>+    }
>+
>+    // Detect if the current operand is a float variable.
>+    TIntermTyped *fValue = node->getOperand();
>+    if (!fValue->getType().isScalarFloat())
>+    {
>+        return true;
>+    }
>+
>+    // 0.0 - float
>+    TIntermTyped *zero = CreateZeroNode(fValue->getType());
>+    zero->setLine(fValue->getLine());
>+    TIntermBinary *sub = new TIntermBinary(EOpSub, zero, fValue);
>+    sub->setLine(fValue->getLine());
>+
>+    queueReplacement(sub, OriginalNode::IS_DROPPED);
>+
>+    mFound = true;
>+    return false;
>+}
>+
>+}  // anonymous namespace
>+
>+void RewriteUnaryMinusOperatorFloat(TIntermNode *root)
>+{
>+    Traverser::Apply(root);
>+}
>+
>+}  // namespace sh
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/RewriteUnaryMinusOperatorFloat.h b/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/RewriteUnaryMinusOperatorFloat.h
>new file mode 100644
>index 00000000000..2df592a7759
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/RewriteUnaryMinusOperatorFloat.h
>@@ -0,0 +1,19 @@
>+// Copyright (c) 2016 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// Rewrite "-float" to "0.0 - float" to work around unary minus operator on float issue on Intel Mac
>+// OSX 10.11.
>+
>+#ifndef COMPILER_TRANSLATOR_TREEOPS_REWRITEUNARYMINUSOPERATORFLOAT_H_
>+#define COMPILER_TRANSLATOR_TREEOPS_REWRITEUNARYMINUSOPERATORFLOAT_H_
>+
>+class TIntermNode;
>+namespace sh
>+{
>+
>+void RewriteUnaryMinusOperatorFloat(TIntermNode *root);
>+
>+}  // namespace sh
>+
>+#endif  // COMPILER_TRANSLATOR_TREEOPS_REWRITEUNARYMINUSOPERATORFLOAT_H_
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/RewriteUnaryMinusOperatorInt.cpp b/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/RewriteUnaryMinusOperatorInt.cpp
>new file mode 100644
>index 00000000000..5bfdb76e03f
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/RewriteUnaryMinusOperatorInt.cpp
>@@ -0,0 +1,110 @@
>+//
>+// Copyright (c) 2016 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// Implementation of evaluating unary integer variable bug workaround.
>+// See header for more info.
>+
>+#include "compiler/translator/tree_ops/RewriteUnaryMinusOperatorInt.h"
>+
>+#include "compiler/translator/tree_util/IntermTraverse.h"
>+
>+namespace sh
>+{
>+
>+namespace
>+{
>+
>+class Traverser : public TIntermTraverser
>+{
>+  public:
>+    static void Apply(TIntermNode *root);
>+
>+  private:
>+    Traverser();
>+    bool visitUnary(Visit visit, TIntermUnary *node) override;
>+    void nextIteration();
>+
>+    bool mFound = false;
>+};
>+
>+// static
>+void Traverser::Apply(TIntermNode *root)
>+{
>+    Traverser traverser;
>+    do
>+    {
>+        traverser.nextIteration();
>+        root->traverse(&traverser);
>+        if (traverser.mFound)
>+        {
>+            traverser.updateTree();
>+        }
>+    } while (traverser.mFound);
>+}
>+
>+Traverser::Traverser() : TIntermTraverser(true, false, false) {}
>+
>+void Traverser::nextIteration()
>+{
>+    mFound = false;
>+}
>+
>+bool Traverser::visitUnary(Visit visit, TIntermUnary *node)
>+{
>+    if (mFound)
>+    {
>+        return false;
>+    }
>+
>+    // Decide if the current unary operator is unary minus.
>+    if (node->getOp() != EOpNegative)
>+    {
>+        return true;
>+    }
>+
>+    // Decide if the current operand is an integer variable.
>+    TIntermTyped *opr = node->getOperand();
>+    if (!opr->getType().isScalarInt())
>+    {
>+        return true;
>+    }
>+
>+    // Potential problem case detected, apply workaround: -(int) -> ~(int) + 1.
>+    // ~(int)
>+    TIntermUnary *bitwiseNot = new TIntermUnary(EOpBitwiseNot, opr, nullptr);
>+    bitwiseNot->setLine(opr->getLine());
>+
>+    // Constant 1 (or 1u)
>+    TConstantUnion *one = new TConstantUnion();
>+    if (opr->getType().getBasicType() == EbtInt)
>+    {
>+        one->setIConst(1);
>+    }
>+    else
>+    {
>+        one->setUConst(1u);
>+    }
>+    TIntermConstantUnion *oneNode =
>+        new TIntermConstantUnion(one, TType(opr->getBasicType(), opr->getPrecision(), EvqConst));
>+    oneNode->setLine(opr->getLine());
>+
>+    // ~(int) + 1
>+    TIntermBinary *add = new TIntermBinary(EOpAdd, bitwiseNot, oneNode);
>+    add->setLine(opr->getLine());
>+
>+    queueReplacement(add, OriginalNode::IS_DROPPED);
>+
>+    mFound = true;
>+    return false;
>+}
>+
>+}  // anonymous namespace
>+
>+void RewriteUnaryMinusOperatorInt(TIntermNode *root)
>+{
>+    Traverser::Apply(root);
>+}
>+
>+}  // namespace sh
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/RewriteUnaryMinusOperatorInt.h b/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/RewriteUnaryMinusOperatorInt.h
>new file mode 100644
>index 00000000000..66192179c41
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/RewriteUnaryMinusOperatorInt.h
>@@ -0,0 +1,20 @@
>+// Copyright (c) 2016 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// This mutating tree traversal works around a bug on evaluating unary
>+// integer variable on Intel D3D driver. It works by rewriting -(int) to
>+// ~(int) + 1 when evaluating unary integer variables.
>+
>+#ifndef COMPILER_TRANSLATOR_TREEOPS_REWRITEUNARYMINUSOPERATORINT_H_
>+#define COMPILER_TRANSLATOR_TREEOPS_REWRITEUNARYMINUSOPERATORINT_H_
>+
>+class TIntermNode;
>+namespace sh
>+{
>+
>+void RewriteUnaryMinusOperatorInt(TIntermNode *root);
>+
>+}  // namespace sh
>+
>+#endif  // COMPILER_TRANSLATOR_TREEOPS_REWRITEUNARYMINUSOPERATORINT_H_
>\ No newline at end of file
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/ScalarizeVecAndMatConstructorArgs.cpp b/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/ScalarizeVecAndMatConstructorArgs.cpp
>new file mode 100644
>index 00000000000..53d34ec5c17
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/ScalarizeVecAndMatConstructorArgs.cpp
>@@ -0,0 +1,226 @@
>+//
>+// Copyright (c) 2002-2014 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// Scalarize vector and matrix constructor args, so that vectors built from components don't have
>+// matrix arguments, and matrices built from components don't have vector arguments. This avoids
>+// driver bugs around vector and matrix constructors.
>+//
>+
>+#include "compiler/translator/tree_ops/ScalarizeVecAndMatConstructorArgs.h"
>+#include "common/debug.h"
>+
>+#include <algorithm>
>+
>+#include "angle_gl.h"
>+#include "common/angleutils.h"
>+#include "compiler/translator/tree_util/IntermNodePatternMatcher.h"
>+#include "compiler/translator/tree_util/IntermNode_util.h"
>+#include "compiler/translator/tree_util/IntermTraverse.h"
>+
>+namespace sh
>+{
>+
>+namespace
>+{
>+
>+TIntermBinary *ConstructVectorIndexBinaryNode(TIntermSymbol *symbolNode, int index)
>+{
>+    return new TIntermBinary(EOpIndexDirect, symbolNode, CreateIndexNode(index));
>+}
>+
>+TIntermBinary *ConstructMatrixIndexBinaryNode(TIntermSymbol *symbolNode, int colIndex, int rowIndex)
>+{
>+    TIntermBinary *colVectorNode = ConstructVectorIndexBinaryNode(symbolNode, colIndex);
>+
>+    return new TIntermBinary(EOpIndexDirect, colVectorNode, CreateIndexNode(rowIndex));
>+}
>+
>+class ScalarizeArgsTraverser : public TIntermTraverser
>+{
>+  public:
>+    ScalarizeArgsTraverser(sh::GLenum shaderType,
>+                           bool fragmentPrecisionHigh,
>+                           TSymbolTable *symbolTable)
>+        : TIntermTraverser(true, false, false, symbolTable),
>+          mShaderType(shaderType),
>+          mFragmentPrecisionHigh(fragmentPrecisionHigh),
>+          mNodesToScalarize(IntermNodePatternMatcher::kScalarizedVecOrMatConstructor)
>+    {}
>+
>+  protected:
>+    bool visitAggregate(Visit visit, TIntermAggregate *node) override;
>+    bool visitBlock(Visit visit, TIntermBlock *node) override;
>+
>+  private:
>+    void scalarizeArgs(TIntermAggregate *aggregate, bool scalarizeVector, bool scalarizeMatrix);
>+
>+    // If we have the following code:
>+    //   mat4 m(0);
>+    //   vec4 v(1, m);
>+    // We will rewrite to:
>+    //   mat4 m(0);
>+    //   mat4 s0 = m;
>+    //   vec4 v(1, s0[0][0], s0[0][1], s0[0][2]);
>+    // This function is to create nodes for "mat4 s0 = m;" and insert it to the code sequence. This
>+    // way the possible side effects of the constructor argument will only be evaluated once.
>+    TVariable *createTempVariable(TIntermTyped *original);
>+
>+    std::vector<TIntermSequence> mBlockStack;
>+
>+    sh::GLenum mShaderType;
>+    bool mFragmentPrecisionHigh;
>+
>+    IntermNodePatternMatcher mNodesToScalarize;
>+};
>+
>+bool ScalarizeArgsTraverser::visitAggregate(Visit visit, TIntermAggregate *node)
>+{
>+    ASSERT(visit == PreVisit);
>+    if (mNodesToScalarize.match(node, getParentNode()))
>+    {
>+        if (node->getType().isVector())
>+        {
>+            scalarizeArgs(node, false, true);
>+        }
>+        else
>+        {
>+            ASSERT(node->getType().isMatrix());
>+            scalarizeArgs(node, true, false);
>+        }
>+    }
>+    return true;
>+}
>+
>+bool ScalarizeArgsTraverser::visitBlock(Visit visit, TIntermBlock *node)
>+{
>+    mBlockStack.push_back(TIntermSequence());
>+    {
>+        for (TIntermNode *child : *node->getSequence())
>+        {
>+            ASSERT(child != nullptr);
>+            child->traverse(this);
>+            mBlockStack.back().push_back(child);
>+        }
>+    }
>+    if (mBlockStack.back().size() > node->getSequence()->size())
>+    {
>+        node->getSequence()->clear();
>+        *(node->getSequence()) = mBlockStack.back();
>+    }
>+    mBlockStack.pop_back();
>+    return false;
>+}
>+
>+void ScalarizeArgsTraverser::scalarizeArgs(TIntermAggregate *aggregate,
>+                                           bool scalarizeVector,
>+                                           bool scalarizeMatrix)
>+{
>+    ASSERT(aggregate);
>+    ASSERT(!aggregate->isArray());
>+    int size                  = static_cast<int>(aggregate->getType().getObjectSize());
>+    TIntermSequence *sequence = aggregate->getSequence();
>+    TIntermSequence originalArgs(*sequence);
>+    sequence->clear();
>+    for (TIntermNode *originalArgNode : originalArgs)
>+    {
>+        ASSERT(size > 0);
>+        TIntermTyped *originalArg = originalArgNode->getAsTyped();
>+        ASSERT(originalArg);
>+        TVariable *argVariable = createTempVariable(originalArg);
>+        if (originalArg->isScalar())
>+        {
>+            sequence->push_back(CreateTempSymbolNode(argVariable));
>+            size--;
>+        }
>+        else if (originalArg->isVector())
>+        {
>+            if (scalarizeVector)
>+            {
>+                int repeat = std::min(size, originalArg->getNominalSize());
>+                size -= repeat;
>+                for (int index = 0; index < repeat; ++index)
>+                {
>+                    TIntermSymbol *symbolNode = CreateTempSymbolNode(argVariable);
>+                    TIntermBinary *newNode    = ConstructVectorIndexBinaryNode(symbolNode, index);
>+                    sequence->push_back(newNode);
>+                }
>+            }
>+            else
>+            {
>+                TIntermSymbol *symbolNode = CreateTempSymbolNode(argVariable);
>+                sequence->push_back(symbolNode);
>+                size -= originalArg->getNominalSize();
>+            }
>+        }
>+        else
>+        {
>+            ASSERT(originalArg->isMatrix());
>+            if (scalarizeMatrix)
>+            {
>+                int colIndex = 0, rowIndex = 0;
>+                int repeat = std::min(size, originalArg->getCols() * originalArg->getRows());
>+                size -= repeat;
>+                while (repeat > 0)
>+                {
>+                    TIntermSymbol *symbolNode = CreateTempSymbolNode(argVariable);
>+                    TIntermBinary *newNode =
>+                        ConstructMatrixIndexBinaryNode(symbolNode, colIndex, rowIndex);
>+                    sequence->push_back(newNode);
>+                    rowIndex++;
>+                    if (rowIndex >= originalArg->getRows())
>+                    {
>+                        rowIndex = 0;
>+                        colIndex++;
>+                    }
>+                    repeat--;
>+                }
>+            }
>+            else
>+            {
>+                TIntermSymbol *symbolNode = CreateTempSymbolNode(argVariable);
>+                sequence->push_back(symbolNode);
>+                size -= originalArg->getCols() * originalArg->getRows();
>+            }
>+        }
>+    }
>+}
>+
>+TVariable *ScalarizeArgsTraverser::createTempVariable(TIntermTyped *original)
>+{
>+    ASSERT(original);
>+
>+    TType *type = new TType(original->getType());
>+    type->setQualifier(EvqTemporary);
>+    if (mShaderType == GL_FRAGMENT_SHADER && type->getBasicType() == EbtFloat &&
>+        type->getPrecision() == EbpUndefined)
>+    {
>+        // We use the highest available precision for the temporary variable
>+        // to avoid computing the actual precision using the rules defined
>+        // in GLSL ES 1.0 Section 4.5.2.
>+        type->setPrecision(mFragmentPrecisionHigh ? EbpHigh : EbpMedium);
>+    }
>+
>+    TVariable *variable = CreateTempVariable(mSymbolTable, type);
>+
>+    ASSERT(mBlockStack.size() > 0);
>+    TIntermSequence &sequence       = mBlockStack.back();
>+    TIntermDeclaration *declaration = CreateTempInitDeclarationNode(variable, original);
>+    sequence.push_back(declaration);
>+
>+    return variable;
>+}
>+
>+}  // namespace
>+
>+void ScalarizeVecAndMatConstructorArgs(TIntermBlock *root,
>+                                       sh::GLenum shaderType,
>+                                       bool fragmentPrecisionHigh,
>+                                       TSymbolTable *symbolTable)
>+{
>+    ScalarizeArgsTraverser scalarizer(shaderType, fragmentPrecisionHigh, symbolTable);
>+    root->traverse(&scalarizer);
>+}
>+
>+}  // namespace sh
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/ScalarizeVecAndMatConstructorArgs.h b/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/ScalarizeVecAndMatConstructorArgs.h
>new file mode 100644
>index 00000000000..e66908de1d9
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/ScalarizeVecAndMatConstructorArgs.h
>@@ -0,0 +1,27 @@
>+//
>+// Copyright (c) 2002-2014 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// Scalarize vector and matrix constructor args, so that vectors built from components don't have
>+// matrix arguments, and matrices built from components don't have vector arguments. This avoids
>+// driver bugs around vector and matrix constructors.
>+//
>+
>+#ifndef COMPILER_TRANSLATOR_TREEOPS_SCALARIZEVECANDMATCONSTRUCTORARGS_H_
>+#define COMPILER_TRANSLATOR_TREEOPS_SCALARIZEVECANDMATCONSTRUCTORARGS_H_
>+
>+#include "GLSLANG/ShaderLang.h"
>+
>+namespace sh
>+{
>+class TIntermBlock;
>+class TSymbolTable;
>+
>+void ScalarizeVecAndMatConstructorArgs(TIntermBlock *root,
>+                                       sh::GLenum shaderType,
>+                                       bool fragmentPrecisionHigh,
>+                                       TSymbolTable *symbolTable);
>+}  // namespace sh
>+
>+#endif  // COMPILER_TRANSLATOR_TREEOPS_SCALARIZEVECANDMATCONSTRUCTORARGS_H_
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/SeparateArrayConstructorStatements.cpp b/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/SeparateArrayConstructorStatements.cpp
>new file mode 100644
>index 00000000000..5b4672bf248
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/SeparateArrayConstructorStatements.cpp
>@@ -0,0 +1,84 @@
>+//
>+// Copyright (c) 2018 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// SeparateArrayConstructorStatements splits statements that are array constructors and drops all of
>+// their constant arguments. For example, a statement like:
>+//   int[2](0, i++);
>+// Will be changed to:
>+//   i++;
>+
>+#include "compiler/translator/tree_ops/SeparateArrayConstructorStatements.h"
>+
>+#include "compiler/translator/tree_util/IntermTraverse.h"
>+
>+namespace sh
>+{
>+
>+namespace
>+{
>+
>+void SplitConstructorArgs(const TIntermSequence &originalArgs, TIntermSequence *argsOut)
>+{
>+    for (TIntermNode *arg : originalArgs)
>+    {
>+        TIntermTyped *argTyped = arg->getAsTyped();
>+        if (argTyped->hasSideEffects())
>+        {
>+            TIntermAggregate *argAggregate = argTyped->getAsAggregate();
>+            if (argTyped->isArray() && argAggregate && argAggregate->isConstructor())
>+            {
>+                SplitConstructorArgs(*argAggregate->getSequence(), argsOut);
>+            }
>+            else
>+            {
>+                argsOut->push_back(argTyped);
>+            }
>+        }
>+    }
>+}
>+
>+class SeparateArrayConstructorStatementsTraverser : public TIntermTraverser
>+{
>+  public:
>+    SeparateArrayConstructorStatementsTraverser();
>+
>+    bool visitAggregate(Visit visit, TIntermAggregate *node) override;
>+};
>+
>+SeparateArrayConstructorStatementsTraverser::SeparateArrayConstructorStatementsTraverser()
>+    : TIntermTraverser(true, false, false)
>+{}
>+
>+bool SeparateArrayConstructorStatementsTraverser::visitAggregate(Visit visit,
>+                                                                 TIntermAggregate *node)
>+{
>+    TIntermBlock *parentAsBlock = getParentNode()->getAsBlock();
>+    if (!parentAsBlock)
>+    {
>+        return false;
>+    }
>+    if (!node->isArray() || !node->isConstructor())
>+    {
>+        return false;
>+    }
>+
>+    TIntermSequence constructorArgs;
>+    SplitConstructorArgs(*node->getSequence(), &constructorArgs);
>+    mMultiReplacements.push_back(
>+        NodeReplaceWithMultipleEntry(parentAsBlock, node, constructorArgs));
>+
>+    return false;
>+}
>+
>+}  // namespace
>+
>+void SeparateArrayConstructorStatements(TIntermBlock *root)
>+{
>+    SeparateArrayConstructorStatementsTraverser traverser;
>+    root->traverse(&traverser);
>+    traverser.updateTree();
>+}
>+
>+}  // namespace sh
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/SeparateArrayConstructorStatements.h b/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/SeparateArrayConstructorStatements.h
>new file mode 100644
>index 00000000000..740ba95aca3
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/SeparateArrayConstructorStatements.h
>@@ -0,0 +1,22 @@
>+//
>+// Copyright (c) 2018 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// SeparateArrayConstructorStatements splits statements that are array constructors and drops all of
>+// their constant arguments. For example, a statement like:
>+//   int[2](0, i++);
>+// Will be changed to:
>+//   i++;
>+
>+#ifndef COMPILER_TRANSLATOR_TREEOPS_SEPARATEARRAYCONSTRUCTORSTATEMENTS_H_
>+#define COMPILER_TRANSLATOR_TREEOPS_SEPARATEARRAYCONSTRUCTORSTATEMENTS_H_
>+
>+namespace sh
>+{
>+class TIntermBlock;
>+
>+void SeparateArrayConstructorStatements(TIntermBlock *root);
>+}  // namespace sh
>+
>+#endif  // COMPILER_TRANSLATOR_TREEOPS_SEPARATEARRAYCONSTRUCTORSTATEMENTS_H_
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/SeparateArrayInitialization.cpp b/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/SeparateArrayInitialization.cpp
>new file mode 100644
>index 00000000000..435ba9d6c47
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/SeparateArrayInitialization.cpp
>@@ -0,0 +1,90 @@
>+//
>+// Copyright (c) 2002-2015 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// The SeparateArrayInitialization function splits each array initialization into a declaration and
>+// an assignment.
>+// Example:
>+//     type[n] a = initializer;
>+// will effectively become
>+//     type[n] a;
>+//     a = initializer;
>+//
>+// Note that if the array is declared as const, the initialization may still be split, making the
>+// AST technically invalid. Because of that this transformation should only be used when subsequent
>+// stages don't care about const qualifiers. However, the initialization will not be split if the
>+// initializer can be written as a HLSL literal.
>+
>+#include "compiler/translator/tree_ops/SeparateArrayInitialization.h"
>+
>+#include "compiler/translator/IntermNode.h"
>+#include "compiler/translator/OutputHLSL.h"
>+
>+namespace sh
>+{
>+
>+namespace
>+{
>+
>+class SeparateArrayInitTraverser : private TIntermTraverser
>+{
>+  public:
>+    static void apply(TIntermNode *root);
>+
>+  private:
>+    SeparateArrayInitTraverser();
>+    bool visitDeclaration(Visit, TIntermDeclaration *node) override;
>+};
>+
>+void SeparateArrayInitTraverser::apply(TIntermNode *root)
>+{
>+    SeparateArrayInitTraverser separateInit;
>+    root->traverse(&separateInit);
>+    separateInit.updateTree();
>+}
>+
>+SeparateArrayInitTraverser::SeparateArrayInitTraverser() : TIntermTraverser(true, false, false) {}
>+
>+bool SeparateArrayInitTraverser::visitDeclaration(Visit, TIntermDeclaration *node)
>+{
>+    TIntermSequence *sequence = node->getSequence();
>+    TIntermBinary *initNode   = sequence->back()->getAsBinaryNode();
>+    if (initNode != nullptr && initNode->getOp() == EOpInitialize)
>+    {
>+        TIntermTyped *initializer = initNode->getRight();
>+        if (initializer->isArray() && !initializer->hasConstantValue())
>+        {
>+            // We rely on that array declarations have been isolated to single declarations.
>+            ASSERT(sequence->size() == 1);
>+            TIntermTyped *symbol      = initNode->getLeft();
>+            TIntermBlock *parentBlock = getParentNode()->getAsBlock();
>+            ASSERT(parentBlock != nullptr);
>+
>+            TIntermSequence replacements;
>+
>+            TIntermDeclaration *replacementDeclaration = new TIntermDeclaration();
>+            replacementDeclaration->appendDeclarator(symbol);
>+            replacementDeclaration->setLine(symbol->getLine());
>+            replacements.push_back(replacementDeclaration);
>+
>+            TIntermBinary *replacementAssignment =
>+                new TIntermBinary(EOpAssign, symbol, initializer);
>+            replacementAssignment->setLine(symbol->getLine());
>+            replacements.push_back(replacementAssignment);
>+
>+            mMultiReplacements.push_back(
>+                NodeReplaceWithMultipleEntry(parentBlock, node, replacements));
>+        }
>+    }
>+    return false;
>+}
>+
>+}  // namespace
>+
>+void SeparateArrayInitialization(TIntermNode *root)
>+{
>+    SeparateArrayInitTraverser::apply(root);
>+}
>+
>+}  // namespace sh
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/SeparateArrayInitialization.h b/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/SeparateArrayInitialization.h
>new file mode 100644
>index 00000000000..a197ff5a86a
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/SeparateArrayInitialization.h
>@@ -0,0 +1,29 @@
>+//
>+// Copyright (c) 2002-2015 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// The SeparateArrayInitialization function splits each array initialization into a declaration and
>+// an assignment.
>+// Example:
>+//     type[n] a = initializer;
>+// will effectively become
>+//     type[n] a;
>+//     a = initializer;
>+//
>+// Note that if the array is declared as const, the initialization may still be split, making the
>+// AST technically invalid. Because of that this transformation should only be used when subsequent
>+// stages don't care about const qualifiers. However, the initialization will not be split if the
>+// initializer can be written as a HLSL literal.
>+
>+#ifndef COMPILER_TRANSLATOR_TREEOPS_SEPARATEARRAYINITIALIZATION_H_
>+#define COMPILER_TRANSLATOR_TREEOPS_SEPARATEARRAYINITIALIZATION_H_
>+
>+namespace sh
>+{
>+class TIntermNode;
>+
>+void SeparateArrayInitialization(TIntermNode *root);
>+}  // namespace sh
>+
>+#endif  // COMPILER_TRANSLATOR_TREEOPS_SEPARATEARRAYINITIALIZATION_H_
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/SeparateDeclarations.cpp b/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/SeparateDeclarations.cpp
>new file mode 100644
>index 00000000000..82011acd8a8
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/SeparateDeclarations.cpp
>@@ -0,0 +1,78 @@
>+//
>+// Copyright (c) 2002-2015 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// The SeparateDeclarations function processes declarations, so that in the end each declaration
>+// contains only one declarator.
>+// This is useful as an intermediate step when initialization needs to be separated from
>+// declaration, or when things need to be unfolded out of the initializer.
>+// Example:
>+//     int a[1] = int[1](1), b[1] = int[1](2);
>+// gets transformed when run through this class into the AST equivalent of:
>+//     int a[1] = int[1](1);
>+//     int b[1] = int[1](2);
>+
>+#include "compiler/translator/tree_ops/SeparateDeclarations.h"
>+
>+#include "compiler/translator/tree_util/IntermTraverse.h"
>+
>+namespace sh
>+{
>+
>+namespace
>+{
>+
>+class SeparateDeclarationsTraverser : private TIntermTraverser
>+{
>+  public:
>+    static void apply(TIntermNode *root);
>+
>+  private:
>+    SeparateDeclarationsTraverser();
>+    bool visitDeclaration(Visit, TIntermDeclaration *node) override;
>+};
>+
>+void SeparateDeclarationsTraverser::apply(TIntermNode *root)
>+{
>+    SeparateDeclarationsTraverser separateDecl;
>+    root->traverse(&separateDecl);
>+    separateDecl.updateTree();
>+}
>+
>+SeparateDeclarationsTraverser::SeparateDeclarationsTraverser()
>+    : TIntermTraverser(true, false, false)
>+{}
>+
>+bool SeparateDeclarationsTraverser::visitDeclaration(Visit, TIntermDeclaration *node)
>+{
>+    TIntermSequence *sequence = node->getSequence();
>+    if (sequence->size() > 1)
>+    {
>+        TIntermBlock *parentBlock = getParentNode()->getAsBlock();
>+        ASSERT(parentBlock != nullptr);
>+
>+        TIntermSequence replacementDeclarations;
>+        for (size_t ii = 0; ii < sequence->size(); ++ii)
>+        {
>+            TIntermDeclaration *replacementDeclaration = new TIntermDeclaration();
>+
>+            replacementDeclaration->appendDeclarator(sequence->at(ii)->getAsTyped());
>+            replacementDeclaration->setLine(sequence->at(ii)->getLine());
>+            replacementDeclarations.push_back(replacementDeclaration);
>+        }
>+
>+        mMultiReplacements.push_back(
>+            NodeReplaceWithMultipleEntry(parentBlock, node, replacementDeclarations));
>+    }
>+    return false;
>+}
>+
>+}  // namespace
>+
>+void SeparateDeclarations(TIntermNode *root)
>+{
>+    SeparateDeclarationsTraverser::apply(root);
>+}
>+
>+}  // namespace sh
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/SeparateDeclarations.h b/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/SeparateDeclarations.h
>new file mode 100644
>index 00000000000..1e7f967be92
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/SeparateDeclarations.h
>@@ -0,0 +1,26 @@
>+//
>+// Copyright (c) 2002-2015 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// The SeparateDeclarations function processes declarations, so that in the end each declaration
>+// contains only one declarator.
>+// This is useful as an intermediate step when initialization needs to be separated from
>+// declaration, or when things need to be unfolded out of the initializer.
>+// Example:
>+//     int a[1] = int[1](1), b[1] = int[1](2);
>+// gets transformed when run through this class into the AST equivalent of:
>+//     int a[1] = int[1](1);
>+//     int b[1] = int[1](2);
>+
>+#ifndef COMPILER_TRANSLATOR_TREEOPS_SEPARATEDECLARATIONS_H_
>+#define COMPILER_TRANSLATOR_TREEOPS_SEPARATEDECLARATIONS_H_
>+
>+namespace sh
>+{
>+class TIntermNode;
>+
>+void SeparateDeclarations(TIntermNode *root);
>+}  // namespace sh
>+
>+#endif  // COMPILER_TRANSLATOR_TREEOPS_SEPARATEDECLARATIONS_H_
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/SeparateExpressionsReturningArrays.cpp b/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/SeparateExpressionsReturningArrays.cpp
>new file mode 100644
>index 00000000000..127e97ebcf7
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/SeparateExpressionsReturningArrays.cpp
>@@ -0,0 +1,129 @@
>+//
>+// Copyright (c) 2002-2015 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// SeparateExpressionsReturningArrays splits array-returning expressions that are not array names
>+// from more complex expressions, assigning them to a temporary variable a#.
>+// Examples where a, b and c are all arrays:
>+// (a = b) == (a = c) is split into a = b; type[n] a1 = a; a = c; type[n] a2 = a; a1 == a2;
>+// type d = type[n](...)[i]; is split into type[n] a1 = type[n](...); type d = a1[i];
>+
>+#include "compiler/translator/tree_ops/SeparateExpressionsReturningArrays.h"
>+
>+#include "compiler/translator/tree_util/IntermNodePatternMatcher.h"
>+#include "compiler/translator/tree_util/IntermNode_util.h"
>+#include "compiler/translator/tree_util/IntermTraverse.h"
>+
>+namespace sh
>+{
>+
>+namespace
>+{
>+
>+// Traverser that separates one array expression into a statement at a time.
>+class SeparateExpressionsTraverser : public TIntermTraverser
>+{
>+  public:
>+    SeparateExpressionsTraverser(TSymbolTable *symbolTable);
>+
>+    bool visitBinary(Visit visit, TIntermBinary *node) override;
>+    bool visitAggregate(Visit visit, TIntermAggregate *node) override;
>+
>+    void nextIteration();
>+    bool foundArrayExpression() const { return mFoundArrayExpression; }
>+
>+  protected:
>+    // Marked to true once an operation that needs to be hoisted out of the expression has been
>+    // found. After that, no more AST updates are performed on that traversal.
>+    bool mFoundArrayExpression;
>+
>+    IntermNodePatternMatcher mPatternToSeparateMatcher;
>+};
>+
>+SeparateExpressionsTraverser::SeparateExpressionsTraverser(TSymbolTable *symbolTable)
>+    : TIntermTraverser(true, false, false, symbolTable),
>+      mFoundArrayExpression(false),
>+      mPatternToSeparateMatcher(IntermNodePatternMatcher::kExpressionReturningArray)
>+{}
>+
>+// Performs a shallow copy of an assignment node.
>+// These shallow copies are useful when a node gets inserted into an aggregate node
>+// and also needs to be replaced in its original location by a different node.
>+TIntermBinary *CopyAssignmentNode(TIntermBinary *node)
>+{
>+    return new TIntermBinary(node->getOp(), node->getLeft(), node->getRight());
>+}
>+
>+bool SeparateExpressionsTraverser::visitBinary(Visit visit, TIntermBinary *node)
>+{
>+    if (mFoundArrayExpression)
>+        return false;
>+
>+    // Return if the expression is not an array or if we're not inside a complex expression.
>+    if (!mPatternToSeparateMatcher.match(node, getParentNode()))
>+        return true;
>+
>+    ASSERT(node->getOp() == EOpAssign);
>+
>+    mFoundArrayExpression = true;
>+
>+    TIntermSequence insertions;
>+    insertions.push_back(CopyAssignmentNode(node));
>+    // TODO(oetuaho): In some cases it would be more optimal to not add the temporary node, but just
>+    // use the original target of the assignment. Care must be taken so that this doesn't happen
>+    // when the same array symbol is a target of assignment more than once in one expression.
>+    TIntermDeclaration *arrayVariableDeclaration;
>+    TVariable *arrayVariable =
>+        DeclareTempVariable(mSymbolTable, node->getLeft(), EvqTemporary, &arrayVariableDeclaration);
>+    insertions.push_back(arrayVariableDeclaration);
>+    insertStatementsInParentBlock(insertions);
>+
>+    queueReplacement(CreateTempSymbolNode(arrayVariable), OriginalNode::IS_DROPPED);
>+
>+    return false;
>+}
>+
>+bool SeparateExpressionsTraverser::visitAggregate(Visit visit, TIntermAggregate *node)
>+{
>+    if (mFoundArrayExpression)
>+        return false;  // No need to traverse further
>+
>+    if (!mPatternToSeparateMatcher.match(node, getParentNode()))
>+        return true;
>+
>+    ASSERT(node->isConstructor() || node->getOp() == EOpCallFunctionInAST);
>+
>+    mFoundArrayExpression = true;
>+
>+    TIntermDeclaration *arrayVariableDeclaration;
>+    TVariable *arrayVariable = DeclareTempVariable(mSymbolTable, node->shallowCopy(), EvqTemporary,
>+                                                   &arrayVariableDeclaration);
>+    insertStatementInParentBlock(arrayVariableDeclaration);
>+
>+    queueReplacement(CreateTempSymbolNode(arrayVariable), OriginalNode::IS_DROPPED);
>+
>+    return false;
>+}
>+
>+void SeparateExpressionsTraverser::nextIteration()
>+{
>+    mFoundArrayExpression = false;
>+}
>+
>+}  // namespace
>+
>+void SeparateExpressionsReturningArrays(TIntermNode *root, TSymbolTable *symbolTable)
>+{
>+    SeparateExpressionsTraverser traverser(symbolTable);
>+    // Separate one expression at a time, and reset the traverser between iterations.
>+    do
>+    {
>+        traverser.nextIteration();
>+        root->traverse(&traverser);
>+        if (traverser.foundArrayExpression())
>+            traverser.updateTree();
>+    } while (traverser.foundArrayExpression());
>+}
>+
>+}  // namespace sh
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/SeparateExpressionsReturningArrays.h b/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/SeparateExpressionsReturningArrays.h
>new file mode 100644
>index 00000000000..9b09f7c61eb
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/SeparateExpressionsReturningArrays.h
>@@ -0,0 +1,23 @@
>+//
>+// Copyright (c) 2002-2015 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// SeparateExpressionsReturningArrays splits array-returning expressions that are not array names
>+// from more complex expressions, assigning them to a temporary variable a#.
>+// Examples where a, b and c are all arrays:
>+// (a = b) == (a = c) is split into a = b; type[n] a1 = a; a = c; type[n] a2 = a; a1 == a2;
>+// type d = type[n](...)[i]; is split into type[n] a1 = type[n](...); type d = a1[i];
>+
>+#ifndef COMPILER_TRANSLATOR_TREEOPS_SEPARATEEXPRESSIONSRETURNINGARRAYS_H_
>+#define COMPILER_TRANSLATOR_TREEOPS_SEPARATEEXPRESSIONSRETURNINGARRAYS_H_
>+
>+namespace sh
>+{
>+class TIntermNode;
>+class TSymbolTable;
>+
>+void SeparateExpressionsReturningArrays(TIntermNode *root, TSymbolTable *symbolTable);
>+}  // namespace sh
>+
>+#endif  // COMPILER_TRANSLATOR_TREEOPS_SEPARATEEXPRESSIONSRETURNINGARRAYS_H_
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/SimplifyLoopConditions.cpp b/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/SimplifyLoopConditions.cpp
>new file mode 100644
>index 00000000000..35d3c33f347
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/SimplifyLoopConditions.cpp
>@@ -0,0 +1,299 @@
>+//
>+// Copyright (c) 2016 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// SimplifyLoopConditions is an AST traverser that converts loop conditions and loop expressions
>+// to regular statements inside the loop. This way further transformations that generate statements
>+// from loop conditions and loop expressions work correctly.
>+//
>+
>+#include "compiler/translator/tree_ops/SimplifyLoopConditions.h"
>+
>+#include "compiler/translator/StaticType.h"
>+#include "compiler/translator/tree_util/IntermNodePatternMatcher.h"
>+#include "compiler/translator/tree_util/IntermNode_util.h"
>+#include "compiler/translator/tree_util/IntermTraverse.h"
>+
>+namespace sh
>+{
>+
>+namespace
>+{
>+
>+class SimplifyLoopConditionsTraverser : public TLValueTrackingTraverser
>+{
>+  public:
>+    SimplifyLoopConditionsTraverser(unsigned int conditionsToSimplifyMask,
>+                                    TSymbolTable *symbolTable);
>+
>+    void traverseLoop(TIntermLoop *node) override;
>+
>+    bool visitUnary(Visit visit, TIntermUnary *node) override;
>+    bool visitBinary(Visit visit, TIntermBinary *node) override;
>+    bool visitAggregate(Visit visit, TIntermAggregate *node) override;
>+    bool visitTernary(Visit visit, TIntermTernary *node) override;
>+    bool visitDeclaration(Visit visit, TIntermDeclaration *node) override;
>+
>+    bool foundLoopToChange() const { return mFoundLoopToChange; }
>+
>+  protected:
>+    // Marked to true once an operation that needs to be hoisted out of a loop expression has been
>+    // found.
>+    bool mFoundLoopToChange;
>+    bool mInsideLoopInitConditionOrExpression;
>+    IntermNodePatternMatcher mConditionsToSimplify;
>+};
>+
>+SimplifyLoopConditionsTraverser::SimplifyLoopConditionsTraverser(
>+    unsigned int conditionsToSimplifyMask,
>+    TSymbolTable *symbolTable)
>+    : TLValueTrackingTraverser(true, false, false, symbolTable),
>+      mFoundLoopToChange(false),
>+      mInsideLoopInitConditionOrExpression(false),
>+      mConditionsToSimplify(conditionsToSimplifyMask)
>+{}
>+
>+// If we're inside a loop initialization, condition, or expression, we check for expressions that
>+// should be moved out of the loop condition or expression. If one is found, the loop is
>+// transformed.
>+// If we're not inside loop initialization, condition, or expression, we only need to traverse nodes
>+// that may contain loops.
>+
>+bool SimplifyLoopConditionsTraverser::visitUnary(Visit visit, TIntermUnary *node)
>+{
>+    if (!mInsideLoopInitConditionOrExpression)
>+        return false;
>+
>+    if (mFoundLoopToChange)
>+        return false;  // Already decided to change this loop.
>+
>+    mFoundLoopToChange = mConditionsToSimplify.match(node);
>+    return !mFoundLoopToChange;
>+}
>+
>+bool SimplifyLoopConditionsTraverser::visitBinary(Visit visit, TIntermBinary *node)
>+{
>+    if (!mInsideLoopInitConditionOrExpression)
>+        return false;
>+
>+    if (mFoundLoopToChange)
>+        return false;  // Already decided to change this loop.
>+
>+    mFoundLoopToChange = mConditionsToSimplify.match(node, getParentNode(), isLValueRequiredHere());
>+    return !mFoundLoopToChange;
>+}
>+
>+bool SimplifyLoopConditionsTraverser::visitAggregate(Visit visit, TIntermAggregate *node)
>+{
>+    if (!mInsideLoopInitConditionOrExpression)
>+        return false;
>+
>+    if (mFoundLoopToChange)
>+        return false;  // Already decided to change this loop.
>+
>+    mFoundLoopToChange = mConditionsToSimplify.match(node, getParentNode());
>+    return !mFoundLoopToChange;
>+}
>+
>+bool SimplifyLoopConditionsTraverser::visitTernary(Visit visit, TIntermTernary *node)
>+{
>+    if (!mInsideLoopInitConditionOrExpression)
>+        return false;
>+
>+    if (mFoundLoopToChange)
>+        return false;  // Already decided to change this loop.
>+
>+    mFoundLoopToChange = mConditionsToSimplify.match(node);
>+    return !mFoundLoopToChange;
>+}
>+
>+bool SimplifyLoopConditionsTraverser::visitDeclaration(Visit visit, TIntermDeclaration *node)
>+{
>+    if (!mInsideLoopInitConditionOrExpression)
>+        return false;
>+
>+    if (mFoundLoopToChange)
>+        return false;  // Already decided to change this loop.
>+
>+    mFoundLoopToChange = mConditionsToSimplify.match(node);
>+    return !mFoundLoopToChange;
>+}
>+
>+void SimplifyLoopConditionsTraverser::traverseLoop(TIntermLoop *node)
>+{
>+    // Mark that we're inside a loop condition or expression, and determine if the loop needs to be
>+    // transformed.
>+
>+    ScopedNodeInTraversalPath addToPath(this, node);
>+
>+    mInsideLoopInitConditionOrExpression = true;
>+    mFoundLoopToChange                   = false;
>+
>+    if (!mFoundLoopToChange && node->getInit())
>+    {
>+        node->getInit()->traverse(this);
>+    }
>+
>+    if (!mFoundLoopToChange && node->getCondition())
>+    {
>+        node->getCondition()->traverse(this);
>+    }
>+
>+    if (!mFoundLoopToChange && node->getExpression())
>+    {
>+        node->getExpression()->traverse(this);
>+    }
>+
>+    mInsideLoopInitConditionOrExpression = false;
>+
>+    if (mFoundLoopToChange)
>+    {
>+        const TType *boolType        = StaticType::Get<EbtBool, EbpUndefined, EvqTemporary, 1, 1>();
>+        TVariable *conditionVariable = CreateTempVariable(mSymbolTable, boolType);
>+
>+        // Replace the loop condition with a boolean variable that's updated on each iteration.
>+        TLoopType loopType = node->getType();
>+        if (loopType == ELoopWhile)
>+        {
>+            // Transform:
>+            //   while (expr) { body; }
>+            // into
>+            //   bool s0 = expr;
>+            //   while (s0) { { body; } s0 = expr; }
>+            TIntermDeclaration *tempInitDeclaration =
>+                CreateTempInitDeclarationNode(conditionVariable, node->getCondition()->deepCopy());
>+            insertStatementInParentBlock(tempInitDeclaration);
>+
>+            TIntermBlock *newBody = new TIntermBlock();
>+            if (node->getBody())
>+            {
>+                newBody->getSequence()->push_back(node->getBody());
>+            }
>+            newBody->getSequence()->push_back(
>+                CreateTempAssignmentNode(conditionVariable, node->getCondition()->deepCopy()));
>+
>+            // Can't use queueReplacement to replace old body, since it may have been nullptr.
>+            // It's safe to do the replacements in place here - the new body will still be
>+            // traversed, but that won't create any problems.
>+            node->setBody(newBody);
>+            node->setCondition(CreateTempSymbolNode(conditionVariable));
>+        }
>+        else if (loopType == ELoopDoWhile)
>+        {
>+            // Transform:
>+            //   do {
>+            //     body;
>+            //   } while (expr);
>+            // into
>+            //   bool s0 = true;
>+            //   do {
>+            //     { body; }
>+            //     s0 = expr;
>+            //   } while (s0);
>+            TIntermDeclaration *tempInitDeclaration =
>+                CreateTempInitDeclarationNode(conditionVariable, CreateBoolNode(true));
>+            insertStatementInParentBlock(tempInitDeclaration);
>+
>+            TIntermBlock *newBody = new TIntermBlock();
>+            if (node->getBody())
>+            {
>+                newBody->getSequence()->push_back(node->getBody());
>+            }
>+            newBody->getSequence()->push_back(
>+                CreateTempAssignmentNode(conditionVariable, node->getCondition()->deepCopy()));
>+
>+            // Can't use queueReplacement to replace old body, since it may have been nullptr.
>+            // It's safe to do the replacements in place here - the new body will still be
>+            // traversed, but that won't create any problems.
>+            node->setBody(newBody);
>+            node->setCondition(CreateTempSymbolNode(conditionVariable));
>+        }
>+        else if (loopType == ELoopFor)
>+        {
>+            // Move the loop condition inside the loop.
>+            // Transform:
>+            //   for (init; expr; exprB) { body; }
>+            // into
>+            //   {
>+            //     init;
>+            //     bool s0 = expr;
>+            //     while (s0) {
>+            //       { body; }
>+            //       exprB;
>+            //       s0 = expr;
>+            //     }
>+            //   }
>+            TIntermBlock *loopScope            = new TIntermBlock();
>+            TIntermSequence *loopScopeSequence = loopScope->getSequence();
>+
>+            // Insert "init;"
>+            if (node->getInit())
>+            {
>+                loopScopeSequence->push_back(node->getInit());
>+            }
>+
>+            // Insert "bool s0 = expr;" if applicable, "bool s0 = true;" otherwise
>+            TIntermTyped *conditionInitializer = nullptr;
>+            if (node->getCondition())
>+            {
>+                conditionInitializer = node->getCondition()->deepCopy();
>+            }
>+            else
>+            {
>+                conditionInitializer = CreateBoolNode(true);
>+            }
>+            loopScopeSequence->push_back(
>+                CreateTempInitDeclarationNode(conditionVariable, conditionInitializer));
>+
>+            // Insert "{ body; }" in the while loop
>+            TIntermBlock *whileLoopBody = new TIntermBlock();
>+            if (node->getBody())
>+            {
>+                whileLoopBody->getSequence()->push_back(node->getBody());
>+            }
>+            // Insert "exprB;" in the while loop
>+            if (node->getExpression())
>+            {
>+                whileLoopBody->getSequence()->push_back(node->getExpression());
>+            }
>+            // Insert "s0 = expr;" in the while loop
>+            if (node->getCondition())
>+            {
>+                whileLoopBody->getSequence()->push_back(
>+                    CreateTempAssignmentNode(conditionVariable, node->getCondition()->deepCopy()));
>+            }
>+
>+            // Create "while(s0) { whileLoopBody }"
>+            TIntermLoop *whileLoop =
>+                new TIntermLoop(ELoopWhile, nullptr, CreateTempSymbolNode(conditionVariable),
>+                                nullptr, whileLoopBody);
>+            loopScope->getSequence()->push_back(whileLoop);
>+            queueReplacement(loopScope, OriginalNode::IS_DROPPED);
>+
>+            // After this the old body node will be traversed and loops inside it may be
>+            // transformed. This is fine, since the old body node will still be in the AST after the
>+            // transformation that's queued here, and transforming loops inside it doesn't need to
>+            // know the exact post-transform path to it.
>+        }
>+    }
>+
>+    mFoundLoopToChange = false;
>+
>+    // We traverse the body of the loop even if the loop is transformed.
>+    if (node->getBody())
>+        node->getBody()->traverse(this);
>+}
>+
>+}  // namespace
>+
>+void SimplifyLoopConditions(TIntermNode *root,
>+                            unsigned int conditionsToSimplifyMask,
>+                            TSymbolTable *symbolTable)
>+{
>+    SimplifyLoopConditionsTraverser traverser(conditionsToSimplifyMask, symbolTable);
>+    root->traverse(&traverser);
>+    traverser.updateTree();
>+}
>+
>+}  // namespace sh
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/SimplifyLoopConditions.h b/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/SimplifyLoopConditions.h
>new file mode 100644
>index 00000000000..15265bb5775
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/SimplifyLoopConditions.h
>@@ -0,0 +1,24 @@
>+//
>+// Copyright (c) 2016 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// SimplifyLoopConditions is an AST traverser that converts loop conditions and loop expressions
>+// to regular statements inside the loop. This way further transformations that generate statements
>+// from loop conditions and loop expressions work correctly.
>+//
>+
>+#ifndef COMPILER_TRANSLATOR_TREEOPS_SIMPLIFYLOOPCONDITIONS_H_
>+#define COMPILER_TRANSLATOR_TREEOPS_SIMPLIFYLOOPCONDITIONS_H_
>+
>+namespace sh
>+{
>+class TIntermNode;
>+class TSymbolTable;
>+
>+void SimplifyLoopConditions(TIntermNode *root,
>+                            unsigned int conditionsToSimplify,
>+                            TSymbolTable *symbolTable);
>+}  // namespace sh
>+
>+#endif  // COMPILER_TRANSLATOR_TREEOPS_SIMPLIFYLOOPCONDITIONS_H_
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/SplitSequenceOperator.cpp b/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/SplitSequenceOperator.cpp
>new file mode 100644
>index 00000000000..72804946faa
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/SplitSequenceOperator.cpp
>@@ -0,0 +1,163 @@
>+//
>+// Copyright (c) 2016 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// SplitSequenceOperator is an AST traverser that detects sequence operator expressions that
>+// go through further AST transformations that generate statements, and splits them so that
>+// possible side effects of earlier parts of the sequence operator expression are guaranteed to be
>+// evaluated before the latter parts of the sequence operator expression are evaluated.
>+//
>+
>+#include "compiler/translator/tree_ops/SplitSequenceOperator.h"
>+
>+#include "compiler/translator/tree_util/IntermNodePatternMatcher.h"
>+#include "compiler/translator/tree_util/IntermTraverse.h"
>+
>+namespace sh
>+{
>+
>+namespace
>+{
>+
>+class SplitSequenceOperatorTraverser : public TLValueTrackingTraverser
>+{
>+  public:
>+    SplitSequenceOperatorTraverser(unsigned int patternsToSplitMask, TSymbolTable *symbolTable);
>+
>+    bool visitUnary(Visit visit, TIntermUnary *node) override;
>+    bool visitBinary(Visit visit, TIntermBinary *node) override;
>+    bool visitAggregate(Visit visit, TIntermAggregate *node) override;
>+    bool visitTernary(Visit visit, TIntermTernary *node) override;
>+
>+    void nextIteration();
>+    bool foundExpressionToSplit() const { return mFoundExpressionToSplit; }
>+
>+  protected:
>+    // Marked to true once an operation that needs to be hoisted out of the expression has been
>+    // found. After that, no more AST updates are performed on that traversal.
>+    bool mFoundExpressionToSplit;
>+    int mInsideSequenceOperator;
>+
>+    IntermNodePatternMatcher mPatternToSplitMatcher;
>+};
>+
>+SplitSequenceOperatorTraverser::SplitSequenceOperatorTraverser(unsigned int patternsToSplitMask,
>+                                                               TSymbolTable *symbolTable)
>+    : TLValueTrackingTraverser(true, false, true, symbolTable),
>+      mFoundExpressionToSplit(false),
>+      mInsideSequenceOperator(0),
>+      mPatternToSplitMatcher(patternsToSplitMask)
>+{}
>+
>+void SplitSequenceOperatorTraverser::nextIteration()
>+{
>+    mFoundExpressionToSplit = false;
>+    mInsideSequenceOperator = 0;
>+}
>+
>+bool SplitSequenceOperatorTraverser::visitAggregate(Visit visit, TIntermAggregate *node)
>+{
>+    if (mFoundExpressionToSplit)
>+        return false;
>+
>+    if (mInsideSequenceOperator > 0 && visit == PreVisit)
>+    {
>+        // Detect expressions that need to be simplified
>+        mFoundExpressionToSplit = mPatternToSplitMatcher.match(node, getParentNode());
>+        return !mFoundExpressionToSplit;
>+    }
>+
>+    return true;
>+}
>+
>+bool SplitSequenceOperatorTraverser::visitUnary(Visit visit, TIntermUnary *node)
>+{
>+    if (mFoundExpressionToSplit)
>+        return false;
>+
>+    if (mInsideSequenceOperator > 0 && visit == PreVisit)
>+    {
>+        // Detect expressions that need to be simplified
>+        mFoundExpressionToSplit = mPatternToSplitMatcher.match(node);
>+        return !mFoundExpressionToSplit;
>+    }
>+
>+    return true;
>+}
>+
>+bool SplitSequenceOperatorTraverser::visitBinary(Visit visit, TIntermBinary *node)
>+{
>+    if (node->getOp() == EOpComma)
>+    {
>+        if (visit == PreVisit)
>+        {
>+            if (mFoundExpressionToSplit)
>+            {
>+                return false;
>+            }
>+            mInsideSequenceOperator++;
>+        }
>+        else if (visit == PostVisit)
>+        {
>+            // Split sequence operators starting from the outermost one to preserve correct
>+            // execution order.
>+            if (mFoundExpressionToSplit && mInsideSequenceOperator == 1)
>+            {
>+                // Move the left side operand into a separate statement in the parent block.
>+                TIntermSequence insertions;
>+                insertions.push_back(node->getLeft());
>+                insertStatementsInParentBlock(insertions);
>+                // Replace the comma node with its right side operand.
>+                queueReplacement(node->getRight(), OriginalNode::IS_DROPPED);
>+            }
>+            mInsideSequenceOperator--;
>+        }
>+        return true;
>+    }
>+
>+    if (mFoundExpressionToSplit)
>+        return false;
>+
>+    if (mInsideSequenceOperator > 0 && visit == PreVisit)
>+    {
>+        // Detect expressions that need to be simplified
>+        mFoundExpressionToSplit =
>+            mPatternToSplitMatcher.match(node, getParentNode(), isLValueRequiredHere());
>+        return !mFoundExpressionToSplit;
>+    }
>+
>+    return true;
>+}
>+
>+bool SplitSequenceOperatorTraverser::visitTernary(Visit visit, TIntermTernary *node)
>+{
>+    if (mFoundExpressionToSplit)
>+        return false;
>+
>+    if (mInsideSequenceOperator > 0 && visit == PreVisit)
>+    {
>+        // Detect expressions that need to be simplified
>+        mFoundExpressionToSplit = mPatternToSplitMatcher.match(node);
>+        return !mFoundExpressionToSplit;
>+    }
>+
>+    return true;
>+}
>+
>+}  // namespace
>+
>+void SplitSequenceOperator(TIntermNode *root, int patternsToSplitMask, TSymbolTable *symbolTable)
>+{
>+    SplitSequenceOperatorTraverser traverser(patternsToSplitMask, symbolTable);
>+    // Separate one expression at a time, and reset the traverser between iterations.
>+    do
>+    {
>+        traverser.nextIteration();
>+        root->traverse(&traverser);
>+        if (traverser.foundExpressionToSplit())
>+            traverser.updateTree();
>+    } while (traverser.foundExpressionToSplit());
>+}
>+
>+}  // namespace sh
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/SplitSequenceOperator.h b/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/SplitSequenceOperator.h
>new file mode 100644
>index 00000000000..fc341c968e6
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/SplitSequenceOperator.h
>@@ -0,0 +1,25 @@
>+//
>+// Copyright (c) 2016 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// SplitSequenceOperator is an AST traverser that detects sequence operator expressions that
>+// go through further AST transformations that generate statements, and splits them so that
>+// possible side effects of earlier parts of the sequence operator expression are guaranteed to be
>+// evaluated before the latter parts of the sequence operator expression are evaluated.
>+//
>+
>+#ifndef COMPILER_TRANSLATOR_TREEOPS_SPLITSEQUENCEOPERATOR_H_
>+#define COMPILER_TRANSLATOR_TREEOPS_SPLITSEQUENCEOPERATOR_H_
>+
>+namespace sh
>+{
>+
>+class TIntermNode;
>+class TSymbolTable;
>+
>+void SplitSequenceOperator(TIntermNode *root, int patternsToSplitMask, TSymbolTable *symbolTable);
>+
>+}  // namespace sh
>+
>+#endif  // COMPILER_TRANSLATOR_TREEOPS_SPLITSEQUENCEOPERATOR_H_
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/UnfoldShortCircuitAST.cpp b/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/UnfoldShortCircuitAST.cpp
>new file mode 100644
>index 00000000000..e408714fdeb
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/UnfoldShortCircuitAST.cpp
>@@ -0,0 +1,74 @@
>+//
>+// Copyright (c) 2002-2013 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+
>+#include "compiler/translator/tree_ops/UnfoldShortCircuitAST.h"
>+
>+#include "compiler/translator/IntermNode.h"
>+#include "compiler/translator/tree_util/IntermNode_util.h"
>+#include "compiler/translator/tree_util/IntermTraverse.h"
>+
>+namespace sh
>+{
>+
>+namespace
>+{
>+
>+// "x || y" is equivalent to "x ? true : y".
>+TIntermTernary *UnfoldOR(TIntermTyped *x, TIntermTyped *y)
>+{
>+    return new TIntermTernary(x, CreateBoolNode(true), y);
>+}
>+
>+// "x && y" is equivalent to "x ? y : false".
>+TIntermTernary *UnfoldAND(TIntermTyped *x, TIntermTyped *y)
>+{
>+    return new TIntermTernary(x, y, CreateBoolNode(false));
>+}
>+
>+// This traverser identifies all the short circuit binary  nodes that need to
>+// be replaced, and creates the corresponding replacement nodes. However,
>+// the actual replacements happen after the traverse through updateTree().
>+
>+class UnfoldShortCircuitASTTraverser : public TIntermTraverser
>+{
>+  public:
>+    UnfoldShortCircuitASTTraverser() : TIntermTraverser(true, false, false) {}
>+
>+    bool visitBinary(Visit visit, TIntermBinary *) override;
>+};
>+
>+bool UnfoldShortCircuitASTTraverser::visitBinary(Visit visit, TIntermBinary *node)
>+{
>+    TIntermTernary *replacement = nullptr;
>+
>+    switch (node->getOp())
>+    {
>+        case EOpLogicalOr:
>+            replacement = UnfoldOR(node->getLeft(), node->getRight());
>+            break;
>+        case EOpLogicalAnd:
>+            replacement = UnfoldAND(node->getLeft(), node->getRight());
>+            break;
>+        default:
>+            break;
>+    }
>+    if (replacement)
>+    {
>+        queueReplacement(replacement, OriginalNode::IS_DROPPED);
>+    }
>+    return true;
>+}
>+
>+}  // anonymous namespace
>+
>+void UnfoldShortCircuitAST(TIntermBlock *root)
>+{
>+    UnfoldShortCircuitASTTraverser traverser;
>+    root->traverse(&traverser);
>+    traverser.updateTree();
>+}
>+
>+}  // namespace sh
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/UnfoldShortCircuitAST.h b/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/UnfoldShortCircuitAST.h
>new file mode 100644
>index 00000000000..7f492a9ca06
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/UnfoldShortCircuitAST.h
>@@ -0,0 +1,22 @@
>+//
>+// Copyright (c) 2002-2013 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// UnfoldShortCircuitAST is an AST traverser to replace short-circuiting
>+// operations with ternary operations.
>+//
>+
>+#ifndef COMPILER_TRANSLATOR_TREEOPS_UNFOLDSHORTCIRCUITAST_H_
>+#define COMPILER_TRANSLATOR_TREEOPS_UNFOLDSHORTCIRCUITAST_H_
>+
>+namespace sh
>+{
>+
>+class TIntermBlock;
>+
>+void UnfoldShortCircuitAST(TIntermBlock *root);
>+
>+}  // namespace sh
>+
>+#endif  // COMPILER_TRANSLATOR_TREEOPS_UNFOLDSHORTCIRCUITAST_H_
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/UnfoldShortCircuitToIf.cpp b/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/UnfoldShortCircuitToIf.cpp
>new file mode 100644
>index 00000000000..4a86c047665
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/UnfoldShortCircuitToIf.cpp
>@@ -0,0 +1,193 @@
>+//
>+// Copyright (c) 2002-2013 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// UnfoldShortCircuitToIf is an AST traverser to convert short-circuiting operators to if-else
>+// statements.
>+// The results are assigned to s# temporaries, which are used by the main translator instead of
>+// the original expression.
>+//
>+
>+#include "compiler/translator/tree_ops/UnfoldShortCircuitToIf.h"
>+
>+#include "compiler/translator/StaticType.h"
>+#include "compiler/translator/tree_util/IntermNodePatternMatcher.h"
>+#include "compiler/translator/tree_util/IntermNode_util.h"
>+#include "compiler/translator/tree_util/IntermTraverse.h"
>+
>+namespace sh
>+{
>+
>+namespace
>+{
>+
>+// Traverser that unfolds one short-circuiting operation at a time.
>+class UnfoldShortCircuitTraverser : public TIntermTraverser
>+{
>+  public:
>+    UnfoldShortCircuitTraverser(TSymbolTable *symbolTable);
>+
>+    bool visitBinary(Visit visit, TIntermBinary *node) override;
>+    bool visitTernary(Visit visit, TIntermTernary *node) override;
>+
>+    void nextIteration();
>+    bool foundShortCircuit() const { return mFoundShortCircuit; }
>+
>+  protected:
>+    // Marked to true once an operation that needs to be unfolded has been found.
>+    // After that, no more unfolding is performed on that traversal.
>+    bool mFoundShortCircuit;
>+
>+    IntermNodePatternMatcher mPatternToUnfoldMatcher;
>+};
>+
>+UnfoldShortCircuitTraverser::UnfoldShortCircuitTraverser(TSymbolTable *symbolTable)
>+    : TIntermTraverser(true, false, true, symbolTable),
>+      mFoundShortCircuit(false),
>+      mPatternToUnfoldMatcher(IntermNodePatternMatcher::kUnfoldedShortCircuitExpression)
>+{}
>+
>+bool UnfoldShortCircuitTraverser::visitBinary(Visit visit, TIntermBinary *node)
>+{
>+    if (mFoundShortCircuit)
>+        return false;
>+
>+    if (visit != PreVisit)
>+        return true;
>+
>+    if (!mPatternToUnfoldMatcher.match(node, getParentNode()))
>+        return true;
>+
>+    // If our right node doesn't have side effects, we know we don't need to unfold this
>+    // expression: there will be no short-circuiting side effects to avoid
>+    // (note: unfolding doesn't depend on the left node -- it will always be evaluated)
>+    ASSERT(node->getRight()->hasSideEffects());
>+
>+    mFoundShortCircuit = true;
>+
>+    switch (node->getOp())
>+    {
>+        case EOpLogicalOr:
>+        {
>+            // "x || y" is equivalent to "x ? true : y", which unfolds to "bool s; if(x) s = true;
>+            // else s = y;",
>+            // and then further simplifies down to "bool s = x; if(!s) s = y;".
>+
>+            TIntermSequence insertions;
>+            const TType *boolType = StaticType::Get<EbtBool, EbpUndefined, EvqTemporary, 1, 1>();
>+            TVariable *resultVariable = CreateTempVariable(mSymbolTable, boolType);
>+
>+            ASSERT(node->getLeft()->getType() == *boolType);
>+            insertions.push_back(CreateTempInitDeclarationNode(resultVariable, node->getLeft()));
>+
>+            TIntermBlock *assignRightBlock = new TIntermBlock();
>+            ASSERT(node->getRight()->getType() == *boolType);
>+            assignRightBlock->getSequence()->push_back(
>+                CreateTempAssignmentNode(resultVariable, node->getRight()));
>+
>+            TIntermUnary *notTempSymbol =
>+                new TIntermUnary(EOpLogicalNot, CreateTempSymbolNode(resultVariable), nullptr);
>+            TIntermIfElse *ifNode = new TIntermIfElse(notTempSymbol, assignRightBlock, nullptr);
>+            insertions.push_back(ifNode);
>+
>+            insertStatementsInParentBlock(insertions);
>+
>+            queueReplacement(CreateTempSymbolNode(resultVariable), OriginalNode::IS_DROPPED);
>+            return false;
>+        }
>+        case EOpLogicalAnd:
>+        {
>+            // "x && y" is equivalent to "x ? y : false", which unfolds to "bool s; if(x) s = y;
>+            // else s = false;",
>+            // and then further simplifies down to "bool s = x; if(s) s = y;".
>+            TIntermSequence insertions;
>+            const TType *boolType = StaticType::Get<EbtBool, EbpUndefined, EvqTemporary, 1, 1>();
>+            TVariable *resultVariable = CreateTempVariable(mSymbolTable, boolType);
>+
>+            ASSERT(node->getLeft()->getType() == *boolType);
>+            insertions.push_back(CreateTempInitDeclarationNode(resultVariable, node->getLeft()));
>+
>+            TIntermBlock *assignRightBlock = new TIntermBlock();
>+            ASSERT(node->getRight()->getType() == *boolType);
>+            assignRightBlock->getSequence()->push_back(
>+                CreateTempAssignmentNode(resultVariable, node->getRight()));
>+
>+            TIntermIfElse *ifNode =
>+                new TIntermIfElse(CreateTempSymbolNode(resultVariable), assignRightBlock, nullptr);
>+            insertions.push_back(ifNode);
>+
>+            insertStatementsInParentBlock(insertions);
>+
>+            queueReplacement(CreateTempSymbolNode(resultVariable), OriginalNode::IS_DROPPED);
>+            return false;
>+        }
>+        default:
>+            UNREACHABLE();
>+            return true;
>+    }
>+}
>+
>+bool UnfoldShortCircuitTraverser::visitTernary(Visit visit, TIntermTernary *node)
>+{
>+    if (mFoundShortCircuit)
>+        return false;
>+
>+    if (visit != PreVisit)
>+        return true;
>+
>+    if (!mPatternToUnfoldMatcher.match(node))
>+        return true;
>+
>+    mFoundShortCircuit = true;
>+
>+    // Unfold "b ? x : y" into "type s; if(b) s = x; else s = y;"
>+    TIntermSequence insertions;
>+    TIntermDeclaration *tempDeclaration = nullptr;
>+    TVariable *resultVariable = DeclareTempVariable(mSymbolTable, new TType(node->getType()),
>+                                                    EvqTemporary, &tempDeclaration);
>+    insertions.push_back(tempDeclaration);
>+
>+    TIntermBlock *trueBlock = new TIntermBlock();
>+    TIntermBinary *trueAssignment =
>+        CreateTempAssignmentNode(resultVariable, node->getTrueExpression());
>+    trueBlock->getSequence()->push_back(trueAssignment);
>+
>+    TIntermBlock *falseBlock = new TIntermBlock();
>+    TIntermBinary *falseAssignment =
>+        CreateTempAssignmentNode(resultVariable, node->getFalseExpression());
>+    falseBlock->getSequence()->push_back(falseAssignment);
>+
>+    TIntermIfElse *ifNode =
>+        new TIntermIfElse(node->getCondition()->getAsTyped(), trueBlock, falseBlock);
>+    insertions.push_back(ifNode);
>+
>+    insertStatementsInParentBlock(insertions);
>+
>+    TIntermSymbol *ternaryResult = CreateTempSymbolNode(resultVariable);
>+    queueReplacement(ternaryResult, OriginalNode::IS_DROPPED);
>+
>+    return false;
>+}
>+
>+void UnfoldShortCircuitTraverser::nextIteration()
>+{
>+    mFoundShortCircuit = false;
>+}
>+
>+}  // namespace
>+
>+void UnfoldShortCircuitToIf(TIntermNode *root, TSymbolTable *symbolTable)
>+{
>+    UnfoldShortCircuitTraverser traverser(symbolTable);
>+    // Unfold one operator at a time, and reset the traverser between iterations.
>+    do
>+    {
>+        traverser.nextIteration();
>+        root->traverse(&traverser);
>+        if (traverser.foundShortCircuit())
>+            traverser.updateTree();
>+    } while (traverser.foundShortCircuit());
>+}
>+
>+}  // namespace sh
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/UnfoldShortCircuitToIf.h b/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/UnfoldShortCircuitToIf.h
>new file mode 100644
>index 00000000000..3458cd27f0f
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/UnfoldShortCircuitToIf.h
>@@ -0,0 +1,25 @@
>+//
>+// Copyright (c) 2002-2012 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// UnfoldShortCircuitToIf is an AST traverser to convert short-circuiting operators to if-else
>+// statements.
>+// The results are assigned to s# temporaries, which are used by the main translator instead of
>+// the original expression.
>+//
>+
>+#ifndef COMPILER_TRANSLATOR_TREEOPS_UNFOLDSHORTCIRCUIT_H_
>+#define COMPILER_TRANSLATOR_TREEOPS_UNFOLDSHORTCIRCUIT_H_
>+
>+namespace sh
>+{
>+
>+class TIntermNode;
>+class TSymbolTable;
>+
>+void UnfoldShortCircuitToIf(TIntermNode *root, TSymbolTable *symbolTable);
>+
>+}  // namespace sh
>+
>+#endif  // COMPILER_TRANSLATOR_TREEOPS_UNFOLDSHORTCIRCUIT_H_
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/UseInterfaceBlockFields.cpp b/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/UseInterfaceBlockFields.cpp
>new file mode 100644
>index 00000000000..83a133ca1ff
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/UseInterfaceBlockFields.cpp
>@@ -0,0 +1,104 @@
>+//
>+// Copyright 2016 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+
>+// UseInterfaceBlockFields.cpp: insert statements to reference all members in InterfaceBlock list at
>+// the beginning of main. This is to work around a Mac driver that treats unused standard/shared
>+// uniform blocks as inactive.
>+
>+#include "compiler/translator/tree_ops/UseInterfaceBlockFields.h"
>+
>+#include "compiler/translator/IntermNode.h"
>+#include "compiler/translator/SymbolTable.h"
>+#include "compiler/translator/tree_util/FindMain.h"
>+#include "compiler/translator/tree_util/IntermNode_util.h"
>+#include "compiler/translator/util.h"
>+
>+namespace sh
>+{
>+
>+namespace
>+{
>+
>+void AddNodeUseStatements(TIntermTyped *node, TIntermSequence *sequence)
>+{
>+    if (node->isArray())
>+    {
>+        for (unsigned int i = 0u; i < node->getOutermostArraySize(); ++i)
>+        {
>+            TIntermBinary *element =
>+                new TIntermBinary(EOpIndexDirect, node->deepCopy(), CreateIndexNode(i));
>+            AddNodeUseStatements(element, sequence);
>+        }
>+    }
>+    else
>+    {
>+        sequence->insert(sequence->begin(), node);
>+    }
>+}
>+
>+void AddFieldUseStatements(const ShaderVariable &var,
>+                           TIntermSequence *sequence,
>+                           const TSymbolTable &symbolTable)
>+{
>+    ASSERT(var.name.find_last_of('[') == std::string::npos);
>+    TIntermSymbol *symbol = ReferenceGlobalVariable(ImmutableString(var.name), symbolTable);
>+    AddNodeUseStatements(symbol, sequence);
>+}
>+
>+void InsertUseCode(const InterfaceBlock &block, TIntermTyped *blockNode, TIntermSequence *sequence)
>+{
>+    for (unsigned int i = 0; i < block.fields.size(); ++i)
>+    {
>+        TIntermBinary *element = new TIntermBinary(EOpIndexDirectInterfaceBlock,
>+                                                   blockNode->deepCopy(), CreateIndexNode(i));
>+        sequence->insert(sequence->begin(), element);
>+    }
>+}
>+
>+void InsertUseCode(TIntermSequence *sequence,
>+                   const InterfaceBlockList &blocks,
>+                   const TSymbolTable &symbolTable)
>+{
>+    for (const auto &block : blocks)
>+    {
>+        if (block.instanceName.empty())
>+        {
>+            for (const auto &var : block.fields)
>+            {
>+                AddFieldUseStatements(var, sequence, symbolTable);
>+            }
>+        }
>+        else if (block.arraySize > 0u)
>+        {
>+            TIntermSymbol *arraySymbol =
>+                ReferenceGlobalVariable(ImmutableString(block.instanceName), symbolTable);
>+            for (unsigned int i = 0u; i < block.arraySize; ++i)
>+            {
>+                TIntermBinary *elementSymbol =
>+                    new TIntermBinary(EOpIndexDirect, arraySymbol->deepCopy(), CreateIndexNode(i));
>+                InsertUseCode(block, elementSymbol, sequence);
>+            }
>+        }
>+        else
>+        {
>+            TIntermSymbol *blockSymbol =
>+                ReferenceGlobalVariable(ImmutableString(block.instanceName), symbolTable);
>+            InsertUseCode(block, blockSymbol, sequence);
>+        }
>+    }
>+}
>+
>+}  // namespace
>+
>+void UseInterfaceBlockFields(TIntermBlock *root,
>+                             const InterfaceBlockList &blocks,
>+                             const TSymbolTable &symbolTable)
>+{
>+    TIntermBlock *mainBody = FindMainBody(root);
>+    InsertUseCode(mainBody->getSequence(), blocks, symbolTable);
>+}
>+
>+}  // namespace sh
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/UseInterfaceBlockFields.h b/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/UseInterfaceBlockFields.h
>new file mode 100644
>index 00000000000..37f0ba02201
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/UseInterfaceBlockFields.h
>@@ -0,0 +1,30 @@
>+//
>+// Copyright 2016 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+
>+// UseInterfaceBlockFields.h: insert statements to reference all members in InterfaceBlock list at
>+// the beginning of main. This is to work around a Mac driver that treats unused standard/shared
>+// uniform blocks as inactive.
>+
>+#ifndef COMPILER_TRANSLATOR_TREEOPS_USEINTERFACEBLOCKFIELDS_H_
>+#define COMPILER_TRANSLATOR_TREEOPS_USEINTERFACEBLOCKFIELDS_H_
>+
>+#include <GLSLANG/ShaderLang.h>
>+
>+namespace sh
>+{
>+
>+class TIntermBlock;
>+class TSymbolTable;
>+
>+using InterfaceBlockList = std::vector<sh::InterfaceBlock>;
>+
>+void UseInterfaceBlockFields(TIntermBlock *root,
>+                             const InterfaceBlockList &blocks,
>+                             const TSymbolTable &symbolTable);
>+
>+}  // namespace sh
>+
>+#endif  // COMPILER_TRANSLATOR_TREEOPS_USEINTERFACEBLOCKFIELDS_H_
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/VectorizeVectorScalarArithmetic.cpp b/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/VectorizeVectorScalarArithmetic.cpp
>new file mode 100644
>index 00000000000..221a73592b4
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/VectorizeVectorScalarArithmetic.cpp
>@@ -0,0 +1,287 @@
>+// Copyright (c) 2017 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// VectorizeVectorScalarArithmetic.cpp: Turn some arithmetic operations that operate on a float
>+// vector-scalar pair into vector-vector operations. This is done recursively. Some scalar binary
>+// operations inside vector constructors are also turned into vector operations.
>+//
>+// This is targeted to work around a bug in NVIDIA OpenGL drivers that was reproducible on NVIDIA
>+// driver version 387.92. It works around the most common occurrences of the bug.
>+
>+#include "compiler/translator/tree_ops/VectorizeVectorScalarArithmetic.h"
>+
>+#include <set>
>+
>+#include "compiler/translator/IntermNode.h"
>+#include "compiler/translator/tree_util/IntermNode_util.h"
>+#include "compiler/translator/tree_util/IntermTraverse.h"
>+
>+namespace sh
>+{
>+
>+namespace
>+{
>+
>+class VectorizeVectorScalarArithmeticTraverser : public TIntermTraverser
>+{
>+  public:
>+    VectorizeVectorScalarArithmeticTraverser(TSymbolTable *symbolTable)
>+        : TIntermTraverser(true, false, false, symbolTable), mReplaced(false)
>+    {}
>+
>+    bool didReplaceScalarsWithVectors() { return mReplaced; }
>+    void nextIteration()
>+    {
>+        mReplaced = false;
>+        mModifiedBlocks.clear();
>+    }
>+
>+  protected:
>+    bool visitBinary(Visit visit, TIntermBinary *node) override;
>+    bool visitAggregate(Visit visit, TIntermAggregate *node) override;
>+
>+  private:
>+    // These helpers should only be called from visitAggregate when visiting a constructor.
>+    // argBinary is the only argument of the constructor.
>+    void replaceMathInsideConstructor(TIntermAggregate *node, TIntermBinary *argBinary);
>+    void replaceAssignInsideConstructor(const TIntermAggregate *node,
>+                                        const TIntermBinary *argBinary);
>+
>+    static TIntermTyped *Vectorize(TIntermTyped *node,
>+                                   TType vectorType,
>+                                   TIntermTraverser::OriginalNode *originalNodeFate);
>+
>+    bool mReplaced;
>+    std::set<const TIntermBlock *> mModifiedBlocks;
>+};
>+
>+TIntermTyped *VectorizeVectorScalarArithmeticTraverser::Vectorize(
>+    TIntermTyped *node,
>+    TType vectorType,
>+    TIntermTraverser::OriginalNode *originalNodeFate)
>+{
>+    ASSERT(node->isScalar());
>+    vectorType.setQualifier(EvqTemporary);
>+    TIntermSequence vectorConstructorArgs;
>+    vectorConstructorArgs.push_back(node);
>+    TIntermAggregate *vectorized =
>+        TIntermAggregate::CreateConstructor(vectorType, &vectorConstructorArgs);
>+    TIntermTyped *vectorizedFolded = vectorized->fold(nullptr);
>+    if (originalNodeFate != nullptr)
>+    {
>+        if (vectorizedFolded != vectorized)
>+        {
>+            *originalNodeFate = OriginalNode::IS_DROPPED;
>+        }
>+        else
>+        {
>+            *originalNodeFate = OriginalNode::BECOMES_CHILD;
>+        }
>+    }
>+    return vectorizedFolded;
>+}
>+
>+bool VectorizeVectorScalarArithmeticTraverser::visitBinary(Visit /*visit*/, TIntermBinary *node)
>+{
>+    TIntermTyped *left  = node->getLeft();
>+    TIntermTyped *right = node->getRight();
>+    ASSERT(left);
>+    ASSERT(right);
>+    switch (node->getOp())
>+    {
>+        case EOpAdd:
>+        case EOpAddAssign:
>+            // Only these specific ops are necessary to turn into vector ops.
>+            break;
>+        default:
>+            return true;
>+    }
>+    if (node->getBasicType() != EbtFloat)
>+    {
>+        // Only float ops have reproduced the bug.
>+        return true;
>+    }
>+    if (left->isScalar() && right->isVector())
>+    {
>+        ASSERT(!node->isAssignment());
>+        ASSERT(!right->isArray());
>+        OriginalNode originalNodeFate;
>+        TIntermTyped *leftVectorized = Vectorize(left, right->getType(), &originalNodeFate);
>+        queueReplacementWithParent(node, left, leftVectorized, originalNodeFate);
>+        mReplaced = true;
>+        // Don't replace more nodes in the same subtree on this traversal. However, nodes elsewhere
>+        // in the tree may still be replaced.
>+        return false;
>+    }
>+    else if (left->isVector() && right->isScalar())
>+    {
>+        OriginalNode originalNodeFate;
>+        TIntermTyped *rightVectorized = Vectorize(right, left->getType(), &originalNodeFate);
>+        queueReplacementWithParent(node, right, rightVectorized, originalNodeFate);
>+        mReplaced = true;
>+        // Don't replace more nodes in the same subtree on this traversal. However, nodes elsewhere
>+        // in the tree may still be replaced.
>+        return false;
>+    }
>+    return true;
>+}
>+
>+void VectorizeVectorScalarArithmeticTraverser::replaceMathInsideConstructor(
>+    TIntermAggregate *node,
>+    TIntermBinary *argBinary)
>+{
>+    // Turn:
>+    //   a * b
>+    // into:
>+    //   gvec(a) * gvec(b)
>+
>+    TIntermTyped *left  = argBinary->getLeft();
>+    TIntermTyped *right = argBinary->getRight();
>+    ASSERT(left->isScalar() && right->isScalar());
>+
>+    TType leftVectorizedType = left->getType();
>+    leftVectorizedType.setPrimarySize(static_cast<unsigned char>(node->getType().getNominalSize()));
>+    TIntermTyped *leftVectorized = Vectorize(left, leftVectorizedType, nullptr);
>+    TType rightVectorizedType    = right->getType();
>+    rightVectorizedType.setPrimarySize(
>+        static_cast<unsigned char>(node->getType().getNominalSize()));
>+    TIntermTyped *rightVectorized = Vectorize(right, rightVectorizedType, nullptr);
>+
>+    TIntermBinary *newArg = new TIntermBinary(argBinary->getOp(), leftVectorized, rightVectorized);
>+    queueReplacementWithParent(node, argBinary, newArg, OriginalNode::IS_DROPPED);
>+}
>+
>+void VectorizeVectorScalarArithmeticTraverser::replaceAssignInsideConstructor(
>+    const TIntermAggregate *node,
>+    const TIntermBinary *argBinary)
>+{
>+    // Turn:
>+    //   gvec(a *= b);
>+    // into:
>+    //   // This is inserted into the parent block:
>+    //   gvec s0 = gvec(a);
>+    //
>+    //   // This goes where the gvec constructor used to be:
>+    //   ((s0 *= b, a = s0.x), s0);
>+
>+    TIntermTyped *left  = argBinary->getLeft();
>+    TIntermTyped *right = argBinary->getRight();
>+    ASSERT(left->isScalar() && right->isScalar());
>+    ASSERT(!left->hasSideEffects());
>+
>+    TType vecType = node->getType();
>+    vecType.setQualifier(EvqTemporary);
>+
>+    // gvec s0 = gvec(a);
>+    // s0 is called "tempAssignmentTarget" below.
>+    TIntermTyped *tempAssignmentTargetInitializer = Vectorize(left->deepCopy(), vecType, nullptr);
>+    TIntermDeclaration *tempAssignmentTargetDeclaration = nullptr;
>+    TVariable *tempAssignmentTarget =
>+        DeclareTempVariable(mSymbolTable, tempAssignmentTargetInitializer, EvqTemporary,
>+                            &tempAssignmentTargetDeclaration);
>+
>+    // s0 *= b
>+    TOperator compoundAssignmentOp = argBinary->getOp();
>+    if (compoundAssignmentOp == EOpMulAssign)
>+    {
>+        compoundAssignmentOp = EOpVectorTimesScalarAssign;
>+    }
>+    TIntermBinary *replacementCompoundAssignment = new TIntermBinary(
>+        compoundAssignmentOp, CreateTempSymbolNode(tempAssignmentTarget), right->deepCopy());
>+
>+    // s0.x
>+    TVector<int> swizzleXOffset;
>+    swizzleXOffset.push_back(0);
>+    TIntermSwizzle *tempAssignmentTargetX =
>+        new TIntermSwizzle(CreateTempSymbolNode(tempAssignmentTarget), swizzleXOffset);
>+    // a = s0.x
>+    TIntermBinary *replacementAssignBackToTarget =
>+        new TIntermBinary(EOpAssign, left->deepCopy(), tempAssignmentTargetX);
>+
>+    // s0 *= b, a = s0.x
>+    TIntermBinary *replacementSequenceLeft =
>+        new TIntermBinary(EOpComma, replacementCompoundAssignment, replacementAssignBackToTarget);
>+    // (s0 *= b, a = s0.x), s0
>+    // Note that the created comma node is not const qualified in any case, so we can always pass
>+    // shader version 300 here.
>+    TIntermBinary *replacementSequence = TIntermBinary::CreateComma(
>+        replacementSequenceLeft, CreateTempSymbolNode(tempAssignmentTarget), 300);
>+
>+    insertStatementInParentBlock(tempAssignmentTargetDeclaration);
>+    queueReplacement(replacementSequence, OriginalNode::IS_DROPPED);
>+}
>+
>+bool VectorizeVectorScalarArithmeticTraverser::visitAggregate(Visit /*visit*/,
>+                                                              TIntermAggregate *node)
>+{
>+    // Transform scalar binary expressions inside vector constructors.
>+    if (!node->isConstructor() || !node->isVector() || node->getSequence()->size() != 1)
>+    {
>+        return true;
>+    }
>+    TIntermTyped *argument = node->getSequence()->back()->getAsTyped();
>+    ASSERT(argument);
>+    if (!argument->isScalar() || argument->getBasicType() != EbtFloat)
>+    {
>+        return true;
>+    }
>+    TIntermBinary *argBinary = argument->getAsBinaryNode();
>+    if (!argBinary)
>+    {
>+        return true;
>+    }
>+
>+    // Only specific ops are necessary to change.
>+    switch (argBinary->getOp())
>+    {
>+        case EOpMul:
>+        case EOpDiv:
>+        {
>+            replaceMathInsideConstructor(node, argBinary);
>+            mReplaced = true;
>+            // Don't replace more nodes in the same subtree on this traversal. However, nodes
>+            // elsewhere in the tree may still be replaced.
>+            return false;
>+        }
>+        case EOpMulAssign:
>+        case EOpDivAssign:
>+        {
>+            // The case where the left side has side effects is too complicated to deal with, so we
>+            // leave that be.
>+            if (!argBinary->getLeft()->hasSideEffects())
>+            {
>+                const TIntermBlock *parentBlock = getParentBlock();
>+                // We can't do more than one insertion to the same block on the same traversal.
>+                if (mModifiedBlocks.find(parentBlock) == mModifiedBlocks.end())
>+                {
>+                    replaceAssignInsideConstructor(node, argBinary);
>+                    mModifiedBlocks.insert(parentBlock);
>+                    mReplaced = true;
>+                    // Don't replace more nodes in the same subtree on this traversal.
>+                    // However, nodes elsewhere in the tree may still be replaced.
>+                    return false;
>+                }
>+            }
>+            break;
>+        }
>+        default:
>+            return true;
>+    }
>+    return true;
>+}
>+
>+}  // anonymous namespace
>+
>+void VectorizeVectorScalarArithmetic(TIntermBlock *root, TSymbolTable *symbolTable)
>+{
>+    VectorizeVectorScalarArithmeticTraverser traverser(symbolTable);
>+    do
>+    {
>+        traverser.nextIteration();
>+        root->traverse(&traverser);
>+        traverser.updateTree();
>+    } while (traverser.didReplaceScalarsWithVectors());
>+}
>+
>+}  // namespace sh
>\ No newline at end of file
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/VectorizeVectorScalarArithmetic.h b/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/VectorizeVectorScalarArithmetic.h
>new file mode 100644
>index 00000000000..e6480646f81
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/VectorizeVectorScalarArithmetic.h
>@@ -0,0 +1,25 @@
>+// Copyright (c) 2017 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// VectorizeVectorScalarArithmetic.h: Turn some arithmetic operations that operate on a float
>+// vector-scalar pair into vector-vector operations. This is done recursively. Some scalar binary
>+// operations inside vector constructors are also turned into vector operations.
>+//
>+// This is targeted to work around a bug in NVIDIA OpenGL drivers that was reproducible on NVIDIA
>+// driver version 387.92. It works around the most common occurrences of the bug.
>+
>+#ifndef COMPILER_TRANSLATOR_TREEOPS_VECTORIZEVECTORSCALARARITHMETIC_H_
>+#define COMPILER_TRANSLATOR_TREEOPS_VECTORIZEVECTORSCALARARITHMETIC_H_
>+
>+namespace sh
>+{
>+
>+class TIntermBlock;
>+class TSymbolTable;
>+
>+void VectorizeVectorScalarArithmetic(TIntermBlock *root, TSymbolTable *symbolTable);
>+
>+}  // namespace sh
>+
>+#endif  // COMPILER_TRANSLATOR_TREEOPS_VECTORIZEVECTORSCALARARITHMETIC_H_
>\ No newline at end of file
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/WrapSwitchStatementsInBlocks.cpp b/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/WrapSwitchStatementsInBlocks.cpp
>new file mode 100644
>index 00000000000..5a4dd30853a
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/WrapSwitchStatementsInBlocks.cpp
>@@ -0,0 +1,126 @@
>+//
>+// Copyright (c) 2017 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// WrapSwitchStatementsInBlocks.cpp: Wrap switch statements in blocks and declare all switch-scoped
>+// variables there to make the AST compatible with HLSL output.
>+//
>+// switch (init)
>+// {
>+//     case 0:
>+//         float f;
>+//     default:
>+//         f = 1.0;
>+// }
>+//
>+// becomes
>+//
>+// {
>+//     float f;
>+//     switch (init)
>+//     {
>+//         case 0:
>+//         default:
>+//             f = 1.0;
>+//     }
>+// }
>+
>+#include "compiler/translator/tree_ops/WrapSwitchStatementsInBlocks.h"
>+
>+#include "compiler/translator/IntermNode.h"
>+#include "compiler/translator/tree_util/IntermTraverse.h"
>+
>+namespace sh
>+{
>+
>+namespace
>+{
>+
>+class WrapSwitchStatementsInBlocksTraverser : public TIntermTraverser
>+{
>+  public:
>+    WrapSwitchStatementsInBlocksTraverser() : TIntermTraverser(true, false, false) {}
>+
>+    bool visitSwitch(Visit visit, TIntermSwitch *node) override;
>+};
>+
>+bool WrapSwitchStatementsInBlocksTraverser::visitSwitch(Visit, TIntermSwitch *node)
>+{
>+    std::vector<TIntermDeclaration *> declarations;
>+    TIntermSequence *statementList = node->getStatementList()->getSequence();
>+    for (TIntermNode *statement : *statementList)
>+    {
>+        TIntermDeclaration *asDeclaration = statement->getAsDeclarationNode();
>+        if (asDeclaration)
>+        {
>+            declarations.push_back(asDeclaration);
>+        }
>+    }
>+    if (declarations.empty())
>+    {
>+        // We don't need to wrap the switch if it doesn't contain declarations as its direct
>+        // descendants.
>+        return true;
>+    }
>+
>+    TIntermBlock *wrapperBlock = new TIntermBlock();
>+    for (TIntermDeclaration *declaration : declarations)
>+    {
>+        // SeparateDeclarations should have already been run.
>+        ASSERT(declaration->getSequence()->size() == 1);
>+
>+        TIntermDeclaration *declarationInBlock = new TIntermDeclaration();
>+        TIntermSymbol *declaratorAsSymbol = declaration->getSequence()->at(0)->getAsSymbolNode();
>+        if (declaratorAsSymbol)
>+        {
>+            // This is a simple declaration like: "float f;"
>+            // Remove the declaration from inside the switch and put it in the wrapping block.
>+            TIntermSequence emptyReplacement;
>+            mMultiReplacements.push_back(NodeReplaceWithMultipleEntry(
>+                node->getStatementList(), declaration, emptyReplacement));
>+
>+            declarationInBlock->appendDeclarator(declaratorAsSymbol->deepCopy());
>+            // The declaration can't be the last statement inside the switch since unused variables
>+            // should already have been pruned.
>+            ASSERT(declaration != statementList->back());
>+        }
>+        else
>+        {
>+            // This is an init declaration like: "float f = 0.0;"
>+            // Change the init declaration inside the switch into an assignment and put a plain
>+            // declaration in the wrapping block.
>+            TIntermBinary *declaratorAsBinary =
>+                declaration->getSequence()->at(0)->getAsBinaryNode();
>+            ASSERT(declaratorAsBinary);
>+
>+            TIntermBinary *initAssignment = new TIntermBinary(
>+                EOpAssign, declaratorAsBinary->getLeft(), declaratorAsBinary->getRight());
>+
>+            queueReplacementWithParent(node->getStatementList(), declaration, initAssignment,
>+                                       OriginalNode::IS_DROPPED);
>+
>+            declarationInBlock->appendDeclarator(declaratorAsBinary->getLeft()->deepCopy());
>+        }
>+        wrapperBlock->appendStatement(declarationInBlock);
>+    }
>+
>+    wrapperBlock->appendStatement(node);
>+    queueReplacement(wrapperBlock, OriginalNode::BECOMES_CHILD);
>+
>+    // Should be fine to process multiple switch statements, even nesting ones in the same
>+    // traversal.
>+    return true;
>+}
>+
>+}  // anonymous namespace
>+
>+// Wrap switch statements in the AST into blocks when needed.
>+void WrapSwitchStatementsInBlocks(TIntermBlock *root)
>+{
>+    WrapSwitchStatementsInBlocksTraverser traverser;
>+    root->traverse(&traverser);
>+    traverser.updateTree();
>+}
>+
>+}  // namespace sh
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/WrapSwitchStatementsInBlocks.h b/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/WrapSwitchStatementsInBlocks.h
>new file mode 100644
>index 00000000000..d04893cb521
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/tree_ops/WrapSwitchStatementsInBlocks.h
>@@ -0,0 +1,22 @@
>+//
>+// Copyright (c) 2017 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// WrapSwitchStatementsInBlocks.h: Wrap switch statements in blocks and declare all switch-scoped
>+// variables there to make the AST compatible with HLSL output.
>+
>+#ifndef COMPILER_TRANSLATOR_TREEOPS_WRAPSWITCHSTATEMENTSINBLOCKS_H_
>+#define COMPILER_TRANSLATOR_TREEOPS_WRAPSWITCHSTATEMENTSINBLOCKS_H_
>+
>+namespace sh
>+{
>+
>+class TIntermBlock;
>+
>+// Wrap switch statements in the AST into blocks when needed. Returns true if the AST was changed.
>+void WrapSwitchStatementsInBlocks(TIntermBlock *root);
>+
>+}  // namespace sh
>+
>+#endif  // COMPILER_TRANSLATOR_TREEOPS_WRAPSWITCHSTATEMENTSINBLOCKS_H_
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/tree_util/BuiltIn_autogen.h b/Source/ThirdParty/ANGLE/src/compiler/translator/tree_util/BuiltIn_autogen.h
>new file mode 100644
>index 00000000000..65b1ba703cf
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/tree_util/BuiltIn_autogen.h
>@@ -0,0 +1,1359 @@
>+// GENERATED FILE - DO NOT EDIT.
>+// Generated by gen_builtin_symbols.py using data from builtin_variables.json and
>+// builtin_function_declarations.txt.
>+//
>+// Copyright 2019 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// BuiltIn_autogen.h:
>+//   Compile-time initialized built-ins.
>+
>+#ifndef COMPILER_TRANSLATOR_TREEUTIL_BUILTIN_AUTOGEN_H_
>+#define COMPILER_TRANSLATOR_TREEUTIL_BUILTIN_AUTOGEN_H_
>+
>+#include "compiler/translator/SymbolUniqueId.h"
>+
>+namespace sh
>+{
>+
>+class TVariable;
>+
>+class BuiltInId
>+{
>+  public:
>+    static constexpr const TSymbolUniqueId radians_Float1                   = TSymbolUniqueId(0);
>+    static constexpr const TSymbolUniqueId pt0B                             = TSymbolUniqueId(1);
>+    static constexpr const TSymbolUniqueId radians_Float2                   = TSymbolUniqueId(2);
>+    static constexpr const TSymbolUniqueId pt1B                             = TSymbolUniqueId(3);
>+    static constexpr const TSymbolUniqueId radians_Float3                   = TSymbolUniqueId(4);
>+    static constexpr const TSymbolUniqueId pt2B                             = TSymbolUniqueId(5);
>+    static constexpr const TSymbolUniqueId radians_Float4                   = TSymbolUniqueId(6);
>+    static constexpr const TSymbolUniqueId pt3B                             = TSymbolUniqueId(7);
>+    static constexpr const TSymbolUniqueId degrees_Float1                   = TSymbolUniqueId(8);
>+    static constexpr const TSymbolUniqueId degrees_Float2                   = TSymbolUniqueId(9);
>+    static constexpr const TSymbolUniqueId degrees_Float3                   = TSymbolUniqueId(10);
>+    static constexpr const TSymbolUniqueId degrees_Float4                   = TSymbolUniqueId(11);
>+    static constexpr const TSymbolUniqueId sin_Float1                       = TSymbolUniqueId(12);
>+    static constexpr const TSymbolUniqueId sin_Float2                       = TSymbolUniqueId(13);
>+    static constexpr const TSymbolUniqueId sin_Float3                       = TSymbolUniqueId(14);
>+    static constexpr const TSymbolUniqueId sin_Float4                       = TSymbolUniqueId(15);
>+    static constexpr const TSymbolUniqueId cos_Float1                       = TSymbolUniqueId(16);
>+    static constexpr const TSymbolUniqueId cos_Float2                       = TSymbolUniqueId(17);
>+    static constexpr const TSymbolUniqueId cos_Float3                       = TSymbolUniqueId(18);
>+    static constexpr const TSymbolUniqueId cos_Float4                       = TSymbolUniqueId(19);
>+    static constexpr const TSymbolUniqueId tan_Float1                       = TSymbolUniqueId(20);
>+    static constexpr const TSymbolUniqueId tan_Float2                       = TSymbolUniqueId(21);
>+    static constexpr const TSymbolUniqueId tan_Float3                       = TSymbolUniqueId(22);
>+    static constexpr const TSymbolUniqueId tan_Float4                       = TSymbolUniqueId(23);
>+    static constexpr const TSymbolUniqueId asin_Float1                      = TSymbolUniqueId(24);
>+    static constexpr const TSymbolUniqueId asin_Float2                      = TSymbolUniqueId(25);
>+    static constexpr const TSymbolUniqueId asin_Float3                      = TSymbolUniqueId(26);
>+    static constexpr const TSymbolUniqueId asin_Float4                      = TSymbolUniqueId(27);
>+    static constexpr const TSymbolUniqueId acos_Float1                      = TSymbolUniqueId(28);
>+    static constexpr const TSymbolUniqueId acos_Float2                      = TSymbolUniqueId(29);
>+    static constexpr const TSymbolUniqueId acos_Float3                      = TSymbolUniqueId(30);
>+    static constexpr const TSymbolUniqueId acos_Float4                      = TSymbolUniqueId(31);
>+    static constexpr const TSymbolUniqueId atan_Float1_Float1               = TSymbolUniqueId(32);
>+    static constexpr const TSymbolUniqueId atan_Float2_Float2               = TSymbolUniqueId(33);
>+    static constexpr const TSymbolUniqueId atan_Float3_Float3               = TSymbolUniqueId(34);
>+    static constexpr const TSymbolUniqueId atan_Float4_Float4               = TSymbolUniqueId(35);
>+    static constexpr const TSymbolUniqueId atan_Float1                      = TSymbolUniqueId(36);
>+    static constexpr const TSymbolUniqueId atan_Float2                      = TSymbolUniqueId(37);
>+    static constexpr const TSymbolUniqueId atan_Float3                      = TSymbolUniqueId(38);
>+    static constexpr const TSymbolUniqueId atan_Float4                      = TSymbolUniqueId(39);
>+    static constexpr const TSymbolUniqueId sinh_Float1                      = TSymbolUniqueId(40);
>+    static constexpr const TSymbolUniqueId sinh_Float2                      = TSymbolUniqueId(41);
>+    static constexpr const TSymbolUniqueId sinh_Float3                      = TSymbolUniqueId(42);
>+    static constexpr const TSymbolUniqueId sinh_Float4                      = TSymbolUniqueId(43);
>+    static constexpr const TSymbolUniqueId cosh_Float1                      = TSymbolUniqueId(44);
>+    static constexpr const TSymbolUniqueId cosh_Float2                      = TSymbolUniqueId(45);
>+    static constexpr const TSymbolUniqueId cosh_Float3                      = TSymbolUniqueId(46);
>+    static constexpr const TSymbolUniqueId cosh_Float4                      = TSymbolUniqueId(47);
>+    static constexpr const TSymbolUniqueId tanh_Float1                      = TSymbolUniqueId(48);
>+    static constexpr const TSymbolUniqueId tanh_Float2                      = TSymbolUniqueId(49);
>+    static constexpr const TSymbolUniqueId tanh_Float3                      = TSymbolUniqueId(50);
>+    static constexpr const TSymbolUniqueId tanh_Float4                      = TSymbolUniqueId(51);
>+    static constexpr const TSymbolUniqueId asinh_Float1                     = TSymbolUniqueId(52);
>+    static constexpr const TSymbolUniqueId asinh_Float2                     = TSymbolUniqueId(53);
>+    static constexpr const TSymbolUniqueId asinh_Float3                     = TSymbolUniqueId(54);
>+    static constexpr const TSymbolUniqueId asinh_Float4                     = TSymbolUniqueId(55);
>+    static constexpr const TSymbolUniqueId acosh_Float1                     = TSymbolUniqueId(56);
>+    static constexpr const TSymbolUniqueId acosh_Float2                     = TSymbolUniqueId(57);
>+    static constexpr const TSymbolUniqueId acosh_Float3                     = TSymbolUniqueId(58);
>+    static constexpr const TSymbolUniqueId acosh_Float4                     = TSymbolUniqueId(59);
>+    static constexpr const TSymbolUniqueId atanh_Float1                     = TSymbolUniqueId(60);
>+    static constexpr const TSymbolUniqueId atanh_Float2                     = TSymbolUniqueId(61);
>+    static constexpr const TSymbolUniqueId atanh_Float3                     = TSymbolUniqueId(62);
>+    static constexpr const TSymbolUniqueId atanh_Float4                     = TSymbolUniqueId(63);
>+    static constexpr const TSymbolUniqueId pow_Float1_Float1                = TSymbolUniqueId(64);
>+    static constexpr const TSymbolUniqueId pow_Float2_Float2                = TSymbolUniqueId(65);
>+    static constexpr const TSymbolUniqueId pow_Float3_Float3                = TSymbolUniqueId(66);
>+    static constexpr const TSymbolUniqueId pow_Float4_Float4                = TSymbolUniqueId(67);
>+    static constexpr const TSymbolUniqueId exp_Float1                       = TSymbolUniqueId(68);
>+    static constexpr const TSymbolUniqueId exp_Float2                       = TSymbolUniqueId(69);
>+    static constexpr const TSymbolUniqueId exp_Float3                       = TSymbolUniqueId(70);
>+    static constexpr const TSymbolUniqueId exp_Float4                       = TSymbolUniqueId(71);
>+    static constexpr const TSymbolUniqueId log_Float1                       = TSymbolUniqueId(72);
>+    static constexpr const TSymbolUniqueId log_Float2                       = TSymbolUniqueId(73);
>+    static constexpr const TSymbolUniqueId log_Float3                       = TSymbolUniqueId(74);
>+    static constexpr const TSymbolUniqueId log_Float4                       = TSymbolUniqueId(75);
>+    static constexpr const TSymbolUniqueId exp2_Float1                      = TSymbolUniqueId(76);
>+    static constexpr const TSymbolUniqueId exp2_Float2                      = TSymbolUniqueId(77);
>+    static constexpr const TSymbolUniqueId exp2_Float3                      = TSymbolUniqueId(78);
>+    static constexpr const TSymbolUniqueId exp2_Float4                      = TSymbolUniqueId(79);
>+    static constexpr const TSymbolUniqueId log2_Float1                      = TSymbolUniqueId(80);
>+    static constexpr const TSymbolUniqueId log2_Float2                      = TSymbolUniqueId(81);
>+    static constexpr const TSymbolUniqueId log2_Float3                      = TSymbolUniqueId(82);
>+    static constexpr const TSymbolUniqueId log2_Float4                      = TSymbolUniqueId(83);
>+    static constexpr const TSymbolUniqueId sqrt_Float1                      = TSymbolUniqueId(84);
>+    static constexpr const TSymbolUniqueId sqrt_Float2                      = TSymbolUniqueId(85);
>+    static constexpr const TSymbolUniqueId sqrt_Float3                      = TSymbolUniqueId(86);
>+    static constexpr const TSymbolUniqueId sqrt_Float4                      = TSymbolUniqueId(87);
>+    static constexpr const TSymbolUniqueId inversesqrt_Float1               = TSymbolUniqueId(88);
>+    static constexpr const TSymbolUniqueId inversesqrt_Float2               = TSymbolUniqueId(89);
>+    static constexpr const TSymbolUniqueId inversesqrt_Float3               = TSymbolUniqueId(90);
>+    static constexpr const TSymbolUniqueId inversesqrt_Float4               = TSymbolUniqueId(91);
>+    static constexpr const TSymbolUniqueId abs_Float1                       = TSymbolUniqueId(92);
>+    static constexpr const TSymbolUniqueId abs_Float2                       = TSymbolUniqueId(93);
>+    static constexpr const TSymbolUniqueId abs_Float3                       = TSymbolUniqueId(94);
>+    static constexpr const TSymbolUniqueId abs_Float4                       = TSymbolUniqueId(95);
>+    static constexpr const TSymbolUniqueId abs_Int1                         = TSymbolUniqueId(96);
>+    static constexpr const TSymbolUniqueId pt0C                             = TSymbolUniqueId(97);
>+    static constexpr const TSymbolUniqueId abs_Int2                         = TSymbolUniqueId(98);
>+    static constexpr const TSymbolUniqueId pt1C                             = TSymbolUniqueId(99);
>+    static constexpr const TSymbolUniqueId abs_Int3                         = TSymbolUniqueId(100);
>+    static constexpr const TSymbolUniqueId pt2C                             = TSymbolUniqueId(101);
>+    static constexpr const TSymbolUniqueId abs_Int4                         = TSymbolUniqueId(102);
>+    static constexpr const TSymbolUniqueId pt3C                             = TSymbolUniqueId(103);
>+    static constexpr const TSymbolUniqueId sign_Float1                      = TSymbolUniqueId(104);
>+    static constexpr const TSymbolUniqueId sign_Float2                      = TSymbolUniqueId(105);
>+    static constexpr const TSymbolUniqueId sign_Float3                      = TSymbolUniqueId(106);
>+    static constexpr const TSymbolUniqueId sign_Float4                      = TSymbolUniqueId(107);
>+    static constexpr const TSymbolUniqueId sign_Int1                        = TSymbolUniqueId(108);
>+    static constexpr const TSymbolUniqueId sign_Int2                        = TSymbolUniqueId(109);
>+    static constexpr const TSymbolUniqueId sign_Int3                        = TSymbolUniqueId(110);
>+    static constexpr const TSymbolUniqueId sign_Int4                        = TSymbolUniqueId(111);
>+    static constexpr const TSymbolUniqueId floor_Float1                     = TSymbolUniqueId(112);
>+    static constexpr const TSymbolUniqueId floor_Float2                     = TSymbolUniqueId(113);
>+    static constexpr const TSymbolUniqueId floor_Float3                     = TSymbolUniqueId(114);
>+    static constexpr const TSymbolUniqueId floor_Float4                     = TSymbolUniqueId(115);
>+    static constexpr const TSymbolUniqueId trunc_Float1                     = TSymbolUniqueId(116);
>+    static constexpr const TSymbolUniqueId trunc_Float2                     = TSymbolUniqueId(117);
>+    static constexpr const TSymbolUniqueId trunc_Float3                     = TSymbolUniqueId(118);
>+    static constexpr const TSymbolUniqueId trunc_Float4                     = TSymbolUniqueId(119);
>+    static constexpr const TSymbolUniqueId round_Float1                     = TSymbolUniqueId(120);
>+    static constexpr const TSymbolUniqueId round_Float2                     = TSymbolUniqueId(121);
>+    static constexpr const TSymbolUniqueId round_Float3                     = TSymbolUniqueId(122);
>+    static constexpr const TSymbolUniqueId round_Float4                     = TSymbolUniqueId(123);
>+    static constexpr const TSymbolUniqueId roundEven_Float1                 = TSymbolUniqueId(124);
>+    static constexpr const TSymbolUniqueId roundEven_Float2                 = TSymbolUniqueId(125);
>+    static constexpr const TSymbolUniqueId roundEven_Float3                 = TSymbolUniqueId(126);
>+    static constexpr const TSymbolUniqueId roundEven_Float4                 = TSymbolUniqueId(127);
>+    static constexpr const TSymbolUniqueId ceil_Float1                      = TSymbolUniqueId(128);
>+    static constexpr const TSymbolUniqueId ceil_Float2                      = TSymbolUniqueId(129);
>+    static constexpr const TSymbolUniqueId ceil_Float3                      = TSymbolUniqueId(130);
>+    static constexpr const TSymbolUniqueId ceil_Float4                      = TSymbolUniqueId(131);
>+    static constexpr const TSymbolUniqueId fract_Float1                     = TSymbolUniqueId(132);
>+    static constexpr const TSymbolUniqueId fract_Float2                     = TSymbolUniqueId(133);
>+    static constexpr const TSymbolUniqueId fract_Float3                     = TSymbolUniqueId(134);
>+    static constexpr const TSymbolUniqueId fract_Float4                     = TSymbolUniqueId(135);
>+    static constexpr const TSymbolUniqueId mod_Float1_Float1                = TSymbolUniqueId(136);
>+    static constexpr const TSymbolUniqueId mod_Float2_Float1                = TSymbolUniqueId(137);
>+    static constexpr const TSymbolUniqueId mod_Float3_Float1                = TSymbolUniqueId(138);
>+    static constexpr const TSymbolUniqueId mod_Float4_Float1                = TSymbolUniqueId(139);
>+    static constexpr const TSymbolUniqueId mod_Float2_Float2                = TSymbolUniqueId(140);
>+    static constexpr const TSymbolUniqueId mod_Float3_Float3                = TSymbolUniqueId(141);
>+    static constexpr const TSymbolUniqueId mod_Float4_Float4                = TSymbolUniqueId(142);
>+    static constexpr const TSymbolUniqueId min_Float1_Float1                = TSymbolUniqueId(143);
>+    static constexpr const TSymbolUniqueId min_Float2_Float1                = TSymbolUniqueId(144);
>+    static constexpr const TSymbolUniqueId min_Float3_Float1                = TSymbolUniqueId(145);
>+    static constexpr const TSymbolUniqueId min_Float4_Float1                = TSymbolUniqueId(146);
>+    static constexpr const TSymbolUniqueId min_Float2_Float2                = TSymbolUniqueId(147);
>+    static constexpr const TSymbolUniqueId min_Float3_Float3                = TSymbolUniqueId(148);
>+    static constexpr const TSymbolUniqueId min_Float4_Float4                = TSymbolUniqueId(149);
>+    static constexpr const TSymbolUniqueId min_Int1_Int1                    = TSymbolUniqueId(150);
>+    static constexpr const TSymbolUniqueId min_Int2_Int2                    = TSymbolUniqueId(151);
>+    static constexpr const TSymbolUniqueId min_Int3_Int3                    = TSymbolUniqueId(152);
>+    static constexpr const TSymbolUniqueId min_Int4_Int4                    = TSymbolUniqueId(153);
>+    static constexpr const TSymbolUniqueId min_Int2_Int1                    = TSymbolUniqueId(154);
>+    static constexpr const TSymbolUniqueId min_Int3_Int1                    = TSymbolUniqueId(155);
>+    static constexpr const TSymbolUniqueId min_Int4_Int1                    = TSymbolUniqueId(156);
>+    static constexpr const TSymbolUniqueId min_UInt1_UInt1                  = TSymbolUniqueId(157);
>+    static constexpr const TSymbolUniqueId pt0D                             = TSymbolUniqueId(158);
>+    static constexpr const TSymbolUniqueId min_UInt2_UInt2                  = TSymbolUniqueId(159);
>+    static constexpr const TSymbolUniqueId pt1D                             = TSymbolUniqueId(160);
>+    static constexpr const TSymbolUniqueId min_UInt3_UInt3                  = TSymbolUniqueId(161);
>+    static constexpr const TSymbolUniqueId pt2D                             = TSymbolUniqueId(162);
>+    static constexpr const TSymbolUniqueId min_UInt4_UInt4                  = TSymbolUniqueId(163);
>+    static constexpr const TSymbolUniqueId pt3D                             = TSymbolUniqueId(164);
>+    static constexpr const TSymbolUniqueId min_UInt2_UInt1                  = TSymbolUniqueId(165);
>+    static constexpr const TSymbolUniqueId min_UInt3_UInt1                  = TSymbolUniqueId(166);
>+    static constexpr const TSymbolUniqueId min_UInt4_UInt1                  = TSymbolUniqueId(167);
>+    static constexpr const TSymbolUniqueId max_Float1_Float1                = TSymbolUniqueId(168);
>+    static constexpr const TSymbolUniqueId max_Float2_Float1                = TSymbolUniqueId(169);
>+    static constexpr const TSymbolUniqueId max_Float3_Float1                = TSymbolUniqueId(170);
>+    static constexpr const TSymbolUniqueId max_Float4_Float1                = TSymbolUniqueId(171);
>+    static constexpr const TSymbolUniqueId max_Float2_Float2                = TSymbolUniqueId(172);
>+    static constexpr const TSymbolUniqueId max_Float3_Float3                = TSymbolUniqueId(173);
>+    static constexpr const TSymbolUniqueId max_Float4_Float4                = TSymbolUniqueId(174);
>+    static constexpr const TSymbolUniqueId max_Int1_Int1                    = TSymbolUniqueId(175);
>+    static constexpr const TSymbolUniqueId max_Int2_Int2                    = TSymbolUniqueId(176);
>+    static constexpr const TSymbolUniqueId max_Int3_Int3                    = TSymbolUniqueId(177);
>+    static constexpr const TSymbolUniqueId max_Int4_Int4                    = TSymbolUniqueId(178);
>+    static constexpr const TSymbolUniqueId max_Int2_Int1                    = TSymbolUniqueId(179);
>+    static constexpr const TSymbolUniqueId max_Int3_Int1                    = TSymbolUniqueId(180);
>+    static constexpr const TSymbolUniqueId max_Int4_Int1                    = TSymbolUniqueId(181);
>+    static constexpr const TSymbolUniqueId max_UInt1_UInt1                  = TSymbolUniqueId(182);
>+    static constexpr const TSymbolUniqueId max_UInt2_UInt2                  = TSymbolUniqueId(183);
>+    static constexpr const TSymbolUniqueId max_UInt3_UInt3                  = TSymbolUniqueId(184);
>+    static constexpr const TSymbolUniqueId max_UInt4_UInt4                  = TSymbolUniqueId(185);
>+    static constexpr const TSymbolUniqueId max_UInt2_UInt1                  = TSymbolUniqueId(186);
>+    static constexpr const TSymbolUniqueId max_UInt3_UInt1                  = TSymbolUniqueId(187);
>+    static constexpr const TSymbolUniqueId max_UInt4_UInt1                  = TSymbolUniqueId(188);
>+    static constexpr const TSymbolUniqueId clamp_Float1_Float1_Float1       = TSymbolUniqueId(189);
>+    static constexpr const TSymbolUniqueId clamp_Float2_Float1_Float1       = TSymbolUniqueId(190);
>+    static constexpr const TSymbolUniqueId clamp_Float3_Float1_Float1       = TSymbolUniqueId(191);
>+    static constexpr const TSymbolUniqueId clamp_Float4_Float1_Float1       = TSymbolUniqueId(192);
>+    static constexpr const TSymbolUniqueId clamp_Float2_Float2_Float2       = TSymbolUniqueId(193);
>+    static constexpr const TSymbolUniqueId clamp_Float3_Float3_Float3       = TSymbolUniqueId(194);
>+    static constexpr const TSymbolUniqueId clamp_Float4_Float4_Float4       = TSymbolUniqueId(195);
>+    static constexpr const TSymbolUniqueId clamp_Int1_Int1_Int1             = TSymbolUniqueId(196);
>+    static constexpr const TSymbolUniqueId clamp_Int2_Int1_Int1             = TSymbolUniqueId(197);
>+    static constexpr const TSymbolUniqueId clamp_Int3_Int1_Int1             = TSymbolUniqueId(198);
>+    static constexpr const TSymbolUniqueId clamp_Int4_Int1_Int1             = TSymbolUniqueId(199);
>+    static constexpr const TSymbolUniqueId clamp_Int2_Int2_Int2             = TSymbolUniqueId(200);
>+    static constexpr const TSymbolUniqueId clamp_Int3_Int3_Int3             = TSymbolUniqueId(201);
>+    static constexpr const TSymbolUniqueId clamp_Int4_Int4_Int4             = TSymbolUniqueId(202);
>+    static constexpr const TSymbolUniqueId clamp_UInt1_UInt1_UInt1          = TSymbolUniqueId(203);
>+    static constexpr const TSymbolUniqueId clamp_UInt2_UInt1_UInt1          = TSymbolUniqueId(204);
>+    static constexpr const TSymbolUniqueId clamp_UInt3_UInt1_UInt1          = TSymbolUniqueId(205);
>+    static constexpr const TSymbolUniqueId clamp_UInt4_UInt1_UInt1          = TSymbolUniqueId(206);
>+    static constexpr const TSymbolUniqueId clamp_UInt2_UInt2_UInt2          = TSymbolUniqueId(207);
>+    static constexpr const TSymbolUniqueId clamp_UInt3_UInt3_UInt3          = TSymbolUniqueId(208);
>+    static constexpr const TSymbolUniqueId clamp_UInt4_UInt4_UInt4          = TSymbolUniqueId(209);
>+    static constexpr const TSymbolUniqueId mix_Float1_Float1_Float1         = TSymbolUniqueId(210);
>+    static constexpr const TSymbolUniqueId mix_Float2_Float2_Float1         = TSymbolUniqueId(211);
>+    static constexpr const TSymbolUniqueId mix_Float3_Float3_Float1         = TSymbolUniqueId(212);
>+    static constexpr const TSymbolUniqueId mix_Float4_Float4_Float1         = TSymbolUniqueId(213);
>+    static constexpr const TSymbolUniqueId mix_Float2_Float2_Float2         = TSymbolUniqueId(214);
>+    static constexpr const TSymbolUniqueId mix_Float3_Float3_Float3         = TSymbolUniqueId(215);
>+    static constexpr const TSymbolUniqueId mix_Float4_Float4_Float4         = TSymbolUniqueId(216);
>+    static constexpr const TSymbolUniqueId mix_Float1_Float1_Bool1          = TSymbolUniqueId(217);
>+    static constexpr const TSymbolUniqueId pt0E                             = TSymbolUniqueId(218);
>+    static constexpr const TSymbolUniqueId mix_Float2_Float2_Bool2          = TSymbolUniqueId(219);
>+    static constexpr const TSymbolUniqueId pt1E                             = TSymbolUniqueId(220);
>+    static constexpr const TSymbolUniqueId mix_Float3_Float3_Bool3          = TSymbolUniqueId(221);
>+    static constexpr const TSymbolUniqueId pt2E                             = TSymbolUniqueId(222);
>+    static constexpr const TSymbolUniqueId mix_Float4_Float4_Bool4          = TSymbolUniqueId(223);
>+    static constexpr const TSymbolUniqueId pt3E                             = TSymbolUniqueId(224);
>+    static constexpr const TSymbolUniqueId step_Float1_Float1               = TSymbolUniqueId(225);
>+    static constexpr const TSymbolUniqueId step_Float2_Float2               = TSymbolUniqueId(226);
>+    static constexpr const TSymbolUniqueId step_Float3_Float3               = TSymbolUniqueId(227);
>+    static constexpr const TSymbolUniqueId step_Float4_Float4               = TSymbolUniqueId(228);
>+    static constexpr const TSymbolUniqueId step_Float1_Float2               = TSymbolUniqueId(229);
>+    static constexpr const TSymbolUniqueId step_Float1_Float3               = TSymbolUniqueId(230);
>+    static constexpr const TSymbolUniqueId step_Float1_Float4               = TSymbolUniqueId(231);
>+    static constexpr const TSymbolUniqueId smoothstep_Float1_Float1_Float1  = TSymbolUniqueId(232);
>+    static constexpr const TSymbolUniqueId smoothstep_Float2_Float2_Float2  = TSymbolUniqueId(233);
>+    static constexpr const TSymbolUniqueId smoothstep_Float3_Float3_Float3  = TSymbolUniqueId(234);
>+    static constexpr const TSymbolUniqueId smoothstep_Float4_Float4_Float4  = TSymbolUniqueId(235);
>+    static constexpr const TSymbolUniqueId smoothstep_Float1_Float1_Float2  = TSymbolUniqueId(236);
>+    static constexpr const TSymbolUniqueId smoothstep_Float1_Float1_Float3  = TSymbolUniqueId(237);
>+    static constexpr const TSymbolUniqueId smoothstep_Float1_Float1_Float4  = TSymbolUniqueId(238);
>+    static constexpr const TSymbolUniqueId modf_Float1_Float1               = TSymbolUniqueId(239);
>+    static constexpr const TSymbolUniqueId pt_o_0B                          = TSymbolUniqueId(240);
>+    static constexpr const TSymbolUniqueId modf_Float2_Float2               = TSymbolUniqueId(241);
>+    static constexpr const TSymbolUniqueId pt_o_1B                          = TSymbolUniqueId(242);
>+    static constexpr const TSymbolUniqueId modf_Float3_Float3               = TSymbolUniqueId(243);
>+    static constexpr const TSymbolUniqueId pt_o_2B                          = TSymbolUniqueId(244);
>+    static constexpr const TSymbolUniqueId modf_Float4_Float4               = TSymbolUniqueId(245);
>+    static constexpr const TSymbolUniqueId pt_o_3B                          = TSymbolUniqueId(246);
>+    static constexpr const TSymbolUniqueId isnan_Float1                     = TSymbolUniqueId(247);
>+    static constexpr const TSymbolUniqueId isnan_Float2                     = TSymbolUniqueId(248);
>+    static constexpr const TSymbolUniqueId isnan_Float3                     = TSymbolUniqueId(249);
>+    static constexpr const TSymbolUniqueId isnan_Float4                     = TSymbolUniqueId(250);
>+    static constexpr const TSymbolUniqueId isinf_Float1                     = TSymbolUniqueId(251);
>+    static constexpr const TSymbolUniqueId isinf_Float2                     = TSymbolUniqueId(252);
>+    static constexpr const TSymbolUniqueId isinf_Float3                     = TSymbolUniqueId(253);
>+    static constexpr const TSymbolUniqueId isinf_Float4                     = TSymbolUniqueId(254);
>+    static constexpr const TSymbolUniqueId floatBitsToInt_Float1            = TSymbolUniqueId(255);
>+    static constexpr const TSymbolUniqueId floatBitsToInt_Float2            = TSymbolUniqueId(256);
>+    static constexpr const TSymbolUniqueId floatBitsToInt_Float3            = TSymbolUniqueId(257);
>+    static constexpr const TSymbolUniqueId floatBitsToInt_Float4            = TSymbolUniqueId(258);
>+    static constexpr const TSymbolUniqueId floatBitsToUint_Float1           = TSymbolUniqueId(259);
>+    static constexpr const TSymbolUniqueId floatBitsToUint_Float2           = TSymbolUniqueId(260);
>+    static constexpr const TSymbolUniqueId floatBitsToUint_Float3           = TSymbolUniqueId(261);
>+    static constexpr const TSymbolUniqueId floatBitsToUint_Float4           = TSymbolUniqueId(262);
>+    static constexpr const TSymbolUniqueId intBitsToFloat_Int1              = TSymbolUniqueId(263);
>+    static constexpr const TSymbolUniqueId intBitsToFloat_Int2              = TSymbolUniqueId(264);
>+    static constexpr const TSymbolUniqueId intBitsToFloat_Int3              = TSymbolUniqueId(265);
>+    static constexpr const TSymbolUniqueId intBitsToFloat_Int4              = TSymbolUniqueId(266);
>+    static constexpr const TSymbolUniqueId uintBitsToFloat_UInt1            = TSymbolUniqueId(267);
>+    static constexpr const TSymbolUniqueId uintBitsToFloat_UInt2            = TSymbolUniqueId(268);
>+    static constexpr const TSymbolUniqueId uintBitsToFloat_UInt3            = TSymbolUniqueId(269);
>+    static constexpr const TSymbolUniqueId uintBitsToFloat_UInt4            = TSymbolUniqueId(270);
>+    static constexpr const TSymbolUniqueId frexp_Float1_Int1                = TSymbolUniqueId(271);
>+    static constexpr const TSymbolUniqueId pt_o_0C                          = TSymbolUniqueId(272);
>+    static constexpr const TSymbolUniqueId frexp_Float2_Int2                = TSymbolUniqueId(273);
>+    static constexpr const TSymbolUniqueId pt_o_1C                          = TSymbolUniqueId(274);
>+    static constexpr const TSymbolUniqueId frexp_Float3_Int3                = TSymbolUniqueId(275);
>+    static constexpr const TSymbolUniqueId pt_o_2C                          = TSymbolUniqueId(276);
>+    static constexpr const TSymbolUniqueId frexp_Float4_Int4                = TSymbolUniqueId(277);
>+    static constexpr const TSymbolUniqueId pt_o_3C                          = TSymbolUniqueId(278);
>+    static constexpr const TSymbolUniqueId ldexp_Float1_Int1                = TSymbolUniqueId(279);
>+    static constexpr const TSymbolUniqueId ldexp_Float2_Int2                = TSymbolUniqueId(280);
>+    static constexpr const TSymbolUniqueId ldexp_Float3_Int3                = TSymbolUniqueId(281);
>+    static constexpr const TSymbolUniqueId ldexp_Float4_Int4                = TSymbolUniqueId(282);
>+    static constexpr const TSymbolUniqueId packSnorm2x16_Float2             = TSymbolUniqueId(283);
>+    static constexpr const TSymbolUniqueId packUnorm2x16_Float2             = TSymbolUniqueId(284);
>+    static constexpr const TSymbolUniqueId packHalf2x16_Float2              = TSymbolUniqueId(285);
>+    static constexpr const TSymbolUniqueId unpackSnorm2x16_UInt1            = TSymbolUniqueId(286);
>+    static constexpr const TSymbolUniqueId unpackUnorm2x16_UInt1            = TSymbolUniqueId(287);
>+    static constexpr const TSymbolUniqueId unpackHalf2x16_UInt1             = TSymbolUniqueId(288);
>+    static constexpr const TSymbolUniqueId packUnorm4x8_Float4              = TSymbolUniqueId(289);
>+    static constexpr const TSymbolUniqueId packSnorm4x8_Float4              = TSymbolUniqueId(290);
>+    static constexpr const TSymbolUniqueId unpackUnorm4x8_UInt1             = TSymbolUniqueId(291);
>+    static constexpr const TSymbolUniqueId unpackSnorm4x8_UInt1             = TSymbolUniqueId(292);
>+    static constexpr const TSymbolUniqueId length_Float1                    = TSymbolUniqueId(293);
>+    static constexpr const TSymbolUniqueId length_Float2                    = TSymbolUniqueId(294);
>+    static constexpr const TSymbolUniqueId length_Float3                    = TSymbolUniqueId(295);
>+    static constexpr const TSymbolUniqueId length_Float4                    = TSymbolUniqueId(296);
>+    static constexpr const TSymbolUniqueId distance_Float1_Float1           = TSymbolUniqueId(297);
>+    static constexpr const TSymbolUniqueId distance_Float2_Float2           = TSymbolUniqueId(298);
>+    static constexpr const TSymbolUniqueId distance_Float3_Float3           = TSymbolUniqueId(299);
>+    static constexpr const TSymbolUniqueId distance_Float4_Float4           = TSymbolUniqueId(300);
>+    static constexpr const TSymbolUniqueId dot_Float1_Float1                = TSymbolUniqueId(301);
>+    static constexpr const TSymbolUniqueId dot_Float2_Float2                = TSymbolUniqueId(302);
>+    static constexpr const TSymbolUniqueId dot_Float3_Float3                = TSymbolUniqueId(303);
>+    static constexpr const TSymbolUniqueId dot_Float4_Float4                = TSymbolUniqueId(304);
>+    static constexpr const TSymbolUniqueId cross_Float3_Float3              = TSymbolUniqueId(305);
>+    static constexpr const TSymbolUniqueId normalize_Float1                 = TSymbolUniqueId(306);
>+    static constexpr const TSymbolUniqueId normalize_Float2                 = TSymbolUniqueId(307);
>+    static constexpr const TSymbolUniqueId normalize_Float3                 = TSymbolUniqueId(308);
>+    static constexpr const TSymbolUniqueId normalize_Float4                 = TSymbolUniqueId(309);
>+    static constexpr const TSymbolUniqueId faceforward_Float1_Float1_Float1 = TSymbolUniqueId(310);
>+    static constexpr const TSymbolUniqueId faceforward_Float2_Float2_Float2 = TSymbolUniqueId(311);
>+    static constexpr const TSymbolUniqueId faceforward_Float3_Float3_Float3 = TSymbolUniqueId(312);
>+    static constexpr const TSymbolUniqueId faceforward_Float4_Float4_Float4 = TSymbolUniqueId(313);
>+    static constexpr const TSymbolUniqueId reflect_Float1_Float1            = TSymbolUniqueId(314);
>+    static constexpr const TSymbolUniqueId reflect_Float2_Float2            = TSymbolUniqueId(315);
>+    static constexpr const TSymbolUniqueId reflect_Float3_Float3            = TSymbolUniqueId(316);
>+    static constexpr const TSymbolUniqueId reflect_Float4_Float4            = TSymbolUniqueId(317);
>+    static constexpr const TSymbolUniqueId refract_Float1_Float1_Float1     = TSymbolUniqueId(318);
>+    static constexpr const TSymbolUniqueId refract_Float2_Float2_Float1     = TSymbolUniqueId(319);
>+    static constexpr const TSymbolUniqueId refract_Float3_Float3_Float1     = TSymbolUniqueId(320);
>+    static constexpr const TSymbolUniqueId refract_Float4_Float4_Float1     = TSymbolUniqueId(321);
>+    static constexpr const TSymbolUniqueId matrixCompMult_Float2x2_Float2x2 = TSymbolUniqueId(322);
>+    static constexpr const TSymbolUniqueId pt5B                             = TSymbolUniqueId(323);
>+    static constexpr const TSymbolUniqueId matrixCompMult_Float3x3_Float3x3 = TSymbolUniqueId(324);
>+    static constexpr const TSymbolUniqueId ptAB                             = TSymbolUniqueId(325);
>+    static constexpr const TSymbolUniqueId matrixCompMult_Float4x4_Float4x4 = TSymbolUniqueId(326);
>+    static constexpr const TSymbolUniqueId ptFB                             = TSymbolUniqueId(327);
>+    static constexpr const TSymbolUniqueId matrixCompMult_Float2x3_Float2x3 = TSymbolUniqueId(328);
>+    static constexpr const TSymbolUniqueId pt9B                             = TSymbolUniqueId(329);
>+    static constexpr const TSymbolUniqueId matrixCompMult_Float3x2_Float3x2 = TSymbolUniqueId(330);
>+    static constexpr const TSymbolUniqueId pt6B                             = TSymbolUniqueId(331);
>+    static constexpr const TSymbolUniqueId matrixCompMult_Float2x4_Float2x4 = TSymbolUniqueId(332);
>+    static constexpr const TSymbolUniqueId ptDB                             = TSymbolUniqueId(333);
>+    static constexpr const TSymbolUniqueId matrixCompMult_Float4x2_Float4x2 = TSymbolUniqueId(334);
>+    static constexpr const TSymbolUniqueId pt7B                             = TSymbolUniqueId(335);
>+    static constexpr const TSymbolUniqueId matrixCompMult_Float3x4_Float3x4 = TSymbolUniqueId(336);
>+    static constexpr const TSymbolUniqueId ptEB                             = TSymbolUniqueId(337);
>+    static constexpr const TSymbolUniqueId matrixCompMult_Float4x3_Float4x3 = TSymbolUniqueId(338);
>+    static constexpr const TSymbolUniqueId ptBB                             = TSymbolUniqueId(339);
>+    static constexpr const TSymbolUniqueId outerProduct_Float2_Float2       = TSymbolUniqueId(340);
>+    static constexpr const TSymbolUniqueId outerProduct_Float3_Float3       = TSymbolUniqueId(341);
>+    static constexpr const TSymbolUniqueId outerProduct_Float4_Float4       = TSymbolUniqueId(342);
>+    static constexpr const TSymbolUniqueId outerProduct_Float3_Float2       = TSymbolUniqueId(343);
>+    static constexpr const TSymbolUniqueId outerProduct_Float2_Float3       = TSymbolUniqueId(344);
>+    static constexpr const TSymbolUniqueId outerProduct_Float4_Float2       = TSymbolUniqueId(345);
>+    static constexpr const TSymbolUniqueId outerProduct_Float2_Float4       = TSymbolUniqueId(346);
>+    static constexpr const TSymbolUniqueId outerProduct_Float4_Float3       = TSymbolUniqueId(347);
>+    static constexpr const TSymbolUniqueId outerProduct_Float3_Float4       = TSymbolUniqueId(348);
>+    static constexpr const TSymbolUniqueId transpose_Float2x2               = TSymbolUniqueId(349);
>+    static constexpr const TSymbolUniqueId transpose_Float3x3               = TSymbolUniqueId(350);
>+    static constexpr const TSymbolUniqueId transpose_Float4x4               = TSymbolUniqueId(351);
>+    static constexpr const TSymbolUniqueId transpose_Float3x2               = TSymbolUniqueId(352);
>+    static constexpr const TSymbolUniqueId transpose_Float2x3               = TSymbolUniqueId(353);
>+    static constexpr const TSymbolUniqueId transpose_Float4x2               = TSymbolUniqueId(354);
>+    static constexpr const TSymbolUniqueId transpose_Float2x4               = TSymbolUniqueId(355);
>+    static constexpr const TSymbolUniqueId transpose_Float4x3               = TSymbolUniqueId(356);
>+    static constexpr const TSymbolUniqueId transpose_Float3x4               = TSymbolUniqueId(357);
>+    static constexpr const TSymbolUniqueId determinant_Float2x2             = TSymbolUniqueId(358);
>+    static constexpr const TSymbolUniqueId determinant_Float3x3             = TSymbolUniqueId(359);
>+    static constexpr const TSymbolUniqueId determinant_Float4x4             = TSymbolUniqueId(360);
>+    static constexpr const TSymbolUniqueId inverse_Float2x2                 = TSymbolUniqueId(361);
>+    static constexpr const TSymbolUniqueId inverse_Float3x3                 = TSymbolUniqueId(362);
>+    static constexpr const TSymbolUniqueId inverse_Float4x4                 = TSymbolUniqueId(363);
>+    static constexpr const TSymbolUniqueId lessThan_Float2_Float2           = TSymbolUniqueId(364);
>+    static constexpr const TSymbolUniqueId lessThan_Float3_Float3           = TSymbolUniqueId(365);
>+    static constexpr const TSymbolUniqueId lessThan_Float4_Float4           = TSymbolUniqueId(366);
>+    static constexpr const TSymbolUniqueId lessThan_Int2_Int2               = TSymbolUniqueId(367);
>+    static constexpr const TSymbolUniqueId lessThan_Int3_Int3               = TSymbolUniqueId(368);
>+    static constexpr const TSymbolUniqueId lessThan_Int4_Int4               = TSymbolUniqueId(369);
>+    static constexpr const TSymbolUniqueId lessThan_UInt2_UInt2             = TSymbolUniqueId(370);
>+    static constexpr const TSymbolUniqueId lessThan_UInt3_UInt3             = TSymbolUniqueId(371);
>+    static constexpr const TSymbolUniqueId lessThan_UInt4_UInt4             = TSymbolUniqueId(372);
>+    static constexpr const TSymbolUniqueId lessThanEqual_Float2_Float2      = TSymbolUniqueId(373);
>+    static constexpr const TSymbolUniqueId lessThanEqual_Float3_Float3      = TSymbolUniqueId(374);
>+    static constexpr const TSymbolUniqueId lessThanEqual_Float4_Float4      = TSymbolUniqueId(375);
>+    static constexpr const TSymbolUniqueId lessThanEqual_Int2_Int2          = TSymbolUniqueId(376);
>+    static constexpr const TSymbolUniqueId lessThanEqual_Int3_Int3          = TSymbolUniqueId(377);
>+    static constexpr const TSymbolUniqueId lessThanEqual_Int4_Int4          = TSymbolUniqueId(378);
>+    static constexpr const TSymbolUniqueId lessThanEqual_UInt2_UInt2        = TSymbolUniqueId(379);
>+    static constexpr const TSymbolUniqueId lessThanEqual_UInt3_UInt3        = TSymbolUniqueId(380);
>+    static constexpr const TSymbolUniqueId lessThanEqual_UInt4_UInt4        = TSymbolUniqueId(381);
>+    static constexpr const TSymbolUniqueId greaterThan_Float2_Float2        = TSymbolUniqueId(382);
>+    static constexpr const TSymbolUniqueId greaterThan_Float3_Float3        = TSymbolUniqueId(383);
>+    static constexpr const TSymbolUniqueId greaterThan_Float4_Float4        = TSymbolUniqueId(384);
>+    static constexpr const TSymbolUniqueId greaterThan_Int2_Int2            = TSymbolUniqueId(385);
>+    static constexpr const TSymbolUniqueId greaterThan_Int3_Int3            = TSymbolUniqueId(386);
>+    static constexpr const TSymbolUniqueId greaterThan_Int4_Int4            = TSymbolUniqueId(387);
>+    static constexpr const TSymbolUniqueId greaterThan_UInt2_UInt2          = TSymbolUniqueId(388);
>+    static constexpr const TSymbolUniqueId greaterThan_UInt3_UInt3          = TSymbolUniqueId(389);
>+    static constexpr const TSymbolUniqueId greaterThan_UInt4_UInt4          = TSymbolUniqueId(390);
>+    static constexpr const TSymbolUniqueId greaterThanEqual_Float2_Float2   = TSymbolUniqueId(391);
>+    static constexpr const TSymbolUniqueId greaterThanEqual_Float3_Float3   = TSymbolUniqueId(392);
>+    static constexpr const TSymbolUniqueId greaterThanEqual_Float4_Float4   = TSymbolUniqueId(393);
>+    static constexpr const TSymbolUniqueId greaterThanEqual_Int2_Int2       = TSymbolUniqueId(394);
>+    static constexpr const TSymbolUniqueId greaterThanEqual_Int3_Int3       = TSymbolUniqueId(395);
>+    static constexpr const TSymbolUniqueId greaterThanEqual_Int4_Int4       = TSymbolUniqueId(396);
>+    static constexpr const TSymbolUniqueId greaterThanEqual_UInt2_UInt2     = TSymbolUniqueId(397);
>+    static constexpr const TSymbolUniqueId greaterThanEqual_UInt3_UInt3     = TSymbolUniqueId(398);
>+    static constexpr const TSymbolUniqueId greaterThanEqual_UInt4_UInt4     = TSymbolUniqueId(399);
>+    static constexpr const TSymbolUniqueId equal_Float2_Float2              = TSymbolUniqueId(400);
>+    static constexpr const TSymbolUniqueId equal_Float3_Float3              = TSymbolUniqueId(401);
>+    static constexpr const TSymbolUniqueId equal_Float4_Float4              = TSymbolUniqueId(402);
>+    static constexpr const TSymbolUniqueId equal_Int2_Int2                  = TSymbolUniqueId(403);
>+    static constexpr const TSymbolUniqueId equal_Int3_Int3                  = TSymbolUniqueId(404);
>+    static constexpr const TSymbolUniqueId equal_Int4_Int4                  = TSymbolUniqueId(405);
>+    static constexpr const TSymbolUniqueId equal_UInt2_UInt2                = TSymbolUniqueId(406);
>+    static constexpr const TSymbolUniqueId equal_UInt3_UInt3                = TSymbolUniqueId(407);
>+    static constexpr const TSymbolUniqueId equal_UInt4_UInt4                = TSymbolUniqueId(408);
>+    static constexpr const TSymbolUniqueId equal_Bool2_Bool2                = TSymbolUniqueId(409);
>+    static constexpr const TSymbolUniqueId equal_Bool3_Bool3                = TSymbolUniqueId(410);
>+    static constexpr const TSymbolUniqueId equal_Bool4_Bool4                = TSymbolUniqueId(411);
>+    static constexpr const TSymbolUniqueId notEqual_Float2_Float2           = TSymbolUniqueId(412);
>+    static constexpr const TSymbolUniqueId notEqual_Float3_Float3           = TSymbolUniqueId(413);
>+    static constexpr const TSymbolUniqueId notEqual_Float4_Float4           = TSymbolUniqueId(414);
>+    static constexpr const TSymbolUniqueId notEqual_Int2_Int2               = TSymbolUniqueId(415);
>+    static constexpr const TSymbolUniqueId notEqual_Int3_Int3               = TSymbolUniqueId(416);
>+    static constexpr const TSymbolUniqueId notEqual_Int4_Int4               = TSymbolUniqueId(417);
>+    static constexpr const TSymbolUniqueId notEqual_UInt2_UInt2             = TSymbolUniqueId(418);
>+    static constexpr const TSymbolUniqueId notEqual_UInt3_UInt3             = TSymbolUniqueId(419);
>+    static constexpr const TSymbolUniqueId notEqual_UInt4_UInt4             = TSymbolUniqueId(420);
>+    static constexpr const TSymbolUniqueId notEqual_Bool2_Bool2             = TSymbolUniqueId(421);
>+    static constexpr const TSymbolUniqueId notEqual_Bool3_Bool3             = TSymbolUniqueId(422);
>+    static constexpr const TSymbolUniqueId notEqual_Bool4_Bool4             = TSymbolUniqueId(423);
>+    static constexpr const TSymbolUniqueId any_Bool2                        = TSymbolUniqueId(424);
>+    static constexpr const TSymbolUniqueId any_Bool3                        = TSymbolUniqueId(425);
>+    static constexpr const TSymbolUniqueId any_Bool4                        = TSymbolUniqueId(426);
>+    static constexpr const TSymbolUniqueId all_Bool2                        = TSymbolUniqueId(427);
>+    static constexpr const TSymbolUniqueId all_Bool3                        = TSymbolUniqueId(428);
>+    static constexpr const TSymbolUniqueId all_Bool4                        = TSymbolUniqueId(429);
>+    static constexpr const TSymbolUniqueId notFunc_Bool2                    = TSymbolUniqueId(430);
>+    static constexpr const TSymbolUniqueId notFunc_Bool3                    = TSymbolUniqueId(431);
>+    static constexpr const TSymbolUniqueId notFunc_Bool4                    = TSymbolUniqueId(432);
>+    static constexpr const TSymbolUniqueId bitfieldExtract_Int1_Int1_Int1   = TSymbolUniqueId(433);
>+    static constexpr const TSymbolUniqueId bitfieldExtract_Int2_Int1_Int1   = TSymbolUniqueId(434);
>+    static constexpr const TSymbolUniqueId bitfieldExtract_Int3_Int1_Int1   = TSymbolUniqueId(435);
>+    static constexpr const TSymbolUniqueId bitfieldExtract_Int4_Int1_Int1   = TSymbolUniqueId(436);
>+    static constexpr const TSymbolUniqueId bitfieldExtract_UInt1_Int1_Int1  = TSymbolUniqueId(437);
>+    static constexpr const TSymbolUniqueId bitfieldExtract_UInt2_Int1_Int1  = TSymbolUniqueId(438);
>+    static constexpr const TSymbolUniqueId bitfieldExtract_UInt3_Int1_Int1  = TSymbolUniqueId(439);
>+    static constexpr const TSymbolUniqueId bitfieldExtract_UInt4_Int1_Int1  = TSymbolUniqueId(440);
>+    static constexpr const TSymbolUniqueId bitfieldInsert_Int1_Int1_Int1_Int1 =
>+        TSymbolUniqueId(441);
>+    static constexpr const TSymbolUniqueId bitfieldInsert_Int2_Int2_Int1_Int1 =
>+        TSymbolUniqueId(442);
>+    static constexpr const TSymbolUniqueId bitfieldInsert_Int3_Int3_Int1_Int1 =
>+        TSymbolUniqueId(443);
>+    static constexpr const TSymbolUniqueId bitfieldInsert_Int4_Int4_Int1_Int1 =
>+        TSymbolUniqueId(444);
>+    static constexpr const TSymbolUniqueId bitfieldInsert_UInt1_UInt1_Int1_Int1 =
>+        TSymbolUniqueId(445);
>+    static constexpr const TSymbolUniqueId bitfieldInsert_UInt2_UInt2_Int1_Int1 =
>+        TSymbolUniqueId(446);
>+    static constexpr const TSymbolUniqueId bitfieldInsert_UInt3_UInt3_Int1_Int1 =
>+        TSymbolUniqueId(447);
>+    static constexpr const TSymbolUniqueId bitfieldInsert_UInt4_UInt4_Int1_Int1 =
>+        TSymbolUniqueId(448);
>+    static constexpr const TSymbolUniqueId bitfieldReverse_Int1         = TSymbolUniqueId(449);
>+    static constexpr const TSymbolUniqueId bitfieldReverse_Int2         = TSymbolUniqueId(450);
>+    static constexpr const TSymbolUniqueId bitfieldReverse_Int3         = TSymbolUniqueId(451);
>+    static constexpr const TSymbolUniqueId bitfieldReverse_Int4         = TSymbolUniqueId(452);
>+    static constexpr const TSymbolUniqueId bitfieldReverse_UInt1        = TSymbolUniqueId(453);
>+    static constexpr const TSymbolUniqueId bitfieldReverse_UInt2        = TSymbolUniqueId(454);
>+    static constexpr const TSymbolUniqueId bitfieldReverse_UInt3        = TSymbolUniqueId(455);
>+    static constexpr const TSymbolUniqueId bitfieldReverse_UInt4        = TSymbolUniqueId(456);
>+    static constexpr const TSymbolUniqueId bitCount_Int1                = TSymbolUniqueId(457);
>+    static constexpr const TSymbolUniqueId bitCount_Int2                = TSymbolUniqueId(458);
>+    static constexpr const TSymbolUniqueId bitCount_Int3                = TSymbolUniqueId(459);
>+    static constexpr const TSymbolUniqueId bitCount_Int4                = TSymbolUniqueId(460);
>+    static constexpr const TSymbolUniqueId bitCount_UInt1               = TSymbolUniqueId(461);
>+    static constexpr const TSymbolUniqueId bitCount_UInt2               = TSymbolUniqueId(462);
>+    static constexpr const TSymbolUniqueId bitCount_UInt3               = TSymbolUniqueId(463);
>+    static constexpr const TSymbolUniqueId bitCount_UInt4               = TSymbolUniqueId(464);
>+    static constexpr const TSymbolUniqueId findLSB_Int1                 = TSymbolUniqueId(465);
>+    static constexpr const TSymbolUniqueId findLSB_Int2                 = TSymbolUniqueId(466);
>+    static constexpr const TSymbolUniqueId findLSB_Int3                 = TSymbolUniqueId(467);
>+    static constexpr const TSymbolUniqueId findLSB_Int4                 = TSymbolUniqueId(468);
>+    static constexpr const TSymbolUniqueId findLSB_UInt1                = TSymbolUniqueId(469);
>+    static constexpr const TSymbolUniqueId findLSB_UInt2                = TSymbolUniqueId(470);
>+    static constexpr const TSymbolUniqueId findLSB_UInt3                = TSymbolUniqueId(471);
>+    static constexpr const TSymbolUniqueId findLSB_UInt4                = TSymbolUniqueId(472);
>+    static constexpr const TSymbolUniqueId findMSB_Int1                 = TSymbolUniqueId(473);
>+    static constexpr const TSymbolUniqueId findMSB_Int2                 = TSymbolUniqueId(474);
>+    static constexpr const TSymbolUniqueId findMSB_Int3                 = TSymbolUniqueId(475);
>+    static constexpr const TSymbolUniqueId findMSB_Int4                 = TSymbolUniqueId(476);
>+    static constexpr const TSymbolUniqueId findMSB_UInt1                = TSymbolUniqueId(477);
>+    static constexpr const TSymbolUniqueId findMSB_UInt2                = TSymbolUniqueId(478);
>+    static constexpr const TSymbolUniqueId findMSB_UInt3                = TSymbolUniqueId(479);
>+    static constexpr const TSymbolUniqueId findMSB_UInt4                = TSymbolUniqueId(480);
>+    static constexpr const TSymbolUniqueId uaddCarry_UInt1_UInt1_UInt1  = TSymbolUniqueId(481);
>+    static constexpr const TSymbolUniqueId pt_o_0D                      = TSymbolUniqueId(482);
>+    static constexpr const TSymbolUniqueId uaddCarry_UInt2_UInt2_UInt2  = TSymbolUniqueId(483);
>+    static constexpr const TSymbolUniqueId pt_o_1D                      = TSymbolUniqueId(484);
>+    static constexpr const TSymbolUniqueId uaddCarry_UInt3_UInt3_UInt3  = TSymbolUniqueId(485);
>+    static constexpr const TSymbolUniqueId pt_o_2D                      = TSymbolUniqueId(486);
>+    static constexpr const TSymbolUniqueId uaddCarry_UInt4_UInt4_UInt4  = TSymbolUniqueId(487);
>+    static constexpr const TSymbolUniqueId pt_o_3D                      = TSymbolUniqueId(488);
>+    static constexpr const TSymbolUniqueId usubBorrow_UInt1_UInt1_UInt1 = TSymbolUniqueId(489);
>+    static constexpr const TSymbolUniqueId usubBorrow_UInt2_UInt2_UInt2 = TSymbolUniqueId(490);
>+    static constexpr const TSymbolUniqueId usubBorrow_UInt3_UInt3_UInt3 = TSymbolUniqueId(491);
>+    static constexpr const TSymbolUniqueId usubBorrow_UInt4_UInt4_UInt4 = TSymbolUniqueId(492);
>+    static constexpr const TSymbolUniqueId umulExtended_UInt1_UInt1_UInt1_UInt1 =
>+        TSymbolUniqueId(493);
>+    static constexpr const TSymbolUniqueId umulExtended_UInt2_UInt2_UInt2_UInt2 =
>+        TSymbolUniqueId(494);
>+    static constexpr const TSymbolUniqueId umulExtended_UInt3_UInt3_UInt3_UInt3 =
>+        TSymbolUniqueId(495);
>+    static constexpr const TSymbolUniqueId umulExtended_UInt4_UInt4_UInt4_UInt4 =
>+        TSymbolUniqueId(496);
>+    static constexpr const TSymbolUniqueId imulExtended_Int1_Int1_Int1_Int1 = TSymbolUniqueId(497);
>+    static constexpr const TSymbolUniqueId imulExtended_Int2_Int2_Int2_Int2 = TSymbolUniqueId(498);
>+    static constexpr const TSymbolUniqueId imulExtended_Int3_Int3_Int3_Int3 = TSymbolUniqueId(499);
>+    static constexpr const TSymbolUniqueId imulExtended_Int4_Int4_Int4_Int4 = TSymbolUniqueId(500);
>+    static constexpr const TSymbolUniqueId texture2D_Sampler2D1_Float2      = TSymbolUniqueId(501);
>+    static constexpr const TSymbolUniqueId pt0H                             = TSymbolUniqueId(502);
>+    static constexpr const TSymbolUniqueId texture2DProj_Sampler2D1_Float3  = TSymbolUniqueId(503);
>+    static constexpr const TSymbolUniqueId texture2DProj_Sampler2D1_Float4  = TSymbolUniqueId(504);
>+    static constexpr const TSymbolUniqueId textureCube_SamplerCube1_Float3  = TSymbolUniqueId(505);
>+    static constexpr const TSymbolUniqueId pt0J                             = TSymbolUniqueId(506);
>+    static constexpr const TSymbolUniqueId texture2D_SamplerExternalOES1_Float2 =
>+        TSymbolUniqueId(507);
>+    static constexpr const TSymbolUniqueId pt0L = TSymbolUniqueId(508);
>+    static constexpr const TSymbolUniqueId texture2DProj_SamplerExternalOES1_Float3 =
>+        TSymbolUniqueId(509);
>+    static constexpr const TSymbolUniqueId texture2DProj_SamplerExternalOES1_Float4 =
>+        TSymbolUniqueId(510);
>+    static constexpr const TSymbolUniqueId texture2DRect_Sampler2DRect1_Float2 =
>+        TSymbolUniqueId(511);
>+    static constexpr const TSymbolUniqueId pt0N = TSymbolUniqueId(512);
>+    static constexpr const TSymbolUniqueId texture2DRectProj_Sampler2DRect1_Float3 =
>+        TSymbolUniqueId(513);
>+    static constexpr const TSymbolUniqueId texture2DRectProj_Sampler2DRect1_Float4 =
>+        TSymbolUniqueId(514);
>+    static constexpr const TSymbolUniqueId texture_Sampler2DRect1_Float2     = TSymbolUniqueId(515);
>+    static constexpr const TSymbolUniqueId textureProj_Sampler2DRect1_Float3 = TSymbolUniqueId(516);
>+    static constexpr const TSymbolUniqueId textureProj_Sampler2DRect1_Float4 = TSymbolUniqueId(517);
>+    static constexpr const TSymbolUniqueId texture2DGradEXT_Sampler2D1_Float2_Float2_Float2 =
>+        TSymbolUniqueId(518);
>+    static constexpr const TSymbolUniqueId texture2DProjGradEXT_Sampler2D1_Float3_Float2_Float2 =
>+        TSymbolUniqueId(519);
>+    static constexpr const TSymbolUniqueId texture2DProjGradEXT_Sampler2D1_Float4_Float2_Float2 =
>+        TSymbolUniqueId(520);
>+    static constexpr const TSymbolUniqueId textureCubeGradEXT_SamplerCube1_Float3_Float3_Float3 =
>+        TSymbolUniqueId(521);
>+    static constexpr const TSymbolUniqueId texture2D_Sampler2D1_Float2_Float1 =
>+        TSymbolUniqueId(522);
>+    static constexpr const TSymbolUniqueId texture2DProj_Sampler2D1_Float3_Float1 =
>+        TSymbolUniqueId(523);
>+    static constexpr const TSymbolUniqueId texture2DProj_Sampler2D1_Float4_Float1 =
>+        TSymbolUniqueId(524);
>+    static constexpr const TSymbolUniqueId textureCube_SamplerCube1_Float3_Float1 =
>+        TSymbolUniqueId(525);
>+    static constexpr const TSymbolUniqueId dFdxExt_Float1   = TSymbolUniqueId(526);
>+    static constexpr const TSymbolUniqueId dFdxExt_Float2   = TSymbolUniqueId(527);
>+    static constexpr const TSymbolUniqueId dFdxExt_Float3   = TSymbolUniqueId(528);
>+    static constexpr const TSymbolUniqueId dFdxExt_Float4   = TSymbolUniqueId(529);
>+    static constexpr const TSymbolUniqueId dFdyExt_Float1   = TSymbolUniqueId(530);
>+    static constexpr const TSymbolUniqueId dFdyExt_Float2   = TSymbolUniqueId(531);
>+    static constexpr const TSymbolUniqueId dFdyExt_Float3   = TSymbolUniqueId(532);
>+    static constexpr const TSymbolUniqueId dFdyExt_Float4   = TSymbolUniqueId(533);
>+    static constexpr const TSymbolUniqueId fwidthExt_Float1 = TSymbolUniqueId(534);
>+    static constexpr const TSymbolUniqueId fwidthExt_Float2 = TSymbolUniqueId(535);
>+    static constexpr const TSymbolUniqueId fwidthExt_Float3 = TSymbolUniqueId(536);
>+    static constexpr const TSymbolUniqueId fwidthExt_Float4 = TSymbolUniqueId(537);
>+    static constexpr const TSymbolUniqueId texture2DLodEXT_Sampler2D1_Float2_Float1 =
>+        TSymbolUniqueId(538);
>+    static constexpr const TSymbolUniqueId texture2DProjLodEXT_Sampler2D1_Float3_Float1 =
>+        TSymbolUniqueId(539);
>+    static constexpr const TSymbolUniqueId texture2DProjLodEXT_Sampler2D1_Float4_Float1 =
>+        TSymbolUniqueId(540);
>+    static constexpr const TSymbolUniqueId textureCubeLodEXT_SamplerCube1_Float3_Float1 =
>+        TSymbolUniqueId(541);
>+    static constexpr const TSymbolUniqueId texture2DLod_Sampler2D1_Float2_Float1 =
>+        TSymbolUniqueId(542);
>+    static constexpr const TSymbolUniqueId texture2DProjLod_Sampler2D1_Float3_Float1 =
>+        TSymbolUniqueId(543);
>+    static constexpr const TSymbolUniqueId texture2DProjLod_Sampler2D1_Float4_Float1 =
>+        TSymbolUniqueId(544);
>+    static constexpr const TSymbolUniqueId textureCubeLod_SamplerCube1_Float3_Float1 =
>+        TSymbolUniqueId(545);
>+    static constexpr const TSymbolUniqueId texture_Sampler2D1_Float2       = TSymbolUniqueId(546);
>+    static constexpr const TSymbolUniqueId texture_ISampler2D1_Float2      = TSymbolUniqueId(547);
>+    static constexpr const TSymbolUniqueId pt0Q                            = TSymbolUniqueId(548);
>+    static constexpr const TSymbolUniqueId texture_USampler2D1_Float2      = TSymbolUniqueId(549);
>+    static constexpr const TSymbolUniqueId pt0W                            = TSymbolUniqueId(550);
>+    static constexpr const TSymbolUniqueId texture_Sampler3D1_Float3       = TSymbolUniqueId(551);
>+    static constexpr const TSymbolUniqueId pt0I                            = TSymbolUniqueId(552);
>+    static constexpr const TSymbolUniqueId texture_ISampler3D1_Float3      = TSymbolUniqueId(553);
>+    static constexpr const TSymbolUniqueId pt0R                            = TSymbolUniqueId(554);
>+    static constexpr const TSymbolUniqueId texture_USampler3D1_Float3      = TSymbolUniqueId(555);
>+    static constexpr const TSymbolUniqueId pt0X                            = TSymbolUniqueId(556);
>+    static constexpr const TSymbolUniqueId texture_SamplerCube1_Float3     = TSymbolUniqueId(557);
>+    static constexpr const TSymbolUniqueId texture_ISamplerCube1_Float3    = TSymbolUniqueId(558);
>+    static constexpr const TSymbolUniqueId pt0S                            = TSymbolUniqueId(559);
>+    static constexpr const TSymbolUniqueId texture_USamplerCube1_Float3    = TSymbolUniqueId(560);
>+    static constexpr const TSymbolUniqueId pt0Y                            = TSymbolUniqueId(561);
>+    static constexpr const TSymbolUniqueId texture_Sampler2DArray1_Float3  = TSymbolUniqueId(562);
>+    static constexpr const TSymbolUniqueId pt0K                            = TSymbolUniqueId(563);
>+    static constexpr const TSymbolUniqueId texture_ISampler2DArray1_Float3 = TSymbolUniqueId(564);
>+    static constexpr const TSymbolUniqueId pt0T                            = TSymbolUniqueId(565);
>+    static constexpr const TSymbolUniqueId texture_USampler2DArray1_Float3 = TSymbolUniqueId(566);
>+    static constexpr const TSymbolUniqueId pt0Z                            = TSymbolUniqueId(567);
>+    static constexpr const TSymbolUniqueId textureProj_Sampler2D1_Float3   = TSymbolUniqueId(568);
>+    static constexpr const TSymbolUniqueId textureProj_ISampler2D1_Float3  = TSymbolUniqueId(569);
>+    static constexpr const TSymbolUniqueId textureProj_USampler2D1_Float3  = TSymbolUniqueId(570);
>+    static constexpr const TSymbolUniqueId textureProj_Sampler2D1_Float4   = TSymbolUniqueId(571);
>+    static constexpr const TSymbolUniqueId textureProj_ISampler2D1_Float4  = TSymbolUniqueId(572);
>+    static constexpr const TSymbolUniqueId textureProj_USampler2D1_Float4  = TSymbolUniqueId(573);
>+    static constexpr const TSymbolUniqueId textureProj_Sampler3D1_Float4   = TSymbolUniqueId(574);
>+    static constexpr const TSymbolUniqueId textureProj_ISampler3D1_Float4  = TSymbolUniqueId(575);
>+    static constexpr const TSymbolUniqueId textureProj_USampler3D1_Float4  = TSymbolUniqueId(576);
>+    static constexpr const TSymbolUniqueId textureLod_Sampler2D1_Float2_Float1 =
>+        TSymbolUniqueId(577);
>+    static constexpr const TSymbolUniqueId textureLod_ISampler2D1_Float2_Float1 =
>+        TSymbolUniqueId(578);
>+    static constexpr const TSymbolUniqueId textureLod_USampler2D1_Float2_Float1 =
>+        TSymbolUniqueId(579);
>+    static constexpr const TSymbolUniqueId textureLod_Sampler3D1_Float3_Float1 =
>+        TSymbolUniqueId(580);
>+    static constexpr const TSymbolUniqueId textureLod_ISampler3D1_Float3_Float1 =
>+        TSymbolUniqueId(581);
>+    static constexpr const TSymbolUniqueId textureLod_USampler3D1_Float3_Float1 =
>+        TSymbolUniqueId(582);
>+    static constexpr const TSymbolUniqueId textureLod_SamplerCube1_Float3_Float1 =
>+        TSymbolUniqueId(583);
>+    static constexpr const TSymbolUniqueId textureLod_ISamplerCube1_Float3_Float1 =
>+        TSymbolUniqueId(584);
>+    static constexpr const TSymbolUniqueId textureLod_USamplerCube1_Float3_Float1 =
>+        TSymbolUniqueId(585);
>+    static constexpr const TSymbolUniqueId textureLod_Sampler2DArray1_Float3_Float1 =
>+        TSymbolUniqueId(586);
>+    static constexpr const TSymbolUniqueId textureLod_ISampler2DArray1_Float3_Float1 =
>+        TSymbolUniqueId(587);
>+    static constexpr const TSymbolUniqueId textureLod_USampler2DArray1_Float3_Float1 =
>+        TSymbolUniqueId(588);
>+    static constexpr const TSymbolUniqueId texture_Sampler2DShadow1_Float3   = TSymbolUniqueId(589);
>+    static constexpr const TSymbolUniqueId pt0c                              = TSymbolUniqueId(590);
>+    static constexpr const TSymbolUniqueId texture_SamplerCubeShadow1_Float4 = TSymbolUniqueId(591);
>+    static constexpr const TSymbolUniqueId pt0d                              = TSymbolUniqueId(592);
>+    static constexpr const TSymbolUniqueId texture_Sampler2DArrayShadow1_Float4 =
>+        TSymbolUniqueId(593);
>+    static constexpr const TSymbolUniqueId pt0e = TSymbolUniqueId(594);
>+    static constexpr const TSymbolUniqueId textureProj_Sampler2DShadow1_Float4 =
>+        TSymbolUniqueId(595);
>+    static constexpr const TSymbolUniqueId textureLod_Sampler2DShadow1_Float3_Float1 =
>+        TSymbolUniqueId(596);
>+    static constexpr const TSymbolUniqueId textureSize_Sampler2D1_Int1       = TSymbolUniqueId(597);
>+    static constexpr const TSymbolUniqueId textureSize_ISampler2D1_Int1      = TSymbolUniqueId(598);
>+    static constexpr const TSymbolUniqueId textureSize_USampler2D1_Int1      = TSymbolUniqueId(599);
>+    static constexpr const TSymbolUniqueId textureSize_Sampler3D1_Int1       = TSymbolUniqueId(600);
>+    static constexpr const TSymbolUniqueId textureSize_ISampler3D1_Int1      = TSymbolUniqueId(601);
>+    static constexpr const TSymbolUniqueId textureSize_USampler3D1_Int1      = TSymbolUniqueId(602);
>+    static constexpr const TSymbolUniqueId textureSize_SamplerCube1_Int1     = TSymbolUniqueId(603);
>+    static constexpr const TSymbolUniqueId textureSize_ISamplerCube1_Int1    = TSymbolUniqueId(604);
>+    static constexpr const TSymbolUniqueId textureSize_USamplerCube1_Int1    = TSymbolUniqueId(605);
>+    static constexpr const TSymbolUniqueId textureSize_Sampler2DArray1_Int1  = TSymbolUniqueId(606);
>+    static constexpr const TSymbolUniqueId textureSize_ISampler2DArray1_Int1 = TSymbolUniqueId(607);
>+    static constexpr const TSymbolUniqueId textureSize_USampler2DArray1_Int1 = TSymbolUniqueId(608);
>+    static constexpr const TSymbolUniqueId textureSize_Sampler2DShadow1_Int1 = TSymbolUniqueId(609);
>+    static constexpr const TSymbolUniqueId textureSize_SamplerCubeShadow1_Int1 =
>+        TSymbolUniqueId(610);
>+    static constexpr const TSymbolUniqueId textureSize_Sampler2DArrayShadow1_Int1 =
>+        TSymbolUniqueId(611);
>+    static constexpr const TSymbolUniqueId textureProjLod_Sampler2D1_Float3_Float1 =
>+        TSymbolUniqueId(612);
>+    static constexpr const TSymbolUniqueId textureProjLod_ISampler2D1_Float3_Float1 =
>+        TSymbolUniqueId(613);
>+    static constexpr const TSymbolUniqueId textureProjLod_USampler2D1_Float3_Float1 =
>+        TSymbolUniqueId(614);
>+    static constexpr const TSymbolUniqueId textureProjLod_Sampler2D1_Float4_Float1 =
>+        TSymbolUniqueId(615);
>+    static constexpr const TSymbolUniqueId textureProjLod_ISampler2D1_Float4_Float1 =
>+        TSymbolUniqueId(616);
>+    static constexpr const TSymbolUniqueId textureProjLod_USampler2D1_Float4_Float1 =
>+        TSymbolUniqueId(617);
>+    static constexpr const TSymbolUniqueId textureProjLod_Sampler3D1_Float4_Float1 =
>+        TSymbolUniqueId(618);
>+    static constexpr const TSymbolUniqueId textureProjLod_ISampler3D1_Float4_Float1 =
>+        TSymbolUniqueId(619);
>+    static constexpr const TSymbolUniqueId textureProjLod_USampler3D1_Float4_Float1 =
>+        TSymbolUniqueId(620);
>+    static constexpr const TSymbolUniqueId textureProjLod_Sampler2DShadow1_Float4_Float1 =
>+        TSymbolUniqueId(621);
>+    static constexpr const TSymbolUniqueId texelFetch_Sampler2D1_Int2_Int1  = TSymbolUniqueId(622);
>+    static constexpr const TSymbolUniqueId texelFetch_ISampler2D1_Int2_Int1 = TSymbolUniqueId(623);
>+    static constexpr const TSymbolUniqueId texelFetch_USampler2D1_Int2_Int1 = TSymbolUniqueId(624);
>+    static constexpr const TSymbolUniqueId texelFetch_Sampler3D1_Int3_Int1  = TSymbolUniqueId(625);
>+    static constexpr const TSymbolUniqueId texelFetch_ISampler3D1_Int3_Int1 = TSymbolUniqueId(626);
>+    static constexpr const TSymbolUniqueId texelFetch_USampler3D1_Int3_Int1 = TSymbolUniqueId(627);
>+    static constexpr const TSymbolUniqueId texelFetch_Sampler2DArray1_Int3_Int1 =
>+        TSymbolUniqueId(628);
>+    static constexpr const TSymbolUniqueId texelFetch_ISampler2DArray1_Int3_Int1 =
>+        TSymbolUniqueId(629);
>+    static constexpr const TSymbolUniqueId texelFetch_USampler2DArray1_Int3_Int1 =
>+        TSymbolUniqueId(630);
>+    static constexpr const TSymbolUniqueId textureGrad_Sampler2D1_Float2_Float2_Float2 =
>+        TSymbolUniqueId(631);
>+    static constexpr const TSymbolUniqueId textureGrad_ISampler2D1_Float2_Float2_Float2 =
>+        TSymbolUniqueId(632);
>+    static constexpr const TSymbolUniqueId textureGrad_USampler2D1_Float2_Float2_Float2 =
>+        TSymbolUniqueId(633);
>+    static constexpr const TSymbolUniqueId textureGrad_Sampler3D1_Float3_Float3_Float3 =
>+        TSymbolUniqueId(634);
>+    static constexpr const TSymbolUniqueId textureGrad_ISampler3D1_Float3_Float3_Float3 =
>+        TSymbolUniqueId(635);
>+    static constexpr const TSymbolUniqueId textureGrad_USampler3D1_Float3_Float3_Float3 =
>+        TSymbolUniqueId(636);
>+    static constexpr const TSymbolUniqueId textureGrad_SamplerCube1_Float3_Float3_Float3 =
>+        TSymbolUniqueId(637);
>+    static constexpr const TSymbolUniqueId textureGrad_ISamplerCube1_Float3_Float3_Float3 =
>+        TSymbolUniqueId(638);
>+    static constexpr const TSymbolUniqueId textureGrad_USamplerCube1_Float3_Float3_Float3 =
>+        TSymbolUniqueId(639);
>+    static constexpr const TSymbolUniqueId textureGrad_Sampler2DShadow1_Float3_Float2_Float2 =
>+        TSymbolUniqueId(640);
>+    static constexpr const TSymbolUniqueId textureGrad_SamplerCubeShadow1_Float4_Float3_Float3 =
>+        TSymbolUniqueId(641);
>+    static constexpr const TSymbolUniqueId textureGrad_Sampler2DArray1_Float3_Float2_Float2 =
>+        TSymbolUniqueId(642);
>+    static constexpr const TSymbolUniqueId textureGrad_ISampler2DArray1_Float3_Float2_Float2 =
>+        TSymbolUniqueId(643);
>+    static constexpr const TSymbolUniqueId textureGrad_USampler2DArray1_Float3_Float2_Float2 =
>+        TSymbolUniqueId(644);
>+    static constexpr const TSymbolUniqueId textureGrad_Sampler2DArrayShadow1_Float4_Float2_Float2 =
>+        TSymbolUniqueId(645);
>+    static constexpr const TSymbolUniqueId textureProjGrad_Sampler2D1_Float3_Float2_Float2 =
>+        TSymbolUniqueId(646);
>+    static constexpr const TSymbolUniqueId textureProjGrad_ISampler2D1_Float3_Float2_Float2 =
>+        TSymbolUniqueId(647);
>+    static constexpr const TSymbolUniqueId textureProjGrad_USampler2D1_Float3_Float2_Float2 =
>+        TSymbolUniqueId(648);
>+    static constexpr const TSymbolUniqueId textureProjGrad_Sampler2D1_Float4_Float2_Float2 =
>+        TSymbolUniqueId(649);
>+    static constexpr const TSymbolUniqueId textureProjGrad_ISampler2D1_Float4_Float2_Float2 =
>+        TSymbolUniqueId(650);
>+    static constexpr const TSymbolUniqueId textureProjGrad_USampler2D1_Float4_Float2_Float2 =
>+        TSymbolUniqueId(651);
>+    static constexpr const TSymbolUniqueId textureProjGrad_Sampler3D1_Float4_Float3_Float3 =
>+        TSymbolUniqueId(652);
>+    static constexpr const TSymbolUniqueId textureProjGrad_ISampler3D1_Float4_Float3_Float3 =
>+        TSymbolUniqueId(653);
>+    static constexpr const TSymbolUniqueId textureProjGrad_USampler3D1_Float4_Float3_Float3 =
>+        TSymbolUniqueId(654);
>+    static constexpr const TSymbolUniqueId textureProjGrad_Sampler2DShadow1_Float4_Float2_Float2 =
>+        TSymbolUniqueId(655);
>+    static constexpr const TSymbolUniqueId textureSize_Sampler2DMS1       = TSymbolUniqueId(656);
>+    static constexpr const TSymbolUniqueId pt0O                           = TSymbolUniqueId(657);
>+    static constexpr const TSymbolUniqueId textureSize_ISampler2DMS1      = TSymbolUniqueId(658);
>+    static constexpr const TSymbolUniqueId pt0U                           = TSymbolUniqueId(659);
>+    static constexpr const TSymbolUniqueId textureSize_USampler2DMS1      = TSymbolUniqueId(660);
>+    static constexpr const TSymbolUniqueId pt0a                           = TSymbolUniqueId(661);
>+    static constexpr const TSymbolUniqueId textureSizeExt_Sampler2DMS1    = TSymbolUniqueId(662);
>+    static constexpr const TSymbolUniqueId textureSizeExt_ISampler2DMS1   = TSymbolUniqueId(663);
>+    static constexpr const TSymbolUniqueId textureSizeExt_USampler2DMS1   = TSymbolUniqueId(664);
>+    static constexpr const TSymbolUniqueId textureSize_Sampler2DMSArray1  = TSymbolUniqueId(665);
>+    static constexpr const TSymbolUniqueId pt0P                           = TSymbolUniqueId(666);
>+    static constexpr const TSymbolUniqueId textureSize_ISampler2DMSArray1 = TSymbolUniqueId(667);
>+    static constexpr const TSymbolUniqueId pt0V                           = TSymbolUniqueId(668);
>+    static constexpr const TSymbolUniqueId textureSize_USampler2DMSArray1 = TSymbolUniqueId(669);
>+    static constexpr const TSymbolUniqueId pt0b                           = TSymbolUniqueId(670);
>+    static constexpr const TSymbolUniqueId textureOffset_Sampler2D1_Float2_Int2 =
>+        TSymbolUniqueId(671);
>+    static constexpr const TSymbolUniqueId textureOffset_ISampler2D1_Float2_Int2 =
>+        TSymbolUniqueId(672);
>+    static constexpr const TSymbolUniqueId textureOffset_USampler2D1_Float2_Int2 =
>+        TSymbolUniqueId(673);
>+    static constexpr const TSymbolUniqueId textureOffset_Sampler3D1_Float3_Int3 =
>+        TSymbolUniqueId(674);
>+    static constexpr const TSymbolUniqueId textureOffset_ISampler3D1_Float3_Int3 =
>+        TSymbolUniqueId(675);
>+    static constexpr const TSymbolUniqueId textureOffset_USampler3D1_Float3_Int3 =
>+        TSymbolUniqueId(676);
>+    static constexpr const TSymbolUniqueId textureOffset_Sampler2DShadow1_Float3_Int2 =
>+        TSymbolUniqueId(677);
>+    static constexpr const TSymbolUniqueId textureOffset_Sampler2DArray1_Float3_Int2 =
>+        TSymbolUniqueId(678);
>+    static constexpr const TSymbolUniqueId textureOffset_ISampler2DArray1_Float3_Int2 =
>+        TSymbolUniqueId(679);
>+    static constexpr const TSymbolUniqueId textureOffset_USampler2DArray1_Float3_Int2 =
>+        TSymbolUniqueId(680);
>+    static constexpr const TSymbolUniqueId textureProjOffset_Sampler2D1_Float3_Int2 =
>+        TSymbolUniqueId(681);
>+    static constexpr const TSymbolUniqueId textureProjOffset_ISampler2D1_Float3_Int2 =
>+        TSymbolUniqueId(682);
>+    static constexpr const TSymbolUniqueId textureProjOffset_USampler2D1_Float3_Int2 =
>+        TSymbolUniqueId(683);
>+    static constexpr const TSymbolUniqueId textureProjOffset_Sampler2D1_Float4_Int2 =
>+        TSymbolUniqueId(684);
>+    static constexpr const TSymbolUniqueId textureProjOffset_ISampler2D1_Float4_Int2 =
>+        TSymbolUniqueId(685);
>+    static constexpr const TSymbolUniqueId textureProjOffset_USampler2D1_Float4_Int2 =
>+        TSymbolUniqueId(686);
>+    static constexpr const TSymbolUniqueId textureProjOffset_Sampler3D1_Float4_Int3 =
>+        TSymbolUniqueId(687);
>+    static constexpr const TSymbolUniqueId textureProjOffset_ISampler3D1_Float4_Int3 =
>+        TSymbolUniqueId(688);
>+    static constexpr const TSymbolUniqueId textureProjOffset_USampler3D1_Float4_Int3 =
>+        TSymbolUniqueId(689);
>+    static constexpr const TSymbolUniqueId textureProjOffset_Sampler2DShadow1_Float4_Int2 =
>+        TSymbolUniqueId(690);
>+    static constexpr const TSymbolUniqueId textureLodOffset_Sampler2D1_Float2_Float1_Int2 =
>+        TSymbolUniqueId(691);
>+    static constexpr const TSymbolUniqueId textureLodOffset_ISampler2D1_Float2_Float1_Int2 =
>+        TSymbolUniqueId(692);
>+    static constexpr const TSymbolUniqueId textureLodOffset_USampler2D1_Float2_Float1_Int2 =
>+        TSymbolUniqueId(693);
>+    static constexpr const TSymbolUniqueId textureLodOffset_Sampler3D1_Float3_Float1_Int3 =
>+        TSymbolUniqueId(694);
>+    static constexpr const TSymbolUniqueId textureLodOffset_ISampler3D1_Float3_Float1_Int3 =
>+        TSymbolUniqueId(695);
>+    static constexpr const TSymbolUniqueId textureLodOffset_USampler3D1_Float3_Float1_Int3 =
>+        TSymbolUniqueId(696);
>+    static constexpr const TSymbolUniqueId textureLodOffset_Sampler2DShadow1_Float3_Float1_Int2 =
>+        TSymbolUniqueId(697);
>+    static constexpr const TSymbolUniqueId textureLodOffset_Sampler2DArray1_Float3_Float1_Int2 =
>+        TSymbolUniqueId(698);
>+    static constexpr const TSymbolUniqueId textureLodOffset_ISampler2DArray1_Float3_Float1_Int2 =
>+        TSymbolUniqueId(699);
>+    static constexpr const TSymbolUniqueId textureLodOffset_USampler2DArray1_Float3_Float1_Int2 =
>+        TSymbolUniqueId(700);
>+    static constexpr const TSymbolUniqueId textureProjLodOffset_Sampler2D1_Float3_Float1_Int2 =
>+        TSymbolUniqueId(701);
>+    static constexpr const TSymbolUniqueId textureProjLodOffset_ISampler2D1_Float3_Float1_Int2 =
>+        TSymbolUniqueId(702);
>+    static constexpr const TSymbolUniqueId textureProjLodOffset_USampler2D1_Float3_Float1_Int2 =
>+        TSymbolUniqueId(703);
>+    static constexpr const TSymbolUniqueId textureProjLodOffset_Sampler2D1_Float4_Float1_Int2 =
>+        TSymbolUniqueId(704);
>+    static constexpr const TSymbolUniqueId textureProjLodOffset_ISampler2D1_Float4_Float1_Int2 =
>+        TSymbolUniqueId(705);
>+    static constexpr const TSymbolUniqueId textureProjLodOffset_USampler2D1_Float4_Float1_Int2 =
>+        TSymbolUniqueId(706);
>+    static constexpr const TSymbolUniqueId textureProjLodOffset_Sampler3D1_Float4_Float1_Int3 =
>+        TSymbolUniqueId(707);
>+    static constexpr const TSymbolUniqueId textureProjLodOffset_ISampler3D1_Float4_Float1_Int3 =
>+        TSymbolUniqueId(708);
>+    static constexpr const TSymbolUniqueId textureProjLodOffset_USampler3D1_Float4_Float1_Int3 =
>+        TSymbolUniqueId(709);
>+    static constexpr const TSymbolUniqueId
>+        textureProjLodOffset_Sampler2DShadow1_Float4_Float1_Int2 = TSymbolUniqueId(710);
>+    static constexpr const TSymbolUniqueId texelFetchOffset_Sampler2D1_Int2_Int1_Int2 =
>+        TSymbolUniqueId(711);
>+    static constexpr const TSymbolUniqueId texelFetchOffset_ISampler2D1_Int2_Int1_Int2 =
>+        TSymbolUniqueId(712);
>+    static constexpr const TSymbolUniqueId texelFetchOffset_USampler2D1_Int2_Int1_Int2 =
>+        TSymbolUniqueId(713);
>+    static constexpr const TSymbolUniqueId texelFetchOffset_Sampler3D1_Int3_Int1_Int3 =
>+        TSymbolUniqueId(714);
>+    static constexpr const TSymbolUniqueId texelFetchOffset_ISampler3D1_Int3_Int1_Int3 =
>+        TSymbolUniqueId(715);
>+    static constexpr const TSymbolUniqueId texelFetchOffset_USampler3D1_Int3_Int1_Int3 =
>+        TSymbolUniqueId(716);
>+    static constexpr const TSymbolUniqueId texelFetchOffset_Sampler2DArray1_Int3_Int1_Int2 =
>+        TSymbolUniqueId(717);
>+    static constexpr const TSymbolUniqueId texelFetchOffset_ISampler2DArray1_Int3_Int1_Int2 =
>+        TSymbolUniqueId(718);
>+    static constexpr const TSymbolUniqueId texelFetchOffset_USampler2DArray1_Int3_Int1_Int2 =
>+        TSymbolUniqueId(719);
>+    static constexpr const TSymbolUniqueId textureGradOffset_Sampler2D1_Float2_Float2_Float2_Int2 =
>+        TSymbolUniqueId(720);
>+    static constexpr const TSymbolUniqueId textureGradOffset_ISampler2D1_Float2_Float2_Float2_Int2 =
>+        TSymbolUniqueId(721);
>+    static constexpr const TSymbolUniqueId textureGradOffset_USampler2D1_Float2_Float2_Float2_Int2 =
>+        TSymbolUniqueId(722);
>+    static constexpr const TSymbolUniqueId textureGradOffset_Sampler3D1_Float3_Float3_Float3_Int3 =
>+        TSymbolUniqueId(723);
>+    static constexpr const TSymbolUniqueId textureGradOffset_ISampler3D1_Float3_Float3_Float3_Int3 =
>+        TSymbolUniqueId(724);
>+    static constexpr const TSymbolUniqueId textureGradOffset_USampler3D1_Float3_Float3_Float3_Int3 =
>+        TSymbolUniqueId(725);
>+    static constexpr const TSymbolUniqueId
>+        textureGradOffset_Sampler2DShadow1_Float3_Float2_Float2_Int2 = TSymbolUniqueId(726);
>+    static constexpr const TSymbolUniqueId
>+        textureGradOffset_Sampler2DArray1_Float3_Float2_Float2_Int2 = TSymbolUniqueId(727);
>+    static constexpr const TSymbolUniqueId
>+        textureGradOffset_ISampler2DArray1_Float3_Float2_Float2_Int2 = TSymbolUniqueId(728);
>+    static constexpr const TSymbolUniqueId
>+        textureGradOffset_USampler2DArray1_Float3_Float2_Float2_Int2 = TSymbolUniqueId(729);
>+    static constexpr const TSymbolUniqueId
>+        textureGradOffset_Sampler2DArrayShadow1_Float4_Float2_Float2_Int2 = TSymbolUniqueId(730);
>+    static constexpr const TSymbolUniqueId
>+        textureProjGradOffset_Sampler2D1_Float3_Float2_Float2_Int2 = TSymbolUniqueId(731);
>+    static constexpr const TSymbolUniqueId
>+        textureProjGradOffset_ISampler2D1_Float3_Float2_Float2_Int2 = TSymbolUniqueId(732);
>+    static constexpr const TSymbolUniqueId
>+        textureProjGradOffset_USampler2D1_Float3_Float2_Float2_Int2 = TSymbolUniqueId(733);
>+    static constexpr const TSymbolUniqueId
>+        textureProjGradOffset_Sampler2D1_Float4_Float2_Float2_Int2 = TSymbolUniqueId(734);
>+    static constexpr const TSymbolUniqueId
>+        textureProjGradOffset_ISampler2D1_Float4_Float2_Float2_Int2 = TSymbolUniqueId(735);
>+    static constexpr const TSymbolUniqueId
>+        textureProjGradOffset_USampler2D1_Float4_Float2_Float2_Int2 = TSymbolUniqueId(736);
>+    static constexpr const TSymbolUniqueId
>+        textureProjGradOffset_Sampler3D1_Float4_Float3_Float3_Int3 = TSymbolUniqueId(737);
>+    static constexpr const TSymbolUniqueId
>+        textureProjGradOffset_ISampler3D1_Float4_Float3_Float3_Int3 = TSymbolUniqueId(738);
>+    static constexpr const TSymbolUniqueId
>+        textureProjGradOffset_USampler3D1_Float4_Float3_Float3_Int3 = TSymbolUniqueId(739);
>+    static constexpr const TSymbolUniqueId
>+        textureProjGradOffset_Sampler2DShadow1_Float4_Float2_Float2_Int2 = TSymbolUniqueId(740);
>+    static constexpr const TSymbolUniqueId textureOffset_Sampler2D1_Float2_Int2_Float1 =
>+        TSymbolUniqueId(741);
>+    static constexpr const TSymbolUniqueId textureOffset_ISampler2D1_Float2_Int2_Float1 =
>+        TSymbolUniqueId(742);
>+    static constexpr const TSymbolUniqueId textureOffset_USampler2D1_Float2_Int2_Float1 =
>+        TSymbolUniqueId(743);
>+    static constexpr const TSymbolUniqueId textureOffset_Sampler3D1_Float3_Int3_Float1 =
>+        TSymbolUniqueId(744);
>+    static constexpr const TSymbolUniqueId textureOffset_ISampler3D1_Float3_Int3_Float1 =
>+        TSymbolUniqueId(745);
>+    static constexpr const TSymbolUniqueId textureOffset_USampler3D1_Float3_Int3_Float1 =
>+        TSymbolUniqueId(746);
>+    static constexpr const TSymbolUniqueId textureOffset_Sampler2DShadow1_Float3_Int2_Float1 =
>+        TSymbolUniqueId(747);
>+    static constexpr const TSymbolUniqueId textureOffset_Sampler2DArray1_Float3_Int2_Float1 =
>+        TSymbolUniqueId(748);
>+    static constexpr const TSymbolUniqueId textureOffset_ISampler2DArray1_Float3_Int2_Float1 =
>+        TSymbolUniqueId(749);
>+    static constexpr const TSymbolUniqueId textureOffset_USampler2DArray1_Float3_Int2_Float1 =
>+        TSymbolUniqueId(750);
>+    static constexpr const TSymbolUniqueId textureProjOffset_Sampler2D1_Float3_Int2_Float1 =
>+        TSymbolUniqueId(751);
>+    static constexpr const TSymbolUniqueId textureProjOffset_ISampler2D1_Float3_Int2_Float1 =
>+        TSymbolUniqueId(752);
>+    static constexpr const TSymbolUniqueId textureProjOffset_USampler2D1_Float3_Int2_Float1 =
>+        TSymbolUniqueId(753);
>+    static constexpr const TSymbolUniqueId textureProjOffset_Sampler2D1_Float4_Int2_Float1 =
>+        TSymbolUniqueId(754);
>+    static constexpr const TSymbolUniqueId textureProjOffset_ISampler2D1_Float4_Int2_Float1 =
>+        TSymbolUniqueId(755);
>+    static constexpr const TSymbolUniqueId textureProjOffset_USampler2D1_Float4_Int2_Float1 =
>+        TSymbolUniqueId(756);
>+    static constexpr const TSymbolUniqueId textureProjOffset_Sampler3D1_Float4_Int3_Float1 =
>+        TSymbolUniqueId(757);
>+    static constexpr const TSymbolUniqueId textureProjOffset_ISampler3D1_Float4_Int3_Float1 =
>+        TSymbolUniqueId(758);
>+    static constexpr const TSymbolUniqueId textureProjOffset_USampler3D1_Float4_Int3_Float1 =
>+        TSymbolUniqueId(759);
>+    static constexpr const TSymbolUniqueId textureProjOffset_Sampler2DShadow1_Float4_Int2_Float1 =
>+        TSymbolUniqueId(760);
>+    static constexpr const TSymbolUniqueId texture_SamplerExternalOES1_Float2 =
>+        TSymbolUniqueId(761);
>+    static constexpr const TSymbolUniqueId textureProj_SamplerExternalOES1_Float3 =
>+        TSymbolUniqueId(762);
>+    static constexpr const TSymbolUniqueId textureProj_SamplerExternalOES1_Float4 =
>+        TSymbolUniqueId(763);
>+    static constexpr const TSymbolUniqueId textureSize_SamplerExternalOES1_Int1 =
>+        TSymbolUniqueId(764);
>+    static constexpr const TSymbolUniqueId texelFetch_SamplerExternalOES1_Int2_Int1 =
>+        TSymbolUniqueId(765);
>+    static constexpr const TSymbolUniqueId texture_SamplerExternal2DY2YEXT1_Float2 =
>+        TSymbolUniqueId(766);
>+    static constexpr const TSymbolUniqueId pt0M = TSymbolUniqueId(767);
>+    static constexpr const TSymbolUniqueId textureProj_SamplerExternal2DY2YEXT1_Float3 =
>+        TSymbolUniqueId(768);
>+    static constexpr const TSymbolUniqueId textureProj_SamplerExternal2DY2YEXT1_Float4 =
>+        TSymbolUniqueId(769);
>+    static constexpr const TSymbolUniqueId rgb_2_yuv_Float3_YuvCscStandardEXT1 =
>+        TSymbolUniqueId(770);
>+    static constexpr const TSymbolUniqueId pt0G = TSymbolUniqueId(771);
>+    static constexpr const TSymbolUniqueId yuv_2_rgb_Float3_YuvCscStandardEXT1 =
>+        TSymbolUniqueId(772);
>+    static constexpr const TSymbolUniqueId textureSize_SamplerExternal2DY2YEXT1_Int1 =
>+        TSymbolUniqueId(773);
>+    static constexpr const TSymbolUniqueId texelFetch_SamplerExternal2DY2YEXT1_Int2_Int1 =
>+        TSymbolUniqueId(774);
>+    static constexpr const TSymbolUniqueId texture_Sampler2D1_Float2_Float1  = TSymbolUniqueId(775);
>+    static constexpr const TSymbolUniqueId texture_ISampler2D1_Float2_Float1 = TSymbolUniqueId(776);
>+    static constexpr const TSymbolUniqueId texture_USampler2D1_Float2_Float1 = TSymbolUniqueId(777);
>+    static constexpr const TSymbolUniqueId texture_Sampler3D1_Float3_Float1  = TSymbolUniqueId(778);
>+    static constexpr const TSymbolUniqueId texture_ISampler3D1_Float3_Float1 = TSymbolUniqueId(779);
>+    static constexpr const TSymbolUniqueId texture_USampler3D1_Float3_Float1 = TSymbolUniqueId(780);
>+    static constexpr const TSymbolUniqueId texture_SamplerCube1_Float3_Float1 =
>+        TSymbolUniqueId(781);
>+    static constexpr const TSymbolUniqueId texture_ISamplerCube1_Float3_Float1 =
>+        TSymbolUniqueId(782);
>+    static constexpr const TSymbolUniqueId texture_USamplerCube1_Float3_Float1 =
>+        TSymbolUniqueId(783);
>+    static constexpr const TSymbolUniqueId texture_Sampler2DArray1_Float3_Float1 =
>+        TSymbolUniqueId(784);
>+    static constexpr const TSymbolUniqueId texture_ISampler2DArray1_Float3_Float1 =
>+        TSymbolUniqueId(785);
>+    static constexpr const TSymbolUniqueId texture_USampler2DArray1_Float3_Float1 =
>+        TSymbolUniqueId(786);
>+    static constexpr const TSymbolUniqueId textureProj_Sampler2D1_Float3_Float1 =
>+        TSymbolUniqueId(787);
>+    static constexpr const TSymbolUniqueId textureProj_ISampler2D1_Float3_Float1 =
>+        TSymbolUniqueId(788);
>+    static constexpr const TSymbolUniqueId textureProj_USampler2D1_Float3_Float1 =
>+        TSymbolUniqueId(789);
>+    static constexpr const TSymbolUniqueId textureProj_Sampler2D1_Float4_Float1 =
>+        TSymbolUniqueId(790);
>+    static constexpr const TSymbolUniqueId textureProj_ISampler2D1_Float4_Float1 =
>+        TSymbolUniqueId(791);
>+    static constexpr const TSymbolUniqueId textureProj_USampler2D1_Float4_Float1 =
>+        TSymbolUniqueId(792);
>+    static constexpr const TSymbolUniqueId textureProj_Sampler3D1_Float4_Float1 =
>+        TSymbolUniqueId(793);
>+    static constexpr const TSymbolUniqueId textureProj_ISampler3D1_Float4_Float1 =
>+        TSymbolUniqueId(794);
>+    static constexpr const TSymbolUniqueId textureProj_USampler3D1_Float4_Float1 =
>+        TSymbolUniqueId(795);
>+    static constexpr const TSymbolUniqueId texture_Sampler2DShadow1_Float3_Float1 =
>+        TSymbolUniqueId(796);
>+    static constexpr const TSymbolUniqueId texture_SamplerCubeShadow1_Float4_Float1 =
>+        TSymbolUniqueId(797);
>+    static constexpr const TSymbolUniqueId textureProj_Sampler2DShadow1_Float4_Float1 =
>+        TSymbolUniqueId(798);
>+    static constexpr const TSymbolUniqueId texture_SamplerExternalOES1_Float2_Float1 =
>+        TSymbolUniqueId(799);
>+    static constexpr const TSymbolUniqueId textureProj_SamplerExternalOES1_Float3_Float1 =
>+        TSymbolUniqueId(800);
>+    static constexpr const TSymbolUniqueId textureProj_SamplerExternalOES1_Float4_Float1 =
>+        TSymbolUniqueId(801);
>+    static constexpr const TSymbolUniqueId texture_SamplerExternal2DY2YEXT1_Float2_Float1 =
>+        TSymbolUniqueId(802);
>+    static constexpr const TSymbolUniqueId textureProj_SamplerExternal2DY2YEXT1_Float3_Float1 =
>+        TSymbolUniqueId(803);
>+    static constexpr const TSymbolUniqueId textureProj_SamplerExternal2DY2YEXT1_Float4_Float1 =
>+        TSymbolUniqueId(804);
>+    static constexpr const TSymbolUniqueId texelFetch_Sampler2DMS1_Int2_Int1 = TSymbolUniqueId(805);
>+    static constexpr const TSymbolUniqueId texelFetch_ISampler2DMS1_Int2_Int1 =
>+        TSymbolUniqueId(806);
>+    static constexpr const TSymbolUniqueId texelFetch_USampler2DMS1_Int2_Int1 =
>+        TSymbolUniqueId(807);
>+    static constexpr const TSymbolUniqueId texelFetchExt_Sampler2DMS1_Int2_Int1 =
>+        TSymbolUniqueId(808);
>+    static constexpr const TSymbolUniqueId texelFetchExt_ISampler2DMS1_Int2_Int1 =
>+        TSymbolUniqueId(809);
>+    static constexpr const TSymbolUniqueId texelFetchExt_USampler2DMS1_Int2_Int1 =
>+        TSymbolUniqueId(810);
>+    static constexpr const TSymbolUniqueId texelFetch_Sampler2DMSArray1_Int3_Int1 =
>+        TSymbolUniqueId(811);
>+    static constexpr const TSymbolUniqueId texelFetch_ISampler2DMSArray1_Int3_Int1 =
>+        TSymbolUniqueId(812);
>+    static constexpr const TSymbolUniqueId texelFetch_USampler2DMSArray1_Int3_Int1 =
>+        TSymbolUniqueId(813);
>+    static constexpr const TSymbolUniqueId textureGather_Sampler2D1_Float2  = TSymbolUniqueId(814);
>+    static constexpr const TSymbolUniqueId textureGather_ISampler2D1_Float2 = TSymbolUniqueId(815);
>+    static constexpr const TSymbolUniqueId textureGather_USampler2D1_Float2 = TSymbolUniqueId(816);
>+    static constexpr const TSymbolUniqueId textureGather_Sampler2D1_Float2_Int1 =
>+        TSymbolUniqueId(817);
>+    static constexpr const TSymbolUniqueId textureGather_ISampler2D1_Float2_Int1 =
>+        TSymbolUniqueId(818);
>+    static constexpr const TSymbolUniqueId textureGather_USampler2D1_Float2_Int1 =
>+        TSymbolUniqueId(819);
>+    static constexpr const TSymbolUniqueId textureGather_Sampler2DArray1_Float3 =
>+        TSymbolUniqueId(820);
>+    static constexpr const TSymbolUniqueId textureGather_ISampler2DArray1_Float3 =
>+        TSymbolUniqueId(821);
>+    static constexpr const TSymbolUniqueId textureGather_USampler2DArray1_Float3 =
>+        TSymbolUniqueId(822);
>+    static constexpr const TSymbolUniqueId textureGather_Sampler2DArray1_Float3_Int1 =
>+        TSymbolUniqueId(823);
>+    static constexpr const TSymbolUniqueId textureGather_ISampler2DArray1_Float3_Int1 =
>+        TSymbolUniqueId(824);
>+    static constexpr const TSymbolUniqueId textureGather_USampler2DArray1_Float3_Int1 =
>+        TSymbolUniqueId(825);
>+    static constexpr const TSymbolUniqueId textureGather_SamplerCube1_Float3 = TSymbolUniqueId(826);
>+    static constexpr const TSymbolUniqueId textureGather_ISamplerCube1_Float3 =
>+        TSymbolUniqueId(827);
>+    static constexpr const TSymbolUniqueId textureGather_USamplerCube1_Float3 =
>+        TSymbolUniqueId(828);
>+    static constexpr const TSymbolUniqueId textureGather_SamplerCube1_Float3_Int1 =
>+        TSymbolUniqueId(829);
>+    static constexpr const TSymbolUniqueId textureGather_ISamplerCube1_Float3_Int1 =
>+        TSymbolUniqueId(830);
>+    static constexpr const TSymbolUniqueId textureGather_USamplerCube1_Float3_Int1 =
>+        TSymbolUniqueId(831);
>+    static constexpr const TSymbolUniqueId textureGather_Sampler2DShadow1_Float2 =
>+        TSymbolUniqueId(832);
>+    static constexpr const TSymbolUniqueId textureGather_Sampler2DShadow1_Float2_Float1 =
>+        TSymbolUniqueId(833);
>+    static constexpr const TSymbolUniqueId textureGather_Sampler2DArrayShadow1_Float3 =
>+        TSymbolUniqueId(834);
>+    static constexpr const TSymbolUniqueId textureGather_Sampler2DArrayShadow1_Float3_Float1 =
>+        TSymbolUniqueId(835);
>+    static constexpr const TSymbolUniqueId textureGather_SamplerCubeShadow1_Float3 =
>+        TSymbolUniqueId(836);
>+    static constexpr const TSymbolUniqueId textureGather_SamplerCubeShadow1_Float3_Float1 =
>+        TSymbolUniqueId(837);
>+    static constexpr const TSymbolUniqueId textureGatherOffset_Sampler2D1_Float2_Int2 =
>+        TSymbolUniqueId(838);
>+    static constexpr const TSymbolUniqueId textureGatherOffset_ISampler2D1_Float2_Int2 =
>+        TSymbolUniqueId(839);
>+    static constexpr const TSymbolUniqueId textureGatherOffset_USampler2D1_Float2_Int2 =
>+        TSymbolUniqueId(840);
>+    static constexpr const TSymbolUniqueId textureGatherOffset_Sampler2D1_Float2_Int2_Int1 =
>+        TSymbolUniqueId(841);
>+    static constexpr const TSymbolUniqueId textureGatherOffset_ISampler2D1_Float2_Int2_Int1 =
>+        TSymbolUniqueId(842);
>+    static constexpr const TSymbolUniqueId textureGatherOffset_USampler2D1_Float2_Int2_Int1 =
>+        TSymbolUniqueId(843);
>+    static constexpr const TSymbolUniqueId textureGatherOffset_Sampler2DArray1_Float3_Int2 =
>+        TSymbolUniqueId(844);
>+    static constexpr const TSymbolUniqueId textureGatherOffset_ISampler2DArray1_Float3_Int2 =
>+        TSymbolUniqueId(845);
>+    static constexpr const TSymbolUniqueId textureGatherOffset_USampler2DArray1_Float3_Int2 =
>+        TSymbolUniqueId(846);
>+    static constexpr const TSymbolUniqueId textureGatherOffset_Sampler2DArray1_Float3_Int2_Int1 =
>+        TSymbolUniqueId(847);
>+    static constexpr const TSymbolUniqueId textureGatherOffset_ISampler2DArray1_Float3_Int2_Int1 =
>+        TSymbolUniqueId(848);
>+    static constexpr const TSymbolUniqueId textureGatherOffset_USampler2DArray1_Float3_Int2_Int1 =
>+        TSymbolUniqueId(849);
>+    static constexpr const TSymbolUniqueId textureGatherOffset_Sampler2DShadow1_Float2_Float1_Int2 =
>+        TSymbolUniqueId(850);
>+    static constexpr const TSymbolUniqueId
>+        textureGatherOffset_Sampler2DArrayShadow1_Float3_Float1_Int2    = TSymbolUniqueId(851);
>+    static constexpr const TSymbolUniqueId dFdx_Float1                  = TSymbolUniqueId(852);
>+    static constexpr const TSymbolUniqueId dFdx_Float2                  = TSymbolUniqueId(853);
>+    static constexpr const TSymbolUniqueId dFdx_Float3                  = TSymbolUniqueId(854);
>+    static constexpr const TSymbolUniqueId dFdx_Float4                  = TSymbolUniqueId(855);
>+    static constexpr const TSymbolUniqueId dFdy_Float1                  = TSymbolUniqueId(856);
>+    static constexpr const TSymbolUniqueId dFdy_Float2                  = TSymbolUniqueId(857);
>+    static constexpr const TSymbolUniqueId dFdy_Float3                  = TSymbolUniqueId(858);
>+    static constexpr const TSymbolUniqueId dFdy_Float4                  = TSymbolUniqueId(859);
>+    static constexpr const TSymbolUniqueId fwidth_Float1                = TSymbolUniqueId(860);
>+    static constexpr const TSymbolUniqueId fwidth_Float2                = TSymbolUniqueId(861);
>+    static constexpr const TSymbolUniqueId fwidth_Float3                = TSymbolUniqueId(862);
>+    static constexpr const TSymbolUniqueId fwidth_Float4                = TSymbolUniqueId(863);
>+    static constexpr const TSymbolUniqueId atomicCounter_AtomicCounter1 = TSymbolUniqueId(864);
>+    static constexpr const TSymbolUniqueId pt0F                         = TSymbolUniqueId(865);
>+    static constexpr const TSymbolUniqueId atomicCounterIncrement_AtomicCounter1 =
>+        TSymbolUniqueId(866);
>+    static constexpr const TSymbolUniqueId atomicCounterDecrement_AtomicCounter1 =
>+        TSymbolUniqueId(867);
>+    static constexpr const TSymbolUniqueId atomicAdd_UInt1_UInt1            = TSymbolUniqueId(868);
>+    static constexpr const TSymbolUniqueId pt_io_0D                         = TSymbolUniqueId(869);
>+    static constexpr const TSymbolUniqueId atomicAdd_Int1_Int1              = TSymbolUniqueId(870);
>+    static constexpr const TSymbolUniqueId pt_io_0C                         = TSymbolUniqueId(871);
>+    static constexpr const TSymbolUniqueId atomicMin_UInt1_UInt1            = TSymbolUniqueId(872);
>+    static constexpr const TSymbolUniqueId atomicMin_Int1_Int1              = TSymbolUniqueId(873);
>+    static constexpr const TSymbolUniqueId atomicMax_UInt1_UInt1            = TSymbolUniqueId(874);
>+    static constexpr const TSymbolUniqueId atomicMax_Int1_Int1              = TSymbolUniqueId(875);
>+    static constexpr const TSymbolUniqueId atomicAnd_UInt1_UInt1            = TSymbolUniqueId(876);
>+    static constexpr const TSymbolUniqueId atomicAnd_Int1_Int1              = TSymbolUniqueId(877);
>+    static constexpr const TSymbolUniqueId atomicOr_UInt1_UInt1             = TSymbolUniqueId(878);
>+    static constexpr const TSymbolUniqueId atomicOr_Int1_Int1               = TSymbolUniqueId(879);
>+    static constexpr const TSymbolUniqueId atomicXor_UInt1_UInt1            = TSymbolUniqueId(880);
>+    static constexpr const TSymbolUniqueId atomicXor_Int1_Int1              = TSymbolUniqueId(881);
>+    static constexpr const TSymbolUniqueId atomicExchange_UInt1_UInt1       = TSymbolUniqueId(882);
>+    static constexpr const TSymbolUniqueId atomicExchange_Int1_Int1         = TSymbolUniqueId(883);
>+    static constexpr const TSymbolUniqueId atomicCompSwap_UInt1_UInt1_UInt1 = TSymbolUniqueId(884);
>+    static constexpr const TSymbolUniqueId atomicCompSwap_Int1_Int1_Int1    = TSymbolUniqueId(885);
>+    static constexpr const TSymbolUniqueId imageSize_Image2D1               = TSymbolUniqueId(886);
>+    static constexpr const TSymbolUniqueId pt0f                             = TSymbolUniqueId(887);
>+    static constexpr const TSymbolUniqueId imageSize_IImage2D1              = TSymbolUniqueId(888);
>+    static constexpr const TSymbolUniqueId pt0g                             = TSymbolUniqueId(889);
>+    static constexpr const TSymbolUniqueId imageSize_UImage2D1              = TSymbolUniqueId(890);
>+    static constexpr const TSymbolUniqueId pt0h                             = TSymbolUniqueId(891);
>+    static constexpr const TSymbolUniqueId imageSize_Image3D1               = TSymbolUniqueId(892);
>+    static constexpr const TSymbolUniqueId pt0i                             = TSymbolUniqueId(893);
>+    static constexpr const TSymbolUniqueId imageSize_IImage3D1              = TSymbolUniqueId(894);
>+    static constexpr const TSymbolUniqueId pt0j                             = TSymbolUniqueId(895);
>+    static constexpr const TSymbolUniqueId imageSize_UImage3D1              = TSymbolUniqueId(896);
>+    static constexpr const TSymbolUniqueId pt0k                             = TSymbolUniqueId(897);
>+    static constexpr const TSymbolUniqueId imageSize_Image2DArray1          = TSymbolUniqueId(898);
>+    static constexpr const TSymbolUniqueId pt0l                             = TSymbolUniqueId(899);
>+    static constexpr const TSymbolUniqueId imageSize_IImage2DArray1         = TSymbolUniqueId(900);
>+    static constexpr const TSymbolUniqueId pt0m                             = TSymbolUniqueId(901);
>+    static constexpr const TSymbolUniqueId imageSize_UImage2DArray1         = TSymbolUniqueId(902);
>+    static constexpr const TSymbolUniqueId pt0n                             = TSymbolUniqueId(903);
>+    static constexpr const TSymbolUniqueId imageSize_ImageCube1             = TSymbolUniqueId(904);
>+    static constexpr const TSymbolUniqueId pt0o                             = TSymbolUniqueId(905);
>+    static constexpr const TSymbolUniqueId imageSize_IImageCube1            = TSymbolUniqueId(906);
>+    static constexpr const TSymbolUniqueId pt0p                             = TSymbolUniqueId(907);
>+    static constexpr const TSymbolUniqueId imageSize_UImageCube1            = TSymbolUniqueId(908);
>+    static constexpr const TSymbolUniqueId pt0q                             = TSymbolUniqueId(909);
>+    static constexpr const TSymbolUniqueId imageLoad_Image2D1_Int2          = TSymbolUniqueId(910);
>+    static constexpr const TSymbolUniqueId imageLoad_IImage2D1_Int2         = TSymbolUniqueId(911);
>+    static constexpr const TSymbolUniqueId imageLoad_UImage2D1_Int2         = TSymbolUniqueId(912);
>+    static constexpr const TSymbolUniqueId imageLoad_Image3D1_Int3          = TSymbolUniqueId(913);
>+    static constexpr const TSymbolUniqueId imageLoad_IImage3D1_Int3         = TSymbolUniqueId(914);
>+    static constexpr const TSymbolUniqueId imageLoad_UImage3D1_Int3         = TSymbolUniqueId(915);
>+    static constexpr const TSymbolUniqueId imageLoad_Image2DArray1_Int3     = TSymbolUniqueId(916);
>+    static constexpr const TSymbolUniqueId imageLoad_IImage2DArray1_Int3    = TSymbolUniqueId(917);
>+    static constexpr const TSymbolUniqueId imageLoad_UImage2DArray1_Int3    = TSymbolUniqueId(918);
>+    static constexpr const TSymbolUniqueId imageLoad_ImageCube1_Int3        = TSymbolUniqueId(919);
>+    static constexpr const TSymbolUniqueId imageLoad_IImageCube1_Int3       = TSymbolUniqueId(920);
>+    static constexpr const TSymbolUniqueId imageLoad_UImageCube1_Int3       = TSymbolUniqueId(921);
>+    static constexpr const TSymbolUniqueId imageStore_Image2D1_Int2_Float4  = TSymbolUniqueId(922);
>+    static constexpr const TSymbolUniqueId imageStore_IImage2D1_Int2_Int4   = TSymbolUniqueId(923);
>+    static constexpr const TSymbolUniqueId imageStore_UImage2D1_Int2_UInt4  = TSymbolUniqueId(924);
>+    static constexpr const TSymbolUniqueId imageStore_Image3D1_Int3_Float4  = TSymbolUniqueId(925);
>+    static constexpr const TSymbolUniqueId imageStore_IImage3D1_Int3_Int4   = TSymbolUniqueId(926);
>+    static constexpr const TSymbolUniqueId imageStore_UImage3D1_Int3_UInt4  = TSymbolUniqueId(927);
>+    static constexpr const TSymbolUniqueId imageStore_Image2DArray1_Int3_Float4 =
>+        TSymbolUniqueId(928);
>+    static constexpr const TSymbolUniqueId imageStore_IImage2DArray1_Int3_Int4 =
>+        TSymbolUniqueId(929);
>+    static constexpr const TSymbolUniqueId imageStore_UImage2DArray1_Int3_UInt4 =
>+        TSymbolUniqueId(930);
>+    static constexpr const TSymbolUniqueId imageStore_ImageCube1_Int3_Float4 = TSymbolUniqueId(931);
>+    static constexpr const TSymbolUniqueId imageStore_IImageCube1_Int3_Int4  = TSymbolUniqueId(932);
>+    static constexpr const TSymbolUniqueId imageStore_UImageCube1_Int3_UInt4 = TSymbolUniqueId(933);
>+    static constexpr const TSymbolUniqueId memoryBarrier                     = TSymbolUniqueId(934);
>+    static constexpr const TSymbolUniqueId memoryBarrierAtomicCounter        = TSymbolUniqueId(935);
>+    static constexpr const TSymbolUniqueId memoryBarrierBuffer               = TSymbolUniqueId(936);
>+    static constexpr const TSymbolUniqueId memoryBarrierImage                = TSymbolUniqueId(937);
>+    static constexpr const TSymbolUniqueId barrier                           = TSymbolUniqueId(938);
>+    static constexpr const TSymbolUniqueId memoryBarrierShared               = TSymbolUniqueId(939);
>+    static constexpr const TSymbolUniqueId groupMemoryBarrier                = TSymbolUniqueId(940);
>+    static constexpr const TSymbolUniqueId EmitVertex                        = TSymbolUniqueId(941);
>+    static constexpr const TSymbolUniqueId EndPrimitive                      = TSymbolUniqueId(942);
>+    static constexpr const TSymbolUniqueId gl_DepthRangeParameters           = TSymbolUniqueId(943);
>+    static constexpr const TSymbolUniqueId gl_DepthRange                     = TSymbolUniqueId(944);
>+    static constexpr const TSymbolUniqueId gl_MaxVertexAttribs               = TSymbolUniqueId(945);
>+    static constexpr const TSymbolUniqueId gl_MaxVertexUniformVectors        = TSymbolUniqueId(946);
>+    static constexpr const TSymbolUniqueId gl_MaxVertexTextureImageUnits     = TSymbolUniqueId(947);
>+    static constexpr const TSymbolUniqueId gl_MaxCombinedTextureImageUnits   = TSymbolUniqueId(948);
>+    static constexpr const TSymbolUniqueId gl_MaxTextureImageUnits           = TSymbolUniqueId(949);
>+    static constexpr const TSymbolUniqueId gl_MaxFragmentUniformVectors      = TSymbolUniqueId(950);
>+    static constexpr const TSymbolUniqueId gl_MaxVaryingVectors              = TSymbolUniqueId(951);
>+    static constexpr const TSymbolUniqueId gl_MaxDrawBuffers                 = TSymbolUniqueId(952);
>+    static constexpr const TSymbolUniqueId gl_MaxDualSourceDrawBuffersEXT    = TSymbolUniqueId(953);
>+    static constexpr const TSymbolUniqueId gl_MaxVertexOutputVectors         = TSymbolUniqueId(954);
>+    static constexpr const TSymbolUniqueId gl_MaxFragmentInputVectors        = TSymbolUniqueId(955);
>+    static constexpr const TSymbolUniqueId gl_MinProgramTexelOffset          = TSymbolUniqueId(956);
>+    static constexpr const TSymbolUniqueId gl_MaxProgramTexelOffset          = TSymbolUniqueId(957);
>+    static constexpr const TSymbolUniqueId gl_MaxImageUnits                  = TSymbolUniqueId(958);
>+    static constexpr const TSymbolUniqueId gl_MaxVertexImageUniforms         = TSymbolUniqueId(959);
>+    static constexpr const TSymbolUniqueId gl_MaxFragmentImageUniforms       = TSymbolUniqueId(960);
>+    static constexpr const TSymbolUniqueId gl_MaxComputeImageUniforms        = TSymbolUniqueId(961);
>+    static constexpr const TSymbolUniqueId gl_MaxCombinedImageUniforms       = TSymbolUniqueId(962);
>+    static constexpr const TSymbolUniqueId gl_MaxCombinedShaderOutputResources =
>+        TSymbolUniqueId(963);
>+    static constexpr const TSymbolUniqueId gl_MaxComputeWorkGroupCount       = TSymbolUniqueId(964);
>+    static constexpr const TSymbolUniqueId gl_MaxComputeWorkGroupSize        = TSymbolUniqueId(965);
>+    static constexpr const TSymbolUniqueId gl_MaxComputeUniformComponents    = TSymbolUniqueId(966);
>+    static constexpr const TSymbolUniqueId gl_MaxComputeTextureImageUnits    = TSymbolUniqueId(967);
>+    static constexpr const TSymbolUniqueId gl_MaxComputeAtomicCounters       = TSymbolUniqueId(968);
>+    static constexpr const TSymbolUniqueId gl_MaxComputeAtomicCounterBuffers = TSymbolUniqueId(969);
>+    static constexpr const TSymbolUniqueId gl_MaxVertexAtomicCounters        = TSymbolUniqueId(970);
>+    static constexpr const TSymbolUniqueId gl_MaxFragmentAtomicCounters      = TSymbolUniqueId(971);
>+    static constexpr const TSymbolUniqueId gl_MaxCombinedAtomicCounters      = TSymbolUniqueId(972);
>+    static constexpr const TSymbolUniqueId gl_MaxAtomicCounterBindings       = TSymbolUniqueId(973);
>+    static constexpr const TSymbolUniqueId gl_MaxVertexAtomicCounterBuffers  = TSymbolUniqueId(974);
>+    static constexpr const TSymbolUniqueId gl_MaxFragmentAtomicCounterBuffers =
>+        TSymbolUniqueId(975);
>+    static constexpr const TSymbolUniqueId gl_MaxCombinedAtomicCounterBuffers =
>+        TSymbolUniqueId(976);
>+    static constexpr const TSymbolUniqueId gl_MaxAtomicCounterBufferSize   = TSymbolUniqueId(977);
>+    static constexpr const TSymbolUniqueId gl_MaxGeometryInputComponents   = TSymbolUniqueId(978);
>+    static constexpr const TSymbolUniqueId gl_MaxGeometryOutputComponents  = TSymbolUniqueId(979);
>+    static constexpr const TSymbolUniqueId gl_MaxGeometryImageUniforms     = TSymbolUniqueId(980);
>+    static constexpr const TSymbolUniqueId gl_MaxGeometryTextureImageUnits = TSymbolUniqueId(981);
>+    static constexpr const TSymbolUniqueId gl_MaxGeometryOutputVertices    = TSymbolUniqueId(982);
>+    static constexpr const TSymbolUniqueId gl_MaxGeometryTotalOutputComponents =
>+        TSymbolUniqueId(983);
>+    static constexpr const TSymbolUniqueId gl_MaxGeometryUniformComponents = TSymbolUniqueId(984);
>+    static constexpr const TSymbolUniqueId gl_MaxGeometryAtomicCounters    = TSymbolUniqueId(985);
>+    static constexpr const TSymbolUniqueId gl_MaxGeometryAtomicCounterBuffers =
>+        TSymbolUniqueId(986);
>+    static constexpr const TSymbolUniqueId gl_FragCoord             = TSymbolUniqueId(987);
>+    static constexpr const TSymbolUniqueId gl_FrontFacing           = TSymbolUniqueId(988);
>+    static constexpr const TSymbolUniqueId gl_PointCoord            = TSymbolUniqueId(989);
>+    static constexpr const TSymbolUniqueId gl_FragColor             = TSymbolUniqueId(990);
>+    static constexpr const TSymbolUniqueId gl_FragData              = TSymbolUniqueId(991);
>+    static constexpr const TSymbolUniqueId gl_FragDepth             = TSymbolUniqueId(992);
>+    static constexpr const TSymbolUniqueId gl_SecondaryFragColorEXT = TSymbolUniqueId(993);
>+    static constexpr const TSymbolUniqueId gl_SecondaryFragDataEXT  = TSymbolUniqueId(994);
>+    static constexpr const TSymbolUniqueId gl_FragDepthEXT          = TSymbolUniqueId(995);
>+    static constexpr const TSymbolUniqueId gl_LastFragData          = TSymbolUniqueId(996);
>+    static constexpr const TSymbolUniqueId gl_LastFragColor         = TSymbolUniqueId(997);
>+    static constexpr const TSymbolUniqueId gl_LastFragDataNV        = TSymbolUniqueId(998);
>+    static constexpr const TSymbolUniqueId gl_LastFragColorARM      = TSymbolUniqueId(999);
>+    static constexpr const TSymbolUniqueId gl_PrimitiveID           = TSymbolUniqueId(1000);
>+    static constexpr const TSymbolUniqueId gl_Layer                 = TSymbolUniqueId(1001);
>+    static constexpr const TSymbolUniqueId gl_Position              = TSymbolUniqueId(1002);
>+    static constexpr const TSymbolUniqueId gl_PointSize             = TSymbolUniqueId(1003);
>+    static constexpr const TSymbolUniqueId gl_InstanceID            = TSymbolUniqueId(1004);
>+    static constexpr const TSymbolUniqueId gl_VertexID              = TSymbolUniqueId(1005);
>+    static constexpr const TSymbolUniqueId gl_ViewportIndex         = TSymbolUniqueId(1006);
>+    static constexpr const TSymbolUniqueId gl_LayerVS               = TSymbolUniqueId(1007);
>+    static constexpr const TSymbolUniqueId gl_DrawID                = TSymbolUniqueId(1008);
>+    static constexpr const TSymbolUniqueId gl_DrawIDESSL1           = TSymbolUniqueId(1009);
>+    static constexpr const TSymbolUniqueId gl_NumWorkGroups         = TSymbolUniqueId(1010);
>+    static constexpr const TSymbolUniqueId gl_WorkGroupSize         = TSymbolUniqueId(1011);
>+    static constexpr const TSymbolUniqueId gl_WorkGroupID           = TSymbolUniqueId(1012);
>+    static constexpr const TSymbolUniqueId gl_LocalInvocationID     = TSymbolUniqueId(1013);
>+    static constexpr const TSymbolUniqueId gl_GlobalInvocationID    = TSymbolUniqueId(1014);
>+    static constexpr const TSymbolUniqueId gl_LocalInvocationIndex  = TSymbolUniqueId(1015);
>+    static constexpr const TSymbolUniqueId gl_PrimitiveIDIn         = TSymbolUniqueId(1016);
>+    static constexpr const TSymbolUniqueId gl_InvocationID          = TSymbolUniqueId(1017);
>+    static constexpr const TSymbolUniqueId gl_PrimitiveIDGS         = TSymbolUniqueId(1018);
>+    static constexpr const TSymbolUniqueId gl_LayerGS               = TSymbolUniqueId(1019);
>+    static constexpr const TSymbolUniqueId gl_PerVertex             = TSymbolUniqueId(1020);
>+    static constexpr const TSymbolUniqueId gl_in                    = TSymbolUniqueId(1021);
>+    static constexpr const TSymbolUniqueId gl_PerVertexOutBlock     = TSymbolUniqueId(1022);
>+    static constexpr const TSymbolUniqueId gl_PositionGS            = TSymbolUniqueId(1023);
>+    static constexpr const TSymbolUniqueId gl_ViewID_OVR            = TSymbolUniqueId(1024);
>+    static constexpr const TSymbolUniqueId gl_ViewID_OVRESSL1       = TSymbolUniqueId(1025);
>+
>+};  // class BuiltInId
>+
>+namespace BuiltInVariable
>+{
>+
>+const TVariable *gl_DrawID();
>+const TVariable *gl_DrawIDESSL1();
>+const TVariable *gl_FragColor();
>+const TVariable *gl_FragCoord();
>+const TVariable *gl_FragDepth();
>+const TVariable *gl_FrontFacing();
>+const TVariable *gl_GlobalInvocationID();
>+const TVariable *gl_InstanceID();
>+const TVariable *gl_InvocationID();
>+const TVariable *gl_LastFragColor();
>+const TVariable *gl_LastFragColorARM();
>+const TVariable *gl_Layer();
>+const TVariable *gl_LayerGS();
>+const TVariable *gl_LayerVS();
>+const TVariable *gl_LocalInvocationID();
>+const TVariable *gl_LocalInvocationIndex();
>+const TVariable *gl_NumWorkGroups();
>+const TVariable *gl_PointCoord();
>+const TVariable *gl_PointSize();
>+const TVariable *gl_Position();
>+const TVariable *gl_PrimitiveID();
>+const TVariable *gl_PrimitiveIDGS();
>+const TVariable *gl_PrimitiveIDIn();
>+const TVariable *gl_SecondaryFragColorEXT();
>+const TVariable *gl_VertexID();
>+const TVariable *gl_ViewID_OVR();
>+const TVariable *gl_ViewID_OVRESSL1();
>+const TVariable *gl_ViewportIndex();
>+const TVariable *gl_WorkGroupID();
>+const TVariable *gl_WorkGroupSize();
>+
>+}  // namespace BuiltInVariable
>+
>+}  // namespace sh
>+
>+#endif  // COMPILER_TRANSLATOR_TREEUTIL_BUILTIN_AUTOGEN_H_
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/tree_util/FindMain.cpp b/Source/ThirdParty/ANGLE/src/compiler/translator/tree_util/FindMain.cpp
>new file mode 100644
>index 00000000000..0e3023b2bff
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/tree_util/FindMain.cpp
>@@ -0,0 +1,54 @@
>+//
>+// Copyright (c) 2017 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+
>+// FindMain.cpp: Find the main() function definition in a given AST.
>+
>+#include "compiler/translator/tree_util/FindMain.h"
>+
>+#include "compiler/translator/IntermNode.h"
>+#include "compiler/translator/Symbol.h"
>+
>+namespace sh
>+{
>+
>+size_t FindMainIndex(TIntermBlock *root)
>+{
>+    const TIntermSequence &sequence = *root->getSequence();
>+    for (size_t index = 0; index < sequence.size(); ++index)
>+    {
>+        TIntermNode *node                       = sequence[index];
>+        TIntermFunctionDefinition *nodeFunction = node->getAsFunctionDefinition();
>+        if (nodeFunction != nullptr && nodeFunction->getFunction()->isMain())
>+        {
>+            return index;
>+        }
>+    }
>+    return std::numeric_limits<size_t>::max();
>+}
>+
>+TIntermFunctionDefinition *FindMain(TIntermBlock *root)
>+{
>+    for (TIntermNode *node : *root->getSequence())
>+    {
>+        TIntermFunctionDefinition *nodeFunction = node->getAsFunctionDefinition();
>+        if (nodeFunction != nullptr && nodeFunction->getFunction()->isMain())
>+        {
>+            return nodeFunction;
>+        }
>+    }
>+    return nullptr;
>+}
>+
>+TIntermBlock *FindMainBody(TIntermBlock *root)
>+{
>+    TIntermFunctionDefinition *main = FindMain(root);
>+    ASSERT(main != nullptr);
>+    TIntermBlock *mainBody = main->getBody();
>+    ASSERT(mainBody != nullptr);
>+    return mainBody;
>+}
>+
>+}  // namespace sh
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/tree_util/FindMain.h b/Source/ThirdParty/ANGLE/src/compiler/translator/tree_util/FindMain.h
>new file mode 100644
>index 00000000000..a313315d76e
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/tree_util/FindMain.h
>@@ -0,0 +1,24 @@
>+//
>+// Copyright (c) 2017 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+
>+// FindMain.h: Adds functions to get the main function definition and its body.
>+
>+#ifndef COMPILER_TRANSLATOR_TREEUTIL_FINDMAIN_H_
>+#define COMPILER_TRANSLATOR_TREEUTIL_FINDMAIN_H_
>+
>+#include <cstddef>
>+
>+namespace sh
>+{
>+class TIntermBlock;
>+class TIntermFunctionDefinition;
>+
>+size_t FindMainIndex(TIntermBlock *root);
>+TIntermFunctionDefinition *FindMain(TIntermBlock *root);
>+TIntermBlock *FindMainBody(TIntermBlock *root);
>+}  // namespace sh
>+
>+#endif  // COMPILER_TRANSLATOR_TREEUTIL_FINDMAIN_H_
>\ No newline at end of file
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/tree_util/FindSymbolNode.cpp b/Source/ThirdParty/ANGLE/src/compiler/translator/tree_util/FindSymbolNode.cpp
>new file mode 100644
>index 00000000000..3eeb9cfd050
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/tree_util/FindSymbolNode.cpp
>@@ -0,0 +1,53 @@
>+//
>+// Copyright (c) 2015 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// FindSymbol.cpp:
>+//     Utility for finding a symbol node inside an AST tree.
>+
>+#include "compiler/translator/tree_util/FindSymbolNode.h"
>+
>+#include "compiler/translator/ImmutableString.h"
>+#include "compiler/translator/Symbol.h"
>+#include "compiler/translator/tree_util/IntermTraverse.h"
>+
>+namespace sh
>+{
>+
>+namespace
>+{
>+
>+class SymbolFinder : public TIntermTraverser
>+{
>+  public:
>+    SymbolFinder(const ImmutableString &symbolName)
>+        : TIntermTraverser(true, false, false), mSymbolName(symbolName), mNodeFound(nullptr)
>+    {}
>+
>+    void visitSymbol(TIntermSymbol *node)
>+    {
>+        if (node->variable().symbolType() != SymbolType::Empty && node->getName() == mSymbolName)
>+        {
>+            mNodeFound = node;
>+        }
>+    }
>+
>+    bool isFound() const { return mNodeFound != nullptr; }
>+    const TIntermSymbol *getNode() const { return mNodeFound; }
>+
>+  private:
>+    ImmutableString mSymbolName;
>+    TIntermSymbol *mNodeFound;
>+};
>+
>+}  // anonymous namespace
>+
>+const TIntermSymbol *FindSymbolNode(TIntermNode *root, const ImmutableString &symbolName)
>+{
>+    SymbolFinder finder(symbolName);
>+    root->traverse(&finder);
>+    return finder.getNode();
>+}
>+
>+}  // namespace sh
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/tree_util/FindSymbolNode.h b/Source/ThirdParty/ANGLE/src/compiler/translator/tree_util/FindSymbolNode.h
>new file mode 100644
>index 00000000000..f285479277f
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/tree_util/FindSymbolNode.h
>@@ -0,0 +1,23 @@
>+//
>+// Copyright (c) 2015 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// FindSymbolNode.h:
>+//     Utility for finding a symbol node inside an AST tree.
>+
>+#ifndef COMPILER_TRANSLATOR_TREEUTIL_FINDSYMBOLNODE_H_
>+#define COMPILER_TRANSLATOR_TREEUTIL_FINDSYMBOLNODE_H_
>+
>+namespace sh
>+{
>+
>+class ImmutableString;
>+class TIntermNode;
>+class TIntermSymbol;
>+
>+const TIntermSymbol *FindSymbolNode(TIntermNode *root, const ImmutableString &symbolName);
>+
>+}  // namespace sh
>+
>+#endif  // COMPILER_TRANSLATOR_TREEUTIL_FINDSYMBOLNODE_H_
>\ No newline at end of file
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/tree_util/IntermNodePatternMatcher.cpp b/Source/ThirdParty/ANGLE/src/compiler/translator/tree_util/IntermNodePatternMatcher.cpp
>new file mode 100644
>index 00000000000..0f3c3a42a34
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/tree_util/IntermNodePatternMatcher.cpp
>@@ -0,0 +1,204 @@
>+//
>+// Copyright (c) 2016 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// IntermNodePatternMatcher is a helper class for matching node trees to given patterns.
>+// It can be used whenever the same checks for certain node structures are common to multiple AST
>+// traversers.
>+//
>+
>+#include "compiler/translator/tree_util/IntermNodePatternMatcher.h"
>+
>+#include "compiler/translator/IntermNode.h"
>+#include "compiler/translator/SymbolTable.h"
>+#include "compiler/translator/util.h"
>+
>+namespace sh
>+{
>+
>+namespace
>+{
>+
>+bool ContainsMatrixNode(const TIntermSequence &sequence)
>+{
>+    for (size_t ii = 0; ii < sequence.size(); ++ii)
>+    {
>+        TIntermTyped *node = sequence[ii]->getAsTyped();
>+        if (node && node->isMatrix())
>+            return true;
>+    }
>+    return false;
>+}
>+
>+bool ContainsVectorNode(const TIntermSequence &sequence)
>+{
>+    for (size_t ii = 0; ii < sequence.size(); ++ii)
>+    {
>+        TIntermTyped *node = sequence[ii]->getAsTyped();
>+        if (node && node->isVector())
>+            return true;
>+    }
>+    return false;
>+}
>+
>+}  // anonymous namespace
>+
>+IntermNodePatternMatcher::IntermNodePatternMatcher(const unsigned int mask) : mMask(mask) {}
>+
>+// static
>+bool IntermNodePatternMatcher::IsDynamicIndexingOfNonSSBOVectorOrMatrix(TIntermBinary *node)
>+{
>+    return IsDynamicIndexingOfVectorOrMatrix(node) && !IsInShaderStorageBlock(node->getLeft());
>+}
>+
>+// static
>+bool IntermNodePatternMatcher::IsDynamicIndexingOfVectorOrMatrix(TIntermBinary *node)
>+{
>+    return node->getOp() == EOpIndexIndirect && !node->getLeft()->isArray() &&
>+           node->getLeft()->getBasicType() != EbtStruct;
>+}
>+
>+bool IntermNodePatternMatcher::matchInternal(TIntermBinary *node, TIntermNode *parentNode)
>+{
>+    if ((mMask & kExpressionReturningArray) != 0)
>+    {
>+        if (node->isArray() && node->getOp() == EOpAssign && parentNode != nullptr &&
>+            !parentNode->getAsBlock())
>+        {
>+            return true;
>+        }
>+    }
>+
>+    if ((mMask & kUnfoldedShortCircuitExpression) != 0)
>+    {
>+        if (node->getRight()->hasSideEffects() &&
>+            (node->getOp() == EOpLogicalOr || node->getOp() == EOpLogicalAnd))
>+        {
>+            return true;
>+        }
>+    }
>+    return false;
>+}
>+
>+bool IntermNodePatternMatcher::match(TIntermUnary *node)
>+{
>+    if ((mMask & kArrayLengthMethod) != 0)
>+    {
>+        if (node->getOp() == EOpArrayLength)
>+        {
>+            return true;
>+        }
>+    }
>+    return false;
>+}
>+
>+bool IntermNodePatternMatcher::match(TIntermBinary *node, TIntermNode *parentNode)
>+{
>+    // L-value tracking information is needed to check for dynamic indexing in L-value.
>+    // Traversers that don't track l-values can still use this class and match binary nodes with
>+    // this variation of this method if they don't need to check for dynamic indexing in l-values.
>+    ASSERT((mMask & kDynamicIndexingOfVectorOrMatrixInLValue) == 0);
>+    return matchInternal(node, parentNode);
>+}
>+
>+bool IntermNodePatternMatcher::match(TIntermBinary *node,
>+                                     TIntermNode *parentNode,
>+                                     bool isLValueRequiredHere)
>+{
>+    if (matchInternal(node, parentNode))
>+    {
>+        return true;
>+    }
>+    if ((mMask & kDynamicIndexingOfVectorOrMatrixInLValue) != 0)
>+    {
>+        if (isLValueRequiredHere && IsDynamicIndexingOfVectorOrMatrix(node))
>+        {
>+            return true;
>+        }
>+    }
>+    return false;
>+}
>+
>+bool IntermNodePatternMatcher::match(TIntermAggregate *node, TIntermNode *parentNode)
>+{
>+    if ((mMask & kExpressionReturningArray) != 0)
>+    {
>+        if (parentNode != nullptr)
>+        {
>+            TIntermBinary *parentBinary = parentNode->getAsBinaryNode();
>+            bool parentIsAssignment =
>+                (parentBinary != nullptr &&
>+                 (parentBinary->getOp() == EOpAssign || parentBinary->getOp() == EOpInitialize));
>+
>+            if (node->getType().isArray() && !parentIsAssignment &&
>+                (node->isConstructor() || node->isFunctionCall()) && !parentNode->getAsBlock())
>+            {
>+                return true;
>+            }
>+        }
>+    }
>+    if ((mMask & kScalarizedVecOrMatConstructor) != 0)
>+    {
>+        if (node->getOp() == EOpConstruct)
>+        {
>+            if (node->getType().isVector() && ContainsMatrixNode(*(node->getSequence())))
>+            {
>+                return true;
>+            }
>+            else if (node->getType().isMatrix() && ContainsVectorNode(*(node->getSequence())))
>+            {
>+                return true;
>+            }
>+        }
>+    }
>+    return false;
>+}
>+
>+bool IntermNodePatternMatcher::match(TIntermTernary *node)
>+{
>+    if ((mMask & kUnfoldedShortCircuitExpression) != 0)
>+    {
>+        return true;
>+    }
>+    return false;
>+}
>+
>+bool IntermNodePatternMatcher::match(TIntermDeclaration *node)
>+{
>+    if ((mMask & kMultiDeclaration) != 0)
>+    {
>+        if (node->getSequence()->size() > 1)
>+        {
>+            return true;
>+        }
>+    }
>+    if ((mMask & kArrayDeclaration) != 0)
>+    {
>+        if (node->getSequence()->front()->getAsTyped()->getType().isStructureContainingArrays())
>+        {
>+            return true;
>+        }
>+        // Need to check from all declarators whether they are arrays since that may vary between
>+        // declarators.
>+        for (TIntermNode *declarator : *node->getSequence())
>+        {
>+            if (declarator->getAsTyped()->isArray())
>+            {
>+                return true;
>+            }
>+        }
>+    }
>+    if ((mMask & kNamelessStructDeclaration) != 0)
>+    {
>+        TIntermTyped *declarator = node->getSequence()->front()->getAsTyped();
>+        if (declarator->getBasicType() == EbtStruct &&
>+            declarator->getType().getStruct()->symbolType() == SymbolType::Empty)
>+        {
>+            return true;
>+        }
>+    }
>+    return false;
>+}
>+
>+}  // namespace sh
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/tree_util/IntermNodePatternMatcher.h b/Source/ThirdParty/ANGLE/src/compiler/translator/tree_util/IntermNodePatternMatcher.h
>new file mode 100644
>index 00000000000..25a46ff4f69
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/tree_util/IntermNodePatternMatcher.h
>@@ -0,0 +1,80 @@
>+//
>+// Copyright (c) 2016 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// IntermNodePatternMatcher is a helper class for matching node trees to given patterns.
>+// It can be used whenever the same checks for certain node structures are common to multiple AST
>+// traversers.
>+//
>+
>+#ifndef COMPILER_TRANSLATOR_TREEUTIL_INTERMNODEPATTERNMATCHER_H_
>+#define COMPILER_TRANSLATOR_TREEUTIL_INTERMNODEPATTERNMATCHER_H_
>+
>+namespace sh
>+{
>+
>+class TIntermAggregate;
>+class TIntermBinary;
>+class TIntermDeclaration;
>+class TIntermNode;
>+class TIntermTernary;
>+class TIntermUnary;
>+
>+class IntermNodePatternMatcher
>+{
>+  public:
>+    static bool IsDynamicIndexingOfNonSSBOVectorOrMatrix(TIntermBinary *node);
>+    static bool IsDynamicIndexingOfVectorOrMatrix(TIntermBinary *node);
>+
>+    enum PatternType
>+    {
>+        // Matches expressions that are unfolded to if statements by UnfoldShortCircuitToIf
>+        kUnfoldedShortCircuitExpression = 0x0001,
>+
>+        // Matches expressions that return arrays with the exception of simple statements where a
>+        // constructor or function call result is assigned.
>+        kExpressionReturningArray = 0x0001 << 1,
>+
>+        // Matches dynamic indexing of vectors or matrices in l-values.
>+        kDynamicIndexingOfVectorOrMatrixInLValue = 0x0001 << 2,
>+
>+        // Matches declarations with more than one declared variables.
>+        kMultiDeclaration = 0x0001 << 3,
>+
>+        // Matches declarations of arrays.
>+        kArrayDeclaration = 0x0001 << 4,
>+
>+        // Matches declarations of structs where the struct type does not have a name.
>+        kNamelessStructDeclaration = 0x0001 << 5,
>+
>+        // Matches array length() method.
>+        kArrayLengthMethod = 0x0001 << 6,
>+
>+        // Matches a vector or matrix constructor whose arguments are scalarized by the
>+        // SH_SCALARIZE_VEC_OR_MAT_CONSTRUCTOR_ARGUMENTS workaround.
>+        kScalarizedVecOrMatConstructor = 0x0001 << 7
>+    };
>+    IntermNodePatternMatcher(const unsigned int mask);
>+
>+    bool match(TIntermUnary *node);
>+
>+    bool match(TIntermBinary *node, TIntermNode *parentNode);
>+
>+    // Use this version for checking binary node matches in case you're using flag
>+    // kDynamicIndexingOfVectorOrMatrixInLValue.
>+    bool match(TIntermBinary *node, TIntermNode *parentNode, bool isLValueRequiredHere);
>+
>+    bool match(TIntermAggregate *node, TIntermNode *parentNode);
>+    bool match(TIntermTernary *node);
>+    bool match(TIntermDeclaration *node);
>+
>+  private:
>+    const unsigned int mMask;
>+
>+    bool matchInternal(TIntermBinary *node, TIntermNode *parentNode);
>+};
>+
>+}  // namespace sh
>+
>+#endif  // COMPILER_TRANSLATOR_TREEUTIL_INTERMNODEPATTERNMATCHER_H_
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/tree_util/IntermNode_util.cpp b/Source/ThirdParty/ANGLE/src/compiler/translator/tree_util/IntermNode_util.cpp
>new file mode 100644
>index 00000000000..878e89dffb4
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/tree_util/IntermNode_util.cpp
>@@ -0,0 +1,257 @@
>+//
>+// Copyright (c) 2017 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// IntermNode_util.cpp: High-level utilities for creating AST nodes and node hierarchies. Mostly
>+// meant to be used in AST transforms.
>+
>+#include "compiler/translator/tree_util/IntermNode_util.h"
>+
>+#include "compiler/translator/FunctionLookup.h"
>+#include "compiler/translator/SymbolTable.h"
>+
>+namespace sh
>+{
>+
>+namespace
>+{
>+
>+const TFunction *LookUpBuiltInFunction(const char *name,
>+                                       const TIntermSequence *arguments,
>+                                       const TSymbolTable &symbolTable,
>+                                       int shaderVersion)
>+{
>+    const ImmutableString &mangledName = TFunctionLookup::GetMangledName(name, *arguments);
>+    const TSymbol *symbol              = symbolTable.findBuiltIn(mangledName, shaderVersion);
>+    if (symbol)
>+    {
>+        ASSERT(symbol->isFunction());
>+        return static_cast<const TFunction *>(symbol);
>+    }
>+    return nullptr;
>+}
>+
>+}  // anonymous namespace
>+
>+TIntermFunctionPrototype *CreateInternalFunctionPrototypeNode(const TFunction &func)
>+{
>+    return new TIntermFunctionPrototype(&func);
>+}
>+
>+TIntermFunctionDefinition *CreateInternalFunctionDefinitionNode(const TFunction &func,
>+                                                                TIntermBlock *functionBody)
>+{
>+    return new TIntermFunctionDefinition(new TIntermFunctionPrototype(&func), functionBody);
>+}
>+
>+TIntermTyped *CreateZeroNode(const TType &type)
>+{
>+    TType constType(type);
>+    constType.setQualifier(EvqConst);
>+
>+    if (!type.isArray() && type.getBasicType() != EbtStruct)
>+    {
>+        size_t size       = constType.getObjectSize();
>+        TConstantUnion *u = new TConstantUnion[size];
>+        for (size_t i = 0; i < size; ++i)
>+        {
>+            switch (type.getBasicType())
>+            {
>+                case EbtFloat:
>+                    u[i].setFConst(0.0f);
>+                    break;
>+                case EbtInt:
>+                    u[i].setIConst(0);
>+                    break;
>+                case EbtUInt:
>+                    u[i].setUConst(0u);
>+                    break;
>+                case EbtBool:
>+                    u[i].setBConst(false);
>+                    break;
>+                default:
>+                    // CreateZeroNode is called by ParseContext that keeps parsing even when an
>+                    // error occurs, so it is possible for CreateZeroNode to be called with
>+                    // non-basic types. This happens only on error condition but CreateZeroNode
>+                    // needs to return a value with the correct type to continue the typecheck.
>+                    // That's why we handle non-basic type by setting whatever value, we just need
>+                    // the type to be right.
>+                    u[i].setIConst(42);
>+                    break;
>+            }
>+        }
>+
>+        TIntermConstantUnion *node = new TIntermConstantUnion(u, constType);
>+        return node;
>+    }
>+
>+    TIntermSequence *arguments = new TIntermSequence();
>+
>+    if (type.isArray())
>+    {
>+        TType elementType(type);
>+        elementType.toArrayElementType();
>+
>+        size_t arraySize = type.getOutermostArraySize();
>+        for (size_t i = 0; i < arraySize; ++i)
>+        {
>+            arguments->push_back(CreateZeroNode(elementType));
>+        }
>+    }
>+    else
>+    {
>+        ASSERT(type.getBasicType() == EbtStruct);
>+
>+        const TStructure *structure = type.getStruct();
>+        for (const auto &field : structure->fields())
>+        {
>+            arguments->push_back(CreateZeroNode(*field->type()));
>+        }
>+    }
>+
>+    return TIntermAggregate::CreateConstructor(constType, arguments);
>+}
>+
>+TIntermConstantUnion *CreateIndexNode(int index)
>+{
>+    TConstantUnion *u = new TConstantUnion[1];
>+    u[0].setIConst(index);
>+
>+    TType type(EbtInt, EbpUndefined, EvqConst, 1);
>+    TIntermConstantUnion *node = new TIntermConstantUnion(u, type);
>+    return node;
>+}
>+
>+TIntermConstantUnion *CreateBoolNode(bool value)
>+{
>+    TConstantUnion *u = new TConstantUnion[1];
>+    u[0].setBConst(value);
>+
>+    TType type(EbtBool, EbpUndefined, EvqConst, 1);
>+    TIntermConstantUnion *node = new TIntermConstantUnion(u, type);
>+    return node;
>+}
>+
>+TVariable *CreateTempVariable(TSymbolTable *symbolTable, const TType *type)
>+{
>+    ASSERT(symbolTable != nullptr);
>+    // TODO(oetuaho): Might be useful to sanitize layout qualifier etc. on the type of the created
>+    // variable. This might need to be done in other places as well.
>+    return new TVariable(symbolTable, kEmptyImmutableString, type, SymbolType::AngleInternal);
>+}
>+
>+TVariable *CreateTempVariable(TSymbolTable *symbolTable, const TType *type, TQualifier qualifier)
>+{
>+    ASSERT(symbolTable != nullptr);
>+    if (type->getQualifier() == qualifier)
>+    {
>+        return CreateTempVariable(symbolTable, type);
>+    }
>+    TType *typeWithQualifier = new TType(*type);
>+    typeWithQualifier->setQualifier(qualifier);
>+    return CreateTempVariable(symbolTable, typeWithQualifier);
>+}
>+
>+TIntermSymbol *CreateTempSymbolNode(const TVariable *tempVariable)
>+{
>+    ASSERT(tempVariable->symbolType() == SymbolType::AngleInternal);
>+    ASSERT(tempVariable->getType().getQualifier() == EvqTemporary ||
>+           tempVariable->getType().getQualifier() == EvqConst ||
>+           tempVariable->getType().getQualifier() == EvqGlobal);
>+    return new TIntermSymbol(tempVariable);
>+}
>+
>+TIntermDeclaration *CreateTempDeclarationNode(const TVariable *tempVariable)
>+{
>+    TIntermDeclaration *tempDeclaration = new TIntermDeclaration();
>+    tempDeclaration->appendDeclarator(CreateTempSymbolNode(tempVariable));
>+    return tempDeclaration;
>+}
>+
>+TIntermDeclaration *CreateTempInitDeclarationNode(const TVariable *tempVariable,
>+                                                  TIntermTyped *initializer)
>+{
>+    ASSERT(initializer != nullptr);
>+    TIntermSymbol *tempSymbol           = CreateTempSymbolNode(tempVariable);
>+    TIntermDeclaration *tempDeclaration = new TIntermDeclaration();
>+    TIntermBinary *tempInit             = new TIntermBinary(EOpInitialize, tempSymbol, initializer);
>+    tempDeclaration->appendDeclarator(tempInit);
>+    return tempDeclaration;
>+}
>+
>+TIntermBinary *CreateTempAssignmentNode(const TVariable *tempVariable, TIntermTyped *rightNode)
>+{
>+    ASSERT(rightNode != nullptr);
>+    TIntermSymbol *tempSymbol = CreateTempSymbolNode(tempVariable);
>+    return new TIntermBinary(EOpAssign, tempSymbol, rightNode);
>+}
>+
>+TVariable *DeclareTempVariable(TSymbolTable *symbolTable,
>+                               const TType *type,
>+                               TQualifier qualifier,
>+                               TIntermDeclaration **declarationOut)
>+{
>+    TVariable *variable = CreateTempVariable(symbolTable, type, qualifier);
>+    *declarationOut     = CreateTempDeclarationNode(variable);
>+    return variable;
>+}
>+
>+TVariable *DeclareTempVariable(TSymbolTable *symbolTable,
>+                               TIntermTyped *initializer,
>+                               TQualifier qualifier,
>+                               TIntermDeclaration **declarationOut)
>+{
>+    TVariable *variable =
>+        CreateTempVariable(symbolTable, new TType(initializer->getType()), qualifier);
>+    *declarationOut = CreateTempInitDeclarationNode(variable, initializer);
>+    return variable;
>+}
>+
>+TIntermBlock *EnsureBlock(TIntermNode *node)
>+{
>+    if (node == nullptr)
>+        return nullptr;
>+    TIntermBlock *blockNode = node->getAsBlock();
>+    if (blockNode != nullptr)
>+        return blockNode;
>+
>+    blockNode = new TIntermBlock();
>+    blockNode->setLine(node->getLine());
>+    blockNode->appendStatement(node);
>+    return blockNode;
>+}
>+
>+TIntermSymbol *ReferenceGlobalVariable(const ImmutableString &name, const TSymbolTable &symbolTable)
>+{
>+    const TVariable *var = static_cast<const TVariable *>(symbolTable.findGlobal(name));
>+    ASSERT(var);
>+    return new TIntermSymbol(var);
>+}
>+
>+TIntermSymbol *ReferenceBuiltInVariable(const ImmutableString &name,
>+                                        const TSymbolTable &symbolTable,
>+                                        int shaderVersion)
>+{
>+    const TVariable *var =
>+        static_cast<const TVariable *>(symbolTable.findBuiltIn(name, shaderVersion));
>+    ASSERT(var);
>+    return new TIntermSymbol(var);
>+}
>+
>+TIntermTyped *CreateBuiltInFunctionCallNode(const char *name,
>+                                            TIntermSequence *arguments,
>+                                            const TSymbolTable &symbolTable,
>+                                            int shaderVersion)
>+{
>+    const TFunction *fn = LookUpBuiltInFunction(name, arguments, symbolTable, shaderVersion);
>+    ASSERT(fn);
>+    TOperator op = fn->getBuiltInOp();
>+    if (op != EOpCallBuiltInFunction && arguments->size() == 1)
>+    {
>+        return new TIntermUnary(op, arguments->at(0)->getAsTyped(), fn);
>+    }
>+    return TIntermAggregate::CreateBuiltInFunctionCall(*fn, arguments);
>+}
>+
>+}  // namespace sh
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/tree_util/IntermNode_util.h b/Source/ThirdParty/ANGLE/src/compiler/translator/tree_util/IntermNode_util.h
>new file mode 100644
>index 00000000000..fe5652a0c36
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/tree_util/IntermNode_util.h
>@@ -0,0 +1,68 @@
>+//
>+// Copyright (c) 2017 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// IntermNode_util.h: High-level utilities for creating AST nodes and node hierarchies. Mostly meant
>+// to be used in AST transforms.
>+
>+#ifndef COMPILER_TRANSLATOR_INTERMNODEUTIL_H_
>+#define COMPILER_TRANSLATOR_INTERMNODEUTIL_H_
>+
>+#include "compiler/translator/IntermNode.h"
>+
>+namespace sh
>+{
>+
>+class TSymbolTable;
>+class TVariable;
>+
>+TIntermFunctionPrototype *CreateInternalFunctionPrototypeNode(const TFunction &func);
>+TIntermFunctionDefinition *CreateInternalFunctionDefinitionNode(const TFunction &func,
>+                                                                TIntermBlock *functionBody);
>+
>+TIntermTyped *CreateZeroNode(const TType &type);
>+TIntermConstantUnion *CreateIndexNode(int index);
>+TIntermConstantUnion *CreateBoolNode(bool value);
>+
>+TVariable *CreateTempVariable(TSymbolTable *symbolTable, const TType *type);
>+TVariable *CreateTempVariable(TSymbolTable *symbolTable, const TType *type, TQualifier qualifier);
>+
>+TIntermSymbol *CreateTempSymbolNode(const TVariable *tempVariable);
>+TIntermDeclaration *CreateTempDeclarationNode(const TVariable *tempVariable);
>+TIntermDeclaration *CreateTempInitDeclarationNode(const TVariable *tempVariable,
>+                                                  TIntermTyped *initializer);
>+TIntermBinary *CreateTempAssignmentNode(const TVariable *tempVariable, TIntermTyped *rightNode);
>+
>+TVariable *DeclareTempVariable(TSymbolTable *symbolTable,
>+                               const TType *type,
>+                               TQualifier qualifier,
>+                               TIntermDeclaration **declarationOut);
>+TVariable *DeclareTempVariable(TSymbolTable *symbolTable,
>+                               TIntermTyped *initializer,
>+                               TQualifier qualifier,
>+                               TIntermDeclaration **declarationOut);
>+
>+// If the input node is nullptr, return nullptr.
>+// If the input node is a block node, return it.
>+// If the input node is not a block node, put it inside a block node and return that.
>+TIntermBlock *EnsureBlock(TIntermNode *node);
>+
>+// Should be called from inside Compiler::compileTreeImpl() where the global level is in scope.
>+TIntermSymbol *ReferenceGlobalVariable(const ImmutableString &name,
>+                                       const TSymbolTable &symbolTable);
>+
>+// Note: this can't access desktop GLSL built-ins. Those can only be accessed directly through
>+// BuiltIn_autogen.h.
>+TIntermSymbol *ReferenceBuiltInVariable(const ImmutableString &name,
>+                                        const TSymbolTable &symbolTable,
>+                                        int shaderVersion);
>+
>+TIntermTyped *CreateBuiltInFunctionCallNode(const char *name,
>+                                            TIntermSequence *arguments,
>+                                            const TSymbolTable &symbolTable,
>+                                            int shaderVersion);
>+
>+}  // namespace sh
>+
>+#endif  // COMPILER_TRANSLATOR_INTERMNODEUTIL_H_
>\ No newline at end of file
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/tree_util/IntermTraverse.cpp b/Source/ThirdParty/ANGLE/src/compiler/translator/tree_util/IntermTraverse.cpp
>new file mode 100644
>index 00000000000..c38baa12bff
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/tree_util/IntermTraverse.cpp
>@@ -0,0 +1,638 @@
>+//
>+// Copyright (c) 2002-2010 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+
>+#include "compiler/translator/tree_util/IntermTraverse.h"
>+
>+#include "compiler/translator/InfoSink.h"
>+#include "compiler/translator/SymbolTable.h"
>+#include "compiler/translator/tree_util/IntermNode_util.h"
>+
>+namespace sh
>+{
>+
>+// Traverse the intermediate representation tree, and call a node type specific visit function for
>+// each node. Traversal is done recursively through the node member function traverse(). Nodes with
>+// children can have their whole subtree skipped if preVisit is turned on and the type specific
>+// function returns false.
>+template <typename T>
>+void TIntermTraverser::traverse(T *node)
>+{
>+    ScopedNodeInTraversalPath addToPath(this, node);
>+    if (!addToPath.isWithinDepthLimit())
>+        return;
>+
>+    bool visit = true;
>+
>+    // Visit the node before children if pre-visiting.
>+    if (preVisit)
>+        visit = node->visit(PreVisit, this);
>+
>+    if (visit)
>+    {
>+        size_t childIndex = 0;
>+        size_t childCount = node->getChildCount();
>+
>+        while (childIndex < childCount && visit)
>+        {
>+            node->getChildNode(childIndex)->traverse(this);
>+            if (inVisit && childIndex != childCount - 1)
>+            {
>+                visit = node->visit(InVisit, this);
>+            }
>+            ++childIndex;
>+        }
>+
>+        if (visit && postVisit)
>+            node->visit(PostVisit, this);
>+    }
>+}
>+
>+void TIntermNode::traverse(TIntermTraverser *it)
>+{
>+    it->traverse(this);
>+}
>+
>+void TIntermSymbol::traverse(TIntermTraverser *it)
>+{
>+    TIntermTraverser::ScopedNodeInTraversalPath addToPath(it, this);
>+    it->visitSymbol(this);
>+}
>+
>+void TIntermConstantUnion::traverse(TIntermTraverser *it)
>+{
>+    TIntermTraverser::ScopedNodeInTraversalPath addToPath(it, this);
>+    it->visitConstantUnion(this);
>+}
>+
>+void TIntermFunctionPrototype::traverse(TIntermTraverser *it)
>+{
>+    TIntermTraverser::ScopedNodeInTraversalPath addToPath(it, this);
>+    it->visitFunctionPrototype(this);
>+}
>+
>+void TIntermBinary::traverse(TIntermTraverser *it)
>+{
>+    it->traverseBinary(this);
>+}
>+
>+void TIntermUnary::traverse(TIntermTraverser *it)
>+{
>+    it->traverseUnary(this);
>+}
>+
>+void TIntermFunctionDefinition::traverse(TIntermTraverser *it)
>+{
>+    it->traverseFunctionDefinition(this);
>+}
>+
>+void TIntermBlock::traverse(TIntermTraverser *it)
>+{
>+    it->traverseBlock(this);
>+}
>+
>+void TIntermAggregate::traverse(TIntermTraverser *it)
>+{
>+    it->traverseAggregate(this);
>+}
>+
>+void TIntermLoop::traverse(TIntermTraverser *it)
>+{
>+    it->traverseLoop(this);
>+}
>+
>+void TIntermPreprocessorDirective::traverse(TIntermTraverser *it)
>+{
>+    it->visitPreprocessorDirective(this);
>+}
>+
>+bool TIntermSymbol::visit(Visit visit, TIntermTraverser *it)
>+{
>+    it->visitSymbol(this);
>+    return false;
>+}
>+
>+bool TIntermConstantUnion::visit(Visit visit, TIntermTraverser *it)
>+{
>+    it->visitConstantUnion(this);
>+    return false;
>+}
>+
>+bool TIntermFunctionPrototype::visit(Visit visit, TIntermTraverser *it)
>+{
>+    it->visitFunctionPrototype(this);
>+    return false;
>+}
>+
>+bool TIntermFunctionDefinition::visit(Visit visit, TIntermTraverser *it)
>+{
>+    return it->visitFunctionDefinition(visit, this);
>+}
>+
>+bool TIntermUnary::visit(Visit visit, TIntermTraverser *it)
>+{
>+    return it->visitUnary(visit, this);
>+}
>+
>+bool TIntermSwizzle::visit(Visit visit, TIntermTraverser *it)
>+{
>+    return it->visitSwizzle(visit, this);
>+}
>+
>+bool TIntermBinary::visit(Visit visit, TIntermTraverser *it)
>+{
>+    return it->visitBinary(visit, this);
>+}
>+
>+bool TIntermTernary::visit(Visit visit, TIntermTraverser *it)
>+{
>+    return it->visitTernary(visit, this);
>+}
>+
>+bool TIntermAggregate::visit(Visit visit, TIntermTraverser *it)
>+{
>+    return it->visitAggregate(visit, this);
>+}
>+
>+bool TIntermDeclaration::visit(Visit visit, TIntermTraverser *it)
>+{
>+    return it->visitDeclaration(visit, this);
>+}
>+
>+bool TIntermInvariantDeclaration::visit(Visit visit, TIntermTraverser *it)
>+{
>+    return it->visitInvariantDeclaration(visit, this);
>+}
>+
>+bool TIntermBlock::visit(Visit visit, TIntermTraverser *it)
>+{
>+    return it->visitBlock(visit, this);
>+}
>+
>+bool TIntermIfElse::visit(Visit visit, TIntermTraverser *it)
>+{
>+    return it->visitIfElse(visit, this);
>+}
>+
>+bool TIntermLoop::visit(Visit visit, TIntermTraverser *it)
>+{
>+    return it->visitLoop(visit, this);
>+}
>+
>+bool TIntermBranch::visit(Visit visit, TIntermTraverser *it)
>+{
>+    return it->visitBranch(visit, this);
>+}
>+
>+bool TIntermSwitch::visit(Visit visit, TIntermTraverser *it)
>+{
>+    return it->visitSwitch(visit, this);
>+}
>+
>+bool TIntermCase::visit(Visit visit, TIntermTraverser *it)
>+{
>+    return it->visitCase(visit, this);
>+}
>+
>+bool TIntermPreprocessorDirective::visit(Visit visit, TIntermTraverser *it)
>+{
>+    it->visitPreprocessorDirective(this);
>+    return false;
>+}
>+
>+TIntermTraverser::TIntermTraverser(bool preVisit,
>+                                   bool inVisit,
>+                                   bool postVisit,
>+                                   TSymbolTable *symbolTable)
>+    : preVisit(preVisit),
>+      inVisit(inVisit),
>+      postVisit(postVisit),
>+      mMaxDepth(0),
>+      mMaxAllowedDepth(std::numeric_limits<int>::max()),
>+      mInGlobalScope(true),
>+      mSymbolTable(symbolTable)
>+{
>+    // Only enabling inVisit is not supported.
>+    ASSERT(!(inVisit && !preVisit && !postVisit));
>+}
>+
>+TIntermTraverser::~TIntermTraverser() {}
>+
>+void TIntermTraverser::setMaxAllowedDepth(int depth)
>+{
>+    mMaxAllowedDepth = depth;
>+}
>+
>+const TIntermBlock *TIntermTraverser::getParentBlock() const
>+{
>+    if (!mParentBlockStack.empty())
>+    {
>+        return mParentBlockStack.back().node;
>+    }
>+    return nullptr;
>+}
>+
>+void TIntermTraverser::pushParentBlock(TIntermBlock *node)
>+{
>+    mParentBlockStack.push_back(ParentBlock(node, 0));
>+}
>+
>+void TIntermTraverser::incrementParentBlockPos()
>+{
>+    ++mParentBlockStack.back().pos;
>+}
>+
>+void TIntermTraverser::popParentBlock()
>+{
>+    ASSERT(!mParentBlockStack.empty());
>+    mParentBlockStack.pop_back();
>+}
>+
>+void TIntermTraverser::insertStatementsInParentBlock(const TIntermSequence &insertions)
>+{
>+    TIntermSequence emptyInsertionsAfter;
>+    insertStatementsInParentBlock(insertions, emptyInsertionsAfter);
>+}
>+
>+void TIntermTraverser::insertStatementsInParentBlock(const TIntermSequence &insertionsBefore,
>+                                                     const TIntermSequence &insertionsAfter)
>+{
>+    ASSERT(!mParentBlockStack.empty());
>+    ParentBlock &parentBlock = mParentBlockStack.back();
>+    if (mPath.back() == parentBlock.node)
>+    {
>+        ASSERT(mParentBlockStack.size() >= 2u);
>+        // The current node is a block node, so the parent block is not the topmost one in the block
>+        // stack, but the one below that.
>+        parentBlock = mParentBlockStack.at(mParentBlockStack.size() - 2u);
>+    }
>+    NodeInsertMultipleEntry insert(parentBlock.node, parentBlock.pos, insertionsBefore,
>+                                   insertionsAfter);
>+    mInsertions.push_back(insert);
>+}
>+
>+void TIntermTraverser::insertStatementInParentBlock(TIntermNode *statement)
>+{
>+    TIntermSequence insertions;
>+    insertions.push_back(statement);
>+    insertStatementsInParentBlock(insertions);
>+}
>+
>+void TIntermTraverser::insertStatementsInBlockAtPosition(TIntermBlock *parent,
>+                                                         size_t position,
>+                                                         const TIntermSequence &insertionsBefore,
>+                                                         const TIntermSequence &insertionsAfter)
>+{
>+    ASSERT(parent);
>+    ASSERT(position >= 0);
>+    ASSERT(position < parent->getChildCount());
>+
>+    mInsertions.emplace_back(parent, position, insertionsBefore, insertionsAfter);
>+}
>+
>+void TLValueTrackingTraverser::setInFunctionCallOutParameter(bool inOutParameter)
>+{
>+    mInFunctionCallOutParameter = inOutParameter;
>+}
>+
>+bool TLValueTrackingTraverser::isInFunctionCallOutParameter() const
>+{
>+    return mInFunctionCallOutParameter;
>+}
>+
>+void TIntermTraverser::traverseBinary(TIntermBinary *node)
>+{
>+    traverse(node);
>+}
>+
>+void TLValueTrackingTraverser::traverseBinary(TIntermBinary *node)
>+{
>+    ScopedNodeInTraversalPath addToPath(this, node);
>+    if (!addToPath.isWithinDepthLimit())
>+        return;
>+
>+    bool visit = true;
>+
>+    // visit the node before children if pre-visiting.
>+    if (preVisit)
>+        visit = node->visit(PreVisit, this);
>+
>+    // Visit the children, in the right order.
>+    if (visit)
>+    {
>+        if (node->isAssignment())
>+        {
>+            ASSERT(!isLValueRequiredHere());
>+            setOperatorRequiresLValue(true);
>+        }
>+
>+        node->getLeft()->traverse(this);
>+
>+        if (node->isAssignment())
>+            setOperatorRequiresLValue(false);
>+
>+        if (inVisit)
>+            visit = node->visit(InVisit, this);
>+
>+        if (visit)
>+        {
>+            // Some binary operations like indexing can be inside an expression which must be an
>+            // l-value.
>+            bool parentOperatorRequiresLValue     = operatorRequiresLValue();
>+            bool parentInFunctionCallOutParameter = isInFunctionCallOutParameter();
>+
>+            // Index is not required to be an l-value even when the surrounding expression is
>+            // required to be an l-value.
>+            TOperator op = node->getOp();
>+            if (op == EOpIndexDirect || op == EOpIndexDirectInterfaceBlock ||
>+                op == EOpIndexDirectStruct || op == EOpIndexIndirect)
>+            {
>+                setOperatorRequiresLValue(false);
>+                setInFunctionCallOutParameter(false);
>+            }
>+
>+            node->getRight()->traverse(this);
>+
>+            setOperatorRequiresLValue(parentOperatorRequiresLValue);
>+            setInFunctionCallOutParameter(parentInFunctionCallOutParameter);
>+
>+            // Visit the node after the children, if requested and the traversal
>+            // hasn't been cancelled yet.
>+            if (postVisit)
>+                visit = node->visit(PostVisit, this);
>+        }
>+    }
>+}
>+
>+void TIntermTraverser::traverseUnary(TIntermUnary *node)
>+{
>+    traverse(node);
>+}
>+
>+void TLValueTrackingTraverser::traverseUnary(TIntermUnary *node)
>+{
>+    ScopedNodeInTraversalPath addToPath(this, node);
>+    if (!addToPath.isWithinDepthLimit())
>+        return;
>+
>+    bool visit = true;
>+
>+    if (preVisit)
>+        visit = node->visit(PreVisit, this);
>+
>+    if (visit)
>+    {
>+        ASSERT(!operatorRequiresLValue());
>+        switch (node->getOp())
>+        {
>+            case EOpPostIncrement:
>+            case EOpPostDecrement:
>+            case EOpPreIncrement:
>+            case EOpPreDecrement:
>+                setOperatorRequiresLValue(true);
>+                break;
>+            default:
>+                break;
>+        }
>+
>+        node->getOperand()->traverse(this);
>+
>+        setOperatorRequiresLValue(false);
>+
>+        if (postVisit)
>+            visit = node->visit(PostVisit, this);
>+    }
>+}
>+
>+// Traverse a function definition node. This keeps track of global scope.
>+void TIntermTraverser::traverseFunctionDefinition(TIntermFunctionDefinition *node)
>+{
>+    ScopedNodeInTraversalPath addToPath(this, node);
>+    if (!addToPath.isWithinDepthLimit())
>+        return;
>+
>+    bool visit = true;
>+
>+    if (preVisit)
>+        visit = node->visit(PreVisit, this);
>+
>+    if (visit)
>+    {
>+        node->getFunctionPrototype()->traverse(this);
>+        if (inVisit)
>+            visit = node->visit(InVisit, this);
>+        if (visit)
>+        {
>+            mInGlobalScope = false;
>+            node->getBody()->traverse(this);
>+            mInGlobalScope = true;
>+            if (postVisit)
>+                visit = node->visit(PostVisit, this);
>+        }
>+    }
>+}
>+
>+// Traverse a block node. This keeps track of the position of traversed child nodes within the block
>+// so that nodes may be inserted before or after them.
>+void TIntermTraverser::traverseBlock(TIntermBlock *node)
>+{
>+    ScopedNodeInTraversalPath addToPath(this, node);
>+    if (!addToPath.isWithinDepthLimit())
>+        return;
>+
>+    pushParentBlock(node);
>+
>+    bool visit = true;
>+
>+    TIntermSequence *sequence = node->getSequence();
>+
>+    if (preVisit)
>+        visit = node->visit(PreVisit, this);
>+
>+    if (visit)
>+    {
>+        for (auto *child : *sequence)
>+        {
>+            if (visit)
>+            {
>+                child->traverse(this);
>+                if (inVisit)
>+                {
>+                    if (child != sequence->back())
>+                        visit = node->visit(InVisit, this);
>+                }
>+
>+                incrementParentBlockPos();
>+            }
>+        }
>+
>+        if (visit && postVisit)
>+            visit = node->visit(PostVisit, this);
>+    }
>+
>+    popParentBlock();
>+}
>+
>+void TIntermTraverser::traverseAggregate(TIntermAggregate *node)
>+{
>+    traverse(node);
>+}
>+
>+bool TIntermTraverser::CompareInsertion(const NodeInsertMultipleEntry &a,
>+                                        const NodeInsertMultipleEntry &b)
>+{
>+    if (a.parent != b.parent)
>+    {
>+        return a.parent > b.parent;
>+    }
>+    return a.position > b.position;
>+}
>+
>+void TIntermTraverser::updateTree()
>+{
>+    // Sort the insertions so that insertion position is decreasing. This way multiple insertions to
>+    // the same parent node are handled correctly.
>+    std::sort(mInsertions.begin(), mInsertions.end(), CompareInsertion);
>+    for (size_t ii = 0; ii < mInsertions.size(); ++ii)
>+    {
>+        // We can't know here what the intended ordering of two insertions to the same position is,
>+        // so it is not supported.
>+        ASSERT(ii == 0 || mInsertions[ii].position != mInsertions[ii - 1].position ||
>+               mInsertions[ii].parent != mInsertions[ii - 1].parent);
>+        const NodeInsertMultipleEntry &insertion = mInsertions[ii];
>+        ASSERT(insertion.parent);
>+        if (!insertion.insertionsAfter.empty())
>+        {
>+            bool inserted = insertion.parent->insertChildNodes(insertion.position + 1,
>+                                                               insertion.insertionsAfter);
>+            ASSERT(inserted);
>+        }
>+        if (!insertion.insertionsBefore.empty())
>+        {
>+            bool inserted =
>+                insertion.parent->insertChildNodes(insertion.position, insertion.insertionsBefore);
>+            ASSERT(inserted);
>+        }
>+    }
>+    for (size_t ii = 0; ii < mReplacements.size(); ++ii)
>+    {
>+        const NodeUpdateEntry &replacement = mReplacements[ii];
>+        ASSERT(replacement.parent);
>+        bool replaced =
>+            replacement.parent->replaceChildNode(replacement.original, replacement.replacement);
>+        ASSERT(replaced);
>+
>+        if (!replacement.originalBecomesChildOfReplacement)
>+        {
>+            // In AST traversing, a parent is visited before its children.
>+            // After we replace a node, if its immediate child is to
>+            // be replaced, we need to make sure we don't update the replaced
>+            // node; instead, we update the replacement node.
>+            for (size_t jj = ii + 1; jj < mReplacements.size(); ++jj)
>+            {
>+                NodeUpdateEntry &replacement2 = mReplacements[jj];
>+                if (replacement2.parent == replacement.original)
>+                    replacement2.parent = replacement.replacement;
>+            }
>+        }
>+    }
>+    for (size_t ii = 0; ii < mMultiReplacements.size(); ++ii)
>+    {
>+        const NodeReplaceWithMultipleEntry &replacement = mMultiReplacements[ii];
>+        ASSERT(replacement.parent);
>+        bool replaced = replacement.parent->replaceChildNodeWithMultiple(replacement.original,
>+                                                                         replacement.replacements);
>+        ASSERT(replaced);
>+    }
>+
>+    clearReplacementQueue();
>+}
>+
>+void TIntermTraverser::clearReplacementQueue()
>+{
>+    mReplacements.clear();
>+    mMultiReplacements.clear();
>+    mInsertions.clear();
>+}
>+
>+void TIntermTraverser::queueReplacement(TIntermNode *replacement, OriginalNode originalStatus)
>+{
>+    queueReplacementWithParent(getParentNode(), mPath.back(), replacement, originalStatus);
>+}
>+
>+void TIntermTraverser::queueReplacementWithParent(TIntermNode *parent,
>+                                                  TIntermNode *original,
>+                                                  TIntermNode *replacement,
>+                                                  OriginalNode originalStatus)
>+{
>+    bool originalBecomesChild = (originalStatus == OriginalNode::BECOMES_CHILD);
>+    mReplacements.push_back(NodeUpdateEntry(parent, original, replacement, originalBecomesChild));
>+}
>+
>+TLValueTrackingTraverser::TLValueTrackingTraverser(bool preVisit,
>+                                                   bool inVisit,
>+                                                   bool postVisit,
>+                                                   TSymbolTable *symbolTable)
>+    : TIntermTraverser(preVisit, inVisit, postVisit, symbolTable),
>+      mOperatorRequiresLValue(false),
>+      mInFunctionCallOutParameter(false)
>+{
>+    ASSERT(symbolTable);
>+}
>+
>+void TLValueTrackingTraverser::traverseAggregate(TIntermAggregate *node)
>+{
>+    ScopedNodeInTraversalPath addToPath(this, node);
>+    if (!addToPath.isWithinDepthLimit())
>+        return;
>+
>+    bool visit = true;
>+
>+    TIntermSequence *sequence = node->getSequence();
>+
>+    if (preVisit)
>+        visit = node->visit(PreVisit, this);
>+
>+    if (visit)
>+    {
>+        size_t paramIndex = 0u;
>+        for (auto *child : *sequence)
>+        {
>+            if (visit)
>+            {
>+                if (node->getFunction())
>+                {
>+                    // Both built-ins and user defined functions should have the function symbol
>+                    // set.
>+                    ASSERT(paramIndex < node->getFunction()->getParamCount());
>+                    TQualifier qualifier =
>+                        node->getFunction()->getParam(paramIndex)->getType().getQualifier();
>+                    setInFunctionCallOutParameter(qualifier == EvqOut || qualifier == EvqInOut);
>+                    ++paramIndex;
>+                }
>+                else
>+                {
>+                    ASSERT(node->isConstructor());
>+                }
>+                child->traverse(this);
>+                if (inVisit)
>+                {
>+                    if (child != sequence->back())
>+                        visit = node->visit(InVisit, this);
>+                }
>+            }
>+        }
>+        setInFunctionCallOutParameter(false);
>+
>+        if (visit && postVisit)
>+            visit = node->visit(PostVisit, this);
>+    }
>+}
>+
>+void TIntermTraverser::traverseLoop(TIntermLoop *node)
>+{
>+    traverse(node);
>+}
>+}  // namespace sh
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/tree_util/IntermTraverse.h b/Source/ThirdParty/ANGLE/src/compiler/translator/tree_util/IntermTraverse.h
>new file mode 100644
>index 00000000000..30687a4869f
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/tree_util/IntermTraverse.h
>@@ -0,0 +1,322 @@
>+//
>+// Copyright (c) 2017 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// IntermTraverse.h : base classes for AST traversers that walk the AST and
>+//   also have the ability to transform it by replacing nodes.
>+
>+#ifndef COMPILER_TRANSLATOR_TREEUTIL_INTERMTRAVERSE_H_
>+#define COMPILER_TRANSLATOR_TREEUTIL_INTERMTRAVERSE_H_
>+
>+#include "compiler/translator/IntermNode.h"
>+#include "compiler/translator/tree_util/Visit.h"
>+
>+namespace sh
>+{
>+
>+class TSymbolTable;
>+class TSymbolUniqueId;
>+
>+// For traversing the tree.  User should derive from this class overriding the visit functions,
>+// and then pass an object of the subclass to a traverse method of a node.
>+//
>+// The traverse*() functions may also be overridden to do other bookkeeping on the tree to provide
>+// contextual information to the visit functions, such as whether the node is the target of an
>+// assignment. This is complex to maintain and so should only be done in special cases.
>+//
>+// When using this, just fill in the methods for nodes you want visited.
>+// Return false from a pre-visit to skip visiting that node's subtree.
>+//
>+// See also how to write AST transformations documentation:
>+//   https://github.com/google/angle/blob/master/doc/WritingShaderASTTransformations.md
>+class TIntermTraverser : angle::NonCopyable
>+{
>+  public:
>+    POOL_ALLOCATOR_NEW_DELETE
>+    TIntermTraverser(bool preVisit,
>+                     bool inVisit,
>+                     bool postVisit,
>+                     TSymbolTable *symbolTable = nullptr);
>+    virtual ~TIntermTraverser();
>+
>+    virtual void visitSymbol(TIntermSymbol *node) {}
>+    virtual void visitConstantUnion(TIntermConstantUnion *node) {}
>+    virtual bool visitSwizzle(Visit visit, TIntermSwizzle *node) { return true; }
>+    virtual bool visitBinary(Visit visit, TIntermBinary *node) { return true; }
>+    virtual bool visitUnary(Visit visit, TIntermUnary *node) { return true; }
>+    virtual bool visitTernary(Visit visit, TIntermTernary *node) { return true; }
>+    virtual bool visitIfElse(Visit visit, TIntermIfElse *node) { return true; }
>+    virtual bool visitSwitch(Visit visit, TIntermSwitch *node) { return true; }
>+    virtual bool visitCase(Visit visit, TIntermCase *node) { return true; }
>+    virtual void visitFunctionPrototype(TIntermFunctionPrototype *node) {}
>+    virtual bool visitFunctionDefinition(Visit visit, TIntermFunctionDefinition *node)
>+    {
>+        return true;
>+    }
>+    virtual bool visitAggregate(Visit visit, TIntermAggregate *node) { return true; }
>+    virtual bool visitBlock(Visit visit, TIntermBlock *node) { return true; }
>+    virtual bool visitInvariantDeclaration(Visit visit, TIntermInvariantDeclaration *node)
>+    {
>+        return true;
>+    }
>+    virtual bool visitDeclaration(Visit visit, TIntermDeclaration *node) { return true; }
>+    virtual bool visitLoop(Visit visit, TIntermLoop *node) { return true; }
>+    virtual bool visitBranch(Visit visit, TIntermBranch *node) { return true; }
>+    virtual void visitPreprocessorDirective(TIntermPreprocessorDirective *node) {}
>+
>+    // The traverse functions contain logic for iterating over the children of the node
>+    // and calling the visit functions in the appropriate places. They also track some
>+    // context that may be used by the visit functions.
>+
>+    // The generic traverse() function is used for nodes that don't need special handling.
>+    // It's templated in order to avoid virtual function calls, this gains around 2% compiler
>+    // performance.
>+    template <typename T>
>+    void traverse(T *node);
>+
>+    // Specialized traverse functions are implemented for node types where traversal logic may need
>+    // to be overridden or where some special bookkeeping needs to be done.
>+    virtual void traverseBinary(TIntermBinary *node);
>+    virtual void traverseUnary(TIntermUnary *node);
>+    virtual void traverseFunctionDefinition(TIntermFunctionDefinition *node);
>+    virtual void traverseAggregate(TIntermAggregate *node);
>+    virtual void traverseBlock(TIntermBlock *node);
>+    virtual void traverseLoop(TIntermLoop *node);
>+
>+    int getMaxDepth() const { return mMaxDepth; }
>+
>+    // If traversers need to replace nodes, they can add the replacements in
>+    // mReplacements/mMultiReplacements during traversal and the user of the traverser should call
>+    // this function after traversal to perform them.
>+    void updateTree();
>+
>+  protected:
>+    void setMaxAllowedDepth(int depth);
>+
>+    // Should only be called from traverse*() functions
>+    bool incrementDepth(TIntermNode *current)
>+    {
>+        mMaxDepth = std::max(mMaxDepth, static_cast<int>(mPath.size()));
>+        mPath.push_back(current);
>+        return mMaxDepth < mMaxAllowedDepth;
>+    }
>+
>+    // Should only be called from traverse*() functions
>+    void decrementDepth() { mPath.pop_back(); }
>+
>+    int getCurrentTraversalDepth() const { return static_cast<int>(mPath.size()) - 1; }
>+
>+    // RAII helper for incrementDepth/decrementDepth
>+    class ScopedNodeInTraversalPath
>+    {
>+      public:
>+        ScopedNodeInTraversalPath(TIntermTraverser *traverser, TIntermNode *current)
>+            : mTraverser(traverser)
>+        {
>+            mWithinDepthLimit = mTraverser->incrementDepth(current);
>+        }
>+        ~ScopedNodeInTraversalPath() { mTraverser->decrementDepth(); }
>+
>+        bool isWithinDepthLimit() { return mWithinDepthLimit; }
>+
>+      private:
>+        TIntermTraverser *mTraverser;
>+        bool mWithinDepthLimit;
>+    };
>+    // Optimized traversal functions for leaf nodes directly access ScopedNodeInTraversalPath.
>+    friend void TIntermSymbol::traverse(TIntermTraverser *);
>+    friend void TIntermConstantUnion::traverse(TIntermTraverser *);
>+    friend void TIntermFunctionPrototype::traverse(TIntermTraverser *);
>+
>+    TIntermNode *getParentNode() { return mPath.size() <= 1 ? nullptr : mPath[mPath.size() - 2u]; }
>+
>+    // Return the nth ancestor of the node being traversed. getAncestorNode(0) == getParentNode()
>+    TIntermNode *getAncestorNode(unsigned int n)
>+    {
>+        if (mPath.size() > n + 1u)
>+        {
>+            return mPath[mPath.size() - n - 2u];
>+        }
>+        return nullptr;
>+    }
>+
>+    const TIntermBlock *getParentBlock() const;
>+
>+    void pushParentBlock(TIntermBlock *node);
>+    void incrementParentBlockPos();
>+    void popParentBlock();
>+
>+    // To replace a single node with multiple nodes in the parent aggregate. May be used with blocks
>+    // but also with other nodes like declarations.
>+    struct NodeReplaceWithMultipleEntry
>+    {
>+        NodeReplaceWithMultipleEntry(TIntermAggregateBase *parentIn,
>+                                     TIntermNode *originalIn,
>+                                     TIntermSequence replacementsIn)
>+            : parent(parentIn), original(originalIn), replacements(std::move(replacementsIn))
>+        {}
>+
>+        TIntermAggregateBase *parent;
>+        TIntermNode *original;
>+        TIntermSequence replacements;
>+    };
>+
>+    // Helper to insert statements in the parent block of the node currently being traversed.
>+    // The statements will be inserted before the node being traversed once updateTree is called.
>+    // Should only be called during PreVisit or PostVisit if called from block nodes.
>+    // Note that two insertions to the same position in the same block are not supported.
>+    void insertStatementsInParentBlock(const TIntermSequence &insertions);
>+
>+    // Same as above, but supports simultaneous insertion of statements before and after the node
>+    // currently being traversed.
>+    void insertStatementsInParentBlock(const TIntermSequence &insertionsBefore,
>+                                       const TIntermSequence &insertionsAfter);
>+
>+    // Helper to insert a single statement.
>+    void insertStatementInParentBlock(TIntermNode *statement);
>+
>+    // Explicitly specify where to insert statements. The statements are inserted before and after
>+    // the specified position. The statements will be inserted once updateTree is called. Note that
>+    // two insertions to the same position in the same block are not supported.
>+    void insertStatementsInBlockAtPosition(TIntermBlock *parent,
>+                                           size_t position,
>+                                           const TIntermSequence &insertionsBefore,
>+                                           const TIntermSequence &insertionsAfter);
>+
>+    enum class OriginalNode
>+    {
>+        BECOMES_CHILD,
>+        IS_DROPPED
>+    };
>+
>+    void clearReplacementQueue();
>+
>+    // Replace the node currently being visited with replacement.
>+    void queueReplacement(TIntermNode *replacement, OriginalNode originalStatus);
>+    // Explicitly specify a node to replace with replacement.
>+    void queueReplacementWithParent(TIntermNode *parent,
>+                                    TIntermNode *original,
>+                                    TIntermNode *replacement,
>+                                    OriginalNode originalStatus);
>+
>+    const bool preVisit;
>+    const bool inVisit;
>+    const bool postVisit;
>+
>+    int mMaxDepth;
>+    int mMaxAllowedDepth;
>+
>+    bool mInGlobalScope;
>+
>+    // During traversing, save all the changes that need to happen into
>+    // mReplacements/mMultiReplacements, then do them by calling updateTree().
>+    // Multi replacements are processed after single replacements.
>+    std::vector<NodeReplaceWithMultipleEntry> mMultiReplacements;
>+
>+    TSymbolTable *mSymbolTable;
>+
>+  private:
>+    // To insert multiple nodes into the parent block.
>+    struct NodeInsertMultipleEntry
>+    {
>+        NodeInsertMultipleEntry(TIntermBlock *_parent,
>+                                TIntermSequence::size_type _position,
>+                                TIntermSequence _insertionsBefore,
>+                                TIntermSequence _insertionsAfter)
>+            : parent(_parent),
>+              position(_position),
>+              insertionsBefore(_insertionsBefore),
>+              insertionsAfter(_insertionsAfter)
>+        {}
>+
>+        TIntermBlock *parent;
>+        TIntermSequence::size_type position;
>+        TIntermSequence insertionsBefore;
>+        TIntermSequence insertionsAfter;
>+    };
>+
>+    static bool CompareInsertion(const NodeInsertMultipleEntry &a,
>+                                 const NodeInsertMultipleEntry &b);
>+
>+    // To replace a single node with another on the parent node
>+    struct NodeUpdateEntry
>+    {
>+        NodeUpdateEntry(TIntermNode *_parent,
>+                        TIntermNode *_original,
>+                        TIntermNode *_replacement,
>+                        bool _originalBecomesChildOfReplacement)
>+            : parent(_parent),
>+              original(_original),
>+              replacement(_replacement),
>+              originalBecomesChildOfReplacement(_originalBecomesChildOfReplacement)
>+        {}
>+
>+        TIntermNode *parent;
>+        TIntermNode *original;
>+        TIntermNode *replacement;
>+        bool originalBecomesChildOfReplacement;
>+    };
>+
>+    struct ParentBlock
>+    {
>+        ParentBlock(TIntermBlock *nodeIn, TIntermSequence::size_type posIn)
>+            : node(nodeIn), pos(posIn)
>+        {}
>+
>+        TIntermBlock *node;
>+        TIntermSequence::size_type pos;
>+    };
>+
>+    std::vector<NodeInsertMultipleEntry> mInsertions;
>+    std::vector<NodeUpdateEntry> mReplacements;
>+
>+    // All the nodes from root to the current node during traversing.
>+    TVector<TIntermNode *> mPath;
>+
>+    // All the code blocks from the root to the current node's parent during traversal.
>+    std::vector<ParentBlock> mParentBlockStack;
>+};
>+
>+// Traverser parent class that tracks where a node is a destination of a write operation and so is
>+// required to be an l-value.
>+class TLValueTrackingTraverser : public TIntermTraverser
>+{
>+  public:
>+    TLValueTrackingTraverser(bool preVisit,
>+                             bool inVisit,
>+                             bool postVisit,
>+                             TSymbolTable *symbolTable);
>+    virtual ~TLValueTrackingTraverser() {}
>+
>+    void traverseBinary(TIntermBinary *node) final;
>+    void traverseUnary(TIntermUnary *node) final;
>+    void traverseAggregate(TIntermAggregate *node) final;
>+
>+  protected:
>+    bool isLValueRequiredHere() const
>+    {
>+        return mOperatorRequiresLValue || mInFunctionCallOutParameter;
>+    }
>+
>+  private:
>+    // Track whether an l-value is required in the node that is currently being traversed by the
>+    // surrounding operator.
>+    // Use isLValueRequiredHere to check all conditions which require an l-value.
>+    void setOperatorRequiresLValue(bool lValueRequired)
>+    {
>+        mOperatorRequiresLValue = lValueRequired;
>+    }
>+    bool operatorRequiresLValue() const { return mOperatorRequiresLValue; }
>+
>+    // Track whether an l-value is required inside a function call.
>+    void setInFunctionCallOutParameter(bool inOutParameter);
>+    bool isInFunctionCallOutParameter() const;
>+
>+    bool mOperatorRequiresLValue;
>+    bool mInFunctionCallOutParameter;
>+};
>+
>+}  // namespace sh
>+
>+#endif  // COMPILER_TRANSLATOR_TREEUTIL_INTERMTRAVERSE_H_
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/tree_util/NodeSearch.h b/Source/ThirdParty/ANGLE/src/compiler/translator/tree_util/NodeSearch.h
>new file mode 100644
>index 00000000000..c0835315781
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/tree_util/NodeSearch.h
>@@ -0,0 +1,56 @@
>+//
>+// Copyright (c) 2002-2013 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// NodeSearch.h: Utilities for searching translator node graphs
>+//
>+
>+#ifndef COMPILER_TRANSLATOR_TREEUTIL_NODESEARCH_H_
>+#define COMPILER_TRANSLATOR_TREEUTIL_NODESEARCH_H_
>+
>+#include "compiler/translator/tree_util/IntermTraverse.h"
>+
>+namespace sh
>+{
>+
>+template <class Parent>
>+class NodeSearchTraverser : public TIntermTraverser
>+{
>+  public:
>+    NodeSearchTraverser() : TIntermTraverser(true, false, false), mFound(false) {}
>+
>+    bool found() const { return mFound; }
>+
>+    static bool search(TIntermNode *node)
>+    {
>+        Parent searchTraverser;
>+        node->traverse(&searchTraverser);
>+        return searchTraverser.found();
>+    }
>+
>+  protected:
>+    bool mFound;
>+};
>+
>+class FindDiscard : public NodeSearchTraverser<FindDiscard>
>+{
>+  public:
>+    virtual bool visitBranch(Visit visit, TIntermBranch *node)
>+    {
>+        switch (node->getFlowOp())
>+        {
>+            case EOpKill:
>+                mFound = true;
>+                break;
>+
>+            default:
>+                break;
>+        }
>+
>+        return !mFound;
>+    }
>+};
>+}  // namespace sh
>+
>+#endif  // COMPILER_TRANSLATOR_TREEUTIL_NODESEARCH_H_
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/tree_util/ReplaceVariable.cpp b/Source/ThirdParty/ANGLE/src/compiler/translator/tree_util/ReplaceVariable.cpp
>new file mode 100644
>index 00000000000..7120cea20b3
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/tree_util/ReplaceVariable.cpp
>@@ -0,0 +1,64 @@
>+//
>+// Copyright (c) 2018 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// ReplaceVariable.cpp: Replace all references to a specific variable in the AST with references to
>+// another variable.
>+
>+#include "compiler/translator/tree_util/ReplaceVariable.h"
>+
>+#include "compiler/translator/IntermNode.h"
>+#include "compiler/translator/tree_util/IntermTraverse.h"
>+
>+namespace sh
>+{
>+
>+namespace
>+{
>+
>+class ReplaceVariableTraverser : public TIntermTraverser
>+{
>+  public:
>+    ReplaceVariableTraverser(const TVariable *toBeReplaced, const TIntermTyped *replacement)
>+        : TIntermTraverser(true, false, false),
>+          mToBeReplaced(toBeReplaced),
>+          mReplacement(replacement)
>+    {}
>+
>+    void visitSymbol(TIntermSymbol *node) override
>+    {
>+        if (&node->variable() == mToBeReplaced)
>+        {
>+            queueReplacement(mReplacement->deepCopy(), OriginalNode::IS_DROPPED);
>+        }
>+    }
>+
>+  private:
>+    const TVariable *const mToBeReplaced;
>+    const TIntermTyped *const mReplacement;
>+};
>+
>+}  // anonymous namespace
>+
>+// Replaces every occurrence of a variable with another variable.
>+void ReplaceVariable(TIntermBlock *root,
>+                     const TVariable *toBeReplaced,
>+                     const TVariable *replacement)
>+{
>+    ReplaceVariableTraverser traverser(toBeReplaced, new TIntermSymbol(replacement));
>+    root->traverse(&traverser);
>+    traverser.updateTree();
>+}
>+
>+// Replaces every occurrence of a variable with a TIntermNode.
>+void ReplaceVariableWithTyped(TIntermBlock *root,
>+                              const TVariable *toBeReplaced,
>+                              const TIntermTyped *replacement)
>+{
>+    ReplaceVariableTraverser traverser(toBeReplaced, replacement);
>+    root->traverse(&traverser);
>+    traverser.updateTree();
>+}
>+
>+}  // namespace sh
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/tree_util/ReplaceVariable.h b/Source/ThirdParty/ANGLE/src/compiler/translator/tree_util/ReplaceVariable.h
>new file mode 100644
>index 00000000000..3a9e34ee34f
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/tree_util/ReplaceVariable.h
>@@ -0,0 +1,27 @@
>+//
>+// Copyright (c) 2018 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// ReplaceVariable.h: Replace all references to a specific variable in the AST with references to
>+// another variable.
>+
>+#ifndef COMPILER_TRANSLATOR_TREEUTIL_REPLACEVARIABLE_H_
>+#define COMPILER_TRANSLATOR_TREEUTIL_REPLACEVARIABLE_H_
>+
>+namespace sh
>+{
>+
>+class TIntermBlock;
>+class TVariable;
>+class TIntermTyped;
>+
>+void ReplaceVariable(TIntermBlock *root,
>+                     const TVariable *toBeReplaced,
>+                     const TVariable *replacement);
>+void ReplaceVariableWithTyped(TIntermBlock *root,
>+                              const TVariable *toBeReplaced,
>+                              const TIntermTyped *replacement);
>+}  // namespace sh
>+
>+#endif  // COMPILER_TRANSLATOR_TREEUTIL_REPLACEVARIABLE_H_
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/tree_util/RunAtTheEndOfShader.cpp b/Source/ThirdParty/ANGLE/src/compiler/translator/tree_util/RunAtTheEndOfShader.cpp
>new file mode 100644
>index 00000000000..bd00b8a0d91
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/tree_util/RunAtTheEndOfShader.cpp
>@@ -0,0 +1,116 @@
>+//
>+// Copyright (c) 2017 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// RunAtTheEndOfShader.cpp: Add code to be run at the end of the shader. In case main() contains a
>+// return statement, this is done by replacing the main() function with another function that calls
>+// the old main, like this:
>+//
>+// void main() { body }
>+// =>
>+// void main0() { body }
>+// void main()
>+// {
>+//     main0();
>+//     codeToRun
>+// }
>+//
>+// This way the code will get run even if the return statement inside main is executed.
>+//
>+
>+#include "compiler/translator/tree_util/RunAtTheEndOfShader.h"
>+
>+#include "compiler/translator/IntermNode.h"
>+#include "compiler/translator/StaticType.h"
>+#include "compiler/translator/SymbolTable.h"
>+#include "compiler/translator/tree_util/FindMain.h"
>+#include "compiler/translator/tree_util/IntermNode_util.h"
>+#include "compiler/translator/tree_util/IntermTraverse.h"
>+
>+namespace sh
>+{
>+
>+namespace
>+{
>+
>+constexpr const ImmutableString kMainString("main");
>+
>+class ContainsReturnTraverser : public TIntermTraverser
>+{
>+  public:
>+    ContainsReturnTraverser() : TIntermTraverser(true, false, false), mContainsReturn(false) {}
>+
>+    bool visitBranch(Visit visit, TIntermBranch *node) override
>+    {
>+        if (node->getFlowOp() == EOpReturn)
>+        {
>+            mContainsReturn = true;
>+        }
>+        return false;
>+    }
>+
>+    bool containsReturn() { return mContainsReturn; }
>+
>+  private:
>+    bool mContainsReturn;
>+};
>+
>+bool ContainsReturn(TIntermNode *node)
>+{
>+    ContainsReturnTraverser traverser;
>+    node->traverse(&traverser);
>+    return traverser.containsReturn();
>+}
>+
>+void WrapMainAndAppend(TIntermBlock *root,
>+                       TIntermFunctionDefinition *main,
>+                       TIntermNode *codeToRun,
>+                       TSymbolTable *symbolTable)
>+{
>+    // Replace main() with main0() with the same body.
>+    TFunction *oldMain =
>+        new TFunction(symbolTable, kEmptyImmutableString, SymbolType::AngleInternal,
>+                      StaticType::GetBasic<EbtVoid>(), false);
>+    TIntermFunctionDefinition *oldMainDefinition =
>+        CreateInternalFunctionDefinitionNode(*oldMain, main->getBody());
>+
>+    bool replaced = root->replaceChildNode(main, oldMainDefinition);
>+    ASSERT(replaced);
>+
>+    // void main()
>+    TFunction *newMain = new TFunction(symbolTable, kMainString, SymbolType::UserDefined,
>+                                       StaticType::GetBasic<EbtVoid>(), false);
>+    TIntermFunctionPrototype *newMainProto = new TIntermFunctionPrototype(newMain);
>+
>+    // {
>+    //     main0();
>+    //     codeToRun
>+    // }
>+    TIntermBlock *newMainBody = new TIntermBlock();
>+    TIntermAggregate *oldMainCall =
>+        TIntermAggregate::CreateFunctionCall(*oldMain, new TIntermSequence());
>+    newMainBody->appendStatement(oldMainCall);
>+    newMainBody->appendStatement(codeToRun);
>+
>+    // Add the new main() to the root node.
>+    TIntermFunctionDefinition *newMainDefinition =
>+        new TIntermFunctionDefinition(newMainProto, newMainBody);
>+    root->appendStatement(newMainDefinition);
>+}
>+
>+}  // anonymous namespace
>+
>+void RunAtTheEndOfShader(TIntermBlock *root, TIntermNode *codeToRun, TSymbolTable *symbolTable)
>+{
>+    TIntermFunctionDefinition *main = FindMain(root);
>+    if (!ContainsReturn(main))
>+    {
>+        main->getBody()->appendStatement(codeToRun);
>+        return;
>+    }
>+
>+    WrapMainAndAppend(root, main, codeToRun, symbolTable);
>+}
>+
>+}  // namespace sh
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/tree_util/RunAtTheEndOfShader.h b/Source/ThirdParty/ANGLE/src/compiler/translator/tree_util/RunAtTheEndOfShader.h
>new file mode 100644
>index 00000000000..ed5a0bb64f2
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/tree_util/RunAtTheEndOfShader.h
>@@ -0,0 +1,23 @@
>+//
>+// Copyright (c) 2017 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// RunAtTheEndOfShader.h: Add code to be run at the end of the shader.
>+//
>+
>+#ifndef COMPILER_TRANSLATOR_TREEUTIL_RUNATTHEENDOFSHADER_H_
>+#define COMPILER_TRANSLATOR_TREEUTIL_RUNATTHEENDOFSHADER_H_
>+
>+namespace sh
>+{
>+
>+class TIntermBlock;
>+class TIntermNode;
>+class TSymbolTable;
>+
>+void RunAtTheEndOfShader(TIntermBlock *root, TIntermNode *codeToRun, TSymbolTable *symbolTable);
>+
>+}  // namespace sh
>+
>+#endif  // COMPILER_TRANSLATOR_TREEUTIL_RUNATTHEENDOFSHADER_H_
>\ No newline at end of file
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/tree_util/Visit.h b/Source/ThirdParty/ANGLE/src/compiler/translator/tree_util/Visit.h
>new file mode 100644
>index 00000000000..2b22fbdf86a
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/tree_util/Visit.h
>@@ -0,0 +1,22 @@
>+//
>+// Copyright (c) 2018 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+
>+#ifndef COMPILER_TRANSLATOR_TREEUTIL_VISIT_H_
>+#define COMPILER_TRANSLATOR_TREEUTIL_VISIT_H_
>+
>+namespace sh
>+{
>+
>+enum Visit
>+{
>+    PreVisit,
>+    InVisit,
>+    PostVisit
>+};
>+
>+}  // namespace sh
>+
>+#endif  // COMPILER_TRANSLATOR_TREEUTIL_VISIT_H_
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/util.cpp b/Source/ThirdParty/ANGLE/src/compiler/translator/util.cpp
>index 9738370c47f..c118469eca9 100644
>--- a/Source/ThirdParty/ANGLE/src/compiler/translator/util.cpp
>+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/util.cpp
>@@ -10,11 +10,12 @@
> 
> #include "common/utilities.h"
> #include "compiler/preprocessor/numeric_lex.h"
>+#include "compiler/translator/ImmutableStringBuilder.h"
> #include "compiler/translator/SymbolTable.h"
> 
> bool atoi_clamp(const char *str, unsigned int *value)
> {
>-    bool success = pp::numeric_lex_int(str, value);
>+    bool success = angle::pp::numeric_lex_int(str, value);
>     if (!success)
>         *value = std::numeric_limits<unsigned int>::max();
>     return success;
>@@ -56,6 +57,10 @@ float NumericLexFloat32OutOfRangeToInfinity(const std::string &str)
> 
>     // The exponent offset reflects the position of the decimal point.
>     int exponentOffset = -1;
>+
>+    // This is just a counter for how many decimal digits are written to decimalMantissa.
>+    int mantissaDecimalDigits = 0;
>+
>     while (i < str.length())
>     {
>         const char c = str[i];
>@@ -83,6 +88,7 @@ float NumericLexFloat32OutOfRangeToInfinity(const std::string &str)
>             if (decimalMantissa <= (std::numeric_limits<unsigned int>::max() - 9u) / 10u)
>             {
>                 decimalMantissa = decimalMantissa * 10u + digit;
>+                ++mantissaDecimalDigits;
>             }
>             if (!decimalPointSeen)
>             {
>@@ -162,12 +168,7 @@ float NumericLexFloat32OutOfRangeToInfinity(const std::string &str)
>     double value = decimalMantissa;
> 
>     // Calculate the exponent offset to normalize the mantissa.
>-    int normalizationExponentOffset = 0;
>-    while (decimalMantissa >= 10u)
>-    {
>-        --normalizationExponentOffset;
>-        decimalMantissa /= 10u;
>-    }
>+    int normalizationExponentOffset = 1 - mantissaDecimalDigits;
>     // Apply the exponent.
>     value *= std::pow(10.0, static_cast<double>(exponent + normalizationExponentOffset));
>     if (value > static_cast<double>(std::numeric_limits<float>::max()))
>@@ -183,11 +184,7 @@ float NumericLexFloat32OutOfRangeToInfinity(const std::string &str)
> 
> bool strtof_clamp(const std::string &str, float *value)
> {
>-    // Try the standard float parsing path first.
>-    bool success = pp::numeric_lex_float(str, value);
>-
>-    // If the standard path doesn't succeed, take the path that can handle the following corner
>-    // cases:
>+    // Custom float parsing that can handle the following corner cases:
>     //   1. The decimal mantissa is very small but the exponent is very large, putting the resulting
>     //   number inside the float range.
>     //   2. The decimal mantissa is very large but the exponent is very small, putting the resulting
>@@ -195,8 +192,7 @@ bool strtof_clamp(const std::string &str, float *value)
>     //   3. The value is out-of-range and should be evaluated as infinity.
>     //   4. The value is too small and should be evaluated as zero.
>     // See ESSL 3.00.6 section 4.1.4 for the relevant specification.
>-    if (!success)
>-        *value = NumericLexFloat32OutOfRangeToInfinity(str);
>+    *value = NumericLexFloat32OutOfRangeToInfinity(str);
>     return !gl::isInf(*value);
> }
> 
>@@ -216,6 +212,9 @@ GLenum GLVariableType(const TType &type)
>                     return GL_FLOAT_VEC4;
>                 default:
>                     UNREACHABLE();
>+#if !UNREACHABLE_IS_NORETURN
>+                    return GL_NONE;
>+#endif
>             }
>         }
>         else if (type.isMatrix())
>@@ -233,6 +232,9 @@ GLenum GLVariableType(const TType &type)
>                             return GL_FLOAT_MAT2x4;
>                         default:
>                             UNREACHABLE();
>+#if !UNREACHABLE_IS_NORETURN
>+                            return GL_NONE;
>+#endif
>                     }
> 
>                 case 3:
>@@ -246,6 +248,9 @@ GLenum GLVariableType(const TType &type)
>                             return GL_FLOAT_MAT3x4;
>                         default:
>                             UNREACHABLE();
>+#if !UNREACHABLE_IS_NORETURN
>+                            return GL_NONE;
>+#endif
>                     }
> 
>                 case 4:
>@@ -259,10 +264,16 @@ GLenum GLVariableType(const TType &type)
>                             return GL_FLOAT_MAT4;
>                         default:
>                             UNREACHABLE();
>+#if !UNREACHABLE_IS_NORETURN
>+                            return GL_NONE;
>+#endif
>                     }
> 
>                 default:
>                     UNREACHABLE();
>+#if !UNREACHABLE_IS_NORETURN
>+                    return GL_NONE;
>+#endif
>             }
>         }
>         else
>@@ -284,6 +295,9 @@ GLenum GLVariableType(const TType &type)
>                     return GL_INT_VEC4;
>                 default:
>                     UNREACHABLE();
>+#if !UNREACHABLE_IS_NORETURN
>+                    return GL_NONE;
>+#endif
>             }
>         }
>         else
>@@ -306,6 +320,9 @@ GLenum GLVariableType(const TType &type)
>                     return GL_UNSIGNED_INT_VEC4;
>                 default:
>                     UNREACHABLE();
>+#if !UNREACHABLE_IS_NORETURN
>+                    return GL_NONE;
>+#endif
>             }
>         }
>         else
>@@ -328,6 +345,9 @@ GLenum GLVariableType(const TType &type)
>                     return GL_BOOL_VEC4;
>                 default:
>                     UNREACHABLE();
>+#if !UNREACHABLE_IS_NORETURN
>+                    return GL_NONE;
>+#endif
>             }
>         }
>         else
>@@ -355,6 +375,8 @@ GLenum GLVariableType(const TType &type)
>             return GL_SAMPLER_2D_ARRAY;
>         case EbtSampler2DMS:
>             return GL_SAMPLER_2D_MULTISAMPLE;
>+        case EbtSampler2DMSArray:
>+            return GL_SAMPLER_2D_MULTISAMPLE_ARRAY;
>         case EbtISampler2D:
>             return GL_INT_SAMPLER_2D;
>         case EbtISampler3D:
>@@ -365,6 +387,8 @@ GLenum GLVariableType(const TType &type)
>             return GL_INT_SAMPLER_2D_ARRAY;
>         case EbtISampler2DMS:
>             return GL_INT_SAMPLER_2D_MULTISAMPLE;
>+        case EbtISampler2DMSArray:
>+            return GL_INT_SAMPLER_2D_MULTISAMPLE_ARRAY;
>         case EbtUSampler2D:
>             return GL_UNSIGNED_INT_SAMPLER_2D;
>         case EbtUSampler3D:
>@@ -375,6 +399,8 @@ GLenum GLVariableType(const TType &type)
>             return GL_UNSIGNED_INT_SAMPLER_2D_ARRAY;
>         case EbtUSampler2DMS:
>             return GL_UNSIGNED_INT_SAMPLER_2D_MULTISAMPLE;
>+        case EbtUSampler2DMSArray:
>+            return GL_UNSIGNED_INT_SAMPLER_2D_MULTISAMPLE_ARRAY;
>         case EbtSampler2DShadow:
>             return GL_SAMPLER_2D_SHADOW;
>         case EbtSamplerCubeShadow:
>@@ -453,32 +479,33 @@ GLenum GLVariablePrecision(const TType &type)
>     return GL_NONE;
> }
> 
>-TString ArrayString(const TType &type)
>+ImmutableString ArrayString(const TType &type)
> {
>-    TStringStream arrayString;
>     if (!type.isArray())
>-        return arrayString.str();
>+        return ImmutableString("");
> 
>-    const TVector<unsigned int> &arraySizes = *type.getArraySizes();
>+    const TVector<unsigned int> &arraySizes         = *type.getArraySizes();
>+    constexpr const size_t kMaxDecimalDigitsPerSize = 10u;
>+    ImmutableStringBuilder arrayString(arraySizes.size() * (kMaxDecimalDigitsPerSize + 2u));
>     for (auto arraySizeIter = arraySizes.rbegin(); arraySizeIter != arraySizes.rend();
>          ++arraySizeIter)
>     {
>         arrayString << "[";
>         if (*arraySizeIter > 0)
>         {
>-            arrayString << (*arraySizeIter);
>+            arrayString.appendDecimal(*arraySizeIter);
>         }
>         arrayString << "]";
>     }
>-    return arrayString.str();
>+    return arrayString;
> }
> 
>-TString GetTypeName(const TType &type, ShHashFunction64 hashFunction, NameMap *nameMap)
>+ImmutableString GetTypeName(const TType &type, ShHashFunction64 hashFunction, NameMap *nameMap)
> {
>     if (type.getBasicType() == EbtStruct)
>-        return HashName(TName(type.getStruct()->name()), hashFunction, nameMap);
>+        return HashName(type.getStruct(), hashFunction, nameMap);
>     else
>-        return type.getBuiltInTypeNameString();
>+        return ImmutableString(type.getBuiltInTypeNameString());
> }
> 
> bool IsVaryingOut(TQualifier qualifier)
>@@ -527,7 +554,7 @@ bool IsVarying(TQualifier qualifier)
> bool IsGeometryShaderInput(GLenum shaderType, TQualifier qualifier)
> {
>     return (qualifier == EvqGeometryIn) ||
>-           ((shaderType == GL_GEOMETRY_SHADER_OES) && IsInterpolationIn(qualifier));
>+           ((shaderType == GL_GEOMETRY_SHADER_EXT) && IsInterpolationIn(qualifier));
> }
> 
> InterpolationType GetInterpolationType(TQualifier qualifier)
>@@ -554,7 +581,9 @@ InterpolationType GetInterpolationType(TQualifier qualifier)
> 
>         default:
>             UNREACHABLE();
>+#if !UNREACHABLE_IS_NORETURN
>             return INTERPOLATION_SMOOTH;
>+#endif
>     }
> }
> 
>@@ -614,10 +643,21 @@ TType GetShaderVariableBasicType(const sh::ShaderVariable &var)
>             return TType(EbtUInt, 4);
>         default:
>             UNREACHABLE();
>+#if !UNREACHABLE_IS_NORETURN
>             return TType();
>+#endif
>     }
> }
> 
>+void DeclareGlobalVariable(TIntermBlock *root, const TVariable *variable)
>+{
>+    TIntermDeclaration *declaration = new TIntermDeclaration();
>+    declaration->appendDeclarator(new TIntermSymbol(variable));
>+
>+    TIntermSequence *globalSequence = root->getSequence();
>+    globalSequence->insert(globalSequence->begin(), declaration);
>+}
>+
> // GLSL ES 1.0.17 4.6.1 The Invariant Qualifier
> bool CanBeInvariantESSL1(TQualifier qualifier)
> {
>@@ -711,4 +751,66 @@ bool IsOutputVulkan(ShShaderOutput output)
>     return output == SH_GLSL_VULKAN_OUTPUT;
> }
> 
>+bool IsInShaderStorageBlock(TIntermTyped *node)
>+{
>+    TIntermSwizzle *swizzleNode = node->getAsSwizzleNode();
>+    if (swizzleNode)
>+    {
>+        return IsInShaderStorageBlock(swizzleNode->getOperand());
>+    }
>+
>+    TIntermBinary *binaryNode = node->getAsBinaryNode();
>+    if (binaryNode)
>+    {
>+        switch (binaryNode->getOp())
>+        {
>+            case EOpIndexDirectInterfaceBlock:
>+            case EOpIndexIndirect:
>+            case EOpIndexDirect:
>+            case EOpIndexDirectStruct:
>+                return IsInShaderStorageBlock(binaryNode->getLeft());
>+            default:
>+                return false;
>+        }
>+    }
>+
>+    const TType &type = node->getType();
>+    return type.getQualifier() == EvqBuffer;
>+}
>+
>+GLenum GetImageInternalFormatType(TLayoutImageInternalFormat iifq)
>+{
>+    switch (iifq)
>+    {
>+        case EiifRGBA32F:
>+            return GL_RGBA32F;
>+        case EiifRGBA16F:
>+            return GL_RGBA16F;
>+        case EiifR32F:
>+            return GL_R32F;
>+        case EiifRGBA32UI:
>+            return GL_RGBA32UI;
>+        case EiifRGBA16UI:
>+            return GL_RGBA16UI;
>+        case EiifRGBA8UI:
>+            return GL_RGBA8UI;
>+        case EiifR32UI:
>+            return GL_R32UI;
>+        case EiifRGBA32I:
>+            return GL_RGBA32I;
>+        case EiifRGBA16I:
>+            return GL_RGBA16I;
>+        case EiifRGBA8I:
>+            return GL_RGBA8I;
>+        case EiifR32I:
>+            return GL_R32I;
>+        case EiifRGBA8:
>+            return GL_RGBA8;
>+        case EiifRGBA8_SNORM:
>+            return GL_RGBA8_SNORM;
>+        default:
>+            return GL_NONE;
>+    }
>+}
>+
> }  // namespace sh
>diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/util.h b/Source/ThirdParty/ANGLE/src/compiler/translator/util.h
>index 6d6dc95b3b2..debac31aa35 100644
>--- a/Source/ThirdParty/ANGLE/src/compiler/translator/util.h
>+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/util.h
>@@ -9,10 +9,11 @@
> 
> #include <stack>
> 
>-#include "angle_gl.h"
> #include <GLSLANG/ShaderLang.h>
>+#include "angle_gl.h"
> 
> #include "compiler/translator/HashNames.h"
>+#include "compiler/translator/ImmutableString.h"
> #include "compiler/translator/Operator.h"
> #include "compiler/translator/Types.h"
> 
>@@ -22,7 +23,9 @@ bool atoi_clamp(const char *str, unsigned int *value);
> 
> namespace sh
> {
>+class TIntermBlock;
> class TSymbolTable;
>+class TIntermTyped;
> 
> float NumericLexFloat32OutOfRangeToInfinity(const std::string &str);
> 
>@@ -44,12 +47,14 @@ InterpolationType GetInterpolationType(TQualifier qualifier);
> 
> // Returns array brackets including size with outermost array size first, as specified in GLSL ES
> // 3.10 section 4.1.9.
>-TString ArrayString(const TType &type);
>+ImmutableString ArrayString(const TType &type);
> 
>-TString GetTypeName(const TType &type, ShHashFunction64 hashFunction, NameMap *nameMap);
>+ImmutableString GetTypeName(const TType &type, ShHashFunction64 hashFunction, NameMap *nameMap);
> 
> TType GetShaderVariableBasicType(const sh::ShaderVariable &var);
> 
>+void DeclareGlobalVariable(TIntermBlock *root, const TVariable *variable);
>+
> bool IsBuiltinOutputVariable(TQualifier qualifier);
> bool IsBuiltinFragmentInputVariable(TQualifier qualifier);
> bool CanBeInvariantESSL1(TQualifier qualifier);
>@@ -58,6 +63,10 @@ bool IsOutputESSL(ShShaderOutput output);
> bool IsOutputGLSL(ShShaderOutput output);
> bool IsOutputHLSL(ShShaderOutput output);
> bool IsOutputVulkan(ShShaderOutput output);
>+
>+bool IsInShaderStorageBlock(TIntermTyped *node);
>+
>+GLenum GetImageInternalFormatType(TLayoutImageInternalFormat iifq);
> }  // namespace sh
> 
> #endif  // COMPILER_TRANSLATOR_UTIL_H_
>diff --git a/Source/ThirdParty/ANGLE/src/feature_support_util/a4a_rules.json b/Source/ThirdParty/ANGLE/src/feature_support_util/a4a_rules.json
>new file mode 100644
>index 00000000000..f12d8e559b2
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/feature_support_util/a4a_rules.json
>@@ -0,0 +1,22 @@
>+{
>+   "Rules":[
>+      {
>+         "Rule":"Default Rule (i.e. use native driver)",
>+         "UseANGLE":false
>+      },
>+      {
>+         "Rule":"Supported application(s) (e.g. Maps on Google devices)",
>+         "UseANGLE":true,
>+         "Applications":[
>+            {
>+               "AppName":"com.chromium.angle"
>+            }
>+         ],
>+         "Devices":[
>+            {
>+               "Manufacturer":"Google"
>+            }
>+         ]
>+      }
>+   ]
>+}
>diff --git a/Source/ThirdParty/ANGLE/src/feature_support_util/feature_support_util.cpp b/Source/ThirdParty/ANGLE/src/feature_support_util/feature_support_util.cpp
>new file mode 100644
>index 00000000000..dd732436e1f
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/feature_support_util/feature_support_util.cpp
>@@ -0,0 +1,926 @@
>+//
>+// Copyright 2018 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+
>+// feature_support_util.cpp: Helps client APIs make decisions based on rules
>+// data files.  For example, the Android EGL loader uses this library to
>+// determine whether to use ANGLE or a native GLES driver.
>+
>+#include "feature_support_util.h"
>+#include <json/json.h>
>+#include <string.h>
>+#include "common/platform.h"
>+#if defined(ANGLE_PLATFORM_ANDROID)
>+#    include <android/log.h>
>+#    include <unistd.h>
>+#endif
>+#include <fstream>
>+#include <list>
>+#include "../gpu_info_util/SystemInfo.h"
>+
>+namespace angle
>+{
>+
>+#if defined(ANGLE_PLATFORM_ANDROID)
>+// Define ANGLE_FEATURE_UTIL_LOG_VERBOSE if you want VERBOSE to output
>+// ANGLE_FEATURE_UTIL_LOG_VERBOSE is automatically defined when is_debug = true
>+
>+#    define ERR(...) __android_log_print(ANDROID_LOG_ERROR, "ANGLE", __VA_ARGS__)
>+#    define WARN(...) __android_log_print(ANDROID_LOG_WARN, "ANGLE", __VA_ARGS__)
>+#    define INFO(...) __android_log_print(ANDROID_LOG_INFO, "ANGLE", __VA_ARGS__)
>+#    define DEBUG(...) __android_log_print(ANDROID_LOG_DEBUG, "ANGLE", __VA_ARGS__)
>+#    ifdef ANGLE_FEATURE_UTIL_LOG_VERBOSE
>+#        define VERBOSE(...) __android_log_print(ANDROID_LOG_VERBOSE, "ANGLE", __VA_ARGS__)
>+#    else
>+#        define VERBOSE(...) ((void)0)
>+#    endif
>+#else  // defined(ANDROID)
>+#    define ERR(...) printf(__VA_ARGS__)
>+#    define WARN(...) printf(__VA_ARGS__)
>+#    define INFO(...) printf(__VA_ARGS__)
>+#    define DEBUG(...) printf(__VA_ARGS__)
>+#    define VERBOSE(...) printf(__VA_ARGS__)
>+#endif  // defined(ANDROID)
>+
>+// JSON values are generally composed of either:
>+//  - Objects, which are a set of comma-separated string:value pairs (note the recursive nature)
>+//  - Arrays, which are a set of comma-separated values.
>+// We'll call the string in a string:value pair the "identifier".  These identifiers are defined
>+// below, as follows:
>+
>+// The JSON identifier for the top-level set of rules.  This is an object, the value of which is an
>+// array of rules.  The rules will be processed in order.  If a rule matches, the rule's version of
>+// the answer (true or false) becomes the new answer.  After all rules are processed, the
>+// most-recent answer is the final answer.
>+constexpr char kJsonRules[] = "Rules";
>+// The JSON identifier for a given rule.  A rule is an object, the first string:value pair is this
>+// identifier (i.e. "Rule") as the string and the value is a user-firendly description of the rule:
>+constexpr char kJsonRule[] = "Rule";
>+// Within a rule, the JSON identifier for the answer--whether or not to use ANGLE.  The value is a
>+// boolean (i.e. true or false).
>+constexpr char kJsonUseANGLE[] = "UseANGLE";
>+
>+// Within a rule, the JSON identifier for describing one or more applications.  The value is an
>+// array of objects, each object of which can specify attributes of an application.
>+constexpr char kJsonApplications[] = "Applications";
>+// Within an object that describes the attributes of an application, the JSON identifier for the
>+// name of the application (e.g. "com.google.maps").  The value is a string.  If any other
>+// attributes will be specified, this must be the first attribute specified in the object.
>+constexpr char kJsonAppName[] = "AppName";
>+
>+// Within a rule, the JSON identifier for describing one or more devices.  The value is an
>+// array of objects, each object of which can specify attributes of a device.
>+constexpr char kJsonDevices[] = "Devices";
>+// Within an object that describes the attributes of a device, the JSON identifier for the
>+// manufacturer of the device.  The value is a string.  If any other non-GPU attributes will be
>+// specified, this must be the first attribute specified in the object.
>+constexpr char kJsonManufacturer[] = "Manufacturer";
>+// Within an object that describes the attributes of a device, the JSON identifier for the
>+// model of the device.  The value is a string.
>+constexpr char kJsonModel[] = "Model";
>+
>+// Within an object that describes the attributes of a device, the JSON identifier for describing
>+// one or more GPUs/drivers used in the device.  The value is an
>+// array of objects, each object of which can specify attributes of a GPU and its driver.
>+constexpr char kJsonGPUs[] = "GPUs";
>+// Within an object that describes the attributes of a GPU and driver, the JSON identifier for the
>+// vendor of the device/driver.  The value is a string.  If any other attributes will be specified,
>+// this must be the first attribute specified in the object.
>+constexpr char kJsonVendor[] = "Vendor";
>+// Within an object that describes the attributes of a GPU and driver, the JSON identifier for the
>+// deviceId of the device.  The value is an unsigned integer.  If the driver version will be
>+// specified, this must preceded the version attributes specified in the object.
>+constexpr char kJsonDeviceId[] = "DeviceId";
>+
>+// Within an object that describes the attributes of either an application or a GPU, the JSON
>+// identifier for the major version of that application or GPU driver.  The value is a positive
>+// integer number.  Not specifying a major version implies a wildcard for all values of a version.
>+constexpr char kJsonVerMajor[] = "VerMajor";
>+// Within an object that describes the attributes of either an application or a GPU, the JSON
>+// identifier for the minor version of that application or GPU driver.  The value is a positive
>+// integer number.  In order to specify a minor version, it must be specified immediately after the
>+// major number associated with it.  Not specifying a minor version implies a wildcard for the
>+// minor, subminor, and patch values of a version.
>+constexpr char kJsonVerMinor[] = "VerMinor";
>+// Within an object that describes the attributes of either an application or a GPU, the JSON
>+// identifier for the subminor version of that application or GPU driver.  The value is a positive
>+// integer number.  In order to specify a subminor version, it must be specified immediately after
>+// the minor number associated with it.  Not specifying a subminor version implies a wildcard for
>+// the subminor and patch values of a version.
>+constexpr char kJsonVerSubMinor[] = "VerSubMinor";
>+// Within an object that describes the attributes of either an application or a GPU, the JSON
>+// identifier for the patch version of that application or GPU driver.  The value is a positive
>+// integer number.  In order to specify a patch version, it must be specified immediately after the
>+// subminor number associated with it.  Not specifying a patch version implies a wildcard for the
>+// patch value of a version.
>+constexpr char kJsonVerPatch[] = "VerPatch";
>+
>+// This encapsulates a std::string.  The default constructor (not given a string) assumes that this
>+// is a wildcard (i.e. will match all other StringPart objects).
>+class StringPart
>+{
>+  public:
>+    StringPart() : mPart(""), mWildcard(true) {}
>+    StringPart(const std::string part) : mPart(part), mWildcard(false) {}
>+    ~StringPart() {}
>+    bool match(const StringPart &toCheck) const
>+    {
>+        return (mWildcard || toCheck.mWildcard || (toCheck.mPart == mPart));
>+    }
>+
>+  public:
>+    std::string mPart;
>+    bool mWildcard;
>+};
>+
>+// This encapsulates a 32-bit unsigned integer.  The default constructor (not given a number)
>+// assumes that this is a wildcard (i.e. will match all other IntegerPart objects).
>+class IntegerPart
>+{
>+  public:
>+    IntegerPart() : mPart(0), mWildcard(true) {}
>+    IntegerPart(uint32_t part) : mPart(part), mWildcard(false) {}
>+    ~IntegerPart() {}
>+    bool match(const IntegerPart &toCheck) const
>+    {
>+        return (mWildcard || toCheck.mWildcard || (toCheck.mPart == mPart));
>+    }
>+
>+  public:
>+    uint32_t mPart;
>+    bool mWildcard;
>+};
>+
>+// This encapsulates a list of other classes, each of which will have a match() and logItem()
>+// method.  The common constructor (given a type, but not any list items) assumes that this is
>+// a wildcard (i.e. will match all other ListOf<t> objects).
>+template <class T>
>+class ListOf
>+{
>+  public:
>+    ListOf(const std::string listType) : mWildcard(true), mListType(listType) {}
>+    ~ListOf() { mList.clear(); }
>+    void addItem(const T &toAdd)
>+    {
>+        mList.push_back(toAdd);
>+        mWildcard = false;
>+    }
>+    bool match(const T &toCheck) const
>+    {
>+        VERBOSE("\t\t Within ListOf<%s> match: wildcards are %s and %s,\n", mListType.c_str(),
>+                mWildcard ? "true" : "false", toCheck.mWildcard ? "true" : "false");
>+        if (mWildcard || toCheck.mWildcard)
>+        {
>+            return true;
>+        }
>+        for (const T &it : mList)
>+        {
>+            VERBOSE("\t\t   Within ListOf<%s> match: calling match on sub-item is %s,\n",
>+                    mListType.c_str(), it.match(toCheck) ? "true" : "false");
>+            if (it.match(toCheck))
>+            {
>+                return true;
>+            }
>+        }
>+        return false;
>+    }
>+    bool match(const ListOf<T> &toCheck) const
>+    {
>+        VERBOSE("\t\t Within ListOf<%s> match: wildcards are %s and %s,\n", mListType.c_str(),
>+                mWildcard ? "true" : "false", toCheck.mWildcard ? "true" : "false");
>+        if (mWildcard || toCheck.mWildcard)
>+        {
>+            return true;
>+        }
>+        // If we make it to here, both this and toCheck have at least one item in their mList
>+        for (const T &it : toCheck.mList)
>+        {
>+            if (match(it))
>+            {
>+                return true;
>+            }
>+        }
>+        return false;
>+    }
>+    void logListOf(const std::string prefix, const std::string name) const
>+    {
>+        if (mWildcard)
>+        {
>+            VERBOSE("%sListOf%s is wildcarded to always match", prefix.c_str(), name.c_str());
>+        }
>+        else
>+        {
>+            VERBOSE("%sListOf%s has %d item(s):", prefix.c_str(), name.c_str(),
>+                    static_cast<int>(mList.size()));
>+            for (auto &it : mList)
>+            {
>+                it.logItem();
>+            }
>+        }
>+    }
>+
>+    bool mWildcard;
>+
>+  private:
>+    std::string mListType;
>+    std::vector<T> mList;
>+};
>+
>+// This encapsulates up-to four 32-bit unsigned integers, that represent a potentially-complex
>+// version number.  The default constructor (not given any numbers) assumes that this is a wildcard
>+// (i.e. will match all other Version objects).  Each part of a Version is stored in an IntegerPart
>+// class, and so may be wildcarded as well.
>+class Version
>+{
>+  public:
>+    Version(uint32_t major, uint32_t minor, uint32_t subminor, uint32_t patch)
>+        : mMajor(major), mMinor(minor), mSubminor(subminor), mPatch(patch), mWildcard(false)
>+    {}
>+    Version(uint32_t major, uint32_t minor, uint32_t subminor)
>+        : mMajor(major), mMinor(minor), mSubminor(subminor), mWildcard(false)
>+    {}
>+    Version(uint32_t major, uint32_t minor) : mMajor(major), mMinor(minor), mWildcard(false) {}
>+    Version(uint32_t major) : mMajor(major), mWildcard(false) {}
>+    Version() : mWildcard(true) {}
>+    Version(const Version &toCopy)
>+        : mMajor(toCopy.mMajor),
>+          mMinor(toCopy.mMinor),
>+          mSubminor(toCopy.mSubminor),
>+          mPatch(toCopy.mPatch),
>+          mWildcard(toCopy.mWildcard)
>+    {}
>+    ~Version() {}
>+
>+    static Version *CreateVersionFromJson(const Json::Value &jObject)
>+    {
>+        Version *version = nullptr;
>+        // A major version must be provided before a minor, and so on:
>+        if (jObject.isMember(kJsonVerMajor) && jObject[kJsonVerMajor].isInt())
>+        {
>+            int major = jObject[kJsonVerMajor].asInt();
>+            if (jObject.isMember(kJsonVerMinor) && jObject[kJsonVerMinor].isInt())
>+            {
>+                int minor = jObject[kJsonVerMinor].asInt();
>+                if (jObject.isMember(kJsonVerSubMinor) && jObject[kJsonVerSubMinor].isInt())
>+                {
>+                    int subMinor = jObject[kJsonVerSubMinor].asInt();
>+                    if (jObject.isMember(kJsonVerPatch) && jObject[kJsonVerPatch].isInt())
>+                    {
>+                        int patch = jObject[kJsonVerPatch].asInt();
>+                        version   = new Version(major, minor, subMinor, patch);
>+                    }
>+                    else
>+                    {
>+                        version = new Version(major, minor, subMinor);
>+                    }
>+                }
>+                else
>+                {
>+                    version = new Version(major, minor);
>+                }
>+            }
>+            else
>+            {
>+                version = new Version(major);
>+            }
>+        }
>+        return version;
>+    }
>+
>+    bool match(const Version &toCheck) const
>+    {
>+        VERBOSE("\t\t\t Within Version %d,%d,%d,%d match(%d,%d,%d,%d): wildcards are %s and %s,\n",
>+                mMajor.mPart, mMinor.mPart, mSubminor.mPart, mPatch.mPart, toCheck.mMajor.mPart,
>+                toCheck.mMinor.mPart, toCheck.mSubminor.mPart, toCheck.mPatch.mPart,
>+                mWildcard ? "true" : "false", toCheck.mWildcard ? "true" : "false");
>+        if (!(mWildcard || toCheck.mWildcard))
>+        {
>+            VERBOSE("\t\t\t   mMajor match is %s, mMinor is %s, mSubminor is %s, mPatch is %s\n",
>+                    mMajor.match(toCheck.mMajor) ? "true" : "false",
>+                    mMinor.match(toCheck.mMinor) ? "true" : "false",
>+                    mSubminor.match(toCheck.mSubminor) ? "true" : "false",
>+                    mPatch.match(toCheck.mPatch) ? "true" : "false");
>+        }
>+        return (mWildcard || toCheck.mWildcard ||
>+                (mMajor.match(toCheck.mMajor) && mMinor.match(toCheck.mMinor) &&
>+                 mSubminor.match(toCheck.mSubminor) && mPatch.match(toCheck.mPatch)));
>+    }
>+    std::string getString() const
>+    {
>+        if (mWildcard)
>+        {
>+            return "*";
>+        }
>+        else
>+        {
>+            char ret[100];
>+            // Must at least have a major version:
>+            if (!mMinor.mWildcard)
>+            {
>+                if (!mSubminor.mWildcard)
>+                {
>+                    if (!mPatch.mWildcard)
>+                    {
>+                        snprintf(ret, 100, "%d.%d.%d.%d", mMajor.mPart, mMinor.mPart,
>+                                 mSubminor.mPart, mPatch.mPart);
>+                    }
>+                    else
>+                    {
>+                        snprintf(ret, 100, "%d.%d.%d.*", mMajor.mPart, mMinor.mPart,
>+                                 mSubminor.mPart);
>+                    }
>+                }
>+                else
>+                {
>+                    snprintf(ret, 100, "%d.%d.*", mMajor.mPart, mMinor.mPart);
>+                }
>+            }
>+            else
>+            {
>+                snprintf(ret, 100, "%d.*", mMajor.mPart);
>+            }
>+            std::string retString = ret;
>+            return retString;
>+        }
>+    }
>+
>+  public:
>+    IntegerPart mMajor;
>+    IntegerPart mMinor;
>+    IntegerPart mSubminor;
>+    IntegerPart mPatch;
>+    bool mWildcard;
>+};
>+
>+// This encapsulates an application, and potentially the application's Version.  The default
>+// constructor (not given any values) assumes that this is a wildcard (i.e. will match all
>+// other Application objects).  Each part of an Application is stored in a class that may
>+// also be wildcarded.
>+class Application
>+{
>+  public:
>+    Application(const std::string name, const Version &version)
>+        : mName(name), mVersion(version), mWildcard(false)
>+    {}
>+    Application(const std::string name) : mName(name), mVersion(), mWildcard(false) {}
>+    Application() : mName(), mVersion(), mWildcard(true) {}
>+    ~Application() {}
>+
>+    static Application *CreateApplicationFromJson(const Json::Value &jObject)
>+    {
>+        Application *application = nullptr;
>+
>+        // If an application is listed, the application's name is required:
>+        std::string appName = jObject[kJsonAppName].asString();
>+
>+        // The application's version is optional:
>+        Version *version = Version::CreateVersionFromJson(jObject);
>+        if (version)
>+        {
>+            application = new Application(appName, *version);
>+            delete version;
>+        }
>+        else
>+        {
>+            application = new Application(appName);
>+        }
>+        return application;
>+    }
>+
>+    bool match(const Application &toCheck) const
>+    {
>+        return (mWildcard || toCheck.mWildcard ||
>+                (toCheck.mName.match(mName) && toCheck.mVersion.match(mVersion)));
>+    }
>+    void logItem() const
>+    {
>+        if (mWildcard)
>+        {
>+            VERBOSE("      Wildcard (i.e. will match all applications)");
>+        }
>+        else if (!mVersion.mWildcard)
>+        {
>+            VERBOSE("      Application \"%s\" (version: %s)", mName.mPart.c_str(),
>+                    mVersion.getString().c_str());
>+        }
>+        else
>+        {
>+            VERBOSE("      Application \"%s\"", mName.mPart.c_str());
>+        }
>+    }
>+
>+  public:
>+    StringPart mName;
>+    Version mVersion;
>+    bool mWildcard;
>+};
>+
>+// This encapsulates a GPU and its driver.  The default constructor (not given any values) assumes
>+// that this is a wildcard (i.e. will match all other GPU objects).  Each part of a GPU is stored
>+// in a class that may also be wildcarded.
>+class GPU
>+{
>+  public:
>+    GPU(const std::string vendor, uint32_t deviceId, const Version &version)
>+        : mVendor(vendor), mDeviceId(IntegerPart(deviceId)), mVersion(version), mWildcard(false)
>+    {}
>+    GPU(const std::string vendor, uint32_t deviceId)
>+        : mVendor(vendor), mDeviceId(IntegerPart(deviceId)), mVersion(), mWildcard(false)
>+    {}
>+    GPU(const std::string vendor) : mVendor(vendor), mDeviceId(), mVersion(), mWildcard(false) {}
>+    GPU() : mVendor(), mDeviceId(), mVersion(), mWildcard(true) {}
>+    bool match(const GPU &toCheck) const
>+    {
>+        VERBOSE("\t\t Within GPU match: wildcards are %s and %s,\n", mWildcard ? "true" : "false",
>+                toCheck.mWildcard ? "true" : "false");
>+        VERBOSE("\t\t   mVendor = \"%s\" and toCheck.mVendor = \"%s\"\n", mVendor.mPart.c_str(),
>+                toCheck.mVendor.mPart.c_str());
>+        VERBOSE("\t\t   mDeviceId = %d and toCheck.mDeviceId = %d\n", mDeviceId.mPart,
>+                toCheck.mDeviceId.mPart);
>+        VERBOSE("\t\t   mVendor match is %s, mDeviceId is %s, mVersion is %s\n",
>+                toCheck.mVendor.match(mVendor) ? "true" : "false",
>+                toCheck.mDeviceId.match(mDeviceId) ? "true" : "false",
>+                toCheck.mVersion.match(mVersion) ? "true" : "false");
>+        return (mWildcard || toCheck.mWildcard ||
>+                (toCheck.mVendor.match(mVendor) && toCheck.mDeviceId.match(mDeviceId) &&
>+                 toCheck.mVersion.match(mVersion)));
>+    }
>+    ~GPU() {}
>+
>+    static GPU *CreateGpuFromJson(const Json::Value &jObject)
>+    {
>+        GPU *gpu = nullptr;
>+
>+        // If a GPU is listed, the vendor name is required:
>+        if (jObject.isMember(kJsonVendor) && jObject[kJsonVendor].isString())
>+        {
>+            std::string vendor = jObject[kJsonVendor].asString();
>+            // If a version is given, the deviceId is required:
>+            if (jObject.isMember(kJsonDeviceId) && jObject[kJsonDeviceId].isUInt())
>+            {
>+                uint32_t deviceId = jObject[kJsonDeviceId].asUInt();
>+                Version *version  = Version::CreateVersionFromJson(jObject);
>+                if (version)
>+                {
>+                    gpu = new GPU(vendor, deviceId, *version);
>+                    delete version;
>+                }
>+                else
>+                {
>+                    gpu = new GPU(vendor, deviceId);
>+                }
>+            }
>+            else
>+            {
>+                gpu = new GPU(vendor);
>+            }
>+        }
>+        else
>+        {
>+            WARN("Asked to parse a GPU, but no vendor found");
>+        }
>+
>+        return gpu;
>+    }
>+
>+    void logItem() const
>+    {
>+        if (mWildcard)
>+        {
>+            VERBOSE("          Wildcard (i.e. will match all GPUs)");
>+        }
>+        else
>+        {
>+            if (!mDeviceId.mWildcard)
>+            {
>+                if (!mVersion.mWildcard)
>+                {
>+                    VERBOSE("\t     GPU vendor: %s, deviceId: 0x%x, version: %s",
>+                            mVendor.mPart.c_str(), mDeviceId.mPart, mVersion.getString().c_str());
>+                }
>+                else
>+                {
>+                    VERBOSE("\t     GPU vendor: %s, deviceId: 0x%x", mVendor.mPart.c_str(),
>+                            mDeviceId.mPart);
>+                }
>+            }
>+            else
>+            {
>+                VERBOSE("\t     GPU vendor: %s", mVendor.mPart.c_str());
>+            }
>+        }
>+    }
>+
>+  public:
>+    StringPart mVendor;
>+    IntegerPart mDeviceId;
>+    Version mVersion;
>+    bool mWildcard;
>+};
>+
>+// This encapsulates a device, and potentially the device's model and/or a list of GPUs/drivers
>+// associated with the Device.  The default constructor (not given any values) assumes that this is
>+// a wildcard (i.e. will match all other Device objects).  Each part of a Device is stored in a
>+// class that may also be wildcarded.
>+class Device
>+{
>+  public:
>+    Device(const std::string manufacturer, const std::string model)
>+        : mManufacturer(manufacturer), mModel(model), mGpuList("GPU"), mWildcard(false)
>+    {}
>+    Device(const std::string manufacturer)
>+        : mManufacturer(manufacturer), mModel(), mGpuList("GPU"), mWildcard(false)
>+    {}
>+    Device() : mManufacturer(), mModel(), mGpuList("GPU"), mWildcard(true) {}
>+    ~Device() {}
>+
>+    static Device *CreateDeviceFromJson(const Json::Value &jObject)
>+    {
>+        Device *device = nullptr;
>+        if (jObject.isMember(kJsonManufacturer) && jObject[kJsonManufacturer].isString())
>+        {
>+            std::string manufacturerName = jObject[kJsonManufacturer].asString();
>+            // We don't let a model be specified without also specifying an Manufacturer:
>+            if (jObject.isMember(kJsonModel) && jObject[kJsonModel].isString())
>+            {
>+                std::string model = jObject[kJsonModel].asString();
>+                device            = new Device(manufacturerName, model);
>+            }
>+            else
>+            {
>+                device = new Device(manufacturerName);
>+            }
>+        }
>+        else
>+        {
>+            // This case is not treated as an error because a rule may wish to only call out one or
>+            // more GPUs, but not any specific Manufacturer (e.g. for any manufacturer's device
>+            // that uses a GPU from Vendor-A, with DeviceID-Foo, and with driver version 1.2.3.4):
>+            device = new Device();
>+        }
>+        return device;
>+    }
>+
>+    void addGPU(const GPU &gpu) { mGpuList.addItem(gpu); }
>+    bool match(const Device &toCheck) const
>+    {
>+        VERBOSE("\t Within Device match: wildcards are %s and %s,\n", mWildcard ? "true" : "false",
>+                toCheck.mWildcard ? "true" : "false");
>+        if (!(mWildcard || toCheck.mWildcard))
>+        {
>+            VERBOSE("\t   Manufacturer match is %s, model is %s\n",
>+                    toCheck.mManufacturer.match(mManufacturer) ? "true" : "false",
>+                    toCheck.mModel.match(mModel) ? "true" : "false");
>+        }
>+        VERBOSE("\t   Need to check ListOf<GPU>\n");
>+        return ((mWildcard || toCheck.mWildcard ||
>+                 // The wildcards can override the Manufacturer/Model check, but not the GPU check
>+                 (toCheck.mManufacturer.match(mManufacturer) && toCheck.mModel.match(mModel))) &&
>+                mGpuList.match(toCheck.mGpuList));
>+    }
>+    void logItem() const
>+    {
>+        if (mWildcard)
>+        {
>+            if (mGpuList.mWildcard)
>+            {
>+                VERBOSE("      Wildcard (i.e. will match all devices)");
>+                return;
>+            }
>+            else
>+            {
>+                VERBOSE(
>+                    "      Device with any manufacturer and model"
>+                    ", and with the following GPUs:");
>+            }
>+        }
>+        else
>+        {
>+            if (!mModel.mWildcard)
>+            {
>+                VERBOSE(
>+                    "      Device manufacturer: \"%s\" and model \"%s\""
>+                    ", and with the following GPUs:",
>+                    mManufacturer.mPart.c_str(), mModel.mPart.c_str());
>+            }
>+            else
>+            {
>+                VERBOSE(
>+                    "      Device manufacturer: \"%s\""
>+                    ", and with the following GPUs:",
>+                    mManufacturer.mPart.c_str());
>+            }
>+        }
>+        mGpuList.logListOf("        ", "GPUs");
>+    }
>+
>+  public:
>+    StringPart mManufacturer;
>+    StringPart mModel;
>+    ListOf<GPU> mGpuList;
>+    bool mWildcard;
>+};
>+
>+// This encapsulates a particular scenario to check against the rules.  A Scenario is similar to a
>+// Rule, except that a Rule has an answer and potentially many wildcards, and a Scenario is the
>+// fully-specified combination of an Application and a Device that is proposed to be run with
>+// ANGLE.  It is compared with the list of Rules.
>+class Scenario
>+{
>+  public:
>+    Scenario(const char *appName, const char *deviceMfr, const char *deviceModel)
>+        : mApplication(Application(appName)), mDevice(Device(deviceMfr, deviceModel))
>+    {}
>+    ~Scenario() {}
>+    void logScenario()
>+    {
>+        VERBOSE("  Scenario to compare against the rules");
>+        VERBOSE("    Application:");
>+        mApplication.logItem();
>+        VERBOSE("    Device:");
>+        mDevice.logItem();
>+    }
>+
>+  public:
>+    Application mApplication;
>+    Device mDevice;
>+};
>+
>+// This encapsulates a Rule that provides an answer based on whether a particular Scenario matches
>+// the Rule.  A Rule always has an answer, but can potentially wildcard every item in it (i.e.
>+// match every scenario).
>+class Rule
>+{
>+  public:
>+    Rule(const std::string description, bool useANGLE)
>+        : mDescription(description),
>+          mAppList("Application"),
>+          mDevList("Device"),
>+          mUseANGLE(useANGLE)
>+    {}
>+    ~Rule() {}
>+    void addApp(const Application &app) { mAppList.addItem(app); }
>+    void addDevice(const Device &dev) { mDevList.addItem(dev); }
>+    bool match(const Scenario &toCheck) const
>+    {
>+        VERBOSE("    Within \"%s\" Rule: application match is %s and device match is %s\n",
>+                mDescription.c_str(), mAppList.match(toCheck.mApplication) ? "true" : "false",
>+                mDevList.match(toCheck.mDevice) ? "true" : "false");
>+        return (mAppList.match(toCheck.mApplication) && mDevList.match(toCheck.mDevice));
>+    }
>+    bool getUseANGLE() const { return mUseANGLE; }
>+    void logRule() const
>+    {
>+        VERBOSE("  Rule: \"%s\" %s ANGLE", mDescription.c_str(),
>+                mUseANGLE ? "enables" : "disables");
>+        mAppList.logListOf("    ", "Applications");
>+        mDevList.logListOf("    ", "Devices");
>+    }
>+
>+    std::string mDescription;
>+    ListOf<Application> mAppList;
>+    ListOf<Device> mDevList;
>+    bool mUseANGLE;
>+};
>+
>+// This encapsulates a list of Rules that Scenarios are matched against.  A Scenario is compared
>+// with each Rule, in order.  Any time a Scenario matches a Rule, the current answer is overridden
>+// with the answer of the matched Rule.
>+class RuleList
>+{
>+  public:
>+    RuleList() {}
>+    ~RuleList() { mRuleList.clear(); }
>+
>+    static RuleList *ReadRulesFromJsonString(const std::string jsonFileContents)
>+    {
>+        RuleList *rules = new RuleList;
>+
>+        // Open the file and start parsing it:
>+        Json::Reader jReader;
>+        Json::Value jTopLevelObject;
>+        jReader.parse(jsonFileContents, jTopLevelObject);
>+        Json::Value jRules = jTopLevelObject[kJsonRules];
>+        for (unsigned int ruleIndex = 0; ruleIndex < jRules.size(); ruleIndex++)
>+        {
>+            Json::Value jRule           = jRules[ruleIndex];
>+            std::string ruleDescription = jRule[kJsonRule].asString();
>+            bool useANGLE               = jRule[kJsonUseANGLE].asBool();
>+            Rule *newRule               = new Rule(ruleDescription, useANGLE);
>+
>+            Json::Value jApps = jRule[kJsonApplications];
>+            for (unsigned int appIndex = 0; appIndex < jApps.size(); appIndex++)
>+            {
>+                Json::Value jApp    = jApps[appIndex];
>+                Application *newApp = Application::CreateApplicationFromJson(jApp);
>+                newRule->addApp(*newApp);
>+                delete newApp;
>+            }
>+
>+            Json::Value jDevs = jRule[kJsonDevices];
>+            for (unsigned int deviceIndex = 0; deviceIndex < jDevs.size(); deviceIndex++)
>+            {
>+                Json::Value jDev = jDevs[deviceIndex];
>+                Device *newDev   = Device::CreateDeviceFromJson(jDev);
>+
>+                Json::Value jGPUs = jDev[kJsonGPUs];
>+                for (unsigned int gpuIndex = 0; gpuIndex < jGPUs.size(); gpuIndex++)
>+                {
>+                    Json::Value jGPU = jGPUs[gpuIndex];
>+                    GPU *newGPU      = GPU::CreateGpuFromJson(jGPU);
>+                    if (newGPU)
>+                    {
>+                        newDev->addGPU(*newGPU);
>+                        delete newGPU;
>+                    }
>+                }
>+                newRule->addDevice(*newDev);
>+                delete newDev;
>+            }
>+
>+            rules->addRule(*newRule);
>+            delete newRule;
>+        }
>+
>+        // Make sure there is at least one, default rule.  If not, add it here:
>+        int nRules = rules->mRuleList.size();
>+        if (nRules == 0)
>+        {
>+            Rule defaultRule("Default Rule", false);
>+            rules->addRule(defaultRule);
>+        }
>+        return rules;
>+    }
>+
>+    void addRule(const Rule &rule) { mRuleList.push_back(rule); }
>+    bool getUseANGLE(const Scenario &toCheck)
>+    {
>+        // Initialize useANGLE to the system-wide default (that should be set in the default
>+        // rule, but just in case, set it here too):
>+        bool useANGLE = false;
>+        VERBOSE("Checking scenario against %d ANGLE-for-Android rules:",
>+                static_cast<int>(mRuleList.size()));
>+
>+        for (const Rule &rule : mRuleList)
>+        {
>+            VERBOSE("  Checking Rule: \"%s\" (to see whether there's a match)",
>+                    rule.mDescription.c_str());
>+            if (rule.match(toCheck))
>+            {
>+                VERBOSE("  -> Rule matches.  Setting useANGLE to %s",
>+                        rule.getUseANGLE() ? "true" : "false");
>+                useANGLE = rule.getUseANGLE();
>+            }
>+            else
>+            {
>+                VERBOSE("  -> Rule doesn't match.");
>+            }
>+        }
>+
>+        return useANGLE;
>+    }
>+    void logRules()
>+    {
>+        VERBOSE("Showing %d ANGLE-for-Android rules:", static_cast<int>(mRuleList.size()));
>+        for (const Rule &rule : mRuleList)
>+        {
>+            rule.logRule();
>+        }
>+    }
>+
>+  public:
>+    std::vector<Rule> mRuleList;
>+};
>+
>+}  // namespace angle
>+
>+extern "C" {
>+
>+using namespace angle;
>+
>+// This function is part of the version-2 API:
>+ANGLE_EXPORT bool ANGLEGetFeatureSupportUtilAPIVersion(unsigned int *versionToUse)
>+{
>+    if (!versionToUse || (*versionToUse < kFeatureVersion_LowestSupported))
>+    {
>+        // The versionToUse is either nullptr or is less than the lowest version supported, which
>+        // is an error.
>+        return false;
>+    }
>+    if (*versionToUse > kFeatureVersion_HighestSupported)
>+    {
>+        // The versionToUse is greater than the highest version supported; change it to the
>+        // highest version supported (caller will decide if it can use that version).
>+        *versionToUse = kFeatureVersion_HighestSupported;
>+    }
>+    return true;
>+}
>+
>+// This function is part of the version-2 API:
>+ANGLE_EXPORT bool ANGLEAndroidParseRulesString(const char *rulesString,
>+                                               RulesHandle *rulesHandle,
>+                                               int *rulesVersion)
>+{
>+    if (!rulesString || !rulesHandle || !rulesVersion)
>+    {
>+        return false;
>+    }
>+
>+    std::string rulesFileContents = rulesString;
>+    RuleList *rules               = RuleList::ReadRulesFromJsonString(rulesFileContents);
>+    rules->logRules();
>+
>+    *rulesHandle  = rules;
>+    *rulesVersion = 0;
>+    return true;
>+}
>+
>+// This function is part of the version-2 API:
>+ANGLE_EXPORT bool ANGLEGetSystemInfo(SystemInfoHandle *systemInfoHandle)
>+{
>+    if (!systemInfoHandle)
>+    {
>+        return false;
>+    }
>+
>+    // TODO (http://anglebug.com/3036): Restore the real code
>+    angle::SystemInfo *systemInfo = new angle::SystemInfo;
>+    systemInfo->gpus.resize(1);
>+    GPUDeviceInfo &gpu = systemInfo->gpus[0];
>+    gpu.vendorId       = 0xFEFEFEFE;
>+    gpu.deviceId       = 0xFEEEFEEE;
>+    gpu.driverVendor   = "Foo";
>+    gpu.driverVersion  = "1.2.3.4";
>+
>+    *systemInfoHandle = systemInfo;
>+    return true;
>+}
>+
>+// This function is part of the version-2 API:
>+ANGLE_EXPORT bool ANGLEAddDeviceInfoToSystemInfo(const char *deviceMfr,
>+                                                 const char *deviceModel,
>+                                                 SystemInfoHandle systemInfoHandle)
>+{
>+    angle::SystemInfo *systemInfo = static_cast<angle::SystemInfo *>(systemInfoHandle);
>+    if (!deviceMfr || !deviceModel || !systemInfo)
>+    {
>+        return false;
>+    }
>+
>+    systemInfo->machineManufacturer = deviceMfr;
>+    systemInfo->machineModelName    = deviceModel;
>+    return true;
>+}
>+
>+// This function is part of the version-2 API:
>+ANGLE_EXPORT bool ANGLEShouldBeUsedForApplication(const RulesHandle rulesHandle,
>+                                                  int rulesVersion,
>+                                                  const SystemInfoHandle systemInfoHandle,
>+                                                  const char *appName)
>+{
>+    RuleList *rules               = static_cast<RuleList *>(rulesHandle);
>+    angle::SystemInfo *systemInfo = static_cast<angle::SystemInfo *>(systemInfoHandle);
>+    if (!rules || !systemInfo || !appName || (systemInfo->gpus.size() != 1))
>+    {
>+        return false;
>+    }
>+
>+    Scenario scenario(appName, systemInfo->machineManufacturer.c_str(),
>+                      systemInfo->machineModelName.c_str());
>+    Version gpuDriverVersion(systemInfo->gpus[0].detailedDriverVersion.major,
>+                             systemInfo->gpus[0].detailedDriverVersion.minor,
>+                             systemInfo->gpus[0].detailedDriverVersion.subMinor,
>+                             systemInfo->gpus[0].detailedDriverVersion.patch);
>+    GPU gpuDriver(systemInfo->gpus[0].driverVendor, systemInfo->gpus[0].deviceId, gpuDriverVersion);
>+    scenario.mDevice.addGPU(gpuDriver);
>+    scenario.logScenario();
>+
>+    bool rtn = rules->getUseANGLE(scenario);
>+    VERBOSE("Application \"%s\" should %s ANGLE", appName, rtn ? "use" : "NOT use");
>+
>+    return rtn;
>+}
>+
>+// This function is part of the version-2 API:
>+ANGLE_EXPORT void ANGLEFreeRulesHandle(const RulesHandle rulesHandle)
>+{
>+    RuleList *rules = static_cast<RuleList *>(rulesHandle);
>+    if (rules)
>+    {
>+        delete rules;
>+    }
>+}
>+
>+// This function is part of the version-2 API:
>+ANGLE_EXPORT void ANGLEFreeSystemInfoHandle(const SystemInfoHandle systemInfoHandle)
>+{
>+    angle::SystemInfo *systemInfo = static_cast<angle::SystemInfo *>(systemInfoHandle);
>+    if (systemInfo)
>+    {
>+        delete systemInfo;
>+    }
>+}
>+
>+}  // extern "C"
>diff --git a/Source/ThirdParty/ANGLE/src/feature_support_util/feature_support_util.h b/Source/ThirdParty/ANGLE/src/feature_support_util/feature_support_util.h
>new file mode 100644
>index 00000000000..54f5ec722a0
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/feature_support_util/feature_support_util.h
>@@ -0,0 +1,132 @@
>+//
>+// Copyright 2018 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+
>+// feature_support_util.h: Internal-to-ANGLE header file for feature-support utilities.
>+
>+#ifndef FEATURE_SUPPORT_UTIL_H_
>+#define FEATURE_SUPPORT_UTIL_H_
>+
>+#include "export.h"
>+
>+#ifdef __cplusplus
>+extern "C" {
>+#endif
>+
>+/**************************************************************************************************
>+ *
>+ * The following is the "version 2" private API for the Android EGL loader:
>+ *
>+ **************************************************************************************************/
>+
>+// Typedefs for handles:
>+typedef void *RulesHandle;
>+typedef void *SystemInfoHandle;
>+
>+// Callers of the ANGLE feature-support-utility API (e.g. the Android EGL loader) will call this
>+// function in order to determine what version of the API it can use (if any).
>+//
>+// The caller supplies the highest version of the API that it knows about.  If that version is
>+// supported by the feature-support-utility, true is returned and the version isn't changed.  If
>+// the supplied version is higher than supported by the feature-support-utility, true is
>+// returned and the version is changed to the highest supported by the feature-support-utility.
>+// If the supplied version is lower than supported by the feature-support-utility, false is
>+// returned.
>+//
>+// Parameters:
>+//
>+// - versionToUse (IN/OUT) - The application supplies the highest version of the interface that
>+//                           it knows about.  If successful, the output value is either
>+//                           unchanged or is the highest supported by the interface.
>+//
>+ANGLE_EXPORT bool ANGLEGetFeatureSupportUtilAPIVersion(unsigned int *versionToUse);
>+
>+// The Android EGL loader will call this function in order to parse a rules file
>+// and create a set of rules, for which a handle is returned.
>+//
>+// Parameters:
>+// - rulesString   (IN) - Rules-file contents, as a non-zero length, null-terminated char*
>+//                        string
>+// - rulesHandle  (OUT) - Handle to the rules data structure
>+// - rulesVersion (OUT) - Version of the rules data structure (potentially because of schema
>+//                        changes) that should be passed to ANGLEShouldBeUsedForApplication()
>+//
>+// Return value:
>+// - bool - true if no errors, otherwise false
>+//
>+ANGLE_EXPORT bool ANGLEAndroidParseRulesString(const char *rulesString,
>+                                               RulesHandle *rulesHandle,
>+                                               int *rulesVersion);
>+
>+// The Android EGL loader will call this function in order to obtain a handle to
>+// the SystemInfo struct.
>+//
>+// Parameters:
>+// - systemInfoHandle (OUT) - handle to the SystemInfo structure
>+//
>+// Return value:
>+// - bool - true if no errors, otherwise false
>+//
>+ANGLE_EXPORT bool ANGLEGetSystemInfo(SystemInfoHandle *systemInfoHandle);
>+
>+// The Android EGL loader will call this function in order to add the device's manufacturer and
>+// model to the SystemInfo struct associated with the handle returned by ANGLEGetSystemInfo.
>+//
>+// Parameters:
>+// - deviceMfr   (IN) - Device manufacturer, from the
>+//                      "ro.product.manufacturer"com.google.android" property
>+// - deviceModel (IN) - Device model, from the "ro.product.model"com.google.android" property
>+// - systemInfoHandle (IN) - handle to the SystemInfo structure
>+//
>+// Return value:
>+// - bool - true if no errors, otherwise false
>+//
>+ANGLE_EXPORT bool ANGLEAddDeviceInfoToSystemInfo(const char *deviceMfr,
>+                                                 const char *deviceModel,
>+                                                 SystemInfoHandle systemInfoHandle);
>+
>+// The Android EGL loader will call this function in order to determine whether
>+// to use ANGLE instead of a native OpenGL-ES (GLES) driver.
>+//
>+// Parameters:
>+// - rulesHandle      (IN) - Handle to the rules data structure
>+// - rulesVersion     (IN) - Version of the rules data structure (potentially because of schema
>+//                           changes) that was passed from AndroidParseRulesFile()
>+// - systemInfoHandle (IN) - Handle to the SystemInfo structure
>+// - appName          (IN) - Java name of the application (e.g. "com.google.android.apps.maps")
>+//
>+// Return value:
>+// - bool - true if Android should use ANGLE for appName, otherwise false (i.e. use the native
>+//          GLES driver)
>+//
>+ANGLE_EXPORT bool ANGLEShouldBeUsedForApplication(const RulesHandle rulesHandle,
>+                                                  int rulesVersion,
>+                                                  const SystemInfoHandle systemInfoHandle,
>+                                                  const char *appName);
>+
>+// The Android EGL loader will call this function in order to free a rules handle.
>+//
>+// Parameters:
>+// - rulesHandle (IN) - Handle to the rules data structure
>+//
>+ANGLE_EXPORT void ANGLEFreeRulesHandle(const RulesHandle rulesHandle);
>+
>+// The Android EGL loader will call this function in order to free a SystemInfo handle.
>+//
>+// Parameters:
>+// - systemInfoHandle (IN) - Handle to the SystemInfo structure
>+//
>+ANGLE_EXPORT void ANGLEFreeSystemInfoHandle(const SystemInfoHandle systemInfoHandle);
>+
>+// The following are internal versions supported by the current  feature-support-utility API.
>+
>+constexpr unsigned int kFeatureVersion_LowestSupported  = 2;
>+constexpr unsigned int kFeatureVersion_HighestSupported = 2;
>+
>+#ifdef __cplusplus
>+}  // extern "C"
>+#endif
>+
>+#endif  // FEATURE_SUPPORT_UTIL_H_
>diff --git a/Source/ThirdParty/ANGLE/src/feature_support_util/feature_support_util_unittest.cpp b/Source/ThirdParty/ANGLE/src/feature_support_util/feature_support_util_unittest.cpp
>new file mode 100644
>index 00000000000..1d6784f6492
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/feature_support_util/feature_support_util_unittest.cpp
>@@ -0,0 +1,162 @@
>+//
>+// Copyright (c) 2018 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+
>+// feature_support_util_unittest.cpp: Unit test for the feature-support utility.
>+
>+#include <gtest/gtest.h>
>+
>+#include "../gpu_info_util/SystemInfo.h"
>+#include "feature_support_util.h"
>+
>+using namespace angle;
>+
>+constexpr char kMfr[]   = "MfrFoo";
>+constexpr char kModel[] = "ModelX";
>+
>+class FeatureSupportUtilTest : public testing::Test
>+{
>+  protected:
>+    FeatureSupportUtilTest()
>+    {
>+        mSystemInfo.machineManufacturer = kMfr;
>+        mSystemInfo.machineModelName    = kModel;
>+        mSystemInfo.gpus.resize(1);
>+        mSystemInfo.gpus[0].vendorId              = 123;
>+        mSystemInfo.gpus[0].deviceId              = 234;
>+        mSystemInfo.gpus[0].driverVendor          = "GPUVendorA";
>+        mSystemInfo.gpus[0].detailedDriverVersion = {1, 2, 3, 4};
>+    }
>+
>+    SystemInfo mSystemInfo;
>+};
>+
>+// Test the ANGLEGetFeatureSupportUtilAPIVersion function
>+TEST_F(FeatureSupportUtilTest, APIVersion)
>+{
>+    unsigned int versionToUse;
>+    unsigned int zero = 0;
>+    unsigned int lowestMinusOne =
>+        (kFeatureVersion_LowestSupported > 1) ? kFeatureVersion_LowestSupported - 1 : zero;
>+
>+    versionToUse = kFeatureVersion_LowestSupported;
>+    EXPECT_TRUE(ANGLEGetFeatureSupportUtilAPIVersion(&versionToUse));
>+    EXPECT_EQ(kFeatureVersion_LowestSupported, versionToUse);
>+
>+    versionToUse = kFeatureVersion_HighestSupported;
>+    EXPECT_TRUE(ANGLEGetFeatureSupportUtilAPIVersion(&versionToUse));
>+    EXPECT_EQ(kFeatureVersion_HighestSupported, versionToUse);
>+
>+    versionToUse = zero;
>+    EXPECT_FALSE(ANGLEGetFeatureSupportUtilAPIVersion(&versionToUse));
>+    EXPECT_EQ(zero, versionToUse);
>+
>+    versionToUse = lowestMinusOne;
>+    EXPECT_FALSE(ANGLEGetFeatureSupportUtilAPIVersion(&versionToUse));
>+    EXPECT_EQ(lowestMinusOne, versionToUse);
>+
>+    versionToUse = kFeatureVersion_HighestSupported + 1;
>+    EXPECT_TRUE(ANGLEGetFeatureSupportUtilAPIVersion(&versionToUse));
>+    EXPECT_EQ(kFeatureVersion_HighestSupported, versionToUse);
>+}
>+
>+// Test the ANGLEAddDeviceInfoToSystemInfo function
>+TEST_F(FeatureSupportUtilTest, SystemInfo)
>+{
>+    SystemInfo systemInfo = mSystemInfo;
>+    systemInfo.machineManufacturer = "BAD";
>+    systemInfo.machineModelName    = "BAD";
>+
>+    ANGLEAddDeviceInfoToSystemInfo(kMfr, kModel, &systemInfo);
>+    EXPECT_EQ(kMfr, systemInfo.machineManufacturer);
>+    EXPECT_EQ(kModel, systemInfo.machineModelName);
>+}
>+
>+// Test the ANGLEAndroidParseRulesString function
>+TEST_F(FeatureSupportUtilTest, ParseRules)
>+{
>+    constexpr char kRulesFileContents[] = R"rulefile(
>+{
>+    "Rules" : [
>+        {
>+            "Rule" : "Default Rule (i.e. do not use ANGLE)",
>+            "UseANGLE" : false
>+        }
>+    ]
>+}
>+)rulefile";
>+    RulesHandle rulesHandle = nullptr;
>+    int rulesVersion        = 0;
>+    EXPECT_TRUE(ANGLEAndroidParseRulesString(kRulesFileContents, &rulesHandle, &rulesVersion));
>+    EXPECT_NE(nullptr, rulesHandle);
>+    ANGLEFreeRulesHandle(rulesHandle);
>+}
>+
>+// Test the ANGLEAndroidParseRulesString and ANGLEShouldBeUsedForApplication functions
>+TEST_F(FeatureSupportUtilTest, TestRuleProcessing)
>+{
>+    SystemInfo systemInfo = mSystemInfo;
>+
>+    constexpr char kRulesFileContents[] = R"rulefile(
>+{
>+    "Rules" : [
>+        {
>+            "Rule" : "Default Rule (i.e. do not use ANGLE)",
>+            "UseANGLE" : false
>+        },
>+        {
>+            "Rule" : "Supported application(s)",
>+            "UseANGLE" : true,
>+            "Applications" : [
>+                {
>+                    "AppName" : "com.isvA.app1"
>+                }
>+            ]
>+        },
>+        {
>+            "Rule" : "Exceptions for bad drivers(s)",
>+            "UseANGLE" : false,
>+            "Applications" : [
>+                {
>+                    "AppName" : "com.isvA.app1"
>+                }
>+            ],
>+            "Devices" : [
>+                {
>+                    "Manufacturer" : "MfrFoo",
>+                    "Model" : "ModelX",
>+                    "GPUs" : [
>+                        {
>+                            "Vendor" : "GPUVendorA",
>+                            "DeviceId" : 234,
>+                            "VerMajor" : 1, "VerMinor" : 2, "VerSubMinor" : 3, "VerPatch" : 4}
>+                        }
>+                    ]
>+                }
>+            ]
>+        }
>+    ]
>+}
>+)rulefile";
>+    RulesHandle rulesHandle = nullptr;
>+    int rulesVersion        = 0;
>+    EXPECT_TRUE(ANGLEAndroidParseRulesString(kRulesFileContents, &rulesHandle, &rulesVersion));
>+    EXPECT_NE(nullptr, rulesHandle);
>+
>+    // Test app1 with a SystemInfo that has an unsupported driver--should fail:
>+    constexpr char kApp1[] = "com.isvA.app1";
>+    EXPECT_FALSE(ANGLEShouldBeUsedForApplication(rulesHandle, rulesVersion, &systemInfo, kApp1));
>+
>+    // Test app1 with a SystemInfo that has a supported driver--should pass:
>+    systemInfo.gpus[0].detailedDriverVersion = {1, 2, 3, 5};
>+    EXPECT_TRUE(ANGLEShouldBeUsedForApplication(rulesHandle, rulesVersion, &systemInfo, kApp1));
>+
>+    // Test unsupported app2--should fail:
>+    constexpr char kApp2[] = "com.isvB.app2";
>+    EXPECT_FALSE(ANGLEShouldBeUsedForApplication(rulesHandle, rulesVersion, &systemInfo, kApp2));
>+
>+    // Free the rules data structures:
>+    ANGLEFreeRulesHandle(rulesHandle);
>+}
>diff --git a/Source/ThirdParty/ANGLE/src/gpu_info_util/SystemInfo.cpp b/Source/ThirdParty/ANGLE/src/gpu_info_util/SystemInfo.cpp
>index f8d744342d4..08a2c39a536 100644
>--- a/Source/ThirdParty/ANGLE/src/gpu_info_util/SystemInfo.cpp
>+++ b/Source/ThirdParty/ANGLE/src/gpu_info_util/SystemInfo.cpp
>@@ -9,6 +9,7 @@
> #include "gpu_info_util/SystemInfo.h"
> 
> #include <cstring>
>+#include <iostream>
> #include <sstream>
> 
> #include "common/debug.h"
>@@ -16,7 +17,35 @@
> 
> namespace angle
> {
>-
>+namespace
>+{
>+std::string VendorName(VendorID vendor)
>+{
>+    switch (vendor)
>+    {
>+        case kVendorID_AMD:
>+            return "AMD";
>+        case kVendorID_Intel:
>+            return "Intel";
>+        case kVendorID_ImgTec:
>+            return "ImgTec";
>+        case kVendorID_NVIDIA:
>+            return "NVIDIA";
>+        case kVendorID_Qualcomm:
>+            return "Qualcomm";
>+        case kVendorID_Vivante:
>+            return "Vivante";
>+        case kVendorID_VeriSilicon:
>+            return "VeriSilicon";
>+        case kVendorID_VMWare:
>+            return "VMWare";
>+        case kVendorID_Kazan:
>+            return "Kazan";
>+        default:
>+            return "Unknown (" + std::to_string(vendor) + ")";
>+    }
>+}
>+}  // anonymous namespace
> GPUDeviceInfo::GPUDeviceInfo() = default;
> 
> GPUDeviceInfo::~GPUDeviceInfo() = default;
>@@ -29,19 +58,70 @@ SystemInfo::~SystemInfo() = default;
> 
> SystemInfo::SystemInfo(const SystemInfo &other) = default;
> 
>+bool SystemInfo::hasNVIDIAGPU() const
>+{
>+    for (const GPUDeviceInfo &gpu : gpus)
>+    {
>+        if (IsNVIDIA(gpu.vendorId))
>+        {
>+            return true;
>+        }
>+    }
>+    return false;
>+}
>+
>+bool SystemInfo::hasIntelGPU() const
>+{
>+    for (const GPUDeviceInfo &gpu : gpus)
>+    {
>+        if (IsIntel(gpu.vendorId))
>+        {
>+            return true;
>+        }
>+    }
>+    return false;
>+}
>+
>+bool SystemInfo::hasAMDGPU() const
>+{
>+    for (const GPUDeviceInfo &gpu : gpus)
>+    {
>+        if (IsAMD(gpu.vendorId))
>+        {
>+            return true;
>+        }
>+    }
>+    return false;
>+}
>+
> bool IsAMD(VendorID vendorId)
> {
>     return vendorId == kVendorID_AMD;
> }
> 
>+bool IsARM(VendorID vendorId)
>+{
>+    return vendorId == kVendorID_ARM;
>+}
>+
>+bool IsImgTec(VendorID vendorId)
>+{
>+    return vendorId == kVendorID_ImgTec;
>+}
>+
>+bool IsKazan(VendorID vendorId)
>+{
>+    return vendorId == kVendorID_Kazan;
>+}
>+
> bool IsIntel(VendorID vendorId)
> {
>     return vendorId == kVendorID_Intel;
> }
> 
>-bool IsNvidia(VendorID vendorId)
>+bool IsNVIDIA(VendorID vendorId)
> {
>-    return vendorId == kVendorID_Nvidia;
>+    return vendorId == kVendorID_NVIDIA;
> }
> 
> bool IsQualcomm(VendorID vendorId)
>@@ -49,6 +129,21 @@ bool IsQualcomm(VendorID vendorId)
>     return vendorId == kVendorID_Qualcomm;
> }
> 
>+bool IsVeriSilicon(VendorID vendorId)
>+{
>+    return vendorId == kVendorID_VeriSilicon;
>+}
>+
>+bool IsVMWare(VendorID vendorId)
>+{
>+    return vendorId == kVendorID_VMWare;
>+}
>+
>+bool IsVivante(VendorID vendorId)
>+{
>+    return vendorId == kVendorID_Vivante;
>+}
>+
> bool ParseAMDBrahmaDriverVersion(const std::string &content, std::string *version)
> {
>     const size_t begin = content.find_first_of("0123456789");
>@@ -162,10 +257,61 @@ void FindPrimaryGPU(SystemInfo *info)
>         }
>     }
> 
>-    // Assume that a combination of AMD or Nvidia with Intel means Optimus or AMD Switchable
>+    // Assume that a combination of NVIDIA or AMD with Intel means Optimus or AMD Switchable
>     info->primaryGPUIndex = primary;
>-    info->isOptimus       = hasIntel && IsNvidia(info->gpus[primary].vendorId);
>+    info->isOptimus       = hasIntel && IsNVIDIA(info->gpus[primary].vendorId);
>     info->isAMDSwitchable = hasIntel && IsAMD(info->gpus[primary].vendorId);
> }
> 
>+void PrintSystemInfo(const SystemInfo &info)
>+{
>+    std::cout << info.gpus.size() << " GPUs:\n";
>+
>+    for (size_t i = 0; i < info.gpus.size(); i++)
>+    {
>+        const auto &gpu = info.gpus[i];
>+
>+        std::cout << "  " << i << " - " << VendorName(gpu.vendorId) << " device id: 0x" << std::hex
>+                  << std::uppercase << gpu.deviceId << std::dec << "\n";
>+        if (!gpu.driverVendor.empty())
>+        {
>+            std::cout << "       Driver Vendor: " << gpu.driverVendor << "\n";
>+        }
>+        if (!gpu.driverVersion.empty())
>+        {
>+            std::cout << "       Driver Version: " << gpu.driverVersion << "\n";
>+        }
>+        if (!gpu.driverDate.empty())
>+        {
>+            std::cout << "       Driver Date: " << gpu.driverDate << "\n";
>+        }
>+    }
>+
>+    std::cout << "\n";
>+    std::cout << "Active GPU: " << info.activeGPUIndex << "\n";
>+    std::cout << "Primary GPU: " << info.primaryGPUIndex << "\n";
>+
>+    std::cout << "\n";
>+    std::cout << "Optimus: " << (info.isOptimus ? "true" : "false") << "\n";
>+    std::cout << "AMD Switchable: " << (info.isAMDSwitchable ? "true" : "false") << "\n";
>+
>+    std::cout << "\n";
>+    if (!info.machineManufacturer.empty())
>+    {
>+        std::cout << "Machine Manufacturer: " << info.machineManufacturer << "\n";
>+    }
>+    if (!info.machineModelName.empty())
>+    {
>+        std::cout << "Machine Model: " << info.machineModelName << "\n";
>+    }
>+    if (!info.machineModelVersion.empty())
>+    {
>+        std::cout << "Machine Model Version: " << info.machineModelVersion << "\n";
>+    }
>+    if (!info.primaryDisplayDeviceId.empty())
>+    {
>+        std::cout << "Primary Display Device: " << info.primaryDisplayDeviceId << "\n";
>+    }
>+    std::cout << std::endl;
>+}
> }  // namespace angle
>diff --git a/Source/ThirdParty/ANGLE/src/gpu_info_util/SystemInfo.h b/Source/ThirdParty/ANGLE/src/gpu_info_util/SystemInfo.h
>index ada43f0a154..f6b3abc47cf 100644
>--- a/Source/ThirdParty/ANGLE/src/gpu_info_util/SystemInfo.h
>+++ b/Source/ThirdParty/ANGLE/src/gpu_info_util/SystemInfo.h
>@@ -19,10 +19,13 @@ namespace angle
> using VendorID = uint32_t;
> using DeviceID = uint32_t;
> 
>-constexpr VendorID kVendorID_AMD      = 0x1002;
>-constexpr VendorID kVendorID_Intel    = 0x8086;
>-constexpr VendorID kVendorID_Nvidia   = 0x10DE;
>-constexpr VendorID kVendorID_Qualcomm = 0x5143;
>+struct VersionInfo
>+{
>+    uint32_t major    = 0;
>+    uint32_t minor    = 0;
>+    uint32_t subMinor = 0;
>+    uint32_t patch    = 0;
>+};
> 
> struct GPUDeviceInfo
> {
>@@ -37,6 +40,9 @@ struct GPUDeviceInfo
>     std::string driverVendor;
>     std::string driverVersion;
>     std::string driverDate;
>+
>+    // Only available on Android
>+    VersionInfo detailedDriverVersion;
> };
> 
> struct SystemInfo
>@@ -46,28 +52,70 @@ struct SystemInfo
> 
>     SystemInfo(const SystemInfo &other);
> 
>+    bool hasNVIDIAGPU() const;
>+    bool hasIntelGPU() const;
>+    bool hasAMDGPU() const;
>+
>     std::vector<GPUDeviceInfo> gpus;
>+
>+    // Index of the primary GPU (the discrete one on dual GPU systems) in `gpus`.
>+    // Will never be -1 after a successful GetSystemInfo.
>     int primaryGPUIndex = -1;
>-    int activeGPUIndex  = -1;
>+    // Index of the currently active GPU in `gpus`, can be -1 if the active GPU could not be
>+    // detected.
>+    int activeGPUIndex = -1;
> 
>     bool isOptimus       = false;
>     bool isAMDSwitchable = false;
>+    // Only true on dual-GPU Mac laptops.
>+    bool isMacSwitchable = false;
> 
>-    // Only available on macOS
>+    // Only available on Android
>+    std::string machineManufacturer;
>+
>+    // Only available on macOS and Android
>     std::string machineModelName;
>+
>+    // Only available on macOS
>     std::string machineModelVersion;
> 
>     // Only available on Windows, set even on failure.
>     std::string primaryDisplayDeviceId;
> };
> 
>+// Gathers information about the system without starting a GPU driver and returns them in `info`.
>+// Returns true if all info was gathered, false otherwise. Even when false is returned, `info` will
>+// be filled with partial information.
> bool GetSystemInfo(SystemInfo *info);
> 
>+// Known PCI vendor IDs
>+constexpr VendorID kVendorID_AMD      = 0x1002;
>+constexpr VendorID kVendorID_ARM      = 0x13B5;
>+constexpr VendorID kVendorID_ImgTec   = 0x1010;
>+constexpr VendorID kVendorID_Intel    = 0x8086;
>+constexpr VendorID kVendorID_NVIDIA   = 0x10DE;
>+constexpr VendorID kVendorID_Qualcomm = 0x5143;
>+constexpr VendorID kVendorID_VMWare   = 0x15ad;
>+
>+// Known non-PCI (i.e. Khronos-registered) vendor IDs
>+constexpr VendorID kVendorID_Vivante     = 0x10001;
>+constexpr VendorID kVendorID_VeriSilicon = 0x10002;
>+constexpr VendorID kVendorID_Kazan       = 0x10003;
>+
>+// Predicates on vendor IDs
> bool IsAMD(VendorID vendorId);
>+bool IsARM(VendorID vendorId);
>+bool IsImgTec(VendorID vendorId);
> bool IsIntel(VendorID vendorId);
>-bool IsNvidia(VendorID vendorId);
>+bool IsKazan(VendorID vendorId);
>+bool IsNVIDIA(VendorID vendorId);
> bool IsQualcomm(VendorID vendorId);
>+bool IsVeriSilicon(VendorID vendorId);
>+bool IsVMWare(VendorID vendorId);
>+bool IsVivante(VendorID vendorId);
> 
>+// Dumps the system info to stdout.
>+void PrintSystemInfo(const SystemInfo &info);
> }  // namespace angle
> 
> #endif  // GPU_INFO_UTIL_SYSTEM_INFO_H_
>diff --git a/Source/ThirdParty/ANGLE/src/gpu_info_util/SystemInfo_android.cpp b/Source/ThirdParty/ANGLE/src/gpu_info_util/SystemInfo_android.cpp
>new file mode 100644
>index 00000000000..743da00a0b4
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/gpu_info_util/SystemInfo_android.cpp
>@@ -0,0 +1,256 @@
>+//
>+// Copyright 2018 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+
>+// SystemInfo_android.cpp: implementation of the Android-specific parts of SystemInfo.h
>+
>+#include <dlfcn.h>
>+#include <vulkan/vulkan.h>
>+#include "gpu_info_util/SystemInfo_internal.h"
>+
>+#include <sys/system_properties.h>
>+#include <cstring>
>+#include <fstream>
>+
>+#include "common/angleutils.h"
>+#include "common/debug.h"
>+
>+namespace angle
>+{
>+class VulkanLibrary final : NonCopyable
>+{
>+  public:
>+    VulkanLibrary() {}
>+    ~VulkanLibrary()
>+    {
>+        if (mInstance != VK_NULL_HANDLE)
>+        {
>+            PFN_vkDestroyInstance pfnDestroyInstance =
>+                reinterpret_cast<PFN_vkDestroyInstance>(dlsym(mLibVulkan, "vkDestroyInstance"));
>+            if (pfnDestroyInstance)
>+            {
>+                pfnDestroyInstance(mInstance, nullptr);
>+            }
>+        }
>+        if (mLibVulkan)
>+            dlclose(mLibVulkan);
>+    }
>+    VkInstance getVulkanInstance()
>+    {
>+        // Find the system's Vulkan library and open it:
>+        mLibVulkan = dlopen("libvulkan.so", RTLD_NOW | RTLD_LOCAL);
>+        if (!mLibVulkan)
>+        {
>+            // If Vulkan doesn't exist, bail-out early:
>+            return VK_NULL_HANDLE;
>+        }
>+
>+        // Determine the available Vulkan instance version:
>+        uint32_t instanceVersion = VK_API_VERSION_1_0;
>+#if defined(VK_VERSION_1_1)
>+        PFN_vkEnumerateInstanceVersion pfnEnumerateInstanceVersion =
>+            reinterpret_cast<PFN_vkEnumerateInstanceVersion>(
>+                dlsym(mLibVulkan, "vkEnumerateInstanceVersion"));
>+        if (!pfnEnumerateInstanceVersion ||
>+            pfnEnumerateInstanceVersion(&instanceVersion) != VK_SUCCESS)
>+        {
>+            instanceVersion = VK_API_VERSION_1_0;
>+        }
>+#endif  // VK_VERSION_1_1
>+
>+        // Create a Vulkan instance:
>+        VkApplicationInfo appInfo;
>+        appInfo.sType              = VK_STRUCTURE_TYPE_APPLICATION_INFO;
>+        appInfo.pNext              = nullptr;
>+        appInfo.pApplicationName   = "";
>+        appInfo.applicationVersion = 1;
>+        appInfo.pEngineName        = "";
>+        appInfo.engineVersion      = 1;
>+        appInfo.apiVersion         = instanceVersion;
>+
>+        VkInstanceCreateInfo createInstanceInfo;
>+        createInstanceInfo.sType                   = VK_STRUCTURE_TYPE_INSTANCE_CREATE_INFO;
>+        createInstanceInfo.pNext                   = nullptr;
>+        createInstanceInfo.flags                   = 0;
>+        createInstanceInfo.pApplicationInfo        = &appInfo;
>+        createInstanceInfo.enabledLayerCount       = 0;
>+        createInstanceInfo.ppEnabledLayerNames     = nullptr;
>+        createInstanceInfo.enabledExtensionCount   = 0;
>+        createInstanceInfo.ppEnabledExtensionNames = nullptr;
>+
>+        PFN_vkCreateInstance pfnCreateInstance =
>+            reinterpret_cast<PFN_vkCreateInstance>(dlsym(mLibVulkan, "vkCreateInstance"));
>+        if (!pfnCreateInstance ||
>+            pfnCreateInstance(&createInstanceInfo, nullptr, &mInstance) != VK_SUCCESS)
>+        {
>+            return VK_NULL_HANDLE;
>+        }
>+
>+        return mInstance;
>+    }
>+    void *gpa(std::string fn) { return dlsym(mLibVulkan, fn.c_str()); }
>+#define GPA(ob, type, fn) reinterpret_cast<type>(ob.gpa(fn))
>+
>+  private:
>+    void *mLibVulkan     = nullptr;
>+    VkInstance mInstance = VK_NULL_HANDLE;
>+};
>+
>+ANGLE_FORMAT_PRINTF(1, 2)
>+std::string FormatString(const char *fmt, ...)
>+{
>+    va_list vararg;
>+    va_start(vararg, fmt);
>+
>+    std::vector<char> buffer(512);
>+    size_t len = FormatStringIntoVector(fmt, vararg, buffer);
>+    va_end(vararg);
>+
>+    return std::string(&buffer[0], len);
>+}
>+
>+bool GetAndroidSystemProperty(const std::string &propertyName, std::string *value)
>+{
>+    // PROP_VALUE_MAX from <sys/system_properties.h>
>+    std::vector<char> propertyBuf(PROP_VALUE_MAX);
>+    int len = __system_property_get(propertyName.c_str(), propertyBuf.data());
>+    if (len <= 0)
>+    {
>+        return false;
>+    }
>+    *value = std::string(propertyBuf.data());
>+    return true;
>+}
>+
>+bool GetSystemInfo(SystemInfo *info)
>+{
>+    bool isFullyPopulated = true;
>+
>+    isFullyPopulated =
>+        GetAndroidSystemProperty("ro.product.manufacturer", &info->machineManufacturer) &&
>+        isFullyPopulated;
>+    isFullyPopulated =
>+        GetAndroidSystemProperty("ro.product.model", &info->machineModelName) && isFullyPopulated;
>+
>+    // This implementation builds on top of the Vulkan API, but cannot assume the existence of the
>+    // Vulkan library.  ANGLE can be installed on versions of Android as old as Ice Cream Sandwich.
>+    // Therefore, we need to use dlopen()/dlsym() in order to see if Vulkan is installed on the
>+    // system, and if so, to use it:
>+    VulkanLibrary vkLibrary;
>+    VkInstance instance = vkLibrary.getVulkanInstance();
>+    if (instance == VK_NULL_HANDLE)
>+    {
>+        // If Vulkan doesn't exist, bail-out early:
>+        return false;
>+    }
>+
>+    // Enumerate the Vulkan physical devices, which are ANGLE gpus:
>+    PFN_vkEnumeratePhysicalDevices pfnEnumeratePhysicalDevices =
>+        GPA(vkLibrary, PFN_vkEnumeratePhysicalDevices, "vkEnumeratePhysicalDevices");
>+    PFN_vkGetPhysicalDeviceProperties pfnGetPhysicalDeviceProperties =
>+        GPA(vkLibrary, PFN_vkGetPhysicalDeviceProperties, "vkGetPhysicalDeviceProperties");
>+    uint32_t physicalDeviceCount = 0;
>+    if (!pfnEnumeratePhysicalDevices ||
>+        pfnEnumeratePhysicalDevices(instance, &physicalDeviceCount, nullptr) != VK_SUCCESS)
>+    {
>+        return false;
>+    }
>+    std::vector<VkPhysicalDevice> physicalDevices(physicalDeviceCount);
>+    if (pfnEnumeratePhysicalDevices(instance, &physicalDeviceCount, physicalDevices.data()) !=
>+        VK_SUCCESS)
>+    {
>+        return false;
>+    }
>+
>+    // If we get to here, we will likely provide a valid answer (unless an unknown vendorID):
>+    info->gpus.resize(physicalDeviceCount);
>+
>+    for (uint32_t i = 0; i < physicalDeviceCount; i++)
>+    {
>+        VkPhysicalDeviceProperties properties;
>+        pfnGetPhysicalDeviceProperties(physicalDevices[i], &properties);
>+        // Fill in data for a given physical device (a.k.a. gpu):
>+        GPUDeviceInfo &gpu = info->gpus[i];
>+        gpu.vendorId       = properties.vendorID;
>+        gpu.deviceId       = properties.deviceID;
>+        // Need to parse/re-format properties.driverVersion.
>+        //
>+        // TODO(ianelliott): Determine the formatting used for each vendor
>+        // (http://anglebug.com/2677)
>+        switch (properties.vendorID)
>+        {
>+            case kVendorID_AMD:
>+                gpu.driverVendor                = "Advanced Micro Devices, Inc";
>+                gpu.driverVersion               = FormatString("0x%x", properties.driverVersion);
>+                gpu.detailedDriverVersion.major = properties.driverVersion;
>+                break;
>+            case kVendorID_ARM:
>+                gpu.driverVendor                = "Arm Holdings";
>+                gpu.driverVersion               = FormatString("0x%x", properties.driverVersion);
>+                gpu.detailedDriverVersion.major = properties.driverVersion;
>+                break;
>+            case kVendorID_ImgTec:
>+                gpu.driverVendor                = "Imagination Technologies Limited";
>+                gpu.driverVersion               = FormatString("0x%x", properties.driverVersion);
>+                gpu.detailedDriverVersion.major = properties.driverVersion;
>+                break;
>+            case kVendorID_Intel:
>+                gpu.driverVendor                = "Intel Corporation";
>+                gpu.driverVersion               = FormatString("0x%x", properties.driverVersion);
>+                gpu.detailedDriverVersion.major = properties.driverVersion;
>+                break;
>+            case kVendorID_NVIDIA:
>+                gpu.driverVendor  = "NVIDIA Corporation";
>+                gpu.driverVersion = FormatString("%d.%d.%d.%d", properties.driverVersion >> 22,
>+                                                 (properties.driverVersion >> 14) & 0XFF,
>+                                                 (properties.driverVersion >> 6) & 0XFF,
>+                                                 properties.driverVersion & 0x3F);
>+                gpu.detailedDriverVersion.major    = properties.driverVersion >> 22;
>+                gpu.detailedDriverVersion.minor    = (properties.driverVersion >> 14) & 0xFF;
>+                gpu.detailedDriverVersion.subMinor = (properties.driverVersion >> 6) & 0xFF;
>+                gpu.detailedDriverVersion.patch    = properties.driverVersion & 0x3F;
>+                break;
>+            case kVendorID_Qualcomm:
>+                gpu.driverVendor = "Qualcomm Technologies, Inc";
>+                if (properties.driverVersion & 0x80000000)
>+                {
>+                    gpu.driverVersion = FormatString("%d.%d.%d", properties.driverVersion >> 22,
>+                                                     (properties.driverVersion >> 12) & 0X3FF,
>+                                                     properties.driverVersion & 0xFFF);
>+                    gpu.detailedDriverVersion.major    = properties.driverVersion >> 22;
>+                    gpu.detailedDriverVersion.minor    = (properties.driverVersion >> 12) & 0x3FF;
>+                    gpu.detailedDriverVersion.subMinor = properties.driverVersion & 0xFFF;
>+                }
>+                else
>+                {
>+                    gpu.driverVersion = FormatString("0x%x", properties.driverVersion);
>+                    gpu.detailedDriverVersion.major = properties.driverVersion;
>+                }
>+                break;
>+            case kVendorID_Vivante:
>+                gpu.driverVendor                = "Vivante";
>+                gpu.driverVersion               = FormatString("0x%x", properties.driverVersion);
>+                gpu.detailedDriverVersion.major = properties.driverVersion;
>+                break;
>+            case kVendorID_VeriSilicon:
>+                gpu.driverVendor                = "VeriSilicon";
>+                gpu.driverVersion               = FormatString("0x%x", properties.driverVersion);
>+                gpu.detailedDriverVersion.major = properties.driverVersion;
>+                break;
>+            case kVendorID_Kazan:
>+                gpu.driverVendor                = "Kazan Software";
>+                gpu.driverVersion               = FormatString("0x%x", properties.driverVersion);
>+                gpu.detailedDriverVersion.major = properties.driverVersion;
>+                break;
>+            default:
>+                return false;
>+        }
>+        gpu.driverDate = "";
>+    }
>+
>+    return isFullyPopulated;
>+}
>+
>+}  // namespace angle
>diff --git a/Source/ThirdParty/ANGLE/src/gpu_info_util/SystemInfo_libpci.cpp b/Source/ThirdParty/ANGLE/src/gpu_info_util/SystemInfo_libpci.cpp
>index 07c72872add..a6674c8578f 100644
>--- a/Source/ThirdParty/ANGLE/src/gpu_info_util/SystemInfo_libpci.cpp
>+++ b/Source/ThirdParty/ANGLE/src/gpu_info_util/SystemInfo_libpci.cpp
>@@ -16,7 +16,7 @@
> #include "common/debug.h"
> 
> #if !defined(GPU_INFO_USE_LIBPCI)
>-#error SystemInfo_libpci.cpp compiled without GPU_INFO_USE_LIBPCI
>+#    error SystemInfo_libpci.cpp compiled without GPU_INFO_USE_LIBPCI
> #endif
> 
> namespace angle
>@@ -129,4 +129,4 @@ bool GetPCIDevicesWithLibPCI(std::vector<GPUDeviceInfo> *devices)
> 
>     return true;
> }
>-}
>+}  // namespace angle
>diff --git a/Source/ThirdParty/ANGLE/src/gpu_info_util/SystemInfo_linux.cpp b/Source/ThirdParty/ANGLE/src/gpu_info_util/SystemInfo_linux.cpp
>index 98f000b0696..b4d6aff4a38 100644
>--- a/Source/ThirdParty/ANGLE/src/gpu_info_util/SystemInfo_linux.cpp
>+++ b/Source/ThirdParty/ANGLE/src/gpu_info_util/SystemInfo_linux.cpp
>@@ -108,7 +108,7 @@ bool GetSystemInfo(SystemInfo *info)
>             }
>         }
> 
>-        if (IsNvidia(gpu->vendorId))
>+        if (IsNVIDIA(gpu->vendorId))
>         {
>             std::string version;
>             if (GetNvidiaDriverVersionWithXNVCtrl(&version))
>@@ -127,7 +127,7 @@ bool GetSystemInfo(SystemInfo *info)
>             if (GetNvidiaDriverVersionWithXNVCtrl(&version))
>             {
>                 GPUDeviceInfo nvidiaInfo;
>-                nvidiaInfo.vendorId = kVendorID_Nvidia;
>+                nvidiaInfo.vendorId = kVendorID_NVIDIA;
>                 nvidiaInfo.deviceId = 0;
>                 gpu->driverVendor   = "Nvidia";
>                 gpu->driverVersion  = std::move(version);
>diff --git a/Source/ThirdParty/ANGLE/src/gpu_info_util/SystemInfo_mac.mm b/Source/ThirdParty/ANGLE/src/gpu_info_util/SystemInfo_mac.mm
>index 7a7a62d170f..25aed136273 100644
>--- a/Source/ThirdParty/ANGLE/src/gpu_info_util/SystemInfo_mac.mm
>+++ b/Source/ThirdParty/ANGLE/src/gpu_info_util/SystemInfo_mac.mm
>@@ -164,6 +164,19 @@ bool GetSystemInfo(SystemInfo *info)
> 
>     FindPrimaryGPU(info);
> 
>+    // Figure out whether this is a dual-GPU system.
>+    //
>+    // TODO(kbr): this code was ported over from Chromium, and its correctness
>+    // could be improved - need to use Mac-specific APIs to determine whether
>+    // offline renderers are allowed, and whether these two GPUs are really the
>+    // integrated/discrete GPUs in a laptop.
>+    if (info->gpus.size() == 2 &&
>+        ((IsIntel(info->gpus[0].vendorId) && !IsIntel(info->gpus[1].vendorId)) ||
>+         (!IsIntel(info->gpus[0].vendorId) && IsIntel(info->gpus[1].vendorId))))
>+    {
>+        info->isMacSwitchable = true;
>+    }
>+
>     return true;
> }
> 
>diff --git a/Source/ThirdParty/ANGLE/src/gpu_info_util/SystemInfo_win.cpp b/Source/ThirdParty/ANGLE/src/gpu_info_util/SystemInfo_win.cpp
>index 041fdad34df..48aae181b99 100644
>--- a/Source/ThirdParty/ANGLE/src/gpu_info_util/SystemInfo_win.cpp
>+++ b/Source/ThirdParty/ANGLE/src/gpu_info_util/SystemInfo_win.cpp
>@@ -16,15 +16,15 @@
> 
> #if defined(GPU_INFO_USE_SETUPAPI)
> // Remove parts of commctrl.h that have compile errors
>-#define NOTOOLBAR
>-#define NOTOOLTIPS
>-#include <cfgmgr32.h>
>-#include <setupapi.h>
>+#    define NOTOOLBAR
>+#    define NOTOOLTIPS
>+#    include <cfgmgr32.h>
>+#    include <setupapi.h>
> #elif defined(GPU_INFO_USE_DXGI)
>-#include <dxgi.h>
>-#include <d3d10.h>
>+#    include <d3d10.h>
>+#    include <dxgi.h>
> #else
>-#error "SystemInfo_win needs at least GPU_INFO_USE_SETUPAPI or GPU_INFO_USE_DXGI defined"
>+#    error "SystemInfo_win needs at least GPU_INFO_USE_SETUPAPI or GPU_INFO_USE_DXGI defined"
> #endif
> 
> #include <array>
>@@ -189,7 +189,7 @@ bool GetDevicesFromDXGI(std::vector<GPUDeviceInfo> *devices)
> }
> 
> #else
>-#error
>+#    error
> #endif
> 
> }  // anonymous namespace
>@@ -210,7 +210,7 @@ bool GetSystemInfo(SystemInfo *info)
>         return false;
>     }
> #else
>-#error
>+#    error
> #endif
> 
>     if (info->gpus.size() == 0)
>diff --git a/Source/ThirdParty/ANGLE/src/gpu_info_util/SystemInfo_x11.cpp b/Source/ThirdParty/ANGLE/src/gpu_info_util/SystemInfo_x11.cpp
>index 3513309f36a..6c23ed83a20 100644
>--- a/Source/ThirdParty/ANGLE/src/gpu_info_util/SystemInfo_x11.cpp
>+++ b/Source/ThirdParty/ANGLE/src/gpu_info_util/SystemInfo_x11.cpp
>@@ -15,7 +15,7 @@
> #include "third_party/libXNVCtrl/NVCtrlLib.h"
> 
> #if !defined(GPU_INFO_USE_X11)
>-#error SystemInfo_x11.cpp compiled without GPU_INFO_USE_X11
>+#    error SystemInfo_x11.cpp compiled without GPU_INFO_USE_X11
> #endif
> 
> namespace angle
>@@ -30,7 +30,7 @@ bool GetNvidiaDriverVersionWithXNVCtrl(std::string *version)
> 
>     Display *display = XOpenDisplay(nullptr);
> 
>-    if (XNVCTRLQueryExtension(display, &eventBase, &errorBase))
>+    if (display && XNVCTRLQueryExtension(display, &eventBase, &errorBase))
>     {
>         int screenCount = ScreenCount(display);
>         for (int screen = 0; screen < screenCount; ++screen)
>@@ -50,4 +50,4 @@ bool GetNvidiaDriverVersionWithXNVCtrl(std::string *version)
> 
>     return false;
> }
>-}
>+}  // namespace angle
>diff --git a/Source/ThirdParty/ANGLE/src/image_util/copyimage.h b/Source/ThirdParty/ANGLE/src/image_util/copyimage.h
>index bc8c1390eb4..066519291a6 100644
>--- a/Source/ThirdParty/ANGLE/src/image_util/copyimage.h
>+++ b/Source/ThirdParty/ANGLE/src/image_util/copyimage.h
>@@ -24,8 +24,11 @@ void ReadColor(const uint8_t *source, uint8_t *dest);
> template <typename destType, typename colorDataType>
> void WriteColor(const uint8_t *source, uint8_t *dest);
> 
>-template <typename sourceType, typename destType, typename colorDataType>
>-void CopyPixel(const uint8_t *source, uint8_t *dest);
>+template <typename SourceType>
>+void ReadDepthStencil(const uint8_t *source, uint8_t *dest);
>+
>+template <typename DestType>
>+void WriteDepthStencil(const uint8_t *source, uint8_t *dest);
> 
> void CopyBGRA8ToRGBA8(const uint8_t *source, uint8_t *dest);
> 
>diff --git a/Source/ThirdParty/ANGLE/src/image_util/copyimage.inl b/Source/ThirdParty/ANGLE/src/image_util/copyimage.inl
>index dbada812918..44b63bd8e59 100644
>--- a/Source/ThirdParty/ANGLE/src/image_util/copyimage.inl
>+++ b/Source/ThirdParty/ANGLE/src/image_util/copyimage.inl
>@@ -8,27 +8,31 @@
> 
> namespace angle
> {
>-
> template <typename sourceType, typename colorDataType>
>-inline void ReadColor(const uint8_t *source, uint8_t *dest)
>+void ReadColor(const uint8_t *source, uint8_t *dest)
> {
>     sourceType::readColor(reinterpret_cast<Color<colorDataType>*>(dest),
>                           reinterpret_cast<const sourceType*>(source));
> }
> 
> template <typename destType, typename colorDataType>
>-inline void WriteColor(const uint8_t *source, uint8_t *dest)
>+void WriteColor(const uint8_t *source, uint8_t *dest)
> {
>     destType::writeColor(reinterpret_cast<destType*>(dest),
>                          reinterpret_cast<const Color<colorDataType>*>(source));
> }
> 
>-template <typename sourceType, typename destType, typename colorDataType>
>-inline void CopyPixel(const uint8_t *source, uint8_t *dest)
>+template <typename SourceType>
>+void ReadDepthStencil(const uint8_t *source, uint8_t *dest)
> {
>-    colorDataType temp;
>-    ReadColor<sourceType, colorDataType>(source, &temp);
>-    WriteColor<destType, colorDataType>(&temp, dest);
>+    SourceType::ReadDepthStencil(reinterpret_cast<DepthStencil *>(dest),
>+                                 reinterpret_cast<const SourceType *>(source));
> }
> 
>+template <typename DestType>
>+void WriteDepthStencil(const uint8_t *source, uint8_t *dest)
>+{
>+    DestType::WriteDepthStencil(reinterpret_cast<DestType *>(dest),
>+                                reinterpret_cast<const DepthStencil *>(source));
>+}
> }  // namespace angle
>diff --git a/Source/ThirdParty/ANGLE/src/image_util/imageformats.cpp b/Source/ThirdParty/ANGLE/src/image_util/imageformats.cpp
>index a4c86945b61..c33c4853420 100644
>--- a/Source/ThirdParty/ANGLE/src/image_util/imageformats.cpp
>+++ b/Source/ThirdParty/ANGLE/src/image_util/imageformats.cpp
>@@ -1673,6 +1673,46 @@ void R10G10B10A2::average(R10G10B10A2 *dst, const R10G10B10A2 *src1, const R10G1
>     dst->A = gl::average(src1->A, src2->A);
> }
> 
>+void R10G10B10A2S::readColor(gl::ColorI *dst, const R10G10B10A2S *src)
>+{
>+    dst->red   = src->R;
>+    dst->green = src->G;
>+    dst->blue  = src->B;
>+    dst->alpha = src->A;
>+}
>+
>+void R10G10B10A2S::readColor(gl::ColorF *dst, const R10G10B10A2S *src)
>+{
>+    dst->red   = gl::normalizedToFloat<10>(src->R);
>+    dst->green = gl::normalizedToFloat<10>(src->G);
>+    dst->blue  = gl::normalizedToFloat<10>(src->B);
>+    dst->alpha = gl::normalizedToFloat<2>(src->A);
>+}
>+
>+void R10G10B10A2S::writeColor(R10G10B10A2S *dst, const gl::ColorI *src)
>+{
>+    dst->R = static_cast<int32_t>(src->red);
>+    dst->G = static_cast<int32_t>(src->green);
>+    dst->B = static_cast<int32_t>(src->blue);
>+    dst->A = static_cast<int32_t>(src->alpha);
>+}
>+
>+void R10G10B10A2S::writeColor(R10G10B10A2S *dst, const gl::ColorF *src)
>+{
>+    dst->R = gl::floatToNormalized<10, int32_t>(src->red);
>+    dst->G = gl::floatToNormalized<10, int32_t>(src->green);
>+    dst->B = gl::floatToNormalized<10, int32_t>(src->blue);
>+    dst->A = gl::floatToNormalized<2, int32_t>(src->alpha);
>+}
>+
>+void R10G10B10A2S::average(R10G10B10A2S *dst, const R10G10B10A2S *src1, const R10G10B10A2S *src2)
>+{
>+    dst->R = gl::average(src1->R, src2->R);
>+    dst->G = gl::average(src1->G, src2->G);
>+    dst->B = gl::average(src1->B, src2->B);
>+    dst->A = gl::average(src1->A, src2->A);
>+}
>+
> void R9G9B9E5::readColor(gl::ColorF *dst, const R9G9B9E5 *src)
> {
>     gl::convert999E5toRGBFloats(gl::bitCast<uint32_t>(*src), &dst->red, &dst->green, &dst->blue);
>@@ -1719,4 +1759,77 @@ void R11G11B10F::average(R11G11B10F *dst, const R11G11B10F *src1, const R11G11B1
>     dst->B = gl::averageFloat10(src1->B, src2->B);
> }
> 
>+void D24S8::ReadDepthStencil(DepthStencil *dst, const D24S8 *src)
>+{
>+    dst->depth   = gl::normalizedToFloat<24>(src->D);
>+    dst->stencil = gl::getShiftedData<8, 24>(src->S);
>+}
>+
>+void D24S8::WriteDepthStencil(D24S8 *dst, const DepthStencil *src)
>+{
>+    dst->D = gl::floatToNormalized<24, uint32_t>(static_cast<float>(src->depth));
>+    dst->S = src->stencil & 0xFF;
>+}
>+
>+void S8::ReadDepthStencil(DepthStencil *dst, const S8 *src)
>+{
>+    UNIMPLEMENTED();
>+}
>+
>+void S8::WriteDepthStencil(S8 *dst, const DepthStencil *src)
>+{
>+    UNIMPLEMENTED();
>+}
>+
>+void D16::ReadDepthStencil(DepthStencil *dst, const D16 *src)
>+{
>+    UNIMPLEMENTED();
>+}
>+
>+void D16::WriteDepthStencil(D16 *dst, const DepthStencil *src)
>+{
>+    UNIMPLEMENTED();
>+}
>+
>+void D24::ReadDepthStencil(DepthStencil *dst, const D24 *src)
>+{
>+    dst->depth = gl::normalizedToFloat<24>(src->D);
>+}
>+
>+void D24::WriteDepthStencil(D24 *dst, const DepthStencil *src)
>+{
>+    UNIMPLEMENTED();
>+}
>+
>+void D32F::ReadDepthStencil(DepthStencil *dst, const D32F *src)
>+{
>+    dst->depth = src->D;
>+}
>+
>+void D32F::WriteDepthStencil(D32F *dst, const DepthStencil *src)
>+{
>+    UNIMPLEMENTED();
>+}
>+
>+void D32::ReadDepthStencil(DepthStencil *dst, const D32 *src)
>+{
>+    UNIMPLEMENTED();
>+}
>+
>+void D32::WriteDepthStencil(D32 *dst, const DepthStencil *src)
>+{
>+    UNIMPLEMENTED();
>+}
>+
>+void D32FS8::ReadDepthStencil(DepthStencil *dst, const D32FS8 *src)
>+{
>+    dst->depth   = src->D;
>+    dst->stencil = gl::getShiftedData<8, 24>(static_cast<uint32_t>(src->S));
>+}
>+
>+void D32FS8::WriteDepthStencil(D32FS8 *dst, const DepthStencil *src)
>+{
>+    dst->D = static_cast<float>(src->depth);
>+    dst->S = src->stencil & 0xFF;
>+}
> }  // namespace angle
>diff --git a/Source/ThirdParty/ANGLE/src/image_util/imageformats.h b/Source/ThirdParty/ANGLE/src/image_util/imageformats.h
>index 65644cd8d9e..d8dbd0004a9 100644
>--- a/Source/ThirdParty/ANGLE/src/image_util/imageformats.h
>+++ b/Source/ThirdParty/ANGLE/src/image_util/imageformats.h
>@@ -670,6 +670,21 @@ struct R10G10B10A2
> };
> static_assert(sizeof(R10G10B10A2) == 4, "R10G10B10A2 struct not 32-bits.");
> 
>+struct R10G10B10A2S
>+{
>+    int32_t R : 10;
>+    int32_t G : 10;
>+    int32_t B : 10;
>+    int32_t A : 2;
>+
>+    static void readColor(gl::ColorF *dst, const R10G10B10A2S *src);
>+    static void readColor(gl::ColorI *dst, const R10G10B10A2S *src);
>+    static void writeColor(R10G10B10A2S *dst, const gl::ColorF *src);
>+    static void writeColor(R10G10B10A2S *dst, const gl::ColorI *src);
>+    static void average(R10G10B10A2S *dst, const R10G10B10A2S *src1, const R10G10B10A2S *src2);
>+};
>+static_assert(sizeof(R10G10B10A2S) == 4, "R10G10B10A2S struct not 32-bits.");
>+
> struct R9G9B9E5
> {
>     uint32_t R : 9;
>@@ -695,6 +710,63 @@ struct R11G11B10F
> };
> static_assert(sizeof(R11G11B10F) == 4, "R11G11B10F struct not 32-bits.");
> 
>+struct D24S8
>+{
>+    uint32_t D : 24;
>+    uint32_t S : 8;
>+
>+    static void ReadDepthStencil(DepthStencil *dst, const D24S8 *src);
>+    static void WriteDepthStencil(D24S8 *dst, const DepthStencil *src);
>+};
>+
>+struct S8
>+{
>+    uint8_t S;
>+
>+    static void ReadDepthStencil(DepthStencil *dst, const S8 *src);
>+    static void WriteDepthStencil(S8 *dst, const DepthStencil *src);
>+};
>+
>+struct D16
>+{
>+    uint16_t D;
>+
>+    static void ReadDepthStencil(DepthStencil *dst, const D16 *src);
>+    static void WriteDepthStencil(D16 *dst, const DepthStencil *src);
>+};
>+
>+struct D24
>+{
>+    uint32_t D;
>+
>+    static void ReadDepthStencil(DepthStencil *dst, const D24 *src);
>+    static void WriteDepthStencil(D24 *dst, const DepthStencil *src);
>+};
>+
>+struct D32F
>+{
>+    float D;
>+
>+    static void ReadDepthStencil(DepthStencil *dst, const D32F *src);
>+    static void WriteDepthStencil(D32F *dst, const DepthStencil *src);
>+};
>+
>+struct D32
>+{
>+    uint32_t D;
>+
>+    static void ReadDepthStencil(DepthStencil *dst, const D32 *src);
>+    static void WriteDepthStencil(D32 *dst, const DepthStencil *src);
>+};
>+
>+struct D32FS8
>+{
>+    float D;
>+    uint32_t S;
>+
>+    static void ReadDepthStencil(DepthStencil *dst, const D32FS8 *src);
>+    static void WriteDepthStencil(D32FS8 *dst, const DepthStencil *src);
>+};
> }  // namespace angle
> 
> #endif  // IMAGEUTIL_IMAGEFORMATS_H_
>diff --git a/Source/ThirdParty/ANGLE/src/image_util/loadimage.cpp b/Source/ThirdParty/ANGLE/src/image_util/loadimage.cpp
>index 56ad3b32e3a..b057017e839 100644
>--- a/Source/ThirdParty/ANGLE/src/image_util/loadimage.cpp
>+++ b/Source/ThirdParty/ANGLE/src/image_util/loadimage.cpp
>@@ -1180,6 +1180,36 @@ void LoadG8R24ToR24G8(size_t width,
>     }
> }
> 
>+void LoadD24S8ToD32FS8X24(size_t width,
>+                          size_t height,
>+                          size_t depth,
>+                          const uint8_t *input,
>+                          size_t inputRowPitch,
>+                          size_t inputDepthPitch,
>+                          uint8_t *output,
>+                          size_t outputRowPitch,
>+                          size_t outputDepthPitch)
>+{
>+    for (size_t z = 0; z < depth; z++)
>+    {
>+        for (size_t y = 0; y < height; y++)
>+        {
>+            const uint32_t *source =
>+                priv::OffsetDataPointer<uint32_t>(input, y, z, inputRowPitch, inputDepthPitch);
>+            float *destDepth =
>+                priv::OffsetDataPointer<float>(output, y, z, outputRowPitch, outputDepthPitch);
>+            uint32_t *destStencil =
>+                priv::OffsetDataPointer<uint32_t>(output, y, z, outputRowPitch, outputDepthPitch) +
>+                1;
>+            for (size_t x = 0; x < width; x++)
>+            {
>+                destDepth[x * 2]   = (source[x] & 0xFFFFFF) / static_cast<float>(0xFFFFFF);
>+                destStencil[x * 2] = source[x] & 0xFF000000;
>+            }
>+        }
>+    }
>+}
>+
> void LoadD32FToD32F(size_t width,
>                     size_t height,
>                     size_t depth,
>@@ -1206,6 +1236,36 @@ void LoadD32FToD32F(size_t width,
>     }
> }
> 
>+void LoadD32FS8X24ToD24S8(size_t width,
>+                          size_t height,
>+                          size_t depth,
>+                          const uint8_t *input,
>+                          size_t inputRowPitch,
>+                          size_t inputDepthPitch,
>+                          uint8_t *output,
>+                          size_t outputRowPitch,
>+                          size_t outputDepthPitch)
>+{
>+    for (size_t z = 0; z < depth; z++)
>+    {
>+        for (size_t y = 0; y < height; y++)
>+        {
>+            const float *sourceDepth =
>+                priv::OffsetDataPointer<float>(input, y, z, inputRowPitch, inputDepthPitch);
>+            const uint32_t *sourceStencil =
>+                priv::OffsetDataPointer<uint32_t>(input, y, z, inputRowPitch, inputDepthPitch) + 1;
>+            uint32_t *dest =
>+                priv::OffsetDataPointer<uint32_t>(output, y, z, outputRowPitch, outputDepthPitch);
>+            for (size_t x = 0; x < width; x++)
>+            {
>+                uint32_t d = static_cast<uint32_t>(gl::clamp01(sourceDepth[x * 2]) * 0xFFFFFF);
>+                uint32_t s = sourceStencil[x * 2] & 0xFF000000;
>+                dest[x]    = d | s;
>+            }
>+        }
>+    }
>+}
>+
> void LoadD32FS8X24ToD32FS8X24(size_t width,
>                               size_t height,
>                               size_t depth,
>@@ -1267,6 +1327,34 @@ void LoadRGB32FToRGBA16F(size_t width,
>     }
> }
> 
>+void LoadRGB32FToRGB16F(size_t width,
>+                        size_t height,
>+                        size_t depth,
>+                        const uint8_t *input,
>+                        size_t inputRowPitch,
>+                        size_t inputDepthPitch,
>+                        uint8_t *output,
>+                        size_t outputRowPitch,
>+                        size_t outputDepthPitch)
>+{
>+    for (size_t z = 0; z < depth; z++)
>+    {
>+        for (size_t y = 0; y < height; y++)
>+        {
>+            const float *source =
>+                priv::OffsetDataPointer<float>(input, y, z, inputRowPitch, inputDepthPitch);
>+            uint16_t *dest =
>+                priv::OffsetDataPointer<uint16_t>(output, y, z, outputRowPitch, outputDepthPitch);
>+            for (size_t x = 0; x < width; x++)
>+            {
>+                dest[x * 3 + 0] = gl::float32ToFloat16(source[x * 3 + 0]);
>+                dest[x * 3 + 1] = gl::float32ToFloat16(source[x * 3 + 1]);
>+                dest[x * 3 + 2] = gl::float32ToFloat16(source[x * 3 + 2]);
>+            }
>+        }
>+    }
>+}
>+
> void LoadR32ToR16(size_t width,
>                   size_t height,
>                   size_t depth,
>diff --git a/Source/ThirdParty/ANGLE/src/image_util/loadimage.h b/Source/ThirdParty/ANGLE/src/image_util/loadimage.h
>index 3e8aac79c23..485c6a49566 100644
>--- a/Source/ThirdParty/ANGLE/src/image_util/loadimage.h
>+++ b/Source/ThirdParty/ANGLE/src/image_util/loadimage.h
>@@ -385,6 +385,16 @@ void LoadG8R24ToR24G8(size_t width,
>                       size_t outputRowPitch,
>                       size_t outputDepthPitch);
> 
>+void LoadD24S8ToD32FS8X24(size_t width,
>+                          size_t height,
>+                          size_t depth,
>+                          const uint8_t *input,
>+                          size_t inputRowPitch,
>+                          size_t inputDepthPitch,
>+                          uint8_t *output,
>+                          size_t outputRowPitch,
>+                          size_t outputDepthPitch);
>+
> void LoadD32FToD32F(size_t width,
>                     size_t height,
>                     size_t depth,
>@@ -395,6 +405,16 @@ void LoadD32FToD32F(size_t width,
>                     size_t outputRowPitch,
>                     size_t outputDepthPitch);
> 
>+void LoadD32FS8X24ToD24S8(size_t width,
>+                          size_t height,
>+                          size_t depth,
>+                          const uint8_t *input,
>+                          size_t inputRowPitch,
>+                          size_t inputDepthPitch,
>+                          uint8_t *output,
>+                          size_t outputRowPitch,
>+                          size_t outputDepthPitch);
>+
> void LoadD32FS8X24ToD32FS8X24(size_t width,
>                               size_t height,
>                               size_t depth,
>@@ -448,6 +468,16 @@ void LoadRGB32FToRGBA16F(size_t width,
>                          size_t outputRowPitch,
>                          size_t outputDepthPitch);
> 
>+void LoadRGB32FToRGB16F(size_t width,
>+                        size_t height,
>+                        size_t depth,
>+                        const uint8_t *input,
>+                        size_t inputRowPitch,
>+                        size_t inputDepthPitch,
>+                        uint8_t *output,
>+                        size_t outputRowPitch,
>+                        size_t outputDepthPitch);
>+
> template <size_t blockWidth, size_t blockHeight, size_t blockSize>
> inline void LoadCompressedToNative(size_t width,
>                                    size_t height,
>@@ -551,6 +581,46 @@ void LoadEACRG11SToRG8(size_t width,
>                        size_t outputRowPitch,
>                        size_t outputDepthPitch);
> 
>+void LoadEACR11ToR16(size_t width,
>+                     size_t height,
>+                     size_t depth,
>+                     const uint8_t *input,
>+                     size_t inputRowPitch,
>+                     size_t inputDepthPitch,
>+                     uint8_t *output,
>+                     size_t outputRowPitch,
>+                     size_t outputDepthPitch);
>+
>+void LoadEACR11SToR16(size_t width,
>+                      size_t height,
>+                      size_t depth,
>+                      const uint8_t *input,
>+                      size_t inputRowPitch,
>+                      size_t inputDepthPitch,
>+                      uint8_t *output,
>+                      size_t outputRowPitch,
>+                      size_t outputDepthPitch);
>+
>+void LoadEACRG11ToRG16(size_t width,
>+                       size_t height,
>+                       size_t depth,
>+                       const uint8_t *input,
>+                       size_t inputRowPitch,
>+                       size_t inputDepthPitch,
>+                       uint8_t *output,
>+                       size_t outputRowPitch,
>+                       size_t outputDepthPitch);
>+
>+void LoadEACRG11SToRG16(size_t width,
>+                        size_t height,
>+                        size_t depth,
>+                        const uint8_t *input,
>+                        size_t inputRowPitch,
>+                        size_t inputDepthPitch,
>+                        uint8_t *output,
>+                        size_t outputRowPitch,
>+                        size_t outputDepthPitch);
>+
> void LoadETC2RGB8ToRGBA8(size_t width,
>                          size_t height,
>                          size_t depth,
>diff --git a/Source/ThirdParty/ANGLE/src/image_util/loadimage_etc.cpp b/Source/ThirdParty/ANGLE/src/image_util/loadimage_etc.cpp
>index 67f73837c08..53edad37d66 100644
>--- a/Source/ThirdParty/ANGLE/src/image_util/loadimage_etc.cpp
>+++ b/Source/ThirdParty/ANGLE/src/image_util/loadimage_etc.cpp
>@@ -53,15 +53,15 @@ static const int kNumPixelsInBlock = 16;
> 
> struct ETC2Block
> {
>-    // Decodes unsigned single or dual channel block to bytes
>-    void decodeAsSingleChannel(uint8_t *dest,
>-                               size_t x,
>-                               size_t y,
>-                               size_t w,
>-                               size_t h,
>-                               size_t destPixelStride,
>-                               size_t destRowPitch,
>-                               bool isSigned) const
>+    // Decodes unsigned single or dual channel ETC2 block to 8-bit color
>+    void decodeAsSingleETC2Channel(uint8_t *dest,
>+                                   size_t x,
>+                                   size_t y,
>+                                   size_t w,
>+                                   size_t h,
>+                                   size_t destPixelStride,
>+                                   size_t destRowPitch,
>+                                   bool isSigned) const
>     {
>         for (size_t j = 0; j < 4 && (y + j) < h; j++)
>         {
>@@ -71,11 +71,40 @@ struct ETC2Block
>                 uint8_t *pixel = row + (i * destPixelStride);
>                 if (isSigned)
>                 {
>-                    *pixel = clampSByte(getSingleChannel(i, j, isSigned));
>+                    *pixel = clampSByte(getSingleETC2Channel(i, j, isSigned));
>                 }
>                 else
>                 {
>-                    *pixel = clampByte(getSingleChannel(i, j, isSigned));
>+                    *pixel = clampByte(getSingleETC2Channel(i, j, isSigned));
>+                }
>+            }
>+        }
>+    }
>+
>+    // Decodes unsigned single or dual channel EAC block to 16-bit color
>+    void decodeAsSingleEACChannel(uint16_t *dest,
>+                                  size_t x,
>+                                  size_t y,
>+                                  size_t w,
>+                                  size_t h,
>+                                  size_t destPixelStride,
>+                                  size_t destRowPitch,
>+                                  bool isSigned) const
>+    {
>+        for (size_t j = 0; j < 4 && (y + j) < h; j++)
>+        {
>+            uint16_t *row = reinterpret_cast<uint16_t *>(reinterpret_cast<uint8_t *>(dest) +
>+                                                         (j * destRowPitch));
>+            for (size_t i = 0; i < 4 && (x + i) < w; i++)
>+            {
>+                uint16_t *pixel = row + (i * destPixelStride);
>+                if (isSigned)
>+                {
>+                    *pixel = renormalizeSignedEAC(getSingleEACChannel(i, j, isSigned));
>+                }
>+                else
>+                {
>+                    *pixel = renormalizeUnsignedEAC(getSingleEACChannel(i, j, isSigned));
>                 }
>             }
>         }
>@@ -171,15 +200,18 @@ struct ETC2Block
>     }
> 
>   private:
>-    union {
>+    union
>+    {
>         // Individual, differential, H and T modes
>         struct
>         {
>-            union {
>+            union
>+            {
>                 // Individual and differential modes
>                 struct
>                 {
>-                    union {
>+                    union
>+                    {
>                         struct  // Individual colors
>                         {
>                             unsigned char R2 : 4;
>@@ -289,7 +321,8 @@ struct ETC2Block
>         // Single channel block
>         struct
>         {
>-            union {
>+            union
>+            {
>                 unsigned char us;
>                 signed char s;
>             } base_codeword;
>@@ -328,6 +361,19 @@ struct ETC2Block
>         return static_cast<signed char>(gl::clamp(value, -128, 127));
>     }
> 
>+    static uint16_t renormalizeUnsignedEAC(int value)
>+    {
>+        // Data is in the range 0 to 2047, clamp it and then scale it to 16-bit
>+        return static_cast<uint16_t>(gl::clamp(value, 0, 2047)) << 5;
>+    }
>+
>+    static int16_t renormalizeSignedEAC(int value)
>+    {
>+        // Data is in the range -1023 to 1023, clamp it and then scale it to 16-bit
>+        // The spec states that -1024 invalid and should be clamped to -1023
>+        return static_cast<int16_t>(gl::clamp(value, -1023, 1023)) * 32;
>+    }
>+
>     static R8G8B8A8 createRGBA(int red, int green, int blue, int alpha)
>     {
>         R8G8B8A8 rgba;
>@@ -489,7 +535,9 @@ struct ETC2Block
>         const int d            = distance[block.Tda << 1 | block.Tdb];
> 
>         const R8G8B8A8 paintColors[4] = {
>-            createRGBA(r1, g1, b1), createRGBA(r2 + d, g2 + d, b2 + d), createRGBA(r2, g2, b2),
>+            createRGBA(r1, g1, b1),
>+            createRGBA(r2 + d, g2 + d, b2 + d),
>+            createRGBA(r2, g2, b2),
>             createRGBA(r2 - d, g2 - d, b2 - d),
>         };
> 
>@@ -536,8 +584,10 @@ struct ETC2Block
>         const int d = distance[(block.Hda << 2) | (block.Hdb << 1) | orderingTrickBit];
> 
>         const R8G8B8A8 paintColors[4] = {
>-            createRGBA(r1 + d, g1 + d, b1 + d), createRGBA(r1 - d, g1 - d, b1 - d),
>-            createRGBA(r2 + d, g2 + d, b2 + d), createRGBA(r2 - d, g2 - d, b2 - d),
>+            createRGBA(r1 + d, g1 + d, b1 + d),
>+            createRGBA(r1 - d, g1 - d, b1 - d),
>+            createRGBA(r2 + d, g2 + d, b2 + d),
>+            createRGBA(r2 - d, g2 - d, b2 - d),
>         };
> 
>         uint8_t *curPixel = dest;
>@@ -1151,7 +1201,8 @@ struct ETC2Block
>         // In ETC opaque punch through formats, index == 2 means transparent pixel.
>         // Thus we don't need to compute its color, just assign it as black.
>         const R8G8B8A8 paintColors[kNumColors] = {
>-            createRGBA(r1, g1, b1), createRGBA(r2 + d, g2 + d, b2 + d),
>+            createRGBA(r1, g1, b1),
>+            createRGBA(r2 + d, g2 + d, b2 + d),
>             nonOpaquePunchThroughAlpha ? createRGBA(0, 0, 0, 0) : createRGBA(r2, g2, b2),
>             createRGBA(r2 - d, g2 - d, b2 - d),
>         };
>@@ -1205,7 +1256,8 @@ struct ETC2Block
>         // In ETC opaque punch through formats, index == 2 means transparent pixel.
>         // Thus we don't need to compute its color, just assign it as black.
>         const R8G8B8A8 paintColors[kNumColors] = {
>-            createRGBA(r1 + d, g1 + d, b1 + d), createRGBA(r1 - d, g1 - d, b1 - d),
>+            createRGBA(r1 + d, g1 + d, b1 + d),
>+            createRGBA(r1 - d, g1 - d, b1 - d),
>             nonOpaquePunchThroughAlpha ? createRGBA(0, 0, 0, 0)
>                                        : createRGBA(r2 + d, g2 + d, b2 + d),
>             createRGBA(r2 - d, g2 - d, b2 - d),
>@@ -1248,7 +1300,7 @@ struct ETC2Block
>         // Planar block doesn't have a color table, fill indices as full
>         int pixelIndices[kNumPixelsInBlock] = {0, 1, 2,  3,  4,  5,  6,  7,
>                                                8, 9, 10, 11, 12, 13, 14, 15};
>-        int pixelIndexCounts[kNumColors] = {1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1};
>+        int pixelIndexCounts[kNumColors]    = {1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1};
> 
>         int minColorIndex, maxColorIndex;
>         selectEndPointPCA(pixelIndexCounts, rgbaBlock, kNumColors, &minColorIndex, &maxColorIndex);
>@@ -1258,7 +1310,14 @@ struct ETC2Block
>     }
> 
>     // Single channel utility functions
>-    int getSingleChannel(size_t x, size_t y, bool isSigned) const
>+    int getSingleEACChannel(size_t x, size_t y, bool isSigned) const
>+    {
>+        int codeword   = isSigned ? u.scblk.base_codeword.s : u.scblk.base_codeword.us;
>+        int multiplier = (u.scblk.multiplier == 0) ? 1 : u.scblk.multiplier * 8;
>+        return codeword * 8 + 4 + getSingleChannelModifier(x, y) * multiplier;
>+    }
>+
>+    int getSingleETC2Channel(size_t x, size_t y, bool isSigned) const
>     {
>         int codeword = isSigned ? u.scblk.base_codeword.s : u.scblk.base_codeword.us;
>         return codeword + getSingleChannelModifier(x, y) * u.scblk.multiplier;
>@@ -1328,8 +1387,8 @@ static const uint8_t DefaultETCAlphaValues[4][4] =
>     { 255, 255, 255, 255 },
>     { 255, 255, 255, 255 },
> };
>-// clang-format on
> 
>+// clang-format on
> void LoadR11EACToR8(size_t width,
>                     size_t height,
>                     size_t depth,
>@@ -1355,8 +1414,8 @@ void LoadR11EACToR8(size_t width,
>                 const ETC2Block *sourceBlock = sourceRow + (x / 4);
>                 uint8_t *destPixels          = destRow + x;
> 
>-                sourceBlock->decodeAsSingleChannel(destPixels, x, y, width, height, 1,
>-                                                   outputRowPitch, isSigned);
>+                sourceBlock->decodeAsSingleETC2Channel(destPixels, x, y, width, height, 1,
>+                                                       outputRowPitch, isSigned);
>             }
>         }
>     }
>@@ -1386,13 +1445,81 @@ void LoadRG11EACToRG8(size_t width,
>             {
>                 uint8_t *destPixelsRed          = destRow + (x * 2);
>                 const ETC2Block *sourceBlockRed = sourceRow + (x / 2);
>-                sourceBlockRed->decodeAsSingleChannel(destPixelsRed, x, y, width, height, 2,
>-                                                      outputRowPitch, isSigned);
>+                sourceBlockRed->decodeAsSingleETC2Channel(destPixelsRed, x, y, width, height, 2,
>+                                                          outputRowPitch, isSigned);
> 
>                 uint8_t *destPixelsGreen          = destPixelsRed + 1;
>                 const ETC2Block *sourceBlockGreen = sourceBlockRed + 1;
>-                sourceBlockGreen->decodeAsSingleChannel(destPixelsGreen, x, y, width, height, 2,
>-                                                        outputRowPitch, isSigned);
>+                sourceBlockGreen->decodeAsSingleETC2Channel(destPixelsGreen, x, y, width, height, 2,
>+                                                            outputRowPitch, isSigned);
>+            }
>+        }
>+    }
>+}
>+
>+void LoadR11EACToR16(size_t width,
>+                     size_t height,
>+                     size_t depth,
>+                     const uint8_t *input,
>+                     size_t inputRowPitch,
>+                     size_t inputDepthPitch,
>+                     uint8_t *output,
>+                     size_t outputRowPitch,
>+                     size_t outputDepthPitch,
>+                     bool isSigned)
>+{
>+    for (size_t z = 0; z < depth; z++)
>+    {
>+        for (size_t y = 0; y < height; y += 4)
>+        {
>+            const ETC2Block *sourceRow =
>+                priv::OffsetDataPointer<ETC2Block>(input, y / 4, z, inputRowPitch, inputDepthPitch);
>+            uint16_t *destRow =
>+                priv::OffsetDataPointer<uint16_t>(output, y, z, outputRowPitch, outputDepthPitch);
>+
>+            for (size_t x = 0; x < width; x += 4)
>+            {
>+                const ETC2Block *sourceBlock = sourceRow + (x / 4);
>+                uint16_t *destPixels         = destRow + x;
>+
>+                sourceBlock->decodeAsSingleEACChannel(destPixels, x, y, width, height, 1,
>+                                                      outputRowPitch, isSigned);
>+            }
>+        }
>+    }
>+}
>+
>+void LoadRG11EACToRG16(size_t width,
>+                       size_t height,
>+                       size_t depth,
>+                       const uint8_t *input,
>+                       size_t inputRowPitch,
>+                       size_t inputDepthPitch,
>+                       uint8_t *output,
>+                       size_t outputRowPitch,
>+                       size_t outputDepthPitch,
>+                       bool isSigned)
>+{
>+    for (size_t z = 0; z < depth; z++)
>+    {
>+        for (size_t y = 0; y < height; y += 4)
>+        {
>+            const ETC2Block *sourceRow =
>+                priv::OffsetDataPointer<ETC2Block>(input, y / 4, z, inputRowPitch, inputDepthPitch);
>+            uint16_t *destRow =
>+                priv::OffsetDataPointer<uint16_t>(output, y, z, outputRowPitch, outputDepthPitch);
>+
>+            for (size_t x = 0; x < width; x += 4)
>+            {
>+                uint16_t *destPixelsRed         = destRow + (x * 2);
>+                const ETC2Block *sourceBlockRed = sourceRow + (x / 2);
>+                sourceBlockRed->decodeAsSingleEACChannel(destPixelsRed, x, y, width, height, 2,
>+                                                         outputRowPitch, isSigned);
>+
>+                uint16_t *destPixelsGreen         = destPixelsRed + 1;
>+                const ETC2Block *sourceBlockGreen = sourceBlockRed + 1;
>+                sourceBlockGreen->decodeAsSingleEACChannel(destPixelsGreen, x, y, width, height, 2,
>+                                                           outputRowPitch, isSigned);
>             }
>         }
>     }
>@@ -1487,7 +1614,7 @@ void LoadETC2RGBA8ToRGBA8(size_t width,
>             for (size_t x = 0; x < width; x += 4)
>             {
>                 const ETC2Block *sourceBlockAlpha = sourceRow + (x / 2);
>-                sourceBlockAlpha->decodeAsSingleChannel(
>+                sourceBlockAlpha->decodeAsSingleETC2Channel(
>                     reinterpret_cast<uint8_t *>(decodedAlphaValues), x, y, width, height, 1, 4,
>                     false);
> 
>@@ -1586,6 +1713,62 @@ void LoadEACRG11SToRG8(size_t width,
>                      outputRowPitch, outputDepthPitch, true);
> }
> 
>+void LoadEACR11ToR16(size_t width,
>+                     size_t height,
>+                     size_t depth,
>+                     const uint8_t *input,
>+                     size_t inputRowPitch,
>+                     size_t inputDepthPitch,
>+                     uint8_t *output,
>+                     size_t outputRowPitch,
>+                     size_t outputDepthPitch)
>+{
>+    LoadR11EACToR16(width, height, depth, input, inputRowPitch, inputDepthPitch, output,
>+                    outputRowPitch, outputDepthPitch, false);
>+}
>+
>+void LoadEACR11SToR16(size_t width,
>+                      size_t height,
>+                      size_t depth,
>+                      const uint8_t *input,
>+                      size_t inputRowPitch,
>+                      size_t inputDepthPitch,
>+                      uint8_t *output,
>+                      size_t outputRowPitch,
>+                      size_t outputDepthPitch)
>+{
>+    LoadR11EACToR16(width, height, depth, input, inputRowPitch, inputDepthPitch, output,
>+                    outputRowPitch, outputDepthPitch, true);
>+}
>+
>+void LoadEACRG11ToRG16(size_t width,
>+                       size_t height,
>+                       size_t depth,
>+                       const uint8_t *input,
>+                       size_t inputRowPitch,
>+                       size_t inputDepthPitch,
>+                       uint8_t *output,
>+                       size_t outputRowPitch,
>+                       size_t outputDepthPitch)
>+{
>+    LoadRG11EACToRG16(width, height, depth, input, inputRowPitch, inputDepthPitch, output,
>+                      outputRowPitch, outputDepthPitch, false);
>+}
>+
>+void LoadEACRG11SToRG16(size_t width,
>+                        size_t height,
>+                        size_t depth,
>+                        const uint8_t *input,
>+                        size_t inputRowPitch,
>+                        size_t inputDepthPitch,
>+                        uint8_t *output,
>+                        size_t outputRowPitch,
>+                        size_t outputDepthPitch)
>+{
>+    LoadRG11EACToRG16(width, height, depth, input, inputRowPitch, inputDepthPitch, output,
>+                      outputRowPitch, outputDepthPitch, true);
>+}
>+
> void LoadETC2RGB8ToRGBA8(size_t width,
>                          size_t height,
>                          size_t depth,
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/AttributeMap.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/AttributeMap.cpp
>index e10d3add7ca..9db71745fed 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/AttributeMap.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/AttributeMap.cpp
>@@ -11,9 +11,7 @@
> namespace egl
> {
> 
>-AttributeMap::AttributeMap()
>-{
>-}
>+AttributeMap::AttributeMap() {}
> 
> AttributeMap::AttributeMap(const AttributeMap &other) = default;
> 
>@@ -39,7 +37,7 @@ EGLAttrib AttributeMap::get(EGLAttrib key) const
> EGLAttrib AttributeMap::get(EGLAttrib key, EGLAttrib defaultValue) const
> {
>     auto iter = mAttributes.find(key);
>-    return (mAttributes.find(key) != mAttributes.end()) ? iter->second : defaultValue;
>+    return (iter != mAttributes.end()) ? iter->second : defaultValue;
> }
> 
> EGLint AttributeMap::getAsInt(EGLAttrib key) const
>@@ -107,4 +105,4 @@ AttributeMap AttributeMap::CreateFromAttribArray(const EGLAttrib *attributes)
>     }
>     return map;
> }
>-}
>+}  // namespace egl
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/AttributeMap.h b/Source/ThirdParty/ANGLE/src/libANGLE/AttributeMap.h
>index eddc1b72d02..0000ecd8174 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/AttributeMap.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/AttributeMap.h
>@@ -7,6 +7,7 @@
> #ifndef LIBANGLE_ATTRIBUTEMAP_H_
> #define LIBANGLE_ATTRIBUTEMAP_H_
> 
>+#include "common/PackedEnums.h"
> 
> #include <EGL/egl.h>
> 
>@@ -25,10 +26,27 @@ class AttributeMap final
> 
>     void insert(EGLAttrib key, EGLAttrib value);
>     bool contains(EGLAttrib key) const;
>+
>     EGLAttrib get(EGLAttrib key) const;
>     EGLAttrib get(EGLAttrib key, EGLAttrib defaultValue) const;
>     EGLint getAsInt(EGLAttrib key) const;
>     EGLint getAsInt(EGLAttrib key, EGLint defaultValue) const;
>+
>+    template <typename PackedEnumT>
>+    PackedEnumT getAsPackedEnum(EGLAttrib key) const
>+    {
>+        return FromEGLenum<PackedEnumT>(static_cast<EGLenum>(get(key)));
>+    }
>+
>+    template <typename PackedEnumT>
>+    PackedEnumT getAsPackedEnum(EGLAttrib key, PackedEnumT defaultValue) const
>+    {
>+        auto iter = mAttributes.find(key);
>+        return (mAttributes.find(key) != mAttributes.end())
>+                   ? FromEGLenum<PackedEnumT>(static_cast<EGLenum>(iter->second))
>+                   : defaultValue;
>+    }
>+
>     bool isEmpty() const;
>     std::vector<EGLint> toIntVector() const;
> 
>@@ -43,7 +61,6 @@ class AttributeMap final
>   private:
>     std::map<EGLAttrib, EGLAttrib> mAttributes;
> };
>+}  // namespace egl
> 
>-}
>-
>-#endif   // LIBANGLE_ATTRIBUTEMAP_H_
>+#endif  // LIBANGLE_ATTRIBUTEMAP_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/BinaryStream.h b/Source/ThirdParty/ANGLE/src/libANGLE/BinaryStream.h
>index 3e4c0934cfb..083cc7bf279 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/BinaryStream.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/BinaryStream.h
>@@ -9,10 +9,10 @@
> #ifndef LIBANGLE_BINARYSTREAM_H_
> #define LIBANGLE_BINARYSTREAM_H_
> 
>+#include <stdint.h>
> #include <cstddef>
> #include <string>
> #include <vector>
>-#include <stdint.h>
> 
> #include "common/angleutils.h"
> #include "common/mathutil.h"
>@@ -25,9 +25,9 @@ class BinaryInputStream : angle::NonCopyable
>   public:
>     BinaryInputStream(const void *data, size_t length)
>     {
>-        mError = false;
>+        mError  = false;
>         mOffset = 0;
>-        mData = static_cast<const uint8_t*>(data);
>+        mData   = static_cast<const uint8_t *>(data);
>         mLength = length;
>     }
> 
>@@ -56,23 +56,30 @@ class BinaryInputStream : angle::NonCopyable
>         }
>     }
> 
>-    bool readBool()
>+    template <class EnumT>
>+    EnumT readEnum()
>     {
>-        int value = 0;
>-        read(&value);
>-        return (value > 0);
>+        using UnderlyingType = typename std::underlying_type<EnumT>::type;
>+        return static_cast<EnumT>(readInt<UnderlyingType>());
>     }
> 
>-    void readBool(bool *outValue)
>+    template <class EnumT>
>+    void readEnum(EnumT *outValue)
>     {
>-        *outValue = readBool();
>+        *outValue = readEnum<EnumT>();
>     }
> 
>-    void readBytes(unsigned char outArray[], size_t count)
>+    bool readBool()
>     {
>-        read<unsigned char>(outArray, count);
>+        int value = 0;
>+        read(&value);
>+        return (value > 0);
>     }
> 
>+    void readBool(bool *outValue) { *outValue = readBool(); }
>+
>+    void readBytes(unsigned char outArray[], size_t count) { read<unsigned char>(outArray, count); }
>+
>     std::string readString()
>     {
>         std::string outString;
>@@ -117,25 +124,18 @@ class BinaryInputStream : angle::NonCopyable
>         mOffset = checkedOffset.ValueOrDie();
>     }
> 
>-    size_t offset() const
>+    size_t offset() const { return mOffset; }
>+    size_t remainingSize() const
>     {
>-        return mOffset;
>+        ASSERT(mLength >= mOffset);
>+        return mLength - mOffset;
>     }
> 
>-    bool error() const
>-    {
>-        return mError;
>-    }
>+    bool error() const { return mError; }
> 
>-    bool endOfStream() const
>-    {
>-        return mOffset == mLength;
>-    }
>+    bool endOfStream() const { return mOffset == mLength; }
> 
>-    const uint8_t *data()
>-    {
>-        return mData;
>-    }
>+    const uint8_t *data() { return mData; }
> 
>   private:
>     bool mError;
>@@ -174,7 +174,6 @@ class BinaryInputStream : angle::NonCopyable
>     {
>         read(v, 1);
>     }
>-
> };
> 
> class BinaryOutputStream : angle::NonCopyable
>@@ -216,26 +215,24 @@ class BinaryOutputStream : angle::NonCopyable
>         }
>     }
> 
>+    template <class EnumT>
>+    void writeEnum(EnumT param)
>+    {
>+        using UnderlyingType = typename std::underlying_type<EnumT>::type;
>+        writeInt<UnderlyingType>(static_cast<UnderlyingType>(param));
>+    }
>+
>     void writeString(const std::string &v)
>     {
>         writeInt(v.length());
>         write(v.c_str(), v.length());
>     }
> 
>-    void writeBytes(const unsigned char *bytes, size_t count)
>-    {
>-        write(bytes, count);
>-    }
>+    void writeBytes(const unsigned char *bytes, size_t count) { write(bytes, count); }
> 
>-    size_t length() const
>-    {
>-        return mData.size();
>-    }
>+    size_t length() const { return mData.size(); }
> 
>-    const void* data() const
>-    {
>-        return mData.size() ? &mData[0] : nullptr;
>-    }
>+    const void *data() const { return mData.size() ? &mData[0] : nullptr; }
> 
>   private:
>     std::vector<char> mData;
>@@ -244,15 +241,12 @@ class BinaryOutputStream : angle::NonCopyable
>     void write(const T *v, size_t num)
>     {
>         static_assert(std::is_fundamental<T>::value, "T must be a fundamental type.");
>-        const char *asBytes = reinterpret_cast<const char*>(v);
>+        const char *asBytes = reinterpret_cast<const char *>(v);
>         mData.insert(mData.end(), asBytes, asBytes + num * sizeof(T));
>     }
>-
> };
> 
>-inline BinaryOutputStream::BinaryOutputStream()
>-{
>-}
>+inline BinaryOutputStream::BinaryOutputStream() {}
> 
> inline BinaryOutputStream::~BinaryOutputStream() = default;
> 
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/BinaryStream_unittest.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/BinaryStream_unittest.cpp
>index 963f4891177..3e9277530fa 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/BinaryStream_unittest.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/BinaryStream_unittest.cpp
>@@ -17,7 +17,7 @@ namespace angle
> TEST(BinaryInputStream, Overflow)
> {
>     const uint8_t goodValue = 2;
>-    const uint8_t badValue = 255;
>+    const uint8_t badValue  = 255;
> 
>     const size_t dataSize = 1024;
>     const size_t slopSize = 1024;
>@@ -28,10 +28,7 @@ TEST(BinaryInputStream, Overflow)
> 
>     std::vector<uint8_t> outputData(dataSize);
> 
>-    auto checkDataIsSafe = [=](uint8_t item)
>-    {
>-        return item == goodValue;
>-    };
>+    auto checkDataIsSafe = [=](uint8_t item) { return item == goodValue; };
> 
>     {
>         // One large read
>@@ -68,4 +65,4 @@ TEST(BinaryInputStream, Overflow)
>         stream.readBytes(outputData.data(), std::numeric_limits<size_t>::max() - dataSize - 2);
>     }
> }
>-}
>+}  // namespace angle
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/BlobCache.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/BlobCache.cpp
>new file mode 100644
>index 00000000000..56720915bda
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/BlobCache.cpp
>@@ -0,0 +1,168 @@
>+//
>+// Copyright 2018 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// BlobCache: Stores keyed blobs in memory to support EGL_ANDROID_blob_cache.
>+// Can be used in conjunction with the platform layer to warm up the cache from
>+// disk.  MemoryProgramCache uses this to handle caching of compiled programs.
>+
>+#include "libANGLE/BlobCache.h"
>+#include "common/utilities.h"
>+#include "common/version.h"
>+#include "libANGLE/Context.h"
>+#include "libANGLE/Display.h"
>+#include "libANGLE/histogram_macros.h"
>+#include "platform/Platform.h"
>+
>+namespace egl
>+{
>+
>+namespace
>+{
>+enum CacheResult
>+{
>+    kCacheMiss,
>+    kCacheHitMemory,
>+    kCacheHitDisk,
>+    kCacheResultMax,
>+};
>+
>+}  // anonymous namespace
>+
>+BlobCache::BlobCache(size_t maxCacheSizeBytes)
>+    : mBlobCache(maxCacheSizeBytes), mSetBlobFunc(nullptr), mGetBlobFunc(nullptr)
>+{}
>+
>+BlobCache::~BlobCache() {}
>+
>+void BlobCache::put(const BlobCache::Key &key, angle::MemoryBuffer &&value)
>+{
>+    if (areBlobCacheFuncsSet())
>+    {
>+        // Store the result in the application's cache
>+        mSetBlobFunc(key.data(), key.size(), value.data(), value.size());
>+    }
>+    else
>+    {
>+        populate(key, std::move(value), CacheSource::Memory);
>+    }
>+}
>+
>+void BlobCache::putApplication(const BlobCache::Key &key, const angle::MemoryBuffer &value)
>+{
>+    if (areBlobCacheFuncsSet())
>+    {
>+        mSetBlobFunc(key.data(), key.size(), value.data(), value.size());
>+    }
>+}
>+
>+void BlobCache::populate(const BlobCache::Key &key, angle::MemoryBuffer &&value, CacheSource source)
>+{
>+    CacheEntry newEntry;
>+    newEntry.first  = std::move(value);
>+    newEntry.second = source;
>+
>+    // Cache it inside blob cache only if caching inside the application is not possible.
>+    mBlobCache.put(key, std::move(newEntry), newEntry.first.size());
>+}
>+
>+bool BlobCache::get(angle::ScratchBuffer *scratchBuffer,
>+                    const BlobCache::Key &key,
>+                    BlobCache::Value *valueOut)
>+{
>+    // Look into the application's cache, if there is such a cache
>+    if (areBlobCacheFuncsSet())
>+    {
>+        EGLsizeiANDROID valueSize = mGetBlobFunc(key.data(), key.size(), nullptr, 0);
>+        if (valueSize <= 0)
>+        {
>+            return false;
>+        }
>+
>+        angle::MemoryBuffer *scratchMemory;
>+        bool result = scratchBuffer->get(valueSize, &scratchMemory);
>+        if (!result)
>+        {
>+            ERR() << "Failed to allocate memory for binary blob";
>+            return false;
>+        }
>+
>+        EGLsizeiANDROID originalValueSize = valueSize;
>+        valueSize = mGetBlobFunc(key.data(), key.size(), scratchMemory->data(), valueSize);
>+
>+        // Make sure the key/value pair still exists/is unchanged after the second call
>+        // (modifications to the application cache by another thread are a possibility)
>+        if (valueSize != originalValueSize)
>+        {
>+            // This warning serves to find issues with the application cache, none of which are
>+            // currently known to be thread-safe.  If such a use ever arises, this WARN can be
>+            // removed.
>+            WARN() << "Binary blob no longer available in cache (removed by a thread?)";
>+            return false;
>+        }
>+
>+        *valueOut = BlobCache::Value(scratchMemory->data(), scratchMemory->size());
>+        return true;
>+    }
>+
>+    // Otherwise we are doing caching internally, so try to find it there
>+    const CacheEntry *entry;
>+    bool result = mBlobCache.get(key, &entry);
>+
>+    if (result)
>+    {
>+        if (entry->second == CacheSource::Memory)
>+        {
>+            ANGLE_HISTOGRAM_ENUMERATION("GPU.ANGLE.ProgramCache.CacheResult", kCacheHitMemory,
>+                                        kCacheResultMax);
>+        }
>+        else
>+        {
>+            ANGLE_HISTOGRAM_ENUMERATION("GPU.ANGLE.ProgramCache.CacheResult", kCacheHitDisk,
>+                                        kCacheResultMax);
>+        }
>+
>+        *valueOut = BlobCache::Value(entry->first.data(), entry->first.size());
>+    }
>+    else
>+    {
>+        ANGLE_HISTOGRAM_ENUMERATION("GPU.ANGLE.ProgramCache.CacheResult", kCacheMiss,
>+                                    kCacheResultMax);
>+    }
>+
>+    return result;
>+}
>+
>+bool BlobCache::getAt(size_t index, const BlobCache::Key **keyOut, BlobCache::Value *valueOut)
>+{
>+    const CacheEntry *valueBuf;
>+    bool result = mBlobCache.getAt(index, keyOut, &valueBuf);
>+    if (result)
>+    {
>+        *valueOut = BlobCache::Value(valueBuf->first.data(), valueBuf->first.size());
>+    }
>+    return result;
>+}
>+
>+void BlobCache::remove(const BlobCache::Key &key)
>+{
>+    bool result = mBlobCache.eraseByKey(key);
>+    ASSERT(result);
>+}
>+
>+void BlobCache::setBlobCacheFuncs(EGLSetBlobFuncANDROID set, EGLGetBlobFuncANDROID get)
>+{
>+    mSetBlobFunc = set;
>+    mGetBlobFunc = get;
>+}
>+
>+bool BlobCache::areBlobCacheFuncsSet() const
>+{
>+    // Either none or both of the callbacks should be set.
>+    ASSERT((mSetBlobFunc != nullptr) == (mGetBlobFunc != nullptr));
>+
>+    return mSetBlobFunc != nullptr && mGetBlobFunc != nullptr;
>+}
>+
>+}  // namespace egl
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/BlobCache.h b/Source/ThirdParty/ANGLE/src/libANGLE/BlobCache.h
>new file mode 100644
>index 00000000000..eec906dadc7
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/BlobCache.h
>@@ -0,0 +1,153 @@
>+//
>+// Copyright 2018 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// BlobCache: Stores compiled and linked programs in memory so they don't
>+//   always have to be re-compiled. Can be used in conjunction with the platform
>+//   layer to warm up the cache from disk.
>+
>+#ifndef LIBANGLE_BLOB_CACHE_H_
>+#define LIBANGLE_BLOB_CACHE_H_
>+
>+#include <array>
>+#include <cstring>
>+
>+#include <anglebase/sha1.h>
>+#include "common/MemoryBuffer.h"
>+#include "common/hash_utils.h"
>+#include "libANGLE/Error.h"
>+#include "libANGLE/SizedMRUCache.h"
>+
>+namespace gl
>+{
>+class Context;
>+}  // namespace gl
>+
>+namespace egl
>+{
>+// 160-bit SHA-1 hash key used for hasing a program.  BlobCache opts in using fixed keys for
>+// simplicity and efficiency.
>+static constexpr size_t kBlobCacheKeyLength = angle::base::kSHA1Length;
>+using BlobCacheKey                          = std::array<uint8_t, kBlobCacheKeyLength>;
>+}  // namespace egl
>+
>+namespace std
>+{
>+template <>
>+struct hash<egl::BlobCacheKey>
>+{
>+    // Simple routine to hash four ints.
>+    size_t operator()(const egl::BlobCacheKey &key) const
>+    {
>+        return angle::ComputeGenericHash(key.data(), key.size());
>+    }
>+};
>+}  // namespace std
>+
>+namespace egl
>+{
>+
>+class BlobCache final : angle::NonCopyable
>+{
>+  public:
>+    // 160-bit SHA-1 hash key used for hasing a program.  BlobCache opts in using fixed keys for
>+    // simplicity and efficiency.
>+    static constexpr size_t kKeyLength = kBlobCacheKeyLength;
>+    using Key                          = BlobCacheKey;
>+    class Value
>+    {
>+      public:
>+        Value() : mPtr(nullptr), mSize(0) {}
>+        Value(const uint8_t *ptr, size_t sz) : mPtr(ptr), mSize(sz) {}
>+
>+        // A very basic struct to hold the pointer and size together.  The objects of this class
>+        // don't own the memory.
>+        const uint8_t *data() { return mPtr; }
>+        size_t size() { return mSize; }
>+
>+        const uint8_t &operator[](size_t pos) const
>+        {
>+            ASSERT(pos < mSize);
>+            return mPtr[pos];
>+        }
>+
>+      private:
>+        const uint8_t *mPtr;
>+        size_t mSize;
>+    };
>+    enum class CacheSource
>+    {
>+        Memory,
>+        Disk,
>+    };
>+
>+    explicit BlobCache(size_t maxCacheSizeBytes);
>+    ~BlobCache();
>+
>+    // Store a key-blob pair in the cache.  If application callbacks are set, the application cache
>+    // will be used.  Otherwise the value is cached in this object.
>+    void put(const BlobCache::Key &key, angle::MemoryBuffer &&value);
>+
>+    // Store a key-blob pair in the application cache, only if application callbacks are set.
>+    void putApplication(const BlobCache::Key &key, const angle::MemoryBuffer &value);
>+
>+    // Store a key-blob pair in the cache without making callbacks to the application.  This is used
>+    // to repopulate this object's cache on startup without generating callback calls.
>+    void populate(const BlobCache::Key &key,
>+                  angle::MemoryBuffer &&value,
>+                  CacheSource source = CacheSource::Disk);
>+
>+    // Check if the cache contains the blob corresponding to this key.  If application callbacks are
>+    // set, those will be used.  Otherwise they key is looked up in this object's cache.
>+    ANGLE_NO_DISCARD bool get(angle::ScratchBuffer *scratchBuffer,
>+                              const BlobCache::Key &key,
>+                              BlobCache::Value *valueOut);
>+
>+    // For querying the contents of the cache.
>+    ANGLE_NO_DISCARD bool getAt(size_t index,
>+                                const BlobCache::Key **keyOut,
>+                                BlobCache::Value *valueOut);
>+
>+    // Evict a blob from the binary cache.
>+    void remove(const BlobCache::Key &key);
>+
>+    // Empty the cache.
>+    void clear() { mBlobCache.clear(); }
>+
>+    // Resize the cache. Discards current contents.
>+    void resize(size_t maxCacheSizeBytes) { mBlobCache.resize(maxCacheSizeBytes); }
>+
>+    // Returns the number of entries in the cache.
>+    size_t entryCount() const { return mBlobCache.entryCount(); }
>+
>+    // Reduces the current cache size and returns the number of bytes freed.
>+    size_t trim(size_t limit) { return mBlobCache.shrinkToSize(limit); }
>+
>+    // Returns the current cache size in bytes.
>+    size_t size() const { return mBlobCache.size(); }
>+
>+    // Returns whether the cache is empty
>+    bool empty() const { return mBlobCache.empty(); }
>+
>+    // Returns the maximum cache size in bytes.
>+    size_t maxSize() const { return mBlobCache.maxSize(); }
>+
>+    void setBlobCacheFuncs(EGLSetBlobFuncANDROID set, EGLGetBlobFuncANDROID get);
>+
>+    bool areBlobCacheFuncsSet() const;
>+
>+    bool isCachingEnabled() const { return areBlobCacheFuncsSet() || maxSize() > 0; }
>+
>+  private:
>+    // This internal cache is used only if the application is not providing caching callbacks
>+    using CacheEntry = std::pair<angle::MemoryBuffer, CacheSource>;
>+    angle::SizedMRUCache<BlobCache::Key, CacheEntry> mBlobCache;
>+
>+    EGLSetBlobFuncANDROID mSetBlobFunc;
>+    EGLGetBlobFuncANDROID mGetBlobFunc;
>+};
>+
>+}  // namespace egl
>+
>+#endif  // LIBANGLE_MEMORY_PROGRAM_CACHE_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/BlobCache_unittest.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/BlobCache_unittest.cpp
>new file mode 100644
>index 00000000000..89f2007778a
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/BlobCache_unittest.cpp
>@@ -0,0 +1,130 @@
>+//
>+// Copyright 2018 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// BlobCache_unittest.h: Unit tests for the blob cache.
>+
>+#include <gtest/gtest.h>
>+
>+#include "libANGLE/BlobCache.h"
>+
>+namespace egl
>+{
>+
>+// Note: this is fairly similar to SizedMRUCache_unittest, and makes sure the
>+// BlobCache usage of SizedMRUCache is not broken.
>+
>+using BlobPut = angle::MemoryBuffer;
>+using Blob    = BlobCache::Value;
>+using Key     = BlobCache::Key;
>+
>+template <typename T>
>+void MakeSequence(T &seq, uint8_t start)
>+{
>+    for (uint8_t i = 0; i < seq.size(); ++i)
>+    {
>+        seq[i] = i + start;
>+    }
>+}
>+
>+BlobPut MakeBlob(size_t size, uint8_t start = 0)
>+{
>+    BlobPut blob;
>+    blob.resize(size);
>+    MakeSequence(blob, start);
>+    return blob;
>+}
>+
>+Key MakeKey(uint8_t start = 0)
>+{
>+    Key key;
>+    MakeSequence(key, start);
>+    return key;
>+}
>+
>+// Test a cache with a value that takes up maximum size.
>+TEST(BlobCacheTest, MaxSizedValue)
>+{
>+    constexpr size_t kSize = 32;
>+    BlobCache blobCache(kSize);
>+
>+    blobCache.populate(MakeKey(0), MakeBlob(kSize));
>+    EXPECT_EQ(32u, blobCache.size());
>+    EXPECT_FALSE(blobCache.empty());
>+
>+    blobCache.populate(MakeKey(1), MakeBlob(kSize));
>+    EXPECT_EQ(32u, blobCache.size());
>+    EXPECT_FALSE(blobCache.empty());
>+
>+    Blob blob;
>+    EXPECT_FALSE(blobCache.get(nullptr, MakeKey(0), &blob));
>+
>+    blobCache.clear();
>+    EXPECT_TRUE(blobCache.empty());
>+}
>+
>+// Test a cache with many small values, that it can handle unlimited inserts.
>+TEST(BlobCacheTest, ManySmallValues)
>+{
>+    constexpr size_t kSize = 32;
>+    BlobCache blobCache(kSize);
>+
>+    for (size_t value = 0; value < kSize; ++value)
>+    {
>+        blobCache.populate(MakeKey(value), MakeBlob(1, value));
>+
>+        Blob qvalue;
>+        EXPECT_TRUE(blobCache.get(nullptr, MakeKey(value), &qvalue));
>+        if (qvalue.size() > 0)
>+        {
>+            EXPECT_EQ(value, qvalue[0]);
>+        }
>+    }
>+
>+    EXPECT_EQ(32u, blobCache.size());
>+    EXPECT_FALSE(blobCache.empty());
>+
>+    // Putting one element evicts the first element.
>+    blobCache.populate(MakeKey(kSize), MakeBlob(1, kSize));
>+
>+    Blob qvalue;
>+    EXPECT_FALSE(blobCache.get(nullptr, MakeKey(0), &qvalue));
>+
>+    // Putting one large element cleans out the whole stack.
>+    blobCache.populate(MakeKey(kSize + 1), MakeBlob(kSize, kSize + 1));
>+    EXPECT_EQ(32u, blobCache.size());
>+    EXPECT_FALSE(blobCache.empty());
>+
>+    for (size_t value = 0; value <= kSize; ++value)
>+    {
>+        EXPECT_FALSE(blobCache.get(nullptr, MakeKey(value), &qvalue));
>+    }
>+    EXPECT_TRUE(blobCache.get(nullptr, MakeKey(kSize + 1), &qvalue));
>+    if (qvalue.size() > 0)
>+    {
>+        EXPECT_EQ(kSize + 1, qvalue[0]);
>+    }
>+
>+    // Put a bunch of items in the cache sequentially.
>+    for (size_t value = 0; value < kSize * 10; ++value)
>+    {
>+        blobCache.populate(MakeKey(value), MakeBlob(1, value));
>+    }
>+
>+    EXPECT_EQ(32u, blobCache.size());
>+}
>+
>+// Tests putting an oversize element.
>+TEST(BlobCacheTest, OversizeValue)
>+{
>+    constexpr size_t kSize = 32;
>+    BlobCache blobCache(kSize);
>+
>+    blobCache.populate(MakeKey(5), MakeBlob(100));
>+
>+    Blob qvalue;
>+    EXPECT_FALSE(blobCache.get(nullptr, MakeKey(5), &qvalue));
>+}
>+
>+}  // namespace egl
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/Buffer.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/Buffer.cpp
>index a1ebfc1acbd..f29e11f3c4f 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/Buffer.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/Buffer.cpp
>@@ -16,6 +16,10 @@
> 
> namespace gl
> {
>+namespace
>+{
>+constexpr angle::SubjectIndex kImplementationSubjectIndex = 0;
>+}  // anonymous namespace
> 
> BufferState::BufferState()
>     : mLabel(),
>@@ -26,17 +30,20 @@ BufferState::BufferState()
>       mMapped(GL_FALSE),
>       mMapPointer(nullptr),
>       mMapOffset(0),
>-      mMapLength(0)
>-{
>-}
>+      mMapLength(0),
>+      mBindingCount(0),
>+      mTransformFeedbackIndexedBindingCount(0),
>+      mTransformFeedbackGenericBindingCount(0)
>+{}
> 
>-BufferState::~BufferState()
>-{
>-}
>+BufferState::~BufferState() {}
> 
> Buffer::Buffer(rx::GLImplFactory *factory, GLuint id)
>-    : RefCountObject(id), mImpl(factory->createBuffer(mState))
>+    : RefCountObject(id),
>+      mImpl(factory->createBuffer(mState)),
>+      mImplObserver(this, kImplementationSubjectIndex)
> {
>+    mImplObserver.bind(mImpl);
> }
> 
> Buffer::~Buffer()
>@@ -44,15 +51,14 @@ Buffer::~Buffer()
>     SafeDelete(mImpl);
> }
> 
>-Error Buffer::onDestroy(const Context *context)
>+void Buffer::onDestroy(const Context *context)
> {
>     // In tests, mImpl might be null.
>     if (mImpl)
>         mImpl->destroy(context);
>-    return NoError();
> }
> 
>-void Buffer::setLabel(const std::string &label)
>+void Buffer::setLabel(const Context *context, const std::string &label)
> {
>     mState.mLabel = label;
> }
>@@ -62,21 +68,22 @@ const std::string &Buffer::getLabel() const
>     return mState.mLabel;
> }
> 
>-Error Buffer::bufferData(const Context *context,
>-                         BufferBinding target,
>-                         const void *data,
>-                         GLsizeiptr size,
>-                         BufferUsage usage)
>+angle::Result Buffer::bufferData(Context *context,
>+                                 BufferBinding target,
>+                                 const void *data,
>+                                 GLsizeiptr size,
>+                                 BufferUsage usage)
> {
>     const void *dataForImpl = data;
> 
>     // If we are using robust resource init, make sure the buffer starts cleared.
>     // Note: the Context is checked for nullptr because of some testing code.
>     // TODO(jmadill): Investigate lazier clearing.
>-    if (context && context->getGLState().isRobustResourceInitEnabled() && !data && size > 0)
>+    if (context && context->getState().isRobustResourceInitEnabled() && !data && size > 0)
>     {
>         angle::MemoryBuffer *scratchBuffer = nullptr;
>-        ANGLE_TRY(context->getZeroFilledBuffer(static_cast<size_t>(size), &scratchBuffer));
>+        ANGLE_CHECK_GL_ALLOC(
>+            context, context->getZeroFilledBuffer(static_cast<size_t>(size), &scratchBuffer));
>         dataForImpl = scratchBuffer->data();
>     }
> 
>@@ -86,37 +93,48 @@ Error Buffer::bufferData(const Context *context,
>     mState.mUsage = usage;
>     mState.mSize  = size;
> 
>-    return NoError();
>+    // Notify when storage changes.
>+    onStateChange(context, angle::SubjectMessage::STORAGE_CHANGED);
>+
>+    return angle::Result::Continue;
> }
> 
>-Error Buffer::bufferSubData(const Context *context,
>-                            BufferBinding target,
>-                            const void *data,
>-                            GLsizeiptr size,
>-                            GLintptr offset)
>+angle::Result Buffer::bufferSubData(const Context *context,
>+                                    BufferBinding target,
>+                                    const void *data,
>+                                    GLsizeiptr size,
>+                                    GLintptr offset)
> {
>     ANGLE_TRY(mImpl->setSubData(context, target, data, size, offset));
> 
>-    mIndexRangeCache.invalidateRange(static_cast<unsigned int>(offset), static_cast<unsigned int>(size));
>+    mIndexRangeCache.invalidateRange(static_cast<unsigned int>(offset),
>+                                     static_cast<unsigned int>(size));
> 
>-    return NoError();
>+    // Notify when data changes.
>+    onStateChange(context, angle::SubjectMessage::CONTENTS_CHANGED);
>+
>+    return angle::Result::Continue;
> }
> 
>-Error Buffer::copyBufferSubData(const Context *context,
>-                                Buffer *source,
>-                                GLintptr sourceOffset,
>-                                GLintptr destOffset,
>-                                GLsizeiptr size)
>+angle::Result Buffer::copyBufferSubData(const Context *context,
>+                                        Buffer *source,
>+                                        GLintptr sourceOffset,
>+                                        GLintptr destOffset,
>+                                        GLsizeiptr size)
> {
>     ANGLE_TRY(
>         mImpl->copySubData(context, source->getImplementation(), sourceOffset, destOffset, size));
> 
>-    mIndexRangeCache.invalidateRange(static_cast<unsigned int>(destOffset), static_cast<unsigned int>(size));
>+    mIndexRangeCache.invalidateRange(static_cast<unsigned int>(destOffset),
>+                                     static_cast<unsigned int>(size));
>+
>+    // Notify when data changes.
>+    onStateChange(context, angle::SubjectMessage::CONTENTS_CHANGED);
> 
>-    return NoError();
>+    return angle::Result::Continue;
> }
> 
>-Error Buffer::map(const Context *context, GLenum access)
>+angle::Result Buffer::map(const Context *context, GLenum access)
> {
>     ASSERT(!mState.mMapped);
> 
>@@ -132,13 +150,16 @@ Error Buffer::map(const Context *context, GLenum access)
>     mState.mAccessFlags = GL_MAP_WRITE_BIT;
>     mIndexRangeCache.clear();
> 
>-    return NoError();
>+    // Notify when state changes.
>+    onStateChange(context, angle::SubjectMessage::RESOURCE_MAPPED);
>+
>+    return angle::Result::Continue;
> }
> 
>-Error Buffer::mapRange(const Context *context,
>-                       GLintptr offset,
>-                       GLsizeiptr length,
>-                       GLbitfield access)
>+angle::Result Buffer::mapRange(const Context *context,
>+                               GLintptr offset,
>+                               GLsizeiptr length,
>+                               GLbitfield access)
> {
>     ASSERT(!mState.mMapped);
>     ASSERT(offset + length <= mState.mSize);
>@@ -159,13 +180,17 @@ Error Buffer::mapRange(const Context *context,
> 
>     if ((access & GL_MAP_WRITE_BIT) > 0)
>     {
>-        mIndexRangeCache.invalidateRange(static_cast<unsigned int>(offset), static_cast<unsigned int>(length));
>+        mIndexRangeCache.invalidateRange(static_cast<unsigned int>(offset),
>+                                         static_cast<unsigned int>(length));
>     }
> 
>-    return NoError();
>+    // Notify when state changes.
>+    onStateChange(context, angle::SubjectMessage::RESOURCE_MAPPED);
>+
>+    return angle::Result::Continue;
> }
> 
>-Error Buffer::unmap(const Context *context, GLboolean *result)
>+angle::Result Buffer::unmap(const Context *context, GLboolean *result)
> {
>     ASSERT(mState.mMapped);
> 
>@@ -179,29 +204,38 @@ Error Buffer::unmap(const Context *context, GLboolean *result)
>     mState.mAccess      = GL_WRITE_ONLY_OES;
>     mState.mAccessFlags = 0;
> 
>-    return NoError();
>+    // Notify when data changes.
>+    onStateChange(context, angle::SubjectMessage::RESOURCE_UNMAPPED);
>+
>+    return angle::Result::Continue;
> }
> 
>-void Buffer::onTransformFeedback()
>+void Buffer::onTransformFeedback(const Context *context)
> {
>     mIndexRangeCache.clear();
>+
>+    // Notify when data changes.
>+    onStateChange(context, angle::SubjectMessage::CONTENTS_CHANGED);
> }
> 
>-void Buffer::onPixelUnpack()
>+void Buffer::onPixelPack(const Context *context)
> {
>     mIndexRangeCache.clear();
>+
>+    // Notify when data changes.
>+    onStateChange(context, angle::SubjectMessage::CONTENTS_CHANGED);
> }
> 
>-Error Buffer::getIndexRange(const gl::Context *context,
>-                            GLenum type,
>-                            size_t offset,
>-                            size_t count,
>-                            bool primitiveRestartEnabled,
>-                            IndexRange *outRange) const
>+angle::Result Buffer::getIndexRange(const gl::Context *context,
>+                                    DrawElementsType type,
>+                                    size_t offset,
>+                                    size_t count,
>+                                    bool primitiveRestartEnabled,
>+                                    IndexRange *outRange) const
> {
>     if (mIndexRangeCache.findRange(type, offset, count, primitiveRestartEnabled, outRange))
>     {
>-        return NoError();
>+        return angle::Result::Continue;
>     }
> 
>     ANGLE_TRY(
>@@ -209,7 +243,43 @@ Error Buffer::getIndexRange(const gl::Context *context,
> 
>     mIndexRangeCache.addRange(type, offset, count, primitiveRestartEnabled, *outRange);
> 
>-    return NoError();
>+    return angle::Result::Continue;
> }
> 
>+GLint64 Buffer::getMemorySize() const
>+{
>+    GLint64 implSize = mImpl->getMemorySize();
>+    return implSize > 0 ? implSize : mState.mSize;
>+}
>+
>+bool Buffer::isDoubleBoundForTransformFeedback() const
>+{
>+    return mState.mTransformFeedbackIndexedBindingCount > 1;
>+}
>+
>+void Buffer::onTFBindingChanged(const Context *context, bool bound, bool indexed)
>+{
>+    ASSERT(bound || mState.mBindingCount > 0);
>+    mState.mBindingCount += bound ? 1 : -1;
>+    if (indexed)
>+    {
>+        ASSERT(bound || mState.mTransformFeedbackIndexedBindingCount > 0);
>+        mState.mTransformFeedbackIndexedBindingCount += bound ? 1 : -1;
>+
>+        onStateChange(context, angle::SubjectMessage::BINDING_CHANGED);
>+    }
>+    else
>+    {
>+        mState.mTransformFeedbackGenericBindingCount += bound ? 1 : -1;
>+    }
>+}
>+
>+void Buffer::onSubjectStateChange(const gl::Context *context,
>+                                  angle::SubjectIndex index,
>+                                  angle::SubjectMessage message)
>+{
>+    // Pass it along!
>+    ASSERT(index == kImplementationSubjectIndex);
>+    onStateChange(context, message);
>+}
> }  // namespace gl
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/Buffer.h b/Source/ThirdParty/ANGLE/src/libANGLE/Buffer.h
>index 86d4a9fd6f0..cd5ab187a99 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/Buffer.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/Buffer.h
>@@ -11,18 +11,19 @@
> #ifndef LIBANGLE_BUFFER_H_
> #define LIBANGLE_BUFFER_H_
> 
>+#include "common/PackedEnums.h"
> #include "common/angleutils.h"
> #include "libANGLE/Debug.h"
> #include "libANGLE/Error.h"
> #include "libANGLE/IndexRangeCache.h"
>-#include "libANGLE/PackedGLEnums.h"
>+#include "libANGLE/Observer.h"
> #include "libANGLE/RefCountObject.h"
> 
> namespace rx
> {
> class BufferImpl;
> class GLImplFactory;
>-};
>+}  // namespace rx
> 
> namespace gl
> {
>@@ -35,8 +36,6 @@ class BufferState final : angle::NonCopyable
>     BufferState();
>     ~BufferState();
> 
>-    const std::string &getLabel();
>-
>     BufferUsage getUsage() const { return mUsage; }
>     GLbitfield getAccessFlags() const { return mAccessFlags; }
>     GLenum getAccess() const { return mAccess; }
>@@ -59,46 +58,56 @@ class BufferState final : angle::NonCopyable
>     void *mMapPointer;
>     GLint64 mMapOffset;
>     GLint64 mMapLength;
>+    int mBindingCount;
>+    int mTransformFeedbackIndexedBindingCount;
>+    int mTransformFeedbackGenericBindingCount;
> };
> 
>-class Buffer final : public RefCountObject, public LabeledObject
>+class Buffer final : public RefCountObject,
>+                     public LabeledObject,
>+                     public angle::ObserverInterface,
>+                     public angle::Subject
> {
>   public:
>     Buffer(rx::GLImplFactory *factory, GLuint id);
>     ~Buffer() override;
>-    Error onDestroy(const Context *context) override;
>+    void onDestroy(const Context *context) override;
> 
>-    void setLabel(const std::string &label) override;
>+    void setLabel(const Context *context, const std::string &label) override;
>     const std::string &getLabel() const override;
> 
>-    Error bufferData(const Context *context,
>-                     BufferBinding target,
>-                     const void *data,
>-                     GLsizeiptr size,
>-                     BufferUsage usage);
>-    Error bufferSubData(const Context *context,
>-                        BufferBinding target,
>-                        const void *data,
>-                        GLsizeiptr size,
>-                        GLintptr offset);
>-    Error copyBufferSubData(const Context *context,
>-                            Buffer *source,
>-                            GLintptr sourceOffset,
>-                            GLintptr destOffset,
>-                            GLsizeiptr size);
>-    Error map(const Context *context, GLenum access);
>-    Error mapRange(const Context *context, GLintptr offset, GLsizeiptr length, GLbitfield access);
>-    Error unmap(const Context *context, GLboolean *result);
>-
>-    void onTransformFeedback();
>-    void onPixelUnpack();
>-
>-    Error getIndexRange(const gl::Context *context,
>-                        GLenum type,
>-                        size_t offset,
>-                        size_t count,
>-                        bool primitiveRestartEnabled,
>-                        IndexRange *outRange) const;
>+    angle::Result bufferData(Context *context,
>+                             BufferBinding target,
>+                             const void *data,
>+                             GLsizeiptr size,
>+                             BufferUsage usage);
>+    angle::Result bufferSubData(const Context *context,
>+                                BufferBinding target,
>+                                const void *data,
>+                                GLsizeiptr size,
>+                                GLintptr offset);
>+    angle::Result copyBufferSubData(const Context *context,
>+                                    Buffer *source,
>+                                    GLintptr sourceOffset,
>+                                    GLintptr destOffset,
>+                                    GLsizeiptr size);
>+    angle::Result map(const Context *context, GLenum access);
>+    angle::Result mapRange(const Context *context,
>+                           GLintptr offset,
>+                           GLsizeiptr length,
>+                           GLbitfield access);
>+    angle::Result unmap(const Context *context, GLboolean *result);
>+
>+    // These are called when another operation changes Buffer data.
>+    void onTransformFeedback(const Context *context);
>+    void onPixelPack(const Context *context);
>+
>+    angle::Result getIndexRange(const gl::Context *context,
>+                                DrawElementsType type,
>+                                size_t offset,
>+                                size_t count,
>+                                bool primitiveRestartEnabled,
>+                                IndexRange *outRange) const;
> 
>     BufferUsage getUsage() const { return mState.mUsage; }
>     GLbitfield getAccessFlags() const { return mState.mAccessFlags; }
>@@ -108,12 +117,36 @@ class Buffer final : public RefCountObject, public LabeledObject
>     GLint64 getMapOffset() const { return mState.mMapOffset; }
>     GLint64 getMapLength() const { return mState.mMapLength; }
>     GLint64 getSize() const { return mState.mSize; }
>+    GLint64 getMemorySize() const;
> 
>     rx::BufferImpl *getImplementation() const { return mImpl; }
> 
>+    ANGLE_INLINE bool isBound() const { return mState.mBindingCount > 0; }
>+
>+    ANGLE_INLINE bool isBoundForTransformFeedbackAndOtherUse() const
>+    {
>+        // The transform feedback generic binding point is not an indexed binding point but it also
>+        // does not count as a non-transform-feedback use of the buffer, so we subtract it from the
>+        // binding count when checking if the buffer is bound to a non-transform-feedback location.
>+        // See https://crbug.com/853978
>+        return mState.mTransformFeedbackIndexedBindingCount > 0 &&
>+               mState.mTransformFeedbackIndexedBindingCount !=
>+                   mState.mBindingCount - mState.mTransformFeedbackGenericBindingCount;
>+    }
>+
>+    bool isDoubleBoundForTransformFeedback() const;
>+    void onTFBindingChanged(const Context *context, bool bound, bool indexed);
>+    void onNonTFBindingChanged(int incr) { mState.mBindingCount += incr; }
>+
>+    // angle::ObserverInterface implementation.
>+    void onSubjectStateChange(const gl::Context *context,
>+                              angle::SubjectIndex index,
>+                              angle::SubjectMessage message) override;
>+
>   private:
>     BufferState mState;
>     rx::BufferImpl *mImpl;
>+    angle::ObserverBinding mImplObserver;
> 
>     mutable IndexRangeCache mIndexRangeCache;
> };
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/Caps.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/Caps.cpp
>index 44da2bbe271..7ef958e8f03 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/Caps.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/Caps.cpp
>@@ -6,8 +6,8 @@
> 
> #include "libANGLE/Caps.h"
> 
>-#include "common/debug.h"
> #include "common/angleutils.h"
>+#include "common/debug.h"
> 
> #include "libANGLE/formatutils.h"
> 
>@@ -16,7 +16,9 @@
> #include <algorithm>
> #include <sstream>
> 
>-static void InsertExtensionString(const std::string &extension, bool supported, std::vector<std::string> *extensionVector)
>+static void InsertExtensionString(const std::string &extension,
>+                                  bool supported,
>+                                  std::vector<std::string> *extensionVector)
> {
>     if (supported)
>     {
>@@ -30,10 +32,10 @@ namespace gl
> TextureCaps::TextureCaps()
>     : texturable(false),
>       filterable(false),
>-      renderable(false),
>+      textureAttachment(false),
>+      renderbuffer(false),
>       sampleCounts()
>-{
>-}
>+{}
> 
> TextureCaps::TextureCaps(const TextureCaps &other) = default;
> 
>@@ -70,9 +72,10 @@ TextureCaps GenerateMinimumTextureCaps(GLenum sizedInternalFormat,
>     TextureCaps caps;
> 
>     const InternalFormat &internalFormatInfo = GetSizedInternalFormatInfo(sizedInternalFormat);
>-    caps.texturable = internalFormatInfo.textureSupport(clientVersion, extensions);
>-    caps.renderable = internalFormatInfo.renderSupport(clientVersion, extensions);
>-    caps.filterable = internalFormatInfo.filterSupport(clientVersion, extensions);
>+    caps.texturable        = internalFormatInfo.textureSupport(clientVersion, extensions);
>+    caps.filterable        = internalFormatInfo.filterSupport(clientVersion, extensions);
>+    caps.textureAttachment = internalFormatInfo.textureAttachmentSupport(clientVersion, extensions);
>+    caps.renderbuffer      = internalFormatInfo.renderbufferSupport(clientVersion, extensions);
> 
>     caps.sampleCounts.insert(0);
>     if (internalFormatInfo.isRequiredRenderbufferFormat(clientVersion))
>@@ -88,18 +91,14 @@ TextureCaps GenerateMinimumTextureCaps(GLenum sizedInternalFormat,
>     return caps;
> }
> 
>-TextureCapsMap::TextureCapsMap()
>-{
>-}
>+TextureCapsMap::TextureCapsMap() {}
> 
>-TextureCapsMap::~TextureCapsMap()
>-{
>-}
>+TextureCapsMap::~TextureCapsMap() {}
> 
> void TextureCapsMap::insert(GLenum internalFormat, const TextureCaps &caps)
> {
>-    angle::Format::ID formatID = angle::Format::InternalFormatToID(internalFormat);
>-    get(formatID)              = caps;
>+    angle::FormatID formatID = angle::Format::InternalFormatToID(internalFormat);
>+    get(formatID)            = caps;
> }
> 
> void TextureCapsMap::clear()
>@@ -109,21 +108,21 @@ void TextureCapsMap::clear()
> 
> const TextureCaps &TextureCapsMap::get(GLenum internalFormat) const
> {
>-    angle::Format::ID formatID = angle::Format::InternalFormatToID(internalFormat);
>+    angle::FormatID formatID = angle::Format::InternalFormatToID(internalFormat);
>     return get(formatID);
> }
> 
>-const TextureCaps &TextureCapsMap::get(angle::Format::ID formatID) const
>+const TextureCaps &TextureCapsMap::get(angle::FormatID formatID) const
> {
>     return mFormatData[static_cast<size_t>(formatID)];
> }
> 
>-TextureCaps &TextureCapsMap::get(angle::Format::ID formatID)
>+TextureCaps &TextureCapsMap::get(angle::FormatID formatID)
> {
>     return mFormatData[static_cast<size_t>(formatID)];
> }
> 
>-void TextureCapsMap::set(angle::Format::ID formatID, const TextureCaps &caps)
>+void TextureCapsMap::set(angle::FormatID formatID, const TextureCaps &caps)
> {
>     get(formatID) = caps;
> }
>@@ -161,7 +160,19 @@ Extensions::Extensions()
>       textureCompressionS3TCsRGB(false),
>       textureCompressionASTCHDR(false),
>       textureCompressionASTCLDR(false),
>+      textureCompressionBPTC(false),
>       compressedETC1RGB8Texture(false),
>+      compressedETC2RGB8Texture(false),
>+      compressedETC2sRGB8Texture(false),
>+      compressedETC2PunchthroughARGB8Texture(false),
>+      compressedETC2PunchthroughAsRGB8AlphaTexture(false),
>+      compressedETC2RGBA8Texture(false),
>+      compressedETC2sRGB8Alpha8Texture(false),
>+      compressedEACR11UnsignedTexture(false),
>+      compressedEACR11SignedTexture(false),
>+      compressedEACRG11UnsignedTexture(false),
>+      compressedEACRG11SignedTexture(false),
>+      compressedTextureETC(false),
>       sRGB(false),
>       depthTextures(false),
>       depth32(false),
>@@ -180,12 +191,13 @@ Extensions::Extensions()
>       blendMinMax(false),
>       framebufferBlit(false),
>       framebufferMultisample(false),
>-      instancedArrays(false),
>+      instancedArraysANGLE(false),
>+      instancedArraysEXT(false),
>       packReverseRowOrder(false),
>       standardDerivatives(false),
>       shaderTextureLOD(false),
>       fragDepth(false),
>-      multiview(false),
>+      multiview2(false),
>       maxViews(1u),
>       textureUsage(false),
>       translatedShaderSource(false),
>@@ -195,6 +207,11 @@ Extensions::Extensions()
>       eglImage(false),
>       eglImageExternal(false),
>       eglImageExternalEssl3(false),
>+      eglSync(false),
>+      memoryObject(false),
>+      memoryObjectFd(false),
>+      semaphore(false),
>+      semaphoreFd(false),
>       eglStreamConsumerExternal(false),
>       unpackSubimage(false),
>       packSubimage(false),
>@@ -210,10 +227,12 @@ Extensions::Extensions()
>       syncQuery(false),
>       copyTexture(false),
>       copyCompressedTexture(false),
>+      copyTexture3d(false),
>       webglCompatibility(false),
>       requestExtension(false),
>       bindGeneratesResource(false),
>       robustClientMemory(false),
>+      textureBorderClamp(false),
>       textureSRGBDecode(false),
>       sRGBWriteControl(false),
>       colorBufferFloatRGB(false),
>@@ -229,10 +248,24 @@ Extensions::Extensions()
>       programCacheControl(false),
>       textureRectangle(false),
>       geometryShader(false),
>-      maxGeometryOutputVertices(0),
>-      maxGeometryShaderInvocations(0)
>-{
>-}
>+      pointSizeArray(false),
>+      textureCubeMap(false),
>+      pointSprite(false),
>+      drawTexture(false),
>+      explicitContextGles1(false),
>+      explicitContext(false),
>+      parallelShaderCompile(false),
>+      textureStorageMultisample2DArray(false),
>+      multiviewMultisample(false),
>+      blendFuncExtended(false),
>+      maxDualSourceDrawBuffers(0),
>+      floatBlend(false),
>+      memorySize(false),
>+      textureMultisample(false),
>+      multiDraw(false)
>+{}
>+
>+Extensions::Extensions(const Extensions &other) = default;
> 
> std::vector<std::string> Extensions::getStrings() const
> {
>@@ -255,16 +288,18 @@ Limitations::Limitations()
>       attributeZeroRequiresZeroDivisorInEXT(false),
>       noSeparateStencilRefsAndMasks(false),
>       shadersRequireIndexedLoopValidation(false),
>-      noSimultaneousConstantColorAndAlphaBlendFunc(false)
>-{
>-}
>+      noSimultaneousConstantColorAndAlphaBlendFunc(false),
>+      noFlexibleVaryingPacking(false),
>+      noDoubleBoundTransformFeedbackBuffers(false)
>+{}
> 
> static bool GetFormatSupportBase(const TextureCapsMap &textureCaps,
>                                  const GLenum *requiredFormats,
>                                  size_t requiredFormatsSize,
>                                  bool requiresTexturing,
>                                  bool requiresFiltering,
>-                                 bool requiresRendering)
>+                                 bool requiresAttachingTexture,
>+                                 bool requiresRenderbufferSupport)
> {
>     for (size_t i = 0; i < requiredFormatsSize; i++)
>     {
>@@ -280,7 +315,12 @@ static bool GetFormatSupportBase(const TextureCapsMap &textureCaps,
>             return false;
>         }
> 
>-        if (requiresRendering && !cap.renderable)
>+        if (requiresAttachingTexture && !cap.textureAttachment)
>+        {
>+            return false;
>+        }
>+
>+        if (requiresRenderbufferSupport && !cap.renderbuffer)
>         {
>             return false;
>         }
>@@ -294,10 +334,12 @@ static bool GetFormatSupport(const TextureCapsMap &textureCaps,
>                              const GLenum (&requiredFormats)[N],
>                              bool requiresTexturing,
>                              bool requiresFiltering,
>-                             bool requiresRendering)
>+                             bool requiresAttachingTexture,
>+                             bool requiresRenderbufferSupport)
> {
>     return GetFormatSupportBase(textureCaps, requiredFormats, N, requiresTexturing,
>-                                requiresFiltering, requiresRendering);
>+                                requiresFiltering, requiresAttachingTexture,
>+                                requiresRenderbufferSupport);
> }
> 
> // Check for GL_OES_packed_depth_stencil
>@@ -307,17 +349,18 @@ static bool DeterminePackedDepthStencilSupport(const TextureCapsMap &textureCaps
>         GL_DEPTH24_STENCIL8,
>     };
> 
>-    return GetFormatSupport(textureCaps, requiredFormats, false, false, true);
>+    return GetFormatSupport(textureCaps, requiredFormats, false, false, true, true);
> }
> 
> // Checks for GL_OES_rgb8_rgba8 support
> static bool DetermineRGB8AndRGBA8TextureSupport(const TextureCapsMap &textureCaps)
> {
>     constexpr GLenum requiredFormats[] = {
>-        GL_RGB8, GL_RGBA8,
>+        GL_RGB8,
>+        GL_RGBA8,
>     };
> 
>-    return GetFormatSupport(textureCaps, requiredFormats, true, true, true);
>+    return GetFormatSupport(textureCaps, requiredFormats, false, false, false, true);
> }
> 
> // Checks for GL_EXT_texture_format_BGRA8888 support
>@@ -327,104 +370,104 @@ static bool DetermineBGRA8TextureSupport(const TextureCapsMap &textureCaps)
>         GL_BGRA8_EXT,
>     };
> 
>-    return GetFormatSupport(textureCaps, requiredFormats, true, true, true);
>+    return GetFormatSupport(textureCaps, requiredFormats, true, true, true, true);
> }
> 
> // Checks for GL_OES_color_buffer_half_float support
> static bool DetermineColorBufferHalfFloatSupport(const TextureCapsMap &textureCaps)
> {
>+    // EXT_color_buffer_half_float issue #2 states that an implementation doesn't need to support
>+    // rendering to any of the formats but is expected to be able to render to at least one. WebGL
>+    // requires that at least RGBA16F is renderable so we make the same requirement.
>     constexpr GLenum requiredFormats[] = {
>-        GL_RGBA16F, GL_RGB16F, GL_RG16F, GL_R16F,
>+        GL_RGBA16F,
>     };
> 
>-    return GetFormatSupport(textureCaps, requiredFormats, true, false, true);
>+    return GetFormatSupport(textureCaps, requiredFormats, false, false, true, true);
> }
> 
> // Checks for GL_OES_texture_half_float support
> static bool DetermineHalfFloatTextureSupport(const TextureCapsMap &textureCaps)
> {
>     constexpr GLenum requiredFormats[] = {
>-        GL_RGB16F, GL_RGBA16F,
>+        GL_RGBA16F, GL_RGB16F, GL_LUMINANCE_ALPHA16F_EXT, GL_LUMINANCE16F_EXT, GL_ALPHA16F_EXT,
>     };
> 
>-    return GetFormatSupport(textureCaps, requiredFormats, true, false, false);
>+    return GetFormatSupport(textureCaps, requiredFormats, true, false, false, false);
> }
> 
> // Checks for GL_OES_texture_half_float_linear support
> static bool DetermineHalfFloatTextureFilteringSupport(const TextureCapsMap &textureCaps)
> {
>     constexpr GLenum requiredFormats[] = {
>-        GL_RGB16F, GL_RGBA16F,
>+        GL_RGBA16F, GL_RGB16F, GL_LUMINANCE_ALPHA16F_EXT, GL_LUMINANCE16F_EXT, GL_ALPHA16F_EXT,
>     };
> 
>-    return DetermineHalfFloatTextureSupport(textureCaps) &&
>-           GetFormatSupport(textureCaps, requiredFormats, true, true, false);
>+    return GetFormatSupport(textureCaps, requiredFormats, false, true, false, false);
> }
> 
> // Checks for GL_OES_texture_float support
> static bool DetermineFloatTextureSupport(const TextureCapsMap &textureCaps)
> {
>     constexpr GLenum requiredFormats[] = {
>-        GL_RGB32F, GL_RGBA32F,
>+        GL_RGBA32F, GL_RGB32F, GL_LUMINANCE_ALPHA32F_EXT, GL_LUMINANCE32F_EXT, GL_ALPHA32F_EXT,
>     };
> 
>-    return GetFormatSupport(textureCaps, requiredFormats, true, false, false);
>+    return GetFormatSupport(textureCaps, requiredFormats, true, false, false, false);
> }
> 
> // Checks for GL_OES_texture_float_linear support
> static bool DetermineFloatTextureFilteringSupport(const TextureCapsMap &textureCaps)
> {
>     constexpr GLenum requiredFormats[] = {
>-        GL_RGB32F, GL_RGBA32F,
>+        GL_RGBA32F, GL_RGB32F, GL_LUMINANCE_ALPHA32F_EXT, GL_LUMINANCE32F_EXT, GL_ALPHA32F_EXT,
>     };
> 
>-    return DetermineFloatTextureSupport(textureCaps) &&
>-           GetFormatSupport(textureCaps, requiredFormats, true, true, false);
>+    return GetFormatSupport(textureCaps, requiredFormats, false, true, false, false);
> }
> 
> // Checks for GL_EXT_texture_rg support
>-static bool DetermineRGHalfFloatTextureSupport(const TextureCapsMap &textureCaps)
>+static bool DetermineRGTextureSupport(const TextureCapsMap &textureCaps,
>+                                      bool checkHalfFloatFormats,
>+                                      bool checkFloatFormats)
> {
>     constexpr GLenum requiredFormats[] = {
>-        GL_R16F, GL_RG16F,
>+        GL_R8,
>+        GL_RG8,
>     };
>-    return GetFormatSupport(textureCaps, requiredFormats, true, true, false);
>-}
>-
>-static bool DetermineRGFloatTextureSupport(const TextureCapsMap &textureCaps)
>-{
>-    constexpr GLenum requiredFormats[] = {
>-        GL_R32F, GL_RG32F,
>+    constexpr GLenum requiredHalfFloatFormats[] = {
>+        GL_R16F,
>+        GL_RG16F,
>+    };
>+    constexpr GLenum requiredFloatFormats[] = {
>+        GL_R32F,
>+        GL_RG32F,
>     };
>-    return GetFormatSupport(textureCaps, requiredFormats, true, true, false);
>-}
> 
>-static bool DetermineRGTextureSupport(const TextureCapsMap &textureCaps, bool checkHalfFloatFormats, bool checkFloatFormats)
>-{
>-    if (checkHalfFloatFormats && !DetermineRGHalfFloatTextureSupport(textureCaps))
>+    if (checkHalfFloatFormats &&
>+        !GetFormatSupport(textureCaps, requiredHalfFloatFormats, true, false, false, false))
>     {
>         return false;
>     }
> 
>-    if (checkFloatFormats && !DetermineRGFloatTextureSupport(textureCaps))
>+    if (checkFloatFormats &&
>+        !GetFormatSupport(textureCaps, requiredFloatFormats, true, false, false, false))
>     {
>         return false;
>     }
> 
>-    constexpr GLenum requiredFormats[] = {
>-        GL_R8, GL_RG8,
>-    };
>-    return GetFormatSupport(textureCaps, requiredFormats, true, true, false);
>+    return GetFormatSupport(textureCaps, requiredFormats, true, true, true, true);
> }
> 
> // Check for GL_EXT_texture_compression_dxt1
> static bool DetermineDXT1TextureSupport(const TextureCapsMap &textureCaps)
> {
>     constexpr GLenum requiredFormats[] = {
>-        GL_COMPRESSED_RGB_S3TC_DXT1_EXT, GL_COMPRESSED_RGBA_S3TC_DXT1_EXT,
>+        GL_COMPRESSED_RGB_S3TC_DXT1_EXT,
>+        GL_COMPRESSED_RGBA_S3TC_DXT1_EXT,
>     };
> 
>-    return GetFormatSupport(textureCaps, requiredFormats, true, true, false);
>+    return GetFormatSupport(textureCaps, requiredFormats, true, true, false, false);
> }
> 
> // Check for GL_ANGLE_texture_compression_dxt3
>@@ -434,7 +477,7 @@ static bool DetermineDXT3TextureSupport(const TextureCapsMap &textureCaps)
>         GL_COMPRESSED_RGBA_S3TC_DXT3_ANGLE,
>     };
> 
>-    return GetFormatSupport(textureCaps, requiredFormats, true, true, false);
>+    return GetFormatSupport(textureCaps, requiredFormats, true, true, false, false);
> }
> 
> // Check for GL_ANGLE_texture_compression_dxt5
>@@ -444,18 +487,20 @@ static bool DetermineDXT5TextureSupport(const TextureCapsMap &textureCaps)
>         GL_COMPRESSED_RGBA_S3TC_DXT5_ANGLE,
>     };
> 
>-    return GetFormatSupport(textureCaps, requiredFormats, true, true, false);
>+    return GetFormatSupport(textureCaps, requiredFormats, true, true, false, false);
> }
> 
> // Check for GL_EXT_texture_compression_s3tc_srgb
> static bool DetermineS3TCsRGBTextureSupport(const TextureCapsMap &textureCaps)
> {
>     constexpr GLenum requiredFormats[] = {
>-        GL_COMPRESSED_SRGB_S3TC_DXT1_EXT, GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT1_EXT,
>-        GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT3_EXT, GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT5_EXT,
>+        GL_COMPRESSED_SRGB_S3TC_DXT1_EXT,
>+        GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT1_EXT,
>+        GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT3_EXT,
>+        GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT5_EXT,
>     };
> 
>-    return GetFormatSupport(textureCaps, requiredFormats, true, true, false);
>+    return GetFormatSupport(textureCaps, requiredFormats, true, true, false, false);
> }
> 
> // Check for GL_KHR_texture_compression_astc_hdr and GL_KHR_texture_compression_astc_ldr
>@@ -478,7 +523,7 @@ static bool DetermineASTCTextureSupport(const TextureCapsMap &textureCaps)
>         GL_COMPRESSED_SRGB8_ALPHA8_ASTC_12x10_KHR, GL_COMPRESSED_SRGB8_ALPHA8_ASTC_12x12_KHR,
>     };
> 
>-    return GetFormatSupport(textureCaps, requiredFormats, true, true, false);
>+    return GetFormatSupport(textureCaps, requiredFormats, true, true, false, false);
> }
> 
> // Check for GL_ETC1_RGB8_OES
>@@ -488,32 +533,135 @@ static bool DetermineETC1RGB8TextureSupport(const TextureCapsMap &textureCaps)
>         GL_ETC1_RGB8_OES,
>     };
> 
>-    return GetFormatSupport(textureCaps, requiredFormats, true, true, false);
>+    return GetFormatSupport(textureCaps, requiredFormats, true, true, false, false);
> }
> 
>-// Check for GL_ANGLE_texture_compression_dxt5
>+// Check for OES_compressed_ETC2_RGB8_texture
>+static bool DetermineETC2RGB8TextureSupport(const TextureCapsMap &textureCaps)
>+{
>+    constexpr GLenum requiredFormats[] = {
>+        GL_COMPRESSED_RGB8_ETC2,
>+    };
>+
>+    return GetFormatSupport(textureCaps, requiredFormats, true, true, false, false);
>+}
>+
>+// Check for OES_compressed_ETC2_sRGB8_texture
>+static bool DetermineETC2sRGB8TextureSupport(const TextureCapsMap &textureCaps)
>+{
>+    constexpr GLenum requiredFormats[] = {
>+        GL_COMPRESSED_SRGB8_ETC2,
>+    };
>+
>+    return GetFormatSupport(textureCaps, requiredFormats, true, true, false, false);
>+}
>+
>+// Check for OES_compressed_ETC2_punchthroughA_RGBA8_texture
>+static bool DetermineETC2PunchthroughARGB8TextureSupport(const TextureCapsMap &textureCaps)
>+{
>+    constexpr GLenum requiredFormats[] = {
>+        GL_COMPRESSED_RGB8_PUNCHTHROUGH_ALPHA1_ETC2,
>+    };
>+
>+    return GetFormatSupport(textureCaps, requiredFormats, true, true, false, false);
>+}
>+
>+// Check for OES_compressed_ETC2_punchthroughA_sRGB8_alpha_texture
>+static bool DetermineETC2PunchthroughAsRGB8AlphaTextureSupport(const TextureCapsMap &textureCaps)
>+{
>+    constexpr GLenum requiredFormats[] = {
>+        GL_COMPRESSED_SRGB8_PUNCHTHROUGH_ALPHA1_ETC2,
>+    };
>+
>+    return GetFormatSupport(textureCaps, requiredFormats, true, true, false, false);
>+}
>+
>+// Check for OES_compressed_ETC2_RGBA8_texture
>+static bool DetermineETC2RGBA8TextureSupport(const TextureCapsMap &textureCaps)
>+{
>+    constexpr GLenum requiredFormats[] = {
>+        GL_COMPRESSED_RGBA8_ETC2_EAC,
>+    };
>+
>+    return GetFormatSupport(textureCaps, requiredFormats, true, true, false, false);
>+}
>+
>+// Check for OES_compressed_ETC2_sRGB8_alpha8_texture
>+static bool DetermineETC2sRGB8Alpha8TextureSupport(const TextureCapsMap &textureCaps)
>+{
>+    constexpr GLenum requiredFormats[] = {
>+        GL_COMPRESSED_SRGB8_ALPHA8_ETC2_EAC,
>+    };
>+
>+    return GetFormatSupport(textureCaps, requiredFormats, true, true, false, false);
>+}
>+
>+// Check for OES_compressed_EAC_R11_unsigned_texture
>+static bool DetermineEACR11UnsignedTextureSupport(const TextureCapsMap &textureCaps)
>+{
>+    constexpr GLenum requiredFormats[] = {
>+        GL_COMPRESSED_R11_EAC,
>+    };
>+
>+    return GetFormatSupport(textureCaps, requiredFormats, true, true, false, false);
>+}
>+
>+// Check for OES_compressed_EAC_R11_signed_texture
>+static bool DetermineEACR11SignedTextureSupport(const TextureCapsMap &textureCaps)
>+{
>+    constexpr GLenum requiredFormats[] = {
>+        GL_COMPRESSED_SIGNED_R11_EAC,
>+    };
>+
>+    return GetFormatSupport(textureCaps, requiredFormats, true, true, false, false);
>+}
>+
>+// Check for OES_compressed_EAC_RG11_unsigned_texture
>+static bool DetermineEACRG11UnsignedTextureSupport(const TextureCapsMap &textureCaps)
>+{
>+    constexpr GLenum requiredFormats[] = {
>+        GL_COMPRESSED_RG11_EAC,
>+    };
>+
>+    return GetFormatSupport(textureCaps, requiredFormats, true, true, false, false);
>+}
>+
>+// Check for OES_compressed_EAC_RG11_signed_texture
>+static bool DetermineEACRG11SignedTextureSupport(const TextureCapsMap &textureCaps)
>+{
>+    constexpr GLenum requiredFormats[] = {
>+        GL_COMPRESSED_SIGNED_RG11_EAC,
>+    };
>+
>+    return GetFormatSupport(textureCaps, requiredFormats, true, true, false, false);
>+}
>+
>+// Check for GL_EXT_sRGB
> static bool DetermineSRGBTextureSupport(const TextureCapsMap &textureCaps)
> {
>     constexpr GLenum requiredFilterFormats[] = {
>-        GL_SRGB8, GL_SRGB8_ALPHA8,
>+        GL_SRGB8,
>+        GL_SRGB8_ALPHA8,
>     };
> 
>     constexpr GLenum requiredRenderFormats[] = {
>         GL_SRGB8_ALPHA8,
>     };
> 
>-    return GetFormatSupport(textureCaps, requiredFilterFormats, true, true, false) &&
>-           GetFormatSupport(textureCaps, requiredRenderFormats, true, false, true);
>+    return GetFormatSupport(textureCaps, requiredFilterFormats, true, true, false, false) &&
>+           GetFormatSupport(textureCaps, requiredRenderFormats, true, false, true, true);
> }
> 
> // Check for GL_ANGLE_depth_texture
> static bool DetermineDepthTextureSupport(const TextureCapsMap &textureCaps)
> {
>     constexpr GLenum requiredFormats[] = {
>-        GL_DEPTH_COMPONENT16, GL_DEPTH_COMPONENT32_OES, GL_DEPTH24_STENCIL8_OES,
>+        GL_DEPTH_COMPONENT16,
>+        GL_DEPTH_COMPONENT32_OES,
>+        GL_DEPTH24_STENCIL8_OES,
>     };
> 
>-    return GetFormatSupport(textureCaps, requiredFormats, true, true, true);
>+    return GetFormatSupport(textureCaps, requiredFormats, true, true, true, true);
> }
> 
> // Check for GL_OES_depth32
>@@ -523,7 +671,7 @@ static bool DetermineDepth32Support(const TextureCapsMap &textureCaps)
>         GL_DEPTH_COMPONENT32_OES,
>     };
> 
>-    return GetFormatSupport(textureCaps, requiredFormats, false, false, true);
>+    return GetFormatSupport(textureCaps, requiredFormats, false, false, true, true);
> }
> 
> // Check for GL_CHROMIUM_color_buffer_float_rgb
>@@ -533,7 +681,7 @@ static bool DetermineColorBufferFloatRGBSupport(const TextureCapsMap &textureCap
>         GL_RGB32F,
>     };
> 
>-    return GetFormatSupport(textureCaps, requiredFormats, true, false, true);
>+    return GetFormatSupport(textureCaps, requiredFormats, true, false, true, false);
> }
> 
> // Check for GL_CHROMIUM_color_buffer_float_rgba
>@@ -543,7 +691,7 @@ static bool DetermineColorBufferFloatRGBASupport(const TextureCapsMap &textureCa
>         GL_RGBA32F,
>     };
> 
>-    return GetFormatSupport(textureCaps, requiredFormats, true, false, true);
>+    return GetFormatSupport(textureCaps, requiredFormats, true, false, true, true);
> }
> 
> // Check for GL_EXT_color_buffer_float
>@@ -553,7 +701,7 @@ static bool DetermineColorBufferFloatSupport(const TextureCapsMap &textureCaps)
>         GL_R16F, GL_RG16F, GL_RGBA16F, GL_R32F, GL_RG32F, GL_RGBA32F, GL_R11F_G11F_B10F,
>     };
> 
>-    return GetFormatSupport(textureCaps, requiredFormats, true, false, true);
>+    return GetFormatSupport(textureCaps, requiredFormats, true, false, true, true);
> }
> 
> // Check for GL_EXT_texture_norm16
>@@ -565,38 +713,83 @@ static bool DetermineTextureNorm16Support(const TextureCapsMap &textureCaps)
>     };
> 
>     constexpr GLenum requiredRenderFormats[] = {
>-        GL_R16_EXT, GL_RG16_EXT, GL_RGBA16_EXT,
>+        GL_R16_EXT,
>+        GL_RG16_EXT,
>+        GL_RGBA16_EXT,
>     };
> 
>-    return GetFormatSupport(textureCaps, requiredFilterFormats, true, true, false) &&
>-           GetFormatSupport(textureCaps, requiredRenderFormats, true, false, true);
>+    return GetFormatSupport(textureCaps, requiredFilterFormats, true, true, false, false) &&
>+           GetFormatSupport(textureCaps, requiredRenderFormats, true, false, true, true);
>+}
>+
>+// Check for EXT_texture_compression_bptc
>+static bool DetermineBPTCTextureSupport(const TextureCapsMap &textureCaps)
>+{
>+    constexpr GLenum requiredFormats[] = {
>+        GL_COMPRESSED_RGBA_BPTC_UNORM_EXT, GL_COMPRESSED_SRGB_ALPHA_BPTC_UNORM_EXT,
>+        GL_COMPRESSED_RGB_BPTC_SIGNED_FLOAT_EXT, GL_COMPRESSED_RGB_BPTC_UNSIGNED_FLOAT_EXT};
>+
>+    return GetFormatSupport(textureCaps, requiredFormats, true, true, false, false);
>+}
>+
>+bool DetermineCompressedTextureETCSupport(const TextureCapsMap &textureCaps)
>+{
>+    constexpr GLenum requiredFormats[] = {GL_COMPRESSED_R11_EAC,
>+                                          GL_COMPRESSED_SIGNED_R11_EAC,
>+                                          GL_COMPRESSED_RG11_EAC,
>+                                          GL_COMPRESSED_SIGNED_RG11_EAC,
>+                                          GL_COMPRESSED_RGB8_ETC2,
>+                                          GL_COMPRESSED_SRGB8_ETC2,
>+                                          GL_COMPRESSED_RGB8_PUNCHTHROUGH_ALPHA1_ETC2,
>+                                          GL_COMPRESSED_SRGB8_PUNCHTHROUGH_ALPHA1_ETC2,
>+                                          GL_COMPRESSED_RGBA8_ETC2_EAC,
>+                                          GL_COMPRESSED_SRGB8_ALPHA8_ETC2_EAC};
>+
>+    return GetFormatSupport(textureCaps, requiredFormats, true, true, false, false);
> }
> 
> void Extensions::setTextureExtensionSupport(const TextureCapsMap &textureCaps)
> {
>-    packedDepthStencil = DeterminePackedDepthStencilSupport(textureCaps);
>-    rgb8rgba8 = DetermineRGB8AndRGBA8TextureSupport(textureCaps);
>+    // TODO(ynovikov): rgb8rgba8, colorBufferHalfFloat, textureHalfFloat, textureHalfFloatLinear,
>+    // textureFloat, textureFloatLinear, textureRG, sRGB, colorBufferFloatRGB, colorBufferFloatRGBA
>+    // and colorBufferFloat were verified. Verify the rest.
>+    packedDepthStencil    = DeterminePackedDepthStencilSupport(textureCaps);
>+    rgb8rgba8             = DetermineRGB8AndRGBA8TextureSupport(textureCaps);
>     textureFormatBGRA8888 = DetermineBGRA8TextureSupport(textureCaps);
>-    colorBufferHalfFloat      = DetermineColorBufferHalfFloatSupport(textureCaps);
>-    textureHalfFloat = DetermineHalfFloatTextureSupport(textureCaps);
>-    textureHalfFloatLinear = DetermineHalfFloatTextureFilteringSupport(textureCaps);
>-    textureFloat = DetermineFloatTextureSupport(textureCaps);
>-    textureFloatLinear = DetermineFloatTextureFilteringSupport(textureCaps);
>-    textureRG = DetermineRGTextureSupport(textureCaps, textureHalfFloat, textureFloat);
>+    textureHalfFloat      = DetermineHalfFloatTextureSupport(textureCaps);
>+    textureHalfFloatLinear =
>+        textureHalfFloat && DetermineHalfFloatTextureFilteringSupport(textureCaps);
>+    textureFloat           = DetermineFloatTextureSupport(textureCaps);
>+    textureFloatLinear     = textureFloat && DetermineFloatTextureFilteringSupport(textureCaps);
>+    textureRG              = DetermineRGTextureSupport(textureCaps, textureHalfFloat, textureFloat);
>+    colorBufferHalfFloat   = textureHalfFloat && DetermineColorBufferHalfFloatSupport(textureCaps);
>     textureCompressionDXT1 = DetermineDXT1TextureSupport(textureCaps);
>     textureCompressionDXT3 = DetermineDXT3TextureSupport(textureCaps);
>     textureCompressionDXT5 = DetermineDXT5TextureSupport(textureCaps);
>     textureCompressionS3TCsRGB = DetermineS3TCsRGBTextureSupport(textureCaps);
>-    textureCompressionASTCHDR = DetermineASTCTextureSupport(textureCaps);
>-    textureCompressionASTCLDR = textureCompressionASTCHDR;
>-    compressedETC1RGB8Texture = DetermineETC1RGB8TextureSupport(textureCaps);
>-    sRGB = DetermineSRGBTextureSupport(textureCaps);
>-    depthTextures = DetermineDepthTextureSupport(textureCaps);
>-    depth32                   = DetermineDepth32Support(textureCaps);
>-    colorBufferFloatRGB        = DetermineColorBufferFloatRGBSupport(textureCaps);
>-    colorBufferFloatRGBA       = DetermineColorBufferFloatRGBASupport(textureCaps);
>-    colorBufferFloat = DetermineColorBufferFloatSupport(textureCaps);
>-    textureNorm16             = DetermineTextureNorm16Support(textureCaps);
>+    textureCompressionASTCHDR  = DetermineASTCTextureSupport(textureCaps);
>+    textureCompressionASTCLDR  = textureCompressionASTCHDR;
>+    compressedETC1RGB8Texture  = DetermineETC1RGB8TextureSupport(textureCaps);
>+    compressedETC2RGB8Texture  = DetermineETC2RGB8TextureSupport(textureCaps);
>+    compressedETC2sRGB8Texture = DetermineETC2sRGB8TextureSupport(textureCaps);
>+    compressedETC2PunchthroughARGB8Texture =
>+        DetermineETC2PunchthroughARGB8TextureSupport(textureCaps);
>+    compressedETC2PunchthroughAsRGB8AlphaTexture =
>+        DetermineETC2PunchthroughAsRGB8AlphaTextureSupport(textureCaps);
>+    compressedETC2RGBA8Texture       = DetermineETC2RGBA8TextureSupport(textureCaps);
>+    compressedETC2sRGB8Alpha8Texture = DetermineETC2sRGB8Alpha8TextureSupport(textureCaps);
>+    compressedEACR11UnsignedTexture  = DetermineEACR11UnsignedTextureSupport(textureCaps);
>+    compressedEACR11SignedTexture    = DetermineEACR11SignedTextureSupport(textureCaps);
>+    compressedEACRG11UnsignedTexture = DetermineEACRG11UnsignedTextureSupport(textureCaps);
>+    compressedEACRG11SignedTexture   = DetermineEACRG11SignedTextureSupport(textureCaps);
>+    sRGB                             = DetermineSRGBTextureSupport(textureCaps);
>+    depthTextures                    = DetermineDepthTextureSupport(textureCaps);
>+    depth32                          = DetermineDepth32Support(textureCaps);
>+    colorBufferFloatRGB              = DetermineColorBufferFloatRGBSupport(textureCaps);
>+    colorBufferFloatRGBA             = DetermineColorBufferFloatRGBASupport(textureCaps);
>+    colorBufferFloat                 = DetermineColorBufferFloatSupport(textureCaps);
>+    textureNorm16                    = DetermineTextureNorm16Support(textureCaps);
>+    textureCompressionBPTC           = DetermineBPTCTextureSupport(textureCaps);
> }
> 
> const ExtensionInfoMap &GetExtensionInfoMap()
>@@ -638,11 +831,23 @@ const ExtensionInfoMap &GetExtensionInfoMap()
>         map["GL_EXT_texture_compression_s3tc_srgb"] = enableableExtension(&Extensions::textureCompressionS3TCsRGB);
>         map["GL_KHR_texture_compression_astc_hdr"] = enableableExtension(&Extensions::textureCompressionASTCHDR);
>         map["GL_KHR_texture_compression_astc_ldr"] = enableableExtension(&Extensions::textureCompressionASTCLDR);
>+        map["GL_EXT_texture_compression_bptc"] = enableableExtension(&Extensions::textureCompressionBPTC);
>         map["GL_OES_compressed_ETC1_RGB8_texture"] = enableableExtension(&Extensions::compressedETC1RGB8Texture);
>+        map["OES_compressed_ETC2_RGB8_texture"] = enableableExtension(&Extensions::compressedETC2RGB8Texture);
>+        map["OES_compressed_ETC2_sRGB8_texture"] = enableableExtension(&Extensions::compressedETC2sRGB8Texture);
>+        map["OES_compressed_ETC2_punchthroughA_RGBA8_texture"] = enableableExtension(&Extensions::compressedETC2PunchthroughARGB8Texture);
>+        map["OES_compressed_ETC2_punchthroughA_sRGB8_alpha_texture"] = enableableExtension(&Extensions::compressedETC2PunchthroughAsRGB8AlphaTexture);
>+        map["OES_compressed_ETC2_RGBA8_texture"] = enableableExtension(&Extensions::compressedETC2RGBA8Texture);
>+        map["OES_compressed_ETC2_sRGB8_alpha8_texture"] = enableableExtension(&Extensions::compressedETC2sRGB8Alpha8Texture);
>+        map["OES_compressed_EAC_R11_unsigned_texture"] = enableableExtension(&Extensions::compressedEACR11UnsignedTexture);
>+        map["OES_compressed_EAC_R11_signed_texture"] = enableableExtension(&Extensions::compressedEACR11SignedTexture);
>+        map["OES_compressed_EAC_RG11_unsigned_texture"] = enableableExtension(&Extensions::compressedEACRG11UnsignedTexture);
>+        map["OES_compressed_EAC_RG11_signed_texture"] = enableableExtension(&Extensions::compressedEACRG11SignedTexture);
>+        map["GL_CHROMIUM_compressed_texture_etc"] = enableableExtension(&Extensions::compressedTextureETC);
>         map["GL_EXT_sRGB"] = enableableExtension(&Extensions::sRGB);
>         map["GL_ANGLE_depth_texture"] = esOnlyExtension(&Extensions::depthTextures);
>         map["GL_OES_depth32"] = esOnlyExtension(&Extensions::depth32);
>-        map["GL_EXT_texture_storage"] = esOnlyExtension(&Extensions::textureStorage);
>+        map["GL_EXT_texture_storage"] = enableableExtension(&Extensions::textureStorage);
>         map["GL_OES_texture_npot"] = enableableExtension(&Extensions::textureNPOT);
>         map["GL_EXT_draw_buffers"] = enableableExtension(&Extensions::drawBuffers);
>         map["GL_EXT_texture_filter_anisotropic"] = enableableExtension(&Extensions::textureFilterAnisotropic);
>@@ -654,26 +859,33 @@ const ExtensionInfoMap &GetExtensionInfoMap()
>         map["GL_EXT_blend_minmax"] = enableableExtension(&Extensions::blendMinMax);
>         map["GL_ANGLE_framebuffer_blit"] = enableableExtension(&Extensions::framebufferBlit);
>         map["GL_ANGLE_framebuffer_multisample"] = enableableExtension(&Extensions::framebufferMultisample);
>-        map["GL_ANGLE_instanced_arrays"] = enableableExtension(&Extensions::instancedArrays);
>+        map["GL_ANGLE_instanced_arrays"] = enableableExtension(&Extensions::instancedArraysANGLE);
>+        map["GL_EXT_instanced_arrays"] = enableableExtension(&Extensions::instancedArraysEXT);
>         map["GL_ANGLE_pack_reverse_row_order"] = enableableExtension(&Extensions::packReverseRowOrder);
>         map["GL_OES_standard_derivatives"] = enableableExtension(&Extensions::standardDerivatives);
>         map["GL_EXT_shader_texture_lod"] = enableableExtension(&Extensions::shaderTextureLOD);
>         map["GL_EXT_frag_depth"] = enableableExtension(&Extensions::fragDepth);
>-        map["GL_ANGLE_multiview"] = enableableExtension(&Extensions::multiview);
>+        map["GL_OVR_multiview2"] = enableableExtension(&Extensions::multiview2);
>         map["GL_ANGLE_texture_usage"] = enableableExtension(&Extensions::textureUsage);
>         map["GL_ANGLE_translated_shader_source"] = esOnlyExtension(&Extensions::translatedShaderSource);
>         map["GL_OES_fbo_render_mipmap"] = enableableExtension(&Extensions::fboRenderMipmap);
>         map["GL_EXT_discard_framebuffer"] = esOnlyExtension(&Extensions::discardFramebuffer);
>         map["GL_EXT_debug_marker"] = esOnlyExtension(&Extensions::debugMarker);
>-        map["GL_OES_EGL_image"] = esOnlyExtension(&Extensions::eglImage);
>-        map["GL_OES_EGL_image_external"] = esOnlyExtension(&Extensions::eglImageExternal);
>-        map["GL_OES_EGL_image_external_essl3"] = esOnlyExtension(&Extensions::eglImageExternalEssl3);
>-        map["GL_NV_EGL_stream_consumer_external"] = esOnlyExtension(&Extensions::eglStreamConsumerExternal);
>+        map["GL_OES_EGL_image"] = enableableExtension(&Extensions::eglImage);
>+        map["GL_OES_EGL_image_external"] = enableableExtension(&Extensions::eglImageExternal);
>+        map["GL_OES_EGL_image_external_essl3"] = enableableExtension(&Extensions::eglImageExternalEssl3);
>+        map["GL_OES_EGL_sync"] = esOnlyExtension(&Extensions::eglSync);
>+        map["GL_EXT_memory_object"] = enableableExtension(&Extensions::memoryObject);
>+        map["GL_EXT_memory_object_fd"] = enableableExtension(&Extensions::memoryObjectFd);
>+        map["GL_EXT_semaphore"] = enableableExtension(&Extensions::semaphore);
>+        map["GL_EXT_semaphore_fd"] = enableableExtension(&Extensions::semaphoreFd);
>+        map["GL_NV_EGL_stream_consumer_external"] = enableableExtension(&Extensions::eglStreamConsumerExternal);
>         map["GL_EXT_unpack_subimage"] = enableableExtension(&Extensions::unpackSubimage);
>         map["GL_NV_pack_subimage"] = enableableExtension(&Extensions::packSubimage);
>         map["GL_EXT_color_buffer_float"] = enableableExtension(&Extensions::colorBufferFloat);
>-        map["GL_OES_vertex_array_object"] = esOnlyExtension(&Extensions::vertexArrayObject);
>+        map["GL_OES_vertex_array_object"] = enableableExtension(&Extensions::vertexArrayObject);
>         map["GL_KHR_debug"] = esOnlyExtension(&Extensions::debug);
>+        map["GL_OES_texture_border_clamp"] = enableableExtension(&Extensions::textureBorderClamp);
>         // TODO(jmadill): Enable this when complete.
>         //map["GL_KHR_no_error"] = esOnlyExtension(&Extensions::noError);
>         map["GL_ANGLE_lossy_etc_decode"] = enableableExtension(&Extensions::lossyETCDecode);
>@@ -681,6 +893,7 @@ const ExtensionInfoMap &GetExtensionInfoMap()
>         map["GL_CHROMIUM_sync_query"] = enableableExtension(&Extensions::syncQuery);
>         map["GL_CHROMIUM_copy_texture"] = esOnlyExtension(&Extensions::copyTexture);
>         map["GL_CHROMIUM_copy_compressed_texture"] = esOnlyExtension(&Extensions::copyCompressedTexture);
>+        map["GL_ANGLE_copy_texture_3d"] = enableableExtension(&Extensions::copyTexture3d);
>         map["GL_ANGLE_webgl_compatibility"] = esOnlyExtension(&Extensions::webglCompatibility);
>         map["GL_ANGLE_request_extension"] = esOnlyExtension(&Extensions::requestExtension);
>         map["GL_CHROMIUM_bind_generates_resource"] = esOnlyExtension(&Extensions::bindGeneratesResource);
>@@ -699,6 +912,23 @@ const ExtensionInfoMap &GetExtensionInfoMap()
>         map["GL_ANGLE_program_cache_control"] = esOnlyExtension(&Extensions::programCacheControl);
>         map["GL_ANGLE_texture_rectangle"] = enableableExtension(&Extensions::textureRectangle);
>         map["GL_EXT_geometry_shader"] = enableableExtension(&Extensions::geometryShader);
>+        map["GL_ANGLE_explicit_context_gles1"] = enableableExtension(&Extensions::explicitContextGles1);
>+        map["GL_ANGLE_explicit_context"] = enableableExtension(&Extensions::explicitContext);
>+        map["GL_KHR_parallel_shader_compile"] = enableableExtension(&Extensions::parallelShaderCompile);
>+        map["GL_OES_texture_storage_multisample_2d_array"] = enableableExtension(&Extensions::textureStorageMultisample2DArray);
>+        map["GL_ANGLE_multiview_multisample"] = enableableExtension(&Extensions::multiviewMultisample);
>+        map["GL_EXT_blend_func_extended"] = enableableExtension(&Extensions::blendFuncExtended);
>+        map["GL_EXT_float_blend"] = enableableExtension(&Extensions::floatBlend);
>+        map["GL_ANGLE_texture_multisample"] = enableableExtension(&Extensions::textureMultisample);
>+        map["GL_ANGLE_multi_draw"] = enableableExtension(&Extensions::multiDraw);
>+        map["GL_ANGLE_provoking_vertex"] = enableableExtension(&Extensions::provokingVertex);
>+        map["GL_CHROMIUM_lose_context"] = enableableExtension(&Extensions::loseContextCHROMIUM);
>+        // GLES1 extensinos
>+        map["GL_OES_point_size_array"] = enableableExtension(&Extensions::pointSizeArray);
>+        map["GL_OES_texture_cube_map"] = enableableExtension(&Extensions::textureCubeMap);
>+        map["GL_OES_point_sprite"] = enableableExtension(&Extensions::pointSprite);
>+        map["GL_OES_draw_texture"] = enableableExtension(&Extensions::drawTexture);
>+        map["GL_ANGLE_memory_size"] = enableableExtension(&Extensions::memorySize);
>         // clang-format on
> 
>         return map;
>@@ -708,9 +938,7 @@ const ExtensionInfoMap &GetExtensionInfoMap()
>     return extensionInfo;
> }
> 
>-TypePrecision::TypePrecision() : range({{0, 0}}), precision(0)
>-{
>-}
>+TypePrecision::TypePrecision() : range({{0, 0}}), precision(0) {}
> 
> TypePrecision::TypePrecision(const TypePrecision &other) = default;
> 
>@@ -753,8 +981,8 @@ Caps::Caps()
>       maxLODBias(0),
>       maxCubeMapTextureSize(0),
>       maxRenderbufferSize(0),
>-      minAliasedPointSize(0),
>-      maxAliasedPointSize(0),
>+      minAliasedPointSize(1.0f),
>+      maxAliasedPointSize(1.0f),
>       minAliasedLineWidth(0),
>       maxAliasedLineWidth(0),
> 
>@@ -779,28 +1007,28 @@ Caps::Caps()
>       maxElementsIndices(0),
>       maxElementsVertices(0),
> 
>+      // Table 20.43
>+      // Table 20.44
>+      // Table 20.45
>+      // Table 20.43gs (GL_EXT_geometry_shader)
>+      // Table 20.46 (GL_EXT_geometry_shader)
>+      maxShaderUniformBlocks({}),
>+      maxShaderTextureImageUnits({}),
>+      maxShaderStorageBlocks({}),
>+      maxShaderUniformComponents({}),
>+      maxShaderAtomicCounterBuffers({}),
>+      maxShaderAtomicCounters({}),
>+      maxShaderImageUniforms({}),
>+      maxCombinedShaderUniformComponents({}),
>+
>       // Table 20.43
>       maxVertexAttributes(0),
>-      maxVertexUniformComponents(0),
>       maxVertexUniformVectors(0),
>-      maxVertexUniformBlocks(0),
>       maxVertexOutputComponents(0),
>-      maxVertexTextureImageUnits(0),
>-      maxVertexAtomicCounterBuffers(0),
>-      maxVertexAtomicCounters(0),
>-      maxVertexImageUniforms(0),
>-      maxVertexShaderStorageBlocks(0),
> 
>       // Table 20.44
>-      maxFragmentUniformComponents(0),
>       maxFragmentUniformVectors(0),
>-      maxFragmentUniformBlocks(0),
>       maxFragmentInputComponents(0),
>-      maxTextureImageUnits(0),
>-      maxFragmentAtomicCounterBuffers(0),
>-      maxFragmentAtomicCounters(0),
>-      maxFragmentImageUniforms(0),
>-      maxFragmentShaderStorageBlocks(0),
>       minProgramTextureGatherOffset(0),
>       maxProgramTextureGatherOffset(0),
>       minProgramTexelOffset(0),
>@@ -808,23 +1036,13 @@ Caps::Caps()
> 
>       // Table 20.45
>       maxComputeWorkGroupInvocations(0),
>-      maxComputeUniformBlocks(0),
>-      maxComputeTextureImageUnits(0),
>       maxComputeSharedMemorySize(0),
>-      maxComputeUniformComponents(0),
>-      maxComputeAtomicCounterBuffers(0),
>-      maxComputeAtomicCounters(0),
>-      maxComputeImageUniforms(0),
>-      maxCombinedComputeUniformComponents(0),
>-      maxComputeShaderStorageBlocks(0),
> 
>       // Table 20.46
>       maxUniformBufferBindings(0),
>       maxUniformBlockSize(0),
>       uniformBufferOffsetAlignment(0),
>       maxCombinedUniformBlocks(0),
>-      maxCombinedVertexUniformComponents(0),
>-      maxCombinedFragmentUniformComponents(0),
>       maxVaryingComponents(0),
>       maxVaryingVectors(0),
>       maxCombinedTextureImageUnits(0),
>@@ -849,7 +1067,33 @@ Caps::Caps()
>       maxTransformFeedbackSeparateComponents(0),
> 
>       // Table 20.49
>-      maxSamples(0)
>+      maxSamples(0),
>+
>+      // Table 20.40 (cont.) (GL_EXT_geometry_shader)
>+      maxFramebufferLayers(0),
>+      layerProvokingVertex(0),
>+
>+      // Table 20.43gs (GL_EXT_geometry_shader)
>+      maxGeometryInputComponents(0),
>+      maxGeometryOutputComponents(0),
>+      maxGeometryOutputVertices(0),
>+      maxGeometryTotalOutputComponents(0),
>+      maxGeometryShaderInvocations(0),
>+
>+      subPixelBits(4),
>+
>+      // GLES1 emulation: Table 6.20 / 6.22 (ES 1.1 spec)
>+      maxMultitextureUnits(0),
>+      maxClipPlanes(0),
>+      maxLights(0),
>+      maxModelviewMatrixStackDepth(0),
>+      maxProjectionMatrixStackDepth(0),
>+      maxTextureMatrixStackDepth(0),
>+      minSmoothPointSize(0),
>+      maxSmoothPointSize(0),
>+      minSmoothLineWidth(0),
>+      maxSmoothLineWidth(0)
>+
> {
>     for (size_t i = 0; i < 3; ++i)
>     {
>@@ -865,6 +1109,21 @@ Caps GenerateMinimumCaps(const Version &clientVersion, const Extensions &extensi
> {
>     Caps caps;
> 
>+    // GLES1 emulation (Minimums taken from Table 6.20 / 6.22 (ES 1.1 spec))
>+    if (clientVersion < Version(2, 0))
>+    {
>+        caps.maxMultitextureUnits = 2;
>+        caps.maxLights            = 8;
>+        caps.maxClipPlanes        = 1;
>+
>+        caps.maxModelviewMatrixStackDepth  = 16;
>+        caps.maxProjectionMatrixStackDepth = 2;
>+        caps.maxTextureMatrixStackDepth    = 2;
>+
>+        caps.minSmoothPointSize = 1.0f;
>+        caps.maxSmoothPointSize = 1.0f;
>+    }
>+
>     if (clientVersion >= Version(2, 0))
>     {
>         // Table 6.18
>@@ -892,13 +1151,13 @@ Caps GenerateMinimumCaps(const Version &clientVersion, const Extensions &extensi
>         caps.fragmentLowpInt.setSimulatedInt(8);
> 
>         // Table 6.20
>-        caps.maxVertexAttributes          = 8;
>-        caps.maxVertexUniformVectors      = 128;
>-        caps.maxVaryingVectors            = 8;
>-        caps.maxCombinedTextureImageUnits = 8;
>-        caps.maxTextureImageUnits         = 8;
>-        caps.maxFragmentUniformVectors    = 16;
>-        caps.maxRenderbufferSize          = 1;
>+        caps.maxVertexAttributes                              = 8;
>+        caps.maxVertexUniformVectors                          = 128;
>+        caps.maxVaryingVectors                                = 8;
>+        caps.maxCombinedTextureImageUnits                     = 8;
>+        caps.maxShaderTextureImageUnits[ShaderType::Fragment] = 8;
>+        caps.maxFragmentUniformVectors                        = 16;
>+        caps.maxRenderbufferSize                              = 1;
>     }
> 
>     if (clientVersion >= Version(3, 0))
>@@ -938,33 +1197,27 @@ Caps GenerateMinimumCaps(const Version &clientVersion, const Extensions &extensi
>         caps.maxServerWaitTimeout = 0;
> 
>         // Table 6.31
>-        caps.maxVertexAttributes        = 16;
>-        caps.maxVertexUniformComponents = 1024;
>-        caps.maxVertexUniformVectors    = 256;
>-        caps.maxVertexUniformBlocks     = 12;
>-        caps.maxVertexOutputComponents  = 64;
>-        caps.maxVertexTextureImageUnits = 16;
>+        caps.maxVertexAttributes                            = 16;
>+        caps.maxShaderUniformComponents[ShaderType::Vertex] = 1024;
>+        caps.maxVertexUniformVectors                        = 256;
>+        caps.maxShaderUniformBlocks[ShaderType::Vertex]     = 12;
>+        caps.maxVertexOutputComponents                      = 64;
>+        caps.maxShaderTextureImageUnits[ShaderType::Vertex] = 16;
> 
>         // Table 6.32
>-        caps.maxFragmentUniformComponents = 896;
>-        caps.maxFragmentUniformVectors    = 224;
>-        caps.maxFragmentUniformBlocks     = 12;
>-        caps.maxFragmentInputComponents   = 60;
>-        caps.maxTextureImageUnits         = 16;
>-        caps.minProgramTexelOffset        = -8;
>-        caps.maxProgramTexelOffset        = 7;
>+        caps.maxShaderUniformComponents[ShaderType::Fragment] = 896;
>+        caps.maxFragmentUniformVectors                        = 224;
>+        caps.maxShaderUniformBlocks[ShaderType::Fragment]     = 12;
>+        caps.maxFragmentInputComponents                       = 60;
>+        caps.maxShaderTextureImageUnits[ShaderType::Fragment] = 16;
>+        caps.minProgramTexelOffset                            = -8;
>+        caps.maxProgramTexelOffset                            = 7;
> 
>         // Table 6.33
>         caps.maxUniformBufferBindings     = 24;
>         caps.maxUniformBlockSize          = 16384;
>         caps.uniformBufferOffsetAlignment = 256;
>         caps.maxCombinedUniformBlocks     = 24;
>-        caps.maxCombinedVertexUniformComponents =
>-            caps.maxVertexUniformBlocks * (caps.maxUniformBlockSize / 4) +
>-            caps.maxVertexUniformComponents;
>-        caps.maxCombinedFragmentUniformComponents =
>-            caps.maxFragmentUniformBlocks * (caps.maxUniformBlockSize / 4) +
>-            caps.maxFragmentUniformComponents;
>         caps.maxVaryingComponents         = 60;
>         caps.maxVaryingVectors            = 15;
>         caps.maxCombinedTextureImageUnits = 32;
>@@ -995,42 +1248,36 @@ Caps GenerateMinimumCaps(const Version &clientVersion, const Extensions &extensi
>         caps.maxVertexAttribStride         = 2048;
> 
>         // Table 20.43
>-        caps.maxVertexAtomicCounterBuffers = 0;
>-        caps.maxVertexAtomicCounters       = 0;
>-        caps.maxVertexImageUniforms        = 0;
>-        caps.maxVertexShaderStorageBlocks  = 0;
>+        caps.maxShaderAtomicCounterBuffers[ShaderType::Vertex] = 0;
>+        caps.maxShaderAtomicCounters[ShaderType::Vertex]       = 0;
>+        caps.maxShaderImageUniforms[ShaderType::Vertex]        = 0;
>+        caps.maxShaderStorageBlocks[ShaderType::Vertex]        = 0;
> 
>         // Table 20.44
>-        caps.maxFragmentUniformComponents    = 1024;
>-        caps.maxFragmentUniformVectors       = 256;
>-        caps.maxFragmentAtomicCounterBuffers = 0;
>-        caps.maxFragmentAtomicCounters       = 0;
>-        caps.maxFragmentImageUniforms        = 0;
>-        caps.maxFragmentShaderStorageBlocks  = 0;
>-        caps.minProgramTextureGatherOffset   = 0;
>-        caps.maxProgramTextureGatherOffset   = 0;
>+        caps.maxShaderUniformComponents[ShaderType::Fragment]    = 1024;
>+        caps.maxFragmentUniformVectors                           = 256;
>+        caps.maxShaderAtomicCounterBuffers[ShaderType::Fragment] = 0;
>+        caps.maxShaderAtomicCounters[ShaderType::Fragment]       = 0;
>+        caps.maxShaderImageUniforms[ShaderType::Fragment]        = 0;
>+        caps.maxShaderStorageBlocks[ShaderType::Fragment]        = 0;
>+        caps.minProgramTextureGatherOffset                       = 0;
>+        caps.maxProgramTextureGatherOffset                       = 0;
> 
>         // Table 20.45
>-        caps.maxComputeWorkGroupCount       = {{65535, 65535, 65535}};
>-        caps.maxComputeWorkGroupSize        = {{128, 128, 64}};
>-        caps.maxComputeWorkGroupInvocations = 12;
>-        caps.maxComputeUniformBlocks        = 12;
>-        caps.maxComputeTextureImageUnits    = 16;
>-        caps.maxComputeSharedMemorySize     = 16384;
>-        caps.maxComputeUniformComponents    = 1024;
>-        caps.maxComputeAtomicCounterBuffers = 1;
>-        caps.maxComputeAtomicCounters       = 8;
>-        caps.maxComputeImageUniforms        = 4;
>-        caps.maxCombinedComputeUniformComponents =
>-            caps.maxComputeUniformBlocks * static_cast<GLuint>(caps.maxUniformBlockSize / 4) +
>-            caps.maxComputeUniformComponents;
>-        caps.maxComputeShaderStorageBlocks = 4;
>+        caps.maxComputeWorkGroupCount                           = {{65535, 65535, 65535}};
>+        caps.maxComputeWorkGroupSize                            = {{128, 128, 64}};
>+        caps.maxComputeWorkGroupInvocations                     = 12;
>+        caps.maxShaderUniformBlocks[ShaderType::Compute]        = 12;
>+        caps.maxShaderTextureImageUnits[ShaderType::Compute]    = 16;
>+        caps.maxComputeSharedMemorySize                         = 16384;
>+        caps.maxShaderUniformComponents[ShaderType::Compute]    = 1024;
>+        caps.maxShaderAtomicCounterBuffers[ShaderType::Compute] = 1;
>+        caps.maxShaderAtomicCounters[ShaderType::Compute]       = 8;
>+        caps.maxShaderImageUniforms[ShaderType::Compute]        = 4;
>+        caps.maxShaderStorageBlocks[ShaderType::Compute]        = 4;
> 
>         // Table 20.46
>-        caps.maxUniformBufferBindings = 36;
>-        caps.maxCombinedFragmentUniformComponents =
>-            caps.maxFragmentUniformBlocks * (caps.maxUniformBlockSize / 4) +
>-            caps.maxFragmentUniformComponents;
>+        caps.maxUniformBufferBindings         = 36;
>         caps.maxCombinedTextureImageUnits     = 48;
>         caps.maxCombinedShaderOutputResources = 4;
> 
>@@ -1053,17 +1300,50 @@ Caps GenerateMinimumCaps(const Version &clientVersion, const Extensions &extensi
>         caps.maxRectangleTextureSize = 64;
>     }
> 
>+    if (extensions.geometryShader)
>+    {
>+        // Table 20.40 (GL_EXT_geometry_shader)
>+        caps.maxFramebufferLayers = 256;
>+        caps.layerProvokingVertex = GL_LAST_VERTEX_CONVENTION_EXT;
>+
>+        // Table 20.43gs (GL_EXT_geometry_shader)
>+        caps.maxShaderUniformComponents[ShaderType::Geometry]    = 1024;
>+        caps.maxShaderUniformBlocks[ShaderType::Geometry]        = 12;
>+        caps.maxGeometryInputComponents                          = 64;
>+        caps.maxGeometryOutputComponents                         = 64;
>+        caps.maxGeometryOutputVertices                           = 256;
>+        caps.maxGeometryTotalOutputComponents                    = 1024;
>+        caps.maxShaderTextureImageUnits[ShaderType::Geometry]    = 16;
>+        caps.maxShaderAtomicCounterBuffers[ShaderType::Geometry] = 0;
>+        caps.maxShaderAtomicCounters[ShaderType::Geometry]       = 0;
>+        caps.maxShaderStorageBlocks[ShaderType::Geometry]        = 0;
>+        caps.maxGeometryShaderInvocations                        = 32;
>+
>+        // Table 20.46 (GL_EXT_geometry_shader)
>+        caps.maxShaderImageUniforms[ShaderType::Geometry] = 0;
>+
>+        // Table 20.46 (GL_EXT_geometry_shader)
>+        caps.maxUniformBufferBindings     = 48;
>+        caps.maxCombinedUniformBlocks     = 36;
>+        caps.maxCombinedTextureImageUnits = 64;
>+    }
>+
>+    for (ShaderType shaderType : AllShaderTypes())
>+    {
>+        caps.maxCombinedShaderUniformComponents[shaderType] =
>+            caps.maxShaderUniformBlocks[shaderType] *
>+                static_cast<GLuint>(caps.maxUniformBlockSize / 4) +
>+            caps.maxShaderUniformComponents[shaderType];
>+    }
>+
>     return caps;
> }
>-}
>+}  // namespace gl
> 
> namespace egl
> {
> 
>-Caps::Caps()
>-    : textureNPOT(false)
>-{
>-}
>+Caps::Caps() : textureNPOT(false) {}
> 
> DisplayExtensions::DisplayExtensions()
>     : createContextRobustness(false),
>@@ -1087,11 +1367,14 @@ DisplayExtensions::DisplayExtensions()
>       getAllProcAddresses(false),
>       flexibleSurfaceCompatibility(false),
>       directComposition(false),
>+      windowsUIComposition(false),
>       createContextNoError(false),
>       stream(false),
>       streamConsumerGLTexture(false),
>       streamConsumerGLTextureYUV(false),
>-      streamProducerD3DTextureNV12(false),
>+      streamProducerD3DTexture(false),
>+      fenceSync(false),
>+      waitSync(false),
>       createContextWebGLCompatibility(false),
>       createContextBindGeneratesResource(false),
>       getSyncValues(false),
>@@ -1101,9 +1384,16 @@ DisplayExtensions::DisplayExtensions()
>       displayTextureShareGroup(false),
>       createContextClientArrays(false),
>       programCacheControl(false),
>-      robustResourceInitialization(false)
>-{
>-}
>+      robustResourceInitialization(false),
>+      iosurfaceClientBuffer(false),
>+      createContextExtensionsEnabled(false),
>+      presentationTime(false),
>+      blobCache(false),
>+      imageNativeBuffer(false),
>+      getFrameTimestamps(false),
>+      recordable(false),
>+      powerPreference(false)
>+{}
> 
> std::vector<std::string> DisplayExtensions::getStrings() const
> {
>@@ -1120,6 +1410,7 @@ std::vector<std::string> DisplayExtensions::getStrings() const
>     InsertExtensionString("EGL_ANGLE_keyed_mutex",                               keyedMutex,                         &extensionStrings);
>     InsertExtensionString("EGL_ANGLE_surface_orientation",                       surfaceOrientation,                 &extensionStrings);
>     InsertExtensionString("EGL_ANGLE_direct_composition",                        directComposition,                  &extensionStrings);
>+    InsertExtensionString("EGL_ANGLE_windows_ui_composition",                    windowsUIComposition,               &extensionStrings);
>     InsertExtensionString("EGL_NV_post_sub_buffer",                              postSubBuffer,                      &extensionStrings);
>     InsertExtensionString("EGL_KHR_create_context",                              createContext,                      &extensionStrings);
>     InsertExtensionString("EGL_EXT_device_query",                                deviceQuery,                        &extensionStrings);
>@@ -1134,18 +1425,28 @@ std::vector<std::string> DisplayExtensions::getStrings() const
>     InsertExtensionString("EGL_KHR_stream",                                      stream,                             &extensionStrings);
>     InsertExtensionString("EGL_KHR_stream_consumer_gltexture",                   streamConsumerGLTexture,            &extensionStrings);
>     InsertExtensionString("EGL_NV_stream_consumer_gltexture_yuv",                streamConsumerGLTextureYUV,         &extensionStrings);
>+    InsertExtensionString("EGL_KHR_fence_sync",                                  fenceSync,                          &extensionStrings);
>+    InsertExtensionString("EGL_KHR_wait_sync",                                   waitSync,                           &extensionStrings);
>     InsertExtensionString("EGL_ANGLE_flexible_surface_compatibility",            flexibleSurfaceCompatibility,       &extensionStrings);
>-    InsertExtensionString("EGL_ANGLE_stream_producer_d3d_texture_nv12",          streamProducerD3DTextureNV12,       &extensionStrings);
>+    InsertExtensionString("EGL_ANGLE_stream_producer_d3d_texture",               streamProducerD3DTexture,           &extensionStrings);
>     InsertExtensionString("EGL_ANGLE_create_context_webgl_compatibility",        createContextWebGLCompatibility,    &extensionStrings);
>     InsertExtensionString("EGL_CHROMIUM_create_context_bind_generates_resource", createContextBindGeneratesResource, &extensionStrings);
>     InsertExtensionString("EGL_CHROMIUM_sync_control",                           getSyncValues,                      &extensionStrings);
>-    InsertExtensionString("EGL_EXT_swap_buffers_with_damage",                    swapBuffersWithDamage,              &extensionStrings);
>+    InsertExtensionString("EGL_KHR_swap_buffers_with_damage",                    swapBuffersWithDamage,              &extensionStrings);
>     InsertExtensionString("EGL_EXT_pixel_format_float",                          pixelFormatFloat,                   &extensionStrings);
>     InsertExtensionString("EGL_KHR_surfaceless_context",                         surfacelessContext,                 &extensionStrings);
>     InsertExtensionString("EGL_ANGLE_display_texture_share_group",               displayTextureShareGroup,           &extensionStrings);
>     InsertExtensionString("EGL_ANGLE_create_context_client_arrays",              createContextClientArrays,          &extensionStrings);
>     InsertExtensionString("EGL_ANGLE_program_cache_control",                     programCacheControl,                &extensionStrings);
>     InsertExtensionString("EGL_ANGLE_robust_resource_initialization",            robustResourceInitialization,       &extensionStrings);
>+    InsertExtensionString("EGL_ANGLE_iosurface_client_buffer",                   iosurfaceClientBuffer,              &extensionStrings);
>+    InsertExtensionString("EGL_ANGLE_create_context_extensions_enabled",         createContextExtensionsEnabled,     &extensionStrings);
>+    InsertExtensionString("EGL_ANDROID_presentation_time",                       presentationTime,                   &extensionStrings);
>+    InsertExtensionString("EGL_ANDROID_blob_cache",                              blobCache,                          &extensionStrings);
>+    InsertExtensionString("EGL_ANDROID_image_native_buffer",                     imageNativeBuffer,                  &extensionStrings);
>+    InsertExtensionString("EGL_ANDROID_get_frame_timestamps",                    getFrameTimestamps,                 &extensionStrings);
>+    InsertExtensionString("EGL_ANDROID_recordable",                              recordable,                         &extensionStrings);
>+    InsertExtensionString("EGL_ANGLE_power_preference",                          powerPreference,                    &extensionStrings);
>     // TODO(jmadill): Enable this when complete.
>     //InsertExtensionString("KHR_create_context_no_error",                       createContextNoError,               &extensionStrings);
>     // clang-format on
>@@ -1153,17 +1454,16 @@ std::vector<std::string> DisplayExtensions::getStrings() const
>     return extensionStrings;
> }
> 
>-DeviceExtensions::DeviceExtensions()
>-    : deviceD3D(false)
>-{
>-}
>+DeviceExtensions::DeviceExtensions() : deviceD3D(false) {}
> 
> std::vector<std::string> DeviceExtensions::getStrings() const
> {
>     std::vector<std::string> extensionStrings;
> 
>+    // clang-format off
>     //                   | Extension name                                 | Supported flag                | Output vector   |
>     InsertExtensionString("EGL_ANGLE_device_d3d",                          deviceD3D,                      &extensionStrings);
>+    // clang-format on
> 
>     return extensionStrings;
> }
>@@ -1176,13 +1476,15 @@ ClientExtensions::ClientExtensions()
>       platformANGLED3D(false),
>       platformANGLEOpenGL(false),
>       platformANGLEVulkan(false),
>+      platformANGLEContextVirtualization(false),
>       deviceCreation(false),
>       deviceCreationD3D11(false),
>       x11Visual(false),
>       experimentalPresentPath(false),
>-      clientGetAllProcAddresses(false)
>-{
>-}
>+      clientGetAllProcAddresses(false),
>+      debug(false),
>+      explicitContext(false)
>+{}
> 
> ClientExtensions::ClientExtensions(const ClientExtensions &other) = default;
> 
>@@ -1191,20 +1493,23 @@ std::vector<std::string> ClientExtensions::getStrings() const
>     std::vector<std::string> extensionStrings;
> 
>     // clang-format off
>-    //                   | Extension name                         | Supported flag           | Output vector   |
>-    InsertExtensionString("EGL_EXT_client_extensions",             clientExtensions,          &extensionStrings);
>-    InsertExtensionString("EGL_EXT_platform_base",                 platformBase,              &extensionStrings);
>-    InsertExtensionString("EGL_EXT_platform_device",               platformDevice,            &extensionStrings);
>-    InsertExtensionString("EGL_ANGLE_platform_angle",              platformANGLE,             &extensionStrings);
>-    InsertExtensionString("EGL_ANGLE_platform_angle_d3d",          platformANGLED3D,          &extensionStrings);
>-    InsertExtensionString("EGL_ANGLE_platform_angle_opengl",       platformANGLEOpenGL,       &extensionStrings);
>-    InsertExtensionString("EGL_ANGLE_platform_angle_null",         platformANGLENULL,         &extensionStrings);
>-    InsertExtensionString("EGL_ANGLE_platform_angle_vulkan",       platformANGLEVulkan,       &extensionStrings);
>-    InsertExtensionString("EGL_ANGLE_device_creation",             deviceCreation,            &extensionStrings);
>-    InsertExtensionString("EGL_ANGLE_device_creation_d3d11",       deviceCreationD3D11,       &extensionStrings);
>-    InsertExtensionString("EGL_ANGLE_x11_visual",                  x11Visual,                 &extensionStrings);
>-    InsertExtensionString("EGL_ANGLE_experimental_present_path",   experimentalPresentPath,   &extensionStrings);
>-    InsertExtensionString("EGL_KHR_client_get_all_proc_addresses", clientGetAllProcAddresses, &extensionStrings);
>+    //                   | Extension name                                   | Supported flag                   | Output vector   |
>+    InsertExtensionString("EGL_EXT_client_extensions",                       clientExtensions,                   &extensionStrings);
>+    InsertExtensionString("EGL_EXT_platform_base",                           platformBase,                       &extensionStrings);
>+    InsertExtensionString("EGL_EXT_platform_device",                         platformDevice,                     &extensionStrings);
>+    InsertExtensionString("EGL_ANGLE_platform_angle",                        platformANGLE,                      &extensionStrings);
>+    InsertExtensionString("EGL_ANGLE_platform_angle_d3d",                    platformANGLED3D,                   &extensionStrings);
>+    InsertExtensionString("EGL_ANGLE_platform_angle_opengl",                 platformANGLEOpenGL,                &extensionStrings);
>+    InsertExtensionString("EGL_ANGLE_platform_angle_null",                   platformANGLENULL,                  &extensionStrings);
>+    InsertExtensionString("EGL_ANGLE_platform_angle_vulkan",                 platformANGLEVulkan,                &extensionStrings);
>+    InsertExtensionString("EGL_ANGLE_platform_angle_context_virtualization", platformANGLEContextVirtualization, &extensionStrings);
>+    InsertExtensionString("EGL_ANGLE_device_creation",                       deviceCreation,                     &extensionStrings);
>+    InsertExtensionString("EGL_ANGLE_device_creation_d3d11",                 deviceCreationD3D11,                &extensionStrings);
>+    InsertExtensionString("EGL_ANGLE_x11_visual",                            x11Visual,                          &extensionStrings);
>+    InsertExtensionString("EGL_ANGLE_experimental_present_path",             experimentalPresentPath,            &extensionStrings);
>+    InsertExtensionString("EGL_KHR_client_get_all_proc_addresses",           clientGetAllProcAddresses,          &extensionStrings);
>+    InsertExtensionString("EGL_KHR_debug",                                   debug,                              &extensionStrings);
>+    InsertExtensionString("EGL_ANGLE_explicit_context",                      explicitContext,                    &extensionStrings);
>     // clang-format on
> 
>     return extensionStrings;
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/Caps.h b/Source/ThirdParty/ANGLE/src/libANGLE/Caps.h
>index 64bdf97112a..8976d45d8a8 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/Caps.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/Caps.h
>@@ -12,11 +12,11 @@
> #include "libANGLE/angletypes.h"
> #include "libANGLE/renderer/Format.h"
> 
>+#include <array>
> #include <map>
> #include <set>
> #include <string>
> #include <vector>
>-#include <array>
> 
> namespace gl
> {
>@@ -37,8 +37,11 @@ struct TextureCaps
>     // Support for linear or anisotropic filtering
>     bool filterable;
> 
>-    // Support for being used as a framebuffer attachment or renderbuffer format
>-    bool renderable;
>+    // Support for being used as a framebuffer attachment, i.e. glFramebufferTexture2D
>+    bool textureAttachment;
>+
>+    // Support for being used as a renderbuffer format, i.e. glFramebufferRenderbuffer
>+    bool renderbuffer;
> 
>     // Set of supported sample counts, only guaranteed to be valid in ES3.
>     SupportedSampleSet sampleCounts;
>@@ -68,13 +71,13 @@ class TextureCapsMap final : angle::NonCopyable
>     void clear();
> 
>     // Prefer using angle::Format methods.
>-    const TextureCaps &get(angle::Format::ID formatID) const;
>-    void set(angle::Format::ID formatID, const TextureCaps &caps);
>+    const TextureCaps &get(angle::FormatID formatID) const;
>+    void set(angle::FormatID formatID, const TextureCaps &caps);
> 
>   private:
>-    TextureCaps &get(angle::Format::ID formatID);
>+    TextureCaps &get(angle::FormatID formatID);
> 
>-    // Indexed by angle::Format::ID
>+    // Indexed by angle::FormatID
>     std::array<TextureCaps, angle::kNumANGLEFormats> mFormatData;
> };
> 
>@@ -82,9 +85,14 @@ void InitMinimumTextureCapsMap(const Version &clientVersion,
>                                const Extensions &extensions,
>                                TextureCapsMap *capsMap);
> 
>+// Returns true if all the formats required to support GL_CHROMIUM_compressed_texture_etc are
>+// present. Does not determine if they are natively supported without decompression.
>+bool DetermineCompressedTextureETCSupport(const TextureCapsMap &textureCaps);
>+
> struct Extensions
> {
>     Extensions();
>+    Extensions(const Extensions &other);
> 
>     // Generate a vector of supported extension strings
>     std::vector<std::string> getStrings() const;
>@@ -106,6 +114,7 @@ struct Extensions
>     // GL_ANGLE_depth_texture, GL_OES_depth32
>     // GL_EXT_color_buffer_float
>     // GL_EXT_texture_norm16
>+    // GL_EXT_texture_compression_bptc
>     void setTextureExtensionSupport(const TextureCapsMap &textureCaps);
> 
>     // ES2 Extension support
>@@ -155,12 +164,13 @@ struct Extensions
>     bool textureFloatLinear;
> 
>     // GL_EXT_texture_rg
>-    // Implies that TextureCaps for GL_R8, GL_RG8 (and floating point R/RG texture formats if floating point extensions
>-    // are also present) exist
>+    // Implies that TextureCaps for GL_R8, GL_RG8 (and floating point R/RG texture formats if
>+    // floating point extensions are also present) exist
>     bool textureRG;
> 
>-    // GL_EXT_texture_compression_dxt1, GL_ANGLE_texture_compression_dxt3 and GL_ANGLE_texture_compression_dxt5
>-    // Implies that TextureCaps exist for GL_COMPRESSED_RGB_S3TC_DXT1_EXT, GL_COMPRESSED_RGBA_S3TC_DXT1_EXT
>+    // GL_EXT_texture_compression_dxt1, GL_ANGLE_texture_compression_dxt3 and
>+    // GL_ANGLE_texture_compression_dxt5 Implies that TextureCaps exist for
>+    // GL_COMPRESSED_RGB_S3TC_DXT1_EXT, GL_COMPRESSED_RGBA_S3TC_DXT1_EXT
>     // GL_COMPRESSED_RGBA_S3TC_DXT3_ANGLE and GL_COMPRESSED_RGBA_S3TC_DXT5_ANGLE
>     bool textureCompressionDXT1;
>     bool textureCompressionDXT3;
>@@ -178,10 +188,50 @@ struct Extensions
>     // GL_KHR_texture_compression_astc_ldr
>     bool textureCompressionASTCLDR;
> 
>+    // GL_EXT_texture_compression_bptc
>+    bool textureCompressionBPTC;
>+
>     // GL_OES_compressed_ETC1_RGB8_texture
>     // Implies that TextureCaps for GL_ETC1_RGB8_OES exist
>     bool compressedETC1RGB8Texture;
> 
>+    // OES_compressed_ETC2_RGB8_texture
>+    bool compressedETC2RGB8Texture;
>+
>+    // OES_compressed_ETC2_sRGB8_texture
>+    bool compressedETC2sRGB8Texture;
>+
>+    // OES_compressed_ETC2_punchthroughA_RGBA8_texture
>+    bool compressedETC2PunchthroughARGB8Texture;
>+
>+    // OES_compressed_ETC2_punchthroughA_sRGB8_alpha_texture
>+    bool compressedETC2PunchthroughAsRGB8AlphaTexture;
>+
>+    // OES_compressed_ETC2_RGBA8_texture
>+    bool compressedETC2RGBA8Texture;
>+
>+    // OES_compressed_ETC2_sRGB8_alpha8_texture
>+    bool compressedETC2sRGB8Alpha8Texture;
>+
>+    // OES_compressed_EAC_R11_unsigned_texture
>+    bool compressedEACR11UnsignedTexture;
>+
>+    // OES_compressed_EAC_R11_signed_texture
>+    bool compressedEACR11SignedTexture;
>+
>+    // OES_compressed_EAC_RG11_unsigned_texture
>+    bool compressedEACRG11UnsignedTexture;
>+
>+    // OES_compressed_EAC_RG11_signed_texture
>+    bool compressedEACRG11SignedTexture;
>+
>+    // GL_CHROMIUM_compressed_texture_etc
>+    // ONLY exposed if ETC texture formats are natively supported without decompression
>+    // Backends should enable this extension explicitly. It is not enabled with
>+    // setTextureExtensionSupport, use DetermineCompressedTextureETCSupport to check if all of the
>+    // individual formats required to support this extension are available.
>+    bool compressedTextureETC;
>+
>     // GL_EXT_sRGB
>     // Implies that TextureCaps for GL_SRGB8_ALPHA8 and GL_SRGB8 exist
>     // TODO: Don't advertise this extension in ES3
>@@ -234,7 +284,11 @@ struct Extensions
>     bool framebufferMultisample;
> 
>     // GL_ANGLE_instanced_arrays
>-    bool instancedArrays;
>+    bool instancedArraysANGLE;
>+    // GL_EXT_instanced_arrays
>+    bool instancedArraysEXT;
>+    // Any version of the instanced arrays extension
>+    bool instancedArraysAny() const { return (instancedArraysANGLE || instancedArraysEXT); }
> 
>     // GL_ANGLE_pack_reverse_row_order
>     bool packReverseRowOrder;
>@@ -248,8 +302,8 @@ struct Extensions
>     // GL_EXT_frag_depth
>     bool fragDepth;
> 
>-    // ANGLE_multiview
>-    bool multiview;
>+    // OVR_multiview2
>+    bool multiview2;
>     GLuint maxViews;
> 
>     // GL_ANGLE_texture_usage
>@@ -276,6 +330,21 @@ struct Extensions
>     // GL_OES_EGL_image_external_essl3
>     bool eglImageExternalEssl3;
> 
>+    // GL_OES_EGL_sync
>+    bool eglSync;
>+
>+    // GL_EXT_memory_object
>+    bool memoryObject;
>+
>+    // GL_EXT_memory_object_fd
>+    bool memoryObjectFd;
>+
>+    // GL_EXT_semaphore
>+    bool semaphore;
>+
>+    // GL_EXT_semaphore_fd
>+    bool semaphoreFd;
>+
>     // NV_EGL_stream_consumer_external
>     bool eglStreamConsumerExternal;
> 
>@@ -313,6 +382,9 @@ struct Extensions
>     // GL_CHROMIUM_copy_compressed_texture
>     bool copyCompressedTexture;
> 
>+    // GL_ANGLE_copy_texture_3d
>+    bool copyTexture3d;
>+
>     // GL_ANGLE_webgl_compatibility
>     bool webglCompatibility;
> 
>@@ -325,6 +397,9 @@ struct Extensions
>     // GL_ANGLE_robust_client_memory
>     bool robustClientMemory;
> 
>+    // GL_OES_texture_border_clamp
>+    bool textureBorderClamp;
>+
>     // GL_EXT_texture_sRGB_decode
>     bool textureSRGBDecode;
> 
>@@ -373,11 +448,53 @@ struct Extensions
> 
>     // GL_EXT_geometry_shader
>     bool geometryShader;
>-    // GL_EXT_geometry_shader (May 31, 2016) Table 20.43gs: Implementation dependent geometry shader
>-    // limits
>-    // TODO(jiawei.shao@intel.com): add all implementation dependent geometry shader limits.
>-    GLuint maxGeometryOutputVertices;
>-    GLuint maxGeometryShaderInvocations;
>+
>+    // GLES1 emulation: GLES1 extensions
>+    // GL_OES_point_size_array
>+    bool pointSizeArray;
>+    // GL_OES_texture_cube_map
>+    bool textureCubeMap;
>+    // GL_OES_point_sprite
>+    bool pointSprite;
>+    // GL_OES_draw_texture
>+    bool drawTexture;
>+
>+    // EGL_ANGLE_explicit_context GL subextensions
>+    // GL_ANGLE_explicit_context_gles1
>+    bool explicitContextGles1;
>+    // GL_ANGLE_explicit_context
>+    bool explicitContext;
>+
>+    // GL_KHR_parallel_shader_compile
>+    bool parallelShaderCompile;
>+
>+    // GL_OES_texture_storage_multisample_2d_array
>+    bool textureStorageMultisample2DArray;
>+
>+    // GL_ANGLE_multiview_multisample
>+    bool multiviewMultisample;
>+
>+    // GL_EXT_blend_func_extended
>+    bool blendFuncExtended;
>+    GLuint maxDualSourceDrawBuffers;
>+
>+    // GL_EXT_float_blend
>+    bool floatBlend;
>+
>+    // GL_ANGLE_memory_size
>+    bool memorySize;
>+
>+    // GL_ANGLE_texture_multisample
>+    bool textureMultisample;
>+
>+    // GL_ANGLE_multi_draw
>+    bool multiDraw;
>+
>+    // GL_ANGLE_provoking_vertex
>+    bool provokingVertex = false;
>+
>+    // GL_CHROMIUM_lose_context
>+    bool loseContextCHROMIUM = false;
> };
> 
> struct ExtensionInfo
>@@ -415,6 +532,12 @@ struct Limitations
>     // Renderer doesn't support Simultaneous use of GL_CONSTANT_ALPHA/GL_ONE_MINUS_CONSTANT_ALPHA
>     // and GL_CONSTANT_COLOR/GL_ONE_MINUS_CONSTANT_COLOR blend functions.
>     bool noSimultaneousConstantColorAndAlphaBlendFunc;
>+
>+    // D3D9 does not support flexible varying register packing.
>+    bool noFlexibleVaryingPacking;
>+
>+    // D3D does not support having multiple transform feedback outputs go to the same buffer.
>+    bool noDoubleBoundTransformFeedbackBuffers;
> };
> 
> struct TypePrecision
>@@ -489,28 +612,36 @@ struct Caps
>     TypePrecision fragmentMediumpInt;
>     TypePrecision fragmentLowpInt;
> 
>+    // Implementation dependent limits required on all shader types.
>+    // TODO(jiawei.shao@intel.com): organize all such limits into ShaderMap.
>+    // ES 3.1 (April 29, 2015) Table 20.43: Implementation dependent Vertex shader limits
>+    // ES 3.1 (April 29, 2015) Table 20.44: Implementation dependent Fragment shader limits
>+    // ES 3.1 (April 29, 2015) Table 20.45: implementation dependent compute shader limits
>+    // GL_EXT_geometry_shader (May 31, 2016) Table 20.43gs: Implementation dependent geometry shader
>+    // limits
>+    // GL_EXT_geometry_shader (May 31, 2016) Table 20.46: Implementation dependent aggregate shader
>+    // limits
>+    ShaderMap<GLuint> maxShaderUniformBlocks;
>+    ShaderMap<GLuint> maxShaderTextureImageUnits;
>+    ShaderMap<GLuint> maxShaderStorageBlocks;
>+    ShaderMap<GLuint> maxShaderUniformComponents;
>+    ShaderMap<GLuint> maxShaderAtomicCounterBuffers;
>+    ShaderMap<GLuint> maxShaderAtomicCounters;
>+    ShaderMap<GLuint> maxShaderImageUniforms;
>+    // Note that we can query MAX_COMPUTE_UNIFORM_COMPONENTS and MAX_GEOMETRY_UNIFORM_COMPONENTS_EXT
>+    // by GetIntegerv, but we can only use GetInteger64v on MAX_VERTEX_UNIFORM_COMPONENTS and
>+    // MAX_FRAGMENT_UNIFORM_COMPONENTS. Currently we use GLuint64 to store all these values so that
>+    // we can put them together into one ShaderMap.
>+    ShaderMap<GLuint64> maxCombinedShaderUniformComponents;
>+
>     // ES 3.1 (April 29, 2015) Table 20.43: Implementation dependent Vertex shader limits
>     GLuint maxVertexAttributes;
>-    GLuint maxVertexUniformComponents;
>     GLuint maxVertexUniformVectors;
>-    GLuint maxVertexUniformBlocks;
>     GLuint maxVertexOutputComponents;
>-    GLuint maxVertexTextureImageUnits;
>-    GLuint maxVertexAtomicCounterBuffers;
>-    GLuint maxVertexAtomicCounters;
>-    GLuint maxVertexImageUniforms;
>-    GLuint maxVertexShaderStorageBlocks;
> 
>     // ES 3.1 (April 29, 2015) Table 20.44: Implementation dependent Fragment shader limits
>-    GLuint maxFragmentUniformComponents;
>     GLuint maxFragmentUniformVectors;
>-    GLuint maxFragmentUniformBlocks;
>     GLuint maxFragmentInputComponents;
>-    GLuint maxTextureImageUnits;
>-    GLuint maxFragmentAtomicCounterBuffers;
>-    GLuint maxFragmentAtomicCounters;
>-    GLuint maxFragmentImageUniforms;
>-    GLuint maxFragmentShaderStorageBlocks;
>     GLint minProgramTextureGatherOffset;
>     GLuint maxProgramTextureGatherOffset;
>     GLint minProgramTexelOffset;
>@@ -520,23 +651,13 @@ struct Caps
>     std::array<GLuint, 3> maxComputeWorkGroupCount;
>     std::array<GLuint, 3> maxComputeWorkGroupSize;
>     GLuint maxComputeWorkGroupInvocations;
>-    GLuint maxComputeUniformBlocks;
>-    GLuint maxComputeTextureImageUnits;
>     GLuint maxComputeSharedMemorySize;
>-    GLuint maxComputeUniformComponents;
>-    GLuint maxComputeAtomicCounterBuffers;
>-    GLuint maxComputeAtomicCounters;
>-    GLuint maxComputeImageUniforms;
>-    GLuint maxCombinedComputeUniformComponents;
>-    GLuint maxComputeShaderStorageBlocks;
> 
>     // ES 3.1 (April 29, 2015) Table 20.46: implementation dependent aggregate shader limits
>     GLuint maxUniformBufferBindings;
>     GLuint64 maxUniformBlockSize;
>     GLuint uniformBufferOffsetAlignment;
>     GLuint maxCombinedUniformBlocks;
>-    GLuint64 maxCombinedVertexUniformComponents;
>-    GLuint64 maxCombinedFragmentUniformComponents;
>     GLuint maxVaryingComponents;
>     GLuint maxVaryingVectors;
>     GLuint maxCombinedTextureImageUnits;
>@@ -562,10 +683,37 @@ struct Caps
> 
>     // ES 3.1 (April 29, 2015) Table 20.49: Framebuffer Dependent Values
>     GLuint maxSamples;
>+
>+    // GL_EXT_geometry_shader (May 31, 2016) Table 20.40: Implementation-Dependent Values (cont.)
>+    GLuint maxFramebufferLayers;
>+    GLuint layerProvokingVertex;
>+
>+    // GL_EXT_geometry_shader (May 31, 2016) Table 20.43gs: Implementation dependent geometry shader
>+    // limits
>+    GLuint maxGeometryInputComponents;
>+    GLuint maxGeometryOutputComponents;
>+    GLuint maxGeometryOutputVertices;
>+    GLuint maxGeometryTotalOutputComponents;
>+    GLuint maxGeometryShaderInvocations;
>+
>+    GLuint subPixelBits;
>+
>+    // GLES1 emulation: Caps for ES 1.1. Taken from Table 6.20 / 6.22 in the OpenGL ES 1.1 spec.
>+    GLuint maxMultitextureUnits;
>+    GLuint maxClipPlanes;
>+    GLuint maxLights;
>+    static constexpr int GlobalMatrixStackDepth = 16;
>+    GLuint maxModelviewMatrixStackDepth;
>+    GLuint maxProjectionMatrixStackDepth;
>+    GLuint maxTextureMatrixStackDepth;
>+    GLfloat minSmoothPointSize;
>+    GLfloat maxSmoothPointSize;
>+    GLfloat minSmoothLineWidth;
>+    GLfloat maxSmoothLineWidth;
> };
> 
> Caps GenerateMinimumCaps(const Version &clientVersion, const Extensions &extensions);
>-}
>+}  // namespace gl
> 
> namespace egl
> {
>@@ -648,6 +796,9 @@ struct DisplayExtensions
>     // EGL_ANGLE_direct_composition
>     bool directComposition;
> 
>+    // EGL_ANGLE_windows_ui_composition
>+    bool windowsUIComposition;
>+
>     // KHR_create_context_no_error
>     bool createContextNoError;
> 
>@@ -660,8 +811,14 @@ struct DisplayExtensions
>     // EGL_NV_stream_consumer_gltexture_yuv
>     bool streamConsumerGLTextureYUV;
> 
>-    // EGL_ANGLE_stream_producer_d3d_texture_nv12
>-    bool streamProducerD3DTextureNV12;
>+    // EGL_ANGLE_stream_producer_d3d_texture
>+    bool streamProducerD3DTexture;
>+
>+    // EGL_KHR_fence_sync
>+    bool fenceSync;
>+
>+    // EGL_KHR_wait_sync
>+    bool waitSync;
> 
>     // EGL_ANGLE_create_context_webgl_compatibility
>     bool createContextWebGLCompatibility;
>@@ -672,7 +829,7 @@ struct DisplayExtensions
>     // EGL_CHROMIUM_get_sync_values
>     bool getSyncValues;
> 
>-    // EGL_EXT_swap_buffers_with_damage
>+    // EGL_KHR_swap_buffers_with_damage
>     bool swapBuffersWithDamage;
> 
>     // EGL_EXT_pixel_format_float
>@@ -692,6 +849,30 @@ struct DisplayExtensions
> 
>     // EGL_ANGLE_robust_resource_initialization
>     bool robustResourceInitialization;
>+
>+    // EGL_ANGLE_iosurface_client_buffer
>+    bool iosurfaceClientBuffer;
>+
>+    // EGL_ANGLE_create_context_extensions_enabled
>+    bool createContextExtensionsEnabled;
>+
>+    // EGL_ANDROID_presentation_time
>+    bool presentationTime;
>+
>+    // EGL_ANDROID_blob_cache
>+    bool blobCache;
>+
>+    // EGL_ANDROID_image_native_buffer
>+    bool imageNativeBuffer;
>+
>+    // EGL_ANDROID_get_frame_timestamps
>+    bool getFrameTimestamps;
>+
>+    // EGL_ANDROID_recordable
>+    bool recordable;
>+
>+    // EGL_ANGLE_power_preference
>+    bool powerPreference;
> };
> 
> struct DeviceExtensions
>@@ -737,6 +918,9 @@ struct ClientExtensions
>     // EGL_ANGLE_platform_angle_vulkan
>     bool platformANGLEVulkan;
> 
>+    // EGL_ANGLE_platform_angle_context_virtualization
>+    bool platformANGLEContextVirtualization;
>+
>     // EGL_ANGLE_device_creation
>     bool deviceCreation;
> 
>@@ -751,8 +935,14 @@ struct ClientExtensions
> 
>     // EGL_KHR_client_get_all_proc_addresses
>     bool clientGetAllProcAddresses;
>+
>+    // EGL_KHR_debug
>+    bool debug;
>+
>+    // EGL_ANGLE_explicit_context
>+    bool explicitContext;
> };
> 
> }  // namespace egl
> 
>-#endif // LIBANGLE_CAPS_H_
>+#endif  // LIBANGLE_CAPS_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/Compiler.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/Compiler.cpp
>index 236c7e1fc2d..22bc4706265 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/Compiler.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/Compiler.cpp
>@@ -9,7 +9,7 @@
> #include "libANGLE/Compiler.h"
> 
> #include "common/debug.h"
>-#include "libANGLE/ContextState.h"
>+#include "libANGLE/State.h"
> #include "libANGLE/renderer/CompilerImpl.h"
> #include "libANGLE/renderer/GLImplFactory.h"
> 
>@@ -19,9 +19,8 @@ namespace gl
> namespace
> {
> 
>-// Global count of active shader compiler handles. Needed to know when to call sh::Initialize and
>-// sh::Finalize.
>-size_t activeCompilerHandles = 0;
>+// To know when to call sh::Initialize and sh::Finalize.
>+size_t gActiveCompilers = 0;
> 
> ShShaderSpec SelectShaderSpec(GLint majorVersion, GLint minorVersion, bool isWebGL)
> {
>@@ -36,51 +35,66 @@ ShShaderSpec SelectShaderSpec(GLint majorVersion, GLint minorVersion, bool isWeb
>             return isWebGL ? SH_WEBGL2_SPEC : SH_GLES3_SPEC;
>         }
>     }
>+
>+    // GLES1 emulation: Use GLES3 shader spec.
>+    if (!isWebGL && majorVersion == 1)
>+    {
>+        return SH_GLES3_SPEC;
>+    }
>+
>     return isWebGL ? SH_WEBGL_SPEC : SH_GLES2_SPEC;
> }
> 
> }  // anonymous namespace
> 
>-Compiler::Compiler(rx::GLImplFactory *implFactory, const ContextState &state)
>+Compiler::Compiler(rx::GLImplFactory *implFactory, const State &state)
>     : mImplementation(implFactory->createCompiler()),
>       mSpec(SelectShaderSpec(state.getClientMajorVersion(),
>                              state.getClientMinorVersion(),
>                              state.getExtensions().webglCompatibility)),
>       mOutputType(mImplementation->getTranslatorOutputType()),
>-      mResources(),
>-      mFragmentCompiler(nullptr),
>-      mVertexCompiler(nullptr),
>-      mComputeCompiler(nullptr),
>-      mGeometryCompiler(nullptr)
>+      mResources()
> {
>-    ASSERT(state.getClientMajorVersion() == 2 || state.getClientMajorVersion() == 3);
>+    ASSERT(state.getClientMajorVersion() == 1 || state.getClientMajorVersion() == 2 ||
>+           state.getClientMajorVersion() == 3);
> 
>     const gl::Caps &caps             = state.getCaps();
>     const gl::Extensions &extensions = state.getExtensions();
> 
>+    if (gActiveCompilers == 0)
>+    {
>+        sh::Initialize();
>+    }
>+    ++gActiveCompilers;
>+
>     sh::InitBuiltInResources(&mResources);
>     mResources.MaxVertexAttribs             = caps.maxVertexAttributes;
>     mResources.MaxVertexUniformVectors      = caps.maxVertexUniformVectors;
>     mResources.MaxVaryingVectors            = caps.maxVaryingVectors;
>-    mResources.MaxVertexTextureImageUnits   = caps.maxVertexTextureImageUnits;
>+    mResources.MaxVertexTextureImageUnits   = caps.maxShaderTextureImageUnits[ShaderType::Vertex];
>     mResources.MaxCombinedTextureImageUnits = caps.maxCombinedTextureImageUnits;
>-    mResources.MaxTextureImageUnits         = caps.maxTextureImageUnits;
>+    mResources.MaxTextureImageUnits         = caps.maxShaderTextureImageUnits[ShaderType::Fragment];
>     mResources.MaxFragmentUniformVectors    = caps.maxFragmentUniformVectors;
>     mResources.MaxDrawBuffers               = caps.maxDrawBuffers;
>     mResources.OES_standard_derivatives     = extensions.standardDerivatives;
>     mResources.EXT_draw_buffers             = extensions.drawBuffers;
>     mResources.EXT_shader_texture_lod       = extensions.shaderTextureLOD;
>-    mResources.OES_EGL_image_external          = extensions.eglImageExternal;
>-    mResources.OES_EGL_image_external_essl3    = extensions.eglImageExternalEssl3;
>+    mResources.OES_EGL_image_external       = extensions.eglImageExternal;
>+    mResources.OES_EGL_image_external_essl3 = extensions.eglImageExternalEssl3;
>     mResources.NV_EGL_stream_consumer_external = extensions.eglStreamConsumerExternal;
>     mResources.ARB_texture_rectangle           = extensions.textureRectangle;
>+    mResources.OES_texture_storage_multisample_2d_array =
>+        extensions.textureStorageMultisample2DArray;
>+    mResources.ANGLE_texture_multisample = extensions.textureMultisample;
>+    mResources.ANGLE_multi_draw          = extensions.multiDraw;
>+
>     // TODO: use shader precision caps to determine if high precision is supported?
>     mResources.FragmentPrecisionHigh = 1;
>     mResources.EXT_frag_depth        = extensions.fragDepth;
> 
>-    // OVR_multiview state
>-    mResources.OVR_multiview = extensions.multiview;
>-    mResources.MaxViewsOVR   = extensions.maxViews;
>+    // OVR_multiview2 state
>+    mResources.OVR_multiview2 = extensions.multiview2;
>+    mResources.MaxViewsOVR    = extensions.maxViews;
> 
>     // GLSL ES 3.0 constants
>     mResources.MaxVertexOutputVectors  = caps.maxVertexOutputComponents / 4;
>@@ -88,13 +102,17 @@ Compiler::Compiler(rx::GLImplFactory *implFactory, const ContextState &state)
>     mResources.MinProgramTexelOffset   = caps.minProgramTexelOffset;
>     mResources.MaxProgramTexelOffset   = caps.maxProgramTexelOffset;
> 
>+    // EXT_blend_func_extended
>+    mResources.EXT_blend_func_extended  = extensions.blendFuncExtended;
>+    mResources.MaxDualSourceDrawBuffers = extensions.maxDualSourceDrawBuffers;
>+
>     // GLSL ES 3.1 constants
>     mResources.MaxProgramTextureGatherOffset    = caps.maxProgramTextureGatherOffset;
>     mResources.MinProgramTextureGatherOffset    = caps.minProgramTextureGatherOffset;
>     mResources.MaxImageUnits                    = caps.maxImageUnits;
>-    mResources.MaxVertexImageUniforms           = caps.maxVertexImageUniforms;
>-    mResources.MaxFragmentImageUniforms         = caps.maxFragmentImageUniforms;
>-    mResources.MaxComputeImageUniforms          = caps.maxComputeImageUniforms;
>+    mResources.MaxVertexImageUniforms           = caps.maxShaderImageUniforms[ShaderType::Vertex];
>+    mResources.MaxFragmentImageUniforms         = caps.maxShaderImageUniforms[ShaderType::Fragment];
>+    mResources.MaxComputeImageUniforms          = caps.maxShaderImageUniforms[ShaderType::Compute];
>     mResources.MaxCombinedImageUniforms         = caps.maxCombinedImageUniforms;
>     mResources.MaxCombinedShaderOutputResources = caps.maxCombinedShaderOutputResources;
>     mResources.MaxUniformLocations              = caps.maxUniformLocations;
>@@ -105,22 +123,25 @@ Compiler::Compiler(rx::GLImplFactory *implFactory, const ContextState &state)
>         mResources.MaxComputeWorkGroupSize[index]  = caps.maxComputeWorkGroupSize[index];
>     }
> 
>-    mResources.MaxComputeUniformComponents = caps.maxComputeUniformComponents;
>-    mResources.MaxComputeTextureImageUnits = caps.maxComputeTextureImageUnits;
>-
>-    mResources.MaxComputeAtomicCounters       = caps.maxComputeAtomicCounters;
>-    mResources.MaxComputeAtomicCounterBuffers = caps.maxComputeAtomicCounterBuffers;
>-
>-    mResources.MaxVertexAtomicCounters         = caps.maxVertexAtomicCounters;
>-    mResources.MaxFragmentAtomicCounters       = caps.maxFragmentAtomicCounters;
>-    mResources.MaxCombinedAtomicCounters       = caps.maxCombinedAtomicCounters;
>-    mResources.MaxAtomicCounterBindings        = caps.maxAtomicCounterBufferBindings;
>-    mResources.MaxVertexAtomicCounterBuffers   = caps.maxVertexAtomicCounterBuffers;
>-    mResources.MaxFragmentAtomicCounterBuffers = caps.maxFragmentAtomicCounterBuffers;
>+    mResources.MaxComputeUniformComponents = caps.maxShaderUniformComponents[ShaderType::Compute];
>+    mResources.MaxComputeTextureImageUnits = caps.maxShaderTextureImageUnits[ShaderType::Compute];
>+
>+    mResources.MaxComputeAtomicCounters = caps.maxShaderAtomicCounters[ShaderType::Compute];
>+    mResources.MaxComputeAtomicCounterBuffers =
>+        caps.maxShaderAtomicCounterBuffers[ShaderType::Compute];
>+
>+    mResources.MaxVertexAtomicCounters   = caps.maxShaderAtomicCounters[ShaderType::Vertex];
>+    mResources.MaxFragmentAtomicCounters = caps.maxShaderAtomicCounters[ShaderType::Fragment];
>+    mResources.MaxCombinedAtomicCounters = caps.maxCombinedAtomicCounters;
>+    mResources.MaxAtomicCounterBindings  = caps.maxAtomicCounterBufferBindings;
>+    mResources.MaxVertexAtomicCounterBuffers =
>+        caps.maxShaderAtomicCounterBuffers[ShaderType::Vertex];
>+    mResources.MaxFragmentAtomicCounterBuffers =
>+        caps.maxShaderAtomicCounterBuffers[ShaderType::Fragment];
>     mResources.MaxCombinedAtomicCounterBuffers = caps.maxCombinedAtomicCounterBuffers;
>     mResources.MaxAtomicCounterBufferSize      = caps.maxAtomicCounterBufferSize;
> 
>-    mResources.MaxUniformBufferBindings = caps.maxUniformBufferBindings;
>+    mResources.MaxUniformBufferBindings       = caps.maxUniformBufferBindings;
>     mResources.MaxShaderStorageBufferBindings = caps.maxShaderStorageBufferBindings;
> 
>     // Needed by point size clamping workaround
>@@ -132,90 +153,126 @@ Compiler::Compiler(rx::GLImplFactory *implFactory, const ContextState &state)
>     }
> 
>     // Geometry Shader constants
>-    mResources.OES_geometry_shader = extensions.geometryShader;
>-    // TODO(jiawei.shao@intel.com): initialize all implementation dependent geometry shader limits.
>-    mResources.MaxGeometryOutputVertices    = extensions.maxGeometryOutputVertices;
>-    mResources.MaxGeometryShaderInvocations = extensions.maxGeometryShaderInvocations;
>+    mResources.EXT_geometry_shader          = extensions.geometryShader;
>+    mResources.MaxGeometryUniformComponents = caps.maxShaderUniformComponents[ShaderType::Geometry];
>+    mResources.MaxGeometryUniformBlocks     = caps.maxShaderUniformBlocks[ShaderType::Geometry];
>+    mResources.MaxGeometryInputComponents   = caps.maxGeometryInputComponents;
>+    mResources.MaxGeometryOutputComponents  = caps.maxGeometryOutputComponents;
>+    mResources.MaxGeometryOutputVertices    = caps.maxGeometryOutputVertices;
>+    mResources.MaxGeometryTotalOutputComponents = caps.maxGeometryTotalOutputComponents;
>+    mResources.MaxGeometryTextureImageUnits = caps.maxShaderTextureImageUnits[ShaderType::Geometry];
>+
>+    mResources.MaxGeometryAtomicCounterBuffers =
>+        caps.maxShaderAtomicCounterBuffers[ShaderType::Geometry];
>+    mResources.MaxGeometryAtomicCounters      = caps.maxShaderAtomicCounters[ShaderType::Geometry];
>+    mResources.MaxGeometryShaderStorageBlocks = caps.maxShaderStorageBlocks[ShaderType::Geometry];
>+    mResources.MaxGeometryShaderInvocations   = caps.maxGeometryShaderInvocations;
>+    mResources.MaxGeometryImageUniforms       = caps.maxShaderImageUniforms[ShaderType::Geometry];
> }
> 
> Compiler::~Compiler()
> {
>-    if (mFragmentCompiler)
>+    for (auto &pool : mPools)
>     {
>-        sh::Destruct(mFragmentCompiler);
>-        mFragmentCompiler = nullptr;
>-
>-        ASSERT(activeCompilerHandles > 0);
>-        activeCompilerHandles--;
>+        for (ShCompilerInstance &instance : pool)
>+        {
>+            instance.destroy();
>+        }
>     }
>-
>-    if (mVertexCompiler)
>+    --gActiveCompilers;
>+    if (gActiveCompilers == 0)
>     {
>-        sh::Destruct(mVertexCompiler);
>-        mVertexCompiler = nullptr;
>-
>-        ASSERT(activeCompilerHandles > 0);
>-        activeCompilerHandles--;
>+        sh::Finalize();
>     }
>+}
> 
>-    if (mComputeCompiler)
>+ShCompilerInstance Compiler::getInstance(ShaderType type)
>+{
>+    ASSERT(type != ShaderType::InvalidEnum);
>+    auto &pool = mPools[type];
>+    if (pool.empty())
>     {
>-        sh::Destruct(mComputeCompiler);
>-        mComputeCompiler = nullptr;
>-
>-        ASSERT(activeCompilerHandles > 0);
>-        activeCompilerHandles--;
>+        ShHandle handle = sh::ConstructCompiler(ToGLenum(type), mSpec, mOutputType, &mResources);
>+        ASSERT(handle);
>+        return ShCompilerInstance(handle, mOutputType, type);
>+    }
>+    else
>+    {
>+        ShCompilerInstance instance = std::move(pool.back());
>+        pool.pop_back();
>+        return instance;
>     }
>+}
> 
>-    if (activeCompilerHandles == 0)
>+void Compiler::putInstance(ShCompilerInstance &&instance)
>+{
>+    static constexpr size_t kMaxPoolSize = 32;
>+    auto &pool                           = mPools[instance.getShaderType()];
>+    if (pool.size() < kMaxPoolSize)
>     {
>-        sh::Finalize();
>+        pool.push_back(std::move(instance));
>+    }
>+    else
>+    {
>+        instance.destroy();
>     }
>+}
>+
>+ShCompilerInstance::ShCompilerInstance() : mHandle(nullptr) {}
>+
>+ShCompilerInstance::ShCompilerInstance(ShHandle handle,
>+                                       ShShaderOutput outputType,
>+                                       ShaderType shaderType)
>+    : mHandle(handle), mOutputType(outputType), mShaderType(shaderType)
>+{}
> 
>-    ANGLE_SWALLOW_ERR(mImplementation->release());
>+ShCompilerInstance::~ShCompilerInstance()
>+{
>+    ASSERT(mHandle == nullptr);
> }
> 
>-ShHandle Compiler::getCompilerHandle(GLenum type)
>+void ShCompilerInstance::destroy()
> {
>-    ShHandle *compiler = nullptr;
>-    switch (type)
>+    if (mHandle != nullptr)
>     {
>-        case GL_VERTEX_SHADER:
>-            compiler = &mVertexCompiler;
>-            break;
>-
>-        case GL_FRAGMENT_SHADER:
>-            compiler = &mFragmentCompiler;
>-            break;
>-        case GL_COMPUTE_SHADER:
>-            compiler = &mComputeCompiler;
>-            break;
>-        case GL_GEOMETRY_SHADER_EXT:
>-            compiler = &mGeometryCompiler;
>-            break;
>-        default:
>-            UNREACHABLE();
>-            return nullptr;
>+        sh::Destruct(mHandle);
>+        mHandle = nullptr;
>     }
>+}
> 
>-    if (!(*compiler))
>-    {
>-        if (activeCompilerHandles == 0)
>-        {
>-            sh::Initialize();
>-        }
>+ShCompilerInstance::ShCompilerInstance(ShCompilerInstance &&other)
>+    : mHandle(other.mHandle), mOutputType(other.mOutputType), mShaderType(other.mShaderType)
>+{
>+    other.mHandle = nullptr;
>+}
> 
>-        *compiler = sh::ConstructCompiler(type, mSpec, mOutputType, &mResources);
>-        ASSERT(*compiler);
>-        activeCompilerHandles++;
>-    }
>+ShCompilerInstance &ShCompilerInstance::operator=(ShCompilerInstance &&other)
>+{
>+    mHandle       = other.mHandle;
>+    mOutputType   = other.mOutputType;
>+    mShaderType   = other.mShaderType;
>+    other.mHandle = nullptr;
>+    return *this;
>+}
> 
>-    return *compiler;
>+ShHandle ShCompilerInstance::getHandle()
>+{
>+    return mHandle;
>+}
>+
>+ShaderType ShCompilerInstance::getShaderType() const
>+{
>+    return mShaderType;
>+}
>+
>+const std::string &ShCompilerInstance::getBuiltinResourcesString()
>+{
>+    return sh::GetBuiltInResourcesString(mHandle);
> }
> 
>-const std::string &Compiler::getBuiltinResourcesString(GLenum type)
>+ShShaderOutput ShCompilerInstance::getShaderOutputType() const
> {
>-    return sh::GetBuiltInResourcesString(getCompilerHandle(type));
>+    return mOutputType;
> }
> 
> }  // namespace gl
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/Compiler.h b/Source/ThirdParty/ANGLE/src/libANGLE/Compiler.h
>index b7f7e9f31b8..0b1105a279c 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/Compiler.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/Compiler.h
>@@ -10,7 +10,10 @@
> #ifndef LIBANGLE_COMPILER_H_
> #define LIBANGLE_COMPILER_H_
> 
>+#include <vector>
>+
> #include "GLSLANG/ShaderLang.h"
>+#include "common/PackedEnums.h"
> #include "libANGLE/Error.h"
> #include "libANGLE/RefCountObject.h"
> 
>@@ -18,20 +21,21 @@ namespace rx
> {
> class CompilerImpl;
> class GLImplFactory;
>-}
>+}  // namespace rx
> 
> namespace gl
> {
>-class ContextState;
>+class ShCompilerInstance;
>+class State;
> 
> class Compiler final : public RefCountObjectNoID
> {
>   public:
>-    Compiler(rx::GLImplFactory *implFactory, const ContextState &data);
>+    Compiler(rx::GLImplFactory *implFactory, const State &data);
> 
>-    ShHandle getCompilerHandle(GLenum type);
>+    ShCompilerInstance getInstance(ShaderType shaderType);
>+    void putInstance(ShCompilerInstance &&instance);
>     ShShaderOutput getShaderOutputType() const { return mOutputType; }
>-    const std::string &getBuiltinResourcesString(GLenum type);
> 
>   private:
>     ~Compiler() override;
>@@ -39,13 +43,31 @@ class Compiler final : public RefCountObjectNoID
>     ShShaderSpec mSpec;
>     ShShaderOutput mOutputType;
>     ShBuiltInResources mResources;
>+    ShaderMap<std::vector<ShCompilerInstance>> mPools;
>+};
>+
>+class ShCompilerInstance final : public angle::NonCopyable
>+{
>+  public:
>+    ShCompilerInstance();
>+    ShCompilerInstance(ShHandle handle, ShShaderOutput outputType, ShaderType shaderType);
>+    ~ShCompilerInstance();
>+    void destroy();
> 
>-    ShHandle mFragmentCompiler;
>-    ShHandle mVertexCompiler;
>-    ShHandle mComputeCompiler;
>-    ShHandle mGeometryCompiler;
>+    ShCompilerInstance(ShCompilerInstance &&other);
>+    ShCompilerInstance &operator=(ShCompilerInstance &&other);
>+
>+    ShHandle getHandle();
>+    ShaderType getShaderType() const;
>+    const std::string &getBuiltinResourcesString();
>+    ShShaderOutput getShaderOutputType() const;
>+
>+  private:
>+    ShHandle mHandle;
>+    ShShaderOutput mOutputType;
>+    ShaderType mShaderType;
> };
> 
> }  // namespace gl
> 
>-#endif // LIBANGLE_COMPILER_H_
>+#endif  // LIBANGLE_COMPILER_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/Config.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/Config.cpp
>index ccf64c8f86f..4134226d052 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/Config.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/Config.cpp
>@@ -14,8 +14,8 @@
> #include <algorithm>
> #include <vector>
> 
>-#include "angle_gl.h"
> #include <EGL/eglext.h>
>+#include "angle_gl.h"
> 
> #include "common/debug.h"
> 
>@@ -34,7 +34,7 @@ Config::Config()
>       alphaMaskSize(0),
>       bindToTextureRGB(EGL_FALSE),
>       bindToTextureRGBA(EGL_FALSE),
>-      colorBufferType(EGL_NONE),
>+      colorBufferType(EGL_RGB_BUFFER),
>       configCaveat(EGL_NONE),
>       configID(0),
>       conformant(0),
>@@ -59,13 +59,11 @@ Config::Config()
>       transparentGreenValue(0),
>       transparentBlueValue(0),
>       optimalOrientation(0),
>-      colorComponentType(EGL_COLOR_COMPONENT_TYPE_FIXED_EXT)
>-{
>-}
>+      colorComponentType(EGL_COLOR_COMPONENT_TYPE_FIXED_EXT),
>+      recordable(EGL_FALSE)
>+{}
> 
>-Config::~Config()
>-{
>-}
>+Config::~Config() {}
> 
> Config::Config(const Config &other) = default;
> 
>@@ -121,7 +119,8 @@ bool ConfigSet::contains(const Config *config) const
>     return false;
> }
> 
>-// Function object used by STL sorting routines for ordering Configs according to [EGL 1.5] section 3.4.1.2 page 28.
>+// Function object used by STL sorting routines for ordering Configs according to [EGL 1.5]
>+// section 3.4.1.2 page 28.
> class ConfigSorter
> {
>   public:
>@@ -135,20 +134,19 @@ class ConfigSorter
>         scanForWantedComponents(attributeMap);
>     }
> 
>-    bool operator()(const Config *x, const Config *y) const
>-    {
>-        return (*this)(*x, *y);
>-    }
>+    bool operator()(const Config *x, const Config *y) const { return (*this)(*x, *y); }
> 
>     bool operator()(const Config &x, const Config &y) const
>     {
>-        #define SORT(attribute)                        \
>-            if (x.attribute != y.attribute)            \
>-            {                                          \
>-                return x.attribute < y.attribute;      \
>-            }
>-
>-        static_assert(EGL_NONE < EGL_SLOW_CONFIG && EGL_SLOW_CONFIG < EGL_NON_CONFORMANT_CONFIG, "Unexpected EGL enum value.");
>+#define SORT(attribute)                       \
>+    do                                        \
>+    {                                         \
>+        if (x.attribute != y.attribute)       \
>+            return x.attribute < y.attribute; \
>+    } while (0)
>+
>+        static_assert(EGL_NONE < EGL_SLOW_CONFIG && EGL_SLOW_CONFIG < EGL_NON_CONFORMANT_CONFIG,
>+                      "Unexpected EGL enum value.");
>         SORT(configCaveat);
> 
>         static_assert(EGL_COLOR_COMPONENT_TYPE_FIXED_EXT < EGL_COLOR_COMPONENT_TYPE_FLOAT_EXT,
>@@ -158,7 +156,8 @@ class ConfigSorter
>         static_assert(EGL_RGB_BUFFER < EGL_LUMINANCE_BUFFER, "Unexpected EGL enum value.");
>         SORT(colorBufferType);
> 
>-        // By larger total number of color bits, only considering those that are requested to be > 0.
>+        // By larger total number of color bits, only considering those that are requested to be >
>+        // 0.
>         EGLint xComponentsSize = wantedComponentsSize(x);
>         EGLint yComponentsSize = wantedComponentsSize(y);
>         if (xComponentsSize != yComponentsSize)
>@@ -175,7 +174,7 @@ class ConfigSorter
>         SORT(nativeVisualType);
>         SORT(configID);
> 
>-        #undef SORT
>+#undef SORT
> 
>         return false;
>     }
>@@ -203,11 +202,16 @@ class ConfigSorter
>     {
>         EGLint total = 0;
> 
>-        if (mWantRed)       total += config.redSize;
>-        if (mWantGreen)     total += config.greenSize;
>-        if (mWantBlue)      total += config.blueSize;
>-        if (mWantAlpha)     total += config.alphaSize;
>-        if (mWantLuminance) total += config.luminanceSize;
>+        if (mWantRed)
>+            total += config.redSize;
>+        if (mWantGreen)
>+            total += config.greenSize;
>+        if (mWantBlue)
>+            total += config.blueSize;
>+        if (mWantAlpha)
>+            total += config.alphaSize;
>+        if (mWantLuminance)
>+            total += config.luminanceSize;
> 
>         return total;
>     }
>@@ -219,15 +223,15 @@ class ConfigSorter
>     bool mWantLuminance;
> };
> 
>-std::vector<const Config*> ConfigSet::filter(const AttributeMap &attributeMap) const
>+std::vector<const Config *> ConfigSet::filter(const AttributeMap &attributeMap) const
> {
>-    std::vector<const Config*> result;
>+    std::vector<const Config *> result;
>     result.reserve(mConfigs.size());
> 
>     for (auto configIter = mConfigs.begin(); configIter != mConfigs.end(); configIter++)
>     {
>         const Config &config = configIter->second;
>-        bool match = true;
>+        bool match           = true;
> 
>         for (auto attribIter = attributeMap.begin(); attribIter != attributeMap.end(); attribIter++)
>         {
>@@ -241,45 +245,123 @@ std::vector<const Config*> ConfigSet::filter(const AttributeMap &attributeMap) c
> 
>             switch (attributeKey)
>             {
>-              case EGL_BUFFER_SIZE:               match = config.bufferSize >= attributeValue;                        break;
>-              case EGL_ALPHA_SIZE:                match = config.alphaSize >= attributeValue;                         break;
>-              case EGL_BLUE_SIZE:                 match = config.blueSize >= attributeValue;                          break;
>-              case EGL_GREEN_SIZE:                match = config.greenSize >= attributeValue;                         break;
>-              case EGL_RED_SIZE:                  match = config.redSize >= attributeValue;                           break;
>-              case EGL_DEPTH_SIZE:                match = config.depthSize >= attributeValue;                         break;
>-              case EGL_STENCIL_SIZE:              match = config.stencilSize >= attributeValue;                       break;
>-              case EGL_CONFIG_CAVEAT:             match = config.configCaveat == (EGLenum)attributeValue;             break;
>-              case EGL_CONFIG_ID:                 match = config.configID == attributeValue;                          break;
>-              case EGL_LEVEL:                     match = config.level >= attributeValue;                             break;
>-              case EGL_NATIVE_RENDERABLE:         match = config.nativeRenderable == (EGLBoolean)attributeValue;      break;
>-              case EGL_NATIVE_VISUAL_TYPE:        match = config.nativeVisualType == attributeValue;                  break;
>-              case EGL_SAMPLES:                   match = config.samples >= attributeValue;                           break;
>-              case EGL_SAMPLE_BUFFERS:            match = config.sampleBuffers >= attributeValue;                     break;
>-              case EGL_SURFACE_TYPE:              match = (config.surfaceType & attributeValue) == attributeValue;    break;
>-              case EGL_TRANSPARENT_TYPE:          match = config.transparentType == (EGLenum)attributeValue;          break;
>-              case EGL_TRANSPARENT_BLUE_VALUE:    match = config.transparentBlueValue == attributeValue;              break;
>-              case EGL_TRANSPARENT_GREEN_VALUE:   match = config.transparentGreenValue == attributeValue;             break;
>-              case EGL_TRANSPARENT_RED_VALUE:     match = config.transparentRedValue == attributeValue;               break;
>-              case EGL_BIND_TO_TEXTURE_RGB:       match = config.bindToTextureRGB == (EGLBoolean)attributeValue;      break;
>-              case EGL_BIND_TO_TEXTURE_RGBA:      match = config.bindToTextureRGBA == (EGLBoolean)attributeValue;     break;
>-              case EGL_MIN_SWAP_INTERVAL:         match = config.minSwapInterval == attributeValue;                   break;
>-              case EGL_MAX_SWAP_INTERVAL:         match = config.maxSwapInterval == attributeValue;                   break;
>-              case EGL_LUMINANCE_SIZE:            match = config.luminanceSize >= attributeValue;                     break;
>-              case EGL_ALPHA_MASK_SIZE:           match = config.alphaMaskSize >= attributeValue;                     break;
>-              case EGL_COLOR_BUFFER_TYPE:         match = config.colorBufferType == (EGLenum)attributeValue;          break;
>-              case EGL_RENDERABLE_TYPE:           match = (config.renderableType & attributeValue) == attributeValue; break;
>-              case EGL_MATCH_NATIVE_PIXMAP:       match = false; UNIMPLEMENTED();                                     break;
>-              case EGL_CONFORMANT:                match = (config.conformant & attributeValue) == attributeValue;     break;
>-              case EGL_MAX_PBUFFER_WIDTH:         match = config.maxPBufferWidth >= attributeValue;                   break;
>-              case EGL_MAX_PBUFFER_HEIGHT:        match = config.maxPBufferHeight >= attributeValue;                  break;
>-              case EGL_MAX_PBUFFER_PIXELS:        match = config.maxPBufferPixels >= attributeValue;                  break;
>-              case EGL_OPTIMAL_SURFACE_ORIENTATION_ANGLE:
>-                  match = config.optimalOrientation == attributeValue;
>-                  break;
>-              case EGL_COLOR_COMPONENT_TYPE_EXT:
>-                  match = config.colorComponentType == static_cast<EGLenum>(attributeValue);
>-                  break;
>-              default: UNREACHABLE();
>+                case EGL_BUFFER_SIZE:
>+                    match = config.bufferSize >= attributeValue;
>+                    break;
>+                case EGL_ALPHA_SIZE:
>+                    match = config.alphaSize >= attributeValue;
>+                    break;
>+                case EGL_BLUE_SIZE:
>+                    match = config.blueSize >= attributeValue;
>+                    break;
>+                case EGL_GREEN_SIZE:
>+                    match = config.greenSize >= attributeValue;
>+                    break;
>+                case EGL_RED_SIZE:
>+                    match = config.redSize >= attributeValue;
>+                    break;
>+                case EGL_DEPTH_SIZE:
>+                    match = config.depthSize >= attributeValue;
>+                    break;
>+                case EGL_STENCIL_SIZE:
>+                    match = config.stencilSize >= attributeValue;
>+                    break;
>+                case EGL_CONFIG_CAVEAT:
>+                    match = config.configCaveat == static_cast<EGLenum>(attributeValue);
>+                    break;
>+                case EGL_CONFIG_ID:
>+                    match = config.configID == attributeValue;
>+                    break;
>+                case EGL_LEVEL:
>+                    match = config.level == attributeValue;
>+                    break;
>+                case EGL_NATIVE_RENDERABLE:
>+                    match = config.nativeRenderable == static_cast<EGLBoolean>(attributeValue);
>+                    break;
>+                case EGL_NATIVE_VISUAL_TYPE:
>+                    match = config.nativeVisualType == attributeValue;
>+                    break;
>+                case EGL_SAMPLES:
>+                    match = config.samples >= attributeValue;
>+                    break;
>+                case EGL_SAMPLE_BUFFERS:
>+                    match = config.sampleBuffers >= attributeValue;
>+                    break;
>+                case EGL_SURFACE_TYPE:
>+                    match = (config.surfaceType & attributeValue) == attributeValue;
>+                    break;
>+                case EGL_TRANSPARENT_TYPE:
>+                    match = config.transparentType == static_cast<EGLenum>(attributeValue);
>+                    break;
>+                case EGL_TRANSPARENT_BLUE_VALUE:
>+                    if (attributeMap.get(EGL_TRANSPARENT_TYPE, EGL_NONE) != EGL_NONE)
>+                    {
>+                        match = config.transparentBlueValue == attributeValue;
>+                    }
>+                    break;
>+                case EGL_TRANSPARENT_GREEN_VALUE:
>+                    if (attributeMap.get(EGL_TRANSPARENT_TYPE, EGL_NONE) != EGL_NONE)
>+                    {
>+                        match = config.transparentGreenValue == attributeValue;
>+                    }
>+                    break;
>+                case EGL_TRANSPARENT_RED_VALUE:
>+                    if (attributeMap.get(EGL_TRANSPARENT_TYPE, EGL_NONE) != EGL_NONE)
>+                    {
>+                        match = config.transparentRedValue == attributeValue;
>+                    }
>+                    break;
>+                case EGL_BIND_TO_TEXTURE_RGB:
>+                    match = config.bindToTextureRGB == static_cast<EGLBoolean>(attributeValue);
>+                    break;
>+                case EGL_BIND_TO_TEXTURE_RGBA:
>+                    match = config.bindToTextureRGBA == static_cast<EGLBoolean>(attributeValue);
>+                    break;
>+                case EGL_MIN_SWAP_INTERVAL:
>+                    match = config.minSwapInterval == attributeValue;
>+                    break;
>+                case EGL_MAX_SWAP_INTERVAL:
>+                    match = config.maxSwapInterval == attributeValue;
>+                    break;
>+                case EGL_LUMINANCE_SIZE:
>+                    match = config.luminanceSize >= attributeValue;
>+                    break;
>+                case EGL_ALPHA_MASK_SIZE:
>+                    match = config.alphaMaskSize >= attributeValue;
>+                    break;
>+                case EGL_COLOR_BUFFER_TYPE:
>+                    match = config.colorBufferType == static_cast<EGLenum>(attributeValue);
>+                    break;
>+                case EGL_RENDERABLE_TYPE:
>+                    match = (config.renderableType & attributeValue) == attributeValue;
>+                    break;
>+                case EGL_MATCH_NATIVE_PIXMAP:
>+                    match = false;
>+                    UNIMPLEMENTED();
>+                    break;
>+                case EGL_CONFORMANT:
>+                    match = (config.conformant & attributeValue) == attributeValue;
>+                    break;
>+                case EGL_MAX_PBUFFER_WIDTH:
>+                    match = config.maxPBufferWidth >= attributeValue;
>+                    break;
>+                case EGL_MAX_PBUFFER_HEIGHT:
>+                    match = config.maxPBufferHeight >= attributeValue;
>+                    break;
>+                case EGL_MAX_PBUFFER_PIXELS:
>+                    match = config.maxPBufferPixels >= attributeValue;
>+                    break;
>+                case EGL_OPTIMAL_SURFACE_ORIENTATION_ANGLE:
>+                    match = config.optimalOrientation == attributeValue;
>+                    break;
>+                case EGL_COLOR_COMPONENT_TYPE_EXT:
>+                    match = config.colorComponentType == static_cast<EGLenum>(attributeValue);
>+                    break;
>+                case EGL_RECORDABLE_ANDROID:
>+                    match = config.recordable == static_cast<EGLBoolean>(attributeValue);
>+                    break;
>+                default:
>+                    UNREACHABLE();
>             }
> 
>             if (!match)
>@@ -300,4 +382,13 @@ std::vector<const Config*> ConfigSet::filter(const AttributeMap &attributeMap) c
>     return result;
> }
> 
>+ConfigSet::ConfigMap::iterator ConfigSet::begin()
>+{
>+    return mConfigs.begin();
>+}
>+
>+ConfigSet::ConfigMap::iterator ConfigSet::end()
>+{
>+    return mConfigs.end();
> }
>+}  // namespace egl
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/Config.h b/Source/ThirdParty/ANGLE/src/libANGLE/Config.h
>index f2fbe8b95a0..e4c3921dc47 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/Config.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/Config.h
>@@ -31,48 +31,52 @@ struct Config
>     Config(const Config &other);
>     Config &operator=(const Config &other);
> 
>-    GLenum renderTargetFormat;      // TODO(geofflang): remove this
>-    GLenum depthStencilFormat;      // TODO(geofflang): remove this
>-
>-    EGLint bufferSize;              // Depth of the color buffer
>-    EGLint redSize;                 // Bits of Red in the color buffer
>-    EGLint greenSize;               // Bits of Green in the color buffer
>-    EGLint blueSize;                // Bits of Blue in the color buffer
>-    EGLint luminanceSize;           // Bits of Luminance in the color buffer
>-    EGLint alphaSize;               // Bits of Alpha in the color buffer
>-    EGLint alphaMaskSize;           // Bits of Alpha Mask in the mask buffer
>-    EGLBoolean bindToTextureRGB;    // True if bindable to RGB textures.
>-    EGLBoolean bindToTextureRGBA;   // True if bindable to RGBA textures.
>-    EGLenum colorBufferType;        // Color buffer type
>-    EGLenum configCaveat;           // Any caveats for the configuration
>-    EGLint configID;                // Unique EGLConfig identifier
>-    EGLint conformant;              // Whether contexts created with this config are conformant
>-    EGLint depthSize;               // Bits of Z in the depth buffer
>-    EGLint level;                   // Frame buffer level
>-    EGLBoolean matchNativePixmap;   // Match the native pixmap format
>-    EGLint maxPBufferWidth;         // Maximum width of pbuffer
>-    EGLint maxPBufferHeight;        // Maximum height of pbuffer
>-    EGLint maxPBufferPixels;        // Maximum size of pbuffer
>-    EGLint maxSwapInterval;         // Maximum swap interval
>-    EGLint minSwapInterval;         // Minimum swap interval
>-    EGLBoolean nativeRenderable;    // EGL_TRUE if native rendering APIs can render to surface
>-    EGLint nativeVisualID;          // Handle of corresponding native visual
>-    EGLint nativeVisualType;        // Native visual type of the associated visual
>-    EGLint renderableType;          // Which client rendering APIs are supported.
>-    EGLint sampleBuffers;           // Number of multisample buffers
>-    EGLint samples;                 // Number of samples per pixel
>-    EGLint stencilSize;             // Bits of Stencil in the stencil buffer
>-    EGLint surfaceType;             // Which types of EGL surfaces are supported.
>-    EGLenum transparentType;        // Type of transparency supported
>-    EGLint transparentRedValue;     // Transparent red value
>-    EGLint transparentGreenValue;   // Transparent green value
>-    EGLint transparentBlueValue;    // Transparent blue value
>-    EGLint optimalOrientation;      // Optimal window surface orientation
>-    EGLenum colorComponentType;     // Color component type
>+    GLenum renderTargetFormat;  // TODO(geofflang): remove this
>+    GLenum depthStencilFormat;  // TODO(geofflang): remove this
>+
>+    EGLint bufferSize;             // Depth of the color buffer
>+    EGLint redSize;                // Bits of Red in the color buffer
>+    EGLint greenSize;              // Bits of Green in the color buffer
>+    EGLint blueSize;               // Bits of Blue in the color buffer
>+    EGLint luminanceSize;          // Bits of Luminance in the color buffer
>+    EGLint alphaSize;              // Bits of Alpha in the color buffer
>+    EGLint alphaMaskSize;          // Bits of Alpha Mask in the mask buffer
>+    EGLBoolean bindToTextureRGB;   // True if bindable to RGB textures.
>+    EGLBoolean bindToTextureRGBA;  // True if bindable to RGBA textures.
>+    EGLenum colorBufferType;       // Color buffer type
>+    EGLenum configCaveat;          // Any caveats for the configuration
>+    EGLint configID;               // Unique EGLConfig identifier
>+    EGLint conformant;             // Whether contexts created with this config are conformant
>+    EGLint depthSize;              // Bits of Z in the depth buffer
>+    EGLint level;                  // Frame buffer level
>+    EGLBoolean matchNativePixmap;  // Match the native pixmap format
>+    EGLint maxPBufferWidth;        // Maximum width of pbuffer
>+    EGLint maxPBufferHeight;       // Maximum height of pbuffer
>+    EGLint maxPBufferPixels;       // Maximum size of pbuffer
>+    EGLint maxSwapInterval;        // Maximum swap interval
>+    EGLint minSwapInterval;        // Minimum swap interval
>+    EGLBoolean nativeRenderable;   // EGL_TRUE if native rendering APIs can render to surface
>+    EGLint nativeVisualID;         // Handle of corresponding native visual
>+    EGLint nativeVisualType;       // Native visual type of the associated visual
>+    EGLint renderableType;         // Which client rendering APIs are supported.
>+    EGLint sampleBuffers;          // Number of multisample buffers
>+    EGLint samples;                // Number of samples per pixel
>+    EGLint stencilSize;            // Bits of Stencil in the stencil buffer
>+    EGLint surfaceType;            // Which types of EGL surfaces are supported.
>+    EGLenum transparentType;       // Type of transparency supported
>+    EGLint transparentRedValue;    // Transparent red value
>+    EGLint transparentGreenValue;  // Transparent green value
>+    EGLint transparentBlueValue;   // Transparent blue value
>+    EGLint optimalOrientation;     // Optimal window surface orientation
>+    EGLenum colorComponentType;    // Color component type
>+    EGLBoolean recordable;         // EGL_TRUE if a surface can support recording on Android
> };
> 
> class ConfigSet
> {
>+  private:
>+    typedef std::map<EGLint, Config> ConfigMap;
>+
>   public:
>     ConfigSet();
>     ConfigSet(const ConfigSet &other);
>@@ -89,13 +93,15 @@ class ConfigSet
>     bool contains(const Config *config) const;
> 
>     // Filter configurations based on the table in [EGL 1.5] section 3.4.1.2 page 29
>-    std::vector<const Config*> filter(const AttributeMap &attributeMap) const;
>+    std::vector<const Config *> filter(const AttributeMap &attributeMap) const;
>+
>+    ConfigMap::iterator begin();
>+    ConfigMap::iterator end();
> 
>   private:
>-    typedef std::map<EGLint, Config> ConfigMap;
>     ConfigMap mConfigs;
> };
> 
>-}
>+}  // namespace egl
> 
>-#endif   // INCLUDE_CONFIG_H_
>+#endif  // INCLUDE_CONFIG_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/Config_unittest.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/Config_unittest.cpp
>index 4c49df6006b..38e39b02a2e 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/Config_unittest.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/Config_unittest.cpp
>@@ -6,6 +6,7 @@
> 
> #include "gmock/gmock.h"
> #include "gtest/gtest.h"
>+
> #include "libANGLE/AttributeMap.h"
> #include "libANGLE/Config.h"
> 
>@@ -15,39 +16,39 @@ static egl::Config GenerateGenericConfig()
> {
>     egl::Config config;
> 
>-    config.bufferSize = 24;
>-    config.redSize = 8;
>-    config.greenSize = 8;
>-    config.blueSize = 8;
>-    config.luminanceSize = 0;
>-    config.alphaSize = 8;
>-    config.alphaMaskSize = 0;
>-    config.bindToTextureRGB = EGL_TRUE;
>-    config.bindToTextureRGBA = EGL_TRUE;
>-    config.colorBufferType = EGL_RGB_BUFFER;
>-    config.configCaveat = EGL_NONE;
>-    config.configID = 0;
>-    config.conformant = EGL_OPENGL_ES2_BIT;
>-    config.depthSize = 24;
>-    config.level = 0;
>-    config.matchNativePixmap = EGL_NONE;
>-    config.maxPBufferWidth = 1024;
>-    config.maxPBufferHeight = 1024;
>-    config.maxPBufferPixels = config.maxPBufferWidth * config.maxPBufferWidth;
>-    config.maxSwapInterval = 0;
>-    config.minSwapInterval = 4;
>-    config.nativeRenderable = EGL_OPENGL_ES2_BIT;
>-    config.nativeVisualID = 0;
>-    config.nativeVisualType = 0;
>-    config.renderableType = EGL_FALSE;
>-    config.sampleBuffers = 0;
>-    config.samples = 0;
>-    config.stencilSize = 8;
>-    config.surfaceType = EGL_PBUFFER_BIT | EGL_WINDOW_BIT | EGL_SWAP_BEHAVIOR_PRESERVED_BIT;
>-    config.transparentType = EGL_NONE;
>+    config.bufferSize          = 24;
>+    config.redSize             = 8;
>+    config.greenSize           = 8;
>+    config.blueSize            = 8;
>+    config.luminanceSize       = 0;
>+    config.alphaSize           = 8;
>+    config.alphaMaskSize       = 0;
>+    config.bindToTextureRGB    = EGL_TRUE;
>+    config.bindToTextureRGBA   = EGL_TRUE;
>+    config.colorBufferType     = EGL_RGB_BUFFER;
>+    config.configCaveat        = EGL_NONE;
>+    config.configID            = 0;
>+    config.conformant          = EGL_OPENGL_ES2_BIT;
>+    config.depthSize           = 24;
>+    config.level               = 0;
>+    config.matchNativePixmap   = EGL_NONE;
>+    config.maxPBufferWidth     = 1024;
>+    config.maxPBufferHeight    = 1024;
>+    config.maxPBufferPixels    = config.maxPBufferWidth * config.maxPBufferWidth;
>+    config.maxSwapInterval     = 0;
>+    config.minSwapInterval     = 4;
>+    config.nativeRenderable    = EGL_OPENGL_ES2_BIT;
>+    config.nativeVisualID      = 0;
>+    config.nativeVisualType    = 0;
>+    config.renderableType      = EGL_FALSE;
>+    config.sampleBuffers       = 0;
>+    config.samples             = 0;
>+    config.stencilSize         = 8;
>+    config.surfaceType         = EGL_PBUFFER_BIT | EGL_WINDOW_BIT | EGL_SWAP_BEHAVIOR_PRESERVED_BIT;
>+    config.transparentType     = EGL_NONE;
>     config.transparentRedValue = 0;
>     config.transparentGreenValue = 0;
>-    config.transparentBlueValue = 0;
>+    config.transparentBlueValue  = 0;
> 
>     return config;
> }
>@@ -59,7 +60,7 @@ static std::vector<egl::Config> GenerateUniqueConfigs(size_t count)
>     for (size_t i = 0; i < count; i++)
>     {
>         egl::Config config = GenerateGenericConfig();
>-        config.samples = static_cast<EGLint>(i);
>+        config.samples     = static_cast<EGLint>(i);
>         configs.push_back(config);
>     }
> 
>@@ -121,14 +122,10 @@ TEST(ConfigSetTest, Filtering_BitSizes)
>         EGLint(egl::Config::*ConfigMember);
>     };
> 
>-    VariableConfigBitSize testMembers[] = 
>-    {
>-        { EGL_RED_SIZE,     &egl::Config::redSize     },
>-        { EGL_GREEN_SIZE,   &egl::Config::greenSize   },
>-        { EGL_BLUE_SIZE,    &egl::Config::blueSize    },
>-        { EGL_ALPHA_SIZE,   &egl::Config::alphaSize   },
>-        { EGL_DEPTH_SIZE,   &egl::Config::depthSize   },
>-        { EGL_STENCIL_SIZE, &egl::Config::stencilSize },
>+    VariableConfigBitSize testMembers[] = {
>+        {EGL_RED_SIZE, &egl::Config::redSize},     {EGL_GREEN_SIZE, &egl::Config::greenSize},
>+        {EGL_BLUE_SIZE, &egl::Config::blueSize},   {EGL_ALPHA_SIZE, &egl::Config::alphaSize},
>+        {EGL_DEPTH_SIZE, &egl::Config::depthSize}, {EGL_STENCIL_SIZE, &egl::Config::stencilSize},
>     };
> 
>     // Generate configsPerType configs with varying bit sizes of each type
>@@ -186,9 +183,9 @@ TEST(ConfigSetTest, Sorting_BitSizes)
>         egl::Config config = GenerateGenericConfig();
> 
>         // Give random-ish bit sizes to the config
>-        config.redSize =   (i *  2) %  3;
>-        config.greenSize = (i +  5) %  7;
>-        config.blueSize =  (i +  7) % 11;
>+        config.redSize   = (i * 2) % 3;
>+        config.greenSize = (i + 5) % 7;
>+        config.blueSize  = (i + 7) % 11;
>         config.alphaSize = (i + 13) % 17;
> 
>         set.add(config);
>@@ -204,16 +201,12 @@ TEST(ConfigSetTest, Sorting_BitSizes)
>     for (size_t i = 1; i < filteredConfigs.size(); i++)
>     {
>         const egl::Config &prevConfig = *filteredConfigs[i - 1];
>-        size_t prevBitCount = prevConfig.redSize +
>-                              prevConfig.greenSize +
>-                              prevConfig.blueSize +
>-                              prevConfig.alphaSize;
>+        size_t prevBitCount =
>+            prevConfig.redSize + prevConfig.greenSize + prevConfig.blueSize + prevConfig.alphaSize;
> 
>         const egl::Config &curConfig = *filteredConfigs[i];
>-        size_t curBitCount = curConfig.redSize +
>-                             curConfig.greenSize +
>-                             curConfig.blueSize +
>-                             curConfig.alphaSize;
>+        size_t curBitCount =
>+            curConfig.redSize + curConfig.greenSize + curConfig.blueSize + curConfig.alphaSize;
> 
>         EXPECT_GE(prevBitCount, curBitCount);
>     }
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/Constants.h b/Source/ThirdParty/ANGLE/src/libANGLE/Constants.h
>index 2fe921af386..907434eb844 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/Constants.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/Constants.h
>@@ -33,10 +33,14 @@ enum
> 
>     IMPLEMENTATION_MAX_VERTEX_SHADER_UNIFORM_BUFFERS   = 16,
>     IMPLEMENTATION_MAX_FRAGMENT_SHADER_UNIFORM_BUFFERS = 16,
>+    IMPLEMENTATION_MAX_COMPUTE_SHADER_UNIFORM_BUFFERS  = 16,
>     IMPLEMENTATION_MAX_COMBINED_SHADER_UNIFORM_BUFFERS =
>         IMPLEMENTATION_MAX_VERTEX_SHADER_UNIFORM_BUFFERS +
>         IMPLEMENTATION_MAX_FRAGMENT_SHADER_UNIFORM_BUFFERS,
> 
>+    // GL_EXT_geometry_shader increases the minimum value of GL_MAX_UNIFORM_BUFFER_BINDINGS to 48.
>+    IMPLEMENTATION_MAX_UNIFORM_BUFFER_BINDINGS = 48,
>+
>     IMPLEMENTATION_MAX_TRANSFORM_FEEDBACK_BUFFERS = 4,
> 
>     // Maximum number of views which are supported by the implementation of ANGLE_multiview.
>@@ -56,7 +60,11 @@ enum
>     // Limit active textures so we can use fast bitsets.
>     IMPLEMENTATION_MAX_SHADER_TEXTURES = 32,
>     IMPLEMENTATION_MAX_ACTIVE_TEXTURES = IMPLEMENTATION_MAX_SHADER_TEXTURES * 2,
>+    IMPLEMENTATION_MAX_IMAGE_UNITS     = IMPLEMENTATION_MAX_ACTIVE_TEXTURES,
>+
>+    // Maximum number of slots allocated for atomic counter buffers.
>+    IMPLEMENTATION_MAX_ATOMIC_COUNTER_BUFFERS = 8,
> };
>-}
>+}  // namespace gl
> 
>-#endif // LIBANGLE_CONSTANTS_H_
>+#endif  // LIBANGLE_CONSTANTS_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/Context.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/Context.cpp
>index f638beda588..857f73d934a 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/Context.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/Context.cpp
>@@ -8,12 +8,14 @@
> // rendering operations. It is the GLES2 specific implementation of EGLContext.
> 
> #include "libANGLE/Context.h"
>+#include "libANGLE/Context.inl.h"
> 
> #include <string.h>
> #include <iterator>
> #include <sstream>
> #include <vector>
> 
>+#include "common/PackedEnums.h"
> #include "common/matrix_utils.h"
> #include "common/platform.h"
> #include "common/utilities.h"
>@@ -24,6 +26,7 @@
> #include "libANGLE/Fence.h"
> #include "libANGLE/Framebuffer.h"
> #include "libANGLE/FramebufferAttachment.h"
>+#include "libANGLE/MemoryObject.h"
> #include "libANGLE/Path.h"
> #include "libANGLE/Program.h"
> #include "libANGLE/ProgramPipeline.h"
>@@ -39,26 +42,22 @@
> #include "libANGLE/formatutils.h"
> #include "libANGLE/queryconversions.h"
> #include "libANGLE/queryutils.h"
>-#include "libANGLE/renderer/ContextImpl.h"
>+#include "libANGLE/renderer/BufferImpl.h"
> #include "libANGLE/renderer/EGLImplFactory.h"
> #include "libANGLE/renderer/Format.h"
> #include "libANGLE/validationES.h"
> 
>+namespace gl
>+{
> namespace
> {
>-
>-#define ANGLE_HANDLE_ERR(X) \
>-    handleError(X);         \
>-    return;
>-#define ANGLE_CONTEXT_TRY(EXPR) ANGLE_TRY_TEMPLATE(EXPR, ANGLE_HANDLE_ERR);
>-
> template <typename T>
>-std::vector<gl::Path *> GatherPaths(gl::PathManager &resourceManager,
>-                                    GLsizei numPaths,
>-                                    const void *paths,
>-                                    GLuint pathBase)
>+std::vector<Path *> GatherPaths(PathManager &resourceManager,
>+                                GLsizei numPaths,
>+                                const void *paths,
>+                                GLuint pathBase)
> {
>-    std::vector<gl::Path *> ret;
>+    std::vector<Path *> ret;
>     ret.reserve(numPaths);
> 
>     const auto *nameArray = static_cast<const T *>(paths);
>@@ -73,11 +72,11 @@ std::vector<gl::Path *> GatherPaths(gl::PathManager &resourceManager,
>     return ret;
> }
> 
>-std::vector<gl::Path *> GatherPaths(gl::PathManager &resourceManager,
>-                                    GLsizei numPaths,
>-                                    GLenum pathNameType,
>-                                    const void *paths,
>-                                    GLuint pathBase)
>+std::vector<Path *> GatherPaths(PathManager &resourceManager,
>+                                GLsizei numPaths,
>+                                GLenum pathNameType,
>+                                const void *paths,
>+                                GLuint pathBase)
> {
>     switch (pathNameType)
>     {
>@@ -101,48 +100,35 @@ std::vector<gl::Path *> GatherPaths(gl::PathManager &resourceManager,
>     }
> 
>     UNREACHABLE();
>-    return std::vector<gl::Path *>();
>+    return std::vector<Path *>();
> }
> 
> template <typename T>
>-gl::Error GetQueryObjectParameter(gl::Query *query, GLenum pname, T *params)
>+angle::Result GetQueryObjectParameter(const Context *context, Query *query, GLenum pname, T *params)
> {
>-    ASSERT(query != nullptr);
>+    ASSERT(query != nullptr || pname == GL_QUERY_RESULT_AVAILABLE_EXT);
> 
>     switch (pname)
>     {
>         case GL_QUERY_RESULT_EXT:
>-            return query->getResult(params);
>+            return query->getResult(context, params);
>         case GL_QUERY_RESULT_AVAILABLE_EXT:
>         {
>-            bool available;
>-            gl::Error error = query->isResultAvailable(&available);
>-            if (!error.isError())
>+            bool available = false;
>+            if (context->isContextLost())
>             {
>-                *params = gl::CastFromStateValue<T>(pname, static_cast<GLuint>(available));
>+                available = true;
>             }
>-            return error;
>-        }
>-        default:
>-            UNREACHABLE();
>-            return gl::InternalError() << "Unreachable Error";
>-    }
>-}
>-
>-void MarkTransformFeedbackBufferUsage(gl::TransformFeedback *transformFeedback)
>-{
>-    if (transformFeedback && transformFeedback->isActive() && !transformFeedback->isPaused())
>-    {
>-        for (size_t tfBufferIndex = 0; tfBufferIndex < transformFeedback->getIndexedBufferCount();
>-             tfBufferIndex++)
>-        {
>-            const gl::OffsetBindingPointer<gl::Buffer> &buffer =
>-                transformFeedback->getIndexedBuffer(tfBufferIndex);
>-            if (buffer.get() != nullptr)
>+            else
>             {
>-                buffer->onTransformFeedback();
>+                ANGLE_TRY(query->isResultAvailable(context, &available));
>             }
>+            *params = CastFromStateValue<T>(pname, static_cast<GLuint>(available));
>+            return angle::Result::Continue;
>         }
>+        default:
>+            UNREACHABLE();
>+            return angle::Result::Stop;
>     }
> }
> 
>@@ -157,15 +143,15 @@ EGLint GetClientMinorVersion(const egl::AttributeMap &attribs)
>     return static_cast<EGLint>(attribs.get(EGL_CONTEXT_MINOR_VERSION, 0));
> }
> 
>-gl::Version GetClientVersion(const egl::AttributeMap &attribs)
>+Version GetClientVersion(const egl::AttributeMap &attribs)
> {
>-    return gl::Version(GetClientMajorVersion(attribs), GetClientMinorVersion(attribs));
>+    return Version(GetClientMajorVersion(attribs), GetClientMinorVersion(attribs));
> }
> 
> GLenum GetResetStrategy(const egl::AttributeMap &attribs)
> {
>-    EGLAttrib attrib = attribs.get(EGL_CONTEXT_OPENGL_RESET_NOTIFICATION_STRATEGY_EXT,
>-                                   EGL_NO_RESET_NOTIFICATION);
>+    EGLAttrib attrib =
>+        attribs.get(EGL_CONTEXT_OPENGL_RESET_NOTIFICATION_STRATEGY_EXT, EGL_NO_RESET_NOTIFICATION);
>     switch (attrib)
>     {
>         case EGL_NO_RESET_NOTIFICATION:
>@@ -201,6 +187,13 @@ bool GetWebGLContext(const egl::AttributeMap &attribs)
>     return (attribs.get(EGL_CONTEXT_WEBGL_COMPATIBILITY_ANGLE, EGL_FALSE) == EGL_TRUE);
> }
> 
>+bool GetExtensionsEnabled(const egl::AttributeMap &attribs, bool webGLContext)
>+{
>+    // If the context is WebGL, extensions are disabled by default
>+    EGLAttrib defaultValue = webGLContext ? EGL_FALSE : EGL_TRUE;
>+    return (attribs.get(EGL_EXTENSIONS_ENABLED_ANGLE, defaultValue) == EGL_TRUE);
>+}
>+
> bool GetBindGeneratesResource(const egl::AttributeMap &attribs)
> {
>     return (attribs.get(EGL_CONTEXT_BIND_GENERATES_RESOURCE_CHROMIUM, EGL_TRUE) == EGL_TRUE);
>@@ -252,55 +245,100 @@ void LimitCap(CapT *cap, MaxT maximum)
>     *cap = std::min(*cap, static_cast<CapT>(maximum));
> }
> 
>+// The rest default to false.
>+constexpr angle::PackedEnumMap<PrimitiveMode, bool, angle::EnumSize<PrimitiveMode>() + 1>
>+    kValidBasicDrawModes = {{
>+        {PrimitiveMode::Points, true},
>+        {PrimitiveMode::Lines, true},
>+        {PrimitiveMode::LineLoop, true},
>+        {PrimitiveMode::LineStrip, true},
>+        {PrimitiveMode::Triangles, true},
>+        {PrimitiveMode::TriangleStrip, true},
>+        {PrimitiveMode::TriangleFan, true},
>+    }};
>+
>+enum SubjectIndexes : angle::SubjectIndex
>+{
>+    kTexture0SubjectIndex       = 0,
>+    kTextureMaxSubjectIndex     = kTexture0SubjectIndex + IMPLEMENTATION_MAX_ACTIVE_TEXTURES,
>+    kUniformBuffer0SubjectIndex = kTextureMaxSubjectIndex,
>+    kUniformBufferMaxSubjectIndex =
>+        kUniformBuffer0SubjectIndex + IMPLEMENTATION_MAX_UNIFORM_BUFFER_BINDINGS,
>+    kSampler0SubjectIndex    = kUniformBufferMaxSubjectIndex,
>+    kSamplerMaxSubjectIndex  = kSampler0SubjectIndex + IMPLEMENTATION_MAX_ACTIVE_TEXTURES,
>+    kVertexArraySubjectIndex = kSamplerMaxSubjectIndex,
>+    kReadFramebufferSubjectIndex,
>+    kDrawFramebufferSubjectIndex
>+};
> }  // anonymous namespace
> 
>-namespace gl
>-{
>-
> Context::Context(rx::EGLImplFactory *implFactory,
>                  const egl::Config *config,
>                  const Context *shareContext,
>                  TextureManager *shareTextures,
>                  MemoryProgramCache *memoryProgramCache,
>                  const egl::AttributeMap &attribs,
>-                 const egl::DisplayExtensions &displayExtensions)
>-
>-    : ValidationContext(shareContext,
>-                        shareTextures,
>-                        GetClientVersion(attribs),
>-                        &mGLState,
>-                        mCaps,
>-                        mTextureCaps,
>-                        mExtensions,
>-                        mLimitations,
>-                        GetNoError(attribs)),
>-      mImplementation(implFactory->createContext(mState)),
>+                 const egl::DisplayExtensions &displayExtensions,
>+                 const egl::ClientExtensions &clientExtensions)
>+    : mState(reinterpret_cast<ContextID>(this),
>+             shareContext ? &shareContext->mState : nullptr,
>+             shareTextures,
>+             GetClientVersion(attribs),
>+             GetDebug(attribs),
>+             GetBindGeneratesResource(attribs),
>+             GetClientArraysEnabled(attribs),
>+             GetRobustResourceInit(attribs),
>+             memoryProgramCache != nullptr),
>+      mSkipValidation(GetNoError(attribs)),
>+      mDisplayTextureShareGroup(shareTextures != nullptr),
>+      mErrors(this),
>+      mImplementation(implFactory->createContext(mState, &mErrors, config, shareContext, attribs)),
>+      mLabel(nullptr),
>       mCompiler(),
>       mConfig(config),
>       mClientType(EGL_OPENGL_ES_API),
>       mHasBeenCurrent(false),
>       mContextLost(false),
>-      mResetStatus(GL_NO_ERROR),
>+      mResetStatus(GraphicsResetStatus::NoError),
>       mContextLostForced(false),
>       mResetStrategy(GetResetStrategy(attribs)),
>       mRobustAccess(GetRobustAccess(attribs)),
>+      mSurfacelessSupported(displayExtensions.surfacelessContext),
>+      mExplicitContextAvailable(clientExtensions.explicitContext),
>       mCurrentSurface(static_cast<egl::Surface *>(EGL_NO_SURFACE)),
>-      mCurrentDisplay(static_cast<egl::Display *>(EGL_NO_DISPLAY)),
>-      mSurfacelessFramebuffer(nullptr),
>+      mDisplay(static_cast<egl::Display *>(EGL_NO_DISPLAY)),
>       mWebGLContext(GetWebGLContext(attribs)),
>+      mBufferAccessValidationEnabled(false),
>+      mExtensionsEnabled(GetExtensionsEnabled(attribs, mWebGLContext)),
>       mMemoryProgramCache(memoryProgramCache),
>+      mVertexArrayObserverBinding(this, kVertexArraySubjectIndex),
>+      mDrawFramebufferObserverBinding(this, kDrawFramebufferSubjectIndex),
>+      mReadFramebufferObserverBinding(this, kReadFramebufferSubjectIndex),
>       mScratchBuffer(1000u),
>-      mZeroFilledBuffer(1000u)
>+      mZeroFilledBuffer(1000u),
>+      mThreadPool(nullptr)
>+{
>+    for (angle::SubjectIndex uboIndex = kUniformBuffer0SubjectIndex;
>+         uboIndex < kUniformBufferMaxSubjectIndex; ++uboIndex)
>+    {
>+        mUniformBufferObserverBindings.emplace_back(this, uboIndex);
>+    }
>+
>+    for (angle::SubjectIndex samplerIndex = kSampler0SubjectIndex;
>+         samplerIndex < kSamplerMaxSubjectIndex; ++samplerIndex)
>+    {
>+        mSamplerObserverBindings.emplace_back(this, samplerIndex);
>+    }
>+}
>+
>+void Context::initialize()
> {
>-    mImplementation->setMemoryProgramCache(memoryProgramCache);
>+    mImplementation->setMemoryProgramCache(mMemoryProgramCache);
> 
>-    bool robustResourceInit = GetRobustResourceInit(attribs);
>-    initCaps(displayExtensions, robustResourceInit);
>+    initCaps();
>     initWorkarounds();
> 
>-    mGLState.initialize(this, GetDebug(attribs), GetBindGeneratesResource(attribs),
>-                        GetClientArraysEnabled(attribs), robustResourceInit,
>-                        mMemoryProgramCache != nullptr);
>+    mState.initialize(this);
> 
>     mFenceNVHandleAllocator.setBaseHandle(0);
> 
>@@ -310,54 +348,58 @@ Context::Context(rx::EGLImplFactory *implFactory,
>     // In order that access to these initial textures not be lost, they are treated as texture
>     // objects all of whose names are 0.
> 
>-    Texture *zeroTexture2D = new Texture(mImplementation.get(), 0, GL_TEXTURE_2D);
>-    mZeroTextures[GL_TEXTURE_2D].set(this, zeroTexture2D);
>+    Texture *zeroTexture2D = new Texture(mImplementation.get(), 0, TextureType::_2D);
>+    mZeroTextures[TextureType::_2D].set(this, zeroTexture2D);
> 
>-    Texture *zeroTextureCube = new Texture(mImplementation.get(), 0, GL_TEXTURE_CUBE_MAP);
>-    mZeroTextures[GL_TEXTURE_CUBE_MAP].set(this, zeroTextureCube);
>+    Texture *zeroTextureCube = new Texture(mImplementation.get(), 0, TextureType::CubeMap);
>+    mZeroTextures[TextureType::CubeMap].set(this, zeroTextureCube);
> 
>     if (getClientVersion() >= Version(3, 0))
>     {
>         // TODO: These could also be enabled via extension
>-        Texture *zeroTexture3D = new Texture(mImplementation.get(), 0, GL_TEXTURE_3D);
>-        mZeroTextures[GL_TEXTURE_3D].set(this, zeroTexture3D);
>+        Texture *zeroTexture3D = new Texture(mImplementation.get(), 0, TextureType::_3D);
>+        mZeroTextures[TextureType::_3D].set(this, zeroTexture3D);
> 
>-        Texture *zeroTexture2DArray = new Texture(mImplementation.get(), 0, GL_TEXTURE_2D_ARRAY);
>-        mZeroTextures[GL_TEXTURE_2D_ARRAY].set(this, zeroTexture2DArray);
>+        Texture *zeroTexture2DArray = new Texture(mImplementation.get(), 0, TextureType::_2DArray);
>+        mZeroTextures[TextureType::_2DArray].set(this, zeroTexture2DArray);
>     }
>-    if (getClientVersion() >= Version(3, 1))
>+    if (getClientVersion() >= Version(3, 1) || mSupportedExtensions.textureMultisample)
>     {
>         Texture *zeroTexture2DMultisample =
>-            new Texture(mImplementation.get(), 0, GL_TEXTURE_2D_MULTISAMPLE);
>-        mZeroTextures[GL_TEXTURE_2D_MULTISAMPLE].set(this, zeroTexture2DMultisample);
>+            new Texture(mImplementation.get(), 0, TextureType::_2DMultisample);
>+        mZeroTextures[TextureType::_2DMultisample].set(this, zeroTexture2DMultisample);
>+    }
>+    if (getClientVersion() >= Version(3, 1))
>+    {
>+        Texture *zeroTexture2DMultisampleArray =
>+            new Texture(mImplementation.get(), 0, TextureType::_2DMultisampleArray);
>+        mZeroTextures[TextureType::_2DMultisampleArray].set(this, zeroTexture2DMultisampleArray);
> 
>-        for (unsigned int i = 0; i < mCaps.maxAtomicCounterBufferBindings; i++)
>+        for (unsigned int i = 0; i < mState.mCaps.maxAtomicCounterBufferBindings; i++)
>         {
>-            bindBufferRange(BufferBinding::AtomicCounter, 0, i, 0, 0);
>+            bindBufferRange(BufferBinding::AtomicCounter, i, 0, 0, 0);
>         }
> 
>-        for (unsigned int i = 0; i < mCaps.maxShaderStorageBufferBindings; i++)
>+        for (unsigned int i = 0; i < mState.mCaps.maxShaderStorageBufferBindings; i++)
>         {
>             bindBufferRange(BufferBinding::ShaderStorage, i, 0, 0, 0);
>         }
>     }
> 
>-    const Extensions &nativeExtensions = mImplementation->getNativeExtensions();
>-    if (nativeExtensions.textureRectangle)
>+    if (mSupportedExtensions.textureRectangle)
>     {
>         Texture *zeroTextureRectangle =
>-            new Texture(mImplementation.get(), 0, GL_TEXTURE_RECTANGLE_ANGLE);
>-        mZeroTextures[GL_TEXTURE_RECTANGLE_ANGLE].set(this, zeroTextureRectangle);
>+            new Texture(mImplementation.get(), 0, TextureType::Rectangle);
>+        mZeroTextures[TextureType::Rectangle].set(this, zeroTextureRectangle);
>     }
> 
>-    if (nativeExtensions.eglImageExternal || nativeExtensions.eglStreamConsumerExternal)
>+    if (mSupportedExtensions.eglImageExternal || mSupportedExtensions.eglStreamConsumerExternal)
>     {
>-        Texture *zeroTextureExternal =
>-            new Texture(mImplementation.get(), 0, GL_TEXTURE_EXTERNAL_OES);
>-        mZeroTextures[GL_TEXTURE_EXTERNAL_OES].set(this, zeroTextureExternal);
>+        Texture *zeroTextureExternal = new Texture(mImplementation.get(), 0, TextureType::External);
>+        mZeroTextures[TextureType::External].set(this, zeroTextureExternal);
>     }
> 
>-    mGLState.initializeZeroTextures(this, mZeroTextures);
>+    mState.initializeZeroTextures(this, mZeroTextures);
> 
>     bindVertexArray(0);
> 
>@@ -377,12 +419,31 @@ Context::Context(rx::EGLImplFactory *implFactory,
> 
>     bindRenderbuffer(GL_RENDERBUFFER, 0);
> 
>-    for (unsigned int i = 0; i < mCaps.maxUniformBufferBindings; i++)
>+    for (unsigned int i = 0; i < mState.mCaps.maxUniformBufferBindings; i++)
>     {
>         bindBufferRange(BufferBinding::Uniform, i, 0, 0, -1);
>     }
> 
>+    // Initialize GLES1 renderer if appropriate.
>+    if (getClientVersion() < Version(2, 0))
>+    {
>+        mGLES1Renderer.reset(new GLES1Renderer());
>+    }
>+
>     // Initialize dirty bit masks
>+    mAllDirtyBits.set();
>+
>+    mDrawDirtyObjects.set(State::DIRTY_OBJECT_DRAW_FRAMEBUFFER);
>+    mDrawDirtyObjects.set(State::DIRTY_OBJECT_VERTEX_ARRAY);
>+    mDrawDirtyObjects.set(State::DIRTY_OBJECT_TEXTURES);
>+    mDrawDirtyObjects.set(State::DIRTY_OBJECT_PROGRAM);
>+    mDrawDirtyObjects.set(State::DIRTY_OBJECT_SAMPLERS);
>+
>+    mPathOperationDirtyObjects.set(State::DIRTY_OBJECT_DRAW_FRAMEBUFFER);
>+    mPathOperationDirtyObjects.set(State::DIRTY_OBJECT_VERTEX_ARRAY);
>+    mPathOperationDirtyObjects.set(State::DIRTY_OBJECT_TEXTURES);
>+    mPathOperationDirtyObjects.set(State::DIRTY_OBJECT_SAMPLERS);
>+
>     mTexImageDirtyBits.set(State::DIRTY_BIT_UNPACK_STATE);
>     mTexImageDirtyBits.set(State::DIRTY_BIT_UNPACK_BUFFER_BINDING);
>     // No dirty objects.
>@@ -390,6 +451,7 @@ Context::Context(rx::EGLImplFactory *implFactory,
>     // Readpixels uses the pack state and read FBO
>     mReadPixelsDirtyBits.set(State::DIRTY_BIT_PACK_STATE);
>     mReadPixelsDirtyBits.set(State::DIRTY_BIT_PACK_BUFFER_BINDING);
>+    mReadPixelsDirtyBits.set(State::DIRTY_BIT_READ_FRAMEBUFFER_BINDING);
>     mReadPixelsDirtyObjects.set(State::DIRTY_OBJECT_READ_FRAMEBUFFER);
> 
>     mClearDirtyBits.set(State::DIRTY_BIT_RASTERIZER_DISCARD_ENABLED);
>@@ -403,19 +465,42 @@ Context::Context(rx::EGLImplFactory *implFactory,
>     mClearDirtyBits.set(State::DIRTY_BIT_DEPTH_MASK);
>     mClearDirtyBits.set(State::DIRTY_BIT_STENCIL_WRITEMASK_FRONT);
>     mClearDirtyBits.set(State::DIRTY_BIT_STENCIL_WRITEMASK_BACK);
>+    mClearDirtyBits.set(State::DIRTY_BIT_DRAW_FRAMEBUFFER_BINDING);
>     mClearDirtyObjects.set(State::DIRTY_OBJECT_DRAW_FRAMEBUFFER);
> 
>     mBlitDirtyBits.set(State::DIRTY_BIT_SCISSOR_TEST_ENABLED);
>     mBlitDirtyBits.set(State::DIRTY_BIT_SCISSOR);
>     mBlitDirtyBits.set(State::DIRTY_BIT_FRAMEBUFFER_SRGB);
>+    mBlitDirtyBits.set(State::DIRTY_BIT_READ_FRAMEBUFFER_BINDING);
>+    mBlitDirtyBits.set(State::DIRTY_BIT_DRAW_FRAMEBUFFER_BINDING);
>     mBlitDirtyObjects.set(State::DIRTY_OBJECT_READ_FRAMEBUFFER);
>     mBlitDirtyObjects.set(State::DIRTY_OBJECT_DRAW_FRAMEBUFFER);
> 
>-    handleError(mImplementation->initialize());
>+    mComputeDirtyBits.set(State::DIRTY_BIT_SHADER_STORAGE_BUFFER_BINDING);
>+    mComputeDirtyBits.set(State::DIRTY_BIT_UNIFORM_BUFFER_BINDINGS);
>+    mComputeDirtyBits.set(State::DIRTY_BIT_ATOMIC_COUNTER_BUFFER_BINDING);
>+    mComputeDirtyBits.set(State::DIRTY_BIT_PROGRAM_BINDING);
>+    mComputeDirtyBits.set(State::DIRTY_BIT_PROGRAM_EXECUTABLE);
>+    mComputeDirtyBits.set(State::DIRTY_BIT_TEXTURE_BINDINGS);
>+    mComputeDirtyBits.set(State::DIRTY_BIT_SAMPLER_BINDINGS);
>+    mComputeDirtyBits.set(State::DIRTY_BIT_IMAGE_BINDINGS);
>+    mComputeDirtyBits.set(State::DIRTY_BIT_DISPATCH_INDIRECT_BUFFER_BINDING);
>+    mComputeDirtyObjects.set(State::DIRTY_OBJECT_TEXTURES);
>+    mComputeDirtyObjects.set(State::DIRTY_OBJECT_PROGRAM);
>+    mComputeDirtyObjects.set(State::DIRTY_OBJECT_SAMPLERS);
>+
>+    ANGLE_CONTEXT_TRY(mImplementation->initialize());
> }
> 
> egl::Error Context::onDestroy(const egl::Display *display)
> {
>+    if (mGLES1Renderer)
>+    {
>+        mGLES1Renderer->onDestroy(this, &mState);
>+    }
>+
>+    ANGLE_TRY(unMakeCurrent(display));
>+
>     for (auto fence : mFenceNVMap)
>     {
>         SafeDelete(fence.second);
>@@ -449,45 +534,55 @@ egl::Error Context::onDestroy(const egl::Display *display)
>     }
>     mTransformFeedbackMap.clear();
> 
>-    for (auto &zeroTexture : mZeroTextures)
>+    for (BindingPointer<Texture> &zeroTexture : mZeroTextures)
>     {
>-        ANGLE_TRY(zeroTexture.second->onDestroy(this));
>-        zeroTexture.second.set(this, nullptr);
>+        if (zeroTexture.get() != nullptr)
>+        {
>+            zeroTexture.set(this, nullptr);
>+        }
>     }
>-    mZeroTextures.clear();
>-
>-    SafeDelete(mSurfacelessFramebuffer);
> 
>-    ANGLE_TRY(releaseSurface(display));
>     releaseShaderCompiler();
> 
>-    mGLState.reset(this);
>+    mState.reset(this);
> 
>-    mState.mBuffers->release(this);
>-    mState.mShaderPrograms->release(this);
>-    mState.mTextures->release(this);
>-    mState.mRenderbuffers->release(this);
>-    mState.mSamplers->release(this);
>-    mState.mSyncs->release(this);
>-    mState.mPaths->release(this);
>-    mState.mFramebuffers->release(this);
>-    mState.mPipelines->release(this);
>+    mState.mBufferManager->release(this);
>+    mState.mShaderProgramManager->release(this);
>+    mState.mTextureManager->release(this);
>+    mState.mRenderbufferManager->release(this);
>+    mState.mSamplerManager->release(this);
>+    mState.mSyncManager->release(this);
>+    mState.mPathManager->release(this);
>+    mState.mFramebufferManager->release(this);
>+    mState.mProgramPipelineManager->release(this);
>+    mState.mMemoryObjectManager->release(this);
>+
>+    mThreadPool.reset();
> 
>     mImplementation->onDestroy(this);
> 
>     return egl::NoError();
> }
> 
>-Context::~Context()
>+Context::~Context() {}
>+
>+void Context::setLabel(EGLLabelKHR label)
>+{
>+    mLabel = label;
>+}
>+
>+EGLLabelKHR Context::getLabel() const
> {
>+    return mLabel;
> }
> 
> egl::Error Context::makeCurrent(egl::Display *display, egl::Surface *surface)
> {
>-    mCurrentDisplay = display;
>+    mDisplay = display;
> 
>     if (!mHasBeenCurrent)
>     {
>+        initialize();
>         initRendererString();
>         initVersionStrings();
>         initExtensionStrings();
>@@ -500,184 +595,147 @@ egl::Error Context::makeCurrent(egl::Display *display, egl::Surface *surface)
>             height = surface->getHeight();
>         }
> 
>-        mGLState.setViewportParams(0, 0, width, height);
>-        mGLState.setScissorParams(0, 0, width, height);
>+        mState.setViewportParams(0, 0, width, height);
>+        mState.setScissorParams(0, 0, width, height);
> 
>         mHasBeenCurrent = true;
>     }
> 
>     // TODO(jmadill): Rework this when we support ContextImpl
>-    mGLState.setAllDirtyBits();
>-    mGLState.setAllDirtyObjects();
>-
>-    ANGLE_TRY(releaseSurface(display));
>+    mState.setAllDirtyBits();
>+    mState.setAllDirtyObjects();
> 
>-    Framebuffer *newDefault = nullptr;
>-    if (surface != nullptr)
>-    {
>-        ANGLE_TRY(surface->setIsCurrent(this, true));
>-        mCurrentSurface = surface;
>-        newDefault      = surface->getDefaultFramebuffer();
>-    }
>-    else
>-    {
>-        if (mSurfacelessFramebuffer == nullptr)
>-        {
>-            mSurfacelessFramebuffer = new Framebuffer(mImplementation.get());
>-        }
>+    ANGLE_TRY(setDefaultFramebuffer(surface));
> 
>-        newDefault = mSurfacelessFramebuffer;
>-    }
>+    // Notify the renderer of a context switch.
>+    angle::Result implResult = mImplementation->onMakeCurrent(this);
> 
>-    // Update default framebuffer, the binding of the previous default
>-    // framebuffer (or lack of) will have a nullptr.
>+    // If the implementation fails onMakeCurrent, unset the default framebuffer.
>+    if (implResult != angle::Result::Continue)
>     {
>-        if (mGLState.getReadFramebuffer() == nullptr)
>-        {
>-            mGLState.setReadFramebufferBinding(newDefault);
>-        }
>-        if (mGLState.getDrawFramebuffer() == nullptr)
>-        {
>-            mGLState.setDrawFramebufferBinding(newDefault);
>-        }
>-        mState.mFramebuffers->setDefaultFramebuffer(newDefault);
>+        ANGLE_TRY(unsetDefaultFramebuffer());
>+        return angle::ResultToEGL(implResult);
>     }
> 
>-    // Notify the renderer of a context switch
>-    mImplementation->onMakeCurrent(this);
>     return egl::NoError();
> }
> 
>-egl::Error Context::releaseSurface(const egl::Display *display)
>+egl::Error Context::unMakeCurrent(const egl::Display *display)
> {
>-    // Remove the default framebuffer
>-    Framebuffer *currentDefault = nullptr;
>-    if (mCurrentSurface != nullptr)
>-    {
>-        currentDefault = mCurrentSurface->getDefaultFramebuffer();
>-    }
>-    else if (mSurfacelessFramebuffer != nullptr)
>-    {
>-        currentDefault = mSurfacelessFramebuffer;
>-    }
>-
>-    if (mGLState.getReadFramebuffer() == currentDefault)
>-    {
>-        mGLState.setReadFramebufferBinding(nullptr);
>-    }
>-    if (mGLState.getDrawFramebuffer() == currentDefault)
>-    {
>-        mGLState.setDrawFramebufferBinding(nullptr);
>-    }
>-    mState.mFramebuffers->setDefaultFramebuffer(nullptr);
>-
>-    if (mCurrentSurface)
>-    {
>-        ANGLE_TRY(mCurrentSurface->setIsCurrent(this, false));
>-        mCurrentSurface = nullptr;
>-    }
>+    ANGLE_TRY(unsetDefaultFramebuffer());
> 
>-    return egl::NoError();
>+    return angle::ResultToEGL(mImplementation->onUnMakeCurrent(this));
> }
> 
> GLuint Context::createBuffer()
> {
>-    return mState.mBuffers->createBuffer();
>+    return mState.mBufferManager->createBuffer();
> }
> 
> GLuint Context::createProgram()
> {
>-    return mState.mShaderPrograms->createProgram(mImplementation.get());
>+    return mState.mShaderProgramManager->createProgram(mImplementation.get());
> }
> 
>-GLuint Context::createShader(GLenum type)
>+GLuint Context::createShader(ShaderType type)
> {
>-    return mState.mShaderPrograms->createShader(mImplementation.get(), mLimitations, type);
>+    return mState.mShaderProgramManager->createShader(mImplementation.get(), mState.mLimitations,
>+                                                      type);
> }
> 
> GLuint Context::createTexture()
> {
>-    return mState.mTextures->createTexture();
>+    return mState.mTextureManager->createTexture();
> }
> 
> GLuint Context::createRenderbuffer()
> {
>-    return mState.mRenderbuffers->createRenderbuffer();
>+    return mState.mRenderbufferManager->createRenderbuffer();
> }
> 
>-GLuint Context::createPaths(GLsizei range)
>+void Context::tryGenPaths(GLsizei range, GLuint *createdOut)
> {
>-    auto resultOrError = mState.mPaths->createPaths(mImplementation.get(), range);
>-    if (resultOrError.isError())
>-    {
>-        handleError(resultOrError.getError());
>-        return 0;
>-    }
>-    return resultOrError.getResult();
>+    ANGLE_CONTEXT_TRY(mState.mPathManager->createPaths(this, range, createdOut));
>+}
>+
>+GLuint Context::genPaths(GLsizei range)
>+{
>+    GLuint created = 0;
>+    tryGenPaths(range, &created);
>+    return created;
> }
> 
> // Returns an unused framebuffer name
> GLuint Context::createFramebuffer()
> {
>-    return mState.mFramebuffers->createFramebuffer();
>+    return mState.mFramebufferManager->createFramebuffer();
> }
> 
>-GLuint Context::createFenceNV()
>+void Context::genFencesNV(GLsizei n, GLuint *fences)
> {
>-    GLuint handle = mFenceNVHandleAllocator.allocate();
>-    mFenceNVMap.assign(handle, new FenceNV(mImplementation->createFenceNV()));
>-    return handle;
>+    for (int i = 0; i < n; i++)
>+    {
>+        GLuint handle = mFenceNVHandleAllocator.allocate();
>+        mFenceNVMap.assign(handle, new FenceNV(mImplementation->createFenceNV()));
>+        fences[i] = handle;
>+    }
> }
> 
> GLuint Context::createProgramPipeline()
> {
>-    return mState.mPipelines->createProgramPipeline();
>+    return mState.mProgramPipelineManager->createProgramPipeline();
> }
> 
>-GLuint Context::createShaderProgramv(GLenum type, GLsizei count, const GLchar *const *strings)
>+GLuint Context::createShaderProgramv(ShaderType type, GLsizei count, const GLchar *const *strings)
> {
>     UNIMPLEMENTED();
>     return 0u;
> }
> 
>-void Context::deleteBuffer(GLuint buffer)
>+GLuint Context::createMemoryObject()
>+{
>+    return mState.mMemoryObjectManager->createMemoryObject(mImplementation.get());
>+}
>+
>+void Context::deleteBuffer(GLuint bufferName)
> {
>-    if (mState.mBuffers->getBuffer(buffer))
>+    Buffer *buffer = mState.mBufferManager->getBuffer(bufferName);
>+    if (buffer)
>     {
>         detachBuffer(buffer);
>     }
> 
>-    mState.mBuffers->deleteObject(this, buffer);
>+    mState.mBufferManager->deleteObject(this, bufferName);
> }
> 
> void Context::deleteShader(GLuint shader)
> {
>-    mState.mShaderPrograms->deleteShader(this, shader);
>+    mState.mShaderProgramManager->deleteShader(this, shader);
> }
> 
> void Context::deleteProgram(GLuint program)
> {
>-    mState.mShaderPrograms->deleteProgram(this, program);
>+    mState.mShaderProgramManager->deleteProgram(this, program);
> }
> 
> void Context::deleteTexture(GLuint texture)
> {
>-    if (mState.mTextures->getTexture(texture))
>+    if (mState.mTextureManager->getTexture(texture))
>     {
>         detachTexture(texture);
>     }
> 
>-    mState.mTextures->deleteObject(this, texture);
>+    mState.mTextureManager->deleteObject(this, texture);
> }
> 
> void Context::deleteRenderbuffer(GLuint renderbuffer)
> {
>-    if (mState.mRenderbuffers->getRenderbuffer(renderbuffer))
>+    if (mState.mRenderbufferManager->getRenderbuffer(renderbuffer))
>     {
>         detachRenderbuffer(renderbuffer);
>     }
> 
>-    mState.mRenderbuffers->deleteObject(this, renderbuffer);
>+    mState.mRenderbufferManager->deleteObject(this, renderbuffer);
> }
> 
> void Context::deleteSync(GLsync sync)
>@@ -686,53 +744,58 @@ void Context::deleteSync(GLsync sync)
>     // wait commands finish. However, since the name becomes invalid, we cannot query the fence,
>     // and since our API is currently designed for being called from a single thread, we can delete
>     // the fence immediately.
>-    mState.mSyncs->deleteObject(this, static_cast<GLuint>(reinterpret_cast<uintptr_t>(sync)));
>+    mState.mSyncManager->deleteObject(this, static_cast<GLuint>(reinterpret_cast<uintptr_t>(sync)));
> }
> 
> void Context::deleteProgramPipeline(GLuint pipeline)
> {
>-    if (mState.mPipelines->getProgramPipeline(pipeline))
>+    if (mState.mProgramPipelineManager->getProgramPipeline(pipeline))
>     {
>         detachProgramPipeline(pipeline);
>     }
> 
>-    mState.mPipelines->deleteObject(this, pipeline);
>+    mState.mProgramPipelineManager->deleteObject(this, pipeline);
>+}
>+
>+void Context::deleteMemoryObject(GLuint memoryObject)
>+{
>+    mState.mMemoryObjectManager->deleteMemoryObject(this, memoryObject);
> }
> 
> void Context::deletePaths(GLuint first, GLsizei range)
> {
>-    mState.mPaths->deletePaths(first, range);
>+    mState.mPathManager->deletePaths(first, range);
> }
> 
>-bool Context::hasPathData(GLuint path) const
>+bool Context::isPath(GLuint path) const
> {
>-    const auto *pathObj = mState.mPaths->getPath(path);
>+    const auto *pathObj = mState.mPathManager->getPath(path);
>     if (pathObj == nullptr)
>         return false;
> 
>     return pathObj->hasPathData();
> }
> 
>-bool Context::hasPath(GLuint path) const
>+bool Context::isPathGenerated(GLuint path) const
> {
>-    return mState.mPaths->hasPath(path);
>+    return mState.mPathManager->hasPath(path);
> }
> 
>-void Context::setPathCommands(GLuint path,
>-                              GLsizei numCommands,
>-                              const GLubyte *commands,
>-                              GLsizei numCoords,
>-                              GLenum coordType,
>-                              const void *coords)
>+void Context::pathCommands(GLuint path,
>+                           GLsizei numCommands,
>+                           const GLubyte *commands,
>+                           GLsizei numCoords,
>+                           GLenum coordType,
>+                           const void *coords)
> {
>-    auto *pathObject = mState.mPaths->getPath(path);
>+    auto *pathObject = mState.mPathManager->getPath(path);
> 
>-    handleError(pathObject->setCommands(numCommands, commands, numCoords, coordType, coords));
>+    ANGLE_CONTEXT_TRY(pathObject->setCommands(numCommands, commands, numCoords, coordType, coords));
> }
> 
>-void Context::setPathParameterf(GLuint path, GLenum pname, GLfloat value)
>+void Context::pathParameterf(GLuint path, GLenum pname, GLfloat value)
> {
>-    auto *pathObj = mState.mPaths->getPath(path);
>+    Path *pathObj = mState.mPathManager->getPath(path);
> 
>     switch (pname)
>     {
>@@ -757,9 +820,15 @@ void Context::setPathParameterf(GLuint path, GLenum pname, GLfloat value)
>     }
> }
> 
>-void Context::getPathParameterfv(GLuint path, GLenum pname, GLfloat *value) const
>+void Context::pathParameteri(GLuint path, GLenum pname, GLint value)
>+{
>+    // TODO(jmadill): Should use proper clamping/casting.
>+    pathParameterf(path, pname, static_cast<GLfloat>(value));
>+}
>+
>+void Context::getPathParameterfv(GLuint path, GLenum pname, GLfloat *value)
> {
>-    const auto *pathObj = mState.mPaths->getPath(path);
>+    const Path *pathObj = mState.mPathManager->getPath(path);
> 
>     switch (pname)
>     {
>@@ -784,49 +853,65 @@ void Context::getPathParameterfv(GLuint path, GLenum pname, GLfloat *value) cons
>     }
> }
> 
>-void Context::setPathStencilFunc(GLenum func, GLint ref, GLuint mask)
>+void Context::getPathParameteriv(GLuint path, GLenum pname, GLint *value)
>+{
>+    GLfloat val = 0.0f;
>+    getPathParameterfv(path, pname, value != nullptr ? &val : nullptr);
>+    if (value)
>+        *value = static_cast<GLint>(val);
>+}
>+
>+void Context::pathStencilFunc(GLenum func, GLint ref, GLuint mask)
>+{
>+    mState.setPathStencilFunc(func, ref, mask);
>+}
>+
>+// GL_CHROMIUM_lose_context
>+void Context::loseContext(GraphicsResetStatus current, GraphicsResetStatus other)
> {
>-    mGLState.setPathStencilFunc(func, ref, mask);
>+    // TODO(geofflang): mark the rest of the share group lost. Requires access to the entire share
>+    // group from a context. http://anglebug.com/3379
>+    markContextLost(current);
> }
> 
> void Context::deleteFramebuffer(GLuint framebuffer)
> {
>-    if (mState.mFramebuffers->getFramebuffer(framebuffer))
>+    if (mState.mFramebufferManager->getFramebuffer(framebuffer))
>     {
>         detachFramebuffer(framebuffer);
>     }
> 
>-    mState.mFramebuffers->deleteObject(this, framebuffer);
>+    mState.mFramebufferManager->deleteObject(this, framebuffer);
> }
> 
>-void Context::deleteFenceNV(GLuint fence)
>+void Context::deleteFencesNV(GLsizei n, const GLuint *fences)
> {
>-    FenceNV *fenceObject = nullptr;
>-    if (mFenceNVMap.erase(fence, &fenceObject))
>+    for (int i = 0; i < n; i++)
>     {
>-        mFenceNVHandleAllocator.release(fence);
>-        delete fenceObject;
>+        GLuint fence = fences[i];
>+
>+        FenceNV *fenceObject = nullptr;
>+        if (mFenceNVMap.erase(fence, &fenceObject))
>+        {
>+            mFenceNVHandleAllocator.release(fence);
>+            delete fenceObject;
>+        }
>     }
> }
> 
> Buffer *Context::getBuffer(GLuint handle) const
> {
>-    return mState.mBuffers->getBuffer(handle);
>-}
>-
>-Texture *Context::getTexture(GLuint handle) const
>-{
>-    return mState.mTextures->getTexture(handle);
>+    return mState.mBufferManager->getBuffer(handle);
> }
> 
> Renderbuffer *Context::getRenderbuffer(GLuint handle) const
> {
>-    return mState.mRenderbuffers->getRenderbuffer(handle);
>+    return mState.mRenderbufferManager->getRenderbuffer(handle);
> }
> 
> Sync *Context::getSync(GLsync handle) const
> {
>-    return mState.mSyncs->getSync(static_cast<GLuint>(reinterpret_cast<uintptr_t>(handle)));
>+    return mState.mSyncManager->getSync(static_cast<GLuint>(reinterpret_cast<uintptr_t>(handle)));
> }
> 
> VertexArray *Context::getVertexArray(GLuint handle) const
>@@ -836,7 +921,7 @@ VertexArray *Context::getVertexArray(GLuint handle) const
> 
> Sampler *Context::getSampler(GLuint handle) const
> {
>-    return mState.mSamplers->getSampler(handle);
>+    return mState.mSamplerManager->getSampler(handle);
> }
> 
> TransformFeedback *Context::getTransformFeedback(GLuint handle) const
>@@ -846,10 +931,10 @@ TransformFeedback *Context::getTransformFeedback(GLuint handle) const
> 
> ProgramPipeline *Context::getProgramPipeline(GLuint handle) const
> {
>-    return mState.mPipelines->getProgramPipeline(handle);
>+    return mState.mProgramPipelineManager->getProgramPipeline(handle);
> }
> 
>-LabeledObject *Context::getLabeledObject(GLenum identifier, GLuint name) const
>+gl::LabeledObject *Context::getLabeledObject(GLenum identifier, GLuint name) const
> {
>     switch (identifier)
>     {
>@@ -858,7 +943,7 @@ LabeledObject *Context::getLabeledObject(GLenum identifier, GLuint name) const
>         case GL_SHADER:
>             return getShader(name);
>         case GL_PROGRAM:
>-            return getProgram(name);
>+            return getProgramNoResolveLink(name);
>         case GL_VERTEX_ARRAY:
>             return getVertexArray(name);
>         case GL_QUERY:
>@@ -879,31 +964,31 @@ LabeledObject *Context::getLabeledObject(GLenum identifier, GLuint name) const
>     }
> }
> 
>-LabeledObject *Context::getLabeledObjectFromPtr(const void *ptr) const
>+gl::LabeledObject *Context::getLabeledObjectFromPtr(const void *ptr) const
> {
>     return getSync(reinterpret_cast<GLsync>(const_cast<void *>(ptr)));
> }
> 
> void Context::objectLabel(GLenum identifier, GLuint name, GLsizei length, const GLchar *label)
> {
>-    LabeledObject *object = getLabeledObject(identifier, name);
>+    gl::LabeledObject *object = getLabeledObject(identifier, name);
>     ASSERT(object != nullptr);
> 
>     std::string labelName = GetObjectLabelFromPointer(length, label);
>-    object->setLabel(labelName);
>+    object->setLabel(this, labelName);
> 
>     // TODO(jmadill): Determine if the object is dirty based on 'name'. Conservatively assume the
>     // specified object is active until we do this.
>-    mGLState.setObjectDirty(identifier);
>+    mState.setObjectDirty(identifier);
> }
> 
> void Context::objectPtrLabel(const void *ptr, GLsizei length, const GLchar *label)
> {
>-    LabeledObject *object = getLabeledObjectFromPtr(ptr);
>+    gl::LabeledObject *object = getLabeledObjectFromPtr(ptr);
>     ASSERT(object != nullptr);
> 
>     std::string labelName = GetObjectLabelFromPointer(length, label);
>-    object->setLabel(labelName);
>+    object->setLabel(this, labelName);
> }
> 
> void Context::getObjectLabel(GLenum identifier,
>@@ -912,7 +997,7 @@ void Context::getObjectLabel(GLenum identifier,
>                              GLsizei *length,
>                              GLchar *label) const
> {
>-    LabeledObject *object = getLabeledObject(identifier, name);
>+    gl::LabeledObject *object = getLabeledObject(identifier, name);
>     ASSERT(object != nullptr);
> 
>     const std::string &objectLabel = object->getLabel();
>@@ -924,7 +1009,7 @@ void Context::getObjectPtrLabel(const void *ptr,
>                                 GLsizei *length,
>                                 GLchar *label) const
> {
>-    LabeledObject *object = getLabeledObjectFromPtr(ptr);
>+    gl::LabeledObject *object = getLabeledObjectFromPtr(ptr);
>     ASSERT(object != nullptr);
> 
>     const std::string &objectLabel = object->getLabel();
>@@ -933,10 +1018,10 @@ void Context::getObjectPtrLabel(const void *ptr,
> 
> bool Context::isSampler(GLuint samplerName) const
> {
>-    return mState.mSamplers->isSampler(samplerName);
>+    return mState.mSamplerManager->isSampler(samplerName);
> }
> 
>-void Context::bindTexture(GLenum target, GLuint handle)
>+void Context::bindTexture(TextureType target, GLuint handle)
> {
>     Texture *texture = nullptr;
> 
>@@ -946,31 +1031,38 @@ void Context::bindTexture(GLenum target, GLuint handle)
>     }
>     else
>     {
>-        texture = mState.mTextures->checkTextureAllocation(mImplementation.get(), handle, target);
>+        texture =
>+            mState.mTextureManager->checkTextureAllocation(mImplementation.get(), handle, target);
>     }
> 
>     ASSERT(texture);
>-    mGLState.setSamplerTexture(this, target, texture);
>+    mState.setSamplerTexture(this, target, texture);
>+    mStateCache.onActiveTextureChange(this);
> }
> 
> void Context::bindReadFramebuffer(GLuint framebufferHandle)
> {
>-    Framebuffer *framebuffer = mState.mFramebuffers->checkFramebufferAllocation(
>-        mImplementation.get(), mCaps, framebufferHandle);
>-    mGLState.setReadFramebufferBinding(framebuffer);
>+    Framebuffer *framebuffer = mState.mFramebufferManager->checkFramebufferAllocation(
>+        mImplementation.get(), mState.mCaps, framebufferHandle);
>+    mState.setReadFramebufferBinding(framebuffer);
>+    mReadFramebufferObserverBinding.bind(framebuffer);
> }
> 
> void Context::bindDrawFramebuffer(GLuint framebufferHandle)
> {
>-    Framebuffer *framebuffer = mState.mFramebuffers->checkFramebufferAllocation(
>-        mImplementation.get(), mCaps, framebufferHandle);
>-    mGLState.setDrawFramebufferBinding(framebuffer);
>+    Framebuffer *framebuffer = mState.mFramebufferManager->checkFramebufferAllocation(
>+        mImplementation.get(), mState.mCaps, framebufferHandle);
>+    mState.setDrawFramebufferBinding(framebuffer);
>+    mDrawFramebufferObserverBinding.bind(framebuffer);
>+    mStateCache.onDrawFramebufferChange(this);
> }
> 
> void Context::bindVertexArray(GLuint vertexArrayHandle)
> {
>     VertexArray *vertexArray = checkVertexArrayAllocation(vertexArrayHandle);
>-    mGLState.setVertexArrayBinding(vertexArray);
>+    mState.setVertexArrayBinding(this, vertexArray);
>+    mVertexArrayObserverBinding.bind(vertexArray);
>+    mStateCache.onVertexArrayBindingChange(this);
> }
> 
> void Context::bindVertexBuffer(GLuint bindingIndex,
>@@ -978,16 +1070,20 @@ void Context::bindVertexBuffer(GLuint bindingIndex,
>                                GLintptr offset,
>                                GLsizei stride)
> {
>-    Buffer *buffer = mState.mBuffers->checkBufferAllocation(mImplementation.get(), bufferHandle);
>-    mGLState.bindVertexBuffer(this, bindingIndex, buffer, offset, stride);
>+    Buffer *buffer =
>+        mState.mBufferManager->checkBufferAllocation(mImplementation.get(), bufferHandle);
>+    mState.bindVertexBuffer(this, bindingIndex, buffer, offset, stride);
>+    mStateCache.onVertexArrayStateChange(this);
> }
> 
> void Context::bindSampler(GLuint textureUnit, GLuint samplerHandle)
> {
>-    ASSERT(textureUnit < mCaps.maxCombinedTextureImageUnits);
>+    ASSERT(textureUnit < mState.mCaps.maxCombinedTextureImageUnits);
>     Sampler *sampler =
>-        mState.mSamplers->checkSamplerAllocation(mImplementation.get(), samplerHandle);
>-    mGLState.setSamplerBinding(this, textureUnit, sampler);
>+        mState.mSamplerManager->checkSamplerAllocation(mImplementation.get(), samplerHandle);
>+    mState.setSamplerBinding(this, textureUnit, sampler);
>+    mSamplerObserverBindings[textureUnit].bind(sampler);
>+    mStateCache.onActiveTextureChange(this);
> }
> 
> void Context::bindImageTexture(GLuint unit,
>@@ -998,13 +1094,14 @@ void Context::bindImageTexture(GLuint unit,
>                                GLenum access,
>                                GLenum format)
> {
>-    Texture *tex = mState.mTextures->getTexture(texture);
>-    mGLState.setImageUnit(this, unit, tex, level, layered, layer, access, format);
>+    Texture *tex = mState.mTextureManager->getTexture(texture);
>+    mState.setImageUnit(this, unit, tex, level, layered, layer, access, format);
> }
> 
> void Context::useProgram(GLuint program)
> {
>-    mGLState.setProgram(this, getProgram(program));
>+    ANGLE_CONTEXT_TRY(mState.setProgram(this, getProgramResolveLink(program)));
>+    mStateCache.onProgramExecutableChange(this);
> }
> 
> void Context::useProgramStages(GLuint pipeline, GLbitfield stages, GLuint program)
>@@ -1017,63 +1114,66 @@ void Context::bindTransformFeedback(GLenum target, GLuint transformFeedbackHandl
>     ASSERT(target == GL_TRANSFORM_FEEDBACK);
>     TransformFeedback *transformFeedback =
>         checkTransformFeedbackAllocation(transformFeedbackHandle);
>-    mGLState.setTransformFeedbackBinding(this, transformFeedback);
>+    mState.setTransformFeedbackBinding(this, transformFeedback);
> }
> 
> void Context::bindProgramPipeline(GLuint pipelineHandle)
> {
>-    ProgramPipeline *pipeline =
>-        mState.mPipelines->checkProgramPipelineAllocation(mImplementation.get(), pipelineHandle);
>-    mGLState.setProgramPipelineBinding(this, pipeline);
>+    ProgramPipeline *pipeline = mState.mProgramPipelineManager->checkProgramPipelineAllocation(
>+        mImplementation.get(), pipelineHandle);
>+    mState.setProgramPipelineBinding(this, pipeline);
> }
> 
>-void Context::beginQuery(GLenum target, GLuint query)
>+void Context::beginQuery(QueryType target, GLuint query)
> {
>     Query *queryObject = getQuery(query, true, target);
>     ASSERT(queryObject);
> 
>     // begin query
>-    ANGLE_CONTEXT_TRY(queryObject->begin());
>+    ANGLE_CONTEXT_TRY(queryObject->begin(this));
> 
>     // set query as active for specified target only if begin succeeded
>-    mGLState.setActiveQuery(this, target, queryObject);
>+    mState.setActiveQuery(this, target, queryObject);
>+    mStateCache.onQueryChange(this);
> }
> 
>-void Context::endQuery(GLenum target)
>+void Context::endQuery(QueryType target)
> {
>-    Query *queryObject = mGLState.getActiveQuery(target);
>+    Query *queryObject = mState.getActiveQuery(target);
>     ASSERT(queryObject);
> 
>-    handleError(queryObject->end());
>+    // Intentionally don't call try here. We don't want an early return.
>+    (void)(queryObject->end(this));
> 
>     // Always unbind the query, even if there was an error. This may delete the query object.
>-    mGLState.setActiveQuery(this, target, nullptr);
>+    mState.setActiveQuery(this, target, nullptr);
>+    mStateCache.onQueryChange(this);
> }
> 
>-void Context::queryCounter(GLuint id, GLenum target)
>+void Context::queryCounter(GLuint id, QueryType target)
> {
>-    ASSERT(target == GL_TIMESTAMP_EXT);
>+    ASSERT(target == QueryType::Timestamp);
> 
>     Query *queryObject = getQuery(id, true, target);
>     ASSERT(queryObject);
> 
>-    handleError(queryObject->queryCounter());
>+    ANGLE_CONTEXT_TRY(queryObject->queryCounter(this));
> }
> 
>-void Context::getQueryiv(GLenum target, GLenum pname, GLint *params)
>+void Context::getQueryiv(QueryType target, GLenum pname, GLint *params)
> {
>     switch (pname)
>     {
>         case GL_CURRENT_QUERY_EXT:
>-            params[0] = mGLState.getActiveQueryId(target);
>+            params[0] = mState.getActiveQueryId(target);
>             break;
>         case GL_QUERY_COUNTER_BITS_EXT:
>             switch (target)
>             {
>-                case GL_TIME_ELAPSED_EXT:
>+                case QueryType::TimeElapsed:
>                     params[0] = getExtensions().queryCounterBitsTimeElapsed;
>                     break;
>-                case GL_TIMESTAMP_EXT:
>+                case QueryType::Timestamp:
>                     params[0] = getExtensions().queryCounterBitsTimestamp;
>                     break;
>                 default:
>@@ -1088,29 +1188,84 @@ void Context::getQueryiv(GLenum target, GLenum pname, GLint *params)
>     }
> }
> 
>+void Context::getQueryivRobust(QueryType target,
>+                               GLenum pname,
>+                               GLsizei bufSize,
>+                               GLsizei *length,
>+                               GLint *params)
>+{
>+    getQueryiv(target, pname, params);
>+}
>+
>+void Context::getUnsignedBytev(GLenum pname, GLubyte *data)
>+{
>+    UNIMPLEMENTED();
>+}
>+
>+void Context::getUnsignedBytei_v(GLenum target, GLuint index, GLubyte *data)
>+{
>+    UNIMPLEMENTED();
>+}
>+
> void Context::getQueryObjectiv(GLuint id, GLenum pname, GLint *params)
> {
>-    handleError(GetQueryObjectParameter(getQuery(id), pname, params));
>+    ANGLE_CONTEXT_TRY(GetQueryObjectParameter(this, getQuery(id), pname, params));
>+}
>+
>+void Context::getQueryObjectivRobust(GLuint id,
>+                                     GLenum pname,
>+                                     GLsizei bufSize,
>+                                     GLsizei *length,
>+                                     GLint *params)
>+{
>+    getQueryObjectiv(id, pname, params);
> }
> 
> void Context::getQueryObjectuiv(GLuint id, GLenum pname, GLuint *params)
> {
>-    handleError(GetQueryObjectParameter(getQuery(id), pname, params));
>+    ANGLE_CONTEXT_TRY(GetQueryObjectParameter(this, getQuery(id), pname, params));
>+}
>+
>+void Context::getQueryObjectuivRobust(GLuint id,
>+                                      GLenum pname,
>+                                      GLsizei bufSize,
>+                                      GLsizei *length,
>+                                      GLuint *params)
>+{
>+    getQueryObjectuiv(id, pname, params);
> }
> 
> void Context::getQueryObjecti64v(GLuint id, GLenum pname, GLint64 *params)
> {
>-    handleError(GetQueryObjectParameter(getQuery(id), pname, params));
>+    ANGLE_CONTEXT_TRY(GetQueryObjectParameter(this, getQuery(id), pname, params));
>+}
>+
>+void Context::getQueryObjecti64vRobust(GLuint id,
>+                                       GLenum pname,
>+                                       GLsizei bufSize,
>+                                       GLsizei *length,
>+                                       GLint64 *params)
>+{
>+    getQueryObjecti64v(id, pname, params);
> }
> 
> void Context::getQueryObjectui64v(GLuint id, GLenum pname, GLuint64 *params)
> {
>-    handleError(GetQueryObjectParameter(getQuery(id), pname, params));
>+    ANGLE_CONTEXT_TRY(GetQueryObjectParameter(this, getQuery(id), pname, params));
>+}
>+
>+void Context::getQueryObjectui64vRobust(GLuint id,
>+                                        GLenum pname,
>+                                        GLsizei bufSize,
>+                                        GLsizei *length,
>+                                        GLuint64 *params)
>+{
>+    getQueryObjectui64v(id, pname, params);
> }
> 
> Framebuffer *Context::getFramebuffer(GLuint handle) const
> {
>-    return mState.mFramebuffers->getFramebuffer(handle);
>+    return mState.mFramebufferManager->getFramebuffer(handle);
> }
> 
> FenceNV *Context::getFenceNV(GLuint handle)
>@@ -1118,7 +1273,7 @@ FenceNV *Context::getFenceNV(GLuint handle)
>     return mFenceNVMap.query(handle);
> }
> 
>-Query *Context::getQuery(GLuint handle, bool create, GLenum type)
>+Query *Context::getQuery(GLuint handle, bool create, QueryType type)
> {
>     if (!mQueryMap.contains(handle))
>     {
>@@ -1128,6 +1283,7 @@ Query *Context::getQuery(GLuint handle, bool create, GLenum type)
>     Query *query = mQueryMap.query(handle);
>     if (!query && create)
>     {
>+        ASSERT(type != QueryType::InvalidEnum);
>         query = new Query(mImplementation->createQuery(type), handle);
>         query->addRef();
>         mQueryMap.assign(handle, query);
>@@ -1140,15 +1296,20 @@ Query *Context::getQuery(GLuint handle) const
>     return mQueryMap.query(handle);
> }
> 
>-Texture *Context::getTargetTexture(GLenum target) const
>+Texture *Context::getTextureByType(TextureType type) const
>+{
>+    ASSERT(ValidTextureTarget(this, type) || ValidTextureExternalTarget(this, type));
>+    return mState.getTargetTexture(type);
>+}
>+
>+Texture *Context::getTextureByTarget(TextureTarget target) const
> {
>-    ASSERT(ValidTextureTarget(this, target) || ValidTextureExternalTarget(this, target));
>-    return mGLState.getTargetTexture(target);
>+    return getTextureByType(TextureTargetToType(target));
> }
> 
>-Texture *Context::getSamplerTexture(unsigned int sampler, GLenum type) const
>+Texture *Context::getSamplerTexture(unsigned int sampler, TextureType type) const
> {
>-    return mGLState.getSamplerTexture(sampler, type);
>+    return mState.getSamplerTexture(sampler, type);
> }
> 
> Compiler *Context::getCompiler() const
>@@ -1170,8 +1331,9 @@ void Context::getBooleanvImpl(GLenum pname, GLboolean *params)
>         case GL_CONTEXT_ROBUST_ACCESS_EXT:
>             *params = mRobustAccess ? GL_TRUE : GL_FALSE;
>             break;
>+
>         default:
>-            mGLState.getBooleanv(pname, params);
>+            mState.getBooleanv(pname, params);
>             break;
>     }
> }
>@@ -1183,32 +1345,49 @@ void Context::getFloatvImpl(GLenum pname, GLfloat *params)
>     switch (pname)
>     {
>         case GL_ALIASED_LINE_WIDTH_RANGE:
>-            params[0] = mCaps.minAliasedLineWidth;
>-            params[1] = mCaps.maxAliasedLineWidth;
>+            params[0] = mState.mCaps.minAliasedLineWidth;
>+            params[1] = mState.mCaps.maxAliasedLineWidth;
>             break;
>         case GL_ALIASED_POINT_SIZE_RANGE:
>-            params[0] = mCaps.minAliasedPointSize;
>-            params[1] = mCaps.maxAliasedPointSize;
>+            params[0] = mState.mCaps.minAliasedPointSize;
>+            params[1] = mState.mCaps.maxAliasedPointSize;
>+            break;
>+        case GL_SMOOTH_POINT_SIZE_RANGE:
>+            params[0] = mState.mCaps.minSmoothPointSize;
>+            params[1] = mState.mCaps.maxSmoothPointSize;
>+            break;
>+        case GL_SMOOTH_LINE_WIDTH_RANGE:
>+            params[0] = mState.mCaps.minSmoothLineWidth;
>+            params[1] = mState.mCaps.maxSmoothLineWidth;
>             break;
>         case GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT:
>-            ASSERT(mExtensions.textureFilterAnisotropic);
>-            *params = mExtensions.maxTextureAnisotropy;
>+            ASSERT(mState.mExtensions.textureFilterAnisotropic);
>+            *params = mState.mExtensions.maxTextureAnisotropy;
>             break;
>         case GL_MAX_TEXTURE_LOD_BIAS:
>-            *params = mCaps.maxLODBias;
>+            *params = mState.mCaps.maxLODBias;
>             break;
> 
>         case GL_PATH_MODELVIEW_MATRIX_CHROMIUM:
>         case GL_PATH_PROJECTION_MATRIX_CHROMIUM:
>         {
>-            ASSERT(mExtensions.pathRendering);
>-            const GLfloat *m = mGLState.getPathRenderingMatrix(pname);
>-            memcpy(params, m, 16 * sizeof(GLfloat));
>+            // GLES1 emulation: // GL_PATH_(MODELVIEW|PROJECTION)_MATRIX_CHROMIUM collides with the
>+            // GLES1 constants for modelview/projection matrix.
>+            if (getClientVersion() < Version(2, 0))
>+            {
>+                mState.getFloatv(pname, params);
>+            }
>+            else
>+            {
>+                ASSERT(mState.mExtensions.pathRendering);
>+                const GLfloat *m = mState.getPathRenderingMatrix(pname);
>+                memcpy(params, m, 16 * sizeof(GLfloat));
>+            }
>         }
>         break;
> 
>         default:
>-            mGLState.getFloatv(pname, params);
>+            mState.getFloatv(pname, params);
>             break;
>     }
> }
>@@ -1221,90 +1400,88 @@ void Context::getIntegervImpl(GLenum pname, GLint *params)
>     switch (pname)
>     {
>         case GL_MAX_VERTEX_ATTRIBS:
>-            *params = mCaps.maxVertexAttributes;
>+            *params = mState.mCaps.maxVertexAttributes;
>             break;
>         case GL_MAX_VERTEX_UNIFORM_VECTORS:
>-            *params = mCaps.maxVertexUniformVectors;
>+            *params = mState.mCaps.maxVertexUniformVectors;
>             break;
>         case GL_MAX_VERTEX_UNIFORM_COMPONENTS:
>-            *params = mCaps.maxVertexUniformComponents;
>+            *params = mState.mCaps.maxShaderUniformComponents[ShaderType::Vertex];
>             break;
>         case GL_MAX_VARYING_VECTORS:
>-            *params = mCaps.maxVaryingVectors;
>+            *params = mState.mCaps.maxVaryingVectors;
>             break;
>         case GL_MAX_VARYING_COMPONENTS:
>-            *params = mCaps.maxVertexOutputComponents;
>+            *params = mState.mCaps.maxVertexOutputComponents;
>             break;
>         case GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS:
>-            *params = mCaps.maxCombinedTextureImageUnits;
>+            *params = mState.mCaps.maxCombinedTextureImageUnits;
>             break;
>         case GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS:
>-            *params = mCaps.maxVertexTextureImageUnits;
>+            *params = mState.mCaps.maxShaderTextureImageUnits[ShaderType::Vertex];
>             break;
>         case GL_MAX_TEXTURE_IMAGE_UNITS:
>-            *params = mCaps.maxTextureImageUnits;
>+            *params = mState.mCaps.maxShaderTextureImageUnits[ShaderType::Fragment];
>             break;
>         case GL_MAX_FRAGMENT_UNIFORM_VECTORS:
>-            *params = mCaps.maxFragmentUniformVectors;
>+            *params = mState.mCaps.maxFragmentUniformVectors;
>             break;
>         case GL_MAX_FRAGMENT_UNIFORM_COMPONENTS:
>-            *params = mCaps.maxFragmentUniformComponents;
>+            *params = mState.mCaps.maxShaderUniformComponents[ShaderType::Fragment];
>             break;
>         case GL_MAX_RENDERBUFFER_SIZE:
>-            *params = mCaps.maxRenderbufferSize;
>+            *params = mState.mCaps.maxRenderbufferSize;
>             break;
>         case GL_MAX_COLOR_ATTACHMENTS_EXT:
>-            *params = mCaps.maxColorAttachments;
>+            *params = mState.mCaps.maxColorAttachments;
>             break;
>         case GL_MAX_DRAW_BUFFERS_EXT:
>-            *params = mCaps.maxDrawBuffers;
>+            *params = mState.mCaps.maxDrawBuffers;
>             break;
>-        // case GL_FRAMEBUFFER_BINDING:                    // now equivalent to
>-        // GL_DRAW_FRAMEBUFFER_BINDING_ANGLE
>         case GL_SUBPIXEL_BITS:
>-            *params = 4;
>+            *params = mState.mCaps.subPixelBits;
>             break;
>         case GL_MAX_TEXTURE_SIZE:
>-            *params = mCaps.max2DTextureSize;
>+            *params = mState.mCaps.max2DTextureSize;
>             break;
>         case GL_MAX_RECTANGLE_TEXTURE_SIZE_ANGLE:
>-            *params = mCaps.maxRectangleTextureSize;
>+            *params = mState.mCaps.maxRectangleTextureSize;
>             break;
>         case GL_MAX_CUBE_MAP_TEXTURE_SIZE:
>-            *params = mCaps.maxCubeMapTextureSize;
>+            *params = mState.mCaps.maxCubeMapTextureSize;
>             break;
>         case GL_MAX_3D_TEXTURE_SIZE:
>-            *params = mCaps.max3DTextureSize;
>+            *params = mState.mCaps.max3DTextureSize;
>             break;
>         case GL_MAX_ARRAY_TEXTURE_LAYERS:
>-            *params = mCaps.maxArrayTextureLayers;
>+            *params = mState.mCaps.maxArrayTextureLayers;
>             break;
>         case GL_UNIFORM_BUFFER_OFFSET_ALIGNMENT:
>-            *params = mCaps.uniformBufferOffsetAlignment;
>+            *params = mState.mCaps.uniformBufferOffsetAlignment;
>             break;
>         case GL_MAX_UNIFORM_BUFFER_BINDINGS:
>-            *params = mCaps.maxUniformBufferBindings;
>+            *params = mState.mCaps.maxUniformBufferBindings;
>             break;
>         case GL_MAX_VERTEX_UNIFORM_BLOCKS:
>-            *params = mCaps.maxVertexUniformBlocks;
>+            *params = mState.mCaps.maxShaderUniformBlocks[ShaderType::Vertex];
>             break;
>         case GL_MAX_FRAGMENT_UNIFORM_BLOCKS:
>-            *params = mCaps.maxFragmentUniformBlocks;
>+            *params = mState.mCaps.maxShaderUniformBlocks[ShaderType::Fragment];
>             break;
>         case GL_MAX_COMBINED_UNIFORM_BLOCKS:
>-            *params = mCaps.maxCombinedTextureImageUnits;
>+            *params = mState.mCaps.maxCombinedUniformBlocks;
>             break;
>         case GL_MAX_VERTEX_OUTPUT_COMPONENTS:
>-            *params = mCaps.maxVertexOutputComponents;
>+            *params = mState.mCaps.maxVertexOutputComponents;
>             break;
>         case GL_MAX_FRAGMENT_INPUT_COMPONENTS:
>-            *params = mCaps.maxFragmentInputComponents;
>+            *params = mState.mCaps.maxFragmentInputComponents;
>             break;
>         case GL_MIN_PROGRAM_TEXEL_OFFSET:
>-            *params = mCaps.minProgramTexelOffset;
>+            *params = mState.mCaps.minProgramTexelOffset;
>             break;
>         case GL_MAX_PROGRAM_TEXEL_OFFSET:
>-            *params = mCaps.maxProgramTexelOffset;
>+            *params = mState.mCaps.maxProgramTexelOffset;
>             break;
>         case GL_MAJOR_VERSION:
>             *params = getClientVersion().major;
>@@ -1313,72 +1490,79 @@ void Context::getIntegervImpl(GLenum pname, GLint *params)
>             *params = getClientVersion().minor;
>             break;
>         case GL_MAX_ELEMENTS_INDICES:
>-            *params = mCaps.maxElementsIndices;
>+            *params = mState.mCaps.maxElementsIndices;
>             break;
>         case GL_MAX_ELEMENTS_VERTICES:
>-            *params = mCaps.maxElementsVertices;
>+            *params = mState.mCaps.maxElementsVertices;
>             break;
>         case GL_MAX_TRANSFORM_FEEDBACK_INTERLEAVED_COMPONENTS:
>-            *params = mCaps.maxTransformFeedbackInterleavedComponents;
>+            *params = mState.mCaps.maxTransformFeedbackInterleavedComponents;
>             break;
>         case GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_ATTRIBS:
>-            *params = mCaps.maxTransformFeedbackSeparateAttributes;
>+            *params = mState.mCaps.maxTransformFeedbackSeparateAttributes;
>             break;
>         case GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_COMPONENTS:
>-            *params = mCaps.maxTransformFeedbackSeparateComponents;
>+            *params = mState.mCaps.maxTransformFeedbackSeparateComponents;
>             break;
>         case GL_NUM_COMPRESSED_TEXTURE_FORMATS:
>-            *params = static_cast<GLint>(mCaps.compressedTextureFormats.size());
>+            *params = static_cast<GLint>(mState.mCaps.compressedTextureFormats.size());
>             break;
>         case GL_MAX_SAMPLES_ANGLE:
>-            *params = mCaps.maxSamples;
>+            *params = mState.mCaps.maxSamples;
>             break;
>         case GL_MAX_VIEWPORT_DIMS:
>         {
>-            params[0] = mCaps.maxViewportWidth;
>-            params[1] = mCaps.maxViewportHeight;
>+            params[0] = mState.mCaps.maxViewportWidth;
>+            params[1] = mState.mCaps.maxViewportHeight;
>         }
>         break;
>         case GL_COMPRESSED_TEXTURE_FORMATS:
>-            std::copy(mCaps.compressedTextureFormats.begin(), mCaps.compressedTextureFormats.end(),
>-                      params);
>+            std::copy(mState.mCaps.compressedTextureFormats.begin(),
>+                      mState.mCaps.compressedTextureFormats.end(), params);
>             break;
>         case GL_RESET_NOTIFICATION_STRATEGY_EXT:
>             *params = mResetStrategy;
>             break;
>         case GL_NUM_SHADER_BINARY_FORMATS:
>-            *params = static_cast<GLint>(mCaps.shaderBinaryFormats.size());
>+            *params = static_cast<GLint>(mState.mCaps.shaderBinaryFormats.size());
>             break;
>         case GL_SHADER_BINARY_FORMATS:
>-            std::copy(mCaps.shaderBinaryFormats.begin(), mCaps.shaderBinaryFormats.end(), params);
>+            std::copy(mState.mCaps.shaderBinaryFormats.begin(),
>+                      mState.mCaps.shaderBinaryFormats.end(), params);
>             break;
>         case GL_NUM_PROGRAM_BINARY_FORMATS:
>-            *params = static_cast<GLint>(mCaps.programBinaryFormats.size());
>+            *params = static_cast<GLint>(mState.mCaps.programBinaryFormats.size());
>             break;
>         case GL_PROGRAM_BINARY_FORMATS:
>-            std::copy(mCaps.programBinaryFormats.begin(), mCaps.programBinaryFormats.end(), params);
>+            std::copy(mState.mCaps.programBinaryFormats.begin(),
>+                      mState.mCaps.programBinaryFormats.end(), params);
>             break;
>         case GL_NUM_EXTENSIONS:
>             *params = static_cast<GLint>(mExtensionStrings.size());
>             break;
> 
>+        // GL_ANGLE_request_extension
>+        case GL_NUM_REQUESTABLE_EXTENSIONS_ANGLE:
>+            *params = static_cast<GLint>(mRequestableExtensionStrings.size());
>+            break;
>+
>         // GL_KHR_debug
>         case GL_MAX_DEBUG_MESSAGE_LENGTH:
>-            *params = mExtensions.maxDebugMessageLength;
>+            *params = mState.mExtensions.maxDebugMessageLength;
>             break;
>         case GL_MAX_DEBUG_LOGGED_MESSAGES:
>-            *params = mExtensions.maxDebugLoggedMessages;
>+            *params = mState.mExtensions.maxDebugLoggedMessages;
>             break;
>         case GL_MAX_DEBUG_GROUP_STACK_DEPTH:
>-            *params = mExtensions.maxDebugGroupStackDepth;
>+            *params = mState.mExtensions.maxDebugGroupStackDepth;
>             break;
>         case GL_MAX_LABEL_LENGTH:
>-            *params = mExtensions.maxLabelLength;
>+            *params = mState.mExtensions.maxLabelLength;
>             break;
> 
>-        // GL_ANGLE_multiview
>-        case GL_MAX_VIEWS_ANGLE:
>-            *params = mExtensions.maxViews;
>+        // GL_OVR_multiview2
>+        case GL_MAX_VIEWS_OVR:
>+            *params = mState.mExtensions.maxViews;
>             break;
> 
>         // GL_EXT_disjoint_timer_query
>@@ -1386,130 +1570,240 @@ void Context::getIntegervImpl(GLenum pname, GLint *params)
>             *params = mImplementation->getGPUDisjoint();
>             break;
>         case GL_MAX_FRAMEBUFFER_WIDTH:
>-            *params = mCaps.maxFramebufferWidth;
>+            *params = mState.mCaps.maxFramebufferWidth;
>             break;
>         case GL_MAX_FRAMEBUFFER_HEIGHT:
>-            *params = mCaps.maxFramebufferHeight;
>+            *params = mState.mCaps.maxFramebufferHeight;
>             break;
>         case GL_MAX_FRAMEBUFFER_SAMPLES:
>-            *params = mCaps.maxFramebufferSamples;
>+            *params = mState.mCaps.maxFramebufferSamples;
>             break;
>         case GL_MAX_SAMPLE_MASK_WORDS:
>-            *params = mCaps.maxSampleMaskWords;
>+            *params = mState.mCaps.maxSampleMaskWords;
>             break;
>         case GL_MAX_COLOR_TEXTURE_SAMPLES:
>-            *params = mCaps.maxColorTextureSamples;
>+            *params = mState.mCaps.maxColorTextureSamples;
>             break;
>         case GL_MAX_DEPTH_TEXTURE_SAMPLES:
>-            *params = mCaps.maxDepthTextureSamples;
>+            *params = mState.mCaps.maxDepthTextureSamples;
>             break;
>         case GL_MAX_INTEGER_SAMPLES:
>-            *params = mCaps.maxIntegerSamples;
>+            *params = mState.mCaps.maxIntegerSamples;
>             break;
>         case GL_MAX_VERTEX_ATTRIB_RELATIVE_OFFSET:
>-            *params = mCaps.maxVertexAttribRelativeOffset;
>+            *params = mState.mCaps.maxVertexAttribRelativeOffset;
>             break;
>         case GL_MAX_VERTEX_ATTRIB_BINDINGS:
>-            *params = mCaps.maxVertexAttribBindings;
>+            *params = mState.mCaps.maxVertexAttribBindings;
>             break;
>         case GL_MAX_VERTEX_ATTRIB_STRIDE:
>-            *params = mCaps.maxVertexAttribStride;
>+            *params = mState.mCaps.maxVertexAttribStride;
>             break;
>         case GL_MAX_VERTEX_ATOMIC_COUNTER_BUFFERS:
>-            *params = mCaps.maxVertexAtomicCounterBuffers;
>+            *params = mState.mCaps.maxShaderAtomicCounterBuffers[ShaderType::Vertex];
>             break;
>         case GL_MAX_VERTEX_ATOMIC_COUNTERS:
>-            *params = mCaps.maxVertexAtomicCounters;
>+            *params = mState.mCaps.maxShaderAtomicCounters[ShaderType::Vertex];
>             break;
>         case GL_MAX_VERTEX_IMAGE_UNIFORMS:
>-            *params = mCaps.maxVertexImageUniforms;
>+            *params = mState.mCaps.maxShaderImageUniforms[ShaderType::Vertex];
>             break;
>         case GL_MAX_VERTEX_SHADER_STORAGE_BLOCKS:
>-            *params = mCaps.maxVertexShaderStorageBlocks;
>+            *params = mState.mCaps.maxShaderStorageBlocks[ShaderType::Vertex];
>             break;
>         case GL_MAX_FRAGMENT_ATOMIC_COUNTER_BUFFERS:
>-            *params = mCaps.maxFragmentAtomicCounterBuffers;
>+            *params = mState.mCaps.maxShaderAtomicCounterBuffers[ShaderType::Fragment];
>             break;
>         case GL_MAX_FRAGMENT_ATOMIC_COUNTERS:
>-            *params = mCaps.maxFragmentAtomicCounters;
>+            *params = mState.mCaps.maxShaderAtomicCounters[ShaderType::Fragment];
>             break;
>         case GL_MAX_FRAGMENT_IMAGE_UNIFORMS:
>-            *params = mCaps.maxFragmentImageUniforms;
>+            *params = mState.mCaps.maxShaderImageUniforms[ShaderType::Fragment];
>             break;
>         case GL_MAX_FRAGMENT_SHADER_STORAGE_BLOCKS:
>-            *params = mCaps.maxFragmentShaderStorageBlocks;
>+            *params = mState.mCaps.maxShaderStorageBlocks[ShaderType::Fragment];
>             break;
>         case GL_MIN_PROGRAM_TEXTURE_GATHER_OFFSET:
>-            *params = mCaps.minProgramTextureGatherOffset;
>+            *params = mState.mCaps.minProgramTextureGatherOffset;
>             break;
>         case GL_MAX_PROGRAM_TEXTURE_GATHER_OFFSET:
>-            *params = mCaps.maxProgramTextureGatherOffset;
>+            *params = mState.mCaps.maxProgramTextureGatherOffset;
>             break;
>         case GL_MAX_COMPUTE_WORK_GROUP_INVOCATIONS:
>-            *params = mCaps.maxComputeWorkGroupInvocations;
>+            *params = mState.mCaps.maxComputeWorkGroupInvocations;
>             break;
>         case GL_MAX_COMPUTE_UNIFORM_BLOCKS:
>-            *params = mCaps.maxComputeUniformBlocks;
>+            *params = mState.mCaps.maxShaderUniformBlocks[ShaderType::Compute];
>             break;
>         case GL_MAX_COMPUTE_TEXTURE_IMAGE_UNITS:
>-            *params = mCaps.maxComputeTextureImageUnits;
>+            *params = mState.mCaps.maxShaderTextureImageUnits[ShaderType::Compute];
>             break;
>         case GL_MAX_COMPUTE_SHARED_MEMORY_SIZE:
>-            *params = mCaps.maxComputeSharedMemorySize;
>+            *params = mState.mCaps.maxComputeSharedMemorySize;
>             break;
>         case GL_MAX_COMPUTE_UNIFORM_COMPONENTS:
>-            *params = mCaps.maxComputeUniformComponents;
>+            *params = mState.mCaps.maxShaderUniformComponents[ShaderType::Compute];
>             break;
>         case GL_MAX_COMPUTE_ATOMIC_COUNTER_BUFFERS:
>-            *params = mCaps.maxComputeAtomicCounterBuffers;
>+            *params = mState.mCaps.maxShaderAtomicCounterBuffers[ShaderType::Compute];
>             break;
>         case GL_MAX_COMPUTE_ATOMIC_COUNTERS:
>-            *params = mCaps.maxComputeAtomicCounters;
>+            *params = mState.mCaps.maxShaderAtomicCounters[ShaderType::Compute];
>             break;
>         case GL_MAX_COMPUTE_IMAGE_UNIFORMS:
>-            *params = mCaps.maxComputeImageUniforms;
>+            *params = mState.mCaps.maxShaderImageUniforms[ShaderType::Compute];
>             break;
>         case GL_MAX_COMBINED_COMPUTE_UNIFORM_COMPONENTS:
>-            *params = mCaps.maxCombinedComputeUniformComponents;
>+            *params = static_cast<GLint>(
>+                mState.mCaps.maxCombinedShaderUniformComponents[ShaderType::Compute]);
>             break;
>         case GL_MAX_COMPUTE_SHADER_STORAGE_BLOCKS:
>-            *params = mCaps.maxComputeShaderStorageBlocks;
>+            *params = mState.mCaps.maxShaderStorageBlocks[ShaderType::Compute];
>             break;
>         case GL_MAX_COMBINED_SHADER_OUTPUT_RESOURCES:
>-            *params = mCaps.maxCombinedShaderOutputResources;
>+            *params = mState.mCaps.maxCombinedShaderOutputResources;
>             break;
>         case GL_MAX_UNIFORM_LOCATIONS:
>-            *params = mCaps.maxUniformLocations;
>+            *params = mState.mCaps.maxUniformLocations;
>             break;
>         case GL_MAX_ATOMIC_COUNTER_BUFFER_BINDINGS:
>-            *params = mCaps.maxAtomicCounterBufferBindings;
>+            *params = mState.mCaps.maxAtomicCounterBufferBindings;
>             break;
>         case GL_MAX_ATOMIC_COUNTER_BUFFER_SIZE:
>-            *params = mCaps.maxAtomicCounterBufferSize;
>+            *params = mState.mCaps.maxAtomicCounterBufferSize;
>             break;
>         case GL_MAX_COMBINED_ATOMIC_COUNTER_BUFFERS:
>-            *params = mCaps.maxCombinedAtomicCounterBuffers;
>+            *params = mState.mCaps.maxCombinedAtomicCounterBuffers;
>             break;
>         case GL_MAX_COMBINED_ATOMIC_COUNTERS:
>-            *params = mCaps.maxCombinedAtomicCounters;
>+            *params = mState.mCaps.maxCombinedAtomicCounters;
>             break;
>         case GL_MAX_IMAGE_UNITS:
>-            *params = mCaps.maxImageUnits;
>+            *params = mState.mCaps.maxImageUnits;
>             break;
>         case GL_MAX_COMBINED_IMAGE_UNIFORMS:
>-            *params = mCaps.maxCombinedImageUniforms;
>+            *params = mState.mCaps.maxCombinedImageUniforms;
>             break;
>         case GL_MAX_SHADER_STORAGE_BUFFER_BINDINGS:
>-            *params = mCaps.maxShaderStorageBufferBindings;
>+            *params = mState.mCaps.maxShaderStorageBufferBindings;
>             break;
>         case GL_MAX_COMBINED_SHADER_STORAGE_BLOCKS:
>-            *params = mCaps.maxCombinedShaderStorageBlocks;
>+            *params = mState.mCaps.maxCombinedShaderStorageBlocks;
>             break;
>         case GL_SHADER_STORAGE_BUFFER_OFFSET_ALIGNMENT:
>-            *params = mCaps.shaderStorageBufferOffsetAlignment;
>+            *params = mState.mCaps.shaderStorageBufferOffsetAlignment;
>+            break;
>+
>+        // GL_EXT_geometry_shader
>+        case GL_MAX_FRAMEBUFFER_LAYERS_EXT:
>+            *params = mState.mCaps.maxFramebufferLayers;
>+            break;
>+        case GL_LAYER_PROVOKING_VERTEX_EXT:
>+            *params = mState.mCaps.layerProvokingVertex;
>             break;
>+        case GL_MAX_GEOMETRY_UNIFORM_COMPONENTS_EXT:
>+            *params = mState.mCaps.maxShaderUniformComponents[ShaderType::Geometry];
>+            break;
>+        case GL_MAX_GEOMETRY_UNIFORM_BLOCKS_EXT:
>+            *params = mState.mCaps.maxShaderUniformBlocks[ShaderType::Geometry];
>+            break;
>+        case GL_MAX_COMBINED_GEOMETRY_UNIFORM_COMPONENTS_EXT:
>+            *params = static_cast<GLint>(
>+                mState.mCaps.maxCombinedShaderUniformComponents[ShaderType::Geometry]);
>+            break;
>+        case GL_MAX_GEOMETRY_INPUT_COMPONENTS_EXT:
>+            *params = mState.mCaps.maxGeometryInputComponents;
>+            break;
>+        case GL_MAX_GEOMETRY_OUTPUT_COMPONENTS_EXT:
>+            *params = mState.mCaps.maxGeometryOutputComponents;
>+            break;
>+        case GL_MAX_GEOMETRY_OUTPUT_VERTICES_EXT:
>+            *params = mState.mCaps.maxGeometryOutputVertices;
>+            break;
>+        case GL_MAX_GEOMETRY_TOTAL_OUTPUT_COMPONENTS_EXT:
>+            *params = mState.mCaps.maxGeometryTotalOutputComponents;
>+            break;
>+        case GL_MAX_GEOMETRY_SHADER_INVOCATIONS_EXT:
>+            *params = mState.mCaps.maxGeometryShaderInvocations;
>+            break;
>+        case GL_MAX_GEOMETRY_TEXTURE_IMAGE_UNITS_EXT:
>+            *params = mState.mCaps.maxShaderTextureImageUnits[ShaderType::Geometry];
>+            break;
>+        case GL_MAX_GEOMETRY_ATOMIC_COUNTER_BUFFERS_EXT:
>+            *params = mState.mCaps.maxShaderAtomicCounterBuffers[ShaderType::Geometry];
>+            break;
>+        case GL_MAX_GEOMETRY_ATOMIC_COUNTERS_EXT:
>+            *params = mState.mCaps.maxShaderAtomicCounters[ShaderType::Geometry];
>+            break;
>+        case GL_MAX_GEOMETRY_IMAGE_UNIFORMS_EXT:
>+            *params = mState.mCaps.maxShaderImageUniforms[ShaderType::Geometry];
>+            break;
>+        case GL_MAX_GEOMETRY_SHADER_STORAGE_BLOCKS_EXT:
>+            *params = mState.mCaps.maxShaderStorageBlocks[ShaderType::Geometry];
>+            break;
>+        // GLES1 emulation: Caps queries
>+        case GL_MAX_TEXTURE_UNITS:
>+            *params = mState.mCaps.maxMultitextureUnits;
>+            break;
>+        case GL_MAX_MODELVIEW_STACK_DEPTH:
>+            *params = mState.mCaps.maxModelviewMatrixStackDepth;
>+            break;
>+        case GL_MAX_PROJECTION_STACK_DEPTH:
>+            *params = mState.mCaps.maxProjectionMatrixStackDepth;
>+            break;
>+        case GL_MAX_TEXTURE_STACK_DEPTH:
>+            *params = mState.mCaps.maxTextureMatrixStackDepth;
>+            break;
>+        case GL_MAX_LIGHTS:
>+            *params = mState.mCaps.maxLights;
>+            break;
>+        case GL_MAX_CLIP_PLANES:
>+            *params = mState.mCaps.maxClipPlanes;
>+            break;
>+        // GLES1 emulation: Vertex attribute queries
>+        case GL_VERTEX_ARRAY_BUFFER_BINDING:
>+        case GL_NORMAL_ARRAY_BUFFER_BINDING:
>+        case GL_COLOR_ARRAY_BUFFER_BINDING:
>+        case GL_POINT_SIZE_ARRAY_BUFFER_BINDING_OES:
>+        case GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING:
>+            getVertexAttribiv(static_cast<GLuint>(vertexArrayIndex(ParamToVertexArrayType(pname))),
>+                              GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING, params);
>+            break;
>+        case GL_VERTEX_ARRAY_STRIDE:
>+        case GL_NORMAL_ARRAY_STRIDE:
>+        case GL_COLOR_ARRAY_STRIDE:
>+        case GL_POINT_SIZE_ARRAY_STRIDE_OES:
>+        case GL_TEXTURE_COORD_ARRAY_STRIDE:
>+            getVertexAttribiv(static_cast<GLuint>(vertexArrayIndex(ParamToVertexArrayType(pname))),
>+                              GL_VERTEX_ATTRIB_ARRAY_STRIDE, params);
>+            break;
>+        case GL_VERTEX_ARRAY_SIZE:
>+        case GL_COLOR_ARRAY_SIZE:
>+        case GL_TEXTURE_COORD_ARRAY_SIZE:
>+            getVertexAttribiv(static_cast<GLuint>(vertexArrayIndex(ParamToVertexArrayType(pname))),
>+                              GL_VERTEX_ATTRIB_ARRAY_SIZE, params);
>+            break;
>+        case GL_VERTEX_ARRAY_TYPE:
>+        case GL_COLOR_ARRAY_TYPE:
>+        case GL_NORMAL_ARRAY_TYPE:
>+        case GL_POINT_SIZE_ARRAY_TYPE_OES:
>+        case GL_TEXTURE_COORD_ARRAY_TYPE:
>+            getVertexAttribiv(static_cast<GLuint>(vertexArrayIndex(ParamToVertexArrayType(pname))),
>+                              GL_VERTEX_ATTRIB_ARRAY_TYPE, params);
>+            break;
>+
>+        // GL_KHR_parallel_shader_compile
>+        case GL_MAX_SHADER_COMPILER_THREADS_KHR:
>+            *params = mState.getMaxShaderCompilerThreads();
>+            break;
>+
>+        // GL_EXT_blend_func_extended
>+        case GL_MAX_DUAL_SOURCE_DRAW_BUFFERS_EXT:
>+            *params = mState.mExtensions.maxDualSourceDrawBuffers;
>+            break;
>+
>         default:
>-            mGLState.getIntegerv(this, pname, params);
>+            ANGLE_CONTEXT_TRY(mState.getIntegerv(this, pname, params));
>             break;
>     }
> }
>@@ -1521,19 +1815,19 @@ void Context::getInteger64vImpl(GLenum pname, GLint64 *params)
>     switch (pname)
>     {
>         case GL_MAX_ELEMENT_INDEX:
>-            *params = mCaps.maxElementIndex;
>+            *params = mState.mCaps.maxElementIndex;
>             break;
>         case GL_MAX_UNIFORM_BLOCK_SIZE:
>-            *params = mCaps.maxUniformBlockSize;
>+            *params = mState.mCaps.maxUniformBlockSize;
>             break;
>         case GL_MAX_COMBINED_VERTEX_UNIFORM_COMPONENTS:
>-            *params = mCaps.maxCombinedVertexUniformComponents;
>+            *params = mState.mCaps.maxCombinedShaderUniformComponents[ShaderType::Vertex];
>             break;
>         case GL_MAX_COMBINED_FRAGMENT_UNIFORM_COMPONENTS:
>-            *params = mCaps.maxCombinedFragmentUniformComponents;
>+            *params = mState.mCaps.maxCombinedShaderUniformComponents[ShaderType::Fragment];
>             break;
>         case GL_MAX_SERVER_WAIT_TIMEOUT:
>-            *params = mCaps.maxServerWaitTimeout;
>+            *params = mState.mCaps.maxServerWaitTimeout;
>             break;
> 
>         // GL_EXT_disjoint_timer_query
>@@ -1542,7 +1836,7 @@ void Context::getInteger64vImpl(GLenum pname, GLint64 *params)
>             break;
> 
>         case GL_MAX_SHADER_STORAGE_BLOCK_SIZE:
>-            *params = mCaps.maxShaderStorageBlockSize;
>+            *params = mState.mCaps.maxShaderStorageBlockSize;
>             break;
>         default:
>             UNREACHABLE();
>@@ -1552,7 +1846,15 @@ void Context::getInteger64vImpl(GLenum pname, GLint64 *params)
> 
> void Context::getPointerv(GLenum pname, void **params) const
> {
>-    mGLState.getPointerv(pname, params);
>+    mState.getPointerv(this, pname, params);
>+}
>+
>+void Context::getPointervRobustANGLERobust(GLenum pname,
>+                                           GLsizei bufSize,
>+                                           GLsizei *length,
>+                                           void **params)
>+{
>+    UNIMPLEMENTED();
> }
> 
> void Context::getIntegeri_v(GLenum target, GLuint index, GLint *data)
>@@ -1571,14 +1873,14 @@ void Context::getIntegeri_v(GLenum target, GLuint index, GLint *data)
>         {
>             case GL_MAX_COMPUTE_WORK_GROUP_COUNT:
>                 ASSERT(index < 3u);
>-                *data = mCaps.maxComputeWorkGroupCount[index];
>+                *data = mState.mCaps.maxComputeWorkGroupCount[index];
>                 break;
>             case GL_MAX_COMPUTE_WORK_GROUP_SIZE:
>                 ASSERT(index < 3u);
>-                *data = mCaps.maxComputeWorkGroupSize[index];
>+                *data = mState.mCaps.maxComputeWorkGroupSize[index];
>                 break;
>             default:
>-                mGLState.getIntegeri_v(target, index, data);
>+                mState.getIntegeri_v(target, index, data);
>         }
>     }
>     else
>@@ -1587,6 +1889,15 @@ void Context::getIntegeri_v(GLenum target, GLuint index, GLint *data)
>     }
> }
> 
>+void Context::getIntegeri_vRobust(GLenum target,
>+                                  GLuint index,
>+                                  GLsizei bufSize,
>+                                  GLsizei *length,
>+                                  GLint *data)
>+{
>+    getIntegeri_v(target, index, data);
>+}
>+
> void Context::getInteger64i_v(GLenum target, GLuint index, GLint64 *data)
> {
>     // Queries about context capabilities and maximums are answered by Context.
>@@ -1599,7 +1910,7 @@ void Context::getInteger64i_v(GLenum target, GLuint index, GLint64 *data)
> 
>     if (nativeType == GL_INT_64_ANGLEX)
>     {
>-        mGLState.getInteger64i_v(target, index, data);
>+        mState.getInteger64i_v(target, index, data);
>     }
>     else
>     {
>@@ -1607,6 +1918,15 @@ void Context::getInteger64i_v(GLenum target, GLuint index, GLint64 *data)
>     }
> }
> 
>+void Context::getInteger64i_vRobust(GLenum target,
>+                                    GLuint index,
>+                                    GLsizei bufSize,
>+                                    GLsizei *length,
>+                                    GLint64 *data)
>+{
>+    getInteger64i_v(target, index, data);
>+}
>+
> void Context::getBooleani_v(GLenum target, GLuint index, GLboolean *data)
> {
>     // Queries about context capabilities and maximums are answered by Context.
>@@ -1619,7 +1939,7 @@ void Context::getBooleani_v(GLenum target, GLuint index, GLboolean *data)
> 
>     if (nativeType == GL_BOOL)
>     {
>-        mGLState.getBooleani_v(target, index, data);
>+        mState.getBooleani_v(target, index, data);
>     }
>     else
>     {
>@@ -1627,157 +1947,321 @@ void Context::getBooleani_v(GLenum target, GLuint index, GLboolean *data)
>     }
> }
> 
>+void Context::getBooleani_vRobust(GLenum target,
>+                                  GLuint index,
>+                                  GLsizei bufSize,
>+                                  GLsizei *length,
>+                                  GLboolean *data)
>+{
>+    getBooleani_v(target, index, data);
>+}
>+
> void Context::getBufferParameteriv(BufferBinding target, GLenum pname, GLint *params)
> {
>-    Buffer *buffer = mGLState.getTargetBuffer(target);
>+    Buffer *buffer = mState.getTargetBuffer(target);
>     QueryBufferParameteriv(buffer, pname, params);
> }
> 
>+void Context::getBufferParameterivRobust(BufferBinding target,
>+                                         GLenum pname,
>+                                         GLsizei bufSize,
>+                                         GLsizei *length,
>+                                         GLint *params)
>+{
>+    getBufferParameteriv(target, pname, params);
>+}
>+
> void Context::getFramebufferAttachmentParameteriv(GLenum target,
>                                                   GLenum attachment,
>                                                   GLenum pname,
>                                                   GLint *params)
> {
>-    const Framebuffer *framebuffer = mGLState.getTargetFramebuffer(target);
>-    QueryFramebufferAttachmentParameteriv(framebuffer, attachment, pname, params);
>+    const Framebuffer *framebuffer = mState.getTargetFramebuffer(target);
>+    QueryFramebufferAttachmentParameteriv(this, framebuffer, attachment, pname, params);
>+}
>+
>+void Context::getFramebufferAttachmentParameterivRobust(GLenum target,
>+                                                        GLenum attachment,
>+                                                        GLenum pname,
>+                                                        GLsizei bufSize,
>+                                                        GLsizei *length,
>+                                                        GLint *params)
>+{
>+    getFramebufferAttachmentParameteriv(target, attachment, pname, params);
> }
> 
> void Context::getRenderbufferParameteriv(GLenum target, GLenum pname, GLint *params)
> {
>-    Renderbuffer *renderbuffer = mGLState.getCurrentRenderbuffer();
>+    Renderbuffer *renderbuffer = mState.getCurrentRenderbuffer();
>     QueryRenderbufferiv(this, renderbuffer, pname, params);
> }
> 
>-void Context::getTexParameterfv(GLenum target, GLenum pname, GLfloat *params)
>+void Context::getRenderbufferParameterivRobust(GLenum target,
>+                                               GLenum pname,
>+                                               GLsizei bufSize,
>+                                               GLsizei *length,
>+                                               GLint *params)
> {
>-    Texture *texture = getTargetTexture(target);
>-    QueryTexParameterfv(texture, pname, params);
>+    getRenderbufferParameteriv(target, pname, params);
> }
> 
>-void Context::getTexParameteriv(GLenum target, GLenum pname, GLint *params)
>+void Context::getTexParameterfv(TextureType target, GLenum pname, GLfloat *params)
> {
>-    Texture *texture = getTargetTexture(target);
>-    QueryTexParameteriv(texture, pname, params);
>+    const Texture *const texture = getTextureByType(target);
>+    QueryTexParameterfv(texture, pname, params);
> }
> 
>-void Context::getTexLevelParameteriv(GLenum target, GLint level, GLenum pname, GLint *params)
>+void Context::getTexParameterfvRobust(TextureType target,
>+                                      GLenum pname,
>+                                      GLsizei bufSize,
>+                                      GLsizei *length,
>+                                      GLfloat *params)
> {
>-    Texture *texture =
>-        getTargetTexture(IsCubeMapTextureTarget(target) ? GL_TEXTURE_CUBE_MAP : target);
>-    QueryTexLevelParameteriv(texture, target, level, pname, params);
>+    getTexParameterfv(target, pname, params);
> }
> 
>-void Context::getTexLevelParameterfv(GLenum target, GLint level, GLenum pname, GLfloat *params)
>+void Context::getTexParameteriv(TextureType target, GLenum pname, GLint *params)
> {
>-    Texture *texture =
>-        getTargetTexture(IsCubeMapTextureTarget(target) ? GL_TEXTURE_CUBE_MAP : target);
>-    QueryTexLevelParameterfv(texture, target, level, pname, params);
>+    const Texture *const texture = getTextureByType(target);
>+    QueryTexParameteriv(texture, pname, params);
> }
> 
>-void Context::texParameterf(GLenum target, GLenum pname, GLfloat param)
>+void Context::getTexParameterIiv(TextureType target, GLenum pname, GLint *params)
> {
>-    Texture *texture = getTargetTexture(target);
>-    SetTexParameterf(this, texture, pname, param);
>-    onTextureChange(texture);
>+    const Texture *const texture = getTextureByType(target);
>+    QueryTexParameterIiv(texture, pname, params);
> }
> 
>-void Context::texParameterfv(GLenum target, GLenum pname, const GLfloat *params)
>+void Context::getTexParameterIuiv(TextureType target, GLenum pname, GLuint *params)
> {
>-    Texture *texture = getTargetTexture(target);
>-    SetTexParameterfv(this, texture, pname, params);
>-    onTextureChange(texture);
>+    const Texture *const texture = getTextureByType(target);
>+    QueryTexParameterIuiv(texture, pname, params);
> }
> 
>-void Context::texParameteri(GLenum target, GLenum pname, GLint param)
>+void Context::getTexParameterivRobust(TextureType target,
>+                                      GLenum pname,
>+                                      GLsizei bufSize,
>+                                      GLsizei *length,
>+                                      GLint *params)
> {
>-    Texture *texture = getTargetTexture(target);
>-    SetTexParameteri(this, texture, pname, param);
>-    onTextureChange(texture);
>+    getTexParameteriv(target, pname, params);
> }
> 
>-void Context::texParameteriv(GLenum target, GLenum pname, const GLint *params)
>+void Context::getTexParameterIivRobust(TextureType target,
>+                                       GLenum pname,
>+                                       GLsizei bufSize,
>+                                       GLsizei *length,
>+                                       GLint *params)
> {
>-    Texture *texture = getTargetTexture(target);
>-    SetTexParameteriv(this, texture, pname, params);
>-    onTextureChange(texture);
>+    UNIMPLEMENTED();
> }
> 
>-void Context::drawArrays(GLenum mode, GLint first, GLsizei count)
>+void Context::getTexParameterIuivRobust(TextureType target,
>+                                        GLenum pname,
>+                                        GLsizei bufSize,
>+                                        GLsizei *length,
>+                                        GLuint *params)
> {
>-    ANGLE_CONTEXT_TRY(prepareForDraw());
>-    ANGLE_CONTEXT_TRY(mImplementation->drawArrays(this, mode, first, count));
>-    MarkTransformFeedbackBufferUsage(mGLState.getCurrentTransformFeedback());
>+    UNIMPLEMENTED();
> }
> 
>-void Context::drawArraysInstanced(GLenum mode, GLint first, GLsizei count, GLsizei instanceCount)
>+void Context::getTexLevelParameteriv(TextureTarget target, GLint level, GLenum pname, GLint *params)
> {
>-    ANGLE_CONTEXT_TRY(prepareForDraw());
>-    ANGLE_CONTEXT_TRY(
>-        mImplementation->drawArraysInstanced(this, mode, first, count, instanceCount));
>-    MarkTransformFeedbackBufferUsage(mGLState.getCurrentTransformFeedback());
>+    Texture *texture = getTextureByTarget(target);
>+    QueryTexLevelParameteriv(texture, target, level, pname, params);
> }
> 
>-void Context::drawElements(GLenum mode, GLsizei count, GLenum type, const void *indices)
>+void Context::getTexLevelParameterivRobust(TextureTarget target,
>+                                           GLint level,
>+                                           GLenum pname,
>+                                           GLsizei bufSize,
>+                                           GLsizei *length,
>+                                           GLint *params)
> {
>-    ANGLE_CONTEXT_TRY(prepareForDraw());
>-    ANGLE_CONTEXT_TRY(mImplementation->drawElements(this, mode, count, type, indices));
>+    UNIMPLEMENTED();
> }
> 
>-void Context::drawElementsInstanced(GLenum mode,
>-                                    GLsizei count,
>-                                    GLenum type,
>-                                    const void *indices,
>-                                    GLsizei instances)
>+void Context::getTexLevelParameterfv(TextureTarget target,
>+                                     GLint level,
>+                                     GLenum pname,
>+                                     GLfloat *params)
> {
>-    ANGLE_CONTEXT_TRY(prepareForDraw());
>-    ANGLE_CONTEXT_TRY(
>-        mImplementation->drawElementsInstanced(this, mode, count, type, indices, instances));
>+    Texture *texture = getTextureByTarget(target);
>+    QueryTexLevelParameterfv(texture, target, level, pname, params);
> }
> 
>-void Context::drawRangeElements(GLenum mode,
>-                                GLuint start,
>-                                GLuint end,
>-                                GLsizei count,
>-                                GLenum type,
>-                                const void *indices)
>+void Context::getTexLevelParameterfvRobust(TextureTarget target,
>+                                           GLint level,
>+                                           GLenum pname,
>+                                           GLsizei bufSize,
>+                                           GLsizei *length,
>+                                           GLfloat *params)
> {
>-    ANGLE_CONTEXT_TRY(prepareForDraw());
>-    ANGLE_CONTEXT_TRY(
>-        mImplementation->drawRangeElements(this, mode, start, end, count, type, indices));
>+    UNIMPLEMENTED();
> }
> 
>-void Context::drawArraysIndirect(GLenum mode, const void *indirect)
>+void Context::texParameterf(TextureType target, GLenum pname, GLfloat param)
> {
>-    ANGLE_CONTEXT_TRY(prepareForDraw());
>-    ANGLE_CONTEXT_TRY(mImplementation->drawArraysIndirect(this, mode, indirect));
>+    Texture *const texture = getTextureByType(target);
>+    SetTexParameterf(this, texture, pname, param);
> }
> 
>-void Context::drawElementsIndirect(GLenum mode, GLenum type, const void *indirect)
>+void Context::texParameterfv(TextureType target, GLenum pname, const GLfloat *params)
> {
>-    ANGLE_CONTEXT_TRY(prepareForDraw());
>-    ANGLE_CONTEXT_TRY(mImplementation->drawElementsIndirect(this, mode, type, indirect));
>+    Texture *const texture = getTextureByType(target);
>+    SetTexParameterfv(this, texture, pname, params);
> }
> 
>-void Context::flush()
>+void Context::texParameterfvRobust(TextureType target,
>+                                   GLenum pname,
>+                                   GLsizei bufSize,
>+                                   const GLfloat *params)
> {
>-    handleError(mImplementation->flush(this));
>+    texParameterfv(target, pname, params);
> }
> 
>-void Context::finish()
>+void Context::texParameteri(TextureType target, GLenum pname, GLint param)
> {
>-    handleError(mImplementation->finish(this));
>+    Texture *const texture = getTextureByType(target);
>+    SetTexParameteri(this, texture, pname, param);
> }
> 
>-void Context::insertEventMarker(GLsizei length, const char *marker)
>+void Context::texParameteriv(TextureType target, GLenum pname, const GLint *params)
> {
>-    ASSERT(mImplementation);
>-    mImplementation->insertEventMarker(length, marker);
>+    Texture *const texture = getTextureByType(target);
>+    SetTexParameteriv(this, texture, pname, params);
>+}
>+
>+void Context::texParameterIiv(TextureType target, GLenum pname, const GLint *params)
>+{
>+    Texture *const texture = getTextureByType(target);
>+    SetTexParameterIiv(this, texture, pname, params);
>+}
>+
>+void Context::texParameterIuiv(TextureType target, GLenum pname, const GLuint *params)
>+{
>+    Texture *const texture = getTextureByType(target);
>+    SetTexParameterIuiv(this, texture, pname, params);
>+}
>+
>+void Context::texParameterivRobust(TextureType target,
>+                                   GLenum pname,
>+                                   GLsizei bufSize,
>+                                   const GLint *params)
>+{
>+    texParameteriv(target, pname, params);
>+}
>+
>+void Context::texParameterIivRobust(TextureType target,
>+                                    GLenum pname,
>+                                    GLsizei bufSize,
>+                                    const GLint *params)
>+{
>+    UNIMPLEMENTED();
>+}
>+
>+void Context::texParameterIuivRobust(TextureType target,
>+                                     GLenum pname,
>+                                     GLsizei bufSize,
>+                                     const GLuint *params)
>+{
>+    UNIMPLEMENTED();
>+}
>+
>+void Context::drawArraysInstanced(PrimitiveMode mode,
>+                                  GLint first,
>+                                  GLsizei count,
>+                                  GLsizei instanceCount)
>+{
>+    // No-op if count draws no primitives for given mode
>+    if (noopDrawInstanced(mode, count, instanceCount))
>+    {
>+        return;
>+    }
>+
>+    ANGLE_CONTEXT_TRY(prepareForDraw(mode));
>+    ANGLE_CONTEXT_TRY(
>+        mImplementation->drawArraysInstanced(this, mode, first, count, instanceCount));
>+    MarkTransformFeedbackBufferUsage(this, count, instanceCount);
>+}
>+
>+void Context::drawElementsInstanced(PrimitiveMode mode,
>+                                    GLsizei count,
>+                                    DrawElementsType type,
>+                                    const void *indices,
>+                                    GLsizei instances)
>+{
>+    // No-op if count draws no primitives for given mode
>+    if (noopDrawInstanced(mode, count, instances))
>+    {
>+        return;
>+    }
>+
>+    ANGLE_CONTEXT_TRY(prepareForDraw(mode));
>+    ANGLE_CONTEXT_TRY(
>+        mImplementation->drawElementsInstanced(this, mode, count, type, indices, instances));
>+}
>+
>+void Context::drawRangeElements(PrimitiveMode mode,
>+                                GLuint start,
>+                                GLuint end,
>+                                GLsizei count,
>+                                DrawElementsType type,
>+                                const void *indices)
>+{
>+    // No-op if count draws no primitives for given mode
>+    if (noopDraw(mode, count))
>+    {
>+        return;
>+    }
>+
>+    ANGLE_CONTEXT_TRY(prepareForDraw(mode));
>+    ANGLE_CONTEXT_TRY(
>+        mImplementation->drawRangeElements(this, mode, start, end, count, type, indices));
>+}
>+
>+void Context::drawArraysIndirect(PrimitiveMode mode, const void *indirect)
>+{
>+    ANGLE_CONTEXT_TRY(prepareForDraw(mode));
>+    ANGLE_CONTEXT_TRY(mImplementation->drawArraysIndirect(this, mode, indirect));
>+}
>+
>+void Context::drawElementsIndirect(PrimitiveMode mode, DrawElementsType type, const void *indirect)
>+{
>+    ANGLE_CONTEXT_TRY(prepareForDraw(mode));
>+    ANGLE_CONTEXT_TRY(mImplementation->drawElementsIndirect(this, mode, type, indirect));
>+}
>+
>+void Context::flush()
>+{
>+    ANGLE_CONTEXT_TRY(mImplementation->flush(this));
>+}
>+
>+void Context::finish()
>+{
>+    ANGLE_CONTEXT_TRY(mImplementation->finish(this));
>+}
>+
>+void Context::insertEventMarker(GLsizei length, const char *marker)
>+{
>+    ASSERT(mImplementation);
>+    mImplementation->insertEventMarker(length, marker);
> }
> 
> void Context::pushGroupMarker(GLsizei length, const char *marker)
> {
>     ASSERT(mImplementation);
>-    mImplementation->pushGroupMarker(length, marker);
>+
>+    if (marker == nullptr)
>+    {
>+        // From the EXT_debug_marker spec,
>+        // "If <marker> is null then an empty string is pushed on the stack."
>+        mImplementation->pushGroupMarker(length, "");
>+    }
>+    else
>+    {
>+        mImplementation->pushGroupMarker(length, marker);
>+    }
> }
> 
> void Context::popGroupMarker()
>@@ -1788,86 +2272,81 @@ void Context::popGroupMarker()
> 
> void Context::bindUniformLocation(GLuint program, GLint location, const GLchar *name)
> {
>-    Program *programObject = getProgram(program);
>+    Program *programObject = getProgramResolveLink(program);
>     ASSERT(programObject);
> 
>     programObject->bindUniformLocation(location, name);
> }
> 
>-void Context::setCoverageModulation(GLenum components)
>+void Context::coverageModulation(GLenum components)
> {
>-    mGLState.setCoverageModulation(components);
>+    mState.setCoverageModulation(components);
> }
> 
>-void Context::loadPathRenderingMatrix(GLenum matrixMode, const GLfloat *matrix)
>+void Context::matrixLoadf(GLenum matrixMode, const GLfloat *matrix)
> {
>-    mGLState.loadPathRenderingMatrix(matrixMode, matrix);
>+    mState.loadPathRenderingMatrix(matrixMode, matrix);
> }
> 
>-void Context::loadPathRenderingIdentityMatrix(GLenum matrixMode)
>+void Context::matrixLoadIdentity(GLenum matrixMode)
> {
>     GLfloat I[16];
>     angle::Matrix<GLfloat>::setToIdentity(I);
> 
>-    mGLState.loadPathRenderingMatrix(matrixMode, I);
>+    mState.loadPathRenderingMatrix(matrixMode, I);
> }
> 
> void Context::stencilFillPath(GLuint path, GLenum fillMode, GLuint mask)
> {
>-    const auto *pathObj = mState.mPaths->getPath(path);
>+    const auto *pathObj = mState.mPathManager->getPath(path);
>     if (!pathObj)
>         return;
> 
>-    // TODO(svaisanen@nvidia.com): maybe sync only state required for path rendering?
>-    syncRendererState();
>+    ANGLE_CONTEXT_TRY(syncStateForPathOperation());
> 
>     mImplementation->stencilFillPath(pathObj, fillMode, mask);
> }
> 
> void Context::stencilStrokePath(GLuint path, GLint reference, GLuint mask)
> {
>-    const auto *pathObj = mState.mPaths->getPath(path);
>+    const auto *pathObj = mState.mPathManager->getPath(path);
>     if (!pathObj)
>         return;
> 
>-    // TODO(svaisanen@nvidia.com): maybe sync only state required for path rendering?
>-    syncRendererState();
>+    ANGLE_CONTEXT_TRY(syncStateForPathOperation());
> 
>     mImplementation->stencilStrokePath(pathObj, reference, mask);
> }
> 
> void Context::coverFillPath(GLuint path, GLenum coverMode)
> {
>-    const auto *pathObj = mState.mPaths->getPath(path);
>+    const auto *pathObj = mState.mPathManager->getPath(path);
>     if (!pathObj)
>         return;
> 
>-    // TODO(svaisanen@nvidia.com): maybe sync only state required for path rendering?
>-    syncRendererState();
>+    ANGLE_CONTEXT_TRY(syncStateForPathOperation());
> 
>     mImplementation->coverFillPath(pathObj, coverMode);
> }
> 
> void Context::coverStrokePath(GLuint path, GLenum coverMode)
> {
>-    const auto *pathObj = mState.mPaths->getPath(path);
>+    const auto *pathObj = mState.mPathManager->getPath(path);
>     if (!pathObj)
>         return;
> 
>-    // TODO(svaisanen@nvidia.com): maybe sync only state required for path rendering?
>-    syncRendererState();
>+    ANGLE_CONTEXT_TRY(syncStateForPathOperation());
> 
>     mImplementation->coverStrokePath(pathObj, coverMode);
> }
> 
> void Context::stencilThenCoverFillPath(GLuint path, GLenum fillMode, GLuint mask, GLenum coverMode)
> {
>-    const auto *pathObj = mState.mPaths->getPath(path);
>+    const auto *pathObj = mState.mPathManager->getPath(path);
>     if (!pathObj)
>         return;
> 
>-    // TODO(svaisanen@nvidia.com): maybe sync only state required for path rendering?
>-    syncRendererState();
>+    ANGLE_CONTEXT_TRY(syncStateForPathOperation());
> 
>     mImplementation->stencilThenCoverFillPath(pathObj, fillMode, mask, coverMode);
> }
>@@ -1877,12 +2356,11 @@ void Context::stencilThenCoverStrokePath(GLuint path,
>                                          GLuint mask,
>                                          GLenum coverMode)
> {
>-    const auto *pathObj = mState.mPaths->getPath(path);
>+    const auto *pathObj = mState.mPathManager->getPath(path);
>     if (!pathObj)
>         return;
> 
>-    // TODO(svaisanen@nvidia.com): maybe sync only state required for path rendering?
>-    syncRendererState();
>+    ANGLE_CONTEXT_TRY(syncStateForPathOperation());
> 
>     mImplementation->stencilThenCoverStrokePath(pathObj, reference, mask, coverMode);
> }
>@@ -1895,10 +2373,10 @@ void Context::coverFillPathInstanced(GLsizei numPaths,
>                                      GLenum transformType,
>                                      const GLfloat *transformValues)
> {
>-    const auto &pathObjects = GatherPaths(*mState.mPaths, numPaths, pathNameType, paths, pathBase);
>+    const auto &pathObjects =
>+        GatherPaths(*mState.mPathManager, numPaths, pathNameType, paths, pathBase);
> 
>-    // TODO(svaisanen@nvidia.com): maybe sync only state required for path rendering?
>-    syncRendererState();
>+    ANGLE_CONTEXT_TRY(syncStateForPathOperation());
> 
>     mImplementation->coverFillPathInstanced(pathObjects, coverMode, transformType, transformValues);
> }
>@@ -1911,10 +2389,11 @@ void Context::coverStrokePathInstanced(GLsizei numPaths,
>                                        GLenum transformType,
>                                        const GLfloat *transformValues)
> {
>-    const auto &pathObjects = GatherPaths(*mState.mPaths, numPaths, pathNameType, paths, pathBase);
>+    const auto &pathObjects =
>+        GatherPaths(*mState.mPathManager, numPaths, pathNameType, paths, pathBase);
> 
>     // TODO(svaisanen@nvidia.com): maybe sync only state required for path rendering?
>-    syncRendererState();
>+    ANGLE_CONTEXT_TRY(syncStateForPathOperation());
> 
>     mImplementation->coverStrokePathInstanced(pathObjects, coverMode, transformType,
>                                               transformValues);
>@@ -1929,10 +2408,11 @@ void Context::stencilFillPathInstanced(GLsizei numPaths,
>                                        GLenum transformType,
>                                        const GLfloat *transformValues)
> {
>-    const auto &pathObjects = GatherPaths(*mState.mPaths, numPaths, pathNameType, paths, pathBase);
>+    const auto &pathObjects =
>+        GatherPaths(*mState.mPathManager, numPaths, pathNameType, paths, pathBase);
> 
>     // TODO(svaisanen@nvidia.com): maybe sync only state required for path rendering?
>-    syncRendererState();
>+    ANGLE_CONTEXT_TRY(syncStateForPathOperation());
> 
>     mImplementation->stencilFillPathInstanced(pathObjects, fillMode, mask, transformType,
>                                               transformValues);
>@@ -1947,10 +2427,10 @@ void Context::stencilStrokePathInstanced(GLsizei numPaths,
>                                          GLenum transformType,
>                                          const GLfloat *transformValues)
> {
>-    const auto &pathObjects = GatherPaths(*mState.mPaths, numPaths, pathNameType, paths, pathBase);
>+    const auto &pathObjects =
>+        GatherPaths(*mState.mPathManager, numPaths, pathNameType, paths, pathBase);
> 
>-    // TODO(svaisanen@nvidia.com): maybe sync only state required for path rendering?
>-    syncRendererState();
>+    ANGLE_CONTEXT_TRY(syncStateForPathOperation());
> 
>     mImplementation->stencilStrokePathInstanced(pathObjects, reference, mask, transformType,
>                                                 transformValues);
>@@ -1966,10 +2446,10 @@ void Context::stencilThenCoverFillPathInstanced(GLsizei numPaths,
>                                                 GLenum transformType,
>                                                 const GLfloat *transformValues)
> {
>-    const auto &pathObjects = GatherPaths(*mState.mPaths, numPaths, pathNameType, paths, pathBase);
>+    const auto &pathObjects =
>+        GatherPaths(*mState.mPathManager, numPaths, pathNameType, paths, pathBase);
> 
>-    // TODO(svaisanen@nvidia.com): maybe sync only state required for path rendering?
>-    syncRendererState();
>+    ANGLE_CONTEXT_TRY(syncStateForPathOperation());
> 
>     mImplementation->stencilThenCoverFillPathInstanced(pathObjects, coverMode, fillMode, mask,
>                                                        transformType, transformValues);
>@@ -1985,10 +2465,10 @@ void Context::stencilThenCoverStrokePathInstanced(GLsizei numPaths,
>                                                   GLenum transformType,
>                                                   const GLfloat *transformValues)
> {
>-    const auto &pathObjects = GatherPaths(*mState.mPaths, numPaths, pathNameType, paths, pathBase);
>+    const auto &pathObjects =
>+        GatherPaths(*mState.mPathManager, numPaths, pathNameType, paths, pathBase);
> 
>-    // TODO(svaisanen@nvidia.com): maybe sync only state required for path rendering?
>-    syncRendererState();
>+    ANGLE_CONTEXT_TRY(syncStateForPathOperation());
> 
>     mImplementation->stencilThenCoverStrokePathInstanced(pathObjects, coverMode, reference, mask,
>                                                          transformType, transformValues);
>@@ -1996,7 +2476,7 @@ void Context::stencilThenCoverStrokePathInstanced(GLsizei numPaths,
> 
> void Context::bindFragmentInputLocation(GLuint program, GLint location, const GLchar *name)
> {
>-    auto *programObject = getProgram(program);
>+    auto *programObject = getProgramResolveLink(program);
> 
>     programObject->bindFragmentInputLocation(location, name);
> }
>@@ -2007,14 +2487,14 @@ void Context::programPathFragmentInputGen(GLuint program,
>                                           GLint components,
>                                           const GLfloat *coeffs)
> {
>-    auto *programObject = getProgram(program);
>+    auto *programObject = getProgramResolveLink(program);
> 
>-    programObject->pathFragmentInputGen(this, location, genMode, components, coeffs);
>+    programObject->pathFragmentInputGen(location, genMode, components, coeffs);
> }
> 
> GLuint Context::getProgramResourceIndex(GLuint program, GLenum programInterface, const GLchar *name)
> {
>-    const auto *programObject = getProgram(program);
>+    const Program *programObject = getProgramResolveLink(program);
>     return QueryProgramResourceIndex(programObject, programInterface, name);
> }
> 
>@@ -2025,7 +2505,7 @@ void Context::getProgramResourceName(GLuint program,
>                                      GLsizei *length,
>                                      GLchar *name)
> {
>-    const auto *programObject = getProgram(program);
>+    const Program *programObject = getProgramResolveLink(program);
>     QueryProgramResourceName(programObject, programInterface, index, bufSize, length, name);
> }
> 
>@@ -2033,7 +2513,7 @@ GLint Context::getProgramResourceLocation(GLuint program,
>                                           GLenum programInterface,
>                                           const GLchar *name)
> {
>-    const auto *programObject = getProgram(program);
>+    const Program *programObject = getProgramResolveLink(program);
>     return QueryProgramResourceLocation(programObject, programInterface, name);
> }
> 
>@@ -2046,7 +2526,7 @@ void Context::getProgramResourceiv(GLuint program,
>                                    GLsizei *length,
>                                    GLint *params)
> {
>-    const auto *programObject = getProgram(program);
>+    const Program *programObject = getProgramResolveLink(program);
>     QueryProgramResourceiv(programObject, programInterface, index, propCount, props, bufSize,
>                            length, params);
> }
>@@ -2056,25 +2536,32 @@ void Context::getProgramInterfaceiv(GLuint program,
>                                     GLenum pname,
>                                     GLint *params)
> {
>-    const auto *programObject = getProgram(program);
>+    const Program *programObject = getProgramResolveLink(program);
>     QueryProgramInterfaceiv(programObject, programInterface, pname, params);
> }
> 
>-void Context::handleError(const Error &error)
>+void Context::getProgramInterfaceivRobust(GLuint program,
>+                                          GLenum programInterface,
>+                                          GLenum pname,
>+                                          GLsizei bufSize,
>+                                          GLsizei *length,
>+                                          GLint *params)
>+{
>+    UNIMPLEMENTED();
>+}
>+
>+void Context::handleError(GLenum errorCode,
>+                          const char *message,
>+                          const char *file,
>+                          const char *function,
>+                          unsigned int line)
> {
>-    if (error.isError())
>-    {
>-        GLenum code = error.getCode();
>-        mErrors.insert(code);
>-        if (code == GL_OUT_OF_MEMORY && getWorkarounds().loseContextOnOutOfMemory)
>-        {
>-            markContextLost();
>-        }
>+    mErrors.handleError(errorCode, message, file, function, line);
>+}
> 
>-        ASSERT(!error.getMessage().empty());
>-        mGLState.getDebug().insertMessage(GL_DEBUG_SOURCE_API, GL_DEBUG_TYPE_ERROR, error.getID(),
>-                                          GL_DEBUG_SEVERITY_HIGH, error.getMessage());
>-    }
>+void Context::validationError(GLenum errorCode, const char *message)
>+{
>+    mErrors.validationError(errorCode, message);
> }
> 
> // Get one of the recorded errors and clear its flag, if any.
>@@ -2087,35 +2574,29 @@ GLenum Context::getError()
>     }
>     else
>     {
>-        GLenum error = *mErrors.begin();
>-        mErrors.erase(mErrors.begin());
>-        return error;
>+        return mErrors.popError();
>     }
> }
> 
> // NOTE: this function should not assume that this context is current!
>-void Context::markContextLost()
>+void Context::markContextLost(GraphicsResetStatus status)
> {
>+    ASSERT(status != GraphicsResetStatus::NoError);
>     if (mResetStrategy == GL_LOSE_CONTEXT_ON_RESET_EXT)
>     {
>-        mResetStatus       = GL_UNKNOWN_CONTEXT_RESET_EXT;
>+        mResetStatus       = status;
>         mContextLostForced = true;
>     }
>     mContextLost = true;
> }
> 
>-bool Context::isContextLost()
>-{
>-    return mContextLost;
>-}
>-
>-GLenum Context::getResetStatus()
>+GLenum Context::getGraphicsResetStatus()
> {
>     // Even if the application doesn't want to know about resets, we want to know
>     // as it will allow us to skip all the calls.
>     if (mResetStrategy == GL_NO_RESET_NOTIFICATION_EXT)
>     {
>-        if (!mContextLost && mImplementation->getResetStatus() != GL_NO_ERROR)
>+        if (!mContextLost && mImplementation->getResetStatus() != GraphicsResetStatus::NoError)
>         {
>             mContextLost = true;
>         }
>@@ -2131,15 +2612,15 @@ GLenum Context::getResetStatus()
>     // once the device has finished resetting.
>     if (!mContextLost)
>     {
>-        ASSERT(mResetStatus == GL_NO_ERROR);
>+        ASSERT(mResetStatus == GraphicsResetStatus::NoError);
>         mResetStatus = mImplementation->getResetStatus();
> 
>-        if (mResetStatus != GL_NO_ERROR)
>+        if (mResetStatus != GraphicsResetStatus::NoError)
>         {
>             mContextLost = true;
>         }
>     }
>-    else if (!mContextLostForced && mResetStatus != GL_NO_ERROR)
>+    else if (!mContextLostForced && mResetStatus != GraphicsResetStatus::NoError)
>     {
>         // If markContextLost was used to mark the context lost then
>         // assume that is not recoverable, and continue to report the
>@@ -2147,7 +2628,7 @@ GLenum Context::getResetStatus()
>         mResetStatus = mImplementation->getResetStatus();
>     }
> 
>-    return mResetStatus;
>+    return ToGLenum(mResetStatus);
> }
> 
> bool Context::isResetNotificationEnabled()
>@@ -2167,13 +2648,13 @@ EGLenum Context::getClientType() const
> 
> EGLenum Context::getRenderBuffer() const
> {
>-    const Framebuffer *framebuffer = mState.mFramebuffers->getFramebuffer(0);
>+    const Framebuffer *framebuffer = mState.mFramebufferManager->getFramebuffer(0);
>     if (framebuffer == nullptr)
>     {
>         return EGL_NONE;
>     }
> 
>-    const FramebufferAttachment *backAttachment = framebuffer->getAttachment(GL_BACK);
>+    const FramebufferAttachment *backAttachment = framebuffer->getAttachment(this, GL_BACK);
>     ASSERT(backAttachment != nullptr);
>     return backAttachment->getSurface()->getRenderBuffer();
> }
>@@ -2184,8 +2665,9 @@ VertexArray *Context::checkVertexArrayAllocation(GLuint vertexArrayHandle)
>     VertexArray *vertexArray = getVertexArray(vertexArrayHandle);
>     if (!vertexArray)
>     {
>-        vertexArray = new VertexArray(mImplementation.get(), vertexArrayHandle,
>-                                      mCaps.maxVertexAttributes, mCaps.maxVertexAttribBindings);
>+        vertexArray =
>+            new VertexArray(mImplementation.get(), vertexArrayHandle,
>+                            mState.mCaps.maxVertexAttributes, mState.mCaps.maxVertexAttribBindings);
> 
>         mVertexArrayMap.assign(vertexArrayHandle, vertexArray);
>     }
>@@ -2200,7 +2682,7 @@ TransformFeedback *Context::checkTransformFeedbackAllocation(GLuint transformFee
>     if (!transformFeedback)
>     {
>         transformFeedback =
>-            new TransformFeedback(mImplementation.get(), transformFeedbackHandle, mCaps);
>+            new TransformFeedback(mImplementation.get(), transformFeedbackHandle, mState.mCaps);
>         transformFeedback->addRef();
>         mTransformFeedbackMap.assign(transformFeedbackHandle, transformFeedback);
>     }
>@@ -2226,10 +2708,10 @@ void Context::detachTexture(GLuint texture)
>     // allocation map management either here or in the resource manager at detach time.
>     // Zero textures are held by the Context, and we don't attempt to request them from
>     // the State.
>-    mGLState.detachTexture(this, mZeroTextures, texture);
>+    mState.detachTexture(this, mZeroTextures, texture);
> }
> 
>-void Context::detachBuffer(GLuint buffer)
>+void Context::detachBuffer(Buffer *buffer)
> {
>     // Simple pass-through to State's detachBuffer method, since
>     // only buffer attachments to container objects that are bound to the current context
>@@ -2239,7 +2721,7 @@ void Context::detachBuffer(GLuint buffer)
>     // Attachments to unbound container objects, such as
>     // deletion of a buffer attached to a vertex array object which is not bound to the context,
>     // are not affected and continue to act as references on the deleted object
>-    mGLState.detachBuffer(this, buffer);
>+    ANGLE_CONTEXT_TRY(mState.detachBuffer(this, buffer));
> }
> 
> void Context::detachFramebuffer(GLuint framebuffer)
>@@ -2253,12 +2735,12 @@ void Context::detachFramebuffer(GLuint framebuffer)
>     // though BindFramebuffer had been executed with the target of FRAMEBUFFER and framebuffer of
>     // zero.
> 
>-    if (mGLState.removeReadFramebufferBinding(framebuffer) && framebuffer != 0)
>+    if (mState.removeReadFramebufferBinding(framebuffer) && framebuffer != 0)
>     {
>         bindReadFramebuffer(0);
>     }
> 
>-    if (mGLState.removeDrawFramebufferBinding(framebuffer) && framebuffer != 0)
>+    if (mState.removeDrawFramebufferBinding(framebuffer) && framebuffer != 0)
>     {
>         bindDrawFramebuffer(0);
>     }
>@@ -2266,7 +2748,7 @@ void Context::detachFramebuffer(GLuint framebuffer)
> 
> void Context::detachRenderbuffer(GLuint renderbuffer)
> {
>-    mGLState.detachRenderbuffer(this, renderbuffer);
>+    mState.detachRenderbuffer(this, renderbuffer);
> }
> 
> void Context::detachVertexArray(GLuint vertexArray)
>@@ -2278,7 +2760,7 @@ void Context::detachVertexArray(GLuint vertexArray)
>     // [OpenGL ES 3.0.2] section 2.10 page 43:
>     // If a vertex array object that is currently bound is deleted, the binding
>     // for that object reverts to zero and the default vertex array becomes current.
>-    if (mGLState.removeVertexArrayBinding(vertexArray))
>+    if (mState.removeVertexArrayBinding(this, vertexArray))
>     {
>         bindVertexArray(0);
>     }
>@@ -2293,7 +2775,7 @@ void Context::detachTransformFeedback(GLuint transformFeedback)
>     // The OpenGL specification doesn't mention what should happen when the currently bound
>     // transform feedback object is deleted. Since it is a container object, we treat it like
>     // VAOs and FBOs and set the current bound transform feedback back to 0.
>-    if (mGLState.removeTransformFeedbackBinding(this, transformFeedback))
>+    if (mState.removeTransformFeedbackBinding(this, transformFeedback))
>     {
>         bindTransformFeedback(GL_TRANSFORM_FEEDBACK, 0);
>     }
>@@ -2301,70 +2783,161 @@ void Context::detachTransformFeedback(GLuint transformFeedback)
> 
> void Context::detachSampler(GLuint sampler)
> {
>-    mGLState.detachSampler(this, sampler);
>+    mState.detachSampler(this, sampler);
> }
> 
> void Context::detachProgramPipeline(GLuint pipeline)
> {
>-    mGLState.detachProgramPipeline(this, pipeline);
>+    mState.detachProgramPipeline(this, pipeline);
> }
> 
> void Context::vertexAttribDivisor(GLuint index, GLuint divisor)
> {
>-    mGLState.setVertexAttribDivisor(this, index, divisor);
>+    mState.setVertexAttribDivisor(this, index, divisor);
>+    mStateCache.onVertexArrayStateChange(this);
> }
> 
> void Context::samplerParameteri(GLuint sampler, GLenum pname, GLint param)
> {
>-    Sampler *samplerObject =
>-        mState.mSamplers->checkSamplerAllocation(mImplementation.get(), sampler);
>-    SetSamplerParameteri(samplerObject, pname, param);
>-    mGLState.setObjectDirty(GL_SAMPLER);
>+    Sampler *const samplerObject =
>+        mState.mSamplerManager->checkSamplerAllocation(mImplementation.get(), sampler);
>+    SetSamplerParameteri(this, samplerObject, pname, param);
> }
> 
> void Context::samplerParameteriv(GLuint sampler, GLenum pname, const GLint *param)
> {
>-    Sampler *samplerObject =
>-        mState.mSamplers->checkSamplerAllocation(mImplementation.get(), sampler);
>-    SetSamplerParameteriv(samplerObject, pname, param);
>-    mGLState.setObjectDirty(GL_SAMPLER);
>+    Sampler *const samplerObject =
>+        mState.mSamplerManager->checkSamplerAllocation(mImplementation.get(), sampler);
>+    SetSamplerParameteriv(this, samplerObject, pname, param);
>+}
>+
>+void Context::samplerParameterIiv(GLuint sampler, GLenum pname, const GLint *param)
>+{
>+    Sampler *const samplerObject =
>+        mState.mSamplerManager->checkSamplerAllocation(mImplementation.get(), sampler);
>+    SetSamplerParameterIiv(this, samplerObject, pname, param);
>+}
>+
>+void Context::samplerParameterIuiv(GLuint sampler, GLenum pname, const GLuint *param)
>+{
>+    Sampler *const samplerObject =
>+        mState.mSamplerManager->checkSamplerAllocation(mImplementation.get(), sampler);
>+    SetSamplerParameterIuiv(this, samplerObject, pname, param);
>+}
>+
>+void Context::samplerParameterivRobust(GLuint sampler,
>+                                       GLenum pname,
>+                                       GLsizei bufSize,
>+                                       const GLint *param)
>+{
>+    samplerParameteriv(sampler, pname, param);
>+}
>+
>+void Context::samplerParameterIivRobust(GLuint sampler,
>+                                        GLenum pname,
>+                                        GLsizei bufSize,
>+                                        const GLint *param)
>+{
>+    UNIMPLEMENTED();
>+}
>+
>+void Context::samplerParameterIuivRobust(GLuint sampler,
>+                                         GLenum pname,
>+                                         GLsizei bufSize,
>+                                         const GLuint *param)
>+{
>+    UNIMPLEMENTED();
> }
> 
> void Context::samplerParameterf(GLuint sampler, GLenum pname, GLfloat param)
> {
>-    Sampler *samplerObject =
>-        mState.mSamplers->checkSamplerAllocation(mImplementation.get(), sampler);
>-    SetSamplerParameterf(samplerObject, pname, param);
>-    mGLState.setObjectDirty(GL_SAMPLER);
>+    Sampler *const samplerObject =
>+        mState.mSamplerManager->checkSamplerAllocation(mImplementation.get(), sampler);
>+    SetSamplerParameterf(this, samplerObject, pname, param);
> }
> 
> void Context::samplerParameterfv(GLuint sampler, GLenum pname, const GLfloat *param)
> {
>-    Sampler *samplerObject =
>-        mState.mSamplers->checkSamplerAllocation(mImplementation.get(), sampler);
>-    SetSamplerParameterfv(samplerObject, pname, param);
>-    mGLState.setObjectDirty(GL_SAMPLER);
>+    Sampler *const samplerObject =
>+        mState.mSamplerManager->checkSamplerAllocation(mImplementation.get(), sampler);
>+    SetSamplerParameterfv(this, samplerObject, pname, param);
>+}
>+
>+void Context::samplerParameterfvRobust(GLuint sampler,
>+                                       GLenum pname,
>+                                       GLsizei bufSize,
>+                                       const GLfloat *param)
>+{
>+    samplerParameterfv(sampler, pname, param);
> }
> 
> void Context::getSamplerParameteriv(GLuint sampler, GLenum pname, GLint *params)
> {
>-    const Sampler *samplerObject =
>-        mState.mSamplers->checkSamplerAllocation(mImplementation.get(), sampler);
>+    const Sampler *const samplerObject =
>+        mState.mSamplerManager->checkSamplerAllocation(mImplementation.get(), sampler);
>     QuerySamplerParameteriv(samplerObject, pname, params);
>-    mGLState.setObjectDirty(GL_SAMPLER);
>+}
>+
>+void Context::getSamplerParameterIiv(GLuint sampler, GLenum pname, GLint *params)
>+{
>+    const Sampler *const samplerObject =
>+        mState.mSamplerManager->checkSamplerAllocation(mImplementation.get(), sampler);
>+    QuerySamplerParameterIiv(samplerObject, pname, params);
>+}
>+
>+void Context::getSamplerParameterIuiv(GLuint sampler, GLenum pname, GLuint *params)
>+{
>+    const Sampler *const samplerObject =
>+        mState.mSamplerManager->checkSamplerAllocation(mImplementation.get(), sampler);
>+    QuerySamplerParameterIuiv(samplerObject, pname, params);
>+}
>+
>+void Context::getSamplerParameterivRobust(GLuint sampler,
>+                                          GLenum pname,
>+                                          GLsizei bufSize,
>+                                          GLsizei *length,
>+                                          GLint *params)
>+{
>+    getSamplerParameteriv(sampler, pname, params);
>+}
>+
>+void Context::getSamplerParameterIivRobust(GLuint sampler,
>+                                           GLenum pname,
>+                                           GLsizei bufSize,
>+                                           GLsizei *length,
>+                                           GLint *params)
>+{
>+    UNIMPLEMENTED();
>+}
>+
>+void Context::getSamplerParameterIuivRobust(GLuint sampler,
>+                                            GLenum pname,
>+                                            GLsizei bufSize,
>+                                            GLsizei *length,
>+                                            GLuint *params)
>+{
>+    UNIMPLEMENTED();
> }
> 
> void Context::getSamplerParameterfv(GLuint sampler, GLenum pname, GLfloat *params)
> {
>-    const Sampler *samplerObject =
>-        mState.mSamplers->checkSamplerAllocation(mImplementation.get(), sampler);
>+    const Sampler *const samplerObject =
>+        mState.mSamplerManager->checkSamplerAllocation(mImplementation.get(), sampler);
>     QuerySamplerParameterfv(samplerObject, pname, params);
>-    mGLState.setObjectDirty(GL_SAMPLER);
>+}
>+
>+void Context::getSamplerParameterfvRobust(GLuint sampler,
>+                                          GLenum pname,
>+                                          GLsizei bufSize,
>+                                          GLsizei *length,
>+                                          GLfloat *params)
>+{
>+    getSamplerParameterfv(sampler, pname, params);
> }
> 
> void Context::programParameteri(GLuint program, GLenum pname, GLint value)
> {
>-    gl::Program *programObject = getProgram(program);
>+    gl::Program *programObject = getProgramResolveLink(program);
>     SetProgramParameteri(programObject, pname, value);
> }
> 
>@@ -2405,20 +2978,18 @@ void Context::initExtensionStrings()
>     };
> 
>     mExtensionStrings.clear();
>-    for (const auto &extensionString : mExtensions.getStrings())
>+    for (const auto &extensionString : mState.mExtensions.getStrings())
>     {
>         mExtensionStrings.push_back(MakeStaticString(extensionString));
>     }
>     mExtensionString = mergeExtensionStrings(mExtensionStrings);
> 
>-    const gl::Extensions &nativeExtensions = mImplementation->getNativeExtensions();
>-
>     mRequestableExtensionStrings.clear();
>     for (const auto &extensionInfo : GetExtensionInfoMap())
>     {
>         if (extensionInfo.second.Requestable &&
>-            !(mExtensions.*(extensionInfo.second.ExtensionsMember)) &&
>-            nativeExtensions.*(extensionInfo.second.ExtensionsMember))
>+            !(mState.mExtensions.*(extensionInfo.second.ExtensionsMember)) &&
>+            mSupportedExtensions.*(extensionInfo.second.ExtensionsMember))
>         {
>             mRequestableExtensionStrings.push_back(MakeStaticString(extensionInfo.first));
>         }
>@@ -2480,9 +3051,8 @@ bool Context::isExtensionRequestable(const char *name)
>     const ExtensionInfoMap &extensionInfos = GetExtensionInfoMap();
>     auto extension                         = extensionInfos.find(name);
> 
>-    const Extensions &nativeExtensions = mImplementation->getNativeExtensions();
>     return extension != extensionInfos.end() && extension->second.Requestable &&
>-           nativeExtensions.*(extension->second.ExtensionsMember);
>+           mSupportedExtensions.*(extension->second.ExtensionsMember);
> }
> 
> void Context::requestExtension(const char *name)
>@@ -2491,15 +3061,15 @@ void Context::requestExtension(const char *name)
>     ASSERT(extensionInfos.find(name) != extensionInfos.end());
>     const auto &extension = extensionInfos.at(name);
>     ASSERT(extension.Requestable);
>-    ASSERT(mImplementation->getNativeExtensions().*(extension.ExtensionsMember));
>+    ASSERT(isExtensionRequestable(name));
> 
>-    if (mExtensions.*(extension.ExtensionsMember))
>+    if (mState.mExtensions.*(extension.ExtensionsMember))
>     {
>         // Extension already enabled
>         return;
>     }
> 
>-    mExtensions.*(extension.ExtensionsMember) = true;
>+    mState.mExtensions.*(extension.ExtensionsMember) = true;
>     updateCaps();
>     initExtensionStrings();
> 
>@@ -2508,13 +3078,16 @@ void Context::requestExtension(const char *name)
> 
>     // Invalidate all textures and framebuffer. Some extensions make new formats renderable or
>     // sampleable.
>-    mState.mTextures->signalAllTexturesDirty();
>+    mState.mTextureManager->signalAllTexturesDirty(this);
>     for (auto &zeroTexture : mZeroTextures)
>     {
>-        zeroTexture.second->signalDirty(InitState::Initialized);
>+        if (zeroTexture.get() != nullptr)
>+        {
>+            zeroTexture->signalDirtyStorage(this, InitState::Initialized);
>+        }
>     }
> 
>-    mState.mFramebuffers->invalidateFramebufferComplenessCache();
>+    mState.mFramebufferManager->invalidateFramebufferComplenessCache(this);
> }
> 
> size_t Context::getRequestableExtensionStringCount() const
>@@ -2522,13 +3095,14 @@ size_t Context::getRequestableExtensionStringCount() const
>     return mRequestableExtensionStrings.size();
> }
> 
>-void Context::beginTransformFeedback(GLenum primitiveMode)
>+void Context::beginTransformFeedback(PrimitiveMode primitiveMode)
> {
>-    TransformFeedback *transformFeedback = mGLState.getCurrentTransformFeedback();
>+    TransformFeedback *transformFeedback = mState.getCurrentTransformFeedback();
>     ASSERT(transformFeedback != nullptr);
>     ASSERT(!transformFeedback->isPaused());
> 
>-    transformFeedback->begin(this, primitiveMode, mGLState.getProgram());
>+    ANGLE_CONTEXT_TRY(transformFeedback->begin(this, primitiveMode, mState.getProgram()));
>+    mStateCache.onActiveTransformFeedbackChange(this);
> }
> 
> bool Context::hasActiveTransformFeedback(GLuint program) const
>@@ -2543,101 +3117,185 @@ bool Context::hasActiveTransformFeedback(GLuint program) const
>     return false;
> }
> 
>-void Context::initCaps(const egl::DisplayExtensions &displayExtensions, bool robustResourceInit)
>+Extensions Context::generateSupportedExtensions() const
> {
>-    mCaps = mImplementation->getNativeCaps();
>+    Extensions supportedExtensions = mImplementation->getNativeExtensions();
> 
>-    mExtensions = mImplementation->getNativeExtensions();
>+    // Explicitly enable GL_KHR_parallel_shader_compile
>+    supportedExtensions.parallelShaderCompile = true;
> 
>-    mLimitations = mImplementation->getNativeLimitations();
>+    if (getClientVersion() < ES_2_0)
>+    {
>+        // Default extensions for GLES1
>+        supportedExtensions.pointSizeArray        = true;
>+        supportedExtensions.textureCubeMap        = true;
>+        supportedExtensions.pointSprite           = true;
>+        supportedExtensions.drawTexture           = true;
>+        supportedExtensions.parallelShaderCompile = false;
>+    }
> 
>-    if (getClientVersion() < Version(3, 0))
>+    if (getClientVersion() < ES_3_0)
>     {
>         // Disable ES3+ extensions
>-        mExtensions.colorBufferFloat      = false;
>-        mExtensions.eglImageExternalEssl3 = false;
>-        mExtensions.textureNorm16         = false;
>-        mExtensions.multiview             = false;
>-        mExtensions.maxViews              = 1u;
>+        supportedExtensions.colorBufferFloat      = false;
>+        supportedExtensions.eglImageExternalEssl3 = false;
>+        supportedExtensions.textureNorm16         = false;
>+        supportedExtensions.multiview2            = false;
>+        supportedExtensions.maxViews              = 1u;
>+        supportedExtensions.copyTexture3d         = false;
>+        supportedExtensions.textureMultisample    = false;
>+
>+        // Don't expose GL_EXT_texture_sRGB_decode without sRGB texture support
>+        if (!supportedExtensions.sRGB)
>+        {
>+            supportedExtensions.textureSRGBDecode = false;
>+        }
>     }
> 
>     if (getClientVersion() < ES_3_1)
>     {
>         // Disable ES3.1+ extensions
>-        mExtensions.geometryShader = false;
>+        supportedExtensions.geometryShader = false;
>+
>+        // TODO(http://anglebug.com/2775): Multisample arrays could be supported on ES 3.0 as well
>+        // once 2D multisample texture extension is exposed there.
>+        supportedExtensions.textureStorageMultisample2DArray = false;
>     }
> 
>-    if (getClientVersion() > Version(2, 0))
>+    if (getClientVersion() > ES_2_0)
>     {
>         // FIXME(geofflang): Don't support EXT_sRGB in non-ES2 contexts
>-        // mExtensions.sRGB = false;
>+        // supportedExtensions.sRGB = false;
>     }
> 
>     // Some extensions are always available because they are implemented in the GL layer.
>-    mExtensions.bindUniformLocation   = true;
>-    mExtensions.vertexArrayObject     = true;
>-    mExtensions.bindGeneratesResource = true;
>-    mExtensions.clientArrays          = true;
>-    mExtensions.requestExtension      = true;
>+    supportedExtensions.bindUniformLocation   = true;
>+    supportedExtensions.vertexArrayObject     = true;
>+    supportedExtensions.bindGeneratesResource = true;
>+    supportedExtensions.clientArrays          = true;
>+    supportedExtensions.requestExtension      = true;
>+    supportedExtensions.multiDraw             = true;
> 
>     // Enable the no error extension if the context was created with the flag.
>-    mExtensions.noError = mSkipValidation;
>+    supportedExtensions.noError = mSkipValidation;
> 
>     // Enable surfaceless to advertise we'll have the correct behavior when there is no default FBO
>-    mExtensions.surfacelessContext = displayExtensions.surfacelessContext;
>+    supportedExtensions.surfacelessContext = mSurfacelessSupported;
> 
>     // Explicitly enable GL_KHR_debug
>-    mExtensions.debug                   = true;
>-    mExtensions.maxDebugMessageLength   = 1024;
>-    mExtensions.maxDebugLoggedMessages  = 1024;
>-    mExtensions.maxDebugGroupStackDepth = 1024;
>-    mExtensions.maxLabelLength          = 1024;
>+    supportedExtensions.debug                   = true;
>+    supportedExtensions.maxDebugMessageLength   = 1024;
>+    supportedExtensions.maxDebugLoggedMessages  = 1024;
>+    supportedExtensions.maxDebugGroupStackDepth = 1024;
>+    supportedExtensions.maxLabelLength          = 1024;
> 
>     // Explicitly enable GL_ANGLE_robust_client_memory
>-    mExtensions.robustClientMemory = true;
>+    supportedExtensions.robustClientMemory = true;
> 
>     // Determine robust resource init availability from EGL.
>-    mExtensions.robustResourceInitialization = robustResourceInit;
>+    supportedExtensions.robustResourceInitialization = mState.isRobustResourceInitEnabled();
> 
>-    // mExtensions.robustBufferAccessBehavior is true only if robust access is true and the backend
>-    // supports it.
>-    mExtensions.robustBufferAccessBehavior =
>-        mRobustAccess && mExtensions.robustBufferAccessBehavior;
>+    // mState.mExtensions.robustBufferAccessBehavior is true only if robust access is true and the
>+    // backend supports it.
>+    supportedExtensions.robustBufferAccessBehavior =
>+        mRobustAccess && supportedExtensions.robustBufferAccessBehavior;
> 
>     // Enable the cache control query unconditionally.
>-    mExtensions.programCacheControl = true;
>+    supportedExtensions.programCacheControl = true;
>+
>+    // Enable EGL_ANGLE_explicit_context subextensions
>+    if (mExplicitContextAvailable)
>+    {
>+        // GL_ANGLE_explicit_context_gles1
>+        supportedExtensions.explicitContextGles1 = true;
>+        // GL_ANGLE_explicit_context
>+        supportedExtensions.explicitContext = true;
>+    }
>+
>+    // If EGL_KHR_fence_sync is not enabled, don't expose GL_OES_EGL_sync.
>+    ASSERT(mDisplay);
>+    if (!mDisplay->getExtensions().fenceSync)
>+    {
>+        supportedExtensions.eglSync = false;
>+    }
>+
>+    supportedExtensions.memorySize = true;
>+
>+    // GL_CHROMIUM_lose_context is implemented in the frontend
>+    supportedExtensions.loseContextCHROMIUM = true;
>+
>+    return supportedExtensions;
>+}
>+
>+void Context::initCaps()
>+{
>+    mState.mCaps = mImplementation->getNativeCaps();
>+
>+    mSupportedExtensions = generateSupportedExtensions();
>+    mState.mExtensions   = mSupportedExtensions;
> 
>-    // Apply implementation limits
>-    LimitCap(&mCaps.maxVertexAttributes, MAX_VERTEX_ATTRIBS);
>+    mState.mLimitations = mImplementation->getNativeLimitations();
>+
>+    // GLES1 emulation: Initialize caps (Table 6.20 / 6.22 in the ES 1.1 spec)
>+    if (getClientVersion() < Version(2, 0))
>+    {
>+        mState.mCaps.maxMultitextureUnits          = 4;
>+        mState.mCaps.maxClipPlanes                 = 6;
>+        mState.mCaps.maxLights                     = 8;
>+        mState.mCaps.maxModelviewMatrixStackDepth  = Caps::GlobalMatrixStackDepth;
>+        mState.mCaps.maxProjectionMatrixStackDepth = Caps::GlobalMatrixStackDepth;
>+        mState.mCaps.maxTextureMatrixStackDepth    = Caps::GlobalMatrixStackDepth;
>+        mState.mCaps.minSmoothPointSize            = 1.0f;
>+        mState.mCaps.maxSmoothPointSize            = 1.0f;
>+        mState.mCaps.minSmoothLineWidth            = 1.0f;
>+        mState.mCaps.maxSmoothLineWidth            = 1.0f;
>+    }
>+
>+    // Apply/Verify implementation limits
>+    LimitCap(&mState.mCaps.maxVertexAttributes, MAX_VERTEX_ATTRIBS);
>+
>+    ASSERT(mState.mCaps.minAliasedPointSize >= 1.0f);
> 
>     if (getClientVersion() < ES_3_1)
>     {
>-        mCaps.maxVertexAttribBindings = mCaps.maxVertexAttributes;
>+        mState.mCaps.maxVertexAttribBindings = mState.mCaps.maxVertexAttributes;
>     }
>     else
>     {
>-        LimitCap(&mCaps.maxVertexAttribBindings, MAX_VERTEX_ATTRIB_BINDINGS);
>+        LimitCap(&mState.mCaps.maxVertexAttribBindings, MAX_VERTEX_ATTRIB_BINDINGS);
>     }
> 
>-    LimitCap(&mCaps.maxVertexUniformBlocks, IMPLEMENTATION_MAX_VERTEX_SHADER_UNIFORM_BUFFERS);
>-    LimitCap(&mCaps.maxVertexOutputComponents, IMPLEMENTATION_MAX_VARYING_VECTORS * 4);
>-    LimitCap(&mCaps.maxFragmentInputComponents, IMPLEMENTATION_MAX_VARYING_VECTORS * 4);
>+    LimitCap(&mState.mCaps.maxShaderUniformBlocks[ShaderType::Vertex],
>+             IMPLEMENTATION_MAX_VERTEX_SHADER_UNIFORM_BUFFERS);
>+    LimitCap(&mState.mCaps.maxUniformBufferBindings, IMPLEMENTATION_MAX_UNIFORM_BUFFER_BINDINGS);
>+
>+    LimitCap(&mState.mCaps.maxVertexOutputComponents, IMPLEMENTATION_MAX_VARYING_VECTORS * 4);
>+    LimitCap(&mState.mCaps.maxFragmentInputComponents, IMPLEMENTATION_MAX_VARYING_VECTORS * 4);
> 
>     // Limit textures as well, so we can use fast bitsets with texture bindings.
>-    LimitCap(&mCaps.maxCombinedTextureImageUnits, IMPLEMENTATION_MAX_ACTIVE_TEXTURES);
>-    LimitCap(&mCaps.maxVertexTextureImageUnits, IMPLEMENTATION_MAX_ACTIVE_TEXTURES / 2);
>-    LimitCap(&mCaps.maxTextureImageUnits, IMPLEMENTATION_MAX_ACTIVE_TEXTURES / 2);
>+    LimitCap(&mState.mCaps.maxCombinedTextureImageUnits, IMPLEMENTATION_MAX_ACTIVE_TEXTURES);
>+    LimitCap(&mState.mCaps.maxShaderTextureImageUnits[ShaderType::Vertex],
>+             IMPLEMENTATION_MAX_ACTIVE_TEXTURES / 2);
>+    LimitCap(&mState.mCaps.maxShaderTextureImageUnits[ShaderType::Fragment],
>+             IMPLEMENTATION_MAX_ACTIVE_TEXTURES / 2);
>+
>+    LimitCap(&mState.mCaps.maxImageUnits, IMPLEMENTATION_MAX_IMAGE_UNITS);
>+
>+    LimitCap(&mState.mCaps.maxCombinedAtomicCounterBuffers,
>+             IMPLEMENTATION_MAX_ATOMIC_COUNTER_BUFFERS);
> 
>-    mCaps.maxSampleMaskWords = std::min<GLuint>(mCaps.maxSampleMaskWords, MAX_SAMPLE_MASK_WORDS);
>+    mState.mCaps.maxSampleMaskWords =
>+        std::min<GLuint>(mState.mCaps.maxSampleMaskWords, MAX_SAMPLE_MASK_WORDS);
> 
>     // WebGL compatibility
>-    mExtensions.webglCompatibility = mWebGLContext;
>+    mState.mExtensions.webglCompatibility = mWebGLContext;
>     for (const auto &extensionInfo : GetExtensionInfoMap())
>     {
>-        // If this context is for WebGL, disable all enableable extensions
>-        if (mWebGLContext && extensionInfo.second.Requestable)
>+        // If the user has requested that extensions start disabled and they are requestable,
>+        // disable them.
>+        if (!mExtensionsEnabled && extensionInfo.second.Requestable)
>         {
>-            mExtensions.*(extensionInfo.second.ExtensionsMember) = false;
>+            mState.mExtensions.*(extensionInfo.second.ExtensionsMember) = false;
>         }
>     }
> 
>@@ -2647,8 +3305,8 @@ void Context::initCaps(const egl::DisplayExtensions &displayExtensions, bool rob
> 
> void Context::updateCaps()
> {
>-    mCaps.compressedTextureFormats.clear();
>-    mTextureCaps.clear();
>+    mState.mCaps.compressedTextureFormats.clear();
>+    mState.mTextureCaps.clear();
> 
>     for (GLenum sizedInternalFormat : GetAllSizedInternalFormats())
>     {
>@@ -2658,17 +3316,21 @@ void Context::updateCaps()
>         // Update the format caps based on the client version and extensions.
>         // Caps are AND'd with the renderer caps because some core formats are still unsupported in
>         // ES3.
>-        formatCaps.texturable =
>-            formatCaps.texturable && formatInfo.textureSupport(getClientVersion(), mExtensions);
>-        formatCaps.renderable =
>-            formatCaps.renderable && formatInfo.renderSupport(getClientVersion(), mExtensions);
>-        formatCaps.filterable =
>-            formatCaps.filterable && formatInfo.filterSupport(getClientVersion(), mExtensions);
>+        formatCaps.texturable = formatCaps.texturable &&
>+                                formatInfo.textureSupport(getClientVersion(), mState.mExtensions);
>+        formatCaps.filterable = formatCaps.filterable &&
>+                                formatInfo.filterSupport(getClientVersion(), mState.mExtensions);
>+        formatCaps.textureAttachment =
>+            formatCaps.textureAttachment &&
>+            formatInfo.textureAttachmentSupport(getClientVersion(), mState.mExtensions);
>+        formatCaps.renderbuffer =
>+            formatCaps.renderbuffer &&
>+            formatInfo.renderbufferSupport(getClientVersion(), mState.mExtensions);
> 
>         // OpenGL ES does not support multisampling with non-rendererable formats
>         // OpenGL ES 3.0 or prior does not support multisampling with integer formats
>-        if (!formatCaps.renderable ||
>-            (getClientVersion() < ES_3_1 &&
>+        if (!formatCaps.renderbuffer ||
>+            (getClientVersion() < ES_3_1 && !mSupportedExtensions.textureMultisample &&
>              (formatInfo.componentType == GL_INT || formatInfo.componentType == GL_UNSIGNED_INT)))
>         {
>             formatCaps.sampleCounts.clear();
>@@ -2686,11 +3348,11 @@ void Context::updateCaps()
>                 formatInfo.isRequiredRenderbufferFormat(getClientVersion()))
>             {
>                 ASSERT(getClientVersion() < ES_3_0 || formatMaxSamples >= 4);
>-                mCaps.maxSamples = std::min(mCaps.maxSamples, formatMaxSamples);
>+                mState.mCaps.maxSamples = std::min(mState.mCaps.maxSamples, formatMaxSamples);
>             }
> 
>             // Handle GLES 3.1 MAX_*_SAMPLES values similarly to MAX_SAMPLES.
>-            if (getClientVersion() >= ES_3_1)
>+            if (getClientVersion() >= ES_3_1 || mSupportedExtensions.textureMultisample)
>             {
>                 // GLES 3.1 section 9.2.5: "Implementations must support creation of renderbuffers
>                 // in these required formats with up to the value of MAX_SAMPLES multisamples, with
>@@ -2700,7 +3362,8 @@ void Context::updateCaps()
>                 if (formatInfo.componentType == GL_INT ||
>                     formatInfo.componentType == GL_UNSIGNED_INT)
>                 {
>-                    mCaps.maxIntegerSamples = std::min(mCaps.maxIntegerSamples, formatMaxSamples);
>+                    mState.mCaps.maxIntegerSamples =
>+                        std::min(mState.mCaps.maxIntegerSamples, formatMaxSamples);
>                 }
> 
>                 // GLES 3.1 section 19.3.1.
>@@ -2708,13 +3371,13 @@ void Context::updateCaps()
>                 {
>                     if (formatInfo.depthBits > 0)
>                     {
>-                        mCaps.maxDepthTextureSamples =
>-                            std::min(mCaps.maxDepthTextureSamples, formatMaxSamples);
>+                        mState.mCaps.maxDepthTextureSamples =
>+                            std::min(mState.mCaps.maxDepthTextureSamples, formatMaxSamples);
>                     }
>                     else if (formatInfo.redBits > 0)
>                     {
>-                        mCaps.maxColorTextureSamples =
>-                            std::min(mCaps.maxColorTextureSamples, formatMaxSamples);
>+                        mState.mCaps.maxColorTextureSamples =
>+                            std::min(mState.mCaps.maxColorTextureSamples, formatMaxSamples);
>                     }
>                 }
>             }
>@@ -2722,17 +3385,65 @@ void Context::updateCaps()
> 
>         if (formatCaps.texturable && formatInfo.compressed)
>         {
>-            mCaps.compressedTextureFormats.push_back(sizedInternalFormat);
>+            mState.mCaps.compressedTextureFormats.push_back(sizedInternalFormat);
>         }
> 
>-        mTextureCaps.insert(sizedInternalFormat, formatCaps);
>+        mState.mTextureCaps.insert(sizedInternalFormat, formatCaps);
>     }
> 
>     // If program binary is disabled, blank out the memory cache pointer.
>-    if (!mImplementation->getNativeExtensions().getProgramBinary)
>+    if (!mSupportedExtensions.getProgramBinary)
>     {
>         mMemoryProgramCache = nullptr;
>     }
>+
>+    // Compute which buffer types are allowed
>+    mValidBufferBindings.reset();
>+    mValidBufferBindings.set(BufferBinding::ElementArray);
>+    mValidBufferBindings.set(BufferBinding::Array);
>+
>+    if (mState.mExtensions.pixelBufferObject || getClientVersion() >= ES_3_0)
>+    {
>+        mValidBufferBindings.set(BufferBinding::PixelPack);
>+        mValidBufferBindings.set(BufferBinding::PixelUnpack);
>+    }
>+
>+    if (getClientVersion() >= ES_3_0)
>+    {
>+        mValidBufferBindings.set(BufferBinding::CopyRead);
>+        mValidBufferBindings.set(BufferBinding::CopyWrite);
>+        mValidBufferBindings.set(BufferBinding::TransformFeedback);
>+        mValidBufferBindings.set(BufferBinding::Uniform);
>+    }
>+
>+    if (getClientVersion() >= ES_3_1)
>+    {
>+        mValidBufferBindings.set(BufferBinding::AtomicCounter);
>+        mValidBufferBindings.set(BufferBinding::ShaderStorage);
>+        mValidBufferBindings.set(BufferBinding::DrawIndirect);
>+        mValidBufferBindings.set(BufferBinding::DispatchIndirect);
>+    }
>+
>+    mThreadPool = angle::WorkerThreadPool::Create(mState.mExtensions.parallelShaderCompile);
>+
>+    // Reinitialize some dirty bits that depend on extensions.
>+    bool robustInit = mState.isRobustResourceInitEnabled();
>+    mDrawDirtyObjects.set(State::DIRTY_OBJECT_DRAW_ATTACHMENTS, robustInit);
>+    mDrawDirtyObjects.set(State::DIRTY_OBJECT_TEXTURES_INIT, robustInit);
>+    mDrawDirtyObjects.set(State::DIRTY_OBJECT_IMAGES_INIT, robustInit);
>+    mBlitDirtyObjects.set(State::DIRTY_OBJECT_DRAW_ATTACHMENTS, robustInit);
>+    mComputeDirtyObjects.set(State::DIRTY_OBJECT_TEXTURES_INIT, robustInit);
>+    mComputeDirtyObjects.set(State::DIRTY_OBJECT_IMAGES_INIT, robustInit);
>+
>+    // We need to validate buffer bounds if we are in a WebGL or robust access context and the
>+    // back-end does not support robust buffer access behaviour.
>+    if (!mSupportedExtensions.robustBufferAccessBehavior && (mState.isWebGL() || mRobustAccess))
>+    {
>+        mBufferAccessValidationEnabled = true;
>+    }
>+
>+    // Reinitialize state cache after extension changes.
>+    mStateCache.initialize(this);
> }
> 
> void Context::initWorkarounds()
>@@ -2743,36 +3454,49 @@ void Context::initWorkarounds()
>     // Lose the context upon out of memory error if the application is
>     // expecting to watch for those events.
>     mWorkarounds.loseContextOnOutOfMemory = (mResetStrategy == GL_LOSE_CONTEXT_ON_RESET_EXT);
>+
>+    if (mWorkarounds.syncFramebufferBindingsOnTexImage)
>+    {
>+        // Update the Framebuffer bindings on TexImage to work around an Intel bug.
>+        mTexImageDirtyBits.set(State::DIRTY_BIT_READ_FRAMEBUFFER_BINDING);
>+        mTexImageDirtyBits.set(State::DIRTY_BIT_DRAW_FRAMEBUFFER_BINDING);
>+    }
> }
> 
>-Error Context::prepareForDraw()
>+bool Context::noopDrawInstanced(PrimitiveMode mode, GLsizei count, GLsizei instanceCount)
> {
>-    syncRendererState();
>+    return (instanceCount == 0) || noopDraw(mode, count);
>+}
> 
>-    if (isRobustResourceInitEnabled())
>-    {
>-        ANGLE_TRY(mGLState.clearUnclearedActiveTextures(this));
>-        ANGLE_TRY(mGLState.getDrawFramebuffer()->ensureDrawAttachmentsInitialized(this));
>-    }
>+angle::Result Context::prepareForClear(GLbitfield mask)
>+{
>+    ANGLE_TRY(syncDirtyObjects(mClearDirtyObjects));
>+    ANGLE_TRY(mState.getDrawFramebuffer()->ensureClearAttachmentsInitialized(this, mask));
>+    ANGLE_TRY(syncDirtyBits(mClearDirtyBits));
>+    return angle::Result::Continue;
>+}
> 
>-    return NoError();
>+angle::Result Context::prepareForClearBuffer(GLenum buffer, GLint drawbuffer)
>+{
>+    ANGLE_TRY(syncDirtyObjects(mClearDirtyObjects));
>+    ANGLE_TRY(mState.getDrawFramebuffer()->ensureClearBufferAttachmentsInitialized(this, buffer,
>+                                                                                   drawbuffer));
>+    ANGLE_TRY(syncDirtyBits(mClearDirtyBits));
>+    return angle::Result::Continue;
> }
> 
>-void Context::syncRendererState()
>+ANGLE_INLINE angle::Result Context::prepareForDispatch()
> {
>-    mGLState.syncDirtyObjects(this);
>-    const State::DirtyBits &dirtyBits = mGLState.getDirtyBits();
>-    mImplementation->syncState(this, dirtyBits);
>-    mGLState.clearDirtyBits();
>+    ANGLE_TRY(syncDirtyObjects(mComputeDirtyObjects));
>+    return syncDirtyBits(mComputeDirtyBits);
> }
> 
>-void Context::syncRendererState(const State::DirtyBits &bitMask,
>-                                const State::DirtyObjects &objectMask)
>+angle::Result Context::syncState(const State::DirtyBits &bitMask,
>+                                 const State::DirtyObjects &objectMask)
> {
>-    mGLState.syncDirtyObjects(this, objectMask);
>-    const State::DirtyBits &dirtyBits = (mGLState.getDirtyBits() & bitMask);
>-    mImplementation->syncState(this, dirtyBits);
>-    mGLState.clearDirtyBits(dirtyBits);
>+    ANGLE_TRY(syncDirtyObjects(objectMask));
>+    ANGLE_TRY(syncDirtyBits(bitMask));
>+    return angle::Result::Continue;
> }
> 
> void Context::blitFramebuffer(GLint srcX0,
>@@ -2786,44 +3510,98 @@ void Context::blitFramebuffer(GLint srcX0,
>                               GLbitfield mask,
>                               GLenum filter)
> {
>-    Framebuffer *drawFramebuffer = mGLState.getDrawFramebuffer();
>+    if (mask == 0)
>+    {
>+        // ES3.0 spec, section 4.3.2 specifies that a mask of zero is valid and no
>+        // buffers are copied.
>+        return;
>+    }
>+
>+    Framebuffer *drawFramebuffer = mState.getDrawFramebuffer();
>     ASSERT(drawFramebuffer);
> 
>     Rectangle srcArea(srcX0, srcY0, srcX1 - srcX0, srcY1 - srcY0);
>     Rectangle dstArea(dstX0, dstY0, dstX1 - dstX0, dstY1 - dstY0);
> 
>-    syncStateForBlit();
>+    ANGLE_CONTEXT_TRY(syncStateForBlit());
> 
>-    handleError(drawFramebuffer->blit(this, srcArea, dstArea, mask, filter));
>+    ANGLE_CONTEXT_TRY(drawFramebuffer->blit(this, srcArea, dstArea, mask, filter));
> }
> 
> void Context::clear(GLbitfield mask)
> {
>-    syncStateForClear();
>-    handleError(mGLState.getDrawFramebuffer()->clear(this, mask));
>+    ANGLE_CONTEXT_TRY(prepareForClear(mask));
>+    ANGLE_CONTEXT_TRY(mState.getDrawFramebuffer()->clear(this, mask));
> }
> 
> void Context::clearBufferfv(GLenum buffer, GLint drawbuffer, const GLfloat *values)
> {
>-    syncStateForClear();
>-    handleError(mGLState.getDrawFramebuffer()->clearBufferfv(this, buffer, drawbuffer, values));
>+    Framebuffer *framebufferObject          = mState.getDrawFramebuffer();
>+    const FramebufferAttachment *attachment = nullptr;
>+    if (buffer == GL_DEPTH)
>+    {
>+        attachment = framebufferObject->getDepthbuffer();
>+    }
>+    if (buffer == GL_COLOR &&
>+        static_cast<size_t>(drawbuffer) < framebufferObject->getNumColorBuffers())
>+    {
>+        attachment = framebufferObject->getColorbuffer(drawbuffer);
>+    }
>+    // It's not an error to try to clear a non-existent buffer, but it's a no-op. We early out so
>+    // that the backend doesn't need to take this case into account.
>+    if (!attachment)
>+    {
>+        return;
>+    }
>+    ANGLE_CONTEXT_TRY(prepareForClearBuffer(buffer, drawbuffer));
>+    ANGLE_CONTEXT_TRY(framebufferObject->clearBufferfv(this, buffer, drawbuffer, values));
> }
> 
> void Context::clearBufferuiv(GLenum buffer, GLint drawbuffer, const GLuint *values)
> {
>-    syncStateForClear();
>-    handleError(mGLState.getDrawFramebuffer()->clearBufferuiv(this, buffer, drawbuffer, values));
>+    Framebuffer *framebufferObject          = mState.getDrawFramebuffer();
>+    const FramebufferAttachment *attachment = nullptr;
>+    if (buffer == GL_COLOR &&
>+        static_cast<size_t>(drawbuffer) < framebufferObject->getNumColorBuffers())
>+    {
>+        attachment = framebufferObject->getColorbuffer(drawbuffer);
>+    }
>+    // It's not an error to try to clear a non-existent buffer, but it's a no-op. We early out so
>+    // that the backend doesn't need to take this case into account.
>+    if (!attachment)
>+    {
>+        return;
>+    }
>+    ANGLE_CONTEXT_TRY(prepareForClearBuffer(buffer, drawbuffer));
>+    ANGLE_CONTEXT_TRY(framebufferObject->clearBufferuiv(this, buffer, drawbuffer, values));
> }
> 
> void Context::clearBufferiv(GLenum buffer, GLint drawbuffer, const GLint *values)
> {
>-    syncStateForClear();
>-    handleError(mGLState.getDrawFramebuffer()->clearBufferiv(this, buffer, drawbuffer, values));
>+    Framebuffer *framebufferObject          = mState.getDrawFramebuffer();
>+    const FramebufferAttachment *attachment = nullptr;
>+    if (buffer == GL_STENCIL)
>+    {
>+        attachment = framebufferObject->getStencilbuffer();
>+    }
>+    if (buffer == GL_COLOR &&
>+        static_cast<size_t>(drawbuffer) < framebufferObject->getNumColorBuffers())
>+    {
>+        attachment = framebufferObject->getColorbuffer(drawbuffer);
>+    }
>+    // It's not an error to try to clear a non-existent buffer, but it's a no-op. We early out so
>+    // that the backend doesn't need to take this case into account.
>+    if (!attachment)
>+    {
>+        return;
>+    }
>+    ANGLE_CONTEXT_TRY(prepareForClearBuffer(buffer, drawbuffer));
>+    ANGLE_CONTEXT_TRY(framebufferObject->clearBufferiv(this, buffer, drawbuffer, values));
> }
> 
> void Context::clearBufferfi(GLenum buffer, GLint drawbuffer, GLfloat depth, GLint stencil)
> {
>-    Framebuffer *framebufferObject = mGLState.getDrawFramebuffer();
>+    Framebuffer *framebufferObject = mState.getDrawFramebuffer();
>     ASSERT(framebufferObject);
> 
>     // If a buffer is not present, the clear has no effect
>@@ -2833,8 +3611,8 @@ void Context::clearBufferfi(GLenum buffer, GLint drawbuffer, GLfloat depth, GLin
>         return;
>     }
> 
>-    syncStateForClear();
>-    handleError(framebufferObject->clearBufferfi(this, buffer, drawbuffer, depth, stencil));
>+    ANGLE_CONTEXT_TRY(prepareForClearBuffer(buffer, drawbuffer));
>+    ANGLE_CONTEXT_TRY(framebufferObject->clearBufferfi(this, buffer, drawbuffer, depth, stencil));
> }
> 
> void Context::readPixels(GLint x,
>@@ -2850,16 +3628,46 @@ void Context::readPixels(GLint x,
>         return;
>     }
> 
>-    syncStateForReadPixels();
>+    ANGLE_CONTEXT_TRY(syncStateForReadPixels());
> 
>-    Framebuffer *readFBO = mGLState.getReadFramebuffer();
>+    Framebuffer *readFBO = mState.getReadFramebuffer();
>     ASSERT(readFBO);
> 
>     Rectangle area(x, y, width, height);
>-    handleError(readFBO->readPixels(this, area, format, type, pixels));
>+    ANGLE_CONTEXT_TRY(readFBO->readPixels(this, area, format, type, pixels));
>+}
>+
>+void Context::readPixelsRobust(GLint x,
>+                               GLint y,
>+                               GLsizei width,
>+                               GLsizei height,
>+                               GLenum format,
>+                               GLenum type,
>+                               GLsizei bufSize,
>+                               GLsizei *length,
>+                               GLsizei *columns,
>+                               GLsizei *rows,
>+                               void *pixels)
>+{
>+    readPixels(x, y, width, height, format, type, pixels);
>+}
>+
>+void Context::readnPixelsRobust(GLint x,
>+                                GLint y,
>+                                GLsizei width,
>+                                GLsizei height,
>+                                GLenum format,
>+                                GLenum type,
>+                                GLsizei bufSize,
>+                                GLsizei *length,
>+                                GLsizei *columns,
>+                                GLsizei *rows,
>+                                void *data)
>+{
>+    readPixels(x, y, width, height, format, type, data);
> }
> 
>-void Context::copyTexImage2D(GLenum target,
>+void Context::copyTexImage2D(TextureTarget target,
>                              GLint level,
>                              GLenum internalformat,
>                              GLint x,
>@@ -2869,17 +3677,17 @@ void Context::copyTexImage2D(GLenum target,
>                              GLint border)
> {
>     // Only sync the read FBO
>-    mGLState.syncDirtyObject(this, GL_READ_FRAMEBUFFER);
>+    ANGLE_CONTEXT_TRY(mState.syncDirtyObject(this, GL_READ_FRAMEBUFFER));
> 
>     Rectangle sourceArea(x, y, width, height);
> 
>-    Framebuffer *framebuffer = mGLState.getReadFramebuffer();
>-    Texture *texture =
>-        getTargetTexture(IsCubeMapTextureTarget(target) ? GL_TEXTURE_CUBE_MAP : target);
>-    handleError(texture->copyImage(this, target, level, sourceArea, internalformat, framebuffer));
>+    Framebuffer *framebuffer = mState.getReadFramebuffer();
>+    Texture *texture         = getTextureByTarget(target);
>+    ANGLE_CONTEXT_TRY(
>+        texture->copyImage(this, target, level, sourceArea, internalformat, framebuffer));
> }
> 
>-void Context::copyTexSubImage2D(GLenum target,
>+void Context::copyTexSubImage2D(TextureTarget target,
>                                 GLint level,
>                                 GLint xoffset,
>                                 GLint yoffset,
>@@ -2894,18 +3702,19 @@ void Context::copyTexSubImage2D(GLenum target,
>     }
> 
>     // Only sync the read FBO
>-    mGLState.syncDirtyObject(this, GL_READ_FRAMEBUFFER);
>+    ANGLE_CONTEXT_TRY(mState.syncDirtyObject(this, GL_READ_FRAMEBUFFER));
> 
>     Offset destOffset(xoffset, yoffset, 0);
>     Rectangle sourceArea(x, y, width, height);
> 
>-    Framebuffer *framebuffer = mGLState.getReadFramebuffer();
>-    Texture *texture =
>-        getTargetTexture(IsCubeMapTextureTarget(target) ? GL_TEXTURE_CUBE_MAP : target);
>-    handleError(texture->copySubImage(this, target, level, destOffset, sourceArea, framebuffer));
>+    ImageIndex index = ImageIndex::MakeFromTarget(target, level);
>+
>+    Framebuffer *framebuffer = mState.getReadFramebuffer();
>+    Texture *texture         = getTextureByTarget(target);
>+    ANGLE_CONTEXT_TRY(texture->copySubImage(this, index, destOffset, sourceArea, framebuffer));
> }
> 
>-void Context::copyTexSubImage3D(GLenum target,
>+void Context::copyTexSubImage3D(TextureTarget target,
>                                 GLint level,
>                                 GLint xoffset,
>                                 GLint yoffset,
>@@ -2921,73 +3730,54 @@ void Context::copyTexSubImage3D(GLenum target,
>     }
> 
>     // Only sync the read FBO
>-    mGLState.syncDirtyObject(this, GL_READ_FRAMEBUFFER);
>+    ANGLE_CONTEXT_TRY(mState.syncDirtyObject(this, GL_READ_FRAMEBUFFER));
> 
>     Offset destOffset(xoffset, yoffset, zoffset);
>     Rectangle sourceArea(x, y, width, height);
> 
>-    Framebuffer *framebuffer = mGLState.getReadFramebuffer();
>-    Texture *texture         = getTargetTexture(target);
>-    handleError(texture->copySubImage(this, target, level, destOffset, sourceArea, framebuffer));
>+    ImageIndex index = ImageIndex::MakeFromType(TextureTargetToType(target), level, zoffset);
>+
>+    Framebuffer *framebuffer = mState.getReadFramebuffer();
>+    Texture *texture         = getTextureByTarget(target);
>+    ANGLE_CONTEXT_TRY(texture->copySubImage(this, index, destOffset, sourceArea, framebuffer));
> }
> 
> void Context::framebufferTexture2D(GLenum target,
>                                    GLenum attachment,
>-                                   GLenum textarget,
>+                                   TextureTarget textarget,
>                                    GLuint texture,
>                                    GLint level)
> {
>-    Framebuffer *framebuffer = mGLState.getTargetFramebuffer(target);
>+    Framebuffer *framebuffer = mState.getTargetFramebuffer(target);
>     ASSERT(framebuffer);
> 
>     if (texture != 0)
>     {
>         Texture *textureObj = getTexture(texture);
>+        ImageIndex index    = ImageIndex::MakeFromTarget(textarget, level);
>+        framebuffer->setAttachment(this, GL_TEXTURE, attachment, index, textureObj);
>+    }
>+    else
>+    {
>+        framebuffer->resetAttachment(this, attachment);
>+    }
> 
>-        ImageIndex index = ImageIndex::MakeInvalid();
>-
>-        if (textarget == GL_TEXTURE_2D)
>-        {
>-            index = ImageIndex::Make2D(level);
>-        }
>-        else if (textarget == GL_TEXTURE_RECTANGLE_ANGLE)
>-        {
>-            index = ImageIndex::MakeRectangle(level);
>-        }
>-        else if (textarget == GL_TEXTURE_2D_MULTISAMPLE)
>-        {
>-            ASSERT(level == 0);
>-            index = ImageIndex::Make2DMultisample();
>-        }
>-        else
>-        {
>-            ASSERT(IsCubeMapTextureTarget(textarget));
>-            index = ImageIndex::MakeCube(textarget, level);
>-        }
>-
>-        framebuffer->setAttachment(this, GL_TEXTURE, attachment, index, textureObj);
>-    }
>-    else
>-    {
>-        framebuffer->resetAttachment(this, attachment);
>-    }
>-
>-    mGLState.setObjectDirty(target);
>-}
>+    mState.setObjectDirty(target);
>+}
> 
> void Context::framebufferRenderbuffer(GLenum target,
>                                       GLenum attachment,
>                                       GLenum renderbuffertarget,
>                                       GLuint renderbuffer)
> {
>-    Framebuffer *framebuffer = mGLState.getTargetFramebuffer(target);
>+    Framebuffer *framebuffer = mState.getTargetFramebuffer(target);
>     ASSERT(framebuffer);
> 
>     if (renderbuffer != 0)
>     {
>         Renderbuffer *renderbufferObject = getRenderbuffer(renderbuffer);
> 
>-        framebuffer->setAttachment(this, GL_RENDERBUFFER, attachment, gl::ImageIndex::MakeInvalid(),
>+        framebuffer->setAttachment(this, GL_RENDERBUFFER, attachment, gl::ImageIndex(),
>                                    renderbufferObject);
>     }
>     else
>@@ -2995,7 +3785,7 @@ void Context::framebufferRenderbuffer(GLenum target,
>         framebuffer->resetAttachment(this, attachment);
>     }
> 
>-    mGLState.setObjectDirty(target);
>+    mState.setObjectDirty(target);
> }
> 
> void Context::framebufferTextureLayer(GLenum target,
>@@ -3004,25 +3794,13 @@ void Context::framebufferTextureLayer(GLenum target,
>                                       GLint level,
>                                       GLint layer)
> {
>-    Framebuffer *framebuffer = mGLState.getTargetFramebuffer(target);
>+    Framebuffer *framebuffer = mState.getTargetFramebuffer(target);
>     ASSERT(framebuffer);
> 
>     if (texture != 0)
>     {
>         Texture *textureObject = getTexture(texture);
>-
>-        ImageIndex index = ImageIndex::MakeInvalid();
>-
>-        if (textureObject->getTarget() == GL_TEXTURE_3D)
>-        {
>-            index = ImageIndex::Make3D(level, layer);
>-        }
>-        else
>-        {
>-            ASSERT(textureObject->getTarget() == GL_TEXTURE_2D_ARRAY);
>-            index = ImageIndex::Make2DArray(level, layer);
>-        }
>-
>+        ImageIndex index       = ImageIndex::MakeFromType(textureObject->getType(), level, layer);
>         framebuffer->setAttachment(this, GL_TEXTURE, attachment, index, textureObject);
>     }
>     else
>@@ -3030,87 +3808,93 @@ void Context::framebufferTextureLayer(GLenum target,
>         framebuffer->resetAttachment(this, attachment);
>     }
> 
>-    mGLState.setObjectDirty(target);
>+    mState.setObjectDirty(target);
> }
> 
>-void Context::framebufferTextureMultiviewLayeredANGLE(GLenum target,
>-                                                      GLenum attachment,
>-                                                      GLuint texture,
>-                                                      GLint level,
>-                                                      GLint baseViewIndex,
>-                                                      GLsizei numViews)
>+void Context::framebufferTextureMultiview(GLenum target,
>+                                          GLenum attachment,
>+                                          GLuint texture,
>+                                          GLint level,
>+                                          GLint baseViewIndex,
>+                                          GLsizei numViews)
> {
>-    Framebuffer *framebuffer = mGLState.getTargetFramebuffer(target);
>+    Framebuffer *framebuffer = mState.getTargetFramebuffer(target);
>     ASSERT(framebuffer);
> 
>     if (texture != 0)
>     {
>         Texture *textureObj = getTexture(texture);
> 
>-        ImageIndex index = ImageIndex::Make2DArrayRange(level, baseViewIndex, numViews);
>-        framebuffer->setAttachmentMultiviewLayered(this, GL_TEXTURE, attachment, index, textureObj,
>-                                                   numViews, baseViewIndex);
>+        ImageIndex index;
>+        if (textureObj->getType() == TextureType::_2DArray)
>+        {
>+            index = ImageIndex::Make2DArrayRange(level, baseViewIndex, numViews);
>+        }
>+        else
>+        {
>+            ASSERT(textureObj->getType() == TextureType::_2DMultisampleArray);
>+            ASSERT(level == 0);
>+            index = ImageIndex::Make2DMultisampleArrayRange(baseViewIndex, numViews);
>+        }
>+        framebuffer->setAttachmentMultiview(this, GL_TEXTURE, attachment, index, textureObj,
>+                                            numViews, baseViewIndex);
>     }
>     else
>     {
>         framebuffer->resetAttachment(this, attachment);
>     }
> 
>-    mGLState.setObjectDirty(target);
>+    mState.setObjectDirty(target);
> }
> 
>-void Context::framebufferTextureMultiviewSideBySideANGLE(GLenum target,
>-                                                         GLenum attachment,
>-                                                         GLuint texture,
>-                                                         GLint level,
>-                                                         GLsizei numViews,
>-                                                         const GLint *viewportOffsets)
>+void Context::framebufferTexture(GLenum target, GLenum attachment, GLuint texture, GLint level)
> {
>-    Framebuffer *framebuffer = mGLState.getTargetFramebuffer(target);
>+    Framebuffer *framebuffer = mState.getTargetFramebuffer(target);
>     ASSERT(framebuffer);
> 
>     if (texture != 0)
>     {
>         Texture *textureObj = getTexture(texture);
> 
>-        ImageIndex index = ImageIndex::Make2D(level);
>-        framebuffer->setAttachmentMultiviewSideBySide(this, GL_TEXTURE, attachment, index,
>-                                                      textureObj, numViews, viewportOffsets);
>+        ImageIndex index = ImageIndex::MakeFromType(
>+            textureObj->getType(), level, ImageIndex::kEntireLevel, ImageIndex::kEntireLevel);
>+        framebuffer->setAttachment(this, GL_TEXTURE, attachment, index, textureObj);
>     }
>     else
>     {
>         framebuffer->resetAttachment(this, attachment);
>     }
> 
>-    mGLState.setObjectDirty(target);
>+    mState.setObjectDirty(target);
> }
> 
> void Context::drawBuffers(GLsizei n, const GLenum *bufs)
> {
>-    Framebuffer *framebuffer = mGLState.getDrawFramebuffer();
>+    Framebuffer *framebuffer = mState.getDrawFramebuffer();
>     ASSERT(framebuffer);
>     framebuffer->setDrawBuffers(n, bufs);
>-    mGLState.setObjectDirty(GL_DRAW_FRAMEBUFFER);
>+    mState.setDrawFramebufferDirty();
>+    mStateCache.onDrawFramebufferChange(this);
> }
> 
> void Context::readBuffer(GLenum mode)
> {
>-    Framebuffer *readFBO = mGLState.getReadFramebuffer();
>+    Framebuffer *readFBO = mState.getReadFramebuffer();
>     readFBO->setReadBuffer(mode);
>-    mGLState.setObjectDirty(GL_READ_FRAMEBUFFER);
>+    mState.setObjectDirty(GL_READ_FRAMEBUFFER);
> }
> 
> void Context::discardFramebuffer(GLenum target, GLsizei numAttachments, const GLenum *attachments)
> {
>     // Only sync the FBO
>-    mGLState.syncDirtyObject(this, target);
>+    ANGLE_CONTEXT_TRY(mState.syncDirtyObject(this, target));
> 
>-    Framebuffer *framebuffer = mGLState.getTargetFramebuffer(target);
>+    Framebuffer *framebuffer = mState.getTargetFramebuffer(target);
>     ASSERT(framebuffer);
> 
>     // The specification isn't clear what should be done when the framebuffer isn't complete.
>     // We leave it up to the framebuffer implementation to decide what to do.
>-    handleError(framebuffer->discard(this, numAttachments, attachments));
>+    ANGLE_CONTEXT_TRY(framebuffer->discard(this, numAttachments, attachments));
> }
> 
> void Context::invalidateFramebuffer(GLenum target,
>@@ -3118,17 +3902,17 @@ void Context::invalidateFramebuffer(GLenum target,
>                                     const GLenum *attachments)
> {
>     // Only sync the FBO
>-    mGLState.syncDirtyObject(this, target);
>+    ANGLE_CONTEXT_TRY(mState.syncDirtyObject(this, target));
> 
>-    Framebuffer *framebuffer = mGLState.getTargetFramebuffer(target);
>+    Framebuffer *framebuffer = mState.getTargetFramebuffer(target);
>     ASSERT(framebuffer);
> 
>-    if (framebuffer->checkStatus(this) != GL_FRAMEBUFFER_COMPLETE)
>+    if (!framebuffer->isComplete(this))
>     {
>         return;
>     }
> 
>-    handleError(framebuffer->invalidate(this, numAttachments, attachments));
>+    ANGLE_CONTEXT_TRY(framebuffer->invalidate(this, numAttachments, attachments));
> }
> 
> void Context::invalidateSubFramebuffer(GLenum target,
>@@ -3140,21 +3924,21 @@ void Context::invalidateSubFramebuffer(GLenum target,
>                                        GLsizei height)
> {
>     // Only sync the FBO
>-    mGLState.syncDirtyObject(this, target);
>+    ANGLE_CONTEXT_TRY(mState.syncDirtyObject(this, target));
> 
>-    Framebuffer *framebuffer = mGLState.getTargetFramebuffer(target);
>+    Framebuffer *framebuffer = mState.getTargetFramebuffer(target);
>     ASSERT(framebuffer);
> 
>-    if (framebuffer->checkStatus(this) != GL_FRAMEBUFFER_COMPLETE)
>+    if (!framebuffer->isComplete(this))
>     {
>         return;
>     }
> 
>     Rectangle area(x, y, width, height);
>-    handleError(framebuffer->invalidateSub(this, numAttachments, attachments, area));
>+    ANGLE_CONTEXT_TRY(framebuffer->invalidateSub(this, numAttachments, attachments, area));
> }
> 
>-void Context::texImage2D(GLenum target,
>+void Context::texImage2D(TextureTarget target,
>                          GLint level,
>                          GLint internalformat,
>                          GLsizei width,
>@@ -3164,16 +3948,30 @@ void Context::texImage2D(GLenum target,
>                          GLenum type,
>                          const void *pixels)
> {
>-    syncStateForTexImage();
>+    ANGLE_CONTEXT_TRY(syncStateForTexImage());
> 
>     Extents size(width, height, 1);
>-    Texture *texture =
>-        getTargetTexture(IsCubeMapTextureTarget(target) ? GL_TEXTURE_CUBE_MAP : target);
>-    handleError(texture->setImage(this, mGLState.getUnpackState(), target, level, internalformat,
>-                                  size, format, type, reinterpret_cast<const uint8_t *>(pixels)));
>+    Texture *texture = getTextureByTarget(target);
>+    ANGLE_CONTEXT_TRY(texture->setImage(this, mState.getUnpackState(), target, level,
>+                                        internalformat, size, format, type,
>+                                        static_cast<const uint8_t *>(pixels)));
>+}
>+
>+void Context::texImage2DRobust(TextureTarget target,
>+                               GLint level,
>+                               GLint internalformat,
>+                               GLsizei width,
>+                               GLsizei height,
>+                               GLint border,
>+                               GLenum format,
>+                               GLenum type,
>+                               GLsizei bufSize,
>+                               const void *pixels)
>+{
>+    texImage2D(target, level, internalformat, width, height, border, format, type, pixels);
> }
> 
>-void Context::texImage3D(GLenum target,
>+void Context::texImage3D(TextureTarget target,
>                          GLint level,
>                          GLint internalformat,
>                          GLsizei width,
>@@ -3184,15 +3982,31 @@ void Context::texImage3D(GLenum target,
>                          GLenum type,
>                          const void *pixels)
> {
>-    syncStateForTexImage();
>+    ANGLE_CONTEXT_TRY(syncStateForTexImage());
> 
>     Extents size(width, height, depth);
>-    Texture *texture = getTargetTexture(target);
>-    handleError(texture->setImage(this, mGLState.getUnpackState(), target, level, internalformat,
>-                                  size, format, type, reinterpret_cast<const uint8_t *>(pixels)));
>+    Texture *texture = getTextureByTarget(target);
>+    ANGLE_CONTEXT_TRY(texture->setImage(this, mState.getUnpackState(), target, level,
>+                                        internalformat, size, format, type,
>+                                        static_cast<const uint8_t *>(pixels)));
>+}
>+
>+void Context::texImage3DRobust(TextureTarget target,
>+                               GLint level,
>+                               GLint internalformat,
>+                               GLsizei width,
>+                               GLsizei height,
>+                               GLsizei depth,
>+                               GLint border,
>+                               GLenum format,
>+                               GLenum type,
>+                               GLsizei bufSize,
>+                               const void *pixels)
>+{
>+    texImage3D(target, level, internalformat, width, height, depth, border, format, type, pixels);
> }
> 
>-void Context::texSubImage2D(GLenum target,
>+void Context::texSubImage2D(TextureTarget target,
>                             GLint level,
>                             GLint xoffset,
>                             GLint yoffset,
>@@ -3208,16 +4022,33 @@ void Context::texSubImage2D(GLenum target,
>         return;
>     }
> 
>-    syncStateForTexImage();
>+    ANGLE_CONTEXT_TRY(syncStateForTexImage());
> 
>     Box area(xoffset, yoffset, 0, width, height, 1);
>-    Texture *texture =
>-        getTargetTexture(IsCubeMapTextureTarget(target) ? GL_TEXTURE_CUBE_MAP : target);
>-    handleError(texture->setSubImage(this, mGLState.getUnpackState(), target, level, area, format,
>-                                     type, reinterpret_cast<const uint8_t *>(pixels)));
>+    Texture *texture = getTextureByTarget(target);
>+
>+    gl::Buffer *unpackBuffer = mState.getTargetBuffer(gl::BufferBinding::PixelUnpack);
>+
>+    ANGLE_CONTEXT_TRY(texture->setSubImage(this, mState.getUnpackState(), unpackBuffer, target,
>+                                           level, area, format, type,
>+                                           static_cast<const uint8_t *>(pixels)));
>+}
>+
>+void Context::texSubImage2DRobust(TextureTarget target,
>+                                  GLint level,
>+                                  GLint xoffset,
>+                                  GLint yoffset,
>+                                  GLsizei width,
>+                                  GLsizei height,
>+                                  GLenum format,
>+                                  GLenum type,
>+                                  GLsizei bufSize,
>+                                  const void *pixels)
>+{
>+    texSubImage2D(target, level, xoffset, yoffset, width, height, format, type, pixels);
> }
> 
>-void Context::texSubImage3D(GLenum target,
>+void Context::texSubImage3D(TextureTarget target,
>                             GLint level,
>                             GLint xoffset,
>                             GLint yoffset,
>@@ -3235,15 +4066,36 @@ void Context::texSubImage3D(GLenum target,
>         return;
>     }
> 
>-    syncStateForTexImage();
>+    ANGLE_CONTEXT_TRY(syncStateForTexImage());
> 
>     Box area(xoffset, yoffset, zoffset, width, height, depth);
>-    Texture *texture = getTargetTexture(target);
>-    handleError(texture->setSubImage(this, mGLState.getUnpackState(), target, level, area, format,
>-                                     type, reinterpret_cast<const uint8_t *>(pixels)));
>+    Texture *texture = getTextureByTarget(target);
>+
>+    gl::Buffer *unpackBuffer = mState.getTargetBuffer(gl::BufferBinding::PixelUnpack);
>+
>+    ANGLE_CONTEXT_TRY(texture->setSubImage(this, mState.getUnpackState(), unpackBuffer, target,
>+                                           level, area, format, type,
>+                                           static_cast<const uint8_t *>(pixels)));
>+}
>+
>+void Context::texSubImage3DRobust(TextureTarget target,
>+                                  GLint level,
>+                                  GLint xoffset,
>+                                  GLint yoffset,
>+                                  GLint zoffset,
>+                                  GLsizei width,
>+                                  GLsizei height,
>+                                  GLsizei depth,
>+                                  GLenum format,
>+                                  GLenum type,
>+                                  GLsizei bufSize,
>+                                  const void *pixels)
>+{
>+    texSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, type,
>+                  pixels);
> }
> 
>-void Context::compressedTexImage2D(GLenum target,
>+void Context::compressedTexImage2D(TextureTarget target,
>                                    GLint level,
>                                    GLenum internalformat,
>                                    GLsizei width,
>@@ -3252,17 +4104,29 @@ void Context::compressedTexImage2D(GLenum target,
>                                    GLsizei imageSize,
>                                    const void *data)
> {
>-    syncStateForTexImage();
>+    ANGLE_CONTEXT_TRY(syncStateForTexImage());
> 
>     Extents size(width, height, 1);
>-    Texture *texture =
>-        getTargetTexture(IsCubeMapTextureTarget(target) ? GL_TEXTURE_CUBE_MAP : target);
>-    handleError(texture->setCompressedImage(this, mGLState.getUnpackState(), target, level,
>-                                            internalformat, size, imageSize,
>-                                            reinterpret_cast<const uint8_t *>(data)));
>+    Texture *texture = getTextureByTarget(target);
>+    ANGLE_CONTEXT_TRY(texture->setCompressedImage(this, mState.getUnpackState(), target, level,
>+                                                  internalformat, size, imageSize,
>+                                                  static_cast<const uint8_t *>(data)));
> }
> 
>-void Context::compressedTexImage3D(GLenum target,
>+void Context::compressedTexImage2DRobust(TextureTarget target,
>+                                         GLint level,
>+                                         GLenum internalformat,
>+                                         GLsizei width,
>+                                         GLsizei height,
>+                                         GLint border,
>+                                         GLsizei imageSize,
>+                                         GLsizei dataSize,
>+                                         const GLvoid *data)
>+{
>+    compressedTexImage2D(target, level, internalformat, width, height, border, imageSize, data);
>+}
>+
>+void Context::compressedTexImage3D(TextureTarget target,
>                                    GLint level,
>                                    GLenum internalformat,
>                                    GLsizei width,
>@@ -3272,16 +4136,31 @@ void Context::compressedTexImage3D(GLenum target,
>                                    GLsizei imageSize,
>                                    const void *data)
> {
>-    syncStateForTexImage();
>+    ANGLE_CONTEXT_TRY(syncStateForTexImage());
> 
>     Extents size(width, height, depth);
>-    Texture *texture = getTargetTexture(target);
>-    handleError(texture->setCompressedImage(this, mGLState.getUnpackState(), target, level,
>-                                            internalformat, size, imageSize,
>-                                            reinterpret_cast<const uint8_t *>(data)));
>+    Texture *texture = getTextureByTarget(target);
>+    ANGLE_CONTEXT_TRY(texture->setCompressedImage(this, mState.getUnpackState(), target, level,
>+                                                  internalformat, size, imageSize,
>+                                                  static_cast<const uint8_t *>(data)));
>+}
>+
>+void Context::compressedTexImage3DRobust(TextureTarget target,
>+                                         GLint level,
>+                                         GLenum internalformat,
>+                                         GLsizei width,
>+                                         GLsizei height,
>+                                         GLsizei depth,
>+                                         GLint border,
>+                                         GLsizei imageSize,
>+                                         GLsizei dataSize,
>+                                         const GLvoid *data)
>+{
>+    compressedTexImage3D(target, level, internalformat, width, height, depth, border, imageSize,
>+                         data);
> }
> 
>-void Context::compressedTexSubImage2D(GLenum target,
>+void Context::compressedTexSubImage2D(TextureTarget target,
>                                       GLint level,
>                                       GLint xoffset,
>                                       GLint yoffset,
>@@ -3291,17 +4170,31 @@ void Context::compressedTexSubImage2D(GLenum target,
>                                       GLsizei imageSize,
>                                       const void *data)
> {
>-    syncStateForTexImage();
>+    ANGLE_CONTEXT_TRY(syncStateForTexImage());
> 
>     Box area(xoffset, yoffset, 0, width, height, 1);
>-    Texture *texture =
>-        getTargetTexture(IsCubeMapTextureTarget(target) ? GL_TEXTURE_CUBE_MAP : target);
>-    handleError(texture->setCompressedSubImage(this, mGLState.getUnpackState(), target, level, area,
>-                                               format, imageSize,
>-                                               reinterpret_cast<const uint8_t *>(data)));
>+    Texture *texture = getTextureByTarget(target);
>+    ANGLE_CONTEXT_TRY(texture->setCompressedSubImage(this, mState.getUnpackState(), target, level,
>+                                                     area, format, imageSize,
>+                                                     static_cast<const uint8_t *>(data)));
>+}
>+
>+void Context::compressedTexSubImage2DRobust(TextureTarget target,
>+                                            GLint level,
>+                                            GLint xoffset,
>+                                            GLint yoffset,
>+                                            GLsizei width,
>+                                            GLsizei height,
>+                                            GLenum format,
>+                                            GLsizei imageSize,
>+                                            GLsizei dataSize,
>+                                            const GLvoid *data)
>+{
>+    compressedTexSubImage2D(target, level, xoffset, yoffset, width, height, format, imageSize,
>+                            data);
> }
> 
>-void Context::compressedTexSubImage3D(GLenum target,
>+void Context::compressedTexSubImage3D(TextureTarget target,
>                                       GLint level,
>                                       GLint xoffset,
>                                       GLint yoffset,
>@@ -3319,56 +4212,73 @@ void Context::compressedTexSubImage3D(GLenum target,
>         return;
>     }
> 
>-    syncStateForTexImage();
>+    ANGLE_CONTEXT_TRY(syncStateForTexImage());
> 
>     Box area(xoffset, yoffset, zoffset, width, height, depth);
>-    Texture *texture = getTargetTexture(target);
>-    handleError(texture->setCompressedSubImage(this, mGLState.getUnpackState(), target, level, area,
>-                                               format, imageSize,
>-                                               reinterpret_cast<const uint8_t *>(data)));
>+    Texture *texture = getTextureByTarget(target);
>+    ANGLE_CONTEXT_TRY(texture->setCompressedSubImage(this, mState.getUnpackState(), target, level,
>+                                                     area, format, imageSize,
>+                                                     static_cast<const uint8_t *>(data)));
>+}
>+
>+void Context::compressedTexSubImage3DRobust(TextureTarget target,
>+                                            GLint level,
>+                                            GLint xoffset,
>+                                            GLint yoffset,
>+                                            GLint zoffset,
>+                                            GLsizei width,
>+                                            GLsizei height,
>+                                            GLsizei depth,
>+                                            GLenum format,
>+                                            GLsizei imageSize,
>+                                            GLsizei dataSize,
>+                                            const GLvoid *data)
>+{
>+    compressedTexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format,
>+                            imageSize, data);
> }
> 
>-void Context::generateMipmap(GLenum target)
>+void Context::generateMipmap(TextureType target)
> {
>-    Texture *texture = getTargetTexture(target);
>-    handleError(texture->generateMipmap(this));
>+    Texture *texture = getTextureByType(target);
>+    ANGLE_CONTEXT_TRY(texture->generateMipmap(this));
> }
> 
>-void Context::copyTextureCHROMIUM(GLuint sourceId,
>-                                  GLint sourceLevel,
>-                                  GLenum destTarget,
>-                                  GLuint destId,
>-                                  GLint destLevel,
>-                                  GLint internalFormat,
>-                                  GLenum destType,
>-                                  GLboolean unpackFlipY,
>-                                  GLboolean unpackPremultiplyAlpha,
>-                                  GLboolean unpackUnmultiplyAlpha)
>+void Context::copyTexture(GLuint sourceId,
>+                          GLint sourceLevel,
>+                          TextureTarget destTarget,
>+                          GLuint destId,
>+                          GLint destLevel,
>+                          GLint internalFormat,
>+                          GLenum destType,
>+                          GLboolean unpackFlipY,
>+                          GLboolean unpackPremultiplyAlpha,
>+                          GLboolean unpackUnmultiplyAlpha)
> {
>-    syncStateForTexImage();
>+    ANGLE_CONTEXT_TRY(syncStateForTexImage());
> 
>     gl::Texture *sourceTexture = getTexture(sourceId);
>     gl::Texture *destTexture   = getTexture(destId);
>-    handleError(destTexture->copyTexture(this, destTarget, destLevel, internalFormat, destType,
>-                                         sourceLevel, ConvertToBool(unpackFlipY),
>-                                         ConvertToBool(unpackPremultiplyAlpha),
>-                                         ConvertToBool(unpackUnmultiplyAlpha), sourceTexture));
>-}
>-
>-void Context::copySubTextureCHROMIUM(GLuint sourceId,
>-                                     GLint sourceLevel,
>-                                     GLenum destTarget,
>-                                     GLuint destId,
>-                                     GLint destLevel,
>-                                     GLint xoffset,
>-                                     GLint yoffset,
>-                                     GLint x,
>-                                     GLint y,
>-                                     GLsizei width,
>-                                     GLsizei height,
>-                                     GLboolean unpackFlipY,
>-                                     GLboolean unpackPremultiplyAlpha,
>-                                     GLboolean unpackUnmultiplyAlpha)
>+    ANGLE_CONTEXT_TRY(
>+        destTexture->copyTexture(this, destTarget, destLevel, internalFormat, destType, sourceLevel,
>+                                 ConvertToBool(unpackFlipY), ConvertToBool(unpackPremultiplyAlpha),
>+                                 ConvertToBool(unpackUnmultiplyAlpha), sourceTexture));
>+}
>+
>+void Context::copySubTexture(GLuint sourceId,
>+                             GLint sourceLevel,
>+                             TextureTarget destTarget,
>+                             GLuint destId,
>+                             GLint destLevel,
>+                             GLint xoffset,
>+                             GLint yoffset,
>+                             GLint x,
>+                             GLint y,
>+                             GLsizei width,
>+                             GLsizei height,
>+                             GLboolean unpackFlipY,
>+                             GLboolean unpackPremultiplyAlpha,
>+                             GLboolean unpackUnmultiplyAlpha)
> {
>     // Zero sized copies are valid but no-ops
>     if (width == 0 || height == 0)
>@@ -3376,44 +4286,108 @@ void Context::copySubTextureCHROMIUM(GLuint sourceId,
>         return;
>     }
> 
>-    syncStateForTexImage();
>+    ANGLE_CONTEXT_TRY(syncStateForTexImage());
> 
>     gl::Texture *sourceTexture = getTexture(sourceId);
>     gl::Texture *destTexture   = getTexture(destId);
>     Offset offset(xoffset, yoffset, 0);
>-    Rectangle area(x, y, width, height);
>-    handleError(destTexture->copySubTexture(this, destTarget, destLevel, offset, sourceLevel, area,
>-                                            ConvertToBool(unpackFlipY),
>-                                            ConvertToBool(unpackPremultiplyAlpha),
>-                                            ConvertToBool(unpackUnmultiplyAlpha), sourceTexture));
>+    Box box(x, y, 0, width, height, 1);
>+    ANGLE_CONTEXT_TRY(destTexture->copySubTexture(
>+        this, destTarget, destLevel, offset, sourceLevel, box, ConvertToBool(unpackFlipY),
>+        ConvertToBool(unpackPremultiplyAlpha), ConvertToBool(unpackUnmultiplyAlpha),
>+        sourceTexture));
>+}
>+
>+void Context::copyTexture3D(GLuint sourceId,
>+                            GLint sourceLevel,
>+                            TextureTarget destTarget,
>+                            GLuint destId,
>+                            GLint destLevel,
>+                            GLint internalFormat,
>+                            GLenum destType,
>+                            GLboolean unpackFlipY,
>+                            GLboolean unpackPremultiplyAlpha,
>+                            GLboolean unpackUnmultiplyAlpha)
>+{
>+    ANGLE_CONTEXT_TRY(syncStateForTexImage());
>+
>+    Texture *sourceTexture = getTexture(sourceId);
>+    Texture *destTexture   = getTexture(destId);
>+    ANGLE_CONTEXT_TRY(
>+        destTexture->copyTexture(this, destTarget, destLevel, internalFormat, destType, sourceLevel,
>+                                 ConvertToBool(unpackFlipY), ConvertToBool(unpackPremultiplyAlpha),
>+                                 ConvertToBool(unpackUnmultiplyAlpha), sourceTexture));
>+}
>+
>+void Context::copySubTexture3D(GLuint sourceId,
>+                               GLint sourceLevel,
>+                               TextureTarget destTarget,
>+                               GLuint destId,
>+                               GLint destLevel,
>+                               GLint xoffset,
>+                               GLint yoffset,
>+                               GLint zoffset,
>+                               GLint x,
>+                               GLint y,
>+                               GLint z,
>+                               GLsizei width,
>+                               GLsizei height,
>+                               GLsizei depth,
>+                               GLboolean unpackFlipY,
>+                               GLboolean unpackPremultiplyAlpha,
>+                               GLboolean unpackUnmultiplyAlpha)
>+{
>+    // Zero sized copies are valid but no-ops
>+    if (width == 0 || height == 0 || depth == 0)
>+    {
>+        return;
>+    }
>+
>+    ANGLE_CONTEXT_TRY(syncStateForTexImage());
>+
>+    Texture *sourceTexture = getTexture(sourceId);
>+    Texture *destTexture   = getTexture(destId);
>+    Offset offset(xoffset, yoffset, zoffset);
>+    Box box(x, y, z, width, height, depth);
>+    ANGLE_CONTEXT_TRY(destTexture->copySubTexture(
>+        this, destTarget, destLevel, offset, sourceLevel, box, ConvertToBool(unpackFlipY),
>+        ConvertToBool(unpackPremultiplyAlpha), ConvertToBool(unpackUnmultiplyAlpha),
>+        sourceTexture));
> }
> 
>-void Context::compressedCopyTextureCHROMIUM(GLuint sourceId, GLuint destId)
>+void Context::compressedCopyTexture(GLuint sourceId, GLuint destId)
> {
>-    syncStateForTexImage();
>+    ANGLE_CONTEXT_TRY(syncStateForTexImage());
> 
>     gl::Texture *sourceTexture = getTexture(sourceId);
>     gl::Texture *destTexture   = getTexture(destId);
>-    handleError(destTexture->copyCompressedTexture(this, sourceTexture));
>+    ANGLE_CONTEXT_TRY(destTexture->copyCompressedTexture(this, sourceTexture));
> }
> 
> void Context::getBufferPointerv(BufferBinding target, GLenum pname, void **params)
> {
>-    Buffer *buffer = mGLState.getTargetBuffer(target);
>+    Buffer *buffer = mState.getTargetBuffer(target);
>     ASSERT(buffer);
> 
>     QueryBufferPointerv(buffer, pname, params);
> }
> 
>+void Context::getBufferPointervRobust(BufferBinding target,
>+                                      GLenum pname,
>+                                      GLsizei bufSize,
>+                                      GLsizei *length,
>+                                      void **params)
>+{
>+    getBufferPointerv(target, pname, params);
>+}
>+
> void *Context::mapBuffer(BufferBinding target, GLenum access)
> {
>-    Buffer *buffer = mGLState.getTargetBuffer(target);
>+    Buffer *buffer = mState.getTargetBuffer(target);
>     ASSERT(buffer);
> 
>-    Error error = buffer->map(this, access);
>-    if (error.isError())
>+    if (buffer->map(this, access) == angle::Result::Stop)
>     {
>-        handleError(error);
>         return nullptr;
>     }
> 
>@@ -3422,14 +4396,12 @@ void *Context::mapBuffer(BufferBinding target, GLenum access)
> 
> GLboolean Context::unmapBuffer(BufferBinding target)
> {
>-    Buffer *buffer = mGLState.getTargetBuffer(target);
>+    Buffer *buffer = mState.getTargetBuffer(target);
>     ASSERT(buffer);
> 
>     GLboolean result;
>-    Error error = buffer->unmap(this, &result);
>-    if (error.isError())
>+    if (buffer->unmap(this, &result) == angle::Result::Stop)
>     {
>-        handleError(error);
>         return GL_FALSE;
>     }
> 
>@@ -3441,13 +4413,11 @@ void *Context::mapBufferRange(BufferBinding target,
>                               GLsizeiptr length,
>                               GLbitfield access)
> {
>-    Buffer *buffer = mGLState.getTargetBuffer(target);
>+    Buffer *buffer = mState.getTargetBuffer(target);
>     ASSERT(buffer);
> 
>-    Error error = buffer->mapRange(this, offset, length, access);
>-    if (error.isError())
>+    if (buffer->mapRange(this, offset, length, access) == angle::Result::Stop)
>     {
>-        handleError(error);
>         return nullptr;
>     }
> 
>@@ -3461,24 +4431,29 @@ void Context::flushMappedBufferRange(BufferBinding /*target*/,
>     // We do not currently support a non-trivial implementation of FlushMappedBufferRange
> }
> 
>-void Context::syncStateForReadPixels()
>+angle::Result Context::syncStateForReadPixels()
> {
>-    syncRendererState(mReadPixelsDirtyBits, mReadPixelsDirtyObjects);
>+    return syncState(mReadPixelsDirtyBits, mReadPixelsDirtyObjects);
> }
> 
>-void Context::syncStateForTexImage()
>+angle::Result Context::syncStateForTexImage()
> {
>-    syncRendererState(mTexImageDirtyBits, mTexImageDirtyObjects);
>+    return syncState(mTexImageDirtyBits, mTexImageDirtyObjects);
> }
> 
>-void Context::syncStateForClear()
>+angle::Result Context::syncStateForBlit()
> {
>-    syncRendererState(mClearDirtyBits, mClearDirtyObjects);
>+    return syncState(mBlitDirtyBits, mBlitDirtyObjects);
> }
> 
>-void Context::syncStateForBlit()
>+angle::Result Context::syncStateForPathOperation()
> {
>-    syncRendererState(mBlitDirtyBits, mBlitDirtyObjects);
>+    ANGLE_TRY(syncDirtyObjects(mPathOperationDirtyObjects));
>+
>+    // TODO(svaisanen@nvidia.com): maybe sync only state required for path rendering?
>+    ANGLE_TRY(syncDirtyBits());
>+
>+    return angle::Result::Continue;
> }
> 
> void Context::activeShaderProgram(GLuint pipeline, GLuint program)
>@@ -3488,98 +4463,102 @@ void Context::activeShaderProgram(GLuint pipeline, GLuint program)
> 
> void Context::activeTexture(GLenum texture)
> {
>-    mGLState.setActiveSampler(texture - GL_TEXTURE0);
>+    mState.setActiveSampler(texture - GL_TEXTURE0);
> }
> 
> void Context::blendColor(GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha)
> {
>-    mGLState.setBlendColor(clamp01(red), clamp01(green), clamp01(blue), clamp01(alpha));
>+    mState.setBlendColor(clamp01(red), clamp01(green), clamp01(blue), clamp01(alpha));
> }
> 
> void Context::blendEquation(GLenum mode)
> {
>-    mGLState.setBlendEquation(mode, mode);
>+    mState.setBlendEquation(mode, mode);
> }
> 
> void Context::blendEquationSeparate(GLenum modeRGB, GLenum modeAlpha)
> {
>-    mGLState.setBlendEquation(modeRGB, modeAlpha);
>+    mState.setBlendEquation(modeRGB, modeAlpha);
> }
> 
> void Context::blendFunc(GLenum sfactor, GLenum dfactor)
> {
>-    mGLState.setBlendFactors(sfactor, dfactor, sfactor, dfactor);
>+    mState.setBlendFactors(sfactor, dfactor, sfactor, dfactor);
> }
> 
> void Context::blendFuncSeparate(GLenum srcRGB, GLenum dstRGB, GLenum srcAlpha, GLenum dstAlpha)
> {
>-    mGLState.setBlendFactors(srcRGB, dstRGB, srcAlpha, dstAlpha);
>+    mState.setBlendFactors(srcRGB, dstRGB, srcAlpha, dstAlpha);
> }
> 
> void Context::clearColor(GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha)
> {
>-    mGLState.setColorClearValue(red, green, blue, alpha);
>+    mState.setColorClearValue(red, green, blue, alpha);
> }
> 
> void Context::clearDepthf(GLfloat depth)
> {
>-    mGLState.setDepthClearValue(depth);
>+    mState.setDepthClearValue(clamp01(depth));
> }
> 
> void Context::clearStencil(GLint s)
> {
>-    mGLState.setStencilClearValue(s);
>+    mState.setStencilClearValue(s);
> }
> 
> void Context::colorMask(GLboolean red, GLboolean green, GLboolean blue, GLboolean alpha)
> {
>-    mGLState.setColorMask(ConvertToBool(red), ConvertToBool(green), ConvertToBool(blue),
>-                          ConvertToBool(alpha));
>+    mState.setColorMask(ConvertToBool(red), ConvertToBool(green), ConvertToBool(blue),
>+                        ConvertToBool(alpha));
> }
> 
> void Context::cullFace(CullFaceMode mode)
> {
>-    mGLState.setCullMode(mode);
>+    mState.setCullMode(mode);
> }
> 
> void Context::depthFunc(GLenum func)
> {
>-    mGLState.setDepthFunc(func);
>+    mState.setDepthFunc(func);
> }
> 
> void Context::depthMask(GLboolean flag)
> {
>-    mGLState.setDepthMask(ConvertToBool(flag));
>+    mState.setDepthMask(ConvertToBool(flag));
> }
> 
> void Context::depthRangef(GLfloat zNear, GLfloat zFar)
> {
>-    mGLState.setDepthRange(zNear, zFar);
>+    mState.setDepthRange(clamp01(zNear), clamp01(zFar));
> }
> 
> void Context::disable(GLenum cap)
> {
>-    mGLState.setEnableFeature(cap, false);
>+    mState.setEnableFeature(cap, false);
>+    mStateCache.onContextCapChange(this);
> }
> 
> void Context::disableVertexAttribArray(GLuint index)
> {
>-    mGLState.setEnableVertexAttribArray(index, false);
>+    mState.setEnableVertexAttribArray(index, false);
>+    mStateCache.onVertexArrayStateChange(this);
> }
> 
> void Context::enable(GLenum cap)
> {
>-    mGLState.setEnableFeature(cap, true);
>+    mState.setEnableFeature(cap, true);
>+    mStateCache.onContextCapChange(this);
> }
> 
> void Context::enableVertexAttribArray(GLuint index)
> {
>-    mGLState.setEnableVertexAttribArray(index, true);
>+    mState.setEnableVertexAttribArray(index, true);
>+    mStateCache.onVertexArrayStateChange(this);
> }
> 
> void Context::frontFace(GLenum mode)
> {
>-    mGLState.setFrontFace(mode);
>+    mState.setFrontFace(mode);
> }
> 
> void Context::hint(GLenum target, GLenum mode)
>@@ -3587,13 +4566,19 @@ void Context::hint(GLenum target, GLenum mode)
>     switch (target)
>     {
>         case GL_GENERATE_MIPMAP_HINT:
>-            mGLState.setGenerateMipmapHint(mode);
>+            mState.setGenerateMipmapHint(mode);
>             break;
> 
>         case GL_FRAGMENT_SHADER_DERIVATIVE_HINT_OES:
>-            mGLState.setFragmentShaderDerivativeHint(mode);
>+            mState.setFragmentShaderDerivativeHint(mode);
>             break;
> 
>+        case GL_PERSPECTIVE_CORRECTION_HINT:
>+        case GL_POINT_SMOOTH_HINT:
>+        case GL_LINE_SMOOTH_HINT:
>+        case GL_FOG_HINT:
>+            mState.gles1().setHint(target, mode);
>+            break;
>         default:
>             UNREACHABLE();
>             return;
>@@ -3602,7 +4587,7 @@ void Context::hint(GLenum target, GLenum mode)
> 
> void Context::lineWidth(GLfloat width)
> {
>-    mGLState.setLineWidth(width);
>+    mState.setLineWidth(width);
> }
> 
> void Context::pixelStorei(GLenum pname, GLint param)
>@@ -3610,55 +4595,55 @@ void Context::pixelStorei(GLenum pname, GLint param)
>     switch (pname)
>     {
>         case GL_UNPACK_ALIGNMENT:
>-            mGLState.setUnpackAlignment(param);
>+            mState.setUnpackAlignment(param);
>             break;
> 
>         case GL_PACK_ALIGNMENT:
>-            mGLState.setPackAlignment(param);
>+            mState.setPackAlignment(param);
>             break;
> 
>         case GL_PACK_REVERSE_ROW_ORDER_ANGLE:
>-            mGLState.setPackReverseRowOrder(param != 0);
>+            mState.setPackReverseRowOrder(param != 0);
>             break;
> 
>         case GL_UNPACK_ROW_LENGTH:
>             ASSERT((getClientMajorVersion() >= 3) || getExtensions().unpackSubimage);
>-            mGLState.setUnpackRowLength(param);
>+            mState.setUnpackRowLength(param);
>             break;
> 
>         case GL_UNPACK_IMAGE_HEIGHT:
>             ASSERT(getClientMajorVersion() >= 3);
>-            mGLState.setUnpackImageHeight(param);
>+            mState.setUnpackImageHeight(param);
>             break;
> 
>         case GL_UNPACK_SKIP_IMAGES:
>             ASSERT(getClientMajorVersion() >= 3);
>-            mGLState.setUnpackSkipImages(param);
>+            mState.setUnpackSkipImages(param);
>             break;
> 
>         case GL_UNPACK_SKIP_ROWS:
>             ASSERT((getClientMajorVersion() >= 3) || getExtensions().unpackSubimage);
>-            mGLState.setUnpackSkipRows(param);
>+            mState.setUnpackSkipRows(param);
>             break;
> 
>         case GL_UNPACK_SKIP_PIXELS:
>             ASSERT((getClientMajorVersion() >= 3) || getExtensions().unpackSubimage);
>-            mGLState.setUnpackSkipPixels(param);
>+            mState.setUnpackSkipPixels(param);
>             break;
> 
>         case GL_PACK_ROW_LENGTH:
>             ASSERT((getClientMajorVersion() >= 3) || getExtensions().packSubimage);
>-            mGLState.setPackRowLength(param);
>+            mState.setPackRowLength(param);
>             break;
> 
>         case GL_PACK_SKIP_ROWS:
>             ASSERT((getClientMajorVersion() >= 3) || getExtensions().packSubimage);
>-            mGLState.setPackSkipRows(param);
>+            mState.setPackSkipRows(param);
>             break;
> 
>         case GL_PACK_SKIP_PIXELS:
>             ASSERT((getClientMajorVersion() >= 3) || getExtensions().packSubimage);
>-            mGLState.setPackSkipPixels(param);
>+            mState.setPackSkipPixels(param);
>             break;
> 
>         default:
>@@ -3669,228 +4654,295 @@ void Context::pixelStorei(GLenum pname, GLint param)
> 
> void Context::polygonOffset(GLfloat factor, GLfloat units)
> {
>-    mGLState.setPolygonOffsetParams(factor, units);
>+    mState.setPolygonOffsetParams(factor, units);
> }
> 
> void Context::sampleCoverage(GLfloat value, GLboolean invert)
> {
>-    mGLState.setSampleCoverageParams(clamp01(value), ConvertToBool(invert));
>+    mState.setSampleCoverageParams(clamp01(value), ConvertToBool(invert));
> }
> 
> void Context::sampleMaski(GLuint maskNumber, GLbitfield mask)
> {
>-    mGLState.setSampleMaskParams(maskNumber, mask);
>+    mState.setSampleMaskParams(maskNumber, mask);
> }
> 
> void Context::scissor(GLint x, GLint y, GLsizei width, GLsizei height)
> {
>-    mGLState.setScissorParams(x, y, width, height);
>+    mState.setScissorParams(x, y, width, height);
> }
> 
> void Context::stencilFuncSeparate(GLenum face, GLenum func, GLint ref, GLuint mask)
> {
>     if (face == GL_FRONT || face == GL_FRONT_AND_BACK)
>     {
>-        mGLState.setStencilParams(func, ref, mask);
>+        mState.setStencilParams(func, ref, mask);
>     }
> 
>     if (face == GL_BACK || face == GL_FRONT_AND_BACK)
>     {
>-        mGLState.setStencilBackParams(func, ref, mask);
>+        mState.setStencilBackParams(func, ref, mask);
>     }
>+
>+    mStateCache.onStencilStateChange(this);
> }
> 
> void Context::stencilMaskSeparate(GLenum face, GLuint mask)
> {
>     if (face == GL_FRONT || face == GL_FRONT_AND_BACK)
>     {
>-        mGLState.setStencilWritemask(mask);
>+        mState.setStencilWritemask(mask);
>     }
> 
>     if (face == GL_BACK || face == GL_FRONT_AND_BACK)
>     {
>-        mGLState.setStencilBackWritemask(mask);
>+        mState.setStencilBackWritemask(mask);
>     }
>+
>+    mStateCache.onStencilStateChange(this);
> }
> 
> void Context::stencilOpSeparate(GLenum face, GLenum fail, GLenum zfail, GLenum zpass)
> {
>     if (face == GL_FRONT || face == GL_FRONT_AND_BACK)
>     {
>-        mGLState.setStencilOperations(fail, zfail, zpass);
>+        mState.setStencilOperations(fail, zfail, zpass);
>     }
> 
>     if (face == GL_BACK || face == GL_FRONT_AND_BACK)
>     {
>-        mGLState.setStencilBackOperations(fail, zfail, zpass);
>+        mState.setStencilBackOperations(fail, zfail, zpass);
>     }
> }
> 
> void Context::vertexAttrib1f(GLuint index, GLfloat x)
> {
>     GLfloat vals[4] = {x, 0, 0, 1};
>-    mGLState.setVertexAttribf(index, vals);
>+    mState.setVertexAttribf(index, vals);
>+    mStateCache.onDefaultVertexAttributeChange(this);
> }
> 
> void Context::vertexAttrib1fv(GLuint index, const GLfloat *values)
> {
>     GLfloat vals[4] = {values[0], 0, 0, 1};
>-    mGLState.setVertexAttribf(index, vals);
>+    mState.setVertexAttribf(index, vals);
>+    mStateCache.onDefaultVertexAttributeChange(this);
> }
> 
> void Context::vertexAttrib2f(GLuint index, GLfloat x, GLfloat y)
> {
>     GLfloat vals[4] = {x, y, 0, 1};
>-    mGLState.setVertexAttribf(index, vals);
>+    mState.setVertexAttribf(index, vals);
>+    mStateCache.onDefaultVertexAttributeChange(this);
> }
> 
> void Context::vertexAttrib2fv(GLuint index, const GLfloat *values)
> {
>     GLfloat vals[4] = {values[0], values[1], 0, 1};
>-    mGLState.setVertexAttribf(index, vals);
>+    mState.setVertexAttribf(index, vals);
>+    mStateCache.onDefaultVertexAttributeChange(this);
> }
> 
> void Context::vertexAttrib3f(GLuint index, GLfloat x, GLfloat y, GLfloat z)
> {
>     GLfloat vals[4] = {x, y, z, 1};
>-    mGLState.setVertexAttribf(index, vals);
>+    mState.setVertexAttribf(index, vals);
>+    mStateCache.onDefaultVertexAttributeChange(this);
> }
> 
> void Context::vertexAttrib3fv(GLuint index, const GLfloat *values)
> {
>     GLfloat vals[4] = {values[0], values[1], values[2], 1};
>-    mGLState.setVertexAttribf(index, vals);
>+    mState.setVertexAttribf(index, vals);
>+    mStateCache.onDefaultVertexAttributeChange(this);
> }
> 
> void Context::vertexAttrib4f(GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w)
> {
>     GLfloat vals[4] = {x, y, z, w};
>-    mGLState.setVertexAttribf(index, vals);
>+    mState.setVertexAttribf(index, vals);
>+    mStateCache.onDefaultVertexAttributeChange(this);
> }
> 
> void Context::vertexAttrib4fv(GLuint index, const GLfloat *values)
> {
>-    mGLState.setVertexAttribf(index, values);
>+    mState.setVertexAttribf(index, values);
>+    mStateCache.onDefaultVertexAttributeChange(this);
> }
> 
> void Context::vertexAttribPointer(GLuint index,
>                                   GLint size,
>-                                  GLenum type,
>+                                  VertexAttribType type,
>                                   GLboolean normalized,
>                                   GLsizei stride,
>                                   const void *ptr)
> {
>-    mGLState.setVertexAttribPointer(this, index, mGLState.getTargetBuffer(BufferBinding::Array),
>-                                    size, type, ConvertToBool(normalized), false, stride, ptr);
>+    mState.setVertexAttribPointer(this, index, mState.getTargetBuffer(BufferBinding::Array), size,
>+                                  type, ConvertToBool(normalized), stride, ptr);
>+    mStateCache.onVertexArrayStateChange(this);
> }
> 
> void Context::vertexAttribFormat(GLuint attribIndex,
>                                  GLint size,
>-                                 GLenum type,
>+                                 VertexAttribType type,
>                                  GLboolean normalized,
>                                  GLuint relativeOffset)
> {
>-    mGLState.setVertexAttribFormat(attribIndex, size, type, ConvertToBool(normalized), false,
>-                                   relativeOffset);
>+    mState.setVertexAttribFormat(attribIndex, size, type, ConvertToBool(normalized), false,
>+                                 relativeOffset);
>+    mStateCache.onVertexArrayFormatChange(this);
> }
> 
> void Context::vertexAttribIFormat(GLuint attribIndex,
>                                   GLint size,
>-                                  GLenum type,
>+                                  VertexAttribType type,
>                                   GLuint relativeOffset)
> {
>-    mGLState.setVertexAttribFormat(attribIndex, size, type, false, true, relativeOffset);
>+    mState.setVertexAttribFormat(attribIndex, size, type, false, true, relativeOffset);
>+    mStateCache.onVertexArrayFormatChange(this);
> }
> 
> void Context::vertexAttribBinding(GLuint attribIndex, GLuint bindingIndex)
> {
>-    mGLState.setVertexAttribBinding(this, attribIndex, bindingIndex);
>+    mState.setVertexAttribBinding(this, attribIndex, bindingIndex);
>+    mStateCache.onVertexArrayStateChange(this);
> }
> 
> void Context::vertexBindingDivisor(GLuint bindingIndex, GLuint divisor)
> {
>-    mGLState.setVertexBindingDivisor(bindingIndex, divisor);
>+    mState.setVertexBindingDivisor(bindingIndex, divisor);
>+    mStateCache.onVertexArrayFormatChange(this);
> }
> 
> void Context::viewport(GLint x, GLint y, GLsizei width, GLsizei height)
> {
>-    mGLState.setViewportParams(x, y, width, height);
>+    mState.setViewportParams(x, y, width, height);
> }
> 
> void Context::vertexAttribIPointer(GLuint index,
>                                    GLint size,
>-                                   GLenum type,
>+                                   VertexAttribType type,
>                                    GLsizei stride,
>                                    const void *pointer)
> {
>-    mGLState.setVertexAttribPointer(this, index, mGLState.getTargetBuffer(BufferBinding::Array),
>-                                    size, type, false, true, stride, pointer);
>+    mState.setVertexAttribIPointer(this, index, mState.getTargetBuffer(BufferBinding::Array), size,
>+                                   type, stride, pointer);
>+    mStateCache.onVertexArrayStateChange(this);
> }
> 
> void Context::vertexAttribI4i(GLuint index, GLint x, GLint y, GLint z, GLint w)
> {
>     GLint vals[4] = {x, y, z, w};
>-    mGLState.setVertexAttribi(index, vals);
>+    mState.setVertexAttribi(index, vals);
>+    mStateCache.onDefaultVertexAttributeChange(this);
> }
> 
> void Context::vertexAttribI4ui(GLuint index, GLuint x, GLuint y, GLuint z, GLuint w)
> {
>     GLuint vals[4] = {x, y, z, w};
>-    mGLState.setVertexAttribu(index, vals);
>+    mState.setVertexAttribu(index, vals);
>+    mStateCache.onDefaultVertexAttributeChange(this);
> }
> 
> void Context::vertexAttribI4iv(GLuint index, const GLint *v)
> {
>-    mGLState.setVertexAttribi(index, v);
>+    mState.setVertexAttribi(index, v);
>+    mStateCache.onDefaultVertexAttributeChange(this);
> }
> 
> void Context::vertexAttribI4uiv(GLuint index, const GLuint *v)
> {
>-    mGLState.setVertexAttribu(index, v);
>+    mState.setVertexAttribu(index, v);
>+    mStateCache.onDefaultVertexAttributeChange(this);
> }
> 
> void Context::getVertexAttribiv(GLuint index, GLenum pname, GLint *params)
> {
>     const VertexAttribCurrentValueData &currentValues =
>-        getGLState().getVertexAttribCurrentValue(index);
>-    const VertexArray *vao = getGLState().getVertexArray();
>+        getState().getVertexAttribCurrentValue(index);
>+    const VertexArray *vao = getState().getVertexArray();
>     QueryVertexAttribiv(vao->getVertexAttribute(index), vao->getBindingFromAttribIndex(index),
>                         currentValues, pname, params);
> }
> 
>+void Context::getVertexAttribivRobust(GLuint index,
>+                                      GLenum pname,
>+                                      GLsizei bufSize,
>+                                      GLsizei *length,
>+                                      GLint *params)
>+{
>+    getVertexAttribiv(index, pname, params);
>+}
>+
> void Context::getVertexAttribfv(GLuint index, GLenum pname, GLfloat *params)
> {
>     const VertexAttribCurrentValueData &currentValues =
>-        getGLState().getVertexAttribCurrentValue(index);
>-    const VertexArray *vao = getGLState().getVertexArray();
>+        getState().getVertexAttribCurrentValue(index);
>+    const VertexArray *vao = getState().getVertexArray();
>     QueryVertexAttribfv(vao->getVertexAttribute(index), vao->getBindingFromAttribIndex(index),
>                         currentValues, pname, params);
> }
> 
>+void Context::getVertexAttribfvRobust(GLuint index,
>+                                      GLenum pname,
>+                                      GLsizei bufSize,
>+                                      GLsizei *length,
>+                                      GLfloat *params)
>+{
>+    getVertexAttribfv(index, pname, params);
>+}
>+
> void Context::getVertexAttribIiv(GLuint index, GLenum pname, GLint *params)
> {
>     const VertexAttribCurrentValueData &currentValues =
>-        getGLState().getVertexAttribCurrentValue(index);
>-    const VertexArray *vao = getGLState().getVertexArray();
>+        getState().getVertexAttribCurrentValue(index);
>+    const VertexArray *vao = getState().getVertexArray();
>     QueryVertexAttribIiv(vao->getVertexAttribute(index), vao->getBindingFromAttribIndex(index),
>                          currentValues, pname, params);
> }
> 
>+void Context::getVertexAttribIivRobust(GLuint index,
>+                                       GLenum pname,
>+                                       GLsizei bufSize,
>+                                       GLsizei *length,
>+                                       GLint *params)
>+{
>+    getVertexAttribIiv(index, pname, params);
>+}
>+
> void Context::getVertexAttribIuiv(GLuint index, GLenum pname, GLuint *params)
> {
>     const VertexAttribCurrentValueData &currentValues =
>-        getGLState().getVertexAttribCurrentValue(index);
>-    const VertexArray *vao = getGLState().getVertexArray();
>+        getState().getVertexAttribCurrentValue(index);
>+    const VertexArray *vao = getState().getVertexArray();
>     QueryVertexAttribIuiv(vao->getVertexAttribute(index), vao->getBindingFromAttribIndex(index),
>                           currentValues, pname, params);
> }
> 
>+void Context::getVertexAttribIuivRobust(GLuint index,
>+                                        GLenum pname,
>+                                        GLsizei bufSize,
>+                                        GLsizei *length,
>+                                        GLuint *params)
>+{
>+    getVertexAttribIuiv(index, pname, params);
>+}
>+
> void Context::getVertexAttribPointerv(GLuint index, GLenum pname, void **pointer)
> {
>-    const VertexAttribute &attrib = getGLState().getVertexArray()->getVertexAttribute(index);
>+    const VertexAttribute &attrib = getState().getVertexArray()->getVertexAttribute(index);
>     QueryVertexAttribPointerv(attrib, pname, pointer);
> }
> 
>+void Context::getVertexAttribPointervRobust(GLuint index,
>+                                            GLenum pname,
>+                                            GLsizei bufSize,
>+                                            GLsizei *length,
>+                                            void **pointer)
>+{
>+    getVertexAttribPointerv(index, pname, pointer);
>+}
>+
> void Context::debugMessageControl(GLenum source,
>                                   GLenum type,
>                                   GLenum severity,
>@@ -3899,8 +4951,8 @@ void Context::debugMessageControl(GLenum source,
>                                   GLboolean enabled)
> {
>     std::vector<GLuint> idVector(ids, ids + count);
>-    mGLState.getDebug().setMessageControl(source, type, severity, std::move(idVector),
>-                                          ConvertToBool(enabled));
>+    mState.getDebug().setMessageControl(source, type, severity, std::move(idVector),
>+                                        ConvertToBool(enabled));
> }
> 
> void Context::debugMessageInsert(GLenum source,
>@@ -3911,12 +4963,12 @@ void Context::debugMessageInsert(GLenum source,
>                                  const GLchar *buf)
> {
>     std::string msg(buf, (length > 0) ? static_cast<size_t>(length) : strlen(buf));
>-    mGLState.getDebug().insertMessage(source, type, id, severity, std::move(msg));
>+    mState.getDebug().insertMessage(source, type, id, severity, std::move(msg));
> }
> 
> void Context::debugMessageCallback(GLDEBUGPROCKHR callback, const void *userParam)
> {
>-    mGLState.getDebug().setCallback(callback, userParam);
>+    mState.getDebug().setCallback(callback, userParam);
> }
> 
> GLuint Context::getDebugMessageLog(GLuint count,
>@@ -3928,28 +4980,28 @@ GLuint Context::getDebugMessageLog(GLuint count,
>                                    GLsizei *lengths,
>                                    GLchar *messageLog)
> {
>-    return static_cast<GLuint>(mGLState.getDebug().getMessages(count, bufSize, sources, types, ids,
>-                                                               severities, lengths, messageLog));
>+    return static_cast<GLuint>(mState.getDebug().getMessages(count, bufSize, sources, types, ids,
>+                                                             severities, lengths, messageLog));
> }
> 
> void Context::pushDebugGroup(GLenum source, GLuint id, GLsizei length, const GLchar *message)
> {
>     std::string msg(message, (length > 0) ? static_cast<size_t>(length) : strlen(message));
>-    mGLState.getDebug().pushGroup(source, id, std::move(msg));
>-    mImplementation->pushDebugGroup(source, id, length, message);
>+    mImplementation->pushDebugGroup(source, id, msg);
>+    mState.getDebug().pushGroup(source, id, std::move(msg));
> }
> 
> void Context::popDebugGroup()
> {
>-    mGLState.getDebug().popGroup();
>+    mState.getDebug().popGroup();
>     mImplementation->popDebugGroup();
> }
> 
> void Context::bufferData(BufferBinding target, GLsizeiptr size, const void *data, BufferUsage usage)
> {
>-    Buffer *buffer = mGLState.getTargetBuffer(target);
>+    Buffer *buffer = mState.getTargetBuffer(target);
>     ASSERT(buffer);
>-    handleError(buffer->bufferData(this, target, data, size, usage));
>+    ANGLE_CONTEXT_TRY(buffer->bufferData(this, target, data, size, usage));
> }
> 
> void Context::bufferSubData(BufferBinding target,
>@@ -3957,20 +5009,20 @@ void Context::bufferSubData(BufferBinding target,
>                             GLsizeiptr size,
>                             const void *data)
> {
>-    if (data == nullptr)
>+    if (data == nullptr || size == 0)
>     {
>         return;
>     }
> 
>-    Buffer *buffer = mGLState.getTargetBuffer(target);
>+    Buffer *buffer = mState.getTargetBuffer(target);
>     ASSERT(buffer);
>-    handleError(buffer->bufferSubData(this, target, data, size, offset));
>+    ANGLE_CONTEXT_TRY(buffer->bufferSubData(this, target, data, size, offset));
> }
> 
> void Context::attachShader(GLuint program, GLuint shader)
> {
>-    Program *programObject = mState.mShaderPrograms->getProgram(program);
>-    Shader *shaderObject   = mState.mShaderPrograms->getShader(shader);
>+    Program *programObject = mState.mShaderProgramManager->getProgram(program);
>+    Shader *shaderObject   = mState.mShaderProgramManager->getShader(shader);
>     ASSERT(programObject && shaderObject);
>     programObject->attachShader(shaderObject);
> }
>@@ -3993,26 +5045,21 @@ void Context::copyBufferSubData(BufferBinding readTarget,
>     }
> 
>     // TODO(jmadill): cache these.
>-    Buffer *readBuffer  = mGLState.getTargetBuffer(readTarget);
>-    Buffer *writeBuffer = mGLState.getTargetBuffer(writeTarget);
>+    Buffer *readBuffer  = mState.getTargetBuffer(readTarget);
>+    Buffer *writeBuffer = mState.getTargetBuffer(writeTarget);
> 
>-    handleError(writeBuffer->copyBufferSubData(this, readBuffer, readOffset, writeOffset, size));
>+    ANGLE_CONTEXT_TRY(
>+        writeBuffer->copyBufferSubData(this, readBuffer, readOffset, writeOffset, size));
> }
> 
> void Context::bindAttribLocation(GLuint program, GLuint index, const GLchar *name)
> {
>-    Program *programObject = getProgram(program);
>-    // TODO(jmadill): Re-use this from the validation if possible.
>+    // Ideally we could share the program query with the validation layer if possible.
>+    Program *programObject = getProgramResolveLink(program);
>     ASSERT(programObject);
>     programObject->bindAttributeLocation(index, name);
> }
> 
>-void Context::bindBuffer(BufferBinding target, GLuint buffer)
>-{
>-    Buffer *bufferObject = mState.mBuffers->checkBufferAllocation(mImplementation.get(), buffer);
>-    mGLState.setBufferBinding(this, target, bufferObject);
>-}
>-
> void Context::bindBufferBase(BufferBinding target, GLuint index, GLuint buffer)
> {
>     bindBufferRange(target, index, buffer, 0, 0);
>@@ -4024,8 +5071,17 @@ void Context::bindBufferRange(BufferBinding target,
>                               GLintptr offset,
>                               GLsizeiptr size)
> {
>-    Buffer *bufferObject = mState.mBuffers->checkBufferAllocation(mImplementation.get(), buffer);
>-    mGLState.setIndexedBufferBinding(this, target, index, bufferObject, offset, size);
>+    Buffer *object = mState.mBufferManager->checkBufferAllocation(mImplementation.get(), buffer);
>+    ANGLE_CONTEXT_TRY(mState.setIndexedBufferBinding(this, target, index, object, offset, size));
>+    if (target == BufferBinding::Uniform)
>+    {
>+        mUniformBufferObserverBindings[index].bind(object);
>+        mStateCache.onUniformBufferStateChange(this);
>+    }
>+    else
>+    {
>+        mStateCache.onBufferBindingChange(this);
>+    }
> }
> 
> void Context::bindFramebuffer(GLenum target, GLuint framebuffer)
>@@ -4044,12 +5100,12 @@ void Context::bindFramebuffer(GLenum target, GLuint framebuffer)
> void Context::bindRenderbuffer(GLenum target, GLuint renderbuffer)
> {
>     ASSERT(target == GL_RENDERBUFFER);
>-    Renderbuffer *object =
>-        mState.mRenderbuffers->checkRenderbufferAllocation(mImplementation.get(), renderbuffer);
>-    mGLState.setRenderbufferBinding(this, object);
>+    Renderbuffer *object = mState.mRenderbufferManager->checkRenderbufferAllocation(
>+        mImplementation.get(), renderbuffer);
>+    mState.setRenderbufferBinding(this, object);
> }
> 
>-void Context::texStorage2DMultisample(GLenum target,
>+void Context::texStorage2DMultisample(TextureType target,
>                                       GLsizei samples,
>                                       GLenum internalformat,
>                                       GLsizei width,
>@@ -4057,28 +5113,51 @@ void Context::texStorage2DMultisample(GLenum target,
>                                       GLboolean fixedsamplelocations)
> {
>     Extents size(width, height, 1);
>-    Texture *texture = getTargetTexture(target);
>-    handleError(texture->setStorageMultisample(this, target, samples, internalformat, size,
>-                                               ConvertToBool(fixedsamplelocations)));
>+    Texture *texture = getTextureByType(target);
>+    ANGLE_CONTEXT_TRY(texture->setStorageMultisample(this, target, samples, internalformat, size,
>+                                                     ConvertToBool(fixedsamplelocations)));
>+}
>+
>+void Context::texStorage3DMultisample(TextureType target,
>+                                      GLsizei samples,
>+                                      GLenum internalformat,
>+                                      GLsizei width,
>+                                      GLsizei height,
>+                                      GLsizei depth,
>+                                      GLboolean fixedsamplelocations)
>+{
>+    Extents size(width, height, depth);
>+    Texture *texture = getTextureByType(target);
>+    ANGLE_CONTEXT_TRY(texture->setStorageMultisample(this, target, samples, internalformat, size,
>+                                                     ConvertToBool(fixedsamplelocations)));
> }
> 
> void Context::getMultisamplefv(GLenum pname, GLuint index, GLfloat *val)
> {
>     // According to spec 3.1 Table 20.49: Framebuffer Dependent Values,
>     // the sample position should be queried by DRAW_FRAMEBUFFER.
>-    mGLState.syncDirtyObject(this, GL_DRAW_FRAMEBUFFER);
>-    const Framebuffer *framebuffer = mGLState.getDrawFramebuffer();
>+    ANGLE_CONTEXT_TRY(mState.syncDirtyObject(this, GL_DRAW_FRAMEBUFFER));
>+    const Framebuffer *framebuffer = mState.getDrawFramebuffer();
> 
>     switch (pname)
>     {
>         case GL_SAMPLE_POSITION:
>-            handleError(framebuffer->getSamplePosition(index, val));
>+            ANGLE_CONTEXT_TRY(framebuffer->getSamplePosition(this, index, val));
>             break;
>         default:
>             UNREACHABLE();
>     }
> }
> 
>+void Context::getMultisamplefvRobust(GLenum pname,
>+                                     GLuint index,
>+                                     GLsizei bufSize,
>+                                     GLsizei *length,
>+                                     GLfloat *val)
>+{
>+    UNIMPLEMENTED();
>+}
>+
> void Context::renderbufferStorage(GLenum target,
>                                   GLenum internalformat,
>                                   GLsizei width,
>@@ -4087,8 +5166,8 @@ void Context::renderbufferStorage(GLenum target,
>     // Hack for the special WebGL 1 "DEPTH_STENCIL" internal format.
>     GLenum convertedInternalFormat = getConvertedRenderbufferFormat(internalformat);
> 
>-    Renderbuffer *renderbuffer = mGLState.getCurrentRenderbuffer();
>-    handleError(renderbuffer->setStorage(this, convertedInternalFormat, width, height));
>+    Renderbuffer *renderbuffer = mState.getCurrentRenderbuffer();
>+    ANGLE_CONTEXT_TRY(renderbuffer->setStorage(this, convertedInternalFormat, width, height));
> }
> 
> void Context::renderbufferStorageMultisample(GLenum target,
>@@ -4100,47 +5179,52 @@ void Context::renderbufferStorageMultisample(GLenum target,
>     // Hack for the special WebGL 1 "DEPTH_STENCIL" internal format.
>     GLenum convertedInternalFormat = getConvertedRenderbufferFormat(internalformat);
> 
>-    Renderbuffer *renderbuffer = mGLState.getCurrentRenderbuffer();
>-    handleError(
>+    Renderbuffer *renderbuffer = mState.getCurrentRenderbuffer();
>+    ANGLE_CONTEXT_TRY(
>         renderbuffer->setStorageMultisample(this, samples, convertedInternalFormat, width, height));
> }
> 
> void Context::getSynciv(GLsync sync, GLenum pname, GLsizei bufSize, GLsizei *length, GLint *values)
> {
>-    const Sync *syncObject = getSync(sync);
>-    handleError(QuerySynciv(syncObject, pname, bufSize, length, values));
>+    const Sync *syncObject = nullptr;
>+    if (!mContextLost)
>+    {
>+        syncObject = getSync(sync);
>+    }
>+    ANGLE_CONTEXT_TRY(QuerySynciv(this, syncObject, pname, bufSize, length, values));
> }
> 
> void Context::getFramebufferParameteriv(GLenum target, GLenum pname, GLint *params)
> {
>-    Framebuffer *framebuffer = mGLState.getTargetFramebuffer(target);
>+    Framebuffer *framebuffer = mState.getTargetFramebuffer(target);
>     QueryFramebufferParameteriv(framebuffer, pname, params);
> }
> 
>+void Context::getFramebufferParameterivRobust(GLenum target,
>+                                              GLenum pname,
>+                                              GLsizei bufSize,
>+                                              GLsizei *length,
>+                                              GLint *params)
>+{
>+    UNIMPLEMENTED();
>+}
>+
> void Context::framebufferParameteri(GLenum target, GLenum pname, GLint param)
> {
>-    Framebuffer *framebuffer = mGLState.getTargetFramebuffer(target);
>-    SetFramebufferParameteri(framebuffer, pname, param);
>+    Framebuffer *framebuffer = mState.getTargetFramebuffer(target);
>+    SetFramebufferParameteri(this, framebuffer, pname, param);
> }
> 
>-Error Context::getScratchBuffer(size_t requstedSizeBytes,
>-                                angle::MemoryBuffer **scratchBufferOut) const
>+bool Context::getScratchBuffer(size_t requstedSizeBytes,
>+                               angle::MemoryBuffer **scratchBufferOut) const
> {
>-    if (!mScratchBuffer.get(requstedSizeBytes, scratchBufferOut))
>-    {
>-        return OutOfMemory() << "Failed to allocate internal buffer.";
>-    }
>-    return NoError();
>+    return mScratchBuffer.get(requstedSizeBytes, scratchBufferOut);
> }
> 
>-Error Context::getZeroFilledBuffer(size_t requstedSizeBytes,
>-                                   angle::MemoryBuffer **zeroBufferOut) const
>+bool Context::getZeroFilledBuffer(size_t requstedSizeBytes,
>+                                  angle::MemoryBuffer **zeroBufferOut) const
> {
>-    if (!mZeroFilledBuffer.getInitialized(requstedSizeBytes, zeroBufferOut, 0))
>-    {
>-        return OutOfMemory() << "Failed to allocate internal buffer.";
>-    }
>-    return NoError();
>+    return mZeroFilledBuffer.getInitialized(requstedSizeBytes, zeroBufferOut, 0);
> }
> 
> void Context::dispatchCompute(GLuint numGroupsX, GLuint numGroupsY, GLuint numGroupsZ)
>@@ -4150,32 +5234,28 @@ void Context::dispatchCompute(GLuint numGroupsX, GLuint numGroupsY, GLuint numGr
>         return;
>     }
> 
>-    // TODO(jmadill): Dirty bits for compute.
>-    if (isRobustResourceInitEnabled())
>-    {
>-        ANGLE_CONTEXT_TRY(mGLState.clearUnclearedActiveTextures(this));
>-    }
>-
>-    handleError(mImplementation->dispatchCompute(this, numGroupsX, numGroupsY, numGroupsZ));
>+    ANGLE_CONTEXT_TRY(prepareForDispatch());
>+    ANGLE_CONTEXT_TRY(mImplementation->dispatchCompute(this, numGroupsX, numGroupsY, numGroupsZ));
> }
> 
> void Context::dispatchComputeIndirect(GLintptr indirect)
> {
>-    UNIMPLEMENTED();
>+    ANGLE_CONTEXT_TRY(prepareForDispatch());
>+    ANGLE_CONTEXT_TRY(mImplementation->dispatchComputeIndirect(this, indirect));
> }
> 
>-void Context::texStorage2D(GLenum target,
>+void Context::texStorage2D(TextureType target,
>                            GLsizei levels,
>                            GLenum internalFormat,
>                            GLsizei width,
>                            GLsizei height)
> {
>     Extents size(width, height, 1);
>-    Texture *texture = getTargetTexture(target);
>-    handleError(texture->setStorage(this, target, levels, internalFormat, size));
>+    Texture *texture = getTextureByType(target);
>+    ANGLE_CONTEXT_TRY(texture->setStorage(this, target, levels, internalFormat, size));
> }
> 
>-void Context::texStorage3D(GLenum target,
>+void Context::texStorage3D(TextureType target,
>                            GLsizei levels,
>                            GLenum internalFormat,
>                            GLsizei width,
>@@ -4183,25 +5263,177 @@ void Context::texStorage3D(GLenum target,
>                            GLsizei depth)
> {
>     Extents size(width, height, depth);
>-    Texture *texture = getTargetTexture(target);
>-    handleError(texture->setStorage(this, target, levels, internalFormat, size));
>+    Texture *texture = getTextureByType(target);
>+    ANGLE_CONTEXT_TRY(texture->setStorage(this, target, levels, internalFormat, size));
> }
> 
> void Context::memoryBarrier(GLbitfield barriers)
> {
>-    UNIMPLEMENTED();
>+    ANGLE_CONTEXT_TRY(mImplementation->memoryBarrier(this, barriers));
> }
> 
> void Context::memoryBarrierByRegion(GLbitfield barriers)
> {
>-    UNIMPLEMENTED();
>+    ANGLE_CONTEXT_TRY(mImplementation->memoryBarrierByRegion(this, barriers));
>+}
>+
>+void Context::multiDrawArrays(PrimitiveMode mode,
>+                              const GLint *firsts,
>+                              const GLsizei *counts,
>+                              GLsizei drawcount)
>+{
>+    ANGLE_CONTEXT_TRY(prepareForDraw(mode));
>+    Program *programObject = mState.getLinkedProgram(this);
>+    const bool hasDrawID   = programObject && programObject->hasDrawIDUniform();
>+    if (hasDrawID)
>+    {
>+        for (GLsizei drawID = 0; drawID < drawcount; ++drawID)
>+        {
>+            if (noopDraw(mode, counts[drawID]))
>+            {
>+                continue;
>+            }
>+            programObject->setDrawIDUniform(drawID);
>+            ANGLE_CONTEXT_TRY(
>+                mImplementation->drawArrays(this, mode, firsts[drawID], counts[drawID]));
>+            MarkTransformFeedbackBufferUsage(this, counts[drawID], 1);
>+        }
>+    }
>+    else
>+    {
>+        for (GLsizei drawID = 0; drawID < drawcount; ++drawID)
>+        {
>+            if (noopDraw(mode, counts[drawID]))
>+            {
>+                continue;
>+            }
>+            ANGLE_CONTEXT_TRY(
>+                mImplementation->drawArrays(this, mode, firsts[drawID], counts[drawID]));
>+            MarkTransformFeedbackBufferUsage(this, counts[drawID], 1);
>+        }
>+    }
>+}
>+
>+void Context::multiDrawArraysInstanced(PrimitiveMode mode,
>+                                       const GLint *firsts,
>+                                       const GLsizei *counts,
>+                                       const GLsizei *instanceCounts,
>+                                       GLsizei drawcount)
>+{
>+    ANGLE_CONTEXT_TRY(prepareForDraw(mode));
>+    Program *programObject = mState.getLinkedProgram(this);
>+    const bool hasDrawID   = programObject && programObject->hasDrawIDUniform();
>+    if (hasDrawID)
>+    {
>+        for (GLsizei drawID = 0; drawID < drawcount; ++drawID)
>+        {
>+            if (noopDrawInstanced(mode, counts[drawID], instanceCounts[drawID]))
>+            {
>+                continue;
>+            }
>+            programObject->setDrawIDUniform(drawID);
>+            ANGLE_CONTEXT_TRY(mImplementation->drawArraysInstanced(
>+                this, mode, firsts[drawID], counts[drawID], instanceCounts[drawID]));
>+            MarkTransformFeedbackBufferUsage(this, counts[drawID], instanceCounts[drawID]);
>+        }
>+    }
>+    else
>+    {
>+        for (GLsizei drawID = 0; drawID < drawcount; ++drawID)
>+        {
>+            if (noopDrawInstanced(mode, counts[drawID], instanceCounts[drawID]))
>+            {
>+                continue;
>+            }
>+            ANGLE_CONTEXT_TRY(mImplementation->drawArraysInstanced(
>+                this, mode, firsts[drawID], counts[drawID], instanceCounts[drawID]));
>+            MarkTransformFeedbackBufferUsage(this, counts[drawID], instanceCounts[drawID]);
>+        }
>+    }
>+}
>+
>+void Context::multiDrawElements(PrimitiveMode mode,
>+                                const GLsizei *counts,
>+                                DrawElementsType type,
>+                                const GLvoid *const *indices,
>+                                GLsizei drawcount)
>+{
>+    ANGLE_CONTEXT_TRY(prepareForDraw(mode));
>+    Program *programObject = mState.getLinkedProgram(this);
>+    const bool hasDrawID   = programObject && programObject->hasDrawIDUniform();
>+    if (hasDrawID)
>+    {
>+        for (GLsizei drawID = 0; drawID < drawcount; ++drawID)
>+        {
>+            if (noopDraw(mode, counts[drawID]))
>+            {
>+                continue;
>+            }
>+            programObject->setDrawIDUniform(drawID);
>+            ANGLE_CONTEXT_TRY(
>+                mImplementation->drawElements(this, mode, counts[drawID], type, indices[drawID]));
>+        }
>+    }
>+    else
>+    {
>+        for (GLsizei drawID = 0; drawID < drawcount; ++drawID)
>+        {
>+            if (noopDraw(mode, counts[drawID]))
>+            {
>+                continue;
>+            }
>+            ANGLE_CONTEXT_TRY(
>+                mImplementation->drawElements(this, mode, counts[drawID], type, indices[drawID]));
>+        }
>+    }
>+}
>+
>+void Context::multiDrawElementsInstanced(PrimitiveMode mode,
>+                                         const GLsizei *counts,
>+                                         DrawElementsType type,
>+                                         const GLvoid *const *indices,
>+                                         const GLsizei *instanceCounts,
>+                                         GLsizei drawcount)
>+{
>+    ANGLE_CONTEXT_TRY(prepareForDraw(mode));
>+    Program *programObject = mState.getLinkedProgram(this);
>+    const bool hasDrawID   = programObject && programObject->hasDrawIDUniform();
>+    if (hasDrawID)
>+    {
>+        for (GLsizei drawID = 0; drawID < drawcount; ++drawID)
>+        {
>+            if (noopDrawInstanced(mode, counts[drawID], instanceCounts[drawID]))
>+            {
>+                continue;
>+            }
>+            programObject->setDrawIDUniform(drawID);
>+            ANGLE_CONTEXT_TRY(mImplementation->drawElementsInstanced(
>+                this, mode, counts[drawID], type, indices[drawID], instanceCounts[drawID]));
>+        }
>+    }
>+    else
>+    {
>+        for (GLsizei drawID = 0; drawID < drawcount; ++drawID)
>+        {
>+            if (noopDrawInstanced(mode, counts[drawID], instanceCounts[drawID]))
>+            {
>+                continue;
>+            }
>+            ANGLE_CONTEXT_TRY(mImplementation->drawElementsInstanced(
>+                this, mode, counts[drawID], type, indices[drawID], instanceCounts[drawID]));
>+        }
>+    }
>+}
>+
>+void Context::provokingVertex(ProvokingVertex provokeMode)
>+{
>+    mState.setProvokingVertex(provokeMode);
> }
> 
> GLenum Context::checkFramebufferStatus(GLenum target)
> {
>-    Framebuffer *framebuffer = mGLState.getTargetFramebuffer(target);
>+    Framebuffer *framebuffer = mState.getTargetFramebuffer(target);
>     ASSERT(framebuffer);
>-
>     return framebuffer->checkStatus(this);
> }
> 
>@@ -4255,7 +5487,7 @@ void Context::deleteTextures(GLsizei n, const GLuint *textures)
> 
> void Context::detachShader(GLuint program, GLuint shader)
> {
>-    Program *programObject = getProgram(program);
>+    Program *programObject = getProgramNoResolveLink(program);
>     ASSERT(programObject);
> 
>     Shader *shaderObject = getShader(shader);
>@@ -4304,7 +5536,7 @@ void Context::getActiveAttrib(GLuint program,
>                               GLenum *type,
>                               GLchar *name)
> {
>-    Program *programObject = getProgram(program);
>+    Program *programObject = getProgramResolveLink(program);
>     ASSERT(programObject);
>     programObject->getActiveAttribute(index, bufsize, length, size, type, name);
> }
>@@ -4317,21 +5549,21 @@ void Context::getActiveUniform(GLuint program,
>                                GLenum *type,
>                                GLchar *name)
> {
>-    Program *programObject = getProgram(program);
>+    Program *programObject = getProgramResolveLink(program);
>     ASSERT(programObject);
>     programObject->getActiveUniform(index, bufsize, length, size, type, name);
> }
> 
> void Context::getAttachedShaders(GLuint program, GLsizei maxcount, GLsizei *count, GLuint *shaders)
> {
>-    Program *programObject = getProgram(program);
>+    Program *programObject = getProgramNoResolveLink(program);
>     ASSERT(programObject);
>     programObject->getAttachedShaders(maxcount, count, shaders);
> }
> 
> GLint Context::getAttribLocation(GLuint program, const GLchar *name)
> {
>-    Program *programObject = getProgram(program);
>+    Program *programObject = getProgramResolveLink(program);
>     ASSERT(programObject);
>     return programObject->getAttributeLocation(name);
> }
>@@ -4352,6 +5584,11 @@ void Context::getBooleanv(GLenum pname, GLboolean *params)
>     }
> }
> 
>+void Context::getBooleanvRobust(GLenum pname, GLsizei bufSize, GLsizei *length, GLboolean *params)
>+{
>+    getBooleanv(pname, params);
>+}
>+
> void Context::getFloatv(GLenum pname, GLfloat *params)
> {
>     GLenum nativeType;
>@@ -4368,6 +5605,11 @@ void Context::getFloatv(GLenum pname, GLfloat *params)
>     }
> }
> 
>+void Context::getFloatvRobust(GLenum pname, GLsizei bufSize, GLsizei *length, GLfloat *params)
>+{
>+    getFloatv(pname, params);
>+}
>+
> void Context::getIntegerv(GLenum pname, GLint *params)
> {
>     GLenum nativeType;
>@@ -4384,21 +5626,46 @@ void Context::getIntegerv(GLenum pname, GLint *params)
>     }
> }
> 
>+void Context::getIntegervRobust(GLenum pname, GLsizei bufSize, GLsizei *length, GLint *data)
>+{
>+    getIntegerv(pname, data);
>+}
>+
> void Context::getProgramiv(GLuint program, GLenum pname, GLint *params)
> {
>-    Program *programObject = getProgram(program);
>-    ASSERT(programObject);
>+    Program *programObject = nullptr;
>+    if (!mContextLost)
>+    {
>+        // Don't resolve link if checking the link completion status.
>+        programObject = (pname == GL_COMPLETION_STATUS_KHR ? getProgramNoResolveLink(program)
>+                                                           : getProgramResolveLink(program));
>+        ASSERT(programObject);
>+    }
>     QueryProgramiv(this, programObject, pname, params);
> }
> 
>+void Context::getProgramivRobust(GLuint program,
>+                                 GLenum pname,
>+                                 GLsizei bufSize,
>+                                 GLsizei *length,
>+                                 GLint *params)
>+{
>+    getProgramiv(program, pname, params);
>+}
>+
> void Context::getProgramPipelineiv(GLuint pipeline, GLenum pname, GLint *params)
> {
>     UNIMPLEMENTED();
> }
> 
>+MemoryObject *Context::getMemoryObject(GLuint handle) const
>+{
>+    return mState.mMemoryObjectManager->getMemoryObject(handle);
>+}
>+
> void Context::getProgramInfoLog(GLuint program, GLsizei bufsize, GLsizei *length, GLchar *infolog)
> {
>-    Program *programObject = getProgram(program);
>+    Program *programObject = getProgramResolveLink(program);
>     ASSERT(programObject);
>     programObject->getInfoLog(bufsize, length, infolog);
> }
>@@ -4413,16 +5680,29 @@ void Context::getProgramPipelineInfoLog(GLuint pipeline,
> 
> void Context::getShaderiv(GLuint shader, GLenum pname, GLint *params)
> {
>-    Shader *shaderObject = getShader(shader);
>-    ASSERT(shaderObject);
>+    Shader *shaderObject = nullptr;
>+    if (!mContextLost)
>+    {
>+        shaderObject = getShader(shader);
>+        ASSERT(shaderObject);
>+    }
>     QueryShaderiv(this, shaderObject, pname, params);
> }
> 
>+void Context::getShaderivRobust(GLuint shader,
>+                                GLenum pname,
>+                                GLsizei bufSize,
>+                                GLsizei *length,
>+                                GLint *params)
>+{
>+    getShaderiv(shader, pname, params);
>+}
>+
> void Context::getShaderInfoLog(GLuint shader, GLsizei bufsize, GLsizei *length, GLchar *infolog)
> {
>     Shader *shaderObject = getShader(shader);
>     ASSERT(shaderObject);
>-    shaderObject->getInfoLog(this, bufsize, length, infolog);
>+    shaderObject->getInfoLog(bufsize, length, infolog);
> }
> 
> void Context::getShaderPrecisionFormat(GLenum shadertype,
>@@ -4438,23 +5718,23 @@ void Context::getShaderPrecisionFormat(GLenum shadertype,
>             switch (precisiontype)
>             {
>                 case GL_LOW_FLOAT:
>-                    mCaps.vertexLowpFloat.get(range, precision);
>+                    mState.mCaps.vertexLowpFloat.get(range, precision);
>                     break;
>                 case GL_MEDIUM_FLOAT:
>-                    mCaps.vertexMediumpFloat.get(range, precision);
>+                    mState.mCaps.vertexMediumpFloat.get(range, precision);
>                     break;
>                 case GL_HIGH_FLOAT:
>-                    mCaps.vertexHighpFloat.get(range, precision);
>+                    mState.mCaps.vertexHighpFloat.get(range, precision);
>                     break;
> 
>                 case GL_LOW_INT:
>-                    mCaps.vertexLowpInt.get(range, precision);
>+                    mState.mCaps.vertexLowpInt.get(range, precision);
>                     break;
>                 case GL_MEDIUM_INT:
>-                    mCaps.vertexMediumpInt.get(range, precision);
>+                    mState.mCaps.vertexMediumpInt.get(range, precision);
>                     break;
>                 case GL_HIGH_INT:
>-                    mCaps.vertexHighpInt.get(range, precision);
>+                    mState.mCaps.vertexHighpInt.get(range, precision);
>                     break;
> 
>                 default:
>@@ -4467,23 +5747,23 @@ void Context::getShaderPrecisionFormat(GLenum shadertype,
>             switch (precisiontype)
>             {
>                 case GL_LOW_FLOAT:
>-                    mCaps.fragmentLowpFloat.get(range, precision);
>+                    mState.mCaps.fragmentLowpFloat.get(range, precision);
>                     break;
>                 case GL_MEDIUM_FLOAT:
>-                    mCaps.fragmentMediumpFloat.get(range, precision);
>+                    mState.mCaps.fragmentMediumpFloat.get(range, precision);
>                     break;
>                 case GL_HIGH_FLOAT:
>-                    mCaps.fragmentHighpFloat.get(range, precision);
>+                    mState.mCaps.fragmentHighpFloat.get(range, precision);
>                     break;
> 
>                 case GL_LOW_INT:
>-                    mCaps.fragmentLowpInt.get(range, precision);
>+                    mState.mCaps.fragmentLowpInt.get(range, precision);
>                     break;
>                 case GL_MEDIUM_INT:
>-                    mCaps.fragmentMediumpInt.get(range, precision);
>+                    mState.mCaps.fragmentMediumpInt.get(range, precision);
>                     break;
>                 case GL_HIGH_INT:
>-                    mCaps.fragmentHighpInt.get(range, precision);
>+                    mState.mCaps.fragmentHighpInt.get(range, precision);
>                     break;
> 
>                 default:
>@@ -4507,21 +5787,39 @@ void Context::getShaderSource(GLuint shader, GLsizei bufsize, GLsizei *length, G
> 
> void Context::getUniformfv(GLuint program, GLint location, GLfloat *params)
> {
>-    Program *programObject = getProgram(program);
>+    Program *programObject = getProgramResolveLink(program);
>     ASSERT(programObject);
>     programObject->getUniformfv(this, location, params);
> }
> 
>+void Context::getUniformfvRobust(GLuint program,
>+                                 GLint location,
>+                                 GLsizei bufSize,
>+                                 GLsizei *length,
>+                                 GLfloat *params)
>+{
>+    getUniformfv(program, location, params);
>+}
>+
> void Context::getUniformiv(GLuint program, GLint location, GLint *params)
> {
>-    Program *programObject = getProgram(program);
>+    Program *programObject = getProgramResolveLink(program);
>     ASSERT(programObject);
>     programObject->getUniformiv(this, location, params);
> }
> 
>+void Context::getUniformivRobust(GLuint program,
>+                                 GLint location,
>+                                 GLsizei bufSize,
>+                                 GLsizei *length,
>+                                 GLint *params)
>+{
>+    getUniformiv(program, location, params);
>+}
>+
> GLint Context::getUniformLocation(GLuint program, const GLchar *name)
> {
>-    Program *programObject = getProgram(program);
>+    Program *programObject = getProgramResolveLink(program);
>     ASSERT(programObject);
>     return programObject->getUniformLocation(name);
> }
>@@ -4538,7 +5836,7 @@ GLboolean Context::isBuffer(GLuint buffer)
> 
> GLboolean Context::isEnabled(GLenum cap)
> {
>-    return mGLState.getEnableFeature(cap);
>+    return mState.getEnableFeature(cap);
> }
> 
> GLboolean Context::isFramebuffer(GLuint framebuffer)
>@@ -4558,7 +5856,7 @@ GLboolean Context::isProgram(GLuint program)
>         return GL_FALSE;
>     }
> 
>-    return (getProgram(program) ? GL_TRUE : GL_FALSE);
>+    return (getProgramNoResolveLink(program) ? GL_TRUE : GL_FALSE);
> }
> 
> GLboolean Context::isRenderbuffer(GLuint renderbuffer)
>@@ -4593,10 +5891,10 @@ GLboolean Context::isTexture(GLuint texture)
> 
> void Context::linkProgram(GLuint program)
> {
>-    Program *programObject = getProgram(program);
>+    Program *programObject = getProgramNoResolveLink(program);
>     ASSERT(programObject);
>-    handleError(programObject->link(this));
>-    mGLState.onProgramExecutableChange(programObject);
>+    ANGLE_CONTEXT_TRY(programObject->link(this));
>+    ANGLE_CONTEXT_TRY(onProgramLink(programObject));
> }
> 
> void Context::releaseShaderCompiler()
>@@ -4614,6 +5912,36 @@ void Context::shaderBinary(GLsizei n,
>     UNIMPLEMENTED();
> }
> 
>+void Context::bindFragDataLocationIndexed(GLuint program,
>+                                          GLuint colorNumber,
>+                                          GLuint index,
>+                                          const char *name)
>+{
>+    Program *programObject = getProgramNoResolveLink(program);
>+    programObject->bindFragmentOutputLocation(colorNumber, name);
>+    programObject->bindFragmentOutputIndex(index, name);
>+}
>+
>+void Context::bindFragDataLocation(GLuint program, GLuint colorNumber, const char *name)
>+{
>+    bindFragDataLocationIndexed(program, colorNumber, 0u, name);
>+}
>+
>+int Context::getFragDataIndex(GLuint program, const char *name)
>+{
>+    Program *programObject = getProgramResolveLink(program);
>+    return programObject->getFragDataIndex(name);
>+}
>+
>+int Context::getProgramResourceLocationIndex(GLuint program,
>+                                             GLenum programInterface,
>+                                             const char *name)
>+{
>+    Program *programObject = getProgramResolveLink(program);
>+    ASSERT(programInterface == GL_PROGRAM_OUTPUT);
>+    return programObject->getFragDataIndex(name);
>+}
>+
> void Context::shaderSource(GLuint shader,
>                            GLsizei count,
>                            const GLchar *const *string,
>@@ -4641,109 +5969,112 @@ void Context::stencilOp(GLenum fail, GLenum zfail, GLenum zpass)
> 
> void Context::uniform1f(GLint location, GLfloat x)
> {
>-    Program *program = mGLState.getProgram();
>+    Program *program = mState.getProgram();
>     program->setUniform1fv(location, 1, &x);
> }
> 
> void Context::uniform1fv(GLint location, GLsizei count, const GLfloat *v)
> {
>-    Program *program = mGLState.getProgram();
>+    Program *program = mState.getProgram();
>     program->setUniform1fv(location, count, v);
> }
> 
>+void Context::setUniform1iImpl(Program *program, GLint location, GLsizei count, const GLint *v)
>+{
>+    program->setUniform1iv(this, location, count, v);
>+}
>+
>+void Context::onSamplerUniformChange(size_t textureUnitIndex)
>+{
>+    mState.onActiveTextureChange(this, textureUnitIndex);
>+    mStateCache.onActiveTextureChange(this);
>+}
>+
> void Context::uniform1i(GLint location, GLint x)
> {
>-    Program *program = mGLState.getProgram();
>-    if (program->setUniform1iv(location, 1, &x) == Program::SetUniformResult::SamplerChanged)
>-    {
>-        mGLState.setObjectDirty(GL_PROGRAM);
>-    }
>+    setUniform1iImpl(mState.getProgram(), location, 1, &x);
> }
> 
> void Context::uniform1iv(GLint location, GLsizei count, const GLint *v)
> {
>-    Program *program = mGLState.getProgram();
>-    if (program->setUniform1iv(location, count, v) == Program::SetUniformResult::SamplerChanged)
>-    {
>-        mGLState.setObjectDirty(GL_PROGRAM);
>-    }
>+    setUniform1iImpl(mState.getProgram(), location, count, v);
> }
> 
> void Context::uniform2f(GLint location, GLfloat x, GLfloat y)
> {
>     GLfloat xy[2]    = {x, y};
>-    Program *program = mGLState.getProgram();
>+    Program *program = mState.getProgram();
>     program->setUniform2fv(location, 1, xy);
> }
> 
> void Context::uniform2fv(GLint location, GLsizei count, const GLfloat *v)
> {
>-    Program *program = mGLState.getProgram();
>+    Program *program = mState.getProgram();
>     program->setUniform2fv(location, count, v);
> }
> 
> void Context::uniform2i(GLint location, GLint x, GLint y)
> {
>     GLint xy[2]      = {x, y};
>-    Program *program = mGLState.getProgram();
>+    Program *program = mState.getProgram();
>     program->setUniform2iv(location, 1, xy);
> }
> 
> void Context::uniform2iv(GLint location, GLsizei count, const GLint *v)
> {
>-    Program *program = mGLState.getProgram();
>+    Program *program = mState.getProgram();
>     program->setUniform2iv(location, count, v);
> }
> 
> void Context::uniform3f(GLint location, GLfloat x, GLfloat y, GLfloat z)
> {
>     GLfloat xyz[3]   = {x, y, z};
>-    Program *program = mGLState.getProgram();
>+    Program *program = mState.getProgram();
>     program->setUniform3fv(location, 1, xyz);
> }
> 
> void Context::uniform3fv(GLint location, GLsizei count, const GLfloat *v)
> {
>-    Program *program = mGLState.getProgram();
>+    Program *program = mState.getProgram();
>     program->setUniform3fv(location, count, v);
> }
> 
> void Context::uniform3i(GLint location, GLint x, GLint y, GLint z)
> {
>     GLint xyz[3]     = {x, y, z};
>-    Program *program = mGLState.getProgram();
>+    Program *program = mState.getProgram();
>     program->setUniform3iv(location, 1, xyz);
> }
> 
> void Context::uniform3iv(GLint location, GLsizei count, const GLint *v)
> {
>-    Program *program = mGLState.getProgram();
>+    Program *program = mState.getProgram();
>     program->setUniform3iv(location, count, v);
> }
> 
> void Context::uniform4f(GLint location, GLfloat x, GLfloat y, GLfloat z, GLfloat w)
> {
>     GLfloat xyzw[4]  = {x, y, z, w};
>-    Program *program = mGLState.getProgram();
>+    Program *program = mState.getProgram();
>     program->setUniform4fv(location, 1, xyzw);
> }
> 
> void Context::uniform4fv(GLint location, GLsizei count, const GLfloat *v)
> {
>-    Program *program = mGLState.getProgram();
>+    Program *program = mState.getProgram();
>     program->setUniform4fv(location, count, v);
> }
> 
> void Context::uniform4i(GLint location, GLint x, GLint y, GLint z, GLint w)
> {
>     GLint xyzw[4]    = {x, y, z, w};
>-    Program *program = mGLState.getProgram();
>+    Program *program = mState.getProgram();
>     program->setUniform4iv(location, 1, xyzw);
> }
> 
> void Context::uniform4iv(GLint location, GLsizei count, const GLint *v)
> {
>-    Program *program = mGLState.getProgram();
>+    Program *program = mState.getProgram();
>     program->setUniform4iv(location, count, v);
> }
> 
>@@ -4752,7 +6083,7 @@ void Context::uniformMatrix2fv(GLint location,
>                                GLboolean transpose,
>                                const GLfloat *value)
> {
>-    Program *program = mGLState.getProgram();
>+    Program *program = mState.getProgram();
>     program->setUniformMatrix2fv(location, count, transpose, value);
> }
> 
>@@ -4761,7 +6092,7 @@ void Context::uniformMatrix3fv(GLint location,
>                                GLboolean transpose,
>                                const GLfloat *value)
> {
>-    Program *program = mGLState.getProgram();
>+    Program *program = mState.getProgram();
>     program->setUniformMatrix3fv(location, count, transpose, value);
> }
> 
>@@ -4770,15 +6101,15 @@ void Context::uniformMatrix4fv(GLint location,
>                                GLboolean transpose,
>                                const GLfloat *value)
> {
>-    Program *program = mGLState.getProgram();
>+    Program *program = mState.getProgram();
>     program->setUniformMatrix4fv(location, count, transpose, value);
> }
> 
> void Context::validateProgram(GLuint program)
> {
>-    Program *programObject = getProgram(program);
>+    Program *programObject = getProgramResolveLink(program);
>     ASSERT(programObject);
>-    programObject->validate(mCaps);
>+    programObject->validate(mState.mCaps);
> }
> 
> void Context::validateProgramPipeline(GLuint pipeline)
>@@ -4792,67 +6123,68 @@ void Context::getProgramBinary(GLuint program,
>                                GLenum *binaryFormat,
>                                void *binary)
> {
>-    Program *programObject = getProgram(program);
>+    Program *programObject = getProgramResolveLink(program);
>     ASSERT(programObject != nullptr);
> 
>-    handleError(programObject->saveBinary(this, binaryFormat, binary, bufSize, length));
>+    ANGLE_CONTEXT_TRY(programObject->saveBinary(this, binaryFormat, binary, bufSize, length));
> }
> 
> void Context::programBinary(GLuint program, GLenum binaryFormat, const void *binary, GLsizei length)
> {
>-    Program *programObject = getProgram(program);
>+    Program *programObject = getProgramResolveLink(program);
>     ASSERT(programObject != nullptr);
> 
>-    handleError(programObject->loadBinary(this, binaryFormat, binary, length));
>+    ANGLE_CONTEXT_TRY(programObject->loadBinary(this, binaryFormat, binary, length));
>+    ANGLE_CONTEXT_TRY(onProgramLink(programObject));
> }
> 
> void Context::uniform1ui(GLint location, GLuint v0)
> {
>-    Program *program = mGLState.getProgram();
>+    Program *program = mState.getProgram();
>     program->setUniform1uiv(location, 1, &v0);
> }
> 
> void Context::uniform2ui(GLint location, GLuint v0, GLuint v1)
> {
>-    Program *program  = mGLState.getProgram();
>+    Program *program  = mState.getProgram();
>     const GLuint xy[] = {v0, v1};
>     program->setUniform2uiv(location, 1, xy);
> }
> 
> void Context::uniform3ui(GLint location, GLuint v0, GLuint v1, GLuint v2)
> {
>-    Program *program   = mGLState.getProgram();
>+    Program *program   = mState.getProgram();
>     const GLuint xyz[] = {v0, v1, v2};
>     program->setUniform3uiv(location, 1, xyz);
> }
> 
> void Context::uniform4ui(GLint location, GLuint v0, GLuint v1, GLuint v2, GLuint v3)
> {
>-    Program *program    = mGLState.getProgram();
>+    Program *program    = mState.getProgram();
>     const GLuint xyzw[] = {v0, v1, v2, v3};
>     program->setUniform4uiv(location, 1, xyzw);
> }
> 
> void Context::uniform1uiv(GLint location, GLsizei count, const GLuint *value)
> {
>-    Program *program = mGLState.getProgram();
>+    Program *program = mState.getProgram();
>     program->setUniform1uiv(location, count, value);
> }
> void Context::uniform2uiv(GLint location, GLsizei count, const GLuint *value)
> {
>-    Program *program = mGLState.getProgram();
>+    Program *program = mState.getProgram();
>     program->setUniform2uiv(location, count, value);
> }
> 
> void Context::uniform3uiv(GLint location, GLsizei count, const GLuint *value)
> {
>-    Program *program = mGLState.getProgram();
>+    Program *program = mState.getProgram();
>     program->setUniform3uiv(location, count, value);
> }
> 
> void Context::uniform4uiv(GLint location, GLsizei count, const GLuint *value)
> {
>-    Program *program = mGLState.getProgram();
>+    Program *program = mState.getProgram();
>     program->setUniform4uiv(location, count, value);
> }
> 
>@@ -4886,7 +6218,7 @@ void Context::deleteQueries(GLsizei n, const GLuint *ids)
> 
> GLboolean Context::isQuery(GLuint id)
> {
>-    return (getQuery(id, false, GL_NONE) != nullptr) ? GL_TRUE : GL_FALSE;
>+    return (getQuery(id, false, QueryType::InvalidEnum) != nullptr) ? GL_TRUE : GL_FALSE;
> }
> 
> void Context::uniformMatrix2x3fv(GLint location,
>@@ -4894,7 +6226,7 @@ void Context::uniformMatrix2x3fv(GLint location,
>                                  GLboolean transpose,
>                                  const GLfloat *value)
> {
>-    Program *program = mGLState.getProgram();
>+    Program *program = mState.getProgram();
>     program->setUniformMatrix2x3fv(location, count, transpose, value);
> }
> 
>@@ -4903,7 +6235,7 @@ void Context::uniformMatrix3x2fv(GLint location,
>                                  GLboolean transpose,
>                                  const GLfloat *value)
> {
>-    Program *program = mGLState.getProgram();
>+    Program *program = mState.getProgram();
>     program->setUniformMatrix3x2fv(location, count, transpose, value);
> }
> 
>@@ -4912,7 +6244,7 @@ void Context::uniformMatrix2x4fv(GLint location,
>                                  GLboolean transpose,
>                                  const GLfloat *value)
> {
>-    Program *program = mGLState.getProgram();
>+    Program *program = mState.getProgram();
>     program->setUniformMatrix2x4fv(location, count, transpose, value);
> }
> 
>@@ -4921,7 +6253,7 @@ void Context::uniformMatrix4x2fv(GLint location,
>                                  GLboolean transpose,
>                                  const GLfloat *value)
> {
>-    Program *program = mGLState.getProgram();
>+    Program *program = mState.getProgram();
>     program->setUniformMatrix4x2fv(location, count, transpose, value);
> }
> 
>@@ -4930,7 +6262,7 @@ void Context::uniformMatrix3x4fv(GLint location,
>                                  GLboolean transpose,
>                                  const GLfloat *value)
> {
>-    Program *program = mGLState.getProgram();
>+    Program *program = mState.getProgram();
>     program->setUniformMatrix3x4fv(location, count, transpose, value);
> }
> 
>@@ -4939,7 +6271,7 @@ void Context::uniformMatrix4x3fv(GLint location,
>                                  GLboolean transpose,
>                                  const GLfloat *value)
> {
>-    Program *program = mGLState.getProgram();
>+    Program *program = mState.getProgram();
>     program->setUniformMatrix4x3fv(location, count, transpose, value);
> }
> 
>@@ -4989,8 +6321,9 @@ bool Context::isVertexArray(GLuint array)
> 
> void Context::endTransformFeedback()
> {
>-    TransformFeedback *transformFeedback = mGLState.getCurrentTransformFeedback();
>-    transformFeedback->end(this);
>+    TransformFeedback *transformFeedback = mState.getCurrentTransformFeedback();
>+    ANGLE_CONTEXT_TRY(transformFeedback->end(this));
>+    mStateCache.onActiveTransformFeedbackChange(this);
> }
> 
> void Context::transformFeedbackVaryings(GLuint program,
>@@ -4998,7 +6331,7 @@ void Context::transformFeedbackVaryings(GLuint program,
>                                         const GLchar *const *varyings,
>                                         GLenum bufferMode)
> {
>-    Program *programObject = getProgram(program);
>+    Program *programObject = getProgramResolveLink(program);
>     ASSERT(programObject);
>     programObject->setTransformFeedbackVaryings(count, varyings, bufferMode);
> }
>@@ -5011,7 +6344,7 @@ void Context::getTransformFeedbackVarying(GLuint program,
>                                           GLenum *type,
>                                           GLchar *name)
> {
>-    Program *programObject = getProgram(program);
>+    Program *programObject = getProgramResolveLink(program);
>     ASSERT(programObject);
>     programObject->getTransformFeedbackVarying(index, bufSize, length, size, type, name);
> }
>@@ -5065,25 +6398,36 @@ bool Context::isTransformFeedback(GLuint id)
> 
> void Context::pauseTransformFeedback()
> {
>-    TransformFeedback *transformFeedback = mGLState.getCurrentTransformFeedback();
>-    transformFeedback->pause();
>+    TransformFeedback *transformFeedback = mState.getCurrentTransformFeedback();
>+    ANGLE_CONTEXT_TRY(transformFeedback->pause(this));
>+    mStateCache.onActiveTransformFeedbackChange(this);
> }
> 
> void Context::resumeTransformFeedback()
> {
>-    TransformFeedback *transformFeedback = mGLState.getCurrentTransformFeedback();
>-    transformFeedback->resume();
>+    TransformFeedback *transformFeedback = mState.getCurrentTransformFeedback();
>+    ANGLE_CONTEXT_TRY(transformFeedback->resume(this));
>+    mStateCache.onActiveTransformFeedbackChange(this);
> }
> 
> void Context::getUniformuiv(GLuint program, GLint location, GLuint *params)
> {
>-    const Program *programObject = getProgram(program);
>+    const Program *programObject = getProgramResolveLink(program);
>     programObject->getUniformuiv(this, location, params);
> }
> 
>+void Context::getUniformuivRobust(GLuint program,
>+                                  GLint location,
>+                                  GLsizei bufSize,
>+                                  GLsizei *length,
>+                                  GLuint *params)
>+{
>+    getUniformuiv(program, location, params);
>+}
>+
> GLint Context::getFragDataLocation(GLuint program, const GLchar *name)
> {
>-    const Program *programObject = getProgram(program);
>+    const Program *programObject = getProgramResolveLink(program);
>     return programObject->getFragDataLocation(name);
> }
> 
>@@ -5092,7 +6436,7 @@ void Context::getUniformIndices(GLuint program,
>                                 const GLchar *const *uniformNames,
>                                 GLuint *uniformIndices)
> {
>-    const Program *programObject = getProgram(program);
>+    const Program *programObject = getProgramResolveLink(program);
>     if (!programObject->isLinked())
>     {
>         for (int uniformId = 0; uniformId < uniformCount; uniformId++)
>@@ -5115,7 +6459,7 @@ void Context::getActiveUniformsiv(GLuint program,
>                                   GLenum pname,
>                                   GLint *params)
> {
>-    const Program *programObject = getProgram(program);
>+    const Program *programObject = getProgramResolveLink(program);
>     for (int uniformId = 0; uniformId < uniformCount; uniformId++)
>     {
>         const GLuint index = uniformIndices[uniformId];
>@@ -5125,7 +6469,7 @@ void Context::getActiveUniformsiv(GLuint program,
> 
> GLuint Context::getUniformBlockIndex(GLuint program, const GLchar *uniformBlockName)
> {
>-    const Program *programObject = getProgram(program);
>+    const Program *programObject = getProgramResolveLink(program);
>     return programObject->getUniformBlockIndex(uniformBlockName);
> }
> 
>@@ -5134,17 +6478,27 @@ void Context::getActiveUniformBlockiv(GLuint program,
>                                       GLenum pname,
>                                       GLint *params)
> {
>-    const Program *programObject = getProgram(program);
>+    const Program *programObject = getProgramResolveLink(program);
>     QueryActiveUniformBlockiv(programObject, uniformBlockIndex, pname, params);
> }
> 
>+void Context::getActiveUniformBlockivRobust(GLuint program,
>+                                            GLuint uniformBlockIndex,
>+                                            GLenum pname,
>+                                            GLsizei bufSize,
>+                                            GLsizei *length,
>+                                            GLint *params)
>+{
>+    getActiveUniformBlockiv(program, uniformBlockIndex, pname, params);
>+}
>+
> void Context::getActiveUniformBlockName(GLuint program,
>                                         GLuint uniformBlockIndex,
>                                         GLsizei bufSize,
>                                         GLsizei *length,
>                                         GLchar *uniformBlockName)
> {
>-    const Program *programObject = getProgram(program);
>+    const Program *programObject = getProgramResolveLink(program);
>     programObject->getActiveUniformBlockName(uniformBlockIndex, bufSize, length, uniformBlockName);
> }
> 
>@@ -5152,21 +6506,26 @@ void Context::uniformBlockBinding(GLuint program,
>                                   GLuint uniformBlockIndex,
>                                   GLuint uniformBlockBinding)
> {
>-    Program *programObject = getProgram(program);
>+    Program *programObject = getProgramResolveLink(program);
>     programObject->bindUniformBlock(uniformBlockIndex, uniformBlockBinding);
>+
>+    // Note: If the Program is shared between Contexts we would be better using Observer/Subject.
>+    if (programObject->isInUse())
>+    {
>+        mState.setObjectDirty(GL_PROGRAM);
>+        mStateCache.onUniformBufferStateChange(this);
>+    }
> }
> 
> GLsync Context::fenceSync(GLenum condition, GLbitfield flags)
> {
>-    GLuint handle     = mState.mSyncs->createSync(mImplementation.get());
>+    GLuint handle     = mState.mSyncManager->createSync(mImplementation.get());
>     GLsync syncHandle = reinterpret_cast<GLsync>(static_cast<uintptr_t>(handle));
> 
>     Sync *syncObject = getSync(syncHandle);
>-    Error error      = syncObject->set(condition, flags);
>-    if (error.isError())
>+    if (syncObject->set(this, condition, flags) == angle::Result::Stop)
>     {
>         deleteSync(syncHandle);
>-        handleError(error);
>         return nullptr;
>     }
> 
>@@ -5183,14 +6542,17 @@ GLenum Context::clientWaitSync(GLsync sync, GLbitfield flags, GLuint64 timeout)
>     Sync *syncObject = getSync(sync);
> 
>     GLenum result = GL_WAIT_FAILED;
>-    handleError(syncObject->clientWait(flags, timeout, &result));
>+    if (syncObject->clientWait(this, flags, timeout, &result) == angle::Result::Stop)
>+    {
>+        return GL_WAIT_FAILED;
>+    }
>     return result;
> }
> 
> void Context::waitSync(GLsync sync, GLbitfield flags, GLuint64 timeout)
> {
>     Sync *syncObject = getSync(sync);
>-    handleError(syncObject->serverWait(flags, timeout));
>+    ANGLE_CONTEXT_TRY(syncObject->serverWait(this, flags, timeout));
> }
> 
> void Context::getInteger64v(GLenum pname, GLint64 *params)
>@@ -5209,17 +6571,31 @@ void Context::getInteger64v(GLenum pname, GLint64 *params)
>     }
> }
> 
>+void Context::getInteger64vRobust(GLenum pname, GLsizei bufSize, GLsizei *length, GLint64 *data)
>+{
>+    getInteger64v(pname, data);
>+}
>+
> void Context::getBufferParameteri64v(BufferBinding target, GLenum pname, GLint64 *params)
> {
>-    Buffer *buffer = mGLState.getTargetBuffer(target);
>+    Buffer *buffer = mState.getTargetBuffer(target);
>     QueryBufferParameteri64v(buffer, pname, params);
> }
> 
>+void Context::getBufferParameteri64vRobust(BufferBinding target,
>+                                           GLenum pname,
>+                                           GLsizei bufSize,
>+                                           GLsizei *length,
>+                                           GLint64 *params)
>+{
>+    getBufferParameteri64v(target, pname, params);
>+}
>+
> void Context::genSamplers(GLsizei count, GLuint *samplers)
> {
>     for (int i = 0; i < count; i++)
>     {
>-        samplers[i] = mState.mSamplers->createSampler();
>+        samplers[i] = mState.mSamplerManager->createSampler();
>     }
> }
> 
>@@ -5229,12 +6605,12 @@ void Context::deleteSamplers(GLsizei count, const GLuint *samplers)
>     {
>         GLuint sampler = samplers[i];
> 
>-        if (mState.mSamplers->getSampler(sampler))
>+        if (mState.mSamplerManager->getSampler(sampler))
>         {
>             detachSampler(sampler);
>         }
> 
>-        mState.mSamplers->deleteObject(this, sampler);
>+        mState.mSamplerManager->deleteObject(this, sampler);
>     }
> }
> 
>@@ -5244,10 +6620,20 @@ void Context::getInternalformativ(GLenum target,
>                                   GLsizei bufSize,
>                                   GLint *params)
> {
>-    const TextureCaps &formatCaps = mTextureCaps.get(internalformat);
>+    const TextureCaps &formatCaps = mState.mTextureCaps.get(internalformat);
>     QueryInternalFormativ(formatCaps, pname, bufSize, params);
> }
> 
>+void Context::getInternalformativRobust(GLenum target,
>+                                        GLenum internalformat,
>+                                        GLenum pname,
>+                                        GLsizei bufSize,
>+                                        GLsizei *length,
>+                                        GLint *params)
>+{
>+    getInternalformativ(target, internalformat, pname, bufSize, params);
>+}
>+
> void Context::programUniform1i(GLuint program, GLint location, GLint v0)
> {
>     programUniform1iv(program, location, 1, &v0);
>@@ -5334,88 +6720,84 @@ void Context::programUniform4f(GLuint program,
> 
> void Context::programUniform1iv(GLuint program, GLint location, GLsizei count, const GLint *value)
> {
>-    Program *programObject = getProgram(program);
>+    Program *programObject = getProgramResolveLink(program);
>     ASSERT(programObject);
>-    if (programObject->setUniform1iv(location, count, value) ==
>-        Program::SetUniformResult::SamplerChanged)
>-    {
>-        mGLState.setObjectDirty(GL_PROGRAM);
>-    }
>+    setUniform1iImpl(programObject, location, count, value);
> }
> 
> void Context::programUniform2iv(GLuint program, GLint location, GLsizei count, const GLint *value)
> {
>-    Program *programObject = getProgram(program);
>+    Program *programObject = getProgramResolveLink(program);
>     ASSERT(programObject);
>     programObject->setUniform2iv(location, count, value);
> }
> 
> void Context::programUniform3iv(GLuint program, GLint location, GLsizei count, const GLint *value)
> {
>-    Program *programObject = getProgram(program);
>+    Program *programObject = getProgramResolveLink(program);
>     ASSERT(programObject);
>     programObject->setUniform3iv(location, count, value);
> }
> 
> void Context::programUniform4iv(GLuint program, GLint location, GLsizei count, const GLint *value)
> {
>-    Program *programObject = getProgram(program);
>+    Program *programObject = getProgramResolveLink(program);
>     ASSERT(programObject);
>     programObject->setUniform4iv(location, count, value);
> }
> 
> void Context::programUniform1uiv(GLuint program, GLint location, GLsizei count, const GLuint *value)
> {
>-    Program *programObject = getProgram(program);
>+    Program *programObject = getProgramResolveLink(program);
>     ASSERT(programObject);
>     programObject->setUniform1uiv(location, count, value);
> }
> 
> void Context::programUniform2uiv(GLuint program, GLint location, GLsizei count, const GLuint *value)
> {
>-    Program *programObject = getProgram(program);
>+    Program *programObject = getProgramResolveLink(program);
>     ASSERT(programObject);
>     programObject->setUniform2uiv(location, count, value);
> }
> 
> void Context::programUniform3uiv(GLuint program, GLint location, GLsizei count, const GLuint *value)
> {
>-    Program *programObject = getProgram(program);
>+    Program *programObject = getProgramResolveLink(program);
>     ASSERT(programObject);
>     programObject->setUniform3uiv(location, count, value);
> }
> 
> void Context::programUniform4uiv(GLuint program, GLint location, GLsizei count, const GLuint *value)
> {
>-    Program *programObject = getProgram(program);
>+    Program *programObject = getProgramResolveLink(program);
>     ASSERT(programObject);
>     programObject->setUniform4uiv(location, count, value);
> }
> 
> void Context::programUniform1fv(GLuint program, GLint location, GLsizei count, const GLfloat *value)
> {
>-    Program *programObject = getProgram(program);
>+    Program *programObject = getProgramResolveLink(program);
>     ASSERT(programObject);
>     programObject->setUniform1fv(location, count, value);
> }
> 
> void Context::programUniform2fv(GLuint program, GLint location, GLsizei count, const GLfloat *value)
> {
>-    Program *programObject = getProgram(program);
>+    Program *programObject = getProgramResolveLink(program);
>     ASSERT(programObject);
>     programObject->setUniform2fv(location, count, value);
> }
> 
> void Context::programUniform3fv(GLuint program, GLint location, GLsizei count, const GLfloat *value)
> {
>-    Program *programObject = getProgram(program);
>+    Program *programObject = getProgramResolveLink(program);
>     ASSERT(programObject);
>     programObject->setUniform3fv(location, count, value);
> }
> 
> void Context::programUniform4fv(GLuint program, GLint location, GLsizei count, const GLfloat *value)
> {
>-    Program *programObject = getProgram(program);
>+    Program *programObject = getProgramResolveLink(program);
>     ASSERT(programObject);
>     programObject->setUniform4fv(location, count, value);
> }
>@@ -5426,7 +6808,7 @@ void Context::programUniformMatrix2fv(GLuint program,
>                                       GLboolean transpose,
>                                       const GLfloat *value)
> {
>-    Program *programObject = getProgram(program);
>+    Program *programObject = getProgramResolveLink(program);
>     ASSERT(programObject);
>     programObject->setUniformMatrix2fv(location, count, transpose, value);
> }
>@@ -5437,7 +6819,7 @@ void Context::programUniformMatrix3fv(GLuint program,
>                                       GLboolean transpose,
>                                       const GLfloat *value)
> {
>-    Program *programObject = getProgram(program);
>+    Program *programObject = getProgramResolveLink(program);
>     ASSERT(programObject);
>     programObject->setUniformMatrix3fv(location, count, transpose, value);
> }
>@@ -5448,7 +6830,7 @@ void Context::programUniformMatrix4fv(GLuint program,
>                                       GLboolean transpose,
>                                       const GLfloat *value)
> {
>-    Program *programObject = getProgram(program);
>+    Program *programObject = getProgramResolveLink(program);
>     ASSERT(programObject);
>     programObject->setUniformMatrix4fv(location, count, transpose, value);
> }
>@@ -5459,7 +6841,7 @@ void Context::programUniformMatrix2x3fv(GLuint program,
>                                         GLboolean transpose,
>                                         const GLfloat *value)
> {
>-    Program *programObject = getProgram(program);
>+    Program *programObject = getProgramResolveLink(program);
>     ASSERT(programObject);
>     programObject->setUniformMatrix2x3fv(location, count, transpose, value);
> }
>@@ -5470,7 +6852,7 @@ void Context::programUniformMatrix3x2fv(GLuint program,
>                                         GLboolean transpose,
>                                         const GLfloat *value)
> {
>-    Program *programObject = getProgram(program);
>+    Program *programObject = getProgramResolveLink(program);
>     ASSERT(programObject);
>     programObject->setUniformMatrix3x2fv(location, count, transpose, value);
> }
>@@ -5481,7 +6863,7 @@ void Context::programUniformMatrix2x4fv(GLuint program,
>                                         GLboolean transpose,
>                                         const GLfloat *value)
> {
>-    Program *programObject = getProgram(program);
>+    Program *programObject = getProgramResolveLink(program);
>     ASSERT(programObject);
>     programObject->setUniformMatrix2x4fv(location, count, transpose, value);
> }
>@@ -5492,7 +6874,7 @@ void Context::programUniformMatrix4x2fv(GLuint program,
>                                         GLboolean transpose,
>                                         const GLfloat *value)
> {
>-    Program *programObject = getProgram(program);
>+    Program *programObject = getProgramResolveLink(program);
>     ASSERT(programObject);
>     programObject->setUniformMatrix4x2fv(location, count, transpose, value);
> }
>@@ -5503,7 +6885,7 @@ void Context::programUniformMatrix3x4fv(GLuint program,
>                                         GLboolean transpose,
>                                         const GLfloat *value)
> {
>-    Program *programObject = getProgram(program);
>+    Program *programObject = getProgramResolveLink(program);
>     ASSERT(programObject);
>     programObject->setUniformMatrix3x4fv(location, count, transpose, value);
> }
>@@ -5514,16 +6896,14 @@ void Context::programUniformMatrix4x3fv(GLuint program,
>                                         GLboolean transpose,
>                                         const GLfloat *value)
> {
>-    Program *programObject = getProgram(program);
>+    Program *programObject = getProgramResolveLink(program);
>     ASSERT(programObject);
>     programObject->setUniformMatrix4x3fv(location, count, transpose, value);
> }
> 
>-void Context::onTextureChange(const Texture *texture)
>+bool Context::isCurrentTransformFeedback(const TransformFeedback *tf) const
> {
>-    // Conservatively assume all textures are dirty.
>-    // TODO(jmadill): More fine-grained update.
>-    mGLState.setObjectDirty(GL_TEXTURE);
>+    return mState.isCurrentTransformFeedback(tf);
> }
> 
> void Context::genProgramPipelines(GLsizei count, GLuint *pipelines)
>@@ -5555,4 +6935,1741 @@ GLboolean Context::isProgramPipeline(GLuint pipeline)
>     return (getProgramPipeline(pipeline) ? GL_TRUE : GL_FALSE);
> }
> 
>+void Context::finishFenceNV(GLuint fence)
>+{
>+    FenceNV *fenceObject = getFenceNV(fence);
>+
>+    ASSERT(fenceObject && fenceObject->isSet());
>+    ANGLE_CONTEXT_TRY(fenceObject->finish(this));
>+}
>+
>+void Context::getFenceivNV(GLuint fence, GLenum pname, GLint *params)
>+{
>+    FenceNV *fenceObject = getFenceNV(fence);
>+
>+    ASSERT(fenceObject && fenceObject->isSet());
>+
>+    switch (pname)
>+    {
>+        case GL_FENCE_STATUS_NV:
>+        {
>+            // GL_NV_fence spec:
>+            // Once the status of a fence has been finished (via FinishFenceNV) or tested and
>+            // the returned status is TRUE (via either TestFenceNV or GetFenceivNV querying the
>+            // FENCE_STATUS_NV), the status remains TRUE until the next SetFenceNV of the fence.
>+            GLboolean status = GL_TRUE;
>+            if (fenceObject->getStatus() != GL_TRUE)
>+            {
>+                ANGLE_CONTEXT_TRY(fenceObject->test(this, &status));
>+            }
>+            *params = status;
>+            break;
>+        }
>+
>+        case GL_FENCE_CONDITION_NV:
>+        {
>+            *params = static_cast<GLint>(fenceObject->getCondition());
>+            break;
>+        }
>+
>+        default:
>+            UNREACHABLE();
>+    }
>+}
>+
>+void Context::getTranslatedShaderSource(GLuint shader,
>+                                        GLsizei bufsize,
>+                                        GLsizei *length,
>+                                        GLchar *source)
>+{
>+    Shader *shaderObject = getShader(shader);
>+    ASSERT(shaderObject);
>+    shaderObject->getTranslatedSourceWithDebugInfo(bufsize, length, source);
>+}
>+
>+void Context::getnUniformfv(GLuint program, GLint location, GLsizei bufSize, GLfloat *params)
>+{
>+    Program *programObject = getProgramResolveLink(program);
>+    ASSERT(programObject);
>+
>+    programObject->getUniformfv(this, location, params);
>+}
>+
>+void Context::getnUniformfvRobust(GLuint program,
>+                                  GLint location,
>+                                  GLsizei bufSize,
>+                                  GLsizei *length,
>+                                  GLfloat *params)
>+{
>+    UNIMPLEMENTED();
>+}
>+
>+void Context::getnUniformiv(GLuint program, GLint location, GLsizei bufSize, GLint *params)
>+{
>+    Program *programObject = getProgramResolveLink(program);
>+    ASSERT(programObject);
>+
>+    programObject->getUniformiv(this, location, params);
>+}
>+
>+void Context::getnUniformivRobust(GLuint program,
>+                                  GLint location,
>+                                  GLsizei bufSize,
>+                                  GLsizei *length,
>+                                  GLint *params)
>+{
>+    UNIMPLEMENTED();
>+}
>+
>+void Context::getnUniformuivRobust(GLuint program,
>+                                   GLint location,
>+                                   GLsizei bufSize,
>+                                   GLsizei *length,
>+                                   GLuint *params)
>+{
>+    UNIMPLEMENTED();
>+}
>+
>+GLboolean Context::isFenceNV(GLuint fence)
>+{
>+    FenceNV *fenceObject = getFenceNV(fence);
>+
>+    if (fenceObject == nullptr)
>+    {
>+        return GL_FALSE;
>+    }
>+
>+    // GL_NV_fence spec:
>+    // A name returned by GenFencesNV, but not yet set via SetFenceNV, is not the name of an
>+    // existing fence.
>+    return fenceObject->isSet();
>+}
>+
>+void Context::readnPixels(GLint x,
>+                          GLint y,
>+                          GLsizei width,
>+                          GLsizei height,
>+                          GLenum format,
>+                          GLenum type,
>+                          GLsizei bufSize,
>+                          void *data)
>+{
>+    return readPixels(x, y, width, height, format, type, data);
>+}
>+
>+void Context::setFenceNV(GLuint fence, GLenum condition)
>+{
>+    ASSERT(condition == GL_ALL_COMPLETED_NV);
>+
>+    FenceNV *fenceObject = getFenceNV(fence);
>+    ASSERT(fenceObject != nullptr);
>+    ANGLE_CONTEXT_TRY(fenceObject->set(this, condition));
>+}
>+
>+GLboolean Context::testFenceNV(GLuint fence)
>+{
>+    FenceNV *fenceObject = getFenceNV(fence);
>+
>+    ASSERT(fenceObject != nullptr);
>+    ASSERT(fenceObject->isSet() == GL_TRUE);
>+
>+    GLboolean result = GL_TRUE;
>+    if (fenceObject->test(this, &result) == angle::Result::Stop)
>+    {
>+        return GL_TRUE;
>+    }
>+
>+    return result;
>+}
>+
>+void Context::deleteMemoryObjects(GLsizei n, const GLuint *memoryObjects)
>+{
>+    for (int i = 0; i < n; i++)
>+    {
>+        deleteMemoryObject(memoryObjects[i]);
>+    }
>+}
>+
>+GLboolean Context::isMemoryObject(GLuint memoryObject)
>+{
>+    if (memoryObject == 0)
>+    {
>+        return GL_FALSE;
>+    }
>+
>+    return (getMemoryObject(memoryObject) ? GL_TRUE : GL_FALSE);
>+}
>+
>+void Context::createMemoryObjects(GLsizei n, GLuint *memoryObjects)
>+{
>+    for (int i = 0; i < n; i++)
>+    {
>+        memoryObjects[i] = createMemoryObject();
>+    }
>+}
>+
>+void Context::memoryObjectParameteriv(GLuint memoryObject, GLenum pname, const GLint *params)
>+{
>+    UNIMPLEMENTED();
>+}
>+
>+void Context::getMemoryObjectParameteriv(GLuint memoryObject, GLenum pname, GLint *params)
>+{
>+    UNIMPLEMENTED();
>+}
>+
>+void Context::texStorageMem2D(TextureType target,
>+                              GLsizei levels,
>+                              GLenum internalFormat,
>+                              GLsizei width,
>+                              GLsizei height,
>+                              GLuint memory,
>+                              GLuint64 offset)
>+{
>+    MemoryObject *memoryObject = getMemoryObject(memory);
>+    ASSERT(memoryObject);
>+    Extents size(width, height, 1);
>+    Texture *texture = getTextureByType(target);
>+    ANGLE_CONTEXT_TRY(texture->setStorageExternalMemory(this, target, levels, internalFormat, size,
>+                                                        memoryObject, offset));
>+}
>+
>+void Context::texStorageMem2DMultisample(TextureType target,
>+                                         GLsizei samples,
>+                                         GLenum internalFormat,
>+                                         GLsizei width,
>+                                         GLsizei height,
>+                                         GLboolean fixedSampleLocations,
>+                                         GLuint memory,
>+                                         GLuint64 offset)
>+{
>+    UNIMPLEMENTED();
>+}
>+
>+void Context::texStorageMem3D(TextureType target,
>+                              GLsizei levels,
>+                              GLenum internalFormat,
>+                              GLsizei width,
>+                              GLsizei height,
>+                              GLsizei depth,
>+                              GLuint memory,
>+                              GLuint64 offset)
>+{
>+    UNIMPLEMENTED();
>+}
>+
>+void Context::texStorageMem3DMultisample(TextureType target,
>+                                         GLsizei samples,
>+                                         GLenum internalFormat,
>+                                         GLsizei width,
>+                                         GLsizei height,
>+                                         GLsizei depth,
>+                                         GLboolean fixedSampleLocations,
>+                                         GLuint memory,
>+                                         GLuint64 offset)
>+{
>+    UNIMPLEMENTED();
>+}
>+
>+void Context::bufferStorageMem(TextureType target, GLsizeiptr size, GLuint memory, GLuint64 offset)
>+{
>+    UNIMPLEMENTED();
>+}
>+
>+void Context::importMemoryFd(GLuint memory, GLuint64 size, HandleType handleType, GLint fd)
>+{
>+    MemoryObject *memoryObject = getMemoryObject(memory);
>+    ASSERT(memoryObject != nullptr);
>+    ANGLE_CONTEXT_TRY(memoryObject->importFd(this, size, handleType, fd));
>+}
>+
>+void Context::genSemaphores(GLsizei n, GLuint *semaphores)
>+{
>+    UNIMPLEMENTED();
>+}
>+
>+void Context::deleteSemaphores(GLsizei n, const GLuint *semaphores)
>+{
>+    UNIMPLEMENTED();
>+}
>+
>+GLboolean Context::isSemaphore(GLuint semaphore)
>+{
>+    UNIMPLEMENTED();
>+    return GL_FALSE;
>+}
>+
>+void Context::semaphoreParameterui64v(GLuint semaphore, GLenum pname, const GLuint64 *params)
>+{
>+    UNIMPLEMENTED();
>+}
>+
>+void Context::getSemaphoreParameterui64v(GLuint semaphore, GLenum pname, GLuint64 *params)
>+{
>+    UNIMPLEMENTED();
>+}
>+
>+void Context::waitSemaphore(GLuint semaphore,
>+                            GLuint numBufferBarriers,
>+                            const GLuint *buffers,
>+                            GLuint numTextureBarriers,
>+                            const GLuint *textures,
>+                            const GLenum *srcLayouts)
>+{
>+    UNIMPLEMENTED();
>+}
>+
>+void Context::signalSemaphore(GLuint semaphore,
>+                              GLuint numBufferBarriers,
>+                              const GLuint *buffers,
>+                              GLuint numTextureBarriers,
>+                              const GLuint *textures,
>+                              const GLenum *dstLayouts)
>+{
>+    UNIMPLEMENTED();
>+}
>+
>+void Context::importSemaphoreFd(GLuint semaphore, HandleType handleType, GLint fd)
>+{
>+    UNIMPLEMENTED();
>+}
>+
>+void Context::eGLImageTargetTexture2D(TextureType target, GLeglImageOES image)
>+{
>+    Texture *texture        = getTextureByType(target);
>+    egl::Image *imageObject = static_cast<egl::Image *>(image);
>+    ANGLE_CONTEXT_TRY(texture->setEGLImageTarget(this, target, imageObject));
>+}
>+
>+void Context::eGLImageTargetRenderbufferStorage(GLenum target, GLeglImageOES image)
>+{
>+    Renderbuffer *renderbuffer = mState.getCurrentRenderbuffer();
>+    egl::Image *imageObject    = static_cast<egl::Image *>(image);
>+    ANGLE_CONTEXT_TRY(renderbuffer->setStorageEGLImageTarget(this, imageObject));
>+}
>+
>+void Context::texStorage1D(GLenum target, GLsizei levels, GLenum internalformat, GLsizei width)
>+{
>+    UNIMPLEMENTED();
>+}
>+
>+bool Context::getQueryParameterInfo(GLenum pname, GLenum *type, unsigned int *numParams)
>+{
>+    // Please note: the query type returned for DEPTH_CLEAR_VALUE in this implementation
>+    // is FLOAT rather than INT, as would be suggested by the GL ES 2.0 spec. This is due
>+    // to the fact that it is stored internally as a float, and so would require conversion
>+    // if returned from Context::getIntegerv. Since this conversion is already implemented
>+    // in the case that one calls glGetIntegerv to retrieve a float-typed state variable, we
>+    // place DEPTH_CLEAR_VALUE with the floats. This should make no difference to the calling
>+    // application.
>+    switch (pname)
>+    {
>+        case GL_COMPRESSED_TEXTURE_FORMATS:
>+        {
>+            *type      = GL_INT;
>+            *numParams = static_cast<unsigned int>(getCaps().compressedTextureFormats.size());
>+            return true;
>+        }
>+        case GL_SHADER_BINARY_FORMATS:
>+        {
>+            *type      = GL_INT;
>+            *numParams = static_cast<unsigned int>(getCaps().shaderBinaryFormats.size());
>+            return true;
>+        }
>+
>+        case GL_MAX_VERTEX_ATTRIBS:
>+        case GL_MAX_VERTEX_UNIFORM_VECTORS:
>+        case GL_MAX_VARYING_VECTORS:
>+        case GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS:
>+        case GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS:
>+        case GL_MAX_TEXTURE_IMAGE_UNITS:
>+        case GL_MAX_FRAGMENT_UNIFORM_VECTORS:
>+        case GL_MAX_RENDERBUFFER_SIZE:
>+        case GL_NUM_SHADER_BINARY_FORMATS:
>+        case GL_NUM_COMPRESSED_TEXTURE_FORMATS:
>+        case GL_ARRAY_BUFFER_BINDING:
>+        case GL_FRAMEBUFFER_BINDING:  // GL_FRAMEBUFFER_BINDING now equivalent to
>+                                      // GL_DRAW_FRAMEBUFFER_BINDING_ANGLE
>+        case GL_RENDERBUFFER_BINDING:
>+        case GL_CURRENT_PROGRAM:
>+        case GL_PACK_ALIGNMENT:
>+        case GL_UNPACK_ALIGNMENT:
>+        case GL_GENERATE_MIPMAP_HINT:
>+        case GL_RED_BITS:
>+        case GL_GREEN_BITS:
>+        case GL_BLUE_BITS:
>+        case GL_ALPHA_BITS:
>+        case GL_DEPTH_BITS:
>+        case GL_STENCIL_BITS:
>+        case GL_ELEMENT_ARRAY_BUFFER_BINDING:
>+        case GL_CULL_FACE_MODE:
>+        case GL_FRONT_FACE:
>+        case GL_ACTIVE_TEXTURE:
>+        case GL_STENCIL_FUNC:
>+        case GL_STENCIL_VALUE_MASK:
>+        case GL_STENCIL_REF:
>+        case GL_STENCIL_FAIL:
>+        case GL_STENCIL_PASS_DEPTH_FAIL:
>+        case GL_STENCIL_PASS_DEPTH_PASS:
>+        case GL_STENCIL_BACK_FUNC:
>+        case GL_STENCIL_BACK_VALUE_MASK:
>+        case GL_STENCIL_BACK_REF:
>+        case GL_STENCIL_BACK_FAIL:
>+        case GL_STENCIL_BACK_PASS_DEPTH_FAIL:
>+        case GL_STENCIL_BACK_PASS_DEPTH_PASS:
>+        case GL_DEPTH_FUNC:
>+        case GL_BLEND_SRC_RGB:
>+        case GL_BLEND_SRC_ALPHA:
>+        case GL_BLEND_DST_RGB:
>+        case GL_BLEND_DST_ALPHA:
>+        case GL_BLEND_EQUATION_RGB:
>+        case GL_BLEND_EQUATION_ALPHA:
>+        case GL_STENCIL_WRITEMASK:
>+        case GL_STENCIL_BACK_WRITEMASK:
>+        case GL_STENCIL_CLEAR_VALUE:
>+        case GL_SUBPIXEL_BITS:
>+        case GL_MAX_TEXTURE_SIZE:
>+        case GL_MAX_CUBE_MAP_TEXTURE_SIZE:
>+        case GL_SAMPLE_BUFFERS:
>+        case GL_SAMPLES:
>+        case GL_IMPLEMENTATION_COLOR_READ_TYPE:
>+        case GL_IMPLEMENTATION_COLOR_READ_FORMAT:
>+        case GL_TEXTURE_BINDING_2D:
>+        case GL_TEXTURE_BINDING_CUBE_MAP:
>+        case GL_RESET_NOTIFICATION_STRATEGY_EXT:
>+        {
>+            *type      = GL_INT;
>+            *numParams = 1;
>+            return true;
>+        }
>+        case GL_PACK_REVERSE_ROW_ORDER_ANGLE:
>+        {
>+            if (!getExtensions().packReverseRowOrder)
>+            {
>+                return false;
>+            }
>+            *type      = GL_INT;
>+            *numParams = 1;
>+            return true;
>+        }
>+        case GL_MAX_RECTANGLE_TEXTURE_SIZE_ANGLE:
>+        case GL_TEXTURE_BINDING_RECTANGLE_ANGLE:
>+        {
>+            if (!getExtensions().textureRectangle)
>+            {
>+                return false;
>+            }
>+            *type      = GL_INT;
>+            *numParams = 1;
>+            return true;
>+        }
>+        case GL_MAX_DRAW_BUFFERS_EXT:
>+        case GL_MAX_COLOR_ATTACHMENTS_EXT:
>+        {
>+            if ((getClientMajorVersion() < 3) && !getExtensions().drawBuffers)
>+            {
>+                return false;
>+            }
>+            *type      = GL_INT;
>+            *numParams = 1;
>+            return true;
>+        }
>+        case GL_MAX_VIEWPORT_DIMS:
>+        {
>+            *type      = GL_INT;
>+            *numParams = 2;
>+            return true;
>+        }
>+        case GL_VIEWPORT:
>+        case GL_SCISSOR_BOX:
>+        {
>+            *type      = GL_INT;
>+            *numParams = 4;
>+            return true;
>+        }
>+        case GL_SHADER_COMPILER:
>+        case GL_SAMPLE_COVERAGE_INVERT:
>+        case GL_DEPTH_WRITEMASK:
>+        case GL_CULL_FACE:                 // CULL_FACE through DITHER are natural to IsEnabled,
>+        case GL_POLYGON_OFFSET_FILL:       // but can be retrieved through the Get{Type}v queries.
>+        case GL_SAMPLE_ALPHA_TO_COVERAGE:  // For this purpose, they are treated here as
>+                                           // bool-natural
>+        case GL_SAMPLE_COVERAGE:
>+        case GL_SCISSOR_TEST:
>+        case GL_STENCIL_TEST:
>+        case GL_DEPTH_TEST:
>+        case GL_BLEND:
>+        case GL_DITHER:
>+        case GL_CONTEXT_ROBUST_ACCESS_EXT:
>+        {
>+            *type      = GL_BOOL;
>+            *numParams = 1;
>+            return true;
>+        }
>+        case GL_COLOR_WRITEMASK:
>+        {
>+            *type      = GL_BOOL;
>+            *numParams = 4;
>+            return true;
>+        }
>+        case GL_POLYGON_OFFSET_FACTOR:
>+        case GL_POLYGON_OFFSET_UNITS:
>+        case GL_SAMPLE_COVERAGE_VALUE:
>+        case GL_DEPTH_CLEAR_VALUE:
>+        case GL_LINE_WIDTH:
>+        {
>+            *type      = GL_FLOAT;
>+            *numParams = 1;
>+            return true;
>+        }
>+        case GL_ALIASED_LINE_WIDTH_RANGE:
>+        case GL_ALIASED_POINT_SIZE_RANGE:
>+        case GL_DEPTH_RANGE:
>+        {
>+            *type      = GL_FLOAT;
>+            *numParams = 2;
>+            return true;
>+        }
>+        case GL_COLOR_CLEAR_VALUE:
>+        case GL_BLEND_COLOR:
>+        {
>+            *type      = GL_FLOAT;
>+            *numParams = 4;
>+            return true;
>+        }
>+        case GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT:
>+            if (!getExtensions().textureFilterAnisotropic)
>+            {
>+                return false;
>+            }
>+            *type      = GL_FLOAT;
>+            *numParams = 1;
>+            return true;
>+        case GL_TIMESTAMP_EXT:
>+            if (!getExtensions().disjointTimerQuery)
>+            {
>+                return false;
>+            }
>+            *type      = GL_INT_64_ANGLEX;
>+            *numParams = 1;
>+            return true;
>+        case GL_GPU_DISJOINT_EXT:
>+            if (!getExtensions().disjointTimerQuery)
>+            {
>+                return false;
>+            }
>+            *type      = GL_INT;
>+            *numParams = 1;
>+            return true;
>+        case GL_COVERAGE_MODULATION_CHROMIUM:
>+            if (!getExtensions().framebufferMixedSamples)
>+            {
>+                return false;
>+            }
>+            *type      = GL_INT;
>+            *numParams = 1;
>+            return true;
>+        case GL_TEXTURE_BINDING_EXTERNAL_OES:
>+            if (!getExtensions().eglStreamConsumerExternal && !getExtensions().eglImageExternal)
>+            {
>+                return false;
>+            }
>+            *type      = GL_INT;
>+            *numParams = 1;
>+            return true;
>+    }
>+
>+    if (getExtensions().debug)
>+    {
>+        switch (pname)
>+        {
>+            case GL_DEBUG_LOGGED_MESSAGES:
>+            case GL_DEBUG_NEXT_LOGGED_MESSAGE_LENGTH:
>+            case GL_DEBUG_GROUP_STACK_DEPTH:
>+            case GL_MAX_DEBUG_MESSAGE_LENGTH:
>+            case GL_MAX_DEBUG_LOGGED_MESSAGES:
>+            case GL_MAX_DEBUG_GROUP_STACK_DEPTH:
>+            case GL_MAX_LABEL_LENGTH:
>+                *type      = GL_INT;
>+                *numParams = 1;
>+                return true;
>+
>+            case GL_DEBUG_OUTPUT_SYNCHRONOUS:
>+            case GL_DEBUG_OUTPUT:
>+                *type      = GL_BOOL;
>+                *numParams = 1;
>+                return true;
>+        }
>+    }
>+
>+    if (getExtensions().multisampleCompatibility)
>+    {
>+        switch (pname)
>+        {
>+            case GL_MULTISAMPLE_EXT:
>+            case GL_SAMPLE_ALPHA_TO_ONE_EXT:
>+                *type      = GL_BOOL;
>+                *numParams = 1;
>+                return true;
>+        }
>+    }
>+
>+    if (getExtensions().pathRendering)
>+    {
>+        switch (pname)
>+        {
>+            case GL_PATH_MODELVIEW_MATRIX_CHROMIUM:
>+            case GL_PATH_PROJECTION_MATRIX_CHROMIUM:
>+                *type      = GL_FLOAT;
>+                *numParams = 16;
>+                return true;
>+        }
>+    }
>+
>+    if (getExtensions().bindGeneratesResource)
>+    {
>+        switch (pname)
>+        {
>+            case GL_BIND_GENERATES_RESOURCE_CHROMIUM:
>+                *type      = GL_BOOL;
>+                *numParams = 1;
>+                return true;
>+        }
>+    }
>+
>+    if (getExtensions().clientArrays)
>+    {
>+        switch (pname)
>+        {
>+            case GL_CLIENT_ARRAYS_ANGLE:
>+                *type      = GL_BOOL;
>+                *numParams = 1;
>+                return true;
>+        }
>+    }
>+
>+    if (getExtensions().sRGBWriteControl)
>+    {
>+        switch (pname)
>+        {
>+            case GL_FRAMEBUFFER_SRGB_EXT:
>+                *type      = GL_BOOL;
>+                *numParams = 1;
>+                return true;
>+        }
>+    }
>+
>+    if (getExtensions().robustResourceInitialization &&
>+        pname == GL_ROBUST_RESOURCE_INITIALIZATION_ANGLE)
>+    {
>+        *type      = GL_BOOL;
>+        *numParams = 1;
>+        return true;
>+    }
>+
>+    if (getExtensions().programCacheControl && pname == GL_PROGRAM_CACHE_ENABLED_ANGLE)
>+    {
>+        *type      = GL_BOOL;
>+        *numParams = 1;
>+        return true;
>+    }
>+
>+    if (getExtensions().parallelShaderCompile && pname == GL_MAX_SHADER_COMPILER_THREADS_KHR)
>+    {
>+        *type      = GL_INT;
>+        *numParams = 1;
>+        return true;
>+    }
>+
>+    if (getExtensions().blendFuncExtended && pname == GL_MAX_DUAL_SOURCE_DRAW_BUFFERS_EXT)
>+    {
>+        *type      = GL_INT;
>+        *numParams = 1;
>+        return true;
>+    }
>+
>+    // Check for ES3.0+ parameter names which are also exposed as ES2 extensions
>+    switch (pname)
>+    {
>+        // GL_DRAW_FRAMEBUFFER_BINDING_ANGLE equivalent to FRAMEBUFFER_BINDING
>+        case GL_READ_FRAMEBUFFER_BINDING_ANGLE:
>+            if ((getClientMajorVersion() < 3) && !getExtensions().framebufferBlit)
>+            {
>+                return false;
>+            }
>+            *type      = GL_INT;
>+            *numParams = 1;
>+            return true;
>+
>+        case GL_NUM_PROGRAM_BINARY_FORMATS_OES:
>+            if ((getClientMajorVersion() < 3) && !getExtensions().getProgramBinary)
>+            {
>+                return false;
>+            }
>+            *type      = GL_INT;
>+            *numParams = 1;
>+            return true;
>+
>+        case GL_PROGRAM_BINARY_FORMATS_OES:
>+            if ((getClientMajorVersion() < 3) && !getExtensions().getProgramBinary)
>+            {
>+                return false;
>+            }
>+            *type      = GL_INT;
>+            *numParams = static_cast<unsigned int>(getCaps().programBinaryFormats.size());
>+            return true;
>+
>+        case GL_PACK_ROW_LENGTH:
>+        case GL_PACK_SKIP_ROWS:
>+        case GL_PACK_SKIP_PIXELS:
>+            if ((getClientMajorVersion() < 3) && !getExtensions().packSubimage)
>+            {
>+                return false;
>+            }
>+            *type      = GL_INT;
>+            *numParams = 1;
>+            return true;
>+        case GL_UNPACK_ROW_LENGTH:
>+        case GL_UNPACK_SKIP_ROWS:
>+        case GL_UNPACK_SKIP_PIXELS:
>+            if ((getClientMajorVersion() < 3) && !getExtensions().unpackSubimage)
>+            {
>+                return false;
>+            }
>+            *type      = GL_INT;
>+            *numParams = 1;
>+            return true;
>+        case GL_VERTEX_ARRAY_BINDING:
>+            if ((getClientMajorVersion() < 3) && !getExtensions().vertexArrayObject)
>+            {
>+                return false;
>+            }
>+            *type      = GL_INT;
>+            *numParams = 1;
>+            return true;
>+        case GL_PIXEL_PACK_BUFFER_BINDING:
>+        case GL_PIXEL_UNPACK_BUFFER_BINDING:
>+            if ((getClientMajorVersion() < 3) && !getExtensions().pixelBufferObject)
>+            {
>+                return false;
>+            }
>+            *type      = GL_INT;
>+            *numParams = 1;
>+            return true;
>+        case GL_MAX_SAMPLES:
>+        {
>+            static_assert(GL_MAX_SAMPLES_ANGLE == GL_MAX_SAMPLES,
>+                          "GL_MAX_SAMPLES_ANGLE not equal to GL_MAX_SAMPLES");
>+            if ((getClientMajorVersion() < 3) && !getExtensions().framebufferMultisample)
>+            {
>+                return false;
>+            }
>+            *type      = GL_INT;
>+            *numParams = 1;
>+            return true;
>+
>+            case GL_FRAGMENT_SHADER_DERIVATIVE_HINT:
>+                if ((getClientMajorVersion() < 3) && !getExtensions().standardDerivatives)
>+                {
>+                    return false;
>+                }
>+                *type      = GL_INT;
>+                *numParams = 1;
>+                return true;
>+        }
>+    }
>+
>+    if (pname >= GL_DRAW_BUFFER0_EXT && pname <= GL_DRAW_BUFFER15_EXT)
>+    {
>+        if ((getClientVersion() < Version(3, 0)) && !getExtensions().drawBuffers)
>+        {
>+            return false;
>+        }
>+        *type      = GL_INT;
>+        *numParams = 1;
>+        return true;
>+    }
>+
>+    if (getExtensions().multiview2 && pname == GL_MAX_VIEWS_OVR)
>+    {
>+        *type      = GL_INT;
>+        *numParams = 1;
>+        return true;
>+    }
>+
>+    if (getClientVersion() < Version(2, 0))
>+    {
>+        switch (pname)
>+        {
>+            case GL_ALPHA_TEST_FUNC:
>+            case GL_CLIENT_ACTIVE_TEXTURE:
>+            case GL_MATRIX_MODE:
>+            case GL_MAX_TEXTURE_UNITS:
>+            case GL_MAX_MODELVIEW_STACK_DEPTH:
>+            case GL_MAX_PROJECTION_STACK_DEPTH:
>+            case GL_MAX_TEXTURE_STACK_DEPTH:
>+            case GL_MAX_LIGHTS:
>+            case GL_MAX_CLIP_PLANES:
>+            case GL_VERTEX_ARRAY_STRIDE:
>+            case GL_NORMAL_ARRAY_STRIDE:
>+            case GL_COLOR_ARRAY_STRIDE:
>+            case GL_TEXTURE_COORD_ARRAY_STRIDE:
>+            case GL_VERTEX_ARRAY_SIZE:
>+            case GL_COLOR_ARRAY_SIZE:
>+            case GL_TEXTURE_COORD_ARRAY_SIZE:
>+            case GL_VERTEX_ARRAY_TYPE:
>+            case GL_NORMAL_ARRAY_TYPE:
>+            case GL_COLOR_ARRAY_TYPE:
>+            case GL_TEXTURE_COORD_ARRAY_TYPE:
>+            case GL_VERTEX_ARRAY_BUFFER_BINDING:
>+            case GL_NORMAL_ARRAY_BUFFER_BINDING:
>+            case GL_COLOR_ARRAY_BUFFER_BINDING:
>+            case GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING:
>+            case GL_POINT_SIZE_ARRAY_STRIDE_OES:
>+            case GL_POINT_SIZE_ARRAY_TYPE_OES:
>+            case GL_POINT_SIZE_ARRAY_BUFFER_BINDING_OES:
>+            case GL_SHADE_MODEL:
>+            case GL_MODELVIEW_STACK_DEPTH:
>+            case GL_PROJECTION_STACK_DEPTH:
>+            case GL_TEXTURE_STACK_DEPTH:
>+            case GL_LOGIC_OP_MODE:
>+            case GL_BLEND_SRC:
>+            case GL_BLEND_DST:
>+            case GL_PERSPECTIVE_CORRECTION_HINT:
>+            case GL_POINT_SMOOTH_HINT:
>+            case GL_LINE_SMOOTH_HINT:
>+            case GL_FOG_HINT:
>+                *type      = GL_INT;
>+                *numParams = 1;
>+                return true;
>+            case GL_ALPHA_TEST_REF:
>+            case GL_FOG_DENSITY:
>+            case GL_FOG_START:
>+            case GL_FOG_END:
>+            case GL_FOG_MODE:
>+            case GL_POINT_SIZE:
>+            case GL_POINT_SIZE_MIN:
>+            case GL_POINT_SIZE_MAX:
>+            case GL_POINT_FADE_THRESHOLD_SIZE:
>+                *type      = GL_FLOAT;
>+                *numParams = 1;
>+                return true;
>+            case GL_SMOOTH_POINT_SIZE_RANGE:
>+            case GL_SMOOTH_LINE_WIDTH_RANGE:
>+                *type      = GL_FLOAT;
>+                *numParams = 2;
>+                return true;
>+            case GL_CURRENT_COLOR:
>+            case GL_CURRENT_TEXTURE_COORDS:
>+            case GL_LIGHT_MODEL_AMBIENT:
>+            case GL_FOG_COLOR:
>+                *type      = GL_FLOAT;
>+                *numParams = 4;
>+                return true;
>+            case GL_CURRENT_NORMAL:
>+            case GL_POINT_DISTANCE_ATTENUATION:
>+                *type      = GL_FLOAT;
>+                *numParams = 3;
>+                return true;
>+            case GL_MODELVIEW_MATRIX:
>+            case GL_PROJECTION_MATRIX:
>+            case GL_TEXTURE_MATRIX:
>+                *type      = GL_FLOAT;
>+                *numParams = 16;
>+                return true;
>+            case GL_LIGHT_MODEL_TWO_SIDE:
>+                *type      = GL_BOOL;
>+                *numParams = 1;
>+                return true;
>+        }
>+    }
>+
>+    if (getClientVersion() < Version(3, 0))
>+    {
>+        return false;
>+    }
>+
>+    // Check for ES3.0+ parameter names
>+    switch (pname)
>+    {
>+        case GL_MAX_UNIFORM_BUFFER_BINDINGS:
>+        case GL_UNIFORM_BUFFER_OFFSET_ALIGNMENT:
>+        case GL_UNIFORM_BUFFER_BINDING:
>+        case GL_TRANSFORM_FEEDBACK_BINDING:
>+        case GL_TRANSFORM_FEEDBACK_BUFFER_BINDING:
>+        case GL_COPY_READ_BUFFER_BINDING:
>+        case GL_COPY_WRITE_BUFFER_BINDING:
>+        case GL_SAMPLER_BINDING:
>+        case GL_READ_BUFFER:
>+        case GL_TEXTURE_BINDING_3D:
>+        case GL_TEXTURE_BINDING_2D_ARRAY:
>+        case GL_MAX_3D_TEXTURE_SIZE:
>+        case GL_MAX_ARRAY_TEXTURE_LAYERS:
>+        case GL_MAX_VERTEX_UNIFORM_BLOCKS:
>+        case GL_MAX_FRAGMENT_UNIFORM_BLOCKS:
>+        case GL_MAX_COMBINED_UNIFORM_BLOCKS:
>+        case GL_MAX_VERTEX_OUTPUT_COMPONENTS:
>+        case GL_MAX_FRAGMENT_INPUT_COMPONENTS:
>+        case GL_MAX_VARYING_COMPONENTS:
>+        case GL_MAX_VERTEX_UNIFORM_COMPONENTS:
>+        case GL_MAX_FRAGMENT_UNIFORM_COMPONENTS:
>+        case GL_MIN_PROGRAM_TEXEL_OFFSET:
>+        case GL_MAX_PROGRAM_TEXEL_OFFSET:
>+        case GL_NUM_EXTENSIONS:
>+        case GL_MAJOR_VERSION:
>+        case GL_MINOR_VERSION:
>+        case GL_MAX_ELEMENTS_INDICES:
>+        case GL_MAX_ELEMENTS_VERTICES:
>+        case GL_MAX_TRANSFORM_FEEDBACK_INTERLEAVED_COMPONENTS:
>+        case GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_ATTRIBS:
>+        case GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_COMPONENTS:
>+        case GL_UNPACK_IMAGE_HEIGHT:
>+        case GL_UNPACK_SKIP_IMAGES:
>+        {
>+            *type      = GL_INT;
>+            *numParams = 1;
>+            return true;
>+        }
>+
>+        case GL_MAX_ELEMENT_INDEX:
>+        case GL_MAX_UNIFORM_BLOCK_SIZE:
>+        case GL_MAX_COMBINED_VERTEX_UNIFORM_COMPONENTS:
>+        case GL_MAX_COMBINED_FRAGMENT_UNIFORM_COMPONENTS:
>+        case GL_MAX_SERVER_WAIT_TIMEOUT:
>+        {
>+            *type      = GL_INT_64_ANGLEX;
>+            *numParams = 1;
>+            return true;
>+        }
>+
>+        case GL_TRANSFORM_FEEDBACK_ACTIVE:
>+        case GL_TRANSFORM_FEEDBACK_PAUSED:
>+        case GL_PRIMITIVE_RESTART_FIXED_INDEX:
>+        case GL_RASTERIZER_DISCARD:
>+        {
>+            *type      = GL_BOOL;
>+            *numParams = 1;
>+            return true;
>+        }
>+
>+        case GL_MAX_TEXTURE_LOD_BIAS:
>+        {
>+            *type      = GL_FLOAT;
>+            *numParams = 1;
>+            return true;
>+        }
>+    }
>+
>+    if (getExtensions().requestExtension)
>+    {
>+        switch (pname)
>+        {
>+            case GL_NUM_REQUESTABLE_EXTENSIONS_ANGLE:
>+                *type      = GL_INT;
>+                *numParams = 1;
>+                return true;
>+        }
>+    }
>+
>+    if (getExtensions().textureMultisample)
>+    {
>+        switch (pname)
>+        {
>+            case GL_MAX_COLOR_TEXTURE_SAMPLES_ANGLE:
>+            case GL_MAX_INTEGER_SAMPLES_ANGLE:
>+            case GL_MAX_DEPTH_TEXTURE_SAMPLES_ANGLE:
>+            case GL_TEXTURE_BINDING_2D_MULTISAMPLE_ANGLE:
>+            case GL_MAX_SAMPLE_MASK_WORDS:
>+                *type      = GL_INT;
>+                *numParams = 1;
>+                return true;
>+        }
>+    }
>+
>+    if (getClientVersion() < Version(3, 1))
>+    {
>+        return false;
>+    }
>+
>+    switch (pname)
>+    {
>+        case GL_ATOMIC_COUNTER_BUFFER_BINDING:
>+        case GL_DRAW_INDIRECT_BUFFER_BINDING:
>+        case GL_DISPATCH_INDIRECT_BUFFER_BINDING:
>+        case GL_MAX_FRAMEBUFFER_WIDTH:
>+        case GL_MAX_FRAMEBUFFER_HEIGHT:
>+        case GL_MAX_FRAMEBUFFER_SAMPLES:
>+        case GL_MAX_SAMPLE_MASK_WORDS:
>+        case GL_MAX_COLOR_TEXTURE_SAMPLES:
>+        case GL_MAX_DEPTH_TEXTURE_SAMPLES:
>+        case GL_MAX_INTEGER_SAMPLES:
>+        case GL_MAX_VERTEX_ATTRIB_RELATIVE_OFFSET:
>+        case GL_MAX_VERTEX_ATTRIB_BINDINGS:
>+        case GL_MAX_VERTEX_ATTRIB_STRIDE:
>+        case GL_MAX_VERTEX_ATOMIC_COUNTER_BUFFERS:
>+        case GL_MAX_VERTEX_ATOMIC_COUNTERS:
>+        case GL_MAX_VERTEX_IMAGE_UNIFORMS:
>+        case GL_MAX_VERTEX_SHADER_STORAGE_BLOCKS:
>+        case GL_MAX_FRAGMENT_ATOMIC_COUNTER_BUFFERS:
>+        case GL_MAX_FRAGMENT_ATOMIC_COUNTERS:
>+        case GL_MAX_FRAGMENT_IMAGE_UNIFORMS:
>+        case GL_MAX_FRAGMENT_SHADER_STORAGE_BLOCKS:
>+        case GL_MIN_PROGRAM_TEXTURE_GATHER_OFFSET:
>+        case GL_MAX_PROGRAM_TEXTURE_GATHER_OFFSET:
>+        case GL_MAX_COMPUTE_WORK_GROUP_INVOCATIONS:
>+        case GL_MAX_COMPUTE_UNIFORM_BLOCKS:
>+        case GL_MAX_COMPUTE_TEXTURE_IMAGE_UNITS:
>+        case GL_MAX_COMPUTE_SHARED_MEMORY_SIZE:
>+        case GL_MAX_COMPUTE_UNIFORM_COMPONENTS:
>+        case GL_MAX_COMPUTE_ATOMIC_COUNTER_BUFFERS:
>+        case GL_MAX_COMPUTE_ATOMIC_COUNTERS:
>+        case GL_MAX_COMPUTE_IMAGE_UNIFORMS:
>+        case GL_MAX_COMBINED_COMPUTE_UNIFORM_COMPONENTS:
>+        case GL_MAX_COMPUTE_SHADER_STORAGE_BLOCKS:
>+        case GL_MAX_COMBINED_SHADER_OUTPUT_RESOURCES:
>+        case GL_MAX_UNIFORM_LOCATIONS:
>+        case GL_MAX_ATOMIC_COUNTER_BUFFER_BINDINGS:
>+        case GL_MAX_ATOMIC_COUNTER_BUFFER_SIZE:
>+        case GL_MAX_COMBINED_ATOMIC_COUNTER_BUFFERS:
>+        case GL_MAX_COMBINED_ATOMIC_COUNTERS:
>+        case GL_MAX_IMAGE_UNITS:
>+        case GL_MAX_COMBINED_IMAGE_UNIFORMS:
>+        case GL_MAX_SHADER_STORAGE_BUFFER_BINDINGS:
>+        case GL_MAX_COMBINED_SHADER_STORAGE_BLOCKS:
>+        case GL_SHADER_STORAGE_BUFFER_BINDING:
>+        case GL_SHADER_STORAGE_BUFFER_OFFSET_ALIGNMENT:
>+        case GL_TEXTURE_BINDING_2D_MULTISAMPLE:
>+        case GL_TEXTURE_BINDING_2D_MULTISAMPLE_ARRAY:
>+            *type      = GL_INT;
>+            *numParams = 1;
>+            return true;
>+        case GL_MAX_SHADER_STORAGE_BLOCK_SIZE:
>+            *type      = GL_INT_64_ANGLEX;
>+            *numParams = 1;
>+            return true;
>+        case GL_SAMPLE_MASK:
>+            *type      = GL_BOOL;
>+            *numParams = 1;
>+            return true;
>+    }
>+
>+    if (getExtensions().geometryShader)
>+    {
>+        switch (pname)
>+        {
>+            case GL_MAX_FRAMEBUFFER_LAYERS_EXT:
>+            case GL_LAYER_PROVOKING_VERTEX_EXT:
>+            case GL_MAX_GEOMETRY_UNIFORM_COMPONENTS_EXT:
>+            case GL_MAX_GEOMETRY_UNIFORM_BLOCKS_EXT:
>+            case GL_MAX_COMBINED_GEOMETRY_UNIFORM_COMPONENTS_EXT:
>+            case GL_MAX_GEOMETRY_INPUT_COMPONENTS_EXT:
>+            case GL_MAX_GEOMETRY_OUTPUT_COMPONENTS_EXT:
>+            case GL_MAX_GEOMETRY_OUTPUT_VERTICES_EXT:
>+            case GL_MAX_GEOMETRY_TOTAL_OUTPUT_COMPONENTS_EXT:
>+            case GL_MAX_GEOMETRY_SHADER_INVOCATIONS_EXT:
>+            case GL_MAX_GEOMETRY_TEXTURE_IMAGE_UNITS_EXT:
>+            case GL_MAX_GEOMETRY_ATOMIC_COUNTER_BUFFERS_EXT:
>+            case GL_MAX_GEOMETRY_ATOMIC_COUNTERS_EXT:
>+            case GL_MAX_GEOMETRY_IMAGE_UNIFORMS_EXT:
>+            case GL_MAX_GEOMETRY_SHADER_STORAGE_BLOCKS_EXT:
>+                *type      = GL_INT;
>+                *numParams = 1;
>+                return true;
>+        }
>+    }
>+
>+    return false;
>+}
>+
>+bool Context::getIndexedQueryParameterInfo(GLenum target, GLenum *type, unsigned int *numParams)
>+{
>+    if (getClientVersion() < Version(3, 0))
>+    {
>+        return false;
>+    }
>+
>+    switch (target)
>+    {
>+        case GL_TRANSFORM_FEEDBACK_BUFFER_BINDING:
>+        case GL_UNIFORM_BUFFER_BINDING:
>+        {
>+            *type      = GL_INT;
>+            *numParams = 1;
>+            return true;
>+        }
>+        case GL_TRANSFORM_FEEDBACK_BUFFER_START:
>+        case GL_TRANSFORM_FEEDBACK_BUFFER_SIZE:
>+        case GL_UNIFORM_BUFFER_START:
>+        case GL_UNIFORM_BUFFER_SIZE:
>+        {
>+            *type      = GL_INT_64_ANGLEX;
>+            *numParams = 1;
>+            return true;
>+        }
>+    }
>+
>+    if (getClientVersion() < Version(3, 1))
>+    {
>+        return false;
>+    }
>+
>+    switch (target)
>+    {
>+        case GL_IMAGE_BINDING_LAYERED:
>+        {
>+            *type      = GL_BOOL;
>+            *numParams = 1;
>+            return true;
>+        }
>+        case GL_MAX_COMPUTE_WORK_GROUP_COUNT:
>+        case GL_MAX_COMPUTE_WORK_GROUP_SIZE:
>+        case GL_ATOMIC_COUNTER_BUFFER_BINDING:
>+        case GL_SHADER_STORAGE_BUFFER_BINDING:
>+        case GL_VERTEX_BINDING_BUFFER:
>+        case GL_VERTEX_BINDING_DIVISOR:
>+        case GL_VERTEX_BINDING_OFFSET:
>+        case GL_VERTEX_BINDING_STRIDE:
>+        case GL_SAMPLE_MASK_VALUE:
>+        case GL_IMAGE_BINDING_NAME:
>+        case GL_IMAGE_BINDING_LEVEL:
>+        case GL_IMAGE_BINDING_LAYER:
>+        case GL_IMAGE_BINDING_ACCESS:
>+        case GL_IMAGE_BINDING_FORMAT:
>+        {
>+            *type      = GL_INT;
>+            *numParams = 1;
>+            return true;
>+        }
>+        case GL_ATOMIC_COUNTER_BUFFER_START:
>+        case GL_ATOMIC_COUNTER_BUFFER_SIZE:
>+        case GL_SHADER_STORAGE_BUFFER_START:
>+        case GL_SHADER_STORAGE_BUFFER_SIZE:
>+        {
>+            *type      = GL_INT_64_ANGLEX;
>+            *numParams = 1;
>+            return true;
>+        }
>+    }
>+
>+    return false;
>+}
>+
>+Program *Context::getProgramNoResolveLink(GLuint handle) const
>+{
>+    return mState.mShaderProgramManager->getProgram(handle);
>+}
>+
>+Shader *Context::getShader(GLuint handle) const
>+{
>+    return mState.mShaderProgramManager->getShader(handle);
>+}
>+
>+bool Context::isRenderbufferGenerated(GLuint renderbuffer) const
>+{
>+    return mState.mRenderbufferManager->isHandleGenerated(renderbuffer);
>+}
>+
>+bool Context::isFramebufferGenerated(GLuint framebuffer) const
>+{
>+    return mState.mFramebufferManager->isHandleGenerated(framebuffer);
>+}
>+
>+bool Context::isProgramPipelineGenerated(GLuint pipeline) const
>+{
>+    return mState.mProgramPipelineManager->isHandleGenerated(pipeline);
>+}
>+
>+bool Context::usingDisplayTextureShareGroup() const
>+{
>+    return mDisplayTextureShareGroup;
>+}
>+
>+GLenum Context::getConvertedRenderbufferFormat(GLenum internalformat) const
>+{
>+    return mState.mExtensions.webglCompatibility && mState.mClientVersion.major == 2 &&
>+                   internalformat == GL_DEPTH_STENCIL
>+               ? GL_DEPTH24_STENCIL8
>+               : internalformat;
>+}
>+
>+void Context::maxShaderCompilerThreads(GLuint count)
>+{
>+    GLuint oldCount = mState.getMaxShaderCompilerThreads();
>+    mState.setMaxShaderCompilerThreads(count);
>+    // A count of zero specifies a request for no parallel compiling or linking.
>+    if ((oldCount == 0 || count == 0) && (oldCount != 0 || count != 0))
>+    {
>+        mThreadPool = angle::WorkerThreadPool::Create(count > 0);
>+    }
>+    mThreadPool->setMaxThreads(count);
>+    mImplementation->setMaxShaderCompilerThreads(count);
>+}
>+
>+bool Context::isGLES1() const
>+{
>+    return mState.getClientVersion() < Version(2, 0);
>+}
>+
>+void Context::onSubjectStateChange(const Context *context,
>+                                   angle::SubjectIndex index,
>+                                   angle::SubjectMessage message)
>+{
>+    switch (index)
>+    {
>+        case kVertexArraySubjectIndex:
>+            switch (message)
>+            {
>+                case angle::SubjectMessage::CONTENTS_CHANGED:
>+                    mState.setObjectDirty(GL_VERTEX_ARRAY);
>+                    mStateCache.onVertexArrayBufferContentsChange(this);
>+                    break;
>+                case angle::SubjectMessage::RESOURCE_MAPPED:
>+                case angle::SubjectMessage::RESOURCE_UNMAPPED:
>+                case angle::SubjectMessage::BINDING_CHANGED:
>+                    mStateCache.onVertexArrayBufferStateChange(this);
>+                    break;
>+                default:
>+                    break;
>+            }
>+            break;
>+
>+        case kReadFramebufferSubjectIndex:
>+            if (message == angle::SubjectMessage::STORAGE_CHANGED)
>+            {
>+                mState.setObjectDirty(GL_READ_FRAMEBUFFER);
>+            }
>+            break;
>+
>+        case kDrawFramebufferSubjectIndex:
>+            if (message == angle::SubjectMessage::STORAGE_CHANGED)
>+            {
>+                mState.setDrawFramebufferDirty();
>+            }
>+            mStateCache.onDrawFramebufferChange(this);
>+            break;
>+
>+        default:
>+            if (index < kTextureMaxSubjectIndex)
>+            {
>+                mState.onActiveTextureStateChange(this, index);
>+                mStateCache.onActiveTextureChange(this);
>+            }
>+            else if (index < kUniformBufferMaxSubjectIndex)
>+            {
>+                mState.onUniformBufferStateChange(index - kUniformBuffer0SubjectIndex);
>+                mStateCache.onUniformBufferStateChange(this);
>+            }
>+            else
>+            {
>+                ASSERT(index < kSamplerMaxSubjectIndex);
>+                mState.setSamplerDirty(index - kSampler0SubjectIndex);
>+                mState.onActiveTextureStateChange(this, index - kSampler0SubjectIndex);
>+            }
>+            break;
>+    }
>+}
>+
>+angle::Result Context::onProgramLink(Program *programObject)
>+{
>+    // Don't parallel link a program which is active in any GL contexts. With this assumption, we
>+    // don't need to worry that:
>+    //   1. Draw calls after link use the new executable code or the old one depending on the link
>+    //      result.
>+    //   2. When a backend program, e.g., ProgramD3D is linking, other backend classes like
>+    //      StateManager11, Renderer11, etc., may have a chance to make unexpected calls to
>+    //      ProgramD3D.
>+    if (programObject->isInUse())
>+    {
>+        programObject->resolveLink(this);
>+        if (programObject->isLinked())
>+        {
>+            ANGLE_TRY(mState.onProgramExecutableChange(this, programObject));
>+        }
>+        mStateCache.onProgramExecutableChange(this);
>+    }
>+
>+    return angle::Result::Continue;
>+}
>+
>+egl::Error Context::setDefaultFramebuffer(egl::Surface *surface)
>+{
>+    ASSERT(mCurrentSurface == nullptr);
>+
>+    Framebuffer *newDefault = nullptr;
>+    if (surface != nullptr)
>+    {
>+        ANGLE_TRY(surface->setIsCurrent(this, true));
>+        mCurrentSurface = surface;
>+        newDefault      = surface->createDefaultFramebuffer(this);
>+    }
>+    else
>+    {
>+        newDefault = new Framebuffer(mImplementation.get());
>+    }
>+
>+    // Update default framebuffer, the binding of the previous default
>+    // framebuffer (or lack of) will have a nullptr.
>+    {
>+        mState.mFramebufferManager->setDefaultFramebuffer(newDefault);
>+        if (mState.getReadFramebuffer() == nullptr)
>+        {
>+            bindReadFramebuffer(0);
>+        }
>+        if (mState.getDrawFramebuffer() == nullptr)
>+        {
>+            bindDrawFramebuffer(0);
>+        }
>+    }
>+
>+    return egl::NoError();
>+}
>+
>+egl::Error Context::unsetDefaultFramebuffer()
>+{
>+    gl::Framebuffer *defaultFramebuffer = mState.mFramebufferManager->getFramebuffer(0);
>+
>+    // Remove the default framebuffer
>+    if (mState.getReadFramebuffer() == defaultFramebuffer)
>+    {
>+        mState.setReadFramebufferBinding(nullptr);
>+        mReadFramebufferObserverBinding.bind(nullptr);
>+    }
>+
>+    if (mState.getDrawFramebuffer() == defaultFramebuffer)
>+    {
>+        mState.setDrawFramebufferBinding(nullptr);
>+        mDrawFramebufferObserverBinding.bind(nullptr);
>+    }
>+
>+    if (defaultFramebuffer)
>+    {
>+        defaultFramebuffer->onDestroy(this);
>+        delete defaultFramebuffer;
>+    }
>+
>+    mState.mFramebufferManager->setDefaultFramebuffer(nullptr);
>+
>+    // Always unset the current surface, even if setIsCurrent fails.
>+    egl::Surface *surface = mCurrentSurface;
>+    mCurrentSurface       = nullptr;
>+    if (surface)
>+    {
>+        ANGLE_TRY(surface->setIsCurrent(this, false));
>+    }
>+
>+    return egl::NoError();
>+}
>+
>+// ErrorSet implementation.
>+ErrorSet::ErrorSet(Context *context) : mContext(context) {}
>+
>+ErrorSet::~ErrorSet() = default;
>+
>+void ErrorSet::handleError(GLenum errorCode,
>+                           const char *message,
>+                           const char *file,
>+                           const char *function,
>+                           unsigned int line)
>+{
>+    if (errorCode == GL_OUT_OF_MEMORY && mContext->getWorkarounds().loseContextOnOutOfMemory)
>+    {
>+        mContext->markContextLost(GraphicsResetStatus::UnknownContextReset);
>+    }
>+
>+    std::stringstream errorStream;
>+    errorStream << "Error: " << gl::FmtHex(errorCode) << ", in " << file << ", " << function << ":"
>+                << line << ". " << message;
>+
>+    std::string formattedMessage = errorStream.str();
>+
>+    // Always log a warning, this function is only called on unexpected internal errors.
>+    WARN() << formattedMessage;
>+
>+    // validationError does the necessary work to process the error.
>+    validationError(errorCode, formattedMessage.c_str());
>+}
>+
>+void ErrorSet::validationError(GLenum errorCode, const char *message)
>+{
>+    ASSERT(errorCode != GL_NO_ERROR);
>+    mErrors.insert(errorCode);
>+
>+    mContext->getState().getDebug().insertMessage(GL_DEBUG_SOURCE_API, GL_DEBUG_TYPE_ERROR,
>+                                                  errorCode, GL_DEBUG_SEVERITY_HIGH, message);
>+}
>+
>+bool ErrorSet::empty() const
>+{
>+    return mErrors.empty();
>+}
>+
>+GLenum ErrorSet::popError()
>+{
>+    ASSERT(!empty());
>+    GLenum error = *mErrors.begin();
>+    mErrors.erase(mErrors.begin());
>+    return error;
>+}
>+
>+// StateCache implementation.
>+StateCache::StateCache()
>+    : mCachedHasAnyEnabledClientAttrib(false),
>+      mCachedNonInstancedVertexElementLimit(0),
>+      mCachedInstancedVertexElementLimit(0),
>+      mCachedBasicDrawStatesError(kInvalidPointer),
>+      mCachedBasicDrawElementsError(kInvalidPointer),
>+      mCachedTransformFeedbackActiveUnpaused(false)
>+{}
>+
>+StateCache::~StateCache() = default;
>+
>+ANGLE_INLINE void StateCache::updateVertexElementLimits(Context *context)
>+{
>+    if (context->isBufferAccessValidationEnabled())
>+    {
>+        updateVertexElementLimitsImpl(context);
>+    }
>+}
>+
>+void StateCache::initialize(Context *context)
>+{
>+    updateValidDrawModes(context);
>+    updateValidBindTextureTypes(context);
>+    updateValidDrawElementsTypes(context);
>+    updateBasicDrawStatesError();
>+    updateBasicDrawElementsError();
>+    updateVertexAttribTypesValidation(context);
>+}
>+
>+void StateCache::updateActiveAttribsMask(Context *context)
>+{
>+    bool isGLES1         = context->isGLES1();
>+    const State &glState = context->getState();
>+
>+    if (!isGLES1 && !glState.getProgram())
>+    {
>+        mCachedActiveBufferedAttribsMask = AttributesMask();
>+        mCachedActiveClientAttribsMask   = AttributesMask();
>+        mCachedActiveDefaultAttribsMask  = AttributesMask();
>+        return;
>+    }
>+
>+    AttributesMask activeAttribs = isGLES1 ? glState.gles1().getVertexArraysAttributeMask()
>+                                           : glState.getProgram()->getActiveAttribLocationsMask();
>+
>+    const VertexArray *vao = glState.getVertexArray();
>+    ASSERT(vao);
>+
>+    const AttributesMask &clientAttribs  = vao->getClientAttribsMask();
>+    const AttributesMask &enabledAttribs = vao->getEnabledAttributesMask();
>+    const AttributesMask &activeEnabled  = activeAttribs & enabledAttribs;
>+
>+    mCachedActiveClientAttribsMask   = activeEnabled & clientAttribs;
>+    mCachedActiveBufferedAttribsMask = activeEnabled & ~clientAttribs;
>+    mCachedActiveDefaultAttribsMask  = activeAttribs & ~enabledAttribs;
>+    mCachedHasAnyEnabledClientAttrib = (clientAttribs & enabledAttribs).any();
>+}
>+
>+void StateCache::updateVertexElementLimitsImpl(Context *context)
>+{
>+    ASSERT(context->isBufferAccessValidationEnabled());
>+
>+    const VertexArray *vao = context->getState().getVertexArray();
>+
>+    mCachedNonInstancedVertexElementLimit = std::numeric_limits<GLint64>::max();
>+    mCachedInstancedVertexElementLimit    = std::numeric_limits<GLint64>::max();
>+
>+    // VAO can be null on Context startup. If we make this computation lazier we could ASSERT.
>+    // If there are no buffered attributes then we should not limit the draw call count.
>+    if (!vao || !mCachedActiveBufferedAttribsMask.any())
>+    {
>+        return;
>+    }
>+
>+    const auto &vertexAttribs  = vao->getVertexAttributes();
>+    const auto &vertexBindings = vao->getVertexBindings();
>+
>+    for (size_t attributeIndex : mCachedActiveBufferedAttribsMask)
>+    {
>+        const VertexAttribute &attrib = vertexAttribs[attributeIndex];
>+
>+        const VertexBinding &binding = vertexBindings[attrib.bindingIndex];
>+        ASSERT(context->isGLES1() ||
>+               context->getState().getProgram()->isAttribLocationActive(attributeIndex));
>+
>+        GLint64 limit = attrib.getCachedElementLimit();
>+        if (binding.getDivisor() > 0)
>+        {
>+            mCachedInstancedVertexElementLimit =
>+                std::min(mCachedInstancedVertexElementLimit, limit);
>+        }
>+        else
>+        {
>+            mCachedNonInstancedVertexElementLimit =
>+                std::min(mCachedNonInstancedVertexElementLimit, limit);
>+        }
>+    }
>+}
>+
>+void StateCache::updateBasicDrawStatesError()
>+{
>+    mCachedBasicDrawStatesError = kInvalidPointer;
>+}
>+
>+void StateCache::updateBasicDrawElementsError()
>+{
>+    mCachedBasicDrawElementsError = kInvalidPointer;
>+}
>+
>+intptr_t StateCache::getBasicDrawStatesErrorImpl(Context *context) const
>+{
>+    ASSERT(mCachedBasicDrawStatesError == kInvalidPointer);
>+    mCachedBasicDrawStatesError = reinterpret_cast<intptr_t>(ValidateDrawStates(context));
>+    return mCachedBasicDrawStatesError;
>+}
>+
>+intptr_t StateCache::getBasicDrawElementsErrorImpl(Context *context) const
>+{
>+    ASSERT(mCachedBasicDrawElementsError == kInvalidPointer);
>+    mCachedBasicDrawElementsError = reinterpret_cast<intptr_t>(ValidateDrawElementsStates(context));
>+    return mCachedBasicDrawElementsError;
>+}
>+
>+void StateCache::onVertexArrayBindingChange(Context *context)
>+{
>+    updateActiveAttribsMask(context);
>+    updateVertexElementLimits(context);
>+    updateBasicDrawStatesError();
>+}
>+
>+void StateCache::onProgramExecutableChange(Context *context)
>+{
>+    updateActiveAttribsMask(context);
>+    updateVertexElementLimits(context);
>+    updateBasicDrawStatesError();
>+    updateValidDrawModes(context);
>+}
>+
>+void StateCache::onVertexArrayFormatChange(Context *context)
>+{
>+    updateVertexElementLimits(context);
>+}
>+
>+void StateCache::onVertexArrayBufferContentsChange(Context *context)
>+{
>+    updateVertexElementLimits(context);
>+    updateBasicDrawStatesError();
>+}
>+
>+void StateCache::onVertexArrayStateChange(Context *context)
>+{
>+    updateActiveAttribsMask(context);
>+    updateVertexElementLimits(context);
>+    updateBasicDrawStatesError();
>+}
>+
>+void StateCache::onVertexArrayBufferStateChange(Context *context)
>+{
>+    updateBasicDrawStatesError();
>+    updateBasicDrawElementsError();
>+}
>+
>+void StateCache::onGLES1ClientStateChange(Context *context)
>+{
>+    updateActiveAttribsMask(context);
>+}
>+
>+void StateCache::onDrawFramebufferChange(Context *context)
>+{
>+    updateBasicDrawStatesError();
>+}
>+
>+void StateCache::onContextCapChange(Context *context)
>+{
>+    updateBasicDrawStatesError();
>+}
>+
>+void StateCache::onStencilStateChange(Context *context)
>+{
>+    updateBasicDrawStatesError();
>+}
>+
>+void StateCache::onDefaultVertexAttributeChange(Context *context)
>+{
>+    updateBasicDrawStatesError();
>+}
>+
>+void StateCache::onActiveTextureChange(Context *context)
>+{
>+    updateBasicDrawStatesError();
>+}
>+
>+void StateCache::onQueryChange(Context *context)
>+{
>+    updateBasicDrawStatesError();
>+}
>+
>+void StateCache::onActiveTransformFeedbackChange(Context *context)
>+{
>+    updateTransformFeedbackActiveUnpaused(context);
>+    updateBasicDrawStatesError();
>+    updateBasicDrawElementsError();
>+    updateValidDrawModes(context);
>+}
>+
>+void StateCache::onUniformBufferStateChange(Context *context)
>+{
>+    updateBasicDrawStatesError();
>+}
>+
>+void StateCache::setValidDrawModes(bool pointsOK,
>+                                   bool linesOK,
>+                                   bool trisOK,
>+                                   bool lineAdjOK,
>+                                   bool triAdjOK)
>+{
>+    mCachedValidDrawModes[PrimitiveMode::Points]                 = pointsOK;
>+    mCachedValidDrawModes[PrimitiveMode::Lines]                  = linesOK;
>+    mCachedValidDrawModes[PrimitiveMode::LineStrip]              = linesOK;
>+    mCachedValidDrawModes[PrimitiveMode::LineLoop]               = linesOK;
>+    mCachedValidDrawModes[PrimitiveMode::Triangles]              = trisOK;
>+    mCachedValidDrawModes[PrimitiveMode::TriangleFan]            = trisOK;
>+    mCachedValidDrawModes[PrimitiveMode::TriangleStrip]          = trisOK;
>+    mCachedValidDrawModes[PrimitiveMode::LinesAdjacency]         = lineAdjOK;
>+    mCachedValidDrawModes[PrimitiveMode::LineStripAdjacency]     = lineAdjOK;
>+    mCachedValidDrawModes[PrimitiveMode::TrianglesAdjacency]     = triAdjOK;
>+    mCachedValidDrawModes[PrimitiveMode::TriangleStripAdjacency] = triAdjOK;
>+}
>+
>+void StateCache::updateValidDrawModes(Context *context)
>+{
>+    const State &state = context->getState();
>+    Program *program   = state.getProgram();
>+
>+    if (mCachedTransformFeedbackActiveUnpaused)
>+    {
>+        TransformFeedback *curTransformFeedback = state.getCurrentTransformFeedback();
>+
>+        // ES Spec 3.0 validation text:
>+        // When transform feedback is active and not paused, all geometric primitives generated must
>+        // match the value of primitiveMode passed to BeginTransformFeedback. The error
>+        // INVALID_OPERATION is generated by DrawArrays and DrawArraysInstanced if mode is not
>+        // identical to primitiveMode. The error INVALID_OPERATION is also generated by
>+        // DrawElements, DrawElementsInstanced, and DrawRangeElements while transform feedback is
>+        // active and not paused, regardless of mode. Any primitive type may be used while transform
>+        // feedback is paused.
>+        if (!context->getExtensions().geometryShader)
>+        {
>+            mCachedValidDrawModes.fill(false);
>+            mCachedValidDrawModes[curTransformFeedback->getPrimitiveMode()] = true;
>+            return;
>+        }
>+
>+        // EXT_geometry_shader validation text:
>+        // When transform feedback is active and not paused, all geometric primitives generated must
>+        // be compatible with the value of <primitiveMode> passed to BeginTransformFeedback. If a
>+        // geometry shader is active, the type of primitive emitted by that shader is used instead
>+        // of the <mode> parameter passed to drawing commands for the purposes of this error check.
>+        // Any primitive type may be used while transform feedback is paused.
>+        bool pointsOK = curTransformFeedback->getPrimitiveMode() == PrimitiveMode::Points;
>+        bool linesOK  = curTransformFeedback->getPrimitiveMode() == PrimitiveMode::Lines;
>+        bool trisOK   = curTransformFeedback->getPrimitiveMode() == PrimitiveMode::Triangles;
>+
>+        setValidDrawModes(pointsOK, linesOK, trisOK, false, false);
>+        return;
>+    }
>+
>+    if (!program || !program->hasLinkedShaderStage(ShaderType::Geometry))
>+    {
>+        mCachedValidDrawModes = kValidBasicDrawModes;
>+        return;
>+    }
>+
>+    ASSERT(program && program->hasLinkedShaderStage(ShaderType::Geometry));
>+    PrimitiveMode gsMode = program->getGeometryShaderInputPrimitiveType();
>+
>+    bool pointsOK  = gsMode == PrimitiveMode::Points;
>+    bool linesOK   = gsMode == PrimitiveMode::Lines;
>+    bool trisOK    = gsMode == PrimitiveMode::Triangles;
>+    bool lineAdjOK = gsMode == PrimitiveMode::LinesAdjacency;
>+    bool triAdjOK  = gsMode == PrimitiveMode::TrianglesAdjacency;
>+
>+    setValidDrawModes(pointsOK, linesOK, trisOK, lineAdjOK, triAdjOK);
>+}
>+
>+void StateCache::updateValidBindTextureTypes(Context *context)
>+{
>+    const Extensions &exts = context->getExtensions();
>+    bool isGLES3           = context->getClientMajorVersion() >= 3;
>+    bool isGLES31          = context->getClientVersion() >= Version(3, 1);
>+
>+    mCachedValidBindTextureTypes = {{
>+        {TextureType::_2D, true},
>+        {TextureType::_2DArray, isGLES3},
>+        {TextureType::_2DMultisample, isGLES31 || exts.textureMultisample},
>+        {TextureType::_2DMultisampleArray, exts.textureStorageMultisample2DArray},
>+        {TextureType::_3D, isGLES3},
>+        {TextureType::External, exts.eglImageExternal || exts.eglStreamConsumerExternal},
>+        {TextureType::Rectangle, exts.textureRectangle},
>+        {TextureType::CubeMap, true},
>+    }};
>+}
>+
>+void StateCache::updateValidDrawElementsTypes(Context *context)
>+{
>+    bool supportsUint =
>+        (context->getClientMajorVersion() >= 3 || context->getExtensions().elementIndexUint);
>+
>+    mCachedValidDrawElementsTypes = {{
>+        {DrawElementsType::UnsignedByte, true},
>+        {DrawElementsType::UnsignedShort, true},
>+        {DrawElementsType::UnsignedInt, supportsUint},
>+    }};
>+}
>+
>+void StateCache::updateTransformFeedbackActiveUnpaused(Context *context)
>+{
>+    TransformFeedback *xfb                 = context->getState().getCurrentTransformFeedback();
>+    mCachedTransformFeedbackActiveUnpaused = xfb && xfb->isActive() && !xfb->isPaused();
>+}
>+
>+void StateCache::updateVertexAttribTypesValidation(Context *context)
>+{
>+    if (context->getClientMajorVersion() <= 2)
>+    {
>+        mCachedVertexAttribTypesValidation = {{
>+            {VertexAttribType::Byte, VertexAttribTypeCase::Valid},
>+            {VertexAttribType::Short, VertexAttribTypeCase::Valid},
>+            {VertexAttribType::UnsignedByte, VertexAttribTypeCase::Valid},
>+            {VertexAttribType::UnsignedShort, VertexAttribTypeCase::Valid},
>+            {VertexAttribType::Float, VertexAttribTypeCase::Valid},
>+            {VertexAttribType::Fixed, VertexAttribTypeCase::Valid},
>+        }};
>+    }
>+    else
>+    {
>+        mCachedVertexAttribTypesValidation = {{
>+            {VertexAttribType::Byte, VertexAttribTypeCase::Valid},
>+            {VertexAttribType::Short, VertexAttribTypeCase::Valid},
>+            {VertexAttribType::Int, VertexAttribTypeCase::Valid},
>+            {VertexAttribType::UnsignedByte, VertexAttribTypeCase::Valid},
>+            {VertexAttribType::UnsignedShort, VertexAttribTypeCase::Valid},
>+            {VertexAttribType::UnsignedInt, VertexAttribTypeCase::Valid},
>+            {VertexAttribType::Float, VertexAttribTypeCase::Valid},
>+            {VertexAttribType::HalfFloat, VertexAttribTypeCase::Valid},
>+            {VertexAttribType::Fixed, VertexAttribTypeCase::Valid},
>+            {VertexAttribType::Int2101010, VertexAttribTypeCase::ValidSize4Only},
>+            {VertexAttribType::UnsignedInt2101010, VertexAttribTypeCase::ValidSize4Only},
>+        }};
>+
>+        mCachedIntegerVertexAttribTypesValidation = {{
>+            {VertexAttribType::Byte, VertexAttribTypeCase::Valid},
>+            {VertexAttribType::Short, VertexAttribTypeCase::Valid},
>+            {VertexAttribType::Int, VertexAttribTypeCase::Valid},
>+            {VertexAttribType::UnsignedByte, VertexAttribTypeCase::Valid},
>+            {VertexAttribType::UnsignedShort, VertexAttribTypeCase::Valid},
>+            {VertexAttribType::UnsignedInt, VertexAttribTypeCase::Valid},
>+        }};
>+    }
>+}
> }  // namespace gl
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/Context.h b/Source/ThirdParty/ANGLE/src/libANGLE/Context.h
>index 38c4e7b4d18..8b1ce976842 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/Context.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/Context.h
>@@ -15,24 +15,27 @@
> 
> #include "angle_gl.h"
> #include "common/MemoryBuffer.h"
>+#include "common/PackedEnums.h"
> #include "common/angleutils.h"
> #include "libANGLE/Caps.h"
> #include "libANGLE/Constants.h"
>-#include "libANGLE/ContextState.h"
>+#include "libANGLE/Context_gles_1_0_autogen.h"
> #include "libANGLE/Error.h"
> #include "libANGLE/HandleAllocator.h"
>-#include "libANGLE/PackedGLEnums.h"
> #include "libANGLE/RefCountObject.h"
>+#include "libANGLE/ResourceManager.h"
> #include "libANGLE/ResourceMap.h"
>+#include "libANGLE/State.h"
> #include "libANGLE/VertexAttribute.h"
> #include "libANGLE/Workarounds.h"
>+#include "libANGLE/WorkerThread.h"
> #include "libANGLE/angletypes.h"
> 
> namespace rx
> {
> class ContextImpl;
> class EGLImplFactory;
>-}
>+}  // namespace rx
> 
> namespace egl
> {
>@@ -40,28 +43,246 @@ class AttributeMap;
> class Surface;
> struct Config;
> class Thread;
>-}
>+}  // namespace egl
> 
> namespace gl
> {
> class Buffer;
> class Compiler;
> class FenceNV;
>-class Sync;
> class Framebuffer;
>+class GLES1Renderer;
> class MemoryProgramCache;
>+class MemoryObject;
> class Program;
>+class ProgramPipeline;
> class Query;
> class Renderbuffer;
> class Sampler;
> class Shader;
>+class Sync;
> class Texture;
> class TransformFeedback;
> class VertexArray;
> struct VertexAttribute;
>-class ProgramPipeline;
> 
>-class Context final : public ValidationContext
>+class ErrorSet : angle::NonCopyable
>+{
>+  public:
>+    explicit ErrorSet(Context *context);
>+    ~ErrorSet();
>+
>+    bool empty() const;
>+    GLenum popError();
>+
>+    void handleError(GLenum errorCode,
>+                     const char *message,
>+                     const char *file,
>+                     const char *function,
>+                     unsigned int line);
>+
>+    void validationError(GLenum errorCode, const char *message);
>+
>+  private:
>+    Context *mContext;
>+    std::set<GLenum> mErrors;
>+};
>+
>+enum class VertexAttribTypeCase
>+{
>+    Invalid        = 0,
>+    Valid          = 1,
>+    ValidSize4Only = 2,
>+};
>+
>+// Helper class for managing cache variables and state changes.
>+class StateCache final : angle::NonCopyable
>+{
>+  public:
>+    StateCache();
>+    ~StateCache();
>+
>+    void initialize(Context *context);
>+
>+    // Places that can trigger updateActiveAttribsMask:
>+    // 1. onVertexArrayBindingChange.
>+    // 2. onProgramExecutableChange.
>+    // 3. onVertexArrayStateChange.
>+    // 4. onGLES1ClientStateChange.
>+    AttributesMask getActiveBufferedAttribsMask() const { return mCachedActiveBufferedAttribsMask; }
>+    AttributesMask getActiveClientAttribsMask() const { return mCachedActiveClientAttribsMask; }
>+    AttributesMask getActiveDefaultAttribsMask() const { return mCachedActiveDefaultAttribsMask; }
>+    bool hasAnyEnabledClientAttrib() const { return mCachedHasAnyEnabledClientAttrib; }
>+    bool hasAnyActiveClientAttrib() const { return mCachedActiveClientAttribsMask.any(); }
>+
>+    // Places that can trigger updateVertexElementLimits:
>+    // 1. onVertexArrayBindingChange.
>+    // 2. onProgramExecutableChange.
>+    // 3. onVertexArrayFormatChange.
>+    // 4. onVertexArrayBufferChange.
>+    // 5. onVertexArrayStateChange.
>+    GLint64 getNonInstancedVertexElementLimit() const
>+    {
>+        return mCachedNonInstancedVertexElementLimit;
>+    }
>+    GLint64 getInstancedVertexElementLimit() const { return mCachedInstancedVertexElementLimit; }
>+
>+    // Places that can trigger updateBasicDrawStatesError:
>+    // 1. onVertexArrayBindingChange.
>+    // 2. onProgramExecutableChange.
>+    // 3. onVertexArrayBufferContentsChange.
>+    // 4. onVertexArrayStateChange.
>+    // 5. onVertexArrayBufferStateChange.
>+    // 6. onDrawFramebufferChange.
>+    // 7. onContextCapChange.
>+    // 8. onStencilStateChange.
>+    // 9. onDefaultVertexAttributeChange.
>+    // 10. onActiveTextureChange.
>+    // 11. onQueryChange.
>+    // 12. onActiveTransformFeedbackChange.
>+    // 13. onUniformBufferStateChange.
>+    // 14. onBufferBindingChange.
>+    bool hasBasicDrawStatesError(Context *context) const
>+    {
>+        if (mCachedBasicDrawStatesError == 0)
>+        {
>+            return false;
>+        }
>+        if (mCachedBasicDrawStatesError != kInvalidPointer)
>+        {
>+            return true;
>+        }
>+        return getBasicDrawStatesErrorImpl(context) != 0;
>+    }
>+
>+    intptr_t getBasicDrawStatesError(Context *context) const
>+    {
>+        if (mCachedBasicDrawStatesError != kInvalidPointer)
>+        {
>+            return mCachedBasicDrawStatesError;
>+        }
>+
>+        return getBasicDrawStatesErrorImpl(context);
>+    }
>+
>+    // Places that can trigger updateBasicDrawElementsError:
>+    // 1. onActiveTransformFeedbackChange.
>+    // 2. onVertexArrayBufferStateChange.
>+    // 3. onBufferBindingChange.
>+    intptr_t getBasicDrawElementsError(Context *context) const
>+    {
>+        if (mCachedBasicDrawElementsError != kInvalidPointer)
>+        {
>+            return mCachedBasicDrawElementsError;
>+        }
>+
>+        return getBasicDrawElementsErrorImpl(context);
>+    }
>+
>+    // Places that can trigger updateValidDrawModes:
>+    // 1. onProgramExecutableChange.
>+    // 2. onActiveTransformFeedbackChange.
>+    bool isValidDrawMode(PrimitiveMode primitiveMode) const
>+    {
>+        return mCachedValidDrawModes[primitiveMode];
>+    }
>+
>+    // Cannot change except on Context/Extension init.
>+    bool isValidBindTextureType(TextureType type) const
>+    {
>+        return mCachedValidBindTextureTypes[type];
>+    }
>+
>+    // Cannot change except on Context/Extension init.
>+    bool isValidDrawElementsType(DrawElementsType type) const
>+    {
>+        return mCachedValidDrawElementsTypes[type];
>+    }
>+
>+    // Places that can trigger updateTransformFeedbackActiveUnpaused:
>+    // 1. onActiveTransformFeedbackChange.
>+    bool isTransformFeedbackActiveUnpaused() const
>+    {
>+        return mCachedTransformFeedbackActiveUnpaused;
>+    }
>+
>+    // Cannot change except on Context/Extension init.
>+    VertexAttribTypeCase getVertexAttribTypeValidation(VertexAttribType type) const
>+    {
>+        return mCachedVertexAttribTypesValidation[type];
>+    }
>+
>+    VertexAttribTypeCase getIntegerVertexAttribTypeValidation(VertexAttribType type) const
>+    {
>+        return mCachedIntegerVertexAttribTypesValidation[type];
>+    }
>+
>+    // State change notifications.
>+    void onVertexArrayBindingChange(Context *context);
>+    void onProgramExecutableChange(Context *context);
>+    void onVertexArrayFormatChange(Context *context);
>+    void onVertexArrayBufferContentsChange(Context *context);
>+    void onVertexArrayStateChange(Context *context);
>+    void onVertexArrayBufferStateChange(Context *context);
>+    void onGLES1ClientStateChange(Context *context);
>+    void onDrawFramebufferChange(Context *context);
>+    void onContextCapChange(Context *context);
>+    void onStencilStateChange(Context *context);
>+    void onDefaultVertexAttributeChange(Context *context);
>+    void onActiveTextureChange(Context *context);
>+    void onQueryChange(Context *context);
>+    void onActiveTransformFeedbackChange(Context *context);
>+    void onUniformBufferStateChange(Context *context);
>+    void onBufferBindingChange(Context *context);
>+
>+  private:
>+    // Cache update functions.
>+    void updateActiveAttribsMask(Context *context);
>+    void updateVertexElementLimits(Context *context);
>+    void updateVertexElementLimitsImpl(Context *context);
>+    void updateValidDrawModes(Context *context);
>+    void updateValidBindTextureTypes(Context *context);
>+    void updateValidDrawElementsTypes(Context *context);
>+    void updateBasicDrawStatesError();
>+    void updateBasicDrawElementsError();
>+    void updateTransformFeedbackActiveUnpaused(Context *context);
>+    void updateVertexAttribTypesValidation(Context *context);
>+
>+    void setValidDrawModes(bool pointsOK, bool linesOK, bool trisOK, bool lineAdjOK, bool triAdjOK);
>+
>+    intptr_t getBasicDrawStatesErrorImpl(Context *context) const;
>+    intptr_t getBasicDrawElementsErrorImpl(Context *context) const;
>+
>+    static constexpr intptr_t kInvalidPointer = 1;
>+
>+    AttributesMask mCachedActiveBufferedAttribsMask;
>+    AttributesMask mCachedActiveClientAttribsMask;
>+    AttributesMask mCachedActiveDefaultAttribsMask;
>+    bool mCachedHasAnyEnabledClientAttrib;
>+    GLint64 mCachedNonInstancedVertexElementLimit;
>+    GLint64 mCachedInstancedVertexElementLimit;
>+    mutable intptr_t mCachedBasicDrawStatesError;
>+    mutable intptr_t mCachedBasicDrawElementsError;
>+    bool mCachedTransformFeedbackActiveUnpaused;
>+
>+    // Reserve an extra slot at the end of these maps for invalid enum.
>+    angle::PackedEnumMap<PrimitiveMode, bool, angle::EnumSize<PrimitiveMode>() + 1>
>+        mCachedValidDrawModes;
>+    angle::PackedEnumMap<TextureType, bool, angle::EnumSize<TextureType>() + 1>
>+        mCachedValidBindTextureTypes;
>+    angle::PackedEnumMap<DrawElementsType, bool, angle::EnumSize<DrawElementsType>() + 1>
>+        mCachedValidDrawElementsTypes;
>+    angle::PackedEnumMap<VertexAttribType,
>+                         VertexAttribTypeCase,
>+                         angle::EnumSize<VertexAttribType>() + 1>
>+        mCachedVertexAttribTypesValidation;
>+    angle::PackedEnumMap<VertexAttribType,
>+                         VertexAttribTypeCase,
>+                         angle::EnumSize<VertexAttribType>() + 1>
>+        mCachedIntegerVertexAttribTypesValidation;
>+};
>+
>+class Context final : public egl::LabeledObject, angle::NonCopyable, public angle::ObserverInterface
> {
>   public:
>     Context(rx::EGLImplFactory *implFactory,
>@@ -70,24 +291,29 @@ class Context final : public ValidationContext
>             TextureManager *shareTextures,
>             MemoryProgramCache *memoryProgramCache,
>             const egl::AttributeMap &attribs,
>-            const egl::DisplayExtensions &displayExtensions);
>+            const egl::DisplayExtensions &displayExtensions,
>+            const egl::ClientExtensions &clientExtensions);
> 
>     egl::Error onDestroy(const egl::Display *display);
>     ~Context() override;
> 
>+    void setLabel(EGLLabelKHR label) override;
>+    EGLLabelKHR getLabel() const override;
>+
>     egl::Error makeCurrent(egl::Display *display, egl::Surface *surface);
>-    egl::Error releaseSurface(const egl::Display *display);
>+    egl::Error unMakeCurrent(const egl::Display *display);
> 
>     // These create  and destroy methods are merely pass-throughs to
>     // ResourceManager, which owns these object types
>     GLuint createBuffer();
>-    GLuint createShader(GLenum type);
>+    GLuint createShader(ShaderType type);
>     GLuint createProgram();
>     GLuint createTexture();
>     GLuint createRenderbuffer();
>-    GLuint createPaths(GLsizei range);
>+    GLuint genPaths(GLsizei range);
>     GLuint createProgramPipeline();
>-    GLuint createShaderProgramv(GLenum type, GLsizei count, const GLchar *const *strings);
>+    GLuint createShaderProgramv(ShaderType type, GLsizei count, const GLchar *const *strings);
>+    GLuint createMemoryObject();
> 
>     void deleteBuffer(GLuint buffer);
>     void deleteShader(GLuint shader);
>@@ -96,29 +322,109 @@ class Context final : public ValidationContext
>     void deleteRenderbuffer(GLuint renderbuffer);
>     void deletePaths(GLuint first, GLsizei range);
>     void deleteProgramPipeline(GLuint pipeline);
>+    void deleteMemoryObject(GLuint memoryObject);
> 
>     // CHROMIUM_path_rendering
>-    bool hasPathData(GLuint path) const;
>-    bool hasPath(GLuint path) const;
>-    void setPathCommands(GLuint path,
>-                         GLsizei numCommands,
>-                         const GLubyte *commands,
>-                         GLsizei numCoords,
>-                         GLenum coordType,
>-                         const void *coords);
>-    void setPathParameterf(GLuint path, GLenum pname, GLfloat value);
>-    void getPathParameterfv(GLuint path, GLenum pname, GLfloat *value) const;
>-    void setPathStencilFunc(GLenum func, GLint ref, GLuint mask);
>+    bool isPath(GLuint path) const;
>+    bool isPathGenerated(GLuint path) const;
>+    void pathCommands(GLuint path,
>+                      GLsizei numCommands,
>+                      const GLubyte *commands,
>+                      GLsizei numCoords,
>+                      GLenum coordType,
>+                      const void *coords);
>+    void pathParameterf(GLuint path, GLenum pname, GLfloat value);
>+    void pathParameteri(GLuint path, GLenum pname, GLint value);
>+    void getPathParameterfv(GLuint path, GLenum pname, GLfloat *value);
>+    void getPathParameteriv(GLuint path, GLenum pname, GLint *value);
>+    void pathStencilFunc(GLenum func, GLint ref, GLuint mask);
>+
>+    // GL_CHROMIUM_lose_context
>+    void loseContext(GraphicsResetStatus current, GraphicsResetStatus other);
> 
>     // Framebuffers are owned by the Context, so these methods do not pass through
>     GLuint createFramebuffer();
>     void deleteFramebuffer(GLuint framebuffer);
> 
>     // NV Fences are owned by the Context.
>-    GLuint createFenceNV();
>-    void deleteFenceNV(GLuint fence);
>-
>-    void bindTexture(GLenum target, GLuint handle);
>+    void genFencesNV(GLsizei n, GLuint *fences);
>+    void deleteFencesNV(GLsizei n, const GLuint *fences);
>+    void finishFenceNV(GLuint fence);
>+    void getFenceivNV(GLuint fence, GLenum pname, GLint *params);
>+    GLboolean isFenceNV(GLuint fence);
>+    void setFenceNV(GLuint fence, GLenum condition);
>+    GLboolean testFenceNV(GLuint fence);
>+
>+    // GL_EXT_memory_object
>+    void deleteMemoryObjects(GLsizei n, const GLuint *memoryObjects);
>+    GLboolean isMemoryObject(GLuint memoryObject);
>+    void createMemoryObjects(GLsizei n, GLuint *memoryObjects);
>+    void memoryObjectParameteriv(GLuint memoryObject, GLenum pname, const GLint *params);
>+    void getMemoryObjectParameteriv(GLuint memoryObject, GLenum pname, GLint *params);
>+    void texStorageMem2D(TextureType target,
>+                         GLsizei levels,
>+                         GLenum internalFormat,
>+                         GLsizei width,
>+                         GLsizei height,
>+                         GLuint memory,
>+                         GLuint64 offset);
>+    void texStorageMem2DMultisample(TextureType target,
>+                                    GLsizei samples,
>+                                    GLenum internalFormat,
>+                                    GLsizei width,
>+                                    GLsizei height,
>+                                    GLboolean fixedSampleLocations,
>+                                    GLuint memory,
>+                                    GLuint64 offset);
>+    void texStorageMem3D(TextureType target,
>+                         GLsizei levels,
>+                         GLenum internalFormat,
>+                         GLsizei width,
>+                         GLsizei height,
>+                         GLsizei depth,
>+                         GLuint memory,
>+                         GLuint64 offset);
>+    void texStorageMem3DMultisample(TextureType target,
>+                                    GLsizei samples,
>+                                    GLenum internalFormat,
>+                                    GLsizei width,
>+                                    GLsizei height,
>+                                    GLsizei depth,
>+                                    GLboolean fixedSampleLocations,
>+                                    GLuint memory,
>+                                    GLuint64 offset);
>+    void bufferStorageMem(TextureType target, GLsizeiptr size, GLuint memory, GLuint64 offset);
>+
>+    // GL_EXT_memory_object_fd
>+    void importMemoryFd(GLuint memory, GLuint64 size, HandleType handleType, GLint fd);
>+
>+    // GL_EXT_semaphore
>+    void genSemaphores(GLsizei n, GLuint *semaphores);
>+    void deleteSemaphores(GLsizei n, const GLuint *semaphores);
>+    GLboolean isSemaphore(GLuint semaphore);
>+    void semaphoreParameterui64v(GLuint semaphore, GLenum pname, const GLuint64 *params);
>+    void getSemaphoreParameterui64v(GLuint semaphore, GLenum pname, GLuint64 *params);
>+    void waitSemaphore(GLuint semaphore,
>+                       GLuint numBufferBarriers,
>+                       const GLuint *buffers,
>+                       GLuint numTextureBarriers,
>+                       const GLuint *textures,
>+                       const GLenum *srcLayouts);
>+    void signalSemaphore(GLuint semaphore,
>+                         GLuint numBufferBarriers,
>+                         const GLuint *buffers,
>+                         GLuint numTextureBarriers,
>+                         const GLuint *textures,
>+                         const GLenum *dstLayouts);
>+
>+    // GL_EXT_semaphore_fd
>+    void importSemaphoreFd(GLuint semaphore, HandleType handleType, GLint fd);
>+
>+    // GLES1 emulation: Interface to entry points
>+    ANGLE_GLES1_CONTEXT_API
>+
>+    // OpenGL ES 2+
>+    void bindTexture(TextureType target, GLuint handle);
>     void bindReadFramebuffer(GLuint framebufferHandle);
>     void bindDrawFramebuffer(GLuint framebufferHandle);
>     void bindVertexArray(GLuint vertexArrayHandle);
>@@ -139,41 +445,175 @@ class Context final : public ValidationContext
>     void bindTransformFeedback(GLenum target, GLuint transformFeedbackHandle);
>     void bindProgramPipeline(GLuint pipelineHandle);
> 
>-    void beginQuery(GLenum target, GLuint query);
>-    void endQuery(GLenum target);
>-    void queryCounter(GLuint id, GLenum target);
>-    void getQueryiv(GLenum target, GLenum pname, GLint *params);
>+    void beginQuery(QueryType target, GLuint query);
>+    void endQuery(QueryType target);
>+    void queryCounter(GLuint id, QueryType target);
>+    void getQueryiv(QueryType target, GLenum pname, GLint *params);
>+    void getQueryivRobust(QueryType target,
>+                          GLenum pname,
>+                          GLsizei bufSize,
>+                          GLsizei *length,
>+                          GLint *params);
>     void getQueryObjectiv(GLuint id, GLenum pname, GLint *params);
>+    void getQueryObjectivRobust(GLuint id,
>+                                GLenum pname,
>+                                GLsizei bufSize,
>+                                GLsizei *length,
>+                                GLint *params);
>     void getQueryObjectuiv(GLuint id, GLenum pname, GLuint *params);
>+    void getQueryObjectuivRobust(GLuint id,
>+                                 GLenum pname,
>+                                 GLsizei bufSize,
>+                                 GLsizei *length,
>+                                 GLuint *params);
>     void getQueryObjecti64v(GLuint id, GLenum pname, GLint64 *params);
>+    void getQueryObjecti64vRobust(GLuint id,
>+                                  GLenum pname,
>+                                  GLsizei bufSize,
>+                                  GLsizei *length,
>+                                  GLint64 *params);
>     void getQueryObjectui64v(GLuint id, GLenum pname, GLuint64 *params);
>+    void getQueryObjectui64vRobust(GLuint id,
>+                                   GLenum pname,
>+                                   GLsizei bufSize,
>+                                   GLsizei *length,
>+                                   GLuint64 *params);
> 
>     void vertexAttribDivisor(GLuint index, GLuint divisor);
>     void vertexBindingDivisor(GLuint bindingIndex, GLuint divisor);
> 
>     void getBufferParameteriv(BufferBinding target, GLenum pname, GLint *params);
>+    void getBufferParameterivRobust(BufferBinding target,
>+                                    GLenum pname,
>+                                    GLsizei bufSize,
>+                                    GLsizei *length,
>+                                    GLint *params);
>+
>     void getFramebufferAttachmentParameteriv(GLenum target,
>                                              GLenum attachment,
>                                              GLenum pname,
>                                              GLint *params);
>+    void getFramebufferAttachmentParameterivRobust(GLenum target,
>+                                                   GLenum attachment,
>+                                                   GLenum pname,
>+                                                   GLsizei bufSize,
>+                                                   GLsizei *length,
>+                                                   GLint *params);
>     void getRenderbufferParameteriv(GLenum target, GLenum pname, GLint *params);
>-
>-    void getTexParameterfv(GLenum target, GLenum pname, GLfloat *params);
>-    void getTexParameteriv(GLenum target, GLenum pname, GLint *params);
>-    void getTexLevelParameteriv(GLenum target, GLint level, GLenum pname, GLint *params);
>-    void getTexLevelParameterfv(GLenum target, GLint level, GLenum pname, GLfloat *params);
>-    void texParameterf(GLenum target, GLenum pname, GLfloat param);
>-    void texParameterfv(GLenum target, GLenum pname, const GLfloat *params);
>-    void texParameteri(GLenum target, GLenum pname, GLint param);
>-    void texParameteriv(GLenum target, GLenum pname, const GLint *params);
>-
>+    void getRenderbufferParameterivRobust(GLenum target,
>+                                          GLenum pname,
>+                                          GLsizei bufSize,
>+                                          GLsizei *length,
>+                                          GLint *params);
>+
>+    void getTexParameterfv(TextureType target, GLenum pname, GLfloat *params);
>+    void getTexParameterfvRobust(TextureType target,
>+                                 GLenum pname,
>+                                 GLsizei bufSize,
>+                                 GLsizei *length,
>+                                 GLfloat *params);
>+    void getTexParameteriv(TextureType target, GLenum pname, GLint *params);
>+    void getTexParameterIiv(TextureType target, GLenum pname, GLint *params);
>+    void getTexParameterIuiv(TextureType target, GLenum pname, GLuint *params);
>+    void getTexParameterivRobust(TextureType target,
>+                                 GLenum pname,
>+                                 GLsizei bufSize,
>+                                 GLsizei *length,
>+                                 GLint *params);
>+    void getTexParameterIivRobust(TextureType target,
>+                                  GLenum pname,
>+                                  GLsizei bufSize,
>+                                  GLsizei *length,
>+                                  GLint *params);
>+    void getTexParameterIuivRobust(TextureType target,
>+                                   GLenum pname,
>+                                   GLsizei bufSize,
>+                                   GLsizei *length,
>+                                   GLuint *params);
>+
>+    void getTexLevelParameteriv(TextureTarget target, GLint level, GLenum pname, GLint *params);
>+    void getTexLevelParameterivRobust(TextureTarget target,
>+                                      GLint level,
>+                                      GLenum pname,
>+                                      GLsizei bufSize,
>+                                      GLsizei *length,
>+                                      GLint *params);
>+    void getTexLevelParameterfv(TextureTarget target, GLint level, GLenum pname, GLfloat *params);
>+    void getTexLevelParameterfvRobust(TextureTarget target,
>+                                      GLint level,
>+                                      GLenum pname,
>+                                      GLsizei bufSize,
>+                                      GLsizei *length,
>+                                      GLfloat *params);
>+    void texParameterf(TextureType target, GLenum pname, GLfloat param);
>+    void texParameterfv(TextureType target, GLenum pname, const GLfloat *params);
>+    void texParameterfvRobust(TextureType target,
>+                              GLenum pname,
>+                              GLsizei bufSize,
>+                              const GLfloat *params);
>+    void texParameteri(TextureType target, GLenum pname, GLint param);
>+    void texParameteriv(TextureType target, GLenum pname, const GLint *params);
>+    void texParameterIiv(TextureType target, GLenum pname, const GLint *params);
>+    void texParameterIuiv(TextureType target, GLenum pname, const GLuint *params);
>+    void texParameterivRobust(TextureType target,
>+                              GLenum pname,
>+                              GLsizei bufSize,
>+                              const GLint *params);
>+    void texParameterIivRobust(TextureType target,
>+                               GLenum pname,
>+                               GLsizei bufSize,
>+                               const GLint *params);
>+    void texParameterIuivRobust(TextureType target,
>+                                GLenum pname,
>+                                GLsizei bufSize,
>+                                const GLuint *params);
>     void samplerParameteri(GLuint sampler, GLenum pname, GLint param);
>     void samplerParameteriv(GLuint sampler, GLenum pname, const GLint *param);
>+    void samplerParameterIiv(GLuint sampler, GLenum pname, const GLint *param);
>+    void samplerParameterIuiv(GLuint sampler, GLenum pname, const GLuint *param);
>+    void samplerParameterivRobust(GLuint sampler,
>+                                  GLenum pname,
>+                                  GLsizei bufSize,
>+                                  const GLint *param);
>+    void samplerParameterIivRobust(GLuint sampler,
>+                                   GLenum pname,
>+                                   GLsizei bufSize,
>+                                   const GLint *param);
>+    void samplerParameterIuivRobust(GLuint sampler,
>+                                    GLenum pname,
>+                                    GLsizei bufSize,
>+                                    const GLuint *param);
>     void samplerParameterf(GLuint sampler, GLenum pname, GLfloat param);
>     void samplerParameterfv(GLuint sampler, GLenum pname, const GLfloat *param);
>+    void samplerParameterfvRobust(GLuint sampler,
>+                                  GLenum pname,
>+                                  GLsizei bufSize,
>+                                  const GLfloat *param);
> 
>     void getSamplerParameteriv(GLuint sampler, GLenum pname, GLint *params);
>+    void getSamplerParameterIiv(GLuint sampler, GLenum pname, GLint *params);
>+    void getSamplerParameterIuiv(GLuint sampler, GLenum pname, GLuint *params);
>+    void getSamplerParameterivRobust(GLuint sampler,
>+                                     GLenum pname,
>+                                     GLsizei bufSize,
>+                                     GLsizei *length,
>+                                     GLint *params);
>+    void getSamplerParameterIivRobust(GLuint sampler,
>+                                      GLenum pname,
>+                                      GLsizei bufSize,
>+                                      GLsizei *length,
>+                                      GLint *params);
>+    void getSamplerParameterIuivRobust(GLuint sampler,
>+                                       GLenum pname,
>+                                       GLsizei bufSize,
>+                                       GLsizei *length,
>+                                       GLuint *params);
>     void getSamplerParameterfv(GLuint sampler, GLenum pname, GLfloat *params);
>+    void getSamplerParameterfvRobust(GLuint sampler,
>+                                     GLenum pname,
>+                                     GLsizei bufSize,
>+                                     GLsizei *length,
>+                                     GLfloat *params);
> 
>     void programParameteri(GLuint program, GLenum pname, GLint value);
> 
>@@ -198,19 +638,30 @@ class Context final : public ValidationContext
>                                GLenum programInterface,
>                                GLenum pname,
>                                GLint *params);
>+    void getProgramInterfaceivRobust(GLuint program,
>+                                     GLenum programInterface,
>+                                     GLenum pname,
>+                                     GLsizei bufSize,
>+                                     GLsizei *length,
>+                                     GLint *params);
> 
>     Buffer *getBuffer(GLuint handle) const;
>     FenceNV *getFenceNV(GLuint handle);
>     Sync *getSync(GLsync handle) const;
>-    Texture *getTexture(GLuint handle) const;
>+    ANGLE_INLINE Texture *getTexture(GLuint handle) const
>+    {
>+        return mState.mTextureManager->getTexture(handle);
>+    }
>+
>     Framebuffer *getFramebuffer(GLuint handle) const;
>     Renderbuffer *getRenderbuffer(GLuint handle) const;
>     VertexArray *getVertexArray(GLuint handle) const;
>     Sampler *getSampler(GLuint handle) const;
>-    Query *getQuery(GLuint handle, bool create, GLenum type);
>+    Query *getQuery(GLuint handle, bool create, QueryType type);
>     Query *getQuery(GLuint handle) const;
>     TransformFeedback *getTransformFeedback(GLuint handle) const;
>     ProgramPipeline *getProgramPipeline(GLuint handle) const;
>+    MemoryObject *getMemoryObject(GLuint handle) const;
> 
>     void objectLabel(GLenum identifier, GLuint name, GLsizei length, const GLchar *label);
>     void objectPtrLabel(const void *ptr, GLsizei length, const GLchar *label);
>@@ -221,8 +672,9 @@ class Context final : public ValidationContext
>                         GLchar *label) const;
>     void getObjectPtrLabel(const void *ptr, GLsizei bufSize, GLsizei *length, GLchar *label) const;
> 
>-    Texture *getTargetTexture(GLenum target) const;
>-    Texture *getSamplerTexture(unsigned int sampler, GLenum type) const;
>+    Texture *getTextureByType(TextureType type) const;
>+    Texture *getTextureByTarget(TextureTarget target) const;
>+    Texture *getSamplerTexture(unsigned int sampler, TextureType type) const;
> 
>     Compiler *getCompiler() const;
> 
>@@ -232,16 +684,40 @@ class Context final : public ValidationContext
>     bool isTransformFeedbackGenerated(GLuint vertexArray);
> 
>     void getBooleanv(GLenum pname, GLboolean *params);
>+    void getBooleanvRobust(GLenum pname, GLsizei bufSize, GLsizei *length, GLboolean *params);
>     void getBooleanvImpl(GLenum pname, GLboolean *params);
>     void getFloatv(GLenum pname, GLfloat *params);
>+    void getFloatvRobust(GLenum pname, GLsizei bufSize, GLsizei *length, GLfloat *params);
>     void getFloatvImpl(GLenum pname, GLfloat *params);
>     void getIntegerv(GLenum pname, GLint *params);
>+    void getIntegervRobust(GLenum pname, GLsizei bufSize, GLsizei *length, GLint *data);
>     void getIntegervImpl(GLenum pname, GLint *params);
>     void getInteger64vImpl(GLenum pname, GLint64 *params);
>     void getPointerv(GLenum pname, void **params) const;
>+    void getPointervRobustANGLERobust(GLenum pname,
>+                                      GLsizei bufSize,
>+                                      GLsizei *length,
>+                                      void **params);
>     void getBooleani_v(GLenum target, GLuint index, GLboolean *data);
>+    void getBooleani_vRobust(GLenum target,
>+                             GLuint index,
>+                             GLsizei bufSize,
>+                             GLsizei *length,
>+                             GLboolean *data);
>     void getIntegeri_v(GLenum target, GLuint index, GLint *data);
>+    void getIntegeri_vRobust(GLenum target,
>+                             GLuint index,
>+                             GLsizei bufSize,
>+                             GLsizei *length,
>+                             GLint *data);
>     void getInteger64i_v(GLenum target, GLuint index, GLint64 *data);
>+    void getInteger64i_vRobust(GLenum target,
>+                               GLuint index,
>+                               GLsizei bufSize,
>+                               GLsizei *length,
>+                               GLint64 *data);
>+    void getUnsignedBytev(GLenum pname, GLubyte *data);
>+    void getUnsignedBytei_v(GLenum target, GLuint index, GLubyte *data);
> 
>     void activeShaderProgram(GLuint pipeline, GLuint program);
>     void activeTexture(GLenum texture);
>@@ -283,20 +759,23 @@ class Context final : public ValidationContext
>     void vertexAttrib4fv(GLuint index, const GLfloat *values);
>     void vertexAttribFormat(GLuint attribIndex,
>                             GLint size,
>-                            GLenum type,
>+                            VertexAttribType type,
>                             GLboolean normalized,
>                             GLuint relativeOffset);
>-    void vertexAttribIFormat(GLuint attribIndex, GLint size, GLenum type, GLuint relativeOffset);
>+    void vertexAttribIFormat(GLuint attribIndex,
>+                             GLint size,
>+                             VertexAttribType type,
>+                             GLuint relativeOffset);
>     void vertexAttribBinding(GLuint attribIndex, GLuint bindingIndex);
>     void vertexAttribPointer(GLuint index,
>                              GLint size,
>-                             GLenum type,
>+                             VertexAttribType type,
>                              GLboolean normalized,
>                              GLsizei stride,
>                              const void *ptr);
>     void vertexAttribIPointer(GLuint index,
>                               GLint size,
>-                              GLenum type,
>+                              VertexAttribType type,
>                               GLsizei stride,
>                               const void *pointer);
>     void viewport(GLint x, GLint y, GLsizei width, GLsizei height);
>@@ -306,10 +785,35 @@ class Context final : public ValidationContext
>     void vertexAttribI4iv(GLuint index, const GLint *v);
>     void vertexAttribI4uiv(GLuint index, const GLuint *v);
>     void getVertexAttribiv(GLuint index, GLenum pname, GLint *params);
>+    void getVertexAttribivRobust(GLuint index,
>+                                 GLenum pname,
>+                                 GLsizei bufSize,
>+                                 GLsizei *length,
>+                                 GLint *params);
>     void getVertexAttribfv(GLuint index, GLenum pname, GLfloat *params);
>+    void getVertexAttribfvRobust(GLuint index,
>+                                 GLenum pname,
>+                                 GLsizei bufSize,
>+                                 GLsizei *length,
>+                                 GLfloat *params);
>     void getVertexAttribIiv(GLuint index, GLenum pname, GLint *params);
>+    void getVertexAttribIivRobust(GLuint index,
>+                                  GLenum pname,
>+                                  GLsizei bufSize,
>+                                  GLsizei *length,
>+                                  GLint *params);
>     void getVertexAttribIuiv(GLuint index, GLenum pname, GLuint *params);
>+    void getVertexAttribIuivRobust(GLuint index,
>+                                   GLenum pname,
>+                                   GLsizei bufSize,
>+                                   GLsizei *length,
>+                                   GLuint *params);
>     void getVertexAttribPointerv(GLuint index, GLenum pname, void **pointer);
>+    void getVertexAttribPointervRobust(GLuint index,
>+                                       GLenum pname,
>+                                       GLsizei bufSize,
>+                                       GLsizei *length,
>+                                       void **pointer);
> 
>     void debugMessageControl(GLenum source,
>                              GLenum type,
>@@ -341,23 +845,26 @@ class Context final : public ValidationContext
>     void clearBufferiv(GLenum buffer, GLint drawbuffer, const GLint *values);
>     void clearBufferfi(GLenum buffer, GLint drawbuffer, GLfloat depth, GLint stencil);
> 
>-    void drawArrays(GLenum mode, GLint first, GLsizei count);
>-    void drawArraysInstanced(GLenum mode, GLint first, GLsizei count, GLsizei instanceCount);
>+    void drawArrays(PrimitiveMode mode, GLint first, GLsizei count);
>+    void drawArraysInstanced(PrimitiveMode mode, GLint first, GLsizei count, GLsizei instanceCount);
> 
>-    void drawElements(GLenum mode, GLsizei count, GLenum type, const void *indices);
>-    void drawElementsInstanced(GLenum mode,
>+    void drawElements(PrimitiveMode mode,
>+                      GLsizei count,
>+                      DrawElementsType type,
>+                      const void *indices);
>+    void drawElementsInstanced(PrimitiveMode mode,
>                                GLsizei count,
>-                               GLenum type,
>+                               DrawElementsType type,
>                                const void *indices,
>                                GLsizei instances);
>-    void drawRangeElements(GLenum mode,
>+    void drawRangeElements(PrimitiveMode mode,
>                            GLuint start,
>                            GLuint end,
>                            GLsizei count,
>-                           GLenum type,
>+                           DrawElementsType type,
>                            const void *indices);
>-    void drawArraysIndirect(GLenum mode, const void *indirect);
>-    void drawElementsIndirect(GLenum mode, GLenum type, const void *indirect);
>+    void drawArraysIndirect(PrimitiveMode mode, const void *indirect);
>+    void drawElementsIndirect(PrimitiveMode mode, DrawElementsType type, const void *indirect);
> 
>     void blitFramebuffer(GLint srcX0,
>                          GLint srcY0,
>@@ -377,8 +884,30 @@ class Context final : public ValidationContext
>                     GLenum format,
>                     GLenum type,
>                     void *pixels);
>+    void readPixelsRobust(GLint x,
>+                          GLint y,
>+                          GLsizei width,
>+                          GLsizei height,
>+                          GLenum format,
>+                          GLenum type,
>+                          GLsizei bufSize,
>+                          GLsizei *length,
>+                          GLsizei *columns,
>+                          GLsizei *rows,
>+                          void *pixels);
>+    void readnPixelsRobust(GLint x,
>+                           GLint y,
>+                           GLsizei width,
>+                           GLsizei height,
>+                           GLenum format,
>+                           GLenum type,
>+                           GLsizei bufSize,
>+                           GLsizei *length,
>+                           GLsizei *columns,
>+                           GLsizei *rows,
>+                           void *data);
> 
>-    void copyTexImage2D(GLenum target,
>+    void copyTexImage2D(TextureTarget target,
>                         GLint level,
>                         GLenum internalformat,
>                         GLint x,
>@@ -387,7 +916,7 @@ class Context final : public ValidationContext
>                         GLsizei height,
>                         GLint border);
> 
>-    void copyTexSubImage2D(GLenum target,
>+    void copyTexSubImage2D(TextureTarget target,
>                            GLint level,
>                            GLint xoffset,
>                            GLint yoffset,
>@@ -396,7 +925,7 @@ class Context final : public ValidationContext
>                            GLsizei width,
>                            GLsizei height);
> 
>-    void copyTexSubImage3D(GLenum target,
>+    void copyTexSubImage3D(TextureTarget target,
>                            GLint level,
>                            GLint xoffset,
>                            GLint yoffset,
>@@ -408,7 +937,7 @@ class Context final : public ValidationContext
> 
>     void framebufferTexture2D(GLenum target,
>                               GLenum attachment,
>-                              GLenum textarget,
>+                              TextureTarget textarget,
>                               GLuint texture,
>                               GLint level);
> 
>@@ -422,18 +951,13 @@ class Context final : public ValidationContext
>                                  GLuint texture,
>                                  GLint level,
>                                  GLint layer);
>-    void framebufferTextureMultiviewLayeredANGLE(GLenum target,
>-                                                 GLenum attachment,
>-                                                 GLuint texture,
>-                                                 GLint level,
>-                                                 GLint baseViewIndex,
>-                                                 GLsizei numViews);
>-    void framebufferTextureMultiviewSideBySideANGLE(GLenum target,
>-                                                    GLenum attachment,
>-                                                    GLuint texture,
>-                                                    GLint level,
>-                                                    GLsizei numViews,
>-                                                    const GLint *viewportOffsets);
>+
>+    void framebufferTextureMultiview(GLenum target,
>+                                     GLenum attachment,
>+                                     GLuint texture,
>+                                     GLint level,
>+                                     GLint baseViewIndex,
>+                                     GLsizei numViews);
> 
>     void drawBuffers(GLsizei n, const GLenum *bufs);
>     void readBuffer(GLenum mode);
>@@ -448,7 +972,7 @@ class Context final : public ValidationContext
>                                   GLsizei width,
>                                   GLsizei height);
> 
>-    void texImage2D(GLenum target,
>+    void texImage2D(TextureTarget target,
>                     GLint level,
>                     GLint internalformat,
>                     GLsizei width,
>@@ -457,7 +981,17 @@ class Context final : public ValidationContext
>                     GLenum format,
>                     GLenum type,
>                     const void *pixels);
>-    void texImage3D(GLenum target,
>+    void texImage2DRobust(TextureTarget target,
>+                          GLint level,
>+                          GLint internalformat,
>+                          GLsizei width,
>+                          GLsizei height,
>+                          GLint border,
>+                          GLenum format,
>+                          GLenum type,
>+                          GLsizei bufSize,
>+                          const void *pixels);
>+    void texImage3D(TextureTarget target,
>                     GLint level,
>                     GLint internalformat,
>                     GLsizei width,
>@@ -467,7 +1001,18 @@ class Context final : public ValidationContext
>                     GLenum format,
>                     GLenum type,
>                     const void *pixels);
>-    void texSubImage2D(GLenum target,
>+    void texImage3DRobust(TextureTarget target,
>+                          GLint level,
>+                          GLint internalformat,
>+                          GLsizei width,
>+                          GLsizei height,
>+                          GLsizei depth,
>+                          GLint border,
>+                          GLenum format,
>+                          GLenum type,
>+                          GLsizei bufSize,
>+                          const void *pixels);
>+    void texSubImage2D(TextureTarget target,
>                        GLint level,
>                        GLint xoffset,
>                        GLint yoffset,
>@@ -476,7 +1021,17 @@ class Context final : public ValidationContext
>                        GLenum format,
>                        GLenum type,
>                        const void *pixels);
>-    void texSubImage3D(GLenum target,
>+    void texSubImage2DRobust(TextureTarget target,
>+                             GLint level,
>+                             GLint xoffset,
>+                             GLint yoffset,
>+                             GLsizei width,
>+                             GLsizei height,
>+                             GLenum format,
>+                             GLenum type,
>+                             GLsizei bufSize,
>+                             const void *pixels);
>+    void texSubImage3D(TextureTarget target,
>                        GLint level,
>                        GLint xoffset,
>                        GLint yoffset,
>@@ -487,7 +1042,19 @@ class Context final : public ValidationContext
>                        GLenum format,
>                        GLenum type,
>                        const void *pixels);
>-    void compressedTexImage2D(GLenum target,
>+    void texSubImage3DRobust(TextureTarget target,
>+                             GLint level,
>+                             GLint xoffset,
>+                             GLint yoffset,
>+                             GLint zoffset,
>+                             GLsizei width,
>+                             GLsizei height,
>+                             GLsizei depth,
>+                             GLenum format,
>+                             GLenum type,
>+                             GLsizei bufSize,
>+                             const void *pixels);
>+    void compressedTexImage2D(TextureTarget target,
>                               GLint level,
>                               GLenum internalformat,
>                               GLsizei width,
>@@ -495,7 +1062,16 @@ class Context final : public ValidationContext
>                               GLint border,
>                               GLsizei imageSize,
>                               const void *data);
>-    void compressedTexImage3D(GLenum target,
>+    void compressedTexImage2DRobust(TextureTarget target,
>+                                    GLint level,
>+                                    GLenum internalformat,
>+                                    GLsizei width,
>+                                    GLsizei height,
>+                                    GLint border,
>+                                    GLsizei imageSize,
>+                                    GLsizei dataSize,
>+                                    const GLvoid *data);
>+    void compressedTexImage3D(TextureTarget target,
>                               GLint level,
>                               GLenum internalformat,
>                               GLsizei width,
>@@ -504,7 +1080,17 @@ class Context final : public ValidationContext
>                               GLint border,
>                               GLsizei imageSize,
>                               const void *data);
>-    void compressedTexSubImage2D(GLenum target,
>+    void compressedTexImage3DRobust(TextureTarget target,
>+                                    GLint level,
>+                                    GLenum internalformat,
>+                                    GLsizei width,
>+                                    GLsizei height,
>+                                    GLsizei depth,
>+                                    GLint border,
>+                                    GLsizei imageSize,
>+                                    GLsizei dataSize,
>+                                    const GLvoid *data);
>+    void compressedTexSubImage2D(TextureTarget target,
>                                  GLint level,
>                                  GLint xoffset,
>                                  GLint yoffset,
>@@ -513,7 +1099,17 @@ class Context final : public ValidationContext
>                                  GLenum format,
>                                  GLsizei imageSize,
>                                  const void *data);
>-    void compressedTexSubImage3D(GLenum target,
>+    void compressedTexSubImage2DRobust(TextureTarget target,
>+                                       GLint level,
>+                                       GLint xoffset,
>+                                       GLint yoffset,
>+                                       GLsizei width,
>+                                       GLsizei height,
>+                                       GLenum format,
>+                                       GLsizei imageSize,
>+                                       GLsizei dataSize,
>+                                       const GLvoid *data);
>+    void compressedTexSubImage3D(TextureTarget target,
>                                  GLint level,
>                                  GLint xoffset,
>                                  GLint yoffset,
>@@ -524,38 +1120,82 @@ class Context final : public ValidationContext
>                                  GLenum format,
>                                  GLsizei imageSize,
>                                  const void *data);
>-    void copyTextureCHROMIUM(GLuint sourceId,
>-                             GLint sourceLevel,
>-                             GLenum destTarget,
>-                             GLuint destId,
>-                             GLint destLevel,
>-                             GLint internalFormat,
>-                             GLenum destType,
>-                             GLboolean unpackFlipY,
>-                             GLboolean unpackPremultiplyAlpha,
>-                             GLboolean unpackUnmultiplyAlpha);
>-    void copySubTextureCHROMIUM(GLuint sourceId,
>-                                GLint sourceLevel,
>-                                GLenum destTarget,
>-                                GLuint destId,
>-                                GLint destLevel,
>-                                GLint xoffset,
>-                                GLint yoffset,
>-                                GLint x,
>-                                GLint y,
>-                                GLsizei width,
>-                                GLsizei height,
>-                                GLboolean unpackFlipY,
>-                                GLboolean unpackPremultiplyAlpha,
>-                                GLboolean unpackUnmultiplyAlpha);
>-    void compressedCopyTextureCHROMIUM(GLuint sourceId, GLuint destId);
>-
>-    void generateMipmap(GLenum target);
>+    void compressedTexSubImage3DRobust(TextureTarget target,
>+                                       GLint level,
>+                                       GLint xoffset,
>+                                       GLint yoffset,
>+                                       GLint zoffset,
>+                                       GLsizei width,
>+                                       GLsizei height,
>+                                       GLsizei depth,
>+                                       GLenum format,
>+                                       GLsizei imageSize,
>+                                       GLsizei dataSize,
>+                                       const GLvoid *data);
>+    void copyTexture(GLuint sourceId,
>+                     GLint sourceLevel,
>+                     TextureTarget destTarget,
>+                     GLuint destId,
>+                     GLint destLevel,
>+                     GLint internalFormat,
>+                     GLenum destType,
>+                     GLboolean unpackFlipY,
>+                     GLboolean unpackPremultiplyAlpha,
>+                     GLboolean unpackUnmultiplyAlpha);
>+    void copyTexture3D(GLuint sourceId,
>+                       GLint sourceLevel,
>+                       TextureTarget destTarget,
>+                       GLuint destId,
>+                       GLint destLevel,
>+                       GLint internalFormat,
>+                       GLenum destType,
>+                       GLboolean unpackFlipY,
>+                       GLboolean unpackPremultiplyAlpha,
>+                       GLboolean unpackUnmultiplyAlpha);
>+    void copySubTexture(GLuint sourceId,
>+                        GLint sourceLevel,
>+                        TextureTarget destTarget,
>+                        GLuint destId,
>+                        GLint destLevel,
>+                        GLint xoffset,
>+                        GLint yoffset,
>+                        GLint x,
>+                        GLint y,
>+                        GLsizei width,
>+                        GLsizei height,
>+                        GLboolean unpackFlipY,
>+                        GLboolean unpackPremultiplyAlpha,
>+                        GLboolean unpackUnmultiplyAlpha);
>+    void copySubTexture3D(GLuint sourceId,
>+                          GLint sourceLevel,
>+                          TextureTarget destTarget,
>+                          GLuint destId,
>+                          GLint destLevel,
>+                          GLint xoffset,
>+                          GLint yoffset,
>+                          GLint zoffset,
>+                          GLint x,
>+                          GLint y,
>+                          GLint z,
>+                          GLsizei width,
>+                          GLsizei height,
>+                          GLsizei depth,
>+                          GLboolean unpackFlipY,
>+                          GLboolean unpackPremultiplyAlpha,
>+                          GLboolean unpackUnmultiplyAlpha);
>+    void compressedCopyTexture(GLuint sourceId, GLuint destId);
>+
>+    void generateMipmap(TextureType target);
> 
>     void flush();
>     void finish();
> 
>     void getBufferPointerv(BufferBinding target, GLenum pname, void **params);
>+    void getBufferPointervRobust(BufferBinding target,
>+                                 GLenum pname,
>+                                 GLsizei bufSize,
>+                                 GLsizei *length,
>+                                 void **params);
>     void *mapBuffer(BufferBinding target, GLenum access);
>     GLboolean unmapBuffer(BufferBinding target);
>     void *mapBufferRange(BufferBinding target,
>@@ -564,7 +1204,7 @@ class Context final : public ValidationContext
>                          GLbitfield access);
>     void flushMappedBufferRange(BufferBinding target, GLintptr offset, GLsizeiptr length);
> 
>-    void beginTransformFeedback(GLenum primitiveMode);
>+    void beginTransformFeedback(PrimitiveMode primitiveMode);
> 
>     bool hasActiveTransformFeedback(GLuint program) const;
> 
>@@ -583,11 +1223,11 @@ class Context final : public ValidationContext
>     void getSynciv(GLsync sync, GLenum pname, GLsizei bufSize, GLsizei *length, GLint *values);
> 
>     // CHROMIUM_framebuffer_mixed_samples
>-    void setCoverageModulation(GLenum components);
>+    void coverageModulation(GLenum components);
> 
>     // CHROMIUM_path_rendering
>-    void loadPathRenderingMatrix(GLenum matrixMode, const GLfloat *matrix);
>-    void loadPathRenderingIdentityMatrix(GLenum matrixMode);
>+    void matrixLoadf(GLenum matrixMode, const GLfloat *matrix);
>+    void matrixLoadIdentity(GLenum matrixMode);
>     void stencilFillPath(GLuint path, GLenum fillMode, GLuint mask);
>     void stencilStrokePath(GLuint path, GLint reference, GLuint mask);
>     void coverFillPath(GLuint path, GLenum coverMode);
>@@ -663,14 +1303,27 @@ class Context final : public ValidationContext
>     void bindFramebuffer(GLenum target, GLuint framebuffer);
>     void bindRenderbuffer(GLenum target, GLuint renderbuffer);
> 
>-    void texStorage2DMultisample(GLenum target,
>+    void texStorage2DMultisample(TextureType target,
>+                                 GLsizei samples,
>+                                 GLenum internalformat,
>+                                 GLsizei width,
>+                                 GLsizei height,
>+                                 GLboolean fixedsamplelocations);
>+
>+    void texStorage3DMultisample(TextureType target,
>                                  GLsizei samples,
>                                  GLenum internalformat,
>                                  GLsizei width,
>                                  GLsizei height,
>+                                 GLsizei depth,
>                                  GLboolean fixedsamplelocations);
> 
>     void getMultisamplefv(GLenum pname, GLuint index, GLfloat *val);
>+    void getMultisamplefvRobust(GLenum pname,
>+                                GLuint index,
>+                                GLsizei bufSize,
>+                                GLsizei *length,
>+                                GLfloat *val);
> 
>     void copyBufferSubData(BufferBinding readTarget,
>                            BufferBinding writeTarget,
>@@ -706,6 +1359,11 @@ class Context final : public ValidationContext
>     void getAttachedShaders(GLuint program, GLsizei maxcount, GLsizei *count, GLuint *shaders);
>     GLint getAttribLocation(GLuint program, const GLchar *name);
>     void getProgramiv(GLuint program, GLenum pname, GLint *params);
>+    void getProgramivRobust(GLuint program,
>+                            GLenum pname,
>+                            GLsizei bufSize,
>+                            GLsizei *length,
>+                            GLint *params);
>     void getProgramPipelineiv(GLuint pipeline, GLenum pname, GLint *params);
>     void getProgramInfoLog(GLuint program, GLsizei bufsize, GLsizei *length, GLchar *infolog);
>     void getProgramPipelineInfoLog(GLuint pipeline,
>@@ -713,6 +1371,12 @@ class Context final : public ValidationContext
>                                    GLsizei *length,
>                                    GLchar *infoLog);
>     void getShaderiv(GLuint shader, GLenum pname, GLint *params);
>+    void getShaderivRobust(GLuint shader,
>+                           GLenum pname,
>+                           GLsizei bufSize,
>+                           GLsizei *length,
>+                           GLint *params);
>+
>     void getShaderInfoLog(GLuint shader, GLsizei bufsize, GLsizei *length, GLchar *infolog);
>     void getShaderPrecisionFormat(GLenum shadertype,
>                                   GLenum precisiontype,
>@@ -720,7 +1384,17 @@ class Context final : public ValidationContext
>                                   GLint *precision);
>     void getShaderSource(GLuint shader, GLsizei bufsize, GLsizei *length, GLchar *source);
>     void getUniformfv(GLuint program, GLint location, GLfloat *params);
>+    void getUniformfvRobust(GLuint program,
>+                            GLint location,
>+                            GLsizei bufSize,
>+                            GLsizei *length,
>+                            GLfloat *params);
>     void getUniformiv(GLuint program, GLint location, GLint *params);
>+    void getUniformivRobust(GLuint program,
>+                            GLint location,
>+                            GLsizei bufSize,
>+                            GLsizei *length,
>+                            GLint *params);
>     GLint getUniformLocation(GLuint program, const GLchar *name);
>     GLboolean isBuffer(GLuint buffer);
>     GLboolean isEnabled(GLenum cap);
>@@ -834,6 +1508,11 @@ class Context final : public ValidationContext
>     void programBinary(GLuint program, GLenum binaryFormat, const void *binary, GLsizei length);
> 
>     void getUniformuiv(GLuint program, GLint location, GLuint *params);
>+    void getUniformuivRobust(GLuint program,
>+                             GLint location,
>+                             GLsizei bufSize,
>+                             GLsizei *length,
>+                             GLuint *params);
>     GLint getFragDataLocation(GLuint program, const GLchar *name);
>     void getUniformIndices(GLuint program,
>                            GLsizei uniformCount,
>@@ -849,6 +1528,12 @@ class Context final : public ValidationContext
>                                  GLuint uniformBlockIndex,
>                                  GLenum pname,
>                                  GLint *params);
>+    void getActiveUniformBlockivRobust(GLuint program,
>+                                       GLuint uniformBlockIndex,
>+                                       GLenum pname,
>+                                       GLsizei bufSize,
>+                                       GLsizei *length,
>+                                       GLint *params);
>     void getActiveUniformBlockName(GLuint program,
>                                    GLuint uniformBlockIndex,
>                                    GLsizei bufSize,
>@@ -862,8 +1547,14 @@ class Context final : public ValidationContext
>     GLenum clientWaitSync(GLsync sync, GLbitfield flags, GLuint64 timeout);
>     void waitSync(GLsync sync, GLbitfield flags, GLuint64 timeout);
>     void getInteger64v(GLenum pname, GLint64 *params);
>+    void getInteger64vRobust(GLenum pname, GLsizei bufSize, GLsizei *length, GLint64 *data);
> 
>     void getBufferParameteri64v(BufferBinding target, GLenum pname, GLint64 *params);
>+    void getBufferParameteri64vRobust(BufferBinding target,
>+                                      GLenum pname,
>+                                      GLsizei bufSize,
>+                                      GLsizei *length,
>+                                      GLint64 *params);
>     void genSamplers(GLsizei count, GLuint *samplers);
>     void deleteSamplers(GLsizei count, const GLuint *samplers);
>     void getInternalformativ(GLenum target,
>@@ -871,6 +1562,12 @@ class Context final : public ValidationContext
>                              GLenum pname,
>                              GLsizei bufSize,
>                              GLint *params);
>+    void getInternalformativRobust(GLenum target,
>+                                   GLenum internalformat,
>+                                   GLenum pname,
>+                                   GLsizei bufSize,
>+                                   GLsizei *length,
>+                                   GLint *params);
> 
>     void programUniform1i(GLuint program, GLint location, GLint v0);
>     void programUniform2i(GLuint program, GLint location, GLint v0, GLint v1);
>@@ -965,13 +1662,110 @@ class Context final : public ValidationContext
>     void genProgramPipelines(GLsizei n, GLuint *pipelines);
>     GLboolean isProgramPipeline(GLuint pipeline);
> 
>-    // Consumes the error.
>-    void handleError(const Error &error) override;
>+    void getTranslatedShaderSource(GLuint shader, GLsizei bufsize, GLsizei *length, GLchar *source);
>+    void getnUniformfv(GLuint program, GLint location, GLsizei bufSize, GLfloat *params);
>+    void getnUniformfvRobust(GLuint program,
>+                             GLint location,
>+                             GLsizei bufSize,
>+                             GLsizei *length,
>+                             GLfloat *params);
>+    void getnUniformiv(GLuint program, GLint location, GLsizei bufSize, GLint *params);
>+    void getnUniformivRobust(GLuint program,
>+                             GLint location,
>+                             GLsizei bufSize,
>+                             GLsizei *length,
>+                             GLint *params);
>+    void getnUniformuivRobust(GLuint program,
>+                              GLint location,
>+                              GLsizei bufSize,
>+                              GLsizei *length,
>+                              GLuint *params);
>+    void readnPixels(GLint x,
>+                     GLint y,
>+                     GLsizei width,
>+                     GLsizei height,
>+                     GLenum format,
>+                     GLenum type,
>+                     GLsizei bufSize,
>+                     void *data);
>+    void eGLImageTargetTexture2D(TextureType target, GLeglImageOES image);
>+    void eGLImageTargetRenderbufferStorage(GLenum target, GLeglImageOES image);
>+
>+    void getFramebufferParameteriv(GLenum target, GLenum pname, GLint *params);
>+    void getFramebufferParameterivRobust(GLenum target,
>+                                         GLenum pname,
>+                                         GLsizei bufSize,
>+                                         GLsizei *length,
>+                                         GLint *params);
>+    void framebufferParameteri(GLenum target, GLenum pname, GLint param);
>+
>+    void dispatchCompute(GLuint numGroupsX, GLuint numGroupsY, GLuint numGroupsZ);
>+    void dispatchComputeIndirect(GLintptr indirect);
>+
>+    void texStorage1D(GLenum target, GLsizei levels, GLenum internalformat, GLsizei width);
>+    void texStorage2D(TextureType target,
>+                      GLsizei levels,
>+                      GLenum internalFormat,
>+                      GLsizei width,
>+                      GLsizei height);
>+    void texStorage3D(TextureType target,
>+                      GLsizei levels,
>+                      GLenum internalFormat,
>+                      GLsizei width,
>+                      GLsizei height,
>+                      GLsizei depth);
>+
>+    void memoryBarrier(GLbitfield barriers);
>+    void memoryBarrierByRegion(GLbitfield barriers);
>+    void multiDrawArrays(PrimitiveMode mode,
>+                         const GLint *firsts,
>+                         const GLsizei *counts,
>+                         GLsizei drawcount);
>+    void multiDrawArraysInstanced(PrimitiveMode mode,
>+                                  const GLint *firsts,
>+                                  const GLsizei *counts,
>+                                  const GLsizei *instanceCounts,
>+                                  GLsizei drawcount);
>+    void multiDrawElements(PrimitiveMode mode,
>+                           const GLsizei *counts,
>+                           DrawElementsType type,
>+                           const GLvoid *const *indices,
>+                           GLsizei drawcount);
>+    void multiDrawElementsInstanced(PrimitiveMode mode,
>+                                    const GLsizei *counts,
>+                                    DrawElementsType type,
>+                                    const GLvoid *const *indices,
>+                                    const GLsizei *instanceCounts,
>+                                    GLsizei drawcount);
>+
>+    void provokingVertex(ProvokingVertex provokeMode);
>+
>+    void framebufferTexture(GLenum target, GLenum attachment, GLuint texture, GLint level);
>+
>+    // EXT_blend_func_extended
>+    void bindFragDataLocationIndexed(GLuint program,
>+                                     GLuint colorNumber,
>+                                     GLuint index,
>+                                     const char *name);
>+    void bindFragDataLocation(GLuint program, GLuint colorNumber, const char *name);
>+    int getFragDataIndex(GLuint program, const char *name);
>+    int getProgramResourceLocationIndex(GLuint program, GLenum programInterface, const char *name);
>+
>+    // Consumes an error.
>+    void handleError(GLenum errorCode,
>+                     const char *message,
>+                     const char *file,
>+                     const char *function,
>+                     unsigned int line);
>+
>+    void validationError(GLenum errorCode, const char *message);
> 
>     GLenum getError();
>-    void markContextLost();
>-    bool isContextLost();
>-    GLenum getResetStatus();
>+    void markContextLost(GraphicsResetStatus status);
>+
>+    bool isContextLost() const { return mContextLost; }
>+
>+    GLenum getGraphicsResetStatus();
>     bool isResetNotificationEnabled();
> 
>     const egl::Config *getConfig() const;
>@@ -990,56 +1784,125 @@ class Context final : public ValidationContext
>     rx::ContextImpl *getImplementation() const { return mImplementation.get(); }
>     const Workarounds &getWorkarounds() const;
> 
>-    void getFramebufferParameteriv(GLenum target, GLenum pname, GLint *params);
>-    void framebufferParameteri(GLenum target, GLenum pname, GLint param);
>-
>-    Error getScratchBuffer(size_t requestedSizeBytes, angle::MemoryBuffer **scratchBufferOut) const;
>-    Error getZeroFilledBuffer(size_t requstedSizeBytes, angle::MemoryBuffer **zeroBufferOut) const;
>+    ANGLE_NO_DISCARD bool getScratchBuffer(size_t requestedSizeBytes,
>+                                           angle::MemoryBuffer **scratchBufferOut) const;
>+    ANGLE_NO_DISCARD bool getZeroFilledBuffer(size_t requstedSizeBytes,
>+                                              angle::MemoryBuffer **zeroBufferOut) const;
>+    angle::ScratchBuffer *getScratchBuffer() const { return &mScratchBuffer; }
> 
>-    void dispatchCompute(GLuint numGroupsX, GLuint numGroupsY, GLuint numGroupsZ);
>-    void dispatchComputeIndirect(GLintptr indirect);
>+    angle::Result prepareForDispatch();
> 
>     MemoryProgramCache *getMemoryProgramCache() const { return mMemoryProgramCache; }
> 
>-    template <EntryPoint EP, typename... ParamsT>
>-    void gatherParams(ParamsT &&... params);
>+    bool hasBeenCurrent() const { return mHasBeenCurrent; }
>+    egl::Display *getDisplay() const { return mDisplay; }
>+    egl::Surface *getCurrentDrawSurface() const { return mCurrentSurface; }
>+    egl::Surface *getCurrentReadSurface() const { return mCurrentSurface; }
> 
>-    void texStorage2D(GLenum target,
>-                      GLsizei levels,
>-                      GLenum internalFormat,
>-                      GLsizei width,
>-                      GLsizei height);
>-    void texStorage3D(GLenum target,
>-                      GLsizei levels,
>-                      GLenum internalFormat,
>-                      GLsizei width,
>-                      GLsizei height,
>-                      GLsizei depth);
>+    bool isRobustResourceInitEnabled() const { return mState.isRobustResourceInitEnabled(); }
> 
>-    void memoryBarrier(GLbitfield barriers);
>-    void memoryBarrierByRegion(GLbitfield barriers);
>+    bool isCurrentTransformFeedback(const TransformFeedback *tf) const;
> 
>-    // Notification for a state change in a Texture.
>-    void onTextureChange(const Texture *texture);
>+    bool isCurrentVertexArray(const VertexArray *va) const
>+    {
>+        return mState.isCurrentVertexArray(va);
>+    }
> 
>-    egl::Display *getCurrentDisplay() const { return mCurrentDisplay; }
>-    egl::Surface *getCurrentDrawSurface() const { return mCurrentSurface; }
>-    egl::Surface *getCurrentReadSurface() const { return mCurrentSurface; }
>+    const State &getState() const { return mState; }
>+    GLint getClientMajorVersion() const { return mState.getClientMajorVersion(); }
>+    GLint getClientMinorVersion() const { return mState.getClientMinorVersion(); }
>+    const Version &getClientVersion() const { return mState.getClientVersion(); }
>+    const Caps &getCaps() const { return mState.getCaps(); }
>+    const TextureCapsMap &getTextureCaps() const { return mState.getTextureCaps(); }
>+    const Extensions &getExtensions() const { return mState.getExtensions(); }
>+    const Limitations &getLimitations() const { return mState.getLimitations(); }
>+    bool skipValidation() const { return mSkipValidation; }
>+    bool isGLES1() const;
>+
>+    // Specific methods needed for validation.
>+    bool getQueryParameterInfo(GLenum pname, GLenum *type, unsigned int *numParams);
>+    bool getIndexedQueryParameterInfo(GLenum target, GLenum *type, unsigned int *numParams);
>+
>+    ANGLE_INLINE Program *getProgramResolveLink(GLuint handle) const
>+    {
>+        Program *program = mState.mShaderProgramManager->getProgram(handle);
>+        if (program)
>+        {
>+            program->resolveLink(this);
>+        }
>+        return program;
>+    }
>+
>+    Program *getProgramNoResolveLink(GLuint handle) const;
>+    Shader *getShader(GLuint handle) const;
>+
>+    ANGLE_INLINE bool isTextureGenerated(GLuint texture) const
>+    {
>+        return mState.mTextureManager->isHandleGenerated(texture);
>+    }
>+
>+    ANGLE_INLINE bool isBufferGenerated(GLuint buffer) const
>+    {
>+        return mState.mBufferManager->isHandleGenerated(buffer);
>+    }
>+
>+    bool isRenderbufferGenerated(GLuint renderbuffer) const;
>+    bool isFramebufferGenerated(GLuint framebuffer) const;
>+    bool isProgramPipelineGenerated(GLuint pipeline) const;
>+
>+    bool usingDisplayTextureShareGroup() const;
>+
>+    // Hack for the special WebGL 1 "DEPTH_STENCIL" internal format.
>+    GLenum getConvertedRenderbufferFormat(GLenum internalformat) const;
>+
>+    bool isWebGL() const { return mState.isWebGL(); }
>+    bool isWebGL1() const { return mState.isWebGL1(); }
>+
>+    bool isValidBufferBinding(BufferBinding binding) const { return mValidBufferBindings[binding]; }
>+
>+    // GLES1 emulation: Renderer level (for validation)
>+    int vertexArrayIndex(ClientVertexArrayType type) const;
>+    static int TexCoordArrayIndex(unsigned int unit);
>+
>+    // GL_KHR_parallel_shader_compile
>+    void maxShaderCompilerThreads(GLuint count);
>+    std::shared_ptr<angle::WorkerThreadPool> getWorkerThreadPool() const { return mThreadPool; }
> 
>-    bool isRobustResourceInitEnabled() const { return mGLState.isRobustResourceInitEnabled(); }
>+    const StateCache &getStateCache() const { return mStateCache; }
>+    StateCache &getStateCache() { return mStateCache; }
>+
>+    void onSubjectStateChange(const Context *context,
>+                              angle::SubjectIndex index,
>+                              angle::SubjectMessage message) override;
>+
>+    void onSamplerUniformChange(size_t textureUnitIndex);
>+
>+    bool isBufferAccessValidationEnabled() const { return mBufferAccessValidationEnabled; }
> 
>   private:
>-    Error prepareForDraw();
>-    void syncRendererState();
>-    void syncRendererState(const State::DirtyBits &bitMask, const State::DirtyObjects &objectMask);
>-    void syncStateForReadPixels();
>-    void syncStateForTexImage();
>-    void syncStateForClear();
>-    void syncStateForBlit();
>+    void initialize();
>+
>+    bool noopDraw(PrimitiveMode mode, GLsizei count);
>+    bool noopDrawInstanced(PrimitiveMode mode, GLsizei count, GLsizei instanceCount);
>+
>+    angle::Result prepareForDraw(PrimitiveMode mode);
>+    angle::Result prepareForClear(GLbitfield mask);
>+    angle::Result prepareForClearBuffer(GLenum buffer, GLint drawbuffer);
>+    angle::Result syncState(const State::DirtyBits &bitMask, const State::DirtyObjects &objectMask);
>+    angle::Result syncDirtyBits();
>+    angle::Result syncDirtyBits(const State::DirtyBits &bitMask);
>+    angle::Result syncDirtyObjects(const State::DirtyObjects &objectMask);
>+    angle::Result syncStateForReadPixels();
>+    angle::Result syncStateForTexImage();
>+    angle::Result syncStateForBlit();
>+    angle::Result syncStateForPathOperation();
>+
>     VertexArray *checkVertexArrayAllocation(GLuint vertexArrayHandle);
>     TransformFeedback *checkTransformFeedbackAllocation(GLuint transformFeedback);
> 
>-    void detachBuffer(GLuint buffer);
>+    angle::Result onProgramLink(Program *programObject);
>+
>+    void detachBuffer(Buffer *buffer);
>     void detachTexture(GLuint texture);
>     void detachFramebuffer(GLuint framebuffer);
>     void detachRenderbuffer(GLuint renderbuffer);
>@@ -1048,30 +1911,47 @@ class Context final : public ValidationContext
>     void detachSampler(GLuint sampler);
>     void detachProgramPipeline(GLuint pipeline);
> 
>+    // A small helper method to facilitate using the ANGLE_CONTEXT_TRY macro.
>+    void tryGenPaths(GLsizei range, GLuint *createdOut);
>+
>+    egl::Error setDefaultFramebuffer(egl::Surface *surface);
>+    egl::Error unsetDefaultFramebuffer();
>+
>     void initRendererString();
>     void initVersionStrings();
>     void initExtensionStrings();
> 
>-    void initCaps(const egl::DisplayExtensions &displayExtensions, bool robustResourceInit);
>+    Extensions generateSupportedExtensions() const;
>+    void initCaps();
>     void updateCaps();
>     void initWorkarounds();
> 
>-    LabeledObject *getLabeledObject(GLenum identifier, GLuint name) const;
>-    LabeledObject *getLabeledObjectFromPtr(const void *ptr) const;
>+    gl::LabeledObject *getLabeledObject(GLenum identifier, GLuint name) const;
>+    gl::LabeledObject *getLabeledObjectFromPtr(const void *ptr) const;
>+
>+    void setUniform1iImpl(Program *program, GLint location, GLsizei count, const GLint *v);
>+
>+    State mState;
>+    bool mSkipValidation;
>+    bool mDisplayTextureShareGroup;
>+
>+    // Recorded errors
>+    ErrorSet mErrors;
>+
>+    // Stores for each buffer binding type whether is it allowed to be used in this context.
>+    angle::PackedEnumBitSet<BufferBinding> mValidBufferBindings;
> 
>     std::unique_ptr<rx::ContextImpl> mImplementation;
> 
>-    // Caps to use for validation
>-    Caps mCaps;
>-    TextureCapsMap mTextureCaps;
>-    Extensions mExtensions;
>-    Limitations mLimitations;
>+    EGLLabelKHR mLabel;
>+
>+    // Extensions supported by the implementation plus extensions that are implemented entirely
>+    // within the frontend.
>+    Extensions mSupportedExtensions;
> 
>     // Shader compiler. Lazily initialized hence the mutable value.
>     mutable BindingPointer<Compiler> mCompiler;
> 
>-    State mGLState;
>-
>     const egl::Config *mConfig;
>     EGLenum mClientType;
> 
>@@ -1097,23 +1977,31 @@ class Context final : public ValidationContext
>     const char *mRequestableExtensionString;
>     std::vector<const char *> mRequestableExtensionStrings;
> 
>-    // Recorded errors
>-    typedef std::set<GLenum> ErrorSet;
>-    ErrorSet mErrors;
>+    // GLES1 renderer state
>+    std::unique_ptr<GLES1Renderer> mGLES1Renderer;
> 
>     // Current/lost context flags
>     bool mHasBeenCurrent;
>     bool mContextLost;
>-    GLenum mResetStatus;
>+    GraphicsResetStatus mResetStatus;
>     bool mContextLostForced;
>     GLenum mResetStrategy;
>-    bool mRobustAccess;
>+    const bool mRobustAccess;
>+    const bool mSurfacelessSupported;
>+    const bool mExplicitContextAvailable;
>     egl::Surface *mCurrentSurface;
>-    egl::Display *mCurrentDisplay;
>-    Framebuffer *mSurfacelessFramebuffer;
>-    bool mWebGLContext;
>+    egl::Display *mDisplay;
>+    const bool mWebGLContext;
>+    bool mBufferAccessValidationEnabled;
>+    const bool mExtensionsEnabled;
>     MemoryProgramCache *mMemoryProgramCache;
> 
>+    State::DirtyObjects mDrawDirtyObjects;
>+    State::DirtyObjects mPathOperationDirtyObjects;
>+
>+    StateCache mStateCache;
>+
>+    State::DirtyBits mAllDirtyBits;
>     State::DirtyBits mTexImageDirtyBits;
>     State::DirtyObjects mTexImageDirtyObjects;
>     State::DirtyBits mReadPixelsDirtyBits;
>@@ -1122,32 +2010,24 @@ class Context final : public ValidationContext
>     State::DirtyObjects mClearDirtyObjects;
>     State::DirtyBits mBlitDirtyBits;
>     State::DirtyObjects mBlitDirtyObjects;
>+    State::DirtyBits mComputeDirtyBits;
>+    State::DirtyObjects mComputeDirtyObjects;
> 
>     Workarounds mWorkarounds;
> 
>+    // Binding to container objects that use dependent state updates.
>+    angle::ObserverBinding mVertexArrayObserverBinding;
>+    angle::ObserverBinding mDrawFramebufferObserverBinding;
>+    angle::ObserverBinding mReadFramebufferObserverBinding;
>+    std::vector<angle::ObserverBinding> mUniformBufferObserverBindings;
>+    std::vector<angle::ObserverBinding> mSamplerObserverBindings;
>+
>     // Not really a property of context state. The size and contexts change per-api-call.
>     mutable angle::ScratchBuffer mScratchBuffer;
>     mutable angle::ScratchBuffer mZeroFilledBuffer;
>-};
> 
>-template <EntryPoint EP, typename... ArgsT>
>-ANGLE_INLINE void Context::gatherParams(ArgsT &&... args)
>-{
>-    static_assert(sizeof(EntryPointParamType<EP>) <= kParamsBufferSize,
>-                  "Params struct too large, please increase kParamsBufferSize.");
>-
>-    mSavedArgsType = &EntryPointParamType<EP>::TypeInfo;
>-
>-    // Skip doing any work for ParamsBase/Invalid type.
>-    if (!EntryPointParamType<EP>::TypeInfo.isValid())
>-    {
>-        return;
>-    }
>-
>-    EntryPointParamType<EP> *objBuffer =
>-        reinterpret_cast<EntryPointParamType<EP> *>(mParamsBuffer.data());
>-    EntryPointParamType<EP>::template Factory<EP>(objBuffer, this, std::forward<ArgsT>(args)...);
>-}
>+    std::shared_ptr<angle::WorkerThreadPool> mThreadPool;
>+};
> 
> }  // namespace gl
> 
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/Context.inl.h b/Source/ThirdParty/ANGLE/src/libANGLE/Context.inl.h
>new file mode 100644
>index 00000000000..4738160c3f5
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/Context.inl.h
>@@ -0,0 +1,135 @@
>+//
>+// Copyright 2018 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+
>+// Context.inl.h: Defines inline functions of gl::Context class
>+// Has to be included after libANGLE/Context.h when using one
>+// of the defined functions
>+
>+#ifndef LIBANGLE_CONTEXT_INL_H_
>+#define LIBANGLE_CONTEXT_INL_H_
>+
>+#include "libANGLE/GLES1Renderer.h"
>+#include "libANGLE/renderer/ContextImpl.h"
>+
>+#define ANGLE_HANDLE_ERR(X) \
>+    (void)(X);              \
>+    return;
>+#define ANGLE_CONTEXT_TRY(EXPR) ANGLE_TRY_TEMPLATE(EXPR, ANGLE_HANDLE_ERR)
>+
>+namespace gl
>+{
>+constexpr angle::PackedEnumMap<PrimitiveMode, GLsizei> kMinimumPrimitiveCounts = {{
>+    {PrimitiveMode::Points, 1},
>+    {PrimitiveMode::Lines, 2},
>+    {PrimitiveMode::LineLoop, 2},
>+    {PrimitiveMode::LineStrip, 2},
>+    {PrimitiveMode::Triangles, 3},
>+    {PrimitiveMode::TriangleStrip, 3},
>+    {PrimitiveMode::TriangleFan, 3},
>+    {PrimitiveMode::LinesAdjacency, 2},
>+    {PrimitiveMode::LineStripAdjacency, 2},
>+    {PrimitiveMode::TrianglesAdjacency, 3},
>+    {PrimitiveMode::TriangleStripAdjacency, 3},
>+}};
>+
>+ANGLE_INLINE void MarkTransformFeedbackBufferUsage(const Context *context,
>+                                                   GLsizei count,
>+                                                   GLsizei instanceCount)
>+{
>+    if (context->getStateCache().isTransformFeedbackActiveUnpaused())
>+    {
>+        TransformFeedback *transformFeedback = context->getState().getCurrentTransformFeedback();
>+        transformFeedback->onVerticesDrawn(context, count, instanceCount);
>+    }
>+}
>+
>+// Return true if the draw is a no-op, else return false.
>+//  A no-op draw occurs if the count of vertices is less than the minimum required to
>+//  have a valid primitive for this mode (0 for points, 0-1 for lines, 0-2 for tris).
>+ANGLE_INLINE bool Context::noopDraw(PrimitiveMode mode, GLsizei count)
>+{
>+    return count < kMinimumPrimitiveCounts[mode];
>+}
>+
>+ANGLE_INLINE angle::Result Context::syncDirtyBits()
>+{
>+    const State::DirtyBits &dirtyBits = mState.getDirtyBits();
>+    ANGLE_TRY(mImplementation->syncState(this, dirtyBits, mAllDirtyBits));
>+    mState.clearDirtyBits();
>+    return angle::Result::Continue;
>+}
>+
>+ANGLE_INLINE angle::Result Context::syncDirtyBits(const State::DirtyBits &bitMask)
>+{
>+    const State::DirtyBits &dirtyBits = (mState.getDirtyBits() & bitMask);
>+    ANGLE_TRY(mImplementation->syncState(this, dirtyBits, bitMask));
>+    mState.clearDirtyBits(dirtyBits);
>+    return angle::Result::Continue;
>+}
>+
>+ANGLE_INLINE angle::Result Context::syncDirtyObjects(const State::DirtyObjects &objectMask)
>+{
>+    return mState.syncDirtyObjects(this, objectMask);
>+}
>+
>+ANGLE_INLINE angle::Result Context::prepareForDraw(PrimitiveMode mode)
>+{
>+    if (mGLES1Renderer)
>+    {
>+        ANGLE_TRY(mGLES1Renderer->prepareForDraw(mode, this, &mState));
>+    }
>+
>+    ANGLE_TRY(syncDirtyObjects(mDrawDirtyObjects));
>+    ASSERT(!isRobustResourceInitEnabled() ||
>+           !mState.getDrawFramebuffer()->hasResourceThatNeedsInit());
>+    return syncDirtyBits();
>+}
>+
>+ANGLE_INLINE void Context::drawArrays(PrimitiveMode mode, GLint first, GLsizei count)
>+{
>+    // No-op if count draws no primitives for given mode
>+    if (noopDraw(mode, count))
>+    {
>+        return;
>+    }
>+
>+    ANGLE_CONTEXT_TRY(prepareForDraw(mode));
>+    ANGLE_CONTEXT_TRY(mImplementation->drawArrays(this, mode, first, count));
>+    MarkTransformFeedbackBufferUsage(this, count, 1);
>+}
>+
>+ANGLE_INLINE void Context::drawElements(PrimitiveMode mode,
>+                                        GLsizei count,
>+                                        DrawElementsType type,
>+                                        const void *indices)
>+{
>+    // No-op if count draws no primitives for given mode
>+    if (noopDraw(mode, count))
>+    {
>+        return;
>+    }
>+
>+    ANGLE_CONTEXT_TRY(prepareForDraw(mode));
>+    ANGLE_CONTEXT_TRY(mImplementation->drawElements(this, mode, count, type, indices));
>+}
>+
>+ANGLE_INLINE void StateCache::onBufferBindingChange(Context *context)
>+{
>+    updateBasicDrawStatesError();
>+    updateBasicDrawElementsError();
>+}
>+
>+ANGLE_INLINE void Context::bindBuffer(BufferBinding target, GLuint buffer)
>+{
>+    Buffer *bufferObject =
>+        mState.mBufferManager->checkBufferAllocation(mImplementation.get(), buffer);
>+    mState.setBufferBinding(this, target, bufferObject);
>+    mStateCache.onBufferBindingChange(this);
>+}
>+
>+}  // namespace gl
>+
>+#endif  // LIBANGLE_CONTEXT_INL_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/ContextState.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/ContextState.cpp
>deleted file mode 100644
>index d109cca76da..00000000000
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/ContextState.cpp
>+++ /dev/null
>@@ -1,839 +0,0 @@
>-//
>-// Copyright (c) 2014 The ANGLE Project Authors. All rights reserved.
>-// Use of this source code is governed by a BSD-style license that can be
>-// found in the LICENSE file.
>-//
>-
>-// Data.cpp: Container class for all GL relevant state, caps and objects
>-
>-#include "libANGLE/ContextState.h"
>-
>-#include "libANGLE/Framebuffer.h"
>-#include "libANGLE/ResourceManager.h"
>-
>-namespace gl
>-{
>-
>-namespace
>-{
>-
>-template <typename T>
>-using ContextStateMember = T *(ContextState::*);
>-
>-template <typename T>
>-T *AllocateOrGetSharedResourceManager(const ContextState *shareContextState,
>-                                      ContextStateMember<T> member)
>-{
>-    if (shareContextState)
>-    {
>-        T *resourceManager = (*shareContextState).*member;
>-        resourceManager->addRef();
>-        return resourceManager;
>-    }
>-    else
>-    {
>-        return new T();
>-    }
>-}
>-
>-TextureManager *AllocateOrGetSharedTextureManager(const ContextState *shareContextState,
>-                                                  TextureManager *shareTextures,
>-                                                  ContextStateMember<TextureManager> member)
>-{
>-    if (shareContextState)
>-    {
>-        TextureManager *textureManager = (*shareContextState).*member;
>-        ASSERT(shareTextures == nullptr || textureManager == shareTextures);
>-        textureManager->addRef();
>-        return textureManager;
>-    }
>-    else if (shareTextures)
>-    {
>-        TextureManager *textureManager = shareTextures;
>-        textureManager->addRef();
>-        return textureManager;
>-    }
>-    else
>-    {
>-        return new TextureManager();
>-    }
>-}
>-
>-}  // anonymous namespace
>-
>-ContextState::ContextState(ContextID contextIn,
>-                           const ContextState *shareContextState,
>-                           TextureManager *shareTextures,
>-                           const Version &clientVersion,
>-                           State *stateIn,
>-                           const Caps &capsIn,
>-                           const TextureCapsMap &textureCapsIn,
>-                           const Extensions &extensionsIn,
>-                           const Limitations &limitationsIn)
>-    : mClientVersion(clientVersion),
>-      mContext(contextIn),
>-      mState(stateIn),
>-      mCaps(capsIn),
>-      mTextureCaps(textureCapsIn),
>-      mExtensions(extensionsIn),
>-      mLimitations(limitationsIn),
>-      mBuffers(AllocateOrGetSharedResourceManager(shareContextState, &ContextState::mBuffers)),
>-      mShaderPrograms(
>-          AllocateOrGetSharedResourceManager(shareContextState, &ContextState::mShaderPrograms)),
>-      mTextures(AllocateOrGetSharedTextureManager(shareContextState,
>-                                                  shareTextures,
>-                                                  &ContextState::mTextures)),
>-      mRenderbuffers(
>-          AllocateOrGetSharedResourceManager(shareContextState, &ContextState::mRenderbuffers)),
>-      mSamplers(AllocateOrGetSharedResourceManager(shareContextState, &ContextState::mSamplers)),
>-      mSyncs(AllocateOrGetSharedResourceManager(shareContextState, &ContextState::mSyncs)),
>-      mPaths(AllocateOrGetSharedResourceManager(shareContextState, &ContextState::mPaths)),
>-      mFramebuffers(new FramebufferManager()),
>-      mPipelines(new ProgramPipelineManager())
>-{
>-}
>-
>-ContextState::~ContextState()
>-{
>-    // Handles are released by the Context.
>-}
>-
>-bool ContextState::isWebGL() const
>-{
>-    return mExtensions.webglCompatibility;
>-}
>-
>-bool ContextState::isWebGL1() const
>-{
>-    return (isWebGL() && mClientVersion.major == 2);
>-}
>-
>-const TextureCaps &ContextState::getTextureCap(GLenum internalFormat) const
>-{
>-    return mTextureCaps.get(internalFormat);
>-}
>-
>-ValidationContext::ValidationContext(const ValidationContext *shareContext,
>-                                     TextureManager *shareTextures,
>-                                     const Version &clientVersion,
>-                                     State *state,
>-                                     const Caps &caps,
>-                                     const TextureCapsMap &textureCaps,
>-                                     const Extensions &extensions,
>-                                     const Limitations &limitations,
>-                                     bool skipValidation)
>-    : mState(reinterpret_cast<ContextID>(this),
>-             shareContext ? &shareContext->mState : nullptr,
>-             shareTextures,
>-             clientVersion,
>-             state,
>-             caps,
>-             textureCaps,
>-             extensions,
>-             limitations),
>-      mSkipValidation(skipValidation),
>-      mDisplayTextureShareGroup(shareTextures != nullptr)
>-{
>-}
>-
>-ValidationContext::~ValidationContext()
>-{
>-}
>-
>-bool ValidationContext::getQueryParameterInfo(GLenum pname, GLenum *type, unsigned int *numParams)
>-{
>-    // Please note: the query type returned for DEPTH_CLEAR_VALUE in this implementation
>-    // is FLOAT rather than INT, as would be suggested by the GL ES 2.0 spec. This is due
>-    // to the fact that it is stored internally as a float, and so would require conversion
>-    // if returned from Context::getIntegerv. Since this conversion is already implemented
>-    // in the case that one calls glGetIntegerv to retrieve a float-typed state variable, we
>-    // place DEPTH_CLEAR_VALUE with the floats. This should make no difference to the calling
>-    // application.
>-    switch (pname)
>-    {
>-        case GL_COMPRESSED_TEXTURE_FORMATS:
>-        {
>-            *type      = GL_INT;
>-            *numParams = static_cast<unsigned int>(getCaps().compressedTextureFormats.size());
>-            return true;
>-        }
>-        case GL_SHADER_BINARY_FORMATS:
>-        {
>-            *type      = GL_INT;
>-            *numParams = static_cast<unsigned int>(getCaps().shaderBinaryFormats.size());
>-            return true;
>-        }
>-
>-        case GL_MAX_VERTEX_ATTRIBS:
>-        case GL_MAX_VERTEX_UNIFORM_VECTORS:
>-        case GL_MAX_VARYING_VECTORS:
>-        case GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS:
>-        case GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS:
>-        case GL_MAX_TEXTURE_IMAGE_UNITS:
>-        case GL_MAX_FRAGMENT_UNIFORM_VECTORS:
>-        case GL_MAX_RENDERBUFFER_SIZE:
>-        case GL_NUM_SHADER_BINARY_FORMATS:
>-        case GL_NUM_COMPRESSED_TEXTURE_FORMATS:
>-        case GL_ARRAY_BUFFER_BINDING:
>-        case GL_FRAMEBUFFER_BINDING:
>-        case GL_RENDERBUFFER_BINDING:
>-        case GL_CURRENT_PROGRAM:
>-        case GL_PACK_ALIGNMENT:
>-        case GL_UNPACK_ALIGNMENT:
>-        case GL_GENERATE_MIPMAP_HINT:
>-        case GL_RED_BITS:
>-        case GL_GREEN_BITS:
>-        case GL_BLUE_BITS:
>-        case GL_ALPHA_BITS:
>-        case GL_DEPTH_BITS:
>-        case GL_STENCIL_BITS:
>-        case GL_ELEMENT_ARRAY_BUFFER_BINDING:
>-        case GL_CULL_FACE_MODE:
>-        case GL_FRONT_FACE:
>-        case GL_ACTIVE_TEXTURE:
>-        case GL_STENCIL_FUNC:
>-        case GL_STENCIL_VALUE_MASK:
>-        case GL_STENCIL_REF:
>-        case GL_STENCIL_FAIL:
>-        case GL_STENCIL_PASS_DEPTH_FAIL:
>-        case GL_STENCIL_PASS_DEPTH_PASS:
>-        case GL_STENCIL_BACK_FUNC:
>-        case GL_STENCIL_BACK_VALUE_MASK:
>-        case GL_STENCIL_BACK_REF:
>-        case GL_STENCIL_BACK_FAIL:
>-        case GL_STENCIL_BACK_PASS_DEPTH_FAIL:
>-        case GL_STENCIL_BACK_PASS_DEPTH_PASS:
>-        case GL_DEPTH_FUNC:
>-        case GL_BLEND_SRC_RGB:
>-        case GL_BLEND_SRC_ALPHA:
>-        case GL_BLEND_DST_RGB:
>-        case GL_BLEND_DST_ALPHA:
>-        case GL_BLEND_EQUATION_RGB:
>-        case GL_BLEND_EQUATION_ALPHA:
>-        case GL_STENCIL_WRITEMASK:
>-        case GL_STENCIL_BACK_WRITEMASK:
>-        case GL_STENCIL_CLEAR_VALUE:
>-        case GL_SUBPIXEL_BITS:
>-        case GL_MAX_TEXTURE_SIZE:
>-        case GL_MAX_CUBE_MAP_TEXTURE_SIZE:
>-        case GL_SAMPLE_BUFFERS:
>-        case GL_SAMPLES:
>-        case GL_IMPLEMENTATION_COLOR_READ_TYPE:
>-        case GL_IMPLEMENTATION_COLOR_READ_FORMAT:
>-        case GL_TEXTURE_BINDING_2D:
>-        case GL_TEXTURE_BINDING_CUBE_MAP:
>-        case GL_RESET_NOTIFICATION_STRATEGY_EXT:
>-        {
>-            *type      = GL_INT;
>-            *numParams = 1;
>-            return true;
>-        }
>-        case GL_PACK_REVERSE_ROW_ORDER_ANGLE:
>-        {
>-            if (!getExtensions().packReverseRowOrder)
>-            {
>-                return false;
>-            }
>-            *type      = GL_INT;
>-            *numParams = 1;
>-            return true;
>-        }
>-        case GL_MAX_RECTANGLE_TEXTURE_SIZE_ANGLE:
>-        case GL_TEXTURE_BINDING_RECTANGLE_ANGLE:
>-        {
>-            if (!getExtensions().textureRectangle)
>-            {
>-                return false;
>-            }
>-            *type      = GL_INT;
>-            *numParams = 1;
>-            return true;
>-        }
>-        case GL_MAX_DRAW_BUFFERS_EXT:
>-        case GL_MAX_COLOR_ATTACHMENTS_EXT:
>-        {
>-            if ((getClientMajorVersion() < 3) && !getExtensions().drawBuffers)
>-            {
>-                return false;
>-            }
>-            *type      = GL_INT;
>-            *numParams = 1;
>-            return true;
>-        }
>-        case GL_MAX_VIEWPORT_DIMS:
>-        {
>-            *type      = GL_INT;
>-            *numParams = 2;
>-            return true;
>-        }
>-        case GL_VIEWPORT:
>-        case GL_SCISSOR_BOX:
>-        {
>-            *type      = GL_INT;
>-            *numParams = 4;
>-            return true;
>-        }
>-        case GL_SHADER_COMPILER:
>-        case GL_SAMPLE_COVERAGE_INVERT:
>-        case GL_DEPTH_WRITEMASK:
>-        case GL_CULL_FACE:                 // CULL_FACE through DITHER are natural to IsEnabled,
>-        case GL_POLYGON_OFFSET_FILL:       // but can be retrieved through the Get{Type}v queries.
>-        case GL_SAMPLE_ALPHA_TO_COVERAGE:  // For this purpose, they are treated here as
>-                                           // bool-natural
>-        case GL_SAMPLE_COVERAGE:
>-        case GL_SCISSOR_TEST:
>-        case GL_STENCIL_TEST:
>-        case GL_DEPTH_TEST:
>-        case GL_BLEND:
>-        case GL_DITHER:
>-        case GL_CONTEXT_ROBUST_ACCESS_EXT:
>-        {
>-            *type      = GL_BOOL;
>-            *numParams = 1;
>-            return true;
>-        }
>-        case GL_COLOR_WRITEMASK:
>-        {
>-            *type      = GL_BOOL;
>-            *numParams = 4;
>-            return true;
>-        }
>-        case GL_POLYGON_OFFSET_FACTOR:
>-        case GL_POLYGON_OFFSET_UNITS:
>-        case GL_SAMPLE_COVERAGE_VALUE:
>-        case GL_DEPTH_CLEAR_VALUE:
>-        case GL_LINE_WIDTH:
>-        {
>-            *type      = GL_FLOAT;
>-            *numParams = 1;
>-            return true;
>-        }
>-        case GL_ALIASED_LINE_WIDTH_RANGE:
>-        case GL_ALIASED_POINT_SIZE_RANGE:
>-        case GL_DEPTH_RANGE:
>-        {
>-            *type      = GL_FLOAT;
>-            *numParams = 2;
>-            return true;
>-        }
>-        case GL_COLOR_CLEAR_VALUE:
>-        case GL_BLEND_COLOR:
>-        {
>-            *type      = GL_FLOAT;
>-            *numParams = 4;
>-            return true;
>-        }
>-        case GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT:
>-            if (!getExtensions().textureFilterAnisotropic)
>-            {
>-                return false;
>-            }
>-            *type      = GL_FLOAT;
>-            *numParams = 1;
>-            return true;
>-        case GL_TIMESTAMP_EXT:
>-            if (!getExtensions().disjointTimerQuery)
>-            {
>-                return false;
>-            }
>-            *type      = GL_INT_64_ANGLEX;
>-            *numParams = 1;
>-            return true;
>-        case GL_GPU_DISJOINT_EXT:
>-            if (!getExtensions().disjointTimerQuery)
>-            {
>-                return false;
>-            }
>-            *type      = GL_INT;
>-            *numParams = 1;
>-            return true;
>-        case GL_COVERAGE_MODULATION_CHROMIUM:
>-            if (!getExtensions().framebufferMixedSamples)
>-            {
>-                return false;
>-            }
>-            *type      = GL_INT;
>-            *numParams = 1;
>-            return true;
>-        case GL_TEXTURE_BINDING_EXTERNAL_OES:
>-            if (!getExtensions().eglStreamConsumerExternal && !getExtensions().eglImageExternal)
>-            {
>-                return false;
>-            }
>-            *type      = GL_INT;
>-            *numParams = 1;
>-            return true;
>-    }
>-
>-    if (getExtensions().debug)
>-    {
>-        switch (pname)
>-        {
>-            case GL_DEBUG_LOGGED_MESSAGES:
>-            case GL_DEBUG_NEXT_LOGGED_MESSAGE_LENGTH:
>-            case GL_DEBUG_GROUP_STACK_DEPTH:
>-            case GL_MAX_DEBUG_MESSAGE_LENGTH:
>-            case GL_MAX_DEBUG_LOGGED_MESSAGES:
>-            case GL_MAX_DEBUG_GROUP_STACK_DEPTH:
>-            case GL_MAX_LABEL_LENGTH:
>-                *type      = GL_INT;
>-                *numParams = 1;
>-                return true;
>-
>-            case GL_DEBUG_OUTPUT_SYNCHRONOUS:
>-            case GL_DEBUG_OUTPUT:
>-                *type      = GL_BOOL;
>-                *numParams = 1;
>-                return true;
>-        }
>-    }
>-
>-    if (getExtensions().multisampleCompatibility)
>-    {
>-        switch (pname)
>-        {
>-            case GL_MULTISAMPLE_EXT:
>-            case GL_SAMPLE_ALPHA_TO_ONE_EXT:
>-                *type      = GL_BOOL;
>-                *numParams = 1;
>-                return true;
>-        }
>-    }
>-
>-    if (getExtensions().pathRendering)
>-    {
>-        switch (pname)
>-        {
>-            case GL_PATH_MODELVIEW_MATRIX_CHROMIUM:
>-            case GL_PATH_PROJECTION_MATRIX_CHROMIUM:
>-                *type = GL_FLOAT;
>-                *numParams = 16;
>-                return true;
>-        }
>-    }
>-
>-    if (getExtensions().bindGeneratesResource)
>-    {
>-        switch (pname)
>-        {
>-            case GL_BIND_GENERATES_RESOURCE_CHROMIUM:
>-                *type      = GL_BOOL;
>-                *numParams = 1;
>-                return true;
>-        }
>-    }
>-
>-    if (getExtensions().clientArrays)
>-    {
>-        switch (pname)
>-        {
>-            case GL_CLIENT_ARRAYS_ANGLE:
>-                *type      = GL_BOOL;
>-                *numParams = 1;
>-                return true;
>-        }
>-    }
>-
>-    if (getExtensions().sRGBWriteControl)
>-    {
>-        switch (pname)
>-        {
>-            case GL_FRAMEBUFFER_SRGB_EXT:
>-                *type      = GL_BOOL;
>-                *numParams = 1;
>-                return true;
>-        }
>-    }
>-
>-    if (getExtensions().robustResourceInitialization &&
>-        pname == GL_ROBUST_RESOURCE_INITIALIZATION_ANGLE)
>-    {
>-        *type      = GL_BOOL;
>-        *numParams = 1;
>-        return true;
>-    }
>-
>-    if (getExtensions().programCacheControl && pname == GL_PROGRAM_CACHE_ENABLED_ANGLE)
>-    {
>-        *type      = GL_BOOL;
>-        *numParams = 1;
>-        return true;
>-    }
>-
>-    // Check for ES3.0+ parameter names which are also exposed as ES2 extensions
>-    switch (pname)
>-    {
>-        // case GL_DRAW_FRAMEBUFFER_BINDING_ANGLE  // equivalent to FRAMEBUFFER_BINDING
>-        case GL_READ_FRAMEBUFFER_BINDING_ANGLE:
>-            if ((getClientMajorVersion() < 3) && !getExtensions().framebufferBlit)
>-            {
>-                return false;
>-            }
>-            *type      = GL_INT;
>-            *numParams = 1;
>-            return true;
>-
>-        case GL_NUM_PROGRAM_BINARY_FORMATS_OES:
>-            if ((getClientMajorVersion() < 3) && !getExtensions().getProgramBinary)
>-            {
>-                return false;
>-            }
>-            *type      = GL_INT;
>-            *numParams = 1;
>-            return true;
>-
>-        case GL_PROGRAM_BINARY_FORMATS_OES:
>-            if ((getClientMajorVersion() < 3) && !getExtensions().getProgramBinary)
>-            {
>-                return false;
>-            }
>-            *type      = GL_INT;
>-            *numParams = static_cast<unsigned int>(getCaps().programBinaryFormats.size());
>-            return true;
>-
>-        case GL_PACK_ROW_LENGTH:
>-        case GL_PACK_SKIP_ROWS:
>-        case GL_PACK_SKIP_PIXELS:
>-            if ((getClientMajorVersion() < 3) && !getExtensions().packSubimage)
>-            {
>-                return false;
>-            }
>-            *type      = GL_INT;
>-            *numParams = 1;
>-            return true;
>-        case GL_UNPACK_ROW_LENGTH:
>-        case GL_UNPACK_SKIP_ROWS:
>-        case GL_UNPACK_SKIP_PIXELS:
>-            if ((getClientMajorVersion() < 3) && !getExtensions().unpackSubimage)
>-            {
>-                return false;
>-            }
>-            *type      = GL_INT;
>-            *numParams = 1;
>-            return true;
>-        case GL_VERTEX_ARRAY_BINDING:
>-            if ((getClientMajorVersion() < 3) && !getExtensions().vertexArrayObject)
>-            {
>-                return false;
>-            }
>-            *type      = GL_INT;
>-            *numParams = 1;
>-            return true;
>-        case GL_PIXEL_PACK_BUFFER_BINDING:
>-        case GL_PIXEL_UNPACK_BUFFER_BINDING:
>-            if ((getClientMajorVersion() < 3) && !getExtensions().pixelBufferObject)
>-            {
>-                return false;
>-            }
>-            *type      = GL_INT;
>-            *numParams = 1;
>-            return true;
>-        case GL_MAX_SAMPLES:
>-        {
>-            static_assert(GL_MAX_SAMPLES_ANGLE == GL_MAX_SAMPLES,
>-                          "GL_MAX_SAMPLES_ANGLE not equal to GL_MAX_SAMPLES");
>-            if ((getClientMajorVersion() < 3) && !getExtensions().framebufferMultisample)
>-            {
>-                return false;
>-            }
>-            *type      = GL_INT;
>-            *numParams = 1;
>-            return true;
>-
>-            case GL_FRAGMENT_SHADER_DERIVATIVE_HINT:
>-                if ((getClientMajorVersion() < 3) && !getExtensions().standardDerivatives)
>-                {
>-                    return false;
>-                }
>-                *type      = GL_INT;
>-                *numParams = 1;
>-                return true;
>-        }
>-    }
>-
>-    if (pname >= GL_DRAW_BUFFER0_EXT && pname <= GL_DRAW_BUFFER15_EXT)
>-    {
>-        if ((getClientVersion() < Version(3, 0)) && !getExtensions().drawBuffers)
>-        {
>-            return false;
>-        }
>-        *type      = GL_INT;
>-        *numParams = 1;
>-        return true;
>-    }
>-
>-    if (getExtensions().multiview && pname == GL_MAX_VIEWS_ANGLE)
>-    {
>-        *type      = GL_INT;
>-        *numParams = 1;
>-        return true;
>-    }
>-
>-    if (getClientVersion() < Version(3, 0))
>-    {
>-        return false;
>-    }
>-
>-    // Check for ES3.0+ parameter names
>-    switch (pname)
>-    {
>-        case GL_MAX_UNIFORM_BUFFER_BINDINGS:
>-        case GL_UNIFORM_BUFFER_OFFSET_ALIGNMENT:
>-        case GL_UNIFORM_BUFFER_BINDING:
>-        case GL_TRANSFORM_FEEDBACK_BINDING:
>-        case GL_TRANSFORM_FEEDBACK_BUFFER_BINDING:
>-        case GL_COPY_READ_BUFFER_BINDING:
>-        case GL_COPY_WRITE_BUFFER_BINDING:
>-        case GL_SAMPLER_BINDING:
>-        case GL_READ_BUFFER:
>-        case GL_TEXTURE_BINDING_3D:
>-        case GL_TEXTURE_BINDING_2D_ARRAY:
>-        case GL_MAX_3D_TEXTURE_SIZE:
>-        case GL_MAX_ARRAY_TEXTURE_LAYERS:
>-        case GL_MAX_VERTEX_UNIFORM_BLOCKS:
>-        case GL_MAX_FRAGMENT_UNIFORM_BLOCKS:
>-        case GL_MAX_COMBINED_UNIFORM_BLOCKS:
>-        case GL_MAX_VERTEX_OUTPUT_COMPONENTS:
>-        case GL_MAX_FRAGMENT_INPUT_COMPONENTS:
>-        case GL_MAX_VARYING_COMPONENTS:
>-        case GL_MAX_VERTEX_UNIFORM_COMPONENTS:
>-        case GL_MAX_FRAGMENT_UNIFORM_COMPONENTS:
>-        case GL_MIN_PROGRAM_TEXEL_OFFSET:
>-        case GL_MAX_PROGRAM_TEXEL_OFFSET:
>-        case GL_NUM_EXTENSIONS:
>-        case GL_MAJOR_VERSION:
>-        case GL_MINOR_VERSION:
>-        case GL_MAX_ELEMENTS_INDICES:
>-        case GL_MAX_ELEMENTS_VERTICES:
>-        case GL_MAX_TRANSFORM_FEEDBACK_INTERLEAVED_COMPONENTS:
>-        case GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_ATTRIBS:
>-        case GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_COMPONENTS:
>-        case GL_UNPACK_IMAGE_HEIGHT:
>-        case GL_UNPACK_SKIP_IMAGES:
>-        {
>-            *type      = GL_INT;
>-            *numParams = 1;
>-            return true;
>-        }
>-
>-        case GL_MAX_ELEMENT_INDEX:
>-        case GL_MAX_UNIFORM_BLOCK_SIZE:
>-        case GL_MAX_COMBINED_VERTEX_UNIFORM_COMPONENTS:
>-        case GL_MAX_COMBINED_FRAGMENT_UNIFORM_COMPONENTS:
>-        case GL_MAX_SERVER_WAIT_TIMEOUT:
>-        {
>-            *type      = GL_INT_64_ANGLEX;
>-            *numParams = 1;
>-            return true;
>-        }
>-
>-        case GL_TRANSFORM_FEEDBACK_ACTIVE:
>-        case GL_TRANSFORM_FEEDBACK_PAUSED:
>-        case GL_PRIMITIVE_RESTART_FIXED_INDEX:
>-        case GL_RASTERIZER_DISCARD:
>-        {
>-            *type      = GL_BOOL;
>-            *numParams = 1;
>-            return true;
>-        }
>-
>-        case GL_MAX_TEXTURE_LOD_BIAS:
>-        {
>-            *type      = GL_FLOAT;
>-            *numParams = 1;
>-            return true;
>-        }
>-    }
>-
>-    if (getExtensions().requestExtension)
>-    {
>-        switch (pname)
>-        {
>-            case GL_NUM_REQUESTABLE_EXTENSIONS_ANGLE:
>-                *type      = GL_INT;
>-                *numParams = 1;
>-                return true;
>-        }
>-    }
>-
>-    if (getClientVersion() < Version(3, 1))
>-    {
>-        return false;
>-    }
>-
>-    switch (pname)
>-    {
>-        case GL_ATOMIC_COUNTER_BUFFER_BINDING:
>-        case GL_DRAW_INDIRECT_BUFFER_BINDING:
>-        case GL_MAX_FRAMEBUFFER_WIDTH:
>-        case GL_MAX_FRAMEBUFFER_HEIGHT:
>-        case GL_MAX_FRAMEBUFFER_SAMPLES:
>-        case GL_MAX_SAMPLE_MASK_WORDS:
>-        case GL_MAX_COLOR_TEXTURE_SAMPLES:
>-        case GL_MAX_DEPTH_TEXTURE_SAMPLES:
>-        case GL_MAX_INTEGER_SAMPLES:
>-        case GL_MAX_VERTEX_ATTRIB_RELATIVE_OFFSET:
>-        case GL_MAX_VERTEX_ATTRIB_BINDINGS:
>-        case GL_MAX_VERTEX_ATTRIB_STRIDE:
>-        case GL_MAX_VERTEX_ATOMIC_COUNTER_BUFFERS:
>-        case GL_MAX_VERTEX_ATOMIC_COUNTERS:
>-        case GL_MAX_VERTEX_IMAGE_UNIFORMS:
>-        case GL_MAX_VERTEX_SHADER_STORAGE_BLOCKS:
>-        case GL_MAX_FRAGMENT_ATOMIC_COUNTER_BUFFERS:
>-        case GL_MAX_FRAGMENT_ATOMIC_COUNTERS:
>-        case GL_MAX_FRAGMENT_IMAGE_UNIFORMS:
>-        case GL_MAX_FRAGMENT_SHADER_STORAGE_BLOCKS:
>-        case GL_MIN_PROGRAM_TEXTURE_GATHER_OFFSET:
>-        case GL_MAX_PROGRAM_TEXTURE_GATHER_OFFSET:
>-        case GL_MAX_COMPUTE_WORK_GROUP_INVOCATIONS:
>-        case GL_MAX_COMPUTE_UNIFORM_BLOCKS:
>-        case GL_MAX_COMPUTE_TEXTURE_IMAGE_UNITS:
>-        case GL_MAX_COMPUTE_SHARED_MEMORY_SIZE:
>-        case GL_MAX_COMPUTE_UNIFORM_COMPONENTS:
>-        case GL_MAX_COMPUTE_ATOMIC_COUNTER_BUFFERS:
>-        case GL_MAX_COMPUTE_ATOMIC_COUNTERS:
>-        case GL_MAX_COMPUTE_IMAGE_UNIFORMS:
>-        case GL_MAX_COMBINED_COMPUTE_UNIFORM_COMPONENTS:
>-        case GL_MAX_COMPUTE_SHADER_STORAGE_BLOCKS:
>-        case GL_MAX_COMBINED_SHADER_OUTPUT_RESOURCES:
>-        case GL_MAX_UNIFORM_LOCATIONS:
>-        case GL_MAX_ATOMIC_COUNTER_BUFFER_BINDINGS:
>-        case GL_MAX_ATOMIC_COUNTER_BUFFER_SIZE:
>-        case GL_MAX_COMBINED_ATOMIC_COUNTER_BUFFERS:
>-        case GL_MAX_COMBINED_ATOMIC_COUNTERS:
>-        case GL_MAX_IMAGE_UNITS:
>-        case GL_MAX_COMBINED_IMAGE_UNIFORMS:
>-        case GL_MAX_SHADER_STORAGE_BUFFER_BINDINGS:
>-        case GL_MAX_COMBINED_SHADER_STORAGE_BLOCKS:
>-        case GL_SHADER_STORAGE_BUFFER_BINDING:
>-        case GL_SHADER_STORAGE_BUFFER_OFFSET_ALIGNMENT:
>-        case GL_TEXTURE_BINDING_2D_MULTISAMPLE:
>-            *type      = GL_INT;
>-            *numParams = 1;
>-            return true;
>-        case GL_MAX_SHADER_STORAGE_BLOCK_SIZE:
>-            *type      = GL_INT_64_ANGLEX;
>-            *numParams = 1;
>-            return true;
>-        case GL_SAMPLE_MASK:
>-            *type      = GL_BOOL;
>-            *numParams = 1;
>-            return true;
>-    }
>-
>-    return false;
>-}
>-
>-bool ValidationContext::getIndexedQueryParameterInfo(GLenum target,
>-                                                     GLenum *type,
>-                                                     unsigned int *numParams)
>-{
>-    if (getClientVersion() < Version(3, 0))
>-    {
>-        return false;
>-    }
>-
>-    switch (target)
>-    {
>-        case GL_TRANSFORM_FEEDBACK_BUFFER_BINDING:
>-        case GL_UNIFORM_BUFFER_BINDING:
>-        {
>-            *type      = GL_INT;
>-            *numParams = 1;
>-            return true;
>-        }
>-        case GL_TRANSFORM_FEEDBACK_BUFFER_START:
>-        case GL_TRANSFORM_FEEDBACK_BUFFER_SIZE:
>-        case GL_UNIFORM_BUFFER_START:
>-        case GL_UNIFORM_BUFFER_SIZE:
>-        {
>-            *type      = GL_INT_64_ANGLEX;
>-            *numParams = 1;
>-            return true;
>-        }
>-    }
>-
>-    if (getClientVersion() < Version(3, 1))
>-    {
>-        return false;
>-    }
>-
>-    switch (target)
>-    {
>-        case GL_MAX_COMPUTE_WORK_GROUP_COUNT:
>-        case GL_MAX_COMPUTE_WORK_GROUP_SIZE:
>-        case GL_ATOMIC_COUNTER_BUFFER_BINDING:
>-        case GL_SHADER_STORAGE_BUFFER_BINDING:
>-        case GL_VERTEX_BINDING_BUFFER:
>-        case GL_VERTEX_BINDING_DIVISOR:
>-        case GL_VERTEX_BINDING_OFFSET:
>-        case GL_VERTEX_BINDING_STRIDE:
>-        case GL_SAMPLE_MASK_VALUE:
>-        {
>-            *type      = GL_INT;
>-            *numParams = 1;
>-            return true;
>-        }
>-        case GL_ATOMIC_COUNTER_BUFFER_START:
>-        case GL_ATOMIC_COUNTER_BUFFER_SIZE:
>-        case GL_SHADER_STORAGE_BUFFER_START:
>-        case GL_SHADER_STORAGE_BUFFER_SIZE:
>-        {
>-            *type      = GL_INT_64_ANGLEX;
>-            *numParams = 1;
>-            return true;
>-        }
>-    }
>-
>-    return false;
>-}
>-
>-Program *ValidationContext::getProgram(GLuint handle) const
>-{
>-    return mState.mShaderPrograms->getProgram(handle);
>-}
>-
>-Shader *ValidationContext::getShader(GLuint handle) const
>-{
>-    return mState.mShaderPrograms->getShader(handle);
>-}
>-
>-bool ValidationContext::isTextureGenerated(GLuint texture) const
>-{
>-    return mState.mTextures->isHandleGenerated(texture);
>-}
>-
>-bool ValidationContext::isBufferGenerated(GLuint buffer) const
>-{
>-    return mState.mBuffers->isHandleGenerated(buffer);
>-}
>-
>-bool ValidationContext::isRenderbufferGenerated(GLuint renderbuffer) const
>-{
>-    return mState.mRenderbuffers->isHandleGenerated(renderbuffer);
>-}
>-
>-bool ValidationContext::isFramebufferGenerated(GLuint framebuffer) const
>-{
>-    return mState.mFramebuffers->isHandleGenerated(framebuffer);
>-}
>-
>-bool ValidationContext::isProgramPipelineGenerated(GLuint pipeline) const
>-{
>-    return mState.mPipelines->isHandleGenerated(pipeline);
>-}
>-
>-bool ValidationContext::usingDisplayTextureShareGroup() const
>-{
>-    return mDisplayTextureShareGroup;
>-}
>-
>-GLenum ValidationContext::getConvertedRenderbufferFormat(GLenum internalformat) const
>-{
>-    return mState.mExtensions.webglCompatibility && mState.mClientVersion.major == 2 &&
>-                   internalformat == GL_DEPTH_STENCIL
>-               ? GL_DEPTH24_STENCIL8
>-               : internalformat;
>-}
>-
>-}  // namespace gl
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/ContextState.h b/Source/ThirdParty/ANGLE/src/libANGLE/ContextState.h
>deleted file mode 100644
>index e6e9f4c6b03..00000000000
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/ContextState.h
>+++ /dev/null
>@@ -1,164 +0,0 @@
>-//
>-// Copyright (c) 2014 The ANGLE Project Authors. All rights reserved.
>-// Use of this source code is governed by a BSD-style license that can be
>-// found in the LICENSE file.
>-//
>-
>-// ContextState: Container class for all GL context state, caps and objects.
>-
>-#ifndef LIBANGLE_CONTEXTSTATE_H_
>-#define LIBANGLE_CONTEXTSTATE_H_
>-
>-#include "common/MemoryBuffer.h"
>-#include "common/angleutils.h"
>-#include "libANGLE/State.h"
>-#include "libANGLE/Version.h"
>-#include "libANGLE/params.h"
>-
>-namespace gl
>-{
>-class BufferManager;
>-class ContextState;
>-class FramebufferManager;
>-class PathManager;
>-class ProgramPipelineManager;
>-class RenderbufferManager;
>-class SamplerManager;
>-class ShaderProgramManager;
>-class SyncManager;
>-class TextureManager;
>-class ValidationContext;
>-
>-static constexpr Version ES_2_0 = Version(2, 0);
>-static constexpr Version ES_3_0 = Version(3, 0);
>-static constexpr Version ES_3_1 = Version(3, 1);
>-
>-using ContextID = uintptr_t;
>-
>-class ContextState final : angle::NonCopyable
>-{
>-  public:
>-    ContextState(ContextID context,
>-                 const ContextState *shareContextState,
>-                 TextureManager *shareTextures,
>-                 const Version &clientVersion,
>-                 State *state,
>-                 const Caps &caps,
>-                 const TextureCapsMap &textureCaps,
>-                 const Extensions &extensions,
>-                 const Limitations &limitations);
>-    ~ContextState();
>-
>-    ContextID getContextID() const { return mContext; }
>-    GLint getClientMajorVersion() const { return mClientVersion.major; }
>-    GLint getClientMinorVersion() const { return mClientVersion.minor; }
>-    const Version &getClientVersion() const { return mClientVersion; }
>-    const State &getState() const { return *mState; }
>-    const Caps &getCaps() const { return mCaps; }
>-    const TextureCapsMap &getTextureCaps() const { return mTextureCaps; }
>-    const Extensions &getExtensions() const { return mExtensions; }
>-    const Limitations &getLimitations() const { return mLimitations; }
>-
>-    const TextureCaps &getTextureCap(GLenum internalFormat) const;
>-
>-    bool usingDisplayTextureShareGroup() const;
>-
>-    bool isWebGL() const;
>-    bool isWebGL1() const;
>-
>-  private:
>-    friend class Context;
>-    friend class ValidationContext;
>-
>-    Version mClientVersion;
>-    ContextID mContext;
>-    State *mState;
>-    const Caps &mCaps;
>-    const TextureCapsMap &mTextureCaps;
>-    const Extensions &mExtensions;
>-    const Limitations &mLimitations;
>-
>-    BufferManager *mBuffers;
>-    ShaderProgramManager *mShaderPrograms;
>-    TextureManager *mTextures;
>-    RenderbufferManager *mRenderbuffers;
>-    SamplerManager *mSamplers;
>-    SyncManager *mSyncs;
>-    PathManager *mPaths;
>-    FramebufferManager *mFramebuffers;
>-    ProgramPipelineManager *mPipelines;
>-};
>-
>-class ValidationContext : angle::NonCopyable
>-{
>-  public:
>-    ValidationContext(const ValidationContext *shareContext,
>-                      TextureManager *shareTextures,
>-                      const Version &clientVersion,
>-                      State *state,
>-                      const Caps &caps,
>-                      const TextureCapsMap &textureCaps,
>-                      const Extensions &extensions,
>-                      const Limitations &limitations,
>-                      bool skipValidation);
>-    virtual ~ValidationContext();
>-
>-    virtual void handleError(const Error &error) = 0;
>-
>-    const ContextState &getContextState() const { return mState; }
>-    GLint getClientMajorVersion() const { return mState.getClientMajorVersion(); }
>-    GLint getClientMinorVersion() const { return mState.getClientMinorVersion(); }
>-    const Version &getClientVersion() const { return mState.getClientVersion(); }
>-    const State &getGLState() const { return mState.getState(); }
>-    const Caps &getCaps() const { return mState.getCaps(); }
>-    const TextureCapsMap &getTextureCaps() const { return mState.getTextureCaps(); }
>-    const Extensions &getExtensions() const { return mState.getExtensions(); }
>-    const Limitations &getLimitations() const { return mState.getLimitations(); }
>-    bool skipValidation() const { return mSkipValidation; }
>-
>-    // Specific methods needed for validation.
>-    bool getQueryParameterInfo(GLenum pname, GLenum *type, unsigned int *numParams);
>-    bool getIndexedQueryParameterInfo(GLenum target, GLenum *type, unsigned int *numParams);
>-
>-    Program *getProgram(GLuint handle) const;
>-    Shader *getShader(GLuint handle) const;
>-
>-    bool isTextureGenerated(GLuint texture) const;
>-    bool isBufferGenerated(GLuint buffer) const;
>-    bool isRenderbufferGenerated(GLuint renderbuffer) const;
>-    bool isFramebufferGenerated(GLuint framebuffer) const;
>-    bool isProgramPipelineGenerated(GLuint pipeline) const;
>-
>-    bool usingDisplayTextureShareGroup() const;
>-
>-    // Hack for the special WebGL 1 "DEPTH_STENCIL" internal format.
>-    GLenum getConvertedRenderbufferFormat(GLenum internalformat) const;
>-
>-    bool isWebGL() const { return mState.isWebGL(); }
>-    bool isWebGL1() const { return mState.isWebGL1(); }
>-
>-    template <typename T>
>-    const T &getParams() const;
>-
>-  protected:
>-    ContextState mState;
>-    bool mSkipValidation;
>-    bool mDisplayTextureShareGroup;
>-
>-    // Caches entry point parameters and values re-used between layers.
>-    mutable const ParamTypeInfo *mSavedArgsType;
>-    static constexpr size_t kParamsBufferSize = 64u;
>-    mutable std::array<uint8_t, kParamsBufferSize> mParamsBuffer;
>-};
>-
>-template <typename T>
>-const T &ValidationContext::getParams() const
>-{
>-    const T *params = reinterpret_cast<T *>(mParamsBuffer.data());
>-    ASSERT(mSavedArgsType->hasDynamicType(T::TypeInfo));
>-    return *params;
>-}
>-
>-}  // namespace gl
>-
>-#endif  // LIBANGLE_CONTEXTSTATE_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/Context_gles_1_0.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/Context_gles_1_0.cpp
>new file mode 100644
>index 00000000000..01bc7d0a8d8
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/Context_gles_1_0.cpp
>@@ -0,0 +1,725 @@
>+//
>+// Copyright 2018 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+
>+// Context_gles_1_0.cpp: Implements the GLES1-specific parts of Context.
>+
>+#include "libANGLE/Context.h"
>+
>+#include "common/mathutil.h"
>+#include "common/utilities.h"
>+
>+#include "libANGLE/GLES1Renderer.h"
>+#include "libANGLE/queryconversions.h"
>+#include "libANGLE/queryutils.h"
>+
>+namespace
>+{
>+
>+angle::Mat4 FixedMatrixToMat4(const GLfixed *m)
>+{
>+    angle::Mat4 matrixAsFloat;
>+    GLfloat *floatData = matrixAsFloat.data();
>+
>+    for (int i = 0; i < 16; i++)
>+    {
>+        floatData[i] = gl::FixedToFloat(m[i]);
>+    }
>+
>+    return matrixAsFloat;
>+}
>+
>+}  // namespace
>+
>+namespace gl
>+{
>+
>+void Context::alphaFunc(AlphaTestFunc func, GLfloat ref)
>+{
>+    mState.gles1().setAlphaFunc(func, ref);
>+}
>+
>+void Context::alphaFuncx(AlphaTestFunc func, GLfixed ref)
>+{
>+    mState.gles1().setAlphaFunc(func, FixedToFloat(ref));
>+}
>+
>+void Context::clearColorx(GLfixed red, GLfixed green, GLfixed blue, GLfixed alpha)
>+{
>+    UNIMPLEMENTED();
>+}
>+
>+void Context::clearDepthx(GLfixed depth)
>+{
>+    UNIMPLEMENTED();
>+}
>+
>+void Context::clientActiveTexture(GLenum texture)
>+{
>+    mState.gles1().setClientTextureUnit(texture - GL_TEXTURE0);
>+    mStateCache.onGLES1ClientStateChange(this);
>+}
>+
>+void Context::clipPlanef(GLenum p, const GLfloat *eqn)
>+{
>+    mState.gles1().setClipPlane(p - GL_CLIP_PLANE0, eqn);
>+}
>+
>+void Context::clipPlanex(GLenum plane, const GLfixed *equation)
>+{
>+    const GLfloat equationf[4] = {
>+        FixedToFloat(equation[0]),
>+        FixedToFloat(equation[1]),
>+        FixedToFloat(equation[2]),
>+        FixedToFloat(equation[3]),
>+    };
>+
>+    mState.gles1().setClipPlane(plane - GL_CLIP_PLANE0, equationf);
>+}
>+
>+void Context::color4f(GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha)
>+{
>+    mState.gles1().setCurrentColor({red, green, blue, alpha});
>+}
>+
>+void Context::color4ub(GLubyte red, GLubyte green, GLubyte blue, GLubyte alpha)
>+{
>+    mState.gles1().setCurrentColor(
>+        {normalizedToFloat<uint8_t>(red), normalizedToFloat<uint8_t>(green),
>+         normalizedToFloat<uint8_t>(blue), normalizedToFloat<uint8_t>(alpha)});
>+}
>+
>+void Context::color4x(GLfixed red, GLfixed green, GLfixed blue, GLfixed alpha)
>+{
>+    mState.gles1().setCurrentColor(
>+        {FixedToFloat(red), FixedToFloat(green), FixedToFloat(blue), FixedToFloat(alpha)});
>+}
>+
>+void Context::colorPointer(GLint size, VertexAttribType type, GLsizei stride, const void *ptr)
>+{
>+    vertexAttribPointer(vertexArrayIndex(ClientVertexArrayType::Color), size, type, GL_FALSE,
>+                        stride, ptr);
>+}
>+
>+void Context::depthRangex(GLfixed n, GLfixed f)
>+{
>+    UNIMPLEMENTED();
>+}
>+
>+void Context::disableClientState(ClientVertexArrayType clientState)
>+{
>+    mState.gles1().setClientStateEnabled(clientState, false);
>+    disableVertexAttribArray(vertexArrayIndex(clientState));
>+    mStateCache.onGLES1ClientStateChange(this);
>+}
>+
>+void Context::enableClientState(ClientVertexArrayType clientState)
>+{
>+    mState.gles1().setClientStateEnabled(clientState, true);
>+    enableVertexAttribArray(vertexArrayIndex(clientState));
>+    mStateCache.onGLES1ClientStateChange(this);
>+}
>+
>+void Context::fogf(GLenum pname, GLfloat param)
>+{
>+    SetFogParameters(&mState.gles1(), pname, &param);
>+}
>+
>+void Context::fogfv(GLenum pname, const GLfloat *params)
>+{
>+    SetFogParameters(&mState.gles1(), pname, params);
>+}
>+
>+void Context::fogx(GLenum pname, GLfixed param)
>+{
>+    if (GetFogParameterCount(pname) == 1)
>+    {
>+        GLfloat paramf = pname == GL_FOG_MODE ? ConvertToGLenum(param) : FixedToFloat(param);
>+        fogf(pname, paramf);
>+    }
>+    else
>+    {
>+        UNREACHABLE();
>+    }
>+}
>+
>+void Context::fogxv(GLenum pname, const GLfixed *params)
>+{
>+    int paramCount = GetFogParameterCount(pname);
>+
>+    if (paramCount > 0)
>+    {
>+        GLfloat paramsf[4];
>+        for (int i = 0; i < paramCount; i++)
>+        {
>+            paramsf[i] =
>+                pname == GL_FOG_MODE ? ConvertToGLenum(params[i]) : FixedToFloat(params[i]);
>+        }
>+        fogfv(pname, paramsf);
>+    }
>+    else
>+    {
>+        UNREACHABLE();
>+    }
>+}
>+
>+void Context::frustumf(GLfloat l, GLfloat r, GLfloat b, GLfloat t, GLfloat n, GLfloat f)
>+{
>+    mState.gles1().multMatrix(angle::Mat4::Frustum(l, r, b, t, n, f));
>+}
>+
>+void Context::frustumx(GLfixed l, GLfixed r, GLfixed b, GLfixed t, GLfixed n, GLfixed f)
>+{
>+    mState.gles1().multMatrix(angle::Mat4::Frustum(FixedToFloat(l), FixedToFloat(r),
>+                                                   FixedToFloat(b), FixedToFloat(t),
>+                                                   FixedToFloat(n), FixedToFloat(f)));
>+}
>+
>+void Context::getClipPlanef(GLenum plane, GLfloat *equation)
>+{
>+    mState.gles1().getClipPlane(plane - GL_CLIP_PLANE0, equation);
>+}
>+
>+void Context::getClipPlanex(GLenum plane, GLfixed *equation)
>+{
>+    GLfloat equationf[4] = {};
>+
>+    mState.gles1().getClipPlane(plane - GL_CLIP_PLANE0, equationf);
>+
>+    for (int i = 0; i < 4; i++)
>+    {
>+        equation[i] = FloatToFixed(equationf[i]);
>+    }
>+}
>+
>+void Context::getFixedv(GLenum pname, GLfixed *params)
>+{
>+    UNIMPLEMENTED();
>+}
>+
>+void Context::getLightfv(GLenum light, LightParameter pname, GLfloat *params)
>+{
>+    GetLightParameters(&mState.gles1(), light, pname, params);
>+}
>+
>+void Context::getLightxv(GLenum light, LightParameter pname, GLfixed *params)
>+{
>+    GLfloat paramsf[4];
>+    getLightfv(light, pname, paramsf);
>+
>+    for (unsigned int i = 0; i < GetLightParameterCount(pname); i++)
>+    {
>+        params[i] = FloatToFixed(paramsf[i]);
>+    }
>+}
>+
>+void Context::getMaterialfv(GLenum face, MaterialParameter pname, GLfloat *params)
>+{
>+    GetMaterialParameters(&mState.gles1(), face, pname, params);
>+}
>+
>+void Context::getMaterialxv(GLenum face, MaterialParameter pname, GLfixed *params)
>+{
>+    GLfloat paramsf[4];
>+    getMaterialfv(face, pname, paramsf);
>+
>+    for (unsigned int i = 0; i < GetMaterialParameterCount(pname); i++)
>+    {
>+        params[i] = FloatToFixed(paramsf[i]);
>+    }
>+}
>+
>+void Context::getTexEnvfv(TextureEnvTarget target, TextureEnvParameter pname, GLfloat *params)
>+{
>+    GetTextureEnv(mState.getActiveSampler(), &mState.gles1(), target, pname, params);
>+}
>+
>+void Context::getTexEnviv(TextureEnvTarget target, TextureEnvParameter pname, GLint *params)
>+{
>+    GLfloat paramsf[4];
>+    GetTextureEnv(mState.getActiveSampler(), &mState.gles1(), target, pname, paramsf);
>+    ConvertTextureEnvToInt(pname, paramsf, params);
>+}
>+
>+void Context::getTexEnvxv(TextureEnvTarget target, TextureEnvParameter pname, GLfixed *params)
>+{
>+    GLfloat paramsf[4];
>+    GetTextureEnv(mState.getActiveSampler(), &mState.gles1(), target, pname, paramsf);
>+    ConvertTextureEnvToFixed(pname, paramsf, params);
>+}
>+
>+void Context::getTexParameterxv(TextureType target, GLenum pname, GLfixed *params)
>+{
>+    UNIMPLEMENTED();
>+}
>+
>+void Context::lightModelf(GLenum pname, GLfloat param)
>+{
>+    SetLightModelParameters(&mState.gles1(), pname, &param);
>+}
>+
>+void Context::lightModelfv(GLenum pname, const GLfloat *params)
>+{
>+    SetLightModelParameters(&mState.gles1(), pname, params);
>+}
>+
>+void Context::lightModelx(GLenum pname, GLfixed param)
>+{
>+    lightModelf(pname, FixedToFloat(param));
>+}
>+
>+void Context::lightModelxv(GLenum pname, const GLfixed *param)
>+{
>+    GLfloat paramsf[4];
>+
>+    for (unsigned int i = 0; i < GetLightModelParameterCount(pname); i++)
>+    {
>+        paramsf[i] = FixedToFloat(param[i]);
>+    }
>+
>+    lightModelfv(pname, paramsf);
>+}
>+
>+void Context::lightf(GLenum light, LightParameter pname, GLfloat param)
>+{
>+    SetLightParameters(&mState.gles1(), light, pname, &param);
>+}
>+
>+void Context::lightfv(GLenum light, LightParameter pname, const GLfloat *params)
>+{
>+    SetLightParameters(&mState.gles1(), light, pname, params);
>+}
>+
>+void Context::lightx(GLenum light, LightParameter pname, GLfixed param)
>+{
>+    lightf(light, pname, FixedToFloat(param));
>+}
>+
>+void Context::lightxv(GLenum light, LightParameter pname, const GLfixed *params)
>+{
>+    GLfloat paramsf[4];
>+
>+    for (unsigned int i = 0; i < GetLightParameterCount(pname); i++)
>+    {
>+        paramsf[i] = FixedToFloat(params[i]);
>+    }
>+
>+    lightfv(light, pname, paramsf);
>+}
>+
>+void Context::lineWidthx(GLfixed width)
>+{
>+    UNIMPLEMENTED();
>+}
>+
>+void Context::loadIdentity()
>+{
>+    mState.gles1().loadMatrix(angle::Mat4());
>+}
>+
>+void Context::loadMatrixf(const GLfloat *m)
>+{
>+    mState.gles1().loadMatrix(angle::Mat4(m));
>+}
>+
>+void Context::loadMatrixx(const GLfixed *m)
>+{
>+    mState.gles1().loadMatrix(FixedMatrixToMat4(m));
>+}
>+
>+void Context::logicOp(LogicalOperation opcodePacked)
>+{
>+    mState.gles1().setLogicOp(opcodePacked);
>+}
>+
>+void Context::materialf(GLenum face, MaterialParameter pname, GLfloat param)
>+{
>+    SetMaterialParameters(&mState.gles1(), face, pname, &param);
>+}
>+
>+void Context::materialfv(GLenum face, MaterialParameter pname, const GLfloat *params)
>+{
>+    SetMaterialParameters(&mState.gles1(), face, pname, params);
>+}
>+
>+void Context::materialx(GLenum face, MaterialParameter pname, GLfixed param)
>+{
>+    materialf(face, pname, FixedToFloat(param));
>+}
>+
>+void Context::materialxv(GLenum face, MaterialParameter pname, const GLfixed *param)
>+{
>+    GLfloat paramsf[4];
>+
>+    for (unsigned int i = 0; i < GetMaterialParameterCount(pname); i++)
>+    {
>+        paramsf[i] = FixedToFloat(param[i]);
>+    }
>+
>+    materialfv(face, pname, paramsf);
>+}
>+
>+void Context::matrixMode(MatrixType mode)
>+{
>+    mState.gles1().setMatrixMode(mode);
>+}
>+
>+void Context::multMatrixf(const GLfloat *m)
>+{
>+    mState.gles1().multMatrix(angle::Mat4(m));
>+}
>+
>+void Context::multMatrixx(const GLfixed *m)
>+{
>+    mState.gles1().multMatrix(FixedMatrixToMat4(m));
>+}
>+
>+void Context::multiTexCoord4f(GLenum target, GLfloat s, GLfloat t, GLfloat r, GLfloat q)
>+{
>+    unsigned int unit = target - GL_TEXTURE0;
>+    ASSERT(target >= GL_TEXTURE0 && unit < getCaps().maxMultitextureUnits);
>+    mState.gles1().setCurrentTextureCoords(unit, {s, t, r, q});
>+}
>+
>+void Context::multiTexCoord4x(GLenum target, GLfixed s, GLfixed t, GLfixed r, GLfixed q)
>+{
>+    unsigned int unit = target - GL_TEXTURE0;
>+    ASSERT(target >= GL_TEXTURE0 && unit < getCaps().maxMultitextureUnits);
>+    mState.gles1().setCurrentTextureCoords(
>+        unit, {FixedToFloat(s), FixedToFloat(t), FixedToFloat(r), FixedToFloat(q)});
>+}
>+
>+void Context::normal3f(GLfloat nx, GLfloat ny, GLfloat nz)
>+{
>+    mState.gles1().setCurrentNormal({nx, ny, nz});
>+}
>+
>+void Context::normal3x(GLfixed nx, GLfixed ny, GLfixed nz)
>+{
>+    mState.gles1().setCurrentNormal({FixedToFloat(nx), FixedToFloat(ny), FixedToFloat(nz)});
>+}
>+
>+void Context::normalPointer(VertexAttribType type, GLsizei stride, const void *ptr)
>+{
>+    vertexAttribPointer(vertexArrayIndex(ClientVertexArrayType::Normal), 3, type, GL_FALSE, stride,
>+                        ptr);
>+}
>+
>+void Context::orthof(GLfloat left,
>+                     GLfloat right,
>+                     GLfloat bottom,
>+                     GLfloat top,
>+                     GLfloat zNear,
>+                     GLfloat zFar)
>+{
>+    mState.gles1().multMatrix(angle::Mat4::Ortho(left, right, bottom, top, zNear, zFar));
>+}
>+
>+void Context::orthox(GLfixed l, GLfixed r, GLfixed b, GLfixed t, GLfixed n, GLfixed f)
>+{
>+    mState.gles1().multMatrix(angle::Mat4::Ortho(FixedToFloat(l), FixedToFloat(r), FixedToFloat(b),
>+                                                 FixedToFloat(t), FixedToFloat(n),
>+                                                 FixedToFloat(f)));
>+}
>+
>+void Context::pointParameterf(PointParameter pname, GLfloat param)
>+{
>+    SetPointParameter(&mState.gles1(), pname, &param);
>+}
>+
>+void Context::pointParameterfv(PointParameter pname, const GLfloat *params)
>+{
>+    SetPointParameter(&mState.gles1(), pname, params);
>+}
>+
>+void Context::pointParameterx(PointParameter pname, GLfixed param)
>+{
>+    GLfloat paramf = FixedToFloat(param);
>+    SetPointParameter(&mState.gles1(), pname, &paramf);
>+}
>+
>+void Context::pointParameterxv(PointParameter pname, const GLfixed *params)
>+{
>+    GLfloat paramsf[4] = {};
>+    for (unsigned int i = 0; i < GetPointParameterCount(pname); i++)
>+    {
>+        paramsf[i] = FixedToFloat(params[i]);
>+    }
>+    SetPointParameter(&mState.gles1(), pname, paramsf);
>+}
>+
>+void Context::pointSize(GLfloat size)
>+{
>+    SetPointSize(&mState.gles1(), size);
>+}
>+
>+void Context::pointSizex(GLfixed size)
>+{
>+    SetPointSize(&mState.gles1(), FixedToFloat(size));
>+}
>+
>+void Context::polygonOffsetx(GLfixed factor, GLfixed units)
>+{
>+    UNIMPLEMENTED();
>+}
>+
>+void Context::popMatrix()
>+{
>+    mState.gles1().popMatrix();
>+}
>+
>+void Context::pushMatrix()
>+{
>+    mState.gles1().pushMatrix();
>+}
>+
>+void Context::rotatef(float angle, float x, float y, float z)
>+{
>+    mState.gles1().multMatrix(angle::Mat4::Rotate(angle, angle::Vector3(x, y, z)));
>+}
>+
>+void Context::rotatex(GLfixed angle, GLfixed x, GLfixed y, GLfixed z)
>+{
>+    mState.gles1().multMatrix(angle::Mat4::Rotate(
>+        FixedToFloat(angle), angle::Vector3(FixedToFloat(x), FixedToFloat(y), FixedToFloat(z))));
>+}
>+
>+void Context::sampleCoveragex(GLclampx value, GLboolean invert)
>+{
>+    UNIMPLEMENTED();
>+}
>+
>+void Context::scalef(float x, float y, float z)
>+{
>+    mState.gles1().multMatrix(angle::Mat4::Scale(angle::Vector3(x, y, z)));
>+}
>+
>+void Context::scalex(GLfixed x, GLfixed y, GLfixed z)
>+{
>+    mState.gles1().multMatrix(
>+        angle::Mat4::Scale(angle::Vector3(FixedToFloat(x), FixedToFloat(y), FixedToFloat(z))));
>+}
>+
>+void Context::shadeModel(ShadingModel model)
>+{
>+    mState.gles1().setShadeModel(model);
>+}
>+
>+void Context::texCoordPointer(GLint size, VertexAttribType type, GLsizei stride, const void *ptr)
>+{
>+    vertexAttribPointer(vertexArrayIndex(ClientVertexArrayType::TextureCoord), size, type, GL_FALSE,
>+                        stride, ptr);
>+}
>+
>+void Context::texEnvf(TextureEnvTarget target, TextureEnvParameter pname, GLfloat param)
>+{
>+    SetTextureEnv(mState.getActiveSampler(), &mState.gles1(), target, pname, &param);
>+}
>+
>+void Context::texEnvfv(TextureEnvTarget target, TextureEnvParameter pname, const GLfloat *params)
>+{
>+    SetTextureEnv(mState.getActiveSampler(), &mState.gles1(), target, pname, params);
>+}
>+
>+void Context::texEnvi(TextureEnvTarget target, TextureEnvParameter pname, GLint param)
>+{
>+    GLfloat paramsf[4] = {};
>+    ConvertTextureEnvFromInt(pname, &param, paramsf);
>+    SetTextureEnv(mState.getActiveSampler(), &mState.gles1(), target, pname, paramsf);
>+}
>+
>+void Context::texEnviv(TextureEnvTarget target, TextureEnvParameter pname, const GLint *params)
>+{
>+    GLfloat paramsf[4] = {};
>+    ConvertTextureEnvFromInt(pname, params, paramsf);
>+    SetTextureEnv(mState.getActiveSampler(), &mState.gles1(), target, pname, paramsf);
>+}
>+
>+void Context::texEnvx(TextureEnvTarget target, TextureEnvParameter pname, GLfixed param)
>+{
>+    GLfloat paramsf[4] = {};
>+    ConvertTextureEnvFromFixed(pname, &param, paramsf);
>+    SetTextureEnv(mState.getActiveSampler(), &mState.gles1(), target, pname, paramsf);
>+}
>+
>+void Context::texEnvxv(TextureEnvTarget target, TextureEnvParameter pname, const GLfixed *params)
>+{
>+    GLfloat paramsf[4] = {};
>+    ConvertTextureEnvFromFixed(pname, params, paramsf);
>+    SetTextureEnv(mState.getActiveSampler(), &mState.gles1(), target, pname, paramsf);
>+}
>+
>+void Context::texParameterx(TextureType target, GLenum pname, GLfixed param)
>+{
>+    UNIMPLEMENTED();
>+}
>+
>+void Context::texParameterxv(TextureType target, GLenum pname, const GLfixed *params)
>+{
>+    UNIMPLEMENTED();
>+}
>+
>+void Context::translatef(float x, float y, float z)
>+{
>+    mState.gles1().multMatrix(angle::Mat4::Translate(angle::Vector3(x, y, z)));
>+}
>+
>+void Context::translatex(GLfixed x, GLfixed y, GLfixed z)
>+{
>+    mState.gles1().multMatrix(
>+        angle::Mat4::Translate(angle::Vector3(FixedToFloat(x), FixedToFloat(y), FixedToFloat(z))));
>+}
>+
>+void Context::vertexPointer(GLint size, VertexAttribType type, GLsizei stride, const void *ptr)
>+{
>+    vertexAttribPointer(vertexArrayIndex(ClientVertexArrayType::Vertex), size, type, GL_FALSE,
>+                        stride, ptr);
>+}
>+
>+// GL_OES_draw_texture
>+void Context::drawTexf(float x, float y, float z, float width, float height)
>+{
>+    mGLES1Renderer->drawTexture(this, &mState, x, y, z, width, height);
>+}
>+
>+void Context::drawTexfv(const GLfloat *coords)
>+{
>+    mGLES1Renderer->drawTexture(this, &mState, coords[0], coords[1], coords[2], coords[3],
>+                                coords[4]);
>+}
>+
>+void Context::drawTexi(GLint x, GLint y, GLint z, GLint width, GLint height)
>+{
>+    mGLES1Renderer->drawTexture(this, &mState, static_cast<GLfloat>(x), static_cast<GLfloat>(y),
>+                                static_cast<GLfloat>(z), static_cast<GLfloat>(width),
>+                                static_cast<GLfloat>(height));
>+}
>+
>+void Context::drawTexiv(const GLint *coords)
>+{
>+    mGLES1Renderer->drawTexture(this, &mState, static_cast<GLfloat>(coords[0]),
>+                                static_cast<GLfloat>(coords[1]), static_cast<GLfloat>(coords[2]),
>+                                static_cast<GLfloat>(coords[3]), static_cast<GLfloat>(coords[4]));
>+}
>+
>+void Context::drawTexs(GLshort x, GLshort y, GLshort z, GLshort width, GLshort height)
>+{
>+    mGLES1Renderer->drawTexture(this, &mState, static_cast<GLfloat>(x), static_cast<GLfloat>(y),
>+                                static_cast<GLfloat>(z), static_cast<GLfloat>(width),
>+                                static_cast<GLfloat>(height));
>+}
>+
>+void Context::drawTexsv(const GLshort *coords)
>+{
>+    mGLES1Renderer->drawTexture(this, &mState, static_cast<GLfloat>(coords[0]),
>+                                static_cast<GLfloat>(coords[1]), static_cast<GLfloat>(coords[2]),
>+                                static_cast<GLfloat>(coords[3]), static_cast<GLfloat>(coords[4]));
>+}
>+
>+void Context::drawTexx(GLfixed x, GLfixed y, GLfixed z, GLfixed width, GLfixed height)
>+{
>+    mGLES1Renderer->drawTexture(this, &mState, FixedToFloat(x), FixedToFloat(y), FixedToFloat(z),
>+                                FixedToFloat(width), FixedToFloat(height));
>+}
>+
>+void Context::drawTexxv(const GLfixed *coords)
>+{
>+    mGLES1Renderer->drawTexture(this, &mState, FixedToFloat(coords[0]), FixedToFloat(coords[1]),
>+                                FixedToFloat(coords[2]), FixedToFloat(coords[3]),
>+                                FixedToFloat(coords[4]));
>+}
>+
>+// GL_OES_matrix_palette
>+void Context::currentPaletteMatrix(GLuint matrixpaletteindex)
>+{
>+    UNIMPLEMENTED();
>+}
>+
>+void Context::loadPaletteFromModelViewMatrix()
>+{
>+    UNIMPLEMENTED();
>+}
>+
>+void Context::matrixIndexPointer(GLint size, GLenum type, GLsizei stride, const void *pointer)
>+{
>+    UNIMPLEMENTED();
>+}
>+
>+void Context::weightPointer(GLint size, GLenum type, GLsizei stride, const void *pointer)
>+{
>+    UNIMPLEMENTED();
>+}
>+
>+// GL_OES_point_size_array
>+void Context::pointSizePointer(VertexAttribType type, GLsizei stride, const void *ptr)
>+{
>+    vertexAttribPointer(vertexArrayIndex(ClientVertexArrayType::PointSize), 1, type, GL_FALSE,
>+                        stride, ptr);
>+}
>+
>+// GL_OES_query_matrix
>+GLbitfield Context::queryMatrixx(GLfixed *mantissa, GLint *exponent)
>+{
>+    UNIMPLEMENTED();
>+    return 0;
>+}
>+
>+// GL_OES_texture_cube_map
>+void Context::getTexGenfv(GLenum coord, GLenum pname, GLfloat *params)
>+{
>+    UNIMPLEMENTED();
>+}
>+
>+void Context::getTexGeniv(GLenum coord, GLenum pname, GLint *params)
>+{
>+    UNIMPLEMENTED();
>+}
>+
>+void Context::getTexGenxv(GLenum coord, GLenum pname, GLfixed *params)
>+{
>+    UNIMPLEMENTED();
>+}
>+
>+void Context::texGenf(GLenum coord, GLenum pname, GLfloat param)
>+{
>+    UNIMPLEMENTED();
>+}
>+
>+void Context::texGenfv(GLenum coord, GLenum pname, const GLfloat *params)
>+{
>+    UNIMPLEMENTED();
>+}
>+
>+void Context::texGeni(GLenum coord, GLenum pname, GLint param)
>+{
>+    UNIMPLEMENTED();
>+}
>+
>+void Context::texGeniv(GLenum coord, GLenum pname, const GLint *params)
>+{
>+    UNIMPLEMENTED();
>+}
>+
>+void Context::texGenx(GLenum coord, GLenum pname, GLfixed param)
>+{
>+    UNIMPLEMENTED();
>+}
>+
>+void Context::texGenxv(GLenum coord, GLenum pname, const GLint *params)
>+{
>+    UNIMPLEMENTED();
>+}
>+
>+int Context::vertexArrayIndex(ClientVertexArrayType type) const
>+{
>+    return GLES1Renderer::VertexArrayIndex(type, mState.gles1());
>+}
>+
>+// static
>+int Context::TexCoordArrayIndex(unsigned int unit)
>+{
>+    return GLES1Renderer::TexCoordArrayIndex(unit);
>+}
>+}  // namespace gl
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/Context_gles_1_0_autogen.h b/Source/ThirdParty/ANGLE/src/libANGLE/Context_gles_1_0_autogen.h
>new file mode 100644
>index 00000000000..d38f5759d16
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/Context_gles_1_0_autogen.h
>@@ -0,0 +1,138 @@
>+// GENERATED FILE - DO NOT EDIT.
>+// Generated by generate_entry_points.py using data from gl.xml.
>+//
>+// Copyright 2019 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// Context_gles_1_0_autogen.h: Creates a macro for interfaces in Context.
>+
>+#ifndef ANGLE_CONTEXT_GLES_1_0_AUTOGEN_H_
>+#define ANGLE_CONTEXT_GLES_1_0_AUTOGEN_H_
>+
>+#define ANGLE_GLES1_CONTEXT_API                                                                  \
>+    void alphaFunc(AlphaTestFunc funcPacked, GLfloat ref);                                       \
>+    void alphaFuncx(AlphaTestFunc funcPacked, GLfixed ref);                                      \
>+    void clearColorx(GLfixed red, GLfixed green, GLfixed blue, GLfixed alpha);                   \
>+    void clearDepthx(GLfixed depth);                                                             \
>+    void clientActiveTexture(GLenum texture);                                                    \
>+    void clipPlanef(GLenum p, const GLfloat *eqn);                                               \
>+    void clipPlanex(GLenum plane, const GLfixed *equation);                                      \
>+    void color4f(GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha);                       \
>+    void color4ub(GLubyte red, GLubyte green, GLubyte blue, GLubyte alpha);                      \
>+    void color4x(GLfixed red, GLfixed green, GLfixed blue, GLfixed alpha);                       \
>+    void colorPointer(GLint size, VertexAttribType typePacked, GLsizei stride,                   \
>+                      const void *pointer);                                                      \
>+    void depthRangex(GLfixed n, GLfixed f);                                                      \
>+    void disableClientState(ClientVertexArrayType arrayPacked);                                  \
>+    void enableClientState(ClientVertexArrayType arrayPacked);                                   \
>+    void fogf(GLenum pname, GLfloat param);                                                      \
>+    void fogfv(GLenum pname, const GLfloat *params);                                             \
>+    void fogx(GLenum pname, GLfixed param);                                                      \
>+    void fogxv(GLenum pname, const GLfixed *param);                                              \
>+    void frustumf(GLfloat l, GLfloat r, GLfloat b, GLfloat t, GLfloat n, GLfloat f);             \
>+    void frustumx(GLfixed l, GLfixed r, GLfixed b, GLfixed t, GLfixed n, GLfixed f);             \
>+    void getClipPlanef(GLenum plane, GLfloat *equation);                                         \
>+    void getClipPlanex(GLenum plane, GLfixed *equation);                                         \
>+    void getFixedv(GLenum pname, GLfixed *params);                                               \
>+    void getLightfv(GLenum light, LightParameter pnamePacked, GLfloat *params);                  \
>+    void getLightxv(GLenum light, LightParameter pnamePacked, GLfixed *params);                  \
>+    void getMaterialfv(GLenum face, MaterialParameter pnamePacked, GLfloat *params);             \
>+    void getMaterialxv(GLenum face, MaterialParameter pnamePacked, GLfixed *params);             \
>+    void getTexEnvfv(TextureEnvTarget targetPacked, TextureEnvParameter pnamePacked,             \
>+                     GLfloat *params);                                                           \
>+    void getTexEnviv(TextureEnvTarget targetPacked, TextureEnvParameter pnamePacked,             \
>+                     GLint *params);                                                             \
>+    void getTexEnvxv(TextureEnvTarget targetPacked, TextureEnvParameter pnamePacked,             \
>+                     GLfixed *params);                                                           \
>+    void getTexParameterxv(TextureType targetPacked, GLenum pname, GLfixed *params);             \
>+    void lightModelf(GLenum pname, GLfloat param);                                               \
>+    void lightModelfv(GLenum pname, const GLfloat *params);                                      \
>+    void lightModelx(GLenum pname, GLfixed param);                                               \
>+    void lightModelxv(GLenum pname, const GLfixed *param);                                       \
>+    void lightf(GLenum light, LightParameter pnamePacked, GLfloat param);                        \
>+    void lightfv(GLenum light, LightParameter pnamePacked, const GLfloat *params);               \
>+    void lightx(GLenum light, LightParameter pnamePacked, GLfixed param);                        \
>+    void lightxv(GLenum light, LightParameter pnamePacked, const GLfixed *params);               \
>+    void lineWidthx(GLfixed width);                                                              \
>+    void loadIdentity();                                                                         \
>+    void loadMatrixf(const GLfloat *m);                                                          \
>+    void loadMatrixx(const GLfixed *m);                                                          \
>+    void logicOp(LogicalOperation opcodePacked);                                                 \
>+    void materialf(GLenum face, MaterialParameter pnamePacked, GLfloat param);                   \
>+    void materialfv(GLenum face, MaterialParameter pnamePacked, const GLfloat *params);          \
>+    void materialx(GLenum face, MaterialParameter pnamePacked, GLfixed param);                   \
>+    void materialxv(GLenum face, MaterialParameter pnamePacked, const GLfixed *param);           \
>+    void matrixMode(MatrixType modePacked);                                                      \
>+    void multMatrixf(const GLfloat *m);                                                          \
>+    void multMatrixx(const GLfixed *m);                                                          \
>+    void multiTexCoord4f(GLenum target, GLfloat s, GLfloat t, GLfloat r, GLfloat q);             \
>+    void multiTexCoord4x(GLenum texture, GLfixed s, GLfixed t, GLfixed r, GLfixed q);            \
>+    void normal3f(GLfloat nx, GLfloat ny, GLfloat nz);                                           \
>+    void normal3x(GLfixed nx, GLfixed ny, GLfixed nz);                                           \
>+    void normalPointer(VertexAttribType typePacked, GLsizei stride, const void *pointer);        \
>+    void orthof(GLfloat l, GLfloat r, GLfloat b, GLfloat t, GLfloat n, GLfloat f);               \
>+    void orthox(GLfixed l, GLfixed r, GLfixed b, GLfixed t, GLfixed n, GLfixed f);               \
>+    void pointParameterf(PointParameter pnamePacked, GLfloat param);                             \
>+    void pointParameterfv(PointParameter pnamePacked, const GLfloat *params);                    \
>+    void pointParameterx(PointParameter pnamePacked, GLfixed param);                             \
>+    void pointParameterxv(PointParameter pnamePacked, const GLfixed *params);                    \
>+    void pointSize(GLfloat size);                                                                \
>+    void pointSizex(GLfixed size);                                                               \
>+    void polygonOffsetx(GLfixed factor, GLfixed units);                                          \
>+    void popMatrix();                                                                            \
>+    void pushMatrix();                                                                           \
>+    void rotatef(GLfloat angle, GLfloat x, GLfloat y, GLfloat z);                                \
>+    void rotatex(GLfixed angle, GLfixed x, GLfixed y, GLfixed z);                                \
>+    void sampleCoveragex(GLclampx value, GLboolean invert);                                      \
>+    void scalef(GLfloat x, GLfloat y, GLfloat z);                                                \
>+    void scalex(GLfixed x, GLfixed y, GLfixed z);                                                \
>+    void shadeModel(ShadingModel modePacked);                                                    \
>+    void texCoordPointer(GLint size, VertexAttribType typePacked, GLsizei stride,                \
>+                         const void *pointer);                                                   \
>+    void texEnvf(TextureEnvTarget targetPacked, TextureEnvParameter pnamePacked, GLfloat param); \
>+    void texEnvfv(TextureEnvTarget targetPacked, TextureEnvParameter pnamePacked,                \
>+                  const GLfloat *params);                                                        \
>+    void texEnvi(TextureEnvTarget targetPacked, TextureEnvParameter pnamePacked, GLint param);   \
>+    void texEnviv(TextureEnvTarget targetPacked, TextureEnvParameter pnamePacked,                \
>+                  const GLint *params);                                                          \
>+    void texEnvx(TextureEnvTarget targetPacked, TextureEnvParameter pnamePacked, GLfixed param); \
>+    void texEnvxv(TextureEnvTarget targetPacked, TextureEnvParameter pnamePacked,                \
>+                  const GLfixed *params);                                                        \
>+    void texParameterx(TextureType targetPacked, GLenum pname, GLfixed param);                   \
>+    void texParameterxv(TextureType targetPacked, GLenum pname, const GLfixed *params);          \
>+    void translatef(GLfloat x, GLfloat y, GLfloat z);                                            \
>+    void translatex(GLfixed x, GLfixed y, GLfixed z);                                            \
>+    void vertexPointer(GLint size, VertexAttribType typePacked, GLsizei stride,                  \
>+                       const void *pointer);                                                     \
>+    /* GL_OES_draw_texture */                                                                    \
>+    void drawTexf(GLfloat x, GLfloat y, GLfloat z, GLfloat width, GLfloat height);               \
>+    void drawTexfv(const GLfloat *coords);                                                       \
>+    void drawTexi(GLint x, GLint y, GLint z, GLint width, GLint height);                         \
>+    void drawTexiv(const GLint *coords);                                                         \
>+    void drawTexs(GLshort x, GLshort y, GLshort z, GLshort width, GLshort height);               \
>+    void drawTexsv(const GLshort *coords);                                                       \
>+    void drawTexx(GLfixed x, GLfixed y, GLfixed z, GLfixed width, GLfixed height);               \
>+    void drawTexxv(const GLfixed *coords);                                                       \
>+    /* GL_OES_framebuffer_object */                                                              \
>+    /* GL_OES_matrix_palette */                                                                  \
>+    void currentPaletteMatrix(GLuint matrixpaletteindex);                                        \
>+    void loadPaletteFromModelViewMatrix();                                                       \
>+    void matrixIndexPointer(GLint size, GLenum type, GLsizei stride, const void *pointer);       \
>+    void weightPointer(GLint size, GLenum type, GLsizei stride, const void *pointer);            \
>+    /* GL_OES_point_size_array */                                                                \
>+    void pointSizePointer(VertexAttribType typePacked, GLsizei stride, const void *pointer);     \
>+    /* GL_OES_query_matrix */                                                                    \
>+    GLbitfield queryMatrixx(GLfixed *mantissa, GLint *exponent);                                 \
>+    /* GL_OES_texture_cube_map */                                                                \
>+    void getTexGenfv(GLenum coord, GLenum pname, GLfloat *params);                               \
>+    void getTexGeniv(GLenum coord, GLenum pname, GLint *params);                                 \
>+    void getTexGenxv(GLenum coord, GLenum pname, GLfixed *params);                               \
>+    void texGenf(GLenum coord, GLenum pname, GLfloat param);                                     \
>+    void texGenfv(GLenum coord, GLenum pname, const GLfloat *params);                            \
>+    void texGeni(GLenum coord, GLenum pname, GLint param);                                       \
>+    void texGeniv(GLenum coord, GLenum pname, const GLint *params);                              \
>+    void texGenx(GLenum coord, GLenum pname, GLfixed param);                                     \
>+    void texGenxv(GLenum coord, GLenum pname, const GLfixed *params);
>+
>+#endif  // ANGLE_CONTEXT_API_1_0_AUTOGEN_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/Debug.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/Debug.cpp
>index 96f30df98c4..d41769f9be3 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/Debug.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/Debug.cpp
>@@ -16,28 +16,20 @@
> namespace gl
> {
> 
>-Debug::Control::Control()
>-{
>-}
>+Debug::Control::Control() {}
> 
>-Debug::Control::~Control()
>-{
>-}
>+Debug::Control::~Control() {}
> 
> Debug::Control::Control(const Control &other) = default;
> 
>-Debug::Group::Group()
>-{
>-}
>+Debug::Group::Group() {}
> 
>-Debug::Group::~Group()
>-{
>-}
>+Debug::Group::~Group() {}
> 
> Debug::Group::Group(const Group &other) = default;
> 
>-Debug::Debug()
>-    : mOutputEnabled(false),
>+Debug::Debug(bool initialDebugState)
>+    : mOutputEnabled(initialDebugState),
>       mCallbackFunction(nullptr),
>       mCallbackUserParam(nullptr),
>       mMessages(),
>@@ -48,9 +40,7 @@ Debug::Debug()
>     pushDefaultGroup();
> }
> 
>-Debug::~Debug()
>-{
>-}
>+Debug::~Debug() {}
> 
> void Debug::setMaxLoggedMessages(GLuint maxLoggedMessages)
> {
>@@ -97,7 +87,7 @@ void Debug::insertMessage(GLenum source,
>                           GLenum type,
>                           GLuint id,
>                           GLenum severity,
>-                          const std::string &message)
>+                          const std::string &message) const
> {
>     std::string messageCopy(message);
>     insertMessage(source, type, id, severity, std::move(messageCopy));
>@@ -107,7 +97,7 @@ void Debug::insertMessage(GLenum source,
>                           GLenum type,
>                           GLuint id,
>                           GLenum severity,
>-                          std::string &&message)
>+                          std::string &&message) const
> {
>     if (!isMessageEnabled(source, type, id, severity))
>     {
>@@ -312,16 +302,75 @@ void Debug::pushDefaultGroup()
>     c0.source   = GL_DONT_CARE;
>     c0.type     = GL_DONT_CARE;
>     c0.severity = GL_DONT_CARE;
>-    c0.enabled = true;
>+    c0.enabled  = true;
>     g.controls.push_back(std::move(c0));
> 
>     Control c1;
>     c1.source   = GL_DONT_CARE;
>     c1.type     = GL_DONT_CARE;
>     c1.severity = GL_DEBUG_SEVERITY_LOW;
>-    c1.enabled = false;
>+    c1.enabled  = false;
>     g.controls.push_back(std::move(c1));
> 
>     mGroups.push_back(std::move(g));
> }
> }  // namespace gl
>+
>+namespace egl
>+{
>+
>+namespace
>+{
>+angle::PackedEnumBitSet<MessageType> GetDefaultMessageTypeBits()
>+{
>+    angle::PackedEnumBitSet<MessageType> result;
>+    result.set(MessageType::Critical);
>+    result.set(MessageType::Error);
>+    return result;
>+}
>+}  // anonymous namespace
>+
>+Debug::Debug() : mCallback(nullptr), mEnabledMessageTypes(GetDefaultMessageTypeBits()) {}
>+
>+void Debug::setCallback(EGLDEBUGPROCKHR callback, const AttributeMap &attribs)
>+{
>+    mCallback = callback;
>+
>+    const angle::PackedEnumBitSet<MessageType> defaultMessageTypes = GetDefaultMessageTypeBits();
>+    if (mCallback != nullptr)
>+    {
>+        for (MessageType messageType : angle::AllEnums<MessageType>())
>+        {
>+            mEnabledMessageTypes[messageType] =
>+                (attribs.getAsInt(egl::ToEGLenum(messageType), defaultMessageTypes[messageType]) ==
>+                 EGL_TRUE);
>+        }
>+    }
>+}
>+
>+EGLDEBUGPROCKHR Debug::getCallback() const
>+{
>+    return mCallback;
>+}
>+
>+bool Debug::isMessageTypeEnabled(MessageType type) const
>+{
>+    return mEnabledMessageTypes[type];
>+}
>+
>+void Debug::insertMessage(EGLenum error,
>+                          const char *command,
>+                          MessageType messageType,
>+                          EGLLabelKHR threadLabel,
>+                          EGLLabelKHR objectLabel,
>+                          const std::string &message) const
>+{
>+    // TODO(geofflang): Lock before checking the callback. http://anglebug.com/2464
>+    if (mCallback && isMessageTypeEnabled(messageType))
>+    {
>+        mCallback(error, command, egl::ToEGLenum(messageType), threadLabel, objectLabel,
>+                  message.c_str());
>+    }
>+}
>+
>+}  // namespace egl
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/Debug.h b/Source/ThirdParty/ANGLE/src/libANGLE/Debug.h
>index 2c15c25e9a2..79b6de702fe 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/Debug.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/Debug.h
>@@ -10,7 +10,9 @@
> #define LIBANGLE_DEBUG_H_
> 
> #include "angle_gl.h"
>+#include "common/PackedEnums.h"
> #include "common/angleutils.h"
>+#include "libANGLE/AttributeMap.h"
> 
> #include <deque>
> #include <string>
>@@ -18,19 +20,20 @@
> 
> namespace gl
> {
>+class Context;
> 
> class LabeledObject
> {
>   public:
>     virtual ~LabeledObject() {}
>-    virtual void setLabel(const std::string &label) = 0;
>-    virtual const std::string &getLabel() const = 0;
>+    virtual void setLabel(const Context *context, const std::string &label) = 0;
>+    virtual const std::string &getLabel() const     = 0;
> };
> 
> class Debug : angle::NonCopyable
> {
>   public:
>-    Debug();
>+    Debug(bool initialDebugState);
>     ~Debug();
> 
>     void setMaxLoggedMessages(GLuint maxLoggedMessages);
>@@ -49,12 +52,12 @@ class Debug : angle::NonCopyable
>                        GLenum type,
>                        GLuint id,
>                        GLenum severity,
>-                       const std::string &message);
>+                       const std::string &message) const;
>     void insertMessage(GLenum source,
>                        GLenum type,
>                        GLuint id,
>                        GLenum severity,
>-                       std::string &&message);
>+                       std::string &&message) const;
> 
>     void setMessageControl(GLenum source,
>                            GLenum type,
>@@ -119,11 +122,42 @@ class Debug : angle::NonCopyable
>     bool mOutputEnabled;
>     GLDEBUGPROCKHR mCallbackFunction;
>     const void *mCallbackUserParam;
>-    std::deque<Message> mMessages;
>+    mutable std::deque<Message> mMessages;
>     GLuint mMaxLoggedMessages;
>     bool mOutputSynchronous;
>     std::vector<Group> mGroups;
> };
> }  // namespace gl
> 
>+namespace egl
>+{
>+class LabeledObject
>+{
>+  public:
>+    virtual ~LabeledObject() {}
>+    virtual void setLabel(EGLLabelKHR label) = 0;
>+    virtual EGLLabelKHR getLabel() const     = 0;
>+};
>+
>+class Debug : angle::NonCopyable
>+{
>+  public:
>+    Debug();
>+
>+    void setCallback(EGLDEBUGPROCKHR callback, const AttributeMap &attribs);
>+    EGLDEBUGPROCKHR getCallback() const;
>+    bool isMessageTypeEnabled(MessageType type) const;
>+
>+    void insertMessage(EGLenum error,
>+                       const char *command,
>+                       MessageType messageType,
>+                       EGLLabelKHR threadLabel,
>+                       EGLLabelKHR objectLabel,
>+                       const std::string &message) const;
>+
>+  private:
>+    EGLDEBUGPROCKHR mCallback;
>+    angle::PackedEnumBitSet<MessageType> mEnabledMessageTypes;
>+};
>+}  // namespace egl
> #endif  // LIBANGLE_DEBUG_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/Device.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/Device.cpp
>index 3ebf48b919c..13ae4e618e0 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/Device.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/Device.cpp
>@@ -11,15 +11,15 @@
> 
> #include <iterator>
> 
>-#include <platform/Platform.h>
> #include <EGL/eglext.h>
>+#include <platform/Platform.h>
> 
> #include "common/debug.h"
> #include "common/platform.h"
> #include "libANGLE/renderer/DeviceImpl.h"
> 
> #if defined(ANGLE_ENABLE_D3D11)
>-#include "libANGLE/renderer/d3d/DeviceD3D.h"
>+#    include "libANGLE/renderer/d3d/DeviceD3D.h"
> #endif
> 
> namespace egl
>@@ -31,7 +31,8 @@ static std::string GenerateExtensionsString(const T &extensions)
>     std::vector<std::string> extensionsVector = extensions.getStrings();
> 
>     std::ostringstream stream;
>-    std::copy(extensionsVector.begin(), extensionsVector.end(), std::ostream_iterator<std::string>(stream, " "));
>+    std::copy(extensionsVector.begin(), extensionsVector.end(),
>+              std::ostream_iterator<std::string>(stream, " "));
>     return stream.str();
> }
> 
>@@ -43,41 +44,43 @@ static DeviceSet *GetDeviceSet()
> }
> 
> // Static factory methods
>-egl::Error Device::CreateDevice(void *devicePointer, EGLint deviceType, Device **outDevice)
>+egl::Error Device::CreateDevice(EGLint deviceType, void *nativeDevice, Device **outDevice)
> {
>     *outDevice = nullptr;
> 
>+    std::unique_ptr<rx::DeviceImpl> newDeviceImpl;
>+
> #if defined(ANGLE_ENABLE_D3D11)
>     if (deviceType == EGL_D3D11_DEVICE_ANGLE)
>     {
>-        std::unique_ptr<rx::DeviceD3D> deviceD3D(new rx::DeviceD3D());
>-        ANGLE_TRY(deviceD3D->initialize(devicePointer, deviceType, EGL_TRUE));
>-        *outDevice = new Device(nullptr, deviceD3D.release());
>-        GetDeviceSet()->insert(*outDevice);
>-        return NoError();
>+        newDeviceImpl.reset(new rx::DeviceD3D(deviceType, nativeDevice));
>     }
> #endif
> 
>     // Note that creating an EGL device from inputted D3D9 parameters isn't currently supported
>-    return EglBadAttribute();
>-}
> 
>-egl::Error Device::CreateDevice(Display *owningDisplay, rx::DeviceImpl *impl, Device **outDevice)
>-{
>-    *outDevice = new Device(owningDisplay, impl);
>-    GetDeviceSet()->insert(*outDevice);
>+    if (newDeviceImpl == nullptr)
>+    {
>+        return EglBadAttribute();
>+    }
>+
>+    ANGLE_TRY(newDeviceImpl->initialize());
>+    *outDevice = new Device(nullptr, newDeviceImpl.release());
>+
>     return NoError();
> }
> 
>-bool Device::IsValidDevice(Device *device)
>+bool Device::IsValidDevice(const Device *device)
> {
>     const DeviceSet *deviceSet = GetDeviceSet();
>-    return deviceSet->find(device) != deviceSet->end();
>+    return deviceSet->find(const_cast<Device *>(device)) != deviceSet->end();
> }
> 
> Device::Device(Display *owningDisplay, rx::DeviceImpl *impl)
>-    : mOwningDisplay(owningDisplay), mImplementation(impl)
>+    : mLabel(nullptr), mOwningDisplay(owningDisplay), mImplementation(impl)
> {
>+    ASSERT(GetDeviceSet()->find(this) == GetDeviceSet()->end());
>+    GetDeviceSet()->insert(this);
>     initDeviceExtensions();
> }
> 
>@@ -85,19 +88,23 @@ Device::~Device()
> {
>     ASSERT(GetDeviceSet()->find(this) != GetDeviceSet()->end());
>     GetDeviceSet()->erase(this);
>+}
> 
>-    if (mImplementation->deviceExternallySourced())
>-    {
>-        // If the device isn't externally sourced then it is up to the renderer to delete the impl
>-        SafeDelete(mImplementation);
>-    }
>+void Device::setLabel(EGLLabelKHR label)
>+{
>+    mLabel = label;
>+}
>+
>+EGLLabelKHR Device::getLabel() const
>+{
>+    return mLabel;
> }
> 
> Error Device::getDevice(EGLAttrib *value)
> {
>     void *nativeDevice = nullptr;
>-    egl::Error error = getImplementation()->getDevice(&nativeDevice);
>-    *value = reinterpret_cast<EGLAttrib>(nativeDevice);
>+    egl::Error error   = getImplementation()->getDevice(&nativeDevice);
>+    *value             = reinterpret_cast<EGLAttrib>(nativeDevice);
>     return error;
> }
> 
>@@ -121,5 +128,4 @@ const std::string &Device::getExtensionString() const
> {
>     return mDeviceExtensionString;
> }
>-
>-}
>+}  // namespace egl
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/Device.h b/Source/ThirdParty/ANGLE/src/libANGLE/Device.h
>index 4bc58ff043a..1096e95a4df 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/Device.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/Device.h
>@@ -11,48 +11,50 @@
> #define LIBANGLE_DEVICE_H_
> 
> #include "common/angleutils.h"
>-#include "libANGLE/Error.h"
> #include "libANGLE/Display.h"
>+#include "libANGLE/Error.h"
>+
>+#include <memory>
> 
> namespace rx
> {
> class DeviceImpl;
>-}
>+}  // namespace rx
> 
> namespace egl
> {
>-class Device final : angle::NonCopyable
>+class Device final : public LabeledObject, angle::NonCopyable
> {
>   public:
>-    virtual ~Device();
>+    Device(Display *owningDisplay, rx::DeviceImpl *impl);
>+    ~Device() override;
>+
>+    void setLabel(EGLLabelKHR label) override;
>+    EGLLabelKHR getLabel() const override;
> 
>     Error getDevice(EGLAttrib *value);
>-    Display *getOwningDisplay() { return mOwningDisplay; };
>+    Display *getOwningDisplay() { return mOwningDisplay; }
>     EGLint getType();
> 
>     const DeviceExtensions &getExtensions() const;
>     const std::string &getExtensionString() const;
> 
>-    rx::DeviceImpl *getImplementation() { return mImplementation; }
>+    rx::DeviceImpl *getImplementation() { return mImplementation.get(); }
> 
>-    static egl::Error CreateDevice(void *devicePointer, EGLint deviceType, Device **outDevice);
>-    static egl::Error CreateDevice(Display *owningDisplay,
>-                                   rx::DeviceImpl *impl,
>-                                   Device **outDevice);
>-
>-    static bool IsValidDevice(Device *device);
>+    static egl::Error CreateDevice(EGLint deviceType, void *nativeDevice, Device **outDevice);
>+    static bool IsValidDevice(const Device *device);
> 
>   private:
>-    Device(Display *owningDisplay, rx::DeviceImpl *impl);
>     void initDeviceExtensions();
> 
>+    EGLLabelKHR mLabel;
>+
>     Display *mOwningDisplay;
>-    rx::DeviceImpl *mImplementation;
>+    std::unique_ptr<rx::DeviceImpl> mImplementation;
> 
>     DeviceExtensions mDeviceExtensions;
>     std::string mDeviceExtensionString;
> };
>+}  // namespace egl
> 
>-}
>-
>-#endif   // LIBANGLE_DEVICE_H_
>+#endif  // LIBANGLE_DEVICE_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/Display.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/Display.cpp
>index 735b4727877..21064073e45 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/Display.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/Display.cpp
>@@ -16,56 +16,65 @@
> #include <sstream>
> #include <vector>
> 
>-#include <platform/Platform.h>
> #include <EGL/eglext.h>
>+#include <platform/Platform.h>
> 
> #include "common/debug.h"
> #include "common/mathutil.h"
> #include "common/platform.h"
>+#include "common/string_utils.h"
>+#include "common/system_utils.h"
> #include "common/utilities.h"
> #include "libANGLE/Context.h"
> #include "libANGLE/Device.h"
>-#include "libANGLE/histogram_macros.h"
>+#include "libANGLE/EGLSync.h"
> #include "libANGLE/Image.h"
>-#include "libANGLE/Surface.h"
>-#include "libANGLE/Stream.h"
> #include "libANGLE/ResourceManager.h"
>+#include "libANGLE/Stream.h"
>+#include "libANGLE/Surface.h"
>+#include "libANGLE/Thread.h"
>+#include "libANGLE/histogram_macros.h"
>+#include "libANGLE/renderer/DeviceImpl.h"
> #include "libANGLE/renderer/DisplayImpl.h"
> #include "libANGLE/renderer/ImageImpl.h"
> #include "third_party/trace_event/trace_event.h"
> 
> #if defined(ANGLE_ENABLE_D3D9) || defined(ANGLE_ENABLE_D3D11)
>-#   include "libANGLE/renderer/d3d/DisplayD3D.h"
>+#    include "libANGLE/renderer/d3d/DisplayD3D.h"
> #endif
> 
> #if defined(ANGLE_ENABLE_OPENGL)
>-#   if defined(ANGLE_PLATFORM_WINDOWS)
>-#       include "libANGLE/renderer/gl/wgl/DisplayWGL.h"
>-#   elif defined(ANGLE_USE_X11)
>-#       include "libANGLE/renderer/gl/glx/DisplayGLX.h"
>-#   elif defined(ANGLE_PLATFORM_APPLE)
>-#       include "libANGLE/renderer/gl/cgl/DisplayCGL.h"
>-#   elif defined(ANGLE_USE_OZONE)
>-#       include "libANGLE/renderer/gl/egl/ozone/DisplayOzone.h"
>-#   elif defined(ANGLE_PLATFORM_ANDROID)
>-#       include "libANGLE/renderer/gl/egl/android/DisplayAndroid.h"
>-#   else
>-#       error Unsupported OpenGL platform.
>-#   endif
>+#    if defined(ANGLE_PLATFORM_WINDOWS)
>+#        include "libANGLE/renderer/gl/wgl/DisplayWGL.h"
>+#    elif defined(ANGLE_USE_X11)
>+#        include "libANGLE/renderer/gl/glx/DisplayGLX.h"
>+#    elif defined(ANGLE_PLATFORM_APPLE)
>+#        include "libANGLE/renderer/gl/cgl/DisplayCGL.h"
>+#    elif defined(ANGLE_USE_OZONE)
>+#        include "libANGLE/renderer/gl/egl/ozone/DisplayOzone.h"
>+#    elif defined(ANGLE_PLATFORM_ANDROID)
>+#        include "libANGLE/renderer/gl/egl/android/DisplayAndroid.h"
>+#    else
>+#        error Unsupported OpenGL platform.
>+#    endif
> #endif
> 
> #if defined(ANGLE_ENABLE_NULL)
>-#include "libANGLE/renderer/null/DisplayNULL.h"
>+#    include "libANGLE/renderer/null/DisplayNULL.h"
> #endif  // defined(ANGLE_ENABLE_NULL)
> 
> #if defined(ANGLE_ENABLE_VULKAN)
>-#if defined(ANGLE_PLATFORM_WINDOWS)
>-#include "libANGLE/renderer/vulkan/win32/DisplayVkWin32.h"
>-#elif defined(ANGLE_PLATFORM_LINUX)
>-#include "libANGLE/renderer/vulkan/xcb/DisplayVkXcb.h"
>-#else
>-#error Unsupported Vulkan platform.
>-#endif
>+#    if defined(ANGLE_PLATFORM_WINDOWS)
>+#        include "libANGLE/renderer/vulkan/win32/DisplayVkWin32.h"
>+#    elif defined(ANGLE_PLATFORM_LINUX)
>+#        include "libANGLE/renderer/vulkan/xcb/DisplayVkXcb.h"
>+#    elif defined(ANGLE_PLATFORM_ANDROID)
>+#        include "libANGLE/renderer/vulkan/android/DisplayVkAndroid.h"
>+#    elif defined(ANGLE_PLATFORM_FUCHSIA)
>+#        include "libANGLE/renderer/vulkan/fuchsia/DisplayVkFuchsia.h"
>+#    else
>+#        error Unsupported Vulkan platform.
>+#    endif
> #endif  // defined(ANGLE_ENABLE_VULKAN)
> 
> namespace egl
>@@ -74,7 +83,7 @@ namespace egl
> namespace
> {
> 
>-typedef std::map<EGLNativeWindowType, Surface*> WindowSurfaceMap;
>+typedef std::map<EGLNativeWindowType, Surface *> WindowSurfaceMap;
> // Get a map of all EGL window surfaces to validate that no window has more than one EGL surface
> // associated with it.
> static WindowSurfaceMap *GetWindowSurfaces()
>@@ -128,11 +137,50 @@ rx::DisplayImpl *CreateDisplayFromDevice(Device *eglDevice, const DisplayState &
>     return impl;
> }
> 
>+// On platforms with support for multiple back-ends, allow an environment variable to control
>+// the default.  This is useful to run angle with benchmarks without having to modify the
>+// benchmark source.  Possible values for this environment variable (ANGLE_DEFAULT_PLATFORM)
>+// are: vulkan, gl, d3d11.
>+EGLAttrib GetDisplayTypeFromEnvironment()
>+{
>+    std::string angleDefaultEnv = angle::GetEnvironmentVar("ANGLE_DEFAULT_PLATFORM");
>+    angle::ToLower(&angleDefaultEnv);
>+
>+#if defined(ANGLE_ENABLE_VULKAN)
>+    if (angleDefaultEnv == "vulkan")
>+    {
>+        return EGL_PLATFORM_ANGLE_TYPE_VULKAN_ANGLE;
>+    }
>+#endif
>+
>+#if defined(ANGLE_ENABLE_OPENGL)
>+    if (angleDefaultEnv == "gl")
>+    {
>+        return EGL_PLATFORM_ANGLE_TYPE_OPENGLES_ANGLE;
>+    }
>+#endif
>+
>+#if defined(ANGLE_ENABLE_D3D11)
>+    if (angleDefaultEnv == "d3d11")
>+    {
>+        return EGL_PLATFORM_ANGLE_TYPE_D3D11_ANGLE;
>+    }
>+#endif
>+
>+    return EGL_PLATFORM_ANGLE_TYPE_DEFAULT_ANGLE;
>+}
>+
> rx::DisplayImpl *CreateDisplayFromAttribs(const AttributeMap &attribMap, const DisplayState &state)
> {
>     rx::DisplayImpl *impl = nullptr;
>     EGLAttrib displayType =
>         attribMap.get(EGL_PLATFORM_ANGLE_TYPE_ANGLE, EGL_PLATFORM_ANGLE_TYPE_DEFAULT_ANGLE);
>+
>+    if (displayType == EGL_PLATFORM_ANGLE_TYPE_DEFAULT_ANGLE)
>+    {
>+        displayType = GetDisplayTypeFromEnvironment();
>+    }
>+
>     switch (displayType)
>     {
>         case EGL_PLATFORM_ANGLE_TYPE_DEFAULT_ANGLE:
>@@ -143,10 +191,16 @@ rx::DisplayImpl *CreateDisplayFromAttribs(const AttributeMap &attribMap, const D
>             impl = new rx::DisplayGLX(state);
> #elif defined(ANGLE_PLATFORM_APPLE)
>             impl = new rx::DisplayCGL(state);
>+#elif defined(ANGLE_PLATFORM_FUCHSIA)
>+            impl = new rx::DisplayVkFuchsia(state);
> #elif defined(ANGLE_USE_OZONE)
>             impl = new rx::DisplayOzone(state);
> #elif defined(ANGLE_PLATFORM_ANDROID)
>+#    if defined(ANGLE_ENABLE_VULKAN)
>+            impl = new rx::DisplayVkAndroid(state);
>+#    else
>             impl = new rx::DisplayAndroid(state);
>+#    endif
> #else
>             // No display available
>             UNREACHABLE();
>@@ -165,21 +219,21 @@ rx::DisplayImpl *CreateDisplayFromAttribs(const AttributeMap &attribMap, const D
> 
>         case EGL_PLATFORM_ANGLE_TYPE_OPENGL_ANGLE:
> #if defined(ANGLE_ENABLE_OPENGL)
>-#if defined(ANGLE_PLATFORM_WINDOWS)
>+#    if defined(ANGLE_PLATFORM_WINDOWS)
>             impl = new rx::DisplayWGL(state);
>-#elif defined(ANGLE_USE_X11)
>+#    elif defined(ANGLE_USE_X11)
>             impl = new rx::DisplayGLX(state);
>-#elif defined(ANGLE_PLATFORM_APPLE)
>+#    elif defined(ANGLE_PLATFORM_APPLE)
>             impl = new rx::DisplayCGL(state);
>-#elif defined(ANGLE_USE_OZONE)
>+#    elif defined(ANGLE_USE_OZONE)
>             // This might work but has never been tried, so disallow for now.
>             impl = nullptr;
>-#elif defined(ANGLE_PLATFORM_ANDROID)
>+#    elif defined(ANGLE_PLATFORM_ANDROID)
>             // No GL support on this platform, fail display creation.
>             impl = nullptr;
>-#else
>-#error Unsupported OpenGL platform.
>-#endif
>+#    else
>+#        error Unsupported OpenGL platform.
>+#    endif
> #else
>             // No display available
>             UNREACHABLE();
>@@ -188,30 +242,34 @@ rx::DisplayImpl *CreateDisplayFromAttribs(const AttributeMap &attribMap, const D
> 
>         case EGL_PLATFORM_ANGLE_TYPE_OPENGLES_ANGLE:
> #if defined(ANGLE_ENABLE_OPENGL)
>-#if defined(ANGLE_PLATFORM_WINDOWS)
>+#    if defined(ANGLE_PLATFORM_WINDOWS)
>             impl = new rx::DisplayWGL(state);
>-#elif defined(ANGLE_USE_X11)
>+#    elif defined(ANGLE_USE_X11)
>             impl = new rx::DisplayGLX(state);
>-#elif defined(ANGLE_USE_OZONE)
>+#    elif defined(ANGLE_USE_OZONE)
>             impl = new rx::DisplayOzone(state);
>-#elif defined(ANGLE_PLATFORM_ANDROID)
>+#    elif defined(ANGLE_PLATFORM_ANDROID)
>             impl = new rx::DisplayAndroid(state);
>-#else
>+#    else
>             // No GLES support on this platform, fail display creation.
>             impl = nullptr;
>-#endif
>+#    endif
> #endif  // defined(ANGLE_ENABLE_OPENGL)
>             break;
> 
>         case EGL_PLATFORM_ANGLE_TYPE_VULKAN_ANGLE:
> #if defined(ANGLE_ENABLE_VULKAN)
>-#if defined(ANGLE_PLATFORM_WINDOWS)
>+#    if defined(ANGLE_PLATFORM_WINDOWS)
>             impl = new rx::DisplayVkWin32(state);
>-#elif defined(ANGLE_PLATFORM_LINUX)
>+#    elif defined(ANGLE_PLATFORM_LINUX)
>             impl = new rx::DisplayVkXcb(state);
>-#else
>-#error Unsupported Vulkan platform.
>-#endif
>+#    elif defined(ANGLE_PLATFORM_ANDROID)
>+            impl = new rx::DisplayVkAndroid(state);
>+#    elif defined(ANGLE_PLATFORM_FUCHSIA)
>+            impl = new rx::DisplayVkFuchsia(state);
>+#    else
>+#        error Unsupported Vulkan platform.
>+#    endif
> #else
>             // No display available
>             UNREACHABLE();
>@@ -268,13 +326,9 @@ void ANGLESetDefaultDisplayPlatform(angle::EGLDisplayType display)
> 
> }  // anonymous namespace
> 
>-DisplayState::DisplayState()
>-{
>-}
>+DisplayState::DisplayState() : label(nullptr) {}
> 
>-DisplayState::~DisplayState()
>-{
>-}
>+DisplayState::~DisplayState() {}
> 
> // static
> Display *Display::GetDisplayFromNativeDisplay(EGLNativeDisplayType nativeDisplay,
>@@ -380,11 +434,10 @@ Display::Display(EGLenum platform, EGLNativeDisplayType displayId, Device *eglDe
>       mDevice(eglDevice),
>       mPlatform(platform),
>       mTextureManager(nullptr),
>-      mMemoryProgramCache(gl::kDefaultMaxProgramCacheMemoryBytes),
>-      mGlobalTextureShareGroupUsers(0),
>-      mProxyContext(this)
>-{
>-}
>+      mBlobCache(gl::kDefaultMaxProgramCacheMemoryBytes),
>+      mMemoryProgramCache(mBlobCache),
>+      mGlobalTextureShareGroupUsers(0)
>+{}
> 
> Display::~Display()
> {
>@@ -414,12 +467,20 @@ Display::~Display()
>         UNREACHABLE();
>     }
> 
>-    mProxyContext.reset(nullptr);
>-
>     SafeDelete(mDevice);
>     SafeDelete(mImplementation);
> }
> 
>+void Display::setLabel(EGLLabelKHR label)
>+{
>+    mState.label = label;
>+}
>+
>+EGLLabelKHR Display::getLabel() const
>+{
>+    return mState.label;
>+}
>+
> void Display::setAttributes(rx::DisplayImpl *impl, const AttributeMap &attribMap)
> {
>     ASSERT(!mInitialized);
>@@ -433,6 +494,9 @@ void Display::setAttributes(rx::DisplayImpl *impl, const AttributeMap &attribMap
> 
> Error Display::initialize()
> {
>+    ASSERT(mImplementation != nullptr);
>+    mImplementation->setBlobCache(&mBlobCache);
>+
>     // TODO(jmadill): Store Platform in Display and init here.
>     const angle::PlatformMethods *platformMethods =
>         reinterpret_cast<const angle::PlatformMethods *>(
>@@ -448,11 +512,11 @@ Error Display::initialize()
> 
>     gl::InitializeDebugAnnotations(&mAnnotator);
> 
>+    gl::InitializeDebugMutexIfNeeded();
>+
>     SCOPED_ANGLE_HISTOGRAM_TIMER("GPU.ANGLE.DisplayInitializeMS");
>     TRACE_EVENT0("gpu.angle", "egl::Display::initialize");
> 
>-    ASSERT(mImplementation != nullptr);
>-
>     if (isInitialized())
>     {
>         return NoError();
>@@ -475,6 +539,15 @@ Error Display::initialize()
>         return EglNotInitialized();
>     }
> 
>+    // OpenGL ES1 is implemented in the frontend, explicitly add ES1 support to all configs
>+    for (auto &config : mConfigSet)
>+    {
>+        // TODO(geofflang): Enable the conformant bit once we pass enough tests
>+        // config.second.conformant |= EGL_OPENGL_ES_BIT;
>+
>+        config.second.renderableType |= EGL_OPENGL_ES_BIT;
>+    }
>+
>     initDisplayExtensions();
>     initVendorString();
> 
>@@ -483,9 +556,17 @@ Error Display::initialize()
>     {
>         if (mDisplayExtensions.deviceQuery)
>         {
>-            rx::DeviceImpl *impl = nullptr;
>-            ANGLE_TRY(mImplementation->getDevice(&impl));
>-            ANGLE_TRY(Device::CreateDevice(this, impl, &mDevice));
>+            std::unique_ptr<rx::DeviceImpl> impl(mImplementation->createDevice());
>+            ASSERT(impl != nullptr);
>+            error = impl->initialize();
>+            if (error.isError())
>+            {
>+                ERR() << "Failed to initialize display because device creation failed: "
>+                      << error.getMessage();
>+                mImplementation->terminate();
>+                return error;
>+            }
>+            mDevice = new Device(this, impl.release());
>         }
>         else
>         {
>@@ -499,29 +580,28 @@ Error Display::initialize()
>         ASSERT(mDevice != nullptr);
>     }
> 
>-    mProxyContext.reset(nullptr);
>-    gl::Context *proxyContext = new gl::Context(mImplementation, nullptr, nullptr, nullptr, nullptr,
>-                                                egl::AttributeMap(), mDisplayExtensions);
>-    mProxyContext.reset(proxyContext);
>-
>     mInitialized = true;
> 
>     return NoError();
> }
> 
>-Error Display::terminate()
>+Error Display::terminate(const Thread *thread)
> {
>-    ANGLE_TRY(makeCurrent(nullptr, nullptr, nullptr));
>+    if (!mInitialized)
>+    {
>+        return NoError();
>+    }
> 
>     mMemoryProgramCache.clear();
>-
>-    mProxyContext.reset(nullptr);
>+    mBlobCache.setBlobCacheFuncs(nullptr, nullptr);
> 
>     while (!mContextSet.empty())
>     {
>-        ANGLE_TRY(destroyContext(*mContextSet.begin()));
>+        ANGLE_TRY(destroyContext(thread, *mContextSet.begin()));
>     }
> 
>+    ANGLE_TRY(makeCurrent(thread, nullptr, nullptr, nullptr));
>+
>     // The global texture manager should be deleted with the last context that uses it.
>     ASSERT(mGlobalTextureShareGroupUsers == 0 && mTextureManager == nullptr);
> 
>@@ -535,6 +615,11 @@ Error Display::terminate()
>         destroyStream(*mStreamSet.begin());
>     }
> 
>+    while (!mSyncSet.empty())
>+    {
>+        destroySync(*mSyncSet.begin());
>+    }
>+
>     while (!mState.surfaceSet.empty())
>     {
>         ANGLE_TRY(destroySurface(*mState.surfaceSet.begin()));
>@@ -563,11 +648,38 @@ Error Display::terminate()
>     return NoError();
> }
> 
>-std::vector<const Config*> Display::getConfigs(const egl::AttributeMap &attribs) const
>+std::vector<const Config *> Display::getConfigs(const egl::AttributeMap &attribs) const
> {
>     return mConfigSet.filter(attribs);
> }
> 
>+std::vector<const Config *> Display::chooseConfig(const egl::AttributeMap &attribs) const
>+{
>+    egl::AttributeMap attribsWithDefaults = AttributeMap();
>+
>+    // Insert default values for attributes that have either an Exact or Mask selection criteria,
>+    // and a default value that matters (e.g. isn't EGL_DONT_CARE):
>+    attribsWithDefaults.insert(EGL_COLOR_BUFFER_TYPE, EGL_RGB_BUFFER);
>+    attribsWithDefaults.insert(EGL_LEVEL, 0);
>+    attribsWithDefaults.insert(EGL_RENDERABLE_TYPE, EGL_OPENGL_ES_BIT);
>+    attribsWithDefaults.insert(EGL_SURFACE_TYPE, EGL_WINDOW_BIT);
>+    attribsWithDefaults.insert(EGL_TRANSPARENT_TYPE, EGL_NONE);
>+    if (getExtensions().pixelFormatFloat)
>+    {
>+        attribsWithDefaults.insert(EGL_COLOR_COMPONENT_TYPE_EXT,
>+                                   EGL_COLOR_COMPONENT_TYPE_FIXED_EXT);
>+    }
>+
>+    // Add the caller-specified values (Note: the poorly-named insert() method will replace any
>+    // of the default values from above):
>+    for (auto attribIter = attribs.begin(); attribIter != attribs.end(); attribIter++)
>+    {
>+        attribsWithDefaults.insert(attribIter->first, attribIter->second);
>+    }
>+
>+    return mConfigSet.filter(attribsWithDefaults);
>+}
>+
> Error Display::createWindowSurface(const Config *configuration,
>                                    EGLNativeWindowType window,
>                                    const AttributeMap &attribs,
>@@ -683,15 +795,19 @@ Error Display::createImage(const gl::Context *context,
>     {
>         sibling = context->getRenderbuffer(egl_gl::EGLClientBufferToGLObjectHandle(buffer));
>     }
>+    else if (IsExternalImageTarget(target))
>+    {
>+        sibling = new ExternalImageSibling(mImplementation, context, target, buffer, attribs);
>+    }
>     else
>     {
>         UNREACHABLE();
>     }
>     ASSERT(sibling != nullptr);
> 
>-    angle::UniqueObjectPointer<Image, gl::Context> imagePtr(
>-        new Image(mImplementation, target, sibling, attribs), context);
>-    ANGLE_TRY(imagePtr->initialize());
>+    angle::UniqueObjectPointer<Image, Display> imagePtr(
>+        new Image(mImplementation, context, target, sibling, attribs), this);
>+    ANGLE_TRY(imagePtr->initialize(this));
> 
>     Image *image = imagePtr.release();
> 
>@@ -721,7 +837,7 @@ Error Display::createStream(const AttributeMap &attribs, Stream **outStream)
> }
> 
> Error Display::createContext(const Config *configuration,
>-                             gl::Context *shareContext,
>+                             const gl::Context *shareContext,
>                              const AttributeMap &attribs,
>                              gl::Context **outContext)
> {
>@@ -751,21 +867,25 @@ Error Display::createContext(const Config *configuration,
> 
>     gl::MemoryProgramCache *cachePointer = &mMemoryProgramCache;
> 
>-    // Check context creation attributes to see if we should enable the cache.
>-    if (mAttributeMap.get(EGL_CONTEXT_PROGRAM_BINARY_CACHE_ENABLED_ANGLE, EGL_TRUE) == EGL_FALSE)
>-    {
>-        cachePointer = nullptr;
>-    }
>-
>-    // A program cache size of zero indicates it should be disabled.
>-    if (mMemoryProgramCache.maxSize() == 0)
>+    // Check context creation attributes to see if we are using EGL_ANGLE_program_cache_control.
>+    // If not, keep caching enabled for EGL_ANDROID_blob_cache, which can have its callbacks set
>+    // at any time.
>+    bool usesProgramCacheControl =
>+        mAttributeMap.contains(EGL_CONTEXT_PROGRAM_BINARY_CACHE_ENABLED_ANGLE);
>+    if (usesProgramCacheControl)
>     {
>-        cachePointer = nullptr;
>+        bool programCacheControlEnabled =
>+            mAttributeMap.get(EGL_CONTEXT_PROGRAM_BINARY_CACHE_ENABLED_ANGLE, GL_FALSE);
>+        // A program cache size of zero indicates it should be disabled.
>+        if (!programCacheControlEnabled || mMemoryProgramCache.maxSize() == 0)
>+        {
>+            cachePointer = nullptr;
>+        }
>     }
> 
>     gl::Context *context =
>         new gl::Context(mImplementation, configuration, shareContext, shareTextures, cachePointer,
>-                        attribs, mDisplayExtensions);
>+                        attribs, mDisplayExtensions, GetClientExtensions());
> 
>     ASSERT(context != nullptr);
>     mContextSet.insert(context);
>@@ -775,10 +895,48 @@ Error Display::createContext(const Config *configuration,
>     return NoError();
> }
> 
>-Error Display::makeCurrent(egl::Surface *drawSurface,
>+Error Display::createSync(const gl::Context *currentContext,
>+                          EGLenum type,
>+                          const AttributeMap &attribs,
>+                          Sync **outSync)
>+{
>+    ASSERT(isInitialized());
>+
>+    if (mImplementation->testDeviceLost())
>+    {
>+        ANGLE_TRY(restoreLostDevice());
>+    }
>+
>+    angle::UniqueObjectPointer<egl::Sync, Display> syncPtr(new Sync(mImplementation, type, attribs),
>+                                                           this);
>+
>+    ANGLE_TRY(syncPtr->initialize(this, currentContext));
>+
>+    Sync *sync = syncPtr.release();
>+
>+    sync->addRef();
>+    mSyncSet.insert(sync);
>+
>+    *outSync = sync;
>+    return NoError();
>+}
>+
>+Error Display::makeCurrent(const Thread *thread,
>+                           egl::Surface *drawSurface,
>                            egl::Surface *readSurface,
>                            gl::Context *context)
> {
>+    if (!mInitialized)
>+    {
>+        return NoError();
>+    }
>+
>+    gl::Context *previousContext = thread->getContext();
>+    if (previousContext)
>+    {
>+        ANGLE_TRY(previousContext->unMakeCurrent(this));
>+    }
>+
>     ANGLE_TRY(mImplementation->makeCurrent(drawSurface, readSurface, context));
> 
>     if (context != nullptr)
>@@ -796,7 +954,8 @@ Error Display::restoreLostDevice()
>     {
>         if ((*ctx)->isResetNotificationEnabled())
>         {
>-            // If reset notifications have been requested, application must delete all contexts first
>+            // If reset notifications have been requested, application must delete all contexts
>+            // first
>             return EglContextLost();
>         }
>     }
>@@ -812,7 +971,8 @@ Error Display::destroySurface(Surface *surface)
>         ASSERT(windowSurfaces);
> 
>         bool surfaceRemoved = false;
>-        for (WindowSurfaceMap::iterator iter = windowSurfaces->begin(); iter != windowSurfaces->end(); iter++)
>+        for (WindowSurfaceMap::iterator iter = windowSurfaces->begin();
>+             iter != windowSurfaces->end(); iter++)
>         {
>             if (iter->second == surface)
>             {
>@@ -834,7 +994,7 @@ void Display::destroyImage(egl::Image *image)
> {
>     auto iter = mImageSet.find(image);
>     ASSERT(iter != mImageSet.end());
>-    (*iter)->release(mProxyContext.get());
>+    (*iter)->release(this);
>     mImageSet.erase(iter);
> }
> 
>@@ -844,8 +1004,20 @@ void Display::destroyStream(egl::Stream *stream)
>     SafeDelete(stream);
> }
> 
>-Error Display::destroyContext(gl::Context *context)
>+Error Display::destroyContext(const Thread *thread, gl::Context *context)
> {
>+    gl::Context *currentContext   = thread->getContext();
>+    Surface *currentDrawSurface   = thread->getCurrentDrawSurface();
>+    Surface *currentReadSurface   = thread->getCurrentReadSurface();
>+    bool changeContextForDeletion = context != currentContext;
>+
>+    // Make the context being deleted current during it's deletion.  This allows it to delete any
>+    // resources it's holding.
>+    if (changeContextForDeletion)
>+    {
>+        ANGLE_TRY(makeCurrent(thread, nullptr, nullptr, context));
>+    }
>+
>     if (context->usingDisplayTextureShareGroup())
>     {
>         ASSERT(mGlobalTextureShareGroupUsers >= 1 && mTextureManager != nullptr);
>@@ -862,9 +1034,24 @@ Error Display::destroyContext(gl::Context *context)
>     ANGLE_TRY(context->onDestroy(this));
>     mContextSet.erase(context);
>     SafeDelete(context);
>+
>+    // Set the previous context back to current
>+    if (changeContextForDeletion)
>+    {
>+        ANGLE_TRY(makeCurrent(thread, currentDrawSurface, currentReadSurface, currentContext));
>+    }
>+
>     return NoError();
> }
> 
>+void Display::destroySync(egl::Sync *sync)
>+{
>+    auto iter = mSyncSet.find(sync);
>+    ASSERT(iter != mSyncSet.end());
>+    (*iter)->release(this);
>+    mSyncSet.erase(iter);
>+}
>+
> bool Display::isDeviceLost() const
> {
>     ASSERT(isInitialized());
>@@ -890,20 +1077,27 @@ void Display::notifyDeviceLost()
>         return;
>     }
> 
>-    for (ContextSet::iterator context = mContextSet.begin(); context != mContextSet.end(); context++)
>+    for (ContextSet::iterator context = mContextSet.begin(); context != mContextSet.end();
>+         context++)
>     {
>-        (*context)->markContextLost();
>+        (*context)->markContextLost(gl::GraphicsResetStatus::UnknownContextReset);
>     }
> 
>     mDeviceLost = true;
> }
> 
>-Error Display::waitClient(const gl::Context *context) const
>+void Display::setBlobCacheFuncs(EGLSetBlobFuncANDROID set, EGLGetBlobFuncANDROID get)
>+{
>+    mBlobCache.setBlobCacheFuncs(set, get);
>+    mImplementation->setBlobCacheFuncs(set, get);
>+}
>+
>+Error Display::waitClient(const gl::Context *context)
> {
>     return mImplementation->waitClient(context);
> }
> 
>-Error Display::waitNative(const gl::Context *context, EGLint engine) const
>+Error Display::waitNative(const gl::Context *context, EGLint engine)
> {
>     return mImplementation->waitNative(context, engine);
> }
>@@ -943,6 +1137,11 @@ bool Display::isValidStream(const Stream *stream) const
>     return mStreamSet.find(const_cast<Stream *>(stream)) != mStreamSet.end();
> }
> 
>+bool Display::isValidSync(const Sync *sync) const
>+{
>+    return mSyncSet.find(const_cast<Sync *>(sync)) != mSyncSet.end();
>+}
>+
> bool Display::hasExistingWindowSurface(EGLNativeWindowType window)
> {
>     WindowSurfaceMap *windowSurfaces = GetWindowSurfaces();
>@@ -956,8 +1155,8 @@ static ClientExtensions GenerateClientExtensions()
>     ClientExtensions extensions;
> 
>     extensions.clientExtensions = true;
>-    extensions.platformBase = true;
>-    extensions.platformANGLE = true;
>+    extensions.platformBase     = true;
>+    extensions.platformANGLE    = true;
> 
> #if defined(ANGLE_ENABLE_D3D9) || defined(ANGLE_ENABLE_D3D11)
>     extensions.platformANGLED3D = true;
>@@ -966,6 +1165,9 @@ static ClientExtensions GenerateClientExtensions()
> 
> #if defined(ANGLE_ENABLE_OPENGL)
>     extensions.platformANGLEOpenGL = true;
>+
>+    // Selecting context virtualization is currently only supported in the OpenGL backend.
>+    extensions.platformANGLEContextVirtualization = true;
> #endif
> 
> #if defined(ANGLE_ENABLE_NULL)
>@@ -973,8 +1175,8 @@ static ClientExtensions GenerateClientExtensions()
> #endif
> 
> #if defined(ANGLE_ENABLE_D3D11)
>-    extensions.deviceCreation      = true;
>-    extensions.deviceCreationD3D11 = true;
>+    extensions.deviceCreation          = true;
>+    extensions.deviceCreationD3D11     = true;
>     extensions.experimentalPresentPath = true;
> #endif
> 
>@@ -987,6 +1189,8 @@ static ClientExtensions GenerateClientExtensions()
> #endif
> 
>     extensions.clientGetAllProcAddresses = true;
>+    extensions.debug                     = true;
>+    extensions.explicitContext           = true;
> 
>     return extensions;
> }
>@@ -997,7 +1201,8 @@ static std::string GenerateExtensionsString(const T &extensions)
>     std::vector<std::string> extensionsVector = extensions.getStrings();
> 
>     std::ostringstream stream;
>-    std::copy(extensionsVector.begin(), extensionsVector.end(), std::ostream_iterator<std::string>(stream, " "));
>+    std::copy(extensionsVector.begin(), extensionsVector.end(),
>+              std::ostream_iterator<std::string>(stream, " "));
>     return stream.str();
> }
> 
>@@ -1021,9 +1226,9 @@ void Display::initDisplayExtensions()
>     mDisplayExtensions = mImplementation->getExtensions();
> 
>     // Some extensions are always available because they are implemented in the EGL layer.
>-    mDisplayExtensions.createContext        = true;
>-    mDisplayExtensions.createContextNoError = true;
>-    mDisplayExtensions.createContextWebGLCompatibility = true;
>+    mDisplayExtensions.createContext                      = true;
>+    mDisplayExtensions.createContextNoError               = true;
>+    mDisplayExtensions.createContextWebGLCompatibility    = true;
>     mDisplayExtensions.createContextBindGeneratesResource = true;
>     mDisplayExtensions.createContextClientArrays          = true;
>     mDisplayExtensions.pixelFormatFloat                   = true;
>@@ -1034,6 +1239,16 @@ void Display::initDisplayExtensions()
>     // Enable program cache control since it is not back-end dependent.
>     mDisplayExtensions.programCacheControl = true;
> 
>+    // Request extension is implemented in the ANGLE frontend
>+    mDisplayExtensions.createContextExtensionsEnabled = true;
>+
>+    // Blob cache extension is provided by the ANGLE frontend
>+    mDisplayExtensions.blobCache = true;
>+
>+    // The EGL_ANDROID_recordable extension is provided by the ANGLE frontend, and will always say
>+    // that ANativeWindow is not recordable.
>+    mDisplayExtensions.recordable = true;
>+
>     mDisplayExtensionString = GenerateExtensionsString(mDisplayExtensions);
> }
> 
>@@ -1045,11 +1260,19 @@ bool Display::isValidNativeWindow(EGLNativeWindowType window) const
> Error Display::validateClientBuffer(const Config *configuration,
>                                     EGLenum buftype,
>                                     EGLClientBuffer clientBuffer,
>-                                    const AttributeMap &attribs)
>+                                    const AttributeMap &attribs) const
> {
>     return mImplementation->validateClientBuffer(configuration, buftype, clientBuffer, attribs);
> }
> 
>+Error Display::validateImageClientBuffer(const gl::Context *context,
>+                                         EGLenum target,
>+                                         EGLClientBuffer clientBuffer,
>+                                         const egl::AttributeMap &attribs) const
>+{
>+    return mImplementation->validateImageClientBuffer(context, target, clientBuffer, attribs);
>+}
>+
> bool Display::isValidDisplay(const egl::Display *display)
> {
>     const ANGLEPlatformDisplayMap *anglePlatformDisplayMap = GetANGLEPlatformDisplayMap();
>@@ -1082,8 +1305,7 @@ bool Display::isValidNativeDisplay(EGLNativeDisplayType display)
>     }
> 
> #if defined(ANGLE_PLATFORM_WINDOWS) && !defined(ANGLE_ENABLE_WINDOWS_STORE)
>-    if (display == EGL_SOFTWARE_DISPLAY_ANGLE ||
>-        display == EGL_D3D11_ELSE_D3D9_DISPLAY_ANGLE ||
>+    if (display == EGL_SOFTWARE_DISPLAY_ANGLE || display == EGL_D3D11_ELSE_D3D9_DISPLAY_ANGLE ||
>         display == EGL_D3D11_ONLY_DISPLAY_ANGLE)
>     {
>         return true;
>@@ -1129,7 +1351,7 @@ EGLint Display::programCacheGetAttrib(EGLenum attrib) const
>     switch (attrib)
>     {
>         case EGL_PROGRAM_CACHE_KEY_LENGTH_ANGLE:
>-            return static_cast<EGLint>(gl::kProgramHashLength);
>+            return static_cast<EGLint>(BlobCache::kKeyLength);
> 
>         case EGL_PROGRAM_CACHE_SIZE_ANGLE:
>             return static_cast<EGLint>(mMemoryProgramCache.entryCount());
>@@ -1148,8 +1370,8 @@ Error Display::programCacheQuery(EGLint index,
> {
>     ASSERT(index >= 0 && index < static_cast<EGLint>(mMemoryProgramCache.entryCount()));
> 
>-    const angle::MemoryBuffer *programBinary = nullptr;
>-    gl::ProgramHash programHash;
>+    const BlobCache::Key *programHash = nullptr;
>+    BlobCache::Value programBinary;
>     // TODO(jmadill): Make this thread-safe.
>     bool result =
>         mMemoryProgramCache.getAt(static_cast<size_t>(index), &programHash, &programBinary);
>@@ -1162,8 +1384,8 @@ Error Display::programCacheQuery(EGLint index,
> 
>     if (key)
>     {
>-        ASSERT(*keysize == static_cast<EGLint>(gl::kProgramHashLength));
>-        memcpy(key, programHash.data(), gl::kProgramHashLength);
>+        ASSERT(*keysize == static_cast<EGLint>(BlobCache::kKeyLength));
>+        memcpy(key, programHash->data(), BlobCache::kKeyLength);
>     }
> 
>     if (binary)
>@@ -1171,16 +1393,16 @@ Error Display::programCacheQuery(EGLint index,
>         // Note: we check the size here instead of in the validation code, since we need to
>         // access the cache as atomically as possible. It's possible that the cache contents
>         // could change between the validation size check and the retrieval.
>-        if (programBinary->size() > static_cast<size_t>(*binarysize))
>+        if (programBinary.size() > static_cast<size_t>(*binarysize))
>         {
>             return EglBadAccess() << "Program binary too large or changed during access.";
>         }
> 
>-        memcpy(binary, programBinary->data(), programBinary->size());
>+        memcpy(binary, programBinary.data(), programBinary.size());
>     }
> 
>-    *binarysize = static_cast<EGLint>(programBinary->size());
>-    *keysize    = static_cast<EGLint>(gl::kProgramHashLength);
>+    *binarysize = static_cast<EGLint>(programBinary.size());
>+    *keysize    = static_cast<EGLint>(BlobCache::kKeyLength);
> 
>     return NoError();
> }
>@@ -1190,10 +1412,10 @@ Error Display::programCachePopulate(const void *key,
>                                     const void *binary,
>                                     EGLint binarysize)
> {
>-    ASSERT(keysize == static_cast<EGLint>(gl::kProgramHashLength));
>+    ASSERT(keysize == static_cast<EGLint>(BlobCache::kKeyLength));
> 
>-    gl::ProgramHash programHash;
>-    memcpy(programHash.data(), key, gl::kProgramHashLength);
>+    BlobCache::Key programHash;
>+    memcpy(programHash.data(), key, BlobCache::kKeyLength);
> 
>     mMemoryProgramCache.putBinary(programHash, reinterpret_cast<const uint8_t *>(binary),
>                                   static_cast<size_t>(binarysize));
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/Display.h b/Source/ThirdParty/ANGLE/src/libANGLE/Display.h
>index aa1d1c3b372..3a681565807 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/Display.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/Display.h
>@@ -15,8 +15,10 @@
> #include <vector>
> 
> #include "libANGLE/AttributeMap.h"
>+#include "libANGLE/BlobCache.h"
> #include "libANGLE/Caps.h"
> #include "libANGLE/Config.h"
>+#include "libANGLE/Debug.h"
> #include "libANGLE/Error.h"
> #include "libANGLE/LoggingAnnotator.h"
> #include "libANGLE/MemoryProgramCache.h"
>@@ -26,7 +28,7 @@ namespace gl
> {
> class Context;
> class TextureManager;
>-}
>+}  // namespace gl
> 
> namespace rx
> {
>@@ -37,8 +39,9 @@ namespace egl
> {
> class Device;
> class Image;
>-class Surface;
> class Stream;
>+class Surface;
>+class Sync;
> class Thread;
> 
> using SurfaceSet = std::set<Surface *>;
>@@ -48,19 +51,23 @@ struct DisplayState final : private angle::NonCopyable
>     DisplayState();
>     ~DisplayState();
> 
>+    EGLLabelKHR label;
>     SurfaceSet surfaceSet;
> };
> 
> // Constant coded here as a sanity limit.
> constexpr EGLAttrib kProgramCacheSizeAbsoluteMax = 0x4000000;
> 
>-class Display final : angle::NonCopyable
>+class Display final : public LabeledObject, angle::NonCopyable
> {
>   public:
>-    ~Display();
>+    ~Display() override;
>+
>+    void setLabel(EGLLabelKHR label) override;
>+    EGLLabelKHR getLabel() const override;
> 
>     Error initialize();
>-    Error terminate();
>+    Error terminate(const Thread *thread);
> 
>     static Display *GetDisplayFromDevice(Device *device, const AttributeMap &attribMap);
>     static Display *GetDisplayFromNativeDisplay(EGLNativeDisplayType nativeDisplay,
>@@ -70,6 +77,7 @@ class Display final : angle::NonCopyable
>     static const std::string &GetClientExtensionString();
> 
>     std::vector<const Config *> getConfigs(const AttributeMap &attribs) const;
>+    std::vector<const Config *> chooseConfig(const AttributeMap &attribs) const;
> 
>     Error createWindowSurface(const Config *configuration,
>                               EGLNativeWindowType window,
>@@ -97,16 +105,25 @@ class Display final : angle::NonCopyable
>     Error createStream(const AttributeMap &attribs, Stream **outStream);
> 
>     Error createContext(const Config *configuration,
>-                        gl::Context *shareContext,
>+                        const gl::Context *shareContext,
>                         const AttributeMap &attribs,
>                         gl::Context **outContext);
> 
>-    Error makeCurrent(Surface *drawSurface, Surface *readSurface, gl::Context *context);
>+    Error createSync(const gl::Context *currentContext,
>+                     EGLenum type,
>+                     const AttributeMap &attribs,
>+                     Sync **outSync);
>+
>+    Error makeCurrent(const Thread *thread,
>+                      Surface *drawSurface,
>+                      Surface *readSurface,
>+                      gl::Context *context);
> 
>     Error destroySurface(Surface *surface);
>     void destroyImage(Image *image);
>     void destroyStream(Stream *stream);
>-    Error destroyContext(gl::Context *context);
>+    Error destroyContext(const Thread *thread, gl::Context *context);
>+    void destroySync(Sync *sync);
> 
>     bool isInitialized() const;
>     bool isValidConfig(const Config *config) const;
>@@ -114,12 +131,17 @@ class Display final : angle::NonCopyable
>     bool isValidSurface(const Surface *surface) const;
>     bool isValidImage(const Image *image) const;
>     bool isValidStream(const Stream *stream) const;
>+    bool isValidSync(const Sync *sync) const;
>     bool isValidNativeWindow(EGLNativeWindowType window) const;
> 
>     Error validateClientBuffer(const Config *configuration,
>                                EGLenum buftype,
>                                EGLClientBuffer clientBuffer,
>-                               const AttributeMap &attribs);
>+                               const AttributeMap &attribs) const;
>+    Error validateImageClientBuffer(const gl::Context *context,
>+                                    EGLenum target,
>+                                    EGLClientBuffer clientBuffer,
>+                                    const egl::AttributeMap &attribs) const;
> 
>     static bool isValidDisplay(const Display *display);
>     static bool isValidNativeDisplay(EGLNativeDisplayType display);
>@@ -129,8 +151,12 @@ class Display final : angle::NonCopyable
>     bool testDeviceLost();
>     void notifyDeviceLost();
> 
>-    Error waitClient(const gl::Context *context) const;
>-    Error waitNative(const gl::Context *context, EGLint engine) const;
>+    void setBlobCacheFuncs(EGLSetBlobFuncANDROID set, EGLGetBlobFuncANDROID get);
>+    bool areBlobCacheFuncsSet() const { return mBlobCache.areBlobCacheFuncsSet(); }
>+    BlobCache &getBlobCache() { return mBlobCache; }
>+
>+    Error waitClient(const gl::Context *context);
>+    Error waitNative(const gl::Context *context, EGLint engine);
> 
>     const Caps &getCaps() const;
> 
>@@ -161,7 +187,8 @@ class Display final : angle::NonCopyable
> 
>     const DisplayState &getState() const { return mState; }
> 
>-    gl::Context *getProxyContext() const { return mProxyContext.get(); }
>+    typedef std::set<gl::Context *> ContextSet;
>+    const ContextSet &getContextSet() { return mContextSet; }
> 
>   private:
>     Display(EGLenum platform, EGLNativeDisplayType displayId, Device *eglDevice);
>@@ -181,7 +208,6 @@ class Display final : angle::NonCopyable
> 
>     ConfigSet mConfigSet;
> 
>-    typedef std::set<gl::Context*> ContextSet;
>     ContextSet mContextSet;
> 
>     typedef std::set<Image *> ImageSet;
>@@ -190,6 +216,9 @@ class Display final : angle::NonCopyable
>     typedef std::set<Stream *> StreamSet;
>     StreamSet mStreamSet;
> 
>+    typedef std::set<Sync *> SyncSet;
>+    SyncSet mSyncSet;
>+
>     bool mInitialized;
>     bool mDeviceLost;
> 
>@@ -205,14 +234,11 @@ class Display final : angle::NonCopyable
>     angle::LoggingAnnotator mAnnotator;
> 
>     gl::TextureManager *mTextureManager;
>+    BlobCache mBlobCache;
>     gl::MemoryProgramCache mMemoryProgramCache;
>     size_t mGlobalTextureShareGroupUsers;
>-
>-    // This gl::Context is a simple proxy to the Display for the GL back-end entry points
>-    // that need access to implementation-specific data, like a Renderer object.
>-    angle::UniqueObjectPointer<gl::Context, Display> mProxyContext;
> };
> 
> }  // namespace egl
> 
>-#endif   // LIBANGLE_DISPLAY_H_
>+#endif  // LIBANGLE_DISPLAY_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/EGLSync.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/EGLSync.cpp
>new file mode 100644
>index 00000000000..f43401386ba
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/EGLSync.cpp
>@@ -0,0 +1,57 @@
>+//
>+// Copyright (c) 2002-2013 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+
>+// EGLSync.cpp: Implements the egl::Sync class.
>+
>+#include "libANGLE/EGLSync.h"
>+
>+#include "angle_gl.h"
>+
>+#include "common/utilities.h"
>+#include "libANGLE/renderer/EGLImplFactory.h"
>+#include "libANGLE/renderer/EGLSyncImpl.h"
>+
>+namespace egl
>+{
>+
>+Sync::Sync(rx::EGLImplFactory *factory, EGLenum type, const AttributeMap &attribs)
>+    : mFence(factory->createSync(attribs)), mType(type)
>+{}
>+
>+void Sync::onDestroy(const Display *display)
>+{
>+    ASSERT(mFence);
>+    mFence->onDestroy(display);
>+    mFence.reset();
>+}
>+
>+Sync::~Sync() {}
>+
>+Error Sync::initialize(const Display *display, const gl::Context *context)
>+{
>+    return mFence->initialize(display, context, mType);
>+}
>+
>+Error Sync::clientWait(const Display *display,
>+                       const gl::Context *context,
>+                       EGLint flags,
>+                       EGLTime timeout,
>+                       EGLint *outResult)
>+{
>+    return mFence->clientWait(display, context, flags, timeout, outResult);
>+}
>+
>+Error Sync::serverWait(const Display *display, const gl::Context *context, EGLint flags)
>+{
>+    return mFence->serverWait(display, context, flags);
>+}
>+
>+Error Sync::getStatus(const Display *display, EGLint *outStatus) const
>+{
>+    return mFence->getStatus(display, outStatus);
>+}
>+
>+}  // namespace egl
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/EGLSync.h b/Source/ThirdParty/ANGLE/src/libANGLE/EGLSync.h
>new file mode 100644
>index 00000000000..0a40ebe6e7f
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/EGLSync.h
>@@ -0,0 +1,61 @@
>+//
>+// Copyright 2019 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+
>+// EGLSync.h: Defines the egl::Sync classes, which support the EGL_KHR_fence_sync,
>+// EGL_KHR_wait_sync and EGL 1.5 sync objects.
>+
>+#ifndef LIBANGLE_EGLSYNC_H_
>+#define LIBANGLE_EGLSYNC_H_
>+
>+#include "libANGLE/Debug.h"
>+#include "libANGLE/Error.h"
>+#include "libANGLE/RefCountObject.h"
>+
>+#include "common/angleutils.h"
>+
>+namespace rx
>+{
>+class EGLImplFactory;
>+class EGLSyncImpl;
>+}  // namespace rx
>+
>+namespace gl
>+{
>+class Context;
>+}  // namespace gl
>+
>+namespace egl
>+{
>+class Sync final : public angle::RefCountObject<Display, angle::Result>
>+{
>+  public:
>+    Sync(rx::EGLImplFactory *factory, EGLenum type, const AttributeMap &attribs);
>+    ~Sync() override;
>+
>+    void onDestroy(const Display *display) override;
>+
>+    Error initialize(const Display *display, const gl::Context *context);
>+    Error clientWait(const Display *display,
>+                     const gl::Context *context,
>+                     EGLint flags,
>+                     EGLTime timeout,
>+                     EGLint *outResult);
>+    Error serverWait(const Display *display, const gl::Context *context, EGLint flags);
>+    Error getStatus(const Display *display, EGLint *outStatus) const;
>+
>+    EGLenum getType() const { return mType; }
>+    EGLint getCondition() const { return mCondition; }
>+
>+  private:
>+    std::unique_ptr<rx::EGLSyncImpl> mFence;
>+
>+    EGLenum mType;
>+    static constexpr EGLint mCondition = EGL_SYNC_PRIOR_COMMANDS_COMPLETE_KHR;
>+};
>+
>+}  // namespace egl
>+
>+#endif  // LIBANGLE_FENCE_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/Error.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/Error.cpp
>index 388f0259fa7..dbd1464f32c 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/Error.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/Error.cpp
>@@ -24,18 +24,16 @@ std::unique_ptr<std::string> EmplaceErrorString(std::string &&message)
> }
> }  // anonymous namespace
> 
>-namespace gl
>+namespace egl
> {
> 
>-Error::Error(GLenum errorCode, std::string &&message)
>+Error::Error(EGLint errorCode, std::string &&message)
>     : mCode(errorCode), mID(errorCode), mMessage(EmplaceErrorString(std::move(message)))
>-{
>-}
>+{}
> 
>-Error::Error(GLenum errorCode, GLuint id, std::string &&message)
>+Error::Error(EGLint errorCode, EGLint id, std::string &&message)
>     : mCode(errorCode), mID(id), mMessage(EmplaceErrorString(std::move(message)))
>-{
>-}
>+{}
> 
> void Error::createMessageString() const
> {
>@@ -51,60 +49,19 @@ const std::string &Error::getMessage() const
>     return *mMessage;
> }
> 
>-bool Error::operator==(const Error &other) const
>-{
>-    if (mCode != other.mCode)
>-        return false;
>-
>-    // TODO(jmadill): Compare extended error codes instead of strings.
>-    if ((!mMessage || !other.mMessage) && (!mMessage != !other.mMessage))
>-        return false;
>-
>-    return (*mMessage == *other.mMessage);
>-}
>-
>-bool Error::operator!=(const Error &other) const
>-{
>-    return !(*this == other);
>-}
>-
> std::ostream &operator<<(std::ostream &os, const Error &err)
> {
>-    return gl::FmtHexShort(os, err.getCode());
>-}
>-
>-}  // namespace gl
>-
>-namespace egl
>-{
>-
>-Error::Error(EGLint errorCode, std::string &&message)
>-    : mCode(errorCode), mID(errorCode), mMessage(EmplaceErrorString(std::move(message)))
>-{
>-}
>-
>-Error::Error(EGLint errorCode, EGLint id, std::string &&message)
>-    : mCode(errorCode), mID(id), mMessage(EmplaceErrorString(std::move(message)))
>-{
>+    return gl::FmtHex(os, err.getCode());
> }
>+}  // namespace egl
> 
>-void Error::createMessageString() const
>+namespace angle
> {
>-    if (!mMessage)
>-    {
>-        mMessage.reset(new std::string(GetGenericErrorMessage(mCode)));
>-    }
>-}
>-
>-const std::string &Error::getMessage() const
>+egl::Error ResultToEGL(Result result)
> {
>-    createMessageString();
>-    return *mMessage;
>-}
>+    if (result == Result::Continue)
>+        return egl::NoError();
> 
>-std::ostream &operator<<(std::ostream &os, const Error &err)
>-{
>-    return gl::FmtHexShort(os, err.getCode());
>+    return egl::Error(EGL_BAD_ACCESS);
> }
>-
>-}  // namespace egl
>+}  // namespace angle
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/Error.h b/Source/ThirdParty/ANGLE/src/libANGLE/Error.h
>index 1d57bb8707c..37df5b0cdf7 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/Error.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/Error.h
>@@ -21,28 +21,6 @@
> 
> namespace angle
> {
>-template <typename ErrorT, typename ResultT, typename ErrorBaseT, ErrorBaseT NoErrorVal>
>-class ANGLE_NO_DISCARD ErrorOrResultBase
>-{
>-  public:
>-    ErrorOrResultBase(const ErrorT &error) : mError(error) {}
>-    ErrorOrResultBase(ErrorT &&error) : mError(std::move(error)) {}
>-
>-    ErrorOrResultBase(ResultT &&result) : mError(NoErrorVal), mResult(std::forward<ResultT>(result))
>-    {
>-    }
>-
>-    ErrorOrResultBase(const ResultT &result) : mError(NoErrorVal), mResult(result) {}
>-
>-    bool isError() const { return mError.isError(); }
>-    const ErrorT &getError() const { return mError; }
>-    ResultT &&getResult() { return std::move(mResult); }
>-
>-  private:
>-    ErrorT mError;
>-    ResultT mResult;
>-};
>-
> template <typename ErrorT, typename ErrorBaseT, ErrorBaseT NoErrorVal, typename CodeT, CodeT EnumT>
> class ErrorStreamBase : angle::NonCopyable
> {
>@@ -59,12 +37,6 @@ class ErrorStreamBase : angle::NonCopyable
> 
>     operator ErrorT() { return ErrorT(EnumT, mID, mErrorStream.str()); }
> 
>-    template <typename ResultT>
>-    operator ErrorOrResultBase<ErrorT, ResultT, ErrorBaseT, NoErrorVal>()
>-    {
>-        return static_cast<ErrorT>(*this);
>-    }
>-
>   private:
>     GLuint mID;
>     std::ostringstream mErrorStream;
>@@ -76,77 +48,6 @@ namespace egl
> class Error;
> }  // namespace egl
> 
>-namespace gl
>-{
>-
>-class ANGLE_NO_DISCARD Error final
>-{
>-  public:
>-    explicit inline Error(GLenum errorCode);
>-    Error(GLenum errorCode, std::string &&message);
>-    Error(GLenum errorCode, GLuint id, std::string &&message);
>-    inline Error(const Error &other);
>-    inline Error(Error &&other);
>-    inline ~Error() = default;
>-
>-    // automatic error type conversion
>-    inline Error(egl::Error &&eglErr);
>-    inline Error(egl::Error eglErr);
>-
>-    inline Error &operator=(const Error &other);
>-    inline Error &operator=(Error &&other);
>-
>-    inline GLenum getCode() const;
>-    inline GLuint getID() const;
>-    inline bool isError() const;
>-
>-    const std::string &getMessage() const;
>-
>-    // Useful for mocking and testing
>-    bool operator==(const Error &other) const;
>-    bool operator!=(const Error &other) const;
>-
>-  private:
>-    void createMessageString() const;
>-
>-    friend std::ostream &operator<<(std::ostream &os, const Error &err);
>-    friend class egl::Error;
>-
>-    GLenum mCode;
>-    GLuint mID;
>-    mutable std::unique_ptr<std::string> mMessage;
>-};
>-
>-template <typename ResultT>
>-using ErrorOrResult = angle::ErrorOrResultBase<Error, ResultT, GLenum, GL_NO_ERROR>;
>-
>-namespace priv
>-{
>-
>-template <GLenum EnumT>
>-using ErrorStream = angle::ErrorStreamBase<Error, GLenum, GL_NO_ERROR, GLenum, EnumT>;
>-
>-}  // namespace priv
>-
>-using InternalError = priv::ErrorStream<GL_INVALID_OPERATION>;
>-
>-using InvalidEnum                 = priv::ErrorStream<GL_INVALID_ENUM>;
>-using InvalidValue                = priv::ErrorStream<GL_INVALID_VALUE>;
>-using InvalidOperation            = priv::ErrorStream<GL_INVALID_OPERATION>;
>-using StackOverflow               = priv::ErrorStream<GL_STACK_OVERFLOW>;
>-using StackUnderflow              = priv::ErrorStream<GL_STACK_UNDERFLOW>;
>-using OutOfMemory                 = priv::ErrorStream<GL_OUT_OF_MEMORY>;
>-using InvalidFramebufferOperation = priv::ErrorStream<GL_INVALID_FRAMEBUFFER_OPERATION>;
>-
>-inline Error NoError()
>-{
>-    return Error(GL_NO_ERROR);
>-}
>-
>-using LinkResult = ErrorOrResult<bool>;
>-
>-}  // namespace gl
>-
> namespace egl
> {
> 
>@@ -160,10 +61,6 @@ class ANGLE_NO_DISCARD Error final
>     inline Error(Error &&other);
>     inline ~Error() = default;
> 
>-    // automatic error type conversion
>-    inline Error(gl::Error &&glErr);
>-    inline Error(gl::Error glErr);
>-
>     inline Error &operator=(const Error &other);
>     inline Error &operator=(Error &&other);
> 
>@@ -173,20 +70,18 @@ class ANGLE_NO_DISCARD Error final
> 
>     const std::string &getMessage() const;
> 
>+    static inline Error NoError();
>+
>   private:
>     void createMessageString() const;
> 
>     friend std::ostream &operator<<(std::ostream &os, const Error &err);
>-    friend class gl::Error;
> 
>     EGLint mCode;
>     EGLint mID;
>     mutable std::unique_ptr<std::string> mMessage;
> };
> 
>-template <typename ResultT>
>-using ErrorOrResult = angle::ErrorOrResultBase<Error, ResultT, EGLint, EGL_SUCCESS>;
>-
> namespace priv
> {
> 
>@@ -195,26 +90,26 @@ using ErrorStream = angle::ErrorStreamBase<Error, EGLint, EGL_SUCCESS, EGLint, E
> 
> }  // namespace priv
> 
>-using EglNotInitialized    = priv::ErrorStream<EGL_NOT_INITIALIZED>;
> using EglBadAccess         = priv::ErrorStream<EGL_BAD_ACCESS>;
> using EglBadAlloc          = priv::ErrorStream<EGL_BAD_ALLOC>;
> using EglBadAttribute      = priv::ErrorStream<EGL_BAD_ATTRIBUTE>;
> using EglBadConfig         = priv::ErrorStream<EGL_BAD_CONFIG>;
> using EglBadContext        = priv::ErrorStream<EGL_BAD_CONTEXT>;
> using EglBadCurrentSurface = priv::ErrorStream<EGL_BAD_CURRENT_SURFACE>;
>+using EglBadDevice         = priv::ErrorStream<EGL_BAD_DEVICE_EXT>;
> using EglBadDisplay        = priv::ErrorStream<EGL_BAD_DISPLAY>;
> using EglBadMatch          = priv::ErrorStream<EGL_BAD_MATCH>;
> using EglBadNativeWindow   = priv::ErrorStream<EGL_BAD_NATIVE_WINDOW>;
> using EglBadParameter      = priv::ErrorStream<EGL_BAD_PARAMETER>;
>+using EglBadState          = priv::ErrorStream<EGL_BAD_STATE_KHR>;
>+using EglBadStream         = priv::ErrorStream<EGL_BAD_STREAM_KHR>;
> using EglBadSurface        = priv::ErrorStream<EGL_BAD_SURFACE>;
> using EglContextLost       = priv::ErrorStream<EGL_CONTEXT_LOST>;
>-using EglBadStream         = priv::ErrorStream<EGL_BAD_STREAM_KHR>;
>-using EglBadState          = priv::ErrorStream<EGL_BAD_STATE_KHR>;
>-using EglBadDevice         = priv::ErrorStream<EGL_BAD_DEVICE_EXT>;
>+using EglNotInitialized    = priv::ErrorStream<EGL_NOT_INITIALIZED>;
> 
> inline Error NoError()
> {
>-    return Error(EGL_SUCCESS);
>+    return Error::NoError();
> }
> 
> }  // namespace egl
>@@ -223,45 +118,73 @@ inline Error NoError()
> #define ANGLE_CONCAT2(x, y) ANGLE_CONCAT1(x, y)
> #define ANGLE_LOCAL_VAR ANGLE_CONCAT2(_localVar, __LINE__)
> 
>-#define ANGLE_TRY_TEMPLATE(EXPR, FUNC) \
>-    {                                  \
>-        auto ANGLE_LOCAL_VAR = EXPR;   \
>-        if (ANGLE_LOCAL_VAR.isError()) \
>-        {                              \
>-            FUNC(ANGLE_LOCAL_VAR);     \
>-        }                              \
>-    }                                  \
>-    ANGLE_EMPTY_STATEMENT
>+#define ANGLE_TRY_TEMPLATE(EXPR, FUNC)                \
>+    do                                                \
>+    {                                                 \
>+        auto ANGLE_LOCAL_VAR = EXPR;                  \
>+        if (ANGLE_UNLIKELY(IsError(ANGLE_LOCAL_VAR))) \
>+        {                                             \
>+            FUNC(ANGLE_LOCAL_VAR);                    \
>+        }                                             \
>+    } while (0)
> 
> #define ANGLE_RETURN(X) return X;
>-#define ANGLE_TRY(EXPR) ANGLE_TRY_TEMPLATE(EXPR, ANGLE_RETURN);
>-
>-#define ANGLE_TRY_RESULT(EXPR, RESULT)         \
>-    {                                          \
>-        auto ANGLE_LOCAL_VAR = EXPR;           \
>-        if (ANGLE_LOCAL_VAR.isError())         \
>-        {                                      \
>-            return ANGLE_LOCAL_VAR.getError(); \
>-        }                                      \
>-        RESULT = ANGLE_LOCAL_VAR.getResult();  \
>-    }                                          \
>-    ANGLE_EMPTY_STATEMENT
>-
>-// TODO(jmadill): Introduce way to store errors to a const Context.
>+#define ANGLE_TRY(EXPR) ANGLE_TRY_TEMPLATE(EXPR, ANGLE_RETURN)
>+
>+// TODO(jmadill): Remove after EGL error refactor. http://anglebug.com/3041
> #define ANGLE_SWALLOW_ERR(EXPR)                                       \
>+    do                                                                \
>     {                                                                 \
>         auto ANGLE_LOCAL_VAR = EXPR;                                  \
>-        if (ANGLE_LOCAL_VAR.isError())                                \
>+        if (ANGLE_UNLIKELY(IsError(ANGLE_LOCAL_VAR)))                 \
>         {                                                             \
>             ERR() << "Unhandled internal error: " << ANGLE_LOCAL_VAR; \
>         }                                                             \
>-    }                                                                 \
>-    ANGLE_EMPTY_STATEMENT
>+    } while (0)
> 
> #undef ANGLE_LOCAL_VAR
> #undef ANGLE_CONCAT2
> #undef ANGLE_CONCAT1
> 
>+#define ANGLE_CHECK(CONTEXT, EXPR, MESSAGE, ERROR)                                    \
>+    do                                                                                \
>+    {                                                                                 \
>+        if (ANGLE_UNLIKELY(!(EXPR)))                                                  \
>+        {                                                                             \
>+            CONTEXT->handleError(ERROR, MESSAGE, __FILE__, ANGLE_FUNCTION, __LINE__); \
>+            return angle::Result::Stop;                                               \
>+        }                                                                             \
>+    } while (0)
>+
>+namespace angle
>+{
>+// Result signals if calling code should continue running or early exit. A value of Stop can
>+// either indicate an Error or a non-Error early exit condition such as a detected no-op.
>+// Incomplete signals special cases that are neither success nor failure but require
>+// special attention.
>+enum class ANGLE_NO_DISCARD Result
>+{
>+    Continue,
>+    Stop,
>+    Incomplete,
>+};
>+
>+// TODO(jmadill): Remove this when refactor is complete. http://anglebug.com/3041
>+egl::Error ResultToEGL(Result result);
>+}  // namespace angle
>+
>+// TODO(jmadill): Remove this when refactor is complete. http://anglebug.com/3041
>+inline bool IsError(angle::Result result)
>+{
>+    return result == angle::Result::Stop;
>+}
>+
>+// TODO(jmadill): Remove this when refactor is complete. http://anglebug.com/3041
>+inline bool IsError(const egl::Error &err)
>+{
>+    return err.isError();
>+}
>+
> #include "Error.inl"
> 
>-#endif // LIBANGLE_ERROR_H_
>+#endif  // LIBANGLE_ERROR_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/Error.inl b/Source/ThirdParty/ANGLE/src/libANGLE/Error.inl
>index 4632830ce0b..f9d5070d0a2 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/Error.inl
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/Error.inl
>@@ -10,95 +10,6 @@
> 
> #include <cstdarg>
> 
>-namespace gl
>-{
>-
>-Error::Error(GLenum errorCode)
>-    : mCode(errorCode),
>-      mID(errorCode)
>-{
>-}
>-
>-Error::Error(const Error &other)
>-    : mCode(other.mCode),
>-      mID(other.mID)
>-{
>-    if (other.mMessage)
>-    {
>-        createMessageString();
>-        *mMessage = *(other.mMessage);
>-    }
>-}
>-
>-Error::Error(Error &&other)
>-    : mCode(other.mCode),
>-      mID(other.mID),
>-      mMessage(std::move(other.mMessage))
>-{
>-}
>-
>-// automatic error type conversion
>-Error::Error(egl::Error &&eglErr)
>-    : mCode(GL_INVALID_OPERATION),
>-      mID(0),
>-      mMessage(std::move(eglErr.mMessage))
>-{
>-}
>-
>-Error::Error(egl::Error eglErr)
>-    : mCode(GL_INVALID_OPERATION),
>-      mID(0),
>-      mMessage(std::move(eglErr.mMessage))
>-{
>-}
>-
>-Error &Error::operator=(const Error &other)
>-{
>-    mCode = other.mCode;
>-    mID = other.mID;
>-
>-    if (other.mMessage)
>-    {
>-        createMessageString();
>-        *mMessage = *(other.mMessage);
>-    }
>-    else
>-    {
>-        mMessage.release();
>-    }
>-
>-    return *this;
>-}
>-
>-Error &Error::operator=(Error &&other)
>-{
>-    if (this != &other)
>-    {
>-        mCode = other.mCode;
>-        mID = other.mID;
>-        mMessage = std::move(other.mMessage);
>-    }
>-
>-    return *this;
>-}
>-
>-GLenum Error::getCode() const
>-{
>-    return mCode;
>-}
>-
>-GLuint Error::getID() const
>-{
>-    return mID;
>-}
>-
>-bool Error::isError() const
>-{
>-    return (mCode != GL_NO_ERROR);
>-}
>-
>-}  // namespace gl
>-
> namespace egl
> {
> 
>@@ -126,21 +37,6 @@ Error::Error(Error &&other)
> {
> }
> 
>-// automatic error type conversion
>-Error::Error(gl::Error &&glErr)
>-    : mCode(EGL_BAD_ACCESS),
>-      mID(0),
>-      mMessage(std::move(glErr.mMessage))
>-{
>-}
>-
>-Error::Error(gl::Error glErr)
>-    : mCode(EGL_BAD_ACCESS),
>-      mID(0),
>-      mMessage(std::move(glErr.mMessage))
>-{
>-}
>-
> Error &Error::operator=(const Error &other)
> {
>     mCode = other.mCode;
>@@ -186,4 +82,10 @@ bool Error::isError() const
>     return (mCode != EGL_SUCCESS);
> }
> 
>+// Static
>+Error Error::NoError()
>+{
>+    return Error(EGL_SUCCESS);
>+}
>+
> }
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/ErrorStrings.h b/Source/ThirdParty/ANGLE/src/libANGLE/ErrorStrings.h
>index 93d64482d90..a2322c01d3e 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/ErrorStrings.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/ErrorStrings.h
>@@ -9,165 +9,490 @@
> #ifndef LIBANGLE_ERRORSTRINGS_H_
> #define LIBANGLE_ERRORSTRINGS_H_
> 
>-#define ERRMSG(name, message) \
>-    static const constexpr char *kError##name = static_cast<const char *>(message);
>-#define ANGLE_VALIDATION_ERR(context, error, errorName) \
>-    context->handleError(error << kError##errorName)
>-
> namespace gl
> {
>-ERRMSG(BufferNotBound, "A buffer must be bound.");
>-ERRMSG(CompressedTextureDimensionsMustMatchData,
>-       "Compressed texture dimensions must exactly match the dimensions of the data passed in.");
>-ERRMSG(CompressedTexturesNotAttachable, "Compressed textures cannot be attached to a framebuffer.");
>-ERRMSG(CubemapFacesEqualDimensions, "Each cubemap face must have equal width and height.");
>-ERRMSG(CubemapIncomplete,
>-       "Texture is not cubemap complete. All cubemaps faces must be defined and be the same size.");
>-ERRMSG(DefaultFramebufferInvalidAttachment,
>-       "Invalid attachment when the default framebuffer is bound.");
>-ERRMSG(DefaultFramebufferTarget, "It is invalid to change default FBO's attachments");
>-ERRMSG(EnumNotSupported, "Enum is not currently supported.");
>-ERRMSG(EnumRequiresGLES31, "Enum requires GLES 3.1");
>-ERRMSG(ES31Required, "OpenGL ES 3.1 Required");
>-ERRMSG(ES3Required, "OpenGL ES 3.0 Required.");
>-ERRMSG(ExceedsMaxElement, "Element value exceeds maximum element index.");
>-ERRMSG(ExpectedProgramName, "Expected a program name, but found a shader name.");
>-ERRMSG(ExpectedShaderName, "Expected a shader name, but found a program name.");
>-ERRMSG(ExtensionNotEnabled, "Extension is not enabled.");
>-ERRMSG(FeedbackLoop, "Feedback loop formed between Framebuffer and active Texture.");
>-ERRMSG(FramebufferIncompleteAttachment,
>-       "Attachment type must be compatible with attachment object.");
>-ERRMSG(GenerateMipmapNotAllowed, "Texture format does not support mipmap generation.");
>-ERRMSG(IndexExceedsMaxActiveUniform, "Index exceeds program active uniform count.");
>-ERRMSG(IndexExceedsMaxDrawBuffer, "Index exceeds MAX_DRAW_BUFFERS.");
>-ERRMSG(IndexExceedsMaxVertexAttribute, "Index exceeds MAX_VERTEX_ATTRIBS.");
>-ERRMSG(InsufficientBufferSize, "Insufficient buffer size.");
>-ERRMSG(InsufficientVertexBufferSize, "Vertex buffer is not big enough for the draw call");
>-ERRMSG(IntegerOverflow, "Integer overflow.");
>-ERRMSG(InvalidAttachment, "Invalid Attachment Type.");
>-ERRMSG(InvalidBlendEquation, "Invalid blend equation.");
>-ERRMSG(InvalidBlendFunction, "Invalid blend function.");
>-ERRMSG(InvalidBorder, "Border must be 0.");
>-ERRMSG(InvalidBufferTypes, "Invalid buffer target enum.");
>-ERRMSG(InvalidBufferUsage, "Invalid buffer usage enum.");
>-ERRMSG(InvalidClearMask, "Invalid mask bits.");
>-ERRMSG(InvalidConstantColor,
>-       "CONSTANT_COLOR (or ONE_MINUS_CONSTANT_COLOR) and CONSTANT_ALPHA (or "
>-       "ONE_MINUS_CONSTANT_ALPHA) cannot be used together as source and destination factors in the "
>-       "blend function.");
>-ERRMSG(InvalidCoverMode, "Invalid cover mode.");
>-ERRMSG(InvalidCullMode, "Cull mode not recognized.");
>-ERRMSG(InvalidDebugSeverity, "Invalid debug severity.");
>-ERRMSG(InvalidDebugSource, "Invalid debug source.");
>-ERRMSG(InvalidDebugType, "Invalid debug type.");
>-ERRMSG(InvalidDepthRange, "Near value cannot be greater than far.");
>-ERRMSG(InvalidDrawMode, "Invalid draw mode.");
>-ERRMSG(InvalidDrawModeTransformFeedback,
>-       "Draw mode must match current transform feedback object's draw mode.");
>-ERRMSG(InvalidFillMode, "Invalid fill mode.");
>-ERRMSG(InvalidFilterTexture, "Texture only supports NEAREST and LINEAR filtering.");
>-ERRMSG(InvalidFormat, "Invalid format.");
>-ERRMSG(InvalidFramebufferTarget, "Invalid framebuffer target.");
>-ERRMSG(InvalidFramebufferTextureLevel, "Mipmap level must be 0 when attaching a texture.");
>-ERRMSG(InvalidFramebufferAttachmentParameter, "Invalid parameter name for framebuffer attachment.");
>-ERRMSG(InvalidInternalFormat, "Invalid internal format.");
>-ERRMSG(InvalidMatrixMode, "Invalid matrix mode.");
>-ERRMSG(InvalidMipLevel, "Level of detail outside of range.");
>-ERRMSG(InvalidName, "Invalid name.");
>-ERRMSG(InvalidNameCharacters, "Name contains invalid characters.");
>-ERRMSG(InvalidPname, "Invalid pname.");
>-ERRMSG(InvalidPrecision, "Invalid or unsupported precision type.");
>-ERRMSG(InvalidProgramName, "Program object expected.");
>-ERRMSG(InvalidQueryId, "Invalid query Id.");
>-ERRMSG(InvalidQueryTarget, "Invalid query target.");
>-ERRMSG(InvalidQueryType, "Invalid query type.");
>-ERRMSG(InvalidRange, "Invalid range.");
>-ERRMSG(InvalidRenderbufferInternalFormat, "Invalid renderbuffer internalformat.");
>-ERRMSG(InvalidRenderbufferTarget, "Invalid renderbuffer target.");
>-ERRMSG(InvalidRenderbufferTextureParameter, "Invalid parameter name for renderbuffer attachment.");
>-ERRMSG(InvalidRenderbufferWidthHeight,
>-       "Renderbuffer width and height cannot be negative and cannot exceed maximum texture size.");
>-ERRMSG(InvalidSampleMaskNumber,
>-       "MaskNumber cannot be greater than or equal to the value of MAX_SAMPLE_MASK_WORDS.");
>-ERRMSG(InvalidSampler, "Sampler is not valid");
>-ERRMSG(InvalidShaderName, "Shader object expected.");
>-ERRMSG(InvalidShaderType, "Invalid shader type.");
>-ERRMSG(InvalidStencil, "Invalid stencil.");
>-ERRMSG(InvalidStencilBitMask, "Invalid stencil bit mask.");
>-ERRMSG(InvalidTarget, "Invalid target.");
>-ERRMSG(InvalidTextureFilterParam, "Texture filter not recognized.");
>-ERRMSG(InvalidTextureRange, "Cannot be less than 0 or greater than maximum number of textures.");
>-ERRMSG(InvalidTextureTarget, "Invalid or unsupported texture target.");
>-ERRMSG(InvalidTextureWrap, "Texture wrap mode not recognized.");
>-ERRMSG(InvalidType, "Invalid type.");
>-ERRMSG(InvalidTypePureInt, "Invalid type, should be integer");
>-ERRMSG(InvalidUnpackAlignment, "Unpack alignment must be 1, 2, 4, or 8.");
>-ERRMSG(InvalidVertexAttrSize, "Vertex attribute size must be 1, 2, 3, or 4.");
>-ERRMSG(InvalidWidth, "Invalid width.");
>-ERRMSG(InvalidWrapModeTexture, "Invalid wrap mode for texture type.");
>-ERRMSG(LevelNotZero, "Texture level must be zero.");
>-ERRMSG(MismatchedByteCountType, "Buffer size does not align with data type.");
>-ERRMSG(MismatchedFormat, "Format must match internal format.");
>-ERRMSG(MismatchedTargetAndFormat, "Invalid texture target and format combination.");
>-ERRMSG(MismatchedTypeAndFormat, "Invalid format and type combination.");
>-ERRMSG(MismatchedVariableProgram, "Variable is not part of the current program.");
>-ERRMSG(MissingReadAttachment, "Missing read attachment.");
>-ERRMSG(MustHaveElementArrayBinding, "Must have element array buffer binding.");
>-ERRMSG(NameBeginsWithGL, "Attributes that begin with 'gl_' are not allowed.");
>-ERRMSG(NegativeAttachments, "Negative number of attachments.");
>-ERRMSG(NegativeBufferSize, "Negative buffer size.");
>-ERRMSG(NegativeCount, "Negative count.");
>-ERRMSG(NegativeLength, "Negative length.");
>-ERRMSG(NegativeMaxCount, "Negative maxcount.");
>-ERRMSG(NegativeOffset, "Negative offset.");
>-ERRMSG(NegativePrimcount, "Primcount must be greater than or equal to zero.");
>-ERRMSG(NegativeSize, "Cannot have negative height or width.");
>-ERRMSG(NegativeStart, "Cannot have negative start.");
>-ERRMSG(NegativeStride, "Cannot have negative stride.");
>-ERRMSG(NoSuchPath, "No such path object.");
>-ERRMSG(NoTransformFeedbackOutputVariables,
>-    "The active program has specified no output variables to record.");
>-ERRMSG(NoZeroDivisor, "At least one enabled attribute must have a divisor of zero.");
>-ERRMSG(ObjectNotGenerated, "Object cannot be used because it has not been generated.");
>-ERRMSG(OffsetMustBeMultipleOfType, "Offset must be a multiple of the passed in datatype.");
>-ERRMSG(OutsideOfBounds, "Parameter outside of bounds.");
>-ERRMSG(ParamOverflow, "The provided parameters overflow with the provided buffer.");
>-ERRMSG(PixelDataNotNull, "Pixel data must be null.");
>-ERRMSG(PixelDataNull, "Pixel data cannot be null.");
>-ERRMSG(ProgramDoesNotExist, "Program doesn't exist.");
>-ERRMSG(ProgramNotBound, "A program must be bound.");
>-ERRMSG(ProgramNotLinked, "Program not linked.");
>-ERRMSG(QueryActive, "Query is active.");
>-ERRMSG(QueryExtensionNotEnabled, "Query extension not enabled.");
>-ERRMSG(ReadBufferNone, "Read buffer is GL_NONE.");
>-ERRMSG(RenderbufferNotBound, "A renderbuffer must be bound.");
>-ERRMSG(ResourceMaxTextureSize, "Desired resource size is greater than max texture size.");
>-ERRMSG(ShaderAttachmentHasShader, "Shader attachment already has a shader.");
>-ERRMSG(ShaderSourceInvalidCharacters, "Shader source contains invalid characters.");
>-ERRMSG(ShaderToDetachMustBeAttached,
>-       "Shader to be detached must be currently attached to the program.");
>-ERRMSG(SourceTextureTooSmall, "The specified dimensions are outside of the bounds of the texture.");
>-ERRMSG(StencilReferenceMaskOrMismatch,
>-       "Stencil reference and mask values must be the same for front facing and back facing "
>-       "triangles.");
>-ERRMSG(StrideMustBeMultipleOfType, "Stride must be a multiple of the passed in datatype.");
>-ERRMSG(TextureNotBound, "A texture must be bound.");
>-ERRMSG(TextureNotPow2, "The texture is a non-power-of-two texture.");
>-ERRMSG(TransformFeedbackDoesNotExist, "Transform feedback object that does not exist.");
>-ERRMSG(TypeMismatch,
>-       "Passed in texture target and format must match the one originally used to define the "
>-       "texture.");
>-ERRMSG(TypeNotUnsignedShortByte, "Only UNSIGNED_SHORT and UNSIGNED_BYTE types are supported.");
>-ERRMSG(UniformSizeMismatch, "Uniform size does not match uniform method.");
>-ERRMSG(UnknownParameter, "Unknown parameter value.");
>-ERRMSG(VertexArrayNoBuffer, "An enabled vertex array has no buffer.");
>-ERRMSG(VertexArrayNoBufferPointer, "An enabled vertex array has no buffer and no pointer.");
>-ERRMSG(ViewportNegativeSize, "Viewport size cannot be negative.");
>-ERRMSG(Webgl2NameLengthLimitExceeded, "Location lengths must not be greater than 1024 characters.");
>-ERRMSG(WebglBindAttribLocationReservedPrefix,
>-       "Attributes that begin with 'webgl_', or '_webgl_' are not allowed.");
>-ERRMSG(WebglNameLengthLimitExceeded,
>-       "Location name lengths must not be greater than 256 characters.");
>-}
>-#undef ERRMSG
>+namespace err
>+{
>+#define MSG constexpr const char *
>+
>+// clang-format off
>+MSG k3DDepthStencil = "Format cannot be GL_DEPTH_COMPONENT or GL_DEPTH_STENCIL if target is GL_TEXTURE_3D";
>+MSG kANGLECopyTexture3DUnavailable = "GL_ANGLE_copy_texture_3d extension not available.";
>+MSG kAtomicCounterResourceName = "Active atomic counter resources are not assigned name strings.";
>+MSG kAttributeZeroRequiresDivisorLimitation = "The current context doesn't support setting a non-zero divisor on the attribute with index zero. Please reorder the attributes in your vertex shader so that attribute zero can have a zero divisor.";
>+MSG kBaseLevelNegative = "Base level must be at least 0.";
>+MSG kBaseLevelNonZero = "Base level must be 0.";
>+MSG kBaseLevelOutOfRange = "Texture base level out of range";
>+MSG kBlitDepthOrStencilFormatMismatch = "Depth/stencil buffer format combination not allowed for blit.";
>+MSG kBlitDimensionsOutOfRange = "BlitFramebuffer dimensions out of 32-bit integer range.";
>+MSG kBlitExtensionDepthStencilWholeBufferBlit = "Only whole-buffer depth and stencil blits are supported by this extension.";
>+MSG kBlitExtensionFormatMismatch = "Attempting to blit and the read and draw buffer formats don't match.";
>+MSG kBlitExtensionFromInvalidAttachmentType = "Blits are only supported from 2D texture = renderbuffer or default framebuffer attachments in this extension.";
>+MSG kBlitExtensionLinear = "Linear blit not supported in this extension.";
>+MSG kBlitExtensionMultisampledDepthOrStencil = "Multisampled depth/stencil blit is not supported by this extension.";
>+MSG kBlitExtensionMultisampledWholeBufferBlit = "Only whole-buffer blit is supported from a multisampled read buffer in this extension.";
>+MSG kBlitExtensionNotAvailable = "Blit extension not available.";
>+MSG kBlitExtensionScaleOrFlip = "Scaling and flipping in BlitFramebufferANGLE not supported by this implementation.";
>+MSG kBlitExtensionToInvalidAttachmentType = "Blits are only supported to 2D texture = renderbuffer or default framebuffer attachments in this extension.";
>+MSG kBlitFeedbackLoop = "Blit feedback loop: the read and draw framebuffers are the same.";
>+MSG kBlitFramebufferMissing = "Read and draw framebuffers must both exist for a blit to succeed.";
>+MSG kBlitFromMultiview = "Attempt to read from a multi-view framebuffer.";
>+MSG kBlitIntegerWithLinearFilter = "Cannot use GL_LINEAR filter when blitting a integer framebuffer.";
>+MSG kBlitInvalidFilter = "Invalid blit filter.";
>+MSG kBlitInvalidMask = "Invalid blit mask.";
>+MSG kBlitMissingColor = "Attempt to read from a missing color attachment of a complete framebuffer.";
>+MSG kBlitMissingDepthOrStencil = "Attempt to read from a missing depth/stencil attachment of a complete framebuffer.";
>+MSG kBlitMultisampledBoundsMismatch = "Attempt to blit from a multisampled framebuffer and the bounds don't match with the draw framebuffer.";
>+MSG kBlitMultisampledFormatOrBoundsMismatch = "Attempt to blit from a multisampled framebuffer and the bounds or format of the color buffer don't match with the draw framebuffer.";
>+MSG kBlitOnlyNearestForNonColor = "Only nearest filtering can be used when blitting buffers other than the color buffer.";
>+MSG kBlitSameImageColor = "Read and write color attachments cannot be the same image.";
>+MSG kBlitSameImageDepthOrStencil = "Read and write depth stencil attachments cannot be the same image.";
>+MSG kBlitToMultiview = "Attempt to write to a multi-view framebuffer.";
>+MSG kBlitTypeMismatchFixedOrFloat = "If the read buffer contains fixed-point or floating-point values = the draw buffer must as well.";
>+MSG kBlitTypeMismatchFixedPoint = "If the read buffer contains fixed-point values = the draw buffer must as well.";
>+MSG kBlitTypeMismatchSignedInteger = "If the read buffer contains signed integer values the draw buffer must as well.";
>+MSG kBlitTypeMismatchUnsignedInteger = "If the read buffer contains unsigned integer values the draw buffer must as well.";
>+MSG kBufferAlreadyMapped = "Buffer is already mapped.";
>+MSG kBufferBoundForTransformFeedback = "Buffer is bound for transform feedback.";
>+MSG kBufferMapped = "An active buffer is mapped";
>+MSG kBufferNotBound = "A buffer must be bound.";
>+MSG kBufferNotMappable = "Attempted to map buffer object zero.";
>+MSG kBufferNotMapped = "Buffer is not mapped.";
>+MSG kBufferOffsetOverflow = "Buffer offset overflow.";
>+MSG kBufferPointerNotAvailable = "Can not get pointer for reserved buffer name zero.";
>+MSG kCannotPopDefaultDebugGroup = "Cannot pop the default debug group.";
>+MSG kClientDataInVertexArray = "Client data cannot be used with a non-default vertex array object.";
>+MSG kColorNumberGreaterThanMaxDrawBuffers = "Color number for primary color greater than or equal to MAX_DRAW_BUFFERS";
>+MSG kColorNumberGreaterThanMaxDualSourceDrawBuffers = "Color number for secondary color greater than or equal to MAX_DUAL_SOURCE_DRAW_BUFFERS";
>+MSG kCompressedDataSizeTooSmall = "dataSize is too small";
>+MSG kCompressedMismatch = "Compressed data is valid if-and-only-if the texture is compressed.";
>+MSG kCompressedTextureDimensionsMustMatchData = "Compressed texture dimensions must exactly match the dimensions of the data passed in.";
>+MSG kCompressedTexturesNotAttachable = "Compressed textures cannot be attached to a framebuffer.";
>+MSG kConstantColorAlphaLimitation = "Simultaneous use of GL_CONSTANT_ALPHA/GL_ONE_MINUS_CONSTANT_ALPHA and GL_CONSTANT_COLOR/GL_ONE_MINUS_CONSTANT_COLOR not supported by this implementation.";
>+MSG kContextLost = "Context has been lost.";
>+MSG kCopyAlias = "The read and write copy regions alias memory.";
>+MSG kCubemapFacesEqualDimensions = "Each cubemap face must have equal width and height.";
>+MSG kCubemapIncomplete = "Texture is not cubemap complete. All cubemaps faces must be defined and be the same size.";
>+MSG kDataTypeNotAligned = "Data is not evenly divisible into the number of bytes needed to store in memory a datum indicated by type.";
>+MSG kDefaultFramebuffer = "Default framebuffer is bound.";
>+MSG kDefaultFramebufferInvalidAttachment = "Invalid attachment when the default framebuffer is bound.";
>+MSG kDefaultFramebufferInvalidDrawBuffer = "Only NONE or BACK are valid draw buffers for the default framebuffer";
>+MSG kDefaultFramebufferTarget = "It is invalid to change default FBO's attachments";
>+MSG kDefaultVertexArray = "Default vertex array object is bound.";
>+MSG kDestinationImmutable = "Destination texture cannot be immutable.";
>+MSG kDestinationLevelNotDefined = "The destination level of the destination texture must be defined.";
>+MSG kDestinationTextureTooSmall = "Destination texture too small.";
>+MSG kDimensionsMustBePow2 = "Texture dimensions must be power-of-two.";
>+MSG kDispatchIndirectBufferNotBound = "Dispatch indirect buffer must be bound.";
>+MSG kDrawBufferMaskMismatch = "Active draw buffers with missing fragment shader outputs.";
>+MSG kDrawBufferTypeMismatch = "Fragment shader output type does not match the bound framebuffer attachment type.";
>+MSG kDrawFramebufferIncomplete = "Draw framebuffer is incomplete";
>+MSG kDrawIndirectBufferNotBound = "Draw indirect buffer must be bound.";
>+MSG kEGLImageCannotCreate2DMultisampled = "Cannot create a 2D texture from a multisampled EGL image.";
>+MSG kEGLImageRenderbufferFormatNotSupported = "EGL image internal format is not supported as a renderbuffer.";
>+MSG kEGLImageTextureFormatNotSupported = "EGL image internal format is not supported as a texture.";
>+MSG kElementArrayBufferBoundForTransformFeedback = "It is undefined behavior to use an element array buffer that is bound for transform feedback.";
>+MSG kElementArrayNoBufferOrPointer = "No element array buffer and no pointer.";
>+MSG kEnumNotSupported = "Enum is not currently supported.";
>+MSG kEnumRequiresGLES30 = "Enum requires GLES 3.0";
>+MSG kEnumRequiresGLES31 = "Enum requires GLES 3.1";
>+MSG kES31Required = "OpenGL ES 3.1 Required";
>+MSG kES3Required = "OpenGL ES 3.0 Required.";
>+MSG kExceedsComputeWorkGroupCountX = "num_groups_x cannot be greater than MAX_COMPUTE_WORK_GROUP_COUNT[0]";
>+MSG kExceedsComputeWorkGroupCountY = "num_groups_y cannot be greater than MAX_COMPUTE_WORK_GROUP_COUNT[1]";
>+MSG kExceedsComputeWorkGroupCountZ = "num_groups_z cannot be greater than MAX_COMPUTE_WORK_GROUP_COUNT[2]";
>+MSG kExceedsElementRange = "Element value exceeds element range.";
>+MSG kExceedsFramebufferHeight = "Params less than 0 or greater than GL_MAX_FRAMEBUFFER_HEIGHT.";
>+MSG kExceedsFramebufferSamples = "Params less than 0 or greater than GL_MAX_FRAMEBUFFER_SAMPLES.";
>+MSG kExceedsFramebufferWidth = "Params less than 0 or greater than GL_MAX_FRAMEBUFFER_WIDTH.";
>+MSG kExceedsMaxColorAttachments = "Index is greater than the maximum supported color attachments";
>+MSG kExceedsMaxDebugGroupStackDepth = "Cannot push more than GL_MAX_DEBUG_GROUP_STACK_DEPTH debug groups.";
>+MSG kExceedsMaxDebugMessageLength = "Message length is larger than GL_MAX_DEBUG_MESSAGE_LENGTH.";
>+MSG kExceedsMaxDrawBuffers = "Draw buffer greater than MAX_DRAW_BUFFERS.";
>+MSG kExceedsMaxElement = "Element value exceeds maximum element index.";
>+MSG kExceedsMaxImageUnits = "Index must be within [0, MAX_IMAGE_UNITS).";
>+MSG kExceedsMaxLabelLength = "Label length is larger than GL_MAX_LABEL_LENGTH.";
>+MSG kExceedsMaxShaderStorageBufferBindings = "Index must be within [0, MAX_SHADER_STORAGE_BUFFER_BINDINGS).";
>+MSG kExceedsMaxVertexAttribBindings = "Index must be within [0, MAX_VERTEX_ATTRIB_BINDINGS).";
>+MSG kExceedsMaxVertexAttribStride = "Stride must be within [0, MAX_VERTEX_ATTRIB_STRIDE).";
>+MSG kExceedsNumExtensions = "Index must be within [0, NUM_EXTENSIONS).";
>+MSG kExceedsNumRequestableExtensions = "Index must be within [0, NUM_REQUESTABLE_EXTENSIONS_ANGLE).";
>+MSG kExpectedProgramName = "Expected a program name = but found a shader name.";
>+MSG kExpectedShaderName = "Expected a shader name = but found a program name.";
>+MSG kExtensionNotEnabled = "Extension is not enabled.";
>+MSG kExtensionNotRequestable = "Extension is not requestable.";
>+MSG kExternalTextureNotSupported = "External texture extension not enabled";
>+MSG kFeedbackLoop = "Feedback loop formed between Framebuffer and active Texture.";
>+MSG kFixedNotInWebGL = "GL_FIXED is not supported in WebGL.";
>+MSG kFormatNotRenderable = "Internal format is not renderable.";
>+MSG kFragDataBindingIndexOutOfRange = "Fragment output color index must be zero or one.";
>+MSG kFragmentInputTypeNotFloatingPoint = "Fragment input type is not a floating point scalar or vector.";
>+MSG kFramebufferIncomplete = "Framebuffer is incomplete.";
>+MSG kFramebufferIncompleteAttachment = "Attachment type must be compatible with attachment object.";
>+MSG kFramebufferTextureInvalidLayer = "Layer invalid for framebuffer texture attachment.";
>+MSG kFramebufferTextureInvalidMipLevel = "Mip level invalid for framebuffer texture attachment.";
>+MSG kFramebufferTextureLayerIncorrectTextureType = "Texture is not a three-dimensional or two-dimensionsal array texture.";
>+MSG kGenerateMipmapNotAllowed = "Texture format does not support mipmap generation.";
>+MSG kGenerateMipmapZeroSize = "Cannot generate mipmaps for a zero-size texture in a WebGL context.";
>+MSG kGeometryShaderExtensionNotEnabled = "GL_EXT_geometry_shader extension not enabled.";
>+MSG kGLES1Only = "GLES1-only function.";
>+MSG kImageSizeMustBeZero = "imageSize must be 0 if no texture data is provided.";
>+MSG kImageSizeTooSmall = "imageSize is too small.";
>+MSG kImmutableTextureBound = "The value of TEXTURE_IMMUTABLE_FORMAT for the texture currently bound to target on the active texture unit is true.";
>+MSG kIncompatibleDrawModeAgainstGeometryShader = "Primitive mode is incompatible with the input primitive type of the geometry shader.";
>+MSG kIndexExceedsActiveUniformBlockCount = "Index exceeds active uniform block count.";
>+MSG kIndexExceedsMaxActiveUniform = "Index must be less than program active uniform count.";
>+MSG kIndexExceedsMaxActiveUniformBlock = "Index must be less than program active uniform block count.";
>+MSG kIndexExceedsMaxAtomicCounterBufferBindings = "Index must be less than MAX_ATOMIC_COUNTER_BUFFER_BINDINGS.";
>+MSG kIndexExceedsMaxDrawBuffer = "Index must be less than MAX_DRAW_BUFFERS.";
>+MSG kIndexExceedsMaxTransformFeedbackAttribs = "Index must be less than MAX_TRANSFORM_FEEDBACK_SEPARATE_ATTRIBS.";
>+MSG kIndexExceedsMaxUniformBufferBindings = "Index must be less than MAX_UNIFORM_BUFFER_BINDINGS.";
>+MSG kIndexExceedsMaxVertexAttribute = "Index must be less than MAX_VERTEX_ATTRIBS.";
>+MSG kIndexExceedsMaxWorkgroupDimensions = "Index must be less than the number of workgroup dimensions (3).";
>+MSG kIndexExceedsSamples = "Index must be less than the value of SAMPLES.";
>+MSG kIndexExceedsTransformFeedbackBufferBindings = "Index is greater than or equal to the number of TRANSFORM_FEEDBACK_BUFFER indexed binding points.";
>+MSG kInsufficientBufferSize = "Insufficient buffer size.";
>+MSG kInsufficientParams = "More parameters are required than were provided.";
>+MSG kInsufficientVertexBufferSize = "Vertex buffer is not big enough for the draw call";
>+MSG kIntegerOverflow = "Integer overflow.";
>+MSG kInternalFormatRequiresTexture2DArray = "internalformat is an ETC2/EAC format and target is not GL_TEXTURE_2D_ARRAY.";
>+MSG kInvalidAccessBits = "Invalid access bits.";
>+MSG kInvalidAccessBitsFlush = "The explicit flushing bit may only be set if the buffer is mapped for writing.";
>+MSG kInvalidAccessBitsRead = "Invalid access bits when mapping buffer for reading";
>+MSG kInvalidAccessBitsReadWrite = "Need to map buffer for either reading or writing.";
>+MSG kInvalidAttachment = "Invalid Attachment Type.";
>+MSG kInvalidBindBufferSize = "Invalid buffer binding size.";
>+MSG kInvalidBindUniformLocation = "Location must be less than (MAX_VERTEX_UNIFORM_VECTORS + MAX_FRAGMENT_UNIFORM_VECTORS) * 4";
>+MSG kInvalidBlendEquation = "Invalid blend equation.";
>+MSG kInvalidBlendFunction = "Invalid blend function.";
>+MSG kInvalidBooleanValue = "Invalid boolean value. Must be GL_FALSE or GL_TRUE.";
>+MSG kInvalidBorder = "Border must be 0.";
>+MSG kInvalidBufferName = "name is not a valid buffer.";
>+MSG kInvalidBufferTypes = "Invalid buffer target.";
>+MSG kInvalidBufferUsage = "Invalid buffer usage enum.";
>+MSG kInvalidClearMask = "Invalid mask bits.";
>+MSG kInvalidClientState = "Invalid client vertex array type.";
>+MSG kInvalidClipPlane = "Invalid clip plane.";
>+MSG kInvalidCombinedImageUnit = "Specified unit must be in [GL_TEXTURE0 = GL_TEXTURE0 + GL_MAX_COMBINED_IMAGE_UNITS)";
>+MSG kInvalidComponents = "Invalid components.";
>+MSG kInvalidCompressedFormat = "Not a valid compressed texture format.";
>+MSG kInvalidCompressedImageSize = "Invalid compressed image size.";
>+MSG kInvalidConstantColor = "CONSTANT_COLOR (or ONE_MINUS_CONSTANT_COLOR) and CONSTANT_ALPHA (or ONE_MINUS_CONSTANT_ALPHA) cannot be used together as source and destination factors in the blend function.";
>+MSG kInvalidCopyCombination = "Invalid copy texture format combination.";
>+MSG kInvalidCoverageComponents = "components is not one of GL_RGB, GL_RGBA, GL_ALPHA or GL_NONE.";
>+MSG kInvalidCoverMode = "Invalid cover mode.";
>+MSG kInvalidCullMode = "Cull mode not recognized.";
>+MSG kInvalidDebugSeverity = "Invalid debug severity.";
>+MSG kInvalidDebugSource = "Invalid debug source.";
>+MSG kInvalidDebugSourceType = "If count is greater than zero, source and type cannot be GL_DONT_CARE.";
>+MSG kInvalidDebugType = "Invalid debug type.";
>+MSG kInvalidDefaultReadBuffer = "Read buffer must be GL_NONE or GL_BACK when reading from the default framebuffer.";
>+MSG kInvalidDepthRange = "Near value cannot be greater than far.";
>+MSG kInvalidDepthStencilDrawBuffer = "Draw buffer must be zero when using depth or stencil.";
>+MSG kInvalidDestinationTexture = "Destination texture is not a valid texture object.";
>+MSG kInvalidDestinationTextureType = "Invalid destination texture type.";
>+MSG kInvalidDrawBuffer = "Invalid draw buffer.";
>+MSG kInvalidDrawBufferCountForDefault = "The default framebuffer must have exactly one draw buffer.";
>+MSG kInvalidDrawBufferValue = "Ith value does not match COLOR_ATTACHMENTi or NONE.";
>+MSG kInvalidDrawMode = "Invalid draw mode.";
>+MSG kInvalidDrawModeTransformFeedback = "Draw mode must match current transform feedback object's draw mode.";
>+MSG kInvalidEGLImage = "EGL image is not valid.";
>+MSG kInvalidElementRange = "Invalid element range.";
>+MSG kInvalidFence = "Invalid fence object.";
>+MSG kInvalidFenceCondition = "Invalid value for condition.";
>+MSG kInvalidFenceState = "Fence must be set.";
>+MSG kInvalidFillMode = "Invalid fill mode.";
>+MSG kInvalidFilterTexture = "Texture only supports NEAREST and LINEAR filtering.";
>+MSG kInvalidFlags = "Invalid value for flags.";
>+MSG kInvalidFlushOutOfRange = "Flushed range does not fit into buffer mapping dimensions.";
>+MSG kInvalidFlushTarget = "Attempted to flush a buffer not mapped for explicit flushing.";
>+MSG kInvalidFlushZero = "Attempted to flush buffer object zero.";
>+MSG kInvalidFogDensity = "Invalid fog density (must be nonnegative).";
>+MSG kInvalidFogMode = "Invalid fog mode.";
>+MSG kInvalidFogParameter = "Invalid fog parameter.";
>+MSG kInvalidFormat = "Invalid format.";
>+MSG kInvalidFormatCombination = "Invalid combination of format = type and internalFormat.";
>+MSG kInvalidFragmentInputBinding = "No such binding.";
>+MSG kInvalidFramebufferAttachmentParameter = "Invalid parameter name for framebuffer attachment.";
>+MSG kInvalidFramebufferLayer = "Framebuffer layer cannot be less than 0 or greater than GL_MAX_FRAMEBUFFER_LAYERS_EXT.";
>+MSG kInvalidFramebufferName = "name is not a valid framebuffer.";
>+MSG kInvalidFramebufferTarget = "Invalid framebuffer target.";
>+MSG kInvalidFramebufferTextureLevel = "Mipmap level must be 0 when attaching a texture.";
>+MSG kInvalidHandleType = "Invalid handle type.";
>+MSG kInvalidImageAccess = "access is not one of the supported tokens.";
>+MSG kInvalidImageFormat = "format is not one of supported image unit formats.";
>+MSG kInvalidIndentifier = "Invalid identifier.";
>+MSG kInvalidIndirectOffset = "indirect must be a multiple of the size of uint in basic machine units.";
>+MSG kInvalidInternalFormat = "Invalid internal format.";
>+MSG kInvalidLight = "Invalid light.";
>+MSG kInvalidLightModelParameter = "Invalid light model parameter.";
>+MSG kInvalidLightParameter = "Invalid light parameter.";
>+MSG kInvalidLogicOp = "Invalid logical operation.";
>+MSG kInvalidMapPointerQuery = "GL_BUFFER_MAP_POINTER can only be queried with GetBufferPointerv.";
>+MSG kInvalidMaterialFace = "Invalid material face.";
>+MSG kInvalidMaterialParameter = "Invalid material parameter.";
>+MSG kInvalidMatrixMode = "Invalid matrix mode.";
>+MSG kInvalidMemoryBarrierBit = "Invalid memory barrier bit.";
>+MSG kInvalidMipLevel = "Level of detail outside of range.";
>+MSG kInvalidMipLevels = "Invalid level count.";
>+MSG kInvalidMultisampledFramebufferOperation = "Invalid operation on multisampled framebuffer";
>+MSG kInvalidMultitextureUnit = "Specified unit must be in [GL_TEXTURE0 = GL_TEXTURE0 + GL_MAX_TEXTURE_UNITS)";
>+MSG kInvalidName = "Invalid name.";
>+MSG kInvalidNameCharacters = "Name contains invalid characters.";
>+MSG kInvalidPathCoefficientsArray = "No coefficients array given.";
>+MSG kInvalidPathCommand = "Invalid command.";
>+MSG kInvalidPathCommandsArray = "No commands array given.";
>+MSG kInvalidPathComponents = "Unexpected number of components";
>+MSG kInvalidPathCoordinateType = "Invalid coordinate type.";
>+MSG kInvalidPathEndCaps = "Invalid end caps.";
>+MSG kInvalidPathGenMode = "Invalid gen mode.";
>+MSG kInvalidPathJoinStyle = "Invalid join style.";
>+MSG kInvalidPathMatrix = "Invalid matrix.";
>+MSG kInvalidPathMiterLimit = "Invalid miter limit.";
>+MSG kInvalidPathNameArray = "No path name array.";
>+MSG kInvalidPathNameType = "Invalid path name type.";
>+MSG kInvalidPathNumCommands = "Invalid number of commands.";
>+MSG kInvalidPathNumCoords = "Invalid number of coordinates.";
>+MSG kInvalidPathNumCoordsArray = "No coordinate array given.";
>+MSG kInvalidPathNumPaths = "Invalid (negative) numPaths.";
>+MSG kInvalidPathParameter = "Invalid path parameter.";
>+MSG kInvalidPathStrokeWidth = "Invalid stroke width.";
>+MSG kInvalidPathValueArray = "No value array.";
>+MSG kInvalidPname = "Invalid pname.";
>+MSG kInvalidPointerQuery = "Invalid pointer query.";
>+MSG kInvalidPointParameter = "Invalid point parameter.";
>+MSG kInvalidPointParameterValue = "Invalid point parameter value (must be non-negative).";
>+MSG kInvalidPointSizeValue = "Invalid point size (must be positive).";
>+MSG kInvalidPrecision = "Invalid or unsupported precision type.";
>+MSG kInvalidPrimitiveMode = "Invalid primitive mode.";
>+MSG kInvalidProgramBinaryFormat = "Program binary format is not valid.";
>+MSG kInvalidProgramInterface = "Invalid program interface.";
>+MSG kInvalidProgramName = "Program object expected.";
>+MSG kInvalidProgramResourceIndex = "Invalid program resource index.";
>+MSG kInvalidProgramResourceProperty = "Invalid program resource property.";
>+MSG kInvalidProjectionMatrix = "Invalid projection matrix. Left/right = top/bottom = near/far intervals cannot be zero = and near/far cannot be less than zero.";
>+MSG kInvalidPropCount = "Invalid propCount.";
>+MSG kInvalidPropertyForProgramInterface = "Not an allowed program resource property for this program interface";
>+MSG kInvalidProvokingVertex = "Invalid provoking vertex.";
>+MSG kInvalidQueryId = "Invalid query Id.";
>+MSG kInvalidQueryName = "name is not a valid query.";
>+MSG kInvalidQueryTarget = "Invalid query target.";
>+MSG kInvalidQueryType = "Invalid query type.";
>+MSG kInvalidRange = "Invalid range.";
>+MSG kInvalidReadBuffer = "Invalid read buffer";
>+MSG kInvalidRenderbufferInternalFormat = "Invalid renderbuffer internalformat.";
>+MSG kInvalidRenderbufferName = "name is not a valid renderbuffer.";
>+MSG kInvalidRenderbufferTarget = "Invalid renderbuffer target.";
>+MSG kInvalidRenderbufferTextureParameter = "Invalid parameter name for renderbuffer attachment.";
>+MSG kInvalidRenderbufferWidthHeight = "Renderbuffer width and height cannot be negative and cannot exceed maximum texture size.";
>+MSG kInvalidResetStatus = "Reset status is not valid";
>+MSG kInvalidSampleMaskNumber = "MaskNumber cannot be greater than or equal to the value of MAX_SAMPLE_MASK_WORDS.";
>+MSG kInvalidSampler = "Sampler is not valid";
>+MSG kInvalidSamplerName = "name is not a valid sampler.";
>+MSG kInvalidShaderBinaryFormat = "Invalid shader binary format.";
>+MSG kInvalidShaderName = "Shader object expected.";
>+MSG kInvalidShaderType = "Invalid shader type.";
>+MSG kInvalidShadingModel = "Invalid shading model.";
>+MSG kInvalidSourceTexture = "Source texture is not a valid texture object.";
>+MSG kInvalidSourceTextureInternalFormat = "Source texture internal format is invalid.";
>+MSG kInvalidSourceTextureLevel = "Invalid source texture level.";
>+MSG kInvalidSourceTextureSize = "Invalid source texture height or width.";
>+MSG kInvalidSourceTextureType = "Source texture must be a valid texture type.";
>+MSG kInvalidStencil = "Invalid stencil.";
>+MSG kInvalidStencilBitMask = "Invalid stencil bit mask.";
>+MSG kInvalidSyncPointer = "Not a valid sync pointer.";
>+MSG kInvalidTarget = "Invalid target.";
>+MSG kInvalidTextureCombine = "Invalid texture combine mode.";
>+MSG kInvalidTextureCombineOp = "Invalid texture combine operand.";
>+MSG kInvalidTextureCombineSrc = "Invalid texture combine source.";
>+MSG kInvalidTextureEnvMode = "Invalid texture environment mode.";
>+MSG kInvalidTextureEnvParameter = "Invalid texture environment parameter.";
>+MSG kInvalidTextureEnvScale = "Invalid texture environment scale.";
>+MSG kInvalidTextureEnvTarget = "Invalid texture environment target.";
>+MSG kInvalidTextureFilterParam = "Texture filter not recognized.";
>+MSG kInvalidTextureLevel = "Texture level does not exist.";
>+MSG kInvalidTextureName = "Not a valid texture object name.";
>+MSG kInvalidTextureRange = "Cannot be less than 0 or greater than maximum number of textures.";
>+MSG kInvalidTextureTarget = "Invalid or unsupported texture target.";
>+MSG kInvalidTextureType = "Texture has incompatible target.";
>+MSG kInvalidTextureWrap = "Texture wrap mode not recognized.";
>+MSG kInvalidTimeout = "Invalid value for timeout.";
>+MSG kInvalidTransformation = "Invalid transformation.";
>+MSG kInvalidTransformFeedbackAttribsCount = "Count exceeds MAX_TRANSFORM_FEEDBACK_SEPARATE_ATTRIBS.";
>+MSG kInvalidTransformFeedbackName = "name is not a valid transform feedback.";
>+MSG kInvalidType = "Invalid type.";
>+MSG kInvalidUniformCount = "Only array uniforms may have count > 1.";
>+MSG kInvalidUniformLocation = "Invalid uniform location";
>+MSG kInvalidUnpackAlignment = "Unpack alignment must be 1 = 2 = 4 = or 8.";
>+MSG kInvalidVaryingLocation = "Location exceeds max varying.";
>+MSG kInvalidVertexArray = "Vertex array does not exist.";
>+MSG kInvalidVertexArrayName = "name is not a valid vertex array.";
>+MSG kInvalidVertexAttribSize2101010 = "Type is INT_2_10_10_10_REV or UNSIGNED_INT_2_10_10_10_REV and size is not 4.";
>+MSG kInvalidVertexAttrSize = "Vertex attribute size must be 1 = 2 = 3 = or 4.";
>+MSG kInvalidVertexPointerSize = "Size for built-in vertex attribute is outside allowed range.";
>+MSG kInvalidVertexPointerStride = "Invalid stride for built-in vertex attribute.";
>+MSG kInvalidVertexPointerType = "Invalid type for built-in vertex attribute.";
>+MSG kInvalidWidth = "Invalid width.";
>+MSG kInvalidWrapModeTexture = "Invalid wrap mode for texture type.";
>+MSG kLengthZero = "Length must not be zero.";
>+MSG kLevelNotZero = "Texture level must be zero.";
>+MSG kLightParameterOutOfRange = "Light parameter out of range.";
>+MSG kMapOutOfRange = "Mapped range does not fit into buffer dimensions.";
>+MSG kMaterialParameterOutOfRange = "Material parameter out of range.";
>+MSG kMatrixStackOverflow = "Current matrix stack is full.";
>+MSG kMatrixStackUnderflow = "Current matrix stack has only a single matrix.";
>+MSG kMaxActiveVariablesInterface = "MAX_NUM_ACTIVE_VARIABLES requires a buffer or block interface.";
>+MSG kMismatchedFormat = "Format must match internal format.";
>+MSG kMismatchedTargetAndFormat = "Invalid texture target and format combination.";
>+MSG kMismatchedTypeAndFormat = "Invalid format and type combination.";
>+MSG kMismatchedVariableProgram = "Variable is not part of the current program.";
>+MSG kMissingName = "No name given.";
>+MSG kMissingReadAttachment = "Missing read attachment.";
>+MSG kMissingTexture = "No Texture is bound to the specified target.";
>+MSG kMissingTextureName = "texture is not the name of an existing texture object.";
>+MSG kMultisampleArrayExtensionRequired = "GL_ANGLE_texture_multisample_array not enabled.";
>+MSG kMultisampleTextureExtensionOrES31Required = "GL_ANGLE_texture_multisample or GLES 3.1 required.";
>+MSG kMultiviewActive = "The number of views in the active draw framebuffer is greater than 1.";
>+MSG kMultiviewMismatch = "The number of views in the active program and draw framebuffer does not match.";
>+MSG kMultiviewNotAvailable = "ANGLE_multiview is not available.";
>+MSG kMultiviewReadFramebuffer = "The active read framebuffer object has multiview attachments.";
>+MSG kMultiviewTimerQuery = "There is an active query for target GL_TIME_ELAPSED_EXT when the number of views in the active draw framebuffer is greater than 1.";
>+MSG kMultiviewTransformFeedback = "There is an active transform feedback object when the number of views in the active draw framebuffer is greater than 1.";
>+MSG kMultiviewViewsTooLarge = "numViews cannot be greater than GL_MAX_VIEWS_ANGLE.";
>+MSG kMultiviewViewsTooSmall = "numViews cannot be less than 1.";
>+MSG kMustHaveElementArrayBinding = "Must have element array buffer bound.";
>+MSG kNameBeginsWithGL = "Attributes that begin with 'gl_' are not allowed.";
>+MSG kNegativeAttachments = "Negative number of attachments.";
>+MSG kNegativeBaseViewIndex = "Negative baseViewIndex.";
>+MSG kNegativeBufferSize = "Negative buffer size.";
>+MSG kNegativeBufSize = "Invalid bufSize.";
>+MSG kNegativeCount = "Negative count.";
>+MSG kNegativeHeightWidthDepth = "Cannot have negative height = width = or depth.";
>+MSG kNegativeLayer = "Negative layer.";
>+MSG kNegativeLength = "Negative length.";
>+MSG kNegativeLevel = "Level is negative.";
>+MSG kNegativeLocation = "Location cannot be less than 0.";
>+MSG kNegativeMaxCount = "Negative maxcount.";
>+MSG kNegativeOffset = "Negative offset.";
>+MSG kNegativeParam = "param is negative.";
>+MSG kNegativePrimcount = "Primcount must be greater than or equal to zero.";
>+MSG kNegativeSize = "Negative size.";
>+MSG kNegativeStart = "Cannot have negative start.";
>+MSG kNegativeStride = "Cannot have negative stride.";
>+MSG kNegativeXYZ = "x = y = or z cannot be negative.";
>+MSG kNoActiveComputeShaderStage = "No active compute shader stage in this program.";
>+MSG kNoActiveGeometryShaderStage = "No active geometry shader stage in this program.";
>+MSG kNoActiveGraphicsShaderStage = "It is a undefined behaviour to render without vertex shader stage or fragment shader stage.";
>+MSG kNoActiveProgramWithComputeShader = "No active program for the compute shader stage.";
>+MSG kNoDefinedClearConversion = "No defined conversion between clear value and attachment format.";
>+MSG kNonPositiveDrawTextureDimension = "Both width and height argument of drawn texture must be positive.";
>+MSG kNoPathOrNoPathData = "No such path or path has no data.";
>+MSG kNoProgramBinaryFormats = "No program binary formats supported.";
>+MSG kNoReadFramebuffer = "No active read framebuffer.";
>+MSG kNoSampleAlphaToCoveragesLimitation = "Current renderer doesn't support alpha-to-coverage.";
>+MSG kNoSuchPath = "No such path object.";
>+MSG kNoTransformArray = "No transform array given.";
>+MSG kNoTransformFeedbackOutputVariables = "The active program has specified no output variables to record.";
>+MSG kNoZeroDivisor = "At least one enabled attribute must have a divisor of zero.";
>+MSG kNVFenceNotSupported = "GL_NV_fence is not supported";
>+MSG kObjectNotGenerated = "Object cannot be used because it has not been generated.";
>+MSG kOffsetAlignment = "offset must be a multiple of 4.";
>+MSG kOffsetAndSizeAlignment = "Offset and size must be multiple of 4.";
>+MSG kOffsetMustBeMultipleOfType = "Offset must be a multiple of the passed in datatype.";
>+MSG kOffsetMustBeMultipleOfUint = "Offset must be a multiple of the size = in basic machine units = of uint";
>+MSG kOffsetOverflow = "Offset overflows texture dimensions.";
>+MSG kOtherQueryActive = "Other query is active.";
>+MSG kOutsideOfBounds = "Parameter outside of bounds.";
>+MSG kParamOverflow = "The provided parameters overflow with the provided buffer.";
>+MSG kPixelDataNotNull = "Pixel data must be null.";
>+MSG kPixelDataNull = "Pixel data cannot be null.";
>+MSG kPixelPackBufferBoundForTransformFeedback = "It is undefined behavior to use a pixel pack buffer that is bound for transform feedback.";
>+MSG kPixelUnpackBufferBoundForTransformFeedback = "It is undefined behavior to use a pixel unpack buffer that is bound for transform feedback.";
>+MSG kPointSizeArrayExtensionNotEnabled = "GL_OES_point_size_array not enabled.";
>+MSG kProgramDoesNotExist = "Program doesn't exist.";
>+MSG kProgramInterfaceMustBeProgramOutput = "programInterface must be set to GL_PROGRAM_OUTPUT.";
>+MSG kProgramNotBound = "A program must be bound.";
>+MSG kProgramNotLinked = "Program not linked.";
>+MSG kQueryActive = "Query is active.";
>+MSG kQueryExtensionNotEnabled = "Query extension not enabled.";
>+MSG kQueryInactive = "Query is not active.";
>+MSG kQueryTargetMismatch = "Query type does not match target.";
>+MSG kReadBufferNone = "Read buffer is GL_NONE.";
>+MSG kReadBufferNotAttached = "Read buffer has no attachment.";
>+MSG kRectangleTextureCompressed = "Rectangle texture cannot have a compressed format.";
>+MSG kRelativeOffsetTooLarge = "relativeOffset cannot be greater than MAX_VERTEX_ATTRIB_RELATIVE_OFFSET.";
>+MSG kRenderableInternalFormat = "SizedInternalformat must be color-renderable = depth-renderable = or stencil-renderable.";
>+MSG kRenderbufferNotBound = "A renderbuffer must be bound.";
>+MSG kResourceMaxRenderbufferSize = "Desired resource size is greater than max renderbuffer size.";
>+MSG kResourceMaxTextureSize = "Desired resource size is greater than max texture size.";
>+MSG kSamplerFormatMismatch = "Mismatch between texture format and sampler type (signed/unsigned/float/shadow).";
>+MSG kSamplerUniformValueOutOfRange = "Sampler uniform value out of range.";
>+MSG kSamplesOutOfRange = "Samples must not be greater than maximum supported value for the format.";
>+MSG kSamplesZero = "Samples may not be zero.";
>+MSG kShaderAttachmentHasShader = "Shader attachment already has a shader.";
>+MSG kShaderSourceInvalidCharacters = "Shader source contains invalid characters.";
>+MSG kShaderStorageBufferOffsetAlignment = "Offset must be multiple of value of SHADER_STORAGE_BUFFER_OFFSET_ALIGNMENT.";
>+MSG kShaderToDetachMustBeAttached = "Shader to be detached must be currently attached to the program.";
>+MSG kSourceLevelNotDefined = "The source level of the source texture must be defined.";
>+MSG kSourceTextureLevelZeroDefined = "Source texture must level 0 defined.";
>+MSG kSourceTextureMustBeCompressed = "Source texture must have a compressed internal format.";
>+MSG kSourceTextureTooSmall = "The specified dimensions are outside of the bounds of the texture.";
>+MSG kStencilReferenceMaskOrMismatch = "Stencil reference and mask values must be the same for front facing and back facing triangles.";
>+MSG kStrideExceedsWebGLLimit = "Stride is over the maximum stride allowed by WebGL.";
>+MSG kStrideMustBeMultipleOfType = "Stride must be a multiple of the passed in datatype.";
>+MSG kSyncMissing = "Sync object does not exist.";
>+MSG kTargetMustBeTexture2DMultisampleArrayOES = "Target must be TEXTURE_2D_MULTISAMPLE_ARRAY_OES.";
>+MSG kTextureFormatMismatch = "Passed in texture target and format must match the one originally used to define the texture.";
>+MSG kTextureIsImmutable = "Texture is immutable.";
>+MSG kTextureIsNotImmutable = "Texture is not immutable.";
>+MSG kTextureNotBound = "A texture must be bound.";
>+MSG kTextureNotPow2 = "The texture is a non-power-of-two texture.";
>+MSG kTextureRectangleNotSupported = "Context does not support GL_ANGLE_texture_rectangle";
>+MSG kTextureSizeTooSmall = "Texture dimensions must all be greater than zero.";
>+MSG kTextureTargetMismatch = "Textarget must match the texture target type.";
>+MSG kTextureTargetRequiresES31 = "Texture target requires at least OpenGL ES 3.1.";
>+MSG kTextureTypeConflict = "Two textures of different types use the same sampler location.";
>+MSG kTextureTypeMismatch = "Passed in texture type must match the one originally used to define the texture.";
>+MSG kTextureWidthOrHeightOutOfRange = "Width and height must be less than or equal to GL_MAX_TEXTURE_SIZE.";
>+MSG kTransfomFeedbackAlreadyActive = "Transform feedback is already active.";
>+MSG kTransformFeedbackActiveDelete = "Attempt to delete an active transform feedback.";
>+MSG kTransformFeedbackActiveDuringLink = "Cannot link program while program is associated with an active transform feedback object.";
>+MSG kTransformFeedbackBufferDoubleBound = "A transform feedback buffer that would be written to is also bound to a non-transform-feedback target = which would cause undefined behavior.";
>+MSG kTransformFeedbackBufferMultipleOutputs = "Transform feedback has a buffer bound to multiple outputs.";
>+MSG kTransformFeedbackBufferTooSmall = "Not enough space in bound transform feedback buffers.";
>+MSG kTransformFeedbackDoesNotExist = "Transform feedback object that does not exist.";
>+MSG kTransformFeedbackNotActive = "No Transform Feedback object is active.";
>+MSG kTransformFeedbackNotPaused = "The active Transform Feedback object is not paused.";
>+MSG kTransformFeedbackPaused = "The active Transform Feedback object is paused.";
>+MSG kTransformFeedbackProgramBinary = "Cannot change program binary while program is associated with an active transform feedback object.";
>+MSG kTransformFeedbackTargetActive = "Target is TRANSFORM_FEEDBACK_BUFFER and transform feedback is currently active.";
>+MSG kTransformFeedbackUseProgram = "Cannot change active program while transform feedback is unpaused.";
>+MSG kTransformFeedbackVaryingIndexOutOfRange = "Index must be less than the transform feedback varying count in the program.";
>+MSG kTypeNotUnsignedShortByte = "Only UNSIGNED_SHORT and UNSIGNED_BYTE types are supported.";
>+MSG kUniformBufferBoundForTransformFeedback = "It is undefined behavior to use an uniform buffer that is bound for transform feedback.";
>+MSG kUniformBufferOffsetAlignment = "Offset must be multiple of value of UNIFORM_BUFFER_OFFSET_ALIGNMENT.";
>+MSG kUniformBufferTooSmall = "It is undefined behaviour to use a uniform buffer that is too small.";
>+MSG kUniformBufferUnbound = "It is undefined behaviour to have a used but unbound uniform buffer.";
>+MSG kUniformSizeMismatch = "Uniform size does not match uniform method.";
>+MSG kUniformTypeMismatch = "Uniform type does not match uniform method.";
>+MSG kUnimplementedComputeShaderPrecision = "Compute shader precision not yet implemented.";
>+MSG kUnknownParameter = "Unknown parameter value.";
>+MSG kUnsizedInternalFormatUnsupported = "Internalformat is one of the unsupported unsized base internalformats.";
>+MSG kUnsupportedDrawModeForTransformFeedback = "The draw command is unsupported when transform feedback is active and not paused.";
>+MSG kUnsupportedFloatBlending = "GL_BLEND with floating-point color attachments requires the EXT_float_blend extension.";
>+MSG kVertexArrayNoBuffer = "An enabled vertex array has no buffer.";
>+MSG kVertexArrayNoBufferPointer = "An enabled vertex array has no buffer and no pointer.";
>+MSG kVertexBufferBoundForTransformFeedback = "It is undefined behavior to use a vertex buffer that is bound for transform feedback.";
>+MSG kVertexShaderTypeMismatch = "Vertex shader input type does not match the type of the bound vertex attribute.";
>+MSG kViewportNegativeSize = "Viewport size cannot be negative.";
>+MSG kViewsExceedMaxArrayLayers = "baseViewIndex+numViews cannot be greater than GL_MAX_ARRAY_TEXTURE_LAYERS.";
>+MSG kWebgl2NameLengthLimitExceeded = "Location lengths must not be greater than 1024 characters.";
>+MSG kWebglBindAttribLocationReservedPrefix = "Attributes that begin with 'webgl_' = or '_webgl_' are not allowed.";
>+MSG kWebglNameLengthLimitExceeded = "Location name lengths must not be greater than 256 characters.";
>+MSG kZeroBoundToTarget = "Zero is bound to target.";
>+// clang-format on
>+
>+#undef MSG
>+}  // namespace err
>+}  // namespace gl
> #endif  // LIBANGLE_ERRORSTRINGS_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/Fence.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/Fence.cpp
>index 9c4d3816737..50c6948fb61 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/Fence.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/Fence.cpp
>@@ -4,8 +4,7 @@
> // found in the LICENSE file.
> //
> 
>-// Fence.cpp: Implements the gl::FenceNV and gl::Sync classes, which support the GL_NV_fence
>-// extension and GLES3 sync objects.
>+// Fence.cpp: Implements the gl::FenceNV and gl::Sync classes.
> 
> #include "libANGLE/Fence.h"
> 
>@@ -19,59 +18,43 @@ namespace gl
> {
> 
> FenceNV::FenceNV(rx::FenceNVImpl *impl)
>-    : mFence(impl),
>-      mIsSet(false),
>-      mStatus(GL_FALSE),
>-      mCondition(GL_NONE)
>-{
>-}
>+    : mFence(impl), mIsSet(false), mStatus(GL_FALSE), mCondition(GL_NONE)
>+{}
> 
> FenceNV::~FenceNV()
> {
>     SafeDelete(mFence);
> }
> 
>-Error FenceNV::set(GLenum condition)
>+angle::Result FenceNV::set(const Context *context, GLenum condition)
> {
>-    Error error = mFence->set(condition);
>-    if (error.isError())
>-    {
>-        return error;
>-    }
>+    ANGLE_TRY(mFence->set(context, condition));
> 
>     mCondition = condition;
>-    mStatus = GL_FALSE;
>-    mIsSet = true;
>+    mStatus    = GL_FALSE;
>+    mIsSet     = true;
> 
>-    return NoError();
>+    return angle::Result::Continue;
> }
> 
>-Error FenceNV::test(GLboolean *outResult)
>+angle::Result FenceNV::test(const Context *context, GLboolean *outResult)
> {
>     // Flush the command buffer by default
>-    Error error = mFence->test(&mStatus);
>-    if (error.isError())
>-    {
>-        return error;
>-    }
>+    ANGLE_TRY(mFence->test(context, &mStatus));
> 
>     *outResult = mStatus;
>-    return NoError();
>+    return angle::Result::Continue;
> }
> 
>-Error FenceNV::finish()
>+angle::Result FenceNV::finish(const Context *context)
> {
>     ASSERT(mIsSet);
> 
>-    gl::Error error = mFence->finish();
>-    if (error.isError())
>-    {
>-        return error;
>-    }
>+    ANGLE_TRY(mFence->finish(context));
> 
>     mStatus = GL_TRUE;
> 
>-    return NoError();
>+    return angle::Result::Continue;
> }
> 
> Sync::Sync(rx::SyncImpl *impl, GLuint id)
>@@ -80,12 +63,12 @@ Sync::Sync(rx::SyncImpl *impl, GLuint id)
>       mLabel(),
>       mCondition(GL_SYNC_GPU_COMMANDS_COMPLETE),
>       mFlags(0)
>-{
>-}
>+{}
> 
>-Error Sync::onDestroy(const Context *context)
>+void Sync::onDestroy(const Context *context)
> {
>-    return NoError();
>+    ASSERT(mFence);
>+    mFence->onDestroy(context);
> }
> 
> Sync::~Sync()
>@@ -93,7 +76,7 @@ Sync::~Sync()
>     SafeDelete(mFence);
> }
> 
>-void Sync::setLabel(const std::string &label)
>+void Sync::setLabel(const Context *context, const std::string &label)
> {
>     mLabel = label;
> }
>@@ -103,33 +86,32 @@ const std::string &Sync::getLabel() const
>     return mLabel;
> }
> 
>-Error Sync::set(GLenum condition, GLbitfield flags)
>+angle::Result Sync::set(const Context *context, GLenum condition, GLbitfield flags)
> {
>-    Error error = mFence->set(condition, flags);
>-    if (error.isError())
>-    {
>-        return error;
>-    }
>+    ANGLE_TRY(mFence->set(context, condition, flags));
> 
>     mCondition = condition;
>-    mFlags = flags;
>-    return NoError();
>+    mFlags     = flags;
>+    return angle::Result::Continue;
> }
> 
>-Error Sync::clientWait(GLbitfield flags, GLuint64 timeout, GLenum *outResult)
>+angle::Result Sync::clientWait(const Context *context,
>+                               GLbitfield flags,
>+                               GLuint64 timeout,
>+                               GLenum *outResult)
> {
>     ASSERT(mCondition != GL_NONE);
>-    return mFence->clientWait(flags, timeout, outResult);
>+    return mFence->clientWait(context, flags, timeout, outResult);
> }
> 
>-Error Sync::serverWait(GLbitfield flags, GLuint64 timeout)
>+angle::Result Sync::serverWait(const Context *context, GLbitfield flags, GLuint64 timeout)
> {
>-    return mFence->serverWait(flags, timeout);
>+    return mFence->serverWait(context, flags, timeout);
> }
> 
>-Error Sync::getStatus(GLint *outResult) const
>+angle::Result Sync::getStatus(const Context *context, GLint *outResult) const
> {
>-    return mFence->getStatus(outResult);
>+    return mFence->getStatus(context, outResult);
> }
> 
> }  // namespace gl
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/Fence.h b/Source/ThirdParty/ANGLE/src/libANGLE/Fence.h
>index 24bc689ca3b..abd30bfbbaf 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/Fence.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/Fence.h
>@@ -20,7 +20,7 @@ namespace rx
> {
> class FenceNVImpl;
> class SyncImpl;
>-}
>+}  // namespace rx
> 
> namespace gl
> {
>@@ -31,9 +31,9 @@ class FenceNV final : angle::NonCopyable
>     explicit FenceNV(rx::FenceNVImpl *impl);
>     virtual ~FenceNV();
> 
>-    Error set(GLenum condition);
>-    Error test(GLboolean *outResult);
>-    Error finish();
>+    angle::Result set(const Context *context, GLenum condition);
>+    angle::Result test(const Context *context, GLboolean *outResult);
>+    angle::Result finish(const Context *context);
> 
>     bool isSet() const { return mIsSet; }
>     GLboolean getStatus() const { return mStatus; }
>@@ -54,15 +54,18 @@ class Sync final : public RefCountObject, public LabeledObject
>     Sync(rx::SyncImpl *impl, GLuint id);
>     ~Sync() override;
> 
>-    Error onDestroy(const Context *context) override;
>+    void onDestroy(const Context *context) override;
> 
>-    void setLabel(const std::string &label) override;
>+    void setLabel(const Context *context, const std::string &label) override;
>     const std::string &getLabel() const override;
> 
>-    Error set(GLenum condition, GLbitfield flags);
>-    Error clientWait(GLbitfield flags, GLuint64 timeout, GLenum *outResult);
>-    Error serverWait(GLbitfield flags, GLuint64 timeout);
>-    Error getStatus(GLint *outResult) const;
>+    angle::Result set(const Context *context, GLenum condition, GLbitfield flags);
>+    angle::Result clientWait(const Context *context,
>+                             GLbitfield flags,
>+                             GLuint64 timeout,
>+                             GLenum *outResult);
>+    angle::Result serverWait(const Context *context, GLbitfield flags, GLuint64 timeout);
>+    angle::Result getStatus(const Context *context, GLint *outResult) const;
> 
>     GLenum getCondition() const { return mCondition; }
>     GLbitfield getFlags() const { return mFlags; }
>@@ -78,4 +81,4 @@ class Sync final : public RefCountObject, public LabeledObject
> 
> }  // namespace gl
> 
>-#endif   // LIBANGLE_FENCE_H_
>+#endif  // LIBANGLE_FENCE_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/Fence_unittest.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/Fence_unittest.cpp
>index edc550103e1..6dd6fb55007 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/Fence_unittest.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/Fence_unittest.cpp
>@@ -6,6 +6,7 @@
> 
> #include "gmock/gmock.h"
> #include "gtest/gtest.h"
>+
> #include "libANGLE/Fence.h"
> #include "libANGLE/renderer/FenceNVImpl.h"
> #include "libANGLE/renderer/SyncImpl.h"
>@@ -14,7 +15,8 @@ using ::testing::_;
> using ::testing::Return;
> using ::testing::SetArgumentPointee;
> 
>-namespace {
>+namespace
>+{
> 
> //
> // FenceNV tests
>@@ -25,9 +27,9 @@ class MockFenceNVImpl : public rx::FenceNVImpl
>   public:
>     virtual ~MockFenceNVImpl() { destroy(); }
> 
>-    MOCK_METHOD1(set, gl::Error(GLenum));
>-    MOCK_METHOD1(test, gl::Error(GLboolean *));
>-    MOCK_METHOD0(finish, gl::Error());
>+    MOCK_METHOD2(set, angle::Result(const gl::Context *, GLenum));
>+    MOCK_METHOD2(test, angle::Result(const gl::Context *, GLboolean *));
>+    MOCK_METHOD1(finish, angle::Result(const gl::Context *));
> 
>     MOCK_METHOD0(destroy, void());
> };
>@@ -42,21 +44,18 @@ class FenceNVTest : public testing::Test
>         mFence = new gl::FenceNV(mImpl);
>     }
> 
>-    virtual void TearDown()
>-    {
>-        delete mFence;
>-    }
>+    virtual void TearDown() { delete mFence; }
> 
>     MockFenceNVImpl *mImpl;
>-    gl::FenceNV* mFence;
>+    gl::FenceNV *mFence;
> };
> 
> TEST_F(FenceNVTest, DestructionDeletesImpl)
> {
>-    MockFenceNVImpl* impl = new MockFenceNVImpl;
>+    MockFenceNVImpl *impl = new MockFenceNVImpl;
>     EXPECT_CALL(*impl, destroy()).Times(1).RetiresOnSaturation();
> 
>-    gl::FenceNV* fence = new gl::FenceNV(impl);
>+    gl::FenceNV *fence = new gl::FenceNV(impl);
>     delete fence;
> 
>     // Only needed because the mock is leaked if bugs are present,
>@@ -67,19 +66,21 @@ TEST_F(FenceNVTest, DestructionDeletesImpl)
> 
> TEST_F(FenceNVTest, SetAndTestBehavior)
> {
>-    EXPECT_CALL(*mImpl, set(_)).WillOnce(Return(gl::NoError())).RetiresOnSaturation();
>+    EXPECT_CALL(*mImpl, set(_, _)).WillOnce(Return(angle::Result::Continue)).RetiresOnSaturation();
>     EXPECT_FALSE(mFence->isSet());
>-    EXPECT_FALSE(mFence->set(GL_ALL_COMPLETED_NV).isError());
>+    EXPECT_EQ(angle::Result::Continue, mFence->set(nullptr, GL_ALL_COMPLETED_NV));
>     EXPECT_TRUE(mFence->isSet());
>     // Fake the behavior of testing the fence before and after it's passed.
>-    EXPECT_CALL(*mImpl, test(_))
>-        .WillOnce(DoAll(SetArgumentPointee<0>(GL_FALSE), Return(gl::NoError())))
>-        .WillOnce(DoAll(SetArgumentPointee<0>(GL_TRUE), Return(gl::NoError())))
>+    EXPECT_CALL(*mImpl, test(_, _))
>+        .WillOnce(DoAll(SetArgumentPointee<1>(static_cast<GLboolean>(GL_FALSE)),
>+                        Return(angle::Result::Continue)))
>+        .WillOnce(DoAll(SetArgumentPointee<1>(static_cast<GLboolean>(GL_TRUE)),
>+                        Return(angle::Result::Continue)))
>         .RetiresOnSaturation();
>     GLboolean out;
>-    EXPECT_FALSE(mFence->test(&out).isError());
>+    EXPECT_EQ(angle::Result::Continue, mFence->test(nullptr, &out));
>     EXPECT_EQ(GL_FALSE, out);
>-    EXPECT_FALSE(mFence->test(&out).isError());
>+    EXPECT_EQ(angle::Result::Continue, mFence->test(nullptr, &out));
>     EXPECT_EQ(GL_TRUE, out);
> }
> 
>@@ -92,10 +93,10 @@ class MockSyncImpl : public rx::SyncImpl
>   public:
>     virtual ~MockSyncImpl() { destroy(); }
> 
>-    MOCK_METHOD2(set, gl::Error(GLenum, GLbitfield));
>-    MOCK_METHOD3(clientWait, gl::Error(GLbitfield, GLuint64, GLenum *));
>-    MOCK_METHOD2(serverWait, gl::Error(GLbitfield, GLuint64));
>-    MOCK_METHOD1(getStatus, gl::Error(GLint *));
>+    MOCK_METHOD3(set, angle::Result(const gl::Context *, GLenum, GLbitfield));
>+    MOCK_METHOD4(clientWait, angle::Result(const gl::Context *, GLbitfield, GLuint64, GLenum *));
>+    MOCK_METHOD3(serverWait, angle::Result(const gl::Context *, GLbitfield, GLuint64));
>+    MOCK_METHOD2(getStatus, angle::Result(const gl::Context *, GLint *));
> 
>     MOCK_METHOD0(destroy, void());
> };
>@@ -134,19 +135,21 @@ TEST_F(FenceSyncTest, DestructionDeletesImpl)
> 
> TEST_F(FenceSyncTest, SetAndGetStatusBehavior)
> {
>-    EXPECT_CALL(*mImpl, set(_, _)).WillOnce(Return(gl::NoError())).RetiresOnSaturation();
>-    EXPECT_FALSE(mFence->set(GL_SYNC_GPU_COMMANDS_COMPLETE, 0).isError());
>+    EXPECT_CALL(*mImpl, set(_, _, _))
>+        .WillOnce(Return(angle::Result::Continue))
>+        .RetiresOnSaturation();
>+    EXPECT_EQ(angle::Result::Continue, mFence->set(nullptr, GL_SYNC_GPU_COMMANDS_COMPLETE, 0));
>     EXPECT_EQ(static_cast<GLenum>(GL_SYNC_GPU_COMMANDS_COMPLETE), mFence->getCondition());
>     // Fake the behavior of testing the fence before and after it's passed.
>-    EXPECT_CALL(*mImpl, getStatus(_))
>-        .WillOnce(DoAll(SetArgumentPointee<0>(GL_UNSIGNALED), Return(gl::NoError())))
>-        .WillOnce(DoAll(SetArgumentPointee<0>(GL_SIGNALED), Return(gl::NoError())))
>+    EXPECT_CALL(*mImpl, getStatus(_, _))
>+        .WillOnce(DoAll(SetArgumentPointee<1>(GL_UNSIGNALED), Return(angle::Result::Continue)))
>+        .WillOnce(DoAll(SetArgumentPointee<1>(GL_SIGNALED), Return(angle::Result::Continue)))
>         .RetiresOnSaturation();
>     GLint out;
>-    EXPECT_FALSE(mFence->getStatus(&out).isError());
>+    EXPECT_EQ(angle::Result::Continue, mFence->getStatus(nullptr, &out));
>     EXPECT_EQ(GL_UNSIGNALED, out);
>-    EXPECT_FALSE(mFence->getStatus(&out).isError());
>+    EXPECT_EQ(angle::Result::Continue, mFence->getStatus(nullptr, &out));
>     EXPECT_EQ(GL_SIGNALED, out);
> }
> 
>-} // namespace
>+}  // namespace
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/Framebuffer.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/Framebuffer.cpp
>index 48e71685b32..cfc8cd02d89 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/Framebuffer.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/Framebuffer.cpp
>@@ -19,6 +19,7 @@
> #include "libANGLE/Renderbuffer.h"
> #include "libANGLE/Surface.h"
> #include "libANGLE/Texture.h"
>+#include "libANGLE/angletypes.h"
> #include "libANGLE/formatutils.h"
> #include "libANGLE/renderer/ContextImpl.h"
> #include "libANGLE/renderer/FramebufferImpl.h"
>@@ -34,11 +35,6 @@ namespace gl
> namespace
> {
> 
>-void BindResourceChannel(OnAttachmentDirtyBinding *binding, FramebufferAttachmentObject *resource)
>-{
>-    binding->bind(resource ? resource->getDirtyChannel() : nullptr);
>-}
>-
> bool CheckMultiviewStateMatchesForCompleteness(const FramebufferAttachment *firstAttachment,
>                                                const FramebufferAttachment *secondAttachment)
> {
>@@ -53,12 +49,7 @@ bool CheckMultiviewStateMatchesForCompleteness(const FramebufferAttachment *firs
>     {
>         return false;
>     }
>-    if (firstAttachment->getMultiviewLayout() != secondAttachment->getMultiviewLayout())
>-    {
>-        return false;
>-    }
>-    if (firstAttachment->getMultiviewViewportOffsets() !=
>-        secondAttachment->getMultiviewViewportOffsets())
>+    if (firstAttachment->isMultiview() != secondAttachment->isMultiview())
>     {
>         return false;
>     }
>@@ -75,17 +66,33 @@ bool CheckAttachmentCompleteness(const Context *context, const FramebufferAttach
>         return false;
>     }
> 
>-    const InternalFormat &format = *attachment.getFormat().info;
>-    if (!format.renderSupport(context->getClientVersion(), context->getExtensions()))
>+    if (!attachment.isRenderable(context))
>     {
>         return false;
>     }
> 
>     if (attachment.type() == GL_TEXTURE)
>     {
>-        if (attachment.layer() >= size.depth)
>+        // [EXT_geometry_shader] Section 9.4.1, "Framebuffer Completeness"
>+        // If <image> is a three-dimensional texture or a two-dimensional array texture and the
>+        // attachment is not layered, the selected layer is less than the depth or layer count,
>+        // respectively, of the texture.
>+        if (!attachment.isLayered())
>         {
>-            return false;
>+            if (attachment.layer() >= size.depth)
>+            {
>+                return false;
>+            }
>+        }
>+        // If <image> is a three-dimensional texture or a two-dimensional array texture and the
>+        // attachment is layered, the depth or layer count, respectively, of the texture is less
>+        // than or equal to the value of MAX_FRAMEBUFFER_LAYERS_EXT.
>+        else
>+        {
>+            if (static_cast<GLuint>(size.depth) >= context->getCaps().maxFramebufferLayers)
>+            {
>+                return false;
>+            }
>         }
> 
>         // ES3 specifies that cube map texture attachments must be cube complete.
>@@ -94,7 +101,7 @@ bool CheckAttachmentCompleteness(const Context *context, const FramebufferAttach
>         // TODO(jmadill): Check if OpenGL ES2 drivers enforce cube completeness.
>         const Texture *texture = attachment.getTexture();
>         ASSERT(texture);
>-        if (texture->getTarget() == GL_TEXTURE_CUBE_MAP &&
>+        if (texture->getType() == TextureType::CubeMap &&
>             !texture->getTextureState().isCubeComplete())
>         {
>             return false;
>@@ -131,7 +138,7 @@ bool CheckAttachmentCompleteness(const Context *context, const FramebufferAttach
>     }
> 
>     return true;
>-};
>+}
> 
> bool CheckAttachmentSampleCompleteness(const Context *context,
>                                        const FramebufferAttachment &attachment,
>@@ -147,11 +154,7 @@ bool CheckAttachmentSampleCompleteness(const Context *context,
>         ASSERT(texture);
> 
>         const ImageIndex &attachmentImageIndex = attachment.getTextureImageIndex();
>-
>-        // ES3.1 (section 9.4) requires that the value of TEXTURE_FIXED_SAMPLE_LOCATIONS should be
>-        // the same for all attached textures.
>-        bool fixedSampleloc = texture->getFixedSampleLocations(attachmentImageIndex.type,
>-                                                               attachmentImageIndex.mipIndex);
>+        bool fixedSampleloc = texture->getAttachmentFixedSampleLocations(attachmentImageIndex);
>         if (fixedSampleLocations->valid() && fixedSampleloc != fixedSampleLocations->value())
>         {
>             return false;
>@@ -198,23 +201,23 @@ bool CheckAttachmentSampleCompleteness(const Context *context,
> 
> // Needed to index into the attachment arrays/bitsets.
> static_assert(static_cast<size_t>(IMPLEMENTATION_MAX_FRAMEBUFFER_ATTACHMENTS) ==
>-                  gl::Framebuffer::DIRTY_BIT_COLOR_ATTACHMENT_MAX,
>+                  Framebuffer::DIRTY_BIT_COLOR_ATTACHMENT_MAX,
>               "Framebuffer Dirty bit mismatch");
> static_assert(static_cast<size_t>(IMPLEMENTATION_MAX_FRAMEBUFFER_ATTACHMENTS) ==
>-                  gl::Framebuffer::DIRTY_BIT_DEPTH_ATTACHMENT,
>+                  Framebuffer::DIRTY_BIT_DEPTH_ATTACHMENT,
>               "Framebuffer Dirty bit mismatch");
> static_assert(static_cast<size_t>(IMPLEMENTATION_MAX_FRAMEBUFFER_ATTACHMENTS + 1) ==
>-                  gl::Framebuffer::DIRTY_BIT_STENCIL_ATTACHMENT,
>+                  Framebuffer::DIRTY_BIT_STENCIL_ATTACHMENT,
>               "Framebuffer Dirty bit mismatch");
> 
>-Error InitAttachment(const Context *context, FramebufferAttachment *attachment)
>+angle::Result InitAttachment(const Context *context, FramebufferAttachment *attachment)
> {
>     ASSERT(attachment->isAttached());
>     if (attachment->initState() == InitState::MayNeedInit)
>     {
>         ANGLE_TRY(attachment->initializeContents(context));
>     }
>-    return NoError();
>+    return angle::Result::Continue;
> }
> 
> bool IsColorMaskedOut(const BlendState &blend)
>@@ -238,14 +241,14 @@ bool IsClearBufferMaskedOut(const Context *context, GLenum buffer)
>     switch (buffer)
>     {
>         case GL_COLOR:
>-            return IsColorMaskedOut(context->getGLState().getBlendState());
>+            return IsColorMaskedOut(context->getState().getBlendState());
>         case GL_DEPTH:
>-            return IsDepthMaskedOut(context->getGLState().getDepthStencilState());
>+            return IsDepthMaskedOut(context->getState().getDepthStencilState());
>         case GL_STENCIL:
>-            return IsStencilMaskedOut(context->getGLState().getDepthStencilState());
>+            return IsStencilMaskedOut(context->getState().getDepthStencilState());
>         case GL_DEPTH_STENCIL:
>-            return IsDepthMaskedOut(context->getGLState().getDepthStencilState()) &&
>-                   IsStencilMaskedOut(context->getGLState().getDepthStencilState());
>+            return IsDepthMaskedOut(context->getState().getDepthStencilState()) &&
>+                   IsStencilMaskedOut(context->getState().getDepthStencilState());
>         default:
>             UNREACHABLE();
>             return true;
>@@ -256,51 +259,60 @@ bool IsClearBufferMaskedOut(const Context *context, GLenum buffer)
> 
> // This constructor is only used for default framebuffers.
> FramebufferState::FramebufferState()
>-    : mLabel(),
>+    : mId(0),
>+      mLabel(),
>       mColorAttachments(1),
>       mDrawBufferStates(1, GL_BACK),
>       mReadBufferState(GL_BACK),
>+      mDrawBufferTypeMask(),
>       mDefaultWidth(0),
>       mDefaultHeight(0),
>       mDefaultSamples(0),
>       mDefaultFixedSampleLocations(GL_FALSE),
>+      mDefaultLayers(0),
>       mWebGLDepthStencilConsistent(true)
> {
>     ASSERT(mDrawBufferStates.size() > 0);
>     mEnabledDrawBuffers.set(0);
> }
> 
>-FramebufferState::FramebufferState(const Caps &caps)
>-    : mLabel(),
>+FramebufferState::FramebufferState(const Caps &caps, GLuint id)
>+    : mId(id),
>+      mLabel(),
>       mColorAttachments(caps.maxColorAttachments),
>       mDrawBufferStates(caps.maxDrawBuffers, GL_NONE),
>       mReadBufferState(GL_COLOR_ATTACHMENT0_EXT),
>+      mDrawBufferTypeMask(),
>       mDefaultWidth(0),
>       mDefaultHeight(0),
>       mDefaultSamples(0),
>       mDefaultFixedSampleLocations(GL_FALSE),
>+      mDefaultLayers(0),
>       mWebGLDepthStencilConsistent(true)
> {
>+    ASSERT(mId != 0);
>     ASSERT(mDrawBufferStates.size() > 0);
>     mDrawBufferStates[0] = GL_COLOR_ATTACHMENT0_EXT;
> }
> 
>-FramebufferState::~FramebufferState()
>-{
>-}
>+FramebufferState::~FramebufferState() {}
> 
> const std::string &FramebufferState::getLabel()
> {
>     return mLabel;
> }
> 
>-const FramebufferAttachment *FramebufferState::getAttachment(GLenum attachment) const
>+const FramebufferAttachment *FramebufferState::getAttachment(const Context *context,
>+                                                             GLenum attachment) const
> {
>     if (attachment >= GL_COLOR_ATTACHMENT0 && attachment <= GL_COLOR_ATTACHMENT15)
>     {
>         return getColorAttachment(attachment - GL_COLOR_ATTACHMENT0);
>     }
> 
>+    // WebGL1 allows a developer to query for attachment parameters even when "inconsistant" (i.e.
>+    // multiple conflicting attachment points) and requires us to return the framebuffer attachment
>+    // associated with WebGL.
>     switch (attachment)
>     {
>         case GL_COLOR:
>@@ -308,13 +320,34 @@ const FramebufferAttachment *FramebufferState::getAttachment(GLenum attachment)
>             return getColorAttachment(0);
>         case GL_DEPTH:
>         case GL_DEPTH_ATTACHMENT:
>-            return getDepthAttachment();
>+            if (context->isWebGL1())
>+            {
>+                return getWebGLDepthAttachment();
>+            }
>+            else
>+            {
>+                return getDepthAttachment();
>+            }
>         case GL_STENCIL:
>         case GL_STENCIL_ATTACHMENT:
>-            return getStencilAttachment();
>+            if (context->isWebGL1())
>+            {
>+                return getWebGLStencilAttachment();
>+            }
>+            else
>+            {
>+                return getStencilAttachment();
>+            }
>         case GL_DEPTH_STENCIL:
>         case GL_DEPTH_STENCIL_ATTACHMENT:
>-            return getDepthStencilAttachment();
>+            if (context->isWebGL1())
>+            {
>+                return getWebGLDepthStencilAttachment();
>+            }
>+            else
>+            {
>+                return getDepthStencilAttachment();
>+            }
>         default:
>             UNREACHABLE();
>             return nullptr;
>@@ -399,11 +432,26 @@ const FramebufferAttachment *FramebufferState::getDepthAttachment() const
>     return mDepthAttachment.isAttached() ? &mDepthAttachment : nullptr;
> }
> 
>+const FramebufferAttachment *FramebufferState::getWebGLDepthAttachment() const
>+{
>+    return mWebGLDepthAttachment.isAttached() ? &mWebGLDepthAttachment : nullptr;
>+}
>+
>+const FramebufferAttachment *FramebufferState::getWebGLDepthStencilAttachment() const
>+{
>+    return mWebGLDepthStencilAttachment.isAttached() ? &mWebGLDepthStencilAttachment : nullptr;
>+}
>+
> const FramebufferAttachment *FramebufferState::getStencilAttachment() const
> {
>     return mStencilAttachment.isAttached() ? &mStencilAttachment : nullptr;
> }
> 
>+const FramebufferAttachment *FramebufferState::getWebGLStencilAttachment() const
>+{
>+    return mWebGLStencilAttachment.isAttached() ? &mWebGLStencilAttachment : nullptr;
>+}
>+
> const FramebufferAttachment *FramebufferState::getDepthStencilAttachment() const
> {
>     // A valid depth-stencil attachment has the same resource bound to both the
>@@ -454,7 +502,15 @@ bool FramebufferState::attachmentsHaveSameDimensions() const
>     return !hasMismatchedSize(mStencilAttachment);
> }
> 
>-const gl::FramebufferAttachment *FramebufferState::getDrawBuffer(size_t drawBufferIdx) const
>+bool FramebufferState::hasSeparateDepthAndStencilAttachments() const
>+{
>+    // if we have both a depth and stencil buffer, they must refer to the same object
>+    // since we only support packed_depth_stencil and not separate depth and stencil
>+    return (getDepthAttachment() != nullptr && getStencilAttachment() != nullptr &&
>+            getDepthStencilAttachment() == nullptr);
>+}
>+
>+const FramebufferAttachment *FramebufferState::getDrawBuffer(size_t drawBufferIdx) const
> {
>     ASSERT(drawBufferIdx < mDrawBufferStates.size());
>     if (mDrawBufferStates[drawBufferIdx] != GL_NONE)
>@@ -463,7 +519,15 @@ const gl::FramebufferAttachment *FramebufferState::getDrawBuffer(size_t drawBuff
>         // must be COLOR_ATTACHMENTi or NONE"
>         ASSERT(mDrawBufferStates[drawBufferIdx] == GL_COLOR_ATTACHMENT0 + drawBufferIdx ||
>                (drawBufferIdx == 0 && mDrawBufferStates[drawBufferIdx] == GL_BACK));
>-        return getAttachment(mDrawBufferStates[drawBufferIdx]);
>+
>+        if (mDrawBufferStates[drawBufferIdx] == GL_BACK)
>+        {
>+            return getColorAttachment(0);
>+        }
>+        else
>+        {
>+            return getColorAttachment(mDrawBufferStates[drawBufferIdx] - GL_COLOR_ATTACHMENT0);
>+        }
>     }
>     else
>     {
>@@ -481,7 +545,7 @@ bool FramebufferState::colorAttachmentsAreUniqueImages() const
>     for (size_t firstAttachmentIdx = 0; firstAttachmentIdx < mColorAttachments.size();
>          firstAttachmentIdx++)
>     {
>-        const gl::FramebufferAttachment &firstAttachment = mColorAttachments[firstAttachmentIdx];
>+        const FramebufferAttachment &firstAttachment = mColorAttachments[firstAttachmentIdx];
>         if (!firstAttachment.isAttached())
>         {
>             continue;
>@@ -490,8 +554,7 @@ bool FramebufferState::colorAttachmentsAreUniqueImages() const
>         for (size_t secondAttachmentIdx = firstAttachmentIdx + 1;
>              secondAttachmentIdx < mColorAttachments.size(); secondAttachmentIdx++)
>         {
>-            const gl::FramebufferAttachment &secondAttachment =
>-                mColorAttachments[secondAttachmentIdx];
>+            const FramebufferAttachment &secondAttachment = mColorAttachments[secondAttachmentIdx];
>             if (!secondAttachment.isAttached())
>             {
>                 continue;
>@@ -517,34 +580,14 @@ bool FramebufferState::hasStencil() const
>     return (mStencilAttachment.isAttached() && mStencilAttachment.getStencilSize() > 0);
> }
> 
>-GLsizei FramebufferState::getNumViews() const
>+bool FramebufferState::isMultiview() const
> {
>     const FramebufferAttachment *attachment = getFirstNonNullAttachment();
>     if (attachment == nullptr)
>     {
>-        return FramebufferAttachment::kDefaultNumViews;
>-    }
>-    return attachment->getNumViews();
>-}
>-
>-const std::vector<Offset> *FramebufferState::getViewportOffsets() const
>-{
>-    const FramebufferAttachment *attachment = getFirstNonNullAttachment();
>-    if (attachment == nullptr)
>-    {
>-        return nullptr;
>-    }
>-    return &attachment->getMultiviewViewportOffsets();
>-}
>-
>-GLenum FramebufferState::getMultiviewLayout() const
>-{
>-    const FramebufferAttachment *attachment = getFirstNonNullAttachment();
>-    if (attachment == nullptr)
>-    {
>-        return GL_NONE;
>+        return false;
>     }
>-    return attachment->getMultiviewLayout();
>+    return attachment->isMultiview();
> }
> 
> int FramebufferState::getBaseViewIndex() const
>@@ -566,14 +609,12 @@ Box FramebufferState::getDimensions() const
> }
> 
> Framebuffer::Framebuffer(const Caps &caps, rx::GLImplFactory *factory, GLuint id)
>-    : mState(caps),
>+    : mState(caps, id),
>       mImpl(factory->createFramebuffer(mState)),
>-      mId(id),
>       mCachedStatus(),
>       mDirtyDepthAttachmentBinding(this, DIRTY_BIT_DEPTH_ATTACHMENT),
>       mDirtyStencilAttachmentBinding(this, DIRTY_BIT_STENCIL_ATTACHMENT)
> {
>-    ASSERT(mId != 0);
>     ASSERT(mImpl != nullptr);
>     ASSERT(mState.mColorAttachments.size() == static_cast<size_t>(caps.maxColorAttachments));
> 
>@@ -584,10 +625,9 @@ Framebuffer::Framebuffer(const Caps &caps, rx::GLImplFactory *factory, GLuint id
>     }
> }
> 
>-Framebuffer::Framebuffer(const egl::Display *display, egl::Surface *surface)
>+Framebuffer::Framebuffer(const Context *context, egl::Surface *surface)
>     : mState(),
>-      mImpl(surface->getImplementation()->createDefaultFramebuffer(mState)),
>-      mId(0),
>+      mImpl(surface->getImplementation()->createDefaultFramebuffer(context, mState)),
>       mCachedStatus(GL_FRAMEBUFFER_COMPLETE),
>       mDirtyDepthAttachmentBinding(this, DIRTY_BIT_DEPTH_ATTACHMENT),
>       mDirtyStencilAttachmentBinding(this, DIRTY_BIT_STENCIL_ATTACHMENT)
>@@ -595,43 +635,35 @@ Framebuffer::Framebuffer(const egl::Display *display, egl::Surface *surface)
>     ASSERT(mImpl != nullptr);
>     mDirtyColorAttachmentBindings.emplace_back(this, DIRTY_BIT_COLOR_ATTACHMENT_0);
> 
>-    const Context *proxyContext = display->getProxyContext();
>-
>-    setAttachmentImpl(proxyContext, GL_FRAMEBUFFER_DEFAULT, GL_BACK, gl::ImageIndex::MakeInvalid(),
>-                      surface, FramebufferAttachment::kDefaultNumViews,
>-                      FramebufferAttachment::kDefaultBaseViewIndex,
>-                      FramebufferAttachment::kDefaultMultiviewLayout,
>-                      FramebufferAttachment::kDefaultViewportOffsets);
>+    setAttachmentImpl(context, GL_FRAMEBUFFER_DEFAULT, GL_BACK, ImageIndex(), surface,
>+                      FramebufferAttachment::kDefaultNumViews,
>+                      FramebufferAttachment::kDefaultBaseViewIndex, false);
> 
>     if (surface->getConfig()->depthSize > 0)
>     {
>-        setAttachmentImpl(
>-            proxyContext, GL_FRAMEBUFFER_DEFAULT, GL_DEPTH, gl::ImageIndex::MakeInvalid(), surface,
>-            FramebufferAttachment::kDefaultNumViews, FramebufferAttachment::kDefaultBaseViewIndex,
>-            FramebufferAttachment::kDefaultMultiviewLayout,
>-            FramebufferAttachment::kDefaultViewportOffsets);
>+        setAttachmentImpl(context, GL_FRAMEBUFFER_DEFAULT, GL_DEPTH, ImageIndex(), surface,
>+                          FramebufferAttachment::kDefaultNumViews,
>+                          FramebufferAttachment::kDefaultBaseViewIndex, false);
>     }
> 
>     if (surface->getConfig()->stencilSize > 0)
>     {
>-        setAttachmentImpl(proxyContext, GL_FRAMEBUFFER_DEFAULT, GL_STENCIL,
>-                          gl::ImageIndex::MakeInvalid(), surface,
>+        setAttachmentImpl(context, GL_FRAMEBUFFER_DEFAULT, GL_STENCIL, ImageIndex(), surface,
>                           FramebufferAttachment::kDefaultNumViews,
>-                          FramebufferAttachment::kDefaultBaseViewIndex,
>-                          FramebufferAttachment::kDefaultMultiviewLayout,
>-                          FramebufferAttachment::kDefaultViewportOffsets);
>+                          FramebufferAttachment::kDefaultBaseViewIndex, false);
>     }
>+    SetComponentTypeMask(getDrawbufferWriteType(0), 0, &mState.mDrawBufferTypeMask);
> }
> 
> Framebuffer::Framebuffer(rx::GLImplFactory *factory)
>     : mState(),
>       mImpl(factory->createFramebuffer(mState)),
>-      mId(0),
>       mCachedStatus(GL_FRAMEBUFFER_UNDEFINED_OES),
>       mDirtyDepthAttachmentBinding(this, DIRTY_BIT_DEPTH_ATTACHMENT),
>       mDirtyStencilAttachmentBinding(this, DIRTY_BIT_STENCIL_ATTACHMENT)
> {
>     mDirtyColorAttachmentBindings.emplace_back(this, DIRTY_BIT_COLOR_ATTACHMENT_0);
>+    SetComponentTypeMask(getDrawbufferWriteType(0), 0, &mState.mDrawBufferTypeMask);
> }
> 
> Framebuffer::~Framebuffer()
>@@ -654,12 +686,7 @@ void Framebuffer::onDestroy(const Context *context)
>     mImpl->destroy(context);
> }
> 
>-void Framebuffer::destroyDefault(const egl::Display *display)
>-{
>-    mImpl->destroyDefault(display);
>-}
>-
>-void Framebuffer::setLabel(const std::string &label)
>+void Framebuffer::setLabel(const Context *context, const std::string &label)
> {
>     mState.mLabel = label;
> }
>@@ -686,7 +713,7 @@ bool Framebuffer::detachResourceById(const Context *context, GLenum resourceType
>     for (size_t colorIndex = 0; colorIndex < mState.mColorAttachments.size(); ++colorIndex)
>     {
>         if (detachMatchingAttachment(context, &mState.mColorAttachments[colorIndex], resourceType,
>-                                     resourceId, DIRTY_BIT_COLOR_ATTACHMENT_0 + colorIndex))
>+                                     resourceId))
>         {
>             found = true;
>         }
>@@ -699,23 +726,19 @@ bool Framebuffer::detachResourceById(const Context *context, GLenum resourceType
>              &mState.mWebGLStencilAttachment}};
>         for (FramebufferAttachment *attachment : attachments)
>         {
>-            if (attachment->isAttached() && attachment->type() == resourceType &&
>-                attachment->id() == resourceId)
>+            if (detachMatchingAttachment(context, attachment, resourceType, resourceId))
>             {
>-                resetAttachment(context, attachment->getBinding());
>                 found = true;
>             }
>         }
>     }
>     else
>     {
>-        if (detachMatchingAttachment(context, &mState.mDepthAttachment, resourceType, resourceId,
>-                                     DIRTY_BIT_DEPTH_ATTACHMENT))
>+        if (detachMatchingAttachment(context, &mState.mDepthAttachment, resourceType, resourceId))
>         {
>             found = true;
>         }
>-        if (detachMatchingAttachment(context, &mState.mStencilAttachment, resourceType, resourceId,
>-                                     DIRTY_BIT_STENCIL_ATTACHMENT))
>+        if (detachMatchingAttachment(context, &mState.mStencilAttachment, resourceType, resourceId))
>         {
>             found = true;
>         }
>@@ -727,14 +750,13 @@ bool Framebuffer::detachResourceById(const Context *context, GLenum resourceType
> bool Framebuffer::detachMatchingAttachment(const Context *context,
>                                            FramebufferAttachment *attachment,
>                                            GLenum matchType,
>-                                           GLuint matchId,
>-                                           size_t dirtyBit)
>+                                           GLuint matchId)
> {
>     if (attachment->isAttached() && attachment->type() == matchType && attachment->id() == matchId)
>     {
>-        attachment->detach(context);
>-        mDirtyBits.set(dirtyBit);
>-        mState.mResourceNeedsInit.set(dirtyBit, false);
>+        // We go through resetAttachment to make sure that all the required bookkeeping will be done
>+        // such as updating enabled draw buffer state.
>+        resetAttachment(context, attachment->getBinding());
>         return true;
>     }
> 
>@@ -792,9 +814,10 @@ const FramebufferAttachment *Framebuffer::getFirstNonNullAttachment() const
>     return mState.getFirstNonNullAttachment();
> }
> 
>-const FramebufferAttachment *Framebuffer::getAttachment(GLenum attachment) const
>+const FramebufferAttachment *Framebuffer::getAttachment(const Context *context,
>+                                                        GLenum attachment) const
> {
>-    return mState.getAttachment(attachment);
>+    return mState.getAttachment(context, attachment);
> }
> 
> size_t Framebuffer::getDrawbufferStateCount() const
>@@ -823,8 +846,12 @@ void Framebuffer::setDrawBuffers(size_t count, const GLenum *buffers)
>     mDirtyBits.set(DIRTY_BIT_DRAW_BUFFERS);
> 
>     mState.mEnabledDrawBuffers.reset();
>+    mState.mDrawBufferTypeMask.reset();
>+
>     for (size_t index = 0; index < count; ++index)
>     {
>+        SetComponentTypeMask(getDrawbufferWriteType(index), index, &mState.mDrawBufferTypeMask);
>+
>         if (drawStates[index] != GL_NONE && mState.mColorAttachments[index].isAttached())
>         {
>             mState.mEnabledDrawBuffers.set(index);
>@@ -837,26 +864,37 @@ const FramebufferAttachment *Framebuffer::getDrawBuffer(size_t drawBuffer) const
>     return mState.getDrawBuffer(drawBuffer);
> }
> 
>-GLenum Framebuffer::getDrawbufferWriteType(size_t drawBuffer) const
>+ComponentType Framebuffer::getDrawbufferWriteType(size_t drawBuffer) const
> {
>     const FramebufferAttachment *attachment = mState.getDrawBuffer(drawBuffer);
>     if (attachment == nullptr)
>     {
>-        return GL_NONE;
>+        return ComponentType::NoType;
>     }
> 
>     GLenum componentType = attachment->getFormat().info->componentType;
>     switch (componentType)
>     {
>         case GL_INT:
>+            return ComponentType::Int;
>         case GL_UNSIGNED_INT:
>-            return componentType;
>+            return ComponentType::UnsignedInt;
> 
>         default:
>-            return GL_FLOAT;
>+            return ComponentType::Float;
>     }
> }
> 
>+ComponentTypeMask Framebuffer::getDrawBufferTypeMask() const
>+{
>+    return mState.mDrawBufferTypeMask;
>+}
>+
>+DrawBufferMask Framebuffer::getDrawBufferMask() const
>+{
>+    return mState.mEnabledDrawBuffers;
>+}
>+
> bool Framebuffer::hasEnabledDrawBuffer() const
> {
>     for (size_t drawbufferIdx = 0; drawbufferIdx < mState.mDrawBufferStates.size(); ++drawbufferIdx)
>@@ -912,40 +950,43 @@ bool Framebuffer::usingExtendedDrawBuffers() const
>     return false;
> }
> 
>-void Framebuffer::invalidateCompletenessCache()
>+void Framebuffer::invalidateCompletenessCache(const Context *context)
> {
>-    if (mId != 0)
>+    if (mState.mId != 0)
>     {
>         mCachedStatus.reset();
>+        onStateChange(context, angle::SubjectMessage::CONTENTS_CHANGED);
>     }
> }
> 
>-GLenum Framebuffer::checkStatus(const Context *context)
>+GLenum Framebuffer::checkStatusImpl(const Context *context)
> {
>-    // The default framebuffer is always complete except when it is surfaceless in which
>-    // case it is always unsupported. We return early because the default framebuffer may
>-    // not be subject to the same rules as application FBOs. ie, it could have 0x0 size.
>-    if (mId == 0)
>-    {
>-        ASSERT(mCachedStatus.valid());
>-        ASSERT(mCachedStatus.value() == GL_FRAMEBUFFER_COMPLETE ||
>-               mCachedStatus.value() == GL_FRAMEBUFFER_UNDEFINED_OES);
>-        return mCachedStatus.value();
>-    }
>+    ASSERT(!isDefault());
>+    ASSERT(hasAnyDirtyBit() || !mCachedStatus.valid());
>+
>+    mCachedStatus = checkStatusWithGLFrontEnd(context);
> 
>-    if (hasAnyDirtyBit() || !mCachedStatus.valid())
>+    if (mCachedStatus.value() == GL_FRAMEBUFFER_COMPLETE)
>     {
>-        mCachedStatus = checkStatusImpl(context);
>+        angle::Result err = syncState(context);
>+        if (err != angle::Result::Continue)
>+        {
>+            return 0;
>+        }
>+        if (!mImpl->checkStatus(context))
>+        {
>+            mCachedStatus = GL_FRAMEBUFFER_UNSUPPORTED;
>+        }
>     }
> 
>     return mCachedStatus.value();
> }
> 
>-GLenum Framebuffer::checkStatusImpl(const Context *context)
>+GLenum Framebuffer::checkStatusWithGLFrontEnd(const Context *context)
> {
>-    const ContextState &state = context->getContextState();
>+    const State &state = context->getState();
> 
>-    ASSERT(mId != 0);
>+    ASSERT(mState.mId != 0);
> 
>     bool hasAttachments = false;
>     Optional<unsigned int> colorbufferSize;
>@@ -955,6 +996,9 @@ GLenum Framebuffer::checkStatusImpl(const Context *context)
> 
>     const FramebufferAttachment *firstAttachment = getFirstNonNullAttachment();
> 
>+    Optional<bool> isLayered;
>+    Optional<TextureType> colorAttachmentsTextureType;
>+
>     for (const FramebufferAttachment &colorAttachment : mState.mColorAttachments)
>     {
>         if (colorAttachment.isAttached())
>@@ -995,11 +1039,41 @@ GLenum Framebuffer::checkStatusImpl(const Context *context)
> 
>             if (!CheckMultiviewStateMatchesForCompleteness(firstAttachment, &colorAttachment))
>             {
>-                return GL_FRAMEBUFFER_INCOMPLETE_VIEW_TARGETS_ANGLE;
>+                return GL_FRAMEBUFFER_INCOMPLETE_VIEW_TARGETS_OVR;
>             }
> 
>             hasRenderbuffer = hasRenderbuffer || (colorAttachment.type() == GL_RENDERBUFFER);
>-            hasAttachments  = true;
>+
>+            if (!hasAttachments)
>+            {
>+                isLayered = colorAttachment.isLayered();
>+                if (isLayered.value())
>+                {
>+                    colorAttachmentsTextureType = colorAttachment.getTextureImageIndex().getType();
>+                }
>+                hasAttachments = true;
>+            }
>+            else
>+            {
>+                // [EXT_geometry_shader] section 9.4.1, "Framebuffer Completeness"
>+                // If any framebuffer attachment is layered, all populated attachments
>+                // must be layered. Additionally, all populated color attachments must
>+                // be from textures of the same target. {FRAMEBUFFER_INCOMPLETE_LAYER_TARGETS_EXT }
>+                ASSERT(isLayered.valid());
>+                if (isLayered.value() != colorAttachment.isLayered())
>+                {
>+                    return GL_FRAMEBUFFER_INCOMPLETE_LAYER_TARGETS_EXT;
>+                }
>+                else if (isLayered.value())
>+                {
>+                    ASSERT(colorAttachmentsTextureType.valid());
>+                    if (colorAttachmentsTextureType.value() !=
>+                        colorAttachment.getTextureImageIndex().getType())
>+                    {
>+                        return GL_FRAMEBUFFER_INCOMPLETE_LAYER_TARGETS_EXT;
>+                    }
>+                }
>+            }
>         }
>     }
> 
>@@ -1025,11 +1099,27 @@ GLenum Framebuffer::checkStatusImpl(const Context *context)
> 
>         if (!CheckMultiviewStateMatchesForCompleteness(firstAttachment, &depthAttachment))
>         {
>-            return GL_FRAMEBUFFER_INCOMPLETE_VIEW_TARGETS_ANGLE;
>+            return GL_FRAMEBUFFER_INCOMPLETE_VIEW_TARGETS_OVR;
>         }
> 
>         hasRenderbuffer = hasRenderbuffer || (depthAttachment.type() == GL_RENDERBUFFER);
>-        hasAttachments  = true;
>+
>+        if (!hasAttachments)
>+        {
>+            isLayered      = depthAttachment.isLayered();
>+            hasAttachments = true;
>+        }
>+        else
>+        {
>+            // [EXT_geometry_shader] section 9.4.1, "Framebuffer Completeness"
>+            // If any framebuffer attachment is layered, all populated attachments
>+            // must be layered. {FRAMEBUFFER_INCOMPLETE_LAYER_TARGETS_EXT }
>+            ASSERT(isLayered.valid());
>+            if (isLayered.value() != depthAttachment.isLayered())
>+            {
>+                return GL_FRAMEBUFFER_INCOMPLETE_LAYER_TARGETS_EXT;
>+            }
>+        }
>     }
> 
>     const FramebufferAttachment &stencilAttachment = mState.mStencilAttachment;
>@@ -1054,11 +1144,27 @@ GLenum Framebuffer::checkStatusImpl(const Context *context)
> 
>         if (!CheckMultiviewStateMatchesForCompleteness(firstAttachment, &stencilAttachment))
>         {
>-            return GL_FRAMEBUFFER_INCOMPLETE_VIEW_TARGETS_ANGLE;
>+            return GL_FRAMEBUFFER_INCOMPLETE_VIEW_TARGETS_OVR;
>         }
> 
>         hasRenderbuffer = hasRenderbuffer || (stencilAttachment.type() == GL_RENDERBUFFER);
>-        hasAttachments  = true;
>+
>+        if (!hasAttachments)
>+        {
>+            hasAttachments = true;
>+        }
>+        else
>+        {
>+            // [EXT_geometry_shader] section 9.4.1, "Framebuffer Completeness"
>+            // If any framebuffer attachment is layered, all populated attachments
>+            // must be layered.
>+            // {FRAMEBUFFER_INCOMPLETE_LAYER_TARGETS_EXT }
>+            ASSERT(isLayered.valid());
>+            if (isLayered.value() != stencilAttachment.isLayered())
>+            {
>+                return GL_FRAMEBUFFER_INCOMPLETE_LAYER_TARGETS_EXT;
>+            }
>+        }
>     }
> 
>     // Starting from ES 3.0 stencil and depth, if present, should be the same image
>@@ -1087,7 +1193,7 @@ GLenum Framebuffer::checkStatusImpl(const Context *context)
>             if (!CheckMultiviewStateMatchesForCompleteness(firstAttachment,
>                                                            &mState.mWebGLDepthStencilAttachment))
>             {
>-                return GL_FRAMEBUFFER_INCOMPLETE_VIEW_TARGETS_ANGLE;
>+                return GL_FRAMEBUFFER_INCOMPLETE_VIEW_TARGETS_OVR;
>             }
>         }
>         else if (mState.mStencilAttachment.isAttached() &&
>@@ -1138,16 +1244,10 @@ GLenum Framebuffer::checkStatusImpl(const Context *context)
>         }
>     }
> 
>-    syncState(context);
>-    if (!mImpl->checkStatus(context))
>-    {
>-        return GL_FRAMEBUFFER_UNSUPPORTED;
>-    }
>-
>     return GL_FRAMEBUFFER_COMPLETE;
> }
> 
>-Error Framebuffer::discard(const Context *context, size_t count, const GLenum *attachments)
>+angle::Result Framebuffer::discard(const Context *context, size_t count, const GLenum *attachments)
> {
>     // Back-ends might make the contents of the FBO undefined. In WebGL 2.0, invalidate operations
>     // can be no-ops, so we should probably do that to ensure consistency.
>@@ -1156,7 +1256,9 @@ Error Framebuffer::discard(const Context *context, size_t count, const GLenum *a
>     return mImpl->discard(context, count, attachments);
> }
> 
>-Error Framebuffer::invalidate(const Context *context, size_t count, const GLenum *attachments)
>+angle::Result Framebuffer::invalidate(const Context *context,
>+                                      size_t count,
>+                                      const GLenum *attachments)
> {
>     // Back-ends might make the contents of the FBO undefined. In WebGL 2.0, invalidate operations
>     // can be no-ops, so we should probably do that to ensure consistency.
>@@ -1170,7 +1272,7 @@ bool Framebuffer::partialClearNeedsInit(const Context *context,
>                                         bool depth,
>                                         bool stencil)
> {
>-    const auto &glState = context->getGLState();
>+    const auto &glState = context->getState();
> 
>     if (!glState.isRobustResourceInitEnabled())
>     {
>@@ -1197,8 +1299,8 @@ bool Framebuffer::partialClearNeedsInit(const Context *context,
>     }
> 
>     const auto &depthStencil = glState.getDepthStencilState();
>-    ASSERT(depthStencil.stencilBackMask == depthStencil.stencilMask);
>-    if (stencil && depthStencil.stencilMask != depthStencil.stencilWritemask)
>+    if (stencil && (depthStencil.stencilMask != depthStencil.stencilWritemask ||
>+                    depthStencil.stencilBackMask != depthStencil.stencilBackWritemask))
>     {
>         return true;
>     }
>@@ -1206,10 +1308,10 @@ bool Framebuffer::partialClearNeedsInit(const Context *context,
>     return false;
> }
> 
>-Error Framebuffer::invalidateSub(const Context *context,
>-                                 size_t count,
>-                                 const GLenum *attachments,
>-                                 const gl::Rectangle &area)
>+angle::Result Framebuffer::invalidateSub(const Context *context,
>+                                         size_t count,
>+                                         const GLenum *attachments,
>+                                         const Rectangle &area)
> {
>     // Back-ends might make the contents of the FBO undefined. In WebGL 2.0, invalidate operations
>     // can be no-ops, so we should probably do that to ensure consistency.
>@@ -1218,170 +1320,197 @@ Error Framebuffer::invalidateSub(const Context *context,
>     return mImpl->invalidateSub(context, count, attachments, area);
> }
> 
>-Error Framebuffer::clear(const gl::Context *context, GLbitfield mask)
>+angle::Result Framebuffer::clear(const Context *context, GLbitfield mask)
> {
>-    const auto &glState = context->getGLState();
>+    const auto &glState = context->getState();
>     if (glState.isRasterizerDiscardEnabled())
>     {
>-        return NoError();
>+        return angle::Result::Continue;
>     }
> 
>-    const auto &blend        = glState.getBlendState();
>-    const auto &depthStencil = glState.getDepthStencilState();
>+    // Remove clear bits that are ineffective. An effective clear changes at least one fragment. If
>+    // color/depth/stencil masks make the clear ineffective we skip it altogether.
> 
>-    bool color   = (mask & GL_COLOR_BUFFER_BIT) != 0 && !IsColorMaskedOut(blend);
>-    bool depth   = (mask & GL_DEPTH_BUFFER_BIT) != 0 && !IsDepthMaskedOut(depthStencil);
>-    bool stencil = (mask & GL_STENCIL_BUFFER_BIT) != 0 && !IsStencilMaskedOut(depthStencil);
>+    // If all color channels are masked, don't attempt to clear color.
>+    if (context->getState().getBlendState().allChannelsMasked())
>+    {
>+        mask &= ~GL_COLOR_BUFFER_BIT;
>+    }
> 
>-    if (partialClearNeedsInit(context, color, depth, stencil))
>+    // If depth write is disabled, don't attempt to clear depth.
>+    if (!context->getState().getDepthStencilState().depthMask)
>     {
>-        ANGLE_TRY(ensureDrawAttachmentsInitialized(context));
>+        mask &= ~GL_DEPTH_BUFFER_BIT;
>     }
> 
>-    ANGLE_TRY(mImpl->clear(context, mask));
>+    // If all stencil bits are masked, don't attempt to clear stencil.
>+    if (context->getState().getDepthStencilState().stencilWritemask == 0)
>+    {
>+        mask &= ~GL_STENCIL_BUFFER_BIT;
>+    }
> 
>-    if (glState.isRobustResourceInitEnabled())
>+    if (mask != 0)
>     {
>-        markDrawAttachmentsInitialized(color, depth, stencil);
>+        ANGLE_TRY(mImpl->clear(context, mask));
>     }
> 
>-    return NoError();
>+    return angle::Result::Continue;
> }
> 
>-Error Framebuffer::clearBufferfv(const gl::Context *context,
>-                                 GLenum buffer,
>-                                 GLint drawbuffer,
>-                                 const GLfloat *values)
>+angle::Result Framebuffer::clearBufferfv(const Context *context,
>+                                         GLenum buffer,
>+                                         GLint drawbuffer,
>+                                         const GLfloat *values)
> {
>-    if (context->getGLState().isRasterizerDiscardEnabled() ||
>-        IsClearBufferMaskedOut(context, buffer))
>+    if (context->getState().isRasterizerDiscardEnabled() || IsClearBufferMaskedOut(context, buffer))
>     {
>-        return NoError();
>+        return angle::Result::Continue;
>     }
> 
>-    if (partialBufferClearNeedsInit(context, buffer))
>+    if (buffer == GL_DEPTH)
>     {
>-        ANGLE_TRY(ensureBufferInitialized(context, buffer, drawbuffer));
>+        // If depth write is disabled, don't attempt to clear depth.
>+        if (!context->getState().getDepthStencilState().depthMask)
>+        {
>+            return angle::Result::Continue;
>+        }
>+    }
>+    else
>+    {
>+        // If all color channels are masked, don't attempt to clear color.
>+        if (context->getState().getBlendState().allChannelsMasked())
>+        {
>+            return angle::Result::Continue;
>+        }
>     }
> 
>     ANGLE_TRY(mImpl->clearBufferfv(context, buffer, drawbuffer, values));
> 
>-    if (context->isRobustResourceInitEnabled())
>-    {
>-        markBufferInitialized(buffer, drawbuffer);
>-    }
>-    return NoError();
>+    return angle::Result::Continue;
> }
> 
>-Error Framebuffer::clearBufferuiv(const gl::Context *context,
>-                                  GLenum buffer,
>-                                  GLint drawbuffer,
>-                                  const GLuint *values)
>+angle::Result Framebuffer::clearBufferuiv(const Context *context,
>+                                          GLenum buffer,
>+                                          GLint drawbuffer,
>+                                          const GLuint *values)
> {
>-    if (context->getGLState().isRasterizerDiscardEnabled() ||
>-        IsClearBufferMaskedOut(context, buffer))
>+    if (context->getState().isRasterizerDiscardEnabled() || IsClearBufferMaskedOut(context, buffer))
>     {
>-        return NoError();
>+        return angle::Result::Continue;
>     }
> 
>-    if (partialBufferClearNeedsInit(context, buffer))
>+    // If all color channels are masked, don't attempt to clear color.
>+    if (context->getState().getBlendState().allChannelsMasked())
>     {
>-        ANGLE_TRY(ensureBufferInitialized(context, buffer, drawbuffer));
>+        return angle::Result::Continue;
>     }
> 
>     ANGLE_TRY(mImpl->clearBufferuiv(context, buffer, drawbuffer, values));
> 
>-    if (context->isRobustResourceInitEnabled())
>-    {
>-        markBufferInitialized(buffer, drawbuffer);
>-    }
>-    return NoError();
>+    return angle::Result::Continue;
> }
> 
>-Error Framebuffer::clearBufferiv(const gl::Context *context,
>-                                 GLenum buffer,
>-                                 GLint drawbuffer,
>-                                 const GLint *values)
>+angle::Result Framebuffer::clearBufferiv(const Context *context,
>+                                         GLenum buffer,
>+                                         GLint drawbuffer,
>+                                         const GLint *values)
> {
>-    if (context->getGLState().isRasterizerDiscardEnabled() ||
>-        IsClearBufferMaskedOut(context, buffer))
>+    if (context->getState().isRasterizerDiscardEnabled() || IsClearBufferMaskedOut(context, buffer))
>     {
>-        return NoError();
>+        return angle::Result::Continue;
>     }
> 
>-    if (partialBufferClearNeedsInit(context, buffer))
>+    if (buffer == GL_STENCIL)
>     {
>-        ANGLE_TRY(ensureBufferInitialized(context, buffer, drawbuffer));
>+        // If all stencil bits are masked, don't attempt to clear stencil.
>+        if (context->getState().getDepthStencilState().stencilWritemask == 0)
>+        {
>+            return angle::Result::Continue;
>+        }
>+    }
>+    else
>+    {
>+        // If all color channels are masked, don't attempt to clear color.
>+        if (context->getState().getBlendState().allChannelsMasked())
>+        {
>+            return angle::Result::Continue;
>+        }
>     }
> 
>     ANGLE_TRY(mImpl->clearBufferiv(context, buffer, drawbuffer, values));
> 
>-    if (context->isRobustResourceInitEnabled())
>-    {
>-        markBufferInitialized(buffer, drawbuffer);
>-    }
>-    return NoError();
>+    return angle::Result::Continue;
> }
> 
>-Error Framebuffer::clearBufferfi(const gl::Context *context,
>-                                 GLenum buffer,
>-                                 GLint drawbuffer,
>-                                 GLfloat depth,
>-                                 GLint stencil)
>+angle::Result Framebuffer::clearBufferfi(const Context *context,
>+                                         GLenum buffer,
>+                                         GLint drawbuffer,
>+                                         GLfloat depth,
>+                                         GLint stencil)
> {
>-    if (context->getGLState().isRasterizerDiscardEnabled() ||
>-        IsClearBufferMaskedOut(context, buffer))
>+    if (context->getState().isRasterizerDiscardEnabled() || IsClearBufferMaskedOut(context, buffer))
>     {
>-        return NoError();
>+        return angle::Result::Continue;
>     }
> 
>-    if (partialBufferClearNeedsInit(context, buffer))
>+    bool clearDepth   = context->getState().getDepthStencilState().depthMask;
>+    bool clearStencil = context->getState().getDepthStencilState().stencilWritemask != 0;
>+
>+    if (clearDepth && clearStencil)
>     {
>-        ANGLE_TRY(ensureBufferInitialized(context, buffer, drawbuffer));
>+        ASSERT(buffer == GL_DEPTH_STENCIL);
>+        ANGLE_TRY(mImpl->clearBufferfi(context, GL_DEPTH_STENCIL, drawbuffer, depth, stencil));
>     }
>-
>-    ANGLE_TRY(mImpl->clearBufferfi(context, buffer, drawbuffer, depth, stencil));
>-
>-    if (context->isRobustResourceInitEnabled())
>+    else if (clearDepth && !clearStencil)
>+    {
>+        ANGLE_TRY(mImpl->clearBufferfv(context, GL_DEPTH, drawbuffer, &depth));
>+    }
>+    else if (!clearDepth && clearStencil)
>     {
>-        markBufferInitialized(buffer, drawbuffer);
>+        ANGLE_TRY(mImpl->clearBufferiv(context, GL_STENCIL, drawbuffer, &stencil));
>     }
>-    return NoError();
>+
>+    return angle::Result::Continue;
> }
> 
>-GLenum Framebuffer::getImplementationColorReadFormat(const Context *context) const
>+angle::Result Framebuffer::getImplementationColorReadFormat(const Context *context,
>+                                                            GLenum *formatOut)
> {
>-    return mImpl->getImplementationColorReadFormat(context);
>+    ANGLE_TRY(syncState(context));
>+    *formatOut = mImpl->getImplementationColorReadFormat(context);
>+    return angle::Result::Continue;
> }
> 
>-GLenum Framebuffer::getImplementationColorReadType(const Context *context) const
>+angle::Result Framebuffer::getImplementationColorReadType(const Context *context, GLenum *typeOut)
> {
>-    return mImpl->getImplementationColorReadType(context);
>+    ANGLE_TRY(syncState(context));
>+    *typeOut = mImpl->getImplementationColorReadType(context);
>+    return angle::Result::Continue;
> }
> 
>-Error Framebuffer::readPixels(const gl::Context *context,
>-                              const Rectangle &area,
>-                              GLenum format,
>-                              GLenum type,
>-                              void *pixels)
>+angle::Result Framebuffer::readPixels(const Context *context,
>+                                      const Rectangle &area,
>+                                      GLenum format,
>+                                      GLenum type,
>+                                      void *pixels)
> {
>     ANGLE_TRY(ensureReadAttachmentInitialized(context, GL_COLOR_BUFFER_BIT));
>     ANGLE_TRY(mImpl->readPixels(context, area, format, type, pixels));
> 
>-    Buffer *unpackBuffer = context->getGLState().getTargetBuffer(gl::BufferBinding::PixelUnpack);
>+    Buffer *unpackBuffer = context->getState().getTargetBuffer(BufferBinding::PixelUnpack);
>     if (unpackBuffer)
>     {
>-        unpackBuffer->onPixelUnpack();
>+        unpackBuffer->onPixelPack(context);
>     }
> 
>-    return NoError();
>+    return angle::Result::Continue;
> }
> 
>-Error Framebuffer::blit(const gl::Context *context,
>-                        const Rectangle &sourceArea,
>-                        const Rectangle &destArea,
>-                        GLbitfield mask,
>-                        GLenum filter)
>+angle::Result Framebuffer::blit(const Context *context,
>+                                const Rectangle &sourceArea,
>+                                const Rectangle &destArea,
>+                                GLbitfield mask,
>+                                GLenum filter)
> {
>     GLbitfield blitMask = mask;
> 
>@@ -1404,10 +1533,10 @@ Error Framebuffer::blit(const gl::Context *context,
> 
>     if (!blitMask)
>     {
>-        return NoError();
>+        return angle::Result::Continue;
>     }
> 
>-    auto *sourceFBO = context->getGLState().getReadFramebuffer();
>+    auto *sourceFBO = context->getState().getReadFramebuffer();
>     ANGLE_TRY(sourceFBO->ensureReadAttachmentInitialized(context, blitMask));
> 
>     // TODO(jmadill): Only clear if not the full FBO dimensions, and only specified bitmask.
>@@ -1416,18 +1545,20 @@ Error Framebuffer::blit(const gl::Context *context,
>     return mImpl->blit(context, sourceArea, destArea, blitMask, filter);
> }
> 
>-int Framebuffer::getSamples(const Context *context)
>+bool Framebuffer::isDefault() const
> {
>-    if (complete(context))
>-    {
>-        return getCachedSamples(context);
>-    }
>+    return id() == 0;
>+}
> 
>-    return 0;
>+int Framebuffer::getSamples(const Context *context)
>+{
>+    return (isComplete(context) ? getCachedSamples(context) : 0);
> }
> 
> int Framebuffer::getCachedSamples(const Context *context)
> {
>+    ASSERT(mCachedStatus.valid() && mCachedStatus.value() == GL_FRAMEBUFFER_COMPLETE);
>+
>     // For a complete framebuffer, all attachments must have the same sample count.
>     // In this case return the first nonzero sample size.
>     const auto *firstNonNullAttachment = mState.getFirstNonNullAttachment();
>@@ -1441,10 +1572,12 @@ int Framebuffer::getCachedSamples(const Context *context)
>     return 0;
> }
> 
>-Error Framebuffer::getSamplePosition(size_t index, GLfloat *xy) const
>+angle::Result Framebuffer::getSamplePosition(const Context *context,
>+                                             size_t index,
>+                                             GLfloat *xy) const
> {
>-    ANGLE_TRY(mImpl->getSamplePosition(index, xy));
>-    return NoError();
>+    ANGLE_TRY(mImpl->getSamplePosition(context, index, xy));
>+    return angle::Result::Continue;
> }
> 
> bool Framebuffer::hasValidDepthStencil() const
>@@ -1460,9 +1593,7 @@ void Framebuffer::setAttachment(const Context *context,
> {
>     setAttachment(context, type, binding, textureIndex, resource,
>                   FramebufferAttachment::kDefaultNumViews,
>-                  FramebufferAttachment::kDefaultBaseViewIndex,
>-                  FramebufferAttachment::kDefaultMultiviewLayout,
>-                  FramebufferAttachment::kDefaultViewportOffsets);
>+                  FramebufferAttachment::kDefaultBaseViewIndex, false);
> }
> 
> void Framebuffer::setAttachment(const Context *context,
>@@ -1472,14 +1603,13 @@ void Framebuffer::setAttachment(const Context *context,
>                                 FramebufferAttachmentObject *resource,
>                                 GLsizei numViews,
>                                 GLuint baseViewIndex,
>-                                GLenum multiviewLayout,
>-                                const GLint *viewportOffsets)
>+                                bool isMultiview)
> {
>     // Context may be null in unit tests.
>     if (!context || !context->isWebGL1())
>     {
>         setAttachmentImpl(context, type, binding, textureIndex, resource, numViews, baseViewIndex,
>-                          multiviewLayout, viewportOffsets);
>+                          isMultiview);
>         return;
>     }
> 
>@@ -1489,61 +1619,42 @@ void Framebuffer::setAttachment(const Context *context,
>         case GL_DEPTH_STENCIL_ATTACHMENT:
>             mState.mWebGLDepthStencilAttachment.attach(context, type, binding, textureIndex,
>                                                        resource, numViews, baseViewIndex,
>-                                                       multiviewLayout, viewportOffsets);
>+                                                       isMultiview);
>             break;
>         case GL_DEPTH:
>         case GL_DEPTH_ATTACHMENT:
>             mState.mWebGLDepthAttachment.attach(context, type, binding, textureIndex, resource,
>-                                                numViews, baseViewIndex, multiviewLayout,
>-                                                viewportOffsets);
>+                                                numViews, baseViewIndex, isMultiview);
>             break;
>         case GL_STENCIL:
>         case GL_STENCIL_ATTACHMENT:
>             mState.mWebGLStencilAttachment.attach(context, type, binding, textureIndex, resource,
>-                                                  numViews, baseViewIndex, multiviewLayout,
>-                                                  viewportOffsets);
>+                                                  numViews, baseViewIndex, isMultiview);
>             break;
>         default:
>             setAttachmentImpl(context, type, binding, textureIndex, resource, numViews,
>-                              baseViewIndex, multiviewLayout, viewportOffsets);
>+                              baseViewIndex, isMultiview);
>             return;
>     }
> 
>-    commitWebGL1DepthStencilIfConsistent(context, numViews, baseViewIndex, multiviewLayout,
>-                                         viewportOffsets);
>+    commitWebGL1DepthStencilIfConsistent(context, numViews, baseViewIndex, isMultiview);
> }
> 
>-void Framebuffer::setAttachmentMultiviewLayered(const Context *context,
>-                                                GLenum type,
>-                                                GLenum binding,
>-                                                const ImageIndex &textureIndex,
>-                                                FramebufferAttachmentObject *resource,
>-                                                GLsizei numViews,
>-                                                GLint baseViewIndex)
>+void Framebuffer::setAttachmentMultiview(const Context *context,
>+                                         GLenum type,
>+                                         GLenum binding,
>+                                         const ImageIndex &textureIndex,
>+                                         FramebufferAttachmentObject *resource,
>+                                         GLsizei numViews,
>+                                         GLint baseViewIndex)
> {
>-    setAttachment(context, type, binding, textureIndex, resource, numViews, baseViewIndex,
>-                  GL_FRAMEBUFFER_MULTIVIEW_LAYERED_ANGLE,
>-                  FramebufferAttachment::kDefaultViewportOffsets);
>-}
>-
>-void Framebuffer::setAttachmentMultiviewSideBySide(const Context *context,
>-                                                   GLenum type,
>-                                                   GLenum binding,
>-                                                   const ImageIndex &textureIndex,
>-                                                   FramebufferAttachmentObject *resource,
>-                                                   GLsizei numViews,
>-                                                   const GLint *viewportOffsets)
>-{
>-    setAttachment(context, type, binding, textureIndex, resource, numViews,
>-                  FramebufferAttachment::kDefaultBaseViewIndex,
>-                  GL_FRAMEBUFFER_MULTIVIEW_SIDE_BY_SIDE_ANGLE, viewportOffsets);
>+    setAttachment(context, type, binding, textureIndex, resource, numViews, baseViewIndex, true);
> }
> 
> void Framebuffer::commitWebGL1DepthStencilIfConsistent(const Context *context,
>                                                        GLsizei numViews,
>                                                        GLuint baseViewIndex,
>-                                                       GLenum multiviewLayout,
>-                                                       const GLint *viewportOffsets)
>+                                                       bool isMultiview)
> {
>     int count = 0;
> 
>@@ -1572,7 +1683,7 @@ void Framebuffer::commitWebGL1DepthStencilIfConsistent(const Context *context,
>         }
>         else
>         {
>-            return ImageIndex::MakeInvalid();
>+            return ImageIndex();
>         }
>     };
> 
>@@ -1581,37 +1692,35 @@ void Framebuffer::commitWebGL1DepthStencilIfConsistent(const Context *context,
>         const auto &depth = mState.mWebGLDepthAttachment;
>         setAttachmentImpl(context, depth.type(), GL_DEPTH_ATTACHMENT,
>                           getImageIndexIfTextureAttachment(depth), depth.getResource(), numViews,
>-                          baseViewIndex, multiviewLayout, viewportOffsets);
>-        setAttachmentImpl(context, GL_NONE, GL_STENCIL_ATTACHMENT, ImageIndex::MakeInvalid(),
>-                          nullptr, numViews, baseViewIndex, multiviewLayout, viewportOffsets);
>+                          baseViewIndex, isMultiview);
>+        setAttachmentImpl(context, GL_NONE, GL_STENCIL_ATTACHMENT, ImageIndex(), nullptr, numViews,
>+                          baseViewIndex, isMultiview);
>     }
>     else if (mState.mWebGLStencilAttachment.isAttached())
>     {
>         const auto &stencil = mState.mWebGLStencilAttachment;
>-        setAttachmentImpl(context, GL_NONE, GL_DEPTH_ATTACHMENT, ImageIndex::MakeInvalid(), nullptr,
>-                          numViews, baseViewIndex, multiviewLayout, viewportOffsets);
>+        setAttachmentImpl(context, GL_NONE, GL_DEPTH_ATTACHMENT, ImageIndex(), nullptr, numViews,
>+                          baseViewIndex, isMultiview);
>         setAttachmentImpl(context, stencil.type(), GL_STENCIL_ATTACHMENT,
>                           getImageIndexIfTextureAttachment(stencil), stencil.getResource(),
>-                          numViews, baseViewIndex, multiviewLayout, viewportOffsets);
>+                          numViews, baseViewIndex, isMultiview);
>     }
>     else if (mState.mWebGLDepthStencilAttachment.isAttached())
>     {
>         const auto &depthStencil = mState.mWebGLDepthStencilAttachment;
>         setAttachmentImpl(context, depthStencil.type(), GL_DEPTH_ATTACHMENT,
>                           getImageIndexIfTextureAttachment(depthStencil),
>-                          depthStencil.getResource(), numViews, baseViewIndex, multiviewLayout,
>-                          viewportOffsets);
>+                          depthStencil.getResource(), numViews, baseViewIndex, isMultiview);
>         setAttachmentImpl(context, depthStencil.type(), GL_STENCIL_ATTACHMENT,
>                           getImageIndexIfTextureAttachment(depthStencil),
>-                          depthStencil.getResource(), numViews, baseViewIndex, multiviewLayout,
>-                          viewportOffsets);
>+                          depthStencil.getResource(), numViews, baseViewIndex, isMultiview);
>     }
>     else
>     {
>-        setAttachmentImpl(context, GL_NONE, GL_DEPTH_ATTACHMENT, ImageIndex::MakeInvalid(), nullptr,
>-                          numViews, baseViewIndex, multiviewLayout, viewportOffsets);
>-        setAttachmentImpl(context, GL_NONE, GL_STENCIL_ATTACHMENT, ImageIndex::MakeInvalid(),
>-                          nullptr, numViews, baseViewIndex, multiviewLayout, viewportOffsets);
>+        setAttachmentImpl(context, GL_NONE, GL_DEPTH_ATTACHMENT, ImageIndex(), nullptr, numViews,
>+                          baseViewIndex, isMultiview);
>+        setAttachmentImpl(context, GL_NONE, GL_STENCIL_ATTACHMENT, ImageIndex(), nullptr, numViews,
>+                          baseViewIndex, isMultiview);
>     }
> }
> 
>@@ -1622,8 +1731,7 @@ void Framebuffer::setAttachmentImpl(const Context *context,
>                                     FramebufferAttachmentObject *resource,
>                                     GLsizei numViews,
>                                     GLuint baseViewIndex,
>-                                    GLenum multiviewLayout,
>-                                    const GLint *viewportOffsets)
>+                                    bool isMultiview)
> {
>     switch (binding)
>     {
>@@ -1644,12 +1752,10 @@ void Framebuffer::setAttachmentImpl(const Context *context,
> 
>             updateAttachment(context, &mState.mDepthAttachment, DIRTY_BIT_DEPTH_ATTACHMENT,
>                              &mDirtyDepthAttachmentBinding, type, binding, textureIndex,
>-                             attachmentObj, numViews, baseViewIndex, multiviewLayout,
>-                             viewportOffsets);
>+                             attachmentObj, numViews, baseViewIndex, isMultiview);
>             updateAttachment(context, &mState.mStencilAttachment, DIRTY_BIT_STENCIL_ATTACHMENT,
>                              &mDirtyStencilAttachmentBinding, type, binding, textureIndex,
>-                             attachmentObj, numViews, baseViewIndex, multiviewLayout,
>-                             viewportOffsets);
>+                             attachmentObj, numViews, baseViewIndex, isMultiview);
>             break;
>         }
> 
>@@ -1657,22 +1763,20 @@ void Framebuffer::setAttachmentImpl(const Context *context,
>         case GL_DEPTH_ATTACHMENT:
>             updateAttachment(context, &mState.mDepthAttachment, DIRTY_BIT_DEPTH_ATTACHMENT,
>                              &mDirtyDepthAttachmentBinding, type, binding, textureIndex, resource,
>-                             numViews, baseViewIndex, multiviewLayout, viewportOffsets);
>+                             numViews, baseViewIndex, isMultiview);
>             break;
> 
>         case GL_STENCIL:
>         case GL_STENCIL_ATTACHMENT:
>             updateAttachment(context, &mState.mStencilAttachment, DIRTY_BIT_STENCIL_ATTACHMENT,
>                              &mDirtyStencilAttachmentBinding, type, binding, textureIndex, resource,
>-                             numViews, baseViewIndex, multiviewLayout, viewportOffsets);
>+                             numViews, baseViewIndex, isMultiview);
>             break;
> 
>         case GL_BACK:
>-            mState.mColorAttachments[0].attach(context, type, binding, textureIndex, resource,
>-                                               numViews, baseViewIndex, multiviewLayout,
>-                                               viewportOffsets);
>-            mDirtyBits.set(DIRTY_BIT_COLOR_ATTACHMENT_0);
>-            // No need for a resource binding for the default FBO, it's always complete.
>+            updateAttachment(context, &mState.mColorAttachments[0], DIRTY_BIT_COLOR_ATTACHMENT_0,
>+                             &mDirtyColorAttachmentBindings[0], type, binding, textureIndex,
>+                             resource, numViews, baseViewIndex, isMultiview);
>             break;
> 
>         default:
>@@ -1682,126 +1786,174 @@ void Framebuffer::setAttachmentImpl(const Context *context,
>             size_t dirtyBit = DIRTY_BIT_COLOR_ATTACHMENT_0 + colorIndex;
>             updateAttachment(context, &mState.mColorAttachments[colorIndex], dirtyBit,
>                              &mDirtyColorAttachmentBindings[colorIndex], type, binding,
>-                             textureIndex, resource, numViews, baseViewIndex, multiviewLayout,
>-                             viewportOffsets);
>+                             textureIndex, resource, numViews, baseViewIndex, isMultiview);
>+
>+            if (!resource)
>+            {
>+                mColorAttachmentBits.reset(colorIndex);
>+                mFloat32ColorAttachmentBits.reset(colorIndex);
>+            }
>+            else
>+            {
>+                mColorAttachmentBits.set(colorIndex);
>+                updateFloat32ColorAttachmentBits(
>+                    colorIndex, resource->getAttachmentFormat(binding, textureIndex).info);
>+            }
> 
>             // TODO(jmadill): ASSERT instead of checking the attachment exists in
>             // formsRenderingFeedbackLoopWith
>             bool enabled = (type != GL_NONE && getDrawBufferState(colorIndex) != GL_NONE);
>             mState.mEnabledDrawBuffers.set(colorIndex, enabled);
>+            SetComponentTypeMask(getDrawbufferWriteType(colorIndex), colorIndex,
>+                                 &mState.mDrawBufferTypeMask);
>         }
>         break;
>     }
>-
>-    mAttachedTextures.reset();
> }
> 
> void Framebuffer::updateAttachment(const Context *context,
>                                    FramebufferAttachment *attachment,
>                                    size_t dirtyBit,
>-                                   OnAttachmentDirtyBinding *onDirtyBinding,
>+                                   angle::ObserverBinding *onDirtyBinding,
>                                    GLenum type,
>                                    GLenum binding,
>                                    const ImageIndex &textureIndex,
>                                    FramebufferAttachmentObject *resource,
>                                    GLsizei numViews,
>                                    GLuint baseViewIndex,
>-                                   GLenum multiviewLayout,
>-                                   const GLint *viewportOffsets)
>+                                   bool isMultiview)
> {
>     attachment->attach(context, type, binding, textureIndex, resource, numViews, baseViewIndex,
>-                       multiviewLayout, viewportOffsets);
>+                       isMultiview);
>     mDirtyBits.set(dirtyBit);
>     mState.mResourceNeedsInit.set(dirtyBit, attachment->initState() == InitState::MayNeedInit);
>-    BindResourceChannel(onDirtyBinding, resource);
>+    onDirtyBinding->bind(resource);
>+
>+    invalidateCompletenessCache(context);
> }
> 
> void Framebuffer::resetAttachment(const Context *context, GLenum binding)
> {
>-    setAttachment(context, GL_NONE, binding, ImageIndex::MakeInvalid(), nullptr);
>+    setAttachment(context, GL_NONE, binding, ImageIndex(), nullptr);
> }
> 
>-void Framebuffer::syncState(const Context *context)
>+angle::Result Framebuffer::syncState(const Context *context)
> {
>     if (mDirtyBits.any())
>     {
>-        mImpl->syncState(context, mDirtyBits);
>+        mDirtyBitsGuard = mDirtyBits;
>+        ANGLE_TRY(mImpl->syncState(context, mDirtyBits));
>         mDirtyBits.reset();
>-        if (mId != 0)
>-        {
>-            mCachedStatus.reset();
>-        }
>+        mDirtyBitsGuard.reset();
>     }
>+    return angle::Result::Continue;
> }
> 
>-void Framebuffer::signal(size_t dirtyBit, InitState state)
>+void Framebuffer::onSubjectStateChange(const Context *context,
>+                                       angle::SubjectIndex index,
>+                                       angle::SubjectMessage message)
> {
>-    // TOOD(jmadill): Make this only update individual attachments to do less work.
>-    mCachedStatus.reset();
>+    if (message != angle::SubjectMessage::STORAGE_CHANGED)
>+    {
>+        // This can be triggered by the GL back-end TextureGL class.
>+        ASSERT(message == angle::SubjectMessage::DEPENDENT_DIRTY_BITS);
>+        return;
>+    }
>+
>+    ASSERT(!mDirtyBitsGuard.valid() || mDirtyBitsGuard.value().test(index));
>+    mDirtyBits.set(index);
>+    onStateChange(context, angle::SubjectMessage::STORAGE_CHANGED);
>+
>+    invalidateCompletenessCache(context);
>+
>+    FramebufferAttachment *attachment = getAttachmentFromSubjectIndex(index);
> 
>     // Mark the appropriate init flag.
>-    mState.mResourceNeedsInit.set(dirtyBit, state == InitState::MayNeedInit);
>-}
>+    mState.mResourceNeedsInit.set(index, attachment->initState() == InitState::MayNeedInit);
> 
>-bool Framebuffer::complete(const Context *context)
>-{
>-    return (checkStatus(context) == GL_FRAMEBUFFER_COMPLETE);
>+    // Update mFloat32ColorAttachmentBits Cache
>+    if (index < DIRTY_BIT_COLOR_ATTACHMENT_MAX)
>+    {
>+        ASSERT(index != DIRTY_BIT_DEPTH_ATTACHMENT);
>+        ASSERT(index != DIRTY_BIT_STENCIL_ATTACHMENT);
>+        updateFloat32ColorAttachmentBits(index - DIRTY_BIT_COLOR_ATTACHMENT_0,
>+                                         attachment->getFormat().info);
>+    }
> }
> 
>-bool Framebuffer::cachedComplete() const
>+FramebufferAttachment *Framebuffer::getAttachmentFromSubjectIndex(angle::SubjectIndex index)
> {
>-    return (mCachedStatus.valid() && mCachedStatus == GL_FRAMEBUFFER_COMPLETE);
>+    switch (index)
>+    {
>+        case DIRTY_BIT_DEPTH_ATTACHMENT:
>+            return &mState.mDepthAttachment;
>+        case DIRTY_BIT_STENCIL_ATTACHMENT:
>+            return &mState.mStencilAttachment;
>+        default:
>+            size_t colorIndex = (index - DIRTY_BIT_COLOR_ATTACHMENT_0);
>+            ASSERT(colorIndex < mState.mColorAttachments.size());
>+            return &mState.mColorAttachments[colorIndex];
>+    }
> }
> 
>-bool Framebuffer::formsRenderingFeedbackLoopWith(const State &state) const
>+bool Framebuffer::formsRenderingFeedbackLoopWith(const Context *context) const
> {
>+    const State &state     = context->getState();
>     const Program *program = state.getProgram();
> 
>     // TODO(jmadill): Default framebuffer feedback loops.
>-    if (mId == 0)
>+    if (mState.mId == 0)
>     {
>         return false;
>     }
> 
>-    // The bitset will skip inactive draw buffers.
>-    for (size_t drawIndex : mState.mEnabledDrawBuffers)
>+    const FramebufferAttachment *depth   = getDepthbuffer();
>+    const FramebufferAttachment *stencil = getStencilbuffer();
>+
>+    const bool checkDepth = depth && depth->type() == GL_TEXTURE;
>+    // Skip the feedback loop check for stencil if depth/stencil point to the same resource.
>+    const bool checkStencil =
>+        (stencil && stencil->type() == GL_TEXTURE) && (!depth || *stencil != *depth);
>+
>+    const gl::ActiveTextureMask &activeTextures   = program->getActiveSamplersMask();
>+    const gl::ActiveTexturePointerArray &textures = state.getActiveTexturesCache();
>+
>+    for (size_t textureUnit : activeTextures)
>     {
>-        const FramebufferAttachment &attachment = mState.mColorAttachments[drawIndex];
>-        ASSERT(attachment.isAttached());
>-        if (attachment.type() == GL_TEXTURE)
>+        Texture *texture = textures[textureUnit];
>+
>+        if (texture == nullptr)
>         {
>-            // Validate the feedback loop.
>-            if (program->samplesFromTexture(state, attachment.id()))
>+            continue;
>+        }
>+
>+        // Depth and stencil attachment form feedback loops
>+        // Regardless of if enabled or masked.
>+        if (checkDepth)
>+        {
>+            if (texture->id() == depth->id())
>             {
>                 return true;
>             }
>         }
>-    }
> 
>-    // Validate depth-stencil feedback loop.
>-    const auto &dsState = state.getDepthStencilState();
>-
>-    // We can skip the feedback loop checks if depth/stencil is masked out or disabled.
>-    const FramebufferAttachment *depth = getDepthbuffer();
>-    if (depth && depth->type() == GL_TEXTURE && dsState.depthTest && dsState.depthMask)
>-    {
>-        if (program->samplesFromTexture(state, depth->id()))
>+        if (checkStencil)
>         {
>-            return true;
>+            if (texture->id() == stencil->id())
>+            {
>+                return true;
>+            }
>         }
>-    }
> 
>-    // Note: we assume the front and back masks are the same for WebGL.
>-    const FramebufferAttachment *stencil = getStencilbuffer();
>-    ASSERT(dsState.stencilBackWritemask == dsState.stencilWritemask);
>-    if (stencil && stencil->type() == GL_TEXTURE && dsState.stencilTest &&
>-        dsState.stencilWritemask != 0)
>-    {
>-        // Skip the feedback loop check if depth/stencil point to the same resource.
>-        if (!depth || *stencil != *depth)
>+        // Check if any color attachment forms a feedback loop.
>+        for (size_t drawIndex : mColorAttachmentBits)
>         {
>-            if (program->samplesFromTexture(state, stencil->id()))
>+            const FramebufferAttachment &attachment = mState.mColorAttachments[drawIndex];
>+            ASSERT(attachment.isAttached());
>+
>+            if (attachment.isTextureWithId(texture->id()))
>             {
>+                // TODO(jmadill): Check for appropriate overlap.
>                 return true;
>             }
>         }
>@@ -1814,7 +1966,7 @@ bool Framebuffer::formsCopyingFeedbackLoopWith(GLuint copyTextureID,
>                                                GLint copyTextureLevel,
>                                                GLint copyTextureLayer) const
> {
>-    if (mId == 0)
>+    if (mState.mId == 0)
>     {
>         // It seems impossible to form a texture copying feedback loop with the default FBO.
>         return false;
>@@ -1826,12 +1978,11 @@ bool Framebuffer::formsCopyingFeedbackLoopWith(GLuint copyTextureID,
>     if (readAttachment->isTextureWithId(copyTextureID))
>     {
>         const auto &imageIndex = readAttachment->getTextureImageIndex();
>-        if (imageIndex.mipIndex == copyTextureLevel)
>+        if (imageIndex.getLevelIndex() == copyTextureLevel)
>         {
>             // Check 3D/Array texture layers.
>-            return imageIndex.layerIndex == ImageIndex::ENTIRE_LEVEL ||
>-                   copyTextureLayer == ImageIndex::ENTIRE_LEVEL ||
>-                   imageIndex.layerIndex == copyTextureLayer;
>+            return !imageIndex.hasLayer() || copyTextureLayer == ImageIndex::kEntireLevel ||
>+                   imageIndex.getLayerIndex() == copyTextureLayer;
>         }
>     }
>     return false;
>@@ -1857,39 +2008,44 @@ bool Framebuffer::getDefaultFixedSampleLocations() const
>     return mState.getDefaultFixedSampleLocations();
> }
> 
>-void Framebuffer::setDefaultWidth(GLint defaultWidth)
>+GLint Framebuffer::getDefaultLayers() const
>+{
>+    return mState.getDefaultLayers();
>+}
>+
>+void Framebuffer::setDefaultWidth(const Context *context, GLint defaultWidth)
> {
>     mState.mDefaultWidth = defaultWidth;
>     mDirtyBits.set(DIRTY_BIT_DEFAULT_WIDTH);
>+    invalidateCompletenessCache(context);
> }
> 
>-void Framebuffer::setDefaultHeight(GLint defaultHeight)
>+void Framebuffer::setDefaultHeight(const Context *context, GLint defaultHeight)
> {
>     mState.mDefaultHeight = defaultHeight;
>     mDirtyBits.set(DIRTY_BIT_DEFAULT_HEIGHT);
>+    invalidateCompletenessCache(context);
> }
> 
>-void Framebuffer::setDefaultSamples(GLint defaultSamples)
>+void Framebuffer::setDefaultSamples(const Context *context, GLint defaultSamples)
> {
>     mState.mDefaultSamples = defaultSamples;
>     mDirtyBits.set(DIRTY_BIT_DEFAULT_SAMPLES);
>+    invalidateCompletenessCache(context);
> }
> 
>-void Framebuffer::setDefaultFixedSampleLocations(bool defaultFixedSampleLocations)
>+void Framebuffer::setDefaultFixedSampleLocations(const Context *context,
>+                                                 bool defaultFixedSampleLocations)
> {
>     mState.mDefaultFixedSampleLocations = defaultFixedSampleLocations;
>     mDirtyBits.set(DIRTY_BIT_DEFAULT_FIXED_SAMPLE_LOCATIONS);
>+    invalidateCompletenessCache(context);
> }
> 
>-// TODO(jmadill): Remove this kludge.
>-GLenum Framebuffer::checkStatus(const ValidationContext *context)
>+void Framebuffer::setDefaultLayers(GLint defaultLayers)
> {
>-    return checkStatus(static_cast<const Context *>(context));
>-}
>-
>-int Framebuffer::getSamples(const ValidationContext *context)
>-{
>-    return getSamples(static_cast<const Context *>(context));
>+    mState.mDefaultLayers = defaultLayers;
>+    mDirtyBits.set(DIRTY_BIT_DEFAULT_LAYERS);
> }
> 
> GLsizei Framebuffer::getNumViews() const
>@@ -1902,21 +2058,78 @@ GLint Framebuffer::getBaseViewIndex() const
>     return mState.getBaseViewIndex();
> }
> 
>-const std::vector<Offset> *Framebuffer::getViewportOffsets() const
>+bool Framebuffer::isMultiview() const
>+{
>+    return mState.isMultiview();
>+}
>+
>+bool Framebuffer::readDisallowedByMultiview() const
>+{
>+    return (mState.isMultiview() && mState.getNumViews() > 1);
>+}
>+
>+angle::Result Framebuffer::ensureClearAttachmentsInitialized(const Context *context,
>+                                                             GLbitfield mask)
> {
>-    return mState.getViewportOffsets();
>+    const auto &glState = context->getState();
>+    if (!context->isRobustResourceInitEnabled() || glState.isRasterizerDiscardEnabled())
>+    {
>+        return angle::Result::Continue;
>+    }
>+
>+    const BlendState &blend               = glState.getBlendState();
>+    const DepthStencilState &depthStencil = glState.getDepthStencilState();
>+
>+    bool color   = (mask & GL_COLOR_BUFFER_BIT) != 0 && !IsColorMaskedOut(blend);
>+    bool depth   = (mask & GL_DEPTH_BUFFER_BIT) != 0 && !IsDepthMaskedOut(depthStencil);
>+    bool stencil = (mask & GL_STENCIL_BUFFER_BIT) != 0 && !IsStencilMaskedOut(depthStencil);
>+
>+    if (!color && !depth && !stencil)
>+    {
>+        return angle::Result::Continue;
>+    }
>+
>+    if (partialClearNeedsInit(context, color, depth, stencil))
>+    {
>+        ANGLE_TRY(ensureDrawAttachmentsInitialized(context));
>+    }
>+
>+    // If the impl encounters an error during a a full (non-partial) clear, the attachments will
>+    // still be marked initialized. This simplifies design, allowing this method to be called before
>+    // the clear.
>+    markDrawAttachmentsInitialized(color, depth, stencil);
>+
>+    return angle::Result::Continue;
> }
> 
>-GLenum Framebuffer::getMultiviewLayout() const
>+angle::Result Framebuffer::ensureClearBufferAttachmentsInitialized(const Context *context,
>+                                                                   GLenum buffer,
>+                                                                   GLint drawbuffer)
> {
>-    return mState.getMultiviewLayout();
>+    if (!context->isRobustResourceInitEnabled() ||
>+        context->getState().isRasterizerDiscardEnabled() || IsClearBufferMaskedOut(context, buffer))
>+    {
>+        return angle::Result::Continue;
>+    }
>+
>+    if (partialBufferClearNeedsInit(context, buffer))
>+    {
>+        ANGLE_TRY(ensureBufferInitialized(context, buffer, drawbuffer));
>+    }
>+
>+    // If the impl encounters an error during a a full (non-partial) clear, the attachments will
>+    // still be marked initialized. This simplifies design, allowing this method to be called before
>+    // the clear.
>+    markBufferInitialized(buffer, drawbuffer);
>+
>+    return angle::Result::Continue;
> }
> 
>-Error Framebuffer::ensureDrawAttachmentsInitialized(const Context *context)
>+angle::Result Framebuffer::ensureDrawAttachmentsInitialized(const Context *context)
> {
>     if (!context->isRobustResourceInitEnabled())
>     {
>-        return NoError();
>+        return angle::Result::Continue;
>     }
> 
>     // Note: we don't actually filter by the draw attachment enum. Just init everything.
>@@ -1937,14 +2150,15 @@ Error Framebuffer::ensureDrawAttachmentsInitialized(const Context *context)
>     }
> 
>     mState.mResourceNeedsInit.reset();
>-    return NoError();
>+    return angle::Result::Continue;
> }
> 
>-Error Framebuffer::ensureReadAttachmentInitialized(const Context *context, GLbitfield blitMask)
>+angle::Result Framebuffer::ensureReadAttachmentInitialized(const Context *context,
>+                                                           GLbitfield blitMask)
> {
>     if (!context->isRobustResourceInitEnabled() || mState.mResourceNeedsInit.none())
>     {
>-        return NoError();
>+        return angle::Result::Continue;
>     }
> 
>     if ((blitMask & GL_COLOR_BUFFER_BIT) != 0 && mState.mReadBufferState != GL_NONE)
>@@ -1975,7 +2189,7 @@ Error Framebuffer::ensureReadAttachmentInitialized(const Context *context, GLbit
>         }
>     }
> 
>-    return NoError();
>+    return angle::Result::Continue;
> }
> 
> void Framebuffer::markDrawAttachmentsInitialized(bool color, bool depth, bool stencil)
>@@ -2062,15 +2276,15 @@ Box Framebuffer::getDimensions() const
>     return mState.getDimensions();
> }
> 
>-Error Framebuffer::ensureBufferInitialized(const Context *context,
>-                                           GLenum bufferType,
>-                                           GLint bufferIndex)
>+angle::Result Framebuffer::ensureBufferInitialized(const Context *context,
>+                                                   GLenum bufferType,
>+                                                   GLint bufferIndex)
> {
>     ASSERT(context->isRobustResourceInitEnabled());
> 
>     if (mState.mResourceNeedsInit.none())
>     {
>-        return NoError();
>+        return angle::Result::Continue;
>     }
> 
>     switch (bufferType)
>@@ -2122,7 +2336,7 @@ Error Framebuffer::ensureBufferInitialized(const Context *context,
>             break;
>     }
> 
>-    return NoError();
>+    return angle::Result::Continue;
> }
> 
> bool Framebuffer::partialBufferClearNeedsInit(const Context *context, GLenum bufferType)
>@@ -2147,36 +2361,4 @@ bool Framebuffer::partialBufferClearNeedsInit(const Context *context, GLenum buf
>             return false;
>     }
> }
>-
>-bool Framebuffer::hasTextureAttachment(const Texture *texture) const
>-{
>-    if (!mAttachedTextures.valid())
>-    {
>-        std::set<const FramebufferAttachmentObject *> attachedTextures;
>-
>-        for (const auto &colorAttachment : mState.mColorAttachments)
>-        {
>-            if (colorAttachment.isAttached() && colorAttachment.type() == GL_TEXTURE)
>-            {
>-                attachedTextures.insert(colorAttachment.getResource());
>-            }
>-        }
>-
>-        if (mState.mDepthAttachment.isAttached() && mState.mDepthAttachment.type() == GL_TEXTURE)
>-        {
>-            attachedTextures.insert(mState.mDepthAttachment.getResource());
>-        }
>-
>-        if (mState.mStencilAttachment.isAttached() &&
>-            mState.mStencilAttachment.type() == GL_TEXTURE)
>-        {
>-            attachedTextures.insert(mState.mStencilAttachment.getResource());
>-        }
>-
>-        mAttachedTextures = std::move(attachedTextures);
>-    }
>-
>-    return (mAttachedTextures.value().count(texture) > 0);
>-}
>-
> }  // namespace gl
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/Framebuffer.h b/Source/ThirdParty/ANGLE/src/libANGLE/Framebuffer.h
>index 70223f0bc73..15ee359ee73 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/Framebuffer.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/Framebuffer.h
>@@ -12,14 +12,15 @@
> 
> #include <vector>
> 
>+#include "common/FixedVector.h"
> #include "common/Optional.h"
> #include "common/angleutils.h"
> #include "libANGLE/Constants.h"
> #include "libANGLE/Debug.h"
> #include "libANGLE/Error.h"
> #include "libANGLE/FramebufferAttachment.h"
>+#include "libANGLE/Observer.h"
> #include "libANGLE/RefCountObject.h"
>-#include "libANGLE/signal_utils.h"
> 
> namespace rx
> {
>@@ -27,40 +28,38 @@ class GLImplFactory;
> class FramebufferImpl;
> class RenderbufferImpl;
> class SurfaceImpl;
>-}
>+}  // namespace rx
> 
> namespace egl
> {
> class Display;
> class Surface;
>-}
>+}  // namespace egl
> 
> namespace gl
> {
>+struct Caps;
> class Context;
>-class ContextState;
>+struct Extensions;
> class Framebuffer;
>+class ImageIndex;
>+struct Rectangle;
> class Renderbuffer;
> class State;
> class Texture;
> class TextureCapsMap;
>-class ValidationContext;
>-struct Caps;
>-struct Extensions;
>-struct ImageIndex;
>-struct Rectangle;
> 
> class FramebufferState final : angle::NonCopyable
> {
>   public:
>     FramebufferState();
>-    explicit FramebufferState(const Caps &caps);
>+    explicit FramebufferState(const Caps &caps, GLuint id);
>     ~FramebufferState();
> 
>     const std::string &getLabel();
>     size_t getReadIndex() const;
> 
>-    const FramebufferAttachment *getAttachment(GLenum attachment) const;
>+    const FramebufferAttachment *getAttachment(const Context *context, GLenum attachment) const;
>     const FramebufferAttachment *getReadAttachment() const;
>     const FramebufferAttachment *getFirstNonNullAttachment() const;
>     const FramebufferAttachment *getFirstColorAttachment() const;
>@@ -80,28 +79,46 @@ class FramebufferState final : angle::NonCopyable
>     }
> 
>     bool attachmentsHaveSameDimensions() const;
>+    bool hasSeparateDepthAndStencilAttachments() const;
>     bool colorAttachmentsAreUniqueImages() const;
>     Box getDimensions() const;
> 
>     const FramebufferAttachment *getDrawBuffer(size_t drawBufferIdx) const;
>     size_t getDrawBufferCount() const;
> 
>-    GLint getDefaultWidth() const { return mDefaultWidth; };
>-    GLint getDefaultHeight() const { return mDefaultHeight; };
>-    GLint getDefaultSamples() const { return mDefaultSamples; };
>-    bool getDefaultFixedSampleLocations() const { return mDefaultFixedSampleLocations; };
>+    GLint getDefaultWidth() const { return mDefaultWidth; }
>+    GLint getDefaultHeight() const { return mDefaultHeight; }
>+    GLint getDefaultSamples() const { return mDefaultSamples; }
>+    bool getDefaultFixedSampleLocations() const { return mDefaultFixedSampleLocations; }
>+    GLint getDefaultLayers() const { return mDefaultLayers; }
> 
>     bool hasDepth() const;
>     bool hasStencil() const;
> 
>-    GLenum getMultiviewLayout() const;
>-    GLsizei getNumViews() const;
>-    const std::vector<Offset> *getViewportOffsets() const;
>+    bool isMultiview() const;
>+
>+    ANGLE_INLINE GLsizei getNumViews() const
>+    {
>+        const FramebufferAttachment *attachment = getFirstNonNullAttachment();
>+        if (attachment == nullptr)
>+        {
>+            return FramebufferAttachment::kDefaultNumViews;
>+        }
>+        return attachment->getNumViews();
>+    }
>+
>     GLint getBaseViewIndex() const;
> 
>+    GLuint id() const { return mId; }
>+
>   private:
>+    const FramebufferAttachment *getWebGLDepthStencilAttachment() const;
>+    const FramebufferAttachment *getWebGLDepthAttachment() const;
>+    const FramebufferAttachment *getWebGLStencilAttachment() const;
>+
>     friend class Framebuffer;
> 
>+    GLuint mId;
>     std::string mLabel;
> 
>     std::vector<FramebufferAttachment> mColorAttachments;
>@@ -111,11 +128,13 @@ class FramebufferState final : angle::NonCopyable
>     std::vector<GLenum> mDrawBufferStates;
>     GLenum mReadBufferState;
>     DrawBufferMask mEnabledDrawBuffers;
>+    ComponentTypeMask mDrawBufferTypeMask;
> 
>     GLint mDefaultWidth;
>     GLint mDefaultHeight;
>     GLint mDefaultSamples;
>     bool mDefaultFixedSampleLocations;
>+    GLint mDefaultLayers;
> 
>     // It's necessary to store all this extra state so we can restore attachments
>     // when DEPTH_STENCIL/DEPTH/STENCIL is unbound in WebGL 1.
>@@ -128,46 +147,40 @@ class FramebufferState final : angle::NonCopyable
>     angle::BitSet<IMPLEMENTATION_MAX_FRAMEBUFFER_ATTACHMENTS + 2> mResourceNeedsInit;
> };
> 
>-class Framebuffer final : public LabeledObject, public OnAttachmentDirtyReceiver
>+class Framebuffer final : public angle::ObserverInterface,
>+                          public LabeledObject,
>+                          public angle::Subject
> {
>   public:
>     // Constructor to build application-defined framebuffers
>     Framebuffer(const Caps &caps, rx::GLImplFactory *factory, GLuint id);
>-    // Constructor to build default framebuffers for a surface
>-    Framebuffer(const egl::Display *display, egl::Surface *surface);
>+    // Constructor to build default framebuffers for a surface and context pair
>+    Framebuffer(const Context *context, egl::Surface *surface);
>     // Constructor to build a fake default framebuffer when surfaceless
>     Framebuffer(rx::GLImplFactory *factory);
> 
>     ~Framebuffer() override;
>     void onDestroy(const Context *context);
>-    void destroyDefault(const egl::Display *display);
> 
>-    void setLabel(const std::string &label) override;
>+    void setLabel(const Context *context, const std::string &label) override;
>     const std::string &getLabel() const override;
> 
>     rx::FramebufferImpl *getImplementation() const { return mImpl; }
> 
>-    GLuint id() const { return mId; }
>+    GLuint id() const { return mState.mId; }
> 
>     void setAttachment(const Context *context,
>                        GLenum type,
>                        GLenum binding,
>                        const ImageIndex &textureIndex,
>                        FramebufferAttachmentObject *resource);
>-    void setAttachmentMultiviewLayered(const Context *context,
>-                                       GLenum type,
>-                                       GLenum binding,
>-                                       const ImageIndex &textureIndex,
>-                                       FramebufferAttachmentObject *resource,
>-                                       GLsizei numViews,
>-                                       GLint baseViewIndex);
>-    void setAttachmentMultiviewSideBySide(const Context *context,
>-                                          GLenum type,
>-                                          GLenum binding,
>-                                          const ImageIndex &textureIndex,
>-                                          FramebufferAttachmentObject *resource,
>-                                          GLsizei numViews,
>-                                          const GLint *viewportOffsets);
>+    void setAttachmentMultiview(const Context *context,
>+                                GLenum type,
>+                                GLenum binding,
>+                                const ImageIndex &textureIndex,
>+                                FramebufferAttachmentObject *resource,
>+                                GLsizei numViews,
>+                                GLint baseViewIndex);
>     void resetAttachment(const Context *context, GLenum binding);
> 
>     bool detachTexture(const Context *context, GLuint texture);
>@@ -184,18 +197,20 @@ class Framebuffer final : public LabeledObject, public OnAttachmentDirtyReceiver
>     const FramebufferAttachment *getFirstColorbuffer() const;
>     const FramebufferAttachment *getFirstNonNullAttachment() const;
> 
>-    const FramebufferAttachment *getAttachment(GLenum attachment) const;
>-    GLenum getMultiviewLayout() const;
>+    const FramebufferAttachment *getAttachment(const Context *context, GLenum attachment) const;
>+    bool isMultiview() const;
>+    bool readDisallowedByMultiview() const;
>     GLsizei getNumViews() const;
>     GLint getBaseViewIndex() const;
>-    const std::vector<Offset> *getViewportOffsets() const;
> 
>     size_t getDrawbufferStateCount() const;
>     GLenum getDrawBufferState(size_t drawBuffer) const;
>     const std::vector<GLenum> &getDrawBufferStates() const;
>     void setDrawBuffers(size_t count, const GLenum *buffers);
>     const FramebufferAttachment *getDrawBuffer(size_t drawBuffer) const;
>-    GLenum getDrawbufferWriteType(size_t drawBuffer) const;
>+    ComponentType getDrawbufferWriteType(size_t drawBuffer) const;
>+    ComponentTypeMask getDrawBufferTypeMask() const;
>+    DrawBufferMask getDrawBufferMask() const;
>     bool hasEnabledDrawBuffer() const;
> 
>     GLenum getReadBufferState() const;
>@@ -210,79 +225,93 @@ class Framebuffer final : public LabeledObject, public OnAttachmentDirtyReceiver
>     // This method calls checkStatus.
>     int getSamples(const Context *context);
> 
>-    Error getSamplePosition(size_t index, GLfloat *xy) const;
>+    angle::Result getSamplePosition(const Context *context, size_t index, GLfloat *xy) const;
> 
>     GLint getDefaultWidth() const;
>     GLint getDefaultHeight() const;
>     GLint getDefaultSamples() const;
>     bool getDefaultFixedSampleLocations() const;
>-    void setDefaultWidth(GLint defaultWidth);
>-    void setDefaultHeight(GLint defaultHeight);
>-    void setDefaultSamples(GLint defaultSamples);
>-    void setDefaultFixedSampleLocations(bool defaultFixedSampleLocations);
>+    GLint getDefaultLayers() const;
>+    void setDefaultWidth(const Context *context, GLint defaultWidth);
>+    void setDefaultHeight(const Context *context, GLint defaultHeight);
>+    void setDefaultSamples(const Context *context, GLint defaultSamples);
>+    void setDefaultFixedSampleLocations(const Context *context, bool defaultFixedSampleLocations);
>+    void setDefaultLayers(GLint defaultLayers);
> 
>-    void invalidateCompletenessCache();
>+    void invalidateCompletenessCache(const Context *context);
> 
>-    GLenum checkStatus(const Context *context);
>-
>-    // TODO(jmadill): Remove this kludge.
>-    GLenum checkStatus(const ValidationContext *context);
>-    int getSamples(const ValidationContext *context);
>+    ANGLE_INLINE GLenum checkStatus(const Context *context)
>+    {
>+        // The default framebuffer is always complete except when it is surfaceless in which
>+        // case it is always unsupported.
>+        ASSERT(mState.mId != 0 || mCachedStatus.valid());
>+        if (mState.mId == 0 || (!hasAnyDirtyBit() && mCachedStatus.valid()))
>+        {
>+            return mCachedStatus.value();
>+        }
>+
>+        return checkStatusImpl(context);
>+    }
> 
>     // For when we don't want to check completeness in getSamples().
>     int getCachedSamples(const Context *context);
> 
>     // Helper for checkStatus == GL_FRAMEBUFFER_COMPLETE.
>-    bool complete(const Context *context);
>-    bool cachedComplete() const;
>+    ANGLE_INLINE bool isComplete(const Context *context)
>+    {
>+        return (checkStatus(context) == GL_FRAMEBUFFER_COMPLETE);
>+    }
> 
>     bool hasValidDepthStencil() const;
> 
>-    Error discard(const Context *context, size_t count, const GLenum *attachments);
>-    Error invalidate(const Context *context, size_t count, const GLenum *attachments);
>-    Error invalidateSub(const Context *context,
>-                        size_t count,
>-                        const GLenum *attachments,
>-                        const gl::Rectangle &area);
>-
>-    Error clear(const gl::Context *context, GLbitfield mask);
>-    Error clearBufferfv(const gl::Context *context,
>-                        GLenum buffer,
>-                        GLint drawbuffer,
>-                        const GLfloat *values);
>-    Error clearBufferuiv(const gl::Context *context,
>-                         GLenum buffer,
>-                         GLint drawbuffer,
>-                         const GLuint *values);
>-    Error clearBufferiv(const gl::Context *context,
>-                        GLenum buffer,
>-                        GLint drawbuffer,
>-                        const GLint *values);
>-    Error clearBufferfi(const gl::Context *context,
>-                        GLenum buffer,
>-                        GLint drawbuffer,
>-                        GLfloat depth,
>-                        GLint stencil);
>-
>-    GLenum getImplementationColorReadFormat(const Context *context) const;
>-    GLenum getImplementationColorReadType(const Context *context) const;
>-    Error readPixels(const gl::Context *context,
>-                     const gl::Rectangle &area,
>-                     GLenum format,
>-                     GLenum type,
>-                     void *pixels);
>-
>-    Error blit(const gl::Context *context,
>-               const Rectangle &sourceArea,
>-               const Rectangle &destArea,
>-               GLbitfield mask,
>-               GLenum filter);
>+    angle::Result discard(const Context *context, size_t count, const GLenum *attachments);
>+    angle::Result invalidate(const Context *context, size_t count, const GLenum *attachments);
>+    angle::Result invalidateSub(const Context *context,
>+                                size_t count,
>+                                const GLenum *attachments,
>+                                const Rectangle &area);
>+
>+    angle::Result clear(const Context *context, GLbitfield mask);
>+    angle::Result clearBufferfv(const Context *context,
>+                                GLenum buffer,
>+                                GLint drawbuffer,
>+                                const GLfloat *values);
>+    angle::Result clearBufferuiv(const Context *context,
>+                                 GLenum buffer,
>+                                 GLint drawbuffer,
>+                                 const GLuint *values);
>+    angle::Result clearBufferiv(const Context *context,
>+                                GLenum buffer,
>+                                GLint drawbuffer,
>+                                const GLint *values);
>+    angle::Result clearBufferfi(const Context *context,
>+                                GLenum buffer,
>+                                GLint drawbuffer,
>+                                GLfloat depth,
>+                                GLint stencil);
>+
>+    // These two methods call syncState() internally.
>+    angle::Result getImplementationColorReadFormat(const Context *context, GLenum *formatOut);
>+    angle::Result getImplementationColorReadType(const Context *context, GLenum *typeOut);
>+
>+    angle::Result readPixels(const Context *context,
>+                             const Rectangle &area,
>+                             GLenum format,
>+                             GLenum type,
>+                             void *pixels);
>+
>+    angle::Result blit(const Context *context,
>+                       const Rectangle &sourceArea,
>+                       const Rectangle &destArea,
>+                       GLbitfield mask,
>+                       GLenum filter);
>+    bool isDefault() const;
> 
>     enum DirtyBitType : size_t
>     {
>         DIRTY_BIT_COLOR_ATTACHMENT_0,
>         DIRTY_BIT_COLOR_ATTACHMENT_MAX =
>-            DIRTY_BIT_COLOR_ATTACHMENT_0 + gl::IMPLEMENTATION_MAX_FRAMEBUFFER_ATTACHMENTS,
>+            DIRTY_BIT_COLOR_ATTACHMENT_0 + IMPLEMENTATION_MAX_FRAMEBUFFER_ATTACHMENTS,
>         DIRTY_BIT_DEPTH_ATTACHMENT = DIRTY_BIT_COLOR_ATTACHMENT_MAX,
>         DIRTY_BIT_STENCIL_ATTACHMENT,
>         DIRTY_BIT_DRAW_BUFFERS,
>@@ -291,36 +320,48 @@ class Framebuffer final : public LabeledObject, public OnAttachmentDirtyReceiver
>         DIRTY_BIT_DEFAULT_HEIGHT,
>         DIRTY_BIT_DEFAULT_SAMPLES,
>         DIRTY_BIT_DEFAULT_FIXED_SAMPLE_LOCATIONS,
>+        DIRTY_BIT_DEFAULT_LAYERS,
>         DIRTY_BIT_UNKNOWN,
>         DIRTY_BIT_MAX = DIRTY_BIT_UNKNOWN
>     };
> 
>-    typedef angle::BitSet<DIRTY_BIT_MAX> DirtyBits;
>+    using DirtyBits = angle::BitSet<DIRTY_BIT_MAX>;
>     bool hasAnyDirtyBit() const { return mDirtyBits.any(); }
> 
>-    void syncState(const Context *context);
>+    bool hasActiveFloat32ColorAttachment() const
>+    {
>+        return (mFloat32ColorAttachmentBits & getDrawBufferMask()).any();
>+    }
>+
>+    bool hasResourceThatNeedsInit() const { return mState.mResourceNeedsInit.any(); }
> 
>-    // OnAttachmentChangedReceiver implementation
>-    void signal(size_t dirtyBit, InitState state) override;
>+    angle::Result syncState(const Context *context);
> 
>-    bool formsRenderingFeedbackLoopWith(const State &state) const;
>+    // Observer implementation
>+    void onSubjectStateChange(const Context *context,
>+                              angle::SubjectIndex index,
>+                              angle::SubjectMessage message) override;
>+
>+    bool formsRenderingFeedbackLoopWith(const Context *context) const;
>     bool formsCopyingFeedbackLoopWith(GLuint copyTextureID,
>                                       GLint copyTextureLevel,
>                                       GLint copyTextureLayer) const;
> 
>-    Error ensureDrawAttachmentsInitialized(const Context *context);
>-    Error ensureReadAttachmentInitialized(const Context *context, GLbitfield blitMask);
>+    angle::Result ensureClearAttachmentsInitialized(const Context *context, GLbitfield mask);
>+    angle::Result ensureClearBufferAttachmentsInitialized(const Context *context,
>+                                                          GLenum buffer,
>+                                                          GLint drawbuffer);
>+    angle::Result ensureDrawAttachmentsInitialized(const Context *context);
>+    angle::Result ensureReadAttachmentInitialized(const Context *context, GLbitfield blitMask);
>     Box getDimensions() const;
> 
>-    bool hasTextureAttachment(const Texture *texture) const;
>-
>   private:
>     bool detachResourceById(const Context *context, GLenum resourceType, GLuint resourceId);
>     bool detachMatchingAttachment(const Context *context,
>                                   FramebufferAttachment *attachment,
>                                   GLenum matchType,
>-                                  GLuint matchId,
>-                                  size_t dirtyBit);
>+                                  GLuint matchId);
>+    GLenum checkStatusWithGLFrontEnd(const Context *context);
>     GLenum checkStatusImpl(const Context *context);
>     void setAttachment(const Context *context,
>                        GLenum type,
>@@ -329,13 +370,11 @@ class Framebuffer final : public LabeledObject, public OnAttachmentDirtyReceiver
>                        FramebufferAttachmentObject *resource,
>                        GLsizei numViews,
>                        GLuint baseViewIndex,
>-                       GLenum multiviewLayout,
>-                       const GLint *viewportOffsets);
>+                       bool isMultiview);
>     void commitWebGL1DepthStencilIfConsistent(const Context *context,
>                                               GLsizei numViews,
>                                               GLuint baseViewIndex,
>-                                              GLenum multiviewLayout,
>-                                              const GLint *viewportOffsets);
>+                                              bool isMultiview);
>     void setAttachmentImpl(const Context *context,
>                            GLenum type,
>                            GLenum binding,
>@@ -343,24 +382,24 @@ class Framebuffer final : public LabeledObject, public OnAttachmentDirtyReceiver
>                            FramebufferAttachmentObject *resource,
>                            GLsizei numViews,
>                            GLuint baseViewIndex,
>-                           GLenum multiviewLayout,
>-                           const GLint *viewportOffsets);
>+                           bool isMultiview);
>     void updateAttachment(const Context *context,
>                           FramebufferAttachment *attachment,
>                           size_t dirtyBit,
>-                          OnAttachmentDirtyBinding *onDirtyBinding,
>+                          angle::ObserverBinding *onDirtyBinding,
>                           GLenum type,
>                           GLenum binding,
>                           const ImageIndex &textureIndex,
>                           FramebufferAttachmentObject *resource,
>                           GLsizei numViews,
>                           GLuint baseViewIndex,
>-                          GLenum multiviewLayout,
>-                          const GLint *viewportOffsets);
>+                          bool isMultiview);
> 
>     void markDrawAttachmentsInitialized(bool color, bool depth, bool stencil);
>     void markBufferInitialized(GLenum bufferType, GLint bufferIndex);
>-    Error ensureBufferInitialized(const Context *context, GLenum bufferType, GLint bufferIndex);
>+    angle::Result ensureBufferInitialized(const Context *context,
>+                                          GLenum bufferType,
>+                                          GLint bufferIndex);
> 
>     // Checks that we have a partially masked clear:
>     // * some color channels are masked out
>@@ -369,19 +408,29 @@ class Framebuffer final : public LabeledObject, public OnAttachmentDirtyReceiver
>     bool partialClearNeedsInit(const Context *context, bool color, bool depth, bool stencil);
>     bool partialBufferClearNeedsInit(const Context *context, GLenum bufferType);
> 
>+    FramebufferAttachment *getAttachmentFromSubjectIndex(angle::SubjectIndex index);
>+
>+    ANGLE_INLINE void updateFloat32ColorAttachmentBits(size_t index,
>+                                                       const gl::InternalFormat *format)
>+    {
>+        mFloat32ColorAttachmentBits.set(index, format->type == GL_FLOAT);
>+    }
>+
>     FramebufferState mState;
>     rx::FramebufferImpl *mImpl;
>-    GLuint mId;
> 
>     Optional<GLenum> mCachedStatus;
>-    std::vector<OnAttachmentDirtyBinding> mDirtyColorAttachmentBindings;
>-    OnAttachmentDirtyBinding mDirtyDepthAttachmentBinding;
>-    OnAttachmentDirtyBinding mDirtyStencilAttachmentBinding;
>+    std::vector<angle::ObserverBinding> mDirtyColorAttachmentBindings;
>+    angle::ObserverBinding mDirtyDepthAttachmentBinding;
>+    angle::ObserverBinding mDirtyStencilAttachmentBinding;
> 
>     DirtyBits mDirtyBits;
>+    DrawBufferMask mFloat32ColorAttachmentBits;
>+    DrawBufferMask mColorAttachmentBits;
> 
>-    // A cache of attached textures for quick validation of feedback loops.
>-    mutable Optional<std::set<const FramebufferAttachmentObject *>> mAttachedTextures;
>+    // The dirty bits guard is checked when we get a dependent state change message. We verify that
>+    // we don't set a dirty bit that isn't already set, when inside the dirty bits syncState.
>+    Optional<DirtyBits> mDirtyBitsGuard;
> };
> 
> }  // namespace gl
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/FramebufferAttachment.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/FramebufferAttachment.cpp
>index cf6bd9c2649..8238541dfd7 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/FramebufferAttachment.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/FramebufferAttachment.cpp
>@@ -22,58 +22,24 @@
> namespace gl
> {
> 
>-namespace
>-{
>-
>-std::vector<Offset> TransformViewportOffsetArrayToVectorOfOffsets(const GLint *viewportOffsets,
>-                                                                  GLsizei numViews)
>-{
>-    const size_t numViewsAsSizeT = static_cast<size_t>(numViews);
>-    std::vector<Offset> offsetVector;
>-    offsetVector.reserve(numViewsAsSizeT);
>-    for (size_t i = 0u; i < numViewsAsSizeT; ++i)
>-    {
>-        offsetVector.emplace_back(Offset(viewportOffsets[i * 2u], viewportOffsets[i * 2u + 1u], 0));
>-    }
>-    return offsetVector;
>-}
>-
>-}  // namespace
>-
> ////// FramebufferAttachment::Target Implementation //////
> 
>-const GLsizei FramebufferAttachment::kDefaultNumViews         = 1;
>-const GLenum FramebufferAttachment::kDefaultMultiviewLayout   = GL_NONE;
>-const GLint FramebufferAttachment::kDefaultBaseViewIndex      = 0;
>-const GLint FramebufferAttachment::kDefaultViewportOffsets[2] = {0};
>+const GLsizei FramebufferAttachment::kDefaultNumViews    = 1;
>+const GLint FramebufferAttachment::kDefaultBaseViewIndex = 0;
> 
>-std::vector<Offset> FramebufferAttachment::GetDefaultViewportOffsetVector()
>-{
>-    return TransformViewportOffsetArrayToVectorOfOffsets(
>-        FramebufferAttachment::kDefaultViewportOffsets, FramebufferAttachment::kDefaultNumViews);
>-}
>-
>-FramebufferAttachment::Target::Target()
>-    : mBinding(GL_NONE),
>-      mTextureIndex(ImageIndex::MakeInvalid())
>-{
>-}
>+FramebufferAttachment::Target::Target() : mBinding(GL_NONE), mTextureIndex() {}
> 
> FramebufferAttachment::Target::Target(GLenum binding, const ImageIndex &imageIndex)
>-    : mBinding(binding),
>-      mTextureIndex(imageIndex)
>-{
>-}
>+    : mBinding(binding), mTextureIndex(imageIndex)
>+{}
> 
> FramebufferAttachment::Target::Target(const Target &other)
>-    : mBinding(other.mBinding),
>-      mTextureIndex(other.mTextureIndex)
>-{
>-}
>+    : mBinding(other.mBinding), mTextureIndex(other.mTextureIndex)
>+{}
> 
> FramebufferAttachment::Target &FramebufferAttachment::Target::operator=(const Target &other)
> {
>-    this->mBinding = other.mBinding;
>+    this->mBinding      = other.mBinding;
>     this->mTextureIndex = other.mTextureIndex;
>     return *this;
> }
>@@ -84,11 +50,9 @@ FramebufferAttachment::FramebufferAttachment()
>     : mType(GL_NONE),
>       mResource(nullptr),
>       mNumViews(kDefaultNumViews),
>-      mMultiviewLayout(kDefaultMultiviewLayout),
>-      mBaseViewIndex(kDefaultBaseViewIndex),
>-      mViewportOffsets(GetDefaultViewportOffsetVector())
>-{
>-}
>+      mIsMultiview(false),
>+      mBaseViewIndex(kDefaultBaseViewIndex)
>+{}
> 
> FramebufferAttachment::FramebufferAttachment(const Context *context,
>                                              GLenum type,
>@@ -98,7 +62,7 @@ FramebufferAttachment::FramebufferAttachment(const Context *context,
>     : mResource(nullptr)
> {
>     attach(context, type, binding, textureIndex, resource, kDefaultNumViews, kDefaultBaseViewIndex,
>-           kDefaultMultiviewLayout, kDefaultViewportOffsets);
>+           false);
> }
> 
> FramebufferAttachment::FramebufferAttachment(FramebufferAttachment &&other)
>@@ -113,9 +77,8 @@ FramebufferAttachment &FramebufferAttachment::operator=(FramebufferAttachment &&
>     std::swap(mTarget, other.mTarget);
>     std::swap(mResource, other.mResource);
>     std::swap(mNumViews, other.mNumViews);
>-    std::swap(mMultiviewLayout, other.mMultiviewLayout);
>+    std::swap(mIsMultiview, other.mIsMultiview);
>     std::swap(mBaseViewIndex, other.mBaseViewIndex);
>-    std::swap(mViewportOffsets, other.mViewportOffsets);
>     return *this;
> }
> 
>@@ -132,10 +95,9 @@ void FramebufferAttachment::detach(const Context *context)
>         mResource->onDetach(context);
>         mResource = nullptr;
>     }
>-    mNumViews        = kDefaultNumViews;
>-    mMultiviewLayout = kDefaultMultiviewLayout;
>-    mBaseViewIndex   = kDefaultBaseViewIndex;
>-    mViewportOffsets = GetDefaultViewportOffsetVector();
>+    mNumViews      = kDefaultNumViews;
>+    mIsMultiview   = false;
>+    mBaseViewIndex = kDefaultBaseViewIndex;
> 
>     // not technically necessary, could omit for performance
>     mTarget = Target();
>@@ -148,8 +110,7 @@ void FramebufferAttachment::attach(const Context *context,
>                                    FramebufferAttachmentObject *resource,
>                                    GLsizei numViews,
>                                    GLuint baseViewIndex,
>-                                   GLenum multiviewLayout,
>-                                   const GLint *viewportOffsets)
>+                                   bool isMultiview)
> {
>     if (resource == nullptr)
>     {
>@@ -157,19 +118,11 @@ void FramebufferAttachment::attach(const Context *context,
>         return;
>     }
> 
>-    mType = type;
>-    mTarget = Target(binding, textureIndex);
>-    mNumViews        = numViews;
>-    mBaseViewIndex   = baseViewIndex;
>-    mMultiviewLayout = multiviewLayout;
>-    if (multiviewLayout == GL_FRAMEBUFFER_MULTIVIEW_SIDE_BY_SIDE_ANGLE)
>-    {
>-        mViewportOffsets = TransformViewportOffsetArrayToVectorOfOffsets(viewportOffsets, numViews);
>-    }
>-    else
>-    {
>-        mViewportOffsets = GetDefaultViewportOffsetVector();
>-    }
>+    mType          = type;
>+    mTarget        = Target(binding, textureIndex);
>+    mNumViews      = numViews;
>+    mBaseViewIndex = baseViewIndex;
>+    mIsMultiview   = isMultiview;
>     resource->onAttach(context);
> 
>     if (mResource != nullptr)
>@@ -231,41 +184,36 @@ const ImageIndex &FramebufferAttachment::getTextureImageIndex() const
>     return mTarget.textureIndex();
> }
> 
>-GLenum FramebufferAttachment::cubeMapFace() const
>+TextureTarget FramebufferAttachment::cubeMapFace() const
> {
>     ASSERT(mType == GL_TEXTURE);
> 
>     const auto &index = mTarget.textureIndex();
>-    return IsCubeMapTextureTarget(index.type) ? index.type : GL_NONE;
>+    return index.getType() == TextureType::CubeMap ? index.getTarget() : TextureTarget::InvalidEnum;
> }
> 
> GLint FramebufferAttachment::mipLevel() const
> {
>     ASSERT(type() == GL_TEXTURE);
>-    return mTarget.textureIndex().mipIndex;
>+    return mTarget.textureIndex().getLevelIndex();
> }
> 
> GLint FramebufferAttachment::layer() const
> {
>     ASSERT(mType == GL_TEXTURE);
> 
>-    const auto &index = mTarget.textureIndex();
>-
>-    if (index.type == GL_TEXTURE_2D_ARRAY || index.type == GL_TEXTURE_3D)
>-    {
>-        return index.layerIndex;
>-    }
>-    return 0;
>+    const gl::ImageIndex &index = mTarget.textureIndex();
>+    return (index.has3DLayer() ? index.getLayerIndex() : 0);
> }
> 
>-GLsizei FramebufferAttachment::getNumViews() const
>+bool FramebufferAttachment::isLayered() const
> {
>-    return mNumViews;
>+    return mTarget.textureIndex().isLayered();
> }
> 
>-GLenum FramebufferAttachment::getMultiviewLayout() const
>+bool FramebufferAttachment::isMultiview() const
> {
>-    return mMultiviewLayout;
>+    return mIsMultiview;
> }
> 
> GLint FramebufferAttachment::getBaseViewIndex() const
>@@ -273,11 +221,6 @@ GLint FramebufferAttachment::getBaseViewIndex() const
>     return mBaseViewIndex;
> }
> 
>-const std::vector<Offset> &FramebufferAttachment::getMultiviewViewportOffsets() const
>-{
>-    return mViewportOffsets;
>-}
>-
> Texture *FramebufferAttachment::getTexture() const
> {
>     return rx::GetAs<Texture>(mResource);
>@@ -301,8 +244,7 @@ FramebufferAttachmentObject *FramebufferAttachment::getResource() const
> bool FramebufferAttachment::operator==(const FramebufferAttachment &other) const
> {
>     if (mResource != other.mResource || mType != other.mType || mNumViews != other.mNumViews ||
>-        mMultiviewLayout != other.mMultiviewLayout || mBaseViewIndex != other.mBaseViewIndex ||
>-        mViewportOffsets != other.mViewportOffsets)
>+        mIsMultiview != other.mIsMultiview || mBaseViewIndex != other.mBaseViewIndex)
>     {
>         return false;
>     }
>@@ -325,12 +267,12 @@ InitState FramebufferAttachment::initState() const
>     return mResource ? mResource->initState(mTarget.textureIndex()) : InitState::Initialized;
> }
> 
>-Error FramebufferAttachment::initializeContents(const Context *context)
>+angle::Result FramebufferAttachment::initializeContents(const Context *context)
> {
>     ASSERT(mResource);
>     ANGLE_TRY(mResource->initializeContents(context, mTarget.textureIndex()));
>     setInitState(InitState::Initialized);
>-    return NoError();
>+    return angle::Result::Continue;
> }
> 
> void FramebufferAttachment::setInitState(InitState initState) const
>@@ -341,15 +283,11 @@ void FramebufferAttachment::setInitState(InitState initState) const
> 
> ////// FramebufferAttachmentObject Implementation //////
> 
>-FramebufferAttachmentObject::FramebufferAttachmentObject()
>-{
>-}
>+FramebufferAttachmentObject::FramebufferAttachmentObject() {}
> 
>-FramebufferAttachmentObject::~FramebufferAttachmentObject()
>-{
>-}
>+FramebufferAttachmentObject::~FramebufferAttachmentObject() {}
> 
>-Error FramebufferAttachmentObject::getAttachmentRenderTarget(
>+angle::Result FramebufferAttachmentObject::getAttachmentRenderTarget(
>     const Context *context,
>     GLenum binding,
>     const ImageIndex &imageIndex,
>@@ -358,22 +296,22 @@ Error FramebufferAttachmentObject::getAttachmentRenderTarget(
>     return getAttachmentImpl()->getAttachmentRenderTarget(context, binding, imageIndex, rtOut);
> }
> 
>-OnAttachmentDirtyChannel *FramebufferAttachmentObject::getDirtyChannel()
>-{
>-    return &mDirtyChannel;
>-}
>-
>-Error FramebufferAttachmentObject::initializeContents(const Context *context,
>-                                                      const ImageIndex &imageIndex)
>+angle::Result FramebufferAttachmentObject::initializeContents(const Context *context,
>+                                                              const ImageIndex &imageIndex)
> {
>     ASSERT(context->isRobustResourceInitEnabled());
> 
>     // Because gl::Texture cannot support tracking individual layer dirtiness, we only handle
>     // initializing entire mip levels for 2D array textures.
>-    if (imageIndex.type == GL_TEXTURE_2D_ARRAY && imageIndex.hasLayer())
>+    if (imageIndex.getType() == TextureType::_2DArray && imageIndex.hasLayer())
>+    {
>+        ImageIndex fullMipIndex =
>+            ImageIndex::Make2DArray(imageIndex.getLevelIndex(), ImageIndex::kEntireLevel);
>+        return getAttachmentImpl()->initializeContents(context, fullMipIndex);
>+    }
>+    else if (imageIndex.getType() == TextureType::_2DMultisampleArray && imageIndex.hasLayer())
>     {
>-        ImageIndex fullMipIndex = imageIndex;
>-        fullMipIndex.layerIndex = ImageIndex::ENTIRE_LEVEL;
>+        ImageIndex fullMipIndex = ImageIndex::Make2DMultisampleArray(ImageIndex::kEntireLevel);
>         return getAttachmentImpl()->initializeContents(context, fullMipIndex);
>     }
>     else
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/FramebufferAttachment.h b/Source/ThirdParty/ANGLE/src/libANGLE/FramebufferAttachment.h
>index 5c0553a1d4c..10d8c990b57 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/FramebufferAttachment.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/FramebufferAttachment.h
>@@ -12,10 +12,11 @@
> 
> #include "angle_gl.h"
> #include "common/angleutils.h"
>-#include "libANGLE/angletypes.h"
> #include "libANGLE/Error.h"
> #include "libANGLE/ImageIndex.h"
>-#include "libANGLE/signal_utils.h"
>+#include "libANGLE/Observer.h"
>+#include "libANGLE/formatutils.h"
>+#include "libANGLE/renderer/FramebufferAttachmentObjectImpl.h"
> 
> namespace egl
> {
>@@ -34,12 +35,11 @@ class FramebufferAttachmentRenderTarget : angle::NonCopyable
> };
> 
> class FramebufferAttachmentObjectImpl;
>-}
>+}  // namespace rx
> 
> namespace gl
> {
> class FramebufferAttachmentObject;
>-struct Format;
> class Renderbuffer;
> class Texture;
> 
>@@ -49,10 +49,6 @@ enum class InitState
>     Initialized,
> };
> 
>-using OnAttachmentDirtyBinding  = angle::ChannelBinding<size_t, InitState>;
>-using OnAttachmentDirtyChannel  = angle::BroadcastChannel<size_t, InitState>;
>-using OnAttachmentDirtyReceiver = angle::SignalReceiver<size_t, InitState>;
>-
> // FramebufferAttachment implements a GL framebuffer attachment.
> // Attachments are "light" containers, which store pointers to ref-counted GL objects.
> // We support GL texture (2D/3D/Cube/2D array) and renderbuffer object attachments.
>@@ -83,8 +79,7 @@ class FramebufferAttachment final
>                 FramebufferAttachmentObject *resource,
>                 GLsizei numViews,
>                 GLuint baseViewIndex,
>-                GLenum multiviewLayout,
>-                const GLint *viewportOffsets);
>+                bool isMultiview);
> 
>     // Helper methods
>     GLuint getRedSize() const;
>@@ -96,42 +91,51 @@ class FramebufferAttachment final
>     GLenum getComponentType() const;
>     GLenum getColorEncoding() const;
> 
>-    bool isTextureWithId(GLuint textureId) const { return mType == GL_TEXTURE && id() == textureId; }
>-    bool isRenderbufferWithId(GLuint renderbufferId) const { return mType == GL_RENDERBUFFER && id() == renderbufferId; }
>+    bool isTextureWithId(GLuint textureId) const
>+    {
>+        return mType == GL_TEXTURE && id() == textureId;
>+    }
>+    bool isRenderbufferWithId(GLuint renderbufferId) const
>+    {
>+        return mType == GL_RENDERBUFFER && id() == renderbufferId;
>+    }
> 
>     GLenum getBinding() const { return mTarget.binding(); }
>     GLuint id() const;
> 
>     // These methods are only legal to call on Texture attachments
>     const ImageIndex &getTextureImageIndex() const;
>-    GLenum cubeMapFace() const;
>+    TextureTarget cubeMapFace() const;
>     GLint mipLevel() const;
>     GLint layer() const;
>-    GLsizei getNumViews() const;
>-    GLenum getMultiviewLayout() const;
>+    bool isLayered() const;
>+
>+    GLsizei getNumViews() const { return mNumViews; }
>+
>+    bool isMultiview() const;
>     GLint getBaseViewIndex() const;
>-    const std::vector<Offset> &getMultiviewViewportOffsets() const;
> 
>     // The size of the underlying resource the attachment points to. The 'depth' value will
>     // correspond to a 3D texture depth or the layer count of a 2D array texture. For Surfaces and
>     // Renderbuffers, it will always be 1.
>     Extents getSize() const;
>-    const Format &getFormat() const;
>+    Format getFormat() const;
>     GLsizei getSamples() const;
>     GLenum type() const { return mType; }
>     bool isAttached() const { return mType != GL_NONE; }
>+    bool isRenderable(const Context *context) const;
> 
>     Renderbuffer *getRenderbuffer() const;
>     Texture *getTexture() const;
>     const egl::Surface *getSurface() const;
>     FramebufferAttachmentObject *getResource() const;
>     InitState initState() const;
>-    Error initializeContents(const Context *context);
>+    angle::Result initializeContents(const Context *context);
>     void setInitState(InitState initState) const;
> 
>     // "T" must be static_castable from FramebufferAttachmentRenderTarget
>     template <typename T>
>-    gl::Error getRenderTarget(const Context *context, T **rtOut) const
>+    angle::Result getRenderTarget(const Context *context, T **rtOut) const
>     {
>         static_assert(std::is_base_of<rx::FramebufferAttachmentRenderTarget, T>(),
>                       "Invalid RenderTarget class.");
>@@ -142,15 +146,12 @@ class FramebufferAttachment final
>     bool operator==(const FramebufferAttachment &other) const;
>     bool operator!=(const FramebufferAttachment &other) const;
> 
>-    static std::vector<Offset> GetDefaultViewportOffsetVector();
>     static const GLsizei kDefaultNumViews;
>-    static const GLenum kDefaultMultiviewLayout;
>     static const GLint kDefaultBaseViewIndex;
>-    static const GLint kDefaultViewportOffsets[2];
> 
>   private:
>-    gl::Error getRenderTargetImpl(const Context *context,
>-                                  rx::FramebufferAttachmentRenderTarget **rtOut) const;
>+    angle::Result getRenderTargetImpl(const Context *context,
>+                                      rx::FramebufferAttachmentRenderTarget **rtOut) const;
> 
>     // A framebuffer attachment points to one of three types of resources: Renderbuffers,
>     // Textures and egl::Surface. The "Target" struct indicates which part of the
>@@ -178,44 +179,41 @@ class FramebufferAttachment final
>     Target mTarget;
>     FramebufferAttachmentObject *mResource;
>     GLsizei mNumViews;
>-    GLenum mMultiviewLayout;
>+    bool mIsMultiview;
>     GLint mBaseViewIndex;
>-    std::vector<Offset> mViewportOffsets;
> };
> 
> // A base class for objects that FBO Attachments may point to.
>-class FramebufferAttachmentObject
>+class FramebufferAttachmentObject : public angle::Subject
> {
>   public:
>     FramebufferAttachmentObject();
>-    virtual ~FramebufferAttachmentObject();
>+    ~FramebufferAttachmentObject() override;
> 
>-    virtual Extents getAttachmentSize(const ImageIndex &imageIndex) const = 0;
>-    virtual const Format &getAttachmentFormat(GLenum binding,
>-                                              const ImageIndex &imageIndex) const = 0;
>-    virtual GLsizei getAttachmentSamples(const ImageIndex &imageIndex) const      = 0;
>+    virtual Extents getAttachmentSize(const ImageIndex &imageIndex) const                  = 0;
>+    virtual Format getAttachmentFormat(GLenum binding, const ImageIndex &imageIndex) const = 0;
>+    virtual GLsizei getAttachmentSamples(const ImageIndex &imageIndex) const               = 0;
>+    virtual bool isRenderable(const Context *context,
>+                              GLenum binding,
>+                              const ImageIndex &imageIndex) const                          = 0;
> 
>     virtual void onAttach(const Context *context) = 0;
>     virtual void onDetach(const Context *context) = 0;
>-    virtual GLuint getId() const = 0;
>+    virtual GLuint getId() const                  = 0;
> 
>     // These are used for robust resource initialization.
>-    virtual InitState initState(const ImageIndex &imageIndex) const = 0;
>+    virtual InitState initState(const ImageIndex &imageIndex) const              = 0;
>     virtual void setInitState(const ImageIndex &imageIndex, InitState initState) = 0;
> 
>-    Error getAttachmentRenderTarget(const Context *context,
>-                                    GLenum binding,
>-                                    const ImageIndex &imageIndex,
>-                                    rx::FramebufferAttachmentRenderTarget **rtOut) const;
>-
>-    Error initializeContents(const Context *context, const ImageIndex &imageIndex);
>+    angle::Result getAttachmentRenderTarget(const Context *context,
>+                                            GLenum binding,
>+                                            const ImageIndex &imageIndex,
>+                                            rx::FramebufferAttachmentRenderTarget **rtOut) const;
> 
>-    OnAttachmentDirtyChannel *getDirtyChannel();
>+    angle::Result initializeContents(const Context *context, const ImageIndex &imageIndex);
> 
>   protected:
>     virtual rx::FramebufferAttachmentObjectImpl *getAttachmentImpl() const = 0;
>-
>-    OnAttachmentDirtyChannel mDirtyChannel;
> };
> 
> inline Extents FramebufferAttachment::getSize() const
>@@ -224,7 +222,7 @@ inline Extents FramebufferAttachment::getSize() const
>     return mResource->getAttachmentSize(mTarget.textureIndex());
> }
> 
>-inline const Format &FramebufferAttachment::getFormat() const
>+inline Format FramebufferAttachment::getFormat() const
> {
>     ASSERT(mResource);
>     return mResource->getAttachmentFormat(mTarget.binding(), mTarget.textureIndex());
>@@ -236,7 +234,7 @@ inline GLsizei FramebufferAttachment::getSamples() const
>     return mResource->getAttachmentSamples(mTarget.textureIndex());
> }
> 
>-inline gl::Error FramebufferAttachment::getRenderTargetImpl(
>+inline angle::Result FramebufferAttachment::getRenderTargetImpl(
>     const Context *context,
>     rx::FramebufferAttachmentRenderTarget **rtOut) const
> {
>@@ -245,6 +243,12 @@ inline gl::Error FramebufferAttachment::getRenderTargetImpl(
>                                                 rtOut);
> }
> 
>-} // namespace gl
>+inline bool FramebufferAttachment::isRenderable(const Context *context) const
>+{
>+    ASSERT(mResource);
>+    return mResource->isRenderable(context, mTarget.binding(), mTarget.textureIndex());
>+}
>+
>+}  // namespace gl
> 
>-#endif // LIBANGLE_FRAMEBUFFERATTACHMENT_H_
>+#endif  // LIBANGLE_FRAMEBUFFERATTACHMENT_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/GLES1Renderer.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/GLES1Renderer.cpp
>new file mode 100644
>index 00000000000..4e7395ef0b7
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/GLES1Renderer.cpp
>@@ -0,0 +1,884 @@
>+//
>+// Copyright 2018 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+
>+// GLES1Renderer.cpp: Implements the GLES1Renderer renderer.
>+
>+#include "libANGLE/GLES1Renderer.h"
>+
>+#include <string.h>
>+#include <iterator>
>+#include <sstream>
>+#include <vector>
>+
>+#include "libANGLE/Context.h"
>+#include "libANGLE/Context.inl.h"
>+#include "libANGLE/Program.h"
>+#include "libANGLE/ResourceManager.h"
>+#include "libANGLE/Shader.h"
>+#include "libANGLE/State.h"
>+#include "libANGLE/renderer/ContextImpl.h"
>+
>+namespace
>+{
>+#include "libANGLE/GLES1Shaders.inc"
>+}  // anonymous namespace
>+
>+namespace gl
>+{
>+
>+GLES1Renderer::GLES1Renderer() : mRendererProgramInitialized(false) {}
>+
>+void GLES1Renderer::onDestroy(Context *context, State *state)
>+{
>+    if (mRendererProgramInitialized)
>+    {
>+        (void)state->setProgram(context, 0);
>+
>+        mShaderPrograms->deleteProgram(context, mProgramState.program);
>+        mShaderPrograms->release(context);
>+        mShaderPrograms             = nullptr;
>+        mRendererProgramInitialized = false;
>+    }
>+}
>+
>+GLES1Renderer::~GLES1Renderer() = default;
>+
>+angle::Result GLES1Renderer::prepareForDraw(PrimitiveMode mode, Context *context, State *glState)
>+{
>+    ANGLE_TRY(initializeRendererProgram(context, glState));
>+
>+    GLES1State &gles1State = glState->gles1();
>+
>+    Program *programObject = getProgram(mProgramState.program);
>+
>+    GLES1UniformBuffers &uniformBuffers = mUniformBuffers;
>+
>+    // If anything is dirty in gles1 or the common parts of gles1/2, just redo these parts
>+    // completely for now.
>+
>+    // Feature enables
>+    {
>+        setUniform1i(context, programObject, mProgramState.enableAlphaTestLoc,
>+                     glState->getEnableFeature(GL_ALPHA_TEST));
>+        setUniform1i(context, programObject, mProgramState.enableLightingLoc,
>+                     glState->getEnableFeature(GL_LIGHTING));
>+        setUniform1i(context, programObject, mProgramState.enableRescaleNormalLoc,
>+                     glState->getEnableFeature(GL_RESCALE_NORMAL));
>+        setUniform1i(context, programObject, mProgramState.enableNormalizeLoc,
>+                     glState->getEnableFeature(GL_NORMALIZE));
>+        setUniform1i(context, programObject, mProgramState.enableColorMaterialLoc,
>+                     glState->getEnableFeature(GL_COLOR_MATERIAL));
>+        setUniform1i(context, programObject, mProgramState.fogEnableLoc,
>+                     glState->getEnableFeature(GL_FOG));
>+
>+        bool enableClipPlanes = false;
>+        for (int i = 0; i < kClipPlaneCount; i++)
>+        {
>+            uniformBuffers.clipPlaneEnables[i] = glState->getEnableFeature(GL_CLIP_PLANE0 + i);
>+            enableClipPlanes = enableClipPlanes || uniformBuffers.clipPlaneEnables[i];
>+        }
>+
>+        setUniform1i(context, programObject, mProgramState.enableClipPlanesLoc, enableClipPlanes);
>+    }
>+
>+    // Texture unit enables and format info
>+    {
>+        std::array<GLint, kTexUnitCount> &tex2DEnables   = uniformBuffers.tex2DEnables;
>+        std::array<GLint, kTexUnitCount> &texCubeEnables = uniformBuffers.texCubeEnables;
>+
>+        std::vector<int> tex2DFormats = {GL_RGBA, GL_RGBA, GL_RGBA, GL_RGBA};
>+
>+        Vec4Uniform *cropRectBuffer = uniformBuffers.texCropRects.data();
>+
>+        for (int i = 0; i < kTexUnitCount; i++)
>+        {
>+            // GL_OES_cube_map allows only one of TEXTURE_2D / TEXTURE_CUBE_MAP
>+            // to be enabled per unit, thankfully. From the extension text:
>+            //
>+            //  --  Section 3.8.10 "Texture Application"
>+            //
>+            //      Replace the beginning sentences of the first paragraph (page 138)
>+            //      with:
>+            //
>+            //      "Texturing is enabled or disabled using the generic Enable
>+            //      and Disable commands, respectively, with the symbolic constants
>+            //      TEXTURE_2D or TEXTURE_CUBE_MAP_OES to enable the two-dimensional or cube
>+            //      map texturing respectively.  If the cube map texture and the two-
>+            //      dimensional texture are enabled, then cube map texturing is used.  If
>+            //      texturing is disabled, a rasterized fragment is passed on unaltered to the
>+            //      next stage of the GL (although its texture coordinates may be discarded).
>+            //      Otherwise, a texture value is found according to the parameter values of
>+            //      the currently bound texture image of the appropriate dimensionality.
>+
>+            texCubeEnables[i] = gles1State.isTextureTargetEnabled(i, TextureType::CubeMap);
>+            tex2DEnables[i] =
>+                !texCubeEnables[i] && (gles1State.isTextureTargetEnabled(i, TextureType::_2D));
>+
>+            Texture *curr2DTexture = glState->getSamplerTexture(i, TextureType::_2D);
>+            if (curr2DTexture)
>+            {
>+                tex2DFormats[i] = gl::GetUnsizedFormat(
>+                    curr2DTexture->getFormat(TextureTarget::_2D, 0).info->internalFormat);
>+
>+                const gl::Rectangle &cropRect = curr2DTexture->getCrop();
>+
>+                GLfloat textureWidth =
>+                    static_cast<GLfloat>(curr2DTexture->getWidth(TextureTarget::_2D, 0));
>+                GLfloat textureHeight =
>+                    static_cast<GLfloat>(curr2DTexture->getHeight(TextureTarget::_2D, 0));
>+
>+                if (textureWidth > 0.0f && textureHeight > 0.0f)
>+                {
>+                    cropRectBuffer[i][0] = cropRect.x / textureWidth;
>+                    cropRectBuffer[i][1] = cropRect.y / textureHeight;
>+                    cropRectBuffer[i][2] = cropRect.width / textureWidth;
>+                    cropRectBuffer[i][3] = cropRect.height / textureHeight;
>+                }
>+            }
>+        }
>+
>+        setUniform1iv(context, programObject, mProgramState.enableTexture2DLoc, kTexUnitCount,
>+                      tex2DEnables.data());
>+        setUniform1iv(context, programObject, mProgramState.enableTextureCubeMapLoc, kTexUnitCount,
>+                      texCubeEnables.data());
>+
>+        setUniform1iv(context, programObject, mProgramState.textureFormatLoc, kTexUnitCount,
>+                      tex2DFormats.data());
>+
>+        setUniform4fv(programObject, mProgramState.drawTextureNormalizedCropRectLoc, kTexUnitCount,
>+                      reinterpret_cast<GLfloat *>(cropRectBuffer));
>+    }
>+
>+    // Client state / current vector enables
>+    if (gles1State.isDirty(GLES1State::DIRTY_GLES1_CLIENT_STATE_ENABLE) ||
>+        gles1State.isDirty(GLES1State::DIRTY_GLES1_CURRENT_VECTOR))
>+    {
>+        if (!gles1State.isClientStateEnabled(ClientVertexArrayType::Normal))
>+        {
>+            const angle::Vector3 normal = gles1State.getCurrentNormal();
>+            context->vertexAttrib3f(kNormalAttribIndex, normal.x(), normal.y(), normal.z());
>+        }
>+
>+        if (!gles1State.isClientStateEnabled(ClientVertexArrayType::Color))
>+        {
>+            const ColorF color = gles1State.getCurrentColor();
>+            context->vertexAttrib4f(kColorAttribIndex, color.red, color.green, color.blue,
>+                                    color.alpha);
>+        }
>+
>+        if (!gles1State.isClientStateEnabled(ClientVertexArrayType::PointSize))
>+        {
>+            GLfloat pointSize = gles1State.mPointParameters.pointSize;
>+            context->vertexAttrib1f(kPointSizeAttribIndex, pointSize);
>+        }
>+
>+        for (int i = 0; i < kTexUnitCount; i++)
>+        {
>+            if (!gles1State.mTexCoordArrayEnabled[i])
>+            {
>+                const TextureCoordF texcoord = gles1State.getCurrentTextureCoords(i);
>+                context->vertexAttrib4f(kTextureCoordAttribIndexBase + i, texcoord.s, texcoord.t,
>+                                        texcoord.r, texcoord.q);
>+            }
>+        }
>+    }
>+
>+    // Matrices
>+    if (gles1State.isDirty(GLES1State::DIRTY_GLES1_MATRICES))
>+    {
>+        angle::Mat4 proj = gles1State.mProjectionMatrices.back();
>+        setUniformMatrix4fv(programObject, mProgramState.projMatrixLoc, 1, GL_FALSE, proj.data());
>+
>+        angle::Mat4 modelview = gles1State.mModelviewMatrices.back();
>+        setUniformMatrix4fv(programObject, mProgramState.modelviewMatrixLoc, 1, GL_FALSE,
>+                            modelview.data());
>+
>+        angle::Mat4 modelviewInvTr = modelview.transpose().inverse();
>+        setUniformMatrix4fv(programObject, mProgramState.modelviewInvTrLoc, 1, GL_FALSE,
>+                            modelviewInvTr.data());
>+
>+        Mat4Uniform *textureMatrixBuffer = uniformBuffers.textureMatrices.data();
>+
>+        for (int i = 0; i < kTexUnitCount; i++)
>+        {
>+            angle::Mat4 textureMatrix = gles1State.mTextureMatrices[i].back();
>+            memcpy(textureMatrixBuffer + i, textureMatrix.data(), sizeof(Mat4Uniform));
>+        }
>+
>+        setUniformMatrix4fv(programObject, mProgramState.textureMatrixLoc, kTexUnitCount, GL_FALSE,
>+                            reinterpret_cast<float *>(uniformBuffers.textureMatrices.data()));
>+    }
>+
>+    if (gles1State.isDirty(GLES1State::DIRTY_GLES1_TEXTURE_ENVIRONMENT))
>+    {
>+        for (int i = 0; i < kTexUnitCount; i++)
>+        {
>+            const auto &env = gles1State.textureEnvironment(i);
>+
>+            uniformBuffers.texEnvModes[i]      = ToGLenum(env.mode);
>+            uniformBuffers.texCombineRgbs[i]   = ToGLenum(env.combineRgb);
>+            uniformBuffers.texCombineAlphas[i] = ToGLenum(env.combineAlpha);
>+
>+            uniformBuffers.texCombineSrc0Rgbs[i]   = ToGLenum(env.src0Rgb);
>+            uniformBuffers.texCombineSrc0Alphas[i] = ToGLenum(env.src0Alpha);
>+            uniformBuffers.texCombineSrc1Rgbs[i]   = ToGLenum(env.src1Rgb);
>+            uniformBuffers.texCombineSrc1Alphas[i] = ToGLenum(env.src1Alpha);
>+            uniformBuffers.texCombineSrc2Rgbs[i]   = ToGLenum(env.src2Rgb);
>+            uniformBuffers.texCombineSrc2Alphas[i] = ToGLenum(env.src2Alpha);
>+
>+            uniformBuffers.texCombineOp0Rgbs[i]   = ToGLenum(env.op0Rgb);
>+            uniformBuffers.texCombineOp0Alphas[i] = ToGLenum(env.op0Alpha);
>+            uniformBuffers.texCombineOp1Rgbs[i]   = ToGLenum(env.op1Rgb);
>+            uniformBuffers.texCombineOp1Alphas[i] = ToGLenum(env.op1Alpha);
>+            uniformBuffers.texCombineOp2Rgbs[i]   = ToGLenum(env.op2Rgb);
>+            uniformBuffers.texCombineOp2Alphas[i] = ToGLenum(env.op2Alpha);
>+
>+            uniformBuffers.texEnvColors[i][0] = env.color.red;
>+            uniformBuffers.texEnvColors[i][1] = env.color.green;
>+            uniformBuffers.texEnvColors[i][2] = env.color.blue;
>+            uniformBuffers.texEnvColors[i][3] = env.color.alpha;
>+
>+            uniformBuffers.texEnvRgbScales[i]   = env.rgbScale;
>+            uniformBuffers.texEnvAlphaScales[i] = env.alphaScale;
>+
>+            uniformBuffers.pointSpriteCoordReplaces[i] = env.pointSpriteCoordReplace;
>+        }
>+
>+        setUniform1iv(context, programObject, mProgramState.textureEnvModeLoc, kTexUnitCount,
>+                      uniformBuffers.texEnvModes.data());
>+        setUniform1iv(context, programObject, mProgramState.combineRgbLoc, kTexUnitCount,
>+                      uniformBuffers.texCombineRgbs.data());
>+        setUniform1iv(context, programObject, mProgramState.combineAlphaLoc, kTexUnitCount,
>+                      uniformBuffers.texCombineAlphas.data());
>+
>+        setUniform1iv(context, programObject, mProgramState.src0rgbLoc, kTexUnitCount,
>+                      uniformBuffers.texCombineSrc0Rgbs.data());
>+        setUniform1iv(context, programObject, mProgramState.src0alphaLoc, kTexUnitCount,
>+                      uniformBuffers.texCombineSrc0Alphas.data());
>+        setUniform1iv(context, programObject, mProgramState.src1rgbLoc, kTexUnitCount,
>+                      uniformBuffers.texCombineSrc1Rgbs.data());
>+        setUniform1iv(context, programObject, mProgramState.src1alphaLoc, kTexUnitCount,
>+                      uniformBuffers.texCombineSrc1Alphas.data());
>+        setUniform1iv(context, programObject, mProgramState.src2rgbLoc, kTexUnitCount,
>+                      uniformBuffers.texCombineSrc2Rgbs.data());
>+        setUniform1iv(context, programObject, mProgramState.src2alphaLoc, kTexUnitCount,
>+                      uniformBuffers.texCombineSrc2Alphas.data());
>+
>+        setUniform1iv(context, programObject, mProgramState.op0rgbLoc, kTexUnitCount,
>+                      uniformBuffers.texCombineOp0Rgbs.data());
>+        setUniform1iv(context, programObject, mProgramState.op0alphaLoc, kTexUnitCount,
>+                      uniformBuffers.texCombineOp0Alphas.data());
>+        setUniform1iv(context, programObject, mProgramState.op1rgbLoc, kTexUnitCount,
>+                      uniformBuffers.texCombineOp1Rgbs.data());
>+        setUniform1iv(context, programObject, mProgramState.op1alphaLoc, kTexUnitCount,
>+                      uniformBuffers.texCombineOp1Alphas.data());
>+        setUniform1iv(context, programObject, mProgramState.op2rgbLoc, kTexUnitCount,
>+                      uniformBuffers.texCombineOp2Rgbs.data());
>+        setUniform1iv(context, programObject, mProgramState.op2alphaLoc, kTexUnitCount,
>+                      uniformBuffers.texCombineOp2Alphas.data());
>+
>+        setUniform4fv(programObject, mProgramState.textureEnvColorLoc, kTexUnitCount,
>+                      reinterpret_cast<float *>(uniformBuffers.texEnvColors.data()));
>+        setUniform1fv(programObject, mProgramState.rgbScaleLoc, kTexUnitCount,
>+                      uniformBuffers.texEnvRgbScales.data());
>+        setUniform1fv(programObject, mProgramState.alphaScaleLoc, kTexUnitCount,
>+                      uniformBuffers.texEnvAlphaScales.data());
>+
>+        setUniform1iv(context, programObject, mProgramState.pointSpriteCoordReplaceLoc,
>+                      kTexUnitCount, uniformBuffers.pointSpriteCoordReplaces.data());
>+    }
>+
>+    // Alpha test
>+    if (gles1State.isDirty(GLES1State::DIRTY_GLES1_ALPHA_TEST))
>+    {
>+        setUniform1i(context, programObject, mProgramState.alphaFuncLoc,
>+                     ToGLenum(gles1State.mAlphaTestFunc));
>+        setUniform1f(programObject, mProgramState.alphaTestRefLoc, gles1State.mAlphaTestRef);
>+    }
>+
>+    // Shading, materials, and lighting
>+    if (gles1State.isDirty(GLES1State::DIRTY_GLES1_SHADE_MODEL))
>+    {
>+        setUniform1i(context, programObject, mProgramState.shadeModelFlatLoc,
>+                     gles1State.mShadeModel == ShadingModel::Flat);
>+    }
>+
>+    if (gles1State.isDirty(GLES1State::DIRTY_GLES1_MATERIAL))
>+    {
>+        const auto &material = gles1State.mMaterial;
>+
>+        setUniform4fv(programObject, mProgramState.materialAmbientLoc, 1, material.ambient.data());
>+        setUniform4fv(programObject, mProgramState.materialDiffuseLoc, 1, material.diffuse.data());
>+        setUniform4fv(programObject, mProgramState.materialSpecularLoc, 1,
>+                      material.specular.data());
>+        setUniform4fv(programObject, mProgramState.materialEmissiveLoc, 1,
>+                      material.emissive.data());
>+        setUniform1f(programObject, mProgramState.materialSpecularExponentLoc,
>+                     material.specularExponent);
>+    }
>+
>+    if (gles1State.isDirty(GLES1State::DIRTY_GLES1_LIGHTS))
>+    {
>+        const auto &lightModel = gles1State.mLightModel;
>+
>+        setUniform4fv(programObject, mProgramState.lightModelSceneAmbientLoc, 1,
>+                      lightModel.color.data());
>+
>+        // TODO (lfy@google.com): Implement two-sided lighting model
>+        // gl->uniform1i(mProgramState.lightModelTwoSidedLoc, lightModel.twoSided);
>+
>+        for (int i = 0; i < kLightCount; i++)
>+        {
>+            const auto &light              = gles1State.mLights[i];
>+            uniformBuffers.lightEnables[i] = light.enabled;
>+            memcpy(uniformBuffers.lightAmbients.data() + i, light.ambient.data(),
>+                   sizeof(Vec4Uniform));
>+            memcpy(uniformBuffers.lightDiffuses.data() + i, light.diffuse.data(),
>+                   sizeof(Vec4Uniform));
>+            memcpy(uniformBuffers.lightSpeculars.data() + i, light.specular.data(),
>+                   sizeof(Vec4Uniform));
>+            memcpy(uniformBuffers.lightPositions.data() + i, light.position.data(),
>+                   sizeof(Vec4Uniform));
>+            memcpy(uniformBuffers.lightDirections.data() + i, light.direction.data(),
>+                   sizeof(Vec3Uniform));
>+            uniformBuffers.spotlightExponents[i]    = light.spotlightExponent;
>+            uniformBuffers.spotlightCutoffAngles[i] = light.spotlightCutoffAngle;
>+            uniformBuffers.attenuationConsts[i]     = light.attenuationConst;
>+            uniformBuffers.attenuationLinears[i]    = light.attenuationLinear;
>+            uniformBuffers.attenuationQuadratics[i] = light.attenuationQuadratic;
>+        }
>+
>+        setUniform1iv(context, programObject, mProgramState.lightEnablesLoc, kLightCount,
>+                      uniformBuffers.lightEnables.data());
>+        setUniform4fv(programObject, mProgramState.lightAmbientsLoc, kLightCount,
>+                      reinterpret_cast<float *>(uniformBuffers.lightAmbients.data()));
>+        setUniform4fv(programObject, mProgramState.lightDiffusesLoc, kLightCount,
>+                      reinterpret_cast<float *>(uniformBuffers.lightDiffuses.data()));
>+        setUniform4fv(programObject, mProgramState.lightSpecularsLoc, kLightCount,
>+                      reinterpret_cast<float *>(uniformBuffers.lightSpeculars.data()));
>+        setUniform4fv(programObject, mProgramState.lightPositionsLoc, kLightCount,
>+                      reinterpret_cast<float *>(uniformBuffers.lightPositions.data()));
>+        setUniform3fv(programObject, mProgramState.lightDirectionsLoc, kLightCount,
>+                      reinterpret_cast<float *>(uniformBuffers.lightDirections.data()));
>+        setUniform1fv(programObject, mProgramState.lightSpotlightExponentsLoc, kLightCount,
>+                      reinterpret_cast<float *>(uniformBuffers.spotlightExponents.data()));
>+        setUniform1fv(programObject, mProgramState.lightSpotlightCutoffAnglesLoc, kLightCount,
>+                      reinterpret_cast<float *>(uniformBuffers.spotlightCutoffAngles.data()));
>+        setUniform1fv(programObject, mProgramState.lightAttenuationConstsLoc, kLightCount,
>+                      reinterpret_cast<float *>(uniformBuffers.attenuationConsts.data()));
>+        setUniform1fv(programObject, mProgramState.lightAttenuationLinearsLoc, kLightCount,
>+                      reinterpret_cast<float *>(uniformBuffers.attenuationLinears.data()));
>+        setUniform1fv(programObject, mProgramState.lightAttenuationQuadraticsLoc, kLightCount,
>+                      reinterpret_cast<float *>(uniformBuffers.attenuationQuadratics.data()));
>+    }
>+
>+    if (gles1State.isDirty(GLES1State::DIRTY_GLES1_FOG))
>+    {
>+        const FogParameters &fog = gles1State.fogParameters();
>+        setUniform1i(context, programObject, mProgramState.fogModeLoc, ToGLenum(fog.mode));
>+        setUniform1f(programObject, mProgramState.fogDensityLoc, fog.density);
>+        setUniform1f(programObject, mProgramState.fogStartLoc, fog.start);
>+        setUniform1f(programObject, mProgramState.fogEndLoc, fog.end);
>+        setUniform4fv(programObject, mProgramState.fogColorLoc, 1, fog.color.data());
>+    }
>+
>+    // Clip planes
>+    if (gles1State.isDirty(GLES1State::DIRTY_GLES1_CLIP_PLANES))
>+    {
>+        bool enableClipPlanes = false;
>+        for (int i = 0; i < kClipPlaneCount; i++)
>+        {
>+            uniformBuffers.clipPlaneEnables[i] = glState->getEnableFeature(GL_CLIP_PLANE0 + i);
>+            enableClipPlanes = enableClipPlanes || uniformBuffers.clipPlaneEnables[i];
>+            gles1State.getClipPlane(
>+                i, reinterpret_cast<float *>(uniformBuffers.clipPlanes.data() + i));
>+        }
>+
>+        setUniform1i(context, programObject, mProgramState.enableClipPlanesLoc, enableClipPlanes);
>+        setUniform1iv(context, programObject, mProgramState.clipPlaneEnablesLoc, kClipPlaneCount,
>+                      uniformBuffers.clipPlaneEnables.data());
>+        setUniform4fv(programObject, mProgramState.clipPlanesLoc, kClipPlaneCount,
>+                      reinterpret_cast<float *>(uniformBuffers.clipPlanes.data()));
>+    }
>+
>+    // Point rasterization
>+    {
>+        const PointParameters &pointParams = gles1State.mPointParameters;
>+
>+        setUniform1i(context, programObject, mProgramState.pointRasterizationLoc,
>+                     mode == PrimitiveMode::Points);
>+        setUniform1i(context, programObject, mProgramState.pointSpriteEnabledLoc,
>+                     glState->getEnableFeature(GL_POINT_SPRITE_OES));
>+        setUniform1f(programObject, mProgramState.pointSizeMinLoc, pointParams.pointSizeMin);
>+        setUniform1f(programObject, mProgramState.pointSizeMaxLoc, pointParams.pointSizeMax);
>+        setUniform3fv(programObject, mProgramState.pointDistanceAttenuationLoc, 1,
>+                      pointParams.pointDistanceAttenuation.data());
>+    }
>+
>+    // Draw texture
>+    {
>+        setUniform1i(context, programObject, mProgramState.enableDrawTextureLoc,
>+                     mDrawTextureEnabled ? 1 : 0);
>+        setUniform4fv(programObject, mProgramState.drawTextureCoordsLoc, 1, mDrawTextureCoords);
>+        setUniform2fv(programObject, mProgramState.drawTextureDimsLoc, 1, mDrawTextureDims);
>+    }
>+
>+    gles1State.clearDirty();
>+    // None of those are changes in sampler, so there is no need to set the GL_PROGRAM dirty.
>+    // Otherwise, put the dirtying here.
>+
>+    return angle::Result::Continue;
>+}
>+
>+// static
>+int GLES1Renderer::VertexArrayIndex(ClientVertexArrayType type, const GLES1State &gles1)
>+{
>+    switch (type)
>+    {
>+        case ClientVertexArrayType::Vertex:
>+            return kVertexAttribIndex;
>+        case ClientVertexArrayType::Normal:
>+            return kNormalAttribIndex;
>+        case ClientVertexArrayType::Color:
>+            return kColorAttribIndex;
>+        case ClientVertexArrayType::PointSize:
>+            return kPointSizeAttribIndex;
>+        case ClientVertexArrayType::TextureCoord:
>+            return kTextureCoordAttribIndexBase + gles1.getClientTextureUnit();
>+        default:
>+            UNREACHABLE();
>+            return 0;
>+    }
>+}
>+
>+// static
>+int GLES1Renderer::TexCoordArrayIndex(unsigned int unit)
>+{
>+    return kTextureCoordAttribIndexBase + unit;
>+}
>+
>+void GLES1Renderer::drawTexture(Context *context,
>+                                State *glState,
>+                                float x,
>+                                float y,
>+                                float z,
>+                                float width,
>+                                float height)
>+{
>+
>+    // get viewport
>+    const gl::Rectangle &viewport = glState->getViewport();
>+
>+    // Translate from viewport to NDC for feeding the shader.
>+    // Recenter, rescale. (e.g., [0, 0, 1080, 1920] -> [-1, -1, 1, 1])
>+    float xNdc = scaleScreenCoordinateToNdc(x, static_cast<GLfloat>(viewport.width));
>+    float yNdc = scaleScreenCoordinateToNdc(y, static_cast<GLfloat>(viewport.height));
>+    float wNdc = scaleScreenDimensionToNdc(width, static_cast<GLfloat>(viewport.width));
>+    float hNdc = scaleScreenDimensionToNdc(height, static_cast<GLfloat>(viewport.height));
>+
>+    float zNdc = 2.0f * clamp(z, 0.0f, 1.0f) - 1.0f;
>+
>+    mDrawTextureCoords[0] = xNdc;
>+    mDrawTextureCoords[1] = yNdc;
>+    mDrawTextureCoords[2] = zNdc;
>+
>+    mDrawTextureDims[0] = wNdc;
>+    mDrawTextureDims[1] = hNdc;
>+
>+    mDrawTextureEnabled = true;
>+
>+    AttributesMask prevAttributesMask = glState->gles1().getVertexArraysAttributeMask();
>+
>+    setAttributesEnabled(context, glState, AttributesMask());
>+
>+    glState->gles1().setAllDirty();
>+
>+    context->drawArrays(PrimitiveMode::Triangles, 0, 6);
>+
>+    setAttributesEnabled(context, glState, prevAttributesMask);
>+
>+    mDrawTextureEnabled = false;
>+}
>+
>+Shader *GLES1Renderer::getShader(GLuint handle) const
>+{
>+    return mShaderPrograms->getShader(handle);
>+}
>+
>+Program *GLES1Renderer::getProgram(GLuint handle) const
>+{
>+    return mShaderPrograms->getProgram(handle);
>+}
>+
>+angle::Result GLES1Renderer::compileShader(Context *context,
>+                                           ShaderType shaderType,
>+                                           const char *src,
>+                                           GLuint *shaderOut)
>+{
>+    rx::ContextImpl *implementation = context->getImplementation();
>+    const Limitations &limitations  = implementation->getNativeLimitations();
>+
>+    GLuint shader = mShaderPrograms->createShader(implementation, limitations, shaderType);
>+
>+    Shader *shaderObject = getShader(shader);
>+    ANGLE_CHECK(context, shaderObject, "Missing shader object", GL_INVALID_OPERATION);
>+
>+    shaderObject->setSource(1, &src, nullptr);
>+    shaderObject->compile(context);
>+
>+    *shaderOut = shader;
>+
>+    if (!shaderObject->isCompiled())
>+    {
>+        GLint infoLogLength = shaderObject->getInfoLogLength();
>+        std::vector<char> infoLog(infoLogLength, 0);
>+        shaderObject->getInfoLog(infoLogLength - 1, nullptr, infoLog.data());
>+
>+        ERR() << "Internal GLES 1 shader compile failed. Info log: " << infoLog.data();
>+        ANGLE_CHECK(context, false, "GLES1Renderer shader compile failed.", GL_INVALID_OPERATION);
>+        return angle::Result::Stop;
>+    }
>+
>+    return angle::Result::Continue;
>+}
>+
>+angle::Result GLES1Renderer::linkProgram(Context *context,
>+                                         State *glState,
>+                                         GLuint vertexShader,
>+                                         GLuint fragmentShader,
>+                                         const std::unordered_map<GLint, std::string> &attribLocs,
>+                                         GLuint *programOut)
>+{
>+    GLuint program = mShaderPrograms->createProgram(context->getImplementation());
>+
>+    Program *programObject = getProgram(program);
>+    ANGLE_CHECK(context, programObject, "Missing program object", GL_INVALID_OPERATION);
>+
>+    *programOut = program;
>+
>+    programObject->attachShader(getShader(vertexShader));
>+    programObject->attachShader(getShader(fragmentShader));
>+
>+    for (auto it : attribLocs)
>+    {
>+        GLint index             = it.first;
>+        const std::string &name = it.second;
>+        programObject->bindAttributeLocation(index, name.c_str());
>+    }
>+
>+    ANGLE_TRY(programObject->link(context));
>+    programObject->resolveLink(context);
>+
>+    ANGLE_TRY(glState->onProgramExecutableChange(context, programObject));
>+
>+    if (!programObject->isLinked())
>+    {
>+        GLint infoLogLength = programObject->getInfoLogLength();
>+        std::vector<char> infoLog(infoLogLength, 0);
>+        programObject->getInfoLog(infoLogLength - 1, nullptr, infoLog.data());
>+
>+        ERR() << "Internal GLES 1 shader link failed. Info log: " << infoLog.data();
>+        ANGLE_CHECK(context, false, "GLES1Renderer program link failed.", GL_INVALID_OPERATION);
>+        return angle::Result::Stop;
>+    }
>+
>+    programObject->detachShader(context, getShader(vertexShader));
>+    programObject->detachShader(context, getShader(fragmentShader));
>+
>+    return angle::Result::Continue;
>+}
>+
>+angle::Result GLES1Renderer::initializeRendererProgram(Context *context, State *glState)
>+{
>+    if (mRendererProgramInitialized)
>+    {
>+        return angle::Result::Continue;
>+    }
>+
>+    mShaderPrograms = new ShaderProgramManager();
>+
>+    GLuint vertexShader;
>+    GLuint fragmentShader;
>+
>+    ANGLE_TRY(compileShader(context, ShaderType::Vertex, kGLES1DrawVShader, &vertexShader));
>+
>+    std::stringstream fragmentStream;
>+    fragmentStream << kGLES1DrawFShaderHeader;
>+    fragmentStream << kGLES1DrawFShaderUniformDefs;
>+    fragmentStream << kGLES1DrawFShaderFunctions;
>+    fragmentStream << kGLES1DrawFShaderMultitexturing;
>+    fragmentStream << kGLES1DrawFShaderMain;
>+
>+    ANGLE_TRY(compileShader(context, ShaderType::Fragment, fragmentStream.str().c_str(),
>+                            &fragmentShader));
>+
>+    std::unordered_map<GLint, std::string> attribLocs;
>+
>+    attribLocs[(GLint)kVertexAttribIndex]    = "pos";
>+    attribLocs[(GLint)kNormalAttribIndex]    = "normal";
>+    attribLocs[(GLint)kColorAttribIndex]     = "color";
>+    attribLocs[(GLint)kPointSizeAttribIndex] = "pointsize";
>+
>+    for (int i = 0; i < kTexUnitCount; i++)
>+    {
>+        std::stringstream ss;
>+        ss << "texcoord" << i;
>+        attribLocs[kTextureCoordAttribIndexBase + i] = ss.str();
>+    }
>+
>+    ANGLE_TRY(linkProgram(context, glState, vertexShader, fragmentShader, attribLocs,
>+                          &mProgramState.program));
>+
>+    mShaderPrograms->deleteShader(context, vertexShader);
>+    mShaderPrograms->deleteShader(context, fragmentShader);
>+
>+    Program *programObject = getProgram(mProgramState.program);
>+
>+    mProgramState.projMatrixLoc      = programObject->getUniformLocation("projection");
>+    mProgramState.modelviewMatrixLoc = programObject->getUniformLocation("modelview");
>+    mProgramState.textureMatrixLoc   = programObject->getUniformLocation("texture_matrix");
>+    mProgramState.modelviewInvTrLoc  = programObject->getUniformLocation("modelview_invtr");
>+
>+    for (int i = 0; i < kTexUnitCount; i++)
>+    {
>+        std::stringstream ss2d;
>+        std::stringstream sscube;
>+
>+        ss2d << "tex_sampler" << i;
>+        sscube << "tex_cube_sampler" << i;
>+
>+        mProgramState.tex2DSamplerLocs[i] = programObject->getUniformLocation(ss2d.str().c_str());
>+        mProgramState.texCubeSamplerLocs[i] =
>+            programObject->getUniformLocation(sscube.str().c_str());
>+    }
>+
>+    mProgramState.enableTexture2DLoc = programObject->getUniformLocation("enable_texture_2d");
>+    mProgramState.enableTextureCubeMapLoc =
>+        programObject->getUniformLocation("enable_texture_cube_map");
>+
>+    mProgramState.textureFormatLoc   = programObject->getUniformLocation("texture_format");
>+    mProgramState.textureEnvModeLoc  = programObject->getUniformLocation("texture_env_mode");
>+    mProgramState.combineRgbLoc      = programObject->getUniformLocation("combine_rgb");
>+    mProgramState.combineAlphaLoc    = programObject->getUniformLocation("combine_alpha");
>+    mProgramState.src0rgbLoc         = programObject->getUniformLocation("src0_rgb");
>+    mProgramState.src0alphaLoc       = programObject->getUniformLocation("src0_alpha");
>+    mProgramState.src1rgbLoc         = programObject->getUniformLocation("src1_rgb");
>+    mProgramState.src1alphaLoc       = programObject->getUniformLocation("src1_alpha");
>+    mProgramState.src2rgbLoc         = programObject->getUniformLocation("src2_rgb");
>+    mProgramState.src2alphaLoc       = programObject->getUniformLocation("src2_alpha");
>+    mProgramState.op0rgbLoc          = programObject->getUniformLocation("op0_rgb");
>+    mProgramState.op0alphaLoc        = programObject->getUniformLocation("op0_alpha");
>+    mProgramState.op1rgbLoc          = programObject->getUniformLocation("op1_rgb");
>+    mProgramState.op1alphaLoc        = programObject->getUniformLocation("op1_alpha");
>+    mProgramState.op2rgbLoc          = programObject->getUniformLocation("op2_rgb");
>+    mProgramState.op2alphaLoc        = programObject->getUniformLocation("op2_alpha");
>+    mProgramState.textureEnvColorLoc = programObject->getUniformLocation("texture_env_color");
>+    mProgramState.rgbScaleLoc        = programObject->getUniformLocation("texture_env_rgb_scale");
>+    mProgramState.alphaScaleLoc      = programObject->getUniformLocation("texture_env_alpha_scale");
>+    mProgramState.pointSpriteCoordReplaceLoc =
>+        programObject->getUniformLocation("point_sprite_coord_replace");
>+
>+    mProgramState.enableAlphaTestLoc = programObject->getUniformLocation("enable_alpha_test");
>+    mProgramState.alphaFuncLoc       = programObject->getUniformLocation("alpha_func");
>+    mProgramState.alphaTestRefLoc    = programObject->getUniformLocation("alpha_test_ref");
>+
>+    mProgramState.shadeModelFlatLoc = programObject->getUniformLocation("shade_model_flat");
>+    mProgramState.enableLightingLoc = programObject->getUniformLocation("enable_lighting");
>+    mProgramState.enableRescaleNormalLoc =
>+        programObject->getUniformLocation("enable_rescale_normal");
>+    mProgramState.enableNormalizeLoc = programObject->getUniformLocation("enable_normalize");
>+    mProgramState.enableColorMaterialLoc =
>+        programObject->getUniformLocation("enable_color_material");
>+
>+    mProgramState.materialAmbientLoc  = programObject->getUniformLocation("material_ambient");
>+    mProgramState.materialDiffuseLoc  = programObject->getUniformLocation("material_diffuse");
>+    mProgramState.materialSpecularLoc = programObject->getUniformLocation("material_specular");
>+    mProgramState.materialEmissiveLoc = programObject->getUniformLocation("material_emissive");
>+    mProgramState.materialSpecularExponentLoc =
>+        programObject->getUniformLocation("material_specular_exponent");
>+
>+    mProgramState.lightModelSceneAmbientLoc =
>+        programObject->getUniformLocation("light_model_scene_ambient");
>+    mProgramState.lightModelTwoSidedLoc =
>+        programObject->getUniformLocation("light_model_two_sided");
>+
>+    mProgramState.lightEnablesLoc    = programObject->getUniformLocation("light_enables");
>+    mProgramState.lightAmbientsLoc   = programObject->getUniformLocation("light_ambients");
>+    mProgramState.lightDiffusesLoc   = programObject->getUniformLocation("light_diffuses");
>+    mProgramState.lightSpecularsLoc  = programObject->getUniformLocation("light_speculars");
>+    mProgramState.lightPositionsLoc  = programObject->getUniformLocation("light_positions");
>+    mProgramState.lightDirectionsLoc = programObject->getUniformLocation("light_directions");
>+    mProgramState.lightSpotlightExponentsLoc =
>+        programObject->getUniformLocation("light_spotlight_exponents");
>+    mProgramState.lightSpotlightCutoffAnglesLoc =
>+        programObject->getUniformLocation("light_spotlight_cutoff_angles");
>+    mProgramState.lightAttenuationConstsLoc =
>+        programObject->getUniformLocation("light_attenuation_consts");
>+    mProgramState.lightAttenuationLinearsLoc =
>+        programObject->getUniformLocation("light_attenuation_linears");
>+    mProgramState.lightAttenuationQuadraticsLoc =
>+        programObject->getUniformLocation("light_attenuation_quadratics");
>+
>+    mProgramState.fogEnableLoc  = programObject->getUniformLocation("enable_fog");
>+    mProgramState.fogModeLoc    = programObject->getUniformLocation("fog_mode");
>+    mProgramState.fogDensityLoc = programObject->getUniformLocation("fog_density");
>+    mProgramState.fogStartLoc   = programObject->getUniformLocation("fog_start");
>+    mProgramState.fogEndLoc     = programObject->getUniformLocation("fog_end");
>+    mProgramState.fogColorLoc   = programObject->getUniformLocation("fog_color");
>+
>+    mProgramState.enableClipPlanesLoc = programObject->getUniformLocation("enable_clip_planes");
>+    mProgramState.clipPlaneEnablesLoc = programObject->getUniformLocation("clip_plane_enables");
>+    mProgramState.clipPlanesLoc       = programObject->getUniformLocation("clip_planes");
>+
>+    mProgramState.pointRasterizationLoc = programObject->getUniformLocation("point_rasterization");
>+    mProgramState.pointSizeMinLoc       = programObject->getUniformLocation("point_size_min");
>+    mProgramState.pointSizeMaxLoc       = programObject->getUniformLocation("point_size_max");
>+    mProgramState.pointDistanceAttenuationLoc =
>+        programObject->getUniformLocation("point_distance_attenuation");
>+    mProgramState.pointSpriteEnabledLoc = programObject->getUniformLocation("point_sprite_enabled");
>+
>+    mProgramState.enableDrawTextureLoc = programObject->getUniformLocation("enable_draw_texture");
>+    mProgramState.drawTextureCoordsLoc = programObject->getUniformLocation("draw_texture_coords");
>+    mProgramState.drawTextureDimsLoc   = programObject->getUniformLocation("draw_texture_dims");
>+    mProgramState.drawTextureNormalizedCropRectLoc =
>+        programObject->getUniformLocation("draw_texture_normalized_crop_rect");
>+
>+    ANGLE_TRY(glState->setProgram(context, programObject));
>+
>+    for (int i = 0; i < kTexUnitCount; i++)
>+    {
>+        setUniform1i(context, programObject, mProgramState.tex2DSamplerLocs[i], i);
>+        setUniform1i(context, programObject, mProgramState.texCubeSamplerLocs[i],
>+                     i + kTexUnitCount);
>+    }
>+
>+    glState->setObjectDirty(GL_PROGRAM);
>+
>+    mRendererProgramInitialized = true;
>+    return angle::Result::Continue;
>+}
>+
>+void GLES1Renderer::setUniform1i(Context *context, Program *programObject, GLint loc, GLint value)
>+{
>+    if (loc == -1)
>+        return;
>+    programObject->setUniform1iv(context, loc, 1, &value);
>+}
>+
>+void GLES1Renderer::setUniform1iv(Context *context,
>+                                  Program *programObject,
>+                                  GLint loc,
>+                                  GLint count,
>+                                  const GLint *value)
>+{
>+    if (loc == -1)
>+        return;
>+    programObject->setUniform1iv(context, loc, count, value);
>+}
>+
>+void GLES1Renderer::setUniformMatrix4fv(Program *programObject,
>+                                        GLint loc,
>+                                        GLint count,
>+                                        GLboolean transpose,
>+                                        const GLfloat *value)
>+{
>+    if (loc == -1)
>+        return;
>+    programObject->setUniformMatrix4fv(loc, count, transpose, value);
>+}
>+
>+void GLES1Renderer::setUniform4fv(Program *programObject,
>+                                  GLint loc,
>+                                  GLint count,
>+                                  const GLfloat *value)
>+{
>+    if (loc == -1)
>+        return;
>+    programObject->setUniform4fv(loc, count, value);
>+}
>+
>+void GLES1Renderer::setUniform3fv(Program *programObject,
>+                                  GLint loc,
>+                                  GLint count,
>+                                  const GLfloat *value)
>+{
>+    if (loc == -1)
>+        return;
>+    programObject->setUniform3fv(loc, count, value);
>+}
>+
>+void GLES1Renderer::setUniform2fv(Program *programObject,
>+                                  GLint loc,
>+                                  GLint count,
>+                                  const GLfloat *value)
>+{
>+    if (loc == -1)
>+        return;
>+    programObject->setUniform2fv(loc, count, value);
>+}
>+
>+void GLES1Renderer::setUniform1f(Program *programObject, GLint loc, GLfloat value)
>+{
>+    if (loc == -1)
>+        return;
>+    programObject->setUniform1fv(loc, 1, &value);
>+}
>+
>+void GLES1Renderer::setUniform1fv(Program *programObject,
>+                                  GLint loc,
>+                                  GLint count,
>+                                  const GLfloat *value)
>+{
>+    if (loc == -1)
>+        return;
>+    programObject->setUniform1fv(loc, count, value);
>+}
>+
>+void GLES1Renderer::setAttributesEnabled(Context *context, State *glState, AttributesMask mask)
>+{
>+    GLES1State &gles1 = glState->gles1();
>+
>+    ClientVertexArrayType nonTexcoordArrays[] = {
>+        ClientVertexArrayType::Vertex,
>+        ClientVertexArrayType::Normal,
>+        ClientVertexArrayType::Color,
>+        ClientVertexArrayType::PointSize,
>+    };
>+
>+    for (const ClientVertexArrayType attrib : nonTexcoordArrays)
>+    {
>+        int index = VertexArrayIndex(attrib, glState->gles1());
>+
>+        if (mask.test(index))
>+        {
>+            gles1.setClientStateEnabled(attrib, true);
>+            context->enableVertexAttribArray(index);
>+        }
>+        else
>+        {
>+            gles1.setClientStateEnabled(attrib, false);
>+            context->disableVertexAttribArray(index);
>+        }
>+    }
>+
>+    for (unsigned int i = 0; i < kTexUnitCount; i++)
>+    {
>+        int index = TexCoordArrayIndex(i);
>+
>+        if (mask.test(index))
>+        {
>+            gles1.setTexCoordArrayEnabled(i, true);
>+            context->enableVertexAttribArray(index);
>+        }
>+        else
>+        {
>+            gles1.setTexCoordArrayEnabled(i, false);
>+            context->disableVertexAttribArray(index);
>+        }
>+    }
>+}
>+
>+}  // namespace gl
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/GLES1Renderer.h b/Source/ThirdParty/ANGLE/src/libANGLE/GLES1Renderer.h
>new file mode 100644
>index 00000000000..f2b592adcb3
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/GLES1Renderer.h
>@@ -0,0 +1,259 @@
>+//
>+// Copyright 2018 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+
>+// GLES1Renderer.h: Defines GLES1 emulation rendering operations on top of a GLES3
>+// context. Used by Context.h.
>+
>+#ifndef LIBANGLE_GLES1_RENDERER_H_
>+#define LIBANGLE_GLES1_RENDERER_H_
>+
>+#include "angle_gl.h"
>+#include "common/angleutils.h"
>+#include "libANGLE/angletypes.h"
>+
>+#include <memory>
>+#include <string>
>+#include <unordered_map>
>+
>+namespace gl
>+{
>+class Context;
>+class GLES1State;
>+class Program;
>+class State;
>+class Shader;
>+class ShaderProgramManager;
>+
>+class GLES1Renderer final : angle::NonCopyable
>+{
>+  public:
>+    GLES1Renderer();
>+    ~GLES1Renderer();
>+
>+    void onDestroy(Context *context, State *state);
>+
>+    angle::Result prepareForDraw(PrimitiveMode mode, Context *context, State *glState);
>+
>+    static int VertexArrayIndex(ClientVertexArrayType type, const GLES1State &gles1);
>+    static int TexCoordArrayIndex(unsigned int unit);
>+
>+    void drawTexture(Context *context,
>+                     State *glState,
>+                     float x,
>+                     float y,
>+                     float z,
>+                     float width,
>+                     float height);
>+
>+    static constexpr int kTexUnitCount = 4;
>+
>+  private:
>+    using Mat4Uniform = float[16];
>+    using Vec4Uniform = float[4];
>+    using Vec3Uniform = float[3];
>+
>+    Shader *getShader(GLuint handle) const;
>+    Program *getProgram(GLuint handle) const;
>+
>+    angle::Result compileShader(Context *context,
>+                                ShaderType shaderType,
>+                                const char *src,
>+                                GLuint *shaderOut);
>+    angle::Result linkProgram(Context *context,
>+                              State *glState,
>+                              GLuint vshader,
>+                              GLuint fshader,
>+                              const std::unordered_map<GLint, std::string> &attribLocs,
>+                              GLuint *programOut);
>+    angle::Result initializeRendererProgram(Context *context, State *glState);
>+
>+    void setUniform1i(Context *context, Program *programObject, GLint loc, GLint value);
>+    void setUniform1iv(Context *context,
>+                       Program *programObject,
>+                       GLint loc,
>+                       GLint count,
>+                       const GLint *value);
>+    void setUniformMatrix4fv(Program *programObject,
>+                             GLint loc,
>+                             GLint count,
>+                             GLboolean transpose,
>+                             const GLfloat *value);
>+    void setUniform4fv(Program *programObject, GLint loc, GLint count, const GLfloat *value);
>+    void setUniform3fv(Program *programObject, GLint loc, GLint count, const GLfloat *value);
>+    void setUniform2fv(Program *programObject, GLint loc, GLint count, const GLfloat *value);
>+    void setUniform1f(Program *programObject, GLint loc, GLfloat value);
>+    void setUniform1fv(Program *programObject, GLint loc, GLint count, const GLfloat *value);
>+
>+    void setAttributesEnabled(Context *context, State *glState, AttributesMask mask);
>+
>+    static constexpr int kLightCount     = 8;
>+    static constexpr int kClipPlaneCount = 6;
>+
>+    static constexpr int kVertexAttribIndex           = 0;
>+    static constexpr int kNormalAttribIndex           = 1;
>+    static constexpr int kColorAttribIndex            = 2;
>+    static constexpr int kPointSizeAttribIndex        = 3;
>+    static constexpr int kTextureCoordAttribIndexBase = 4;
>+
>+    bool mRendererProgramInitialized;
>+    ShaderProgramManager *mShaderPrograms;
>+
>+    struct GLES1ProgramState
>+    {
>+        GLuint program;
>+
>+        GLint projMatrixLoc;
>+        GLint modelviewMatrixLoc;
>+        GLint textureMatrixLoc;
>+        GLint modelviewInvTrLoc;
>+
>+        // Texturing
>+        GLint enableTexture2DLoc;
>+        GLint enableTextureCubeMapLoc;
>+        std::array<GLint, kTexUnitCount> tex2DSamplerLocs;
>+        std::array<GLint, kTexUnitCount> texCubeSamplerLocs;
>+
>+        GLint textureFormatLoc;
>+
>+        GLint textureEnvModeLoc;
>+        GLint combineRgbLoc;
>+        GLint combineAlphaLoc;
>+        GLint src0rgbLoc;
>+        GLint src0alphaLoc;
>+        GLint src1rgbLoc;
>+        GLint src1alphaLoc;
>+        GLint src2rgbLoc;
>+        GLint src2alphaLoc;
>+        GLint op0rgbLoc;
>+        GLint op0alphaLoc;
>+        GLint op1rgbLoc;
>+        GLint op1alphaLoc;
>+        GLint op2rgbLoc;
>+        GLint op2alphaLoc;
>+        GLint textureEnvColorLoc;
>+        GLint rgbScaleLoc;
>+        GLint alphaScaleLoc;
>+        GLint pointSpriteCoordReplaceLoc;
>+
>+        // Alpha test
>+        GLint enableAlphaTestLoc;
>+        GLint alphaFuncLoc;
>+        GLint alphaTestRefLoc;
>+
>+        // Shading, materials, and lighting
>+        GLint shadeModelFlatLoc;
>+        GLint enableLightingLoc;
>+        GLint enableRescaleNormalLoc;
>+        GLint enableNormalizeLoc;
>+        GLint enableColorMaterialLoc;
>+
>+        GLint materialAmbientLoc;
>+        GLint materialDiffuseLoc;
>+        GLint materialSpecularLoc;
>+        GLint materialEmissiveLoc;
>+        GLint materialSpecularExponentLoc;
>+
>+        GLint lightModelSceneAmbientLoc;
>+        GLint lightModelTwoSidedLoc;
>+
>+        GLint lightEnablesLoc;
>+        GLint lightAmbientsLoc;
>+        GLint lightDiffusesLoc;
>+        GLint lightSpecularsLoc;
>+        GLint lightPositionsLoc;
>+        GLint lightDirectionsLoc;
>+        GLint lightSpotlightExponentsLoc;
>+        GLint lightSpotlightCutoffAnglesLoc;
>+        GLint lightAttenuationConstsLoc;
>+        GLint lightAttenuationLinearsLoc;
>+        GLint lightAttenuationQuadraticsLoc;
>+
>+        // Fog
>+        GLint fogEnableLoc;
>+        GLint fogModeLoc;
>+        GLint fogDensityLoc;
>+        GLint fogStartLoc;
>+        GLint fogEndLoc;
>+        GLint fogColorLoc;
>+
>+        // Clip planes
>+        GLint enableClipPlanesLoc;
>+        GLint clipPlaneEnablesLoc;
>+        GLint clipPlanesLoc;
>+
>+        // Point rasterization
>+        GLint pointRasterizationLoc;
>+        GLint pointSizeMinLoc;
>+        GLint pointSizeMaxLoc;
>+        GLint pointDistanceAttenuationLoc;
>+        GLint pointSpriteEnabledLoc;
>+
>+        // Draw texture
>+        GLint enableDrawTextureLoc;
>+        GLint drawTextureCoordsLoc;
>+        GLint drawTextureDimsLoc;
>+        GLint drawTextureNormalizedCropRectLoc;
>+    };
>+
>+    struct GLES1UniformBuffers
>+    {
>+        std::array<Mat4Uniform, kTexUnitCount> textureMatrices;
>+        std::array<GLint, kTexUnitCount> tex2DEnables;
>+        std::array<GLint, kTexUnitCount> texCubeEnables;
>+
>+        std::array<GLint, kTexUnitCount> texEnvModes;
>+        std::array<GLint, kTexUnitCount> texCombineRgbs;
>+        std::array<GLint, kTexUnitCount> texCombineAlphas;
>+
>+        std::array<GLint, kTexUnitCount> texCombineSrc0Rgbs;
>+        std::array<GLint, kTexUnitCount> texCombineSrc0Alphas;
>+        std::array<GLint, kTexUnitCount> texCombineSrc1Rgbs;
>+        std::array<GLint, kTexUnitCount> texCombineSrc1Alphas;
>+        std::array<GLint, kTexUnitCount> texCombineSrc2Rgbs;
>+        std::array<GLint, kTexUnitCount> texCombineSrc2Alphas;
>+        std::array<GLint, kTexUnitCount> texCombineOp0Rgbs;
>+        std::array<GLint, kTexUnitCount> texCombineOp0Alphas;
>+        std::array<GLint, kTexUnitCount> texCombineOp1Rgbs;
>+        std::array<GLint, kTexUnitCount> texCombineOp1Alphas;
>+        std::array<GLint, kTexUnitCount> texCombineOp2Rgbs;
>+        std::array<GLint, kTexUnitCount> texCombineOp2Alphas;
>+        std::array<Vec4Uniform, kTexUnitCount> texEnvColors;
>+        std::array<GLfloat, kTexUnitCount> texEnvRgbScales;
>+        std::array<GLfloat, kTexUnitCount> texEnvAlphaScales;
>+        std::array<GLint, kTexUnitCount> pointSpriteCoordReplaces;
>+
>+        // Lighting
>+        std::array<GLint, kLightCount> lightEnables;
>+        std::array<Vec4Uniform, kLightCount> lightAmbients;
>+        std::array<Vec4Uniform, kLightCount> lightDiffuses;
>+        std::array<Vec4Uniform, kLightCount> lightSpeculars;
>+        std::array<Vec4Uniform, kLightCount> lightPositions;
>+        std::array<Vec3Uniform, kLightCount> lightDirections;
>+        std::array<GLfloat, kLightCount> spotlightExponents;
>+        std::array<GLfloat, kLightCount> spotlightCutoffAngles;
>+        std::array<GLfloat, kLightCount> attenuationConsts;
>+        std::array<GLfloat, kLightCount> attenuationLinears;
>+        std::array<GLfloat, kLightCount> attenuationQuadratics;
>+
>+        // Clip planes
>+        std::array<GLint, kClipPlaneCount> clipPlaneEnables;
>+        std::array<Vec4Uniform, kClipPlaneCount> clipPlanes;
>+
>+        // Texture crop rectangles
>+        std::array<Vec4Uniform, kTexUnitCount> texCropRects;
>+    };
>+
>+    GLES1UniformBuffers mUniformBuffers;
>+    GLES1ProgramState mProgramState;
>+
>+    bool mDrawTextureEnabled      = false;
>+    GLfloat mDrawTextureCoords[4] = {0.0f, 0.0f, 0.0f, 0.0f};
>+    GLfloat mDrawTextureDims[2]   = {0.0f, 0.0f};
>+};
>+
>+}  // namespace gl
>+
>+#endif  // LIBANGLE_GLES1_RENDERER_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/GLES1Shaders.inc b/Source/ThirdParty/ANGLE/src/libANGLE/GLES1Shaders.inc
>new file mode 100644
>index 00000000000..b9b5961cdcf
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/GLES1Shaders.inc
>@@ -0,0 +1,1110 @@
>+//
>+// Copyright 2018 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+
>+// GLES1Shaders.inc: Defines GLES1 emulation shader.
>+
>+constexpr char kGLES1DrawVShader[] = R"(#version 300 es
>+precision highp float;
>+
>+#define kMaxTexUnits 4
>+
>+in vec4 pos;
>+in vec3 normal;
>+in vec4 color;
>+in float pointsize;
>+in vec4 texcoord0;
>+in vec4 texcoord1;
>+in vec4 texcoord2;
>+in vec4 texcoord3;
>+
>+uniform mat4 projection;
>+uniform mat4 modelview;
>+uniform mat4 modelview_invtr;
>+uniform mat4 texture_matrix[kMaxTexUnits];
>+
>+uniform bool enable_rescale_normal;
>+uniform bool enable_normalize;
>+
>+// Point rasterization//////////////////////////////////////////////////////////
>+
>+uniform bool point_rasterization;
>+uniform float point_size_min;
>+uniform float point_size_max;
>+uniform vec3 point_distance_attenuation;
>+
>+// GL_OES_draw_texture uniforms/////////////////////////////////////////////////
>+
>+uniform bool enable_draw_texture;
>+uniform vec4 draw_texture_coords;
>+uniform vec2 draw_texture_dims;
>+uniform vec4 draw_texture_normalized_crop_rect[kMaxTexUnits];
>+
>+// Varyings/////////////////////////////////////////////////////////////////////
>+
>+out vec4 pos_varying;
>+out vec3 normal_varying;
>+out vec4 color_varying;
>+flat out vec4 color_varying_flat;
>+out vec4 texcoord0_varying;
>+out vec4 texcoord1_varying;
>+out vec4 texcoord2_varying;
>+out vec4 texcoord3_varying;
>+
>+const vec4 drawTextureVertices[6] = vec4[](
>+    vec4(0.0, 0.0, 0.0, 1.0),
>+    vec4(1.0, 0.0, 0.0, 1.0),
>+    vec4(1.0, 1.0, 0.0, 1.0),
>+    vec4(0.0, 0.0, 0.0, 1.0),
>+    vec4(1.0, 1.0, 0.0, 1.0),
>+    vec4(0.0, 1.0, 0.0, 1.0));
>+
>+vec4 drawTexturePosition(int vertexId)
>+{
>+
>+    float drawTexX = draw_texture_coords[0];
>+    float drawTexY = draw_texture_coords[1];
>+    float drawTexZ = draw_texture_coords[2];
>+    float drawTexW = draw_texture_dims[0];
>+    float drawTexH = draw_texture_dims[1];
>+
>+    return vec4(drawTexX, drawTexY, drawTexZ, 0.0) +
>+           drawTextureVertices[vertexId] *
>+           vec4(drawTexW, drawTexH, 1.0, 1.0);
>+}
>+
>+vec4 drawTextureTexCoord(int vertexId, int textureUnit)
>+{
>+    float texCropU = draw_texture_normalized_crop_rect[textureUnit].x;
>+    float texCropV = draw_texture_normalized_crop_rect[textureUnit].y;
>+    float texCropW = draw_texture_normalized_crop_rect[textureUnit].z;
>+    float texCropH = draw_texture_normalized_crop_rect[textureUnit].w;
>+
>+    return vec4(texCropU, texCropV, 0.0, 0.0) +
>+           drawTextureVertices[vertexId] *
>+           vec4(texCropW, texCropH, 0.0, 0.0);
>+}
>+
>+vec4 calcWorldPosition(vec4 posInput)
>+{
>+    return modelview * posInput;
>+}
>+
>+vec4 calcNdcFromWorldPosition(vec4 worldPos)
>+{
>+    return projection * worldPos;
>+}
>+
>+float calcPointSize(vec4 ndcPos)
>+{
>+    float dist         = length(ndcPos.z);
>+    float attConst     = point_distance_attenuation[0];
>+    float attLinear    = point_distance_attenuation[1];
>+    float attQuad      = point_distance_attenuation[2];
>+    float attPart      = attConst + attLinear * dist + attQuad * dist * dist;
>+    float attPointSize = pointsize / pow(attPart, 0.5);
>+
>+    return clamp(attPointSize, point_size_min, point_size_max);
>+}
>+
>+vec3 calcNormal(vec3 normalInput)
>+{
>+    mat3 mvInvTr3 = mat3(modelview_invtr);
>+    vec3 result   = mvInvTr3 * normalInput;
>+
>+    if (enable_rescale_normal)
>+    {
>+        float rescale   = 1.0;
>+        vec3 rescaleVec = vec3(mvInvTr3[2]);
>+        float len       = length(rescaleVec);
>+        if (len > 0.0)
>+        {
>+            rescale = 1.0 / len;
>+        }
>+        result *= rescale;
>+    }
>+
>+    if (enable_normalize)
>+    {
>+        result = normalize(result);
>+    }
>+
>+    return result;
>+}
>+
>+void main()
>+{
>+    color_varying      = color;
>+    color_varying_flat = color;
>+
>+    if (enable_draw_texture)
>+    {
>+        int vertexId        = gl_VertexID;
>+        vec4 posDrawTexture = drawTexturePosition(vertexId);
>+
>+        gl_Position = posDrawTexture;
>+        pos_varying = posDrawTexture;
>+
>+        normal_varying = normal;
>+
>+        gl_PointSize = pointsize;
>+
>+        texcoord0_varying = drawTextureTexCoord(vertexId, 0);
>+        texcoord1_varying = drawTextureTexCoord(vertexId, 1);
>+        texcoord2_varying = drawTextureTexCoord(vertexId, 2);
>+        texcoord3_varying = drawTextureTexCoord(vertexId, 3);
>+    }
>+    else
>+    {
>+        vec4 worldPos = calcWorldPosition(pos);
>+        vec4 ndcPos   = calcNdcFromWorldPosition(worldPos);
>+
>+        gl_Position = ndcPos;
>+        pos_varying = worldPos;
>+
>+        normal_varying = calcNormal(normal);
>+
>+        // Avoid calculating point size stuff
>+        // if we are not rendering points.
>+        if (point_rasterization)
>+        {
>+            gl_PointSize = calcPointSize(ndcPos);
>+        }
>+        else
>+        {
>+            gl_PointSize = pointsize;
>+        }
>+
>+        texcoord0_varying = texture_matrix[0] * texcoord0;
>+        texcoord1_varying = texture_matrix[1] * texcoord1;
>+        texcoord2_varying = texture_matrix[2] * texcoord2;
>+        texcoord3_varying = texture_matrix[3] * texcoord3;
>+    }
>+}
>+)";
>+
>+// version, flat,
>+constexpr char kGLES1DrawFShaderHeader[] = R"(#version 300 es
>+precision highp float;
>+
>+// Defines for GL constants
>+#define kMaxLights                           8
>+#define kMaxTexUnits                         4
>+#define kMaxClipPlanes                       6
>+
>+#define kModulate                       0x2100
>+#define kDecal                          0x2101
>+#define kCombine                        0x8570
>+#define kReplace                        0x1E01
>+#define kBlend                          0x0BE2
>+#define kAdd                            0x0104
>+
>+#define kAddSigned                      0x8574
>+#define kInterpolate                    0x8575
>+#define kSubtract                       0x84E7
>+#define kDot3Rgb                        0x86AE
>+#define kDot3Rgba                       0x86AF
>+
>+#define kAlpha                          0x1906
>+#define kRGB                            0x1907
>+#define kRGBA                           0x1908
>+#define kLuminance                      0x1909
>+#define kLuminanceAlpha                 0x190A
>+
>+#define kTexture                        0x1702
>+#define kConstant                       0x8576
>+#define kPrimaryColor                   0x8577
>+#define kPrevious                       0x8578
>+
>+#define kSrcColor                       0x0300
>+#define kOneMinusSrcColor               0x0301
>+#define kSrcAlpha                       0x0302
>+#define kOneMinusSrcAlpha               0x0303
>+
>+#define kLinear                         0x2601
>+#define kExp                            0x0800
>+#define kExp2                           0x0801
>+
>+#define kNever                          0x0200
>+#define kLess                           0x0201
>+#define kEqual                          0x0202
>+#define kLequal                         0x0203
>+#define kGreater                        0x0204
>+#define kNotequal                       0x0205
>+#define kGequal                         0x0206
>+#define kAlways                         0x0207
>+#define kZero                              0x0
>+#define kOne                               0x1
>+
>+#define kClear                          0x1500
>+#define kAnd                            0x1501
>+#define kAnd_reverse                    0x1502
>+#define kCopy                           0x1503
>+#define kAnd_inverted                   0x1504
>+#define kNoop                           0x1505
>+#define kXor                            0x1506
>+#define kOr                             0x1507
>+#define kNor                            0x1508
>+#define kEquiv                          0x1509
>+#define kInvert                         0x150A
>+#define kOr_reverse                     0x150B
>+#define kCopy_inverted                  0x150C
>+#define kOr_inverted                    0x150D
>+#define kNand                           0x150E
>+#define kSet                            0x150F)";
>+
>+constexpr char kGLES1DrawFShaderUniformDefs[] = R"(
>+
>+// Texture units ///////////////////////////////////////////////////////////////
>+
>+uniform bool enable_texture_2d[kMaxTexUnits];
>+uniform bool enable_texture_cube_map[kMaxTexUnits];
>+
>+// These are not arrays because hw support for arrays
>+// of samplers is rather lacking.
>+
>+uniform sampler2D tex_sampler0;
>+uniform samplerCube tex_cube_sampler0;
>+
>+uniform sampler2D tex_sampler1;
>+uniform samplerCube tex_cube_sampler1;
>+
>+uniform sampler2D tex_sampler2;
>+uniform samplerCube tex_cube_sampler2;
>+
>+uniform sampler2D tex_sampler3;
>+uniform samplerCube tex_cube_sampler3;
>+
>+uniform int texture_format[kMaxTexUnits];
>+
>+uniform int texture_env_mode[kMaxTexUnits];
>+uniform int combine_rgb[kMaxTexUnits];
>+uniform int combine_alpha[kMaxTexUnits];
>+uniform int src0_rgb[kMaxTexUnits];
>+uniform int src0_alpha[kMaxTexUnits];
>+uniform int src1_rgb[kMaxTexUnits];
>+uniform int src1_alpha[kMaxTexUnits];
>+uniform int src2_rgb[kMaxTexUnits];
>+uniform int src2_alpha[kMaxTexUnits];
>+uniform int op0_rgb[kMaxTexUnits];
>+uniform int op0_alpha[kMaxTexUnits];
>+uniform int op1_rgb[kMaxTexUnits];
>+uniform int op1_alpha[kMaxTexUnits];
>+uniform int op2_rgb[kMaxTexUnits];
>+uniform int op2_alpha[kMaxTexUnits];
>+uniform vec4 texture_env_color[kMaxTexUnits];
>+uniform float texture_env_rgb_scale[kMaxTexUnits];
>+uniform float texture_env_alpha_scale[kMaxTexUnits];
>+uniform bool point_sprite_coord_replace[kMaxTexUnits];
>+
>+// Vertex attributes////////////////////////////////////////////////////////////
>+
>+in vec4 pos_varying;
>+in vec3 normal_varying;
>+in vec4 color_varying;
>+flat in vec4 color_varying_flat;
>+in vec4 texcoord0_varying;
>+in vec4 texcoord1_varying;
>+in vec4 texcoord2_varying;
>+in vec4 texcoord3_varying;
>+
>+// Alpha test///////////////////////////////////////////////////////////////////
>+
>+uniform bool enable_alpha_test;
>+uniform int alpha_func;
>+uniform float alpha_test_ref;
>+
>+// Shading: flat shading, lighting, and materials///////////////////////////////
>+
>+uniform bool shade_model_flat;
>+uniform bool enable_lighting;
>+uniform bool enable_color_material;
>+
>+uniform vec4 material_ambient;
>+uniform vec4 material_diffuse;
>+uniform vec4 material_specular;
>+uniform vec4 material_emissive;
>+uniform float material_specular_exponent;
>+
>+uniform vec4 light_model_scene_ambient;
>+uniform bool light_model_two_sided;
>+
>+uniform bool light_enables[kMaxLights];
>+uniform vec4 light_ambients[kMaxLights];
>+uniform vec4 light_diffuses[kMaxLights];
>+uniform vec4 light_speculars[kMaxLights];
>+uniform vec4 light_positions[kMaxLights];
>+uniform vec3 light_directions[kMaxLights];
>+uniform float light_spotlight_exponents[kMaxLights];
>+uniform float light_spotlight_cutoff_angles[kMaxLights];
>+uniform float light_attenuation_consts[kMaxLights];
>+uniform float light_attenuation_linears[kMaxLights];
>+uniform float light_attenuation_quadratics[kMaxLights];
>+
>+// Fog /////////////////////////////////////////////////////////////////////////
>+
>+uniform bool enable_fog;
>+uniform int fog_mode;
>+uniform float fog_density;
>+uniform float fog_start;
>+uniform float fog_end;
>+uniform vec4 fog_color;
>+
>+// User clip plane /////////////////////////////////////////////////////////////
>+
>+uniform bool enable_clip_planes;
>+uniform bool clip_plane_enables[kMaxClipPlanes];
>+uniform vec4 clip_planes[kMaxClipPlanes];
>+
>+// Point rasterization//////////////////////////////////////////////////////////
>+
>+uniform bool point_rasterization;
>+uniform bool point_sprite_enabled;
>+
>+// GL_OES_draw_texture//////////////////////////////////////////////////////////
>+
>+uniform bool enable_draw_texture;
>+
>+// Outgoing fragment////////////////////////////////////////////////////////////
>+
>+out vec4 frag_color;
>+)";
>+
>+constexpr char kGLES1DrawFShaderFunctions[] = R"(
>+
>+float posDot(vec3 a, vec3 b)
>+{
>+    return max(dot(a, b), 0.0);
>+}
>+
>+vec4 doLighting(vec4 currentFragment)
>+{
>+    vec4 materialAmbientActual = material_ambient;
>+    vec4 materialDiffuseActual = material_diffuse;
>+
>+    if (enable_color_material || enable_texture_2d[0] || enable_texture_cube_map[0])
>+    {
>+        materialAmbientActual = currentFragment;
>+        materialDiffuseActual = currentFragment;
>+    }
>+
>+    vec4 lightingResult = material_emissive + materialAmbientActual * light_model_scene_ambient;
>+
>+    for (int i = 0; i < kMaxLights; i++)
>+    {
>+
>+        if (!light_enables[i])
>+            continue;
>+
>+        vec4 lightAmbient  = light_ambients[i];
>+        vec4 lightDiffuse  = light_diffuses[i];
>+        vec4 lightSpecular = light_speculars[i];
>+        vec4 lightPos      = light_positions[i];
>+        vec3 lightDir      = light_directions[i];
>+        float attConst     = light_attenuation_consts[i];
>+        float attLinear    = light_attenuation_linears[i];
>+        float attQuadratic = light_attenuation_quadratics[i];
>+        float spotAngle    = light_spotlight_cutoff_angles[i];
>+        float spotExponent = light_spotlight_exponents[i];
>+
>+        vec3 toLight;
>+        if (lightPos.w == 0.0)
>+        {
>+            toLight = lightPos.xyz;
>+        }
>+        else
>+        {
>+            toLight = (lightPos.xyz / lightPos.w - pos_varying.xyz);
>+        }
>+
>+        float lightDist = length(toLight);
>+        vec3 h          = normalize(toLight) + vec3(0.0, 0.0, 1.0);
>+        float ndotL     = posDot(normal_varying, normalize(toLight));
>+        float ndoth     = posDot(normal_varying, normalize(h));
>+
>+        float specAtt;
>+
>+        if (ndotL != 0.0)
>+        {
>+            specAtt = 1.0;
>+        }
>+        else
>+        {
>+            specAtt = 0.0;
>+        }
>+
>+        float att;
>+
>+        if (lightPos.w != 0.0)
>+        {
>+            float attDenom =
>+                (attConst + attLinear * lightDist + attQuadratic * lightDist * lightDist);
>+            att = 1.0 / attDenom;
>+        }
>+        else
>+        {
>+            att = 1.0;
>+        }
>+
>+        float spot;
>+
>+        float spotAngleCos = cos(radians(spotAngle));
>+        vec3 toSurfaceDir  = -normalize(toLight);
>+        float spotDot      = posDot(toSurfaceDir, normalize(lightDir));
>+
>+        if (spotAngle == 180.0 || lightPos.w == 0.0)
>+        {
>+            spot = 1.0;
>+        }
>+        else
>+        {
>+            if (spotDot < spotAngleCos)
>+            {
>+                spot = 0.0;
>+            }
>+            else
>+            {
>+                spot = pow(spotDot, spotExponent);
>+            }
>+        }
>+
>+        vec4 contrib = materialAmbientActual * lightAmbient;
>+        contrib += ndotL * materialDiffuseActual * lightDiffuse;
>+        if (ndoth > 0.0 && material_specular_exponent > 0.0)
>+        {
>+            contrib += specAtt * pow(ndoth, material_specular_exponent) * material_specular *
>+                       lightSpecular;
>+        }
>+        else
>+        {
>+            if (ndoth > 0.0)
>+            {
>+                contrib += specAtt * material_specular * lightSpecular;
>+            }
>+        }
>+        contrib *= att * spot;
>+        lightingResult += contrib;
>+    }
>+
>+    return lightingResult;
>+}
>+
>+bool doAlphaTest(vec4 currentFragment)
>+{
>+    bool shouldPassAlpha = false;
>+    float incAlpha       = currentFragment.a;
>+
>+    switch (alpha_func)
>+    {
>+        case kNever:
>+            shouldPassAlpha = false;
>+            break;
>+        case kLess:
>+            shouldPassAlpha = incAlpha < alpha_test_ref;
>+            break;
>+        case kLequal:
>+            shouldPassAlpha = incAlpha <= alpha_test_ref;
>+            break;
>+        case kEqual:
>+            shouldPassAlpha = incAlpha == alpha_test_ref;
>+            break;
>+        case kGequal:
>+            shouldPassAlpha = incAlpha >= alpha_test_ref;
>+            break;
>+        case kGreater:
>+            shouldPassAlpha = incAlpha > alpha_test_ref;
>+            break;
>+        case kNotequal:
>+            shouldPassAlpha = incAlpha != alpha_test_ref;
>+            break;
>+        case kAlways:
>+        default:
>+            shouldPassAlpha = true;
>+            break;
>+    }
>+
>+    return shouldPassAlpha;
>+}
>+
>+bool doClipPlaneTest()
>+{
>+    bool res = true;
>+
>+    for (int i = 0; i < kMaxClipPlanes; i++)
>+    {
>+        if (clip_plane_enables[i])
>+        {
>+            float dist = dot(clip_planes[i].xyz, pos_varying.xyz) + clip_planes[i].w * pos_varying.w;
>+            res        = res && (dist >= 0.0);
>+        }
>+    }
>+
>+    return res;
>+}
>+
>+vec4 doFog(vec4 currentFragment)
>+{
>+
>+    float eyeDist = -pos_varying.z / pos_varying.w;
>+    float f       = 1.0;
>+    switch (fog_mode)
>+    {
>+        case kExp:
>+            f = exp(-fog_density * eyeDist);
>+            break;
>+        case kExp2:
>+            f = exp(-(pow(fog_density * eyeDist, 2.0)));
>+            break;
>+        case kLinear:
>+            f = (fog_end - eyeDist) / (fog_end - fog_start);
>+            break;
>+        default:
>+            break;
>+    }
>+
>+    vec4 result = f * currentFragment + (1.0 - f) * fog_color;
>+    return result;
>+}
>+
>+)";
>+
>+constexpr char kGLES1DrawFShaderMultitexturing[] = R"(
>+
>+bool isTextureUnitEnabled(int unit)
>+{
>+    return enable_texture_2d[unit] || enable_texture_cube_map[unit];
>+}
>+
>+vec4 getTextureColor(int unit)
>+{
>+    vec4 res;
>+
>+    switch (unit)
>+    {
>+        case 0:
>+            if (enable_texture_2d[0])
>+            {
>+                res = texture(tex_sampler0, texcoord0_varying.xy);
>+            }
>+            else if (enable_texture_cube_map[0])
>+            {
>+                res = texture(tex_cube_sampler0, texcoord0_varying.xyz);
>+            }
>+            break;
>+        case 1:
>+            if (enable_texture_2d[1])
>+            {
>+                res = texture(tex_sampler1, texcoord1_varying.xy);
>+            }
>+            else if (enable_texture_cube_map[1])
>+            {
>+                res = texture(tex_cube_sampler1, texcoord1_varying.xyz);
>+            }
>+            break;
>+        case 2:
>+            if (enable_texture_2d[2])
>+            {
>+                res = texture(tex_sampler2, texcoord2_varying.xy);
>+            }
>+            else if (enable_texture_cube_map[2])
>+            {
>+                res = texture(tex_cube_sampler2, texcoord2_varying.xyz);
>+            }
>+            break;
>+        case 3:
>+            if (enable_texture_2d[3])
>+            {
>+                res = texture(tex_sampler3, texcoord3_varying.xy);
>+            }
>+            else if (enable_texture_cube_map[3])
>+            {
>+                // TODO: Weird stuff happens
>+                // res = texture(tex_cube_sampler3, texcoord3_varying.xyz);
>+            }
>+            break;
>+        default:
>+            break;
>+    }
>+
>+    return res;
>+}
>+
>+vec4 getPointSpriteTextureColor(int unit)
>+{
>+    vec4 res;
>+
>+    switch (unit)
>+    {
>+        case 0:
>+            if (enable_texture_2d[0])
>+            {
>+                res = texture(tex_sampler0, gl_PointCoord.xy);
>+            }
>+            break;
>+        case 1:
>+            if (enable_texture_2d[1])
>+            {
>+                res = texture(tex_sampler1, gl_PointCoord.xy);
>+            }
>+            break;
>+        case 2:
>+            if (enable_texture_2d[2])
>+            {
>+                res = texture(tex_sampler2, gl_PointCoord.xy);
>+            }
>+            break;
>+        case 3:
>+            if (enable_texture_2d[3])
>+            {
>+                res = texture(tex_sampler3, gl_PointCoord.xy);
>+            }
>+            break;
>+        default:
>+            break;
>+    }
>+
>+    return res;
>+}
>+
>+vec3 textureCombineSrcnOpnRgb(int srcnRgb,
>+                              int opnRgb,
>+                              vec4 textureEnvColor,
>+                              vec4 vertexColor,
>+                              vec4 texturePrevColor,
>+                              vec4 textureColor)
>+{
>+    vec3 res;
>+    vec4 op;
>+
>+    switch (srcnRgb)
>+    {
>+        case kTexture:
>+            op = textureColor;
>+            break;
>+        case kConstant:
>+            op = textureEnvColor;
>+            break;
>+        case kPrimaryColor:
>+            op = vertexColor;
>+            break;
>+        case kPrevious:
>+            op = texturePrevColor;
>+            break;
>+        default:
>+            op = texturePrevColor;
>+            break;
>+    }
>+
>+    switch (opnRgb)
>+    {
>+        case kSrcColor:
>+            res = op.rgb;
>+            break;
>+        case kOneMinusSrcColor:
>+            res = 1.0 - op.rgb;
>+            break;
>+        case kSrcAlpha:
>+            res = vec3(op.a, op.a, op.a);
>+            break;
>+        case kOneMinusSrcAlpha:
>+            res = vec3(1.0 - op.a, 1.0 - op.a, 1.0 - op.a);
>+            break;
>+        default:
>+            break;
>+    }
>+
>+    return res;
>+}
>+
>+float textureCombineSrcnOpnAlpha(int srcn,
>+                                 int opn,
>+                                 vec4 textureEnvColor,
>+                                 vec4 vertexColor,
>+                                 vec4 texturePrevColor,
>+                                 vec4 textureColor)
>+{
>+    float res;
>+    vec4 op;
>+
>+    switch (srcn)
>+    {
>+        case kTexture:
>+            op = textureColor;
>+            break;
>+        case kConstant:
>+            op = textureEnvColor;
>+            break;
>+        case kPrimaryColor:
>+            op = vertexColor;
>+            break;
>+        case kPrevious:
>+            op = texturePrevColor;
>+            break;
>+        default:
>+            op = texturePrevColor;
>+            break;
>+    }
>+
>+    switch (opn)
>+    {
>+        case kSrcAlpha:
>+            res = op.a;
>+            break;
>+        case kOneMinusSrcAlpha:
>+            res = 1.0 - op.a;
>+            break;
>+        default:
>+            break;
>+    }
>+
>+    return res;
>+}
>+
>+vec4 textureCombine(int combineRgb,
>+                    int combineAlpha,
>+                    int src0Rgb,
>+                    int src0Alpha,
>+                    int src1Rgb,
>+                    int src1Alpha,
>+                    int src2Rgb,
>+                    int src2Alpha,
>+                    int op0Rgb,
>+                    int op0Alpha,
>+                    int op1Rgb,
>+                    int op1Alpha,
>+                    int op2Rgb,
>+                    int op2Alpha,
>+                    vec4 textureEnvColor,
>+                    float rgbScale,
>+                    float alphaScale,
>+                    vec4 vertexColor,
>+                    vec4 texturePrevColor,
>+                    vec4 textureColor)
>+{
>+
>+    vec3 resRgb;
>+    float resAlpha;
>+
>+    vec3 arg0Rgb;
>+    float arg0Alpha;
>+    vec3 arg1Rgb;
>+    float arg1Alpha;
>+    vec3 arg2Rgb;
>+    float arg2Alpha;
>+    float dotVal;
>+
>+    arg0Rgb   = textureCombineSrcnOpnRgb(src0Rgb, op0Rgb, textureEnvColor, vertexColor,
>+                                       texturePrevColor, textureColor);
>+    arg0Alpha = textureCombineSrcnOpnAlpha(src0Alpha, op0Alpha, textureEnvColor, vertexColor,
>+                                           texturePrevColor, textureColor);
>+
>+    if (combineRgb != kReplace)
>+    {
>+        arg1Rgb = textureCombineSrcnOpnRgb(src1Rgb, op1Rgb, textureEnvColor, vertexColor,
>+                                           texturePrevColor, textureColor);
>+    }
>+
>+    if (combineAlpha != kReplace)
>+    {
>+        arg1Alpha = textureCombineSrcnOpnAlpha(src1Alpha, op1Alpha, textureEnvColor, vertexColor,
>+                                               texturePrevColor, textureColor);
>+    }
>+
>+    if (combineRgb == kInterpolate)
>+    {
>+        arg2Rgb = textureCombineSrcnOpnRgb(src2Rgb, op2Rgb, textureEnvColor, vertexColor,
>+                                           texturePrevColor, textureColor);
>+    }
>+
>+    if (combineAlpha == kInterpolate)
>+    {
>+        arg2Alpha = textureCombineSrcnOpnAlpha(src2Alpha, op2Alpha, textureEnvColor, vertexColor,
>+                                               texturePrevColor, textureColor);
>+    }
>+
>+    switch (combineRgb)
>+    {
>+        case kReplace:
>+            resRgb = arg0Rgb;
>+            break;
>+        case kModulate:
>+            resRgb = arg0Rgb * arg1Rgb;
>+            break;
>+        case kAdd:
>+            resRgb = arg0Rgb + arg1Rgb;
>+            break;
>+        case kAddSigned:
>+            resRgb = arg0Rgb + arg1Rgb - 0.5;
>+            break;
>+        case kInterpolate:
>+            resRgb = arg0Rgb * arg2Rgb + arg1Rgb * (1.0 - arg2Rgb);
>+            break;
>+        case kSubtract:
>+            resRgb = arg0Rgb - arg1Rgb;
>+            break;
>+        default:
>+            break;
>+    }
>+
>+    switch (combineAlpha)
>+    {
>+        case kReplace:
>+            resAlpha = arg0Alpha;
>+            break;
>+        case kModulate:
>+            resAlpha = arg0Alpha * arg1Alpha;
>+            break;
>+        case kAdd:
>+            resAlpha = arg0Alpha + arg1Alpha;
>+            break;
>+        case kAddSigned:
>+            resAlpha = arg0Alpha + arg1Alpha - 0.5;
>+            break;
>+        case kInterpolate:
>+            resAlpha = arg0Alpha * arg2Alpha + arg1Alpha * (1.0 - arg2Alpha);
>+            break;
>+        case kSubtract:
>+            resAlpha = arg0Alpha - arg1Alpha;
>+            break;
>+        default:
>+            break;
>+    }
>+
>+    if (combineRgb == kDot3Rgb || combineRgb == kDot3Rgba)
>+    {
>+        dotVal = 4.0 * dot(arg0Rgb - 0.5, arg1Rgb - 0.5);
>+
>+        if (combineRgb == kDot3Rgb)
>+        {
>+            return vec4(dotVal, dotVal, dotVal, resAlpha);
>+        }
>+        else
>+        {
>+            return vec4(dotVal, dotVal, dotVal, dotVal);
>+        }
>+    }
>+    else
>+    {
>+        return vec4(resRgb, resAlpha);
>+    }
>+}
>+
>+vec4 textureFunction(int unit,
>+                     int texFormat,
>+                     int envMode,
>+                     int combineRgb,
>+                     int combineAlpha,
>+                     int src0Rgb,
>+                     int src0Alpha,
>+                     int src1Rgb,
>+                     int src1Alpha,
>+                     int src2Rgb,
>+                     int src2Alpha,
>+                     int op0Rgb,
>+                     int op0Alpha,
>+                     int op1Rgb,
>+                     int op1Alpha,
>+                     int op2Rgb,
>+                     int op2Alpha,
>+                     vec4 textureEnvColor,
>+                     float rgbScale,
>+                     float alphaScale,
>+                     vec4 vertexColor,
>+                     vec4 texturePrevColor,
>+                     vec4 textureColor)
>+{
>+
>+    if (!isTextureUnitEnabled(unit))
>+    {
>+        return texturePrevColor;
>+    }
>+
>+    vec4 res;
>+
>+    switch (envMode)
>+    {
>+        case kReplace:
>+            switch (texFormat)
>+            {
>+                case kAlpha:
>+                    res.rgb = texturePrevColor.rgb;
>+                    res.a   = textureColor.a;
>+                    break;
>+                case kRGBA:
>+                case kLuminanceAlpha:
>+                    res.rgba = textureColor.rgba;
>+                    break;
>+                case kRGB:
>+                case kLuminance:
>+                default:
>+                    res.rgb = textureColor.rgb;
>+                    res.a   = texturePrevColor.a;
>+                    break;
>+            }
>+            break;
>+        case kModulate:
>+            switch (texFormat)
>+            {
>+                case kAlpha:
>+                    res.rgb = texturePrevColor.rgb;
>+                    res.a   = texturePrevColor.a * textureColor.a;
>+                    break;
>+                case kRGBA:
>+                case kLuminanceAlpha:
>+                    res.rgba = texturePrevColor.rgba * textureColor.rgba;
>+                    break;
>+                case kRGB:
>+                case kLuminance:
>+                default:
>+                    res.rgb = texturePrevColor.rgb * textureColor.rgb;
>+                    res.a   = texturePrevColor.a;
>+                    break;
>+            }
>+            break;
>+        case kDecal:
>+            switch (texFormat)
>+            {
>+                case kRGB:
>+                    res.rgb = textureColor.rgb;
>+                    res.a   = texturePrevColor.a;
>+                    break;
>+                case kRGBA:
>+                    res.rgb = texturePrevColor.rgb * (1.0 - textureColor.a) +
>+                              textureColor.rgb * textureColor.a;
>+                    res.a = texturePrevColor.a;
>+                    break;
>+                case kAlpha:
>+                case kLuminance:
>+                case kLuminanceAlpha:
>+                default:
>+                    res.rgb = texturePrevColor.rgb * textureColor.rgb;
>+                    res.a   = texturePrevColor.a;
>+                    break;
>+            }
>+            break;
>+        case kBlend:
>+            switch (texFormat)
>+            {
>+                case kAlpha:
>+                    res.rgb = texturePrevColor.rgb;
>+                    res.a   = textureColor.a * texturePrevColor.a;
>+                    break;
>+                case kLuminance:
>+                case kRGB:
>+                    res.rgb = texturePrevColor.rgb * (1.0 - textureColor.rgb) +
>+                              textureEnvColor.rgb * textureColor.rgb;
>+                    res.a = texturePrevColor.a;
>+                    break;
>+                case kLuminanceAlpha:
>+                case kRGBA:
>+                default:
>+                    res.rgb = texturePrevColor.rgb * (1.0 - textureColor.rgb) +
>+                              textureEnvColor.rgb * textureColor.rgb;
>+                    res.a = textureColor.a * texturePrevColor.a;
>+                    break;
>+            }
>+            break;
>+        case kAdd:
>+            switch (texFormat)
>+            {
>+                case kAlpha:
>+                    res.rgb = texturePrevColor.rgb;
>+                    res.a   = textureColor.a * texturePrevColor.a;
>+                    break;
>+                case kLuminance:
>+                case kRGB:
>+                    res.rgb = texturePrevColor.rgb + textureColor.rgb;
>+                    res.a   = texturePrevColor.a;
>+                    break;
>+                case kLuminanceAlpha:
>+                case kRGBA:
>+                default:
>+                    res.rgb = texturePrevColor.rgb + textureColor.rgb;
>+                    res.a   = textureColor.a * texturePrevColor.a;
>+                    break;
>+            }
>+            break;
>+        case kCombine:
>+            res = textureCombine(combineRgb, combineAlpha, src0Rgb, src0Alpha, src1Rgb, src1Alpha,
>+                                 src2Rgb, src2Alpha, op0Rgb, op0Alpha, op1Rgb, op1Alpha, op2Rgb,
>+                                 op2Alpha, textureEnvColor, rgbScale, alphaScale, vertexColor,
>+                                 texturePrevColor, textureColor);
>+            res.rgb *= rgbScale;
>+            res.a *= alphaScale;
>+            break;
>+        default:
>+            break;
>+    }
>+
>+    return clamp(res, 0.0, 1.0);
>+}
>+)";
>+
>+constexpr char kGLES1DrawFShaderMain[] = R"(
>+void main()
>+{
>+    if (enable_clip_planes && !enable_draw_texture)
>+    {
>+        if (!doClipPlaneTest())
>+        {
>+            discard;
>+        }
>+    }
>+
>+    vec4 currentFragment;
>+    vec4 vertex_color;
>+
>+    if (shade_model_flat)
>+    {
>+        vertex_color = color_varying_flat;
>+    }
>+    else
>+    {
>+        vertex_color = color_varying;
>+    }
>+
>+    currentFragment = vertex_color;
>+
>+    vec4 texturePrevColor = currentFragment;
>+
>+    for (int i = 0; i < kMaxTexUnits; i++)
>+    {
>+        vec4 textureColor;
>+
>+        if (point_rasterization && point_sprite_enabled &&
>+            point_sprite_coord_replace[i]) {
>+            textureColor = getPointSpriteTextureColor(i);
>+        } else {
>+            textureColor = getTextureColor(i);
>+        }
>+
>+        currentFragment = textureFunction(
>+            i, texture_format[i], texture_env_mode[i], combine_rgb[i], combine_alpha[i],
>+            src0_rgb[i], src0_alpha[i], src1_rgb[i], src1_alpha[i], src2_rgb[i], src2_alpha[i],
>+            op0_rgb[i], op0_alpha[i], op1_rgb[i], op1_alpha[i], op2_rgb[i], op2_alpha[i],
>+            texture_env_color[i], texture_env_rgb_scale[i], texture_env_alpha_scale[i],
>+            vertex_color, texturePrevColor, textureColor);
>+
>+        texturePrevColor = currentFragment;
>+    }
>+
>+    if (enable_lighting)
>+    {
>+        currentFragment = doLighting(currentFragment);
>+    }
>+
>+    if (enable_fog)
>+    {
>+        currentFragment = doFog(currentFragment);
>+    }
>+
>+    if (enable_alpha_test && !doAlphaTest(currentFragment))
>+    {
>+        discard;
>+    }
>+
>+    frag_color = currentFragment;
>+}
>+)";
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/GLES1State.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/GLES1State.cpp
>new file mode 100644
>index 00000000000..2ff2b3d53e5
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/GLES1State.cpp
>@@ -0,0 +1,576 @@
>+//
>+// Copyright 2018 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+
>+// GLES1State.cpp: Implements the GLES1State class, tracking state
>+// for GLES1 contexts.
>+
>+#include "libANGLE/GLES1State.h"
>+
>+#include "libANGLE/Context.h"
>+#include "libANGLE/GLES1Renderer.h"
>+
>+namespace gl
>+{
>+
>+TextureCoordF::TextureCoordF() = default;
>+
>+TextureCoordF::TextureCoordF(float _s, float _t, float _r, float _q) : s(_s), t(_t), r(_r), q(_q) {}
>+
>+bool TextureCoordF::operator==(const TextureCoordF &other) const
>+{
>+    return s == other.s && t == other.t && r == other.r && q == other.q;
>+}
>+
>+MaterialParameters::MaterialParameters() = default;
>+
>+LightModelParameters::LightModelParameters() = default;
>+
>+LightParameters::LightParameters() = default;
>+
>+LightParameters::LightParameters(const LightParameters &other) = default;
>+
>+FogParameters::FogParameters() = default;
>+
>+TextureEnvironmentParameters::TextureEnvironmentParameters() = default;
>+
>+TextureEnvironmentParameters::TextureEnvironmentParameters(
>+    const TextureEnvironmentParameters &other) = default;
>+
>+PointParameters::PointParameters() = default;
>+
>+PointParameters::PointParameters(const PointParameters &other) = default;
>+
>+ClipPlaneParameters::ClipPlaneParameters() = default;
>+
>+ClipPlaneParameters::ClipPlaneParameters(bool enabled, const angle::Vector4 &equation)
>+    : enabled(enabled), equation(equation)
>+{}
>+
>+ClipPlaneParameters::ClipPlaneParameters(const ClipPlaneParameters &other) = default;
>+
>+GLES1State::GLES1State()
>+    : mGLState(nullptr),
>+      mVertexArrayEnabled(false),
>+      mNormalArrayEnabled(false),
>+      mColorArrayEnabled(false),
>+      mPointSizeArrayEnabled(false),
>+      mLineSmoothEnabled(false),
>+      mPointSmoothEnabled(false),
>+      mPointSpriteEnabled(false),
>+      mAlphaTestEnabled(false),
>+      mLogicOpEnabled(false),
>+      mLightingEnabled(false),
>+      mFogEnabled(false),
>+      mRescaleNormalEnabled(false),
>+      mNormalizeEnabled(false),
>+      mColorMaterialEnabled(false),
>+      mReflectionMapEnabled(false),
>+      mCurrentColor({0.0f, 0.0f, 0.0f, 0.0f}),
>+      mCurrentNormal({0.0f, 0.0f, 0.0f}),
>+      mClientActiveTexture(0),
>+      mMatrixMode(MatrixType::Modelview),
>+      mShadeModel(ShadingModel::Smooth),
>+      mAlphaTestFunc(AlphaTestFunc::AlwaysPass),
>+      mAlphaTestRef(0.0f),
>+      mLogicOp(LogicalOperation::Copy),
>+      mLineSmoothHint(HintSetting::DontCare),
>+      mPointSmoothHint(HintSetting::DontCare),
>+      mPerspectiveCorrectionHint(HintSetting::DontCare),
>+      mFogHint(HintSetting::DontCare)
>+{}
>+
>+GLES1State::~GLES1State() = default;
>+
>+// Taken from the GLES 1.x spec which specifies all initial state values.
>+void GLES1State::initialize(const Context *context, const State *state)
>+{
>+    mGLState = state;
>+
>+    const Caps &caps = context->getCaps();
>+
>+    mTexUnitEnables.resize(caps.maxMultitextureUnits);
>+    for (auto &enables : mTexUnitEnables)
>+    {
>+        enables.reset();
>+    }
>+
>+    mVertexArrayEnabled    = false;
>+    mNormalArrayEnabled    = false;
>+    mColorArrayEnabled     = false;
>+    mPointSizeArrayEnabled = false;
>+    mTexCoordArrayEnabled.resize(caps.maxMultitextureUnits, false);
>+
>+    mLineSmoothEnabled    = false;
>+    mPointSmoothEnabled   = false;
>+    mPointSpriteEnabled   = false;
>+    mLogicOpEnabled       = false;
>+    mAlphaTestEnabled     = false;
>+    mLightingEnabled      = false;
>+    mFogEnabled           = false;
>+    mRescaleNormalEnabled = false;
>+    mNormalizeEnabled     = false;
>+    mColorMaterialEnabled = false;
>+    mReflectionMapEnabled = false;
>+
>+    mMatrixMode = MatrixType::Modelview;
>+
>+    mCurrentColor  = {1.0f, 1.0f, 1.0f, 1.0f};
>+    mCurrentNormal = {0.0f, 0.0f, 1.0f};
>+    mCurrentTextureCoords.resize(caps.maxMultitextureUnits);
>+    mClientActiveTexture = 0;
>+
>+    mTextureEnvironments.resize(caps.maxMultitextureUnits);
>+
>+    mModelviewMatrices.push_back(angle::Mat4());
>+    mProjectionMatrices.push_back(angle::Mat4());
>+    mTextureMatrices.resize(caps.maxMultitextureUnits);
>+    for (auto &stack : mTextureMatrices)
>+    {
>+        stack.push_back(angle::Mat4());
>+    }
>+
>+    mMaterial.ambient  = {0.2f, 0.2f, 0.2f, 1.0f};
>+    mMaterial.diffuse  = {0.8f, 0.8f, 0.8f, 1.0f};
>+    mMaterial.specular = {0.0f, 0.0f, 0.0f, 1.0f};
>+    mMaterial.emissive = {0.0f, 0.0f, 0.0f, 1.0f};
>+
>+    mMaterial.specularExponent = 0.0f;
>+
>+    mLightModel.color    = {0.2f, 0.2f, 0.2f, 1.0f};
>+    mLightModel.twoSided = false;
>+
>+    mLights.resize(caps.maxLights);
>+
>+    // GL_LIGHT0 is special and has default state that avoids all-black renderings.
>+    mLights[0].diffuse  = {1.0f, 1.0f, 1.0f, 1.0f};
>+    mLights[0].specular = {1.0f, 1.0f, 1.0f, 1.0f};
>+
>+    mFog.mode    = FogMode::Exp;
>+    mFog.density = 1.0f;
>+    mFog.start   = 0.0f;
>+    mFog.end     = 1.0f;
>+
>+    mFog.color = {0.0f, 0.0f, 0.0f, 0.0f};
>+
>+    mShadeModel = ShadingModel::Smooth;
>+
>+    mAlphaTestFunc = AlphaTestFunc::AlwaysPass;
>+    mAlphaTestRef  = 0.0f;
>+
>+    mLogicOp = LogicalOperation::Copy;
>+
>+    mClipPlanes.resize(caps.maxClipPlanes,
>+                       ClipPlaneParameters(false, angle::Vector4(0.0f, 0.0f, 0.0f, 0.0f)));
>+
>+    mLineSmoothHint            = HintSetting::DontCare;
>+    mPointSmoothHint           = HintSetting::DontCare;
>+    mPerspectiveCorrectionHint = HintSetting::DontCare;
>+    mFogHint                   = HintSetting::DontCare;
>+
>+    // The user-specified point size, GL_POINT_SIZE_MAX,
>+    // is initially equal to the implementation maximum.
>+    mPointParameters.pointSizeMax = caps.maxAliasedPointSize;
>+
>+    mDirtyBits.set();
>+}
>+
>+void GLES1State::setAlphaFunc(AlphaTestFunc func, GLfloat ref)
>+{
>+    setDirty(DIRTY_GLES1_ALPHA_TEST);
>+    mAlphaTestFunc = func;
>+    mAlphaTestRef  = ref;
>+}
>+
>+void GLES1State::setClientTextureUnit(unsigned int unit)
>+{
>+    setDirty(DIRTY_GLES1_CLIENT_ACTIVE_TEXTURE);
>+    mClientActiveTexture = unit;
>+}
>+
>+unsigned int GLES1State::getClientTextureUnit() const
>+{
>+    return mClientActiveTexture;
>+}
>+
>+void GLES1State::setCurrentColor(const ColorF &color)
>+{
>+    setDirty(DIRTY_GLES1_CURRENT_VECTOR);
>+    mCurrentColor = color;
>+}
>+
>+const ColorF &GLES1State::getCurrentColor() const
>+{
>+    return mCurrentColor;
>+}
>+
>+void GLES1State::setCurrentNormal(const angle::Vector3 &normal)
>+{
>+    setDirty(DIRTY_GLES1_CURRENT_VECTOR);
>+    mCurrentNormal = normal;
>+}
>+
>+const angle::Vector3 &GLES1State::getCurrentNormal() const
>+{
>+    return mCurrentNormal;
>+}
>+
>+void GLES1State::setCurrentTextureCoords(unsigned int unit, const TextureCoordF &coords)
>+{
>+    setDirty(DIRTY_GLES1_CURRENT_VECTOR);
>+    mCurrentTextureCoords[unit] = coords;
>+}
>+
>+const TextureCoordF &GLES1State::getCurrentTextureCoords(unsigned int unit) const
>+{
>+    return mCurrentTextureCoords[unit];
>+}
>+
>+void GLES1State::setMatrixMode(MatrixType mode)
>+{
>+    setDirty(DIRTY_GLES1_MATRICES);
>+    mMatrixMode = mode;
>+}
>+
>+MatrixType GLES1State::getMatrixMode() const
>+{
>+    return mMatrixMode;
>+}
>+
>+GLint GLES1State::getCurrentMatrixStackDepth(GLenum queryType) const
>+{
>+    switch (queryType)
>+    {
>+        case GL_MODELVIEW_STACK_DEPTH:
>+            return clampCast<GLint>(mModelviewMatrices.size());
>+        case GL_PROJECTION_STACK_DEPTH:
>+            return clampCast<GLint>(mProjectionMatrices.size());
>+        case GL_TEXTURE_STACK_DEPTH:
>+            return clampCast<GLint>(mTextureMatrices[mGLState->getActiveSampler()].size());
>+        default:
>+            UNREACHABLE();
>+            return 0;
>+    }
>+}
>+
>+void GLES1State::pushMatrix()
>+{
>+    setDirty(DIRTY_GLES1_MATRICES);
>+    auto &stack = currentMatrixStack();
>+    stack.push_back(stack.back());
>+}
>+
>+void GLES1State::popMatrix()
>+{
>+    setDirty(DIRTY_GLES1_MATRICES);
>+    auto &stack = currentMatrixStack();
>+    stack.pop_back();
>+}
>+
>+GLES1State::MatrixStack &GLES1State::currentMatrixStack()
>+{
>+    setDirty(DIRTY_GLES1_MATRICES);
>+    switch (mMatrixMode)
>+    {
>+        case MatrixType::Modelview:
>+            return mModelviewMatrices;
>+        case MatrixType::Projection:
>+            return mProjectionMatrices;
>+        case MatrixType::Texture:
>+            return mTextureMatrices[mGLState->getActiveSampler()];
>+        default:
>+            UNREACHABLE();
>+            return mModelviewMatrices;
>+    }
>+}
>+
>+const angle::Mat4 &GLES1State::getModelviewMatrix() const
>+{
>+    return mModelviewMatrices.back();
>+}
>+
>+const GLES1State::MatrixStack &GLES1State::currentMatrixStack() const
>+{
>+    switch (mMatrixMode)
>+    {
>+        case MatrixType::Modelview:
>+            return mModelviewMatrices;
>+        case MatrixType::Projection:
>+            return mProjectionMatrices;
>+        case MatrixType::Texture:
>+            return mTextureMatrices[mGLState->getActiveSampler()];
>+        default:
>+            UNREACHABLE();
>+            return mModelviewMatrices;
>+    }
>+}
>+
>+void GLES1State::loadMatrix(const angle::Mat4 &m)
>+{
>+    setDirty(DIRTY_GLES1_MATRICES);
>+    currentMatrixStack().back() = m;
>+}
>+
>+void GLES1State::multMatrix(const angle::Mat4 &m)
>+{
>+    setDirty(DIRTY_GLES1_MATRICES);
>+    angle::Mat4 currentMatrix   = currentMatrixStack().back();
>+    currentMatrixStack().back() = currentMatrix.product(m);
>+}
>+
>+void GLES1State::setLogicOp(LogicalOperation opcodePacked)
>+{
>+    setDirty(DIRTY_GLES1_LOGIC_OP);
>+    mLogicOp = opcodePacked;
>+}
>+
>+void GLES1State::setClientStateEnabled(ClientVertexArrayType clientState, bool enable)
>+{
>+    setDirty(DIRTY_GLES1_CLIENT_STATE_ENABLE);
>+    switch (clientState)
>+    {
>+        case ClientVertexArrayType::Vertex:
>+            mVertexArrayEnabled = enable;
>+            break;
>+        case ClientVertexArrayType::Normal:
>+            mNormalArrayEnabled = enable;
>+            break;
>+        case ClientVertexArrayType::Color:
>+            mColorArrayEnabled = enable;
>+            break;
>+        case ClientVertexArrayType::PointSize:
>+            mPointSizeArrayEnabled = enable;
>+            break;
>+        case ClientVertexArrayType::TextureCoord:
>+            mTexCoordArrayEnabled[mClientActiveTexture] = enable;
>+            break;
>+        default:
>+            UNREACHABLE();
>+            break;
>+    }
>+}
>+
>+void GLES1State::setTexCoordArrayEnabled(unsigned int unit, bool enable)
>+{
>+    setDirty(DIRTY_GLES1_CLIENT_STATE_ENABLE);
>+    mTexCoordArrayEnabled[unit] = enable;
>+}
>+
>+bool GLES1State::isClientStateEnabled(ClientVertexArrayType clientState) const
>+{
>+    switch (clientState)
>+    {
>+        case ClientVertexArrayType::Vertex:
>+            return mVertexArrayEnabled;
>+        case ClientVertexArrayType::Normal:
>+            return mNormalArrayEnabled;
>+        case ClientVertexArrayType::Color:
>+            return mColorArrayEnabled;
>+        case ClientVertexArrayType::PointSize:
>+            return mPointSizeArrayEnabled;
>+        case ClientVertexArrayType::TextureCoord:
>+            return mTexCoordArrayEnabled[mClientActiveTexture];
>+        default:
>+            UNREACHABLE();
>+            return false;
>+    }
>+}
>+
>+bool GLES1State::isTexCoordArrayEnabled(unsigned int unit) const
>+{
>+    ASSERT(unit < mTexCoordArrayEnabled.size());
>+    return mTexCoordArrayEnabled[unit];
>+}
>+
>+bool GLES1State::isTextureTargetEnabled(unsigned int unit, const TextureType type) const
>+{
>+    return mTexUnitEnables[unit].test(type);
>+}
>+
>+LightModelParameters &GLES1State::lightModelParameters()
>+{
>+    setDirty(DIRTY_GLES1_LIGHTS);
>+    return mLightModel;
>+}
>+
>+const LightModelParameters &GLES1State::lightModelParameters() const
>+{
>+    return mLightModel;
>+}
>+
>+LightParameters &GLES1State::lightParameters(unsigned int light)
>+{
>+    setDirty(DIRTY_GLES1_LIGHTS);
>+    return mLights[light];
>+}
>+
>+const LightParameters &GLES1State::lightParameters(unsigned int light) const
>+{
>+    return mLights[light];
>+}
>+
>+MaterialParameters &GLES1State::materialParameters()
>+{
>+    setDirty(DIRTY_GLES1_MATERIAL);
>+    return mMaterial;
>+}
>+
>+const MaterialParameters &GLES1State::materialParameters() const
>+{
>+    return mMaterial;
>+}
>+
>+bool GLES1State::isColorMaterialEnabled() const
>+{
>+    return mColorMaterialEnabled;
>+}
>+
>+void GLES1State::setShadeModel(ShadingModel model)
>+{
>+    setDirty(DIRTY_GLES1_SHADE_MODEL);
>+    mShadeModel = model;
>+}
>+
>+void GLES1State::setClipPlane(unsigned int plane, const GLfloat *equation)
>+{
>+    setDirty(DIRTY_GLES1_CLIP_PLANES);
>+    assert(plane < mClipPlanes.size());
>+    mClipPlanes[plane].equation[0] = equation[0];
>+    mClipPlanes[plane].equation[1] = equation[1];
>+    mClipPlanes[plane].equation[2] = equation[2];
>+    mClipPlanes[plane].equation[3] = equation[3];
>+}
>+
>+void GLES1State::getClipPlane(unsigned int plane, GLfloat *equation) const
>+{
>+    assert(plane < mClipPlanes.size());
>+    equation[0] = mClipPlanes[plane].equation[0];
>+    equation[1] = mClipPlanes[plane].equation[1];
>+    equation[2] = mClipPlanes[plane].equation[2];
>+    equation[3] = mClipPlanes[plane].equation[3];
>+}
>+
>+FogParameters &GLES1State::fogParameters()
>+{
>+    setDirty(DIRTY_GLES1_FOG);
>+    return mFog;
>+}
>+
>+const FogParameters &GLES1State::fogParameters() const
>+{
>+    return mFog;
>+}
>+
>+TextureEnvironmentParameters &GLES1State::textureEnvironment(unsigned int unit)
>+{
>+    setDirty(DIRTY_GLES1_TEXTURE_ENVIRONMENT);
>+    assert(unit < mTextureEnvironments.size());
>+    return mTextureEnvironments[unit];
>+}
>+
>+const TextureEnvironmentParameters &GLES1State::textureEnvironment(unsigned int unit) const
>+{
>+    assert(unit < mTextureEnvironments.size());
>+    return mTextureEnvironments[unit];
>+}
>+
>+PointParameters &GLES1State::pointParameters()
>+{
>+    setDirty(DIRTY_GLES1_POINT_PARAMETERS);
>+    return mPointParameters;
>+}
>+
>+const PointParameters &GLES1State::pointParameters() const
>+{
>+    return mPointParameters;
>+}
>+
>+AttributesMask GLES1State::getVertexArraysAttributeMask() const
>+{
>+    AttributesMask attribsMask;
>+
>+    ClientVertexArrayType nonTexcoordArrays[] = {
>+        ClientVertexArrayType::Vertex,
>+        ClientVertexArrayType::Normal,
>+        ClientVertexArrayType::Color,
>+        ClientVertexArrayType::PointSize,
>+    };
>+
>+    for (const ClientVertexArrayType attrib : nonTexcoordArrays)
>+    {
>+        attribsMask.set(GLES1Renderer::VertexArrayIndex(attrib, *this),
>+                        isClientStateEnabled(attrib));
>+    }
>+
>+    for (unsigned int i = 0; i < GLES1Renderer::kTexUnitCount; i++)
>+    {
>+        attribsMask.set(GLES1Renderer::TexCoordArrayIndex(i), isTexCoordArrayEnabled(i));
>+    }
>+
>+    return attribsMask;
>+}
>+
>+void GLES1State::setHint(GLenum target, GLenum mode)
>+{
>+    setDirty(DIRTY_GLES1_HINT_SETTING);
>+    HintSetting setting = FromGLenum<HintSetting>(mode);
>+    switch (target)
>+    {
>+        case GL_PERSPECTIVE_CORRECTION_HINT:
>+            mPerspectiveCorrectionHint = setting;
>+            break;
>+        case GL_POINT_SMOOTH_HINT:
>+            mPointSmoothHint = setting;
>+            break;
>+        case GL_LINE_SMOOTH_HINT:
>+            mLineSmoothHint = setting;
>+            break;
>+        case GL_FOG_HINT:
>+            mFogHint = setting;
>+            break;
>+        default:
>+            UNREACHABLE();
>+    }
>+}
>+
>+GLenum GLES1State::getHint(GLenum target)
>+{
>+    switch (target)
>+    {
>+        case GL_PERSPECTIVE_CORRECTION_HINT:
>+            return ToGLenum(mPerspectiveCorrectionHint);
>+        case GL_POINT_SMOOTH_HINT:
>+            return ToGLenum(mPointSmoothHint);
>+        case GL_LINE_SMOOTH_HINT:
>+            return ToGLenum(mLineSmoothHint);
>+        case GL_FOG_HINT:
>+            return ToGLenum(mFogHint);
>+        default:
>+            UNREACHABLE();
>+            return 0;
>+    }
>+}
>+
>+void GLES1State::setDirty(DirtyGles1Type type)
>+{
>+    mDirtyBits.set(type);
>+}
>+
>+void GLES1State::setAllDirty()
>+{
>+    mDirtyBits.set();
>+}
>+
>+void GLES1State::clearDirty()
>+{
>+    mDirtyBits.reset();
>+}
>+
>+bool GLES1State::isDirty(DirtyGles1Type type) const
>+{
>+    return mDirtyBits.test(type);
>+}
>+
>+}  // namespace gl
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/GLES1State.h b/Source/ThirdParty/ANGLE/src/libANGLE/GLES1State.h
>new file mode 100644
>index 00000000000..b52388bc4cd
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/GLES1State.h
>@@ -0,0 +1,331 @@
>+//
>+// Copyright 2018 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+
>+// GLES1State.h: Defines the GLES1State class holding the state of
>+// a GLES1 context.
>+
>+#ifndef LIBANGLE_GLES1STATE_H_
>+#define LIBANGLE_GLES1STATE_H_
>+
>+#include <unordered_set>
>+
>+#include "common/FixedVector.h"
>+#include "common/angleutils.h"
>+#include "common/bitset_utils.h"
>+#include "common/matrix_utils.h"
>+#include "common/vector_utils.h"
>+#include "libANGLE/Caps.h"
>+#include "libANGLE/angletypes.h"
>+
>+namespace gl
>+{
>+
>+// State types specific to GLES1 contexts, from the OpenGL ES 1.1 spec "State Tables" section
>+struct TextureCoordF
>+{
>+    TextureCoordF();
>+    TextureCoordF(float _s, float _t, float _r, float _q);
>+    bool operator==(const TextureCoordF &other) const;
>+
>+    GLfloat s = 0.0f;
>+    GLfloat t = 0.0f;
>+    GLfloat r = 0.0f;
>+    GLfloat q = 0.0f;
>+};
>+
>+struct MaterialParameters
>+{
>+    MaterialParameters();
>+
>+    ColorF ambient;
>+    ColorF diffuse;
>+    ColorF specular;
>+    ColorF emissive;
>+    GLfloat specularExponent;
>+};
>+
>+struct LightModelParameters
>+{
>+    LightModelParameters();
>+
>+    ColorF color;
>+    bool twoSided;
>+};
>+
>+struct LightParameters
>+{
>+    LightParameters();
>+    LightParameters(const LightParameters &other);
>+
>+    bool enabled                 = false;
>+    ColorF ambient               = {0.0f, 0.0f, 0.0f, 1.0f};
>+    ColorF diffuse               = {0.0f, 0.0f, 0.0f, 1.0f};
>+    ColorF specular              = {0.0f, 0.0f, 0.0f, 1.0f};
>+    angle::Vector4 position      = {0.0f, 0.0f, 1.0f, 0.0f};
>+    angle::Vector3 direction     = {0.0f, 0.0f, -1.0f};
>+    GLfloat spotlightExponent    = 0.0f;
>+    GLfloat spotlightCutoffAngle = 180.0f;
>+    GLfloat attenuationConst     = 1.0f;
>+    GLfloat attenuationLinear    = 0.0f;
>+    GLfloat attenuationQuadratic = 0.0f;
>+};
>+
>+struct FogParameters
>+{
>+    FogParameters();
>+
>+    FogMode mode;
>+    GLfloat density;
>+    GLfloat start;
>+    GLfloat end;
>+    ColorF color;
>+};
>+
>+struct TextureEnvironmentParameters
>+{
>+    TextureEnvironmentParameters();
>+    TextureEnvironmentParameters(const TextureEnvironmentParameters &other);
>+
>+    TextureEnvMode mode         = TextureEnvMode::Modulate;
>+    TextureCombine combineRgb   = TextureCombine::Modulate;
>+    TextureCombine combineAlpha = TextureCombine::Modulate;
>+
>+    TextureSrc src0Rgb   = TextureSrc::Texture;
>+    TextureSrc src0Alpha = TextureSrc::Texture;
>+
>+    TextureSrc src1Rgb   = TextureSrc::Previous;
>+    TextureSrc src1Alpha = TextureSrc::Previous;
>+
>+    TextureSrc src2Rgb   = TextureSrc::Constant;
>+    TextureSrc src2Alpha = TextureSrc::Constant;
>+
>+    TextureOp op0Rgb   = TextureOp::SrcColor;
>+    TextureOp op0Alpha = TextureOp::SrcAlpha;
>+
>+    TextureOp op1Rgb   = TextureOp::SrcColor;
>+    TextureOp op1Alpha = TextureOp::SrcAlpha;
>+
>+    TextureOp op2Rgb   = TextureOp::SrcAlpha;
>+    TextureOp op2Alpha = TextureOp::SrcAlpha;
>+
>+    ColorF color       = {0.0f, 0.0f, 0.0f, 0.0f};
>+    GLfloat rgbScale   = 1.0f;
>+    GLfloat alphaScale = 1.0f;
>+
>+    bool pointSpriteCoordReplace = false;
>+};
>+
>+struct PointParameters
>+{
>+    PointParameters();
>+    PointParameters(const PointParameters &other);
>+
>+    GLfloat pointSizeMin                    = 0.0f;
>+    GLfloat pointSizeMax                    = 1.0f;
>+    GLfloat pointFadeThresholdSize          = 1.0f;
>+    angle::Vector3 pointDistanceAttenuation = {1.0f, 0.0f, 0.0f};
>+    GLfloat pointSize                       = 1.0f;
>+};
>+
>+struct ClipPlaneParameters
>+{
>+    ClipPlaneParameters();
>+    ClipPlaneParameters(bool enabled, const angle::Vector4 &equation);
>+    ClipPlaneParameters(const ClipPlaneParameters &other);
>+
>+    bool enabled;
>+    angle::Vector4 equation;
>+};
>+
>+class Context;
>+class GLES1Renderer;
>+class State;
>+
>+class GLES1State final : angle::NonCopyable
>+{
>+  public:
>+    GLES1State();
>+    ~GLES1State();
>+
>+    void initialize(const Context *context, const State *state);
>+
>+    void setAlphaFunc(AlphaTestFunc func, GLfloat ref);
>+    void setClientTextureUnit(unsigned int unit);
>+    unsigned int getClientTextureUnit() const;
>+
>+    void setCurrentColor(const ColorF &color);
>+    const ColorF &getCurrentColor() const;
>+
>+    void setCurrentNormal(const angle::Vector3 &normal);
>+    const angle::Vector3 &getCurrentNormal() const;
>+
>+    void setCurrentTextureCoords(unsigned int unit, const TextureCoordF &coords);
>+    const TextureCoordF &getCurrentTextureCoords(unsigned int unit) const;
>+
>+    void setMatrixMode(MatrixType mode);
>+    MatrixType getMatrixMode() const;
>+
>+    GLint getCurrentMatrixStackDepth(GLenum param) const;
>+
>+    void pushMatrix();
>+    void popMatrix();
>+
>+    using MatrixStack = angle::FixedVector<angle::Mat4, Caps::GlobalMatrixStackDepth>;
>+    MatrixStack &currentMatrixStack();
>+    const MatrixStack &currentMatrixStack() const;
>+
>+    const angle::Mat4 &getModelviewMatrix() const;
>+
>+    void loadMatrix(const angle::Mat4 &m);
>+    void multMatrix(const angle::Mat4 &m);
>+
>+    void setLogicOp(LogicalOperation opcodePacked);
>+
>+    void setClientStateEnabled(ClientVertexArrayType clientState, bool enable);
>+    void setTexCoordArrayEnabled(unsigned int unit, bool enable);
>+    bool isClientStateEnabled(ClientVertexArrayType clientState) const;
>+    bool isTexCoordArrayEnabled(unsigned int unit) const;
>+    bool isTextureTargetEnabled(unsigned int unit, const TextureType type) const;
>+
>+    LightModelParameters &lightModelParameters();
>+    const LightModelParameters &lightModelParameters() const;
>+
>+    LightParameters &lightParameters(unsigned int light);
>+    const LightParameters &lightParameters(unsigned int light) const;
>+
>+    MaterialParameters &materialParameters();
>+    const MaterialParameters &materialParameters() const;
>+    bool isColorMaterialEnabled() const;
>+
>+    void setShadeModel(ShadingModel model);
>+
>+    void setClipPlane(unsigned int plane, const GLfloat *equation);
>+    void getClipPlane(unsigned int plane, GLfloat *equation) const;
>+
>+    FogParameters &fogParameters();
>+    const FogParameters &fogParameters() const;
>+
>+    TextureEnvironmentParameters &textureEnvironment(unsigned int unit);
>+    const TextureEnvironmentParameters &textureEnvironment(unsigned int unit) const;
>+
>+    PointParameters &pointParameters();
>+    const PointParameters &pointParameters() const;
>+
>+    AttributesMask getVertexArraysAttributeMask() const;
>+
>+    void setHint(GLenum target, GLenum mode);
>+    GLenum getHint(GLenum target);
>+
>+  private:
>+    friend class State;
>+    friend class GLES1Renderer;
>+
>+    // Back pointer for reading from State.
>+    const State *mGLState;
>+
>+    enum DirtyGles1Type
>+    {
>+        DIRTY_GLES1_TEXTURE_UNIT_ENABLE = 0,
>+        DIRTY_GLES1_CLIENT_STATE_ENABLE,
>+        DIRTY_GLES1_FEATURE_ENABLE,
>+        DIRTY_GLES1_CURRENT_VECTOR,
>+        DIRTY_GLES1_CLIENT_ACTIVE_TEXTURE,
>+        DIRTY_GLES1_MATRICES,
>+        DIRTY_GLES1_TEXTURE_ENVIRONMENT,
>+        DIRTY_GLES1_MATERIAL,
>+        DIRTY_GLES1_LIGHTS,
>+        DIRTY_GLES1_FOG,
>+        DIRTY_GLES1_SHADE_MODEL,
>+        DIRTY_GLES1_POINT_PARAMETERS,
>+        DIRTY_GLES1_ALPHA_TEST,
>+        DIRTY_GLES1_LOGIC_OP,
>+        DIRTY_GLES1_CLIP_PLANES,
>+        DIRTY_GLES1_HINT_SETTING,
>+        DIRTY_GLES1_MAX,
>+    };
>+    using DirtyBits = angle::BitSet<DIRTY_GLES1_MAX>;
>+    DirtyBits mDirtyBits;
>+
>+    void setDirty(DirtyGles1Type type);
>+    void setAllDirty();
>+    void clearDirty();
>+    bool isDirty(DirtyGles1Type type) const;
>+
>+    // All initial state values come from the
>+    // OpenGL ES 1.1 spec.
>+    std::vector<angle::PackedEnumBitSet<TextureType>> mTexUnitEnables;
>+
>+    // Table 6.4, 6.5 (IsEnabled)
>+    bool mVertexArrayEnabled;
>+    bool mNormalArrayEnabled;
>+    bool mColorArrayEnabled;
>+    bool mPointSizeArrayEnabled;
>+    std::vector<bool> mTexCoordArrayEnabled;
>+
>+    // Table 6.7-6.16 (IsEnabled)
>+    bool mLineSmoothEnabled;
>+    bool mPointSmoothEnabled;
>+    bool mPointSpriteEnabled;
>+    bool mAlphaTestEnabled;
>+    bool mLogicOpEnabled;
>+    bool mLightingEnabled;
>+    bool mFogEnabled;
>+    bool mRescaleNormalEnabled;
>+    bool mNormalizeEnabled;
>+    bool mColorMaterialEnabled;
>+    bool mReflectionMapEnabled;
>+
>+    // Table 6.3
>+    ColorF mCurrentColor;
>+    angle::Vector3 mCurrentNormal;
>+    // Invariant: mCurrentTextureCoords size is == GL_MAX_TEXTURE_UNITS.
>+    std::vector<TextureCoordF> mCurrentTextureCoords;
>+
>+    // Table 6.4
>+    unsigned int mClientActiveTexture;
>+
>+    // Table 6.7
>+    MatrixType mMatrixMode;
>+    MatrixStack mProjectionMatrices;
>+    MatrixStack mModelviewMatrices;
>+    std::vector<MatrixStack> mTextureMatrices;
>+
>+    // Table 6.15
>+    using TextureEnvironments = std::vector<TextureEnvironmentParameters>;
>+    TextureEnvironments mTextureEnvironments;
>+
>+    // Table 6.9, 2.8
>+    MaterialParameters mMaterial;
>+    LightModelParameters mLightModel;
>+
>+    // Table 6.10
>+    std::vector<LightParameters> mLights;
>+
>+    // Table 6.8
>+    FogParameters mFog;
>+    ShadingModel mShadeModel;
>+
>+    // Table 6.11
>+    PointParameters mPointParameters;
>+
>+    // Table 6.16
>+    AlphaTestFunc mAlphaTestFunc;
>+    GLfloat mAlphaTestRef;
>+    LogicalOperation mLogicOp;
>+
>+    // Table 6.7
>+    std::vector<ClipPlaneParameters> mClipPlanes;
>+
>+    // Table 6.19
>+    HintSetting mLineSmoothHint;
>+    HintSetting mPointSmoothHint;
>+    HintSetting mPerspectiveCorrectionHint;
>+    HintSetting mFogHint;
>+};
>+
>+}  // namespace gl
>+
>+#endif  // LIBANGLE_GLES1STATE_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/HandleAllocator.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/HandleAllocator.cpp
>index c3c184258fd..8b2b3024f73 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/HandleAllocator.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/HandleAllocator.cpp
>@@ -10,6 +10,7 @@
> #include "libANGLE/HandleAllocator.h"
> 
> #include <algorithm>
>+#include <functional>
> 
> #include "common/debug.h"
> 
>@@ -18,25 +19,21 @@ namespace gl
> 
> struct HandleAllocator::HandleRangeComparator
> {
>-    bool operator()(const HandleRange &range, GLuint handle) const
>-    {
>-        return (range.end < handle);
>-    }
>+    bool operator()(const HandleRange &range, GLuint handle) const { return (range.end < handle); }
> };
> 
>-HandleAllocator::HandleAllocator() : mBaseValue(1), mNextValue(1)
>+HandleAllocator::HandleAllocator() : mBaseValue(1), mNextValue(1), mLoggingEnabled(false)
> {
>     mUnallocatedList.push_back(HandleRange(1, std::numeric_limits<GLuint>::max()));
> }
> 
>-HandleAllocator::HandleAllocator(GLuint maximumHandleValue) : mBaseValue(1), mNextValue(1)
>+HandleAllocator::HandleAllocator(GLuint maximumHandleValue)
>+    : mBaseValue(1), mNextValue(1), mLoggingEnabled(false)
> {
>     mUnallocatedList.push_back(HandleRange(1, maximumHandleValue));
> }
> 
>-HandleAllocator::~HandleAllocator()
>-{
>-}
>+HandleAllocator::~HandleAllocator() {}
> 
> void HandleAllocator::setBaseHandle(GLuint value)
> {
>@@ -52,9 +49,15 @@ GLuint HandleAllocator::allocate()
>     // Allocate from released list, logarithmic time for pop_heap.
>     if (!mReleasedList.empty())
>     {
>-        std::pop_heap(mReleasedList.begin(), mReleasedList.end());
>+        std::pop_heap(mReleasedList.begin(), mReleasedList.end(), std::greater<GLuint>());
>         GLuint reusedHandle = mReleasedList.back();
>         mReleasedList.pop_back();
>+
>+        if (mLoggingEnabled)
>+        {
>+            WARN() << "HandleAllocator::allocate reusing " << reusedHandle << std::endl;
>+        }
>+
>         return reusedHandle;
>     }
> 
>@@ -73,18 +76,33 @@ GLuint HandleAllocator::allocate()
>         listIt->begin++;
>     }
> 
>+    if (mLoggingEnabled)
>+    {
>+        WARN() << "HandleAllocator::allocate allocating " << freeListHandle << std::endl;
>+    }
>+
>     return freeListHandle;
> }
> 
> void HandleAllocator::release(GLuint handle)
> {
>+    if (mLoggingEnabled)
>+    {
>+        WARN() << "HandleAllocator::release releasing " << handle << std::endl;
>+    }
>+
>     // Add to released list, logarithmic time for push_heap.
>     mReleasedList.push_back(handle);
>-    std::push_heap(mReleasedList.begin(), mReleasedList.end());
>+    std::push_heap(mReleasedList.begin(), mReleasedList.end(), std::greater<GLuint>());
> }
> 
> void HandleAllocator::reserve(GLuint handle)
> {
>+    if (mLoggingEnabled)
>+    {
>+        WARN() << "HandleAllocator::reserve reserving " << handle << std::endl;
>+    }
>+
>     // Clear from released list -- might be a slow operation.
>     if (!mReleasedList.empty())
>     {
>@@ -92,17 +110,19 @@ void HandleAllocator::reserve(GLuint handle)
>         if (releasedIt != mReleasedList.end())
>         {
>             mReleasedList.erase(releasedIt);
>+            std::make_heap(mReleasedList.begin(), mReleasedList.end(), std::greater<GLuint>());
>             return;
>         }
>     }
> 
>     // Not in released list, reserve in the unallocated list.
>-    auto boundIt = std::lower_bound(mUnallocatedList.begin(), mUnallocatedList.end(), handle, HandleRangeComparator());
>+    auto boundIt = std::lower_bound(mUnallocatedList.begin(), mUnallocatedList.end(), handle,
>+                                    HandleRangeComparator());
> 
>     ASSERT(boundIt != mUnallocatedList.end());
> 
>     GLuint begin = boundIt->begin;
>-    GLuint end = boundIt->end;
>+    GLuint end   = boundIt->end;
> 
>     if (handle == begin || handle == end)
>     {
>@@ -139,4 +159,9 @@ void HandleAllocator::reset()
>     mNextValue = 1;
> }
> 
>+void HandleAllocator::enableLogging(bool enabled)
>+{
>+    mLoggingEnabled = enabled;
>+}
>+
> }  // namespace gl
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/HandleAllocator.h b/Source/ThirdParty/ANGLE/src/libANGLE/HandleAllocator.h
>index cd21d687f4c..e76590f9b3e 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/HandleAllocator.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/HandleAllocator.h
>@@ -34,6 +34,8 @@ class HandleAllocator final : angle::NonCopyable
>     void reserve(GLuint handle);
>     void reset();
> 
>+    void enableLogging(bool enabled);
>+
>   private:
>     GLuint mBaseValue;
>     GLuint mNextValue;
>@@ -56,8 +58,10 @@ class HandleAllocator final : angle::NonCopyable
>     // released, stored in a heap.
>     std::vector<HandleRange> mUnallocatedList;
>     std::vector<GLuint> mReleasedList;
>+
>+    bool mLoggingEnabled;
> };
> 
> }  // namespace gl
> 
>-#endif   // LIBANGLE_HANDLEALLOCATOR_H_
>+#endif  // LIBANGLE_HANDLEALLOCATOR_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/HandleAllocator_unittest.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/HandleAllocator_unittest.cpp
>index d975b4b0762..f6efa06715d 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/HandleAllocator_unittest.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/HandleAllocator_unittest.cpp
>@@ -150,4 +150,47 @@ TEST(HandleAllocatorTest, Reset)
>     }
> }
> 
>+// Covers a particular bug with reserving and allocating sub ranges.
>+TEST(HandleAllocatorTest, ReserveAndAllocateIterated)
>+{
>+    gl::HandleAllocator allocator;
>+
>+    for (int iteration = 0; iteration < 3; ++iteration)
>+    {
>+        allocator.reserve(5);
>+        allocator.reserve(6);
>+        GLuint a = allocator.allocate();
>+        GLuint b = allocator.allocate();
>+        GLuint c = allocator.allocate();
>+        allocator.release(c);
>+        allocator.release(a);
>+        allocator.release(b);
>+        allocator.release(5);
>+        allocator.release(6);
>+    }
>+}
>+
>+// This test reproduces invalid heap bug when reserve resources after release.
>+TEST(HandleAllocatorTest, ReserveAfterReleaseBug)
>+{
>+    gl::HandleAllocator allocator;
>+
>+    for (int iteration = 1; iteration <= 16; ++iteration)
>+    {
>+        allocator.allocate();
>+    }
>+
>+    allocator.release(15);
>+    allocator.release(16);
>+
>+    for (int iteration = 1; iteration <= 14; ++iteration)
>+    {
>+        allocator.release(iteration);
>+    }
>+
>+    allocator.reserve(1);
>+
>+    allocator.allocate();
>+}
>+
> }  // anonymous namespace
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/HandleRangeAllocator.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/HandleRangeAllocator.cpp
>index 2a97ce939f3..f9189070377 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/HandleRangeAllocator.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/HandleRangeAllocator.cpp
>@@ -27,9 +27,7 @@ HandleRangeAllocator::HandleRangeAllocator()
>     mUsed.insert(std::make_pair(0u, 0u));
> }
> 
>-HandleRangeAllocator::~HandleRangeAllocator()
>-{
>-}
>+HandleRangeAllocator::~HandleRangeAllocator() {}
> 
> GLuint HandleRangeAllocator::allocate()
> {
>@@ -42,7 +40,7 @@ GLuint HandleRangeAllocator::allocateAtOrAbove(GLuint wanted)
>         return allocateRange(1u);
> 
>     auto current = mUsed.lower_bound(wanted);
>-    auto next = current;
>+    auto next    = current;
>     if (current == mUsed.end() || current->first > wanted)
>     {
>         current--;
>@@ -53,7 +51,7 @@ GLuint HandleRangeAllocator::allocateAtOrAbove(GLuint wanted)
>     }
> 
>     GLuint firstId = current->first;
>-    GLuint lastId = current->second;
>+    GLuint lastId  = current->second;
>     ASSERT(wanted >= firstId);
> 
>     if (wanted - 1u <= lastId)
>@@ -205,7 +203,7 @@ void HandleRangeAllocator::releaseRange(GLuint first, GLuint range)
>         {
>             ASSERT(current->first < first && current->second > last);
>             const GLuint lastExisting = current->second;
>-            current->second = first - 1u;
>+            current->second           = first - 1u;
>             mUsed.insert(std::make_pair(last + 1u, lastExisting));
>         }
>     }
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/HandleRangeAllocator_unittest.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/HandleRangeAllocator_unittest.cpp
>index 1d825f7106b..ffbd53a4165 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/HandleRangeAllocator_unittest.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/HandleRangeAllocator_unittest.cpp
>@@ -79,7 +79,7 @@ TEST_F(HandleRangeAllocatorTest, TestAdvanced)
> TEST_F(HandleRangeAllocatorTest, MarkAsUsed)
> {
>     auto *allocator = getAllocator();
>-    GLuint id = allocator->allocate();
>+    GLuint id       = allocator->allocate();
>     allocator->release(id);
>     EXPECT_FALSE(allocator->isUsed(id));
>     EXPECT_TRUE(allocator->markAsUsed(id));
>@@ -98,7 +98,7 @@ TEST_F(HandleRangeAllocatorTest, AllocateAtOrAbove)
> {
>     const GLuint kOffset = 123456;
>     auto *allocator      = getAllocator();
>-    GLuint id1 = allocator->allocateAtOrAbove(kOffset);
>+    GLuint id1           = allocator->allocateAtOrAbove(kOffset);
>     EXPECT_EQ(kOffset, id1);
>     GLuint id2 = allocator->allocateAtOrAbove(kOffset);
>     EXPECT_GT(id2, kOffset);
>@@ -111,7 +111,7 @@ TEST_F(HandleRangeAllocatorTest, AllocateIdAtOrAboveWrapsAround)
> {
>     const GLuint kMaxPossibleOffset = ~static_cast<GLuint>(0);
>     auto *allocator                 = getAllocator();
>-    GLuint id1 = allocator->allocateAtOrAbove(kMaxPossibleOffset);
>+    GLuint id1                      = allocator->allocateAtOrAbove(kMaxPossibleOffset);
>     EXPECT_EQ(kMaxPossibleOffset, id1);
>     GLuint id2 = allocator->allocateAtOrAbove(kMaxPossibleOffset);
>     EXPECT_EQ(1u, id2);
>@@ -123,7 +123,7 @@ TEST_F(HandleRangeAllocatorTest, AllocateIdAtOrAboveWrapsAround)
> TEST_F(HandleRangeAllocatorTest, RedundantFreeIsIgnored)
> {
>     auto *allocator = getAllocator();
>-    GLuint id1 = allocator->allocate();
>+    GLuint id1      = allocator->allocate();
>     allocator->release(0);
>     allocator->release(id1);
>     allocator->release(id1);
>@@ -189,7 +189,7 @@ TEST_F(HandleRangeAllocatorTest, AllocateRangeEndNoEffect)
>     const GLuint kMaxPossibleOffset = std::numeric_limits<GLuint>::max();
> 
>     auto *allocator = getAllocator();
>-    GLuint id1 = allocator->allocateAtOrAbove(kMaxPossibleOffset - 2u);
>+    GLuint id1      = allocator->allocateAtOrAbove(kMaxPossibleOffset - 2u);
>     EXPECT_EQ(kMaxPossibleOffset - 2u, id1);
>     GLuint id3 = allocator->allocateRange(3);
>     EXPECT_EQ(1u, id3);
>@@ -203,7 +203,7 @@ TEST_F(HandleRangeAllocatorTest, AllocateMax)
>     const uint32_t kMaxPossibleRange = std::numeric_limits<uint32_t>::max();
> 
>     auto *allocator = getAllocator();
>-    GLuint id = allocator->allocateRange(kMaxPossibleRange);
>+    GLuint id       = allocator->allocateRange(kMaxPossibleRange);
>     EXPECT_EQ(1u, id);
>     allocator->releaseRange(id, kMaxPossibleRange - 1u);
>     GLuint id2 = allocator->allocateRange(kMaxPossibleRange);
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/Image.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/Image.cpp
>index 04c757c2c47..d94d311a96e 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/Image.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/Image.cpp
>@@ -10,10 +10,11 @@
> 
> #include "common/debug.h"
> #include "common/utilities.h"
>+#include "libANGLE/Context.h"
>+#include "libANGLE/Renderbuffer.h"
>+#include "libANGLE/Texture.h"
> #include "libANGLE/angletypes.h"
> #include "libANGLE/formatutils.h"
>-#include "libANGLE/Texture.h"
>-#include "libANGLE/Renderbuffer.h"
> #include "libANGLE/renderer/EGLImplFactory.h"
> #include "libANGLE/renderer/ImageImpl.h"
> 
>@@ -24,32 +25,35 @@ namespace
> {
> gl::ImageIndex GetImageIndex(EGLenum eglTarget, const egl::AttributeMap &attribs)
> {
>-    if (eglTarget == EGL_GL_RENDERBUFFER)
>+    if (!IsTextureTarget(eglTarget))
>     {
>-        return gl::ImageIndex::MakeInvalid();
>+        return gl::ImageIndex();
>     }
> 
>-    GLenum target = egl_gl::EGLImageTargetToGLTextureTarget(eglTarget);
>-    GLint mip     = static_cast<GLint>(attribs.get(EGL_GL_TEXTURE_LEVEL_KHR, 0));
>-    GLint layer   = static_cast<GLint>(attribs.get(EGL_GL_TEXTURE_ZOFFSET_KHR, 0));
>+    gl::TextureTarget target = egl_gl::EGLImageTargetToTextureTarget(eglTarget);
>+    GLint mip                = static_cast<GLint>(attribs.get(EGL_GL_TEXTURE_LEVEL_KHR, 0));
>+    GLint layer              = static_cast<GLint>(attribs.get(EGL_GL_TEXTURE_ZOFFSET_KHR, 0));
> 
>-    if (target == GL_TEXTURE_3D)
>+    if (target == gl::TextureTarget::_3D)
>     {
>         return gl::ImageIndex::Make3D(mip, layer);
>     }
>     else
>     {
>         ASSERT(layer == 0);
>-        return gl::ImageIndex::MakeGeneric(target, mip);
>+        return gl::ImageIndex::MakeFromTarget(target, mip);
>     }
> }
>-}  // anonymous namespace
> 
>-ImageSibling::ImageSibling(GLuint id)
>-    : RefCountObject(id), FramebufferAttachmentObject(), mSourcesOf(), mTargetOf()
>+const Display *DisplayFromContext(const gl::Context *context)
> {
>+    return (context ? context->getDisplay() : nullptr);
> }
> 
>+}  // anonymous namespace
>+
>+ImageSibling::ImageSibling() : FramebufferAttachmentObject(), mSourcesOf(), mTargetOf() {}
>+
> ImageSibling::~ImageSibling()
> {
>     // EGL images should hold a ref to their targets and siblings, a Texture should not be deletable
>@@ -62,11 +66,11 @@ ImageSibling::~ImageSibling()
> void ImageSibling::setTargetImage(const gl::Context *context, egl::Image *imageTarget)
> {
>     ASSERT(imageTarget != nullptr);
>-    mTargetOf.set(context, imageTarget);
>+    mTargetOf.set(DisplayFromContext(context), imageTarget);
>     imageTarget->addTargetSibling(this);
> }
> 
>-gl::Error ImageSibling::orphanImages(const gl::Context *context)
>+angle::Result ImageSibling::orphanImages(const gl::Context *context)
> {
>     if (mTargetOf.get() != nullptr)
>     {
>@@ -74,18 +78,18 @@ gl::Error ImageSibling::orphanImages(const gl::Context *context)
>         ASSERT(mSourcesOf.empty());
> 
>         ANGLE_TRY(mTargetOf->orphanSibling(context, this));
>-        mTargetOf.set(context, nullptr);
>+        mTargetOf.set(DisplayFromContext(context), nullptr);
>     }
>     else
>     {
>-        for (egl::Image *sourceImage : mSourcesOf)
>+        for (Image *sourceImage : mSourcesOf)
>         {
>             ANGLE_TRY(sourceImage->orphanSibling(context, this));
>         }
>         mSourcesOf.clear();
>     }
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
> void ImageSibling::addImageSource(egl::Image *imageSource)
>@@ -117,22 +121,111 @@ void ImageSibling::setSourceEGLImageInitState(gl::InitState initState) const
>     mTargetOf->setInitState(initState);
> }
> 
>-ImageState::ImageState(EGLenum target, ImageSibling *buffer, const AttributeMap &attribs)
>-    : imageIndex(GetImageIndex(target, attribs)), source(buffer), targets()
>+bool ImageSibling::isRenderable(const gl::Context *context,
>+                                GLenum binding,
>+                                const gl::ImageIndex &imageIndex) const
>+{
>+    ASSERT(isEGLImageTarget());
>+    return mTargetOf->isRenderable(context);
>+}
>+
>+ExternalImageSibling::ExternalImageSibling(rx::EGLImplFactory *factory,
>+                                           const gl::Context *context,
>+                                           EGLenum target,
>+                                           EGLClientBuffer buffer,
>+                                           const AttributeMap &attribs)
>+    : mImplementation(factory->createExternalImageSibling(context, target, buffer, attribs))
>+{}
>+
>+ExternalImageSibling::~ExternalImageSibling() = default;
>+
>+void ExternalImageSibling::onDestroy(const egl::Display *display)
>+{
>+    mImplementation->onDestroy(display);
>+}
>+
>+Error ExternalImageSibling::initialize(const egl::Display *display)
>+{
>+    return mImplementation->initialize(display);
>+}
>+
>+gl::Extents ExternalImageSibling::getAttachmentSize(const gl::ImageIndex &imageIndex) const
>+{
>+    return mImplementation->getSize();
>+}
>+
>+gl::Format ExternalImageSibling::getAttachmentFormat(GLenum binding,
>+                                                     const gl::ImageIndex &imageIndex) const
>+{
>+    return mImplementation->getFormat();
>+}
>+
>+GLsizei ExternalImageSibling::getAttachmentSamples(const gl::ImageIndex &imageIndex) const
>+{
>+    return mImplementation->getSamples();
>+}
>+
>+bool ExternalImageSibling::isRenderable(const gl::Context *context,
>+                                        GLenum binding,
>+                                        const gl::ImageIndex &imageIndex) const
>+{
>+    return mImplementation->isRenderable(context);
>+}
>+
>+bool ExternalImageSibling::isTextureable(const gl::Context *context) const
>+{
>+    return mImplementation->isTexturable(context);
>+}
>+
>+void ExternalImageSibling::onAttach(const gl::Context *context) {}
>+
>+void ExternalImageSibling::onDetach(const gl::Context *context) {}
>+
>+GLuint ExternalImageSibling::getId() const
>+{
>+    UNREACHABLE();
>+    return 0;
>+}
>+
>+gl::InitState ExternalImageSibling::initState(const gl::ImageIndex &imageIndex) const
>+{
>+    return gl::InitState::Initialized;
>+}
>+
>+void ExternalImageSibling::setInitState(const gl::ImageIndex &imageIndex, gl::InitState initState)
>+{}
>+
>+rx::ExternalImageSiblingImpl *ExternalImageSibling::getImplementation() const
> {
>+    return mImplementation.get();
> }
> 
>-ImageState::~ImageState()
>+rx::FramebufferAttachmentObjectImpl *ExternalImageSibling::getAttachmentImpl() const
> {
>+    return mImplementation.get();
> }
> 
>+ImageState::ImageState(EGLenum target, ImageSibling *buffer, const AttributeMap &attribs)
>+    : label(nullptr),
>+      target(target),
>+      imageIndex(GetImageIndex(target, attribs)),
>+      source(buffer),
>+      targets(),
>+      format(GL_NONE),
>+      size(),
>+      samples(),
>+      sourceType(target)
>+{}
>+
>+ImageState::~ImageState() {}
>+
> Image::Image(rx::EGLImplFactory *factory,
>+             const gl::Context *context,
>              EGLenum target,
>              ImageSibling *buffer,
>              const AttributeMap &attribs)
>-    : RefCountObject(0),
>-      mState(target, buffer, attribs),
>-      mImplementation(factory->createImage(mState, target, attribs)),
>+    : mState(target, buffer, attribs),
>+      mImplementation(factory->createImage(mState, context, target, attribs)),
>       mOrphanedAndNeedsInit(false)
> {
>     ASSERT(mImplementation != nullptr);
>@@ -141,19 +234,29 @@ Image::Image(rx::EGLImplFactory *factory,
>     mState.source->addImageSource(this);
> }
> 
>-gl::Error Image::onDestroy(const gl::Context *context)
>+void Image::onDestroy(const Display *display)
> {
>     // All targets should hold a ref to the egl image and it should not be deleted until there are
>     // no siblings left.
>     ASSERT(mState.targets.empty());
> 
>     // Tell the source that it is no longer used by this image
>-    if (mState.source.get() != nullptr)
>+    if (mState.source != nullptr)
>     {
>         mState.source->removeImageSource(this);
>-        mState.source.set(context, nullptr);
>+
>+        // If the source is an external object, delete it
>+        if (IsExternalImageTarget(mState.sourceType))
>+        {
>+            ExternalImageSibling *externalSibling = rx::GetAs<ExternalImageSibling>(mState.source);
>+            externalSibling->onDestroy(display);
>+            delete externalSibling;
>+        }
>+
>+        mState.source = nullptr;
>     }
>-    return gl::NoError();
>+
>+    mImplementation->onDestroy(display);
> }
> 
> Image::~Image()
>@@ -161,21 +264,36 @@ Image::~Image()
>     SafeDelete(mImplementation);
> }
> 
>+void Image::setLabel(EGLLabelKHR label)
>+{
>+    mState.label = label;
>+}
>+
>+EGLLabelKHR Image::getLabel() const
>+{
>+    return mState.label;
>+}
>+
> void Image::addTargetSibling(ImageSibling *sibling)
> {
>     mState.targets.insert(sibling);
> }
> 
>-gl::Error Image::orphanSibling(const gl::Context *context, ImageSibling *sibling)
>+angle::Result Image::orphanSibling(const gl::Context *context, ImageSibling *sibling)
> {
>+    ASSERT(sibling != nullptr);
>+
>     // notify impl
>     ANGLE_TRY(mImplementation->orphan(context, sibling));
> 
>-    if (mState.source.get() == sibling)
>+    if (mState.source == sibling)
>     {
>+        // The external source of an image cannot be redefined so it cannot be orpahend.
>+        ASSERT(!IsExternalImageTarget(mState.sourceType));
>+
>         // If the sibling is the source, it cannot be a target.
>         ASSERT(mState.targets.find(sibling) == mState.targets.end());
>-        mState.source.set(context, nullptr);
>+        mState.source = nullptr;
>         mOrphanedAndNeedsInit =
>             (sibling->initState(mState.imageIndex) == gl::InitState::MayNeedInit);
>     }
>@@ -184,27 +302,70 @@ gl::Error Image::orphanSibling(const gl::Context *context, ImageSibling *sibling
>         mState.targets.erase(sibling);
>     }
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
> const gl::Format &Image::getFormat() const
> {
>-    return mState.source->getAttachmentFormat(GL_NONE, mState.imageIndex);
>+    return mState.format;
>+}
>+
>+bool Image::isRenderable(const gl::Context *context) const
>+{
>+    if (IsTextureTarget(mState.sourceType))
>+    {
>+        return mState.format.info->textureAttachmentSupport(context->getClientVersion(),
>+                                                            context->getExtensions());
>+    }
>+    else if (IsRenderbufferTarget(mState.sourceType))
>+    {
>+        return mState.format.info->renderbufferSupport(context->getClientVersion(),
>+                                                       context->getExtensions());
>+    }
>+    else if (IsExternalImageTarget(mState.sourceType))
>+    {
>+        ASSERT(mState.source != nullptr);
>+        return mState.source->isRenderable(context, GL_NONE, gl::ImageIndex());
>+    }
>+
>+    UNREACHABLE();
>+    return false;
>+}
>+
>+bool Image::isTexturable(const gl::Context *context) const
>+{
>+    if (IsTextureTarget(mState.sourceType))
>+    {
>+        return mState.format.info->textureSupport(context->getClientVersion(),
>+                                                  context->getExtensions());
>+    }
>+    else if (IsRenderbufferTarget(mState.sourceType))
>+    {
>+        return true;
>+    }
>+    else if (IsExternalImageTarget(mState.sourceType))
>+    {
>+        ASSERT(mState.source != nullptr);
>+        return rx::GetAs<ExternalImageSibling>(mState.source)->isTextureable(context);
>+    }
>+
>+    UNREACHABLE();
>+    return false;
> }
> 
> size_t Image::getWidth() const
> {
>-    return mState.source->getAttachmentSize(mState.imageIndex).width;
>+    return mState.size.width;
> }
> 
> size_t Image::getHeight() const
> {
>-    return mState.source->getAttachmentSize(mState.imageIndex).height;
>+    return mState.size.height;
> }
> 
> size_t Image::getSamples() const
> {
>-    return mState.source->getAttachmentSamples(mState.imageIndex);
>+    return mState.samples;
> }
> 
> rx::ImageImpl *Image::getImplementation() const
>@@ -212,14 +373,23 @@ rx::ImageImpl *Image::getImplementation() const
>     return mImplementation;
> }
> 
>-Error Image::initialize()
>+Error Image::initialize(const Display *display)
> {
>-    return mImplementation->initialize();
>+    if (IsExternalImageTarget(mState.sourceType))
>+    {
>+        ANGLE_TRY(rx::GetAs<ExternalImageSibling>(mState.source)->initialize(display));
>+    }
>+
>+    mState.format  = mState.source->getAttachmentFormat(GL_NONE, mState.imageIndex);
>+    mState.size    = mState.source->getAttachmentSize(mState.imageIndex);
>+    mState.samples = mState.source->getAttachmentSamples(mState.imageIndex);
>+
>+    return mImplementation->initialize(display);
> }
> 
> bool Image::orphaned() const
> {
>-    return (mState.source.get() == nullptr);
>+    return (mState.source == nullptr);
> }
> 
> gl::InitState Image::sourceInitState() const
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/Image.h b/Source/ThirdParty/ANGLE/src/libANGLE/Image.h
>index d2f1b875c61..b5603a268ed 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/Image.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/Image.h
>@@ -11,6 +11,7 @@
> 
> #include "common/angleutils.h"
> #include "libANGLE/AttributeMap.h"
>+#include "libANGLE/Debug.h"
> #include "libANGLE/Error.h"
> #include "libANGLE/FramebufferAttachment.h"
> #include "libANGLE/RefCountObject.h"
>@@ -22,31 +23,37 @@ namespace rx
> {
> class EGLImplFactory;
> class ImageImpl;
>-}
>+class ExternalImageSiblingImpl;
>+}  // namespace rx
> 
> namespace egl
> {
> class Image;
>+class Display;
> 
> // Only currently Renderbuffers and Textures can be bound with images. This makes the relationship
> // explicit, and also ensures that an image sibling can determine if it's been initialized or not,
> // which is important for the robust resource init extension with Textures and EGLImages.
>-class ImageSibling : public gl::RefCountObject, public gl::FramebufferAttachmentObject
>+class ImageSibling : public gl::FramebufferAttachmentObject
> {
>   public:
>-    ImageSibling(GLuint id);
>+    ImageSibling();
>     ~ImageSibling() override;
> 
>     bool isEGLImageTarget() const;
>     gl::InitState sourceEGLImageInitState() const;
>     void setSourceEGLImageInitState(gl::InitState initState) const;
> 
>+    bool isRenderable(const gl::Context *context,
>+                      GLenum binding,
>+                      const gl::ImageIndex &imageIndex) const override;
>+
>   protected:
>     // Set the image target of this sibling
>     void setTargetImage(const gl::Context *context, egl::Image *imageTarget);
> 
>     // Orphan all EGL image sources and targets
>-    gl::Error orphanImages(const gl::Context *context);
>+    angle::Result orphanImages(const gl::Context *context);
> 
>   private:
>     friend class Image;
>@@ -58,7 +65,47 @@ class ImageSibling : public gl::RefCountObject, public gl::FramebufferAttachment
>     void removeImageSource(egl::Image *imageSource);
> 
>     std::set<Image *> mSourcesOf;
>-    gl::BindingPointer<Image> mTargetOf;
>+    BindingPointer<Image> mTargetOf;
>+};
>+
>+// Wrapper for EGLImage sources that are not owned by ANGLE, these often have to do
>+// platform-specific queries for format and size information.
>+class ExternalImageSibling : public ImageSibling
>+{
>+  public:
>+    ExternalImageSibling(rx::EGLImplFactory *factory,
>+                         const gl::Context *context,
>+                         EGLenum target,
>+                         EGLClientBuffer buffer,
>+                         const AttributeMap &attribs);
>+    ~ExternalImageSibling() override;
>+
>+    void onDestroy(const egl::Display *display);
>+
>+    Error initialize(const Display *display);
>+
>+    gl::Extents getAttachmentSize(const gl::ImageIndex &imageIndex) const override;
>+    gl::Format getAttachmentFormat(GLenum binding, const gl::ImageIndex &imageIndex) const override;
>+    GLsizei getAttachmentSamples(const gl::ImageIndex &imageIndex) const override;
>+    bool isRenderable(const gl::Context *context,
>+                      GLenum binding,
>+                      const gl::ImageIndex &imageIndex) const override;
>+    bool isTextureable(const gl::Context *context) const;
>+
>+    void onAttach(const gl::Context *context) override;
>+    void onDetach(const gl::Context *context) override;
>+    GLuint getId() const override;
>+
>+    gl::InitState initState(const gl::ImageIndex &imageIndex) const override;
>+    void setInitState(const gl::ImageIndex &imageIndex, gl::InitState initState) override;
>+
>+    rx::ExternalImageSiblingImpl *getImplementation() const;
>+
>+  protected:
>+    rx::FramebufferAttachmentObjectImpl *getAttachmentImpl() const override;
>+
>+  private:
>+    std::unique_ptr<rx::ExternalImageSiblingImpl> mImplementation;
> };
> 
> struct ImageState : private angle::NonCopyable
>@@ -66,28 +113,41 @@ struct ImageState : private angle::NonCopyable
>     ImageState(EGLenum target, ImageSibling *buffer, const AttributeMap &attribs);
>     ~ImageState();
> 
>+    EGLLabelKHR label;
>+    EGLenum target;
>     gl::ImageIndex imageIndex;
>-    gl::BindingPointer<ImageSibling> source;
>+    ImageSibling *source;
>     std::set<ImageSibling *> targets;
>+
>+    gl::Format format;
>+    gl::Extents size;
>+    size_t samples;
>+    EGLenum sourceType;
> };
> 
>-class Image final : public gl::RefCountObject
>+class Image final : public RefCountObject, public LabeledObject
> {
>   public:
>     Image(rx::EGLImplFactory *factory,
>+          const gl::Context *context,
>           EGLenum target,
>           ImageSibling *buffer,
>           const AttributeMap &attribs);
> 
>-    gl::Error onDestroy(const gl::Context *context) override;
>+    void onDestroy(const Display *display) override;
>     ~Image() override;
> 
>+    void setLabel(EGLLabelKHR label) override;
>+    EGLLabelKHR getLabel() const override;
>+
>     const gl::Format &getFormat() const;
>+    bool isRenderable(const gl::Context *context) const;
>+    bool isTexturable(const gl::Context *context) const;
>     size_t getWidth() const;
>     size_t getHeight() const;
>     size_t getSamples() const;
> 
>-    Error initialize();
>+    Error initialize(const Display *display);
> 
>     rx::ImageImpl *getImplementation() const;
> 
>@@ -104,7 +164,7 @@ class Image final : public gl::RefCountObject
> 
>     // Called from ImageSibling only to notify the image that a sibling (source or target) has
>     // been respecified and state tracking should be updated.
>-    gl::Error orphanSibling(const gl::Context *context, ImageSibling *sibling);
>+    angle::Result orphanSibling(const gl::Context *context, ImageSibling *sibling);
> 
>     ImageState mState;
>     rx::ImageImpl *mImplementation;
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/ImageIndex.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/ImageIndex.cpp
>index 6f99f8ab54a..f0c8b0c4ea8 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/ImageIndex.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/ImageIndex.cpp
>@@ -1,4 +1,3 @@
>-#include "ImageIndex.h"
> //
> // Copyright 2014 The ANGLE Project Authors. All rights reserved.
> // Use of this source code is governed by a BSD-style license that can be
>@@ -8,179 +7,307 @@
> // ImageIndex.cpp: Implementation for ImageIndex methods.
> 
> #include "libANGLE/ImageIndex.h"
>-#include "libANGLE/Constants.h"
>+
> #include "common/utilities.h"
>+#include "libANGLE/Constants.h"
>+#include "libANGLE/angletypes.h"
>+
>+#include <tuple>
> 
> namespace gl
> {
>+namespace
>+{
>+GLint TextureTargetToLayer(TextureTarget target)
>+{
>+    switch (target)
>+    {
>+        case TextureTarget::CubeMapPositiveX:
>+            return 0;
>+        case TextureTarget::CubeMapNegativeX:
>+            return 1;
>+        case TextureTarget::CubeMapPositiveY:
>+            return 2;
>+        case TextureTarget::CubeMapNegativeY:
>+            return 3;
>+        case TextureTarget::CubeMapPositiveZ:
>+            return 4;
>+        case TextureTarget::CubeMapNegativeZ:
>+            return 5;
>+        case TextureTarget::External:
>+            return ImageIndex::kEntireLevel;
>+        case TextureTarget::Rectangle:
>+            return ImageIndex::kEntireLevel;
>+        case TextureTarget::_2D:
>+            return ImageIndex::kEntireLevel;
>+        case TextureTarget::_2DArray:
>+            return ImageIndex::kEntireLevel;
>+        case TextureTarget::_2DMultisample:
>+            return ImageIndex::kEntireLevel;
>+        case TextureTarget::_2DMultisampleArray:
>+            return ImageIndex::kEntireLevel;
>+        case TextureTarget::_3D:
>+            return ImageIndex::kEntireLevel;
>+        default:
>+            UNREACHABLE();
>+            return 0;
>+    }
>+}
> 
>-ImageIndex::ImageIndex(const ImageIndex &other)
>-    : type(other.type),
>-      mipIndex(other.mipIndex),
>-      layerIndex(other.layerIndex),
>-      numLayers(other.numLayers)
>+TextureTarget TextureTypeToTarget(TextureType type, GLint layerIndex)
>+{
>+    if (type == TextureType::CubeMap)
>+    {
>+        // As GL_TEXTURE_CUBE_MAP cannot be a texture target in texImage*D APIs, so we don't allow
>+        // an entire cube map to have a texture target.
>+        ASSERT(layerIndex != ImageIndex::kEntireLevel);
>+        return CubeFaceIndexToTextureTarget(layerIndex);
>+    }
>+    else
>+    {
>+        return NonCubeTextureTypeToTarget(type);
>+    }
>+}
>+}  // anonymous namespace
>+
>+ImageIndex::ImageIndex()
>+    : mType(TextureType::InvalidEnum), mLevelIndex(0), mLayerIndex(0), mLayerCount(kEntireLevel)
> {}
> 
>-ImageIndex &ImageIndex::operator=(const ImageIndex &other)
>+ImageIndex::ImageIndex(const ImageIndex &other) = default;
>+
>+ImageIndex &ImageIndex::operator=(const ImageIndex &other) = default;
>+
>+bool ImageIndex::hasLayer() const
> {
>-    type = other.type;
>-    mipIndex = other.mipIndex;
>-    layerIndex = other.layerIndex;
>-    numLayers  = other.numLayers;
>-    return *this;
>+    return mLayerIndex != kEntireLevel;
> }
> 
>-bool ImageIndex::is3D() const
>+bool ImageIndex::isLayered() const
> {
>-    return type == GL_TEXTURE_3D || type == GL_TEXTURE_2D_ARRAY;
>+    switch (mType)
>+    {
>+        case TextureType::_2DArray:
>+        case TextureType::_2DMultisampleArray:
>+        case TextureType::CubeMap:
>+        case TextureType::_3D:
>+            return mLayerIndex == kEntireLevel;
>+        default:
>+            return false;
>+    }
>+}
>+
>+bool ImageIndex::has3DLayer() const
>+{
>+    // It's quicker to check != CubeMap than calling usesTex3D, which checks multiple types. This
>+    // ASSERT validates the check gives the same result.
>+    ASSERT(!hasLayer() || ((mType != TextureType::CubeMap) == usesTex3D()));
>+    return (hasLayer() && mType != TextureType::CubeMap);
> }
> 
>-ImageIndex ImageIndex::Make2D(GLint mipIndex)
>+bool ImageIndex::usesTex3D() const
> {
>-    return ImageIndex(GL_TEXTURE_2D, mipIndex, ENTIRE_LEVEL, 1);
>+    return mType == TextureType::_3D || mType == TextureType::_2DArray ||
>+           mType == TextureType::_2DMultisampleArray;
> }
> 
>-ImageIndex ImageIndex::MakeRectangle(GLint mipIndex)
>+TextureTarget ImageIndex::getTarget() const
> {
>-    return ImageIndex(GL_TEXTURE_RECTANGLE_ANGLE, mipIndex, ENTIRE_LEVEL, 1);
>+    return TextureTypeToTarget(mType, mLayerIndex);
> }
> 
>-ImageIndex ImageIndex::MakeCube(GLenum target, GLint mipIndex)
>+GLint ImageIndex::cubeMapFaceIndex() const
> {
>-    ASSERT(gl::IsCubeMapTextureTarget(target));
>-    return ImageIndex(target, mipIndex,
>-                      static_cast<GLint>(CubeMapTextureTargetToLayerIndex(target)), 1);
>+    ASSERT(mType == TextureType::CubeMap);
>+    ASSERT(mLayerIndex == kEntireLevel || mLayerIndex < static_cast<GLint>(kCubeFaceCount));
>+    return mLayerIndex;
> }
> 
>-ImageIndex ImageIndex::Make2DArray(GLint mipIndex, GLint layerIndex)
>+bool ImageIndex::valid() const
> {
>-    return ImageIndex(GL_TEXTURE_2D_ARRAY, mipIndex, layerIndex, 1);
>+    return mType != TextureType::InvalidEnum;
> }
> 
>-ImageIndex ImageIndex::Make2DArrayRange(GLint mipIndex, GLint layerIndex, GLint numLayers)
>+bool ImageIndex::isEntireLevelCubeMap() const
> {
>-    return ImageIndex(GL_TEXTURE_2D_ARRAY, mipIndex, layerIndex, numLayers);
>+    return mType == TextureType::CubeMap && mLayerIndex == ImageIndex::kEntireLevel;
> }
> 
>-ImageIndex ImageIndex::Make3D(GLint mipIndex, GLint layerIndex)
>+ImageIndex ImageIndex::Make2D(GLint levelIndex)
> {
>-    return ImageIndex(GL_TEXTURE_3D, mipIndex, layerIndex, 1);
>+    return ImageIndex(TextureType::_2D, levelIndex, kEntireLevel, 1);
> }
> 
>-ImageIndex ImageIndex::MakeGeneric(GLenum target, GLint mipIndex)
>+ImageIndex ImageIndex::MakeRectangle(GLint levelIndex)
> {
>-    GLint layerIndex = IsCubeMapTextureTarget(target)
>-                           ? static_cast<GLint>(CubeMapTextureTargetToLayerIndex(target))
>-                           : ENTIRE_LEVEL;
>-    return ImageIndex(target, mipIndex, layerIndex, 1);
>+    return ImageIndex(TextureType::Rectangle, levelIndex, kEntireLevel, 1);
>+}
>+
>+ImageIndex ImageIndex::MakeCubeMapFace(TextureTarget target, GLint levelIndex)
>+{
>+    ASSERT(IsCubeMapFaceTarget(target));
>+    return ImageIndex(TextureType::CubeMap, levelIndex, TextureTargetToLayer(target), 1);
>+}
>+
>+ImageIndex ImageIndex::Make2DArray(GLint levelIndex, GLint layerIndex)
>+{
>+    return ImageIndex(TextureType::_2DArray, levelIndex, layerIndex, 1);
>+}
>+
>+ImageIndex ImageIndex::Make2DArrayRange(GLint levelIndex, GLint layerIndex, GLint numLayers)
>+{
>+    return ImageIndex(TextureType::_2DArray, levelIndex, layerIndex, numLayers);
>+}
>+
>+ImageIndex ImageIndex::Make3D(GLint levelIndex, GLint layerIndex)
>+{
>+    return ImageIndex(TextureType::_3D, levelIndex, layerIndex, 1);
>+}
>+
>+ImageIndex ImageIndex::MakeFromTarget(TextureTarget target, GLint levelIndex)
>+{
>+    return ImageIndex(TextureTargetToType(target), levelIndex, TextureTargetToLayer(target), 1);
>+}
>+
>+ImageIndex ImageIndex::MakeFromType(TextureType type,
>+                                    GLint levelIndex,
>+                                    GLint layerIndex,
>+                                    GLint layerCount)
>+{
>+    GLint overrideLayerCount =
>+        (type == TextureType::CubeMap && layerIndex == kEntireLevel ? kCubeFaceCount : layerCount);
>+    return ImageIndex(type, levelIndex, layerIndex, overrideLayerCount);
> }
> 
> ImageIndex ImageIndex::Make2DMultisample()
> {
>-    return ImageIndex(GL_TEXTURE_2D_MULTISAMPLE, 0, ENTIRE_LEVEL, 1);
>+    return ImageIndex(TextureType::_2DMultisample, 0, kEntireLevel, 1);
> }
> 
>-ImageIndex ImageIndex::MakeInvalid()
>+ImageIndex ImageIndex::Make2DMultisampleArray(GLint layerIndex)
> {
>-    return ImageIndex(GL_NONE, -1, -1, -1);
>+    return ImageIndex(TextureType::_2DMultisampleArray, 0, layerIndex, 1);
> }
> 
>-bool ImageIndex::operator<(const ImageIndex &other) const
>+ImageIndex ImageIndex::Make2DMultisampleArrayRange(GLint layerIndex, GLint numLayers)
> {
>-    if (type != other.type)
>-    {
>-        return type < other.type;
>-    }
>-    else if (mipIndex != other.mipIndex)
>-    {
>-        return mipIndex < other.mipIndex;
>-    }
>-    else if (layerIndex != other.layerIndex)
>-    {
>-        return layerIndex < other.layerIndex;
>-    }
>-    else
>-    {
>-        return numLayers < other.numLayers;
>-    }
>+    return ImageIndex(TextureType::_2DMultisampleArray, 0, layerIndex, numLayers);
> }
> 
>-bool ImageIndex::operator==(const ImageIndex &other) const
>+bool ImageIndex::operator<(const ImageIndex &b) const
> {
>-    return (type == other.type) && (mipIndex == other.mipIndex) &&
>-           (layerIndex == other.layerIndex) && (numLayers == other.numLayers);
>+    return std::tie(mType, mLevelIndex, mLayerIndex, mLayerCount) <
>+           std::tie(b.mType, b.mLevelIndex, b.mLayerIndex, b.mLayerCount);
> }
> 
>-bool ImageIndex::operator!=(const ImageIndex &other) const
>+bool ImageIndex::operator==(const ImageIndex &b) const
> {
>-    return !(*this == other);
>+    return std::tie(mType, mLevelIndex, mLayerIndex, mLayerCount) ==
>+           std::tie(b.mType, b.mLevelIndex, b.mLayerIndex, b.mLayerCount);
> }
> 
>-ImageIndex::ImageIndex(GLenum typeIn, GLint mipIndexIn, GLint layerIndexIn, GLint numLayersIn)
>-    : type(typeIn), mipIndex(mipIndexIn), layerIndex(layerIndexIn), numLayers(numLayersIn)
>+bool ImageIndex::operator!=(const ImageIndex &b) const
>+{
>+    return !(*this == b);
>+}
>+
>+ImageIndex::ImageIndex(TextureType type, GLint levelIndex, GLint layerIndex, GLint layerCount)
>+    : mType(type), mLevelIndex(levelIndex), mLayerIndex(layerIndex), mLayerCount(layerCount)
> {}
> 
>+ImageIndexIterator ImageIndex::getLayerIterator(GLint layerCount) const
>+{
>+    ASSERT(mType != TextureType::_2D && !hasLayer());
>+    return ImageIndexIterator::MakeGeneric(mType, mLevelIndex, mLevelIndex + 1, 0, layerCount);
>+}
>+
> ImageIndexIterator::ImageIndexIterator(const ImageIndexIterator &other) = default;
> 
> ImageIndexIterator ImageIndexIterator::Make2D(GLint minMip, GLint maxMip)
> {
>-    return ImageIndexIterator(GL_TEXTURE_2D, Range<GLint>(minMip, maxMip),
>-                              Range<GLint>(ImageIndex::ENTIRE_LEVEL, ImageIndex::ENTIRE_LEVEL),
>+    return ImageIndexIterator(TextureType::_2D, Range<GLint>(minMip, maxMip),
>+                              Range<GLint>(ImageIndex::kEntireLevel, ImageIndex::kEntireLevel),
>                               nullptr);
> }
> 
> ImageIndexIterator ImageIndexIterator::MakeRectangle(GLint minMip, GLint maxMip)
> {
>-    return ImageIndexIterator(GL_TEXTURE_RECTANGLE_ANGLE, Range<GLint>(minMip, maxMip),
>-                              Range<GLint>(ImageIndex::ENTIRE_LEVEL, ImageIndex::ENTIRE_LEVEL),
>+    return ImageIndexIterator(TextureType::Rectangle, Range<GLint>(minMip, maxMip),
>+                              Range<GLint>(ImageIndex::kEntireLevel, ImageIndex::kEntireLevel),
>                               nullptr);
> }
> 
> ImageIndexIterator ImageIndexIterator::MakeCube(GLint minMip, GLint maxMip)
> {
>-    return ImageIndexIterator(GL_TEXTURE_CUBE_MAP, Range<GLint>(minMip, maxMip), Range<GLint>(0, 6),
>-                              nullptr);
>+    return ImageIndexIterator(TextureType::CubeMap, Range<GLint>(minMip, maxMip),
>+                              Range<GLint>(0, 6), nullptr);
> }
> 
>-ImageIndexIterator ImageIndexIterator::Make3D(GLint minMip, GLint maxMip,
>-                                              GLint minLayer, GLint maxLayer)
>+ImageIndexIterator ImageIndexIterator::Make3D(GLint minMip,
>+                                              GLint maxMip,
>+                                              GLint minLayer,
>+                                              GLint maxLayer)
> {
>-    return ImageIndexIterator(GL_TEXTURE_3D, Range<GLint>(minMip, maxMip),
>+    return ImageIndexIterator(TextureType::_3D, Range<GLint>(minMip, maxMip),
>                               Range<GLint>(minLayer, maxLayer), nullptr);
> }
> 
>-ImageIndexIterator ImageIndexIterator::Make2DArray(GLint minMip, GLint maxMip,
>+ImageIndexIterator ImageIndexIterator::Make2DArray(GLint minMip,
>+                                                   GLint maxMip,
>                                                    const GLsizei *layerCounts)
> {
>-    return ImageIndexIterator(GL_TEXTURE_2D_ARRAY, Range<GLint>(minMip, maxMip),
>-                              Range<GLint>(0, IMPLEMENTATION_MAX_2D_ARRAY_TEXTURE_LAYERS), layerCounts);
>+    return ImageIndexIterator(TextureType::_2DArray, Range<GLint>(minMip, maxMip),
>+                              Range<GLint>(0, IMPLEMENTATION_MAX_2D_ARRAY_TEXTURE_LAYERS),
>+                              layerCounts);
> }
> 
> ImageIndexIterator ImageIndexIterator::Make2DMultisample()
> {
>-    return ImageIndexIterator(GL_TEXTURE_2D_MULTISAMPLE, Range<GLint>(0, 0),
>-                              Range<GLint>(ImageIndex::ENTIRE_LEVEL, ImageIndex::ENTIRE_LEVEL),
>+    return ImageIndexIterator(TextureType::_2DMultisample, Range<GLint>(0, 1),
>+                              Range<GLint>(ImageIndex::kEntireLevel, ImageIndex::kEntireLevel),
>+                              nullptr);
>+}
>+
>+ImageIndexIterator ImageIndexIterator::Make2DMultisampleArray(const GLsizei *layerCounts)
>+{
>+    return ImageIndexIterator(TextureType::_2DMultisampleArray, Range<GLint>(0, 1),
>+                              Range<GLint>(0, IMPLEMENTATION_MAX_2D_ARRAY_TEXTURE_LAYERS),
>+                              layerCounts);
>+}
>+
>+ImageIndexIterator ImageIndexIterator::MakeGeneric(TextureType type,
>+                                                   GLint minMip,
>+                                                   GLint maxMip,
>+                                                   GLint minLayer,
>+                                                   GLint maxLayer)
>+{
>+    if (type == TextureType::CubeMap)
>+    {
>+        return MakeCube(minMip, maxMip);
>+    }
>+
>+    return ImageIndexIterator(type, Range<GLint>(minMip, maxMip), Range<GLint>(minLayer, maxLayer),
>                               nullptr);
> }
> 
>-ImageIndexIterator::ImageIndexIterator(GLenum type,
>+ImageIndexIterator::ImageIndexIterator(TextureType type,
>                                        const Range<GLint> &mipRange,
>                                        const Range<GLint> &layerRange,
>                                        const GLsizei *layerCounts)
>-    : mType(type),
>-      mMipRange(mipRange),
>+    : mMipRange(mipRange),
>       mLayerRange(layerRange),
>       mLayerCounts(layerCounts),
>-      mCurrentMip(mipRange.low()),
>-      mCurrentLayer(layerRange.low())
>+      mCurrentIndex(type, mipRange.low(), layerRange.low(), 1)
> {}
> 
> GLint ImageIndexIterator::maxLayer() const
> {
>     if (mLayerCounts)
>     {
>-        ASSERT(mCurrentMip >= 0);
>-        return (mCurrentMip < mMipRange.high()) ? mLayerCounts[mCurrentMip] : 0;
>+        ASSERT(mCurrentIndex.hasLayer());
>+        return (mCurrentIndex.getLevelIndex() < mMipRange.high())
>+                   ? mLayerCounts[mCurrentIndex.getLevelIndex()]
>+                   : 0;
>     }
>     return mLayerRange.high();
> }
>@@ -189,61 +316,37 @@ ImageIndex ImageIndexIterator::next()
> {
>     ASSERT(hasNext());
> 
>-    ImageIndex value = current();
>+    // Make a copy of the current index to return
>+    ImageIndex previousIndex = mCurrentIndex;
> 
>     // Iterate layers in the inner loop for now. We can add switchable
>     // layer or mip iteration if we need it.
> 
>-    if (mCurrentLayer != ImageIndex::ENTIRE_LEVEL)
>+    if (mCurrentIndex.hasLayer() && mCurrentIndex.getLayerIndex() < maxLayer() - 1)
>     {
>-        if (mCurrentLayer < maxLayer() - 1)
>-        {
>-            mCurrentLayer++;
>-        }
>-        else if (mCurrentMip < mMipRange.high() - 1)
>-        {
>-            mCurrentMip++;
>-            mCurrentLayer = mLayerRange.low();
>-        }
>-        else
>-        {
>-            done();
>-        }
>+        mCurrentIndex.mLayerIndex++;
>     }
>-    else if (mCurrentMip < mMipRange.high() - 1)
>+    else if (mCurrentIndex.mLevelIndex < mMipRange.high() - 1)
>     {
>-        mCurrentMip++;
>-        mCurrentLayer = mLayerRange.low();
>+        mCurrentIndex.mLayerIndex = mLayerRange.low();
>+        mCurrentIndex.mLevelIndex++;
>     }
>     else
>     {
>-        done();
>+        mCurrentIndex = ImageIndex();
>     }
> 
>-    return value;
>+    return previousIndex;
> }
> 
> ImageIndex ImageIndexIterator::current() const
> {
>-    ImageIndex value(mType, mCurrentMip, mCurrentLayer, 1);
>-
>-    if (mType == GL_TEXTURE_CUBE_MAP)
>-    {
>-        value.type = LayerIndexToCubeMapTextureTarget(mCurrentLayer);
>-    }
>-
>-    return value;
>+    return mCurrentIndex;
> }
> 
> bool ImageIndexIterator::hasNext() const
> {
>-    return (mCurrentMip < mMipRange.high() || mCurrentLayer < maxLayer());
>-}
>-
>-void ImageIndexIterator::done()
>-{
>-    mCurrentMip   = mMipRange.high();
>-    mCurrentLayer = maxLayer();
>+    return mCurrentIndex.valid();
> }
> 
> }  // namespace gl
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/ImageIndex.h b/Source/ThirdParty/ANGLE/src/libANGLE/ImageIndex.h
>index 8e1b0103252..2aace503ff8 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/ImageIndex.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/ImageIndex.h
>@@ -9,6 +9,7 @@
> #ifndef LIBANGLE_IMAGE_INDEX_H_
> #define LIBANGLE_IMAGE_INDEX_H_
> 
>+#include "common/PackedEnums.h"
> #include "common/mathutil.h"
> 
> #include "angle_gl.h"
>@@ -18,42 +19,72 @@ namespace gl
> 
> class ImageIndexIterator;
> 
>-struct ImageIndex
>+class ImageIndex
> {
>-    GLenum type;
>-    GLint mipIndex;
>-    GLint layerIndex;
>-    GLint numLayers;
>-
>+  public:
>+    ImageIndex();
>     ImageIndex(const ImageIndex &other);
>     ImageIndex &operator=(const ImageIndex &other);
> 
>-    bool hasLayer() const { return layerIndex != ENTIRE_LEVEL; }
>-    bool is3D() const;
>-
>-    static ImageIndex Make2D(GLint mipIndex);
>-    static ImageIndex MakeRectangle(GLint mipIndex);
>-    static ImageIndex MakeCube(GLenum target, GLint mipIndex);
>-    static ImageIndex Make2DArray(GLint mipIndex, GLint layerIndex);
>-    static ImageIndex Make2DArrayRange(GLint mipIndex, GLint layerIndex, GLint numLayers);
>-    static ImageIndex Make3D(GLint mipIndex, GLint layerIndex = ENTIRE_LEVEL);
>-    static ImageIndex MakeGeneric(GLenum target, GLint mipIndex);
>+    TextureType getType() const { return mType; }
>+    GLint getLevelIndex() const { return mLevelIndex; }
>+    GLint getLayerIndex() const { return mLayerIndex; }
>+    GLint getLayerCount() const { return mLayerCount; }
>+
>+    bool hasLayer() const;
>+    bool has3DLayer() const;
>+    bool usesTex3D() const;
>+    GLint cubeMapFaceIndex() const;
>+    bool valid() const;
>+    // Note that you cannot use this function when the ImageIndex represents an entire level of cube
>+    // map.
>+    TextureTarget getTarget() const;
>+
>+    bool isLayered() const;
>+    bool isEntireLevelCubeMap() const;
>+
>+    static ImageIndex Make2D(GLint levelIndex);
>+    static ImageIndex MakeRectangle(GLint levelIndex);
>+    static ImageIndex MakeCubeMapFace(TextureTarget target, GLint levelIndex);
>+    static ImageIndex Make2DArray(GLint levelIndex, GLint layerIndex = kEntireLevel);
>+    static ImageIndex Make2DArrayRange(GLint levelIndex, GLint layerIndex, GLint layerCount);
>+    static ImageIndex Make3D(GLint levelIndex, GLint layerIndex = kEntireLevel);
>+    static ImageIndex MakeFromTarget(TextureTarget target, GLint levelIndex);
>+    static ImageIndex MakeFromType(TextureType type,
>+                                   GLint levelIndex,
>+                                   GLint layerIndex = kEntireLevel,
>+                                   GLint layerCount = 1);
>     static ImageIndex Make2DMultisample();
>+    static ImageIndex Make2DMultisampleArray(GLint layerIndex = kEntireLevel);
>+    static ImageIndex Make2DMultisampleArrayRange(GLint layerIndex, GLint layerCount);
> 
>-    static ImageIndex MakeInvalid();
>+    static constexpr GLint kEntireLevel = static_cast<GLint>(-1);
> 
>-    static const GLint ENTIRE_LEVEL = static_cast<GLint>(-1);
>+    bool operator<(const ImageIndex &b) const;
>+    bool operator==(const ImageIndex &b) const;
>+    bool operator!=(const ImageIndex &b) const;
> 
>-    bool operator<(const ImageIndex &other) const;
>-    bool operator==(const ImageIndex &other) const;
>-    bool operator!=(const ImageIndex &other) const;
>+    // Only valid for 3D/Cube textures with layers.
>+    ImageIndexIterator getLayerIterator(GLint layerCount) const;
> 
>   private:
>     friend class ImageIndexIterator;
> 
>-    ImageIndex(GLenum typeIn, GLint mipIndexIn, GLint layerIndexIn, GLint numLayersIn);
>+    ImageIndex(TextureType type, GLint leveIndex, GLint layerIndex, GLint layerCount);
>+
>+    TextureType mType;
>+    GLint mLevelIndex;
>+    GLint mLayerIndex;
>+    GLint mLayerCount;
> };
> 
>+// To be used like this:
>+//
>+// ImageIndexIterator it = ...;
>+// while (it.hasNext())
>+// {
>+//     ImageIndex current = it.next();
>+// }
> class ImageIndexIterator
> {
>   public:
>@@ -65,27 +96,31 @@ class ImageIndexIterator
>     static ImageIndexIterator Make3D(GLint minMip, GLint maxMip, GLint minLayer, GLint maxLayer);
>     static ImageIndexIterator Make2DArray(GLint minMip, GLint maxMip, const GLsizei *layerCounts);
>     static ImageIndexIterator Make2DMultisample();
>+    static ImageIndexIterator Make2DMultisampleArray(const GLsizei *layerCounts);
>+    static ImageIndexIterator MakeGeneric(TextureType type,
>+                                          GLint minMip,
>+                                          GLint maxMip,
>+                                          GLint minLayer,
>+                                          GLint maxLayer);
> 
>     ImageIndex next();
>     ImageIndex current() const;
>     bool hasNext() const;
> 
>   private:
>-
>-    ImageIndexIterator(GLenum type, const Range<GLint> &mipRange,
>-                       const Range<GLint> &layerRange, const GLsizei *layerCounts);
>+    ImageIndexIterator(TextureType type,
>+                       const Range<GLint> &mipRange,
>+                       const Range<GLint> &layerRange,
>+                       const GLsizei *layerCounts);
> 
>     GLint maxLayer() const;
>-    void done();
>-
>-    GLenum mType;
>-    Range<GLint> mMipRange;
>-    Range<GLint> mLayerRange;
>-    const GLsizei *mLayerCounts;
>-    GLint mCurrentMip;
>-    GLint mCurrentLayer;
>-};
> 
>-}
>+    const Range<GLint> mMipRange;
>+    const Range<GLint> mLayerRange;
>+    const GLsizei *const mLayerCounts;
>+
>+    ImageIndex mCurrentIndex;
>+};
>+}  // namespace gl
> 
>-#endif // LIBANGLE_IMAGE_INDEX_H_
>+#endif  // LIBANGLE_IMAGE_INDEX_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/ImageIndexIterator_unittest.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/ImageIndexIterator_unittest.cpp
>index 2f97e8eba95..5801de2ffc6 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/ImageIndexIterator_unittest.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/ImageIndexIterator_unittest.cpp
>@@ -15,8 +15,8 @@ using namespace gl;
> namespace
> {
> 
>-static const GLint minMip = 0;
>-static const GLint maxMip = 4;
>+static const GLint minMip   = 0;
>+static const GLint maxMip   = 4;
> static const GLint minLayer = 1;
> static const GLint maxLayer = 3;
> 
>@@ -29,17 +29,19 @@ TEST(ImageIndexTest, Iterator2D)
>     for (GLint mip = minMip; mip < maxMip; mip++)
>     {
>         EXPECT_TRUE(iter.hasNext());
>-        ImageIndex current = iter.current();
>+        ImageIndex current   = iter.current();
>         ImageIndex nextIndex = iter.next();
> 
>-        EXPECT_EQ(static_cast<GLenum>(GL_TEXTURE_2D), nextIndex.type);
>-        EXPECT_EQ(mip, nextIndex.mipIndex);
>+        EXPECT_EQ(TextureType::_2D, nextIndex.getType());
>+        EXPECT_EQ(TextureTarget::_2D, nextIndex.getTarget());
>+        EXPECT_EQ(mip, nextIndex.getLevelIndex());
>         EXPECT_FALSE(nextIndex.hasLayer());
>+        EXPECT_FALSE(nextIndex.has3DLayer());
> 
>         // Also test current
>-        EXPECT_EQ(current.type, nextIndex.type);
>-        EXPECT_EQ(current.mipIndex, nextIndex.mipIndex);
>-        EXPECT_EQ(current.layerIndex, nextIndex.layerIndex);
>+        EXPECT_EQ(current.getType(), nextIndex.getType());
>+        EXPECT_EQ(current.getLevelIndex(), nextIndex.getLevelIndex());
>+        EXPECT_EQ(current.getLayerIndex(), nextIndex.getLayerIndex());
>     }
> 
>     EXPECT_FALSE(iter.hasNext());
>@@ -47,23 +49,22 @@ TEST(ImageIndexTest, Iterator2D)
> 
> TEST(ImageIndexTest, IteratorCube)
> {
>-    ImageIndexIterator iter = ImageIndexIterator::MakeCube(0, 4);
>+    ImageIndexIterator iter = ImageIndexIterator::MakeCube(minMip, maxMip);
> 
>     ASSERT_GE(0, minMip);
> 
>     for (GLint mip = minMip; mip < maxMip; mip++)
>     {
>-        for (GLint layer = 0; layer < 6; layer++)
>+        for (TextureTarget target : AllCubeFaceTextureTargets())
>         {
>             EXPECT_TRUE(iter.hasNext());
>             ImageIndex nextIndex = iter.next();
> 
>-            GLenum cubeTarget = LayerIndexToCubeMapTextureTarget(layer);
>-
>-            EXPECT_EQ(cubeTarget, nextIndex.type);
>-            EXPECT_EQ(mip, nextIndex.mipIndex);
>-            EXPECT_EQ(layer, nextIndex.layerIndex);
>+            EXPECT_EQ(TextureType::CubeMap, nextIndex.getType());
>+            EXPECT_EQ(target, nextIndex.getTarget());
>+            EXPECT_EQ(mip, nextIndex.getLevelIndex());
>             EXPECT_TRUE(nextIndex.hasLayer());
>+            EXPECT_FALSE(nextIndex.has3DLayer());
>         }
>     }
> 
>@@ -83,10 +84,12 @@ TEST(ImageIndexTest, Iterator3D)
>             EXPECT_TRUE(iter.hasNext());
>             ImageIndex nextIndex = iter.next();
> 
>-            EXPECT_EQ(static_cast<GLenum>(GL_TEXTURE_3D), nextIndex.type);
>-            EXPECT_EQ(mip, nextIndex.mipIndex);
>-            EXPECT_EQ(layer, nextIndex.layerIndex);
>+            EXPECT_EQ(TextureType::_3D, nextIndex.getType());
>+            EXPECT_EQ(TextureTarget::_3D, nextIndex.getTarget());
>+            EXPECT_EQ(mip, nextIndex.getLevelIndex());
>+            EXPECT_EQ(layer, nextIndex.getLayerIndex());
>             EXPECT_TRUE(nextIndex.hasLayer());
>+            EXPECT_TRUE(nextIndex.has3DLayer());
>         }
>     }
> 
>@@ -95,7 +98,7 @@ TEST(ImageIndexTest, Iterator3D)
> 
> TEST(ImageIndexTest, Iterator2DArray)
> {
>-    GLsizei layerCounts[] = { 1, 3, 5, 2 };
>+    GLsizei layerCounts[] = {1, 3, 5, 2};
> 
>     ImageIndexIterator iter = ImageIndexIterator::Make2DArray(minMip, maxMip, layerCounts);
> 
>@@ -109,14 +112,47 @@ TEST(ImageIndexTest, Iterator2DArray)
>             EXPECT_TRUE(iter.hasNext());
>             ImageIndex nextIndex = iter.next();
> 
>-            EXPECT_EQ(static_cast<GLenum>(GL_TEXTURE_2D_ARRAY), nextIndex.type);
>-            EXPECT_EQ(mip, nextIndex.mipIndex);
>-            EXPECT_EQ(layer, nextIndex.layerIndex);
>+            EXPECT_EQ(TextureType::_2DArray, nextIndex.getType());
>+            EXPECT_EQ(TextureTarget::_2DArray, nextIndex.getTarget());
>+            EXPECT_EQ(mip, nextIndex.getLevelIndex());
>+            EXPECT_EQ(layer, nextIndex.getLayerIndex());
>             EXPECT_TRUE(nextIndex.hasLayer());
>+            EXPECT_TRUE(nextIndex.has3DLayer());
>         }
>     }
> 
>     EXPECT_FALSE(iter.hasNext());
> }
> 
>-} // namespace
>+TEST(ImageIndexTest, LayerIterator2DArray)
>+{
>+    GLsizei layerCounts[] = {1, 3, 5, 2};
>+
>+    ASSERT_GE(0, minMip);
>+    ASSERT_EQ(ArraySize(layerCounts), static_cast<size_t>(maxMip));
>+
>+    for (GLint mip = minMip; mip < maxMip; mip++)
>+    {
>+        // Make a layer iterator.
>+        ImageIndex mipImageIndex = ImageIndex::Make2DArray(mip, ImageIndex::kEntireLevel);
>+        ImageIndexIterator iter  = mipImageIndex.getLayerIterator(layerCounts[mip]);
>+
>+        for (GLint layer = 0; layer < layerCounts[mip]; layer++)
>+        {
>+            EXPECT_TRUE(iter.hasNext());
>+            ImageIndex nextIndex = iter.next();
>+
>+            EXPECT_EQ(TextureType::_2DArray, nextIndex.getType());
>+            EXPECT_EQ(TextureTarget::_2DArray, nextIndex.getTarget());
>+            EXPECT_EQ(mip, nextIndex.getLevelIndex());
>+            EXPECT_EQ(layer, nextIndex.getLayerIndex());
>+            EXPECT_TRUE(nextIndex.hasLayer());
>+            EXPECT_TRUE(nextIndex.has3DLayer());
>+            EXPECT_LT(nextIndex.getLayerIndex(), layerCounts[mip]);
>+        }
>+
>+        EXPECT_FALSE(iter.hasNext());
>+    }
>+}
>+
>+}  // namespace
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/Image_unittest.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/Image_unittest.cpp
>index b685ae587b7..d8f59c72663 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/Image_unittest.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/Image_unittest.cpp
>@@ -8,12 +8,13 @@
> 
> #include "gmock/gmock.h"
> #include "gtest/gtest.h"
>+
> #include "libANGLE/Image.h"
>-#include "libANGLE/Texture.h"
> #include "libANGLE/Renderbuffer.h"
>+#include "libANGLE/Texture.h"
> #include "libANGLE/renderer/ImageImpl_mock.h"
>-#include "libANGLE/renderer/TextureImpl_mock.h"
> #include "libANGLE/renderer/RenderbufferImpl_mock.h"
>+#include "libANGLE/renderer/TextureImpl_mock.h"
> #include "tests/angle_unittests_utils.h"
> 
> using ::testing::_;
>@@ -24,7 +25,7 @@ namespace angle
> {
> ACTION(CreateMockImageImpl)
> {
>-    return new rx::MockImageImpl(arg0, arg1, arg2);
>+    return new rx::MockImageImpl(arg0);
> }
> 
> // Verify ref counts are maintained between images and their siblings when objects are deleted
>@@ -36,58 +37,61 @@ TEST(ImageTest, RefCounting)
>     // Create a texture and an EGL image that uses the texture as its source
>     rx::MockTextureImpl *textureImpl = new rx::MockTextureImpl();
>     EXPECT_CALL(mockGLFactory, createTexture(_)).WillOnce(Return(textureImpl));
>-    gl::Texture *texture = new gl::Texture(&mockGLFactory, 1, GL_TEXTURE_2D);
>+    gl::Texture *texture = new gl::Texture(&mockGLFactory, 1, gl::TextureType::_2D);
>     texture->addRef();
> 
>-    EXPECT_CALL(mockEGLFactory, createImage(_, _, _))
>+    EXPECT_CALL(mockEGLFactory, createImage(_, _, _, _))
>         .WillOnce(CreateMockImageImpl())
>         .RetiresOnSaturation();
> 
>     egl::Image *image =
>-        new egl::Image(&mockEGLFactory, EGL_GL_TEXTURE_2D, texture, egl::AttributeMap());
>+        new egl::Image(&mockEGLFactory, nullptr, EGL_GL_TEXTURE_2D, texture, egl::AttributeMap());
>+    rx::MockImageImpl *imageImpl = static_cast<rx::MockImageImpl *>(image->getImplementation());
>     image->addRef();
> 
>-    // Verify that the image added a ref to the texture and the texture has not added a ref to the
>-    // image
>-    EXPECT_EQ(2u, texture->getRefCount());
>+    // Verify that the image does not add a ref to its source so that the source may still be
>+    // deleted
>+    EXPECT_EQ(1u, texture->getRefCount());
>     EXPECT_EQ(1u, image->getRefCount());
> 
>     // Create a renderbuffer and set it as a target of the EGL image
>     rx::MockRenderbufferImpl *renderbufferImpl = new rx::MockRenderbufferImpl();
>-    gl::Renderbuffer *renderbuffer = new gl::Renderbuffer(renderbufferImpl, 1);
>+    EXPECT_CALL(mockGLFactory, createRenderbuffer(_)).WillOnce(Return(renderbufferImpl));
>+    gl::Renderbuffer *renderbuffer = new gl::Renderbuffer(&mockGLFactory, 1);
>     renderbuffer->addRef();
> 
>     EXPECT_CALL(*renderbufferImpl, setStorageEGLImageTarget(_, _))
>-        .WillOnce(Return(gl::NoError()))
>+        .WillOnce(Return(angle::Result::Continue))
>         .RetiresOnSaturation();
>-    EXPECT_FALSE(renderbuffer->setStorageEGLImageTarget(nullptr, image).isError());
>+    EXPECT_EQ(angle::Result::Continue, renderbuffer->setStorageEGLImageTarget(nullptr, image));
> 
>     // Verify that the renderbuffer added a ref to the image and the image did not add a ref to
>     // the renderbuffer
>-    EXPECT_EQ(2u, texture->getRefCount());
>+    EXPECT_EQ(1u, texture->getRefCount());
>     EXPECT_EQ(2u, image->getRefCount());
>     EXPECT_EQ(1u, renderbuffer->getRefCount());
> 
>-    // Simulate deletion of the texture and verify that it still exists because the image holds a
>-    // ref
>+    // Simulate deletion of the texture and verify that it is deleted but the image still exists
>+    EXPECT_CALL(*imageImpl, orphan(_, _))
>+        .WillOnce(Return(angle::Result::Continue))
>+        .RetiresOnSaturation();
>+    EXPECT_CALL(*textureImpl, destructor()).Times(1).RetiresOnSaturation();
>     texture->release(nullptr);
>-    EXPECT_EQ(1u, texture->getRefCount());
>     EXPECT_EQ(2u, image->getRefCount());
>     EXPECT_EQ(1u, renderbuffer->getRefCount());
> 
>     // Simulate deletion of the image and verify that it still exists because the renderbuffer holds
>     // a ref
>     image->release(nullptr);
>-    EXPECT_EQ(1u, texture->getRefCount());
>     EXPECT_EQ(1u, image->getRefCount());
>     EXPECT_EQ(1u, renderbuffer->getRefCount());
> 
>     // Simulate deletion of the renderbuffer and verify that the deletion cascades to all objects
>-    rx::MockImageImpl *imageImpl = static_cast<rx::MockImageImpl *>(image->getImplementation());
>     EXPECT_CALL(*imageImpl, destructor()).Times(1).RetiresOnSaturation();
>-    EXPECT_CALL(*imageImpl, orphan(_, _)).WillOnce(Return(gl::NoError())).RetiresOnSaturation();
>+    EXPECT_CALL(*imageImpl, orphan(_, _))
>+        .WillOnce(Return(angle::Result::Continue))
>+        .RetiresOnSaturation();
> 
>-    EXPECT_CALL(*textureImpl, destructor()).Times(1).RetiresOnSaturation();
>     EXPECT_CALL(*renderbufferImpl, destructor()).Times(1).RetiresOnSaturation();
> 
>     renderbuffer->release(nullptr);
>@@ -102,43 +106,42 @@ TEST(ImageTest, RespecificationReleasesReferences)
>     // Create a texture and an EGL image that uses the texture as its source
>     rx::MockTextureImpl *textureImpl = new rx::MockTextureImpl();
>     EXPECT_CALL(mockGLFactory, createTexture(_)).WillOnce(Return(textureImpl));
>-    gl::Texture *texture = new gl::Texture(&mockGLFactory, 1, GL_TEXTURE_2D);
>+    gl::Texture *texture = new gl::Texture(&mockGLFactory, 1, gl::TextureType::_2D);
>     texture->addRef();
> 
>     gl::PixelUnpackState defaultUnpackState;
> 
>-    EXPECT_CALL(*textureImpl, setImage(_, _, _, _, _, _, _, _, _))
>-        .WillOnce(Return(gl::NoError()))
>+    EXPECT_CALL(*textureImpl, setImage(_, _, _, _, _, _, _, _))
>+        .WillOnce(Return(angle::Result::Continue))
>         .RetiresOnSaturation();
>-    EXPECT_FALSE(texture
>-                     ->setImage(nullptr, defaultUnpackState, GL_TEXTURE_2D, 0, GL_RGBA8,
>-                                gl::Extents(1, 1, 1), GL_RGBA, GL_UNSIGNED_BYTE, nullptr)
>-                     .isError());
>+    EXPECT_EQ(angle::Result::Continue,
>+              texture->setImage(nullptr, defaultUnpackState, gl::TextureTarget::_2D, 0, GL_RGBA8,
>+                                gl::Extents(1, 1, 1), GL_RGBA, GL_UNSIGNED_BYTE, nullptr));
> 
>-    EXPECT_CALL(mockEGLFactory, createImage(_, _, _))
>+    EXPECT_CALL(mockEGLFactory, createImage(_, _, _, _))
>         .WillOnce(CreateMockImageImpl())
>         .RetiresOnSaturation();
> 
>     egl::Image *image =
>-        new egl::Image(&mockEGLFactory, EGL_GL_TEXTURE_2D, texture, egl::AttributeMap());
>+        new egl::Image(&mockEGLFactory, nullptr, EGL_GL_TEXTURE_2D, texture, egl::AttributeMap());
>     image->addRef();
> 
>-    // Verify that the image added a ref to the texture and the texture has not added a ref to the
>-    // image
>-    EXPECT_EQ(2u, texture->getRefCount());
>+    // Verify that the image did not add a ref to it's source.
>+    EXPECT_EQ(1u, texture->getRefCount());
>     EXPECT_EQ(1u, image->getRefCount());
> 
>-    // Respecify the texture and verify that the image releases its reference
>+    // Respecify the texture and verify that the image is orpahaned
>     rx::MockImageImpl *imageImpl = static_cast<rx::MockImageImpl *>(image->getImplementation());
>-    EXPECT_CALL(*imageImpl, orphan(_, _)).WillOnce(Return(gl::NoError())).RetiresOnSaturation();
>-    EXPECT_CALL(*textureImpl, setImage(_, _, _, _, _, _, _, _, _))
>-        .WillOnce(Return(gl::NoError()))
>+    EXPECT_CALL(*imageImpl, orphan(_, _))
>+        .WillOnce(Return(angle::Result::Continue))
>+        .RetiresOnSaturation();
>+    EXPECT_CALL(*textureImpl, setImage(_, _, _, _, _, _, _, _))
>+        .WillOnce(Return(angle::Result::Continue))
>         .RetiresOnSaturation();
> 
>-    EXPECT_FALSE(texture
>-                     ->setImage(nullptr, defaultUnpackState, GL_TEXTURE_2D, 0, GL_RGBA8,
>-                                gl::Extents(1, 1, 1), GL_RGBA, GL_UNSIGNED_BYTE, nullptr)
>-                     .isError());
>+    EXPECT_EQ(angle::Result::Continue,
>+              texture->setImage(nullptr, defaultUnpackState, gl::TextureTarget::_2D, 0, GL_RGBA8,
>+                                gl::Extents(1, 1, 1), GL_RGBA, GL_UNSIGNED_BYTE, nullptr));
> 
>     EXPECT_EQ(1u, texture->getRefCount());
>     EXPECT_EQ(1u, image->getRefCount());
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/IndexRangeCache.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/IndexRangeCache.cpp
>index 71a1392b1b8..5540dc8a7c2 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/IndexRangeCache.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/IndexRangeCache.cpp
>@@ -15,15 +15,11 @@
> namespace gl
> {
> 
>-IndexRangeCache::IndexRangeCache()
>-{
>-}
>+IndexRangeCache::IndexRangeCache() {}
> 
>-IndexRangeCache::~IndexRangeCache()
>-{
>-}
>+IndexRangeCache::~IndexRangeCache() {}
> 
>-void IndexRangeCache::addRange(GLenum type,
>+void IndexRangeCache::addRange(DrawElementsType type,
>                                size_t offset,
>                                size_t count,
>                                bool primitiveRestartEnabled,
>@@ -32,7 +28,7 @@ void IndexRangeCache::addRange(GLenum type,
>     mIndexRangeCache[IndexRangeKey(type, offset, count, primitiveRestartEnabled)] = range;
> }
> 
>-bool IndexRangeCache::findRange(GLenum type,
>+bool IndexRangeCache::findRange(DrawElementsType type,
>                                 size_t offset,
>                                 size_t count,
>                                 bool primitiveRestartEnabled,
>@@ -66,7 +62,8 @@ void IndexRangeCache::invalidateRange(size_t offset, size_t size)
>     while (i != mIndexRangeCache.end())
>     {
>         size_t rangeStart = i->first.offset;
>-        size_t rangeEnd   = i->first.offset + (GetTypeInfo(i->first.type).bytes * i->first.count);
>+        size_t rangeEnd =
>+            i->first.offset + (GetDrawElementsTypeSize(i->first.type) * i->first.count);
> 
>         if (invalidateEnd < rangeStart || invalidateStart > rangeEnd)
>         {
>@@ -85,17 +82,15 @@ void IndexRangeCache::clear()
> }
> 
> IndexRangeCache::IndexRangeKey::IndexRangeKey()
>-    : IndexRangeCache::IndexRangeKey(GL_NONE, 0, 0, false)
>-{
>-}
>+    : IndexRangeCache::IndexRangeKey(DrawElementsType::InvalidEnum, 0, 0, false)
>+{}
> 
>-IndexRangeCache::IndexRangeKey::IndexRangeKey(GLenum type_,
>+IndexRangeCache::IndexRangeKey::IndexRangeKey(DrawElementsType type_,
>                                               size_t offset_,
>                                               size_t count_,
>                                               bool primitiveRestartEnabled_)
>     : type(type_), offset(offset_), count(count_), primitiveRestartEnabled(primitiveRestartEnabled_)
>-{
>-}
>+{}
> 
> bool IndexRangeCache::IndexRangeKey::operator<(const IndexRangeKey &rhs) const
> {
>@@ -118,4 +113,4 @@ bool IndexRangeCache::IndexRangeKey::operator<(const IndexRangeKey &rhs) const
>     return false;
> }
> 
>-}
>+}  // namespace gl
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/IndexRangeCache.h b/Source/ThirdParty/ANGLE/src/libANGLE/IndexRangeCache.h
>index 3b183448e63..f53602d12fc 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/IndexRangeCache.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/IndexRangeCache.h
>@@ -10,11 +10,11 @@
> #ifndef LIBANGLE_INDEXRANGECACHE_H_
> #define LIBANGLE_INDEXRANGECACHE_H_
> 
>+#include "angle_gl.h"
>+#include "common/PackedEnums.h"
> #include "common/angleutils.h"
> #include "common/mathutil.h"
> 
>-#include "angle_gl.h"
>-
> #include <map>
> 
> namespace gl
>@@ -26,12 +26,12 @@ class IndexRangeCache
>     IndexRangeCache();
>     ~IndexRangeCache();
> 
>-    void addRange(GLenum type,
>+    void addRange(DrawElementsType type,
>                   size_t offset,
>                   size_t count,
>                   bool primitiveRestartEnabled,
>                   const IndexRange &range);
>-    bool findRange(GLenum type,
>+    bool findRange(DrawElementsType type,
>                    size_t offset,
>                    size_t count,
>                    bool primitiveRestartEnabled,
>@@ -44,11 +44,11 @@ class IndexRangeCache
>     struct IndexRangeKey
>     {
>         IndexRangeKey();
>-        IndexRangeKey(GLenum type, size_t offset, size_t count, bool primitiveRestart);
>+        IndexRangeKey(DrawElementsType type, size_t offset, size_t count, bool primitiveRestart);
> 
>         bool operator<(const IndexRangeKey &rhs) const;
> 
>-        GLenum type;
>+        DrawElementsType type;
>         size_t offset;
>         size_t count;
>         bool primitiveRestartEnabled;
>@@ -58,6 +58,6 @@ class IndexRangeCache
>     IndexRangeMap mIndexRangeCache;
> };
> 
>-}
>+}  // namespace gl
> 
>-#endif // LIBANGLE_INDEXRANGECACHE_H_
>+#endif  // LIBANGLE_INDEXRANGECACHE_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/LoggingAnnotator.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/LoggingAnnotator.cpp
>index 799399e4531..1ef177a76de 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/LoggingAnnotator.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/LoggingAnnotator.cpp
>@@ -9,6 +9,7 @@
> #include "libANGLE/LoggingAnnotator.h"
> 
> #include <platform/Platform.h>
>+#include "third_party/trace_event/trace_event.h"
> 
> namespace angle
> {
>@@ -18,6 +19,21 @@ bool LoggingAnnotator::getStatus()
>     return false;
> }
> 
>+void LoggingAnnotator::beginEvent(const char *eventName, const char *eventMessage)
>+{
>+    TRACE_EVENT_BEGIN0("gpu.angle", eventName);
>+}
>+
>+void LoggingAnnotator::endEvent(const char *eventName)
>+{
>+    TRACE_EVENT_END0("gpu.angle", eventName);
>+}
>+
>+void LoggingAnnotator::setMarker(const char *markerName)
>+{
>+    TRACE_EVENT_INSTANT0("gpu.angle", markerName);
>+}
>+
> void LoggingAnnotator::logMessage(const gl::LogMessage &msg) const
> {
>     auto *plat = ANGLEPlatformCurrent();
>@@ -25,6 +41,7 @@ void LoggingAnnotator::logMessage(const gl::LogMessage &msg) const
>     {
>         switch (msg.getSeverity())
>         {
>+            case gl::LOG_FATAL:
>             case gl::LOG_ERR:
>                 plat->logError(plat, msg.getMessage().c_str());
>                 break;
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/LoggingAnnotator.h b/Source/ThirdParty/ANGLE/src/libANGLE/LoggingAnnotator.h
>index 5bec68e189a..9a4fbe429b8 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/LoggingAnnotator.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/LoggingAnnotator.h
>@@ -17,11 +17,11 @@ namespace angle
> class LoggingAnnotator : public gl::DebugAnnotator
> {
>   public:
>-    LoggingAnnotator(){};
>-    ~LoggingAnnotator() override{};
>-    void beginEvent(const wchar_t *eventName) override {}
>-    void endEvent() override {}
>-    void setMarker(const wchar_t *markerName) override {}
>+    LoggingAnnotator() {}
>+    ~LoggingAnnotator() override {}
>+    void beginEvent(const char *eventName, const char *eventMessage) override;
>+    void endEvent(const char *eventName) override;
>+    void setMarker(const char *markerName) override;
>     bool getStatus() override;
>     void logMessage(const gl::LogMessage &msg) const override;
> };
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/MemoryObject.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/MemoryObject.cpp
>new file mode 100644
>index 00000000000..fcb2e961b3b
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/MemoryObject.cpp
>@@ -0,0 +1,36 @@
>+//
>+// Copyright 2019 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// MemoryObject.h: Implements the gl::MemoryObject class [EXT_external_objects]
>+
>+#include "libANGLE/MemoryObject.h"
>+
>+#include "common/angleutils.h"
>+#include "libANGLE/renderer/GLImplFactory.h"
>+#include "libANGLE/renderer/MemoryObjectImpl.h"
>+
>+namespace gl
>+{
>+
>+MemoryObject::MemoryObject(rx::GLImplFactory *factory, GLuint id)
>+    : RefCountObject(id), mImplementation(factory->createMemoryObject())
>+{}
>+
>+MemoryObject::~MemoryObject() {}
>+
>+void MemoryObject::onDestroy(const Context *context)
>+{
>+    mImplementation->onDestroy(context);
>+}
>+
>+angle::Result MemoryObject::importFd(Context *context,
>+                                     GLuint64 size,
>+                                     HandleType handleType,
>+                                     GLint fd)
>+{
>+    return mImplementation->importFd(context, size, handleType, fd);
>+}
>+
>+}  // namespace gl
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/MemoryObject.h b/Source/ThirdParty/ANGLE/src/libANGLE/MemoryObject.h
>new file mode 100644
>index 00000000000..1bc1d40145a
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/MemoryObject.h
>@@ -0,0 +1,45 @@
>+//
>+// Copyright 2019 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// MemoryObject.h: Defines the gl::MemoryObject class [EXT_external_objects]
>+
>+#ifndef LIBANGLE_MEMORYOBJECT_H_
>+#define LIBANGLE_MEMORYOBJECT_H_
>+
>+#include "angle_gl.h"
>+#include "common/PackedEnums.h"
>+#include "common/angleutils.h"
>+#include "libANGLE/Error.h"
>+#include "libANGLE/RefCountObject.h"
>+
>+namespace rx
>+{
>+class GLImplFactory;
>+class MemoryObjectImpl;
>+}  // namespace rx
>+
>+namespace gl
>+{
>+class Context;
>+
>+class MemoryObject final : public RefCountObject
>+{
>+  public:
>+    MemoryObject(rx::GLImplFactory *factory, GLuint id);
>+    ~MemoryObject() override;
>+
>+    void onDestroy(const Context *context) override;
>+
>+    rx::MemoryObjectImpl *getImplementation() const { return mImplementation.get(); }
>+
>+    angle::Result importFd(Context *context, GLuint64 size, HandleType handleType, GLint fd);
>+
>+  private:
>+    std::unique_ptr<rx::MemoryObjectImpl> mImplementation;
>+};
>+
>+}  // namespace gl
>+
>+#endif  // LIBANGLE_MEMORYOBJECT_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/MemoryProgramCache.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/MemoryProgramCache.cpp
>index 2a9c6836a36..9c549220a00 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/MemoryProgramCache.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/MemoryProgramCache.cpp
>@@ -26,122 +26,8 @@ namespace gl
> 
> namespace
> {
>-enum CacheResult
>-{
>-    kCacheMiss,
>-    kCacheHitMemory,
>-    kCacheHitDisk,
>-    kCacheResultMax,
>-};
>-
> constexpr unsigned int kWarningLimit = 3;
> 
>-void WriteShaderVar(BinaryOutputStream *stream, const sh::ShaderVariable &var)
>-{
>-    stream->writeInt(var.type);
>-    stream->writeInt(var.precision);
>-    stream->writeString(var.name);
>-    stream->writeString(var.mappedName);
>-    stream->writeIntVector(var.arraySizes);
>-    stream->writeInt(var.staticUse);
>-    stream->writeString(var.structName);
>-    ASSERT(var.fields.empty());
>-}
>-
>-void LoadShaderVar(BinaryInputStream *stream, sh::ShaderVariable *var)
>-{
>-    var->type       = stream->readInt<GLenum>();
>-    var->precision  = stream->readInt<GLenum>();
>-    var->name       = stream->readString();
>-    var->mappedName = stream->readString();
>-    stream->readIntVector<unsigned int>(&var->arraySizes);
>-    var->staticUse  = stream->readBool();
>-    var->structName = stream->readString();
>-}
>-
>-void WriteShaderVariableBuffer(BinaryOutputStream *stream, const ShaderVariableBuffer &var)
>-{
>-    stream->writeInt(var.binding);
>-    stream->writeInt(var.dataSize);
>-
>-    stream->writeInt(var.vertexStaticUse);
>-    stream->writeInt(var.fragmentStaticUse);
>-    stream->writeInt(var.computeStaticUse);
>-
>-    stream->writeInt(var.memberIndexes.size());
>-    for (unsigned int memberCounterIndex : var.memberIndexes)
>-    {
>-        stream->writeInt(memberCounterIndex);
>-    }
>-}
>-
>-void LoadShaderVariableBuffer(BinaryInputStream *stream, ShaderVariableBuffer *var)
>-{
>-    var->binding           = stream->readInt<int>();
>-    var->dataSize          = stream->readInt<unsigned int>();
>-    var->vertexStaticUse   = stream->readBool();
>-    var->fragmentStaticUse = stream->readBool();
>-    var->computeStaticUse  = stream->readBool();
>-
>-    unsigned int numMembers = stream->readInt<unsigned int>();
>-    for (unsigned int blockMemberIndex = 0; blockMemberIndex < numMembers; blockMemberIndex++)
>-    {
>-        var->memberIndexes.push_back(stream->readInt<unsigned int>());
>-    }
>-}
>-
>-void WriteBufferVariable(BinaryOutputStream *stream, const BufferVariable &var)
>-{
>-    WriteShaderVar(stream, var);
>-
>-    stream->writeInt(var.bufferIndex);
>-    stream->writeInt(var.blockInfo.offset);
>-    stream->writeInt(var.blockInfo.arrayStride);
>-    stream->writeInt(var.blockInfo.matrixStride);
>-    stream->writeInt(var.blockInfo.isRowMajorMatrix);
>-    stream->writeInt(var.blockInfo.topLevelArrayStride);
>-    stream->writeInt(var.topLevelArraySize);
>-    stream->writeInt(var.vertexStaticUse);
>-    stream->writeInt(var.fragmentStaticUse);
>-    stream->writeInt(var.computeStaticUse);
>-}
>-
>-void LoadBufferVariable(BinaryInputStream *stream, BufferVariable *var)
>-{
>-    LoadShaderVar(stream, var);
>-
>-    var->bufferIndex                   = stream->readInt<int>();
>-    var->blockInfo.offset              = stream->readInt<int>();
>-    var->blockInfo.arrayStride         = stream->readInt<int>();
>-    var->blockInfo.matrixStride        = stream->readInt<int>();
>-    var->blockInfo.isRowMajorMatrix    = stream->readBool();
>-    var->blockInfo.topLevelArrayStride = stream->readInt<int>();
>-    var->topLevelArraySize             = stream->readInt<int>();
>-    var->vertexStaticUse               = stream->readBool();
>-    var->fragmentStaticUse             = stream->readBool();
>-    var->computeStaticUse              = stream->readBool();
>-}
>-
>-void WriteInterfaceBlock(BinaryOutputStream *stream, const InterfaceBlock &block)
>-{
>-    stream->writeString(block.name);
>-    stream->writeString(block.mappedName);
>-    stream->writeInt(block.isArray);
>-    stream->writeInt(block.arrayElement);
>-
>-    WriteShaderVariableBuffer(stream, block);
>-}
>-
>-void LoadInterfaceBlock(BinaryInputStream *stream, InterfaceBlock *block)
>-{
>-    block->name         = stream->readString();
>-    block->mappedName   = stream->readString();
>-    block->isArray      = stream->readBool();
>-    block->arrayElement = stream->readInt<unsigned int>();
>-
>-    LoadShaderVariableBuffer(stream, block);
>-}
>-
> class HashStream final : angle::NonCopyable
> {
>   public:
>@@ -169,7 +55,7 @@ HashStream &operator<<(HashStream &stream, const Shader *shader)
>     return stream;
> }
> 
>-HashStream &operator<<(HashStream &stream, const Program::Bindings &bindings)
>+HashStream &operator<<(HashStream &stream, const ProgramBindings &bindings)
> {
>     for (const auto &binding : bindings)
>     {
>@@ -187,418 +73,33 @@ HashStream &operator<<(HashStream &stream, const std::vector<std::string> &strin
>     return stream;
> }
> 
>-}  // anonymous namespace
>-
>-MemoryProgramCache::MemoryProgramCache(size_t maxCacheSizeBytes)
>-    : mProgramBinaryCache(maxCacheSizeBytes), mIssuedWarnings(0)
>-{
>-}
>-
>-MemoryProgramCache::~MemoryProgramCache()
>-{
>-}
>-
>-// static
>-LinkResult MemoryProgramCache::Deserialize(const Context *context,
>-                                           const Program *program,
>-                                           ProgramState *state,
>-                                           const uint8_t *binary,
>-                                           size_t length,
>-                                           InfoLog &infoLog)
>+HashStream &operator<<(HashStream &stream, const std::vector<gl::VariableLocation> &locations)
> {
>-    BinaryInputStream stream(binary, length);
>-
>-    unsigned char commitString[ANGLE_COMMIT_HASH_SIZE];
>-    stream.readBytes(commitString, ANGLE_COMMIT_HASH_SIZE);
>-    if (memcmp(commitString, ANGLE_COMMIT_HASH, sizeof(unsigned char) * ANGLE_COMMIT_HASH_SIZE) !=
>-        0)
>+    for (const auto &loc : locations)
>     {
>-        infoLog << "Invalid program binary version.";
>-        return false;
>-    }
>-
>-    int majorVersion = stream.readInt<int>();
>-    int minorVersion = stream.readInt<int>();
>-    if (majorVersion != context->getClientMajorVersion() ||
>-        minorVersion != context->getClientMinorVersion())
>-    {
>-        infoLog << "Cannot load program binaries across different ES context versions.";
>-        return false;
>-    }
>-
>-    state->mComputeShaderLocalSize[0] = stream.readInt<int>();
>-    state->mComputeShaderLocalSize[1] = stream.readInt<int>();
>-    state->mComputeShaderLocalSize[2] = stream.readInt<int>();
>-
>-    state->mNumViews = stream.readInt<int>();
>-
>-    static_assert(MAX_VERTEX_ATTRIBS <= sizeof(unsigned long) * 8,
>-                  "Too many vertex attribs for mask");
>-#pragma clang diagnostic push
>-#pragma clang diagnostic ignored "-Wconversion"
>-    state->mActiveAttribLocationsMask = stream.readInt<unsigned long>();
>-#pragma clang diagnostic pop
>-
>-    unsigned int attribCount = stream.readInt<unsigned int>();
>-    ASSERT(state->mAttributes.empty());
>-    for (unsigned int attribIndex = 0; attribIndex < attribCount; ++attribIndex)
>-    {
>-        sh::Attribute attrib;
>-        LoadShaderVar(&stream, &attrib);
>-        attrib.location = stream.readInt<int>();
>-        state->mAttributes.push_back(attrib);
>-    }
>-
>-    unsigned int uniformCount = stream.readInt<unsigned int>();
>-    ASSERT(state->mUniforms.empty());
>-    for (unsigned int uniformIndex = 0; uniformIndex < uniformCount; ++uniformIndex)
>-    {
>-        LinkedUniform uniform;
>-        LoadShaderVar(&stream, &uniform);
>-
>-        uniform.bufferIndex                = stream.readInt<int>();
>-        uniform.blockInfo.offset           = stream.readInt<int>();
>-        uniform.blockInfo.arrayStride      = stream.readInt<int>();
>-        uniform.blockInfo.matrixStride     = stream.readInt<int>();
>-        uniform.blockInfo.isRowMajorMatrix = stream.readBool();
>-
>-        uniform.typeInfo = &GetUniformTypeInfo(uniform.type);
>-
>-        state->mUniforms.push_back(uniform);
>-    }
>-
>-    const unsigned int uniformIndexCount = stream.readInt<unsigned int>();
>-    ASSERT(state->mUniformLocations.empty());
>-    for (unsigned int uniformIndexIndex = 0; uniformIndexIndex < uniformIndexCount;
>-         uniformIndexIndex++)
>-    {
>-        VariableLocation variable;
>-        stream.readInt(&variable.arrayIndex);
>-        stream.readInt(&variable.index);
>-        stream.readBool(&variable.ignored);
>-
>-        state->mUniformLocations.push_back(variable);
>-    }
>-
>-    unsigned int uniformBlockCount = stream.readInt<unsigned int>();
>-    ASSERT(state->mUniformBlocks.empty());
>-    for (unsigned int uniformBlockIndex = 0; uniformBlockIndex < uniformBlockCount;
>-         ++uniformBlockIndex)
>-    {
>-        InterfaceBlock uniformBlock;
>-        LoadInterfaceBlock(&stream, &uniformBlock);
>-        state->mUniformBlocks.push_back(uniformBlock);
>-
>-        state->mActiveUniformBlockBindings.set(uniformBlockIndex, uniformBlock.binding != 0);
>-    }
>-
>-    unsigned int bufferVariableCount = stream.readInt<unsigned int>();
>-    ASSERT(state->mBufferVariables.empty());
>-    for (unsigned int index = 0; index < bufferVariableCount; ++index)
>-    {
>-        BufferVariable bufferVariable;
>-        LoadBufferVariable(&stream, &bufferVariable);
>-        state->mBufferVariables.push_back(bufferVariable);
>-    }
>-
>-    unsigned int shaderStorageBlockCount = stream.readInt<unsigned int>();
>-    ASSERT(state->mShaderStorageBlocks.empty());
>-    for (unsigned int shaderStorageBlockIndex = 0;
>-         shaderStorageBlockIndex < shaderStorageBlockCount; ++shaderStorageBlockIndex)
>-    {
>-        InterfaceBlock shaderStorageBlock;
>-        LoadInterfaceBlock(&stream, &shaderStorageBlock);
>-        state->mShaderStorageBlocks.push_back(shaderStorageBlock);
>-    }
>-
>-    unsigned int atomicCounterBufferCount = stream.readInt<unsigned int>();
>-    ASSERT(state->mAtomicCounterBuffers.empty());
>-    for (unsigned int bufferIndex = 0; bufferIndex < atomicCounterBufferCount; ++bufferIndex)
>-    {
>-        AtomicCounterBuffer atomicCounterBuffer;
>-        LoadShaderVariableBuffer(&stream, &atomicCounterBuffer);
>-
>-        state->mAtomicCounterBuffers.push_back(atomicCounterBuffer);
>-    }
>-
>-    unsigned int transformFeedbackVaryingCount = stream.readInt<unsigned int>();
>-
>-    // Reject programs that use transform feedback varyings if the hardware cannot support them.
>-    if (transformFeedbackVaryingCount > 0 &&
>-        context->getWorkarounds().disableProgramCachingForTransformFeedback)
>-    {
>-        infoLog << "Current driver does not support transform feedback in binary programs.";
>-        return false;
>-    }
>-
>-    ASSERT(state->mLinkedTransformFeedbackVaryings.empty());
>-    for (unsigned int transformFeedbackVaryingIndex = 0;
>-         transformFeedbackVaryingIndex < transformFeedbackVaryingCount;
>-         ++transformFeedbackVaryingIndex)
>-    {
>-        sh::Varying varying;
>-        stream.readIntVector<unsigned int>(&varying.arraySizes);
>-        stream.readInt(&varying.type);
>-        stream.readString(&varying.name);
>-
>-        GLuint arrayIndex = stream.readInt<GLuint>();
>-
>-        state->mLinkedTransformFeedbackVaryings.emplace_back(varying, arrayIndex);
>-    }
>-
>-    stream.readInt(&state->mTransformFeedbackBufferMode);
>-
>-    unsigned int outputCount = stream.readInt<unsigned int>();
>-    ASSERT(state->mOutputVariables.empty());
>-    for (unsigned int outputIndex = 0; outputIndex < outputCount; ++outputIndex)
>-    {
>-        sh::OutputVariable output;
>-        LoadShaderVar(&stream, &output);
>-        output.location = stream.readInt<int>();
>-        state->mOutputVariables.push_back(output);
>-    }
>-
>-    unsigned int outputVarCount = stream.readInt<unsigned int>();
>-    ASSERT(state->mOutputLocations.empty());
>-    for (unsigned int outputIndex = 0; outputIndex < outputVarCount; ++outputIndex)
>-    {
>-        VariableLocation locationData;
>-        stream.readInt(&locationData.arrayIndex);
>-        stream.readInt(&locationData.index);
>-        stream.readBool(&locationData.ignored);
>-        state->mOutputLocations.push_back(locationData);
>-    }
>-
>-    unsigned int outputTypeCount = stream.readInt<unsigned int>();
>-    for (unsigned int outputIndex = 0; outputIndex < outputTypeCount; ++outputIndex)
>-    {
>-        state->mOutputVariableTypes.push_back(stream.readInt<GLenum>());
>-    }
>-    static_assert(IMPLEMENTATION_MAX_DRAW_BUFFERS < 8 * sizeof(uint32_t),
>-                  "All bits of DrawBufferMask can be contained in an uint32_t");
>-    state->mActiveOutputVariables = stream.readInt<uint32_t>();
>-
>-    unsigned int samplerRangeLow  = stream.readInt<unsigned int>();
>-    unsigned int samplerRangeHigh = stream.readInt<unsigned int>();
>-    state->mSamplerUniformRange   = RangeUI(samplerRangeLow, samplerRangeHigh);
>-    unsigned int samplerCount = stream.readInt<unsigned int>();
>-    for (unsigned int samplerIndex = 0; samplerIndex < samplerCount; ++samplerIndex)
>-    {
>-        GLenum textureType  = stream.readInt<GLenum>();
>-        size_t bindingCount = stream.readInt<size_t>();
>-        bool unreferenced   = stream.readBool();
>-        state->mSamplerBindings.emplace_back(
>-            SamplerBinding(textureType, bindingCount, unreferenced));
>-    }
>-
>-    unsigned int imageRangeLow  = stream.readInt<unsigned int>();
>-    unsigned int imageRangeHigh = stream.readInt<unsigned int>();
>-    state->mImageUniformRange   = RangeUI(imageRangeLow, imageRangeHigh);
>-    unsigned int imageBindingCount = stream.readInt<unsigned int>();
>-    for (unsigned int imageIndex = 0; imageIndex < imageBindingCount; ++imageIndex)
>-    {
>-        unsigned int elementCount = stream.readInt<unsigned int>();
>-        ImageBinding imageBinding(elementCount);
>-        for (unsigned int i = 0; i < elementCount; ++i)
>-        {
>-            imageBinding.boundImageUnits[i] = stream.readInt<unsigned int>();
>-        }
>-        state->mImageBindings.emplace_back(imageBinding);
>+        stream << loc.index << loc.arrayIndex << loc.ignored;
>     }
>-
>-    unsigned int atomicCounterRangeLow  = stream.readInt<unsigned int>();
>-    unsigned int atomicCounterRangeHigh = stream.readInt<unsigned int>();
>-    state->mAtomicCounterUniformRange   = RangeUI(atomicCounterRangeLow, atomicCounterRangeHigh);
>-
>-    static_assert(SHADER_TYPE_MAX <= sizeof(unsigned long) * 8, "Too many shader types");
>-#pragma clang diagnostic push
>-#pragma clang diagnostic ignored "-Wconversion"
>-    state->mLinkedShaderStages = stream.readInt<unsigned long>();
>-#pragma clang diagnostic pop
>-
>-    return program->getImplementation()->load(context, infoLog, &stream);
>+    return stream;
> }
> 
>-// static
>-void MemoryProgramCache::Serialize(const Context *context,
>-                                   const gl::Program *program,
>-                                   angle::MemoryBuffer *binaryOut)
>-{
>-    BinaryOutputStream stream;
>-
>-    stream.writeBytes(reinterpret_cast<const unsigned char *>(ANGLE_COMMIT_HASH),
>-                      ANGLE_COMMIT_HASH_SIZE);
>-
>-    // nullptr context is supported when computing binary length.
>-    if (context)
>-    {
>-        stream.writeInt(context->getClientVersion().major);
>-        stream.writeInt(context->getClientVersion().minor);
>-    }
>-    else
>-    {
>-        stream.writeInt(2);
>-        stream.writeInt(0);
>-    }
>-
>-    const auto &state = program->getState();
>-
>-    const auto &computeLocalSize = state.getComputeShaderLocalSize();
>-
>-    stream.writeInt(computeLocalSize[0]);
>-    stream.writeInt(computeLocalSize[1]);
>-    stream.writeInt(computeLocalSize[2]);
>-
>-    stream.writeInt(state.mNumViews);
>-
>-    stream.writeInt(state.getActiveAttribLocationsMask().to_ulong());
>-
>-    stream.writeInt(state.getAttributes().size());
>-    for (const sh::Attribute &attrib : state.getAttributes())
>-    {
>-        WriteShaderVar(&stream, attrib);
>-        stream.writeInt(attrib.location);
>-    }
>-
>-    stream.writeInt(state.getUniforms().size());
>-    for (const LinkedUniform &uniform : state.getUniforms())
>-    {
>-        WriteShaderVar(&stream, uniform);
>-
>-        // FIXME: referenced
>-
>-        stream.writeInt(uniform.bufferIndex);
>-        stream.writeInt(uniform.blockInfo.offset);
>-        stream.writeInt(uniform.blockInfo.arrayStride);
>-        stream.writeInt(uniform.blockInfo.matrixStride);
>-        stream.writeInt(uniform.blockInfo.isRowMajorMatrix);
>-    }
>-
>-    stream.writeInt(state.getUniformLocations().size());
>-    for (const auto &variable : state.getUniformLocations())
>-    {
>-        stream.writeInt(variable.arrayIndex);
>-        stream.writeIntOrNegOne(variable.index);
>-        stream.writeInt(variable.ignored);
>-    }
>-
>-    stream.writeInt(state.getUniformBlocks().size());
>-    for (const InterfaceBlock &uniformBlock : state.getUniformBlocks())
>-    {
>-        WriteInterfaceBlock(&stream, uniformBlock);
>-    }
>-
>-    stream.writeInt(state.getBufferVariables().size());
>-    for (const BufferVariable &bufferVariable : state.getBufferVariables())
>-    {
>-        WriteBufferVariable(&stream, bufferVariable);
>-    }
>-
>-    stream.writeInt(state.getShaderStorageBlocks().size());
>-    for (const InterfaceBlock &shaderStorageBlock : state.getShaderStorageBlocks())
>-    {
>-        WriteInterfaceBlock(&stream, shaderStorageBlock);
>-    }
>-
>-    stream.writeInt(state.mAtomicCounterBuffers.size());
>-    for (const auto &atomicCounterBuffer : state.mAtomicCounterBuffers)
>-    {
>-        WriteShaderVariableBuffer(&stream, atomicCounterBuffer);
>-    }
>-
>-    // Warn the app layer if saving a binary with unsupported transform feedback.
>-    if (!state.getLinkedTransformFeedbackVaryings().empty() &&
>-        context->getWorkarounds().disableProgramCachingForTransformFeedback)
>-    {
>-        WARN() << "Saving program binary with transform feedback, which is not supported on this "
>-                  "driver.";
>-    }
>-
>-    stream.writeInt(state.getLinkedTransformFeedbackVaryings().size());
>-    for (const auto &var : state.getLinkedTransformFeedbackVaryings())
>-    {
>-        stream.writeIntVector(var.arraySizes);
>-        stream.writeInt(var.type);
>-        stream.writeString(var.name);
>-
>-        stream.writeIntOrNegOne(var.arrayIndex);
>-    }
>-
>-    stream.writeInt(state.getTransformFeedbackBufferMode());
>-
>-    stream.writeInt(state.getOutputVariables().size());
>-    for (const sh::OutputVariable &output : state.getOutputVariables())
>-    {
>-        WriteShaderVar(&stream, output);
>-        stream.writeInt(output.location);
>-    }
>-
>-    stream.writeInt(state.getOutputLocations().size());
>-    for (const auto &outputVar : state.getOutputLocations())
>-    {
>-        stream.writeInt(outputVar.arrayIndex);
>-        stream.writeIntOrNegOne(outputVar.index);
>-        stream.writeInt(outputVar.ignored);
>-    }
>-
>-    stream.writeInt(state.mOutputVariableTypes.size());
>-    for (const auto &outputVariableType : state.mOutputVariableTypes)
>-    {
>-        stream.writeInt(outputVariableType);
>-    }
>-
>-    static_assert(IMPLEMENTATION_MAX_DRAW_BUFFERS < 8 * sizeof(uint32_t),
>-                  "All bits of DrawBufferMask can be contained in an uint32_t");
>-    stream.writeInt(static_cast<uint32_t>(state.mActiveOutputVariables.to_ulong()));
>-
>-    stream.writeInt(state.getSamplerUniformRange().low());
>-    stream.writeInt(state.getSamplerUniformRange().high());
>-
>-    stream.writeInt(state.getSamplerBindings().size());
>-    for (const auto &samplerBinding : state.getSamplerBindings())
>-    {
>-        stream.writeInt(samplerBinding.textureType);
>-        stream.writeInt(samplerBinding.boundTextureUnits.size());
>-        stream.writeInt(samplerBinding.unreferenced);
>-    }
>-
>-    stream.writeInt(state.getImageUniformRange().low());
>-    stream.writeInt(state.getImageUniformRange().high());
>-
>-    stream.writeInt(state.getImageBindings().size());
>-    for (const auto &imageBinding : state.getImageBindings())
>-    {
>-        stream.writeInt(imageBinding.boundImageUnits.size());
>-        for (size_t i = 0; i < imageBinding.boundImageUnits.size(); ++i)
>-        {
>-            stream.writeInt(imageBinding.boundImageUnits[i]);
>-        }
>-    }
>-
>-    stream.writeInt(state.getAtomicCounterUniformRange().low());
>-    stream.writeInt(state.getAtomicCounterUniformRange().high());
>-
>-    stream.writeInt(state.getLinkedShaderStages().to_ulong());
>+}  // anonymous namespace
> 
>-    program->getImplementation()->save(context, &stream);
>+MemoryProgramCache::MemoryProgramCache(egl::BlobCache &blobCache)
>+    : mBlobCache(blobCache), mIssuedWarnings(0)
>+{}
> 
>-    ASSERT(binaryOut);
>-    binaryOut->resize(stream.length());
>-    memcpy(binaryOut->data(), stream.data(), stream.length());
>-}
>+MemoryProgramCache::~MemoryProgramCache() {}
> 
>-// static
> void MemoryProgramCache::ComputeHash(const Context *context,
>                                      const Program *program,
>-                                     ProgramHash *hashOut)
>+                                     egl::BlobCache::Key *hashOut)
> {
>-    const Shader *vertexShader   = program->getAttachedVertexShader();
>-    const Shader *fragmentShader = program->getAttachedFragmentShader();
>-    const Shader *computeShader  = program->getAttachedComputeShader();
>-
>     // Compute the program hash. Start with the shader hashes and resource strings.
>     HashStream hashStream;
>-    hashStream << vertexShader << fragmentShader << computeShader;
>+    for (ShaderType shaderType : AllShaderTypes())
>+    {
>+        hashStream << program->getAttachedShader(shaderType);
>+    }
> 
>     // Add some ANGLE metadata and Context properties, such as version and back-end.
>     hashStream << ANGLE_COMMIT_HASH << context->getClientMajorVersion()
>@@ -608,7 +109,9 @@ void MemoryProgramCache::ComputeHash(const Context *context,
>     hashStream << program->getAttributeBindings() << program->getUniformLocationBindings()
>                << program->getFragmentInputBindings()
>                << program->getState().getTransformFeedbackVaryingNames()
>-               << program->getState().getTransformFeedbackBufferMode();
>+               << program->getState().getTransformFeedbackBufferMode()
>+               << program->getState().getOutputLocations()
>+               << program->getState().getSecondaryOutputLocations();
> 
>     // Call the secure SHA hashing function.
>     const std::string &programKey = hashStream.str();
>@@ -616,163 +119,138 @@ void MemoryProgramCache::ComputeHash(const Context *context,
>                                programKey.length(), hashOut->data());
> }
> 
>-LinkResult MemoryProgramCache::getProgram(const Context *context,
>-                                          const Program *program,
>-                                          ProgramState *state,
>-                                          ProgramHash *hashOut)
>+angle::Result MemoryProgramCache::getProgram(const Context *context,
>+                                             Program *program,
>+                                             egl::BlobCache::Key *hashOut)
> {
>+    // If caching is effectively disabled, don't bother calculating the hash.
>+    if (!mBlobCache.isCachingEnabled())
>+    {
>+        return angle::Result::Incomplete;
>+    }
>+
>     ComputeHash(context, program, hashOut);
>-    const angle::MemoryBuffer *binaryProgram = nullptr;
>-    LinkResult result(false);
>-    if (get(*hashOut, &binaryProgram))
>+    egl::BlobCache::Value binaryProgram;
>+    if (get(context, *hashOut, &binaryProgram))
>     {
>-        InfoLog infoLog;
>-        ANGLE_TRY_RESULT(Deserialize(context, program, state, binaryProgram->data(),
>-                                     binaryProgram->size(), infoLog),
>-                         result);
>-        ANGLE_HISTOGRAM_BOOLEAN("GPU.ANGLE.ProgramCache.LoadBinarySuccess", result.getResult());
>-        if (!result.getResult())
>+        angle::Result result = program->loadBinary(context, GL_PROGRAM_BINARY_ANGLE,
>+                                                   binaryProgram.data(), binaryProgram.size());
>+        ANGLE_HISTOGRAM_BOOLEAN("GPU.ANGLE.ProgramCache.LoadBinarySuccess",
>+                                result == angle::Result::Continue);
>+        ANGLE_TRY(result);
>+
>+        if (result == angle::Result::Continue)
>+            return angle::Result::Continue;
>+
>+        // Cache load failed, evict.
>+        if (mIssuedWarnings++ < kWarningLimit)
>         {
>-            // Cache load failed, evict.
>-            if (mIssuedWarnings++ < kWarningLimit)
>-            {
>-                WARN() << "Failed to load binary from cache: " << infoLog.str();
>+            WARN() << "Failed to load binary from cache.";
> 
>-                if (mIssuedWarnings == kWarningLimit)
>-                {
>-                    WARN() << "Reaching warning limit for cache load failures, silencing "
>-                              "subsequent warnings.";
>-                }
>+            if (mIssuedWarnings == kWarningLimit)
>+            {
>+                WARN() << "Reaching warning limit for cache load failures, silencing "
>+                          "subsequent warnings.";
>             }
>-            remove(*hashOut);
>         }
>+        remove(*hashOut);
>     }
>-    return result;
>+    return angle::Result::Incomplete;
> }
> 
>-bool MemoryProgramCache::get(const ProgramHash &programHash, const angle::MemoryBuffer **programOut)
>+bool MemoryProgramCache::get(const Context *context,
>+                             const egl::BlobCache::Key &programHash,
>+                             egl::BlobCache::Value *programOut)
> {
>-    const CacheEntry *entry = nullptr;
>-    if (!mProgramBinaryCache.get(programHash, &entry))
>-    {
>-        ANGLE_HISTOGRAM_ENUMERATION("GPU.ANGLE.ProgramCache.CacheResult", kCacheMiss,
>-                                    kCacheResultMax);
>-        return false;
>-    }
>-
>-    if (entry->second == CacheSource::PutProgram)
>-    {
>-        ANGLE_HISTOGRAM_ENUMERATION("GPU.ANGLE.ProgramCache.CacheResult", kCacheHitMemory,
>-                                    kCacheResultMax);
>-    }
>-    else
>-    {
>-        ANGLE_HISTOGRAM_ENUMERATION("GPU.ANGLE.ProgramCache.CacheResult", kCacheHitDisk,
>-                                    kCacheResultMax);
>-    }
>-
>-    *programOut = &entry->first;
>-    return true;
>+    return mBlobCache.get(context->getScratchBuffer(), programHash, programOut);
> }
> 
> bool MemoryProgramCache::getAt(size_t index,
>-                               ProgramHash *hashOut,
>-                               const angle::MemoryBuffer **programOut)
>+                               const egl::BlobCache::Key **hashOut,
>+                               egl::BlobCache::Value *programOut)
> {
>-    const CacheEntry *entry = nullptr;
>-    if (!mProgramBinaryCache.getAt(index, hashOut, &entry))
>-    {
>-        return false;
>-    }
>-
>-    *programOut = &entry->first;
>-    return true;
>+    return mBlobCache.getAt(index, hashOut, programOut);
> }
> 
>-void MemoryProgramCache::remove(const ProgramHash &programHash)
>+void MemoryProgramCache::remove(const egl::BlobCache::Key &programHash)
> {
>-    bool result = mProgramBinaryCache.eraseByKey(programHash);
>-    ASSERT(result);
>+    mBlobCache.remove(programHash);
> }
> 
>-void MemoryProgramCache::putProgram(const ProgramHash &programHash,
>+void MemoryProgramCache::putProgram(const egl::BlobCache::Key &programHash,
>                                     const Context *context,
>                                     const Program *program)
> {
>-    CacheEntry newEntry;
>-    Serialize(context, program, &newEntry.first);
>-    newEntry.second = CacheSource::PutProgram;
>+    // If caching is effectively disabled, don't bother serializing the program.
>+    if (!mBlobCache.isCachingEnabled())
>+    {
>+        return;
>+    }
>+
>+    angle::MemoryBuffer serializedProgram;
>+    program->serialize(context, &serializedProgram);
> 
>     ANGLE_HISTOGRAM_COUNTS("GPU.ANGLE.ProgramCache.ProgramBinarySizeBytes",
>-                           static_cast<int>(newEntry.first.size()));
>+                           static_cast<int>(serializedProgram.size()));
> 
>-    const CacheEntry *result =
>-        mProgramBinaryCache.put(programHash, std::move(newEntry), newEntry.first.size());
>-    if (!result)
>-    {
>-        ERR() << "Failed to store binary program in memory cache, program is too large.";
>-    }
>-    else
>-    {
>-        auto *platform = ANGLEPlatformCurrent();
>-        platform->cacheProgram(platform, programHash, result->first.size(), result->first.data());
>-    }
>+    // TODO(syoussefi): to be removed.  Compatibility for Chrome until it supports
>+    // EGL_ANDROID_blob_cache. http://anglebug.com/2516
>+    auto *platform = ANGLEPlatformCurrent();
>+    platform->cacheProgram(platform, programHash, serializedProgram.size(),
>+                           serializedProgram.data());
>+
>+    mBlobCache.put(programHash, std::move(serializedProgram));
> }
> 
> void MemoryProgramCache::updateProgram(const Context *context, const Program *program)
> {
>-    gl::ProgramHash programHash;
>+    egl::BlobCache::Key programHash;
>     ComputeHash(context, program, &programHash);
>     putProgram(programHash, context, program);
> }
> 
>-void MemoryProgramCache::putBinary(const ProgramHash &programHash,
>+void MemoryProgramCache::putBinary(const egl::BlobCache::Key &programHash,
>                                    const uint8_t *binary,
>                                    size_t length)
> {
>     // Copy the binary.
>-    CacheEntry newEntry;
>-    newEntry.first.resize(length);
>-    memcpy(newEntry.first.data(), binary, length);
>-    newEntry.second = CacheSource::PutBinary;
>+    angle::MemoryBuffer newEntry;
>+    newEntry.resize(length);
>+    memcpy(newEntry.data(), binary, length);
> 
>     // Store the binary.
>-    const CacheEntry *result = mProgramBinaryCache.put(programHash, std::move(newEntry), length);
>-    if (!result)
>-    {
>-        ERR() << "Failed to store binary program in memory cache, program is too large.";
>-    }
>+    mBlobCache.populate(programHash, std::move(newEntry));
> }
> 
> void MemoryProgramCache::clear()
> {
>-    mProgramBinaryCache.clear();
>+    mBlobCache.clear();
>     mIssuedWarnings = 0;
> }
> 
> void MemoryProgramCache::resize(size_t maxCacheSizeBytes)
> {
>-    mProgramBinaryCache.resize(maxCacheSizeBytes);
>+    mBlobCache.resize(maxCacheSizeBytes);
> }
> 
> size_t MemoryProgramCache::entryCount() const
> {
>-    return mProgramBinaryCache.entryCount();
>+    return mBlobCache.entryCount();
> }
> 
> size_t MemoryProgramCache::trim(size_t limit)
> {
>-    return mProgramBinaryCache.shrinkToSize(limit);
>+    return mBlobCache.trim(limit);
> }
> 
> size_t MemoryProgramCache::size() const
> {
>-    return mProgramBinaryCache.size();
>+    return mBlobCache.size();
> }
> 
> size_t MemoryProgramCache::maxSize() const
> {
>-    return mProgramBinaryCache.maxSize();
>+    return mBlobCache.maxSize();
> }
> 
> }  // namespace gl
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/MemoryProgramCache.h b/Source/ThirdParty/ANGLE/src/libANGLE/MemoryProgramCache.h
>index 044bd48ecc2..106fc243e84 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/MemoryProgramCache.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/MemoryProgramCache.h
>@@ -1,5 +1,5 @@
> //
>-// Copyright 2017 The ANGLE Project Authors. All rights reserved.
>+// Copyright 2017-2018 The ANGLE Project Authors. All rights reserved.
> // Use of this source code is governed by a BSD-style license that can be
> // found in the LICENSE file.
> //
>@@ -13,87 +13,55 @@
> #include <array>
> 
> #include "common/MemoryBuffer.h"
>+#include "libANGLE/BlobCache.h"
> #include "libANGLE/Error.h"
>-#include "libANGLE/SizedMRUCache.h"
>-
>-namespace gl
>-{
>-// 160-bit SHA-1 hash key.
>-constexpr size_t kProgramHashLength = 20;
>-using ProgramHash                   = std::array<uint8_t, kProgramHashLength>;
>-}  // namespace gl
>-
>-namespace std
>-{
>-template <>
>-struct hash<gl::ProgramHash>
>-{
>-    // Simple routine to hash four ints.
>-    size_t operator()(const gl::ProgramHash &programHash) const
>-    {
>-        unsigned int hash = 0;
>-        for (uint32_t num : programHash)
>-        {
>-            hash *= 37;
>-            hash += num;
>-        }
>-        return hash;
>-    }
>-};
>-}  // namespace std
> 
> namespace gl
> {
> class Context;
>-class InfoLog;
> class Program;
> class ProgramState;
> 
> class MemoryProgramCache final : angle::NonCopyable
> {
>   public:
>-    MemoryProgramCache(size_t maxCacheSizeBytes);
>+    explicit MemoryProgramCache(egl::BlobCache &blobCache);
>     ~MemoryProgramCache();
> 
>-    // Writes a program's binary to the output memory buffer.
>-    static void Serialize(const Context *context,
>-                          const Program *program,
>-                          angle::MemoryBuffer *binaryOut);
>-
>-    // Loads program state according to the specified binary blob.
>-    static LinkResult Deserialize(const Context *context,
>-                                  const Program *program,
>-                                  ProgramState *state,
>-                                  const uint8_t *binary,
>-                                  size_t length,
>-                                  InfoLog &infoLog);
>-
>-    static void ComputeHash(const Context *context, const Program *program, ProgramHash *hashOut);
>+    static void ComputeHash(const Context *context,
>+                            const Program *program,
>+                            egl::BlobCache::Key *hashOut);
> 
>     // Check if the cache contains a binary matching the specified program.
>-    bool get(const ProgramHash &programHash, const angle::MemoryBuffer **programOut);
>+    bool get(const Context *context,
>+             const egl::BlobCache::Key &programHash,
>+             egl::BlobCache::Value *programOut);
> 
>     // For querying the contents of the cache.
>-    bool getAt(size_t index, ProgramHash *hashOut, const angle::MemoryBuffer **programOut);
>+    bool getAt(size_t index,
>+               const egl::BlobCache::Key **hashOut,
>+               egl::BlobCache::Value *programOut);
> 
>     // Evict a program from the binary cache.
>-    void remove(const ProgramHash &programHash);
>+    void remove(const egl::BlobCache::Key &programHash);
> 
>     // Helper method that serializes a program.
>-    void putProgram(const ProgramHash &programHash, const Context *context, const Program *program);
>+    void putProgram(const egl::BlobCache::Key &programHash,
>+                    const Context *context,
>+                    const Program *program);
> 
>     // Same as putProgram but computes the hash.
>     void updateProgram(const Context *context, const Program *program);
> 
>-    // Store a binary directly.
>-    void putBinary(const ProgramHash &programHash, const uint8_t *binary, size_t length);
>+    // Store a binary directly.  TODO(syoussefi): deprecated.  Will be removed once Chrome supports
>+    // EGL_ANDROID_blob_cache. http://anglebug.com/2516
>+    void putBinary(const egl::BlobCache::Key &programHash, const uint8_t *binary, size_t length);
> 
>     // Check the cache, and deserialize and load the program if found. Evict existing hash if load
>     // fails.
>-    LinkResult getProgram(const Context *context,
>-                          const Program *program,
>-                          ProgramState *state,
>-                          ProgramHash *hashOut);
>+    angle::Result getProgram(const Context *context,
>+                             Program *program,
>+                             egl::BlobCache::Key *hashOut);
> 
>     // Empty the cache.
>     void clear();
>@@ -114,14 +82,7 @@ class MemoryProgramCache final : angle::NonCopyable
>     size_t maxSize() const;
> 
>   private:
>-    enum class CacheSource
>-    {
>-        PutProgram,
>-        PutBinary,
>-    };
>-
>-    using CacheEntry = std::pair<angle::MemoryBuffer, CacheSource>;
>-    angle::SizedMRUCache<ProgramHash, CacheEntry> mProgramBinaryCache;
>+    egl::BlobCache &mBlobCache;
>     unsigned int mIssuedWarnings;
> };
> 
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/Observer.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/Observer.cpp
>new file mode 100644
>index 00000000000..a209bb70e2b
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/Observer.cpp
>@@ -0,0 +1,101 @@
>+//
>+// Copyright 2018 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// Observer:
>+//   Implements the Observer pattern for sending state change notifications
>+//   from Subject objects to dependent Observer objects.
>+//
>+//   See design document:
>+//   https://docs.google.com/document/d/15Edfotqg6_l1skTEL8ADQudF_oIdNa7i8Po43k6jMd4/
>+
>+#include "libANGLE/Observer.h"
>+
>+#include <algorithm>
>+
>+#include "common/debug.h"
>+
>+namespace angle
>+{
>+namespace
>+{}  // anonymous namespace
>+
>+// Observer implementation.
>+ObserverInterface::~ObserverInterface() = default;
>+
>+// Subject implementation.
>+Subject::Subject() {}
>+
>+Subject::~Subject()
>+{
>+    resetObservers();
>+}
>+
>+bool Subject::hasObservers() const
>+{
>+    return !mObservers.empty();
>+}
>+
>+void Subject::onStateChange(const gl::Context *context, SubjectMessage message) const
>+{
>+    if (mObservers.empty())
>+        return;
>+
>+    for (const ObserverBindingBase *binding : mObservers)
>+    {
>+        binding->getObserver()->onSubjectStateChange(context, binding->getSubjectIndex(), message);
>+    }
>+}
>+
>+void Subject::resetObservers()
>+{
>+    for (angle::ObserverBindingBase *binding : mObservers)
>+    {
>+        binding->onSubjectReset();
>+    }
>+    mObservers.clear();
>+}
>+
>+// ObserverBinding implementation.
>+ObserverBinding::ObserverBinding(ObserverInterface *observer, SubjectIndex index)
>+    : ObserverBindingBase(observer, index), mSubject(nullptr)
>+{
>+    ASSERT(observer);
>+}
>+
>+ObserverBinding::~ObserverBinding()
>+{
>+    reset();
>+}
>+
>+ObserverBinding::ObserverBinding(const ObserverBinding &other) = default;
>+
>+ObserverBinding &ObserverBinding::operator=(const ObserverBinding &other) = default;
>+
>+void ObserverBinding::bind(Subject *subject)
>+{
>+    ASSERT(getObserver());
>+    if (mSubject)
>+    {
>+        mSubject->removeObserver(this);
>+    }
>+
>+    mSubject = subject;
>+
>+    if (mSubject)
>+    {
>+        mSubject->addObserver(this);
>+    }
>+}
>+
>+void ObserverBinding::onStateChange(const gl::Context *context, SubjectMessage message) const
>+{
>+    getObserver()->onSubjectStateChange(context, getSubjectIndex(), message);
>+}
>+
>+void ObserverBinding::onSubjectReset()
>+{
>+    mSubject = nullptr;
>+}
>+}  // namespace angle
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/Observer.h b/Source/ThirdParty/ANGLE/src/libANGLE/Observer.h
>new file mode 100644
>index 00000000000..65efef82984
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/Observer.h
>@@ -0,0 +1,128 @@
>+//
>+// Copyright 2016 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// Observer:
>+//   Implements the Observer pattern for sending state change notifications
>+//   from Subject objects to dependent Observer objects.
>+//
>+//   See design document:
>+//   https://docs.google.com/document/d/15Edfotqg6_l1skTEL8ADQudF_oIdNa7i8Po43k6jMd4/
>+
>+#ifndef LIBANGLE_OBSERVER_H_
>+#define LIBANGLE_OBSERVER_H_
>+
>+#include "common/FastVector.h"
>+#include "common/angleutils.h"
>+
>+namespace gl
>+{
>+class Context;
>+}  // namespace gl
>+
>+namespace angle
>+{
>+template <typename HaystackT, typename NeedleT>
>+bool IsInContainer(const HaystackT &haystack, const NeedleT &needle)
>+{
>+    return std::find(haystack.begin(), haystack.end(), needle) != haystack.end();
>+}
>+
>+using SubjectIndex = size_t;
>+
>+enum class SubjectMessage
>+{
>+    CONTENTS_CHANGED,
>+    STORAGE_CHANGED,
>+    BINDING_CHANGED,
>+    DEPENDENT_DIRTY_BITS,
>+    RESOURCE_MAPPED,
>+    RESOURCE_UNMAPPED,
>+};
>+
>+// The observing class inherits from this interface class.
>+class ObserverInterface
>+{
>+  public:
>+    virtual ~ObserverInterface();
>+    virtual void onSubjectStateChange(const gl::Context *context,
>+                                      SubjectIndex index,
>+                                      SubjectMessage message) = 0;
>+};
>+
>+class ObserverBindingBase
>+{
>+  public:
>+    ObserverBindingBase(ObserverInterface *observer, SubjectIndex subjectIndex)
>+        : mObserver(observer), mIndex(subjectIndex)
>+    {}
>+    virtual ~ObserverBindingBase() {}
>+
>+    ObserverInterface *getObserver() const { return mObserver; }
>+    SubjectIndex getSubjectIndex() const { return mIndex; }
>+
>+    virtual void onSubjectReset() {}
>+
>+  private:
>+    ObserverInterface *mObserver;
>+    SubjectIndex mIndex;
>+};
>+
>+// Maintains a list of observer bindings. Sends update messages to the observer.
>+class Subject : NonCopyable
>+{
>+  public:
>+    Subject();
>+    virtual ~Subject();
>+
>+    void onStateChange(const gl::Context *context, SubjectMessage message) const;
>+    bool hasObservers() const;
>+    void resetObservers();
>+
>+    ANGLE_INLINE void addObserver(ObserverBindingBase *observer)
>+    {
>+        ASSERT(!IsInContainer(mObservers, observer));
>+        mObservers.push_back(observer);
>+    }
>+
>+    ANGLE_INLINE void removeObserver(ObserverBindingBase *observer)
>+    {
>+        ASSERT(IsInContainer(mObservers, observer));
>+        mObservers.remove_and_permute(observer);
>+    }
>+
>+  private:
>+    // Keep a short list of observers so we can allocate/free them quickly. But since we support
>+    // unlimited bindings, have a spill-over list of that uses dynamic allocation.
>+    static constexpr size_t kMaxFixedObservers = 8;
>+    angle::FastVector<ObserverBindingBase *, kMaxFixedObservers> mObservers;
>+};
>+
>+// Keeps a binding between a Subject and Observer, with a specific subject index.
>+class ObserverBinding final : public ObserverBindingBase
>+{
>+  public:
>+    ObserverBinding(ObserverInterface *observer, SubjectIndex index);
>+    ~ObserverBinding() override;
>+    ObserverBinding(const ObserverBinding &other);
>+    ObserverBinding &operator=(const ObserverBinding &other);
>+
>+    void bind(Subject *subject);
>+
>+    ANGLE_INLINE void reset() { bind(nullptr); }
>+
>+    void onStateChange(const gl::Context *context, SubjectMessage message) const;
>+    void onSubjectReset() override;
>+
>+    ANGLE_INLINE const Subject *getSubject() const { return mSubject; }
>+
>+    ANGLE_INLINE void assignSubject(Subject *subject) { mSubject = subject; }
>+
>+  private:
>+    Subject *mSubject;
>+};
>+
>+}  // namespace angle
>+
>+#endif  // LIBANGLE_OBSERVER_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/Observer_unittest.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/Observer_unittest.cpp
>new file mode 100644
>index 00000000000..f0c02c92777
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/Observer_unittest.cpp
>@@ -0,0 +1,43 @@
>+//
>+// Copyright (c) 2016 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// Observer_unittest:
>+//   Unit tests for Observers and related classes.
>+
>+#include <gtest/gtest.h>
>+
>+#include "libANGLE/Observer.h"
>+
>+using namespace angle;
>+using namespace testing;
>+
>+namespace
>+{
>+
>+struct ObserverClass : public ObserverInterface
>+{
>+    void onSubjectStateChange(const gl::Context *context,
>+                              SubjectIndex index,
>+                              SubjectMessage message) override
>+    {
>+        wasNotified = true;
>+    }
>+    bool wasNotified = false;
>+};
>+
>+// Test that Observer/Subject state change notifications work.
>+TEST(ObserverTest, BasicUsage)
>+{
>+    Subject subject;
>+    ObserverClass observer;
>+    ObserverBinding binding(&observer, 0u);
>+
>+    binding.bind(&subject);
>+    ASSERT_FALSE(observer.wasNotified);
>+    subject.onStateChange(nullptr, SubjectMessage::STORAGE_CHANGED);
>+    ASSERT_TRUE(observer.wasNotified);
>+}
>+
>+}  // anonymous namespace
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/PackedGLEnums.h b/Source/ThirdParty/ANGLE/src/libANGLE/PackedGLEnums.h
>deleted file mode 100644
>index 70e32910fcd..00000000000
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/PackedGLEnums.h
>+++ /dev/null
>@@ -1,111 +0,0 @@
>-// Copyright 2017 The ANGLE Project Authors. All rights reserved.
>-// Use of this source code is governed by a BSD-style license that can be
>-// found in the LICENSE file.
>-//
>-// PackedGLEnums_autogen.h:
>-//   Declares ANGLE-specific enums classes for GLEnum and functions operating
>-//   on them.
>-
>-#ifndef LIBANGLE_PACKEDGLENUMS_H_
>-#define LIBANGLE_PACKEDGLENUMS_H_
>-
>-#include "libANGLE/PackedGLEnums_autogen.h"
>-
>-#include <array>
>-#include <cstddef>
>-
>-namespace angle
>-{
>-
>-template <typename E>
>-class EnumIterator final
>-{
>-  private:
>-    using UnderlyingType = typename std::underlying_type<E>::type;
>-
>-  public:
>-    EnumIterator(E value) : mValue(static_cast<UnderlyingType>(value)) {}
>-    EnumIterator &operator++()
>-    {
>-        mValue++;
>-        return *this;
>-    }
>-    bool operator==(const EnumIterator &other) const { return mValue == other.mValue; }
>-    bool operator!=(const EnumIterator &other) const { return mValue != other.mValue; }
>-    E operator*() const { return static_cast<E>(mValue); }
>-
>-  private:
>-    UnderlyingType mValue;
>-};
>-
>-template <typename E>
>-struct AllEnums
>-{
>-    EnumIterator<E> begin() const { return {static_cast<E>(0)}; }
>-    EnumIterator<E> end() const { return {E::InvalidEnum}; }
>-};
>-
>-template <typename E, typename T>
>-class PackedEnumMap
>-{
>-  private:
>-    using UnderlyingType          = typename std::underlying_type<E>::type;
>-    static constexpr size_t kSize = static_cast<UnderlyingType>(E::EnumCount);
>-    using Storage                 = std::array<T, kSize>;
>-
>-    Storage mData;
>-
>-  public:
>-    // types:
>-    using value_type      = T;
>-    using pointer         = T *;
>-    using const_pointer   = const T *;
>-    using reference       = T &;
>-    using const_reference = const T &;
>-
>-    using size_type       = size_t;
>-    using difference_type = ptrdiff_t;
>-
>-    using iterator               = typename Storage::iterator;
>-    using const_iterator         = typename Storage::const_iterator;
>-    using reverse_iterator       = std::reverse_iterator<iterator>;
>-    using const_reverse_iterator = std::reverse_iterator<const_iterator>;
>-
>-    // No explicit construct/copy/destroy for aggregate type
>-    void fill(const T &u) { mData.fill(u); }
>-    void swap(PackedEnumMap<E, T> &a) noexcept { mData.swap(a.mData); }
>-
>-    // iterators:
>-    iterator begin() noexcept { return mData.begin(); }
>-    const_iterator begin() const noexcept { return mData.begin(); }
>-    iterator end() noexcept { return mData.end(); }
>-    const_iterator end() const noexcept { return mData.end(); }
>-
>-    reverse_iterator rbegin() noexcept { return mData.rbegin(); }
>-    const_reverse_iterator rbegin() const noexcept { return mData.rbegin(); }
>-    reverse_iterator rend() noexcept { return mData.rend(); }
>-    const_reverse_iterator rend() const noexcept { return mData.rend(); }
>-
>-    // capacity:
>-    constexpr size_type size() const noexcept { return mData.size(); }
>-    constexpr size_type max_size() const noexcept { return mData.max_size(); }
>-    constexpr bool empty() const noexcept { return mData.empty(); }
>-
>-    // element access:
>-    reference operator[](E n) { return mData[static_cast<UnderlyingType>(n)]; }
>-    const_reference operator[](E n) const { return mData[static_cast<UnderlyingType>(n)]; }
>-    const_reference at(E n) const { return mData.at(static_cast<UnderlyingType>(n)); }
>-    reference at(E n) { return mData.at(static_cast<UnderlyingType>(n)); }
>-
>-    reference front() { return mData.front(); }
>-    const_reference front() const { return mData.front(); }
>-    reference back() { return mData.back(); }
>-    const_reference back() const { return mData.back(); }
>-
>-    T *data() noexcept { return mData.data(); }
>-    const T *data() const noexcept { return mData.data(); }
>-};
>-
>-}  // namespace angle
>-
>-#endif  // LIBANGLE_PACKEDGLENUMS_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/PackedGLEnums_autogen.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/PackedGLEnums_autogen.cpp
>deleted file mode 100644
>index 4959a8ff147..00000000000
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/PackedGLEnums_autogen.cpp
>+++ /dev/null
>@@ -1,174 +0,0 @@
>-// GENERATED FILE - DO NOT EDIT.
>-// Generated by gen_packed_gl_enums.py using data from packed_gl_enums.json.
>-//
>-// Copyright 2017 The ANGLE Project Authors. All rights reserved.
>-// Use of this source code is governed by a BSD-style license that can be
>-// found in the LICENSE file.
>-//
>-// PackedGLEnums_autogen.cpp:
>-//   Implements ANGLE-specific enums classes for GLEnum and functions operating
>-//   on them.
>-
>-#include "libANGLE/PackedGLEnums_autogen.h"
>-#include "common/debug.h"
>-
>-namespace gl
>-{
>-
>-template <>
>-BufferBinding FromGLenum<BufferBinding>(GLenum from)
>-{
>-    switch (from)
>-    {
>-        case GL_ARRAY_BUFFER:
>-            return BufferBinding::Array;
>-        case GL_ATOMIC_COUNTER_BUFFER:
>-            return BufferBinding::AtomicCounter;
>-        case GL_COPY_READ_BUFFER:
>-            return BufferBinding::CopyRead;
>-        case GL_COPY_WRITE_BUFFER:
>-            return BufferBinding::CopyWrite;
>-        case GL_DISPATCH_INDIRECT_BUFFER:
>-            return BufferBinding::DispatchIndirect;
>-        case GL_DRAW_INDIRECT_BUFFER:
>-            return BufferBinding::DrawIndirect;
>-        case GL_ELEMENT_ARRAY_BUFFER:
>-            return BufferBinding::ElementArray;
>-        case GL_PIXEL_PACK_BUFFER:
>-            return BufferBinding::PixelPack;
>-        case GL_PIXEL_UNPACK_BUFFER:
>-            return BufferBinding::PixelUnpack;
>-        case GL_SHADER_STORAGE_BUFFER:
>-            return BufferBinding::ShaderStorage;
>-        case GL_TRANSFORM_FEEDBACK_BUFFER:
>-            return BufferBinding::TransformFeedback;
>-        case GL_UNIFORM_BUFFER:
>-            return BufferBinding::Uniform;
>-        default:
>-            return BufferBinding::InvalidEnum;
>-    }
>-}
>-
>-GLenum ToGLenum(BufferBinding from)
>-{
>-    switch (from)
>-    {
>-        case BufferBinding::Array:
>-            return GL_ARRAY_BUFFER;
>-        case BufferBinding::AtomicCounter:
>-            return GL_ATOMIC_COUNTER_BUFFER;
>-        case BufferBinding::CopyRead:
>-            return GL_COPY_READ_BUFFER;
>-        case BufferBinding::CopyWrite:
>-            return GL_COPY_WRITE_BUFFER;
>-        case BufferBinding::DispatchIndirect:
>-            return GL_DISPATCH_INDIRECT_BUFFER;
>-        case BufferBinding::DrawIndirect:
>-            return GL_DRAW_INDIRECT_BUFFER;
>-        case BufferBinding::ElementArray:
>-            return GL_ELEMENT_ARRAY_BUFFER;
>-        case BufferBinding::PixelPack:
>-            return GL_PIXEL_PACK_BUFFER;
>-        case BufferBinding::PixelUnpack:
>-            return GL_PIXEL_UNPACK_BUFFER;
>-        case BufferBinding::ShaderStorage:
>-            return GL_SHADER_STORAGE_BUFFER;
>-        case BufferBinding::TransformFeedback:
>-            return GL_TRANSFORM_FEEDBACK_BUFFER;
>-        case BufferBinding::Uniform:
>-            return GL_UNIFORM_BUFFER;
>-        default:
>-            UNREACHABLE();
>-            return GL_NONE;
>-    }
>-}
>-
>-template <>
>-BufferUsage FromGLenum<BufferUsage>(GLenum from)
>-{
>-    switch (from)
>-    {
>-        case GL_DYNAMIC_COPY:
>-            return BufferUsage::DynamicCopy;
>-        case GL_DYNAMIC_DRAW:
>-            return BufferUsage::DynamicDraw;
>-        case GL_DYNAMIC_READ:
>-            return BufferUsage::DynamicRead;
>-        case GL_STATIC_COPY:
>-            return BufferUsage::StaticCopy;
>-        case GL_STATIC_DRAW:
>-            return BufferUsage::StaticDraw;
>-        case GL_STATIC_READ:
>-            return BufferUsage::StaticRead;
>-        case GL_STREAM_COPY:
>-            return BufferUsage::StreamCopy;
>-        case GL_STREAM_DRAW:
>-            return BufferUsage::StreamDraw;
>-        case GL_STREAM_READ:
>-            return BufferUsage::StreamRead;
>-        default:
>-            return BufferUsage::InvalidEnum;
>-    }
>-}
>-
>-GLenum ToGLenum(BufferUsage from)
>-{
>-    switch (from)
>-    {
>-        case BufferUsage::DynamicCopy:
>-            return GL_DYNAMIC_COPY;
>-        case BufferUsage::DynamicDraw:
>-            return GL_DYNAMIC_DRAW;
>-        case BufferUsage::DynamicRead:
>-            return GL_DYNAMIC_READ;
>-        case BufferUsage::StaticCopy:
>-            return GL_STATIC_COPY;
>-        case BufferUsage::StaticDraw:
>-            return GL_STATIC_DRAW;
>-        case BufferUsage::StaticRead:
>-            return GL_STATIC_READ;
>-        case BufferUsage::StreamCopy:
>-            return GL_STREAM_COPY;
>-        case BufferUsage::StreamDraw:
>-            return GL_STREAM_DRAW;
>-        case BufferUsage::StreamRead:
>-            return GL_STREAM_READ;
>-        default:
>-            UNREACHABLE();
>-            return GL_NONE;
>-    }
>-}
>-
>-template <>
>-CullFaceMode FromGLenum<CullFaceMode>(GLenum from)
>-{
>-    switch (from)
>-    {
>-        case GL_BACK:
>-            return CullFaceMode::Back;
>-        case GL_FRONT:
>-            return CullFaceMode::Front;
>-        case GL_FRONT_AND_BACK:
>-            return CullFaceMode::FrontAndBack;
>-        default:
>-            return CullFaceMode::InvalidEnum;
>-    }
>-}
>-
>-GLenum ToGLenum(CullFaceMode from)
>-{
>-    switch (from)
>-    {
>-        case CullFaceMode::Back:
>-            return GL_BACK;
>-        case CullFaceMode::Front:
>-            return GL_FRONT;
>-        case CullFaceMode::FrontAndBack:
>-            return GL_FRONT_AND_BACK;
>-        default:
>-            UNREACHABLE();
>-            return GL_NONE;
>-    }
>-}
>-
>-}  // namespace gl
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/PackedGLEnums_autogen.h b/Source/ThirdParty/ANGLE/src/libANGLE/PackedGLEnums_autogen.h
>deleted file mode 100644
>index f3f349ab68e..00000000000
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/PackedGLEnums_autogen.h
>+++ /dev/null
>@@ -1,84 +0,0 @@
>-// GENERATED FILE - DO NOT EDIT.
>-// Generated by gen_packed_gl_enums.py using data from packed_gl_enums.json.
>-//
>-// Copyright 2017 The ANGLE Project Authors. All rights reserved.
>-// Use of this source code is governed by a BSD-style license that can be
>-// found in the LICENSE file.
>-//
>-// PackedGLEnums_autogen.h:
>-//   Declares ANGLE-specific enums classes for GLEnum and functions operating
>-//   on them.
>-
>-#ifndef LIBANGLE_PACKEDGLENUMS_AUTOGEN_H_
>-#define LIBANGLE_PACKEDGLENUMS_AUTOGEN_H_
>-
>-#include <angle_gl.h>
>-
>-#include <cstdint>
>-
>-namespace gl
>-{
>-
>-template <typename Enum>
>-Enum FromGLenum(GLenum from);
>-
>-enum class BufferBinding : uint8_t
>-{
>-    Array             = 0,
>-    AtomicCounter     = 1,
>-    CopyRead          = 2,
>-    CopyWrite         = 3,
>-    DispatchIndirect  = 4,
>-    DrawIndirect      = 5,
>-    ElementArray      = 6,
>-    PixelPack         = 7,
>-    PixelUnpack       = 8,
>-    ShaderStorage     = 9,
>-    TransformFeedback = 10,
>-    Uniform           = 11,
>-
>-    InvalidEnum = 12,
>-    EnumCount   = 12,
>-};
>-
>-template <>
>-BufferBinding FromGLenum<BufferBinding>(GLenum from);
>-GLenum ToGLenum(BufferBinding from);
>-
>-enum class BufferUsage : uint8_t
>-{
>-    DynamicCopy = 0,
>-    DynamicDraw = 1,
>-    DynamicRead = 2,
>-    StaticCopy  = 3,
>-    StaticDraw  = 4,
>-    StaticRead  = 5,
>-    StreamCopy  = 6,
>-    StreamDraw  = 7,
>-    StreamRead  = 8,
>-
>-    InvalidEnum = 9,
>-    EnumCount   = 9,
>-};
>-
>-template <>
>-BufferUsage FromGLenum<BufferUsage>(GLenum from);
>-GLenum ToGLenum(BufferUsage from);
>-
>-enum class CullFaceMode : uint8_t
>-{
>-    Back         = 0,
>-    Front        = 1,
>-    FrontAndBack = 2,
>-
>-    InvalidEnum = 3,
>-    EnumCount   = 3,
>-};
>-
>-template <>
>-CullFaceMode FromGLenum<CullFaceMode>(GLenum from);
>-GLenum ToGLenum(CullFaceMode from);
>-
>-}  // namespace gl
>-
>-#endif  // LIBANGLE_PACKEDGLENUMS_AUTOGEN_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/Path.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/Path.cpp
>index 8f2ce9ef92a..86adae743f8 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/Path.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/Path.cpp
>@@ -10,8 +10,8 @@
> #include "libANGLE/Path.h"
> #include "libANGLE/renderer/PathImpl.h"
> 
>-#include "common/mathutil.h"
> #include "common/debug.h"
>+#include "common/mathutil.h"
> 
> namespace gl
> {
>@@ -24,25 +24,24 @@ Path::Path(rx::PathImpl *impl)
>       mStrokeWidth(1.0f),
>       mStrokeBound(0.2f),
>       mMiterLimit(4.0f)
>-{
>-}
>+{}
> 
> Path::~Path()
> {
>     delete mPath;
> }
> 
>-Error Path::setCommands(GLsizei numCommands,
>-                        const GLubyte *commands,
>-                        GLsizei numCoords,
>-                        GLenum coordType,
>-                        const void *coords)
>+angle::Result Path::setCommands(GLsizei numCommands,
>+                                const GLubyte *commands,
>+                                GLsizei numCoords,
>+                                GLenum coordType,
>+                                const void *coords)
> {
>     ANGLE_TRY(mPath->setCommands(numCommands, commands, numCoords, coordType, coords));
> 
>     mHasData = true;
> 
>-    return NoError();
>+    return angle::Result::Continue;
> }
> 
> void Path::setStrokeWidth(GLfloat width)
>@@ -75,4 +74,4 @@ void Path::setMiterLimit(GLfloat value)
>     mPath->setPathParameter(GL_PATH_MITER_LIMIT_CHROMIUM, value);
> }
> 
>-}  // gl
>+}  // namespace gl
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/Path.h b/Source/ThirdParty/ANGLE/src/libANGLE/Path.h
>index b103c846070..8fb714c4cd9 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/Path.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/Path.h
>@@ -29,11 +29,11 @@ class Path final : angle::NonCopyable
> 
>     ~Path();
> 
>-    Error setCommands(GLsizei numCommands,
>-                      const GLubyte *commands,
>-                      GLsizei numCoords,
>-                      GLenum coordType,
>-                      const void *coords);
>+    angle::Result setCommands(GLsizei numCommands,
>+                              const GLubyte *commands,
>+                              GLsizei numCoords,
>+                              GLenum coordType,
>+                              const void *coords);
> 
>     void setStrokeWidth(GLfloat width);
>     void setStrokeBound(GLfloat bound);
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/Platform.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/Platform.cpp
>index c5128942302..6cbbd1e80dd 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/Platform.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/Platform.cpp
>@@ -15,20 +15,9 @@
> namespace
> {
> // TODO(jmadill): Make methods owned by egl::Display.
>-#if defined(__clang__)
>-#pragma clang diagnostic push
>-#pragma clang diagnostic ignored "-Wglobal-constructors"
>-#endif
>-    angle::PlatformMethods g_platformMethods;
>-#if defined(__clang__)
>-#pragma clang diagnostic pop
>-#endif
>+angle::PlatformMethods g_platformMethods;
> }  // anonymous namespace
> 
>-angle::PlatformMethods::PlatformMethods()
>-{
>-}
>-
> angle::PlatformMethods *ANGLEPlatformCurrent()
> {
>     return &g_platformMethods;
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/Program.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/Program.cpp
>index 9cb7fb768c8..c675165098c 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/Program.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/Program.cpp
>@@ -16,6 +16,7 @@
> #include "common/platform.h"
> #include "common/string_utils.h"
> #include "common/utilities.h"
>+#include "common/version.h"
> #include "compiler/translator/blocklayout.h"
> #include "libANGLE/Context.h"
> #include "libANGLE/MemoryProgramCache.h"
>@@ -23,6 +24,7 @@
> #include "libANGLE/ResourceManager.h"
> #include "libANGLE/Uniform.h"
> #include "libANGLE/VaryingPacking.h"
>+#include "libANGLE/Version.h"
> #include "libANGLE/features.h"
> #include "libANGLE/histogram_macros.h"
> #include "libANGLE/queryconversions.h"
>@@ -192,7 +194,7 @@ bool IncludeSameArrayElement(const std::set<std::string> &nameSet, const std::st
> {
>     std::vector<unsigned int> subscripts;
>     std::string baseName = ParseResourceName(name, &subscripts);
>-    for (const auto& nameInSet : nameSet)
>+    for (const std::string &nameInSet : nameSet)
>     {
>         std::vector<unsigned int> arrayIndices;
>         std::string arrayName = ParseResourceName(nameInSet, &arrayIndices);
>@@ -205,24 +207,88 @@ bool IncludeSameArrayElement(const std::set<std::string> &nameSet, const std::st
>     return false;
> }
> 
>-bool validateInterfaceBlocksCount(GLuint maxInterfaceBlocks,
>+std::string GetInterfaceBlockLimitName(ShaderType shaderType, sh::BlockType blockType)
>+{
>+    std::ostringstream stream;
>+    stream << "GL_MAX_" << GetShaderTypeString(shaderType) << "_";
>+
>+    switch (blockType)
>+    {
>+        case sh::BlockType::BLOCK_UNIFORM:
>+            stream << "UNIFORM_BUFFERS";
>+            break;
>+        case sh::BlockType::BLOCK_BUFFER:
>+            stream << "SHADER_STORAGE_BLOCKS";
>+            break;
>+        default:
>+            UNREACHABLE();
>+            return "";
>+    }
>+
>+    if (shaderType == ShaderType::Geometry)
>+    {
>+        stream << "_EXT";
>+    }
>+
>+    return stream.str();
>+}
>+
>+const char *GetInterfaceBlockTypeString(sh::BlockType blockType)
>+{
>+    switch (blockType)
>+    {
>+        case sh::BlockType::BLOCK_UNIFORM:
>+            return "uniform block";
>+        case sh::BlockType::BLOCK_BUFFER:
>+            return "shader storage block";
>+        default:
>+            UNREACHABLE();
>+            return "";
>+    }
>+}
>+
>+void LogInterfaceBlocksExceedLimit(InfoLog &infoLog,
>+                                   ShaderType shaderType,
>+                                   sh::BlockType blockType,
>+                                   GLuint limit)
>+{
>+    infoLog << GetShaderTypeString(shaderType) << " shader "
>+            << GetInterfaceBlockTypeString(blockType) << " count exceeds "
>+            << GetInterfaceBlockLimitName(shaderType, blockType) << " (" << limit << ")";
>+}
>+
>+bool ValidateInterfaceBlocksCount(GLuint maxInterfaceBlocks,
>                                   const std::vector<sh::InterfaceBlock> &interfaceBlocks,
>-                                  const std::string &errorMessage,
>+                                  ShaderType shaderType,
>+                                  sh::BlockType blockType,
>+                                  GLuint *combinedInterfaceBlocksCount,
>                                   InfoLog &infoLog)
> {
>     GLuint blockCount = 0;
>     for (const sh::InterfaceBlock &block : interfaceBlocks)
>     {
>-        if (block.staticUse || block.layout != sh::BLOCKLAYOUT_PACKED)
>+        if (IsActiveInterfaceBlock(block))
>         {
>-            blockCount += (block.arraySize ? block.arraySize : 1);
>+            blockCount += std::max(block.arraySize, 1u);
>             if (blockCount > maxInterfaceBlocks)
>             {
>-                infoLog << errorMessage << maxInterfaceBlocks << ")";
>+                LogInterfaceBlocksExceedLimit(infoLog, shaderType, blockType, maxInterfaceBlocks);
>                 return false;
>             }
>         }
>     }
>+
>+    // [OpenGL ES 3.1] Chapter 7.6.2 Page 105:
>+    // If a uniform block is used by multiple shader stages, each such use counts separately
>+    // against this combined limit.
>+    // [OpenGL ES 3.1] Chapter 7.8 Page 111:
>+    // If a shader storage block in a program is referenced by multiple shaders, each such
>+    // reference counts separately against this combined limit.
>+    if (combinedInterfaceBlocksCount)
>+    {
>+        *combinedInterfaceBlocksCount += blockCount;
>+    }
>+
>     return true;
> }
> 
>@@ -273,65 +339,395 @@ void GetInterfaceBlockName(const GLuint index,
>     }
> }
> 
>-void InitUniformBlockLinker(const gl::Context *context,
>-                            const ProgramState &state,
>-                            UniformBlockLinker *blockLinker)
>+void InitUniformBlockLinker(const ProgramState &state, UniformBlockLinker *blockLinker)
>+{
>+    for (ShaderType shaderType : AllShaderTypes())
>+    {
>+        Shader *shader = state.getAttachedShader(shaderType);
>+        if (shader)
>+        {
>+            blockLinker->addShaderBlocks(shaderType, &shader->getUniformBlocks());
>+        }
>+    }
>+}
>+
>+void InitShaderStorageBlockLinker(const ProgramState &state, ShaderStorageBlockLinker *blockLinker)
> {
>-    if (state.getAttachedVertexShader())
>+    for (ShaderType shaderType : AllShaderTypes())
>     {
>-        blockLinker->addShaderBlocks(GL_VERTEX_SHADER,
>-                                     &state.getAttachedVertexShader()->getUniformBlocks(context));
>+        Shader *shader = state.getAttachedShader(shaderType);
>+        if (shader != nullptr)
>+        {
>+            blockLinker->addShaderBlocks(shaderType, &shader->getShaderStorageBlocks());
>+        }
>     }
>+}
> 
>-    if (state.getAttachedFragmentShader())
>+// Find the matching varying or field by name.
>+const sh::ShaderVariable *FindVaryingOrField(const ProgramMergedVaryings &varyings,
>+                                             const std::string &name)
>+{
>+    const sh::ShaderVariable *var = nullptr;
>+    for (const auto &ref : varyings)
>     {
>-        blockLinker->addShaderBlocks(GL_FRAGMENT_SHADER,
>-                                     &state.getAttachedFragmentShader()->getUniformBlocks(context));
>+        const sh::Varying *varying = ref.second.get();
>+        if (varying->name == name)
>+        {
>+            var = varying;
>+            break;
>+        }
>+        var = FindShaderVarField(*varying, name);
>+        if (var != nullptr)
>+        {
>+            break;
>+        }
>     }
>+    return var;
>+}
> 
>-    if (state.getAttachedComputeShader())
>+void AddParentPrefix(const std::string &parentName, std::string *mismatchedFieldName)
>+{
>+    ASSERT(mismatchedFieldName);
>+    if (mismatchedFieldName->empty())
>+    {
>+        *mismatchedFieldName = parentName;
>+    }
>+    else
>     {
>-        blockLinker->addShaderBlocks(GL_COMPUTE_SHADER,
>-                                     &state.getAttachedComputeShader()->getUniformBlocks(context));
>+        std::ostringstream stream;
>+        stream << parentName << "." << *mismatchedFieldName;
>+        *mismatchedFieldName = stream.str();
>+    }
>+}
>+
>+const char *GetLinkMismatchErrorString(LinkMismatchError linkError)
>+{
>+    switch (linkError)
>+    {
>+        case LinkMismatchError::TYPE_MISMATCH:
>+            return "Type";
>+        case LinkMismatchError::ARRAY_SIZE_MISMATCH:
>+            return "Array size";
>+        case LinkMismatchError::PRECISION_MISMATCH:
>+            return "Precision";
>+        case LinkMismatchError::STRUCT_NAME_MISMATCH:
>+            return "Structure name";
>+        case LinkMismatchError::FIELD_NUMBER_MISMATCH:
>+            return "Field number";
>+        case LinkMismatchError::FIELD_NAME_MISMATCH:
>+            return "Field name";
>+
>+        case LinkMismatchError::INTERPOLATION_TYPE_MISMATCH:
>+            return "Interpolation type";
>+        case LinkMismatchError::INVARIANCE_MISMATCH:
>+            return "Invariance";
>+
>+        case LinkMismatchError::BINDING_MISMATCH:
>+            return "Binding layout qualifier";
>+        case LinkMismatchError::LOCATION_MISMATCH:
>+            return "Location layout qualifier";
>+        case LinkMismatchError::OFFSET_MISMATCH:
>+            return "Offset layout qualilfier";
>+
>+        case LinkMismatchError::LAYOUT_QUALIFIER_MISMATCH:
>+            return "Layout qualifier";
>+        case LinkMismatchError::MATRIX_PACKING_MISMATCH:
>+            return "Matrix Packing";
>+        default:
>+            UNREACHABLE();
>+            return "";
>     }
> }
> 
>-void InitShaderStorageBlockLinker(const gl::Context *context,
>-                                  const ProgramState &state,
>-                                  ShaderStorageBlockLinker *blockLinker)
>+LinkMismatchError LinkValidateInterfaceBlockFields(const sh::InterfaceBlockField &blockField1,
>+                                                   const sh::InterfaceBlockField &blockField2,
>+                                                   bool webglCompatibility,
>+                                                   std::string *mismatchedBlockFieldName)
> {
>-    if (state.getAttachedVertexShader())
>+    if (blockField1.name != blockField2.name)
>     {
>-        blockLinker->addShaderBlocks(
>-            GL_VERTEX_SHADER, &state.getAttachedVertexShader()->getShaderStorageBlocks(context));
>+        return LinkMismatchError::FIELD_NAME_MISMATCH;
>     }
> 
>-    if (state.getAttachedFragmentShader())
>+    // If webgl, validate precision of UBO fields, otherwise don't.  See Khronos bug 10287.
>+    LinkMismatchError linkError = Program::LinkValidateVariablesBase(
>+        blockField1, blockField2, webglCompatibility, true, mismatchedBlockFieldName);
>+    if (linkError != LinkMismatchError::NO_MISMATCH)
>     {
>-        blockLinker->addShaderBlocks(
>-            GL_FRAGMENT_SHADER,
>-            &state.getAttachedFragmentShader()->getShaderStorageBlocks(context));
>+        AddParentPrefix(blockField1.name, mismatchedBlockFieldName);
>+        return linkError;
>     }
> 
>-    if (state.getAttachedComputeShader())
>+    if (blockField1.isRowMajorLayout != blockField2.isRowMajorLayout)
>     {
>-        blockLinker->addShaderBlocks(
>-            GL_COMPUTE_SHADER, &state.getAttachedComputeShader()->getShaderStorageBlocks(context));
>+        AddParentPrefix(blockField1.name, mismatchedBlockFieldName);
>+        return LinkMismatchError::MATRIX_PACKING_MISMATCH;
>     }
>+
>+    return LinkMismatchError::NO_MISMATCH;
> }
> 
>-}  // anonymous namespace
>+LinkMismatchError AreMatchingInterfaceBlocks(const sh::InterfaceBlock &interfaceBlock1,
>+                                             const sh::InterfaceBlock &interfaceBlock2,
>+                                             bool webglCompatibility,
>+                                             std::string *mismatchedBlockFieldName)
>+{
>+    // validate blocks for the same member types
>+    if (interfaceBlock1.fields.size() != interfaceBlock2.fields.size())
>+    {
>+        return LinkMismatchError::FIELD_NUMBER_MISMATCH;
>+    }
>+    if (interfaceBlock1.arraySize != interfaceBlock2.arraySize)
>+    {
>+        return LinkMismatchError::ARRAY_SIZE_MISMATCH;
>+    }
>+    if (interfaceBlock1.layout != interfaceBlock2.layout ||
>+        interfaceBlock1.binding != interfaceBlock2.binding)
>+    {
>+        return LinkMismatchError::LAYOUT_QUALIFIER_MISMATCH;
>+    }
>+    const unsigned int numBlockMembers = static_cast<unsigned int>(interfaceBlock1.fields.size());
>+    for (unsigned int blockMemberIndex = 0; blockMemberIndex < numBlockMembers; blockMemberIndex++)
>+    {
>+        const sh::InterfaceBlockField &member1 = interfaceBlock1.fields[blockMemberIndex];
>+        const sh::InterfaceBlockField &member2 = interfaceBlock2.fields[blockMemberIndex];
> 
>-const char *const g_fakepath = "C:\\fakepath";
>+        LinkMismatchError linkError = LinkValidateInterfaceBlockFields(
>+            member1, member2, webglCompatibility, mismatchedBlockFieldName);
>+        if (linkError != LinkMismatchError::NO_MISMATCH)
>+        {
>+            return linkError;
>+        }
>+    }
>+    return LinkMismatchError::NO_MISMATCH;
>+}
>+
>+using ShaderInterfaceBlock = std::pair<ShaderType, const sh::InterfaceBlock *>;
>+using InterfaceBlockMap    = std::map<std::string, ShaderInterfaceBlock>;
>+
>+void InitializeInterfaceBlockMap(const std::vector<sh::InterfaceBlock> &interfaceBlocks,
>+                                 ShaderType shaderType,
>+                                 InterfaceBlockMap *linkedInterfaceBlocks)
>+{
>+    ASSERT(linkedInterfaceBlocks);
>+
>+    for (const sh::InterfaceBlock &interfaceBlock : interfaceBlocks)
>+    {
>+        (*linkedInterfaceBlocks)[interfaceBlock.name] = std::make_pair(shaderType, &interfaceBlock);
>+    }
>+}
>+
>+bool ValidateGraphicsInterfaceBlocksPerShader(
>+    const std::vector<sh::InterfaceBlock> &interfaceBlocksToLink,
>+    ShaderType shaderType,
>+    bool webglCompatibility,
>+    InterfaceBlockMap *linkedBlocks,
>+    InfoLog &infoLog)
>+{
>+    ASSERT(linkedBlocks);
>+
>+    for (const sh::InterfaceBlock &block : interfaceBlocksToLink)
>+    {
>+        const auto &entry = linkedBlocks->find(block.name);
>+        if (entry != linkedBlocks->end())
>+        {
>+            const sh::InterfaceBlock &linkedBlock = *(entry->second.second);
>+            std::string mismatchedStructFieldName;
>+            LinkMismatchError linkError = AreMatchingInterfaceBlocks(
>+                block, linkedBlock, webglCompatibility, &mismatchedStructFieldName);
>+            if (linkError != LinkMismatchError::NO_MISMATCH)
>+            {
>+                LogLinkMismatch(infoLog, block.name, GetInterfaceBlockTypeString(block.blockType),
>+                                linkError, mismatchedStructFieldName, entry->second.first,
>+                                shaderType);
>+                return false;
>+            }
>+        }
>+        else
>+        {
>+            (*linkedBlocks)[block.name] = std::make_pair(shaderType, &block);
>+        }
>+    }
>+
>+    return true;
>+}
>+
>+bool ValidateInterfaceBlocksMatch(
>+    GLuint numShadersHasInterfaceBlocks,
>+    const ShaderMap<const std::vector<sh::InterfaceBlock> *> &shaderInterfaceBlocks,
>+    InfoLog &infoLog,
>+    bool webglCompatibility)
>+{
>+    if (numShadersHasInterfaceBlocks < 2u)
>+    {
>+        return true;
>+    }
>+
>+    ASSERT(!shaderInterfaceBlocks[ShaderType::Compute]);
>+
>+    // Check that interface blocks defined in the graphics shaders are identical
>+
>+    InterfaceBlockMap linkedInterfaceBlocks;
>+
>+    bool interfaceBlockMapInitialized = false;
>+    for (ShaderType shaderType : kAllGraphicsShaderTypes)
>+    {
>+        if (!shaderInterfaceBlocks[shaderType])
>+        {
>+            continue;
>+        }
>+
>+        if (!interfaceBlockMapInitialized)
>+        {
>+            InitializeInterfaceBlockMap(*shaderInterfaceBlocks[shaderType], shaderType,
>+                                        &linkedInterfaceBlocks);
>+            interfaceBlockMapInitialized = true;
>+        }
>+        else if (!ValidateGraphicsInterfaceBlocksPerShader(*shaderInterfaceBlocks[shaderType],
>+                                                           shaderType, webglCompatibility,
>+                                                           &linkedInterfaceBlocks, infoLog))
>+        {
>+            return false;
>+        }
>+    }
>+
>+    return true;
>+}
>+
>+void WriteShaderVar(BinaryOutputStream *stream, const sh::ShaderVariable &var)
>+{
>+    stream->writeInt(var.type);
>+    stream->writeInt(var.precision);
>+    stream->writeString(var.name);
>+    stream->writeString(var.mappedName);
>+    stream->writeIntVector(var.arraySizes);
>+    stream->writeInt(var.staticUse);
>+    stream->writeInt(var.active);
>+    stream->writeString(var.structName);
>+    ASSERT(var.fields.empty());
>+}
>+
>+void LoadShaderVar(BinaryInputStream *stream, sh::ShaderVariable *var)
>+{
>+    var->type       = stream->readInt<GLenum>();
>+    var->precision  = stream->readInt<GLenum>();
>+    var->name       = stream->readString();
>+    var->mappedName = stream->readString();
>+    stream->readIntVector<unsigned int>(&var->arraySizes);
>+    var->staticUse  = stream->readBool();
>+    var->active     = stream->readBool();
>+    var->structName = stream->readString();
>+}
>+
>+void WriteShaderVariableBuffer(BinaryOutputStream *stream, const ShaderVariableBuffer &var)
>+{
>+    stream->writeInt(var.binding);
>+    stream->writeInt(var.dataSize);
>+
>+    for (ShaderType shaderType : AllShaderTypes())
>+    {
>+        stream->writeInt(var.isActive(shaderType));
>+    }
>+
>+    stream->writeInt(var.memberIndexes.size());
>+    for (unsigned int memberCounterIndex : var.memberIndexes)
>+    {
>+        stream->writeInt(memberCounterIndex);
>+    }
>+}
>+
>+void LoadShaderVariableBuffer(BinaryInputStream *stream, ShaderVariableBuffer *var)
>+{
>+    var->binding  = stream->readInt<int>();
>+    var->dataSize = stream->readInt<unsigned int>();
>+
>+    for (ShaderType shaderType : AllShaderTypes())
>+    {
>+        var->setActive(shaderType, stream->readBool());
>+    }
>+
>+    unsigned int numMembers = stream->readInt<unsigned int>();
>+    for (unsigned int blockMemberIndex = 0; blockMemberIndex < numMembers; blockMemberIndex++)
>+    {
>+        var->memberIndexes.push_back(stream->readInt<unsigned int>());
>+    }
>+}
>+
>+void WriteBufferVariable(BinaryOutputStream *stream, const BufferVariable &var)
>+{
>+    WriteShaderVar(stream, var);
> 
>-InfoLog::InfoLog()
>+    stream->writeInt(var.bufferIndex);
>+    stream->writeInt(var.blockInfo.offset);
>+    stream->writeInt(var.blockInfo.arrayStride);
>+    stream->writeInt(var.blockInfo.matrixStride);
>+    stream->writeInt(var.blockInfo.isRowMajorMatrix);
>+    stream->writeInt(var.blockInfo.topLevelArrayStride);
>+    stream->writeInt(var.topLevelArraySize);
>+
>+    for (ShaderType shaderType : AllShaderTypes())
>+    {
>+        stream->writeInt(var.isActive(shaderType));
>+    }
>+}
>+
>+void LoadBufferVariable(BinaryInputStream *stream, BufferVariable *var)
>+{
>+    LoadShaderVar(stream, var);
>+
>+    var->bufferIndex                   = stream->readInt<int>();
>+    var->blockInfo.offset              = stream->readInt<int>();
>+    var->blockInfo.arrayStride         = stream->readInt<int>();
>+    var->blockInfo.matrixStride        = stream->readInt<int>();
>+    var->blockInfo.isRowMajorMatrix    = stream->readBool();
>+    var->blockInfo.topLevelArrayStride = stream->readInt<int>();
>+    var->topLevelArraySize             = stream->readInt<int>();
>+
>+    for (ShaderType shaderType : AllShaderTypes())
>+    {
>+        var->setActive(shaderType, stream->readBool());
>+    }
>+}
>+
>+void WriteInterfaceBlock(BinaryOutputStream *stream, const InterfaceBlock &block)
> {
>+    stream->writeString(block.name);
>+    stream->writeString(block.mappedName);
>+    stream->writeInt(block.isArray);
>+    stream->writeInt(block.arrayElement);
>+
>+    WriteShaderVariableBuffer(stream, block);
> }
> 
>-InfoLog::~InfoLog()
>+void LoadInterfaceBlock(BinaryInputStream *stream, InterfaceBlock *block)
> {
>+    block->name         = stream->readString();
>+    block->mappedName   = stream->readString();
>+    block->isArray      = stream->readBool();
>+    block->arrayElement = stream->readInt<unsigned int>();
>+
>+    LoadShaderVariableBuffer(stream, block);
> }
> 
>+}  // anonymous namespace
>+
>+// Saves the linking context for later use in resolveLink().
>+struct Program::LinkingState
>+{
>+    const Context *context;
>+    std::unique_ptr<ProgramLinkedResources> resources;
>+    egl::BlobCache::Key programHash;
>+    std::unique_ptr<rx::LinkEvent> linkEvent;
>+    bool linkingFromBinary;
>+};
>+
>+const char *const g_fakepath = "C:\\fakepath";
>+
>+// InfoLog implementation.
>+InfoLog::InfoLog() {}
>+
>+InfoLog::~InfoLog() {}
>+
> size_t InfoLog::getLength() const
> {
>     if (!mLazyStream)
>@@ -383,68 +779,112 @@ void InfoLog::appendSanitized(const char *message)
>         {
>             msg.erase(found, strlen(g_fakepath));
>         }
>-    }
>-    while (found != std::string::npos);
>+    } while (found != std::string::npos);
> 
>     *mLazyStream << message << std::endl;
> }
> 
> void InfoLog::reset()
> {
>+    if (mLazyStream)
>+    {
>+        mLazyStream.reset(nullptr);
>+    }
>+}
>+
>+bool InfoLog::empty() const
>+{
>+    if (!mLazyStream)
>+    {
>+        return true;
>+    }
>+
>+    return mLazyStream->rdbuf()->in_avail() == 0;
>+}
>+
>+void LogLinkMismatch(InfoLog &infoLog,
>+                     const std::string &variableName,
>+                     const char *variableType,
>+                     LinkMismatchError linkError,
>+                     const std::string &mismatchedStructOrBlockFieldName,
>+                     ShaderType shaderType1,
>+                     ShaderType shaderType2)
>+{
>+    std::ostringstream stream;
>+    stream << GetLinkMismatchErrorString(linkError) << "s of " << variableType << " '"
>+           << variableName;
>+
>+    if (!mismatchedStructOrBlockFieldName.empty())
>+    {
>+        stream << "' member '" << variableName << "." << mismatchedStructOrBlockFieldName;
>+    }
>+
>+    stream << "' differ between " << GetShaderTypeString(shaderType1) << " and "
>+           << GetShaderTypeString(shaderType2) << " shaders.";
>+
>+    infoLog << stream.str();
> }
> 
>-VariableLocation::VariableLocation() : arrayIndex(0), index(kUnused), ignored(false)
>+bool IsActiveInterfaceBlock(const sh::InterfaceBlock &interfaceBlock)
> {
>+    // Only 'packed' blocks are allowed to be considered inactive.
>+    return interfaceBlock.active || interfaceBlock.layout != sh::BLOCKLAYOUT_PACKED;
> }
> 
>+// VariableLocation implementation.
>+VariableLocation::VariableLocation() : arrayIndex(0), index(kUnused), ignored(false) {}
>+
> VariableLocation::VariableLocation(unsigned int arrayIndex, unsigned int index)
>     : arrayIndex(arrayIndex), index(index), ignored(false)
> {
>     ASSERT(arrayIndex != GL_INVALID_INDEX);
> }
> 
>-SamplerBinding::SamplerBinding(GLenum textureTypeIn, size_t elementCount, bool unreferenced)
>-    : textureType(textureTypeIn), boundTextureUnits(elementCount, 0), unreferenced(unreferenced)
>-{
>-}
>+// SamplerBindings implementation.
>+SamplerBinding::SamplerBinding(TextureType textureTypeIn,
>+                               SamplerFormat formatIn,
>+                               size_t elementCount,
>+                               bool unreferenced)
>+    : textureType(textureTypeIn),
>+      format(formatIn),
>+      boundTextureUnits(elementCount, 0),
>+      unreferenced(unreferenced)
>+{}
> 
> SamplerBinding::SamplerBinding(const SamplerBinding &other) = default;
> 
> SamplerBinding::~SamplerBinding() = default;
> 
>-Program::Bindings::Bindings()
>-{
>-}
>+// ProgramBindings implementation.
>+ProgramBindings::ProgramBindings() {}
> 
>-Program::Bindings::~Bindings()
>-{
>-}
>+ProgramBindings::~ProgramBindings() {}
> 
>-void Program::Bindings::bindLocation(GLuint index, const std::string &name)
>+void ProgramBindings::bindLocation(GLuint index, const std::string &name)
> {
>     mBindings[name] = index;
> }
> 
>-int Program::Bindings::getBinding(const std::string &name) const
>+int ProgramBindings::getBinding(const std::string &name) const
> {
>     auto iter = mBindings.find(name);
>     return (iter != mBindings.end()) ? iter->second : -1;
> }
> 
>-Program::Bindings::const_iterator Program::Bindings::begin() const
>+ProgramBindings::const_iterator ProgramBindings::begin() const
> {
>     return mBindings.begin();
> }
> 
>-Program::Bindings::const_iterator Program::Bindings::end() const
>+ProgramBindings::const_iterator ProgramBindings::end() const
> {
>     return mBindings.end();
> }
> 
>-ImageBinding::ImageBinding(size_t count) : boundImageUnits(count, 0)
>-{
>-}
>-ImageBinding::ImageBinding(GLuint imageUnit, size_t count)
>+// ImageBinding implementation.
>+ImageBinding::ImageBinding(size_t count) : boundImageUnits(count, 0), unreferenced(false) {}
>+ImageBinding::ImageBinding(GLuint imageUnit, size_t count, bool unreferenced)
>+    : unreferenced(unreferenced)
> {
>     for (size_t index = 0; index < count; ++index)
>     {
>@@ -456,27 +896,32 @@ ImageBinding::ImageBinding(const ImageBinding &other) = default;
> 
> ImageBinding::~ImageBinding() = default;
> 
>+// ProgramState implementation.
> ProgramState::ProgramState()
>     : mLabel(),
>-      mAttachedFragmentShader(nullptr),
>-      mAttachedVertexShader(nullptr),
>-      mAttachedComputeShader(nullptr),
>-      mAttachedGeometryShader(nullptr),
>+      mAttachedShaders({}),
>       mTransformFeedbackBufferMode(GL_INTERLEAVED_ATTRIBS),
>       mMaxActiveAttribLocation(0),
>       mSamplerUniformRange(0, 0),
>       mImageUniformRange(0, 0),
>       mAtomicCounterUniformRange(0, 0),
>       mBinaryRetrieveableHint(false),
>-      mNumViews(-1)
>+      mNumViews(-1),
>+      // [GL_EXT_geometry_shader] Table 20.22
>+      mGeometryShaderInputPrimitiveType(PrimitiveMode::Triangles),
>+      mGeometryShaderOutputPrimitiveType(PrimitiveMode::TriangleStrip),
>+      mGeometryShaderInvocations(1),
>+      mGeometryShaderMaxVertices(0),
>+      mDrawIDLocation(-1),
>+      mActiveSamplerRefCounts{}
> {
>     mComputeShaderLocalSize.fill(1);
>+    mActiveSamplerTypes.fill(TextureType::InvalidEnum);
> }
> 
> ProgramState::~ProgramState()
> {
>-    ASSERT(!mAttachedVertexShader && !mAttachedFragmentShader && !mAttachedComputeShader &&
>-           !mAttachedGeometryShader);
>+    ASSERT(!hasAttachedShader());
> }
> 
> const std::string &ProgramState::getLabel()
>@@ -484,6 +929,12 @@ const std::string &ProgramState::getLabel()
>     return mLabel;
> }
> 
>+Shader *ProgramState::getAttachedShader(ShaderType shaderType) const
>+{
>+    ASSERT(shaderType != ShaderType::InvalidEnum);
>+    return mAttachedShaders[shaderType];
>+}
>+
> GLuint ProgramState::getUniformIndexFromName(const std::string &name) const
> {
>     return GetResourceIndexFromName(mUniforms, name);
>@@ -522,6 +973,17 @@ GLuint ProgramState::getSamplerIndexFromUniformIndex(GLuint uniformIndex) const
>     return uniformIndex - mSamplerUniformRange.low();
> }
> 
>+bool ProgramState::isImageUniformIndex(GLuint index) const
>+{
>+    return mImageUniformRange.contains(index);
>+}
>+
>+GLuint ProgramState::getImageIndexFromUniformIndex(GLuint uniformIndex) const
>+{
>+    ASSERT(isImageUniformIndex(uniformIndex));
>+    return uniformIndex - mImageUniformRange.low();
>+}
>+
> GLuint ProgramState::getAttributeLocation(const std::string &name) const
> {
>     for (const sh::Attribute &attribute : mAttributes)
>@@ -535,10 +997,23 @@ GLuint ProgramState::getAttributeLocation(const std::string &name) const
>     return static_cast<GLuint>(-1);
> }
> 
>+bool ProgramState::hasAttachedShader() const
>+{
>+    for (const Shader *shader : mAttachedShaders)
>+    {
>+        if (shader)
>+        {
>+            return true;
>+        }
>+    }
>+    return false;
>+}
>+
> Program::Program(rx::GLImplFactory *factory, ShaderProgramManager *manager, GLuint handle)
>     : mProgram(factory->createProgram(mState)),
>       mValidated(false),
>       mLinked(false),
>+      mLinkResolved(true),
>       mDeleteStatus(false),
>       mRefCount(0),
>       mResourceManager(manager),
>@@ -556,155 +1031,123 @@ Program::~Program()
> 
> void Program::onDestroy(const Context *context)
> {
>-    if (mState.mAttachedVertexShader != nullptr)
>-    {
>-        mState.mAttachedVertexShader->release(context);
>-        mState.mAttachedVertexShader = nullptr;
>-    }
>-
>-    if (mState.mAttachedFragmentShader != nullptr)
>-    {
>-        mState.mAttachedFragmentShader->release(context);
>-        mState.mAttachedFragmentShader = nullptr;
>-    }
>-
>-    if (mState.mAttachedComputeShader != nullptr)
>-    {
>-        mState.mAttachedComputeShader->release(context);
>-        mState.mAttachedComputeShader = nullptr;
>-    }
>-
>-    if (mState.mAttachedGeometryShader != nullptr)
>+    resolveLink(context);
>+    for (ShaderType shaderType : AllShaderTypes())
>     {
>-        mState.mAttachedGeometryShader->release(context);
>-        mState.mAttachedGeometryShader = nullptr;
>+        if (mState.mAttachedShaders[shaderType])
>+        {
>+            mState.mAttachedShaders[shaderType]->release(context);
>+            mState.mAttachedShaders[shaderType] = nullptr;
>+        }
>     }
> 
>     mProgram->destroy(context);
> 
>-    ASSERT(!mState.mAttachedVertexShader && !mState.mAttachedFragmentShader &&
>-           !mState.mAttachedComputeShader && !mState.mAttachedGeometryShader);
>+    ASSERT(!mState.hasAttachedShader());
>     SafeDelete(mProgram);
> 
>     delete this;
> }
>+GLuint Program::id() const
>+{
>+    ASSERT(mLinkResolved);
>+    return mHandle;
>+}
> 
>-void Program::setLabel(const std::string &label)
>+void Program::setLabel(const Context *context, const std::string &label)
> {
>+    ASSERT(mLinkResolved);
>     mState.mLabel = label;
> }
> 
> const std::string &Program::getLabel() const
> {
>+    ASSERT(mLinkResolved);
>     return mState.mLabel;
> }
> 
> void Program::attachShader(Shader *shader)
> {
>-    switch (shader->getType())
>-    {
>-        case GL_VERTEX_SHADER:
>-        {
>-            ASSERT(!mState.mAttachedVertexShader);
>-            mState.mAttachedVertexShader = shader;
>-            mState.mAttachedVertexShader->addRef();
>-            break;
>-        }
>-        case GL_FRAGMENT_SHADER:
>-        {
>-            ASSERT(!mState.mAttachedFragmentShader);
>-            mState.mAttachedFragmentShader = shader;
>-            mState.mAttachedFragmentShader->addRef();
>-            break;
>-        }
>-        case GL_COMPUTE_SHADER:
>-        {
>-            ASSERT(!mState.mAttachedComputeShader);
>-            mState.mAttachedComputeShader = shader;
>-            mState.mAttachedComputeShader->addRef();
>-            break;
>-        }
>-        case GL_GEOMETRY_SHADER_EXT:
>-        {
>-            ASSERT(!mState.mAttachedGeometryShader);
>-            mState.mAttachedGeometryShader = shader;
>-            mState.mAttachedGeometryShader->addRef();
>-            break;
>-        }
>-        default:
>-            UNREACHABLE();
>-    }
>+    ASSERT(mLinkResolved);
>+    ShaderType shaderType = shader->getType();
>+    ASSERT(shaderType != ShaderType::InvalidEnum);
>+
>+    mState.mAttachedShaders[shaderType] = shader;
>+    mState.mAttachedShaders[shaderType]->addRef();
> }
> 
> void Program::detachShader(const Context *context, Shader *shader)
> {
>-    switch (shader->getType())
>+    ASSERT(mLinkResolved);
>+    ShaderType shaderType = shader->getType();
>+    ASSERT(shaderType != ShaderType::InvalidEnum);
>+
>+    ASSERT(mState.mAttachedShaders[shaderType] == shader);
>+    shader->release(context);
>+    mState.mAttachedShaders[shaderType] = nullptr;
>+}
>+
>+int Program::getAttachedShadersCount() const
>+{
>+    ASSERT(mLinkResolved);
>+    int numAttachedShaders = 0;
>+    for (const Shader *shader : mState.mAttachedShaders)
>     {
>-        case GL_VERTEX_SHADER:
>-        {
>-            ASSERT(mState.mAttachedVertexShader == shader);
>-            shader->release(context);
>-            mState.mAttachedVertexShader = nullptr;
>-            break;
>-        }
>-        case GL_FRAGMENT_SHADER:
>-        {
>-            ASSERT(mState.mAttachedFragmentShader == shader);
>-            shader->release(context);
>-            mState.mAttachedFragmentShader = nullptr;
>-            break;
>-        }
>-        case GL_COMPUTE_SHADER:
>+        if (shader)
>         {
>-            ASSERT(mState.mAttachedComputeShader == shader);
>-            shader->release(context);
>-            mState.mAttachedComputeShader = nullptr;
>-            break;
>+            ++numAttachedShaders;
>         }
>-        case GL_GEOMETRY_SHADER_EXT:
>-        {
>-            ASSERT(mState.mAttachedGeometryShader == shader);
>-            shader->release(context);
>-            mState.mAttachedGeometryShader = nullptr;
>-            break;
>-        }
>-        default:
>-            UNREACHABLE();
>     }
>+
>+    return numAttachedShaders;
> }
> 
>-int Program::getAttachedShadersCount() const
>+const Shader *Program::getAttachedShader(ShaderType shaderType) const
> {
>-    return (mState.mAttachedVertexShader ? 1 : 0) + (mState.mAttachedFragmentShader ? 1 : 0) +
>-           (mState.mAttachedComputeShader ? 1 : 0) + (mState.mAttachedGeometryShader ? 1 : 0);
>+    ASSERT(mLinkResolved);
>+    return mState.getAttachedShader(shaderType);
> }
> 
> void Program::bindAttributeLocation(GLuint index, const char *name)
> {
>+    ASSERT(mLinkResolved);
>     mAttributeBindings.bindLocation(index, name);
> }
> 
> void Program::bindUniformLocation(GLuint index, const char *name)
> {
>+    ASSERT(mLinkResolved);
>     mUniformLocationBindings.bindLocation(index, name);
> }
> 
> void Program::bindFragmentInputLocation(GLint index, const char *name)
> {
>+    ASSERT(mLinkResolved);
>     mFragmentInputBindings.bindLocation(index, name);
> }
> 
>-BindingInfo Program::getFragmentInputBindingInfo(const Context *context, GLint index) const
>+void Program::bindFragmentOutputLocation(GLuint index, const char *name)
>+{
>+    mFragmentOutputLocations.bindLocation(index, name);
>+}
>+
>+void Program::bindFragmentOutputIndex(GLuint index, const char *name)
> {
>+    mFragmentOutputIndexes.bindLocation(index, name);
>+}
>+
>+BindingInfo Program::getFragmentInputBindingInfo(GLint index) const
>+{
>+    ASSERT(mLinkResolved);
>     BindingInfo ret;
>     ret.type  = GL_NONE;
>     ret.valid = false;
> 
>-    Shader *fragmentShader = mState.getAttachedFragmentShader();
>+    Shader *fragmentShader = mState.getAttachedShader(ShaderType::Fragment);
>     ASSERT(fragmentShader);
> 
>     // Find the actual fragment shader varying we're interested in
>-    const std::vector<sh::Varying> &inputs = fragmentShader->getInputVaryings(context);
>+    const std::vector<sh::Varying> &inputs = fragmentShader->getInputVaryings();
> 
>     for (const auto &binding : mFragmentInputBindings)
>     {
>@@ -746,17 +1189,17 @@ BindingInfo Program::getFragmentInputBindingInfo(const Context *context, GLint i
>     return ret;
> }
> 
>-void Program::pathFragmentInputGen(const Context *context,
>-                                   GLint index,
>+void Program::pathFragmentInputGen(GLint index,
>                                    GLenum genMode,
>                                    GLint components,
>                                    const GLfloat *coeffs)
> {
>+    ASSERT(mLinkResolved);
>     // If the location is -1 then the command is silently ignored
>     if (index == -1)
>         return;
> 
>-    const auto &binding = getFragmentInputBindingInfo(context, index);
>+    const auto &binding = getFragmentInputBindingInfo(index);
> 
>     // If the input doesn't exist then then the command is silently ignored
>     // This could happen through optimization for example, the shader translator
>@@ -770,219 +1213,313 @@ void Program::pathFragmentInputGen(const Context *context,
> // The attached shaders are checked for linking errors by matching up their variables.
> // Uniform, input and output variables get collected.
> // The code gets compiled into binaries.
>-Error Program::link(const gl::Context *context)
>+angle::Result Program::link(const Context *context)
> {
>-    const auto &data = context->getContextState();
>+    ASSERT(mLinkResolved);
>+    const auto &data = context->getState();
> 
>     auto *platform   = ANGLEPlatformCurrent();
>     double startTime = platform->currentTime(platform);
> 
>     unlink();
>+    mInfoLog.reset();
> 
>-    ProgramHash programHash;
>-    auto *cache = context->getMemoryProgramCache();
>-    if (cache)
>+    // Validate we have properly attached shaders before checking the cache.
>+    if (!linkValidateShaders(mInfoLog))
>     {
>-        ANGLE_TRY_RESULT(cache->getProgram(context, this, &mState, &programHash), mLinked);
>-        ANGLE_HISTOGRAM_BOOLEAN("GPU.ANGLE.ProgramCache.LoadBinarySuccess", mLinked);
>+        return angle::Result::Continue;
>     }
> 
>-    if (mLinked)
>+    egl::BlobCache::Key programHash = {0};
>+    MemoryProgramCache *cache       = context->getMemoryProgramCache();
>+
>+    if (cache)
>     {
>-        double delta = platform->currentTime(platform) - startTime;
>-        int us       = static_cast<int>(delta * 1000000.0);
>-        ANGLE_HISTOGRAM_COUNTS("GPU.ANGLE.ProgramCache.ProgramCacheHitTimeUS", us);
>-        return NoError();
>+        angle::Result cacheResult = cache->getProgram(context, this, &programHash);
>+        ANGLE_TRY(cacheResult);
>+
>+        // Check explicitly for Continue, Incomplete means a cache miss
>+        if (cacheResult == angle::Result::Continue)
>+        {
>+            // Succeeded in loading the binaries in the front-end, back end may still be loading
>+            // asynchronously
>+            double delta = platform->currentTime(platform) - startTime;
>+            int us       = static_cast<int>(delta * 1000000.0);
>+            ANGLE_HISTOGRAM_COUNTS("GPU.ANGLE.ProgramCache.ProgramCacheHitTimeUS", us);
>+            return angle::Result::Continue;
>+        }
>     }
> 
>     // Cache load failed, fall through to normal linking.
>     unlink();
>-    mInfoLog.reset();
> 
>-    const Caps &caps = data.getCaps();
>-
>-    Shader *vertexShader   = mState.mAttachedVertexShader;
>-    Shader *fragmentShader = mState.mAttachedFragmentShader;
>-    Shader *computeShader  = mState.mAttachedComputeShader;
>-
>-    bool isComputeShaderAttached   = (computeShader != nullptr);
>-    bool nonComputeShadersAttached = (vertexShader != nullptr || fragmentShader != nullptr);
>-    // Check whether we both have a compute and non-compute shaders attached.
>-    // If there are of both types attached, then linking should fail.
>-    // OpenGL ES 3.10, 7.3 Program Objects, under LinkProgram
>-    if (isComputeShaderAttached == true && nonComputeShadersAttached == true)
>-    {
>-        mInfoLog << "Both a compute and non-compute shaders are attached to the same program.";
>-        return NoError();
>-    }
>+    // Re-link shaders after the unlink call.
>+    ASSERT(linkValidateShaders(mInfoLog));
> 
>-    if (computeShader)
>+    std::unique_ptr<ProgramLinkedResources> resources;
>+    if (mState.mAttachedShaders[ShaderType::Compute])
>     {
>-        if (!computeShader->isCompiled(context))
>-        {
>-            mInfoLog << "Attached compute shader is not compiled.";
>-            return NoError();
>-        }
>-        ASSERT(computeShader->getType() == GL_COMPUTE_SHADER);
>+        resources.reset(new ProgramLinkedResources(
>+            0, PackMode::ANGLE_RELAXED, &mState.mUniformBlocks, &mState.mUniforms,
>+            &mState.mShaderStorageBlocks, &mState.mBufferVariables, &mState.mAtomicCounterBuffers));
> 
>-        mState.mComputeShaderLocalSize = computeShader->getWorkGroupSize(context);
>-
>-        // GLSL ES 3.10, 4.4.1.1 Compute Shader Inputs
>-        // If the work group size is not specified, a link time error should occur.
>-        if (!mState.mComputeShaderLocalSize.isDeclared())
>+        GLuint combinedImageUniforms = 0u;
>+        if (!linkUniforms(context->getCaps(), mInfoLog, mUniformLocationBindings,
>+                          &combinedImageUniforms, &resources->unusedUniforms))
>         {
>-            mInfoLog << "Work group size is not specified.";
>-            return NoError();
>+            return angle::Result::Continue;
>         }
> 
>-        if (!linkUniforms(context, mInfoLog, mUniformLocationBindings))
>+        GLuint combinedShaderStorageBlocks = 0u;
>+        if (!linkInterfaceBlocks(context->getCaps(), context->getClientVersion(),
>+                                 context->getExtensions().webglCompatibility, mInfoLog,
>+                                 &combinedShaderStorageBlocks))
>         {
>-            return NoError();
>+            return angle::Result::Continue;
>         }
> 
>-        if (!linkInterfaceBlocks(context, mInfoLog))
>+        // [OpenGL ES 3.1] Chapter 8.22 Page 203:
>+        // A link error will be generated if the sum of the number of active image uniforms used in
>+        // all shaders, the number of active shader storage blocks, and the number of active
>+        // fragment shader outputs exceeds the implementation-dependent value of
>+        // MAX_COMBINED_SHADER_OUTPUT_RESOURCES.
>+        if (combinedImageUniforms + combinedShaderStorageBlocks >
>+            context->getCaps().maxCombinedShaderOutputResources)
>         {
>-            return NoError();
>+            mInfoLog
>+                << "The sum of the number of active image uniforms, active shader storage blocks "
>+                   "and active fragment shader outputs exceeds "
>+                   "MAX_COMBINED_SHADER_OUTPUT_RESOURCES ("
>+                << context->getCaps().maxCombinedShaderOutputResources << ")";
>+            return angle::Result::Continue;
>         }
> 
>-        ProgramLinkedResources resources = {
>-            {0, PackMode::ANGLE_RELAXED},
>-            {&mState.mUniformBlocks, &mState.mUniforms},
>-            {&mState.mShaderStorageBlocks, &mState.mBufferVariables}};
>-
>-        InitUniformBlockLinker(context, mState, &resources.uniformBlockLinker);
>-        InitShaderStorageBlockLinker(context, mState, &resources.shaderStorageBlockLinker);
>-
>-        ANGLE_TRY_RESULT(mProgram->link(context, resources, mInfoLog), mLinked);
>-        if (!mLinked)
>-        {
>-            return NoError();
>-        }
>+        InitUniformBlockLinker(mState, &resources->uniformBlockLinker);
>+        InitShaderStorageBlockLinker(mState, &resources->shaderStorageBlockLinker);
>     }
>     else
>     {
>-        if (!fragmentShader || !fragmentShader->isCompiled(context))
>+        // Map the varyings to the register file
>+        // In WebGL, we use a slightly different handling for packing variables.
>+        gl::PackMode packMode = PackMode::ANGLE_RELAXED;
>+        if (data.getLimitations().noFlexibleVaryingPacking)
>         {
>-            return NoError();
>+            // D3D9 pack mode is strictly more strict than WebGL, so takes priority.
>+            packMode = PackMode::ANGLE_NON_CONFORMANT_D3D9;
>         }
>-        ASSERT(fragmentShader->getType() == GL_FRAGMENT_SHADER);
>-
>-        if (!vertexShader || !vertexShader->isCompiled(context))
>+        else if (data.getExtensions().webglCompatibility)
>         {
>-            return NoError();
>+            packMode = PackMode::WEBGL_STRICT;
>         }
>-        ASSERT(vertexShader->getType() == GL_VERTEX_SHADER);
> 
>-        if (fragmentShader->getShaderVersion(context) != vertexShader->getShaderVersion(context))
>+        resources.reset(new ProgramLinkedResources(
>+            data.getCaps().maxVaryingVectors, packMode, &mState.mUniformBlocks, &mState.mUniforms,
>+            &mState.mShaderStorageBlocks, &mState.mBufferVariables, &mState.mAtomicCounterBuffers));
>+
>+        if (!linkAttributes(context->getCaps(), mInfoLog))
>         {
>-            mInfoLog << "Fragment shader version does not match vertex shader version.";
>-            return NoError();
>+            return angle::Result::Continue;
>         }
> 
>-        if (!linkAttributes(context, mInfoLog))
>+        if (!linkVaryings(mInfoLog))
>         {
>-            return NoError();
>+            return angle::Result::Continue;
>         }
> 
>-        if (!linkVaryings(context, mInfoLog))
>+        GLuint combinedImageUniforms = 0u;
>+        if (!linkUniforms(context->getCaps(), mInfoLog, mUniformLocationBindings,
>+                          &combinedImageUniforms, &resources->unusedUniforms))
>         {
>-            return NoError();
>+            return angle::Result::Continue;
>         }
> 
>-        if (!linkUniforms(context, mInfoLog, mUniformLocationBindings))
>+        GLuint combinedShaderStorageBlocks = 0u;
>+        if (!linkInterfaceBlocks(context->getCaps(), context->getClientVersion(),
>+                                 context->getExtensions().webglCompatibility, mInfoLog,
>+                                 &combinedShaderStorageBlocks))
>         {
>-            return NoError();
>+            return angle::Result::Continue;
>         }
> 
>-        if (!linkInterfaceBlocks(context, mInfoLog))
>+        if (!linkValidateGlobalNames(mInfoLog))
>         {
>-            return NoError();
>+            return angle::Result::Continue;
>         }
> 
>-        if (!linkValidateGlobalNames(context, mInfoLog))
>+        if (!linkOutputVariables(context->getCaps(), context->getExtensions(),
>+                                 context->getClientVersion(), combinedImageUniforms,
>+                                 combinedShaderStorageBlocks))
>         {
>-            return NoError();
>+            return angle::Result::Continue;
>         }
> 
>-        const auto &mergedVaryings = getMergedVaryings(context);
>-
>-        mState.mNumViews = vertexShader->getNumViews(context);
>-
>-        linkOutputVariables(context);
>+        const auto &mergedVaryings = getMergedVaryings();
> 
>-        // Map the varyings to the register file
>-        // In WebGL, we use a slightly different handling for packing variables.
>-        auto packMode = data.getExtensions().webglCompatibility ? PackMode::WEBGL_STRICT
>-                                                                : PackMode::ANGLE_RELAXED;
>+        ASSERT(mState.mAttachedShaders[ShaderType::Vertex]);
>+        mState.mNumViews = mState.mAttachedShaders[ShaderType::Vertex]->getNumViews();
> 
>-        ProgramLinkedResources resources = {
>-            {data.getCaps().maxVaryingVectors, packMode},
>-            {&mState.mUniformBlocks, &mState.mUniforms},
>-            {&mState.mShaderStorageBlocks, &mState.mBufferVariables}};
>+        InitUniformBlockLinker(mState, &resources->uniformBlockLinker);
>+        InitShaderStorageBlockLinker(mState, &resources->shaderStorageBlockLinker);
> 
>-        InitUniformBlockLinker(context, mState, &resources.uniformBlockLinker);
>-        InitShaderStorageBlockLinker(context, mState, &resources.shaderStorageBlockLinker);
>-
>-        if (!linkValidateTransformFeedback(context, mInfoLog, mergedVaryings, caps))
>+        if (!linkValidateTransformFeedback(context->getClientVersion(), mInfoLog, mergedVaryings,
>+                                           context->getCaps()))
>         {
>-            return NoError();
>+            return angle::Result::Continue;
>         }
> 
>-        if (!resources.varyingPacking.collectAndPackUserVaryings(
>+        if (!resources->varyingPacking.collectAndPackUserVaryings(
>                 mInfoLog, mergedVaryings, mState.getTransformFeedbackVaryingNames()))
>         {
>-            return NoError();
>-        }
>-
>-        ANGLE_TRY_RESULT(mProgram->link(context, resources, mInfoLog), mLinked);
>-        if (!mLinked)
>-        {
>-            return NoError();
>+            return angle::Result::Continue;
>         }
> 
>         gatherTransformFeedbackVaryings(mergedVaryings);
>     }
> 
>-    gatherAtomicCounterBuffers();
>-    initInterfaceBlockBindings();
>+    mLinkingState.reset(new LinkingState());
>+    mLinkingState->context     = context;
>+    mLinkingState->linkingFromBinary = false;
>+    mLinkingState->programHash = programHash;
>+    mLinkingState->linkEvent   = mProgram->link(context, *resources, mInfoLog);
>+    mLinkingState->resources   = std::move(resources);
>+    mLinkResolved              = false;
> 
>-    setUniformValuesFromBindingQualifiers();
>+    return angle::Result::Continue;
>+}
>+
>+bool Program::isLinking() const
>+{
>+    return (mLinkingState.get() && mLinkingState->linkEvent->isLinking());
>+}
>+
>+void Program::resolveLinkImpl(const Context *context)
>+{
>+    ASSERT(mLinkingState.get());
>+
>+    angle::Result result = mLinkingState->linkEvent->wait(context);
>+
>+    mLinked           = result == angle::Result::Continue;
>+    mLinkResolved     = true;
>+    std::unique_ptr<LinkingState> linkingState = std::move(mLinkingState);
>+    if (!mLinked)
>+    {
>+        return;
>+    }
> 
>+    if (linkingState->linkingFromBinary)
>+    {
>+        // All internal Program state is already loaded from the binary.
>+        return;
>+    }
>+
>+    initInterfaceBlockBindings();
>+
>+    // According to GLES 3.0/3.1 spec for LinkProgram and UseProgram,
>+    // Only successfully linked program can replace the executables.
>     ASSERT(mLinked);
>     updateLinkedShaderStages();
> 
>     // Mark implementation-specific unreferenced uniforms as ignored.
>-    mProgram->markUnusedUniformLocations(&mState.mUniformLocations, &mState.mSamplerBindings);
>+    mProgram->markUnusedUniformLocations(&mState.mUniformLocations, &mState.mSamplerBindings,
>+                                         &mState.mImageBindings);
>+
>+    // Must be called after markUnusedUniformLocations.
>+    postResolveLink(context);
>+
>+    // TODO(syoussefi): this might need to be moved to postResolveLink() so it will be called from
>+    // deserialize() as well.  http://anglebug.com/3089
>+    setUniformValuesFromBindingQualifiers();
> 
>     // Save to the program cache.
>-    if (cache && (mState.mLinkedTransformFeedbackVaryings.empty() ||
>-                  !context->getWorkarounds().disableProgramCachingForTransformFeedback))
>+    auto *cache = linkingState->context->getMemoryProgramCache();
>+    if (cache &&
>+        (mState.mLinkedTransformFeedbackVaryings.empty() ||
>+         !linkingState->context->getWorkarounds().disableProgramCachingForTransformFeedback))
>     {
>-        cache->putProgram(programHash, context, this);
>+        cache->putProgram(linkingState->programHash, linkingState->context, this);
>     }
>+}
> 
>-    double delta = platform->currentTime(platform) - startTime;
>-    int us       = static_cast<int>(delta * 1000000.0);
>-    ANGLE_HISTOGRAM_COUNTS("GPU.ANGLE.ProgramCache.ProgramCacheMissTimeUS", us);
>+void Program::updateLinkedShaderStages()
>+{
>+    mState.mLinkedShaderStages.reset();
> 
>-    return NoError();
>+    for (const Shader *shader : mState.mAttachedShaders)
>+    {
>+        if (shader)
>+        {
>+            mState.mLinkedShaderStages.set(shader->getType());
>+        }
>+    }
> }
> 
>-void Program::updateLinkedShaderStages()
>+void ProgramState::updateTransformFeedbackStrides()
> {
>-    if (mState.mAttachedVertexShader)
>+    if (mTransformFeedbackBufferMode == GL_INTERLEAVED_ATTRIBS)
>+    {
>+        mTransformFeedbackStrides.resize(1);
>+        size_t totalSize = 0;
>+        for (const TransformFeedbackVarying &varying : mLinkedTransformFeedbackVaryings)
>+        {
>+            totalSize += varying.size() * VariableExternalSize(varying.type);
>+        }
>+        mTransformFeedbackStrides[0] = static_cast<GLsizei>(totalSize);
>+    }
>+    else
>     {
>-        mState.mLinkedShaderStages.set(SHADER_VERTEX);
>+        mTransformFeedbackStrides.resize(mLinkedTransformFeedbackVaryings.size());
>+        for (size_t i = 0; i < mLinkedTransformFeedbackVaryings.size(); i++)
>+        {
>+            TransformFeedbackVarying &varying = mLinkedTransformFeedbackVaryings[i];
>+            mTransformFeedbackStrides[i] =
>+                static_cast<GLsizei>(varying.size() * VariableExternalSize(varying.type));
>+        }
>     }
>+}
>+
>+void ProgramState::updateActiveSamplers()
>+{
>+    mActiveSamplerRefCounts.fill(0);
> 
>-    if (mState.mAttachedFragmentShader)
>+    for (SamplerBinding &samplerBinding : mSamplerBindings)
>     {
>-        mState.mLinkedShaderStages.set(SHADER_FRAGMENT);
>+        if (samplerBinding.unreferenced)
>+            continue;
>+
>+        for (GLint textureUnit : samplerBinding.boundTextureUnits)
>+        {
>+            if (++mActiveSamplerRefCounts[textureUnit] == 1)
>+            {
>+                mActiveSamplerTypes[textureUnit]   = samplerBinding.textureType;
>+                mActiveSamplerFormats[textureUnit] = samplerBinding.format;
>+            }
>+            else
>+            {
>+                if (mActiveSamplerTypes[textureUnit] != samplerBinding.textureType)
>+                {
>+                    mActiveSamplerTypes[textureUnit] = TextureType::InvalidEnum;
>+                }
>+                if (mActiveSamplerFormats[textureUnit] != samplerBinding.format)
>+                {
>+                    mActiveSamplerFormats[textureUnit] = SamplerFormat::InvalidEnum;
>+                }
>+            }
>+            mActiveSamplersMask.set(textureUnit);
>+        }
>     }
>+}
> 
>-    if (mState.mAttachedComputeShader)
>+void ProgramState::updateActiveImages()
>+{
>+    for (ImageBinding &imageBinding : mImageBindings)
>     {
>-        mState.mLinkedShaderStages.set(SHADER_COMPUTE);
>+        if (imageBinding.unreferenced)
>+            continue;
>+
>+        for (GLint imageUnit : imageBinding.boundImageUnits)
>+        {
>+            mActiveImagesMask.set(imageUnit);
>+        }
>     }
> }
> 
>@@ -990,6 +1527,8 @@ void Program::updateLinkedShaderStages()
> void Program::unlink()
> {
>     mState.mAttributes.clear();
>+    mState.mAttributesTypeMask.reset();
>+    mState.mAttributesMask.reset();
>     mState.mActiveAttribLocationsMask.reset();
>     mState.mMaxActiveAttribLocation = 0;
>     mState.mLinkedTransformFeedbackVaryings.clear();
>@@ -1001,64 +1540,79 @@ void Program::unlink()
>     mState.mOutputVariables.clear();
>     mState.mOutputLocations.clear();
>     mState.mOutputVariableTypes.clear();
>+    mState.mDrawBufferTypeMask.reset();
>     mState.mActiveOutputVariables.reset();
>     mState.mComputeShaderLocalSize.fill(1);
>     mState.mSamplerBindings.clear();
>     mState.mImageBindings.clear();
>-    mState.mNumViews = -1;
>-    mState.mLinkedShaderStages.reset();
>+    mState.mActiveImagesMask.reset();
>+    mState.mNumViews                          = -1;
>+    mState.mGeometryShaderInputPrimitiveType  = PrimitiveMode::Triangles;
>+    mState.mGeometryShaderOutputPrimitiveType = PrimitiveMode::TriangleStrip;
>+    mState.mGeometryShaderInvocations         = 1;
>+    mState.mGeometryShaderMaxVertices         = 0;
>+    mState.mDrawIDLocation                    = -1;
> 
>     mValidated = false;
> 
>     mLinked = false;
>+    mInfoLog.reset();
> }
> 
>-bool Program::isLinked() const
>-{
>-    return mLinked;
>-}
>-
>-Error Program::loadBinary(const Context *context,
>-                          GLenum binaryFormat,
>-                          const void *binary,
>-                          GLsizei length)
>+angle::Result Program::loadBinary(const Context *context,
>+                                  GLenum binaryFormat,
>+                                  const void *binary,
>+                                  GLsizei length)
> {
>+    ASSERT(mLinkResolved);
>     unlink();
> 
> #if ANGLE_PROGRAM_BINARY_LOAD != ANGLE_ENABLED
>-    return NoError();
>+    return angle::Result::Continue;
> #else
>     ASSERT(binaryFormat == GL_PROGRAM_BINARY_ANGLE);
>     if (binaryFormat != GL_PROGRAM_BINARY_ANGLE)
>     {
>         mInfoLog << "Invalid program binary format.";
>-        return NoError();
>+        return angle::Result::Continue;
>     }
> 
>-    const uint8_t *bytes = reinterpret_cast<const uint8_t *>(binary);
>-    ANGLE_TRY_RESULT(
>-        MemoryProgramCache::Deserialize(context, this, &mState, bytes, length, mInfoLog), mLinked);
>+    BinaryInputStream stream(binary, length);
>+    ANGLE_TRY(deserialize(context, stream, mInfoLog));
> 
>     // Currently we require the full shader text to compute the program hash.
>-    // TODO(jmadill): Store the binary in the internal program cache.
>+    // We could also store the binary in the internal program cache.
>+
>+    for (size_t uniformBlockIndex = 0; uniformBlockIndex < mState.mUniformBlocks.size();
>+         ++uniformBlockIndex)
>+    {
>+        mDirtyBits.set(uniformBlockIndex);
>+    }
> 
>-    return NoError();
>+    mLinkingState.reset(new LinkingState());
>+    mLinkingState->context           = context;
>+    mLinkingState->linkingFromBinary = true;
>+    mLinkingState->linkEvent         = mProgram->load(context, &stream, mInfoLog);
>+    mLinkResolved                    = false;
>+
>+    return angle::Result::Continue;
> #endif  // #if ANGLE_PROGRAM_BINARY_LOAD == ANGLE_ENABLED
> }
> 
>-Error Program::saveBinary(const Context *context,
>-                          GLenum *binaryFormat,
>-                          void *binary,
>-                          GLsizei bufSize,
>-                          GLsizei *length) const
>+angle::Result Program::saveBinary(Context *context,
>+                                  GLenum *binaryFormat,
>+                                  void *binary,
>+                                  GLsizei bufSize,
>+                                  GLsizei *length) const
> {
>+    ASSERT(mLinkResolved);
>     if (binaryFormat)
>     {
>         *binaryFormat = GL_PROGRAM_BINARY_ANGLE;
>     }
> 
>     angle::MemoryBuffer memoryBuf;
>-    MemoryProgramCache::Serialize(context, this, &memoryBuf);
>+    serialize(context, &memoryBuf);
> 
>     GLsizei streamLength       = static_cast<GLsizei>(memoryBuf.size());
>     const uint8_t *streamState = memoryBuf.data();
>@@ -1070,15 +1624,15 @@ Error Program::saveBinary(const Context *context,
>             *length = 0;
>         }
> 
>-        // TODO: This should be moved to the validation layer but computing the size of the binary before saving
>-        // it causes the save to happen twice.  It may be possible to write the binary to a separate buffer, validate
>-        // sizes and then copy it.
>-        return InternalError();
>+        // TODO: This should be moved to the validation layer but computing the size of the binary
>+        // before saving it causes the save to happen twice.  It may be possible to write the binary
>+        // to a separate buffer, validate sizes and then copy it.
>+        ANGLE_CHECK(context, false, "Insufficient buffer size", GL_INVALID_OPERATION);
>     }
> 
>     if (binary)
>     {
>-        char *ptr = reinterpret_cast<char*>(binary);
>+        char *ptr = reinterpret_cast<char *>(binary);
> 
>         memcpy(ptr, streamState, streamLength);
>         ptr += streamLength;
>@@ -1091,14 +1645,21 @@ Error Program::saveBinary(const Context *context,
>         *length = streamLength;
>     }
> 
>-    return NoError();
>+    return angle::Result::Continue;
> }
> 
>-GLint Program::getBinaryLength(const Context *context) const
>+GLint Program::getBinaryLength(Context *context) const
> {
>+    ASSERT(mLinkResolved);
>+    if (!mLinked)
>+    {
>+        return 0;
>+    }
>+
>     GLint length;
>-    Error error = saveBinary(context, nullptr, nullptr, std::numeric_limits<GLint>::max(), &length);
>-    if (error.isError())
>+    angle::Result result =
>+        saveBinary(context, nullptr, nullptr, std::numeric_limits<GLint>::max(), &length);
>+    if (result != angle::Result::Continue)
>     {
>         return 0;
>     }
>@@ -1108,6 +1669,7 @@ GLint Program::getBinaryLength(const Context *context) const
> 
> void Program::setBinaryRetrievableHint(bool retrievable)
> {
>+    ASSERT(mLinkResolved);
>     // TODO(jmadill) : replace with dirty bits
>     mProgram->setBinaryRetrievableHint(retrievable);
>     mState.mBinaryRetrieveableHint = retrievable;
>@@ -1115,11 +1677,13 @@ void Program::setBinaryRetrievableHint(bool retrievable)
> 
> bool Program::getBinaryRetrievableHint() const
> {
>+    ASSERT(mLinkResolved);
>     return mState.mBinaryRetrieveableHint;
> }
> 
> void Program::setSeparable(bool separable)
> {
>+    ASSERT(mLinkResolved);
>     // TODO(yunchao) : replace with dirty bits
>     if (mState.mSeparable != separable)
>     {
>@@ -1130,22 +1694,14 @@ void Program::setSeparable(bool separable)
> 
> bool Program::isSeparable() const
> {
>+    ASSERT(mLinkResolved);
>     return mState.mSeparable;
> }
> 
>-void Program::release(const Context *context)
>-{
>-    mRefCount--;
>-
>-    if (mRefCount == 0 && mDeleteStatus)
>-    {
>-        mResourceManager->deleteProgram(context, mHandle);
>-    }
>-}
>-
>-void Program::addRef()
>+void Program::deleteSelf(const Context *context)
> {
>-    mRefCount++;
>+    ASSERT(mRefCount == 0 && mDeleteStatus);
>+    mResourceManager->deleteProgram(context, mHandle);
> }
> 
> unsigned int Program::getRefCount() const
>@@ -1155,51 +1711,27 @@ unsigned int Program::getRefCount() const
> 
> int Program::getInfoLogLength() const
> {
>+    ASSERT(mLinkResolved);
>     return static_cast<int>(mInfoLog.getLength());
> }
> 
> void Program::getInfoLog(GLsizei bufSize, GLsizei *length, char *infoLog) const
> {
>+    ASSERT(mLinkResolved);
>     return mInfoLog.getLog(bufSize, length, infoLog);
> }
> 
> void Program::getAttachedShaders(GLsizei maxCount, GLsizei *count, GLuint *shaders) const
> {
>+    ASSERT(mLinkResolved);
>     int total = 0;
> 
>-    if (mState.mAttachedComputeShader)
>-    {
>-        if (total < maxCount)
>-        {
>-            shaders[total] = mState.mAttachedComputeShader->getHandle();
>-            total++;
>-        }
>-    }
>-
>-    if (mState.mAttachedVertexShader)
>-    {
>-        if (total < maxCount)
>-        {
>-            shaders[total] = mState.mAttachedVertexShader->getHandle();
>-            total++;
>-        }
>-    }
>-
>-    if (mState.mAttachedFragmentShader)
>-    {
>-        if (total < maxCount)
>-        {
>-            shaders[total] = mState.mAttachedFragmentShader->getHandle();
>-            total++;
>-        }
>-    }
>-
>-    if (mState.mAttachedGeometryShader)
>+    for (const Shader *shader : mState.mAttachedShaders)
>     {
>-        if (total < maxCount)
>+        if (shader && (total < maxCount))
>         {
>-            shaders[total] = mState.mAttachedGeometryShader->getHandle();
>-            total++;
>+            shaders[total] = shader->getHandle();
>+            ++total;
>         }
>     }
> 
>@@ -1211,11 +1743,13 @@ void Program::getAttachedShaders(GLsizei maxCount, GLsizei *count, GLuint *shade
> 
> GLuint Program::getAttributeLocation(const std::string &name) const
> {
>+    ASSERT(mLinkResolved);
>     return mState.getAttributeLocation(name);
> }
> 
> bool Program::isAttribLocationActive(size_t attribLocation) const
> {
>+    ASSERT(mLinkResolved);
>     ASSERT(attribLocation < mState.mActiveAttribLocationsMask.size());
>     return mState.mActiveAttribLocationsMask[attribLocation];
> }
>@@ -1227,6 +1761,7 @@ void Program::getActiveAttribute(GLuint index,
>                                  GLenum *type,
>                                  GLchar *name) const
> {
>+    ASSERT(mLinkResolved);
>     if (!mLinked)
>     {
>         if (bufsize > 0)
>@@ -1259,6 +1794,7 @@ void Program::getActiveAttribute(GLuint index,
> 
> GLint Program::getActiveAttributeCount() const
> {
>+    ASSERT(mLinkResolved);
>     if (!mLinked)
>     {
>         return 0;
>@@ -1269,6 +1805,7 @@ GLint Program::getActiveAttributeCount() const
> 
> GLint Program::getActiveAttributeMaxLength() const
> {
>+    ASSERT(mLinkResolved);
>     if (!mLinked)
>     {
>         return 0;
>@@ -1284,21 +1821,69 @@ GLint Program::getActiveAttributeMaxLength() const
>     return static_cast<GLint>(maxLength);
> }
> 
>+const std::vector<sh::Attribute> &Program::getAttributes() const
>+{
>+    ASSERT(mLinkResolved);
>+    return mState.mAttributes;
>+}
>+
>+const std::vector<SamplerBinding> &Program::getSamplerBindings() const
>+{
>+    ASSERT(mLinkResolved);
>+    return mState.mSamplerBindings;
>+}
>+
>+const sh::WorkGroupSize &Program::getComputeShaderLocalSize() const
>+{
>+    ASSERT(mLinkResolved);
>+    return mState.mComputeShaderLocalSize;
>+}
>+
>+PrimitiveMode Program::getGeometryShaderInputPrimitiveType() const
>+{
>+    ASSERT(mLinkResolved);
>+    return mState.mGeometryShaderInputPrimitiveType;
>+}
>+PrimitiveMode Program::getGeometryShaderOutputPrimitiveType() const
>+{
>+    ASSERT(mLinkResolved);
>+    return mState.mGeometryShaderOutputPrimitiveType;
>+}
>+GLint Program::getGeometryShaderInvocations() const
>+{
>+    ASSERT(mLinkResolved);
>+    return mState.mGeometryShaderInvocations;
>+}
>+GLint Program::getGeometryShaderMaxVertices() const
>+{
>+    ASSERT(mLinkResolved);
>+    return mState.mGeometryShaderMaxVertices;
>+}
>+
> GLuint Program::getInputResourceIndex(const GLchar *name) const
> {
>+    ASSERT(mLinkResolved);
>     return GetResourceIndexFromName(mState.mAttributes, std::string(name));
> }
> 
> GLuint Program::getOutputResourceIndex(const GLchar *name) const
> {
>+    ASSERT(mLinkResolved);
>     return GetResourceIndexFromName(mState.mOutputVariables, std::string(name));
> }
> 
> size_t Program::getOutputResourceCount() const
> {
>+    ASSERT(mLinkResolved);
>     return (mLinked ? mState.mOutputVariables.size() : 0);
> }
> 
>+const std::vector<GLenum> &Program::getOutputVariableTypes() const
>+{
>+    ASSERT(mLinkResolved);
>+    return mState.mOutputVariableTypes;
>+}
>+
> template <typename T>
> void Program::getResourceName(GLuint index,
>                               const std::vector<T> &resources,
>@@ -1333,6 +1918,7 @@ void Program::getInputResourceName(GLuint index,
>                                    GLsizei *length,
>                                    GLchar *name) const
> {
>+    ASSERT(mLinkResolved);
>     getResourceName(index, mState.mAttributes, bufSize, length, name);
> }
> 
>@@ -1341,6 +1927,7 @@ void Program::getOutputResourceName(GLuint index,
>                                     GLsizei *length,
>                                     GLchar *name) const
> {
>+    ASSERT(mLinkResolved);
>     getResourceName(index, mState.mOutputVariables, bufSize, length, name);
> }
> 
>@@ -1349,6 +1936,7 @@ void Program::getUniformResourceName(GLuint index,
>                                      GLsizei *length,
>                                      GLchar *name) const
> {
>+    ASSERT(mLinkResolved);
>     getResourceName(index, mState.mUniforms, bufSize, length, name);
> }
> 
>@@ -1357,24 +1945,86 @@ void Program::getBufferVariableResourceName(GLuint index,
>                                             GLsizei *length,
>                                             GLchar *name) const
> {
>+    ASSERT(mLinkResolved);
>     getResourceName(index, mState.mBufferVariables, bufSize, length, name);
> }
> 
> const sh::Attribute &Program::getInputResource(GLuint index) const
> {
>+    ASSERT(mLinkResolved);
>     ASSERT(index < mState.mAttributes.size());
>     return mState.mAttributes[index];
> }
> 
> const sh::OutputVariable &Program::getOutputResource(GLuint index) const
> {
>+    ASSERT(mLinkResolved);
>     ASSERT(index < mState.mOutputVariables.size());
>     return mState.mOutputVariables[index];
> }
> 
>+const ProgramBindings &Program::getAttributeBindings() const
>+{
>+    ASSERT(mLinkResolved);
>+    return mAttributeBindings;
>+}
>+const ProgramBindings &Program::getUniformLocationBindings() const
>+{
>+    ASSERT(mLinkResolved);
>+    return mUniformLocationBindings;
>+}
>+const ProgramBindings &Program::getFragmentInputBindings() const
>+{
>+    ASSERT(mLinkResolved);
>+    return mFragmentInputBindings;
>+}
>+
>+ComponentTypeMask Program::getDrawBufferTypeMask() const
>+{
>+    ASSERT(mLinkResolved);
>+    return mState.mDrawBufferTypeMask;
>+}
>+ComponentTypeMask Program::getAttributesTypeMask() const
>+{
>+    ASSERT(mLinkResolved);
>+    return mState.mAttributesTypeMask;
>+}
>+AttributesMask Program::getAttributesMask() const
>+{
>+    ASSERT(mLinkResolved);
>+    return mState.mAttributesMask;
>+}
>+
>+const std::vector<GLsizei> &Program::getTransformFeedbackStrides() const
>+{
>+    ASSERT(mLinkResolved);
>+    return mState.mTransformFeedbackStrides;
>+}
>+
> GLint Program::getFragDataLocation(const std::string &name) const
> {
>-    return GetVariableLocation(mState.mOutputVariables, mState.mOutputLocations, name);
>+    ASSERT(mLinkResolved);
>+    GLint primaryLocation =
>+        GetVariableLocation(mState.mOutputVariables, mState.mOutputLocations, name);
>+    if (primaryLocation != -1)
>+    {
>+        return primaryLocation;
>+    }
>+    return GetVariableLocation(mState.mOutputVariables, mState.mSecondaryOutputLocations, name);
>+}
>+
>+GLint Program::getFragDataIndex(const std::string &name) const
>+{
>+    ASSERT(mLinkResolved);
>+    if (GetVariableLocation(mState.mOutputVariables, mState.mOutputLocations, name) != -1)
>+    {
>+        return 0;
>+    }
>+    if (GetVariableLocation(mState.mOutputVariables, mState.mSecondaryOutputLocations, name) != -1)
>+    {
>+        return 1;
>+    }
>+    return -1;
> }
> 
> void Program::getActiveUniform(GLuint index,
>@@ -1384,6 +2034,7 @@ void Program::getActiveUniform(GLuint index,
>                                GLenum *type,
>                                GLchar *name) const
> {
>+    ASSERT(mLinkResolved);
>     if (mLinked)
>     {
>         // index must be smaller than getActiveUniformCount()
>@@ -1418,6 +2069,7 @@ void Program::getActiveUniform(GLuint index,
> 
> GLint Program::getActiveUniformCount() const
> {
>+    ASSERT(mLinkResolved);
>     if (mLinked)
>     {
>         return static_cast<GLint>(mState.mUniforms.size());
>@@ -1430,11 +2082,13 @@ GLint Program::getActiveUniformCount() const
> 
> size_t Program::getActiveBufferVariableCount() const
> {
>+    ASSERT(mLinkResolved);
>     return mLinked ? mState.mBufferVariables.size() : 0;
> }
> 
> GLint Program::getActiveUniformMaxLength() const
> {
>+    ASSERT(mLinkResolved);
>     size_t maxLength = 0;
> 
>     if (mLinked)
>@@ -1458,6 +2112,7 @@ GLint Program::getActiveUniformMaxLength() const
> 
> bool Program::isValidUniformLocation(GLint location) const
> {
>+    ASSERT(mLinkResolved);
>     ASSERT(angle::IsValueInRangeForNumericType<GLint>(mState.mUniformLocations.size()));
>     return (location >= 0 && static_cast<size_t>(location) < mState.mUniformLocations.size() &&
>             mState.mUniformLocations[static_cast<size_t>(location)].used());
>@@ -1465,45 +2120,40 @@ bool Program::isValidUniformLocation(GLint location) const
> 
> const LinkedUniform &Program::getUniformByLocation(GLint location) const
> {
>+    ASSERT(mLinkResolved);
>     ASSERT(location >= 0 && static_cast<size_t>(location) < mState.mUniformLocations.size());
>     return mState.mUniforms[mState.getUniformIndexFromLocation(location)];
> }
> 
> const VariableLocation &Program::getUniformLocation(GLint location) const
> {
>+    ASSERT(mLinkResolved);
>     ASSERT(location >= 0 && static_cast<size_t>(location) < mState.mUniformLocations.size());
>     return mState.mUniformLocations[location];
> }
> 
>-const std::vector<VariableLocation> &Program::getUniformLocations() const
>-{
>-    return mState.mUniformLocations;
>-}
>-
>-const LinkedUniform &Program::getUniformByIndex(GLuint index) const
>-{
>-    ASSERT(index < static_cast<size_t>(mState.mUniforms.size()));
>-    return mState.mUniforms[index];
>-}
>-
> const BufferVariable &Program::getBufferVariableByIndex(GLuint index) const
> {
>+    ASSERT(mLinkResolved);
>     ASSERT(index < static_cast<size_t>(mState.mBufferVariables.size()));
>     return mState.mBufferVariables[index];
> }
> 
> GLint Program::getUniformLocation(const std::string &name) const
> {
>+    ASSERT(mLinkResolved);
>     return GetVariableLocation(mState.mUniforms, mState.mUniformLocations, name);
> }
> 
> GLuint Program::getUniformIndex(const std::string &name) const
> {
>+    ASSERT(mLinkResolved);
>     return mState.getUniformIndexFromName(name);
> }
> 
> void Program::setUniform1fv(GLint location, GLsizei count, const GLfloat *v)
> {
>+    ASSERT(mLinkResolved);
>     const VariableLocation &locationInfo = mState.mUniformLocations[location];
>     GLsizei clampedCount                 = clampUniformCount(locationInfo, count, 1, v);
>     mProgram->setUniform1fv(location, clampedCount, v);
>@@ -1511,6 +2161,7 @@ void Program::setUniform1fv(GLint location, GLsizei count, const GLfloat *v)
> 
> void Program::setUniform2fv(GLint location, GLsizei count, const GLfloat *v)
> {
>+    ASSERT(mLinkResolved);
>     const VariableLocation &locationInfo = mState.mUniformLocations[location];
>     GLsizei clampedCount                 = clampUniformCount(locationInfo, count, 2, v);
>     mProgram->setUniform2fv(location, clampedCount, v);
>@@ -1518,6 +2169,7 @@ void Program::setUniform2fv(GLint location, GLsizei count, const GLfloat *v)
> 
> void Program::setUniform3fv(GLint location, GLsizei count, const GLfloat *v)
> {
>+    ASSERT(mLinkResolved);
>     const VariableLocation &locationInfo = mState.mUniformLocations[location];
>     GLsizei clampedCount                 = clampUniformCount(locationInfo, count, 3, v);
>     mProgram->setUniform3fv(location, clampedCount, v);
>@@ -1525,13 +2177,15 @@ void Program::setUniform3fv(GLint location, GLsizei count, const GLfloat *v)
> 
> void Program::setUniform4fv(GLint location, GLsizei count, const GLfloat *v)
> {
>+    ASSERT(mLinkResolved);
>     const VariableLocation &locationInfo = mState.mUniformLocations[location];
>     GLsizei clampedCount                 = clampUniformCount(locationInfo, count, 4, v);
>     mProgram->setUniform4fv(location, clampedCount, v);
> }
> 
>-Program::SetUniformResult Program::setUniform1iv(GLint location, GLsizei count, const GLint *v)
>+void Program::setUniform1iv(Context *context, GLint location, GLsizei count, const GLint *v)
> {
>+    ASSERT(mLinkResolved);
>     const VariableLocation &locationInfo = mState.mUniformLocations[location];
>     GLsizei clampedCount                 = clampUniformCount(locationInfo, count, 1, v);
> 
>@@ -1539,15 +2193,13 @@ Program::SetUniformResult Program::setUniform1iv(GLint location, GLsizei count,
> 
>     if (mState.isSamplerUniformIndex(locationInfo.index))
>     {
>-        updateSamplerUniform(locationInfo, clampedCount, v);
>-        return SetUniformResult::SamplerChanged;
>+        updateSamplerUniform(context, locationInfo, clampedCount, v);
>     }
>-
>-    return SetUniformResult::NoSamplerChange;
> }
> 
> void Program::setUniform2iv(GLint location, GLsizei count, const GLint *v)
> {
>+    ASSERT(mLinkResolved);
>     const VariableLocation &locationInfo = mState.mUniformLocations[location];
>     GLsizei clampedCount                 = clampUniformCount(locationInfo, count, 2, v);
>     mProgram->setUniform2iv(location, clampedCount, v);
>@@ -1555,6 +2207,7 @@ void Program::setUniform2iv(GLint location, GLsizei count, const GLint *v)
> 
> void Program::setUniform3iv(GLint location, GLsizei count, const GLint *v)
> {
>+    ASSERT(mLinkResolved);
>     const VariableLocation &locationInfo = mState.mUniformLocations[location];
>     GLsizei clampedCount                 = clampUniformCount(locationInfo, count, 3, v);
>     mProgram->setUniform3iv(location, clampedCount, v);
>@@ -1562,6 +2215,7 @@ void Program::setUniform3iv(GLint location, GLsizei count, const GLint *v)
> 
> void Program::setUniform4iv(GLint location, GLsizei count, const GLint *v)
> {
>+    ASSERT(mLinkResolved);
>     const VariableLocation &locationInfo = mState.mUniformLocations[location];
>     GLsizei clampedCount                 = clampUniformCount(locationInfo, count, 4, v);
>     mProgram->setUniform4iv(location, clampedCount, v);
>@@ -1569,6 +2223,7 @@ void Program::setUniform4iv(GLint location, GLsizei count, const GLint *v)
> 
> void Program::setUniform1uiv(GLint location, GLsizei count, const GLuint *v)
> {
>+    ASSERT(mLinkResolved);
>     const VariableLocation &locationInfo = mState.mUniformLocations[location];
>     GLsizei clampedCount                 = clampUniformCount(locationInfo, count, 1, v);
>     mProgram->setUniform1uiv(location, clampedCount, v);
>@@ -1576,6 +2231,7 @@ void Program::setUniform1uiv(GLint location, GLsizei count, const GLuint *v)
> 
> void Program::setUniform2uiv(GLint location, GLsizei count, const GLuint *v)
> {
>+    ASSERT(mLinkResolved);
>     const VariableLocation &locationInfo = mState.mUniformLocations[location];
>     GLsizei clampedCount                 = clampUniformCount(locationInfo, count, 2, v);
>     mProgram->setUniform2uiv(location, clampedCount, v);
>@@ -1583,6 +2239,7 @@ void Program::setUniform2uiv(GLint location, GLsizei count, const GLuint *v)
> 
> void Program::setUniform3uiv(GLint location, GLsizei count, const GLuint *v)
> {
>+    ASSERT(mLinkResolved);
>     const VariableLocation &locationInfo = mState.mUniformLocations[location];
>     GLsizei clampedCount                 = clampUniformCount(locationInfo, count, 3, v);
>     mProgram->setUniform3uiv(location, clampedCount, v);
>@@ -1590,128 +2247,195 @@ void Program::setUniform3uiv(GLint location, GLsizei count, const GLuint *v)
> 
> void Program::setUniform4uiv(GLint location, GLsizei count, const GLuint *v)
> {
>+    ASSERT(mLinkResolved);
>     const VariableLocation &locationInfo = mState.mUniformLocations[location];
>     GLsizei clampedCount                 = clampUniformCount(locationInfo, count, 4, v);
>     mProgram->setUniform4uiv(location, clampedCount, v);
> }
> 
>-void Program::setUniformMatrix2fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *v)
>+void Program::setUniformMatrix2fv(GLint location,
>+                                  GLsizei count,
>+                                  GLboolean transpose,
>+                                  const GLfloat *v)
> {
>+    ASSERT(mLinkResolved);
>     GLsizei clampedCount = clampMatrixUniformCount<2, 2>(location, count, transpose, v);
>     mProgram->setUniformMatrix2fv(location, clampedCount, transpose, v);
> }
> 
>-void Program::setUniformMatrix3fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *v)
>+void Program::setUniformMatrix3fv(GLint location,
>+                                  GLsizei count,
>+                                  GLboolean transpose,
>+                                  const GLfloat *v)
> {
>+    ASSERT(mLinkResolved);
>     GLsizei clampedCount = clampMatrixUniformCount<3, 3>(location, count, transpose, v);
>     mProgram->setUniformMatrix3fv(location, clampedCount, transpose, v);
> }
> 
>-void Program::setUniformMatrix4fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *v)
>+void Program::setUniformMatrix4fv(GLint location,
>+                                  GLsizei count,
>+                                  GLboolean transpose,
>+                                  const GLfloat *v)
> {
>+    ASSERT(mLinkResolved);
>     GLsizei clampedCount = clampMatrixUniformCount<4, 4>(location, count, transpose, v);
>     mProgram->setUniformMatrix4fv(location, clampedCount, transpose, v);
> }
> 
>-void Program::setUniformMatrix2x3fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *v)
>+void Program::setUniformMatrix2x3fv(GLint location,
>+                                    GLsizei count,
>+                                    GLboolean transpose,
>+                                    const GLfloat *v)
> {
>+    ASSERT(mLinkResolved);
>     GLsizei clampedCount = clampMatrixUniformCount<2, 3>(location, count, transpose, v);
>     mProgram->setUniformMatrix2x3fv(location, clampedCount, transpose, v);
> }
> 
>-void Program::setUniformMatrix2x4fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *v)
>+void Program::setUniformMatrix2x4fv(GLint location,
>+                                    GLsizei count,
>+                                    GLboolean transpose,
>+                                    const GLfloat *v)
> {
>+    ASSERT(mLinkResolved);
>     GLsizei clampedCount = clampMatrixUniformCount<2, 4>(location, count, transpose, v);
>     mProgram->setUniformMatrix2x4fv(location, clampedCount, transpose, v);
> }
> 
>-void Program::setUniformMatrix3x2fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *v)
>+void Program::setUniformMatrix3x2fv(GLint location,
>+                                    GLsizei count,
>+                                    GLboolean transpose,
>+                                    const GLfloat *v)
> {
>+    ASSERT(mLinkResolved);
>     GLsizei clampedCount = clampMatrixUniformCount<3, 2>(location, count, transpose, v);
>     mProgram->setUniformMatrix3x2fv(location, clampedCount, transpose, v);
> }
> 
>-void Program::setUniformMatrix3x4fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *v)
>+void Program::setUniformMatrix3x4fv(GLint location,
>+                                    GLsizei count,
>+                                    GLboolean transpose,
>+                                    const GLfloat *v)
> {
>+    ASSERT(mLinkResolved);
>     GLsizei clampedCount = clampMatrixUniformCount<3, 4>(location, count, transpose, v);
>     mProgram->setUniformMatrix3x4fv(location, clampedCount, transpose, v);
> }
> 
>-void Program::setUniformMatrix4x2fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *v)
>+void Program::setUniformMatrix4x2fv(GLint location,
>+                                    GLsizei count,
>+                                    GLboolean transpose,
>+                                    const GLfloat *v)
> {
>+    ASSERT(mLinkResolved);
>     GLsizei clampedCount = clampMatrixUniformCount<4, 2>(location, count, transpose, v);
>     mProgram->setUniformMatrix4x2fv(location, clampedCount, transpose, v);
> }
> 
>-void Program::setUniformMatrix4x3fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *v)
>+void Program::setUniformMatrix4x3fv(GLint location,
>+                                    GLsizei count,
>+                                    GLboolean transpose,
>+                                    const GLfloat *v)
> {
>+    ASSERT(mLinkResolved);
>     GLsizei clampedCount = clampMatrixUniformCount<4, 3>(location, count, transpose, v);
>     mProgram->setUniformMatrix4x3fv(location, clampedCount, transpose, v);
> }
> 
>+GLuint Program::getSamplerUniformBinding(const VariableLocation &uniformLocation) const
>+{
>+    ASSERT(mLinkResolved);
>+    GLuint samplerIndex = mState.getSamplerIndexFromUniformIndex(uniformLocation.index);
>+    const std::vector<GLuint> &boundTextureUnits =
>+        mState.mSamplerBindings[samplerIndex].boundTextureUnits;
>+    return boundTextureUnits[uniformLocation.arrayIndex];
>+}
>+
> void Program::getUniformfv(const Context *context, GLint location, GLfloat *v) const
> {
>-    const auto &uniformLocation = mState.getUniformLocations()[location];
>-    const auto &uniform         = mState.getUniforms()[uniformLocation.index];
>+    ASSERT(mLinkResolved);
>+    const VariableLocation &uniformLocation = mState.getUniformLocations()[location];
>+    const LinkedUniform &uniform            = mState.getUniforms()[uniformLocation.index];
>+
>+    if (uniform.isSampler())
>+    {
>+        *v = static_cast<GLfloat>(getSamplerUniformBinding(uniformLocation));
>+        return;
>+    }
> 
>-    GLenum nativeType = gl::VariableComponentType(uniform.type);
>+    const GLenum nativeType = gl::VariableComponentType(uniform.type);
>     if (nativeType == GL_FLOAT)
>     {
>         mProgram->getUniformfv(context, location, v);
>     }
>     else
>     {
>-        getUniformInternal(context, v, location, nativeType,
>-                           gl::VariableComponentCount(uniform.type));
>+        getUniformInternal(context, v, location, nativeType, VariableComponentCount(uniform.type));
>     }
> }
> 
> void Program::getUniformiv(const Context *context, GLint location, GLint *v) const
> {
>-    const auto &uniformLocation = mState.getUniformLocations()[location];
>-    const auto &uniform         = mState.getUniforms()[uniformLocation.index];
>+    ASSERT(mLinkResolved);
>+    const VariableLocation &uniformLocation = mState.getUniformLocations()[location];
>+    const LinkedUniform &uniform            = mState.getUniforms()[uniformLocation.index];
>+
>+    if (uniform.isSampler())
>+    {
>+        *v = static_cast<GLint>(getSamplerUniformBinding(uniformLocation));
>+        return;
>+    }
> 
>-    GLenum nativeType = gl::VariableComponentType(uniform.type);
>+    const GLenum nativeType = gl::VariableComponentType(uniform.type);
>     if (nativeType == GL_INT || nativeType == GL_BOOL)
>     {
>         mProgram->getUniformiv(context, location, v);
>     }
>     else
>     {
>-        getUniformInternal(context, v, location, nativeType,
>-                           gl::VariableComponentCount(uniform.type));
>+        getUniformInternal(context, v, location, nativeType, VariableComponentCount(uniform.type));
>     }
> }
> 
> void Program::getUniformuiv(const Context *context, GLint location, GLuint *v) const
> {
>-    const auto &uniformLocation = mState.getUniformLocations()[location];
>-    const auto &uniform         = mState.getUniforms()[uniformLocation.index];
>+    ASSERT(mLinkResolved);
>+    const VariableLocation &uniformLocation = mState.getUniformLocations()[location];
>+    const LinkedUniform &uniform            = mState.getUniforms()[uniformLocation.index];
>+
>+    if (uniform.isSampler())
>+    {
>+        *v = getSamplerUniformBinding(uniformLocation);
>+        return;
>+    }
> 
>-    GLenum nativeType = gl::VariableComponentType(uniform.type);
>+    const GLenum nativeType = VariableComponentType(uniform.type);
>     if (nativeType == GL_UNSIGNED_INT)
>     {
>         mProgram->getUniformuiv(context, location, v);
>     }
>     else
>     {
>-        getUniformInternal(context, v, location, nativeType,
>-                           gl::VariableComponentCount(uniform.type));
>+        getUniformInternal(context, v, location, nativeType, VariableComponentCount(uniform.type));
>     }
> }
> 
> void Program::flagForDeletion()
> {
>+    ASSERT(mLinkResolved);
>     mDeleteStatus = true;
> }
> 
> bool Program::isFlaggedForDeletion() const
> {
>+    ASSERT(mLinkResolved);
>     return mDeleteStatus;
> }
> 
> void Program::validate(const Caps &caps)
> {
>+    ASSERT(mLinkResolved);
>     mInfoLog.reset();
> 
>     if (mLinked)
>@@ -1724,68 +2448,26 @@ void Program::validate(const Caps &caps)
>     }
> }
> 
>-bool Program::validateSamplers(InfoLog *infoLog, const Caps &caps)
>+bool Program::validateSamplersImpl(InfoLog *infoLog, const Caps &caps)
> {
>-    // Skip cache if we're using an infolog, so we get the full error.
>-    // Also skip the cache if the sample mapping has changed, or if we haven't ever validated.
>-    if (infoLog == nullptr && mCachedValidateSamplersResult.valid())
>-    {
>-        return mCachedValidateSamplersResult.value();
>-    }
>-
>-    if (mTextureUnitTypesCache.empty())
>-    {
>-        mTextureUnitTypesCache.resize(caps.maxCombinedTextureImageUnits, GL_NONE);
>-    }
>-    else
>-    {
>-        std::fill(mTextureUnitTypesCache.begin(), mTextureUnitTypesCache.end(), GL_NONE);
>-    }
>+    ASSERT(mLinkResolved);
> 
>     // if any two active samplers in a program are of different types, but refer to the same
>     // texture image unit, and this is the current program, then ValidateProgram will fail, and
>     // DrawArrays and DrawElements will issue the INVALID_OPERATION error.
>-    for (const auto &samplerBinding : mState.mSamplerBindings)
>+    for (size_t textureUnit : mState.mActiveSamplersMask)
>     {
>-        if (samplerBinding.unreferenced)
>-            continue;
>-
>-        GLenum textureType = samplerBinding.textureType;
>-
>-        for (GLuint textureUnit : samplerBinding.boundTextureUnits)
>+        if (mState.mActiveSamplerTypes[textureUnit] == TextureType::InvalidEnum)
>         {
>-            if (textureUnit >= caps.maxCombinedTextureImageUnits)
>+            if (infoLog)
>             {
>-                if (infoLog)
>-                {
>-                    (*infoLog) << "Sampler uniform (" << textureUnit
>-                               << ") exceeds GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS ("
>-                               << caps.maxCombinedTextureImageUnits << ")";
>-                }
>-
>-                mCachedValidateSamplersResult = false;
>-                return false;
>+                (*infoLog) << "Samplers of conflicting types refer to the same texture "
>+                              "image unit ("
>+                           << textureUnit << ").";
>             }
> 
>-            if (mTextureUnitTypesCache[textureUnit] != GL_NONE)
>-            {
>-                if (textureType != mTextureUnitTypesCache[textureUnit])
>-                {
>-                    if (infoLog)
>-                    {
>-                        (*infoLog) << "Samplers of conflicting types refer to the same texture "
>-                                      "image unit ("
>-                                   << textureUnit << ").";
>-                    }
>-
>-                    mCachedValidateSamplersResult = false;
>-                    return false;
>-                }
>-            }
>-            else
>-            {
>-                mTextureUnitTypesCache[textureUnit] = textureType;
>-            }
>+            mCachedValidateSamplersResult = false;
>+            return false;
>         }
>     }
> 
>@@ -1795,29 +2477,16 @@ bool Program::validateSamplers(InfoLog *infoLog, const Caps &caps)
> 
> bool Program::isValidated() const
> {
>+    ASSERT(mLinkResolved);
>     return mValidated;
> }
> 
>-GLuint Program::getActiveUniformBlockCount() const
>-{
>-    return static_cast<GLuint>(mState.mUniformBlocks.size());
>-}
>-
>-GLuint Program::getActiveAtomicCounterBufferCount() const
>-{
>-    return static_cast<GLuint>(mState.mAtomicCounterBuffers.size());
>-}
>-
>-GLuint Program::getActiveShaderStorageBlockCount() const
>-{
>-    return static_cast<GLuint>(mState.mShaderStorageBlocks.size());
>-}
>-
> void Program::getActiveUniformBlockName(const GLuint blockIndex,
>                                         GLsizei bufSize,
>                                         GLsizei *length,
>                                         GLchar *blockName) const
> {
>+    ASSERT(mLinkResolved);
>     GetInterfaceBlockName(blockIndex, mState.mUniformBlocks, bufSize, length, blockName);
> }
> 
>@@ -1826,23 +2495,22 @@ void Program::getActiveShaderStorageBlockName(const GLuint blockIndex,
>                                               GLsizei *length,
>                                               GLchar *blockName) const
> {
>-
>+    ASSERT(mLinkResolved);
>     GetInterfaceBlockName(blockIndex, mState.mShaderStorageBlocks, bufSize, length, blockName);
> }
> 
>-GLint Program::getActiveUniformBlockMaxLength() const
>+template <typename T>
>+GLint Program::getActiveInterfaceBlockMaxNameLength(const std::vector<T> &resources) const
> {
>     int maxLength = 0;
> 
>     if (mLinked)
>     {
>-        unsigned int numUniformBlocks = static_cast<unsigned int>(mState.mUniformBlocks.size());
>-        for (unsigned int uniformBlockIndex = 0; uniformBlockIndex < numUniformBlocks; uniformBlockIndex++)
>+        for (const T &resource : resources)
>         {
>-            const InterfaceBlock &uniformBlock = mState.mUniformBlocks[uniformBlockIndex];
>-            if (!uniformBlock.name.empty())
>+            if (!resource.name.empty())
>             {
>-                int length = static_cast<int>(uniformBlock.nameWithArrayIndex().length());
>+                int length = static_cast<int>(resource.nameWithArrayIndex().length());
>                 maxLength  = std::max(length + 1, maxLength);
>             }
>         }
>@@ -1851,47 +2519,69 @@ GLint Program::getActiveUniformBlockMaxLength() const
>     return maxLength;
> }
> 
>+GLint Program::getActiveUniformBlockMaxNameLength() const
>+{
>+    ASSERT(mLinkResolved);
>+    return getActiveInterfaceBlockMaxNameLength(mState.mUniformBlocks);
>+}
>+
>+GLint Program::getActiveShaderStorageBlockMaxNameLength() const
>+{
>+    ASSERT(mLinkResolved);
>+    return getActiveInterfaceBlockMaxNameLength(mState.mShaderStorageBlocks);
>+}
>+
> GLuint Program::getUniformBlockIndex(const std::string &name) const
> {
>+    ASSERT(mLinkResolved);
>     return GetInterfaceBlockIndex(mState.mUniformBlocks, name);
> }
> 
> GLuint Program::getShaderStorageBlockIndex(const std::string &name) const
> {
>+    ASSERT(mLinkResolved);
>     return GetInterfaceBlockIndex(mState.mShaderStorageBlocks, name);
> }
> 
> const InterfaceBlock &Program::getUniformBlockByIndex(GLuint index) const
> {
>+    ASSERT(mLinkResolved);
>     ASSERT(index < static_cast<GLuint>(mState.mUniformBlocks.size()));
>     return mState.mUniformBlocks[index];
> }
> 
> const InterfaceBlock &Program::getShaderStorageBlockByIndex(GLuint index) const
> {
>+    ASSERT(mLinkResolved);
>     ASSERT(index < static_cast<GLuint>(mState.mShaderStorageBlocks.size()));
>     return mState.mShaderStorageBlocks[index];
> }
> 
> void Program::bindUniformBlock(GLuint uniformBlockIndex, GLuint uniformBlockBinding)
> {
>+    ASSERT(mLinkResolved);
>     mState.mUniformBlocks[uniformBlockIndex].binding = uniformBlockBinding;
>     mState.mActiveUniformBlockBindings.set(uniformBlockIndex, uniformBlockBinding != 0);
>-    mProgram->setUniformBlockBinding(uniformBlockIndex, uniformBlockBinding);
>+    mDirtyBits.set(DIRTY_BIT_UNIFORM_BLOCK_BINDING_0 + uniformBlockIndex);
> }
> 
> GLuint Program::getUniformBlockBinding(GLuint uniformBlockIndex) const
> {
>+    ASSERT(mLinkResolved);
>     return mState.getUniformBlockBinding(uniformBlockIndex);
> }
> 
> GLuint Program::getShaderStorageBlockBinding(GLuint shaderStorageBlockIndex) const
> {
>+    ASSERT(mLinkResolved);
>     return mState.getShaderStorageBlockBinding(shaderStorageBlockIndex);
> }
> 
>-void Program::setTransformFeedbackVaryings(GLsizei count, const GLchar *const *varyings, GLenum bufferMode)
>+void Program::setTransformFeedbackVaryings(GLsizei count,
>+                                           const GLchar *const *varyings,
>+                                           GLenum bufferMode)
> {
>+    ASSERT(mLinkResolved);
>     mState.mTransformFeedbackVaryingNames.resize(count);
>     for (GLsizei i = 0; i < count; i++)
>     {
>@@ -1901,8 +2591,14 @@ void Program::setTransformFeedbackVaryings(GLsizei count, const GLchar *const *v
>     mState.mTransformFeedbackBufferMode = bufferMode;
> }
> 
>-void Program::getTransformFeedbackVarying(GLuint index, GLsizei bufSize, GLsizei *length, GLsizei *size, GLenum *type, GLchar *name) const
>+void Program::getTransformFeedbackVarying(GLuint index,
>+                                          GLsizei bufSize,
>+                                          GLsizei *length,
>+                                          GLsizei *size,
>+                                          GLenum *type,
>+                                          GLchar *name) const
> {
>+    ASSERT(mLinkResolved);
>     if (mLinked)
>     {
>         ASSERT(index < mState.mLinkedTransformFeedbackVaryings.size());
>@@ -1931,6 +2627,7 @@ void Program::getTransformFeedbackVarying(GLuint index, GLsizei bufSize, GLsizei
> 
> GLsizei Program::getTransformFeedbackVaryingCount() const
> {
>+    ASSERT(mLinkResolved);
>     if (mLinked)
>     {
>         return static_cast<GLsizei>(mState.mLinkedTransformFeedbackVaryings.size());
>@@ -1943,6 +2640,7 @@ GLsizei Program::getTransformFeedbackVaryingCount() const
> 
> GLsizei Program::getTransformFeedbackVaryingMaxLength() const
> {
>+    ASSERT(mLinkResolved);
>     if (mLinked)
>     {
>         GLsizei maxSize = 0;
>@@ -1962,39 +2660,235 @@ GLsizei Program::getTransformFeedbackVaryingMaxLength() const
> 
> GLenum Program::getTransformFeedbackBufferMode() const
> {
>+    ASSERT(mLinkResolved);
>     return mState.mTransformFeedbackBufferMode;
> }
> 
>-bool Program::linkVaryings(const Context *context, InfoLog &infoLog) const
>+bool Program::linkValidateShaders(InfoLog &infoLog)
> {
>-    Shader *vertexShader   = mState.mAttachedVertexShader;
>-    Shader *fragmentShader = mState.mAttachedFragmentShader;
>+    Shader *vertexShader   = mState.mAttachedShaders[ShaderType::Vertex];
>+    Shader *fragmentShader = mState.mAttachedShaders[ShaderType::Fragment];
>+    Shader *computeShader  = mState.mAttachedShaders[ShaderType::Compute];
>+    Shader *geometryShader = mState.mAttachedShaders[ShaderType::Geometry];
> 
>-    ASSERT(vertexShader->getShaderVersion(context) == fragmentShader->getShaderVersion(context));
>+    bool isComputeShaderAttached = (computeShader != nullptr);
>+    bool isGraphicsShaderAttached =
>+        (vertexShader != nullptr || fragmentShader != nullptr || geometryShader != nullptr);
>+    // Check whether we both have a compute and non-compute shaders attached.
>+    // If there are of both types attached, then linking should fail.
>+    // OpenGL ES 3.10, 7.3 Program Objects, under LinkProgram
>+    if (isComputeShaderAttached == true && isGraphicsShaderAttached == true)
>+    {
>+        infoLog << "Both compute and graphics shaders are attached to the same program.";
>+        return false;
>+    }
>+
>+    if (computeShader)
>+    {
>+        if (!computeShader->isCompiled())
>+        {
>+            infoLog << "Attached compute shader is not compiled.";
>+            return false;
>+        }
>+        ASSERT(computeShader->getType() == ShaderType::Compute);
> 
>-    const std::vector<sh::Varying> &vertexVaryings   = vertexShader->getOutputVaryings(context);
>-    const std::vector<sh::Varying> &fragmentVaryings = fragmentShader->getInputVaryings(context);
>+        mState.mComputeShaderLocalSize = computeShader->getWorkGroupSize();
> 
>-    std::map<GLuint, std::string> staticFragmentInputLocations;
>+        // GLSL ES 3.10, 4.4.1.1 Compute Shader Inputs
>+        // If the work group size is not specified, a link time error should occur.
>+        if (!mState.mComputeShaderLocalSize.isDeclared())
>+        {
>+            infoLog << "Work group size is not specified.";
>+            return false;
>+        }
>+    }
>+    else
>+    {
>+        if (!fragmentShader || !fragmentShader->isCompiled())
>+        {
>+            infoLog << "No compiled fragment shader when at least one graphics shader is attached.";
>+            return false;
>+        }
>+        ASSERT(fragmentShader->getType() == ShaderType::Fragment);
>+
>+        if (!vertexShader || !vertexShader->isCompiled())
>+        {
>+            infoLog << "No compiled vertex shader when at least one graphics shader is attached.";
>+            return false;
>+        }
>+        ASSERT(vertexShader->getType() == ShaderType::Vertex);
>+
>+        int vertexShaderVersion = vertexShader->getShaderVersion();
>+        if (fragmentShader->getShaderVersion() != vertexShaderVersion)
>+        {
>+            infoLog << "Fragment shader version does not match vertex shader version.";
>+            return false;
>+        }
>+
>+        if (geometryShader)
>+        {
>+            // [GL_EXT_geometry_shader] Chapter 7
>+            // Linking can fail for a variety of reasons as specified in the OpenGL ES Shading
>+            // Language Specification, as well as any of the following reasons:
>+            // * One or more of the shader objects attached to <program> are not compiled
>+            //   successfully.
>+            // * The shaders do not use the same shader language version.
>+            // * <program> contains objects to form a geometry shader, and
>+            //   - <program> is not separable and contains no objects to form a vertex shader; or
>+            //   - the input primitive type, output primitive type, or maximum output vertex count
>+            //     is not specified in the compiled geometry shader object.
>+            if (!geometryShader->isCompiled())
>+            {
>+                infoLog << "The attached geometry shader isn't compiled.";
>+                return false;
>+            }
>+
>+            if (geometryShader->getShaderVersion() != vertexShaderVersion)
>+            {
>+                mInfoLog << "Geometry shader version does not match vertex shader version.";
>+                return false;
>+            }
>+            ASSERT(geometryShader->getType() == ShaderType::Geometry);
>+
>+            Optional<PrimitiveMode> inputPrimitive =
>+                geometryShader->getGeometryShaderInputPrimitiveType();
>+            if (!inputPrimitive.valid())
>+            {
>+                mInfoLog << "Input primitive type is not specified in the geometry shader.";
>+                return false;
>+            }
>+
>+            Optional<PrimitiveMode> outputPrimitive =
>+                geometryShader->getGeometryShaderOutputPrimitiveType();
>+            if (!outputPrimitive.valid())
>+            {
>+                mInfoLog << "Output primitive type is not specified in the geometry shader.";
>+                return false;
>+            }
>+
>+            Optional<GLint> maxVertices = geometryShader->getGeometryShaderMaxVertices();
>+            if (!maxVertices.valid())
>+            {
>+                mInfoLog << "'max_vertices' is not specified in the geometry shader.";
>+                return false;
>+            }
>+
>+            mState.mGeometryShaderInputPrimitiveType  = inputPrimitive.value();
>+            mState.mGeometryShaderOutputPrimitiveType = outputPrimitive.value();
>+            mState.mGeometryShaderMaxVertices         = maxVertices.value();
>+            mState.mGeometryShaderInvocations = geometryShader->getGeometryShaderInvocations();
>+        }
>+    }
>+
>+    return true;
>+}
>+
>+GLuint Program::getTransformFeedbackVaryingResourceIndex(const GLchar *name) const
>+{
>+    ASSERT(mLinkResolved);
>+    for (GLuint tfIndex = 0; tfIndex < mState.mLinkedTransformFeedbackVaryings.size(); ++tfIndex)
>+    {
>+        const auto &tf = mState.mLinkedTransformFeedbackVaryings[tfIndex];
>+        if (tf.nameWithArrayIndex() == name)
>+        {
>+            return tfIndex;
>+        }
>+    }
>+    return GL_INVALID_INDEX;
>+}
>+
>+const TransformFeedbackVarying &Program::getTransformFeedbackVaryingResource(GLuint index) const
>+{
>+    ASSERT(mLinkResolved);
>+    ASSERT(index < mState.mLinkedTransformFeedbackVaryings.size());
>+    return mState.mLinkedTransformFeedbackVaryings[index];
>+}
>+
>+bool Program::hasDrawIDUniform() const
>+{
>+    ASSERT(mLinkResolved);
>+    return mState.mDrawIDLocation >= 0;
>+}
>+
>+void Program::setDrawIDUniform(GLint drawid)
>+{
>+    ASSERT(mLinkResolved);
>+    ASSERT(mState.mDrawIDLocation >= 0);
>+    mProgram->setUniform1iv(mState.mDrawIDLocation, 1, &drawid);
>+}
>+
>+bool Program::linkVaryings(InfoLog &infoLog) const
>+{
>+    Shader *previousShader = nullptr;
>+    for (ShaderType shaderType : kAllGraphicsShaderTypes)
>+    {
>+        Shader *currentShader = mState.mAttachedShaders[shaderType];
>+        if (!currentShader)
>+        {
>+            continue;
>+        }
>+
>+        if (previousShader)
>+        {
>+            if (!linkValidateShaderInterfaceMatching(previousShader, currentShader, infoLog))
>+            {
>+                return false;
>+            }
>+        }
>+        previousShader = currentShader;
>+    }
>+
>+    if (!linkValidateBuiltInVaryings(infoLog))
>+    {
>+        return false;
>+    }
>+
>+    if (!linkValidateFragmentInputBindings(infoLog))
>+    {
>+        return false;
>+    }
>+
>+    return true;
>+}
>+
>+// [OpenGL ES 3.1] Chapter 7.4.1 "Shader Interface Matchining" Page 91
>+// TODO(jiawei.shao@intel.com): add validation on input/output blocks matching
>+bool Program::linkValidateShaderInterfaceMatching(gl::Shader *generatingShader,
>+                                                  gl::Shader *consumingShader,
>+                                                  gl::InfoLog &infoLog) const
>+{
>+    ASSERT(generatingShader->getShaderVersion() == consumingShader->getShaderVersion());
>+
>+    const std::vector<sh::Varying> &outputVaryings = generatingShader->getOutputVaryings();
>+    const std::vector<sh::Varying> &inputVaryings  = consumingShader->getInputVaryings();
> 
>-    for (const sh::Varying &output : fragmentVaryings)
>+    bool validateGeometryShaderInputs = consumingShader->getType() == ShaderType::Geometry;
>+
>+    for (const sh::Varying &input : inputVaryings)
>     {
>         bool matched = false;
> 
>         // Built-in varyings obey special rules
>-        if (output.isBuiltIn())
>+        if (input.isBuiltIn())
>         {
>             continue;
>         }
> 
>-        for (const sh::Varying &input : vertexVaryings)
>+        for (const sh::Varying &output : outputVaryings)
>         {
>-            if (output.name == input.name)
>+            if (input.name == output.name)
>             {
>-                ASSERT(!input.isBuiltIn());
>-                if (!linkValidateVaryings(infoLog, output.name, input, output,
>-                                          vertexShader->getShaderVersion(context)))
>+                ASSERT(!output.isBuiltIn());
>+
>+                std::string mismatchedStructFieldName;
>+                LinkMismatchError linkError =
>+                    LinkValidateVaryings(output, input, generatingShader->getShaderVersion(),
>+                                         validateGeometryShaderInputs, &mismatchedStructFieldName);
>+                if (linkError != LinkMismatchError::NO_MISMATCH)
>                 {
>+                    LogLinkMismatch(infoLog, input.name, "varying", linkError,
>+                                    mismatchedStructFieldName, generatingShader->getType(),
>+                                    consumingShader->getType());
>                     return false;
>                 }
> 
>@@ -2003,60 +2897,73 @@ bool Program::linkVaryings(const Context *context, InfoLog &infoLog) const
>             }
>         }
> 
>-        // We permit unmatched, unreferenced varyings
>-        if (!matched && output.staticUse)
>+        // We permit unmatched, unreferenced varyings. Note that this specifically depends on
>+        // whether the input is statically used - a statically used input should fail this test even
>+        // if it is not active. GLSL ES 3.00.6 section 4.3.10.
>+        if (!matched && input.staticUse)
>         {
>-            infoLog << "Fragment varying " << output.name << " does not match any vertex varying";
>+            infoLog << GetShaderTypeString(consumingShader->getType()) << " varying " << input.name
>+                    << " does not match any " << GetShaderTypeString(generatingShader->getType())
>+                    << " varying";
>             return false;
>         }
>+    }
>+
>+    // TODO(jmadill): verify no unmatched output varyings?
>+
>+    return true;
>+}
>+
>+bool Program::linkValidateFragmentInputBindings(gl::InfoLog &infoLog) const
>+{
>+    ASSERT(mState.mAttachedShaders[ShaderType::Fragment]);
> 
>-        // Check for aliased path rendering input bindings (if any).
>-        // If more than one binding refer statically to the same
>-        // location the link must fail.
>+    std::map<GLuint, std::string> staticFragmentInputLocations;
> 
>-        if (!output.staticUse)
>+    const std::vector<sh::Varying> &fragmentInputVaryings =
>+        mState.mAttachedShaders[ShaderType::Fragment]->getInputVaryings();
>+    for (const sh::Varying &input : fragmentInputVaryings)
>+    {
>+        if (input.isBuiltIn() || !input.staticUse)
>+        {
>             continue;
>+        }
> 
>-        const auto inputBinding = mFragmentInputBindings.getBinding(output.name);
>+        const auto inputBinding = mFragmentInputBindings.getBinding(input.name);
>         if (inputBinding == -1)
>             continue;
> 
>         const auto it = staticFragmentInputLocations.find(inputBinding);
>         if (it == std::end(staticFragmentInputLocations))
>         {
>-            staticFragmentInputLocations.insert(std::make_pair(inputBinding, output.name));
>+            staticFragmentInputLocations.insert(std::make_pair(inputBinding, input.name));
>         }
>         else
>         {
>-            infoLog << "Binding for fragment input " << output.name << " conflicts with "
>+            infoLog << "Binding for fragment input " << input.name << " conflicts with "
>                     << it->second;
>             return false;
>         }
>     }
> 
>-    if (!linkValidateBuiltInVaryings(context, infoLog))
>-    {
>-        return false;
>-    }
>-
>-    // TODO(jmadill): verify no unmatched vertex varyings?
>-
>     return true;
> }
> 
>-bool Program::linkUniforms(const Context *context,
>+bool Program::linkUniforms(const Caps &caps,
>                            InfoLog &infoLog,
>-                           const Bindings &uniformLocationBindings)
>+                           const ProgramBindings &uniformLocationBindings,
>+                           GLuint *combinedImageUniformsCount,
>+                           std::vector<UnusedUniform> *unusedUniforms)
> {
>     UniformLinker linker(mState);
>-    if (!linker.link(context, infoLog, uniformLocationBindings))
>+    if (!linker.link(caps, infoLog, uniformLocationBindings))
>     {
>         return false;
>     }
> 
>-    linker.getResults(&mState.mUniforms, &mState.mUniformLocations);
>+    linker.getResults(&mState.mUniforms, unusedUniforms, &mState.mUniformLocations);
> 
>-    linkSamplerAndImageBindings();
>+    linkSamplerAndImageBindings(combinedImageUniformsCount);
> 
>     if (!linkAtomicCounterBuffers())
>     {
>@@ -2066,8 +2973,10 @@ bool Program::linkUniforms(const Context *context,
>     return true;
> }
> 
>-void Program::linkSamplerAndImageBindings()
>+void Program::linkSamplerAndImageBindings(GLuint *combinedImageUniforms)
> {
>+    ASSERT(combinedImageUniforms);
>+
>     unsigned int high = static_cast<unsigned int>(mState.mUniforms.size());
>     unsigned int low  = high;
> 
>@@ -2088,7 +2997,7 @@ void Program::linkSamplerAndImageBindings()
>     }
> 
>     mState.mImageUniformRange = RangeUI(low, high);
>-
>+    *combinedImageUniforms    = 0u;
>     // If uniform is a image type, insert it into the mImageBindings array.
>     for (unsigned int imageIndex : mState.mImageUniformRange)
>     {
>@@ -2105,8 +3014,11 @@ void Program::linkSamplerAndImageBindings()
>         else
>         {
>             mState.mImageBindings.emplace_back(
>-                ImageBinding(imageUniform.binding, imageUniform.getBasicTypeElementCount()));
>+                ImageBinding(imageUniform.binding, imageUniform.getBasicTypeElementCount(), false));
>         }
>+
>+        GLuint arraySize = imageUniform.isArray() ? imageUniform.arraySizes[0] : 1u;
>+        *combinedImageUniforms += imageUniform.activeShaderCount() * arraySize;
>     }
> 
>     high = low;
>@@ -2123,9 +3035,10 @@ void Program::linkSamplerAndImageBindings()
>     for (unsigned int samplerIndex : mState.mSamplerUniformRange)
>     {
>         const auto &samplerUniform = mState.mUniforms[samplerIndex];
>-        GLenum textureType         = SamplerTypeToTextureType(samplerUniform.type);
>-        mState.mSamplerBindings.emplace_back(
>-            SamplerBinding(textureType, samplerUniform.getBasicTypeElementCount(), false));
>+        TextureType textureType    = SamplerTypeToTextureType(samplerUniform.type);
>+        unsigned int elementCount  = samplerUniform.getBasicTypeElementCount();
>+        SamplerFormat format       = samplerUniform.typeInfo->samplerFormat;
>+        mState.mSamplerBindings.emplace_back(textureType, format, elementCount, false);
>     }
> }
> 
>@@ -2133,8 +3046,13 @@ bool Program::linkAtomicCounterBuffers()
> {
>     for (unsigned int index : mState.mAtomicCounterUniformRange)
>     {
>-        auto &uniform = mState.mUniforms[index];
>-        bool found    = false;
>+        auto &uniform                      = mState.mUniforms[index];
>+        uniform.blockInfo.offset           = uniform.offset;
>+        uniform.blockInfo.arrayStride      = (uniform.isArray() ? 4 : 0);
>+        uniform.blockInfo.matrixStride     = 0;
>+        uniform.blockInfo.isRowMajorMatrix = false;
>+
>+        bool found = false;
>         for (unsigned int bufferIndex = 0; bufferIndex < mState.mAtomicCounterBuffers.size();
>              ++bufferIndex)
>         {
>@@ -2159,42 +3077,31 @@ bool Program::linkAtomicCounterBuffers()
>         }
>     }
>     // TODO(jie.a.chen@intel.com): Count each atomic counter buffer to validate against
>-    // gl_Max[Vertex|Fragment|Compute|Combined]AtomicCounterBuffers.
>+    // gl_Max[Vertex|Fragment|Compute|Geometry|Combined]AtomicCounterBuffers.
> 
>     return true;
> }
> 
>-bool Program::linkValidateInterfaceBlockFields(InfoLog &infoLog,
>-                                               const std::string &uniformName,
>-                                               const sh::InterfaceBlockField &vertexUniform,
>-                                               const sh::InterfaceBlockField &fragmentUniform,
>-                                               bool webglCompatibility)
>+// Assigns locations to all attributes from the bindings and program locations.
>+bool Program::linkAttributes(const Caps &caps, InfoLog &infoLog)
> {
>-    // If webgl, validate precision of UBO fields, otherwise don't.  See Khronos bug 10287.
>-    if (!linkValidateVariablesBase(infoLog, uniformName, vertexUniform, fragmentUniform,
>-                                   webglCompatibility))
>+    Shader *vertexShader = mState.getAttachedShader(ShaderType::Vertex);
>+
>+    int shaderVersion = vertexShader->getShaderVersion();
>+
>+    unsigned int usedLocations = 0;
>+    if (shaderVersion >= 300)
>     {
>-        return false;
>+        // In GLSL ES 3.00.6, aliasing checks should be done with all declared attributes - see GLSL
>+        // ES 3.00.6 section 12.46. Inactive attributes will be pruned after aliasing checks.
>+        mState.mAttributes = vertexShader->getAllAttributes();
>     }
>-
>-    if (vertexUniform.isRowMajorLayout != fragmentUniform.isRowMajorLayout)
>+    else
>     {
>-        infoLog << "Matrix packings for " << uniformName << " differ between vertex and fragment shaders";
>-        return false;
>+        // In GLSL ES 1.00.17 we only do aliasing checks for active attributes.
>+        mState.mAttributes = vertexShader->getActiveAttributes();
>     }
>-
>-    return true;
>-}
>-
>-// Assigns locations to all attributes from the bindings and program locations.
>-bool Program::linkAttributes(const Context *context, InfoLog &infoLog)
>-{
>-    const ContextState &data = context->getContextState();
>-    auto *vertexShader       = mState.getAttachedVertexShader();
>-
>-    unsigned int usedLocations = 0;
>-    mState.mAttributes         = vertexShader->getActiveAttributes(context);
>-    GLuint maxAttribs          = data.getCaps().maxVertexAttributes;
>+    GLuint maxAttribs = caps.maxVertexAttributes;
> 
>     // TODO(jmadill): handle aliasing robustly
>     if (mState.mAttributes.size() > maxAttribs)
>@@ -2205,7 +3112,7 @@ bool Program::linkAttributes(const Context *context, InfoLog &infoLog)
> 
>     std::vector<sh::Attribute *> usedAttribMap(maxAttribs, nullptr);
> 
>-    // Link attributes that have a binding location
>+    // Assign locations to attributes that have a binding location and check for attribute aliasing.
>     for (sh::Attribute &attribute : mState.mAttributes)
>     {
>         // GLSL ES 3.10 January 2016 section 4.3.4: Vertex shader inputs can't be arrays or
>@@ -2226,8 +3133,8 @@ bool Program::linkAttributes(const Context *context, InfoLog &infoLog)
> 
>             if (static_cast<GLuint>(regs + attribute.location) > maxAttribs)
>             {
>-                infoLog << "Active attribute (" << attribute.name << ") at location "
>-                        << attribute.location << " is too big to fit";
>+                infoLog << "Attribute (" << attribute.name << ") at location " << attribute.location
>+                        << " is too big to fit";
> 
>                 return false;
>             }
>@@ -2237,12 +3144,13 @@ bool Program::linkAttributes(const Context *context, InfoLog &infoLog)
>                 const int regLocation               = attribute.location + reg;
>                 sh::ShaderVariable *linkedAttribute = usedAttribMap[regLocation];
> 
>-                // In GLSL 3.00, attribute aliasing produces a link error
>-                // In GLSL 1.00, attribute aliasing is allowed, but ANGLE currently has a bug
>+                // In GLSL ES 3.00.6 and in WebGL, attribute aliasing produces a link error.
>+                // In non-WebGL GLSL ES 1.00.17, attribute aliasing is allowed with some
>+                // restrictions - see GLSL ES 1.00.17 section 2.10.4, but ANGLE currently has a bug.
>                 if (linkedAttribute)
>                 {
>                     // TODO(jmadill): fix aliasing on ES2
>-                    // if (mProgram->getShaderVersion() >= 300)
>+                    // if (shaderVersion >= 300 && !webgl)
>                     {
>                         infoLog << "Attribute '" << attribute.name << "' aliases attribute '"
>                                 << linkedAttribute->name << "' at location " << regLocation;
>@@ -2259,7 +3167,7 @@ bool Program::linkAttributes(const Context *context, InfoLog &infoLog)
>         }
>     }
> 
>-    // Link attributes that don't have a binding location
>+    // Assign locations to attributes that don't have a binding location.
>     for (sh::Attribute &attribute : mState.mAttributes)
>     {
>         // Not set by glBindAttribLocation or by location layout qualifier
>@@ -2270,7 +3178,7 @@ bool Program::linkAttributes(const Context *context, InfoLog &infoLog)
> 
>             if (availableIndex == -1 || static_cast<GLuint>(availableIndex + regs) > maxAttribs)
>             {
>-                infoLog << "Too many active attributes (" << attribute.name << ")";
>+                infoLog << "Too many attributes (" << attribute.name << ")";
>                 return false;
>             }
> 
>@@ -2278,8 +3186,30 @@ bool Program::linkAttributes(const Context *context, InfoLog &infoLog)
>         }
>     }
> 
>+    ASSERT(mState.mAttributesTypeMask.none());
>+    ASSERT(mState.mAttributesMask.none());
>+
>+    // Prune inactive attributes. This step is only needed on shaderVersion >= 300 since on earlier
>+    // shader versions we're only processing active attributes to begin with.
>+    if (shaderVersion >= 300)
>+    {
>+        for (auto attributeIter = mState.mAttributes.begin();
>+             attributeIter != mState.mAttributes.end();)
>+        {
>+            if (attributeIter->active)
>+            {
>+                ++attributeIter;
>+            }
>+            else
>+            {
>+                attributeIter = mState.mAttributes.erase(attributeIter);
>+            }
>+        }
>+    }
>+
>     for (const sh::Attribute &attribute : mState.mAttributes)
>     {
>+        ASSERT(attribute.active);
>         ASSERT(attribute.location != -1);
>         unsigned int regs = static_cast<unsigned int>(VariableRegisterCount(attribute.type));
> 
>@@ -2289,278 +3219,222 @@ bool Program::linkAttributes(const Context *context, InfoLog &infoLog)
>             mState.mActiveAttribLocationsMask.set(location);
>             mState.mMaxActiveAttribLocation =
>                 std::max(mState.mMaxActiveAttribLocation, location + 1);
>-        }
>-    }
>-
>-    return true;
>-}
>-
>-bool Program::validateVertexAndFragmentInterfaceBlocks(
>-    const std::vector<sh::InterfaceBlock> &vertexInterfaceBlocks,
>-    const std::vector<sh::InterfaceBlock> &fragmentInterfaceBlocks,
>-    InfoLog &infoLog,
>-    bool webglCompatibility) const
>-{
>-    // Check that interface blocks defined in the vertex and fragment shaders are identical
>-    typedef std::map<std::string, const sh::InterfaceBlock *> InterfaceBlockMap;
>-    InterfaceBlockMap linkedInterfaceBlocks;
>-
>-    for (const sh::InterfaceBlock &vertexInterfaceBlock : vertexInterfaceBlocks)
>-    {
>-        linkedInterfaceBlocks[vertexInterfaceBlock.name] = &vertexInterfaceBlock;
>-    }
> 
>-    for (const sh::InterfaceBlock &fragmentInterfaceBlock : fragmentInterfaceBlocks)
>-    {
>-        auto entry = linkedInterfaceBlocks.find(fragmentInterfaceBlock.name);
>-        if (entry != linkedInterfaceBlocks.end())
>-        {
>-            const sh::InterfaceBlock &vertexInterfaceBlock = *entry->second;
>-            if (!areMatchingInterfaceBlocks(infoLog, vertexInterfaceBlock, fragmentInterfaceBlock,
>-                                            webglCompatibility))
>+            // gl_VertexID and gl_InstanceID are active attributes but don't have a bound attribute.
>+            if (!attribute.isBuiltIn())
>             {
>-                return false;
>+                ComponentType componentType =
>+                    GLenumToComponentType(VariableComponentType(attribute.type));
>+
>+                SetComponentTypeMask(componentType, location, &mState.mAttributesTypeMask);
>+                mState.mAttributesMask.set(location);
>             }
>         }
>-        // TODO(jiajia.qin@intel.com): Add
>-        // MAX_COMBINED_UNIFORM_BLOCKS/MAX_COMBINED_SHADER_STORAGE_BLOCKS validation.
>     }
>+
>     return true;
> }
> 
>-bool Program::linkInterfaceBlocks(const Context *context, InfoLog &infoLog)
>+bool Program::linkInterfaceBlocks(const Caps &caps,
>+                                  const Version &version,
>+                                  bool webglCompatibility,
>+                                  InfoLog &infoLog,
>+                                  GLuint *combinedShaderStorageBlocksCount)
> {
>-    const auto &caps = context->getCaps();
>+    ASSERT(combinedShaderStorageBlocksCount);
> 
>-    if (mState.mAttachedComputeShader)
>+    GLuint combinedUniformBlocksCount                                         = 0u;
>+    GLuint numShadersHasUniformBlocks                                         = 0u;
>+    ShaderMap<const std::vector<sh::InterfaceBlock> *> allShaderUniformBlocks = {};
>+    for (ShaderType shaderType : AllShaderTypes())
>     {
>-        Shader &computeShader              = *mState.mAttachedComputeShader;
>-        const auto &computeUniformBlocks   = computeShader.getUniformBlocks(context);
>-
>-        if (!validateInterfaceBlocksCount(
>-                caps.maxComputeUniformBlocks, computeUniformBlocks,
>-                "Compute shader uniform block count exceeds GL_MAX_COMPUTE_UNIFORM_BLOCKS (",
>-                infoLog))
>+        Shader *shader = mState.mAttachedShaders[shaderType];
>+        if (!shader)
>         {
>-            return false;
>+            continue;
>         }
> 
>-        const auto &computeShaderStorageBlocks = computeShader.getShaderStorageBlocks(context);
>-        if (!validateInterfaceBlocksCount(caps.maxComputeShaderStorageBlocks,
>-                                          computeShaderStorageBlocks,
>-                                          "Compute shader shader storage block count exceeds "
>-                                          "GL_MAX_COMPUTE_SHADER_STORAGE_BLOCKS (",
>-                                          infoLog))
>+        const auto &uniformBlocks = shader->getUniformBlocks();
>+        if (!uniformBlocks.empty())
>         {
>-            return false;
>+            if (!ValidateInterfaceBlocksCount(
>+                    caps.maxShaderUniformBlocks[shaderType], uniformBlocks, shaderType,
>+                    sh::BlockType::BLOCK_UNIFORM, &combinedUniformBlocksCount, infoLog))
>+            {
>+                return false;
>+            }
>+
>+            allShaderUniformBlocks[shaderType] = &uniformBlocks;
>+            ++numShadersHasUniformBlocks;
>         }
>-        return true;
>     }
> 
>-    Shader &vertexShader   = *mState.mAttachedVertexShader;
>-    Shader &fragmentShader = *mState.mAttachedFragmentShader;
>-
>-    const auto &vertexUniformBlocks   = vertexShader.getUniformBlocks(context);
>-    const auto &fragmentUniformBlocks = fragmentShader.getUniformBlocks(context);
>-
>-    if (!validateInterfaceBlocksCount(
>-            caps.maxVertexUniformBlocks, vertexUniformBlocks,
>-            "Vertex shader uniform block count exceeds GL_MAX_VERTEX_UNIFORM_BLOCKS (", infoLog))
>+    if (combinedUniformBlocksCount > caps.maxCombinedUniformBlocks)
>     {
>-        return false;
>-    }
>-    if (!validateInterfaceBlocksCount(
>-            caps.maxFragmentUniformBlocks, fragmentUniformBlocks,
>-            "Fragment shader uniform block count exceeds GL_MAX_FRAGMENT_UNIFORM_BLOCKS (",
>-            infoLog))
>-    {
>-
>+        infoLog << "The sum of the number of active uniform blocks exceeds "
>+                   "MAX_COMBINED_UNIFORM_BLOCKS ("
>+                << caps.maxCombinedUniformBlocks << ").";
>         return false;
>     }
> 
>-    bool webglCompatibility = context->getExtensions().webglCompatibility;
>-    if (!validateVertexAndFragmentInterfaceBlocks(vertexUniformBlocks, fragmentUniformBlocks,
>-                                                  infoLog, webglCompatibility))
>+    if (!ValidateInterfaceBlocksMatch(numShadersHasUniformBlocks, allShaderUniformBlocks, infoLog,
>+                                      webglCompatibility))
>     {
>         return false;
>     }
> 
>-    if (context->getClientVersion() >= Version(3, 1))
>+    if (version >= Version(3, 1))
>     {
>-        const auto &vertexShaderStorageBlocks   = vertexShader.getShaderStorageBlocks(context);
>-        const auto &fragmentShaderStorageBlocks = fragmentShader.getShaderStorageBlocks(context);
>-
>-        if (!validateInterfaceBlocksCount(caps.maxVertexShaderStorageBlocks,
>-                                          vertexShaderStorageBlocks,
>-                                          "Vertex shader shader storage block count exceeds "
>-                                          "GL_MAX_VERTEX_SHADER_STORAGE_BLOCKS (",
>-                                          infoLog))
>-        {
>-            return false;
>-        }
>-        if (!validateInterfaceBlocksCount(caps.maxFragmentShaderStorageBlocks,
>-                                          fragmentShaderStorageBlocks,
>-                                          "Fragment shader shader storage block count exceeds "
>-                                          "GL_MAX_FRAGMENT_SHADER_STORAGE_BLOCKS (",
>-                                          infoLog))
>+        *combinedShaderStorageBlocksCount                                         = 0u;
>+        GLuint numShadersHasShaderStorageBlocks                                   = 0u;
>+        ShaderMap<const std::vector<sh::InterfaceBlock> *> allShaderStorageBlocks = {};
>+        for (ShaderType shaderType : AllShaderTypes())
>         {
>+            Shader *shader = mState.mAttachedShaders[shaderType];
>+            if (!shader)
>+            {
>+                continue;
>+            }
> 
>-            return false;
>-        }
>+            const auto &shaderStorageBlocks = shader->getShaderStorageBlocks();
>+            if (!shaderStorageBlocks.empty())
>+            {
>+                if (!ValidateInterfaceBlocksCount(
>+                        caps.maxShaderStorageBlocks[shaderType], shaderStorageBlocks, shaderType,
>+                        sh::BlockType::BLOCK_BUFFER, combinedShaderStorageBlocksCount, infoLog))
>+                {
>+                    return false;
>+                }
> 
>-        if (!validateVertexAndFragmentInterfaceBlocks(vertexShaderStorageBlocks,
>-                                                      fragmentShaderStorageBlocks, infoLog,
>-                                                      webglCompatibility))
>-        {
>-            return false;
>+                allShaderStorageBlocks[shaderType] = &shaderStorageBlocks;
>+                ++numShadersHasShaderStorageBlocks;
>+            }
>         }
>-    }
>-    return true;
>-}
> 
>-bool Program::areMatchingInterfaceBlocks(InfoLog &infoLog,
>-                                         const sh::InterfaceBlock &vertexInterfaceBlock,
>-                                         const sh::InterfaceBlock &fragmentInterfaceBlock,
>-                                         bool webglCompatibility) const
>-{
>-    const char* blockName = vertexInterfaceBlock.name.c_str();
>-    // validate blocks for the same member types
>-    if (vertexInterfaceBlock.fields.size() != fragmentInterfaceBlock.fields.size())
>-    {
>-        infoLog << "Types for interface block '" << blockName
>-                << "' differ between vertex and fragment shaders";
>-        return false;
>-    }
>-    if (vertexInterfaceBlock.arraySize != fragmentInterfaceBlock.arraySize)
>-    {
>-        infoLog << "Array sizes differ for interface block '" << blockName
>-                << "' between vertex and fragment shaders";
>-        return false;
>-    }
>-    if (vertexInterfaceBlock.layout != fragmentInterfaceBlock.layout ||
>-        vertexInterfaceBlock.isRowMajorLayout != fragmentInterfaceBlock.isRowMajorLayout ||
>-        vertexInterfaceBlock.binding != fragmentInterfaceBlock.binding)
>-    {
>-        infoLog << "Layout qualifiers differ for interface block '" << blockName
>-                << "' between vertex and fragment shaders";
>-        return false;
>-    }
>-    const unsigned int numBlockMembers =
>-        static_cast<unsigned int>(vertexInterfaceBlock.fields.size());
>-    for (unsigned int blockMemberIndex = 0; blockMemberIndex < numBlockMembers; blockMemberIndex++)
>-    {
>-        const sh::InterfaceBlockField &vertexMember = vertexInterfaceBlock.fields[blockMemberIndex];
>-        const sh::InterfaceBlockField &fragmentMember = fragmentInterfaceBlock.fields[blockMemberIndex];
>-        if (vertexMember.name != fragmentMember.name)
>+        if (*combinedShaderStorageBlocksCount > caps.maxCombinedShaderStorageBlocks)
>         {
>-            infoLog << "Name mismatch for field " << blockMemberIndex
>-                    << " of interface block '" << blockName
>-                    << "': (in vertex: '" << vertexMember.name
>-                    << "', in fragment: '" << fragmentMember.name << "')";
>+            infoLog << "The sum of the number of active shader storage blocks exceeds "
>+                       "MAX_COMBINED_SHADER_STORAGE_BLOCKS ("
>+                    << caps.maxCombinedShaderStorageBlocks << ").";
>             return false;
>         }
>-        std::string memberName = "interface block '" + vertexInterfaceBlock.name + "' member '" + vertexMember.name + "'";
>-        if (!linkValidateInterfaceBlockFields(infoLog, memberName, vertexMember, fragmentMember,
>-                                              webglCompatibility))
>+
>+        if (!ValidateInterfaceBlocksMatch(numShadersHasShaderStorageBlocks, allShaderStorageBlocks,
>+                                          infoLog, webglCompatibility))
>         {
>             return false;
>         }
>     }
>+
>     return true;
> }
> 
>-bool Program::linkValidateVariablesBase(InfoLog &infoLog, const std::string &variableName, const sh::ShaderVariable &vertexVariable,
>-                                              const sh::ShaderVariable &fragmentVariable, bool validatePrecision)
>+LinkMismatchError Program::LinkValidateVariablesBase(const sh::ShaderVariable &variable1,
>+                                                     const sh::ShaderVariable &variable2,
>+                                                     bool validatePrecision,
>+                                                     bool validateArraySize,
>+                                                     std::string *mismatchedStructOrBlockMemberName)
> {
>-    if (vertexVariable.type != fragmentVariable.type)
>+    if (variable1.type != variable2.type)
>     {
>-        infoLog << "Types for " << variableName << " differ between vertex and fragment shaders";
>-        return false;
>+        return LinkMismatchError::TYPE_MISMATCH;
>     }
>-    if (vertexVariable.arraySizes != fragmentVariable.arraySizes)
>+    if (validateArraySize && variable1.arraySizes != variable2.arraySizes)
>     {
>-        infoLog << "Array sizes for " << variableName << " differ between vertex and fragment shaders";
>-        return false;
>+        return LinkMismatchError::ARRAY_SIZE_MISMATCH;
>     }
>-    if (validatePrecision && vertexVariable.precision != fragmentVariable.precision)
>+    if (validatePrecision && variable1.precision != variable2.precision)
>     {
>-        infoLog << "Precisions for " << variableName << " differ between vertex and fragment shaders";
>-        return false;
>+        return LinkMismatchError::PRECISION_MISMATCH;
>     }
>-    if (vertexVariable.structName != fragmentVariable.structName)
>+    if (variable1.structName != variable2.structName)
>     {
>-        infoLog << "Structure names for " << variableName
>-                << " differ between vertex and fragment shaders";
>-        return false;
>+        return LinkMismatchError::STRUCT_NAME_MISMATCH;
>     }
> 
>-    if (vertexVariable.fields.size() != fragmentVariable.fields.size())
>+    if (variable1.fields.size() != variable2.fields.size())
>     {
>-        infoLog << "Structure lengths for " << variableName << " differ between vertex and fragment shaders";
>-        return false;
>+        return LinkMismatchError::FIELD_NUMBER_MISMATCH;
>     }
>-    const unsigned int numMembers = static_cast<unsigned int>(vertexVariable.fields.size());
>+    const unsigned int numMembers = static_cast<unsigned int>(variable1.fields.size());
>     for (unsigned int memberIndex = 0; memberIndex < numMembers; memberIndex++)
>     {
>-        const sh::ShaderVariable &vertexMember = vertexVariable.fields[memberIndex];
>-        const sh::ShaderVariable &fragmentMember = fragmentVariable.fields[memberIndex];
>+        const sh::ShaderVariable &member1 = variable1.fields[memberIndex];
>+        const sh::ShaderVariable &member2 = variable2.fields[memberIndex];
> 
>-        if (vertexMember.name != fragmentMember.name)
>+        if (member1.name != member2.name)
>         {
>-            infoLog << "Name mismatch for field '" << memberIndex
>-                    << "' of " << variableName
>-                    << ": (in vertex: '" << vertexMember.name
>-                    << "', in fragment: '" << fragmentMember.name << "')";
>-            return false;
>+            return LinkMismatchError::FIELD_NAME_MISMATCH;
>         }
> 
>-        const std::string memberName = variableName.substr(0, variableName.length() - 1) + "." +
>-                                       vertexMember.name + "'";
>-
>-        if (!linkValidateVariablesBase(infoLog, vertexMember.name, vertexMember, fragmentMember, validatePrecision))
>+        LinkMismatchError linkErrorOnField = LinkValidateVariablesBase(
>+            member1, member2, validatePrecision, true, mismatchedStructOrBlockMemberName);
>+        if (linkErrorOnField != LinkMismatchError::NO_MISMATCH)
>         {
>-            return false;
>+            AddParentPrefix(member1.name, mismatchedStructOrBlockMemberName);
>+            return linkErrorOnField;
>         }
>     }
> 
>-    return true;
>+    return LinkMismatchError::NO_MISMATCH;
> }
> 
>-bool Program::linkValidateVaryings(InfoLog &infoLog,
>-                                   const std::string &varyingName,
>-                                   const sh::Varying &vertexVarying,
>-                                   const sh::Varying &fragmentVarying,
>-                                   int shaderVersion)
>+LinkMismatchError Program::LinkValidateVaryings(const sh::Varying &outputVarying,
>+                                                const sh::Varying &inputVarying,
>+                                                int shaderVersion,
>+                                                bool validateGeometryShaderInputVarying,
>+                                                std::string *mismatchedStructFieldName)
> {
>-    if (!linkValidateVariablesBase(infoLog, varyingName, vertexVarying, fragmentVarying, false))
>+    if (validateGeometryShaderInputVarying)
>     {
>-        return false;
>+        // [GL_EXT_geometry_shader] Section 11.1gs.4.3:
>+        // The OpenGL ES Shading Language doesn't support multi-dimensional arrays as shader inputs
>+        // or outputs.
>+        ASSERT(inputVarying.arraySizes.size() == 1u);
>+
>+        // Geometry shader input varyings are not treated as arrays, so a vertex array output
>+        // varying cannot match a geometry shader input varying.
>+        // [GL_EXT_geometry_shader] Section 7.4.1:
>+        // Geometry shader per-vertex input variables and blocks are required to be declared as
>+        // arrays, with each element representing input or output values for a single vertex of a
>+        // multi-vertex primitive. For the purposes of interface matching, such variables and blocks
>+        // are treated as though they were not declared as arrays.
>+        if (outputVarying.isArray())
>+        {
>+            return LinkMismatchError::ARRAY_SIZE_MISMATCH;
>+        }
>     }
> 
>-    if (!sh::InterpolationTypesMatch(vertexVarying.interpolation, fragmentVarying.interpolation))
>+    // Skip the validation on the array sizes between a vertex output varying and a geometry input
>+    // varying as it has been done before.
>+    LinkMismatchError linkError =
>+        LinkValidateVariablesBase(outputVarying, inputVarying, false,
>+                                  !validateGeometryShaderInputVarying, mismatchedStructFieldName);
>+    if (linkError != LinkMismatchError::NO_MISMATCH)
>     {
>-        infoLog << "Interpolation types for " << varyingName
>-                << " differ between vertex and fragment shaders.";
>-        return false;
>+        return linkError;
>     }
> 
>-    if (shaderVersion == 100 && vertexVarying.isInvariant != fragmentVarying.isInvariant)
>+    if (!sh::InterpolationTypesMatch(outputVarying.interpolation, inputVarying.interpolation))
>     {
>-        infoLog << "Invariance for " << varyingName
>-                << " differs between vertex and fragment shaders.";
>-        return false;
>+        return LinkMismatchError::INTERPOLATION_TYPE_MISMATCH;
>     }
> 
>-    return true;
>+    if (shaderVersion == 100 && outputVarying.isInvariant != inputVarying.isInvariant)
>+    {
>+        return LinkMismatchError::INVARIANCE_MISMATCH;
>+    }
>+
>+    return LinkMismatchError::NO_MISMATCH;
> }
> 
>-bool Program::linkValidateBuiltInVaryings(const Context *context, InfoLog &infoLog) const
>+bool Program::linkValidateBuiltInVaryings(InfoLog &infoLog) const
> {
>-    Shader *vertexShader         = mState.mAttachedVertexShader;
>-    Shader *fragmentShader       = mState.mAttachedFragmentShader;
>-    const auto &vertexVaryings   = vertexShader->getOutputVaryings(context);
>-    const auto &fragmentVaryings = fragmentShader->getInputVaryings(context);
>-    int shaderVersion            = vertexShader->getShaderVersion(context);
>+    Shader *vertexShader         = mState.mAttachedShaders[ShaderType::Vertex];
>+    Shader *fragmentShader       = mState.mAttachedShaders[ShaderType::Fragment];
>+    const auto &vertexVaryings   = vertexShader->getOutputVaryings();
>+    const auto &fragmentVaryings = fragmentShader->getInputVaryings();
>+    int shaderVersion            = vertexShader->getShaderVersion();
> 
>     if (shaderVersion != 100)
>     {
>@@ -2625,130 +3499,151 @@ bool Program::linkValidateBuiltInVaryings(const Context *context, InfoLog &infoL
>     return true;
> }
> 
>-bool Program::linkValidateTransformFeedback(const gl::Context *context,
>+bool Program::linkValidateTransformFeedback(const Version &version,
>                                             InfoLog &infoLog,
>-                                            const Program::MergedVaryings &varyings,
>+                                            const ProgramMergedVaryings &varyings,
>                                             const Caps &caps) const
> {
>-    size_t totalComponents = 0;
> 
>+    // Validate the tf names regardless of the actual program varyings.
>     std::set<std::string> uniqueNames;
>-
>     for (const std::string &tfVaryingName : mState.mTransformFeedbackVaryingNames)
>     {
>-        bool found = false;
>-        std::vector<unsigned int> subscripts;
>+        if (version < Version(3, 1) && tfVaryingName.find('[') != std::string::npos)
>+        {
>+            infoLog << "Capture of array elements is undefined and not supported.";
>+            return false;
>+        }
>+        if (version >= Version(3, 1))
>+        {
>+            if (IncludeSameArrayElement(uniqueNames, tfVaryingName))
>+            {
>+                infoLog << "Two transform feedback varyings include the same array element ("
>+                        << tfVaryingName << ").";
>+                return false;
>+            }
>+        }
>+        else
>+        {
>+            if (uniqueNames.count(tfVaryingName) > 0)
>+            {
>+                infoLog << "Two transform feedback varyings specify the same output variable ("
>+                        << tfVaryingName << ").";
>+                return false;
>+            }
>+        }
>+        uniqueNames.insert(tfVaryingName);
>+    }
>+
>+    // Validate against program varyings.
>+    size_t totalComponents = 0;
>+    for (const std::string &tfVaryingName : mState.mTransformFeedbackVaryingNames)
>+    {
>+        std::vector<unsigned int> subscripts;
>         std::string baseName = ParseResourceName(tfVaryingName, &subscripts);
> 
>-        for (const auto &ref : varyings)
>+        const sh::ShaderVariable *var = FindVaryingOrField(varyings, baseName);
>+        if (var == nullptr)
>         {
>-            const sh::Varying *varying = ref.second.get();
>+            infoLog << "Transform feedback varying " << tfVaryingName
>+                    << " does not exist in the vertex shader.";
>+            return false;
>+        }
> 
>-            if (baseName == varying->name)
>-            {
>-                if (uniqueNames.count(tfVaryingName) > 0)
>-                {
>-                    infoLog << "Two transform feedback varyings specify the same output variable ("
>-                            << tfVaryingName << ").";
>-                    return false;
>-                }
>-                if (context->getClientVersion() >= Version(3, 1))
>-                {
>-                    if (IncludeSameArrayElement(uniqueNames, tfVaryingName))
>-                    {
>-                        infoLog
>-                            << "Two transform feedback varyings include the same array element ("
>-                            << tfVaryingName << ").";
>-                        return false;
>-                    }
>-                }
>-                else if (varying->isArray())
>-                {
>-                    infoLog << "Capture of arrays is undefined and not supported.";
>-                    return false;
>-                }
>+        // Validate the matching variable.
>+        if (var->isStruct())
>+        {
>+            infoLog << "Struct cannot be captured directly (" << baseName << ").";
>+            return false;
>+        }
> 
>-                uniqueNames.insert(tfVaryingName);
>+        size_t elementCount   = 0;
>+        size_t componentCount = 0;
> 
>-                // TODO(jmadill): Investigate implementation limits on D3D11
>+        if (var->isArray())
>+        {
>+            if (version < Version(3, 1))
>+            {
>+                infoLog << "Capture of arrays is undefined and not supported.";
>+                return false;
>+            }
> 
>-                // GLSL ES 3.10 section 4.3.6: A vertex output can't be an array of arrays.
>-                ASSERT(!varying->isArrayOfArrays());
>-                size_t elementCount =
>-                    ((varying->isArray() && subscripts.empty()) ? varying->getOutermostArraySize()
>-                                                                : 1);
>-                size_t componentCount = VariableComponentCount(varying->type) * elementCount;
>-                if (mState.mTransformFeedbackBufferMode == GL_SEPARATE_ATTRIBS &&
>-                    componentCount > caps.maxTransformFeedbackSeparateComponents)
>-                {
>-                    infoLog << "Transform feedback varying's " << varying->name << " components ("
>-                            << componentCount << ") exceed the maximum separate components ("
>-                            << caps.maxTransformFeedbackSeparateComponents << ").";
>-                    return false;
>-                }
>+            // GLSL ES 3.10 section 4.3.6: A vertex output can't be an array of arrays.
>+            ASSERT(!var->isArrayOfArrays());
> 
>-                totalComponents += componentCount;
>-                found = true;
>-                break;
>+            if (!subscripts.empty() && subscripts[0] >= var->getOutermostArraySize())
>+            {
>+                infoLog << "Cannot capture outbound array element '" << tfVaryingName << "'.";
>+                return false;
>             }
>+            elementCount = (subscripts.empty() ? var->getOutermostArraySize() : 1);
>         }
>-        if (context->getClientVersion() < Version(3, 1) &&
>-            tfVaryingName.find('[') != std::string::npos)
>+        else
>         {
>-            infoLog << "Capture of array elements is undefined and not supported.";
>-            return false;
>+            if (!subscripts.empty())
>+            {
>+                infoLog << "Varying '" << baseName
>+                        << "' is not an array to be captured by element.";
>+                return false;
>+            }
>+            elementCount = 1;
>         }
>-        if (!found)
>+
>+        // TODO(jmadill): Investigate implementation limits on D3D11
>+        componentCount = VariableComponentCount(var->type) * elementCount;
>+        if (mState.mTransformFeedbackBufferMode == GL_SEPARATE_ATTRIBS &&
>+            componentCount > caps.maxTransformFeedbackSeparateComponents)
>         {
>-            infoLog << "Transform feedback varying " << tfVaryingName
>-                    << " does not exist in the vertex shader.";
>+            infoLog << "Transform feedback varying " << tfVaryingName << " components ("
>+                    << componentCount << ") exceed the maximum separate components ("
>+                    << caps.maxTransformFeedbackSeparateComponents << ").";
>             return false;
>         }
>-    }
> 
>-    if (mState.mTransformFeedbackBufferMode == GL_INTERLEAVED_ATTRIBS &&
>-        totalComponents > caps.maxTransformFeedbackInterleavedComponents)
>-    {
>-        infoLog << "Transform feedback varying total components (" << totalComponents
>-                << ") exceed the maximum interleaved components ("
>-                << caps.maxTransformFeedbackInterleavedComponents << ").";
>-        return false;
>+        totalComponents += componentCount;
>+        if (mState.mTransformFeedbackBufferMode == GL_INTERLEAVED_ATTRIBS &&
>+            totalComponents > caps.maxTransformFeedbackInterleavedComponents)
>+        {
>+            infoLog << "Transform feedback varying total components (" << totalComponents
>+                    << ") exceed the maximum interleaved components ("
>+                    << caps.maxTransformFeedbackInterleavedComponents << ").";
>+            return false;
>+        }
>     }
>-
>     return true;
> }
> 
>-bool Program::linkValidateGlobalNames(const Context *context, InfoLog &infoLog) const
>+bool Program::linkValidateGlobalNames(InfoLog &infoLog) const
> {
>-    const std::vector<sh::Uniform> &vertexUniforms =
>-        mState.mAttachedVertexShader->getUniforms(context);
>-    const std::vector<sh::Uniform> &fragmentUniforms =
>-        mState.mAttachedFragmentShader->getUniforms(context);
>     const std::vector<sh::Attribute> &attributes =
>-        mState.mAttachedVertexShader->getActiveAttributes(context);
>+        mState.mAttachedShaders[ShaderType::Vertex]->getActiveAttributes();
>+
>     for (const auto &attrib : attributes)
>     {
>-        for (const auto &uniform : vertexUniforms)
>+        for (ShaderType shaderType : kAllGraphicsShaderTypes)
>         {
>-            if (uniform.name == attrib.name)
>+            Shader *shader = mState.mAttachedShaders[shaderType];
>+            if (!shader)
>             {
>-                infoLog << "Name conflicts between a uniform and an attribute: " << attrib.name;
>-                return false;
>+                continue;
>             }
>-        }
>-        for (const auto &uniform : fragmentUniforms)
>-        {
>-            if (uniform.name == attrib.name)
>+
>+            const std::vector<sh::Uniform> &uniforms = shader->getUniforms();
>+            for (const auto &uniform : uniforms)
>             {
>-                infoLog << "Name conflicts between a uniform and an attribute: " << attrib.name;
>-                return false;
>+                if (uniform.name == attrib.name)
>+                {
>+                    infoLog << "Name conflicts between a uniform and an attribute: " << attrib.name;
>+                    return false;
>+                }
>             }
>         }
>     }
>+
>     return true;
> }
> 
>-void Program::gatherTransformFeedbackVaryings(const Program::MergedVaryings &varyings)
>+void Program::gatherTransformFeedbackVaryings(const ProgramMergedVaryings &varyings)
> {
>     // Gather the linked varyings that are used for transform feedback, they should all exist.
>     mState.mLinkedTransformFeedbackVaryings.clear();
>@@ -2770,20 +3665,31 @@ void Program::gatherTransformFeedbackVaryings(const Program::MergedVaryings &var
>                     *varying, static_cast<GLuint>(subscript));
>                 break;
>             }
>+            else if (varying->isStruct())
>+            {
>+                const auto *field = FindShaderVarField(*varying, tfVaryingName);
>+                if (field != nullptr)
>+                {
>+                    mState.mLinkedTransformFeedbackVaryings.emplace_back(*field, *varying);
>+                    break;
>+                }
>+            }
>         }
>     }
> }
> 
>-Program::MergedVaryings Program::getMergedVaryings(const Context *context) const
>+ProgramMergedVaryings Program::getMergedVaryings() const
> {
>-    MergedVaryings merged;
>+    ProgramMergedVaryings merged;
> 
>-    for (const sh::Varying &varying : mState.mAttachedVertexShader->getOutputVaryings(context))
>+    for (const sh::Varying &varying :
>+         mState.mAttachedShaders[ShaderType::Vertex]->getOutputVaryings())
>     {
>         merged[varying.name].vertex = &varying;
>     }
> 
>-    for (const sh::Varying &varying : mState.mAttachedFragmentShader->getInputVaryings(context))
>+    for (const sh::Varying &varying :
>+         mState.mAttachedShaders[ShaderType::Fragment]->getInputVaryings())
>     {
>         merged[varying.name].fragment = &varying;
>     }
>@@ -2791,17 +3697,60 @@ Program::MergedVaryings Program::getMergedVaryings(const Context *context) const
>     return merged;
> }
> 
>+bool CompareOutputVariable(const sh::OutputVariable &a, const sh::OutputVariable &b)
>+{
>+    return a.getArraySizeProduct() > b.getArraySizeProduct();
>+}
>+
>+int Program::getOutputLocationForLink(const sh::OutputVariable &outputVariable) const
>+{
>+    if (outputVariable.location != -1)
>+    {
>+        return outputVariable.location;
>+    }
>+    int apiLocation = mFragmentOutputLocations.getBinding(outputVariable.name);
>+    if (apiLocation != -1)
>+    {
>+        return apiLocation;
>+    }
>+    return -1;
>+}
>+
>+bool Program::isOutputSecondaryForLink(const sh::OutputVariable &outputVariable) const
>+{
>+    if (outputVariable.index != -1)
>+    {
>+        ASSERT(outputVariable.index == 0 || outputVariable.index == 1);
>+        return (outputVariable.index == 1);
>+    }
>+    int apiIndex = mFragmentOutputIndexes.getBinding(outputVariable.name);
>+    if (apiIndex != -1)
>+    {
>+        // Index layout qualifier from the shader takes precedence, so the index from the API is
>+        // checked only if the index was not set in the shader. This is not specified in the EXT
>+        // spec, but is specified in desktop OpenGL specs.
>+        return (apiIndex == 1);
>+    }
>+    // EXT_blend_func_extended: Outputs get index 0 by default.
>+    return false;
>+}
> 
>-void Program::linkOutputVariables(const Context *context)
>+bool Program::linkOutputVariables(const Caps &caps,
>+                                  const Extensions &extensions,
>+                                  const Version &version,
>+                                  GLuint combinedImageUniformsCount,
>+                                  GLuint combinedShaderStorageBlocksCount)
> {
>-    Shader *fragmentShader = mState.mAttachedFragmentShader;
>+    Shader *fragmentShader = mState.mAttachedShaders[ShaderType::Fragment];
>     ASSERT(fragmentShader != nullptr);
> 
>     ASSERT(mState.mOutputVariableTypes.empty());
>     ASSERT(mState.mActiveOutputVariables.none());
>+    ASSERT(mState.mDrawBufferTypeMask.none());
> 
>+    const auto &outputVariables = fragmentShader->getActiveOutputVariables();
>     // Gather output variable types
>-    for (const auto &outputVariable : fragmentShader->getActiveOutputVariables(context))
>+    for (const auto &outputVariable : outputVariables)
>     {
>         if (outputVariable.isBuiltIn() && outputVariable.name != "gl_FragColor" &&
>             outputVariable.name != "gl_FragData")
>@@ -2826,62 +3775,204 @@ void Program::linkOutputVariables(const Context *context)
>             ASSERT(location < mState.mActiveOutputVariables.size());
>             mState.mActiveOutputVariables.set(location);
>             mState.mOutputVariableTypes[location] = VariableComponentType(outputVariable.type);
>+            ComponentType componentType =
>+                GLenumToComponentType(mState.mOutputVariableTypes[location]);
>+            SetComponentTypeMask(componentType, location, &mState.mDrawBufferTypeMask);
>+        }
>+    }
>+
>+    if (version >= ES_3_1)
>+    {
>+        // [OpenGL ES 3.1] Chapter 8.22 Page 203:
>+        // A link error will be generated if the sum of the number of active image uniforms used in
>+        // all shaders, the number of active shader storage blocks, and the number of active
>+        // fragment shader outputs exceeds the implementation-dependent value of
>+        // MAX_COMBINED_SHADER_OUTPUT_RESOURCES.
>+        if (combinedImageUniformsCount + combinedShaderStorageBlocksCount +
>+                mState.mActiveOutputVariables.count() >
>+            caps.maxCombinedShaderOutputResources)
>+        {
>+            mInfoLog
>+                << "The sum of the number of active image uniforms, active shader storage blocks "
>+                   "and active fragment shader outputs exceeds "
>+                   "MAX_COMBINED_SHADER_OUTPUT_RESOURCES ("
>+                << caps.maxCombinedShaderOutputResources << ")";
>+            return false;
>         }
>     }
> 
>     // Skip this step for GLES2 shaders.
>-    if (fragmentShader->getShaderVersion(context) == 100)
>-        return;
>+    if (fragmentShader->getShaderVersion() == 100)
>+        return true;
> 
>-    mState.mOutputVariables = fragmentShader->getActiveOutputVariables(context);
>+    mState.mOutputVariables = outputVariables;
>     // TODO(jmadill): any caps validation here?
> 
>-    for (unsigned int outputVariableIndex = 0; outputVariableIndex < mState.mOutputVariables.size();
>-         outputVariableIndex++)
>+    for (sh::OutputVariable &outputVariable : mState.mOutputVariables)
>     {
>-        const sh::OutputVariable &outputVariable = mState.mOutputVariables[outputVariableIndex];
>-
>         if (outputVariable.isArray())
>         {
>             // We're following the GLES 3.1 November 2016 spec section 7.3.1.1 Naming Active
>             // Resources and including [0] at the end of array variable names.
>-            mState.mOutputVariables[outputVariableIndex].name += "[0]";
>-            mState.mOutputVariables[outputVariableIndex].mappedName += "[0]";
>+            outputVariable.name += "[0]";
>+            outputVariable.mappedName += "[0]";
>         }
>+    }
>+
>+    bool hasSecondaryOutputs = false;
>+
>+    // Reserve locations for output variables whose location is fixed in the shader or through the
>+    // API.
>+    for (unsigned int outputVariableIndex = 0; outputVariableIndex < mState.mOutputVariables.size();
>+         outputVariableIndex++)
>+    {
>+        const sh::OutputVariable &outputVariable = mState.mOutputVariables[outputVariableIndex];
> 
>         // Don't store outputs for gl_FragDepth, gl_FragColor, etc.
>         if (outputVariable.isBuiltIn())
>             continue;
> 
>-        // Since multiple output locations must be specified, use 0 for non-specified locations.
>-        unsigned int baseLocation =
>-            (outputVariable.location == -1 ? 0u
>-                                           : static_cast<unsigned int>(outputVariable.location));
>+        int baseLocation = getOutputLocationForLink(outputVariable);
>+        if (baseLocation == -1)
>+        {
>+            // Here we're only reserving locations for variables whose location is fixed.
>+            continue;
>+        }
>+
>+        auto *outputLocations = &mState.mOutputLocations;
>+        if (isOutputSecondaryForLink(outputVariable))
>+        {
>+            outputLocations = &mState.mSecondaryOutputLocations;
>+            // Note that this check doesn't need to be before checking baseLocation == -1 above. If
>+            // an output has an index specified it will always also have the location specified.
>+            hasSecondaryOutputs = true;
>+        }
> 
>         // GLSL ES 3.10 section 4.3.6: Output variables cannot be arrays of arrays or arrays of
>         // structures, so we may use getBasicTypeElementCount().
>-        unsigned int elementCount = outputVariable.getBasicTypeElementCount();
>+        unsigned int elementCount          = outputVariable.getBasicTypeElementCount();
>+        unsigned int outputLocationsNeeded = static_cast<unsigned int>(baseLocation) + elementCount;
>+        if (outputLocationsNeeded > outputLocations->size())
>+        {
>+            outputLocations->resize(outputLocationsNeeded);
>+        }
>         for (unsigned int elementIndex = 0; elementIndex < elementCount; elementIndex++)
>         {
>-            const unsigned int location = baseLocation + elementIndex;
>-            if (location >= mState.mOutputLocations.size())
>+            const unsigned int location = static_cast<unsigned int>(baseLocation) + elementIndex;
>+            ASSERT(location < outputLocations->size());
>+            if (outputLocations->at(location).used())
>             {
>-                mState.mOutputLocations.resize(location + 1);
>+                mInfoLog << "Location of variable " << outputVariable.name
>+                         << " conflicts with another variable.";
>+                return false;
>             }
>-            ASSERT(!mState.mOutputLocations.at(location).used());
>             if (outputVariable.isArray())
>             {
>-                mState.mOutputLocations[location] =
>-                    VariableLocation(elementIndex, outputVariableIndex);
>+                (*outputLocations)[location] = VariableLocation(elementIndex, outputVariableIndex);
>             }
>             else
>             {
>                 VariableLocation locationInfo;
>-                locationInfo.index                = outputVariableIndex;
>-                mState.mOutputLocations[location] = locationInfo;
>+                locationInfo.index           = outputVariableIndex;
>+                (*outputLocations)[location] = locationInfo;
>             }
>         }
>     }
>+
>+    // Here we assign locations for the output variables that don't yet have them. Note that we're
>+    // not necessarily able to fit the variables optimally, since then we might have to try
>+    // different arrangements of output arrays. Now we just assign the locations in the order that
>+    // we got the output variables. The spec isn't clear on what kind of algorithm is required for
>+    // finding locations for the output variables, so this should be acceptable at least for now.
>+    GLuint maxLocation = caps.maxDrawBuffers;
>+    if (hasSecondaryOutputs)
>+    {
>+        // EXT_blend_func_extended: Program outputs will be validated against
>+        // MAX_DUAL_SOURCE_DRAW_BUFFERS_EXT if there's even one output with index one.
>+        maxLocation = extensions.maxDualSourceDrawBuffers;
>+    }
>+
>+    for (unsigned int outputVariableIndex = 0; outputVariableIndex < mState.mOutputVariables.size();
>+         outputVariableIndex++)
>+    {
>+        const sh::OutputVariable &outputVariable = mState.mOutputVariables[outputVariableIndex];
>+
>+        // Don't store outputs for gl_FragDepth, gl_FragColor, etc.
>+        if (outputVariable.isBuiltIn())
>+            continue;
>+
>+        if (getOutputLocationForLink(outputVariable) != -1)
>+        {
>+            continue;
>+        }
>+
>+        auto *outputLocations = &mState.mOutputLocations;
>+        if (isOutputSecondaryForLink(outputVariable))
>+        {
>+            outputLocations = &mState.mSecondaryOutputLocations;
>+        }
>+
>+        int baseLocation          = 0;
>+        unsigned int elementCount = outputVariable.getBasicTypeElementCount();
>+        bool elementsFit          = false;
>+        while (!elementsFit)
>+        {
>+            // Try baseLocations starting from 0 one at a time and see if the variable fits.
>+            elementsFit = true;
>+            if (baseLocation + elementCount > maxLocation)
>+            {
>+                // EXT_blend_func_extended: Linking can fail:
>+                // "if the explicit binding assignments do not leave enough space for the linker to
>+                // automatically assign a location for a varying out array, which requires multiple
>+                // contiguous locations."
>+                mInfoLog << "Could not fit output variable into available locations: "
>+                         << outputVariable.name;
>+                return false;
>+            }
>+            unsigned int outputLocationsNeeded =
>+                static_cast<unsigned int>(baseLocation) + elementCount;
>+            if (outputLocationsNeeded > outputLocations->size())
>+            {
>+                outputLocations->resize(outputLocationsNeeded);
>+            }
>+            for (unsigned int elementIndex = 0; elementIndex < elementCount; elementIndex++)
>+            {
>+                const unsigned int location =
>+                    static_cast<unsigned int>(baseLocation) + elementIndex;
>+                ASSERT(location < outputLocations->size());
>+                if (outputLocations->at(location).used())
>+                {
>+                    elementsFit = false;
>+                    break;
>+                }
>+            }
>+            if (elementsFit)
>+            {
>+                for (unsigned int elementIndex = 0; elementIndex < elementCount; elementIndex++)
>+                {
>+                    const unsigned int location =
>+                        static_cast<unsigned int>(baseLocation) + elementIndex;
>+                    if (outputVariable.isArray())
>+                    {
>+                        (*outputLocations)[location] =
>+                            VariableLocation(elementIndex, outputVariableIndex);
>+                    }
>+                    else
>+                    {
>+                        VariableLocation locationInfo;
>+                        locationInfo.index           = outputVariableIndex;
>+                        (*outputLocations)[location] = locationInfo;
>+                    }
>+                }
>+            }
>+            else
>+            {
>+                ++baseLocation;
>+            }
>+        }
>+    }
>+
>+    return true;
> }
> 
> void Program::setUniformValuesFromBindingQualifiers()
>@@ -2899,26 +3990,15 @@ void Program::setUniformValuesFromBindingQualifiers()
>             {
>                 boundTextureUnits.push_back(samplerUniform.binding + elementIndex);
>             }
>-            setUniform1iv(location, static_cast<GLsizei>(boundTextureUnits.size()),
>+
>+            // Here we pass nullptr to avoid a large chain of calls that need a non-const Context.
>+            // We know it's safe not to notify the Context because this is only called after link.
>+            setUniform1iv(nullptr, location, static_cast<GLsizei>(boundTextureUnits.size()),
>                           boundTextureUnits.data());
>         }
>     }
> }
> 
>-void Program::gatherAtomicCounterBuffers()
>-{
>-    for (unsigned int index : mState.mAtomicCounterUniformRange)
>-    {
>-        auto &uniform                      = mState.mUniforms[index];
>-        uniform.blockInfo.offset           = uniform.offset;
>-        uniform.blockInfo.arrayStride      = (uniform.isArray() ? 4 : 0);
>-        uniform.blockInfo.matrixStride     = 0;
>-        uniform.blockInfo.isRowMajorMatrix = false;
>-    }
>-
>-    // TODO(jie.a.chen@intel.com): Get the actual BUFFER_DATA_SIZE from backend for each buffer.
>-}
>-
> void Program::initInterfaceBlockBindings()
> {
>     // Set initial bindings from shader.
>@@ -2929,21 +4009,134 @@ void Program::initInterfaceBlockBindings()
>     }
> }
> 
>-void Program::updateSamplerUniform(const VariableLocation &locationInfo,
>+void Program::updateSamplerUniform(Context *context,
>+                                   const VariableLocation &locationInfo,
>                                    GLsizei clampedCount,
>                                    const GLint *v)
> {
>     ASSERT(mState.isSamplerUniformIndex(locationInfo.index));
>-    GLuint samplerIndex = mState.getSamplerIndexFromUniformIndex(locationInfo.index);
>-    std::vector<GLuint> *boundTextureUnits =
>-        &mState.mSamplerBindings[samplerIndex].boundTextureUnits;
>+    GLuint samplerIndex            = mState.getSamplerIndexFromUniformIndex(locationInfo.index);
>+    SamplerBinding &samplerBinding = mState.mSamplerBindings[samplerIndex];
>+    std::vector<GLuint> &boundTextureUnits = samplerBinding.boundTextureUnits;
>+
>+    if (samplerBinding.unreferenced)
>+        return;
>+
>+    // Update the sampler uniforms.
>+    for (GLsizei arrayIndex = 0; arrayIndex < clampedCount; ++arrayIndex)
>+    {
>+        GLint oldTextureUnit = boundTextureUnits[arrayIndex + locationInfo.arrayIndex];
>+        GLint newTextureUnit = v[arrayIndex];
>+
>+        if (oldTextureUnit == newTextureUnit)
>+            continue;
>+
>+        boundTextureUnits[arrayIndex + locationInfo.arrayIndex] = newTextureUnit;
>+
>+        // Update the reference counts.
>+        uint32_t &oldRefCount = mState.mActiveSamplerRefCounts[oldTextureUnit];
>+        uint32_t &newRefCount = mState.mActiveSamplerRefCounts[newTextureUnit];
>+        ASSERT(oldRefCount > 0);
>+        ASSERT(newRefCount < std::numeric_limits<uint32_t>::max());
>+        oldRefCount--;
>+        newRefCount++;
> 
>-    std::copy(v, v + clampedCount, boundTextureUnits->begin() + locationInfo.arrayIndex);
>+        // Check for binding type change.
>+        TextureType &newSamplerType     = mState.mActiveSamplerTypes[newTextureUnit];
>+        TextureType &oldSamplerType     = mState.mActiveSamplerTypes[oldTextureUnit];
>+        SamplerFormat &newSamplerFormat = mState.mActiveSamplerFormats[newTextureUnit];
>+        SamplerFormat &oldSamplerFormat = mState.mActiveSamplerFormats[oldTextureUnit];
>+
>+        if (newRefCount == 1)
>+        {
>+            newSamplerType   = samplerBinding.textureType;
>+            newSamplerFormat = samplerBinding.format;
>+            mState.mActiveSamplersMask.set(newTextureUnit);
>+        }
>+        else
>+        {
>+            if (newSamplerType != samplerBinding.textureType)
>+            {
>+                // Conflict detected. Ensure we reset it properly.
>+                newSamplerType = TextureType::InvalidEnum;
>+            }
>+            if (newSamplerFormat != samplerBinding.format)
>+            {
>+                newSamplerFormat = SamplerFormat::InvalidEnum;
>+            }
>+        }
>+
>+        // Unset previously active sampler.
>+        if (oldRefCount == 0)
>+        {
>+            oldSamplerType   = TextureType::InvalidEnum;
>+            oldSamplerFormat = SamplerFormat::InvalidEnum;
>+            mState.mActiveSamplersMask.reset(oldTextureUnit);
>+        }
>+        else
>+        {
>+            if (oldSamplerType == TextureType::InvalidEnum ||
>+                oldSamplerFormat == SamplerFormat::InvalidEnum)
>+            {
>+                // Previous conflict. Check if this new change fixed the conflict.
>+                mState.setSamplerUniformTextureTypeAndFormat(oldTextureUnit);
>+            }
>+        }
>+
>+        // Notify context.
>+        if (context)
>+        {
>+            context->onSamplerUniformChange(newTextureUnit);
>+            context->onSamplerUniformChange(oldTextureUnit);
>+        }
>+    }
> 
>     // Invalidate the validation cache.
>     mCachedValidateSamplersResult.reset();
> }
> 
>+void ProgramState::setSamplerUniformTextureTypeAndFormat(size_t textureUnitIndex)
>+{
>+    bool foundBinding         = false;
>+    TextureType foundType     = TextureType::InvalidEnum;
>+    SamplerFormat foundFormat = SamplerFormat::InvalidEnum;
>+
>+    for (const SamplerBinding &binding : mSamplerBindings)
>+    {
>+        if (binding.unreferenced)
>+            continue;
>+
>+        // A conflict exists if samplers of different types are sourced by the same texture unit.
>+        // We need to check all bound textures to detect this error case.
>+        for (GLuint textureUnit : binding.boundTextureUnits)
>+        {
>+            if (textureUnit == textureUnitIndex)
>+            {
>+                if (!foundBinding)
>+                {
>+                    foundBinding = true;
>+                    foundType    = binding.textureType;
>+                    foundFormat  = binding.format;
>+                }
>+                else
>+                {
>+                    if (foundType != binding.textureType)
>+                    {
>+                        foundType = TextureType::InvalidEnum;
>+                    }
>+                    if (foundFormat != binding.format)
>+                    {
>+                        foundFormat = SamplerFormat::InvalidEnum;
>+                    }
>+                }
>+            }
>+        }
>+    }
>+
>+    mActiveSamplerTypes[textureUnitIndex]   = foundType;
>+    mActiveSamplerFormats[textureUnitIndex] = foundFormat;
>+}
>+
> template <typename T>
> GLsizei Program::clampUniformCount(const VariableLocation &locationInfo,
>                                    GLsizei count,
>@@ -3041,26 +4234,455 @@ void Program::getUniformInternal(const Context *context,
>     }
> }
> 
>-bool Program::samplesFromTexture(const gl::State &state, GLuint textureID) const
>+angle::Result Program::syncState(const Context *context)
>+{
>+    if (mDirtyBits.any())
>+    {
>+        ASSERT(mLinkResolved);
>+        ANGLE_TRY(mProgram->syncState(context, mDirtyBits));
>+        mDirtyBits.reset();
>+    }
>+
>+    return angle::Result::Continue;
>+}
>+
>+void Program::serialize(const Context *context, angle::MemoryBuffer *binaryOut) const
>+{
>+    BinaryOutputStream stream;
>+
>+    stream.writeBytes(reinterpret_cast<const unsigned char *>(ANGLE_COMMIT_HASH),
>+                      ANGLE_COMMIT_HASH_SIZE);
>+
>+    // nullptr context is supported when computing binary length.
>+    if (context)
>+    {
>+        stream.writeInt(context->getClientVersion().major);
>+        stream.writeInt(context->getClientVersion().minor);
>+    }
>+    else
>+    {
>+        stream.writeInt(2);
>+        stream.writeInt(0);
>+    }
>+
>+    const auto &computeLocalSize = mState.getComputeShaderLocalSize();
>+
>+    stream.writeInt(computeLocalSize[0]);
>+    stream.writeInt(computeLocalSize[1]);
>+    stream.writeInt(computeLocalSize[2]);
>+
>+    ASSERT(mState.mGeometryShaderInvocations >= 1 && mState.mGeometryShaderMaxVertices >= 0);
>+    stream.writeEnum(mState.mGeometryShaderInputPrimitiveType);
>+    stream.writeEnum(mState.mGeometryShaderOutputPrimitiveType);
>+    stream.writeInt(mState.mGeometryShaderInvocations);
>+    stream.writeInt(mState.mGeometryShaderMaxVertices);
>+
>+    stream.writeInt(mState.mNumViews);
>+
>+    static_assert(MAX_VERTEX_ATTRIBS * 2 <= sizeof(uint32_t) * 8,
>+                  "All bits of mAttributesTypeMask types and mask fit into 32 bits each");
>+    stream.writeInt(static_cast<int>(mState.mAttributesTypeMask.to_ulong()));
>+    stream.writeInt(static_cast<int>(mState.mAttributesMask.to_ulong()));
>+
>+    stream.writeInt(mState.getActiveAttribLocationsMask().to_ulong());
>+
>+    stream.writeInt(mState.getAttributes().size());
>+    for (const sh::Attribute &attrib : mState.getAttributes())
>+    {
>+        WriteShaderVar(&stream, attrib);
>+        stream.writeInt(attrib.location);
>+    }
>+
>+    stream.writeInt(mState.getUniforms().size());
>+    for (const LinkedUniform &uniform : mState.getUniforms())
>+    {
>+        WriteShaderVar(&stream, uniform);
>+
>+        // FIXME: referenced
>+
>+        stream.writeInt(uniform.bufferIndex);
>+        stream.writeInt(uniform.blockInfo.offset);
>+        stream.writeInt(uniform.blockInfo.arrayStride);
>+        stream.writeInt(uniform.blockInfo.matrixStride);
>+        stream.writeInt(uniform.blockInfo.isRowMajorMatrix);
>+    }
>+
>+    stream.writeInt(mState.getUniformLocations().size());
>+    for (const auto &variable : mState.getUniformLocations())
>+    {
>+        stream.writeInt(variable.arrayIndex);
>+        stream.writeIntOrNegOne(variable.index);
>+        stream.writeInt(variable.ignored);
>+    }
>+
>+    stream.writeInt(mState.getUniformBlocks().size());
>+    for (const InterfaceBlock &uniformBlock : mState.getUniformBlocks())
>+    {
>+        WriteInterfaceBlock(&stream, uniformBlock);
>+    }
>+
>+    stream.writeInt(mState.getBufferVariables().size());
>+    for (const BufferVariable &bufferVariable : mState.getBufferVariables())
>+    {
>+        WriteBufferVariable(&stream, bufferVariable);
>+    }
>+
>+    stream.writeInt(mState.getShaderStorageBlocks().size());
>+    for (const InterfaceBlock &shaderStorageBlock : mState.getShaderStorageBlocks())
>+    {
>+        WriteInterfaceBlock(&stream, shaderStorageBlock);
>+    }
>+
>+    stream.writeInt(mState.mAtomicCounterBuffers.size());
>+    for (const auto &atomicCounterBuffer : mState.mAtomicCounterBuffers)
>+    {
>+        WriteShaderVariableBuffer(&stream, atomicCounterBuffer);
>+    }
>+
>+    // Warn the app layer if saving a binary with unsupported transform feedback.
>+    if (!mState.getLinkedTransformFeedbackVaryings().empty() &&
>+        context->getWorkarounds().disableProgramCachingForTransformFeedback)
>+    {
>+        WARN() << "Saving program binary with transform feedback, which is not supported on this "
>+                  "driver.";
>+    }
>+
>+    stream.writeInt(mState.getLinkedTransformFeedbackVaryings().size());
>+    for (const auto &var : mState.getLinkedTransformFeedbackVaryings())
>+    {
>+        stream.writeIntVector(var.arraySizes);
>+        stream.writeInt(var.type);
>+        stream.writeString(var.name);
>+
>+        stream.writeIntOrNegOne(var.arrayIndex);
>+    }
>+
>+    stream.writeInt(mState.getTransformFeedbackBufferMode());
>+
>+    stream.writeInt(mState.getOutputVariables().size());
>+    for (const sh::OutputVariable &output : mState.getOutputVariables())
>+    {
>+        WriteShaderVar(&stream, output);
>+        stream.writeInt(output.location);
>+        stream.writeInt(output.index);
>+    }
>+
>+    stream.writeInt(mState.getOutputLocations().size());
>+    for (const auto &outputVar : mState.getOutputLocations())
>+    {
>+        stream.writeInt(outputVar.arrayIndex);
>+        stream.writeIntOrNegOne(outputVar.index);
>+        stream.writeInt(outputVar.ignored);
>+    }
>+
>+    stream.writeInt(mState.getSecondaryOutputLocations().size());
>+    for (const auto &outputVar : mState.getSecondaryOutputLocations())
>+    {
>+        stream.writeInt(outputVar.arrayIndex);
>+        stream.writeIntOrNegOne(outputVar.index);
>+        stream.writeInt(outputVar.ignored);
>+    }
>+
>+    stream.writeInt(mState.mOutputVariableTypes.size());
>+    for (const auto &outputVariableType : mState.mOutputVariableTypes)
>+    {
>+        stream.writeInt(outputVariableType);
>+    }
>+
>+    static_assert(
>+        IMPLEMENTATION_MAX_DRAW_BUFFERS * 2 <= 8 * sizeof(uint32_t),
>+        "All bits of mDrawBufferTypeMask and mActiveOutputVariables can be contained in 32 bits");
>+    stream.writeInt(static_cast<int>(mState.mDrawBufferTypeMask.to_ulong()));
>+    stream.writeInt(static_cast<int>(mState.mActiveOutputVariables.to_ulong()));
>+
>+    stream.writeInt(mState.getSamplerUniformRange().low());
>+    stream.writeInt(mState.getSamplerUniformRange().high());
>+
>+    stream.writeInt(mState.getSamplerBindings().size());
>+    for (const auto &samplerBinding : mState.getSamplerBindings())
>+    {
>+        stream.writeEnum(samplerBinding.textureType);
>+        stream.writeEnum(samplerBinding.format);
>+        stream.writeInt(samplerBinding.boundTextureUnits.size());
>+        stream.writeInt(samplerBinding.unreferenced);
>+    }
>+
>+    stream.writeInt(mState.getImageUniformRange().low());
>+    stream.writeInt(mState.getImageUniformRange().high());
>+
>+    stream.writeInt(mState.getImageBindings().size());
>+    for (const auto &imageBinding : mState.getImageBindings())
>+    {
>+        stream.writeInt(imageBinding.boundImageUnits.size());
>+        for (size_t i = 0; i < imageBinding.boundImageUnits.size(); ++i)
>+        {
>+            stream.writeInt(imageBinding.boundImageUnits[i]);
>+        }
>+    }
>+
>+    stream.writeInt(mState.getAtomicCounterUniformRange().low());
>+    stream.writeInt(mState.getAtomicCounterUniformRange().high());
>+
>+    stream.writeInt(mState.getLinkedShaderStages().to_ulong());
>+
>+    mProgram->save(context, &stream);
>+
>+    ASSERT(binaryOut);
>+    binaryOut->resize(stream.length());
>+    memcpy(binaryOut->data(), stream.data(), stream.length());
>+}
>+
>+angle::Result Program::deserialize(const Context *context,
>+                                   BinaryInputStream &stream,
>+                                   InfoLog &infoLog)
> {
>-    // Must be called after samplers are validated.
>-    ASSERT(mCachedValidateSamplersResult.valid() && mCachedValidateSamplersResult.value());
>+    unsigned char commitString[ANGLE_COMMIT_HASH_SIZE];
>+    stream.readBytes(commitString, ANGLE_COMMIT_HASH_SIZE);
>+    if (memcmp(commitString, ANGLE_COMMIT_HASH, sizeof(unsigned char) * ANGLE_COMMIT_HASH_SIZE) !=
>+        0)
>+    {
>+        infoLog << "Invalid program binary version.";
>+        return angle::Result::Incomplete;
>+    }
> 
>-    for (const auto &binding : mState.mSamplerBindings)
>+    int majorVersion = stream.readInt<int>();
>+    int minorVersion = stream.readInt<int>();
>+    if (majorVersion != context->getClientMajorVersion() ||
>+        minorVersion != context->getClientMinorVersion())
>     {
>-        GLenum textureType = binding.textureType;
>-        for (const auto &unit : binding.boundTextureUnits)
>+        infoLog << "Cannot load program binaries across different ES context versions.";
>+        return angle::Result::Incomplete;
>+    }
>+
>+    mState.mComputeShaderLocalSize[0] = stream.readInt<int>();
>+    mState.mComputeShaderLocalSize[1] = stream.readInt<int>();
>+    mState.mComputeShaderLocalSize[2] = stream.readInt<int>();
>+
>+    mState.mGeometryShaderInputPrimitiveType  = stream.readEnum<PrimitiveMode>();
>+    mState.mGeometryShaderOutputPrimitiveType = stream.readEnum<PrimitiveMode>();
>+    mState.mGeometryShaderInvocations         = stream.readInt<int>();
>+    mState.mGeometryShaderMaxVertices         = stream.readInt<int>();
>+
>+    mState.mNumViews = stream.readInt<int>();
>+
>+    static_assert(MAX_VERTEX_ATTRIBS * 2 <= sizeof(uint32_t) * 8,
>+                  "All bits of mAttributesTypeMask types and mask fit into 32 bits each");
>+    mState.mAttributesTypeMask = gl::ComponentTypeMask(stream.readInt<uint32_t>());
>+    mState.mAttributesMask     = stream.readInt<gl::AttributesMask>();
>+
>+    static_assert(MAX_VERTEX_ATTRIBS <= sizeof(unsigned long) * 8,
>+                  "Too many vertex attribs for mask");
>+    mState.mActiveAttribLocationsMask = stream.readInt<gl::AttributesMask>();
>+
>+    unsigned int attribCount = stream.readInt<unsigned int>();
>+    ASSERT(mState.mAttributes.empty());
>+    for (unsigned int attribIndex = 0; attribIndex < attribCount; ++attribIndex)
>+    {
>+        sh::Attribute attrib;
>+        LoadShaderVar(&stream, &attrib);
>+        attrib.location = stream.readInt<int>();
>+        mState.mAttributes.push_back(attrib);
>+    }
>+
>+    unsigned int uniformCount = stream.readInt<unsigned int>();
>+    ASSERT(mState.mUniforms.empty());
>+    for (unsigned int uniformIndex = 0; uniformIndex < uniformCount; ++uniformIndex)
>+    {
>+        LinkedUniform uniform;
>+        LoadShaderVar(&stream, &uniform);
>+
>+        uniform.bufferIndex                = stream.readInt<int>();
>+        uniform.blockInfo.offset           = stream.readInt<int>();
>+        uniform.blockInfo.arrayStride      = stream.readInt<int>();
>+        uniform.blockInfo.matrixStride     = stream.readInt<int>();
>+        uniform.blockInfo.isRowMajorMatrix = stream.readBool();
>+
>+        uniform.typeInfo = &GetUniformTypeInfo(uniform.type);
>+
>+        mState.mUniforms.push_back(uniform);
>+    }
>+
>+    const unsigned int uniformIndexCount = stream.readInt<unsigned int>();
>+    ASSERT(mState.mUniformLocations.empty());
>+    for (unsigned int uniformIndexIndex = 0; uniformIndexIndex < uniformIndexCount;
>+         uniformIndexIndex++)
>+    {
>+        VariableLocation variable;
>+        stream.readInt(&variable.arrayIndex);
>+        stream.readInt(&variable.index);
>+        stream.readBool(&variable.ignored);
>+
>+        mState.mUniformLocations.push_back(variable);
>+    }
>+
>+    unsigned int uniformBlockCount = stream.readInt<unsigned int>();
>+    ASSERT(mState.mUniformBlocks.empty());
>+    for (unsigned int uniformBlockIndex = 0; uniformBlockIndex < uniformBlockCount;
>+         ++uniformBlockIndex)
>+    {
>+        InterfaceBlock uniformBlock;
>+        LoadInterfaceBlock(&stream, &uniformBlock);
>+        mState.mUniformBlocks.push_back(uniformBlock);
>+
>+        mState.mActiveUniformBlockBindings.set(uniformBlockIndex, uniformBlock.binding != 0);
>+    }
>+
>+    unsigned int bufferVariableCount = stream.readInt<unsigned int>();
>+    ASSERT(mState.mBufferVariables.empty());
>+    for (unsigned int index = 0; index < bufferVariableCount; ++index)
>+    {
>+        BufferVariable bufferVariable;
>+        LoadBufferVariable(&stream, &bufferVariable);
>+        mState.mBufferVariables.push_back(bufferVariable);
>+    }
>+
>+    unsigned int shaderStorageBlockCount = stream.readInt<unsigned int>();
>+    ASSERT(mState.mShaderStorageBlocks.empty());
>+    for (unsigned int shaderStorageBlockIndex = 0;
>+         shaderStorageBlockIndex < shaderStorageBlockCount; ++shaderStorageBlockIndex)
>+    {
>+        InterfaceBlock shaderStorageBlock;
>+        LoadInterfaceBlock(&stream, &shaderStorageBlock);
>+        mState.mShaderStorageBlocks.push_back(shaderStorageBlock);
>+    }
>+
>+    unsigned int atomicCounterBufferCount = stream.readInt<unsigned int>();
>+    ASSERT(mState.mAtomicCounterBuffers.empty());
>+    for (unsigned int bufferIndex = 0; bufferIndex < atomicCounterBufferCount; ++bufferIndex)
>+    {
>+        AtomicCounterBuffer atomicCounterBuffer;
>+        LoadShaderVariableBuffer(&stream, &atomicCounterBuffer);
>+
>+        mState.mAtomicCounterBuffers.push_back(atomicCounterBuffer);
>+    }
>+
>+    unsigned int transformFeedbackVaryingCount = stream.readInt<unsigned int>();
>+
>+    // Reject programs that use transform feedback varyings if the hardware cannot support them.
>+    if (transformFeedbackVaryingCount > 0 &&
>+        context->getWorkarounds().disableProgramCachingForTransformFeedback)
>+    {
>+        infoLog << "Current driver does not support transform feedback in binary programs.";
>+        return angle::Result::Incomplete;
>+    }
>+
>+    ASSERT(mState.mLinkedTransformFeedbackVaryings.empty());
>+    for (unsigned int transformFeedbackVaryingIndex = 0;
>+         transformFeedbackVaryingIndex < transformFeedbackVaryingCount;
>+         ++transformFeedbackVaryingIndex)
>+    {
>+        sh::Varying varying;
>+        stream.readIntVector<unsigned int>(&varying.arraySizes);
>+        stream.readInt(&varying.type);
>+        stream.readString(&varying.name);
>+
>+        GLuint arrayIndex = stream.readInt<GLuint>();
>+
>+        mState.mLinkedTransformFeedbackVaryings.emplace_back(varying, arrayIndex);
>+    }
>+
>+    stream.readInt(&mState.mTransformFeedbackBufferMode);
>+
>+    unsigned int outputCount = stream.readInt<unsigned int>();
>+    ASSERT(mState.mOutputVariables.empty());
>+    for (unsigned int outputIndex = 0; outputIndex < outputCount; ++outputIndex)
>+    {
>+        sh::OutputVariable output;
>+        LoadShaderVar(&stream, &output);
>+        output.location = stream.readInt<int>();
>+        output.index    = stream.readInt<int>();
>+        mState.mOutputVariables.push_back(output);
>+    }
>+
>+    unsigned int outputVarCount = stream.readInt<unsigned int>();
>+    ASSERT(mState.mOutputLocations.empty());
>+    for (unsigned int outputIndex = 0; outputIndex < outputVarCount; ++outputIndex)
>+    {
>+        VariableLocation locationData;
>+        stream.readInt(&locationData.arrayIndex);
>+        stream.readInt(&locationData.index);
>+        stream.readBool(&locationData.ignored);
>+        mState.mOutputLocations.push_back(locationData);
>+    }
>+
>+    unsigned int secondaryOutputVarCount = stream.readInt<unsigned int>();
>+    ASSERT(mState.mSecondaryOutputLocations.empty());
>+    for (unsigned int outputIndex = 0; outputIndex < secondaryOutputVarCount; ++outputIndex)
>+    {
>+        VariableLocation locationData;
>+        stream.readInt(&locationData.arrayIndex);
>+        stream.readInt(&locationData.index);
>+        stream.readBool(&locationData.ignored);
>+        mState.mSecondaryOutputLocations.push_back(locationData);
>+    }
>+
>+    unsigned int outputTypeCount = stream.readInt<unsigned int>();
>+    for (unsigned int outputIndex = 0; outputIndex < outputTypeCount; ++outputIndex)
>+    {
>+        mState.mOutputVariableTypes.push_back(stream.readInt<GLenum>());
>+    }
>+
>+    static_assert(IMPLEMENTATION_MAX_DRAW_BUFFERS * 2 <= 8 * sizeof(uint32_t),
>+                  "All bits of mDrawBufferTypeMask and mActiveOutputVariables types and mask fit "
>+                  "into 32 bits each");
>+    mState.mDrawBufferTypeMask    = gl::ComponentTypeMask(stream.readInt<uint32_t>());
>+    mState.mActiveOutputVariables = stream.readInt<gl::DrawBufferMask>();
>+
>+    unsigned int samplerRangeLow  = stream.readInt<unsigned int>();
>+    unsigned int samplerRangeHigh = stream.readInt<unsigned int>();
>+    mState.mSamplerUniformRange   = RangeUI(samplerRangeLow, samplerRangeHigh);
>+    unsigned int samplerCount     = stream.readInt<unsigned int>();
>+    for (unsigned int samplerIndex = 0; samplerIndex < samplerCount; ++samplerIndex)
>+    {
>+        TextureType textureType = stream.readEnum<TextureType>();
>+        SamplerFormat format    = stream.readEnum<SamplerFormat>();
>+        size_t bindingCount     = stream.readInt<size_t>();
>+        bool unreferenced       = stream.readBool();
>+        mState.mSamplerBindings.emplace_back(textureType, format, bindingCount, unreferenced);
>+    }
>+
>+    unsigned int imageRangeLow     = stream.readInt<unsigned int>();
>+    unsigned int imageRangeHigh    = stream.readInt<unsigned int>();
>+    mState.mImageUniformRange      = RangeUI(imageRangeLow, imageRangeHigh);
>+    unsigned int imageBindingCount = stream.readInt<unsigned int>();
>+    for (unsigned int imageIndex = 0; imageIndex < imageBindingCount; ++imageIndex)
>+    {
>+        unsigned int elementCount = stream.readInt<unsigned int>();
>+        ImageBinding imageBinding(elementCount);
>+        for (unsigned int i = 0; i < elementCount; ++i)
>         {
>-            GLenum programTextureID = state.getSamplerTextureId(unit, textureType);
>-            if (programTextureID == textureID)
>-            {
>-                // TODO(jmadill): Check for appropriate overlap.
>-                return true;
>-            }
>+            imageBinding.boundImageUnits[i] = stream.readInt<unsigned int>();
>         }
>+        mState.mImageBindings.emplace_back(imageBinding);
>     }
> 
>-    return false;
>+    unsigned int atomicCounterRangeLow  = stream.readInt<unsigned int>();
>+    unsigned int atomicCounterRangeHigh = stream.readInt<unsigned int>();
>+    mState.mAtomicCounterUniformRange   = RangeUI(atomicCounterRangeLow, atomicCounterRangeHigh);
>+
>+    static_assert(static_cast<unsigned long>(ShaderType::EnumCount) <= sizeof(unsigned long) * 8,
>+                  "Too many shader types");
>+    mState.mLinkedShaderStages = ShaderBitSet(stream.readInt<uint8_t>());
>+
>+    postResolveLink(context);
>+
>+    return angle::Result::Continue;
>+}
>+
>+void Program::postResolveLink(const gl::Context *context)
>+{
>+    if (!mState.mAttachedShaders[ShaderType::Compute])
>+    {
>+        mState.updateTransformFeedbackStrides();
>+    }
>+
>+    mState.updateActiveSamplers();
>+    mState.updateActiveImages();
>+
>+    if (context->getExtensions().multiDraw)
>+    {
>+        mState.mDrawIDLocation = getUniformLocation("gl_DrawID");
>+    }
> }
> 
> }  // namespace gl
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/Program.h b/Source/ThirdParty/ANGLE/src/libANGLE/Program.h
>index c242d846710..80d25fefcad 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/Program.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/Program.h
>@@ -20,9 +20,10 @@
> #include <string>
> #include <vector>
> 
>+#include "common/Optional.h"
> #include "common/angleutils.h"
> #include "common/mathutil.h"
>-#include "common/Optional.h"
>+#include "common/utilities.h"
> 
> #include "libANGLE/Constants.h"
> #include "libANGLE/Debug.h"
>@@ -36,21 +37,49 @@ namespace rx
> class GLImplFactory;
> class ProgramImpl;
> struct TranslatedAttribute;
>-}
>+}  // namespace rx
> 
> namespace gl
> {
>+class Buffer;
>+class BinaryInputStream;
> struct Caps;
> class Context;
>-class ContextState;
>+struct Extensions;
>+class Framebuffer;
>+class InfoLog;
> class Shader;
> class ShaderProgramManager;
> class State;
>-class InfoLog;
>-class Buffer;
>-class Framebuffer;
>+struct UnusedUniform;
>+struct Version;
> 
>-extern const char * const g_fakepath;
>+extern const char *const g_fakepath;
>+
>+enum class LinkMismatchError
>+{
>+    // Shared
>+    NO_MISMATCH,
>+    TYPE_MISMATCH,
>+    ARRAY_SIZE_MISMATCH,
>+    PRECISION_MISMATCH,
>+    STRUCT_NAME_MISMATCH,
>+    FIELD_NUMBER_MISMATCH,
>+    FIELD_NAME_MISMATCH,
>+
>+    // Varying specific
>+    INTERPOLATION_TYPE_MISMATCH,
>+    INVARIANCE_MISMATCH,
>+
>+    // Uniform specific
>+    BINDING_MISMATCH,
>+    LOCATION_MISMATCH,
>+    OFFSET_MISMATCH,
>+
>+    // Interface block specific
>+    LAYOUT_QUALIFIER_MISMATCH,
>+    MATRIX_PACKING_MISMATCH
>+};
> 
> class InfoLog : angle::NonCopyable
> {
>@@ -68,11 +97,7 @@ class InfoLog : angle::NonCopyable
>     class StreamHelper : angle::NonCopyable
>     {
>       public:
>-        StreamHelper(StreamHelper &&rhs)
>-            : mStream(rhs.mStream)
>-        {
>-            rhs.mStream = nullptr;
>-        }
>+        StreamHelper(StreamHelper &&rhs) : mStream(rhs.mStream) { rhs.mStream = nullptr; }
> 
>         StreamHelper &operator=(StreamHelper &&rhs)
>         {
>@@ -99,11 +124,7 @@ class InfoLog : angle::NonCopyable
>       private:
>         friend class InfoLog;
> 
>-        StreamHelper(std::stringstream *stream)
>-            : mStream(stream)
>-        {
>-            ASSERT(stream);
>-        }
>+        StreamHelper(std::stringstream *stream) : mStream(stream) { ASSERT(stream); }
> 
>         std::stringstream *mStream;
>     };
>@@ -119,6 +140,8 @@ class InfoLog : angle::NonCopyable
> 
>     std::string str() const { return mLazyStream ? mLazyStream->str() : ""; }
> 
>+    bool empty() const;
>+
>   private:
>     void ensureInitialized()
>     {
>@@ -131,6 +154,16 @@ class InfoLog : angle::NonCopyable
>     std::unique_ptr<std::stringstream> mLazyStream;
> };
> 
>+void LogLinkMismatch(InfoLog &infoLog,
>+                     const std::string &variableName,
>+                     const char *variableType,
>+                     LinkMismatchError linkError,
>+                     const std::string &mismatchedStructOrBlockFieldName,
>+                     ShaderType shaderType1,
>+                     ShaderType shaderType2);
>+
>+bool IsActiveInterfaceBlock(const sh::InterfaceBlock &interfaceBlock);
>+
> // Struct used for correlating uniforms/elements of uniform arrays to handles
> struct VariableLocation
> {
>@@ -178,12 +211,17 @@ struct BindingInfo
> // This small structure encapsulates binding sampler uniforms to active GL textures.
> struct SamplerBinding
> {
>-    SamplerBinding(GLenum textureTypeIn, size_t elementCount, bool unreferenced);
>+    SamplerBinding(TextureType textureTypeIn,
>+                   SamplerFormat formatIn,
>+                   size_t elementCount,
>+                   bool unreferenced);
>     SamplerBinding(const SamplerBinding &other);
>     ~SamplerBinding();
> 
>     // Necessary for retrieving active textures from the GL state.
>-    GLenum textureType;
>+    TextureType textureType;
>+
>+    SamplerFormat format;
> 
>     // List of all textures bound to this sampler, of type textureType.
>     std::vector<GLuint> boundTextureUnits;
>@@ -201,6 +239,17 @@ struct TransformFeedbackVarying : public sh::Varying
>     {
>         ASSERT(!isArrayOfArrays());
>     }
>+
>+    TransformFeedbackVarying(const sh::ShaderVariable &field, const sh::Varying &parent)
>+        : arrayIndex(GL_INVALID_INDEX)
>+    {
>+        sh::ShaderVariable *thisVar = this;
>+        *thisVar                    = field;
>+        interpolation               = parent.interpolation;
>+        isInvariant                 = parent.isInvariant;
>+        name                        = parent.name + "." + name;
>+    }
>+
>     std::string nameWithArrayIndex() const
>     {
>         std::stringstream fullNameStr;
>@@ -222,14 +271,15 @@ struct TransformFeedbackVarying : public sh::Varying
> struct ImageBinding
> {
>     ImageBinding(size_t count);
>-    ImageBinding(GLuint imageUnit, size_t count);
>+    ImageBinding(GLuint imageUnit, size_t count, bool unreferenced);
>     ImageBinding(const ImageBinding &other);
>     ~ImageBinding();
> 
>     std::vector<GLuint> boundImageUnits;
>-};
> 
>-using ShaderStagesMask = angle::BitSet<SHADER_TYPE_MAX>;
>+    // A note if this image unit is an unreferenced uniform.
>+    bool unreferenced;
>+};
> 
> class ProgramState final : angle::NonCopyable
> {
>@@ -239,10 +289,8 @@ class ProgramState final : angle::NonCopyable
> 
>     const std::string &getLabel();
> 
>-    Shader *getAttachedVertexShader() const { return mAttachedVertexShader; }
>-    Shader *getAttachedFragmentShader() const { return mAttachedFragmentShader; }
>-    Shader *getAttachedComputeShader() const { return mAttachedComputeShader; }
>-    Shader *getAttachedGeometryShader() const { return mAttachedGeometryShader; }
>+    Shader *getAttachedShader(ShaderType shaderType) const;
>+    const gl::ShaderMap<Shader *> &getAttachedShaders() const { return mAttachedShaders; }
>     const std::vector<std::string> &getTransformFeedbackVaryingNames() const
>     {
>         return mTransformFeedbackVaryingNames;
>@@ -271,6 +319,10 @@ class ProgramState final : angle::NonCopyable
>     DrawBufferMask getActiveOutputVariables() const { return mActiveOutputVariables; }
>     const std::vector<sh::OutputVariable> &getOutputVariables() const { return mOutputVariables; }
>     const std::vector<VariableLocation> &getOutputLocations() const { return mOutputLocations; }
>+    const std::vector<VariableLocation> &getSecondaryOutputLocations() const
>+    {
>+        return mSecondaryOutputLocations;
>+    }
>     const std::vector<LinkedUniform> &getUniforms() const { return mUniforms; }
>     const std::vector<VariableLocation> &getUniformLocations() const { return mUniformLocations; }
>     const std::vector<InterfaceBlock> &getUniformBlocks() const { return mUniformBlocks; }
>@@ -300,6 +352,8 @@ class ProgramState final : angle::NonCopyable
>     Optional<GLuint> getSamplerIndex(GLint location) const;
>     bool isSamplerUniformIndex(GLuint index) const;
>     GLuint getSamplerIndexFromUniformIndex(GLuint uniformIndex) const;
>+    bool isImageUniformIndex(GLuint index) const;
>+    GLuint getImageIndexFromUniformIndex(GLuint uniformIndex) const;
>     GLuint getAttributeLocation(const std::string &name) const;
> 
>     GLuint getBufferVariableIndexFromName(const std::string &name) const;
>@@ -307,20 +361,32 @@ class ProgramState final : angle::NonCopyable
>     int getNumViews() const { return mNumViews; }
>     bool usesMultiview() const { return mNumViews != -1; }
> 
>-    const ShaderStagesMask &getLinkedShaderStages() const { return mLinkedShaderStages; }
>+    const ShaderBitSet &getLinkedShaderStages() const { return mLinkedShaderStages; }
>+
>+    bool hasAttachedShader() const;
>+
>+    const ActiveTextureMask &getActiveSamplersMask() const { return mActiveSamplersMask; }
>+    SamplerFormat getSamplerFormatForTextureUnitIndex(size_t textureUnitIndex) const
>+    {
>+        return mActiveSamplerFormats[textureUnitIndex];
>+    }
> 
>   private:
>     friend class MemoryProgramCache;
>     friend class Program;
> 
>+    void updateTransformFeedbackStrides();
>+    void updateActiveSamplers();
>+    void updateActiveImages();
>+
>+    // Scans the sampler bindings for type conflicts with sampler 'textureUnitIndex'.
>+    void setSamplerUniformTextureTypeAndFormat(size_t textureUnitIndex);
>+
>     std::string mLabel;
> 
>     sh::WorkGroupSize mComputeShaderLocalSize;
> 
>-    Shader *mAttachedFragmentShader;
>-    Shader *mAttachedVertexShader;
>-    Shader *mAttachedComputeShader;
>-    Shader *mAttachedGeometryShader;
>+    ShaderMap<Shader *> mAttachedShaders;
> 
>     std::vector<std::string> mTransformFeedbackVaryingNames;
>     std::vector<TransformFeedbackVarying> mLinkedTransformFeedbackVaryings;
>@@ -332,6 +398,9 @@ class ProgramState final : angle::NonCopyable
>     std::vector<sh::Attribute> mAttributes;
>     angle::BitSet<MAX_VERTEX_ATTRIBS> mActiveAttribLocationsMask;
>     unsigned int mMaxActiveAttribLocation;
>+    ComponentTypeMask mAttributesTypeMask;
>+    // mAttributesMask is identical to mActiveAttribLocationsMask with built-in attributes removed.
>+    AttributesMask mAttributesMask;
> 
>     // Uniforms are sorted in order:
>     //  1. Non-opaque uniforms
>@@ -356,79 +425,146 @@ class ProgramState final : angle::NonCopyable
>     RangeUI mAtomicCounterUniformRange;
> 
>     // An array of the samplers that are used by the program
>-    std::vector<gl::SamplerBinding> mSamplerBindings;
>+    std::vector<SamplerBinding> mSamplerBindings;
> 
>     // An array of the images that are used by the program
>-    std::vector<gl::ImageBinding> mImageBindings;
>+    std::vector<ImageBinding> mImageBindings;
> 
>     // Names and mapped names of output variables that are arrays include [0] in the end, similarly
>     // to uniforms.
>     std::vector<sh::OutputVariable> mOutputVariables;
>     std::vector<VariableLocation> mOutputLocations;
>+
>+    // EXT_blend_func_extended secondary outputs (ones with index 1) in ESSL 3.00 shaders.
>+    std::vector<VariableLocation> mSecondaryOutputLocations;
>+
>     DrawBufferMask mActiveOutputVariables;
> 
>     // Fragment output variable base types: FLOAT, INT, or UINT.  Ordered by location.
>     std::vector<GLenum> mOutputVariableTypes;
>+    ComponentTypeMask mDrawBufferTypeMask;
> 
>     bool mBinaryRetrieveableHint;
>     bool mSeparable;
>-    ShaderStagesMask mLinkedShaderStages;
>+    ShaderBitSet mLinkedShaderStages;
> 
>     // ANGLE_multiview.
>     int mNumViews;
>+
>+    // GL_EXT_geometry_shader.
>+    PrimitiveMode mGeometryShaderInputPrimitiveType;
>+    PrimitiveMode mGeometryShaderOutputPrimitiveType;
>+    int mGeometryShaderInvocations;
>+    int mGeometryShaderMaxVertices;
>+
>+    // GL_ANGLE_multi_draw
>+    int mDrawIDLocation;
>+
>+    // The size of the data written to each transform feedback buffer per vertex.
>+    std::vector<GLsizei> mTransformFeedbackStrides;
>+
>+    // Cached mask of active samplers and sampler types.
>+    ActiveTextureMask mActiveSamplersMask;
>+    ActiveTextureArray<uint32_t> mActiveSamplerRefCounts;
>+    ActiveTextureArray<TextureType> mActiveSamplerTypes;
>+    ActiveTextureArray<SamplerFormat> mActiveSamplerFormats;
>+
>+    // Cached mask of active images.
>+    ActiveTextureMask mActiveImagesMask;
> };
> 
>+class ProgramBindings final : angle::NonCopyable
>+{
>+  public:
>+    ProgramBindings();
>+    ~ProgramBindings();
>+
>+    void bindLocation(GLuint index, const std::string &name);
>+    int getBinding(const std::string &name) const;
>+
>+    using const_iterator = std::unordered_map<std::string, GLuint>::const_iterator;
>+    const_iterator begin() const;
>+    const_iterator end() const;
>+
>+  private:
>+    std::unordered_map<std::string, GLuint> mBindings;
>+};
>+
>+struct ProgramVaryingRef
>+{
>+    const sh::Varying *get() const { return vertex ? vertex : fragment; }
>+
>+    const sh::Varying *vertex   = nullptr;
>+    const sh::Varying *fragment = nullptr;
>+};
>+
>+using ProgramMergedVaryings = std::map<std::string, ProgramVaryingRef>;
>+
> class Program final : angle::NonCopyable, public LabeledObject
> {
>   public:
>     Program(rx::GLImplFactory *factory, ShaderProgramManager *manager, GLuint handle);
>     void onDestroy(const Context *context);
> 
>-    GLuint id() const { return mHandle; }
>+    GLuint id() const;
> 
>-    void setLabel(const std::string &label) override;
>+    void setLabel(const Context *context, const std::string &label) override;
>     const std::string &getLabel() const override;
> 
>-    rx::ProgramImpl *getImplementation() const { return mProgram; }
>+    ANGLE_INLINE rx::ProgramImpl *getImplementation() const
>+    {
>+        ASSERT(mLinkResolved);
>+        return mProgram;
>+    }
> 
>     void attachShader(Shader *shader);
>     void detachShader(const Context *context, Shader *shader);
>     int getAttachedShadersCount() const;
> 
>-    const Shader *getAttachedVertexShader() const { return mState.mAttachedVertexShader; }
>-    const Shader *getAttachedFragmentShader() const { return mState.mAttachedFragmentShader; }
>-    const Shader *getAttachedComputeShader() const { return mState.mAttachedComputeShader; }
>-    const Shader *getAttachedGeometryShader() const { return mState.mAttachedGeometryShader; }
>+    const Shader *getAttachedShader(ShaderType shaderType) const;
> 
>     void bindAttributeLocation(GLuint index, const char *name);
>     void bindUniformLocation(GLuint index, const char *name);
> 
>     // CHROMIUM_path_rendering
>-    BindingInfo getFragmentInputBindingInfo(const Context *context, GLint index) const;
>+    BindingInfo getFragmentInputBindingInfo(GLint index) const;
>     void bindFragmentInputLocation(GLint index, const char *name);
>-    void pathFragmentInputGen(const Context *context,
>-                              GLint index,
>-                              GLenum genMode,
>-                              GLint components,
>-                              const GLfloat *coeffs);
>-
>-    Error link(const gl::Context *context);
>-    bool isLinked() const;
>-
>-    bool hasLinkedVertexShader() const { return mState.mLinkedShaderStages[SHADER_VERTEX]; }
>-    bool hasLinkedFragmentShader() const { return mState.mLinkedShaderStages[SHADER_FRAGMENT]; }
>-    bool hasLinkedComputeShader() const { return mState.mLinkedShaderStages[SHADER_COMPUTE]; }
>-
>-    Error loadBinary(const Context *context,
>-                     GLenum binaryFormat,
>-                     const void *binary,
>-                     GLsizei length);
>-    Error saveBinary(const Context *context,
>-                     GLenum *binaryFormat,
>-                     void *binary,
>-                     GLsizei bufSize,
>-                     GLsizei *length) const;
>-    GLint getBinaryLength(const Context *context) const;
>+    void pathFragmentInputGen(GLint index, GLenum genMode, GLint components, const GLfloat *coeffs);
>+
>+    // EXT_blend_func_extended
>+    void bindFragmentOutputLocation(GLuint index, const char *name);
>+    void bindFragmentOutputIndex(GLuint index, const char *name);
>+
>+    // KHR_parallel_shader_compile
>+    // Try to link the program asynchrously. As a result, background threads may be launched to
>+    // execute the linking tasks concurrently.
>+    angle::Result link(const Context *context);
>+
>+    // Peek whether there is any running linking tasks.
>+    bool isLinking() const;
>+
>+    bool isLinked() const
>+    {
>+        ASSERT(mLinkResolved);
>+        return mLinked;
>+    }
>+
>+    bool hasLinkedShaderStage(ShaderType shaderType) const
>+    {
>+        ASSERT(shaderType != ShaderType::InvalidEnum);
>+        return mState.mLinkedShaderStages[shaderType];
>+    }
>+
>+    angle::Result loadBinary(const Context *context,
>+                             GLenum binaryFormat,
>+                             const void *binary,
>+                             GLsizei length);
>+    angle::Result saveBinary(Context *context,
>+                             GLenum *binaryFormat,
>+                             void *binary,
>+                             GLsizei bufSize,
>+                             GLsizei *length) const;
>+    GLint getBinaryLength(Context *context) const;
>     void setBinaryRetrievableHint(bool retrievable);
>     bool getBinaryRetrievableHint() const;
> 
>@@ -450,15 +586,19 @@ class Program final : angle::NonCopyable, public LabeledObject
>                             GLchar *name) const;
>     GLint getActiveAttributeCount() const;
>     GLint getActiveAttributeMaxLength() const;
>-    const std::vector<sh::Attribute> &getAttributes() const { return mState.mAttributes; }
>+    const std::vector<sh::Attribute> &getAttributes() const;
> 
>     GLint getFragDataLocation(const std::string &name) const;
>     size_t getOutputResourceCount() const;
>-    const std::vector<GLenum> &getOutputVariableTypes() const
>+    const std::vector<GLenum> &getOutputVariableTypes() const;
>+    DrawBufferMask getActiveOutputVariables() const
>     {
>-        return mState.mOutputVariableTypes;
>+        ASSERT(mLinkResolved);
>+        return mState.mActiveOutputVariables;
>     }
>-    DrawBufferMask getActiveOutputVariables() const { return mState.mActiveOutputVariables; }
>+
>+    // EXT_blend_func_extended
>+    GLint getFragDataIndex(const std::string &name) const;
> 
>     void getActiveUniform(GLuint index,
>                           GLsizei bufsize,
>@@ -472,8 +612,19 @@ class Program final : angle::NonCopyable, public LabeledObject
>     bool isValidUniformLocation(GLint location) const;
>     const LinkedUniform &getUniformByLocation(GLint location) const;
>     const VariableLocation &getUniformLocation(GLint location) const;
>-    const std::vector<VariableLocation> &getUniformLocations() const;
>-    const LinkedUniform &getUniformByIndex(GLuint index) const;
>+
>+    const std::vector<VariableLocation> &getUniformLocations() const
>+    {
>+        ASSERT(mLinkResolved);
>+        return mState.mUniformLocations;
>+    }
>+
>+    const LinkedUniform &getUniformByIndex(GLuint index) const
>+    {
>+        ASSERT(mLinkResolved);
>+        ASSERT(index < static_cast<size_t>(mState.mUniforms.size()));
>+        return mState.mUniforms[index];
>+    }
> 
>     const BufferVariable &getBufferVariableByIndex(GLuint index) const;
> 
>@@ -489,7 +640,7 @@ class Program final : angle::NonCopyable, public LabeledObject
>     void setUniform2fv(GLint location, GLsizei count, const GLfloat *v);
>     void setUniform3fv(GLint location, GLsizei count, const GLfloat *v);
>     void setUniform4fv(GLint location, GLsizei count, const GLfloat *v);
>-    SetUniformResult setUniform1iv(GLint location, GLsizei count, const GLint *v);
>+    void setUniform1iv(Context *context, GLint location, GLsizei count, const GLint *v);
>     void setUniform2iv(GLint location, GLsizei count, const GLint *v);
>     void setUniform3iv(GLint location, GLsizei count, const GLint *v);
>     void setUniform4iv(GLint location, GLsizei count, const GLint *v);
>@@ -497,15 +648,42 @@ class Program final : angle::NonCopyable, public LabeledObject
>     void setUniform2uiv(GLint location, GLsizei count, const GLuint *v);
>     void setUniform3uiv(GLint location, GLsizei count, const GLuint *v);
>     void setUniform4uiv(GLint location, GLsizei count, const GLuint *v);
>-    void setUniformMatrix2fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
>-    void setUniformMatrix3fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
>-    void setUniformMatrix4fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
>-    void setUniformMatrix2x3fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
>-    void setUniformMatrix3x2fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
>-    void setUniformMatrix2x4fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
>-    void setUniformMatrix4x2fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
>-    void setUniformMatrix3x4fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
>-    void setUniformMatrix4x3fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
>+    void setUniformMatrix2fv(GLint location,
>+                             GLsizei count,
>+                             GLboolean transpose,
>+                             const GLfloat *value);
>+    void setUniformMatrix3fv(GLint location,
>+                             GLsizei count,
>+                             GLboolean transpose,
>+                             const GLfloat *value);
>+    void setUniformMatrix4fv(GLint location,
>+                             GLsizei count,
>+                             GLboolean transpose,
>+                             const GLfloat *value);
>+    void setUniformMatrix2x3fv(GLint location,
>+                               GLsizei count,
>+                               GLboolean transpose,
>+                               const GLfloat *value);
>+    void setUniformMatrix3x2fv(GLint location,
>+                               GLsizei count,
>+                               GLboolean transpose,
>+                               const GLfloat *value);
>+    void setUniformMatrix2x4fv(GLint location,
>+                               GLsizei count,
>+                               GLboolean transpose,
>+                               const GLfloat *value);
>+    void setUniformMatrix4x2fv(GLint location,
>+                               GLsizei count,
>+                               GLboolean transpose,
>+                               const GLfloat *value);
>+    void setUniformMatrix3x4fv(GLint location,
>+                               GLsizei count,
>+                               GLboolean transpose,
>+                               const GLfloat *value);
>+    void setUniformMatrix4x3fv(GLint location,
>+                               GLsizei count,
>+                               GLboolean transpose,
>+                               const GLfloat *value);
> 
>     void getUniformfv(const Context *context, GLint location, GLfloat *params) const;
>     void getUniformiv(const Context *context, GLint location, GLint *params) const;
>@@ -519,10 +697,27 @@ class Program final : angle::NonCopyable, public LabeledObject
>                                          GLsizei bufSize,
>                                          GLsizei *length,
>                                          GLchar *blockName) const;
>-    GLuint getActiveUniformBlockCount() const;
>-    GLuint getActiveAtomicCounterBufferCount() const;
>-    GLuint getActiveShaderStorageBlockCount() const;
>-    GLint getActiveUniformBlockMaxLength() const;
>+
>+    ANGLE_INLINE GLuint getActiveUniformBlockCount() const
>+    {
>+        ASSERT(mLinkResolved);
>+        return static_cast<GLuint>(mState.mUniformBlocks.size());
>+    }
>+
>+    ANGLE_INLINE GLuint getActiveAtomicCounterBufferCount() const
>+    {
>+        ASSERT(mLinkResolved);
>+        return static_cast<GLuint>(mState.mAtomicCounterBuffers.size());
>+    }
>+
>+    ANGLE_INLINE GLuint getActiveShaderStorageBlockCount() const
>+    {
>+        ASSERT(mLinkResolved);
>+        return static_cast<GLuint>(mState.mShaderStorageBlocks.size());
>+    }
>+
>+    GLint getActiveUniformBlockMaxNameLength() const;
>+    GLint getActiveShaderStorageBlockMaxNameLength() const;
> 
>     GLuint getUniformBlockIndex(const std::string &name) const;
>     GLuint getShaderStorageBlockIndex(const std::string &name) const;
>@@ -534,52 +729,91 @@ class Program final : angle::NonCopyable, public LabeledObject
>     const InterfaceBlock &getUniformBlockByIndex(GLuint index) const;
>     const InterfaceBlock &getShaderStorageBlockByIndex(GLuint index) const;
> 
>-    void setTransformFeedbackVaryings(GLsizei count, const GLchar *const *varyings, GLenum bufferMode);
>-    void getTransformFeedbackVarying(GLuint index, GLsizei bufSize, GLsizei *length, GLsizei *size, GLenum *type, GLchar *name) const;
>+    void setTransformFeedbackVaryings(GLsizei count,
>+                                      const GLchar *const *varyings,
>+                                      GLenum bufferMode);
>+    void getTransformFeedbackVarying(GLuint index,
>+                                     GLsizei bufSize,
>+                                     GLsizei *length,
>+                                     GLsizei *size,
>+                                     GLenum *type,
>+                                     GLchar *name) const;
>     GLsizei getTransformFeedbackVaryingCount() const;
>     GLsizei getTransformFeedbackVaryingMaxLength() const;
>     GLenum getTransformFeedbackBufferMode() const;
>+    GLuint getTransformFeedbackVaryingResourceIndex(const GLchar *name) const;
>+    const TransformFeedbackVarying &getTransformFeedbackVaryingResource(GLuint index) const;
>+
>+    bool hasDrawIDUniform() const;
>+    void setDrawIDUniform(GLint drawid);
> 
>-    static bool linkValidateInterfaceBlockFields(InfoLog &infoLog,
>-                                                 const std::string &uniformName,
>-                                                 const sh::InterfaceBlockField &vertexUniform,
>-                                                 const sh::InterfaceBlockField &fragmentUniform,
>-                                                 bool webglCompatibility);
>+    ANGLE_INLINE void addRef()
>+    {
>+        ASSERT(mLinkResolved);
>+        mRefCount++;
>+    }
>+
>+    ANGLE_INLINE void release(const Context *context)
>+    {
>+        ASSERT(mLinkResolved);
>+        mRefCount--;
>+
>+        if (mRefCount == 0 && mDeleteStatus)
>+        {
>+            deleteSelf(context);
>+        }
>+    }
> 
>-    void addRef();
>-    void release(const Context *context);
>     unsigned int getRefCount() const;
>+    bool isInUse() const { return getRefCount() != 0; }
>     void flagForDeletion();
>     bool isFlaggedForDeletion() const;
> 
>     void validate(const Caps &caps);
>-    bool validateSamplers(InfoLog *infoLog, const Caps &caps);
>+    bool validateSamplers(InfoLog *infoLog, const Caps &caps)
>+    {
>+        // Skip cache if we're using an infolog, so we get the full error.
>+        // Also skip the cache if the sample mapping has changed, or if we haven't ever validated.
>+        if (infoLog == nullptr && mCachedValidateSamplersResult.valid())
>+        {
>+            return mCachedValidateSamplersResult.value();
>+        }
>+
>+        return validateSamplersImpl(infoLog, caps);
>+    }
>+
>     bool isValidated() const;
>-    bool samplesFromTexture(const gl::State &state, GLuint textureID) const;
> 
>     const AttributesMask &getActiveAttribLocationsMask() const
>     {
>+        ASSERT(mLinkResolved);
>         return mState.mActiveAttribLocationsMask;
>     }
> 
>-    const std::vector<SamplerBinding> &getSamplerBindings() const
>+    const std::vector<SamplerBinding> &getSamplerBindings() const;
>+    const std::vector<ImageBinding> &getImageBindings() const
>     {
>-        return mState.mSamplerBindings;
>+        ASSERT(mLinkResolved);
>+        return mState.mImageBindings;
>     }
>+    const sh::WorkGroupSize &getComputeShaderLocalSize() const;
>+    PrimitiveMode getGeometryShaderInputPrimitiveType() const;
>+    PrimitiveMode getGeometryShaderOutputPrimitiveType() const;
>+    GLint getGeometryShaderInvocations() const;
>+    GLint getGeometryShaderMaxVertices() const;
> 
>-    const std::vector<ImageBinding> &getImageBindings() const { return mState.mImageBindings; }
>-    const sh::WorkGroupSize &getComputeShaderLocalSize() const
>+    const ProgramState &getState() const
>     {
>-        return mState.mComputeShaderLocalSize;
>+        ASSERT(mLinkResolved);
>+        return mState;
>     }
> 
>-    const ProgramState &getState() const { return mState; }
>-
>-    static bool linkValidateVariablesBase(InfoLog &infoLog,
>-                                          const std::string &variableName,
>-                                          const sh::ShaderVariable &vertexVariable,
>-                                          const sh::ShaderVariable &fragmentVariable,
>-                                          bool validatePrecision);
>+    static LinkMismatchError LinkValidateVariablesBase(
>+        const sh::ShaderVariable &variable1,
>+        const sh::ShaderVariable &variable2,
>+        bool validatePrecision,
>+        bool validateArraySize,
>+        std::string *mismatchedStructOrBlockMemberName);
> 
>     GLuint getInputResourceIndex(const GLchar *name) const;
>     GLuint getOutputResourceIndex(const GLchar *name) const;
>@@ -593,85 +827,125 @@ class Program final : angle::NonCopyable, public LabeledObject
>     const sh::Attribute &getInputResource(GLuint index) const;
>     const sh::OutputVariable &getOutputResource(GLuint index) const;
> 
>-    class Bindings final : angle::NonCopyable
>+    const ProgramBindings &getAttributeBindings() const;
>+    const ProgramBindings &getUniformLocationBindings() const;
>+    const ProgramBindings &getFragmentInputBindings() const;
>+
>+    int getNumViews() const
>     {
>-      public:
>-        Bindings();
>-        ~Bindings();
>-        void bindLocation(GLuint index, const std::string &name);
>-        int getBinding(const std::string &name) const;
>+        ASSERT(mLinkResolved);
>+        return mState.getNumViews();
>+    }
> 
>-        typedef std::unordered_map<std::string, GLuint>::const_iterator const_iterator;
>-        const_iterator begin() const;
>-        const_iterator end() const;
>+    bool usesMultiview() const { return mState.usesMultiview(); }
> 
>-      private:
>-        std::unordered_map<std::string, GLuint> mBindings;
>-    };
>+    ComponentTypeMask getDrawBufferTypeMask() const;
>+    ComponentTypeMask getAttributesTypeMask() const;
>+    AttributesMask getAttributesMask() const;
> 
>-    const Bindings &getAttributeBindings() const { return mAttributeBindings; }
>-    const Bindings &getUniformLocationBindings() const { return mUniformLocationBindings; }
>-    const Bindings &getFragmentInputBindings() const { return mFragmentInputBindings; }
>+    const std::vector<GLsizei> &getTransformFeedbackStrides() const;
> 
>-    int getNumViews() const { return mState.getNumViews(); }
>-    bool usesMultiview() const { return mState.usesMultiview(); }
>+    const ActiveTextureMask &getActiveSamplersMask() const { return mState.mActiveSamplersMask; }
>+    const ActiveTextureMask &getActiveImagesMask() const { return mState.mActiveImagesMask; }
> 
>-    struct VaryingRef
>+    const ActiveTextureArray<TextureType> &getActiveSamplerTypes() const
>     {
>-        const sh::Varying *get() const { return vertex ? vertex : fragment; }
>+        return mState.mActiveSamplerTypes;
>+    }
>+
>+    // Program dirty bits.
>+    enum DirtyBitType
>+    {
>+        DIRTY_BIT_UNIFORM_BLOCK_BINDING_0,
>+        DIRTY_BIT_UNIFORM_BLOCK_BINDING_MAX =
>+            DIRTY_BIT_UNIFORM_BLOCK_BINDING_0 + IMPLEMENTATION_MAX_COMBINED_SHADER_UNIFORM_BUFFERS,
> 
>-        const sh::Varying *vertex   = nullptr;
>-        const sh::Varying *fragment = nullptr;
>+        DIRTY_BIT_COUNT = DIRTY_BIT_UNIFORM_BLOCK_BINDING_MAX,
>     };
>-    using MergedVaryings = std::map<std::string, VaryingRef>;
>+
>+    using DirtyBits = angle::BitSet<DIRTY_BIT_COUNT>;
>+
>+    angle::Result syncState(const Context *context);
>+
>+    // Try to resolve linking. Inlined to make sure its overhead is as low as possible.
>+    void resolveLink(const Context *context)
>+    {
>+        if (!mLinkResolved)
>+        {
>+            resolveLinkImpl(context);
>+        }
>+    }
>+
>+    ANGLE_INLINE bool hasAnyDirtyBit() const { return mDirtyBits.any(); }
>+
>+    // Writes a program's binary to the output memory buffer.
>+    void serialize(const Context *context, angle::MemoryBuffer *binaryOut) const;
>+
> 
>   private:
>-    ~Program() override;
>+    struct LinkingState;
> 
>-    void unlink();
>+    ~Program() override;
> 
>-    bool linkAttributes(const Context *context, InfoLog &infoLog);
>-    bool validateVertexAndFragmentInterfaceBlocks(
>-        const std::vector<sh::InterfaceBlock> &vertexInterfaceBlocks,
>-        const std::vector<sh::InterfaceBlock> &fragmentInterfaceBlocks,
>-        InfoLog &infoLog,
>-        bool webglCompatibility) const;
>-    bool linkInterfaceBlocks(const Context *context, InfoLog &infoLog);
>-    bool linkVaryings(const Context *context, InfoLog &infoLog) const;
>+    // Loads program state according to the specified binary blob.
>+    angle::Result deserialize(const Context *context, BinaryInputStream &stream, InfoLog &infoLog);
> 
>-    bool linkUniforms(const Context *context,
>+    void unlink();
>+    void deleteSelf(const Context *context);
>+
>+    bool linkValidateShaders(InfoLog &infoLog);
>+    bool linkAttributes(const Caps &caps, InfoLog &infoLog);
>+    bool linkInterfaceBlocks(const Caps &caps,
>+                             const Version &version,
>+                             bool webglCompatibility,
>+                             InfoLog &infoLog,
>+                             GLuint *combinedShaderStorageBlocksCount);
>+    bool linkVaryings(InfoLog &infoLog) const;
>+
>+    bool linkUniforms(const Caps &caps,
>                       InfoLog &infoLog,
>-                      const Bindings &uniformLocationBindings);
>-    void linkSamplerAndImageBindings();
>+                      const ProgramBindings &uniformLocationBindings,
>+                      GLuint *combinedImageUniformsCount,
>+                      std::vector<UnusedUniform> *unusedUniforms);
>+    void linkSamplerAndImageBindings(GLuint *combinedImageUniformsCount);
>     bool linkAtomicCounterBuffers();
> 
>     void updateLinkedShaderStages();
> 
>-    bool areMatchingInterfaceBlocks(InfoLog &infoLog,
>-                                    const sh::InterfaceBlock &vertexInterfaceBlock,
>-                                    const sh::InterfaceBlock &fragmentInterfaceBlock,
>-                                    bool webglCompatibility) const;
>-
>-    static bool linkValidateVaryings(InfoLog &infoLog,
>-                                     const std::string &varyingName,
>-                                     const sh::Varying &vertexVarying,
>-                                     const sh::Varying &fragmentVarying,
>-                                     int shaderVersion);
>-    bool linkValidateBuiltInVaryings(const Context *context, InfoLog &infoLog) const;
>-    bool linkValidateTransformFeedback(const gl::Context *context,
>+    static LinkMismatchError LinkValidateVaryings(const sh::Varying &outputVarying,
>+                                                  const sh::Varying &inputVarying,
>+                                                  int shaderVersion,
>+                                                  bool validateGeometryShaderInputVarying,
>+                                                  std::string *mismatchedStructFieldName);
>+
>+    bool linkValidateShaderInterfaceMatching(Shader *generatingShader,
>+                                             Shader *consumingShader,
>+                                             InfoLog &infoLog) const;
>+
>+    // Check for aliased path rendering input bindings (if any).
>+    // If more than one binding refer statically to the same location the link must fail.
>+    bool linkValidateFragmentInputBindings(InfoLog &infoLog) const;
>+
>+    bool linkValidateBuiltInVaryings(InfoLog &infoLog) const;
>+    bool linkValidateTransformFeedback(const Version &version,
>                                        InfoLog &infoLog,
>-                                       const MergedVaryings &linkedVaryings,
>+                                       const ProgramMergedVaryings &linkedVaryings,
>                                        const Caps &caps) const;
>-    bool linkValidateGlobalNames(const Context *context, InfoLog &infoLog) const;
>+    bool linkValidateGlobalNames(InfoLog &infoLog) const;
> 
>-    void gatherTransformFeedbackVaryings(const MergedVaryings &varyings);
>+    void gatherTransformFeedbackVaryings(const ProgramMergedVaryings &varyings);
> 
>-    MergedVaryings getMergedVaryings(const Context *context) const;
>-    void linkOutputVariables(const Context *context);
>+    ProgramMergedVaryings getMergedVaryings() const;
>+    int getOutputLocationForLink(const sh::OutputVariable &outputVariable) const;
>+    bool isOutputSecondaryForLink(const sh::OutputVariable &outputVariable) const;
>+    bool linkOutputVariables(const Caps &caps,
>+                             const Extensions &extensions,
>+                             const Version &version,
>+                             GLuint combinedImageUniformsCount,
>+                             GLuint combinedShaderStorageBlocksCount);
> 
>     void setUniformValuesFromBindingQualifiers();
> 
>-    void gatherAtomicCounterBuffers();
>     void initInterfaceBlockBindings();
> 
>     // Both these function update the cached uniform values and return a modified "count"
>@@ -684,7 +958,8 @@ class Program final : angle::NonCopyable, public LabeledObject
>     template <size_t cols, size_t rows, typename T>
>     GLsizei clampMatrixUniformCount(GLint location, GLsizei count, GLboolean transpose, const T *v);
> 
>-    void updateSamplerUniform(const VariableLocation &locationInfo,
>+    void updateSamplerUniform(Context *context,
>+                              const VariableLocation &locationInfo,
>                               GLsizei clampedCount,
>                               const GLint *v);
> 
>@@ -702,22 +977,40 @@ class Program final : angle::NonCopyable, public LabeledObject
>                          GLsizei *length,
>                          GLchar *name) const;
> 
>+    template <typename T>
>+    GLint getActiveInterfaceBlockMaxNameLength(const std::vector<T> &resources) const;
>+
>+    GLuint getSamplerUniformBinding(const VariableLocation &uniformLocation) const;
>+
>+    bool validateSamplersImpl(InfoLog *infoLog, const Caps &caps);
>+
>+    // Block until linking is finished and resolve it.
>+    void resolveLinkImpl(const gl::Context *context);
>+
>+    void postResolveLink(const gl::Context *context);
>+
>     ProgramState mState;
>     rx::ProgramImpl *mProgram;
> 
>     bool mValidated;
> 
>-    Bindings mAttributeBindings;
>+    ProgramBindings mAttributeBindings;
> 
>     // Note that this has nothing to do with binding layout qualifiers that can be set for some
>     // uniforms in GLES3.1+. It is used to pre-set the location of uniforms.
>-    Bindings mUniformLocationBindings;
>+    ProgramBindings mUniformLocationBindings;
> 
>     // CHROMIUM_path_rendering
>-    Bindings mFragmentInputBindings;
>+    ProgramBindings mFragmentInputBindings;
>+
>+    // EXT_blend_func_extended
>+    ProgramBindings mFragmentOutputLocations;
>+    ProgramBindings mFragmentOutputIndexes;
> 
>     bool mLinked;
>-    bool mDeleteStatus;   // Flag to indicate that the program can be deleted when no longer in use
>+    bool mLinkResolved;
>+    std::unique_ptr<LinkingState> mLinkingState;
>+    bool mDeleteStatus;  // Flag to indicate that the program can be deleted when no longer in use
> 
>     unsigned int mRefCount;
> 
>@@ -728,8 +1021,9 @@ class Program final : angle::NonCopyable, public LabeledObject
> 
>     // Cache for sampler validation
>     Optional<bool> mCachedValidateSamplersResult;
>-    std::vector<GLenum> mTextureUnitTypesCache;
>+
>+    DirtyBits mDirtyBits;
> };
> }  // namespace gl
> 
>-#endif   // LIBANGLE_PROGRAM_H_
>+#endif  // LIBANGLE_PROGRAM_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/ProgramLinkedResources.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/ProgramLinkedResources.cpp
>index a33f7515259..9b4411ecbd9 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/ProgramLinkedResources.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/ProgramLinkedResources.cpp
>@@ -4,9 +4,9 @@
> // found in the LICENSE file.
> //
> 
>-// UniformLinker.cpp: implements link-time checks for default block uniforms, and generates uniform
>-// locations. Populates data structures related to uniforms so that they can be stored in program
>-// state.
>+// ProgramLinkedResources.cpp: implements link-time checks for default block uniforms, and generates
>+// uniform locations. Populates data structures related to uniforms so that they can be stored in
>+// program state.
> 
> #include "libANGLE/ProgramLinkedResources.h"
> 
>@@ -19,10 +19,8 @@
> 
> namespace gl
> {
>-
> namespace
> {
>-
> LinkedUniform *FindUniform(std::vector<LinkedUniform> &list, const std::string &name)
> {
>     for (LinkedUniform &uniform : list)
>@@ -34,7 +32,7 @@ LinkedUniform *FindUniform(std::vector<LinkedUniform> &list, const std::string &
>     return nullptr;
> }
> 
>-int GetUniformLocationBinding(const Program::Bindings &uniformLocationBindings,
>+int GetUniformLocationBinding(const ProgramBindings &uniformLocationBindings,
>                               const sh::Uniform &uniform)
> {
>     int binding = uniformLocationBindings.getBinding(uniform.name);
>@@ -48,135 +46,593 @@ int GetUniformLocationBinding(const Program::Bindings &uniformLocationBindings,
>     return binding;
> }
> 
>-}  // anonymous namespace
>-
>-UniformLinker::UniformLinker(const ProgramState &state) : mState(state)
>+template <typename VarT>
>+void SetActive(std::vector<VarT> *list, const std::string &name, ShaderType shaderType, bool active)
> {
>+    for (auto &variable : *list)
>+    {
>+        if (variable.name == name)
>+        {
>+            variable.setActive(shaderType, active);
>+            return;
>+        }
>+    }
> }
> 
>-UniformLinker::~UniformLinker() = default;
>-
>-void UniformLinker::getResults(std::vector<LinkedUniform> *uniforms,
>-                               std::vector<VariableLocation> *uniformLocations)
>+// GLSL ES Spec 3.00.3, section 4.3.5.
>+LinkMismatchError LinkValidateUniforms(const sh::Uniform &uniform1,
>+                                       const sh::Uniform &uniform2,
>+                                       std::string *mismatchedStructFieldName)
> {
>-    uniforms->swap(mUniforms);
>-    uniformLocations->swap(mUniformLocations);
>+#if ANGLE_PROGRAM_LINK_VALIDATE_UNIFORM_PRECISION == ANGLE_ENABLED
>+    const bool validatePrecision = true;
>+#else
>+    const bool validatePrecision = false;
>+#endif
>+
>+    LinkMismatchError linkError = Program::LinkValidateVariablesBase(
>+        uniform1, uniform2, validatePrecision, true, mismatchedStructFieldName);
>+    if (linkError != LinkMismatchError::NO_MISMATCH)
>+    {
>+        return linkError;
>+    }
>+
>+    // GLSL ES Spec 3.10.4, section 4.4.5.
>+    if (uniform1.binding != -1 && uniform2.binding != -1 && uniform1.binding != uniform2.binding)
>+    {
>+        return LinkMismatchError::BINDING_MISMATCH;
>+    }
>+
>+    // GLSL ES Spec 3.10.4, section 9.2.1.
>+    if (uniform1.location != -1 && uniform2.location != -1 &&
>+        uniform1.location != uniform2.location)
>+    {
>+        return LinkMismatchError::LOCATION_MISMATCH;
>+    }
>+    if (uniform1.offset != uniform2.offset)
>+    {
>+        return LinkMismatchError::OFFSET_MISMATCH;
>+    }
>+
>+    return LinkMismatchError::NO_MISMATCH;
> }
> 
>-bool UniformLinker::link(const Context *context,
>-                         InfoLog &infoLog,
>-                         const Program::Bindings &uniformLocationBindings)
>+using ShaderUniform = std::pair<ShaderType, const sh::Uniform *>;
>+
>+bool ValidateGraphicsUniformsPerShader(Shader *shaderToLink,
>+                                       bool extendLinkedUniforms,
>+                                       std::map<std::string, ShaderUniform> *linkedUniforms,
>+                                       InfoLog &infoLog)
> {
>-    if (mState.getAttachedVertexShader() && mState.getAttachedFragmentShader())
>+    ASSERT(shaderToLink && linkedUniforms);
>+
>+    for (const sh::Uniform &uniform : shaderToLink->getUniforms())
>     {
>-        ASSERT(mState.getAttachedComputeShader() == nullptr);
>-        if (!validateVertexAndFragmentUniforms(context, infoLog))
>+        const auto &entry = linkedUniforms->find(uniform.name);
>+        if (entry != linkedUniforms->end())
>         {
>-            return false;
>+            const sh::Uniform &linkedUniform = *(entry->second.second);
>+            std::string mismatchedStructFieldName;
>+            LinkMismatchError linkError =
>+                LinkValidateUniforms(uniform, linkedUniform, &mismatchedStructFieldName);
>+            if (linkError != LinkMismatchError::NO_MISMATCH)
>+            {
>+                LogLinkMismatch(infoLog, uniform.name, "uniform", linkError,
>+                                mismatchedStructFieldName, entry->second.first,
>+                                shaderToLink->getType());
>+                return false;
>+            }
>+        }
>+        else if (extendLinkedUniforms)
>+        {
>+            (*linkedUniforms)[uniform.name] = std::make_pair(shaderToLink->getType(), &uniform);
>         }
>     }
> 
>-    // Flatten the uniforms list (nested fields) into a simple list (no nesting).
>-    // Also check the maximum uniform vector and sampler counts.
>-    if (!flattenUniformsAndCheckCaps(context, infoLog))
>+    return true;
>+}
>+
>+GLuint GetMaximumShaderUniformVectors(ShaderType shaderType, const Caps &caps)
>+{
>+    switch (shaderType)
>     {
>-        return false;
>+        case ShaderType::Vertex:
>+            return caps.maxVertexUniformVectors;
>+        case ShaderType::Fragment:
>+            return caps.maxFragmentUniformVectors;
>+
>+        case ShaderType::Compute:
>+        case ShaderType::Geometry:
>+            return caps.maxShaderUniformComponents[shaderType] / 4;
>+
>+        default:
>+            UNREACHABLE();
>+            return 0u;
>     }
>+}
>+
>+enum class UniformType : uint8_t
>+{
>+    Variable      = 0,
>+    Sampler       = 1,
>+    Image         = 2,
>+    AtomicCounter = 3,
>+
>+    InvalidEnum = 4,
>+    EnumCount   = 4,
>+};
> 
>-    if (!checkMaxCombinedAtomicCounters(context->getCaps(), infoLog))
>+const char *GetUniformResourceNameString(UniformType uniformType)
>+{
>+    switch (uniformType)
>     {
>-        return false;
>+        case UniformType::Variable:
>+            return "uniform";
>+        case UniformType::Sampler:
>+            return "texture image unit";
>+        case UniformType::Image:
>+            return "image uniform";
>+        case UniformType::AtomicCounter:
>+            return "atomic counter";
>+        default:
>+            UNREACHABLE();
>+            return "";
>     }
>+}
> 
>-    if (!indexUniforms(infoLog, uniformLocationBindings))
>+std::string GetUniformResourceLimitName(ShaderType shaderType, UniformType uniformType)
>+{
>+    // Special case: MAX_TEXTURE_IMAGE_UNITS (no "MAX_FRAGMENT_TEXTURE_IMAGE_UNITS")
>+    if (shaderType == ShaderType::Fragment && uniformType == UniformType::Sampler)
>     {
>-        return false;
>+        return "MAX_TEXTURE_IMAGE_UNITS";
>     }
> 
>-    return true;
>+    std::ostringstream ostream;
>+    ostream << "MAX_" << GetShaderTypeString(shaderType) << "_";
>+
>+    switch (uniformType)
>+    {
>+        case UniformType::Variable:
>+            // For vertex and fragment shaders, ES 2.0 only defines MAX_VERTEX_UNIFORM_VECTORS and
>+            // MAX_FRAGMENT_UNIFORM_VECTORS ([OpenGL ES 2.0] Table 6.20).
>+            if (shaderType == ShaderType::Vertex || shaderType == ShaderType::Fragment)
>+            {
>+                ostream << "UNIFORM_VECTORS";
>+                break;
>+            }
>+            // For compute and geometry shaders, there are no definitions on
>+            // "MAX_COMPUTE_UNIFORM_VECTORS" or "MAX_GEOMETRY_UNIFORM_VECTORS_EXT"
>+            // ([OpenGL ES 3.1] Table 20.45, [EXT_geometry_shader] Table 20.43gs).
>+            else
>+            {
>+                ostream << "UNIFORM_COMPONENTS";
>+            }
>+            break;
>+        case UniformType::Sampler:
>+            ostream << "TEXTURE_IMAGE_UNITS";
>+            break;
>+        case UniformType::Image:
>+            ostream << "IMAGE_UNIFORMS";
>+            break;
>+        case UniformType::AtomicCounter:
>+            ostream << "ATOMIC_COUNTERS";
>+            break;
>+        default:
>+            UNREACHABLE();
>+            return "";
>+    }
>+
>+    if (shaderType == ShaderType::Geometry)
>+    {
>+        ostream << "_EXT";
>+    }
>+
>+    return ostream.str();
>+}
>+
>+void LogUniformsExceedLimit(ShaderType shaderType,
>+                            UniformType uniformType,
>+                            GLuint limit,
>+                            InfoLog &infoLog)
>+{
>+    infoLog << GetShaderTypeString(shaderType) << " shader "
>+            << GetUniformResourceNameString(uniformType) << "s count exceeds "
>+            << GetUniformResourceLimitName(shaderType, uniformType) << "(" << limit << ")";
>+}
>+
>+// The purpose of this visitor is to capture the uniforms in a uniform block. Each new uniform is
>+// added to "uniformsOut".
>+class UniformBlockEncodingVisitor : public sh::VariableNameVisitor
>+{
>+  public:
>+    UniformBlockEncodingVisitor(const GetBlockMemberInfoFunc &getMemberInfo,
>+                                const std::string &namePrefix,
>+                                const std::string &mappedNamePrefix,
>+                                std::vector<LinkedUniform> *uniformsOut,
>+                                ShaderType shaderType,
>+                                int blockIndex)
>+        : sh::VariableNameVisitor(namePrefix, mappedNamePrefix),
>+          mGetMemberInfo(getMemberInfo),
>+          mUniformsOut(uniformsOut),
>+          mShaderType(shaderType),
>+          mBlockIndex(blockIndex)
>+    {}
>+
>+    void visitNamedVariable(const sh::ShaderVariable &variable,
>+                            bool isRowMajor,
>+                            const std::string &name,
>+                            const std::string &mappedName) override
>+    {
>+        // If getBlockMemberInfo returns false, the variable is optimized out.
>+        sh::BlockMemberInfo variableInfo;
>+        if (!mGetMemberInfo(name, mappedName, &variableInfo))
>+            return;
>+
>+        std::string nameWithArrayIndex       = name;
>+        std::string mappedNameWithArrayIndex = mappedName;
>+
>+        if (variable.isArray())
>+        {
>+            nameWithArrayIndex += "[0]";
>+            mappedNameWithArrayIndex += "[0]";
>+        }
>+
>+        if (mBlockIndex == -1)
>+        {
>+            SetActive(mUniformsOut, nameWithArrayIndex, mShaderType, variable.active);
>+            return;
>+        }
>+
>+        LinkedUniform newUniform(variable.type, variable.precision, nameWithArrayIndex,
>+                                 variable.arraySizes, -1, -1, -1, mBlockIndex, variableInfo);
>+        newUniform.mappedName = mappedNameWithArrayIndex;
>+        newUniform.setActive(mShaderType, variable.active);
>+
>+        // Since block uniforms have no location, we don't need to store them in the uniform
>+        // locations list.
>+        mUniformsOut->push_back(newUniform);
>+    }
>+
>+  private:
>+    const GetBlockMemberInfoFunc &mGetMemberInfo;
>+    std::vector<LinkedUniform> *mUniformsOut;
>+    const ShaderType mShaderType;
>+    const int mBlockIndex;
>+};
>+
>+// The purpose of this visitor is to capture the buffer variables in a shader storage block. Each
>+// new buffer variable is stored in "bufferVariablesOut".
>+class ShaderStorageBlockVisitor : public sh::BlockEncoderVisitor
>+{
>+  public:
>+    ShaderStorageBlockVisitor(const GetBlockMemberInfoFunc &getMemberInfo,
>+                              const std::string &namePrefix,
>+                              const std::string &mappedNamePrefix,
>+                              std::vector<BufferVariable> *bufferVariablesOut,
>+                              ShaderType shaderType,
>+                              int blockIndex)
>+        : sh::BlockEncoderVisitor(namePrefix, mappedNamePrefix, &mDummyEncoder),
>+          mGetMemberInfo(getMemberInfo),
>+          mBufferVariablesOut(bufferVariablesOut),
>+          mShaderType(shaderType),
>+          mBlockIndex(blockIndex)
>+    {}
>+
>+    void visitNamedVariable(const sh::ShaderVariable &variable,
>+                            bool isRowMajor,
>+                            const std::string &name,
>+                            const std::string &mappedName) override
>+    {
>+        if (mSkipEnabled)
>+            return;
>+
>+        // If getBlockMemberInfo returns false, the variable is optimized out.
>+        sh::BlockMemberInfo variableInfo;
>+        if (!mGetMemberInfo(name, mappedName, &variableInfo))
>+            return;
>+
>+        std::string nameWithArrayIndex       = name;
>+        std::string mappedNameWithArrayIndex = mappedName;
>+
>+        if (variable.isArray())
>+        {
>+            nameWithArrayIndex += "[0]";
>+            mappedNameWithArrayIndex += "[0]";
>+        }
>+
>+        if (mBlockIndex == -1)
>+        {
>+            SetActive(mBufferVariablesOut, nameWithArrayIndex, mShaderType, variable.active);
>+            return;
>+        }
>+
>+        BufferVariable newBufferVariable(variable.type, variable.precision, nameWithArrayIndex,
>+                                         variable.arraySizes, mBlockIndex, variableInfo);
>+        newBufferVariable.mappedName = mappedNameWithArrayIndex;
>+        newBufferVariable.setActive(mShaderType, variable.active);
>+
>+        newBufferVariable.topLevelArraySize = mTopLevelArraySize;
>+
>+        mBufferVariablesOut->push_back(newBufferVariable);
>+    }
>+
>+  private:
>+    const GetBlockMemberInfoFunc &mGetMemberInfo;
>+    std::vector<BufferVariable> *mBufferVariablesOut;
>+    const ShaderType mShaderType;
>+    const int mBlockIndex;
>+    sh::DummyBlockEncoder mDummyEncoder;
>+};
>+
>+struct ShaderUniformCount
>+{
>+    unsigned int vectorCount        = 0;
>+    unsigned int samplerCount       = 0;
>+    unsigned int imageCount         = 0;
>+    unsigned int atomicCounterCount = 0;
>+};
>+
>+ShaderUniformCount &operator+=(ShaderUniformCount &lhs, const ShaderUniformCount &rhs)
>+{
>+    lhs.vectorCount += rhs.vectorCount;
>+    lhs.samplerCount += rhs.samplerCount;
>+    lhs.imageCount += rhs.imageCount;
>+    lhs.atomicCounterCount += rhs.atomicCounterCount;
>+    return lhs;
> }
> 
>-bool UniformLinker::validateVertexAndFragmentUniforms(const Context *context,
>-                                                      InfoLog &infoLog) const
>+// The purpose of this visitor is to flatten struct and array uniforms into a list of singleton
>+// uniforms. They are stored in separate lists by uniform type so they can be sorted in order.
>+// Counts for each uniform category are stored and can be queried with "getCounts".
>+class FlattenUniformVisitor : public sh::VariableNameVisitor
> {
>-    // Check that uniforms defined in the vertex and fragment shaders are identical
>-    std::map<std::string, sh::Uniform> linkedUniforms;
>-    const std::vector<sh::Uniform> &vertexUniforms =
>-        mState.getAttachedVertexShader()->getUniforms(context);
>-    const std::vector<sh::Uniform> &fragmentUniforms =
>-        mState.getAttachedFragmentShader()->getUniforms(context);
>-
>-    for (const sh::Uniform &vertexUniform : vertexUniforms)
>+  public:
>+    FlattenUniformVisitor(ShaderType shaderType,
>+                          const sh::Uniform &uniform,
>+                          std::vector<LinkedUniform> *uniforms,
>+                          std::vector<LinkedUniform> *samplerUniforms,
>+                          std::vector<LinkedUniform> *imageUniforms,
>+                          std::vector<LinkedUniform> *atomicCounterUniforms,
>+                          std::vector<UnusedUniform> *unusedUniforms)
>+        : sh::VariableNameVisitor("", ""),
>+          mShaderType(shaderType),
>+          mMarkActive(uniform.active),
>+          mMarkStaticUse(uniform.staticUse),
>+          mBinding(uniform.binding),
>+          mOffset(uniform.offset),
>+          mLocation(uniform.location),
>+          mUniforms(uniforms),
>+          mSamplerUniforms(samplerUniforms),
>+          mImageUniforms(imageUniforms),
>+          mAtomicCounterUniforms(atomicCounterUniforms),
>+          mUnusedUniforms(unusedUniforms)
>+    {}
>+
>+    void visitNamedSampler(const sh::ShaderVariable &sampler,
>+                           const std::string &name,
>+                           const std::string &mappedName) override
>     {
>-        linkedUniforms[vertexUniform.name] = vertexUniform;
>+        visitNamedVariable(sampler, false, name, mappedName);
>     }
> 
>-    for (const sh::Uniform &fragmentUniform : fragmentUniforms)
>+    void visitNamedVariable(const sh::ShaderVariable &variable,
>+                            bool isRowMajor,
>+                            const std::string &name,
>+                            const std::string &mappedName) override
>     {
>-        auto entry = linkedUniforms.find(fragmentUniform.name);
>-        if (entry != linkedUniforms.end())
>+        bool isSampler                              = IsSamplerType(variable.type);
>+        bool isImage                                = IsImageType(variable.type);
>+        bool isAtomicCounter                        = IsAtomicCounterType(variable.type);
>+        std::vector<gl::LinkedUniform> *uniformList = mUniforms;
>+        if (isSampler)
>+        {
>+            uniformList = mSamplerUniforms;
>+        }
>+        else if (isImage)
>         {
>-            const sh::Uniform &linkedUniform = entry->second;
>-            const std::string &uniformName   = "uniform '" + linkedUniform.name + "'";
>-            if (!linkValidateUniforms(infoLog, uniformName, linkedUniform, fragmentUniform))
>+            uniformList = mImageUniforms;
>+        }
>+        else if (isAtomicCounter)
>+        {
>+            uniformList = mAtomicCounterUniforms;
>+        }
>+
>+        std::string fullNameWithArrayIndex(name);
>+        std::string fullMappedNameWithArrayIndex(mappedName);
>+
>+        if (variable.isArray())
>+        {
>+            // We're following the GLES 3.1 November 2016 spec section 7.3.1.1 Naming Active
>+            // Resources and including [0] at the end of array variable names.
>+            fullNameWithArrayIndex += "[0]";
>+            fullMappedNameWithArrayIndex += "[0]";
>+        }
>+
>+        LinkedUniform *existingUniform = FindUniform(*uniformList, fullNameWithArrayIndex);
>+        if (existingUniform)
>+        {
>+            if (getBinding() != -1)
>             {
>-                return false;
>+                existingUniform->binding = getBinding();
>+            }
>+            if (getOffset() != -1)
>+            {
>+                existingUniform->offset = getOffset();
>+            }
>+            if (mLocation != -1)
>+            {
>+                existingUniform->location = mLocation;
>+            }
>+            if (mMarkActive)
>+            {
>+                existingUniform->active = true;
>+                existingUniform->setActive(mShaderType, true);
>+            }
>+            if (mMarkStaticUse)
>+            {
>+                existingUniform->staticUse = true;
>             }
>         }
>+        else
>+        {
>+            LinkedUniform linkedUniform(variable.type, variable.precision, fullNameWithArrayIndex,
>+                                        variable.arraySizes, getBinding(), getOffset(), mLocation,
>+                                        -1, sh::kDefaultBlockMemberInfo);
>+            linkedUniform.mappedName = fullMappedNameWithArrayIndex;
>+            linkedUniform.active     = mMarkActive;
>+            linkedUniform.staticUse  = mMarkStaticUse;
>+            linkedUniform.setParentArrayIndex(variable.parentArrayIndex());
>+            if (mMarkActive)
>+            {
>+                linkedUniform.setActive(mShaderType, true);
>+            }
>+            else
>+            {
>+                mUnusedUniforms->emplace_back(linkedUniform.name, linkedUniform.isSampler());
>+            }
>+
>+            uniformList->push_back(linkedUniform);
>+        }
>+
>+        unsigned int elementCount = variable.getBasicTypeElementCount();
>+
>+        // Samplers and images aren't "real" uniforms, so they don't count towards register usage.
>+        // Likewise, don't count "real" uniforms towards opaque count.
>+
>+        if (!IsOpaqueType(variable.type))
>+        {
>+            mUniformCount.vectorCount += VariableRegisterCount(variable.type) * elementCount;
>+        }
>+
>+        mUniformCount.samplerCount += (isSampler ? elementCount : 0);
>+        mUniformCount.imageCount += (isImage ? elementCount : 0);
>+        mUniformCount.atomicCounterCount += (isAtomicCounter ? elementCount : 0);
>+
>+        if (mLocation != -1)
>+        {
>+            mLocation += elementCount;
>+        }
>     }
>-    return true;
>+
>+    void enterStructAccess(const sh::ShaderVariable &structVar, bool isRowMajor) override
>+    {
>+        mStructStackSize++;
>+        sh::VariableNameVisitor::enterStructAccess(structVar, isRowMajor);
>+    }
>+
>+    void exitStructAccess(const sh::ShaderVariable &structVar, bool isRowMajor) override
>+    {
>+        mStructStackSize--;
>+        sh::VariableNameVisitor::exitStructAccess(structVar, isRowMajor);
>+    }
>+
>+    ShaderUniformCount getCounts() const { return mUniformCount; }
>+
>+  private:
>+    int getBinding() const { return mStructStackSize == 0 ? mBinding : -1; }
>+    int getOffset() const { return mStructStackSize == 0 ? mOffset : -1; }
>+
>+    ShaderType mShaderType;
>+
>+    // Active and StaticUse are given separately because they are tracked at struct granularity.
>+    bool mMarkActive;
>+    bool mMarkStaticUse;
>+    int mBinding;
>+    int mOffset;
>+    int mLocation;
>+    std::vector<LinkedUniform> *mUniforms;
>+    std::vector<LinkedUniform> *mSamplerUniforms;
>+    std::vector<LinkedUniform> *mImageUniforms;
>+    std::vector<LinkedUniform> *mAtomicCounterUniforms;
>+    std::vector<UnusedUniform> *mUnusedUniforms;
>+    ShaderUniformCount mUniformCount;
>+    unsigned int mStructStackSize = 0;
>+};
>+}  // anonymous namespace
>+
>+UniformLinker::UniformLinker(const ProgramState &state) : mState(state) {}
>+
>+UniformLinker::~UniformLinker() = default;
>+
>+void UniformLinker::getResults(std::vector<LinkedUniform> *uniforms,
>+                               std::vector<UnusedUniform> *unusedUniforms,
>+                               std::vector<VariableLocation> *uniformLocations)
>+{
>+    uniforms->swap(mUniforms);
>+    unusedUniforms->swap(mUnusedUniforms);
>+    uniformLocations->swap(mUniformLocations);
> }
> 
>-// GLSL ES Spec 3.00.3, section 4.3.5.
>-bool UniformLinker::linkValidateUniforms(InfoLog &infoLog,
>-                                         const std::string &uniformName,
>-                                         const sh::Uniform &vertexUniform,
>-                                         const sh::Uniform &fragmentUniform)
>+bool UniformLinker::link(const Caps &caps,
>+                         InfoLog &infoLog,
>+                         const ProgramBindings &uniformLocationBindings)
> {
>-#if ANGLE_PROGRAM_LINK_VALIDATE_UNIFORM_PRECISION == ANGLE_ENABLED
>-    const bool validatePrecision = true;
>-#else
>-    const bool validatePrecision = false;
>-#endif
>+    if (mState.getAttachedShader(ShaderType::Vertex) &&
>+        mState.getAttachedShader(ShaderType::Fragment))
>+    {
>+        ASSERT(mState.getAttachedShader(ShaderType::Compute) == nullptr);
>+        if (!validateGraphicsUniforms(infoLog))
>+        {
>+            return false;
>+        }
>+    }
> 
>-    if (!Program::linkValidateVariablesBase(infoLog, uniformName, vertexUniform, fragmentUniform,
>-                                            validatePrecision))
>+    // Flatten the uniforms list (nested fields) into a simple list (no nesting).
>+    // Also check the maximum uniform vector and sampler counts.
>+    if (!flattenUniformsAndCheckCaps(caps, infoLog))
>     {
>         return false;
>     }
> 
>-    // GLSL ES Spec 3.10.4, section 4.4.5.
>-    if (vertexUniform.binding != -1 && fragmentUniform.binding != -1 &&
>-        vertexUniform.binding != fragmentUniform.binding)
>+    if (!checkMaxCombinedAtomicCounters(caps, infoLog))
>     {
>-        infoLog << "Binding layout qualifiers for " << uniformName
>-                << " differ between vertex and fragment shaders.";
>         return false;
>     }
> 
>-    // GLSL ES Spec 3.10.4, section 9.2.1.
>-    if (vertexUniform.location != -1 && fragmentUniform.location != -1 &&
>-        vertexUniform.location != fragmentUniform.location)
>+    if (!indexUniforms(infoLog, uniformLocationBindings))
>     {
>-        infoLog << "Location layout qualifiers for " << uniformName
>-                << " differ between vertex and fragment shaders.";
>         return false;
>     }
>-    if (vertexUniform.offset != fragmentUniform.offset)
>+
>+    return true;
>+}
>+
>+bool UniformLinker::validateGraphicsUniforms(InfoLog &infoLog) const
>+{
>+    // Check that uniforms defined in the graphics shaders are identical
>+    std::map<std::string, ShaderUniform> linkedUniforms;
>+
>+    for (ShaderType shaderType : kAllGraphicsShaderTypes)
>     {
>-        infoLog << "Offset layout qualifiers for " << uniformName
>-                << " differ between vertex and fragment shaders.";
>-        return false;
>+        Shader *currentShader = mState.getAttachedShader(shaderType);
>+        if (currentShader)
>+        {
>+            if (shaderType == ShaderType::Vertex)
>+            {
>+                for (const sh::Uniform &vertexUniform : currentShader->getUniforms())
>+                {
>+                    linkedUniforms[vertexUniform.name] =
>+                        std::make_pair(ShaderType::Vertex, &vertexUniform);
>+                }
>+            }
>+            else
>+            {
>+                bool isLastShader = (shaderType == ShaderType::Fragment);
>+                if (!ValidateGraphicsUniformsPerShader(currentShader, !isLastShader,
>+                                                       &linkedUniforms, infoLog))
>+                {
>+                    return false;
>+                }
>+            }
>+        }
>     }
> 
>     return true;
> }
> 
>-bool UniformLinker::indexUniforms(InfoLog &infoLog,
>-                                  const Program::Bindings &uniformLocationBindings)
>+bool UniformLinker::indexUniforms(InfoLog &infoLog, const ProgramBindings &uniformLocationBindings)
> {
>-    // All the locations where another uniform can't be located.
>-    std::set<GLuint> reservedLocations;
>     // Locations which have been allocated for an unused uniform.
>     std::set<GLuint> ignoredLocations;
> 
>@@ -185,8 +641,7 @@ bool UniformLinker::indexUniforms(InfoLog &infoLog,
>     // Gather uniform locations that have been set either using the bindUniformLocation API or by
>     // using a location layout qualifier and check conflicts between them.
>     if (!gatherUniformLocationsAndCheckConflicts(infoLog, uniformLocationBindings,
>-                                                 &reservedLocations, &ignoredLocations,
>-                                                 &maxUniformLocation))
>+                                                 &ignoredLocations, &maxUniformLocation))
>     {
>         return false;
>     }
>@@ -203,7 +658,8 @@ bool UniformLinker::indexUniforms(InfoLog &infoLog,
>     {
>         const LinkedUniform &uniform = mUniforms[uniformIndex];
> 
>-        if (uniform.isBuiltIn() || IsAtomicCounterType(uniform.type))
>+        if ((uniform.isBuiltIn() && !uniform.isEmulatedBuiltIn()) ||
>+            IsAtomicCounterType(uniform.type))
>         {
>             continue;
>         }
>@@ -270,14 +726,16 @@ bool UniformLinker::indexUniforms(InfoLog &infoLog,
> 
> bool UniformLinker::gatherUniformLocationsAndCheckConflicts(
>     InfoLog &infoLog,
>-    const Program::Bindings &uniformLocationBindings,
>-    std::set<GLuint> *reservedLocations,
>+    const ProgramBindings &uniformLocationBindings,
>     std::set<GLuint> *ignoredLocations,
>     int *maxUniformLocation)
> {
>+    // All the locations where another uniform can't be located.
>+    std::set<GLuint> reservedLocations;
>+
>     for (const LinkedUniform &uniform : mUniforms)
>     {
>-        if (uniform.isBuiltIn())
>+        if (uniform.isBuiltIn() && !uniform.isEmulatedBuiltIn())
>         {
>             continue;
>         }
>@@ -294,13 +752,13 @@ bool UniformLinker::gatherUniformLocationsAndCheckConflicts(
>                 // GLSL ES 3.10 section 4.4.3
>                 int elementLocation = shaderLocation + arrayIndex;
>                 *maxUniformLocation = std::max(*maxUniformLocation, elementLocation);
>-                if (reservedLocations->find(elementLocation) != reservedLocations->end())
>+                if (reservedLocations.find(elementLocation) != reservedLocations.end())
>                 {
>                     infoLog << "Multiple uniforms bound to location " << elementLocation << ".";
>                     return false;
>                 }
>-                reservedLocations->insert(elementLocation);
>-                if (!uniform.staticUse)
>+                reservedLocations.insert(elementLocation);
>+                if (!uniform.active)
>                 {
>                     ignoredLocations->insert(elementLocation);
>                 }
>@@ -310,12 +768,16 @@ bool UniformLinker::gatherUniformLocationsAndCheckConflicts(
>         {
>             // Only the first location is reserved even if the uniform is an array.
>             *maxUniformLocation = std::max(*maxUniformLocation, apiBoundLocation);
>-            if (reservedLocations->find(apiBoundLocation) != reservedLocations->end())
>+            if (reservedLocations.find(apiBoundLocation) != reservedLocations.end())
>             {
>                 infoLog << "Multiple uniforms bound to location " << apiBoundLocation << ".";
>                 return false;
>             }
>-            reservedLocations->insert(apiBoundLocation);
>+            reservedLocations.insert(apiBoundLocation);
>+            if (!uniform.active)
>+            {
>+                ignoredLocations->insert(apiBoundLocation);
>+            }
>         }
>     }
> 
>@@ -324,7 +786,7 @@ bool UniformLinker::gatherUniformLocationsAndCheckConflicts(
>     for (const auto &locationBinding : uniformLocationBindings)
>     {
>         GLuint location = locationBinding.second;
>-        if (reservedLocations->find(location) == reservedLocations->end())
>+        if (reservedLocations.find(location) == reservedLocations.end())
>         {
>             ignoredLocations->insert(location);
>             *maxUniformLocation = std::max(*maxUniformLocation, static_cast<int>(location));
>@@ -339,120 +801,107 @@ void UniformLinker::pruneUnusedUniforms()
>     auto uniformIter = mUniforms.begin();
>     while (uniformIter != mUniforms.end())
>     {
>-        if (uniformIter->staticUse)
>+        if (uniformIter->active)
>         {
>             ++uniformIter;
>         }
>         else
>         {
>+            mUnusedUniforms.emplace_back(uniformIter->name, uniformIter->isSampler());
>             uniformIter = mUniforms.erase(uniformIter);
>         }
>     }
> }
> 
> bool UniformLinker::flattenUniformsAndCheckCapsForShader(
>-    const Context *context,
>     Shader *shader,
>-    GLuint maxUniformComponents,
>-    GLuint maxTextureImageUnits,
>-    GLuint maxImageUnits,
>-    GLuint maxAtomicCounters,
>-    const std::string &componentsErrorMessage,
>-    const std::string &samplerErrorMessage,
>-    const std::string &imageErrorMessage,
>-    const std::string &atomicCounterErrorMessage,
>+    const Caps &caps,
>     std::vector<LinkedUniform> &samplerUniforms,
>     std::vector<LinkedUniform> &imageUniforms,
>     std::vector<LinkedUniform> &atomicCounterUniforms,
>+    std::vector<UnusedUniform> &unusedUniforms,
>     InfoLog &infoLog)
> {
>     ShaderUniformCount shaderUniformCount;
>-    for (const sh::Uniform &uniform : shader->getUniforms(context))
>+    for (const sh::Uniform &uniform : shader->getUniforms())
>     {
>-        shaderUniformCount += flattenUniform(uniform, &samplerUniforms, &imageUniforms,
>-                                             &atomicCounterUniforms, shader->getType());
>+        FlattenUniformVisitor flattener(shader->getType(), uniform, &mUniforms, &samplerUniforms,
>+                                        &imageUniforms, &atomicCounterUniforms, &unusedUniforms);
>+        sh::TraverseShaderVariable(uniform, false, &flattener);
>+
>+        if (uniform.active)
>+        {
>+            shaderUniformCount += flattener.getCounts();
>+        }
>+        else
>+        {
>+            unusedUniforms.emplace_back(uniform.name, IsSamplerType(uniform.type));
>+        }
>     }
> 
>-    if (shaderUniformCount.vectorCount > maxUniformComponents)
>+    ShaderType shaderType = shader->getType();
>+
>+    // TODO (jiawei.shao@intel.com): check whether we need finer-grained component counting
>+    GLuint maxUniformVectorsCount = GetMaximumShaderUniformVectors(shaderType, caps);
>+    if (shaderUniformCount.vectorCount > maxUniformVectorsCount)
>     {
>-        infoLog << componentsErrorMessage << maxUniformComponents << ").";
>+        GLuint maxUniforms = 0u;
>+
>+        // See comments in GetUniformResourceLimitName()
>+        if (shaderType == ShaderType::Vertex || shaderType == ShaderType::Fragment)
>+        {
>+            maxUniforms = maxUniformVectorsCount;
>+        }
>+        else
>+        {
>+            maxUniforms = maxUniformVectorsCount * 4;
>+        }
>+
>+        LogUniformsExceedLimit(shaderType, UniformType::Variable, maxUniforms, infoLog);
>         return false;
>     }
> 
>-    if (shaderUniformCount.samplerCount > maxTextureImageUnits)
>+    if (shaderUniformCount.samplerCount > caps.maxShaderTextureImageUnits[shaderType])
>     {
>-        infoLog << samplerErrorMessage << maxTextureImageUnits << ").";
>+        LogUniformsExceedLimit(shaderType, UniformType::Sampler,
>+                               caps.maxShaderTextureImageUnits[shaderType], infoLog);
>         return false;
>     }
> 
>-    if (shaderUniformCount.imageCount > maxImageUnits)
>+    if (shaderUniformCount.imageCount > caps.maxShaderImageUniforms[shaderType])
>     {
>-        infoLog << imageErrorMessage << maxImageUnits << ").";
>+        LogUniformsExceedLimit(shaderType, UniformType::Image,
>+                               caps.maxShaderImageUniforms[shaderType], infoLog);
>         return false;
>     }
> 
>-    if (shaderUniformCount.atomicCounterCount > maxAtomicCounters)
>+    if (shaderUniformCount.atomicCounterCount > caps.maxShaderAtomicCounters[shaderType])
>     {
>-        infoLog << atomicCounterErrorMessage << maxAtomicCounters << ").";
>+        LogUniformsExceedLimit(shaderType, UniformType::AtomicCounter,
>+                               caps.maxShaderAtomicCounters[shaderType], infoLog);
>         return false;
>     }
> 
>     return true;
> }
> 
>-bool UniformLinker::flattenUniformsAndCheckCaps(const Context *context, InfoLog &infoLog)
>+bool UniformLinker::flattenUniformsAndCheckCaps(const Caps &caps, InfoLog &infoLog)
> {
>     std::vector<LinkedUniform> samplerUniforms;
>     std::vector<LinkedUniform> imageUniforms;
>     std::vector<LinkedUniform> atomicCounterUniforms;
>+    std::vector<UnusedUniform> unusedUniforms;
> 
>-    const Caps &caps = context->getCaps();
>-
>-    if (mState.getAttachedComputeShader())
>+    for (ShaderType shaderType : AllShaderTypes())
>     {
>-        Shader *computeShader = mState.getAttachedComputeShader();
>-
>-        // TODO (mradev): check whether we need finer-grained component counting
>-        if (!flattenUniformsAndCheckCapsForShader(
>-                context, computeShader, caps.maxComputeUniformComponents / 4,
>-                caps.maxComputeTextureImageUnits, caps.maxComputeImageUniforms,
>-                caps.maxComputeAtomicCounters,
>-                "Compute shader active uniforms exceed MAX_COMPUTE_UNIFORM_COMPONENTS (",
>-                "Compute shader sampler count exceeds MAX_COMPUTE_TEXTURE_IMAGE_UNITS (",
>-                "Compute shader image count exceeds MAX_COMPUTE_IMAGE_UNIFORMS (",
>-                "Compute shader atomic counter count exceeds MAX_COMPUTE_ATOMIC_COUNTERS (",
>-                samplerUniforms, imageUniforms, atomicCounterUniforms, infoLog))
>+        Shader *shader = mState.getAttachedShader(shaderType);
>+        if (!shader)
>         {
>-            return false;
>-        }
>-    }
>-    else
>-    {
>-        Shader *vertexShader = mState.getAttachedVertexShader();
>-
>-        if (!flattenUniformsAndCheckCapsForShader(
>-                context, vertexShader, caps.maxVertexUniformVectors,
>-                caps.maxVertexTextureImageUnits, caps.maxVertexImageUniforms,
>-                caps.maxVertexAtomicCounters,
>-                "Vertex shader active uniforms exceed MAX_VERTEX_UNIFORM_VECTORS (",
>-                "Vertex shader sampler count exceeds MAX_VERTEX_TEXTURE_IMAGE_UNITS (",
>-                "Vertex shader image count exceeds MAX_VERTEX_IMAGE_UNIFORMS (",
>-                "Vertex shader atomic counter count exceeds MAX_VERTEX_ATOMIC_COUNTERS (",
>-                samplerUniforms, imageUniforms, atomicCounterUniforms, infoLog))
>-        {
>-            return false;
>+            continue;
>         }
> 
>-        Shader *fragmentShader = mState.getAttachedFragmentShader();
>-
>-        if (!flattenUniformsAndCheckCapsForShader(
>-                context, fragmentShader, caps.maxFragmentUniformVectors, caps.maxTextureImageUnits,
>-                caps.maxFragmentImageUniforms, caps.maxFragmentAtomicCounters,
>-                "Fragment shader active uniforms exceed MAX_FRAGMENT_UNIFORM_VECTORS (",
>-                "Fragment shader sampler count exceeds MAX_TEXTURE_IMAGE_UNITS (",
>-                "Fragment shader image count exceeds MAX_FRAGMENT_IMAGE_UNIFORMS (",
>-                "Fragment shader atomic counter count exceeds MAX_FRAGMENT_ATOMIC_COUNTERS (",
>-                samplerUniforms, imageUniforms, atomicCounterUniforms, infoLog))
>+        if (!flattenUniformsAndCheckCapsForShader(shader, caps, samplerUniforms, imageUniforms,
>+                                                  atomicCounterUniforms, unusedUniforms, infoLog))
>         {
>             return false;
>         }
>@@ -461,258 +910,16 @@ bool UniformLinker::flattenUniformsAndCheckCaps(const Context *context, InfoLog
>     mUniforms.insert(mUniforms.end(), samplerUniforms.begin(), samplerUniforms.end());
>     mUniforms.insert(mUniforms.end(), imageUniforms.begin(), imageUniforms.end());
>     mUniforms.insert(mUniforms.end(), atomicCounterUniforms.begin(), atomicCounterUniforms.end());
>+    mUnusedUniforms.insert(mUnusedUniforms.end(), unusedUniforms.begin(), unusedUniforms.end());
>     return true;
> }
> 
>-UniformLinker::ShaderUniformCount UniformLinker::flattenUniform(
>-    const sh::Uniform &uniform,
>-    std::vector<LinkedUniform> *samplerUniforms,
>-    std::vector<LinkedUniform> *imageUniforms,
>-    std::vector<LinkedUniform> *atomicCounterUniforms,
>-    GLenum shaderType)
>-{
>-    int location = uniform.location;
>-    ShaderUniformCount shaderUniformCount =
>-        flattenUniformImpl(uniform, uniform.name, uniform.mappedName, samplerUniforms,
>-                           imageUniforms, atomicCounterUniforms, shaderType, uniform.staticUse,
>-                           uniform.binding, uniform.offset, &location);
>-    if (uniform.staticUse)
>-    {
>-        return shaderUniformCount;
>-    }
>-    return ShaderUniformCount();
>-}
>-
>-UniformLinker::ShaderUniformCount UniformLinker::flattenArrayOfStructsUniform(
>-    const sh::ShaderVariable &uniform,
>-    unsigned int arrayNestingIndex,
>-    const std::string &namePrefix,
>-    const std::string &mappedNamePrefix,
>-    std::vector<LinkedUniform> *samplerUniforms,
>-    std::vector<LinkedUniform> *imageUniforms,
>-    std::vector<LinkedUniform> *atomicCounterUniforms,
>-    GLenum shaderType,
>-    bool markStaticUse,
>-    int binding,
>-    int offset,
>-    int *location)
>-{
>-    // Nested arrays are processed starting from outermost (arrayNestingIndex 0u) and ending at the
>-    // innermost.
>-    ShaderUniformCount shaderUniformCount;
>-    const unsigned int currentArraySize = uniform.getNestedArraySize(arrayNestingIndex);
>-    for (unsigned int arrayElement = 0u; arrayElement < currentArraySize; ++arrayElement)
>-    {
>-        const std::string elementName       = namePrefix + ArrayString(arrayElement);
>-        const std::string elementMappedName = mappedNamePrefix + ArrayString(arrayElement);
>-        if (arrayNestingIndex + 1u < uniform.arraySizes.size())
>-        {
>-            shaderUniformCount += flattenArrayOfStructsUniform(
>-                uniform, arrayNestingIndex + 1u, elementName, elementMappedName, samplerUniforms,
>-                imageUniforms, atomicCounterUniforms, shaderType, markStaticUse, binding, offset,
>-                location);
>-        }
>-        else
>-        {
>-            shaderUniformCount += flattenStructUniform(
>-                uniform.fields, elementName, elementMappedName, samplerUniforms, imageUniforms,
>-                atomicCounterUniforms, shaderType, markStaticUse, binding, offset, location);
>-        }
>-    }
>-    return shaderUniformCount;
>-}
>-
>-UniformLinker::ShaderUniformCount UniformLinker::flattenStructUniform(
>-    const std::vector<sh::ShaderVariable> &fields,
>-    const std::string &namePrefix,
>-    const std::string &mappedNamePrefix,
>-    std::vector<LinkedUniform> *samplerUniforms,
>-    std::vector<LinkedUniform> *imageUniforms,
>-    std::vector<LinkedUniform> *atomicCounterUniforms,
>-    GLenum shaderType,
>-    bool markStaticUse,
>-    int binding,
>-    int offset,
>-    int *location)
>-{
>-    ShaderUniformCount shaderUniformCount;
>-    for (const sh::ShaderVariable &field : fields)
>-    {
>-        const std::string &fieldName       = namePrefix + "." + field.name;
>-        const std::string &fieldMappedName = mappedNamePrefix + "." + field.mappedName;
>-
>-        shaderUniformCount +=
>-            flattenUniformImpl(field, fieldName, fieldMappedName, samplerUniforms, imageUniforms,
>-                               atomicCounterUniforms, shaderType, markStaticUse, -1, -1, location);
>-    }
>-    return shaderUniformCount;
>-}
>-
>-UniformLinker::ShaderUniformCount UniformLinker::flattenArrayUniform(
>-    const sh::ShaderVariable &uniform,
>-    const std::string &namePrefix,
>-    const std::string &mappedNamePrefix,
>-    std::vector<LinkedUniform> *samplerUniforms,
>-    std::vector<LinkedUniform> *imageUniforms,
>-    std::vector<LinkedUniform> *atomicCounterUniforms,
>-    GLenum shaderType,
>-    bool markStaticUse,
>-    int binding,
>-    int offset,
>-    int *location)
>-{
>-    ShaderUniformCount shaderUniformCount;
>-
>-    ASSERT(uniform.isArray());
>-    for (unsigned int arrayElement = 0u; arrayElement < uniform.getOutermostArraySize();
>-         ++arrayElement)
>-    {
>-        sh::ShaderVariable uniformElement = uniform;
>-        uniformElement.indexIntoArray(arrayElement);
>-        const std::string elementName       = namePrefix + ArrayString(arrayElement);
>-        const std::string elementMappedName = mappedNamePrefix + ArrayString(arrayElement);
>-
>-        shaderUniformCount += flattenUniformImpl(
>-            uniformElement, elementName, elementMappedName, samplerUniforms, imageUniforms,
>-            atomicCounterUniforms, shaderType, markStaticUse, binding, offset, location);
>-    }
>-    return shaderUniformCount;
>-}
>-
>-UniformLinker::ShaderUniformCount UniformLinker::flattenUniformImpl(
>-    const sh::ShaderVariable &uniform,
>-    const std::string &fullName,
>-    const std::string &fullMappedName,
>-    std::vector<LinkedUniform> *samplerUniforms,
>-    std::vector<LinkedUniform> *imageUniforms,
>-    std::vector<LinkedUniform> *atomicCounterUniforms,
>-    GLenum shaderType,
>-    bool markStaticUse,
>-    int binding,
>-    int offset,
>-    int *location)
>-{
>-    ASSERT(location);
>-    ShaderUniformCount shaderUniformCount;
>-
>-    if (uniform.isStruct())
>-    {
>-        if (uniform.isArray())
>-        {
>-            shaderUniformCount += flattenArrayOfStructsUniform(
>-                uniform, 0u, fullName, fullMappedName, samplerUniforms, imageUniforms,
>-                atomicCounterUniforms, shaderType, markStaticUse, binding, offset, location);
>-        }
>-        else
>-        {
>-            shaderUniformCount += flattenStructUniform(
>-                uniform.fields, fullName, fullMappedName, samplerUniforms, imageUniforms,
>-                atomicCounterUniforms, shaderType, markStaticUse, binding, offset, location);
>-        }
>-        return shaderUniformCount;
>-    }
>-    if (uniform.isArrayOfArrays())
>-    {
>-        // GLES 3.1 November 2016 section 7.3.1 page 77:
>-        // "For an active variable declared as an array of an aggregate data type (structures or
>-        // arrays), a separate entry will be generated for each active array element"
>-        return flattenArrayUniform(uniform, fullName, fullMappedName, samplerUniforms,
>-                                   imageUniforms, atomicCounterUniforms, shaderType, markStaticUse,
>-                                   binding, offset, location);
>-    }
>-
>-    // Not a struct
>-    bool isSampler                              = IsSamplerType(uniform.type);
>-    bool isImage                                = IsImageType(uniform.type);
>-    bool isAtomicCounter                        = IsAtomicCounterType(uniform.type);
>-    std::vector<gl::LinkedUniform> *uniformList = &mUniforms;
>-    if (isSampler)
>-    {
>-        uniformList = samplerUniforms;
>-    }
>-    else if (isImage)
>-    {
>-        uniformList = imageUniforms;
>-    }
>-    else if (isAtomicCounter)
>-    {
>-        uniformList = atomicCounterUniforms;
>-    }
>-
>-    std::string fullNameWithArrayIndex(fullName);
>-    std::string fullMappedNameWithArrayIndex(fullMappedName);
>-
>-    if (uniform.isArray())
>-    {
>-        // We're following the GLES 3.1 November 2016 spec section 7.3.1.1 Naming Active Resources
>-        // and including [0] at the end of array variable names.
>-        fullNameWithArrayIndex += "[0]";
>-        fullMappedNameWithArrayIndex += "[0]";
>-    }
>-
>-    LinkedUniform *existingUniform = FindUniform(*uniformList, fullNameWithArrayIndex);
>-    if (existingUniform)
>-    {
>-        if (binding != -1)
>-        {
>-            existingUniform->binding = binding;
>-        }
>-        if (offset != -1)
>-        {
>-            existingUniform->offset = offset;
>-        }
>-        if (*location != -1)
>-        {
>-            existingUniform->location = *location;
>-        }
>-        if (markStaticUse)
>-        {
>-            existingUniform->staticUse = true;
>-            existingUniform->setStaticUse(shaderType, true);
>-        }
>-    }
>-    else
>-    {
>-        ASSERT(uniform.arraySizes.size() <= 1u);
>-        LinkedUniform linkedUniform(uniform.type, uniform.precision, fullNameWithArrayIndex,
>-                                    uniform.arraySizes, binding, offset, *location, -1,
>-                                    sh::BlockMemberInfo::getDefaultBlockInfo());
>-        linkedUniform.mappedName                    = fullMappedNameWithArrayIndex;
>-        linkedUniform.staticUse                     = markStaticUse;
>-        linkedUniform.flattenedOffsetInParentArrays = uniform.flattenedOffsetInParentArrays;
>-        if (markStaticUse)
>-        {
>-            linkedUniform.setStaticUse(shaderType, true);
>-        }
>-
>-        uniformList->push_back(linkedUniform);
>-    }
>-
>-    // Struct and array of arrays uniforms get flattened so we can use getBasicTypeElementCount().
>-    unsigned int elementCount = uniform.getBasicTypeElementCount();
>-
>-    // Samplers and images aren't "real" uniforms, so they don't count towards register usage.
>-    // Likewise, don't count "real" uniforms towards opaque count.
>-    shaderUniformCount.vectorCount =
>-        (IsOpaqueType(uniform.type) ? 0 : (VariableRegisterCount(uniform.type) * elementCount));
>-    shaderUniformCount.samplerCount       = (isSampler ? elementCount : 0);
>-    shaderUniformCount.imageCount         = (isImage ? elementCount : 0);
>-    shaderUniformCount.atomicCounterCount = (isAtomicCounter ? elementCount : 0);
>-
>-    if (*location != -1)
>-    {
>-        *location += elementCount;
>-    }
>-
>-    return shaderUniformCount;
>-}
>-
> bool UniformLinker::checkMaxCombinedAtomicCounters(const Caps &caps, InfoLog &infoLog)
> {
>     unsigned int atomicCounterCount = 0;
>     for (const auto &uniform : mUniforms)
>     {
>-        if (IsAtomicCounterType(uniform.type) && uniform.staticUse)
>+        if (IsAtomicCounterType(uniform.type) && uniform.active)
>         {
>             atomicCounterCount += uniform.getBasicTypeElementCount();
>             if (atomicCounterCount > caps.maxCombinedAtomicCounters)
>@@ -728,196 +935,67 @@ bool UniformLinker::checkMaxCombinedAtomicCounters(const Caps &caps, InfoLog &in
> 
> // InterfaceBlockLinker implementation.
> InterfaceBlockLinker::InterfaceBlockLinker(std::vector<InterfaceBlock> *blocksOut)
>-    : mBlocksOut(blocksOut)
>-{
>-}
>+    : mShaderBlocks({}), mBlocksOut(blocksOut)
>+{}
> 
>-InterfaceBlockLinker::~InterfaceBlockLinker()
>-{
>-}
>+InterfaceBlockLinker::~InterfaceBlockLinker() {}
> 
>-void InterfaceBlockLinker::addShaderBlocks(GLenum shader,
>+void InterfaceBlockLinker::addShaderBlocks(ShaderType shaderType,
>                                            const std::vector<sh::InterfaceBlock> *blocks)
> {
>-    mShaderBlocks.push_back(std::make_pair(shader, blocks));
>+    mShaderBlocks[shaderType] = blocks;
> }
> 
>-void InterfaceBlockLinker::linkBlocks(const GetBlockSize &getBlockSize,
>-                                      const GetBlockMemberInfo &getMemberInfo) const
>+void InterfaceBlockLinker::linkBlocks(const GetBlockSizeFunc &getBlockSize,
>+                                      const GetBlockMemberInfoFunc &getMemberInfo) const
> {
>     ASSERT(mBlocksOut->empty());
> 
>     std::set<std::string> visitedList;
> 
>-    for (const auto &shaderBlocks : mShaderBlocks)
>+    for (ShaderType shaderType : AllShaderTypes())
>     {
>-        const GLenum shaderType = shaderBlocks.first;
>+        if (!mShaderBlocks[shaderType])
>+        {
>+            continue;
>+        }
> 
>-        for (const auto &block : *shaderBlocks.second)
>+        for (const sh::InterfaceBlock &block : *mShaderBlocks[shaderType])
>         {
>-            // Only 'packed' blocks are allowed to be considered inactive.
>-            if (!block.staticUse && block.layout == sh::BLOCKLAYOUT_PACKED)
>+            if (!IsActiveInterfaceBlock(block))
>                 continue;
> 
>-            if (visitedList.count(block.name) > 0)
>-            {
>-                if (block.staticUse)
>-                {
>-                    for (InterfaceBlock &priorBlock : *mBlocksOut)
>-                    {
>-                        if (block.name == priorBlock.name)
>-                        {
>-                            priorBlock.setStaticUse(shaderType, true);
>-                            // TODO(jiajia.qin@intel.com): update the block members static use.
>-                        }
>-                    }
>-                }
>-            }
>-            else
>+            if (visitedList.count(block.name) == 0)
>             {
>                 defineInterfaceBlock(getBlockSize, getMemberInfo, block, shaderType);
>                 visitedList.insert(block.name);
>+                continue;
>             }
>-        }
>-    }
>-}
> 
>-template <typename VarT>
>-void InterfaceBlockLinker::defineArrayOfStructsBlockMembers(const GetBlockMemberInfo &getMemberInfo,
>-                                                            const VarT &field,
>-                                                            unsigned int arrayNestingIndex,
>-                                                            const std::string &prefix,
>-                                                            const std::string &mappedPrefix,
>-                                                            int blockIndex,
>-                                                            bool singleEntryForTopLevelArray,
>-                                                            int topLevelArraySize) const
>-{
>-    // Nested arrays are processed starting from outermost (arrayNestingIndex 0u) and ending at the
>-    // innermost.
>-    unsigned int entryGenerationArraySize = field.getNestedArraySize(arrayNestingIndex);
>-    if (singleEntryForTopLevelArray)
>-    {
>-        entryGenerationArraySize = 1;
>-    }
>-    for (unsigned int arrayElement = 0u; arrayElement < entryGenerationArraySize; ++arrayElement)
>-    {
>-        const std::string elementName       = prefix + ArrayString(arrayElement);
>-        const std::string elementMappedName = mappedPrefix + ArrayString(arrayElement);
>-        if (arrayNestingIndex + 1u < field.arraySizes.size())
>-        {
>-            defineArrayOfStructsBlockMembers(getMemberInfo, field, arrayNestingIndex + 1u,
>-                                             elementName, elementMappedName, blockIndex, false,
>-                                             topLevelArraySize);
>-        }
>-        else
>-        {
>-            defineBlockMembers(getMemberInfo, field.fields, elementName, elementMappedName,
>-                               blockIndex, false, topLevelArraySize);
>-        }
>-    }
>-}
>-
>-template <typename VarT>
>-void InterfaceBlockLinker::defineBlockMembers(const GetBlockMemberInfo &getMemberInfo,
>-                                              const std::vector<VarT> &fields,
>-                                              const std::string &prefix,
>-                                              const std::string &mappedPrefix,
>-                                              int blockIndex,
>-                                              bool singleEntryForTopLevelArray,
>-                                              int topLevelArraySize) const
>-{
>-    for (const VarT &field : fields)
>-    {
>-        std::string fullName = (prefix.empty() ? field.name : prefix + "." + field.name);
>-        std::string fullMappedName =
>-            (mappedPrefix.empty() ? field.mappedName : mappedPrefix + "." + field.mappedName);
>-
>-        defineBlockMember(getMemberInfo, field, fullName, fullMappedName, blockIndex,
>-                          singleEntryForTopLevelArray, topLevelArraySize);
>-    }
>-}
>+            if (!block.active)
>+                continue;
> 
>-template <typename VarT>
>-void InterfaceBlockLinker::defineBlockMember(const GetBlockMemberInfo &getMemberInfo,
>-                                             const VarT &field,
>-                                             const std::string &fullName,
>-                                             const std::string &fullMappedName,
>-                                             int blockIndex,
>-                                             bool singleEntryForTopLevelArray,
>-                                             int topLevelArraySize) const
>-{
>-    int nextArraySize = topLevelArraySize;
>-    if (((field.isArray() && field.isStruct()) || field.isArrayOfArrays()) &&
>-        singleEntryForTopLevelArray)
>-    {
>-        // In OpenGL ES 3.10 spec, session 7.3.1.1 'For an active shader storage block
>-        // member declared as an array of an aggregate type, an entry will be generated only
>-        // for the first array element, regardless of its type.'
>-        nextArraySize = field.getOutermostArraySize();
>-    }
>+            for (InterfaceBlock &priorBlock : *mBlocksOut)
>+            {
>+                if (block.name == priorBlock.name)
>+                {
>+                    priorBlock.setActive(shaderType, true);
> 
>-    if (field.isStruct())
>-    {
>-        if (field.isArray())
>-        {
>-            defineArrayOfStructsBlockMembers(getMemberInfo, field, 0u, fullName, fullMappedName,
>-                                             blockIndex, singleEntryForTopLevelArray,
>-                                             nextArraySize);
>-        }
>-        else
>-        {
>-            ASSERT(nextArraySize == topLevelArraySize);
>-            defineBlockMembers(getMemberInfo, field.fields, fullName, fullMappedName, blockIndex,
>-                               false, nextArraySize);
>-        }
>-        return;
>-    }
>-    if (field.isArrayOfArrays())
>-    {
>-        unsigned int entryGenerationArraySize = field.getOutermostArraySize();
>-        if (singleEntryForTopLevelArray)
>-        {
>-            entryGenerationArraySize = 1u;
>-        }
>-        for (unsigned int arrayElement = 0u; arrayElement < entryGenerationArraySize;
>-             ++arrayElement)
>-        {
>-            VarT fieldElement = field;
>-            fieldElement.indexIntoArray(arrayElement);
>-            const std::string elementName       = fullName + ArrayString(arrayElement);
>-            const std::string elementMappedName = fullMappedName + ArrayString(arrayElement);
>+                    std::unique_ptr<sh::ShaderVariableVisitor> visitor(
>+                        getVisitor(getMemberInfo, block.fieldPrefix(), block.fieldMappedPrefix(),
>+                                   shaderType, -1));
> 
>-            defineBlockMember(getMemberInfo, fieldElement, elementName, elementMappedName,
>-                              blockIndex, false, nextArraySize);
>+                    sh::TraverseShaderVariables(block.fields, false, visitor.get());
>+                }
>+            }
>         }
>-        return;
>-    }
>-
>-    // If getBlockMemberInfo returns false, the variable is optimized out.
>-    sh::BlockMemberInfo memberInfo;
>-    if (!getMemberInfo(fullName, fullMappedName, &memberInfo))
>-    {
>-        return;
>     }
>-
>-    std::string fullNameWithArrayIndex       = fullName;
>-    std::string fullMappedNameWithArrayIndex = fullMappedName;
>-
>-    if (field.isArray())
>-    {
>-        fullNameWithArrayIndex += "[0]";
>-        fullMappedNameWithArrayIndex += "[0]";
>-    }
>-
>-    ASSERT(nextArraySize == topLevelArraySize);
>-    defineBlockMemberImpl(field, fullNameWithArrayIndex, fullMappedNameWithArrayIndex, blockIndex,
>-                          memberInfo, nextArraySize);
> }
> 
>-void InterfaceBlockLinker::defineInterfaceBlock(const GetBlockSize &getBlockSize,
>-                                                const GetBlockMemberInfo &getMemberInfo,
>+void InterfaceBlockLinker::defineInterfaceBlock(const GetBlockSizeFunc &getBlockSize,
>+                                                const GetBlockMemberInfoFunc &getMemberInfo,
>                                                 const sh::InterfaceBlock &interfaceBlock,
>-                                                GLenum shaderType) const
>+                                                ShaderType shaderType) const
> {
>     size_t blockSize = 0;
>     std::vector<unsigned int> blockIndexes;
>@@ -926,9 +1004,12 @@ void InterfaceBlockLinker::defineInterfaceBlock(const GetBlockSize &getBlockSize
>     // Track the first and last block member index to determine the range of active block members in
>     // the block.
>     size_t firstBlockMemberIndex = getCurrentBlockMemberIndex();
>-    defineBlockMembers(getMemberInfo, interfaceBlock.fields, interfaceBlock.fieldPrefix(),
>-                       interfaceBlock.fieldMappedPrefix(), blockIndex,
>-                       interfaceBlock.blockType == sh::BlockType::BLOCK_BUFFER, 1);
>+
>+    std::unique_ptr<sh::ShaderVariableVisitor> visitor(
>+        getVisitor(getMemberInfo, interfaceBlock.fieldPrefix(), interfaceBlock.fieldMappedPrefix(),
>+                   shaderType, blockIndex));
>+    sh::TraverseShaderVariables(interfaceBlock.fields, false, visitor.get());
>+
>     size_t lastBlockMemberIndex = getCurrentBlockMemberIndex();
> 
>     for (size_t blockMemberIndex = firstBlockMemberIndex; blockMemberIndex < lastBlockMemberIndex;
>@@ -937,10 +1018,6 @@ void InterfaceBlockLinker::defineInterfaceBlock(const GetBlockSize &getBlockSize
>         blockIndexes.push_back(static_cast<unsigned int>(blockMemberIndex));
>     }
> 
>-    // ESSL 3.10 section 4.4.4 page 58:
>-    // Any uniform or shader storage block declared without a binding qualifier is initially
>-    // assigned to block binding point zero.
>-    int blockBinding = (interfaceBlock.binding == -1 ? 0 : interfaceBlock.binding);
>     for (unsigned int arrayElement = 0; arrayElement < interfaceBlock.elementCount();
>          ++arrayElement)
>     {
>@@ -958,10 +1035,15 @@ void InterfaceBlockLinker::defineInterfaceBlock(const GetBlockSize &getBlockSize
>             continue;
>         }
> 
>+        // ESSL 3.10 section 4.4.4 page 58:
>+        // Any uniform or shader storage block declared without a binding qualifier is initially
>+        // assigned to block binding point zero.
>+        int blockBinding =
>+            (interfaceBlock.binding == -1 ? 0 : interfaceBlock.binding + arrayElement);
>         InterfaceBlock block(interfaceBlock.name, interfaceBlock.mappedName,
>-                             interfaceBlock.isArray(), arrayElement, blockBinding + arrayElement);
>+                             interfaceBlock.isArray(), arrayElement, blockBinding);
>         block.memberIndexes = blockIndexes;
>-        block.setStaticUse(shaderType, interfaceBlock.staticUse);
>+        block.setActive(shaderType, interfaceBlock.active);
> 
>         // Since all block elements in an array share the same active interface blocks, they
>         // will all be active once any block member is used. So, since interfaceBlock.name[0]
>@@ -975,66 +1057,82 @@ void InterfaceBlockLinker::defineInterfaceBlock(const GetBlockSize &getBlockSize
> UniformBlockLinker::UniformBlockLinker(std::vector<InterfaceBlock> *blocksOut,
>                                        std::vector<LinkedUniform> *uniformsOut)
>     : InterfaceBlockLinker(blocksOut), mUniformsOut(uniformsOut)
>-{
>-}
>+{}
> 
>-UniformBlockLinker::~UniformBlockLinker()
>-{
>-}
>+UniformBlockLinker::~UniformBlockLinker() {}
> 
>-void UniformBlockLinker::defineBlockMemberImpl(const sh::ShaderVariable &field,
>-                                               const std::string &fullName,
>-                                               const std::string &fullMappedName,
>-                                               int blockIndex,
>-                                               const sh::BlockMemberInfo &memberInfo,
>-                                               int /*topLevelArraySize*/) const
>+size_t UniformBlockLinker::getCurrentBlockMemberIndex() const
> {
>-    LinkedUniform newUniform(field.type, field.precision, fullName, field.arraySizes, -1, -1, -1,
>-                             blockIndex, memberInfo);
>-    newUniform.mappedName = fullMappedName;
>-    // TODO(jiajia.qin@intel.com): update the block memeber static use.
>-
>-    // Since block uniforms have no location, we don't need to store them in the uniform locations
>-    // list.
>-    mUniformsOut->push_back(newUniform);
>+    return mUniformsOut->size();
> }
> 
>-size_t UniformBlockLinker::getCurrentBlockMemberIndex() const
>+sh::ShaderVariableVisitor *UniformBlockLinker::getVisitor(
>+    const GetBlockMemberInfoFunc &getMemberInfo,
>+    const std::string &namePrefix,
>+    const std::string &mappedNamePrefix,
>+    ShaderType shaderType,
>+    int blockIndex) const
> {
>-    return mUniformsOut->size();
>+    return new UniformBlockEncodingVisitor(getMemberInfo, namePrefix, mappedNamePrefix,
>+                                           mUniformsOut, shaderType, blockIndex);
> }
> 
> // ShaderStorageBlockLinker implementation.
> ShaderStorageBlockLinker::ShaderStorageBlockLinker(std::vector<InterfaceBlock> *blocksOut,
>                                                    std::vector<BufferVariable> *bufferVariablesOut)
>     : InterfaceBlockLinker(blocksOut), mBufferVariablesOut(bufferVariablesOut)
>-{
>-}
>+{}
> 
>-ShaderStorageBlockLinker::~ShaderStorageBlockLinker()
>+ShaderStorageBlockLinker::~ShaderStorageBlockLinker() {}
>+
>+size_t ShaderStorageBlockLinker::getCurrentBlockMemberIndex() const
> {
>+    return mBufferVariablesOut->size();
> }
> 
>-void ShaderStorageBlockLinker::defineBlockMemberImpl(const sh::ShaderVariable &field,
>-                                                     const std::string &fullName,
>-                                                     const std::string &fullMappedName,
>-                                                     int blockIndex,
>-                                                     const sh::BlockMemberInfo &memberInfo,
>-                                                     int topLevelArraySize) const
>+sh::ShaderVariableVisitor *ShaderStorageBlockLinker::getVisitor(
>+    const GetBlockMemberInfoFunc &getMemberInfo,
>+    const std::string &namePrefix,
>+    const std::string &mappedNamePrefix,
>+    ShaderType shaderType,
>+    int blockIndex) const
> {
>-    BufferVariable newBufferVariable(field.type, field.precision, fullName, field.arraySizes,
>-                                     blockIndex, memberInfo);
>-    newBufferVariable.mappedName = fullMappedName;
>-    // TODO(jiajia.qin@intel.com): update the block memeber static use.
>+    return new ShaderStorageBlockVisitor(getMemberInfo, namePrefix, mappedNamePrefix,
>+                                         mBufferVariablesOut, shaderType, blockIndex);
>+}
> 
>-    newBufferVariable.topLevelArraySize = topLevelArraySize;
>+// AtomicCounterBufferLinker implementation.
>+AtomicCounterBufferLinker::AtomicCounterBufferLinker(
>+    std::vector<AtomicCounterBuffer> *atomicCounterBuffersOut)
>+    : mAtomicCounterBuffersOut(atomicCounterBuffersOut)
>+{}
> 
>-    mBufferVariablesOut->push_back(newBufferVariable);
>-}
>+AtomicCounterBufferLinker::~AtomicCounterBufferLinker() {}
> 
>-size_t ShaderStorageBlockLinker::getCurrentBlockMemberIndex() const
>+void AtomicCounterBufferLinker::link(const std::map<int, unsigned int> &sizeMap) const
> {
>-    return mBufferVariablesOut->size();
>+    for (auto &atomicCounterBuffer : *mAtomicCounterBuffersOut)
>+    {
>+        auto bufferSize = sizeMap.find(atomicCounterBuffer.binding);
>+        ASSERT(bufferSize != sizeMap.end());
>+        atomicCounterBuffer.dataSize = bufferSize->second;
>+    }
> }
> 
>+ProgramLinkedResources::ProgramLinkedResources(
>+    GLuint maxVaryingVectors,
>+    PackMode packMode,
>+    std::vector<InterfaceBlock> *uniformBlocksOut,
>+    std::vector<LinkedUniform> *uniformsOut,
>+    std::vector<InterfaceBlock> *shaderStorageBlocksOut,
>+    std::vector<BufferVariable> *bufferVariablesOut,
>+    std::vector<AtomicCounterBuffer> *atomicCounterBuffersOut)
>+    : varyingPacking(maxVaryingVectors, packMode),
>+      uniformBlockLinker(uniformBlocksOut, uniformsOut),
>+      shaderStorageBlockLinker(shaderStorageBlocksOut, bufferVariablesOut),
>+      atomicCounterBufferLinker(atomicCounterBuffersOut)
>+{}
>+
>+ProgramLinkedResources::~ProgramLinkedResources() = default;
>+
> }  // namespace gl
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/ProgramLinkedResources.h b/Source/ThirdParty/ANGLE/src/libANGLE/ProgramLinkedResources.h
>index 1bf91b7f3b7..a4588f9b1cc 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/ProgramLinkedResources.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/ProgramLinkedResources.h
>@@ -4,155 +4,92 @@
> // found in the LICENSE file.
> //
> 
>-// UniformLinker.h: implements link-time checks for default block uniforms, and generates uniform
>-// locations. Populates data structures related to uniforms so that they can be stored in program
>-// state.
>+// ProgramLinkedResources.h: implements link-time checks for default block uniforms, and generates
>+// uniform locations. Populates data structures related to uniforms so that they can be stored in
>+// program state.
> 
> #ifndef LIBANGLE_UNIFORMLINKER_H_
> #define LIBANGLE_UNIFORMLINKER_H_
> 
>-#include "libANGLE/Program.h"
>-#include "libANGLE/Uniform.h"
>+#include "angle_gl.h"
>+#include "common/PackedEnums.h"
>+#include "common/angleutils.h"
> #include "libANGLE/VaryingPacking.h"
> 
> #include <functional>
> 
>-namespace gl
>+namespace sh
> {
>+struct BlockMemberInfo;
>+struct InterfaceBlock;
>+struct ShaderVariable;
>+class BlockEncoderVisitor;
>+class ShaderVariableVisitor;
>+struct Uniform;
>+}  // namespace sh
> 
>-class UniformLinker
>+namespace gl
>+{
>+struct BufferVariable;
>+struct Caps;
>+class Context;
>+class InfoLog;
>+struct InterfaceBlock;
>+enum class LinkMismatchError;
>+struct LinkedUniform;
>+class ProgramState;
>+class ProgramBindings;
>+class Shader;
>+struct ShaderVariableBuffer;
>+struct UnusedUniform;
>+struct VariableLocation;
>+
>+using AtomicCounterBuffer = ShaderVariableBuffer;
>+
>+class UniformLinker final : angle::NonCopyable
> {
>   public:
>     UniformLinker(const ProgramState &state);
>     ~UniformLinker();
> 
>-    bool link(const Context *context,
>-              InfoLog &infoLog,
>-              const Program::Bindings &uniformLocationBindings);
>+    bool link(const Caps &caps, InfoLog &infoLog, const ProgramBindings &uniformLocationBindings);
> 
>     void getResults(std::vector<LinkedUniform> *uniforms,
>+                    std::vector<UnusedUniform> *unusedUniforms,
>                     std::vector<VariableLocation> *uniformLocations);
> 
>   private:
>-    struct ShaderUniformCount
>-    {
>-        ShaderUniformCount() : vectorCount(0), samplerCount(0), imageCount(0), atomicCounterCount(0)
>-        {
>-        }
>-        ShaderUniformCount(const ShaderUniformCount &other) = default;
>-        ShaderUniformCount &operator=(const ShaderUniformCount &other) = default;
>-
>-        ShaderUniformCount &operator+=(const ShaderUniformCount &other)
>-        {
>-            vectorCount += other.vectorCount;
>-            samplerCount += other.samplerCount;
>-            imageCount += other.imageCount;
>-            atomicCounterCount += other.atomicCounterCount;
>-            return *this;
>-        }
>-
>-        unsigned int vectorCount;
>-        unsigned int samplerCount;
>-        unsigned int imageCount;
>-        unsigned int atomicCounterCount;
>-    };
>-
>-    bool validateVertexAndFragmentUniforms(const Context *context, InfoLog &infoLog) const;
>-
>-    static bool linkValidateUniforms(InfoLog &infoLog,
>-                                     const std::string &uniformName,
>-                                     const sh::Uniform &vertexUniform,
>-                                     const sh::Uniform &fragmentUniform);
>-
>-    bool flattenUniformsAndCheckCapsForShader(const Context *context,
>-                                              Shader *shader,
>-                                              GLuint maxUniformComponents,
>-                                              GLuint maxTextureImageUnits,
>-                                              GLuint maxImageUnits,
>-                                              GLuint maxAtomicCounters,
>-                                              const std::string &componentsErrorMessage,
>-                                              const std::string &samplerErrorMessage,
>-                                              const std::string &imageErrorMessage,
>-                                              const std::string &atomicCounterErrorMessage,
>+    bool validateGraphicsUniforms(InfoLog &infoLog) const;
>+
>+    bool flattenUniformsAndCheckCapsForShader(Shader *shader,
>+                                              const Caps &caps,
>                                               std::vector<LinkedUniform> &samplerUniforms,
>                                               std::vector<LinkedUniform> &imageUniforms,
>                                               std::vector<LinkedUniform> &atomicCounterUniforms,
>+                                              std::vector<UnusedUniform> &unusedUniforms,
>                                               InfoLog &infoLog);
> 
>-    bool flattenUniformsAndCheckCaps(const Context *context, InfoLog &infoLog);
>+    bool flattenUniformsAndCheckCaps(const Caps &caps, InfoLog &infoLog);
>     bool checkMaxCombinedAtomicCounters(const Caps &caps, InfoLog &infoLog);
> 
>-    ShaderUniformCount flattenUniform(const sh::Uniform &uniform,
>-                                      std::vector<LinkedUniform> *samplerUniforms,
>-                                      std::vector<LinkedUniform> *imageUniforms,
>-                                      std::vector<LinkedUniform> *atomicCounterUniforms,
>-                                      GLenum shaderType);
>-
>-    ShaderUniformCount flattenArrayOfStructsUniform(
>-        const sh::ShaderVariable &uniform,
>-        unsigned int arrayNestingIndex,
>-        const std::string &namePrefix,
>-        const std::string &mappedNamePrefix,
>-        std::vector<LinkedUniform> *samplerUniforms,
>-        std::vector<LinkedUniform> *imageUniforms,
>-        std::vector<LinkedUniform> *atomicCounterUniforms,
>-        GLenum shaderType,
>-        bool markStaticUse,
>-        int binding,
>-        int offset,
>-        int *location);
>-
>-    ShaderUniformCount flattenStructUniform(const std::vector<sh::ShaderVariable> &fields,
>-                                            const std::string &namePrefix,
>-                                            const std::string &mappedNamePrefix,
>-                                            std::vector<LinkedUniform> *samplerUniforms,
>-                                            std::vector<LinkedUniform> *imageUniforms,
>-                                            std::vector<LinkedUniform> *atomicCounterUniforms,
>-                                            GLenum shaderType,
>-                                            bool markStaticUse,
>-                                            int binding,
>-                                            int offset,
>-                                            int *location);
>-
>-    ShaderUniformCount flattenArrayUniform(const sh::ShaderVariable &uniform,
>-                                           const std::string &fullName,
>-                                           const std::string &fullMappedName,
>-                                           std::vector<LinkedUniform> *samplerUniforms,
>-                                           std::vector<LinkedUniform> *imageUniforms,
>-                                           std::vector<LinkedUniform> *atomicCounterUniforms,
>-                                           GLenum shaderType,
>-                                           bool markStaticUse,
>-                                           int binding,
>-                                           int offset,
>-                                           int *location);
>-
>-    // markStaticUse is given as a separate parameter because it is tracked here at struct
>-    // granularity.
>-    ShaderUniformCount flattenUniformImpl(const sh::ShaderVariable &uniform,
>-                                          const std::string &fullName,
>-                                          const std::string &fullMappedName,
>-                                          std::vector<LinkedUniform> *samplerUniforms,
>-                                          std::vector<LinkedUniform> *imageUniforms,
>-                                          std::vector<LinkedUniform> *atomicCounterUniforms,
>-                                          GLenum shaderType,
>-                                          bool markStaticUse,
>-                                          int binding,
>-                                          int offset,
>-                                          int *location);
>-
>-    bool indexUniforms(InfoLog &infoLog, const Program::Bindings &uniformLocationBindings);
>+    bool indexUniforms(InfoLog &infoLog, const ProgramBindings &uniformLocationBindings);
>     bool gatherUniformLocationsAndCheckConflicts(InfoLog &infoLog,
>-                                                 const Program::Bindings &uniformLocationBindings,
>-                                                 std::set<GLuint> *reservedLocations,
>+                                                 const ProgramBindings &uniformLocationBindings,
>                                                  std::set<GLuint> *ignoredLocations,
>                                                  int *maxUniformLocation);
>     void pruneUnusedUniforms();
> 
>     const ProgramState &mState;
>     std::vector<LinkedUniform> mUniforms;
>+    std::vector<UnusedUniform> mUnusedUniforms;
>     std::vector<VariableLocation> mUniformLocations;
> };
> 
>+using GetBlockSizeFunc = std::function<
>+    bool(const std::string &blockName, const std::string &blockMappedName, size_t *sizeOut)>;
>+using GetBlockMemberInfoFunc = std::function<
>+    bool(const std::string &name, const std::string &mappedName, sh::BlockMemberInfo *infoOut)>;
>+
> // This class is intended to be used during the link step to store interface block information.
> // It is called by the Impl class during ProgramImpl::link so that it has access to the
> // real block size and layout.
>@@ -161,66 +98,32 @@ class InterfaceBlockLinker : angle::NonCopyable
>   public:
>     virtual ~InterfaceBlockLinker();
> 
>-    using GetBlockSize = std::function<
>-        bool(const std::string &blockName, const std::string &blockMappedName, size_t *sizeOut)>;
>-    using GetBlockMemberInfo = std::function<
>-        bool(const std::string &name, const std::string &mappedName, sh::BlockMemberInfo *infoOut)>;
>-
>     // This is called once per shader stage. It stores a pointer to the block vector, so it's
>     // important that this class does not persist longer than the duration of Program::link.
>-    void addShaderBlocks(GLenum shader, const std::vector<sh::InterfaceBlock> *blocks);
>+    void addShaderBlocks(ShaderType shader, const std::vector<sh::InterfaceBlock> *blocks);
> 
>     // This is called once during a link operation, after all shader blocks are added.
>-    void linkBlocks(const GetBlockSize &getBlockSize,
>-                    const GetBlockMemberInfo &getMemberInfo) const;
>+    void linkBlocks(const GetBlockSizeFunc &getBlockSize,
>+                    const GetBlockMemberInfoFunc &getMemberInfo) const;
> 
>   protected:
>     InterfaceBlockLinker(std::vector<InterfaceBlock> *blocksOut);
>-    void defineInterfaceBlock(const GetBlockSize &getBlockSize,
>-                              const GetBlockMemberInfo &getMemberInfo,
>+    void defineInterfaceBlock(const GetBlockSizeFunc &getBlockSize,
>+                              const GetBlockMemberInfoFunc &getMemberInfo,
>                               const sh::InterfaceBlock &interfaceBlock,
>-                              GLenum shaderType) const;
>-
>-    template <typename VarT>
>-    void defineBlockMembers(const GetBlockMemberInfo &getMemberInfo,
>-                            const std::vector<VarT> &fields,
>-                            const std::string &prefix,
>-                            const std::string &mappedPrefix,
>-                            int blockIndex,
>-                            bool singleEntryForTopLevelArray,
>-                            int topLevelArraySize) const;
>-    template <typename VarT>
>-    void defineBlockMember(const GetBlockMemberInfo &getMemberInfo,
>-                           const VarT &field,
>-                           const std::string &fullName,
>-                           const std::string &fullMappedName,
>-                           int blockIndex,
>-                           bool singleEntryForTopLevelArray,
>-                           int topLevelArraySize) const;
>-
>-    virtual void defineBlockMemberImpl(const sh::ShaderVariable &field,
>-                                       const std::string &fullName,
>-                                       const std::string &fullMappedName,
>-                                       int blockIndex,
>-                                       const sh::BlockMemberInfo &memberInfo,
>-                                       int topLevelArraySize) const             = 0;
>-    virtual size_t getCurrentBlockMemberIndex() const                           = 0;
>-
>-    using ShaderBlocks = std::pair<GLenum, const std::vector<sh::InterfaceBlock> *>;
>-    std::vector<ShaderBlocks> mShaderBlocks;
>+                              ShaderType shaderType) const;
>+
>+    virtual size_t getCurrentBlockMemberIndex() const = 0;
>+
>+    ShaderMap<const std::vector<sh::InterfaceBlock> *> mShaderBlocks;
> 
>     std::vector<InterfaceBlock> *mBlocksOut;
> 
>-  private:
>-    template <typename VarT>
>-    void defineArrayOfStructsBlockMembers(const GetBlockMemberInfo &getMemberInfo,
>-                                          const VarT &field,
>-                                          unsigned int arrayNestingIndex,
>-                                          const std::string &prefix,
>-                                          const std::string &mappedPrefix,
>-                                          int blockIndex,
>-                                          bool singleEntryForTopLevelArray,
>-                                          int topLevelArraySize) const;
>+    virtual sh::ShaderVariableVisitor *getVisitor(const GetBlockMemberInfoFunc &getMemberInfo,
>+                                                  const std::string &namePrefix,
>+                                                  const std::string &mappedNamePrefix,
>+                                                  ShaderType shaderType,
>+                                                  int blockIndex) const = 0;
> };
> 
> class UniformBlockLinker final : public InterfaceBlockLinker
>@@ -231,13 +134,14 @@ class UniformBlockLinker final : public InterfaceBlockLinker
>     ~UniformBlockLinker() override;
> 
>   private:
>-    void defineBlockMemberImpl(const sh::ShaderVariable &field,
>-                               const std::string &fullName,
>-                               const std::string &fullMappedName,
>-                               int blockIndex,
>-                               const sh::BlockMemberInfo &memberInfo,
>-                               int topLevelArraySize) const override;
>     size_t getCurrentBlockMemberIndex() const override;
>+
>+    sh::ShaderVariableVisitor *getVisitor(const GetBlockMemberInfoFunc &getMemberInfo,
>+                                          const std::string &namePrefix,
>+                                          const std::string &mappedNamePrefix,
>+                                          ShaderType shaderType,
>+                                          int blockIndex) const override;
>+
>     std::vector<LinkedUniform> *mUniformsOut;
> };
> 
>@@ -249,24 +153,60 @@ class ShaderStorageBlockLinker final : public InterfaceBlockLinker
>     ~ShaderStorageBlockLinker() override;
> 
>   private:
>-    void defineBlockMemberImpl(const sh::ShaderVariable &field,
>-                               const std::string &fullName,
>-                               const std::string &fullMappedName,
>-                               int blockIndex,
>-                               const sh::BlockMemberInfo &memberInfo,
>-                               int topLevelArraySize) const override;
>     size_t getCurrentBlockMemberIndex() const override;
>+
>+    sh::ShaderVariableVisitor *getVisitor(const GetBlockMemberInfoFunc &getMemberInfo,
>+                                          const std::string &namePrefix,
>+                                          const std::string &mappedNamePrefix,
>+                                          ShaderType shaderType,
>+                                          int blockIndex) const override;
>+
>     std::vector<BufferVariable> *mBufferVariablesOut;
> };
> 
>+class AtomicCounterBufferLinker final : angle::NonCopyable
>+{
>+  public:
>+    AtomicCounterBufferLinker(std::vector<AtomicCounterBuffer> *atomicCounterBuffersOut);
>+    ~AtomicCounterBufferLinker();
>+
>+    void link(const std::map<int, unsigned int> &sizeMap) const;
>+
>+  private:
>+    std::vector<AtomicCounterBuffer> *mAtomicCounterBuffersOut;
>+};
>+
> // The link operation is responsible for finishing the link of uniform and interface blocks.
> // This way it can filter out unreferenced resources and still have access to the info.
> // TODO(jmadill): Integrate uniform linking/filtering as well as interface blocks.
>+struct UnusedUniform
>+{
>+    UnusedUniform(std::string name, bool isSampler)
>+    {
>+        this->name      = name;
>+        this->isSampler = isSampler;
>+    }
>+
>+    std::string name;
>+    bool isSampler;
>+};
>+
> struct ProgramLinkedResources
> {
>+    ProgramLinkedResources(GLuint maxVaryingVectors,
>+                           PackMode packMode,
>+                           std::vector<InterfaceBlock> *uniformBlocksOut,
>+                           std::vector<LinkedUniform> *uniformsOut,
>+                           std::vector<InterfaceBlock> *shaderStorageBlocksOut,
>+                           std::vector<BufferVariable> *bufferVariablesOut,
>+                           std::vector<AtomicCounterBuffer> *atomicCounterBuffersOut);
>+    ~ProgramLinkedResources();
>+
>     VaryingPacking varyingPacking;
>     UniformBlockLinker uniformBlockLinker;
>     ShaderStorageBlockLinker shaderStorageBlockLinker;
>+    AtomicCounterBufferLinker atomicCounterBufferLinker;
>+    std::vector<UnusedUniform> unusedUniforms;
> };
> 
> }  // namespace gl
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/ProgramPipeline.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/ProgramPipeline.cpp
>index 04455120903..bacd2ed71b6 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/ProgramPipeline.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/ProgramPipeline.cpp
>@@ -17,13 +17,9 @@
> namespace gl
> {
> 
>-ProgramPipelineState::ProgramPipelineState() : mLabel()
>-{
>-}
>+ProgramPipelineState::ProgramPipelineState() : mLabel() {}
> 
>-ProgramPipelineState::~ProgramPipelineState()
>-{
>-}
>+ProgramPipelineState::~ProgramPipelineState() {}
> 
> const std::string &ProgramPipelineState::getLabel() const
> {
>@@ -31,8 +27,7 @@ const std::string &ProgramPipelineState::getLabel() const
> }
> 
> ProgramPipeline::ProgramPipeline(rx::GLImplFactory *factory, GLuint handle)
>-    : RefCountObject(handle),
>-      mProgramPipeline(factory->createProgramPipeline(mState))
>+    : RefCountObject(handle), mProgramPipeline(factory->createProgramPipeline(mState))
> {
>     ASSERT(mProgramPipeline);
> }
>@@ -42,12 +37,9 @@ ProgramPipeline::~ProgramPipeline()
>     mProgramPipeline.release();
> }
> 
>-Error ProgramPipeline::onDestroy(const Context *context)
>-{
>-    return NoError();
>-}
>+void ProgramPipeline::onDestroy(const Context *context) {}
> 
>-void ProgramPipeline::setLabel(const std::string &label)
>+void ProgramPipeline::setLabel(const Context *context, const std::string &label)
> {
>     mState.mLabel = label;
> }
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/ProgramPipeline.h b/Source/ThirdParty/ANGLE/src/libANGLE/ProgramPipeline.h
>index 2aac87c7b86..b32e7b9c799 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/ProgramPipeline.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/ProgramPipeline.h
>@@ -21,7 +21,7 @@ namespace rx
> {
> class GLImplFactory;
> class ProgramPipelineImpl;
>-};
>+}  // namespace rx
> 
> namespace gl
> {
>@@ -48,9 +48,9 @@ class ProgramPipeline final : public RefCountObject, public LabeledObject
>     ProgramPipeline(rx::GLImplFactory *factory, GLuint handle);
>     ~ProgramPipeline() override;
> 
>-    Error onDestroy(const Context *context) override;
>+    void onDestroy(const Context *context) override;
> 
>-    void setLabel(const std::string &label) override;
>+    void setLabel(const Context *context, const std::string &label) override;
>     const std::string &getLabel() const override;
> 
>     rx::ProgramPipelineImpl *getImplementation() const;
>@@ -60,6 +60,6 @@ class ProgramPipeline final : public RefCountObject, public LabeledObject
> 
>     ProgramPipelineState mState;
> };
>-}
>+}  // namespace gl
> 
> #endif  // LIBANGLE_PROGRAMPIPELINE_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/Program_unittest.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/Program_unittest.cpp
>index 6d99f00195e..e054dce93b0 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/Program_unittest.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/Program_unittest.cpp
>@@ -39,4 +39,4 @@ TEST(InfoLogTest, AppendingNewline)
>     EXPECT_EQ(expected, infoLog.str());
> }
> 
>-} // namespace
>+}  // namespace
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/Query.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/Query.cpp
>index cd1fb5f4bc7..47aa26578de 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/Query.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/Query.cpp
>@@ -11,16 +11,20 @@
> 
> namespace gl
> {
>-Query::Query(rx::QueryImpl *impl, GLuint id) : RefCountObject(id), mQuery(impl), mLabel()
>-{
>-}
>+Query::Query(rx::QueryImpl *impl, GLuint id) : RefCountObject(id), mQuery(impl), mLabel() {}
> 
> Query::~Query()
> {
>     SafeDelete(mQuery);
> }
> 
>-void Query::setLabel(const std::string &label)
>+void Query::onDestroy(const Context *context)
>+{
>+    ASSERT(mQuery);
>+    mQuery->onDestroy(context);
>+}
>+
>+void Query::setLabel(const Context *context, const std::string &label)
> {
>     mLabel = label;
> }
>@@ -30,47 +34,47 @@ const std::string &Query::getLabel() const
>     return mLabel;
> }
> 
>-Error Query::begin()
>+angle::Result Query::begin(const Context *context)
> {
>-    return mQuery->begin();
>+    return mQuery->begin(context);
> }
> 
>-Error Query::end()
>+angle::Result Query::end(const Context *context)
> {
>-    return mQuery->end();
>+    return mQuery->end(context);
> }
> 
>-Error Query::queryCounter()
>+angle::Result Query::queryCounter(const Context *context)
> {
>-    return mQuery->queryCounter();
>+    return mQuery->queryCounter(context);
> }
> 
>-Error Query::getResult(GLint *params)
>+angle::Result Query::getResult(const Context *context, GLint *params)
> {
>-    return mQuery->getResult(params);
>+    return mQuery->getResult(context, params);
> }
> 
>-Error Query::getResult(GLuint *params)
>+angle::Result Query::getResult(const Context *context, GLuint *params)
> {
>-    return mQuery->getResult(params);
>+    return mQuery->getResult(context, params);
> }
> 
>-Error Query::getResult(GLint64 *params)
>+angle::Result Query::getResult(const Context *context, GLint64 *params)
> {
>-    return mQuery->getResult(params);
>+    return mQuery->getResult(context, params);
> }
> 
>-Error Query::getResult(GLuint64 *params)
>+angle::Result Query::getResult(const Context *context, GLuint64 *params)
> {
>-    return mQuery->getResult(params);
>+    return mQuery->getResult(context, params);
> }
> 
>-Error Query::isResultAvailable(bool *available)
>+angle::Result Query::isResultAvailable(const Context *context, bool *available)
> {
>-    return mQuery->isResultAvailable(available);
>+    return mQuery->isResultAvailable(context, available);
> }
> 
>-GLenum Query::getType() const
>+QueryType Query::getType() const
> {
>     return mQuery->getType();
> }
>@@ -84,4 +88,4 @@ const rx::QueryImpl *Query::getImplementation() const
> {
>     return mQuery;
> }
>-}
>+}  // namespace gl
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/Query.h b/Source/ThirdParty/ANGLE/src/libANGLE/Query.h
>index c307eaaf08c..a19256e8ac4 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/Query.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/Query.h
>@@ -9,6 +9,7 @@
> #ifndef LIBANGLE_QUERY_H_
> #define LIBANGLE_QUERY_H_
> 
>+#include "common/PackedEnums.h"
> #include "libANGLE/Debug.h"
> #include "libANGLE/Error.h"
> #include "libANGLE/RefCountObject.h"
>@@ -29,22 +30,22 @@ class Query final : public RefCountObject, public LabeledObject
> {
>   public:
>     Query(rx::QueryImpl *impl, GLuint id);
>-    void destroy(const gl::Context *context) {}
>     ~Query() override;
>+    void onDestroy(const Context *context) override;
> 
>-    void setLabel(const std::string &label) override;
>+    void setLabel(const Context *context, const std::string &label) override;
>     const std::string &getLabel() const override;
> 
>-    Error begin();
>-    Error end();
>-    Error queryCounter();
>-    Error getResult(GLint *params);
>-    Error getResult(GLuint *params);
>-    Error getResult(GLint64 *params);
>-    Error getResult(GLuint64 *params);
>-    Error isResultAvailable(bool *available);
>+    angle::Result begin(const Context *context);
>+    angle::Result end(const Context *context);
>+    angle::Result queryCounter(const Context *context);
>+    angle::Result getResult(const Context *context, GLint *params);
>+    angle::Result getResult(const Context *context, GLuint *params);
>+    angle::Result getResult(const Context *context, GLint64 *params);
>+    angle::Result getResult(const Context *context, GLuint64 *params);
>+    angle::Result isResultAvailable(const Context *context, bool *available);
> 
>-    GLenum getType() const;
>+    QueryType getType() const;
> 
>     rx::QueryImpl *getImplementation();
>     const rx::QueryImpl *getImplementation() const;
>@@ -54,7 +55,6 @@ class Query final : public RefCountObject, public LabeledObject
> 
>     std::string mLabel;
> };
>+}  // namespace gl
> 
>-}
>-
>-#endif   // LIBANGLE_QUERY_H_
>+#endif  // LIBANGLE_QUERY_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/RefCountObject.h b/Source/ThirdParty/ANGLE/src/libANGLE/RefCountObject.h
>index cb41cc27f4c..158b6367553 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/RefCountObject.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/RefCountObject.h
>@@ -15,27 +15,32 @@
> #include "angle_gl.h"
> #include "common/debug.h"
> #include "libANGLE/Error.h"
>+#include "libANGLE/Observer.h"
> 
> #include <cstddef>
> 
>-namespace gl
>+namespace angle
> {
>-class Context;
> 
>-class RefCountObjectNoID : angle::NonCopyable
>+template <typename ContextT, typename ErrorT>
>+class RefCountObject : angle::NonCopyable
> {
>   public:
>-    RefCountObjectNoID() : mRefCount(0) {}
>-    virtual Error onDestroy(const Context *context);
>+    using ContextType = ContextT;
>+    using ErrorType   = ErrorT;
>+
>+    RefCountObject() : mRefCount(0) {}
>+
>+    virtual void onDestroy(const ContextType *context) {}
> 
>     void addRef() const { ++mRefCount; }
> 
>-    void release() const
>+    ANGLE_INLINE void release(const ContextType *context)
>     {
>         ASSERT(mRefCount > 0);
>-
>         if (--mRefCount == 0)
>         {
>+            onDestroy(context);
>             delete this;
>         }
>     }
>@@ -43,72 +48,37 @@ class RefCountObjectNoID : angle::NonCopyable
>     size_t getRefCount() const { return mRefCount; }
> 
>   protected:
>-    virtual ~RefCountObjectNoID();
>-
>-    // A specialized release method for objects which need a destroy context.
>-    void release(const gl::Context *context)
>-    {
>-        ASSERT(mRefCount > 0);
>-        if (--mRefCount == 0)
>-        {
>-            ANGLE_SWALLOW_ERR(onDestroy(context));
>-            delete this;
>-        }
>-    }
>+    virtual ~RefCountObject() { ASSERT(mRefCount == 0); }
> 
>-    template <class ObjectType>
>-    friend class BindingPointer;
>-    mutable std::size_t mRefCount;
>+    mutable size_t mRefCount;
> };
> 
>-inline RefCountObjectNoID::~RefCountObjectNoID()
>-{
>-    ASSERT(mRefCount == 0);
>-}
>-
>-inline Error RefCountObjectNoID::onDestroy(const Context *context)
>-{
>-    return NoError();
>-}
>-
>-template <class ObjectType>
>-class BindingPointer;
>-
>-class RefCountObject : RefCountObjectNoID
>+template <class ObjectType, typename ContextT, typename ErrorT = angle::Result>
>+class BindingPointer
> {
>   public:
>-    explicit RefCountObject(GLuint id) : mId(id) {}
>-
>-    GLuint id() const { return mId; }
>+    using ContextType = ContextT;
>+    using ErrorType   = ErrorT;
> 
>-    using RefCountObjectNoID::release;
>-    using RefCountObjectNoID::addRef;
>-    using RefCountObjectNoID::getRefCount;
>-
>-  protected:
>-    ~RefCountObject() override {}
>+    BindingPointer() : mObject(nullptr) {}
> 
>-  private:
>-    GLuint mId;
>-};
>-
>-template <class ObjectType>
>-class BindingPointer
>-{
>-  public:
>-    BindingPointer()
>-        : mObject(nullptr)
>+    BindingPointer(ObjectType *object) : mObject(object)
>     {
>+        if (mObject)
>+        {
>+            mObject->addRef();
>+        }
>     }
> 
>-    BindingPointer(ObjectType *object) : mObject(object) { mObject->addRef(); }
>-
>-    BindingPointer(const BindingPointer<ObjectType> &other) : mObject(other.mObject)
>+    BindingPointer(const BindingPointer &other) : mObject(other.mObject)
>     {
>-        mObject->addRef();
>+        if (mObject)
>+        {
>+            mObject->addRef();
>+        }
>     }
> 
>-    BindingPointer &operator=(BindingPointer<ObjectType> &&other)
>+    BindingPointer &operator=(BindingPointer &&other)
>     {
>         std::swap(mObject, other.mObject);
>         return *this;
>@@ -116,53 +86,101 @@ class BindingPointer
> 
>     virtual ~BindingPointer()
>     {
>-        // Objects have to be released before the resource manager is destroyed, so they must be explicitly cleaned up.
>+        // Objects have to be released before the resource manager is destroyed, so they must be
>+        // explicitly cleaned up.
>         ASSERT(mObject == nullptr);
>     }
> 
>-    virtual void set(const Context *context, ObjectType *newObject)
>+    void set(const ContextType *context, ObjectType *newObject)
>     {
>         // addRef first in case newObject == mObject and this is the last reference to it.
>-        if (newObject != nullptr) reinterpret_cast<const RefCountObjectNoID*>(newObject)->addRef();
>-        if (mObject != nullptr)
>-            reinterpret_cast<RefCountObjectNoID *>(mObject)->release(context);
>-        mObject = newObject;
>+        if (newObject != nullptr)
>+        {
>+            reinterpret_cast<RefCountObject<ContextType, ErrorType> *>(newObject)->addRef();
>+        }
>+
>+        // Store the old pointer in a temporary so we can set the pointer before calling release.
>+        // Otherwise the object could still be referenced when its destructor is called.
>+        ObjectType *oldObject = mObject;
>+        mObject               = newObject;
>+        if (oldObject != nullptr)
>+        {
>+            reinterpret_cast<RefCountObject<ContextType, ErrorType> *>(oldObject)->release(context);
>+        }
>     }
> 
>+    void assign(ObjectType *object) { mObject = object; }
>+
>     ObjectType *get() const { return mObject; }
>     ObjectType *operator->() const { return mObject; }
> 
>-    GLuint id() const { return (mObject != nullptr) ? mObject->id() : 0; }
>+    bool operator==(const BindingPointer &other) const { return mObject == other.mObject; }
> 
>-    bool operator==(const BindingPointer<ObjectType> &other) const
>-    {
>-        return mObject == other.mObject;
>-    }
>+    bool operator!=(const BindingPointer &other) const { return !(*this == other); }
> 
>-    bool operator!=(const BindingPointer<ObjectType> &other) const { return !(*this == other); }
>+  protected:
>+    ANGLE_INLINE void setImpl(ObjectType *obj) { mObject = obj; }
> 
>   private:
>     ObjectType *mObject;
> };
>+}  // namespace angle
>+
>+namespace gl
>+{
>+class Context;
> 
> template <class ObjectType>
>-class OffsetBindingPointer : public BindingPointer<ObjectType>
>+class BindingPointer;
>+
>+using RefCountObjectNoID = angle::RefCountObject<Context, angle::Result>;
>+
>+class RefCountObject : public gl::RefCountObjectNoID
>+{
>+  public:
>+    explicit RefCountObject(GLuint id) : mId(id) {}
>+
>+    GLuint id() const { return mId; }
>+
>+  protected:
>+    ~RefCountObject() override {}
>+
>+  private:
>+    GLuint mId;
>+};
>+
>+template <class ObjectType>
>+class BindingPointer : public angle::BindingPointer<ObjectType, Context>
> {
>   public:
>-    OffsetBindingPointer() : mOffset(0), mSize(0) { }
>+    using ContextType = typename angle::BindingPointer<ObjectType, Context>::ContextType;
>+    using ErrorType   = typename angle::BindingPointer<ObjectType, Context>::ErrorType;
>+
>+    BindingPointer() {}
>+
>+    BindingPointer(ObjectType *object) : angle::BindingPointer<ObjectType, Context>(object) {}
> 
>-    void set(const Context *context, ObjectType *newObject) override
>+    GLuint id() const
>     {
>-        BindingPointer<ObjectType>::set(context, newObject);
>-        mOffset = 0;
>-        mSize = 0;
>+        ObjectType *obj = this->get();
>+        return obj ? obj->id() : 0;
>     }
>+};
>+
>+template <class ObjectType>
>+class OffsetBindingPointer : public BindingPointer<ObjectType>
>+{
>+  public:
>+    using ContextType = typename BindingPointer<ObjectType>::ContextType;
>+    using ErrorType   = typename BindingPointer<ObjectType>::ErrorType;
> 
>-    void set(const Context *context, ObjectType *newObject, GLintptr offset, GLsizeiptr size)
>+    OffsetBindingPointer() : mOffset(0), mSize(0) {}
>+
>+    void set(const ContextType *context, ObjectType *newObject, GLintptr offset, GLsizeiptr size)
>     {
>-        BindingPointer<ObjectType>::set(context, newObject);
>+        set(context, newObject);
>         mOffset = offset;
>-        mSize = size;
>+        mSize   = size;
>     }
> 
>     GLintptr getOffset() const { return mOffset; }
>@@ -178,10 +196,67 @@ class OffsetBindingPointer : public BindingPointer<ObjectType>
>         return !(*this == other);
>     }
> 
>+    void assign(ObjectType *object, GLintptr offset, GLsizeiptr size)
>+    {
>+        assign(object);
>+        mOffset = offset;
>+        mSize   = size;
>+    }
>+
>   private:
>+    // Delete the unparameterized functions. This forces an explicit offset and size.
>+    using BindingPointer<ObjectType>::set;
>+    using BindingPointer<ObjectType>::assign;
>+
>     GLintptr mOffset;
>     GLsizeiptr mSize;
> };
>+
>+template <typename SubjectT>
>+class SubjectBindingPointer : protected BindingPointer<SubjectT>, public angle::ObserverBindingBase
>+{
>+  public:
>+    SubjectBindingPointer(angle::ObserverInterface *observer, angle::SubjectIndex index)
>+        : ObserverBindingBase(observer, index)
>+    {}
>+    ~SubjectBindingPointer() {}
>+    SubjectBindingPointer(const SubjectBindingPointer &other) = default;
>+    SubjectBindingPointer &operator=(const SubjectBindingPointer &other) = default;
>+
>+    void bind(const Context *context, SubjectT *subject)
>+    {
>+        // AddRef first in case subject == get()
>+        if (subject)
>+        {
>+            subject->addObserver(this);
>+            subject->addRef();
>+        }
>+
>+        if (get())
>+        {
>+            get()->removeObserver(this);
>+            get()->release(context);
>+        }
>+
>+        this->setImpl(subject);
>+    }
>+
>+    using BindingPointer<SubjectT>::get;
>+    using BindingPointer<SubjectT>::operator->;
>+
>+    friend class State;
>+};
> }  // namespace gl
> 
>-#endif   // LIBANGLE_REFCOUNTOBJECT_H_
>+namespace egl
>+{
>+class Display;
>+
>+using RefCountObject = angle::RefCountObject<Display, Error>;
>+
>+template <class ObjectType>
>+using BindingPointer = angle::BindingPointer<ObjectType, Display, Error>;
>+
>+}  // namespace egl
>+
>+#endif  // LIBANGLE_REFCOUNTOBJECT_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/Renderbuffer.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/Renderbuffer.cpp
>index 8310f1abda5..662b3c530a9 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/Renderbuffer.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/Renderbuffer.cpp
>@@ -11,44 +11,78 @@
> #include "libANGLE/Renderbuffer.h"
> 
> #include "common/utilities.h"
>+#include "libANGLE/Context.h"
> #include "libANGLE/FramebufferAttachment.h"
> #include "libANGLE/Image.h"
>+#include "libANGLE/Renderbuffer.h"
> #include "libANGLE/Texture.h"
> #include "libANGLE/formatutils.h"
>+#include "libANGLE/renderer/GLImplFactory.h"
> #include "libANGLE/renderer/d3d/RenderTargetD3D.h"
> 
> namespace gl
> {
>-Renderbuffer::Renderbuffer(rx::RenderbufferImpl *impl, GLuint id)
>-    : egl::ImageSibling(id),
>-      mRenderbuffer(impl),
>-      mLabel(),
>-      mWidth(0),
>-      mHeight(0),
>-      mFormat(GL_RGBA4),
>-      mSamples(0),
>-      mInitState(InitState::MayNeedInit)
>+// RenderbufferState implementation.
>+RenderbufferState::RenderbufferState()
>+    : mWidth(0), mHeight(0), mFormat(GL_RGBA4), mSamples(0), mInitState(InitState::MayNeedInit)
>+{}
>+
>+RenderbufferState::~RenderbufferState() {}
>+
>+GLsizei RenderbufferState::getWidth() const
> {
>+    return mWidth;
> }
> 
>-Error Renderbuffer::onDestroy(const Context *context)
>+GLsizei RenderbufferState::getHeight() const
> {
>-    ANGLE_TRY(orphanImages(context));
>+    return mHeight;
>+}
> 
>-    if (mRenderbuffer)
>-    {
>-        ANGLE_TRY(mRenderbuffer->onDestroy(context));
>-    }
>+const Format &RenderbufferState::getFormat() const
>+{
>+    return mFormat;
>+}
> 
>-    return NoError();
>+GLsizei RenderbufferState::getSamples() const
>+{
>+    return mSamples;
>+}
>+
>+void RenderbufferState::update(GLsizei width,
>+                               GLsizei height,
>+                               const Format &format,
>+                               GLsizei samples,
>+                               InitState initState)
>+{
>+    mWidth     = static_cast<GLsizei>(width);
>+    mHeight    = static_cast<GLsizei>(height);
>+    mFormat    = format;
>+    mSamples   = samples;
>+    mInitState = InitState::MayNeedInit;
> }
> 
>-Renderbuffer::~Renderbuffer()
>+// Renderbuffer implementation.
>+Renderbuffer::Renderbuffer(rx::GLImplFactory *implFactory, GLuint id)
>+    : RefCountObject(id),
>+      mState(),
>+      mImplementation(implFactory->createRenderbuffer(mState)),
>+      mLabel()
>+{}
>+
>+void Renderbuffer::onDestroy(const Context *context)
> {
>-    SafeDelete(mRenderbuffer);
>+    (void)(orphanImages(context));
>+
>+    if (mImplementation)
>+    {
>+        mImplementation->onDestroy(context);
>+    }
> }
> 
>-void Renderbuffer::setLabel(const std::string &label)
>+Renderbuffer::~Renderbuffer() {}
>+
>+void Renderbuffer::setLabel(const Context *context, const std::string &label)
> {
>     mLabel = label;
> }
>@@ -58,121 +92,123 @@ const std::string &Renderbuffer::getLabel() const
>     return mLabel;
> }
> 
>-Error Renderbuffer::setStorage(const Context *context,
>-                               GLenum internalformat,
>-                               size_t width,
>-                               size_t height)
>+angle::Result Renderbuffer::setStorage(const Context *context,
>+                                       GLenum internalformat,
>+                                       size_t width,
>+                                       size_t height)
> {
>     ANGLE_TRY(orphanImages(context));
>+    ANGLE_TRY(mImplementation->setStorage(context, internalformat, width, height));
> 
>-    ANGLE_TRY(mRenderbuffer->setStorage(context, internalformat, width, height));
>-
>-    mWidth          = static_cast<GLsizei>(width);
>-    mHeight         = static_cast<GLsizei>(height);
>-    mFormat         = Format(internalformat);
>-    mSamples = 0;
>+    mState.update(static_cast<GLsizei>(width), static_cast<GLsizei>(height), Format(internalformat),
>+                  0, InitState::MayNeedInit);
>+    onStateChange(context, angle::SubjectMessage::STORAGE_CHANGED);
> 
>-    mInitState = InitState::MayNeedInit;
>-    mDirtyChannel.signal(mInitState);
>-
>-    return NoError();
>+    return angle::Result::Continue;
> }
> 
>-Error Renderbuffer::setStorageMultisample(const Context *context,
>-                                          size_t samples,
>-                                          GLenum internalformat,
>-                                          size_t width,
>-                                          size_t height)
>+angle::Result Renderbuffer::setStorageMultisample(const Context *context,
>+                                                  size_t samples,
>+                                                  GLenum internalformat,
>+                                                  size_t width,
>+                                                  size_t height)
> {
>     ANGLE_TRY(orphanImages(context));
>-
>     ANGLE_TRY(
>-        mRenderbuffer->setStorageMultisample(context, samples, internalformat, width, height));
>+        mImplementation->setStorageMultisample(context, samples, internalformat, width, height));
> 
>-    mWidth          = static_cast<GLsizei>(width);
>-    mHeight         = static_cast<GLsizei>(height);
>-    mFormat         = Format(internalformat);
>-    mSamples        = static_cast<GLsizei>(samples);
>+    mState.update(static_cast<GLsizei>(width), static_cast<GLsizei>(height), Format(internalformat),
>+                  static_cast<GLsizei>(samples), InitState::MayNeedInit);
>+    onStateChange(context, angle::SubjectMessage::STORAGE_CHANGED);
> 
>-    mInitState = InitState::MayNeedInit;
>-    mDirtyChannel.signal(mInitState);
>-
>-    return NoError();
>+    return angle::Result::Continue;
> }
> 
>-Error Renderbuffer::setStorageEGLImageTarget(const Context *context, egl::Image *image)
>+angle::Result Renderbuffer::setStorageEGLImageTarget(const Context *context, egl::Image *image)
> {
>     ANGLE_TRY(orphanImages(context));
>-
>-    ANGLE_TRY(mRenderbuffer->setStorageEGLImageTarget(context, image));
>+    ANGLE_TRY(mImplementation->setStorageEGLImageTarget(context, image));
> 
>     setTargetImage(context, image);
> 
>-    mWidth          = static_cast<GLsizei>(image->getWidth());
>-    mHeight         = static_cast<GLsizei>(image->getHeight());
>-    mFormat         = Format(image->getFormat());
>-    mSamples        = 0;
>+    mState.update(static_cast<GLsizei>(image->getWidth()), static_cast<GLsizei>(image->getHeight()),
>+                  Format(image->getFormat()), 0, image->sourceInitState());
>+    onStateChange(context, angle::SubjectMessage::STORAGE_CHANGED);
> 
>-    mInitState = image->sourceInitState();
>-    mDirtyChannel.signal(mInitState);
>-
>-    return NoError();
>+    return angle::Result::Continue;
> }
> 
> rx::RenderbufferImpl *Renderbuffer::getImplementation() const
> {
>-    ASSERT(mRenderbuffer);
>-    return mRenderbuffer;
>+    ASSERT(mImplementation);
>+    return mImplementation.get();
> }
> 
> GLsizei Renderbuffer::getWidth() const
> {
>-    return mWidth;
>+    return mState.mWidth;
> }
> 
> GLsizei Renderbuffer::getHeight() const
> {
>-    return mHeight;
>+    return mState.mHeight;
> }
> 
> const Format &Renderbuffer::getFormat() const
> {
>-    return mFormat;
>+    return mState.mFormat;
> }
> 
> GLsizei Renderbuffer::getSamples() const
> {
>-    return mSamples;
>+    return mState.mSamples;
> }
> 
> GLuint Renderbuffer::getRedSize() const
> {
>-    return mFormat.info->redBits;
>+    return mState.mFormat.info->redBits;
> }
> 
> GLuint Renderbuffer::getGreenSize() const
> {
>-    return mFormat.info->greenBits;
>+    return mState.mFormat.info->greenBits;
> }
> 
> GLuint Renderbuffer::getBlueSize() const
> {
>-    return mFormat.info->blueBits;
>+    return mState.mFormat.info->blueBits;
> }
> 
> GLuint Renderbuffer::getAlphaSize() const
> {
>-    return mFormat.info->alphaBits;
>+    return mState.mFormat.info->alphaBits;
> }
> 
> GLuint Renderbuffer::getDepthSize() const
> {
>-    return mFormat.info->depthBits;
>+    return mState.mFormat.info->depthBits;
> }
> 
> GLuint Renderbuffer::getStencilSize() const
> {
>-    return mFormat.info->stencilBits;
>+    return mState.mFormat.info->stencilBits;
>+}
>+
>+GLint Renderbuffer::getMemorySize() const
>+{
>+    GLint implSize = mImplementation->getMemorySize();
>+    if (implSize > 0)
>+    {
>+        return implSize;
>+    }
>+
>+    // Assume allocated size is around width * height * samples * pixelBytes
>+    angle::CheckedNumeric<GLint> size = 1;
>+    size *= mState.mFormat.info->pixelBytes;
>+    size *= mState.mWidth;
>+    size *= mState.mHeight;
>+    size *= std::max(mState.mSamples, 1);
>+    return size.ValueOrDefault(std::numeric_limits<GLint>::max());
> }
> 
> void Renderbuffer::onAttach(const Context *context)
>@@ -192,11 +228,11 @@ GLuint Renderbuffer::getId() const
> 
> Extents Renderbuffer::getAttachmentSize(const gl::ImageIndex & /*imageIndex*/) const
> {
>-    return Extents(mWidth, mHeight, 1);
>+    return Extents(mState.mWidth, mState.mHeight, 1);
> }
> 
>-const Format &Renderbuffer::getAttachmentFormat(GLenum /*binding*/,
>-                                                const ImageIndex & /*imageIndex*/) const
>+Format Renderbuffer::getAttachmentFormat(GLenum /*binding*/,
>+                                         const ImageIndex & /*imageIndex*/) const
> {
>     return getFormat();
> }
>@@ -205,6 +241,18 @@ GLsizei Renderbuffer::getAttachmentSamples(const ImageIndex & /*imageIndex*/) co
>     return getSamples();
> }
> 
>+bool Renderbuffer::isRenderable(const Context *context,
>+                                GLenum binding,
>+                                const ImageIndex &imageIndex) const
>+{
>+    if (isEGLImageTarget())
>+    {
>+        return ImageSibling::isRenderable(context, binding, imageIndex);
>+    }
>+    return getFormat().info->renderbufferSupport(context->getClientVersion(),
>+                                                 context->getExtensions());
>+}
>+
> InitState Renderbuffer::initState(const gl::ImageIndex & /*imageIndex*/) const
> {
>     if (isEGLImageTarget())
>@@ -212,7 +260,7 @@ InitState Renderbuffer::initState(const gl::ImageIndex & /*imageIndex*/) const
>         return sourceEGLImageInitState();
>     }
> 
>-    return mInitState;
>+    return mState.mInitState;
> }
> 
> void Renderbuffer::setInitState(const gl::ImageIndex & /*imageIndex*/, InitState initState)
>@@ -223,13 +271,13 @@ void Renderbuffer::setInitState(const gl::ImageIndex & /*imageIndex*/, InitState
>     }
>     else
>     {
>-        mInitState = initState;
>+        mState.mInitState = initState;
>     }
> }
> 
> rx::FramebufferAttachmentObjectImpl *Renderbuffer::getAttachmentImpl() const
> {
>-    return mRenderbuffer;
>+    return mImplementation.get();
> }
> 
> }  // namespace gl
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/Renderbuffer.h b/Source/ThirdParty/ANGLE/src/libANGLE/Renderbuffer.h
>index def18e6ff74..d2cf07824f1 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/Renderbuffer.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/Renderbuffer.h
>@@ -20,6 +20,11 @@
> #include "libANGLE/formatutils.h"
> #include "libANGLE/renderer/RenderbufferImpl.h"
> 
>+namespace rx
>+{
>+class GLImplFactory;
>+}  // namespace rx
>+
> namespace gl
> {
> // A GL renderbuffer object is usually used as a depth or stencil buffer attachment
>@@ -27,25 +32,56 @@ namespace gl
> // FramebufferAttachment and Framebuffer for how they are applied to an FBO via an
> // attachment point.
> 
>-class Renderbuffer final : public egl::ImageSibling,
>-                           public LabeledObject
>+class RenderbufferState final : angle::NonCopyable
> {
>   public:
>-    Renderbuffer(rx::RenderbufferImpl *impl, GLuint id);
>+    RenderbufferState();
>+    ~RenderbufferState();
>+
>+    GLsizei getWidth() const;
>+    GLsizei getHeight() const;
>+    const Format &getFormat() const;
>+    GLsizei getSamples() const;
>+
>+  private:
>+    friend class Renderbuffer;
>+
>+    void update(GLsizei width,
>+                GLsizei height,
>+                const Format &format,
>+                GLsizei samples,
>+                InitState initState);
>+
>+    GLsizei mWidth;
>+    GLsizei mHeight;
>+    Format mFormat;
>+    GLsizei mSamples;
>+
>+    // For robust resource init.
>+    InitState mInitState;
>+};
>+
>+class Renderbuffer final : public RefCountObject, public egl::ImageSibling, public LabeledObject
>+{
>+  public:
>+    Renderbuffer(rx::GLImplFactory *implFactory, GLuint id);
>     ~Renderbuffer() override;
> 
>-    Error onDestroy(const Context *context) override;
>+    void onDestroy(const Context *context) override;
> 
>-    void setLabel(const std::string &label) override;
>+    void setLabel(const Context *context, const std::string &label) override;
>     const std::string &getLabel() const override;
> 
>-    Error setStorage(const Context *context, GLenum internalformat, size_t width, size_t height);
>-    Error setStorageMultisample(const Context *context,
>-                                size_t samples,
>-                                GLenum internalformat,
>-                                size_t width,
>-                                size_t height);
>-    Error setStorageEGLImageTarget(const Context *context, egl::Image *imageTarget);
>+    angle::Result setStorage(const Context *context,
>+                             GLenum internalformat,
>+                             size_t width,
>+                             size_t height);
>+    angle::Result setStorageMultisample(const Context *context,
>+                                        size_t samples,
>+                                        GLenum internalformat,
>+                                        size_t width,
>+                                        size_t height);
>+    angle::Result setStorageEGLImageTarget(const Context *context, egl::Image *imageTarget);
> 
>     rx::RenderbufferImpl *getImplementation() const;
> 
>@@ -60,10 +96,15 @@ class Renderbuffer final : public egl::ImageSibling,
>     GLuint getDepthSize() const;
>     GLuint getStencilSize() const;
> 
>+    GLint getMemorySize() const;
>+
>     // FramebufferAttachmentObject Impl
>     Extents getAttachmentSize(const ImageIndex &imageIndex) const override;
>-    const Format &getAttachmentFormat(GLenum binding, const ImageIndex &imageIndex) const override;
>+    Format getAttachmentFormat(GLenum binding, const ImageIndex &imageIndex) const override;
>     GLsizei getAttachmentSamples(const ImageIndex &imageIndex) const override;
>+    bool isRenderable(const Context *context,
>+                      GLenum binding,
>+                      const ImageIndex &imageIndex) const override;
> 
>     void onAttach(const Context *context) override;
>     void onDetach(const Context *context) override;
>@@ -75,19 +116,12 @@ class Renderbuffer final : public egl::ImageSibling,
>   private:
>     rx::FramebufferAttachmentObjectImpl *getAttachmentImpl() const override;
> 
>-    rx::RenderbufferImpl *mRenderbuffer;
>+    RenderbufferState mState;
>+    std::unique_ptr<rx::RenderbufferImpl> mImplementation;
> 
>     std::string mLabel;
>-
>-    GLsizei mWidth;
>-    GLsizei mHeight;
>-    Format mFormat;
>-    GLsizei mSamples;
>-
>-    // For robust resource init.
>-    InitState mInitState;
> };
> 
> }  // namespace gl
> 
>-#endif   // LIBANGLE_RENDERBUFFER_H_
>+#endif  // LIBANGLE_RENDERBUFFER_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/ResourceManager.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/ResourceManager.cpp
>index 79eb7e5f427..1bc8c8cba56 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/ResourceManager.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/ResourceManager.cpp
>@@ -10,7 +10,9 @@
> #include "libANGLE/ResourceManager.h"
> 
> #include "libANGLE/Buffer.h"
>+#include "libANGLE/Context.h"
> #include "libANGLE/Fence.h"
>+#include "libANGLE/MemoryObject.h"
> #include "libANGLE/Path.h"
> #include "libANGLE/Program.h"
> #include "libANGLE/ProgramPipeline.h"
>@@ -18,7 +20,7 @@
> #include "libANGLE/Sampler.h"
> #include "libANGLE/Shader.h"
> #include "libANGLE/Texture.h"
>-#include "libANGLE/renderer/GLImplFactory.h"
>+#include "libANGLE/renderer/ContextImpl.h"
> 
> namespace gl
> {
>@@ -38,8 +40,7 @@ GLuint AllocateEmptyObject(HandleAllocator *handleAllocator, ResourceMap<Resourc
> 
> template <typename HandleAllocatorType>
> ResourceManagerBase<HandleAllocatorType>::ResourceManagerBase() : mRefCount(1)
>-{
>-}
>+{}
> 
> template <typename HandleAllocatorType>
> void ResourceManagerBase<HandleAllocatorType>::addRef()
>@@ -135,9 +136,7 @@ Buffer *BufferManager::getBuffer(GLuint handle) const
> 
> // ShaderProgramManager Implementation.
> 
>-ShaderProgramManager::ShaderProgramManager()
>-{
>-}
>+ShaderProgramManager::ShaderProgramManager() {}
> 
> ShaderProgramManager::~ShaderProgramManager()
> {
>@@ -161,11 +160,10 @@ void ShaderProgramManager::reset(const Context *context)
> 
> GLuint ShaderProgramManager::createShader(rx::GLImplFactory *factory,
>                                           const gl::Limitations &rendererLimitations,
>-                                          GLenum type)
>+                                          ShaderType type)
> {
>-    ASSERT(type == GL_VERTEX_SHADER || type == GL_FRAGMENT_SHADER || type == GL_COMPUTE_SHADER ||
>-           type == GL_GEOMETRY_SHADER_EXT);
>-    GLuint handle    = mHandleAllocator.allocate();
>+    ASSERT(type != ShaderType::InvalidEnum);
>+    GLuint handle = mHandleAllocator.allocate();
>     mShaders.assign(handle, new Shader(this, factory, rendererLimitations, type, handle));
>     return handle;
> }
>@@ -192,11 +190,6 @@ void ShaderProgramManager::deleteProgram(const gl::Context *context, GLuint prog
>     deleteObject(context, &mPrograms, program);
> }
> 
>-Program *ShaderProgramManager::getProgram(GLuint handle) const
>-{
>-    return mPrograms.query(handle);
>-}
>-
> template <typename ObjectType>
> void ShaderProgramManager::deleteObject(const Context *context,
>                                         ResourceMap<ObjectType> *objectMap,
>@@ -223,9 +216,11 @@ void ShaderProgramManager::deleteObject(const Context *context,
> // TextureManager Implementation.
> 
> // static
>-Texture *TextureManager::AllocateNewObject(rx::GLImplFactory *factory, GLuint handle, GLenum target)
>+Texture *TextureManager::AllocateNewObject(rx::GLImplFactory *factory,
>+                                           GLuint handle,
>+                                           TextureType type)
> {
>-    Texture *texture = new Texture(factory, handle, target);
>+    Texture *texture = new Texture(factory, handle, type);
>     texture->addRef();
>     return texture;
> }
>@@ -241,13 +236,7 @@ GLuint TextureManager::createTexture()
>     return AllocateEmptyObject(&mHandleAllocator, &mObjectMap);
> }
> 
>-Texture *TextureManager::getTexture(GLuint handle) const
>-{
>-    ASSERT(mObjectMap.query(0) == nullptr);
>-    return mObjectMap.query(handle);
>-}
>-
>-void TextureManager::signalAllTexturesDirty() const
>+void TextureManager::signalAllTexturesDirty(const Context *context) const
> {
>     for (const auto &texture : mObjectMap)
>     {
>@@ -255,17 +244,22 @@ void TextureManager::signalAllTexturesDirty() const
>         {
>             // We don't know if the Texture needs init, but that's ok, since it will only force
>             // a re-check, and will not initialize the pixels if it's not needed.
>-            texture.second->signalDirty(InitState::MayNeedInit);
>+            texture.second->signalDirtyStorage(context, InitState::MayNeedInit);
>         }
>     }
> }
> 
>+void TextureManager::enableHandleAllocatorLogging()
>+{
>+    mHandleAllocator.enableLogging(true);
>+}
>+
> // RenderbufferManager Implementation.
> 
> // static
> Renderbuffer *RenderbufferManager::AllocateNewObject(rx::GLImplFactory *factory, GLuint handle)
> {
>-    Renderbuffer *renderbuffer = new Renderbuffer(factory->createRenderbuffer(), handle);
>+    Renderbuffer *renderbuffer = new Renderbuffer(factory, handle);
>     renderbuffer->addRef();
>     return renderbuffer;
> }
>@@ -341,31 +335,38 @@ Sync *SyncManager::getSync(GLuint handle) const
> 
> // PathManager Implementation.
> 
>-PathManager::PathManager()
>-{
>-}
>+PathManager::PathManager() = default;
> 
>-ErrorOrResult<GLuint> PathManager::createPaths(rx::GLImplFactory *factory, GLsizei range)
>+angle::Result PathManager::createPaths(Context *context, GLsizei range, GLuint *createdOut)
> {
>+    *createdOut = 0;
>+
>     // Allocate client side handles.
>     const GLuint client = mHandleAllocator.allocateRange(static_cast<GLuint>(range));
>     if (client == HandleRangeAllocator::kInvalidHandle)
>-        return OutOfMemory() << "Failed to allocate path handle range.";
>+    {
>+        context->handleError(GL_OUT_OF_MEMORY, "Failed to allocate path handle range.", __FILE__,
>+                             ANGLE_FUNCTION, __LINE__);
>+        return angle::Result::Stop;
>+    }
> 
>-    const auto &paths = factory->createPaths(range);
>+    const auto &paths = context->getImplementation()->createPaths(range);
>     if (paths.empty())
>     {
>         mHandleAllocator.releaseRange(client, range);
>-        return OutOfMemory() << "Failed to allocate path objects.";
>+        context->handleError(GL_OUT_OF_MEMORY, "Failed to allocate path objects.", __FILE__,
>+                             ANGLE_FUNCTION, __LINE__);
>+        return angle::Result::Stop;
>     }
> 
>     for (GLsizei i = 0; i < range; ++i)
>     {
>         rx::PathImpl *impl = paths[static_cast<unsigned>(i)];
>-        const auto id   = client + i;
>+        const auto id      = client + i;
>         mPaths.assign(id, new Path(impl));
>     }
>-    return client;
>+    *createdOut = client;
>+    return angle::Result::Continue;
> }
> 
> void PathManager::deletePaths(GLuint first, GLsizei range)
>@@ -418,12 +419,8 @@ Framebuffer *FramebufferManager::AllocateNewObject(rx::GLImplFactory *factory,
> // static
> void FramebufferManager::DeleteObject(const Context *context, Framebuffer *framebuffer)
> {
>-    // Default framebuffer are owned by their respective Surface
>-    if (framebuffer->id() != 0)
>-    {
>-        framebuffer->onDestroy(context);
>-        delete framebuffer;
>-    }
>+    framebuffer->onDestroy(context);
>+    delete framebuffer;
> }
> 
> GLuint FramebufferManager::createFramebuffer()
>@@ -442,13 +439,13 @@ void FramebufferManager::setDefaultFramebuffer(Framebuffer *framebuffer)
>     mObjectMap.assign(0, framebuffer);
> }
> 
>-void FramebufferManager::invalidateFramebufferComplenessCache() const
>+void FramebufferManager::invalidateFramebufferComplenessCache(const Context *context) const
> {
>     for (const auto &framebuffer : mObjectMap)
>     {
>         if (framebuffer.second)
>         {
>-            framebuffer.second->invalidateCompletenessCache();
>+            framebuffer.second->invalidateCompletenessCache(context);
>         }
>     }
> }
>@@ -480,4 +477,53 @@ ProgramPipeline *ProgramPipelineManager::getProgramPipeline(GLuint handle) const
>     return mObjectMap.query(handle);
> }
> 
>+// MemoryObjectManager Implementation.
>+
>+MemoryObjectManager::MemoryObjectManager() {}
>+
>+MemoryObjectManager::~MemoryObjectManager()
>+{
>+    ASSERT(mMemoryObjects.empty());
>+}
>+
>+void MemoryObjectManager::reset(const Context *context)
>+{
>+    while (!mMemoryObjects.empty())
>+    {
>+        deleteMemoryObject(context, mMemoryObjects.begin()->first);
>+    }
>+    mMemoryObjects.clear();
>+}
>+
>+GLuint MemoryObjectManager::createMemoryObject(rx::GLImplFactory *factory)
>+{
>+    GLuint handle = mHandleAllocator.allocate();
>+    MemoryObject *memoryObject = new MemoryObject(factory, handle);
>+    memoryObject->addRef();
>+    mMemoryObjects.assign(handle, memoryObject);
>+    return handle;
>+}
>+
>+void MemoryObjectManager::deleteMemoryObject(const Context *context, GLuint handle)
>+{
>+    MemoryObject *memoryObject = nullptr;
>+    if (!mMemoryObjects.erase(handle, &memoryObject))
>+    {
>+        return;
>+    }
>+
>+    // Requires an explicit this-> because of C++ template rules.
>+    this->mHandleAllocator.release(handle);
>+
>+    if (memoryObject)
>+    {
>+        memoryObject->release(context);
>+    }
>+}
>+
>+MemoryObject *MemoryObjectManager::getMemoryObject(GLuint handle) const
>+{
>+    return mMemoryObjects.query(handle);
>+}
>+
> }  // namespace gl
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/ResourceManager.h b/Source/ThirdParty/ANGLE/src/libANGLE/ResourceManager.h
>index 2dfeff5234c..208e289591d 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/ResourceManager.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/ResourceManager.h
>@@ -30,6 +30,7 @@ class Context;
> class Sync;
> class Framebuffer;
> struct Limitations;
>+class MemoryObject;
> class Path;
> class Program;
> class ProgramPipeline;
>@@ -64,7 +65,7 @@ class TypedResourceManager : public ResourceManagerBase<HandleAllocatorType>
>     TypedResourceManager() {}
> 
>     void deleteObject(const Context *context, GLuint handle);
>-    bool isHandleGenerated(GLuint handle) const
>+    ANGLE_INLINE bool isHandleGenerated(GLuint handle) const
>     {
>         // Zero is always assumed to have been generated implicitly.
>         return handle == 0 || mObjectMap.contains(handle);
>@@ -75,7 +76,9 @@ class TypedResourceManager : public ResourceManagerBase<HandleAllocatorType>
> 
>     // Inlined in the header for performance.
>     template <typename... ArgTypes>
>-    ResourceType *checkObjectAllocation(rx::GLImplFactory *factory, GLuint handle, ArgTypes... args)
>+    ANGLE_INLINE ResourceType *checkObjectAllocation(rx::GLImplFactory *factory,
>+                                                     GLuint handle,
>+                                                     ArgTypes... args)
>     {
>         ResourceType *value = mObjectMap.query(handle);
>         if (value)
>@@ -88,6 +91,19 @@ class TypedResourceManager : public ResourceManagerBase<HandleAllocatorType>
>             return nullptr;
>         }
> 
>+        return checkObjectAllocationImpl(factory, handle, args...);
>+    }
>+
>+    void reset(const Context *context) override;
>+
>+    ResourceMap<ResourceType> mObjectMap;
>+
>+  private:
>+    template <typename... ArgTypes>
>+    ResourceType *checkObjectAllocationImpl(rx::GLImplFactory *factory,
>+                                            GLuint handle,
>+                                            ArgTypes... args)
>+    {
>         ResourceType *object = ImplT::AllocateNewObject(factory, handle, args...);
> 
>         if (!mObjectMap.contains(handle))
>@@ -98,10 +114,6 @@ class TypedResourceManager : public ResourceManagerBase<HandleAllocatorType>
> 
>         return object;
>     }
>-
>-    void reset(const Context *context) override;
>-
>-    ResourceMap<ResourceType> mObjectMap;
> };
> 
> class BufferManager : public TypedResourceManager<Buffer, HandleAllocator, BufferManager>
>@@ -110,7 +122,7 @@ class BufferManager : public TypedResourceManager<Buffer, HandleAllocator, Buffe
>     GLuint createBuffer();
>     Buffer *getBuffer(GLuint handle) const;
> 
>-    Buffer *checkBufferAllocation(rx::GLImplFactory *factory, GLuint handle)
>+    ANGLE_INLINE Buffer *checkBufferAllocation(rx::GLImplFactory *factory, GLuint handle)
>     {
>         return checkObjectAllocation(factory, handle);
>     }
>@@ -130,13 +142,14 @@ class ShaderProgramManager : public ResourceManagerBase<HandleAllocator>
> 
>     GLuint createShader(rx::GLImplFactory *factory,
>                         const Limitations &rendererLimitations,
>-                        GLenum type);
>+                        ShaderType type);
>     void deleteShader(const Context *context, GLuint shader);
>     Shader *getShader(GLuint handle) const;
> 
>     GLuint createProgram(rx::GLImplFactory *factory);
>     void deleteProgram(const Context *context, GLuint program);
>-    Program *getProgram(GLuint handle) const;
>+
>+    ANGLE_INLINE Program *getProgram(GLuint handle) const { return mPrograms.query(handle); }
> 
>   protected:
>     ~ShaderProgramManager() override;
>@@ -155,18 +168,26 @@ class TextureManager : public TypedResourceManager<Texture, HandleAllocator, Tex
> {
>   public:
>     GLuint createTexture();
>-    Texture *getTexture(GLuint handle) const;
>+    ANGLE_INLINE Texture *getTexture(GLuint handle) const
>+    {
>+        ASSERT(mObjectMap.query(0) == nullptr);
>+        return mObjectMap.query(handle);
>+    }
> 
>-    void signalAllTexturesDirty() const;
>+    void signalAllTexturesDirty(const Context *context) const;
> 
>-    Texture *checkTextureAllocation(rx::GLImplFactory *factory, GLuint handle, GLenum target)
>+    ANGLE_INLINE Texture *checkTextureAllocation(rx::GLImplFactory *factory,
>+                                                 GLuint handle,
>+                                                 TextureType type)
>     {
>-        return checkObjectAllocation(factory, handle, target);
>+        return checkObjectAllocation(factory, handle, type);
>     }
> 
>-    static Texture *AllocateNewObject(rx::GLImplFactory *factory, GLuint handle, GLenum target);
>+    static Texture *AllocateNewObject(rx::GLImplFactory *factory, GLuint handle, TextureType type);
>     static void DeleteObject(const Context *context, Texture *texture);
> 
>+    void enableHandleAllocatorLogging();
>+
>   protected:
>     ~TextureManager() override {}
> };
>@@ -226,7 +247,7 @@ class PathManager : public ResourceManagerBase<HandleRangeAllocator>
>   public:
>     PathManager();
> 
>-    ErrorOrResult<GLuint> createPaths(rx::GLImplFactory *factory, GLsizei range);
>+    angle::Result createPaths(Context *context, GLsizei range, GLuint *numCreated);
>     void deletePaths(GLuint first, GLsizei range);
>     Path *getPath(GLuint handle) const;
>     bool hasPath(GLuint handle) const;
>@@ -247,7 +268,7 @@ class FramebufferManager
>     Framebuffer *getFramebuffer(GLuint handle) const;
>     void setDefaultFramebuffer(Framebuffer *framebuffer);
> 
>-    void invalidateFramebufferComplenessCache() const;
>+    void invalidateFramebufferComplenessCache(const Context *context) const;
> 
>     Framebuffer *checkFramebufferAllocation(rx::GLImplFactory *factory,
>                                             const Caps &caps,
>@@ -284,6 +305,24 @@ class ProgramPipelineManager
>     ~ProgramPipelineManager() override {}
> };
> 
>+class MemoryObjectManager : public ResourceManagerBase<HandleAllocator>
>+{
>+  public:
>+    MemoryObjectManager();
>+
>+    GLuint createMemoryObject(rx::GLImplFactory *factory);
>+    void deleteMemoryObject(const Context *context, GLuint handle);
>+    MemoryObject *getMemoryObject(GLuint handle) const;
>+
>+  protected:
>+    ~MemoryObjectManager() override;
>+
>+  private:
>+    void reset(const Context *context) override;
>+
>+    ResourceMap<MemoryObject> mMemoryObjects;
>+};
>+
> }  // namespace gl
> 
>-#endif // LIBANGLE_RESOURCEMANAGER_H_
>+#endif  // LIBANGLE_RESOURCEMANAGER_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/ResourceManager_unittest.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/ResourceManager_unittest.cpp
>index 03ca94a57d6..72bbc2ac022 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/ResourceManager_unittest.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/ResourceManager_unittest.cpp
>@@ -47,7 +47,7 @@ TEST_F(ResourceManagerTest, ReallocateBoundTexture)
> {
>     EXPECT_CALL(mMockFactory, createTexture(_)).Times(1).RetiresOnSaturation();
> 
>-    mTextureManager->checkTextureAllocation(&mMockFactory, 1, GL_TEXTURE_2D);
>+    mTextureManager->checkTextureAllocation(&mMockFactory, 1, TextureType::_2D);
>     GLuint newTexture = mTextureManager->createTexture();
>     EXPECT_NE(1u, newTexture);
> }
>@@ -63,7 +63,7 @@ TEST_F(ResourceManagerTest, ReallocateBoundBuffer)
> 
> TEST_F(ResourceManagerTest, ReallocateBoundRenderbuffer)
> {
>-    EXPECT_CALL(mMockFactory, createRenderbuffer()).Times(1).RetiresOnSaturation();
>+    EXPECT_CALL(mMockFactory, createRenderbuffer(_)).Times(1).RetiresOnSaturation();
> 
>     mRenderbuffermanager->checkRenderbufferAllocation(&mMockFactory, 1);
>     GLuint newRenderbuffer = mRenderbuffermanager->createRenderbuffer();
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/ResourceMap.h b/Source/ThirdParty/ANGLE/src/libANGLE/ResourceMap.h
>index b00da686127..b823f0665b5 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/ResourceMap.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/ResourceMap.h
>@@ -23,7 +23,16 @@ class ResourceMap final : angle::NonCopyable
>     ResourceMap();
>     ~ResourceMap();
> 
>-    ResourceType *query(GLuint handle) const;
>+    ANGLE_INLINE ResourceType *query(GLuint handle) const
>+    {
>+        if (handle < mFlatResourcesSize)
>+        {
>+            ResourceType *value = mFlatResources[handle];
>+            return (value == InvalidPointer() ? nullptr : value);
>+        }
>+        auto it = mHashedResources.find(handle);
>+        return (it == mHashedResources.end() ? nullptr : it->second);
>+    }
> 
>     // Returns true if the handle was reserved. Not necessarily if the resource is created.
>     bool contains(GLuint handle) const;
>@@ -84,7 +93,11 @@ class ResourceMap final : angle::NonCopyable
>     // Experimental testing suggests that 16k is a reasonable upper limit.
>     static constexpr size_t kFlatResourcesLimit = 0x4000;
> 
>-    std::vector<ResourceType *> mFlatResources;
>+    // Size of one map element.
>+    static constexpr size_t kElementSize = sizeof(ResourceType *);
>+
>+    size_t mFlatResourcesSize;
>+    ResourceType **mFlatResources;
> 
>     // A map of GL objects indexed by object ID.
>     HashMap mHashedResources;
>@@ -92,32 +105,24 @@ class ResourceMap final : angle::NonCopyable
> 
> template <typename ResourceType>
> ResourceMap<ResourceType>::ResourceMap()
>-    : mFlatResources(kInitialFlatResourcesSize, InvalidPointer()), mHashedResources()
>+    : mFlatResourcesSize(kInitialFlatResourcesSize),
>+      mFlatResources(new ResourceType *[kInitialFlatResourcesSize]),
>+      mHashedResources()
> {
>+    memset(mFlatResources, kInvalidPointer, mFlatResourcesSize * kElementSize);
> }
> 
> template <typename ResourceType>
> ResourceMap<ResourceType>::~ResourceMap()
> {
>     ASSERT(empty());
>+    delete[] mFlatResources;
> }
> 
> template <typename ResourceType>
>-ResourceType *ResourceMap<ResourceType>::query(GLuint handle) const
>-{
>-    if (handle < mFlatResources.size())
>-    {
>-        auto value = mFlatResources[handle];
>-        return (value == InvalidPointer() ? nullptr : value);
>-    }
>-    auto it = mHashedResources.find(handle);
>-    return (it == mHashedResources.end() ? nullptr : it->second);
>-}
>-
>-template <typename ResourceType>
>-bool ResourceMap<ResourceType>::contains(GLuint handle) const
>+ANGLE_INLINE bool ResourceMap<ResourceType>::contains(GLuint handle) const
> {
>-    if (handle < mFlatResources.size())
>+    if (handle < mFlatResourcesSize)
>     {
>         return (mFlatResources[handle] != InvalidPointer());
>     }
>@@ -127,7 +132,7 @@ bool ResourceMap<ResourceType>::contains(GLuint handle) const
> template <typename ResourceType>
> bool ResourceMap<ResourceType>::erase(GLuint handle, ResourceType **resourceOut)
> {
>-    if (handle < mFlatResources.size())
>+    if (handle < mFlatResourcesSize)
>     {
>         auto &value = mFlatResources[handle];
>         if (value == InvalidPointer())
>@@ -155,17 +160,25 @@ void ResourceMap<ResourceType>::assign(GLuint handle, ResourceType *resource)
> {
>     if (handle < kFlatResourcesLimit)
>     {
>-        if (handle >= mFlatResources.size())
>+        if (handle >= mFlatResourcesSize)
>         {
>             // Use power-of-two.
>-            size_t newSize = mFlatResources.size();
>+            size_t newSize = mFlatResourcesSize;
>             while (newSize <= handle)
>             {
>                 newSize *= 2;
>             }
>-            mFlatResources.resize(newSize, nullptr);
>+
>+            ResourceType **oldResources = mFlatResources;
>+
>+            mFlatResources = new ResourceType *[newSize];
>+            memset(&mFlatResources[mFlatResourcesSize], kInvalidPointer,
>+                   (newSize - mFlatResourcesSize) * kElementSize);
>+            memcpy(mFlatResources, oldResources, mFlatResourcesSize * kElementSize);
>+            mFlatResourcesSize = newSize;
>+            delete[] oldResources;
>         }
>-        ASSERT(mFlatResources.size() > handle);
>+        ASSERT(mFlatResourcesSize > handle);
>         mFlatResources[handle] = resource;
>     }
>     else
>@@ -183,13 +196,13 @@ typename ResourceMap<ResourceType>::Iterator ResourceMap<ResourceType>::begin()
> template <typename ResourceType>
> typename ResourceMap<ResourceType>::Iterator ResourceMap<ResourceType>::end() const
> {
>-    return Iterator(*this, static_cast<GLuint>(mFlatResources.size()), mHashedResources.end());
>+    return Iterator(*this, static_cast<GLuint>(mFlatResourcesSize), mHashedResources.end());
> }
> 
> template <typename ResourceType>
> typename ResourceMap<ResourceType>::Iterator ResourceMap<ResourceType>::find(GLuint handle) const
> {
>-    if (handle < mFlatResources.size())
>+    if (handle < mFlatResourcesSize)
>     {
>         return (mFlatResources[handle] != InvalidPointer()
>                     ? Iterator(handle, mHashedResources.begin())
>@@ -210,21 +223,22 @@ bool ResourceMap<ResourceType>::empty() const
> template <typename ResourceType>
> void ResourceMap<ResourceType>::clear()
> {
>-    mFlatResources.assign(kInitialFlatResourcesSize, InvalidPointer());
>+    memset(mFlatResources, kInvalidPointer, kInitialFlatResourcesSize * kElementSize);
>+    mFlatResourcesSize = kInitialFlatResourcesSize;
>     mHashedResources.clear();
> }
> 
> template <typename ResourceType>
> GLuint ResourceMap<ResourceType>::nextNonNullResource(size_t flatIndex) const
> {
>-    for (size_t index = flatIndex; index < mFlatResources.size(); index++)
>+    for (size_t index = flatIndex; index < mFlatResourcesSize; index++)
>     {
>         if (mFlatResources[index] != nullptr && mFlatResources[index] != InvalidPointer())
>         {
>             return static_cast<GLuint>(index);
>         }
>     }
>-    return static_cast<GLuint>(mFlatResources.size());
>+    return static_cast<GLuint>(mFlatResourcesSize);
> }
> 
> template <typename ResourceType>
>@@ -259,7 +273,7 @@ bool ResourceMap<ResourceType>::Iterator::operator!=(const Iterator &other) cons
> template <typename ResourceType>
> typename ResourceMap<ResourceType>::Iterator &ResourceMap<ResourceType>::Iterator::operator++()
> {
>-    if (mFlatIndex < static_cast<GLuint>(mOrigin.mFlatResources.size()))
>+    if (mFlatIndex < static_cast<GLuint>(mOrigin.mFlatResourcesSize))
>     {
>         mFlatIndex = mOrigin.nextNonNullResource(mFlatIndex + 1);
>     }
>@@ -288,7 +302,7 @@ const typename ResourceMap<ResourceType>::IndexAndResource
> template <typename ResourceType>
> void ResourceMap<ResourceType>::Iterator::updateValue()
> {
>-    if (mFlatIndex < static_cast<GLuint>(mOrigin.mFlatResources.size()))
>+    if (mFlatIndex < static_cast<GLuint>(mOrigin.mFlatResourcesSize))
>     {
>         mValue.first  = mFlatIndex;
>         mValue.second = mOrigin.mFlatResources[mFlatIndex];
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/ResourceMap_unittest.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/ResourceMap_unittest.cpp
>new file mode 100644
>index 00000000000..fd9d3e9080a
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/ResourceMap_unittest.cpp
>@@ -0,0 +1,136 @@
>+//
>+// Copyright 2018 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// ResourceMap_unittest:
>+//   Unit tests for the ResourceMap template class.
>+//
>+
>+#include <gtest/gtest.h>
>+
>+#include "libANGLE/ResourceMap.h"
>+
>+using namespace gl;
>+
>+namespace
>+{
>+// Tests assigning slots in the map and then deleting elements.
>+TEST(ResourceMapTest, AssignAndErase)
>+{
>+    constexpr size_t kSize = 64;
>+    ResourceMap<size_t> resourceMap;
>+    std::vector<size_t> objects(kSize, 1);
>+    for (size_t index = 0; index < kSize; ++index)
>+    {
>+        resourceMap.assign(index + 1, &objects[index]);
>+    }
>+
>+    for (size_t index = 0; index < kSize; ++index)
>+    {
>+        size_t *found = nullptr;
>+        ASSERT_TRUE(resourceMap.erase(index + 1, &found));
>+        ASSERT_EQ(&objects[index], found);
>+    }
>+
>+    ASSERT_TRUE(resourceMap.empty());
>+}
>+
>+// Tests assigning slots in the map and then using clear() to free it.
>+TEST(ResourceMapTest, AssignAndClear)
>+{
>+    constexpr size_t kSize = 64;
>+    ResourceMap<size_t> resourceMap;
>+    std::vector<size_t> objects(kSize, 1);
>+    for (size_t index = 0; index < kSize; ++index)
>+    {
>+        resourceMap.assign(index + 1, &objects[index]);
>+    }
>+
>+    resourceMap.clear();
>+    ASSERT_TRUE(resourceMap.empty());
>+}
>+
>+// Tests growing a map more than double the size.
>+TEST(ResourceMapTest, BigGrowth)
>+{
>+    constexpr size_t kSize = 8;
>+
>+    ResourceMap<size_t> resourceMap;
>+    std::vector<size_t> objects;
>+
>+    for (size_t index = 0; index < kSize; ++index)
>+    {
>+        objects.push_back(index);
>+    }
>+
>+    // Assign a large value.
>+    constexpr size_t kLargeIndex = 128;
>+    objects.push_back(kLargeIndex);
>+
>+    for (size_t &object : objects)
>+    {
>+        resourceMap.assign(object, &object);
>+    }
>+
>+    for (size_t object : objects)
>+    {
>+        size_t *found = nullptr;
>+        ASSERT_TRUE(resourceMap.erase(object, &found));
>+        ASSERT_EQ(object, *found);
>+    }
>+
>+    ASSERT_TRUE(resourceMap.empty());
>+}
>+
>+// Tests querying unassigned or erased values.
>+TEST(ResourceMapTest, QueryUnassigned)
>+{
>+    constexpr size_t kSize = 8;
>+
>+    ResourceMap<size_t> resourceMap;
>+    std::vector<size_t> objects;
>+
>+    for (size_t index = 0; index < kSize; ++index)
>+    {
>+        objects.push_back(index);
>+    }
>+
>+    ASSERT_FALSE(resourceMap.contains(0));
>+    ASSERT_EQ(nullptr, resourceMap.query(0));
>+    ASSERT_FALSE(resourceMap.contains(100));
>+    ASSERT_EQ(nullptr, resourceMap.query(100));
>+
>+    for (size_t &object : objects)
>+    {
>+        resourceMap.assign(object, &object);
>+    }
>+
>+    ASSERT_FALSE(resourceMap.empty());
>+
>+    for (size_t &object : objects)
>+    {
>+        ASSERT_TRUE(resourceMap.contains(object));
>+        ASSERT_EQ(&object, resourceMap.query(object));
>+    }
>+
>+    ASSERT_FALSE(resourceMap.contains(10));
>+    ASSERT_EQ(nullptr, resourceMap.query(10));
>+    ASSERT_FALSE(resourceMap.contains(100));
>+    ASSERT_EQ(nullptr, resourceMap.query(100));
>+
>+    for (size_t object : objects)
>+    {
>+        size_t *found = nullptr;
>+        ASSERT_TRUE(resourceMap.erase(object, &found));
>+        ASSERT_EQ(object, *found);
>+    }
>+
>+    ASSERT_TRUE(resourceMap.empty());
>+
>+    ASSERT_FALSE(resourceMap.contains(0));
>+    ASSERT_EQ(nullptr, resourceMap.query(0));
>+    ASSERT_FALSE(resourceMap.contains(100));
>+    ASSERT_EQ(nullptr, resourceMap.query(100));
>+}
>+}  // anonymous namespace
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/Sampler.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/Sampler.cpp
>index 0f05b697a23..c8a43d36ada 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/Sampler.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/Sampler.cpp
>@@ -17,20 +17,16 @@ namespace gl
> 
> Sampler::Sampler(rx::GLImplFactory *factory, GLuint id)
>     : RefCountObject(id), mState(), mImpl(factory->createSampler(mState)), mLabel()
>-{
>-}
>+{}
> 
> Sampler::~Sampler()
> {
>     SafeDelete(mImpl);
> }
> 
>-Error Sampler::onDestroy(const Context *context)
>-{
>-    return NoError();
>-}
>+void Sampler::onDestroy(const Context *context) {}
> 
>-void Sampler::setLabel(const std::string &label)
>+void Sampler::setLabel(const Context *context, const std::string &label)
> {
>     mLabel = label;
> }
>@@ -40,114 +36,136 @@ const std::string &Sampler::getLabel() const
>     return mLabel;
> }
> 
>-void Sampler::setMinFilter(GLenum minFilter)
>+void Sampler::setMinFilter(const Context *context, GLenum minFilter)
> {
>-    mState.minFilter = minFilter;
>+    mState.setMinFilter(minFilter);
>+    onStateChange(context, angle::SubjectMessage::DEPENDENT_DIRTY_BITS);
> }
> 
> GLenum Sampler::getMinFilter() const
> {
>-    return mState.minFilter;
>+    return mState.getMinFilter();
> }
> 
>-void Sampler::setMagFilter(GLenum magFilter)
>+void Sampler::setMagFilter(const Context *context, GLenum magFilter)
> {
>-    mState.magFilter = magFilter;
>+    mState.setMagFilter(magFilter);
>+    onStateChange(context, angle::SubjectMessage::DEPENDENT_DIRTY_BITS);
> }
> 
> GLenum Sampler::getMagFilter() const
> {
>-    return mState.magFilter;
>+    return mState.getMagFilter();
> }
> 
>-void Sampler::setWrapS(GLenum wrapS)
>+void Sampler::setWrapS(const Context *context, GLenum wrapS)
> {
>-    mState.wrapS = wrapS;
>+    mState.setWrapS(wrapS);
>+    onStateChange(context, angle::SubjectMessage::DEPENDENT_DIRTY_BITS);
> }
> 
> GLenum Sampler::getWrapS() const
> {
>-    return mState.wrapS;
>+    return mState.getWrapS();
> }
> 
>-void Sampler::setWrapT(GLenum wrapT)
>+void Sampler::setWrapT(const Context *context, GLenum wrapT)
> {
>-    mState.wrapT = wrapT;
>+    mState.setWrapT(wrapT);
>+    onStateChange(context, angle::SubjectMessage::DEPENDENT_DIRTY_BITS);
> }
> 
> GLenum Sampler::getWrapT() const
> {
>-    return mState.wrapT;
>+    return mState.getWrapT();
> }
> 
>-void Sampler::setWrapR(GLenum wrapR)
>+void Sampler::setWrapR(const Context *context, GLenum wrapR)
> {
>-    mState.wrapR = wrapR;
>+    mState.setWrapR(wrapR);
>+    onStateChange(context, angle::SubjectMessage::DEPENDENT_DIRTY_BITS);
> }
> 
> GLenum Sampler::getWrapR() const
> {
>-    return mState.wrapR;
>+    return mState.getWrapR();
> }
> 
>-void Sampler::setMaxAnisotropy(float maxAnisotropy)
>+void Sampler::setMaxAnisotropy(const Context *context, float maxAnisotropy)
> {
>-    mState.maxAnisotropy = maxAnisotropy;
>+    mState.setMaxAnisotropy(maxAnisotropy);
>+    onStateChange(context, angle::SubjectMessage::DEPENDENT_DIRTY_BITS);
> }
> 
> float Sampler::getMaxAnisotropy() const
> {
>-    return mState.maxAnisotropy;
>+    return mState.getMaxAnisotropy();
> }
> 
>-void Sampler::setMinLod(GLfloat minLod)
>+void Sampler::setMinLod(const Context *context, GLfloat minLod)
> {
>-    mState.minLod = minLod;
>+    mState.setMinLod(minLod);
>+    onStateChange(context, angle::SubjectMessage::DEPENDENT_DIRTY_BITS);
> }
> 
> GLfloat Sampler::getMinLod() const
> {
>-    return mState.minLod;
>+    return mState.getMinLod();
> }
> 
>-void Sampler::setMaxLod(GLfloat maxLod)
>+void Sampler::setMaxLod(const Context *context, GLfloat maxLod)
> {
>-    mState.maxLod = maxLod;
>+    mState.setMaxLod(maxLod);
>+    onStateChange(context, angle::SubjectMessage::DEPENDENT_DIRTY_BITS);
> }
> 
> GLfloat Sampler::getMaxLod() const
> {
>-    return mState.maxLod;
>+    return mState.getMaxLod();
> }
> 
>-void Sampler::setCompareMode(GLenum compareMode)
>+void Sampler::setCompareMode(const Context *context, GLenum compareMode)
> {
>-    mState.compareMode = compareMode;
>+    mState.setCompareMode(compareMode);
>+    onStateChange(context, angle::SubjectMessage::DEPENDENT_DIRTY_BITS);
> }
> 
> GLenum Sampler::getCompareMode() const
> {
>-    return mState.compareMode;
>+    return mState.getCompareMode();
> }
> 
>-void Sampler::setCompareFunc(GLenum compareFunc)
>+void Sampler::setCompareFunc(const Context *context, GLenum compareFunc)
> {
>-    mState.compareFunc = compareFunc;
>+    mState.setCompareFunc(compareFunc);
>+    onStateChange(context, angle::SubjectMessage::DEPENDENT_DIRTY_BITS);
> }
> 
> GLenum Sampler::getCompareFunc() const
> {
>-    return mState.compareFunc;
>+    return mState.getCompareFunc();
> }
> 
>-void Sampler::setSRGBDecode(GLenum sRGBDecode)
>+void Sampler::setSRGBDecode(const Context *context, GLenum sRGBDecode)
> {
>-    mState.sRGBDecode = sRGBDecode;
>+    mState.setSRGBDecode(sRGBDecode);
>+    onStateChange(context, angle::SubjectMessage::DEPENDENT_DIRTY_BITS);
> }
> 
> GLenum Sampler::getSRGBDecode() const
> {
>-    return mState.sRGBDecode;
>+    return mState.getSRGBDecode();
>+}
>+
>+void Sampler::setBorderColor(const Context *context, const ColorGeneric &color)
>+{
>+    mState.setBorderColor(color);
>+    onStateChange(context, angle::SubjectMessage::DEPENDENT_DIRTY_BITS);
>+}
>+
>+const ColorGeneric &Sampler::getBorderColor() const
>+{
>+    return mState.getBorderColor();
> }
> 
> const SamplerState &Sampler::getSamplerState() const
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/Sampler.h b/Source/ThirdParty/ANGLE/src/libANGLE/Sampler.h
>index cd34273b44d..ba8c604cb1a 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/Sampler.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/Sampler.h
>@@ -10,63 +10,67 @@
> #ifndef LIBANGLE_SAMPLER_H_
> #define LIBANGLE_SAMPLER_H_
> 
>-#include "libANGLE/angletypes.h"
> #include "libANGLE/Debug.h"
>+#include "libANGLE/Observer.h"
> #include "libANGLE/RefCountObject.h"
>+#include "libANGLE/angletypes.h"
> 
> namespace rx
> {
> class GLImplFactory;
> class SamplerImpl;
>-}
>+}  // namespace rx
> 
> namespace gl
> {
> 
>-class Sampler final : public RefCountObject, public LabeledObject
>+class Sampler final : public RefCountObject, public LabeledObject, public angle::Subject
> {
>   public:
>     Sampler(rx::GLImplFactory *factory, GLuint id);
>     ~Sampler() override;
> 
>-    Error onDestroy(const Context *context) override;
>+    void onDestroy(const Context *context) override;
> 
>-    void setLabel(const std::string &label) override;
>+    void setLabel(const Context *context, const std::string &label) override;
>     const std::string &getLabel() const override;
> 
>-    void setMinFilter(GLenum minFilter);
>+    void setMinFilter(const Context *context, GLenum minFilter);
>     GLenum getMinFilter() const;
> 
>-    void setMagFilter(GLenum magFilter);
>+    void setMagFilter(const Context *context, GLenum magFilter);
>     GLenum getMagFilter() const;
> 
>-    void setWrapS(GLenum wrapS);
>+    void setWrapS(const Context *context, GLenum wrapS);
>     GLenum getWrapS() const;
> 
>-    void setWrapT(GLenum wrapT);
>+    void setWrapT(const Context *context, GLenum wrapT);
>     GLenum getWrapT() const;
> 
>-    void setWrapR(GLenum wrapR);
>+    void setWrapR(const Context *context, GLenum wrapR);
>     GLenum getWrapR() const;
> 
>-    void setMaxAnisotropy(float maxAnisotropy);
>+    void setMaxAnisotropy(const Context *context, float maxAnisotropy);
>     float getMaxAnisotropy() const;
> 
>-    void setMinLod(GLfloat minLod);
>+    void setMinLod(const Context *context, GLfloat minLod);
>     GLfloat getMinLod() const;
> 
>-    void setMaxLod(GLfloat maxLod);
>+    void setMaxLod(const Context *context, GLfloat maxLod);
>     GLfloat getMaxLod() const;
> 
>-    void setCompareMode(GLenum compareMode);
>+    void setCompareMode(const Context *context, GLenum compareMode);
>     GLenum getCompareMode() const;
> 
>-    void setCompareFunc(GLenum compareFunc);
>+    void setCompareFunc(const Context *context, GLenum compareFunc);
>     GLenum getCompareFunc() const;
> 
>-    void setSRGBDecode(GLenum sRGBDecode);
>+    void setSRGBDecode(const Context *context, GLenum sRGBDecode);
>     GLenum getSRGBDecode() const;
> 
>+    void setBorderColor(const Context *context, const ColorGeneric &color);
>+    const ColorGeneric &getBorderColor() const;
>+
>     const SamplerState &getSamplerState() const;
> 
>     rx::SamplerImpl *getImplementation() const;
>@@ -82,4 +86,4 @@ class Sampler final : public RefCountObject, public LabeledObject
> 
> }  // namespace gl
> 
>-#endif // LIBANGLE_SAMPLER_H_
>+#endif  // LIBANGLE_SAMPLER_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/Shader.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/Shader.cpp
>index 94c4f3c7054..6cd1a01a68a 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/Shader.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/Shader.cpp
>@@ -10,17 +10,18 @@
> 
> #include "libANGLE/Shader.h"
> 
>+#include <functional>
> #include <sstream>
> 
>-#include "common/utilities.h"
> #include "GLSLANG/ShaderLang.h"
>+#include "common/utilities.h"
> #include "libANGLE/Caps.h"
> #include "libANGLE/Compiler.h"
> #include "libANGLE/Constants.h"
>+#include "libANGLE/Context.h"
>+#include "libANGLE/ResourceManager.h"
> #include "libANGLE/renderer/GLImplFactory.h"
> #include "libANGLE/renderer/ShaderImpl.h"
>-#include "libANGLE/ResourceManager.h"
>-#include "libANGLE/Context.h"
> 
> namespace gl
> {
>@@ -35,7 +36,7 @@ std::vector<VarT> GetActiveShaderVariables(const std::vector<VarT> *variableList
>     for (size_t varIndex = 0; varIndex < variableList->size(); varIndex++)
>     {
>         const VarT &var = variableList->at(varIndex);
>-        if (var.staticUse)
>+        if (var.active)
>         {
>             result.push_back(var);
>         }
>@@ -74,28 +75,61 @@ bool CompareShaderVar(const sh::ShaderVariable &x, const sh::ShaderVariable &y)
>     return gl::VariableSortOrder(x.type) < gl::VariableSortOrder(y.type);
> }
> 
>-ShaderState::ShaderState(GLenum shaderType)
>+const char *GetShaderTypeString(ShaderType type)
>+{
>+    switch (type)
>+    {
>+        case ShaderType::Vertex:
>+            return "VERTEX";
>+
>+        case ShaderType::Fragment:
>+            return "FRAGMENT";
>+
>+        case ShaderType::Compute:
>+            return "COMPUTE";
>+
>+        case ShaderType::Geometry:
>+            return "GEOMETRY";
>+
>+        default:
>+            UNREACHABLE();
>+            return "";
>+    }
>+}
>+
>+class ScopedExit final : angle::NonCopyable
>+{
>+  public:
>+    ScopedExit(std::function<void()> exit) : mExit(exit) {}
>+    ~ScopedExit() { mExit(); }
>+
>+  private:
>+    std::function<void()> mExit;
>+};
>+
>+struct Shader::CompilingState
>+{
>+    std::shared_ptr<rx::WaitableCompileEvent> compileEvent;
>+    ShCompilerInstance shCompilerInstance;
>+};
>+
>+ShaderState::ShaderState(ShaderType shaderType)
>     : mLabel(),
>       mShaderType(shaderType),
>       mShaderVersion(100),
>       mNumViews(-1),
>-      mGeometryShaderInputPrimitiveType(GL_INVALID_VALUE),
>-      mGeometryShaderOutputPrimitiveType(GL_INVALID_VALUE),
>       mGeometryShaderInvocations(1),
>-      mGeometryShaderMaxVertices(-1),
>       mCompileStatus(CompileStatus::NOT_COMPILED)
> {
>     mLocalSize.fill(-1);
> }
> 
>-ShaderState::~ShaderState()
>-{
>-}
>+ShaderState::~ShaderState() {}
> 
> Shader::Shader(ShaderProgramManager *manager,
>                rx::GLImplFactory *implFactory,
>                const gl::Limitations &rendererLimitations,
>-               GLenum type,
>+               ShaderType type,
>                GLuint handle)
>     : mState(type),
>       mImplementation(implFactory->createShader(mState)),
>@@ -104,13 +138,16 @@ Shader::Shader(ShaderProgramManager *manager,
>       mType(type),
>       mRefCount(0),
>       mDeleteStatus(false),
>-      mResourceManager(manager)
>+      mResourceManager(manager),
>+      mCurrentMaxComputeWorkGroupInvocations(0u)
> {
>     ASSERT(mImplementation);
> }
> 
> void Shader::onDestroy(const gl::Context *context)
> {
>+    resolveCompile();
>+    mImplementation->destroy();
>     mBoundCompiler.set(context, nullptr);
>     mImplementation.reset(nullptr);
>     delete this;
>@@ -121,7 +158,7 @@ Shader::~Shader()
>     ASSERT(!mImplementation);
> }
> 
>-void Shader::setLabel(const std::string &label)
>+void Shader::setLabel(const Context *context, const std::string &label)
> {
>     mState.mLabel = label;
> }
>@@ -155,9 +192,9 @@ void Shader::setSource(GLsizei count, const char *const *string, const GLint *le
>     mState.mSource = stream.str();
> }
> 
>-int Shader::getInfoLogLength(const Context *context)
>+int Shader::getInfoLogLength()
> {
>-    resolveCompile(context);
>+    resolveCompile();
>     if (mInfoLog.empty())
>     {
>         return 0;
>@@ -166,9 +203,9 @@ int Shader::getInfoLogLength(const Context *context)
>     return (static_cast<int>(mInfoLog.length()) + 1);
> }
> 
>-void Shader::getInfoLog(const Context *context, GLsizei bufSize, GLsizei *length, char *infoLog)
>+void Shader::getInfoLog(GLsizei bufSize, GLsizei *length, char *infoLog)
> {
>-    resolveCompile(context);
>+    resolveCompile();
> 
>     int index = 0;
> 
>@@ -191,9 +228,9 @@ int Shader::getSourceLength() const
>     return mState.mSource.empty() ? 0 : (static_cast<int>(mState.mSource.length()) + 1);
> }
> 
>-int Shader::getTranslatedSourceLength(const Context *context)
>+int Shader::getTranslatedSourceLength()
> {
>-    resolveCompile(context);
>+    resolveCompile();
> 
>     if (mState.mTranslatedSource.empty())
>     {
>@@ -203,9 +240,9 @@ int Shader::getTranslatedSourceLength(const Context *context)
>     return (static_cast<int>(mState.mTranslatedSource.length()) + 1);
> }
> 
>-int Shader::getTranslatedSourceWithDebugInfoLength(const Context *context)
>+int Shader::getTranslatedSourceWithDebugInfoLength()
> {
>-    resolveCompile(context);
>+    resolveCompile();
> 
>     const std::string &debugInfo = mImplementation->getDebugInfo();
>     if (debugInfo.empty())
>@@ -243,32 +280,28 @@ void Shader::getSource(GLsizei bufSize, GLsizei *length, char *buffer) const
>     GetSourceImpl(mState.mSource, bufSize, length, buffer);
> }
> 
>-void Shader::getTranslatedSource(const Context *context,
>-                                 GLsizei bufSize,
>-                                 GLsizei *length,
>-                                 char *buffer)
>+void Shader::getTranslatedSource(GLsizei bufSize, GLsizei *length, char *buffer)
> {
>-    GetSourceImpl(getTranslatedSource(context), bufSize, length, buffer);
>+    GetSourceImpl(getTranslatedSource(), bufSize, length, buffer);
> }
> 
>-const std::string &Shader::getTranslatedSource(const Context *context)
>+const std::string &Shader::getTranslatedSource()
> {
>-    resolveCompile(context);
>+    resolveCompile();
>     return mState.mTranslatedSource;
> }
> 
>-void Shader::getTranslatedSourceWithDebugInfo(const Context *context,
>-                                              GLsizei bufSize,
>-                                              GLsizei *length,
>-                                              char *buffer)
>+void Shader::getTranslatedSourceWithDebugInfo(GLsizei bufSize, GLsizei *length, char *buffer)
> {
>-    resolveCompile(context);
>+    resolveCompile();
>     const std::string &debugInfo = mImplementation->getDebugInfo();
>     GetSourceImpl(debugInfo, bufSize, length, buffer);
> }
> 
> void Shader::compile(const Context *context)
> {
>+    resolveCompile();
>+
>     mState.mTranslatedSource.clear();
>     mInfoLog.clear();
>     mState.mShaderVersion = 100;
>@@ -280,64 +313,72 @@ void Shader::compile(const Context *context)
>     mState.mActiveAttributes.clear();
>     mState.mActiveOutputVariables.clear();
>     mState.mNumViews = -1;
>-    mState.mGeometryShaderInputPrimitiveType  = GL_INVALID_VALUE;
>-    mState.mGeometryShaderOutputPrimitiveType = GL_INVALID_VALUE;
>-    mState.mGeometryShaderInvocations         = 1;
>-    mState.mGeometryShaderMaxVertices         = -1;
>+    mState.mGeometryShaderInputPrimitiveType.reset();
>+    mState.mGeometryShaderOutputPrimitiveType.reset();
>+    mState.mGeometryShaderMaxVertices.reset();
>+    mState.mGeometryShaderInvocations = 1;
> 
>     mState.mCompileStatus = CompileStatus::COMPILE_REQUESTED;
>     mBoundCompiler.set(context, context->getCompiler());
> 
>-    // Cache the compile source and options for compilation. Must be done now, since the source
>-    // can change before the link call or another call that resolves the compile.
>-
>-    std::stringstream sourceStream;
>+    ShCompileOptions options = (SH_OBJECT_CODE | SH_VARIABLES | SH_EMULATE_GL_DRAW_ID);
> 
>-    mLastCompileOptions =
>-        mImplementation->prepareSourceAndReturnOptions(&sourceStream, &mLastCompiledSourcePath);
>-    mLastCompileOptions |= (SH_OBJECT_CODE | SH_VARIABLES);
>-    mLastCompiledSource = sourceStream.str();
>-
>-    // Add default options to WebGL shaders to prevent unexpected behavior during compilation.
>+    // Add default options to WebGL shaders to prevent unexpected behavior during
>+    // compilation.
>     if (context->getExtensions().webglCompatibility)
>     {
>-        mLastCompileOptions |= SH_INIT_GL_POSITION;
>-        mLastCompileOptions |= SH_LIMIT_CALL_STACK_DEPTH;
>-        mLastCompileOptions |= SH_LIMIT_EXPRESSION_COMPLEXITY;
>-        mLastCompileOptions |= SH_ENFORCE_PACKING_RESTRICTIONS;
>+        options |= SH_INIT_GL_POSITION;
>+        options |= SH_LIMIT_CALL_STACK_DEPTH;
>+        options |= SH_LIMIT_EXPRESSION_COMPLEXITY;
>+        options |= SH_ENFORCE_PACKING_RESTRICTIONS;
>+        options |= SH_INIT_SHARED_VARIABLES;
>     }
> 
>-    // Some targets (eg D3D11 Feature Level 9_3 and below) do not support non-constant loop indexes
>-    // in fragment shaders. Shader compilation will fail. To provide a better error message we can
>-    // instruct the compiler to pre-validate.
>+    // Some targets (eg D3D11 Feature Level 9_3 and below) do not support non-constant loop
>+    // indexes in fragment shaders. Shader compilation will fail. To provide a better error
>+    // message we can instruct the compiler to pre-validate.
>     if (mRendererLimitations.shadersRequireIndexedLoopValidation)
>     {
>-        mLastCompileOptions |= SH_VALIDATE_LOOP_INDEXING;
>+        options |= SH_VALIDATE_LOOP_INDEXING;
>     }
>+
>+    mCurrentMaxComputeWorkGroupInvocations = context->getCaps().maxComputeWorkGroupInvocations;
>+
>+    ASSERT(mBoundCompiler.get());
>+    ShCompilerInstance compilerInstance = mBoundCompiler->getInstance(mState.mShaderType);
>+    ShHandle compilerHandle             = compilerInstance.getHandle();
>+    ASSERT(compilerHandle);
>+    mCompilerResourcesString = compilerInstance.getBuiltinResourcesString();
>+
>+    mCompilingState.reset(new CompilingState());
>+    mCompilingState->shCompilerInstance = std::move(compilerInstance);
>+    mCompilingState->compileEvent =
>+        mImplementation->compile(context, &(mCompilingState->shCompilerInstance), options);
> }
> 
>-void Shader::resolveCompile(const Context *context)
>+void Shader::resolveCompile()
> {
>     if (!mState.compilePending())
>     {
>         return;
>     }
> 
>-    ASSERT(mBoundCompiler.get());
>-    ShHandle compilerHandle = mBoundCompiler->getCompilerHandle(mState.mShaderType);
>+    ASSERT(mCompilingState.get());
> 
>-    std::vector<const char *> srcStrings;
>+    mCompilingState->compileEvent->wait();
> 
>-    if (!mLastCompiledSourcePath.empty())
>-    {
>-        srcStrings.push_back(mLastCompiledSourcePath.c_str());
>-    }
>+    mInfoLog += mCompilingState->compileEvent->getInfoLog();
> 
>-    srcStrings.push_back(mLastCompiledSource.c_str());
>+    ScopedExit exit([this]() {
>+        mBoundCompiler->putInstance(std::move(mCompilingState->shCompilerInstance));
>+        mCompilingState->compileEvent.reset();
>+        mCompilingState.reset();
>+    });
> 
>-    if (!sh::Compile(compilerHandle, &srcStrings[0], srcStrings.size(), mLastCompileOptions))
>+    ShHandle compilerHandle = mCompilingState->shCompilerInstance.getHandle();
>+    if (!mCompilingState->compileEvent->getResult())
>     {
>-        mInfoLog = sh::GetInfoLog(compilerHandle);
>+        mInfoLog += sh::GetInfoLog(compilerHandle);
>         WARN() << std::endl << mInfoLog;
>         mState.mCompileStatus = CompileStatus::NOT_COMPILED;
>         return;
>@@ -369,28 +410,52 @@ void Shader::resolveCompile(const Context *context)
>     // Gather the shader information
>     mState.mShaderVersion = sh::GetShaderVersion(compilerHandle);
> 
>-    mState.mUniforms        = GetShaderVariables(sh::GetUniforms(compilerHandle));
>+    mState.mUniforms            = GetShaderVariables(sh::GetUniforms(compilerHandle));
>     mState.mUniformBlocks       = GetShaderVariables(sh::GetUniformBlocks(compilerHandle));
>     mState.mShaderStorageBlocks = GetShaderVariables(sh::GetShaderStorageBlocks(compilerHandle));
> 
>     switch (mState.mShaderType)
>     {
>-        case GL_COMPUTE_SHADER:
>+        case ShaderType::Compute:
>         {
>             mState.mLocalSize = sh::GetComputeShaderLocalGroupSize(compilerHandle);
>+            if (mState.mLocalSize.isDeclared())
>+            {
>+                angle::CheckedNumeric<uint32_t> checked_local_size_product(mState.mLocalSize[0]);
>+                checked_local_size_product *= mState.mLocalSize[1];
>+                checked_local_size_product *= mState.mLocalSize[2];
>+
>+                if (!checked_local_size_product.IsValid())
>+                {
>+                    WARN() << std::endl
>+                           << "Integer overflow when computing the product of local_size_x, "
>+                           << "local_size_y and local_size_z.";
>+                    mState.mCompileStatus = CompileStatus::NOT_COMPILED;
>+                    return;
>+                }
>+                if (checked_local_size_product.ValueOrDie() >
>+                    mCurrentMaxComputeWorkGroupInvocations)
>+                {
>+                    WARN() << std::endl
>+                           << "The total number of invocations within a work group exceeds "
>+                           << "MAX_COMPUTE_WORK_GROUP_INVOCATIONS.";
>+                    mState.mCompileStatus = CompileStatus::NOT_COMPILED;
>+                    return;
>+                }
>+            }
>             break;
>         }
>-        case GL_VERTEX_SHADER:
>+        case ShaderType::Vertex:
>         {
>             {
>                 mState.mOutputVaryings = GetShaderVariables(sh::GetOutputVaryings(compilerHandle));
>-                mState.mActiveAttributes =
>-                    GetActiveShaderVariables(sh::GetAttributes(compilerHandle));
>-                mState.mNumViews = sh::GetVertexShaderNumViews(compilerHandle);
>+                mState.mAllAttributes    = GetShaderVariables(sh::GetAttributes(compilerHandle));
>+                mState.mActiveAttributes = GetActiveShaderVariables(&mState.mAllAttributes);
>+                mState.mNumViews         = sh::GetVertexShaderNumViews(compilerHandle);
>             }
>             break;
>         }
>-        case GL_FRAGMENT_SHADER:
>+        case ShaderType::Fragment:
>         {
>             mState.mInputVaryings = GetShaderVariables(sh::GetInputVaryings(compilerHandle));
>             // TODO(jmadill): Figure out why we only sort in the FS, and if we need to.
>@@ -399,17 +464,27 @@ void Shader::resolveCompile(const Context *context)
>                 GetActiveShaderVariables(sh::GetOutputVariables(compilerHandle));
>             break;
>         }
>-        case GL_GEOMETRY_SHADER_EXT:
>+        case ShaderType::Geometry:
>         {
>             mState.mInputVaryings  = GetShaderVariables(sh::GetInputVaryings(compilerHandle));
>             mState.mOutputVaryings = GetShaderVariables(sh::GetOutputVaryings(compilerHandle));
> 
>-            mState.mGeometryShaderInputPrimitiveType =
>-                sh::GetGeometryShaderInputPrimitiveType(compilerHandle);
>-            mState.mGeometryShaderOutputPrimitiveType =
>-                sh::GetGeometryShaderOutputPrimitiveType(compilerHandle);
>+            if (sh::HasValidGeometryShaderInputPrimitiveType(compilerHandle))
>+            {
>+                mState.mGeometryShaderInputPrimitiveType = FromGLenum<PrimitiveMode>(
>+                    sh::GetGeometryShaderInputPrimitiveType(compilerHandle));
>+            }
>+            if (sh::HasValidGeometryShaderOutputPrimitiveType(compilerHandle))
>+            {
>+                mState.mGeometryShaderOutputPrimitiveType = FromGLenum<PrimitiveMode>(
>+                    sh::GetGeometryShaderOutputPrimitiveType(compilerHandle));
>+            }
>+            if (sh::HasValidGeometryShaderMaxVertices(compilerHandle))
>+            {
>+                mState.mGeometryShaderMaxVertices =
>+                    sh::GetGeometryShaderMaxVertices(compilerHandle);
>+            }
>             mState.mGeometryShaderInvocations = sh::GetGeometryShaderInvocations(compilerHandle);
>-            mState.mGeometryShaderMaxVertices = sh::GetGeometryShaderMaxVertices(compilerHandle);
>             break;
>         }
>         default:
>@@ -418,7 +493,7 @@ void Shader::resolveCompile(const Context *context)
> 
>     ASSERT(!mState.mTranslatedSource.empty());
> 
>-    bool success = mImplementation->postTranslateCompile(mBoundCompiler.get(), &mInfoLog);
>+    bool success          = mCompilingState->compileEvent->postTranslate(&mInfoLog);
>     mState.mCompileStatus = success ? CompileStatus::COMPILED : CompileStatus::NOT_COMPILED;
> }
> 
>@@ -452,66 +527,76 @@ void Shader::flagForDeletion()
>     mDeleteStatus = true;
> }
> 
>-bool Shader::isCompiled(const Context *context)
>+bool Shader::isCompiled()
> {
>-    resolveCompile(context);
>+    resolveCompile();
>     return mState.mCompileStatus == CompileStatus::COMPILED;
> }
> 
>-int Shader::getShaderVersion(const Context *context)
>+bool Shader::isCompleted()
>+{
>+    return (!mState.compilePending() || mCompilingState->compileEvent->isReady());
>+}
>+
>+int Shader::getShaderVersion()
> {
>-    resolveCompile(context);
>+    resolveCompile();
>     return mState.mShaderVersion;
> }
> 
>-const std::vector<sh::Varying> &Shader::getInputVaryings(const Context *context)
>+const std::vector<sh::Varying> &Shader::getInputVaryings()
> {
>-    resolveCompile(context);
>+    resolveCompile();
>     return mState.getInputVaryings();
> }
> 
>-const std::vector<sh::Varying> &Shader::getOutputVaryings(const Context *context)
>+const std::vector<sh::Varying> &Shader::getOutputVaryings()
> {
>-    resolveCompile(context);
>+    resolveCompile();
>     return mState.getOutputVaryings();
> }
> 
>-const std::vector<sh::Uniform> &Shader::getUniforms(const Context *context)
>+const std::vector<sh::Uniform> &Shader::getUniforms()
> {
>-    resolveCompile(context);
>+    resolveCompile();
>     return mState.getUniforms();
> }
> 
>-const std::vector<sh::InterfaceBlock> &Shader::getUniformBlocks(const Context *context)
>+const std::vector<sh::InterfaceBlock> &Shader::getUniformBlocks()
> {
>-    resolveCompile(context);
>+    resolveCompile();
>     return mState.getUniformBlocks();
> }
> 
>-const std::vector<sh::InterfaceBlock> &Shader::getShaderStorageBlocks(const Context *context)
>+const std::vector<sh::InterfaceBlock> &Shader::getShaderStorageBlocks()
> {
>-    resolveCompile(context);
>+    resolveCompile();
>     return mState.getShaderStorageBlocks();
> }
> 
>-const std::vector<sh::Attribute> &Shader::getActiveAttributes(const Context *context)
>+const std::vector<sh::Attribute> &Shader::getActiveAttributes()
> {
>-    resolveCompile(context);
>+    resolveCompile();
>     return mState.getActiveAttributes();
> }
> 
>-const std::vector<sh::OutputVariable> &Shader::getActiveOutputVariables(const Context *context)
>+const std::vector<sh::Attribute> &Shader::getAllAttributes()
>+{
>+    resolveCompile();
>+    return mState.getAllAttributes();
>+}
>+
>+const std::vector<sh::OutputVariable> &Shader::getActiveOutputVariables()
> {
>-    resolveCompile(context);
>+    resolveCompile();
>     return mState.getActiveOutputVariables();
> }
> 
>-std::string Shader::getTransformFeedbackVaryingMappedName(const std::string &tfVaryingName,
>-                                                          const Context *context)
>+std::string Shader::getTransformFeedbackVaryingMappedName(const std::string &tfVaryingName)
> {
>     // TODO(jiawei.shao@intel.com): support transform feedback on geometry shader.
>-    ASSERT(mState.getShaderType() == GL_VERTEX_SHADER);
>-    const auto &varyings = getOutputVaryings(context);
>+    ASSERT(mState.getShaderType() == ShaderType::Vertex);
>+    const auto &varyings = getOutputVaryings();
>     auto bracketPos      = tfVaryingName.find("[");
>     if (bracketPos != std::string::npos)
>     {
>@@ -534,28 +619,57 @@ std::string Shader::getTransformFeedbackVaryingMappedName(const std::string &tfV
>             {
>                 return varying.mappedName;
>             }
>+            else if (varying.isStruct())
>+            {
>+                const auto *field = FindShaderVarField(varying, tfVaryingName);
>+                ASSERT(field != nullptr && !field->isStruct() && !field->isArray());
>+                return varying.mappedName + "." + field->mappedName;
>+            }
>         }
>     }
>     UNREACHABLE();
>     return std::string();
> }
> 
>-const sh::WorkGroupSize &Shader::getWorkGroupSize(const Context *context)
>+const sh::WorkGroupSize &Shader::getWorkGroupSize()
> {
>-    resolveCompile(context);
>+    resolveCompile();
>     return mState.mLocalSize;
> }
> 
>-int Shader::getNumViews(const Context *context)
>+int Shader::getNumViews()
> {
>-    resolveCompile(context);
>+    resolveCompile();
>     return mState.mNumViews;
> }
> 
>+Optional<PrimitiveMode> Shader::getGeometryShaderInputPrimitiveType()
>+{
>+    resolveCompile();
>+    return mState.mGeometryShaderInputPrimitiveType;
>+}
>+
>+Optional<PrimitiveMode> Shader::getGeometryShaderOutputPrimitiveType()
>+{
>+    resolveCompile();
>+    return mState.mGeometryShaderOutputPrimitiveType;
>+}
>+
>+int Shader::getGeometryShaderInvocations()
>+{
>+    resolveCompile();
>+    return mState.mGeometryShaderInvocations;
>+}
>+
>+Optional<GLint> Shader::getGeometryShaderMaxVertices()
>+{
>+    resolveCompile();
>+    return mState.mGeometryShaderMaxVertices;
>+}
>+
> const std::string &Shader::getCompilerResourcesString() const
> {
>-    ASSERT(mBoundCompiler.get());
>-    return mBoundCompiler->getBuiltinResourcesString(mState.mShaderType);
>+    return mCompilerResourcesString;
> }
> 
> }  // namespace gl
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/Shader.h b/Source/ThirdParty/ANGLE/src/libANGLE/Shader.h
>index 4b6be4696d0..c3d04dd54c3 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/Shader.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/Shader.h
>@@ -17,11 +17,12 @@
> #include <string>
> #include <vector>
> 
>-#include "angle_gl.h"
> #include <GLSLANG/ShaderLang.h>
>+#include "angle_gl.h"
> 
> #include "common/Optional.h"
> #include "common/angleutils.h"
>+#include "libANGLE/Compiler.h"
> #include "libANGLE/Debug.h"
> #include "libANGLE/angletypes.h"
> 
>@@ -30,15 +31,22 @@ namespace rx
> class GLImplFactory;
> class ShaderImpl;
> class ShaderSh;
>-}
>+class WaitableCompileEvent;
>+}  // namespace rx
>+
>+namespace angle
>+{
>+class WaitableEvent;
>+class WorkerThreadPool;
>+}  // namespace angle
> 
> namespace gl
> {
>-class Compiler;
>-class ContextState;
>+class CompileTask;
>+class Context;
> struct Limitations;
> class ShaderProgramManager;
>-class Context;
>+class State;
> 
> // We defer the compile until link time, or until properties are queried.
> enum class CompileStatus
>@@ -51,7 +59,7 @@ enum class CompileStatus
> class ShaderState final : angle::NonCopyable
> {
>   public:
>-    ShaderState(GLenum shaderType);
>+    ShaderState(ShaderType shaderType);
>     ~ShaderState();
> 
>     const std::string &getLabel() const { return mLabel; }
>@@ -59,7 +67,7 @@ class ShaderState final : angle::NonCopyable
>     const std::string &getSource() const { return mSource; }
>     const std::string &getTranslatedSource() const { return mTranslatedSource; }
> 
>-    GLenum getShaderType() const { return mShaderType; }
>+    ShaderType getShaderType() const { return mShaderType; }
>     int getShaderVersion() const { return mShaderVersion; }
> 
>     const std::vector<sh::Varying> &getInputVaryings() const { return mInputVaryings; }
>@@ -71,6 +79,7 @@ class ShaderState final : angle::NonCopyable
>         return mShaderStorageBlocks;
>     }
>     const std::vector<sh::Attribute> &getActiveAttributes() const { return mActiveAttributes; }
>+    const std::vector<sh::Attribute> &getAllAttributes() const { return mAllAttributes; }
>     const std::vector<sh::OutputVariable> &getActiveOutputVariables() const
>     {
>         return mActiveOutputVariables;
>@@ -83,7 +92,7 @@ class ShaderState final : angle::NonCopyable
> 
>     std::string mLabel;
> 
>-    GLenum mShaderType;
>+    ShaderType mShaderType;
>     int mShaderVersion;
>     std::string mTranslatedSource;
>     std::string mSource;
>@@ -95,6 +104,7 @@ class ShaderState final : angle::NonCopyable
>     std::vector<sh::Uniform> mUniforms;
>     std::vector<sh::InterfaceBlock> mUniformBlocks;
>     std::vector<sh::InterfaceBlock> mShaderStorageBlocks;
>+    std::vector<sh::Attribute> mAllAttributes;
>     std::vector<sh::Attribute> mActiveAttributes;
>     std::vector<sh::OutputVariable> mActiveOutputVariables;
> 
>@@ -102,10 +112,10 @@ class ShaderState final : angle::NonCopyable
>     int mNumViews;
> 
>     // Geometry Shader.
>-    GLenum mGeometryShaderInputPrimitiveType;
>-    GLenum mGeometryShaderOutputPrimitiveType;
>+    Optional<PrimitiveMode> mGeometryShaderInputPrimitiveType;
>+    Optional<PrimitiveMode> mGeometryShaderOutputPrimitiveType;
>+    Optional<GLint> mGeometryShaderMaxVertices;
>     int mGeometryShaderInvocations;
>-    int mGeometryShaderMaxVertices;
> 
>     // Indicates if this shader has been successfully compiled
>     CompileStatus mCompileStatus;
>@@ -117,39 +127,34 @@ class Shader final : angle::NonCopyable, public LabeledObject
>     Shader(ShaderProgramManager *manager,
>            rx::GLImplFactory *implFactory,
>            const gl::Limitations &rendererLimitations,
>-           GLenum type,
>+           ShaderType type,
>            GLuint handle);
> 
>     void onDestroy(const Context *context);
> 
>-    void setLabel(const std::string &label) override;
>+    void setLabel(const Context *context, const std::string &label) override;
>     const std::string &getLabel() const override;
> 
>-    GLenum getType() const { return mType; }
>+    ShaderType getType() const { return mType; }
>     GLuint getHandle() const;
> 
>     rx::ShaderImpl *getImplementation() const { return mImplementation.get(); }
> 
>     void setSource(GLsizei count, const char *const *string, const GLint *length);
>-    int getInfoLogLength(const Context *context);
>-    void getInfoLog(const Context *context, GLsizei bufSize, GLsizei *length, char *infoLog);
>+    int getInfoLogLength();
>+    void getInfoLog(GLsizei bufSize, GLsizei *length, char *infoLog);
>     int getSourceLength() const;
>     const std::string &getSourceString() const { return mState.getSource(); }
>     void getSource(GLsizei bufSize, GLsizei *length, char *buffer) const;
>-    int getTranslatedSourceLength(const Context *context);
>-    int getTranslatedSourceWithDebugInfoLength(const Context *context);
>-    const std::string &getTranslatedSource(const Context *context);
>-    void getTranslatedSource(const Context *context,
>-                             GLsizei bufSize,
>-                             GLsizei *length,
>-                             char *buffer);
>-    void getTranslatedSourceWithDebugInfo(const Context *context,
>-                                          GLsizei bufSize,
>-                                          GLsizei *length,
>-                                          char *buffer);
>+    int getTranslatedSourceLength();
>+    int getTranslatedSourceWithDebugInfoLength();
>+    const std::string &getTranslatedSource();
>+    void getTranslatedSource(GLsizei bufSize, GLsizei *length, char *buffer);
>+    void getTranslatedSourceWithDebugInfo(GLsizei bufSize, GLsizei *length, char *buffer);
> 
>     void compile(const Context *context);
>-    bool isCompiled(const Context *context);
>+    bool isCompiled();
>+    bool isCompleted();
> 
>     void addRef();
>     void release(const Context *context);
>@@ -157,56 +162,66 @@ class Shader final : angle::NonCopyable, public LabeledObject
>     bool isFlaggedForDeletion() const;
>     void flagForDeletion();
> 
>-    int getShaderVersion(const Context *context);
>+    int getShaderVersion();
> 
>-    const std::vector<sh::Varying> &getInputVaryings(const Context *context);
>-    const std::vector<sh::Varying> &getOutputVaryings(const Context *context);
>-    const std::vector<sh::Uniform> &getUniforms(const Context *context);
>-    const std::vector<sh::InterfaceBlock> &getUniformBlocks(const Context *context);
>-    const std::vector<sh::InterfaceBlock> &getShaderStorageBlocks(const Context *context);
>-    const std::vector<sh::Attribute> &getActiveAttributes(const Context *context);
>-    const std::vector<sh::OutputVariable> &getActiveOutputVariables(const Context *context);
>+    const std::vector<sh::Varying> &getInputVaryings();
>+    const std::vector<sh::Varying> &getOutputVaryings();
>+    const std::vector<sh::Uniform> &getUniforms();
>+    const std::vector<sh::InterfaceBlock> &getUniformBlocks();
>+    const std::vector<sh::InterfaceBlock> &getShaderStorageBlocks();
>+    const std::vector<sh::Attribute> &getActiveAttributes();
>+    const std::vector<sh::Attribute> &getAllAttributes();
>+    const std::vector<sh::OutputVariable> &getActiveOutputVariables();
> 
>     // Returns mapped name of a transform feedback varying. The original name may contain array
>     // brackets with an index inside, which will get copied to the mapped name. The varying must be
>     // known to be declared in the shader.
>-    std::string getTransformFeedbackVaryingMappedName(const std::string &tfVaryingName,
>-                                                      const Context *context);
>+    std::string getTransformFeedbackVaryingMappedName(const std::string &tfVaryingName);
>+
>+    const sh::WorkGroupSize &getWorkGroupSize();
> 
>-    const sh::WorkGroupSize &getWorkGroupSize(const Context *context);
>+    int getNumViews();
> 
>-    int getNumViews(const Context *context);
>+    Optional<PrimitiveMode> getGeometryShaderInputPrimitiveType();
>+    Optional<PrimitiveMode> getGeometryShaderOutputPrimitiveType();
>+    int getGeometryShaderInvocations();
>+    Optional<GLint> getGeometryShaderMaxVertices();
> 
>     const std::string &getCompilerResourcesString() const;
> 
>   private:
>+    struct CompilingState;
>+
>     ~Shader() override;
>     static void GetSourceImpl(const std::string &source,
>                               GLsizei bufSize,
>                               GLsizei *length,
>                               char *buffer);
> 
>-    void resolveCompile(const Context *context);
>+    void resolveCompile();
> 
>     ShaderState mState;
>-    std::string mLastCompiledSource;
>-    std::string mLastCompiledSourcePath;
>-    ShCompileOptions mLastCompileOptions;
>     std::unique_ptr<rx::ShaderImpl> mImplementation;
>     const gl::Limitations &mRendererLimitations;
>     const GLuint mHandle;
>-    const GLenum mType;
>-    unsigned int mRefCount;     // Number of program objects this shader is attached to
>-    bool mDeleteStatus;         // Flag to indicate that the shader can be deleted when no longer in use
>+    const ShaderType mType;
>+    unsigned int mRefCount;  // Number of program objects this shader is attached to
>+    bool mDeleteStatus;  // Flag to indicate that the shader can be deleted when no longer in use
>     std::string mInfoLog;
> 
>     // We keep a reference to the translator in order to defer compiles while preserving settings.
>     BindingPointer<Compiler> mBoundCompiler;
>+    std::unique_ptr<CompilingState> mCompilingState;
>+    std::string mCompilerResourcesString;
> 
>     ShaderProgramManager *mResourceManager;
>+
>+    GLuint mCurrentMaxComputeWorkGroupInvocations;
> };
> 
> bool CompareShaderVar(const sh::ShaderVariable &x, const sh::ShaderVariable &y);
>+
>+const char *GetShaderTypeString(ShaderType type);
> }  // namespace gl
> 
>-#endif   // LIBANGLE_SHADER_H_
>+#endif  // LIBANGLE_SHADER_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/SizedMRUCache.h b/Source/ThirdParty/ANGLE/src/libANGLE/SizedMRUCache.h
>index 6a608a697ed..945622d0039 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/SizedMRUCache.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/SizedMRUCache.h
>@@ -9,7 +9,6 @@
> #define LIBANGLE_SIZED_MRU_CACHE_H_
> 
> #include <anglebase/containers/mru_cache.h>
>-#include "common/third_party/smhasher/src/PMurHash.h"
> 
> namespace angle
> {
>@@ -22,8 +21,7 @@ class SizedMRUCache final : angle::NonCopyable
>         : mMaximumTotalSize(maximumTotalSize),
>           mCurrentSize(0),
>           mStore(SizedMRUCacheStore::NO_AUTO_EVICT)
>-    {
>-    }
>+    {}
> 
>     // Returns nullptr on failure.
>     const Value *put(const Key &key, Value &&value, size_t size)
>@@ -55,13 +53,13 @@ class SizedMRUCache final : angle::NonCopyable
>         return true;
>     }
> 
>-    bool getAt(size_t index, Key *keyOut, const Value **valueOut)
>+    bool getAt(size_t index, const Key **keyOut, const Value **valueOut)
>     {
>         if (index < mStore.size())
>         {
>             auto it = mStore.begin();
>             std::advance(it, index);
>-            *keyOut   = it->first;
>+            *keyOut   = &it->first;
>             *valueOut = &it->second.value;
>             return true;
>         }
>@@ -157,18 +155,5 @@ void TrimCache(size_t maxStates, size_t gcLimit, const char *name, T *cache)
>         cache->ShrinkToSize(maxStates / 2);
>     }
> }
>-
>-// Computes a hash of struct "key". Any structs passed to this function must be multiples of
>-// 4 bytes, since the PMurhHas32 method can only operate increments of 4-byte words.
>-template <typename T>
>-std::size_t ComputeGenericHash(const T &key)
>-{
>-    static const unsigned int seed = 0xABCDEF98;
>-
>-    // We can't support "odd" alignments.
>-    static_assert(sizeof(key) % 4 == 0, "ComputeGenericHash requires aligned types");
>-    return PMurHash32(seed, &key, sizeof(T));
>-}
>-
> }  // namespace angle
> #endif  // LIBANGLE_SIZED_MRU_CACHE_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/SizedMRUCache_unittest.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/SizedMRUCache_unittest.cpp
>index d691e48b358..5d5465c711f 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/SizedMRUCache_unittest.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/SizedMRUCache_unittest.cpp
>@@ -5,9 +5,10 @@
> //
> // SizedMRUCache_unittest.h: Unit tests for the sized MRU cached.
> 
>-#include "libANGLE/SizedMRUCache.h"
> #include <gtest/gtest.h>
> 
>+#include "libANGLE/SizedMRUCache.h"
>+
> namespace angle
> {
> 
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/State.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/State.cpp
>index f87e963710c..7223bb9de93 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/State.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/State.cpp
>@@ -8,12 +8,13 @@
> 
> #include "libANGLE/State.h"
> 
>-#include <limits>
> #include <string.h>
>+#include <limits>
> 
> #include "common/bitset_utils.h"
> #include "common/mathutil.h"
> #include "common/matrix_utils.h"
>+#include "libANGLE/Buffer.h"
> #include "libANGLE/Caps.h"
> #include "libANGLE/Context.h"
> #include "libANGLE/Debug.h"
>@@ -23,23 +24,241 @@
> #include "libANGLE/VertexArray.h"
> #include "libANGLE/formatutils.h"
> #include "libANGLE/queryconversions.h"
>+#include "libANGLE/queryutils.h"
> #include "libANGLE/renderer/ContextImpl.h"
>+#include "libANGLE/renderer/TextureImpl.h"
>+
>+namespace gl
>+{
> 
> namespace
> {
>+bool GetAlternativeQueryType(QueryType type, QueryType *alternativeType)
>+{
>+    switch (type)
>+    {
>+        case QueryType::AnySamples:
>+            *alternativeType = QueryType::AnySamplesConservative;
>+            return true;
>+        case QueryType::AnySamplesConservative:
>+            *alternativeType = QueryType::AnySamples;
>+            return true;
>+        default:
>+            return false;
>+    }
>+}
> 
>-GLenum ActiveQueryType(const GLenum type)
>+// Mapping from a buffer binding type to a dirty bit type.
>+constexpr angle::PackedEnumMap<BufferBinding, size_t> kBufferBindingDirtyBits = {{
>+    {BufferBinding::AtomicCounter, State::DIRTY_BIT_ATOMIC_COUNTER_BUFFER_BINDING},
>+    {BufferBinding::DispatchIndirect, State::DIRTY_BIT_DISPATCH_INDIRECT_BUFFER_BINDING},
>+    {BufferBinding::DrawIndirect, State::DIRTY_BIT_DRAW_INDIRECT_BUFFER_BINDING},
>+    {BufferBinding::PixelPack, State::DIRTY_BIT_PACK_BUFFER_BINDING},
>+    {BufferBinding::PixelUnpack, State::DIRTY_BIT_UNPACK_BUFFER_BINDING},
>+    {BufferBinding::ShaderStorage, State::DIRTY_BIT_SHADER_STORAGE_BUFFER_BINDING},
>+    {BufferBinding::Uniform, State::DIRTY_BIT_UNIFORM_BUFFER_BINDINGS},
>+}};
>+
>+// Returns a buffer binding function depending on if a dirty bit is set.
>+template <BufferBinding Target>
>+constexpr std::pair<BufferBinding, State::BufferBindingSetter> GetBufferBindingSetter()
> {
>-    return (type == GL_ANY_SAMPLES_PASSED_CONSERVATIVE) ? GL_ANY_SAMPLES_PASSED : type;
>+    return std::make_pair(Target, kBufferBindingDirtyBits[Target] != 0
>+                                      ? &State::setGenericBufferBindingWithBit<Target>
>+                                      : &State::setGenericBufferBinding<Target>);
> }
> 
>-}  // anonymous namepace
>+template <typename T>
>+using ContextStateMember = T *(State::*);
> 
>-namespace gl
>+template <typename T>
>+T *AllocateOrGetSharedResourceManager(const State *shareContextState, ContextStateMember<T> member)
>+{
>+    if (shareContextState)
>+    {
>+        T *resourceManager = (*shareContextState).*member;
>+        resourceManager->addRef();
>+        return resourceManager;
>+    }
>+    else
>+    {
>+        return new T();
>+    }
>+}
>+
>+TextureManager *AllocateOrGetSharedTextureManager(const State *shareContextState,
>+                                                  TextureManager *shareTextures,
>+                                                  ContextStateMember<TextureManager> member)
>+{
>+    if (shareContextState)
>+    {
>+        TextureManager *textureManager = (*shareContextState).*member;
>+        ASSERT(shareTextures == nullptr || textureManager == shareTextures);
>+        textureManager->addRef();
>+        return textureManager;
>+    }
>+    else if (shareTextures)
>+    {
>+        TextureManager *textureManager = shareTextures;
>+        textureManager->addRef();
>+        return textureManager;
>+    }
>+    else
>+    {
>+        return new TextureManager();
>+    }
>+}
>+}  // namespace
>+
>+template <typename BindingT, typename... ArgsT>
>+ANGLE_INLINE void UpdateNonTFBufferBinding(const Context *context,
>+                                           BindingT *binding,
>+                                           Buffer *buffer,
>+                                           ArgsT... args)
>+{
>+    Buffer *oldBuffer = binding->get();
>+    if (oldBuffer)
>+    {
>+        oldBuffer->onNonTFBindingChanged(-1);
>+        oldBuffer->release(context);
>+    }
>+    binding->assign(buffer, args...);
>+    if (buffer)
>+    {
>+        buffer->addRef();
>+        buffer->onNonTFBindingChanged(1);
>+    }
>+}
>+
>+template <typename BindingT, typename... ArgsT>
>+void UpdateTFBufferBinding(const Context *context, BindingT *binding, bool indexed, ArgsT... args)
>+{
>+    if (binding->get())
>+        (*binding)->onTFBindingChanged(context, false, indexed);
>+    binding->set(context, args...);
>+    if (binding->get())
>+        (*binding)->onTFBindingChanged(context, true, indexed);
>+}
>+
>+void UpdateBufferBinding(const Context *context,
>+                         BindingPointer<Buffer> *binding,
>+                         Buffer *buffer,
>+                         BufferBinding target)
>+{
>+    if (target == BufferBinding::TransformFeedback)
>+    {
>+        UpdateTFBufferBinding(context, binding, false, buffer);
>+    }
>+    else
>+    {
>+        UpdateNonTFBufferBinding(context, binding, buffer);
>+    }
>+}
>+
>+void UpdateIndexedBufferBinding(const Context *context,
>+                                OffsetBindingPointer<Buffer> *binding,
>+                                Buffer *buffer,
>+                                BufferBinding target,
>+                                GLintptr offset,
>+                                GLsizeiptr size)
>+{
>+    if (target == BufferBinding::TransformFeedback)
>+    {
>+        UpdateTFBufferBinding(context, binding, true, buffer, offset, size);
>+    }
>+    else
>+    {
>+        UpdateNonTFBufferBinding(context, binding, buffer, offset, size);
>+    }
>+}
>+
>+// These template functions must be defined before they are instantiated in kBufferSetters.
>+template <BufferBinding Target>
>+void State::setGenericBufferBindingWithBit(const Context *context, Buffer *buffer)
>+{
>+    UpdateNonTFBufferBinding(context, &mBoundBuffers[Target], buffer);
>+    mDirtyBits.set(kBufferBindingDirtyBits[Target]);
>+}
>+
>+template <BufferBinding Target>
>+void State::setGenericBufferBinding(const Context *context, Buffer *buffer)
>+{
>+    UpdateNonTFBufferBinding(context, &mBoundBuffers[Target], buffer);
>+}
>+
>+template <>
>+void State::setGenericBufferBinding<BufferBinding::TransformFeedback>(const Context *context,
>+                                                                      Buffer *buffer)
> {
>+    UpdateTFBufferBinding(context, &mBoundBuffers[BufferBinding::TransformFeedback], false, buffer);
>+}
>+
>+template <>
>+void State::setGenericBufferBinding<BufferBinding::ElementArray>(const Context *context,
>+                                                                 Buffer *buffer)
>+{
>+    Buffer *oldBuffer = mVertexArray->mState.mElementArrayBuffer.get();
>+    if (oldBuffer)
>+    {
>+        oldBuffer->removeObserver(&mVertexArray->mState.mElementArrayBuffer);
>+        oldBuffer->onNonTFBindingChanged(-1);
>+        oldBuffer->release(context);
>+    }
>+    mVertexArray->mState.mElementArrayBuffer.assign(buffer);
>+    if (buffer)
>+    {
>+        buffer->addObserver(&mVertexArray->mState.mElementArrayBuffer);
>+        buffer->onNonTFBindingChanged(1);
>+        buffer->addRef();
>+    }
>+    mVertexArray->mDirtyBits.set(VertexArray::DIRTY_BIT_ELEMENT_ARRAY_BUFFER);
>+    mVertexArray->mIndexRangeCache.invalidate();
>+    mDirtyObjects.set(DIRTY_OBJECT_VERTEX_ARRAY);
>+}
> 
>-State::State()
>-    : mMaxDrawBuffers(0),
>+const angle::PackedEnumMap<BufferBinding, State::BufferBindingSetter> State::kBufferSetters = {{
>+    GetBufferBindingSetter<BufferBinding::Array>(),
>+    GetBufferBindingSetter<BufferBinding::AtomicCounter>(),
>+    GetBufferBindingSetter<BufferBinding::CopyRead>(),
>+    GetBufferBindingSetter<BufferBinding::CopyWrite>(),
>+    GetBufferBindingSetter<BufferBinding::DispatchIndirect>(),
>+    GetBufferBindingSetter<BufferBinding::DrawIndirect>(),
>+    GetBufferBindingSetter<BufferBinding::ElementArray>(),
>+    GetBufferBindingSetter<BufferBinding::PixelPack>(),
>+    GetBufferBindingSetter<BufferBinding::PixelUnpack>(),
>+    GetBufferBindingSetter<BufferBinding::ShaderStorage>(),
>+    GetBufferBindingSetter<BufferBinding::TransformFeedback>(),
>+    GetBufferBindingSetter<BufferBinding::Uniform>(),
>+}};
>+
>+State::State(ContextID contextIn,
>+             const State *shareContextState,
>+             TextureManager *shareTextures,
>+             const Version &clientVersion,
>+             bool debug,
>+             bool bindGeneratesResource,
>+             bool clientArraysEnabled,
>+             bool robustResourceInit,
>+             bool programBinaryCacheEnabled)
>+    : mClientVersion(clientVersion),
>+      mContext(contextIn),
>+      mBufferManager(AllocateOrGetSharedResourceManager(shareContextState, &State::mBufferManager)),
>+      mShaderProgramManager(
>+          AllocateOrGetSharedResourceManager(shareContextState, &State::mShaderProgramManager)),
>+      mTextureManager(AllocateOrGetSharedTextureManager(shareContextState,
>+                                                        shareTextures,
>+                                                        &State::mTextureManager)),
>+      mRenderbufferManager(
>+          AllocateOrGetSharedResourceManager(shareContextState, &State::mRenderbufferManager)),
>+      mSamplerManager(
>+          AllocateOrGetSharedResourceManager(shareContextState, &State::mSamplerManager)),
>+      mSyncManager(AllocateOrGetSharedResourceManager(shareContextState, &State::mSyncManager)),
>+      mPathManager(AllocateOrGetSharedResourceManager(shareContextState, &State::mPathManager)),
>+      mFramebufferManager(new FramebufferManager()),
>+      mProgramPipelineManager(new ProgramPipelineManager()),
>+      mMemoryObjectManager(
>+          AllocateOrGetSharedResourceManager(shareContextState, &State::mMemoryObjectManager)),
>+      mMaxDrawBuffers(0),
>       mMaxCombinedTextureImageUnits(0),
>       mDepthClearValue(0),
>       mStencilClearValue(0),
>@@ -54,107 +273,112 @@ State::State()
>       mLineWidth(0),
>       mGenerateMipmapHint(GL_NONE),
>       mFragmentShaderDerivativeHint(GL_NONE),
>-      mBindGeneratesResource(true),
>-      mClientArraysEnabled(true),
>+      mBindGeneratesResource(bindGeneratesResource),
>+      mClientArraysEnabled(clientArraysEnabled),
>       mNearZ(0),
>       mFarZ(0),
>       mReadFramebuffer(nullptr),
>       mDrawFramebuffer(nullptr),
>       mProgram(nullptr),
>+      mProvokingVertex(gl::ProvokingVertex::LastVertexConvention),
>       mVertexArray(nullptr),
>       mActiveSampler(0),
>+      mActiveTexturesCache{},
>+      mTexturesIncompatibleWithSamplers(0),
>       mPrimitiveRestart(false),
>+      mDebug(debug),
>       mMultiSampling(false),
>       mSampleAlphaToOne(false),
>       mFramebufferSRGB(true),
>-      mRobustResourceInit(false),
>-      mProgramBinaryCacheEnabled(false)
>-{
>-}
>+      mRobustResourceInit(robustResourceInit),
>+      mProgramBinaryCacheEnabled(programBinaryCacheEnabled),
>+      mMaxShaderCompilerThreads(std::numeric_limits<GLuint>::max())
>+{}
> 
>-State::~State()
>-{
>-}
>+State::~State() {}
> 
>-void State::initialize(const Context *context,
>-                       bool debug,
>-                       bool bindGeneratesResource,
>-                       bool clientArraysEnabled,
>-                       bool robustResourceInit,
>-                       bool programBinaryCacheEnabled)
>+void State::initialize(Context *context)
> {
>-    const Caps &caps             = context->getCaps();
>-    const Extensions &extensions = context->getExtensions();
>+    const Caps &caps                   = context->getCaps();
>+    const Extensions &extensions       = context->getExtensions();
>     const Extensions &nativeExtensions = context->getImplementation()->getNativeExtensions();
>-    const Version &clientVersion = context->getClientVersion();
>+    const Version &clientVersion       = context->getClientVersion();
> 
>-    mMaxDrawBuffers = caps.maxDrawBuffers;
>+    mMaxDrawBuffers               = caps.maxDrawBuffers;
>     mMaxCombinedTextureImageUnits = caps.maxCombinedTextureImageUnits;
> 
>     setColorClearValue(0.0f, 0.0f, 0.0f, 0.0f);
> 
>-    mDepthClearValue = 1.0f;
>+    mDepthClearValue   = 1.0f;
>     mStencilClearValue = 0;
> 
>-    mScissorTest = false;
>-    mScissor.x = 0;
>-    mScissor.y = 0;
>-    mScissor.width = 0;
>+    mScissorTest    = false;
>+    mScissor.x      = 0;
>+    mScissor.y      = 0;
>+    mScissor.width  = 0;
>     mScissor.height = 0;
> 
>-    mBlendColor.red = 0;
>+    mBlendColor.red   = 0;
>     mBlendColor.green = 0;
>-    mBlendColor.blue = 0;
>+    mBlendColor.blue  = 0;
>     mBlendColor.alpha = 0;
> 
>-    mStencilRef = 0;
>+    mStencilRef     = 0;
>     mStencilBackRef = 0;
> 
>-    mSampleCoverage = false;
>-    mSampleCoverageValue = 1.0f;
>+    mSampleCoverage       = false;
>+    mSampleCoverageValue  = 1.0f;
>     mSampleCoverageInvert = false;
> 
>     mMaxSampleMaskWords = caps.maxSampleMaskWords;
>     mSampleMask         = false;
>     mSampleMaskValues.fill(~GLbitfield(0));
> 
>-    mGenerateMipmapHint = GL_DONT_CARE;
>+    mGenerateMipmapHint           = GL_DONT_CARE;
>     mFragmentShaderDerivativeHint = GL_DONT_CARE;
> 
>-    mBindGeneratesResource = bindGeneratesResource;
>-    mClientArraysEnabled   = clientArraysEnabled;
>-
>     mLineWidth = 1.0f;
> 
>-    mViewport.x = 0;
>-    mViewport.y = 0;
>-    mViewport.width = 0;
>+    mViewport.x      = 0;
>+    mViewport.y      = 0;
>+    mViewport.width  = 0;
>     mViewport.height = 0;
>-    mNearZ = 0.0f;
>-    mFarZ = 1.0f;
>+    mNearZ           = 0.0f;
>+    mFarZ            = 1.0f;
> 
>-    mBlend.colorMaskRed = true;
>+    mBlend.colorMaskRed   = true;
>     mBlend.colorMaskGreen = true;
>-    mBlend.colorMaskBlue = true;
>+    mBlend.colorMaskBlue  = true;
>     mBlend.colorMaskAlpha = true;
> 
>     mActiveSampler = 0;
> 
>     mVertexAttribCurrentValues.resize(caps.maxVertexAttributes);
> 
>+    // Set all indexes in state attributes type mask to float (default)
>+    for (int i = 0; i < MAX_VERTEX_ATTRIBS; i++)
>+    {
>+        SetComponentTypeMask(ComponentType::Float, i, &mCurrentValuesTypeMask);
>+    }
>+
>     mUniformBuffers.resize(caps.maxUniformBufferBindings);
> 
>-    mSamplerTextures[GL_TEXTURE_2D].resize(caps.maxCombinedTextureImageUnits);
>-    mSamplerTextures[GL_TEXTURE_CUBE_MAP].resize(caps.maxCombinedTextureImageUnits);
>+    mSamplerTextures[TextureType::_2D].resize(caps.maxCombinedTextureImageUnits);
>+    mSamplerTextures[TextureType::CubeMap].resize(caps.maxCombinedTextureImageUnits);
>     if (clientVersion >= Version(3, 0))
>     {
>         // TODO: These could also be enabled via extension
>-        mSamplerTextures[GL_TEXTURE_2D_ARRAY].resize(caps.maxCombinedTextureImageUnits);
>-        mSamplerTextures[GL_TEXTURE_3D].resize(caps.maxCombinedTextureImageUnits);
>+        mSamplerTextures[TextureType::_2DArray].resize(caps.maxCombinedTextureImageUnits);
>+        mSamplerTextures[TextureType::_3D].resize(caps.maxCombinedTextureImageUnits);
>+    }
>+    if (clientVersion >= Version(3, 1) || nativeExtensions.textureMultisample)
>+    {
>+        mSamplerTextures[TextureType::_2DMultisample].resize(caps.maxCombinedTextureImageUnits);
>     }
>     if (clientVersion >= Version(3, 1))
>     {
>-        mSamplerTextures[GL_TEXTURE_2D_MULTISAMPLE].resize(caps.maxCombinedTextureImageUnits);
>+        mSamplerTextures[TextureType::_2DMultisampleArray].resize(
>+            caps.maxCombinedTextureImageUnits);
> 
>         mAtomicCounterBuffers.resize(caps.maxAtomicCounterBufferBindings);
>         mShaderStorageBuffers.resize(caps.maxShaderStorageBufferBindings);
>@@ -162,28 +386,25 @@ void State::initialize(const Context *context,
>     }
>     if (nativeExtensions.textureRectangle)
>     {
>-        mSamplerTextures[GL_TEXTURE_RECTANGLE_ANGLE].resize(caps.maxCombinedTextureImageUnits);
>+        mSamplerTextures[TextureType::Rectangle].resize(caps.maxCombinedTextureImageUnits);
>     }
>     if (nativeExtensions.eglImageExternal || nativeExtensions.eglStreamConsumerExternal)
>     {
>-        mSamplerTextures[GL_TEXTURE_EXTERNAL_OES].resize(caps.maxCombinedTextureImageUnits);
>+        mSamplerTextures[TextureType::External].resize(caps.maxCombinedTextureImageUnits);
>     }
>-    mCompleteTextureCache.resize(caps.maxCombinedTextureImageUnits, nullptr);
>     mCompleteTextureBindings.reserve(caps.maxCombinedTextureImageUnits);
>-    mCachedTexturesInitState = InitState::MayNeedInit;
>     for (uint32_t textureIndex = 0; textureIndex < caps.maxCombinedTextureImageUnits;
>          ++textureIndex)
>     {
>-        mCompleteTextureBindings.emplace_back(OnAttachmentDirtyBinding(this, textureIndex));
>+        mCompleteTextureBindings.emplace_back(context, textureIndex);
>     }
> 
>     mSamplers.resize(caps.maxCombinedTextureImageUnits);
> 
>-    mActiveQueries[GL_ANY_SAMPLES_PASSED].set(context, nullptr);
>-    mActiveQueries[GL_ANY_SAMPLES_PASSED_CONSERVATIVE].set(context, nullptr);
>-    mActiveQueries[GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN].set(context, nullptr);
>-    mActiveQueries[GL_TIME_ELAPSED_EXT].set(context, nullptr);
>-    mActiveQueries[GL_COMMANDS_COMPLETED_CHROMIUM].set(context, nullptr);
>+    for (QueryType type : angle::AllEnums<QueryType>())
>+    {
>+        mActiveQueries[type].set(context, nullptr);
>+    }
> 
>     mProgram = nullptr;
> 
>@@ -192,7 +413,6 @@ void State::initialize(const Context *context,
> 
>     mPrimitiveRestart = false;
> 
>-    mDebug.setOutputEnabled(debug);
>     mDebug.setMaxLoggedMessages(extensions.maxDebugLoggedMessages);
> 
>     mMultiSampling    = true;
>@@ -206,18 +426,21 @@ void State::initialize(const Context *context,
>     mPathStencilRef  = 0;
>     mPathStencilMask = std::numeric_limits<GLuint>::max();
> 
>-    mRobustResourceInit = robustResourceInit;
>-    mProgramBinaryCacheEnabled = programBinaryCacheEnabled;
>+    // GLES1 emulation: Initialize state for GLES1 if version
>+    // applies
>+    if (clientVersion < Version(2, 0))
>+    {
>+        mGLES1State.initialize(context, this);
>+    }
> }
> 
> void State::reset(const Context *context)
> {
>     for (auto &bindingVec : mSamplerTextures)
>     {
>-        TextureBindingVector &textureVector = bindingVec.second;
>-        for (size_t textureIdx = 0; textureIdx < textureVector.size(); textureIdx++)
>+        for (size_t textureIdx = 0; textureIdx < bindingVec.size(); textureIdx++)
>         {
>-            textureVector[textureIdx].set(context, nullptr);
>+            bindingVec[textureIdx].set(context, nullptr);
>         }
>     }
>     for (size_t samplerIdx = 0; samplerIdx < mSamplers.size(); samplerIdx++)
>@@ -239,7 +462,7 @@ void State::reset(const Context *context)
> 
>     for (auto type : angle::AllEnums<BufferBinding>())
>     {
>-        mBoundBuffers[type].set(context, nullptr);
>+        UpdateBufferBinding(context, &mBoundBuffers[type], nullptr, type);
>     }
> 
>     if (mProgram)
>@@ -250,26 +473,28 @@ void State::reset(const Context *context)
> 
>     mProgramPipeline.set(context, nullptr);
> 
>+    if (mTransformFeedback.get())
>+        mTransformFeedback->onBindingChanged(context, false);
>     mTransformFeedback.set(context, nullptr);
> 
>-    for (State::ActiveQueryMap::iterator i = mActiveQueries.begin(); i != mActiveQueries.end(); i++)
>+    for (QueryType type : angle::AllEnums<QueryType>())
>     {
>-        i->second.set(context, nullptr);
>+        mActiveQueries[type].set(context, nullptr);
>     }
> 
>     for (auto &buf : mUniformBuffers)
>     {
>-        buf.set(context, nullptr);
>+        UpdateIndexedBufferBinding(context, &buf, nullptr, BufferBinding::Uniform, 0, 0);
>     }
> 
>     for (auto &buf : mAtomicCounterBuffers)
>     {
>-        buf.set(context, nullptr);
>+        UpdateIndexedBufferBinding(context, &buf, nullptr, BufferBinding::AtomicCounter, 0, 0);
>     }
> 
>     for (auto &buf : mShaderStorageBuffers)
>     {
>-        buf.set(context, nullptr);
>+        UpdateIndexedBufferBinding(context, &buf, nullptr, BufferBinding::ShaderStorage, 0, 0);
>     }
> 
>     angle::Matrix<GLfloat>::setToIdentity(mPathMatrixProj);
>@@ -278,10 +503,78 @@ void State::reset(const Context *context)
>     mPathStencilRef  = 0;
>     mPathStencilMask = std::numeric_limits<GLuint>::max();
> 
>-    // TODO(jmadill): Is this necessary?
>     setAllDirtyBits();
> }
> 
>+ANGLE_INLINE void State::unsetActiveTextures(ActiveTextureMask textureMask)
>+{
>+    // Unset any relevant bound textures.
>+    for (size_t textureIndex : mProgram->getActiveSamplersMask())
>+    {
>+        mActiveTexturesCache[textureIndex] = nullptr;
>+        mCompleteTextureBindings[textureIndex].reset();
>+    }
>+}
>+
>+ANGLE_INLINE void State::updateActiveTextureState(const Context *context,
>+                                                  size_t textureIndex,
>+                                                  const Sampler *sampler,
>+                                                  Texture *texture)
>+{
>+    if (!texture->isSamplerComplete(context, sampler))
>+    {
>+        mActiveTexturesCache[textureIndex] = nullptr;
>+    }
>+    else
>+    {
>+        mActiveTexturesCache[textureIndex] = texture;
>+
>+        if (texture->hasAnyDirtyBit())
>+        {
>+            setTextureDirty(textureIndex);
>+        }
>+
>+        if (mRobustResourceInit && texture->initState() == InitState::MayNeedInit)
>+        {
>+            mDirtyObjects.set(DIRTY_OBJECT_TEXTURES_INIT);
>+        }
>+    }
>+
>+    if (mProgram)
>+    {
>+        const SamplerState &samplerState =
>+            sampler ? sampler->getSamplerState() : texture->getSamplerState();
>+        mTexturesIncompatibleWithSamplers[textureIndex] =
>+            !texture->getTextureState().compatibleWithSamplerFormat(
>+                mProgram->getState().getSamplerFormatForTextureUnitIndex(textureIndex),
>+                samplerState);
>+    }
>+    else
>+    {
>+        mTexturesIncompatibleWithSamplers[textureIndex] = false;
>+    }
>+
>+    mDirtyBits.set(DIRTY_BIT_TEXTURE_BINDINGS);
>+}
>+
>+ANGLE_INLINE void State::updateActiveTexture(const Context *context,
>+                                             size_t textureIndex,
>+                                             Texture *texture)
>+{
>+    const Sampler *sampler = mSamplers[textureIndex].get();
>+
>+    mCompleteTextureBindings[textureIndex].bind(texture);
>+
>+    if (!texture)
>+    {
>+        mActiveTexturesCache[textureIndex] = nullptr;
>+        mDirtyBits.set(DIRTY_BIT_TEXTURE_BINDINGS);
>+        return;
>+    }
>+
>+    updateActiveTextureState(context, textureIndex, sampler, texture);
>+}
>+
> const RasterizerState &State::getRasterizerState() const
> {
>     return mRasterizer;
>@@ -299,9 +592,9 @@ const DepthStencilState &State::getDepthStencilState() const
> 
> void State::setColorClearValue(float red, float green, float blue, float alpha)
> {
>-    mColorClearValue.red = red;
>+    mColorClearValue.red   = red;
>     mColorClearValue.green = green;
>-    mColorClearValue.blue = blue;
>+    mColorClearValue.blue  = blue;
>     mColorClearValue.alpha = alpha;
>     mDirtyBits.set(DIRTY_BIT_CLEAR_COLOR);
> }
>@@ -320,9 +613,9 @@ void State::setStencilClearValue(int stencil)
> 
> void State::setColorMask(bool red, bool green, bool blue, bool alpha)
> {
>-    mBlend.colorMaskRed = red;
>+    mBlend.colorMaskRed   = red;
>     mBlend.colorMaskGreen = green;
>-    mBlend.colorMaskBlue = blue;
>+    mBlend.colorMaskBlue  = blue;
>     mBlend.colorMaskAlpha = alpha;
>     mDirtyBits.set(DIRTY_BIT_COLOR_MASK);
> }
>@@ -333,22 +626,12 @@ void State::setDepthMask(bool mask)
>     mDirtyBits.set(DIRTY_BIT_DEPTH_MASK);
> }
> 
>-bool State::isRasterizerDiscardEnabled() const
>-{
>-    return mRasterizer.rasterizerDiscard;
>-}
>-
> void State::setRasterizerDiscard(bool enabled)
> {
>     mRasterizer.rasterizerDiscard = enabled;
>     mDirtyBits.set(DIRTY_BIT_RASTERIZER_DISCARD_ENABLED);
> }
> 
>-bool State::isCullFaceEnabled() const
>-{
>-    return mRasterizer.cullFace;
>-}
>-
> void State::setCullFace(bool enabled)
> {
>     mRasterizer.cullFace = enabled;
>@@ -367,11 +650,6 @@ void State::setFrontFace(GLenum front)
>     mDirtyBits.set(DIRTY_BIT_FRONT_FACE);
> }
> 
>-bool State::isDepthTestEnabled() const
>-{
>-    return mDepthStencil.depthTest;
>-}
>-
> void State::setDepthTest(bool enabled)
> {
>     mDepthStencil.depthTest = enabled;
>@@ -380,32 +658,17 @@ void State::setDepthTest(bool enabled)
> 
> void State::setDepthFunc(GLenum depthFunc)
> {
>-     mDepthStencil.depthFunc = depthFunc;
>-     mDirtyBits.set(DIRTY_BIT_DEPTH_FUNC);
>+    mDepthStencil.depthFunc = depthFunc;
>+    mDirtyBits.set(DIRTY_BIT_DEPTH_FUNC);
> }
> 
> void State::setDepthRange(float zNear, float zFar)
> {
>     mNearZ = zNear;
>-    mFarZ = zFar;
>+    mFarZ  = zFar;
>     mDirtyBits.set(DIRTY_BIT_DEPTH_RANGE);
> }
> 
>-float State::getNearPlane() const
>-{
>-    return mNearZ;
>-}
>-
>-float State::getFarPlane() const
>-{
>-    return mFarZ;
>-}
>-
>-bool State::isBlendEnabled() const
>-{
>-    return mBlend.blend;
>-}
>-
> void State::setBlend(bool enabled)
> {
>     mBlend.blend = enabled;
>@@ -414,39 +677,29 @@ void State::setBlend(bool enabled)
> 
> void State::setBlendFactors(GLenum sourceRGB, GLenum destRGB, GLenum sourceAlpha, GLenum destAlpha)
> {
>-    mBlend.sourceBlendRGB = sourceRGB;
>-    mBlend.destBlendRGB = destRGB;
>+    mBlend.sourceBlendRGB   = sourceRGB;
>+    mBlend.destBlendRGB     = destRGB;
>     mBlend.sourceBlendAlpha = sourceAlpha;
>-    mBlend.destBlendAlpha = destAlpha;
>+    mBlend.destBlendAlpha   = destAlpha;
>     mDirtyBits.set(DIRTY_BIT_BLEND_FUNCS);
> }
> 
> void State::setBlendColor(float red, float green, float blue, float alpha)
> {
>-    mBlendColor.red = red;
>+    mBlendColor.red   = red;
>     mBlendColor.green = green;
>-    mBlendColor.blue = blue;
>+    mBlendColor.blue  = blue;
>     mBlendColor.alpha = alpha;
>     mDirtyBits.set(DIRTY_BIT_BLEND_COLOR);
> }
> 
> void State::setBlendEquation(GLenum rgbEquation, GLenum alphaEquation)
> {
>-    mBlend.blendEquationRGB = rgbEquation;
>+    mBlend.blendEquationRGB   = rgbEquation;
>     mBlend.blendEquationAlpha = alphaEquation;
>     mDirtyBits.set(DIRTY_BIT_BLEND_EQUATIONS);
> }
> 
>-const ColorF &State::getBlendColor() const
>-{
>-    return mBlendColor;
>-}
>-
>-bool State::isStencilTestEnabled() const
>-{
>-    return mDepthStencil.stencilTest;
>-}
>-
> void State::setStencilTest(bool enabled)
> {
>     mDepthStencil.stencilTest = enabled;
>@@ -456,15 +709,17 @@ void State::setStencilTest(bool enabled)
> void State::setStencilParams(GLenum stencilFunc, GLint stencilRef, GLuint stencilMask)
> {
>     mDepthStencil.stencilFunc = stencilFunc;
>-    mStencilRef = (stencilRef > 0) ? stencilRef : 0;
>+    mStencilRef               = gl::clamp(stencilRef, 0, std::numeric_limits<uint8_t>::max());
>     mDepthStencil.stencilMask = stencilMask;
>     mDirtyBits.set(DIRTY_BIT_STENCIL_FUNCS_FRONT);
> }
> 
>-void State::setStencilBackParams(GLenum stencilBackFunc, GLint stencilBackRef, GLuint stencilBackMask)
>+void State::setStencilBackParams(GLenum stencilBackFunc,
>+                                 GLint stencilBackRef,
>+                                 GLuint stencilBackMask)
> {
>     mDepthStencil.stencilBackFunc = stencilBackFunc;
>-    mStencilBackRef = (stencilBackRef > 0) ? stencilBackRef : 0;
>+    mStencilBackRef = gl::clamp(stencilBackRef, 0, std::numeric_limits<uint8_t>::max());
>     mDepthStencil.stencilBackMask = stencilBackMask;
>     mDirtyBits.set(DIRTY_BIT_STENCIL_FUNCS_BACK);
> }
>@@ -481,37 +736,26 @@ void State::setStencilBackWritemask(GLuint stencilBackWritemask)
>     mDirtyBits.set(DIRTY_BIT_STENCIL_WRITEMASK_BACK);
> }
> 
>-void State::setStencilOperations(GLenum stencilFail, GLenum stencilPassDepthFail, GLenum stencilPassDepthPass)
>+void State::setStencilOperations(GLenum stencilFail,
>+                                 GLenum stencilPassDepthFail,
>+                                 GLenum stencilPassDepthPass)
> {
>-    mDepthStencil.stencilFail = stencilFail;
>+    mDepthStencil.stencilFail          = stencilFail;
>     mDepthStencil.stencilPassDepthFail = stencilPassDepthFail;
>     mDepthStencil.stencilPassDepthPass = stencilPassDepthPass;
>     mDirtyBits.set(DIRTY_BIT_STENCIL_OPS_FRONT);
> }
> 
>-void State::setStencilBackOperations(GLenum stencilBackFail, GLenum stencilBackPassDepthFail, GLenum stencilBackPassDepthPass)
>+void State::setStencilBackOperations(GLenum stencilBackFail,
>+                                     GLenum stencilBackPassDepthFail,
>+                                     GLenum stencilBackPassDepthPass)
> {
>-    mDepthStencil.stencilBackFail = stencilBackFail;
>+    mDepthStencil.stencilBackFail          = stencilBackFail;
>     mDepthStencil.stencilBackPassDepthFail = stencilBackPassDepthFail;
>     mDepthStencil.stencilBackPassDepthPass = stencilBackPassDepthPass;
>     mDirtyBits.set(DIRTY_BIT_STENCIL_OPS_BACK);
> }
> 
>-GLint State::getStencilRef() const
>-{
>-    return mStencilRef;
>-}
>-
>-GLint State::getStencilBackRef() const
>-{
>-    return mStencilBackRef;
>-}
>-
>-bool State::isPolygonOffsetFillEnabled() const
>-{
>-    return mRasterizer.polygonOffsetFill;
>-}
>-
> void State::setPolygonOffsetFill(bool enabled)
> {
>     mRasterizer.polygonOffsetFill = enabled;
>@@ -522,26 +766,16 @@ void State::setPolygonOffsetParams(GLfloat factor, GLfloat units)
> {
>     // An application can pass NaN values here, so handle this gracefully
>     mRasterizer.polygonOffsetFactor = factor != factor ? 0.0f : factor;
>-    mRasterizer.polygonOffsetUnits = units != units ? 0.0f : units;
>+    mRasterizer.polygonOffsetUnits  = units != units ? 0.0f : units;
>     mDirtyBits.set(DIRTY_BIT_POLYGON_OFFSET);
> }
> 
>-bool State::isSampleAlphaToCoverageEnabled() const
>-{
>-    return mBlend.sampleAlphaToCoverage;
>-}
>-
> void State::setSampleAlphaToCoverage(bool enabled)
> {
>     mBlend.sampleAlphaToCoverage = enabled;
>     mDirtyBits.set(DIRTY_BIT_SAMPLE_ALPHA_TO_COVERAGE_ENABLED);
> }
> 
>-bool State::isSampleCoverageEnabled() const
>-{
>-    return mSampleCoverage;
>-}
>-
> void State::setSampleCoverage(bool enabled)
> {
>     mSampleCoverage = enabled;
>@@ -550,26 +784,11 @@ void State::setSampleCoverage(bool enabled)
> 
> void State::setSampleCoverageParams(GLclampf value, bool invert)
> {
>-    mSampleCoverageValue = value;
>+    mSampleCoverageValue  = value;
>     mSampleCoverageInvert = invert;
>     mDirtyBits.set(DIRTY_BIT_SAMPLE_COVERAGE);
> }
> 
>-GLclampf State::getSampleCoverageValue() const
>-{
>-    return mSampleCoverageValue;
>-}
>-
>-bool State::getSampleCoverageInvert() const
>-{
>-    return mSampleCoverageInvert;
>-}
>-
>-bool State::isSampleMaskEnabled() const
>-{
>-    return mSampleMask;
>-}
>-
> void State::setSampleMaskEnabled(bool enabled)
> {
>     mSampleMask = enabled;
>@@ -584,44 +803,18 @@ void State::setSampleMaskParams(GLuint maskNumber, GLbitfield mask)
>     mDirtyBits.set(DIRTY_BIT_SAMPLE_MASK);
> }
> 
>-GLbitfield State::getSampleMaskWord(GLuint maskNumber) const
>-{
>-    ASSERT(maskNumber < mMaxSampleMaskWords);
>-    return mSampleMaskValues[maskNumber];
>-}
>-
>-GLuint State::getMaxSampleMaskWords() const
>-{
>-    return mMaxSampleMaskWords;
>-}
>-
> void State::setSampleAlphaToOne(bool enabled)
> {
>     mSampleAlphaToOne = enabled;
>     mDirtyBits.set(DIRTY_BIT_SAMPLE_ALPHA_TO_ONE);
> }
> 
>-bool State::isSampleAlphaToOneEnabled() const
>-{
>-    return mSampleAlphaToOne;
>-}
>-
> void State::setMultisampling(bool enabled)
> {
>     mMultiSampling = enabled;
>     mDirtyBits.set(DIRTY_BIT_MULTISAMPLING);
> }
> 
>-bool State::isMultisamplingEnabled() const
>-{
>-    return mMultiSampling;
>-}
>-
>-bool State::isScissorTestEnabled() const
>-{
>-    return mScissorTest;
>-}
>-
> void State::setScissorTest(bool enabled)
> {
>     mScissorTest = enabled;
>@@ -630,34 +823,19 @@ void State::setScissorTest(bool enabled)
> 
> void State::setScissorParams(GLint x, GLint y, GLsizei width, GLsizei height)
> {
>-    mScissor.x = x;
>-    mScissor.y = y;
>-    mScissor.width = width;
>+    mScissor.x      = x;
>+    mScissor.y      = y;
>+    mScissor.width  = width;
>     mScissor.height = height;
>     mDirtyBits.set(DIRTY_BIT_SCISSOR);
> }
> 
>-const Rectangle &State::getScissor() const
>-{
>-    return mScissor;
>-}
>-
>-bool State::isDitherEnabled() const
>-{
>-    return mBlend.dither;
>-}
>-
> void State::setDither(bool enabled)
> {
>     mBlend.dither = enabled;
>     mDirtyBits.set(DIRTY_BIT_DITHER_ENABLED);
> }
> 
>-bool State::isPrimitiveRestartEnabled() const
>-{
>-    return mPrimitiveRestart;
>-}
>-
> void State::setPrimitiveRestart(bool enabled)
> {
>     mPrimitiveRestart = enabled;
>@@ -668,32 +846,115 @@ void State::setEnableFeature(GLenum feature, bool enabled)
> {
>     switch (feature)
>     {
>-      case GL_MULTISAMPLE_EXT:               setMultisampling(enabled);         break;
>-      case GL_SAMPLE_ALPHA_TO_ONE_EXT:       setSampleAlphaToOne(enabled);      break;
>-      case GL_CULL_FACE:                     setCullFace(enabled);              break;
>-      case GL_POLYGON_OFFSET_FILL:           setPolygonOffsetFill(enabled);     break;
>-      case GL_SAMPLE_ALPHA_TO_COVERAGE:      setSampleAlphaToCoverage(enabled); break;
>-      case GL_SAMPLE_COVERAGE:               setSampleCoverage(enabled);        break;
>-      case GL_SCISSOR_TEST:                  setScissorTest(enabled);           break;
>-      case GL_STENCIL_TEST:                  setStencilTest(enabled);           break;
>-      case GL_DEPTH_TEST:                    setDepthTest(enabled);             break;
>-      case GL_BLEND:                         setBlend(enabled);                 break;
>-      case GL_DITHER:                        setDither(enabled);                break;
>-      case GL_PRIMITIVE_RESTART_FIXED_INDEX: setPrimitiveRestart(enabled);      break;
>-      case GL_RASTERIZER_DISCARD:            setRasterizerDiscard(enabled);     break;
>-      case GL_SAMPLE_MASK:
>-          setSampleMaskEnabled(enabled);
>-          break;
>-      case GL_DEBUG_OUTPUT_SYNCHRONOUS:
>-          mDebug.setOutputSynchronous(enabled);
>-          break;
>-      case GL_DEBUG_OUTPUT:
>-          mDebug.setOutputEnabled(enabled);
>-          break;
>-      case GL_FRAMEBUFFER_SRGB_EXT:
>-          setFramebufferSRGB(enabled);
>-          break;
>-      default:                               UNREACHABLE();
>+        case GL_MULTISAMPLE_EXT:
>+            setMultisampling(enabled);
>+            break;
>+        case GL_SAMPLE_ALPHA_TO_ONE_EXT:
>+            setSampleAlphaToOne(enabled);
>+            break;
>+        case GL_CULL_FACE:
>+            setCullFace(enabled);
>+            break;
>+        case GL_POLYGON_OFFSET_FILL:
>+            setPolygonOffsetFill(enabled);
>+            break;
>+        case GL_SAMPLE_ALPHA_TO_COVERAGE:
>+            setSampleAlphaToCoverage(enabled);
>+            break;
>+        case GL_SAMPLE_COVERAGE:
>+            setSampleCoverage(enabled);
>+            break;
>+        case GL_SCISSOR_TEST:
>+            setScissorTest(enabled);
>+            break;
>+        case GL_STENCIL_TEST:
>+            setStencilTest(enabled);
>+            break;
>+        case GL_DEPTH_TEST:
>+            setDepthTest(enabled);
>+            break;
>+        case GL_BLEND:
>+            setBlend(enabled);
>+            break;
>+        case GL_DITHER:
>+            setDither(enabled);
>+            break;
>+        case GL_PRIMITIVE_RESTART_FIXED_INDEX:
>+            setPrimitiveRestart(enabled);
>+            break;
>+        case GL_RASTERIZER_DISCARD:
>+            setRasterizerDiscard(enabled);
>+            break;
>+        case GL_SAMPLE_MASK:
>+            setSampleMaskEnabled(enabled);
>+            break;
>+        case GL_DEBUG_OUTPUT_SYNCHRONOUS:
>+            mDebug.setOutputSynchronous(enabled);
>+            break;
>+        case GL_DEBUG_OUTPUT:
>+            mDebug.setOutputEnabled(enabled);
>+            break;
>+        case GL_FRAMEBUFFER_SRGB_EXT:
>+            setFramebufferSRGB(enabled);
>+            break;
>+
>+        // GLES1 emulation
>+        case GL_ALPHA_TEST:
>+            mGLES1State.mAlphaTestEnabled = enabled;
>+            break;
>+        case GL_TEXTURE_2D:
>+            mGLES1State.mTexUnitEnables[mActiveSampler].set(TextureType::_2D, enabled);
>+            break;
>+        case GL_TEXTURE_CUBE_MAP:
>+            mGLES1State.mTexUnitEnables[mActiveSampler].set(TextureType::CubeMap, enabled);
>+            break;
>+        case GL_LIGHTING:
>+            mGLES1State.mLightingEnabled = enabled;
>+            break;
>+        case GL_LIGHT0:
>+        case GL_LIGHT1:
>+        case GL_LIGHT2:
>+        case GL_LIGHT3:
>+        case GL_LIGHT4:
>+        case GL_LIGHT5:
>+        case GL_LIGHT6:
>+        case GL_LIGHT7:
>+            mGLES1State.mLights[feature - GL_LIGHT0].enabled = enabled;
>+            break;
>+        case GL_NORMALIZE:
>+            mGLES1State.mNormalizeEnabled = enabled;
>+            break;
>+        case GL_RESCALE_NORMAL:
>+            mGLES1State.mRescaleNormalEnabled = enabled;
>+            break;
>+        case GL_COLOR_MATERIAL:
>+            mGLES1State.mColorMaterialEnabled = enabled;
>+            break;
>+        case GL_CLIP_PLANE0:
>+        case GL_CLIP_PLANE1:
>+        case GL_CLIP_PLANE2:
>+        case GL_CLIP_PLANE3:
>+        case GL_CLIP_PLANE4:
>+        case GL_CLIP_PLANE5:
>+            mGLES1State.mClipPlanes[feature - GL_CLIP_PLANE0].enabled = enabled;
>+            break;
>+        case GL_FOG:
>+            mGLES1State.mFogEnabled = enabled;
>+            break;
>+        case GL_POINT_SMOOTH:
>+            mGLES1State.mPointSmoothEnabled = enabled;
>+            break;
>+        case GL_LINE_SMOOTH:
>+            mGLES1State.mLineSmoothEnabled = enabled;
>+            break;
>+        case GL_POINT_SPRITE_OES:
>+            mGLES1State.mPointSpriteEnabled = enabled;
>+            break;
>+        case GL_COLOR_LOGIC_OP:
>+            mGLES1State.mLogicOpEnabled = enabled;
>+            break;
>+        default:
>+            UNREACHABLE();
>     }
> }
> 
>@@ -701,39 +962,103 @@ bool State::getEnableFeature(GLenum feature) const
> {
>     switch (feature)
>     {
>-      case GL_MULTISAMPLE_EXT:               return isMultisamplingEnabled();
>-      case GL_SAMPLE_ALPHA_TO_ONE_EXT:       return isSampleAlphaToOneEnabled();
>-      case GL_CULL_FACE:                     return isCullFaceEnabled();
>-      case GL_POLYGON_OFFSET_FILL:           return isPolygonOffsetFillEnabled();
>-      case GL_SAMPLE_ALPHA_TO_COVERAGE:      return isSampleAlphaToCoverageEnabled();
>-      case GL_SAMPLE_COVERAGE:               return isSampleCoverageEnabled();
>-      case GL_SCISSOR_TEST:                  return isScissorTestEnabled();
>-      case GL_STENCIL_TEST:                  return isStencilTestEnabled();
>-      case GL_DEPTH_TEST:                    return isDepthTestEnabled();
>-      case GL_BLEND:                         return isBlendEnabled();
>-      case GL_DITHER:                        return isDitherEnabled();
>-      case GL_PRIMITIVE_RESTART_FIXED_INDEX: return isPrimitiveRestartEnabled();
>-      case GL_RASTERIZER_DISCARD:            return isRasterizerDiscardEnabled();
>-      case GL_SAMPLE_MASK:
>-          return isSampleMaskEnabled();
>-      case GL_DEBUG_OUTPUT_SYNCHRONOUS:
>-          return mDebug.isOutputSynchronous();
>-      case GL_DEBUG_OUTPUT:
>-          return mDebug.isOutputEnabled();
>-      case GL_BIND_GENERATES_RESOURCE_CHROMIUM:
>-          return isBindGeneratesResourceEnabled();
>-      case GL_CLIENT_ARRAYS_ANGLE:
>-          return areClientArraysEnabled();
>-      case GL_FRAMEBUFFER_SRGB_EXT:
>-          return getFramebufferSRGB();
>-      case GL_ROBUST_RESOURCE_INITIALIZATION_ANGLE:
>-          return mRobustResourceInit;
>-      case GL_PROGRAM_CACHE_ENABLED_ANGLE:
>-          return mProgramBinaryCacheEnabled;
>-
>-      default:
>-          UNREACHABLE();
>-          return false;
>+        case GL_MULTISAMPLE_EXT:
>+            return isMultisamplingEnabled();
>+        case GL_SAMPLE_ALPHA_TO_ONE_EXT:
>+            return isSampleAlphaToOneEnabled();
>+        case GL_CULL_FACE:
>+            return isCullFaceEnabled();
>+        case GL_POLYGON_OFFSET_FILL:
>+            return isPolygonOffsetFillEnabled();
>+        case GL_SAMPLE_ALPHA_TO_COVERAGE:
>+            return isSampleAlphaToCoverageEnabled();
>+        case GL_SAMPLE_COVERAGE:
>+            return isSampleCoverageEnabled();
>+        case GL_SCISSOR_TEST:
>+            return isScissorTestEnabled();
>+        case GL_STENCIL_TEST:
>+            return isStencilTestEnabled();
>+        case GL_DEPTH_TEST:
>+            return isDepthTestEnabled();
>+        case GL_BLEND:
>+            return isBlendEnabled();
>+        case GL_DITHER:
>+            return isDitherEnabled();
>+        case GL_PRIMITIVE_RESTART_FIXED_INDEX:
>+            return isPrimitiveRestartEnabled();
>+        case GL_RASTERIZER_DISCARD:
>+            return isRasterizerDiscardEnabled();
>+        case GL_SAMPLE_MASK:
>+            return isSampleMaskEnabled();
>+        case GL_DEBUG_OUTPUT_SYNCHRONOUS:
>+            return mDebug.isOutputSynchronous();
>+        case GL_DEBUG_OUTPUT:
>+            return mDebug.isOutputEnabled();
>+        case GL_BIND_GENERATES_RESOURCE_CHROMIUM:
>+            return isBindGeneratesResourceEnabled();
>+        case GL_CLIENT_ARRAYS_ANGLE:
>+            return areClientArraysEnabled();
>+        case GL_FRAMEBUFFER_SRGB_EXT:
>+            return getFramebufferSRGB();
>+        case GL_ROBUST_RESOURCE_INITIALIZATION_ANGLE:
>+            return mRobustResourceInit;
>+        case GL_PROGRAM_CACHE_ENABLED_ANGLE:
>+            return mProgramBinaryCacheEnabled;
>+
>+        // GLES1 emulation
>+        case GL_ALPHA_TEST:
>+            return mGLES1State.mAlphaTestEnabled;
>+        case GL_VERTEX_ARRAY:
>+            return mGLES1State.mVertexArrayEnabled;
>+        case GL_NORMAL_ARRAY:
>+            return mGLES1State.mNormalArrayEnabled;
>+        case GL_COLOR_ARRAY:
>+            return mGLES1State.mColorArrayEnabled;
>+        case GL_POINT_SIZE_ARRAY_OES:
>+            return mGLES1State.mPointSizeArrayEnabled;
>+        case GL_TEXTURE_COORD_ARRAY:
>+            return mGLES1State.mTexCoordArrayEnabled[mGLES1State.mClientActiveTexture];
>+        case GL_TEXTURE_2D:
>+            return mGLES1State.mTexUnitEnables[mActiveSampler].test(TextureType::_2D);
>+        case GL_TEXTURE_CUBE_MAP:
>+            return mGLES1State.mTexUnitEnables[mActiveSampler].test(TextureType::CubeMap);
>+        case GL_LIGHTING:
>+            return mGLES1State.mLightingEnabled;
>+        case GL_LIGHT0:
>+        case GL_LIGHT1:
>+        case GL_LIGHT2:
>+        case GL_LIGHT3:
>+        case GL_LIGHT4:
>+        case GL_LIGHT5:
>+        case GL_LIGHT6:
>+        case GL_LIGHT7:
>+            return mGLES1State.mLights[feature - GL_LIGHT0].enabled;
>+        case GL_NORMALIZE:
>+            return mGLES1State.mNormalizeEnabled;
>+        case GL_RESCALE_NORMAL:
>+            return mGLES1State.mRescaleNormalEnabled;
>+        case GL_COLOR_MATERIAL:
>+            return mGLES1State.mColorMaterialEnabled;
>+        case GL_CLIP_PLANE0:
>+        case GL_CLIP_PLANE1:
>+        case GL_CLIP_PLANE2:
>+        case GL_CLIP_PLANE3:
>+        case GL_CLIP_PLANE4:
>+        case GL_CLIP_PLANE5:
>+            return mGLES1State.mClipPlanes[feature - GL_CLIP_PLANE0].enabled;
>+        case GL_FOG:
>+            return mGLES1State.mFogEnabled;
>+        case GL_POINT_SMOOTH:
>+            return mGLES1State.mPointSmoothEnabled;
>+        case GL_LINE_SMOOTH:
>+            return mGLES1State.mLineSmoothEnabled;
>+        case GL_POINT_SPRITE_OES:
>+            return mGLES1State.mPointSpriteEnabled;
>+        case GL_COLOR_LOGIC_OP:
>+            return mGLES1State.mLogicOpEnabled;
>+        default:
>+            UNREACHABLE();
>+            return false;
>     }
> }
> 
>@@ -743,11 +1068,6 @@ void State::setLineWidth(GLfloat width)
>     mDirtyBits.set(DIRTY_BIT_LINE_WIDTH);
> }
> 
>-float State::getLineWidth() const
>-{
>-    return mLineWidth;
>-}
>-
> void State::setGenerateMipmapHint(GLenum hint)
> {
>     mGenerateMipmapHint = hint;
>@@ -763,66 +1083,42 @@ void State::setFragmentShaderDerivativeHint(GLenum hint)
>     // Ignore for now. It is valid for implementations to ignore hint.
> }
> 
>-bool State::isBindGeneratesResourceEnabled() const
>-{
>-    return mBindGeneratesResource;
>-}
>-
>-bool State::areClientArraysEnabled() const
>-{
>-    return mClientArraysEnabled;
>-}
>-
> void State::setViewportParams(GLint x, GLint y, GLsizei width, GLsizei height)
> {
>-    mViewport.x = x;
>-    mViewport.y = y;
>-    mViewport.width = width;
>+    mViewport.x      = x;
>+    mViewport.y      = y;
>+    mViewport.width  = width;
>     mViewport.height = height;
>     mDirtyBits.set(DIRTY_BIT_VIEWPORT);
> }
> 
>-const Rectangle &State::getViewport() const
>-{
>-    return mViewport;
>-}
>-
> void State::setActiveSampler(unsigned int active)
> {
>     mActiveSampler = active;
> }
> 
>-unsigned int State::getActiveSampler() const
>-{
>-    return static_cast<unsigned int>(mActiveSampler);
>-}
>-
>-void State::setSamplerTexture(const Context *context, GLenum type, Texture *texture)
>+void State::setSamplerTexture(const Context *context, TextureType type, Texture *texture)
> {
>     mSamplerTextures[type][mActiveSampler].set(context, texture);
>-    mDirtyBits.set(DIRTY_BIT_TEXTURE_BINDINGS);
>-    mDirtyObjects.set(DIRTY_OBJECT_PROGRAM_TEXTURES);
>-}
> 
>-Texture *State::getTargetTexture(GLenum target) const
>-{
>-    return getSamplerTexture(static_cast<unsigned int>(mActiveSampler), target);
>+    if (mProgram && mProgram->getActiveSamplersMask()[mActiveSampler] &&
>+        mProgram->getActiveSamplerTypes()[mActiveSampler] == type)
>+    {
>+        updateActiveTexture(context, mActiveSampler, texture);
>+    }
>+
>+    mDirtyBits.set(DIRTY_BIT_TEXTURE_BINDINGS);
> }
> 
>-Texture *State::getSamplerTexture(unsigned int sampler, GLenum type) const
>+Texture *State::getTargetTexture(TextureType type) const
> {
>-    const auto it = mSamplerTextures.find(type);
>-    ASSERT(it != mSamplerTextures.end());
>-    ASSERT(sampler < it->second.size());
>-    return it->second[sampler].get();
>+    return getSamplerTexture(static_cast<unsigned int>(mActiveSampler), type);
> }
> 
>-GLuint State::getSamplerTextureId(unsigned int sampler, GLenum type) const
>+GLuint State::getSamplerTextureId(unsigned int sampler, TextureType type) const
> {
>-    const auto it = mSamplerTextures.find(type);
>-    ASSERT(it != mSamplerTextures.end());
>-    ASSERT(sampler < it->second.size());
>-    return it->second[sampler].id();
>+    ASSERT(sampler < mSamplerTextures[type].size());
>+    return mSamplerTextures[type][sampler].id();
> }
> 
> void State::detachTexture(const Context *context, const TextureMap &zeroTextures, GLuint texture)
>@@ -833,22 +1129,26 @@ void State::detachTexture(const Context *context, const TextureMap &zeroTextures
>     // the ResourceManager.
> 
>     // [OpenGL ES 2.0.24] section 3.8 page 84:
>-    // If a texture object is deleted, it is as if all texture units which are bound to that texture object are
>-    // rebound to texture object zero
>+    // If a texture object is deleted, it is as if all texture units which are bound to that texture
>+    // object are rebound to texture object zero
> 
>-    for (auto &bindingVec : mSamplerTextures)
>+    for (TextureType type : angle::AllEnums<TextureType>())
>     {
>-        GLenum textureType = bindingVec.first;
>-        TextureBindingVector &textureVector = bindingVec.second;
>-        for (BindingPointer<Texture> &binding : textureVector)
>+        TextureBindingVector &textureVector = mSamplerTextures[type];
>+
>+        for (size_t bindingIndex = 0; bindingIndex < textureVector.size(); ++bindingIndex)
>         {
>+            BindingPointer<Texture> &binding = textureVector[bindingIndex];
>             if (binding.id() == texture)
>             {
>-                auto it = zeroTextures.find(textureType);
>-                ASSERT(it != zeroTextures.end());
>                 // Zero textures are the "default" textures instead of NULL
>-                binding.set(context, it->second.get());
>-                mDirtyBits.set(DIRTY_BIT_TEXTURE_BINDINGS);
>+                Texture *zeroTexture = zeroTextures[type].get();
>+                ASSERT(zeroTexture != nullptr);
>+                if (mCompleteTextureBindings[bindingIndex].getSubject() == binding.get())
>+                {
>+                    updateActiveTexture(context, bindingIndex, zeroTexture);
>+                }
>+                binding.set(context, zeroTexture);
>             }
>         }
>     }
>@@ -868,9 +1168,9 @@ void State::detachTexture(const Context *context, const TextureMap &zeroTextures
>     }
> 
>     // [OpenGL ES 2.0.24] section 4.4 page 112:
>-    // If a texture object is deleted while its image is attached to the currently bound framebuffer, then it is
>-    // as if Texture2DAttachment had been called, with a texture of 0, for each attachment point to which this
>-    // image was attached in the currently bound framebuffer.
>+    // If a texture object is deleted while its image is attached to the currently bound
>+    // framebuffer, then it is as if Texture2DAttachment had been called, with a texture of 0, for
>+    // each attachment point to which this image was attached in the currently bound framebuffer.
> 
>     if (mReadFramebuffer && mReadFramebuffer->detachTexture(context, texture))
>     {
>@@ -879,19 +1179,17 @@ void State::detachTexture(const Context *context, const TextureMap &zeroTextures
> 
>     if (mDrawFramebuffer && mDrawFramebuffer->detachTexture(context, texture))
>     {
>-        mDirtyObjects.set(DIRTY_OBJECT_DRAW_FRAMEBUFFER);
>+        setDrawFramebufferDirty();
>     }
> }
> 
> void State::initializeZeroTextures(const Context *context, const TextureMap &zeroTextures)
> {
>-    for (const auto &zeroTexture : zeroTextures)
>+    for (TextureType type : angle::AllEnums<TextureType>())
>     {
>-        auto &samplerTextureArray = mSamplerTextures[zeroTexture.first];
>-
>-        for (size_t textureUnit = 0; textureUnit < samplerTextureArray.size(); ++textureUnit)
>+        for (size_t textureUnit = 0; textureUnit < mSamplerTextures[type].size(); ++textureUnit)
>         {
>-            samplerTextureArray[textureUnit].set(context, zeroTexture.second.get());
>+            mSamplerTextures[type][textureUnit].set(context, zeroTextures[type].get());
>         }
>     }
> }
>@@ -900,18 +1198,10 @@ void State::setSamplerBinding(const Context *context, GLuint textureUnit, Sample
> {
>     mSamplers[textureUnit].set(context, sampler);
>     mDirtyBits.set(DIRTY_BIT_SAMPLER_BINDINGS);
>-    mDirtyObjects.set(DIRTY_OBJECT_PROGRAM_TEXTURES);
>-}
>-
>-GLuint State::getSamplerId(GLuint textureUnit) const
>-{
>-    ASSERT(textureUnit < mSamplers.size());
>-    return mSamplers[textureUnit].id();
>-}
>-
>-Sampler *State::getSampler(GLuint textureUnit) const
>-{
>-    return mSamplers[textureUnit].get();
>+    // This is overly conservative as it assumes the sampler has never been bound.
>+    setSamplerDirty(textureUnit);
>+    onActiveTextureChange(context, textureUnit);
>+    onActiveTextureStateChange(context, textureUnit);
> }
> 
> void State::detachSampler(const Context *context, GLuint sampler)
>@@ -920,12 +1210,11 @@ void State::detachSampler(const Context *context, GLuint sampler)
>     // If a sampler object that is currently bound to one or more texture units is
>     // deleted, it is as though BindSampler is called once for each texture unit to
>     // which the sampler is bound, with unit set to the texture unit and sampler set to zero.
>-    for (BindingPointer<Sampler> &samplerBinding : mSamplers)
>+    for (size_t i = 0; i < mSamplers.size(); i++)
>     {
>-        if (samplerBinding.id() == sampler)
>+        if (mSamplers[i].id() == sampler)
>         {
>-            samplerBinding.set(context, nullptr);
>-            mDirtyBits.set(DIRTY_BIT_SAMPLER_BINDINGS);
>+            setSamplerBinding(context, i, nullptr);
>         }
>     }
> }
>@@ -936,21 +1225,11 @@ void State::setRenderbufferBinding(const Context *context, Renderbuffer *renderb
>     mDirtyBits.set(DIRTY_BIT_RENDERBUFFER_BINDING);
> }
> 
>-GLuint State::getRenderbufferId() const
>-{
>-    return mRenderbuffer.id();
>-}
>-
>-Renderbuffer *State::getCurrentRenderbuffer() const
>-{
>-    return mRenderbuffer.get();
>-}
>-
> void State::detachRenderbuffer(const Context *context, GLuint renderbuffer)
> {
>     // [OpenGL ES 2.0.24] section 4.4 page 109:
>-    // If a renderbuffer that is currently bound to RENDERBUFFER is deleted, it is as though BindRenderbuffer
>-    // had been executed with the target RENDERBUFFER and name of zero.
>+    // If a renderbuffer that is currently bound to RENDERBUFFER is deleted, it is as though
>+    // BindRenderbuffer had been executed with the target RENDERBUFFER and name of zero.
> 
>     if (mRenderbuffer.id() == renderbuffer)
>     {
>@@ -958,9 +1237,10 @@ void State::detachRenderbuffer(const Context *context, GLuint renderbuffer)
>     }
> 
>     // [OpenGL ES 2.0.24] section 4.4 page 111:
>-    // If a renderbuffer object is deleted while its image is attached to the currently bound framebuffer,
>-    // then it is as if FramebufferRenderbuffer had been called, with a renderbuffer of 0, for each attachment
>-    // point to which this image was attached in the currently bound framebuffer.
>+    // If a renderbuffer object is deleted while its image is attached to the currently bound
>+    // framebuffer, then it is as if FramebufferRenderbuffer had been called, with a renderbuffer of
>+    // 0, for each attachment point to which this image was attached in the currently bound
>+    // framebuffer.
> 
>     Framebuffer *readFramebuffer = mReadFramebuffer;
>     Framebuffer *drawFramebuffer = mDrawFramebuffer;
>@@ -974,10 +1254,9 @@ void State::detachRenderbuffer(const Context *context, GLuint renderbuffer)
>     {
>         if (drawFramebuffer->detachRenderbuffer(context, renderbuffer))
>         {
>-            mDirtyObjects.set(DIRTY_OBJECT_DRAW_FRAMEBUFFER);
>+            setDrawFramebufferDirty();
>         }
>     }
>-
> }
> 
> void State::setReadFramebufferBinding(Framebuffer *framebuffer)
>@@ -1002,9 +1281,17 @@ void State::setDrawFramebufferBinding(Framebuffer *framebuffer)
>     mDrawFramebuffer = framebuffer;
>     mDirtyBits.set(DIRTY_BIT_DRAW_FRAMEBUFFER_BINDING);
> 
>-    if (mDrawFramebuffer && mDrawFramebuffer->hasAnyDirtyBit())
>+    if (mDrawFramebuffer)
>     {
>-        mDirtyObjects.set(DIRTY_OBJECT_DRAW_FRAMEBUFFER);
>+        if (mDrawFramebuffer->hasAnyDirtyBit())
>+        {
>+            mDirtyObjects.set(DIRTY_OBJECT_DRAW_FRAMEBUFFER);
>+        }
>+
>+        if (mRobustResourceInit && mDrawFramebuffer->hasResourceThatNeedsInit())
>+        {
>+            mDirtyObjects.set(DIRTY_OBJECT_DRAW_ATTACHMENTS);
>+        }
>     }
> }
> 
>@@ -1023,20 +1310,9 @@ Framebuffer *State::getTargetFramebuffer(GLenum target) const
>     }
> }
> 
>-Framebuffer *State::getReadFramebuffer() const
>-{
>-    return mReadFramebuffer;
>-}
>-
>-Framebuffer *State::getDrawFramebuffer() const
>-{
>-    return mDrawFramebuffer;
>-}
>-
> bool State::removeReadFramebufferBinding(GLuint framebuffer)
> {
>-    if (mReadFramebuffer != nullptr &&
>-        mReadFramebuffer->id() == framebuffer)
>+    if (mReadFramebuffer != nullptr && mReadFramebuffer->id() == framebuffer)
>     {
>         setReadFramebufferBinding(nullptr);
>         return true;
>@@ -1047,8 +1323,7 @@ bool State::removeReadFramebufferBinding(GLuint framebuffer)
> 
> bool State::removeDrawFramebufferBinding(GLuint framebuffer)
> {
>-    if (mReadFramebuffer != nullptr &&
>-        mDrawFramebuffer->id() == framebuffer)
>+    if (mReadFramebuffer != nullptr && mDrawFramebuffer->id() == framebuffer)
>     {
>         setDrawFramebufferBinding(nullptr);
>         return true;
>@@ -1057,9 +1332,15 @@ bool State::removeDrawFramebufferBinding(GLuint framebuffer)
>     return false;
> }
> 
>-void State::setVertexArrayBinding(VertexArray *vertexArray)
>+void State::setVertexArrayBinding(const Context *context, VertexArray *vertexArray)
> {
>+    if (mVertexArray == vertexArray)
>+        return;
>+    if (mVertexArray)
>+        mVertexArray->onBindingChanged(context, -1);
>     mVertexArray = vertexArray;
>+    if (vertexArray)
>+        vertexArray->onBindingChanged(context, 1);
>     mDirtyBits.set(DIRTY_BIT_VERTEX_ARRAY_BINDING);
> 
>     if (mVertexArray && mVertexArray->hasAnyDirtyBit())
>@@ -1068,22 +1349,11 @@ void State::setVertexArrayBinding(VertexArray *vertexArray)
>     }
> }
> 
>-GLuint State::getVertexArrayId() const
>-{
>-    ASSERT(mVertexArray != nullptr);
>-    return mVertexArray->id();
>-}
>-
>-VertexArray *State::getVertexArray() const
>-{
>-    ASSERT(mVertexArray != nullptr);
>-    return mVertexArray;
>-}
>-
>-bool State::removeVertexArrayBinding(GLuint vertexArray)
>+bool State::removeVertexArrayBinding(const Context *context, GLuint vertexArray)
> {
>-    if (mVertexArray->id() == vertexArray)
>+    if (mVertexArray && mVertexArray->id() == vertexArray)
>     {
>+        mVertexArray->onBindingChanged(context, -1);
>         mVertexArray = nullptr;
>         mDirtyBits.set(DIRTY_BIT_VERTEX_ARRAY_BINDING);
>         mDirtyObjects.set(DIRTY_OBJECT_VERTEX_ARRAY);
>@@ -1093,6 +1363,12 @@ bool State::removeVertexArrayBinding(GLuint vertexArray)
>     return false;
> }
> 
>+GLuint State::getVertexArrayId() const
>+{
>+    ASSERT(mVertexArray != nullptr);
>+    return mVertexArray->id();
>+}
>+
> void State::bindVertexBuffer(const Context *context,
>                              GLuint bindingIndex,
>                              Buffer *boundBuffer,
>@@ -1103,15 +1379,9 @@ void State::bindVertexBuffer(const Context *context,
>     mDirtyObjects.set(DIRTY_OBJECT_VERTEX_ARRAY);
> }
> 
>-void State::setVertexAttribBinding(const Context *context, GLuint attribIndex, GLuint bindingIndex)
>-{
>-    getVertexArray()->setVertexAttribBinding(context, attribIndex, bindingIndex);
>-    mDirtyObjects.set(DIRTY_OBJECT_VERTEX_ARRAY);
>-}
>-
> void State::setVertexAttribFormat(GLuint attribIndex,
>                                   GLint size,
>-                                  GLenum type,
>+                                  VertexAttribType type,
>                                   bool normalized,
>                                   bool pureInteger,
>                                   GLuint relativeOffset)
>@@ -1127,12 +1397,13 @@ void State::setVertexBindingDivisor(GLuint bindingIndex, GLuint divisor)
>     mDirtyObjects.set(DIRTY_OBJECT_VERTEX_ARRAY);
> }
> 
>-void State::setProgram(const Context *context, Program *newProgram)
>+angle::Result State::setProgram(const Context *context, Program *newProgram)
> {
>     if (mProgram != newProgram)
>     {
>         if (mProgram)
>         {
>+            unsetActiveTextures(mProgram->getActiveSamplersMask());
>             mProgram->release(context);
>         }
> 
>@@ -1141,39 +1412,37 @@ void State::setProgram(const Context *context, Program *newProgram)
>         if (mProgram)
>         {
>             newProgram->addRef();
>-            mDirtyObjects.set(DIRTY_OBJECT_PROGRAM_TEXTURES);
>+            ANGLE_TRY(onProgramExecutableChange(context, newProgram));
>         }
>-        mDirtyBits.set(DIRTY_BIT_PROGRAM_EXECUTABLE);
>+
>+        // Note that rendering is undefined if glUseProgram(0) is called. But ANGLE will generate
>+        // an error if the app tries to draw in this case.
>+
>         mDirtyBits.set(DIRTY_BIT_PROGRAM_BINDING);
>     }
>-}
> 
>-Program *State::getProgram() const
>-{
>-    return mProgram;
>+    return angle::Result::Continue;
> }
> 
> void State::setTransformFeedbackBinding(const Context *context,
>                                         TransformFeedback *transformFeedback)
> {
>+    if (transformFeedback == mTransformFeedback.get())
>+        return;
>+    if (mTransformFeedback.get())
>+        mTransformFeedback->onBindingChanged(context, false);
>     mTransformFeedback.set(context, transformFeedback);
>-}
>-
>-TransformFeedback *State::getCurrentTransformFeedback() const
>-{
>-    return mTransformFeedback.get();
>-}
>-
>-bool State::isTransformFeedbackActiveUnpaused() const
>-{
>-    TransformFeedback *curTransformFeedback = getCurrentTransformFeedback();
>-    return curTransformFeedback && curTransformFeedback->isActive() && !curTransformFeedback->isPaused();
>+    if (mTransformFeedback.get())
>+        mTransformFeedback->onBindingChanged(context, true);
>+    mDirtyBits.set(DIRTY_BIT_TRANSFORM_FEEDBACK_BINDING);
> }
> 
> bool State::removeTransformFeedbackBinding(const Context *context, GLuint transformFeedback)
> {
>     if (mTransformFeedback.id() == transformFeedback)
>     {
>+        if (mTransformFeedback.get())
>+            mTransformFeedback->onBindingChanged(context, false);
>         mTransformFeedback.set(context, nullptr);
>         return true;
>     }
>@@ -1191,15 +1460,19 @@ void State::detachProgramPipeline(const Context *context, GLuint pipeline)
>     mProgramPipeline.set(context, nullptr);
> }
> 
>-bool State::isQueryActive(const GLenum type) const
>+bool State::isQueryActive(QueryType type) const
> {
>-    for (auto &iter : mActiveQueries)
>+    const Query *query = mActiveQueries[type].get();
>+    if (query != nullptr)
>     {
>-        const Query *query = iter.second.get();
>-        if (query != nullptr && ActiveQueryType(query->getType()) == ActiveQueryType(type))
>-        {
>-            return true;
>-        }
>+        return true;
>+    }
>+
>+    QueryType alternativeType;
>+    if (GetAlternativeQueryType(type, &alternativeType))
>+    {
>+        query = mActiveQueries[alternativeType].get();
>+        return query != nullptr;
>     }
> 
>     return false;
>@@ -1207,9 +1480,9 @@ bool State::isQueryActive(const GLenum type) const
> 
> bool State::isQueryActive(Query *query) const
> {
>-    for (auto &iter : mActiveQueries)
>+    for (auto &queryPointer : mActiveQueries)
>     {
>-        if (iter.second.get() == query)
>+        if (queryPointer.get() == query)
>         {
>             return true;
>         }
>@@ -1218,85 +1491,55 @@ bool State::isQueryActive(Query *query) const
>     return false;
> }
> 
>-void State::setActiveQuery(const Context *context, GLenum target, Query *query)
>+void State::setActiveQuery(const Context *context, QueryType type, Query *query)
> {
>-    mActiveQueries[target].set(context, query);
>+    mActiveQueries[type].set(context, query);
> }
> 
>-GLuint State::getActiveQueryId(GLenum target) const
>+GLuint State::getActiveQueryId(QueryType type) const
> {
>-    const Query *query = getActiveQuery(target);
>+    const Query *query = getActiveQuery(type);
>     return (query ? query->id() : 0u);
> }
> 
>-Query *State::getActiveQuery(GLenum target) const
>+Query *State::getActiveQuery(QueryType type) const
> {
>-    const auto it = mActiveQueries.find(target);
>-
>-    // All query types should already exist in the activeQueries map
>-    ASSERT(it != mActiveQueries.end());
>-
>-    return it->second.get();
>+    return mActiveQueries[type].get();
> }
> 
>-void State::setBufferBinding(const Context *context, BufferBinding target, Buffer *buffer)
>-{
>-    switch (target)
>-    {
>-        case BufferBinding::PixelPack:
>-            mBoundBuffers[target].set(context, buffer);
>-            mDirtyBits.set(DIRTY_BIT_PACK_BUFFER_BINDING);
>-            break;
>-        case BufferBinding::PixelUnpack:
>-            mBoundBuffers[target].set(context, buffer);
>-            mDirtyBits.set(DIRTY_BIT_UNPACK_BUFFER_BINDING);
>-            break;
>-        case BufferBinding::DrawIndirect:
>-            mBoundBuffers[target].set(context, buffer);
>-            mDirtyBits.set(DIRTY_BIT_DRAW_INDIRECT_BUFFER_BINDING);
>-            break;
>-        case BufferBinding::TransformFeedback:
>-            if (mTransformFeedback.get() != nullptr)
>-            {
>-                mTransformFeedback->bindGenericBuffer(context, buffer);
>-            }
>-            break;
>-        case BufferBinding::ElementArray:
>-            getVertexArray()->setElementArrayBuffer(context, buffer);
>-            mDirtyObjects.set(DIRTY_OBJECT_VERTEX_ARRAY);
>-            break;
>-        default:
>-            mBoundBuffers[target].set(context, buffer);
>-            break;
>-    }
>-}
>-void State::setIndexedBufferBinding(const Context *context,
>-                                    BufferBinding target,
>-                                    GLuint index,
>-                                    Buffer *buffer,
>-                                    GLintptr offset,
>-                                    GLsizeiptr size)
>+angle::Result State::setIndexedBufferBinding(const Context *context,
>+                                             BufferBinding target,
>+                                             GLuint index,
>+                                             Buffer *buffer,
>+                                             GLintptr offset,
>+                                             GLsizeiptr size)
> {
>     setBufferBinding(context, target, buffer);
> 
>     switch (target)
>     {
>         case BufferBinding::TransformFeedback:
>-            mTransformFeedback->bindIndexedBuffer(context, index, buffer, offset, size);
>+            ANGLE_TRY(mTransformFeedback->bindIndexedBuffer(context, index, buffer, offset, size));
>+            setBufferBinding(context, target, buffer);
>             break;
>         case BufferBinding::Uniform:
>-            mUniformBuffers[index].set(context, buffer, offset, size);
>+            UpdateIndexedBufferBinding(context, &mUniformBuffers[index], buffer, target, offset,
>+                                       size);
>             break;
>         case BufferBinding::AtomicCounter:
>-            mAtomicCounterBuffers[index].set(context, buffer, offset, size);
>+            UpdateIndexedBufferBinding(context, &mAtomicCounterBuffers[index], buffer, target,
>+                                       offset, size);
>             break;
>         case BufferBinding::ShaderStorage:
>-            mShaderStorageBuffers[index].set(context, buffer, offset, size);
>+            UpdateIndexedBufferBinding(context, &mShaderStorageBuffers[index], buffer, target,
>+                                       offset, size);
>             break;
>         default:
>             UNREACHABLE();
>             break;
>     }
>+
>+    return angle::Result::Continue;
> }
> 
> const OffsetBindingPointer<Buffer> &State::getIndexedUniformBuffer(size_t index) const
>@@ -1317,36 +1560,58 @@ const OffsetBindingPointer<Buffer> &State::getIndexedShaderStorageBuffer(size_t
>     return mShaderStorageBuffers[index];
> }
> 
>-Buffer *State::getTargetBuffer(BufferBinding target) const
>+angle::Result State::detachBuffer(Context *context, const Buffer *buffer)
> {
>-    switch (target)
>+    if (!buffer->isBound())
>     {
>-        case BufferBinding::ElementArray:
>-            return getVertexArray()->getElementArrayBuffer().get();
>-        case BufferBinding::TransformFeedback:
>-            return mTransformFeedback->getGenericBuffer().get();
>-        default:
>-            return mBoundBuffers[target].get();
>+        return angle::Result::Continue;
>     }
>-}
>-
>-void State::detachBuffer(const Context *context, GLuint bufferName)
>-{
>-    for (auto &buffer : mBoundBuffers)
>+    GLuint bufferName = buffer->id();
>+    for (auto target : angle::AllEnums<BufferBinding>())
>     {
>-        if (buffer.id() == bufferName)
>+        if (mBoundBuffers[target].id() == bufferName)
>         {
>-            buffer.set(context, nullptr);
>+            UpdateBufferBinding(context, &mBoundBuffers[target], nullptr, target);
>         }
>     }
> 
>     TransformFeedback *curTransformFeedback = getCurrentTransformFeedback();
>     if (curTransformFeedback)
>     {
>-        curTransformFeedback->detachBuffer(context, bufferName);
>+        ANGLE_TRY(curTransformFeedback->detachBuffer(context, bufferName));
>     }
> 
>-    getVertexArray()->detachBuffer(context, bufferName);
>+    if (getVertexArray()->detachBuffer(context, bufferName))
>+    {
>+        mDirtyObjects.set(DIRTY_OBJECT_VERTEX_ARRAY);
>+        context->getStateCache().onVertexArrayStateChange(context);
>+    }
>+
>+    for (auto &buf : mUniformBuffers)
>+    {
>+        if (buf.id() == bufferName)
>+        {
>+            UpdateIndexedBufferBinding(context, &buf, nullptr, BufferBinding::Uniform, 0, 0);
>+        }
>+    }
>+
>+    for (auto &buf : mAtomicCounterBuffers)
>+    {
>+        if (buf.id() == bufferName)
>+        {
>+            UpdateIndexedBufferBinding(context, &buf, nullptr, BufferBinding::AtomicCounter, 0, 0);
>+        }
>+    }
>+
>+    for (auto &buf : mShaderStorageBuffers)
>+    {
>+        if (buf.id() == bufferName)
>+        {
>+            UpdateIndexedBufferBinding(context, &buf, nullptr, BufferBinding::ShaderStorage, 0, 0);
>+        }
>+    }
>+
>+    return angle::Result::Continue;
> }
> 
> void State::setEnableVertexAttribArray(unsigned int attribNum, bool enabled)
>@@ -1361,6 +1626,7 @@ void State::setVertexAttribf(GLuint index, const GLfloat values[4])
>     mVertexAttribCurrentValues[index].setFloatValues(values);
>     mDirtyBits.set(DIRTY_BIT_CURRENT_VALUES);
>     mDirtyCurrentValues.set(index);
>+    SetComponentTypeMask(ComponentType::Float, index, &mCurrentValuesTypeMask);
> }
> 
> void State::setVertexAttribu(GLuint index, const GLuint values[4])
>@@ -1369,6 +1635,7 @@ void State::setVertexAttribu(GLuint index, const GLuint values[4])
>     mVertexAttribCurrentValues[index].setUnsignedIntValues(values);
>     mDirtyBits.set(DIRTY_BIT_CURRENT_VALUES);
>     mDirtyCurrentValues.set(index);
>+    SetComponentTypeMask(ComponentType::UnsignedInt, index, &mCurrentValuesTypeMask);
> }
> 
> void State::setVertexAttribi(GLuint index, const GLint values[4])
>@@ -1377,21 +1644,7 @@ void State::setVertexAttribi(GLuint index, const GLint values[4])
>     mVertexAttribCurrentValues[index].setIntValues(values);
>     mDirtyBits.set(DIRTY_BIT_CURRENT_VALUES);
>     mDirtyCurrentValues.set(index);
>-}
>-
>-void State::setVertexAttribPointer(const Context *context,
>-                                   unsigned int attribNum,
>-                                   Buffer *boundBuffer,
>-                                   GLint size,
>-                                   GLenum type,
>-                                   bool normalized,
>-                                   bool pureInteger,
>-                                   GLsizei stride,
>-                                   const void *pointer)
>-{
>-    getVertexArray()->setVertexAttribPointer(context, attribNum, boundBuffer, size, type,
>-                                             normalized, pureInteger, stride, pointer);
>-    mDirtyObjects.set(DIRTY_OBJECT_VERTEX_ARRAY);
>+    SetComponentTypeMask(ComponentType::Int, index, &mCurrentValuesTypeMask);
> }
> 
> void State::setVertexAttribDivisor(const Context *context, GLuint index, GLuint divisor)
>@@ -1400,17 +1653,6 @@ void State::setVertexAttribDivisor(const Context *context, GLuint index, GLuint
>     mDirtyObjects.set(DIRTY_OBJECT_VERTEX_ARRAY);
> }
> 
>-const VertexAttribCurrentValueData &State::getVertexAttribCurrentValue(size_t attribNum) const
>-{
>-    ASSERT(attribNum < mVertexAttribCurrentValues.size());
>-    return mVertexAttribCurrentValues[attribNum];
>-}
>-
>-const std::vector<VertexAttribCurrentValueData> &State::getVertexAttribCurrentValues() const
>-{
>-    return mVertexAttribCurrentValues;
>-}
>-
> const void *State::getVertexAttribPointer(unsigned int attribNum) const
> {
>     return getVertexArray()->getVertexAttribute(attribNum).pointer;
>@@ -1422,173 +1664,83 @@ void State::setPackAlignment(GLint alignment)
>     mDirtyBits.set(DIRTY_BIT_PACK_STATE);
> }
> 
>-GLint State::getPackAlignment() const
>-{
>-    return mPack.alignment;
>-}
>-
> void State::setPackReverseRowOrder(bool reverseRowOrder)
> {
>     mPack.reverseRowOrder = reverseRowOrder;
>     mDirtyBits.set(DIRTY_BIT_PACK_STATE);
> }
> 
>-bool State::getPackReverseRowOrder() const
>-{
>-    return mPack.reverseRowOrder;
>-}
>-
> void State::setPackRowLength(GLint rowLength)
> {
>     mPack.rowLength = rowLength;
>     mDirtyBits.set(DIRTY_BIT_PACK_STATE);
> }
> 
>-GLint State::getPackRowLength() const
>-{
>-    return mPack.rowLength;
>-}
>-
> void State::setPackSkipRows(GLint skipRows)
> {
>     mPack.skipRows = skipRows;
>     mDirtyBits.set(DIRTY_BIT_PACK_STATE);
> }
> 
>-GLint State::getPackSkipRows() const
>-{
>-    return mPack.skipRows;
>-}
>-
> void State::setPackSkipPixels(GLint skipPixels)
> {
>     mPack.skipPixels = skipPixels;
>     mDirtyBits.set(DIRTY_BIT_PACK_STATE);
> }
> 
>-GLint State::getPackSkipPixels() const
>-{
>-    return mPack.skipPixels;
>-}
>-
>-const PixelPackState &State::getPackState() const
>-{
>-    return mPack;
>-}
>-
>-PixelPackState &State::getPackState()
>-{
>-    return mPack;
>-}
>-
> void State::setUnpackAlignment(GLint alignment)
> {
>     mUnpack.alignment = alignment;
>     mDirtyBits.set(DIRTY_BIT_UNPACK_STATE);
> }
> 
>-GLint State::getUnpackAlignment() const
>-{
>-    return mUnpack.alignment;
>-}
>-
> void State::setUnpackRowLength(GLint rowLength)
> {
>     mUnpack.rowLength = rowLength;
>     mDirtyBits.set(DIRTY_BIT_UNPACK_STATE);
> }
> 
>-GLint State::getUnpackRowLength() const
>-{
>-    return mUnpack.rowLength;
>-}
>-
> void State::setUnpackImageHeight(GLint imageHeight)
> {
>     mUnpack.imageHeight = imageHeight;
>     mDirtyBits.set(DIRTY_BIT_UNPACK_STATE);
> }
> 
>-GLint State::getUnpackImageHeight() const
>-{
>-    return mUnpack.imageHeight;
>-}
>-
> void State::setUnpackSkipImages(GLint skipImages)
> {
>     mUnpack.skipImages = skipImages;
>     mDirtyBits.set(DIRTY_BIT_UNPACK_STATE);
> }
> 
>-GLint State::getUnpackSkipImages() const
>-{
>-    return mUnpack.skipImages;
>-}
>-
> void State::setUnpackSkipRows(GLint skipRows)
> {
>     mUnpack.skipRows = skipRows;
>     mDirtyBits.set(DIRTY_BIT_UNPACK_STATE);
> }
> 
>-GLint State::getUnpackSkipRows() const
>-{
>-    return mUnpack.skipRows;
>-}
>-
> void State::setUnpackSkipPixels(GLint skipPixels)
> {
>     mUnpack.skipPixels = skipPixels;
>     mDirtyBits.set(DIRTY_BIT_UNPACK_STATE);
> }
> 
>-GLint State::getUnpackSkipPixels() const
>-{
>-    return mUnpack.skipPixels;
>-}
>-
>-const PixelUnpackState &State::getUnpackState() const
>-{
>-    return mUnpack;
>-}
>-
>-PixelUnpackState &State::getUnpackState()
>-{
>-    return mUnpack;
>-}
>-
>-const Debug &State::getDebug() const
>-{
>-    return mDebug;
>-}
>-
>-Debug &State::getDebug()
>-{
>-    return mDebug;
>-}
>-
> void State::setCoverageModulation(GLenum components)
> {
>     mCoverageModulation = components;
>     mDirtyBits.set(DIRTY_BIT_COVERAGE_MODULATION);
> }
> 
>-GLenum State::getCoverageModulation() const
>-{
>-    return mCoverageModulation;
>-}
>-
> void State::loadPathRenderingMatrix(GLenum matrixMode, const GLfloat *matrix)
> {
>     if (matrixMode == GL_PATH_MODELVIEW_CHROMIUM)
>     {
>         memcpy(mPathMatrixMV, matrix, 16 * sizeof(GLfloat));
>-        mDirtyBits.set(DIRTY_BIT_PATH_RENDERING_MATRIX_MV);
>+        mDirtyBits.set(DIRTY_BIT_PATH_RENDERING);
>     }
>     else if (matrixMode == GL_PATH_PROJECTION_CHROMIUM)
>     {
>         memcpy(mPathMatrixProj, matrix, 16 * sizeof(GLfloat));
>-        mDirtyBits.set(DIRTY_BIT_PATH_RENDERING_MATRIX_PROJ);
>+        mDirtyBits.set(DIRTY_BIT_PATH_RENDERING);
>     }
>     else
>     {
>@@ -1616,22 +1768,7 @@ void State::setPathStencilFunc(GLenum func, GLint ref, GLuint mask)
>     mPathStencilFunc = func;
>     mPathStencilRef  = ref;
>     mPathStencilMask = mask;
>-    mDirtyBits.set(DIRTY_BIT_PATH_RENDERING_STENCIL_STATE);
>-}
>-
>-GLenum State::getPathStencilFunc() const
>-{
>-    return mPathStencilFunc;
>-}
>-
>-GLint State::getPathStencilRef() const
>-{
>-    return mPathStencilRef;
>-}
>-
>-GLuint State::getPathStencilMask() const
>-{
>-    return mPathStencilMask;
>+    mDirtyBits.set(DIRTY_BIT_PATH_RENDERING);
> }
> 
> void State::setFramebufferSRGB(bool sRGB)
>@@ -1640,76 +1777,103 @@ void State::setFramebufferSRGB(bool sRGB)
>     mDirtyBits.set(DIRTY_BIT_FRAMEBUFFER_SRGB);
> }
> 
>-bool State::getFramebufferSRGB() const
>+void State::setMaxShaderCompilerThreads(GLuint count)
> {
>-    return mFramebufferSRGB;
>+    mMaxShaderCompilerThreads = count;
> }
> 
> void State::getBooleanv(GLenum pname, GLboolean *params)
> {
>     switch (pname)
>     {
>-      case GL_SAMPLE_COVERAGE_INVERT:    *params = mSampleCoverageInvert;         break;
>-      case GL_DEPTH_WRITEMASK:           *params = mDepthStencil.depthMask;       break;
>-      case GL_COLOR_WRITEMASK:
>-        params[0] = mBlend.colorMaskRed;
>-        params[1] = mBlend.colorMaskGreen;
>-        params[2] = mBlend.colorMaskBlue;
>-        params[3] = mBlend.colorMaskAlpha;
>-        break;
>-      case GL_CULL_FACE:
>-          *params = mRasterizer.cullFace;
>-          break;
>-      case GL_POLYGON_OFFSET_FILL:       *params = mRasterizer.polygonOffsetFill; break;
>-      case GL_SAMPLE_ALPHA_TO_COVERAGE:  *params = mBlend.sampleAlphaToCoverage;  break;
>-      case GL_SAMPLE_COVERAGE:           *params = mSampleCoverage;               break;
>-      case GL_SAMPLE_MASK:
>-          *params = mSampleMask;
>-          break;
>-      case GL_SCISSOR_TEST:              *params = mScissorTest;                  break;
>-      case GL_STENCIL_TEST:              *params = mDepthStencil.stencilTest;     break;
>-      case GL_DEPTH_TEST:                *params = mDepthStencil.depthTest;       break;
>-      case GL_BLEND:                     *params = mBlend.blend;                  break;
>-      case GL_DITHER:                    *params = mBlend.dither;                 break;
>-      case GL_TRANSFORM_FEEDBACK_ACTIVE: *params = getCurrentTransformFeedback()->isActive() ? GL_TRUE : GL_FALSE; break;
>-      case GL_TRANSFORM_FEEDBACK_PAUSED: *params = getCurrentTransformFeedback()->isPaused() ? GL_TRUE : GL_FALSE; break;
>-      case GL_PRIMITIVE_RESTART_FIXED_INDEX:
>-          *params = mPrimitiveRestart;
>-          break;
>-      case GL_RASTERIZER_DISCARD:
>-          *params = isRasterizerDiscardEnabled() ? GL_TRUE : GL_FALSE;
>-          break;
>-      case GL_DEBUG_OUTPUT_SYNCHRONOUS:
>-          *params = mDebug.isOutputSynchronous() ? GL_TRUE : GL_FALSE;
>-          break;
>-      case GL_DEBUG_OUTPUT:
>-          *params = mDebug.isOutputEnabled() ? GL_TRUE : GL_FALSE;
>-          break;
>-      case GL_MULTISAMPLE_EXT:
>-          *params = mMultiSampling;
>-          break;
>-      case GL_SAMPLE_ALPHA_TO_ONE_EXT:
>-          *params = mSampleAlphaToOne;
>-          break;
>-      case GL_BIND_GENERATES_RESOURCE_CHROMIUM:
>-          *params = isBindGeneratesResourceEnabled() ? GL_TRUE : GL_FALSE;
>-          break;
>-      case GL_CLIENT_ARRAYS_ANGLE:
>-          *params = areClientArraysEnabled() ? GL_TRUE : GL_FALSE;
>-          break;
>-      case GL_FRAMEBUFFER_SRGB_EXT:
>-          *params = getFramebufferSRGB() ? GL_TRUE : GL_FALSE;
>-          break;
>-      case GL_ROBUST_RESOURCE_INITIALIZATION_ANGLE:
>-          *params = mRobustResourceInit ? GL_TRUE : GL_FALSE;
>-          break;
>-      case GL_PROGRAM_CACHE_ENABLED_ANGLE:
>-          *params = mProgramBinaryCacheEnabled ? GL_TRUE : GL_FALSE;
>-          break;
>-
>-      default:
>-        UNREACHABLE();
>-        break;
>+        case GL_SAMPLE_COVERAGE_INVERT:
>+            *params = mSampleCoverageInvert;
>+            break;
>+        case GL_DEPTH_WRITEMASK:
>+            *params = mDepthStencil.depthMask;
>+            break;
>+        case GL_COLOR_WRITEMASK:
>+            params[0] = mBlend.colorMaskRed;
>+            params[1] = mBlend.colorMaskGreen;
>+            params[2] = mBlend.colorMaskBlue;
>+            params[3] = mBlend.colorMaskAlpha;
>+            break;
>+        case GL_CULL_FACE:
>+            *params = mRasterizer.cullFace;
>+            break;
>+        case GL_POLYGON_OFFSET_FILL:
>+            *params = mRasterizer.polygonOffsetFill;
>+            break;
>+        case GL_SAMPLE_ALPHA_TO_COVERAGE:
>+            *params = mBlend.sampleAlphaToCoverage;
>+            break;
>+        case GL_SAMPLE_COVERAGE:
>+            *params = mSampleCoverage;
>+            break;
>+        case GL_SAMPLE_MASK:
>+            *params = mSampleMask;
>+            break;
>+        case GL_SCISSOR_TEST:
>+            *params = mScissorTest;
>+            break;
>+        case GL_STENCIL_TEST:
>+            *params = mDepthStencil.stencilTest;
>+            break;
>+        case GL_DEPTH_TEST:
>+            *params = mDepthStencil.depthTest;
>+            break;
>+        case GL_BLEND:
>+            *params = mBlend.blend;
>+            break;
>+        case GL_DITHER:
>+            *params = mBlend.dither;
>+            break;
>+        case GL_TRANSFORM_FEEDBACK_ACTIVE:
>+            *params = getCurrentTransformFeedback()->isActive() ? GL_TRUE : GL_FALSE;
>+            break;
>+        case GL_TRANSFORM_FEEDBACK_PAUSED:
>+            *params = getCurrentTransformFeedback()->isPaused() ? GL_TRUE : GL_FALSE;
>+            break;
>+        case GL_PRIMITIVE_RESTART_FIXED_INDEX:
>+            *params = mPrimitiveRestart;
>+            break;
>+        case GL_RASTERIZER_DISCARD:
>+            *params = isRasterizerDiscardEnabled() ? GL_TRUE : GL_FALSE;
>+            break;
>+        case GL_DEBUG_OUTPUT_SYNCHRONOUS:
>+            *params = mDebug.isOutputSynchronous() ? GL_TRUE : GL_FALSE;
>+            break;
>+        case GL_DEBUG_OUTPUT:
>+            *params = mDebug.isOutputEnabled() ? GL_TRUE : GL_FALSE;
>+            break;
>+        case GL_MULTISAMPLE_EXT:
>+            *params = mMultiSampling;
>+            break;
>+        case GL_SAMPLE_ALPHA_TO_ONE_EXT:
>+            *params = mSampleAlphaToOne;
>+            break;
>+        case GL_BIND_GENERATES_RESOURCE_CHROMIUM:
>+            *params = isBindGeneratesResourceEnabled() ? GL_TRUE : GL_FALSE;
>+            break;
>+        case GL_CLIENT_ARRAYS_ANGLE:
>+            *params = areClientArraysEnabled() ? GL_TRUE : GL_FALSE;
>+            break;
>+        case GL_FRAMEBUFFER_SRGB_EXT:
>+            *params = getFramebufferSRGB() ? GL_TRUE : GL_FALSE;
>+            break;
>+        case GL_ROBUST_RESOURCE_INITIALIZATION_ANGLE:
>+            *params = mRobustResourceInit ? GL_TRUE : GL_FALSE;
>+            break;
>+        case GL_PROGRAM_CACHE_ENABLED_ANGLE:
>+            *params = mProgramBinaryCacheEnabled ? GL_TRUE : GL_FALSE;
>+            break;
>+        case GL_LIGHT_MODEL_TWO_SIDE:
>+            *params = IsLightModelTwoSided(&mGLES1State);
>+            break;
>+
>+        default:
>+            UNREACHABLE();
>+            break;
>     }
> }
> 
>@@ -1721,50 +1885,124 @@ void State::getFloatv(GLenum pname, GLfloat *params)
>     // case, this should make no difference to the calling application.
>     switch (pname)
>     {
>-      case GL_LINE_WIDTH:               *params = mLineWidth;                         break;
>-      case GL_SAMPLE_COVERAGE_VALUE:    *params = mSampleCoverageValue;               break;
>-      case GL_DEPTH_CLEAR_VALUE:        *params = mDepthClearValue;                   break;
>-      case GL_POLYGON_OFFSET_FACTOR:    *params = mRasterizer.polygonOffsetFactor;    break;
>-      case GL_POLYGON_OFFSET_UNITS:     *params = mRasterizer.polygonOffsetUnits;     break;
>-      case GL_DEPTH_RANGE:
>-        params[0] = mNearZ;
>-        params[1] = mFarZ;
>-        break;
>-      case GL_COLOR_CLEAR_VALUE:
>-        params[0] = mColorClearValue.red;
>-        params[1] = mColorClearValue.green;
>-        params[2] = mColorClearValue.blue;
>-        params[3] = mColorClearValue.alpha;
>-        break;
>-      case GL_BLEND_COLOR:
>-        params[0] = mBlendColor.red;
>-        params[1] = mBlendColor.green;
>-        params[2] = mBlendColor.blue;
>-        params[3] = mBlendColor.alpha;
>-        break;
>-      case GL_MULTISAMPLE_EXT:
>-        *params = static_cast<GLfloat>(mMultiSampling);
>-        break;
>-      case GL_SAMPLE_ALPHA_TO_ONE_EXT:
>-        *params = static_cast<GLfloat>(mSampleAlphaToOne);
>-      case GL_COVERAGE_MODULATION_CHROMIUM:
>-          params[0] = static_cast<GLfloat>(mCoverageModulation);
>-          break;
>-      default:
>-        UNREACHABLE();
>-        break;
>+        case GL_LINE_WIDTH:
>+            *params = mLineWidth;
>+            break;
>+        case GL_SAMPLE_COVERAGE_VALUE:
>+            *params = mSampleCoverageValue;
>+            break;
>+        case GL_DEPTH_CLEAR_VALUE:
>+            *params = mDepthClearValue;
>+            break;
>+        case GL_POLYGON_OFFSET_FACTOR:
>+            *params = mRasterizer.polygonOffsetFactor;
>+            break;
>+        case GL_POLYGON_OFFSET_UNITS:
>+            *params = mRasterizer.polygonOffsetUnits;
>+            break;
>+        case GL_DEPTH_RANGE:
>+            params[0] = mNearZ;
>+            params[1] = mFarZ;
>+            break;
>+        case GL_COLOR_CLEAR_VALUE:
>+            params[0] = mColorClearValue.red;
>+            params[1] = mColorClearValue.green;
>+            params[2] = mColorClearValue.blue;
>+            params[3] = mColorClearValue.alpha;
>+            break;
>+        case GL_BLEND_COLOR:
>+            params[0] = mBlendColor.red;
>+            params[1] = mBlendColor.green;
>+            params[2] = mBlendColor.blue;
>+            params[3] = mBlendColor.alpha;
>+            break;
>+        case GL_MULTISAMPLE_EXT:
>+            *params = static_cast<GLfloat>(mMultiSampling);
>+            break;
>+        case GL_SAMPLE_ALPHA_TO_ONE_EXT:
>+            *params = static_cast<GLfloat>(mSampleAlphaToOne);
>+            break;
>+        case GL_COVERAGE_MODULATION_CHROMIUM:
>+            params[0] = static_cast<GLfloat>(mCoverageModulation);
>+            break;
>+        case GL_ALPHA_TEST_REF:
>+            *params = mGLES1State.mAlphaTestRef;
>+            break;
>+        case GL_CURRENT_COLOR:
>+        {
>+            const auto &color = mGLES1State.mCurrentColor;
>+            params[0]         = color.red;
>+            params[1]         = color.green;
>+            params[2]         = color.blue;
>+            params[3]         = color.alpha;
>+            break;
>+        }
>+        case GL_CURRENT_NORMAL:
>+        {
>+            const auto &normal = mGLES1State.mCurrentNormal;
>+            params[0]          = normal[0];
>+            params[1]          = normal[1];
>+            params[2]          = normal[2];
>+            break;
>+        }
>+        case GL_CURRENT_TEXTURE_COORDS:
>+        {
>+            const auto &texcoord = mGLES1State.mCurrentTextureCoords[mActiveSampler];
>+            params[0]            = texcoord.s;
>+            params[1]            = texcoord.t;
>+            params[2]            = texcoord.r;
>+            params[3]            = texcoord.q;
>+            break;
>+        }
>+        case GL_MODELVIEW_MATRIX:
>+            memcpy(params, mGLES1State.mModelviewMatrices.back().data(), 16 * sizeof(GLfloat));
>+            break;
>+        case GL_PROJECTION_MATRIX:
>+            memcpy(params, mGLES1State.mProjectionMatrices.back().data(), 16 * sizeof(GLfloat));
>+            break;
>+        case GL_TEXTURE_MATRIX:
>+            memcpy(params, mGLES1State.mTextureMatrices[mActiveSampler].back().data(),
>+                   16 * sizeof(GLfloat));
>+            break;
>+        case GL_LIGHT_MODEL_AMBIENT:
>+            GetLightModelParameters(&mGLES1State, pname, params);
>+            break;
>+        case GL_FOG_MODE:
>+        case GL_FOG_DENSITY:
>+        case GL_FOG_START:
>+        case GL_FOG_END:
>+        case GL_FOG_COLOR:
>+            GetFogParameters(&mGLES1State, pname, params);
>+            break;
>+        case GL_POINT_SIZE:
>+            GetPointSize(&mGLES1State, params);
>+            break;
>+        case GL_POINT_SIZE_MIN:
>+        case GL_POINT_SIZE_MAX:
>+        case GL_POINT_FADE_THRESHOLD_SIZE:
>+        case GL_POINT_DISTANCE_ATTENUATION:
>+            GetPointParameter(&mGLES1State, FromGLenum<PointParameter>(pname), params);
>+            break;
>+        default:
>+            UNREACHABLE();
>+            break;
>     }
> }
> 
>-void State::getIntegerv(const Context *context, GLenum pname, GLint *params)
>+angle::Result State::getIntegerv(const Context *context, GLenum pname, GLint *params)
> {
>     if (pname >= GL_DRAW_BUFFER0_EXT && pname <= GL_DRAW_BUFFER15_EXT)
>     {
>-        unsigned int colorAttachment = (pname - GL_DRAW_BUFFER0_EXT);
>-        ASSERT(colorAttachment < mMaxDrawBuffers);
>+        size_t drawBuffer = (pname - GL_DRAW_BUFFER0_EXT);
>+        ASSERT(drawBuffer < mMaxDrawBuffers);
>         Framebuffer *framebuffer = mDrawFramebuffer;
>-        *params = framebuffer->getDrawBufferState(colorAttachment);
>-        return;
>+        // The default framebuffer may have fewer draw buffer states than a user-created one. The
>+        // user is always allowed to query up to GL_MAX_DRAWBUFFERS so just return GL_NONE here if
>+        // the draw buffer is out of range for this framebuffer.
>+        *params = drawBuffer < framebuffer->getDrawbufferStateCount()
>+                      ? framebuffer->getDrawBufferState(drawBuffer)
>+                      : GL_NONE;
>+        return angle::Result::Continue;
>     }
> 
>     // Please note: DEPTH_CLEAR_VALUE is not included in our internal getIntegerv implementation
>@@ -1781,90 +2019,157 @@ void State::getIntegerv(const Context *context, GLenum pname, GLint *params)
>             *params = mBoundBuffers[BufferBinding::DrawIndirect].id();
>             break;
>         case GL_ELEMENT_ARRAY_BUFFER_BINDING:
>-            *params = getVertexArray()->getElementArrayBuffer().id();
>-            break;
>-        //case GL_FRAMEBUFFER_BINDING:                    // now equivalent to GL_DRAW_FRAMEBUFFER_BINDING_ANGLE
>-      case GL_DRAW_FRAMEBUFFER_BINDING_ANGLE:           *params = mDrawFramebuffer->id();                         break;
>-      case GL_READ_FRAMEBUFFER_BINDING_ANGLE:           *params = mReadFramebuffer->id();                         break;
>-      case GL_RENDERBUFFER_BINDING:                     *params = mRenderbuffer.id();                             break;
>-      case GL_VERTEX_ARRAY_BINDING:                     *params = mVertexArray->id();                             break;
>-      case GL_CURRENT_PROGRAM:                          *params = mProgram ? mProgram->id() : 0;                  break;
>-      case GL_PACK_ALIGNMENT:                           *params = mPack.alignment;                                break;
>-      case GL_PACK_REVERSE_ROW_ORDER_ANGLE:             *params = mPack.reverseRowOrder;                          break;
>-      case GL_PACK_ROW_LENGTH:
>-          *params = mPack.rowLength;
>-          break;
>-      case GL_PACK_SKIP_ROWS:
>-          *params = mPack.skipRows;
>-          break;
>-      case GL_PACK_SKIP_PIXELS:
>-          *params = mPack.skipPixels;
>-          break;
>-      case GL_UNPACK_ALIGNMENT:                         *params = mUnpack.alignment;                              break;
>-      case GL_UNPACK_ROW_LENGTH:                        *params = mUnpack.rowLength;                              break;
>-      case GL_UNPACK_IMAGE_HEIGHT:
>-          *params = mUnpack.imageHeight;
>-          break;
>-      case GL_UNPACK_SKIP_IMAGES:
>-          *params = mUnpack.skipImages;
>-          break;
>-      case GL_UNPACK_SKIP_ROWS:
>-          *params = mUnpack.skipRows;
>-          break;
>-      case GL_UNPACK_SKIP_PIXELS:
>-          *params = mUnpack.skipPixels;
>-          break;
>-      case GL_GENERATE_MIPMAP_HINT:                     *params = mGenerateMipmapHint;                            break;
>-      case GL_FRAGMENT_SHADER_DERIVATIVE_HINT_OES:      *params = mFragmentShaderDerivativeHint;                  break;
>-      case GL_ACTIVE_TEXTURE:
>-          *params = (static_cast<GLint>(mActiveSampler) + GL_TEXTURE0);
>-          break;
>-      case GL_STENCIL_FUNC:                             *params = mDepthStencil.stencilFunc;                      break;
>-      case GL_STENCIL_REF:                              *params = mStencilRef;                                    break;
>-      case GL_STENCIL_VALUE_MASK:
>-          *params = CastMaskValue(context, mDepthStencil.stencilMask);
>-          break;
>-      case GL_STENCIL_BACK_FUNC:                        *params = mDepthStencil.stencilBackFunc;                  break;
>-      case GL_STENCIL_BACK_REF:                         *params = mStencilBackRef;                                break;
>-      case GL_STENCIL_BACK_VALUE_MASK:
>-          *params = CastMaskValue(context, mDepthStencil.stencilBackMask);
>-          break;
>-      case GL_STENCIL_FAIL:                             *params = mDepthStencil.stencilFail;                      break;
>-      case GL_STENCIL_PASS_DEPTH_FAIL:                  *params = mDepthStencil.stencilPassDepthFail;             break;
>-      case GL_STENCIL_PASS_DEPTH_PASS:                  *params = mDepthStencil.stencilPassDepthPass;             break;
>-      case GL_STENCIL_BACK_FAIL:                        *params = mDepthStencil.stencilBackFail;                  break;
>-      case GL_STENCIL_BACK_PASS_DEPTH_FAIL:             *params = mDepthStencil.stencilBackPassDepthFail;         break;
>-      case GL_STENCIL_BACK_PASS_DEPTH_PASS:             *params = mDepthStencil.stencilBackPassDepthPass;         break;
>-      case GL_DEPTH_FUNC:                               *params = mDepthStencil.depthFunc;                        break;
>-      case GL_BLEND_SRC_RGB:                            *params = mBlend.sourceBlendRGB;                          break;
>-      case GL_BLEND_SRC_ALPHA:                          *params = mBlend.sourceBlendAlpha;                        break;
>-      case GL_BLEND_DST_RGB:                            *params = mBlend.destBlendRGB;                            break;
>-      case GL_BLEND_DST_ALPHA:                          *params = mBlend.destBlendAlpha;                          break;
>-      case GL_BLEND_EQUATION_RGB:                       *params = mBlend.blendEquationRGB;                        break;
>-      case GL_BLEND_EQUATION_ALPHA:                     *params = mBlend.blendEquationAlpha;                      break;
>-      case GL_STENCIL_WRITEMASK:
>-          *params = CastMaskValue(context, mDepthStencil.stencilWritemask);
>-          break;
>-      case GL_STENCIL_BACK_WRITEMASK:
>-          *params = CastMaskValue(context, mDepthStencil.stencilBackWritemask);
>-          break;
>-      case GL_STENCIL_CLEAR_VALUE:                      *params = mStencilClearValue;                             break;
>-      case GL_IMPLEMENTATION_COLOR_READ_TYPE:
>-          *params = mReadFramebuffer->getImplementationColorReadType(context);
>-          break;
>-      case GL_IMPLEMENTATION_COLOR_READ_FORMAT:
>-          *params = mReadFramebuffer->getImplementationColorReadFormat(context);
>-          break;
>-      case GL_SAMPLE_BUFFERS:
>-      case GL_SAMPLES:
>+        {
>+            Buffer *elementArrayBuffer = getVertexArray()->getElementArrayBuffer();
>+            *params                    = elementArrayBuffer ? elementArrayBuffer->id() : 0;
>+            break;
>+        }
>+        case GL_DRAW_FRAMEBUFFER_BINDING:
>+            static_assert(GL_DRAW_FRAMEBUFFER_BINDING == GL_DRAW_FRAMEBUFFER_BINDING_ANGLE,
>+                          "Enum mismatch");
>+            *params = mDrawFramebuffer->id();
>+            break;
>+        case GL_READ_FRAMEBUFFER_BINDING:
>+            static_assert(GL_READ_FRAMEBUFFER_BINDING == GL_READ_FRAMEBUFFER_BINDING_ANGLE,
>+                          "Enum mismatch");
>+            *params = mReadFramebuffer->id();
>+            break;
>+        case GL_RENDERBUFFER_BINDING:
>+            *params = mRenderbuffer.id();
>+            break;
>+        case GL_VERTEX_ARRAY_BINDING:
>+            *params = mVertexArray->id();
>+            break;
>+        case GL_CURRENT_PROGRAM:
>+            *params = mProgram ? mProgram->id() : 0;
>+            break;
>+        case GL_PACK_ALIGNMENT:
>+            *params = mPack.alignment;
>+            break;
>+        case GL_PACK_REVERSE_ROW_ORDER_ANGLE:
>+            *params = mPack.reverseRowOrder;
>+            break;
>+        case GL_PACK_ROW_LENGTH:
>+            *params = mPack.rowLength;
>+            break;
>+        case GL_PACK_SKIP_ROWS:
>+            *params = mPack.skipRows;
>+            break;
>+        case GL_PACK_SKIP_PIXELS:
>+            *params = mPack.skipPixels;
>+            break;
>+        case GL_UNPACK_ALIGNMENT:
>+            *params = mUnpack.alignment;
>+            break;
>+        case GL_UNPACK_ROW_LENGTH:
>+            *params = mUnpack.rowLength;
>+            break;
>+        case GL_UNPACK_IMAGE_HEIGHT:
>+            *params = mUnpack.imageHeight;
>+            break;
>+        case GL_UNPACK_SKIP_IMAGES:
>+            *params = mUnpack.skipImages;
>+            break;
>+        case GL_UNPACK_SKIP_ROWS:
>+            *params = mUnpack.skipRows;
>+            break;
>+        case GL_UNPACK_SKIP_PIXELS:
>+            *params = mUnpack.skipPixels;
>+            break;
>+        case GL_GENERATE_MIPMAP_HINT:
>+            *params = mGenerateMipmapHint;
>+            break;
>+        case GL_FRAGMENT_SHADER_DERIVATIVE_HINT_OES:
>+            *params = mFragmentShaderDerivativeHint;
>+            break;
>+        case GL_ACTIVE_TEXTURE:
>+            *params = (static_cast<GLint>(mActiveSampler) + GL_TEXTURE0);
>+            break;
>+        case GL_STENCIL_FUNC:
>+            *params = mDepthStencil.stencilFunc;
>+            break;
>+        case GL_STENCIL_REF:
>+            *params = mStencilRef;
>+            break;
>+        case GL_STENCIL_VALUE_MASK:
>+            *params = CastMaskValue(context, mDepthStencil.stencilMask);
>+            break;
>+        case GL_STENCIL_BACK_FUNC:
>+            *params = mDepthStencil.stencilBackFunc;
>+            break;
>+        case GL_STENCIL_BACK_REF:
>+            *params = mStencilBackRef;
>+            break;
>+        case GL_STENCIL_BACK_VALUE_MASK:
>+            *params = CastMaskValue(context, mDepthStencil.stencilBackMask);
>+            break;
>+        case GL_STENCIL_FAIL:
>+            *params = mDepthStencil.stencilFail;
>+            break;
>+        case GL_STENCIL_PASS_DEPTH_FAIL:
>+            *params = mDepthStencil.stencilPassDepthFail;
>+            break;
>+        case GL_STENCIL_PASS_DEPTH_PASS:
>+            *params = mDepthStencil.stencilPassDepthPass;
>+            break;
>+        case GL_STENCIL_BACK_FAIL:
>+            *params = mDepthStencil.stencilBackFail;
>+            break;
>+        case GL_STENCIL_BACK_PASS_DEPTH_FAIL:
>+            *params = mDepthStencil.stencilBackPassDepthFail;
>+            break;
>+        case GL_STENCIL_BACK_PASS_DEPTH_PASS:
>+            *params = mDepthStencil.stencilBackPassDepthPass;
>+            break;
>+        case GL_DEPTH_FUNC:
>+            *params = mDepthStencil.depthFunc;
>+            break;
>+        case GL_BLEND_SRC_RGB:
>+            *params = mBlend.sourceBlendRGB;
>+            break;
>+        case GL_BLEND_SRC_ALPHA:
>+            *params = mBlend.sourceBlendAlpha;
>+            break;
>+        case GL_BLEND_DST_RGB:
>+            *params = mBlend.destBlendRGB;
>+            break;
>+        case GL_BLEND_DST_ALPHA:
>+            *params = mBlend.destBlendAlpha;
>+            break;
>+        case GL_BLEND_EQUATION_RGB:
>+            *params = mBlend.blendEquationRGB;
>+            break;
>+        case GL_BLEND_EQUATION_ALPHA:
>+            *params = mBlend.blendEquationAlpha;
>+            break;
>+        case GL_STENCIL_WRITEMASK:
>+            *params = CastMaskValue(context, mDepthStencil.stencilWritemask);
>+            break;
>+        case GL_STENCIL_BACK_WRITEMASK:
>+            *params = CastMaskValue(context, mDepthStencil.stencilBackWritemask);
>+            break;
>+        case GL_STENCIL_CLEAR_VALUE:
>+            *params = mStencilClearValue;
>+            break;
>+        case GL_IMPLEMENTATION_COLOR_READ_TYPE:
>+            ANGLE_TRY(mReadFramebuffer->getImplementationColorReadType(
>+                context, reinterpret_cast<GLenum *>(params)));
>+            break;
>+        case GL_IMPLEMENTATION_COLOR_READ_FORMAT:
>+            ANGLE_TRY(mReadFramebuffer->getImplementationColorReadFormat(
>+                context, reinterpret_cast<GLenum *>(params)));
>+            break;
>+        case GL_SAMPLE_BUFFERS:
>+        case GL_SAMPLES:
>         {
>             Framebuffer *framebuffer = mDrawFramebuffer;
>-            if (framebuffer->checkStatus(context) == GL_FRAMEBUFFER_COMPLETE)
>+            if (framebuffer->isComplete(context))
>             {
>+                GLint samples = framebuffer->getSamples(context);
>                 switch (pname)
>                 {
>                     case GL_SAMPLE_BUFFERS:
>-                        if (framebuffer->getSamples(context) != 0)
>+                        if (samples != 0)
>                         {
>                             *params = 1;
>                         }
>@@ -1874,7 +2179,7 @@ void State::getIntegerv(const Context *context, GLenum pname, GLint *params)
>                         }
>                         break;
>                     case GL_SAMPLES:
>-                        *params = framebuffer->getSamples(context);
>+                        *params = samples;
>                         break;
>                 }
>             }
>@@ -1884,28 +2189,28 @@ void State::getIntegerv(const Context *context, GLenum pname, GLint *params)
>             }
>         }
>         break;
>-      case GL_VIEWPORT:
>-        params[0] = mViewport.x;
>-        params[1] = mViewport.y;
>-        params[2] = mViewport.width;
>-        params[3] = mViewport.height;
>-        break;
>-      case GL_SCISSOR_BOX:
>-        params[0] = mScissor.x;
>-        params[1] = mScissor.y;
>-        params[2] = mScissor.width;
>-        params[3] = mScissor.height;
>-        break;
>-      case GL_CULL_FACE_MODE:
>-          *params = ToGLenum(mRasterizer.cullMode);
>-          break;
>-      case GL_FRONT_FACE:
>-          *params = mRasterizer.frontFace;
>-          break;
>-      case GL_RED_BITS:
>-      case GL_GREEN_BITS:
>-      case GL_BLUE_BITS:
>-      case GL_ALPHA_BITS:
>+        case GL_VIEWPORT:
>+            params[0] = mViewport.x;
>+            params[1] = mViewport.y;
>+            params[2] = mViewport.width;
>+            params[3] = mViewport.height;
>+            break;
>+        case GL_SCISSOR_BOX:
>+            params[0] = mScissor.x;
>+            params[1] = mScissor.y;
>+            params[2] = mScissor.width;
>+            params[3] = mScissor.height;
>+            break;
>+        case GL_CULL_FACE_MODE:
>+            *params = ToGLenum(mRasterizer.cullMode);
>+            break;
>+        case GL_FRONT_FACE:
>+            *params = mRasterizer.frontFace;
>+            break;
>+        case GL_RED_BITS:
>+        case GL_GREEN_BITS:
>+        case GL_BLUE_BITS:
>+        case GL_ALPHA_BITS:
>         {
>             Framebuffer *framebuffer                 = getDrawFramebuffer();
>             const FramebufferAttachment *colorbuffer = framebuffer->getFirstColorbuffer();
>@@ -1914,10 +2219,18 @@ void State::getIntegerv(const Context *context, GLenum pname, GLint *params)
>             {
>                 switch (pname)
>                 {
>-                case GL_RED_BITS:   *params = colorbuffer->getRedSize();      break;
>-                case GL_GREEN_BITS: *params = colorbuffer->getGreenSize();    break;
>-                case GL_BLUE_BITS:  *params = colorbuffer->getBlueSize();     break;
>-                case GL_ALPHA_BITS: *params = colorbuffer->getAlphaSize();    break;
>+                    case GL_RED_BITS:
>+                        *params = colorbuffer->getRedSize();
>+                        break;
>+                    case GL_GREEN_BITS:
>+                        *params = colorbuffer->getGreenSize();
>+                        break;
>+                    case GL_BLUE_BITS:
>+                        *params = colorbuffer->getBlueSize();
>+                        break;
>+                    case GL_ALPHA_BITS:
>+                        *params = colorbuffer->getAlphaSize();
>+                        break;
>                 }
>             }
>             else
>@@ -1926,7 +2239,7 @@ void State::getIntegerv(const Context *context, GLenum pname, GLint *params)
>             }
>         }
>         break;
>-      case GL_DEPTH_BITS:
>+        case GL_DEPTH_BITS:
>         {
>             const Framebuffer *framebuffer           = getDrawFramebuffer();
>             const FramebufferAttachment *depthbuffer = framebuffer->getDepthbuffer();
>@@ -1941,7 +2254,7 @@ void State::getIntegerv(const Context *context, GLenum pname, GLint *params)
>             }
>         }
>         break;
>-      case GL_STENCIL_BITS:
>+        case GL_STENCIL_BITS:
>         {
>             const Framebuffer *framebuffer             = getDrawFramebuffer();
>             const FramebufferAttachment *stencilbuffer = framebuffer->getStencilbuffer();
>@@ -1956,98 +2269,148 @@ void State::getIntegerv(const Context *context, GLenum pname, GLint *params)
>             }
>         }
>         break;
>-      case GL_TEXTURE_BINDING_2D:
>-        ASSERT(mActiveSampler < mMaxCombinedTextureImageUnits);
>-        *params = getSamplerTextureId(static_cast<unsigned int>(mActiveSampler), GL_TEXTURE_2D);
>-        break;
>-      case GL_TEXTURE_BINDING_RECTANGLE_ANGLE:
>-          ASSERT(mActiveSampler < mMaxCombinedTextureImageUnits);
>-          *params = getSamplerTextureId(static_cast<unsigned int>(mActiveSampler),
>-                                        GL_TEXTURE_RECTANGLE_ANGLE);
>-          break;
>-      case GL_TEXTURE_BINDING_CUBE_MAP:
>-        ASSERT(mActiveSampler < mMaxCombinedTextureImageUnits);
>-        *params =
>-            getSamplerTextureId(static_cast<unsigned int>(mActiveSampler), GL_TEXTURE_CUBE_MAP);
>-        break;
>-      case GL_TEXTURE_BINDING_3D:
>-        ASSERT(mActiveSampler < mMaxCombinedTextureImageUnits);
>-        *params = getSamplerTextureId(static_cast<unsigned int>(mActiveSampler), GL_TEXTURE_3D);
>-        break;
>-      case GL_TEXTURE_BINDING_2D_ARRAY:
>-        ASSERT(mActiveSampler < mMaxCombinedTextureImageUnits);
>-        *params =
>-            getSamplerTextureId(static_cast<unsigned int>(mActiveSampler), GL_TEXTURE_2D_ARRAY);
>-        break;
>-      case GL_TEXTURE_BINDING_2D_MULTISAMPLE:
>-          ASSERT(mActiveSampler < mMaxCombinedTextureImageUnits);
>-          *params = getSamplerTextureId(static_cast<unsigned int>(mActiveSampler),
>-                                        GL_TEXTURE_2D_MULTISAMPLE);
>-          break;
>-      case GL_TEXTURE_BINDING_EXTERNAL_OES:
>-          ASSERT(mActiveSampler < mMaxCombinedTextureImageUnits);
>-          *params = getSamplerTextureId(static_cast<unsigned int>(mActiveSampler),
>-                                        GL_TEXTURE_EXTERNAL_OES);
>-          break;
>-      case GL_UNIFORM_BUFFER_BINDING:
>-          *params = mBoundBuffers[BufferBinding::Uniform].id();
>-          break;
>-      case GL_TRANSFORM_FEEDBACK_BINDING:
>-        *params = mTransformFeedback.id();
>-        break;
>-      case GL_TRANSFORM_FEEDBACK_BUFFER_BINDING:
>-          ASSERT(mTransformFeedback.get() != nullptr);
>-          *params = mTransformFeedback->getGenericBuffer().id();
>-          break;
>-      case GL_COPY_READ_BUFFER_BINDING:
>-          *params = mBoundBuffers[BufferBinding::CopyRead].id();
>-          break;
>-      case GL_COPY_WRITE_BUFFER_BINDING:
>-          *params = mBoundBuffers[BufferBinding::CopyWrite].id();
>-          break;
>-      case GL_PIXEL_PACK_BUFFER_BINDING:
>-          *params = mBoundBuffers[BufferBinding::PixelPack].id();
>-          break;
>-      case GL_PIXEL_UNPACK_BUFFER_BINDING:
>-          *params = mBoundBuffers[BufferBinding::PixelUnpack].id();
>-          break;
>-      case GL_READ_BUFFER:
>-          *params = mReadFramebuffer->getReadBufferState();
>-          break;
>-      case GL_SAMPLER_BINDING:
>-          ASSERT(mActiveSampler < mMaxCombinedTextureImageUnits);
>-          *params = getSamplerId(static_cast<GLuint>(mActiveSampler));
>-          break;
>-      case GL_DEBUG_LOGGED_MESSAGES:
>-          *params = static_cast<GLint>(mDebug.getMessageCount());
>-          break;
>-      case GL_DEBUG_NEXT_LOGGED_MESSAGE_LENGTH:
>-          *params = static_cast<GLint>(mDebug.getNextMessageLength());
>-          break;
>-      case GL_DEBUG_GROUP_STACK_DEPTH:
>-          *params = static_cast<GLint>(mDebug.getGroupStackDepth());
>-          break;
>-      case GL_MULTISAMPLE_EXT:
>-          *params = static_cast<GLint>(mMultiSampling);
>-          break;
>-      case GL_SAMPLE_ALPHA_TO_ONE_EXT:
>-          *params = static_cast<GLint>(mSampleAlphaToOne);
>-      case GL_COVERAGE_MODULATION_CHROMIUM:
>-          *params = static_cast<GLint>(mCoverageModulation);
>-          break;
>-      case GL_ATOMIC_COUNTER_BUFFER_BINDING:
>-          *params = mBoundBuffers[BufferBinding::AtomicCounter].id();
>-          break;
>-      case GL_SHADER_STORAGE_BUFFER_BINDING:
>-          *params = mBoundBuffers[BufferBinding::ShaderStorage].id();
>-          break;
>-      default:
>-        UNREACHABLE();
>-        break;
>+        case GL_TEXTURE_BINDING_2D:
>+            ASSERT(mActiveSampler < mMaxCombinedTextureImageUnits);
>+            *params =
>+                getSamplerTextureId(static_cast<unsigned int>(mActiveSampler), TextureType::_2D);
>+            break;
>+        case GL_TEXTURE_BINDING_RECTANGLE_ANGLE:
>+            ASSERT(mActiveSampler < mMaxCombinedTextureImageUnits);
>+            *params = getSamplerTextureId(static_cast<unsigned int>(mActiveSampler),
>+                                          TextureType::Rectangle);
>+            break;
>+        case GL_TEXTURE_BINDING_CUBE_MAP:
>+            ASSERT(mActiveSampler < mMaxCombinedTextureImageUnits);
>+            *params = getSamplerTextureId(static_cast<unsigned int>(mActiveSampler),
>+                                          TextureType::CubeMap);
>+            break;
>+        case GL_TEXTURE_BINDING_3D:
>+            ASSERT(mActiveSampler < mMaxCombinedTextureImageUnits);
>+            *params =
>+                getSamplerTextureId(static_cast<unsigned int>(mActiveSampler), TextureType::_3D);
>+            break;
>+        case GL_TEXTURE_BINDING_2D_ARRAY:
>+            ASSERT(mActiveSampler < mMaxCombinedTextureImageUnits);
>+            *params = getSamplerTextureId(static_cast<unsigned int>(mActiveSampler),
>+                                          TextureType::_2DArray);
>+            break;
>+        case GL_TEXTURE_BINDING_2D_MULTISAMPLE:
>+            ASSERT(mActiveSampler < mMaxCombinedTextureImageUnits);
>+            *params = getSamplerTextureId(static_cast<unsigned int>(mActiveSampler),
>+                                          TextureType::_2DMultisample);
>+            break;
>+        case GL_TEXTURE_BINDING_2D_MULTISAMPLE_ARRAY:
>+            ASSERT(mActiveSampler < mMaxCombinedTextureImageUnits);
>+            *params = getSamplerTextureId(static_cast<unsigned int>(mActiveSampler),
>+                                          TextureType::_2DMultisampleArray);
>+            break;
>+        case GL_TEXTURE_BINDING_EXTERNAL_OES:
>+            ASSERT(mActiveSampler < mMaxCombinedTextureImageUnits);
>+            *params = getSamplerTextureId(static_cast<unsigned int>(mActiveSampler),
>+                                          TextureType::External);
>+            break;
>+        case GL_UNIFORM_BUFFER_BINDING:
>+            *params = mBoundBuffers[BufferBinding::Uniform].id();
>+            break;
>+        case GL_TRANSFORM_FEEDBACK_BINDING:
>+            *params = mTransformFeedback.id();
>+            break;
>+        case GL_TRANSFORM_FEEDBACK_BUFFER_BINDING:
>+            *params = mBoundBuffers[BufferBinding::TransformFeedback].id();
>+            break;
>+        case GL_COPY_READ_BUFFER_BINDING:
>+            *params = mBoundBuffers[BufferBinding::CopyRead].id();
>+            break;
>+        case GL_COPY_WRITE_BUFFER_BINDING:
>+            *params = mBoundBuffers[BufferBinding::CopyWrite].id();
>+            break;
>+        case GL_PIXEL_PACK_BUFFER_BINDING:
>+            *params = mBoundBuffers[BufferBinding::PixelPack].id();
>+            break;
>+        case GL_PIXEL_UNPACK_BUFFER_BINDING:
>+            *params = mBoundBuffers[BufferBinding::PixelUnpack].id();
>+            break;
>+        case GL_READ_BUFFER:
>+            *params = mReadFramebuffer->getReadBufferState();
>+            break;
>+        case GL_SAMPLER_BINDING:
>+            ASSERT(mActiveSampler < mMaxCombinedTextureImageUnits);
>+            *params = getSamplerId(static_cast<GLuint>(mActiveSampler));
>+            break;
>+        case GL_DEBUG_LOGGED_MESSAGES:
>+            *params = static_cast<GLint>(mDebug.getMessageCount());
>+            break;
>+        case GL_DEBUG_NEXT_LOGGED_MESSAGE_LENGTH:
>+            *params = static_cast<GLint>(mDebug.getNextMessageLength());
>+            break;
>+        case GL_DEBUG_GROUP_STACK_DEPTH:
>+            *params = static_cast<GLint>(mDebug.getGroupStackDepth());
>+            break;
>+        case GL_MULTISAMPLE_EXT:
>+            *params = static_cast<GLint>(mMultiSampling);
>+            break;
>+        case GL_SAMPLE_ALPHA_TO_ONE_EXT:
>+            *params = static_cast<GLint>(mSampleAlphaToOne);
>+            break;
>+        case GL_COVERAGE_MODULATION_CHROMIUM:
>+            *params = static_cast<GLint>(mCoverageModulation);
>+            break;
>+        case GL_ATOMIC_COUNTER_BUFFER_BINDING:
>+            *params = mBoundBuffers[BufferBinding::AtomicCounter].id();
>+            break;
>+        case GL_SHADER_STORAGE_BUFFER_BINDING:
>+            *params = mBoundBuffers[BufferBinding::ShaderStorage].id();
>+            break;
>+        case GL_DISPATCH_INDIRECT_BUFFER_BINDING:
>+            *params = mBoundBuffers[BufferBinding::DispatchIndirect].id();
>+            break;
>+        case GL_ALPHA_TEST_FUNC:
>+            *params = ToGLenum(mGLES1State.mAlphaTestFunc);
>+            break;
>+        case GL_CLIENT_ACTIVE_TEXTURE:
>+            *params = mGLES1State.mClientActiveTexture + GL_TEXTURE0;
>+            break;
>+        case GL_MATRIX_MODE:
>+            *params = ToGLenum(mGLES1State.mMatrixMode);
>+            break;
>+        case GL_SHADE_MODEL:
>+            *params = ToGLenum(mGLES1State.mShadeModel);
>+            break;
>+        case GL_MODELVIEW_STACK_DEPTH:
>+        case GL_PROJECTION_STACK_DEPTH:
>+        case GL_TEXTURE_STACK_DEPTH:
>+            *params = mGLES1State.getCurrentMatrixStackDepth(pname);
>+            break;
>+        case GL_LOGIC_OP_MODE:
>+            *params = ToGLenum(mGLES1State.mLogicOp);
>+            break;
>+        case GL_BLEND_SRC:
>+            *params = mBlend.sourceBlendRGB;
>+            break;
>+        case GL_BLEND_DST:
>+            *params = mBlend.destBlendRGB;
>+            break;
>+        case GL_PERSPECTIVE_CORRECTION_HINT:
>+        case GL_POINT_SMOOTH_HINT:
>+        case GL_LINE_SMOOTH_HINT:
>+        case GL_FOG_HINT:
>+            *params = mGLES1State.getHint(pname);
>+            break;
>+
>+        // GL_ANGLE_provoking_vertex
>+        case GL_PROVOKING_VERTEX:
>+            *params = ToGLenum(mProvokingVertex);
>+            break;
>+
>+        default:
>+            UNREACHABLE();
>+            break;
>     }
>+
>+    return angle::Result::Continue;
> }
> 
>-void State::getPointerv(GLenum pname, void **params) const
>+void State::getPointerv(const Context *context, GLenum pname, void **params) const
> {
>     switch (pname)
>     {
>@@ -2057,6 +2420,15 @@ void State::getPointerv(GLenum pname, void **params) const
>         case GL_DEBUG_CALLBACK_USER_PARAM:
>             *params = const_cast<void *>(mDebug.getUserParam());
>             break;
>+        case GL_VERTEX_ARRAY_POINTER:
>+        case GL_NORMAL_ARRAY_POINTER:
>+        case GL_COLOR_ARRAY_POINTER:
>+        case GL_TEXTURE_COORD_ARRAY_POINTER:
>+        case GL_POINT_SIZE_ARRAY_POINTER_OES:
>+            QueryVertexAttribPointerv(getVertexArray()->getVertexAttribute(
>+                                          context->vertexArrayIndex(ParamToVertexArrayType(pname))),
>+                                      GL_VERTEX_ATTRIB_ARRAY_POINTER, params);
>+            return;
>         default:
>             UNREACHABLE();
>             break;
>@@ -2067,45 +2439,65 @@ void State::getIntegeri_v(GLenum target, GLuint index, GLint *data)
> {
>     switch (target)
>     {
>-      case GL_TRANSFORM_FEEDBACK_BUFFER_BINDING:
>-          ASSERT(static_cast<size_t>(index) < mTransformFeedback->getIndexedBufferCount());
>-          *data = mTransformFeedback->getIndexedBuffer(index).id();
>-          break;
>-      case GL_UNIFORM_BUFFER_BINDING:
>-          ASSERT(static_cast<size_t>(index) < mUniformBuffers.size());
>-          *data = mUniformBuffers[index].id();
>-          break;
>-      case GL_ATOMIC_COUNTER_BUFFER_BINDING:
>-          ASSERT(static_cast<size_t>(index) < mAtomicCounterBuffers.size());
>-          *data = mAtomicCounterBuffers[index].id();
>-          break;
>-      case GL_SHADER_STORAGE_BUFFER_BINDING:
>-          ASSERT(static_cast<size_t>(index) < mShaderStorageBuffers.size());
>-          *data = mShaderStorageBuffers[index].id();
>-          break;
>-      case GL_VERTEX_BINDING_BUFFER:
>-          ASSERT(static_cast<size_t>(index) < mVertexArray->getMaxBindings());
>-          *data = mVertexArray->getVertexBinding(index).getBuffer().id();
>-          break;
>-      case GL_VERTEX_BINDING_DIVISOR:
>-          ASSERT(static_cast<size_t>(index) < mVertexArray->getMaxBindings());
>-          *data = mVertexArray->getVertexBinding(index).getDivisor();
>-          break;
>-      case GL_VERTEX_BINDING_OFFSET:
>-          ASSERT(static_cast<size_t>(index) < mVertexArray->getMaxBindings());
>-          *data = static_cast<GLuint>(mVertexArray->getVertexBinding(index).getOffset());
>-          break;
>-      case GL_VERTEX_BINDING_STRIDE:
>-          ASSERT(static_cast<size_t>(index) < mVertexArray->getMaxBindings());
>-          *data = mVertexArray->getVertexBinding(index).getStride();
>-          break;
>-      case GL_SAMPLE_MASK_VALUE:
>-          ASSERT(static_cast<size_t>(index) < mSampleMaskValues.size());
>-          *data = mSampleMaskValues[index];
>-          break;
>-      default:
>-          UNREACHABLE();
>-          break;
>+        case GL_TRANSFORM_FEEDBACK_BUFFER_BINDING:
>+            ASSERT(static_cast<size_t>(index) < mTransformFeedback->getIndexedBufferCount());
>+            *data = mTransformFeedback->getIndexedBuffer(index).id();
>+            break;
>+        case GL_UNIFORM_BUFFER_BINDING:
>+            ASSERT(static_cast<size_t>(index) < mUniformBuffers.size());
>+            *data = mUniformBuffers[index].id();
>+            break;
>+        case GL_ATOMIC_COUNTER_BUFFER_BINDING:
>+            ASSERT(static_cast<size_t>(index) < mAtomicCounterBuffers.size());
>+            *data = mAtomicCounterBuffers[index].id();
>+            break;
>+        case GL_SHADER_STORAGE_BUFFER_BINDING:
>+            ASSERT(static_cast<size_t>(index) < mShaderStorageBuffers.size());
>+            *data = mShaderStorageBuffers[index].id();
>+            break;
>+        case GL_VERTEX_BINDING_BUFFER:
>+            ASSERT(static_cast<size_t>(index) < mVertexArray->getMaxBindings());
>+            *data = mVertexArray->getVertexBinding(index).getBuffer().id();
>+            break;
>+        case GL_VERTEX_BINDING_DIVISOR:
>+            ASSERT(static_cast<size_t>(index) < mVertexArray->getMaxBindings());
>+            *data = mVertexArray->getVertexBinding(index).getDivisor();
>+            break;
>+        case GL_VERTEX_BINDING_OFFSET:
>+            ASSERT(static_cast<size_t>(index) < mVertexArray->getMaxBindings());
>+            *data = static_cast<GLuint>(mVertexArray->getVertexBinding(index).getOffset());
>+            break;
>+        case GL_VERTEX_BINDING_STRIDE:
>+            ASSERT(static_cast<size_t>(index) < mVertexArray->getMaxBindings());
>+            *data = mVertexArray->getVertexBinding(index).getStride();
>+            break;
>+        case GL_SAMPLE_MASK_VALUE:
>+            ASSERT(static_cast<size_t>(index) < mSampleMaskValues.size());
>+            *data = mSampleMaskValues[index];
>+            break;
>+        case GL_IMAGE_BINDING_NAME:
>+            ASSERT(static_cast<size_t>(index) < mImageUnits.size());
>+            *data = mImageUnits[index].texture.id();
>+            break;
>+        case GL_IMAGE_BINDING_LEVEL:
>+            ASSERT(static_cast<size_t>(index) < mImageUnits.size());
>+            *data = mImageUnits[index].level;
>+            break;
>+        case GL_IMAGE_BINDING_LAYER:
>+            ASSERT(static_cast<size_t>(index) < mImageUnits.size());
>+            *data = mImageUnits[index].layer;
>+            break;
>+        case GL_IMAGE_BINDING_ACCESS:
>+            ASSERT(static_cast<size_t>(index) < mImageUnits.size());
>+            *data = mImageUnits[index].access;
>+            break;
>+        case GL_IMAGE_BINDING_FORMAT:
>+            ASSERT(static_cast<size_t>(index) < mImageUnits.size());
>+            *data = mImageUnits[index].format;
>+            break;
>+        default:
>+            UNREACHABLE();
>+            break;
>     }
> }
> 
>@@ -2113,191 +2505,160 @@ void State::getInteger64i_v(GLenum target, GLuint index, GLint64 *data)
> {
>     switch (target)
>     {
>-      case GL_TRANSFORM_FEEDBACK_BUFFER_START:
>-          ASSERT(static_cast<size_t>(index) < mTransformFeedback->getIndexedBufferCount());
>-          *data = mTransformFeedback->getIndexedBuffer(index).getOffset();
>-          break;
>-      case GL_TRANSFORM_FEEDBACK_BUFFER_SIZE:
>-          ASSERT(static_cast<size_t>(index) < mTransformFeedback->getIndexedBufferCount());
>-          *data = mTransformFeedback->getIndexedBuffer(index).getSize();
>-          break;
>-      case GL_UNIFORM_BUFFER_START:
>-          ASSERT(static_cast<size_t>(index) < mUniformBuffers.size());
>-          *data = mUniformBuffers[index].getOffset();
>-          break;
>-      case GL_UNIFORM_BUFFER_SIZE:
>-          ASSERT(static_cast<size_t>(index) < mUniformBuffers.size());
>-          *data = mUniformBuffers[index].getSize();
>-          break;
>-      case GL_ATOMIC_COUNTER_BUFFER_START:
>-          ASSERT(static_cast<size_t>(index) < mAtomicCounterBuffers.size());
>-          *data = mAtomicCounterBuffers[index].getOffset();
>-          break;
>-      case GL_ATOMIC_COUNTER_BUFFER_SIZE:
>-          ASSERT(static_cast<size_t>(index) < mAtomicCounterBuffers.size());
>-          *data = mAtomicCounterBuffers[index].getSize();
>-          break;
>-      case GL_SHADER_STORAGE_BUFFER_START:
>-          ASSERT(static_cast<size_t>(index) < mShaderStorageBuffers.size());
>-          *data = mShaderStorageBuffers[index].getOffset();
>-          break;
>-      case GL_SHADER_STORAGE_BUFFER_SIZE:
>-          ASSERT(static_cast<size_t>(index) < mShaderStorageBuffers.size());
>-          *data = mShaderStorageBuffers[index].getSize();
>-          break;
>-      default:
>-          UNREACHABLE();
>-          break;
>+        case GL_TRANSFORM_FEEDBACK_BUFFER_START:
>+            ASSERT(static_cast<size_t>(index) < mTransformFeedback->getIndexedBufferCount());
>+            *data = mTransformFeedback->getIndexedBuffer(index).getOffset();
>+            break;
>+        case GL_TRANSFORM_FEEDBACK_BUFFER_SIZE:
>+            ASSERT(static_cast<size_t>(index) < mTransformFeedback->getIndexedBufferCount());
>+            *data = mTransformFeedback->getIndexedBuffer(index).getSize();
>+            break;
>+        case GL_UNIFORM_BUFFER_START:
>+            ASSERT(static_cast<size_t>(index) < mUniformBuffers.size());
>+            *data = mUniformBuffers[index].getOffset();
>+            break;
>+        case GL_UNIFORM_BUFFER_SIZE:
>+            ASSERT(static_cast<size_t>(index) < mUniformBuffers.size());
>+            *data = mUniformBuffers[index].getSize();
>+            break;
>+        case GL_ATOMIC_COUNTER_BUFFER_START:
>+            ASSERT(static_cast<size_t>(index) < mAtomicCounterBuffers.size());
>+            *data = mAtomicCounterBuffers[index].getOffset();
>+            break;
>+        case GL_ATOMIC_COUNTER_BUFFER_SIZE:
>+            ASSERT(static_cast<size_t>(index) < mAtomicCounterBuffers.size());
>+            *data = mAtomicCounterBuffers[index].getSize();
>+            break;
>+        case GL_SHADER_STORAGE_BUFFER_START:
>+            ASSERT(static_cast<size_t>(index) < mShaderStorageBuffers.size());
>+            *data = mShaderStorageBuffers[index].getOffset();
>+            break;
>+        case GL_SHADER_STORAGE_BUFFER_SIZE:
>+            ASSERT(static_cast<size_t>(index) < mShaderStorageBuffers.size());
>+            *data = mShaderStorageBuffers[index].getSize();
>+            break;
>+        default:
>+            UNREACHABLE();
>+            break;
>     }
> }
> 
> void State::getBooleani_v(GLenum target, GLuint index, GLboolean *data)
> {
>-    UNREACHABLE();
>+    switch (target)
>+    {
>+        case GL_IMAGE_BINDING_LAYERED:
>+            ASSERT(static_cast<size_t>(index) < mImageUnits.size());
>+            *data = mImageUnits[index].layered;
>+            break;
>+        default:
>+            UNREACHABLE();
>+            break;
>+    }
> }
> 
>-bool State::hasMappedBuffer(BufferBinding target) const
>+angle::Result State::syncReadFramebuffer(const Context *context)
> {
>-    if (target == BufferBinding::Array)
>-    {
>-        const VertexArray *vao     = getVertexArray();
>-        const auto &vertexAttribs = vao->getVertexAttributes();
>-        const auto &vertexBindings = vao->getVertexBindings();
>-        size_t maxEnabledAttrib = vao->getMaxEnabledAttribute();
>-        for (size_t attribIndex = 0; attribIndex < maxEnabledAttrib; attribIndex++)
>-        {
>-            const VertexAttribute &vertexAttrib = vertexAttribs[attribIndex];
>-            auto *boundBuffer = vertexBindings[vertexAttrib.bindingIndex].getBuffer().get();
>-            if (vertexAttrib.enabled && boundBuffer && boundBuffer->isMapped())
>-            {
>-                return true;
>-            }
>-        }
>-
>-        return false;
>-    }
>-    else
>-    {
>-        Buffer *buffer = getTargetBuffer(target);
>-        return (buffer && buffer->isMapped());
>-    }
>+    ASSERT(mReadFramebuffer);
>+    return mReadFramebuffer->syncState(context);
> }
> 
>-void State::syncDirtyObjects(const Context *context)
>+angle::Result State::syncDrawFramebuffer(const Context *context)
> {
>-    if (!mDirtyObjects.any())
>-        return;
>+    ASSERT(mDrawFramebuffer);
>+    return mDrawFramebuffer->syncState(context);
>+}
> 
>-    syncDirtyObjects(context, mDirtyObjects);
>+angle::Result State::syncDrawAttachments(const Context *context)
>+{
>+    ASSERT(mDrawFramebuffer);
>+    ASSERT(!mDrawFramebuffer->hasAnyDirtyBit());
>+    ASSERT(mRobustResourceInit);
>+    return mDrawFramebuffer->ensureDrawAttachmentsInitialized(context);
> }
> 
>-void State::syncDirtyObjects(const Context *context, const DirtyObjects &bitset)
>+angle::Result State::syncTextures(const Context *context)
> {
>-    for (auto dirtyObject : bitset)
>+    if (mDirtyTextures.none())
>+        return angle::Result::Continue;
>+
>+    for (size_t textureIndex : mDirtyTextures)
>     {
>-        switch (dirtyObject)
>+        Texture *texture = mActiveTexturesCache[textureIndex];
>+        if (texture && texture->hasAnyDirtyBit())
>         {
>-            case DIRTY_OBJECT_READ_FRAMEBUFFER:
>-                ASSERT(mReadFramebuffer);
>-                mReadFramebuffer->syncState(context);
>-                break;
>-            case DIRTY_OBJECT_DRAW_FRAMEBUFFER:
>-                ASSERT(mDrawFramebuffer);
>-                mDrawFramebuffer->syncState(context);
>-                break;
>-            case DIRTY_OBJECT_VERTEX_ARRAY:
>-                ASSERT(mVertexArray);
>-                mVertexArray->syncState(context);
>-                break;
>-            case DIRTY_OBJECT_PROGRAM_TEXTURES:
>-                syncProgramTextures(context);
>-                break;
>-
>-            default:
>-                UNREACHABLE();
>-                break;
>+            ANGLE_TRY(texture->syncState(context));
>         }
>     }
> 
>-    mDirtyObjects &= ~bitset;
>+    mDirtyTextures.reset();
>+    return angle::Result::Continue;
> }
> 
>-void State::syncProgramTextures(const Context *context)
>+angle::Result State::syncSamplers(const Context *context)
> {
>-    // TODO(jmadill): Fine-grained updates.
>-    if (!mProgram)
>+    if (mDirtySamplers.none())
>+        return angle::Result::Continue;
>+
>+    for (size_t samplerIndex : mDirtySamplers)
>     {
>-        return;
>+        BindingPointer<Sampler> &sampler = mSamplers[samplerIndex];
>+        if (sampler.get())
>+        {
>+            sampler->syncState(context);
>+        }
>     }
> 
>-    ASSERT(mDirtyObjects[DIRTY_OBJECT_PROGRAM_TEXTURES]);
>-    mDirtyBits.set(DIRTY_BIT_TEXTURE_BINDINGS);
>-
>-    ActiveTextureMask newActiveTextures;
>-
>-    // Initialize to the 'Initialized' state and set to 'MayNeedInit' if any texture is not
>-    // initialized.
>-    mCachedTexturesInitState = InitState::Initialized;
>+    mDirtySamplers.reset();
> 
>-    for (const SamplerBinding &samplerBinding : mProgram->getSamplerBindings())
>-    {
>-        if (samplerBinding.unreferenced)
>-            continue;
>-
>-        GLenum textureType = samplerBinding.textureType;
>-        for (GLuint textureUnitIndex : samplerBinding.boundTextureUnits)
>-        {
>-            Texture *texture = getSamplerTexture(textureUnitIndex, textureType);
>-            Sampler *sampler = getSampler(textureUnitIndex);
>-            ASSERT(static_cast<size_t>(textureUnitIndex) < mCompleteTextureCache.size());
>-            ASSERT(static_cast<size_t>(textureUnitIndex) < newActiveTextures.size());
>+    return angle::Result::Continue;
>+}
> 
>-            ASSERT(texture);
>+angle::Result State::syncVertexArray(const Context *context)
>+{
>+    ASSERT(mVertexArray);
>+    return mVertexArray->syncState(context);
>+}
> 
>-            // Mark the texture binding bit as dirty if the texture completeness changes.
>-            // TODO(jmadill): Use specific dirty bit for completeness change.
>-            if (texture->isSamplerComplete(context, sampler) &&
>-                !mDrawFramebuffer->hasTextureAttachment(texture))
>-            {
>-                texture->syncState();
>-                mCompleteTextureCache[textureUnitIndex] = texture;
>-            }
>-            else
>-            {
>-                mCompleteTextureCache[textureUnitIndex] = nullptr;
>-            }
>+angle::Result State::syncProgram(const Context *context)
>+{
>+    return mProgram->syncState(context);
>+}
> 
>-            // Bind the texture unconditionally, to recieve completeness change notifications.
>-            mCompleteTextureBindings[textureUnitIndex].bind(texture->getDirtyChannel());
>-            mActiveTexturesMask.set(textureUnitIndex);
>-            newActiveTextures.set(textureUnitIndex);
>+angle::Result State::syncTexturesInit(const Context *context)
>+{
>+    ASSERT(mRobustResourceInit);
> 
>-            if (sampler != nullptr)
>-            {
>-                sampler->syncState(context);
>-            }
>+    if (!mProgram)
>+        return angle::Result::Continue;
> 
>-            if (texture->initState() == InitState::MayNeedInit)
>-            {
>-                mCachedTexturesInitState = InitState::MayNeedInit;
>-            }
>+    for (size_t textureUnitIndex : mProgram->getActiveSamplersMask())
>+    {
>+        Texture *texture = mActiveTexturesCache[textureUnitIndex];
>+        if (texture)
>+        {
>+            ANGLE_TRY(texture->ensureInitialized(context));
>         }
>     }
>+    return angle::Result::Continue;
>+}
> 
>-    // Unset now missing textures.
>-    ActiveTextureMask negativeMask = mActiveTexturesMask & ~newActiveTextures;
>-    if (negativeMask.any())
>+angle::Result State::syncImagesInit(const Context *context)
>+{
>+    ASSERT(mRobustResourceInit);
>+    ASSERT(mProgram);
>+    for (size_t imageUnitIndex : mProgram->getActiveImagesMask())
>     {
>-        for (auto textureIndex : negativeMask)
>+        Texture *texture = mImageUnits[imageUnitIndex].texture.get();
>+        if (texture)
>         {
>-            mCompleteTextureBindings[textureIndex].reset();
>-            mCompleteTextureCache[textureIndex] = nullptr;
>-            mActiveTexturesMask.reset(textureIndex);
>+            ANGLE_TRY(texture->ensureInitialized(context));
>         }
>     }
>+    return angle::Result::Continue;
> }
> 
>-void State::syncDirtyObject(const Context *context, GLenum target)
>+angle::Result State::syncDirtyObject(const Context *context, GLenum target)
> {
>     DirtyObjects localSet;
> 
>@@ -2317,13 +2678,17 @@ void State::syncDirtyObject(const Context *context, GLenum target)
>             localSet.set(DIRTY_OBJECT_VERTEX_ARRAY);
>             break;
>         case GL_TEXTURE:
>+            localSet.set(DIRTY_OBJECT_TEXTURES);
>+            break;
>         case GL_SAMPLER:
>+            localSet.set(DIRTY_OBJECT_SAMPLERS);
>+            break;
>         case GL_PROGRAM:
>-            localSet.set(DIRTY_OBJECT_PROGRAM_TEXTURES);
>+            localSet.set(DIRTY_OBJECT_PROGRAM);
>             break;
>     }
> 
>-    syncDirtyObjects(context, localSet);
>+    return syncDirtyObjects(context, localSet);
> }
> 
> void State::setObjectDirty(GLenum target)
>@@ -2334,39 +2699,86 @@ void State::setObjectDirty(GLenum target)
>             mDirtyObjects.set(DIRTY_OBJECT_READ_FRAMEBUFFER);
>             break;
>         case GL_DRAW_FRAMEBUFFER:
>-            mDirtyObjects.set(DIRTY_OBJECT_DRAW_FRAMEBUFFER);
>+            setDrawFramebufferDirty();
>             break;
>         case GL_FRAMEBUFFER:
>             mDirtyObjects.set(DIRTY_OBJECT_READ_FRAMEBUFFER);
>-            mDirtyObjects.set(DIRTY_OBJECT_DRAW_FRAMEBUFFER);
>+            setDrawFramebufferDirty();
>             break;
>         case GL_VERTEX_ARRAY:
>             mDirtyObjects.set(DIRTY_OBJECT_VERTEX_ARRAY);
>             break;
>-        case GL_TEXTURE:
>-        case GL_SAMPLER:
>         case GL_PROGRAM:
>-            mDirtyObjects.set(DIRTY_OBJECT_PROGRAM_TEXTURES);
>-            mDirtyBits.set(DIRTY_BIT_TEXTURE_BINDINGS);
>+            mDirtyObjects.set(DIRTY_OBJECT_PROGRAM);
>+            break;
>+        default:
>             break;
>     }
> }
> 
>-void State::onProgramExecutableChange(Program *program)
>+angle::Result State::onProgramExecutableChange(const Context *context, Program *program)
> {
>     // OpenGL Spec:
>     // "If LinkProgram or ProgramBinary successfully re-links a program object
>     //  that was already in use as a result of a previous call to UseProgram, then the
>     //  generated executable code will be installed as part of the current rendering state."
>-    if (program->isLinked() && mProgram == program)
>+    ASSERT(program->isLinked());
>+
>+    mDirtyBits.set(DIRTY_BIT_PROGRAM_EXECUTABLE);
>+
>+    if (program->hasAnyDirtyBit())
>     {
>-        mDirtyBits.set(DIRTY_BIT_PROGRAM_EXECUTABLE);
>-        mDirtyObjects.set(DIRTY_OBJECT_PROGRAM_TEXTURES);
>+        mDirtyObjects.set(DIRTY_OBJECT_PROGRAM);
>+    }
>+
>+    // Set any bound textures.
>+    const ActiveTextureTypeArray &textureTypes = program->getActiveSamplerTypes();
>+    for (size_t textureIndex : program->getActiveSamplersMask())
>+    {
>+        TextureType type = textureTypes[textureIndex];
>+
>+        // This can happen if there is a conflicting texture type.
>+        if (type == TextureType::InvalidEnum)
>+            continue;
>+
>+        Texture *texture = mSamplerTextures[type][textureIndex].get();
>+        updateActiveTexture(context, textureIndex, texture);
>     }
>+
>+    for (size_t imageUnitIndex : program->getActiveImagesMask())
>+    {
>+        Texture *image = mImageUnits[imageUnitIndex].texture.get();
>+        if (!image)
>+            continue;
>+
>+        if (image->hasAnyDirtyBit())
>+        {
>+            ANGLE_TRY(image->syncState(context));
>+        }
>+
>+        if (mRobustResourceInit && image->initState() == InitState::MayNeedInit)
>+        {
>+            mDirtyObjects.set(DIRTY_OBJECT_IMAGES_INIT);
>+        }
>+    }
>+
>+    return angle::Result::Continue;
>+}
>+
>+void State::setTextureDirty(size_t textureUnitIndex)
>+{
>+    mDirtyObjects.set(DIRTY_OBJECT_TEXTURES);
>+    mDirtyTextures.set(textureUnitIndex);
>+}
>+
>+void State::setSamplerDirty(size_t samplerIndex)
>+{
>+    mDirtyObjects.set(DIRTY_OBJECT_SAMPLERS);
>+    mDirtySamplers.set(samplerIndex);
> }
> 
> void State::setImageUnit(const Context *context,
>-                         GLuint unit,
>+                         size_t unit,
>                          Texture *texture,
>                          GLint level,
>                          GLboolean layered,
>@@ -2380,47 +2792,56 @@ void State::setImageUnit(const Context *context,
>     mImageUnits[unit].layer   = layer;
>     mImageUnits[unit].access  = access;
>     mImageUnits[unit].format  = format;
>-}
>+    mDirtyBits.set(DIRTY_BIT_IMAGE_BINDINGS);
> 
>-const ImageUnit &State::getImageUnit(GLuint unit) const
>-{
>-    return mImageUnits[unit];
>+    onImageStateChange(context, unit);
> }
> 
> // Handle a dirty texture event.
>-void State::signal(size_t textureIndex, InitState initState)
>+void State::onActiveTextureChange(const Context *context, size_t textureUnit)
> {
>-    // Conservatively assume all textures are dirty.
>-    // TODO(jmadill): More fine-grained update.
>-    mDirtyObjects.set(DIRTY_OBJECT_PROGRAM_TEXTURES);
>-
>-    if (initState == InitState::MayNeedInit)
>+    if (mProgram)
>     {
>-        mCachedTexturesInitState = InitState::MayNeedInit;
>+        TextureType type = mProgram->getActiveSamplerTypes()[textureUnit];
>+        if (type != TextureType::InvalidEnum)
>+        {
>+            Texture *activeTexture = mSamplerTextures[type][textureUnit].get();
>+            updateActiveTexture(context, textureUnit, activeTexture);
>+        }
>     }
> }
> 
>-Error State::clearUnclearedActiveTextures(const Context *context)
>+void State::onActiveTextureStateChange(const Context *context, size_t textureUnit)
> {
>-    ASSERT(mRobustResourceInit);
>-
>-    if (mCachedTexturesInitState == InitState::Initialized)
>+    if (mProgram)
>     {
>-        return NoError();
>+        TextureType type = mProgram->getActiveSamplerTypes()[textureUnit];
>+        if (type != TextureType::InvalidEnum)
>+        {
>+            Texture *activeTexture = mSamplerTextures[type][textureUnit].get();
>+            const Sampler *sampler = mSamplers[textureUnit].get();
>+            updateActiveTextureState(context, textureUnit, sampler, activeTexture);
>+        }
>     }
>+}
> 
>-    for (auto textureIndex : mActiveTexturesMask)
>+void State::onImageStateChange(const Context *context, size_t unit)
>+{
>+    if (mProgram)
>     {
>-        Texture *texture = mCompleteTextureCache[textureIndex];
>-        if (texture)
>+        const ImageUnit &image = mImageUnits[unit];
>+        ASSERT(image.texture.get());
>+        if (mRobustResourceInit && image.texture->initState() == InitState::MayNeedInit)
>         {
>-            ANGLE_TRY(texture->ensureInitialized(context));
>+            mDirtyObjects.set(DIRTY_OBJECT_IMAGES_INIT);
>         }
>     }
>+}
> 
>-    mCachedTexturesInitState = InitState::Initialized;
>-
>-    return NoError();
>+void State::onUniformBufferStateChange(size_t uniformBufferIndex)
>+{
>+    // This could be represented by a different dirty bit. Using the same one keeps it simple.
>+    mDirtyBits.set(DIRTY_BIT_UNIFORM_BUFFER_BINDINGS);
> }
> 
> AttributesMask State::getAndResetDirtyCurrentValues() const
>@@ -2430,4 +2851,6 @@ AttributesMask State::getAndResetDirtyCurrentValues() const
>     return retVal;
> }
> 
>+constexpr State::DirtyObjectHandler State::kDirtyObjectHandlers[DIRTY_OBJECT_MAX];
>+
> }  // namespace gl
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/State.h b/Source/ThirdParty/ANGLE/src/libANGLE/State.h
>index 52e1d783823..bec9a5e09cb 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/State.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/State.h
>@@ -16,6 +16,7 @@
> #include "common/angleutils.h"
> #include "common/bitset_utils.h"
> #include "libANGLE/Debug.h"
>+#include "libANGLE/GLES1State.h"
> #include "libANGLE/Program.h"
> #include "libANGLE/ProgramPipeline.h"
> #include "libANGLE/RefCountObject.h"
>@@ -24,30 +25,68 @@
> #include "libANGLE/Texture.h"
> #include "libANGLE/TransformFeedback.h"
> #include "libANGLE/Version.h"
>-#include "libANGLE/VertexAttribute.h"
>+#include "libANGLE/VertexArray.h"
> #include "libANGLE/angletypes.h"
> 
> namespace gl
> {
>+class BufferManager;
>+struct Caps;
>+class Context;
>+class FramebufferManager;
>+class MemoryObjectManager;
>+class PathManager;
>+class ProgramPipelineManager;
> class Query;
>+class RenderbufferManager;
>+class SamplerManager;
>+class ShaderProgramManager;
>+class SyncManager;
>+class TextureManager;
> class VertexArray;
>-class Context;
>-struct Caps;
> 
>-class State : public OnAttachmentDirtyReceiver, angle::NonCopyable
>+static constexpr Version ES_2_0 = Version(2, 0);
>+static constexpr Version ES_3_0 = Version(3, 0);
>+static constexpr Version ES_3_1 = Version(3, 1);
>+
>+using ContextID = uintptr_t;
>+
>+class State : angle::NonCopyable
> {
>   public:
>-    State();
>-    ~State() override;
>-
>-    void initialize(const Context *context,
>-                    bool debug,
>-                    bool bindGeneratesResource,
>-                    bool clientArraysEnabled,
>-                    bool robustResourceInit,
>-                    bool programBinaryCacheEnabled);
>+    State(ContextID contextIn,
>+          const State *shareContextState,
>+          TextureManager *shareTextures,
>+          const Version &clientVersion,
>+          bool debug,
>+          bool bindGeneratesResource,
>+          bool clientArraysEnabled,
>+          bool robustResourceInit,
>+          bool programBinaryCacheEnabled);
>+    ~State();
>+
>+    void initialize(Context *context);
>     void reset(const Context *context);
> 
>+    // Getters
>+    ContextID getContextID() const { return mContext; }
>+    GLint getClientMajorVersion() const { return mClientVersion.major; }
>+    GLint getClientMinorVersion() const { return mClientVersion.minor; }
>+    const Version &getClientVersion() const { return mClientVersion; }
>+    const Caps &getCaps() const { return mCaps; }
>+    const TextureCapsMap &getTextureCaps() const { return mTextureCaps; }
>+    const Extensions &getExtensions() const { return mExtensions; }
>+    const Limitations &getLimitations() const { return mLimitations; }
>+
>+    bool isWebGL() const { return mExtensions.webglCompatibility; }
>+
>+    bool isWebGL1() const { return (isWebGL() && mClientVersion.major == 2); }
>+
>+    const TextureCaps &getTextureCap(GLenum internalFormat) const
>+    {
>+        return mTextureCaps.get(internalFormat);
>+    }
>+
>     // State chunk getters
>     const RasterizerState &getRasterizerState() const;
>     const BlendState &getBlendState() const;
>@@ -67,37 +106,37 @@ class State : public OnAttachmentDirtyReceiver, angle::NonCopyable
>     void setDepthMask(bool mask);
> 
>     // Discard toggle & query
>-    bool isRasterizerDiscardEnabled() const;
>+    bool isRasterizerDiscardEnabled() const { return mRasterizer.rasterizerDiscard; }
>     void setRasterizerDiscard(bool enabled);
> 
>     // Primitive restart
>-    bool isPrimitiveRestartEnabled() const;
>+    bool isPrimitiveRestartEnabled() const { return mPrimitiveRestart; }
>     void setPrimitiveRestart(bool enabled);
> 
>     // Face culling state manipulation
>-    bool isCullFaceEnabled() const;
>+    bool isCullFaceEnabled() const { return mRasterizer.cullFace; }
>     void setCullFace(bool enabled);
>     void setCullMode(CullFaceMode mode);
>     void setFrontFace(GLenum front);
> 
>     // Depth test state manipulation
>-    bool isDepthTestEnabled() const;
>+    bool isDepthTestEnabled() const { return mDepthStencil.depthTest; }
>     void setDepthTest(bool enabled);
>     void setDepthFunc(GLenum depthFunc);
>     void setDepthRange(float zNear, float zFar);
>-    float getNearPlane() const;
>-    float getFarPlane() const;
>+    float getNearPlane() const { return mNearZ; }
>+    float getFarPlane() const { return mFarZ; }
> 
>     // Blend state manipulation
>-    bool isBlendEnabled() const;
>+    bool isBlendEnabled() const { return mBlend.blend; }
>     void setBlend(bool enabled);
>     void setBlendFactors(GLenum sourceRGB, GLenum destRGB, GLenum sourceAlpha, GLenum destAlpha);
>     void setBlendColor(float red, float green, float blue, float alpha);
>     void setBlendEquation(GLenum rgbEquation, GLenum alphaEquation);
>-    const ColorF &getBlendColor() const;
>+    const ColorF &getBlendColor() const { return mBlendColor; }
> 
>     // Stencil state maniupulation
>-    bool isStencilTestEnabled() const;
>+    bool isStencilTestEnabled() const { return mDepthStencil.stencilTest; }
>     void setStencilTest(bool enabled);
>     void setStencilParams(GLenum stencilFunc, GLint stencilRef, GLuint stencilMask);
>     void setStencilBackParams(GLenum stencilBackFunc, GLint stencilBackRef, GLuint stencilBackMask);
>@@ -109,44 +148,48 @@ class State : public OnAttachmentDirtyReceiver, angle::NonCopyable
>     void setStencilBackOperations(GLenum stencilBackFail,
>                                   GLenum stencilBackPassDepthFail,
>                                   GLenum stencilBackPassDepthPass);
>-    GLint getStencilRef() const;
>-    GLint getStencilBackRef() const;
>+    GLint getStencilRef() const { return mStencilRef; }
>+    GLint getStencilBackRef() const { return mStencilBackRef; }
> 
>     // Depth bias/polygon offset state manipulation
>-    bool isPolygonOffsetFillEnabled() const;
>+    bool isPolygonOffsetFillEnabled() const { return mRasterizer.polygonOffsetFill; }
>     void setPolygonOffsetFill(bool enabled);
>     void setPolygonOffsetParams(GLfloat factor, GLfloat units);
> 
>     // Multisample coverage state manipulation
>-    bool isSampleAlphaToCoverageEnabled() const;
>+    bool isSampleAlphaToCoverageEnabled() const { return mBlend.sampleAlphaToCoverage; }
>     void setSampleAlphaToCoverage(bool enabled);
>-    bool isSampleCoverageEnabled() const;
>+    bool isSampleCoverageEnabled() const { return mSampleCoverage; }
>     void setSampleCoverage(bool enabled);
>     void setSampleCoverageParams(GLclampf value, bool invert);
>-    GLfloat getSampleCoverageValue() const;
>-    bool getSampleCoverageInvert() const;
>+    GLclampf getSampleCoverageValue() const { return mSampleCoverageValue; }
>+    bool getSampleCoverageInvert() const { return mSampleCoverageInvert; }
> 
>     // Multisample mask state manipulation.
>-    bool isSampleMaskEnabled() const;
>+    bool isSampleMaskEnabled() const { return mSampleMask; }
>     void setSampleMaskEnabled(bool enabled);
>     void setSampleMaskParams(GLuint maskNumber, GLbitfield mask);
>-    GLbitfield getSampleMaskWord(GLuint maskNumber) const;
>-    GLuint getMaxSampleMaskWords() const;
>+    GLbitfield getSampleMaskWord(GLuint maskNumber) const
>+    {
>+        ASSERT(maskNumber < mMaxSampleMaskWords);
>+        return mSampleMaskValues[maskNumber];
>+    }
>+    GLuint getMaxSampleMaskWords() const { return mMaxSampleMaskWords; }
> 
>     // Multisampling/alpha to one manipulation.
>     void setSampleAlphaToOne(bool enabled);
>-    bool isSampleAlphaToOneEnabled() const;
>+    bool isSampleAlphaToOneEnabled() const { return mSampleAlphaToOne; }
>     void setMultisampling(bool enabled);
>-    bool isMultisamplingEnabled() const;
>+    bool isMultisamplingEnabled() const { return mMultiSampling; }
> 
>     // Scissor test state toggle & query
>-    bool isScissorTestEnabled() const;
>+    bool isScissorTestEnabled() const { return mScissorTest; }
>     void setScissorTest(bool enabled);
>     void setScissorParams(GLint x, GLint y, GLsizei width, GLsizei height);
>-    const Rectangle &getScissor() const;
>+    const Rectangle &getScissor() const { return mScissor; }
> 
>     // Dither state toggle & query
>-    bool isDitherEnabled() const;
>+    bool isDitherEnabled() const { return mBlend.dither; }
>     void setDither(bool enabled);
> 
>     // Generic state toggle & query
>@@ -155,116 +198,201 @@ class State : public OnAttachmentDirtyReceiver, angle::NonCopyable
> 
>     // Line width state setter
>     void setLineWidth(GLfloat width);
>-    float getLineWidth() const;
>+    float getLineWidth() const { return mLineWidth; }
> 
>     // Hint setters
>     void setGenerateMipmapHint(GLenum hint);
>     void setFragmentShaderDerivativeHint(GLenum hint);
> 
>     // GL_CHROMIUM_bind_generates_resource
>-    bool isBindGeneratesResourceEnabled() const;
>+    bool isBindGeneratesResourceEnabled() const { return mBindGeneratesResource; }
> 
>     // GL_ANGLE_client_arrays
>-    bool areClientArraysEnabled() const;
>+    bool areClientArraysEnabled() const { return mClientArraysEnabled; }
> 
>     // Viewport state setter/getter
>     void setViewportParams(GLint x, GLint y, GLsizei width, GLsizei height);
>-    const Rectangle &getViewport() const;
>+    const Rectangle &getViewport() const { return mViewport; }
> 
>     // Texture binding & active texture unit manipulation
>     void setActiveSampler(unsigned int active);
>-    unsigned int getActiveSampler() const;
>-    void setSamplerTexture(const Context *context, GLenum type, Texture *texture);
>-    Texture *getTargetTexture(GLenum target) const;
>-    Texture *getSamplerTexture(unsigned int sampler, GLenum type) const;
>-    GLuint getSamplerTextureId(unsigned int sampler, GLenum type) const;
>+    unsigned int getActiveSampler() const { return static_cast<unsigned int>(mActiveSampler); }
>+
>+    void setSamplerTexture(const Context *context, TextureType type, Texture *texture);
>+    Texture *getTargetTexture(TextureType type) const;
>+
>+    Texture *getSamplerTexture(unsigned int sampler, TextureType type) const
>+    {
>+        ASSERT(sampler < mSamplerTextures[type].size());
>+        return mSamplerTextures[type][sampler].get();
>+    }
>+
>+    GLuint getSamplerTextureId(unsigned int sampler, TextureType type) const;
>     void detachTexture(const Context *context, const TextureMap &zeroTextures, GLuint texture);
>     void initializeZeroTextures(const Context *context, const TextureMap &zeroTextures);
> 
>     // Sampler object binding manipulation
>     void setSamplerBinding(const Context *context, GLuint textureUnit, Sampler *sampler);
>-    GLuint getSamplerId(GLuint textureUnit) const;
>-    Sampler *getSampler(GLuint textureUnit) const;
>+    GLuint getSamplerId(GLuint textureUnit) const
>+    {
>+        ASSERT(textureUnit < mSamplers.size());
>+        return mSamplers[textureUnit].id();
>+    }
>+
>+    Sampler *getSampler(GLuint textureUnit) const { return mSamplers[textureUnit].get(); }
>+
>+    using SamplerBindingVector = std::vector<BindingPointer<Sampler>>;
>+    const SamplerBindingVector &getSamplers() const { return mSamplers; }
>+
>     void detachSampler(const Context *context, GLuint sampler);
> 
>     // Renderbuffer binding manipulation
>     void setRenderbufferBinding(const Context *context, Renderbuffer *renderbuffer);
>-    GLuint getRenderbufferId() const;
>-    Renderbuffer *getCurrentRenderbuffer() const;
>+    GLuint getRenderbufferId() const { return mRenderbuffer.id(); }
>+    Renderbuffer *getCurrentRenderbuffer() const { return mRenderbuffer.get(); }
>     void detachRenderbuffer(const Context *context, GLuint renderbuffer);
> 
>     // Framebuffer binding manipulation
>     void setReadFramebufferBinding(Framebuffer *framebuffer);
>     void setDrawFramebufferBinding(Framebuffer *framebuffer);
>     Framebuffer *getTargetFramebuffer(GLenum target) const;
>-    Framebuffer *getReadFramebuffer() const;
>-    Framebuffer *getDrawFramebuffer() const;
>+    Framebuffer *getReadFramebuffer() const { return mReadFramebuffer; }
>+    Framebuffer *getDrawFramebuffer() const { return mDrawFramebuffer; }
>+
>     bool removeReadFramebufferBinding(GLuint framebuffer);
>     bool removeDrawFramebufferBinding(GLuint framebuffer);
> 
>     // Vertex array object binding manipulation
>-    void setVertexArrayBinding(VertexArray *vertexArray);
>+    void setVertexArrayBinding(const Context *context, VertexArray *vertexArray);
>+    bool removeVertexArrayBinding(const Context *context, GLuint vertexArray);
>     GLuint getVertexArrayId() const;
>-    VertexArray *getVertexArray() const;
>-    bool removeVertexArrayBinding(GLuint vertexArray);
>+
>+    VertexArray *getVertexArray() const
>+    {
>+        ASSERT(mVertexArray != nullptr);
>+        return mVertexArray;
>+    }
> 
>     // Program binding manipulation
>-    void setProgram(const Context *context, Program *newProgram);
>-    Program *getProgram() const;
>+    angle::Result setProgram(const Context *context, Program *newProgram);
>+
>+    Program *getProgram() const
>+    {
>+        ASSERT(!mProgram || !mProgram->isLinking());
>+        return mProgram;
>+    }
>+
>+    Program *getLinkedProgram(const Context *context) const
>+    {
>+        if (mProgram)
>+        {
>+            mProgram->resolveLink(context);
>+        }
>+        return mProgram;
>+    }
> 
>     // Transform feedback object (not buffer) binding manipulation
>     void setTransformFeedbackBinding(const Context *context, TransformFeedback *transformFeedback);
>-    TransformFeedback *getCurrentTransformFeedback() const;
>-    bool isTransformFeedbackActiveUnpaused() const;
>+    TransformFeedback *getCurrentTransformFeedback() const { return mTransformFeedback.get(); }
>+
>+    ANGLE_INLINE bool isTransformFeedbackActiveUnpaused() const
>+    {
>+        TransformFeedback *curTransformFeedback = mTransformFeedback.get();
>+        return curTransformFeedback && curTransformFeedback->isActive() &&
>+               !curTransformFeedback->isPaused();
>+    }
>+
>     bool removeTransformFeedbackBinding(const Context *context, GLuint transformFeedback);
> 
>     // Query binding manipulation
>-    bool isQueryActive(const GLenum type) const;
>+    bool isQueryActive(QueryType type) const;
>     bool isQueryActive(Query *query) const;
>-    void setActiveQuery(const Context *context, GLenum target, Query *query);
>-    GLuint getActiveQueryId(GLenum target) const;
>-    Query *getActiveQuery(GLenum target) const;
>+    void setActiveQuery(const Context *context, QueryType type, Query *query);
>+    GLuint getActiveQueryId(QueryType type) const;
>+    Query *getActiveQuery(QueryType type) const;
> 
>     // Program Pipeline binding manipulation
>     void setProgramPipelineBinding(const Context *context, ProgramPipeline *pipeline);
>     void detachProgramPipeline(const Context *context, GLuint pipeline);
> 
>     //// Typed buffer binding point manipulation ////
>-    void setBufferBinding(const Context *context, BufferBinding target, Buffer *buffer);
>-    Buffer *getTargetBuffer(BufferBinding target) const;
>-    void setIndexedBufferBinding(const Context *context,
>-                                 BufferBinding target,
>-                                 GLuint index,
>-                                 Buffer *buffer,
>-                                 GLintptr offset,
>-                                 GLsizeiptr size);
>+    ANGLE_INLINE void setBufferBinding(const Context *context, BufferBinding target, Buffer *buffer)
>+    {
>+        (this->*(kBufferSetters[target]))(context, buffer);
>+    }
>+
>+    ANGLE_INLINE Buffer *getTargetBuffer(BufferBinding target) const
>+    {
>+        switch (target)
>+        {
>+            case BufferBinding::ElementArray:
>+                return getVertexArray()->getElementArrayBuffer();
>+            default:
>+                return mBoundBuffers[target].get();
>+        }
>+    }
>+
>+    angle::Result setIndexedBufferBinding(const Context *context,
>+                                          BufferBinding target,
>+                                          GLuint index,
>+                                          Buffer *buffer,
>+                                          GLintptr offset,
>+                                          GLsizeiptr size);
> 
>     const OffsetBindingPointer<Buffer> &getIndexedUniformBuffer(size_t index) const;
>     const OffsetBindingPointer<Buffer> &getIndexedAtomicCounterBuffer(size_t index) const;
>     const OffsetBindingPointer<Buffer> &getIndexedShaderStorageBuffer(size_t index) const;
> 
>     // Detach a buffer from all bindings
>-    void detachBuffer(const Context *context, GLuint bufferName);
>+    angle::Result detachBuffer(Context *context, const Buffer *buffer);
> 
>     // Vertex attrib manipulation
>     void setEnableVertexAttribArray(unsigned int attribNum, bool enabled);
>-    void setElementArrayBuffer(const Context *context, Buffer *buffer);
>     void setVertexAttribf(GLuint index, const GLfloat values[4]);
>     void setVertexAttribu(GLuint index, const GLuint values[4]);
>     void setVertexAttribi(GLuint index, const GLint values[4]);
>-    void setVertexAttribPointer(const Context *context,
>-                                unsigned int attribNum,
>-                                Buffer *boundBuffer,
>-                                GLint size,
>-                                GLenum type,
>-                                bool normalized,
>-                                bool pureInteger,
>-                                GLsizei stride,
>-                                const void *pointer);
>+
>+    ANGLE_INLINE void setVertexAttribPointer(const Context *context,
>+                                             unsigned int attribNum,
>+                                             Buffer *boundBuffer,
>+                                             GLint size,
>+                                             VertexAttribType type,
>+                                             bool normalized,
>+                                             GLsizei stride,
>+                                             const void *pointer)
>+    {
>+        mVertexArray->setVertexAttribPointer(context, attribNum, boundBuffer, size, type,
>+                                             normalized, stride, pointer);
>+        mDirtyObjects.set(DIRTY_OBJECT_VERTEX_ARRAY);
>+    }
>+
>+    ANGLE_INLINE void setVertexAttribIPointer(const Context *context,
>+                                              unsigned int attribNum,
>+                                              Buffer *boundBuffer,
>+                                              GLint size,
>+                                              VertexAttribType type,
>+                                              GLsizei stride,
>+                                              const void *pointer)
>+    {
>+        mVertexArray->setVertexAttribIPointer(context, attribNum, boundBuffer, size, type, stride,
>+                                              pointer);
>+        mDirtyObjects.set(DIRTY_OBJECT_VERTEX_ARRAY);
>+    }
>+
>     void setVertexAttribDivisor(const Context *context, GLuint index, GLuint divisor);
>-    const VertexAttribCurrentValueData &getVertexAttribCurrentValue(size_t attribNum) const;
>-    const std::vector<VertexAttribCurrentValueData> &getVertexAttribCurrentValues() const;
>+    const VertexAttribCurrentValueData &getVertexAttribCurrentValue(size_t attribNum) const
>+    {
>+        ASSERT(attribNum < mVertexAttribCurrentValues.size());
>+        return mVertexAttribCurrentValues[attribNum];
>+    }
>+
>+    const std::vector<VertexAttribCurrentValueData> &getVertexAttribCurrentValues() const
>+    {
>+        return mVertexAttribCurrentValues;
>+    }
>+
>     const void *getVertexAttribPointer(unsigned int attribNum) const;
>+
>     void bindVertexBuffer(const Context *context,
>                           GLuint bindingIndex,
>                           Buffer *boundBuffer,
>@@ -272,78 +400,86 @@ class State : public OnAttachmentDirtyReceiver, angle::NonCopyable
>                           GLsizei stride);
>     void setVertexAttribFormat(GLuint attribIndex,
>                                GLint size,
>-                               GLenum type,
>+                               VertexAttribType type,
>                                bool normalized,
>                                bool pureInteger,
>                                GLuint relativeOffset);
>-    void setVertexAttribBinding(const Context *context, GLuint attribIndex, GLuint bindingIndex);
>+
>+    void setVertexAttribBinding(const Context *context, GLuint attribIndex, GLuint bindingIndex)
>+    {
>+        mVertexArray->setVertexAttribBinding(context, attribIndex, bindingIndex);
>+        mDirtyObjects.set(DIRTY_OBJECT_VERTEX_ARRAY);
>+    }
>+
>     void setVertexBindingDivisor(GLuint bindingIndex, GLuint divisor);
> 
>     // Pixel pack state manipulation
>     void setPackAlignment(GLint alignment);
>-    GLint getPackAlignment() const;
>+    GLint getPackAlignment() const { return mPack.alignment; }
>     void setPackReverseRowOrder(bool reverseRowOrder);
>-    bool getPackReverseRowOrder() const;
>+    bool getPackReverseRowOrder() const { return mPack.reverseRowOrder; }
>     void setPackRowLength(GLint rowLength);
>-    GLint getPackRowLength() const;
>+    GLint getPackRowLength() const { return mPack.rowLength; }
>     void setPackSkipRows(GLint skipRows);
>-    GLint getPackSkipRows() const;
>+    GLint getPackSkipRows() const { return mPack.skipRows; }
>     void setPackSkipPixels(GLint skipPixels);
>-    GLint getPackSkipPixels() const;
>-    const PixelPackState &getPackState() const;
>-    PixelPackState &getPackState();
>+    GLint getPackSkipPixels() const { return mPack.skipPixels; }
>+    const PixelPackState &getPackState() const { return mPack; }
>+    PixelPackState &getPackState() { return mPack; }
> 
>     // Pixel unpack state manipulation
>     void setUnpackAlignment(GLint alignment);
>-    GLint getUnpackAlignment() const;
>+    GLint getUnpackAlignment() const { return mUnpack.alignment; }
>     void setUnpackRowLength(GLint rowLength);
>-    GLint getUnpackRowLength() const;
>+    GLint getUnpackRowLength() const { return mUnpack.rowLength; }
>     void setUnpackImageHeight(GLint imageHeight);
>-    GLint getUnpackImageHeight() const;
>+    GLint getUnpackImageHeight() const { return mUnpack.imageHeight; }
>     void setUnpackSkipImages(GLint skipImages);
>-    GLint getUnpackSkipImages() const;
>+    GLint getUnpackSkipImages() const { return mUnpack.skipImages; }
>     void setUnpackSkipRows(GLint skipRows);
>-    GLint getUnpackSkipRows() const;
>+    GLint getUnpackSkipRows() const { return mUnpack.skipRows; }
>     void setUnpackSkipPixels(GLint skipPixels);
>-    GLint getUnpackSkipPixels() const;
>-    const PixelUnpackState &getUnpackState() const;
>-    PixelUnpackState &getUnpackState();
>+    GLint getUnpackSkipPixels() const { return mUnpack.skipPixels; }
>+    const PixelUnpackState &getUnpackState() const { return mUnpack; }
>+    PixelUnpackState &getUnpackState() { return mUnpack; }
> 
>     // Debug state
>-    const Debug &getDebug() const;
>-    Debug &getDebug();
>+    const Debug &getDebug() const { return mDebug; }
>+    Debug &getDebug() { return mDebug; }
> 
>     // CHROMIUM_framebuffer_mixed_samples coverage modulation
>     void setCoverageModulation(GLenum components);
>-    GLenum getCoverageModulation() const;
>+    GLenum getCoverageModulation() const { return mCoverageModulation; }
> 
>     // CHROMIUM_path_rendering
>     void loadPathRenderingMatrix(GLenum matrixMode, const GLfloat *matrix);
>     const GLfloat *getPathRenderingMatrix(GLenum which) const;
>     void setPathStencilFunc(GLenum func, GLint ref, GLuint mask);
>-
>-    GLenum getPathStencilFunc() const;
>-    GLint getPathStencilRef() const;
>-    GLuint getPathStencilMask() const;
>+    GLenum getPathStencilFunc() const { return mPathStencilFunc; }
>+    GLint getPathStencilRef() const { return mPathStencilRef; }
>+    GLuint getPathStencilMask() const { return mPathStencilMask; }
> 
>     // GL_EXT_sRGB_write_control
>     void setFramebufferSRGB(bool sRGB);
>-    bool getFramebufferSRGB() const;
>+    bool getFramebufferSRGB() const { return mFramebufferSRGB; }
>+
>+    // GL_KHR_parallel_shader_compile
>+    void setMaxShaderCompilerThreads(GLuint count);
>+    GLuint getMaxShaderCompilerThreads() const { return mMaxShaderCompilerThreads; }
> 
>     // State query functions
>     void getBooleanv(GLenum pname, GLboolean *params);
>     void getFloatv(GLenum pname, GLfloat *params);
>-    void getIntegerv(const Context *context, GLenum pname, GLint *params);
>-    void getPointerv(GLenum pname, void **params) const;
>+    angle::Result getIntegerv(const Context *context, GLenum pname, GLint *params);
>+    void getPointerv(const Context *context, GLenum pname, void **params) const;
>     void getIntegeri_v(GLenum target, GLuint index, GLint *data);
>     void getInteger64i_v(GLenum target, GLuint index, GLint64 *data);
>     void getBooleani_v(GLenum target, GLuint index, GLboolean *data);
> 
>-    bool hasMappedBuffer(BufferBinding target) const;
>     bool isRobustResourceInitEnabled() const { return mRobustResourceInit; }
> 
>     // Sets the dirty bit for the program executable.
>-    void onProgramExecutableChange(Program *program);
>+    angle::Result onProgramExecutableChange(const Context *context, Program *program);
> 
>     enum DirtyBitType
>     {
>@@ -394,19 +530,25 @@ class State : public OnAttachmentDirtyReceiver, angle::NonCopyable
>         DIRTY_BIT_RENDERBUFFER_BINDING,
>         DIRTY_BIT_VERTEX_ARRAY_BINDING,
>         DIRTY_BIT_DRAW_INDIRECT_BUFFER_BINDING,
>+        DIRTY_BIT_DISPATCH_INDIRECT_BUFFER_BINDING,
>+        // TODO(jmadill): Fine-grained dirty bits for each index.
>         DIRTY_BIT_PROGRAM_BINDING,
>         DIRTY_BIT_PROGRAM_EXECUTABLE,
>         // TODO(jmadill): Fine-grained dirty bits for each texture/sampler.
>         DIRTY_BIT_TEXTURE_BINDINGS,
>         DIRTY_BIT_SAMPLER_BINDINGS,
>+        DIRTY_BIT_IMAGE_BINDINGS,
>+        DIRTY_BIT_TRANSFORM_FEEDBACK_BINDING,
>+        DIRTY_BIT_UNIFORM_BUFFER_BINDINGS,
>+        DIRTY_BIT_SHADER_STORAGE_BUFFER_BINDING,
>+        DIRTY_BIT_ATOMIC_COUNTER_BUFFER_BINDING,
>         DIRTY_BIT_MULTISAMPLING,
>         DIRTY_BIT_SAMPLE_ALPHA_TO_ONE,
>-        DIRTY_BIT_COVERAGE_MODULATION,         // CHROMIUM_framebuffer_mixed_samples
>-        DIRTY_BIT_PATH_RENDERING_MATRIX_MV,    // CHROMIUM_path_rendering path model view matrix
>-        DIRTY_BIT_PATH_RENDERING_MATRIX_PROJ,  // CHROMIUM_path_rendering path projection matrix
>-        DIRTY_BIT_PATH_RENDERING_STENCIL_STATE,
>+        DIRTY_BIT_COVERAGE_MODULATION,  // CHROMIUM_framebuffer_mixed_samples
>+        DIRTY_BIT_PATH_RENDERING,
>         DIRTY_BIT_FRAMEBUFFER_SRGB,  // GL_EXT_sRGB_write_control
>         DIRTY_BIT_CURRENT_VALUES,
>+        DIRTY_BIT_PROVOKING_VERTEX,
>         DIRTY_BIT_INVALID,
>         DIRTY_BIT_MAX = DIRTY_BIT_INVALID,
>     };
>@@ -416,36 +558,50 @@ class State : public OnAttachmentDirtyReceiver, angle::NonCopyable
>     // TODO(jmadill): Consider storing dirty objects in a list instead of by binding.
>     enum DirtyObjectType
>     {
>-        DIRTY_OBJECT_READ_FRAMEBUFFER,
>+        DIRTY_OBJECT_READ_FRAMEBUFFER = 0,
>         DIRTY_OBJECT_DRAW_FRAMEBUFFER,
>+        DIRTY_OBJECT_DRAW_ATTACHMENTS,
>         DIRTY_OBJECT_VERTEX_ARRAY,
>-        // Use a very coarse bit for any program or texture change.
>-        // TODO(jmadill): Fine-grained dirty bits for each texture/sampler.
>-        DIRTY_OBJECT_PROGRAM_TEXTURES,
>+        DIRTY_OBJECT_TEXTURES,  // Top-level dirty bit. Also see mDirtyTextures.
>+        DIRTY_OBJECT_SAMPLERS,  // Top-level dirty bit. Also see mDirtySamplers.
>+        DIRTY_OBJECT_PROGRAM,
>+        DIRTY_OBJECT_TEXTURES_INIT,
>+        DIRTY_OBJECT_IMAGES_INIT,
>         DIRTY_OBJECT_UNKNOWN,
>         DIRTY_OBJECT_MAX = DIRTY_OBJECT_UNKNOWN,
>     };
> 
>-    typedef angle::BitSet<DIRTY_BIT_MAX> DirtyBits;
>+    using DirtyBits = angle::BitSet<DIRTY_BIT_MAX>;
>     const DirtyBits &getDirtyBits() const { return mDirtyBits; }
>     void clearDirtyBits() { mDirtyBits.reset(); }
>     void clearDirtyBits(const DirtyBits &bitset) { mDirtyBits &= ~bitset; }
>-    void setAllDirtyBits() { mDirtyBits.set(); }
>+    void setAllDirtyBits()
>+    {
>+        mDirtyBits.set();
>+        mDirtyCurrentValues.set();
>+    }
> 
>-    typedef angle::BitSet<DIRTY_OBJECT_MAX> DirtyObjects;
>+    using DirtyObjects = angle::BitSet<DIRTY_OBJECT_MAX>;
>     void clearDirtyObjects() { mDirtyObjects.reset(); }
>     void setAllDirtyObjects() { mDirtyObjects.set(); }
>-    void syncDirtyObjects(const Context *context);
>-    void syncDirtyObjects(const Context *context, const DirtyObjects &bitset);
>-    void syncDirtyObject(const Context *context, GLenum target);
>+    angle::Result syncDirtyObjects(const Context *context, const DirtyObjects &bitset);
>+    angle::Result syncDirtyObject(const Context *context, GLenum target);
>     void setObjectDirty(GLenum target);
>+    void setTextureDirty(size_t textureUnitIndex);
>+    void setSamplerDirty(size_t samplerIndex);
>+
>+    ANGLE_INLINE void setDrawFramebufferDirty()
>+    {
>+        mDirtyObjects.set(DIRTY_OBJECT_DRAW_FRAMEBUFFER);
>+        mDirtyObjects.set(DIRTY_OBJECT_DRAW_ATTACHMENTS);
>+    }
> 
>     // This actually clears the current value dirty bits.
>     // TODO(jmadill): Pass mutable dirty bits into Impl.
>     AttributesMask getAndResetDirtyCurrentValues() const;
> 
>     void setImageUnit(const Context *context,
>-                      GLuint unit,
>+                      size_t unit,
>                       Texture *texture,
>                       GLint level,
>                       GLboolean layered,
>@@ -453,16 +609,112 @@ class State : public OnAttachmentDirtyReceiver, angle::NonCopyable
>                       GLenum access,
>                       GLenum format);
> 
>-    const ImageUnit &getImageUnit(GLuint unit) const;
>-    const std::vector<Texture *> &getCompleteTextureCache() const { return mCompleteTextureCache; }
>+    const ImageUnit &getImageUnit(size_t unit) const { return mImageUnits[unit]; }
>+    const ActiveTexturePointerArray &getActiveTexturesCache() const { return mActiveTexturesCache; }
>+    ComponentTypeMask getCurrentValuesTypeMask() const { return mCurrentValuesTypeMask; }
>+
>+    // "onActiveTextureChange" is called when a texture binding changes.
>+    void onActiveTextureChange(const Context *context, size_t textureUnit);
>+
>+    // "onActiveTextureStateChange" calls when the Texture itself changed but the binding did not.
>+    void onActiveTextureStateChange(const Context *context, size_t textureUnit);
>+
>+    void onImageStateChange(const Context *context, size_t unit);
> 
>-    // Handle a dirty texture event.
>-    void signal(size_t textureIndex, InitState initState) override;
>+    void onUniformBufferStateChange(size_t uniformBufferIndex);
> 
>-    Error clearUnclearedActiveTextures(const Context *context);
>+    bool isCurrentTransformFeedback(const TransformFeedback *tf) const
>+    {
>+        return tf == mTransformFeedback.get();
>+    }
>+    bool isCurrentVertexArray(const VertexArray *va) const { return va == mVertexArray; }
>+
>+    GLES1State &gles1() { return mGLES1State; }
>+    const GLES1State &gles1() const { return mGLES1State; }
>+
>+    // Helpers for setting bound buffers. They should all have the same signature.
>+    // Not meant to be called externally. Used for local helpers in State.cpp.
>+    template <BufferBinding Target>
>+    void setGenericBufferBindingWithBit(const Context *context, Buffer *buffer);
>+
>+    template <BufferBinding Target>
>+    void setGenericBufferBinding(const Context *context, Buffer *buffer);
>+
>+    using BufferBindingSetter = void (State::*)(const Context *, Buffer *);
>+
>+    ANGLE_INLINE bool validateSamplerFormats() const
>+    {
>+        return (mTexturesIncompatibleWithSamplers & mProgram->getActiveSamplersMask()).none();
>+    }
>+
>+    ProvokingVertex getProvokingVertex() const { return mProvokingVertex; }
>+    void setProvokingVertex(ProvokingVertex val)
>+    {
>+        mDirtyBits.set(State::DIRTY_BIT_PROVOKING_VERTEX);
>+        mProvokingVertex = val;
>+    }
> 
>   private:
>-    void syncProgramTextures(const Context *context);
>+    friend class Context;
>+
>+    void unsetActiveTextures(ActiveTextureMask textureMask);
>+    void updateActiveTexture(const Context *context, size_t textureIndex, Texture *texture);
>+    void updateActiveTextureState(const Context *context,
>+                                  size_t textureIndex,
>+                                  const Sampler *sampler,
>+                                  Texture *texture);
>+
>+    // Functions to synchronize dirty states
>+    angle::Result syncReadFramebuffer(const Context *context);
>+    angle::Result syncDrawFramebuffer(const Context *context);
>+    angle::Result syncDrawAttachments(const Context *context);
>+    angle::Result syncVertexArray(const Context *context);
>+    angle::Result syncTextures(const Context *context);
>+    angle::Result syncSamplers(const Context *context);
>+    angle::Result syncProgram(const Context *context);
>+    angle::Result syncTexturesInit(const Context *context);
>+    angle::Result syncImagesInit(const Context *context);
>+
>+    using DirtyObjectHandler = angle::Result (State::*)(const Context *context);
>+    static constexpr DirtyObjectHandler kDirtyObjectHandlers[DIRTY_OBJECT_MAX] = {
>+        &State::syncReadFramebuffer, &State::syncDrawFramebuffer, &State::syncDrawAttachments,
>+        &State::syncVertexArray,     &State::syncTextures,        &State::syncSamplers,
>+        &State::syncProgram,         &State::syncTexturesInit,    &State::syncImagesInit};
>+
>+    static_assert(DIRTY_OBJECT_READ_FRAMEBUFFER == 0, "check DIRTY_OBJECT_READ_FRAMEBUFFER index");
>+    static_assert(DIRTY_OBJECT_DRAW_FRAMEBUFFER == 1, "check DIRTY_OBJECT_DRAW_FRAMEBUFFER index");
>+    static_assert(DIRTY_OBJECT_DRAW_ATTACHMENTS == 2, "check DIRTY_OBJECT_DRAW_ATTACHMENTS index");
>+    static_assert(DIRTY_OBJECT_VERTEX_ARRAY == 3, "check DIRTY_OBJECT_VERTEX_ARRAY index");
>+    static_assert(DIRTY_OBJECT_TEXTURES == 4, "check DIRTY_OBJECT_TEXTURES index");
>+    static_assert(DIRTY_OBJECT_SAMPLERS == 5, "check DIRTY_OBJECT_SAMPLERS index");
>+    static_assert(DIRTY_OBJECT_PROGRAM == 6, "check DIRTY_OBJECT_PROGRAM index");
>+    static_assert(DIRTY_OBJECT_TEXTURES_INIT == 7, "check DIRTY_OBJECT_TEXTURES_INIT index");
>+    static_assert(DIRTY_OBJECT_IMAGES_INIT == 8, "check DIRTY_OBJECT_IMAGES_INIT index");
>+    static_assert(DIRTY_OBJECT_MAX == 9, "check DIRTY_OBJECT_MAX");
>+
>+    // Dispatch table for buffer update functions.
>+    static const angle::PackedEnumMap<BufferBinding, BufferBindingSetter> kBufferSetters;
>+
>+    Version mClientVersion;
>+    ContextID mContext;
>+
>+    // Caps to use for validation
>+    Caps mCaps;
>+    TextureCapsMap mTextureCaps;
>+    Extensions mExtensions;
>+    Limitations mLimitations;
>+
>+    // Resource managers.
>+    BufferManager *mBufferManager;
>+    ShaderProgramManager *mShaderProgramManager;
>+    TextureManager *mTextureManager;
>+    RenderbufferManager *mRenderbufferManager;
>+    SamplerManager *mSamplerManager;
>+    SyncManager *mSyncManager;
>+    PathManager *mPathManager;
>+    FramebufferManager *mFramebufferManager;
>+    ProgramPipelineManager *mProgramPipelineManager;
>+    MemoryObjectManager *mMemoryObjectManager;
> 
>     // Cached values from Context's caps
>     GLuint mMaxDrawBuffers;
>@@ -494,8 +746,8 @@ class State : public OnAttachmentDirtyReceiver, angle::NonCopyable
>     GLenum mGenerateMipmapHint;
>     GLenum mFragmentShaderDerivativeHint;
> 
>-    bool mBindGeneratesResource;
>-    bool mClientArraysEnabled;
>+    const bool mBindGeneratesResource;
>+    const bool mClientArraysEnabled;
> 
>     Rectangle mViewport;
>     float mNearZ;
>@@ -507,51 +759,51 @@ class State : public OnAttachmentDirtyReceiver, angle::NonCopyable
>     Program *mProgram;
>     BindingPointer<ProgramPipeline> mProgramPipeline;
> 
>-    typedef std::vector<VertexAttribCurrentValueData> VertexAttribVector;
>+    // GL_ANGLE_provoking_vertex
>+    ProvokingVertex mProvokingVertex;
>+
>+    using VertexAttribVector = std::vector<VertexAttribCurrentValueData>;
>     VertexAttribVector mVertexAttribCurrentValues;  // From glVertexAttrib
>     VertexArray *mVertexArray;
>+    ComponentTypeMask mCurrentValuesTypeMask;
> 
>     // Texture and sampler bindings
>     size_t mActiveSampler;  // Active texture unit selector - GL_TEXTURE0
> 
>-    typedef std::vector<BindingPointer<Texture>> TextureBindingVector;
>-    typedef std::map<GLenum, TextureBindingVector> TextureBindingMap;
>+    using TextureBindingVector = std::vector<BindingPointer<Texture>>;
>+    using TextureBindingMap    = angle::PackedEnumMap<TextureType, TextureBindingVector>;
>     TextureBindingMap mSamplerTextures;
> 
>     // Texture Completeness Caching
>     // ----------------------------
>-    // The texture completeness cache uses dirty bits to avoid having to scan the list
>-    // of textures each draw call. This gl::State class implements OnAttachmentDirtyReceiver,
>-    // and keeps an array of bindings to the Texture class. When the Textures are marked dirty,
>-    // they send messages to the State class (and any Framebuffers they're attached to) via the
>-    // State::signal method (see above). Internally this then invalidates the completeness cache.
>+    // The texture completeness cache uses dirty bits to avoid having to scan the list of textures
>+    // each draw call. This gl::State class implements angle::Observer interface. When subject
>+    // Textures have state changes, messages reach 'State' (also any observing Framebuffers) via the
>+    // onSubjectStateChange method (above). This then invalidates the completeness cache.
>     //
>     // Note this requires that we also invalidate the completeness cache manually on events like
>     // re-binding textures/samplers or a change in the program. For more information see the
>-    // signal_utils.h header and the design doc linked there.
>+    // Observer.h header and the design doc linked there.
> 
>     // A cache of complete textures. nullptr indicates unbound or incomplete.
>     // Don't use BindingPointer because this cache is only valid within a draw call.
>     // Also stores a notification channel to the texture itself to handle texture change events.
>-    std::vector<Texture *> mCompleteTextureCache;
>-    std::vector<OnAttachmentDirtyBinding> mCompleteTextureBindings;
>-    InitState mCachedTexturesInitState;
>-    using ActiveTextureMask = angle::BitSet<IMPLEMENTATION_MAX_ACTIVE_TEXTURES>;
>-    ActiveTextureMask mActiveTexturesMask;
>+    ActiveTexturePointerArray mActiveTexturesCache;
>+    std::vector<angle::ObserverBinding> mCompleteTextureBindings;
>+
>+    ActiveTextureMask mTexturesIncompatibleWithSamplers;
> 
>-    typedef std::vector<BindingPointer<Sampler>> SamplerBindingVector;
>     SamplerBindingVector mSamplers;
> 
>-    typedef std::vector<ImageUnit> ImageUnitVector;
>-    ImageUnitVector mImageUnits;
>+    // It would be nice to merge the image and observer binding. Same for textures.
>+    std::vector<ImageUnit> mImageUnits;
> 
>-    typedef std::map<GLenum, BindingPointer<Query>> ActiveQueryMap;
>+    using ActiveQueryMap = angle::PackedEnumMap<QueryType, BindingPointer<Query>>;
>     ActiveQueryMap mActiveQueries;
> 
>-    // Stores the currently bound buffer for each binding point. It has entries for the element
>-    // array buffer and the transform feedback buffer but these should not be used. Instead these
>-    // bind points are respectively owned by current the vertex array object and the current
>-    // transform feedback object.
>+    // Stores the currently bound buffer for each binding point. It has an entry for the element
>+    // array buffer but it should not be used. Instead this bind point is owned by the current
>+    // vertex array object.
>     using BoundBufferMap = angle::PackedEnumMap<BufferBinding, BindingPointer<Buffer>>;
>     BoundBufferMap mBoundBuffers;
> 
>@@ -562,9 +814,7 @@ class State : public OnAttachmentDirtyReceiver, angle::NonCopyable
> 
>     BindingPointer<TransformFeedback> mTransformFeedback;
> 
>-    BindingPointer<Buffer> mPixelUnpackBuffer;
>     PixelUnpackState mUnpack;
>-    BindingPointer<Buffer> mPixelPackBuffer;
>     PixelPackState mPack;
> 
>     bool mPrimitiveRestart;
>@@ -587,16 +837,39 @@ class State : public OnAttachmentDirtyReceiver, angle::NonCopyable
>     bool mFramebufferSRGB;
> 
>     // GL_ANGLE_robust_resource_intialization
>-    bool mRobustResourceInit;
>+    const bool mRobustResourceInit;
> 
>     // GL_ANGLE_program_cache_control
>-    bool mProgramBinaryCacheEnabled;
>+    const bool mProgramBinaryCacheEnabled;
>+
>+    // GL_KHR_parallel_shader_compile
>+    GLuint mMaxShaderCompilerThreads;
>+
>+    // GLES1 emulation: state specific to GLES1
>+    GLES1State mGLES1State;
> 
>     DirtyBits mDirtyBits;
>     DirtyObjects mDirtyObjects;
>     mutable AttributesMask mDirtyCurrentValues;
>+    ActiveTextureMask mDirtyTextures;
>+    ActiveTextureMask mDirtySamplers;
>+    ImageUnitMask mDirtyImages;
> };
> 
>+ANGLE_INLINE angle::Result State::syncDirtyObjects(const Context *context,
>+                                                   const DirtyObjects &bitset)
>+{
>+    const DirtyObjects &dirtyObjects = mDirtyObjects & bitset;
>+
>+    for (size_t dirtyObject : dirtyObjects)
>+    {
>+        ANGLE_TRY((this->*kDirtyObjectHandlers[dirtyObject])(context));
>+    }
>+
>+    mDirtyObjects &= ~dirtyObjects;
>+    return angle::Result::Continue;
>+}
>+
> }  // namespace gl
> 
> #endif  // LIBANGLE_STATE_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/Stream.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/Stream.cpp
>index 68279976b75..b7bc84c8697 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/Stream.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/Stream.cpp
>@@ -9,8 +9,8 @@
> 
> #include "libANGLE/Stream.h"
> 
>-#include <platform/Platform.h>
> #include <EGL/eglext.h>
>+#include <platform/Platform.h>
> 
> #include "common/debug.h"
> #include "common/mathutil.h"
>@@ -25,7 +25,8 @@ namespace egl
> {
> 
> Stream::Stream(Display *display, const AttributeMap &attribs)
>-    : mDisplay(display),
>+    : mLabel(nullptr),
>+      mDisplay(display),
>       mProducerImplementation(nullptr),
>       mState(EGL_STREAM_STATE_CREATED_KHR),
>       mProducerFrame(0),
>@@ -55,6 +56,16 @@ Stream::~Stream()
>     }
> }
> 
>+void Stream::setLabel(EGLLabelKHR label)
>+{
>+    mLabel = label;
>+}
>+
>+EGLLabelKHR Stream::getLabel() const
>+{
>+    return mLabel;
>+}
>+
> void Stream::setConsumerLatency(EGLint latency)
> {
>     mConsumerLatency = latency;
>@@ -117,11 +128,11 @@ Error Stream::createConsumerGLTextureExternal(const AttributeMap &attributes, gl
>     ASSERT(mProducerType == ProducerType::NoProducer);
>     ASSERT(context != nullptr);
> 
>-    const auto &glState = context->getGLState();
>-    EGLenum bufferType = attributes.getAsInt(EGL_COLOR_BUFFER_TYPE, EGL_RGB_BUFFER);
>+    const auto &glState = context->getState();
>+    EGLenum bufferType  = attributes.getAsInt(EGL_COLOR_BUFFER_TYPE, EGL_RGB_BUFFER);
>     if (bufferType == EGL_RGB_BUFFER)
>     {
>-        mPlanes[0].texture = glState.getTargetTexture(GL_TEXTURE_EXTERNAL_OES);
>+        mPlanes[0].texture = glState.getTargetTexture(gl::TextureType::External);
>         ASSERT(mPlanes[0].texture != nullptr);
>         mPlanes[0].texture->bindStream(this);
>         mConsumerType = ConsumerType::GLTextureRGB;
>@@ -138,7 +149,7 @@ Error Stream::createConsumerGLTextureExternal(const AttributeMap &attributes, gl
>             if (mPlanes[i].textureUnit != EGL_NONE)
>             {
>                 mPlanes[i].texture =
>-                    glState.getSamplerTexture(mPlanes[i].textureUnit, GL_TEXTURE_EXTERNAL_OES);
>+                    glState.getSamplerTexture(mPlanes[i].textureUnit, gl::TextureType::External);
>                 ASSERT(mPlanes[i].texture != nullptr);
>             }
>         }
>@@ -160,16 +171,16 @@ Error Stream::createConsumerGLTextureExternal(const AttributeMap &attributes, gl
>     return NoError();
> }
> 
>-Error Stream::createProducerD3D11TextureNV12(const AttributeMap &attributes)
>+Error Stream::createProducerD3D11Texture(const AttributeMap &attributes)
> {
>     ASSERT(mState == EGL_STREAM_STATE_CONNECTING_KHR);
>-    ASSERT(mConsumerType == ConsumerType::GLTextureYUV);
>+    ASSERT(mConsumerType == ConsumerType::GLTextureRGB ||
>+           mConsumerType == ConsumerType::GLTextureYUV);
>     ASSERT(mProducerType == ProducerType::NoProducer);
>-    ASSERT(mPlaneCount == 2);
> 
>-    mProducerImplementation = mDisplay->getImplementation()->createStreamProducerD3DTextureNV12(
>-        mConsumerType, attributes);
>-    mProducerType = ProducerType::D3D11TextureNV12;
>+    mProducerImplementation =
>+        mDisplay->getImplementation()->createStreamProducerD3DTexture(mConsumerType, attributes);
>+    mProducerType = ProducerType::D3D11Texture;
>     mState        = EGL_STREAM_STATE_EMPTY_KHR;
> 
>     return NoError();
>@@ -182,7 +193,7 @@ Error Stream::consumerAcquire(const gl::Context *context)
>            mState == EGL_STREAM_STATE_OLD_FRAME_AVAILABLE_KHR);
>     ASSERT(mConsumerType == ConsumerType::GLTextureRGB ||
>            mConsumerType == ConsumerType::GLTextureYUV);
>-    ASSERT(mProducerType == ProducerType::D3D11TextureNV12);
>+    ASSERT(mProducerType == ProducerType::D3D11Texture);
> 
>     mState = EGL_STREAM_STATE_OLD_FRAME_AVAILABLE_KHR;
>     mConsumerFrame++;
>@@ -192,8 +203,8 @@ Error Stream::consumerAcquire(const gl::Context *context)
>     {
>         if (mPlanes[i].texture != nullptr)
>         {
>-            ANGLE_TRY(mPlanes[i].texture->acquireImageFromStream(
>-                context, mProducerImplementation->getGLFrameDescription(i)));
>+            ANGLE_TRY(ResultToEGL(mPlanes[i].texture->acquireImageFromStream(
>+                context, mProducerImplementation->getGLFrameDescription(i))));
>         }
>     }
> 
>@@ -206,14 +217,14 @@ Error Stream::consumerRelease(const gl::Context *context)
>            mState == EGL_STREAM_STATE_OLD_FRAME_AVAILABLE_KHR);
>     ASSERT(mConsumerType == ConsumerType::GLTextureRGB ||
>            mConsumerType == ConsumerType::GLTextureYUV);
>-    ASSERT(mProducerType == ProducerType::D3D11TextureNV12);
>+    ASSERT(mProducerType == ProducerType::D3D11Texture);
> 
>     // Release the images
>     for (int i = 0; i < mPlaneCount; i++)
>     {
>         if (mPlanes[i].texture != nullptr)
>         {
>-            ANGLE_TRY(mPlanes[i].texture->releaseImageFromStream(context));
>+            ANGLE_TRY(ResultToEGL(mPlanes[i].texture->releaseImageFromStream(context)));
>         }
>     }
> 
>@@ -226,23 +237,23 @@ bool Stream::isConsumerBoundToContext(const gl::Context *context) const
>     return (context == mContext);
> }
> 
>-Error Stream::validateD3D11NV12Texture(void *texture) const
>+Error Stream::validateD3D11Texture(void *texture, const AttributeMap &attributes) const
> {
>     ASSERT(mConsumerType == ConsumerType::GLTextureRGB ||
>            mConsumerType == ConsumerType::GLTextureYUV);
>-    ASSERT(mProducerType == ProducerType::D3D11TextureNV12);
>+    ASSERT(mProducerType == ProducerType::D3D11Texture);
>     ASSERT(mProducerImplementation != nullptr);
> 
>-    return mProducerImplementation->validateD3DNV12Texture(texture);
>+    return mProducerImplementation->validateD3DTexture(texture, attributes);
> }
> 
>-Error Stream::postD3D11NV12Texture(void *texture, const AttributeMap &attributes)
>+Error Stream::postD3D11Texture(void *texture, const AttributeMap &attributes)
> {
>     ASSERT(mConsumerType == ConsumerType::GLTextureRGB ||
>            mConsumerType == ConsumerType::GLTextureYUV);
>-    ASSERT(mProducerType == ProducerType::D3D11TextureNV12);
>+    ASSERT(mProducerType == ProducerType::D3D11Texture);
> 
>-    mProducerImplementation->postD3DNV12Texture(texture, attributes);
>+    mProducerImplementation->postD3DTexture(texture, attributes);
>     mProducerFrame++;
> 
>     mState = EGL_STREAM_STATE_NEW_FRAME_AVAILABLE_KHR;
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/Stream.h b/Source/ThirdParty/ANGLE/src/libANGLE/Stream.h
>index b674c44008c..9157aa5184a 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/Stream.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/Stream.h
>@@ -17,6 +17,7 @@
> 
> #include "common/angleutils.h"
> #include "libANGLE/AttributeMap.h"
>+#include "libANGLE/Debug.h"
> 
> namespace rx
> {
>@@ -27,7 +28,7 @@ namespace gl
> {
> class Context;
> class Texture;
>-}
>+}  // namespace gl
> 
> namespace egl
> {
>@@ -35,11 +36,14 @@ class Display;
> class Error;
> class Thread;
> 
>-class Stream final : angle::NonCopyable
>+class Stream final : public LabeledObject, angle::NonCopyable
> {
>   public:
>     Stream(Display *display, const AttributeMap &attribs);
>-    ~Stream();
>+    ~Stream() override;
>+
>+    void setLabel(EGLLabelKHR label) override;
>+    EGLLabelKHR getLabel() const override;
> 
>     enum class ConsumerType
>     {
>@@ -51,7 +55,7 @@ class Stream final : angle::NonCopyable
>     enum class ProducerType
>     {
>         NoProducer,
>-        D3D11TextureNV12,
>+        D3D11Texture,
>     };
> 
>     // A GL texture interpretation of a part of a producer frame. For use with GL texture consumers
>@@ -85,7 +89,7 @@ class Stream final : angle::NonCopyable
>     Error createConsumerGLTextureExternal(const AttributeMap &attributes, gl::Context *context);
> 
>     // Producer creation methods
>-    Error createProducerD3D11TextureNV12(const AttributeMap &attributes);
>+    Error createProducerD3D11Texture(const AttributeMap &attributes);
> 
>     // Consumer methods
>     Error consumerAcquire(const gl::Context *context);
>@@ -96,10 +100,12 @@ class Stream final : angle::NonCopyable
>     bool isConsumerBoundToContext(const gl::Context *context) const;
> 
>     // Producer methods
>-    Error validateD3D11NV12Texture(void *texture) const;
>-    Error postD3D11NV12Texture(void *texture, const AttributeMap &attributes);
>+    Error validateD3D11Texture(void *texture, const AttributeMap &attributes) const;
>+    Error postD3D11Texture(void *texture, const AttributeMap &attributes);
> 
>   private:
>+    EGLLabelKHR mLabel;
>+
>     // Associated display
>     Display *mDisplay;
> 
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/Surface.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/Surface.cpp
>index 746da037782..6daec4f653b 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/Surface.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/Surface.cpp
>@@ -12,8 +12,6 @@
> 
> #include <EGL/eglext.h>
> 
>-#include <iostream>
>-
> #include "libANGLE/Config.h"
> #include "libANGLE/Context.h"
> #include "libANGLE/Display.h"
>@@ -22,22 +20,28 @@
> #include "libANGLE/Thread.h"
> #include "libANGLE/formatutils.h"
> #include "libANGLE/renderer/EGLImplFactory.h"
>+#include "third_party/trace_event/trace_event.h"
> 
> namespace egl
> {
> 
> SurfaceState::SurfaceState(const egl::Config *configIn, const AttributeMap &attributesIn)
>-    : defaultFramebuffer(nullptr), config(configIn), attributes(attributesIn)
>-{
>-}
>+    : label(nullptr), config(configIn), attributes(attributesIn), timestampsEnabled(false)
>+{}
>+
>+SurfaceState::~SurfaceState() = default;
> 
>-Surface::Surface(EGLint surfaceType, const egl::Config *config, const AttributeMap &attributes)
>+Surface::Surface(EGLint surfaceType,
>+                 const egl::Config *config,
>+                 const AttributeMap &attributes,
>+                 EGLenum buftype)
>     : FramebufferAttachmentObject(),
>       mState(config, attributes),
>       mImplementation(nullptr),
>-      mCurrentCount(0),
>+      mRefCount(0),
>       mDestroyed(false),
>       mType(surfaceType),
>+      mBuftype(buftype),
>       mPostSubBufferRequested(false),
>       mLargestPbuffer(false),
>       mGLColorspace(EGL_GL_COLORSPACE_LINEAR),
>@@ -51,18 +55,20 @@ Surface::Surface(EGLint surfaceType, const egl::Config *config, const AttributeM
>       mFixedSize(false),
>       mFixedWidth(0),
>       mFixedHeight(0),
>-      mTextureFormat(EGL_NO_TEXTURE),
>+      mTextureFormat(TextureFormat::NoTexture),
>       mTextureTarget(EGL_NO_TEXTURE),
>       // FIXME: Determine actual pixel aspect ratio
>       mPixelAspectRatio(static_cast<EGLint>(1.0 * EGL_DISPLAY_SCALING)),
>       mRenderBuffer(EGL_BACK_BUFFER),
>       mSwapBehavior(EGL_NONE),
>       mOrientation(0),
>-      mTexture(),
>-      mBackFormat(config->renderTargetFormat),
>-      mDSFormat(config->depthStencilFormat)
>+      mTexture(nullptr),
>+      mColorFormat(config->renderTargetFormat),
>+      mDSFormat(config->depthStencilFormat),
>+      mInitState(gl::InitState::Initialized)
> {
>-    mPostSubBufferRequested = (attributes.get(EGL_POST_SUB_BUFFER_SUPPORTED_NV, EGL_FALSE) == EGL_TRUE);
>+    mPostSubBufferRequested =
>+        (attributes.get(EGL_POST_SUB_BUFFER_SUPPORTED_NV, EGL_FALSE) == EGL_TRUE);
>     mFlexibleSurfaceCompatibilityRequested =
>         (attributes.get(EGL_FLEXIBLE_SURFACE_COMPATIBILITY_SUPPORTED_ANGLE, EGL_FALSE) == EGL_TRUE);
> 
>@@ -82,6 +88,10 @@ Surface::Surface(EGLint surfaceType, const egl::Config *config, const AttributeM
> 
>     mRobustResourceInitialization =
>         (attributes.get(EGL_ROBUST_RESOURCE_INITIALIZATION_ANGLE, EGL_FALSE) == EGL_TRUE);
>+    if (mRobustResourceInitialization)
>+    {
>+        mInitState = gl::InitState::MayNeedInit;
>+    }
> 
>     mFixedSize = (attributes.get(EGL_FIXED_SIZE_ANGLE, EGL_FALSE) == EGL_TRUE);
>     if (mFixedSize)
>@@ -92,16 +102,14 @@ Surface::Surface(EGLint surfaceType, const egl::Config *config, const AttributeM
> 
>     if (mType != EGL_WINDOW_BIT)
>     {
>-        mTextureFormat = static_cast<EGLenum>(attributes.get(EGL_TEXTURE_FORMAT, EGL_NO_TEXTURE));
>+        mTextureFormat = attributes.getAsPackedEnum(EGL_TEXTURE_FORMAT, TextureFormat::NoTexture);
>         mTextureTarget = static_cast<EGLenum>(attributes.get(EGL_TEXTURE_TARGET, EGL_NO_TEXTURE));
>     }
> 
>     mOrientation = static_cast<EGLint>(attributes.get(EGL_SURFACE_ORIENTATION_ANGLE, 0));
> }
> 
>-Surface::~Surface()
>-{
>-}
>+Surface::~Surface() {}
> 
> rx::FramebufferAttachmentObjectImpl *Surface::getAttachmentImpl() const
> {
>@@ -110,40 +118,28 @@ rx::FramebufferAttachmentObjectImpl *Surface::getAttachmentImpl() const
> 
> Error Surface::destroyImpl(const Display *display)
> {
>-    if (mState.defaultFramebuffer)
>-    {
>-        mState.defaultFramebuffer->destroyDefault(display);
>-    }
>     if (mImplementation)
>     {
>         mImplementation->destroy(display);
>     }
> 
>-    if (mTexture.get())
>-    {
>-        if (mImplementation)
>-        {
>-            ANGLE_TRY(mImplementation->releaseTexImage(EGL_BACK_BUFFER));
>-        }
>-        auto glErr = mTexture->releaseTexImageFromSurface(display->getProxyContext());
>-        if (glErr.isError())
>-        {
>-            return Error(EGL_BAD_SURFACE);
>-        }
>-        mTexture.set(nullptr, nullptr);
>-    }
>+    ASSERT(!mTexture);
> 
>-    if (mState.defaultFramebuffer)
>-    {
>-        mState.defaultFramebuffer->onDestroy(display->getProxyContext());
>-    }
>-    SafeDelete(mState.defaultFramebuffer);
>     SafeDelete(mImplementation);
> 
>     delete this;
>     return NoError();
> }
> 
>+void Surface::postSwap(const gl::Context *context)
>+{
>+    if (mRobustResourceInitialization && mSwapBehavior != EGL_BUFFER_PRESERVED)
>+    {
>+        mInitState = gl::InitState::MayNeedInit;
>+        onStateChange(context, angle::SubjectMessage::STORAGE_CHANGED);
>+    }
>+}
>+
> Error Surface::initialize(const Display *display)
> {
>     ANGLE_TRY(mImplementation->initialize(display));
>@@ -152,9 +148,31 @@ Error Surface::initialize(const Display *display)
>     // Must happen after implementation initialize for Android.
>     mSwapBehavior = mImplementation->getSwapBehavior();
> 
>-    // Must happen after implementation initialize for OSX.
>-    mState.defaultFramebuffer = createDefaultFramebuffer(display);
>-    ASSERT(mState.defaultFramebuffer != nullptr);
>+    if (mBuftype == EGL_IOSURFACE_ANGLE)
>+    {
>+        GLenum internalFormat =
>+            static_cast<GLenum>(mState.attributes.get(EGL_TEXTURE_INTERNAL_FORMAT_ANGLE));
>+        GLenum type  = static_cast<GLenum>(mState.attributes.get(EGL_TEXTURE_TYPE_ANGLE));
>+        mColorFormat = gl::Format(internalFormat, type);
>+    }
>+    if (mBuftype == EGL_D3D_TEXTURE_ANGLE)
>+    {
>+        const angle::Format *colorFormat = mImplementation->getD3DTextureColorFormat();
>+        ASSERT(colorFormat != nullptr);
>+        GLenum internalFormat = colorFormat->fboImplementationInternalFormat;
>+        mColorFormat          = gl::Format(internalFormat, colorFormat->componentType);
>+        mGLColorspace         = EGL_GL_COLORSPACE_LINEAR;
>+        if (mColorFormat.info->colorEncoding == GL_SRGB)
>+        {
>+            mGLColorspace = EGL_GL_COLORSPACE_SRGB;
>+        }
>+    }
>+
>+    if (mType == EGL_WINDOW_BIT && display->getExtensions().getFrameTimestamps)
>+    {
>+        mState.supportedCompositorTimings = mImplementation->getSupportedCompositorTimings();
>+        mState.supportedTimestamps        = mImplementation->getSupportedTimestamps();
>+    }
> 
>     return NoError();
> }
>@@ -163,30 +181,46 @@ Error Surface::setIsCurrent(const gl::Context *context, bool isCurrent)
> {
>     if (isCurrent)
>     {
>-        mCurrentCount++;
>+        mRefCount++;
>         return NoError();
>     }
> 
>-    ASSERT(mCurrentCount > 0);
>-    mCurrentCount--;
>-    if (mCurrentCount == 0 && mDestroyed)
>+    return releaseRef(context->getDisplay());
>+}
>+
>+Error Surface::releaseRef(const Display *display)
>+{
>+    ASSERT(mRefCount > 0);
>+    mRefCount--;
>+    if (mRefCount == 0 && mDestroyed)
>     {
>-        ASSERT(context);
>-        return destroyImpl(context->getCurrentDisplay());
>+        ASSERT(display);
>+        return destroyImpl(display);
>     }
>+
>     return NoError();
> }
> 
> Error Surface::onDestroy(const Display *display)
> {
>     mDestroyed = true;
>-    if (mCurrentCount == 0)
>+    if (mRefCount == 0)
>     {
>         return destroyImpl(display);
>     }
>     return NoError();
> }
> 
>+void Surface::setLabel(EGLLabelKHR label)
>+{
>+    mState.label = label;
>+}
>+
>+EGLLabelKHR Surface::getLabel() const
>+{
>+    return mState.label;
>+}
>+
> EGLint Surface::getType() const
> {
>     return mType;
>@@ -194,12 +228,18 @@ EGLint Surface::getType() const
> 
> Error Surface::swap(const gl::Context *context)
> {
>-    return mImplementation->swap(context);
>+    TRACE_EVENT0("gpu.angle", "egl::Surface::swap");
>+
>+    ANGLE_TRY(mImplementation->swap(context));
>+    postSwap(context);
>+    return NoError();
> }
> 
> Error Surface::swapWithDamage(const gl::Context *context, EGLint *rects, EGLint n_rects)
> {
>-    return mImplementation->swapWithDamage(context, rects, n_rects);
>+    ANGLE_TRY(mImplementation->swapWithDamage(context, rects, n_rects));
>+    postSwap(context);
>+    return NoError();
> }
> 
> Error Surface::postSubBuffer(const gl::Context *context,
>@@ -208,9 +248,19 @@ Error Surface::postSubBuffer(const gl::Context *context,
>                              EGLint width,
>                              EGLint height)
> {
>+    if (width == 0 || height == 0)
>+    {
>+        return egl::NoError();
>+    }
>+
>     return mImplementation->postSubBuffer(context, x, y, width, height);
> }
> 
>+Error Surface::setPresentationTime(EGLnsecsANDROID time)
>+{
>+    return mImplementation->setPresentationTime(time);
>+}
>+
> Error Surface::querySurfacePointerANGLE(EGLint attribute, void **value)
> {
>     return mImplementation->querySurfacePointerANGLE(attribute, value);
>@@ -247,6 +297,18 @@ void Surface::setSwapBehavior(EGLenum behavior)
>     mSwapBehavior = behavior;
> }
> 
>+void Surface::setFixedWidth(EGLint width)
>+{
>+    mFixedWidth = width;
>+    mImplementation->setFixedWidth(width);
>+}
>+
>+void Surface::setFixedHeight(EGLint height)
>+{
>+    mFixedHeight = height;
>+    mImplementation->setFixedHeight(height);
>+}
>+
> const Config *Surface::getConfig() const
> {
>     return mState.config;
>@@ -267,7 +329,7 @@ EGLenum Surface::getSwapBehavior() const
>     return mSwapBehavior;
> }
> 
>-EGLenum Surface::getTextureFormat() const
>+TextureFormat Surface::getTextureFormat() const
> {
>     return mTextureFormat;
> }
>@@ -337,17 +399,17 @@ EGLint Surface::getHeight() const
>     return mFixedSize ? static_cast<EGLint>(mFixedHeight) : mImplementation->getHeight();
> }
> 
>-Error Surface::bindTexImage(const gl::Context *context, gl::Texture *texture, EGLint buffer)
>+Error Surface::bindTexImage(gl::Context *context, gl::Texture *texture, EGLint buffer)
> {
>-    ASSERT(!mTexture.get());
>-    ANGLE_TRY(mImplementation->bindTexImage(texture, buffer));
>+    ASSERT(!mTexture);
>+    ANGLE_TRY(mImplementation->bindTexImage(context, texture, buffer));
> 
>-    auto glErr = texture->bindTexImageFromSurface(context, this);
>-    if (glErr.isError())
>+    if (texture->bindTexImageFromSurface(context, this) == angle::Result::Stop)
>     {
>         return Error(EGL_BAD_SURFACE);
>     }
>-    mTexture.set(context, texture);
>+    mTexture = texture;
>+    mRefCount++;
> 
>     return NoError();
> }
>@@ -356,17 +418,12 @@ Error Surface::releaseTexImage(const gl::Context *context, EGLint buffer)
> {
>     ASSERT(context);
> 
>-    ANGLE_TRY(mImplementation->releaseTexImage(buffer));
>+    ANGLE_TRY(mImplementation->releaseTexImage(context, buffer));
> 
>-    ASSERT(mTexture.get());
>-    auto glErr = mTexture->releaseTexImageFromSurface(context);
>-    if (glErr.isError())
>-    {
>-        return Error(EGL_BAD_SURFACE);
>-    }
>-    mTexture.set(context, nullptr);
>+    ASSERT(mTexture);
>+    ANGLE_TRY(ResultToEGL(mTexture->releaseTexImageFromSurface(context)));
> 
>-    return NoError();
>+    return releaseTexImageFromTexture(context);
> }
> 
> Error Surface::getSyncValues(EGLuint64KHR *ust, EGLuint64KHR *msc, EGLuint64KHR *sbc)
>@@ -374,10 +431,11 @@ Error Surface::getSyncValues(EGLuint64KHR *ust, EGLuint64KHR *msc, EGLuint64KHR
>     return mImplementation->getSyncValues(ust, msc, sbc);
> }
> 
>-void Surface::releaseTexImageFromTexture(const gl::Context *context)
>+Error Surface::releaseTexImageFromTexture(const gl::Context *context)
> {
>-    ASSERT(mTexture.get());
>-    mTexture.set(context, nullptr);
>+    ASSERT(mTexture);
>+    mTexture = nullptr;
>+    return releaseRef(context->getDisplay());
> }
> 
> gl::Extents Surface::getAttachmentSize(const gl::ImageIndex & /*target*/) const
>@@ -385,9 +443,9 @@ gl::Extents Surface::getAttachmentSize(const gl::ImageIndex & /*target*/) const
>     return gl::Extents(getWidth(), getHeight(), 1);
> }
> 
>-const gl::Format &Surface::getAttachmentFormat(GLenum binding, const gl::ImageIndex &target) const
>+gl::Format Surface::getAttachmentFormat(GLenum binding, const gl::ImageIndex &target) const
> {
>-    return (binding == GL_BACK ? mBackFormat : mDSFormat);
>+    return (binding == GL_BACK ? mColorFormat : mDSFormat);
> }
> 
> GLsizei Surface::getAttachmentSamples(const gl::ImageIndex &target) const
>@@ -395,26 +453,73 @@ GLsizei Surface::getAttachmentSamples(const gl::ImageIndex &target) const
>     return getConfig()->samples;
> }
> 
>+bool Surface::isRenderable(const gl::Context *context,
>+                           GLenum binding,
>+                           const gl::ImageIndex &imageIndex) const
>+{
>+    return true;
>+}
>+
> GLuint Surface::getId() const
> {
>     UNREACHABLE();
>     return 0;
> }
> 
>-gl::Framebuffer *Surface::createDefaultFramebuffer(const Display *display)
>+gl::Framebuffer *Surface::createDefaultFramebuffer(const gl::Context *context)
> {
>-    return new gl::Framebuffer(display, this);
>+    return new gl::Framebuffer(context, this);
> }
> 
> gl::InitState Surface::initState(const gl::ImageIndex & /*imageIndex*/) const
> {
>-    // TODO(jmadill): Lazy surface init.
>-    return gl::InitState::Initialized;
>+    return mInitState;
>+}
>+
>+void Surface::setInitState(const gl::ImageIndex & /*imageIndex*/, gl::InitState initState)
>+{
>+    mInitState = initState;
>+}
>+
>+void Surface::setTimestampsEnabled(bool enabled)
>+{
>+    mImplementation->setTimestampsEnabled(enabled);
>+    mState.timestampsEnabled = enabled;
>+}
>+
>+bool Surface::isTimestampsEnabled() const
>+{
>+    return mState.timestampsEnabled;
>+}
>+
>+const SupportedCompositorTiming &Surface::getSupportedCompositorTimings() const
>+{
>+    return mState.supportedCompositorTimings;
>+}
>+
>+Error Surface::getCompositorTiming(EGLint numTimestamps,
>+                                   const EGLint *names,
>+                                   EGLnsecsANDROID *values) const
>+{
>+    return mImplementation->getCompositorTiming(numTimestamps, names, values);
>+}
>+
>+Error Surface::getNextFrameId(EGLuint64KHR *frameId) const
>+{
>+    return mImplementation->getNextFrameId(frameId);
>+}
>+
>+const SupportedTimestamps &Surface::getSupportedTimestamps() const
>+{
>+    return mState.supportedTimestamps;
> }
> 
>-void Surface::setInitState(const gl::ImageIndex & /*imageIndex*/, gl::InitState /*initState*/)
>+Error Surface::getFrameTimestamps(EGLuint64KHR frameId,
>+                                  EGLint numTimestamps,
>+                                  const EGLint *timestamps,
>+                                  EGLnsecsANDROID *values) const
> {
>-    // No-op.
>+    return mImplementation->getFrameTimestamps(frameId, numTimestamps, timestamps, values);
> }
> 
> WindowSurface::WindowSurface(rx::EGLImplFactory *implFactory,
>@@ -426,9 +531,7 @@ WindowSurface::WindowSurface(rx::EGLImplFactory *implFactory,
>     mImplementation = implFactory->createWindowSurface(mState, window, attribs);
> }
> 
>-WindowSurface::~WindowSurface()
>-{
>-}
>+WindowSurface::~WindowSurface() {}
> 
> PbufferSurface::PbufferSurface(rx::EGLImplFactory *implFactory,
>                                const Config *config,
>@@ -443,15 +546,13 @@ PbufferSurface::PbufferSurface(rx::EGLImplFactory *implFactory,
>                                EGLenum buftype,
>                                EGLClientBuffer clientBuffer,
>                                const AttributeMap &attribs)
>-    : Surface(EGL_PBUFFER_BIT, config, attribs)
>+    : Surface(EGL_PBUFFER_BIT, config, attribs, buftype)
> {
>     mImplementation =
>         implFactory->createPbufferFromClientBuffer(mState, buftype, clientBuffer, attribs);
> }
> 
>-PbufferSurface::~PbufferSurface()
>-{
>-}
>+PbufferSurface::~PbufferSurface() {}
> 
> PixmapSurface::PixmapSurface(rx::EGLImplFactory *implFactory,
>                              const Config *config,
>@@ -462,19 +563,13 @@ PixmapSurface::PixmapSurface(rx::EGLImplFactory *implFactory,
>     mImplementation = implFactory->createPixmapSurface(mState, nativePixmap, attribs);
> }
> 
>-PixmapSurface::~PixmapSurface()
>-{
>-}
>+PixmapSurface::~PixmapSurface() {}
> 
> // SurfaceDeleter implementation.
> 
>-SurfaceDeleter::SurfaceDeleter(const Display *display) : mDisplay(display)
>-{
>-}
>+SurfaceDeleter::SurfaceDeleter(const Display *display) : mDisplay(display) {}
> 
>-SurfaceDeleter::~SurfaceDeleter()
>-{
>-}
>+SurfaceDeleter::~SurfaceDeleter() {}
> 
> void SurfaceDeleter::operator()(Surface *surface)
> {
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/Surface.h b/Source/ThirdParty/ANGLE/src/libANGLE/Surface.h
>index b3188ff9099..9721938bf52 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/Surface.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/Surface.h
>@@ -13,8 +13,10 @@
> 
> #include <EGL/egl.h>
> 
>+#include "common/PackedEnums.h"
> #include "common/angleutils.h"
> #include "libANGLE/AttributeMap.h"
>+#include "libANGLE/Debug.h"
> #include "libANGLE/Error.h"
> #include "libANGLE/FramebufferAttachment.h"
> #include "libANGLE/RefCountObject.h"
>@@ -23,9 +25,10 @@
> 
> namespace gl
> {
>+class Context;
> class Framebuffer;
> class Texture;
>-}
>+}  // namespace gl
> 
> namespace rx
> {
>@@ -37,20 +40,31 @@ namespace egl
> class Display;
> struct Config;
> 
>+using SupportedCompositorTiming = angle::PackedEnumBitSet<CompositorTiming>;
>+using SupportedTimestamps       = angle::PackedEnumBitSet<Timestamp>;
>+
> struct SurfaceState final : private angle::NonCopyable
> {
>     SurfaceState(const egl::Config *configIn, const AttributeMap &attributesIn);
>+    ~SurfaceState();
> 
>-    gl::Framebuffer *defaultFramebuffer;
>+    EGLLabelKHR label;
>     const egl::Config *config;
>     AttributeMap attributes;
>+
>+    bool timestampsEnabled;
>+    SupportedCompositorTiming supportedCompositorTimings;
>+    SupportedTimestamps supportedTimestamps;
> };
> 
>-class Surface : public gl::FramebufferAttachmentObject
>+class Surface : public LabeledObject, public gl::FramebufferAttachmentObject
> {
>   public:
>     rx::SurfaceImpl *getImplementation() const { return mImplementation; }
> 
>+    void setLabel(EGLLabelKHR label) override;
>+    EGLLabelKHR getLabel() const override;
>+
>     EGLint getType() const;
> 
>     Error initialize(const Display *display);
>@@ -61,8 +75,9 @@ class Surface : public gl::FramebufferAttachmentObject
>                         EGLint y,
>                         EGLint width,
>                         EGLint height);
>+    Error setPresentationTime(EGLnsecsANDROID time);
>     Error querySurfacePointerANGLE(EGLint attribute, void **value);
>-    Error bindTexImage(const gl::Context *context, gl::Texture *texture, EGLint buffer);
>+    Error bindTexImage(gl::Context *context, gl::Texture *texture, EGLint buffer);
>     Error releaseTexImage(const gl::Context *context, EGLint buffer);
> 
>     Error getSyncValues(EGLuint64KHR *ust, EGLuint64KHR *msc, EGLuint64KHR *sbc);
>@@ -77,6 +92,11 @@ class Surface : public gl::FramebufferAttachmentObject
>     void setMultisampleResolve(EGLenum resolve);
>     void setSwapBehavior(EGLenum behavior);
> 
>+    void setFixedWidth(EGLint width);
>+    void setFixedHeight(EGLint height);
>+
>+    gl::Framebuffer *createDefaultFramebuffer(const gl::Context *context);
>+
>     const Config *getConfig() const;
> 
>     // width and height can change with client window resizing
>@@ -85,7 +105,7 @@ class Surface : public gl::FramebufferAttachmentObject
>     EGLint getPixelAspectRatio() const;
>     EGLenum getRenderBuffer() const;
>     EGLenum getSwapBehavior() const;
>-    EGLenum getTextureFormat() const;
>+    TextureFormat getTextureFormat() const;
>     EGLenum getTextureTarget() const;
>     bool getLargestPbuffer() const;
>     EGLenum getGLColorspace() const;
>@@ -97,16 +117,17 @@ class Surface : public gl::FramebufferAttachmentObject
>     EGLint getVerticalResolution() const;
>     EGLenum getMultisampleResolve() const;
> 
>-    gl::Texture *getBoundTexture() const { return mTexture.get(); }
>-    gl::Framebuffer *getDefaultFramebuffer() { return mState.defaultFramebuffer; }
>+    gl::Texture *getBoundTexture() const { return mTexture; }
> 
>     EGLint isFixedSize() const;
> 
>     // FramebufferAttachmentObject implementation
>     gl::Extents getAttachmentSize(const gl::ImageIndex &imageIndex) const override;
>-    const gl::Format &getAttachmentFormat(GLenum binding,
>-                                          const gl::ImageIndex &imageIndex) const override;
>+    gl::Format getAttachmentFormat(GLenum binding, const gl::ImageIndex &imageIndex) const override;
>     GLsizei getAttachmentSamples(const gl::ImageIndex &imageIndex) const override;
>+    bool isRenderable(const gl::Context *context,
>+                      GLenum binding,
>+                      const gl::ImageIndex &imageIndex) const override;
> 
>     void onAttach(const gl::Context *context) override {}
>     void onDetach(const gl::Context *context) override {}
>@@ -125,8 +146,29 @@ class Surface : public gl::FramebufferAttachmentObject
> 
>     bool isRobustResourceInitEnabled() const { return mRobustResourceInitialization; }
> 
>+    const gl::Format &getBindTexImageFormat() const { return mColorFormat; }
>+
>+    // EGL_ANDROID_get_frame_timestamps entry points
>+    void setTimestampsEnabled(bool enabled);
>+    bool isTimestampsEnabled() const;
>+
>+    const SupportedCompositorTiming &getSupportedCompositorTimings() const;
>+    Error getCompositorTiming(EGLint numTimestamps,
>+                              const EGLint *names,
>+                              EGLnsecsANDROID *values) const;
>+
>+    Error getNextFrameId(EGLuint64KHR *frameId) const;
>+    const SupportedTimestamps &getSupportedTimestamps() const;
>+    Error getFrameTimestamps(EGLuint64KHR frameId,
>+                             EGLint numTimestamps,
>+                             const EGLint *timestamps,
>+                             EGLnsecsANDROID *values) const;
>+
>   protected:
>-    Surface(EGLint surfaceType, const egl::Config *config, const AttributeMap &attributes);
>+    Surface(EGLint surfaceType,
>+            const egl::Config *config,
>+            const AttributeMap &attributes,
>+            EGLenum buftype = EGL_NONE);
>     ~Surface() override;
>     rx::FramebufferAttachmentObjectImpl *getAttachmentImpl() const override;
> 
>@@ -134,14 +176,15 @@ class Surface : public gl::FramebufferAttachmentObject
> 
>     // ANGLE-only method, used internally
>     friend class gl::Texture;
>-    void releaseTexImageFromTexture(const gl::Context *context);
>+    Error releaseTexImageFromTexture(const gl::Context *context);
> 
>     SurfaceState mState;
>     rx::SurfaceImpl *mImplementation;
>-    int mCurrentCount;
>+    int mRefCount;
>     bool mDestroyed;
> 
>     EGLint mType;
>+    EGLenum mBuftype;
> 
>     bool mPostSubBufferRequested;
>     bool mFlexibleSurfaceCompatibilityRequested;
>@@ -164,22 +207,29 @@ class Surface : public gl::FramebufferAttachmentObject
> 
>     bool mRobustResourceInitialization;
> 
>-    EGLenum mTextureFormat;
>+    TextureFormat mTextureFormat;
>     EGLenum mTextureTarget;
> 
>-    EGLint mPixelAspectRatio;      // Display aspect ratio
>-    EGLenum mRenderBuffer;         // Render buffer
>-    EGLenum mSwapBehavior;         // Buffer swap behavior
>+    EGLint mPixelAspectRatio;  // Display aspect ratio
>+    EGLenum mRenderBuffer;     // Render buffer
>+    EGLenum mSwapBehavior;     // Buffer swap behavior
> 
>     EGLint mOrientation;
> 
>-    gl::BindingPointer<gl::Texture> mTexture;
>+    // We don't use a binding pointer here. We don't ever want to own an orphaned texture. If a
>+    // Texture is deleted the Surface is unbound in onDestroy.
>+    gl::Texture *mTexture;
> 
>-    gl::Format mBackFormat;
>+    gl::Format mColorFormat;
>     gl::Format mDSFormat;
> 
>   private:
>     Error destroyImpl(const Display *display);
>+
>+    void postSwap(const gl::Context *context);
>+    Error releaseRef(const Display *display);
>+
>+    gl::InitState mInitState;
> };
> 
> class WindowSurface final : public Surface
>@@ -235,4 +285,4 @@ using SurfacePointer = angle::UniqueObjectPointerBase<Surface, SurfaceDeleter>;
> 
> }  // namespace egl
> 
>-#endif   // LIBANGLE_SURFACE_H_
>+#endif  // LIBANGLE_SURFACE_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/Surface_unittest.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/Surface_unittest.cpp
>index 4fc9cd377f0..8de989d1edf 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/Surface_unittest.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/Surface_unittest.cpp
>@@ -6,12 +6,12 @@
> 
> #include "gmock/gmock.h"
> #include "gtest/gtest.h"
>-#include "libANGLE/angletypes.h"
>+
> #include "libANGLE/AttributeMap.h"
> #include "libANGLE/Config.h"
>-#include "libANGLE/ContextState.h"
> #include "libANGLE/State.h"
> #include "libANGLE/Surface.h"
>+#include "libANGLE/angletypes.h"
> #include "libANGLE/renderer/FramebufferImpl_mock.h"
> #include "libANGLE/renderer/SurfaceImpl.h"
> #include "tests/angle_unittests_utils.h"
>@@ -30,13 +30,14 @@ class MockSurfaceImpl : public rx::SurfaceImpl
> 
>     MOCK_METHOD1(destroy, void(const egl::Display *));
>     MOCK_METHOD1(initialize, egl::Error(const egl::Display *));
>-    MOCK_METHOD1(createDefaultFramebuffer, rx::FramebufferImpl *(const gl::FramebufferState &data));
>+    MOCK_METHOD2(createDefaultFramebuffer,
>+                 rx::FramebufferImpl *(const gl::Context *, const gl::FramebufferState &data));
>     MOCK_METHOD1(swap, egl::Error(const gl::Context *));
>     MOCK_METHOD3(swapWithDamage, egl::Error(const gl::Context *, EGLint *, EGLint));
>     MOCK_METHOD5(postSubBuffer, egl::Error(const gl::Context *, EGLint, EGLint, EGLint, EGLint));
>-    MOCK_METHOD2(querySurfacePointerANGLE, egl::Error(EGLint, void**));
>-    MOCK_METHOD2(bindTexImage, egl::Error(gl::Texture*, EGLint));
>-    MOCK_METHOD1(releaseTexImage, egl::Error(EGLint));
>+    MOCK_METHOD2(querySurfacePointerANGLE, egl::Error(EGLint, void **));
>+    MOCK_METHOD3(bindTexImage, egl::Error(const gl::Context *context, gl::Texture *, EGLint));
>+    MOCK_METHOD2(releaseTexImage, egl::Error(const gl::Context *context, EGLint));
>     MOCK_METHOD3(getSyncValues, egl::Error(EGLuint64KHR *, EGLuint64KHR *, EGLuint64KHR *));
>     MOCK_METHOD1(setSwapInterval, void(EGLint));
>     MOCK_CONST_METHOD0(getWidth, EGLint());
>@@ -44,10 +45,10 @@ class MockSurfaceImpl : public rx::SurfaceImpl
>     MOCK_CONST_METHOD0(isPostSubBufferSupported, EGLint(void));
>     MOCK_CONST_METHOD0(getSwapBehavior, EGLint(void));
>     MOCK_METHOD4(getAttachmentRenderTarget,
>-                 gl::Error(const gl::Context *,
>-                           GLenum,
>-                           const gl::ImageIndex &,
>-                           rx::FramebufferAttachmentRenderTarget **));
>+                 angle::Result(const gl::Context *,
>+                               GLenum,
>+                               const gl::ImageIndex &,
>+                               rx::FramebufferAttachmentRenderTarget **));
> 
>     MOCK_METHOD0(destructor, void());
> 
>@@ -76,4 +77,4 @@ TEST(SurfaceTest, DestructionDeletesImpl)
>     Mock::VerifyAndClear(impl);
> }
> 
>-} // namespace
>+}  // namespace
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/Texture.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/Texture.cpp
>index da92e659161..d071ac50f87 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/Texture.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/Texture.cpp
>@@ -12,8 +12,8 @@
> #include "common/utilities.h"
> #include "libANGLE/Config.h"
> #include "libANGLE/Context.h"
>-#include "libANGLE/ContextState.h"
> #include "libANGLE/Image.h"
>+#include "libANGLE/State.h"
> #include "libANGLE/Surface.h"
> #include "libANGLE/formatutils.h"
> #include "libANGLE/renderer/GLImplFactory.h"
>@@ -26,28 +26,15 @@ namespace
> {
> bool IsPointSampled(const SamplerState &samplerState)
> {
>-    return (samplerState.magFilter == GL_NEAREST &&
>-            (samplerState.minFilter == GL_NEAREST ||
>-             samplerState.minFilter == GL_NEAREST_MIPMAP_NEAREST));
>+    return (samplerState.getMagFilter() == GL_NEAREST &&
>+            (samplerState.getMinFilter() == GL_NEAREST ||
>+             samplerState.getMinFilter() == GL_NEAREST_MIPMAP_NEAREST));
> }
> 
>-size_t GetImageDescIndex(GLenum target, size_t level)
>+size_t GetImageDescIndex(TextureTarget target, size_t level)
> {
>-    return IsCubeMapTextureTarget(target) ? ((level * 6) + CubeMapTextureTargetToLayerIndex(target))
>-                                          : level;
>-}
>-
>-ImageIndex GetImageIndexFromDescIndex(GLenum target, size_t descIndex)
>-{
>-    if (target == GL_TEXTURE_CUBE_MAP)
>-    {
>-        size_t faceIndex = descIndex % 6;
>-        size_t mipIndex  = descIndex / 6;
>-        return ImageIndex::MakeCube(LayerIndexToCubeMapTextureTarget(faceIndex),
>-                                    static_cast<GLint>(mipIndex));
>-    }
>-
>-    return ImageIndex::MakeGeneric(target, static_cast<GLint>(descIndex));
>+    return IsCubeMapFaceTarget(target) ? (level * 6 + CubeMapTextureTargetToFaceIndex(target))
>+                                       : level;
> }
> 
> InitState DetermineInitState(const Context *context, const uint8_t *pixels)
>@@ -56,7 +43,7 @@ InitState DetermineInitState(const Context *context, const uint8_t *pixels)
>     if (!context || !context->isRobustResourceInitEnabled())
>         return InitState::Initialized;
> 
>-    const auto &glState = context->getGLState();
>+    const auto &glState = context->getState();
>     return (pixels == nullptr && glState.getTargetBuffer(gl::BufferBinding::PixelUnpack) == nullptr)
>                ? InitState::MayNeedInit
>                : InitState::Initialized;
>@@ -66,7 +53,7 @@ InitState DetermineInitState(const Context *context, const uint8_t *pixels)
> 
> bool IsMipmapFiltered(const SamplerState &samplerState)
> {
>-    switch (samplerState.minFilter)
>+    switch (samplerState.getMinFilter())
>     {
>         case GL_NEAREST:
>         case GL_LINEAR:
>@@ -83,17 +70,12 @@ bool IsMipmapFiltered(const SamplerState &samplerState)
> }
> 
> SwizzleState::SwizzleState()
>-    : swizzleRed(GL_INVALID_INDEX),
>-      swizzleGreen(GL_INVALID_INDEX),
>-      swizzleBlue(GL_INVALID_INDEX),
>-      swizzleAlpha(GL_INVALID_INDEX)
>-{
>-}
>+    : swizzleRed(GL_RED), swizzleGreen(GL_GREEN), swizzleBlue(GL_BLUE), swizzleAlpha(GL_ALPHA)
>+{}
> 
> SwizzleState::SwizzleState(GLenum red, GLenum green, GLenum blue, GLenum alpha)
>     : swizzleRed(red), swizzleGreen(green), swizzleBlue(blue), swizzleAlpha(alpha)
>-{
>-}
>+{}
> 
> bool SwizzleState::swizzleRequired() const
> {
>@@ -112,25 +94,25 @@ bool SwizzleState::operator!=(const SwizzleState &other) const
>     return !(*this == other);
> }
> 
>-TextureState::TextureState(GLenum target)
>-    : mTarget(target),
>-      mSwizzleState(GL_RED, GL_GREEN, GL_BLUE, GL_ALPHA),
>-      mSamplerState(SamplerState::CreateDefaultForTarget(target)),
>+TextureState::TextureState(TextureType type)
>+    : mType(type),
>+      mSamplerState(SamplerState::CreateDefaultForTarget(type)),
>       mBaseLevel(0),
>       mMaxLevel(1000),
>       mDepthStencilTextureMode(GL_DEPTH_COMPONENT),
>       mImmutableFormat(false),
>       mImmutableLevels(0),
>       mUsage(GL_NONE),
>-      mImageDescs((IMPLEMENTATION_MAX_TEXTURE_LEVELS + 1) *
>-                  (target == GL_TEXTURE_CUBE_MAP ? 6 : 1)),
>-      mInitState(InitState::MayNeedInit)
>-{
>-}
>+      mImageDescs((IMPLEMENTATION_MAX_TEXTURE_LEVELS + 1) * (type == TextureType::CubeMap ? 6 : 1)),
>+      mCropRect(0, 0, 0, 0),
>+      mGenerateMipmapHint(GL_FALSE),
>+      mInitState(InitState::MayNeedInit),
>+      mCachedSamplerFormat(SamplerFormat::InvalidEnum),
>+      mCachedSamplerCompareMode(GL_NONE),
>+      mCachedSamplerFormatValid(false)
>+{}
> 
>-TextureState::~TextureState()
>-{
>-}
>+TextureState::~TextureState() {}
> 
> bool TextureState::swizzleRequired() const
> {
>@@ -167,9 +149,9 @@ GLuint TextureState::getMipmapMaxLevel() const
> {
>     const ImageDesc &baseImageDesc = getImageDesc(getBaseImageTarget(), getEffectiveBaseLevel());
>     GLuint expectedMipLevels       = 0;
>-    if (mTarget == GL_TEXTURE_3D)
>+    if (mType == TextureType::_3D)
>     {
>-        const int maxDim = std::max(std::max(baseImageDesc.size.width, baseImageDesc.size.height),
>+        const int maxDim  = std::max(std::max(baseImageDesc.size.width, baseImageDesc.size.height),
>                                     baseImageDesc.size.depth);
>         expectedMipLevels = static_cast<GLuint>(log2(maxDim));
>     }
>@@ -209,18 +191,20 @@ bool TextureState::setMaxLevel(GLuint maxLevel)
> // For OpenGL ES2 the base level is always zero.
> bool TextureState::isCubeComplete() const
> {
>-    ASSERT(mTarget == GL_TEXTURE_CUBE_MAP);
>+    ASSERT(mType == TextureType::CubeMap);
> 
>-    const ImageDesc &baseImageDesc =
>-        getImageDesc(FirstCubeMapTextureTarget, getEffectiveBaseLevel());
>+    angle::EnumIterator<TextureTarget> face = kCubeMapTextureTargetMin;
>+    const ImageDesc &baseImageDesc          = getImageDesc(*face, getEffectiveBaseLevel());
>     if (baseImageDesc.size.width == 0 || baseImageDesc.size.width != baseImageDesc.size.height)
>     {
>         return false;
>     }
> 
>-    for (GLenum face = FirstCubeMapTextureTarget + 1; face <= LastCubeMapTextureTarget; face++)
>+    ++face;
>+
>+    for (; face != kAfterCubeMapTextureTargetMax; ++face)
>     {
>-        const ImageDesc &faceImageDesc = getImageDesc(face, getEffectiveBaseLevel());
>+        const ImageDesc &faceImageDesc = getImageDesc(*face, getEffectiveBaseLevel());
>         if (faceImageDesc.size.width != baseImageDesc.size.width ||
>             faceImageDesc.size.height != baseImageDesc.size.height ||
>             !Format::SameSized(faceImageDesc.format, baseImageDesc.format))
>@@ -232,8 +216,61 @@ bool TextureState::isCubeComplete() const
>     return true;
> }
> 
>+const ImageDesc &TextureState::getBaseLevelDesc() const
>+{
>+    ASSERT(mType != TextureType::CubeMap || isCubeComplete());
>+    return getImageDesc(getBaseImageTarget(), getEffectiveBaseLevel());
>+}
>+
>+void TextureState::setCrop(const gl::Rectangle &rect)
>+{
>+    mCropRect = rect;
>+}
>+
>+const gl::Rectangle &TextureState::getCrop() const
>+{
>+    return mCropRect;
>+}
>+
>+void TextureState::setGenerateMipmapHint(GLenum hint)
>+{
>+    mGenerateMipmapHint = hint;
>+}
>+
>+GLenum TextureState::getGenerateMipmapHint() const
>+{
>+    return mGenerateMipmapHint;
>+}
>+
>+SamplerFormat TextureState::computeRequiredSamplerFormat(const SamplerState &samplerState) const
>+{
>+    const ImageDesc &baseImageDesc = getImageDesc(getBaseImageTarget(), getEffectiveBaseLevel());
>+    if ((baseImageDesc.format.info->format == GL_DEPTH_COMPONENT ||
>+         baseImageDesc.format.info->format == GL_DEPTH_STENCIL) &&
>+        samplerState.getCompareMode() != GL_NONE)
>+    {
>+        return SamplerFormat::Shadow;
>+    }
>+    else
>+    {
>+        switch (baseImageDesc.format.info->componentType)
>+        {
>+            case GL_UNSIGNED_NORMALIZED:
>+            case GL_SIGNED_NORMALIZED:
>+            case GL_FLOAT:
>+                return SamplerFormat::Float;
>+            case GL_INT:
>+                return SamplerFormat::Signed;
>+            case GL_UNSIGNED_INT:
>+                return SamplerFormat::Unsigned;
>+            default:
>+                return SamplerFormat::InvalidEnum;
>+        }
>+    }
>+}
>+
> bool TextureState::computeSamplerCompleteness(const SamplerState &samplerState,
>-                                              const ContextState &data) const
>+                                              const State &data) const
> {
>     if (mBaseLevel > mMaxLevel)
>     {
>@@ -249,7 +286,7 @@ bool TextureState::computeSamplerCompleteness(const SamplerState &samplerState,
>     // handled by the above condition.
>     ASSERT(mBaseLevel < IMPLEMENTATION_MAX_TEXTURE_LEVELS || mImmutableFormat);
> 
>-    if (mTarget == GL_TEXTURE_CUBE_MAP && baseImageDesc.size.width != baseImageDesc.size.height)
>+    if (mType == TextureType::CubeMap && baseImageDesc.size.width != baseImageDesc.size.height)
>     {
>         return false;
>     }
>@@ -259,7 +296,7 @@ bool TextureState::computeSamplerCompleteness(const SamplerState &samplerState,
>     // is NEAREST_MIPMAP_LINEAR and magFilter is LINEAR(table 20.11,). For multismaple texture,
>     // filter state of multisample texture is ignored(11.1.3.3). So it shouldn't be judged as
>     // incomplete texture. So, we ignore filtering for multisample texture completeness here.
>-    if (mTarget != GL_TEXTURE_2D_MULTISAMPLE &&
>+    if (!IsMultisampled(mType) &&
>         !baseImageDesc.format.info->filterSupport(data.getClientVersion(), data.getExtensions()) &&
>         !IsPointSampled(samplerState))
>     {
>@@ -268,14 +305,16 @@ bool TextureState::computeSamplerCompleteness(const SamplerState &samplerState,
>     bool npotSupport = data.getExtensions().textureNPOT || data.getClientMajorVersion() >= 3;
>     if (!npotSupport)
>     {
>-        if ((samplerState.wrapS != GL_CLAMP_TO_EDGE && !isPow2(baseImageDesc.size.width)) ||
>-            (samplerState.wrapT != GL_CLAMP_TO_EDGE && !isPow2(baseImageDesc.size.height)))
>+        if ((samplerState.getWrapS() != GL_CLAMP_TO_EDGE &&
>+             samplerState.getWrapS() != GL_CLAMP_TO_BORDER && !isPow2(baseImageDesc.size.width)) ||
>+            (samplerState.getWrapT() != GL_CLAMP_TO_EDGE &&
>+             samplerState.getWrapT() != GL_CLAMP_TO_BORDER && !isPow2(baseImageDesc.size.height)))
>         {
>             return false;
>         }
>     }
> 
>-    if (mTarget != GL_TEXTURE_2D_MULTISAMPLE && IsMipmapFiltered(samplerState))
>+    if (mType != TextureType::_2DMultisample && IsMipmapFiltered(samplerState))
>     {
>         if (!npotSupport)
>         {
>@@ -292,7 +331,7 @@ bool TextureState::computeSamplerCompleteness(const SamplerState &samplerState,
>     }
>     else
>     {
>-        if (mTarget == GL_TEXTURE_CUBE_MAP && !isCubeComplete())
>+        if (mType == TextureType::CubeMap && !isCubeComplete())
>         {
>             return false;
>         }
>@@ -306,14 +345,15 @@ bool TextureState::computeSamplerCompleteness(const SamplerState &samplerState,
>     // texture, the texture will be considered incomplete.
>     // Sampler object state which does not affect sampling for the type of texture bound to a
>     // texture unit, such as TEXTURE_WRAP_R for an external texture, does not affect completeness.
>-    if (mTarget == GL_TEXTURE_EXTERNAL_OES)
>+    if (mType == TextureType::External)
>     {
>-        if (samplerState.wrapS != GL_CLAMP_TO_EDGE || samplerState.wrapT != GL_CLAMP_TO_EDGE)
>+        if (samplerState.getWrapS() != GL_CLAMP_TO_EDGE ||
>+            samplerState.getWrapT() != GL_CLAMP_TO_EDGE)
>         {
>             return false;
>         }
> 
>-        if (samplerState.minFilter != GL_LINEAR && samplerState.minFilter != GL_NEAREST)
>+        if (samplerState.getMinFilter() != GL_LINEAR && samplerState.getMinFilter() != GL_NEAREST)
>         {
>             return false;
>         }
>@@ -324,24 +364,44 @@ bool TextureState::computeSamplerCompleteness(const SamplerState &samplerState,
>     // depth and stencil format (see table 3.13), the value of TEXTURE_COMPARE_-
>     // MODE is NONE, and either the magnification filter is not NEAREST or the mini-
>     // fication filter is neither NEAREST nor NEAREST_MIPMAP_NEAREST.
>-    if (mTarget != GL_TEXTURE_2D_MULTISAMPLE && baseImageDesc.format.info->depthBits > 0 &&
>+    if (!IsMultisampled(mType) && baseImageDesc.format.info->depthBits > 0 &&
>         data.getClientMajorVersion() >= 3)
>     {
>         // Note: we restrict this validation to sized types. For the OES_depth_textures
>         // extension, due to some underspecification problems, we must allow linear filtering
>         // for legacy compatibility with WebGL 1.
>         // See http://crbug.com/649200
>-        if (samplerState.compareMode == GL_NONE && baseImageDesc.format.info->sized)
>+        if (samplerState.getCompareMode() == GL_NONE && baseImageDesc.format.info->sized)
>         {
>-            if ((samplerState.minFilter != GL_NEAREST &&
>-                 samplerState.minFilter != GL_NEAREST_MIPMAP_NEAREST) ||
>-                samplerState.magFilter != GL_NEAREST)
>+            if ((samplerState.getMinFilter() != GL_NEAREST &&
>+                 samplerState.getMinFilter() != GL_NEAREST_MIPMAP_NEAREST) ||
>+                samplerState.getMagFilter() != GL_NEAREST)
>             {
>                 return false;
>             }
>         }
>     }
> 
>+    // OpenGLES 3.1 spec section 8.16 states that a texture is not mipmap complete if:
>+    // The internalformat specified for the texture is DEPTH_STENCIL format, the value of
>+    // DEPTH_STENCIL_TEXTURE_MODE is STENCIL_INDEX, and either the magnification filter is
>+    // not NEAREST or the minification filter is neither NEAREST nor NEAREST_MIPMAP_NEAREST.
>+    // However, the ES 3.1 spec differs from the statement above, because it is incorrect.
>+    // See the issue at https://github.com/KhronosGroup/OpenGL-API/issues/33.
>+    // For multismaple texture, filter state of multisample texture is ignored(11.1.3.3).
>+    // So it shouldn't be judged as incomplete texture. So, we ignore filtering for multisample
>+    // texture completeness here.
>+    if (!IsMultisampled(mType) && baseImageDesc.format.info->depthBits > 0 &&
>+        mDepthStencilTextureMode == GL_STENCIL_INDEX)
>+    {
>+        if ((samplerState.getMinFilter() != GL_NEAREST &&
>+             samplerState.getMinFilter() != GL_NEAREST_MIPMAP_NEAREST) ||
>+            samplerState.getMagFilter() != GL_NEAREST)
>+        {
>+            return false;
>+        }
>+    }
>+
>     return true;
> }
> 
>@@ -351,9 +411,9 @@ bool TextureState::computeMipmapCompleteness() const
> 
>     for (GLuint level = getEffectiveBaseLevel(); level <= maxLevel; level++)
>     {
>-        if (mTarget == GL_TEXTURE_CUBE_MAP)
>+        if (mType == TextureType::CubeMap)
>         {
>-            for (GLenum face = FirstCubeMapTextureTarget; face <= LastCubeMapTextureTarget; face++)
>+            for (TextureTarget face : AllCubeFaceTextureTargets())
>             {
>                 if (!computeLevelCompleteness(face, level))
>                 {
>@@ -363,7 +423,7 @@ bool TextureState::computeMipmapCompleteness() const
>         }
>         else
>         {
>-            if (!computeLevelCompleteness(mTarget, level))
>+            if (!computeLevelCompleteness(NonCubeTextureTypeToTarget(mType), level))
>             {
>                 return false;
>             }
>@@ -373,7 +433,7 @@ bool TextureState::computeMipmapCompleteness() const
>     return true;
> }
> 
>-bool TextureState::computeLevelCompleteness(GLenum target, size_t level) const
>+bool TextureState::computeLevelCompleteness(TextureTarget target, size_t level) const
> {
>     ASSERT(level < IMPLEMENTATION_MAX_TEXTURE_LEVELS);
> 
>@@ -413,14 +473,14 @@ bool TextureState::computeLevelCompleteness(GLenum target, size_t level) const
>         return false;
>     }
> 
>-    if (mTarget == GL_TEXTURE_3D)
>+    if (mType == TextureType::_3D)
>     {
>         if (levelImageDesc.size.depth != std::max(1, baseImageDesc.size.depth >> relativeLevel))
>         {
>             return false;
>         }
>     }
>-    else if (mTarget == GL_TEXTURE_2D_ARRAY)
>+    else if (mType == TextureType::_2DArray)
>     {
>         if (levelImageDesc.size.depth != baseImageDesc.size.depth)
>         {
>@@ -431,20 +491,19 @@ bool TextureState::computeLevelCompleteness(GLenum target, size_t level) const
>     return true;
> }
> 
>-GLenum TextureState::getBaseImageTarget() const
>+TextureTarget TextureState::getBaseImageTarget() const
> {
>-    return mTarget == GL_TEXTURE_CUBE_MAP ? FirstCubeMapTextureTarget : mTarget;
>+    return mType == TextureType::CubeMap ? kCubeMapTextureTargetMin
>+                                         : NonCubeTextureTypeToTarget(mType);
> }
> 
> ImageDesc::ImageDesc()
>     : ImageDesc(Extents(0, 0, 0), Format::Invalid(), 0, GL_TRUE, InitState::Initialized)
>-{
>-}
>+{}
> 
> ImageDesc::ImageDesc(const Extents &size, const Format &format, const InitState initState)
>     : size(size), format(format), samples(0), fixedSampleLocations(GL_TRUE), initState(initState)
>-{
>-}
>+{}
> 
> ImageDesc::ImageDesc(const Extents &size,
>                      const Format &format,
>@@ -456,17 +515,28 @@ ImageDesc::ImageDesc(const Extents &size,
>       samples(samples),
>       fixedSampleLocations(fixedSampleLocations),
>       initState(initState)
>+{}
>+
>+GLint ImageDesc::getMemorySize() const
> {
>+    // Assume allocated size is around width * height * depth * samples * pixelBytes
>+    angle::CheckedNumeric<GLint> levelSize = 1;
>+    levelSize *= format.info->pixelBytes;
>+    levelSize *= size.width;
>+    levelSize *= size.height;
>+    levelSize *= size.depth;
>+    levelSize *= std::max(samples, 1);
>+    return levelSize.ValueOrDefault(std::numeric_limits<GLint>::max());
> }
> 
>-const ImageDesc &TextureState::getImageDesc(GLenum target, size_t level) const
>+const ImageDesc &TextureState::getImageDesc(TextureTarget target, size_t level) const
> {
>     size_t descIndex = GetImageDescIndex(target, level);
>     ASSERT(descIndex < mImageDescs.size());
>     return mImageDescs[descIndex];
> }
> 
>-void TextureState::setImageDesc(GLenum target, size_t level, const ImageDesc &desc)
>+void TextureState::setImageDesc(TextureTarget target, size_t level, const ImageDesc &desc)
> {
>     size_t descIndex = GetImageDescIndex(target, level);
>     ASSERT(descIndex < mImageDescs.size());
>@@ -477,9 +547,19 @@ void TextureState::setImageDesc(GLenum target, size_t level, const ImageDesc &de
>     }
> }
> 
>+// Note that an ImageIndex that represents an entire level of a cube map corresponds to 6
>+// ImageDescs, so if the cube map is cube complete, we return the ImageDesc of the first cube
>+// face, and we don't allow using this function when the cube map is not cube complete.
> const ImageDesc &TextureState::getImageDesc(const ImageIndex &imageIndex) const
> {
>-    return getImageDesc(imageIndex.type, imageIndex.mipIndex);
>+    if (imageIndex.isEntireLevelCubeMap())
>+    {
>+        ASSERT(isCubeComplete());
>+        const GLint levelIndex = imageIndex.getLevelIndex();
>+        return getImageDesc(kCubeMapTextureTargetMin, levelIndex);
>+    }
>+
>+    return getImageDesc(imageIndex.getTarget(), imageIndex.getLevelIndex());
> }
> 
> void TextureState::setImageDescChain(GLuint baseLevel,
>@@ -493,21 +573,21 @@ void TextureState::setImageDescChain(GLuint baseLevel,
>         int relativeLevel = (level - baseLevel);
>         Extents levelSize(std::max<int>(baseSize.width >> relativeLevel, 1),
>                           std::max<int>(baseSize.height >> relativeLevel, 1),
>-                          (mTarget == GL_TEXTURE_2D_ARRAY)
>+                          (mType == TextureType::_2DArray)
>                               ? baseSize.depth
>                               : std::max<int>(baseSize.depth >> relativeLevel, 1));
>         ImageDesc levelInfo(levelSize, format, initState);
> 
>-        if (mTarget == GL_TEXTURE_CUBE_MAP)
>+        if (mType == TextureType::CubeMap)
>         {
>-            for (GLenum face = FirstCubeMapTextureTarget; face <= LastCubeMapTextureTarget; face++)
>+            for (TextureTarget face : AllCubeFaceTextureTargets())
>             {
>                 setImageDesc(face, level, levelInfo);
>             }
>         }
>         else
>         {
>-            setImageDesc(mTarget, level, levelInfo);
>+            setImageDesc(NonCubeTextureTypeToTarget(mType), level, levelInfo);
>         }
>     }
> }
>@@ -518,12 +598,12 @@ void TextureState::setImageDescChainMultisample(Extents baseSize,
>                                                 bool fixedSampleLocations,
>                                                 InitState initState)
> {
>-    ASSERT(mTarget == GL_TEXTURE_2D_MULTISAMPLE);
>+    ASSERT(mType == TextureType::_2DMultisample || mType == TextureType::_2DMultisampleArray);
>     ImageDesc levelInfo(baseSize, format, samples, fixedSampleLocations, initState);
>-    setImageDesc(mTarget, 0, levelInfo);
>+    setImageDesc(NonCubeTextureTypeToTarget(mType), 0, levelInfo);
> }
> 
>-void TextureState::clearImageDesc(GLenum target, size_t level)
>+void TextureState::clearImageDesc(TextureTarget target, size_t level)
> {
>     setImageDesc(target, level, ImageDesc());
> }
>@@ -536,21 +616,26 @@ void TextureState::clearImageDescs()
>     }
> }
> 
>-Texture::Texture(rx::GLImplFactory *factory, GLuint id, GLenum target)
>-    : egl::ImageSibling(id),
>-      mState(target),
>+Texture::Texture(rx::GLImplFactory *factory, GLuint id, TextureType type)
>+    : RefCountObject(id),
>+      mState(type),
>       mTexture(factory->createTexture(mState)),
>+      mImplObserver(this, 0),
>       mLabel(),
>       mBoundSurface(nullptr),
>       mBoundStream(nullptr)
> {
>+    mImplObserver.bind(mTexture);
>+
>+    // Initially assume the implementation is dirty.
>+    mDirtyBits.set(DIRTY_BIT_IMPLEMENTATION);
> }
> 
>-Error Texture::onDestroy(const Context *context)
>+void Texture::onDestroy(const Context *context)
> {
>     if (mBoundSurface)
>     {
>-        ANGLE_TRY(mBoundSurface->releaseTexImage(context, EGL_BACK_BUFFER));
>+        ANGLE_SWALLOW_ERR(mBoundSurface->releaseTexImage(context, EGL_BACK_BUFFER));
>         mBoundSurface = nullptr;
>     }
>     if (mBoundStream)
>@@ -559,13 +644,12 @@ Error Texture::onDestroy(const Context *context)
>         mBoundStream = nullptr;
>     }
> 
>-    ANGLE_TRY(orphanImages(context));
>+    (void)(orphanImages(context));
> 
>     if (mTexture)
>     {
>-        ANGLE_TRY(mTexture->onDestroy(context));
>+        mTexture->onDestroy(context);
>     }
>-    return NoError();
> }
> 
> Texture::~Texture()
>@@ -573,10 +657,10 @@ Texture::~Texture()
>     SafeDelete(mTexture);
> }
> 
>-void Texture::setLabel(const std::string &label)
>+void Texture::setLabel(const Context *context, const std::string &label)
> {
>     mLabel = label;
>-    mDirtyBits.set(DIRTY_BIT_LABEL);
>+    signalDirtyState(context, DIRTY_BIT_LABEL);
> }
> 
> const std::string &Texture::getLabel() const
>@@ -584,15 +668,10 @@ const std::string &Texture::getLabel() const
>     return mLabel;
> }
> 
>-GLenum Texture::getTarget() const
>-{
>-    return mState.mTarget;
>-}
>-
>-void Texture::setSwizzleRed(GLenum swizzleRed)
>+void Texture::setSwizzleRed(const Context *context, GLenum swizzleRed)
> {
>     mState.mSwizzleState.swizzleRed = swizzleRed;
>-    mDirtyBits.set(DIRTY_BIT_SWIZZLE_RED);
>+    signalDirtyState(context, DIRTY_BIT_SWIZZLE_RED);
> }
> 
> GLenum Texture::getSwizzleRed() const
>@@ -600,10 +679,10 @@ GLenum Texture::getSwizzleRed() const
>     return mState.mSwizzleState.swizzleRed;
> }
> 
>-void Texture::setSwizzleGreen(GLenum swizzleGreen)
>+void Texture::setSwizzleGreen(const Context *context, GLenum swizzleGreen)
> {
>     mState.mSwizzleState.swizzleGreen = swizzleGreen;
>-    mDirtyBits.set(DIRTY_BIT_SWIZZLE_GREEN);
>+    signalDirtyState(context, DIRTY_BIT_SWIZZLE_GREEN);
> }
> 
> GLenum Texture::getSwizzleGreen() const
>@@ -611,10 +690,10 @@ GLenum Texture::getSwizzleGreen() const
>     return mState.mSwizzleState.swizzleGreen;
> }
> 
>-void Texture::setSwizzleBlue(GLenum swizzleBlue)
>+void Texture::setSwizzleBlue(const Context *context, GLenum swizzleBlue)
> {
>     mState.mSwizzleState.swizzleBlue = swizzleBlue;
>-    mDirtyBits.set(DIRTY_BIT_SWIZZLE_BLUE);
>+    signalDirtyState(context, DIRTY_BIT_SWIZZLE_BLUE);
> }
> 
> GLenum Texture::getSwizzleBlue() const
>@@ -622,10 +701,10 @@ GLenum Texture::getSwizzleBlue() const
>     return mState.mSwizzleState.swizzleBlue;
> }
> 
>-void Texture::setSwizzleAlpha(GLenum swizzleAlpha)
>+void Texture::setSwizzleAlpha(const Context *context, GLenum swizzleAlpha)
> {
>     mState.mSwizzleState.swizzleAlpha = swizzleAlpha;
>-    mDirtyBits.set(DIRTY_BIT_SWIZZLE_ALPHA);
>+    signalDirtyState(context, DIRTY_BIT_SWIZZLE_ALPHA);
> }
> 
> GLenum Texture::getSwizzleAlpha() const
>@@ -633,125 +712,125 @@ GLenum Texture::getSwizzleAlpha() const
>     return mState.mSwizzleState.swizzleAlpha;
> }
> 
>-void Texture::setMinFilter(GLenum minFilter)
>+void Texture::setMinFilter(const Context *context, GLenum minFilter)
> {
>-    mState.mSamplerState.minFilter = minFilter;
>-    mDirtyBits.set(DIRTY_BIT_MIN_FILTER);
>+    mState.mSamplerState.setMinFilter(minFilter);
>+    signalDirtyState(context, DIRTY_BIT_MIN_FILTER);
> }
> 
> GLenum Texture::getMinFilter() const
> {
>-    return mState.mSamplerState.minFilter;
>+    return mState.mSamplerState.getMinFilter();
> }
> 
>-void Texture::setMagFilter(GLenum magFilter)
>+void Texture::setMagFilter(const Context *context, GLenum magFilter)
> {
>-    mState.mSamplerState.magFilter = magFilter;
>-    mDirtyBits.set(DIRTY_BIT_MAG_FILTER);
>+    mState.mSamplerState.setMagFilter(magFilter);
>+    signalDirtyState(context, DIRTY_BIT_MAG_FILTER);
> }
> 
> GLenum Texture::getMagFilter() const
> {
>-    return mState.mSamplerState.magFilter;
>+    return mState.mSamplerState.getMagFilter();
> }
> 
>-void Texture::setWrapS(GLenum wrapS)
>+void Texture::setWrapS(const Context *context, GLenum wrapS)
> {
>-    mState.mSamplerState.wrapS = wrapS;
>-    mDirtyBits.set(DIRTY_BIT_WRAP_S);
>+    mState.mSamplerState.setWrapS(wrapS);
>+    signalDirtyState(context, DIRTY_BIT_WRAP_S);
> }
> 
> GLenum Texture::getWrapS() const
> {
>-    return mState.mSamplerState.wrapS;
>+    return mState.mSamplerState.getWrapS();
> }
> 
>-void Texture::setWrapT(GLenum wrapT)
>+void Texture::setWrapT(const Context *context, GLenum wrapT)
> {
>-    mState.mSamplerState.wrapT = wrapT;
>-    mDirtyBits.set(DIRTY_BIT_WRAP_T);
>+    mState.mSamplerState.setWrapT(wrapT);
>+    signalDirtyState(context, DIRTY_BIT_WRAP_T);
> }
> 
> GLenum Texture::getWrapT() const
> {
>-    return mState.mSamplerState.wrapT;
>+    return mState.mSamplerState.getWrapT();
> }
> 
>-void Texture::setWrapR(GLenum wrapR)
>+void Texture::setWrapR(const Context *context, GLenum wrapR)
> {
>-    mState.mSamplerState.wrapR = wrapR;
>-    mDirtyBits.set(DIRTY_BIT_WRAP_R);
>+    mState.mSamplerState.setWrapR(wrapR);
>+    signalDirtyState(context, DIRTY_BIT_WRAP_R);
> }
> 
> GLenum Texture::getWrapR() const
> {
>-    return mState.mSamplerState.wrapR;
>+    return mState.mSamplerState.getWrapR();
> }
> 
>-void Texture::setMaxAnisotropy(float maxAnisotropy)
>+void Texture::setMaxAnisotropy(const Context *context, float maxAnisotropy)
> {
>-    mState.mSamplerState.maxAnisotropy = maxAnisotropy;
>-    mDirtyBits.set(DIRTY_BIT_MAX_ANISOTROPY);
>+    mState.mSamplerState.setMaxAnisotropy(maxAnisotropy);
>+    signalDirtyState(context, DIRTY_BIT_MAX_ANISOTROPY);
> }
> 
> float Texture::getMaxAnisotropy() const
> {
>-    return mState.mSamplerState.maxAnisotropy;
>+    return mState.mSamplerState.getMaxAnisotropy();
> }
> 
>-void Texture::setMinLod(GLfloat minLod)
>+void Texture::setMinLod(const Context *context, GLfloat minLod)
> {
>-    mState.mSamplerState.minLod = minLod;
>-    mDirtyBits.set(DIRTY_BIT_MIN_LOD);
>+    mState.mSamplerState.setMinLod(minLod);
>+    signalDirtyState(context, DIRTY_BIT_MIN_LOD);
> }
> 
> GLfloat Texture::getMinLod() const
> {
>-    return mState.mSamplerState.minLod;
>+    return mState.mSamplerState.getMinLod();
> }
> 
>-void Texture::setMaxLod(GLfloat maxLod)
>+void Texture::setMaxLod(const Context *context, GLfloat maxLod)
> {
>-    mState.mSamplerState.maxLod = maxLod;
>-    mDirtyBits.set(DIRTY_BIT_MAX_LOD);
>+    mState.mSamplerState.setMaxLod(maxLod);
>+    signalDirtyState(context, DIRTY_BIT_MAX_LOD);
> }
> 
> GLfloat Texture::getMaxLod() const
> {
>-    return mState.mSamplerState.maxLod;
>+    return mState.mSamplerState.getMaxLod();
> }
> 
>-void Texture::setCompareMode(GLenum compareMode)
>+void Texture::setCompareMode(const Context *context, GLenum compareMode)
> {
>-    mState.mSamplerState.compareMode = compareMode;
>-    mDirtyBits.set(DIRTY_BIT_COMPARE_MODE);
>+    mState.mSamplerState.setCompareMode(compareMode);
>+    signalDirtyState(context, DIRTY_BIT_COMPARE_MODE);
> }
> 
> GLenum Texture::getCompareMode() const
> {
>-    return mState.mSamplerState.compareMode;
>+    return mState.mSamplerState.getCompareMode();
> }
> 
>-void Texture::setCompareFunc(GLenum compareFunc)
>+void Texture::setCompareFunc(const Context *context, GLenum compareFunc)
> {
>-    mState.mSamplerState.compareFunc = compareFunc;
>-    mDirtyBits.set(DIRTY_BIT_COMPARE_FUNC);
>+    mState.mSamplerState.setCompareFunc(compareFunc);
>+    signalDirtyState(context, DIRTY_BIT_COMPARE_FUNC);
> }
> 
> GLenum Texture::getCompareFunc() const
> {
>-    return mState.mSamplerState.compareFunc;
>+    return mState.mSamplerState.getCompareFunc();
> }
> 
>-void Texture::setSRGBDecode(GLenum sRGBDecode)
>+void Texture::setSRGBDecode(const Context *context, GLenum sRGBDecode)
> {
>-    mState.mSamplerState.sRGBDecode = sRGBDecode;
>-    mDirtyBits.set(DIRTY_BIT_SRGB_DECODE);
>+    mState.mSamplerState.setSRGBDecode(sRGBDecode);
>+    signalDirtyState(context, DIRTY_BIT_SRGB_DECODE);
> }
> 
> GLenum Texture::getSRGBDecode() const
> {
>-    return mState.mSamplerState.sRGBDecode;
>+    return mState.mSamplerState.getSRGBDecode();
> }
> 
> const SamplerState &Texture::getSamplerState() const
>@@ -759,16 +838,15 @@ const SamplerState &Texture::getSamplerState() const
>     return mState.mSamplerState;
> }
> 
>-Error Texture::setBaseLevel(const Context *context, GLuint baseLevel)
>+angle::Result Texture::setBaseLevel(const Context *context, GLuint baseLevel)
> {
>     if (mState.setBaseLevel(baseLevel))
>     {
>         ANGLE_TRY(mTexture->setBaseLevel(context, mState.getEffectiveBaseLevel()));
>-        mDirtyBits.set(DIRTY_BIT_BASE_LEVEL);
>-        invalidateCompletenessCache();
>+        signalDirtyState(context, DIRTY_BIT_BASE_LEVEL);
>     }
> 
>-    return NoError();
>+    return angle::Result::Continue;
> }
> 
> GLuint Texture::getBaseLevel() const
>@@ -776,12 +854,11 @@ GLuint Texture::getBaseLevel() const
>     return mState.mBaseLevel;
> }
> 
>-void Texture::setMaxLevel(GLuint maxLevel)
>+void Texture::setMaxLevel(const Context *context, GLuint maxLevel)
> {
>     if (mState.setMaxLevel(maxLevel))
>     {
>-        mDirtyBits.set(DIRTY_BIT_MAX_LEVEL);
>-        invalidateCompletenessCache();
>+        signalDirtyState(context, DIRTY_BIT_MAX_LEVEL);
>     }
> }
> 
>@@ -790,16 +867,13 @@ GLuint Texture::getMaxLevel() const
>     return mState.mMaxLevel;
> }
> 
>-void Texture::setDepthStencilTextureMode(GLenum mode)
>+void Texture::setDepthStencilTextureMode(const Context *context, GLenum mode)
> {
>-    if (mode != mState.mDepthStencilTextureMode)
>+    if (mState.mDepthStencilTextureMode != mode)
>     {
>-        // Changing the mode from the default state (GL_DEPTH_COMPONENT) is not implemented yet
>-        UNIMPLEMENTED();
>+        mState.mDepthStencilTextureMode = mode;
>+        signalDirtyState(context, DIRTY_BIT_DEPTH_STENCIL_TEXTURE_MODE);
>     }
>-
>-    // TODO(geofflang): add dirty bits
>-    mState.mDepthStencilTextureMode = mode;
> }
> 
> GLenum Texture::getDepthStencilTextureMode() const
>@@ -817,10 +891,10 @@ GLuint Texture::getImmutableLevels() const
>     return mState.mImmutableLevels;
> }
> 
>-void Texture::setUsage(GLenum usage)
>+void Texture::setUsage(const Context *context, GLenum usage)
> {
>     mState.mUsage = usage;
>-    mDirtyBits.set(DIRTY_BIT_USAGE);
>+    signalDirtyState(context, DIRTY_BIT_USAGE);
> }
> 
> GLenum Texture::getUsage() const
>@@ -833,45 +907,39 @@ const TextureState &Texture::getTextureState() const
>     return mState;
> }
> 
>-size_t Texture::getWidth(GLenum target, size_t level) const
>+size_t Texture::getWidth(TextureTarget target, size_t level) const
> {
>-    ASSERT(target == mState.mTarget ||
>-           (mState.mTarget == GL_TEXTURE_CUBE_MAP && IsCubeMapTextureTarget(target)));
>+    ASSERT(TextureTargetToType(target) == mState.mType);
>     return mState.getImageDesc(target, level).size.width;
> }
> 
>-size_t Texture::getHeight(GLenum target, size_t level) const
>+size_t Texture::getHeight(TextureTarget target, size_t level) const
> {
>-    ASSERT(target == mState.mTarget ||
>-           (mState.mTarget == GL_TEXTURE_CUBE_MAP && IsCubeMapTextureTarget(target)));
>+    ASSERT(TextureTargetToType(target) == mState.mType);
>     return mState.getImageDesc(target, level).size.height;
> }
> 
>-size_t Texture::getDepth(GLenum target, size_t level) const
>+size_t Texture::getDepth(TextureTarget target, size_t level) const
> {
>-    ASSERT(target == mState.mTarget ||
>-           (mState.mTarget == GL_TEXTURE_CUBE_MAP && IsCubeMapTextureTarget(target)));
>+    ASSERT(TextureTargetToType(target) == mState.mType);
>     return mState.getImageDesc(target, level).size.depth;
> }
> 
>-const Format &Texture::getFormat(GLenum target, size_t level) const
>+const Format &Texture::getFormat(TextureTarget target, size_t level) const
> {
>-    ASSERT(target == mState.mTarget ||
>-           (mState.mTarget == GL_TEXTURE_CUBE_MAP && IsCubeMapTextureTarget(target)));
>+    ASSERT(TextureTargetToType(target) == mState.mType);
>     return mState.getImageDesc(target, level).format;
> }
> 
>-GLsizei Texture::getSamples(GLenum target, size_t level) const
>+GLsizei Texture::getSamples(TextureTarget target, size_t level) const
> {
>-    ASSERT(target == mState.mTarget ||
>-           (mState.mTarget == GL_TEXTURE_CUBE_MAP && IsCubeMapTextureTarget(target)));
>+    ASSERT(TextureTargetToType(target) == mState.mType);
>     return mState.getImageDesc(target, level).samples;
> }
> 
>-bool Texture::getFixedSampleLocations(GLenum target, size_t level) const
>+bool Texture::getFixedSampleLocations(TextureTarget target, size_t level) const
> {
>-    ASSERT(target == mState.mTarget ||
>-           (mState.mTarget == GL_TEXTURE_CUBE_MAP && IsCubeMapTextureTarget(target)));
>+    ASSERT(TextureTargetToType(target) == mState.mType);
>     return mState.getImageDesc(target, level).fixedSampleLocations;
> }
> 
>@@ -895,109 +963,158 @@ egl::Stream *Texture::getBoundStream() const
>     return mBoundStream;
> }
> 
>-void Texture::signalDirty(InitState initState) const
>+GLint Texture::getMemorySize() const
>+{
>+    GLint implSize = mTexture->getMemorySize();
>+    if (implSize > 0)
>+    {
>+        return implSize;
>+    }
>+
>+    angle::CheckedNumeric<GLint> size = 0;
>+    for (const ImageDesc &imageDesc : mState.mImageDescs)
>+    {
>+        size += imageDesc.getMemorySize();
>+    }
>+    return size.ValueOrDefault(std::numeric_limits<GLint>::max());
>+}
>+
>+GLint Texture::getLevelMemorySize(TextureTarget target, GLint level) const
> {
>-    mDirtyChannel.signal(initState);
>+    GLint implSize = mTexture->getLevelMemorySize(target, level);
>+    if (implSize > 0)
>+    {
>+        return implSize;
>+    }
>+
>+    return mState.getImageDesc(target, level).getMemorySize();
>+}
>+
>+void Texture::signalDirtyStorage(const Context *context, InitState initState)
>+{
>+    mState.mInitState = initState;
>     invalidateCompletenessCache();
>+    mState.mCachedSamplerFormatValid = false;
>+    onStateChange(context, angle::SubjectMessage::STORAGE_CHANGED);
> }
> 
>-Error Texture::setImage(const Context *context,
>-                        const PixelUnpackState &unpackState,
>-                        GLenum target,
>-                        size_t level,
>-                        GLenum internalFormat,
>-                        const Extents &size,
>-                        GLenum format,
>-                        GLenum type,
>-                        const uint8_t *pixels)
>+void Texture::signalDirtyState(const Context *context, size_t dirtyBit)
> {
>-    ASSERT(target == mState.mTarget ||
>-           (mState.mTarget == GL_TEXTURE_CUBE_MAP && IsCubeMapTextureTarget(target)));
>+    mDirtyBits.set(dirtyBit);
>+    invalidateCompletenessCache();
>+    mState.mCachedSamplerFormatValid = false;
>+    onStateChange(context, angle::SubjectMessage::DEPENDENT_DIRTY_BITS);
>+}
>+
>+angle::Result Texture::setImage(Context *context,
>+                                const PixelUnpackState &unpackState,
>+                                TextureTarget target,
>+                                GLint level,
>+                                GLenum internalFormat,
>+                                const Extents &size,
>+                                GLenum format,
>+                                GLenum type,
>+                                const uint8_t *pixels)
>+{
>+    ASSERT(TextureTargetToType(target) == mState.mType);
> 
>     // Release from previous calls to eglBindTexImage, to avoid calling the Impl after
>     ANGLE_TRY(releaseTexImageInternal(context));
>     ANGLE_TRY(orphanImages(context));
> 
>-    ANGLE_TRY(mTexture->setImage(context, target, level, internalFormat, size, format, type,
>-                                 unpackState, pixels));
>+    ImageIndex index = ImageIndex::MakeFromTarget(target, level);
>+
>+    ANGLE_TRY(mTexture->setImage(context, index, internalFormat, size, format, type, unpackState,
>+                                 pixels));
> 
>     InitState initState = DetermineInitState(context, pixels);
>     mState.setImageDesc(target, level, ImageDesc(size, Format(internalFormat, type), initState));
>-    signalDirty(initState);
> 
>-    return NoError();
>+    ANGLE_TRY(handleMipmapGenerationHint(context, level));
>+
>+    signalDirtyStorage(context, initState);
>+
>+    return angle::Result::Continue;
> }
> 
>-Error Texture::setSubImage(const Context *context,
>-                           const PixelUnpackState &unpackState,
>-                           GLenum target,
>-                           size_t level,
>-                           const Box &area,
>-                           GLenum format,
>-                           GLenum type,
>-                           const uint8_t *pixels)
>+angle::Result Texture::setSubImage(Context *context,
>+                                   const PixelUnpackState &unpackState,
>+                                   Buffer *unpackBuffer,
>+                                   TextureTarget target,
>+                                   GLint level,
>+                                   const Box &area,
>+                                   GLenum format,
>+                                   GLenum type,
>+                                   const uint8_t *pixels)
> {
>-    ASSERT(target == mState.mTarget ||
>-           (mState.mTarget == GL_TEXTURE_CUBE_MAP && IsCubeMapTextureTarget(target)));
>+    ASSERT(TextureTargetToType(target) == mState.mType);
> 
>     ANGLE_TRY(ensureSubImageInitialized(context, target, level, area));
> 
>-    return mTexture->setSubImage(context, target, level, area, format, type, unpackState, pixels);
>+    ImageIndex index = ImageIndex::MakeFromTarget(target, level);
>+
>+    ANGLE_TRY(mTexture->setSubImage(context, index, area, format, type, unpackState, unpackBuffer,
>+                                    pixels));
>+
>+    ANGLE_TRY(handleMipmapGenerationHint(context, level));
>+
>+    return angle::Result::Continue;
> }
> 
>-Error Texture::setCompressedImage(const Context *context,
>-                                  const PixelUnpackState &unpackState,
>-                                  GLenum target,
>-                                  size_t level,
>-                                  GLenum internalFormat,
>-                                  const Extents &size,
>-                                  size_t imageSize,
>-                                  const uint8_t *pixels)
>+angle::Result Texture::setCompressedImage(Context *context,
>+                                          const PixelUnpackState &unpackState,
>+                                          TextureTarget target,
>+                                          GLint level,
>+                                          GLenum internalFormat,
>+                                          const Extents &size,
>+                                          size_t imageSize,
>+                                          const uint8_t *pixels)
> {
>-    ASSERT(target == mState.mTarget ||
>-           (mState.mTarget == GL_TEXTURE_CUBE_MAP && IsCubeMapTextureTarget(target)));
>+    ASSERT(TextureTargetToType(target) == mState.mType);
> 
>     // Release from previous calls to eglBindTexImage, to avoid calling the Impl after
>     ANGLE_TRY(releaseTexImageInternal(context));
>     ANGLE_TRY(orphanImages(context));
> 
>-    ANGLE_TRY(mTexture->setCompressedImage(context, target, level, internalFormat, size,
>-                                           unpackState, imageSize, pixels));
>+    ImageIndex index = ImageIndex::MakeFromTarget(target, level);
>+
>+    ANGLE_TRY(mTexture->setCompressedImage(context, index, internalFormat, size, unpackState,
>+                                           imageSize, pixels));
> 
>     InitState initState = DetermineInitState(context, pixels);
>     mState.setImageDesc(target, level, ImageDesc(size, Format(internalFormat), initState));
>-    signalDirty(initState);
>+    signalDirtyStorage(context, initState);
> 
>-    return NoError();
>+    return angle::Result::Continue;
> }
> 
>-Error Texture::setCompressedSubImage(const Context *context,
>-                                     const PixelUnpackState &unpackState,
>-                                     GLenum target,
>-                                     size_t level,
>-                                     const Box &area,
>-                                     GLenum format,
>-                                     size_t imageSize,
>-                                     const uint8_t *pixels)
>+angle::Result Texture::setCompressedSubImage(const Context *context,
>+                                             const PixelUnpackState &unpackState,
>+                                             TextureTarget target,
>+                                             GLint level,
>+                                             const Box &area,
>+                                             GLenum format,
>+                                             size_t imageSize,
>+                                             const uint8_t *pixels)
> {
>-    ASSERT(target == mState.mTarget ||
>-           (mState.mTarget == GL_TEXTURE_CUBE_MAP && IsCubeMapTextureTarget(target)));
>+    ASSERT(TextureTargetToType(target) == mState.mType);
> 
>     ANGLE_TRY(ensureSubImageInitialized(context, target, level, area));
> 
>-    return mTexture->setCompressedSubImage(context, target, level, area, format, unpackState,
>-                                           imageSize, pixels);
>+    ImageIndex index = ImageIndex::MakeFromTarget(target, level);
>+
>+    return mTexture->setCompressedSubImage(context, index, area, format, unpackState, imageSize,
>+                                           pixels);
> }
> 
>-Error Texture::copyImage(const Context *context,
>-                         GLenum target,
>-                         size_t level,
>-                         const Rectangle &sourceArea,
>-                         GLenum internalFormat,
>-                         Framebuffer *source)
>+angle::Result Texture::copyImage(Context *context,
>+                                 TextureTarget target,
>+                                 GLint level,
>+                                 const Rectangle &sourceArea,
>+                                 GLenum internalFormat,
>+                                 Framebuffer *source)
> {
>-    ASSERT(target == mState.mTarget ||
>-           (mState.mTarget == GL_TEXTURE_CUBE_MAP && IsCubeMapTextureTarget(target)));
>+    ASSERT(TextureTargetToType(target) == mState.mType);
> 
>     // Release from previous calls to eglBindTexImage, to avoid calling the Impl after
>     ANGLE_TRY(releaseTexImageInternal(context));
>@@ -1010,7 +1127,9 @@ Error Texture::copyImage(const Context *context,
>     Box destBox(0, 0, 0, sourceArea.width, sourceArea.height, 1);
>     ANGLE_TRY(ensureSubImageInitialized(context, target, level, destBox));
> 
>-    ANGLE_TRY(mTexture->copyImage(context, target, level, sourceArea, internalFormat, source));
>+    ImageIndex index = ImageIndex::MakeFromTarget(target, level);
>+
>+    ANGLE_TRY(mTexture->copyImage(context, index, sourceArea, internalFormat, source));
> 
>     const InternalFormat &internalFormatInfo =
>         GetInternalFormatInfo(internalFormat, GL_UNSIGNED_BYTE);
>@@ -1019,44 +1138,48 @@ Error Texture::copyImage(const Context *context,
>                         ImageDesc(Extents(sourceArea.width, sourceArea.height, 1),
>                                   Format(internalFormatInfo), InitState::Initialized));
> 
>+    ANGLE_TRY(handleMipmapGenerationHint(context, level));
>+
>     // We need to initialize this texture only if the source attachment is not initialized.
>-    signalDirty(InitState::Initialized);
>+    signalDirtyStorage(context, InitState::Initialized);
> 
>-    return NoError();
>+    return angle::Result::Continue;
> }
> 
>-Error Texture::copySubImage(const Context *context,
>-                            GLenum target,
>-                            size_t level,
>-                            const Offset &destOffset,
>-                            const Rectangle &sourceArea,
>-                            Framebuffer *source)
>+angle::Result Texture::copySubImage(Context *context,
>+                                    const ImageIndex &index,
>+                                    const Offset &destOffset,
>+                                    const Rectangle &sourceArea,
>+                                    Framebuffer *source)
> {
>-    ASSERT(target == mState.mTarget ||
>-           (mState.mTarget == GL_TEXTURE_CUBE_MAP && IsCubeMapTextureTarget(target)));
>+    ASSERT(TextureTargetToType(index.getTarget()) == mState.mType);
> 
>     // Ensure source FBO is initialized.
>     ANGLE_TRY(source->ensureReadAttachmentInitialized(context, GL_COLOR_BUFFER_BIT));
> 
>-    Box destBox(destOffset.x, destOffset.y, destOffset.y, sourceArea.width, sourceArea.height, 1);
>-    ANGLE_TRY(ensureSubImageInitialized(context, target, level, destBox));
>+    Box destBox(destOffset.x, destOffset.y, destOffset.z, sourceArea.width, sourceArea.height, 1);
>+    ANGLE_TRY(
>+        ensureSubImageInitialized(context, index.getTarget(), index.getLevelIndex(), destBox));
>+
>+    ANGLE_TRY(mTexture->copySubImage(context, index, destOffset, sourceArea, source));
>+    ANGLE_TRY(handleMipmapGenerationHint(context, index.getLevelIndex()));
> 
>-    return mTexture->copySubImage(context, target, level, destOffset, sourceArea, source);
>+    return angle::Result::Continue;
> }
> 
>-Error Texture::copyTexture(const Context *context,
>-                           GLenum target,
>-                           size_t level,
>-                           GLenum internalFormat,
>-                           GLenum type,
>-                           size_t sourceLevel,
>-                           bool unpackFlipY,
>-                           bool unpackPremultiplyAlpha,
>-                           bool unpackUnmultiplyAlpha,
>-                           Texture *source)
>+angle::Result Texture::copyTexture(Context *context,
>+                                   TextureTarget target,
>+                                   GLint level,
>+                                   GLenum internalFormat,
>+                                   GLenum type,
>+                                   GLint sourceLevel,
>+                                   bool unpackFlipY,
>+                                   bool unpackPremultiplyAlpha,
>+                                   bool unpackUnmultiplyAlpha,
>+                                   Texture *source)
> {
>-    ASSERT(target == mState.mTarget ||
>-           (mState.mTarget == GL_TEXTURE_CUBE_MAP && IsCubeMapTextureTarget(target)));
>+    ASSERT(TextureTargetToType(target) == mState.mType);
>+    ASSERT(source->getType() != TextureType::CubeMap);
> 
>     // Release from previous calls to eglBindTexImage, to avoid calling the Impl after
>     ANGLE_TRY(releaseTexImageInternal(context));
>@@ -1066,47 +1189,50 @@ Error Texture::copyTexture(const Context *context,
>     // Note: we don't have a way to notify which portions of the image changed currently.
>     ANGLE_TRY(source->ensureInitialized(context));
> 
>-    ANGLE_TRY(mTexture->copyTexture(context, target, level, internalFormat, type, sourceLevel,
>-                                    unpackFlipY, unpackPremultiplyAlpha, unpackUnmultiplyAlpha,
>-                                    source));
>+    ImageIndex index = ImageIndex::MakeFromTarget(target, level);
>+
>+    ANGLE_TRY(mTexture->copyTexture(context, index, internalFormat, type, sourceLevel, unpackFlipY,
>+                                    unpackPremultiplyAlpha, unpackUnmultiplyAlpha, source));
> 
>-    const auto &sourceDesc   = source->mState.getImageDesc(source->getTarget(), 0);
>+    const auto &sourceDesc =
>+        source->mState.getImageDesc(NonCubeTextureTypeToTarget(source->getType()), 0);
>     const InternalFormat &internalFormatInfo = GetInternalFormatInfo(internalFormat, type);
>     mState.setImageDesc(
>         target, level,
>         ImageDesc(sourceDesc.size, Format(internalFormatInfo), InitState::Initialized));
> 
>-    signalDirty(InitState::Initialized);
>+    signalDirtyStorage(context, InitState::Initialized);
> 
>-    return NoError();
>+    return angle::Result::Continue;
> }
> 
>-Error Texture::copySubTexture(const Context *context,
>-                              GLenum target,
>-                              size_t level,
>-                              const Offset &destOffset,
>-                              size_t sourceLevel,
>-                              const Rectangle &sourceArea,
>-                              bool unpackFlipY,
>-                              bool unpackPremultiplyAlpha,
>-                              bool unpackUnmultiplyAlpha,
>-                              Texture *source)
>+angle::Result Texture::copySubTexture(const Context *context,
>+                                      TextureTarget target,
>+                                      GLint level,
>+                                      const Offset &destOffset,
>+                                      GLint sourceLevel,
>+                                      const Box &sourceBox,
>+                                      bool unpackFlipY,
>+                                      bool unpackPremultiplyAlpha,
>+                                      bool unpackUnmultiplyAlpha,
>+                                      Texture *source)
> {
>-    ASSERT(target == mState.mTarget ||
>-           (mState.mTarget == GL_TEXTURE_CUBE_MAP && IsCubeMapTextureTarget(target)));
>+    ASSERT(TextureTargetToType(target) == mState.mType);
> 
>     // Ensure source is initialized.
>     ANGLE_TRY(source->ensureInitialized(context));
> 
>-    Box destBox(destOffset.x, destOffset.y, destOffset.y, sourceArea.width, sourceArea.height, 1);
>+    Box destBox(destOffset.x, destOffset.y, destOffset.z, sourceBox.width, sourceBox.height,
>+                sourceBox.depth);
>     ANGLE_TRY(ensureSubImageInitialized(context, target, level, destBox));
> 
>-    return mTexture->copySubTexture(context, target, level, destOffset, sourceLevel, sourceArea,
>-                                    unpackFlipY, unpackPremultiplyAlpha, unpackUnmultiplyAlpha,
>-                                    source);
>+    ImageIndex index = ImageIndex::MakeFromTarget(target, level);
>+
>+    return mTexture->copySubTexture(context, index, destOffset, sourceLevel, sourceBox, unpackFlipY,
>+                                    unpackPremultiplyAlpha, unpackUnmultiplyAlpha, source);
> }
> 
>-Error Texture::copyCompressedTexture(const Context *context, const Texture *source)
>+angle::Result Texture::copyCompressedTexture(Context *context, const Texture *source)
> {
>     // Release from previous calls to eglBindTexImage, to avoid calling the Impl after
>     ANGLE_TRY(releaseTexImageInternal(context));
>@@ -1114,26 +1240,27 @@ Error Texture::copyCompressedTexture(const Context *context, const Texture *sour
> 
>     ANGLE_TRY(mTexture->copyCompressedTexture(context, source));
> 
>-    ASSERT(source->getTarget() != GL_TEXTURE_CUBE_MAP && getTarget() != GL_TEXTURE_CUBE_MAP);
>-    const auto &sourceDesc = source->mState.getImageDesc(source->getTarget(), 0);
>-    mState.setImageDesc(getTarget(), 0, sourceDesc);
>+    ASSERT(source->getType() != TextureType::CubeMap && getType() != TextureType::CubeMap);
>+    const auto &sourceDesc =
>+        source->mState.getImageDesc(NonCubeTextureTypeToTarget(source->getType()), 0);
>+    mState.setImageDesc(NonCubeTextureTypeToTarget(getType()), 0, sourceDesc);
> 
>-    return NoError();
>+    return angle::Result::Continue;
> }
> 
>-Error Texture::setStorage(const Context *context,
>-                          GLenum target,
>-                          GLsizei levels,
>-                          GLenum internalFormat,
>-                          const Extents &size)
>+angle::Result Texture::setStorage(Context *context,
>+                                  TextureType type,
>+                                  GLsizei levels,
>+                                  GLenum internalFormat,
>+                                  const Extents &size)
> {
>-    ASSERT(target == mState.mTarget);
>+    ASSERT(type == mState.mType);
> 
>     // Release from previous calls to eglBindTexImage, to avoid calling the Impl after
>     ANGLE_TRY(releaseTexImageInternal(context));
>     ANGLE_TRY(orphanImages(context));
> 
>-    ANGLE_TRY(mTexture->setStorage(context, target, levels, internalFormat, size));
>+    ANGLE_TRY(mTexture->setStorage(context, type, levels, internalFormat, size));
> 
>     mState.mImmutableFormat = true;
>     mState.mImmutableLevels = static_cast<GLuint>(levels);
>@@ -1148,25 +1275,25 @@ Error Texture::setStorage(const Context *context,
>     mDirtyBits.set(DIRTY_BIT_BASE_LEVEL);
>     mDirtyBits.set(DIRTY_BIT_MAX_LEVEL);
> 
>-    signalDirty(InitState::MayNeedInit);
>+    signalDirtyStorage(context, InitState::MayNeedInit);
> 
>-    return NoError();
>+    return angle::Result::Continue;
> }
> 
>-Error Texture::setStorageMultisample(const Context *context,
>-                                     GLenum target,
>-                                     GLsizei samples,
>-                                     GLint internalFormat,
>-                                     const Extents &size,
>-                                     bool fixedSampleLocations)
>+angle::Result Texture::setStorageMultisample(Context *context,
>+                                             TextureType type,
>+                                             GLsizei samples,
>+                                             GLint internalFormat,
>+                                             const Extents &size,
>+                                             bool fixedSampleLocations)
> {
>-    ASSERT(target == mState.mTarget);
>+    ASSERT(type == mState.mType);
> 
>     // Release from previous calls to eglBindTexImage, to avoid calling the Impl after
>     ANGLE_TRY(releaseTexImageInternal(context));
>     ANGLE_TRY(orphanImages(context));
> 
>-    ANGLE_TRY(mTexture->setStorageMultisample(context, target, samples, internalFormat, size,
>+    ANGLE_TRY(mTexture->setStorageMultisample(context, type, samples, internalFormat, size,
>                                               fixedSampleLocations));
> 
>     mState.mImmutableFormat = true;
>@@ -1175,12 +1302,47 @@ Error Texture::setStorageMultisample(const Context *context,
>     mState.setImageDescChainMultisample(size, Format(internalFormat), samples, fixedSampleLocations,
>                                         InitState::MayNeedInit);
> 
>-    signalDirty(InitState::MayNeedInit);
>+    signalDirtyStorage(context, InitState::MayNeedInit);
>+
>+    return angle::Result::Continue;
>+}
>+
>+angle::Result Texture::setStorageExternalMemory(Context *context,
>+                                                TextureType type,
>+                                                GLsizei levels,
>+                                                GLenum internalFormat,
>+                                                const Extents &size,
>+                                                MemoryObject *memoryObject,
>+                                                GLuint64 offset)
>+{
>+    ASSERT(type == mState.mType);
>+
>+    // Release from previous calls to eglBindTexImage, to avoid calling the Impl after
>+    ANGLE_TRY(releaseTexImageInternal(context));
>+    ANGLE_TRY(orphanImages(context));
>+
>+    ANGLE_TRY(mTexture->setStorageExternalMemory(context, type, levels, internalFormat, size,
>+                                                 memoryObject, offset));
>+
>+    mState.mImmutableFormat = true;
>+    mState.mImmutableLevels = static_cast<GLuint>(levels);
>+    mState.clearImageDescs();
>+    mState.setImageDescChain(0, static_cast<GLuint>(levels - 1), size, Format(internalFormat),
>+                             InitState::MayNeedInit);
>+
>+    // Changing the texture to immutable can trigger a change in the base and max levels:
>+    // GLES 3.0.4 section 3.8.10 pg 158:
>+    // "For immutable-format textures, levelbase is clamped to the range[0;levels],levelmax is then
>+    // clamped to the range[levelbase;levels].
>+    mDirtyBits.set(DIRTY_BIT_BASE_LEVEL);
>+    mDirtyBits.set(DIRTY_BIT_MAX_LEVEL);
>+
>+    signalDirtyStorage(context, InitState::Initialized);
> 
>-    return NoError();
>+    return angle::Result::Continue;
> }
> 
>-Error Texture::generateMipmap(const Context *context)
>+angle::Result Texture::generateMipmap(Context *context)
> {
>     // Release from previous calls to eglBindTexImage, to avoid calling the Impl after
>     ANGLE_TRY(releaseTexImageInternal(context));
>@@ -1195,32 +1357,48 @@ Error Texture::generateMipmap(const Context *context)
>     const GLuint baseLevel = mState.getEffectiveBaseLevel();
>     const GLuint maxLevel  = mState.getMipmapMaxLevel();
> 
>-    if (maxLevel > baseLevel)
>+    if (maxLevel <= baseLevel)
>     {
>-        syncState();
>-        const ImageDesc &baseImageInfo =
>-            mState.getImageDesc(mState.getBaseImageTarget(), baseLevel);
>+        return angle::Result::Continue;
>+    }
>+
>+    if (hasAnyDirtyBit())
>+    {
>+        ANGLE_TRY(syncState(context));
>+    }
> 
>-        // Clear the base image immediately if necessary.
>-        if (context->isRobustResourceInitEnabled() &&
>-            baseImageInfo.initState == InitState::MayNeedInit)
>+    // Clear the base image(s) immediately if needed
>+    if (context->isRobustResourceInitEnabled())
>+    {
>+        ImageIndexIterator it =
>+            ImageIndexIterator::MakeGeneric(mState.mType, baseLevel, baseLevel + 1,
>+                                            ImageIndex::kEntireLevel, ImageIndex::kEntireLevel);
>+        while (it.hasNext())
>         {
>-            ANGLE_TRY(initializeContents(
>-                context, GetImageIndexFromDescIndex(mState.getBaseImageTarget(), baseLevel)));
>+            const ImageIndex index = it.next();
>+            const ImageDesc &desc  = mState.getImageDesc(index.getTarget(), index.getLevelIndex());
>+
>+            if (desc.initState == InitState::MayNeedInit)
>+            {
>+                ANGLE_TRY(initializeContents(context, index));
>+            }
>         }
>+    }
> 
>-        ANGLE_TRY(mTexture->generateMipmap(context));
>+    ANGLE_TRY(mTexture->generateMipmap(context));
> 
>-        mState.setImageDescChain(baseLevel, maxLevel, baseImageInfo.size, baseImageInfo.format,
>-                                 InitState::Initialized);
>-    }
>+    // Propagate the format and size of the bsae mip to the smaller ones. Cube maps are guaranteed
>+    // to have faces of the same size and format so any faces can be picked.
>+    const ImageDesc &baseImageInfo = mState.getImageDesc(mState.getBaseImageTarget(), baseLevel);
>+    mState.setImageDescChain(baseLevel, maxLevel, baseImageInfo.size, baseImageInfo.format,
>+                             InitState::Initialized);
> 
>-    signalDirty(InitState::Initialized);
>+    signalDirtyStorage(context, InitState::Initialized);
> 
>-    return NoError();
>+    return angle::Result::Continue;
> }
> 
>-Error Texture::bindTexImageFromSurface(const Context *context, egl::Surface *surface)
>+angle::Result Texture::bindTexImageFromSurface(Context *context, egl::Surface *surface)
> {
>     ASSERT(surface);
> 
>@@ -1233,25 +1411,25 @@ Error Texture::bindTexImageFromSurface(const Context *context, egl::Surface *sur
>     mBoundSurface = surface;
> 
>     // Set the image info to the size and format of the surface
>-    ASSERT(mState.mTarget == GL_TEXTURE_2D || mState.mTarget == GL_TEXTURE_RECTANGLE_ANGLE);
>+    ASSERT(mState.mType == TextureType::_2D || mState.mType == TextureType::Rectangle);
>     Extents size(surface->getWidth(), surface->getHeight(), 1);
>-    ImageDesc desc(size, Format(surface->getConfig()->renderTargetFormat), InitState::Initialized);
>-    mState.setImageDesc(mState.mTarget, 0, desc);
>-    signalDirty(InitState::Initialized);
>-    return NoError();
>+    ImageDesc desc(size, surface->getBindTexImageFormat(), InitState::Initialized);
>+    mState.setImageDesc(NonCubeTextureTypeToTarget(mState.mType), 0, desc);
>+    signalDirtyStorage(context, InitState::Initialized);
>+    return angle::Result::Continue;
> }
> 
>-Error Texture::releaseTexImageFromSurface(const Context *context)
>+angle::Result Texture::releaseTexImageFromSurface(const Context *context)
> {
>     ASSERT(mBoundSurface);
>     mBoundSurface = nullptr;
>     ANGLE_TRY(mTexture->releaseTexImage(context));
> 
>     // Erase the image info for level 0
>-    ASSERT(mState.mTarget == GL_TEXTURE_2D || mState.mTarget == GL_TEXTURE_RECTANGLE_ANGLE);
>-    mState.clearImageDesc(mState.mTarget, 0);
>-    signalDirty(InitState::Initialized);
>-    return NoError();
>+    ASSERT(mState.mType == TextureType::_2D || mState.mType == TextureType::Rectangle);
>+    mState.clearImageDesc(NonCubeTextureTypeToTarget(mState.mType), 0);
>+    signalDirtyStorage(context, InitState::Initialized);
>+    return angle::Result::Continue;
> }
> 
> void Texture::bindStream(egl::Stream *stream)
>@@ -1263,7 +1441,7 @@ void Texture::bindStream(egl::Stream *stream)
> 
>     mBoundStream = stream;
> 
>-    ASSERT(mState.mTarget == GL_TEXTURE_EXTERNAL_OES);
>+    ASSERT(mState.mType == TextureType::External);
> }
> 
> void Texture::releaseStream()
>@@ -1272,54 +1450,62 @@ void Texture::releaseStream()
>     mBoundStream = nullptr;
> }
> 
>-Error Texture::acquireImageFromStream(const Context *context,
>-                                      const egl::Stream::GLTextureDescription &desc)
>+angle::Result Texture::acquireImageFromStream(const Context *context,
>+                                              const egl::Stream::GLTextureDescription &desc)
> {
>     ASSERT(mBoundStream != nullptr);
>-    ANGLE_TRY(mTexture->setImageExternal(context, mState.mTarget, mBoundStream, desc));
>+    ANGLE_TRY(mTexture->setImageExternal(context, mState.mType, mBoundStream, desc));
> 
>     Extents size(desc.width, desc.height, 1);
>-    mState.setImageDesc(mState.mTarget, 0,
>+    mState.setImageDesc(NonCubeTextureTypeToTarget(mState.mType), 0,
>                         ImageDesc(size, Format(desc.internalFormat), InitState::Initialized));
>-    signalDirty(InitState::Initialized);
>-    return NoError();
>+    signalDirtyStorage(context, InitState::Initialized);
>+    return angle::Result::Continue;
> }
> 
>-Error Texture::releaseImageFromStream(const Context *context)
>+angle::Result Texture::releaseImageFromStream(const Context *context)
> {
>     ASSERT(mBoundStream != nullptr);
>-    ANGLE_TRY(mTexture->setImageExternal(context, mState.mTarget, nullptr,
>+    ANGLE_TRY(mTexture->setImageExternal(context, mState.mType, nullptr,
>                                          egl::Stream::GLTextureDescription()));
> 
>     // Set to incomplete
>-    mState.clearImageDesc(mState.mTarget, 0);
>-    signalDirty(InitState::Initialized);
>-    return NoError();
>+    mState.clearImageDesc(NonCubeTextureTypeToTarget(mState.mType), 0);
>+    signalDirtyStorage(context, InitState::Initialized);
>+    return angle::Result::Continue;
> }
> 
>-Error Texture::releaseTexImageInternal(const Context *context)
>+angle::Result Texture::releaseTexImageInternal(Context *context)
> {
>     if (mBoundSurface)
>     {
>         // Notify the surface
>-        mBoundSurface->releaseTexImageFromTexture(context);
>+        egl::Error eglErr = mBoundSurface->releaseTexImageFromTexture(context);
>+        // TODO(jmadill): Remove this once refactor is complete. http://anglebug.com/3041
>+        if (eglErr.isError())
>+        {
>+            context->handleError(GL_INVALID_OPERATION, "Error releasing tex image from texture",
>+                                 __FILE__, ANGLE_FUNCTION, __LINE__);
>+        }
> 
>         // Then, call the same method as from the surface
>         ANGLE_TRY(releaseTexImageFromSurface(context));
>     }
>-    return NoError();
>+    return angle::Result::Continue;
> }
> 
>-Error Texture::setEGLImageTarget(const Context *context, GLenum target, egl::Image *imageTarget)
>+angle::Result Texture::setEGLImageTarget(Context *context,
>+                                         TextureType type,
>+                                         egl::Image *imageTarget)
> {
>-    ASSERT(target == mState.mTarget);
>-    ASSERT(target == GL_TEXTURE_2D || target == GL_TEXTURE_EXTERNAL_OES);
>+    ASSERT(type == mState.mType);
>+    ASSERT(type == TextureType::_2D || type == TextureType::External);
> 
>     // Release from previous calls to eglBindTexImage, to avoid calling the Impl after
>     ANGLE_TRY(releaseTexImageInternal(context));
>     ANGLE_TRY(orphanImages(context));
> 
>-    ANGLE_TRY(mTexture->setEGLImageTarget(context, target, imageTarget));
>+    ANGLE_TRY(mTexture->setEGLImageTarget(context, type, imageTarget));
> 
>     setTargetImage(context, imageTarget);
> 
>@@ -1329,25 +1515,116 @@ Error Texture::setEGLImageTarget(const Context *context, GLenum target, egl::Ima
>     auto initState = imageTarget->sourceInitState();
> 
>     mState.clearImageDescs();
>-    mState.setImageDesc(target, 0, ImageDesc(size, imageTarget->getFormat(), initState));
>-    signalDirty(initState);
>+    mState.setImageDesc(NonCubeTextureTypeToTarget(type), 0,
>+                        ImageDesc(size, imageTarget->getFormat(), initState));
>+    signalDirtyStorage(context, initState);
> 
>-    return NoError();
>+    return angle::Result::Continue;
> }
> 
> Extents Texture::getAttachmentSize(const ImageIndex &imageIndex) const
> {
>+    // As an ImageIndex that represents an entire level of a cube map corresponds to 6 ImageDescs,
>+    // we only allow querying ImageDesc on a complete cube map, and this ImageDesc is exactly the
>+    // one that belongs to the first face of the cube map.
>+    if (imageIndex.isEntireLevelCubeMap())
>+    {
>+        // A cube map texture is cube complete if the following conditions all hold true:
>+        // - The levelbase arrays of each of the six texture images making up the cube map have
>+        //   identical, positive, and square dimensions.
>+        if (!mState.isCubeComplete())
>+        {
>+            return Extents();
>+        }
>+    }
>+
>     return mState.getImageDesc(imageIndex).size;
> }
> 
>-const Format &Texture::getAttachmentFormat(GLenum /*binding*/, const ImageIndex &imageIndex) const
>+Format Texture::getAttachmentFormat(GLenum /*binding*/, const ImageIndex &imageIndex) const
> {
>+    // As an ImageIndex that represents an entire level of a cube map corresponds to 6 ImageDescs,
>+    // we only allow querying ImageDesc on a complete cube map, and this ImageDesc is exactly the
>+    // one that belongs to the first face of the cube map.
>+    if (imageIndex.isEntireLevelCubeMap())
>+    {
>+        // A cube map texture is cube complete if the following conditions all hold true:
>+        // - The levelbase arrays were each specified with the same effective internal format.
>+        if (!mState.isCubeComplete())
>+        {
>+            return Format::Invalid();
>+        }
>+    }
>     return mState.getImageDesc(imageIndex).format;
> }
> 
> GLsizei Texture::getAttachmentSamples(const ImageIndex &imageIndex) const
> {
>-    return getSamples(imageIndex.type, 0);
>+    // We do not allow querying TextureTarget by an ImageIndex that represents an entire level of a
>+    // cube map (See comments in function TextureTypeToTarget() in ImageIndex.cpp).
>+    if (imageIndex.isEntireLevelCubeMap())
>+    {
>+        return 0;
>+    }
>+
>+    return getSamples(imageIndex.getTarget(), imageIndex.getLevelIndex());
>+}
>+
>+bool Texture::isRenderable(const Context *context,
>+                           GLenum binding,
>+                           const ImageIndex &imageIndex) const
>+{
>+    if (isEGLImageTarget())
>+    {
>+        return ImageSibling::isRenderable(context, binding, imageIndex);
>+    }
>+    return getAttachmentFormat(binding, imageIndex)
>+        .info->textureAttachmentSupport(context->getClientVersion(), context->getExtensions());
>+}
>+
>+bool Texture::getAttachmentFixedSampleLocations(const ImageIndex &imageIndex) const
>+{
>+    // We do not allow querying TextureTarget by an ImageIndex that represents an entire level of a
>+    // cube map (See comments in function TextureTypeToTarget() in ImageIndex.cpp).
>+    if (imageIndex.isEntireLevelCubeMap())
>+    {
>+        return true;
>+    }
>+
>+    // ES3.1 (section 9.4) requires that the value of TEXTURE_FIXED_SAMPLE_LOCATIONS should be
>+    // the same for all attached textures.
>+    return getFixedSampleLocations(imageIndex.getTarget(), imageIndex.getLevelIndex());
>+}
>+
>+void Texture::setBorderColor(const Context *context, const ColorGeneric &color)
>+{
>+    mState.mSamplerState.setBorderColor(color);
>+    signalDirtyState(context, DIRTY_BIT_BORDER_COLOR);
>+}
>+
>+const ColorGeneric &Texture::getBorderColor() const
>+{
>+    return mState.mSamplerState.getBorderColor();
>+}
>+
>+void Texture::setCrop(const gl::Rectangle &rect)
>+{
>+    mState.setCrop(rect);
>+}
>+
>+const gl::Rectangle &Texture::getCrop() const
>+{
>+    return mState.getCrop();
>+}
>+
>+void Texture::setGenerateMipmapHint(GLenum hint)
>+{
>+    mState.setGenerateMipmapHint(hint);
>+}
>+
>+GLenum Texture::getGenerateMipmapHint() const
>+{
>+    return mState.getGenerateMipmapHint();
> }
> 
> void Texture::onAttach(const Context *context)
>@@ -1365,10 +1642,12 @@ GLuint Texture::getId() const
>     return id();
> }
> 
>-void Texture::syncState()
>+angle::Result Texture::syncState(const Context *context)
> {
>-    mTexture->syncState(mDirtyBits);
>+    ASSERT(hasAnyDirtyBit());
>+    ANGLE_TRY(mTexture->syncState(context, mDirtyBits));
>     mDirtyBits.reset();
>+    return angle::Result::Continue;
> }
> 
> rx::FramebufferAttachmentObjectImpl *Texture::getAttachmentImpl() const
>@@ -1380,12 +1659,12 @@ bool Texture::isSamplerComplete(const Context *context, const Sampler *optionalS
> {
>     const auto &samplerState =
>         optionalSampler ? optionalSampler->getSamplerState() : mState.mSamplerState;
>-    const auto &contextState = context->getContextState();
>+    const auto &contextState = context->getState();
> 
>     if (contextState.getContextID() != mCompletenessCache.context ||
>-        mCompletenessCache.samplerState != samplerState)
>+        !mCompletenessCache.samplerState.sameCompleteness(samplerState))
>     {
>-        mCompletenessCache.context      = context->getContextState().getContextID();
>+        mCompletenessCache.context      = context->getState().getContextID();
>         mCompletenessCache.samplerState = samplerState;
>         mCompletenessCache.samplerComplete =
>             mState.computeSamplerCompleteness(samplerState, contextState);
>@@ -1396,75 +1675,101 @@ bool Texture::isSamplerComplete(const Context *context, const Sampler *optionalS
> 
> Texture::SamplerCompletenessCache::SamplerCompletenessCache()
>     : context(0), samplerState(), samplerComplete(false)
>-{
>-}
>+{}
> 
> void Texture::invalidateCompletenessCache() const
> {
>     mCompletenessCache.context = 0;
> }
> 
>-Error Texture::ensureInitialized(const Context *context)
>+angle::Result Texture::ensureInitialized(const Context *context)
> {
>     if (!context->isRobustResourceInitEnabled() || mState.mInitState == InitState::Initialized)
>     {
>-        return NoError();
>+        return angle::Result::Continue;
>     }
> 
>     bool anyDirty = false;
> 
>-    for (size_t descIndex = 0; descIndex < mState.mImageDescs.size(); ++descIndex)
>+    ImageIndexIterator it =
>+        ImageIndexIterator::MakeGeneric(mState.mType, 0, IMPLEMENTATION_MAX_TEXTURE_LEVELS + 1,
>+                                        ImageIndex::kEntireLevel, ImageIndex::kEntireLevel);
>+    while (it.hasNext())
>     {
>-        auto &imageDesc = mState.mImageDescs[descIndex];
>-        if (imageDesc.initState == InitState::MayNeedInit)
>+        const ImageIndex index = it.next();
>+        ImageDesc &desc =
>+            mState.mImageDescs[GetImageDescIndex(index.getTarget(), index.getLevelIndex())];
>+        if (desc.initState == InitState::MayNeedInit)
>         {
>             ASSERT(mState.mInitState == InitState::MayNeedInit);
>-            const auto &imageIndex = GetImageIndexFromDescIndex(mState.mTarget, descIndex);
>-            ANGLE_TRY(initializeContents(context, imageIndex));
>-            imageDesc.initState = InitState::Initialized;
>-            anyDirty            = true;
>+            ANGLE_TRY(initializeContents(context, index));
>+            desc.initState = InitState::Initialized;
>+            anyDirty       = true;
>         }
>     }
>     if (anyDirty)
>     {
>-        signalDirty(InitState::Initialized);
>+        signalDirtyStorage(context, InitState::Initialized);
>     }
>     mState.mInitState = InitState::Initialized;
> 
>-    return NoError();
>+    return angle::Result::Continue;
> }
> 
> InitState Texture::initState(const ImageIndex &imageIndex) const
> {
>-    return mState.getImageDesc(imageIndex).initState;
>-}
>+    // As an ImageIndex that represents an entire level of a cube map corresponds to 6 ImageDescs,
>+    // we need to check all the related ImageDescs.
>+    if (imageIndex.isEntireLevelCubeMap())
>+    {
>+        const GLint levelIndex = imageIndex.getLevelIndex();
>+        for (TextureTarget cubeFaceTarget : AllCubeFaceTextureTargets())
>+        {
>+            if (mState.getImageDesc(cubeFaceTarget, levelIndex).initState == InitState::MayNeedInit)
>+            {
>+                return InitState::MayNeedInit;
>+            }
>+        }
>+        return InitState::Initialized;
>+    }
> 
>-InitState Texture::initState() const
>-{
>-    return mState.mInitState;
>+    return mState.getImageDesc(imageIndex).initState;
> }
> 
> void Texture::setInitState(const ImageIndex &imageIndex, InitState initState)
> {
>-    ImageDesc newDesc = mState.getImageDesc(imageIndex);
>-    newDesc.initState = initState;
>-    mState.setImageDesc(imageIndex.type, imageIndex.mipIndex, newDesc);
>+    // As an ImageIndex that represents an entire level of a cube map corresponds to 6 ImageDescs,
>+    // we need to update all the related ImageDescs.
>+    if (imageIndex.isEntireLevelCubeMap())
>+    {
>+        const GLint levelIndex = imageIndex.getLevelIndex();
>+        for (TextureTarget cubeFaceTarget : AllCubeFaceTextureTargets())
>+        {
>+            setInitState(ImageIndex::MakeCubeMapFace(cubeFaceTarget, levelIndex), initState);
>+        }
>+    }
>+    else
>+    {
>+        ImageDesc newDesc = mState.getImageDesc(imageIndex);
>+        newDesc.initState = initState;
>+        mState.setImageDesc(imageIndex.getTarget(), imageIndex.getLevelIndex(), newDesc);
>+    }
> }
> 
>-Error Texture::ensureSubImageInitialized(const Context *context,
>-                                         GLenum target,
>-                                         size_t level,
>-                                         const gl::Box &area)
>+angle::Result Texture::ensureSubImageInitialized(const Context *context,
>+                                                 TextureTarget target,
>+                                                 size_t level,
>+                                                 const gl::Box &area)
> {
>     if (!context->isRobustResourceInitEnabled() || mState.mInitState == InitState::Initialized)
>     {
>-        return NoError();
>+        return angle::Result::Continue;
>     }
> 
>     // Pre-initialize the texture contents if necessary.
>     // TODO(jmadill): Check if area overlaps the entire texture.
>-    const auto &imageIndex = GetImageIndexFromDescIndex(target, level);
>-    const auto &desc       = mState.getImageDesc(imageIndex);
>+    ImageIndex imageIndex = ImageIndex::MakeFromTarget(target, static_cast<GLint>(level));
>+    const auto &desc      = mState.getImageDesc(imageIndex);
>     if (desc.initState == InitState::MayNeedInit)
>     {
>         ASSERT(mState.mInitState == InitState::MayNeedInit);
>@@ -1478,7 +1783,28 @@ Error Texture::ensureSubImageInitialized(const Context *context,
>         setInitState(imageIndex, InitState::Initialized);
>     }
> 
>-    return NoError();
>+    return angle::Result::Continue;
>+}
>+
>+angle::Result Texture::handleMipmapGenerationHint(Context *context, int level)
>+{
>+
>+    if (getGenerateMipmapHint() == GL_TRUE && level == 0)
>+    {
>+        ANGLE_TRY(generateMipmap(context));
>+    }
>+
>+    return angle::Result::Continue;
> }
> 
>+void Texture::onSubjectStateChange(const gl::Context *context,
>+                                   angle::SubjectIndex index,
>+                                   angle::SubjectMessage message)
>+{
>+    if (message == angle::SubjectMessage::DEPENDENT_DIRTY_BITS)
>+    {
>+        mDirtyBits.set(DIRTY_BIT_IMPLEMENTATION);
>+        signalDirtyState(context, DIRTY_BIT_IMPLEMENTATION);
>+    }
>+}
> }  // namespace gl
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/Texture.h b/Source/ThirdParty/ANGLE/src/libANGLE/Texture.h
>index 7525da2b2ff..d80a7cbee06 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/Texture.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/Texture.h
>@@ -9,18 +9,20 @@
> #ifndef LIBANGLE_TEXTURE_H_
> #define LIBANGLE_TEXTURE_H_
> 
>-#include <vector>
> #include <map>
>+#include <vector>
> 
> #include "angle_gl.h"
> #include "common/Optional.h"
> #include "common/debug.h"
>+#include "common/utilities.h"
> #include "libANGLE/Caps.h"
> #include "libANGLE/Constants.h"
> #include "libANGLE/Debug.h"
> #include "libANGLE/Error.h"
> #include "libANGLE/FramebufferAttachment.h"
> #include "libANGLE/Image.h"
>+#include "libANGLE/Observer.h"
> #include "libANGLE/Stream.h"
> #include "libANGLE/angletypes.h"
> #include "libANGLE/formatutils.h"
>@@ -29,20 +31,21 @@ namespace egl
> {
> class Surface;
> class Stream;
>-}
>+}  // namespace egl
> 
> namespace rx
> {
> class GLImplFactory;
> class TextureImpl;
> class TextureGL;
>-}
>+}  // namespace rx
> 
> namespace gl
> {
>-class ContextState;
> class Framebuffer;
>+class MemoryObject;
> class Sampler;
>+class State;
> class Texture;
> 
> bool IsMipmapFiltered(const SamplerState &samplerState);
>@@ -60,6 +63,8 @@ struct ImageDesc final
>     ImageDesc(const ImageDesc &other) = default;
>     ImageDesc &operator=(const ImageDesc &other) = default;
> 
>+    GLint getMemorySize() const;
>+
>     Extents size;
>     Format format;
>     GLsizei samples;
>@@ -88,9 +93,10 @@ struct SwizzleState final
> };
> 
> // State from Table 6.9 (state per texture object) in the OpenGL ES 3.0.2 spec.
>-struct TextureState final : private angle::NonCopyable
>+class TextureState final : private angle::NonCopyable
> {
>-    TextureState(GLenum target);
>+  public:
>+    TextureState(TextureType type);
>     ~TextureState();
> 
>     bool swizzleRequired() const;
>@@ -106,13 +112,39 @@ struct TextureState final : private angle::NonCopyable
> 
>     bool isCubeComplete() const;
> 
>-    const ImageDesc &getImageDesc(GLenum target, size_t level) const;
>+    ANGLE_INLINE bool compatibleWithSamplerFormat(SamplerFormat format,
>+                                                  const SamplerState &samplerState) const
>+    {
>+        if (!mCachedSamplerFormatValid ||
>+            mCachedSamplerCompareMode != samplerState.getCompareMode())
>+        {
>+            mCachedSamplerFormat      = computeRequiredSamplerFormat(samplerState);
>+            mCachedSamplerCompareMode = samplerState.getCompareMode();
>+            mCachedSamplerFormatValid = true;
>+        }
>+        // Incomplete textures are compatible with any sampler format.
>+        return mCachedSamplerFormat == SamplerFormat::InvalidEnum || format == mCachedSamplerFormat;
>+    }
>+
>+    const ImageDesc &getImageDesc(TextureTarget target, size_t level) const;
>     const ImageDesc &getImageDesc(const ImageIndex &imageIndex) const;
> 
>-    GLenum getTarget() const { return mTarget; }
>+    TextureType getType() const { return mType; }
>     const SwizzleState &getSwizzleState() const { return mSwizzleState; }
>     const SamplerState &getSamplerState() const { return mSamplerState; }
>     GLenum getUsage() const { return mUsage; }
>+    GLenum getDepthStencilTextureMode() const { return mDepthStencilTextureMode; }
>+
>+    // Returns the desc of the base level. Only valid for cube-complete/mip-complete textures.
>+    const ImageDesc &getBaseLevelDesc() const;
>+
>+    // GLES1 emulation: For GL_OES_draw_texture
>+    void setCrop(const gl::Rectangle &rect);
>+    const gl::Rectangle &getCrop() const;
>+
>+    // GLES1 emulation: Auto-mipmap generation is a texparameter
>+    void setGenerateMipmapHint(GLenum hint);
>+    GLenum getGenerateMipmapHint() const;
> 
>   private:
>     // Texture needs access to the ImageDesc functions.
>@@ -121,14 +153,14 @@ struct TextureState final : private angle::NonCopyable
>     friend class rx::TextureGL;
>     friend bool operator==(const TextureState &a, const TextureState &b);
> 
>-    bool computeSamplerCompleteness(const SamplerState &samplerState,
>-                                    const ContextState &data) const;
>+    bool computeSamplerCompleteness(const SamplerState &samplerState, const State &data) const;
>     bool computeMipmapCompleteness() const;
>-    bool computeLevelCompleteness(GLenum target, size_t level) const;
>+    bool computeLevelCompleteness(TextureTarget target, size_t level) const;
>+    SamplerFormat computeRequiredSamplerFormat(const SamplerState &samplerState) const;
> 
>-    GLenum getBaseImageTarget() const;
>+    TextureTarget getBaseImageTarget() const;
> 
>-    void setImageDesc(GLenum target, size_t level, const ImageDesc &desc);
>+    void setImageDesc(TextureTarget target, size_t level, const ImageDesc &desc);
>     void setImageDescChain(GLuint baselevel,
>                            GLuint maxLevel,
>                            Extents baseSize,
>@@ -140,10 +172,10 @@ struct TextureState final : private angle::NonCopyable
>                                       bool fixedSampleLocations,
>                                       InitState initState);
> 
>-    void clearImageDesc(GLenum target, size_t level);
>+    void clearImageDesc(TextureTarget target, size_t level);
>     void clearImageDescs();
> 
>-    const GLenum mTarget;
>+    const TextureType mType;
> 
>     SwizzleState mSwizzleState;
> 
>@@ -161,194 +193,222 @@ struct TextureState final : private angle::NonCopyable
>     GLenum mUsage;
> 
>     std::vector<ImageDesc> mImageDescs;
>+
>+    // GLES1 emulation: Texture crop rectangle
>+    // For GL_OES_draw_texture
>+    gl::Rectangle mCropRect;
>+
>+    // GLES1 emulation: Generate-mipmap hint per texture
>+    GLenum mGenerateMipmapHint;
>+
>     InitState mInitState;
>+
>+    mutable SamplerFormat mCachedSamplerFormat;
>+    mutable GLenum mCachedSamplerCompareMode;
>+    mutable bool mCachedSamplerFormatValid;
> };
> 
> bool operator==(const TextureState &a, const TextureState &b);
> bool operator!=(const TextureState &a, const TextureState &b);
> 
>-class Texture final : public egl::ImageSibling,
>-                      public LabeledObject
>+class Texture final : public RefCountObject,
>+                      public egl::ImageSibling,
>+                      public LabeledObject,
>+                      public angle::ObserverInterface
> {
>   public:
>-    Texture(rx::GLImplFactory *factory, GLuint id, GLenum target);
>+    Texture(rx::GLImplFactory *factory, GLuint id, TextureType type);
>     ~Texture() override;
> 
>-    Error onDestroy(const Context *context) override;
>+    void onDestroy(const Context *context) override;
> 
>-    void setLabel(const std::string &label) override;
>+    void setLabel(const Context *context, const std::string &label) override;
>     const std::string &getLabel() const override;
> 
>-    GLenum getTarget() const;
>+    TextureType getType() const { return mState.mType; }
> 
>-    void setSwizzleRed(GLenum swizzleRed);
>+    void setSwizzleRed(const Context *context, GLenum swizzleRed);
>     GLenum getSwizzleRed() const;
> 
>-    void setSwizzleGreen(GLenum swizzleGreen);
>+    void setSwizzleGreen(const Context *context, GLenum swizzleGreen);
>     GLenum getSwizzleGreen() const;
> 
>-    void setSwizzleBlue(GLenum swizzleBlue);
>+    void setSwizzleBlue(const Context *context, GLenum swizzleBlue);
>     GLenum getSwizzleBlue() const;
> 
>-    void setSwizzleAlpha(GLenum swizzleAlpha);
>+    void setSwizzleAlpha(const Context *context, GLenum swizzleAlpha);
>     GLenum getSwizzleAlpha() const;
> 
>-    void setMinFilter(GLenum minFilter);
>+    void setMinFilter(const Context *context, GLenum minFilter);
>     GLenum getMinFilter() const;
> 
>-    void setMagFilter(GLenum magFilter);
>+    void setMagFilter(const Context *context, GLenum magFilter);
>     GLenum getMagFilter() const;
> 
>-    void setWrapS(GLenum wrapS);
>+    void setWrapS(const Context *context, GLenum wrapS);
>     GLenum getWrapS() const;
> 
>-    void setWrapT(GLenum wrapT);
>+    void setWrapT(const Context *context, GLenum wrapT);
>     GLenum getWrapT() const;
> 
>-    void setWrapR(GLenum wrapR);
>+    void setWrapR(const Context *context, GLenum wrapR);
>     GLenum getWrapR() const;
> 
>-    void setMaxAnisotropy(float maxAnisotropy);
>+    void setMaxAnisotropy(const Context *context, float maxAnisotropy);
>     float getMaxAnisotropy() const;
> 
>-    void setMinLod(GLfloat minLod);
>+    void setMinLod(const Context *context, GLfloat minLod);
>     GLfloat getMinLod() const;
> 
>-    void setMaxLod(GLfloat maxLod);
>+    void setMaxLod(const Context *context, GLfloat maxLod);
>     GLfloat getMaxLod() const;
> 
>-    void setCompareMode(GLenum compareMode);
>+    void setCompareMode(const Context *context, GLenum compareMode);
>     GLenum getCompareMode() const;
> 
>-    void setCompareFunc(GLenum compareFunc);
>+    void setCompareFunc(const Context *context, GLenum compareFunc);
>     GLenum getCompareFunc() const;
> 
>-    void setSRGBDecode(GLenum sRGBDecode);
>+    void setSRGBDecode(const Context *context, GLenum sRGBDecode);
>     GLenum getSRGBDecode() const;
> 
>     const SamplerState &getSamplerState() const;
> 
>-    gl::Error setBaseLevel(const Context *context, GLuint baseLevel);
>+    angle::Result setBaseLevel(const Context *context, GLuint baseLevel);
>     GLuint getBaseLevel() const;
> 
>-    void setMaxLevel(GLuint maxLevel);
>+    void setMaxLevel(const Context *context, GLuint maxLevel);
>     GLuint getMaxLevel() const;
> 
>-    void setDepthStencilTextureMode(GLenum mode);
>+    void setDepthStencilTextureMode(const Context *context, GLenum mode);
>     GLenum getDepthStencilTextureMode() const;
> 
>     bool getImmutableFormat() const;
> 
>     GLuint getImmutableLevels() const;
> 
>-    void setUsage(GLenum usage);
>+    void setUsage(const Context *context, GLenum usage);
>     GLenum getUsage() const;
> 
>+    void setBorderColor(const Context *context, const ColorGeneric &color);
>+    const ColorGeneric &getBorderColor() const;
>+
>     const TextureState &getTextureState() const;
> 
>-    size_t getWidth(GLenum target, size_t level) const;
>-    size_t getHeight(GLenum target, size_t level) const;
>-    size_t getDepth(GLenum target, size_t level) const;
>-    GLsizei getSamples(GLenum target, size_t level) const;
>-    bool getFixedSampleLocations(GLenum target, size_t level) const;
>-    const Format &getFormat(GLenum target, size_t level) const;
>+    size_t getWidth(TextureTarget target, size_t level) const;
>+    size_t getHeight(TextureTarget target, size_t level) const;
>+    size_t getDepth(TextureTarget target, size_t level) const;
>+    GLsizei getSamples(TextureTarget target, size_t level) const;
>+    bool getFixedSampleLocations(TextureTarget target, size_t level) const;
>+    const Format &getFormat(TextureTarget target, size_t level) const;
> 
>     // Returns the value called "q" in the GLES 3.0.4 spec section 3.8.10.
>     GLuint getMipmapMaxLevel() const;
> 
>     bool isMipmapComplete() const;
> 
>-    Error setImage(const Context *context,
>-                   const PixelUnpackState &unpackState,
>-                   GLenum target,
>-                   size_t level,
>-                   GLenum internalFormat,
>-                   const Extents &size,
>-                   GLenum format,
>-                   GLenum type,
>-                   const uint8_t *pixels);
>-    Error setSubImage(const Context *context,
>-                      const PixelUnpackState &unpackState,
>-                      GLenum target,
>-                      size_t level,
>-                      const Box &area,
>-                      GLenum format,
>-                      GLenum type,
>-                      const uint8_t *pixels);
>-
>-    Error setCompressedImage(const Context *context,
>-                             const PixelUnpackState &unpackState,
>-                             GLenum target,
>-                             size_t level,
>+    angle::Result setImage(Context *context,
>+                           const PixelUnpackState &unpackState,
>+                           TextureTarget target,
>+                           GLint level,
>+                           GLenum internalFormat,
>+                           const Extents &size,
>+                           GLenum format,
>+                           GLenum type,
>+                           const uint8_t *pixels);
>+    angle::Result setSubImage(Context *context,
>+                              const PixelUnpackState &unpackState,
>+                              Buffer *unpackBuffer,
>+                              TextureTarget target,
>+                              GLint level,
>+                              const Box &area,
>+                              GLenum format,
>+                              GLenum type,
>+                              const uint8_t *pixels);
>+
>+    angle::Result setCompressedImage(Context *context,
>+                                     const PixelUnpackState &unpackState,
>+                                     TextureTarget target,
>+                                     GLint level,
>+                                     GLenum internalFormat,
>+                                     const Extents &size,
>+                                     size_t imageSize,
>+                                     const uint8_t *pixels);
>+    angle::Result setCompressedSubImage(const Context *context,
>+                                        const PixelUnpackState &unpackState,
>+                                        TextureTarget target,
>+                                        GLint level,
>+                                        const Box &area,
>+                                        GLenum format,
>+                                        size_t imageSize,
>+                                        const uint8_t *pixels);
>+
>+    angle::Result copyImage(Context *context,
>+                            TextureTarget target,
>+                            GLint level,
>+                            const Rectangle &sourceArea,
>+                            GLenum internalFormat,
>+                            Framebuffer *source);
>+    angle::Result copySubImage(Context *context,
>+                               const ImageIndex &index,
>+                               const Offset &destOffset,
>+                               const Rectangle &sourceArea,
>+                               Framebuffer *source);
>+
>+    angle::Result copyTexture(Context *context,
>+                              TextureTarget target,
>+                              GLint level,
>+                              GLenum internalFormat,
>+                              GLenum type,
>+                              GLint sourceLevel,
>+                              bool unpackFlipY,
>+                              bool unpackPremultiplyAlpha,
>+                              bool unpackUnmultiplyAlpha,
>+                              Texture *source);
>+    angle::Result copySubTexture(const Context *context,
>+                                 TextureTarget target,
>+                                 GLint level,
>+                                 const Offset &destOffset,
>+                                 GLint sourceLevel,
>+                                 const Box &sourceBox,
>+                                 bool unpackFlipY,
>+                                 bool unpackPremultiplyAlpha,
>+                                 bool unpackUnmultiplyAlpha,
>+                                 Texture *source);
>+    angle::Result copyCompressedTexture(Context *context, const Texture *source);
>+
>+    angle::Result setStorage(Context *context,
>+                             TextureType type,
>+                             GLsizei levels,
>                              GLenum internalFormat,
>-                             const Extents &size,
>-                             size_t imageSize,
>-                             const uint8_t *pixels);
>-    Error setCompressedSubImage(const Context *context,
>-                                const PixelUnpackState &unpackState,
>-                                GLenum target,
>-                                size_t level,
>-                                const Box &area,
>-                                GLenum format,
>-                                size_t imageSize,
>-                                const uint8_t *pixels);
>-
>-    Error copyImage(const Context *context,
>-                    GLenum target,
>-                    size_t level,
>-                    const Rectangle &sourceArea,
>-                    GLenum internalFormat,
>-                    Framebuffer *source);
>-    Error copySubImage(const Context *context,
>-                       GLenum target,
>-                       size_t level,
>-                       const Offset &destOffset,
>-                       const Rectangle &sourceArea,
>-                       Framebuffer *source);
>-
>-    Error copyTexture(const Context *context,
>-                      GLenum target,
>-                      size_t level,
>-                      GLenum internalFormat,
>-                      GLenum type,
>-                      size_t sourceLevel,
>-                      bool unpackFlipY,
>-                      bool unpackPremultiplyAlpha,
>-                      bool unpackUnmultiplyAlpha,
>-                      Texture *source);
>-    Error copySubTexture(const Context *context,
>-                         GLenum target,
>-                         size_t level,
>-                         const Offset &destOffset,
>-                         size_t sourceLevel,
>-                         const Rectangle &sourceArea,
>-                         bool unpackFlipY,
>-                         bool unpackPremultiplyAlpha,
>-                         bool unpackUnmultiplyAlpha,
>-                         Texture *source);
>-    Error copyCompressedTexture(const Context *context, const Texture *source);
>-
>-    Error setStorage(const Context *context,
>-                     GLenum target,
>-                     GLsizei levels,
>-                     GLenum internalFormat,
>-                     const Extents &size);
>-
>-    Error setStorageMultisample(const Context *context,
>-                                GLenum target,
>-                                GLsizei samples,
>-                                GLint internalformat,
>-                                const Extents &size,
>-                                bool fixedSampleLocations);
>-
>-    Error setEGLImageTarget(const Context *context, GLenum target, egl::Image *imageTarget);
>-
>-    Error generateMipmap(const Context *context);
>+                             const Extents &size);
>+
>+    angle::Result setStorageMultisample(Context *context,
>+                                        TextureType type,
>+                                        GLsizei samples,
>+                                        GLint internalformat,
>+                                        const Extents &size,
>+                                        bool fixedSampleLocations);
>+
>+    angle::Result setStorageExternalMemory(Context *context,
>+                                           TextureType type,
>+                                           GLsizei levels,
>+                                           GLenum internalFormat,
>+                                           const Extents &size,
>+                                           MemoryObject *memoryObject,
>+                                           GLuint64 offset);
>+
>+    angle::Result setEGLImageTarget(Context *context, TextureType type, egl::Image *imageTarget);
>+
>+    angle::Result generateMipmap(Context *context);
> 
>     egl::Surface *getBoundSurface() const;
>     egl::Stream *getBoundStream() const;
> 
>-    void signalDirty(InitState initState) const;
>+    GLint getMemorySize() const;
>+    GLint getLevelMemorySize(TextureTarget target, GLint level) const;
>+
>+    void signalDirtyStorage(const Context *context, InitState initState);
> 
>     bool isSamplerComplete(const Context *context, const Sampler *optionalSampler);
> 
>@@ -356,17 +416,28 @@ class Texture final : public egl::ImageSibling,
> 
>     // FramebufferAttachmentObject implementation
>     Extents getAttachmentSize(const ImageIndex &imageIndex) const override;
>-    const Format &getAttachmentFormat(GLenum binding, const ImageIndex &imageIndex) const override;
>+    Format getAttachmentFormat(GLenum binding, const ImageIndex &imageIndex) const override;
>     GLsizei getAttachmentSamples(const ImageIndex &imageIndex) const override;
>+    bool isRenderable(const Context *context,
>+                      GLenum binding,
>+                      const ImageIndex &imageIndex) const override;
>+
>+    bool getAttachmentFixedSampleLocations(const ImageIndex &imageIndex) const;
>+
>+    // GLES1 emulation
>+    void setCrop(const gl::Rectangle &rect);
>+    const gl::Rectangle &getCrop() const;
>+    void setGenerateMipmapHint(GLenum generate);
>+    GLenum getGenerateMipmapHint() const;
> 
>     void onAttach(const Context *context) override;
>     void onDetach(const Context *context) override;
>     GLuint getId() const override;
> 
>     // Needed for robust resource init.
>-    Error ensureInitialized(const Context *context);
>+    angle::Result ensureInitialized(const Context *context);
>     InitState initState(const ImageIndex &imageIndex) const override;
>-    InitState initState() const;
>+    InitState initState() const { return mState.mInitState; }
>     void setInitState(const ImageIndex &imageIndex, InitState initState) override;
> 
>     enum DirtyBitType
>@@ -383,6 +454,7 @@ class Texture final : public egl::ImageSibling,
>         DIRTY_BIT_COMPARE_MODE,
>         DIRTY_BIT_COMPARE_FUNC,
>         DIRTY_BIT_SRGB_DECODE,
>+        DIRTY_BIT_BORDER_COLOR,
> 
>         // Texture state
>         DIRTY_BIT_SWIZZLE_RED,
>@@ -391,45 +463,57 @@ class Texture final : public egl::ImageSibling,
>         DIRTY_BIT_SWIZZLE_ALPHA,
>         DIRTY_BIT_BASE_LEVEL,
>         DIRTY_BIT_MAX_LEVEL,
>+        DIRTY_BIT_DEPTH_STENCIL_TEXTURE_MODE,
> 
>         // Misc
>         DIRTY_BIT_LABEL,
>         DIRTY_BIT_USAGE,
>+        DIRTY_BIT_IMPLEMENTATION,
> 
>         DIRTY_BIT_COUNT,
>     };
>     using DirtyBits = angle::BitSet<DIRTY_BIT_COUNT>;
> 
>-    void syncState();
>+    angle::Result syncState(const Context *context);
>     bool hasAnyDirtyBit() const { return mDirtyBits.any(); }
> 
>+    // ObserverInterface implementation.
>+    void onSubjectStateChange(const gl::Context *context,
>+                              angle::SubjectIndex index,
>+                              angle::SubjectMessage message) override;
>+
>   private:
>     rx::FramebufferAttachmentObjectImpl *getAttachmentImpl() const override;
> 
>     // ANGLE-only method, used internally
>     friend class egl::Surface;
>-    Error bindTexImageFromSurface(const Context *context, egl::Surface *surface);
>-    Error releaseTexImageFromSurface(const Context *context);
>+    angle::Result bindTexImageFromSurface(Context *context, egl::Surface *surface);
>+    angle::Result releaseTexImageFromSurface(const Context *context);
> 
>     // ANGLE-only methods, used internally
>     friend class egl::Stream;
>     void bindStream(egl::Stream *stream);
>     void releaseStream();
>-    Error acquireImageFromStream(const Context *context,
>-                                 const egl::Stream::GLTextureDescription &desc);
>-    Error releaseImageFromStream(const Context *context);
>+    angle::Result acquireImageFromStream(const Context *context,
>+                                         const egl::Stream::GLTextureDescription &desc);
>+    angle::Result releaseImageFromStream(const Context *context);
> 
>     void invalidateCompletenessCache() const;
>-    Error releaseTexImageInternal(const Context *context);
>+    angle::Result releaseTexImageInternal(Context *context);
>+
>+    angle::Result ensureSubImageInitialized(const Context *context,
>+                                            TextureTarget target,
>+                                            size_t level,
>+                                            const gl::Box &area);
>+
>+    angle::Result handleMipmapGenerationHint(Context *context, int level);
> 
>-    Error ensureSubImageInitialized(const Context *context,
>-                                    GLenum target,
>-                                    size_t level,
>-                                    const gl::Box &area);
>+    void signalDirtyState(const Context *context, size_t dirtyBit);
> 
>     TextureState mState;
>     DirtyBits mDirtyBits;
>     rx::TextureImpl *mTexture;
>+    angle::ObserverBinding mImplObserver;
> 
>     std::string mLabel;
> 
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/Thread.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/Thread.cpp
>index d346db1fa26..d9789faf547 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/Thread.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/Thread.cpp
>@@ -9,20 +9,48 @@
> #include "libANGLE/Thread.h"
> 
> #include "libANGLE/Context.h"
>+#include "libANGLE/Debug.h"
> #include "libANGLE/Error.h"
>+#include "libANGLE/ErrorStrings.h"
> 
> namespace egl
> {
>+
> Thread::Thread()
>-    : mError(EGL_SUCCESS),
>+    : mLabel(nullptr),
>+      mError(EGL_SUCCESS),
>       mAPI(EGL_OPENGL_ES_API),
>       mContext(static_cast<gl::Context *>(EGL_NO_CONTEXT))
>+{}
>+
>+void Thread::setLabel(EGLLabelKHR label)
>+{
>+    mLabel = label;
>+}
>+
>+EGLLabelKHR Thread::getLabel() const
> {
>+    return mLabel;
> }
> 
>-void Thread::setError(const Error &error)
>+void Thread::setSuccess()
> {
>+    mError = EGL_SUCCESS;
>+}
>+
>+void Thread::setError(const Error &error,
>+                      const Debug *debug,
>+                      const char *command,
>+                      const LabeledObject *object)
>+{
>+    ASSERT(debug != nullptr);
>+
>     mError = error.getCode();
>+    if (error.isError() && !error.getMessage().empty())
>+    {
>+        debug->insertMessage(error.getCode(), command, ErrorCodeToMessageType(error.getCode()),
>+                             getLabel(), object ? object->getLabel() : nullptr, error.getMessage());
>+    }
> }
> 
> EGLint Thread::getError() const
>@@ -72,18 +100,19 @@ gl::Context *Thread::getValidContext() const
> {
>     if (mContext && mContext->isContextLost())
>     {
>-        mContext->handleError(gl::OutOfMemory() << "Context has been lost.");
>+        mContext->handleError(GL_OUT_OF_MEMORY, gl::err::kContextLost, __FILE__, ANGLE_FUNCTION,
>+                              __LINE__);
>         return nullptr;
>     }
> 
>     return mContext;
> }
> 
>-Display *Thread::getCurrentDisplay() const
>+Display *Thread::getDisplay() const
> {
>     if (mContext)
>     {
>-        return mContext->getCurrentDisplay();
>+        return mContext->getDisplay();
>     }
>     return nullptr;
> }
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/Thread.h b/Source/ThirdParty/ANGLE/src/libANGLE/Thread.h
>index 6406dad9e04..5fbc8c4f4dd 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/Thread.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/Thread.h
>@@ -11,6 +11,8 @@
> 
> #include <EGL/egl.h>
> 
>+#include "libANGLE/Debug.h"
>+
> namespace gl
> {
> class Context;
>@@ -19,15 +21,23 @@ class Context;
> namespace egl
> {
> class Error;
>+class Debug;
> class Display;
> class Surface;
> 
>-class Thread
>+class Thread : public LabeledObject
> {
>   public:
>     Thread();
> 
>-    void setError(const Error &error);
>+    void setLabel(EGLLabelKHR label) override;
>+    EGLLabelKHR getLabel() const override;
>+
>+    void setSuccess();
>+    void setError(const Error &error,
>+                  const Debug *debug,
>+                  const char *command,
>+                  const LabeledObject *object);
>     EGLint getError() const;
> 
>     void setAPI(EGLenum api);
>@@ -38,9 +48,10 @@ class Thread
>     Surface *getCurrentReadSurface() const;
>     gl::Context *getContext() const;
>     gl::Context *getValidContext() const;
>-    Display *getCurrentDisplay() const;
>+    Display *getDisplay() const;
> 
>   private:
>+    EGLLabelKHR mLabel;
>     EGLint mError;
>     EGLenum mAPI;
>     gl::Context *mContext;
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/TransformFeedback.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/TransformFeedback.cpp
>index 99235debd4c..50fb5379269 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/TransformFeedback.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/TransformFeedback.cpp
>@@ -6,35 +6,58 @@
> 
> #include "libANGLE/TransformFeedback.h"
> 
>+#include "common/mathutil.h"
> #include "libANGLE/Buffer.h"
> #include "libANGLE/Caps.h"
>-#include "libANGLE/ContextState.h"
>+#include "libANGLE/Context.h"
> #include "libANGLE/Program.h"
>+#include "libANGLE/State.h"
> #include "libANGLE/renderer/GLImplFactory.h"
> #include "libANGLE/renderer/TransformFeedbackImpl.h"
> 
>+#include <limits>
>+
> namespace gl
> {
> 
>+angle::CheckedNumeric<GLsizeiptr> GetVerticesNeededForDraw(PrimitiveMode primitiveMode,
>+                                                           GLsizei count,
>+                                                           GLsizei primcount)
>+{
>+    if (count < 0 || primcount < 0)
>+    {
>+        return 0;
>+    }
>+    // Transform feedback only outputs complete primitives, so we need to round down to the nearest
>+    // complete primitive before multiplying by the number of instances.
>+    angle::CheckedNumeric<GLsizeiptr> checkedCount     = count;
>+    angle::CheckedNumeric<GLsizeiptr> checkedPrimcount = primcount;
>+    switch (primitiveMode)
>+    {
>+        case PrimitiveMode::Triangles:
>+            return checkedPrimcount * (checkedCount - checkedCount % 3);
>+        case PrimitiveMode::Lines:
>+            return checkedPrimcount * (checkedCount - checkedCount % 2);
>+        case PrimitiveMode::Points:
>+            return checkedPrimcount * checkedCount;
>+        default:
>+            UNREACHABLE();
>+            return checkedPrimcount * checkedCount;
>+    }
>+}
>+
> TransformFeedbackState::TransformFeedbackState(size_t maxIndexedBuffers)
>     : mLabel(),
>       mActive(false),
>-      mPrimitiveMode(GL_NONE),
>+      mPrimitiveMode(PrimitiveMode::InvalidEnum),
>       mPaused(false),
>+      mVerticesDrawn(0),
>+      mVertexCapacity(0),
>       mProgram(nullptr),
>-      mGenericBuffer(),
>       mIndexedBuffers(maxIndexedBuffers)
>-{
>-}
>-
>-TransformFeedbackState::~TransformFeedbackState()
>-{
>-}
>+{}
> 
>-const BindingPointer<Buffer> &TransformFeedbackState::getGenericBuffer() const
>-{
>-    return mGenericBuffer;
>-}
>+TransformFeedbackState::~TransformFeedbackState() {}
> 
> const OffsetBindingPointer<Buffer> &TransformFeedbackState::getIndexedBuffer(size_t idx) const
> {
>@@ -54,8 +77,9 @@ TransformFeedback::TransformFeedback(rx::GLImplFactory *implFactory, GLuint id,
>     ASSERT(mImplementation != nullptr);
> }
> 
>-Error TransformFeedback::onDestroy(const Context *context)
>+void TransformFeedback::onDestroy(const Context *context)
> {
>+    ASSERT(!context || !context->isCurrentTransformFeedback(this));
>     if (mState.mProgram)
>     {
>         mState.mProgram->release(context);
>@@ -63,13 +87,10 @@ Error TransformFeedback::onDestroy(const Context *context)
>     }
> 
>     ASSERT(!mState.mProgram);
>-    mState.mGenericBuffer.set(context, nullptr);
>     for (size_t i = 0; i < mState.mIndexedBuffers.size(); i++)
>     {
>-        mState.mIndexedBuffers[i].set(context, nullptr);
>+        mState.mIndexedBuffers[i].set(context, nullptr, 0, 0);
>     }
>-
>-    return NoError();
> }
> 
> TransformFeedback::~TransformFeedback()
>@@ -77,7 +98,7 @@ TransformFeedback::~TransformFeedback()
>     SafeDelete(mImplementation);
> }
> 
>-void TransformFeedback::setLabel(const std::string &label)
>+void TransformFeedback::setLabel(const Context *context, const std::string &label)
> {
>     mState.mLabel = label;
> }
>@@ -87,43 +108,66 @@ const std::string &TransformFeedback::getLabel() const
>     return mState.mLabel;
> }
> 
>-void TransformFeedback::begin(const Context *context, GLenum primitiveMode, Program *program)
>+angle::Result TransformFeedback::begin(const Context *context,
>+                                       PrimitiveMode primitiveMode,
>+                                       Program *program)
> {
>+    ANGLE_TRY(mImplementation->begin(context, primitiveMode));
>     mState.mActive        = true;
>     mState.mPrimitiveMode = primitiveMode;
>     mState.mPaused        = false;
>-    mImplementation->begin(primitiveMode);
>+    mState.mVerticesDrawn = 0;
>     bindProgram(context, program);
>+
>+    if (program)
>+    {
>+        // Compute the number of vertices we can draw before overflowing the bound buffers.
>+        auto strides = program->getTransformFeedbackStrides();
>+        ASSERT(strides.size() <= mState.mIndexedBuffers.size() && !strides.empty());
>+        GLsizeiptr minCapacity = std::numeric_limits<GLsizeiptr>::max();
>+        for (size_t index = 0; index < strides.size(); index++)
>+        {
>+            GLsizeiptr capacity =
>+                GetBoundBufferAvailableSize(mState.mIndexedBuffers[index]) / strides[index];
>+            minCapacity = std::min(minCapacity, capacity);
>+        }
>+        mState.mVertexCapacity = minCapacity;
>+    }
>+    else
>+    {
>+        mState.mVertexCapacity = 0;
>+    }
>+    return angle::Result::Continue;
> }
> 
>-void TransformFeedback::end(const Context *context)
>+angle::Result TransformFeedback::end(const Context *context)
> {
>-    mState.mActive        = false;
>-    mState.mPrimitiveMode = GL_NONE;
>-    mState.mPaused        = false;
>-    mImplementation->end();
>+    ANGLE_TRY(mImplementation->end(context));
>+    mState.mActive         = false;
>+    mState.mPrimitiveMode  = PrimitiveMode::InvalidEnum;
>+    mState.mPaused         = false;
>+    mState.mVerticesDrawn  = 0;
>+    mState.mVertexCapacity = 0;
>     if (mState.mProgram)
>     {
>         mState.mProgram->release(context);
>         mState.mProgram = nullptr;
>     }
>+    return angle::Result::Continue;
> }
> 
>-void TransformFeedback::pause()
>+angle::Result TransformFeedback::pause(const Context *context)
> {
>+    ANGLE_TRY(mImplementation->pause(context));
>     mState.mPaused = true;
>-    mImplementation->pause();
>+    return angle::Result::Continue;
> }
> 
>-void TransformFeedback::resume()
>+angle::Result TransformFeedback::resume(const Context *context)
> {
>+    ANGLE_TRY(mImplementation->resume(context));
>     mState.mPaused = false;
>-    mImplementation->resume();
>-}
>-
>-bool TransformFeedback::isActive() const
>-{
>-    return mState.mActive;
>+    return angle::Result::Continue;
> }
> 
> bool TransformFeedback::isPaused() const
>@@ -131,11 +175,35 @@ bool TransformFeedback::isPaused() const
>     return mState.mPaused;
> }
> 
>-GLenum TransformFeedback::getPrimitiveMode() const
>+PrimitiveMode TransformFeedback::getPrimitiveMode() const
> {
>     return mState.mPrimitiveMode;
> }
> 
>+bool TransformFeedback::checkBufferSpaceForDraw(GLsizei count, GLsizei primcount) const
>+{
>+    auto vertices =
>+        mState.mVerticesDrawn + GetVerticesNeededForDraw(mState.mPrimitiveMode, count, primcount);
>+    return vertices.IsValid() && vertices.ValueOrDie() <= mState.mVertexCapacity;
>+}
>+
>+void TransformFeedback::onVerticesDrawn(const Context *context, GLsizei count, GLsizei primcount)
>+{
>+    ASSERT(mState.mActive && !mState.mPaused);
>+    // All draws should be validated with checkBufferSpaceForDraw so ValueOrDie should never fail.
>+    mState.mVerticesDrawn =
>+        (mState.mVerticesDrawn + GetVerticesNeededForDraw(mState.mPrimitiveMode, count, primcount))
>+            .ValueOrDie();
>+
>+    for (auto &buffer : mState.mIndexedBuffers)
>+    {
>+        if (buffer.get() != nullptr)
>+        {
>+            buffer->onTransformFeedback(context);
>+        }
>+    }
>+}
>+
> void TransformFeedback::bindProgram(const Context *context, Program *program)
> {
>     if (mState.mProgram != program)
>@@ -157,44 +225,45 @@ bool TransformFeedback::hasBoundProgram(GLuint program) const
>     return mState.mProgram != nullptr && mState.mProgram->id() == program;
> }
> 
>-void TransformFeedback::bindGenericBuffer(const Context *context, Buffer *buffer)
>-{
>-    mState.mGenericBuffer.set(context, buffer);
>-    mImplementation->bindGenericBuffer(mState.mGenericBuffer);
>-}
>-
>-void TransformFeedback::detachBuffer(const Context *context, GLuint bufferName)
>+angle::Result TransformFeedback::detachBuffer(const Context *context, GLuint bufferName)
> {
>+    bool isBound = context->isCurrentTransformFeedback(this);
>     for (size_t index = 0; index < mState.mIndexedBuffers.size(); index++)
>     {
>         if (mState.mIndexedBuffers[index].id() == bufferName)
>         {
>-            mState.mIndexedBuffers[index].set(context, nullptr);
>-            mImplementation->bindIndexedBuffer(index, mState.mIndexedBuffers[index]);
>+            if (isBound)
>+            {
>+                mState.mIndexedBuffers[index]->onTFBindingChanged(context, false, true);
>+            }
>+            mState.mIndexedBuffers[index].set(context, nullptr, 0, 0);
>+            ANGLE_TRY(
>+                mImplementation->bindIndexedBuffer(context, index, mState.mIndexedBuffers[index]));
>         }
>     }
> 
>-    if (mState.mGenericBuffer.id() == bufferName)
>-    {
>-        mState.mGenericBuffer.set(context, nullptr);
>-        mImplementation->bindGenericBuffer(mState.mGenericBuffer);
>-    }
>-}
>-
>-const BindingPointer<Buffer> &TransformFeedback::getGenericBuffer() const
>-{
>-    return mState.mGenericBuffer;
>+    return angle::Result::Continue;
> }
> 
>-void TransformFeedback::bindIndexedBuffer(const Context *context,
>-                                          size_t index,
>-                                          Buffer *buffer,
>-                                          size_t offset,
>-                                          size_t size)
>+angle::Result TransformFeedback::bindIndexedBuffer(const Context *context,
>+                                                   size_t index,
>+                                                   Buffer *buffer,
>+                                                   size_t offset,
>+                                                   size_t size)
> {
>     ASSERT(index < mState.mIndexedBuffers.size());
>+    bool isBound = context && context->isCurrentTransformFeedback(this);
>+    if (isBound && mState.mIndexedBuffers[index].get())
>+    {
>+        mState.mIndexedBuffers[index]->onTFBindingChanged(context, false, true);
>+    }
>     mState.mIndexedBuffers[index].set(context, buffer, offset, size);
>-    mImplementation->bindIndexedBuffer(index, mState.mIndexedBuffers[index]);
>+    if (isBound && buffer)
>+    {
>+        buffer->onTFBindingChanged(context, true, true);
>+    }
>+
>+    return mImplementation->bindIndexedBuffer(context, index, mState.mIndexedBuffers[index]);
> }
> 
> const OffsetBindingPointer<Buffer> &TransformFeedback::getIndexedBuffer(size_t index) const
>@@ -208,6 +277,18 @@ size_t TransformFeedback::getIndexedBufferCount() const
>     return mState.mIndexedBuffers.size();
> }
> 
>+bool TransformFeedback::buffersBoundForOtherUse() const
>+{
>+    for (auto &buffer : mState.mIndexedBuffers)
>+    {
>+        if (buffer.get() && buffer->isBoundForTransformFeedbackAndOtherUse())
>+        {
>+            return true;
>+        }
>+    }
>+    return false;
>+}
>+
> rx::TransformFeedbackImpl *TransformFeedback::getImplementation()
> {
>     return mImplementation;
>@@ -218,4 +299,14 @@ const rx::TransformFeedbackImpl *TransformFeedback::getImplementation() const
>     return mImplementation;
> }
> 
>+void TransformFeedback::onBindingChanged(const Context *context, bool bound)
>+{
>+    for (auto &buffer : mState.mIndexedBuffers)
>+    {
>+        if (buffer.get())
>+        {
>+            buffer->onTFBindingChanged(context, bound, true);
>+        }
>+    }
> }
>+}  // namespace gl
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/TransformFeedback.h b/Source/ThirdParty/ANGLE/src/libANGLE/TransformFeedback.h
>index 2b35d43f9a1..f2a767087fd 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/TransformFeedback.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/TransformFeedback.h
>@@ -9,6 +9,7 @@
> 
> #include "libANGLE/RefCountObject.h"
> 
>+#include "common/PackedEnums.h"
> #include "common/angleutils.h"
> #include "libANGLE/Debug.h"
> 
>@@ -18,7 +19,8 @@ namespace rx
> {
> class GLImplFactory;
> class TransformFeedbackImpl;
>-}
>+class TransformFeedbackGL;
>+}  // namespace rx
> 
> namespace gl
> {
>@@ -33,9 +35,9 @@ class TransformFeedbackState final : angle::NonCopyable
>     TransformFeedbackState(size_t maxIndexedBuffers);
>     ~TransformFeedbackState();
> 
>-    const BindingPointer<Buffer> &getGenericBuffer() const;
>     const OffsetBindingPointer<Buffer> &getIndexedBuffer(size_t idx) const;
>     const std::vector<OffsetBindingPointer<Buffer>> &getIndexedBuffers() const;
>+    const Program *getBoundProgram() const { return mProgram; }
> 
>   private:
>     friend class TransformFeedback;
>@@ -43,12 +45,13 @@ class TransformFeedbackState final : angle::NonCopyable
>     std::string mLabel;
> 
>     bool mActive;
>-    GLenum mPrimitiveMode;
>+    PrimitiveMode mPrimitiveMode;
>     bool mPaused;
>+    GLsizeiptr mVerticesDrawn;
>+    GLsizeiptr mVertexCapacity;
> 
>     Program *mProgram;
> 
>-    BindingPointer<Buffer> mGenericBuffer;
>     std::vector<OffsetBindingPointer<Buffer>> mIndexedBuffers;
> };
> 
>@@ -57,45 +60,56 @@ class TransformFeedback final : public RefCountObject, public LabeledObject
>   public:
>     TransformFeedback(rx::GLImplFactory *implFactory, GLuint id, const Caps &caps);
>     ~TransformFeedback() override;
>-    Error onDestroy(const Context *context) override;
>+    void onDestroy(const Context *context) override;
> 
>-    void setLabel(const std::string &label) override;
>+    void setLabel(const Context *context, const std::string &label) override;
>     const std::string &getLabel() const override;
> 
>-    void begin(const Context *context, GLenum primitiveMode, Program *program);
>-    void end(const Context *context);
>-    void pause();
>-    void resume();
>+    angle::Result begin(const Context *context, PrimitiveMode primitiveMode, Program *program);
>+    angle::Result end(const Context *context);
>+    angle::Result pause(const Context *context);
>+    angle::Result resume(const Context *context);
>+
>+    bool isActive() const { return mState.mActive; }
> 
>-    bool isActive() const;
>     bool isPaused() const;
>-    GLenum getPrimitiveMode() const;
>+    PrimitiveMode getPrimitiveMode() const;
>+    // Validates that the vertices produced by a draw call will fit in the bound transform feedback
>+    // buffers.
>+    bool checkBufferSpaceForDraw(GLsizei count, GLsizei primcount) const;
>+    // This must be called after each draw call when transform feedback is enabled to keep track of
>+    // how many vertices have been written to the buffers. This information is needed by
>+    // checkBufferSpaceForDraw because each draw call appends vertices to the buffers starting just
>+    // after the last vertex of the previous draw call.
>+    void onVerticesDrawn(const Context *context, GLsizei count, GLsizei primcount);
> 
>     bool hasBoundProgram(GLuint program) const;
> 
>-    void bindGenericBuffer(const Context *context, Buffer *buffer);
>-    const BindingPointer<Buffer> &getGenericBuffer() const;
>-
>-    void bindIndexedBuffer(const Context *context,
>-                           size_t index,
>-                           Buffer *buffer,
>-                           size_t offset,
>-                           size_t size);
>+    angle::Result bindIndexedBuffer(const Context *context,
>+                                    size_t index,
>+                                    Buffer *buffer,
>+                                    size_t offset,
>+                                    size_t size);
>     const OffsetBindingPointer<Buffer> &getIndexedBuffer(size_t index) const;
>     size_t getIndexedBufferCount() const;
> 
>-    void detachBuffer(const Context *context, GLuint bufferName);
>+    // Returns true if any buffer bound to this object is also bound to another target.
>+    bool buffersBoundForOtherUse() const;
>+
>+    angle::Result detachBuffer(const Context *context, GLuint bufferName);
> 
>     rx::TransformFeedbackImpl *getImplementation();
>     const rx::TransformFeedbackImpl *getImplementation() const;
> 
>+    void onBindingChanged(const Context *context, bool bound);
>+
>   private:
>     void bindProgram(const Context *context, Program *program);
> 
>     TransformFeedbackState mState;
>-    rx::TransformFeedbackImpl* mImplementation;
>+    rx::TransformFeedbackImpl *mImplementation;
> };
> 
>-}
>+}  // namespace gl
> 
>-#endif // LIBANGLE_TRANSFORM_FEEDBACK_H_
>+#endif  // LIBANGLE_TRANSFORM_FEEDBACK_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/TransformFeedback_unittest.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/TransformFeedback_unittest.cpp
>index d019cb76718..6a05df7eba0 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/TransformFeedback_unittest.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/TransformFeedback_unittest.cpp
>@@ -6,6 +6,7 @@
> 
> #include "gmock/gmock.h"
> #include "gtest/gtest.h"
>+
> #include "libANGLE/Buffer.h"
> #include "libANGLE/Caps.h"
> #include "libANGLE/TransformFeedback.h"
>@@ -61,8 +62,8 @@ class TransformFeedbackTest : public testing::Test
>     }
> 
>     rx::MockGLFactory mMockFactory;
>-    rx::MockTransformFeedbackImpl* mImpl;
>-    gl::TransformFeedback* mFeedback;
>+    rx::MockTransformFeedbackImpl *mImpl;
>+    gl::TransformFeedback *mFeedback;
>     gl::Caps mCaps;
> };
> 
>@@ -71,12 +72,13 @@ TEST_F(TransformFeedbackTest, SideEffectsOfStartAndStop)
>     testing::InSequence seq;
> 
>     EXPECT_FALSE(mFeedback->isActive());
>-    EXPECT_CALL(*mImpl, begin(GL_TRIANGLES));
>-    mFeedback->begin(nullptr, GL_TRIANGLES, nullptr);
>+    EXPECT_CALL(*mImpl, begin(nullptr, gl::PrimitiveMode::Triangles));
>+    EXPECT_EQ(angle::Result::Continue,
>+              mFeedback->begin(nullptr, gl::PrimitiveMode::Triangles, nullptr));
>     EXPECT_TRUE(mFeedback->isActive());
>-    EXPECT_EQ(static_cast<GLenum>(GL_TRIANGLES), mFeedback->getPrimitiveMode());
>-    EXPECT_CALL(*mImpl, end());
>-    mFeedback->end(nullptr);
>+    EXPECT_EQ(gl::PrimitiveMode::Triangles, mFeedback->getPrimitiveMode());
>+    EXPECT_CALL(*mImpl, end(nullptr));
>+    EXPECT_EQ(angle::Result::Continue, mFeedback->end(nullptr));
>     EXPECT_FALSE(mFeedback->isActive());
> }
> 
>@@ -85,17 +87,18 @@ TEST_F(TransformFeedbackTest, SideEffectsOfPauseAndResume)
>     testing::InSequence seq;
> 
>     EXPECT_FALSE(mFeedback->isActive());
>-    EXPECT_CALL(*mImpl, begin(GL_TRIANGLES));
>-    mFeedback->begin(nullptr, GL_TRIANGLES, nullptr);
>+    EXPECT_CALL(*mImpl, begin(nullptr, gl::PrimitiveMode::Triangles));
>+    EXPECT_EQ(angle::Result::Continue,
>+              mFeedback->begin(nullptr, gl::PrimitiveMode::Triangles, nullptr));
>     EXPECT_FALSE(mFeedback->isPaused());
>-    EXPECT_CALL(*mImpl, pause());
>-    mFeedback->pause();
>+    EXPECT_CALL(*mImpl, pause(nullptr));
>+    EXPECT_EQ(angle::Result::Continue, mFeedback->pause(nullptr));
>     EXPECT_TRUE(mFeedback->isPaused());
>-    EXPECT_CALL(*mImpl, resume());
>-    mFeedback->resume();
>+    EXPECT_CALL(*mImpl, resume(nullptr));
>+    EXPECT_EQ(angle::Result::Continue, mFeedback->resume(nullptr));
>     EXPECT_FALSE(mFeedback->isPaused());
>-    EXPECT_CALL(*mImpl, end());
>-    mFeedback->end(nullptr);
>+    EXPECT_CALL(*mImpl, end(nullptr));
>+    EXPECT_EQ(angle::Result::Continue, mFeedback->end(nullptr));
> }
> 
> TEST_F(TransformFeedbackTest, BufferBinding)
>@@ -115,12 +118,9 @@ TEST_F(TransformFeedbackTest, BufferBinding)
> 
>     EXPECT_EQ(mFeedback->getIndexedBufferCount(), mCaps.maxTransformFeedbackSeparateAttributes);
> 
>-    EXPECT_CALL(*mImpl, bindGenericBuffer(_));
>-    mFeedback->bindGenericBuffer(nullptr, buffer);
>-    EXPECT_EQ(mFeedback->getGenericBuffer().get(), buffer);
>-
>-    EXPECT_CALL(*mImpl, bindIndexedBuffer(_, _));
>-    mFeedback->bindIndexedBuffer(nullptr, bindIndex, buffer, 0, 1);
>+    EXPECT_CALL(*mImpl, bindIndexedBuffer(_, _, _));
>+    EXPECT_EQ(angle::Result::Continue,
>+              mFeedback->bindIndexedBuffer(nullptr, bindIndex, buffer, 0, 1));
>     for (size_t i = 0; i < mFeedback->getIndexedBufferCount(); i++)
>     {
>         if (i == bindIndex)
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/Uniform.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/Uniform.cpp
>index dee8eee9152..8794210277d 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/Uniform.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/Uniform.cpp
>@@ -13,51 +13,44 @@
> namespace gl
> {
> 
>-StaticallyUsed::StaticallyUsed()
>-    : vertexStaticUse(false), fragmentStaticUse(false), computeStaticUse(false)
>+ActiveVariable::ActiveVariable() {}
>+
>+ActiveVariable::~ActiveVariable() {}
>+
>+ActiveVariable::ActiveVariable(const ActiveVariable &rhs) = default;
>+ActiveVariable &ActiveVariable::operator=(const ActiveVariable &rhs) = default;
>+
>+void ActiveVariable::setActive(ShaderType shaderType, bool used)
> {
>+    ASSERT(shaderType != ShaderType::InvalidEnum);
>+    mActiveUseBits.set(shaderType, used);
> }
> 
>-StaticallyUsed::~StaticallyUsed()
>+bool ActiveVariable::isActive(ShaderType shaderType) const
> {
>+    ASSERT(shaderType != ShaderType::InvalidEnum);
>+    return mActiveUseBits[shaderType];
> }
> 
>-StaticallyUsed::StaticallyUsed(const StaticallyUsed &rhs) = default;
>-StaticallyUsed &StaticallyUsed::operator=(const StaticallyUsed &rhs) = default;
>-
>-void StaticallyUsed::setStaticUse(GLenum shaderType, bool used)
>+void ActiveVariable::unionReferencesWith(const ActiveVariable &other)
> {
>-    switch (shaderType)
>-    {
>-        case GL_VERTEX_SHADER:
>-            vertexStaticUse = used;
>-            break;
>-
>-        case GL_FRAGMENT_SHADER:
>-            fragmentStaticUse = used;
>-            break;
>-
>-        case GL_COMPUTE_SHADER:
>-            computeStaticUse = used;
>-            break;
>-
>-        default:
>-            UNREACHABLE();
>-    }
>+    mActiveUseBits |= other.mActiveUseBits;
> }
> 
>-void StaticallyUsed::unionReferencesWith(const StaticallyUsed &other)
>+ShaderType ActiveVariable::getFirstShaderTypeWhereActive() const
> {
>-    vertexStaticUse |= other.vertexStaticUse;
>-    fragmentStaticUse |= other.fragmentStaticUse;
>-    computeStaticUse |= other.computeStaticUse;
>+    return static_cast<ShaderType>(ScanForward(mActiveUseBits.bits()));
> }
> 
>-LinkedUniform::LinkedUniform()
>-    : typeInfo(nullptr), bufferIndex(-1), blockInfo(sh::BlockMemberInfo::getDefaultBlockInfo())
>+GLuint ActiveVariable::activeShaderCount() const
> {
>+    return static_cast<GLuint>(mActiveUseBits.count());
> }
> 
>+LinkedUniform::LinkedUniform()
>+    : typeInfo(nullptr), bufferIndex(-1), blockInfo(sh::kDefaultBlockMemberInfo)
>+{}
>+
> LinkedUniform::LinkedUniform(GLenum typeIn,
>                              GLenum precisionIn,
>                              const std::string &nameIn,
>@@ -69,13 +62,13 @@ LinkedUniform::LinkedUniform(GLenum typeIn,
>                              const sh::BlockMemberInfo &blockInfoIn)
>     : typeInfo(&GetUniformTypeInfo(typeIn)), bufferIndex(bufferIndexIn), blockInfo(blockInfoIn)
> {
>-    type      = typeIn;
>-    precision = precisionIn;
>-    name      = nameIn;
>+    type       = typeIn;
>+    precision  = precisionIn;
>+    name       = nameIn;
>     arraySizes = arraySizesIn;
>-    binding   = bindingIn;
>-    offset    = offsetIn;
>-    location  = locationIn;
>+    binding    = bindingIn;
>+    offset     = offsetIn;
>+    location   = locationIn;
>     ASSERT(!isArrayOfArrays());
>     ASSERT(!isArray() || !isStruct());
> }
>@@ -84,7 +77,7 @@ LinkedUniform::LinkedUniform(const sh::Uniform &uniform)
>     : sh::Uniform(uniform),
>       typeInfo(&GetUniformTypeInfo(type)),
>       bufferIndex(-1),
>-      blockInfo(sh::BlockMemberInfo::getDefaultBlockInfo())
>+      blockInfo(sh::kDefaultBlockMemberInfo)
> {
>     ASSERT(!isArrayOfArrays());
>     ASSERT(!isArray() || !isStruct());
>@@ -92,26 +85,23 @@ LinkedUniform::LinkedUniform(const sh::Uniform &uniform)
> 
> LinkedUniform::LinkedUniform(const LinkedUniform &uniform)
>     : sh::Uniform(uniform),
>-      StaticallyUsed(uniform),
>+      ActiveVariable(uniform),
>       typeInfo(uniform.typeInfo),
>       bufferIndex(uniform.bufferIndex),
>       blockInfo(uniform.blockInfo)
>-{
>-}
>+{}
> 
> LinkedUniform &LinkedUniform::operator=(const LinkedUniform &uniform)
> {
>-    sh::Uniform::operator=(uniform);
>-    StaticallyUsed::operator=(uniform);
>-    typeInfo             = uniform.typeInfo;
>-    bufferIndex          = uniform.bufferIndex;
>-    blockInfo            = uniform.blockInfo;
>+    sh::Uniform::operator   =(uniform);
>+    ActiveVariable::operator=(uniform);
>+    typeInfo                = uniform.typeInfo;
>+    bufferIndex             = uniform.bufferIndex;
>+    blockInfo               = uniform.blockInfo;
>     return *this;
> }
> 
>-LinkedUniform::~LinkedUniform()
>-{
>-}
>+LinkedUniform::~LinkedUniform() {}
> 
> bool LinkedUniform::isInDefaultBlock() const
> {
>@@ -149,9 +139,8 @@ size_t LinkedUniform::getElementComponents() const
> }
> 
> BufferVariable::BufferVariable()
>-    : bufferIndex(-1), blockInfo(sh::BlockMemberInfo::getDefaultBlockInfo()), topLevelArraySize(-1)
>-{
>-}
>+    : bufferIndex(-1), blockInfo(sh::kDefaultBlockMemberInfo), topLevelArraySize(-1)
>+{}
> 
> BufferVariable::BufferVariable(GLenum typeIn,
>                                GLenum precisionIn,
>@@ -161,34 +150,26 @@ BufferVariable::BufferVariable(GLenum typeIn,
>                                const sh::BlockMemberInfo &blockInfoIn)
>     : bufferIndex(bufferIndexIn), blockInfo(blockInfoIn), topLevelArraySize(-1)
> {
>-    type      = typeIn;
>-    precision = precisionIn;
>-    name      = nameIn;
>+    type       = typeIn;
>+    precision  = precisionIn;
>+    name       = nameIn;
>     arraySizes = arraySizesIn;
> }
> 
>-BufferVariable::~BufferVariable()
>-{
>-}
>+BufferVariable::~BufferVariable() {}
> 
>-ShaderVariableBuffer::ShaderVariableBuffer() : binding(0), dataSize(0)
>-{
>-}
>+ShaderVariableBuffer::ShaderVariableBuffer() : binding(0), dataSize(0) {}
> 
> ShaderVariableBuffer::ShaderVariableBuffer(const ShaderVariableBuffer &other) = default;
> 
>-ShaderVariableBuffer::~ShaderVariableBuffer()
>-{
>-}
>+ShaderVariableBuffer::~ShaderVariableBuffer() {}
> 
> int ShaderVariableBuffer::numActiveVariables() const
> {
>     return static_cast<int>(memberIndexes.size());
> }
> 
>-InterfaceBlock::InterfaceBlock() : isArray(false), arrayElement(0)
>-{
>-}
>+InterfaceBlock::InterfaceBlock() : isArray(false), arrayElement(0) {}
> 
> InterfaceBlock::InterfaceBlock(const std::string &nameIn,
>                                const std::string &mappedNameIn,
>@@ -223,4 +204,4 @@ std::string InterfaceBlock::mappedNameWithArrayIndex() const
> 
>     return fullNameStr.str();
> }
>-}
>+}  // namespace gl
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/Uniform.h b/Source/ThirdParty/ANGLE/src/libANGLE/Uniform.h
>index 14c39387a68..ac292fcfd1c 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/Uniform.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/Uniform.h
>@@ -11,8 +11,8 @@
> #include <vector>
> 
> #include "angle_gl.h"
>-#include "common/debug.h"
> #include "common/MemoryBuffer.h"
>+#include "common/debug.h"
> #include "compiler/translator/blocklayout.h"
> #include "libANGLE/angletypes.h"
> 
>@@ -20,24 +20,26 @@ namespace gl
> {
> struct UniformTypeInfo;
> 
>-struct StaticallyUsed
>+struct ActiveVariable
> {
>-    StaticallyUsed();
>-    StaticallyUsed(const StaticallyUsed &rhs);
>-    virtual ~StaticallyUsed();
>+    ActiveVariable();
>+    ActiveVariable(const ActiveVariable &rhs);
>+    virtual ~ActiveVariable();
> 
>-    StaticallyUsed &operator=(const StaticallyUsed &rhs);
>+    ActiveVariable &operator=(const ActiveVariable &rhs);
> 
>-    void setStaticUse(GLenum shaderType, bool used);
>-    void unionReferencesWith(const StaticallyUsed &other);
>+    ShaderType getFirstShaderTypeWhereActive() const;
>+    void setActive(ShaderType shaderType, bool used);
>+    void unionReferencesWith(const ActiveVariable &other);
>+    bool isActive(ShaderType shaderType) const;
>+    GLuint activeShaderCount() const;
> 
>-    bool vertexStaticUse;
>-    bool fragmentStaticUse;
>-    bool computeStaticUse;
>+  private:
>+    ShaderBitSet mActiveUseBits;
> };
> 
> // Helper struct representing a single shader uniform
>-struct LinkedUniform : public sh::Uniform, public StaticallyUsed
>+struct LinkedUniform : public sh::Uniform, public ActiveVariable
> {
>     LinkedUniform();
>     LinkedUniform(GLenum type,
>@@ -69,7 +71,7 @@ struct LinkedUniform : public sh::Uniform, public StaticallyUsed
>     sh::BlockMemberInfo blockInfo;
> };
> 
>-struct BufferVariable : public sh::ShaderVariable, public StaticallyUsed
>+struct BufferVariable : public sh::ShaderVariable, public ActiveVariable
> {
>     BufferVariable();
>     BufferVariable(GLenum type,
>@@ -88,7 +90,7 @@ struct BufferVariable : public sh::ShaderVariable, public StaticallyUsed
> 
> // Parent struct for atomic counter, uniform block, and shader storage block buffer, which all
> // contain a group of shader variables, and have a GL buffer backed.
>-struct ShaderVariableBuffer : public StaticallyUsed
>+struct ShaderVariableBuffer : public ActiveVariable
> {
>     ShaderVariableBuffer();
>     ShaderVariableBuffer(const ShaderVariableBuffer &other);
>@@ -121,6 +123,6 @@ struct InterfaceBlock : public ShaderVariableBuffer
>     unsigned int arrayElement;
> };
> 
>-}
>+}  // namespace gl
> 
>-#endif   // LIBANGLE_UNIFORM_H_
>+#endif  // LIBANGLE_UNIFORM_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/VaryingPacking.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/VaryingPacking.cpp
>index 6fc707b549a..9947c4ca40c 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/VaryingPacking.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/VaryingPacking.cpp
>@@ -30,9 +30,9 @@ bool ComparePackedVarying(const PackedVarying &x, const PackedVarying &y)
>     const sh::ShaderVariable *px, *py;
>     if (x.isArrayElement())
>     {
>-        vx           = *x.varying;
>+        vx = *x.varying;
>         vx.arraySizes.clear();
>-        px           = &vx;
>+        px = &vx;
>     }
>     else
>     {
>@@ -41,9 +41,9 @@ bool ComparePackedVarying(const PackedVarying &x, const PackedVarying &y)
> 
>     if (y.isArrayElement())
>     {
>-        vy           = *y.varying;
>+        vy = *y.varying;
>         vy.arraySizes.clear();
>-        py           = &vy;
>+        py = &vy;
>     }
>     else
>     {
>@@ -58,8 +58,7 @@ bool ComparePackedVarying(const PackedVarying &x, const PackedVarying &y)
> // Implementation of VaryingPacking
> VaryingPacking::VaryingPacking(GLuint maxVaryingVectors, PackMode packMode)
>     : mRegisterMap(maxVaryingVectors), mPackMode(packMode)
>-{
>-}
>+{}
> 
> VaryingPacking::~VaryingPacking() = default;
> 
>@@ -69,7 +68,7 @@ VaryingPacking::~VaryingPacking() = default;
> // Returns false if unsuccessful.
> bool VaryingPacking::packVarying(const PackedVarying &packedVarying)
> {
>-    const auto &varying = *packedVarying.varying;
>+    const sh::ShaderVariable &varying = *packedVarying.varying;
> 
>     // "Non - square matrices of type matCxR consume the same space as a square matrix of type matN
>     // where N is the greater of C and R."
>@@ -80,9 +79,16 @@ bool VaryingPacking::packVarying(const PackedVarying &packedVarying)
>     unsigned int varyingRows    = gl::VariableRowCount(transposedType);
>     unsigned int varyingColumns = gl::VariableColumnCount(transposedType);
> 
>+    // Special pack mode for D3D9. Each varying takes a full register, no sharing.
>+    // TODO(jmadill): Implement more sophisticated component packing in D3D9.
>+    if (mPackMode == PackMode::ANGLE_NON_CONFORMANT_D3D9)
>+    {
>+        varyingColumns = 4;
>+    }
>+
>     // "Variables of type mat2 occupies 2 complete rows."
>     // For non-WebGL contexts, we allow mat2 to occupy only two columns per row.
>-    if (mPackMode == PackMode::WEBGL_STRICT && varying.type == GL_FLOAT_MAT2)
>+    else if (mPackMode == PackMode::WEBGL_STRICT && varying.type == GL_FLOAT_MAT2)
>     {
>         varyingColumns = 4;
>     }
>@@ -182,12 +188,12 @@ bool VaryingPacking::packVarying(const PackedVarying &packedVarying)
>                 {
>                     // If varyingRows > 1, it must be an array.
>                     PackedVaryingRegister registerInfo;
>-                    registerInfo.packedVarying     = &packedVarying;
>-                    registerInfo.registerRow       = row + arrayIndex;
>-                    registerInfo.registerColumn    = bestColumn;
>+                    registerInfo.packedVarying  = &packedVarying;
>+                    registerInfo.registerRow    = row + arrayIndex;
>+                    registerInfo.registerColumn = bestColumn;
>                     registerInfo.varyingArrayIndex =
>                         (packedVarying.isArrayElement() ? packedVarying.arrayIndex : arrayIndex);
>-                    registerInfo.varyingRowIndex   = 0;
>+                    registerInfo.varyingRowIndex = 0;
>                     // Do not record register info for builtins.
>                     // TODO(jmadill): Clean this up.
>                     if (!packedVarying.varying->isBuiltIn())
>@@ -273,7 +279,7 @@ void VaryingPacking::insert(unsigned int registerRow,
> }
> 
> bool VaryingPacking::collectAndPackUserVaryings(gl::InfoLog &infoLog,
>-                                                const Program::MergedVaryings &mergedVaryings,
>+                                                const ProgramMergedVaryings &mergedVaryings,
>                                                 const std::vector<std::string> &tfVaryings)
> {
>     std::set<std::string> uniqueFullNames;
>@@ -285,38 +291,53 @@ bool VaryingPacking::collectAndPackUserVaryings(gl::InfoLog &infoLog,
>         const sh::Varying *output = ref.second.fragment;
> 
>         // Only pack statically used varyings that have a matched input or output, plus special
>-        // builtins.
>-        if (((input && output) || (output && output->isBuiltIn())) && output->staticUse)
>+        // builtins. Note that we pack all statically used user-defined varyings even if they are
>+        // not active. GLES specs are a bit vague on whether it's allowed to only pack active
>+        // varyings, though GLES 3.1 spec section 11.1.2.1 says that "device-dependent
>+        // optimizations" may be used to make vertex shader outputs fit.
>+        if ((input && output && output->staticUse) ||
>+            (input && input->isBuiltIn() && input->active) ||
>+            (output && output->isBuiltIn() && output->active))
>         {
>-            // Will get the vertex shader interpolation by default.
>-            auto interpolation = ref.second.get()->interpolation;
>+            const sh::Varying *varying = output ? output : input;
> 
>-            // Note that we lose the vertex shader static use information here. The data for the
>-            // variable is taken from the fragment shader.
>-            if (output->isStruct())
>+            // Don't count gl_Position. Also don't count gl_PointSize for D3D9.
>+            if (varying->name != "gl_Position" &&
>+                !(varying->name == "gl_PointSize" &&
>+                  mPackMode == PackMode::ANGLE_NON_CONFORMANT_D3D9))
>             {
>-                ASSERT(!output->isArray());
>-                for (const auto &field : output->fields)
>+                // Will get the vertex shader interpolation by default.
>+                auto interpolation = ref.second.get()->interpolation;
>+
>+                // Note that we lose the vertex shader static use information here. The data for the
>+                // variable is taken from the fragment shader.
>+                if (varying->isStruct())
>                 {
>-                    ASSERT(!field.isStruct() && !field.isArray());
>-                    mPackedVaryings.push_back(PackedVarying(field, interpolation, output->name));
>-                    uniqueFullNames.insert(mPackedVaryings.back().nameWithArrayIndex());
>+                    ASSERT(!varying->isArray());
>+                    for (const auto &field : varying->fields)
>+                    {
>+                        ASSERT(!field.isStruct() && !field.isArray());
>+                        mPackedVaryings.emplace_back(field, interpolation, varying->name);
>+                        uniqueFullNames.insert(mPackedVaryings.back().fullName());
>+                    }
>                 }
>+                else
>+                {
>+                    mPackedVaryings.emplace_back(*varying, interpolation);
>+                    uniqueFullNames.insert(mPackedVaryings.back().fullName());
>+                }
>+                continue;
>             }
>-            else
>-            {
>-                mPackedVaryings.push_back(PackedVarying(*output, interpolation));
>-                uniqueFullNames.insert(mPackedVaryings.back().nameWithArrayIndex());
>-            }
>-            continue;
>         }
> 
>-        // Keep Transform FB varyings in the merged list always.
>+        // If the varying is not used in the VS, we know it is inactive.
>         if (!input)
>         {
>+            mInactiveVaryingNames.push_back(ref.first);
>             continue;
>         }
> 
>+        // Keep Transform FB varyings in the merged list always.
>         for (const std::string &tfVarying : tfVaryings)
>         {
>             std::vector<unsigned int> subscripts;
>@@ -331,16 +352,26 @@ bool VaryingPacking::collectAndPackUserVaryings(gl::InfoLog &infoLog,
>             {
>                 continue;
>             }
>+            if (input->isStruct())
>+            {
>+                const sh::ShaderVariable *field = FindShaderVarField(*input, tfVarying);
>+                if (field != nullptr)
>+                {
>+                    ASSERT(!field->isStruct() && !field->isArray());
>+                    mPackedVaryings.emplace_back(*field, input->interpolation, input->name);
>+                    mPackedVaryings.back().vertexOnly = true;
>+                    mPackedVaryings.back().arrayIndex = GL_INVALID_INDEX;
>+                    uniqueFullNames.insert(tfVarying);
>+                }
>+            }
>             // Array as a whole and array element conflict has already been checked in
>             // linkValidateTransformFeedback.
>-            if (baseName == input->name)
>+            else if (baseName == input->name)
>             {
>-                // Transform feedback for varying structs is underspecified.
>-                // See Khronos bug 9856.
>-                // TODO(jmadill): Figure out how to be spec-compliant here.
>-                if (!input->isStruct() && tfVarying.compare(0, 3, "gl_") != 0)
>+                // only pack varyings that are not builtins.
>+                if (tfVarying.compare(0, 3, "gl_") != 0)
>                 {
>-                    mPackedVaryings.push_back(PackedVarying(*input, input->interpolation));
>+                    mPackedVaryings.emplace_back(*input, input->interpolation);
>                     mPackedVaryings.back().vertexOnly = true;
>                     mPackedVaryings.back().arrayIndex = static_cast<GLuint>(subscript);
>                     uniqueFullNames.insert(tfVarying);
>@@ -353,17 +384,21 @@ bool VaryingPacking::collectAndPackUserVaryings(gl::InfoLog &infoLog,
>                 }
>             }
>         }
>+
>+        if (uniqueFullNames.count(ref.first) == 0)
>+        {
>+            mInactiveVaryingNames.push_back(ref.first);
>+        }
>     }
> 
>     std::sort(mPackedVaryings.begin(), mPackedVaryings.end(), ComparePackedVarying);
> 
>-    return packUserVaryings(infoLog, mPackedVaryings, tfVaryings);
>+    return packUserVaryings(infoLog, mPackedVaryings);
> }
> 
> // See comment on packVarying.
> bool VaryingPacking::packUserVaryings(gl::InfoLog &infoLog,
>-                                      const std::vector<PackedVarying> &packedVaryings,
>-                                      const std::vector<std::string> &transformFeedbackVaryings)
>+                                      const std::vector<PackedVarying> &packedVaryings)
> {
> 
>     // "Variables are packed into the registers one at a time so that they each occupy a contiguous
>@@ -372,7 +407,15 @@ bool VaryingPacking::packUserVaryings(gl::InfoLog &infoLog,
>     {
>         if (!packVarying(packedVarying))
>         {
>-            infoLog << "Could not pack varying " << packedVarying.nameWithArrayIndex();
>+            infoLog << "Could not pack varying " << packedVarying.fullName();
>+
>+            // TODO(jmadill): Implement more sophisticated component packing in D3D9.
>+            if (mPackMode == PackMode::ANGLE_NON_CONFORMANT_D3D9)
>+            {
>+                infoLog << "Note: Additional non-conformant packing restrictions are enforced on "
>+                           "D3D9.";
>+            }
>+
>             return false;
>         }
>     }
>@@ -380,29 +423,11 @@ bool VaryingPacking::packUserVaryings(gl::InfoLog &infoLog,
>     // Sort the packed register list
>     std::sort(mRegisterList.begin(), mRegisterList.end());
> 
>-    // Assign semantic indices
>-    for (unsigned int semanticIndex = 0;
>-         semanticIndex < static_cast<unsigned int>(mRegisterList.size()); ++semanticIndex)
>-    {
>-        mRegisterList[semanticIndex].semanticIndex = semanticIndex;
>-    }
>-
>     return true;
> }
> 
>-unsigned int VaryingPacking::getRegisterCount() const
>+const std::vector<std::string> &VaryingPacking::getInactiveVaryingNames() const
> {
>-    unsigned int count = 0;
>-
>-    for (const Register &reg : mRegisterMap)
>-    {
>-        if (reg.data[0] || reg.data[1] || reg.data[2] || reg.data[3])
>-        {
>-            ++count;
>-        }
>-    }
>-
>-    return count;
>+    return mInactiveVaryingNames;
> }
>-
>-}  // namespace rx
>+}  // namespace gl
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/VaryingPacking.h b/Source/ThirdParty/ANGLE/src/libANGLE/VaryingPacking.h
>index 14b25f929e0..c52f7e9b4b2 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/VaryingPacking.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/VaryingPacking.h
>@@ -16,18 +16,21 @@
> 
> #include "angle_gl.h"
> #include "common/angleutils.h"
>-#include "libANGLE/Program.h"
>+
>+#include <map>
> 
> namespace gl
> {
> class InfoLog;
>+struct ProgramVaryingRef;
>+
>+using ProgramMergedVaryings = std::map<std::string, ProgramVaryingRef>;
> 
> struct PackedVarying
> {
>     PackedVarying(const sh::ShaderVariable &varyingIn, sh::InterpolationType interpolationIn)
>         : PackedVarying(varyingIn, interpolationIn, "")
>-    {
>-    }
>+    {}
>     PackedVarying(const sh::ShaderVariable &varyingIn,
>                   sh::InterpolationType interpolationIn,
>                   const std::string &parentStructNameIn)
>@@ -36,16 +39,20 @@ struct PackedVarying
>           interpolation(interpolationIn),
>           parentStructName(parentStructNameIn),
>           arrayIndex(GL_INVALID_INDEX)
>-    {
>-    }
>+    {}
> 
>     bool isStructField() const { return !parentStructName.empty(); }
> 
>     bool isArrayElement() const { return arrayIndex != GL_INVALID_INDEX; }
> 
>-    std::string nameWithArrayIndex() const
>+    std::string fullName() const
>     {
>         std::stringstream fullNameStr;
>+        if (isStructField())
>+        {
>+            fullNameStr << parentStructName << ".";
>+        }
>+
>         fullNameStr << varying->name;
>         if (arrayIndex != GL_INVALID_INDEX)
>         {
>@@ -76,8 +83,7 @@ struct PackedVaryingRegister final
>           varyingRowIndex(0),
>           registerRow(0),
>           registerColumn(0)
>-    {
>-    }
>+    {}
> 
>     PackedVaryingRegister(const PackedVaryingRegister &) = default;
>     PackedVaryingRegister &operator=(const PackedVaryingRegister &) = default;
>@@ -93,7 +99,17 @@ struct PackedVaryingRegister final
>         return registerRow * 4 + registerColumn;
>     }
> 
>-    bool isStructField() const { return !structFieldName.empty(); }
>+    std::string tfVaryingName() const
>+    {
>+        if (packedVarying->isArrayElement() || packedVarying->isStructField())
>+        {
>+            return packedVarying->fullName();
>+        }
>+        else
>+        {
>+            return packedVarying->varying->name;
>+        }
>+    }
> 
>     // Index to the array of varyings.
>     const PackedVarying *packedVarying;
>@@ -109,12 +125,6 @@ struct PackedVaryingRegister final
> 
>     // The column of the register row into which we've packed this varying.
>     unsigned int registerColumn;
>-
>-    // Assigned after packing
>-    unsigned int semanticIndex;
>-
>-    // Struct member this varying corresponds to.
>-    std::string structFieldName;
> };
> 
> // Supported packing modes:
>@@ -125,6 +135,9 @@ enum class PackMode
> 
>     // We allow mat2 to take a 2x2 chunk.
>     ANGLE_RELAXED,
>+
>+    // Each varying takes a separate register. No register sharing.
>+    ANGLE_NON_CONFORMANT_D3D9,
> };
> 
> class VaryingPacking final : angle::NonCopyable
>@@ -133,12 +146,10 @@ class VaryingPacking final : angle::NonCopyable
>     VaryingPacking(GLuint maxVaryingVectors, PackMode packMode);
>     ~VaryingPacking();
> 
>-    bool packUserVaryings(gl::InfoLog &infoLog,
>-                          const std::vector<PackedVarying> &packedVaryings,
>-                          const std::vector<std::string> &tfVaryings);
>+    bool packUserVaryings(gl::InfoLog &infoLog, const std::vector<PackedVarying> &packedVaryings);
> 
>     bool collectAndPackUserVaryings(gl::InfoLog &infoLog,
>-                                    const Program::MergedVaryings &mergedVaryings,
>+                                    const ProgramMergedVaryings &mergedVaryings,
>                                     const std::vector<std::string> &tfVaryings);
> 
>     struct Register
>@@ -159,8 +170,8 @@ class VaryingPacking final : angle::NonCopyable
>     {
>         return static_cast<unsigned int>(mRegisterList.size());
>     }
>-    unsigned int getRegisterCount() const;
>-    size_t getRegisterMapSize() const { return mRegisterMap.size(); }
>+
>+    const std::vector<std::string> &getInactiveVaryingNames() const;
> 
>   private:
>     bool packVarying(const PackedVarying &packedVarying);
>@@ -175,6 +186,7 @@ class VaryingPacking final : angle::NonCopyable
>     std::vector<Register> mRegisterMap;
>     std::vector<PackedVaryingRegister> mRegisterList;
>     std::vector<PackedVarying> mPackedVaryings;
>+    std::vector<std::string> mInactiveVaryingNames;
> 
>     PackMode mPackMode;
> };
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/VaryingPacking_unittest.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/VaryingPacking_unittest.cpp
>index 55306a21fe5..2a2ef852385 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/VaryingPacking_unittest.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/VaryingPacking_unittest.cpp
>@@ -13,6 +13,7 @@
> // But 'None' is also define as a numberic constant 0L in <X11/X.h>.
> // So we need to include gtest first to avoid such conflict.
> 
>+#include "libANGLE/Program.h"
> #include "libANGLE/VaryingPacking.h"
> 
> using namespace gl;
>@@ -37,7 +38,7 @@ class VaryingPackingTest : public ::testing::TestWithParam<GLuint>
>         InfoLog infoLog;
>         std::vector<std::string> transformFeedbackVaryings;
> 
>-        return varyingPacking->packUserVaryings(infoLog, packedVaryings, transformFeedbackVaryings);
>+        return varyingPacking->packUserVaryings(infoLog, packedVaryings);
>     }
> 
>     // Uses the "relaxed" ANGLE packing mode.
>@@ -67,10 +68,10 @@ std::vector<sh::Varying> MakeVaryings(GLenum type, size_t count, size_t arraySiz
>         strstr << type << index;
> 
>         sh::Varying varying;
>-        varying.type          = type;
>-        varying.precision     = GL_MEDIUM_FLOAT;
>-        varying.name          = strstr.str();
>-        varying.mappedName    = strstr.str();
>+        varying.type       = type;
>+        varying.precision  = GL_MEDIUM_FLOAT;
>+        varying.name       = strstr.str();
>+        varying.mappedName = strstr.str();
>         if (arraySize > 0)
>         {
>             varying.arraySizes.push_back(static_cast<unsigned int>(arraySize));
>@@ -160,6 +161,6 @@ TEST_P(VaryingPackingTest, MaxPlusOneMat2VaryingsFailsWebGL)
> }
> 
> // Makes separate tests for different values of kMaxVaryings.
>-INSTANTIATE_TEST_CASE_P(, VaryingPackingTest, ::testing::Values(1, 4, 8));
>+INSTANTIATE_TEST_SUITE_P(, VaryingPackingTest, ::testing::Values(1, 4, 8));
> 
> }  // anonymous namespace
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/Version.h b/Source/ThirdParty/ANGLE/src/libANGLE/Version.h
>index 7bd41846c8b..444bdd75e98 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/Version.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/Version.h
>@@ -27,8 +27,8 @@ bool operator>=(const Version &a, const Version &b);
> bool operator<=(const Version &a, const Version &b);
> bool operator<(const Version &a, const Version &b);
> bool operator>(const Version &a, const Version &b);
>-}
>+}  // namespace gl
> 
> #include "Version.inl"
> 
>-#endif // LIBANGLE_VERSION_H_
>+#endif  // LIBANGLE_VERSION_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/VertexArray.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/VertexArray.cpp
>index a8c2fce1553..f14876668b7 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/VertexArray.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/VertexArray.cpp
>@@ -7,46 +7,149 @@
> //
> 
> #include "libANGLE/VertexArray.h"
>+
>+#include "common/utilities.h"
> #include "libANGLE/Buffer.h"
> #include "libANGLE/Context.h"
>+#include "libANGLE/renderer/BufferImpl.h"
> #include "libANGLE/renderer/GLImplFactory.h"
> #include "libANGLE/renderer/VertexArrayImpl.h"
> 
> namespace gl
> {
>+namespace
>+{
>+bool IsElementArrayBufferSubjectIndex(angle::SubjectIndex subjectIndex)
>+{
>+    return (subjectIndex == MAX_VERTEX_ATTRIBS);
>+}
> 
>-VertexArrayState::VertexArrayState(size_t maxAttribs, size_t maxAttribBindings)
>-    : mLabel(), mVertexBindings(maxAttribBindings), mMaxEnabledAttribute(0)
>+ANGLE_INLINE ComponentType GetVertexAttributeComponentType(bool pureInteger, VertexAttribType type)
>+{
>+    if (pureInteger)
>+    {
>+        switch (type)
>+        {
>+            case VertexAttribType::Byte:
>+            case VertexAttribType::Short:
>+            case VertexAttribType::Int:
>+                return ComponentType::Int;
>+
>+            case VertexAttribType::UnsignedByte:
>+            case VertexAttribType::UnsignedShort:
>+            case VertexAttribType::UnsignedInt:
>+                return ComponentType::UnsignedInt;
>+
>+            default:
>+                UNREACHABLE();
>+                return ComponentType::NoType;
>+        }
>+    }
>+    else
>+    {
>+        return ComponentType::Float;
>+    }
>+}
>+
>+constexpr angle::SubjectIndex kElementArrayBufferIndex = MAX_VERTEX_ATTRIBS;
>+}  // namespace
>+
>+// VertexArrayState implementation.
>+VertexArrayState::VertexArrayState(VertexArray *vertexArray,
>+                                   size_t maxAttribs,
>+                                   size_t maxAttribBindings)
>+    : mElementArrayBuffer(vertexArray, kElementArrayBufferIndex)
> {
>     ASSERT(maxAttribs <= maxAttribBindings);
> 
>     for (size_t i = 0; i < maxAttribs; i++)
>     {
>         mVertexAttributes.emplace_back(static_cast<GLuint>(i));
>+        mVertexBindings.emplace_back(static_cast<GLuint>(i));
>     }
>+
>+    // Initially all attributes start as "client" with no buffer bound.
>+    mClientMemoryAttribsMask.set();
>+}
>+
>+VertexArrayState::~VertexArrayState() {}
>+
>+bool VertexArrayState::hasEnabledNullPointerClientArray() const
>+{
>+    return (mNullPointerClientMemoryAttribsMask & mEnabledAttributesMask).any();
>+}
>+
>+AttributesMask VertexArrayState::getBindingToAttributesMask(GLuint bindingIndex) const
>+{
>+    ASSERT(bindingIndex < MAX_VERTEX_ATTRIB_BINDINGS);
>+    return mVertexBindings[bindingIndex].getBoundAttributesMask();
> }
> 
>-VertexArrayState::~VertexArrayState()
>+// Set an attribute using a new binding.
>+void VertexArrayState::setAttribBinding(const Context *context,
>+                                        size_t attribIndex,
>+                                        GLuint newBindingIndex)
> {
>+    ASSERT(attribIndex < MAX_VERTEX_ATTRIBS && newBindingIndex < MAX_VERTEX_ATTRIB_BINDINGS);
>+
>+    VertexAttribute &attrib = mVertexAttributes[attribIndex];
>+
>+    // Update the binding-attribute map.
>+    const GLuint oldBindingIndex = attrib.bindingIndex;
>+    ASSERT(oldBindingIndex != newBindingIndex);
>+
>+    VertexBinding &oldBinding = mVertexBindings[oldBindingIndex];
>+    VertexBinding &newBinding = mVertexBindings[newBindingIndex];
>+
>+    ASSERT(oldBinding.getBoundAttributesMask().test(attribIndex) &&
>+           !newBinding.getBoundAttributesMask().test(attribIndex));
>+
>+    oldBinding.resetBoundAttribute(attribIndex);
>+    newBinding.setBoundAttribute(attribIndex);
>+
>+    // Set the attribute using the new binding.
>+    attrib.bindingIndex = newBindingIndex;
>+
>+    if (context->isBufferAccessValidationEnabled())
>+    {
>+        attrib.updateCachedElementLimit(newBinding);
>+    }
>+
>+    bool isMapped = newBinding.getBuffer().get() && newBinding.getBuffer()->isMapped();
>+    mCachedMappedArrayBuffers.set(attribIndex, isMapped);
>+    mCachedEnabledMappedArrayBuffers.set(attribIndex, isMapped && attrib.enabled);
> }
> 
>+// VertexArray implementation.
> VertexArray::VertexArray(rx::GLImplFactory *factory,
>                          GLuint id,
>                          size_t maxAttribs,
>                          size_t maxAttribBindings)
>     : mId(id),
>-      mState(maxAttribs, maxAttribBindings),
>+      mState(this, maxAttribs, maxAttribBindings),
>       mVertexArray(factory->createVertexArray(mState))
> {
>+    for (size_t attribIndex = 0; attribIndex < maxAttribBindings; ++attribIndex)
>+    {
>+        mArrayBufferObserverBindings.emplace_back(this, attribIndex);
>+    }
> }
> 
> void VertexArray::onDestroy(const Context *context)
> {
>-    for (auto &binding : mState.mVertexBindings)
>+    bool isBound = context->isCurrentVertexArray(this);
>+    for (VertexBinding &binding : mState.mVertexBindings)
>     {
>+        if (isBound)
>+        {
>+            if (binding.getBuffer().get())
>+                binding.getBuffer()->onNonTFBindingChanged(-1);
>+        }
>         binding.setBuffer(context, nullptr);
>     }
>-    mState.mElementArrayBuffer.set(context, nullptr);
>+    if (isBound && mState.mElementArrayBuffer.get())
>+        mState.mElementArrayBuffer->onNonTFBindingChanged(-1);
>+    mState.mElementArrayBuffer.bind(context, nullptr);
>     mVertexArray->destroy(context);
>     SafeDelete(mVertexArray);
>     delete this;
>@@ -57,12 +160,7 @@ VertexArray::~VertexArray()
>     ASSERT(!mVertexArray);
> }
> 
>-GLuint VertexArray::id() const
>-{
>-    return mId;
>-}
>-
>-void VertexArray::setLabel(const std::string &label)
>+void VertexArray::setLabel(const Context *context, const std::string &label)
> {
>     mState.mLabel = label;
> }
>@@ -72,20 +170,48 @@ const std::string &VertexArray::getLabel() const
>     return mState.mLabel;
> }
> 
>-void VertexArray::detachBuffer(const Context *context, GLuint bufferName)
>+bool VertexArray::detachBuffer(const Context *context, GLuint bufferName)
> {
>-    for (auto &binding : mState.mVertexBindings)
>+    bool isBound = context->isCurrentVertexArray(this);
>+    bool anyBufferDetached = false;
>+    for (size_t bindingIndex = 0; bindingIndex < gl::MAX_VERTEX_ATTRIB_BINDINGS; ++bindingIndex)
>     {
>+        VertexBinding &binding = mState.mVertexBindings[bindingIndex];
>         if (binding.getBuffer().id() == bufferName)
>         {
>+            if (isBound)
>+            {
>+                if (binding.getBuffer().get())
>+                    binding.getBuffer()->onNonTFBindingChanged(-1);
>+            }
>             binding.setBuffer(context, nullptr);
>+            mArrayBufferObserverBindings[bindingIndex].reset();
>+
>+            if (context->getClientVersion() >= ES_3_1)
>+            {
>+                setDirtyBindingBit(bindingIndex, DIRTY_BINDING_BUFFER);
>+            }
>+            else
>+            {
>+                ASSERT(binding.getBoundAttributesMask() == AttributesMask(1ull << bindingIndex));
>+                setDirtyAttribBit(bindingIndex, DIRTY_ATTRIB_POINTER);
>+            }
>+
>+            anyBufferDetached = true;
>+            mState.mClientMemoryAttribsMask |= binding.getBoundAttributesMask();
>         }
>     }
> 
>-    if (mState.mElementArrayBuffer.id() == bufferName)
>+    if (mState.mElementArrayBuffer.get() && mState.mElementArrayBuffer->id() == bufferName)
>     {
>-        mState.mElementArrayBuffer.set(context, nullptr);
>+        if (isBound && mState.mElementArrayBuffer.get())
>+            mState.mElementArrayBuffer->onNonTFBindingChanged(-1);
>+        mState.mElementArrayBuffer.bind(context, nullptr);
>+        mDirtyBits.set(DIRTY_BIT_ELEMENT_ARRAY_BUFFER);
>+        anyBufferDetached = true;
>     }
>+
>+    return anyBufferDetached;
> }
> 
> const VertexAttribute &VertexArray::getVertexAttribute(size_t attribIndex) const
>@@ -105,7 +231,64 @@ size_t VertexArray::GetVertexIndexFromDirtyBit(size_t dirtyBit)
>     static_assert(gl::MAX_VERTEX_ATTRIBS == gl::MAX_VERTEX_ATTRIB_BINDINGS,
>                   "The stride of vertex attributes should equal to that of vertex bindings.");
>     ASSERT(dirtyBit > DIRTY_BIT_ELEMENT_ARRAY_BUFFER);
>-    return (dirtyBit - DIRTY_BIT_ATTRIB_0_ENABLED) % gl::MAX_VERTEX_ATTRIBS;
>+    return (dirtyBit - DIRTY_BIT_ATTRIB_0) % gl::MAX_VERTEX_ATTRIBS;
>+}
>+
>+ANGLE_INLINE void VertexArray::setDirtyAttribBit(size_t attribIndex,
>+                                                 DirtyAttribBitType dirtyAttribBit)
>+{
>+    mDirtyBits.set(DIRTY_BIT_ATTRIB_0 + attribIndex);
>+    mDirtyAttribBits[attribIndex].set(dirtyAttribBit);
>+}
>+
>+ANGLE_INLINE void VertexArray::setDirtyBindingBit(size_t bindingIndex,
>+                                                  DirtyBindingBitType dirtyBindingBit)
>+{
>+    mDirtyBits.set(DIRTY_BIT_BINDING_0 + bindingIndex);
>+    mDirtyBindingBits[bindingIndex].set(dirtyBindingBit);
>+}
>+
>+ANGLE_INLINE void VertexArray::updateCachedBufferBindingSize(const Context *context,
>+                                                             VertexBinding *binding)
>+{
>+    if (!context->isBufferAccessValidationEnabled())
>+        return;
>+
>+    for (size_t boundAttribute : binding->getBoundAttributesMask())
>+    {
>+        mState.mVertexAttributes[boundAttribute].updateCachedElementLimit(*binding);
>+    }
>+}
>+
>+ANGLE_INLINE void VertexArray::updateCachedMappedArrayBuffers(
>+    bool isMapped,
>+    const AttributesMask &boundAttributesMask)
>+{
>+    if (isMapped)
>+    {
>+        mState.mCachedMappedArrayBuffers |= boundAttributesMask;
>+    }
>+    else
>+    {
>+        mState.mCachedMappedArrayBuffers &= ~boundAttributesMask;
>+    }
>+
>+    mState.mCachedEnabledMappedArrayBuffers =
>+        mState.mCachedMappedArrayBuffers & mState.mEnabledAttributesMask;
>+}
>+
>+ANGLE_INLINE void VertexArray::updateCachedMappedArrayBuffersBinding(const VertexBinding &binding)
>+{
>+    const Buffer *buffer = binding.getBuffer().get();
>+    return updateCachedMappedArrayBuffers(buffer && buffer->isMapped(),
>+                                          binding.getBoundAttributesMask());
>+}
>+
>+ANGLE_INLINE void VertexArray::updateCachedTransformFeedbackBindingValidation(size_t bindingIndex,
>+                                                                              const Buffer *buffer)
>+{
>+    const bool hasConflict = buffer && buffer->isBoundForTransformFeedbackAndOtherUse();
>+    mCachedTransformFeedbackConflictedBindingsMask.set(bindingIndex, hasConflict);
> }
> 
> void VertexArray::bindVertexBufferImpl(const Context *context,
>@@ -115,12 +298,44 @@ void VertexArray::bindVertexBufferImpl(const Context *context,
>                                        GLsizei stride)
> {
>     ASSERT(bindingIndex < getMaxBindings());
>+    ASSERT(context->isCurrentVertexArray(this));
> 
>     VertexBinding *binding = &mState.mVertexBindings[bindingIndex];
> 
>-    binding->setBuffer(context, boundBuffer);
>+    Buffer *oldBuffer                = binding->getBuffer().get();
>+    angle::ObserverBinding *observer = &mArrayBufferObserverBindings[bindingIndex];
>+    observer->assignSubject(boundBuffer);
>+
>+    // Several nullptr checks are combined here for optimization purposes.
>+    if (oldBuffer)
>+    {
>+        oldBuffer->onNonTFBindingChanged(-1);
>+        oldBuffer->removeObserver(observer);
>+        oldBuffer->release(context);
>+    }
>+
>+    binding->assignBuffer(boundBuffer);
>     binding->setOffset(offset);
>     binding->setStride(stride);
>+    updateCachedBufferBindingSize(context, binding);
>+
>+    // Update client memory attribute pointers. Affects all bound attributes.
>+    if (boundBuffer)
>+    {
>+        boundBuffer->addRef();
>+        boundBuffer->onNonTFBindingChanged(1);
>+        boundBuffer->addObserver(observer);
>+        mCachedTransformFeedbackConflictedBindingsMask.set(
>+            bindingIndex, boundBuffer->isBoundForTransformFeedbackAndOtherUse());
>+        mState.mClientMemoryAttribsMask &= ~binding->getBoundAttributesMask();
>+        updateCachedMappedArrayBuffers(boundBuffer->isMapped(), binding->getBoundAttributesMask());
>+    }
>+    else
>+    {
>+        mCachedTransformFeedbackConflictedBindingsMask.set(bindingIndex, false);
>+        mState.mClientMemoryAttribsMask |= binding->getBoundAttributesMask();
>+        updateCachedMappedArrayBuffers(false, binding->getBoundAttributesMask());
>+    }
> }
> 
> void VertexArray::bindVertexBuffer(const Context *context,
>@@ -130,8 +345,7 @@ void VertexArray::bindVertexBuffer(const Context *context,
>                                    GLsizei stride)
> {
>     bindVertexBufferImpl(context, bindingIndex, boundBuffer, offset, stride);
>-
>-    mDirtyBits.set(DIRTY_BIT_BINDING_0_BUFFER + bindingIndex);
>+    setDirtyBindingBit(bindingIndex, DIRTY_BINDING_BUFFER);
> }
> 
> void VertexArray::setVertexAttribBinding(const Context *context,
>@@ -144,9 +358,14 @@ void VertexArray::setVertexAttribBinding(const Context *context,
>     {
>         // In ES 3.0 contexts, the binding cannot change, hence the code below is unreachable.
>         ASSERT(context->getClientVersion() >= ES_3_1);
>-        mState.mVertexAttributes[attribIndex].bindingIndex = bindingIndex;
> 
>-        mDirtyBits.set(DIRTY_BIT_ATTRIB_0_BINDING + attribIndex);
>+        mState.setAttribBinding(context, attribIndex, bindingIndex);
>+
>+        setDirtyAttribBit(attribIndex, DIRTY_ATTRIB_BINDING);
>+
>+        // Update client attribs mask.
>+        bool hasBuffer = mState.mVertexBindings[bindingIndex].getBuffer().get() != nullptr;
>+        mState.mClientMemoryAttribsMask.set(attribIndex, !hasBuffer);
>     }
> }
> 
>@@ -154,39 +373,47 @@ void VertexArray::setVertexBindingDivisor(size_t bindingIndex, GLuint divisor)
> {
>     ASSERT(bindingIndex < getMaxBindings());
> 
>-    mState.mVertexBindings[bindingIndex].setDivisor(divisor);
>+    VertexBinding &binding = mState.mVertexBindings[bindingIndex];
>+
>+    binding.setDivisor(divisor);
>+    setDirtyBindingBit(bindingIndex, DIRTY_BINDING_DIVISOR);
> 
>-    mDirtyBits.set(DIRTY_BIT_BINDING_0_DIVISOR + bindingIndex);
>+    // Trigger updates in all bound attributes.
>+    for (size_t attribIndex : binding.getBoundAttributesMask())
>+    {
>+        mState.mVertexAttributes[attribIndex].updateCachedElementLimit(binding);
>+    }
> }
> 
>-void VertexArray::setVertexAttribFormatImpl(size_t attribIndex,
>-                                            GLint size,
>-                                            GLenum type,
>-                                            bool normalized,
>-                                            bool pureInteger,
>-                                            GLuint relativeOffset)
>+ANGLE_INLINE void VertexArray::setVertexAttribFormatImpl(VertexAttribute *attrib,
>+                                                         GLint size,
>+                                                         VertexAttribType type,
>+                                                         bool normalized,
>+                                                         GLuint relativeOffset)
> {
>-    ASSERT(attribIndex < getMaxAttribs());
>-
>-    VertexAttribute *attrib = &mState.mVertexAttributes[attribIndex];
>-
>     attrib->size           = size;
>     attrib->type           = type;
>     attrib->normalized     = normalized;
>-    attrib->pureInteger    = pureInteger;
>     attrib->relativeOffset = relativeOffset;
> }
> 
> void VertexArray::setVertexAttribFormat(size_t attribIndex,
>                                         GLint size,
>-                                        GLenum type,
>+                                        VertexAttribType type,
>                                         bool normalized,
>                                         bool pureInteger,
>                                         GLuint relativeOffset)
> {
>-    setVertexAttribFormatImpl(attribIndex, size, type, normalized, pureInteger, relativeOffset);
>+    VertexAttribute &attrib = mState.mVertexAttributes[attribIndex];
>+    attrib.pureInteger      = pureInteger;
> 
>-    mDirtyBits.set(DIRTY_BIT_ATTRIB_0_FORMAT + attribIndex);
>+    ComponentType componentType = GetVertexAttributeComponentType(pureInteger, type);
>+    SetComponentTypeMask(componentType, attribIndex, &mState.mVertexAttributesTypeMask);
>+
>+    setVertexAttribFormatImpl(&attrib, size, type, normalized, relativeOffset);
>+    setDirtyAttribBit(attribIndex, DIRTY_ATTRIB_FORMAT);
>+
>+    attrib.updateCachedElementLimit(mState.mVertexBindings[attrib.bindingIndex]);
> }
> 
> void VertexArray::setVertexAttribDivisor(const Context *context, size_t attribIndex, GLuint divisor)
>@@ -201,43 +428,45 @@ void VertexArray::enableAttribute(size_t attribIndex, bool enabledState)
> {
>     ASSERT(attribIndex < getMaxAttribs());
> 
>-    mState.mVertexAttributes[attribIndex].enabled = enabledState;
>-
>-    mDirtyBits.set(DIRTY_BIT_ATTRIB_0_ENABLED + attribIndex);
>+    VertexAttribute &attrib = mState.mVertexAttributes[attribIndex];
> 
>-    // Update state cache
>-    if (enabledState)
>+    if (mState.mEnabledAttributesMask.test(attribIndex) == enabledState)
>     {
>-        mState.mMaxEnabledAttribute = std::max(attribIndex + 1, mState.mMaxEnabledAttribute);
>-    }
>-    else if (mState.mMaxEnabledAttribute == attribIndex + 1)
>-    {
>-        while (mState.mMaxEnabledAttribute > 0 &&
>-               !mState.mVertexAttributes[mState.mMaxEnabledAttribute - 1].enabled)
>-        {
>-            --mState.mMaxEnabledAttribute;
>-        }
>+        return;
>     }
>+
>+    attrib.enabled = enabledState;
>+
>+    setDirtyAttribBit(attribIndex, DIRTY_ATTRIB_ENABLED);
>+
>+    // Update state cache
>+    mState.mEnabledAttributesMask.set(attribIndex, enabledState);
>+    mState.mCachedEnabledMappedArrayBuffers =
>+        mState.mCachedMappedArrayBuffers & mState.mEnabledAttributesMask;
> }
> 
>-void VertexArray::setVertexAttribPointer(const Context *context,
>-                                         size_t attribIndex,
>-                                         gl::Buffer *boundBuffer,
>-                                         GLint size,
>-                                         GLenum type,
>-                                         bool normalized,
>-                                         bool pureInteger,
>-                                         GLsizei stride,
>-                                         const void *pointer)
>+ANGLE_INLINE void VertexArray::setVertexAttribPointerImpl(const Context *context,
>+                                                          ComponentType componentType,
>+                                                          bool pureInteger,
>+                                                          size_t attribIndex,
>+                                                          Buffer *boundBuffer,
>+                                                          GLint size,
>+                                                          VertexAttribType type,
>+                                                          bool normalized,
>+                                                          GLsizei stride,
>+                                                          const void *pointer)
> {
>     ASSERT(attribIndex < getMaxAttribs());
> 
>     GLintptr offset = boundBuffer ? reinterpret_cast<GLintptr>(pointer) : 0;
> 
>-    setVertexAttribFormatImpl(attribIndex, size, type, normalized, pureInteger, 0);
>-    setVertexAttribBinding(context, attribIndex, static_cast<GLuint>(attribIndex));
>-
>     VertexAttribute &attrib = mState.mVertexAttributes[attribIndex];
>+    attrib.pureInteger      = pureInteger;
>+
>+    SetComponentTypeMask(componentType, attribIndex, &mState.mVertexAttributesTypeMask);
>+
>+    setVertexAttribFormatImpl(&attrib, size, type, normalized, 0);
>+    setVertexAttribBinding(context, attribIndex, static_cast<GLuint>(attribIndex));
> 
>     GLsizei effectiveStride =
>         stride != 0 ? stride : static_cast<GLsizei>(ComputeVertexAttributeTypeSize(attrib));
>@@ -246,22 +475,201 @@ void VertexArray::setVertexAttribPointer(const Context *context,
> 
>     bindVertexBufferImpl(context, attribIndex, boundBuffer, offset, effectiveStride);
> 
>-    mDirtyBits.set(DIRTY_BIT_ATTRIB_0_POINTER + attribIndex);
>+    setDirtyAttribBit(attribIndex, DIRTY_ATTRIB_POINTER);
>+
>+    mState.mNullPointerClientMemoryAttribsMask.set(attribIndex,
>+                                                   boundBuffer == nullptr && pointer == nullptr);
> }
> 
>-void VertexArray::setElementArrayBuffer(const Context *context, Buffer *buffer)
>+void VertexArray::setVertexAttribPointer(const Context *context,
>+                                         size_t attribIndex,
>+                                         gl::Buffer *boundBuffer,
>+                                         GLint size,
>+                                         VertexAttribType type,
>+                                         bool normalized,
>+                                         GLsizei stride,
>+                                         const void *pointer)
>+{
>+    setVertexAttribPointerImpl(context, ComponentType::Float, false, attribIndex, boundBuffer, size,
>+                               type, normalized, stride, pointer);
>+}
>+
>+void VertexArray::setVertexAttribIPointer(const Context *context,
>+                                          size_t attribIndex,
>+                                          gl::Buffer *boundBuffer,
>+                                          GLint size,
>+                                          VertexAttribType type,
>+                                          GLsizei stride,
>+                                          const void *pointer)
> {
>-    mState.mElementArrayBuffer.set(context, buffer);
>-    mDirtyBits.set(DIRTY_BIT_ELEMENT_ARRAY_BUFFER);
>+    ComponentType componentType = GetVertexAttributeComponentType(true, type);
>+    setVertexAttribPointerImpl(context, componentType, true, attribIndex, boundBuffer, size, type,
>+                               false, stride, pointer);
> }
> 
>-void VertexArray::syncState(const Context *context)
>+angle::Result VertexArray::syncState(const Context *context)
> {
>     if (mDirtyBits.any())
>     {
>-        mVertexArray->syncState(context, mDirtyBits);
>+        mDirtyBitsGuard = mDirtyBits;
>+        ANGLE_TRY(
>+            mVertexArray->syncState(context, mDirtyBits, &mDirtyAttribBits, &mDirtyBindingBits));
>         mDirtyBits.reset();
>+        mDirtyBitsGuard.reset();
>+
>+        // The dirty bits should be reset in the back-end. To simplify ASSERTs only check attrib 0.
>+        ASSERT(mDirtyAttribBits[0].none());
>+        ASSERT(mDirtyBindingBits[0].none());
>+    }
>+    return angle::Result::Continue;
>+}
>+
>+void VertexArray::onBindingChanged(const Context *context, int incr)
>+{
>+    if (mState.mElementArrayBuffer.get())
>+        mState.mElementArrayBuffer->onNonTFBindingChanged(incr);
>+    for (auto &binding : mState.mVertexBindings)
>+    {
>+        binding.onContainerBindingChanged(context, incr);
>+    }
>+}
>+
>+VertexArray::DirtyBitType VertexArray::getDirtyBitFromIndex(bool contentsChanged,
>+                                                            angle::SubjectIndex index) const
>+{
>+    if (IsElementArrayBufferSubjectIndex(index))
>+    {
>+        mIndexRangeCache.invalidate();
>+        return contentsChanged ? DIRTY_BIT_ELEMENT_ARRAY_BUFFER_DATA
>+                               : DIRTY_BIT_ELEMENT_ARRAY_BUFFER;
>+    }
>+    else
>+    {
>+        // Note: this currently just gets the top-level dirty bit.
>+        ASSERT(index < mArrayBufferObserverBindings.size());
>+        return static_cast<DirtyBitType>(
>+            (contentsChanged ? DIRTY_BIT_BUFFER_DATA_0 : DIRTY_BIT_BINDING_0) + index);
>+    }
>+}
>+
>+void VertexArray::onSubjectStateChange(const gl::Context *context,
>+                                       angle::SubjectIndex index,
>+                                       angle::SubjectMessage message)
>+{
>+    switch (message)
>+    {
>+        case angle::SubjectMessage::CONTENTS_CHANGED:
>+            setDependentDirtyBit(context, true, index);
>+            break;
>+
>+        case angle::SubjectMessage::STORAGE_CHANGED:
>+            if (!IsElementArrayBufferSubjectIndex(index))
>+            {
>+                updateCachedBufferBindingSize(context, &mState.mVertexBindings[index]);
>+            }
>+            setDependentDirtyBit(context, false, index);
>+            break;
>+
>+        case angle::SubjectMessage::BINDING_CHANGED:
>+            if (!IsElementArrayBufferSubjectIndex(index))
>+            {
>+                const Buffer *buffer = mState.mVertexBindings[index].getBuffer().get();
>+                updateCachedTransformFeedbackBindingValidation(index, buffer);
>+            }
>+            break;
>+
>+        case angle::SubjectMessage::RESOURCE_MAPPED:
>+            if (!IsElementArrayBufferSubjectIndex(index))
>+            {
>+                updateCachedMappedArrayBuffersBinding(mState.mVertexBindings[index]);
>+            }
>+            onStateChange(context, angle::SubjectMessage::RESOURCE_MAPPED);
>+            break;
>+
>+        case angle::SubjectMessage::RESOURCE_UNMAPPED:
>+            setDependentDirtyBit(context, true, index);
>+
>+            if (!IsElementArrayBufferSubjectIndex(index))
>+            {
>+                updateCachedMappedArrayBuffersBinding(mState.mVertexBindings[index]);
>+            }
>+            onStateChange(context, angle::SubjectMessage::RESOURCE_UNMAPPED);
>+            break;
>+
>+        default:
>+            UNREACHABLE();
>+            break;
>+    }
>+}
>+
>+void VertexArray::setDependentDirtyBit(const gl::Context *context,
>+                                       bool contentsChanged,
>+                                       angle::SubjectIndex index)
>+{
>+    DirtyBitType dirtyBit = getDirtyBitFromIndex(contentsChanged, index);
>+    ASSERT(!mDirtyBitsGuard.valid() || mDirtyBitsGuard.value().test(dirtyBit));
>+    mDirtyBits.set(dirtyBit);
>+    onStateChange(context, angle::SubjectMessage::CONTENTS_CHANGED);
>+}
>+
>+bool VertexArray::hasTransformFeedbackBindingConflict(const gl::Context *context) const
>+{
>+    // Fast check first.
>+    if (!mCachedTransformFeedbackConflictedBindingsMask.any())
>+    {
>+        return false;
>     }
>+
>+    const AttributesMask &activeAttribues = context->getStateCache().getActiveBufferedAttribsMask();
>+
>+    // Slow check. We must ensure that the conflicting attributes are enabled/active.
>+    for (size_t attribIndex : activeAttribues)
>+    {
>+        const VertexAttribute &attrib = mState.mVertexAttributes[attribIndex];
>+        if (mCachedTransformFeedbackConflictedBindingsMask[attrib.bindingIndex])
>+        {
>+            return true;
>+        }
>+    }
>+
>+    return false;
> }
> 
>+angle::Result VertexArray::getIndexRangeImpl(const Context *context,
>+                                             DrawElementsType type,
>+                                             GLsizei indexCount,
>+                                             const void *indices,
>+                                             IndexRange *indexRangeOut) const
>+{
>+    Buffer *elementArrayBuffer = mState.mElementArrayBuffer.get();
>+    if (!elementArrayBuffer)
>+    {
>+        *indexRangeOut = ComputeIndexRange(type, indices, indexCount,
>+                                           context->getState().isPrimitiveRestartEnabled());
>+        return angle::Result::Continue;
>+    }
>+
>+    size_t offset = reinterpret_cast<uintptr_t>(indices);
>+    ANGLE_TRY(elementArrayBuffer->getIndexRange(context, type, offset, indexCount,
>+                                                context->getState().isPrimitiveRestartEnabled(),
>+                                                indexRangeOut));
>+
>+    mIndexRangeCache.put(type, indexCount, offset, *indexRangeOut);
>+    return angle::Result::Continue;
>+}
>+
>+VertexArray::IndexRangeCache::IndexRangeCache() = default;
>+
>+void VertexArray::IndexRangeCache::put(DrawElementsType type,
>+                                       GLsizei indexCount,
>+                                       size_t offset,
>+                                       const IndexRange &indexRange)
>+{
>+    ASSERT(type != DrawElementsType::InvalidEnum);
>+
>+    mTypeKey       = type;
>+    mIndexCountKey = indexCount;
>+    mOffsetKey     = offset;
>+    mPayload       = indexRange;
>+}
> }  // namespace gl
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/VertexArray.h b/Source/ThirdParty/ANGLE/src/libANGLE/VertexArray.h
>index f82ec789f0d..3687501f1b8 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/VertexArray.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/VertexArray.h
>@@ -13,10 +13,11 @@
> #ifndef LIBANGLE_VERTEXARRAY_H_
> #define LIBANGLE_VERTEXARRAY_H_
> 
>-#include "libANGLE/RefCountObject.h"
>+#include "common/Optional.h"
> #include "libANGLE/Constants.h"
> #include "libANGLE/Debug.h"
>-#include "libANGLE/State.h"
>+#include "libANGLE/Observer.h"
>+#include "libANGLE/RefCountObject.h"
> #include "libANGLE/VertexAttribute.h"
> 
> #include <vector>
>@@ -34,15 +35,15 @@ class Buffer;
> class VertexArrayState final : angle::NonCopyable
> {
>   public:
>-    VertexArrayState(size_t maxAttribs, size_t maxBindings);
>+    VertexArrayState(VertexArray *vertexArray, size_t maxAttribs, size_t maxBindings);
>     ~VertexArrayState();
> 
>     const std::string &getLabel() const { return mLabel; }
> 
>-    const BindingPointer<Buffer> &getElementArrayBuffer() const { return mElementArrayBuffer; }
>+    Buffer *getElementArrayBuffer() const { return mElementArrayBuffer.get(); }
>     size_t getMaxAttribs() const { return mVertexAttributes.size(); }
>     size_t getMaxBindings() const { return mVertexBindings.size(); }
>-    size_t getMaxEnabledAttribute() const { return mMaxEnabledAttribute; }
>+    const AttributesMask &getEnabledAttributesMask() const { return mEnabledAttributesMask; }
>     const std::vector<VertexAttribute> &getVertexAttributes() const { return mVertexAttributes; }
>     const VertexAttribute &getVertexAttribute(size_t attribIndex) const
>     {
>@@ -62,25 +63,50 @@ class VertexArrayState final : angle::NonCopyable
>         return mVertexAttributes[attribIndex].bindingIndex;
>     }
> 
>+    void setAttribBinding(const Context *context, size_t attribIndex, GLuint newBindingIndex);
>+
>+    // Extra validation performed on the Vertex Array.
>+    bool hasEnabledNullPointerClientArray() const;
>+
>+    // Get all the attributes in an AttributesMask that are using the given binding.
>+    AttributesMask getBindingToAttributesMask(GLuint bindingIndex) const;
>+
>   private:
>     friend class VertexArray;
>     std::string mLabel;
>     std::vector<VertexAttribute> mVertexAttributes;
>-    BindingPointer<Buffer> mElementArrayBuffer;
>+    SubjectBindingPointer<Buffer> mElementArrayBuffer;
>     std::vector<VertexBinding> mVertexBindings;
>-    size_t mMaxEnabledAttribute;
>+    AttributesMask mEnabledAttributesMask;
>+    ComponentTypeMask mVertexAttributesTypeMask;
>+
>+    // This is a performance optimization for buffer binding. Allows element array buffer updates.
>+    friend class State;
>+
>+    // From the GLES 3.1 spec:
>+    // When a generic attribute array is sourced from client memory, the vertex attribute binding
>+    // state is ignored. Thus we don't have to worry about binding state when using client memory
>+    // attribs.
>+    gl::AttributesMask mClientMemoryAttribsMask;
>+    gl::AttributesMask mNullPointerClientMemoryAttribsMask;
>+
>+    // Used for validation cache. Indexed by attribute.
>+    AttributesMask mCachedMappedArrayBuffers;
>+    AttributesMask mCachedEnabledMappedArrayBuffers;
> };
> 
>-class VertexArray final : public LabeledObject
>+class VertexArray final : public angle::ObserverInterface,
>+                          public LabeledObject,
>+                          public angle::Subject
> {
>   public:
>     VertexArray(rx::GLImplFactory *factory, GLuint id, size_t maxAttribs, size_t maxAttribBindings);
> 
>     void onDestroy(const Context *context);
> 
>-    GLuint id() const;
>+    GLuint id() const { return mId; }
> 
>-    void setLabel(const std::string &label) override;
>+    void setLabel(const Context *context, const std::string &label) override;
>     const std::string &getLabel() const override;
> 
>     const VertexBinding &getVertexBinding(size_t bindingIndex) const;
>@@ -90,21 +116,32 @@ class VertexArray final : public LabeledObject
>         return mState.getBindingFromAttribIndex(attribIndex);
>     }
> 
>-    void detachBuffer(const Context *context, GLuint bufferName);
>+    // Returns true if the function finds and detaches a bound buffer.
>+    bool detachBuffer(const Context *context, GLuint bufferName);
>+
>     void setVertexAttribDivisor(const Context *context, size_t index, GLuint divisor);
>     void enableAttribute(size_t attribIndex, bool enabledState);
>+
>     void setVertexAttribPointer(const Context *context,
>                                 size_t attribIndex,
>                                 Buffer *boundBuffer,
>                                 GLint size,
>-                                GLenum type,
>+                                VertexAttribType type,
>                                 bool normalized,
>-                                bool pureInteger,
>                                 GLsizei stride,
>                                 const void *pointer);
>+
>+    void setVertexAttribIPointer(const Context *context,
>+                                 size_t attribIndex,
>+                                 Buffer *boundBuffer,
>+                                 GLint size,
>+                                 VertexAttribType type,
>+                                 GLsizei stride,
>+                                 const void *pointer);
>+
>     void setVertexAttribFormat(size_t attribIndex,
>                                GLint size,
>-                               GLenum type,
>+                               VertexAttribType type,
>                                bool normalized,
>                                bool pureInteger,
>                                GLuint relativeOffset);
>@@ -115,11 +152,10 @@ class VertexArray final : public LabeledObject
>                           GLsizei stride);
>     void setVertexAttribBinding(const Context *context, size_t attribIndex, GLuint bindingIndex);
>     void setVertexBindingDivisor(size_t bindingIndex, GLuint divisor);
>-    void setVertexAttribFormatImpl(size_t attribIndex,
>+    void setVertexAttribFormatImpl(VertexAttribute *attrib,
>                                    GLint size,
>-                                   GLenum type,
>+                                   VertexAttribType type,
>                                    bool normalized,
>-                                   bool pureInteger,
>                                    GLuint relativeOffset);
>     void bindVertexBufferImpl(const Context *context,
>                               size_t bindingIndex,
>@@ -127,12 +163,7 @@ class VertexArray final : public LabeledObject
>                               GLintptr offset,
>                               GLsizei stride);
> 
>-    void setElementArrayBuffer(const Context *context, Buffer *buffer);
>-
>-    const BindingPointer<Buffer> &getElementArrayBuffer() const
>-    {
>-        return mState.getElementArrayBuffer();
>-    }
>+    Buffer *getElementArrayBuffer() const { return mState.getElementArrayBuffer(); }
>     size_t getMaxAttribs() const { return mState.getMaxAttribs(); }
>     size_t getMaxBindings() const { return mState.getMaxBindings(); }
> 
>@@ -147,59 +178,196 @@ class VertexArray final : public LabeledObject
> 
>     rx::VertexArrayImpl *getImplementation() const { return mVertexArray; }
> 
>-    size_t getMaxEnabledAttribute() const { return mState.getMaxEnabledAttribute(); }
>+    const AttributesMask &getEnabledAttributesMask() const
>+    {
>+        return mState.getEnabledAttributesMask();
>+    }
>+
>+    gl::AttributesMask getClientAttribsMask() const { return mState.mClientMemoryAttribsMask; }
>+
>+    bool hasEnabledNullPointerClientArray() const
>+    {
>+        return mState.hasEnabledNullPointerClientArray();
>+    }
>+
>+    bool hasMappedEnabledArrayBuffer() const
>+    {
>+        return mState.mCachedEnabledMappedArrayBuffers.any();
>+    }
> 
>+    // Observer implementation
>+    void onSubjectStateChange(const gl::Context *context,
>+                              angle::SubjectIndex index,
>+                              angle::SubjectMessage message) override;
>+
>+    // Dirty bits for VertexArrays use a heirarchical design. At the top level, each attribute
>+    // has a single dirty bit. Then an array of MAX_ATTRIBS dirty bits each has a dirty bit for
>+    // enabled/pointer/format/binding. Bindings are handled similarly. Note that because the
>+    // total number of dirty bits is 33, it will not be as fast on a 32-bit machine, which
>+    // can't support the advanced 64-bit scanning intrinsics. We could consider packing the
>+    // binding and attribute bits together if this becomes a problem.
>     enum DirtyBitType
>     {
>         DIRTY_BIT_ELEMENT_ARRAY_BUFFER,
>+        DIRTY_BIT_ELEMENT_ARRAY_BUFFER_DATA,
> 
>-        // Reserve bits for enabled flags
>-        DIRTY_BIT_ATTRIB_0_ENABLED,
>-        DIRTY_BIT_ATTRIB_MAX_ENABLED = DIRTY_BIT_ATTRIB_0_ENABLED + gl::MAX_VERTEX_ATTRIBS,
>+        // Dirty bits for attributes.
>+        DIRTY_BIT_ATTRIB_0,
>+        DIRTY_BIT_ATTRIB_MAX = DIRTY_BIT_ATTRIB_0 + gl::MAX_VERTEX_ATTRIBS,
> 
>-        // Reserve bits for attrib pointers
>-        DIRTY_BIT_ATTRIB_0_POINTER   = DIRTY_BIT_ATTRIB_MAX_ENABLED,
>-        DIRTY_BIT_ATTRIB_MAX_POINTER = DIRTY_BIT_ATTRIB_0_POINTER + gl::MAX_VERTEX_ATTRIBS,
>+        // Dirty bits for bindings.
>+        DIRTY_BIT_BINDING_0   = DIRTY_BIT_ATTRIB_MAX,
>+        DIRTY_BIT_BINDING_MAX = DIRTY_BIT_BINDING_0 + gl::MAX_VERTEX_ATTRIB_BINDINGS,
> 
>-        // Reserve bits for changes to VertexAttribFormat
>-        DIRTY_BIT_ATTRIB_0_FORMAT   = DIRTY_BIT_ATTRIB_MAX_POINTER,
>-        DIRTY_BIT_ATTRIB_MAX_FORMAT = DIRTY_BIT_ATTRIB_0_FORMAT + gl::MAX_VERTEX_ATTRIBS,
>+        // We keep separate dirty bits for bound buffers whose data changed since last update.
>+        DIRTY_BIT_BUFFER_DATA_0   = DIRTY_BIT_BINDING_MAX,
>+        DIRTY_BIT_BUFFER_DATA_MAX = DIRTY_BIT_BUFFER_DATA_0 + gl::MAX_VERTEX_ATTRIB_BINDINGS,
> 
>-        // Reserve bits for changes to VertexAttribBinding
>-        DIRTY_BIT_ATTRIB_0_BINDING   = DIRTY_BIT_ATTRIB_MAX_FORMAT,
>-        DIRTY_BIT_ATTRIB_MAX_BINDING = DIRTY_BIT_ATTRIB_0_BINDING + gl::MAX_VERTEX_ATTRIBS,
>+        DIRTY_BIT_UNKNOWN = DIRTY_BIT_BUFFER_DATA_MAX,
>+        DIRTY_BIT_MAX     = DIRTY_BIT_UNKNOWN,
>+    };
> 
>-        // Reserve bits for changes to BindVertexBuffer
>-        DIRTY_BIT_BINDING_0_BUFFER   = DIRTY_BIT_ATTRIB_MAX_BINDING,
>-        DIRTY_BIT_BINDING_MAX_BUFFER = DIRTY_BIT_BINDING_0_BUFFER + gl::MAX_VERTEX_ATTRIB_BINDINGS,
>+    // We want to keep the number of dirty bits within 64 to keep iteration times fast.
>+    static_assert(DIRTY_BIT_MAX <= 64, "Too many vertex array dirty bits.");
> 
>-        // Reserve bits for binding divisors
>-        DIRTY_BIT_BINDING_0_DIVISOR = DIRTY_BIT_BINDING_MAX_BUFFER,
>-        DIRTY_BIT_BINDING_MAX_DIVISOR =
>-            DIRTY_BIT_BINDING_0_DIVISOR + gl::MAX_VERTEX_ATTRIB_BINDINGS,
>+    enum DirtyAttribBitType
>+    {
>+        DIRTY_ATTRIB_ENABLED,
>+        DIRTY_ATTRIB_POINTER,
>+        DIRTY_ATTRIB_FORMAT,
>+        DIRTY_ATTRIB_BINDING,
>+        DIRTY_ATTRIB_UNKNOWN,
>+        DIRTY_ATTRIB_MAX = DIRTY_ATTRIB_UNKNOWN,
>+    };
> 
>-        DIRTY_BIT_UNKNOWN = DIRTY_BIT_BINDING_MAX_DIVISOR,
>-        DIRTY_BIT_MAX     = DIRTY_BIT_UNKNOWN,
>+    enum DirtyBindingBitType
>+    {
>+        DIRTY_BINDING_BUFFER,
>+        DIRTY_BINDING_DIVISOR,
>+        DIRTY_BINDING_UNKNOWN,
>+        DIRTY_BINDING_MAX = DIRTY_BINDING_UNKNOWN,
>     };
> 
>-    using DirtyBits = angle::BitSet<DIRTY_BIT_MAX>;
>+    using DirtyBits             = angle::BitSet<DIRTY_BIT_MAX>;
>+    using DirtyAttribBits       = angle::BitSet<DIRTY_ATTRIB_MAX>;
>+    using DirtyBindingBits      = angle::BitSet<DIRTY_BINDING_MAX>;
>+    using DirtyAttribBitsArray  = std::array<DirtyAttribBits, gl::MAX_VERTEX_ATTRIBS>;
>+    using DirtyBindingBitsArray = std::array<DirtyBindingBits, gl::MAX_VERTEX_ATTRIB_BINDINGS>;
> 
>     static size_t GetVertexIndexFromDirtyBit(size_t dirtyBit);
> 
>-    void syncState(const Context *context);
>+    angle::Result syncState(const Context *context);
>     bool hasAnyDirtyBit() const { return mDirtyBits.any(); }
> 
>+    ComponentTypeMask getAttributesTypeMask() const { return mState.mVertexAttributesTypeMask; }
>+    AttributesMask getAttributesMask() const { return mState.mEnabledAttributesMask; }
>+
>+    void onBindingChanged(const Context *context, int incr);
>+    bool hasTransformFeedbackBindingConflict(const gl::Context *context) const;
>+
>+    ANGLE_INLINE angle::Result getIndexRange(const Context *context,
>+                                             DrawElementsType type,
>+                                             GLsizei indexCount,
>+                                             const void *indices,
>+                                             IndexRange *indexRangeOut) const
>+    {
>+        Buffer *elementArrayBuffer = mState.mElementArrayBuffer.get();
>+        if (elementArrayBuffer && mIndexRangeCache.get(type, indexCount, indices, indexRangeOut))
>+        {
>+            return angle::Result::Continue;
>+        }
>+
>+        return getIndexRangeImpl(context, type, indexCount, indices, indexRangeOut);
>+    }
>+
>   private:
>     ~VertexArray() override;
> 
>+    // This is a performance optimization for buffer binding. Allows element array buffer updates.
>+    friend class State;
>+
>+    void setDirtyAttribBit(size_t attribIndex, DirtyAttribBitType dirtyAttribBit);
>+    void setDirtyBindingBit(size_t bindingIndex, DirtyBindingBitType dirtyBindingBit);
>+
>+    DirtyBitType getDirtyBitFromIndex(bool contentsChanged, angle::SubjectIndex index) const;
>+    void setDependentDirtyBit(const gl::Context *context,
>+                              bool contentsChanged,
>+                              angle::SubjectIndex index);
>+
>+    // These are used to optimize draw call validation.
>+    void updateCachedBufferBindingSize(const Context *context, VertexBinding *binding);
>+    void updateCachedTransformFeedbackBindingValidation(size_t bindingIndex, const Buffer *buffer);
>+    void updateCachedMappedArrayBuffers(bool isMapped, const AttributesMask &boundAttributesMask);
>+    void updateCachedMappedArrayBuffersBinding(const VertexBinding &binding);
>+
>+    angle::Result getIndexRangeImpl(const Context *context,
>+                                    DrawElementsType type,
>+                                    GLsizei indexCount,
>+                                    const void *indices,
>+                                    IndexRange *indexRangeOut) const;
>+
>+    void setVertexAttribPointerImpl(const Context *context,
>+                                    ComponentType componentType,
>+                                    bool pureInteger,
>+                                    size_t attribIndex,
>+                                    Buffer *boundBuffer,
>+                                    GLint size,
>+                                    VertexAttribType type,
>+                                    bool normalized,
>+                                    GLsizei stride,
>+                                    const void *pointer);
>+
>     GLuint mId;
> 
>     VertexArrayState mState;
>     DirtyBits mDirtyBits;
>+    DirtyAttribBitsArray mDirtyAttribBits;
>+    DirtyBindingBitsArray mDirtyBindingBits;
>+    Optional<DirtyBits> mDirtyBitsGuard;
> 
>     rx::VertexArrayImpl *mVertexArray;
>+
>+    std::vector<angle::ObserverBinding> mArrayBufferObserverBindings;
>+
>+    AttributesMask mCachedTransformFeedbackConflictedBindingsMask;
>+
>+    class IndexRangeCache final : angle::NonCopyable
>+    {
>+      public:
>+        IndexRangeCache();
>+
>+        void invalidate() { mTypeKey = DrawElementsType::InvalidEnum; }
>+
>+        bool get(DrawElementsType type,
>+                 GLsizei indexCount,
>+                 const void *indices,
>+                 IndexRange *indexRangeOut)
>+        {
>+            size_t offset = reinterpret_cast<uintptr_t>(indices);
>+            if (mTypeKey == type && mIndexCountKey == indexCount && mOffsetKey == offset)
>+            {
>+                *indexRangeOut = mPayload;
>+                return true;
>+            }
>+
>+            return false;
>+        }
>+
>+        void put(DrawElementsType type,
>+                 GLsizei indexCount,
>+                 size_t offset,
>+                 const IndexRange &indexRange);
>+
>+      private:
>+        DrawElementsType mTypeKey;
>+        GLsizei mIndexCountKey;
>+        size_t mOffsetKey;
>+        IndexRange mPayload;
>+    };
>+
>+    mutable IndexRangeCache mIndexRangeCache;
> };
> 
> }  // namespace gl
> 
>-#endif // LIBANGLE_VERTEXARRAY_H_
>+#endif  // LIBANGLE_VERTEXARRAY_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/VertexArray_unittest.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/VertexArray_unittest.cpp
>index bf210b6b9cb..a3216cc1457 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/VertexArray_unittest.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/VertexArray_unittest.cpp
>@@ -19,7 +19,7 @@ using namespace gl;
> TEST(VertexArrayTest, VerifyGetIndexFromDirtyBit)
> {
>     VertexArray::DirtyBits dirtyBits;
>-    constexpr size_t bits[] = {1, 4, 9, 16, 25, 36, 49, 64, 81, 92};
>+    constexpr size_t bits[] = {1, 4, 9, 16, 25, 35};
>     constexpr GLint count   = sizeof(bits) / sizeof(size_t);
>     for (GLint i = 0; i < count; i++)
>     {
>@@ -29,29 +29,21 @@ TEST(VertexArrayTest, VerifyGetIndexFromDirtyBit)
>     for (size_t dirtyBit : dirtyBits)
>     {
>         const size_t index = VertexArray::GetVertexIndexFromDirtyBit(dirtyBit);
>-        if (dirtyBit < VertexArray::DIRTY_BIT_ATTRIB_MAX_ENABLED)
>+        if (dirtyBit < VertexArray::DIRTY_BIT_ATTRIB_0)
>         {
>-            EXPECT_EQ(dirtyBit - VertexArray::DIRTY_BIT_ATTRIB_0_ENABLED, index);
>+            continue;
>         }
>-        else if (dirtyBit < VertexArray::DIRTY_BIT_ATTRIB_MAX_POINTER)
>+        else if (dirtyBit < VertexArray::DIRTY_BIT_ATTRIB_MAX)
>         {
>-            EXPECT_EQ(dirtyBit - VertexArray::DIRTY_BIT_ATTRIB_0_POINTER, index);
>+            EXPECT_EQ(dirtyBit - VertexArray::DIRTY_BIT_ATTRIB_0, index);
>         }
>-        else if (dirtyBit < VertexArray::DIRTY_BIT_ATTRIB_MAX_FORMAT)
>+        else if (dirtyBit < VertexArray::DIRTY_BIT_BINDING_MAX)
>         {
>-            EXPECT_EQ(dirtyBit - VertexArray::DIRTY_BIT_ATTRIB_0_FORMAT, index);
>+            EXPECT_EQ(dirtyBit - VertexArray::DIRTY_BIT_BINDING_0, index);
>         }
>-        else if (dirtyBit < VertexArray::DIRTY_BIT_ATTRIB_MAX_BINDING)
>+        else if (dirtyBit < VertexArray::DIRTY_BIT_BUFFER_DATA_MAX)
>         {
>-            EXPECT_EQ(dirtyBit - VertexArray::DIRTY_BIT_ATTRIB_0_BINDING, index);
>-        }
>-        else if (dirtyBit < VertexArray::DIRTY_BIT_BINDING_MAX_BUFFER)
>-        {
>-            EXPECT_EQ(dirtyBit - VertexArray::DIRTY_BIT_BINDING_0_BUFFER, index);
>-        }
>-        else if (dirtyBit < VertexArray::DIRTY_BIT_BINDING_MAX_DIVISOR)
>-        {
>-            EXPECT_EQ(dirtyBit - VertexArray::DIRTY_BIT_BINDING_0_DIVISOR, index);
>+            EXPECT_EQ(dirtyBit - VertexArray::DIRTY_BIT_BUFFER_DATA_0, index);
>         }
>         else
>             ASSERT_TRUE(false);
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/VertexAttribute.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/VertexAttribute.cpp
>index 20f7452fa53..857f2e5eb30 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/VertexAttribute.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/VertexAttribute.cpp
>@@ -13,8 +13,11 @@ namespace gl
> 
> // [OpenGL ES 3.1] (November 3, 2016) Section 20 Page 361
> // Table 20.2: Vertex Array Object State
>-VertexBinding::VertexBinding() : mStride(16u), mDivisor(0), mOffset(0)
>+VertexBinding::VertexBinding() : VertexBinding(0) {}
>+
>+VertexBinding::VertexBinding(GLuint boundAttribute) : mStride(16u), mDivisor(0), mOffset(0)
> {
>+    mBoundAttributesMask.set(boundAttribute);
> }
> 
> VertexBinding::VertexBinding(VertexBinding &&binding)
>@@ -22,34 +25,39 @@ VertexBinding::VertexBinding(VertexBinding &&binding)
>     *this = std::move(binding);
> }
> 
>-VertexBinding::~VertexBinding()
>-{
>-}
>+VertexBinding::~VertexBinding() {}
> 
> VertexBinding &VertexBinding::operator=(VertexBinding &&binding)
> {
>     if (this != &binding)
>     {
>-        mStride  = binding.mStride;
>-        mDivisor = binding.mDivisor;
>-        mOffset  = binding.mOffset;
>+        mStride              = binding.mStride;
>+        mDivisor             = binding.mDivisor;
>+        mOffset              = binding.mOffset;
>+        mBoundAttributesMask = binding.mBoundAttributesMask;
>         std::swap(binding.mBuffer, mBuffer);
>     }
>     return *this;
> }
> 
>+void VertexBinding::onContainerBindingChanged(const Context *context, int incr) const
>+{
>+    if (mBuffer.get())
>+        mBuffer->onNonTFBindingChanged(incr);
>+}
>+
> VertexAttribute::VertexAttribute(GLuint bindingIndex)
>     : enabled(false),
>-      type(GL_FLOAT),
>+      type(VertexAttribType::Float),
>       size(4u),
>       normalized(false),
>       pureInteger(false),
>       pointer(nullptr),
>       relativeOffset(0),
>       vertexAttribArrayStride(0),
>-      bindingIndex(bindingIndex)
>-{
>-}
>+      bindingIndex(bindingIndex),
>+      mCachedElementLimit(0)
>+{}
> 
> VertexAttribute::VertexAttribute(VertexAttribute &&attrib)
>     : enabled(attrib.enabled),
>@@ -60,9 +68,9 @@ VertexAttribute::VertexAttribute(VertexAttribute &&attrib)
>       pointer(attrib.pointer),
>       relativeOffset(attrib.relativeOffset),
>       vertexAttribArrayStride(attrib.vertexAttribArrayStride),
>-      bindingIndex(attrib.bindingIndex)
>-{
>-}
>+      bindingIndex(attrib.bindingIndex),
>+      mCachedElementLimit(attrib.mCachedElementLimit)
>+{}
> 
> VertexAttribute &VertexAttribute::operator=(VertexAttribute &&attrib)
> {
>@@ -77,28 +85,64 @@ VertexAttribute &VertexAttribute::operator=(VertexAttribute &&attrib)
>         relativeOffset          = attrib.relativeOffset;
>         vertexAttribArrayStride = attrib.vertexAttribArrayStride;
>         bindingIndex            = attrib.bindingIndex;
>+        mCachedElementLimit     = attrib.mCachedElementLimit;
>     }
>     return *this;
> }
> 
>-size_t ComputeVertexAttributeTypeSize(const VertexAttribute& attrib)
>+void VertexAttribute::updateCachedElementLimit(const VertexBinding &binding)
> {
>-    GLuint size = attrib.size;
>-    switch (attrib.type)
>+    Buffer *buffer = binding.getBuffer().get();
>+    if (!buffer)
>+    {
>+        mCachedElementLimit = 0;
>+        return;
>+    }
>+
>+    angle::CheckedNumeric<GLint64> bufferSize(buffer->getSize());
>+    angle::CheckedNumeric<GLint64> bufferOffset(binding.getOffset());
>+    angle::CheckedNumeric<GLint64> attribOffset(relativeOffset);
>+    angle::CheckedNumeric<GLint64> attribSize(ComputeVertexAttributeTypeSize(*this));
>+
>+    // (buffer.size - buffer.offset - attrib.relativeOffset - attrib.size) / binding.stride
>+    angle::CheckedNumeric<GLint64> elementLimit =
>+        (bufferSize - bufferOffset - attribOffset - attribSize);
>+
>+    // Use the special integer overflow value if there was a math error.
>+    if (!elementLimit.IsValid())
>+    {
>+        static_assert(kIntegerOverflow < 0, "Unexpected value");
>+        mCachedElementLimit = kIntegerOverflow;
>+        return;
>+    }
>+
>+    mCachedElementLimit = elementLimit.ValueOrDie();
>+    if (mCachedElementLimit < 0)
>     {
>-      case GL_BYTE:                        return size * sizeof(GLbyte);
>-      case GL_UNSIGNED_BYTE:               return size * sizeof(GLubyte);
>-      case GL_SHORT:                       return size * sizeof(GLshort);
>-      case GL_UNSIGNED_SHORT:              return size * sizeof(GLushort);
>-      case GL_INT:                         return size * sizeof(GLint);
>-      case GL_UNSIGNED_INT:                return size * sizeof(GLuint);
>-      case GL_INT_2_10_10_10_REV:          return 4;
>-      case GL_UNSIGNED_INT_2_10_10_10_REV: return 4;
>-      case GL_FIXED:                       return size * sizeof(GLfixed);
>-      case GL_HALF_FLOAT:                  return size * sizeof(GLhalf);
>-      case GL_FLOAT:                       return size * sizeof(GLfloat);
>-      default: UNREACHABLE();              return size * sizeof(GLfloat);
>+        return;
>+    }
>+
>+    if (binding.getStride() == 0)
>+    {
>+        // Special case for a zero stride. If we can fit one vertex we can fit infinite vertices.
>+        mCachedElementLimit = std::numeric_limits<GLint64>::max();
>+        return;
>+    }
>+
>+    angle::CheckedNumeric<GLint64> bindingStride(binding.getStride());
>+    elementLimit /= bindingStride;
>+
>+    if (binding.getDivisor() > 0)
>+    {
>+        // For instanced draws, the element count is floor(instanceCount - 1) / binding.divisor.
>+        angle::CheckedNumeric<GLint64> bindingDivisor(binding.getDivisor());
>+        elementLimit *= bindingDivisor;
>+
>+        // We account for the floor() part rounding by adding a rounding constant.
>+        elementLimit += bindingDivisor - 1;
>     }
>+
>+    mCachedElementLimit = elementLimit.ValueOrDefault(kIntegerOverflow);
> }
> 
> size_t ComputeVertexAttributeStride(const VertexAttribute &attrib, const VertexBinding &binding)
>@@ -132,31 +176,4 @@ size_t ComputeVertexBindingElementCount(GLuint divisor, size_t drawCount, size_t
>     return drawCount;
> }
> 
>-GLenum GetVertexAttributeBaseType(const VertexAttribute &attrib)
>-{
>-    if (attrib.pureInteger)
>-    {
>-        switch (attrib.type)
>-        {
>-            case GL_BYTE:
>-            case GL_SHORT:
>-            case GL_INT:
>-                return GL_INT;
>-
>-            case GL_UNSIGNED_BYTE:
>-            case GL_UNSIGNED_SHORT:
>-            case GL_UNSIGNED_INT:
>-                return GL_UNSIGNED_INT;
>-
>-            default:
>-                UNREACHABLE();
>-                return GL_NONE;
>-        }
>-    }
>-    else
>-    {
>-        return GL_FLOAT;
>-    }
>-}
>-
> }  // namespace gl
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/VertexAttribute.h b/Source/ThirdParty/ANGLE/src/libANGLE/VertexAttribute.h
>index c531bece7cc..61ca1cc49ee 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/VertexAttribute.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/VertexAttribute.h
>@@ -10,6 +10,7 @@
> #define LIBANGLE_VERTEXATTRIBUTE_H_
> 
> #include "libANGLE/Buffer.h"
>+#include "libANGLE/angletypes.h"
> 
> namespace gl
> {
>@@ -23,6 +24,7 @@ class VertexBinding final : angle::NonCopyable
> {
>   public:
>     VertexBinding();
>+    explicit VertexBinding(GLuint boundAttribute);
>     VertexBinding(VertexBinding &&binding);
>     ~VertexBinding();
>     VertexBinding &operator=(VertexBinding &&binding);
>@@ -37,7 +39,22 @@ class VertexBinding final : angle::NonCopyable
>     void setOffset(GLintptr offsetIn) { mOffset = offsetIn; }
> 
>     const BindingPointer<Buffer> &getBuffer() const { return mBuffer; }
>-    void setBuffer(const gl::Context *context, Buffer *bufferIn) { mBuffer.set(context, bufferIn); }
>+
>+    ANGLE_INLINE void setBuffer(const gl::Context *context, Buffer *bufferIn)
>+    {
>+        mBuffer.set(context, bufferIn);
>+    }
>+
>+    // Skips ref counting for better inlined performance.
>+    ANGLE_INLINE void assignBuffer(Buffer *bufferIn) { mBuffer.assign(bufferIn); }
>+
>+    void onContainerBindingChanged(const Context *context, int incr) const;
>+
>+    const AttributesMask &getBoundAttributesMask() const { return mBoundAttributesMask; }
>+
>+    void setBoundAttribute(size_t index) { mBoundAttributesMask.set(index); }
>+
>+    void resetBoundAttribute(size_t index) { mBoundAttributesMask.reset(index); }
> 
>   private:
>     GLuint mStride;
>@@ -45,6 +62,9 @@ class VertexBinding final : angle::NonCopyable
>     GLintptr mOffset;
> 
>     BindingPointer<Buffer> mBuffer;
>+
>+    // Mapping from this binding to all of the attributes that are using this binding.
>+    AttributesMask mBoundAttributesMask;
> };
> 
> //
>@@ -53,11 +73,15 @@ class VertexBinding final : angle::NonCopyable
> struct VertexAttribute final : private angle::NonCopyable
> {
>     explicit VertexAttribute(GLuint bindingIndex);
>-    explicit VertexAttribute(VertexAttribute &&attrib);
>+    VertexAttribute(VertexAttribute &&attrib);
>     VertexAttribute &operator=(VertexAttribute &&attrib);
> 
>+    // Called from VertexArray.
>+    void updateCachedElementLimit(const VertexBinding &binding);
>+    GLint64 getCachedElementLimit() const { return mCachedElementLimit; }
>+
>     bool enabled;  // For glEnable/DisableVertexAttribArray
>-    GLenum type;
>+    VertexAttribType type;
>     GLuint size;
>     bool normalized;
>     bool pureInteger;
>@@ -67,9 +91,48 @@ struct VertexAttribute final : private angle::NonCopyable
> 
>     GLuint vertexAttribArrayStride;  // ONLY for queries of VERTEX_ATTRIB_ARRAY_STRIDE
>     GLuint bindingIndex;
>+
>+    // Special value for the cached element limit on the integer overflow case.
>+    static constexpr GLint64 kIntegerOverflow = std::numeric_limits<GLint64>::min();
>+
>+  private:
>+    // This is kept in sync by the VertexArray. It is used to optimize draw call validation.
>+    GLint64 mCachedElementLimit;
> };
> 
>-size_t ComputeVertexAttributeTypeSize(const VertexAttribute &attrib);
>+ANGLE_INLINE size_t ComputeVertexAttributeTypeSize(const VertexAttribute &attrib)
>+{
>+    switch (attrib.type)
>+    {
>+        case VertexAttribType::Byte:
>+            return attrib.size * sizeof(GLbyte);
>+        case VertexAttribType::UnsignedByte:
>+            return attrib.size * sizeof(GLubyte);
>+        case VertexAttribType::Short:
>+            return attrib.size * sizeof(GLshort);
>+        case VertexAttribType::UnsignedShort:
>+            return attrib.size * sizeof(GLushort);
>+        case VertexAttribType::Int:
>+            return attrib.size * sizeof(GLint);
>+        case VertexAttribType::UnsignedInt:
>+            return attrib.size * sizeof(GLuint);
>+        case VertexAttribType::Float:
>+            return attrib.size * sizeof(GLfloat);
>+        case VertexAttribType::HalfFloat:
>+            return attrib.size * sizeof(GLhalf);
>+        case VertexAttribType::Fixed:
>+            return attrib.size * sizeof(GLfixed);
>+        case VertexAttribType::Int2101010:
>+            // Packed attribute types don't scale by their component size.
>+            return 4;
>+        case VertexAttribType::UnsignedInt2101010:
>+            // Packed attribute types don't scale by their component size.
>+            return 4;
>+        default:
>+            UNREACHABLE();
>+            return 0;
>+    }
>+}
> 
> // Warning: you should ensure binding really matches attrib.bindingIndex before using this function.
> size_t ComputeVertexAttributeStride(const VertexAttribute &attrib, const VertexBinding &binding);
>@@ -79,16 +142,15 @@ GLintptr ComputeVertexAttributeOffset(const VertexAttribute &attrib, const Verte
> 
> size_t ComputeVertexBindingElementCount(GLuint divisor, size_t drawCount, size_t instanceCount);
> 
>-GLenum GetVertexAttributeBaseType(const VertexAttribute &attrib);
>-
> struct VertexAttribCurrentValueData
> {
>-    union {
>+    union
>+    {
>         GLfloat FloatValues[4];
>         GLint IntValues[4];
>         GLuint UnsignedIntValues[4];
>     };
>-    GLenum Type;
>+    VertexAttribType Type;
> 
>     VertexAttribCurrentValueData();
> 
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/VertexAttribute.inl b/Source/ThirdParty/ANGLE/src/libANGLE/VertexAttribute.inl
>index 1c1843e46fe..b46b6bec98d 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/VertexAttribute.inl
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/VertexAttribute.inl
>@@ -10,7 +10,7 @@ namespace gl
> {
> 
> inline VertexAttribCurrentValueData::VertexAttribCurrentValueData()
>-    : Type(GL_FLOAT)
>+    : Type(gl::VertexAttribType::Float)
> {
>     FloatValues[0] = 0.0f;
>     FloatValues[1] = 0.0f;
>@@ -24,7 +24,7 @@ inline void VertexAttribCurrentValueData::setFloatValues(const GLfloat floatValu
>     {
>         FloatValues[valueIndex] = floatValues[valueIndex];
>     }
>-    Type = GL_FLOAT;
>+    Type = gl::VertexAttribType::Float;
> }
> 
> inline void VertexAttribCurrentValueData::setIntValues(const GLint intValues[4])
>@@ -33,7 +33,7 @@ inline void VertexAttribCurrentValueData::setIntValues(const GLint intValues[4])
>     {
>         IntValues[valueIndex] = intValues[valueIndex];
>     }
>-    Type = GL_INT;
>+    Type = gl::VertexAttribType::Int;
> }
> 
> inline void VertexAttribCurrentValueData::setUnsignedIntValues(const GLuint unsignedIntValues[4])
>@@ -42,7 +42,7 @@ inline void VertexAttribCurrentValueData::setUnsignedIntValues(const GLuint unsi
>     {
>         UnsignedIntValues[valueIndex] = unsignedIntValues[valueIndex];
>     }
>-    Type = GL_UNSIGNED_INT;
>+    Type = gl::VertexAttribType::UnsignedInt;
> }
> 
> inline bool operator==(const VertexAttribCurrentValueData &a, const VertexAttribCurrentValueData &b)
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/Workarounds.h b/Source/ThirdParty/ANGLE/src/libANGLE/Workarounds.h
>index 898031d78d0..2421dd6a3a7 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/Workarounds.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/Workarounds.h
>@@ -23,6 +23,11 @@ struct Workarounds
>     // Program binaries don't contain transform feedback varyings on Qualcomm GPUs.
>     // Work around this by disabling the program cache for programs with transform feedback.
>     bool disableProgramCachingForTransformFeedback = false;
>+
>+    // On Windows Intel OpenGL drivers TexImage sometimes seems to interact with the Framebuffer.
>+    // Flaky crashes can occur unless we sync the Framebuffer bindings. The workaround is to add
>+    // Framebuffer binding dirty bits to TexImage updates. See http://anglebug.com/2906
>+    bool syncFramebufferBindingsOnTexImage = false;
> };
> }  // namespace gl
> 
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/WorkerThread.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/WorkerThread.cpp
>index b5d789ef936..0a96e9101be 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/WorkerThread.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/WorkerThread.cpp
>@@ -10,148 +10,233 @@
> 
> #include "libANGLE/WorkerThread.h"
> 
>+#if (ANGLE_STD_ASYNC_WORKERS == ANGLE_ENABLED)
>+#    include <condition_variable>
>+#    include <future>
>+#    include <mutex>
>+#    include <queue>
>+#    include <thread>
>+#endif  // (ANGLE_STD_ASYNC_WORKERS == ANGLE_ENABLED)
>+
> namespace angle
> {
> 
>-namespace priv
>-{
>-// SingleThreadedWorkerPool implementation.
>-SingleThreadedWorkerPool::SingleThreadedWorkerPool(size_t maxThreads)
>-    : WorkerThreadPoolBase(maxThreads)
>-{
>-}
>+WaitableEvent::WaitableEvent()  = default;
>+WaitableEvent::~WaitableEvent() = default;
> 
>-SingleThreadedWorkerPool::~SingleThreadedWorkerPool()
>-{
>-}
>+void WaitableEventDone::wait() {}
> 
>-SingleThreadedWaitableEvent SingleThreadedWorkerPool::postWorkerTaskImpl(Closure *task)
>+bool WaitableEventDone::isReady()
> {
>-    (*task)();
>-    return SingleThreadedWaitableEvent(EventResetPolicy::Automatic, EventInitialState::Signaled);
>+    return true;
> }
> 
>-// SingleThreadedWaitableEvent implementation.
>-SingleThreadedWaitableEvent::SingleThreadedWaitableEvent()
>-    : SingleThreadedWaitableEvent(EventResetPolicy::Automatic, EventInitialState::NonSignaled)
>-{
>-}
>+WorkerThreadPool::WorkerThreadPool()  = default;
>+WorkerThreadPool::~WorkerThreadPool() = default;
> 
>-SingleThreadedWaitableEvent::SingleThreadedWaitableEvent(EventResetPolicy resetPolicy,
>-                                                         EventInitialState initialState)
>-    : WaitableEventBase(resetPolicy, initialState)
>+class SingleThreadedWaitableEvent final : public WaitableEvent
> {
>-}
>+  public:
>+    SingleThreadedWaitableEvent()           = default;
>+    ~SingleThreadedWaitableEvent() override = default;
> 
>-SingleThreadedWaitableEvent::~SingleThreadedWaitableEvent()
>-{
>-}
>+    void wait() override;
>+    bool isReady() override;
>+};
> 
>-SingleThreadedWaitableEvent::SingleThreadedWaitableEvent(SingleThreadedWaitableEvent &&other)
>-    : WaitableEventBase(std::move(other))
>-{
>-}
>+void SingleThreadedWaitableEvent::wait() {}
> 
>-SingleThreadedWaitableEvent &SingleThreadedWaitableEvent::operator=(
>-    SingleThreadedWaitableEvent &&other)
>+bool SingleThreadedWaitableEvent::isReady()
> {
>-    return copyBase(std::move(other));
>+    return true;
> }
> 
>-void SingleThreadedWaitableEvent::resetImpl()
>+class SingleThreadedWorkerPool final : public WorkerThreadPool
> {
>-    mSignaled = false;
>-}
>+  public:
>+    std::shared_ptr<WaitableEvent> postWorkerTask(std::shared_ptr<Closure> task) override;
>+    void setMaxThreads(size_t maxThreads) override;
>+    bool isAsync() override;
>+};
> 
>-void SingleThreadedWaitableEvent::waitImpl()
>+// SingleThreadedWorkerPool implementation.
>+std::shared_ptr<WaitableEvent> SingleThreadedWorkerPool::postWorkerTask(
>+    std::shared_ptr<Closure> task)
> {
>+    (*task)();
>+    return std::make_shared<SingleThreadedWaitableEvent>();
> }
> 
>-void SingleThreadedWaitableEvent::signalImpl()
>+void SingleThreadedWorkerPool::setMaxThreads(size_t maxThreads) {}
>+
>+bool SingleThreadedWorkerPool::isAsync()
> {
>-    mSignaled = true;
>+    return false;
> }
> 
> #if (ANGLE_STD_ASYNC_WORKERS == ANGLE_ENABLED)
>-// AsyncWorkerPool implementation.
>-AsyncWorkerPool::AsyncWorkerPool(size_t maxThreads) : WorkerThreadPoolBase(maxThreads)
>+class AsyncWaitableEvent final : public WaitableEvent
> {
>-}
>+  public:
>+    AsyncWaitableEvent() : mIsPending(true) {}
>+    ~AsyncWaitableEvent() override = default;
> 
>-AsyncWorkerPool::~AsyncWorkerPool()
>-{
>-}
>+    void wait() override;
>+    bool isReady() override;
> 
>-AsyncWaitableEvent AsyncWorkerPool::postWorkerTaskImpl(Closure *task)
>-{
>-    auto future = std::async(std::launch::async, [task] { (*task)(); });
>+  private:
>+    friend class AsyncWorkerPool;
>+    void setFuture(std::future<void> &&future);
> 
>-    AsyncWaitableEvent waitable(EventResetPolicy::Automatic, EventInitialState::NonSignaled);
>+    // To block wait() when the task is stil in queue to be run.
>+    // Also to protect the concurrent accesses from both main thread and
>+    // background threads to the member fields.
>+    std::mutex mMutex;
> 
>-    waitable.setFuture(std::move(future));
>+    bool mIsPending;
>+    std::condition_variable mCondition;
>+    std::future<void> mFuture;
>+};
> 
>-    return waitable;
>+void AsyncWaitableEvent::setFuture(std::future<void> &&future)
>+{
>+    mFuture = std::move(future);
> }
> 
>-// AsyncWaitableEvent implementation.
>-AsyncWaitableEvent::AsyncWaitableEvent()
>-    : AsyncWaitableEvent(EventResetPolicy::Automatic, EventInitialState::NonSignaled)
>+void AsyncWaitableEvent::wait()
> {
>+    {
>+        std::unique_lock<std::mutex> lock(mMutex);
>+        mCondition.wait(lock, [this] { return !mIsPending; });
>+    }
>+
>+    ASSERT(mFuture.valid());
>+    mFuture.wait();
> }
> 
>-AsyncWaitableEvent::AsyncWaitableEvent(EventResetPolicy resetPolicy, EventInitialState initialState)
>-    : WaitableEventBase(resetPolicy, initialState)
>+bool AsyncWaitableEvent::isReady()
> {
>+    std::lock_guard<std::mutex> lock(mMutex);
>+    if (mIsPending)
>+    {
>+        return false;
>+    }
>+    ASSERT(mFuture.valid());
>+    return mFuture.wait_for(std::chrono::seconds(0)) == std::future_status::ready;
> }
> 
>-AsyncWaitableEvent::~AsyncWaitableEvent()
>+class AsyncWorkerPool final : public WorkerThreadPool
> {
>-}
>+  public:
>+    AsyncWorkerPool(size_t maxThreads) : mMaxThreads(maxThreads), mRunningThreads(0) {}
>+    ~AsyncWorkerPool() override = default;
>+
>+    std::shared_ptr<WaitableEvent> postWorkerTask(std::shared_ptr<Closure> task) override;
>+    void setMaxThreads(size_t maxThreads) override;
>+    bool isAsync() override;
>+
>+  private:
>+    void checkToRunPendingTasks();
> 
>-AsyncWaitableEvent::AsyncWaitableEvent(AsyncWaitableEvent &&other)
>-    : WaitableEventBase(std::move(other)), mFuture(std::move(other.mFuture))
>+    // To protect the concurrent accesses from both main thread and background
>+    // threads to the member fields.
>+    std::mutex mMutex;
>+
>+    size_t mMaxThreads;
>+    size_t mRunningThreads;
>+    std::queue<std::pair<std::shared_ptr<AsyncWaitableEvent>, std::shared_ptr<Closure>>> mTaskQueue;
>+};
>+
>+// AsyncWorkerPool implementation.
>+std::shared_ptr<WaitableEvent> AsyncWorkerPool::postWorkerTask(std::shared_ptr<Closure> task)
> {
>+    ASSERT(mMaxThreads > 0);
>+
>+    auto waitable = std::make_shared<AsyncWaitableEvent>();
>+    {
>+        std::lock_guard<std::mutex> lock(mMutex);
>+        mTaskQueue.push(std::make_pair(waitable, task));
>+    }
>+    checkToRunPendingTasks();
>+    return waitable;
> }
> 
>-AsyncWaitableEvent &AsyncWaitableEvent::operator=(AsyncWaitableEvent &&other)
>+void AsyncWorkerPool::setMaxThreads(size_t maxThreads)
> {
>-    std::swap(mFuture, other.mFuture);
>-    return copyBase(std::move(other));
>+    {
>+        std::lock_guard<std::mutex> lock(mMutex);
>+        mMaxThreads = (maxThreads == 0xFFFFFFFF ? std::thread::hardware_concurrency() : maxThreads);
>+    }
>+    checkToRunPendingTasks();
> }
> 
>-void AsyncWaitableEvent::setFuture(std::future<void> &&future)
>+bool AsyncWorkerPool::isAsync()
> {
>-    mFuture = std::move(future);
>+    return true;
> }
> 
>-void AsyncWaitableEvent::resetImpl()
>+void AsyncWorkerPool::checkToRunPendingTasks()
> {
>-    mSignaled = false;
>-    mFuture   = std::future<void>();
>+    std::lock_guard<std::mutex> lock(mMutex);
>+    while (mRunningThreads < mMaxThreads && !mTaskQueue.empty())
>+    {
>+        auto task = mTaskQueue.front();
>+        mTaskQueue.pop();
>+        auto waitable = task.first;
>+        auto closure  = task.second;
>+
>+        auto future = std::async(std::launch::async, [closure, this] {
>+            (*closure)();
>+            {
>+                std::lock_guard<std::mutex> lock(mMutex);
>+                ASSERT(mRunningThreads != 0);
>+                --mRunningThreads;
>+            }
>+            checkToRunPendingTasks();
>+        });
>+
>+        ++mRunningThreads;
>+
>+        {
>+            std::lock_guard<std::mutex> waitableLock(waitable->mMutex);
>+            waitable->mIsPending = false;
>+            waitable->setFuture(std::move(future));
>+        }
>+        waitable->mCondition.notify_all();
>+    }
> }
>+#endif  // (ANGLE_STD_ASYNC_WORKERS == ANGLE_ENABLED)
> 
>-void AsyncWaitableEvent::waitImpl()
>+// static
>+std::shared_ptr<WorkerThreadPool> WorkerThreadPool::Create(bool multithreaded)
> {
>-    if (mSignaled || !mFuture.valid())
>+    std::shared_ptr<WorkerThreadPool> pool(nullptr);
>+#if (ANGLE_STD_ASYNC_WORKERS == ANGLE_ENABLED)
>+    if (multithreaded)
>     {
>-        return;
>+        pool = std::shared_ptr<WorkerThreadPool>(static_cast<WorkerThreadPool *>(
>+            new AsyncWorkerPool(std::thread::hardware_concurrency())));
>     }
>-
>-    mFuture.wait();
>-    signal();
>+#endif
>+    if (!pool)
>+    {
>+        return std::shared_ptr<WorkerThreadPool>(
>+            static_cast<WorkerThreadPool *>(new SingleThreadedWorkerPool()));
>+    }
>+    return pool;
> }
> 
>-void AsyncWaitableEvent::signalImpl()
>+// static
>+std::shared_ptr<WaitableEvent> WorkerThreadPool::PostWorkerTask(
>+    std::shared_ptr<WorkerThreadPool> pool,
>+    std::shared_ptr<Closure> task)
> {
>-    mSignaled = true;
>-
>-    if (mResetPolicy == EventResetPolicy::Automatic)
>+    std::shared_ptr<WaitableEvent> event = pool->postWorkerTask(task);
>+    if (event.get())
>     {
>-        reset();
>+        event->setWorkerThreadPool(pool);
>     }
>+    return event;
> }
>-#endif  // (ANGLE_STD_ASYNC_WORKERS == ANGLE_ENABLED)
>-
>-}  // namespace priv
> 
> }  // namespace angle
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/WorkerThread.h b/Source/ThirdParty/ANGLE/src/libANGLE/WorkerThread.h
>index f6b81dce212..b1f704f568f 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/WorkerThread.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/WorkerThread.h
>@@ -12,31 +12,16 @@
> #define LIBANGLE_WORKER_THREAD_H_
> 
> #include <array>
>+#include <memory>
> #include <vector>
> 
> #include "common/debug.h"
> #include "libANGLE/features.h"
> 
>-#if (ANGLE_STD_ASYNC_WORKERS == ANGLE_ENABLED)
>-#include <future>
>-#endif  // (ANGLE_STD_ASYNC_WORKERS == ANGLE_ENABLED)
>-
> namespace angle
> {
>-// Indicates whether a WaitableEvent should automatically reset the event state after a single
>-// waiting thread has been released or remain signaled until reset() is manually invoked.
>-enum class EventResetPolicy
>-{
>-    Manual,
>-    Automatic
>-};
> 
>-// Specify the initial state on creation.
>-enum class EventInitialState
>-{
>-    NonSignaled,
>-    Signaled
>-};
>+class WorkerThreadPool;
> 
> // A callback function with no return value and no arguments.
> class Closure
>@@ -46,238 +31,63 @@ class Closure
>     virtual void operator()() = 0;
> };
> 
>-namespace priv
>-{
> // An event that we can wait on, useful for joining worker threads.
>-template <typename Impl>
>-class WaitableEventBase : angle::NonCopyable
>+class WaitableEvent : angle::NonCopyable
> {
>   public:
>-    WaitableEventBase(EventResetPolicy resetPolicy, EventInitialState initialState);
>-
>-    WaitableEventBase(WaitableEventBase &&other);
>-
>-    // Puts the event in the un-signaled state.
>-    void reset();
>+    WaitableEvent();
>+    virtual ~WaitableEvent();
> 
>     // Waits indefinitely for the event to be signaled.
>-    void wait();
>+    virtual void wait() = 0;
> 
>-    // Puts the event in the signaled state, causing any thread blocked on Wait to be woken up.
>-    // The event state is reset to non-signaled after a waiting thread has been released.
>-    void signal();
>-
>-  protected:
>-    Impl &copyBase(Impl &&other);
>+    // Peeks whether the event is ready. If ready, wait() will not block.
>+    virtual bool isReady() = 0;
>+    void setWorkerThreadPool(std::shared_ptr<WorkerThreadPool> pool) { mPool = pool; }
> 
>     template <size_t Count>
>-    static size_t WaitManyBase(std::array<Impl, Count> *waitables);
>-
>-    EventResetPolicy mResetPolicy;
>-    bool mSignaled;
>-};
>-
>-template <typename Impl>
>-WaitableEventBase<Impl>::WaitableEventBase(EventResetPolicy resetPolicy,
>-                                           EventInitialState initialState)
>-    : mResetPolicy(resetPolicy), mSignaled(initialState == EventInitialState::Signaled)
>-{
>-}
>-
>-template <typename Impl>
>-WaitableEventBase<Impl>::WaitableEventBase(WaitableEventBase &&other)
>-    : mResetPolicy(other.mResetPolicy), mSignaled(other.mSignaled)
>-{
>-}
>-
>-template <typename Impl>
>-void WaitableEventBase<Impl>::reset()
>-{
>-    static_cast<Impl *>(this)->resetImpl();
>-}
>-
>-template <typename Impl>
>-void WaitableEventBase<Impl>::wait()
>-{
>-    static_cast<Impl *>(this)->waitImpl();
>-}
>-
>-template <typename Impl>
>-void WaitableEventBase<Impl>::signal()
>-{
>-    static_cast<Impl *>(this)->signalImpl();
>-}
>-
>-template <typename Impl>
>-template <size_t Count>
>-// static
>-size_t WaitableEventBase<Impl>::WaitManyBase(std::array<Impl, Count> *waitables)
>-{
>-    ASSERT(Count > 0);
>-
>-    for (size_t index = 0; index < Count; ++index)
>+    static void WaitMany(std::array<std::shared_ptr<WaitableEvent>, Count> *waitables)
>     {
>-        (*waitables)[index].wait();
>+        ASSERT(Count > 0);
>+        for (size_t index = 0; index < Count; ++index)
>+        {
>+            (*waitables)[index]->wait();
>+        }
>     }
> 
>-    return 0;
>-}
>-
>-template <typename Impl>
>-Impl &WaitableEventBase<Impl>::copyBase(Impl &&other)
>-{
>-    std::swap(mSignaled, other.mSignaled);
>-    std::swap(mResetPolicy, other.mResetPolicy);
>-    return *static_cast<Impl *>(this);
>-}
>-
>-class SingleThreadedWaitableEvent : public WaitableEventBase<SingleThreadedWaitableEvent>
>-{
>-  public:
>-    SingleThreadedWaitableEvent();
>-    SingleThreadedWaitableEvent(EventResetPolicy resetPolicy, EventInitialState initialState);
>-    ~SingleThreadedWaitableEvent();
>-
>-    SingleThreadedWaitableEvent(SingleThreadedWaitableEvent &&other);
>-    SingleThreadedWaitableEvent &operator=(SingleThreadedWaitableEvent &&other);
>-
>-    void resetImpl();
>-    void waitImpl();
>-    void signalImpl();
>-
>-    // Wait, synchronously, on multiple events.
>-    // returns the index of a WaitableEvent which has been signaled.
>-    template <size_t Count>
>-    static size_t WaitMany(std::array<SingleThreadedWaitableEvent, Count> *waitables);
>-};
>-
>-template <size_t Count>
>-// static
>-size_t SingleThreadedWaitableEvent::WaitMany(
>-    std::array<SingleThreadedWaitableEvent, Count> *waitables)
>-{
>-    return WaitableEventBase<SingleThreadedWaitableEvent>::WaitManyBase(waitables);
>-}
>-
>-#if (ANGLE_STD_ASYNC_WORKERS == ANGLE_ENABLED)
>-class AsyncWaitableEvent : public WaitableEventBase<AsyncWaitableEvent>
>-{
>-  public:
>-    AsyncWaitableEvent();
>-    AsyncWaitableEvent(EventResetPolicy resetPolicy, EventInitialState initialState);
>-    ~AsyncWaitableEvent();
>-
>-    AsyncWaitableEvent(AsyncWaitableEvent &&other);
>-    AsyncWaitableEvent &operator=(AsyncWaitableEvent &&other);
>-
>-    void resetImpl();
>-    void waitImpl();
>-    void signalImpl();
>-
>-    // Wait, synchronously, on multiple events.
>-    // returns the index of a WaitableEvent which has been signaled.
>-    template <size_t Count>
>-    static size_t WaitMany(std::array<AsyncWaitableEvent, Count> *waitables);
>-
>   private:
>-    friend class AsyncWorkerPool;
>-    void setFuture(std::future<void> &&future);
>-
>-    std::future<void> mFuture;
>-};
>-
>-template <size_t Count>
>-// static
>-size_t AsyncWaitableEvent::WaitMany(std::array<AsyncWaitableEvent, Count> *waitables)
>-{
>-    return WaitableEventBase<AsyncWaitableEvent>::WaitManyBase(waitables);
>-}
>-#endif  // (ANGLE_STD_ASYNC_WORKERS == ANGLE_ENABLED)
>-
>-// The traits class allows the the thread pool to return the "Typed" waitable event from postTask.
>-// Otherwise postTask would always think it returns the current active type, so the unit tests
>-// could not run on multiple worker types in the same compilation.
>-template <typename Impl>
>-struct WorkerThreadPoolTraits;
>-
>-class SingleThreadedWorkerPool;
>-template <>
>-struct WorkerThreadPoolTraits<SingleThreadedWorkerPool>
>-{
>-    using WaitableEventType = SingleThreadedWaitableEvent;
>+    std::shared_ptr<WorkerThreadPool> mPool;
> };
> 
>-#if (ANGLE_STD_ASYNC_WORKERS == ANGLE_ENABLED)
>-class AsyncWorkerPool;
>-template <>
>-struct WorkerThreadPoolTraits<AsyncWorkerPool>
>+// A dummy waitable event.
>+class WaitableEventDone final : public WaitableEvent
> {
>-    using WaitableEventType = AsyncWaitableEvent;
>+  public:
>+    void wait() override;
>+    bool isReady() override;
> };
>-#endif  // (ANGLE_STD_ASYNC_WORKERS == ANGLE_ENABLED)
> 
> // Request WorkerThreads from the WorkerThreadPool. Each pool can keep worker threads around so
> // we avoid the costly spin up and spin down time.
>-template <typename Impl>
>-class WorkerThreadPoolBase : angle::NonCopyable
>+class WorkerThreadPool : angle::NonCopyable
> {
>   public:
>-    WorkerThreadPoolBase(size_t maxThreads);
>-    ~WorkerThreadPoolBase();
>-
>-    using WaitableEventType = typename WorkerThreadPoolTraits<Impl>::WaitableEventType;
>-
>-    // Returns an event to wait on for the task to finish.
>-    // If the pool fails to create the task, returns null.
>-    WaitableEventType postWorkerTask(Closure *task);
>-};
>+    WorkerThreadPool();
>+    virtual ~WorkerThreadPool();
> 
>-template <typename Impl>
>-WorkerThreadPoolBase<Impl>::WorkerThreadPoolBase(size_t maxThreads)
>-{
>-}
>-
>-template <typename Impl>
>-WorkerThreadPoolBase<Impl>::~WorkerThreadPoolBase()
>-{
>-}
>-
>-template <typename Impl>
>-typename WorkerThreadPoolBase<Impl>::WaitableEventType WorkerThreadPoolBase<Impl>::postWorkerTask(
>-    Closure *task)
>-{
>-    return static_cast<Impl *>(this)->postWorkerTaskImpl(task);
>-}
>-
>-class SingleThreadedWorkerPool : public WorkerThreadPoolBase<SingleThreadedWorkerPool>
>-{
>-  public:
>-    SingleThreadedWorkerPool(size_t maxThreads);
>-    ~SingleThreadedWorkerPool();
>+    static std::shared_ptr<WorkerThreadPool> Create(bool multithreaded);
>+    static std::shared_ptr<WaitableEvent> PostWorkerTask(std::shared_ptr<WorkerThreadPool> pool,
>+                                                         std::shared_ptr<Closure> task);
> 
>-    SingleThreadedWaitableEvent postWorkerTaskImpl(Closure *task);
>-};
>+    virtual void setMaxThreads(size_t maxThreads) = 0;
> 
>-#if (ANGLE_STD_ASYNC_WORKERS == ANGLE_ENABLED)
>-class AsyncWorkerPool : public WorkerThreadPoolBase<AsyncWorkerPool>
>-{
>-  public:
>-    AsyncWorkerPool(size_t maxThreads);
>-    ~AsyncWorkerPool();
>+    virtual bool isAsync() = 0;
> 
>-    AsyncWaitableEvent postWorkerTaskImpl(Closure *task);
>+  private:
>+    // Returns an event to wait on for the task to finish.
>+    // If the pool fails to create the task, returns null.
>+    virtual std::shared_ptr<WaitableEvent> postWorkerTask(std::shared_ptr<Closure> task) = 0;
> };
>-#endif  // (ANGLE_STD_ASYNC_WORKERS == ANGLE_ENABLED)
>-
>-}  // namespace priv
>-
>-#if (ANGLE_STD_ASYNC_WORKERS == ANGLE_ENABLED)
>-using WaitableEvent    = priv::AsyncWaitableEvent;
>-using WorkerThreadPool = priv::AsyncWorkerPool;
>-#else
>-using WaitableEvent    = priv::SingleThreadedWaitableEvent;
>-using WorkerThreadPool = priv::SingleThreadedWorkerPool;
>-#endif  // (ANGLE_STD_ASYNC_WORKERS == ANGLE_ENABLED)
> 
> }  // namespace angle
> 
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/WorkerThread_unittest.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/WorkerThread_unittest.cpp
>index a5b566d5887..32ce919eebe 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/WorkerThread_unittest.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/WorkerThread_unittest.cpp
>@@ -6,8 +6,8 @@
> // WorkerThread_unittest:
> //   Simple tests for the worker thread class.
> 
>-#include <array>
> #include <gtest/gtest.h>
>+#include <array>
> 
> #include "libANGLE/WorkerThread.h"
> 
>@@ -16,23 +16,8 @@ using namespace angle;
> namespace
> {
> 
>-template <typename T>
>-class WorkerPoolTest : public ::testing::Test
>-{
>-  public:
>-    T workerPool = {4};
>-};
>-
>-#if (ANGLE_STD_ASYNC_WORKERS == ANGLE_ENABLED)
>-using WorkerPoolTypes = ::testing::Types<priv::AsyncWorkerPool, priv::SingleThreadedWorkerPool>;
>-#else
>-using WorkerPoolTypes = ::testing::Types<priv::SingleThreadedWorkerPool>;
>-#endif  // (ANGLE_STD_ASYNC_WORKERS == ANGLE_ENABLED)
>-
>-TYPED_TEST_CASE(WorkerPoolTest, WorkerPoolTypes);
>-
> // Tests simple worker pool application.
>-TYPED_TEST(WorkerPoolTest, SimpleTask)
>+TEST(WorkerPoolTest, SimpleTask)
> {
>     class TestTask : public Closure
>     {
>@@ -42,17 +27,25 @@ TYPED_TEST(WorkerPoolTest, SimpleTask)
>         bool fired = false;
>     };
> 
>-    std::array<TestTask, 4> tasks;
>-    std::array<typename TypeParam::WaitableEventType, 4> waitables = {{
>-        this->workerPool.postWorkerTask(&tasks[0]), this->workerPool.postWorkerTask(&tasks[1]),
>-        this->workerPool.postWorkerTask(&tasks[2]), this->workerPool.postWorkerTask(&tasks[3]),
>-    }};
>-
>-    TypeParam::WaitableEventType::WaitMany(&waitables);
>-
>-    for (const auto &task : tasks)
>+    std::array<std::shared_ptr<WorkerThreadPool>, 2> pools = {
>+        {WorkerThreadPool::Create(false), WorkerThreadPool::Create(true)}};
>+    for (auto &pool : pools)
>     {
>-        EXPECT_TRUE(task.fired);
>+        std::array<std::shared_ptr<TestTask>, 4> tasks = {
>+            {std::make_shared<TestTask>(), std::make_shared<TestTask>(),
>+             std::make_shared<TestTask>(), std::make_shared<TestTask>()}};
>+        std::array<std::shared_ptr<WaitableEvent>, 4> waitables = {
>+            {WorkerThreadPool::PostWorkerTask(pool, tasks[0]),
>+             WorkerThreadPool::PostWorkerTask(pool, tasks[1]),
>+             WorkerThreadPool::PostWorkerTask(pool, tasks[2]),
>+             WorkerThreadPool::PostWorkerTask(pool, tasks[3])}};
>+
>+        WaitableEvent::WaitMany(&waitables);
>+
>+        for (const auto &task : tasks)
>+        {
>+            EXPECT_TRUE(task->fired);
>+        }
>     }
> }
> 
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/angletypes.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/angletypes.cpp
>index 702d391e465..0fa6c3a4c05 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/angletypes.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/angletypes.cpp
>@@ -8,37 +8,12 @@
> 
> #include "libANGLE/angletypes.h"
> #include "libANGLE/Program.h"
>-#include "libANGLE/VertexAttribute.h"
> #include "libANGLE/State.h"
> #include "libANGLE/VertexArray.h"
>+#include "libANGLE/VertexAttribute.h"
> 
> namespace gl
> {
>-
>-PrimitiveType GetPrimitiveType(GLenum drawMode)
>-{
>-    switch (drawMode)
>-    {
>-        case GL_POINTS:
>-            return PRIMITIVE_POINTS;
>-        case GL_LINES:
>-            return PRIMITIVE_LINES;
>-        case GL_LINE_STRIP:
>-            return PRIMITIVE_LINE_STRIP;
>-        case GL_LINE_LOOP:
>-            return PRIMITIVE_LINE_LOOP;
>-        case GL_TRIANGLES:
>-            return PRIMITIVE_TRIANGLES;
>-        case GL_TRIANGLE_STRIP:
>-            return PRIMITIVE_TRIANGLE_STRIP;
>-        case GL_TRIANGLE_FAN:
>-            return PRIMITIVE_TRIANGLE_FAN;
>-        default:
>-            UNREACHABLE();
>-            return PRIMITIVE_TYPE_MAX;
>-    }
>-}
>-
> RasterizerState::RasterizerState()
> {
>     memset(this, 0, sizeof(RasterizerState));
>@@ -84,6 +59,11 @@ BlendState::BlendState(const BlendState &other)
>     memcpy(this, &other, sizeof(BlendState));
> }
> 
>+bool BlendState::allChannelsMasked() const
>+{
>+    return !colorMaskRed && !colorMaskGreen && !colorMaskBlue && !colorMaskAlpha;
>+}
>+
> bool operator==(const BlendState &a, const BlendState &b)
> {
>     return memcmp(&a, &b, sizeof(BlendState)) == 0;
>@@ -135,43 +115,114 @@ SamplerState::SamplerState()
> {
>     memset(this, 0, sizeof(SamplerState));
> 
>-    minFilter     = GL_NEAREST_MIPMAP_LINEAR;
>-    magFilter     = GL_LINEAR;
>-    wrapS         = GL_REPEAT;
>-    wrapT         = GL_REPEAT;
>-    wrapR         = GL_REPEAT;
>-    maxAnisotropy = 1.0f;
>-    minLod        = -1000.0f;
>-    maxLod        = 1000.0f;
>-    compareMode   = GL_NONE;
>-    compareFunc   = GL_LEQUAL;
>-    sRGBDecode    = GL_DECODE_EXT;
>+    setMinFilter(GL_NEAREST_MIPMAP_LINEAR);
>+    setMagFilter(GL_LINEAR);
>+    setWrapS(GL_REPEAT);
>+    setWrapT(GL_REPEAT);
>+    setWrapR(GL_REPEAT);
>+    setMaxAnisotropy(1.0f);
>+    setMinLod(-1000.0f);
>+    setMaxLod(1000.0f);
>+    setCompareMode(GL_NONE);
>+    setCompareFunc(GL_LEQUAL);
>+    setSRGBDecode(GL_DECODE_EXT);
> }
> 
> SamplerState::SamplerState(const SamplerState &other) = default;
> 
> // static
>-SamplerState SamplerState::CreateDefaultForTarget(GLenum target)
>+SamplerState SamplerState::CreateDefaultForTarget(TextureType type)
> {
>     SamplerState state;
> 
>     // According to OES_EGL_image_external and ARB_texture_rectangle: For external textures, the
>     // default min filter is GL_LINEAR and the default s and t wrap modes are GL_CLAMP_TO_EDGE.
>-    if (target == GL_TEXTURE_EXTERNAL_OES || target == GL_TEXTURE_RECTANGLE_ANGLE)
>+    if (type == TextureType::External || type == TextureType::Rectangle)
>     {
>-        state.minFilter = GL_LINEAR;
>-        state.wrapS     = GL_CLAMP_TO_EDGE;
>-        state.wrapT     = GL_CLAMP_TO_EDGE;
>+        state.mMinFilter = GL_LINEAR;
>+        state.mWrapS     = GL_CLAMP_TO_EDGE;
>+        state.mWrapT     = GL_CLAMP_TO_EDGE;
>     }
> 
>     return state;
> }
> 
>-ImageUnit::ImageUnit()
>-    : texture(), level(0), layered(false), layer(0), access(GL_READ_ONLY), format(GL_R32UI)
>+void SamplerState::setMinFilter(GLenum minFilter)
>+{
>+    mMinFilter                    = minFilter;
>+    mCompleteness.typed.minFilter = static_cast<uint8_t>(FromGLenum<FilterMode>(minFilter));
>+}
>+
>+void SamplerState::setMagFilter(GLenum magFilter)
>+{
>+    mMagFilter                    = magFilter;
>+    mCompleteness.typed.magFilter = static_cast<uint8_t>(FromGLenum<FilterMode>(magFilter));
>+}
>+
>+void SamplerState::setWrapS(GLenum wrapS)
>+{
>+    mWrapS                    = wrapS;
>+    mCompleteness.typed.wrapS = static_cast<uint8_t>(FromGLenum<WrapMode>(wrapS));
>+}
>+
>+void SamplerState::setWrapT(GLenum wrapT)
>+{
>+    mWrapT = wrapT;
>+    updateWrapTCompareMode();
>+}
>+
>+void SamplerState::setWrapR(GLenum wrapR)
>+{
>+    mWrapR = wrapR;
>+}
>+
>+void SamplerState::setMaxAnisotropy(float maxAnisotropy)
>+{
>+    mMaxAnisotropy = maxAnisotropy;
>+}
>+
>+void SamplerState::setMinLod(GLfloat minLod)
>+{
>+    mMinLod = minLod;
>+}
>+
>+void SamplerState::setMaxLod(GLfloat maxLod)
>+{
>+    mMaxLod = maxLod;
>+}
>+
>+void SamplerState::setCompareMode(GLenum compareMode)
>+{
>+    mCompareMode = compareMode;
>+    updateWrapTCompareMode();
>+}
>+
>+void SamplerState::setCompareFunc(GLenum compareFunc)
>+{
>+    mCompareFunc = compareFunc;
>+}
>+
>+void SamplerState::setSRGBDecode(GLenum sRGBDecode)
>+{
>+    mSRGBDecode = sRGBDecode;
>+}
>+
>+void SamplerState::setBorderColor(const ColorGeneric &color)
>+{
>+    mBorderColor = color;
>+}
>+
>+void SamplerState::updateWrapTCompareMode()
> {
>+    uint8_t wrap    = static_cast<uint8_t>(FromGLenum<WrapMode>(mWrapT));
>+    uint8_t compare = static_cast<uint8_t>(mCompareMode == GL_NONE ? 0x10 : 0x00);
>+    mCompleteness.typed.wrapTCompareMode = wrap | compare;
> }
> 
>+ImageUnit::ImageUnit()
>+    : texture(), level(0), layered(false), layer(0), access(GL_READ_ONLY), format(GL_R32UI)
>+{}
>+
> ImageUnit::ImageUnit(const ImageUnit &other) = default;
> 
> ImageUnit::~ImageUnit() = default;
>@@ -190,6 +241,27 @@ static void MinMax(int a, int b, int *minimum, int *maximum)
>     }
> }
> 
>+Rectangle Rectangle::removeReversal() const
>+{
>+    Rectangle unreversed = *this;
>+    if (isReversedX())
>+    {
>+        unreversed.x     = unreversed.x + unreversed.width;
>+        unreversed.width = -unreversed.width;
>+    }
>+    if (isReversedY())
>+    {
>+        unreversed.y      = unreversed.y + unreversed.height;
>+        unreversed.height = -unreversed.height;
>+    }
>+    return unreversed;
>+}
>+
>+bool Rectangle::encloses(const gl::Rectangle &inside) const
>+{
>+    return x0() <= inside.x0() && y0() <= inside.y0() && x1() >= inside.x1() && y1() >= inside.y1();
>+}
>+
> bool ClipRectangle(const Rectangle &source, const Rectangle &clip, Rectangle *intersection)
> {
>     int minSourceX, maxSourceX, minSourceY, maxSourceY;
>@@ -200,36 +272,25 @@ bool ClipRectangle(const Rectangle &source, const Rectangle &clip, Rectangle *in
>     MinMax(clip.x, clip.x + clip.width, &minClipX, &maxClipX);
>     MinMax(clip.y, clip.y + clip.height, &minClipY, &maxClipY);
> 
>-    if (minSourceX >= maxClipX || maxSourceX <= minClipX || minSourceY >= maxClipY || maxSourceY <= minClipY)
>+    if (minSourceX >= maxClipX || maxSourceX <= minClipX || minSourceY >= maxClipY ||
>+        maxSourceY <= minClipY)
>     {
>-        if (intersection)
>-        {
>-            intersection->x = minSourceX;
>-            intersection->y = maxSourceY;
>-            intersection->width = maxSourceX - minSourceX;
>-            intersection->height = maxSourceY - minSourceY;
>-        }
>-
>         return false;
>     }
>-    else
>+    if (intersection)
>     {
>-        if (intersection)
>-        {
>-            intersection->x = std::max(minSourceX, minClipX);
>-            intersection->y = std::max(minSourceY, minClipY);
>-            intersection->width  = std::min(maxSourceX, maxClipX) - std::max(minSourceX, minClipX);
>-            intersection->height = std::min(maxSourceY, maxClipY) - std::max(minSourceY, minClipY);
>-        }
>-
>-        return true;
>+        intersection->x      = std::max(minSourceX, minClipX);
>+        intersection->y      = std::max(minSourceY, minClipY);
>+        intersection->width  = std::min(maxSourceX, maxClipX) - std::max(minSourceX, minClipX);
>+        intersection->height = std::min(maxSourceY, maxClipY) - std::max(minSourceY, minClipY);
>     }
>+    return true;
> }
> 
> bool Box::operator==(const Box &other) const
> {
>-    return (x == other.x && y == other.y && z == other.z &&
>-            width == other.width && height == other.height && depth == other.depth);
>+    return (x == other.x && y == other.y && z == other.z && width == other.width &&
>+            height == other.height && depth == other.depth);
> }
> 
> bool Box::operator!=(const Box &other) const
>@@ -237,6 +298,12 @@ bool Box::operator!=(const Box &other) const
>     return !(*this == other);
> }
> 
>+Rectangle Box::toRect() const
>+{
>+    ASSERT(z == 0 && depth == 1);
>+    return Rectangle(x, y, width, height);
>+}
>+
> bool operator==(const Offset &a, const Offset &b)
> {
>     return a.x == b.x && a.y == b.y && a.z == b.z;
>@@ -256,4 +323,62 @@ bool operator!=(const Extents &lhs, const Extents &rhs)
> {
>     return !(lhs == rhs);
> }
>+
>+bool ValidateComponentTypeMasks(unsigned long outputTypes,
>+                                unsigned long inputTypes,
>+                                unsigned long outputMask,
>+                                unsigned long inputMask)
>+{
>+    static_assert(IMPLEMENTATION_MAX_DRAW_BUFFERS <= kMaxComponentTypeMaskIndex,
>+                  "Output/input masks should fit into 16 bits - 1 bit per draw buffer. The "
>+                  "corresponding type masks should fit into 32 bits - 2 bits per draw buffer.");
>+    static_assert(MAX_VERTEX_ATTRIBS <= kMaxComponentTypeMaskIndex,
>+                  "Output/input masks should fit into 16 bits - 1 bit per attrib. The "
>+                  "corresponding type masks should fit into 32 bits - 2 bits per attrib.");
>+
>+    // For performance reasons, draw buffer and attribute type validation is done using bit masks.
>+    // We store two bits representing the type split, with the low bit in the lower 16 bits of the
>+    // variable, and the high bit in the upper 16 bits of the variable. This is done so we can AND
>+    // with the elswewhere used DrawBufferMask or AttributeMask.
>+
>+    // OR the masks with themselves, shifted 16 bits. This is to match our split type bits.
>+    outputMask |= (outputMask << kMaxComponentTypeMaskIndex);
>+    inputMask |= (inputMask << kMaxComponentTypeMaskIndex);
>+
>+    // To validate:
>+    // 1. Remove any indexes that are not enabled in the input (& inputMask)
>+    // 2. Remove any indexes that exist in output, but not in input (& outputMask)
>+    // 3. Use == to verify equality
>+    return (outputTypes & inputMask) == ((inputTypes & outputMask) & inputMask);
>+}
>+
>+GLsizeiptr GetBoundBufferAvailableSize(const OffsetBindingPointer<Buffer> &binding)
>+{
>+    Buffer *buffer = binding.get();
>+    if (buffer)
>+    {
>+        if (binding.getSize() == 0)
>+            return static_cast<GLsizeiptr>(buffer->getSize());
>+        angle::CheckedNumeric<GLintptr> offset       = binding.getOffset();
>+        angle::CheckedNumeric<GLsizeiptr> size       = binding.getSize();
>+        angle::CheckedNumeric<GLsizeiptr> bufferSize = buffer->getSize();
>+        auto end                                     = offset + size;
>+        auto clampedSize                             = size;
>+        auto difference                              = end - bufferSize;
>+        if (!difference.IsValid())
>+        {
>+            return 0;
>+        }
>+        if (difference.ValueOrDie() > 0)
>+        {
>+            clampedSize = size - difference;
>+        }
>+        return clampedSize.ValueOrDefault(0);
>+    }
>+    else
>+    {
>+        return 0;
>+    }
>+}
>+
> }  // namespace gl
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/angletypes.h b/Source/ThirdParty/ANGLE/src/libANGLE/angletypes.h
>index 4f364b090ac..e7b5bf09b06 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/angletypes.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/angletypes.h
>@@ -9,12 +9,16 @@
> #ifndef LIBANGLE_ANGLETYPES_H_
> #define LIBANGLE_ANGLETYPES_H_
> 
>+#include "common/Color.h"
>+#include "common/FixedVector.h"
>+#include "common/PackedEnums.h"
> #include "common/bitset_utils.h"
>+#include "common/vector_utils.h"
> #include "libANGLE/Constants.h"
> #include "libANGLE/Error.h"
>-#include "libANGLE/PackedGLEnums.h"
> #include "libANGLE/RefCountObject.h"
> 
>+#include <inttypes.h>
> #include <stdint.h>
> 
> #include <bitset>
>@@ -26,49 +30,26 @@ namespace gl
> class Buffer;
> class Texture;
> 
>-enum PrimitiveType
>-{
>-    PRIMITIVE_POINTS,
>-    PRIMITIVE_LINES,
>-    PRIMITIVE_LINE_STRIP,
>-    PRIMITIVE_LINE_LOOP,
>-    PRIMITIVE_TRIANGLES,
>-    PRIMITIVE_TRIANGLE_STRIP,
>-    PRIMITIVE_TRIANGLE_FAN,
>-    PRIMITIVE_TYPE_MAX,
>-};
>-
>-PrimitiveType GetPrimitiveType(GLenum drawMode);
>-
>-enum SamplerType
>-{
>-    SAMPLER_PIXEL,
>-    SAMPLER_VERTEX,
>-    SAMPLER_COMPUTE
>-};
>-
>-enum ShaderType
>-{
>-    SHADER_VERTEX,
>-    SHADER_FRAGMENT,
>-    SHADER_GEOMETRY,
>-    SHADER_COMPUTE,
>-    SHADER_TYPE_MAX
>-};
>-
> struct Rectangle
> {
>     Rectangle() : x(0), y(0), width(0), height(0) {}
>-    Rectangle(int x_in, int y_in, int width_in, int height_in)
>+    constexpr Rectangle(int x_in, int y_in, int width_in, int height_in)
>         : x(x_in), y(y_in), width(width_in), height(height_in)
>-    {
>-    }
>+    {}
> 
>     int x0() const { return x; }
>     int y0() const { return y; }
>     int x1() const { return x + width; }
>     int y1() const { return y + height; }
> 
>+    bool isReversedX() const { return width < 0; }
>+    bool isReversedY() const { return height < 0; }
>+
>+    // Returns a rectangle with the same area but with height and width guaranteed to be positive.
>+    Rectangle removeReversal() const;
>+
>+    bool encloses(const gl::Rectangle &inside) const;
>+
>     int x;
>     int y;
>     int width;
>@@ -82,30 +63,32 @@ bool ClipRectangle(const Rectangle &source, const Rectangle &clip, Rectangle *in
> 
> struct Offset
> {
>+    constexpr Offset() : x(0), y(0), z(0) {}
>+    constexpr Offset(int x_in, int y_in, int z_in) : x(x_in), y(y_in), z(z_in) {}
>+
>     int x;
>     int y;
>     int z;
>-
>-    Offset() : x(0), y(0), z(0) { }
>-    Offset(int x_in, int y_in, int z_in) : x(x_in), y(y_in), z(z_in) { }
> };
> 
>+constexpr Offset kOffsetZero(0, 0, 0);
>+
> bool operator==(const Offset &a, const Offset &b);
> bool operator!=(const Offset &a, const Offset &b);
> 
> struct Extents
> {
>-    int width;
>-    int height;
>-    int depth;
>-
>-    Extents() : width(0), height(0), depth(0) { }
>-    Extents(int width_, int height_, int depth_) : width(width_), height(height_), depth(depth_) { }
>+    Extents() : width(0), height(0), depth(0) {}
>+    Extents(int width_, int height_, int depth_) : width(width_), height(height_), depth(depth_) {}
> 
>     Extents(const Extents &other) = default;
>     Extents &operator=(const Extents &other) = default;
> 
>     bool empty() const { return (width * height * depth) == 0; }
>+
>+    int width;
>+    int height;
>+    int depth;
> };
> 
> bool operator==(const Extents &lhs, const Extents &rhs);
>@@ -113,18 +96,28 @@ bool operator!=(const Extents &lhs, const Extents &rhs);
> 
> struct Box
> {
>+    Box() : x(0), y(0), z(0), width(0), height(0), depth(0) {}
>+    Box(int x_in, int y_in, int z_in, int width_in, int height_in, int depth_in)
>+        : x(x_in), y(y_in), z(z_in), width(width_in), height(height_in), depth(depth_in)
>+    {}
>+    Box(const Offset &offset, const Extents &size)
>+        : x(offset.x),
>+          y(offset.y),
>+          z(offset.z),
>+          width(size.width),
>+          height(size.height),
>+          depth(size.depth)
>+    {}
>+    bool operator==(const Box &other) const;
>+    bool operator!=(const Box &other) const;
>+    Rectangle toRect() const;
>+
>     int x;
>     int y;
>     int z;
>     int width;
>     int height;
>     int depth;
>-
>-    Box() : x(0), y(0), z(0), width(0), height(0), depth(0) { }
>-    Box(int x_in, int y_in, int z_in, int width_in, int height_in, int depth_in) : x(x_in), y(y_in), z(z_in), width(width_in), height(height_in), depth(depth_in) { }
>-    Box(const Offset &offset, const Extents &size) : x(offset.x), y(offset.y), z(offset.z), width(size.width), height(size.height), depth(size.depth) { }
>-    bool operator==(const Box &other) const;
>-    bool operator!=(const Box &other) const;
> };
> 
> struct RasterizerState final
>@@ -155,6 +148,8 @@ struct BlendState final
>     BlendState();
>     BlendState(const BlendState &other);
> 
>+    bool allChannelsMasked() const;
>+
>     bool blend;
>     GLenum sourceBlendRGB;
>     GLenum destBlendRGB;
>@@ -204,32 +199,122 @@ struct DepthStencilState final
> bool operator==(const DepthStencilState &a, const DepthStencilState &b);
> bool operator!=(const DepthStencilState &a, const DepthStencilState &b);
> 
>+// Packs a sampler state for completeness checks:
>+// * minFilter: 5 values (3 bits)
>+// * magFilter: 2 values (1 bit)
>+// * wrapS:     3 values (2 bits)
>+// * wrapT:     3 values (2 bits)
>+// * compareMode: 1 bit (for == GL_NONE).
>+// This makes a total of 9 bits. We can pack this easily into 32 bits:
>+// * minFilter: 8 bits
>+// * magFilter: 8 bits
>+// * wrapS:     8 bits
>+// * wrapT:     4 bits
>+// * compareMode: 4 bits
>+
>+struct PackedSamplerCompleteness
>+{
>+    uint8_t minFilter;
>+    uint8_t magFilter;
>+    uint8_t wrapS;
>+    uint8_t wrapTCompareMode;
>+};
>+
>+static_assert(sizeof(PackedSamplerCompleteness) == sizeof(uint32_t), "Unexpected size");
>+
> // State from Table 6.10 (state per sampler object)
>-struct SamplerState final
>+class SamplerState final
> {
>+  public:
>     // This will zero-initialize the struct, including padding.
>     SamplerState();
>     SamplerState(const SamplerState &other);
> 
>-    static SamplerState CreateDefaultForTarget(GLenum target);
>+    static SamplerState CreateDefaultForTarget(TextureType type);
>+
>+    GLenum getMinFilter() const { return mMinFilter; }
>+
>+    void setMinFilter(GLenum minFilter);
>+
>+    GLenum getMagFilter() const { return mMagFilter; }
>+
>+    void setMagFilter(GLenum magFilter);
>+
>+    GLenum getWrapS() const { return mWrapS; }
>+
>+    void setWrapS(GLenum wrapS);
>+
>+    GLenum getWrapT() const { return mWrapT; }
>+
>+    void setWrapT(GLenum wrapT);
>+
>+    GLenum getWrapR() const { return mWrapR; }
>+
>+    void setWrapR(GLenum wrapR);
>+
>+    float getMaxAnisotropy() const { return mMaxAnisotropy; }
>+
>+    void setMaxAnisotropy(float maxAnisotropy);
>+
>+    GLfloat getMinLod() const { return mMinLod; }
>+
>+    void setMinLod(GLfloat minLod);
>+
>+    GLfloat getMaxLod() const { return mMaxLod; }
>+
>+    void setMaxLod(GLfloat maxLod);
> 
>-    GLenum minFilter;
>-    GLenum magFilter;
>+    GLenum getCompareMode() const { return mCompareMode; }
> 
>-    GLenum wrapS;
>-    GLenum wrapT;
>-    GLenum wrapR;
>+    void setCompareMode(GLenum compareMode);
>+
>+    GLenum getCompareFunc() const { return mCompareFunc; }
>+
>+    void setCompareFunc(GLenum compareFunc);
>+
>+    GLenum getSRGBDecode() const { return mSRGBDecode; }
>+
>+    void setSRGBDecode(GLenum sRGBDecode);
>+
>+    void setBorderColor(const ColorGeneric &color);
>+
>+    const ColorGeneric &getBorderColor() const { return mBorderColor; }
>+
>+    bool sameCompleteness(const SamplerState &samplerState) const
>+    {
>+        return mCompleteness.packed == samplerState.mCompleteness.packed;
>+    }
>+
>+  private:
>+    void updateWrapTCompareMode();
>+
>+    GLenum mMinFilter;
>+    GLenum mMagFilter;
>+
>+    GLenum mWrapS;
>+    GLenum mWrapT;
>+    GLenum mWrapR;
> 
>     // From EXT_texture_filter_anisotropic
>-    float maxAnisotropy;
>+    float mMaxAnisotropy;
>+
>+    GLfloat mMinLod;
>+    GLfloat mMaxLod;
> 
>-    GLfloat minLod;
>-    GLfloat maxLod;
>+    GLenum mCompareMode;
>+    GLenum mCompareFunc;
> 
>-    GLenum compareMode;
>-    GLenum compareFunc;
>+    GLenum mSRGBDecode;
> 
>-    GLenum sRGBDecode;
>+    ColorGeneric mBorderColor;
>+
>+    union Completeness
>+    {
>+        uint32_t packed;
>+        PackedSamplerCompleteness typed;
>+    };
>+
>+    Completeness mCompleteness;
> };
> 
> bool operator==(const SamplerState &a, const SamplerState &b);
>@@ -270,6 +355,8 @@ struct ImageUnit
>     GLenum format;
> };
> 
>+using ImageUnitTextureTypeMap = std::map<unsigned int, gl::TextureType>;
>+
> struct PixelStoreStateBase
> {
>     GLint alignment   = 4;
>@@ -281,8 +368,7 @@ struct PixelStoreStateBase
> };
> 
> struct PixelUnpackState : PixelStoreStateBase
>-{
>-};
>+{};
> 
> struct PixelPackState : PixelStoreStateBase
> {
>@@ -295,14 +381,65 @@ using AttributesMask = angle::BitSet<MAX_VERTEX_ATTRIBS>;
> // Used in Program
> using UniformBlockBindingMask = angle::BitSet<IMPLEMENTATION_MAX_COMBINED_SHADER_UNIFORM_BUFFERS>;
> 
>-// Used in Framebuffer
>+// Used in Framebuffer / Program
> using DrawBufferMask = angle::BitSet<IMPLEMENTATION_MAX_DRAW_BUFFERS>;
> 
>+template <typename T>
>+using TexLevelArray = std::array<T, IMPLEMENTATION_MAX_TEXTURE_LEVELS>;
>+
>+enum class ComponentType
>+{
>+    Float       = 0,
>+    Int         = 1,
>+    UnsignedInt = 2,
>+    NoType      = 3,
>+    EnumCount   = 4,
>+    InvalidEnum = 4,
>+};
>+
>+constexpr ComponentType GLenumToComponentType(GLenum componentType)
>+{
>+    switch (componentType)
>+    {
>+        case GL_FLOAT:
>+            return ComponentType::Float;
>+        case GL_INT:
>+            return ComponentType::Int;
>+        case GL_UNSIGNED_INT:
>+            return ComponentType::UnsignedInt;
>+        case GL_NONE:
>+            return ComponentType::NoType;
>+        default:
>+            return ComponentType::InvalidEnum;
>+    }
>+}
>+
>+constexpr angle::PackedEnumMap<ComponentType, uint32_t> kComponentMasks = {{
>+    {ComponentType::Float, 0x10001},
>+    {ComponentType::Int, 0x00001},
>+    {ComponentType::UnsignedInt, 0x10000},
>+}};
>+
>+constexpr size_t kMaxComponentTypeMaskIndex = 16;
>+using ComponentTypeMask                     = angle::BitSet<kMaxComponentTypeMaskIndex * 2>;
>+
>+ANGLE_INLINE void SetComponentTypeMask(ComponentType type, size_t index, ComponentTypeMask *mask)
>+{
>+    ASSERT(index <= kMaxComponentTypeMaskIndex);
>+    *mask &= ~(0x10001 << index);
>+    *mask |= kComponentMasks[type] << index;
>+}
>+
>+bool ValidateComponentTypeMasks(unsigned long outputTypes,
>+                                unsigned long inputTypes,
>+                                unsigned long outputMask,
>+                                unsigned long inputMask);
>+
> using ContextID = uintptr_t;
> 
>-constexpr size_t CUBE_FACE_COUNT = 6;
>+constexpr size_t kCubeFaceCount = 6;
> 
>-using TextureMap = std::map<GLenum, BindingPointer<Texture>>;
>+using TextureMap = angle::PackedEnumMap<TextureType, BindingPointer<Texture>>;
> 
> template <typename T>
> using AttachmentArray = std::array<T, IMPLEMENTATION_MAX_FRAMEBUFFER_ATTACHMENTS>;
>@@ -310,39 +447,62 @@ using AttachmentArray = std::array<T, IMPLEMENTATION_MAX_FRAMEBUFFER_ATTACHMENTS
> template <typename T>
> using DrawBuffersArray = std::array<T, IMPLEMENTATION_MAX_DRAW_BUFFERS>;
> 
>+template <typename T>
>+using DrawBuffersVector = angle::FixedVector<T, IMPLEMENTATION_MAX_DRAW_BUFFERS>;
>+
>+template <typename T>
>+using AttribArray = std::array<T, MAX_VERTEX_ATTRIBS>;
>+
>+using ActiveTextureMask = angle::BitSet<IMPLEMENTATION_MAX_ACTIVE_TEXTURES>;
>+
>+template <typename T>
>+using ActiveTextureArray = std::array<T, IMPLEMENTATION_MAX_ACTIVE_TEXTURES>;
>+
>+using ActiveTexturePointerArray = ActiveTextureArray<Texture *>;
>+using ActiveTextureTypeArray    = ActiveTextureArray<TextureType>;
>+
>+using ImageUnitMask = angle::BitSet<IMPLEMENTATION_MAX_IMAGE_UNITS>;
>+
>+// OffsetBindingPointer.getSize() returns the size specified by the user, which may be larger than
>+// the size of the bound buffer. This function reduces the returned size to fit the bound buffer if
>+// necessary. Returns 0 if no buffer is bound or if integer overflow occurs.
>+GLsizeiptr GetBoundBufferAvailableSize(const OffsetBindingPointer<Buffer> &binding);
>+
> }  // namespace gl
> 
> namespace rx
> {
> // A macro that determines whether an object has a given runtime type.
> #if defined(__clang__)
>-#if __has_feature(cxx_rtti)
>-#define ANGLE_HAS_DYNAMIC_CAST 1
>-#endif
>-#elif !defined(NDEBUG) && (!defined(_MSC_VER) || defined(_CPPRTTI)) && (!defined(__GNUC__) || __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 3) || defined(__GXX_RTTI))
>-#define ANGLE_HAS_DYNAMIC_CAST 1
>+#    if __has_feature(cxx_rtti)
>+#        define ANGLE_HAS_DYNAMIC_CAST 1
>+#    endif
>+#elif !defined(NDEBUG) && (!defined(_MSC_VER) || defined(_CPPRTTI)) &&              \
>+    (!defined(__GNUC__) || __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 3) || \
>+     defined(__GXX_RTTI))
>+#    define ANGLE_HAS_DYNAMIC_CAST 1
> #endif
> 
> #ifdef ANGLE_HAS_DYNAMIC_CAST
>-#define ANGLE_HAS_DYNAMIC_TYPE(type, obj) (dynamic_cast<type >(obj) != nullptr)
>-#undef ANGLE_HAS_DYNAMIC_CAST
>+#    define ANGLE_HAS_DYNAMIC_TYPE(type, obj) (dynamic_cast<type>(obj) != nullptr)
>+#    undef ANGLE_HAS_DYNAMIC_CAST
> #else
>-#define ANGLE_HAS_DYNAMIC_TYPE(type, obj) (obj != nullptr)
>+#    define ANGLE_HAS_DYNAMIC_TYPE(type, obj) (obj != nullptr)
> #endif
> 
> // Downcast a base implementation object (EG TextureImpl to TextureD3D)
> template <typename DestT, typename SrcT>
> inline DestT *GetAs(SrcT *src)
> {
>-    ASSERT(ANGLE_HAS_DYNAMIC_TYPE(DestT*, src));
>-    return static_cast<DestT*>(src);
>+    ASSERT(ANGLE_HAS_DYNAMIC_TYPE(DestT *, src));
>+    return static_cast<DestT *>(src);
> }
> 
> template <typename DestT, typename SrcT>
> inline const DestT *GetAs(const SrcT *src)
> {
>-    ASSERT(ANGLE_HAS_DYNAMIC_TYPE(const DestT*, src));
>-    return static_cast<const DestT*>(src);
>+    ASSERT(ANGLE_HAS_DYNAMIC_TYPE(const DestT *, src));
>+    return static_cast<const DestT *>(src);
> }
> 
> #undef ANGLE_HAS_DYNAMIC_TYPE
>@@ -417,7 +577,7 @@ class DestroyThenDelete
> 
>     void operator()(ObjT *obj)
>     {
>-        ANGLE_SWALLOW_ERR(obj->onDestroy(mContext));
>+        (void)(obj->onDestroy(mContext));
>         delete obj;
>     }
> 
>@@ -432,13 +592,11 @@ class UniqueObjectPointerBase : angle::NonCopyable
>   public:
>     template <typename ContextT>
>     UniqueObjectPointerBase(const ContextT *context) : mObject(nullptr), mDeleter(context)
>-    {
>-    }
>+    {}
> 
>     template <typename ContextT>
>     UniqueObjectPointerBase(ObjT *obj, const ContextT *context) : mObject(obj), mDeleter(context)
>-    {
>-    }
>+    {}
> 
>     ~UniqueObjectPointerBase()
>     {
>@@ -480,8 +638,7 @@ using UniqueObjectPointer = UniqueObjectPointerBase<ObjT, DestroyThenDelete<ObjT
> 
> namespace gl
> {
>-class ContextState;
>-
>+class State;
> }  // namespace gl
> 
>-#endif // LIBANGLE_ANGLETYPES_H_
>+#endif  // LIBANGLE_ANGLETYPES_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/entry_points_enum_autogen.h b/Source/ThirdParty/ANGLE/src/libANGLE/entry_points_enum_autogen.h
>deleted file mode 100644
>index 14b5e3c1b0f..00000000000
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/entry_points_enum_autogen.h
>+++ /dev/null
>@@ -1,336 +0,0 @@
>-// GENERATED FILE - DO NOT EDIT.
>-// Generated by generate_entry_points.py using data from gl.xml.
>-//
>-// Copyright 2017 The ANGLE Project Authors. All rights reserved.
>-// Use of this source code is governed by a BSD-style license that can be
>-// found in the LICENSE file.
>-//
>-// entry_points_enum_autogen.h:
>-//   Defines the GLES entry points enumeration.
>-
>-#ifndef LIBGLESV2_ENTRYPOINTSENUM_AUTOGEN_H_
>-#define LIBGLESV2_ENTRYPOINTSENUM_AUTOGEN_H_
>-
>-namespace gl
>-{
>-enum class EntryPoint
>-{
>-    Invalid,
>-    ActiveTexture,
>-    AttachShader,
>-    BindAttribLocation,
>-    BindBuffer,
>-    BindFramebuffer,
>-    BindRenderbuffer,
>-    BindTexture,
>-    BlendColor,
>-    BlendEquation,
>-    BlendEquationSeparate,
>-    BlendFunc,
>-    BlendFuncSeparate,
>-    BufferData,
>-    BufferSubData,
>-    CheckFramebufferStatus,
>-    Clear,
>-    ClearColor,
>-    ClearDepthf,
>-    ClearStencil,
>-    ColorMask,
>-    CompileShader,
>-    CompressedTexImage2D,
>-    CompressedTexSubImage2D,
>-    CopyTexImage2D,
>-    CopyTexSubImage2D,
>-    CreateProgram,
>-    CreateShader,
>-    CullFace,
>-    DeleteBuffers,
>-    DeleteFramebuffers,
>-    DeleteProgram,
>-    DeleteRenderbuffers,
>-    DeleteShader,
>-    DeleteTextures,
>-    DepthFunc,
>-    DepthMask,
>-    DepthRangef,
>-    DetachShader,
>-    Disable,
>-    DisableVertexAttribArray,
>-    DrawArrays,
>-    DrawElements,
>-    Enable,
>-    EnableVertexAttribArray,
>-    Finish,
>-    Flush,
>-    FramebufferRenderbuffer,
>-    FramebufferTexture2D,
>-    FrontFace,
>-    GenBuffers,
>-    GenerateMipmap,
>-    GenFramebuffers,
>-    GenRenderbuffers,
>-    GenTextures,
>-    GetActiveAttrib,
>-    GetActiveUniform,
>-    GetAttachedShaders,
>-    GetAttribLocation,
>-    GetBooleanv,
>-    GetBufferParameteriv,
>-    GetError,
>-    GetFloatv,
>-    GetFramebufferAttachmentParameteriv,
>-    GetIntegerv,
>-    GetProgramiv,
>-    GetProgramInfoLog,
>-    GetRenderbufferParameteriv,
>-    GetShaderiv,
>-    GetShaderInfoLog,
>-    GetShaderPrecisionFormat,
>-    GetShaderSource,
>-    GetString,
>-    GetTexParameterfv,
>-    GetTexParameteriv,
>-    GetUniformfv,
>-    GetUniformiv,
>-    GetUniformLocation,
>-    GetVertexAttribfv,
>-    GetVertexAttribiv,
>-    GetVertexAttribPointerv,
>-    Hint,
>-    IsBuffer,
>-    IsEnabled,
>-    IsFramebuffer,
>-    IsProgram,
>-    IsRenderbuffer,
>-    IsShader,
>-    IsTexture,
>-    LineWidth,
>-    LinkProgram,
>-    PixelStorei,
>-    PolygonOffset,
>-    ReadPixels,
>-    ReleaseShaderCompiler,
>-    RenderbufferStorage,
>-    SampleCoverage,
>-    Scissor,
>-    ShaderBinary,
>-    ShaderSource,
>-    StencilFunc,
>-    StencilFuncSeparate,
>-    StencilMask,
>-    StencilMaskSeparate,
>-    StencilOp,
>-    StencilOpSeparate,
>-    TexImage2D,
>-    TexParameterf,
>-    TexParameterfv,
>-    TexParameteri,
>-    TexParameteriv,
>-    TexSubImage2D,
>-    Uniform1f,
>-    Uniform1fv,
>-    Uniform1i,
>-    Uniform1iv,
>-    Uniform2f,
>-    Uniform2fv,
>-    Uniform2i,
>-    Uniform2iv,
>-    Uniform3f,
>-    Uniform3fv,
>-    Uniform3i,
>-    Uniform3iv,
>-    Uniform4f,
>-    Uniform4fv,
>-    Uniform4i,
>-    Uniform4iv,
>-    UniformMatrix2fv,
>-    UniformMatrix3fv,
>-    UniformMatrix4fv,
>-    UseProgram,
>-    ValidateProgram,
>-    VertexAttrib1f,
>-    VertexAttrib1fv,
>-    VertexAttrib2f,
>-    VertexAttrib2fv,
>-    VertexAttrib3f,
>-    VertexAttrib3fv,
>-    VertexAttrib4f,
>-    VertexAttrib4fv,
>-    VertexAttribPointer,
>-    Viewport,
>-    ReadBuffer,
>-    DrawRangeElements,
>-    TexImage3D,
>-    TexSubImage3D,
>-    CopyTexSubImage3D,
>-    CompressedTexImage3D,
>-    CompressedTexSubImage3D,
>-    GenQueries,
>-    DeleteQueries,
>-    IsQuery,
>-    BeginQuery,
>-    EndQuery,
>-    GetQueryiv,
>-    GetQueryObjectuiv,
>-    UnmapBuffer,
>-    GetBufferPointerv,
>-    DrawBuffers,
>-    UniformMatrix2x3fv,
>-    UniformMatrix3x2fv,
>-    UniformMatrix2x4fv,
>-    UniformMatrix4x2fv,
>-    UniformMatrix3x4fv,
>-    UniformMatrix4x3fv,
>-    BlitFramebuffer,
>-    RenderbufferStorageMultisample,
>-    FramebufferTextureLayer,
>-    MapBufferRange,
>-    FlushMappedBufferRange,
>-    BindVertexArray,
>-    DeleteVertexArrays,
>-    GenVertexArrays,
>-    IsVertexArray,
>-    GetIntegeri_v,
>-    BeginTransformFeedback,
>-    EndTransformFeedback,
>-    BindBufferRange,
>-    BindBufferBase,
>-    TransformFeedbackVaryings,
>-    GetTransformFeedbackVarying,
>-    VertexAttribIPointer,
>-    GetVertexAttribIiv,
>-    GetVertexAttribIuiv,
>-    VertexAttribI4i,
>-    VertexAttribI4ui,
>-    VertexAttribI4iv,
>-    VertexAttribI4uiv,
>-    GetUniformuiv,
>-    GetFragDataLocation,
>-    Uniform1ui,
>-    Uniform2ui,
>-    Uniform3ui,
>-    Uniform4ui,
>-    Uniform1uiv,
>-    Uniform2uiv,
>-    Uniform3uiv,
>-    Uniform4uiv,
>-    ClearBufferiv,
>-    ClearBufferuiv,
>-    ClearBufferfv,
>-    ClearBufferfi,
>-    GetStringi,
>-    CopyBufferSubData,
>-    GetUniformIndices,
>-    GetActiveUniformsiv,
>-    GetUniformBlockIndex,
>-    GetActiveUniformBlockiv,
>-    GetActiveUniformBlockName,
>-    UniformBlockBinding,
>-    DrawArraysInstanced,
>-    DrawElementsInstanced,
>-    FenceSync,
>-    IsSync,
>-    DeleteSync,
>-    ClientWaitSync,
>-    WaitSync,
>-    GetInteger64v,
>-    GetSynciv,
>-    GetInteger64i_v,
>-    GetBufferParameteri64v,
>-    GenSamplers,
>-    DeleteSamplers,
>-    IsSampler,
>-    BindSampler,
>-    SamplerParameteri,
>-    SamplerParameteriv,
>-    SamplerParameterf,
>-    SamplerParameterfv,
>-    GetSamplerParameteriv,
>-    GetSamplerParameterfv,
>-    VertexAttribDivisor,
>-    BindTransformFeedback,
>-    DeleteTransformFeedbacks,
>-    GenTransformFeedbacks,
>-    IsTransformFeedback,
>-    PauseTransformFeedback,
>-    ResumeTransformFeedback,
>-    GetProgramBinary,
>-    ProgramBinary,
>-    ProgramParameteri,
>-    InvalidateFramebuffer,
>-    InvalidateSubFramebuffer,
>-    TexStorage2D,
>-    TexStorage3D,
>-    GetInternalformativ,
>-    DispatchCompute,
>-    DispatchComputeIndirect,
>-    DrawArraysIndirect,
>-    DrawElementsIndirect,
>-    FramebufferParameteri,
>-    GetFramebufferParameteriv,
>-    GetProgramInterfaceiv,
>-    GetProgramResourceIndex,
>-    GetProgramResourceName,
>-    GetProgramResourceiv,
>-    GetProgramResourceLocation,
>-    UseProgramStages,
>-    ActiveShaderProgram,
>-    CreateShaderProgramv,
>-    BindProgramPipeline,
>-    DeleteProgramPipelines,
>-    GenProgramPipelines,
>-    IsProgramPipeline,
>-    GetProgramPipelineiv,
>-    ProgramUniform1i,
>-    ProgramUniform2i,
>-    ProgramUniform3i,
>-    ProgramUniform4i,
>-    ProgramUniform1ui,
>-    ProgramUniform2ui,
>-    ProgramUniform3ui,
>-    ProgramUniform4ui,
>-    ProgramUniform1f,
>-    ProgramUniform2f,
>-    ProgramUniform3f,
>-    ProgramUniform4f,
>-    ProgramUniform1iv,
>-    ProgramUniform2iv,
>-    ProgramUniform3iv,
>-    ProgramUniform4iv,
>-    ProgramUniform1uiv,
>-    ProgramUniform2uiv,
>-    ProgramUniform3uiv,
>-    ProgramUniform4uiv,
>-    ProgramUniform1fv,
>-    ProgramUniform2fv,
>-    ProgramUniform3fv,
>-    ProgramUniform4fv,
>-    ProgramUniformMatrix2fv,
>-    ProgramUniformMatrix3fv,
>-    ProgramUniformMatrix4fv,
>-    ProgramUniformMatrix2x3fv,
>-    ProgramUniformMatrix3x2fv,
>-    ProgramUniformMatrix2x4fv,
>-    ProgramUniformMatrix4x2fv,
>-    ProgramUniformMatrix3x4fv,
>-    ProgramUniformMatrix4x3fv,
>-    ValidateProgramPipeline,
>-    GetProgramPipelineInfoLog,
>-    BindImageTexture,
>-    GetBooleani_v,
>-    MemoryBarrier,
>-    MemoryBarrierByRegion,
>-    TexStorage2DMultisample,
>-    GetMultisamplefv,
>-    SampleMaski,
>-    GetTexLevelParameteriv,
>-    GetTexLevelParameterfv,
>-    BindVertexBuffer,
>-    VertexAttribFormat,
>-    VertexAttribIFormat,
>-    VertexAttribBinding,
>-    VertexBindingDivisor,
>-    DrawElementsInstancedANGLE
>-};
>-}  // namespace gl
>-#endif  // LIBGLESV2_ENTRY_POINTS_ENUM_AUTOGEN_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/es3_copy_conversion_table_autogen.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/es3_copy_conversion_table_autogen.cpp
>index 149f79f4582..0fbb7dfd525 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/es3_copy_conversion_table_autogen.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/es3_copy_conversion_table_autogen.cpp
>@@ -1,7 +1,7 @@
> // GENERATED FILE - DO NOT EDIT.
> // Generated by gen_copy_conversion_table.py using data from es3_copy_conversion_formats.json.
> //
>-// Copyright 2017 The ANGLE Project Authors. All rights reserved.
>+// Copyright 2019 The ANGLE Project Authors. All rights reserved.
> // Use of this source code is governed by a BSD-style license that can be
> // found in the LICENSE file.
> //
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/features.h b/Source/ThirdParty/ANGLE/src/libANGLE/features.h
>index 48a194ff0bc..9ff7dfa63ba 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/features.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/features.h
>@@ -19,29 +19,29 @@
> // D3D9Ex interfaces.  In order to get debug pixel to work on a Vista/Win 7
> // machine, define "ANGLE_D3D9EX=0" in your project file.
> #if !defined(ANGLE_D3D9EX)
>-#define ANGLE_D3D9EX ANGLE_ENABLED
>+#    define ANGLE_D3D9EX ANGLE_ENABLED
> #endif
> 
> // Vsync
> // ENABLED allows Vsync to be configured at runtime
> // DISABLED disallows Vsync
> #if !defined(ANGLE_VSYNC)
>-#define ANGLE_VSYNC ANGLE_ENABLED
>+#    define ANGLE_VSYNC ANGLE_ENABLED
> #endif
> 
> // Program binary loading
> #if !defined(ANGLE_PROGRAM_BINARY_LOAD)
>-#define ANGLE_PROGRAM_BINARY_LOAD ANGLE_ENABLED
>+#    define ANGLE_PROGRAM_BINARY_LOAD ANGLE_ENABLED
> #endif
> 
> // Append HLSL assembly to shader debug info. Defaults to enabled in Debug and off in Release.
> #if !defined(ANGLE_APPEND_ASSEMBLY_TO_SHADER_DEBUG_INFO)
>-#if !defined(NDEBUG)
>-#define ANGLE_APPEND_ASSEMBLY_TO_SHADER_DEBUG_INFO ANGLE_ENABLED
>-#else
>-#define ANGLE_APPEND_ASSEMBLY_TO_SHADER_DEBUG_INFO ANGLE_DISABLED
>-#endif  // !defined(NDEBUG)
>-#endif  // !defined(ANGLE_APPEND_ASSEMBLY_TO_SHADER_DEBUG_INFO)
>+#    if !defined(NDEBUG)
>+#        define ANGLE_APPEND_ASSEMBLY_TO_SHADER_DEBUG_INFO ANGLE_ENABLED
>+#    else
>+#        define ANGLE_APPEND_ASSEMBLY_TO_SHADER_DEBUG_INFO ANGLE_DISABLED
>+#    endif  // !defined(NDEBUG)
>+#endif      // !defined(ANGLE_APPEND_ASSEMBLY_TO_SHADER_DEBUG_INFO)
> 
> // Program link validation of precisions for uniforms. This feature was
> // requested by developers to allow non-conformant shaders to be used which
>@@ -49,17 +49,17 @@
> // ENABLED validate that precision for uniforms match between vertex and fragment shaders
> // DISABLED allow precision for uniforms to differ between vertex and fragment shaders
> #if !defined(ANGLE_PROGRAM_LINK_VALIDATE_UNIFORM_PRECISION)
>-#define ANGLE_PROGRAM_LINK_VALIDATE_UNIFORM_PRECISION ANGLE_ENABLED
>+#    define ANGLE_PROGRAM_LINK_VALIDATE_UNIFORM_PRECISION ANGLE_ENABLED
> #endif
> 
> // Controls if our threading code uses std::async or falls back to single-threaded operations.
>-// TODO(jmadill): Enable on Linux once STL chrono headers are updated.
> #if !defined(ANGLE_STD_ASYNC_WORKERS)
>-#if defined(ANGLE_PLATFORM_WINDOWS)
>-#define ANGLE_STD_ASYNC_WORKERS ANGLE_ENABLED
>-#else
>-#define ANGLE_STD_ASYNC_WORKERS ANGLE_DISABLED
>-#endif  // defined(ANGLE_PLATFORM_WINDOWS)
>-#endif  // !defined(ANGLE_STD_ASYNC_WORKERS)
>+#    define ANGLE_STD_ASYNC_WORKERS ANGLE_ENABLED
>+#endif      // !defined(ANGLE_STD_ASYNC_WORKERS)
> 
>-#endif // LIBANGLE_FEATURES_H_
>+// Force thread safety in all of ANGLE by locking a global mutex in every ANGLE entry point.
>+#if !defined(ANGLE_FORCE_THREAD_SAFETY)
>+#    define ANGLE_FORCE_THREAD_SAFETY ANGLE_DISABLED
>+#endif  // !defined(ANGLE_FORCE_THREAD_SAFETY)
>+
>+#endif  // LIBANGLE_FEATURES_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/format_map_autogen.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/format_map_autogen.cpp
>index a7f3ebafc82..f88a2c8c7c5 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/format_map_autogen.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/format_map_autogen.cpp
>@@ -2,7 +2,7 @@
> // Generated by gen_format_map.py using data from format_map_data.json.
> // ES3 format info from es3_format_type_combinations.json.
> //
>-// Copyright 2017 The ANGLE Project Authors. All rights reserved.
>+// Copyright 2019 The ANGLE Project Authors. All rights reserved.
> // Use of this source code is governed by a BSD-style license that can be
> // found in the LICENSE file.
> //
>@@ -52,6 +52,16 @@ GLenum GetSizedFormatInternal(GLenum format, GLenum type)
>             }
>             break;
> 
>+        case GL_COMPRESSED_RGBA_BPTC_UNORM_EXT:
>+            switch (type)
>+            {
>+                case GL_UNSIGNED_BYTE:
>+                    return GL_COMPRESSED_RGBA_BPTC_UNORM_EXT;
>+                default:
>+                    break;
>+            }
>+            break;
>+
>         case GL_COMPRESSED_RGBA_S3TC_DXT1_EXT:
>             switch (type)
>             {
>@@ -82,6 +92,26 @@ GLenum GetSizedFormatInternal(GLenum format, GLenum type)
>             }
>             break;
> 
>+        case GL_COMPRESSED_RGB_BPTC_SIGNED_FLOAT_EXT:
>+            switch (type)
>+            {
>+                case GL_UNSIGNED_BYTE:
>+                    return GL_COMPRESSED_RGB_BPTC_SIGNED_FLOAT_EXT;
>+                default:
>+                    break;
>+            }
>+            break;
>+
>+        case GL_COMPRESSED_RGB_BPTC_UNSIGNED_FLOAT_EXT:
>+            switch (type)
>+            {
>+                case GL_UNSIGNED_BYTE:
>+                    return GL_COMPRESSED_RGB_BPTC_UNSIGNED_FLOAT_EXT;
>+                default:
>+                    break;
>+            }
>+            break;
>+
>         case GL_COMPRESSED_RGB_S3TC_DXT1_EXT:
>             switch (type)
>             {
>@@ -92,6 +122,16 @@ GLenum GetSizedFormatInternal(GLenum format, GLenum type)
>             }
>             break;
> 
>+        case GL_COMPRESSED_SRGB_ALPHA_BPTC_UNORM_EXT:
>+            switch (type)
>+            {
>+                case GL_UNSIGNED_BYTE:
>+                    return GL_COMPRESSED_SRGB_ALPHA_BPTC_UNORM_EXT;
>+                default:
>+                    break;
>+            }
>+            break;
>+
>         case GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT1_EXT:
>             switch (type)
>             {
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/format_map_data.json b/Source/ThirdParty/ANGLE/src/libANGLE/format_map_data.json
>index a4f1c98b4d4..192428a65b9 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/format_map_data.json
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/format_map_data.json
>@@ -127,6 +127,18 @@
>     "GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT5_EXT": {
>         "GL_UNSIGNED_BYTE": "GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT5_EXT"
>     },
>+    "GL_COMPRESSED_RGBA_BPTC_UNORM_EXT": {
>+        "GL_UNSIGNED_BYTE": "GL_COMPRESSED_RGBA_BPTC_UNORM_EXT"
>+    },
>+    "GL_COMPRESSED_SRGB_ALPHA_BPTC_UNORM_EXT": {
>+        "GL_UNSIGNED_BYTE": "GL_COMPRESSED_SRGB_ALPHA_BPTC_UNORM_EXT"
>+    },
>+    "GL_COMPRESSED_RGB_BPTC_SIGNED_FLOAT_EXT": {
>+        "GL_UNSIGNED_BYTE": "GL_COMPRESSED_RGB_BPTC_SIGNED_FLOAT_EXT"
>+    },
>+    "GL_COMPRESSED_RGB_BPTC_UNSIGNED_FLOAT_EXT": {
>+        "GL_UNSIGNED_BYTE": "GL_COMPRESSED_RGB_BPTC_UNSIGNED_FLOAT_EXT"
>+    },
>     "GL_DEPTH_COMPONENT": {
>         "GL_UNSIGNED_SHORT": "GL_DEPTH_COMPONENT16",
>         "GL_UNSIGNED_INT": "GL_DEPTH_COMPONENT32_OES",
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/formatutils.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/formatutils.cpp
>index 67bb2efdea7..2f20480992b 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/formatutils.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/formatutils.cpp
>@@ -17,9 +17,9 @@ using namespace angle;
> namespace gl
> {
> 
>-// ES2 requires that format is equal to internal format at all glTex*Image2D entry points and the implementation
>-// can decide the true, sized, internal format. The ES2FormatMap determines the internal format for all valid
>-// format and type combinations.
>+// ES2 requires that format is equal to internal format at all glTex*Image2D entry points and the
>+// implementation can decide the true, sized, internal format. The ES2FormatMap determines the
>+// internal format for all valid format and type combinations.
> GLenum GetSizedFormatInternal(GLenum format, GLenum type);
> 
> namespace
>@@ -27,16 +27,32 @@ namespace
> using InternalFormatInfoMap =
>     std::unordered_map<GLenum, std::unordered_map<GLenum, InternalFormat>>;
> 
>-}  // anonymous namespace
>-
>-FormatType::FormatType() : format(GL_NONE), type(GL_NONE)
>+bool CheckedMathResult(const CheckedNumeric<GLuint> &value, GLuint *resultOut)
> {
>+    if (!value.IsValid())
>+    {
>+        return false;
>+    }
>+    else
>+    {
>+        *resultOut = value.ValueOrDie();
>+        return true;
>+    }
> }
> 
>-FormatType::FormatType(GLenum format_, GLenum type_) : format(format_), type(type_)
>+constexpr uint32_t PackTypeInfo(GLuint bytes, bool specialized)
> {
>+    // static_assert within constexpr requires c++17
>+    // static_assert(isPow2(bytes));
>+    return bytes | (rx::Log2(bytes) << 8) | (specialized << 16);
> }
> 
>+}  // anonymous namespace
>+
>+FormatType::FormatType() : format(GL_NONE), type(GL_NONE) {}
>+
>+FormatType::FormatType(GLenum format_, GLenum type_) : format(format_), type(type_) {}
>+
> bool FormatType::operator<(const FormatType &other) const
> {
>     if (format != other.format)
>@@ -44,29 +60,7 @@ bool FormatType::operator<(const FormatType &other) const
>     return type < other.type;
> }
> 
>-Type::Type()
>-    : bytes(0),
>-      bytesShift(0),
>-      specialInterpretation(false)
>-{
>-}
>-
>-static Type GenTypeInfo(GLuint bytes, bool specialInterpretation)
>-{
>-    Type info;
>-    info.bytes = bytes;
>-    GLuint i = 0;
>-    while ((1u << i) < bytes)
>-    {
>-        ++i;
>-    }
>-    info.bytesShift = i;
>-    ASSERT((1u << info.bytesShift) == bytes);
>-    info.specialInterpretation = specialInterpretation;
>-    return info;
>-}
>-
>-bool operator<(const Type& a, const Type& b)
>+bool operator<(const Type &a, const Type &b)
> {
>     return memcmp(&a, &b, sizeof(Type)) < 0;
> }
>@@ -142,136 +136,178 @@ static bool RequireExtOrExt(const Version &, const Extensions &extensions)
>     return extensions.*bool1 || extensions.*bool2;
> }
> 
>-// Special function for half float formats with three or four channels.
>-static bool HalfFloatSupport(const Version &clientVersion, const Extensions &extensions)
>+// R8, RG8
>+static bool SizedRGSupport(const Version &clientVersion, const Extensions &extensions)
> {
>-    return clientVersion >= Version(3, 0) || extensions.textureHalfFloat;
>+    return clientVersion >= Version(3, 0) || (extensions.textureStorage && extensions.textureRG);
> }
> 
>-static bool HalfFloatRGBRenderableSupport(const Version &clientVersion,
>-                                          const Extensions &extensions)
>+// R16F, RG16F with HALF_FLOAT_OES type
>+static bool SizedHalfFloatOESRGSupport(const Version &clientVersion, const Extensions &extensions)
> {
>-    return HalfFloatSupport(clientVersion, extensions) && extensions.colorBufferHalfFloat;
>+    return extensions.textureStorage && extensions.textureHalfFloat && extensions.textureRG;
> }
> 
>-static bool HalfFloatRGBARenderableSupport(const Version &clientVersion,
>-                                           const Extensions &extensions)
>+static bool SizedHalfFloatOESRGTextureAttachmentSupport(const Version &clientVersion,
>+                                                        const Extensions &extensions)
> {
>-    return HalfFloatSupport(clientVersion, extensions) &&
>-           (extensions.colorBufferHalfFloat || extensions.colorBufferFloat);
>+    return SizedHalfFloatOESRGSupport(clientVersion, extensions) && extensions.colorBufferHalfFloat;
> }
> 
>-// Special function for half float formats with one or two channels.
>-
>-// R16F, RG16F
>-static bool HalfFloatRGSupport(const Version &clientVersion, const Extensions &extensions)
>+// R16F, RG16F with either HALF_FLOAT_OES or HALF_FLOAT types
>+static bool SizedHalfFloatRGSupport(const Version &clientVersion, const Extensions &extensions)
> {
>-    return clientVersion >= Version(3, 0) || (extensions.textureHalfFloat && extensions.textureRG);
>-}
>-
>-// R16F, RG16F
>-static bool HalfFloatRGRenderableSupport(const Version &clientVersion, const Extensions &extensions)
>-{
>-    // It's unclear if EXT_color_buffer_half_float gives renderability to non-OES half float
>-    // textures
>-    return HalfFloatRGSupport(clientVersion, extensions) &&
>-           (extensions.colorBufferHalfFloat || extensions.colorBufferFloat);
>+    // HALF_FLOAT
>+    if (clientVersion >= Version(3, 0))
>+    {
>+        return true;
>+    }
>+    // HALF_FLOAT_OES
>+    else
>+    {
>+        return SizedHalfFloatOESRGSupport(clientVersion, extensions);
>+    }
> }
> 
>-// RED + HALF_FLOAT_OES, RG + HALF_FLOAT_OES
>-static bool UnsizedHalfFloatOESRGSupport(const Version &, const Extensions &extensions)
>+static bool SizedHalfFloatRGTextureAttachmentSupport(const Version &clientVersion,
>+                                                     const Extensions &extensions)
> {
>-    return extensions.textureHalfFloat && extensions.textureRG;
>+    // HALF_FLOAT
>+    if (clientVersion >= Version(3, 0))
>+    {
>+        return extensions.colorBufferFloat;
>+    }
>+    // HALF_FLOAT_OES
>+    else
>+    {
>+        return SizedHalfFloatOESRGTextureAttachmentSupport(clientVersion, extensions);
>+    }
> }
> 
>-// RED + HALF_FLOAT_OES, RG + HALF_FLOAT_OES
>-static bool UnsizedHalfFloatOESRGRenderableSupport(const Version &clientVersion,
>-                                                   const Extensions &extensions)
>+static bool SizedHalfFloatRGRenderbufferSupport(const Version &clientVersion,
>+                                                const Extensions &extensions)
> {
>-    return UnsizedHalfFloatOESRGSupport(clientVersion, extensions) &&
>-           extensions.colorBufferHalfFloat;
>+    return (clientVersion >= Version(3, 0) ||
>+            (extensions.textureHalfFloat && extensions.textureRG)) &&
>+           (extensions.colorBufferFloat || extensions.colorBufferHalfFloat);
> }
> 
>-// RGB + HALF_FLOAT_OES, RGBA + HALF_FLOAT_OES
>-static bool UnsizedHalfFloatOESSupport(const Version &clientVersion, const Extensions &extensions)
>+// RGB16F, RGBA16F with HALF_FLOAT_OES type
>+static bool SizedHalfFloatOESSupport(const Version &clientVersion, const Extensions &extensions)
> {
>-    return extensions.textureHalfFloat;
>+    return extensions.textureStorage && extensions.textureHalfFloat;
> }
> 
>-// RGB + HALF_FLOAT_OES, RGBA + HALF_FLOAT_OES
>-static bool UnsizedHalfFloatOESRenderableSupport(const Version &clientVersion,
>-                                                 const Extensions &extensions)
>+static bool SizedHalfFloatOESTextureAttachmentSupport(const Version &clientVersion,
>+                                                      const Extensions &extensions)
> {
>-    return UnsizedHalfFloatOESSupport(clientVersion, extensions) && extensions.colorBufferHalfFloat;
>+    return SizedHalfFloatOESSupport(clientVersion, extensions) && extensions.colorBufferHalfFloat;
> }
> 
>-// Special function for float formats with three or four channels.
>-
>-// RGB32F, RGBA32F
>-static bool FloatSupport(const Version &clientVersion, const Extensions &extensions)
>+// RGB16F, RGBA16F with either HALF_FLOAT_OES or HALF_FLOAT types
>+static bool SizedHalfFloatSupport(const Version &clientVersion, const Extensions &extensions)
> {
>-    return clientVersion >= Version(3, 0) || extensions.textureFloat;
>+    // HALF_FLOAT
>+    if (clientVersion >= Version(3, 0))
>+    {
>+        return true;
>+    }
>+    // HALF_FLOAT_OES
>+    else
>+    {
>+        return SizedHalfFloatOESSupport(clientVersion, extensions);
>+    }
> }
> 
>-// RGB32F
>-static bool FloatRGBRenderableSupport(const Version &clientVersion, const Extensions &extensions)
>+static bool SizedHalfFloatFilterSupport(const Version &clientVersion, const Extensions &extensions)
> {
>-    return FloatSupport(clientVersion, extensions) && extensions.colorBufferFloatRGB;
>+    // HALF_FLOAT
>+    if (clientVersion >= Version(3, 0))
>+    {
>+        return true;
>+    }
>+    // HALF_FLOAT_OES
>+    else
>+    {
>+        return extensions.textureHalfFloatLinear;
>+    }
> }
> 
>-// RGBA32F
>-static bool FloatRGBARenderableSupport(const Version &clientVersion, const Extensions &extensions)
>+static bool SizedHalfFloatRGBTextureAttachmentSupport(const Version &clientVersion,
>+                                                      const Extensions &extensions)
> {
>-    return FloatSupport(clientVersion, extensions) &&
>-           (extensions.colorBufferFloat || extensions.colorBufferFloatRGBA);
>+    // HALF_FLOAT
>+    if (clientVersion >= Version(3, 0))
>+    {
>+        // It is unclear how EXT_color_buffer_half_float applies to ES3.0 and above, however,
>+        // dEQP GLES3 es3fFboColorbufferTests.cpp verifies that texture attachment of GL_RGB16F
>+        // is possible, so assume that all GLES implementations support it.
>+        return extensions.colorBufferHalfFloat;
>+    }
>+    // HALF_FLOAT_OES
>+    else
>+    {
>+        return SizedHalfFloatOESTextureAttachmentSupport(clientVersion, extensions);
>+    }
> }
> 
>-// RGB + FLOAT, RGBA + FLOAT
>-static bool UnsizedFloatSupport(const Version &clientVersion, const Extensions &extensions)
>+static bool SizedHalfFloatRGBRenderbufferSupport(const Version &clientVersion,
>+                                                 const Extensions &extensions)
> {
>-    return extensions.textureFloat;
>+    return (clientVersion >= Version(3, 0) || extensions.textureHalfFloat) &&
>+           extensions.colorBufferHalfFloat;
> }
> 
>-// RGB + FLOAT
>-static bool UnsizedFloatRGBRenderableSupport(const Version &clientVersion,
>-                                             const Extensions &extensions)
>+static bool SizedHalfFloatRGBATextureAttachmentSupport(const Version &clientVersion,
>+                                                       const Extensions &extensions)
> {
>-    return UnsizedFloatSupport(clientVersion, extensions) && extensions.colorBufferFloatRGB;
>+    // HALF_FLOAT
>+    if (clientVersion >= Version(3, 0))
>+    {
>+        return extensions.colorBufferFloat;
>+    }
>+    // HALF_FLOAT_OES
>+    else
>+    {
>+        return SizedHalfFloatOESTextureAttachmentSupport(clientVersion, extensions);
>+    }
> }
> 
>-// RGBA + FLOAT
>-static bool UnsizedFloatRGBARenderableSupport(const Version &clientVersion,
>-                                              const Extensions &extensions)
>+static bool SizedHalfFloatRGBARenderbufferSupport(const Version &clientVersion,
>+                                                  const Extensions &extensions)
> {
>-    return UnsizedFloatSupport(clientVersion, extensions) &&
>-           (extensions.colorBufferFloatRGBA || extensions.colorBufferFloat);
>+    return (clientVersion >= Version(3, 0) || extensions.textureHalfFloat) &&
>+           (extensions.colorBufferFloat || extensions.colorBufferHalfFloat);
> }
> 
>-// Special function for float formats with one or two channels.
>-
> // R32F, RG32F
>-static bool FloatRGSupport(const Version &clientVersion, const Extensions &extensions)
>+static bool SizedFloatRGSupport(const Version &clientVersion, const Extensions &extensions)
> {
>-    return clientVersion >= Version(3, 0) || (extensions.textureFloat && extensions.textureRG);
>+    return clientVersion >= Version(3, 0) ||
>+           (extensions.textureStorage && extensions.textureFloat && extensions.textureRG);
> }
> 
>-// R32F, RG32F
>-static bool FloatRGRenderableSupport(const Version &clientVersion, const Extensions &extensions)
>+// RGB32F
>+static bool SizedFloatRGBSupport(const Version &clientVersion, const Extensions &extensions)
> {
>-    return FloatRGSupport(clientVersion, extensions) && extensions.colorBufferFloat;
>+    return clientVersion >= Version(3, 0) ||
>+           (extensions.textureStorage && extensions.textureFloat) || extensions.colorBufferFloatRGB;
> }
> 
>-// RED + FLOAT, RG + FLOAT
>-static bool UnsizedFloatRGSupport(const Version &clientVersion, const Extensions &extensions)
>+// RGBA32F
>+static bool SizedFloatRGBASupport(const Version &clientVersion, const Extensions &extensions)
> {
>-    return extensions.textureFloat && extensions.textureRG;
>+    return clientVersion >= Version(3, 0) ||
>+           (extensions.textureStorage && extensions.textureFloat) ||
>+           extensions.colorBufferFloatRGBA;
> }
> 
>-// RED + FLOAT, RG + FLOAT
>-static bool UnsizedFloatRGRenderableSupport(const Version &clientVersion,
>+static bool SizedFloatRGBARenderableSupport(const Version &clientVersion,
>                                             const Extensions &extensions)
> {
>-    return FloatRGSupport(clientVersion, extensions) && extensions.colorBufferFloat;
>+    // This logic is the same for both Renderbuffers and TextureAttachment.
>+    return extensions.colorBufferFloatRGBA ||  // ES2
>+           extensions.colorBufferFloat;        // ES3
> }
> 
> InternalFormat::InternalFormat()
>@@ -296,10 +332,10 @@ InternalFormat::InternalFormat()
>       componentType(GL_NONE),
>       colorEncoding(GL_NONE),
>       textureSupport(NeverSupported),
>-      renderSupport(NeverSupported),
>-      filterSupport(NeverSupported)
>-{
>-}
>+      filterSupport(NeverSupported),
>+      textureAttachmentSupport(NeverSupported),
>+      renderbufferSupport(NeverSupported)
>+{}
> 
> InternalFormat::InternalFormat(const InternalFormat &other) = default;
> 
>@@ -438,22 +474,19 @@ bool InternalFormat::isRequiredRenderbufferFormat(const Version &version) const
>             return true;
>         default:
>             UNREACHABLE();
>+#if !UNREACHABLE_IS_NORETURN
>             return false;
>+#endif
>     }
> }
> 
>-Format::Format(GLenum internalFormat) : Format(GetSizedInternalFormatInfo(internalFormat))
>-{
>-}
>+Format::Format(GLenum internalFormat) : Format(GetSizedInternalFormatInfo(internalFormat)) {}
> 
>-Format::Format(const InternalFormat &internalFormat) : info(&internalFormat)
>-{
>-}
>+Format::Format(const InternalFormat &internalFormat) : info(&internalFormat) {}
> 
> Format::Format(GLenum internalFormat, GLenum type)
>     : info(&GetInternalFormatInfo(internalFormat, type))
>-{
>-}
>+{}
> 
> Format::Format(const Format &other) = default;
> Format &Format::operator=(const Format &other) = default;
>@@ -497,7 +530,7 @@ Format Format::Invalid()
> std::ostream &operator<<(std::ostream &os, const Format &fmt)
> {
>     // TODO(ynovikov): return string representation when available
>-    return FmtHexShort(os, fmt.info->sizedInternalFormat);
>+    return FmtHex(os, fmt.info->sizedInternalFormat);
> }
> 
> bool InternalFormat::operator==(const InternalFormat &other) const
>@@ -531,29 +564,31 @@ void AddRGBAFormat(InternalFormatInfoMap *map,
>                    GLenum componentType,
>                    bool srgb,
>                    InternalFormat::SupportCheckFunction textureSupport,
>-                   InternalFormat::SupportCheckFunction renderSupport,
>-                   InternalFormat::SupportCheckFunction filterSupport)
>+                   InternalFormat::SupportCheckFunction filterSupport,
>+                   InternalFormat::SupportCheckFunction textureAttachmentSupport,
>+                   InternalFormat::SupportCheckFunction renderbufferSupport)
> {
>     InternalFormat formatInfo;
>     formatInfo.internalFormat = internalFormat;
>     formatInfo.sized          = sized;
>     formatInfo.sizedInternalFormat =
>         sized ? internalFormat : GetSizedFormatInternal(internalFormat, type);
>-    formatInfo.redBits = red;
>-    formatInfo.greenBits = green;
>-    formatInfo.blueBits = blue;
>-    formatInfo.alphaBits = alpha;
>+    formatInfo.redBits    = red;
>+    formatInfo.greenBits  = green;
>+    formatInfo.blueBits   = blue;
>+    formatInfo.alphaBits  = alpha;
>     formatInfo.sharedBits = shared;
>     formatInfo.pixelBytes = (red + green + blue + alpha + shared) / 8;
>     formatInfo.componentCount =
>         ((red > 0) ? 1 : 0) + ((green > 0) ? 1 : 0) + ((blue > 0) ? 1 : 0) + ((alpha > 0) ? 1 : 0);
>-    formatInfo.format = format;
>-    formatInfo.type = type;
>-    formatInfo.componentType = componentType;
>-    formatInfo.colorEncoding = (srgb ? GL_SRGB : GL_LINEAR);
>-    formatInfo.textureSupport = textureSupport;
>-    formatInfo.renderSupport = renderSupport;
>-    formatInfo.filterSupport = filterSupport;
>+    formatInfo.format                   = format;
>+    formatInfo.type                     = type;
>+    formatInfo.componentType            = componentType;
>+    formatInfo.colorEncoding            = (srgb ? GL_SRGB : GL_LINEAR);
>+    formatInfo.textureSupport           = textureSupport;
>+    formatInfo.filterSupport            = filterSupport;
>+    formatInfo.textureAttachmentSupport = textureAttachmentSupport;
>+    formatInfo.renderbufferSupport      = renderbufferSupport;
> 
>     InsertFormatInfo(map, formatInfo);
> }
>@@ -567,25 +602,27 @@ static void AddLUMAFormat(InternalFormatInfoMap *map,
>                           GLenum type,
>                           GLenum componentType,
>                           InternalFormat::SupportCheckFunction textureSupport,
>-                          InternalFormat::SupportCheckFunction renderSupport,
>-                          InternalFormat::SupportCheckFunction filterSupport)
>+                          InternalFormat::SupportCheckFunction filterSupport,
>+                          InternalFormat::SupportCheckFunction textureAttachmentSupport,
>+                          InternalFormat::SupportCheckFunction renderbufferSupport)
> {
>     InternalFormat formatInfo;
>     formatInfo.internalFormat = internalFormat;
>     formatInfo.sized          = sized;
>     formatInfo.sizedInternalFormat =
>         sized ? internalFormat : GetSizedFormatInternal(internalFormat, type);
>-    formatInfo.luminanceBits = luminance;
>-    formatInfo.alphaBits = alpha;
>-    formatInfo.pixelBytes = (luminance + alpha) / 8;
>-    formatInfo.componentCount = ((luminance > 0) ? 1 : 0) + ((alpha > 0) ? 1 : 0);
>-    formatInfo.format = format;
>-    formatInfo.type = type;
>-    formatInfo.componentType = componentType;
>-    formatInfo.colorEncoding = GL_LINEAR;
>-    formatInfo.textureSupport = textureSupport;
>-    formatInfo.renderSupport = renderSupport;
>-    formatInfo.filterSupport = filterSupport;
>+    formatInfo.luminanceBits            = luminance;
>+    formatInfo.alphaBits                = alpha;
>+    formatInfo.pixelBytes               = (luminance + alpha) / 8;
>+    formatInfo.componentCount           = ((luminance > 0) ? 1 : 0) + ((alpha > 0) ? 1 : 0);
>+    formatInfo.format                   = format;
>+    formatInfo.type                     = type;
>+    formatInfo.componentType            = componentType;
>+    formatInfo.colorEncoding            = GL_LINEAR;
>+    formatInfo.textureSupport           = textureSupport;
>+    formatInfo.filterSupport            = filterSupport;
>+    formatInfo.textureAttachmentSupport = textureAttachmentSupport;
>+    formatInfo.renderbufferSupport      = renderbufferSupport;
> 
>     InsertFormatInfo(map, formatInfo);
> }
>@@ -600,25 +637,27 @@ void AddDepthStencilFormat(InternalFormatInfoMap *map,
>                            GLenum type,
>                            GLenum componentType,
>                            InternalFormat::SupportCheckFunction textureSupport,
>-                           InternalFormat::SupportCheckFunction renderSupport,
>-                           InternalFormat::SupportCheckFunction filterSupport)
>+                           InternalFormat::SupportCheckFunction filterSupport,
>+                           InternalFormat::SupportCheckFunction textureAttachmentSupport,
>+                           InternalFormat::SupportCheckFunction renderbufferSupport)
> {
>     InternalFormat formatInfo;
>     formatInfo.internalFormat = internalFormat;
>     formatInfo.sized          = sized;
>     formatInfo.sizedInternalFormat =
>         sized ? internalFormat : GetSizedFormatInternal(internalFormat, type);
>-    formatInfo.depthBits = depthBits;
>-    formatInfo.stencilBits = stencilBits;
>-    formatInfo.pixelBytes = (depthBits + stencilBits + unusedBits) / 8;
>-    formatInfo.componentCount = ((depthBits > 0) ? 1 : 0) + ((stencilBits > 0) ? 1 : 0);
>-    formatInfo.format = format;
>-    formatInfo.type = type;
>-    formatInfo.componentType = componentType;
>-    formatInfo.colorEncoding = GL_LINEAR;
>-    formatInfo.textureSupport = textureSupport;
>-    formatInfo.renderSupport = renderSupport;
>-    formatInfo.filterSupport = filterSupport;
>+    formatInfo.depthBits                = depthBits;
>+    formatInfo.stencilBits              = stencilBits;
>+    formatInfo.pixelBytes               = (depthBits + stencilBits + unusedBits) / 8;
>+    formatInfo.componentCount           = ((depthBits > 0) ? 1 : 0) + ((stencilBits > 0) ? 1 : 0);
>+    formatInfo.format                   = format;
>+    formatInfo.type                     = type;
>+    formatInfo.componentType            = componentType;
>+    formatInfo.colorEncoding            = GL_LINEAR;
>+    formatInfo.textureSupport           = textureSupport;
>+    formatInfo.filterSupport            = filterSupport;
>+    formatInfo.textureAttachmentSupport = textureAttachmentSupport;
>+    formatInfo.renderbufferSupport      = renderbufferSupport;
> 
>     InsertFormatInfo(map, formatInfo);
> }
>@@ -629,33 +668,43 @@ void AddCompressedFormat(InternalFormatInfoMap *map,
>                          GLuint compressedBlockHeight,
>                          GLuint compressedBlockSize,
>                          GLuint componentCount,
>-                         GLenum format,
>-                         GLenum type,
>                          bool srgb,
>                          InternalFormat::SupportCheckFunction textureSupport,
>-                         InternalFormat::SupportCheckFunction renderSupport,
>-                         InternalFormat::SupportCheckFunction filterSupport)
>+                         InternalFormat::SupportCheckFunction filterSupport,
>+                         InternalFormat::SupportCheckFunction textureAttachmentSupport,
>+                         InternalFormat::SupportCheckFunction renderbufferSupport)
> {
>     InternalFormat formatInfo;
>-    formatInfo.internalFormat        = internalFormat;
>-    formatInfo.sized                 = true;
>-    formatInfo.sizedInternalFormat   = internalFormat;
>-    formatInfo.compressedBlockWidth = compressedBlockWidth;
>-    formatInfo.compressedBlockHeight = compressedBlockHeight;
>-    formatInfo.pixelBytes = compressedBlockSize / 8;
>-    formatInfo.componentCount = componentCount;
>-    formatInfo.format = format;
>-    formatInfo.type = type;
>-    formatInfo.componentType = GL_UNSIGNED_NORMALIZED;
>-    formatInfo.colorEncoding = (srgb ? GL_SRGB : GL_LINEAR);
>-    formatInfo.compressed = true;
>-    formatInfo.textureSupport = textureSupport;
>-    formatInfo.renderSupport = renderSupport;
>-    formatInfo.filterSupport = filterSupport;
>+    formatInfo.internalFormat           = internalFormat;
>+    formatInfo.sized                    = true;
>+    formatInfo.sizedInternalFormat      = internalFormat;
>+    formatInfo.compressedBlockWidth     = compressedBlockWidth;
>+    formatInfo.compressedBlockHeight    = compressedBlockHeight;
>+    formatInfo.pixelBytes               = compressedBlockSize / 8;
>+    formatInfo.componentCount           = componentCount;
>+    formatInfo.format                   = internalFormat;
>+    formatInfo.type                     = GL_UNSIGNED_BYTE;
>+    formatInfo.componentType            = GL_UNSIGNED_NORMALIZED;
>+    formatInfo.colorEncoding            = (srgb ? GL_SRGB : GL_LINEAR);
>+    formatInfo.compressed               = true;
>+    formatInfo.textureSupport           = textureSupport;
>+    formatInfo.filterSupport            = filterSupport;
>+    formatInfo.textureAttachmentSupport = textureAttachmentSupport;
>+    formatInfo.renderbufferSupport      = renderbufferSupport;
> 
>     InsertFormatInfo(map, formatInfo);
> }
> 
>+// Notes:
>+// 1. "Texture supported" includes all the means by which texture can be created, however,
>+//    GL_EXT_texture_storage in ES2 is a special case, when only glTexStorage* is allowed.
>+//    The assumption is that ES2 validation will not check textureSupport for sized formats.
>+//
>+// 2. Sized half float types are a combination of GL_HALF_FLOAT and GL_HALF_FLOAT_OES support,
>+//    due to a limitation that only one type for sized formats is allowed.
>+//
>+// TODO(ynovikov): http://anglebug.com/2846 Verify support fields of BGRA, depth, stencil
>+// and compressed formats. Perform texturable check as part of filterable and attachment checks.
> static InternalFormatInfoMap BuildInternalFormatInfoMap()
> {
>     InternalFormatInfoMap map;
>@@ -665,266 +714,281 @@ static InternalFormatInfoMap BuildInternalFormatInfoMap()
> 
>     // clang-format off
> 
>-    //                 | Internal format    |sized| R | G | B | A |S | Format         | Type                           | Component type        | SRGB | Texture supported                           | Renderable                                  | Filterable    |
>-    AddRGBAFormat(&map, GL_R8,               true,  8,  0,  0,  0, 0, GL_RED,          GL_UNSIGNED_BYTE,                GL_UNSIGNED_NORMALIZED, false, RequireESOrExt<3, 0, &Extensions::textureRG>, RequireESOrExt<3, 0, &Extensions::textureRG>, AlwaysSupported);
>-    AddRGBAFormat(&map, GL_R8_SNORM,         true,  8,  0,  0,  0, 0, GL_RED,          GL_BYTE,                         GL_SIGNED_NORMALIZED,   false, RequireES<3, 0>,                              NeverSupported,                               AlwaysSupported);
>-    AddRGBAFormat(&map, GL_RG8,              true,  8,  8,  0,  0, 0, GL_RG,           GL_UNSIGNED_BYTE,                GL_UNSIGNED_NORMALIZED, false, RequireESOrExt<3, 0, &Extensions::textureRG>, RequireESOrExt<3, 0, &Extensions::textureRG>, AlwaysSupported);
>-    AddRGBAFormat(&map, GL_RG8_SNORM,        true,  8,  8,  0,  0, 0, GL_RG,           GL_BYTE,                         GL_SIGNED_NORMALIZED,   false, RequireES<3, 0>,                              NeverSupported,                               AlwaysSupported);
>-    AddRGBAFormat(&map, GL_RGB8,             true,  8,  8,  8,  0, 0, GL_RGB,          GL_UNSIGNED_BYTE,                GL_UNSIGNED_NORMALIZED, false, RequireESOrExt<3, 0, &Extensions::rgb8rgba8>, RequireESOrExt<3, 0, &Extensions::rgb8rgba8>, AlwaysSupported);
>-    AddRGBAFormat(&map, GL_RGB8_SNORM,       true,  8,  8,  8,  0, 0, GL_RGB,          GL_BYTE,                         GL_SIGNED_NORMALIZED,   false, RequireES<3, 0>,                              NeverSupported,                               AlwaysSupported);
>-    AddRGBAFormat(&map, GL_RGB565,           true,  5,  6,  5,  0, 0, GL_RGB,          GL_UNSIGNED_SHORT_5_6_5,         GL_UNSIGNED_NORMALIZED, false, RequireES<2, 0>,                              RequireES<2, 0>,                              AlwaysSupported);
>-    AddRGBAFormat(&map, GL_RGBA4,            true,  4,  4,  4,  4, 0, GL_RGBA,         GL_UNSIGNED_SHORT_4_4_4_4,       GL_UNSIGNED_NORMALIZED, false, RequireES<2, 0>,                              RequireES<2, 0>,                              AlwaysSupported);
>-    AddRGBAFormat(&map, GL_RGB5_A1,          true,  5,  5,  5,  1, 0, GL_RGBA,         GL_UNSIGNED_SHORT_5_5_5_1,       GL_UNSIGNED_NORMALIZED, false, RequireES<2, 0>,                              RequireES<2, 0>,                              AlwaysSupported);
>-    AddRGBAFormat(&map, GL_RGBA8,            true,  8,  8,  8,  8, 0, GL_RGBA,         GL_UNSIGNED_BYTE,                GL_UNSIGNED_NORMALIZED, false, RequireESOrExt<3, 0, &Extensions::rgb8rgba8>, RequireESOrExt<3, 0, &Extensions::rgb8rgba8>, AlwaysSupported);
>-    AddRGBAFormat(&map, GL_RGBA8_SNORM,      true,  8,  8,  8,  8, 0, GL_RGBA,         GL_BYTE,                         GL_SIGNED_NORMALIZED,   false, RequireES<3, 0>,                              NeverSupported,                               AlwaysSupported);
>-    AddRGBAFormat(&map, GL_RGB10_A2,         true, 10, 10, 10,  2, 0, GL_RGBA,         GL_UNSIGNED_INT_2_10_10_10_REV,  GL_UNSIGNED_NORMALIZED, false, RequireES<3, 0>,                              RequireES<3, 0>,                              AlwaysSupported);
>-    AddRGBAFormat(&map, GL_RGB10_A2UI,       true, 10, 10, 10,  2, 0, GL_RGBA_INTEGER, GL_UNSIGNED_INT_2_10_10_10_REV,  GL_UNSIGNED_INT,        false, RequireES<3, 0>,                              RequireES<3, 0>,                              NeverSupported);
>-    AddRGBAFormat(&map, GL_SRGB8,            true,  8,  8,  8,  0, 0, GL_RGB,          GL_UNSIGNED_BYTE,                GL_UNSIGNED_NORMALIZED, true,  RequireESOrExt<3, 0, &Extensions::sRGB>,      NeverSupported,                               AlwaysSupported);
>-    AddRGBAFormat(&map, GL_SRGB8_ALPHA8,     true,  8,  8,  8,  8, 0, GL_RGBA,         GL_UNSIGNED_BYTE,                GL_UNSIGNED_NORMALIZED, true,  RequireESOrExt<3, 0, &Extensions::sRGB>,      RequireESOrExt<3, 0, &Extensions::sRGB>,      AlwaysSupported);
>-    AddRGBAFormat(&map, GL_RGB9_E5,          true,  9,  9,  9,  0, 5, GL_RGB,          GL_UNSIGNED_INT_5_9_9_9_REV,     GL_FLOAT,               false, RequireES<3, 0>,                              NeverSupported,                               AlwaysSupported);
>-    AddRGBAFormat(&map, GL_R8I,              true,  8,  0,  0,  0, 0, GL_RED_INTEGER,  GL_BYTE,                         GL_INT,                 false, RequireES<3, 0>,                              RequireES<3, 0>,                              NeverSupported);
>-    AddRGBAFormat(&map, GL_R8UI,             true,  8,  0,  0,  0, 0, GL_RED_INTEGER,  GL_UNSIGNED_BYTE,                GL_UNSIGNED_INT,        false, RequireES<3, 0>,                              RequireES<3, 0>,                              NeverSupported);
>-    AddRGBAFormat(&map, GL_R16I,             true, 16,  0,  0,  0, 0, GL_RED_INTEGER,  GL_SHORT,                        GL_INT,                 false, RequireES<3, 0>,                              RequireES<3, 0>,                              NeverSupported);
>-    AddRGBAFormat(&map, GL_R16UI,            true, 16,  0,  0,  0, 0, GL_RED_INTEGER,  GL_UNSIGNED_SHORT,               GL_UNSIGNED_INT,        false, RequireES<3, 0>,                              RequireES<3, 0>,                              NeverSupported);
>-    AddRGBAFormat(&map, GL_R32I,             true, 32,  0,  0,  0, 0, GL_RED_INTEGER,  GL_INT,                          GL_INT,                 false, RequireES<3, 0>,                              RequireES<3, 0>,                              NeverSupported);
>-    AddRGBAFormat(&map, GL_R32UI,            true, 32,  0,  0,  0, 0, GL_RED_INTEGER,  GL_UNSIGNED_INT,                 GL_UNSIGNED_INT,        false, RequireES<3, 0>,                              RequireES<3, 0>,                              NeverSupported);
>-    AddRGBAFormat(&map, GL_RG8I,             true,  8,  8,  0,  0, 0, GL_RG_INTEGER,   GL_BYTE,                         GL_INT,                 false, RequireES<3, 0>,                              RequireES<3, 0>,                              NeverSupported);
>-    AddRGBAFormat(&map, GL_RG8UI,            true,  8,  8,  0,  0, 0, GL_RG_INTEGER,   GL_UNSIGNED_BYTE,                GL_UNSIGNED_INT,        false, RequireES<3, 0>,                              RequireES<3, 0>,                              NeverSupported);
>-    AddRGBAFormat(&map, GL_RG16I,            true, 16, 16,  0,  0, 0, GL_RG_INTEGER,   GL_SHORT,                        GL_INT,                 false, RequireES<3, 0>,                              RequireES<3, 0>,                              NeverSupported);
>-    AddRGBAFormat(&map, GL_RG16UI,           true, 16, 16,  0,  0, 0, GL_RG_INTEGER,   GL_UNSIGNED_SHORT,               GL_UNSIGNED_INT,        false, RequireES<3, 0>,                              RequireES<3, 0>,                              NeverSupported);
>-    AddRGBAFormat(&map, GL_RG32I,            true, 32, 32,  0,  0, 0, GL_RG_INTEGER,   GL_INT,                          GL_INT,                 false, RequireES<3, 0>,                              RequireES<3, 0>,                              NeverSupported);
>-    AddRGBAFormat(&map, GL_R11F_G11F_B10F,   true, 11, 11, 10,  0, 0, GL_RGB,          GL_UNSIGNED_INT_10F_11F_11F_REV, GL_FLOAT,               false, RequireES<3, 0>,                              RequireExt<&Extensions::colorBufferFloat>,    AlwaysSupported);
>-    AddRGBAFormat(&map, GL_RG32UI,           true, 32, 32,  0,  0, 0, GL_RG_INTEGER,   GL_UNSIGNED_INT,                 GL_UNSIGNED_INT,        false, RequireES<3, 0>,                              RequireES<3, 0>,                              NeverSupported);
>-    AddRGBAFormat(&map, GL_RGB8I,            true,  8,  8,  8,  0, 0, GL_RGB_INTEGER,  GL_BYTE,                         GL_INT,                 false, RequireES<3, 0>,                              NeverSupported,                               NeverSupported);
>-    AddRGBAFormat(&map, GL_RGB8UI,           true,  8,  8,  8,  0, 0, GL_RGB_INTEGER,  GL_UNSIGNED_BYTE,                GL_UNSIGNED_INT,        false, RequireES<3, 0>,                              NeverSupported,                               NeverSupported);
>-    AddRGBAFormat(&map, GL_RGB16I,           true, 16, 16, 16,  0, 0, GL_RGB_INTEGER,  GL_SHORT,                        GL_INT,                 false, RequireES<3, 0>,                              NeverSupported,                               NeverSupported);
>-    AddRGBAFormat(&map, GL_RGB16UI,          true, 16, 16, 16,  0, 0, GL_RGB_INTEGER,  GL_UNSIGNED_SHORT,               GL_UNSIGNED_INT,        false, RequireES<3, 0>,                              NeverSupported,                               NeverSupported);
>-    AddRGBAFormat(&map, GL_RGB32I,           true, 32, 32, 32,  0, 0, GL_RGB_INTEGER,  GL_INT,                          GL_INT,                 false, RequireES<3, 0>,                              NeverSupported,                               NeverSupported);
>-    AddRGBAFormat(&map, GL_RGB32UI,          true, 32, 32, 32,  0, 0, GL_RGB_INTEGER,  GL_UNSIGNED_INT,                 GL_UNSIGNED_INT,        false, RequireES<3, 0>,                              NeverSupported,                               NeverSupported);
>-    AddRGBAFormat(&map, GL_RGBA8I,           true,  8,  8,  8,  8, 0, GL_RGBA_INTEGER, GL_BYTE,                         GL_INT,                 false, RequireES<3, 0>,                              RequireES<3, 0>,                              NeverSupported);
>-    AddRGBAFormat(&map, GL_RGBA8UI,          true,  8,  8,  8,  8, 0, GL_RGBA_INTEGER, GL_UNSIGNED_BYTE,                GL_UNSIGNED_INT,        false, RequireES<3, 0>,                              RequireES<3, 0>,                              NeverSupported);
>-    AddRGBAFormat(&map, GL_RGBA16I,          true, 16, 16, 16, 16, 0, GL_RGBA_INTEGER, GL_SHORT,                        GL_INT,                 false, RequireES<3, 0>,                              RequireES<3, 0>,                              NeverSupported);
>-    AddRGBAFormat(&map, GL_RGBA16UI,         true, 16, 16, 16, 16, 0, GL_RGBA_INTEGER, GL_UNSIGNED_SHORT,               GL_UNSIGNED_INT,        false, RequireES<3, 0>,                              RequireES<3, 0>,                              NeverSupported);
>-    AddRGBAFormat(&map, GL_RGBA32I,          true, 32, 32, 32, 32, 0, GL_RGBA_INTEGER, GL_INT,                          GL_INT,                 false, RequireES<3, 0>,                              RequireES<3, 0>,                              NeverSupported);
>-    AddRGBAFormat(&map, GL_RGBA32UI,         true, 32, 32, 32, 32, 0, GL_RGBA_INTEGER, GL_UNSIGNED_INT,                 GL_UNSIGNED_INT,        false, RequireES<3, 0>,                              RequireES<3, 0>,                              NeverSupported);
>-
>-    AddRGBAFormat(&map, GL_BGRA8_EXT,        true,  8,  8,  8,  8, 0, GL_BGRA_EXT,     GL_UNSIGNED_BYTE,                  GL_UNSIGNED_NORMALIZED, false, RequireExt<&Extensions::textureFormatBGRA8888>, RequireExt<&Extensions::textureFormatBGRA8888>, AlwaysSupported);
>-    AddRGBAFormat(&map, GL_BGRA4_ANGLEX,     true,  4,  4,  4,  4, 0, GL_BGRA_EXT,     GL_UNSIGNED_SHORT_4_4_4_4_REV_EXT, GL_UNSIGNED_NORMALIZED, false, RequireExt<&Extensions::textureFormatBGRA8888>, RequireExt<&Extensions::textureFormatBGRA8888>, AlwaysSupported);
>-    AddRGBAFormat(&map, GL_BGR5_A1_ANGLEX,   true,  5,  5,  5,  1, 0, GL_BGRA_EXT,     GL_UNSIGNED_SHORT_1_5_5_5_REV_EXT, GL_UNSIGNED_NORMALIZED, false, RequireExt<&Extensions::textureFormatBGRA8888>, RequireExt<&Extensions::textureFormatBGRA8888>, AlwaysSupported);
>+    //                 | Internal format     |sized| R | G | B | A |S | Format         | Type                             | Component type        | SRGB | Texture supported                                | Filterable     | Texture attachment                               | Renderbuffer                                 |
>+    AddRGBAFormat(&map, GL_R8,                true,  8,  0,  0,  0, 0, GL_RED,          GL_UNSIGNED_BYTE,                  GL_UNSIGNED_NORMALIZED, false, SizedRGSupport,                                    AlwaysSupported, SizedRGSupport,                                    RequireESOrExt<3, 0, &Extensions::textureRG>  );
>+    AddRGBAFormat(&map, GL_R8_SNORM,          true,  8,  0,  0,  0, 0, GL_RED,          GL_BYTE,                           GL_SIGNED_NORMALIZED,   false, RequireES<3, 0>,                                   AlwaysSupported, NeverSupported,                                    NeverSupported                                );
>+    AddRGBAFormat(&map, GL_RG8,               true,  8,  8,  0,  0, 0, GL_RG,           GL_UNSIGNED_BYTE,                  GL_UNSIGNED_NORMALIZED, false, SizedRGSupport,                                    AlwaysSupported, SizedRGSupport,                                    RequireESOrExt<3, 0, &Extensions::textureRG>  );
>+    AddRGBAFormat(&map, GL_RG8_SNORM,         true,  8,  8,  0,  0, 0, GL_RG,           GL_BYTE,                           GL_SIGNED_NORMALIZED,   false, RequireES<3, 0>,                                   AlwaysSupported, NeverSupported,                                    NeverSupported                                );
>+    AddRGBAFormat(&map, GL_RGB8,              true,  8,  8,  8,  0, 0, GL_RGB,          GL_UNSIGNED_BYTE,                  GL_UNSIGNED_NORMALIZED, false, RequireESOrExt<3, 0, &Extensions::textureStorage>, AlwaysSupported, RequireESOrExt<3, 0, &Extensions::textureStorage>, RequireESOrExt<3, 0, &Extensions::rgb8rgba8>  );
>+    AddRGBAFormat(&map, GL_RGB8_SNORM,        true,  8,  8,  8,  0, 0, GL_RGB,          GL_BYTE,                           GL_SIGNED_NORMALIZED,   false, RequireES<3, 0>,                                   AlwaysSupported, NeverSupported,                                    NeverSupported                                );
>+    AddRGBAFormat(&map, GL_RGB565,            true,  5,  6,  5,  0, 0, GL_RGB,          GL_UNSIGNED_SHORT_5_6_5,           GL_UNSIGNED_NORMALIZED, false, RequireESOrExt<3, 0, &Extensions::textureStorage>, AlwaysSupported, RequireESOrExt<3, 0, &Extensions::textureStorage>, RequireES<2, 0>                               );
>+    AddRGBAFormat(&map, GL_RGBA4,             true,  4,  4,  4,  4, 0, GL_RGBA,         GL_UNSIGNED_SHORT_4_4_4_4,         GL_UNSIGNED_NORMALIZED, false, RequireESOrExt<3, 0, &Extensions::textureStorage>, AlwaysSupported, RequireESOrExt<3, 0, &Extensions::textureStorage>, RequireES<2, 0>                               );
>+    AddRGBAFormat(&map, GL_RGB5_A1,           true,  5,  5,  5,  1, 0, GL_RGBA,         GL_UNSIGNED_SHORT_5_5_5_1,         GL_UNSIGNED_NORMALIZED, false, RequireESOrExt<3, 0, &Extensions::textureStorage>, AlwaysSupported, RequireESOrExt<3, 0, &Extensions::textureStorage>, RequireES<2, 0>                               );
>+    AddRGBAFormat(&map, GL_RGBA8,             true,  8,  8,  8,  8, 0, GL_RGBA,         GL_UNSIGNED_BYTE,                  GL_UNSIGNED_NORMALIZED, false, RequireESOrExt<3, 0, &Extensions::textureStorage>, AlwaysSupported, RequireESOrExt<3, 0, &Extensions::textureStorage>, RequireESOrExt<3, 0, &Extensions::rgb8rgba8>  );
>+    AddRGBAFormat(&map, GL_RGBA8_SNORM,       true,  8,  8,  8,  8, 0, GL_RGBA,         GL_BYTE,                           GL_SIGNED_NORMALIZED,   false, RequireES<3, 0>,                                   AlwaysSupported, NeverSupported,                                    NeverSupported                                );
>+    AddRGBAFormat(&map, GL_RGB10_A2,          true, 10, 10, 10,  2, 0, GL_RGBA,         GL_UNSIGNED_INT_2_10_10_10_REV,    GL_UNSIGNED_NORMALIZED, false, RequireES<3, 0>,                                   AlwaysSupported, RequireES<3, 0>,                                   RequireES<3, 0>                               );
>+    AddRGBAFormat(&map, GL_RGB10_A2UI,        true, 10, 10, 10,  2, 0, GL_RGBA_INTEGER, GL_UNSIGNED_INT_2_10_10_10_REV,    GL_UNSIGNED_INT,        false, RequireES<3, 0>,                                   NeverSupported,  RequireES<3, 0>,                                   RequireES<3, 0>                               );
>+    AddRGBAFormat(&map, GL_SRGB8,             true,  8,  8,  8,  0, 0, GL_RGB,          GL_UNSIGNED_BYTE,                  GL_UNSIGNED_NORMALIZED, true,  RequireES<3, 0>,                                   AlwaysSupported, NeverSupported,                                    NeverSupported                                );
>+    AddRGBAFormat(&map, GL_SRGB8_ALPHA8,      true,  8,  8,  8,  8, 0, GL_RGBA,         GL_UNSIGNED_BYTE,                  GL_UNSIGNED_NORMALIZED, true,  RequireES<3, 0>,                                   AlwaysSupported, RequireES<3, 0>,                                   RequireESOrExt<3, 0, &Extensions::sRGB>       );
>+    AddRGBAFormat(&map, GL_R11F_G11F_B10F,    true, 11, 11, 10,  0, 0, GL_RGB,          GL_UNSIGNED_INT_10F_11F_11F_REV,   GL_FLOAT,               false, RequireES<3, 0>,                                   AlwaysSupported, RequireExt<&Extensions::colorBufferFloat>,         RequireExt<&Extensions::colorBufferFloat>     );
>+    AddRGBAFormat(&map, GL_RGB9_E5,           true,  9,  9,  9,  0, 5, GL_RGB,          GL_UNSIGNED_INT_5_9_9_9_REV,       GL_FLOAT,               false, RequireES<3, 0>,                                   AlwaysSupported, NeverSupported,                                    NeverSupported                                );
>+    AddRGBAFormat(&map, GL_R8I,               true,  8,  0,  0,  0, 0, GL_RED_INTEGER,  GL_BYTE,                           GL_INT,                 false, RequireES<3, 0>,                                   NeverSupported,  RequireES<3, 0>,                                   RequireES<3, 0>                               );
>+    AddRGBAFormat(&map, GL_R8UI,              true,  8,  0,  0,  0, 0, GL_RED_INTEGER,  GL_UNSIGNED_BYTE,                  GL_UNSIGNED_INT,        false, RequireES<3, 0>,                                   NeverSupported,  RequireES<3, 0>,                                   RequireES<3, 0>                               );
>+    AddRGBAFormat(&map, GL_R16I,              true, 16,  0,  0,  0, 0, GL_RED_INTEGER,  GL_SHORT,                          GL_INT,                 false, RequireES<3, 0>,                                   NeverSupported,  RequireES<3, 0>,                                   RequireES<3, 0>                               );
>+    AddRGBAFormat(&map, GL_R16UI,             true, 16,  0,  0,  0, 0, GL_RED_INTEGER,  GL_UNSIGNED_SHORT,                 GL_UNSIGNED_INT,        false, RequireES<3, 0>,                                   NeverSupported,  RequireES<3, 0>,                                   RequireES<3, 0>                               );
>+    AddRGBAFormat(&map, GL_R32I,              true, 32,  0,  0,  0, 0, GL_RED_INTEGER,  GL_INT,                            GL_INT,                 false, RequireES<3, 0>,                                   NeverSupported,  RequireES<3, 0>,                                   RequireES<3, 0>                               );
>+    AddRGBAFormat(&map, GL_R32UI,             true, 32,  0,  0,  0, 0, GL_RED_INTEGER,  GL_UNSIGNED_INT,                   GL_UNSIGNED_INT,        false, RequireES<3, 0>,                                   NeverSupported,  RequireES<3, 0>,                                   RequireES<3, 0>                               );
>+    AddRGBAFormat(&map, GL_RG8I,              true,  8,  8,  0,  0, 0, GL_RG_INTEGER,   GL_BYTE,                           GL_INT,                 false, RequireES<3, 0>,                                   NeverSupported,  RequireES<3, 0>,                                   RequireES<3, 0>                               );
>+    AddRGBAFormat(&map, GL_RG8UI,             true,  8,  8,  0,  0, 0, GL_RG_INTEGER,   GL_UNSIGNED_BYTE,                  GL_UNSIGNED_INT,        false, RequireES<3, 0>,                                   NeverSupported,  RequireES<3, 0>,                                   RequireES<3, 0>                               );
>+    AddRGBAFormat(&map, GL_RG16I,             true, 16, 16,  0,  0, 0, GL_RG_INTEGER,   GL_SHORT,                          GL_INT,                 false, RequireES<3, 0>,                                   NeverSupported,  RequireES<3, 0>,                                   RequireES<3, 0>                               );
>+    AddRGBAFormat(&map, GL_RG16UI,            true, 16, 16,  0,  0, 0, GL_RG_INTEGER,   GL_UNSIGNED_SHORT,                 GL_UNSIGNED_INT,        false, RequireES<3, 0>,                                   NeverSupported,  RequireES<3, 0>,                                   RequireES<3, 0>                               );
>+    AddRGBAFormat(&map, GL_RG32I,             true, 32, 32,  0,  0, 0, GL_RG_INTEGER,   GL_INT,                            GL_INT,                 false, RequireES<3, 0>,                                   NeverSupported,  RequireES<3, 0>,                                   RequireES<3, 0>                               );
>+    AddRGBAFormat(&map, GL_RG32UI,            true, 32, 32,  0,  0, 0, GL_RG_INTEGER,   GL_UNSIGNED_INT,                   GL_UNSIGNED_INT,        false, RequireES<3, 0>,                                   NeverSupported,  RequireES<3, 0>,                                   RequireES<3, 0>                               );
>+    AddRGBAFormat(&map, GL_RGB8I,             true,  8,  8,  8,  0, 0, GL_RGB_INTEGER,  GL_BYTE,                           GL_INT,                 false, RequireES<3, 0>,                                   NeverSupported,  NeverSupported,                                    NeverSupported                                );
>+    AddRGBAFormat(&map, GL_RGB8UI,            true,  8,  8,  8,  0, 0, GL_RGB_INTEGER,  GL_UNSIGNED_BYTE,                  GL_UNSIGNED_INT,        false, RequireES<3, 0>,                                   NeverSupported,  NeverSupported,                                    NeverSupported                                );
>+    AddRGBAFormat(&map, GL_RGB16I,            true, 16, 16, 16,  0, 0, GL_RGB_INTEGER,  GL_SHORT,                          GL_INT,                 false, RequireES<3, 0>,                                   NeverSupported,  NeverSupported,                                    NeverSupported                                );
>+    AddRGBAFormat(&map, GL_RGB16UI,           true, 16, 16, 16,  0, 0, GL_RGB_INTEGER,  GL_UNSIGNED_SHORT,                 GL_UNSIGNED_INT,        false, RequireES<3, 0>,                                   NeverSupported,  NeverSupported,                                    NeverSupported                                );
>+    AddRGBAFormat(&map, GL_RGB32I,            true, 32, 32, 32,  0, 0, GL_RGB_INTEGER,  GL_INT,                            GL_INT,                 false, RequireES<3, 0>,                                   NeverSupported,  NeverSupported,                                    NeverSupported                                );
>+    AddRGBAFormat(&map, GL_RGB32UI,           true, 32, 32, 32,  0, 0, GL_RGB_INTEGER,  GL_UNSIGNED_INT,                   GL_UNSIGNED_INT,        false, RequireES<3, 0>,                                   NeverSupported,  NeverSupported,                                    NeverSupported                                );
>+    AddRGBAFormat(&map, GL_RGBA8I,            true,  8,  8,  8,  8, 0, GL_RGBA_INTEGER, GL_BYTE,                           GL_INT,                 false, RequireES<3, 0>,                                   NeverSupported,  RequireES<3, 0>,                                   RequireES<3, 0>                               );
>+    AddRGBAFormat(&map, GL_RGBA8UI,           true,  8,  8,  8,  8, 0, GL_RGBA_INTEGER, GL_UNSIGNED_BYTE,                  GL_UNSIGNED_INT,        false, RequireES<3, 0>,                                   NeverSupported,  RequireES<3, 0>,                                   RequireES<3, 0>                               );
>+    AddRGBAFormat(&map, GL_RGBA16I,           true, 16, 16, 16, 16, 0, GL_RGBA_INTEGER, GL_SHORT,                          GL_INT,                 false, RequireES<3, 0>,                                   NeverSupported,  RequireES<3, 0>,                                   RequireES<3, 0>                               );
>+    AddRGBAFormat(&map, GL_RGBA16UI,          true, 16, 16, 16, 16, 0, GL_RGBA_INTEGER, GL_UNSIGNED_SHORT,                 GL_UNSIGNED_INT,        false, RequireES<3, 0>,                                   NeverSupported,  RequireES<3, 0>,                                   RequireES<3, 0>                               );
>+    AddRGBAFormat(&map, GL_RGBA32I,           true, 32, 32, 32, 32, 0, GL_RGBA_INTEGER, GL_INT,                            GL_INT,                 false, RequireES<3, 0>,                                   NeverSupported,  RequireES<3, 0>,                                   RequireES<3, 0>                               );
>+    AddRGBAFormat(&map, GL_RGBA32UI,          true, 32, 32, 32, 32, 0, GL_RGBA_INTEGER, GL_UNSIGNED_INT,                   GL_UNSIGNED_INT,        false, RequireES<3, 0>,                                   NeverSupported,  RequireES<3, 0>,                                   RequireES<3, 0>                               );
>+
>+    AddRGBAFormat(&map, GL_BGRA8_EXT,         true,  8,  8,  8,  8, 0, GL_BGRA_EXT,     GL_UNSIGNED_BYTE,                  GL_UNSIGNED_NORMALIZED, false, RequireExt<&Extensions::textureFormatBGRA8888>,    AlwaysSupported, RequireExt<&Extensions::textureFormatBGRA8888>,    RequireExt<&Extensions::textureFormatBGRA8888>);
>+    AddRGBAFormat(&map, GL_BGRA4_ANGLEX,      true,  4,  4,  4,  4, 0, GL_BGRA_EXT,     GL_UNSIGNED_SHORT_4_4_4_4_REV_EXT, GL_UNSIGNED_NORMALIZED, false, RequireExt<&Extensions::textureFormatBGRA8888>,    AlwaysSupported, RequireExt<&Extensions::textureFormatBGRA8888>,    RequireExt<&Extensions::textureFormatBGRA8888>);
>+    AddRGBAFormat(&map, GL_BGR5_A1_ANGLEX,    true,  5,  5,  5,  1, 0, GL_BGRA_EXT,     GL_UNSIGNED_SHORT_1_5_5_5_REV_EXT, GL_UNSIGNED_NORMALIZED, false, RequireExt<&Extensions::textureFormatBGRA8888>,    AlwaysSupported, RequireExt<&Extensions::textureFormatBGRA8888>,    RequireExt<&Extensions::textureFormatBGRA8888>);
>+
>+    // Special format that is used for D3D textures that are used within ANGLE via the
>+    // EGL_ANGLE_d3d_texture_client_buffer extension. We don't allow uploading texture images with
>+    // this format, but textures in this format can be created from D3D textures, and filtering them
>+    // and rendering to them is allowed.
>+    AddRGBAFormat(&map, GL_BGRA8_SRGB_ANGLEX, true,  8,  8,  8,  8, 0, GL_BGRA_EXT,     GL_UNSIGNED_BYTE,                  GL_UNSIGNED_NORMALIZED, true,  NeverSupported,                                    AlwaysSupported, AlwaysSupported,                                   AlwaysSupported                               );
> 
>     // Special format which is not really supported, so always false for all supports.
>-    AddRGBAFormat(&map, GL_BGR565_ANGLEX,    true,  5,  6,  5,  1, 0, GL_BGRA_EXT,     GL_UNSIGNED_SHORT_5_6_5,           GL_UNSIGNED_NORMALIZED, false, NeverSupported, NeverSupported, NeverSupported);
>-
>-    // Floating point renderability and filtering is provided by OES_texture_float and OES_texture_half_float
>-    //                 | Internal format    |sized| D |S | Format             | Type                                   | Comp   | SRGB |  Texture supported | Renderable                    | Filterable                                    |
>-    //                 |                    |     |   |  |                    |                                        | type   |      |                    |                               |                                               |
>-    AddRGBAFormat(&map, GL_R16F,             true, 16,  0,  0,  0, 0, GL_RED,          GL_HALF_FLOAT,                   GL_FLOAT, false, HalfFloatRGSupport, HalfFloatRGRenderableSupport,   RequireESOrExt<3, 0, &Extensions::textureHalfFloatLinear>);
>-    AddRGBAFormat(&map, GL_RG16F,            true, 16, 16,  0,  0, 0, GL_RG,           GL_HALF_FLOAT,                   GL_FLOAT, false, HalfFloatRGSupport, HalfFloatRGRenderableSupport,   RequireESOrExt<3, 0, &Extensions::textureHalfFloatLinear>);
>-    AddRGBAFormat(&map, GL_RGB16F,           true, 16, 16, 16,  0, 0, GL_RGB,          GL_HALF_FLOAT,                   GL_FLOAT, false, HalfFloatSupport,   HalfFloatRGBRenderableSupport,  RequireESOrExt<3, 0, &Extensions::textureHalfFloatLinear>);
>-    AddRGBAFormat(&map, GL_RGBA16F,          true, 16, 16, 16, 16, 0, GL_RGBA,         GL_HALF_FLOAT,                   GL_FLOAT, false, HalfFloatSupport,   HalfFloatRGBARenderableSupport, RequireESOrExt<3, 0, &Extensions::textureHalfFloatLinear>);
>-    AddRGBAFormat(&map, GL_R32F,             true, 32,  0,  0,  0, 0, GL_RED,          GL_FLOAT,                        GL_FLOAT, false, FloatRGSupport,     FloatRGRenderableSupport,       RequireExt<&Extensions::textureFloatLinear>              );
>-    AddRGBAFormat(&map, GL_RG32F,            true, 32, 32,  0,  0, 0, GL_RG,           GL_FLOAT,                        GL_FLOAT, false, FloatRGSupport,     FloatRGRenderableSupport,       RequireExt<&Extensions::textureFloatLinear>              );
>-    AddRGBAFormat(&map, GL_RGB32F,           true, 32, 32, 32,  0, 0, GL_RGB,          GL_FLOAT,                        GL_FLOAT, false, FloatSupport,       FloatRGBRenderableSupport,      RequireExt<&Extensions::textureFloatLinear>              );
>-    AddRGBAFormat(&map, GL_RGBA32F,          true, 32, 32, 32, 32, 0, GL_RGBA,         GL_FLOAT,                        GL_FLOAT, false, FloatSupport,       FloatRGBARenderableSupport,     RequireExt<&Extensions::textureFloatLinear>              );
>+    AddRGBAFormat(&map, GL_BGRX8_ANGLEX,      true,  8,  8,  8,  0, 0, GL_BGRA_EXT,     GL_UNSIGNED_BYTE,                  GL_UNSIGNED_NORMALIZED, false, NeverSupported,                                    NeverSupported,  NeverSupported,                                    NeverSupported                                );
>+    AddRGBAFormat(&map, GL_BGR565_ANGLEX,     true,  5,  6,  5,  1, 0, GL_BGRA_EXT,     GL_UNSIGNED_SHORT_5_6_5,           GL_UNSIGNED_NORMALIZED, false, NeverSupported,                                    NeverSupported,  NeverSupported,                                    NeverSupported                                );
>+
>+    // Floating point formats
>+    //                 | Internal format |sized| R | G | B | A |S | Format | Type             | Component type | SRGB | Texture supported         | Filterable                                 | Texture attachment                          | Renderbuffer                            |
>+    // It's not possible to have two entries per sized format.
>+    // E.g. for GL_RG16F, one with GL_HALF_FLOAT type and the other with GL_HALF_FLOAT_OES type.
>+    // So, GL_HALF_FLOAT type formats conditions are merged with GL_HALF_FLOAT_OES type conditions.
>+    AddRGBAFormat(&map, GL_R16F,          true, 16,  0,  0,  0, 0, GL_RED,  GL_HALF_FLOAT,     GL_FLOAT,        false, SizedHalfFloatRGSupport,    SizedHalfFloatFilterSupport,                 SizedHalfFloatRGTextureAttachmentSupport,     SizedHalfFloatRGRenderbufferSupport      );
>+    AddRGBAFormat(&map, GL_RG16F,         true, 16, 16,  0,  0, 0, GL_RG,   GL_HALF_FLOAT,     GL_FLOAT,        false, SizedHalfFloatRGSupport,    SizedHalfFloatFilterSupport,                 SizedHalfFloatRGTextureAttachmentSupport,     SizedHalfFloatRGRenderbufferSupport      );
>+    AddRGBAFormat(&map, GL_RGB16F,        true, 16, 16, 16,  0, 0, GL_RGB,  GL_HALF_FLOAT,     GL_FLOAT,        false, SizedHalfFloatSupport,      SizedHalfFloatFilterSupport,                 SizedHalfFloatRGBTextureAttachmentSupport,    SizedHalfFloatRGBRenderbufferSupport     );
>+    AddRGBAFormat(&map, GL_RGBA16F,       true, 16, 16, 16, 16, 0, GL_RGBA, GL_HALF_FLOAT,     GL_FLOAT,        false, SizedHalfFloatSupport,      SizedHalfFloatFilterSupport,                 SizedHalfFloatRGBATextureAttachmentSupport,   SizedHalfFloatRGBARenderbufferSupport    );
>+    AddRGBAFormat(&map, GL_R32F,          true, 32,  0,  0,  0, 0, GL_RED,  GL_FLOAT,          GL_FLOAT,        false, SizedFloatRGSupport,        RequireExt<&Extensions::textureFloatLinear>, RequireExt<&Extensions::colorBufferFloat>,    RequireExt<&Extensions::colorBufferFloat>);
>+    AddRGBAFormat(&map, GL_RG32F,         true, 32, 32,  0,  0, 0, GL_RG,   GL_FLOAT,          GL_FLOAT,        false, SizedFloatRGSupport,        RequireExt<&Extensions::textureFloatLinear>, RequireExt<&Extensions::colorBufferFloat>,    RequireExt<&Extensions::colorBufferFloat>);
>+    AddRGBAFormat(&map, GL_RGB32F,        true, 32, 32, 32,  0, 0, GL_RGB,  GL_FLOAT,          GL_FLOAT,        false, SizedFloatRGBSupport,       RequireExt<&Extensions::textureFloatLinear>, RequireExt<&Extensions::colorBufferFloatRGB>, NeverSupported                           );
>+    AddRGBAFormat(&map, GL_RGBA32F,       true, 32, 32, 32, 32, 0, GL_RGBA, GL_FLOAT,          GL_FLOAT,        false, SizedFloatRGBASupport,      RequireExt<&Extensions::textureFloatLinear>, SizedFloatRGBARenderableSupport,              SizedFloatRGBARenderableSupport          );
> 
>     // Depth stencil formats
>-    //                         | Internal format         |sized| D |S | X | Format            | Type                             | Component type        | Supported                                       | Renderable                                                                            | Filterable                                  |
>-    AddDepthStencilFormat(&map, GL_DEPTH_COMPONENT16,     true, 16, 0,  0, GL_DEPTH_COMPONENT, GL_UNSIGNED_SHORT,                 GL_UNSIGNED_NORMALIZED, RequireES<2, 0>,                                  RequireES<2, 0>,                                                                        RequireESOrExt<3, 0, &Extensions::depthTextures>);
>-    AddDepthStencilFormat(&map, GL_DEPTH_COMPONENT24,     true, 24, 0,  0, GL_DEPTH_COMPONENT, GL_UNSIGNED_INT,                   GL_UNSIGNED_NORMALIZED, RequireES<3, 0>,                                  RequireES<3, 0>,                                                                        RequireESOrExt<3, 0, &Extensions::depthTextures>);
>-    AddDepthStencilFormat(&map, GL_DEPTH_COMPONENT32F,    true, 32, 0,  0, GL_DEPTH_COMPONENT, GL_FLOAT,                          GL_FLOAT,               RequireES<3, 0>,                                  RequireES<3, 0>,                                                                        RequireESOrExt<3, 0, &Extensions::depthTextures>);
>-    AddDepthStencilFormat(&map, GL_DEPTH_COMPONENT32_OES, true, 32, 0,  0, GL_DEPTH_COMPONENT, GL_UNSIGNED_INT,                   GL_UNSIGNED_NORMALIZED, RequireExtOrExt<&Extensions::depthTextures, &Extensions::depth32>, RequireExtOrExt<&Extensions::depthTextures, &Extensions::depth32>,     AlwaysSupported                                 );
>-    AddDepthStencilFormat(&map, GL_DEPTH24_STENCIL8,      true, 24, 8,  0, GL_DEPTH_STENCIL,   GL_UNSIGNED_INT_24_8,              GL_UNSIGNED_NORMALIZED, RequireESOrExt<3, 0, &Extensions::depthTextures>, RequireESOrExtOrExt<3, 0, &Extensions::depthTextures, &Extensions::packedDepthStencil>, AlwaysSupported                                 );
>-    AddDepthStencilFormat(&map, GL_DEPTH32F_STENCIL8,     true, 32, 8, 24, GL_DEPTH_STENCIL,   GL_FLOAT_32_UNSIGNED_INT_24_8_REV, GL_FLOAT,               RequireES<3, 0>,                                  RequireES<3, 0>,                                                                        AlwaysSupported                                 );
>+    //                         | Internal format         |sized| D |S | X | Format            | Type                             | Component type        | Texture supported                                                | Filterable                                      | Texture attachment                                                                   | Renderbuffer                                                                         |
>+    AddDepthStencilFormat(&map, GL_DEPTH_COMPONENT16,     true, 16, 0,  0, GL_DEPTH_COMPONENT, GL_UNSIGNED_SHORT,                 GL_UNSIGNED_NORMALIZED, RequireES<1, 0>,                                                   RequireESOrExt<3, 0, &Extensions::depthTextures>, RequireES<1, 0>,                                                                        RequireES<1, 0>                                                                       );
>+    AddDepthStencilFormat(&map, GL_DEPTH_COMPONENT24,     true, 24, 0,  0, GL_DEPTH_COMPONENT, GL_UNSIGNED_INT,                   GL_UNSIGNED_NORMALIZED, RequireES<3, 0>,                                                   RequireESOrExt<3, 0, &Extensions::depthTextures>, RequireES<3, 0>,                                                                        RequireES<3, 0>                                                                       );
>+    AddDepthStencilFormat(&map, GL_DEPTH_COMPONENT32F,    true, 32, 0,  0, GL_DEPTH_COMPONENT, GL_FLOAT,                          GL_FLOAT,               RequireES<3, 0>,                                                   RequireESOrExt<3, 0, &Extensions::depthTextures>, RequireES<3, 0>,                                                                        RequireES<3, 0>                                                                       );
>+    AddDepthStencilFormat(&map, GL_DEPTH_COMPONENT32_OES, true, 32, 0,  0, GL_DEPTH_COMPONENT, GL_UNSIGNED_INT,                   GL_UNSIGNED_NORMALIZED, RequireExtOrExt<&Extensions::depthTextures, &Extensions::depth32>, AlwaysSupported,                                  RequireExtOrExt<&Extensions::depthTextures, &Extensions::depth32>,                      RequireExtOrExt<&Extensions::depthTextures, &Extensions::depth32>                     );
>+    AddDepthStencilFormat(&map, GL_DEPTH24_STENCIL8,      true, 24, 8,  0, GL_DEPTH_STENCIL,   GL_UNSIGNED_INT_24_8,              GL_UNSIGNED_NORMALIZED, RequireESOrExt<3, 0, &Extensions::depthTextures>,                  AlwaysSupported,                                  RequireESOrExtOrExt<3, 0, &Extensions::depthTextures, &Extensions::packedDepthStencil>, RequireESOrExtOrExt<3, 0, &Extensions::depthTextures, &Extensions::packedDepthStencil>);
>+    AddDepthStencilFormat(&map, GL_DEPTH32F_STENCIL8,     true, 32, 8, 24, GL_DEPTH_STENCIL,   GL_FLOAT_32_UNSIGNED_INT_24_8_REV, GL_FLOAT,               RequireES<3, 0>,                                                   AlwaysSupported,                                  RequireES<3, 0>,                                                                        RequireES<3, 0>                                                                       );
>     // STENCIL_INDEX8 is special-cased, see around the bottom of the list.
> 
>     // Luminance alpha formats
>-    //                | Internal format           |sized| L | A | Format            | Type             | Component type        | Supported                                                                   | Renderable    | Filterable    |
>-    AddLUMAFormat(&map, GL_ALPHA8_EXT,             true,  0,  8, GL_ALPHA,           GL_UNSIGNED_BYTE,  GL_UNSIGNED_NORMALIZED, RequireExt<&Extensions::textureStorage>,                                      NeverSupported, AlwaysSupported);
>-    AddLUMAFormat(&map, GL_LUMINANCE8_EXT,         true,  8,  0, GL_LUMINANCE,       GL_UNSIGNED_BYTE,  GL_UNSIGNED_NORMALIZED, RequireExt<&Extensions::textureStorage>,                                      NeverSupported, AlwaysSupported);
>-    AddLUMAFormat(&map, GL_LUMINANCE8_ALPHA8_EXT,  true,  8,  8, GL_LUMINANCE_ALPHA, GL_UNSIGNED_BYTE,  GL_UNSIGNED_NORMALIZED, RequireExt<&Extensions::textureStorage>,                                      NeverSupported, AlwaysSupported);
>-    AddLUMAFormat(&map, GL_ALPHA16F_EXT,           true,  0, 16, GL_ALPHA,           GL_HALF_FLOAT_OES, GL_FLOAT,               RequireExtAndExt<&Extensions::textureStorage, &Extensions::textureHalfFloat>, NeverSupported, RequireESOrExt<3, 0, &Extensions::textureHalfFloatLinear>);
>-    AddLUMAFormat(&map, GL_LUMINANCE16F_EXT,       true, 16,  0, GL_LUMINANCE,       GL_HALF_FLOAT_OES, GL_FLOAT,               RequireExtAndExt<&Extensions::textureStorage, &Extensions::textureHalfFloat>, NeverSupported, RequireESOrExt<3, 0, &Extensions::textureHalfFloatLinear>);
>-    AddLUMAFormat(&map, GL_LUMINANCE_ALPHA16F_EXT, true, 16, 16, GL_LUMINANCE_ALPHA, GL_HALF_FLOAT_OES, GL_FLOAT,               RequireExtAndExt<&Extensions::textureStorage, &Extensions::textureHalfFloat>, NeverSupported, RequireESOrExt<3, 0, &Extensions::textureHalfFloatLinear>);
>-    AddLUMAFormat(&map, GL_ALPHA32F_EXT,           true,  0, 32, GL_ALPHA,           GL_FLOAT,          GL_FLOAT,               RequireExtAndExt<&Extensions::textureStorage, &Extensions::textureFloat>,     NeverSupported, RequireExt<&Extensions::textureFloatLinear>);
>-    AddLUMAFormat(&map, GL_LUMINANCE32F_EXT,       true, 32,  0, GL_LUMINANCE,       GL_FLOAT,          GL_FLOAT,               RequireExtAndExt<&Extensions::textureStorage, &Extensions::textureFloat>,     NeverSupported, RequireExt<&Extensions::textureFloatLinear>);
>-    AddLUMAFormat(&map, GL_LUMINANCE_ALPHA32F_EXT, true, 32, 32, GL_LUMINANCE_ALPHA, GL_FLOAT,          GL_FLOAT,               RequireExtAndExt<&Extensions::textureStorage, &Extensions::textureFloat>,     NeverSupported, RequireExt<&Extensions::textureFloatLinear>);
>+    //                | Internal format           |sized| L | A | Format            | Type             | Component type        | Texture supported                                                           | Filterable                                     | Texture attachment | Renderbuffer |
>+    AddLUMAFormat(&map, GL_ALPHA8_EXT,             true,  0,  8, GL_ALPHA,           GL_UNSIGNED_BYTE,  GL_UNSIGNED_NORMALIZED, RequireExt<&Extensions::textureStorage>,                                      AlwaysSupported,                                 NeverSupported,      NeverSupported);
>+    AddLUMAFormat(&map, GL_LUMINANCE8_EXT,         true,  8,  0, GL_LUMINANCE,       GL_UNSIGNED_BYTE,  GL_UNSIGNED_NORMALIZED, RequireExt<&Extensions::textureStorage>,                                      AlwaysSupported,                                 NeverSupported,      NeverSupported);
>+    AddLUMAFormat(&map, GL_LUMINANCE8_ALPHA8_EXT,  true,  8,  8, GL_LUMINANCE_ALPHA, GL_UNSIGNED_BYTE,  GL_UNSIGNED_NORMALIZED, RequireExt<&Extensions::textureStorage>,                                      AlwaysSupported,                                 NeverSupported,      NeverSupported);
>+    AddLUMAFormat(&map, GL_ALPHA16F_EXT,           true,  0, 16, GL_ALPHA,           GL_HALF_FLOAT_OES, GL_FLOAT,               RequireExtAndExt<&Extensions::textureStorage, &Extensions::textureHalfFloat>, RequireExt<&Extensions::textureHalfFloatLinear>, NeverSupported,      NeverSupported);
>+    AddLUMAFormat(&map, GL_LUMINANCE16F_EXT,       true, 16,  0, GL_LUMINANCE,       GL_HALF_FLOAT_OES, GL_FLOAT,               RequireExtAndExt<&Extensions::textureStorage, &Extensions::textureHalfFloat>, RequireExt<&Extensions::textureHalfFloatLinear>, NeverSupported,      NeverSupported);
>+    AddLUMAFormat(&map, GL_LUMINANCE_ALPHA16F_EXT, true, 16, 16, GL_LUMINANCE_ALPHA, GL_HALF_FLOAT_OES, GL_FLOAT,               RequireExtAndExt<&Extensions::textureStorage, &Extensions::textureHalfFloat>, RequireExt<&Extensions::textureHalfFloatLinear>, NeverSupported,      NeverSupported);
>+    AddLUMAFormat(&map, GL_ALPHA32F_EXT,           true,  0, 32, GL_ALPHA,           GL_FLOAT,          GL_FLOAT,               RequireExtAndExt<&Extensions::textureStorage, &Extensions::textureFloat>,     RequireExt<&Extensions::textureFloatLinear>,     NeverSupported,      NeverSupported);
>+    AddLUMAFormat(&map, GL_LUMINANCE32F_EXT,       true, 32,  0, GL_LUMINANCE,       GL_FLOAT,          GL_FLOAT,               RequireExtAndExt<&Extensions::textureStorage, &Extensions::textureFloat>,     RequireExt<&Extensions::textureFloatLinear>,     NeverSupported,      NeverSupported);
>+    AddLUMAFormat(&map, GL_LUMINANCE_ALPHA32F_EXT, true, 32, 32, GL_LUMINANCE_ALPHA, GL_FLOAT,          GL_FLOAT,               RequireExtAndExt<&Extensions::textureStorage, &Extensions::textureFloat>,     RequireExt<&Extensions::textureFloatLinear>,     NeverSupported,      NeverSupported);
> 
>     // Compressed formats, From ES 3.0.1 spec, table 3.16
>-    //                       | Internal format                             |W |H | BS |CC| Format | Type            | SRGB | Supported      | Renderable    | Filterable    |
>-    AddCompressedFormat(&map, GL_COMPRESSED_R11_EAC,                        4, 4,  64, 1, GL_RED,  GL_UNSIGNED_BYTE, false, RequireES<3, 0>, NeverSupported, AlwaysSupported);
>-    AddCompressedFormat(&map, GL_COMPRESSED_SIGNED_R11_EAC,                 4, 4,  64, 1, GL_RED,  GL_UNSIGNED_BYTE, false, RequireES<3, 0>, NeverSupported, AlwaysSupported);
>-    AddCompressedFormat(&map, GL_COMPRESSED_RG11_EAC,                       4, 4, 128, 2, GL_RG,   GL_UNSIGNED_BYTE, false, RequireES<3, 0>, NeverSupported, AlwaysSupported);
>-    AddCompressedFormat(&map, GL_COMPRESSED_SIGNED_RG11_EAC,                4, 4, 128, 2, GL_RG,   GL_UNSIGNED_BYTE, false, RequireES<3, 0>, NeverSupported, AlwaysSupported);
>-    AddCompressedFormat(&map, GL_COMPRESSED_RGB8_ETC2,                      4, 4,  64, 3, GL_RGB,  GL_UNSIGNED_BYTE, false, RequireES<3, 0>, NeverSupported, AlwaysSupported);
>-    AddCompressedFormat(&map, GL_COMPRESSED_SRGB8_ETC2,                     4, 4,  64, 3, GL_RGB,  GL_UNSIGNED_BYTE, true,  RequireES<3, 0>, NeverSupported, AlwaysSupported);
>-    AddCompressedFormat(&map, GL_COMPRESSED_RGB8_PUNCHTHROUGH_ALPHA1_ETC2,  4, 4,  64, 3, GL_RGB,  GL_UNSIGNED_BYTE, false, RequireES<3, 0>, NeverSupported, AlwaysSupported);
>-    AddCompressedFormat(&map, GL_COMPRESSED_SRGB8_PUNCHTHROUGH_ALPHA1_ETC2, 4, 4,  64, 3, GL_RGB,  GL_UNSIGNED_BYTE, true,  RequireES<3, 0>, NeverSupported, AlwaysSupported);
>-    AddCompressedFormat(&map, GL_COMPRESSED_RGBA8_ETC2_EAC,                 4, 4, 128, 4, GL_RGBA, GL_UNSIGNED_BYTE, false, RequireES<3, 0>, NeverSupported, AlwaysSupported);
>-    AddCompressedFormat(&map, GL_COMPRESSED_SRGB8_ALPHA8_ETC2_EAC,          4, 4, 128, 4, GL_RGBA, GL_UNSIGNED_BYTE, true,  RequireES<3, 0>, NeverSupported, AlwaysSupported);
>+    //                       | Internal format                             |W |H | BS |CC| SRGB | Texture supported                                                                                                      | Filterable     | Texture attachment | Renderbuffer |
>+    AddCompressedFormat(&map, GL_COMPRESSED_R11_EAC,                        4, 4,  64, 1, false, RequireESOrExtOrExt<3, 0, &Extensions::compressedTextureETC, &Extensions::compressedEACR11UnsignedTexture>,              AlwaysSupported, NeverSupported,      NeverSupported);
>+    AddCompressedFormat(&map, GL_COMPRESSED_SIGNED_R11_EAC,                 4, 4,  64, 1, false, RequireESOrExtOrExt<3, 0, &Extensions::compressedTextureETC, &Extensions::compressedEACR11SignedTexture>,                AlwaysSupported, NeverSupported,      NeverSupported);
>+    AddCompressedFormat(&map, GL_COMPRESSED_RG11_EAC,                       4, 4, 128, 2, false, RequireESOrExtOrExt<3, 0, &Extensions::compressedTextureETC, &Extensions::compressedEACRG11UnsignedTexture>,             AlwaysSupported, NeverSupported,      NeverSupported);
>+    AddCompressedFormat(&map, GL_COMPRESSED_SIGNED_RG11_EAC,                4, 4, 128, 2, false, RequireESOrExtOrExt<3, 0, &Extensions::compressedTextureETC, &Extensions::compressedEACRG11SignedTexture>,               AlwaysSupported, NeverSupported,      NeverSupported);
>+    AddCompressedFormat(&map, GL_COMPRESSED_RGB8_ETC2,                      4, 4,  64, 3, false, RequireESOrExtOrExt<3, 0, &Extensions::compressedTextureETC, &Extensions::compressedETC2RGB8Texture>,                    AlwaysSupported, NeverSupported,      NeverSupported);
>+    AddCompressedFormat(&map, GL_COMPRESSED_SRGB8_ETC2,                     4, 4,  64, 3, true,  RequireESOrExtOrExt<3, 0, &Extensions::compressedTextureETC, &Extensions::compressedETC2sRGB8Texture>,                   AlwaysSupported, NeverSupported,      NeverSupported);
>+    AddCompressedFormat(&map, GL_COMPRESSED_RGB8_PUNCHTHROUGH_ALPHA1_ETC2,  4, 4,  64, 3, false, RequireESOrExtOrExt<3, 0, &Extensions::compressedTextureETC, &Extensions::compressedETC2PunchthroughARGB8Texture>,       AlwaysSupported, NeverSupported,      NeverSupported);
>+    AddCompressedFormat(&map, GL_COMPRESSED_SRGB8_PUNCHTHROUGH_ALPHA1_ETC2, 4, 4,  64, 3, true,  RequireESOrExtOrExt<3, 0, &Extensions::compressedTextureETC, &Extensions::compressedETC2PunchthroughAsRGB8AlphaTexture>, AlwaysSupported, NeverSupported,      NeverSupported);
>+    AddCompressedFormat(&map, GL_COMPRESSED_RGBA8_ETC2_EAC,                 4, 4, 128, 4, false, RequireESOrExtOrExt<3, 0, &Extensions::compressedTextureETC, &Extensions::compressedETC2RGBA8Texture>,                   AlwaysSupported, NeverSupported,      NeverSupported);
>+    AddCompressedFormat(&map, GL_COMPRESSED_SRGB8_ALPHA8_ETC2_EAC,          4, 4, 128, 4, true,  RequireESOrExtOrExt<3, 0, &Extensions::compressedTextureETC, &Extensions::compressedETC2sRGB8Alpha8Texture>,             AlwaysSupported, NeverSupported,      NeverSupported);
> 
>     // From GL_EXT_texture_compression_dxt1
>-    //                       | Internal format                   |W |H | BS |CC| Format | Type            | SRGB | Supported                                         | Renderable    | Filterable    |
>-    AddCompressedFormat(&map, GL_COMPRESSED_RGB_S3TC_DXT1_EXT,    4, 4,  64, 3, GL_RGB,  GL_UNSIGNED_BYTE, false, RequireExt<&Extensions::textureCompressionDXT1>,    NeverSupported, AlwaysSupported);
>-    AddCompressedFormat(&map, GL_COMPRESSED_RGBA_S3TC_DXT1_EXT,   4, 4,  64, 4, GL_RGBA, GL_UNSIGNED_BYTE, false, RequireExt<&Extensions::textureCompressionDXT1>,    NeverSupported, AlwaysSupported);
>+    //                       | Internal format                   |W |H | BS |CC| SRGB | Texture supported                                 | Filterable     | Texture attachment | Renderbuffer |
>+    AddCompressedFormat(&map, GL_COMPRESSED_RGB_S3TC_DXT1_EXT,    4, 4,  64, 3, false, RequireExt<&Extensions::textureCompressionDXT1>,    AlwaysSupported, NeverSupported,      NeverSupported);
>+    AddCompressedFormat(&map, GL_COMPRESSED_RGBA_S3TC_DXT1_EXT,   4, 4,  64, 4, false, RequireExt<&Extensions::textureCompressionDXT1>,    AlwaysSupported, NeverSupported,      NeverSupported);
> 
>     // From GL_ANGLE_texture_compression_dxt3
>-    AddCompressedFormat(&map, GL_COMPRESSED_RGBA_S3TC_DXT3_ANGLE, 4, 4, 128, 4, GL_RGBA, GL_UNSIGNED_BYTE, false, RequireExt<&Extensions::textureCompressionDXT3>,    NeverSupported, AlwaysSupported);
>+    AddCompressedFormat(&map, GL_COMPRESSED_RGBA_S3TC_DXT3_ANGLE, 4, 4, 128, 4, false, RequireExt<&Extensions::textureCompressionDXT3>,    AlwaysSupported, NeverSupported,      NeverSupported);
> 
>     // From GL_ANGLE_texture_compression_dxt5
>-    AddCompressedFormat(&map, GL_COMPRESSED_RGBA_S3TC_DXT5_ANGLE, 4, 4, 128, 4, GL_RGBA, GL_UNSIGNED_BYTE, false, RequireExt<&Extensions::textureCompressionDXT5>,    NeverSupported, AlwaysSupported);
>+    AddCompressedFormat(&map, GL_COMPRESSED_RGBA_S3TC_DXT5_ANGLE, 4, 4, 128, 4, false, RequireExt<&Extensions::textureCompressionDXT5>,    AlwaysSupported, NeverSupported,      NeverSupported);
> 
>     // From GL_OES_compressed_ETC1_RGB8_texture
>-    AddCompressedFormat(&map, GL_ETC1_RGB8_OES,                   4, 4,  64, 3, GL_RGB,  GL_UNSIGNED_BYTE, false, RequireExt<&Extensions::compressedETC1RGB8Texture>, NeverSupported, AlwaysSupported);
>+    AddCompressedFormat(&map, GL_ETC1_RGB8_OES,                   4, 4,  64, 3, false, RequireExt<&Extensions::compressedETC1RGB8Texture>, AlwaysSupported, NeverSupported,      NeverSupported);
> 
>     // From GL_EXT_texture_compression_s3tc_srgb
>-    //                       | Internal format                       |W |H | BS |CC| Format | Type            | SRGB | Supported                                         | Renderable    | Filterable    |
>-    AddCompressedFormat(&map, GL_COMPRESSED_SRGB_S3TC_DXT1_EXT,       4, 4,  64, 3, GL_RGB,  GL_UNSIGNED_BYTE, true, RequireExt<&Extensions::textureCompressionS3TCsRGB>, NeverSupported, AlwaysSupported);
>-    AddCompressedFormat(&map, GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT1_EXT, 4, 4,  64, 4, GL_RGBA, GL_UNSIGNED_BYTE, true, RequireExt<&Extensions::textureCompressionS3TCsRGB>, NeverSupported, AlwaysSupported);
>-    AddCompressedFormat(&map, GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT3_EXT, 4, 4, 128, 4, GL_RGBA, GL_UNSIGNED_BYTE, true, RequireExt<&Extensions::textureCompressionS3TCsRGB>, NeverSupported, AlwaysSupported);
>-    AddCompressedFormat(&map, GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT5_EXT, 4, 4, 128, 4, GL_RGBA, GL_UNSIGNED_BYTE, true, RequireExt<&Extensions::textureCompressionS3TCsRGB>, NeverSupported, AlwaysSupported);
>+    //                       | Internal format                       |W |H | BS |CC|SRGB | Texture supported                                 | Filterable     | Texture attachment | Renderbuffer |
>+    AddCompressedFormat(&map, GL_COMPRESSED_SRGB_S3TC_DXT1_EXT,       4, 4,  64, 3, true, RequireExt<&Extensions::textureCompressionS3TCsRGB>, AlwaysSupported, NeverSupported,      NeverSupported);
>+    AddCompressedFormat(&map, GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT1_EXT, 4, 4,  64, 4, true, RequireExt<&Extensions::textureCompressionS3TCsRGB>, AlwaysSupported, NeverSupported,      NeverSupported);
>+    AddCompressedFormat(&map, GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT3_EXT, 4, 4, 128, 4, true, RequireExt<&Extensions::textureCompressionS3TCsRGB>, AlwaysSupported, NeverSupported,      NeverSupported);
>+    AddCompressedFormat(&map, GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT5_EXT, 4, 4, 128, 4, true, RequireExt<&Extensions::textureCompressionS3TCsRGB>, AlwaysSupported, NeverSupported,      NeverSupported);
> 
>     // From KHR_texture_compression_astc_hdr
>-    //                       | Internal format                          | W | H | BS |CC| Format | Type            | SRGB | Supported                                                                                     | Renderable     | Filterable    |
>-    AddCompressedFormat(&map, GL_COMPRESSED_RGBA_ASTC_4x4_KHR,            4,  4, 128, 4, GL_RGBA, GL_UNSIGNED_BYTE, false, RequireExtOrExt<&Extensions::textureCompressionASTCHDR, &Extensions::textureCompressionASTCLDR>, NeverSupported, AlwaysSupported);
>-    AddCompressedFormat(&map, GL_COMPRESSED_RGBA_ASTC_5x4_KHR,            5,  4, 128, 4, GL_RGBA, GL_UNSIGNED_BYTE, false, RequireExtOrExt<&Extensions::textureCompressionASTCHDR, &Extensions::textureCompressionASTCLDR>, NeverSupported, AlwaysSupported);
>-    AddCompressedFormat(&map, GL_COMPRESSED_RGBA_ASTC_5x5_KHR,            5,  5, 128, 4, GL_RGBA, GL_UNSIGNED_BYTE, false, RequireExtOrExt<&Extensions::textureCompressionASTCHDR, &Extensions::textureCompressionASTCLDR>, NeverSupported, AlwaysSupported);
>-    AddCompressedFormat(&map, GL_COMPRESSED_RGBA_ASTC_6x5_KHR,            6,  5, 128, 4, GL_RGBA, GL_UNSIGNED_BYTE, false, RequireExtOrExt<&Extensions::textureCompressionASTCHDR, &Extensions::textureCompressionASTCLDR>, NeverSupported, AlwaysSupported);
>-    AddCompressedFormat(&map, GL_COMPRESSED_RGBA_ASTC_6x6_KHR,            6,  6, 128, 4, GL_RGBA, GL_UNSIGNED_BYTE, false, RequireExtOrExt<&Extensions::textureCompressionASTCHDR, &Extensions::textureCompressionASTCLDR>, NeverSupported, AlwaysSupported);
>-    AddCompressedFormat(&map, GL_COMPRESSED_RGBA_ASTC_8x5_KHR,            8,  5, 128, 4, GL_RGBA, GL_UNSIGNED_BYTE, false, RequireExtOrExt<&Extensions::textureCompressionASTCHDR, &Extensions::textureCompressionASTCLDR>, NeverSupported, AlwaysSupported);
>-    AddCompressedFormat(&map, GL_COMPRESSED_RGBA_ASTC_8x6_KHR,            8,  6, 128, 4, GL_RGBA, GL_UNSIGNED_BYTE, false, RequireExtOrExt<&Extensions::textureCompressionASTCHDR, &Extensions::textureCompressionASTCLDR>, NeverSupported, AlwaysSupported);
>-    AddCompressedFormat(&map, GL_COMPRESSED_RGBA_ASTC_8x8_KHR,            8,  8, 128, 4, GL_RGBA, GL_UNSIGNED_BYTE, false, RequireExtOrExt<&Extensions::textureCompressionASTCHDR, &Extensions::textureCompressionASTCLDR>, NeverSupported, AlwaysSupported);
>-    AddCompressedFormat(&map, GL_COMPRESSED_RGBA_ASTC_10x5_KHR,          10,  5, 128, 4, GL_RGBA, GL_UNSIGNED_BYTE, false, RequireExtOrExt<&Extensions::textureCompressionASTCHDR, &Extensions::textureCompressionASTCLDR>, NeverSupported, AlwaysSupported);
>-    AddCompressedFormat(&map, GL_COMPRESSED_RGBA_ASTC_10x6_KHR,          10,  6, 128, 4, GL_RGBA, GL_UNSIGNED_BYTE, false, RequireExtOrExt<&Extensions::textureCompressionASTCHDR, &Extensions::textureCompressionASTCLDR>, NeverSupported, AlwaysSupported);
>-    AddCompressedFormat(&map, GL_COMPRESSED_RGBA_ASTC_10x8_KHR,          10,  8, 128, 4, GL_RGBA, GL_UNSIGNED_BYTE, false, RequireExtOrExt<&Extensions::textureCompressionASTCHDR, &Extensions::textureCompressionASTCLDR>, NeverSupported, AlwaysSupported);
>-    AddCompressedFormat(&map, GL_COMPRESSED_RGBA_ASTC_10x10_KHR,         10, 10, 128, 4, GL_RGBA, GL_UNSIGNED_BYTE, false, RequireExtOrExt<&Extensions::textureCompressionASTCHDR, &Extensions::textureCompressionASTCLDR>, NeverSupported, AlwaysSupported);
>-    AddCompressedFormat(&map, GL_COMPRESSED_RGBA_ASTC_12x10_KHR,         12, 10, 128, 4, GL_RGBA, GL_UNSIGNED_BYTE, false, RequireExtOrExt<&Extensions::textureCompressionASTCHDR, &Extensions::textureCompressionASTCLDR>, NeverSupported, AlwaysSupported);
>-    AddCompressedFormat(&map, GL_COMPRESSED_RGBA_ASTC_12x12_KHR,         12, 12, 128, 4, GL_RGBA, GL_UNSIGNED_BYTE, false, RequireExtOrExt<&Extensions::textureCompressionASTCHDR, &Extensions::textureCompressionASTCLDR>, NeverSupported, AlwaysSupported);
>-
>-    AddCompressedFormat(&map, GL_COMPRESSED_SRGB8_ALPHA8_ASTC_4x4_KHR,    4,  4, 128, 4, GL_RGBA, GL_UNSIGNED_BYTE, true,  RequireExtOrExt<&Extensions::textureCompressionASTCHDR, &Extensions::textureCompressionASTCLDR>, NeverSupported, AlwaysSupported);
>-    AddCompressedFormat(&map, GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x4_KHR,    5,  4, 128, 4, GL_RGBA, GL_UNSIGNED_BYTE, true,  RequireExtOrExt<&Extensions::textureCompressionASTCHDR, &Extensions::textureCompressionASTCLDR>, NeverSupported, AlwaysSupported);
>-    AddCompressedFormat(&map, GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x5_KHR,    5,  5, 128, 4, GL_RGBA, GL_UNSIGNED_BYTE, true,  RequireExtOrExt<&Extensions::textureCompressionASTCHDR, &Extensions::textureCompressionASTCLDR>, NeverSupported, AlwaysSupported);
>-    AddCompressedFormat(&map, GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x5_KHR,    6,  5, 128, 4, GL_RGBA, GL_UNSIGNED_BYTE, true,  RequireExtOrExt<&Extensions::textureCompressionASTCHDR, &Extensions::textureCompressionASTCLDR>, NeverSupported, AlwaysSupported);
>-    AddCompressedFormat(&map, GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x6_KHR,    6,  6, 128, 4, GL_RGBA, GL_UNSIGNED_BYTE, true,  RequireExtOrExt<&Extensions::textureCompressionASTCHDR, &Extensions::textureCompressionASTCLDR>, NeverSupported, AlwaysSupported);
>-    AddCompressedFormat(&map, GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x5_KHR,    8,  5, 128, 4, GL_RGBA, GL_UNSIGNED_BYTE, true,  RequireExtOrExt<&Extensions::textureCompressionASTCHDR, &Extensions::textureCompressionASTCLDR>, NeverSupported, AlwaysSupported);
>-    AddCompressedFormat(&map, GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x6_KHR,    8,  6, 128, 4, GL_RGBA, GL_UNSIGNED_BYTE, true,  RequireExtOrExt<&Extensions::textureCompressionASTCHDR, &Extensions::textureCompressionASTCLDR>, NeverSupported, AlwaysSupported);
>-    AddCompressedFormat(&map, GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x8_KHR,    8,  8, 128, 4, GL_RGBA, GL_UNSIGNED_BYTE, true,  RequireExtOrExt<&Extensions::textureCompressionASTCHDR, &Extensions::textureCompressionASTCLDR>, NeverSupported, AlwaysSupported);
>-    AddCompressedFormat(&map, GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x5_KHR,  10,  5, 128, 4, GL_RGBA, GL_UNSIGNED_BYTE, true,  RequireExtOrExt<&Extensions::textureCompressionASTCHDR, &Extensions::textureCompressionASTCLDR>, NeverSupported, AlwaysSupported);
>-    AddCompressedFormat(&map, GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x6_KHR,  10,  6, 128, 4, GL_RGBA, GL_UNSIGNED_BYTE, true,  RequireExtOrExt<&Extensions::textureCompressionASTCHDR, &Extensions::textureCompressionASTCLDR>, NeverSupported, AlwaysSupported);
>-    AddCompressedFormat(&map, GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x8_KHR,  10,  8, 128, 4, GL_RGBA, GL_UNSIGNED_BYTE, true,  RequireExtOrExt<&Extensions::textureCompressionASTCHDR, &Extensions::textureCompressionASTCLDR>, NeverSupported, AlwaysSupported);
>-    AddCompressedFormat(&map, GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x10_KHR, 10, 10, 128, 4, GL_RGBA, GL_UNSIGNED_BYTE, true,  RequireExtOrExt<&Extensions::textureCompressionASTCHDR, &Extensions::textureCompressionASTCLDR>, NeverSupported, AlwaysSupported);
>-    AddCompressedFormat(&map, GL_COMPRESSED_SRGB8_ALPHA8_ASTC_12x10_KHR, 12, 10, 128, 4, GL_RGBA, GL_UNSIGNED_BYTE, true,  RequireExtOrExt<&Extensions::textureCompressionASTCHDR, &Extensions::textureCompressionASTCLDR>, NeverSupported, AlwaysSupported);
>-    AddCompressedFormat(&map, GL_COMPRESSED_SRGB8_ALPHA8_ASTC_12x12_KHR, 12, 12, 128, 4, GL_RGBA, GL_UNSIGNED_BYTE, true,  RequireExtOrExt<&Extensions::textureCompressionASTCHDR, &Extensions::textureCompressionASTCLDR>, NeverSupported, AlwaysSupported);
>+    //                       | Internal format                          | W | H | BS |CC| SRGB | Texture supported                                                                              | Filterable     | Texture attachment | Renderbuffer |
>+    AddCompressedFormat(&map, GL_COMPRESSED_RGBA_ASTC_4x4_KHR,            4,  4, 128, 4, false, RequireExtOrExt<&Extensions::textureCompressionASTCHDR, &Extensions::textureCompressionASTCLDR>, AlwaysSupported, NeverSupported,      NeverSupported);
>+    AddCompressedFormat(&map, GL_COMPRESSED_RGBA_ASTC_5x4_KHR,            5,  4, 128, 4, false, RequireExtOrExt<&Extensions::textureCompressionASTCHDR, &Extensions::textureCompressionASTCLDR>, AlwaysSupported, NeverSupported,      NeverSupported);
>+    AddCompressedFormat(&map, GL_COMPRESSED_RGBA_ASTC_5x5_KHR,            5,  5, 128, 4, false, RequireExtOrExt<&Extensions::textureCompressionASTCHDR, &Extensions::textureCompressionASTCLDR>, AlwaysSupported, NeverSupported,      NeverSupported);
>+    AddCompressedFormat(&map, GL_COMPRESSED_RGBA_ASTC_6x5_KHR,            6,  5, 128, 4, false, RequireExtOrExt<&Extensions::textureCompressionASTCHDR, &Extensions::textureCompressionASTCLDR>, AlwaysSupported, NeverSupported,      NeverSupported);
>+    AddCompressedFormat(&map, GL_COMPRESSED_RGBA_ASTC_6x6_KHR,            6,  6, 128, 4, false, RequireExtOrExt<&Extensions::textureCompressionASTCHDR, &Extensions::textureCompressionASTCLDR>, AlwaysSupported, NeverSupported,      NeverSupported);
>+    AddCompressedFormat(&map, GL_COMPRESSED_RGBA_ASTC_8x5_KHR,            8,  5, 128, 4, false, RequireExtOrExt<&Extensions::textureCompressionASTCHDR, &Extensions::textureCompressionASTCLDR>, AlwaysSupported, NeverSupported,      NeverSupported);
>+    AddCompressedFormat(&map, GL_COMPRESSED_RGBA_ASTC_8x6_KHR,            8,  6, 128, 4, false, RequireExtOrExt<&Extensions::textureCompressionASTCHDR, &Extensions::textureCompressionASTCLDR>, AlwaysSupported, NeverSupported,      NeverSupported);
>+    AddCompressedFormat(&map, GL_COMPRESSED_RGBA_ASTC_8x8_KHR,            8,  8, 128, 4, false, RequireExtOrExt<&Extensions::textureCompressionASTCHDR, &Extensions::textureCompressionASTCLDR>, AlwaysSupported, NeverSupported,      NeverSupported);
>+    AddCompressedFormat(&map, GL_COMPRESSED_RGBA_ASTC_10x5_KHR,          10,  5, 128, 4, false, RequireExtOrExt<&Extensions::textureCompressionASTCHDR, &Extensions::textureCompressionASTCLDR>, AlwaysSupported, NeverSupported,      NeverSupported);
>+    AddCompressedFormat(&map, GL_COMPRESSED_RGBA_ASTC_10x6_KHR,          10,  6, 128, 4, false, RequireExtOrExt<&Extensions::textureCompressionASTCHDR, &Extensions::textureCompressionASTCLDR>, AlwaysSupported, NeverSupported,      NeverSupported);
>+    AddCompressedFormat(&map, GL_COMPRESSED_RGBA_ASTC_10x8_KHR,          10,  8, 128, 4, false, RequireExtOrExt<&Extensions::textureCompressionASTCHDR, &Extensions::textureCompressionASTCLDR>, AlwaysSupported, NeverSupported,      NeverSupported);
>+    AddCompressedFormat(&map, GL_COMPRESSED_RGBA_ASTC_10x10_KHR,         10, 10, 128, 4, false, RequireExtOrExt<&Extensions::textureCompressionASTCHDR, &Extensions::textureCompressionASTCLDR>, AlwaysSupported, NeverSupported,      NeverSupported);
>+    AddCompressedFormat(&map, GL_COMPRESSED_RGBA_ASTC_12x10_KHR,         12, 10, 128, 4, false, RequireExtOrExt<&Extensions::textureCompressionASTCHDR, &Extensions::textureCompressionASTCLDR>, AlwaysSupported, NeverSupported,      NeverSupported);
>+    AddCompressedFormat(&map, GL_COMPRESSED_RGBA_ASTC_12x12_KHR,         12, 12, 128, 4, false, RequireExtOrExt<&Extensions::textureCompressionASTCHDR, &Extensions::textureCompressionASTCLDR>, AlwaysSupported, NeverSupported,      NeverSupported);
>+
>+    AddCompressedFormat(&map, GL_COMPRESSED_SRGB8_ALPHA8_ASTC_4x4_KHR,    4,  4, 128, 4, true,  RequireExtOrExt<&Extensions::textureCompressionASTCHDR, &Extensions::textureCompressionASTCLDR>, AlwaysSupported, NeverSupported,      NeverSupported);
>+    AddCompressedFormat(&map, GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x4_KHR,    5,  4, 128, 4, true,  RequireExtOrExt<&Extensions::textureCompressionASTCHDR, &Extensions::textureCompressionASTCLDR>, AlwaysSupported, NeverSupported,      NeverSupported);
>+    AddCompressedFormat(&map, GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x5_KHR,    5,  5, 128, 4, true,  RequireExtOrExt<&Extensions::textureCompressionASTCHDR, &Extensions::textureCompressionASTCLDR>, AlwaysSupported, NeverSupported,      NeverSupported);
>+    AddCompressedFormat(&map, GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x5_KHR,    6,  5, 128, 4, true,  RequireExtOrExt<&Extensions::textureCompressionASTCHDR, &Extensions::textureCompressionASTCLDR>, AlwaysSupported, NeverSupported,      NeverSupported);
>+    AddCompressedFormat(&map, GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x6_KHR,    6,  6, 128, 4, true,  RequireExtOrExt<&Extensions::textureCompressionASTCHDR, &Extensions::textureCompressionASTCLDR>, AlwaysSupported, NeverSupported,      NeverSupported);
>+    AddCompressedFormat(&map, GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x5_KHR,    8,  5, 128, 4, true,  RequireExtOrExt<&Extensions::textureCompressionASTCHDR, &Extensions::textureCompressionASTCLDR>, AlwaysSupported, NeverSupported,      NeverSupported);
>+    AddCompressedFormat(&map, GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x6_KHR,    8,  6, 128, 4, true,  RequireExtOrExt<&Extensions::textureCompressionASTCHDR, &Extensions::textureCompressionASTCLDR>, AlwaysSupported, NeverSupported,      NeverSupported);
>+    AddCompressedFormat(&map, GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x8_KHR,    8,  8, 128, 4, true,  RequireExtOrExt<&Extensions::textureCompressionASTCHDR, &Extensions::textureCompressionASTCLDR>, AlwaysSupported, NeverSupported,      NeverSupported);
>+    AddCompressedFormat(&map, GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x5_KHR,  10,  5, 128, 4, true,  RequireExtOrExt<&Extensions::textureCompressionASTCHDR, &Extensions::textureCompressionASTCLDR>, AlwaysSupported, NeverSupported,      NeverSupported);
>+    AddCompressedFormat(&map, GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x6_KHR,  10,  6, 128, 4, true,  RequireExtOrExt<&Extensions::textureCompressionASTCHDR, &Extensions::textureCompressionASTCLDR>, AlwaysSupported, NeverSupported,      NeverSupported);
>+    AddCompressedFormat(&map, GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x8_KHR,  10,  8, 128, 4, true,  RequireExtOrExt<&Extensions::textureCompressionASTCHDR, &Extensions::textureCompressionASTCLDR>, AlwaysSupported, NeverSupported,      NeverSupported);
>+    AddCompressedFormat(&map, GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x10_KHR, 10, 10, 128, 4, true,  RequireExtOrExt<&Extensions::textureCompressionASTCHDR, &Extensions::textureCompressionASTCLDR>, AlwaysSupported, NeverSupported,      NeverSupported);
>+    AddCompressedFormat(&map, GL_COMPRESSED_SRGB8_ALPHA8_ASTC_12x10_KHR, 12, 10, 128, 4, true,  RequireExtOrExt<&Extensions::textureCompressionASTCHDR, &Extensions::textureCompressionASTCLDR>, AlwaysSupported, NeverSupported,      NeverSupported);
>+    AddCompressedFormat(&map, GL_COMPRESSED_SRGB8_ALPHA8_ASTC_12x12_KHR, 12, 12, 128, 4, true,  RequireExtOrExt<&Extensions::textureCompressionASTCHDR, &Extensions::textureCompressionASTCLDR>, AlwaysSupported, NeverSupported,      NeverSupported);
>+
>+    // From EXT_texture_compression_bptc
>+    //                       | Internal format                         | W | H | BS |CC| SRGB | Texture supported                              | Filterable     | Texture attachment | Renderbuffer |
>+    AddCompressedFormat(&map, GL_COMPRESSED_RGBA_BPTC_UNORM_EXT,         4,  4, 128, 4, false, RequireExt<&Extensions::textureCompressionBPTC>, AlwaysSupported, NeverSupported,      NeverSupported);
>+    AddCompressedFormat(&map, GL_COMPRESSED_SRGB_ALPHA_BPTC_UNORM_EXT,   4,  4, 128, 4, true,  RequireExt<&Extensions::textureCompressionBPTC>, AlwaysSupported, NeverSupported,      NeverSupported);
>+    AddCompressedFormat(&map, GL_COMPRESSED_RGB_BPTC_SIGNED_FLOAT_EXT,   4,  4, 128, 4, false, RequireExt<&Extensions::textureCompressionBPTC>, AlwaysSupported, NeverSupported,      NeverSupported);
>+    AddCompressedFormat(&map, GL_COMPRESSED_RGB_BPTC_UNSIGNED_FLOAT_EXT, 4,  4, 128, 4, false, RequireExt<&Extensions::textureCompressionBPTC>, AlwaysSupported, NeverSupported,      NeverSupported);
> 
>     // For STENCIL_INDEX8 we chose a normalized component type for the following reasons:
>     // - Multisampled buffer are disallowed for non-normalized integer component types and we want to support it for STENCIL_INDEX8
>     // - All other stencil formats (all depth-stencil) are either float or normalized
>     // - It affects only validation of internalformat in RenderbufferStorageMultisample.
>-    //                         | Internal format  |sized|D |S |X | Format    | Type            | Component type        | Supported      | Renderable     | Filterable   |
>-    AddDepthStencilFormat(&map, GL_STENCIL_INDEX8, true, 0, 8, 0, GL_STENCIL, GL_UNSIGNED_BYTE, GL_UNSIGNED_NORMALIZED, RequireES<2, 0>, RequireES<2, 0>, NeverSupported);
>+    //                         | Internal format  |sized|D |S |X | Format    | Type            | Component type        | Texture supported | Filterable    | Texture attachment | Renderbuffer  |
>+    AddDepthStencilFormat(&map, GL_STENCIL_INDEX8, true, 0, 8, 0, GL_STENCIL, GL_UNSIGNED_BYTE, GL_UNSIGNED_NORMALIZED, RequireES<1, 0>,    NeverSupported, RequireES<1, 0>,     RequireES<1, 0>);
> 
>     // From GL_ANGLE_lossy_etc_decode
>-    //                       | Internal format                                                |W |H |BS |CC| Format | Type            | SRGB | Supported                                                                                     | Renderable     | Filterable    |
>-    AddCompressedFormat(&map, GL_ETC1_RGB8_LOSSY_DECODE_ANGLE,                                 4, 4, 64, 3, GL_RGB,  GL_UNSIGNED_BYTE, false, RequireExt<&Extensions::lossyETCDecode>, NeverSupported, AlwaysSupported);
>-    AddCompressedFormat(&map, GL_COMPRESSED_RGB8_LOSSY_DECODE_ETC2_ANGLE,                      4, 4, 64, 3, GL_RGB,  GL_UNSIGNED_BYTE, false, RequireExt<&Extensions::lossyETCDecode>, NeverSupported, AlwaysSupported);
>-    AddCompressedFormat(&map, GL_COMPRESSED_SRGB8_LOSSY_DECODE_ETC2_ANGLE,                     4, 4, 64, 3, GL_RGB,  GL_UNSIGNED_BYTE, true,  RequireExt<&Extensions::lossyETCDecode>, NeverSupported, AlwaysSupported);
>-    AddCompressedFormat(&map, GL_COMPRESSED_RGB8_PUNCHTHROUGH_ALPHA1_LOSSY_DECODE_ETC2_ANGLE,  4, 4, 64, 3, GL_RGBA, GL_UNSIGNED_BYTE, false, RequireExt<&Extensions::lossyETCDecode>, NeverSupported, AlwaysSupported);
>-    AddCompressedFormat(&map, GL_COMPRESSED_SRGB8_PUNCHTHROUGH_ALPHA1_LOSSY_DECODE_ETC2_ANGLE, 4, 4, 64, 3, GL_RGBA, GL_UNSIGNED_BYTE, true,  RequireExt<&Extensions::lossyETCDecode>, NeverSupported, AlwaysSupported);
>+    //                       | Internal format                                                |W |H |BS |CC| SRGB | Texture supported                      | Filterable     | Texture attachment | Renderbuffer |
>+    AddCompressedFormat(&map, GL_ETC1_RGB8_LOSSY_DECODE_ANGLE,                                 4, 4, 64, 3, false, RequireExt<&Extensions::lossyETCDecode>, AlwaysSupported, NeverSupported,      NeverSupported);
>+    AddCompressedFormat(&map, GL_COMPRESSED_RGB8_LOSSY_DECODE_ETC2_ANGLE,                      4, 4, 64, 3, false, RequireExt<&Extensions::lossyETCDecode>, AlwaysSupported, NeverSupported,      NeverSupported);
>+    AddCompressedFormat(&map, GL_COMPRESSED_SRGB8_LOSSY_DECODE_ETC2_ANGLE,                     4, 4, 64, 3, true,  RequireExt<&Extensions::lossyETCDecode>, AlwaysSupported, NeverSupported,      NeverSupported);
>+    AddCompressedFormat(&map, GL_COMPRESSED_RGB8_PUNCHTHROUGH_ALPHA1_LOSSY_DECODE_ETC2_ANGLE,  4, 4, 64, 3, false, RequireExt<&Extensions::lossyETCDecode>, AlwaysSupported, NeverSupported,      NeverSupported);
>+    AddCompressedFormat(&map, GL_COMPRESSED_SRGB8_PUNCHTHROUGH_ALPHA1_LOSSY_DECODE_ETC2_ANGLE, 4, 4, 64, 3, true,  RequireExt<&Extensions::lossyETCDecode>, AlwaysSupported, NeverSupported,      NeverSupported);
> 
>     // From GL_EXT_texture_norm16
>-    //                 | Internal format    |sized| R | G | B | A |S | Format         | Type                           | Component type        | SRGB | Texture supported                        | Renderable                               | Filterable    |
>-    AddRGBAFormat(&map, GL_R16_EXT,          true, 16,  0,  0,  0, 0, GL_RED,          GL_UNSIGNED_SHORT,               GL_UNSIGNED_NORMALIZED, false, RequireExt<&Extensions::textureNorm16>,    RequireExt<&Extensions::textureNorm16>,    AlwaysSupported);
>-    AddRGBAFormat(&map, GL_R16_SNORM_EXT,    true, 16,  0,  0,  0, 0, GL_RED,          GL_SHORT,                        GL_SIGNED_NORMALIZED,   false, RequireExt<&Extensions::textureNorm16>,    NeverSupported,                            AlwaysSupported);
>-    AddRGBAFormat(&map, GL_RG16_EXT,         true, 16, 16,  0,  0, 0, GL_RG,           GL_UNSIGNED_SHORT,               GL_UNSIGNED_NORMALIZED, false, RequireExt<&Extensions::textureNorm16>,    RequireExt<&Extensions::textureNorm16>,    AlwaysSupported);
>-    AddRGBAFormat(&map, GL_RG16_SNORM_EXT,   true, 16, 16,  0,  0, 0, GL_RG,           GL_SHORT,                        GL_SIGNED_NORMALIZED,   false, RequireExt<&Extensions::textureNorm16>,    NeverSupported,                            AlwaysSupported);
>-    AddRGBAFormat(&map, GL_RGB16_EXT,        true, 16, 16, 16,  0, 0, GL_RGB,          GL_UNSIGNED_SHORT,               GL_UNSIGNED_NORMALIZED, false, RequireExt<&Extensions::textureNorm16>,    NeverSupported,                            AlwaysSupported);
>-    AddRGBAFormat(&map, GL_RGB16_SNORM_EXT,  true, 16, 16, 16,  0, 0, GL_RGB,          GL_SHORT,                        GL_SIGNED_NORMALIZED,   false, RequireExt<&Extensions::textureNorm16>,    NeverSupported,                            AlwaysSupported);
>-    AddRGBAFormat(&map, GL_RGBA16_EXT,       true, 16, 16, 16, 16, 0, GL_RGBA,         GL_UNSIGNED_SHORT,               GL_UNSIGNED_NORMALIZED, false, RequireExt<&Extensions::textureNorm16>,    RequireExt<&Extensions::textureNorm16>,    AlwaysSupported);
>-    AddRGBAFormat(&map, GL_RGBA16_SNORM_EXT, true, 16, 16, 16, 16, 0, GL_RGBA,         GL_SHORT,                        GL_SIGNED_NORMALIZED,   false, RequireExt<&Extensions::textureNorm16>,    NeverSupported,                            AlwaysSupported);
>+    //                 | Internal format    |sized| R | G | B | A |S | Format | Type             | Component type        | SRGB | Texture supported                     | Filterable     | Texture attachment                    | Renderbuffer                         |
>+    AddRGBAFormat(&map, GL_R16_EXT,          true, 16,  0,  0,  0, 0, GL_RED,  GL_UNSIGNED_SHORT, GL_UNSIGNED_NORMALIZED, false, RequireExt<&Extensions::textureNorm16>, AlwaysSupported, RequireExt<&Extensions::textureNorm16>, RequireExt<&Extensions::textureNorm16>);
>+    AddRGBAFormat(&map, GL_R16_SNORM_EXT,    true, 16,  0,  0,  0, 0, GL_RED,  GL_SHORT,          GL_SIGNED_NORMALIZED,   false, RequireExt<&Extensions::textureNorm16>, AlwaysSupported, NeverSupported,                         NeverSupported                        );
>+    AddRGBAFormat(&map, GL_RG16_EXT,         true, 16, 16,  0,  0, 0, GL_RG,   GL_UNSIGNED_SHORT, GL_UNSIGNED_NORMALIZED, false, RequireExt<&Extensions::textureNorm16>, AlwaysSupported, RequireExt<&Extensions::textureNorm16>, RequireExt<&Extensions::textureNorm16>);
>+    AddRGBAFormat(&map, GL_RG16_SNORM_EXT,   true, 16, 16,  0,  0, 0, GL_RG,   GL_SHORT,          GL_SIGNED_NORMALIZED,   false, RequireExt<&Extensions::textureNorm16>, AlwaysSupported, NeverSupported,                         NeverSupported                        );
>+    AddRGBAFormat(&map, GL_RGB16_EXT,        true, 16, 16, 16,  0, 0, GL_RGB,  GL_UNSIGNED_SHORT, GL_UNSIGNED_NORMALIZED, false, RequireExt<&Extensions::textureNorm16>, AlwaysSupported, NeverSupported,                         NeverSupported                        );
>+    AddRGBAFormat(&map, GL_RGB16_SNORM_EXT,  true, 16, 16, 16,  0, 0, GL_RGB,  GL_SHORT,          GL_SIGNED_NORMALIZED,   false, RequireExt<&Extensions::textureNorm16>, AlwaysSupported, NeverSupported,                         NeverSupported                        );
>+    AddRGBAFormat(&map, GL_RGBA16_EXT,       true, 16, 16, 16, 16, 0, GL_RGBA, GL_UNSIGNED_SHORT, GL_UNSIGNED_NORMALIZED, false, RequireExt<&Extensions::textureNorm16>, AlwaysSupported, RequireExt<&Extensions::textureNorm16>, RequireExt<&Extensions::textureNorm16>);
>+    AddRGBAFormat(&map, GL_RGBA16_SNORM_EXT, true, 16, 16, 16, 16, 0, GL_RGBA, GL_SHORT,          GL_SIGNED_NORMALIZED,   false, RequireExt<&Extensions::textureNorm16>, AlwaysSupported, NeverSupported,                         NeverSupported                        );
> 
>     // Unsized formats
>-    //                 | Internal format    |sized | R | G | B | A |S | Format         | Type                           | Component type        | SRGB | Texture supported                           | Renderable                                  | Filterable    |
>-    AddRGBAFormat(&map, GL_RED,              false,  8,  0,  0,  0, 0, GL_RED,          GL_UNSIGNED_BYTE,                GL_UNSIGNED_NORMALIZED, false, RequireExt<&Extensions::textureRG>,           AlwaysSupported,                              AlwaysSupported);
>-    AddRGBAFormat(&map, GL_RED,              false,  8,  0,  0,  0, 0, GL_RED,          GL_BYTE,                         GL_SIGNED_NORMALIZED,   false, NeverSupported,                               NeverSupported,                               NeverSupported );
>-    AddRGBAFormat(&map, GL_RG,               false,  8,  8,  0,  0, 0, GL_RG,           GL_UNSIGNED_BYTE,                GL_UNSIGNED_NORMALIZED, false, RequireExt<&Extensions::textureRG>,           AlwaysSupported,                              AlwaysSupported);
>-    AddRGBAFormat(&map, GL_RG,               false,  8,  8,  0,  0, 0, GL_RG,           GL_BYTE,                         GL_SIGNED_NORMALIZED,   false, NeverSupported,                               NeverSupported,                               NeverSupported );
>-    AddRGBAFormat(&map, GL_RGB,              false,  8,  8,  8,  0, 0, GL_RGB,          GL_UNSIGNED_BYTE,                GL_UNSIGNED_NORMALIZED, false, RequireES<2, 0>,                              AlwaysSupported,                              AlwaysSupported);
>-    AddRGBAFormat(&map, GL_RGB,              false,  5,  6,  5,  0, 0, GL_RGB,          GL_UNSIGNED_SHORT_5_6_5,         GL_UNSIGNED_NORMALIZED, false, RequireES<2, 0>,                              RequireES<2, 0>,                              AlwaysSupported);
>-    AddRGBAFormat(&map, GL_RGB,              false,  8,  8,  8,  0, 0, GL_RGB,          GL_BYTE,                         GL_SIGNED_NORMALIZED,   false, NeverSupported,                               NeverSupported,                               NeverSupported );
>-    AddRGBAFormat(&map, GL_RGBA,             false,  4,  4,  4,  4, 0, GL_RGBA,         GL_UNSIGNED_SHORT_4_4_4_4,       GL_UNSIGNED_NORMALIZED, false, RequireES<2, 0>,                              RequireES<2, 0>,                              AlwaysSupported);
>-    AddRGBAFormat(&map, GL_RGBA,             false,  5,  5,  5,  1, 0, GL_RGBA,         GL_UNSIGNED_SHORT_5_5_5_1,       GL_UNSIGNED_NORMALIZED, false, RequireES<2, 0>,                              RequireES<2, 0>,                              AlwaysSupported);
>-    AddRGBAFormat(&map, GL_RGBA,             false,  8,  8,  8,  8, 0, GL_RGBA,         GL_UNSIGNED_BYTE,                GL_UNSIGNED_NORMALIZED, false, RequireES<2, 0>,                              RequireES<2, 0>,                              AlwaysSupported);
>-    AddRGBAFormat(&map, GL_RGBA,             false, 10, 10, 10,  2, 0, GL_RGBA,         GL_UNSIGNED_INT_2_10_10_10_REV,  GL_UNSIGNED_NORMALIZED, false, RequireES<2, 0>,                              RequireES<2, 0>,                              AlwaysSupported);
>-    AddRGBAFormat(&map, GL_RGBA,             false,  8,  8,  8,  8, 0, GL_RGBA,         GL_BYTE,                         GL_SIGNED_NORMALIZED,   false, NeverSupported,                               NeverSupported,                               NeverSupported );
>-    AddRGBAFormat(&map, GL_SRGB,             false,  8,  8,  8,  0, 0, GL_RGB,          GL_UNSIGNED_BYTE,                GL_UNSIGNED_NORMALIZED, true,  RequireExt<&Extensions::sRGB>,                NeverSupported,                               AlwaysSupported);
>-    AddRGBAFormat(&map, GL_SRGB_ALPHA_EXT,   false,  8,  8,  8,  8, 0, GL_RGBA,         GL_UNSIGNED_BYTE,                GL_UNSIGNED_NORMALIZED, true,  RequireExt<&Extensions::sRGB>,                RequireExt<&Extensions::sRGB>,                AlwaysSupported);
>-
>-    AddRGBAFormat(&map, GL_BGRA_EXT,         false,  8,  8,  8,  8, 0, GL_BGRA_EXT,     GL_UNSIGNED_BYTE,                GL_UNSIGNED_NORMALIZED, false, RequireExt<&Extensions::textureFormatBGRA8888>, RequireExt<&Extensions::textureFormatBGRA8888>, AlwaysSupported);
>+    //                 | Internal format  |sized | R | G | B | A |S | Format           | Type                          | Component type        | SRGB | Texture supported                             | Filterable     | Texture attachment                            | Renderbuffer |
>+    AddRGBAFormat(&map, GL_RED,            false,  8,  0,  0,  0, 0, GL_RED,            GL_UNSIGNED_BYTE,               GL_UNSIGNED_NORMALIZED, false, RequireExt<&Extensions::textureRG>,             AlwaysSupported, RequireExt<&Extensions::textureRG>,             NeverSupported);
>+    AddRGBAFormat(&map, GL_RED,            false,  8,  0,  0,  0, 0, GL_RED,            GL_BYTE,                        GL_SIGNED_NORMALIZED,   false, NeverSupported,                                 NeverSupported,  NeverSupported,                                 NeverSupported);
>+    AddRGBAFormat(&map, GL_RG,             false,  8,  8,  0,  0, 0, GL_RG,             GL_UNSIGNED_BYTE,               GL_UNSIGNED_NORMALIZED, false, RequireExt<&Extensions::textureRG>,             AlwaysSupported, RequireExt<&Extensions::textureRG>,             NeverSupported);
>+    AddRGBAFormat(&map, GL_RG,             false,  8,  8,  0,  0, 0, GL_RG,             GL_BYTE,                        GL_SIGNED_NORMALIZED,   false, NeverSupported,                                 NeverSupported,  NeverSupported,                                 NeverSupported);
>+    AddRGBAFormat(&map, GL_RGB,            false,  8,  8,  8,  0, 0, GL_RGB,            GL_UNSIGNED_BYTE,               GL_UNSIGNED_NORMALIZED, false, AlwaysSupported,                                AlwaysSupported, RequireES<2, 0>,                                NeverSupported);
>+    AddRGBAFormat(&map, GL_RGB,            false,  5,  6,  5,  0, 0, GL_RGB,            GL_UNSIGNED_SHORT_5_6_5,        GL_UNSIGNED_NORMALIZED, false, AlwaysSupported,                                AlwaysSupported, RequireES<2, 0>,                                NeverSupported);
>+    AddRGBAFormat(&map, GL_RGB,            false,  8,  8,  8,  0, 0, GL_RGB,            GL_BYTE,                        GL_SIGNED_NORMALIZED,   false, NeverSupported,                                 NeverSupported,  NeverSupported,                                 NeverSupported);
>+    AddRGBAFormat(&map, GL_RGBA,           false,  4,  4,  4,  4, 0, GL_RGBA,           GL_UNSIGNED_SHORT_4_4_4_4,      GL_UNSIGNED_NORMALIZED, false, AlwaysSupported,                                AlwaysSupported, RequireES<2, 0>,                                NeverSupported);
>+    AddRGBAFormat(&map, GL_RGBA,           false,  5,  5,  5,  1, 0, GL_RGBA,           GL_UNSIGNED_SHORT_5_5_5_1,      GL_UNSIGNED_NORMALIZED, false, AlwaysSupported,                                AlwaysSupported, RequireES<2, 0>,                                NeverSupported);
>+    AddRGBAFormat(&map, GL_RGBA,           false,  8,  8,  8,  8, 0, GL_RGBA,           GL_UNSIGNED_BYTE,               GL_UNSIGNED_NORMALIZED, false, AlwaysSupported,                                AlwaysSupported, RequireES<2, 0>,                                NeverSupported);
>+    AddRGBAFormat(&map, GL_RGBA,           false, 10, 10, 10,  2, 0, GL_RGBA,           GL_UNSIGNED_INT_2_10_10_10_REV, GL_UNSIGNED_NORMALIZED, false, NeverSupported,                                 NeverSupported,  NeverSupported,                                 NeverSupported);
>+    AddRGBAFormat(&map, GL_RGBA,           false,  8,  8,  8,  8, 0, GL_RGBA,           GL_BYTE,                        GL_SIGNED_NORMALIZED,   false, NeverSupported,                                 NeverSupported,  NeverSupported,                                 NeverSupported);
>+    AddRGBAFormat(&map, GL_SRGB,           false,  8,  8,  8,  0, 0, GL_SRGB,           GL_UNSIGNED_BYTE,               GL_UNSIGNED_NORMALIZED, true,  RequireExt<&Extensions::sRGB>,                  AlwaysSupported, NeverSupported,                                 NeverSupported);
>+    AddRGBAFormat(&map, GL_SRGB_ALPHA_EXT, false,  8,  8,  8,  8, 0, GL_SRGB_ALPHA_EXT, GL_UNSIGNED_BYTE,               GL_UNSIGNED_NORMALIZED, true,  RequireExt<&Extensions::sRGB>,                  AlwaysSupported, RequireExt<&Extensions::sRGB>,                  NeverSupported);
>+    AddRGBAFormat(&map, GL_BGRA_EXT,       false,  8,  8,  8,  8, 0, GL_BGRA_EXT,       GL_UNSIGNED_BYTE,               GL_UNSIGNED_NORMALIZED, false, RequireExt<&Extensions::textureFormatBGRA8888>, AlwaysSupported, RequireExt<&Extensions::textureFormatBGRA8888>, NeverSupported);
> 
>     // Unsized integer formats
>-    //                 |Internal format |sized | R | G | B | A |S | Format         | Type                          | Component type | SRGB | Texture        | Renderable    | Filterable   |
>-    AddRGBAFormat(&map, GL_RED_INTEGER,  false,  8,  0,  0,  0, 0, GL_RED_INTEGER,  GL_BYTE,                        GL_INT,          false, RequireES<3, 0>, NeverSupported, NeverSupported);
>-    AddRGBAFormat(&map, GL_RED_INTEGER,  false,  8,  0,  0,  0, 0, GL_RED_INTEGER,  GL_UNSIGNED_BYTE,               GL_UNSIGNED_INT, false, RequireES<3, 0>, NeverSupported, NeverSupported);
>-    AddRGBAFormat(&map, GL_RED_INTEGER,  false, 16,  0,  0,  0, 0, GL_RED_INTEGER,  GL_SHORT,                       GL_INT,          false, RequireES<3, 0>, NeverSupported, NeverSupported);
>-    AddRGBAFormat(&map, GL_RED_INTEGER,  false, 16,  0,  0,  0, 0, GL_RED_INTEGER,  GL_UNSIGNED_SHORT,              GL_UNSIGNED_INT, false, RequireES<3, 0>, NeverSupported, NeverSupported);
>-    AddRGBAFormat(&map, GL_RED_INTEGER,  false, 32,  0,  0,  0, 0, GL_RED_INTEGER,  GL_INT,                         GL_INT,          false, RequireES<3, 0>, NeverSupported, NeverSupported);
>-    AddRGBAFormat(&map, GL_RED_INTEGER,  false, 32,  0,  0,  0, 0, GL_RED_INTEGER,  GL_UNSIGNED_INT,                GL_UNSIGNED_INT, false, RequireES<3, 0>, NeverSupported, NeverSupported);
>-    AddRGBAFormat(&map, GL_RG_INTEGER,   false,  8,  8,  0,  0, 0, GL_RG_INTEGER,   GL_BYTE,                        GL_INT,          false, RequireES<3, 0>, NeverSupported, NeverSupported);
>-    AddRGBAFormat(&map, GL_RG_INTEGER,   false,  8,  8,  0,  0, 0, GL_RG_INTEGER,   GL_UNSIGNED_BYTE,               GL_UNSIGNED_INT, false, RequireES<3, 0>, NeverSupported, NeverSupported);
>-    AddRGBAFormat(&map, GL_RG_INTEGER,   false, 16, 16,  0,  0, 0, GL_RG_INTEGER,   GL_SHORT,                       GL_INT,          false, RequireES<3, 0>, NeverSupported, NeverSupported);
>-    AddRGBAFormat(&map, GL_RG_INTEGER,   false, 16, 16,  0,  0, 0, GL_RG_INTEGER,   GL_UNSIGNED_SHORT,              GL_UNSIGNED_INT, false, RequireES<3, 0>, NeverSupported, NeverSupported);
>-    AddRGBAFormat(&map, GL_RG_INTEGER,   false, 32, 32,  0,  0, 0, GL_RG_INTEGER,   GL_INT,                         GL_INT,          false, RequireES<3, 0>, NeverSupported, NeverSupported);
>-    AddRGBAFormat(&map, GL_RG_INTEGER,   false, 32, 32,  0,  0, 0, GL_RG_INTEGER,   GL_UNSIGNED_INT,                GL_UNSIGNED_INT, false, RequireES<3, 0>, NeverSupported, NeverSupported);
>-    AddRGBAFormat(&map, GL_RGB_INTEGER,  false,  8,  8,  8,  0, 0, GL_RGB_INTEGER,  GL_BYTE,                        GL_INT,          false, RequireES<3, 0>, NeverSupported, NeverSupported);
>-    AddRGBAFormat(&map, GL_RGB_INTEGER,  false,  8,  8,  8,  0, 0, GL_RGB_INTEGER,  GL_UNSIGNED_BYTE,               GL_UNSIGNED_INT, false, RequireES<3, 0>, NeverSupported, NeverSupported);
>-    AddRGBAFormat(&map, GL_RGB_INTEGER,  false, 16, 16, 16,  0, 0, GL_RGB_INTEGER,  GL_SHORT,                       GL_INT,          false, RequireES<3, 0>, NeverSupported, NeverSupported);
>-    AddRGBAFormat(&map, GL_RGB_INTEGER,  false, 16, 16, 16,  0, 0, GL_RGB_INTEGER,  GL_UNSIGNED_SHORT,              GL_UNSIGNED_INT, false, RequireES<3, 0>, NeverSupported, NeverSupported);
>-    AddRGBAFormat(&map, GL_RGB_INTEGER,  false, 32, 32, 32,  0, 0, GL_RGB_INTEGER,  GL_INT,                         GL_INT,          false, RequireES<3, 0>, NeverSupported, NeverSupported);
>-    AddRGBAFormat(&map, GL_RGB_INTEGER,  false, 32, 32, 32,  0, 0, GL_RGB_INTEGER,  GL_UNSIGNED_INT,                GL_UNSIGNED_INT, false, RequireES<3, 0>, NeverSupported, NeverSupported);
>-    AddRGBAFormat(&map, GL_RGBA_INTEGER, false,  8,  8,  8,  8, 0, GL_RGBA_INTEGER, GL_BYTE,                        GL_INT,          false, RequireES<3, 0>, NeverSupported, NeverSupported);
>-    AddRGBAFormat(&map, GL_RGBA_INTEGER, false,  8,  8,  8,  8, 0, GL_RGBA_INTEGER, GL_UNSIGNED_BYTE,               GL_UNSIGNED_INT, false, RequireES<3, 0>, NeverSupported, NeverSupported);
>-    AddRGBAFormat(&map, GL_RGBA_INTEGER, false, 16, 16, 16, 16, 0, GL_RGBA_INTEGER, GL_SHORT,                       GL_INT,          false, RequireES<3, 0>, NeverSupported, NeverSupported);
>-    AddRGBAFormat(&map, GL_RGBA_INTEGER, false, 16, 16, 16, 16, 0, GL_RGBA_INTEGER, GL_UNSIGNED_SHORT,              GL_UNSIGNED_INT, false, RequireES<3, 0>, NeverSupported, NeverSupported);
>-    AddRGBAFormat(&map, GL_RGBA_INTEGER, false, 32, 32, 32, 32, 0, GL_RGBA_INTEGER, GL_INT,                         GL_INT,          false, RequireES<3, 0>, NeverSupported, NeverSupported);
>-    AddRGBAFormat(&map, GL_RGBA_INTEGER, false, 32, 32, 32, 32, 0, GL_RGBA_INTEGER, GL_UNSIGNED_INT,                GL_UNSIGNED_INT, false, RequireES<3, 0>, NeverSupported, NeverSupported);
>-    AddRGBAFormat(&map, GL_RGBA_INTEGER, false, 10, 10, 10,  2, 0, GL_RGBA_INTEGER, GL_UNSIGNED_INT_2_10_10_10_REV, GL_UNSIGNED_INT, false, RequireES<3, 0>, NeverSupported, NeverSupported);
>+    //                 |Internal format |sized | R | G | B | A |S | Format         | Type                          | Component type | SRGB | Texture supported | Filterable    | Texture attachment | Renderbuffer |
>+    AddRGBAFormat(&map, GL_RED_INTEGER,  false,  8,  0,  0,  0, 0, GL_RED_INTEGER,  GL_BYTE,                        GL_INT,          false, RequireES<3, 0>,    NeverSupported, NeverSupported,      NeverSupported);
>+    AddRGBAFormat(&map, GL_RED_INTEGER,  false,  8,  0,  0,  0, 0, GL_RED_INTEGER,  GL_UNSIGNED_BYTE,               GL_UNSIGNED_INT, false, RequireES<3, 0>,    NeverSupported, NeverSupported,      NeverSupported);
>+    AddRGBAFormat(&map, GL_RED_INTEGER,  false, 16,  0,  0,  0, 0, GL_RED_INTEGER,  GL_SHORT,                       GL_INT,          false, RequireES<3, 0>,    NeverSupported, NeverSupported,      NeverSupported);
>+    AddRGBAFormat(&map, GL_RED_INTEGER,  false, 16,  0,  0,  0, 0, GL_RED_INTEGER,  GL_UNSIGNED_SHORT,              GL_UNSIGNED_INT, false, RequireES<3, 0>,    NeverSupported, NeverSupported,      NeverSupported);
>+    AddRGBAFormat(&map, GL_RED_INTEGER,  false, 32,  0,  0,  0, 0, GL_RED_INTEGER,  GL_INT,                         GL_INT,          false, RequireES<3, 0>,    NeverSupported, NeverSupported,      NeverSupported);
>+    AddRGBAFormat(&map, GL_RED_INTEGER,  false, 32,  0,  0,  0, 0, GL_RED_INTEGER,  GL_UNSIGNED_INT,                GL_UNSIGNED_INT, false, RequireES<3, 0>,    NeverSupported, NeverSupported,      NeverSupported);
>+    AddRGBAFormat(&map, GL_RG_INTEGER,   false,  8,  8,  0,  0, 0, GL_RG_INTEGER,   GL_BYTE,                        GL_INT,          false, RequireES<3, 0>,    NeverSupported, NeverSupported,      NeverSupported);
>+    AddRGBAFormat(&map, GL_RG_INTEGER,   false,  8,  8,  0,  0, 0, GL_RG_INTEGER,   GL_UNSIGNED_BYTE,               GL_UNSIGNED_INT, false, RequireES<3, 0>,    NeverSupported, NeverSupported,      NeverSupported);
>+    AddRGBAFormat(&map, GL_RG_INTEGER,   false, 16, 16,  0,  0, 0, GL_RG_INTEGER,   GL_SHORT,                       GL_INT,          false, RequireES<3, 0>,    NeverSupported, NeverSupported,      NeverSupported);
>+    AddRGBAFormat(&map, GL_RG_INTEGER,   false, 16, 16,  0,  0, 0, GL_RG_INTEGER,   GL_UNSIGNED_SHORT,              GL_UNSIGNED_INT, false, RequireES<3, 0>,    NeverSupported, NeverSupported,      NeverSupported);
>+    AddRGBAFormat(&map, GL_RG_INTEGER,   false, 32, 32,  0,  0, 0, GL_RG_INTEGER,   GL_INT,                         GL_INT,          false, RequireES<3, 0>,    NeverSupported, NeverSupported,      NeverSupported);
>+    AddRGBAFormat(&map, GL_RG_INTEGER,   false, 32, 32,  0,  0, 0, GL_RG_INTEGER,   GL_UNSIGNED_INT,                GL_UNSIGNED_INT, false, RequireES<3, 0>,    NeverSupported, NeverSupported,      NeverSupported);
>+    AddRGBAFormat(&map, GL_RGB_INTEGER,  false,  8,  8,  8,  0, 0, GL_RGB_INTEGER,  GL_BYTE,                        GL_INT,          false, RequireES<3, 0>,    NeverSupported, NeverSupported,      NeverSupported);
>+    AddRGBAFormat(&map, GL_RGB_INTEGER,  false,  8,  8,  8,  0, 0, GL_RGB_INTEGER,  GL_UNSIGNED_BYTE,               GL_UNSIGNED_INT, false, RequireES<3, 0>,    NeverSupported, NeverSupported,      NeverSupported);
>+    AddRGBAFormat(&map, GL_RGB_INTEGER,  false, 16, 16, 16,  0, 0, GL_RGB_INTEGER,  GL_SHORT,                       GL_INT,          false, RequireES<3, 0>,    NeverSupported, NeverSupported,      NeverSupported);
>+    AddRGBAFormat(&map, GL_RGB_INTEGER,  false, 16, 16, 16,  0, 0, GL_RGB_INTEGER,  GL_UNSIGNED_SHORT,              GL_UNSIGNED_INT, false, RequireES<3, 0>,    NeverSupported, NeverSupported,      NeverSupported);
>+    AddRGBAFormat(&map, GL_RGB_INTEGER,  false, 32, 32, 32,  0, 0, GL_RGB_INTEGER,  GL_INT,                         GL_INT,          false, RequireES<3, 0>,    NeverSupported, NeverSupported,      NeverSupported);
>+    AddRGBAFormat(&map, GL_RGB_INTEGER,  false, 32, 32, 32,  0, 0, GL_RGB_INTEGER,  GL_UNSIGNED_INT,                GL_UNSIGNED_INT, false, RequireES<3, 0>,    NeverSupported, NeverSupported,      NeverSupported);
>+    AddRGBAFormat(&map, GL_RGBA_INTEGER, false,  8,  8,  8,  8, 0, GL_RGBA_INTEGER, GL_BYTE,                        GL_INT,          false, RequireES<3, 0>,    NeverSupported, NeverSupported,      NeverSupported);
>+    AddRGBAFormat(&map, GL_RGBA_INTEGER, false,  8,  8,  8,  8, 0, GL_RGBA_INTEGER, GL_UNSIGNED_BYTE,               GL_UNSIGNED_INT, false, RequireES<3, 0>,    NeverSupported, NeverSupported,      NeverSupported);
>+    AddRGBAFormat(&map, GL_RGBA_INTEGER, false, 16, 16, 16, 16, 0, GL_RGBA_INTEGER, GL_SHORT,                       GL_INT,          false, RequireES<3, 0>,    NeverSupported, NeverSupported,      NeverSupported);
>+    AddRGBAFormat(&map, GL_RGBA_INTEGER, false, 16, 16, 16, 16, 0, GL_RGBA_INTEGER, GL_UNSIGNED_SHORT,              GL_UNSIGNED_INT, false, RequireES<3, 0>,    NeverSupported, NeverSupported,      NeverSupported);
>+    AddRGBAFormat(&map, GL_RGBA_INTEGER, false, 32, 32, 32, 32, 0, GL_RGBA_INTEGER, GL_INT,                         GL_INT,          false, RequireES<3, 0>,    NeverSupported, NeverSupported,      NeverSupported);
>+    AddRGBAFormat(&map, GL_RGBA_INTEGER, false, 32, 32, 32, 32, 0, GL_RGBA_INTEGER, GL_UNSIGNED_INT,                GL_UNSIGNED_INT, false, RequireES<3, 0>,    NeverSupported, NeverSupported,      NeverSupported);
>+    AddRGBAFormat(&map, GL_RGBA_INTEGER, false, 10, 10, 10,  2, 0, GL_RGBA_INTEGER, GL_UNSIGNED_INT_2_10_10_10_REV, GL_UNSIGNED_INT, false, RequireES<3, 0>,    NeverSupported, NeverSupported,      NeverSupported);
> 
>     // Unsized floating point formats
>-    //                 |Internal format |sized | R | G | B | A |S | Format         | Type                           | Comp    | SRGB | Texture supported           | Renderable                            | Filterable                                              |
>-    AddRGBAFormat(&map, GL_RED,          false, 16,  0,  0,  0, 0, GL_RED,          GL_HALF_FLOAT,                   GL_FLOAT, false, NeverSupported,               NeverSupported,                         NeverSupported                                           );
>-    AddRGBAFormat(&map, GL_RG,           false, 16, 16,  0,  0, 0, GL_RG,           GL_HALF_FLOAT,                   GL_FLOAT, false, NeverSupported,               NeverSupported,                         NeverSupported                                           );
>-    AddRGBAFormat(&map, GL_RGB,          false, 16, 16, 16,  0, 0, GL_RGB,          GL_HALF_FLOAT,                   GL_FLOAT, false, NeverSupported,               NeverSupported,                         NeverSupported                                           );
>-    AddRGBAFormat(&map, GL_RGBA,         false, 16, 16, 16, 16, 0, GL_RGBA,         GL_HALF_FLOAT,                   GL_FLOAT, false, NeverSupported,               NeverSupported,                         NeverSupported                                           );
>-    AddRGBAFormat(&map, GL_RED,          false, 16,  0,  0,  0, 0, GL_RED,          GL_HALF_FLOAT_OES,               GL_FLOAT, false, UnsizedHalfFloatOESRGSupport, UnsizedHalfFloatOESRGRenderableSupport, RequireESOrExt<3, 0, &Extensions::textureHalfFloatLinear>);
>-    AddRGBAFormat(&map, GL_RG,           false, 16, 16,  0,  0, 0, GL_RG,           GL_HALF_FLOAT_OES,               GL_FLOAT, false, UnsizedHalfFloatOESRGSupport, UnsizedHalfFloatOESRGRenderableSupport, RequireESOrExt<3, 0, &Extensions::textureHalfFloatLinear>);
>-    AddRGBAFormat(&map, GL_RGB,          false, 16, 16, 16,  0, 0, GL_RGB,          GL_HALF_FLOAT_OES,               GL_FLOAT, false, UnsizedHalfFloatOESSupport,   UnsizedHalfFloatOESRenderableSupport,   RequireESOrExt<3, 0, &Extensions::textureHalfFloatLinear>);
>-    AddRGBAFormat(&map, GL_RGBA,         false, 16, 16, 16, 16, 0, GL_RGBA,         GL_HALF_FLOAT_OES,               GL_FLOAT, false, UnsizedHalfFloatOESSupport,   UnsizedHalfFloatOESRenderableSupport,   RequireESOrExt<3, 0, &Extensions::textureHalfFloatLinear>);
>-    AddRGBAFormat(&map, GL_RED,          false, 32,  0,  0,  0, 0, GL_RED,          GL_FLOAT,                        GL_FLOAT, false, UnsizedFloatRGSupport,        UnsizedFloatRGRenderableSupport,        RequireExt<&Extensions::textureFloatLinear>              );
>-    AddRGBAFormat(&map, GL_RG,           false, 32, 32,  0,  0, 0, GL_RG,           GL_FLOAT,                        GL_FLOAT, false, UnsizedFloatRGSupport,        UnsizedFloatRGRenderableSupport,        RequireExt<&Extensions::textureFloatLinear>              );
>-    AddRGBAFormat(&map, GL_RGB,          false, 32, 32, 32,  0, 0, GL_RGB,          GL_FLOAT,                        GL_FLOAT, false, UnsizedFloatSupport,          UnsizedFloatRGBRenderableSupport,       RequireExt<&Extensions::textureFloatLinear>              );
>-    AddRGBAFormat(&map, GL_RGB,          false,  9,  9,  9,  0, 5, GL_RGB,          GL_UNSIGNED_INT_5_9_9_9_REV,     GL_FLOAT, false, NeverSupported,               NeverSupported,                         NeverSupported                                           );
>-    AddRGBAFormat(&map, GL_RGB,          false, 11, 11, 10,  0, 0, GL_RGB,          GL_UNSIGNED_INT_10F_11F_11F_REV, GL_FLOAT, false, NeverSupported,               NeverSupported,                         NeverSupported                                           );
>-    AddRGBAFormat(&map, GL_RGBA,         false, 32, 32, 32, 32, 0, GL_RGBA,         GL_FLOAT,                        GL_FLOAT, false, UnsizedFloatSupport,          UnsizedFloatRGBARenderableSupport,      RequireExt<&Extensions::textureFloatLinear>              );
>+    //                 |Internal format |sized | R | G | B | A |S | Format | Type                           | Comp    | SRGB | Texture supported                                                      | Filterable                                     | Texture attachment                                                                  | Renderbuffer |
>+    AddRGBAFormat(&map, GL_RED,          false, 16,  0,  0,  0, 0, GL_RED,  GL_HALF_FLOAT,                   GL_FLOAT, false, NeverSupported,                                                          NeverSupported,                                  NeverSupported,                                                                       NeverSupported);
>+    AddRGBAFormat(&map, GL_RG,           false, 16, 16,  0,  0, 0, GL_RG,   GL_HALF_FLOAT,                   GL_FLOAT, false, NeverSupported,                                                          NeverSupported,                                  NeverSupported,                                                                       NeverSupported);
>+    AddRGBAFormat(&map, GL_RGB,          false, 16, 16, 16,  0, 0, GL_RGB,  GL_HALF_FLOAT,                   GL_FLOAT, false, NeverSupported,                                                          NeverSupported,                                  NeverSupported,                                                                       NeverSupported);
>+    AddRGBAFormat(&map, GL_RGBA,         false, 16, 16, 16, 16, 0, GL_RGBA, GL_HALF_FLOAT,                   GL_FLOAT, false, NeverSupported,                                                          NeverSupported,                                  NeverSupported,                                                                       NeverSupported);
>+    AddRGBAFormat(&map, GL_RED,          false, 16,  0,  0,  0, 0, GL_RED,  GL_HALF_FLOAT_OES,               GL_FLOAT, false, RequireExtAndExt<&Extensions::textureHalfFloat, &Extensions::textureRG>, RequireExt<&Extensions::textureHalfFloatLinear>, NeverSupported,                                                                       NeverSupported);
>+    AddRGBAFormat(&map, GL_RG,           false, 16, 16,  0,  0, 0, GL_RG,   GL_HALF_FLOAT_OES,               GL_FLOAT, false, RequireExtAndExt<&Extensions::textureHalfFloat, &Extensions::textureRG>, RequireExt<&Extensions::textureHalfFloatLinear>, NeverSupported,                                                                       NeverSupported);
>+    AddRGBAFormat(&map, GL_RGB,          false, 16, 16, 16,  0, 0, GL_RGB,  GL_HALF_FLOAT_OES,               GL_FLOAT, false, RequireExt<&Extensions::textureHalfFloat>,                               RequireExt<&Extensions::textureHalfFloatLinear>, RequireExtAndExt<&Extensions::colorBufferHalfFloat, &Extensions::webglCompatibility>, NeverSupported);
>+    AddRGBAFormat(&map, GL_RGBA,         false, 16, 16, 16, 16, 0, GL_RGBA, GL_HALF_FLOAT_OES,               GL_FLOAT, false, RequireExt<&Extensions::textureHalfFloat>,                               RequireExt<&Extensions::textureHalfFloatLinear>, RequireExt<&Extensions::colorBufferHalfFloat>,                                        NeverSupported);
>+    AddRGBAFormat(&map, GL_RED,          false, 32,  0,  0,  0, 0, GL_RED,  GL_FLOAT,                        GL_FLOAT, false, RequireExtAndExt<&Extensions::textureFloat, &Extensions::textureRG>,     RequireExt<&Extensions::textureFloatLinear>,     NeverSupported,                                                                       NeverSupported);
>+    AddRGBAFormat(&map, GL_RG,           false, 32, 32,  0,  0, 0, GL_RG,   GL_FLOAT,                        GL_FLOAT, false, RequireExtAndExt<&Extensions::textureFloat, &Extensions::textureRG>,     RequireExt<&Extensions::textureFloatLinear>,     NeverSupported,                                                                       NeverSupported);
>+    AddRGBAFormat(&map, GL_RGB,          false, 32, 32, 32,  0, 0, GL_RGB,  GL_FLOAT,                        GL_FLOAT, false, RequireExt<&Extensions::textureFloat>,                                   RequireExt<&Extensions::textureFloatLinear>,     NeverSupported,                                                                       NeverSupported);
>+    AddRGBAFormat(&map, GL_RGB,          false,  9,  9,  9,  0, 5, GL_RGB,  GL_UNSIGNED_INT_5_9_9_9_REV,     GL_FLOAT, false, NeverSupported,                                                          NeverSupported,                                  NeverSupported,                                                                       NeverSupported);
>+    AddRGBAFormat(&map, GL_RGB,          false, 11, 11, 10,  0, 0, GL_RGB,  GL_UNSIGNED_INT_10F_11F_11F_REV, GL_FLOAT, false, NeverSupported,                                                          NeverSupported,                                  NeverSupported,                                                                       NeverSupported);
>+    AddRGBAFormat(&map, GL_RGBA,         false, 32, 32, 32, 32, 0, GL_RGBA, GL_FLOAT,                        GL_FLOAT, false, RequireExt<&Extensions::textureFloat>,                                   RequireExt<&Extensions::textureFloatLinear>,     NeverSupported,                                                                       NeverSupported);
> 
>     // Unsized luminance alpha formats
>-    //                | Internal format    |sized | L | A | Format            | Type             | Component type        | Supported                                | Renderable    | Filterable                                    |
>-    AddLUMAFormat(&map, GL_ALPHA,           false,  0,  8, GL_ALPHA,           GL_UNSIGNED_BYTE,  GL_UNSIGNED_NORMALIZED, RequireES<2, 0>,                           NeverSupported, AlwaysSupported                                );
>-    AddLUMAFormat(&map, GL_LUMINANCE,       false,  8,  0, GL_LUMINANCE,       GL_UNSIGNED_BYTE,  GL_UNSIGNED_NORMALIZED, RequireES<2, 0>,                           NeverSupported, AlwaysSupported                                );
>-    AddLUMAFormat(&map, GL_LUMINANCE_ALPHA, false,  8,  8, GL_LUMINANCE_ALPHA, GL_UNSIGNED_BYTE,  GL_UNSIGNED_NORMALIZED, RequireES<2, 0>,                           NeverSupported, AlwaysSupported                                );
>-    AddLUMAFormat(&map, GL_ALPHA,           false,  0, 16, GL_ALPHA,           GL_HALF_FLOAT_OES, GL_FLOAT,               RequireExt<&Extensions::textureHalfFloat>, NeverSupported, RequireExt<&Extensions::textureHalfFloatLinear>);
>-    AddLUMAFormat(&map, GL_LUMINANCE,       false, 16,  0, GL_LUMINANCE,       GL_HALF_FLOAT_OES, GL_FLOAT,               RequireExt<&Extensions::textureHalfFloat>, NeverSupported, RequireExt<&Extensions::textureHalfFloatLinear>);
>-    AddLUMAFormat(&map, GL_LUMINANCE_ALPHA ,false, 16, 16, GL_LUMINANCE_ALPHA, GL_HALF_FLOAT_OES, GL_FLOAT,               RequireExt<&Extensions::textureHalfFloat>, NeverSupported, RequireExt<&Extensions::textureHalfFloatLinear>);
>-    AddLUMAFormat(&map, GL_ALPHA,           false,  0, 32, GL_ALPHA,           GL_FLOAT,          GL_FLOAT,               RequireExt<&Extensions::textureFloat>,     NeverSupported, RequireExt<&Extensions::textureFloatLinear>    );
>-    AddLUMAFormat(&map, GL_LUMINANCE,       false, 32,  0, GL_LUMINANCE,       GL_FLOAT,          GL_FLOAT,               RequireExt<&Extensions::textureFloat>,     NeverSupported, RequireExt<&Extensions::textureFloatLinear>    );
>-    AddLUMAFormat(&map, GL_LUMINANCE_ALPHA, false, 32, 32, GL_LUMINANCE_ALPHA, GL_FLOAT,          GL_FLOAT,               RequireExt<&Extensions::textureFloat>,     NeverSupported, RequireExt<&Extensions::textureFloatLinear>    );
>+    //                 | Internal format   |sized | L | A | Format            | Type             | Component type        | Texture supported                        | Filterable                                     | Texture attachment | Renderbuffer |
>+    AddLUMAFormat(&map, GL_ALPHA,           false,  0,  8, GL_ALPHA,           GL_UNSIGNED_BYTE,  GL_UNSIGNED_NORMALIZED, AlwaysSupported,                           AlwaysSupported,                                 NeverSupported,      NeverSupported);
>+    AddLUMAFormat(&map, GL_LUMINANCE,       false,  8,  0, GL_LUMINANCE,       GL_UNSIGNED_BYTE,  GL_UNSIGNED_NORMALIZED, AlwaysSupported,                           AlwaysSupported,                                 NeverSupported,      NeverSupported);
>+    AddLUMAFormat(&map, GL_LUMINANCE_ALPHA, false,  8,  8, GL_LUMINANCE_ALPHA, GL_UNSIGNED_BYTE,  GL_UNSIGNED_NORMALIZED, AlwaysSupported,                           AlwaysSupported,                                 NeverSupported,      NeverSupported);
>+    AddLUMAFormat(&map, GL_ALPHA,           false,  0, 16, GL_ALPHA,           GL_HALF_FLOAT_OES, GL_FLOAT,               RequireExt<&Extensions::textureHalfFloat>, RequireExt<&Extensions::textureHalfFloatLinear>, NeverSupported,      NeverSupported);
>+    AddLUMAFormat(&map, GL_LUMINANCE,       false, 16,  0, GL_LUMINANCE,       GL_HALF_FLOAT_OES, GL_FLOAT,               RequireExt<&Extensions::textureHalfFloat>, RequireExt<&Extensions::textureHalfFloatLinear>, NeverSupported,      NeverSupported);
>+    AddLUMAFormat(&map, GL_LUMINANCE_ALPHA, false, 16, 16, GL_LUMINANCE_ALPHA, GL_HALF_FLOAT_OES, GL_FLOAT,               RequireExt<&Extensions::textureHalfFloat>, RequireExt<&Extensions::textureHalfFloatLinear>, NeverSupported,      NeverSupported);
>+    AddLUMAFormat(&map, GL_ALPHA,           false,  0, 32, GL_ALPHA,           GL_FLOAT,          GL_FLOAT,               RequireExt<&Extensions::textureFloat>,     RequireExt<&Extensions::textureFloatLinear>,     NeverSupported,      NeverSupported);
>+    AddLUMAFormat(&map, GL_LUMINANCE,       false, 32,  0, GL_LUMINANCE,       GL_FLOAT,          GL_FLOAT,               RequireExt<&Extensions::textureFloat>,     RequireExt<&Extensions::textureFloatLinear>,     NeverSupported,      NeverSupported);
>+    AddLUMAFormat(&map, GL_LUMINANCE_ALPHA, false, 32, 32, GL_LUMINANCE_ALPHA, GL_FLOAT,          GL_FLOAT,               RequireExt<&Extensions::textureFloat>,     RequireExt<&Extensions::textureFloatLinear>,     NeverSupported,      NeverSupported);
> 
>     // Unsized depth stencil formats
>-    //                         | Internal format        |sized | D |S | X | Format            | Type                             | Component type        | Supported                                            | Renderable                                           | Filterable    |
>-    AddDepthStencilFormat(&map, GL_DEPTH_COMPONENT,      false, 16, 0,  0, GL_DEPTH_COMPONENT, GL_UNSIGNED_SHORT,                 GL_UNSIGNED_NORMALIZED, RequireES<2, 0>,                                       RequireES<2, 0>,                                       AlwaysSupported);
>-    AddDepthStencilFormat(&map, GL_DEPTH_COMPONENT,      false, 24, 0,  0, GL_DEPTH_COMPONENT, GL_UNSIGNED_INT,                   GL_UNSIGNED_NORMALIZED, RequireES<2, 0>,                                       RequireES<2, 0>,                                       AlwaysSupported);
>-    AddDepthStencilFormat(&map, GL_DEPTH_COMPONENT,      false, 32, 0,  0, GL_DEPTH_COMPONENT, GL_FLOAT,                          GL_FLOAT,               RequireES<2, 0>,                                       RequireES<2, 0>,                                       AlwaysSupported);
>-    AddDepthStencilFormat(&map, GL_DEPTH_STENCIL,        false, 24, 8,  0, GL_DEPTH_STENCIL,   GL_UNSIGNED_INT_24_8,              GL_UNSIGNED_NORMALIZED, RequireESOrExt<3, 0, &Extensions::packedDepthStencil>, RequireESOrExt<3, 0, &Extensions::packedDepthStencil>, AlwaysSupported);
>-    AddDepthStencilFormat(&map, GL_DEPTH_STENCIL,        false, 32, 8, 24, GL_DEPTH_STENCIL,   GL_FLOAT_32_UNSIGNED_INT_24_8_REV, GL_FLOAT,               RequireESOrExt<3, 0, &Extensions::packedDepthStencil>, RequireESOrExt<3, 0, &Extensions::packedDepthStencil>, AlwaysSupported);
>-    AddDepthStencilFormat(&map, GL_STENCIL,              false,  0, 8,  0, GL_STENCIL,         GL_UNSIGNED_BYTE,                  GL_UNSIGNED_NORMALIZED, RequireES<2, 0>,                                       RequireES<2, 0>,                                       NeverSupported);
>+    //                         | Internal format   |sized | D |S | X | Format            | Type                             | Component type        | Texture supported                                    | Filterable     | Texture attachment                                   | Renderbuffer                                        |
>+    AddDepthStencilFormat(&map, GL_DEPTH_COMPONENT, false, 16, 0,  0, GL_DEPTH_COMPONENT, GL_UNSIGNED_SHORT,                 GL_UNSIGNED_NORMALIZED, RequireES<1, 0>,                                       AlwaysSupported, RequireES<1, 0>,                                       RequireES<1, 0>                                      );
>+    AddDepthStencilFormat(&map, GL_DEPTH_COMPONENT, false, 24, 0,  0, GL_DEPTH_COMPONENT, GL_UNSIGNED_INT,                   GL_UNSIGNED_NORMALIZED, RequireES<1, 0>,                                       AlwaysSupported, RequireES<1, 0>,                                       RequireES<1, 0>                                      );
>+    AddDepthStencilFormat(&map, GL_DEPTH_COMPONENT, false, 32, 0,  0, GL_DEPTH_COMPONENT, GL_FLOAT,                          GL_FLOAT,               RequireES<1, 0>,                                       AlwaysSupported, RequireES<1, 0>,                                       RequireES<1, 0>                                      );
>+    AddDepthStencilFormat(&map, GL_DEPTH_STENCIL,   false, 24, 8,  0, GL_DEPTH_STENCIL,   GL_UNSIGNED_INT_24_8,              GL_UNSIGNED_NORMALIZED, RequireESOrExt<3, 0, &Extensions::packedDepthStencil>, AlwaysSupported, RequireESOrExt<3, 0, &Extensions::packedDepthStencil>, RequireESOrExt<3, 0, &Extensions::packedDepthStencil>);
>+    AddDepthStencilFormat(&map, GL_DEPTH_STENCIL,   false, 32, 8, 24, GL_DEPTH_STENCIL,   GL_FLOAT_32_UNSIGNED_INT_24_8_REV, GL_FLOAT,               RequireESOrExt<3, 0, &Extensions::packedDepthStencil>, AlwaysSupported, RequireESOrExt<3, 0, &Extensions::packedDepthStencil>, RequireESOrExt<3, 0, &Extensions::packedDepthStencil>);
>+    AddDepthStencilFormat(&map, GL_STENCIL,         false,  0, 8,  0, GL_STENCIL,         GL_UNSIGNED_BYTE,                  GL_UNSIGNED_NORMALIZED, RequireES<1, 0>,                                       NeverSupported , RequireES<1, 0>,                                       RequireES<1, 0>                                      );
>     // clang-format on
> 
>     return map;
>@@ -958,58 +1022,57 @@ static FormatSet BuildAllSizedInternalFormatSet()
>     return result;
> }
> 
>-const Type &GetTypeInfo(GLenum type)
>+uint32_t GetPackedTypeInfo(GLenum type)
> {
>     switch (type)
>     {
>-      case GL_UNSIGNED_BYTE:
>-      case GL_BYTE:
>+        case GL_UNSIGNED_BYTE:
>+        case GL_BYTE:
>         {
>-            static const Type info = GenTypeInfo(1, false);
>-            return info;
>+            static constexpr uint32_t kPacked = PackTypeInfo(1, false);
>+            return kPacked;
>         }
>-      case GL_UNSIGNED_SHORT:
>-      case GL_SHORT:
>-      case GL_HALF_FLOAT:
>-      case GL_HALF_FLOAT_OES:
>+        case GL_UNSIGNED_SHORT:
>+        case GL_SHORT:
>+        case GL_HALF_FLOAT:
>+        case GL_HALF_FLOAT_OES:
>         {
>-            static const Type info = GenTypeInfo(2, false);
>-            return info;
>+            static constexpr uint32_t kPacked = PackTypeInfo(2, false);
>+            return kPacked;
>         }
>-      case GL_UNSIGNED_INT:
>-      case GL_INT:
>-      case GL_FLOAT:
>+        case GL_UNSIGNED_INT:
>+        case GL_INT:
>+        case GL_FLOAT:
>         {
>-            static const Type info = GenTypeInfo(4, false);
>-            return info;
>+            static constexpr uint32_t kPacked = PackTypeInfo(4, false);
>+            return kPacked;
>         }
>-      case GL_UNSIGNED_SHORT_5_6_5:
>-      case GL_UNSIGNED_SHORT_4_4_4_4:
>-      case GL_UNSIGNED_SHORT_5_5_5_1:
>-      case GL_UNSIGNED_SHORT_4_4_4_4_REV_EXT:
>-      case GL_UNSIGNED_SHORT_1_5_5_5_REV_EXT:
>+        case GL_UNSIGNED_SHORT_5_6_5:
>+        case GL_UNSIGNED_SHORT_4_4_4_4:
>+        case GL_UNSIGNED_SHORT_5_5_5_1:
>+        case GL_UNSIGNED_SHORT_4_4_4_4_REV_EXT:
>+        case GL_UNSIGNED_SHORT_1_5_5_5_REV_EXT:
>         {
>-            static const Type info = GenTypeInfo(2, true);
>-            return info;
>+            static constexpr uint32_t kPacked = PackTypeInfo(2, true);
>+            return kPacked;
>         }
>-      case GL_UNSIGNED_INT_2_10_10_10_REV:
>-      case GL_UNSIGNED_INT_24_8:
>-      case GL_UNSIGNED_INT_10F_11F_11F_REV:
>-      case GL_UNSIGNED_INT_5_9_9_9_REV:
>+        case GL_UNSIGNED_INT_2_10_10_10_REV:
>+        case GL_UNSIGNED_INT_24_8:
>+        case GL_UNSIGNED_INT_10F_11F_11F_REV:
>+        case GL_UNSIGNED_INT_5_9_9_9_REV:
>         {
>             ASSERT(GL_UNSIGNED_INT_24_8_OES == GL_UNSIGNED_INT_24_8);
>-            static const Type info = GenTypeInfo(4, true);
>-            return info;
>+            static constexpr uint32_t kPacked = PackTypeInfo(4, true);
>+            return kPacked;
>         }
>-      case GL_FLOAT_32_UNSIGNED_INT_24_8_REV:
>+        case GL_FLOAT_32_UNSIGNED_INT_24_8_REV:
>         {
>-            static const Type info = GenTypeInfo(8, true);
>-            return info;
>+            static constexpr uint32_t kPacked = PackTypeInfo(8, true);
>+            return kPacked;
>         }
>-      default:
>+        default:
>         {
>-            static const Type defaultInfo;
>-            return defaultInfo;
>+            return 0;
>         }
>     }
> }
>@@ -1068,16 +1131,17 @@ GLuint InternalFormat::computePixelBytes(GLenum formatType) const
>     return components * typeInfo.bytes;
> }
> 
>-ErrorOrResult<GLuint> InternalFormat::computeRowPitch(GLenum formatType,
>-                                                          GLsizei width,
>-                                                          GLint alignment,
>-                                                          GLint rowLength) const
>+bool InternalFormat::computeRowPitch(GLenum formatType,
>+                                     GLsizei width,
>+                                     GLint alignment,
>+                                     GLint rowLength,
>+                                     GLuint *resultOut) const
> {
>     // Compressed images do not use pack/unpack parameters.
>     if (compressed)
>     {
>         ASSERT(rowLength == 0);
>-        return computeCompressedImageSize(Extents(width, 1, 1));
>+        return computeCompressedImageSize(Extents(width, 1, 1), resultOut);
>     }
> 
>     CheckedNumeric<GLuint> checkedWidth(rowLength > 0 ? rowLength : width);
>@@ -1086,36 +1150,38 @@ ErrorOrResult<GLuint> InternalFormat::computeRowPitch(GLenum formatType,
>     ASSERT(alignment > 0 && isPow2(alignment));
>     CheckedNumeric<GLuint> checkedAlignment(alignment);
>     auto aligned = rx::roundUp(checkedRowBytes, checkedAlignment);
>-    ANGLE_TRY_CHECKED_MATH(aligned);
>-    return aligned.ValueOrDie();
>+    return CheckedMathResult(aligned, resultOut);
> }
> 
>-ErrorOrResult<GLuint> InternalFormat::computeDepthPitch(GLsizei height,
>-                                                        GLint imageHeight,
>-                                                        GLuint rowPitch) const
>+bool InternalFormat::computeDepthPitch(GLsizei height,
>+                                       GLint imageHeight,
>+                                       GLuint rowPitch,
>+                                       GLuint *resultOut) const
> {
>     GLuint rows =
>         (imageHeight > 0 ? static_cast<GLuint>(imageHeight) : static_cast<GLuint>(height));
>     CheckedNumeric<GLuint> checkedRowPitch(rowPitch);
> 
>-    auto depthPitch = checkedRowPitch * rows;
>-    ANGLE_TRY_CHECKED_MATH(depthPitch);
>-    return depthPitch.ValueOrDie();
>+    return CheckedMathResult(checkedRowPitch * rows, resultOut);
> }
> 
>-ErrorOrResult<GLuint> InternalFormat::computeDepthPitch(GLenum formatType,
>-                                                            GLsizei width,
>-                                                            GLsizei height,
>-                                                            GLint alignment,
>-                                                            GLint rowLength,
>-                                                            GLint imageHeight) const
>+bool InternalFormat::computeDepthPitch(GLenum formatType,
>+                                       GLsizei width,
>+                                       GLsizei height,
>+                                       GLint alignment,
>+                                       GLint rowLength,
>+                                       GLint imageHeight,
>+                                       GLuint *resultOut) const
> {
>     GLuint rowPitch = 0;
>-    ANGLE_TRY_RESULT(computeRowPitch(formatType, width, alignment, rowLength), rowPitch);
>-    return computeDepthPitch(height, imageHeight, rowPitch);
>+    if (!computeRowPitch(formatType, width, alignment, rowLength, &rowPitch))
>+    {
>+        return false;
>+    }
>+    return computeDepthPitch(height, imageHeight, rowPitch, resultOut);
> }
> 
>-ErrorOrResult<GLuint> InternalFormat::computeCompressedImageSize(const Extents &size) const
>+bool InternalFormat::computeCompressedImageSize(const Extents &size, GLuint *resultOut) const
> {
>     CheckedNumeric<GLuint> checkedWidth(size.width);
>     CheckedNumeric<GLuint> checkedHeight(size.height);
>@@ -1127,21 +1193,22 @@ ErrorOrResult<GLuint> InternalFormat::computeCompressedImageSize(const Extents &
>     auto numBlocksWide = (checkedWidth + checkedBlockWidth - 1u) / checkedBlockWidth;
>     auto numBlocksHigh = (checkedHeight + checkedBlockHeight - 1u) / checkedBlockHeight;
>     auto bytes         = numBlocksWide * numBlocksHigh * pixelBytes * checkedDepth;
>-    ANGLE_TRY_CHECKED_MATH(bytes);
>-    return bytes.ValueOrDie();
>+    return CheckedMathResult(bytes, resultOut);
> }
> 
>-ErrorOrResult<GLuint> InternalFormat::computeSkipBytes(GLuint rowPitch,
>-                                                           GLuint depthPitch,
>-                                                           const PixelStoreStateBase &state,
>-                                                           bool is3D) const
>+bool InternalFormat::computeSkipBytes(GLenum formatType,
>+                                      GLuint rowPitch,
>+                                      GLuint depthPitch,
>+                                      const PixelStoreStateBase &state,
>+                                      bool is3D,
>+                                      GLuint *resultOut) const
> {
>     CheckedNumeric<GLuint> checkedRowPitch(rowPitch);
>     CheckedNumeric<GLuint> checkedDepthPitch(depthPitch);
>     CheckedNumeric<GLuint> checkedSkipImages(static_cast<GLuint>(state.skipImages));
>     CheckedNumeric<GLuint> checkedSkipRows(static_cast<GLuint>(state.skipRows));
>     CheckedNumeric<GLuint> checkedSkipPixels(static_cast<GLuint>(state.skipPixels));
>-    CheckedNumeric<GLuint> checkedPixelBytes(pixelBytes);
>+    CheckedNumeric<GLuint> checkedPixelBytes(computePixelBytes(formatType));
>     auto checkedSkipImagesBytes = checkedSkipImages * checkedDepthPitch;
>     if (!is3D)
>     {
>@@ -1149,30 +1216,36 @@ ErrorOrResult<GLuint> InternalFormat::computeSkipBytes(GLuint rowPitch,
>     }
>     auto skipBytes = checkedSkipImagesBytes + checkedSkipRows * checkedRowPitch +
>                      checkedSkipPixels * checkedPixelBytes;
>-    ANGLE_TRY_CHECKED_MATH(skipBytes);
>-    return skipBytes.ValueOrDie();
>+    return CheckedMathResult(skipBytes, resultOut);
> }
> 
>-ErrorOrResult<GLuint> InternalFormat::computePackUnpackEndByte(
>-    GLenum formatType,
>-    const Extents &size,
>-    const PixelStoreStateBase &state,
>-    bool is3D) const
>+bool InternalFormat::computePackUnpackEndByte(GLenum formatType,
>+                                              const Extents &size,
>+                                              const PixelStoreStateBase &state,
>+                                              bool is3D,
>+                                              GLuint *resultOut) const
> {
>     GLuint rowPitch = 0;
>-    ANGLE_TRY_RESULT(computeRowPitch(formatType, size.width, state.alignment, state.rowLength),
>-                     rowPitch);
>+    if (!computeRowPitch(formatType, size.width, state.alignment, state.rowLength, &rowPitch))
>+    {
>+        return false;
>+    }
> 
>     GLuint depthPitch = 0;
>-    if (is3D)
>+    if (is3D && !computeDepthPitch(size.height, state.imageHeight, rowPitch, &depthPitch))
>     {
>-        ANGLE_TRY_RESULT(computeDepthPitch(size.height, state.imageHeight, rowPitch), depthPitch);
>+        return false;
>     }
> 
>-    CheckedNumeric<GLuint> checkedCopyBytes = 0;
>+    CheckedNumeric<GLuint> checkedCopyBytes(0);
>     if (compressed)
>     {
>-        ANGLE_TRY_RESULT(computeCompressedImageSize(size), checkedCopyBytes);
>+        GLuint copyBytes = 0;
>+        if (!computeCompressedImageSize(size, &copyBytes))
>+        {
>+            return false;
>+        }
>+        checkedCopyBytes = copyBytes;
>     }
>     else if (size.height != 0 && (!is3D || size.depth != 0))
>     {
>@@ -1189,13 +1262,15 @@ ErrorOrResult<GLuint> InternalFormat::computePackUnpackEndByte(
>         }
>     }
> 
>-    CheckedNumeric<GLuint> checkedSkipBytes = 0;
>-    ANGLE_TRY_RESULT(computeSkipBytes(rowPitch, depthPitch, state, is3D), checkedSkipBytes);
>+    GLuint skipBytes = 0;
>+    if (!computeSkipBytes(formatType, rowPitch, depthPitch, state, is3D, &skipBytes))
>+    {
>+        return false;
>+    }
> 
>-    CheckedNumeric<GLuint> endByte = checkedCopyBytes + checkedSkipBytes;
>+    CheckedNumeric<GLuint> endByte = checkedCopyBytes + CheckedNumeric<GLuint>(skipBytes);
> 
>-    ANGLE_TRY_CHECKED_MATH(endByte);
>-    return endByte.ValueOrDie();
>+    return CheckedMathResult(endByte, resultOut);
> }
> 
> GLenum GetUnsizedFormat(GLenum internalFormat)
>@@ -1263,728 +1338,748 @@ AttributeType GetAttributeType(GLenum enumValue)
>             return ATTRIBUTE_MAT4x3;
>         default:
>             UNREACHABLE();
>+#if !UNREACHABLE_IS_NORETURN
>             return ATTRIBUTE_FLOAT;
>+#endif
>     }
> }
> 
>-VertexFormatType GetVertexFormatType(GLenum type, GLboolean normalized, GLuint components, bool pureInteger)
>+angle::FormatID GetVertexFormatID(VertexAttribType type,
>+                                  GLboolean normalized,
>+                                  GLuint components,
>+                                  bool pureInteger)
> {
>     switch (type)
>     {
>-        case GL_BYTE:
>+        case VertexAttribType::Byte:
>             switch (components)
>             {
>                 case 1:
>                     if (pureInteger)
>-                        return VERTEX_FORMAT_SBYTE1_INT;
>+                        return angle::FormatID::R8_SINT;
>                     if (normalized)
>-                        return VERTEX_FORMAT_SBYTE1_NORM;
>-                    return VERTEX_FORMAT_SBYTE1;
>+                        return angle::FormatID::R8_SNORM;
>+                    return angle::FormatID::R8_SSCALED;
>                 case 2:
>                     if (pureInteger)
>-                        return VERTEX_FORMAT_SBYTE2_INT;
>+                        return angle::FormatID::R8G8_SINT;
>                     if (normalized)
>-                        return VERTEX_FORMAT_SBYTE2_NORM;
>-                    return VERTEX_FORMAT_SBYTE2;
>+                        return angle::FormatID::R8G8_SNORM;
>+                    return angle::FormatID::R8G8_SSCALED;
>                 case 3:
>                     if (pureInteger)
>-                        return VERTEX_FORMAT_SBYTE3_INT;
>+                        return angle::FormatID::R8G8B8_SINT;
>                     if (normalized)
>-                        return VERTEX_FORMAT_SBYTE3_NORM;
>-                    return VERTEX_FORMAT_SBYTE3;
>+                        return angle::FormatID::R8G8B8_SNORM;
>+                    return angle::FormatID::R8G8B8_SSCALED;
>                 case 4:
>                     if (pureInteger)
>-                        return VERTEX_FORMAT_SBYTE4_INT;
>+                        return angle::FormatID::R8G8B8A8_SINT;
>                     if (normalized)
>-                        return VERTEX_FORMAT_SBYTE4_NORM;
>-                    return VERTEX_FORMAT_SBYTE4;
>+                        return angle::FormatID::R8G8B8A8_SNORM;
>+                    return angle::FormatID::R8G8B8A8_SSCALED;
>                 default:
>                     UNREACHABLE();
>-                    break;
>+#if !UNREACHABLE_IS_NORETURN
>+                    return angle::FormatID::NONE;
>+#endif
>             }
>-        case GL_UNSIGNED_BYTE:
>+        case VertexAttribType::UnsignedByte:
>             switch (components)
>             {
>                 case 1:
>                     if (pureInteger)
>-                        return VERTEX_FORMAT_UBYTE1_INT;
>+                        return angle::FormatID::R8_UINT;
>                     if (normalized)
>-                        return VERTEX_FORMAT_UBYTE1_NORM;
>-                    return VERTEX_FORMAT_UBYTE1;
>+                        return angle::FormatID::R8_UNORM;
>+                    return angle::FormatID::R8_USCALED;
>                 case 2:
>                     if (pureInteger)
>-                        return VERTEX_FORMAT_UBYTE2_INT;
>+                        return angle::FormatID::R8G8_UINT;
>                     if (normalized)
>-                        return VERTEX_FORMAT_UBYTE2_NORM;
>-                    return VERTEX_FORMAT_UBYTE2;
>+                        return angle::FormatID::R8G8_UNORM;
>+                    return angle::FormatID::R8G8_USCALED;
>                 case 3:
>                     if (pureInteger)
>-                        return VERTEX_FORMAT_UBYTE3_INT;
>+                        return angle::FormatID::R8G8B8_UINT;
>                     if (normalized)
>-                        return VERTEX_FORMAT_UBYTE3_NORM;
>-                    return VERTEX_FORMAT_UBYTE3;
>+                        return angle::FormatID::R8G8B8_UNORM;
>+                    return angle::FormatID::R8G8B8_USCALED;
>                 case 4:
>                     if (pureInteger)
>-                        return VERTEX_FORMAT_UBYTE4_INT;
>+                        return angle::FormatID::R8G8B8A8_UINT;
>                     if (normalized)
>-                        return VERTEX_FORMAT_UBYTE4_NORM;
>-                    return VERTEX_FORMAT_UBYTE4;
>+                        return angle::FormatID::R8G8B8A8_UNORM;
>+                    return angle::FormatID::R8G8B8A8_USCALED;
>                 default:
>                     UNREACHABLE();
>-                    break;
>+#if !UNREACHABLE_IS_NORETURN
>+                    return angle::FormatID::NONE;
>+#endif
>             }
>-        case GL_SHORT:
>+        case VertexAttribType::Short:
>             switch (components)
>             {
>                 case 1:
>                     if (pureInteger)
>-                        return VERTEX_FORMAT_SSHORT1_INT;
>+                        return angle::FormatID::R16_SINT;
>                     if (normalized)
>-                        return VERTEX_FORMAT_SSHORT1_NORM;
>-                    return VERTEX_FORMAT_SSHORT1;
>+                        return angle::FormatID::R16_SNORM;
>+                    return angle::FormatID::R16_SSCALED;
>                 case 2:
>                     if (pureInteger)
>-                        return VERTEX_FORMAT_SSHORT2_INT;
>+                        return angle::FormatID::R16G16_SINT;
>                     if (normalized)
>-                        return VERTEX_FORMAT_SSHORT2_NORM;
>-                    return VERTEX_FORMAT_SSHORT2;
>+                        return angle::FormatID::R16G16_SNORM;
>+                    return angle::FormatID::R16G16_SSCALED;
>                 case 3:
>                     if (pureInteger)
>-                        return VERTEX_FORMAT_SSHORT3_INT;
>+                        return angle::FormatID::R16G16B16_SINT;
>                     if (normalized)
>-                        return VERTEX_FORMAT_SSHORT3_NORM;
>-                    return VERTEX_FORMAT_SSHORT3;
>+                        return angle::FormatID::R16G16B16_SNORM;
>+                    return angle::FormatID::R16G16B16_SSCALED;
>                 case 4:
>                     if (pureInteger)
>-                        return VERTEX_FORMAT_SSHORT4_INT;
>+                        return angle::FormatID::R16G16B16A16_SINT;
>                     if (normalized)
>-                        return VERTEX_FORMAT_SSHORT4_NORM;
>-                    return VERTEX_FORMAT_SSHORT4;
>+                        return angle::FormatID::R16G16B16A16_SNORM;
>+                    return angle::FormatID::R16G16B16A16_SSCALED;
>                 default:
>                     UNREACHABLE();
>-                    break;
>+#if !UNREACHABLE_IS_NORETURN
>+                    return angle::FormatID::NONE;
>+#endif
>             }
>-        case GL_UNSIGNED_SHORT:
>+        case VertexAttribType::UnsignedShort:
>             switch (components)
>             {
>                 case 1:
>                     if (pureInteger)
>-                        return VERTEX_FORMAT_USHORT1_INT;
>+                        return angle::FormatID::R16_UINT;
>                     if (normalized)
>-                        return VERTEX_FORMAT_USHORT1_NORM;
>-                    return VERTEX_FORMAT_USHORT1;
>+                        return angle::FormatID::R16_UNORM;
>+                    return angle::FormatID::R16_USCALED;
>                 case 2:
>                     if (pureInteger)
>-                        return VERTEX_FORMAT_USHORT2_INT;
>+                        return angle::FormatID::R16G16_UINT;
>                     if (normalized)
>-                        return VERTEX_FORMAT_USHORT2_NORM;
>-                    return VERTEX_FORMAT_USHORT2;
>+                        return angle::FormatID::R16G16_UNORM;
>+                    return angle::FormatID::R16G16_USCALED;
>                 case 3:
>                     if (pureInteger)
>-                        return VERTEX_FORMAT_USHORT3_INT;
>+                        return angle::FormatID::R16G16B16_UINT;
>                     if (normalized)
>-                        return VERTEX_FORMAT_USHORT3_NORM;
>-                    return VERTEX_FORMAT_USHORT3;
>+                        return angle::FormatID::R16G16B16_UNORM;
>+                    return angle::FormatID::R16G16B16_USCALED;
>                 case 4:
>                     if (pureInteger)
>-                        return VERTEX_FORMAT_USHORT4_INT;
>+                        return angle::FormatID::R16G16B16A16_UINT;
>                     if (normalized)
>-                        return VERTEX_FORMAT_USHORT4_NORM;
>-                    return VERTEX_FORMAT_USHORT4;
>+                        return angle::FormatID::R16G16B16A16_UNORM;
>+                    return angle::FormatID::R16G16B16A16_USCALED;
>                 default:
>                     UNREACHABLE();
>-                    break;
>+#if !UNREACHABLE_IS_NORETURN
>+                    return angle::FormatID::NONE;
>+#endif
>             }
>-        case GL_INT:
>+        case VertexAttribType::Int:
>             switch (components)
>             {
>                 case 1:
>                     if (pureInteger)
>-                        return VERTEX_FORMAT_SINT1_INT;
>+                        return angle::FormatID::R32_SINT;
>                     if (normalized)
>-                        return VERTEX_FORMAT_SINT1_NORM;
>-                    return VERTEX_FORMAT_SINT1;
>+                        return angle::FormatID::R32_SNORM;
>+                    return angle::FormatID::R32_SSCALED;
>                 case 2:
>                     if (pureInteger)
>-                        return VERTEX_FORMAT_SINT2_INT;
>+                        return angle::FormatID::R32G32_SINT;
>                     if (normalized)
>-                        return VERTEX_FORMAT_SINT2_NORM;
>-                    return VERTEX_FORMAT_SINT2;
>+                        return angle::FormatID::R32G32_SNORM;
>+                    return angle::FormatID::R32G32_SSCALED;
>                 case 3:
>                     if (pureInteger)
>-                        return VERTEX_FORMAT_SINT3_INT;
>+                        return angle::FormatID::R32G32B32_SINT;
>                     if (normalized)
>-                        return VERTEX_FORMAT_SINT3_NORM;
>-                    return VERTEX_FORMAT_SINT3;
>+                        return angle::FormatID::R32G32B32_SNORM;
>+                    return angle::FormatID::R32G32B32_SSCALED;
>                 case 4:
>                     if (pureInteger)
>-                        return VERTEX_FORMAT_SINT4_INT;
>+                        return angle::FormatID::R32G32B32A32_SINT;
>                     if (normalized)
>-                        return VERTEX_FORMAT_SINT4_NORM;
>-                    return VERTEX_FORMAT_SINT4;
>+                        return angle::FormatID::R32G32B32A32_SNORM;
>+                    return angle::FormatID::R32G32B32A32_SSCALED;
>                 default:
>                     UNREACHABLE();
>-                    break;
>+#if !UNREACHABLE_IS_NORETURN
>+                    return angle::FormatID::NONE;
>+#endif
>             }
>-        case GL_UNSIGNED_INT:
>+        case VertexAttribType::UnsignedInt:
>             switch (components)
>             {
>                 case 1:
>                     if (pureInteger)
>-                        return VERTEX_FORMAT_UINT1_INT;
>+                        return angle::FormatID::R32_UINT;
>                     if (normalized)
>-                        return VERTEX_FORMAT_UINT1_NORM;
>-                    return VERTEX_FORMAT_UINT1;
>+                        return angle::FormatID::R32_UNORM;
>+                    return angle::FormatID::R32_USCALED;
>                 case 2:
>                     if (pureInteger)
>-                        return VERTEX_FORMAT_UINT2_INT;
>+                        return angle::FormatID::R32G32_UINT;
>                     if (normalized)
>-                        return VERTEX_FORMAT_UINT2_NORM;
>-                    return VERTEX_FORMAT_UINT2;
>+                        return angle::FormatID::R32G32_UNORM;
>+                    return angle::FormatID::R32G32_USCALED;
>                 case 3:
>                     if (pureInteger)
>-                        return VERTEX_FORMAT_UINT3_INT;
>+                        return angle::FormatID::R32G32B32_UINT;
>                     if (normalized)
>-                        return VERTEX_FORMAT_UINT3_NORM;
>-                    return VERTEX_FORMAT_UINT3;
>+                        return angle::FormatID::R32G32B32_UNORM;
>+                    return angle::FormatID::R32G32B32_USCALED;
>                 case 4:
>                     if (pureInteger)
>-                        return VERTEX_FORMAT_UINT4_INT;
>+                        return angle::FormatID::R32G32B32A32_UINT;
>                     if (normalized)
>-                        return VERTEX_FORMAT_UINT4_NORM;
>-                    return VERTEX_FORMAT_UINT4;
>+                        return angle::FormatID::R32G32B32A32_UNORM;
>+                    return angle::FormatID::R32G32B32A32_USCALED;
>                 default:
>                     UNREACHABLE();
>-                    break;
>+#if !UNREACHABLE_IS_NORETURN
>+                    return angle::FormatID::NONE;
>+#endif
>             }
>-        case GL_FLOAT:
>+        case VertexAttribType::Float:
>             switch (components)
>             {
>                 case 1:
>-                    return VERTEX_FORMAT_FLOAT1;
>+                    return angle::FormatID::R32_FLOAT;
>                 case 2:
>-                    return VERTEX_FORMAT_FLOAT2;
>+                    return angle::FormatID::R32G32_FLOAT;
>                 case 3:
>-                    return VERTEX_FORMAT_FLOAT3;
>+                    return angle::FormatID::R32G32B32_FLOAT;
>                 case 4:
>-                    return VERTEX_FORMAT_FLOAT4;
>+                    return angle::FormatID::R32G32B32A32_FLOAT;
>                 default:
>                     UNREACHABLE();
>-                    break;
>+#if !UNREACHABLE_IS_NORETURN
>+                    return angle::FormatID::NONE;
>+#endif
>             }
>-        case GL_HALF_FLOAT:
>+        case VertexAttribType::HalfFloat:
>             switch (components)
>             {
>                 case 1:
>-                    return VERTEX_FORMAT_HALF1;
>+                    return angle::FormatID::R16_FLOAT;
>                 case 2:
>-                    return VERTEX_FORMAT_HALF2;
>+                    return angle::FormatID::R16G16_FLOAT;
>                 case 3:
>-                    return VERTEX_FORMAT_HALF3;
>+                    return angle::FormatID::R16G16B16_FLOAT;
>                 case 4:
>-                    return VERTEX_FORMAT_HALF4;
>+                    return angle::FormatID::R16G16B16A16_FLOAT;
>                 default:
>                     UNREACHABLE();
>-                    break;
>+#if !UNREACHABLE_IS_NORETURN
>+                    return angle::FormatID::NONE;
>+#endif
>             }
>-        case GL_FIXED:
>+        case VertexAttribType::Fixed:
>             switch (components)
>             {
>                 case 1:
>-                    return VERTEX_FORMAT_FIXED1;
>+                    return angle::FormatID::R32_FIXED;
>                 case 2:
>-                    return VERTEX_FORMAT_FIXED2;
>+                    return angle::FormatID::R32G32_FIXED;
>                 case 3:
>-                    return VERTEX_FORMAT_FIXED3;
>+                    return angle::FormatID::R32G32B32_FIXED;
>                 case 4:
>-                    return VERTEX_FORMAT_FIXED4;
>+                    return angle::FormatID::R32G32B32A32_FIXED;
>                 default:
>                     UNREACHABLE();
>-                    break;
>+#if !UNREACHABLE_IS_NORETURN
>+                    return angle::FormatID::NONE;
>+#endif
>             }
>-        case GL_INT_2_10_10_10_REV:
>+        case VertexAttribType::Int2101010:
>             if (pureInteger)
>-                return VERTEX_FORMAT_SINT210_INT;
>+                return angle::FormatID::R10G10B10A2_SINT;
>             if (normalized)
>-                return VERTEX_FORMAT_SINT210_NORM;
>-            return VERTEX_FORMAT_SINT210;
>-        case GL_UNSIGNED_INT_2_10_10_10_REV:
>+                return angle::FormatID::R10G10B10A2_SNORM;
>+            return angle::FormatID::R10G10B10A2_SSCALED;
>+        case VertexAttribType::UnsignedInt2101010:
>             if (pureInteger)
>-                return VERTEX_FORMAT_UINT210_INT;
>+                return angle::FormatID::R10G10B10A2_UINT;
>             if (normalized)
>-                return VERTEX_FORMAT_UINT210_NORM;
>-            return VERTEX_FORMAT_UINT210;
>+                return angle::FormatID::R10G10B10A2_UNORM;
>+            return angle::FormatID::R10G10B10A2_USCALED;
>         default:
>             UNREACHABLE();
>-            break;
>+#if !UNREACHABLE_IS_NORETURN
>+            return angle::FormatID::NONE;
>+#endif
>     }
>-    return VERTEX_FORMAT_UBYTE1;
>-}
>-
>-VertexFormatType GetVertexFormatType(const VertexAttribute &attrib)
>-{
>-    return GetVertexFormatType(attrib.type, attrib.normalized, attrib.size, attrib.pureInteger);
> }
> 
>-VertexFormatType GetVertexFormatType(const VertexAttribute &attrib, GLenum currentValueType)
>+angle::FormatID GetVertexFormatID(const VertexAttribute &attrib, VertexAttribType currentValueType)
> {
>     if (!attrib.enabled)
>     {
>-        return GetVertexFormatType(currentValueType, GL_FALSE, 4, (currentValueType != GL_FLOAT));
>+        return GetVertexFormatID(currentValueType, GL_FALSE, 4,
>+                                 (currentValueType != VertexAttribType::Float));
>     }
>-    return GetVertexFormatType(attrib);
>+    return GetVertexFormatID(attrib);
> }
> 
>-const VertexFormat &GetVertexFormatFromType(VertexFormatType vertexFormatType)
>+const VertexFormat &GetVertexFormatFromID(angle::FormatID vertexFormatID)
> {
>-    switch (vertexFormatType)
>+    switch (vertexFormatID)
>     {
>-        case VERTEX_FORMAT_SBYTE1:
>+        case angle::FormatID::R8_SSCALED:
>         {
>             static const VertexFormat format(GL_BYTE, GL_FALSE, 1, false);
>             return format;
>         }
>-        case VERTEX_FORMAT_SBYTE1_NORM:
>+        case angle::FormatID::R8_SNORM:
>         {
>             static const VertexFormat format(GL_BYTE, GL_TRUE, 1, false);
>             return format;
>         }
>-        case VERTEX_FORMAT_SBYTE2:
>+        case angle::FormatID::R8G8_SSCALED:
>         {
>             static const VertexFormat format(GL_BYTE, GL_FALSE, 2, false);
>             return format;
>         }
>-        case VERTEX_FORMAT_SBYTE2_NORM:
>+        case angle::FormatID::R8G8_SNORM:
>         {
>             static const VertexFormat format(GL_BYTE, GL_TRUE, 2, false);
>             return format;
>         }
>-        case VERTEX_FORMAT_SBYTE3:
>+        case angle::FormatID::R8G8B8_SSCALED:
>         {
>             static const VertexFormat format(GL_BYTE, GL_FALSE, 3, false);
>             return format;
>         }
>-        case VERTEX_FORMAT_SBYTE3_NORM:
>+        case angle::FormatID::R8G8B8_SNORM:
>         {
>             static const VertexFormat format(GL_BYTE, GL_TRUE, 3, false);
>             return format;
>         }
>-        case VERTEX_FORMAT_SBYTE4:
>+        case angle::FormatID::R8G8B8A8_SSCALED:
>         {
>             static const VertexFormat format(GL_BYTE, GL_FALSE, 4, false);
>             return format;
>         }
>-        case VERTEX_FORMAT_SBYTE4_NORM:
>+        case angle::FormatID::R8G8B8A8_SNORM:
>         {
>             static const VertexFormat format(GL_BYTE, GL_TRUE, 4, false);
>             return format;
>         }
>-        case VERTEX_FORMAT_UBYTE1:
>+        case angle::FormatID::R8_USCALED:
>         {
>             static const VertexFormat format(GL_UNSIGNED_BYTE, GL_FALSE, 1, false);
>             return format;
>         }
>-        case VERTEX_FORMAT_UBYTE1_NORM:
>+        case angle::FormatID::R8_UNORM:
>         {
>             static const VertexFormat format(GL_UNSIGNED_BYTE, GL_TRUE, 1, false);
>             return format;
>         }
>-        case VERTEX_FORMAT_UBYTE2:
>+        case angle::FormatID::R8G8_USCALED:
>         {
>             static const VertexFormat format(GL_UNSIGNED_BYTE, GL_FALSE, 2, false);
>             return format;
>         }
>-        case VERTEX_FORMAT_UBYTE2_NORM:
>+        case angle::FormatID::R8G8_UNORM:
>         {
>             static const VertexFormat format(GL_UNSIGNED_BYTE, GL_TRUE, 2, false);
>             return format;
>         }
>-        case VERTEX_FORMAT_UBYTE3:
>+        case angle::FormatID::R8G8B8_USCALED:
>         {
>             static const VertexFormat format(GL_UNSIGNED_BYTE, GL_FALSE, 3, false);
>             return format;
>         }
>-        case VERTEX_FORMAT_UBYTE3_NORM:
>+        case angle::FormatID::R8G8B8_UNORM:
>         {
>             static const VertexFormat format(GL_UNSIGNED_BYTE, GL_TRUE, 3, false);
>             return format;
>         }
>-        case VERTEX_FORMAT_UBYTE4:
>+        case angle::FormatID::R8G8B8A8_USCALED:
>         {
>             static const VertexFormat format(GL_UNSIGNED_BYTE, GL_FALSE, 4, false);
>             return format;
>         }
>-        case VERTEX_FORMAT_UBYTE4_NORM:
>+        case angle::FormatID::R8G8B8A8_UNORM:
>         {
>             static const VertexFormat format(GL_UNSIGNED_BYTE, GL_TRUE, 4, false);
>             return format;
>         }
>-        case VERTEX_FORMAT_SSHORT1:
>+        case angle::FormatID::R16_SSCALED:
>         {
>             static const VertexFormat format(GL_SHORT, GL_FALSE, 1, false);
>             return format;
>         }
>-        case VERTEX_FORMAT_SSHORT1_NORM:
>+        case angle::FormatID::R16_SNORM:
>         {
>             static const VertexFormat format(GL_SHORT, GL_TRUE, 1, false);
>             return format;
>         }
>-        case VERTEX_FORMAT_SSHORT2:
>+        case angle::FormatID::R16G16_SSCALED:
>         {
>             static const VertexFormat format(GL_SHORT, GL_FALSE, 2, false);
>             return format;
>         }
>-        case VERTEX_FORMAT_SSHORT2_NORM:
>+        case angle::FormatID::R16G16_SNORM:
>         {
>             static const VertexFormat format(GL_SHORT, GL_TRUE, 2, false);
>             return format;
>         }
>-        case VERTEX_FORMAT_SSHORT3:
>+        case angle::FormatID::R16G16B16_SSCALED:
>         {
>             static const VertexFormat format(GL_SHORT, GL_FALSE, 3, false);
>             return format;
>         }
>-        case VERTEX_FORMAT_SSHORT3_NORM:
>+        case angle::FormatID::R16G16B16_SNORM:
>         {
>             static const VertexFormat format(GL_SHORT, GL_TRUE, 3, false);
>             return format;
>         }
>-        case VERTEX_FORMAT_SSHORT4:
>+        case angle::FormatID::R16G16B16A16_SSCALED:
>         {
>             static const VertexFormat format(GL_SHORT, GL_FALSE, 4, false);
>             return format;
>         }
>-        case VERTEX_FORMAT_SSHORT4_NORM:
>+        case angle::FormatID::R16G16B16A16_SNORM:
>         {
>             static const VertexFormat format(GL_SHORT, GL_TRUE, 4, false);
>             return format;
>         }
>-        case VERTEX_FORMAT_USHORT1:
>+        case angle::FormatID::R16_USCALED:
>         {
>             static const VertexFormat format(GL_UNSIGNED_SHORT, GL_FALSE, 1, false);
>             return format;
>         }
>-        case VERTEX_FORMAT_USHORT1_NORM:
>+        case angle::FormatID::R16_UNORM:
>         {
>             static const VertexFormat format(GL_UNSIGNED_SHORT, GL_TRUE, 1, false);
>             return format;
>         }
>-        case VERTEX_FORMAT_USHORT2:
>+        case angle::FormatID::R16G16_USCALED:
>         {
>             static const VertexFormat format(GL_UNSIGNED_SHORT, GL_FALSE, 2, false);
>             return format;
>         }
>-        case VERTEX_FORMAT_USHORT2_NORM:
>+        case angle::FormatID::R16G16_UNORM:
>         {
>             static const VertexFormat format(GL_UNSIGNED_SHORT, GL_TRUE, 2, false);
>             return format;
>         }
>-        case VERTEX_FORMAT_USHORT3:
>+        case angle::FormatID::R16G16B16_USCALED:
>         {
>             static const VertexFormat format(GL_UNSIGNED_SHORT, GL_FALSE, 3, false);
>             return format;
>         }
>-        case VERTEX_FORMAT_USHORT3_NORM:
>+        case angle::FormatID::R16G16B16_UNORM:
>         {
>             static const VertexFormat format(GL_UNSIGNED_SHORT, GL_TRUE, 3, false);
>             return format;
>         }
>-        case VERTEX_FORMAT_USHORT4:
>+        case angle::FormatID::R16G16B16A16_USCALED:
>         {
>             static const VertexFormat format(GL_UNSIGNED_SHORT, GL_FALSE, 4, false);
>             return format;
>         }
>-        case VERTEX_FORMAT_USHORT4_NORM:
>+        case angle::FormatID::R16G16B16A16_UNORM:
>         {
>             static const VertexFormat format(GL_UNSIGNED_SHORT, GL_TRUE, 4, false);
>             return format;
>         }
>-        case VERTEX_FORMAT_SINT1:
>+        case angle::FormatID::R32_SSCALED:
>         {
>             static const VertexFormat format(GL_INT, GL_FALSE, 1, false);
>             return format;
>         }
>-        case VERTEX_FORMAT_SINT1_NORM:
>+        case angle::FormatID::R32_SNORM:
>         {
>             static const VertexFormat format(GL_INT, GL_TRUE, 1, false);
>             return format;
>         }
>-        case VERTEX_FORMAT_SINT2:
>+        case angle::FormatID::R32G32_SSCALED:
>         {
>             static const VertexFormat format(GL_INT, GL_FALSE, 2, false);
>             return format;
>         }
>-        case VERTEX_FORMAT_SINT2_NORM:
>+        case angle::FormatID::R32G32_SNORM:
>         {
>             static const VertexFormat format(GL_INT, GL_TRUE, 2, false);
>             return format;
>         }
>-        case VERTEX_FORMAT_SINT3:
>+        case angle::FormatID::R32G32B32_SSCALED:
>         {
>             static const VertexFormat format(GL_INT, GL_FALSE, 3, false);
>             return format;
>         }
>-        case VERTEX_FORMAT_SINT3_NORM:
>+        case angle::FormatID::R32G32B32_SNORM:
>         {
>             static const VertexFormat format(GL_INT, GL_TRUE, 3, false);
>             return format;
>         }
>-        case VERTEX_FORMAT_SINT4:
>+        case angle::FormatID::R32G32B32A32_SSCALED:
>         {
>             static const VertexFormat format(GL_INT, GL_FALSE, 4, false);
>             return format;
>         }
>-        case VERTEX_FORMAT_SINT4_NORM:
>+        case angle::FormatID::R32G32B32A32_SNORM:
>         {
>             static const VertexFormat format(GL_INT, GL_TRUE, 4, false);
>             return format;
>         }
>-        case VERTEX_FORMAT_UINT1:
>+        case angle::FormatID::R32_USCALED:
>         {
>             static const VertexFormat format(GL_UNSIGNED_INT, GL_FALSE, 1, false);
>             return format;
>         }
>-        case VERTEX_FORMAT_UINT1_NORM:
>+        case angle::FormatID::R32_UNORM:
>         {
>             static const VertexFormat format(GL_UNSIGNED_INT, GL_TRUE, 1, false);
>             return format;
>         }
>-        case VERTEX_FORMAT_UINT2:
>+        case angle::FormatID::R32G32_USCALED:
>         {
>             static const VertexFormat format(GL_UNSIGNED_INT, GL_FALSE, 2, false);
>             return format;
>         }
>-        case VERTEX_FORMAT_UINT2_NORM:
>+        case angle::FormatID::R32G32_UNORM:
>         {
>             static const VertexFormat format(GL_UNSIGNED_INT, GL_TRUE, 2, false);
>             return format;
>         }
>-        case VERTEX_FORMAT_UINT3:
>+        case angle::FormatID::R32G32B32_USCALED:
>         {
>             static const VertexFormat format(GL_UNSIGNED_INT, GL_FALSE, 3, false);
>             return format;
>         }
>-        case VERTEX_FORMAT_UINT3_NORM:
>+        case angle::FormatID::R32G32B32_UNORM:
>         {
>             static const VertexFormat format(GL_UNSIGNED_INT, GL_TRUE, 3, false);
>             return format;
>         }
>-        case VERTEX_FORMAT_UINT4:
>+        case angle::FormatID::R32G32B32A32_USCALED:
>         {
>             static const VertexFormat format(GL_UNSIGNED_INT, GL_FALSE, 4, false);
>             return format;
>         }
>-        case VERTEX_FORMAT_UINT4_NORM:
>+        case angle::FormatID::R32G32B32A32_UNORM:
>         {
>             static const VertexFormat format(GL_UNSIGNED_INT, GL_TRUE, 4, false);
>             return format;
>         }
>-        case VERTEX_FORMAT_SBYTE1_INT:
>+        case angle::FormatID::R8_SINT:
>         {
>             static const VertexFormat format(GL_BYTE, GL_FALSE, 1, true);
>             return format;
>         }
>-        case VERTEX_FORMAT_SBYTE2_INT:
>+        case angle::FormatID::R8G8_SINT:
>         {
>             static const VertexFormat format(GL_BYTE, GL_FALSE, 2, true);
>             return format;
>         }
>-        case VERTEX_FORMAT_SBYTE3_INT:
>+        case angle::FormatID::R8G8B8_SINT:
>         {
>             static const VertexFormat format(GL_BYTE, GL_FALSE, 3, true);
>             return format;
>         }
>-        case VERTEX_FORMAT_SBYTE4_INT:
>+        case angle::FormatID::R8G8B8A8_SINT:
>         {
>             static const VertexFormat format(GL_BYTE, GL_FALSE, 4, true);
>             return format;
>         }
>-        case VERTEX_FORMAT_UBYTE1_INT:
>+        case angle::FormatID::R8_UINT:
>         {
>             static const VertexFormat format(GL_UNSIGNED_BYTE, GL_FALSE, 1, true);
>             return format;
>         }
>-        case VERTEX_FORMAT_UBYTE2_INT:
>+        case angle::FormatID::R8G8_UINT:
>         {
>             static const VertexFormat format(GL_UNSIGNED_BYTE, GL_FALSE, 2, true);
>             return format;
>         }
>-        case VERTEX_FORMAT_UBYTE3_INT:
>+        case angle::FormatID::R8G8B8_UINT:
>         {
>             static const VertexFormat format(GL_UNSIGNED_BYTE, GL_FALSE, 3, true);
>             return format;
>         }
>-        case VERTEX_FORMAT_UBYTE4_INT:
>+        case angle::FormatID::R8G8B8A8_UINT:
>         {
>             static const VertexFormat format(GL_UNSIGNED_BYTE, GL_FALSE, 4, true);
>             return format;
>         }
>-        case VERTEX_FORMAT_SSHORT1_INT:
>+        case angle::FormatID::R16_SINT:
>         {
>             static const VertexFormat format(GL_SHORT, GL_FALSE, 1, true);
>             return format;
>         }
>-        case VERTEX_FORMAT_SSHORT2_INT:
>+        case angle::FormatID::R16G16_SINT:
>         {
>             static const VertexFormat format(GL_SHORT, GL_FALSE, 2, true);
>             return format;
>         }
>-        case VERTEX_FORMAT_SSHORT3_INT:
>+        case angle::FormatID::R16G16B16_SINT:
>         {
>             static const VertexFormat format(GL_SHORT, GL_FALSE, 3, true);
>             return format;
>         }
>-        case VERTEX_FORMAT_SSHORT4_INT:
>+        case angle::FormatID::R16G16B16A16_SINT:
>         {
>             static const VertexFormat format(GL_SHORT, GL_FALSE, 4, true);
>             return format;
>         }
>-        case VERTEX_FORMAT_USHORT1_INT:
>+        case angle::FormatID::R16_UINT:
>         {
>             static const VertexFormat format(GL_UNSIGNED_SHORT, GL_FALSE, 1, true);
>             return format;
>         }
>-        case VERTEX_FORMAT_USHORT2_INT:
>+        case angle::FormatID::R16G16_UINT:
>         {
>             static const VertexFormat format(GL_UNSIGNED_SHORT, GL_FALSE, 2, true);
>             return format;
>         }
>-        case VERTEX_FORMAT_USHORT3_INT:
>+        case angle::FormatID::R16G16B16_UINT:
>         {
>             static const VertexFormat format(GL_UNSIGNED_SHORT, GL_FALSE, 3, true);
>             return format;
>         }
>-        case VERTEX_FORMAT_USHORT4_INT:
>+        case angle::FormatID::R16G16B16A16_UINT:
>         {
>             static const VertexFormat format(GL_UNSIGNED_SHORT, GL_FALSE, 4, true);
>             return format;
>         }
>-        case VERTEX_FORMAT_SINT1_INT:
>+        case angle::FormatID::R32_SINT:
>         {
>             static const VertexFormat format(GL_INT, GL_FALSE, 1, true);
>             return format;
>         }
>-        case VERTEX_FORMAT_SINT2_INT:
>+        case angle::FormatID::R32G32_SINT:
>         {
>             static const VertexFormat format(GL_INT, GL_FALSE, 2, true);
>             return format;
>         }
>-        case VERTEX_FORMAT_SINT3_INT:
>+        case angle::FormatID::R32G32B32_SINT:
>         {
>             static const VertexFormat format(GL_INT, GL_FALSE, 3, true);
>             return format;
>         }
>-        case VERTEX_FORMAT_SINT4_INT:
>+        case angle::FormatID::R32G32B32A32_SINT:
>         {
>             static const VertexFormat format(GL_INT, GL_FALSE, 4, true);
>             return format;
>         }
>-        case VERTEX_FORMAT_UINT1_INT:
>+        case angle::FormatID::R32_UINT:
>         {
>             static const VertexFormat format(GL_UNSIGNED_INT, GL_FALSE, 1, true);
>             return format;
>         }
>-        case VERTEX_FORMAT_UINT2_INT:
>+        case angle::FormatID::R32G32_UINT:
>         {
>             static const VertexFormat format(GL_UNSIGNED_INT, GL_FALSE, 2, true);
>             return format;
>         }
>-        case VERTEX_FORMAT_UINT3_INT:
>+        case angle::FormatID::R32G32B32_UINT:
>         {
>             static const VertexFormat format(GL_UNSIGNED_INT, GL_FALSE, 3, true);
>             return format;
>         }
>-        case VERTEX_FORMAT_UINT4_INT:
>+        case angle::FormatID::R32G32B32A32_UINT:
>         {
>             static const VertexFormat format(GL_UNSIGNED_INT, GL_FALSE, 4, true);
>             return format;
>         }
>-        case VERTEX_FORMAT_FIXED1:
>+        case angle::FormatID::R32_FIXED:
>         {
>             static const VertexFormat format(GL_FIXED, GL_FALSE, 1, false);
>             return format;
>         }
>-        case VERTEX_FORMAT_FIXED2:
>+        case angle::FormatID::R32G32_FIXED:
>         {
>             static const VertexFormat format(GL_FIXED, GL_FALSE, 2, false);
>             return format;
>         }
>-        case VERTEX_FORMAT_FIXED3:
>+        case angle::FormatID::R32G32B32_FIXED:
>         {
>             static const VertexFormat format(GL_FIXED, GL_FALSE, 3, false);
>             return format;
>         }
>-        case VERTEX_FORMAT_FIXED4:
>+        case angle::FormatID::R32G32B32A32_FIXED:
>         {
>             static const VertexFormat format(GL_FIXED, GL_FALSE, 4, false);
>             return format;
>         }
>-        case VERTEX_FORMAT_HALF1:
>+        case angle::FormatID::R16_FLOAT:
>         {
>             static const VertexFormat format(GL_HALF_FLOAT, GL_FALSE, 1, false);
>             return format;
>         }
>-        case VERTEX_FORMAT_HALF2:
>+        case angle::FormatID::R16G16_FLOAT:
>         {
>             static const VertexFormat format(GL_HALF_FLOAT, GL_FALSE, 2, false);
>             return format;
>         }
>-        case VERTEX_FORMAT_HALF3:
>+        case angle::FormatID::R16G16B16_FLOAT:
>         {
>             static const VertexFormat format(GL_HALF_FLOAT, GL_FALSE, 3, false);
>             return format;
>         }
>-        case VERTEX_FORMAT_HALF4:
>+        case angle::FormatID::R16G16B16A16_FLOAT:
>         {
>             static const VertexFormat format(GL_HALF_FLOAT, GL_FALSE, 4, false);
>             return format;
>         }
>-        case VERTEX_FORMAT_FLOAT1:
>+        case angle::FormatID::R32_FLOAT:
>         {
>             static const VertexFormat format(GL_FLOAT, GL_FALSE, 1, false);
>             return format;
>         }
>-        case VERTEX_FORMAT_FLOAT2:
>+        case angle::FormatID::R32G32_FLOAT:
>         {
>             static const VertexFormat format(GL_FLOAT, GL_FALSE, 2, false);
>             return format;
>         }
>-        case VERTEX_FORMAT_FLOAT3:
>+        case angle::FormatID::R32G32B32_FLOAT:
>         {
>             static const VertexFormat format(GL_FLOAT, GL_FALSE, 3, false);
>             return format;
>         }
>-        case VERTEX_FORMAT_FLOAT4:
>+        case angle::FormatID::R32G32B32A32_FLOAT:
>         {
>             static const VertexFormat format(GL_FLOAT, GL_FALSE, 4, false);
>             return format;
>         }
>-        case VERTEX_FORMAT_SINT210:
>+        case angle::FormatID::R10G10B10A2_SSCALED:
>         {
>             static const VertexFormat format(GL_INT_2_10_10_10_REV, GL_FALSE, 4, false);
>             return format;
>         }
>-        case VERTEX_FORMAT_UINT210:
>+        case angle::FormatID::R10G10B10A2_USCALED:
>         {
>             static const VertexFormat format(GL_UNSIGNED_INT_2_10_10_10_REV, GL_FALSE, 4, false);
>             return format;
>         }
>-        case VERTEX_FORMAT_SINT210_NORM:
>+        case angle::FormatID::R10G10B10A2_SNORM:
>         {
>             static const VertexFormat format(GL_INT_2_10_10_10_REV, GL_TRUE, 4, false);
>             return format;
>         }
>-        case VERTEX_FORMAT_UINT210_NORM:
>+        case angle::FormatID::R10G10B10A2_UNORM:
>         {
>             static const VertexFormat format(GL_UNSIGNED_INT_2_10_10_10_REV, GL_TRUE, 4, false);
>             return format;
>         }
>-        case VERTEX_FORMAT_SINT210_INT:
>+        case angle::FormatID::R10G10B10A2_SINT:
>         {
>             static const VertexFormat format(GL_INT_2_10_10_10_REV, GL_FALSE, 4, true);
>             return format;
>         }
>-        case VERTEX_FORMAT_UINT210_INT:
>+        case angle::FormatID::R10G10B10A2_UINT:
>         {
>             static const VertexFormat format(GL_UNSIGNED_INT_2_10_10_10_REV, GL_FALSE, 4, true);
>             return format;
>@@ -1997,120 +2092,122 @@ const VertexFormat &GetVertexFormatFromType(VertexFormatType vertexFormatType)
>     }
> }
> 
>-size_t GetVertexFormatTypeSize(VertexFormatType vertexFormatType)
>+size_t GetVertexFormatSize(angle::FormatID vertexFormatID)
> {
>-    switch (vertexFormatType)
>+    switch (vertexFormatID)
>     {
>-        case VERTEX_FORMAT_SBYTE1:
>-        case VERTEX_FORMAT_SBYTE1_NORM:
>-        case VERTEX_FORMAT_UBYTE1:
>-        case VERTEX_FORMAT_UBYTE1_NORM:
>-        case VERTEX_FORMAT_SBYTE1_INT:
>-        case VERTEX_FORMAT_UBYTE1_INT:
>+        case angle::FormatID::R8_SSCALED:
>+        case angle::FormatID::R8_SNORM:
>+        case angle::FormatID::R8_USCALED:
>+        case angle::FormatID::R8_UNORM:
>+        case angle::FormatID::R8_SINT:
>+        case angle::FormatID::R8_UINT:
>             return 1;
> 
>-        case VERTEX_FORMAT_SBYTE2:
>-        case VERTEX_FORMAT_SBYTE2_NORM:
>-        case VERTEX_FORMAT_UBYTE2:
>-        case VERTEX_FORMAT_UBYTE2_NORM:
>-        case VERTEX_FORMAT_SBYTE2_INT:
>-        case VERTEX_FORMAT_UBYTE2_INT:
>-        case VERTEX_FORMAT_SSHORT1:
>-        case VERTEX_FORMAT_SSHORT1_NORM:
>-        case VERTEX_FORMAT_USHORT1:
>-        case VERTEX_FORMAT_USHORT1_NORM:
>-        case VERTEX_FORMAT_SSHORT1_INT:
>-        case VERTEX_FORMAT_USHORT1_INT:
>-        case VERTEX_FORMAT_HALF1:
>+        case angle::FormatID::R8G8_SSCALED:
>+        case angle::FormatID::R8G8_SNORM:
>+        case angle::FormatID::R8G8_USCALED:
>+        case angle::FormatID::R8G8_UNORM:
>+        case angle::FormatID::R8G8_SINT:
>+        case angle::FormatID::R8G8_UINT:
>+        case angle::FormatID::R16_SSCALED:
>+        case angle::FormatID::R16_SNORM:
>+        case angle::FormatID::R16_USCALED:
>+        case angle::FormatID::R16_UNORM:
>+        case angle::FormatID::R16_SINT:
>+        case angle::FormatID::R16_UINT:
>+        case angle::FormatID::R16_FLOAT:
>             return 2;
> 
>-        case VERTEX_FORMAT_SBYTE3:
>-        case VERTEX_FORMAT_SBYTE3_NORM:
>-        case VERTEX_FORMAT_UBYTE3:
>-        case VERTEX_FORMAT_UBYTE3_NORM:
>-        case VERTEX_FORMAT_SBYTE3_INT:
>-        case VERTEX_FORMAT_UBYTE3_INT:
>+        case angle::FormatID::R8G8B8_SSCALED:
>+        case angle::FormatID::R8G8B8_SNORM:
>+        case angle::FormatID::R8G8B8_USCALED:
>+        case angle::FormatID::R8G8B8_UNORM:
>+        case angle::FormatID::R8G8B8_SINT:
>+        case angle::FormatID::R8G8B8_UINT:
>             return 3;
> 
>-        case VERTEX_FORMAT_SBYTE4:
>-        case VERTEX_FORMAT_SBYTE4_NORM:
>-        case VERTEX_FORMAT_UBYTE4:
>-        case VERTEX_FORMAT_UBYTE4_NORM:
>-        case VERTEX_FORMAT_SBYTE4_INT:
>-        case VERTEX_FORMAT_UBYTE4_INT:
>-        case VERTEX_FORMAT_SSHORT2:
>-        case VERTEX_FORMAT_SSHORT2_NORM:
>-        case VERTEX_FORMAT_USHORT2:
>-        case VERTEX_FORMAT_USHORT2_NORM:
>-        case VERTEX_FORMAT_SSHORT2_INT:
>-        case VERTEX_FORMAT_USHORT2_INT:
>-        case VERTEX_FORMAT_SINT1:
>-        case VERTEX_FORMAT_SINT1_NORM:
>-        case VERTEX_FORMAT_UINT1:
>-        case VERTEX_FORMAT_UINT1_NORM:
>-        case VERTEX_FORMAT_SINT1_INT:
>-        case VERTEX_FORMAT_UINT1_INT:
>-        case VERTEX_FORMAT_HALF2:
>-        case VERTEX_FORMAT_FIXED1:
>-        case VERTEX_FORMAT_FLOAT1:
>-        case VERTEX_FORMAT_SINT210:
>-        case VERTEX_FORMAT_UINT210:
>-        case VERTEX_FORMAT_SINT210_NORM:
>-        case VERTEX_FORMAT_UINT210_NORM:
>-        case VERTEX_FORMAT_SINT210_INT:
>-        case VERTEX_FORMAT_UINT210_INT:
>+        case angle::FormatID::R8G8B8A8_SSCALED:
>+        case angle::FormatID::R8G8B8A8_SNORM:
>+        case angle::FormatID::R8G8B8A8_USCALED:
>+        case angle::FormatID::R8G8B8A8_UNORM:
>+        case angle::FormatID::R8G8B8A8_SINT:
>+        case angle::FormatID::R8G8B8A8_UINT:
>+        case angle::FormatID::R16G16_SSCALED:
>+        case angle::FormatID::R16G16_SNORM:
>+        case angle::FormatID::R16G16_USCALED:
>+        case angle::FormatID::R16G16_UNORM:
>+        case angle::FormatID::R16G16_SINT:
>+        case angle::FormatID::R16G16_UINT:
>+        case angle::FormatID::R32_SSCALED:
>+        case angle::FormatID::R32_SNORM:
>+        case angle::FormatID::R32_USCALED:
>+        case angle::FormatID::R32_UNORM:
>+        case angle::FormatID::R32_SINT:
>+        case angle::FormatID::R32_UINT:
>+        case angle::FormatID::R16G16_FLOAT:
>+        case angle::FormatID::R32_FIXED:
>+        case angle::FormatID::R32_FLOAT:
>+        case angle::FormatID::R10G10B10A2_SSCALED:
>+        case angle::FormatID::R10G10B10A2_USCALED:
>+        case angle::FormatID::R10G10B10A2_SNORM:
>+        case angle::FormatID::R10G10B10A2_UNORM:
>+        case angle::FormatID::R10G10B10A2_SINT:
>+        case angle::FormatID::R10G10B10A2_UINT:
>             return 4;
> 
>-        case VERTEX_FORMAT_SSHORT3:
>-        case VERTEX_FORMAT_SSHORT3_NORM:
>-        case VERTEX_FORMAT_USHORT3:
>-        case VERTEX_FORMAT_USHORT3_NORM:
>-        case VERTEX_FORMAT_SSHORT3_INT:
>-        case VERTEX_FORMAT_USHORT3_INT:
>-        case VERTEX_FORMAT_HALF3:
>+        case angle::FormatID::R16G16B16_SSCALED:
>+        case angle::FormatID::R16G16B16_SNORM:
>+        case angle::FormatID::R16G16B16_USCALED:
>+        case angle::FormatID::R16G16B16_UNORM:
>+        case angle::FormatID::R16G16B16_SINT:
>+        case angle::FormatID::R16G16B16_UINT:
>+        case angle::FormatID::R16G16B16_FLOAT:
>             return 6;
> 
>-        case VERTEX_FORMAT_SSHORT4:
>-        case VERTEX_FORMAT_SSHORT4_NORM:
>-        case VERTEX_FORMAT_USHORT4:
>-        case VERTEX_FORMAT_USHORT4_NORM:
>-        case VERTEX_FORMAT_SSHORT4_INT:
>-        case VERTEX_FORMAT_USHORT4_INT:
>-        case VERTEX_FORMAT_SINT2:
>-        case VERTEX_FORMAT_SINT2_NORM:
>-        case VERTEX_FORMAT_UINT2:
>-        case VERTEX_FORMAT_UINT2_NORM:
>-        case VERTEX_FORMAT_SINT2_INT:
>-        case VERTEX_FORMAT_UINT2_INT:
>-        case VERTEX_FORMAT_HALF4:
>-        case VERTEX_FORMAT_FIXED2:
>-        case VERTEX_FORMAT_FLOAT2:
>+        case angle::FormatID::R16G16B16A16_SSCALED:
>+        case angle::FormatID::R16G16B16A16_SNORM:
>+        case angle::FormatID::R16G16B16A16_USCALED:
>+        case angle::FormatID::R16G16B16A16_UNORM:
>+        case angle::FormatID::R16G16B16A16_SINT:
>+        case angle::FormatID::R16G16B16A16_UINT:
>+        case angle::FormatID::R32G32_SSCALED:
>+        case angle::FormatID::R32G32_SNORM:
>+        case angle::FormatID::R32G32_USCALED:
>+        case angle::FormatID::R32G32_UNORM:
>+        case angle::FormatID::R32G32_SINT:
>+        case angle::FormatID::R32G32_UINT:
>+        case angle::FormatID::R16G16B16A16_FLOAT:
>+        case angle::FormatID::R32G32_FIXED:
>+        case angle::FormatID::R32G32_FLOAT:
>             return 8;
> 
>-        case VERTEX_FORMAT_SINT3:
>-        case VERTEX_FORMAT_SINT3_NORM:
>-        case VERTEX_FORMAT_UINT3:
>-        case VERTEX_FORMAT_UINT3_NORM:
>-        case VERTEX_FORMAT_SINT3_INT:
>-        case VERTEX_FORMAT_UINT3_INT:
>-        case VERTEX_FORMAT_FIXED3:
>-        case VERTEX_FORMAT_FLOAT3:
>+        case angle::FormatID::R32G32B32_SSCALED:
>+        case angle::FormatID::R32G32B32_SNORM:
>+        case angle::FormatID::R32G32B32_USCALED:
>+        case angle::FormatID::R32G32B32_UNORM:
>+        case angle::FormatID::R32G32B32_SINT:
>+        case angle::FormatID::R32G32B32_UINT:
>+        case angle::FormatID::R32G32B32_FIXED:
>+        case angle::FormatID::R32G32B32_FLOAT:
>             return 12;
> 
>-        case VERTEX_FORMAT_SINT4:
>-        case VERTEX_FORMAT_SINT4_NORM:
>-        case VERTEX_FORMAT_UINT4:
>-        case VERTEX_FORMAT_UINT4_NORM:
>-        case VERTEX_FORMAT_SINT4_INT:
>-        case VERTEX_FORMAT_UINT4_INT:
>-        case VERTEX_FORMAT_FIXED4:
>-        case VERTEX_FORMAT_FLOAT4:
>+        case angle::FormatID::R32G32B32A32_SSCALED:
>+        case angle::FormatID::R32G32B32A32_SNORM:
>+        case angle::FormatID::R32G32B32A32_USCALED:
>+        case angle::FormatID::R32G32B32A32_UNORM:
>+        case angle::FormatID::R32G32B32A32_SINT:
>+        case angle::FormatID::R32G32B32A32_UINT:
>+        case angle::FormatID::R32G32B32A32_FIXED:
>+        case angle::FormatID::R32G32B32A32_FLOAT:
>             return 16;
> 
>-        case VERTEX_FORMAT_INVALID:
>+        case angle::FormatID::NONE:
>         default:
>             UNREACHABLE();
>+#if !UNREACHABLE_IS_NORETURN
>             return 0;
>+#endif
>     }
> }
> 
>@@ -2120,14 +2217,14 @@ bool ValidES3InternalFormat(GLenum internalFormat)
>     return internalFormat != GL_NONE && formatMap.find(internalFormat) != formatMap.end();
> }
> 
>-VertexFormat::VertexFormat(GLenum typeIn, GLboolean normalizedIn, GLuint componentsIn, bool pureIntegerIn)
>-    : type(typeIn),
>-      normalized(normalizedIn),
>-      components(componentsIn),
>-      pureInteger(pureIntegerIn)
>+VertexFormat::VertexFormat(GLenum typeIn,
>+                           GLboolean normalizedIn,
>+                           GLuint componentsIn,
>+                           bool pureIntegerIn)
>+    : type(typeIn), normalized(normalizedIn), components(componentsIn), pureInteger(pureIntegerIn)
> {
>     // float -> !normalized
>-    ASSERT(!(type == GL_FLOAT || type == GL_HALF_FLOAT || type == GL_FIXED) || normalized == GL_FALSE);
>-}
>-
>+    ASSERT(!(type == GL_FLOAT || type == GL_HALF_FLOAT || type == GL_FIXED) ||
>+           normalized == GL_FALSE);
> }
>+}  // namespace gl
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/formatutils.h b/Source/ThirdParty/ANGLE/src/libANGLE/formatutils.h
>index dbfe5908468..60eb67f3cbd 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/formatutils.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/formatutils.h
>@@ -9,14 +9,15 @@
> #ifndef LIBANGLE_FORMATUTILS_H_
> #define LIBANGLE_FORMATUTILS_H_
> 
>+#include <stdint.h>
> #include <cstddef>
> #include <ostream>
>-#include <stdint.h>
> 
> #include "angle_gl.h"
> #include "libANGLE/Caps.h"
> #include "libANGLE/Error.h"
> #include "libANGLE/Version.h"
>+#include "libANGLE/VertexAttribute.h"
> #include "libANGLE/angletypes.h"
> 
> namespace gl
>@@ -38,13 +39,41 @@ struct FormatType final
> 
> struct Type
> {
>-    Type();
>+    Type() : bytes(0), bytesShift(0), specialInterpretation(0) {}
>+
>+    explicit Type(uint32_t packedTypeInfo)
>+        : bytes(packedTypeInfo & 0xff),
>+          bytesShift((packedTypeInfo >> 8) & 0xff),
>+          specialInterpretation((packedTypeInfo >> 16) & 1)
>+    {}
> 
>     GLuint bytes;
>-    GLuint bytesShift; // Bit shift by this value to effectively divide/multiply by "bytes" in a more optimal way
>+    GLuint bytesShift;  // Bit shift by this value to effectively divide/multiply by "bytes" in a
>+                        // more optimal way
>     bool specialInterpretation;
> };
>-const Type &GetTypeInfo(GLenum type);
>+
>+uint32_t GetPackedTypeInfo(GLenum type);
>+
>+ANGLE_INLINE const Type GetTypeInfo(GLenum type)
>+{
>+    return Type(GetPackedTypeInfo(type));
>+}
>+
>+// This helpers use tricks based on the assumption that the type has certain values.
>+static_assert(static_cast<GLuint>(DrawElementsType::UnsignedByte) == 0, "Please update this code.");
>+static_assert(static_cast<GLuint>(DrawElementsType::UnsignedShort) == 1,
>+              "Please update this code.");
>+static_assert(static_cast<GLuint>(DrawElementsType::UnsignedInt) == 2, "Please update this code.");
>+ANGLE_INLINE GLuint GetDrawElementsTypeSize(DrawElementsType type)
>+{
>+    return (1 << static_cast<GLuint>(type));
>+}
>+
>+ANGLE_INLINE GLuint GetDrawElementsTypeShift(DrawElementsType type)
>+{
>+    return static_cast<GLuint>(type);
>+}
> 
> // Information about an OpenGL internal format.  Can be keyed on the internalFormat and type
> // members.
>@@ -55,31 +84,37 @@ struct InternalFormat
> 
>     GLuint computePixelBytes(GLenum formatType) const;
> 
>-    ErrorOrResult<GLuint> computeRowPitch(GLenum formatType,
>+    ANGLE_NO_DISCARD bool computeRowPitch(GLenum formatType,
>                                           GLsizei width,
>                                           GLint alignment,
>-                                          GLint rowLength) const;
>-    ErrorOrResult<GLuint> computeDepthPitch(GLsizei height,
>+                                          GLint rowLength,
>+                                          GLuint *resultOut) const;
>+    ANGLE_NO_DISCARD bool computeDepthPitch(GLsizei height,
>                                             GLint imageHeight,
>-                                            GLuint rowPitch) const;
>-    ErrorOrResult<GLuint> computeDepthPitch(GLenum formatType,
>+                                            GLuint rowPitch,
>+                                            GLuint *resultOut) const;
>+    ANGLE_NO_DISCARD bool computeDepthPitch(GLenum formatType,
>                                             GLsizei width,
>                                             GLsizei height,
>                                             GLint alignment,
>                                             GLint rowLength,
>-                                            GLint imageHeight) const;
>+                                            GLint imageHeight,
>+                                            GLuint *resultOut) const;
> 
>-    ErrorOrResult<GLuint> computeCompressedImageSize(const Extents &size) const;
>+    ANGLE_NO_DISCARD bool computeCompressedImageSize(const Extents &size, GLuint *resultOut) const;
> 
>-    ErrorOrResult<GLuint> computeSkipBytes(GLuint rowPitch,
>+    ANGLE_NO_DISCARD bool computeSkipBytes(GLenum formatType,
>+                                           GLuint rowPitch,
>                                            GLuint depthPitch,
>                                            const PixelStoreStateBase &state,
>-                                           bool is3D) const;
>+                                           bool is3D,
>+                                           GLuint *resultOut) const;
> 
>-    ErrorOrResult<GLuint> computePackUnpackEndByte(GLenum formatType,
>-                                                       const Extents &size,
>-                                                       const PixelStoreStateBase &state,
>-                                                       bool is3D) const;
>+    ANGLE_NO_DISCARD bool computePackUnpackEndByte(GLenum formatType,
>+                                                   const Extents &size,
>+                                                   const PixelStoreStateBase &state,
>+                                                   bool is3D,
>+                                                   GLuint *resultOut) const;
> 
>     bool isLUMA() const;
>     GLenum getReadPixelsFormat() const;
>@@ -127,8 +162,9 @@ struct InternalFormat
> 
>     typedef bool (*SupportCheckFunction)(const Version &, const Extensions &);
>     SupportCheckFunction textureSupport;
>-    SupportCheckFunction renderSupport;
>     SupportCheckFunction filterSupport;
>+    SupportCheckFunction textureAttachmentSupport;  // glFramebufferTexture2D
>+    SupportCheckFunction renderbufferSupport;       // glFramebufferRenderbuffer
> };
> 
> // A "Format" wraps an InternalFormat struct, querying it from either a sized internal format or
>@@ -199,102 +235,7 @@ enum AttributeType
> 
> AttributeType GetAttributeType(GLenum enumValue);
> 
>-enum VertexFormatType
>-{
>-    VERTEX_FORMAT_INVALID,
>-    VERTEX_FORMAT_SBYTE1,
>-    VERTEX_FORMAT_SBYTE1_NORM,
>-    VERTEX_FORMAT_SBYTE2,
>-    VERTEX_FORMAT_SBYTE2_NORM,
>-    VERTEX_FORMAT_SBYTE3,
>-    VERTEX_FORMAT_SBYTE3_NORM,
>-    VERTEX_FORMAT_SBYTE4,
>-    VERTEX_FORMAT_SBYTE4_NORM,
>-    VERTEX_FORMAT_UBYTE1,
>-    VERTEX_FORMAT_UBYTE1_NORM,
>-    VERTEX_FORMAT_UBYTE2,
>-    VERTEX_FORMAT_UBYTE2_NORM,
>-    VERTEX_FORMAT_UBYTE3,
>-    VERTEX_FORMAT_UBYTE3_NORM,
>-    VERTEX_FORMAT_UBYTE4,
>-    VERTEX_FORMAT_UBYTE4_NORM,
>-    VERTEX_FORMAT_SSHORT1,
>-    VERTEX_FORMAT_SSHORT1_NORM,
>-    VERTEX_FORMAT_SSHORT2,
>-    VERTEX_FORMAT_SSHORT2_NORM,
>-    VERTEX_FORMAT_SSHORT3,
>-    VERTEX_FORMAT_SSHORT3_NORM,
>-    VERTEX_FORMAT_SSHORT4,
>-    VERTEX_FORMAT_SSHORT4_NORM,
>-    VERTEX_FORMAT_USHORT1,
>-    VERTEX_FORMAT_USHORT1_NORM,
>-    VERTEX_FORMAT_USHORT2,
>-    VERTEX_FORMAT_USHORT2_NORM,
>-    VERTEX_FORMAT_USHORT3,
>-    VERTEX_FORMAT_USHORT3_NORM,
>-    VERTEX_FORMAT_USHORT4,
>-    VERTEX_FORMAT_USHORT4_NORM,
>-    VERTEX_FORMAT_SINT1,
>-    VERTEX_FORMAT_SINT1_NORM,
>-    VERTEX_FORMAT_SINT2,
>-    VERTEX_FORMAT_SINT2_NORM,
>-    VERTEX_FORMAT_SINT3,
>-    VERTEX_FORMAT_SINT3_NORM,
>-    VERTEX_FORMAT_SINT4,
>-    VERTEX_FORMAT_SINT4_NORM,
>-    VERTEX_FORMAT_UINT1,
>-    VERTEX_FORMAT_UINT1_NORM,
>-    VERTEX_FORMAT_UINT2,
>-    VERTEX_FORMAT_UINT2_NORM,
>-    VERTEX_FORMAT_UINT3,
>-    VERTEX_FORMAT_UINT3_NORM,
>-    VERTEX_FORMAT_UINT4,
>-    VERTEX_FORMAT_UINT4_NORM,
>-    VERTEX_FORMAT_SBYTE1_INT,
>-    VERTEX_FORMAT_SBYTE2_INT,
>-    VERTEX_FORMAT_SBYTE3_INT,
>-    VERTEX_FORMAT_SBYTE4_INT,
>-    VERTEX_FORMAT_UBYTE1_INT,
>-    VERTEX_FORMAT_UBYTE2_INT,
>-    VERTEX_FORMAT_UBYTE3_INT,
>-    VERTEX_FORMAT_UBYTE4_INT,
>-    VERTEX_FORMAT_SSHORT1_INT,
>-    VERTEX_FORMAT_SSHORT2_INT,
>-    VERTEX_FORMAT_SSHORT3_INT,
>-    VERTEX_FORMAT_SSHORT4_INT,
>-    VERTEX_FORMAT_USHORT1_INT,
>-    VERTEX_FORMAT_USHORT2_INT,
>-    VERTEX_FORMAT_USHORT3_INT,
>-    VERTEX_FORMAT_USHORT4_INT,
>-    VERTEX_FORMAT_SINT1_INT,
>-    VERTEX_FORMAT_SINT2_INT,
>-    VERTEX_FORMAT_SINT3_INT,
>-    VERTEX_FORMAT_SINT4_INT,
>-    VERTEX_FORMAT_UINT1_INT,
>-    VERTEX_FORMAT_UINT2_INT,
>-    VERTEX_FORMAT_UINT3_INT,
>-    VERTEX_FORMAT_UINT4_INT,
>-    VERTEX_FORMAT_FIXED1,
>-    VERTEX_FORMAT_FIXED2,
>-    VERTEX_FORMAT_FIXED3,
>-    VERTEX_FORMAT_FIXED4,
>-    VERTEX_FORMAT_HALF1,
>-    VERTEX_FORMAT_HALF2,
>-    VERTEX_FORMAT_HALF3,
>-    VERTEX_FORMAT_HALF4,
>-    VERTEX_FORMAT_FLOAT1,
>-    VERTEX_FORMAT_FLOAT2,
>-    VERTEX_FORMAT_FLOAT3,
>-    VERTEX_FORMAT_FLOAT4,
>-    VERTEX_FORMAT_SINT210,
>-    VERTEX_FORMAT_UINT210,
>-    VERTEX_FORMAT_SINT210_NORM,
>-    VERTEX_FORMAT_UINT210_NORM,
>-    VERTEX_FORMAT_SINT210_INT,
>-    VERTEX_FORMAT_UINT210_INT,
>-};
>-
>-typedef std::vector<VertexFormatType> InputLayout;
>+typedef std::vector<angle::FormatID> InputLayout;
> 
> struct VertexFormat : private angle::NonCopyable
> {
>@@ -306,11 +247,19 @@ struct VertexFormat : private angle::NonCopyable
>     bool pureInteger;
> };
> 
>-VertexFormatType GetVertexFormatType(GLenum type, GLboolean normalized, GLuint components, bool pureInteger);
>-VertexFormatType GetVertexFormatType(const VertexAttribute &attrib);
>-VertexFormatType GetVertexFormatType(const VertexAttribute &attrib, GLenum currentValueType);
>-const VertexFormat &GetVertexFormatFromType(VertexFormatType vertexFormatType);
>-size_t GetVertexFormatTypeSize(VertexFormatType vertexFormatType);
>+angle::FormatID GetVertexFormatID(VertexAttribType type,
>+                                  GLboolean normalized,
>+                                  GLuint components,
>+                                  bool pureInteger);
>+
>+ANGLE_INLINE angle::FormatID GetVertexFormatID(const VertexAttribute &attrib)
>+{
>+    return GetVertexFormatID(attrib.type, attrib.normalized, attrib.size, attrib.pureInteger);
>+}
>+
>+angle::FormatID GetVertexFormatID(const VertexAttribute &attrib, VertexAttribType currentValueType);
>+const VertexFormat &GetVertexFormatFromID(angle::FormatID vertexFormatID);
>+size_t GetVertexFormatSize(angle::FormatID vertexFormatID);
> 
> // Check if an internal format is ever valid in ES3.  Makes no checks about support for a specific
> // context.
>@@ -326,4 +275,4 @@ bool ValidES3CopyConversion(GLenum textureFormat, GLenum framebufferFormat);
> 
> }  // namespace gl
> 
>-#endif // LIBANGLE_FORMATUTILS_H_
>+#endif  // LIBANGLE_FORMATUTILS_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/gen_copy_conversion_table.py b/Source/ThirdParty/ANGLE/src/libANGLE/gen_copy_conversion_table.py
>index f2c9603d545..ad67ab13da3 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/gen_copy_conversion_table.py
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/gen_copy_conversion_table.py
>@@ -5,6 +5,7 @@
> #
> # gen_copy_conversion_table.py:
> #  Code generation for ES3 valid copy conversions table format map.
>+#  NOTE: don't run this script directly. Run scripts/run_code_generation.py.
> 
> from datetime import date
> import sys
>@@ -64,28 +65,51 @@ def parse_texture_format_case(texture_format, framebuffer_formats):
>     return template_format_case.format(
>         texture_format = texture_format, framebuffer_format_cases = framebuffer_format_cases)
> 
>-data_source_name = 'es3_copy_conversion_formats.json'
> 
>-json_data = angle_format.load_json(data_source_name)
>+def main():
> 
>-format_map = {}
>+    data_source_name = 'es3_copy_conversion_formats.json'
>+    out_file_name = 'es3_copy_conversion_table_autogen.cpp'
> 
>-for description, data in json_data.iteritems():
>-    for texture_format, framebuffer_format in data:
>-        if texture_format not in format_map:
>-            format_map[texture_format] = []
>-        format_map[texture_format] += [ framebuffer_format ]
>+    # auto_script parameters.
>+    if len(sys.argv) > 1:
>+        inputs = [data_source_name]
>+        outputs = [out_file_name]
> 
>-texture_format_cases = ""
>+        if sys.argv[1] == 'inputs':
>+            print ','.join(inputs)
>+        elif sys.argv[1] == 'outputs':
>+            print ','.join(outputs)
>+        else:
>+            print('Invalid script parameters')
>+            return 1
>+        return 0
> 
>-for texture_format, framebuffer_formats in sorted(format_map.iteritems()):
>-    texture_format_cases += parse_texture_format_case(texture_format, framebuffer_formats)
>+    json_data = angle_format.load_json(data_source_name)
> 
>-with open('es3_copy_conversion_table_autogen.cpp', 'wt') as out_file:
>-    output_cpp = template_cpp.format(
>-        script_name = sys.argv[0],
>-        data_source_name = data_source_name,
>-        copyright_year = date.today().year,
>-        texture_format_cases = texture_format_cases)
>-    out_file.write(output_cpp)
>-    out_file.close()
>+    format_map = {}
>+
>+    for description, data in json_data.iteritems():
>+        for texture_format, framebuffer_format in data:
>+            if texture_format not in format_map:
>+                format_map[texture_format] = []
>+            format_map[texture_format] += [ framebuffer_format ]
>+
>+    texture_format_cases = ""
>+
>+    for texture_format, framebuffer_formats in sorted(format_map.iteritems()):
>+        texture_format_cases += parse_texture_format_case(texture_format, framebuffer_formats)
>+
>+    with open(out_file_name, 'wt') as out_file:
>+        output_cpp = template_cpp.format(
>+            script_name = sys.argv[0],
>+            data_source_name = data_source_name,
>+            copyright_year = date.today().year,
>+            texture_format_cases = texture_format_cases)
>+        out_file.write(output_cpp)
>+        out_file.close()
>+    return 0
>+
>+
>+if __name__ == '__main__':
>+    sys.exit(main())
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/gen_format_map.py b/Source/ThirdParty/ANGLE/src/libANGLE/gen_format_map.py
>index e150fc0bcac..4bba7a6d861 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/gen_format_map.py
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/gen_format_map.py
>@@ -6,6 +6,7 @@
> # gen_format_map.py:
> #  Code generation for GL format map. The format map matches between
> #  {format,type} and internal format.
>+#  NOTE: don't run this script directly. Run scripts/run_code_generation.py.
> 
> from datetime import date
> import sys
>@@ -110,10 +111,12 @@ template_es3_combo_type_case = """                case {type}:
>                 }}
> """
> 
>+
> def parse_type_case(type, result):
>     return template_simple_case.format(
>         key = type, result = result)
> 
>+
> def parse_format_case(format, type_map):
>     type_cases = ""
>     for type, internal_format in sorted(type_map.iteritems()):
>@@ -121,66 +124,88 @@ def parse_format_case(format, type_map):
>     return template_format_case.format(
>         format = format, type_cases = type_cases)
> 
>-input_script = 'format_map_data.json'
> 
>-format_map = angle_format.load_json(input_script)
>+def main():
>+
>+    # auto_script parameters.
>+    if len(sys.argv) > 1:
>+        inputs = ['es3_format_type_combinations.json', 'format_map_data.json']
>+        outputs = ['format_map_autogen.cpp']
>+
>+        if sys.argv[1] == 'inputs':
>+            print ','.join(inputs)
>+        elif sys.argv[1] == 'outputs':
>+            print ','.join(outputs)
>+        else:
>+            print('Invalid script parameters')
>+            return 1
>+        return 0
>+
>+    input_script = 'format_map_data.json'
>+
>+    format_map = angle_format.load_json(input_script)
>+
>+    format_cases = ""
>+
>+    for format, type_map in sorted(format_map.iteritems()):
>+        format_cases += parse_format_case(format, type_map)
> 
>-format_cases = ""
>+    combo_data_file = 'es3_format_type_combinations.json'
>+    es3_combo_data = angle_format.load_json(combo_data_file)
>+    combo_data = [combo for sublist in es3_combo_data.values() for combo in sublist]
> 
>-for format, type_map in sorted(format_map.iteritems()):
>-    format_cases += parse_format_case(format, type_map)
>+    types = set()
>+    formats = set()
>+    combos = {}
> 
>-combo_data_file = 'es3_format_type_combinations.json'
>-es3_combo_data = angle_format.load_json(combo_data_file)
>-combo_data = [combo for sublist in es3_combo_data.values() for combo in sublist]
>+    for internal_format, format, type in combo_data:
>+        types.update([type])
>+        formats.update([format])
>+        if format not in combos:
>+            combos[format] = {}
>+        if type not in combos[format]:
>+            combos[format][type] = [internal_format]
>+        else:
>+            combos[format][type] += [internal_format]
> 
>-types = set()
>-formats = set()
>-combos = {}
>+    es3_format_cases = ""
> 
>-for internal_format, format, type in combo_data:
>-    types.update([type])
>-    formats.update([format])
>-    if format not in combos:
>-        combos[format] = {}
>-    if type not in combos[format]:
>-        combos[format][type] = [internal_format]
>-    else:
>-        combos[format][type] += [internal_format]
>+    for format in sorted(formats):
>+        es3_format_cases += "        case " + format + ":\n"
> 
>-es3_format_cases = ""
>+    es3_type_cases = ""
> 
>-for format in sorted(formats):
>-    es3_format_cases += "        case " + format + ":\n"
>+    for type in sorted(types):
>+        es3_type_cases += "        case " + type + ":\n"
> 
>-es3_type_cases = ""
>+    es3_combo_cases = ""
> 
>-for type in sorted(types):
>-    es3_type_cases += "        case " + type + ":\n"
>+    for format, type_combos in combos.iteritems():
>+        this_type_cases = ""
>+        for type, combos in type_combos.iteritems():
>+            internal_format_cases = ""
>+            for internal_format in combos:
>+                internal_format_cases += "                        case " + internal_format + ":\n"
> 
>-es3_combo_cases = ""
>+            this_type_cases += template_es3_combo_type_case.format(
>+                type = type, internal_format_cases = internal_format_cases)
> 
>-for format, type_combos in combos.iteritems():
>-    this_type_cases = ""
>-    for type, combos in type_combos.iteritems():
>-        internal_format_cases = ""
>-        for internal_format in combos:
>-            internal_format_cases += "                        case " + internal_format + ":\n"
>+        es3_combo_cases += template_format_case.format(
>+            format = format, type_cases = this_type_cases)
> 
>-        this_type_cases += template_es3_combo_type_case.format(
>-            type = type, internal_format_cases = internal_format_cases)
>+    with open('format_map_autogen.cpp', 'wt') as out_file:
>+        output_cpp = template_cpp.format(
>+            script_name = sys.argv[0],
>+            data_source_name = input_script,
>+            es3_data_source_name = combo_data_file,
>+            copyright_year = date.today().year,
>+            format_cases = format_cases,
>+            es3_format_cases = es3_format_cases,
>+            es3_type_cases = es3_type_cases,
>+            es3_combo_cases = es3_combo_cases)
>+        out_file.write(output_cpp)
>+    return 0
> 
>-    es3_combo_cases += template_format_case.format(
>-        format = format, type_cases = this_type_cases)
> 
>-with open('format_map_autogen.cpp', 'wt') as out_file:
>-    output_cpp = template_cpp.format(
>-        script_name = sys.argv[0],
>-        data_source_name = input_script,
>-        es3_data_source_name = combo_data_file,
>-        copyright_year = date.today().year,
>-        format_cases = format_cases,
>-        es3_format_cases = es3_format_cases,
>-        es3_type_cases = es3_type_cases,
>-        es3_combo_cases = es3_combo_cases)
>-    out_file.write(output_cpp)
>+if __name__ == '__main__':
>+    sys.exit(main())
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/gen_packed_gl_enums.py b/Source/ThirdParty/ANGLE/src/libANGLE/gen_packed_gl_enums.py
>deleted file mode 100644
>index 562bf19e595..00000000000
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/gen_packed_gl_enums.py
>+++ /dev/null
>@@ -1,176 +0,0 @@
>-# Copyright 2016 The ANGLE Project Authors. All rights reserved.
>-# Use of this source code is governed by a BSD-style license that can be
>-# found in the LICENSE file.
>-#
>-# gen_packed_gl_enums.py:
>-#  Code generation for the packed GL enums.
>-
>-import datetime, json, os, sys
>-from collections import namedtuple
>-
>-Enum = namedtuple('Enum', ['name', 'values', 'max_value'])
>-EnumValue = namedtuple('EnumValue', ['name', 'gl_name', 'value'])
>-
>-kJsonFileName = "packed_gl_enums.json"
>-
>-def load_enums(path):
>-    with open(path) as map_file:
>-        enums_dict = json.loads(map_file.read())
>-
>-    enums = []
>-    for (enum_name, values_dict) in enums_dict.iteritems():
>-
>-        values = []
>-        i = 0
>-        for (value_name, value_gl_name) in sorted(values_dict.iteritems()):
>-            values.append(EnumValue(value_name, value_gl_name, i))
>-            i += 1
>-
>-        assert(i < 255) # This makes sure enums fit in the uint8_t
>-        enums.append(Enum(enum_name, values, i))
>-
>-    enums.sort(key=lambda enum: enum.name)
>-    return enums
>-
>-header_template = """// GENERATED FILE - DO NOT EDIT.
>-// Generated by {script_name} using data from {data_source_name}.
>-//
>-// Copyright {copyright_year} The ANGLE Project Authors. All rights reserved.
>-// Use of this source code is governed by a BSD-style license that can be
>-// found in the LICENSE file.
>-//
>-// PackedGLEnums_autogen.h:
>-//   Declares ANGLE-specific enums classes for GLEnum and functions operating
>-//   on them.
>-
>-#ifndef LIBANGLE_PACKEDGLENUMS_AUTOGEN_H_
>-#define LIBANGLE_PACKEDGLENUMS_AUTOGEN_H_
>-
>-#include <angle_gl.h>
>-
>-#include <cstdint>
>-
>-namespace gl
>-{{
>-
>-template<typename Enum>
>-Enum FromGLenum(GLenum from);
>-{content}
>-}}  // namespace gl
>-
>-#endif // LIBANGLE_PACKEDGLENUMS_AUTOGEN_H_
>-"""
>-
>-enum_declaration_template = """
>-enum class {enum_name} : uint8_t
>-{{
>-{value_declarations}
>-
>-    InvalidEnum = {max_value},
>-    EnumCount = {max_value},
>-}};
>-
>-template<>
>-{enum_name} FromGLenum<{enum_name}>(GLenum from);
>-GLenum ToGLenum({enum_name} from);
>-"""
>-
>-def write_header(enums, path):
>-    content = ['']
>-
>-    for enum in enums:
>-        value_declarations = []
>-        for value in enum.values:
>-            value_declarations.append('    ' + value.name + ' = ' + str(value.value) + ',')
>-
>-        content.append(enum_declaration_template.format(
>-            enum_name = enum.name,
>-            max_value = str(enum.max_value),
>-            value_declarations = '\n'.join(value_declarations)
>-        ))
>-
>-    header = header_template.format(
>-        content = ''.join(content),
>-        copyright_year = datetime.date.today().year,
>-        data_source_name = kJsonFileName,
>-        script_name = sys.argv[0]
>-    )
>-
>-    with (open(path, 'wt')) as f:
>-        f.write(header)
>-
>-cpp_template = """// GENERATED FILE - DO NOT EDIT.
>-// Generated by {script_name} using data from {data_source_name}.
>-//
>-// Copyright {copyright_year} The ANGLE Project Authors. All rights reserved.
>-// Use of this source code is governed by a BSD-style license that can be
>-// found in the LICENSE file.
>-//
>-// PackedGLEnums_autogen.cpp:
>-//   Implements ANGLE-specific enums classes for GLEnum and functions operating
>-//   on them.
>-
>-#include "common/debug.h"
>-#include "libANGLE/PackedGLEnums_autogen.h"
>-
>-namespace gl
>-{{
>-{content}
>-}}  // namespace gl
>-"""
>-
>-enum_implementation_template = """
>-template<>
>-{enum_name} FromGLenum<{enum_name}>(GLenum from)
>-{{
>-    switch(from)
>-    {{
>-{from_glenum_cases}
>-        default: return {enum_name}::InvalidEnum;
>-    }}
>-}}
>-
>-GLenum ToGLenum({enum_name} from)
>-{{
>-    switch(from)
>-    {{
>-{to_glenum_cases}
>-        default: UNREACHABLE(); return GL_NONE;
>-    }}
>-}}
>-"""
>-
>-def write_cpp(enums, path):
>-    content = ['']
>-
>-    for enum in enums:
>-        from_glenum_cases = []
>-        to_glenum_cases = []
>-        for value in enum.values:
>-            qualified_name = enum.name + '::' + value.name
>-            from_glenum_cases.append('        case ' + value.gl_name + ': return ' + qualified_name + ';')
>-            to_glenum_cases.append('        case ' + qualified_name + ': return ' + value.gl_name + ';')
>-
>-        content.append(enum_implementation_template.format(
>-            enum_name = enum.name,
>-            from_glenum_cases = '\n'.join(from_glenum_cases),
>-            max_value = str(enum.max_value),
>-            to_glenum_cases = '\n'.join(to_glenum_cases)
>-        ))
>-
>-    cpp = cpp_template.format(
>-        content = ''.join(content),
>-        copyright_year = datetime.date.today().year,
>-        data_source_name = kJsonFileName,
>-        script_name = sys.argv[0]
>-    )
>-
>-    with (open(path, 'wt')) as f:
>-        f.write(cpp)
>-
>-if __name__ == '__main__':
>-    path_prefix = os.path.dirname(os.path.realpath(__file__)) + os.path.sep
>-    enums = load_enums(path_prefix + kJsonFileName)
>-
>-    write_header(enums, path_prefix + 'PackedGLEnums_autogen.h')
>-    write_cpp(enums, path_prefix + 'PackedGLEnums_autogen.cpp')
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/histogram_macros.h b/Source/ThirdParty/ANGLE/src/libANGLE/histogram_macros.h
>index fb428b46d24..d9718c27715 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/histogram_macros.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/histogram_macros.h
>@@ -12,28 +12,27 @@
> 
> #include <platform/Platform.h>
> 
>-#define ANGLE_HISTOGRAM_TIMES(name, sample) ANGLE_HISTOGRAM_CUSTOM_TIMES( \
>-    name, sample, 1, 10000, 50)
>+#define ANGLE_HISTOGRAM_TIMES(name, sample) ANGLE_HISTOGRAM_CUSTOM_TIMES(name, sample, 1, 10000, 50)
> 
>-#define ANGLE_HISTOGRAM_MEDIUM_TIMES(name, sample) ANGLE_HISTOGRAM_CUSTOM_TIMES( \
>-    name, sample, 10, 180000, 50)
>+#define ANGLE_HISTOGRAM_MEDIUM_TIMES(name, sample) \
>+    ANGLE_HISTOGRAM_CUSTOM_TIMES(name, sample, 10, 180000, 50)
> 
> // Use this macro when times can routinely be much longer than 10 seconds.
>-#define ANGLE_HISTOGRAM_LONG_TIMES(name, sample) ANGLE_HISTOGRAM_CUSTOM_TIMES( \
>-    name, sample, 1, 3600000, 50)
>+#define ANGLE_HISTOGRAM_LONG_TIMES(name, sample) \
>+    ANGLE_HISTOGRAM_CUSTOM_TIMES(name, sample, 1, 3600000, 50)
> 
> // Use this macro when times can routinely be much longer than 10 seconds and
> // you want 100 buckets.
>-#define ANGLE_HISTOGRAM_LONG_TIMES_100(name, sample) ANGLE_HISTOGRAM_CUSTOM_TIMES( \
>-    name, sample, 1, 3600000, 100)
>+#define ANGLE_HISTOGRAM_LONG_TIMES_100(name, sample) \
>+    ANGLE_HISTOGRAM_CUSTOM_TIMES(name, sample, 1, 3600000, 100)
> 
> // For folks that need real specific times, use this to select a precise range
> // of times you want plotted, and the number of buckets you want used.
> #define ANGLE_HISTOGRAM_CUSTOM_TIMES(name, sample, min, max, bucket_count) \
>     ANGLE_HISTOGRAM_CUSTOM_COUNTS(name, sample, min, max, bucket_count)
> 
>-#define ANGLE_HISTOGRAM_COUNTS(name, sample) ANGLE_HISTOGRAM_CUSTOM_COUNTS( \
>-    name, sample, 1, 1000000, 50)
>+#define ANGLE_HISTOGRAM_COUNTS(name, sample) \
>+    ANGLE_HISTOGRAM_CUSTOM_COUNTS(name, sample, 1, 1000000, 50)
> 
> #define ANGLE_HISTOGRAM_COUNTS_100(name, sample) \
>     ANGLE_HISTOGRAM_CUSTOM_COUNTS(name, sample, 1, 100, 50)
>@@ -55,11 +54,11 @@
>     ANGLEPlatformCurrent()->histogramEnumeration(ANGLEPlatformCurrent(), name, sample, \
>                                                  boundary_value)
> 
>-#define ANGLE_HISTOGRAM_MEMORY_KB(name, sample) ANGLE_HISTOGRAM_CUSTOM_COUNTS( \
>-    name, sample, 1000, 500000, 50)
>+#define ANGLE_HISTOGRAM_MEMORY_KB(name, sample) \
>+    ANGLE_HISTOGRAM_CUSTOM_COUNTS(name, sample, 1000, 500000, 50)
> 
>-#define ANGLE_HISTOGRAM_MEMORY_MB(name, sample) ANGLE_HISTOGRAM_CUSTOM_COUNTS( \
>-    name, sample, 1, 1000, 50)
>+#define ANGLE_HISTOGRAM_MEMORY_MB(name, sample) \
>+    ANGLE_HISTOGRAM_CUSTOM_COUNTS(name, sample, 1, 1000, 50)
> 
> #define ANGLE_HISTOGRAM_SPARSE_SLOWLY(name, sample) \
>     ANGLEPlatformCurrent()->histogramSparse(ANGLEPlatformCurrent(), name, sample)
>@@ -86,8 +85,7 @@
>       public:                                                                           \
>         ScopedHistogramTimer##key()                                                     \
>             : constructed_(ANGLEPlatformCurrent()->currentTime(ANGLEPlatformCurrent())) \
>-        {                                                                               \
>-        }                                                                               \
>+        {}                                                                              \
>         ~ScopedHistogramTimer##key()                                                    \
>         {                                                                               \
>             if (constructed_ == 0)                                                      \
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/packed_gl_enums.json b/Source/ThirdParty/ANGLE/src/libANGLE/packed_gl_enums.json
>deleted file mode 100644
>index 7e77de2f36d..00000000000
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/packed_gl_enums.json
>+++ /dev/null
>@@ -1,35 +0,0 @@
>-{
>-    "BufferBinding":
>-    {
>-        "Array": "GL_ARRAY_BUFFER",
>-        "AtomicCounter": "GL_ATOMIC_COUNTER_BUFFER",
>-        "CopyRead": "GL_COPY_READ_BUFFER",
>-        "CopyWrite": "GL_COPY_WRITE_BUFFER",
>-        "DispatchIndirect": "GL_DISPATCH_INDIRECT_BUFFER",
>-        "DrawIndirect": "GL_DRAW_INDIRECT_BUFFER",
>-        "ElementArray": "GL_ELEMENT_ARRAY_BUFFER",
>-        "PixelPack": "GL_PIXEL_PACK_BUFFER",
>-        "PixelUnpack": "GL_PIXEL_UNPACK_BUFFER",
>-        "ShaderStorage": "GL_SHADER_STORAGE_BUFFER",
>-        "TransformFeedback": "GL_TRANSFORM_FEEDBACK_BUFFER",
>-        "Uniform": "GL_UNIFORM_BUFFER"
>-    },
>-    "BufferUsage":
>-    {
>-        "DynamicCopy": "GL_DYNAMIC_COPY",
>-        "DynamicDraw": "GL_DYNAMIC_DRAW",
>-        "DynamicRead": "GL_DYNAMIC_READ",
>-        "StaticCopy": "GL_STATIC_COPY",
>-        "StaticDraw": "GL_STATIC_DRAW",
>-        "StaticRead": "GL_STATIC_READ",
>-        "StreamCopy": "GL_STREAM_COPY",
>-        "StreamDraw": "GL_STREAM_DRAW",
>-        "StreamRead": "GL_STREAM_READ"
>-    },
>-    "CullFaceMode":
>-    {
>-        "Back": "GL_BACK",
>-        "Front": "GL_FRONT",
>-        "FrontAndBack": "GL_FRONT_AND_BACK"
>-    }
>-}
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/params.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/params.cpp
>deleted file mode 100644
>index a89d87e0a91..00000000000
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/params.cpp
>+++ /dev/null
>@@ -1,68 +0,0 @@
>-//
>-// Copyright 2017 The ANGLE Project Authors. All rights reserved.
>-// Use of this source code is governed by a BSD-style license that can be
>-// found in the LICENSE file.
>-//
>-// params:
>-//   Parameter wrapper structs for OpenGL ES. These helpers cache re-used values
>-//   in entry point routines.
>-
>-#include "libANGLE/params.h"
>-
>-#include "common/utilities.h"
>-#include "libANGLE/Context.h"
>-#include "libANGLE/VertexArray.h"
>-
>-namespace gl
>-{
>-
>-// static
>-constexpr ParamTypeInfo ParamsBase::TypeInfo;
>-constexpr ParamTypeInfo HasIndexRange::TypeInfo;
>-
>-HasIndexRange::HasIndexRange()
>-    : ParamsBase(nullptr), mContext(nullptr), mCount(0), mType(GL_NONE), mIndices(nullptr)
>-{
>-}
>-
>-HasIndexRange::HasIndexRange(Context *context, GLsizei count, GLenum type, const void *indices)
>-    : ParamsBase(context), mContext(context), mCount(count), mType(type), mIndices(indices)
>-{
>-}
>-
>-const Optional<IndexRange> &HasIndexRange::getIndexRange() const
>-{
>-    if (mIndexRange.valid() || !mContext)
>-    {
>-        return mIndexRange;
>-    }
>-
>-    const State &state = mContext->getGLState();
>-
>-    const gl::VertexArray *vao     = state.getVertexArray();
>-    gl::Buffer *elementArrayBuffer = vao->getElementArrayBuffer().get();
>-
>-    if (elementArrayBuffer)
>-    {
>-        uintptr_t offset = reinterpret_cast<uintptr_t>(mIndices);
>-        IndexRange indexRange;
>-        Error error =
>-            elementArrayBuffer->getIndexRange(mContext, mType, static_cast<size_t>(offset), mCount,
>-                                              state.isPrimitiveRestartEnabled(), &indexRange);
>-        if (error.isError())
>-        {
>-            mContext->handleError(error);
>-            return mIndexRange;
>-        }
>-
>-        mIndexRange = indexRange;
>-    }
>-    else
>-    {
>-        mIndexRange = ComputeIndexRange(mType, mIndices, mCount, state.isPrimitiveRestartEnabled());
>-    }
>-
>-    return mIndexRange;
>-}
>-
>-}  // namespace gl
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/params.h b/Source/ThirdParty/ANGLE/src/libANGLE/params.h
>deleted file mode 100644
>index 27dba640ffc..00000000000
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/params.h
>+++ /dev/null
>@@ -1,228 +0,0 @@
>-//
>-// Copyright 2017 The ANGLE Project Authors. All rights reserved.
>-// Use of this source code is governed by a BSD-style license that can be
>-// found in the LICENSE file.
>-//
>-// params:
>-//   Parameter wrapper structs for OpenGL ES. These helpers cache re-used values
>-//   in entry point routines.
>-
>-#ifndef LIBANGLE_PARAMS_H_
>-#define LIBANGLE_PARAMS_H_
>-
>-#include "angle_gl.h"
>-#include "common/Optional.h"
>-#include "common/angleutils.h"
>-#include "common/mathutil.h"
>-#include "libANGLE/entry_points_enum_autogen.h"
>-
>-namespace gl
>-{
>-class Context;
>-
>-template <EntryPoint EP>
>-struct EntryPointParam;
>-
>-template <EntryPoint EP>
>-using EntryPointParamType = typename EntryPointParam<EP>::Type;
>-
>-class ParamTypeInfo
>-{
>-  public:
>-    constexpr ParamTypeInfo(const char *selfClass, const ParamTypeInfo *parentType)
>-        : mSelfClass(selfClass), mParentTypeInfo(parentType)
>-    {
>-    }
>-
>-    constexpr bool hasDynamicType(const ParamTypeInfo &typeInfo) const
>-    {
>-        return mSelfClass == typeInfo.mSelfClass ||
>-               (mParentTypeInfo && mParentTypeInfo->hasDynamicType(typeInfo));
>-    }
>-
>-    constexpr bool isValid() const { return mSelfClass != nullptr; }
>-
>-  private:
>-    const char *mSelfClass;
>-    const ParamTypeInfo *mParentTypeInfo;
>-};
>-
>-#define ANGLE_PARAM_TYPE_INFO(NAME, BASENAME) \
>-    static constexpr ParamTypeInfo TypeInfo = {#NAME, &BASENAME::TypeInfo}
>-
>-class ParamsBase : angle::NonCopyable
>-{
>-  public:
>-    ParamsBase(Context *context, ...){};
>-
>-    template <EntryPoint EP, typename... ArgsT>
>-    static void Factory(EntryPointParamType<EP> *objBuffer, ArgsT... args);
>-
>-    static constexpr ParamTypeInfo TypeInfo = {nullptr, nullptr};
>-};
>-
>-// static
>-template <EntryPoint EP, typename... ArgsT>
>-ANGLE_INLINE void ParamsBase::Factory(EntryPointParamType<EP> *objBuffer, ArgsT... args)
>-{
>-    new (objBuffer) EntryPointParamType<EP>(args...);
>-}
>-
>-class HasIndexRange : public ParamsBase
>-{
>-  public:
>-    // Dummy placeholder that can't generate an index range.
>-    HasIndexRange();
>-    HasIndexRange(Context *context, GLsizei count, GLenum type, const void *indices);
>-
>-    template <EntryPoint EP, typename... ArgsT>
>-    static void Factory(HasIndexRange *objBuffer, ArgsT... args);
>-
>-    const Optional<IndexRange> &getIndexRange() const;
>-
>-    ANGLE_PARAM_TYPE_INFO(HasIndexRange, ParamsBase);
>-
>-  private:
>-    Context *mContext;
>-    GLsizei mCount;
>-    GLenum mType;
>-    const GLvoid *mIndices;
>-    mutable Optional<IndexRange> mIndexRange;
>-};
>-
>-// Entry point funcs essentially re-map different entry point parameter arrays into
>-// the format the parameter type class expects. For example, for HasIndexRange, for the
>-// various indexed draw calls, they drop parameters that aren't useful and re-arrange
>-// the rest.
>-#define ANGLE_ENTRY_POINT_FUNC(NAME, CLASS, ...)    \
>-    \
>-template<> struct EntryPointParam<EntryPoint::NAME> \
>-    {                                               \
>-        using Type = CLASS;                         \
>-    };                                              \
>-    \
>-template<> inline void CLASS::Factory<EntryPoint::NAME>(__VA_ARGS__)
>-
>-ANGLE_ENTRY_POINT_FUNC(DrawElements,
>-                       HasIndexRange,
>-                       HasIndexRange *objBuffer,
>-                       Context *context,
>-                       GLenum /*mode*/,
>-                       GLsizei count,
>-                       GLenum type,
>-                       const void *indices)
>-{
>-    return ParamsBase::Factory<EntryPoint::DrawElements>(objBuffer, context, count, type, indices);
>-}
>-
>-ANGLE_ENTRY_POINT_FUNC(DrawElementsInstanced,
>-                       HasIndexRange,
>-                       HasIndexRange *objBuffer,
>-                       Context *context,
>-                       GLenum /*mode*/,
>-                       GLsizei count,
>-                       GLenum type,
>-                       const void *indices,
>-                       GLsizei /*instanceCount*/)
>-{
>-    return ParamsBase::Factory<EntryPoint::DrawElementsInstanced>(objBuffer, context, count, type,
>-                                                                  indices);
>-}
>-
>-ANGLE_ENTRY_POINT_FUNC(DrawElementsInstancedANGLE,
>-                       HasIndexRange,
>-                       HasIndexRange *objBuffer,
>-                       Context *context,
>-                       GLenum /*mode*/,
>-                       GLsizei count,
>-                       GLenum type,
>-                       const void *indices,
>-                       GLsizei /*instanceCount*/)
>-{
>-    return ParamsBase::Factory<EntryPoint::DrawElementsInstancedANGLE>(objBuffer, context, count,
>-                                                                       type, indices);
>-}
>-
>-ANGLE_ENTRY_POINT_FUNC(DrawRangeElements,
>-                       HasIndexRange,
>-                       HasIndexRange *objBuffer,
>-                       Context *context,
>-                       GLenum /*mode*/,
>-                       GLuint /*start*/,
>-                       GLuint /*end*/,
>-                       GLsizei count,
>-                       GLenum type,
>-                       const void *indices)
>-{
>-    return ParamsBase::Factory<EntryPoint::DrawRangeElements>(objBuffer, context, count, type,
>-                                                              indices);
>-}
>-
>-#undef ANGLE_ENTRY_POINT_FUNC
>-
>-template <EntryPoint EP>
>-struct EntryPointParam
>-{
>-    using Type = ParamsBase;
>-};
>-
>-// A template struct for determining the default value to return for each entry point.
>-template <EntryPoint EP, typename ReturnType>
>-struct DefaultReturnValue;
>-
>-// Default return values for each basic return type.
>-template <EntryPoint EP>
>-struct DefaultReturnValue<EP, GLint>
>-{
>-    static constexpr GLint kValue = -1;
>-};
>-
>-// This doubles as the GLenum return value.
>-template <EntryPoint EP>
>-struct DefaultReturnValue<EP, GLuint>
>-{
>-    static constexpr GLuint kValue = 0;
>-};
>-
>-template <EntryPoint EP>
>-struct DefaultReturnValue<EP, GLboolean>
>-{
>-    static constexpr GLboolean kValue = GL_FALSE;
>-};
>-
>-// Catch-all rules for pointer types.
>-template <EntryPoint EP, typename PointerType>
>-struct DefaultReturnValue<EP, const PointerType *>
>-{
>-    static constexpr const PointerType *kValue = nullptr;
>-};
>-
>-template <EntryPoint EP, typename PointerType>
>-struct DefaultReturnValue<EP, PointerType *>
>-{
>-    static constexpr PointerType *kValue = nullptr;
>-};
>-
>-// Overloaded to return invalid index
>-template <>
>-struct DefaultReturnValue<EntryPoint::GetUniformBlockIndex, GLuint>
>-{
>-    static constexpr GLuint kValue = GL_INVALID_INDEX;
>-};
>-
>-// Specialized enum error value.
>-template <>
>-struct DefaultReturnValue<EntryPoint::ClientWaitSync, GLenum>
>-{
>-    static constexpr GLenum kValue = GL_WAIT_FAILED;
>-};
>-
>-template <EntryPoint EP, typename ReturnType>
>-constexpr ANGLE_INLINE ReturnType GetDefaultReturnValue()
>-{
>-    return DefaultReturnValue<EP, ReturnType>::kValue;
>-}
>-
>-}  // namespace gl
>-
>-#endif  // LIBANGLE_PARAMS_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/queryconversions.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/queryconversions.cpp
>index 78d219365ec..21f3cd6036f 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/queryconversions.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/queryconversions.cpp
>@@ -10,8 +10,8 @@
> 
> #include <vector>
> 
>-#include "libANGLE/Context.h"
> #include "common/utilities.h"
>+#include "libANGLE/Context.h"
> 
> namespace gl
> {
>@@ -31,14 +31,23 @@ QueryT CastFromStateValueToInt(GLenum pname, NativeT value)
> 
>     if (nativeType == GL_FLOAT)
>     {
>-        // RGBA color values and DepthRangeF values are converted to integer using Equation 2.4 from Table 4.5
>-        if (pname == GL_DEPTH_RANGE || pname == GL_COLOR_CLEAR_VALUE || pname == GL_DEPTH_CLEAR_VALUE || pname == GL_BLEND_COLOR)
>+        // RGBA color values and DepthRangeF values are converted to integer using Equation 2.4 from
>+        // Table 4.5
>+        switch (pname)
>         {
>-            return clampCast<QueryT>(ExpandFloatToInteger(static_cast<GLfloat>(value)));
>-        }
>-        else
>-        {
>-            return clampCast<QueryT>(std::round(value));
>+            case GL_DEPTH_RANGE:
>+            case GL_COLOR_CLEAR_VALUE:
>+            case GL_DEPTH_CLEAR_VALUE:
>+            case GL_BLEND_COLOR:
>+            // GLES1 emulation:
>+            // Also, several GLES1.x values need to be converted to integer with
>+            // ExpandFloatToInteger rather than rounding. See GLES 1.1 spec 6.1.2 "Data
>+            // Conversions".
>+            case GL_ALPHA_TEST_REF:
>+            case GL_CURRENT_COLOR:
>+                return clampCast<QueryT>(ExpandFloatToInteger(static_cast<GLfloat>(value)));
>+            default:
>+                return clampCast<QueryT>(std::round(value));
>         }
>     }
> 
>@@ -80,6 +89,9 @@ template GLfloat CastFromGLintStateValue<GLfloat, GLenum>(GLenum pname, GLenum v
> template GLint CastFromGLintStateValue<GLint, GLenum>(GLenum pname, GLenum value);
> template GLint64 CastFromGLintStateValue<GLint64, GLenum>(GLenum pname, GLenum value);
> template GLuint CastFromGLintStateValue<GLuint, GLenum>(GLenum pname, GLenum value);
>+template GLuint CastFromGLintStateValue<GLuint, GLint>(GLenum pname, GLint value);
>+template GLfloat CastFromGLintStateValue<GLfloat, GLint>(GLenum pname, GLint value);
>+template GLint CastFromGLintStateValue<GLint, GLint>(GLenum pname, GLint value);
> template GLfloat CastFromGLintStateValue<GLfloat, bool>(GLenum pname, bool value);
> template GLuint CastFromGLintStateValue<GLuint, bool>(GLenum pname, bool value);
> template GLint CastFromGLintStateValue<GLint, bool>(GLenum pname, bool value);
>@@ -110,8 +122,10 @@ template GLint CastFromStateValue<GLint, GLint64>(GLenum pname, GLint64 value);
> template GLint64 CastFromStateValue<GLint64, GLint>(GLenum pname, GLint value);
> template GLint64 CastFromStateValue<GLint64, GLint64>(GLenum pname, GLint64 value);
> template GLfloat CastFromStateValue<GLfloat, GLint>(GLenum pname, GLint value);
>+template GLfloat CastFromStateValue<GLfloat, GLuint>(GLenum pname, GLuint value);
> template GLfloat CastFromStateValue<GLfloat, GLfloat>(GLenum pname, GLfloat value);
> template GLint CastFromStateValue<GLint, GLfloat>(GLenum pname, GLfloat value);
>+template GLuint CastFromStateValue<GLuint, GLfloat>(GLenum pname, GLfloat value);
> template GLuint CastFromStateValue<GLuint, GLint>(GLenum pname, GLint value);
> template GLuint CastFromStateValue<GLuint, GLuint>(GLenum pname, GLuint value);
> template GLint CastFromStateValue<GLint, GLboolean>(GLenum pname, GLboolean value);
>@@ -145,14 +159,20 @@ NativeT CastQueryValueTo(GLenum pname, QueryT value)
> template GLint CastQueryValueTo<GLint, GLfloat>(GLenum pname, GLfloat value);
> template GLboolean CastQueryValueTo<GLboolean, GLint>(GLenum pname, GLint value);
> template GLint CastQueryValueTo<GLint, GLint>(GLenum pname, GLint value);
>+template GLint CastQueryValueTo<GLint, GLuint>(GLenum pname, GLuint value);
> template GLfloat CastQueryValueTo<GLfloat, GLint>(GLenum pname, GLint value);
>+template GLfloat CastQueryValueTo<GLfloat, GLuint>(GLenum pname, GLuint value);
> template GLfloat CastQueryValueTo<GLfloat, GLfloat>(GLenum pname, GLfloat value);
> template GLuint CastQueryValueTo<GLuint, GLint>(GLenum pname, GLint value);
>+template GLuint CastQueryValueTo<GLuint, GLuint>(GLenum pname, GLuint value);
> template GLuint CastQueryValueTo<GLuint, GLfloat>(GLenum pname, GLfloat value);
> 
> template <typename QueryT>
>-void CastStateValues(Context *context, GLenum nativeType, GLenum pname,
>-                     unsigned int numParams, QueryT *outParams)
>+void CastStateValues(Context *context,
>+                     GLenum nativeType,
>+                     GLenum pname,
>+                     unsigned int numParams,
>+                     QueryT *outParams)
> {
>     if (nativeType == GL_INT)
>     {
>@@ -171,7 +191,8 @@ void CastStateValues(Context *context, GLenum nativeType, GLenum pname,
> 
>         for (unsigned int i = 0; i < numParams; ++i)
>         {
>-            outParams[i] = (boolParams[i] == GL_FALSE ? static_cast<QueryT>(0) : static_cast<QueryT>(1));
>+            outParams[i] =
>+                (boolParams[i] == GL_FALSE ? static_cast<QueryT>(0) : static_cast<QueryT>(1));
>         }
>     }
>     else if (nativeType == GL_FLOAT)
>@@ -194,7 +215,8 @@ void CastStateValues(Context *context, GLenum nativeType, GLenum pname,
>             outParams[i] = CastFromStateValue<QueryT>(pname, int64Params[i]);
>         }
>     }
>-    else UNREACHABLE();
>+    else
>+        UNREACHABLE();
> }
> 
> // Explicit template instantiation (how we export template functions in different files)
>@@ -280,4 +302,4 @@ template void CastIndexedStateValues<GLint64>(Context *,
>                                               GLuint index,
>                                               unsigned int,
>                                               GLint64 *);
>-}
>+}  // namespace gl
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/queryconversions.h b/Source/ThirdParty/ANGLE/src/libANGLE/queryconversions.h
>index 805f36cf026..14a6d05875a 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/queryconversions.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/queryconversions.h
>@@ -81,8 +81,26 @@ GLenum ConvertToGLenum(ParamType param)
>     return ConvertToGLenum(GL_NONE, param);
> }
> 
>+template <typename OutType>
>+OutType ConvertGLenum(GLenum param)
>+{
>+    return static_cast<OutType>(param);
>+}
>+
>+template <typename InType, typename OutType>
>+void ConvertGLenumValue(InType param, OutType *out)
>+{
>+    *out = ConvertGLenum<OutType>(static_cast<GLenum>(param));
>+}
>+
>+template <typename PackedEnumType, typename OutType>
>+void ConvertPackedEnum(PackedEnumType param, OutType *out)
>+{
>+    *out = static_cast<OutType>(ToGLenum(param));
>+}
>+
> template <typename ParamType>
>-GLenum ConvertToGLint(ParamType param)
>+GLint ConvertToGLint(ParamType param)
> {
>     return CastQueryValueTo<GLint>(GL_NONE, param);
> }
>@@ -101,8 +119,11 @@ GLboolean ConvertToGLBoolean(ParamType param)
> 
> // The GL state query API types are: bool, int, uint, float, int64, uint64
> template <typename QueryT>
>-void CastStateValues(Context *context, GLenum nativeType, GLenum pname,
>-                     unsigned int numParams, QueryT *outParams);
>+void CastStateValues(Context *context,
>+                     GLenum nativeType,
>+                     GLenum pname,
>+                     unsigned int numParams,
>+                     QueryT *outParams);
> 
> // The GL state query API types are: bool, int, uint, float, int64, uint64
> template <typename QueryT>
>@@ -112,6 +133,6 @@ void CastIndexedStateValues(Context *context,
>                             GLuint index,
>                             unsigned int numParams,
>                             QueryT *outParams);
>-}
>+}  // namespace gl
> 
> #endif  // LIBANGLE_QUERY_CONVERSIONS_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/queryutils.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/queryutils.cpp
>index 16a989c688e..cac2c8ff2bf 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/queryutils.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/queryutils.cpp
>@@ -13,8 +13,11 @@
> #include "libANGLE/Buffer.h"
> #include "libANGLE/Config.h"
> #include "libANGLE/Context.h"
>+#include "libANGLE/Display.h"
>+#include "libANGLE/EGLSync.h"
> #include "libANGLE/Fence.h"
> #include "libANGLE/Framebuffer.h"
>+#include "libANGLE/GLES1State.h"
> #include "libANGLE/Program.h"
> #include "libANGLE/Renderbuffer.h"
> #include "libANGLE/Sampler.h"
>@@ -31,9 +34,103 @@ namespace gl
> namespace
> {
> 
>+template <bool isPureInteger>
>+ColorGeneric ConvertToColor(const GLfloat *params)
>+{
>+    if (isPureInteger)
>+    {
>+        UNREACHABLE();
>+        return ColorGeneric(ColorI());
>+    }
>+    else
>+    {
>+        return ColorGeneric(ColorF::fromData(params));
>+    }
>+}
>+
>+template <bool isPureInteger>
>+ColorGeneric ConvertToColor(const GLint *params)
>+{
>+    if (isPureInteger)
>+    {
>+        return ColorGeneric(ColorI(params[0], params[1], params[2], params[3]));
>+    }
>+    else
>+    {
>+        return ColorGeneric(ColorF(normalizedToFloat(params[0]), normalizedToFloat(params[1]),
>+                                   normalizedToFloat(params[2]), normalizedToFloat(params[3])));
>+    }
>+}
>+
>+template <bool isPureInteger>
>+ColorGeneric ConvertToColor(const GLuint *params)
>+{
>+    if (isPureInteger)
>+    {
>+        return ColorGeneric(ColorUI(params[0], params[1], params[2], params[3]));
>+    }
>+    else
>+    {
>+        UNREACHABLE();
>+        return ColorGeneric(ColorF());
>+    }
>+}
>+
>+template <bool isPureInteger>
>+void ConvertFromColor(const ColorGeneric &color, GLfloat *outParams)
>+{
>+    if (isPureInteger)
>+    {
>+        UNREACHABLE();
>+    }
>+    else
>+    {
>+        ASSERT(color.type == ColorGeneric::Type::Float);
>+        color.colorF.writeData(outParams);
>+    }
>+}
>+
>+template <bool isPureInteger>
>+void ConvertFromColor(const ColorGeneric &color, GLint *outParams)
>+{
>+    if (isPureInteger)
>+    {
>+        ASSERT(color.type == ColorGeneric::Type::Int);
>+        outParams[0] = color.colorI.red;
>+        outParams[1] = color.colorI.green;
>+        outParams[2] = color.colorI.blue;
>+        outParams[3] = color.colorI.alpha;
>+    }
>+    else
>+    {
>+        ASSERT(color.type == ColorGeneric::Type::Float);
>+        outParams[0] = floatToNormalized<GLint>(color.colorF.red);
>+        outParams[1] = floatToNormalized<GLint>(color.colorF.green);
>+        outParams[2] = floatToNormalized<GLint>(color.colorF.blue);
>+        outParams[3] = floatToNormalized<GLint>(color.colorF.alpha);
>+    }
>+}
>+
>+template <bool isPureInteger>
>+void ConvertFromColor(const ColorGeneric &color, GLuint *outParams)
>+{
>+    if (isPureInteger)
>+    {
>+        ASSERT(color.type == ColorGeneric::Type::UInt);
>+        outParams[0] = color.colorUI.red;
>+        outParams[1] = color.colorUI.green;
>+        outParams[2] = color.colorUI.blue;
>+        outParams[3] = color.colorUI.alpha;
>+    }
>+    else
>+    {
>+        UNREACHABLE();
>+    }
>+}
>+
> template <typename ParamType>
> void QueryTexLevelParameterBase(const Texture *texture,
>-                                GLenum target,
>+                                TextureTarget target,
>                                 GLint level,
>                                 GLenum pname,
>                                 ParamType *params)
>@@ -110,13 +207,17 @@ void QueryTexLevelParameterBase(const Texture *texture,
>         case GL_TEXTURE_COMPRESSED:
>             *params = CastFromStateValue<ParamType>(pname, static_cast<GLint>(info->compressed));
>             break;
>+        case GL_MEMORY_SIZE_ANGLE:
>+            *params =
>+                CastFromStateValue<ParamType>(pname, texture->getLevelMemorySize(target, level));
>+            break;
>         default:
>             UNREACHABLE();
>             break;
>     }
> }
> 
>-template <typename ParamType>
>+template <bool isPureInteger, typename ParamType>
> void QueryTexParameterBase(const Texture *texture, GLenum pname, ParamType *params)
> {
>     ASSERT(texture != nullptr);
>@@ -169,10 +270,10 @@ void QueryTexParameterBase(const Texture *texture, GLenum pname, ParamType *para
>             *params = CastFromGLintStateValue<ParamType>(pname, texture->getMaxLevel());
>             break;
>         case GL_TEXTURE_MIN_LOD:
>-            *params = CastFromStateValue<ParamType>(pname, texture->getSamplerState().minLod);
>+            *params = CastFromStateValue<ParamType>(pname, texture->getMinLod());
>             break;
>         case GL_TEXTURE_MAX_LOD:
>-            *params = CastFromStateValue<ParamType>(pname, texture->getSamplerState().maxLod);
>+            *params = CastFromStateValue<ParamType>(pname, texture->getMaxLod());
>             break;
>         case GL_TEXTURE_COMPARE_MODE:
>             *params = CastFromGLintStateValue<ParamType>(pname, texture->getCompareMode());
>@@ -183,13 +284,35 @@ void QueryTexParameterBase(const Texture *texture, GLenum pname, ParamType *para
>         case GL_TEXTURE_SRGB_DECODE_EXT:
>             *params = CastFromGLintStateValue<ParamType>(pname, texture->getSRGBDecode());
>             break;
>+        case GL_DEPTH_STENCIL_TEXTURE_MODE:
>+            *params =
>+                CastFromGLintStateValue<ParamType>(pname, texture->getDepthStencilTextureMode());
>+            break;
>+        case GL_TEXTURE_CROP_RECT_OES:
>+        {
>+            const gl::Rectangle &crop = texture->getCrop();
>+            params[0]                 = CastFromGLintStateValue<ParamType>(pname, crop.x);
>+            params[1]                 = CastFromGLintStateValue<ParamType>(pname, crop.y);
>+            params[2]                 = CastFromGLintStateValue<ParamType>(pname, crop.width);
>+            params[3]                 = CastFromGLintStateValue<ParamType>(pname, crop.height);
>+            break;
>+        }
>+        case GL_GENERATE_MIPMAP:
>+            *params = CastFromGLintStateValue<ParamType>(pname, texture->getGenerateMipmapHint());
>+            break;
>+        case GL_MEMORY_SIZE_ANGLE:
>+            *params = CastFromStateValue<ParamType>(pname, texture->getMemorySize());
>+            break;
>+        case GL_TEXTURE_BORDER_COLOR:
>+            ConvertFromColor<isPureInteger>(texture->getBorderColor(), params);
>+            break;
>         default:
>             UNREACHABLE();
>             break;
>     }
> }
> 
>-template <typename ParamType>
>+template <bool isPureInteger, typename ParamType>
> void SetTexParameterBase(Context *context, Texture *texture, GLenum pname, const ParamType *params)
> {
>     ASSERT(texture != nullptr);
>@@ -197,64 +320,77 @@ void SetTexParameterBase(Context *context, Texture *texture, GLenum pname, const
>     switch (pname)
>     {
>         case GL_TEXTURE_WRAP_S:
>-            texture->setWrapS(ConvertToGLenum(pname, params[0]));
>+            texture->setWrapS(context, ConvertToGLenum(pname, params[0]));
>             break;
>         case GL_TEXTURE_WRAP_T:
>-            texture->setWrapT(ConvertToGLenum(pname, params[0]));
>+            texture->setWrapT(context, ConvertToGLenum(pname, params[0]));
>             break;
>         case GL_TEXTURE_WRAP_R:
>-            texture->setWrapR(ConvertToGLenum(pname, params[0]));
>+            texture->setWrapR(context, ConvertToGLenum(pname, params[0]));
>             break;
>         case GL_TEXTURE_MIN_FILTER:
>-            texture->setMinFilter(ConvertToGLenum(pname, params[0]));
>+            texture->setMinFilter(context, ConvertToGLenum(pname, params[0]));
>             break;
>         case GL_TEXTURE_MAG_FILTER:
>-            texture->setMagFilter(ConvertToGLenum(pname, params[0]));
>+            texture->setMagFilter(context, ConvertToGLenum(pname, params[0]));
>             break;
>         case GL_TEXTURE_USAGE_ANGLE:
>-            texture->setUsage(ConvertToGLenum(pname, params[0]));
>+            texture->setUsage(context, ConvertToGLenum(pname, params[0]));
>             break;
>         case GL_TEXTURE_MAX_ANISOTROPY_EXT:
>-            texture->setMaxAnisotropy(CastQueryValueTo<GLfloat>(pname, params[0]));
>+            texture->setMaxAnisotropy(context, CastQueryValueTo<GLfloat>(pname, params[0]));
>             break;
>         case GL_TEXTURE_COMPARE_MODE:
>-            texture->setCompareMode(ConvertToGLenum(pname, params[0]));
>+            texture->setCompareMode(context, ConvertToGLenum(pname, params[0]));
>             break;
>         case GL_TEXTURE_COMPARE_FUNC:
>-            texture->setCompareFunc(ConvertToGLenum(pname, params[0]));
>+            texture->setCompareFunc(context, ConvertToGLenum(pname, params[0]));
>             break;
>         case GL_TEXTURE_SWIZZLE_R:
>-            texture->setSwizzleRed(ConvertToGLenum(pname, params[0]));
>+            texture->setSwizzleRed(context, ConvertToGLenum(pname, params[0]));
>             break;
>         case GL_TEXTURE_SWIZZLE_G:
>-            texture->setSwizzleGreen(ConvertToGLenum(pname, params[0]));
>+            texture->setSwizzleGreen(context, ConvertToGLenum(pname, params[0]));
>             break;
>         case GL_TEXTURE_SWIZZLE_B:
>-            texture->setSwizzleBlue(ConvertToGLenum(pname, params[0]));
>+            texture->setSwizzleBlue(context, ConvertToGLenum(pname, params[0]));
>             break;
>         case GL_TEXTURE_SWIZZLE_A:
>-            texture->setSwizzleAlpha(ConvertToGLenum(pname, params[0]));
>+            texture->setSwizzleAlpha(context, ConvertToGLenum(pname, params[0]));
>             break;
>         case GL_TEXTURE_BASE_LEVEL:
>         {
>-            context->handleError(texture->setBaseLevel(
>+            (void)(texture->setBaseLevel(
>                 context, clampCast<GLuint>(CastQueryValueTo<GLint>(pname, params[0]))));
>             break;
>         }
>         case GL_TEXTURE_MAX_LEVEL:
>-            texture->setMaxLevel(clampCast<GLuint>(CastQueryValueTo<GLint>(pname, params[0])));
>+            texture->setMaxLevel(context,
>+                                 clampCast<GLuint>(CastQueryValueTo<GLint>(pname, params[0])));
>             break;
>         case GL_TEXTURE_MIN_LOD:
>-            texture->setMinLod(CastQueryValueTo<GLfloat>(pname, params[0]));
>+            texture->setMinLod(context, CastQueryValueTo<GLfloat>(pname, params[0]));
>             break;
>         case GL_TEXTURE_MAX_LOD:
>-            texture->setMaxLod(CastQueryValueTo<GLfloat>(pname, params[0]));
>+            texture->setMaxLod(context, CastQueryValueTo<GLfloat>(pname, params[0]));
>             break;
>         case GL_DEPTH_STENCIL_TEXTURE_MODE:
>-            texture->setDepthStencilTextureMode(ConvertToGLenum(pname, params[0]));
>+            texture->setDepthStencilTextureMode(context, ConvertToGLenum(pname, params[0]));
>             break;
>         case GL_TEXTURE_SRGB_DECODE_EXT:
>-            texture->setSRGBDecode(ConvertToGLenum(pname, params[0]));
>+            texture->setSRGBDecode(context, ConvertToGLenum(pname, params[0]));
>+            break;
>+        case GL_TEXTURE_CROP_RECT_OES:
>+            texture->setCrop(gl::Rectangle(CastQueryValueTo<GLint>(pname, params[0]),
>+                                           CastQueryValueTo<GLint>(pname, params[1]),
>+                                           CastQueryValueTo<GLint>(pname, params[2]),
>+                                           CastQueryValueTo<GLint>(pname, params[3])));
>+            break;
>+        case GL_GENERATE_MIPMAP:
>+            texture->setGenerateMipmapHint(ConvertToGLenum(params[0]));
>+            break;
>+        case GL_TEXTURE_BORDER_COLOR:
>+            texture->setBorderColor(context, ConvertToColor<isPureInteger>(params));
>             break;
>         default:
>             UNREACHABLE();
>@@ -262,7 +398,7 @@ void SetTexParameterBase(Context *context, Texture *texture, GLenum pname, const
>     }
> }
> 
>-template <typename ParamType>
>+template <bool isPureInteger, typename ParamType>
> void QuerySamplerParameterBase(const Sampler *sampler, GLenum pname, ParamType *params)
> {
>     switch (pname)
>@@ -300,54 +436,65 @@ void QuerySamplerParameterBase(const Sampler *sampler, GLenum pname, ParamType *
>         case GL_TEXTURE_SRGB_DECODE_EXT:
>             *params = CastFromGLintStateValue<ParamType>(pname, sampler->getSRGBDecode());
>             break;
>+        case GL_TEXTURE_BORDER_COLOR:
>+            ConvertFromColor<isPureInteger>(sampler->getBorderColor(), params);
>+            break;
>         default:
>             UNREACHABLE();
>             break;
>     }
> }
> 
>-template <typename ParamType>
>-void SetSamplerParameterBase(Sampler *sampler, GLenum pname, const ParamType *params)
>+template <bool isPureInteger, typename ParamType>
>+void SetSamplerParameterBase(Context *context,
>+                             Sampler *sampler,
>+                             GLenum pname,
>+                             const ParamType *params)
> {
>     switch (pname)
>     {
>         case GL_TEXTURE_WRAP_S:
>-            sampler->setWrapS(ConvertToGLenum(pname, params[0]));
>+            sampler->setWrapS(context, ConvertToGLenum(pname, params[0]));
>             break;
>         case GL_TEXTURE_WRAP_T:
>-            sampler->setWrapT(ConvertToGLenum(pname, params[0]));
>+            sampler->setWrapT(context, ConvertToGLenum(pname, params[0]));
>             break;
>         case GL_TEXTURE_WRAP_R:
>-            sampler->setWrapR(ConvertToGLenum(pname, params[0]));
>+            sampler->setWrapR(context, ConvertToGLenum(pname, params[0]));
>             break;
>         case GL_TEXTURE_MIN_FILTER:
>-            sampler->setMinFilter(ConvertToGLenum(pname, params[0]));
>+            sampler->setMinFilter(context, ConvertToGLenum(pname, params[0]));
>             break;
>         case GL_TEXTURE_MAG_FILTER:
>-            sampler->setMagFilter(ConvertToGLenum(pname, params[0]));
>+            sampler->setMagFilter(context, ConvertToGLenum(pname, params[0]));
>             break;
>         case GL_TEXTURE_MAX_ANISOTROPY_EXT:
>-            sampler->setMaxAnisotropy(CastQueryValueTo<GLfloat>(pname, params[0]));
>+            sampler->setMaxAnisotropy(context, CastQueryValueTo<GLfloat>(pname, params[0]));
>             break;
>         case GL_TEXTURE_COMPARE_MODE:
>-            sampler->setCompareMode(ConvertToGLenum(pname, params[0]));
>+            sampler->setCompareMode(context, ConvertToGLenum(pname, params[0]));
>             break;
>         case GL_TEXTURE_COMPARE_FUNC:
>-            sampler->setCompareFunc(ConvertToGLenum(pname, params[0]));
>+            sampler->setCompareFunc(context, ConvertToGLenum(pname, params[0]));
>             break;
>         case GL_TEXTURE_MIN_LOD:
>-            sampler->setMinLod(CastQueryValueTo<GLfloat>(pname, params[0]));
>+            sampler->setMinLod(context, CastQueryValueTo<GLfloat>(pname, params[0]));
>             break;
>         case GL_TEXTURE_MAX_LOD:
>-            sampler->setMaxLod(CastQueryValueTo<GLfloat>(pname, params[0]));
>+            sampler->setMaxLod(context, CastQueryValueTo<GLfloat>(pname, params[0]));
>             break;
>         case GL_TEXTURE_SRGB_DECODE_EXT:
>-            sampler->setSRGBDecode(ConvertToGLenum(pname, params[0]));
>+            sampler->setSRGBDecode(context, ConvertToGLenum(pname, params[0]));
>+            break;
>+        case GL_TEXTURE_BORDER_COLOR:
>+            sampler->setBorderColor(context, ConvertToColor<isPureInteger>(params));
>             break;
>         default:
>             UNREACHABLE();
>             break;
>     }
>+
>+    sampler->onStateChange(context, angle::SubjectMessage::CONTENTS_CHANGED);
> }
> 
> // Warning: you should ensure binding really matches attrib.bindingIndex before using this function.
>@@ -376,7 +523,7 @@ void QueryVertexAttribBase(const VertexAttribute &attrib,
>             *params = CastFromGLintStateValue<ParamType>(pname, attrib.vertexAttribArrayStride);
>             break;
>         case GL_VERTEX_ATTRIB_ARRAY_TYPE:
>-            *params = CastFromGLintStateValue<ParamType>(pname, attrib.type);
>+            *params = CastFromGLintStateValue<ParamType>(pname, ToGLenum(attrib.type));
>             break;
>         case GL_VERTEX_ATTRIB_ARRAY_NORMALIZED:
>             *params = CastFromStateValue<ParamType>(pname, static_cast<GLint>(attrib.normalized));
>@@ -385,7 +532,7 @@ void QueryVertexAttribBase(const VertexAttribute &attrib,
>             *params = CastFromGLintStateValue<ParamType>(pname, binding.getBuffer().id());
>             break;
>         case GL_VERTEX_ATTRIB_ARRAY_DIVISOR:
>-            *params = CastFromGLintStateValue<ParamType>(pname, binding.getDivisor());
>+            *params = CastFromStateValue<ParamType>(pname, binding.getDivisor());
>             break;
>         case GL_VERTEX_ATTRIB_ARRAY_INTEGER:
>             *params = CastFromGLintStateValue<ParamType>(pname, attrib.pureInteger);
>@@ -430,6 +577,9 @@ void QueryBufferParameterBase(const Buffer *buffer, GLenum pname, ParamType *par
>         case GL_BUFFER_MAP_LENGTH:
>             *params = CastFromStateValue<ParamType>(pname, buffer->getMapLength());
>             break;
>+        case GL_MEMORY_SIZE_ANGLE:
>+            *params = CastFromStateValue<ParamType>(pname, buffer->getMemorySize());
>+            break;
>         default:
>             UNREACHABLE();
>             break;
>@@ -476,6 +626,7 @@ GLint GetInputResourceProperty(const Program *program, GLuint index, GLenum prop
> 
>         case GL_REFERENCED_BY_FRAGMENT_SHADER:
>         case GL_REFERENCED_BY_COMPUTE_SHADER:
>+        case GL_REFERENCED_BY_GEOMETRY_SHADER_EXT:
>             return 0;
> 
>         default:
>@@ -497,13 +648,16 @@ GLint GetOutputResourceProperty(const Program *program, GLuint index, const GLen
>         case GL_LOCATION:
>             return program->getFragDataLocation(outputVariable.name);
> 
>-        case GL_REFERENCED_BY_VERTEX_SHADER:
>-            return 0;
>+        case GL_LOCATION_INDEX_EXT:
>+            // EXT_blend_func_extended
>+            return program->getFragDataIndex(outputVariable.name);
> 
>         case GL_REFERENCED_BY_FRAGMENT_SHADER:
>             return 1;
> 
>+        case GL_REFERENCED_BY_VERTEX_SHADER:
>         case GL_REFERENCED_BY_COMPUTE_SHADER:
>+        case GL_REFERENCED_BY_GEOMETRY_SHADER_EXT:
>             return 0;
> 
>         default:
>@@ -512,6 +666,28 @@ GLint GetOutputResourceProperty(const Program *program, GLuint index, const GLen
>     }
> }
> 
>+GLint GetTransformFeedbackVaryingResourceProperty(const Program *program,
>+                                                  GLuint index,
>+                                                  const GLenum prop)
>+{
>+    const auto &tfVariable = program->getTransformFeedbackVaryingResource(index);
>+    switch (prop)
>+    {
>+        case GL_TYPE:
>+            return clampCast<GLint>(tfVariable.type);
>+
>+        case GL_ARRAY_SIZE:
>+            return clampCast<GLint>(tfVariable.size());
>+
>+        case GL_NAME_LENGTH:
>+            return clampCast<GLint>(tfVariable.nameWithArrayIndex().size() + 1);
>+
>+        default:
>+            UNREACHABLE();
>+            return GL_INVALID_VALUE;
>+    }
>+}
>+
> GLint QueryProgramInterfaceActiveResources(const Program *program, GLenum programInterface)
> {
>     switch (programInterface)
>@@ -537,10 +713,8 @@ GLint QueryProgramInterfaceActiveResources(const Program *program, GLenum progra
>         case GL_SHADER_STORAGE_BLOCK:
>             return clampCast<GLint>(program->getState().getShaderStorageBlocks().size());
> 
>-        // TODO(jie.a.chen@intel.com): more interfaces.
>         case GL_TRANSFORM_FEEDBACK_VARYING:
>-            UNIMPLEMENTED();
>-            return 0;
>+            return clampCast<GLint>(program->getTransformFeedbackVaryingCount());
> 
>         default:
>             UNREACHABLE();
>@@ -578,9 +752,7 @@ GLint QueryProgramInterfaceMaxNameLength(const Program *program, GLenum programI
>             break;
> 
>         case GL_UNIFORM_BLOCK:
>-            maxNameLength =
>-                FindMaxSize(program->getState().getUniformBlocks(), &InterfaceBlock::name);
>-            break;
>+            return program->getActiveUniformBlockMaxNameLength();
> 
>         case GL_BUFFER_VARIABLE:
>             maxNameLength =
>@@ -588,14 +760,10 @@ GLint QueryProgramInterfaceMaxNameLength(const Program *program, GLenum programI
>             break;
> 
>         case GL_SHADER_STORAGE_BLOCK:
>-            maxNameLength =
>-                FindMaxSize(program->getState().getShaderStorageBlocks(), &InterfaceBlock::name);
>-            break;
>+            return program->getActiveShaderStorageBlockMaxNameLength();
> 
>-        // TODO(jie.a.chen@intel.com): more interfaces.
>         case GL_TRANSFORM_FEEDBACK_VARYING:
>-            UNIMPLEMENTED();
>-            return 0;
>+            return clampCast<GLint>(program->getTransformFeedbackVaryingMaxLength());
> 
>         default:
>             UNREACHABLE();
>@@ -709,13 +877,16 @@ void GetShaderVariableBufferResourceProperty(const ShaderVariableBuffer &buffer,
>             }
>             break;
>         case GL_REFERENCED_BY_VERTEX_SHADER:
>-            params[(*outputPosition)++] = static_cast<GLint>(buffer.vertexStaticUse);
>+            params[(*outputPosition)++] = static_cast<GLint>(buffer.isActive(ShaderType::Vertex));
>             break;
>         case GL_REFERENCED_BY_FRAGMENT_SHADER:
>-            params[(*outputPosition)++] = static_cast<GLint>(buffer.fragmentStaticUse);
>+            params[(*outputPosition)++] = static_cast<GLint>(buffer.isActive(ShaderType::Fragment));
>             break;
>         case GL_REFERENCED_BY_COMPUTE_SHADER:
>-            params[(*outputPosition)++] = static_cast<GLint>(buffer.computeStaticUse);
>+            params[(*outputPosition)++] = static_cast<GLint>(buffer.isActive(ShaderType::Compute));
>+            break;
>+        case GL_REFERENCED_BY_GEOMETRY_SHADER_EXT:
>+            params[(*outputPosition)++] = static_cast<GLint>(buffer.isActive(ShaderType::Geometry));
>             break;
>         default:
>             UNREACHABLE();
>@@ -776,16 +947,44 @@ void GetAtomicCounterBufferResourceProperty(const Program *program,
>     GetShaderVariableBufferResourceProperty(buffer, pname, params, bufSize, outputPosition);
> }
> 
>+bool IsTextureEnvEnumParameter(TextureEnvParameter pname)
>+{
>+    switch (pname)
>+    {
>+        case TextureEnvParameter::Mode:
>+        case TextureEnvParameter::CombineRgb:
>+        case TextureEnvParameter::CombineAlpha:
>+        case TextureEnvParameter::Src0Rgb:
>+        case TextureEnvParameter::Src1Rgb:
>+        case TextureEnvParameter::Src2Rgb:
>+        case TextureEnvParameter::Src0Alpha:
>+        case TextureEnvParameter::Src1Alpha:
>+        case TextureEnvParameter::Src2Alpha:
>+        case TextureEnvParameter::Op0Rgb:
>+        case TextureEnvParameter::Op1Rgb:
>+        case TextureEnvParameter::Op2Rgb:
>+        case TextureEnvParameter::Op0Alpha:
>+        case TextureEnvParameter::Op1Alpha:
>+        case TextureEnvParameter::Op2Alpha:
>+        case TextureEnvParameter::PointCoordReplace:
>+            return true;
>+        default:
>+            return false;
>+    }
>+}
>+
> }  // anonymous namespace
> 
>-void QueryFramebufferAttachmentParameteriv(const Framebuffer *framebuffer,
>+void QueryFramebufferAttachmentParameteriv(const Context *context,
>+                                           const Framebuffer *framebuffer,
>                                            GLenum attachment,
>                                            GLenum pname,
>                                            GLint *params)
> {
>     ASSERT(framebuffer);
> 
>-    const FramebufferAttachment *attachmentObject = framebuffer->getAttachment(attachment);
>+    const FramebufferAttachment *attachmentObject = framebuffer->getAttachment(context, attachment);
>+
>     if (attachmentObject == nullptr)
>     {
>         // ES 2.0.25 spec pg 127 states that if the value of FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE
>@@ -828,8 +1027,19 @@ void QueryFramebufferAttachmentParameteriv(const Framebuffer *framebuffer,
>             break;
> 
>         case GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE:
>-            *params = attachmentObject->cubeMapFace();
>-            break;
>+        {
>+            TextureTarget face = attachmentObject->cubeMapFace();
>+            if (face != TextureTarget::InvalidEnum)
>+            {
>+                *params = ToGLenum(attachmentObject->cubeMapFace());
>+            }
>+            else
>+            {
>+                // This happens when the attachment isn't a texture cube map face
>+                *params = GL_NONE;
>+            }
>+        }
>+        break;
> 
>         case GL_FRAMEBUFFER_ATTACHMENT_RED_SIZE:
>             *params = attachmentObject->getRedSize();
>@@ -867,28 +1077,17 @@ void QueryFramebufferAttachmentParameteriv(const Framebuffer *framebuffer,
>             *params = attachmentObject->layer();
>             break;
> 
>-        case GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_NUM_VIEWS_ANGLE:
>+        case GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_NUM_VIEWS_OVR:
>             *params = attachmentObject->getNumViews();
>             break;
> 
>-        case GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_MULTIVIEW_LAYOUT_ANGLE:
>-            *params = static_cast<GLint>(attachmentObject->getMultiviewLayout());
>-            break;
>-
>-        case GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_BASE_VIEW_INDEX_ANGLE:
>+        case GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_BASE_VIEW_INDEX_OVR:
>             *params = attachmentObject->getBaseViewIndex();
>             break;
> 
>-        case GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_VIEWPORT_OFFSETS_ANGLE:
>-        {
>-            const std::vector<Offset> &offsets = attachmentObject->getMultiviewViewportOffsets();
>-            for (size_t i = 0u; i < offsets.size(); ++i)
>-            {
>-                params[i * 2u]      = offsets[i].x;
>-                params[i * 2u + 1u] = offsets[i].y;
>-            }
>-        }
>-        break;
>+        case GL_FRAMEBUFFER_ATTACHMENT_LAYERED_EXT:
>+            *params = attachmentObject->isLayered();
>+            break;
> 
>         default:
>             UNREACHABLE();
>@@ -920,9 +1119,9 @@ void QueryBufferPointerv(const Buffer *buffer, GLenum pname, void **params)
>     }
> }
> 
>-void QueryProgramiv(const Context *context, const Program *program, GLenum pname, GLint *params)
>+void QueryProgramiv(Context *context, const Program *program, GLenum pname, GLint *params)
> {
>-    ASSERT(program != nullptr);
>+    ASSERT(program != nullptr || pname == GL_COMPLETION_STATUS_KHR);
> 
>     switch (pname)
>     {
>@@ -932,6 +1131,16 @@ void QueryProgramiv(const Context *context, const Program *program, GLenum pname
>         case GL_LINK_STATUS:
>             *params = program->isLinked();
>             return;
>+        case GL_COMPLETION_STATUS_KHR:
>+            if (context->isContextLost())
>+            {
>+                *params = GL_TRUE;
>+            }
>+            else
>+            {
>+                *params = program->isLinking() ? GL_FALSE : GL_TRUE;
>+            }
>+            return;
>         case GL_VALIDATE_STATUS:
>             *params = program->isValidated();
>             return;
>@@ -954,19 +1163,21 @@ void QueryProgramiv(const Context *context, const Program *program, GLenum pname
>             *params = program->getActiveUniformMaxLength();
>             return;
>         case GL_PROGRAM_BINARY_LENGTH_OES:
>-            *params = program->getBinaryLength(context);
>+            *params = context->getCaps().programBinaryFormats.empty()
>+                          ? 0
>+                          : program->getBinaryLength(context);
>             return;
>         case GL_ACTIVE_UNIFORM_BLOCKS:
>             *params = program->getActiveUniformBlockCount();
>             return;
>         case GL_ACTIVE_UNIFORM_BLOCK_MAX_NAME_LENGTH:
>-            *params = program->getActiveUniformBlockMaxLength();
>+            *params = program->getActiveUniformBlockMaxNameLength();
>             break;
>         case GL_TRANSFORM_FEEDBACK_BUFFER_MODE:
>             *params = program->getTransformFeedbackBufferMode();
>             break;
>         case GL_TRANSFORM_FEEDBACK_VARYINGS:
>-            *params = program->getTransformFeedbackVaryingCount();
>+            *params = clampCast<GLint>(program->getTransformFeedbackVaryingCount());
>             break;
>         case GL_TRANSFORM_FEEDBACK_VARYING_MAX_LENGTH:
>             *params = program->getTransformFeedbackVaryingMaxLength();
>@@ -988,6 +1199,18 @@ void QueryProgramiv(const Context *context, const Program *program, GLenum pname
>         case GL_ACTIVE_ATOMIC_COUNTER_BUFFERS:
>             *params = program->getActiveAtomicCounterBufferCount();
>             break;
>+        case GL_GEOMETRY_LINKED_INPUT_TYPE_EXT:
>+            *params = ToGLenum(program->getGeometryShaderInputPrimitiveType());
>+            break;
>+        case GL_GEOMETRY_LINKED_OUTPUT_TYPE_EXT:
>+            *params = ToGLenum(program->getGeometryShaderOutputPrimitiveType());
>+            break;
>+        case GL_GEOMETRY_LINKED_VERTICES_OUT_EXT:
>+            *params = program->getGeometryShaderMaxVertices();
>+            break;
>+        case GL_GEOMETRY_SHADER_INVOCATIONS_EXT:
>+            *params = program->getGeometryShaderInvocations();
>+            break;
>         default:
>             UNREACHABLE();
>             break;
>@@ -1042,6 +1265,9 @@ void QueryRenderbufferiv(const Context *context,
>         case GL_RENDERBUFFER_SAMPLES_ANGLE:
>             *params = renderbuffer->getSamples();
>             break;
>+        case GL_MEMORY_SIZE_ANGLE:
>+            *params = renderbuffer->getMemorySize();
>+            break;
>         default:
>             UNREACHABLE();
>             break;
>@@ -1050,27 +1276,37 @@ void QueryRenderbufferiv(const Context *context,
> 
> void QueryShaderiv(const Context *context, Shader *shader, GLenum pname, GLint *params)
> {
>-    ASSERT(shader != nullptr);
>+    ASSERT(shader != nullptr || pname == GL_COMPLETION_STATUS_KHR);
> 
>     switch (pname)
>     {
>         case GL_SHADER_TYPE:
>-            *params = shader->getType();
>+            *params = static_cast<GLint>(ToGLenum(shader->getType()));
>             return;
>         case GL_DELETE_STATUS:
>             *params = shader->isFlaggedForDeletion();
>             return;
>         case GL_COMPILE_STATUS:
>-            *params = shader->isCompiled(context) ? GL_TRUE : GL_FALSE;
>+            *params = shader->isCompiled() ? GL_TRUE : GL_FALSE;
>+            return;
>+        case GL_COMPLETION_STATUS_KHR:
>+            if (context->isContextLost())
>+            {
>+                *params = GL_TRUE;
>+            }
>+            else
>+            {
>+                *params = shader->isCompleted() ? GL_TRUE : GL_FALSE;
>+            }
>             return;
>         case GL_INFO_LOG_LENGTH:
>-            *params = shader->getInfoLogLength(context);
>+            *params = shader->getInfoLogLength();
>             return;
>         case GL_SHADER_SOURCE_LENGTH:
>             *params = shader->getSourceLength();
>             return;
>         case GL_TRANSLATED_SHADER_SOURCE_LENGTH_ANGLE:
>-            *params = shader->getTranslatedSourceWithDebugInfoLength(context);
>+            *params = shader->getTranslatedSourceWithDebugInfoLength();
>             return;
>         default:
>             UNREACHABLE();
>@@ -1079,7 +1315,7 @@ void QueryShaderiv(const Context *context, Shader *shader, GLenum pname, GLint *
> }
> 
> void QueryTexLevelParameterfv(const Texture *texture,
>-                              GLenum target,
>+                              TextureTarget target,
>                               GLint level,
>                               GLenum pname,
>                               GLfloat *params)
>@@ -1088,7 +1324,7 @@ void QueryTexLevelParameterfv(const Texture *texture,
> }
> 
> void QueryTexLevelParameteriv(const Texture *texture,
>-                              GLenum target,
>+                              TextureTarget target,
>                               GLint level,
>                               GLenum pname,
>                               GLint *params)
>@@ -1098,22 +1334,42 @@ void QueryTexLevelParameteriv(const Texture *texture,
> 
> void QueryTexParameterfv(const Texture *texture, GLenum pname, GLfloat *params)
> {
>-    QueryTexParameterBase(texture, pname, params);
>+    QueryTexParameterBase<false>(texture, pname, params);
> }
> 
> void QueryTexParameteriv(const Texture *texture, GLenum pname, GLint *params)
> {
>-    QueryTexParameterBase(texture, pname, params);
>+    QueryTexParameterBase<false>(texture, pname, params);
>+}
>+
>+void QueryTexParameterIiv(const Texture *texture, GLenum pname, GLint *params)
>+{
>+    QueryTexParameterBase<true>(texture, pname, params);
>+}
>+
>+void QueryTexParameterIuiv(const Texture *texture, GLenum pname, GLuint *params)
>+{
>+    QueryTexParameterBase<true>(texture, pname, params);
> }
> 
> void QuerySamplerParameterfv(const Sampler *sampler, GLenum pname, GLfloat *params)
> {
>-    QuerySamplerParameterBase(sampler, pname, params);
>+    QuerySamplerParameterBase<false>(sampler, pname, params);
> }
> 
> void QuerySamplerParameteriv(const Sampler *sampler, GLenum pname, GLint *params)
> {
>-    QuerySamplerParameterBase(sampler, pname, params);
>+    QuerySamplerParameterBase<false>(sampler, pname, params);
>+}
>+
>+void QuerySamplerParameterIiv(const Sampler *sampler, GLenum pname, GLint *params)
>+{
>+    QuerySamplerParameterBase<true>(sampler, pname, params);
>+}
>+
>+void QuerySamplerParameterIuiv(const Sampler *sampler, GLenum pname, GLuint *params)
>+{
>+    QuerySamplerParameterBase<true>(sampler, pname, params);
> }
> 
> void QueryVertexAttribfv(const VertexAttribute &attrib,
>@@ -1222,15 +1478,23 @@ void QueryFramebufferParameteriv(const Framebuffer *framebuffer, GLenum pname, G
>         case GL_FRAMEBUFFER_DEFAULT_FIXED_SAMPLE_LOCATIONS:
>             *params = ConvertToGLBoolean(framebuffer->getDefaultFixedSampleLocations());
>             break;
>+        case GL_FRAMEBUFFER_DEFAULT_LAYERS_EXT:
>+            *params = framebuffer->getDefaultLayers();
>+            break;
>         default:
>             UNREACHABLE();
>             break;
>     }
> }
> 
>-Error QuerySynciv(const Sync *sync, GLenum pname, GLsizei bufSize, GLsizei *length, GLint *values)
>+angle::Result QuerySynciv(const Context *context,
>+                          const Sync *sync,
>+                          GLenum pname,
>+                          GLsizei bufSize,
>+                          GLsizei *length,
>+                          GLint *values)
> {
>-    ASSERT(sync);
>+    ASSERT(sync != nullptr || pname == GL_SYNC_STATUS);
> 
>     // All queries return one value, exit early if the buffer can't fit anything.
>     if (bufSize < 1)
>@@ -1239,7 +1503,7 @@ Error QuerySynciv(const Sync *sync, GLenum pname, GLsizei bufSize, GLsizei *leng
>         {
>             *length = 0;
>         }
>-        return NoError();
>+        return angle::Result::Continue;
>     }
> 
>     switch (pname)
>@@ -1254,7 +1518,14 @@ Error QuerySynciv(const Sync *sync, GLenum pname, GLsizei bufSize, GLsizei *leng
>             *values = clampCast<GLint>(sync->getFlags());
>             break;
>         case GL_SYNC_STATUS:
>-            ANGLE_TRY(sync->getStatus(values));
>+            if (context->isContextLost())
>+            {
>+                *values = GL_SIGNALED;
>+            }
>+            else
>+            {
>+                ANGLE_TRY(sync->getStatus(context, values));
>+            }
>             break;
> 
>         default:
>@@ -1267,66 +1538,92 @@ Error QuerySynciv(const Sync *sync, GLenum pname, GLsizei bufSize, GLsizei *leng
>         *length = 1;
>     }
> 
>-    return NoError();
>+    return angle::Result::Continue;
> }
> 
> void SetTexParameterf(Context *context, Texture *texture, GLenum pname, GLfloat param)
> {
>-    SetTexParameterBase(context, texture, pname, &param);
>+    SetTexParameterBase<false>(context, texture, pname, &param);
> }
> 
> void SetTexParameterfv(Context *context, Texture *texture, GLenum pname, const GLfloat *params)
> {
>-    SetTexParameterBase(context, texture, pname, params);
>+    SetTexParameterBase<false>(context, texture, pname, params);
> }
> 
> void SetTexParameteri(Context *context, Texture *texture, GLenum pname, GLint param)
> {
>-    SetTexParameterBase(context, texture, pname, &param);
>+    SetTexParameterBase<false>(context, texture, pname, &param);
> }
> 
> void SetTexParameteriv(Context *context, Texture *texture, GLenum pname, const GLint *params)
> {
>-    SetTexParameterBase(context, texture, pname, params);
>+    SetTexParameterBase<false>(context, texture, pname, params);
>+}
>+
>+void SetTexParameterIiv(Context *context, Texture *texture, GLenum pname, const GLint *params)
>+{
>+    SetTexParameterBase<true>(context, texture, pname, params);
>+}
>+
>+void SetTexParameterIuiv(Context *context, Texture *texture, GLenum pname, const GLuint *params)
>+{
>+    SetTexParameterBase<true>(context, texture, pname, params);
>+}
>+
>+void SetSamplerParameterf(Context *context, Sampler *sampler, GLenum pname, GLfloat param)
>+{
>+    SetSamplerParameterBase<false>(context, sampler, pname, &param);
>+}
>+
>+void SetSamplerParameterfv(Context *context, Sampler *sampler, GLenum pname, const GLfloat *params)
>+{
>+    SetSamplerParameterBase<false>(context, sampler, pname, params);
> }
> 
>-void SetSamplerParameterf(Sampler *sampler, GLenum pname, GLfloat param)
>+void SetSamplerParameteri(Context *context, Sampler *sampler, GLenum pname, GLint param)
> {
>-    SetSamplerParameterBase(sampler, pname, &param);
>+    SetSamplerParameterBase<false>(context, sampler, pname, &param);
> }
> 
>-void SetSamplerParameterfv(Sampler *sampler, GLenum pname, const GLfloat *params)
>+void SetSamplerParameteriv(Context *context, Sampler *sampler, GLenum pname, const GLint *params)
> {
>-    SetSamplerParameterBase(sampler, pname, params);
>+    SetSamplerParameterBase<false>(context, sampler, pname, params);
> }
> 
>-void SetSamplerParameteri(Sampler *sampler, GLenum pname, GLint param)
>+void SetSamplerParameterIiv(Context *context, Sampler *sampler, GLenum pname, const GLint *params)
> {
>-    SetSamplerParameterBase(sampler, pname, &param);
>+    SetSamplerParameterBase<true>(context, sampler, pname, params);
> }
> 
>-void SetSamplerParameteriv(Sampler *sampler, GLenum pname, const GLint *params)
>+void SetSamplerParameterIuiv(Context *context, Sampler *sampler, GLenum pname, const GLuint *params)
> {
>-    SetSamplerParameterBase(sampler, pname, params);
>+    SetSamplerParameterBase<true>(context, sampler, pname, params);
> }
> 
>-void SetFramebufferParameteri(Framebuffer *framebuffer, GLenum pname, GLint param)
>+void SetFramebufferParameteri(const Context *context,
>+                              Framebuffer *framebuffer,
>+                              GLenum pname,
>+                              GLint param)
> {
>     ASSERT(framebuffer);
> 
>     switch (pname)
>     {
>         case GL_FRAMEBUFFER_DEFAULT_WIDTH:
>-            framebuffer->setDefaultWidth(param);
>+            framebuffer->setDefaultWidth(context, param);
>             break;
>         case GL_FRAMEBUFFER_DEFAULT_HEIGHT:
>-            framebuffer->setDefaultHeight(param);
>+            framebuffer->setDefaultHeight(context, param);
>             break;
>         case GL_FRAMEBUFFER_DEFAULT_SAMPLES:
>-            framebuffer->setDefaultSamples(param);
>+            framebuffer->setDefaultSamples(context, param);
>             break;
>         case GL_FRAMEBUFFER_DEFAULT_FIXED_SAMPLE_LOCATIONS:
>-            framebuffer->setDefaultFixedSampleLocations(ConvertToBool(param));
>+            framebuffer->setDefaultFixedSampleLocations(context, ConvertToBool(param));
>+            break;
>+        case GL_FRAMEBUFFER_DEFAULT_LAYERS_EXT:
>+            framebuffer->setDefaultLayers(param);
>             break;
>         default:
>             UNREACHABLE();
>@@ -1382,13 +1679,16 @@ GLint GetUniformResourceProperty(const Program *program, GLuint index, const GLe
>             return static_cast<GLint>(uniform.blockInfo.isRowMajorMatrix);
> 
>         case GL_REFERENCED_BY_VERTEX_SHADER:
>-            return uniform.vertexStaticUse;
>+            return uniform.isActive(ShaderType::Vertex);
> 
>         case GL_REFERENCED_BY_FRAGMENT_SHADER:
>-            return uniform.fragmentStaticUse;
>+            return uniform.isActive(ShaderType::Fragment);
> 
>         case GL_REFERENCED_BY_COMPUTE_SHADER:
>-            return uniform.computeStaticUse;
>+            return uniform.isActive(ShaderType::Compute);
>+
>+        case GL_REFERENCED_BY_GEOMETRY_SHADER_EXT:
>+            return uniform.isActive(ShaderType::Geometry);
> 
>         case GL_ATOMIC_COUNTER_BUFFER_INDEX:
>             return (uniform.isAtomicCounter() ? uniform.bufferIndex : -1);
>@@ -1425,13 +1725,16 @@ GLint GetBufferVariableResourceProperty(const Program *program, GLuint index, co
>             return static_cast<GLint>(bufferVariable.blockInfo.isRowMajorMatrix);
> 
>         case GL_REFERENCED_BY_VERTEX_SHADER:
>-            return bufferVariable.vertexStaticUse;
>+            return bufferVariable.isActive(ShaderType::Vertex);
> 
>         case GL_REFERENCED_BY_FRAGMENT_SHADER:
>-            return bufferVariable.fragmentStaticUse;
>+            return bufferVariable.isActive(ShaderType::Fragment);
> 
>         case GL_REFERENCED_BY_COMPUTE_SHADER:
>-            return bufferVariable.computeStaticUse;
>+            return bufferVariable.isActive(ShaderType::Compute);
>+
>+        case GL_REFERENCED_BY_GEOMETRY_SHADER_EXT:
>+            return bufferVariable.isActive(ShaderType::Geometry);
> 
>         case GL_TOP_LEVEL_ARRAY_SIZE:
>             return bufferVariable.topLevelArraySize;
>@@ -1469,10 +1772,8 @@ GLuint QueryProgramResourceIndex(const Program *program,
>         case GL_UNIFORM_BLOCK:
>             return program->getUniformBlockIndex(name);
> 
>-        // TODO(jie.a.chen@intel.com): more interfaces.
>         case GL_TRANSFORM_FEEDBACK_VARYING:
>-            UNIMPLEMENTED();
>-            return GL_INVALID_INDEX;
>+            return program->getTransformFeedbackVaryingResourceIndex(name);
> 
>         default:
>             UNREACHABLE();
>@@ -1513,9 +1814,8 @@ void QueryProgramResourceName(const Program *program,
>             program->getActiveUniformBlockName(index, bufSize, length, name);
>             break;
> 
>-        // TODO(jie.a.chen@intel.com): more interfaces.
>         case GL_TRANSFORM_FEEDBACK_VARYING:
>-            UNIMPLEMENTED();
>+            program->getTransformFeedbackVarying(index, bufSize, length, nullptr, nullptr, name);
>             break;
> 
>         default:
>@@ -1600,10 +1900,10 @@ void QueryProgramResourceiv(const Program *program,
>                 GetAtomicCounterBufferResourceProperty(program, index, props[i], params, bufSize,
>                                                        &pos);
>                 break;
>-            // TODO(jie.a.chen@intel.com): more interfaces.
>+
>             case GL_TRANSFORM_FEEDBACK_VARYING:
>-                UNIMPLEMENTED();
>-                params[i] = GL_INVALID_VALUE;
>+                params[i] = GetTransformFeedbackVaryingResourceProperty(program, index, props[i]);
>+                ++pos;
>                 break;
> 
>             default:
>@@ -1648,63 +1948,872 @@ void QueryProgramInterfaceiv(const Program *program,
>     }
> }
> 
>-}  // namespace gl
>+ClientVertexArrayType ParamToVertexArrayType(GLenum param)
>+{
>+    switch (param)
>+    {
>+        case GL_VERTEX_ARRAY:
>+        case GL_VERTEX_ARRAY_BUFFER_BINDING:
>+        case GL_VERTEX_ARRAY_STRIDE:
>+        case GL_VERTEX_ARRAY_SIZE:
>+        case GL_VERTEX_ARRAY_TYPE:
>+        case GL_VERTEX_ARRAY_POINTER:
>+            return ClientVertexArrayType::Vertex;
>+        case GL_NORMAL_ARRAY:
>+        case GL_NORMAL_ARRAY_BUFFER_BINDING:
>+        case GL_NORMAL_ARRAY_STRIDE:
>+        case GL_NORMAL_ARRAY_TYPE:
>+        case GL_NORMAL_ARRAY_POINTER:
>+            return ClientVertexArrayType::Normal;
>+        case GL_COLOR_ARRAY:
>+        case GL_COLOR_ARRAY_BUFFER_BINDING:
>+        case GL_COLOR_ARRAY_STRIDE:
>+        case GL_COLOR_ARRAY_SIZE:
>+        case GL_COLOR_ARRAY_TYPE:
>+        case GL_COLOR_ARRAY_POINTER:
>+            return ClientVertexArrayType::Color;
>+        case GL_POINT_SIZE_ARRAY_OES:
>+        case GL_POINT_SIZE_ARRAY_BUFFER_BINDING_OES:
>+        case GL_POINT_SIZE_ARRAY_STRIDE_OES:
>+        case GL_POINT_SIZE_ARRAY_TYPE_OES:
>+        case GL_POINT_SIZE_ARRAY_POINTER_OES:
>+            return ClientVertexArrayType::PointSize;
>+        case GL_TEXTURE_COORD_ARRAY:
>+        case GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING:
>+        case GL_TEXTURE_COORD_ARRAY_STRIDE:
>+        case GL_TEXTURE_COORD_ARRAY_SIZE:
>+        case GL_TEXTURE_COORD_ARRAY_TYPE:
>+        case GL_TEXTURE_COORD_ARRAY_POINTER:
>+            return ClientVertexArrayType::TextureCoord;
>+        default:
>+            UNREACHABLE();
>+            return ClientVertexArrayType::InvalidEnum;
>+    }
>+}
> 
>-namespace egl
>+void SetLightModelParameters(GLES1State *state, GLenum pname, const GLfloat *params)
> {
>+    LightModelParameters &lightModel = state->lightModelParameters();
> 
>-void QueryConfigAttrib(const Config *config, EGLint attribute, EGLint *value)
>+    switch (pname)
>+    {
>+        case GL_LIGHT_MODEL_AMBIENT:
>+            lightModel.color = ColorF::fromData(params);
>+            break;
>+        case GL_LIGHT_MODEL_TWO_SIDE:
>+            lightModel.twoSided = *params == 1.0f ? true : false;
>+            break;
>+        default:
>+            break;
>+    }
>+}
>+
>+void GetLightModelParameters(const GLES1State *state, GLenum pname, GLfloat *params)
> {
>-    ASSERT(config != nullptr);
>-    switch (attribute)
>+    const LightModelParameters &lightModel = state->lightModelParameters();
>+
>+    switch (pname)
>     {
>-        case EGL_BUFFER_SIZE:
>-            *value = config->bufferSize;
>+        case GL_LIGHT_MODEL_TWO_SIDE:
>+            *params = lightModel.twoSided ? 1.0f : 0.0f;
>             break;
>-        case EGL_ALPHA_SIZE:
>-            *value = config->alphaSize;
>+        case GL_LIGHT_MODEL_AMBIENT:
>+            lightModel.color.writeData(params);
>             break;
>-        case EGL_BLUE_SIZE:
>-            *value = config->blueSize;
>+        default:
>             break;
>-        case EGL_GREEN_SIZE:
>-            *value = config->greenSize;
>+    }
>+}
>+
>+bool IsLightModelTwoSided(const GLES1State *state)
>+{
>+    return state->lightModelParameters().twoSided;
>+}
>+
>+void SetLightParameters(GLES1State *state,
>+                        GLenum light,
>+                        LightParameter pname,
>+                        const GLfloat *params)
>+{
>+    uint32_t lightIndex = light - GL_LIGHT0;
>+
>+    LightParameters &lightParams = state->lightParameters(lightIndex);
>+
>+    switch (pname)
>+    {
>+        case LightParameter::Ambient:
>+            lightParams.ambient = ColorF::fromData(params);
>             break;
>-        case EGL_RED_SIZE:
>-            *value = config->redSize;
>+        case LightParameter::Diffuse:
>+            lightParams.diffuse = ColorF::fromData(params);
>             break;
>-        case EGL_DEPTH_SIZE:
>-            *value = config->depthSize;
>+        case LightParameter::Specular:
>+            lightParams.specular = ColorF::fromData(params);
>             break;
>-        case EGL_STENCIL_SIZE:
>-            *value = config->stencilSize;
>+        case LightParameter::Position:
>+        {
>+            angle::Mat4 mv = state->getModelviewMatrix();
>+            angle::Vector4 transformedPos =
>+                mv.product(angle::Vector4(params[0], params[1], params[2], params[3]));
>+            lightParams.position[0] = transformedPos[0];
>+            lightParams.position[1] = transformedPos[1];
>+            lightParams.position[2] = transformedPos[2];
>+            lightParams.position[3] = transformedPos[3];
>+        }
>+        break;
>+        case LightParameter::SpotDirection:
>+        {
>+            angle::Mat4 mv = state->getModelviewMatrix();
>+            angle::Vector4 transformedPos =
>+                mv.product(angle::Vector4(params[0], params[1], params[2], 0.0f));
>+            lightParams.direction[0] = transformedPos[0];
>+            lightParams.direction[1] = transformedPos[1];
>+            lightParams.direction[2] = transformedPos[2];
>+        }
>+        break;
>+        case LightParameter::SpotExponent:
>+            lightParams.spotlightExponent = *params;
>             break;
>-        case EGL_CONFIG_CAVEAT:
>-            *value = config->configCaveat;
>+        case LightParameter::SpotCutoff:
>+            lightParams.spotlightCutoffAngle = *params;
>             break;
>-        case EGL_CONFIG_ID:
>-            *value = config->configID;
>+        case LightParameter::ConstantAttenuation:
>+            lightParams.attenuationConst = *params;
>             break;
>-        case EGL_LEVEL:
>-            *value = config->level;
>+        case LightParameter::LinearAttenuation:
>+            lightParams.attenuationLinear = *params;
>             break;
>-        case EGL_NATIVE_RENDERABLE:
>-            *value = config->nativeRenderable;
>+        case LightParameter::QuadraticAttenuation:
>+            lightParams.attenuationQuadratic = *params;
>             break;
>-        case EGL_NATIVE_VISUAL_ID:
>-            *value = config->nativeVisualID;
>+        default:
>+            return;
>+    }
>+}
>+
>+void GetLightParameters(const GLES1State *state,
>+                        GLenum light,
>+                        LightParameter pname,
>+                        GLfloat *params)
>+{
>+    uint32_t lightIndex                = light - GL_LIGHT0;
>+    const LightParameters &lightParams = state->lightParameters(lightIndex);
>+
>+    switch (pname)
>+    {
>+        case LightParameter::Ambient:
>+            lightParams.ambient.writeData(params);
>             break;
>-        case EGL_NATIVE_VISUAL_TYPE:
>-            *value = config->nativeVisualType;
>+        case LightParameter::Diffuse:
>+            lightParams.diffuse.writeData(params);
>             break;
>-        case EGL_SAMPLES:
>-            *value = config->samples;
>+        case LightParameter::Specular:
>+            lightParams.specular.writeData(params);
>             break;
>-        case EGL_SAMPLE_BUFFERS:
>-            *value = config->sampleBuffers;
>+        case LightParameter::Position:
>+            memcpy(params, lightParams.position.data(), 4 * sizeof(GLfloat));
>             break;
>-        case EGL_SURFACE_TYPE:
>-            *value = config->surfaceType;
>+        case LightParameter::SpotDirection:
>+            memcpy(params, lightParams.direction.data(), 3 * sizeof(GLfloat));
>+            break;
>+        case LightParameter::SpotExponent:
>+            *params = lightParams.spotlightExponent;
>+            break;
>+        case LightParameter::SpotCutoff:
>+            *params = lightParams.spotlightCutoffAngle;
>+            break;
>+        case LightParameter::ConstantAttenuation:
>+            *params = lightParams.attenuationConst;
>+            break;
>+        case LightParameter::LinearAttenuation:
>+            *params = lightParams.attenuationLinear;
>+            break;
>+        case LightParameter::QuadraticAttenuation:
>+            *params = lightParams.attenuationQuadratic;
>+            break;
>+        default:
>+            break;
>+    }
>+}
>+
>+void SetMaterialParameters(GLES1State *state,
>+                           GLenum face,
>+                           MaterialParameter pname,
>+                           const GLfloat *params)
>+{
>+    MaterialParameters &material = state->materialParameters();
>+    switch (pname)
>+    {
>+        case MaterialParameter::Ambient:
>+            material.ambient = ColorF::fromData(params);
>+            break;
>+        case MaterialParameter::Diffuse:
>+            material.diffuse = ColorF::fromData(params);
>+            break;
>+        case MaterialParameter::AmbientAndDiffuse:
>+            material.ambient = ColorF::fromData(params);
>+            material.diffuse = ColorF::fromData(params);
>+            break;
>+        case MaterialParameter::Specular:
>+            material.specular = ColorF::fromData(params);
>+            break;
>+        case MaterialParameter::Emission:
>+            material.emissive = ColorF::fromData(params);
>+            break;
>+        case MaterialParameter::Shininess:
>+            material.specularExponent = *params;
>+            break;
>+        default:
>+            return;
>+    }
>+}
>+
>+void GetMaterialParameters(const GLES1State *state,
>+                           GLenum face,
>+                           MaterialParameter pname,
>+                           GLfloat *params)
>+{
>+    const ColorF &currentColor         = state->getCurrentColor();
>+    const MaterialParameters &material = state->materialParameters();
>+    const bool colorMaterialEnabled    = state->isColorMaterialEnabled();
>+
>+    switch (pname)
>+    {
>+        case MaterialParameter::Ambient:
>+            if (colorMaterialEnabled)
>+            {
>+                currentColor.writeData(params);
>+            }
>+            else
>+            {
>+                material.ambient.writeData(params);
>+            }
>+            break;
>+        case MaterialParameter::Diffuse:
>+            if (colorMaterialEnabled)
>+            {
>+                currentColor.writeData(params);
>+            }
>+            else
>+            {
>+                material.diffuse.writeData(params);
>+            }
>+            break;
>+        case MaterialParameter::Specular:
>+            material.specular.writeData(params);
>+            break;
>+        case MaterialParameter::Emission:
>+            material.emissive.writeData(params);
>+            break;
>+        case MaterialParameter::Shininess:
>+            *params = material.specularExponent;
>+            break;
>+        default:
>+            return;
>+    }
>+}
>+
>+unsigned int GetLightModelParameterCount(GLenum pname)
>+{
>+    switch (pname)
>+    {
>+        case GL_LIGHT_MODEL_AMBIENT:
>+            return 4;
>+        case GL_LIGHT_MODEL_TWO_SIDE:
>+            return 1;
>+        default:
>+            return 0;
>+    }
>+}
>+
>+unsigned int GetLightParameterCount(LightParameter pname)
>+{
>+    switch (pname)
>+    {
>+        case LightParameter::Ambient:
>+        case LightParameter::Diffuse:
>+        case LightParameter::Specular:
>+        case LightParameter::Position:
>+            return 4;
>+        case LightParameter::SpotDirection:
>+            return 3;
>+        case LightParameter::SpotExponent:
>+        case LightParameter::SpotCutoff:
>+        case LightParameter::ConstantAttenuation:
>+        case LightParameter::LinearAttenuation:
>+        case LightParameter::QuadraticAttenuation:
>+            return 1;
>+        default:
>+            return 0;
>+    }
>+}
>+
>+unsigned int GetMaterialParameterCount(MaterialParameter pname)
>+{
>+    switch (pname)
>+    {
>+        case MaterialParameter::Ambient:
>+        case MaterialParameter::Diffuse:
>+        case MaterialParameter::Specular:
>+        case MaterialParameter::Emission:
>+            return 4;
>+        case MaterialParameter::Shininess:
>+            return 1;
>+        default:
>+            return 0;
>+    }
>+}
>+
>+void SetFogParameters(GLES1State *state, GLenum pname, const GLfloat *params)
>+{
>+    FogParameters &fog = state->fogParameters();
>+    switch (pname)
>+    {
>+        case GL_FOG_MODE:
>+            fog.mode = FromGLenum<FogMode>(static_cast<GLenum>(params[0]));
>+            break;
>+        case GL_FOG_DENSITY:
>+            fog.density = params[0];
>+            break;
>+        case GL_FOG_START:
>+            fog.start = params[0];
>+            break;
>+        case GL_FOG_END:
>+            fog.end = params[0];
>+            break;
>+        case GL_FOG_COLOR:
>+            fog.color = ColorF::fromData(params);
>+            break;
>+        default:
>+            return;
>+    }
>+}
>+
>+void GetFogParameters(const GLES1State *state, GLenum pname, GLfloat *params)
>+{
>+    const FogParameters &fog = state->fogParameters();
>+    switch (pname)
>+    {
>+        case GL_FOG_MODE:
>+            params[0] = static_cast<GLfloat>(ToGLenum(fog.mode));
>+            break;
>+        case GL_FOG_DENSITY:
>+            params[0] = fog.density;
>+            break;
>+        case GL_FOG_START:
>+            params[0] = fog.start;
>+            break;
>+        case GL_FOG_END:
>+            params[0] = fog.end;
>+            break;
>+        case GL_FOG_COLOR:
>+            fog.color.writeData(params);
>+            break;
>+        default:
>+            return;
>+    }
>+}
>+
>+unsigned int GetFogParameterCount(GLenum pname)
>+{
>+    switch (pname)
>+    {
>+        case GL_FOG_MODE:
>+        case GL_FOG_DENSITY:
>+        case GL_FOG_START:
>+        case GL_FOG_END:
>+            return 1;
>+        case GL_FOG_COLOR:
>+            return 4;
>+        default:
>+            return 0;
>+    }
>+}
>+
>+unsigned int GetTextureEnvParameterCount(TextureEnvParameter pname)
>+{
>+    switch (pname)
>+    {
>+        case TextureEnvParameter::Mode:
>+        case TextureEnvParameter::CombineRgb:
>+        case TextureEnvParameter::CombineAlpha:
>+        case TextureEnvParameter::Src0Rgb:
>+        case TextureEnvParameter::Src1Rgb:
>+        case TextureEnvParameter::Src2Rgb:
>+        case TextureEnvParameter::Src0Alpha:
>+        case TextureEnvParameter::Src1Alpha:
>+        case TextureEnvParameter::Src2Alpha:
>+        case TextureEnvParameter::Op0Rgb:
>+        case TextureEnvParameter::Op1Rgb:
>+        case TextureEnvParameter::Op2Rgb:
>+        case TextureEnvParameter::Op0Alpha:
>+        case TextureEnvParameter::Op1Alpha:
>+        case TextureEnvParameter::Op2Alpha:
>+        case TextureEnvParameter::RgbScale:
>+        case TextureEnvParameter::AlphaScale:
>+        case TextureEnvParameter::PointCoordReplace:
>+            return 1;
>+        case TextureEnvParameter::Color:
>+            return 4;
>+        default:
>+            return 0;
>+    }
>+}
>+
>+void ConvertTextureEnvFromInt(TextureEnvParameter pname, const GLint *input, GLfloat *output)
>+{
>+    if (IsTextureEnvEnumParameter(pname))
>+    {
>+        ConvertGLenumValue(input[0], output);
>+        return;
>+    }
>+
>+    switch (pname)
>+    {
>+        case TextureEnvParameter::RgbScale:
>+        case TextureEnvParameter::AlphaScale:
>+            output[0] = static_cast<GLfloat>(input[0]);
>+            break;
>+        case TextureEnvParameter::Color:
>+            for (int i = 0; i < 4; i++)
>+            {
>+                output[i] = input[i] / 255.0f;
>+            }
>+            break;
>+        default:
>+            UNREACHABLE();
>+            break;
>+    }
>+}
>+
>+void ConvertTextureEnvFromFixed(TextureEnvParameter pname, const GLfixed *input, GLfloat *output)
>+{
>+    if (IsTextureEnvEnumParameter(pname))
>+    {
>+        ConvertGLenumValue(input[0], output);
>+        return;
>+    }
>+
>+    switch (pname)
>+    {
>+        case TextureEnvParameter::RgbScale:
>+        case TextureEnvParameter::AlphaScale:
>+            output[0] = FixedToFloat(input[0]);
>+            break;
>+        case TextureEnvParameter::Color:
>+            for (int i = 0; i < 4; i++)
>+            {
>+                output[i] = FixedToFloat(input[i]);
>+            }
>+            break;
>+        default:
>+            UNREACHABLE();
>+            break;
>+    }
>+}
>+
>+void ConvertTextureEnvToInt(TextureEnvParameter pname, const GLfloat *input, GLint *output)
>+{
>+    if (IsTextureEnvEnumParameter(pname))
>+    {
>+        ConvertGLenumValue(input[0], output);
>+        return;
>+    }
>+
>+    switch (pname)
>+    {
>+        case TextureEnvParameter::RgbScale:
>+        case TextureEnvParameter::AlphaScale:
>+            output[0] = static_cast<GLint>(input[0]);
>+            break;
>+        case TextureEnvParameter::Color:
>+            for (int i = 0; i < 4; i++)
>+            {
>+                output[i] = static_cast<GLint>(input[i] * 255.0f);
>+            }
>+            break;
>+        default:
>+            UNREACHABLE();
>+            break;
>+    }
>+}
>+
>+void ConvertTextureEnvToFixed(TextureEnvParameter pname, const GLfloat *input, GLfixed *output)
>+{
>+    if (IsTextureEnvEnumParameter(pname))
>+    {
>+        ConvertGLenumValue(input[0], output);
>+        return;
>+    }
>+
>+    switch (pname)
>+    {
>+        case TextureEnvParameter::RgbScale:
>+        case TextureEnvParameter::AlphaScale:
>+            output[0] = FloatToFixed(input[0]);
>+            break;
>+        case TextureEnvParameter::Color:
>+            for (int i = 0; i < 4; i++)
>+            {
>+                output[i] = FloatToFixed(input[i]);
>+            }
>+            break;
>+        default:
>+            UNREACHABLE();
>+            break;
>+    }
>+}
>+
>+void SetTextureEnv(unsigned int unit,
>+                   GLES1State *state,
>+                   TextureEnvTarget target,
>+                   TextureEnvParameter pname,
>+                   const GLfloat *params)
>+{
>+    TextureEnvironmentParameters &env = state->textureEnvironment(unit);
>+    GLenum asEnum                     = ConvertToGLenum(params[0]);
>+
>+    switch (target)
>+    {
>+        case TextureEnvTarget::Env:
>+            switch (pname)
>+            {
>+                case TextureEnvParameter::Mode:
>+                    env.mode = FromGLenum<TextureEnvMode>(asEnum);
>+                    break;
>+                case TextureEnvParameter::CombineRgb:
>+                    env.combineRgb = FromGLenum<TextureCombine>(asEnum);
>+                    break;
>+                case TextureEnvParameter::CombineAlpha:
>+                    env.combineAlpha = FromGLenum<TextureCombine>(asEnum);
>+                    break;
>+                case TextureEnvParameter::Src0Rgb:
>+                    env.src0Rgb = FromGLenum<TextureSrc>(asEnum);
>+                    break;
>+                case TextureEnvParameter::Src1Rgb:
>+                    env.src1Rgb = FromGLenum<TextureSrc>(asEnum);
>+                    break;
>+                case TextureEnvParameter::Src2Rgb:
>+                    env.src2Rgb = FromGLenum<TextureSrc>(asEnum);
>+                    break;
>+                case TextureEnvParameter::Src0Alpha:
>+                    env.src0Alpha = FromGLenum<TextureSrc>(asEnum);
>+                    break;
>+                case TextureEnvParameter::Src1Alpha:
>+                    env.src1Alpha = FromGLenum<TextureSrc>(asEnum);
>+                    break;
>+                case TextureEnvParameter::Src2Alpha:
>+                    env.src2Alpha = FromGLenum<TextureSrc>(asEnum);
>+                    break;
>+                case TextureEnvParameter::Op0Rgb:
>+                    env.op0Rgb = FromGLenum<TextureOp>(asEnum);
>+                    break;
>+                case TextureEnvParameter::Op1Rgb:
>+                    env.op1Rgb = FromGLenum<TextureOp>(asEnum);
>+                    break;
>+                case TextureEnvParameter::Op2Rgb:
>+                    env.op2Rgb = FromGLenum<TextureOp>(asEnum);
>+                    break;
>+                case TextureEnvParameter::Op0Alpha:
>+                    env.op0Alpha = FromGLenum<TextureOp>(asEnum);
>+                    break;
>+                case TextureEnvParameter::Op1Alpha:
>+                    env.op1Alpha = FromGLenum<TextureOp>(asEnum);
>+                    break;
>+                case TextureEnvParameter::Op2Alpha:
>+                    env.op2Alpha = FromGLenum<TextureOp>(asEnum);
>+                    break;
>+                case TextureEnvParameter::Color:
>+                    env.color = ColorF::fromData(params);
>+                    break;
>+                case TextureEnvParameter::RgbScale:
>+                    env.rgbScale = params[0];
>+                    break;
>+                case TextureEnvParameter::AlphaScale:
>+                    env.alphaScale = params[0];
>+                    break;
>+                default:
>+                    UNREACHABLE();
>+                    break;
>+            }
>+            break;
>+        case TextureEnvTarget::PointSprite:
>+            switch (pname)
>+            {
>+                case TextureEnvParameter::PointCoordReplace:
>+                    env.pointSpriteCoordReplace = static_cast<bool>(params[0]);
>+                    break;
>+                default:
>+                    UNREACHABLE();
>+                    break;
>+            }
>+            break;
>+        default:
>+            UNREACHABLE();
>+            break;
>+    }
>+}
>+
>+void GetTextureEnv(unsigned int unit,
>+                   const GLES1State *state,
>+                   TextureEnvTarget target,
>+                   TextureEnvParameter pname,
>+                   GLfloat *params)
>+{
>+    const TextureEnvironmentParameters &env = state->textureEnvironment(unit);
>+
>+    switch (target)
>+    {
>+        case TextureEnvTarget::Env:
>+            switch (pname)
>+            {
>+                case TextureEnvParameter::Mode:
>+                    ConvertPackedEnum(env.mode, params);
>+                    break;
>+                case TextureEnvParameter::CombineRgb:
>+                    ConvertPackedEnum(env.combineRgb, params);
>+                    break;
>+                case TextureEnvParameter::CombineAlpha:
>+                    ConvertPackedEnum(env.combineAlpha, params);
>+                    break;
>+                case TextureEnvParameter::Src0Rgb:
>+                    ConvertPackedEnum(env.src0Rgb, params);
>+                    break;
>+                case TextureEnvParameter::Src1Rgb:
>+                    ConvertPackedEnum(env.src1Rgb, params);
>+                    break;
>+                case TextureEnvParameter::Src2Rgb:
>+                    ConvertPackedEnum(env.src2Rgb, params);
>+                    break;
>+                case TextureEnvParameter::Src0Alpha:
>+                    ConvertPackedEnum(env.src0Alpha, params);
>+                    break;
>+                case TextureEnvParameter::Src1Alpha:
>+                    ConvertPackedEnum(env.src1Alpha, params);
>+                    break;
>+                case TextureEnvParameter::Src2Alpha:
>+                    ConvertPackedEnum(env.src2Alpha, params);
>+                    break;
>+                case TextureEnvParameter::Op0Rgb:
>+                    ConvertPackedEnum(env.op0Rgb, params);
>+                    break;
>+                case TextureEnvParameter::Op1Rgb:
>+                    ConvertPackedEnum(env.op1Rgb, params);
>+                    break;
>+                case TextureEnvParameter::Op2Rgb:
>+                    ConvertPackedEnum(env.op2Rgb, params);
>+                    break;
>+                case TextureEnvParameter::Op0Alpha:
>+                    ConvertPackedEnum(env.op0Alpha, params);
>+                    break;
>+                case TextureEnvParameter::Op1Alpha:
>+                    ConvertPackedEnum(env.op1Alpha, params);
>+                    break;
>+                case TextureEnvParameter::Op2Alpha:
>+                    ConvertPackedEnum(env.op2Alpha, params);
>+                    break;
>+                case TextureEnvParameter::Color:
>+                    env.color.writeData(params);
>+                    break;
>+                case TextureEnvParameter::RgbScale:
>+                    *params = env.rgbScale;
>+                    break;
>+                case TextureEnvParameter::AlphaScale:
>+                    *params = env.alphaScale;
>+                    break;
>+                default:
>+                    UNREACHABLE();
>+                    break;
>+            }
>+            break;
>+        case TextureEnvTarget::PointSprite:
>+            switch (pname)
>+            {
>+                case TextureEnvParameter::PointCoordReplace:
>+                    *params = static_cast<GLfloat>(env.pointSpriteCoordReplace);
>+                    break;
>+                default:
>+                    UNREACHABLE();
>+                    break;
>+            }
>+            break;
>+        default:
>+            UNREACHABLE();
>+            break;
>+    }
>+}
>+
>+unsigned int GetPointParameterCount(PointParameter pname)
>+{
>+    switch (pname)
>+    {
>+        case PointParameter::PointSizeMin:
>+        case PointParameter::PointSizeMax:
>+        case PointParameter::PointFadeThresholdSize:
>+            return 1;
>+        case PointParameter::PointDistanceAttenuation:
>+            return 3;
>+        default:
>+            return 0;
>+    }
>+}
>+
>+void SetPointParameter(GLES1State *state, PointParameter pname, const GLfloat *params)
>+{
>+
>+    PointParameters &pointParams = state->pointParameters();
>+
>+    switch (pname)
>+    {
>+        case PointParameter::PointSizeMin:
>+            pointParams.pointSizeMin = params[0];
>+            break;
>+        case PointParameter::PointSizeMax:
>+            pointParams.pointSizeMax = params[0];
>+            break;
>+        case PointParameter::PointFadeThresholdSize:
>+            pointParams.pointFadeThresholdSize = params[0];
>+            break;
>+        case PointParameter::PointDistanceAttenuation:
>+            for (unsigned int i = 0; i < 3; i++)
>+            {
>+                pointParams.pointDistanceAttenuation[i] = params[i];
>+            }
>+            break;
>+        default:
>+            UNREACHABLE();
>+    }
>+}
>+
>+void GetPointParameter(const GLES1State *state, PointParameter pname, GLfloat *params)
>+{
>+    const PointParameters &pointParams = state->pointParameters();
>+
>+    switch (pname)
>+    {
>+        case PointParameter::PointSizeMin:
>+            params[0] = pointParams.pointSizeMin;
>+            break;
>+        case PointParameter::PointSizeMax:
>+            params[0] = pointParams.pointSizeMax;
>+            break;
>+        case PointParameter::PointFadeThresholdSize:
>+            params[0] = pointParams.pointFadeThresholdSize;
>+            break;
>+        case PointParameter::PointDistanceAttenuation:
>+            for (unsigned int i = 0; i < 3; i++)
>+            {
>+                params[i] = pointParams.pointDistanceAttenuation[i];
>+            }
>+            break;
>+        default:
>+            UNREACHABLE();
>+    }
>+}
>+
>+void SetPointSize(GLES1State *state, GLfloat size)
>+{
>+    PointParameters &params = state->pointParameters();
>+    params.pointSize        = size;
>+}
>+
>+void GetPointSize(GLES1State *state, GLfloat *sizeOut)
>+{
>+    const PointParameters &params = state->pointParameters();
>+    *sizeOut                      = params.pointSize;
>+}
>+
>+unsigned int GetTexParameterCount(GLenum pname)
>+{
>+    switch (pname)
>+    {
>+        case GL_TEXTURE_CROP_RECT_OES:
>+        case GL_TEXTURE_BORDER_COLOR:
>+            return 4;
>+        case GL_TEXTURE_MAG_FILTER:
>+        case GL_TEXTURE_MIN_FILTER:
>+        case GL_TEXTURE_WRAP_S:
>+        case GL_TEXTURE_WRAP_T:
>+        case GL_TEXTURE_USAGE_ANGLE:
>+        case GL_TEXTURE_MAX_ANISOTROPY_EXT:
>+        case GL_TEXTURE_IMMUTABLE_FORMAT:
>+        case GL_TEXTURE_WRAP_R:
>+        case GL_TEXTURE_IMMUTABLE_LEVELS:
>+        case GL_TEXTURE_SWIZZLE_R:
>+        case GL_TEXTURE_SWIZZLE_G:
>+        case GL_TEXTURE_SWIZZLE_B:
>+        case GL_TEXTURE_SWIZZLE_A:
>+        case GL_TEXTURE_BASE_LEVEL:
>+        case GL_TEXTURE_MAX_LEVEL:
>+        case GL_TEXTURE_MIN_LOD:
>+        case GL_TEXTURE_MAX_LOD:
>+        case GL_TEXTURE_COMPARE_MODE:
>+        case GL_TEXTURE_COMPARE_FUNC:
>+        case GL_TEXTURE_SRGB_DECODE_EXT:
>+        case GL_DEPTH_STENCIL_TEXTURE_MODE:
>+            return 1;
>+        default:
>+            return 0;
>+    }
>+}
>+
>+}  // namespace gl
>+
>+namespace egl
>+{
>+
>+void QueryConfigAttrib(const Config *config, EGLint attribute, EGLint *value)
>+{
>+    ASSERT(config != nullptr);
>+    switch (attribute)
>+    {
>+        case EGL_BUFFER_SIZE:
>+            *value = config->bufferSize;
>+            break;
>+        case EGL_ALPHA_SIZE:
>+            *value = config->alphaSize;
>+            break;
>+        case EGL_BLUE_SIZE:
>+            *value = config->blueSize;
>+            break;
>+        case EGL_GREEN_SIZE:
>+            *value = config->greenSize;
>+            break;
>+        case EGL_RED_SIZE:
>+            *value = config->redSize;
>+            break;
>+        case EGL_DEPTH_SIZE:
>+            *value = config->depthSize;
>+            break;
>+        case EGL_STENCIL_SIZE:
>+            *value = config->stencilSize;
>+            break;
>+        case EGL_CONFIG_CAVEAT:
>+            *value = config->configCaveat;
>+            break;
>+        case EGL_CONFIG_ID:
>+            *value = config->configID;
>+            break;
>+        case EGL_LEVEL:
>+            *value = config->level;
>+            break;
>+        case EGL_NATIVE_RENDERABLE:
>+            *value = config->nativeRenderable;
>+            break;
>+        case EGL_NATIVE_VISUAL_ID:
>+            *value = config->nativeVisualID;
>+            break;
>+        case EGL_NATIVE_VISUAL_TYPE:
>+            *value = config->nativeVisualType;
>+            break;
>+        case EGL_SAMPLES:
>+            *value = config->samples;
>+            break;
>+        case EGL_SAMPLE_BUFFERS:
>+            *value = config->sampleBuffers;
>+            break;
>+        case EGL_SURFACE_TYPE:
>+            *value = config->surfaceType;
>             break;
>         case EGL_TRANSPARENT_TYPE:
>             *value = config->transparentType;
>@@ -1764,6 +2873,9 @@ void QueryConfigAttrib(const Config *config, EGLint attribute, EGLint *value)
>         case EGL_COLOR_COMPONENT_TYPE_EXT:
>             *value = config->colorComponentType;
>             break;
>+        case EGL_RECORDABLE_ANDROID:
>+            *value = config->recordable;
>+            break;
>         default:
>             UNREACHABLE();
>             break;
>@@ -1854,7 +2966,7 @@ void QuerySurfaceAttrib(const Surface *surface, EGLint attribute, EGLint *value)
>             // The EGL spec states that value is not written if the surface is not a pbuffer
>             if (surface->getType() == EGL_PBUFFER_BIT)
>             {
>-                *value = surface->getTextureFormat();
>+                *value = ToEGLenum(surface->getTextureFormat());
>             }
>             break;
>         case EGL_TEXTURE_TARGET:
>@@ -1888,6 +3000,9 @@ void QuerySurfaceAttrib(const Surface *surface, EGLint attribute, EGLint *value)
>         case EGL_ROBUST_RESOURCE_INITIALIZATION_ANGLE:
>             *value = surface->isRobustResourceInitEnabled();
>             break;
>+        case EGL_TIMESTAMPS_ANDROID:
>+            *value = surface->isTimestampsEnabled();
>+            break;
>         default:
>             UNREACHABLE();
>             break;
>@@ -1907,10 +3022,42 @@ void SetSurfaceAttrib(Surface *surface, EGLint attribute, EGLint value)
>         case EGL_SWAP_BEHAVIOR:
>             surface->setSwapBehavior(value);
>             break;
>+        case EGL_WIDTH:
>+            surface->setFixedWidth(value);
>+            break;
>+        case EGL_HEIGHT:
>+            surface->setFixedHeight(value);
>+            break;
>+        case EGL_TIMESTAMPS_ANDROID:
>+            surface->setTimestampsEnabled(value != EGL_FALSE);
>+            break;
>         default:
>             UNREACHABLE();
>             break;
>     }
> }
> 
>+Error GetSyncAttrib(Display *display, Sync *sync, EGLint attribute, EGLint *value)
>+{
>+    switch (attribute)
>+    {
>+        case EGL_SYNC_TYPE_KHR:
>+            *value = sync->getType();
>+            return NoError();
>+
>+        case EGL_SYNC_STATUS_KHR:
>+            return sync->getStatus(display, value);
>+
>+        case EGL_SYNC_CONDITION_KHR:
>+            *value = sync->getCondition();
>+            return NoError();
>+
>+        default:
>+            break;
>+    }
>+
>+    UNREACHABLE();
>+    return NoError();
>+}
>+
> }  // namespace egl
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/queryutils.h b/Source/ThirdParty/ANGLE/src/libANGLE/queryutils.h
>index 990cbc169ed..8bfe3b20ebc 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/queryutils.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/queryutils.h
>@@ -10,7 +10,9 @@
> #define LIBANGLE_QUERYUTILS_H_
> 
> #include "angle_gl.h"
>+#include "common/PackedEnums.h"
> #include "common/angleutils.h"
>+#include "libANGLE/Error.h"
> 
> #include <EGL/egl.h>
> 
>@@ -18,9 +20,9 @@ namespace gl
> {
> class Buffer;
> class Context;
>-class Error;
> class Sync;
> class Framebuffer;
>+class GLES1State;
> class Program;
> class Renderbuffer;
> class Sampler;
>@@ -32,33 +34,38 @@ struct VertexAttribute;
> class VertexBinding;
> struct VertexAttribCurrentValueData;
> 
>-void QueryFramebufferAttachmentParameteriv(const Framebuffer *framebuffer,
>+void QueryFramebufferAttachmentParameteriv(const Context *context,
>+                                           const Framebuffer *framebuffer,
>                                            GLenum attachment,
>                                            GLenum pname,
>                                            GLint *params);
> void QueryBufferParameteriv(const Buffer *buffer, GLenum pname, GLint *params);
> void QueryBufferParameteri64v(const Buffer *buffer, GLenum pname, GLint64 *params);
> void QueryBufferPointerv(const Buffer *buffer, GLenum pname, void **params);
>-void QueryProgramiv(const Context *context, const Program *program, GLenum pname, GLint *params);
>+void QueryProgramiv(Context *context, const Program *program, GLenum pname, GLint *params);
> void QueryRenderbufferiv(const Context *context,
>                          const Renderbuffer *renderbuffer,
>                          GLenum pname,
>                          GLint *params);
> void QueryShaderiv(const Context *context, Shader *shader, GLenum pname, GLint *params);
> void QueryTexLevelParameterfv(const Texture *texture,
>-                              GLenum target,
>+                              TextureTarget target,
>                               GLint level,
>                               GLenum pname,
>                               GLfloat *params);
> void QueryTexLevelParameteriv(const Texture *texture,
>-                              GLenum target,
>+                              TextureTarget target,
>                               GLint level,
>                               GLenum pname,
>                               GLint *params);
> void QueryTexParameterfv(const Texture *texture, GLenum pname, GLfloat *params);
> void QueryTexParameteriv(const Texture *texture, GLenum pname, GLint *params);
>+void QueryTexParameterIiv(const Texture *texture, GLenum pname, GLint *params);
>+void QueryTexParameterIuiv(const Texture *texture, GLenum pname, GLuint *params);
> void QuerySamplerParameterfv(const Sampler *sampler, GLenum pname, GLfloat *params);
> void QuerySamplerParameteriv(const Sampler *sampler, GLenum pname, GLint *params);
>+void QuerySamplerParameterIiv(const Sampler *sampler, GLenum pname, GLint *params);
>+void QuerySamplerParameterIuiv(const Sampler *sampler, GLenum pname, GLuint *params);
> 
> // Warning: you should ensure binding really matches attrib.bindingIndex before using the following
> // functions.
>@@ -97,19 +104,34 @@ void QueryInternalFormativ(const TextureCaps &format, GLenum pname, GLsizei bufS
> 
> void QueryFramebufferParameteriv(const Framebuffer *framebuffer, GLenum pname, GLint *params);
> 
>-Error QuerySynciv(const Sync *sync, GLenum pname, GLsizei bufSize, GLsizei *length, GLint *values);
>+angle::Result QuerySynciv(const Context *context,
>+                          const Sync *sync,
>+                          GLenum pname,
>+                          GLsizei bufSize,
>+                          GLsizei *length,
>+                          GLint *values);
> 
> void SetTexParameterf(Context *context, Texture *texture, GLenum pname, GLfloat param);
> void SetTexParameterfv(Context *context, Texture *texture, GLenum pname, const GLfloat *params);
> void SetTexParameteri(Context *context, Texture *texture, GLenum pname, GLint param);
> void SetTexParameteriv(Context *context, Texture *texture, GLenum pname, const GLint *params);
>+void SetTexParameterIiv(Context *context, Texture *texture, GLenum pname, const GLint *params);
>+void SetTexParameterIuiv(Context *context, Texture *texture, GLenum pname, const GLuint *params);
>+
>+void SetSamplerParameterf(Context *context, Sampler *sampler, GLenum pname, GLfloat param);
>+void SetSamplerParameterfv(Context *context, Sampler *sampler, GLenum pname, const GLfloat *params);
>+void SetSamplerParameteri(Context *context, Sampler *sampler, GLenum pname, GLint param);
>+void SetSamplerParameteriv(Context *context, Sampler *sampler, GLenum pname, const GLint *params);
>+void SetSamplerParameterIiv(Context *context, Sampler *sampler, GLenum pname, const GLint *params);
>+void SetSamplerParameterIuiv(Context *context,
>+                             Sampler *sampler,
>+                             GLenum pname,
>+                             const GLuint *params);
> 
>-void SetSamplerParameterf(Sampler *sampler, GLenum pname, GLfloat param);
>-void SetSamplerParameterfv(Sampler *sampler, GLenum pname, const GLfloat *params);
>-void SetSamplerParameteri(Sampler *sampler, GLenum pname, GLint param);
>-void SetSamplerParameteriv(Sampler *sampler, GLenum pname, const GLint *params);
>-
>-void SetFramebufferParameteri(Framebuffer *framebuffer, GLenum pname, GLint param);
>+void SetFramebufferParameteri(const Context *context,
>+                              Framebuffer *framebuffer,
>+                              GLenum pname,
>+                              GLint param);
> 
> void SetProgramParameteri(Program *program, GLenum pname, GLint value);
> 
>@@ -142,13 +164,76 @@ void QueryProgramInterfaceiv(const Program *program,
>                              GLenum programInterface,
>                              GLenum pname,
>                              GLint *params);
>+// GLES1 emulation
>+
>+ClientVertexArrayType ParamToVertexArrayType(GLenum param);
>+
>+void SetLightParameters(GLES1State *state,
>+                        GLenum light,
>+                        LightParameter pname,
>+                        const GLfloat *params);
>+void GetLightParameters(const GLES1State *state,
>+                        GLenum light,
>+                        LightParameter pname,
>+                        GLfloat *params);
>+
>+void SetLightModelParameters(GLES1State *state, GLenum pname, const GLfloat *params);
>+void GetLightModelParameters(const GLES1State *state, GLenum pname, GLfloat *params);
>+bool IsLightModelTwoSided(const GLES1State *state);
>+
>+void SetMaterialParameters(GLES1State *state,
>+                           GLenum face,
>+                           MaterialParameter pname,
>+                           const GLfloat *params);
>+void GetMaterialParameters(const GLES1State *state,
>+                           GLenum face,
>+                           MaterialParameter pname,
>+                           GLfloat *params);
>+
>+unsigned int GetLightModelParameterCount(GLenum pname);
>+unsigned int GetLightParameterCount(LightParameter pname);
>+unsigned int GetMaterialParameterCount(MaterialParameter pname);
>+
>+void SetFogParameters(GLES1State *state, GLenum pname, const GLfloat *params);
>+void GetFogParameters(const GLES1State *state, GLenum pname, GLfloat *params);
>+unsigned int GetFogParameterCount(GLenum pname);
>+
>+unsigned int GetTextureEnvParameterCount(TextureEnvParameter pname);
>+
>+void ConvertTextureEnvFromInt(TextureEnvParameter pname, const GLint *input, GLfloat *output);
>+void ConvertTextureEnvFromFixed(TextureEnvParameter pname, const GLfixed *input, GLfloat *output);
>+void ConvertTextureEnvToInt(TextureEnvParameter pname, const GLfloat *input, GLint *output);
>+void ConvertTextureEnvToFixed(TextureEnvParameter pname, const GLfloat *input, GLfixed *output);
>+
>+void SetTextureEnv(unsigned int unit,
>+                   GLES1State *state,
>+                   TextureEnvTarget target,
>+                   TextureEnvParameter pname,
>+                   const GLfloat *params);
>+void GetTextureEnv(unsigned int unit,
>+                   const GLES1State *state,
>+                   TextureEnvTarget target,
>+                   TextureEnvParameter pname,
>+                   GLfloat *params);
>+
>+unsigned int GetPointParameterCount(PointParameter pname);
>+
>+void SetPointParameter(GLES1State *state, PointParameter pname, const GLfloat *params);
>+void GetPointParameter(const GLES1State *state, PointParameter pname, GLfloat *params);
>+
>+void SetPointSize(GLES1State *state, GLfloat size);
>+void GetPointSize(GLES1State *state, GLfloat *sizeOut);
>+
>+unsigned int GetTexParameterCount(GLenum pname);
> 
> }  // namespace gl
> 
> namespace egl
> {
> struct Config;
>+class Display;
> class Surface;
>+class Sync;
> 
> void QueryConfigAttrib(const Config *config, EGLint attribute, EGLint *value);
> 
>@@ -156,6 +241,7 @@ void QueryContextAttrib(const gl::Context *context, EGLint attribute, EGLint *va
> 
> void QuerySurfaceAttrib(const Surface *surface, EGLint attribute, EGLint *value);
> void SetSurfaceAttrib(Surface *surface, EGLint attribute, EGLint value);
>+Error GetSyncAttrib(Display *display, Sync *sync, EGLint attribute, EGLint *value);
> 
> }  // namespace egl
> 
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/BufferImpl.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/BufferImpl.h
>index f76fcdc8d7a..77b773741ce 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/BufferImpl.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/BufferImpl.h
>@@ -9,10 +9,11 @@
> #ifndef LIBANGLE_RENDERER_BUFFERIMPL_H_
> #define LIBANGLE_RENDERER_BUFFERIMPL_H_
> 
>+#include "common/PackedEnums.h"
> #include "common/angleutils.h"
> #include "common/mathutil.h"
> #include "libANGLE/Error.h"
>-#include "libANGLE/PackedGLEnums.h"
>+#include "libANGLE/Observer.h"
> 
> #include <stdint.h>
> 
>@@ -20,50 +21,62 @@ namespace gl
> {
> class BufferState;
> class Context;
>-}
>+}  // namespace gl
> 
> namespace rx
> {
>-class BufferImpl : angle::NonCopyable
>+// We use two set of Subject messages. The CONTENTS_CHANGED message is signaled whenever data
>+// changes, to trigger re-translation or other events. Some buffers only need to be updated when the
>+// underlying driver object changes - this is notified via the STORAGE_CHANGED message.
>+class BufferImpl : public angle::Subject
> {
>   public:
>     BufferImpl(const gl::BufferState &state) : mState(state) {}
>-    virtual ~BufferImpl() {}
>+    ~BufferImpl() override {}
>     virtual void destroy(const gl::Context *context) {}
> 
>-    virtual gl::Error setData(const gl::Context *context,
>-                              gl::BufferBinding target,
>-                              const void *data,
>-                              size_t size,
>-                              gl::BufferUsage usage)                                = 0;
>-    virtual gl::Error setSubData(const gl::Context *context,
>-                                 gl::BufferBinding target,
>-                                 const void *data,
>-                                 size_t size,
>-                                 size_t offset)                                     = 0;
>-    virtual gl::Error copySubData(const gl::Context *context,
>-                                  BufferImpl *source,
>-                                  GLintptr sourceOffset,
>-                                  GLintptr destOffset,
>-                                  GLsizeiptr size) = 0;
>-    virtual gl::Error map(const gl::Context *context, GLenum access, void **mapPtr) = 0;
>-    virtual gl::Error mapRange(const gl::Context *context,
>-                               size_t offset,
>-                               size_t length,
>-                               GLbitfield access,
>-                               void **mapPtr) = 0;
>-    virtual gl::Error unmap(const gl::Context *context, GLboolean *result) = 0;
>+    virtual angle::Result setData(const gl::Context *context,
>+                                  gl::BufferBinding target,
>+                                  const void *data,
>+                                  size_t size,
>+                                  gl::BufferUsage usage)                                = 0;
>+    virtual angle::Result setSubData(const gl::Context *context,
>+                                     gl::BufferBinding target,
>+                                     const void *data,
>+                                     size_t size,
>+                                     size_t offset)                                     = 0;
>+    virtual angle::Result copySubData(const gl::Context *context,
>+                                      BufferImpl *source,
>+                                      GLintptr sourceOffset,
>+                                      GLintptr destOffset,
>+                                      GLsizeiptr size)                                  = 0;
>+    virtual angle::Result map(const gl::Context *context, GLenum access, void **mapPtr) = 0;
>+    virtual angle::Result mapRange(const gl::Context *context,
>+                                   size_t offset,
>+                                   size_t length,
>+                                   GLbitfield access,
>+                                   void **mapPtr)                                       = 0;
>+    virtual angle::Result unmap(const gl::Context *context, GLboolean *result)          = 0;
>+
>+    virtual angle::Result getIndexRange(const gl::Context *context,
>+                                        gl::DrawElementsType type,
>+                                        size_t offset,
>+                                        size_t count,
>+                                        bool primitiveRestartEnabled,
>+                                        gl::IndexRange *outRange) = 0;
> 
>-    virtual gl::Error getIndexRange(const gl::Context *context,
>-                                    GLenum type,
>-                                    size_t offset,
>-                                    size_t count,
>-                                    bool primitiveRestartEnabled,
>-                                    gl::IndexRange *outRange) = 0;
>+    // Override if accurate native memory size information is available
>+    virtual GLint64 getMemorySize() const;
> 
>   protected:
>     const gl::BufferState &mState;
> };
>+
>+inline GLint64 BufferImpl::getMemorySize() const
>+{
>+    return 0;
> }
> 
>+}  // namespace rx
>+
> #endif  // LIBANGLE_RENDERER_BUFFERIMPL_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/BufferImpl_mock.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/BufferImpl_mock.h
>index 5a4e21003c2..7d6901d79d8 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/BufferImpl_mock.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/BufferImpl_mock.h
>@@ -22,27 +22,40 @@ class MockBufferImpl : public BufferImpl
>     MockBufferImpl() : BufferImpl(mMockState) {}
>     ~MockBufferImpl() { destructor(); }
> 
>+    MOCK_METHOD5(setData,
>+                 angle::Result(const gl::Context *,
>+                               gl::BufferBinding,
>+                               const void *,
>+                               size_t,
>+                               gl::BufferUsage));
>     MOCK_METHOD5(
>-        setData,
>-        gl::Error(const gl::Context *, gl::BufferBinding, const void *, size_t, gl::BufferUsage));
>-    MOCK_METHOD5(setSubData,
>-                 gl::Error(const gl::Context *, gl::BufferBinding, const void *, size_t, size_t));
>+        setSubData,
>+        angle::Result(const gl::Context *, gl::BufferBinding, const void *, size_t, size_t));
>+    MOCK_METHOD5(copySubData,
>+                 angle::Result(const gl::Context *contextImpl,
>+                               BufferImpl *,
>+                               GLintptr,
>+                               GLintptr,
>+                               GLsizeiptr));
>+    MOCK_METHOD3(map, angle::Result(const gl::Context *contextImpl, GLenum, void **));
>     MOCK_METHOD5(
>-        copySubData,
>-        gl::Error(const gl::Context *contextImpl, BufferImpl *, GLintptr, GLintptr, GLsizeiptr));
>-    MOCK_METHOD3(map, gl::Error(const gl::Context *contextImpl, GLenum, void **));
>-    MOCK_METHOD5(mapRange,
>-                 gl::Error(const gl::Context *contextImpl, size_t, size_t, GLbitfield, void **));
>-    MOCK_METHOD2(unmap, gl::Error(const gl::Context *contextImpl, GLboolean *result));
>+        mapRange,
>+        angle::Result(const gl::Context *contextImpl, size_t, size_t, GLbitfield, void **));
>+    MOCK_METHOD2(unmap, angle::Result(const gl::Context *contextImpl, GLboolean *result));
> 
>     MOCK_METHOD6(getIndexRange,
>-                 gl::Error(const gl::Context *, GLenum, size_t, size_t, bool, gl::IndexRange *));
>+                 angle::Result(const gl::Context *,
>+                               gl::DrawElementsType,
>+                               size_t,
>+                               size_t,
>+                               bool,
>+                               gl::IndexRange *));
> 
>     MOCK_METHOD0(destructor, void());
> 
>   protected:
>     gl::BufferState mMockState;
> };
>-}
>+}  // namespace rx
> 
> #endif  // LIBANGLE_RENDERER_BUFFERIMPLMOCK_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/CompilerImpl.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/CompilerImpl.h
>index 82f1ffe0d35..1683a453ded 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/CompilerImpl.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/CompilerImpl.h
>@@ -7,12 +7,12 @@
> // CompilerImpl.h: Defines the rx::CompilerImpl class, an implementation interface
> //                 for the gl::Compiler object.
> 
>-#include "common/angleutils.h"
> #include "GLSLANG/ShaderLang.h"
>+#include "common/angleutils.h"
> #include "libANGLE/Error.h"
> 
> #ifndef LIBANGLE_RENDERER_COMPILERIMPL_H_
>-#define LIBANGLE_RENDERER_COMPILERIMPL_H_
>+#    define LIBANGLE_RENDERER_COMPILERIMPL_H_
> 
> namespace rx
> {
>@@ -23,12 +23,10 @@ class CompilerImpl : angle::NonCopyable
>     CompilerImpl() {}
>     virtual ~CompilerImpl() {}
> 
>-    virtual gl::Error release() = 0;
>-
>     // TODO(jmadill): Expose translator built-in resources init method.
>     virtual ShShaderOutput getTranslatorOutputType() const = 0;
> };
> 
>-}
>+}  // namespace rx
> 
>-#endif // LIBANGLE_RENDERER_COMPILERIMPL_H_
>+#endif  // LIBANGLE_RENDERER_COMPILERIMPL_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/ContextImpl.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/ContextImpl.cpp
>index 8d3df291d36..b1cb50f6406 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/ContextImpl.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/ContextImpl.cpp
>@@ -9,17 +9,15 @@
> 
> #include "libANGLE/renderer/ContextImpl.h"
> 
>-namespace rx
>-{
>+#include "libANGLE/Context.h"
> 
>-ContextImpl::ContextImpl(const gl::ContextState &state)
>-    : mState(state), mMemoryProgramCache(nullptr)
>+namespace rx
> {
>-}
>+ContextImpl::ContextImpl(const gl::State &state, gl::ErrorSet *errorSet)
>+    : mState(state), mMemoryProgramCache(nullptr), mErrors(errorSet)
>+{}
> 
>-ContextImpl::~ContextImpl()
>-{
>-}
>+ContextImpl::~ContextImpl() {}
> 
> void ContextImpl::stencilFillPath(const gl::Path *path, GLenum fillMode, GLuint mask)
> {
>@@ -111,9 +109,25 @@ void ContextImpl::stencilThenCoverStrokePathInstanced(const std::vector<gl::Path
>     UNREACHABLE();
> }
> 
>+angle::Result ContextImpl::onUnMakeCurrent(const gl::Context *context)
>+{
>+    return angle::Result::Continue;
>+}
>+
> void ContextImpl::setMemoryProgramCache(gl::MemoryProgramCache *memoryProgramCache)
> {
>     mMemoryProgramCache = memoryProgramCache;
> }
> 
>+void ContextImpl::handleError(GLenum errorCode,
>+                              const char *message,
>+                              const char *file,
>+                              const char *function,
>+                              unsigned int line)
>+{
>+    std::stringstream errorStream;
>+    errorStream << "Internal error: " << gl::FmtHex(errorCode) << ": " << message;
>+    mErrors->handleError(errorCode, errorStream.str().c_str(), file, function, line);
>+}
>+
> }  // namespace rx
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/ContextImpl.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/ContextImpl.h
>index 7ba4b5ad2d9..bf7bf990761 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/ContextImpl.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/ContextImpl.h
>@@ -13,69 +13,70 @@
> #include <vector>
> 
> #include "common/angleutils.h"
>-#include "libANGLE/ContextState.h"
>+#include "libANGLE/State.h"
> #include "libANGLE/renderer/GLImplFactory.h"
> 
> namespace gl
> {
>+class ErrorSet;
> class MemoryProgramCache;
> class Path;
> struct Workarounds;
>-}
>+}  // namespace gl
> 
> namespace rx
> {
> class ContextImpl : public GLImplFactory
> {
>   public:
>-    ContextImpl(const gl::ContextState &state);
>+    ContextImpl(const gl::State &state, gl::ErrorSet *errorSet);
>     ~ContextImpl() override;
> 
>     virtual void onDestroy(const gl::Context *context) {}
> 
>-    virtual gl::Error initialize() = 0;
>+    virtual angle::Result initialize() = 0;
> 
>     // Flush and finish.
>-    virtual gl::Error flush(const gl::Context *context)  = 0;
>-    virtual gl::Error finish(const gl::Context *context) = 0;
>+    virtual angle::Result flush(const gl::Context *context)  = 0;
>+    virtual angle::Result finish(const gl::Context *context) = 0;
> 
>     // Drawing methods.
>-    virtual gl::Error drawArrays(const gl::Context *context,
>-                                 GLenum mode,
>-                                 GLint first,
>-                                 GLsizei count) = 0;
>-    virtual gl::Error drawArraysInstanced(const gl::Context *context,
>-                                          GLenum mode,
>-                                          GLint first,
>-                                          GLsizei count,
>-                                          GLsizei instanceCount) = 0;
>-
>-    virtual gl::Error drawElements(const gl::Context *context,
>-                                   GLenum mode,
>-                                   GLsizei count,
>-                                   GLenum type,
>-                                   const void *indices) = 0;
>-    virtual gl::Error drawElementsInstanced(const gl::Context *context,
>-                                            GLenum mode,
>+    virtual angle::Result drawArrays(const gl::Context *context,
>+                                     gl::PrimitiveMode mode,
>+                                     GLint first,
>+                                     GLsizei count)                  = 0;
>+    virtual angle::Result drawArraysInstanced(const gl::Context *context,
>+                                              gl::PrimitiveMode mode,
>+                                              GLint first,
>+                                              GLsizei count,
>+                                              GLsizei instanceCount) = 0;
>+
>+    virtual angle::Result drawElements(const gl::Context *context,
>+                                       gl::PrimitiveMode mode,
>+                                       GLsizei count,
>+                                       gl::DrawElementsType type,
>+                                       const void *indices)        = 0;
>+    virtual angle::Result drawElementsInstanced(const gl::Context *context,
>+                                                gl::PrimitiveMode mode,
>+                                                GLsizei count,
>+                                                gl::DrawElementsType type,
>+                                                const void *indices,
>+                                                GLsizei instances) = 0;
>+    virtual angle::Result drawRangeElements(const gl::Context *context,
>+                                            gl::PrimitiveMode mode,
>+                                            GLuint start,
>+                                            GLuint end,
>                                             GLsizei count,
>-                                            GLenum type,
>-                                            const void *indices,
>-                                            GLsizei instances) = 0;
>-    virtual gl::Error drawRangeElements(const gl::Context *context,
>-                                        GLenum mode,
>-                                        GLuint start,
>-                                        GLuint end,
>-                                        GLsizei count,
>-                                        GLenum type,
>-                                        const void *indices) = 0;
>-
>-    virtual gl::Error drawArraysIndirect(const gl::Context *context,
>-                                         GLenum mode,
>-                                         const void *indirect) = 0;
>-    virtual gl::Error drawElementsIndirect(const gl::Context *context,
>-                                           GLenum mode,
>-                                           GLenum type,
>-                                           const void *indirect) = 0;
>+                                            gl::DrawElementsType type,
>+                                            const void *indices)   = 0;
>+
>+    virtual angle::Result drawArraysIndirect(const gl::Context *context,
>+                                             gl::PrimitiveMode mode,
>+                                             const void *indirect)   = 0;
>+    virtual angle::Result drawElementsIndirect(const gl::Context *context,
>+                                               gl::PrimitiveMode mode,
>+                                               gl::DrawElementsType type,
>+                                               const void *indirect) = 0;
> 
>     // CHROMIUM_path_rendering path drawing methods.
>     virtual void stencilFillPath(const gl::Path *path, GLenum fillMode, GLuint mask);
>@@ -124,7 +125,7 @@ class ContextImpl : public GLImplFactory
>                                                      const GLfloat *transformValues);
> 
>     // Device loss
>-    virtual GLenum getResetStatus() = 0;
>+    virtual gl::GraphicsResetStatus getResetStatus() = 0;
> 
>     // Vendor and description strings.
>     virtual std::string getVendorString() const        = 0;
>@@ -133,39 +134,50 @@ class ContextImpl : public GLImplFactory
>     // EXT_debug_marker
>     virtual void insertEventMarker(GLsizei length, const char *marker) = 0;
>     virtual void pushGroupMarker(GLsizei length, const char *marker)   = 0;
>-    virtual void popGroupMarker() = 0;
>+    virtual void popGroupMarker()                                      = 0;
> 
>     // KHR_debug
>-    virtual void pushDebugGroup(GLenum source, GLuint id, GLsizei length, const char *message) = 0;
>-    virtual void popDebugGroup()                                                               = 0;
>+    virtual void pushDebugGroup(GLenum source, GLuint id, const std::string &message) = 0;
>+    virtual void popDebugGroup()                                                      = 0;
>+
>+    // KHR_parallel_shader_compile
>+    virtual void setMaxShaderCompilerThreads(GLuint count) {}
> 
>     // State sync with dirty bits.
>-    virtual void syncState(const gl::Context *context, const gl::State::DirtyBits &dirtyBits) = 0;
>+    virtual angle::Result syncState(const gl::Context *context,
>+                                    const gl::State::DirtyBits &dirtyBits,
>+                                    const gl::State::DirtyBits &bitMask) = 0;
> 
>     // Disjoint timer queries
>     virtual GLint getGPUDisjoint() = 0;
>     virtual GLint64 getTimestamp() = 0;
> 
>     // Context switching
>-    virtual void onMakeCurrent(const gl::Context *context) = 0;
>+    virtual angle::Result onMakeCurrent(const gl::Context *context) = 0;
>+    virtual angle::Result onUnMakeCurrent(const gl::Context *context);
> 
>     // Native capabilities, unmodified by gl::Context.
>-    virtual const gl::Caps &getNativeCaps() const                  = 0;
>+    virtual gl::Caps getNativeCaps() const                         = 0;
>     virtual const gl::TextureCapsMap &getNativeTextureCaps() const = 0;
>     virtual const gl::Extensions &getNativeExtensions() const      = 0;
>     virtual const gl::Limitations &getNativeLimitations() const    = 0;
> 
>     virtual void applyNativeWorkarounds(gl::Workarounds *workarounds) const {}
> 
>-    virtual gl::Error dispatchCompute(const gl::Context *context,
>-                                      GLuint numGroupsX,
>-                                      GLuint numGroupsY,
>-                                      GLuint numGroupsZ) = 0;
>+    virtual angle::Result dispatchCompute(const gl::Context *context,
>+                                          GLuint numGroupsX,
>+                                          GLuint numGroupsY,
>+                                          GLuint numGroupsZ)         = 0;
>+    virtual angle::Result dispatchComputeIndirect(const gl::Context *context,
>+                                                  GLintptr indirect) = 0;
> 
>-    const gl::ContextState &getContextState() { return mState; }
>+    virtual angle::Result memoryBarrier(const gl::Context *context, GLbitfield barriers) = 0;
>+    virtual angle::Result memoryBarrierByRegion(const gl::Context *context,
>+                                                GLbitfield barriers)                     = 0;
>+
>+    const gl::State &getState() { return mState; }
>     int getClientMajorVersion() const { return mState.getClientMajorVersion(); }
>     int getClientMinorVersion() const { return mState.getClientMinorVersion(); }
>-    const gl::State &getGLState() const { return mState.getState(); }
>     const gl::Caps &getCaps() const { return mState.getCaps(); }
>     const gl::TextureCapsMap &getTextureCaps() const { return mState.getTextureCaps(); }
>     const gl::Extensions &getExtensions() const { return mState.getExtensions(); }
>@@ -176,9 +188,16 @@ class ContextImpl : public GLImplFactory
>     // on draw calls we can store the refreshed shaders in the cache.
>     void setMemoryProgramCache(gl::MemoryProgramCache *memoryProgramCache);
> 
>+    void handleError(GLenum errorCode,
>+                     const char *message,
>+                     const char *file,
>+                     const char *function,
>+                     unsigned int line);
>+
>   protected:
>-    const gl::ContextState &mState;
>+    const gl::State &mState;
>     gl::MemoryProgramCache *mMemoryProgramCache;
>+    gl::ErrorSet *mErrors;
> };
> 
> }  // namespace rx
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/DeviceImpl.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/DeviceImpl.cpp
>index 6a166236d0e..840a89fb4cf 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/DeviceImpl.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/DeviceImpl.cpp
>@@ -11,12 +11,8 @@
> namespace rx
> {
> 
>-DeviceImpl::DeviceImpl()
>-{
>-}
>+DeviceImpl::DeviceImpl() {}
> 
>-DeviceImpl::~DeviceImpl()
>-{
>-}
>+DeviceImpl::~DeviceImpl() {}
> 
>-}
>+}  // namespace rx
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/DeviceImpl.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/DeviceImpl.h
>index 550bc1e2d9a..353bb978be4 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/DeviceImpl.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/DeviceImpl.h
>@@ -10,8 +10,8 @@
> #define LIBANGLE_RENDERER_DEVICEIMPL_H_
> 
> #include "common/angleutils.h"
>-#include "libANGLE/Error.h"
> #include "libANGLE/Caps.h"
>+#include "libANGLE/Error.h"
> 
> namespace egl
> {
>@@ -26,12 +26,13 @@ class DeviceImpl : angle::NonCopyable
>     DeviceImpl();
>     virtual ~DeviceImpl();
> 
>-    virtual egl::Error getDevice(void **outValue) = 0;
>-    virtual EGLint getType() = 0;
>+    virtual egl::Error initialize() = 0;
>+
>+    virtual egl::Error getDevice(void **outValue)                               = 0;
>+    virtual EGLint getType()                                                    = 0;
>     virtual void generateExtensions(egl::DeviceExtensions *outExtensions) const = 0;
>-    virtual bool deviceExternallySourced() = 0;
> };
> 
>-}
>+}  // namespace rx
> 
>-#endif // LIBANGLE_RENDERER_DEVICEIMPL_H_
>+#endif  // LIBANGLE_RENDERER_DEVICEIMPL_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/DisplayImpl.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/DisplayImpl.cpp
>index 5cc9da96dc1..da32d47486b 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/DisplayImpl.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/DisplayImpl.cpp
>@@ -15,9 +15,8 @@ namespace rx
> {
> 
> DisplayImpl::DisplayImpl(const egl::DisplayState &state)
>-    : mState(state), mExtensionsInitialized(false), mCapsInitialized(false)
>-{
>-}
>+    : mState(state), mExtensionsInitialized(false), mCapsInitialized(false), mBlobCache(nullptr)
>+{}
> 
> DisplayImpl::~DisplayImpl()
> {
>@@ -44,6 +43,15 @@ egl::Error DisplayImpl::validateClientBuffer(const egl::Config *configuration,
>     return egl::EglBadDisplay() << "DisplayImpl::validateClientBuffer unimplemented.";
> }
> 
>+egl::Error DisplayImpl::validateImageClientBuffer(const gl::Context *context,
>+                                                  EGLenum target,
>+                                                  EGLClientBuffer clientBuffer,
>+                                                  const egl::AttributeMap &attribs) const
>+{
>+    UNREACHABLE();
>+    return egl::EglBadDisplay() << "DisplayImpl::validateImageClientBuffer unimplemented.";
>+}
>+
> const egl::Caps &DisplayImpl::getCaps() const
> {
>     if (!mCapsInitialized)
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/DisplayImpl.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/DisplayImpl.h
>index b1c49d9bc81..f9e297edc5a 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/DisplayImpl.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/DisplayImpl.h
>@@ -13,9 +13,9 @@
> #include "libANGLE/Caps.h"
> #include "libANGLE/Config.h"
> #include "libANGLE/Error.h"
>-#include "libANGLE/renderer/EGLImplFactory.h"
> #include "libANGLE/Stream.h"
> #include "libANGLE/Version.h"
>+#include "libANGLE/renderer/EGLImplFactory.h"
> 
> #include <set>
> #include <vector>
>@@ -23,13 +23,14 @@
> namespace egl
> {
> class AttributeMap;
>+class BlobCache;
> class Display;
> struct DisplayState;
> struct Config;
> class Surface;
> class ImageSibling;
> class Thread;
>-}
>+}  // namespace egl
> 
> namespace gl
> {
>@@ -51,13 +52,15 @@ class DisplayImpl : public EGLImplFactory
>     ~DisplayImpl() override;
> 
>     virtual egl::Error initialize(egl::Display *display) = 0;
>-    virtual void terminate() = 0;
>+    virtual void terminate()                             = 0;
> 
>-    virtual egl::Error makeCurrent(egl::Surface *drawSurface, egl::Surface *readSurface, gl::Context *context) = 0;
>+    virtual egl::Error makeCurrent(egl::Surface *drawSurface,
>+                                   egl::Surface *readSurface,
>+                                   gl::Context *context) = 0;
> 
>     virtual egl::ConfigSet generateConfigs() = 0;
> 
>-    virtual bool testDeviceLost() = 0;
>+    virtual bool testDeviceLost()                                     = 0;
>     virtual egl::Error restoreLostDevice(const egl::Display *display) = 0;
> 
>     virtual bool isValidNativeWindow(EGLNativeWindowType window) const = 0;
>@@ -65,32 +68,43 @@ class DisplayImpl : public EGLImplFactory
>                                             EGLenum buftype,
>                                             EGLClientBuffer clientBuffer,
>                                             const egl::AttributeMap &attribs) const;
>+    virtual egl::Error validateImageClientBuffer(const gl::Context *context,
>+                                                 EGLenum target,
>+                                                 EGLClientBuffer clientBuffer,
>+                                                 const egl::AttributeMap &attribs) const;
> 
>     virtual std::string getVendorString() const = 0;
> 
>-    virtual egl::Error getDevice(DeviceImpl **device) = 0;
>+    virtual DeviceImpl *createDevice() = 0;
> 
>-    virtual egl::Error waitClient(const gl::Context *context) const = 0;
>-    virtual egl::Error waitNative(const gl::Context *context, EGLint engine) const = 0;
>-    virtual gl::Version getMaxSupportedESVersion() const           = 0;
>+    virtual egl::Error waitClient(const gl::Context *context)                = 0;
>+    virtual egl::Error waitNative(const gl::Context *context, EGLint engine) = 0;
>+    virtual gl::Version getMaxSupportedESVersion() const                     = 0;
>     const egl::Caps &getCaps() const;
> 
>+    virtual void setBlobCacheFuncs(EGLSetBlobFuncANDROID set, EGLGetBlobFuncANDROID get) {}
>+
>     const egl::DisplayExtensions &getExtensions() const;
> 
>+    void setBlobCache(egl::BlobCache *blobCache) { mBlobCache = blobCache; }
>+    egl::BlobCache *getBlobCache() const { return mBlobCache; }
>+
>   protected:
>     const egl::DisplayState &mState;
> 
>   private:
>     virtual void generateExtensions(egl::DisplayExtensions *outExtensions) const = 0;
>-    virtual void generateCaps(egl::Caps *outCaps) const = 0;
>+    virtual void generateCaps(egl::Caps *outCaps) const                          = 0;
> 
>     mutable bool mExtensionsInitialized;
>     mutable egl::DisplayExtensions mExtensions;
> 
>     mutable bool mCapsInitialized;
>     mutable egl::Caps mCaps;
>+
>+    egl::BlobCache *mBlobCache;
> };
> 
>-}
>+}  // namespace rx
> 
>-#endif // LIBANGLE_RENDERER_DISPLAYIMPL_H_
>+#endif  // LIBANGLE_RENDERER_DISPLAYIMPL_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/EGLImplFactory.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/EGLImplFactory.h
>index 0433364cd33..3748953ba2c 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/EGLImplFactory.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/EGLImplFactory.h
>@@ -19,18 +19,21 @@ struct Config;
> class ImageSibling;
> struct ImageState;
> struct SurfaceState;
>-}
>+}  // namespace egl
> 
> namespace gl
> {
> class Context;
>-class ContextState;
>-}
>+class ErrorSet;
>+class State;
>+}  // namespace gl
> 
> namespace rx
> {
> class ContextImpl;
>+class EGLSyncImpl;
> class ImageImpl;
>+class ExternalImageSiblingImpl;
> class SurfaceImpl;
> 
> class EGLImplFactory : angle::NonCopyable
>@@ -41,28 +44,56 @@ class EGLImplFactory : angle::NonCopyable
> 
>     virtual SurfaceImpl *createWindowSurface(const egl::SurfaceState &state,
>                                              EGLNativeWindowType window,
>-                                             const egl::AttributeMap &attribs) = 0;
>+                                             const egl::AttributeMap &attribs)           = 0;
>     virtual SurfaceImpl *createPbufferSurface(const egl::SurfaceState &state,
>-                                              const egl::AttributeMap &attribs) = 0;
>+                                              const egl::AttributeMap &attribs)          = 0;
>     virtual SurfaceImpl *createPbufferFromClientBuffer(const egl::SurfaceState &state,
>                                                        EGLenum buftype,
>                                                        EGLClientBuffer clientBuffer,
>                                                        const egl::AttributeMap &attribs) = 0;
>     virtual SurfaceImpl *createPixmapSurface(const egl::SurfaceState &state,
>                                              NativePixmapType nativePixmap,
>-                                             const egl::AttributeMap &attribs) = 0;
>+                                             const egl::AttributeMap &attribs)           = 0;
> 
>     virtual ImageImpl *createImage(const egl::ImageState &state,
>+                                   const gl::Context *context,
>                                    EGLenum target,
>                                    const egl::AttributeMap &attribs) = 0;
> 
>-    virtual ContextImpl *createContext(const gl::ContextState &state) = 0;
>+    virtual ContextImpl *createContext(const gl::State &state,
>+                                       gl::ErrorSet *errorSet,
>+                                       const egl::Config *configuration,
>+                                       const gl::Context *shareContext,
>+                                       const egl::AttributeMap &attribs) = 0;
> 
>-    virtual StreamProducerImpl *createStreamProducerD3DTextureNV12(
>+    virtual StreamProducerImpl *createStreamProducerD3DTexture(
>         egl::Stream::ConsumerType consumerType,
>         const egl::AttributeMap &attribs) = 0;
>+
>+    virtual ExternalImageSiblingImpl *createExternalImageSibling(const gl::Context *context,
>+                                                                 EGLenum target,
>+                                                                 EGLClientBuffer buffer,
>+                                                                 const egl::AttributeMap &attribs);
>+
>+    virtual EGLSyncImpl *createSync(const egl::AttributeMap &attribs);
> };
> 
>+inline ExternalImageSiblingImpl *EGLImplFactory::createExternalImageSibling(
>+    const gl::Context *context,
>+    EGLenum target,
>+    EGLClientBuffer buffer,
>+    const egl::AttributeMap &attribs)
>+{
>+    UNREACHABLE();
>+    return nullptr;
>+}
>+
>+inline EGLSyncImpl *EGLImplFactory::createSync(const egl::AttributeMap &attribs)
>+{
>+    UNREACHABLE();
>+    return nullptr;
>+}
>+
> }  // namespace rx
> 
> #endif  // LIBANGLE_RENDERER_EGLIMPLFACTORY_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/EGLSyncImpl.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/EGLSyncImpl.h
>new file mode 100644
>index 00000000000..561251df67b
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/EGLSyncImpl.h
>@@ -0,0 +1,53 @@
>+//
>+// Copyright 2019 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+
>+// EGLSyncImpl.h: Defines the rx::EGLSyncImpl class.
>+
>+#ifndef LIBANGLE_RENDERER_EGLSYNCIMPL_H_
>+#define LIBANGLE_RENDERER_EGLSYNCIMPL_H_
>+
>+#include "libANGLE/Error.h"
>+
>+#include "common/angleutils.h"
>+
>+#include "angle_gl.h"
>+
>+namespace egl
>+{
>+class Display;
>+}  // namespace egl
>+
>+namespace gl
>+{
>+class Context;
>+}  // namespace gl
>+
>+namespace rx
>+{
>+class EGLSyncImpl : angle::NonCopyable
>+{
>+  public:
>+    EGLSyncImpl() {}
>+    virtual ~EGLSyncImpl() {}
>+
>+    virtual void onDestroy(const egl::Display *display) {}
>+
>+    virtual egl::Error initialize(const egl::Display *display,
>+                                  const gl::Context *context,
>+                                  EGLenum type)                                  = 0;
>+    virtual egl::Error clientWait(const egl::Display *display,
>+                                  const gl::Context *context,
>+                                  EGLint flags,
>+                                  EGLTime timeout,
>+                                  EGLint *outResult)                             = 0;
>+    virtual egl::Error serverWait(const egl::Display *display,
>+                                  const gl::Context *context,
>+                                  EGLint flags)                                  = 0;
>+    virtual egl::Error getStatus(const egl::Display *display, EGLint *outStatus) = 0;
>+};
>+}  // namespace rx
>+
>+#endif  // LIBANGLE_RENDERER_EGLSYNCIMPL_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/FenceNVImpl.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/FenceNVImpl.h
>index a5349149708..eaa055749c6 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/FenceNVImpl.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/FenceNVImpl.h
>@@ -15,20 +15,23 @@
> 
> #include "angle_gl.h"
> 
>-namespace rx
>+namespace gl
> {
>+class Context;
>+}  // namespace gl
> 
>+namespace rx
>+{
> class FenceNVImpl : angle::NonCopyable
> {
>   public:
>-    FenceNVImpl() { };
>-    virtual ~FenceNVImpl() { };
>+    FenceNVImpl() {}
>+    virtual ~FenceNVImpl() {}
> 
>-    virtual gl::Error set(GLenum condition) = 0;
>-    virtual gl::Error test(GLboolean *outFinished) = 0;
>-    virtual gl::Error finish() = 0;
>+    virtual angle::Result set(const gl::Context *context, GLenum condition)        = 0;
>+    virtual angle::Result test(const gl::Context *context, GLboolean *outFinished) = 0;
>+    virtual angle::Result finish(const gl::Context *context)                       = 0;
> };
>+}  // namespace rx
> 
>-}
>-
>-#endif // LIBANGLE_RENDERER_FENCENVIMPL_H_
>+#endif  // LIBANGLE_RENDERER_FENCENVIMPL_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/Format.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/Format.h
>index 66bdace3e94..d1d5490cb4f 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/Format.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/Format.h
>@@ -12,34 +12,54 @@
> #ifndef LIBANGLE_RENDERER_FORMAT_H_
> #define LIBANGLE_RENDERER_FORMAT_H_
> 
>+#include "libANGLE/renderer/FormatID_autogen.h"
> #include "libANGLE/renderer/renderer_utils.h"
> 
> namespace angle
> {
>+enum class FormatID;
>+
>+extern const Format gFormatInfoTable[];
> 
> struct Format final : private angle::NonCopyable
> {
>-    enum class ID;
>-
>-    constexpr Format(ID id,
>-                     GLenum glFormat,
>-                     GLenum fboFormat,
>-                     rx::MipGenerationFunction mipGen,
>-                     const rx::FastCopyFunctionMap &fastCopyFunctions,
>-                     rx::ColorReadFunction colorRead,
>-                     rx::ColorWriteFunction colorWrite,
>-                     GLenum componentType,
>-                     GLuint redBits,
>-                     GLuint greenBits,
>-                     GLuint blueBits,
>-                     GLuint alphaBits,
>-                     GLuint depthBits,
>-                     GLuint stencilBits);
>-
>-    static const Format &Get(ID id);
>-    static ID InternalFormatToID(GLenum internalFormat);
>-
>-    ID id;
>+    inline constexpr Format(FormatID id,
>+                            GLenum glFormat,
>+                            GLenum fboFormat,
>+                            rx::MipGenerationFunction mipGen,
>+                            const rx::FastCopyFunctionMap &fastCopyFunctions,
>+                            rx::PixelReadFunction colorRead,
>+                            rx::PixelWriteFunction colorWrite,
>+                            GLenum componentType,
>+                            GLuint redBits,
>+                            GLuint greenBits,
>+                            GLuint blueBits,
>+                            GLuint alphaBits,
>+                            GLuint luminanceBits,
>+                            GLuint depthBits,
>+                            GLuint stencilBits,
>+                            GLuint pixelBytes,
>+                            GLuint componentAlignmentMask,
>+                            bool isBlock,
>+                            bool isFixed);
>+
>+    static const Format &Get(FormatID id) { return gFormatInfoTable[static_cast<int>(id)]; }
>+
>+    static FormatID InternalFormatToID(GLenum internalFormat);
>+
>+    constexpr bool hasDepthOrStencilBits() const;
>+    constexpr bool isLUMA() const;
>+    constexpr GLuint channelCount() const;
>+
>+    constexpr bool isInt() const;
>+    constexpr bool isUint() const;
>+    constexpr bool isSnorm() const;
>+    constexpr bool isUnorm() const;
>+    constexpr bool isFloat() const;
>+
>+    bool operator==(const Format &other) const { return this->id == other.id; }
>+
>+    FormatID id;
> 
>     // The closest matching GL internal format for the storage this format uses. Note that this
>     // may be a different internal format than the one this ANGLE format is used for.
>@@ -51,8 +71,8 @@ struct Format final : private angle::NonCopyable
>     GLenum fboImplementationInternalFormat;
> 
>     rx::MipGenerationFunction mipGenerationFunction;
>-    rx::ColorReadFunction colorReadFunction;
>-    rx::ColorWriteFunction colorWriteFunction;
>+    rx::PixelReadFunction pixelReadFunction;
>+    rx::PixelWriteFunction pixelWriteFunction;
> 
>     // A map from a gl::FormatType to a fast pixel copy function for this format.
>     const rx::FastCopyFunctionMap &fastCopyFunctions;
>@@ -63,43 +83,103 @@ struct Format final : private angle::NonCopyable
>     GLuint greenBits;
>     GLuint blueBits;
>     GLuint alphaBits;
>+    GLuint luminanceBits;
>     GLuint depthBits;
>     GLuint stencilBits;
>+
>+    GLuint pixelBytes;
>+
>+    // For 1-byte components, is MAX_UINT. For 2-byte, is 0x1. For 4-byte, is 0x3. For all others,
>+    // 0x0.
>+    GLuint componentAlignmentMask;
>+
>+    bool isBlock;
>+    bool isFixed;
> };
> 
>-constexpr Format::Format(ID id,
>+constexpr Format::Format(FormatID id,
>                          GLenum glFormat,
>                          GLenum fboFormat,
>                          rx::MipGenerationFunction mipGen,
>                          const rx::FastCopyFunctionMap &fastCopyFunctions,
>-                         rx::ColorReadFunction colorRead,
>-                         rx::ColorWriteFunction colorWrite,
>+                         rx::PixelReadFunction colorRead,
>+                         rx::PixelWriteFunction colorWrite,
>                          GLenum componentType,
>                          GLuint redBits,
>                          GLuint greenBits,
>                          GLuint blueBits,
>                          GLuint alphaBits,
>+                         GLuint luminanceBits,
>                          GLuint depthBits,
>-                         GLuint stencilBits)
>+                         GLuint stencilBits,
>+                         GLuint pixelBytes,
>+                         GLuint componentAlignmentMask,
>+                         bool isBlock,
>+                         bool isFixed)
>     : id(id),
>       glInternalFormat(glFormat),
>       fboImplementationInternalFormat(fboFormat),
>       mipGenerationFunction(mipGen),
>-      colorReadFunction(colorRead),
>-      colorWriteFunction(colorWrite),
>+      pixelReadFunction(colorRead),
>+      pixelWriteFunction(colorWrite),
>       fastCopyFunctions(fastCopyFunctions),
>       componentType(componentType),
>       redBits(redBits),
>       greenBits(greenBits),
>       blueBits(blueBits),
>       alphaBits(alphaBits),
>+      luminanceBits(luminanceBits),
>       depthBits(depthBits),
>-      stencilBits(stencilBits)
>+      stencilBits(stencilBits),
>+      pixelBytes(pixelBytes),
>+      componentAlignmentMask(componentAlignmentMask),
>+      isBlock(isBlock),
>+      isFixed(isFixed)
>+{}
>+
>+constexpr bool Format::hasDepthOrStencilBits() const
> {
>+    return depthBits > 0 || stencilBits > 0;
> }
> 
>-}  // namespace angle
>+constexpr bool Format::isLUMA() const
>+{
>+    // There's no format with G or B without R
>+    ASSERT(redBits > 0 || (greenBits == 0 && blueBits == 0));
>+    return redBits == 0 && (luminanceBits > 0 || alphaBits > 0);
>+}
>+
>+constexpr GLuint Format::channelCount() const
>+{
>+    return (redBits > 0) + (greenBits > 0) + (blueBits > 0) + (alphaBits > 0) +
>+           (luminanceBits > 0) + (depthBits > 0) + (stencilBits > 0);
>+}
>+
>+constexpr bool Format::isInt() const
>+{
>+    return componentType == GL_INT;
>+}
> 
>-#include "libANGLE/renderer/Format_ID_autogen.inl"
>+constexpr bool Format::isUint() const
>+{
>+    return componentType == GL_UNSIGNED_INT;
>+}
>+
>+constexpr bool Format::isSnorm() const
>+{
>+    return componentType == GL_SIGNED_NORMALIZED;
>+}
>+
>+constexpr bool Format::isUnorm() const
>+{
>+    return componentType == GL_UNSIGNED_NORMALIZED;
>+}
>+
>+constexpr bool Format::isFloat() const
>+{
>+    return componentType == GL_FLOAT;
>+}
>+
>+}  // namespace angle
> 
> #endif  // LIBANGLE_RENDERER_FORMAT_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/FormatID_autogen.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/FormatID_autogen.h
>new file mode 100644
>index 00000000000..beab70e3e96
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/FormatID_autogen.h
>@@ -0,0 +1,203 @@
>+// GENERATED FILE - DO NOT EDIT.
>+// Generated by gen_angle_format_table.py using data from angle_format_data.json
>+//
>+// Copyright 2019 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// ANGLE format enumeration.
>+
>+#ifndef LIBANGLE_RENDERER_FORMATID_H_
>+#define LIBANGLE_RENDERER_FORMATID_H_
>+
>+#include <cstdint>
>+
>+namespace angle
>+{
>+
>+enum class FormatID
>+{
>+    NONE,
>+    A16_FLOAT,
>+    A1R5G5B5_UNORM,
>+    A32_FLOAT,
>+    A8_UNORM,
>+    ASTC_10x10_SRGB_BLOCK,
>+    ASTC_10x10_UNORM_BLOCK,
>+    ASTC_10x5_SRGB_BLOCK,
>+    ASTC_10x5_UNORM_BLOCK,
>+    ASTC_10x6_SRGB_BLOCK,
>+    ASTC_10x6_UNORM_BLOCK,
>+    ASTC_10x8_SRGB_BLOCK,
>+    ASTC_10x8_UNORM_BLOCK,
>+    ASTC_12x10_SRGB_BLOCK,
>+    ASTC_12x10_UNORM_BLOCK,
>+    ASTC_12x12_SRGB_BLOCK,
>+    ASTC_12x12_UNORM_BLOCK,
>+    ASTC_4x4_SRGB_BLOCK,
>+    ASTC_4x4_UNORM_BLOCK,
>+    ASTC_5x4_SRGB_BLOCK,
>+    ASTC_5x4_UNORM_BLOCK,
>+    ASTC_5x5_SRGB_BLOCK,
>+    ASTC_5x5_UNORM_BLOCK,
>+    ASTC_6x5_SRGB_BLOCK,
>+    ASTC_6x5_UNORM_BLOCK,
>+    ASTC_6x6_SRGB_BLOCK,
>+    ASTC_6x6_UNORM_BLOCK,
>+    ASTC_8x5_SRGB_BLOCK,
>+    ASTC_8x5_UNORM_BLOCK,
>+    ASTC_8x6_SRGB_BLOCK,
>+    ASTC_8x6_UNORM_BLOCK,
>+    ASTC_8x8_SRGB_BLOCK,
>+    ASTC_8x8_UNORM_BLOCK,
>+    B4G4R4A4_UNORM,
>+    B5G5R5A1_UNORM,
>+    B5G6R5_UNORM,
>+    B8G8R8A8_TYPELESS,
>+    B8G8R8A8_TYPELESS_SRGB,
>+    B8G8R8A8_UNORM,
>+    B8G8R8A8_UNORM_SRGB,
>+    B8G8R8X8_UNORM,
>+    BC1_RGBA_UNORM_BLOCK,
>+    BC1_RGBA_UNORM_SRGB_BLOCK,
>+    BC1_RGB_UNORM_BLOCK,
>+    BC1_RGB_UNORM_SRGB_BLOCK,
>+    BC2_RGBA_UNORM_BLOCK,
>+    BC2_RGBA_UNORM_SRGB_BLOCK,
>+    BC3_RGBA_UNORM_BLOCK,
>+    BC3_RGBA_UNORM_SRGB_BLOCK,
>+    BPTC_RGBA_UNORM_BLOCK,
>+    BPTC_RGB_SIGNED_FLOAT_BLOCK,
>+    BPTC_RGB_UNSIGNED_FLOAT_BLOCK,
>+    BPTC_SRGB_ALPHA_UNORM_BLOCK,
>+    D16_UNORM,
>+    D24_UNORM_S8_UINT,
>+    D24_UNORM_X8_UINT,
>+    D32_FLOAT,
>+    D32_FLOAT_S8X24_UINT,
>+    D32_UNORM,
>+    EAC_R11G11_SNORM_BLOCK,
>+    EAC_R11G11_UNORM_BLOCK,
>+    EAC_R11_SNORM_BLOCK,
>+    EAC_R11_UNORM_BLOCK,
>+    ETC1_LOSSY_DECODE_R8G8B8_UNORM_BLOCK,
>+    ETC1_R8G8B8_UNORM_BLOCK,
>+    ETC2_R8G8B8A1_SRGB_BLOCK,
>+    ETC2_R8G8B8A1_UNORM_BLOCK,
>+    ETC2_R8G8B8A8_SRGB_BLOCK,
>+    ETC2_R8G8B8A8_UNORM_BLOCK,
>+    ETC2_R8G8B8_SRGB_BLOCK,
>+    ETC2_R8G8B8_UNORM_BLOCK,
>+    L16A16_FLOAT,
>+    L16_FLOAT,
>+    L32A32_FLOAT,
>+    L32_FLOAT,
>+    L8A8_UNORM,
>+    L8_UNORM,
>+    R10G10B10A2_SINT,
>+    R10G10B10A2_SNORM,
>+    R10G10B10A2_SSCALED,
>+    R10G10B10A2_UINT,
>+    R10G10B10A2_UNORM,
>+    R10G10B10A2_USCALED,
>+    R11G11B10_FLOAT,
>+    R16G16B16A16_FLOAT,
>+    R16G16B16A16_SINT,
>+    R16G16B16A16_SNORM,
>+    R16G16B16A16_SSCALED,
>+    R16G16B16A16_UINT,
>+    R16G16B16A16_UNORM,
>+    R16G16B16A16_USCALED,
>+    R16G16B16_FLOAT,
>+    R16G16B16_SINT,
>+    R16G16B16_SNORM,
>+    R16G16B16_SSCALED,
>+    R16G16B16_UINT,
>+    R16G16B16_UNORM,
>+    R16G16B16_USCALED,
>+    R16G16_FLOAT,
>+    R16G16_SINT,
>+    R16G16_SNORM,
>+    R16G16_SSCALED,
>+    R16G16_UINT,
>+    R16G16_UNORM,
>+    R16G16_USCALED,
>+    R16_FLOAT,
>+    R16_SINT,
>+    R16_SNORM,
>+    R16_SSCALED,
>+    R16_UINT,
>+    R16_UNORM,
>+    R16_USCALED,
>+    R32G32B32A32_FIXED,
>+    R32G32B32A32_FLOAT,
>+    R32G32B32A32_SINT,
>+    R32G32B32A32_SNORM,
>+    R32G32B32A32_SSCALED,
>+    R32G32B32A32_UINT,
>+    R32G32B32A32_UNORM,
>+    R32G32B32A32_USCALED,
>+    R32G32B32_FIXED,
>+    R32G32B32_FLOAT,
>+    R32G32B32_SINT,
>+    R32G32B32_SNORM,
>+    R32G32B32_SSCALED,
>+    R32G32B32_UINT,
>+    R32G32B32_UNORM,
>+    R32G32B32_USCALED,
>+    R32G32_FIXED,
>+    R32G32_FLOAT,
>+    R32G32_SINT,
>+    R32G32_SNORM,
>+    R32G32_SSCALED,
>+    R32G32_UINT,
>+    R32G32_UNORM,
>+    R32G32_USCALED,
>+    R32_FIXED,
>+    R32_FLOAT,
>+    R32_SINT,
>+    R32_SNORM,
>+    R32_SSCALED,
>+    R32_UINT,
>+    R32_UNORM,
>+    R32_USCALED,
>+    R4G4B4A4_UNORM,
>+    R5G5B5A1_UNORM,
>+    R5G6B5_UNORM,
>+    R8G8B8A8_SINT,
>+    R8G8B8A8_SNORM,
>+    R8G8B8A8_SSCALED,
>+    R8G8B8A8_TYPELESS,
>+    R8G8B8A8_TYPELESS_SRGB,
>+    R8G8B8A8_UINT,
>+    R8G8B8A8_UNORM,
>+    R8G8B8A8_UNORM_SRGB,
>+    R8G8B8A8_USCALED,
>+    R8G8B8_SINT,
>+    R8G8B8_SNORM,
>+    R8G8B8_SSCALED,
>+    R8G8B8_UINT,
>+    R8G8B8_UNORM,
>+    R8G8B8_UNORM_SRGB,
>+    R8G8B8_USCALED,
>+    R8G8_SINT,
>+    R8G8_SNORM,
>+    R8G8_SSCALED,
>+    R8G8_UINT,
>+    R8G8_UNORM,
>+    R8G8_USCALED,
>+    R8_SINT,
>+    R8_SNORM,
>+    R8_SSCALED,
>+    R8_UINT,
>+    R8_UNORM,
>+    R8_USCALED,
>+    R9G9B9E5_SHAREDEXP,
>+    S8_UINT
>+};
>+
>+constexpr uint32_t kNumANGLEFormats = 177;
>+
>+}  // namespace angle
>+
>+#endif  // LIBANGLE_RENDERER_FORMATID_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/Format_ID_autogen.inl b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/Format_ID_autogen.inl
>deleted file mode 100644
>index b2cbfb04104..00000000000
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/Format_ID_autogen.inl
>+++ /dev/null
>@@ -1,147 +0,0 @@
>-// GENERATED FILE - DO NOT EDIT.
>-// Generated by gen_angle_format_table.py using data from angle_format_data.json
>-//
>-// Copyright 2017 The ANGLE Project Authors. All rights reserved.
>-// Use of this source code is governed by a BSD-style license that can be
>-// found in the LICENSE file.
>-//
>-// ANGLE format enumeration.
>-
>-namespace angle
>-{
>-
>-enum class Format::ID
>-{
>-    NONE,
>-    A16_FLOAT,
>-    A32_FLOAT,
>-    A8_UNORM,
>-    ASTC_10x10_SRGB_BLOCK,
>-    ASTC_10x10_UNORM_BLOCK,
>-    ASTC_10x5_SRGB_BLOCK,
>-    ASTC_10x5_UNORM_BLOCK,
>-    ASTC_10x6_SRGB_BLOCK,
>-    ASTC_10x6_UNORM_BLOCK,
>-    ASTC_10x8_SRGB_BLOCK,
>-    ASTC_10x8_UNORM_BLOCK,
>-    ASTC_12x10_SRGB_BLOCK,
>-    ASTC_12x10_UNORM_BLOCK,
>-    ASTC_12x12_SRGB_BLOCK,
>-    ASTC_12x12_UNORM_BLOCK,
>-    ASTC_4x4_SRGB_BLOCK,
>-    ASTC_4x4_UNORM_BLOCK,
>-    ASTC_5x4_SRGB_BLOCK,
>-    ASTC_5x4_UNORM_BLOCK,
>-    ASTC_5x5_SRGB_BLOCK,
>-    ASTC_5x5_UNORM_BLOCK,
>-    ASTC_6x5_SRGB_BLOCK,
>-    ASTC_6x5_UNORM_BLOCK,
>-    ASTC_6x6_SRGB_BLOCK,
>-    ASTC_6x6_UNORM_BLOCK,
>-    ASTC_8x5_SRGB_BLOCK,
>-    ASTC_8x5_UNORM_BLOCK,
>-    ASTC_8x6_SRGB_BLOCK,
>-    ASTC_8x6_UNORM_BLOCK,
>-    ASTC_8x8_SRGB_BLOCK,
>-    ASTC_8x8_UNORM_BLOCK,
>-    B4G4R4A4_UNORM,
>-    B5G5R5A1_UNORM,
>-    B5G6R5_UNORM,
>-    B8G8R8A8_UNORM,
>-    B8G8R8A8_UNORM_SRGB,
>-    B8G8R8X8_UNORM,
>-    BC1_RGBA_UNORM_BLOCK,
>-    BC1_RGBA_UNORM_SRGB_BLOCK,
>-    BC1_RGB_UNORM_BLOCK,
>-    BC1_RGB_UNORM_SRGB_BLOCK,
>-    BC2_RGBA_UNORM_BLOCK,
>-    BC2_RGBA_UNORM_SRGB_BLOCK,
>-    BC3_RGBA_UNORM_BLOCK,
>-    BC3_RGBA_UNORM_SRGB_BLOCK,
>-    D16_UNORM,
>-    D24_UNORM,
>-    D24_UNORM_S8_UINT,
>-    D32_FLOAT,
>-    D32_FLOAT_S8X24_UINT,
>-    D32_UNORM,
>-    EAC_R11G11_SNORM_BLOCK,
>-    EAC_R11G11_UNORM_BLOCK,
>-    EAC_R11_SNORM_BLOCK,
>-    EAC_R11_UNORM_BLOCK,
>-    ETC1_LOSSY_DECODE_R8G8B8_UNORM_BLOCK,
>-    ETC1_R8G8B8_UNORM_BLOCK,
>-    ETC2_R8G8B8A1_SRGB_BLOCK,
>-    ETC2_R8G8B8A1_UNORM_BLOCK,
>-    ETC2_R8G8B8A8_SRGB_BLOCK,
>-    ETC2_R8G8B8A8_UNORM_BLOCK,
>-    ETC2_R8G8B8_SRGB_BLOCK,
>-    ETC2_R8G8B8_UNORM_BLOCK,
>-    L16A16_FLOAT,
>-    L16_FLOAT,
>-    L32A32_FLOAT,
>-    L32_FLOAT,
>-    L8A8_UNORM,
>-    L8_UNORM,
>-    R10G10B10A2_UINT,
>-    R10G10B10A2_UNORM,
>-    R11G11B10_FLOAT,
>-    R16G16B16A16_FLOAT,
>-    R16G16B16A16_SINT,
>-    R16G16B16A16_SNORM,
>-    R16G16B16A16_UINT,
>-    R16G16B16A16_UNORM,
>-    R16G16B16_FLOAT,
>-    R16G16B16_SINT,
>-    R16G16B16_SNORM,
>-    R16G16B16_UINT,
>-    R16G16B16_UNORM,
>-    R16G16_FLOAT,
>-    R16G16_SINT,
>-    R16G16_SNORM,
>-    R16G16_UINT,
>-    R16G16_UNORM,
>-    R16_FLOAT,
>-    R16_SINT,
>-    R16_SNORM,
>-    R16_UINT,
>-    R16_UNORM,
>-    R32G32B32A32_FLOAT,
>-    R32G32B32A32_SINT,
>-    R32G32B32A32_UINT,
>-    R32G32B32_FLOAT,
>-    R32G32B32_SINT,
>-    R32G32B32_UINT,
>-    R32G32_FLOAT,
>-    R32G32_SINT,
>-    R32G32_UINT,
>-    R32_FLOAT,
>-    R32_SINT,
>-    R32_UINT,
>-    R4G4B4A4_UNORM,
>-    R5G5B5A1_UNORM,
>-    R5G6B5_UNORM,
>-    R8G8B8A8_SINT,
>-    R8G8B8A8_SNORM,
>-    R8G8B8A8_UINT,
>-    R8G8B8A8_UNORM,
>-    R8G8B8A8_UNORM_SRGB,
>-    R8G8B8_SINT,
>-    R8G8B8_SNORM,
>-    R8G8B8_UINT,
>-    R8G8B8_UNORM,
>-    R8G8B8_UNORM_SRGB,
>-    R8G8_SINT,
>-    R8G8_SNORM,
>-    R8G8_UINT,
>-    R8G8_UNORM,
>-    R8_SINT,
>-    R8_SNORM,
>-    R8_UINT,
>-    R8_UNORM,
>-    R9G9B9E5_SHAREDEXP,
>-    S8_UINT
>-};
>-
>-constexpr uint32_t kNumANGLEFormats = 128;
>-
>-}  // namespace angle
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/Format_table_autogen.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/Format_table_autogen.cpp
>index ecb3ad231ac..5a9f25c764e 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/Format_table_autogen.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/Format_table_autogen.cpp
>@@ -1,7 +1,7 @@
> // GENERATED FILE - DO NOT EDIT.
> // Generated by gen_angle_format_table.py using data from angle_format_data.json
> //
>-// Copyright 2017 The ANGLE Project Authors. All rights reserved.
>+// Copyright 2019 The ANGLE Project Authors. All rights reserved.
> // Use of this source code is governed by a BSD-style license that can be
> // found in the LICENSE file.
> //
>@@ -17,418 +17,563 @@
> namespace angle
> {
> 
>-static constexpr rx::FastCopyFunctionMap::Entry BGRAEntry = {GL_RGBA, GL_UNSIGNED_BYTE,
>+static constexpr rx::FastCopyFunctionMap::Entry BGRAEntry  = {angle::FormatID::R8G8B8A8_UNORM,
>                                                              CopyBGRA8ToRGBA8};
> static constexpr rx::FastCopyFunctionMap BGRACopyFunctions = {&BGRAEntry, 1};
> static constexpr rx::FastCopyFunctionMap NoCopyFunctions;
> 
>-constexpr Format g_formatInfoTable[] = {
>+const Format gFormatInfoTable[] = {
>     // clang-format off
>-    { Format::ID::NONE, GL_NONE, GL_NONE, nullptr, NoCopyFunctions, nullptr, nullptr, GL_NONE, 0, 0, 0, 0, 0, 0 },
>-    { Format::ID::A16_FLOAT, GL_ALPHA16F_EXT, GL_ALPHA16F_EXT, GenerateMip<A16F>, NoCopyFunctions, ReadColor<A16F, GLfloat>, WriteColor<A16F, GLfloat>, GL_FLOAT, 0, 0, 0, 16, 0, 0 },
>-    { Format::ID::A32_FLOAT, GL_ALPHA32F_EXT, GL_ALPHA32F_EXT, GenerateMip<A32F>, NoCopyFunctions, ReadColor<A32F, GLfloat>, WriteColor<A32F, GLfloat>, GL_FLOAT, 0, 0, 0, 32, 0, 0 },
>-    { Format::ID::A8_UNORM, GL_ALPHA8_EXT, GL_ALPHA8_EXT, GenerateMip<A8>, NoCopyFunctions, ReadColor<A8, GLfloat>, WriteColor<A8, GLfloat>, GL_UNSIGNED_NORMALIZED, 0, 0, 0, 8, 0, 0 },
>-    { Format::ID::ASTC_10x10_SRGB_BLOCK, GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x10_KHR, GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x10_KHR, nullptr, NoCopyFunctions, nullptr, nullptr, GL_UNSIGNED_NORMALIZED, 0, 0, 0, 0, 0, 0 },
>-    { Format::ID::ASTC_10x10_UNORM_BLOCK, GL_COMPRESSED_RGBA_ASTC_10x10_KHR, GL_COMPRESSED_RGBA_ASTC_10x10_KHR, nullptr, NoCopyFunctions, nullptr, nullptr, GL_UNSIGNED_NORMALIZED, 0, 0, 0, 0, 0, 0 },
>-    { Format::ID::ASTC_10x5_SRGB_BLOCK, GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x5_KHR, GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x5_KHR, nullptr, NoCopyFunctions, nullptr, nullptr, GL_UNSIGNED_NORMALIZED, 0, 0, 0, 0, 0, 0 },
>-    { Format::ID::ASTC_10x5_UNORM_BLOCK, GL_COMPRESSED_RGBA_ASTC_10x5_KHR, GL_COMPRESSED_RGBA_ASTC_10x5_KHR, nullptr, NoCopyFunctions, nullptr, nullptr, GL_UNSIGNED_NORMALIZED, 0, 0, 0, 0, 0, 0 },
>-    { Format::ID::ASTC_10x6_SRGB_BLOCK, GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x6_KHR, GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x6_KHR, nullptr, NoCopyFunctions, nullptr, nullptr, GL_UNSIGNED_NORMALIZED, 0, 0, 0, 0, 0, 0 },
>-    { Format::ID::ASTC_10x6_UNORM_BLOCK, GL_COMPRESSED_RGBA_ASTC_10x6_KHR, GL_COMPRESSED_RGBA_ASTC_10x6_KHR, nullptr, NoCopyFunctions, nullptr, nullptr, GL_UNSIGNED_NORMALIZED, 0, 0, 0, 0, 0, 0 },
>-    { Format::ID::ASTC_10x8_SRGB_BLOCK, GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x8_KHR, GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x8_KHR, nullptr, NoCopyFunctions, nullptr, nullptr, GL_UNSIGNED_NORMALIZED, 0, 0, 0, 0, 0, 0 },
>-    { Format::ID::ASTC_10x8_UNORM_BLOCK, GL_COMPRESSED_RGBA_ASTC_10x8_KHR, GL_COMPRESSED_RGBA_ASTC_10x8_KHR, nullptr, NoCopyFunctions, nullptr, nullptr, GL_UNSIGNED_NORMALIZED, 0, 0, 0, 0, 0, 0 },
>-    { Format::ID::ASTC_12x10_SRGB_BLOCK, GL_COMPRESSED_SRGB8_ALPHA8_ASTC_12x10_KHR, GL_COMPRESSED_SRGB8_ALPHA8_ASTC_12x10_KHR, nullptr, NoCopyFunctions, nullptr, nullptr, GL_UNSIGNED_NORMALIZED, 0, 0, 0, 0, 0, 0 },
>-    { Format::ID::ASTC_12x10_UNORM_BLOCK, GL_COMPRESSED_RGBA_ASTC_12x10_KHR, GL_COMPRESSED_RGBA_ASTC_12x10_KHR, nullptr, NoCopyFunctions, nullptr, nullptr, GL_UNSIGNED_NORMALIZED, 0, 0, 0, 0, 0, 0 },
>-    { Format::ID::ASTC_12x12_SRGB_BLOCK, GL_COMPRESSED_SRGB8_ALPHA8_ASTC_12x12_KHR, GL_COMPRESSED_SRGB8_ALPHA8_ASTC_12x12_KHR, nullptr, NoCopyFunctions, nullptr, nullptr, GL_UNSIGNED_NORMALIZED, 0, 0, 0, 0, 0, 0 },
>-    { Format::ID::ASTC_12x12_UNORM_BLOCK, GL_COMPRESSED_RGBA_ASTC_12x12_KHR, GL_COMPRESSED_RGBA_ASTC_12x12_KHR, nullptr, NoCopyFunctions, nullptr, nullptr, GL_UNSIGNED_NORMALIZED, 0, 0, 0, 0, 0, 0 },
>-    { Format::ID::ASTC_4x4_SRGB_BLOCK, GL_COMPRESSED_SRGB8_ALPHA8_ASTC_4x4_KHR, GL_COMPRESSED_SRGB8_ALPHA8_ASTC_4x4_KHR, nullptr, NoCopyFunctions, nullptr, nullptr, GL_UNSIGNED_NORMALIZED, 0, 0, 0, 0, 0, 0 },
>-    { Format::ID::ASTC_4x4_UNORM_BLOCK, GL_COMPRESSED_RGBA_ASTC_4x4_KHR, GL_COMPRESSED_RGBA_ASTC_4x4_KHR, nullptr, NoCopyFunctions, nullptr, nullptr, GL_UNSIGNED_NORMALIZED, 0, 0, 0, 0, 0, 0 },
>-    { Format::ID::ASTC_5x4_SRGB_BLOCK, GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x4_KHR, GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x4_KHR, nullptr, NoCopyFunctions, nullptr, nullptr, GL_UNSIGNED_NORMALIZED, 0, 0, 0, 0, 0, 0 },
>-    { Format::ID::ASTC_5x4_UNORM_BLOCK, GL_COMPRESSED_RGBA_ASTC_5x4_KHR, GL_COMPRESSED_RGBA_ASTC_5x4_KHR, nullptr, NoCopyFunctions, nullptr, nullptr, GL_UNSIGNED_NORMALIZED, 0, 0, 0, 0, 0, 0 },
>-    { Format::ID::ASTC_5x5_SRGB_BLOCK, GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x5_KHR, GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x5_KHR, nullptr, NoCopyFunctions, nullptr, nullptr, GL_UNSIGNED_NORMALIZED, 0, 0, 0, 0, 0, 0 },
>-    { Format::ID::ASTC_5x5_UNORM_BLOCK, GL_COMPRESSED_RGBA_ASTC_5x5_KHR, GL_COMPRESSED_RGBA_ASTC_5x5_KHR, nullptr, NoCopyFunctions, nullptr, nullptr, GL_UNSIGNED_NORMALIZED, 0, 0, 0, 0, 0, 0 },
>-    { Format::ID::ASTC_6x5_SRGB_BLOCK, GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x5_KHR, GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x5_KHR, nullptr, NoCopyFunctions, nullptr, nullptr, GL_UNSIGNED_NORMALIZED, 0, 0, 0, 0, 0, 0 },
>-    { Format::ID::ASTC_6x5_UNORM_BLOCK, GL_COMPRESSED_RGBA_ASTC_6x5_KHR, GL_COMPRESSED_RGBA_ASTC_6x5_KHR, nullptr, NoCopyFunctions, nullptr, nullptr, GL_UNSIGNED_NORMALIZED, 0, 0, 0, 0, 0, 0 },
>-    { Format::ID::ASTC_6x6_SRGB_BLOCK, GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x6_KHR, GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x6_KHR, nullptr, NoCopyFunctions, nullptr, nullptr, GL_UNSIGNED_NORMALIZED, 0, 0, 0, 0, 0, 0 },
>-    { Format::ID::ASTC_6x6_UNORM_BLOCK, GL_COMPRESSED_RGBA_ASTC_6x6_KHR, GL_COMPRESSED_RGBA_ASTC_6x6_KHR, nullptr, NoCopyFunctions, nullptr, nullptr, GL_UNSIGNED_NORMALIZED, 0, 0, 0, 0, 0, 0 },
>-    { Format::ID::ASTC_8x5_SRGB_BLOCK, GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x5_KHR, GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x5_KHR, nullptr, NoCopyFunctions, nullptr, nullptr, GL_UNSIGNED_NORMALIZED, 0, 0, 0, 0, 0, 0 },
>-    { Format::ID::ASTC_8x5_UNORM_BLOCK, GL_COMPRESSED_RGBA_ASTC_8x5_KHR, GL_COMPRESSED_RGBA_ASTC_8x5_KHR, nullptr, NoCopyFunctions, nullptr, nullptr, GL_UNSIGNED_NORMALIZED, 0, 0, 0, 0, 0, 0 },
>-    { Format::ID::ASTC_8x6_SRGB_BLOCK, GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x6_KHR, GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x6_KHR, nullptr, NoCopyFunctions, nullptr, nullptr, GL_UNSIGNED_NORMALIZED, 0, 0, 0, 0, 0, 0 },
>-    { Format::ID::ASTC_8x6_UNORM_BLOCK, GL_COMPRESSED_RGBA_ASTC_8x6_KHR, GL_COMPRESSED_RGBA_ASTC_8x6_KHR, nullptr, NoCopyFunctions, nullptr, nullptr, GL_UNSIGNED_NORMALIZED, 0, 0, 0, 0, 0, 0 },
>-    { Format::ID::ASTC_8x8_SRGB_BLOCK, GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x8_KHR, GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x8_KHR, nullptr, NoCopyFunctions, nullptr, nullptr, GL_UNSIGNED_NORMALIZED, 0, 0, 0, 0, 0, 0 },
>-    { Format::ID::ASTC_8x8_UNORM_BLOCK, GL_COMPRESSED_RGBA_ASTC_8x8_KHR, GL_COMPRESSED_RGBA_ASTC_8x8_KHR, nullptr, NoCopyFunctions, nullptr, nullptr, GL_UNSIGNED_NORMALIZED, 0, 0, 0, 0, 0, 0 },
>-    { Format::ID::B4G4R4A4_UNORM, GL_BGRA4_ANGLEX, GL_RGBA4, GenerateMip<A4R4G4B4>, NoCopyFunctions, ReadColor<A4R4G4B4, GLfloat>, WriteColor<A4R4G4B4, GLfloat>, GL_UNSIGNED_NORMALIZED, 4, 4, 4, 4, 0, 0 },
>-    { Format::ID::B5G5R5A1_UNORM, GL_BGR5_A1_ANGLEX, GL_RGB5_A1, GenerateMip<A1R5G5B5>, NoCopyFunctions, ReadColor<A1R5G5B5, GLfloat>, WriteColor<A1R5G5B5, GLfloat>, GL_UNSIGNED_NORMALIZED, 5, 5, 5, 1, 0, 0 },
>-    { Format::ID::B5G6R5_UNORM, GL_BGR565_ANGLEX, GL_RGB565, GenerateMip<B5G6R5>, NoCopyFunctions, ReadColor<B5G6R5, GLfloat>, WriteColor<B5G6R5, GLfloat>, GL_UNSIGNED_NORMALIZED, 5, 6, 5, 0, 0, 0 },
>-    { Format::ID::B8G8R8A8_UNORM, GL_BGRA8_EXT, GL_BGRA8_EXT, GenerateMip<B8G8R8A8>, BGRACopyFunctions, ReadColor<B8G8R8A8, GLfloat>, WriteColor<B8G8R8A8, GLfloat>, GL_UNSIGNED_NORMALIZED, 8, 8, 8, 8, 0, 0 },
>-    { Format::ID::B8G8R8A8_UNORM_SRGB, GL_BGRA8_SRGB_ANGLEX, GL_BGRA8_SRGB_ANGLEX, GenerateMip<B8G8R8A8>, NoCopyFunctions, ReadColor<B8G8R8A8, GLfloat>, WriteColor<B8G8R8A8, GLfloat>, GL_UNSIGNED_NORMALIZED, 8, 8, 8, 8, 0, 0 },
>-    { Format::ID::B8G8R8X8_UNORM, GL_BGRA8_EXT, GL_BGRA8_EXT, GenerateMip<B8G8R8X8>, NoCopyFunctions, ReadColor<B8G8R8X8, GLfloat>, WriteColor<B8G8R8X8, GLfloat>, GL_UNSIGNED_NORMALIZED, 8, 8, 8, 0, 0, 0 },
>-    { Format::ID::BC1_RGBA_UNORM_BLOCK, GL_COMPRESSED_RGBA_S3TC_DXT1_EXT, GL_COMPRESSED_RGBA_S3TC_DXT1_EXT, nullptr, NoCopyFunctions, nullptr, nullptr, GL_UNSIGNED_NORMALIZED, 0, 0, 0, 0, 0, 0 },
>-    { Format::ID::BC1_RGBA_UNORM_SRGB_BLOCK, GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT1_EXT, GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT1_EXT, nullptr, NoCopyFunctions, nullptr, nullptr, GL_UNSIGNED_NORMALIZED, 0, 0, 0, 0, 0, 0 },
>-    { Format::ID::BC1_RGB_UNORM_BLOCK, GL_COMPRESSED_RGB_S3TC_DXT1_EXT, GL_COMPRESSED_RGB_S3TC_DXT1_EXT, nullptr, NoCopyFunctions, nullptr, nullptr, GL_UNSIGNED_NORMALIZED, 0, 0, 0, 0, 0, 0 },
>-    { Format::ID::BC1_RGB_UNORM_SRGB_BLOCK, GL_COMPRESSED_SRGB_S3TC_DXT1_EXT, GL_COMPRESSED_SRGB_S3TC_DXT1_EXT, nullptr, NoCopyFunctions, nullptr, nullptr, GL_UNSIGNED_NORMALIZED, 0, 0, 0, 0, 0, 0 },
>-    { Format::ID::BC2_RGBA_UNORM_BLOCK, GL_COMPRESSED_RGBA_S3TC_DXT3_ANGLE, GL_COMPRESSED_RGBA_S3TC_DXT3_ANGLE, nullptr, NoCopyFunctions, nullptr, nullptr, GL_UNSIGNED_NORMALIZED, 0, 0, 0, 0, 0, 0 },
>-    { Format::ID::BC2_RGBA_UNORM_SRGB_BLOCK, GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT3_EXT, GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT3_EXT, nullptr, NoCopyFunctions, nullptr, nullptr, GL_UNSIGNED_NORMALIZED, 0, 0, 0, 0, 0, 0 },
>-    { Format::ID::BC3_RGBA_UNORM_BLOCK, GL_COMPRESSED_RGBA_S3TC_DXT5_ANGLE, GL_COMPRESSED_RGBA_S3TC_DXT5_ANGLE, nullptr, NoCopyFunctions, nullptr, nullptr, GL_UNSIGNED_NORMALIZED, 0, 0, 0, 0, 0, 0 },
>-    { Format::ID::BC3_RGBA_UNORM_SRGB_BLOCK, GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT5_EXT, GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT5_EXT, nullptr, NoCopyFunctions, nullptr, nullptr, GL_UNSIGNED_NORMALIZED, 0, 0, 0, 0, 0, 0 },
>-    { Format::ID::D16_UNORM, GL_DEPTH_COMPONENT16, GL_DEPTH_COMPONENT16, nullptr, NoCopyFunctions, nullptr, nullptr, GL_UNSIGNED_NORMALIZED, 0, 0, 0, 0, 16, 0 },
>-    { Format::ID::D24_UNORM, GL_DEPTH_COMPONENT24, GL_DEPTH_COMPONENT24, nullptr, NoCopyFunctions, nullptr, nullptr, GL_UNSIGNED_NORMALIZED, 0, 0, 0, 0, 24, 0 },
>-    { Format::ID::D24_UNORM_S8_UINT, GL_DEPTH24_STENCIL8, GL_DEPTH24_STENCIL8, nullptr, NoCopyFunctions, nullptr, nullptr, GL_UNSIGNED_NORMALIZED, 0, 0, 0, 0, 24, 8 },
>-    { Format::ID::D32_FLOAT, GL_DEPTH_COMPONENT32F, GL_DEPTH_COMPONENT32F, nullptr, NoCopyFunctions, nullptr, nullptr, GL_FLOAT, 0, 0, 0, 0, 32, 0 },
>-    { Format::ID::D32_FLOAT_S8X24_UINT, GL_DEPTH32F_STENCIL8, GL_DEPTH32F_STENCIL8, nullptr, NoCopyFunctions, nullptr, nullptr, GL_FLOAT, 0, 0, 0, 0, 32, 8 },
>-    { Format::ID::D32_UNORM, GL_DEPTH_COMPONENT32_OES, GL_DEPTH_COMPONENT32_OES, nullptr, NoCopyFunctions, nullptr, nullptr, GL_UNSIGNED_NORMALIZED, 0, 0, 0, 0, 32, 0 },
>-    { Format::ID::EAC_R11G11_SNORM_BLOCK, GL_COMPRESSED_SIGNED_RG11_EAC, GL_COMPRESSED_SIGNED_RG11_EAC, nullptr, NoCopyFunctions, nullptr, nullptr, GL_SIGNED_NORMALIZED, 11, 11, 0, 0, 0, 0 },
>-    { Format::ID::EAC_R11G11_UNORM_BLOCK, GL_COMPRESSED_RG11_EAC, GL_COMPRESSED_RG11_EAC, nullptr, NoCopyFunctions, nullptr, nullptr, GL_UNSIGNED_NORMALIZED, 11, 11, 0, 0, 0, 0 },
>-    { Format::ID::EAC_R11_SNORM_BLOCK, GL_COMPRESSED_SIGNED_R11_EAC, GL_COMPRESSED_SIGNED_R11_EAC, nullptr, NoCopyFunctions, nullptr, nullptr, GL_SIGNED_NORMALIZED, 11, 0, 0, 0, 0, 0 },
>-    { Format::ID::EAC_R11_UNORM_BLOCK, GL_COMPRESSED_R11_EAC, GL_COMPRESSED_R11_EAC, nullptr, NoCopyFunctions, nullptr, nullptr, GL_UNSIGNED_NORMALIZED, 11, 0, 0, 0, 0, 0 },
>-    { Format::ID::ETC1_LOSSY_DECODE_R8G8B8_UNORM_BLOCK, GL_ETC1_RGB8_LOSSY_DECODE_ANGLE, GL_ETC1_RGB8_LOSSY_DECODE_ANGLE, nullptr, NoCopyFunctions, nullptr, nullptr, GL_UNSIGNED_NORMALIZED, 8, 8, 8, 0, 0, 0 },
>-    { Format::ID::ETC1_R8G8B8_UNORM_BLOCK, GL_ETC1_RGB8_OES, GL_ETC1_RGB8_OES, nullptr, NoCopyFunctions, nullptr, nullptr, GL_UNSIGNED_NORMALIZED, 8, 8, 8, 0, 0, 0 },
>-    { Format::ID::ETC2_R8G8B8A1_SRGB_BLOCK, GL_COMPRESSED_SRGB8_PUNCHTHROUGH_ALPHA1_ETC2, GL_COMPRESSED_SRGB8_PUNCHTHROUGH_ALPHA1_ETC2, nullptr, NoCopyFunctions, nullptr, nullptr, GL_UNSIGNED_NORMALIZED, 8, 8, 8, 1, 0, 0 },
>-    { Format::ID::ETC2_R8G8B8A1_UNORM_BLOCK, GL_COMPRESSED_RGB8_PUNCHTHROUGH_ALPHA1_ETC2, GL_COMPRESSED_RGB8_PUNCHTHROUGH_ALPHA1_ETC2, nullptr, NoCopyFunctions, nullptr, nullptr, GL_UNSIGNED_NORMALIZED, 8, 8, 8, 1, 0, 0 },
>-    { Format::ID::ETC2_R8G8B8A8_SRGB_BLOCK, GL_COMPRESSED_SRGB8_ALPHA8_ETC2_EAC, GL_COMPRESSED_SRGB8_ALPHA8_ETC2_EAC, nullptr, NoCopyFunctions, nullptr, nullptr, GL_UNSIGNED_NORMALIZED, 8, 8, 8, 8, 0, 0 },
>-    { Format::ID::ETC2_R8G8B8A8_UNORM_BLOCK, GL_COMPRESSED_RGBA8_ETC2_EAC, GL_COMPRESSED_RGBA8_ETC2_EAC, nullptr, NoCopyFunctions, nullptr, nullptr, GL_UNSIGNED_NORMALIZED, 8, 8, 8, 8, 0, 0 },
>-    { Format::ID::ETC2_R8G8B8_SRGB_BLOCK, GL_COMPRESSED_SRGB8_ETC2, GL_COMPRESSED_SRGB8_ETC2, nullptr, NoCopyFunctions, nullptr, nullptr, GL_UNSIGNED_NORMALIZED, 8, 8, 8, 0, 0, 0 },
>-    { Format::ID::ETC2_R8G8B8_UNORM_BLOCK, GL_COMPRESSED_RGB8_ETC2, GL_COMPRESSED_RGB8_ETC2, nullptr, NoCopyFunctions, nullptr, nullptr, GL_UNSIGNED_NORMALIZED, 8, 8, 8, 0, 0, 0 },
>-    { Format::ID::L16A16_FLOAT, GL_LUMINANCE_ALPHA16F_EXT, GL_LUMINANCE_ALPHA16F_EXT, GenerateMip<L16A16F>, NoCopyFunctions, ReadColor<L16A16F, GLfloat>, WriteColor<L16A16F, GLfloat>, GL_FLOAT, 0, 0, 0, 16, 0, 0 },
>-    { Format::ID::L16_FLOAT, GL_LUMINANCE16F_EXT, GL_LUMINANCE16F_EXT, GenerateMip<L16F>, NoCopyFunctions, ReadColor<L16F, GLfloat>, WriteColor<L16F, GLfloat>, GL_FLOAT, 0, 0, 0, 0, 0, 0 },
>-    { Format::ID::L32A32_FLOAT, GL_LUMINANCE_ALPHA32F_EXT, GL_LUMINANCE_ALPHA32F_EXT, GenerateMip<L32A32F>, NoCopyFunctions, ReadColor<L32A32F, GLfloat>, WriteColor<L32A32F, GLfloat>, GL_FLOAT, 0, 0, 0, 32, 0, 0 },
>-    { Format::ID::L32_FLOAT, GL_LUMINANCE32F_EXT, GL_LUMINANCE32F_EXT, GenerateMip<L32F>, NoCopyFunctions, ReadColor<L32F, GLfloat>, WriteColor<L32F, GLfloat>, GL_FLOAT, 0, 0, 0, 0, 0, 0 },
>-    { Format::ID::L8A8_UNORM, GL_LUMINANCE8_ALPHA8_EXT, GL_LUMINANCE8_ALPHA8_EXT, GenerateMip<L8A8>, NoCopyFunctions, ReadColor<L8A8, GLfloat>, WriteColor<L8A8, GLfloat>, GL_UNSIGNED_NORMALIZED, 0, 0, 0, 8, 0, 0 },
>-    { Format::ID::L8_UNORM, GL_LUMINANCE8_EXT, GL_LUMINANCE8_EXT, GenerateMip<L8>, NoCopyFunctions, ReadColor<L8, GLfloat>, WriteColor<L8, GLfloat>, GL_UNSIGNED_NORMALIZED, 0, 0, 0, 0, 0, 0 },
>-    { Format::ID::R10G10B10A2_UINT, GL_RGB10_A2UI, GL_RGB10_A2UI, GenerateMip<R10G10B10A2>, NoCopyFunctions, ReadColor<R10G10B10A2, GLuint>, WriteColor<R10G10B10A2, GLuint>, GL_UNSIGNED_INT, 10, 10, 10, 2, 0, 0 },
>-    { Format::ID::R10G10B10A2_UNORM, GL_RGB10_A2, GL_RGB10_A2, GenerateMip<R10G10B10A2>, NoCopyFunctions, ReadColor<R10G10B10A2, GLfloat>, WriteColor<R10G10B10A2, GLfloat>, GL_UNSIGNED_NORMALIZED, 10, 10, 10, 2, 0, 0 },
>-    { Format::ID::R11G11B10_FLOAT, GL_R11F_G11F_B10F, GL_R11F_G11F_B10F, GenerateMip<R11G11B10F>, NoCopyFunctions, ReadColor<R11G11B10F, GLfloat>, WriteColor<R11G11B10F, GLfloat>, GL_FLOAT, 11, 11, 10, 0, 0, 0 },
>-    { Format::ID::R16G16B16A16_FLOAT, GL_RGBA16F, GL_RGBA16F, GenerateMip<R16G16B16A16F>, NoCopyFunctions, ReadColor<R16G16B16A16F, GLfloat>, WriteColor<R16G16B16A16F, GLfloat>, GL_FLOAT, 16, 16, 16, 16, 0, 0 },
>-    { Format::ID::R16G16B16A16_SINT, GL_RGBA16I, GL_RGBA16I, GenerateMip<R16G16B16A16S>, NoCopyFunctions, ReadColor<R16G16B16A16S, GLint>, WriteColor<R16G16B16A16S, GLint>, GL_INT, 16, 16, 16, 16, 0, 0 },
>-    { Format::ID::R16G16B16A16_SNORM, GL_RGBA16_SNORM_EXT, GL_RGBA16_SNORM_EXT, GenerateMip<R16G16B16A16S>, NoCopyFunctions, ReadColor<R16G16B16A16S, GLfloat>, WriteColor<R16G16B16A16S, GLfloat>, GL_SIGNED_NORMALIZED, 16, 16, 16, 16, 0, 0 },
>-    { Format::ID::R16G16B16A16_UINT, GL_RGBA16UI, GL_RGBA16UI, GenerateMip<R16G16B16A16>, NoCopyFunctions, ReadColor<R16G16B16A16, GLuint>, WriteColor<R16G16B16A16, GLuint>, GL_UNSIGNED_INT, 16, 16, 16, 16, 0, 0 },
>-    { Format::ID::R16G16B16A16_UNORM, GL_RGBA16_EXT, GL_RGBA16_EXT, GenerateMip<R16G16B16A16>, NoCopyFunctions, ReadColor<R16G16B16A16, GLfloat>, WriteColor<R16G16B16A16, GLfloat>, GL_UNSIGNED_NORMALIZED, 16, 16, 16, 16, 0, 0 },
>-    { Format::ID::R16G16B16_FLOAT, GL_RGB16F, GL_RGB16F, GenerateMip<R16G16B16F>, NoCopyFunctions, ReadColor<R16G16B16F, GLfloat>, WriteColor<R16G16B16F, GLfloat>, GL_FLOAT, 16, 16, 16, 0, 0, 0 },
>-    { Format::ID::R16G16B16_SINT, GL_RGB16I, GL_RGB16I, GenerateMip<R16G16B16S>, NoCopyFunctions, ReadColor<R16G16B16S, GLint>, WriteColor<R16G16B16S, GLint>, GL_INT, 16, 16, 16, 0, 0, 0 },
>-    { Format::ID::R16G16B16_SNORM, GL_RGB16_SNORM_EXT, GL_RGB16_SNORM_EXT, GenerateMip<R16G16B16S>, NoCopyFunctions, ReadColor<R16G16B16S, GLfloat>, WriteColor<R16G16B16S, GLfloat>, GL_SIGNED_NORMALIZED, 16, 16, 16, 0, 0, 0 },
>-    { Format::ID::R16G16B16_UINT, GL_RGB16UI, GL_RGB16UI, GenerateMip<R16G16B16>, NoCopyFunctions, ReadColor<R16G16B16, GLuint>, WriteColor<R16G16B16, GLuint>, GL_UNSIGNED_INT, 16, 16, 16, 0, 0, 0 },
>-    { Format::ID::R16G16B16_UNORM, GL_RGB16_EXT, GL_RGB16_EXT, GenerateMip<R16G16B16>, NoCopyFunctions, ReadColor<R16G16B16, GLfloat>, WriteColor<R16G16B16, GLfloat>, GL_UNSIGNED_NORMALIZED, 16, 16, 16, 0, 0, 0 },
>-    { Format::ID::R16G16_FLOAT, GL_RG16F, GL_RG16F, GenerateMip<R16G16F>, NoCopyFunctions, ReadColor<R16G16F, GLfloat>, WriteColor<R16G16F, GLfloat>, GL_FLOAT, 16, 16, 0, 0, 0, 0 },
>-    { Format::ID::R16G16_SINT, GL_RG16I, GL_RG16I, GenerateMip<R16G16S>, NoCopyFunctions, ReadColor<R16G16S, GLint>, WriteColor<R16G16S, GLint>, GL_INT, 16, 16, 0, 0, 0, 0 },
>-    { Format::ID::R16G16_SNORM, GL_RG16_SNORM_EXT, GL_RG16_SNORM_EXT, GenerateMip<R16G16S>, NoCopyFunctions, ReadColor<R16G16S, GLfloat>, WriteColor<R16G16S, GLfloat>, GL_SIGNED_NORMALIZED, 16, 16, 0, 0, 0, 0 },
>-    { Format::ID::R16G16_UINT, GL_RG16UI, GL_RG16UI, GenerateMip<R16G16>, NoCopyFunctions, ReadColor<R16G16, GLuint>, WriteColor<R16G16, GLuint>, GL_UNSIGNED_INT, 16, 16, 0, 0, 0, 0 },
>-    { Format::ID::R16G16_UNORM, GL_RG16_EXT, GL_RG16_EXT, GenerateMip<R16G16>, NoCopyFunctions, ReadColor<R16G16, GLfloat>, WriteColor<R16G16, GLfloat>, GL_UNSIGNED_NORMALIZED, 16, 16, 0, 0, 0, 0 },
>-    { Format::ID::R16_FLOAT, GL_R16F, GL_R16F, GenerateMip<R16F>, NoCopyFunctions, ReadColor<R16F, GLfloat>, WriteColor<R16F, GLfloat>, GL_FLOAT, 16, 0, 0, 0, 0, 0 },
>-    { Format::ID::R16_SINT, GL_R16I, GL_R16I, GenerateMip<R16S>, NoCopyFunctions, ReadColor<R16S, GLint>, WriteColor<R16S, GLint>, GL_INT, 16, 0, 0, 0, 0, 0 },
>-    { Format::ID::R16_SNORM, GL_R16_SNORM_EXT, GL_R16_SNORM_EXT, GenerateMip<R16S>, NoCopyFunctions, ReadColor<R16S, GLfloat>, WriteColor<R16S, GLfloat>, GL_SIGNED_NORMALIZED, 16, 0, 0, 0, 0, 0 },
>-    { Format::ID::R16_UINT, GL_R16UI, GL_R16UI, GenerateMip<R16>, NoCopyFunctions, ReadColor<R16, GLuint>, WriteColor<R16, GLuint>, GL_UNSIGNED_INT, 16, 0, 0, 0, 0, 0 },
>-    { Format::ID::R16_UNORM, GL_R16_EXT, GL_R16_EXT, GenerateMip<R16>, NoCopyFunctions, ReadColor<R16, GLfloat>, WriteColor<R16, GLfloat>, GL_UNSIGNED_NORMALIZED, 16, 0, 0, 0, 0, 0 },
>-    { Format::ID::R32G32B32A32_FLOAT, GL_RGBA32F, GL_RGBA32F, GenerateMip<R32G32B32A32F>, NoCopyFunctions, ReadColor<R32G32B32A32F, GLfloat>, WriteColor<R32G32B32A32F, GLfloat>, GL_FLOAT, 32, 32, 32, 32, 0, 0 },
>-    { Format::ID::R32G32B32A32_SINT, GL_RGBA32I, GL_RGBA32I, GenerateMip<R32G32B32A32S>, NoCopyFunctions, ReadColor<R32G32B32A32S, GLint>, WriteColor<R32G32B32A32S, GLint>, GL_INT, 32, 32, 32, 32, 0, 0 },
>-    { Format::ID::R32G32B32A32_UINT, GL_RGBA32UI, GL_RGBA32UI, GenerateMip<R32G32B32A32>, NoCopyFunctions, ReadColor<R32G32B32A32, GLuint>, WriteColor<R32G32B32A32, GLuint>, GL_UNSIGNED_INT, 32, 32, 32, 32, 0, 0 },
>-    { Format::ID::R32G32B32_FLOAT, GL_RGB32F, GL_RGB32F, GenerateMip<R32G32B32F>, NoCopyFunctions, ReadColor<R32G32B32F, GLfloat>, WriteColor<R32G32B32F, GLfloat>, GL_FLOAT, 32, 32, 32, 0, 0, 0 },
>-    { Format::ID::R32G32B32_SINT, GL_RGB32I, GL_RGB32I, GenerateMip<R32G32B32S>, NoCopyFunctions, ReadColor<R32G32B32S, GLint>, WriteColor<R32G32B32S, GLint>, GL_INT, 32, 32, 32, 0, 0, 0 },
>-    { Format::ID::R32G32B32_UINT, GL_RGB32UI, GL_RGB32UI, GenerateMip<R32G32B32>, NoCopyFunctions, ReadColor<R32G32B32, GLuint>, WriteColor<R32G32B32, GLuint>, GL_UNSIGNED_INT, 32, 32, 32, 0, 0, 0 },
>-    { Format::ID::R32G32_FLOAT, GL_RG32F, GL_RG32F, GenerateMip<R32G32F>, NoCopyFunctions, ReadColor<R32G32F, GLfloat>, WriteColor<R32G32F, GLfloat>, GL_FLOAT, 32, 32, 0, 0, 0, 0 },
>-    { Format::ID::R32G32_SINT, GL_RG32I, GL_RG32I, GenerateMip<R32G32S>, NoCopyFunctions, ReadColor<R32G32S, GLint>, WriteColor<R32G32S, GLint>, GL_INT, 32, 32, 0, 0, 0, 0 },
>-    { Format::ID::R32G32_UINT, GL_RG32UI, GL_RG32UI, GenerateMip<R32G32>, NoCopyFunctions, ReadColor<R32G32, GLuint>, WriteColor<R32G32, GLuint>, GL_UNSIGNED_INT, 32, 32, 0, 0, 0, 0 },
>-    { Format::ID::R32_FLOAT, GL_R32F, GL_R32F, GenerateMip<R32F>, NoCopyFunctions, ReadColor<R32F, GLfloat>, WriteColor<R32F, GLfloat>, GL_FLOAT, 32, 0, 0, 0, 0, 0 },
>-    { Format::ID::R32_SINT, GL_R32I, GL_R32I, GenerateMip<R32S>, NoCopyFunctions, ReadColor<R32S, GLint>, WriteColor<R32S, GLint>, GL_INT, 32, 0, 0, 0, 0, 0 },
>-    { Format::ID::R32_UINT, GL_R32UI, GL_R32UI, GenerateMip<R32>, NoCopyFunctions, ReadColor<R32, GLuint>, WriteColor<R32, GLuint>, GL_UNSIGNED_INT, 32, 0, 0, 0, 0, 0 },
>-    { Format::ID::R4G4B4A4_UNORM, GL_RGBA4, GL_RGBA4, GenerateMip<R4G4B4A4>, NoCopyFunctions, ReadColor<R4G4B4A4, GLfloat>, WriteColor<R4G4B4A4, GLfloat>, GL_UNSIGNED_NORMALIZED, 4, 4, 4, 4, 0, 0 },
>-    { Format::ID::R5G5B5A1_UNORM, GL_RGB5_A1, GL_RGB5_A1, GenerateMip<R5G5B5A1>, NoCopyFunctions, ReadColor<R5G5B5A1, GLfloat>, WriteColor<R5G5B5A1, GLfloat>, GL_UNSIGNED_NORMALIZED, 5, 5, 5, 1, 0, 0 },
>-    { Format::ID::R5G6B5_UNORM, GL_RGB565, GL_RGB565, GenerateMip<R5G6B5>, NoCopyFunctions, ReadColor<R5G6B5, GLfloat>, WriteColor<R5G6B5, GLfloat>, GL_UNSIGNED_NORMALIZED, 5, 6, 5, 0, 0, 0 },
>-    { Format::ID::R8G8B8A8_SINT, GL_RGBA8I, GL_RGBA8I, GenerateMip<R8G8B8A8S>, NoCopyFunctions, ReadColor<R8G8B8A8S, GLint>, WriteColor<R8G8B8A8S, GLint>, GL_INT, 8, 8, 8, 8, 0, 0 },
>-    { Format::ID::R8G8B8A8_SNORM, GL_RGBA8_SNORM, GL_RGBA8_SNORM, GenerateMip<R8G8B8A8S>, NoCopyFunctions, ReadColor<R8G8B8A8S, GLfloat>, WriteColor<R8G8B8A8S, GLfloat>, GL_SIGNED_NORMALIZED, 8, 8, 8, 8, 0, 0 },
>-    { Format::ID::R8G8B8A8_UINT, GL_RGBA8UI, GL_RGBA8UI, GenerateMip<R8G8B8A8>, NoCopyFunctions, ReadColor<R8G8B8A8, GLuint>, WriteColor<R8G8B8A8, GLuint>, GL_UNSIGNED_INT, 8, 8, 8, 8, 0, 0 },
>-    { Format::ID::R8G8B8A8_UNORM, GL_RGBA8, GL_RGBA8, GenerateMip<R8G8B8A8>, NoCopyFunctions, ReadColor<R8G8B8A8, GLfloat>, WriteColor<R8G8B8A8, GLfloat>, GL_UNSIGNED_NORMALIZED, 8, 8, 8, 8, 0, 0 },
>-    { Format::ID::R8G8B8A8_UNORM_SRGB, GL_SRGB8_ALPHA8, GL_SRGB8_ALPHA8, GenerateMip<R8G8B8A8SRGB>, NoCopyFunctions, ReadColor<R8G8B8A8SRGB, GLfloat>, WriteColor<R8G8B8A8SRGB, GLfloat>, GL_UNSIGNED_NORMALIZED, 8, 8, 8, 8, 0, 0 },
>-    { Format::ID::R8G8B8_SINT, GL_RGB8I, GL_RGB8I, GenerateMip<R8G8B8S>, NoCopyFunctions, ReadColor<R8G8B8S, GLint>, WriteColor<R8G8B8S, GLint>, GL_INT, 8, 8, 8, 0, 0, 0 },
>-    { Format::ID::R8G8B8_SNORM, GL_RGB8_SNORM, GL_RGB8_SNORM, GenerateMip<R8G8B8S>, NoCopyFunctions, ReadColor<R8G8B8S, GLfloat>, WriteColor<R8G8B8S, GLfloat>, GL_SIGNED_NORMALIZED, 8, 8, 8, 0, 0, 0 },
>-    { Format::ID::R8G8B8_UINT, GL_RGB8UI, GL_RGB8UI, GenerateMip<R8G8B8>, NoCopyFunctions, ReadColor<R8G8B8, GLuint>, WriteColor<R8G8B8, GLuint>, GL_UNSIGNED_INT, 8, 8, 8, 0, 0, 0 },
>-    { Format::ID::R8G8B8_UNORM, GL_RGB8, GL_RGB8, GenerateMip<R8G8B8>, NoCopyFunctions, ReadColor<R8G8B8, GLfloat>, WriteColor<R8G8B8, GLfloat>, GL_UNSIGNED_NORMALIZED, 8, 8, 8, 0, 0, 0 },
>-    { Format::ID::R8G8B8_UNORM_SRGB, GL_SRGB8, GL_SRGB8, GenerateMip<R8G8B8>, NoCopyFunctions, ReadColor<R8G8B8, GLfloat>, WriteColor<R8G8B8, GLfloat>, GL_UNSIGNED_NORMALIZED, 8, 8, 8, 0, 0, 0 },
>-    { Format::ID::R8G8_SINT, GL_RG8I, GL_RG8I, GenerateMip<R8G8S>, NoCopyFunctions, ReadColor<R8G8S, GLint>, WriteColor<R8G8S, GLint>, GL_INT, 8, 8, 0, 0, 0, 0 },
>-    { Format::ID::R8G8_SNORM, GL_RG8_SNORM, GL_RG8_SNORM, GenerateMip<R8G8S>, NoCopyFunctions, ReadColor<R8G8S, GLfloat>, WriteColor<R8G8S, GLfloat>, GL_SIGNED_NORMALIZED, 8, 8, 0, 0, 0, 0 },
>-    { Format::ID::R8G8_UINT, GL_RG8UI, GL_RG8UI, GenerateMip<R8G8>, NoCopyFunctions, ReadColor<R8G8, GLuint>, WriteColor<R8G8, GLuint>, GL_UNSIGNED_INT, 8, 8, 0, 0, 0, 0 },
>-    { Format::ID::R8G8_UNORM, GL_RG8, GL_RG8, GenerateMip<R8G8>, NoCopyFunctions, ReadColor<R8G8, GLfloat>, WriteColor<R8G8, GLfloat>, GL_UNSIGNED_NORMALIZED, 8, 8, 0, 0, 0, 0 },
>-    { Format::ID::R8_SINT, GL_R8I, GL_R8I, GenerateMip<R8S>, NoCopyFunctions, ReadColor<R8S, GLint>, WriteColor<R8S, GLint>, GL_INT, 8, 0, 0, 0, 0, 0 },
>-    { Format::ID::R8_SNORM, GL_R8_SNORM, GL_R8_SNORM, GenerateMip<R8S>, NoCopyFunctions, ReadColor<R8S, GLfloat>, WriteColor<R8S, GLfloat>, GL_SIGNED_NORMALIZED, 8, 0, 0, 0, 0, 0 },
>-    { Format::ID::R8_UINT, GL_R8UI, GL_R8UI, GenerateMip<R8>, NoCopyFunctions, ReadColor<R8, GLuint>, WriteColor<R8, GLuint>, GL_UNSIGNED_INT, 8, 0, 0, 0, 0, 0 },
>-    { Format::ID::R8_UNORM, GL_R8, GL_R8, GenerateMip<R8>, NoCopyFunctions, ReadColor<R8, GLfloat>, WriteColor<R8, GLfloat>, GL_UNSIGNED_NORMALIZED, 8, 0, 0, 0, 0, 0 },
>-    { Format::ID::R9G9B9E5_SHAREDEXP, GL_RGB9_E5, GL_RGB9_E5, GenerateMip<R9G9B9E5>, NoCopyFunctions, ReadColor<R9G9B9E5, GLfloat>, WriteColor<R9G9B9E5, GLfloat>, GL_FLOAT, 9, 9, 9, 0, 0, 0 },
>-    { Format::ID::S8_UINT, GL_STENCIL_INDEX8, GL_STENCIL_INDEX8, nullptr, NoCopyFunctions, nullptr, nullptr, GL_UNSIGNED_INT, 0, 0, 0, 0, 0, 8 },
>+    { FormatID::NONE, GL_NONE, GL_NONE, nullptr, NoCopyFunctions, nullptr, nullptr, GL_NONE, 0, 0, 0, 0, 0, 0, 0, 0, 0, false, false },
>+    { FormatID::A16_FLOAT, GL_ALPHA16F_EXT, GL_ALPHA16F_EXT, GenerateMip<A16F>, NoCopyFunctions, ReadColor<A16F, GLfloat>, WriteColor<A16F, GLfloat>, GL_FLOAT, 0, 0, 0, 16, 0, 0, 0, 2, 1, false, false },
>+    { FormatID::A1R5G5B5_UNORM, GL_A1RGB5_ANGLEX, GL_A1RGB5_ANGLEX, GenerateMip<A1R5G5B5>, NoCopyFunctions, ReadColor<A1R5G5B5, GLfloat>, WriteColor<A1R5G5B5, GLfloat>, GL_UNSIGNED_NORMALIZED, 5, 5, 5, 1, 0, 0, 0, 2, std::numeric_limits<GLuint>::max(), false, false },
>+    { FormatID::A32_FLOAT, GL_ALPHA32F_EXT, GL_ALPHA32F_EXT, GenerateMip<A32F>, NoCopyFunctions, ReadColor<A32F, GLfloat>, WriteColor<A32F, GLfloat>, GL_FLOAT, 0, 0, 0, 32, 0, 0, 0, 4, 3, false, false },
>+    { FormatID::A8_UNORM, GL_ALPHA8_EXT, GL_ALPHA8_EXT, GenerateMip<A8>, NoCopyFunctions, ReadColor<A8, GLfloat>, WriteColor<A8, GLfloat>, GL_UNSIGNED_NORMALIZED, 0, 0, 0, 8, 0, 0, 0, 1, 0, false, false },
>+    { FormatID::ASTC_10x10_SRGB_BLOCK, GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x10_KHR, GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x10_KHR, nullptr, NoCopyFunctions, nullptr, nullptr, GL_UNSIGNED_NORMALIZED, 0, 0, 0, 0, 0, 0, 0, 16, std::numeric_limits<GLuint>::max(), true, false },
>+    { FormatID::ASTC_10x10_UNORM_BLOCK, GL_COMPRESSED_RGBA_ASTC_10x10_KHR, GL_COMPRESSED_RGBA_ASTC_10x10_KHR, nullptr, NoCopyFunctions, nullptr, nullptr, GL_UNSIGNED_NORMALIZED, 0, 0, 0, 0, 0, 0, 0, 16, std::numeric_limits<GLuint>::max(), true, false },
>+    { FormatID::ASTC_10x5_SRGB_BLOCK, GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x5_KHR, GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x5_KHR, nullptr, NoCopyFunctions, nullptr, nullptr, GL_UNSIGNED_NORMALIZED, 0, 0, 0, 0, 0, 0, 0, 16, std::numeric_limits<GLuint>::max(), true, false },
>+    { FormatID::ASTC_10x5_UNORM_BLOCK, GL_COMPRESSED_RGBA_ASTC_10x5_KHR, GL_COMPRESSED_RGBA_ASTC_10x5_KHR, nullptr, NoCopyFunctions, nullptr, nullptr, GL_UNSIGNED_NORMALIZED, 0, 0, 0, 0, 0, 0, 0, 16, std::numeric_limits<GLuint>::max(), true, false },
>+    { FormatID::ASTC_10x6_SRGB_BLOCK, GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x6_KHR, GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x6_KHR, nullptr, NoCopyFunctions, nullptr, nullptr, GL_UNSIGNED_NORMALIZED, 0, 0, 0, 0, 0, 0, 0, 16, std::numeric_limits<GLuint>::max(), true, false },
>+    { FormatID::ASTC_10x6_UNORM_BLOCK, GL_COMPRESSED_RGBA_ASTC_10x6_KHR, GL_COMPRESSED_RGBA_ASTC_10x6_KHR, nullptr, NoCopyFunctions, nullptr, nullptr, GL_UNSIGNED_NORMALIZED, 0, 0, 0, 0, 0, 0, 0, 16, std::numeric_limits<GLuint>::max(), true, false },
>+    { FormatID::ASTC_10x8_SRGB_BLOCK, GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x8_KHR, GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x8_KHR, nullptr, NoCopyFunctions, nullptr, nullptr, GL_UNSIGNED_NORMALIZED, 0, 0, 0, 0, 0, 0, 0, 16, std::numeric_limits<GLuint>::max(), true, false },
>+    { FormatID::ASTC_10x8_UNORM_BLOCK, GL_COMPRESSED_RGBA_ASTC_10x8_KHR, GL_COMPRESSED_RGBA_ASTC_10x8_KHR, nullptr, NoCopyFunctions, nullptr, nullptr, GL_UNSIGNED_NORMALIZED, 0, 0, 0, 0, 0, 0, 0, 16, std::numeric_limits<GLuint>::max(), true, false },
>+    { FormatID::ASTC_12x10_SRGB_BLOCK, GL_COMPRESSED_SRGB8_ALPHA8_ASTC_12x10_KHR, GL_COMPRESSED_SRGB8_ALPHA8_ASTC_12x10_KHR, nullptr, NoCopyFunctions, nullptr, nullptr, GL_UNSIGNED_NORMALIZED, 0, 0, 0, 0, 0, 0, 0, 16, std::numeric_limits<GLuint>::max(), true, false },
>+    { FormatID::ASTC_12x10_UNORM_BLOCK, GL_COMPRESSED_RGBA_ASTC_12x10_KHR, GL_COMPRESSED_RGBA_ASTC_12x10_KHR, nullptr, NoCopyFunctions, nullptr, nullptr, GL_UNSIGNED_NORMALIZED, 0, 0, 0, 0, 0, 0, 0, 16, std::numeric_limits<GLuint>::max(), true, false },
>+    { FormatID::ASTC_12x12_SRGB_BLOCK, GL_COMPRESSED_SRGB8_ALPHA8_ASTC_12x12_KHR, GL_COMPRESSED_SRGB8_ALPHA8_ASTC_12x12_KHR, nullptr, NoCopyFunctions, nullptr, nullptr, GL_UNSIGNED_NORMALIZED, 0, 0, 0, 0, 0, 0, 0, 16, std::numeric_limits<GLuint>::max(), true, false },
>+    { FormatID::ASTC_12x12_UNORM_BLOCK, GL_COMPRESSED_RGBA_ASTC_12x12_KHR, GL_COMPRESSED_RGBA_ASTC_12x12_KHR, nullptr, NoCopyFunctions, nullptr, nullptr, GL_UNSIGNED_NORMALIZED, 0, 0, 0, 0, 0, 0, 0, 16, std::numeric_limits<GLuint>::max(), true, false },
>+    { FormatID::ASTC_4x4_SRGB_BLOCK, GL_COMPRESSED_SRGB8_ALPHA8_ASTC_4x4_KHR, GL_COMPRESSED_SRGB8_ALPHA8_ASTC_4x4_KHR, nullptr, NoCopyFunctions, nullptr, nullptr, GL_UNSIGNED_NORMALIZED, 0, 0, 0, 0, 0, 0, 0, 16, std::numeric_limits<GLuint>::max(), true, false },
>+    { FormatID::ASTC_4x4_UNORM_BLOCK, GL_COMPRESSED_RGBA_ASTC_4x4_KHR, GL_COMPRESSED_RGBA_ASTC_4x4_KHR, nullptr, NoCopyFunctions, nullptr, nullptr, GL_UNSIGNED_NORMALIZED, 0, 0, 0, 0, 0, 0, 0, 16, std::numeric_limits<GLuint>::max(), true, false },
>+    { FormatID::ASTC_5x4_SRGB_BLOCK, GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x4_KHR, GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x4_KHR, nullptr, NoCopyFunctions, nullptr, nullptr, GL_UNSIGNED_NORMALIZED, 0, 0, 0, 0, 0, 0, 0, 16, std::numeric_limits<GLuint>::max(), true, false },
>+    { FormatID::ASTC_5x4_UNORM_BLOCK, GL_COMPRESSED_RGBA_ASTC_5x4_KHR, GL_COMPRESSED_RGBA_ASTC_5x4_KHR, nullptr, NoCopyFunctions, nullptr, nullptr, GL_UNSIGNED_NORMALIZED, 0, 0, 0, 0, 0, 0, 0, 16, std::numeric_limits<GLuint>::max(), true, false },
>+    { FormatID::ASTC_5x5_SRGB_BLOCK, GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x5_KHR, GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x5_KHR, nullptr, NoCopyFunctions, nullptr, nullptr, GL_UNSIGNED_NORMALIZED, 0, 0, 0, 0, 0, 0, 0, 16, std::numeric_limits<GLuint>::max(), true, false },
>+    { FormatID::ASTC_5x5_UNORM_BLOCK, GL_COMPRESSED_RGBA_ASTC_5x5_KHR, GL_COMPRESSED_RGBA_ASTC_5x5_KHR, nullptr, NoCopyFunctions, nullptr, nullptr, GL_UNSIGNED_NORMALIZED, 0, 0, 0, 0, 0, 0, 0, 16, std::numeric_limits<GLuint>::max(), true, false },
>+    { FormatID::ASTC_6x5_SRGB_BLOCK, GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x5_KHR, GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x5_KHR, nullptr, NoCopyFunctions, nullptr, nullptr, GL_UNSIGNED_NORMALIZED, 0, 0, 0, 0, 0, 0, 0, 16, std::numeric_limits<GLuint>::max(), true, false },
>+    { FormatID::ASTC_6x5_UNORM_BLOCK, GL_COMPRESSED_RGBA_ASTC_6x5_KHR, GL_COMPRESSED_RGBA_ASTC_6x5_KHR, nullptr, NoCopyFunctions, nullptr, nullptr, GL_UNSIGNED_NORMALIZED, 0, 0, 0, 0, 0, 0, 0, 16, std::numeric_limits<GLuint>::max(), true, false },
>+    { FormatID::ASTC_6x6_SRGB_BLOCK, GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x6_KHR, GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x6_KHR, nullptr, NoCopyFunctions, nullptr, nullptr, GL_UNSIGNED_NORMALIZED, 0, 0, 0, 0, 0, 0, 0, 16, std::numeric_limits<GLuint>::max(), true, false },
>+    { FormatID::ASTC_6x6_UNORM_BLOCK, GL_COMPRESSED_RGBA_ASTC_6x6_KHR, GL_COMPRESSED_RGBA_ASTC_6x6_KHR, nullptr, NoCopyFunctions, nullptr, nullptr, GL_UNSIGNED_NORMALIZED, 0, 0, 0, 0, 0, 0, 0, 16, std::numeric_limits<GLuint>::max(), true, false },
>+    { FormatID::ASTC_8x5_SRGB_BLOCK, GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x5_KHR, GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x5_KHR, nullptr, NoCopyFunctions, nullptr, nullptr, GL_UNSIGNED_NORMALIZED, 0, 0, 0, 0, 0, 0, 0, 16, std::numeric_limits<GLuint>::max(), true, false },
>+    { FormatID::ASTC_8x5_UNORM_BLOCK, GL_COMPRESSED_RGBA_ASTC_8x5_KHR, GL_COMPRESSED_RGBA_ASTC_8x5_KHR, nullptr, NoCopyFunctions, nullptr, nullptr, GL_UNSIGNED_NORMALIZED, 0, 0, 0, 0, 0, 0, 0, 16, std::numeric_limits<GLuint>::max(), true, false },
>+    { FormatID::ASTC_8x6_SRGB_BLOCK, GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x6_KHR, GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x6_KHR, nullptr, NoCopyFunctions, nullptr, nullptr, GL_UNSIGNED_NORMALIZED, 0, 0, 0, 0, 0, 0, 0, 16, std::numeric_limits<GLuint>::max(), true, false },
>+    { FormatID::ASTC_8x6_UNORM_BLOCK, GL_COMPRESSED_RGBA_ASTC_8x6_KHR, GL_COMPRESSED_RGBA_ASTC_8x6_KHR, nullptr, NoCopyFunctions, nullptr, nullptr, GL_UNSIGNED_NORMALIZED, 0, 0, 0, 0, 0, 0, 0, 16, std::numeric_limits<GLuint>::max(), true, false },
>+    { FormatID::ASTC_8x8_SRGB_BLOCK, GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x8_KHR, GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x8_KHR, nullptr, NoCopyFunctions, nullptr, nullptr, GL_UNSIGNED_NORMALIZED, 0, 0, 0, 0, 0, 0, 0, 16, std::numeric_limits<GLuint>::max(), true, false },
>+    { FormatID::ASTC_8x8_UNORM_BLOCK, GL_COMPRESSED_RGBA_ASTC_8x8_KHR, GL_COMPRESSED_RGBA_ASTC_8x8_KHR, nullptr, NoCopyFunctions, nullptr, nullptr, GL_UNSIGNED_NORMALIZED, 0, 0, 0, 0, 0, 0, 0, 16, std::numeric_limits<GLuint>::max(), true, false },
>+    { FormatID::B4G4R4A4_UNORM, GL_BGRA4_ANGLEX, GL_RGBA4, GenerateMip<A4R4G4B4>, NoCopyFunctions, ReadColor<A4R4G4B4, GLfloat>, WriteColor<A4R4G4B4, GLfloat>, GL_UNSIGNED_NORMALIZED, 4, 4, 4, 4, 0, 0, 0, 2, std::numeric_limits<GLuint>::max(), false, false },
>+    { FormatID::B5G5R5A1_UNORM, GL_BGR5_A1_ANGLEX, GL_RGB5_A1, GenerateMip<A1R5G5B5>, NoCopyFunctions, ReadColor<A1R5G5B5, GLfloat>, WriteColor<A1R5G5B5, GLfloat>, GL_UNSIGNED_NORMALIZED, 5, 5, 5, 1, 0, 0, 0, 2, std::numeric_limits<GLuint>::max(), false, false },
>+    { FormatID::B5G6R5_UNORM, GL_BGR565_ANGLEX, GL_RGB565, GenerateMip<B5G6R5>, NoCopyFunctions, ReadColor<B5G6R5, GLfloat>, WriteColor<B5G6R5, GLfloat>, GL_UNSIGNED_NORMALIZED, 5, 6, 5, 0, 0, 0, 0, 2, std::numeric_limits<GLuint>::max(), false, false },
>+    { FormatID::B8G8R8A8_TYPELESS, GL_BGRA8_EXT, GL_BGRA8_EXT, GenerateMip<B8G8R8A8>, NoCopyFunctions, ReadColor<B8G8R8A8, GLfloat>, WriteColor<B8G8R8A8, GLfloat>, GL_UNSIGNED_NORMALIZED, 8, 8, 8, 8, 0, 0, 0, 4, 0, false, false },
>+    { FormatID::B8G8R8A8_TYPELESS_SRGB, GL_BGRA8_SRGB_ANGLEX, GL_BGRA8_SRGB_ANGLEX, GenerateMip<B8G8R8A8>, NoCopyFunctions, ReadColor<B8G8R8A8, GLfloat>, WriteColor<B8G8R8A8, GLfloat>, GL_UNSIGNED_NORMALIZED, 8, 8, 8, 8, 0, 0, 0, 4, 0, false, false },
>+    { FormatID::B8G8R8A8_UNORM, GL_BGRA8_EXT, GL_BGRA8_EXT, GenerateMip<B8G8R8A8>, BGRACopyFunctions, ReadColor<B8G8R8A8, GLfloat>, WriteColor<B8G8R8A8, GLfloat>, GL_UNSIGNED_NORMALIZED, 8, 8, 8, 8, 0, 0, 0, 4, 0, false, false },
>+    { FormatID::B8G8R8A8_UNORM_SRGB, GL_BGRA8_SRGB_ANGLEX, GL_BGRA8_SRGB_ANGLEX, GenerateMip<B8G8R8A8>, NoCopyFunctions, ReadColor<B8G8R8A8, GLfloat>, WriteColor<B8G8R8A8, GLfloat>, GL_UNSIGNED_NORMALIZED, 8, 8, 8, 8, 0, 0, 0, 4, 0, false, false },
>+    { FormatID::B8G8R8X8_UNORM, GL_BGRA8_EXT, GL_BGRA8_EXT, GenerateMip<B8G8R8X8>, NoCopyFunctions, ReadColor<B8G8R8X8, GLfloat>, WriteColor<B8G8R8X8, GLfloat>, GL_UNSIGNED_NORMALIZED, 8, 8, 8, 0, 0, 0, 0, 4, std::numeric_limits<GLuint>::max(), false, false },
>+    { FormatID::BC1_RGBA_UNORM_BLOCK, GL_COMPRESSED_RGBA_S3TC_DXT1_EXT, GL_COMPRESSED_RGBA_S3TC_DXT1_EXT, nullptr, NoCopyFunctions, nullptr, nullptr, GL_UNSIGNED_NORMALIZED, 0, 0, 0, 0, 0, 0, 0, 8, std::numeric_limits<GLuint>::max(), true, false },
>+    { FormatID::BC1_RGBA_UNORM_SRGB_BLOCK, GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT1_EXT, GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT1_EXT, nullptr, NoCopyFunctions, nullptr, nullptr, GL_UNSIGNED_NORMALIZED, 0, 0, 0, 0, 0, 0, 0, 8, std::numeric_limits<GLuint>::max(), true, false },
>+    { FormatID::BC1_RGB_UNORM_BLOCK, GL_COMPRESSED_RGB_S3TC_DXT1_EXT, GL_COMPRESSED_RGB_S3TC_DXT1_EXT, nullptr, NoCopyFunctions, nullptr, nullptr, GL_UNSIGNED_NORMALIZED, 0, 0, 0, 0, 0, 0, 0, 8, std::numeric_limits<GLuint>::max(), true, false },
>+    { FormatID::BC1_RGB_UNORM_SRGB_BLOCK, GL_COMPRESSED_SRGB_S3TC_DXT1_EXT, GL_COMPRESSED_SRGB_S3TC_DXT1_EXT, nullptr, NoCopyFunctions, nullptr, nullptr, GL_UNSIGNED_NORMALIZED, 0, 0, 0, 0, 0, 0, 0, 8, std::numeric_limits<GLuint>::max(), true, false },
>+    { FormatID::BC2_RGBA_UNORM_BLOCK, GL_COMPRESSED_RGBA_S3TC_DXT3_ANGLE, GL_COMPRESSED_RGBA_S3TC_DXT3_ANGLE, nullptr, NoCopyFunctions, nullptr, nullptr, GL_UNSIGNED_NORMALIZED, 0, 0, 0, 0, 0, 0, 0, 16, std::numeric_limits<GLuint>::max(), true, false },
>+    { FormatID::BC2_RGBA_UNORM_SRGB_BLOCK, GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT3_EXT, GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT3_EXT, nullptr, NoCopyFunctions, nullptr, nullptr, GL_UNSIGNED_NORMALIZED, 0, 0, 0, 0, 0, 0, 0, 16, std::numeric_limits<GLuint>::max(), true, false },
>+    { FormatID::BC3_RGBA_UNORM_BLOCK, GL_COMPRESSED_RGBA_S3TC_DXT5_ANGLE, GL_COMPRESSED_RGBA_S3TC_DXT5_ANGLE, nullptr, NoCopyFunctions, nullptr, nullptr, GL_UNSIGNED_NORMALIZED, 0, 0, 0, 0, 0, 0, 0, 16, std::numeric_limits<GLuint>::max(), true, false },
>+    { FormatID::BC3_RGBA_UNORM_SRGB_BLOCK, GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT5_EXT, GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT5_EXT, nullptr, NoCopyFunctions, nullptr, nullptr, GL_UNSIGNED_NORMALIZED, 0, 0, 0, 0, 0, 0, 0, 16, std::numeric_limits<GLuint>::max(), true, false },
>+    { FormatID::BPTC_RGBA_UNORM_BLOCK, GL_COMPRESSED_RGBA_BPTC_UNORM_EXT, GL_COMPRESSED_RGBA_BPTC_UNORM_EXT, nullptr, NoCopyFunctions, nullptr, nullptr, GL_UNSIGNED_NORMALIZED, 0, 0, 0, 0, 0, 0, 0, 16, std::numeric_limits<GLuint>::max(), true, false },
>+    { FormatID::BPTC_RGB_SIGNED_FLOAT_BLOCK, GL_COMPRESSED_RGB_BPTC_SIGNED_FLOAT_EXT, GL_COMPRESSED_RGB_BPTC_SIGNED_FLOAT_EXT, nullptr, NoCopyFunctions, nullptr, nullptr, GL_FLOAT, 0, 0, 0, 0, 0, 0, 0, 16, std::numeric_limits<GLuint>::max(), true, false },
>+    { FormatID::BPTC_RGB_UNSIGNED_FLOAT_BLOCK, GL_COMPRESSED_RGB_BPTC_UNSIGNED_FLOAT_EXT, GL_COMPRESSED_RGB_BPTC_UNSIGNED_FLOAT_EXT, nullptr, NoCopyFunctions, nullptr, nullptr, GL_FLOAT, 0, 0, 0, 0, 0, 0, 0, 16, std::numeric_limits<GLuint>::max(), true, false },
>+    { FormatID::BPTC_SRGB_ALPHA_UNORM_BLOCK, GL_COMPRESSED_SRGB_ALPHA_BPTC_UNORM_EXT, GL_COMPRESSED_SRGB_ALPHA_BPTC_UNORM_EXT, nullptr, NoCopyFunctions, nullptr, nullptr, GL_UNSIGNED_NORMALIZED, 0, 0, 0, 0, 0, 0, 0, 16, std::numeric_limits<GLuint>::max(), true, false },
>+    { FormatID::D16_UNORM, GL_DEPTH_COMPONENT16, GL_DEPTH_COMPONENT16, nullptr, NoCopyFunctions, ReadDepthStencil<D16>, WriteDepthStencil<D16>, GL_UNSIGNED_NORMALIZED, 0, 0, 0, 0, 0, 16, 0, 2, std::numeric_limits<GLuint>::max(), false, false },
>+    { FormatID::D24_UNORM_S8_UINT, GL_DEPTH24_STENCIL8, GL_DEPTH24_STENCIL8, nullptr, NoCopyFunctions, ReadDepthStencil<D24S8>, WriteDepthStencil<D24S8>, GL_UNSIGNED_NORMALIZED, 0, 0, 0, 0, 0, 24, 8, 4, std::numeric_limits<GLuint>::max(), false, false },
>+    { FormatID::D24_UNORM_X8_UINT, GL_DEPTH_COMPONENT24, GL_DEPTH_COMPONENT24, nullptr, NoCopyFunctions, ReadDepthStencil<D24>, WriteDepthStencil<D24>, GL_UNSIGNED_NORMALIZED, 0, 0, 0, 0, 0, 24, 0, 4, std::numeric_limits<GLuint>::max(), false, false },
>+    { FormatID::D32_FLOAT, GL_DEPTH_COMPONENT32F, GL_DEPTH_COMPONENT32F, nullptr, NoCopyFunctions, ReadDepthStencil<D32F>, WriteDepthStencil<D32F>, GL_FLOAT, 0, 0, 0, 0, 0, 32, 0, 4, std::numeric_limits<GLuint>::max(), false, false },
>+    { FormatID::D32_FLOAT_S8X24_UINT, GL_DEPTH32F_STENCIL8, GL_DEPTH32F_STENCIL8, nullptr, NoCopyFunctions, ReadDepthStencil<D32FS8>, WriteDepthStencil<D32FS8>, GL_FLOAT, 0, 0, 0, 0, 0, 32, 8, 8, std::numeric_limits<GLuint>::max(), false, false },
>+    { FormatID::D32_UNORM, GL_DEPTH_COMPONENT32_OES, GL_DEPTH_COMPONENT32_OES, nullptr, NoCopyFunctions, ReadDepthStencil<D32>, WriteDepthStencil<D32>, GL_UNSIGNED_NORMALIZED, 0, 0, 0, 0, 0, 32, 0, 4, std::numeric_limits<GLuint>::max(), false, false },
>+    { FormatID::EAC_R11G11_SNORM_BLOCK, GL_COMPRESSED_SIGNED_RG11_EAC, GL_COMPRESSED_SIGNED_RG11_EAC, nullptr, NoCopyFunctions, nullptr, nullptr, GL_SIGNED_NORMALIZED, 11, 11, 0, 0, 0, 0, 0, 16, 0, true, false },
>+    { FormatID::EAC_R11G11_UNORM_BLOCK, GL_COMPRESSED_RG11_EAC, GL_COMPRESSED_RG11_EAC, nullptr, NoCopyFunctions, nullptr, nullptr, GL_UNSIGNED_NORMALIZED, 11, 11, 0, 0, 0, 0, 0, 16, 0, true, false },
>+    { FormatID::EAC_R11_SNORM_BLOCK, GL_COMPRESSED_SIGNED_R11_EAC, GL_COMPRESSED_SIGNED_R11_EAC, nullptr, NoCopyFunctions, nullptr, nullptr, GL_SIGNED_NORMALIZED, 11, 0, 0, 0, 0, 0, 0, 8, 0, true, false },
>+    { FormatID::EAC_R11_UNORM_BLOCK, GL_COMPRESSED_R11_EAC, GL_COMPRESSED_R11_EAC, nullptr, NoCopyFunctions, nullptr, nullptr, GL_UNSIGNED_NORMALIZED, 11, 0, 0, 0, 0, 0, 0, 8, 0, true, false },
>+    { FormatID::ETC1_LOSSY_DECODE_R8G8B8_UNORM_BLOCK, GL_ETC1_RGB8_LOSSY_DECODE_ANGLE, GL_ETC1_RGB8_LOSSY_DECODE_ANGLE, nullptr, NoCopyFunctions, nullptr, nullptr, GL_UNSIGNED_NORMALIZED, 8, 8, 8, 0, 0, 0, 0, 8, 0, true, false },
>+    { FormatID::ETC1_R8G8B8_UNORM_BLOCK, GL_ETC1_RGB8_OES, GL_ETC1_RGB8_OES, nullptr, NoCopyFunctions, nullptr, nullptr, GL_UNSIGNED_NORMALIZED, 8, 8, 8, 0, 0, 0, 0, 8, 0, true, false },
>+    { FormatID::ETC2_R8G8B8A1_SRGB_BLOCK, GL_COMPRESSED_SRGB8_PUNCHTHROUGH_ALPHA1_ETC2, GL_COMPRESSED_SRGB8_PUNCHTHROUGH_ALPHA1_ETC2, nullptr, NoCopyFunctions, nullptr, nullptr, GL_UNSIGNED_NORMALIZED, 8, 8, 8, 1, 0, 0, 0, 8, std::numeric_limits<GLuint>::max(), true, false },
>+    { FormatID::ETC2_R8G8B8A1_UNORM_BLOCK, GL_COMPRESSED_RGB8_PUNCHTHROUGH_ALPHA1_ETC2, GL_COMPRESSED_RGB8_PUNCHTHROUGH_ALPHA1_ETC2, nullptr, NoCopyFunctions, nullptr, nullptr, GL_UNSIGNED_NORMALIZED, 8, 8, 8, 1, 0, 0, 0, 8, std::numeric_limits<GLuint>::max(), true, false },
>+    { FormatID::ETC2_R8G8B8A8_SRGB_BLOCK, GL_COMPRESSED_SRGB8_ALPHA8_ETC2_EAC, GL_COMPRESSED_SRGB8_ALPHA8_ETC2_EAC, nullptr, NoCopyFunctions, nullptr, nullptr, GL_UNSIGNED_NORMALIZED, 8, 8, 8, 8, 0, 0, 0, 16, 0, true, false },
>+    { FormatID::ETC2_R8G8B8A8_UNORM_BLOCK, GL_COMPRESSED_RGBA8_ETC2_EAC, GL_COMPRESSED_RGBA8_ETC2_EAC, nullptr, NoCopyFunctions, nullptr, nullptr, GL_UNSIGNED_NORMALIZED, 8, 8, 8, 8, 0, 0, 0, 16, 0, true, false },
>+    { FormatID::ETC2_R8G8B8_SRGB_BLOCK, GL_COMPRESSED_SRGB8_ETC2, GL_COMPRESSED_SRGB8_ETC2, nullptr, NoCopyFunctions, nullptr, nullptr, GL_UNSIGNED_NORMALIZED, 8, 8, 8, 0, 0, 0, 0, 8, 0, true, false },
>+    { FormatID::ETC2_R8G8B8_UNORM_BLOCK, GL_COMPRESSED_RGB8_ETC2, GL_COMPRESSED_RGB8_ETC2, nullptr, NoCopyFunctions, nullptr, nullptr, GL_UNSIGNED_NORMALIZED, 8, 8, 8, 0, 0, 0, 0, 8, 0, true, false },
>+    { FormatID::L16A16_FLOAT, GL_LUMINANCE_ALPHA16F_EXT, GL_LUMINANCE_ALPHA16F_EXT, GenerateMip<L16A16F>, NoCopyFunctions, ReadColor<L16A16F, GLfloat>, WriteColor<L16A16F, GLfloat>, GL_FLOAT, 0, 0, 0, 16, 16, 0, 0, 4, std::numeric_limits<GLuint>::max(), false, false },
>+    { FormatID::L16_FLOAT, GL_LUMINANCE16F_EXT, GL_LUMINANCE16F_EXT, GenerateMip<L16F>, NoCopyFunctions, ReadColor<L16F, GLfloat>, WriteColor<L16F, GLfloat>, GL_FLOAT, 0, 0, 0, 0, 16, 0, 0, 2, std::numeric_limits<GLuint>::max(), false, false },
>+    { FormatID::L32A32_FLOAT, GL_LUMINANCE_ALPHA32F_EXT, GL_LUMINANCE_ALPHA32F_EXT, GenerateMip<L32A32F>, NoCopyFunctions, ReadColor<L32A32F, GLfloat>, WriteColor<L32A32F, GLfloat>, GL_FLOAT, 0, 0, 0, 32, 32, 0, 0, 8, std::numeric_limits<GLuint>::max(), false, false },
>+    { FormatID::L32_FLOAT, GL_LUMINANCE32F_EXT, GL_LUMINANCE32F_EXT, GenerateMip<L32F>, NoCopyFunctions, ReadColor<L32F, GLfloat>, WriteColor<L32F, GLfloat>, GL_FLOAT, 0, 0, 0, 0, 32, 0, 0, 4, std::numeric_limits<GLuint>::max(), false, false },
>+    { FormatID::L8A8_UNORM, GL_LUMINANCE8_ALPHA8_EXT, GL_LUMINANCE8_ALPHA8_EXT, GenerateMip<L8A8>, NoCopyFunctions, ReadColor<L8A8, GLfloat>, WriteColor<L8A8, GLfloat>, GL_UNSIGNED_NORMALIZED, 0, 0, 0, 8, 8, 0, 0, 2, std::numeric_limits<GLuint>::max(), false, false },
>+    { FormatID::L8_UNORM, GL_LUMINANCE8_EXT, GL_LUMINANCE8_EXT, GenerateMip<L8>, NoCopyFunctions, ReadColor<L8, GLfloat>, WriteColor<L8, GLfloat>, GL_UNSIGNED_NORMALIZED, 0, 0, 0, 0, 8, 0, 0, 1, std::numeric_limits<GLuint>::max(), false, false },
>+    { FormatID::R10G10B10A2_SINT, GL_RGB10_A2_SINT_ANGLEX, GL_RGB10_A2_SINT_ANGLEX, GenerateMip<R10G10B10A2S>, NoCopyFunctions, ReadColor<R10G10B10A2S, GLint>, WriteColor<R10G10B10A2S, GLint>, GL_INT, 10, 10, 10, 2, 0, 0, 0, 4, std::numeric_limits<GLuint>::max(), false, false },
>+    { FormatID::R10G10B10A2_SNORM, GL_RGB10_A2_SNORM_ANGLEX, GL_RGB10_A2_SNORM_ANGLEX, GenerateMip<R10G10B10A2S>, NoCopyFunctions, ReadColor<R10G10B10A2S, GLfloat>, WriteColor<R10G10B10A2S, GLfloat>, GL_SIGNED_NORMALIZED, 10, 10, 10, 2, 0, 0, 0, 4, std::numeric_limits<GLuint>::max(), false, false },
>+    { FormatID::R10G10B10A2_SSCALED, GL_RGB10_A2_SSCALED_ANGLEX, GL_RGB10_A2_SSCALED_ANGLEX, GenerateMip<R10G10B10A2S>, NoCopyFunctions, ReadColor<R10G10B10A2S, GLint>, WriteColor<R10G10B10A2S, GLint>, GL_INT, 10, 10, 10, 2, 0, 0, 0, 4, std::numeric_limits<GLuint>::max(), false, false },
>+    { FormatID::R10G10B10A2_UINT, GL_RGB10_A2UI, GL_RGB10_A2UI, GenerateMip<R10G10B10A2>, NoCopyFunctions, ReadColor<R10G10B10A2, GLuint>, WriteColor<R10G10B10A2, GLuint>, GL_UNSIGNED_INT, 10, 10, 10, 2, 0, 0, 0, 4, std::numeric_limits<GLuint>::max(), false, false },
>+    { FormatID::R10G10B10A2_UNORM, GL_RGB10_A2, GL_RGB10_A2, GenerateMip<R10G10B10A2>, NoCopyFunctions, ReadColor<R10G10B10A2, GLfloat>, WriteColor<R10G10B10A2, GLfloat>, GL_UNSIGNED_NORMALIZED, 10, 10, 10, 2, 0, 0, 0, 4, std::numeric_limits<GLuint>::max(), false, false },
>+    { FormatID::R10G10B10A2_USCALED, GL_RGB10_A2_USCALED_ANGLEX, GL_RGB10_A2_USCALED_ANGLEX, GenerateMip<R10G10B10A2>, NoCopyFunctions, ReadColor<R10G10B10A2, GLuint>, WriteColor<R10G10B10A2, GLuint>, GL_UNSIGNED_INT, 10, 10, 10, 2, 0, 0, 0, 4, std::numeric_limits<GLuint>::max(), false, false },
>+    { FormatID::R11G11B10_FLOAT, GL_R11F_G11F_B10F, GL_R11F_G11F_B10F, GenerateMip<R11G11B10F>, NoCopyFunctions, ReadColor<R11G11B10F, GLfloat>, WriteColor<R11G11B10F, GLfloat>, GL_FLOAT, 11, 11, 10, 0, 0, 0, 0, 4, std::numeric_limits<GLuint>::max(), false, false },
>+    { FormatID::R16G16B16A16_FLOAT, GL_RGBA16F, GL_RGBA16F, GenerateMip<R16G16B16A16F>, NoCopyFunctions, ReadColor<R16G16B16A16F, GLfloat>, WriteColor<R16G16B16A16F, GLfloat>, GL_FLOAT, 16, 16, 16, 16, 0, 0, 0, 8, 1, false, false },
>+    { FormatID::R16G16B16A16_SINT, GL_RGBA16I, GL_RGBA16I, GenerateMip<R16G16B16A16S>, NoCopyFunctions, ReadColor<R16G16B16A16S, GLint>, WriteColor<R16G16B16A16S, GLint>, GL_INT, 16, 16, 16, 16, 0, 0, 0, 8, 1, false, false },
>+    { FormatID::R16G16B16A16_SNORM, GL_RGBA16_SNORM_EXT, GL_RGBA16_SNORM_EXT, GenerateMip<R16G16B16A16S>, NoCopyFunctions, ReadColor<R16G16B16A16S, GLfloat>, WriteColor<R16G16B16A16S, GLfloat>, GL_SIGNED_NORMALIZED, 16, 16, 16, 16, 0, 0, 0, 8, 1, false, false },
>+    { FormatID::R16G16B16A16_SSCALED, GL_RGBA16_SSCALED_ANGLEX, GL_RGBA16_SSCALED_ANGLEX, GenerateMip<R16G16B16A16S>, NoCopyFunctions, ReadColor<R16G16B16A16S, GLint>, WriteColor<R16G16B16A16S, GLint>, GL_INT, 16, 16, 16, 16, 0, 0, 0, 8, 1, false, false },
>+    { FormatID::R16G16B16A16_UINT, GL_RGBA16UI, GL_RGBA16UI, GenerateMip<R16G16B16A16>, NoCopyFunctions, ReadColor<R16G16B16A16, GLuint>, WriteColor<R16G16B16A16, GLuint>, GL_UNSIGNED_INT, 16, 16, 16, 16, 0, 0, 0, 8, 1, false, false },
>+    { FormatID::R16G16B16A16_UNORM, GL_RGBA16_EXT, GL_RGBA16_EXT, GenerateMip<R16G16B16A16>, NoCopyFunctions, ReadColor<R16G16B16A16, GLfloat>, WriteColor<R16G16B16A16, GLfloat>, GL_UNSIGNED_NORMALIZED, 16, 16, 16, 16, 0, 0, 0, 8, 1, false, false },
>+    { FormatID::R16G16B16A16_USCALED, GL_RGBA16_USCALED_ANGLEX, GL_RGBA16_USCALED_ANGLEX, GenerateMip<R16G16B16A16>, NoCopyFunctions, ReadColor<R16G16B16A16, GLuint>, WriteColor<R16G16B16A16, GLuint>, GL_UNSIGNED_INT, 16, 16, 16, 16, 0, 0, 0, 8, 1, false, false },
>+    { FormatID::R16G16B16_FLOAT, GL_RGB16F, GL_RGB16F, GenerateMip<R16G16B16F>, NoCopyFunctions, ReadColor<R16G16B16F, GLfloat>, WriteColor<R16G16B16F, GLfloat>, GL_FLOAT, 16, 16, 16, 0, 0, 0, 0, 6, 1, false, false },
>+    { FormatID::R16G16B16_SINT, GL_RGB16I, GL_RGB16I, GenerateMip<R16G16B16S>, NoCopyFunctions, ReadColor<R16G16B16S, GLint>, WriteColor<R16G16B16S, GLint>, GL_INT, 16, 16, 16, 0, 0, 0, 0, 6, 1, false, false },
>+    { FormatID::R16G16B16_SNORM, GL_RGB16_SNORM_EXT, GL_RGB16_SNORM_EXT, GenerateMip<R16G16B16S>, NoCopyFunctions, ReadColor<R16G16B16S, GLfloat>, WriteColor<R16G16B16S, GLfloat>, GL_SIGNED_NORMALIZED, 16, 16, 16, 0, 0, 0, 0, 6, 1, false, false },
>+    { FormatID::R16G16B16_SSCALED, GL_RGB16_SSCALED_ANGLEX, GL_RGB16_SSCALED_ANGLEX, GenerateMip<R16G16B16S>, NoCopyFunctions, ReadColor<R16G16B16S, GLint>, WriteColor<R16G16B16S, GLint>, GL_INT, 16, 16, 16, 0, 0, 0, 0, 6, 1, false, false },
>+    { FormatID::R16G16B16_UINT, GL_RGB16UI, GL_RGB16UI, GenerateMip<R16G16B16>, NoCopyFunctions, ReadColor<R16G16B16, GLuint>, WriteColor<R16G16B16, GLuint>, GL_UNSIGNED_INT, 16, 16, 16, 0, 0, 0, 0, 6, 1, false, false },
>+    { FormatID::R16G16B16_UNORM, GL_RGB16_EXT, GL_RGB16_EXT, GenerateMip<R16G16B16>, NoCopyFunctions, ReadColor<R16G16B16, GLfloat>, WriteColor<R16G16B16, GLfloat>, GL_UNSIGNED_NORMALIZED, 16, 16, 16, 0, 0, 0, 0, 6, 1, false, false },
>+    { FormatID::R16G16B16_USCALED, GL_RGB16_USCALED_ANGLEX, GL_RGB16_USCALED_ANGLEX, GenerateMip<R16G16B16>, NoCopyFunctions, ReadColor<R16G16B16, GLuint>, WriteColor<R16G16B16, GLuint>, GL_UNSIGNED_INT, 16, 16, 16, 0, 0, 0, 0, 6, 1, false, false },
>+    { FormatID::R16G16_FLOAT, GL_RG16F, GL_RG16F, GenerateMip<R16G16F>, NoCopyFunctions, ReadColor<R16G16F, GLfloat>, WriteColor<R16G16F, GLfloat>, GL_FLOAT, 16, 16, 0, 0, 0, 0, 0, 4, 1, false, false },
>+    { FormatID::R16G16_SINT, GL_RG16I, GL_RG16I, GenerateMip<R16G16S>, NoCopyFunctions, ReadColor<R16G16S, GLint>, WriteColor<R16G16S, GLint>, GL_INT, 16, 16, 0, 0, 0, 0, 0, 4, 1, false, false },
>+    { FormatID::R16G16_SNORM, GL_RG16_SNORM_EXT, GL_RG16_SNORM_EXT, GenerateMip<R16G16S>, NoCopyFunctions, ReadColor<R16G16S, GLfloat>, WriteColor<R16G16S, GLfloat>, GL_SIGNED_NORMALIZED, 16, 16, 0, 0, 0, 0, 0, 4, 1, false, false },
>+    { FormatID::R16G16_SSCALED, GL_RG16_SSCALED_ANGLEX, GL_RG16_SSCALED_ANGLEX, GenerateMip<R16G16S>, NoCopyFunctions, ReadColor<R16G16S, GLint>, WriteColor<R16G16S, GLint>, GL_INT, 16, 16, 0, 0, 0, 0, 0, 4, 1, false, false },
>+    { FormatID::R16G16_UINT, GL_RG16UI, GL_RG16UI, GenerateMip<R16G16>, NoCopyFunctions, ReadColor<R16G16, GLuint>, WriteColor<R16G16, GLuint>, GL_UNSIGNED_INT, 16, 16, 0, 0, 0, 0, 0, 4, 1, false, false },
>+    { FormatID::R16G16_UNORM, GL_RG16_EXT, GL_RG16_EXT, GenerateMip<R16G16>, NoCopyFunctions, ReadColor<R16G16, GLfloat>, WriteColor<R16G16, GLfloat>, GL_UNSIGNED_NORMALIZED, 16, 16, 0, 0, 0, 0, 0, 4, 1, false, false },
>+    { FormatID::R16G16_USCALED, GL_RG16_USCALED_ANGLEX, GL_RG16_USCALED_ANGLEX, GenerateMip<R16G16>, NoCopyFunctions, ReadColor<R16G16, GLuint>, WriteColor<R16G16, GLuint>, GL_UNSIGNED_INT, 16, 16, 0, 0, 0, 0, 0, 4, 1, false, false },
>+    { FormatID::R16_FLOAT, GL_R16F, GL_R16F, GenerateMip<R16F>, NoCopyFunctions, ReadColor<R16F, GLfloat>, WriteColor<R16F, GLfloat>, GL_FLOAT, 16, 0, 0, 0, 0, 0, 0, 2, 1, false, false },
>+    { FormatID::R16_SINT, GL_R16I, GL_R16I, GenerateMip<R16S>, NoCopyFunctions, ReadColor<R16S, GLint>, WriteColor<R16S, GLint>, GL_INT, 16, 0, 0, 0, 0, 0, 0, 2, 1, false, false },
>+    { FormatID::R16_SNORM, GL_R16_SNORM_EXT, GL_R16_SNORM_EXT, GenerateMip<R16S>, NoCopyFunctions, ReadColor<R16S, GLfloat>, WriteColor<R16S, GLfloat>, GL_SIGNED_NORMALIZED, 16, 0, 0, 0, 0, 0, 0, 2, 1, false, false },
>+    { FormatID::R16_SSCALED, GL_R16_SSCALED_ANGLEX, GL_R16_SSCALED_ANGLEX, GenerateMip<R16S>, NoCopyFunctions, ReadColor<R16S, GLint>, WriteColor<R16S, GLint>, GL_INT, 16, 0, 0, 0, 0, 0, 0, 2, 1, false, false },
>+    { FormatID::R16_UINT, GL_R16UI, GL_R16UI, GenerateMip<R16>, NoCopyFunctions, ReadColor<R16, GLuint>, WriteColor<R16, GLuint>, GL_UNSIGNED_INT, 16, 0, 0, 0, 0, 0, 0, 2, 1, false, false },
>+    { FormatID::R16_UNORM, GL_R16_EXT, GL_R16_EXT, GenerateMip<R16>, NoCopyFunctions, ReadColor<R16, GLfloat>, WriteColor<R16, GLfloat>, GL_UNSIGNED_NORMALIZED, 16, 0, 0, 0, 0, 0, 0, 2, 1, false, false },
>+    { FormatID::R16_USCALED, GL_R16_USCALED_ANGLEX, GL_R16_USCALED_ANGLEX, GenerateMip<R16>, NoCopyFunctions, ReadColor<R16, GLuint>, WriteColor<R16, GLuint>, GL_UNSIGNED_INT, 16, 0, 0, 0, 0, 0, 0, 2, 1, false, false },
>+    { FormatID::R32G32B32A32_FIXED, GL_RGBA32_FIXED_ANGLEX, GL_RGBA32_FIXED_ANGLEX, GenerateMip<R32G32B32A32F>, NoCopyFunctions, ReadColor<R32G32B32A32F, GLfloat>, WriteColor<R32G32B32A32F, GLfloat>, GL_FLOAT, 32, 32, 32, 32, 0, 0, 0, 16, 3, false, true },
>+    { FormatID::R32G32B32A32_FLOAT, GL_RGBA32F, GL_RGBA32F, GenerateMip<R32G32B32A32F>, NoCopyFunctions, ReadColor<R32G32B32A32F, GLfloat>, WriteColor<R32G32B32A32F, GLfloat>, GL_FLOAT, 32, 32, 32, 32, 0, 0, 0, 16, 3, false, false },
>+    { FormatID::R32G32B32A32_SINT, GL_RGBA32I, GL_RGBA32I, GenerateMip<R32G32B32A32S>, NoCopyFunctions, ReadColor<R32G32B32A32S, GLint>, WriteColor<R32G32B32A32S, GLint>, GL_INT, 32, 32, 32, 32, 0, 0, 0, 16, 3, false, false },
>+    { FormatID::R32G32B32A32_SNORM, GL_RGBA32_SNORM_ANGLEX, GL_RGBA32_SNORM_ANGLEX, GenerateMip<R32G32B32A32S>, NoCopyFunctions, ReadColor<R32G32B32A32S, GLfloat>, WriteColor<R32G32B32A32S, GLfloat>, GL_SIGNED_NORMALIZED, 32, 32, 32, 32, 0, 0, 0, 16, 3, false, false },
>+    { FormatID::R32G32B32A32_SSCALED, GL_RGBA32_SSCALED_ANGLEX, GL_RGBA32_SSCALED_ANGLEX, GenerateMip<R32G32B32A32S>, NoCopyFunctions, ReadColor<R32G32B32A32S, GLint>, WriteColor<R32G32B32A32S, GLint>, GL_INT, 32, 32, 32, 32, 0, 0, 0, 16, 3, false, false },
>+    { FormatID::R32G32B32A32_UINT, GL_RGBA32UI, GL_RGBA32UI, GenerateMip<R32G32B32A32>, NoCopyFunctions, ReadColor<R32G32B32A32, GLuint>, WriteColor<R32G32B32A32, GLuint>, GL_UNSIGNED_INT, 32, 32, 32, 32, 0, 0, 0, 16, 3, false, false },
>+    { FormatID::R32G32B32A32_UNORM, GL_RGBA32_UNORM_ANGLEX, GL_RGBA32_UNORM_ANGLEX, GenerateMip<R32G32B32A32>, NoCopyFunctions, ReadColor<R32G32B32A32, GLfloat>, WriteColor<R32G32B32A32, GLfloat>, GL_UNSIGNED_NORMALIZED, 32, 32, 32, 32, 0, 0, 0, 16, 3, false, false },
>+    { FormatID::R32G32B32A32_USCALED, GL_RGBA32_USCALED_ANGLEX, GL_RGBA32_USCALED_ANGLEX, GenerateMip<R32G32B32A32>, NoCopyFunctions, ReadColor<R32G32B32A32, GLuint>, WriteColor<R32G32B32A32, GLuint>, GL_UNSIGNED_INT, 32, 32, 32, 32, 0, 0, 0, 16, 3, false, false },
>+    { FormatID::R32G32B32_FIXED, GL_RGB32_FIXED_ANGLEX, GL_RGB32_FIXED_ANGLEX, GenerateMip<R32G32B32F>, NoCopyFunctions, ReadColor<R32G32B32F, GLfloat>, WriteColor<R32G32B32F, GLfloat>, GL_FLOAT, 32, 32, 32, 0, 0, 0, 0, 12, 3, false, true },
>+    { FormatID::R32G32B32_FLOAT, GL_RGB32F, GL_RGB32F, GenerateMip<R32G32B32F>, NoCopyFunctions, ReadColor<R32G32B32F, GLfloat>, WriteColor<R32G32B32F, GLfloat>, GL_FLOAT, 32, 32, 32, 0, 0, 0, 0, 12, 3, false, false },
>+    { FormatID::R32G32B32_SINT, GL_RGB32I, GL_RGB32I, GenerateMip<R32G32B32S>, NoCopyFunctions, ReadColor<R32G32B32S, GLint>, WriteColor<R32G32B32S, GLint>, GL_INT, 32, 32, 32, 0, 0, 0, 0, 12, 3, false, false },
>+    { FormatID::R32G32B32_SNORM, GL_RGB32_SNORM_ANGLEX, GL_RGB32_SNORM_ANGLEX, GenerateMip<R32G32B32S>, NoCopyFunctions, ReadColor<R32G32B32S, GLfloat>, WriteColor<R32G32B32S, GLfloat>, GL_SIGNED_NORMALIZED, 32, 32, 32, 0, 0, 0, 0, 12, 3, false, false },
>+    { FormatID::R32G32B32_SSCALED, GL_RGB32_SSCALED_ANGLEX, GL_RGB32_SSCALED_ANGLEX, GenerateMip<R32G32B32S>, NoCopyFunctions, ReadColor<R32G32B32S, GLint>, WriteColor<R32G32B32S, GLint>, GL_INT, 32, 32, 32, 0, 0, 0, 0, 12, 3, false, false },
>+    { FormatID::R32G32B32_UINT, GL_RGB32UI, GL_RGB32UI, GenerateMip<R32G32B32>, NoCopyFunctions, ReadColor<R32G32B32, GLuint>, WriteColor<R32G32B32, GLuint>, GL_UNSIGNED_INT, 32, 32, 32, 0, 0, 0, 0, 12, 3, false, false },
>+    { FormatID::R32G32B32_UNORM, GL_RGB32_UNORM_ANGLEX, GL_RGB32_UNORM_ANGLEX, GenerateMip<R32G32B32>, NoCopyFunctions, ReadColor<R32G32B32, GLfloat>, WriteColor<R32G32B32, GLfloat>, GL_UNSIGNED_NORMALIZED, 32, 32, 32, 0, 0, 0, 0, 12, 3, false, false },
>+    { FormatID::R32G32B32_USCALED, GL_RGB32_USCALED_ANGLEX, GL_RGB32_USCALED_ANGLEX, GenerateMip<R32G32B32>, NoCopyFunctions, ReadColor<R32G32B32, GLuint>, WriteColor<R32G32B32, GLuint>, GL_UNSIGNED_INT, 32, 32, 32, 0, 0, 0, 0, 12, 3, false, false },
>+    { FormatID::R32G32_FIXED, GL_RG32_FIXED_ANGLEX, GL_RG32_FIXED_ANGLEX, GenerateMip<R32G32F>, NoCopyFunctions, ReadColor<R32G32F, GLfloat>, WriteColor<R32G32F, GLfloat>, GL_FLOAT, 32, 32, 0, 0, 0, 0, 0, 8, 3, false, true },
>+    { FormatID::R32G32_FLOAT, GL_RG32F, GL_RG32F, GenerateMip<R32G32F>, NoCopyFunctions, ReadColor<R32G32F, GLfloat>, WriteColor<R32G32F, GLfloat>, GL_FLOAT, 32, 32, 0, 0, 0, 0, 0, 8, 3, false, false },
>+    { FormatID::R32G32_SINT, GL_RG32I, GL_RG32I, GenerateMip<R32G32S>, NoCopyFunctions, ReadColor<R32G32S, GLint>, WriteColor<R32G32S, GLint>, GL_INT, 32, 32, 0, 0, 0, 0, 0, 8, 3, false, false },
>+    { FormatID::R32G32_SNORM, GL_RG32_SNORM_ANGLEX, GL_RG32_SNORM_ANGLEX, GenerateMip<R32G32S>, NoCopyFunctions, ReadColor<R32G32S, GLfloat>, WriteColor<R32G32S, GLfloat>, GL_SIGNED_NORMALIZED, 32, 32, 0, 0, 0, 0, 0, 8, 3, false, false },
>+    { FormatID::R32G32_SSCALED, GL_RG32_SSCALED_ANGLEX, GL_RG32_SSCALED_ANGLEX, GenerateMip<R32G32S>, NoCopyFunctions, ReadColor<R32G32S, GLint>, WriteColor<R32G32S, GLint>, GL_INT, 32, 32, 0, 0, 0, 0, 0, 8, 3, false, false },
>+    { FormatID::R32G32_UINT, GL_RG32UI, GL_RG32UI, GenerateMip<R32G32>, NoCopyFunctions, ReadColor<R32G32, GLuint>, WriteColor<R32G32, GLuint>, GL_UNSIGNED_INT, 32, 32, 0, 0, 0, 0, 0, 8, 3, false, false },
>+    { FormatID::R32G32_UNORM, GL_RG32_UNORM_ANGLEX, GL_RG32_UNORM_ANGLEX, GenerateMip<R32G32>, NoCopyFunctions, ReadColor<R32G32, GLfloat>, WriteColor<R32G32, GLfloat>, GL_UNSIGNED_NORMALIZED, 32, 32, 0, 0, 0, 0, 0, 8, 3, false, false },
>+    { FormatID::R32G32_USCALED, GL_RG32_USCALED_ANGLEX, GL_RG32_USCALED_ANGLEX, GenerateMip<R32G32>, NoCopyFunctions, ReadColor<R32G32, GLuint>, WriteColor<R32G32, GLuint>, GL_UNSIGNED_INT, 32, 32, 0, 0, 0, 0, 0, 8, 3, false, false },
>+    { FormatID::R32_FIXED, GL_R32_FIXED_ANGLEX, GL_R32_FIXED_ANGLEX, GenerateMip<R32F>, NoCopyFunctions, ReadColor<R32F, GLfloat>, WriteColor<R32F, GLfloat>, GL_FLOAT, 32, 0, 0, 0, 0, 0, 0, 4, 3, false, true },
>+    { FormatID::R32_FLOAT, GL_R32F, GL_R32F, GenerateMip<R32F>, NoCopyFunctions, ReadColor<R32F, GLfloat>, WriteColor<R32F, GLfloat>, GL_FLOAT, 32, 0, 0, 0, 0, 0, 0, 4, 3, false, false },
>+    { FormatID::R32_SINT, GL_R32I, GL_R32I, GenerateMip<R32S>, NoCopyFunctions, ReadColor<R32S, GLint>, WriteColor<R32S, GLint>, GL_INT, 32, 0, 0, 0, 0, 0, 0, 4, 3, false, false },
>+    { FormatID::R32_SNORM, GL_R32_SNORM_ANGLEX, GL_R32_SNORM_ANGLEX, GenerateMip<R32S>, NoCopyFunctions, ReadColor<R32S, GLfloat>, WriteColor<R32S, GLfloat>, GL_SIGNED_NORMALIZED, 32, 0, 0, 0, 0, 0, 0, 4, 3, false, false },
>+    { FormatID::R32_SSCALED, GL_R32_SSCALED_ANGLEX, GL_R32_SSCALED_ANGLEX, GenerateMip<R32S>, NoCopyFunctions, ReadColor<R32S, GLint>, WriteColor<R32S, GLint>, GL_INT, 32, 0, 0, 0, 0, 0, 0, 4, 3, false, false },
>+    { FormatID::R32_UINT, GL_R32UI, GL_R32UI, GenerateMip<R32>, NoCopyFunctions, ReadColor<R32, GLuint>, WriteColor<R32, GLuint>, GL_UNSIGNED_INT, 32, 0, 0, 0, 0, 0, 0, 4, 3, false, false },
>+    { FormatID::R32_UNORM, GL_R32_UNORM_ANGLEX, GL_R32_UNORM_ANGLEX, GenerateMip<R32>, NoCopyFunctions, ReadColor<R32, GLfloat>, WriteColor<R32, GLfloat>, GL_UNSIGNED_NORMALIZED, 32, 0, 0, 0, 0, 0, 0, 4, 3, false, false },
>+    { FormatID::R32_USCALED, GL_R32_USCALED_ANGLEX, GL_R32_USCALED_ANGLEX, GenerateMip<R32>, NoCopyFunctions, ReadColor<R32, GLuint>, WriteColor<R32, GLuint>, GL_UNSIGNED_INT, 32, 0, 0, 0, 0, 0, 0, 4, 3, false, false },
>+    { FormatID::R4G4B4A4_UNORM, GL_RGBA4, GL_RGBA4, GenerateMip<R4G4B4A4>, NoCopyFunctions, ReadColor<R4G4B4A4, GLfloat>, WriteColor<R4G4B4A4, GLfloat>, GL_UNSIGNED_NORMALIZED, 4, 4, 4, 4, 0, 0, 0, 2, std::numeric_limits<GLuint>::max(), false, false },
>+    { FormatID::R5G5B5A1_UNORM, GL_RGB5_A1, GL_RGB5_A1, GenerateMip<R5G5B5A1>, NoCopyFunctions, ReadColor<R5G5B5A1, GLfloat>, WriteColor<R5G5B5A1, GLfloat>, GL_UNSIGNED_NORMALIZED, 5, 5, 5, 1, 0, 0, 0, 2, std::numeric_limits<GLuint>::max(), false, false },
>+    { FormatID::R5G6B5_UNORM, GL_RGB565, GL_RGB565, GenerateMip<R5G6B5>, NoCopyFunctions, ReadColor<R5G6B5, GLfloat>, WriteColor<R5G6B5, GLfloat>, GL_UNSIGNED_NORMALIZED, 5, 6, 5, 0, 0, 0, 0, 2, std::numeric_limits<GLuint>::max(), false, false },
>+    { FormatID::R8G8B8A8_SINT, GL_RGBA8I, GL_RGBA8I, GenerateMip<R8G8B8A8S>, NoCopyFunctions, ReadColor<R8G8B8A8S, GLint>, WriteColor<R8G8B8A8S, GLint>, GL_INT, 8, 8, 8, 8, 0, 0, 0, 4, 0, false, false },
>+    { FormatID::R8G8B8A8_SNORM, GL_RGBA8_SNORM, GL_RGBA8_SNORM, GenerateMip<R8G8B8A8S>, NoCopyFunctions, ReadColor<R8G8B8A8S, GLfloat>, WriteColor<R8G8B8A8S, GLfloat>, GL_SIGNED_NORMALIZED, 8, 8, 8, 8, 0, 0, 0, 4, 0, false, false },
>+    { FormatID::R8G8B8A8_SSCALED, GL_RGBA8_SSCALED_ANGLEX, GL_RGBA8_SSCALED_ANGLEX, GenerateMip<R8G8B8A8S>, NoCopyFunctions, ReadColor<R8G8B8A8S, GLint>, WriteColor<R8G8B8A8S, GLint>, GL_INT, 8, 8, 8, 8, 0, 0, 0, 4, 0, false, false },
>+    { FormatID::R8G8B8A8_TYPELESS, GL_RGBA8, GL_RGBA8, GenerateMip<R8G8B8A8>, NoCopyFunctions, ReadColor<R8G8B8A8, GLfloat>, WriteColor<R8G8B8A8, GLfloat>, GL_UNSIGNED_NORMALIZED, 8, 8, 8, 8, 0, 0, 0, 4, 0, false, false },
>+    { FormatID::R8G8B8A8_TYPELESS_SRGB, GL_SRGB8_ALPHA8, GL_SRGB8_ALPHA8, GenerateMip<R8G8B8A8>, NoCopyFunctions, ReadColor<R8G8B8A8, GLfloat>, WriteColor<R8G8B8A8, GLfloat>, GL_UNSIGNED_NORMALIZED, 8, 8, 8, 8, 0, 0, 0, 4, 0, false, false },
>+    { FormatID::R8G8B8A8_UINT, GL_RGBA8UI, GL_RGBA8UI, GenerateMip<R8G8B8A8>, NoCopyFunctions, ReadColor<R8G8B8A8, GLuint>, WriteColor<R8G8B8A8, GLuint>, GL_UNSIGNED_INT, 8, 8, 8, 8, 0, 0, 0, 4, 0, false, false },
>+    { FormatID::R8G8B8A8_UNORM, GL_RGBA8, GL_RGBA8, GenerateMip<R8G8B8A8>, NoCopyFunctions, ReadColor<R8G8B8A8, GLfloat>, WriteColor<R8G8B8A8, GLfloat>, GL_UNSIGNED_NORMALIZED, 8, 8, 8, 8, 0, 0, 0, 4, 0, false, false },
>+    { FormatID::R8G8B8A8_UNORM_SRGB, GL_SRGB8_ALPHA8, GL_SRGB8_ALPHA8, GenerateMip<R8G8B8A8SRGB>, NoCopyFunctions, ReadColor<R8G8B8A8SRGB, GLfloat>, WriteColor<R8G8B8A8SRGB, GLfloat>, GL_UNSIGNED_NORMALIZED, 8, 8, 8, 8, 0, 0, 0, 4, 0, false, false },
>+    { FormatID::R8G8B8A8_USCALED, GL_RGBA8_USCALED_ANGLEX, GL_RGBA8_USCALED_ANGLEX, GenerateMip<R8G8B8A8>, NoCopyFunctions, ReadColor<R8G8B8A8, GLuint>, WriteColor<R8G8B8A8, GLuint>, GL_UNSIGNED_INT, 8, 8, 8, 8, 0, 0, 0, 4, 0, false, false },
>+    { FormatID::R8G8B8_SINT, GL_RGB8I, GL_RGB8I, GenerateMip<R8G8B8S>, NoCopyFunctions, ReadColor<R8G8B8S, GLint>, WriteColor<R8G8B8S, GLint>, GL_INT, 8, 8, 8, 0, 0, 0, 0, 3, 0, false, false },
>+    { FormatID::R8G8B8_SNORM, GL_RGB8_SNORM, GL_RGB8_SNORM, GenerateMip<R8G8B8S>, NoCopyFunctions, ReadColor<R8G8B8S, GLfloat>, WriteColor<R8G8B8S, GLfloat>, GL_SIGNED_NORMALIZED, 8, 8, 8, 0, 0, 0, 0, 3, 0, false, false },
>+    { FormatID::R8G8B8_SSCALED, GL_RGB8_SSCALED_ANGLEX, GL_RGB8_SSCALED_ANGLEX, GenerateMip<R8G8B8S>, NoCopyFunctions, ReadColor<R8G8B8S, GLint>, WriteColor<R8G8B8S, GLint>, GL_INT, 8, 8, 8, 0, 0, 0, 0, 3, 0, false, false },
>+    { FormatID::R8G8B8_UINT, GL_RGB8UI, GL_RGB8UI, GenerateMip<R8G8B8>, NoCopyFunctions, ReadColor<R8G8B8, GLuint>, WriteColor<R8G8B8, GLuint>, GL_UNSIGNED_INT, 8, 8, 8, 0, 0, 0, 0, 3, 0, false, false },
>+    { FormatID::R8G8B8_UNORM, GL_RGB8, GL_RGB8, GenerateMip<R8G8B8>, NoCopyFunctions, ReadColor<R8G8B8, GLfloat>, WriteColor<R8G8B8, GLfloat>, GL_UNSIGNED_NORMALIZED, 8, 8, 8, 0, 0, 0, 0, 3, 0, false, false },
>+    { FormatID::R8G8B8_UNORM_SRGB, GL_SRGB8, GL_SRGB8, GenerateMip<R8G8B8>, NoCopyFunctions, ReadColor<R8G8B8, GLfloat>, WriteColor<R8G8B8, GLfloat>, GL_UNSIGNED_NORMALIZED, 8, 8, 8, 0, 0, 0, 0, 3, 0, false, false },
>+    { FormatID::R8G8B8_USCALED, GL_RGB8_USCALED_ANGLEX, GL_RGB8_USCALED_ANGLEX, GenerateMip<R8G8B8>, NoCopyFunctions, ReadColor<R8G8B8, GLuint>, WriteColor<R8G8B8, GLuint>, GL_UNSIGNED_INT, 8, 8, 8, 0, 0, 0, 0, 3, 0, false, false },
>+    { FormatID::R8G8_SINT, GL_RG8I, GL_RG8I, GenerateMip<R8G8S>, NoCopyFunctions, ReadColor<R8G8S, GLint>, WriteColor<R8G8S, GLint>, GL_INT, 8, 8, 0, 0, 0, 0, 0, 2, 0, false, false },
>+    { FormatID::R8G8_SNORM, GL_RG8_SNORM, GL_RG8_SNORM, GenerateMip<R8G8S>, NoCopyFunctions, ReadColor<R8G8S, GLfloat>, WriteColor<R8G8S, GLfloat>, GL_SIGNED_NORMALIZED, 8, 8, 0, 0, 0, 0, 0, 2, 0, false, false },
>+    { FormatID::R8G8_SSCALED, GL_RG8_SSCALED_ANGLEX, GL_RG8_SSCALED_ANGLEX, GenerateMip<R8G8S>, NoCopyFunctions, ReadColor<R8G8S, GLint>, WriteColor<R8G8S, GLint>, GL_INT, 8, 8, 0, 0, 0, 0, 0, 2, 0, false, false },
>+    { FormatID::R8G8_UINT, GL_RG8UI, GL_RG8UI, GenerateMip<R8G8>, NoCopyFunctions, ReadColor<R8G8, GLuint>, WriteColor<R8G8, GLuint>, GL_UNSIGNED_INT, 8, 8, 0, 0, 0, 0, 0, 2, 0, false, false },
>+    { FormatID::R8G8_UNORM, GL_RG8, GL_RG8, GenerateMip<R8G8>, NoCopyFunctions, ReadColor<R8G8, GLfloat>, WriteColor<R8G8, GLfloat>, GL_UNSIGNED_NORMALIZED, 8, 8, 0, 0, 0, 0, 0, 2, 0, false, false },
>+    { FormatID::R8G8_USCALED, GL_RG8_USCALED_ANGLEX, GL_RG8_USCALED_ANGLEX, GenerateMip<R8G8>, NoCopyFunctions, ReadColor<R8G8, GLuint>, WriteColor<R8G8, GLuint>, GL_UNSIGNED_INT, 8, 8, 0, 0, 0, 0, 0, 2, 0, false, false },
>+    { FormatID::R8_SINT, GL_R8I, GL_R8I, GenerateMip<R8S>, NoCopyFunctions, ReadColor<R8S, GLint>, WriteColor<R8S, GLint>, GL_INT, 8, 0, 0, 0, 0, 0, 0, 1, 0, false, false },
>+    { FormatID::R8_SNORM, GL_R8_SNORM, GL_R8_SNORM, GenerateMip<R8S>, NoCopyFunctions, ReadColor<R8S, GLfloat>, WriteColor<R8S, GLfloat>, GL_SIGNED_NORMALIZED, 8, 0, 0, 0, 0, 0, 0, 1, 0, false, false },
>+    { FormatID::R8_SSCALED, GL_R8_SSCALED_ANGLEX, GL_R8_SSCALED_ANGLEX, GenerateMip<R8S>, NoCopyFunctions, ReadColor<R8S, GLint>, WriteColor<R8S, GLint>, GL_INT, 8, 0, 0, 0, 0, 0, 0, 1, 0, false, false },
>+    { FormatID::R8_UINT, GL_R8UI, GL_R8UI, GenerateMip<R8>, NoCopyFunctions, ReadColor<R8, GLuint>, WriteColor<R8, GLuint>, GL_UNSIGNED_INT, 8, 0, 0, 0, 0, 0, 0, 1, 0, false, false },
>+    { FormatID::R8_UNORM, GL_R8, GL_R8, GenerateMip<R8>, NoCopyFunctions, ReadColor<R8, GLfloat>, WriteColor<R8, GLfloat>, GL_UNSIGNED_NORMALIZED, 8, 0, 0, 0, 0, 0, 0, 1, 0, false, false },
>+    { FormatID::R8_USCALED, GL_R8_USCALED_ANGLEX, GL_R8_USCALED_ANGLEX, GenerateMip<R8>, NoCopyFunctions, ReadColor<R8, GLuint>, WriteColor<R8, GLuint>, GL_UNSIGNED_INT, 8, 0, 0, 0, 0, 0, 0, 1, 0, false, false },
>+    { FormatID::R9G9B9E5_SHAREDEXP, GL_RGB9_E5, GL_RGB9_E5, GenerateMip<R9G9B9E5>, NoCopyFunctions, ReadColor<R9G9B9E5, GLfloat>, WriteColor<R9G9B9E5, GLfloat>, GL_FLOAT, 9, 9, 9, 0, 0, 0, 0, 3, 0, false, false },
>+    { FormatID::S8_UINT, GL_STENCIL_INDEX8, GL_STENCIL_INDEX8, nullptr, NoCopyFunctions, ReadDepthStencil<S8>, WriteDepthStencil<S8>, GL_UNSIGNED_INT, 0, 0, 0, 0, 0, 0, 8, 1, std::numeric_limits<GLuint>::max(), false, false },
>     // clang-format on
> };
> 
> // static
>-Format::ID Format::InternalFormatToID(GLenum internalFormat)
>+FormatID Format::InternalFormatToID(GLenum internalFormat)
> {
>     switch (internalFormat)
>     {
>-        case GL_RGBA16_EXT:
>-            return Format::ID::R16G16B16A16_UNORM;
>-        case GL_ETC1_RGB8_LOSSY_DECODE_ANGLE:
>-            return Format::ID::ETC1_LOSSY_DECODE_R8G8B8_UNORM_BLOCK;
>-        case GL_RG8I:
>-            return Format::ID::R8G8_SINT;
>-        case GL_R16F:
>-            return Format::ID::R16_FLOAT;
>-        case GL_RGBA8I:
>-            return Format::ID::R8G8B8A8_SINT;
>-        case GL_RG8UI:
>-            return Format::ID::R8G8_UINT;
>-        case GL_RGBA8_SNORM:
>-            return Format::ID::R8G8B8A8_SNORM;
>-        case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_12x10_KHR:
>-            return Format::ID::ASTC_12x10_SRGB_BLOCK;
>-        case GL_RG8_SNORM:
>-            return Format::ID::R8G8_SNORM;
>+        case GL_A1RGB5_ANGLEX:
>+            return FormatID::A1R5G5B5_UNORM;
>+        case GL_ALPHA16F_EXT:
>+            return FormatID::A16_FLOAT;
>+        case GL_ALPHA32F_EXT:
>+            return FormatID::A32_FLOAT;
>+        case GL_ALPHA8_EXT:
>+            return FormatID::A8_UNORM;
>         case GL_BGR565_ANGLEX:
>-            return Format::ID::B5G6R5_UNORM;
>-        case GL_DEPTH_COMPONENT24:
>-            return Format::ID::D24_UNORM;
>+            return FormatID::B5G6R5_UNORM;
>+        case GL_BGR5_A1_ANGLEX:
>+            return FormatID::B5G5R5A1_UNORM;
>+        case GL_BGRA4_ANGLEX:
>+            return FormatID::B4G4R4A4_UNORM;
>+        case GL_BGRA8_EXT:
>+            return FormatID::B8G8R8A8_UNORM;
>+        case GL_BGRA8_SRGB_ANGLEX:
>+            return FormatID::B8G8R8A8_UNORM_SRGB;
>+        case GL_BGRA8_TYPELESS_ANGLEX:
>+            return FormatID::B8G8R8A8_TYPELESS;
>+        case GL_BGRA8_TYPELESS_SRGB_ANGLEX:
>+            return FormatID::B8G8R8A8_TYPELESS_SRGB;
>+        case GL_BGRX8_ANGLEX:
>+            return FormatID::B8G8R8X8_UNORM;
>+        case GL_COMPRESSED_R11_EAC:
>+            return FormatID::EAC_R11_UNORM_BLOCK;
>+        case GL_COMPRESSED_RG11_EAC:
>+            return FormatID::EAC_R11G11_UNORM_BLOCK;
>+        case GL_COMPRESSED_RGB8_ETC2:
>+            return FormatID::ETC2_R8G8B8_UNORM_BLOCK;
>         case GL_COMPRESSED_RGB8_PUNCHTHROUGH_ALPHA1_ETC2:
>-            return Format::ID::ETC2_R8G8B8A1_UNORM_BLOCK;
>+            return FormatID::ETC2_R8G8B8A1_UNORM_BLOCK;
>+        case GL_COMPRESSED_RGBA8_ETC2_EAC:
>+            return FormatID::ETC2_R8G8B8A8_UNORM_BLOCK;
>         case GL_COMPRESSED_RGBA_ASTC_10x10_KHR:
>-            return Format::ID::ASTC_10x10_UNORM_BLOCK;
>-        case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x6_KHR:
>-            return Format::ID::ASTC_8x6_SRGB_BLOCK;
>-        case GL_RGB32UI:
>-            return Format::ID::R32G32B32_UINT;
>+            return FormatID::ASTC_10x10_UNORM_BLOCK;
>+        case GL_COMPRESSED_RGBA_ASTC_10x5_KHR:
>+            return FormatID::ASTC_10x5_UNORM_BLOCK;
>+        case GL_COMPRESSED_RGBA_ASTC_10x6_KHR:
>+            return FormatID::ASTC_10x6_UNORM_BLOCK;
>+        case GL_COMPRESSED_RGBA_ASTC_10x8_KHR:
>+            return FormatID::ASTC_10x8_UNORM_BLOCK;
>+        case GL_COMPRESSED_RGBA_ASTC_12x10_KHR:
>+            return FormatID::ASTC_12x10_UNORM_BLOCK;
>+        case GL_COMPRESSED_RGBA_ASTC_12x12_KHR:
>+            return FormatID::ASTC_12x12_UNORM_BLOCK;
>+        case GL_COMPRESSED_RGBA_ASTC_4x4_KHR:
>+            return FormatID::ASTC_4x4_UNORM_BLOCK;
>+        case GL_COMPRESSED_RGBA_ASTC_5x4_KHR:
>+            return FormatID::ASTC_5x4_UNORM_BLOCK;
>+        case GL_COMPRESSED_RGBA_ASTC_5x5_KHR:
>+            return FormatID::ASTC_5x5_UNORM_BLOCK;
>         case GL_COMPRESSED_RGBA_ASTC_6x5_KHR:
>-            return Format::ID::ASTC_6x5_UNORM_BLOCK;
>-        case GL_ALPHA32F_EXT:
>-            return Format::ID::A32_FLOAT;
>-        case GL_R16UI:
>-            return Format::ID::R16_UINT;
>+            return FormatID::ASTC_6x5_UNORM_BLOCK;
>+        case GL_COMPRESSED_RGBA_ASTC_6x6_KHR:
>+            return FormatID::ASTC_6x6_UNORM_BLOCK;
>+        case GL_COMPRESSED_RGBA_ASTC_8x5_KHR:
>+            return FormatID::ASTC_8x5_UNORM_BLOCK;
>+        case GL_COMPRESSED_RGBA_ASTC_8x6_KHR:
>+            return FormatID::ASTC_8x6_UNORM_BLOCK;
>+        case GL_COMPRESSED_RGBA_ASTC_8x8_KHR:
>+            return FormatID::ASTC_8x8_UNORM_BLOCK;
>+        case GL_COMPRESSED_RGBA_BPTC_UNORM_EXT:
>+            return FormatID::BPTC_RGBA_UNORM_BLOCK;
>+        case GL_COMPRESSED_RGBA_S3TC_DXT1_EXT:
>+            return FormatID::BC1_RGBA_UNORM_BLOCK;
>+        case GL_COMPRESSED_RGBA_S3TC_DXT3_ANGLE:
>+            return FormatID::BC2_RGBA_UNORM_BLOCK;
>+        case GL_COMPRESSED_RGBA_S3TC_DXT5_ANGLE:
>+            return FormatID::BC3_RGBA_UNORM_BLOCK;
>+        case GL_COMPRESSED_RGB_BPTC_SIGNED_FLOAT_EXT:
>+            return FormatID::BPTC_RGB_SIGNED_FLOAT_BLOCK;
>+        case GL_COMPRESSED_RGB_BPTC_UNSIGNED_FLOAT_EXT:
>+            return FormatID::BPTC_RGB_UNSIGNED_FLOAT_BLOCK;
>+        case GL_COMPRESSED_RGB_S3TC_DXT1_EXT:
>+            return FormatID::BC1_RGB_UNORM_BLOCK;
>+        case GL_COMPRESSED_SIGNED_R11_EAC:
>+            return FormatID::EAC_R11_SNORM_BLOCK;
>+        case GL_COMPRESSED_SIGNED_RG11_EAC:
>+            return FormatID::EAC_R11G11_SNORM_BLOCK;
>+        case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x10_KHR:
>+            return FormatID::ASTC_10x10_SRGB_BLOCK;
>+        case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x5_KHR:
>+            return FormatID::ASTC_10x5_SRGB_BLOCK;
>+        case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x6_KHR:
>+            return FormatID::ASTC_10x6_SRGB_BLOCK;
>+        case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x8_KHR:
>+            return FormatID::ASTC_10x8_SRGB_BLOCK;
>+        case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_12x10_KHR:
>+            return FormatID::ASTC_12x10_SRGB_BLOCK;
>+        case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_12x12_KHR:
>+            return FormatID::ASTC_12x12_SRGB_BLOCK;
>+        case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_4x4_KHR:
>+            return FormatID::ASTC_4x4_SRGB_BLOCK;
>         case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x4_KHR:
>-            return Format::ID::ASTC_5x4_SRGB_BLOCK;
>+            return FormatID::ASTC_5x4_SRGB_BLOCK;
>         case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x5_KHR:
>-            return Format::ID::ASTC_5x5_SRGB_BLOCK;
>-        case GL_COMPRESSED_R11_EAC:
>-            return Format::ID::EAC_R11_UNORM_BLOCK;
>-        case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x10_KHR:
>-            return Format::ID::ASTC_10x10_SRGB_BLOCK;
>-        case GL_RGBA32UI:
>-            return Format::ID::R32G32B32A32_UINT;
>-        case GL_R8_SNORM:
>-            return Format::ID::R8_SNORM;
>+            return FormatID::ASTC_5x5_SRGB_BLOCK;
>+        case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x5_KHR:
>+            return FormatID::ASTC_6x5_SRGB_BLOCK;
>+        case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x6_KHR:
>+            return FormatID::ASTC_6x6_SRGB_BLOCK;
>+        case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x5_KHR:
>+            return FormatID::ASTC_8x5_SRGB_BLOCK;
>+        case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x6_KHR:
>+            return FormatID::ASTC_8x6_SRGB_BLOCK;
>+        case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x8_KHR:
>+            return FormatID::ASTC_8x8_SRGB_BLOCK;
>+        case GL_COMPRESSED_SRGB8_ALPHA8_ETC2_EAC:
>+            return FormatID::ETC2_R8G8B8A8_SRGB_BLOCK;
>+        case GL_COMPRESSED_SRGB8_ETC2:
>+            return FormatID::ETC2_R8G8B8_SRGB_BLOCK;
>+        case GL_COMPRESSED_SRGB8_PUNCHTHROUGH_ALPHA1_ETC2:
>+            return FormatID::ETC2_R8G8B8A1_SRGB_BLOCK;
>+        case GL_COMPRESSED_SRGB_ALPHA_BPTC_UNORM_EXT:
>+            return FormatID::BPTC_SRGB_ALPHA_UNORM_BLOCK;
>         case GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT1_EXT:
>-            return Format::ID::BC1_RGBA_UNORM_SRGB_BLOCK;
>+            return FormatID::BC1_RGBA_UNORM_SRGB_BLOCK;
>+        case GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT3_EXT:
>+            return FormatID::BC2_RGBA_UNORM_SRGB_BLOCK;
>+        case GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT5_EXT:
>+            return FormatID::BC3_RGBA_UNORM_SRGB_BLOCK;
>+        case GL_COMPRESSED_SRGB_S3TC_DXT1_EXT:
>+            return FormatID::BC1_RGB_UNORM_SRGB_BLOCK;
>+        case GL_DEPTH24_STENCIL8:
>+            return FormatID::D24_UNORM_S8_UINT;
>+        case GL_DEPTH32F_STENCIL8:
>+            return FormatID::D32_FLOAT_S8X24_UINT;
>+        case GL_DEPTH_COMPONENT16:
>+            return FormatID::D16_UNORM;
>+        case GL_DEPTH_COMPONENT24:
>+            return FormatID::D24_UNORM_X8_UINT;
>+        case GL_DEPTH_COMPONENT32F:
>+            return FormatID::D32_FLOAT;
>+        case GL_DEPTH_COMPONENT32_OES:
>+            return FormatID::D32_UNORM;
>+        case GL_ETC1_RGB8_LOSSY_DECODE_ANGLE:
>+            return FormatID::ETC1_LOSSY_DECODE_R8G8B8_UNORM_BLOCK;
>+        case GL_ETC1_RGB8_OES:
>+            return FormatID::ETC1_R8G8B8_UNORM_BLOCK;
>+        case GL_LUMINANCE16F_EXT:
>+            return FormatID::L16_FLOAT;
>         case GL_LUMINANCE32F_EXT:
>-            return Format::ID::L32_FLOAT;
>-        case GL_RG16_EXT:
>-            return Format::ID::R16G16_UNORM;
>-        case GL_COMPRESSED_SRGB8_PUNCHTHROUGH_ALPHA1_ETC2:
>-            return Format::ID::ETC2_R8G8B8A1_SRGB_BLOCK;
>-        case GL_SRGB8:
>-            return Format::ID::R8G8B8_UNORM_SRGB;
>+            return FormatID::L32_FLOAT;
>         case GL_LUMINANCE8_ALPHA8_EXT:
>-            return Format::ID::L8A8_UNORM;
>-        case GL_BGRX8_ANGLEX:
>-            return Format::ID::B8G8R8X8_UNORM;
>-        case GL_RGB16_SNORM_EXT:
>-            return Format::ID::R16G16B16_SNORM;
>-        case GL_RGBA8UI:
>-            return Format::ID::R8G8B8A8_UINT;
>-        case GL_BGRA4_ANGLEX:
>-            return Format::ID::B4G4R4A4_UNORM;
>-        case GL_COMPRESSED_SRGB8_ALPHA8_ETC2_EAC:
>-            return Format::ID::ETC2_R8G8B8A8_SRGB_BLOCK;
>+            return FormatID::L8A8_UNORM;
>         case GL_LUMINANCE8_EXT:
>-            return Format::ID::L8_UNORM;
>-        case GL_COMPRESSED_RGBA_S3TC_DXT5_ANGLE:
>-            return Format::ID::BC3_RGBA_UNORM_BLOCK;
>+            return FormatID::L8_UNORM;
>+        case GL_LUMINANCE_ALPHA16F_EXT:
>+            return FormatID::L16A16_FLOAT;
>+        case GL_LUMINANCE_ALPHA32F_EXT:
>+            return FormatID::L32A32_FLOAT;
>+        case GL_NONE:
>+            return FormatID::NONE;
>+        case GL_R11F_G11F_B10F:
>+            return FormatID::R11G11B10_FLOAT;
>+        case GL_R16F:
>+            return FormatID::R16_FLOAT;
>         case GL_R16I:
>-            return Format::ID::R16_SINT;
>-        case GL_RGB5_A1:
>-            return Format::ID::R5G5B5A1_UNORM;
>-        case GL_RGB16UI:
>-            return Format::ID::R16G16B16_UINT;
>-        case GL_COMPRESSED_RGBA_ASTC_4x4_KHR:
>-            return Format::ID::ASTC_4x4_UNORM_BLOCK;
>-        case GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT3_EXT:
>-            return Format::ID::BC2_RGBA_UNORM_SRGB_BLOCK;
>+            return FormatID::R16_SINT;
>+        case GL_R16UI:
>+            return FormatID::R16_UINT;
>+        case GL_R16_EXT:
>+            return FormatID::R16_UNORM;
>         case GL_R16_SNORM_EXT:
>-            return Format::ID::R16_SNORM;
>-        case GL_COMPRESSED_RGB8_ETC2:
>-            return Format::ID::ETC2_R8G8B8_UNORM_BLOCK;
>-        case GL_COMPRESSED_SRGB_S3TC_DXT1_EXT:
>-            return Format::ID::BC1_RGB_UNORM_SRGB_BLOCK;
>-        case GL_RGBA32F:
>-            return Format::ID::R32G32B32A32_FLOAT;
>-        case GL_RGBA32I:
>-            return Format::ID::R32G32B32A32_SINT;
>-        case GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT5_EXT:
>-            return Format::ID::BC3_RGBA_UNORM_SRGB_BLOCK;
>-        case GL_COMPRESSED_RGBA_ASTC_8x5_KHR:
>-            return Format::ID::ASTC_8x5_UNORM_BLOCK;
>-        case GL_RG8:
>-            return Format::ID::R8G8_UNORM;
>-        case GL_COMPRESSED_RGBA_ASTC_8x8_KHR:
>-            return Format::ID::ASTC_8x8_UNORM_BLOCK;
>-        case GL_RGB10_A2:
>-            return Format::ID::R10G10B10A2_UNORM;
>-        case GL_COMPRESSED_SIGNED_RG11_EAC:
>-            return Format::ID::EAC_R11G11_SNORM_BLOCK;
>-        case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x6_KHR:
>-            return Format::ID::ASTC_6x6_SRGB_BLOCK;
>-        case GL_DEPTH_COMPONENT16:
>-            return Format::ID::D16_UNORM;
>-        case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x5_KHR:
>-            return Format::ID::ASTC_10x5_SRGB_BLOCK;
>-        case GL_RGB32I:
>-            return Format::ID::R32G32B32_SINT;
>+            return FormatID::R16_SNORM;
>+        case GL_R16_SSCALED_ANGLEX:
>+            return FormatID::R16_SSCALED;
>+        case GL_R16_USCALED_ANGLEX:
>+            return FormatID::R16_USCALED;
>+        case GL_R32F:
>+            return FormatID::R32_FLOAT;
>+        case GL_R32I:
>+            return FormatID::R32_SINT;
>+        case GL_R32UI:
>+            return FormatID::R32_UINT;
>+        case GL_R32_FIXED_ANGLEX:
>+            return FormatID::R32_FIXED;
>+        case GL_R32_SNORM_ANGLEX:
>+            return FormatID::R32_SNORM;
>+        case GL_R32_SSCALED_ANGLEX:
>+            return FormatID::R32_SSCALED;
>+        case GL_R32_UNORM_ANGLEX:
>+            return FormatID::R32_UNORM;
>+        case GL_R32_USCALED_ANGLEX:
>+            return FormatID::R32_USCALED;
>         case GL_R8:
>-            return Format::ID::R8_UNORM;
>-        case GL_RGB32F:
>-            return Format::ID::R32G32B32_FLOAT;
>-        case GL_R16_EXT:
>-            return Format::ID::R16_UNORM;
>-        case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x8_KHR:
>-            return Format::ID::ASTC_8x8_SRGB_BLOCK;
>-        case GL_COMPRESSED_RGBA_ASTC_10x5_KHR:
>-            return Format::ID::ASTC_10x5_UNORM_BLOCK;
>-        case GL_R11F_G11F_B10F:
>-            return Format::ID::R11G11B10_FLOAT;
>-        case GL_RGB8:
>-            return Format::ID::R8G8B8_UNORM;
>-        case GL_COMPRESSED_RGBA_ASTC_5x5_KHR:
>-            return Format::ID::ASTC_5x5_UNORM_BLOCK;
>-        case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x5_KHR:
>-            return Format::ID::ASTC_8x5_SRGB_BLOCK;
>-        case GL_RGBA16I:
>-            return Format::ID::R16G16B16A16_SINT;
>+            return FormatID::R8_UNORM;
>         case GL_R8I:
>-            return Format::ID::R8_SINT;
>-        case GL_RGB8_SNORM:
>-            return Format::ID::R8G8B8_SNORM;
>+            return FormatID::R8_SINT;
>+        case GL_R8UI:
>+            return FormatID::R8_UINT;
>+        case GL_R8_SNORM:
>+            return FormatID::R8_SNORM;
>+        case GL_R8_SSCALED_ANGLEX:
>+            return FormatID::R8_SSCALED;
>+        case GL_R8_USCALED_ANGLEX:
>+            return FormatID::R8_USCALED;
>+        case GL_RG16F:
>+            return FormatID::R16G16_FLOAT;
>+        case GL_RG16I:
>+            return FormatID::R16G16_SINT;
>+        case GL_RG16UI:
>+            return FormatID::R16G16_UINT;
>+        case GL_RG16_EXT:
>+            return FormatID::R16G16_UNORM;
>+        case GL_RG16_SNORM_EXT:
>+            return FormatID::R16G16_SNORM;
>+        case GL_RG16_SSCALED_ANGLEX:
>+            return FormatID::R16G16_SSCALED;
>+        case GL_RG16_USCALED_ANGLEX:
>+            return FormatID::R16G16_USCALED;
>         case GL_RG32F:
>-            return Format::ID::R32G32_FLOAT;
>-        case GL_DEPTH_COMPONENT32F:
>-            return Format::ID::D32_FLOAT;
>+            return FormatID::R32G32_FLOAT;
>         case GL_RG32I:
>-            return Format::ID::R32G32_SINT;
>-        case GL_ALPHA8_EXT:
>-            return Format::ID::A8_UNORM;
>-        case GL_RGB16_EXT:
>-            return Format::ID::R16G16B16_UNORM;
>-        case GL_BGRA8_EXT:
>-            return Format::ID::B8G8R8A8_UNORM;
>+            return FormatID::R32G32_SINT;
>         case GL_RG32UI:
>-            return Format::ID::R32G32_UINT;
>-        case GL_RGBA16UI:
>-            return Format::ID::R16G16B16A16_UINT;
>-        case GL_COMPRESSED_RGBA8_ETC2_EAC:
>-            return Format::ID::ETC2_R8G8B8A8_UNORM_BLOCK;
>-        case GL_COMPRESSED_RGBA_S3TC_DXT1_EXT:
>-            return Format::ID::BC1_RGBA_UNORM_BLOCK;
>-        case GL_COMPRESSED_RGBA_ASTC_10x6_KHR:
>-            return Format::ID::ASTC_10x6_UNORM_BLOCK;
>-        case GL_COMPRESSED_SRGB8_ETC2:
>-            return Format::ID::ETC2_R8G8B8_SRGB_BLOCK;
>-        case GL_BGRA8_SRGB_ANGLEX:
>-            return Format::ID::B8G8R8A8_UNORM_SRGB;
>-        case GL_DEPTH32F_STENCIL8:
>-            return Format::ID::D32_FLOAT_S8X24_UINT;
>-        case GL_COMPRESSED_RGBA_ASTC_6x6_KHR:
>-            return Format::ID::ASTC_6x6_UNORM_BLOCK;
>-        case GL_R32UI:
>-            return Format::ID::R32_UINT;
>-        case GL_BGR5_A1_ANGLEX:
>-            return Format::ID::B5G5R5A1_UNORM;
>-        case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_12x12_KHR:
>-            return Format::ID::ASTC_12x12_SRGB_BLOCK;
>-        case GL_COMPRESSED_RG11_EAC:
>-            return Format::ID::EAC_R11G11_UNORM_BLOCK;
>-        case GL_SRGB8_ALPHA8:
>-            return Format::ID::R8G8B8A8_UNORM_SRGB;
>-        case GL_LUMINANCE_ALPHA16F_EXT:
>-            return Format::ID::L16A16_FLOAT;
>-        case GL_RGBA:
>-            return Format::ID::R8G8B8A8_UNORM;
>-        case GL_ETC1_RGB8_OES:
>-            return Format::ID::ETC1_R8G8B8_UNORM_BLOCK;
>-        case GL_DEPTH24_STENCIL8:
>-            return Format::ID::D24_UNORM_S8_UINT;
>-        case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_4x4_KHR:
>-            return Format::ID::ASTC_4x4_SRGB_BLOCK;
>+            return FormatID::R32G32_UINT;
>+        case GL_RG32_FIXED_ANGLEX:
>+            return FormatID::R32G32_FIXED;
>+        case GL_RG32_SNORM_ANGLEX:
>+            return FormatID::R32G32_SNORM;
>+        case GL_RG32_SSCALED_ANGLEX:
>+            return FormatID::R32G32_SSCALED;
>+        case GL_RG32_UNORM_ANGLEX:
>+            return FormatID::R32G32_UNORM;
>+        case GL_RG32_USCALED_ANGLEX:
>+            return FormatID::R32G32_USCALED;
>+        case GL_RG8:
>+            return FormatID::R8G8_UNORM;
>+        case GL_RG8I:
>+            return FormatID::R8G8_SINT;
>+        case GL_RG8UI:
>+            return FormatID::R8G8_UINT;
>+        case GL_RG8_SNORM:
>+            return FormatID::R8G8_SNORM;
>+        case GL_RG8_SSCALED_ANGLEX:
>+            return FormatID::R8G8_SSCALED;
>+        case GL_RG8_USCALED_ANGLEX:
>+            return FormatID::R8G8_USCALED;
>+        case GL_RGB:
>+            return FormatID::R8G8B8_UNORM;
>+        case GL_RGB10_A2:
>+            return FormatID::R10G10B10A2_UNORM;
>+        case GL_RGB10_A2UI:
>+            return FormatID::R10G10B10A2_UINT;
>+        case GL_RGB10_A2_SINT_ANGLEX:
>+            return FormatID::R10G10B10A2_SINT;
>+        case GL_RGB10_A2_SNORM_ANGLEX:
>+            return FormatID::R10G10B10A2_SNORM;
>+        case GL_RGB10_A2_SSCALED_ANGLEX:
>+            return FormatID::R10G10B10A2_SSCALED;
>+        case GL_RGB10_A2_USCALED_ANGLEX:
>+            return FormatID::R10G10B10A2_USCALED;
>+        case GL_RGB16F:
>+            return FormatID::R16G16B16_FLOAT;
>         case GL_RGB16I:
>-            return Format::ID::R16G16B16_SINT;
>-        case GL_R8UI:
>-            return Format::ID::R8_UINT;
>-        case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x6_KHR:
>-            return Format::ID::ASTC_10x6_SRGB_BLOCK;
>-        case GL_RGBA16F:
>-            return Format::ID::R16G16B16A16_FLOAT;
>-        case GL_COMPRESSED_SIGNED_R11_EAC:
>-            return Format::ID::EAC_R11_SNORM_BLOCK;
>-        case GL_COMPRESSED_RGB_S3TC_DXT1_EXT:
>-            return Format::ID::BC1_RGB_UNORM_BLOCK;
>+            return FormatID::R16G16B16_SINT;
>+        case GL_RGB16UI:
>+            return FormatID::R16G16B16_UINT;
>+        case GL_RGB16_EXT:
>+            return FormatID::R16G16B16_UNORM;
>+        case GL_RGB16_SNORM_EXT:
>+            return FormatID::R16G16B16_SNORM;
>+        case GL_RGB16_SSCALED_ANGLEX:
>+            return FormatID::R16G16B16_SSCALED;
>+        case GL_RGB16_USCALED_ANGLEX:
>+            return FormatID::R16G16B16_USCALED;
>+        case GL_RGB32F:
>+            return FormatID::R32G32B32_FLOAT;
>+        case GL_RGB32I:
>+            return FormatID::R32G32B32_SINT;
>+        case GL_RGB32UI:
>+            return FormatID::R32G32B32_UINT;
>+        case GL_RGB32_FIXED_ANGLEX:
>+            return FormatID::R32G32B32_FIXED;
>+        case GL_RGB32_SNORM_ANGLEX:
>+            return FormatID::R32G32B32_SNORM;
>+        case GL_RGB32_SSCALED_ANGLEX:
>+            return FormatID::R32G32B32_SSCALED;
>+        case GL_RGB32_UNORM_ANGLEX:
>+            return FormatID::R32G32B32_UNORM;
>+        case GL_RGB32_USCALED_ANGLEX:
>+            return FormatID::R32G32B32_USCALED;
>+        case GL_RGB565:
>+            return FormatID::R5G6B5_UNORM;
>+        case GL_RGB5_A1:
>+            return FormatID::R5G5B5A1_UNORM;
>+        case GL_RGB8:
>+            return FormatID::R8G8B8_UNORM;
>         case GL_RGB8I:
>-            return Format::ID::R8G8B8_SINT;
>-        case GL_COMPRESSED_RGBA_ASTC_8x6_KHR:
>-            return Format::ID::ASTC_8x6_UNORM_BLOCK;
>-        case GL_STENCIL_INDEX8:
>-            return Format::ID::S8_UINT;
>-        case GL_LUMINANCE_ALPHA32F_EXT:
>-            return Format::ID::L32A32_FLOAT;
>-        case GL_ALPHA16F_EXT:
>-            return Format::ID::A16_FLOAT;
>+            return FormatID::R8G8B8_SINT;
>         case GL_RGB8UI:
>-            return Format::ID::R8G8B8_UINT;
>-        case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x8_KHR:
>-            return Format::ID::ASTC_10x8_SRGB_BLOCK;
>-        case GL_COMPRESSED_RGBA_ASTC_12x10_KHR:
>-            return Format::ID::ASTC_12x10_UNORM_BLOCK;
>+            return FormatID::R8G8B8_UINT;
>+        case GL_RGB8_SNORM:
>+            return FormatID::R8G8B8_SNORM;
>+        case GL_RGB8_SSCALED_ANGLEX:
>+            return FormatID::R8G8B8_SSCALED;
>+        case GL_RGB8_USCALED_ANGLEX:
>+            return FormatID::R8G8B8_USCALED;
>         case GL_RGB9_E5:
>-            return Format::ID::R9G9B9E5_SHAREDEXP;
>+            return FormatID::R9G9B9E5_SHAREDEXP;
>+        case GL_RGBA:
>+            return FormatID::R8G8B8A8_UNORM;
>+        case GL_RGBA16F:
>+            return FormatID::R16G16B16A16_FLOAT;
>+        case GL_RGBA16I:
>+            return FormatID::R16G16B16A16_SINT;
>+        case GL_RGBA16UI:
>+            return FormatID::R16G16B16A16_UINT;
>+        case GL_RGBA16_EXT:
>+            return FormatID::R16G16B16A16_UNORM;
>         case GL_RGBA16_SNORM_EXT:
>-            return Format::ID::R16G16B16A16_SNORM;
>-        case GL_R32I:
>-            return Format::ID::R32_SINT;
>-        case GL_DEPTH_COMPONENT32_OES:
>-            return Format::ID::D32_UNORM;
>-        case GL_R32F:
>-            return Format::ID::R32_FLOAT;
>-        case GL_NONE:
>-            return Format::ID::NONE;
>-        case GL_RG16F:
>-            return Format::ID::R16G16_FLOAT;
>-        case GL_RGB:
>-            return Format::ID::R8G8B8_UNORM;
>-        case GL_RGB565:
>-            return Format::ID::R5G6B5_UNORM;
>-        case GL_LUMINANCE16F_EXT:
>-            return Format::ID::L16_FLOAT;
>-        case GL_RG16UI:
>-            return Format::ID::R16G16_UINT;
>-        case GL_COMPRESSED_RGBA_S3TC_DXT3_ANGLE:
>-            return Format::ID::BC2_RGBA_UNORM_BLOCK;
>-        case GL_RG16I:
>-            return Format::ID::R16G16_SINT;
>-        case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x5_KHR:
>-            return Format::ID::ASTC_6x5_SRGB_BLOCK;
>-        case GL_RG16_SNORM_EXT:
>-            return Format::ID::R16G16_SNORM;
>-        case GL_COMPRESSED_RGBA_ASTC_12x12_KHR:
>-            return Format::ID::ASTC_12x12_UNORM_BLOCK;
>-        case GL_COMPRESSED_RGBA_ASTC_5x4_KHR:
>-            return Format::ID::ASTC_5x4_UNORM_BLOCK;
>-        case GL_COMPRESSED_RGBA_ASTC_10x8_KHR:
>-            return Format::ID::ASTC_10x8_UNORM_BLOCK;
>+            return FormatID::R16G16B16A16_SNORM;
>+        case GL_RGBA16_SSCALED_ANGLEX:
>+            return FormatID::R16G16B16A16_SSCALED;
>+        case GL_RGBA16_USCALED_ANGLEX:
>+            return FormatID::R16G16B16A16_USCALED;
>+        case GL_RGBA32F:
>+            return FormatID::R32G32B32A32_FLOAT;
>+        case GL_RGBA32I:
>+            return FormatID::R32G32B32A32_SINT;
>+        case GL_RGBA32UI:
>+            return FormatID::R32G32B32A32_UINT;
>+        case GL_RGBA32_FIXED_ANGLEX:
>+            return FormatID::R32G32B32A32_FIXED;
>+        case GL_RGBA32_SNORM_ANGLEX:
>+            return FormatID::R32G32B32A32_SNORM;
>+        case GL_RGBA32_SSCALED_ANGLEX:
>+            return FormatID::R32G32B32A32_SSCALED;
>+        case GL_RGBA32_UNORM_ANGLEX:
>+            return FormatID::R32G32B32A32_UNORM;
>+        case GL_RGBA32_USCALED_ANGLEX:
>+            return FormatID::R32G32B32A32_USCALED;
>         case GL_RGBA4:
>-            return Format::ID::R4G4B4A4_UNORM;
>+            return FormatID::R4G4B4A4_UNORM;
>         case GL_RGBA8:
>-            return Format::ID::R8G8B8A8_UNORM;
>-        case GL_RGB16F:
>-            return Format::ID::R16G16B16_FLOAT;
>-        case GL_RGB10_A2UI:
>-            return Format::ID::R10G10B10A2_UINT;
>+            return FormatID::R8G8B8A8_UNORM;
>+        case GL_RGBA8I:
>+            return FormatID::R8G8B8A8_SINT;
>+        case GL_RGBA8UI:
>+            return FormatID::R8G8B8A8_UINT;
>+        case GL_RGBA8_SNORM:
>+            return FormatID::R8G8B8A8_SNORM;
>+        case GL_RGBA8_SSCALED_ANGLEX:
>+            return FormatID::R8G8B8A8_SSCALED;
>+        case GL_RGBA8_TYPELESS_ANGLEX:
>+            return FormatID::R8G8B8A8_TYPELESS;
>+        case GL_RGBA8_TYPELESS_SRGB_ANGLEX:
>+            return FormatID::R8G8B8A8_TYPELESS_SRGB;
>+        case GL_RGBA8_USCALED_ANGLEX:
>+            return FormatID::R8G8B8A8_USCALED;
>+        case GL_SRGB8:
>+            return FormatID::R8G8B8_UNORM_SRGB;
>+        case GL_SRGB8_ALPHA8:
>+            return FormatID::R8G8B8A8_UNORM_SRGB;
>+        case GL_STENCIL_INDEX8:
>+            return FormatID::S8_UINT;
>         default:
>-            return Format::ID::NONE;
>+            return FormatID::NONE;
>     }
> }
> 
>-// static
>-const Format &Format::Get(ID id)
>+const Format *GetFormatInfoTable()
> {
>-    return g_formatInfoTable[static_cast<size_t>(id)];
>+    return gFormatInfoTable;
> }
>-
> }  // namespace angle
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/FramebufferAttachmentObjectImpl.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/FramebufferAttachmentObjectImpl.h
>index 056ddc833a7..5c526117bad 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/FramebufferAttachmentObjectImpl.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/FramebufferAttachmentObjectImpl.h
>@@ -11,10 +11,12 @@
> #ifndef LIBANGLE_RENDERER_FRAMEBUFFER_ATTACHMENT_OBJECT_IMPL_H_
> #define LIBANGLE_RENDERER_FRAMEBUFFER_ATTACHMENT_OBJECT_IMPL_H_
> 
>-#include "libANGLE/FramebufferAttachment.h"
>+#include "libANGLE/ImageIndex.h"
>+#include "libANGLE/Observer.h"
> 
> namespace rx
> {
>+class FramebufferAttachmentRenderTarget;
> 
> class FramebufferAttachmentObjectImpl : angle::NonCopyable
> {
>@@ -22,31 +24,31 @@ class FramebufferAttachmentObjectImpl : angle::NonCopyable
>     FramebufferAttachmentObjectImpl() {}
>     virtual ~FramebufferAttachmentObjectImpl() {}
> 
>-    virtual gl::Error getAttachmentRenderTarget(const gl::Context *context,
>-                                                GLenum binding,
>-                                                const gl::ImageIndex &imageIndex,
>-                                                FramebufferAttachmentRenderTarget **rtOut);
>+    virtual angle::Result getAttachmentRenderTarget(const gl::Context *context,
>+                                                    GLenum binding,
>+                                                    const gl::ImageIndex &imageIndex,
>+                                                    FramebufferAttachmentRenderTarget **rtOut);
> 
>-    virtual gl::Error initializeContents(const gl::Context *context,
>-                                         const gl::ImageIndex &imageIndex);
>+    virtual angle::Result initializeContents(const gl::Context *context,
>+                                             const gl::ImageIndex &imageIndex);
> };
> 
>-inline gl::Error FramebufferAttachmentObjectImpl::getAttachmentRenderTarget(
>+inline angle::Result FramebufferAttachmentObjectImpl::getAttachmentRenderTarget(
>     const gl::Context *context,
>     GLenum binding,
>     const gl::ImageIndex &imageIndex,
>     FramebufferAttachmentRenderTarget **rtOut)
> {
>     UNIMPLEMENTED();
>-    return gl::OutOfMemory() << "getAttachmentRenderTarget not supported.";
>+    return angle::Result::Stop;
> }
> 
>-inline gl::Error FramebufferAttachmentObjectImpl::initializeContents(
>+inline angle::Result FramebufferAttachmentObjectImpl::initializeContents(
>     const gl::Context *context,
>     const gl::ImageIndex &imageIndex)
> {
>     UNIMPLEMENTED();
>-    return gl::OutOfMemory() << "initialize not supported.";
>+    return angle::Result::Stop;
> }
> 
> }  // namespace rx
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/FramebufferImpl.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/FramebufferImpl.h
>index ebb166ca808..63b48cda883 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/FramebufferImpl.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/FramebufferImpl.h
>@@ -20,7 +20,7 @@ class State;
> class Framebuffer;
> class FramebufferAttachment;
> struct Rectangle;
>-}
>+}  // namespace gl
> 
> namespace rx
> {
>@@ -32,64 +32,65 @@ class FramebufferImpl : angle::NonCopyable
>     explicit FramebufferImpl(const gl::FramebufferState &state) : mState(state) {}
>     virtual ~FramebufferImpl() {}
>     virtual void destroy(const gl::Context *context) {}
>-    virtual void destroyDefault(const egl::Display *display) {}
>-
>-    virtual gl::Error discard(const gl::Context *context,
>-                              size_t count,
>-                              const GLenum *attachments) = 0;
>-    virtual gl::Error invalidate(const gl::Context *context,
>-                                 size_t count,
>-                                 const GLenum *attachments) = 0;
>-    virtual gl::Error invalidateSub(const gl::Context *context,
>-                                    size_t count,
>-                                    const GLenum *attachments,
>-                                    const gl::Rectangle &area) = 0;
>-
>-    virtual gl::Error clear(const gl::Context *context, GLbitfield mask) = 0;
>-    virtual gl::Error clearBufferfv(const gl::Context *context,
>-                                    GLenum buffer,
>-                                    GLint drawbuffer,
>-                                    const GLfloat *values) = 0;
>-    virtual gl::Error clearBufferuiv(const gl::Context *context,
>-                                     GLenum buffer,
>-                                     GLint drawbuffer,
>-                                     const GLuint *values) = 0;
>-    virtual gl::Error clearBufferiv(const gl::Context *context,
>-                                    GLenum buffer,
>-                                    GLint drawbuffer,
>-                                    const GLint *values) = 0;
>-    virtual gl::Error clearBufferfi(const gl::Context *context,
>-                                    GLenum buffer,
>-                                    GLint drawbuffer,
>-                                    GLfloat depth,
>-                                    GLint stencil) = 0;
>+
>+    virtual angle::Result discard(const gl::Context *context,
>+                                  size_t count,
>+                                  const GLenum *attachments)       = 0;
>+    virtual angle::Result invalidate(const gl::Context *context,
>+                                     size_t count,
>+                                     const GLenum *attachments)    = 0;
>+    virtual angle::Result invalidateSub(const gl::Context *context,
>+                                        size_t count,
>+                                        const GLenum *attachments,
>+                                        const gl::Rectangle &area) = 0;
>+
>+    virtual angle::Result clear(const gl::Context *context, GLbitfield mask) = 0;
>+    virtual angle::Result clearBufferfv(const gl::Context *context,
>+                                        GLenum buffer,
>+                                        GLint drawbuffer,
>+                                        const GLfloat *values)               = 0;
>+    virtual angle::Result clearBufferuiv(const gl::Context *context,
>+                                         GLenum buffer,
>+                                         GLint drawbuffer,
>+                                         const GLuint *values)               = 0;
>+    virtual angle::Result clearBufferiv(const gl::Context *context,
>+                                        GLenum buffer,
>+                                        GLint drawbuffer,
>+                                        const GLint *values)                 = 0;
>+    virtual angle::Result clearBufferfi(const gl::Context *context,
>+                                        GLenum buffer,
>+                                        GLint drawbuffer,
>+                                        GLfloat depth,
>+                                        GLint stencil)                       = 0;
> 
>     virtual GLenum getImplementationColorReadFormat(const gl::Context *context) const = 0;
>     virtual GLenum getImplementationColorReadType(const gl::Context *context) const   = 0;
>-    virtual gl::Error readPixels(const gl::Context *context,
>-                                 const gl::Rectangle &area,
>-                                 GLenum format,
>-                                 GLenum type,
>-                                 void *pixels) = 0;
>-
>-    virtual gl::Error blit(const gl::Context *context,
>-                           const gl::Rectangle &sourceArea,
>-                           const gl::Rectangle &destArea,
>-                           GLbitfield mask,
>-                           GLenum filter) = 0;
>+    virtual angle::Result readPixels(const gl::Context *context,
>+                                     const gl::Rectangle &area,
>+                                     GLenum format,
>+                                     GLenum type,
>+                                     void *pixels)                                    = 0;
>+
>+    virtual angle::Result blit(const gl::Context *context,
>+                               const gl::Rectangle &sourceArea,
>+                               const gl::Rectangle &destArea,
>+                               GLbitfield mask,
>+                               GLenum filter) = 0;
> 
>     virtual bool checkStatus(const gl::Context *context) const = 0;
> 
>-    virtual void syncState(const gl::Context *context,
>-                           const gl::Framebuffer::DirtyBits &dirtyBits) = 0;
>+    virtual angle::Result syncState(const gl::Context *context,
>+                                    const gl::Framebuffer::DirtyBits &dirtyBits) = 0;
> 
>-    virtual gl::Error getSamplePosition(size_t index, GLfloat *xy) const = 0;
>+    virtual angle::Result getSamplePosition(const gl::Context *context,
>+                                            size_t index,
>+                                            GLfloat *xy) const = 0;
> 
>     const gl::FramebufferState &getState() const { return mState; }
> 
>   protected:
>     const gl::FramebufferState &mState;
> };
>-}
>+}  // namespace rx
> 
> #endif  // LIBANGLE_RENDERER_FRAMEBUFFERIMPL_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/FramebufferImpl_mock.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/FramebufferImpl_mock.h
>index c2d069676ec..8d841e7020c 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/FramebufferImpl_mock.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/FramebufferImpl_mock.h
>@@ -23,34 +23,34 @@ class MockFramebufferImpl : public rx::FramebufferImpl
>     MockFramebufferImpl() : rx::FramebufferImpl(gl::FramebufferState()) {}
>     virtual ~MockFramebufferImpl() { destructor(); }
> 
>-    MOCK_METHOD3(discard, gl::Error(const gl::Context *, size_t, const GLenum *));
>-    MOCK_METHOD3(invalidate, gl::Error(const gl::Context *, size_t, const GLenum *));
>+    MOCK_METHOD3(discard, angle::Result(const gl::Context *, size_t, const GLenum *));
>+    MOCK_METHOD3(invalidate, angle::Result(const gl::Context *, size_t, const GLenum *));
>     MOCK_METHOD4(invalidateSub,
>-                 gl::Error(const gl::Context *, size_t, const GLenum *, const gl::Rectangle &));
>+                 angle::Result(const gl::Context *, size_t, const GLenum *, const gl::Rectangle &));
> 
>-    MOCK_METHOD2(clear, gl::Error(const gl::Context *, GLbitfield));
>-    MOCK_METHOD4(clearBufferfv, gl::Error(const gl::Context *, GLenum, GLint, const GLfloat *));
>-    MOCK_METHOD4(clearBufferuiv, gl::Error(const gl::Context *, GLenum, GLint, const GLuint *));
>-    MOCK_METHOD4(clearBufferiv, gl::Error(const gl::Context *, GLenum, GLint, const GLint *));
>-    MOCK_METHOD5(clearBufferfi, gl::Error(const gl::Context *, GLenum, GLint, GLfloat, GLint));
>+    MOCK_METHOD2(clear, angle::Result(const gl::Context *, GLbitfield));
>+    MOCK_METHOD4(clearBufferfv, angle::Result(const gl::Context *, GLenum, GLint, const GLfloat *));
>+    MOCK_METHOD4(clearBufferuiv, angle::Result(const gl::Context *, GLenum, GLint, const GLuint *));
>+    MOCK_METHOD4(clearBufferiv, angle::Result(const gl::Context *, GLenum, GLint, const GLint *));
>+    MOCK_METHOD5(clearBufferfi, angle::Result(const gl::Context *, GLenum, GLint, GLfloat, GLint));
> 
>     MOCK_CONST_METHOD1(getImplementationColorReadFormat, GLenum(const gl::Context *));
>     MOCK_CONST_METHOD1(getImplementationColorReadType, GLenum(const gl::Context *));
>     MOCK_METHOD5(readPixels,
>-                 gl::Error(const gl::Context *, const gl::Rectangle &, GLenum, GLenum, void *));
>+                 angle::Result(const gl::Context *, const gl::Rectangle &, GLenum, GLenum, void *));
> 
>-    MOCK_CONST_METHOD2(getSamplePosition, gl::Error(size_t, GLfloat *));
>+    MOCK_CONST_METHOD3(getSamplePosition, angle::Result(const gl::Context *, size_t, GLfloat *));
> 
>     MOCK_METHOD5(blit,
>-                 gl::Error(const gl::Context *,
>-                           const gl::Rectangle &,
>-                           const gl::Rectangle &,
>-                           GLbitfield,
>-                           GLenum));
>+                 angle::Result(const gl::Context *,
>+                               const gl::Rectangle &,
>+                               const gl::Rectangle &,
>+                               GLbitfield,
>+                               GLenum));
> 
>     MOCK_CONST_METHOD1(checkStatus, bool(const gl::Context *));
> 
>-    MOCK_METHOD2(syncState, void(const gl::Context *, const gl::Framebuffer::DirtyBits &));
>+    MOCK_METHOD2(syncState, angle::Result(const gl::Context *, const gl::Framebuffer::DirtyBits &));
> 
>     MOCK_METHOD0(destructor, void());
> };
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/GLImplFactory.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/GLImplFactory.h
>index b9a135f5962..4b13beb3009 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/GLImplFactory.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/GLImplFactory.h
>@@ -16,14 +16,16 @@
> #include "libANGLE/Framebuffer.h"
> #include "libANGLE/Program.h"
> #include "libANGLE/ProgramPipeline.h"
>+#include "libANGLE/Renderbuffer.h"
> #include "libANGLE/Shader.h"
>+#include "libANGLE/Texture.h"
> #include "libANGLE/TransformFeedback.h"
> #include "libANGLE/VertexArray.h"
> 
> namespace gl
> {
>-class ContextState;
>-}
>+class State;
>+}  // namespace gl
> 
> namespace rx
> {
>@@ -33,6 +35,7 @@ class ContextImpl;
> class FenceNVImpl;
> class SyncImpl;
> class FramebufferImpl;
>+class MemoryObjectImpl;
> class PathImpl;
> class ProgramImpl;
> class ProgramPipelineImpl;
>@@ -51,8 +54,8 @@ class GLImplFactory : angle::NonCopyable
>     virtual ~GLImplFactory() {}
> 
>     // Shader creation
>-    virtual CompilerImpl *createCompiler() = 0;
>-    virtual ShaderImpl *createShader(const gl::ShaderState &data) = 0;
>+    virtual CompilerImpl *createCompiler()                           = 0;
>+    virtual ShaderImpl *createShader(const gl::ShaderState &data)    = 0;
>     virtual ProgramImpl *createProgram(const gl::ProgramState &data) = 0;
> 
>     // Framebuffer creation
>@@ -62,7 +65,7 @@ class GLImplFactory : angle::NonCopyable
>     virtual TextureImpl *createTexture(const gl::TextureState &state) = 0;
> 
>     // Renderbuffer creation
>-    virtual RenderbufferImpl *createRenderbuffer() = 0;
>+    virtual RenderbufferImpl *createRenderbuffer(const gl::RenderbufferState &state) = 0;
> 
>     // Buffer creation
>     virtual BufferImpl *createBuffer(const gl::BufferState &state) = 0;
>@@ -71,9 +74,9 @@ class GLImplFactory : angle::NonCopyable
>     virtual VertexArrayImpl *createVertexArray(const gl::VertexArrayState &data) = 0;
> 
>     // Query and Fence creation
>-    virtual QueryImpl *createQuery(GLenum type) = 0;
>-    virtual FenceNVImpl *createFenceNV() = 0;
>-    virtual SyncImpl *createSync()              = 0;
>+    virtual QueryImpl *createQuery(gl::QueryType type) = 0;
>+    virtual FenceNVImpl *createFenceNV()               = 0;
>+    virtual SyncImpl *createSync()                     = 0;
> 
>     // Transform Feedback creation
>     virtual TransformFeedbackImpl *createTransformFeedback(
>@@ -86,6 +89,9 @@ class GLImplFactory : angle::NonCopyable
>     virtual ProgramPipelineImpl *createProgramPipeline(const gl::ProgramPipelineState &data) = 0;
> 
>     virtual std::vector<PathImpl *> createPaths(GLsizei range) = 0;
>+
>+    // Memory object creation
>+    virtual MemoryObjectImpl *createMemoryObject() = 0;
> };
> 
> }  // namespace rx
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/ImageImpl.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/ImageImpl.h
>index 79694eaebf6..6d2e6e5337d 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/ImageImpl.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/ImageImpl.h
>@@ -11,6 +11,8 @@
> 
> #include "common/angleutils.h"
> #include "libANGLE/Error.h"
>+#include "libANGLE/formatutils.h"
>+#include "libANGLE/renderer/FramebufferAttachmentObjectImpl.h"
> 
> namespace gl
> {
>@@ -19,20 +21,38 @@ class Context;
> 
> namespace egl
> {
>+class Display;
> class ImageSibling;
> struct ImageState;
> }  // namespace egl
> 
> namespace rx
> {
>+class ExternalImageSiblingImpl : public FramebufferAttachmentObjectImpl
>+{
>+  public:
>+    ~ExternalImageSiblingImpl() override {}
>+
>+    virtual egl::Error initialize(const egl::Display *display) = 0;
>+    virtual void onDestroy(const egl::Display *display) {}
>+
>+    virtual gl::Format getFormat() const                        = 0;
>+    virtual bool isRenderable(const gl::Context *context) const = 0;
>+    virtual bool isTexturable(const gl::Context *context) const = 0;
>+    virtual gl::Extents getSize() const                         = 0;
>+    virtual size_t getSamples() const                           = 0;
>+};
>+
> class ImageImpl : angle::NonCopyable
> {
>   public:
>     ImageImpl(const egl::ImageState &state) : mState(state) {}
>     virtual ~ImageImpl() {}
>-    virtual egl::Error initialize() = 0;
>+    virtual void onDestroy(const egl::Display *display) {}
>+
>+    virtual egl::Error initialize(const egl::Display *display) = 0;
> 
>-    virtual gl::Error orphan(const gl::Context *context, egl::ImageSibling *sibling) = 0;
>+    virtual angle::Result orphan(const gl::Context *context, egl::ImageSibling *sibling) = 0;
> 
>   protected:
>     const egl::ImageState &mState;
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/ImageImpl_mock.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/ImageImpl_mock.h
>index 30c0cc25946..d84cea7cf4c 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/ImageImpl_mock.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/ImageImpl_mock.h
>@@ -18,15 +18,10 @@ namespace rx
> class MockImageImpl : public ImageImpl
> {
>   public:
>-    MockImageImpl(const egl::ImageState &state,
>-                  EGLenum /*target*/,
>-                  const egl::AttributeMap & /*attribs*/)
>-        : ImageImpl(state)
>-    {
>-    }
>+    MockImageImpl(const egl::ImageState &state) : ImageImpl(state) {}
>     virtual ~MockImageImpl() { destructor(); }
>-    MOCK_METHOD0(initialize, egl::Error(void));
>-    MOCK_METHOD2(orphan, gl::Error(const gl::Context *, egl::ImageSibling *));
>+    MOCK_METHOD1(initialize, egl::Error(const egl::Display *));
>+    MOCK_METHOD2(orphan, angle::Result(const gl::Context *, egl::ImageSibling *));
>     MOCK_METHOD0(destructor, void());
> };
> }  // namespace rx
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/MemoryObjectImpl.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/MemoryObjectImpl.h
>new file mode 100644
>index 00000000000..edec1184538
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/MemoryObjectImpl.h
>@@ -0,0 +1,40 @@
>+//
>+// Copyright 2019 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// MemoryObjectImpl.h: Implements the rx::MemoryObjectImpl class [EXT_external_objects]
>+
>+#ifndef LIBANGLE_RENDERER_MEMORYOBJECTIMPL_H_
>+#define LIBANGLE_RENDERER_MEMORYOBJECTIMPL_H_
>+
>+#include "angle_gl.h"
>+#include "common/PackedEnums.h"
>+#include "common/angleutils.h"
>+#include "libANGLE/Error.h"
>+
>+namespace gl
>+{
>+class Context;
>+class MemoryObject;
>+}  // namespace gl
>+
>+namespace rx
>+{
>+
>+class MemoryObjectImpl : angle::NonCopyable
>+{
>+  public:
>+    virtual ~MemoryObjectImpl() {}
>+
>+    virtual void onDestroy(const gl::Context *context) = 0;
>+
>+    virtual angle::Result importFd(gl::Context *context,
>+                                   GLuint64 size,
>+                                   gl::HandleType handleType,
>+                                   GLint fd) = 0;
>+};
>+
>+}  // namespace rx
>+
>+#endif  // LIBANGLE_RENDERER_MEMORYOBJECTIMPL_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/PathImpl.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/PathImpl.h
>index 3607f69a2b8..5460d76606a 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/PathImpl.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/PathImpl.h
>@@ -22,11 +22,11 @@ class PathImpl : angle::NonCopyable
>   public:
>     virtual ~PathImpl() {}
> 
>-    virtual gl::Error setCommands(GLsizei numCommands,
>-                                  const GLubyte *commands,
>-                                  GLsizei numCoords,
>-                                  GLenum coordType,
>-                                  const void *coords) = 0;
>+    virtual angle::Result setCommands(GLsizei numCommands,
>+                                      const GLubyte *commands,
>+                                      GLsizei numCoords,
>+                                      GLenum coordType,
>+                                      const void *coords) = 0;
> 
>     virtual void setPathParameter(GLenum pname, GLfloat value) = 0;
> };
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/ProgramImpl.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/ProgramImpl.h
>index 18ecb6457d5..2bc07040014 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/ProgramImpl.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/ProgramImpl.h
>@@ -21,7 +21,7 @@ namespace gl
> {
> class Context;
> struct ProgramLinkedResources;
>-}
>+}  // namespace gl
> 
> namespace sh
> {
>@@ -30,6 +30,44 @@ struct BlockMemberInfo;
> 
> namespace rx
> {
>+
>+// Provides a mechanism to access the result of asynchronous linking.
>+class LinkEvent : angle::NonCopyable
>+{
>+  public:
>+    virtual ~LinkEvent() {}
>+
>+    // Please be aware that these methods may be called under a gl::Context other
>+    // than the one where the LinkEvent was created.
>+    //
>+    // Waits until the linking is actually done. Returns true if the linking
>+    // succeeded, false otherwise.
>+    virtual angle::Result wait(const gl::Context *context) = 0;
>+    // Peeks whether the linking is still ongoing.
>+    virtual bool isLinking() = 0;
>+};
>+
>+// Wraps an already done linking.
>+class LinkEventDone final : public LinkEvent
>+{
>+  public:
>+    LinkEventDone(angle::Result result) : mResult(result) {}
>+    angle::Result wait(const gl::Context *context) override;
>+    bool isLinking() override;
>+
>+  private:
>+    angle::Result mResult;
>+};
>+
>+inline angle::Result LinkEventDone::wait(const gl::Context *context)
>+{
>+    return mResult;
>+}
>+inline bool LinkEventDone::isLinking()
>+{
>+    return false;
>+}
>+
> class ProgramImpl : angle::NonCopyable
> {
>   public:
>@@ -37,51 +75,75 @@ class ProgramImpl : angle::NonCopyable
>     virtual ~ProgramImpl() {}
>     virtual void destroy(const gl::Context *context) {}
> 
>-    virtual gl::LinkResult load(const gl::Context *context,
>-                                gl::InfoLog &infoLog,
>-                                gl::BinaryInputStream *stream) = 0;
>+    virtual std::unique_ptr<LinkEvent> load(const gl::Context *context,
>+                                            gl::BinaryInputStream *stream,
>+                                            gl::InfoLog &infoLog)                 = 0;
>     virtual void save(const gl::Context *context, gl::BinaryOutputStream *stream) = 0;
>-    virtual void setBinaryRetrievableHint(bool retrievable) = 0;
>-    virtual void setSeparable(bool separable)               = 0;
>+    virtual void setBinaryRetrievableHint(bool retrievable)                       = 0;
>+    virtual void setSeparable(bool separable)                                     = 0;
> 
>-    virtual gl::LinkResult link(const gl::Context *context,
>-                                const gl::ProgramLinkedResources &resources,
>-                                gl::InfoLog &infoLog)                      = 0;
>+    virtual std::unique_ptr<LinkEvent> link(const gl::Context *context,
>+                                            const gl::ProgramLinkedResources &resources,
>+                                            gl::InfoLog &infoLog)          = 0;
>     virtual GLboolean validate(const gl::Caps &caps, gl::InfoLog *infoLog) = 0;
> 
>     virtual void setUniform1fv(GLint location, GLsizei count, const GLfloat *v) = 0;
>     virtual void setUniform2fv(GLint location, GLsizei count, const GLfloat *v) = 0;
>     virtual void setUniform3fv(GLint location, GLsizei count, const GLfloat *v) = 0;
>     virtual void setUniform4fv(GLint location, GLsizei count, const GLfloat *v) = 0;
>-    virtual void setUniform1iv(GLint location, GLsizei count, const GLint *v) = 0;
>-    virtual void setUniform2iv(GLint location, GLsizei count, const GLint *v) = 0;
>-    virtual void setUniform3iv(GLint location, GLsizei count, const GLint *v) = 0;
>-    virtual void setUniform4iv(GLint location, GLsizei count, const GLint *v) = 0;
>+    virtual void setUniform1iv(GLint location, GLsizei count, const GLint *v)   = 0;
>+    virtual void setUniform2iv(GLint location, GLsizei count, const GLint *v)   = 0;
>+    virtual void setUniform3iv(GLint location, GLsizei count, const GLint *v)   = 0;
>+    virtual void setUniform4iv(GLint location, GLsizei count, const GLint *v)   = 0;
>     virtual void setUniform1uiv(GLint location, GLsizei count, const GLuint *v) = 0;
>     virtual void setUniform2uiv(GLint location, GLsizei count, const GLuint *v) = 0;
>     virtual void setUniform3uiv(GLint location, GLsizei count, const GLuint *v) = 0;
>     virtual void setUniform4uiv(GLint location, GLsizei count, const GLuint *v) = 0;
>-    virtual void setUniformMatrix2fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value) = 0;
>-    virtual void setUniformMatrix3fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value) = 0;
>-    virtual void setUniformMatrix4fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value) = 0;
>-    virtual void setUniformMatrix2x3fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value) = 0;
>-    virtual void setUniformMatrix3x2fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value) = 0;
>-    virtual void setUniformMatrix2x4fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value) = 0;
>-    virtual void setUniformMatrix4x2fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value) = 0;
>-    virtual void setUniformMatrix3x4fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value) = 0;
>-    virtual void setUniformMatrix4x3fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value) = 0;
>+    virtual void setUniformMatrix2fv(GLint location,
>+                                     GLsizei count,
>+                                     GLboolean transpose,
>+                                     const GLfloat *value)                      = 0;
>+    virtual void setUniformMatrix3fv(GLint location,
>+                                     GLsizei count,
>+                                     GLboolean transpose,
>+                                     const GLfloat *value)                      = 0;
>+    virtual void setUniformMatrix4fv(GLint location,
>+                                     GLsizei count,
>+                                     GLboolean transpose,
>+                                     const GLfloat *value)                      = 0;
>+    virtual void setUniformMatrix2x3fv(GLint location,
>+                                       GLsizei count,
>+                                       GLboolean transpose,
>+                                       const GLfloat *value)                    = 0;
>+    virtual void setUniformMatrix3x2fv(GLint location,
>+                                       GLsizei count,
>+                                       GLboolean transpose,
>+                                       const GLfloat *value)                    = 0;
>+    virtual void setUniformMatrix2x4fv(GLint location,
>+                                       GLsizei count,
>+                                       GLboolean transpose,
>+                                       const GLfloat *value)                    = 0;
>+    virtual void setUniformMatrix4x2fv(GLint location,
>+                                       GLsizei count,
>+                                       GLboolean transpose,
>+                                       const GLfloat *value)                    = 0;
>+    virtual void setUniformMatrix3x4fv(GLint location,
>+                                       GLsizei count,
>+                                       GLboolean transpose,
>+                                       const GLfloat *value)                    = 0;
>+    virtual void setUniformMatrix4x3fv(GLint location,
>+                                       GLsizei count,
>+                                       GLboolean transpose,
>+                                       const GLfloat *value)                    = 0;
> 
>     // Done in the back-end to avoid having to keep a system copy of uniform data.
>     virtual void getUniformfv(const gl::Context *context,
>                               GLint location,
>-                              GLfloat *params) const = 0;
>+                              GLfloat *params) const                                           = 0;
>     virtual void getUniformiv(const gl::Context *context, GLint location, GLint *params) const = 0;
>     virtual void getUniformuiv(const gl::Context *context,
>                                GLint location,
>-                               GLuint *params) const = 0;
>-
>-    // TODO: synchronize in syncState when dirty bits exist.
>-    virtual void setUniformBlockBinding(GLuint uniformBlockIndex, GLuint uniformBlockBinding) = 0;
>+                               GLuint *params) const                                           = 0;
> 
>     // CHROMIUM_path_rendering
>     // Set parameters to control fragment shader input variable interpolation
>@@ -92,16 +154,27 @@ class ProgramImpl : angle::NonCopyable
> 
>     // Implementation-specific method for ignoring unreferenced uniforms. Some implementations may
>     // perform more extensive analysis and ignore some locations that ANGLE doesn't detect as
>-    // unreferenced. This method is not required to be overridden by a back-end.
>+    // unreferenced. This method is not required to be overriden by a back-end.
>     virtual void markUnusedUniformLocations(std::vector<gl::VariableLocation> *uniformLocations,
>-                                            std::vector<gl::SamplerBinding> *samplerBindings)
>-    {
>-    }
>+                                            std::vector<gl::SamplerBinding> *samplerBindings,
>+                                            std::vector<gl::ImageBinding> *imageBindings)
>+    {}
>+
>+    const gl::ProgramState &getState() const { return mState; }
>+
>+    virtual angle::Result syncState(const gl::Context *context,
>+                                    const gl::Program::DirtyBits &dirtyBits);
> 
>   protected:
>     const gl::ProgramState &mState;
> };
> 
>+inline angle::Result ProgramImpl::syncState(const gl::Context *context,
>+                                            const gl::Program::DirtyBits &dirtyBits)
>+{
>+    return angle::Result::Continue;
>+}
>+
> }  // namespace rx
> 
>-#endif // LIBANGLE_RENDERER_PROGRAMIMPL_H_
>+#endif  // LIBANGLE_RENDERER_PROGRAMIMPL_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/ProgramImpl_mock.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/ProgramImpl_mock.h
>index 4717ab88431..9bb6ce4b2e9 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/ProgramImpl_mock.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/ProgramImpl_mock.h
>@@ -24,15 +24,15 @@ class MockProgramImpl : public rx::ProgramImpl
>     MockProgramImpl() : ProgramImpl(gl::ProgramState()) {}
>     virtual ~MockProgramImpl() { destructor(); }
> 
>-    MOCK_METHOD3(load, gl::LinkResult(const gl::Context *, gl::InfoLog &, gl::BinaryInputStream *));
>+    MOCK_METHOD3(load, angle::Result(const gl::Context *, gl::InfoLog &, gl::BinaryInputStream *));
>     MOCK_METHOD2(save, void(const gl::Context *, gl::BinaryOutputStream *));
>     MOCK_METHOD1(setBinaryRetrievableHint, void(bool));
>     MOCK_METHOD1(setSeparable, void(bool));
> 
>     MOCK_METHOD3(link,
>-                 gl::LinkResult(const gl::Context *,
>-                                const gl::ProgramLinkedResources &,
>-                                gl::InfoLog &));
>+                 std::unique_ptr<LinkEvent>(const gl::Context *,
>+                                            const gl::ProgramLinkedResources &,
>+                                            gl::InfoLog &));
>     MOCK_METHOD2(validate, GLboolean(const gl::Caps &, gl::InfoLog *));
> 
>     MOCK_METHOD3(setUniform1fv, void(GLint, GLsizei, const GLfloat *));
>@@ -62,7 +62,6 @@ class MockProgramImpl : public rx::ProgramImpl
>     MOCK_CONST_METHOD3(getUniformiv, void(const gl::Context *, GLint, GLint *));
>     MOCK_CONST_METHOD3(getUniformuiv, void(const gl::Context *, GLint, GLuint *));
> 
>-    MOCK_METHOD2(setUniformBlockBinding, void(GLuint, GLuint));
>     MOCK_METHOD4(setPathFragmentInputGen,
>                  void(const std::string &, GLenum, GLint, const GLfloat *));
> 
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/QueryImpl.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/QueryImpl.cpp
>new file mode 100644
>index 00000000000..18c74abc089
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/QueryImpl.cpp
>@@ -0,0 +1,16 @@
>+//
>+// Copyright 2018 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+
>+// QueryImpl.cpp: Defines the abstract rx::QueryImpl classes.
>+
>+#include "libANGLE/renderer/QueryImpl.h"
>+
>+namespace rx
>+{
>+
>+void QueryImpl::onDestroy(const gl::Context *context) {}
>+
>+}  // namespace rx
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/QueryImpl.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/QueryImpl.h
>index d738eb4ffc7..cbe7fa39fb2 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/QueryImpl.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/QueryImpl.h
>@@ -9,36 +9,39 @@
> #ifndef LIBANGLE_RENDERER_QUERYIMPL_H_
> #define LIBANGLE_RENDERER_QUERYIMPL_H_
> 
>-#include "libANGLE/Error.h"
>-
>+#include "common/PackedEnums.h"
> #include "common/angleutils.h"
>+#include "libANGLE/Error.h"
> 
>-#include <GLES2/gl2.h>
>+namespace gl
>+{
>+class Context;
>+}  // namespace gl
> 
> namespace rx
> {
>-
> class QueryImpl : angle::NonCopyable
> {
>   public:
>-    explicit QueryImpl(GLenum type) { mType = type; }
>-    virtual ~QueryImpl() { }
>+    explicit QueryImpl(gl::QueryType type) : mType(type) {}
>+    virtual ~QueryImpl() {}
>+
>+    virtual void onDestroy(const gl::Context *context);
> 
>-    virtual gl::Error begin() = 0;
>-    virtual gl::Error end() = 0;
>-    virtual gl::Error queryCounter() = 0;
>-    virtual gl::Error getResult(GLint *params) = 0;
>-    virtual gl::Error getResult(GLuint *params) = 0;
>-    virtual gl::Error getResult(GLint64 *params) = 0;
>-    virtual gl::Error getResult(GLuint64 *params) = 0;
>-    virtual gl::Error isResultAvailable(bool *available) = 0;
>+    virtual angle::Result begin(const gl::Context *context)                              = 0;
>+    virtual angle::Result end(const gl::Context *context)                                = 0;
>+    virtual angle::Result queryCounter(const gl::Context *context)                       = 0;
>+    virtual angle::Result getResult(const gl::Context *context, GLint *params)           = 0;
>+    virtual angle::Result getResult(const gl::Context *context, GLuint *params)          = 0;
>+    virtual angle::Result getResult(const gl::Context *context, GLint64 *params)         = 0;
>+    virtual angle::Result getResult(const gl::Context *context, GLuint64 *params)        = 0;
>+    virtual angle::Result isResultAvailable(const gl::Context *context, bool *available) = 0;
> 
>-    GLenum getType() const { return mType;  }
>+    gl::QueryType getType() const { return mType; }
> 
>   private:
>-    GLenum mType;
>+    gl::QueryType mType;
> };
>+}  // namespace rx
> 
>-}
>-
>-#endif // LIBANGLE_RENDERER_QUERYIMPL_H_
>+#endif  // LIBANGLE_RENDERER_QUERYIMPL_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/RenderTargetCache.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/RenderTargetCache.h
>new file mode 100644
>index 00000000000..f59aacf11cf
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/RenderTargetCache.h
>@@ -0,0 +1,160 @@
>+//
>+// Copyright 2018 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// RenderTargetCache:
>+// The RenderTargetCache pattern is used in the D3D9, D3D11 and Vulkan back-ends. It is a
>+// cache of the various back-end objects (RenderTargets) associated with each Framebuffer
>+// attachment, be they Textures, Renderbuffers, or Surfaces. The cache is updated in Framebuffer's
>+// syncState method.
>+//
>+
>+#ifndef LIBANGLE_RENDERER_RENDER_TARGET_CACHE_H_
>+#define LIBANGLE_RENDERER_RENDER_TARGET_CACHE_H_
>+
>+#include "libANGLE/Framebuffer.h"
>+#include "libANGLE/FramebufferAttachment.h"
>+
>+namespace rx
>+{
>+
>+template <typename RenderTargetT>
>+class RenderTargetCache final : angle::NonCopyable
>+{
>+  public:
>+    RenderTargetCache();
>+    ~RenderTargetCache();
>+
>+    // Update all RenderTargets from the dirty bits.
>+    angle::Result update(const gl::Context *context,
>+                         const gl::FramebufferState &state,
>+                         const gl::Framebuffer::DirtyBits &dirtyBits);
>+
>+    // Update individual RenderTargets.
>+    angle::Result updateColorRenderTarget(const gl::Context *context,
>+                                          const gl::FramebufferState &state,
>+                                          size_t colorIndex);
>+    angle::Result updateDepthStencilRenderTarget(const gl::Context *context,
>+                                                 const gl::FramebufferState &state);
>+
>+    using RenderTargetArray = gl::AttachmentArray<RenderTargetT *>;
>+
>+    const RenderTargetArray &getColors() const;
>+    RenderTargetT *getDepthStencil() const;
>+
>+    RenderTargetT *getColorRead(const gl::FramebufferState &state) const;
>+
>+  private:
>+    angle::Result updateCachedRenderTarget(const gl::Context *context,
>+                                           const gl::FramebufferAttachment *attachment,
>+                                           RenderTargetT **cachedRenderTarget);
>+
>+    gl::AttachmentArray<RenderTargetT *> mColorRenderTargets;
>+    // We only support a single Depth/Stencil RenderTarget currently.
>+    RenderTargetT *mDepthStencilRenderTarget;
>+};
>+
>+template <typename RenderTargetT>
>+RenderTargetCache<RenderTargetT>::RenderTargetCache()
>+    : mColorRenderTargets{{nullptr}}, mDepthStencilRenderTarget(nullptr)
>+{}
>+
>+template <typename RenderTargetT>
>+RenderTargetCache<RenderTargetT>::~RenderTargetCache()
>+{}
>+
>+template <typename RenderTargetT>
>+angle::Result RenderTargetCache<RenderTargetT>::update(const gl::Context *context,
>+                                                       const gl::FramebufferState &state,
>+                                                       const gl::Framebuffer::DirtyBits &dirtyBits)
>+{
>+    for (auto dirtyBit : dirtyBits)
>+    {
>+        switch (dirtyBit)
>+        {
>+            case gl::Framebuffer::DIRTY_BIT_DEPTH_ATTACHMENT:
>+            case gl::Framebuffer::DIRTY_BIT_STENCIL_ATTACHMENT:
>+                ANGLE_TRY(updateDepthStencilRenderTarget(context, state));
>+                break;
>+            case gl::Framebuffer::DIRTY_BIT_DRAW_BUFFERS:
>+            case gl::Framebuffer::DIRTY_BIT_READ_BUFFER:
>+            case gl::Framebuffer::DIRTY_BIT_DEFAULT_WIDTH:
>+            case gl::Framebuffer::DIRTY_BIT_DEFAULT_HEIGHT:
>+            case gl::Framebuffer::DIRTY_BIT_DEFAULT_SAMPLES:
>+            case gl::Framebuffer::DIRTY_BIT_DEFAULT_FIXED_SAMPLE_LOCATIONS:
>+                break;
>+            default:
>+            {
>+                ASSERT(gl::Framebuffer::DIRTY_BIT_COLOR_ATTACHMENT_0 == 0 &&
>+                       dirtyBit < gl::Framebuffer::DIRTY_BIT_COLOR_ATTACHMENT_MAX);
>+                size_t colorIndex =
>+                    static_cast<size_t>(dirtyBit - gl::Framebuffer::DIRTY_BIT_COLOR_ATTACHMENT_0);
>+                ANGLE_TRY(updateColorRenderTarget(context, state, colorIndex));
>+                break;
>+            }
>+        }
>+    }
>+
>+    return angle::Result::Continue;
>+}
>+
>+template <typename RenderTargetT>
>+const gl::AttachmentArray<RenderTargetT *> &RenderTargetCache<RenderTargetT>::getColors() const
>+{
>+    return mColorRenderTargets;
>+}
>+
>+template <typename RenderTargetT>
>+RenderTargetT *RenderTargetCache<RenderTargetT>::getDepthStencil() const
>+{
>+    return mDepthStencilRenderTarget;
>+}
>+
>+template <typename RenderTargetT>
>+angle::Result RenderTargetCache<RenderTargetT>::updateColorRenderTarget(
>+    const gl::Context *context,
>+    const gl::FramebufferState &state,
>+    size_t colorIndex)
>+{
>+    return updateCachedRenderTarget(context, state.getColorAttachment(colorIndex),
>+                                    &mColorRenderTargets[colorIndex]);
>+}
>+
>+template <typename RenderTargetT>
>+angle::Result RenderTargetCache<RenderTargetT>::updateDepthStencilRenderTarget(
>+    const gl::Context *context,
>+    const gl::FramebufferState &state)
>+{
>+    return updateCachedRenderTarget(context, state.getDepthOrStencilAttachment(),
>+                                    &mDepthStencilRenderTarget);
>+}
>+
>+template <typename RenderTargetT>
>+angle::Result RenderTargetCache<RenderTargetT>::updateCachedRenderTarget(
>+    const gl::Context *context,
>+    const gl::FramebufferAttachment *attachment,
>+    RenderTargetT **cachedRenderTarget)
>+{
>+    RenderTargetT *newRenderTarget = nullptr;
>+    if (attachment)
>+    {
>+        ASSERT(attachment->isAttached());
>+        ANGLE_TRY(attachment->getRenderTarget(context, &newRenderTarget));
>+    }
>+    *cachedRenderTarget = newRenderTarget;
>+    return angle::Result::Continue;
>+}
>+
>+template <typename RenderTargetT>
>+RenderTargetT *RenderTargetCache<RenderTargetT>::getColorRead(
>+    const gl::FramebufferState &state) const
>+{
>+    ASSERT(mColorRenderTargets[state.getReadIndex()] &&
>+           state.getReadIndex() < mColorRenderTargets.size());
>+    return mColorRenderTargets[state.getReadIndex()];
>+}
>+
>+}  // namespace rx
>+
>+#endif  // LIBANGLE_RENDERER_RENDER_TARGET_CACHE_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/RenderbufferImpl.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/RenderbufferImpl.h
>index a70ab1d0f0f..11ad88cb750 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/RenderbufferImpl.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/RenderbufferImpl.h
>@@ -14,10 +14,15 @@
> #include "libANGLE/Error.h"
> #include "libANGLE/renderer/FramebufferAttachmentObjectImpl.h"
> 
>+namespace gl
>+{
>+class RenderbufferState;
>+}  // namespace gl
>+
> namespace egl
> {
> class Image;
>-}
>+}  // namespace egl
> 
> namespace rx
> {
>@@ -25,26 +30,34 @@ namespace rx
> class RenderbufferImpl : public FramebufferAttachmentObjectImpl
> {
>   public:
>-    RenderbufferImpl() {}
>+    RenderbufferImpl(const gl::RenderbufferState &state) : mState(state) {}
>     ~RenderbufferImpl() override {}
>-    virtual gl::Error onDestroy(const gl::Context *context);
>-
>-    virtual gl::Error setStorage(const gl::Context *context,
>-                                 GLenum internalformat,
>-                                 size_t width,
>-                                 size_t height) = 0;
>-    virtual gl::Error setStorageMultisample(const gl::Context *context,
>-                                            size_t samples,
>-                                            GLenum internalformat,
>-                                            size_t width,
>-                                            size_t height) = 0;
>-    virtual gl::Error setStorageEGLImageTarget(const gl::Context *context, egl::Image *image) = 0;
>+    virtual void onDestroy(const gl::Context *context) {}
>+
>+    virtual angle::Result setStorage(const gl::Context *context,
>+                                     GLenum internalformat,
>+                                     size_t width,
>+                                     size_t height)                   = 0;
>+    virtual angle::Result setStorageMultisample(const gl::Context *context,
>+                                                size_t samples,
>+                                                GLenum internalformat,
>+                                                size_t width,
>+                                                size_t height)        = 0;
>+    virtual angle::Result setStorageEGLImageTarget(const gl::Context *context,
>+                                                   egl::Image *image) = 0;
>+
>+    // Override if accurate native memory size information is available
>+    virtual GLint getMemorySize() const;
>+
>+  protected:
>+    const gl::RenderbufferState &mState;
> };
> 
>-inline gl::Error RenderbufferImpl::onDestroy(const gl::Context *context)
>+inline GLint RenderbufferImpl::getMemorySize() const
> {
>-    return gl::NoError();
>-}
>+    return 0;
> }
> 
>-#endif   // LIBANGLE_RENDERER_RENDERBUFFERIMPL_H_
>+}  // namespace rx
>+
>+#endif  // LIBANGLE_RENDERER_RENDERBUFFERIMPL_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/RenderbufferImpl_mock.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/RenderbufferImpl_mock.h
>index 408b9a5fe91..ac5bcf6a2f5 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/RenderbufferImpl_mock.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/RenderbufferImpl_mock.h
>@@ -12,6 +12,7 @@
> #include "gmock/gmock.h"
> 
> #include "libANGLE/Image.h"
>+#include "libANGLE/Renderbuffer.h"
> #include "libANGLE/renderer/RenderbufferImpl.h"
> 
> namespace rx
>@@ -20,21 +21,25 @@ namespace rx
> class MockRenderbufferImpl : public RenderbufferImpl
> {
>   public:
>+    MockRenderbufferImpl() : RenderbufferImpl(mMockState) {}
>     virtual ~MockRenderbufferImpl() { destructor(); }
>-    MOCK_METHOD4(setStorage, gl::Error(const gl::Context *, GLenum, size_t, size_t));
>+    MOCK_METHOD4(setStorage, angle::Result(const gl::Context *, GLenum, size_t, size_t));
>     MOCK_METHOD5(setStorageMultisample,
>-                 gl::Error(const gl::Context *, size_t, GLenum, size_t, size_t));
>-    MOCK_METHOD2(setStorageEGLImageTarget, gl::Error(const gl::Context *, egl::Image *));
>+                 angle::Result(const gl::Context *, size_t, GLenum, size_t, size_t));
>+    MOCK_METHOD2(setStorageEGLImageTarget, angle::Result(const gl::Context *, egl::Image *));
> 
>     MOCK_METHOD4(getAttachmentRenderTarget,
>-                 gl::Error(const gl::Context *,
>-                           GLenum,
>-                           const gl::ImageIndex &,
>-                           FramebufferAttachmentRenderTarget **));
>+                 angle::Result(const gl::Context *,
>+                               GLenum,
>+                               const gl::ImageIndex &,
>+                               FramebufferAttachmentRenderTarget **));
> 
>     MOCK_METHOD0(destructor, void());
>+
>+  protected:
>+    gl::RenderbufferState mMockState;
> };
> 
>-}
>+}  // namespace rx
> 
>-#endif // LIBANGLE_RENDERER_RENDERBUFFERIMPLMOCK_H_
>+#endif  // LIBANGLE_RENDERER_RENDERBUFFERIMPLMOCK_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/SamplerImpl.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/SamplerImpl.h
>index 66e1079b64e..b813d02b528 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/SamplerImpl.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/SamplerImpl.h
>@@ -14,7 +14,7 @@
> namespace gl
> {
> class Context;
>-struct SamplerState;
>+class SamplerState;
> }  // namespace gl
> 
> namespace rx
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/ShaderImpl.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/ShaderImpl.cpp
>new file mode 100644
>index 00000000000..f828ef13587
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/ShaderImpl.cpp
>@@ -0,0 +1,94 @@
>+//
>+// Copyright 2019 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+
>+// ShaderImpl.cpp: Implementation methods of ShaderImpl
>+
>+#include "libANGLE/renderer/ShaderImpl.h"
>+
>+#include "libANGLE/Context.h"
>+
>+namespace rx
>+{
>+
>+WaitableCompileEvent::WaitableCompileEvent(std::shared_ptr<angle::WaitableEvent> waitableEvent)
>+    : mWaitableEvent(waitableEvent)
>+{}
>+
>+WaitableCompileEvent::~WaitableCompileEvent()
>+{
>+    mWaitableEvent.reset();
>+}
>+
>+void WaitableCompileEvent::wait()
>+{
>+    mWaitableEvent->wait();
>+}
>+
>+bool WaitableCompileEvent::isReady()
>+{
>+    return mWaitableEvent->isReady();
>+}
>+
>+const std::string &WaitableCompileEvent::getInfoLog()
>+{
>+    return mInfoLog;
>+}
>+
>+class TranslateTask : public angle::Closure
>+{
>+  public:
>+    TranslateTask(ShHandle handle, ShCompileOptions options, const std::string &source)
>+        : mHandle(handle), mOptions(options), mSource(source), mResult(false)
>+    {}
>+
>+    void operator()() override
>+    {
>+        const char *source = mSource.c_str();
>+        mResult            = sh::Compile(mHandle, &source, 1, mOptions);
>+    }
>+
>+    bool getResult() { return mResult; }
>+
>+    ShHandle getHandle() { return mHandle; }
>+
>+  private:
>+    ShHandle mHandle;
>+    ShCompileOptions mOptions;
>+    std::string mSource;
>+    bool mResult;
>+};
>+
>+class WaitableCompileEventImpl final : public WaitableCompileEvent
>+{
>+  public:
>+    WaitableCompileEventImpl(std::shared_ptr<angle::WaitableEvent> waitableEvent,
>+                             std::shared_ptr<TranslateTask> translateTask)
>+        : WaitableCompileEvent(waitableEvent), mTranslateTask(translateTask)
>+    {}
>+
>+    bool getResult() override { return mTranslateTask->getResult(); }
>+
>+    bool postTranslate(std::string *infoLog) override { return true; }
>+
>+  private:
>+    std::shared_ptr<TranslateTask> mTranslateTask;
>+};
>+
>+std::shared_ptr<WaitableCompileEvent> ShaderImpl::compileImpl(
>+    const gl::Context *context,
>+    gl::ShCompilerInstance *compilerInstance,
>+    const std::string &source,
>+    ShCompileOptions compileOptions)
>+{
>+    auto workerThreadPool = context->getWorkerThreadPool();
>+    auto translateTask =
>+        std::make_shared<TranslateTask>(compilerInstance->getHandle(), compileOptions, source);
>+
>+    return std::make_shared<WaitableCompileEventImpl>(
>+        angle::WorkerThreadPool::PostWorkerTask(workerThreadPool, translateTask), translateTask);
>+}
>+
>+}  // namespace rx
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/ShaderImpl.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/ShaderImpl.h
>index 77e02d02375..7ec7ae76813 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/ShaderImpl.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/ShaderImpl.h
>@@ -9,32 +9,67 @@
> #ifndef LIBANGLE_RENDERER_SHADERIMPL_H_
> #define LIBANGLE_RENDERER_SHADERIMPL_H_
> 
>+#include <functional>
>+
> #include "common/angleutils.h"
> #include "libANGLE/Shader.h"
>+#include "libANGLE/WorkerThread.h"
>+
>+namespace gl
>+{
>+class ShCompilerInstance;
>+}  // namespace gl
> 
> namespace rx
> {
> 
>+using UpdateShaderStateFunctor = std::function<void(bool compiled, ShHandle handle)>;
>+class WaitableCompileEvent : public angle::WaitableEvent
>+{
>+  public:
>+    WaitableCompileEvent(std::shared_ptr<angle::WaitableEvent> waitableEvent);
>+    ~WaitableCompileEvent() override;
>+
>+    void wait() override;
>+
>+    bool isReady() override;
>+
>+    virtual bool getResult() = 0;
>+
>+    virtual bool postTranslate(std::string *infoLog) = 0;
>+
>+    const std::string &getInfoLog();
>+
>+  protected:
>+    std::shared_ptr<angle::WaitableEvent> mWaitableEvent;
>+    std::string mInfoLog;
>+};
>+
> class ShaderImpl : angle::NonCopyable
> {
>   public:
>     ShaderImpl(const gl::ShaderState &data) : mData(data) {}
>-    virtual ~ShaderImpl() { }
>+    virtual ~ShaderImpl() {}
> 
>-    // Returns additional sh::Compile options.
>-    virtual ShCompileOptions prepareSourceAndReturnOptions(std::stringstream *sourceStream,
>-                                                           std::string *sourcePath) = 0;
>-    // Returns success for compiling on the driver. Returns success.
>-    virtual bool postTranslateCompile(gl::Compiler *compiler, std::string *infoLog) = 0;
>+    virtual void destroy() {}
>+
>+    virtual std::shared_ptr<WaitableCompileEvent> compile(const gl::Context *context,
>+                                                          gl::ShCompilerInstance *compilerInstance,
>+                                                          ShCompileOptions options) = 0;
> 
>     virtual std::string getDebugInfo() const = 0;
> 
>     const gl::ShaderState &getData() const { return mData; }
> 
>   protected:
>+    std::shared_ptr<WaitableCompileEvent> compileImpl(const gl::Context *context,
>+                                                      gl::ShCompilerInstance *compilerInstance,
>+                                                      const std::string &source,
>+                                                      ShCompileOptions compileOptions);
>+
>     const gl::ShaderState &mData;
> };
> 
>-}
>+}  // namespace rx
> 
>-#endif // LIBANGLE_RENDERER_SHADERIMPL_H_
>+#endif  // LIBANGLE_RENDERER_SHADERIMPL_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/StreamProducerImpl.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/StreamProducerImpl.h
>index 1915bf75d3e..caeef7b6fef 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/StreamProducerImpl.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/StreamProducerImpl.h
>@@ -23,11 +23,12 @@ class StreamProducerImpl : angle::NonCopyable
> 
>     // Validates the ability for the producer to accept an arbitrary pointer to a frame. All
>     // pointers should be validated through this function before being used to produce a frame.
>-    virtual egl::Error validateD3DNV12Texture(void *pointer) const = 0;
>+    virtual egl::Error validateD3DTexture(void *pointer,
>+                                          const egl::AttributeMap &attributes) const = 0;
> 
>     // Constructs a frame from an arbitrary external pointer that points to producer specific frame
>     // data. Replaces the internal frame with the new one.
>-    virtual void postD3DNV12Texture(void *pointer, const egl::AttributeMap &attributes) = 0;
>+    virtual void postD3DTexture(void *pointer, const egl::AttributeMap &attributes) = 0;
> 
>     // Returns an OpenGL texture interpretation of some frame attributes for the purpose of
>     // constructing an OpenGL texture from a frame. Depending on the producer and consumer, some
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/SurfaceImpl.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/SurfaceImpl.cpp
>index cd2fa3dde63..071accd61c3 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/SurfaceImpl.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/SurfaceImpl.cpp
>@@ -11,18 +11,76 @@
> namespace rx
> {
> 
>-SurfaceImpl::SurfaceImpl(const egl::SurfaceState &state) : mState(state)
>+SurfaceImpl::SurfaceImpl(const egl::SurfaceState &state) : mState(state) {}
>+
>+SurfaceImpl::~SurfaceImpl() {}
>+
>+egl::Error SurfaceImpl::swapWithDamage(const gl::Context *context, EGLint *rects, EGLint n_rects)
> {
>+    UNREACHABLE();
>+    return egl::EglBadSurface() << "swapWithDamage implementation missing.";
> }
> 
>-SurfaceImpl::~SurfaceImpl()
>+egl::Error SurfaceImpl::setPresentationTime(EGLnsecsANDROID time)
> {
>+    UNREACHABLE();
>+    return egl::EglBadSurface() << "setPresentationTime implementation missing.";
> }
> 
>-egl::Error SurfaceImpl::swapWithDamage(const gl::Context *context, EGLint *rects, EGLint n_rects)
>+void SurfaceImpl::setFixedWidth(EGLint width)
> {
>     UNREACHABLE();
>-    return egl::EglBadSurface() << "swapWithDamage implementation missing.";
>+}
>+
>+void SurfaceImpl::setFixedHeight(EGLint height)
>+{
>+    UNREACHABLE();
>+}
>+
>+void SurfaceImpl::setTimestampsEnabled(bool enabled)
>+{
>+    UNREACHABLE();
>+}
>+
>+const angle::Format *SurfaceImpl::getD3DTextureColorFormat() const
>+{
>+    UNREACHABLE();
>+    return nullptr;
>+}
>+
>+egl::SupportedCompositorTimings SurfaceImpl::getSupportedCompositorTimings() const
>+{
>+    UNREACHABLE();
>+    return egl::SupportedCompositorTimings();
>+}
>+
>+egl::Error SurfaceImpl::getCompositorTiming(EGLint numTimestamps,
>+                                            const EGLint *names,
>+                                            EGLnsecsANDROID *values) const
>+{
>+    UNREACHABLE();
>+    return egl::EglBadDisplay();
>+}
>+
>+egl::Error SurfaceImpl::getNextFrameId(EGLuint64KHR *frameId) const
>+{
>+    UNREACHABLE();
>+    return egl::EglBadDisplay();
>+}
>+
>+egl::SupportedTimestamps SurfaceImpl::getSupportedTimestamps() const
>+{
>+    UNREACHABLE();
>+    return egl::SupportedTimestamps();
>+}
>+
>+egl::Error SurfaceImpl::getFrameTimestamps(EGLuint64KHR frameId,
>+                                           EGLint numTimestamps,
>+                                           const EGLint *timestamps,
>+                                           EGLnsecsANDROID *values) const
>+{
>+    UNREACHABLE();
>+    return egl::EglBadDisplay();
> }
> 
> }  // namespace rx
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/SurfaceImpl.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/SurfaceImpl.h
>index eaa27de2811..ea1a051095b 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/SurfaceImpl.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/SurfaceImpl.h
>@@ -17,10 +17,16 @@
> #include "libANGLE/FramebufferAttachment.h"
> #include "libANGLE/renderer/FramebufferAttachmentObjectImpl.h"
> 
>+namespace angle
>+{
>+struct Format;
>+}
>+
> namespace gl
> {
>+class Context;
> class FramebufferState;
>-}
>+}  // namespace gl
> 
> namespace egl
> {
>@@ -28,7 +34,10 @@ class Display;
> struct Config;
> struct SurfaceState;
> class Thread;
>-}
>+
>+using SupportedTimestamps        = angle::PackedEnumBitSet<Timestamp>;
>+using SupportedCompositorTimings = angle::PackedEnumBitSet<CompositorTiming>;
>+}  // namespace egl
> 
> namespace rx
> {
>@@ -42,7 +51,8 @@ class SurfaceImpl : public FramebufferAttachmentObjectImpl
>     virtual void destroy(const egl::Display *display) {}
> 
>     virtual egl::Error initialize(const egl::Display *display)                           = 0;
>-    virtual FramebufferImpl *createDefaultFramebuffer(const gl::FramebufferState &state) = 0;
>+    virtual FramebufferImpl *createDefaultFramebuffer(const gl::Context *context,
>+                                                      const gl::FramebufferState &state) = 0;
>     virtual egl::Error swap(const gl::Context *context)                                  = 0;
>     virtual egl::Error swapWithDamage(const gl::Context *context, EGLint *rects, EGLint n_rects);
>     virtual egl::Error postSubBuffer(const gl::Context *context,
>@@ -50,24 +60,44 @@ class SurfaceImpl : public FramebufferAttachmentObjectImpl
>                                      EGLint y,
>                                      EGLint width,
>                                      EGLint height) = 0;
>-    virtual egl::Error querySurfacePointerANGLE(EGLint attribute, void **value) = 0;
>-    virtual egl::Error bindTexImage(gl::Texture *texture, EGLint buffer) = 0;
>-    virtual egl::Error releaseTexImage(EGLint buffer) = 0;
>+    virtual egl::Error setPresentationTime(EGLnsecsANDROID time);
>+    virtual egl::Error querySurfacePointerANGLE(EGLint attribute, void **value)               = 0;
>+    virtual egl::Error bindTexImage(const gl::Context *context,
>+                                    gl::Texture *texture,
>+                                    EGLint buffer)                                            = 0;
>+    virtual egl::Error releaseTexImage(const gl::Context *context, EGLint buffer)             = 0;
>     virtual egl::Error getSyncValues(EGLuint64KHR *ust, EGLuint64KHR *msc, EGLuint64KHR *sbc) = 0;
>-    virtual void setSwapInterval(EGLint interval) = 0;
>+    virtual void setSwapInterval(EGLint interval)                                             = 0;
>+    virtual void setFixedWidth(EGLint width);
>+    virtual void setFixedHeight(EGLint height);
> 
>     // width and height can change with client window resizing
>-    virtual EGLint getWidth() const = 0;
>+    virtual EGLint getWidth() const  = 0;
>     virtual EGLint getHeight() const = 0;
> 
>     virtual EGLint isPostSubBufferSupported() const = 0;
>-    virtual EGLint getSwapBehavior() const = 0;
>+    virtual EGLint getSwapBehavior() const          = 0;
>+
>+    // Used to query color format from pbuffers created from D3D textures.
>+    virtual const angle::Format *getD3DTextureColorFormat() const;
>+
>+    // EGL_ANDROID_get_frame_timestamps
>+    virtual void setTimestampsEnabled(bool enabled);
>+    virtual egl::SupportedCompositorTimings getSupportedCompositorTimings() const;
>+    virtual egl::Error getCompositorTiming(EGLint numTimestamps,
>+                                           const EGLint *names,
>+                                           EGLnsecsANDROID *values) const;
>+    virtual egl::Error getNextFrameId(EGLuint64KHR *frameId) const;
>+    virtual egl::SupportedTimestamps getSupportedTimestamps() const;
>+    virtual egl::Error getFrameTimestamps(EGLuint64KHR frameId,
>+                                          EGLint numTimestamps,
>+                                          const EGLint *timestamps,
>+                                          EGLnsecsANDROID *values) const;
> 
>   protected:
>     const egl::SurfaceState &mState;
> };
> 
>-}
>-
>-#endif // LIBANGLE_RENDERER_SURFACEIMPL_H_
>+}  // namespace rx
> 
>+#endif  // LIBANGLE_RENDERER_SURFACEIMPL_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/SyncImpl.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/SyncImpl.h
>index 22c92c3729e..58338bdbb25 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/SyncImpl.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/SyncImpl.h
>@@ -15,20 +15,31 @@
> 
> #include "angle_gl.h"
> 
>-namespace rx
>+namespace gl
> {
>+class Context;
>+}  // namespace gl
> 
>+namespace rx
>+{
> class SyncImpl : angle::NonCopyable
> {
>   public:
>-    SyncImpl(){};
>-    virtual ~SyncImpl(){};
>-
>-    virtual gl::Error set(GLenum condition, GLbitfield flags) = 0;
>-    virtual gl::Error clientWait(GLbitfield flags, GLuint64 timeout, GLenum *outResult) = 0;
>-    virtual gl::Error serverWait(GLbitfield flags, GLuint64 timeout) = 0;
>-    virtual gl::Error getStatus(GLint *outResult) = 0;
>+    SyncImpl() {}
>+    virtual ~SyncImpl() {}
>+
>+    virtual void onDestroy(const gl::Context *context) {}
>+
>+    virtual angle::Result set(const gl::Context *context, GLenum condition, GLbitfield flags) = 0;
>+    virtual angle::Result clientWait(const gl::Context *context,
>+                                     GLbitfield flags,
>+                                     GLuint64 timeout,
>+                                     GLenum *outResult)                                       = 0;
>+    virtual angle::Result serverWait(const gl::Context *context,
>+                                     GLbitfield flags,
>+                                     GLuint64 timeout)                                        = 0;
>+    virtual angle::Result getStatus(const gl::Context *context, GLint *outResult)             = 0;
> };
>-}
>+}  // namespace rx
> 
> #endif  // LIBANGLE_RENDERER_FENCESYNCIMPL_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/TextureImpl.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/TextureImpl.cpp
>index 830d30e6d19..2a3462808d4 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/TextureImpl.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/TextureImpl.cpp
>@@ -10,54 +10,85 @@
> 
> namespace rx
> {
>+TextureImpl::TextureImpl(const gl::TextureState &state) : mState(state) {}
> 
>-TextureImpl::TextureImpl(const gl::TextureState &state) : mState(state)
>+TextureImpl::~TextureImpl() {}
>+
>+void TextureImpl::onDestroy(const gl::Context *context) {}
>+
>+angle::Result TextureImpl::copyTexture(const gl::Context *context,
>+                                       const gl::ImageIndex &index,
>+                                       GLenum internalFormat,
>+                                       GLenum type,
>+                                       size_t sourceLevel,
>+                                       bool unpackFlipY,
>+                                       bool unpackPremultiplyAlpha,
>+                                       bool unpackUnmultiplyAlpha,
>+                                       const gl::Texture *source)
> {
>+    UNREACHABLE();
>+    return angle::Result::Stop;
> }
> 
>-TextureImpl::~TextureImpl()
>+angle::Result TextureImpl::copySubTexture(const gl::Context *context,
>+                                          const gl::ImageIndex &index,
>+                                          const gl::Offset &destOffset,
>+                                          size_t sourceLevel,
>+                                          const gl::Box &sourceBox,
>+                                          bool unpackFlipY,
>+                                          bool unpackPremultiplyAlpha,
>+                                          bool unpackUnmultiplyAlpha,
>+                                          const gl::Texture *source)
> {
>+    UNREACHABLE();
>+    return angle::Result::Stop;
> }
> 
>-gl::Error TextureImpl::onDestroy(const gl::Context *context)
>+angle::Result TextureImpl::copyCompressedTexture(const gl::Context *context,
>+                                                 const gl::Texture *source)
> {
>-    return gl::NoError();
>+    UNREACHABLE();
>+    return angle::Result::Stop;
> }
> 
>-gl::Error TextureImpl::copyTexture(const gl::Context *context,
>-                                   GLenum target,
>-                                   size_t level,
>-                                   GLenum internalFormat,
>-                                   GLenum type,
>-                                   size_t sourceLevel,
>-                                   bool unpackFlipY,
>-                                   bool unpackPremultiplyAlpha,
>-                                   bool unpackUnmultiplyAlpha,
>-                                   const gl::Texture *source)
>+angle::Result TextureImpl::copy3DTexture(const gl::Context *context,
>+                                         gl::TextureTarget target,
>+                                         GLenum internalFormat,
>+                                         GLenum type,
>+                                         size_t sourceLevel,
>+                                         size_t destLevel,
>+                                         bool unpackFlipY,
>+                                         bool unpackPremultiplyAlpha,
>+                                         bool unpackUnmultiplyAlpha,
>+                                         const gl::Texture *source)
> {
>     UNREACHABLE();
>-    return gl::InternalError() << "CHROMIUM_copy_texture exposed but not implemented.";
>+    return angle::Result::Stop;
> }
> 
>-gl::Error TextureImpl::copySubTexture(const gl::Context *context,
>-                                      GLenum target,
>-                                      size_t level,
>-                                      const gl::Offset &destOffset,
>-                                      size_t sourceLevel,
>-                                      const gl::Rectangle &sourceArea,
>-                                      bool unpackFlipY,
>-                                      bool unpackPremultiplyAlpha,
>-                                      bool unpackUnmultiplyAlpha,
>-                                      const gl::Texture *source)
>+angle::Result TextureImpl::copy3DSubTexture(const gl::Context *context,
>+                                            const gl::TextureTarget target,
>+                                            const gl::Offset &destOffset,
>+                                            size_t sourceLevel,
>+                                            size_t destLevel,
>+                                            const gl::Box &srcBox,
>+                                            bool unpackFlipY,
>+                                            bool unpackPremultiplyAlpha,
>+                                            bool unpackUnmultiplyAlpha,
>+                                            const gl::Texture *source)
> {
>     UNREACHABLE();
>-    return gl::InternalError() << "CHROMIUM_copy_texture exposed but not implemented.";
>+    return angle::Result::Stop;
> }
> 
>-gl::Error TextureImpl::copyCompressedTexture(const gl::Context *context, const gl::Texture *source)
>+GLint TextureImpl::getMemorySize() const
> {
>-    UNREACHABLE();
>-    return gl::InternalError() << "CHROMIUM_copy_compressed_texture exposed but not implemented.";
>+    return 0;
>+}
>+
>+GLint TextureImpl::getLevelMemorySize(gl::TextureTarget target, GLint level)
>+{
>+    return 0;
> }
> 
> }  // namespace rx
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/TextureImpl.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/TextureImpl.h
>index 3b4f28f5f70..b2948989210 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/TextureImpl.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/TextureImpl.h
>@@ -23,7 +23,7 @@ namespace egl
> {
> class Surface;
> class Image;
>-}
>+}  // namespace egl
> 
> namespace gl
> {
>@@ -32,128 +32,157 @@ struct Extents;
> struct Offset;
> struct Rectangle;
> class Framebuffer;
>+class MemoryObject;
> struct PixelUnpackState;
>-struct TextureState;
>-}
>+class TextureState;
>+}  // namespace gl
> 
> namespace rx
> {
> class ContextImpl;
> 
>-class TextureImpl : public FramebufferAttachmentObjectImpl
>+class TextureImpl : public FramebufferAttachmentObjectImpl, public angle::Subject
> {
>   public:
>     TextureImpl(const gl::TextureState &state);
>     ~TextureImpl() override;
> 
>-    virtual gl::Error onDestroy(const gl::Context *context);
>-
>-    virtual gl::Error setImage(const gl::Context *context,
>-                               GLenum target,
>-                               size_t level,
>-                               GLenum internalFormat,
>-                               const gl::Extents &size,
>-                               GLenum format,
>-                               GLenum type,
>-                               const gl::PixelUnpackState &unpack,
>-                               const uint8_t *pixels) = 0;
>-    virtual gl::Error setSubImage(const gl::Context *context,
>-                                  GLenum target,
>-                                  size_t level,
>-                                  const gl::Box &area,
>-                                  GLenum format,
>-                                  GLenum type,
>-                                  const gl::PixelUnpackState &unpack,
>-                                  const uint8_t *pixels) = 0;
>-
>-    virtual gl::Error setCompressedImage(const gl::Context *context,
>-                                         GLenum target,
>-                                         size_t level,
>-                                         GLenum internalFormat,
>-                                         const gl::Extents &size,
>-                                         const gl::PixelUnpackState &unpack,
>-                                         size_t imageSize,
>-                                         const uint8_t *pixels) = 0;
>-    virtual gl::Error setCompressedSubImage(const gl::Context *context,
>-                                            GLenum target,
>-                                            size_t level,
>-                                            const gl::Box &area,
>-                                            GLenum format,
>-                                            const gl::PixelUnpackState &unpack,
>-                                            size_t imageSize,
>-                                            const uint8_t *pixels) = 0;
>-
>-    virtual gl::Error copyImage(const gl::Context *context,
>-                                GLenum target,
>-                                size_t level,
>-                                const gl::Rectangle &sourceArea,
>-                                GLenum internalFormat,
>-                                const gl::Framebuffer *source) = 0;
>-    virtual gl::Error copySubImage(const gl::Context *context,
>-                                   GLenum target,
>-                                   size_t level,
>-                                   const gl::Offset &destOffset,
>-                                   const gl::Rectangle &sourceArea,
>-                                   const gl::Framebuffer *source) = 0;
>-
>-    virtual gl::Error copyTexture(const gl::Context *context,
>-                                  GLenum target,
>-                                  size_t level,
>-                                  GLenum internalFormat,
>-                                  GLenum type,
>-                                  size_t sourceLevel,
>-                                  bool unpackFlipY,
>-                                  bool unpackPremultiplyAlpha,
>-                                  bool unpackUnmultiplyAlpha,
>-                                  const gl::Texture *source);
>-    virtual gl::Error copySubTexture(const gl::Context *context,
>-                                     GLenum target,
>-                                     size_t level,
>-                                     const gl::Offset &destOffset,
>-                                     size_t sourceLevel,
>-                                     const gl::Rectangle &sourceArea,
>-                                     bool unpackFlipY,
>-                                     bool unpackPremultiplyAlpha,
>-                                     bool unpackUnmultiplyAlpha,
>-                                     const gl::Texture *source);
>-
>-    virtual gl::Error copyCompressedTexture(const gl::Context *context, const gl::Texture *source);
>-
>-    virtual gl::Error setStorage(const gl::Context *context,
>-                                 GLenum target,
>-                                 size_t levels,
>-                                 GLenum internalFormat,
>-                                 const gl::Extents &size) = 0;
>-
>-    virtual gl::Error setStorageMultisample(const gl::Context *context,
>-                                            GLenum target,
>-                                            GLsizei samples,
>-                                            GLint internalformat,
>-                                            const gl::Extents &size,
>-                                            bool fixedSampleLocations) = 0;
>-
>-    virtual gl::Error setEGLImageTarget(const gl::Context *context,
>-                                        GLenum target,
>-                                        egl::Image *image) = 0;
>-
>-    virtual gl::Error setImageExternal(const gl::Context *context,
>-                                       GLenum target,
>-                                       egl::Stream *stream,
>-                                       const egl::Stream::GLTextureDescription &desc) = 0;
>-
>-    virtual gl::Error generateMipmap(const gl::Context *context) = 0;
>-
>-    virtual gl::Error setBaseLevel(const gl::Context *context, GLuint baseLevel) = 0;
>-
>-    virtual gl::Error bindTexImage(const gl::Context *context, egl::Surface *surface) = 0;
>-    virtual gl::Error releaseTexImage(const gl::Context *context) = 0;
>-
>-    virtual void syncState(const gl::Texture::DirtyBits &dirtyBits) = 0;
>+    virtual void onDestroy(const gl::Context *context);
>+
>+    virtual angle::Result setImage(const gl::Context *context,
>+                                   const gl::ImageIndex &index,
>+                                   GLenum internalFormat,
>+                                   const gl::Extents &size,
>+                                   GLenum format,
>+                                   GLenum type,
>+                                   const gl::PixelUnpackState &unpack,
>+                                   const uint8_t *pixels)    = 0;
>+    virtual angle::Result setSubImage(const gl::Context *context,
>+                                      const gl::ImageIndex &index,
>+                                      const gl::Box &area,
>+                                      GLenum format,
>+                                      GLenum type,
>+                                      const gl::PixelUnpackState &unpack,
>+                                      gl::Buffer *unpackBuffer,
>+                                      const uint8_t *pixels) = 0;
>+
>+    virtual angle::Result setCompressedImage(const gl::Context *context,
>+                                             const gl::ImageIndex &index,
>+                                             GLenum internalFormat,
>+                                             const gl::Extents &size,
>+                                             const gl::PixelUnpackState &unpack,
>+                                             size_t imageSize,
>+                                             const uint8_t *pixels)    = 0;
>+    virtual angle::Result setCompressedSubImage(const gl::Context *context,
>+                                                const gl::ImageIndex &index,
>+                                                const gl::Box &area,
>+                                                GLenum format,
>+                                                const gl::PixelUnpackState &unpack,
>+                                                size_t imageSize,
>+                                                const uint8_t *pixels) = 0;
>+
>+    virtual angle::Result copyImage(const gl::Context *context,
>+                                    const gl::ImageIndex &index,
>+                                    const gl::Rectangle &sourceArea,
>+                                    GLenum internalFormat,
>+                                    gl::Framebuffer *source)    = 0;
>+    virtual angle::Result copySubImage(const gl::Context *context,
>+                                       const gl::ImageIndex &index,
>+                                       const gl::Offset &destOffset,
>+                                       const gl::Rectangle &sourceArea,
>+                                       gl::Framebuffer *source) = 0;
>+
>+    virtual angle::Result copyTexture(const gl::Context *context,
>+                                      const gl::ImageIndex &index,
>+                                      GLenum internalFormat,
>+                                      GLenum type,
>+                                      size_t sourceLevel,
>+                                      bool unpackFlipY,
>+                                      bool unpackPremultiplyAlpha,
>+                                      bool unpackUnmultiplyAlpha,
>+                                      const gl::Texture *source);
>+    virtual angle::Result copySubTexture(const gl::Context *context,
>+                                         const gl::ImageIndex &index,
>+                                         const gl::Offset &destOffset,
>+                                         size_t sourceLevel,
>+                                         const gl::Box &sourceBox,
>+                                         bool unpackFlipY,
>+                                         bool unpackPremultiplyAlpha,
>+                                         bool unpackUnmultiplyAlpha,
>+                                         const gl::Texture *source);
>+
>+    virtual angle::Result copyCompressedTexture(const gl::Context *context,
>+                                                const gl::Texture *source);
>+
>+    virtual angle::Result copy3DTexture(const gl::Context *context,
>+                                        gl::TextureTarget target,
>+                                        GLenum internalFormat,
>+                                        GLenum type,
>+                                        size_t sourceLevel,
>+                                        size_t destLevel,
>+                                        bool unpackFlipY,
>+                                        bool unpackPremultiplyAlpha,
>+                                        bool unpackUnmultiplyAlpha,
>+                                        const gl::Texture *source);
>+    virtual angle::Result copy3DSubTexture(const gl::Context *context,
>+                                           const gl::TextureTarget target,
>+                                           const gl::Offset &destOffset,
>+                                           size_t sourceLevel,
>+                                           size_t destLevel,
>+                                           const gl::Box &srcBox,
>+                                           bool unpackFlipY,
>+                                           bool unpackPremultiplyAlpha,
>+                                           bool unpackUnmultiplyAlpha,
>+                                           const gl::Texture *source);
>+
>+    virtual angle::Result setStorage(const gl::Context *context,
>+                                     gl::TextureType type,
>+                                     size_t levels,
>+                                     GLenum internalFormat,
>+                                     const gl::Extents &size) = 0;
>+
>+    virtual angle::Result setStorageMultisample(const gl::Context *context,
>+                                                gl::TextureType type,
>+                                                GLsizei samples,
>+                                                GLint internalformat,
>+                                                const gl::Extents &size,
>+                                                bool fixedSampleLocations) = 0;
>+
>+    virtual angle::Result setStorageExternalMemory(const gl::Context *context,
>+                                                   gl::TextureType type,
>+                                                   size_t levels,
>+                                                   GLenum internalFormat,
>+                                                   const gl::Extents &size,
>+                                                   gl::MemoryObject *memoryObject,
>+                                                   GLuint64 offset) = 0;
>+
>+    virtual angle::Result setEGLImageTarget(const gl::Context *context,
>+                                            gl::TextureType type,
>+                                            egl::Image *image) = 0;
>+
>+    virtual angle::Result setImageExternal(const gl::Context *context,
>+                                           gl::TextureType type,
>+                                           egl::Stream *stream,
>+                                           const egl::Stream::GLTextureDescription &desc) = 0;
>+
>+    virtual angle::Result generateMipmap(const gl::Context *context) = 0;
>+
>+    virtual angle::Result setBaseLevel(const gl::Context *context, GLuint baseLevel) = 0;
>+
>+    virtual angle::Result bindTexImage(const gl::Context *context, egl::Surface *surface) = 0;
>+    virtual angle::Result releaseTexImage(const gl::Context *context)                     = 0;
>+
>+    // Override if accurate native memory size information is available
>+    virtual GLint getMemorySize() const;
>+    virtual GLint getLevelMemorySize(gl::TextureTarget target, GLint level);
>+
>+    virtual angle::Result syncState(const gl::Context *context,
>+                                    const gl::Texture::DirtyBits &dirtyBits) = 0;
> 
>   protected:
>     const gl::TextureState &mState;
> };
> 
>-}
>+}  // namespace rx
> 
>-#endif // LIBANGLE_RENDERER_TEXTUREIMPL_H_
>+#endif  // LIBANGLE_RENDERER_TEXTUREIMPL_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/TextureImpl_mock.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/TextureImpl_mock.h
>index e7fa4417817..0b7aa38f5bc 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/TextureImpl_mock.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/TextureImpl_mock.h
>@@ -19,113 +19,121 @@ namespace rx
> class MockTextureImpl : public TextureImpl
> {
>   public:
>-    MockTextureImpl() : TextureImpl(mMockState), mMockState(GL_TEXTURE_2D) {}
>+    MockTextureImpl() : TextureImpl(mMockState), mMockState(gl::TextureType::_2D) {}
>     virtual ~MockTextureImpl() { destructor(); }
>-    MOCK_METHOD9(setImage,
>-                 gl::Error(const gl::Context *,
>-                           GLenum,
>-                           size_t,
>-                           GLenum,
>-                           const gl::Extents &,
>-                           GLenum,
>-                           GLenum,
>-                           const gl::PixelUnpackState &,
>-                           const uint8_t *));
>+    MOCK_METHOD8(setImage,
>+                 angle::Result(const gl::Context *,
>+                               const gl::ImageIndex &,
>+                               GLenum,
>+                               const gl::Extents &,
>+                               GLenum,
>+                               GLenum,
>+                               const gl::PixelUnpackState &,
>+                               const uint8_t *));
>     MOCK_METHOD8(setSubImage,
>-                 gl::Error(const gl::Context *,
>-                           GLenum,
>-                           size_t,
>-                           const gl::Box &,
>-                           GLenum,
>-                           GLenum,
>-                           const gl::PixelUnpackState &,
>-                           const uint8_t *));
>-    MOCK_METHOD8(setCompressedImage,
>-                 gl::Error(const gl::Context *,
>-                           GLenum,
>-                           size_t,
>-                           GLenum,
>-                           const gl::Extents &,
>-                           const gl::PixelUnpackState &,
>-                           size_t,
>-                           const uint8_t *));
>-    MOCK_METHOD8(setCompressedSubImage,
>-                 gl::Error(const gl::Context *,
>-                           GLenum,
>-                           size_t,
>-                           const gl::Box &,
>-                           GLenum,
>-                           const gl::PixelUnpackState &,
>-                           size_t,
>-                           const uint8_t *));
>-    MOCK_METHOD6(copyImage,
>-                 gl::Error(const gl::Context *,
>-                           GLenum,
>-                           size_t,
>-                           const gl::Rectangle &,
>-                           GLenum,
>-                           const gl::Framebuffer *));
>-    MOCK_METHOD6(copySubImage,
>-                 gl::Error(const gl::Context *,
>-                           GLenum,
>-                           size_t,
>-                           const gl::Offset &,
>-                           const gl::Rectangle &,
>-                           const gl::Framebuffer *));
>-    MOCK_METHOD10(copyTexture,
>-                  gl::Error(const gl::Context *,
>-                            GLenum,
>-                            size_t,
>-                            GLenum,
>-                            GLenum,
>-                            size_t,
>-                            bool,
>-                            bool,
>-                            bool,
>-                            const gl::Texture *));
>-    MOCK_METHOD10(copySubTexture,
>-                  gl::Error(const gl::Context *,
>-                            GLenum,
>-                            size_t,
>-                            const gl::Offset &,
>-                            size_t,
>-                            const gl::Rectangle &,
>-                            bool,
>-                            bool,
>-                            bool,
>-                            const gl::Texture *));
>-    MOCK_METHOD2(copyCompressedTexture, gl::Error(const gl::Context *, const gl::Texture *source));
>-    MOCK_METHOD5(setStorage,
>-                 gl::Error(const gl::Context *, GLenum, size_t, GLenum, const gl::Extents &));
>+                 angle::Result(const gl::Context *,
>+                               const gl::ImageIndex &,
>+                               const gl::Box &,
>+                               GLenum,
>+                               GLenum,
>+                               const gl::PixelUnpackState &,
>+                               gl::Buffer *,
>+                               const uint8_t *));
>+    MOCK_METHOD7(setCompressedImage,
>+                 angle::Result(const gl::Context *,
>+                               const gl::ImageIndex &,
>+                               GLenum,
>+                               const gl::Extents &,
>+                               const gl::PixelUnpackState &,
>+                               size_t,
>+                               const uint8_t *));
>+    MOCK_METHOD7(setCompressedSubImage,
>+                 angle::Result(const gl::Context *,
>+                               const gl::ImageIndex &,
>+                               const gl::Box &,
>+                               GLenum,
>+                               const gl::PixelUnpackState &,
>+                               size_t,
>+                               const uint8_t *));
>+    MOCK_METHOD5(copyImage,
>+                 angle::Result(const gl::Context *,
>+                               const gl::ImageIndex &,
>+                               const gl::Rectangle &,
>+                               GLenum,
>+                               gl::Framebuffer *));
>+    MOCK_METHOD5(copySubImage,
>+                 angle::Result(const gl::Context *,
>+                               const gl::ImageIndex &,
>+                               const gl::Offset &,
>+                               const gl::Rectangle &,
>+                               gl::Framebuffer *));
>+    MOCK_METHOD9(copyTexture,
>+                 angle::Result(const gl::Context *,
>+                               const gl::ImageIndex &,
>+                               GLenum,
>+                               GLenum,
>+                               size_t,
>+                               bool,
>+                               bool,
>+                               bool,
>+                               const gl::Texture *));
>+    MOCK_METHOD9(copySubTexture,
>+                 angle::Result(const gl::Context *,
>+                               const gl::ImageIndex &,
>+                               const gl::Offset &,
>+                               size_t,
>+                               const gl::Box &,
>+                               bool,
>+                               bool,
>+                               bool,
>+                               const gl::Texture *));
>+    MOCK_METHOD2(copyCompressedTexture,
>+                 angle::Result(const gl::Context *, const gl::Texture *source));
>+    MOCK_METHOD5(
>+        setStorage,
>+        angle::Result(const gl::Context *, gl::TextureType, size_t, GLenum, const gl::Extents &));
>+    MOCK_METHOD7(setStorageExternalMemory,
>+                 angle::Result(const gl::Context *,
>+                               gl::TextureType,
>+                               size_t,
>+                               GLenum,
>+                               const gl::Extents &,
>+                               gl::MemoryObject *,
>+                               GLuint64));
>     MOCK_METHOD4(setImageExternal,
>-                 gl::Error(const gl::Context *,
>-                           GLenum,
>-                           egl::Stream *,
>-                           const egl::Stream::GLTextureDescription &));
>-    MOCK_METHOD3(setEGLImageTarget, gl::Error(const gl::Context *, GLenum, egl::Image *));
>-    MOCK_METHOD1(generateMipmap, gl::Error(const gl::Context *));
>-    MOCK_METHOD2(bindTexImage, gl::Error(const gl::Context *, egl::Surface *));
>-    MOCK_METHOD1(releaseTexImage, gl::Error(const gl::Context *));
>+                 angle::Result(const gl::Context *,
>+                               gl::TextureType,
>+                               egl::Stream *,
>+                               const egl::Stream::GLTextureDescription &));
>+    MOCK_METHOD3(setEGLImageTarget,
>+                 angle::Result(const gl::Context *, gl::TextureType, egl::Image *));
>+    MOCK_METHOD1(generateMipmap, angle::Result(const gl::Context *));
>+    MOCK_METHOD2(bindTexImage, angle::Result(const gl::Context *, egl::Surface *));
>+    MOCK_METHOD1(releaseTexImage, angle::Result(const gl::Context *));
> 
>     MOCK_METHOD4(getAttachmentRenderTarget,
>-                 gl::Error(const gl::Context *,
>-                           GLenum,
>-                           const gl::ImageIndex &,
>-                           FramebufferAttachmentRenderTarget **));
>+                 angle::Result(const gl::Context *,
>+                               GLenum,
>+                               const gl::ImageIndex &,
>+                               FramebufferAttachmentRenderTarget **));
> 
>     MOCK_METHOD6(setStorageMultisample,
>-                 gl::Error(const gl::Context *, GLenum, GLsizei, GLint, const gl::Extents &, bool));
>+                 angle::Result(const gl::Context *,
>+                               gl::TextureType,
>+                               GLsizei,
>+                               GLint,
>+                               const gl::Extents &,
>+                               bool));
> 
>-    MOCK_METHOD2(setBaseLevel, gl::Error(const gl::Context *, GLuint));
>+    MOCK_METHOD2(setBaseLevel, angle::Result(const gl::Context *, GLuint));
> 
>-    MOCK_METHOD1(syncState, void(const gl::Texture::DirtyBits &));
>+    MOCK_METHOD2(syncState, angle::Result(const gl::Context *, const gl::Texture::DirtyBits &));
> 
>     MOCK_METHOD0(destructor, void());
> 
>   protected:
>     gl::TextureState mMockState;
> };
>+}  // namespace rx
> 
>-}
>-
>-#endif // LIBANGLE_RENDERER_TEXTUREIMPLMOCK_H_
>+#endif  // LIBANGLE_RENDERER_TEXTUREIMPLMOCK_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/TransformFeedbackImpl.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/TransformFeedbackImpl.h
>index ad371e9b365..f27388ec38f 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/TransformFeedbackImpl.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/TransformFeedbackImpl.h
>@@ -19,21 +19,23 @@ class TransformFeedbackImpl : angle::NonCopyable
> {
>   public:
>     TransformFeedbackImpl(const gl::TransformFeedbackState &state) : mState(state) {}
>-    virtual ~TransformFeedbackImpl() { }
>+    virtual ~TransformFeedbackImpl() {}
> 
>-    virtual void begin(GLenum primitiveMode) = 0;
>-    virtual void end() = 0;
>-    virtual void pause() = 0;
>-    virtual void resume() = 0;
>+    virtual angle::Result begin(const gl::Context *context, gl::PrimitiveMode primitiveMode) = 0;
>+    virtual angle::Result end(const gl::Context *context)                                    = 0;
>+    virtual angle::Result pause(const gl::Context *context)                                  = 0;
>+    virtual angle::Result resume(const gl::Context *context)                                 = 0;
> 
>-    virtual void bindGenericBuffer(const gl::BindingPointer<gl::Buffer> &binding) = 0;
>-    virtual void bindIndexedBuffer(size_t index,
>-                                   const gl::OffsetBindingPointer<gl::Buffer> &binding) = 0;
>+    virtual angle::Result bindGenericBuffer(const gl::Context *context,
>+                                            const gl::BindingPointer<gl::Buffer> &binding) = 0;
>+    virtual angle::Result bindIndexedBuffer(
>+        const gl::Context *context,
>+        size_t index,
>+        const gl::OffsetBindingPointer<gl::Buffer> &binding) = 0;
> 
>   protected:
>     const gl::TransformFeedbackState &mState;
> };
>+}  // namespace rx
> 
>-}
>-
>-#endif // LIBANGLE_RENDERER_TRANSFORMFEEDBACKIMPL_H_
>+#endif  // LIBANGLE_RENDERER_TRANSFORMFEEDBACKIMPL_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/TransformFeedbackImpl_mock.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/TransformFeedbackImpl_mock.h
>index 2de3ad79a91..bf45eab1a8c 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/TransformFeedbackImpl_mock.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/TransformFeedbackImpl_mock.h
>@@ -21,21 +21,23 @@ class MockTransformFeedbackImpl : public TransformFeedbackImpl
>   public:
>     MockTransformFeedbackImpl(const gl::TransformFeedbackState &state)
>         : TransformFeedbackImpl(state)
>-    {
>-    }
>+    {}
>     ~MockTransformFeedbackImpl() { destructor(); }
> 
>-    MOCK_METHOD1(begin, void(GLenum primitiveMode));
>-    MOCK_METHOD0(end, void());
>-    MOCK_METHOD0(pause, void());
>-    MOCK_METHOD0(resume, void());
>+    MOCK_METHOD2(begin, angle::Result(const gl::Context *, gl::PrimitiveMode));
>+    MOCK_METHOD1(end, angle::Result(const gl::Context *));
>+    MOCK_METHOD1(pause, angle::Result(const gl::Context *));
>+    MOCK_METHOD1(resume, angle::Result(const gl::Context *));
> 
>-    MOCK_METHOD1(bindGenericBuffer, void(const gl::BindingPointer<gl::Buffer> &));
>-    MOCK_METHOD2(bindIndexedBuffer, void(size_t, const gl::OffsetBindingPointer<gl::Buffer> &));
>+    MOCK_METHOD2(bindGenericBuffer,
>+                 angle::Result(const gl::Context *, const gl::BindingPointer<gl::Buffer> &));
>+    MOCK_METHOD3(bindIndexedBuffer,
>+                 angle::Result(const gl::Context *,
>+                               size_t,
>+                               const gl::OffsetBindingPointer<gl::Buffer> &));
> 
>     MOCK_METHOD0(destructor, void());
> };
>+}  // namespace rx
> 
>-}
>-
>-#endif // LIBANGLE_RENDERER_TRANSFORMFEEDBACKIMPLMOCK_H_
>+#endif  // LIBANGLE_RENDERER_TRANSFORMFEEDBACKIMPLMOCK_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/VertexArrayImpl.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/VertexArrayImpl.h
>index e48cc53d6c6..71e0f7acd22 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/VertexArrayImpl.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/VertexArrayImpl.h
>@@ -13,6 +13,17 @@
> #include "libANGLE/Buffer.h"
> #include "libANGLE/VertexArray.h"
> 
>+// This is a helper X macro for iterating over all dirty attribs/bindings. Useful for dirty bits.
>+static_assert(gl::MAX_VERTEX_ATTRIBS == 16, "Invalid max vertex attribs");
>+static_assert(gl::MAX_VERTEX_ATTRIB_BINDINGS == 16, "Invalid max vertex bindings");
>+#define ANGLE_VERTEX_INDEX_CASES(FUNC) \
>+    FUNC(0)                            \
>+    FUNC(1)                            \
>+    FUNC(2)                            \
>+    FUNC(3)                            \
>+    FUNC(4)                            \
>+    FUNC(5) FUNC(6) FUNC(7) FUNC(8) FUNC(9) FUNC(10) FUNC(11) FUNC(12) FUNC(13) FUNC(14) FUNC(15)
>+
> namespace rx
> {
> class ContextImpl;
>@@ -21,17 +32,31 @@ class VertexArrayImpl : angle::NonCopyable
> {
>   public:
>     VertexArrayImpl(const gl::VertexArrayState &state) : mState(state) {}
>-    virtual void syncState(const gl::Context *context, const gl::VertexArray::DirtyBits &dirtyBits)
>-    {
>-    }
>+
>+    // It's up to the implementation to reset the attrib and binding dirty bits.
>+    // This is faster than the front-end having to clear all the bits after they have been scanned.
>+    virtual angle::Result syncState(const gl::Context *context,
>+                                    const gl::VertexArray::DirtyBits &dirtyBits,
>+                                    gl::VertexArray::DirtyAttribBitsArray *attribBits,
>+                                    gl::VertexArray::DirtyBindingBitsArray *bindingBits);
> 
>     virtual void destroy(const gl::Context *context) {}
>     virtual ~VertexArrayImpl() {}
> 
>+    const gl::VertexArrayState &getState() const { return mState; }
>+
>   protected:
>     const gl::VertexArrayState &mState;
> };
> 
>+inline angle::Result VertexArrayImpl::syncState(const gl::Context *context,
>+                                                const gl::VertexArray::DirtyBits &dirtyBits,
>+                                                gl::VertexArray::DirtyAttribBitsArray *attribBits,
>+                                                gl::VertexArray::DirtyBindingBitsArray *bindingBits)
>+{
>+    return angle::Result::Continue;
> }
> 
>-#endif // LIBANGLE_RENDERER_VERTEXARRAYIMPL_H_
>+}  // namespace rx
>+
>+#endif  // LIBANGLE_RENDERER_VERTEXARRAYIMPL_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/angle_format.py b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/angle_format.py
>index 19d531ca741..1f1bab9d305 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/angle_format.py
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/angle_format.py
>@@ -10,6 +10,11 @@ import json
> import os
> import re
> 
>+kChannels = "ABDGLRSX"
>+
>+def get_angle_format_map_abs_path():
>+    return os.path.join(os.path.dirname(os.path.realpath(__file__)), 'angle_format_map.json')
>+
> def reject_duplicate_keys(pairs):
>     found_keys = {}
>     for key, value in pairs:
>@@ -34,7 +39,7 @@ def load_inverse_table(path):
>     return { angle: gl for gl, angle in pairs }
> 
> def load_without_override():
>-    map_path = os.path.join(os.path.dirname(os.path.realpath(__file__)), 'angle_format_map.json')
>+    map_path = get_angle_format_map_abs_path()
>     return load_forward_table(map_path)
> 
> def load_with_override(override_path):
>@@ -46,6 +51,10 @@ def load_with_override(override_path):
> 
>     return results
> 
>+def get_all_angle_formats():
>+    map_path = get_angle_format_map_abs_path()
>+    return load_inverse_table(map_path).keys()
>+
> def get_component_type(format_id):
>     if "SNORM" in format_id:
>         return "snorm"
>@@ -53,21 +62,29 @@ def get_component_type(format_id):
>         return "unorm"
>     elif "FLOAT" in format_id:
>         return "float"
>+    elif "FIXED" in format_id:
>+        return "float"
>     elif "UINT" in format_id:
>         return "uint"
>     elif "SINT" in format_id:
>         return "int"
>+    elif "USCALED" in format_id:
>+        return "uint"
>+    elif "SSCALED" in format_id:
>+        return "int"
>     elif format_id == "NONE":
>         return "none"
>     elif "SRGB" in format_id:
>         return "unorm"
>+    elif "TYPELESS" in format_id:
>+        return "unorm"
>     elif format_id == "R9G9B9E5_SHAREDEXP":
>         return "float"
>     else:
>         raise ValueError("Unknown component type for " + format_id)
> 
> def get_channel_tokens(format_id):
>-    r = re.compile(r'([ABDGLRS][\d]+)')
>+    r = re.compile(r'([' + kChannels + '][\d]+)')
>     return filter(r.match, r.split(format_id))
> 
> def get_channels(format_id):
>@@ -166,3 +183,46 @@ def get_internal_format_initializer(internal_format, format_id):
>         return 'Initialize4ComponentData<GLuint, 0x00000000, 0x00000000, 0x00000000, 0x00000001>'
>     else:
>         raise ValueError('warning: internal format initializer could not be generated and may be needed for ' + internal_format)
>+
>+def get_vertex_copy_function(src_format, dst_format):
>+    if dst_format == "NONE":
>+        return "nullptr";
>+
>+    num_channel = len(get_channel_tokens(src_format))
>+    if num_channel < 1 or num_channel > 4:
>+        return "nullptr";
>+
>+    if 'FIXED' in src_format:
>+        assert 'FLOAT' in dst_format, ('get_vertex_copy_function: can only convert fixed to float,'
>+                                       + ' not to ' + dst_format)
>+        return 'Copy32FixedTo32FVertexData<%d, %d>' % (num_channel, num_channel)
>+
>+    sign = ''
>+    base_type = None
>+    if 'FLOAT' in src_format:
>+        base_type = 'float'
>+    else:
>+        bits = get_bits(src_format)
>+        redbits = bits and bits.get('R')
>+        if redbits == 8:
>+            base_type = 'byte'
>+        elif redbits == 16:
>+            base_type = 'short'
>+        elif redbits == 32:
>+            base_type = 'int'
>+
>+        if 'UINT' in src_format or 'UNORM' in src_format or 'USCALED' in src_format:
>+            sign = 'u'
>+
>+    if base_type is None:
>+        return "nullptr";
>+
>+    gl_type = 'GL' + sign + base_type
>+
>+    if src_format == dst_format:
>+        return 'CopyNativeVertexData<%s, %d, %d, 0>' % (gl_type, num_channel, num_channel)
>+
>+    assert 'FLOAT' in dst_format, ('get_vertex_copy_function: can only convert to float,'
>+                                   + ' not to ' + dst_format)
>+    normalized = 'true' if 'NORM' in src_format else 'false'
>+    return "CopyTo32FVertexData<%s, %d, %d, %s>" % (gl_type, num_channel, num_channel, normalized)
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/angle_format_data.json b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/angle_format_data.json
>index 5b3a226e2e9..5d3840ac2bf 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/angle_format_data.json
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/angle_format_data.json
>@@ -20,5 +20,173 @@
>   },
>   "R8G8B8A8_UNORM_SRGB": {
>     "channelStruct":  "R8G8B8A8SRGB"
>+  },
>+  "R8G8B8A8_TYPELESS": {
>+    "glInternalFormat": "GL_RGBA8"
>+  },
>+  "R8G8B8A8_TYPELESS_SRGB": {
>+    "glInternalFormat": "GL_SRGB8_ALPHA8"
>+  },
>+  "B8G8R8A8_TYPELESS": {
>+    "glInternalFormat": "GL_BGRA8_EXT"
>+  },
>+  "B8G8R8A8_TYPELESS_SRGB": {
>+    "glInternalFormat": "GL_BGRA8_SRGB_ANGLEX"
>+  },
>+  "ASTC_4x4_SRGB_BLOCK": {
>+    "blockPixelBytes": "16"
>+  },
>+  "ASTC_4x4_UNORM_BLOCK": {
>+    "blockPixelBytes": "16"
>+  },
>+  "ASTC_5x4_SRGB_BLOCK": {
>+    "blockPixelBytes": "16"
>+  },
>+  "ASTC_5x4_UNORM_BLOCK": {
>+    "blockPixelBytes": "16"
>+  },
>+  "ASTC_5x5_SRGB_BLOCK": {
>+    "blockPixelBytes": "16"
>+  },
>+  "ASTC_5x5_UNORM_BLOCK": {
>+    "blockPixelBytes": "16"
>+  },
>+  "ASTC_6x5_SRGB_BLOCK": {
>+    "blockPixelBytes": "16"
>+  },
>+  "ASTC_6x5_UNORM_BLOCK": {
>+    "blockPixelBytes": "16"
>+  },
>+  "ASTC_6x6_SRGB_BLOCK": {
>+    "blockPixelBytes": "16"
>+  },
>+  "ASTC_6x6_UNORM_BLOCK": {
>+    "blockPixelBytes": "16"
>+  },
>+  "ASTC_8x5_SRGB_BLOCK": {
>+    "blockPixelBytes": "16"
>+  },
>+  "ASTC_8x5_UNORM_BLOCK": {
>+    "blockPixelBytes": "16"
>+  },
>+  "ASTC_8x6_SRGB_BLOCK": {
>+    "blockPixelBytes": "16"
>+  },
>+  "ASTC_8x6_UNORM_BLOCK": {
>+    "blockPixelBytes": "16"
>+  },
>+  "ASTC_8x8_SRGB_BLOCK": {
>+    "blockPixelBytes": "16"
>+  },
>+  "ASTC_8x8_UNORM_BLOCK": {
>+    "blockPixelBytes": "16"
>+  },
>+  "ASTC_10x5_SRGB_BLOCK": {
>+    "blockPixelBytes": "16"
>+  },
>+  "ASTC_10x5_UNORM_BLOCK": {
>+    "blockPixelBytes": "16"
>+  },
>+  "ASTC_10x6_SRGB_BLOCK": {
>+    "blockPixelBytes": "16"
>+  },
>+  "ASTC_10x6_UNORM_BLOCK": {
>+    "blockPixelBytes": "16"
>+  },
>+  "ASTC_10x8_SRGB_BLOCK": {
>+    "blockPixelBytes": "16"
>+  },
>+  "ASTC_10x8_UNORM_BLOCK": {
>+    "blockPixelBytes": "16"
>+  },
>+  "ASTC_10x10_SRGB_BLOCK": {
>+    "blockPixelBytes": "16"
>+  },
>+  "ASTC_10x10_UNORM_BLOCK": {
>+    "blockPixelBytes": "16"
>+  },
>+  "ASTC_12x10_SRGB_BLOCK": {
>+    "blockPixelBytes": "16"
>+  },
>+  "ASTC_12x10_UNORM_BLOCK": {
>+    "blockPixelBytes": "16"
>+  },
>+  "ASTC_12x12_SRGB_BLOCK": {
>+    "blockPixelBytes": "16"
>+  },
>+  "ASTC_12x12_UNORM_BLOCK": {
>+    "blockPixelBytes": "16"
>+  },
>+  "BC1_RGB_UNORM_BLOCK": {
>+    "blockPixelBytes": "8"
>+  },
>+  "BC1_RGBA_UNORM_BLOCK": {
>+    "blockPixelBytes": "8"
>+  },
>+  "BC1_RGBA_UNORM_SRGB_BLOCK": {
>+    "blockPixelBytes": "8"
>+  },
>+  "BC1_RGB_UNORM_SRGB_BLOCK": {
>+    "blockPixelBytes": "8"
>+  },
>+  "BC2_RGBA_UNORM_BLOCK": {
>+    "blockPixelBytes": "16"
>+  },
>+  "BC2_RGBA_UNORM_SRGB_BLOCK": {
>+    "blockPixelBytes": "16"
>+  },
>+  "BC3_RGBA_UNORM_BLOCK": {
>+    "blockPixelBytes": "16"
>+  },
>+  "BC3_RGBA_UNORM_SRGB_BLOCK": {
>+    "blockPixelBytes": "16"
>+  },
>+  "BPTC_SRGB_ALPHA_UNORM_BLOCK": {
>+    "blockPixelBytes": "16"
>+  },
>+  "BPTC_RGB_SIGNED_FLOAT_BLOCK": {
>+    "blockPixelBytes": "16"
>+  },
>+  "BPTC_RGB_UNSIGNED_FLOAT_BLOCK": {
>+    "blockPixelBytes": "16"
>+  },
>+  "BPTC_RGBA_UNORM_BLOCK": {
>+    "blockPixelBytes": "16"
>+  },
>+  "EAC_R11_SNORM_BLOCK": {
>+    "blockPixelBytes": "8"
>+  },
>+  "EAC_R11_UNORM_BLOCK": {
>+    "blockPixelBytes": "8"
>+  },
>+  "EAC_R11G11_SNORM_BLOCK": {
>+    "blockPixelBytes": "16"
>+  },
>+  "EAC_R11G11_UNORM_BLOCK": {
>+    "blockPixelBytes": "16"
>+  },
>+  "ETC1_R8G8B8_UNORM_BLOCK": {
>+    "blockPixelBytes": "8"
>+  },
>+  "ETC1_LOSSY_DECODE_R8G8B8_UNORM_BLOCK": {
>+    "blockPixelBytes": "8"
>+  },
>+  "ETC2_R8G8B8_SRGB_BLOCK": {
>+    "blockPixelBytes": "8"
>+  },
>+  "ETC2_R8G8B8_UNORM_BLOCK": {
>+    "blockPixelBytes": "8"
>+  },
>+  "ETC2_R8G8B8A1_SRGB_BLOCK": {
>+    "blockPixelBytes": "8"
>+  },
>+  "ETC2_R8G8B8A1_UNORM_BLOCK": {
>+    "blockPixelBytes": "8"
>+  },
>+  "ETC2_R8G8B8A8_UNORM_BLOCK": {
>+    "blockPixelBytes": "16"
>+  },
>+  "ETC2_R8G8B8A8_SRGB_BLOCK": {
>+    "blockPixelBytes": "16"
>   }
> }
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/angle_format_map.json b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/angle_format_map.json
>index 5a4e487cbd1..0475550c75e 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/angle_format_map.json
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/angle_format_map.json
>@@ -54,10 +54,14 @@
>   [ "GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT3_EXT", "BC2_RGBA_UNORM_SRGB_BLOCK" ],
>   [ "GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT5_EXT", "BC3_RGBA_UNORM_SRGB_BLOCK" ],
>   [ "GL_COMPRESSED_SRGB_S3TC_DXT1_EXT", "BC1_RGB_UNORM_SRGB_BLOCK" ],
>+  [ "GL_COMPRESSED_RGBA_BPTC_UNORM_EXT", "BPTC_RGBA_UNORM_BLOCK" ],
>+  [ "GL_COMPRESSED_SRGB_ALPHA_BPTC_UNORM_EXT", "BPTC_SRGB_ALPHA_UNORM_BLOCK" ],
>+  [ "GL_COMPRESSED_RGB_BPTC_SIGNED_FLOAT_EXT", "BPTC_RGB_SIGNED_FLOAT_BLOCK" ],
>+  [ "GL_COMPRESSED_RGB_BPTC_UNSIGNED_FLOAT_EXT", "BPTC_RGB_UNSIGNED_FLOAT_BLOCK" ],
>   [ "GL_DEPTH24_STENCIL8", "D24_UNORM_S8_UINT" ],
>   [ "GL_DEPTH32F_STENCIL8", "D32_FLOAT_S8X24_UINT" ],
>   [ "GL_DEPTH_COMPONENT16", "D16_UNORM" ],
>-  [ "GL_DEPTH_COMPONENT24", "D24_UNORM" ],
>+  [ "GL_DEPTH_COMPONENT24", "D24_UNORM_X8_UINT" ],
>   [ "GL_DEPTH_COMPONENT32F", "D32_FLOAT" ],
>   [ "GL_DEPTH_COMPONENT32_OES", "D32_UNORM" ],
>   [ "GL_ETC1_RGB8_OES", "ETC1_R8G8B8_UNORM_BLOCK" ],
>@@ -93,6 +97,10 @@
>   [ "GL_RGB", "R8G8B8_UNORM" ],
>   [ "GL_RGB10_A2", "R10G10B10A2_UNORM" ],
>   [ "GL_RGB10_A2UI", "R10G10B10A2_UINT" ],
>+  [ "GL_RGB10_A2_USCALED_ANGLEX", "R10G10B10A2_USCALED" ],
>+  [ "GL_RGB10_A2_SNORM_ANGLEX", "R10G10B10A2_SNORM" ],
>+  [ "GL_RGB10_A2_SINT_ANGLEX", "R10G10B10A2_SINT" ],
>+  [ "GL_RGB10_A2_SSCALED_ANGLEX", "R10G10B10A2_SSCALED" ],
>   [ "GL_RGB16F", "R16G16B16_FLOAT" ],
>   [ "GL_RGB16I", "R16G16B16_SINT" ],
>   [ "GL_RGB16UI", "R16G16B16_UINT" ],
>@@ -128,5 +136,46 @@
>   [ "GL_R16_SNORM_EXT", "R16_SNORM" ],
>   [ "GL_RG16_SNORM_EXT", "R16G16_SNORM" ],
>   [ "GL_RGB16_SNORM_EXT", "R16G16B16_SNORM" ],
>-  [ "GL_RGBA16_SNORM_EXT", "R16G16B16A16_SNORM" ]
>+  [ "GL_RGBA16_SNORM_EXT", "R16G16B16A16_SNORM" ],
>+  [ "GL_A1RGB5_ANGLEX", "A1R5G5B5_UNORM" ],
>+  [ "GL_RGBA8_TYPELESS_ANGLEX", "R8G8B8A8_TYPELESS" ],
>+  [ "GL_RGBA8_TYPELESS_SRGB_ANGLEX", "R8G8B8A8_TYPELESS_SRGB" ],
>+  [ "GL_BGRA8_TYPELESS_ANGLEX", "B8G8R8A8_TYPELESS" ],
>+  [ "GL_BGRA8_TYPELESS_SRGB_ANGLEX", "B8G8R8A8_TYPELESS_SRGB" ],
>+  [ "GL_R8_SSCALED_ANGLEX", "R8_SSCALED" ],
>+  [ "GL_RG8_SSCALED_ANGLEX", "R8G8_SSCALED" ],
>+  [ "GL_RGB8_SSCALED_ANGLEX", "R8G8B8_SSCALED" ],
>+  [ "GL_RGBA8_SSCALED_ANGLEX", "R8G8B8A8_SSCALED" ],
>+  [ "GL_R8_USCALED_ANGLEX", "R8_USCALED" ],
>+  [ "GL_RG8_USCALED_ANGLEX", "R8G8_USCALED" ],
>+  [ "GL_RGB8_USCALED_ANGLEX", "R8G8B8_USCALED" ],
>+  [ "GL_RGBA8_USCALED_ANGLEX", "R8G8B8A8_USCALED" ],
>+  [ "GL_R16_SSCALED_ANGLEX", "R16_SSCALED" ],
>+  [ "GL_RG16_SSCALED_ANGLEX", "R16G16_SSCALED" ],
>+  [ "GL_RGB16_SSCALED_ANGLEX", "R16G16B16_SSCALED" ],
>+  [ "GL_RGBA16_SSCALED_ANGLEX", "R16G16B16A16_SSCALED" ],
>+  [ "GL_R16_USCALED_ANGLEX", "R16_USCALED" ],
>+  [ "GL_RG16_USCALED_ANGLEX", "R16G16_USCALED" ],
>+  [ "GL_RGB16_USCALED_ANGLEX", "R16G16B16_USCALED" ],
>+  [ "GL_RGBA16_USCALED_ANGLEX", "R16G16B16A16_USCALED" ],
>+  [ "GL_R32_SNORM_ANGLEX", "R32_SNORM" ],
>+  [ "GL_RG32_SNORM_ANGLEX", "R32G32_SNORM" ],
>+  [ "GL_RGB32_SNORM_ANGLEX", "R32G32B32_SNORM" ],
>+  [ "GL_RGBA32_SNORM_ANGLEX", "R32G32B32A32_SNORM" ],
>+  [ "GL_R32_UNORM_ANGLEX", "R32_UNORM" ],
>+  [ "GL_RG32_UNORM_ANGLEX", "R32G32_UNORM" ],
>+  [ "GL_RGB32_UNORM_ANGLEX", "R32G32B32_UNORM" ],
>+  [ "GL_RGBA32_UNORM_ANGLEX", "R32G32B32A32_UNORM" ],
>+  [ "GL_R32_SSCALED_ANGLEX", "R32_SSCALED" ],
>+  [ "GL_RG32_SSCALED_ANGLEX", "R32G32_SSCALED" ],
>+  [ "GL_RGB32_SSCALED_ANGLEX", "R32G32B32_SSCALED" ],
>+  [ "GL_RGBA32_SSCALED_ANGLEX", "R32G32B32A32_SSCALED" ],
>+  [ "GL_R32_USCALED_ANGLEX", "R32_USCALED" ],
>+  [ "GL_RG32_USCALED_ANGLEX", "R32G32_USCALED" ],
>+  [ "GL_RGB32_USCALED_ANGLEX", "R32G32B32_USCALED" ],
>+  [ "GL_RGBA32_USCALED_ANGLEX", "R32G32B32A32_USCALED" ],
>+  [ "GL_R32_FIXED_ANGLEX", "R32_FIXED" ],
>+  [ "GL_RG32_FIXED_ANGLEX", "R32G32_FIXED" ],
>+  [ "GL_RGB32_FIXED_ANGLEX", "R32G32B32_FIXED" ],
>+  [ "GL_RGBA32_FIXED_ANGLEX", "R32G32B32A32_FIXED" ]
> ]
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/copyvertex.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/copyvertex.h
>new file mode 100644
>index 00000000000..988e590f3b2
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/copyvertex.h
>@@ -0,0 +1,57 @@
>+//
>+// Copyright (c) 2013-2015 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+
>+// copyvertex.h: Defines vertex buffer copying and conversion functions
>+
>+#ifndef LIBANGLE_RENDERER_COPYVERTEX_H_
>+#define LIBANGLE_RENDERER_COPYVERTEX_H_
>+
>+#include "common/mathutil.h"
>+
>+namespace rx
>+{
>+
>+using VertexCopyFunction = void (*)(const uint8_t *input,
>+                                    size_t stride,
>+                                    size_t count,
>+                                    uint8_t *output);
>+
>+// 'alphaDefaultValueBits' gives the default value for the alpha channel (4th component)
>+template <typename T,
>+          size_t inputComponentCount,
>+          size_t outputComponentCount,
>+          uint32_t alphaDefaultValueBits>
>+void CopyNativeVertexData(const uint8_t *input, size_t stride, size_t count, uint8_t *output);
>+
>+template <size_t inputComponentCount, size_t outputComponentCount>
>+void Copy8SintTo16SintVertexData(const uint8_t *input,
>+                                 size_t stride,
>+                                 size_t count,
>+                                 uint8_t *output);
>+
>+template <size_t componentCount>
>+void Copy8SnormTo16SnormVertexData(const uint8_t *input,
>+                                   size_t stride,
>+                                   size_t count,
>+                                   uint8_t *output);
>+
>+template <size_t inputComponentCount, size_t outputComponentCount>
>+void Copy32FixedTo32FVertexData(const uint8_t *input, size_t stride, size_t count, uint8_t *output);
>+
>+template <typename T, size_t inputComponentCount, size_t outputComponentCount, bool normalized>
>+void CopyTo32FVertexData(const uint8_t *input, size_t stride, size_t count, uint8_t *output);
>+
>+template <bool isSigned, bool normalized, bool toFloat>
>+void CopyXYZ10W2ToXYZW32FVertexData(const uint8_t *input,
>+                                    size_t stride,
>+                                    size_t count,
>+                                    uint8_t *output);
>+
>+}  // namespace rx
>+
>+#include "copyvertex.inc.h"
>+
>+#endif  // LIBANGLE_RENDERER_COPYVERTEX_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/copyvertex.inc.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/copyvertex.inc.h
>new file mode 100644
>index 00000000000..16c82adcf22
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/copyvertex.inc.h
>@@ -0,0 +1,479 @@
>+//
>+// Copyright (c) 2014-2015 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+
>+// copyvertex.inc.h: Implementation of vertex buffer copying and conversion functions
>+
>+namespace rx
>+{
>+
>+template <typename T,
>+          size_t inputComponentCount,
>+          size_t outputComponentCount,
>+          uint32_t alphaDefaultValueBits>
>+inline void CopyNativeVertexData(const uint8_t *input, size_t stride, size_t count, uint8_t *output)
>+{
>+    const size_t attribSize = sizeof(T) * inputComponentCount;
>+
>+    if (attribSize == stride && inputComponentCount == outputComponentCount)
>+    {
>+        memcpy(output, input, count * attribSize);
>+        return;
>+    }
>+
>+    if (inputComponentCount == outputComponentCount)
>+    {
>+        for (size_t i = 0; i < count; i++)
>+        {
>+            const T *offsetInput = reinterpret_cast<const T *>(input + (i * stride));
>+            T *offsetOutput      = reinterpret_cast<T *>(output) + i * outputComponentCount;
>+
>+            memcpy(offsetOutput, offsetInput, attribSize);
>+        }
>+        return;
>+    }
>+
>+    const T defaultAlphaValue                = gl::bitCast<T>(alphaDefaultValueBits);
>+    const size_t lastNonAlphaOutputComponent = std::min<size_t>(outputComponentCount, 3);
>+
>+    for (size_t i = 0; i < count; i++)
>+    {
>+        const T *offsetInput = reinterpret_cast<const T *>(input + (i * stride));
>+        T *offsetOutput      = reinterpret_cast<T *>(output) + i * outputComponentCount;
>+
>+        memcpy(offsetOutput, offsetInput, attribSize);
>+
>+        if (inputComponentCount < lastNonAlphaOutputComponent)
>+        {
>+            // Set the remaining G/B channels to 0.
>+            size_t numComponents = (lastNonAlphaOutputComponent - inputComponentCount);
>+            memset(&offsetOutput[inputComponentCount], 0, numComponents * sizeof(T));
>+        }
>+
>+        if (inputComponentCount < outputComponentCount && outputComponentCount == 4)
>+        {
>+            // Set the remaining alpha channel to the defaultAlphaValue.
>+            offsetOutput[3] = defaultAlphaValue;
>+        }
>+    }
>+}
>+
>+template <size_t inputComponentCount, size_t outputComponentCount>
>+inline void Copy8SintTo16SintVertexData(const uint8_t *input,
>+                                        size_t stride,
>+                                        size_t count,
>+                                        uint8_t *output)
>+{
>+    const size_t lastNonAlphaOutputComponent = std::min<size_t>(outputComponentCount, 3);
>+
>+    for (size_t i = 0; i < count; i++)
>+    {
>+        const GLbyte *offsetInput = reinterpret_cast<const GLbyte *>(input + i * stride);
>+        GLshort *offsetOutput     = reinterpret_cast<GLshort *>(output) + i * outputComponentCount;
>+
>+        for (size_t j = 0; j < inputComponentCount; j++)
>+        {
>+            offsetOutput[j] = static_cast<GLshort>(offsetInput[j]);
>+        }
>+
>+        for (size_t j = inputComponentCount; j < lastNonAlphaOutputComponent; j++)
>+        {
>+            // Set remaining G/B channels to 0.
>+            offsetOutput[j] = 0;
>+        }
>+
>+        if (inputComponentCount < outputComponentCount && outputComponentCount == 4)
>+        {
>+            // On integer formats, we must set the Alpha channel to 1 if it's unused.
>+            offsetOutput[3] = 1;
>+        }
>+    }
>+}
>+
>+template <size_t inputComponentCount, size_t outputComponentCount>
>+inline void Copy8SnormTo16SnormVertexData(const uint8_t *input,
>+                                          size_t stride,
>+                                          size_t count,
>+                                          uint8_t *output)
>+{
>+    for (size_t i = 0; i < count; i++)
>+    {
>+        const GLbyte *offsetInput = reinterpret_cast<const GLbyte *>(input + i * stride);
>+        GLshort *offsetOutput     = reinterpret_cast<GLshort *>(output) + i * outputComponentCount;
>+
>+        for (size_t j = 0; j < inputComponentCount; j++)
>+        {
>+            // The original GLbyte value ranges from -128 to +127 (INT8_MAX).
>+            // When converted to GLshort, the value must be scaled to between -32768 and +32767
>+            // (INT16_MAX).
>+            if (offsetInput[j] > 0)
>+            {
>+                offsetOutput[j] =
>+                    offsetInput[j] << 8 | offsetInput[j] << 1 | ((offsetInput[j] & 0x40) >> 6);
>+            }
>+            else
>+            {
>+                offsetOutput[j] = offsetInput[j] << 8;
>+            }
>+        }
>+
>+        for (size_t j = inputComponentCount; j < std::min<size_t>(outputComponentCount, 3); j++)
>+        {
>+            // Set remaining G/B channels to 0.
>+            offsetOutput[j] = 0;
>+        }
>+
>+        if (inputComponentCount < outputComponentCount && outputComponentCount == 4)
>+        {
>+            // On normalized formats, we must set the Alpha channel to the max value if it's unused.
>+            offsetOutput[3] = INT16_MAX;
>+        }
>+    }
>+}
>+
>+template <size_t inputComponentCount, size_t outputComponentCount>
>+inline void Copy32FixedTo32FVertexData(const uint8_t *input,
>+                                       size_t stride,
>+                                       size_t count,
>+                                       uint8_t *output)
>+{
>+    static const float divisor = 1.0f / (1 << 16);
>+
>+    for (size_t i = 0; i < count; i++)
>+    {
>+        const uint8_t *offsetInput = input + i * stride;
>+        float *offsetOutput        = reinterpret_cast<float *>(output) + i * outputComponentCount;
>+
>+        // GLfixed access must be 4-byte aligned on arm32, input and stride sometimes are not
>+        if (reinterpret_cast<uintptr_t>(offsetInput) % sizeof(GLfixed) == 0)
>+        {
>+            for (size_t j = 0; j < inputComponentCount; j++)
>+            {
>+                offsetOutput[j] =
>+                    static_cast<float>(reinterpret_cast<const GLfixed *>(offsetInput)[j]) * divisor;
>+            }
>+        }
>+        else
>+        {
>+            for (size_t j = 0; j < inputComponentCount; j++)
>+            {
>+                GLfixed alignedInput;
>+                memcpy(&alignedInput, offsetInput + j * sizeof(GLfixed), sizeof(GLfixed));
>+                offsetOutput[j] = static_cast<float>(alignedInput) * divisor;
>+            }
>+        }
>+
>+        // 4-component output formats would need special padding in the alpha channel.
>+        static_assert(!(inputComponentCount < 4 && outputComponentCount == 4),
>+                      "An inputComponentCount less than 4 and an outputComponentCount equal to 4 "
>+                      "is not supported.");
>+
>+        for (size_t j = inputComponentCount; j < outputComponentCount; j++)
>+        {
>+            offsetOutput[j] = 0.0f;
>+        }
>+    }
>+}
>+
>+template <typename T, size_t inputComponentCount, size_t outputComponentCount, bool normalized>
>+inline void CopyTo32FVertexData(const uint8_t *input, size_t stride, size_t count, uint8_t *output)
>+{
>+    typedef std::numeric_limits<T> NL;
>+
>+    for (size_t i = 0; i < count; i++)
>+    {
>+        const T *offsetInput = reinterpret_cast<const T *>(input + (stride * i));
>+        float *offsetOutput  = reinterpret_cast<float *>(output) + i * outputComponentCount;
>+
>+        for (size_t j = 0; j < inputComponentCount; j++)
>+        {
>+            if (normalized)
>+            {
>+                if (NL::is_signed)
>+                {
>+                    const float divisor = 1.0f / (2 * static_cast<float>(NL::max()) + 1);
>+                    offsetOutput[j]     = (2 * static_cast<float>(offsetInput[j]) + 1) * divisor;
>+                }
>+                else
>+                {
>+                    offsetOutput[j] = static_cast<float>(offsetInput[j]) / NL::max();
>+                }
>+            }
>+            else
>+            {
>+                offsetOutput[j] = static_cast<float>(offsetInput[j]);
>+            }
>+        }
>+
>+        // This would require special padding.
>+        static_assert(!(inputComponentCount < 4 && outputComponentCount == 4),
>+                      "An inputComponentCount less than 4 and an outputComponentCount equal to 4 "
>+                      "is not supported.");
>+
>+        for (size_t j = inputComponentCount; j < outputComponentCount; j++)
>+        {
>+            offsetOutput[j] = 0.0f;
>+        }
>+    }
>+}
>+
>+namespace priv
>+{
>+
>+template <bool isSigned, bool normalized, bool toFloat>
>+static inline void CopyPackedRGB(uint32_t data, uint8_t *output)
>+{
>+    const uint32_t rgbSignMask  = 0x200;       // 1 set at the 9 bit
>+    const uint32_t negativeMask = 0xFFFFFC00;  // All bits from 10 to 31 set to 1
>+
>+    if (toFloat)
>+    {
>+        GLfloat *floatOutput = reinterpret_cast<GLfloat *>(output);
>+        if (isSigned)
>+        {
>+            GLfloat finalValue = 0;
>+            if (data & rgbSignMask)
>+            {
>+                int negativeNumber = data | negativeMask;
>+                finalValue         = static_cast<GLfloat>(negativeNumber);
>+            }
>+            else
>+            {
>+                finalValue = static_cast<GLfloat>(data);
>+            }
>+
>+            if (normalized)
>+            {
>+                const int32_t maxValue = 0x1FF;       // 1 set in bits 0 through 8
>+                const int32_t minValue = 0xFFFFFE01;  // Inverse of maxValue
>+
>+                // A 10-bit two's complement number has the possibility of being minValue - 1 but
>+                // OpenGL's normalization rules dictate that it should be clamped to minValue in
>+                // this case.
>+                if (finalValue < minValue)
>+                {
>+                    finalValue = minValue;
>+                }
>+
>+                const int32_t halfRange = (maxValue - minValue) >> 1;
>+                *floatOutput            = ((finalValue - minValue) / halfRange) - 1.0f;
>+            }
>+            else
>+            {
>+                *floatOutput = finalValue;
>+            }
>+        }
>+        else
>+        {
>+            if (normalized)
>+            {
>+                const uint32_t maxValue = 0x3FF;  // 1 set in bits 0 through 9
>+                *floatOutput = static_cast<GLfloat>(data) / static_cast<GLfloat>(maxValue);
>+            }
>+            else
>+            {
>+                *floatOutput = static_cast<GLfloat>(data);
>+            }
>+        }
>+    }
>+    else
>+    {
>+        if (isSigned)
>+        {
>+            GLshort *intOutput = reinterpret_cast<GLshort *>(output);
>+
>+            if (data & rgbSignMask)
>+            {
>+                *intOutput = static_cast<GLshort>(data | negativeMask);
>+            }
>+            else
>+            {
>+                *intOutput = static_cast<GLshort>(data);
>+            }
>+        }
>+        else
>+        {
>+            GLushort *uintOutput = reinterpret_cast<GLushort *>(output);
>+            *uintOutput          = static_cast<GLushort>(data);
>+        }
>+    }
>+}
>+
>+template <bool isSigned, bool normalized, bool toFloat>
>+inline void CopyPackedAlpha(uint32_t data, uint8_t *output)
>+{
>+    if (toFloat)
>+    {
>+        GLfloat *floatOutput = reinterpret_cast<GLfloat *>(output);
>+        if (isSigned)
>+        {
>+            if (normalized)
>+            {
>+                switch (data)
>+                {
>+                    case 0x0:
>+                        *floatOutput = 0.0f;
>+                        break;
>+                    case 0x1:
>+                        *floatOutput = 1.0f;
>+                        break;
>+                    case 0x2:
>+                        *floatOutput = -1.0f;
>+                        break;
>+                    case 0x3:
>+                        *floatOutput = -1.0f;
>+                        break;
>+                    default:
>+                        UNREACHABLE();
>+                }
>+            }
>+            else
>+            {
>+                switch (data)
>+                {
>+                    case 0x0:
>+                        *floatOutput = 0.0f;
>+                        break;
>+                    case 0x1:
>+                        *floatOutput = 1.0f;
>+                        break;
>+                    case 0x2:
>+                        *floatOutput = -2.0f;
>+                        break;
>+                    case 0x3:
>+                        *floatOutput = -1.0f;
>+                        break;
>+                    default:
>+                        UNREACHABLE();
>+                }
>+            }
>+        }
>+        else
>+        {
>+            if (normalized)
>+            {
>+                switch (data)
>+                {
>+                    case 0x0:
>+                        *floatOutput = 0.0f / 3.0f;
>+                        break;
>+                    case 0x1:
>+                        *floatOutput = 1.0f / 3.0f;
>+                        break;
>+                    case 0x2:
>+                        *floatOutput = 2.0f / 3.0f;
>+                        break;
>+                    case 0x3:
>+                        *floatOutput = 3.0f / 3.0f;
>+                        break;
>+                    default:
>+                        UNREACHABLE();
>+                }
>+            }
>+            else
>+            {
>+                switch (data)
>+                {
>+                    case 0x0:
>+                        *floatOutput = 0.0f;
>+                        break;
>+                    case 0x1:
>+                        *floatOutput = 1.0f;
>+                        break;
>+                    case 0x2:
>+                        *floatOutput = 2.0f;
>+                        break;
>+                    case 0x3:
>+                        *floatOutput = 3.0f;
>+                        break;
>+                    default:
>+                        UNREACHABLE();
>+                }
>+            }
>+        }
>+    }
>+    else
>+    {
>+        if (isSigned)
>+        {
>+            GLshort *intOutput = reinterpret_cast<GLshort *>(output);
>+            switch (data)
>+            {
>+                case 0x0:
>+                    *intOutput = 0;
>+                    break;
>+                case 0x1:
>+                    *intOutput = 1;
>+                    break;
>+                case 0x2:
>+                    *intOutput = -2;
>+                    break;
>+                case 0x3:
>+                    *intOutput = -1;
>+                    break;
>+                default:
>+                    UNREACHABLE();
>+            }
>+        }
>+        else
>+        {
>+            GLushort *uintOutput = reinterpret_cast<GLushort *>(output);
>+            switch (data)
>+            {
>+                case 0x0:
>+                    *uintOutput = 0;
>+                    break;
>+                case 0x1:
>+                    *uintOutput = 1;
>+                    break;
>+                case 0x2:
>+                    *uintOutput = 2;
>+                    break;
>+                case 0x3:
>+                    *uintOutput = 3;
>+                    break;
>+                default:
>+                    UNREACHABLE();
>+            }
>+        }
>+    }
>+}
>+
>+}  // namespace priv
>+
>+template <bool isSigned, bool normalized, bool toFloat>
>+inline void CopyXYZ10W2ToXYZW32FVertexData(const uint8_t *input,
>+                                           size_t stride,
>+                                           size_t count,
>+                                           uint8_t *output)
>+{
>+    const size_t outputComponentSize = toFloat ? 4 : 2;
>+    const size_t componentCount      = 4;
>+
>+    const uint32_t rgbMask  = 0x3FF;  // 1 set in bits 0 through 9
>+    const size_t redShift   = 0;      // red is bits 0 through 9
>+    const size_t greenShift = 10;     // green is bits 10 through 19
>+    const size_t blueShift  = 20;     // blue is bits 20 through 29
>+
>+    const uint32_t alphaMask = 0x3;  // 1 set in bits 0 and 1
>+    const size_t alphaShift  = 30;   // Alpha is the 30 and 31 bits
>+
>+    for (size_t i = 0; i < count; i++)
>+    {
>+        GLuint packedValue    = *reinterpret_cast<const GLuint *>(input + (i * stride));
>+        uint8_t *offsetOutput = output + (i * outputComponentSize * componentCount);
>+
>+        priv::CopyPackedRGB<isSigned, normalized, toFloat>(
>+            (packedValue >> redShift) & rgbMask, offsetOutput + (0 * outputComponentSize));
>+        priv::CopyPackedRGB<isSigned, normalized, toFloat>(
>+            (packedValue >> greenShift) & rgbMask, offsetOutput + (1 * outputComponentSize));
>+        priv::CopyPackedRGB<isSigned, normalized, toFloat>(
>+            (packedValue >> blueShift) & rgbMask, offsetOutput + (2 * outputComponentSize));
>+        priv::CopyPackedAlpha<isSigned, normalized, toFloat>(
>+            (packedValue >> alphaShift) & alphaMask, offsetOutput + (3 * outputComponentSize));
>+    }
>+}
>+
>+}  // namespace rx
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/BufferD3D.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/BufferD3D.cpp
>index 7769ab2b75e..464bd6d4a83 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/BufferD3D.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/BufferD3D.cpp
>@@ -11,8 +11,8 @@
> #include "common/mathutil.h"
> #include "common/utilities.h"
> #include "libANGLE/renderer/d3d/IndexBuffer.h"
>-#include "libANGLE/renderer/d3d/VertexBuffer.h"
> #include "libANGLE/renderer/d3d/RendererD3D.h"
>+#include "libANGLE/renderer/d3d/VertexBuffer.h"
> 
> namespace rx
> {
>@@ -54,16 +54,16 @@ void BufferD3D::updateD3DBufferUsage(const gl::Context *context, gl::BufferUsage
>         case gl::BufferUsage::StaticCopy:
>         case gl::BufferUsage::StaticDraw:
>         case gl::BufferUsage::StaticRead:
>+        case gl::BufferUsage::DynamicCopy:
>+        case gl::BufferUsage::DynamicRead:
>+        case gl::BufferUsage::StreamCopy:
>+        case gl::BufferUsage::StreamRead:
>             mUsage = D3DBufferUsage::STATIC;
>             initializeStaticData(context);
>             break;
> 
>-        case gl::BufferUsage::DynamicCopy:
>         case gl::BufferUsage::DynamicDraw:
>-        case gl::BufferUsage::DynamicRead:
>-        case gl::BufferUsage::StreamCopy:
>         case gl::BufferUsage::StreamDraw:
>-        case gl::BufferUsage::StreamRead:
>             mUsage = D3DBufferUsage::DYNAMIC;
>             break;
>         default:
>@@ -160,10 +160,11 @@ void BufferD3D::invalidateStaticData(const gl::Context *context)
> }
> 
> // Creates static buffers if sufficient used data has been left unmodified
>-void BufferD3D::promoteStaticUsage(const gl::Context *context, int dataSize)
>+void BufferD3D::promoteStaticUsage(const gl::Context *context, size_t dataSize)
> {
>     if (mUsage == D3DBufferUsage::DYNAMIC)
>     {
>+        // Note: This is not a safe math operation. 'dataSize' can come from the app.
>         mUnmodifiedDataUse += dataSize;
> 
>         if (mUnmodifiedDataUse > 3 * getSize())
>@@ -173,18 +174,18 @@ void BufferD3D::promoteStaticUsage(const gl::Context *context, int dataSize)
>     }
> }
> 
>-gl::Error BufferD3D::getIndexRange(const gl::Context *context,
>-                                   GLenum type,
>-                                   size_t offset,
>-                                   size_t count,
>-                                   bool primitiveRestartEnabled,
>-                                   gl::IndexRange *outRange)
>+angle::Result BufferD3D::getIndexRange(const gl::Context *context,
>+                                       gl::DrawElementsType type,
>+                                       size_t offset,
>+                                       size_t count,
>+                                       bool primitiveRestartEnabled,
>+                                       gl::IndexRange *outRange)
> {
>     const uint8_t *data = nullptr;
>     ANGLE_TRY(getData(context, &data));
> 
>     *outRange = gl::ComputeIndexRange(type, data + offset, count, primitiveRestartEnabled);
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
> }  // namespace rx
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/BufferD3D.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/BufferD3D.h
>index 60153748e68..19ea78c6ebb 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/BufferD3D.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/BufferD3D.h
>@@ -19,7 +19,7 @@ namespace gl
> {
> struct VertexAttribute;
> class VertexBinding;
>-}
>+}  // namespace gl
> 
> namespace rx
> {
>@@ -41,10 +41,10 @@ class BufferD3D : public BufferImpl
> 
>     unsigned int getSerial() const { return mSerial; }
> 
>-    virtual size_t getSize() const = 0;
>-    virtual bool supportsDirectBinding() const = 0;
>-    virtual gl::Error markTransformFeedbackUsage(const gl::Context *context) = 0;
>-    virtual gl::Error getData(const gl::Context *context, const uint8_t **outData) = 0;
>+    virtual size_t getSize() const                                                     = 0;
>+    virtual bool supportsDirectBinding() const                                         = 0;
>+    virtual angle::Result markTransformFeedbackUsage(const gl::Context *context)       = 0;
>+    virtual angle::Result getData(const gl::Context *context, const uint8_t **outData) = 0;
> 
>     // Warning: you should ensure binding really matches attrib.bindingIndex before using this
>     // function.
>@@ -55,14 +55,14 @@ class BufferD3D : public BufferImpl
>     virtual void initializeStaticData(const gl::Context *context);
>     virtual void invalidateStaticData(const gl::Context *context);
> 
>-    void promoteStaticUsage(const gl::Context *context, int dataSize);
>+    void promoteStaticUsage(const gl::Context *context, size_t dataSize);
> 
>-    gl::Error getIndexRange(const gl::Context *context,
>-                            GLenum type,
>-                            size_t offset,
>-                            size_t count,
>-                            bool primitiveRestartEnabled,
>-                            gl::IndexRange *outRange) override;
>+    angle::Result getIndexRange(const gl::Context *context,
>+                                gl::DrawElementsType type,
>+                                size_t offset,
>+                                size_t count,
>+                                bool primitiveRestartEnabled,
>+                                gl::IndexRange *outRange) override;
> 
>     BufferFactoryD3D *getFactory() const { return mFactory; }
>     D3DBufferUsage getUsage() const { return mUsage; }
>@@ -80,10 +80,10 @@ class BufferD3D : public BufferImpl
>     StaticIndexBufferInterface *mStaticIndexBuffer;
>     unsigned int mStaticBufferCacheTotalSize;
>     unsigned int mStaticVertexBufferOutOfDate;
>-    unsigned int mUnmodifiedDataUse;
>+    size_t mUnmodifiedDataUse;
>     D3DBufferUsage mUsage;
> };
> 
>-}
>+}  // namespace rx
> 
>-#endif // LIBANGLE_RENDERER_D3D_BUFFERD3D_H_
>+#endif  // LIBANGLE_RENDERER_D3D_BUFFERD3D_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/CompilerD3D.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/CompilerD3D.cpp
>index 8ceeec3c39a..4656cf4d804 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/CompilerD3D.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/CompilerD3D.cpp
>@@ -14,13 +14,7 @@ namespace rx
> 
> CompilerD3D::CompilerD3D(ShShaderOutput translatorOutputType)
>     : mTranslatorOutputType(translatorOutputType)
>-{
>-}
>-
>-gl::Error CompilerD3D::release()
>-{
>-    return gl::NoError();
>-}
>+{}
> 
> ShShaderOutput CompilerD3D::getTranslatorOutputType() const
> {
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/CompilerD3D.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/CompilerD3D.h
>index bcfe810d04c..bc4ad267b89 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/CompilerD3D.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/CompilerD3D.h
>@@ -21,13 +21,12 @@ class CompilerD3D : public CompilerImpl
>     CompilerD3D(ShShaderOutput translatorOutputType);
>     ~CompilerD3D() override {}
> 
>-    gl::Error release() override;
>     ShShaderOutput getTranslatorOutputType() const override;
> 
>   private:
>     ShShaderOutput mTranslatorOutputType;
> };
> 
>-}
>+}  // namespace rx
> 
>-#endif // LIBANGLE_RENDERER_COMPILERD3D_H_
>+#endif  // LIBANGLE_RENDERER_COMPILERD3D_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/ContextD3D.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/ContextD3D.h
>new file mode 100644
>index 00000000000..d563672e678
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/ContextD3D.h
>@@ -0,0 +1,24 @@
>+//
>+// Copyright 2018 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// ContextD3D: Shared common class for Context9 and Context11.
>+
>+#ifndef LIBANGLE_RENDERER_CONTEXTD3D_H_
>+#define LIBANGLE_RENDERER_CONTEXTD3D_H_
>+
>+#include "libANGLE/renderer/ContextImpl.h"
>+#include "libANGLE/renderer/d3d/RendererD3D.h"
>+
>+namespace rx
>+{
>+class ContextD3D : public ContextImpl, public d3d::Context
>+{
>+  public:
>+    ContextD3D(const gl::State &state, gl::ErrorSet *errorSet) : ContextImpl(state, errorSet) {}
>+    ~ContextD3D() override {}
>+};
>+}  // namespace rx
>+
>+#endif  // LIBANGLE_RENDERER_CONTEXTD3D_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/DeviceD3D.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/DeviceD3D.cpp
>index 5a06b15279c..ba5cf532d45 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/DeviceD3D.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/DeviceD3D.cpp
>@@ -17,18 +17,17 @@
> namespace rx
> {
> 
>-DeviceD3D::DeviceD3D()
>-    : mDevice(0), mDeviceType(0), mDeviceExternallySourced(false), mIsInitialized(false)
>-{
>-}
>+DeviceD3D::DeviceD3D(GLint deviceType, void *nativeDevice)
>+    : mDevice(nativeDevice), mDeviceType(deviceType), mIsInitialized(false)
>+{}
> 
> DeviceD3D::~DeviceD3D()
> {
> #if defined(ANGLE_ENABLE_D3D11)
>-    if (mDeviceType == EGL_D3D11_DEVICE_ANGLE)
>+    if (mIsInitialized && mDeviceType == EGL_D3D11_DEVICE_ANGLE)
>     {
>         // DeviceD3D holds a ref to an externally-sourced D3D11 device. We must release it.
>-        ID3D11Device *device = reinterpret_cast<ID3D11Device *>(mDevice);
>+        ID3D11Device *device = static_cast<ID3D11Device *>(mDevice);
>         device->Release();
>     }
> #endif
>@@ -36,31 +35,20 @@ DeviceD3D::~DeviceD3D()
> 
> egl::Error DeviceD3D::getDevice(void **outValue)
> {
>-    if (!mIsInitialized)
>-    {
>-        *outValue = nullptr;
>-        return egl::EglBadDevice();
>-    }
>-
>+    ASSERT(mIsInitialized);
>     *outValue = mDevice;
>     return egl::NoError();
> }
> 
>-egl::Error DeviceD3D::initialize(void *device,
>-                                 EGLint deviceType,
>-                                 EGLBoolean deviceExternallySourced)
>+egl::Error DeviceD3D::initialize()
> {
>     ASSERT(!mIsInitialized);
>-    if (mIsInitialized)
>-    {
>-        return egl::EglBadDevice();
>-    }
> 
> #if defined(ANGLE_ENABLE_D3D11)
>-    if (deviceType == EGL_D3D11_DEVICE_ANGLE)
>+    if (mDeviceType == EGL_D3D11_DEVICE_ANGLE)
>     {
>         // Validate the device
>-        IUnknown *iunknown = reinterpret_cast<IUnknown *>(device);
>+        IUnknown *iunknown = static_cast<IUnknown *>(mDevice);
> 
>         ID3D11Device *d3dDevice = nullptr;
>         HRESULT hr =
>@@ -74,16 +62,9 @@ egl::Error DeviceD3D::initialize(void *device,
>         // Deliberately don't release the ref here, so that the DeviceD3D holds a ref to the
>         // D3D11 device.
>     }
>-    else
> #endif
>-    {
>-        ASSERT(deviceExternallySourced == EGL_FALSE);
>-    }
> 
>-    mDevice                  = device;
>-    mDeviceType              = deviceType;
>-    mDeviceExternallySourced = !!deviceExternallySourced;
>-    mIsInitialized           = true;
>+    mIsInitialized = true;
> 
>     return egl::NoError();
> }
>@@ -98,8 +79,4 @@ void DeviceD3D::generateExtensions(egl::DeviceExtensions *outExtensions) const
>     outExtensions->deviceD3D = true;
> }
> 
>-bool DeviceD3D::deviceExternallySourced()
>-{
>-    return mDeviceExternallySourced;
>-}
>-}
>+}  // namespace rx
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/DeviceD3D.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/DeviceD3D.h
>index 15eaf9210ae..7c0ceb732ba 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/DeviceD3D.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/DeviceD3D.h
>@@ -18,22 +18,20 @@ namespace rx
> class DeviceD3D : public DeviceImpl
> {
>   public:
>-    DeviceD3D();
>+    DeviceD3D(EGLint deviceType, void *nativeDevice);
>     ~DeviceD3D() override;
> 
>-    egl::Error initialize(void *device, EGLint deviceType, EGLBoolean external);
>+    egl::Error initialize() override;
>     egl::Error getDevice(void **outValue) override;
>     EGLint getType() override;
>     void generateExtensions(egl::DeviceExtensions *outExtensions) const override;
>-    bool deviceExternallySourced() override;
> 
>   private:
>     void *mDevice;
>     EGLint mDeviceType;
>-    bool mDeviceExternallySourced;
>     bool mIsInitialized;
> };
> 
>-}
>+}  // namespace rx
> 
>-#endif // LIBANGLE_RENDERER_D3D_DEVICED3D_H_
>+#endif  // LIBANGLE_RENDERER_D3D_DEVICED3D_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/DisplayD3D.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/DisplayD3D.cpp
>index 0edda9c5845..de60dfff9af 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/DisplayD3D.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/DisplayD3D.cpp
>@@ -22,23 +22,23 @@
> #include "libANGLE/renderer/d3d/SurfaceD3D.h"
> #include "libANGLE/renderer/d3d/SwapChainD3D.h"
> 
>-#if defined (ANGLE_ENABLE_D3D9)
>-#   include "libANGLE/renderer/d3d/d3d9/Renderer9.h"
>-#endif // ANGLE_ENABLE_D3D9
>+#if defined(ANGLE_ENABLE_D3D9)
>+#    include "libANGLE/renderer/d3d/d3d9/Renderer9.h"
>+#endif  // ANGLE_ENABLE_D3D9
> 
>-#if defined (ANGLE_ENABLE_D3D11)
>-#   include "libANGLE/renderer/d3d/d3d11/Renderer11.h"
>-#endif // ANGLE_ENABLE_D3D11
>+#if defined(ANGLE_ENABLE_D3D11)
>+#    include "libANGLE/renderer/d3d/d3d11/Renderer11.h"
>+#endif  // ANGLE_ENABLE_D3D11
> 
> #if !defined(ANGLE_DEFAULT_D3D11)
> // Enables use of the Direct3D 11 API for a default display, when available
>-#   define ANGLE_DEFAULT_D3D11 1
>+#    define ANGLE_DEFAULT_D3D11 1
> #endif
> 
> namespace rx
> {
> 
>-typedef RendererD3D *(*CreateRendererD3DFunction)(egl::Display*);
>+typedef RendererD3D *(*CreateRendererD3DFunction)(egl::Display *);
> 
> template <typename RendererType>
> static RendererD3D *CreateTypedRendererD3D(egl::Display *display)
>@@ -60,44 +60,44 @@ egl::Error CreateRendererD3D(egl::Display *display, RendererD3D **outRenderer)
>         EGLint requestedDisplayType = static_cast<EGLint>(
>             attribMap.get(EGL_PLATFORM_ANGLE_TYPE_ANGLE, EGL_PLATFORM_ANGLE_TYPE_DEFAULT_ANGLE));
> 
>-#   if defined(ANGLE_ENABLE_D3D11)
>+#if defined(ANGLE_ENABLE_D3D11)
>         if (nativeDisplay == EGL_D3D11_ELSE_D3D9_DISPLAY_ANGLE ||
>             nativeDisplay == EGL_D3D11_ONLY_DISPLAY_ANGLE ||
>             requestedDisplayType == EGL_PLATFORM_ANGLE_TYPE_D3D11_ANGLE)
>         {
>             rendererCreationFunctions.push_back(CreateTypedRendererD3D<Renderer11>);
>         }
>-#   endif
>+#endif
> 
>-#   if defined(ANGLE_ENABLE_D3D9)
>+#if defined(ANGLE_ENABLE_D3D9)
>         if (nativeDisplay == EGL_D3D11_ELSE_D3D9_DISPLAY_ANGLE ||
>             requestedDisplayType == EGL_PLATFORM_ANGLE_TYPE_D3D9_ANGLE)
>         {
>             rendererCreationFunctions.push_back(CreateTypedRendererD3D<Renderer9>);
>         }
>-#   endif
>+#endif
> 
>         if (nativeDisplay != EGL_D3D11_ELSE_D3D9_DISPLAY_ANGLE &&
>             nativeDisplay != EGL_D3D11_ONLY_DISPLAY_ANGLE &&
>             requestedDisplayType == EGL_PLATFORM_ANGLE_TYPE_DEFAULT_ANGLE)
>         {
>-        // The default display is requested, try the D3D9 and D3D11 renderers, order them using
>-        // the definition of ANGLE_DEFAULT_D3D11
>-#       if ANGLE_DEFAULT_D3D11
>-#           if defined(ANGLE_ENABLE_D3D11)
>+            // The default display is requested, try the D3D9 and D3D11 renderers, order them using
>+            // the definition of ANGLE_DEFAULT_D3D11
>+#if ANGLE_DEFAULT_D3D11
>+#    if defined(ANGLE_ENABLE_D3D11)
>             rendererCreationFunctions.push_back(CreateTypedRendererD3D<Renderer11>);
>-#           endif
>-#           if defined(ANGLE_ENABLE_D3D9)
>+#    endif
>+#    if defined(ANGLE_ENABLE_D3D9)
>             rendererCreationFunctions.push_back(CreateTypedRendererD3D<Renderer9>);
>-#           endif
>-#       else
>-#           if defined(ANGLE_ENABLE_D3D9)
>+#    endif
>+#else
>+#    if defined(ANGLE_ENABLE_D3D9)
>             rendererCreationFunctions.push_back(CreateTypedRendererD3D<Renderer9>);
>-#           endif
>-#           if defined(ANGLE_ENABLE_D3D11)
>+#    endif
>+#    if defined(ANGLE_ENABLE_D3D11)
>             rendererCreationFunctions.push_back(CreateTypedRendererD3D<Renderer11>);
>-#           endif
>-#       endif
>+#    endif
>+#endif
>         }
>     }
>     else if (display->getPlatform() == EGL_PLATFORM_DEVICE_EXT)
>@@ -119,25 +119,23 @@ egl::Error CreateRendererD3D(egl::Display *display, RendererD3D **outRenderer)
>         RendererD3D *renderer = rendererCreationFunctions[i](display);
>         egl::Error result     = renderer->initialize();
> 
>-#       if defined(ANGLE_ENABLE_D3D11)
>-            if (renderer->getRendererClass() == RENDERER_D3D11)
>-            {
>-                ASSERT(result.getID() >= 0 && result.getID() < NUM_D3D11_INIT_ERRORS);
>-                ANGLE_HISTOGRAM_ENUMERATION("GPU.ANGLE.D3D11InitializeResult",
>-                                            result.getID(),
>-                                            NUM_D3D11_INIT_ERRORS);
>-            }
>-#       endif
>-
>-#       if defined(ANGLE_ENABLE_D3D9)
>-            if (renderer->getRendererClass() == RENDERER_D3D9)
>-            {
>-                ASSERT(result.getID() >= 0 && result.getID() < NUM_D3D9_INIT_ERRORS);
>-                ANGLE_HISTOGRAM_ENUMERATION("GPU.ANGLE.D3D9InitializeResult",
>-                                            result.getID(),
>-                                            NUM_D3D9_INIT_ERRORS);
>-            }
>-#       endif
>+#if defined(ANGLE_ENABLE_D3D11)
>+        if (renderer->getRendererClass() == RENDERER_D3D11)
>+        {
>+            ASSERT(result.getID() >= 0 && result.getID() < NUM_D3D11_INIT_ERRORS);
>+            ANGLE_HISTOGRAM_ENUMERATION("GPU.ANGLE.D3D11InitializeResult", result.getID(),
>+                                        NUM_D3D11_INIT_ERRORS);
>+        }
>+#endif
>+
>+#if defined(ANGLE_ENABLE_D3D9)
>+        if (renderer->getRendererClass() == RENDERER_D3D9)
>+        {
>+            ASSERT(result.getID() >= 0 && result.getID() < NUM_D3D9_INIT_ERRORS);
>+            ANGLE_HISTOGRAM_ENUMERATION("GPU.ANGLE.D3D9InitializeResult", result.getID(),
>+                                        NUM_D3D9_INIT_ERRORS);
>+        }
>+#endif
> 
>         if (!result.isError())
>         {
>@@ -152,9 +150,7 @@ egl::Error CreateRendererD3D(egl::Display *display, RendererD3D **outRenderer)
>     return egl::EglNotInitialized() << "No available renderers.";
> }
> 
>-DisplayD3D::DisplayD3D(const egl::DisplayState &state) : DisplayImpl(state), mRenderer(nullptr)
>-{
>-}
>+DisplayD3D::DisplayD3D(const egl::DisplayState &state) : DisplayImpl(state), mRenderer(nullptr) {}
> 
> SurfaceImpl *DisplayD3D::createWindowSurface(const egl::SurfaceState &state,
>                                              EGLNativeWindowType window,
>@@ -189,32 +185,39 @@ SurfaceImpl *DisplayD3D::createPixmapSurface(const egl::SurfaceState &state,
> }
> 
> ImageImpl *DisplayD3D::createImage(const egl::ImageState &state,
>+                                   const gl::Context *context,
>                                    EGLenum target,
>                                    const egl::AttributeMap &attribs)
> {
>     return new EGLImageD3D(state, target, attribs, mRenderer);
> }
> 
>-egl::Error DisplayD3D::getDevice(DeviceImpl **device)
>+DeviceImpl *DisplayD3D::createDevice()
> {
>-    return mRenderer->getEGLDevice(device);
>+    return mRenderer->createEGLDevice();
> }
> 
>-ContextImpl *DisplayD3D::createContext(const gl::ContextState &state)
>+rx::ContextImpl *DisplayD3D::createContext(const gl::State &state,
>+                                           gl::ErrorSet *errorSet,
>+                                           const egl::Config *configuration,
>+                                           const gl::Context *shareContext,
>+                                           const egl::AttributeMap &attribs)
> {
>     ASSERT(mRenderer != nullptr);
>-    return mRenderer->createContext(state);
>+    return mRenderer->createContext(state, errorSet);
> }
> 
>-StreamProducerImpl *DisplayD3D::createStreamProducerD3DTextureNV12(
>+StreamProducerImpl *DisplayD3D::createStreamProducerD3DTexture(
>     egl::Stream::ConsumerType consumerType,
>     const egl::AttributeMap &attribs)
> {
>     ASSERT(mRenderer != nullptr);
>-    return mRenderer->createStreamProducerD3DTextureNV12(consumerType, attribs);
>+    return mRenderer->createStreamProducerD3DTexture(consumerType, attribs);
> }
> 
>-egl::Error DisplayD3D::makeCurrent(egl::Surface *drawSurface, egl::Surface *readSurface, gl::Context *context)
>+egl::Error DisplayD3D::makeCurrent(egl::Surface *drawSurface,
>+                                   egl::Surface *readSurface,
>+                                   gl::Context *context)
> {
>     return egl::NoError();
> }
>@@ -249,10 +252,7 @@ egl::Error DisplayD3D::restoreLostDevice(const egl::Display *display)
>     // Release surface resources to make the Reset() succeed
>     for (egl::Surface *surface : mState.surfaceSet)
>     {
>-        if (surface->getBoundTexture())
>-        {
>-            ANGLE_TRY(surface->releaseTexImage(display->getProxyContext(), EGL_BACK_BUFFER));
>-        }
>+        ASSERT(!surface->getBoundTexture());
>         SurfaceD3D *surfaceD3D = GetImplAs<SurfaceD3D>(surface);
>         surfaceD3D->releaseSwapChain();
>     }
>@@ -322,18 +322,18 @@ void DisplayD3D::generateCaps(egl::Caps *outCaps) const
>     outCaps->textureNPOT = mRenderer->getNativeExtensions().textureNPOT;
> }
> 
>-egl::Error DisplayD3D::waitClient(const gl::Context *context) const
>+egl::Error DisplayD3D::waitClient(const gl::Context *context)
> {
>     for (egl::Surface *surface : mState.surfaceSet)
>     {
>         SurfaceD3D *surfaceD3D = GetImplAs<SurfaceD3D>(surface);
>-        ANGLE_TRY(surfaceD3D->checkForOutOfDateSwapChain(context));
>+        ANGLE_TRY(surfaceD3D->checkForOutOfDateSwapChain(this));
>     }
> 
>     return egl::NoError();
> }
> 
>-egl::Error DisplayD3D::waitNative(const gl::Context *context, EGLint engine) const
>+egl::Error DisplayD3D::waitNative(const gl::Context *context, EGLint engine)
> {
>     egl::Surface *drawSurface = context->getCurrentDrawSurface();
>     egl::Surface *readSurface = context->getCurrentReadSurface();
>@@ -341,13 +341,13 @@ egl::Error DisplayD3D::waitNative(const gl::Context *context, EGLint engine) con
>     if (drawSurface != nullptr)
>     {
>         SurfaceD3D *drawSurfaceD3D = GetImplAs<SurfaceD3D>(drawSurface);
>-        ANGLE_TRY(drawSurfaceD3D->checkForOutOfDateSwapChain(context));
>+        ANGLE_TRY(drawSurfaceD3D->checkForOutOfDateSwapChain(this));
>     }
> 
>     if (readSurface != nullptr)
>     {
>         SurfaceD3D *readSurfaceD3D = GetImplAs<SurfaceD3D>(readSurface);
>-        ANGLE_TRY(readSurfaceD3D->checkForOutOfDateSwapChain(context));
>+        ANGLE_TRY(readSurfaceD3D->checkForOutOfDateSwapChain(this));
>     }
> 
>     return egl::NoError();
>@@ -358,4 +358,18 @@ gl::Version DisplayD3D::getMaxSupportedESVersion() const
>     return mRenderer->getMaxSupportedESVersion();
> }
> 
>+void DisplayD3D::handleResult(HRESULT hr,
>+                              const char *message,
>+                              const char *file,
>+                              const char *function,
>+                              unsigned int line)
>+{
>+    ASSERT(FAILED(hr));
>+
>+    std::stringstream errorStream;
>+    errorStream << "Internal D3D11 error: " << gl::FmtHR(hr) << ", in " << file << ", " << function
>+                << ":" << line << ". " << message;
>+
>+    mStoredErrorString = errorStream.str();
>+}
> }  // namespace rx
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/DisplayD3D.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/DisplayD3D.h
>index 70905223123..0b6d65abbd5 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/DisplayD3D.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/DisplayD3D.h
>@@ -9,14 +9,14 @@
> #ifndef LIBANGLE_RENDERER_D3D_DISPLAYD3D_H_
> #define LIBANGLE_RENDERER_D3D_DISPLAYD3D_H_
> 
>-#include "libANGLE/renderer/DisplayImpl.h"
> #include "libANGLE/Device.h"
>+#include "libANGLE/renderer/DisplayImpl.h"
>+
>+#include "libANGLE/renderer/d3d/RendererD3D.h"
> 
> namespace rx
> {
>-class RendererD3D;
>-
>-class DisplayD3D : public DisplayImpl
>+class DisplayD3D : public DisplayImpl, public d3d::Context
> {
>   public:
>     DisplayD3D(const egl::DisplayState &state);
>@@ -39,16 +39,22 @@ class DisplayD3D : public DisplayImpl
>                                      const egl::AttributeMap &attribs) override;
> 
>     ImageImpl *createImage(const egl::ImageState &state,
>+                           const gl::Context *context,
>                            EGLenum target,
>                            const egl::AttributeMap &attribs) override;
> 
>-    ContextImpl *createContext(const gl::ContextState &state) override;
>+    ContextImpl *createContext(const gl::State &state,
>+                               gl::ErrorSet *errorSet,
>+                               const egl::Config *configuration,
>+                               const gl::Context *shareContext,
>+                               const egl::AttributeMap &attribs) override;
> 
>-    StreamProducerImpl *createStreamProducerD3DTextureNV12(
>-        egl::Stream::ConsumerType consumerType,
>-        const egl::AttributeMap &attribs) override;
>+    StreamProducerImpl *createStreamProducerD3DTexture(egl::Stream::ConsumerType consumerType,
>+                                                       const egl::AttributeMap &attribs) override;
> 
>-    egl::Error makeCurrent(egl::Surface *drawSurface, egl::Surface *readSurface, gl::Context *context) override;
>+    egl::Error makeCurrent(egl::Surface *drawSurface,
>+                           egl::Surface *readSurface,
>+                           gl::Context *context) override;
> 
>     egl::ConfigSet generateConfigs() override;
> 
>@@ -61,14 +67,22 @@ class DisplayD3D : public DisplayImpl
>                                     EGLClientBuffer clientBuffer,
>                                     const egl::AttributeMap &attribs) const override;
> 
>-    egl::Error getDevice(DeviceImpl **device) override;
>+    DeviceImpl *createDevice() override;
> 
>     std::string getVendorString() const override;
> 
>-    egl::Error waitClient(const gl::Context *context) const override;
>-    egl::Error waitNative(const gl::Context *context, EGLint engine) const override;
>+    egl::Error waitClient(const gl::Context *context) override;
>+    egl::Error waitNative(const gl::Context *context, EGLint engine) override;
>     gl::Version getMaxSupportedESVersion() const override;
> 
>+    void handleResult(HRESULT hr,
>+                      const char *message,
>+                      const char *file,
>+                      const char *function,
>+                      unsigned int line) override;
>+
>+    const std::string &getStoredErrorString() const { return mStoredErrorString; }
>+
>   private:
>     void generateExtensions(egl::DisplayExtensions *outExtensions) const override;
>     void generateCaps(egl::Caps *outCaps) const override;
>@@ -76,8 +90,9 @@ class DisplayD3D : public DisplayImpl
>     egl::Display *mDisplay;
> 
>     rx::RendererD3D *mRenderer;
>+    std::string mStoredErrorString;
> };
> 
>-}
>+}  // namespace rx
> 
>-#endif // LIBANGLE_RENDERER_D3D_DISPLAYD3D_H_
>+#endif  // LIBANGLE_RENDERER_D3D_DISPLAYD3D_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/DynamicHLSL.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/DynamicHLSL.cpp
>index b4143a3f5f9..51f766b5f84 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/DynamicHLSL.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/DynamicHLSL.cpp
>@@ -28,27 +28,6 @@ namespace rx
> namespace
> {
> 
>-// This class needs to match OutputHLSL::decorate
>-class DecorateVariable final : angle::NonCopyable
>-{
>-  public:
>-    explicit DecorateVariable(const std::string &str) : mName(str) {}
>-    const std::string &getName() const { return mName; }
>-
>-  private:
>-    const std::string &mName;
>-};
>-
>-std::ostream &operator<<(std::ostream &o, const DecorateVariable &dv)
>-{
>-    if (dv.getName().compare(0, 3, "gl_") != 0)
>-    {
>-        o << "_";
>-    }
>-    o << dv.getName();
>-    return o;
>-}
>-
> const char *HLSLComponentTypeString(GLenum componentType)
> {
>     switch (componentType)
>@@ -145,8 +124,11 @@ void WriteArrayString(std::ostringstream &strstr, unsigned int i)
>     strstr << "]";
> }
> 
>-constexpr const char *VERTEX_ATTRIBUTE_STUB_STRING = "@@ VERTEX ATTRIBUTES @@";
>-constexpr const char *PIXEL_OUTPUT_STUB_STRING     = "@@ PIXEL OUTPUT @@";
>+constexpr const char *VERTEX_ATTRIBUTE_STUB_STRING      = "@@ VERTEX ATTRIBUTES @@";
>+constexpr const char *VERTEX_OUTPUT_STUB_STRING         = "@@ VERTEX OUTPUT @@";
>+constexpr const char *PIXEL_OUTPUT_STUB_STRING          = "@@ PIXEL OUTPUT @@";
>+constexpr const char *PIXEL_MAIN_PARAMETERS_STUB_STRING = "@@ PIXEL MAIN PARAMETERS @@";
>+constexpr const char *MAIN_PROLOGUE_STUB_STRING         = "@@ MAIN PROLOGUE @@";
> }  // anonymous namespace
> 
> // BuiltinInfo implementation
>@@ -156,9 +138,7 @@ BuiltinInfo::~BuiltinInfo() = default;
> 
> // DynamicHLSL implementation
> 
>-DynamicHLSL::DynamicHLSL(RendererD3D *const renderer) : mRenderer(renderer)
>-{
>-}
>+DynamicHLSL::DynamicHLSL(RendererD3D *const renderer) : mRenderer(renderer) {}
> 
> std::string DynamicHLSL::generateVertexShaderForInputLayout(
>     const std::string &sourceShader,
>@@ -201,8 +181,8 @@ std::string DynamicHLSL::generateVertexShaderForInputLayout(
>         if (!shaderAttribute.name.empty())
>         {
>             ASSERT(inputIndex < MAX_VERTEX_ATTRIBS);
>-            VertexFormatType vertexFormatType =
>-                inputIndex < inputLayout.size() ? inputLayout[inputIndex] : VERTEX_FORMAT_INVALID;
>+            angle::FormatID vertexFormatID =
>+                inputIndex < inputLayout.size() ? inputLayout[inputIndex] : angle::FormatID::NONE;
> 
>             // HLSL code for input structure
>             if (IsMatrixType(shaderAttribute.type))
>@@ -213,7 +193,7 @@ std::string DynamicHLSL::generateVertexShaderForInputLayout(
>             }
>             else
>             {
>-                GLenum componentType = mRenderer->getVertexComponentType(vertexFormatType);
>+                GLenum componentType = mRenderer->getVertexComponentType(vertexFormatID);
> 
>                 if (shaderAttribute.name == "gl_InstanceID" ||
>                     shaderAttribute.name == "gl_VertexID")
>@@ -255,15 +235,21 @@ std::string DynamicHLSL::generateVertexShaderForInputLayout(
>             // data reinterpretation (eg for pure integer->float, float->pure integer)
>             // TODO: issue warning with gl debug info extension, when supported
>             if (IsMatrixType(shaderAttribute.type) ||
>-                (mRenderer->getVertexConversionType(vertexFormatType) & VERTEX_CONVERT_GPU) != 0)
>+                (mRenderer->getVertexConversionType(vertexFormatID) & VERTEX_CONVERT_GPU) != 0)
>             {
>-                GenerateAttributeConversionHLSL(vertexFormatType, shaderAttribute, initStream);
>+                GenerateAttributeConversionHLSL(vertexFormatID, shaderAttribute, initStream);
>             }
>             else
>             {
>                 initStream << "input." << DecorateVariable(shaderAttribute.name);
>             }
> 
>+            if (shaderAttribute.name == "gl_VertexID")
>+            {
>+                // dx_VertexID contains the firstVertex offset
>+                initStream << " + dx_VertexID";
>+            }
>+
>             initStream << ";\n";
> 
>             inputIndex += VariableRowCount(TransposeMatrixType(shaderAttribute.type));
>@@ -350,8 +336,9 @@ std::string DynamicHLSL::generatePixelShaderForOutputSignature(
>                          "PS_OUTPUT generateOutput()\n"
>                          "{\n"
>                          "    PS_OUTPUT output;\n"
>-                      << copyStream.str() << "    return output;\n"
>-                                             "}\n";
>+                      << copyStream.str()
>+                      << "    return output;\n"
>+                         "}\n";
> 
>     std::string pixelHLSL(sourceShader);
> 
>@@ -362,6 +349,25 @@ std::string DynamicHLSL::generatePixelShaderForOutputSignature(
>     return pixelHLSL;
> }
> 
>+std::string DynamicHLSL::generateComputeShaderForImage2DBindSignature(
>+    const d3d::Context *context,
>+    ProgramD3D &programD3D,
>+    const gl::ProgramState &programData,
>+    std::vector<sh::Uniform> &image2DUniforms,
>+    const gl::ImageUnitTextureTypeMap &image2DBindLayout) const
>+{
>+    std::string computeHLSL(
>+        programData.getAttachedShader(ShaderType::Compute)->getTranslatedSource());
>+
>+    if (image2DUniforms.empty())
>+    {
>+        return computeHLSL;
>+    }
>+
>+    return GenerateComputeShaderForImage2DBindSignature(context, programD3D, programData,
>+                                                        image2DUniforms, image2DBindLayout);
>+}
>+
> void DynamicHLSL::generateVaryingLinkHLSL(const VaryingPacking &varyingPacking,
>                                           const BuiltinInfo &builtins,
>                                           bool programUsesPointSize,
>@@ -397,23 +403,14 @@ void DynamicHLSL::generateVaryingLinkHLSL(const VaryingPacking &varyingPacking,
>                    << ";\n";
>     }
> 
>-    if (builtins.glViewportIndex.enabled)
>-    {
>-        hlslStream << "    nointerpolation uint gl_ViewportIndex : "
>-                   << builtins.glViewportIndex.str() << ";\n";
>-    }
>-
>-    if (builtins.glLayer.enabled)
>-    {
>-        hlslStream << "    nointerpolation uint gl_Layer : " << builtins.glLayer.str() << ";\n";
>-    }
>-
>     std::string varyingSemantic =
>         GetVaryingSemantic(mRenderer->getMajorShaderModel(), programUsesPointSize);
> 
>-    for (const PackedVaryingRegister &registerInfo : varyingPacking.getRegisterList())
>+    const auto &registerInfos = varyingPacking.getRegisterList();
>+    for (GLuint registerIndex = 0u; registerIndex < registerInfos.size(); ++registerIndex)
>     {
>-        const auto &varying = *registerInfo.packedVarying->varying;
>+        const PackedVaryingRegister &registerInfo = registerInfos[registerIndex];
>+        const auto &varying                       = *registerInfo.packedVarying->varying;
>         ASSERT(!varying.isStruct());
> 
>         // TODO: Add checks to ensure D3D interpolation modifiers don't result in too many
>@@ -442,28 +439,42 @@ void DynamicHLSL::generateVaryingLinkHLSL(const VaryingPacking &varyingPacking,
>         GLenum componentType  = gl::VariableComponentType(transposedType);
>         int columnCount       = gl::VariableColumnCount(transposedType);
>         HLSLComponentTypeString(hlslStream, componentType, columnCount);
>-        unsigned int semanticIndex = registerInfo.semanticIndex;
>-        hlslStream << " v" << semanticIndex << " : " << varyingSemantic << semanticIndex << ";\n";
>+        hlslStream << " v" << registerIndex << " : " << varyingSemantic << registerIndex << ";\n";
>+    }
>+
>+    // Note that the following outputs need to be declared after the others. They are not included
>+    // in pixel shader inputs even when they are in vertex/geometry shader outputs, and the pixel
>+    // shader input struct must be a prefix of the vertex/geometry shader output struct.
>+
>+    if (builtins.glViewportIndex.enabled)
>+    {
>+        hlslStream << "    nointerpolation uint gl_ViewportIndex : "
>+                   << builtins.glViewportIndex.str() << ";\n";
>+    }
>+
>+    if (builtins.glLayer.enabled)
>+    {
>+        hlslStream << "    nointerpolation uint gl_Layer : " << builtins.glLayer.str() << ";\n";
>     }
> 
>     hlslStream << "};\n";
> }
> 
>-void DynamicHLSL::generateShaderLinkHLSL(const gl::Context *context,
>+void DynamicHLSL::generateShaderLinkHLSL(const gl::Caps &caps,
>                                          const gl::ProgramState &programData,
>                                          const ProgramD3DMetadata &programMetadata,
>                                          const VaryingPacking &varyingPacking,
>                                          const BuiltinVaryingsD3D &builtinsD3D,
>-                                         std::string *pixelHLSL,
>-                                         std::string *vertexHLSL) const
>+                                         gl::ShaderMap<std::string> *shaderHLSL) const
> {
>-    ASSERT(pixelHLSL->empty() && vertexHLSL->empty());
>+    ASSERT(shaderHLSL);
>+    ASSERT((*shaderHLSL)[gl::ShaderType::Vertex].empty() &&
>+           (*shaderHLSL)[gl::ShaderType::Fragment].empty());
> 
>-    const auto &data                   = context->getContextState();
>-    gl::Shader *vertexShaderGL         = programData.getAttachedVertexShader();
>-    gl::Shader *fragmentShaderGL       = programData.getAttachedFragmentShader();
>-    const ShaderD3D *fragmentShader    = GetImplAs<ShaderD3D>(fragmentShaderGL);
>-    const int shaderModel              = mRenderer->getMajorShaderModel();
>+    gl::Shader *vertexShaderGL      = programData.getAttachedShader(ShaderType::Vertex);
>+    gl::Shader *fragmentShaderGL    = programData.getAttachedShader(ShaderType::Fragment);
>+    const ShaderD3D *fragmentShader = GetImplAs<ShaderD3D>(fragmentShaderGL);
>+    const int shaderModel           = mRenderer->getMajorShaderModel();
> 
>     // usesViewScale() isn't supported in the D3D9 renderer
>     ASSERT(shaderModel >= 4 || !programMetadata.usesViewScale());
>@@ -476,81 +487,71 @@ void DynamicHLSL::generateShaderLinkHLSL(const gl::Context *context,
>     ASSERT(!fragmentShader->usesFragColor() || !fragmentShader->usesFragData());
> 
>     std::ostringstream vertexStream;
>-    vertexStream << vertexShaderGL->getTranslatedSource(context);
>+    vertexStream << "struct VS_OUTPUT\n";
>+    const auto &vertexBuiltins = builtinsD3D[gl::ShaderType::Vertex];
>+    generateVaryingLinkHLSL(varyingPacking, vertexBuiltins, builtinsD3D.usesPointSize(),
>+                            vertexStream);
> 
>     // Instanced PointSprite emulation requires additional entries originally generated in the
>     // GeometryShader HLSL. These include pointsize clamp values.
>     if (useInstancedPointSpriteEmulation)
>     {
>-        vertexStream << "static float minPointSize = "
>-                     << static_cast<int>(data.getCaps().minAliasedPointSize) << ".0f;\n"
>-                     << "static float maxPointSize = "
>-                     << static_cast<int>(data.getCaps().maxAliasedPointSize) << ".0f;\n";
>+        vertexStream << "static float minPointSize = " << static_cast<int>(caps.minAliasedPointSize)
>+                     << ".0f;\n"
>+                     << "static float maxPointSize = " << static_cast<int>(caps.maxAliasedPointSize)
>+                     << ".0f;\n";
>     }
> 
>-    // Add stub string to be replaced when shader is dynamically defined by its layout
>-    vertexStream << "\n" << std::string(VERTEX_ATTRIBUTE_STUB_STRING) << "\n";
>-
>-    const auto &vertexBuiltins = builtinsD3D[gl::SHADER_VERTEX];
>-
>-    // Write the HLSL input/output declarations
>-    vertexStream << "struct VS_OUTPUT\n";
>-    generateVaryingLinkHLSL(varyingPacking, vertexBuiltins, builtinsD3D.usesPointSize(),
>-                            vertexStream);
>-    vertexStream << "\n"
>-                 << "VS_OUTPUT main(VS_INPUT input)\n"
>-                 << "{\n"
>-                 << "    initAttributes(input);\n";
>-
>-    vertexStream << "\n"
>-                 << "    gl_main();\n"
>-                 << "\n"
>-                 << "    VS_OUTPUT output;\n";
>+    std::ostringstream vertexGenerateOutput;
>+    vertexGenerateOutput << "VS_OUTPUT generateOutput(VS_INPUT input)\n"
>+                         << "{\n"
>+                         << "    VS_OUTPUT output;\n";
> 
>     if (vertexBuiltins.glPosition.enabled)
>     {
>-        vertexStream << "    output.gl_Position = gl_Position;\n";
>+        vertexGenerateOutput << "    output.gl_Position = gl_Position;\n";
>     }
> 
>     if (vertexBuiltins.glViewIDOVR.enabled)
>     {
>-        vertexStream << "    output.gl_ViewID_OVR = _ViewID_OVR;\n";
>+        vertexGenerateOutput << "    output.gl_ViewID_OVR = ViewID_OVR;\n";
>     }
>     if (programMetadata.hasANGLEMultiviewEnabled() && programMetadata.canSelectViewInVertexShader())
>     {
>         ASSERT(vertexBuiltins.glViewportIndex.enabled && vertexBuiltins.glLayer.enabled);
>-        vertexStream << "    if (multiviewSelectViewportIndex)\n"
>-                     << "    {\n"
>-                     << "         output.gl_ViewportIndex = _ViewID_OVR;\n"
>-                     << "    } else {\n"
>-                     << "         output.gl_ViewportIndex = 0;\n"
>-                     << "         output.gl_Layer = _ViewID_OVR;\n"
>-                     << "    }\n";
>+        vertexGenerateOutput << "    if (multiviewSelectViewportIndex)\n"
>+                             << "    {\n"
>+                             << "         output.gl_ViewportIndex = ViewID_OVR;\n"
>+                             << "    } else {\n"
>+                             << "         output.gl_ViewportIndex = 0;\n"
>+                             << "         output.gl_Layer = ViewID_OVR;\n"
>+                             << "    }\n";
>     }
> 
>     // On D3D9 or D3D11 Feature Level 9, we need to emulate large viewports using dx_ViewAdjust.
>     if (shaderModel >= 4 && mRenderer->getShaderModelSuffix() == "")
>     {
>-        vertexStream << "    output.dx_Position.x = gl_Position.x;\n";
>+        vertexGenerateOutput << "    output.dx_Position.x = gl_Position.x;\n";
> 
>         if (programMetadata.usesViewScale())
>         {
>             // This code assumes that dx_ViewScale.y = -1.0f when rendering to texture, and +1.0f
>             // when rendering to the default framebuffer. No other values are valid.
>-            vertexStream << "    output.dx_Position.y = dx_ViewScale.y * gl_Position.y;\n";
>+            vertexGenerateOutput << "    output.dx_Position.y = dx_ViewScale.y * gl_Position.y;\n";
>         }
>         else
>         {
>-            vertexStream << "    output.dx_Position.y = - gl_Position.y;\n";
>+            vertexGenerateOutput << "    output.dx_Position.y = - gl_Position.y;\n";
>         }
> 
>-        vertexStream << "    output.dx_Position.z = (gl_Position.z + gl_Position.w) * 0.5;\n"
>-                     << "    output.dx_Position.w = gl_Position.w;\n";
>+        vertexGenerateOutput
>+            << "    output.dx_Position.z = (gl_Position.z + gl_Position.w) * 0.5;\n"
>+            << "    output.dx_Position.w = gl_Position.w;\n";
>     }
>     else
>     {
>-        vertexStream << "    output.dx_Position.x = gl_Position.x * dx_ViewAdjust.z + "
>-                        "dx_ViewAdjust.x * gl_Position.w;\n";
>+        vertexGenerateOutput << "    output.dx_Position.x = gl_Position.x * dx_ViewAdjust.z + "
>+                                "dx_ViewAdjust.x * gl_Position.w;\n";
> 
>         // If usesViewScale() is true and we're using the D3D11 renderer via Feature Level 9_*,
>         // then we need to multiply the gl_Position.y by the viewScale.
>@@ -558,88 +559,96 @@ void DynamicHLSL::generateShaderLinkHLSL(const gl::Context *context,
>         if (programMetadata.usesViewScale() &&
>             (shaderModel >= 4 && mRenderer->getShaderModelSuffix() != ""))
>         {
>-            vertexStream << "    output.dx_Position.y = dx_ViewScale.y * (gl_Position.y * "
>-                            "dx_ViewAdjust.w + dx_ViewAdjust.y * gl_Position.w);\n";
>+            vertexGenerateOutput << "    output.dx_Position.y = dx_ViewScale.y * (gl_Position.y * "
>+                                    "dx_ViewAdjust.w + dx_ViewAdjust.y * gl_Position.w);\n";
>         }
>         else
>         {
>-            vertexStream << "    output.dx_Position.y = -(gl_Position.y * dx_ViewAdjust.w + "
>-                            "dx_ViewAdjust.y * gl_Position.w);\n";
>+            vertexGenerateOutput
>+                << "    output.dx_Position.y = -(gl_Position.y * dx_ViewAdjust.w + "
>+                   "dx_ViewAdjust.y * gl_Position.w);\n";
>         }
> 
>-        vertexStream << "    output.dx_Position.z = (gl_Position.z + gl_Position.w) * 0.5;\n"
>-                     << "    output.dx_Position.w = gl_Position.w;\n";
>+        vertexGenerateOutput
>+            << "    output.dx_Position.z = (gl_Position.z + gl_Position.w) * 0.5;\n"
>+            << "    output.dx_Position.w = gl_Position.w;\n";
>     }
> 
>     // We don't need to output gl_PointSize if we use are emulating point sprites via instancing.
>     if (vertexBuiltins.glPointSize.enabled)
>     {
>-        vertexStream << "    output.gl_PointSize = gl_PointSize;\n";
>+        vertexGenerateOutput << "    output.gl_PointSize = gl_PointSize;\n";
>     }
> 
>     if (vertexBuiltins.glFragCoord.enabled)
>     {
>-        vertexStream << "    output.gl_FragCoord = gl_Position;\n";
>+        vertexGenerateOutput << "    output.gl_FragCoord = gl_Position;\n";
>     }
> 
>-    for (const PackedVaryingRegister &registerInfo : varyingPacking.getRegisterList())
>+    const auto &registerInfos = varyingPacking.getRegisterList();
>+    for (GLuint registerIndex = 0u; registerIndex < registerInfos.size(); ++registerIndex)
>     {
>-        const auto &packedVarying = *registerInfo.packedVarying;
>-        const auto &varying = *packedVarying.varying;
>+        const PackedVaryingRegister &registerInfo = registerInfos[registerIndex];
>+        const auto &packedVarying                 = *registerInfo.packedVarying;
>+        const auto &varying                       = *packedVarying.varying;
>         ASSERT(!varying.isStruct());
> 
>-        vertexStream << "    output.v" << registerInfo.semanticIndex << " = ";
>+        vertexGenerateOutput << "    output.v" << registerIndex << " = ";
> 
>         if (packedVarying.isStructField())
>         {
>-            vertexStream << DecorateVariable(packedVarying.parentStructName) << ".";
>+            vertexGenerateOutput << DecorateVariable(packedVarying.parentStructName) << ".";
>         }
> 
>-        vertexStream << DecorateVariable(varying.name);
>+        vertexGenerateOutput << DecorateVariable(varying.name);
> 
>         if (varying.isArray())
>         {
>-            WriteArrayString(vertexStream, registerInfo.varyingArrayIndex);
>+            WriteArrayString(vertexGenerateOutput, registerInfo.varyingArrayIndex);
>         }
> 
>         if (VariableRowCount(varying.type) > 1)
>         {
>-            WriteArrayString(vertexStream, registerInfo.varyingRowIndex);
>+            WriteArrayString(vertexGenerateOutput, registerInfo.varyingRowIndex);
>         }
> 
>-        vertexStream << ";\n";
>+        vertexGenerateOutput << ";\n";
>     }
> 
>     // Instanced PointSprite emulation requires additional entries to calculate
>     // the final output vertex positions of the quad that represents each sprite.
>     if (useInstancedPointSpriteEmulation)
>     {
>-        vertexStream << "\n"
>-                     << "    gl_PointSize = clamp(gl_PointSize, minPointSize, maxPointSize);\n";
>+        vertexGenerateOutput
>+            << "\n"
>+            << "    gl_PointSize = clamp(gl_PointSize, minPointSize, maxPointSize);\n";
> 
>-        vertexStream << "    output.dx_Position.x += (input.spriteVertexPos.x * gl_PointSize / "
>-                        "(dx_ViewCoords.x*2)) * output.dx_Position.w;";
>+        vertexGenerateOutput
>+            << "    output.dx_Position.x += (input.spriteVertexPos.x * gl_PointSize / "
>+               "(dx_ViewCoords.x*2)) * output.dx_Position.w;";
> 
>         if (programMetadata.usesViewScale())
>         {
>             // Multiply by ViewScale to invert the rendering when appropriate
>-            vertexStream << "    output.dx_Position.y += (-dx_ViewScale.y * "
>-                            "input.spriteVertexPos.y * gl_PointSize / (dx_ViewCoords.y*2)) * "
>-                            "output.dx_Position.w;";
>+            vertexGenerateOutput
>+                << "    output.dx_Position.y += (-dx_ViewScale.y * "
>+                   "input.spriteVertexPos.y * gl_PointSize / (dx_ViewCoords.y*2)) * "
>+                   "output.dx_Position.w;";
>         }
>         else
>         {
>-            vertexStream << "    output.dx_Position.y += (input.spriteVertexPos.y * gl_PointSize / "
>-                            "(dx_ViewCoords.y*2)) * output.dx_Position.w;";
>+            vertexGenerateOutput
>+                << "    output.dx_Position.y += (input.spriteVertexPos.y * gl_PointSize / "
>+                   "(dx_ViewCoords.y*2)) * output.dx_Position.w;";
>         }
> 
>-        vertexStream
>+        vertexGenerateOutput
>             << "    output.dx_Position.z += input.spriteVertexPos.z * output.dx_Position.w;\n";
> 
>         if (programMetadata.usesPointCoord())
>         {
>-            vertexStream << "\n"
>-                         << "    output.gl_PointCoord = input.spriteTexCoord;\n";
>+            vertexGenerateOutput << "\n"
>+                                 << "    output.gl_PointCoord = input.spriteTexCoord;\n";
>         }
>     }
> 
>@@ -649,75 +658,62 @@ void DynamicHLSL::generateShaderLinkHLSL(const gl::Context *context,
>     if (programMetadata.usesInsertedPointCoordValue())
>     {
>         ASSERT(!useInstancedPointSpriteEmulation);
>-        vertexStream << "\n"
>-                     << "    output.gl_PointCoord = float2(0.5, 0.5);\n";
>+        vertexGenerateOutput << "\n"
>+                             << "    output.gl_PointCoord = float2(0.5, 0.5);\n";
>     }
> 
>-    vertexStream << "\n"
>-                 << "    return output;\n"
>-                 << "}\n";
>+    vertexGenerateOutput << "\n"
>+                         << "    return output;\n"
>+                         << "}";
> 
>-    const auto &pixelBuiltins = builtinsD3D[gl::SHADER_FRAGMENT];
>+    std::string vertexSource = vertexShaderGL->getTranslatedSource();
>+    angle::ReplaceSubstring(&vertexSource, std::string(MAIN_PROLOGUE_STUB_STRING),
>+                            "    initAttributes(input);\n");
>+    angle::ReplaceSubstring(&vertexSource, std::string(VERTEX_OUTPUT_STUB_STRING),
>+                            vertexGenerateOutput.str());
>+    vertexStream << vertexSource;
>+
>+    const auto &pixelBuiltins = builtinsD3D[gl::ShaderType::Fragment];
> 
>     std::ostringstream pixelStream;
>-    pixelStream << fragmentShaderGL->getTranslatedSource(context);
>     pixelStream << "struct PS_INPUT\n";
>     generateVaryingLinkHLSL(varyingPacking, pixelBuiltins, builtinsD3D.usesPointSize(),
>                             pixelStream);
>     pixelStream << "\n";
> 
>-    pixelStream << std::string(PIXEL_OUTPUT_STUB_STRING) << "\n";
>-
>-    if (fragmentShader->usesFrontFacing())
>-    {
>-        if (shaderModel >= 4)
>-        {
>-            pixelStream << "PS_OUTPUT main(PS_INPUT input, bool isFrontFace : SV_IsFrontFace)\n"
>-                        << "{\n";
>-        }
>-        else
>-        {
>-            pixelStream << "PS_OUTPUT main(PS_INPUT input, float vFace : VFACE)\n"
>-                        << "{\n";
>-        }
>-    }
>-    else
>-    {
>-        pixelStream << "PS_OUTPUT main(PS_INPUT input)\n"
>-                    << "{\n";
>-    }
>-
>+    std::ostringstream pixelPrologue;
>     if (fragmentShader->usesViewID())
>     {
>         ASSERT(pixelBuiltins.glViewIDOVR.enabled);
>-        pixelStream << "    _ViewID_OVR = input.gl_ViewID_OVR;\n";
>+        pixelPrologue << "    ViewID_OVR = input.gl_ViewID_OVR;\n";
>     }
> 
>     if (pixelBuiltins.glFragCoord.enabled)
>     {
>-        pixelStream << "    float rhw = 1.0 / input.gl_FragCoord.w;\n";
>+        pixelPrologue << "    float rhw = 1.0 / input.gl_FragCoord.w;\n";
> 
>         // Certain Shader Models (4_0+ and 3_0) allow reading from dx_Position in the pixel shader.
>         // Other Shader Models (4_0_level_9_3 and 2_x) don't support this, so we emulate it using
>         // dx_ViewCoords.
>         if (shaderModel >= 4 && mRenderer->getShaderModelSuffix() == "")
>         {
>-            pixelStream << "    gl_FragCoord.x = input.dx_Position.x;\n"
>-                        << "    gl_FragCoord.y = input.dx_Position.y;\n";
>+            pixelPrologue << "    gl_FragCoord.x = input.dx_Position.x;\n"
>+                          << "    gl_FragCoord.y = input.dx_Position.y;\n";
>         }
>         else if (shaderModel == 3)
>         {
>-            pixelStream << "    gl_FragCoord.x = input.dx_Position.x + 0.5;\n"
>-                        << "    gl_FragCoord.y = input.dx_Position.y + 0.5;\n";
>+            pixelPrologue << "    gl_FragCoord.x = input.dx_Position.x + 0.5;\n"
>+                          << "    gl_FragCoord.y = input.dx_Position.y + 0.5;\n";
>         }
>         else
>         {
>             // dx_ViewCoords contains the viewport width/2, height/2, center.x and center.y. See
>             // Renderer::setViewport()
>-            pixelStream << "    gl_FragCoord.x = (input.gl_FragCoord.x * rhw) * dx_ViewCoords.x + "
>-                           "dx_ViewCoords.z;\n"
>-                        << "    gl_FragCoord.y = (input.gl_FragCoord.y * rhw) * dx_ViewCoords.y + "
>-                           "dx_ViewCoords.w;\n";
>+            pixelPrologue
>+                << "    gl_FragCoord.x = (input.gl_FragCoord.x * rhw) * dx_ViewCoords.x + "
>+                   "dx_ViewCoords.z;\n"
>+                << "    gl_FragCoord.y = (input.gl_FragCoord.y * rhw) * dx_ViewCoords.y + "
>+                   "dx_ViewCoords.w;\n";
>         }
> 
>         if (programMetadata.usesViewScale())
>@@ -757,169 +753,115 @@ void DynamicHLSL::generateShaderLinkHLSL(const gl::Context *context,
>                 //    gl_FragCoord.y"
>                 //
>                 // Simplifying, this becomes:
>-                pixelStream
>+                pixelPrologue
>                     << "    gl_FragCoord.y = (1.0f + dx_ViewScale.y) * gl_FragCoord.y /"
>                        "(1.0f - input.gl_FragCoord.y * rhw)  - dx_ViewScale.y * gl_FragCoord.y;\n";
>             }
>         }
> 
>-        pixelStream << "    gl_FragCoord.z = (input.gl_FragCoord.z * rhw) * dx_DepthFront.x + "
>-                       "dx_DepthFront.y;\n"
>-                    << "    gl_FragCoord.w = rhw;\n";
>+        pixelPrologue << "    gl_FragCoord.z = (input.gl_FragCoord.z * rhw) * dx_DepthFront.x + "
>+                         "dx_DepthFront.y;\n"
>+                      << "    gl_FragCoord.w = rhw;\n";
>     }
> 
>     if (pixelBuiltins.glPointCoord.enabled && shaderModel >= 3)
>     {
>-        pixelStream << "    gl_PointCoord.x = input.gl_PointCoord.x;\n"
>-                    << "    gl_PointCoord.y = 1.0 - input.gl_PointCoord.y;\n";
>+        pixelPrologue << "    gl_PointCoord.x = input.gl_PointCoord.x;\n"
>+                      << "    gl_PointCoord.y = 1.0 - input.gl_PointCoord.y;\n";
>     }
> 
>     if (fragmentShader->usesFrontFacing())
>     {
>         if (shaderModel <= 3)
>         {
>-            pixelStream << "    gl_FrontFacing = (vFace * dx_DepthFront.z >= 0.0);\n";
>+            pixelPrologue << "    gl_FrontFacing = (vFace * dx_DepthFront.z >= 0.0);\n";
>         }
>         else
>         {
>-            pixelStream << "    gl_FrontFacing = isFrontFace;\n";
>+            pixelPrologue << "    gl_FrontFacing = isFrontFace;\n";
>         }
>     }
> 
>-    for (const PackedVaryingRegister &registerInfo : varyingPacking.getRegisterList())
>+    for (GLuint registerIndex = 0u; registerIndex < registerInfos.size(); ++registerIndex)
>     {
>-        const auto &packedVarying = *registerInfo.packedVarying;
>-        const auto &varying = *packedVarying.varying;
>+        const PackedVaryingRegister &registerInfo = registerInfos[registerIndex];
>+        const auto &packedVarying                 = *registerInfo.packedVarying;
>+        const auto &varying                       = *packedVarying.varying;
>         ASSERT(!varying.isBuiltIn() && !varying.isStruct());
> 
>         // Don't reference VS-only transform feedback varyings in the PS. Note that we're relying on
>-        // that the staticUse flag is set according to usage in the fragment shader.
>-        if (packedVarying.vertexOnly || !varying.staticUse)
>+        // that the active flag is set according to usage in the fragment shader.
>+        if (packedVarying.vertexOnly || !varying.active)
>             continue;
> 
>-        pixelStream << "    ";
>+        pixelPrologue << "    ";
> 
>         if (packedVarying.isStructField())
>         {
>-            pixelStream << DecorateVariable(packedVarying.parentStructName) << ".";
>+            pixelPrologue << DecorateVariable(packedVarying.parentStructName) << ".";
>         }
> 
>-        pixelStream << DecorateVariable(varying.name);
>+        pixelPrologue << DecorateVariable(varying.name);
> 
>         if (varying.isArray())
>         {
>-            WriteArrayString(pixelStream, registerInfo.varyingArrayIndex);
>+            WriteArrayString(pixelPrologue, registerInfo.varyingArrayIndex);
>         }
> 
>         GLenum transposedType = TransposeMatrixType(varying.type);
>         if (VariableRowCount(transposedType) > 1)
>         {
>-            WriteArrayString(pixelStream, registerInfo.varyingRowIndex);
>+            WriteArrayString(pixelPrologue, registerInfo.varyingRowIndex);
>         }
> 
>-        pixelStream << " = input.v" << registerInfo.semanticIndex;
>+        pixelPrologue << " = input.v" << registerIndex;
> 
>         switch (VariableColumnCount(transposedType))
>         {
>             case 1:
>-                pixelStream << ".x";
>+                pixelPrologue << ".x";
>                 break;
>             case 2:
>-                pixelStream << ".xy";
>+                pixelPrologue << ".xy";
>                 break;
>             case 3:
>-                pixelStream << ".xyz";
>+                pixelPrologue << ".xyz";
>                 break;
>             case 4:
>                 break;
>             default:
>                 UNREACHABLE();
>         }
>-        pixelStream << ";\n";
>+        pixelPrologue << ";\n";
>     }
> 
>-    pixelStream << "\n"
>-                << "    gl_main();\n"
>-                << "\n"
>-                << "    return generateOutput();\n"
>-                << "}\n";
>-
>-    *vertexHLSL = vertexStream.str();
>-    *pixelHLSL  = pixelStream.str();
>-}
>-
>-std::string DynamicHLSL::generateComputeShaderLinkHLSL(const gl::Context *context,
>-                                                       const gl::ProgramState &programData) const
>-{
>-    gl::Shader *computeShaderGL = programData.getAttachedComputeShader();
>-    std::stringstream computeStream;
>-    std::string translatedSource = computeShaderGL->getTranslatedSource(context);
>-    computeStream << translatedSource;
>-
>-    bool usesWorkGroupID = translatedSource.find("GL_USES_WORK_GROUP_ID") != std::string::npos;
>-    bool usesLocalInvocationID =
>-        translatedSource.find("GL_USES_LOCAL_INVOCATION_ID") != std::string::npos;
>-    bool usesGlobalInvocationID =
>-        translatedSource.find("GL_USES_GLOBAL_INVOCATION_ID") != std::string::npos;
>-    bool usesLocalInvocationIndex =
>-        translatedSource.find("GL_USES_LOCAL_INVOCATION_INDEX") != std::string::npos;
>-
>-    computeStream << "\nstruct CS_INPUT\n{\n";
>-    if (usesWorkGroupID)
>-    {
>-        computeStream << "    uint3 dx_WorkGroupID : "
>-                      << "SV_GroupID;\n";
>-    }
>+    std::string pixelSource = fragmentShaderGL->getTranslatedSource();
> 
>-    if (usesLocalInvocationID)
>-    {
>-        computeStream << "    uint3 dx_LocalInvocationID : "
>-                      << "SV_GroupThreadID;\n";
>-    }
>-
>-    if (usesGlobalInvocationID)
>-    {
>-        computeStream << "    uint3 dx_GlobalInvocationID : "
>-                      << "SV_DispatchThreadID;\n";
>-    }
>-
>-    if (usesLocalInvocationIndex)
>-    {
>-        computeStream << "    uint dx_LocalInvocationIndex : "
>-                      << "SV_GroupIndex;\n";
>-    }
>-
>-    computeStream << "};\n\n";
>-
>-    const sh::WorkGroupSize &localSize = computeShaderGL->getWorkGroupSize(context);
>-    computeStream << "[numthreads(" << localSize[0] << ", " << localSize[1] << ", " << localSize[2]
>-                  << ")]\n";
>-
>-    computeStream << "void main(CS_INPUT input)\n"
>-                  << "{\n";
>-
>-    if (usesWorkGroupID)
>-    {
>-        computeStream << "    gl_WorkGroupID = input.dx_WorkGroupID;\n";
>-    }
>-    if (usesLocalInvocationID)
>-    {
>-        computeStream << "    gl_LocalInvocationID = input.dx_LocalInvocationID;\n";
>-    }
>-    if (usesGlobalInvocationID)
>+    if (fragmentShader->usesFrontFacing())
>     {
>-        computeStream << "    gl_GlobalInvocationID = input.dx_GlobalInvocationID;\n";
>+        if (shaderModel >= 4)
>+        {
>+            angle::ReplaceSubstring(&pixelSource, std::string(PIXEL_MAIN_PARAMETERS_STUB_STRING),
>+                                    "PS_INPUT input, bool isFrontFace : SV_IsFrontFace");
>+        }
>+        else
>+        {
>+            angle::ReplaceSubstring(&pixelSource, std::string(PIXEL_MAIN_PARAMETERS_STUB_STRING),
>+                                    "PS_INPUT input, float vFace : VFACE");
>+        }
>     }
>-    if (usesLocalInvocationIndex)
>+    else
>     {
>-        computeStream << "    gl_LocalInvocationIndex = input.dx_LocalInvocationIndex;\n";
>+        angle::ReplaceSubstring(&pixelSource, std::string(PIXEL_MAIN_PARAMETERS_STUB_STRING),
>+                                "PS_INPUT input");
>     }
> 
>-    computeStream << "\n"
>-                  << "    gl_main();\n"
>-                  << "}\n";
>+    angle::ReplaceSubstring(&pixelSource, std::string(MAIN_PROLOGUE_STUB_STRING),
>+                            pixelPrologue.str());
>+    pixelStream << pixelSource;
> 
>-    return computeStream.str();
>+    (*shaderHLSL)[gl::ShaderType::Vertex]   = vertexStream.str();
>+    (*shaderHLSL)[gl::ShaderType::Fragment] = pixelStream.str();
> }
> 
> std::string DynamicHLSL::generateGeometryShaderPreamble(const VaryingPacking &varyingPacking,
>@@ -931,14 +873,14 @@ std::string DynamicHLSL::generateGeometryShaderPreamble(const VaryingPacking &va
> 
>     std::ostringstream preambleStream;
> 
>-    const auto &vertexBuiltins = builtinsD3D[gl::SHADER_VERTEX];
>+    const auto &vertexBuiltins = builtinsD3D[gl::ShaderType::Vertex];
> 
>     preambleStream << "struct GS_INPUT\n";
>     generateVaryingLinkHLSL(varyingPacking, vertexBuiltins, builtinsD3D.usesPointSize(),
>                             preambleStream);
>     preambleStream << "\n"
>                    << "struct GS_OUTPUT\n";
>-    generateVaryingLinkHLSL(varyingPacking, builtinsD3D[gl::SHADER_GEOMETRY],
>+    generateVaryingLinkHLSL(varyingPacking, builtinsD3D[gl::ShaderType::Geometry],
>                             builtinsD3D.usesPointSize(), preambleStream);
>     preambleStream
>         << "\n"
>@@ -956,8 +898,8 @@ std::string DynamicHLSL::generateGeometryShaderPreamble(const VaryingPacking &va
>         preambleStream << "    output.gl_ViewID_OVR = input.gl_ViewID_OVR;\n";
>         if (selectViewInVS)
>         {
>-            ASSERT(builtinsD3D[gl::SHADER_GEOMETRY].glViewportIndex.enabled &&
>-                   builtinsD3D[gl::SHADER_GEOMETRY].glLayer.enabled);
>+            ASSERT(builtinsD3D[gl::ShaderType::Geometry].glViewportIndex.enabled &&
>+                   builtinsD3D[gl::ShaderType::Geometry].glLayer.enabled);
> 
>             // If the view is already selected in the VS, then we just pass the gl_ViewportIndex and
>             // gl_Layer to the output.
>@@ -966,14 +908,16 @@ std::string DynamicHLSL::generateGeometryShaderPreamble(const VaryingPacking &va
>         }
>     }
> 
>-    for (const PackedVaryingRegister &varyingRegister : varyingPacking.getRegisterList())
>+    const auto &registerInfos = varyingPacking.getRegisterList();
>+    for (GLuint registerIndex = 0u; registerIndex < registerInfos.size(); ++registerIndex)
>     {
>-        preambleStream << "    output.v" << varyingRegister.semanticIndex << " = ";
>+        const PackedVaryingRegister &varyingRegister = registerInfos[registerIndex];
>+        preambleStream << "    output.v" << registerIndex << " = ";
>         if (varyingRegister.packedVarying->interpolation == sh::INTERPOLATION_FLAT)
>         {
>             preambleStream << "flat";
>         }
>-        preambleStream << "input.v" << varyingRegister.semanticIndex << "; \n";
>+        preambleStream << "input.v" << registerIndex << "; \n";
>     }
> 
>     if (vertexBuiltins.glFragCoord.enabled)
>@@ -989,8 +933,8 @@ std::string DynamicHLSL::generateGeometryShaderPreamble(const VaryingPacking &va
> 
>     if (hasANGLEMultiviewEnabled && !selectViewInVS)
>     {
>-        ASSERT(builtinsD3D[gl::SHADER_GEOMETRY].glViewportIndex.enabled &&
>-               builtinsD3D[gl::SHADER_GEOMETRY].glLayer.enabled);
>+        ASSERT(builtinsD3D[gl::ShaderType::Geometry].glViewportIndex.enabled &&
>+               builtinsD3D[gl::ShaderType::Geometry].glLayer.enabled);
> 
>         // According to the HLSL reference, using SV_RenderTargetArrayIndex is only valid if the
>         // render target is an array resource. Because of this we do not write to gl_Layer if we are
>@@ -1013,8 +957,8 @@ std::string DynamicHLSL::generateGeometryShaderPreamble(const VaryingPacking &va
>     return preambleStream.str();
> }
> 
>-std::string DynamicHLSL::generateGeometryShaderHLSL(const gl::Context *context,
>-                                                    gl::PrimitiveType primitiveType,
>+std::string DynamicHLSL::generateGeometryShaderHLSL(const gl::Caps &caps,
>+                                                    gl::PrimitiveMode primitiveType,
>                                                     const gl::ProgramState &programData,
>                                                     const bool useViewScale,
>                                                     const bool hasANGLEMultiviewEnabled,
>@@ -1026,7 +970,7 @@ std::string DynamicHLSL::generateGeometryShaderHLSL(const gl::Context *context,
> 
>     std::stringstream shaderStream;
> 
>-    const bool pointSprites   = (primitiveType == PRIMITIVE_POINTS) && pointSpriteEmulation;
>+    const bool pointSprites = (primitiveType == gl::PrimitiveMode::Points) && pointSpriteEmulation;
>     const bool usesPointCoord = preambleString.find("gl_PointCoord") != std::string::npos;
> 
>     const char *inputPT  = nullptr;
>@@ -1036,9 +980,9 @@ std::string DynamicHLSL::generateGeometryShaderHLSL(const gl::Context *context,
> 
>     switch (primitiveType)
>     {
>-        case PRIMITIVE_POINTS:
>-            inputPT         = "point";
>-            inputSize       = 1;
>+        case gl::PrimitiveMode::Points:
>+            inputPT   = "point";
>+            inputSize = 1;
> 
>             if (pointSprites)
>             {
>@@ -1053,18 +997,18 @@ std::string DynamicHLSL::generateGeometryShaderHLSL(const gl::Context *context,
> 
>             break;
> 
>-        case PRIMITIVE_LINES:
>-        case PRIMITIVE_LINE_STRIP:
>-        case PRIMITIVE_LINE_LOOP:
>+        case gl::PrimitiveMode::Lines:
>+        case gl::PrimitiveMode::LineStrip:
>+        case gl::PrimitiveMode::LineLoop:
>             inputPT         = "line";
>             outputPT        = "Line";
>             inputSize       = 2;
>             maxVertexOutput = 2;
>             break;
> 
>-        case PRIMITIVE_TRIANGLES:
>-        case PRIMITIVE_TRIANGLE_STRIP:
>-        case PRIMITIVE_TRIANGLE_FAN:
>+        case gl::PrimitiveMode::Triangles:
>+        case gl::PrimitiveMode::TriangleStrip:
>+        case gl::PrimitiveMode::TriangleFan:
>             inputPT         = "triangle";
>             outputPT        = "Triangle";
>             inputSize       = 3;
>@@ -1121,10 +1065,10 @@ std::string DynamicHLSL::generateGeometryShaderHLSL(const gl::Context *context,
>                         "};\n"
>                         "\n"
>                         "static float minPointSize = "
>-                     << static_cast<int>(context->getCaps().minAliasedPointSize)
>+                     << static_cast<int>(caps.minAliasedPointSize)
>                      << ".0f;\n"
>                         "static float maxPointSize = "
>-                     << static_cast<int>(context->getCaps().maxAliasedPointSize) << ".0f;\n"
>+                     << static_cast<int>(caps.maxAliasedPointSize) << ".0f;\n"
>                      << "\n";
>     }
> 
>@@ -1132,7 +1076,7 @@ std::string DynamicHLSL::generateGeometryShaderHLSL(const gl::Context *context,
>                  << "[maxvertexcount(" << maxVertexOutput << ")]\n"
>                  << "void main(" << inputPT << " GS_INPUT input[" << inputSize << "], ";
> 
>-    if (primitiveType == PRIMITIVE_TRIANGLE_STRIP)
>+    if (primitiveType == gl::PrimitiveMode::TriangleStrip)
>     {
>         shaderStream << "uint primitiveID : SV_PrimitiveID, ";
>     }
>@@ -1141,7 +1085,7 @@ std::string DynamicHLSL::generateGeometryShaderHLSL(const gl::Context *context,
>                  << "{\n"
>                  << "    GS_OUTPUT output = (GS_OUTPUT)0;\n";
> 
>-    if (primitiveType == PRIMITIVE_TRIANGLE_STRIP)
>+    if (primitiveType == gl::PrimitiveMode::TriangleStrip)
>     {
>         shaderStream << "    uint lastVertexIndex = (primitiveID % 2 == 0 ? 2 : 1);\n";
>     }
>@@ -1209,7 +1153,7 @@ std::string DynamicHLSL::generateGeometryShaderHLSL(const gl::Context *context,
> }
> 
> // static
>-void DynamicHLSL::GenerateAttributeConversionHLSL(gl::VertexFormatType vertexFormatType,
>+void DynamicHLSL::GenerateAttributeConversionHLSL(angle::FormatID vertexFormatID,
>                                                   const sh::ShaderVariable &shaderAttrib,
>                                                   std::ostringstream &outStream)
> {
>@@ -1220,9 +1164,9 @@ void DynamicHLSL::GenerateAttributeConversionHLSL(gl::VertexFormatType vertexFor
>         return;
>     }
> 
>-    GLenum shaderComponentType = VariableComponentType(shaderAttrib.type);
>-    int shaderComponentCount   = VariableComponentCount(shaderAttrib.type);
>-    const gl::VertexFormat &vertexFormat = gl::GetVertexFormatFromType(vertexFormatType);
>+    GLenum shaderComponentType           = VariableComponentType(shaderAttrib.type);
>+    int shaderComponentCount             = VariableComponentCount(shaderAttrib.type);
>+    const gl::VertexFormat &vertexFormat = gl::GetVertexFormatFromID(vertexFormatID);
> 
>     // Perform integer to float conversion (if necessary)
>     if (shaderComponentType == GL_FLOAT && vertexFormat.type != GL_FLOAT)
>@@ -1238,7 +1182,7 @@ void DynamicHLSL::GenerateAttributeConversionHLSL(gl::VertexFormatType vertexFor
>     outStream << "input." << DecorateVariable(shaderAttrib.name);
> }
> 
>-void DynamicHLSL::getPixelShaderOutputKey(const gl::ContextState &data,
>+void DynamicHLSL::getPixelShaderOutputKey(const gl::State &data,
>                                           const gl::ProgramState &programData,
>                                           const ProgramD3DMetadata &metadata,
>                                           std::vector<PixelShaderOutputVariable> *outPixelShaderKey)
>@@ -1286,11 +1230,11 @@ void DynamicHLSL::getPixelShaderOutputKey(const gl::ContextState &data,
>             const std::string &elementString =
>                 (outputVariable.isArray() ? Str(outputLocation.arrayIndex) : "");
> 
>-            ASSERT(outputVariable.staticUse);
>+            ASSERT(outputVariable.active);
> 
>             PixelShaderOutputVariable outputKeyVariable;
>-            outputKeyVariable.type        = outputVariable.type;
>-            outputKeyVariable.name        = variableName + elementString;
>+            outputKeyVariable.type = outputVariable.type;
>+            outputKeyVariable.name = variableName + elementString;
>             outputKeyVariable.source =
>                 variableName +
>                 (outputVariable.isArray() ? ArrayString(outputLocation.arrayIndex) : "");
>@@ -1302,9 +1246,7 @@ void DynamicHLSL::getPixelShaderOutputKey(const gl::ContextState &data,
> }
> 
> // BuiltinVarying Implementation.
>-BuiltinVarying::BuiltinVarying() : enabled(false), index(0), systemValue(false)
>-{
>-}
>+BuiltinVarying::BuiltinVarying() : enabled(false), index(0), systemValue(false) {}
> 
> std::string BuiltinVarying::str() const
> {
>@@ -1329,12 +1271,25 @@ void BuiltinVarying::enable(const std::string &semanticVal, unsigned int indexVa
> BuiltinVaryingsD3D::BuiltinVaryingsD3D(const ProgramD3DMetadata &metadata,
>                                        const VaryingPacking &packing)
> {
>-    updateBuiltins(gl::SHADER_VERTEX, metadata, packing);
>-    updateBuiltins(gl::SHADER_FRAGMENT, metadata, packing);
>-    if (metadata.getRendererMajorShaderModel() >= 4)
>-    {
>-        updateBuiltins(gl::SHADER_GEOMETRY, metadata, packing);
>-    }
>+    updateBuiltins(gl::ShaderType::Vertex, metadata, packing);
>+    updateBuiltins(gl::ShaderType::Fragment, metadata, packing);
>+    int shaderModel = metadata.getRendererMajorShaderModel();
>+    if (shaderModel >= 4)
>+    {
>+        updateBuiltins(gl::ShaderType::Geometry, metadata, packing);
>+    }
>+    // In shader model >= 4, some builtins need to be the same in vertex and pixel shaders - input
>+    // struct needs to be a prefix of output struct.
>+    ASSERT(shaderModel < 4 || mBuiltinInfo[gl::ShaderType::Vertex].glPosition.enabled ==
>+                                  mBuiltinInfo[gl::ShaderType::Fragment].glPosition.enabled);
>+    ASSERT(shaderModel < 4 || mBuiltinInfo[gl::ShaderType::Vertex].glFragCoord.enabled ==
>+                                  mBuiltinInfo[gl::ShaderType::Fragment].glFragCoord.enabled);
>+    ASSERT(shaderModel < 4 || mBuiltinInfo[gl::ShaderType::Vertex].glPointCoord.enabled ==
>+                                  mBuiltinInfo[gl::ShaderType::Fragment].glPointCoord.enabled);
>+    ASSERT(shaderModel < 4 || mBuiltinInfo[gl::ShaderType::Vertex].glPointSize.enabled ==
>+                                  mBuiltinInfo[gl::ShaderType::Fragment].glPointSize.enabled);
>+    ASSERT(shaderModel < 4 || mBuiltinInfo[gl::ShaderType::Vertex].glViewIDOVR.enabled ==
>+                                  mBuiltinInfo[gl::ShaderType::Fragment].glViewIDOVR.enabled);
> }
> 
> BuiltinVaryingsD3D::~BuiltinVaryingsD3D() = default;
>@@ -1346,6 +1301,10 @@ void BuiltinVaryingsD3D::updateBuiltins(gl::ShaderType shaderType,
>     const std::string &userSemantic = GetVaryingSemantic(metadata.getRendererMajorShaderModel(),
>                                                          metadata.usesSystemValuePointSize());
> 
>+    // Note that when enabling builtins only for specific shader stages in shader model >= 4, the
>+    // code needs to ensure that the input struct of the shader stage is a prefix of the output
>+    // struct of the previous stage.
>+
>     unsigned int reservedSemanticIndex = packing.getMaxSemanticIndex();
> 
>     BuiltinInfo *builtins = &mBuiltinInfo[shaderType];
>@@ -1354,7 +1313,7 @@ void BuiltinVaryingsD3D::updateBuiltins(gl::ShaderType shaderType,
>     {
>         builtins->dxPosition.enableSystem("SV_Position");
>     }
>-    else if (shaderType == gl::SHADER_FRAGMENT)
>+    else if (shaderType == gl::ShaderType::Fragment)
>     {
>         builtins->dxPosition.enableSystem("VPOS");
>     }
>@@ -1373,8 +1332,8 @@ void BuiltinVaryingsD3D::updateBuiltins(gl::ShaderType shaderType,
>         builtins->glFragCoord.enable(userSemantic, reservedSemanticIndex++);
>     }
> 
>-    if (shaderType == gl::SHADER_VERTEX ? metadata.addsPointCoordToVertexShader()
>-                                        : metadata.usesPointCoord())
>+    if (shaderType == gl::ShaderType::Vertex ? metadata.addsPointCoordToVertexShader()
>+                                             : metadata.usesPointCoord())
>     {
>         // SM3 reserves the TEXCOORD semantic for point sprite texcoords (gl_PointCoord)
>         // In D3D11 we manually compute gl_PointCoord in the GS.
>@@ -1388,37 +1347,34 @@ void BuiltinVaryingsD3D::updateBuiltins(gl::ShaderType shaderType,
>         }
>     }
> 
>-    if (shaderType == gl::SHADER_VERTEX && metadata.hasANGLEMultiviewEnabled())
>+    if (metadata.hasANGLEMultiviewEnabled())
>     {
>+        // Although it is possible to compute gl_ViewID_OVR from the value of
>+        // SV_ViewportArrayIndex or SV_RenderTargetArrayIndex and the multi-view state in the
>+        // driver constant buffer, it is easier and cleaner to always pass it as a varying.
>         builtins->glViewIDOVR.enable(userSemantic, reservedSemanticIndex++);
>-        if (metadata.canSelectViewInVertexShader())
>+
>+        if (shaderType == gl::ShaderType::Vertex)
>+        {
>+            if (metadata.canSelectViewInVertexShader())
>+            {
>+                builtins->glViewportIndex.enableSystem("SV_ViewportArrayIndex");
>+                builtins->glLayer.enableSystem("SV_RenderTargetArrayIndex");
>+            }
>+        }
>+
>+        if (shaderType == gl::ShaderType::Geometry)
>         {
>+            // gl_Layer and gl_ViewportIndex are necessary so that we can write to either based on
>+            // the multiview state in the driver constant buffer.
>             builtins->glViewportIndex.enableSystem("SV_ViewportArrayIndex");
>             builtins->glLayer.enableSystem("SV_RenderTargetArrayIndex");
>         }
>     }
> 
>-    if (shaderType == gl::SHADER_FRAGMENT && metadata.hasANGLEMultiviewEnabled())
>-    {
>-        builtins->glViewIDOVR.enable(userSemantic, reservedSemanticIndex++);
>-    }
>-
>-    if (shaderType == gl::SHADER_GEOMETRY && metadata.hasANGLEMultiviewEnabled())
>-    {
>-        // Although it is possible to retrieve gl_ViewID_OVR from the value of
>-        // SV_ViewportArrayIndex or SV_RenderTargetArrayIndex based on the multi-view state in the
>-        // driver constant buffer, it is easier and cleaner to pass it as a varying.
>-        builtins->glViewIDOVR.enable(userSemantic, reservedSemanticIndex++);
>-
>-        // gl_Layer and gl_ViewportIndex are necessary so that we can write to either based on the
>-        // multiview state in the driver constant buffer.
>-        builtins->glViewportIndex.enableSystem("SV_ViewportArrayIndex");
>-        builtins->glLayer.enableSystem("SV_RenderTargetArrayIndex");
>-    }
>-
>     // Special case: do not include PSIZE semantic in HLSL 3 pixel shaders
>     if (metadata.usesSystemValuePointSize() &&
>-        (shaderType != gl::SHADER_FRAGMENT || metadata.getRendererMajorShaderModel() >= 4))
>+        (shaderType != gl::ShaderType::Fragment || metadata.getRendererMajorShaderModel() >= 4))
>     {
>         builtins->glPointSize.enableSystem("PSIZE");
>     }
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/DynamicHLSL.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/DynamicHLSL.h
>index fe8d9cb0a30..64ac318ce57 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/DynamicHLSL.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/DynamicHLSL.h
>@@ -18,13 +18,14 @@
> #include "libANGLE/Program.h"
> #include "libANGLE/angletypes.h"
> #include "libANGLE/formatutils.h"
>+#include "libANGLE/renderer/d3d/DynamicImage2DHLSL.h"
> #include "libANGLE/renderer/d3d/RendererD3D.h"
> 
> namespace sh
> {
> struct Attribute;
> struct ShaderVariable;
>-}
>+}  // namespace sh
> 
> namespace gl
> {
>@@ -32,13 +33,34 @@ class InfoLog;
> struct VariableLocation;
> class VaryingPacking;
> struct VertexAttribute;
>-}
>+}  // namespace gl
> 
> namespace rx
> {
> class ProgramD3DMetadata;
> class ShaderD3D;
> 
>+// This class needs to match OutputHLSL::decorate
>+class DecorateVariable final : angle::NonCopyable
>+{
>+  public:
>+    explicit DecorateVariable(const std::string &str) : mName(str) {}
>+    const std::string &getName() const { return mName; }
>+
>+  private:
>+    const std::string &mName;
>+};
>+
>+inline std::ostream &operator<<(std::ostream &o, const DecorateVariable &dv)
>+{
>+    if (dv.getName().compare(0, 3, "gl_") != 0)
>+    {
>+        o << "_";
>+    }
>+    o << dv.getName();
>+    return o;
>+}
>+
> struct PixelShaderOutputVariable
> {
>     PixelShaderOutputVariable() {}
>@@ -47,8 +69,7 @@ struct PixelShaderOutputVariable
>                               const std::string &sourceIn,
>                               size_t outputIndexIn)
>         : type(typeIn), name(nameIn), source(sourceIn), outputIndex(outputIndexIn)
>-    {
>-    }
>+    {}
> 
>     GLenum type = GL_NONE;
>     std::string name;
>@@ -98,7 +119,7 @@ class BuiltinVaryingsD3D
>     BuiltinVaryingsD3D(const ProgramD3DMetadata &metadata, const gl::VaryingPacking &packing);
>     ~BuiltinVaryingsD3D();
> 
>-    bool usesPointSize() const { return mBuiltinInfo[gl::SHADER_VERTEX].glPointSize.enabled; }
>+    bool usesPointSize() const { return mBuiltinInfo[gl::ShaderType::Vertex].glPointSize.enabled; }
> 
>     const BuiltinInfo &operator[](gl::ShaderType shaderType) const
>     {
>@@ -111,7 +132,7 @@ class BuiltinVaryingsD3D
>                         const ProgramD3DMetadata &metadata,
>                         const gl::VaryingPacking &packing);
> 
>-    std::array<BuiltinInfo, gl::SHADER_TYPE_MAX> mBuiltinInfo;
>+    gl::ShaderMap<BuiltinInfo> mBuiltinInfo;
> };
> 
> class DynamicHLSL : angle::NonCopyable
>@@ -128,23 +149,26 @@ class DynamicHLSL : angle::NonCopyable
>         const std::vector<PixelShaderOutputVariable> &outputVariables,
>         bool usesFragDepth,
>         const std::vector<GLenum> &outputLayout) const;
>-    void generateShaderLinkHLSL(const gl::Context *context,
>+    std::string generateComputeShaderForImage2DBindSignature(
>+        const d3d::Context *context,
>+        ProgramD3D &programD3D,
>+        const gl::ProgramState &programData,
>+        std::vector<sh::Uniform> &image2DUniforms,
>+        const gl::ImageUnitTextureTypeMap &image2DBindLayout) const;
>+    void generateShaderLinkHLSL(const gl::Caps &caps,
>                                 const gl::ProgramState &programData,
>                                 const ProgramD3DMetadata &programMetadata,
>                                 const gl::VaryingPacking &varyingPacking,
>                                 const BuiltinVaryingsD3D &builtinsD3D,
>-                                std::string *pixelHLSL,
>-                                std::string *vertexHLSL) const;
>-    std::string generateComputeShaderLinkHLSL(const gl::Context *context,
>-                                              const gl::ProgramState &programData) const;
>+                                gl::ShaderMap<std::string> *shaderHLSL) const;
> 
>     std::string generateGeometryShaderPreamble(const gl::VaryingPacking &varyingPacking,
>                                                const BuiltinVaryingsD3D &builtinsD3D,
>                                                const bool hasANGLEMultiviewEnabled,
>                                                const bool selectViewInVS) const;
> 
>-    std::string generateGeometryShaderHLSL(const gl::Context *context,
>-                                           gl::PrimitiveType primitiveType,
>+    std::string generateGeometryShaderHLSL(const gl::Caps &caps,
>+                                           gl::PrimitiveMode primitiveType,
>                                            const gl::ProgramState &programData,
>                                            const bool useViewScale,
>                                            const bool hasANGLEMultiviewEnabled,
>@@ -152,7 +176,7 @@ class DynamicHLSL : angle::NonCopyable
>                                            const bool pointSpriteEmulation,
>                                            const std::string &preambleString) const;
> 
>-    void getPixelShaderOutputKey(const gl::ContextState &data,
>+    void getPixelShaderOutputKey(const gl::State &data,
>                                  const gl::ProgramState &programData,
>                                  const ProgramD3DMetadata &metadata,
>                                  std::vector<PixelShaderOutputVariable> *outPixelShaderKey);
>@@ -165,7 +189,7 @@ class DynamicHLSL : angle::NonCopyable
>                                  bool programUsesPointSize,
>                                  std::ostringstream &hlslStream) const;
> 
>-    static void GenerateAttributeConversionHLSL(gl::VertexFormatType vertexFormatType,
>+    static void GenerateAttributeConversionHLSL(angle::FormatID vertexFormatID,
>                                                 const sh::ShaderVariable &shaderAttrib,
>                                                 std::ostringstream &outStream);
> };
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/DynamicImage2DHLSL.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/DynamicImage2DHLSL.cpp
>new file mode 100644
>index 00000000000..1d00272f475
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/DynamicImage2DHLSL.cpp
>@@ -0,0 +1,907 @@
>+//
>+// Copyright 2019 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// DynamicImage2DHLSL.cpp: Implementation for link and run-time HLSL generation
>+//
>+
>+#include "libANGLE/renderer/d3d/DynamicImage2DHLSL.h"
>+
>+#include "common/string_utils.h"
>+#include "libANGLE/renderer/d3d/ProgramD3D.h"
>+#include "libANGLE/renderer/d3d/ShaderD3D.h"
>+
>+using namespace gl;
>+
>+namespace rx
>+{
>+
>+namespace
>+{
>+
>+enum Image2DHLSLGroup
>+{
>+    IMAGE2D_R_FLOAT4,
>+    IMAGE2D_MIN = IMAGE2D_R_FLOAT4,
>+    IMAGE2D_R_UNORM,
>+    IMAGE2D_R_SNORM,
>+    IMAGE2D_R_UINT4,
>+    IMAGE2D_R_INT4,
>+    IMAGE2D_W_FLOAT4,
>+    IMAGE2D_W_UNORM,
>+    IMAGE2D_W_SNORM,
>+    IMAGE2D_W_UINT4,
>+    IMAGE2D_W_INT4,
>+    IMAGE2D_UNKNOWN,
>+    IMAGE2D_MAX = IMAGE2D_UNKNOWN
>+};
>+
>+enum Image2DMethod
>+{
>+    IMAGE2DSIZE,
>+    IMAGE2DLOAD,
>+    IMAGE2DSTORE
>+};
>+
>+Image2DHLSLGroup image2DHLSLGroup(const sh::Uniform &uniform)
>+{
>+    GLenum format = uniform.imageUnitFormat;
>+    bool readonly = uniform.readonly;
>+    switch (uniform.type)
>+    {
>+        case GL_IMAGE_2D:
>+        {
>+            switch (format)
>+            {
>+                case GL_RGBA32F:
>+                case GL_RGBA16F:
>+                case GL_R32F:
>+                    return readonly ? IMAGE2D_R_FLOAT4 : IMAGE2D_W_FLOAT4;
>+                case GL_RGBA8:
>+                    return readonly ? IMAGE2D_R_UNORM : IMAGE2D_W_UNORM;
>+                case GL_RGBA8_SNORM:
>+                    return readonly ? IMAGE2D_R_SNORM : IMAGE2D_W_SNORM;
>+                default:
>+                    UNREACHABLE();
>+                    return IMAGE2D_UNKNOWN;
>+            }
>+        }
>+        case GL_INT_IMAGE_2D:
>+        {
>+            switch (format)
>+            {
>+                case GL_RGBA32I:
>+                case GL_RGBA16I:
>+                case GL_RGBA8I:
>+                case GL_R32I:
>+                    return readonly ? IMAGE2D_R_INT4 : IMAGE2D_W_INT4;
>+                default:
>+                    UNREACHABLE();
>+                    return IMAGE2D_UNKNOWN;
>+            }
>+        }
>+        case GL_UNSIGNED_INT_IMAGE_2D:
>+        {
>+            switch (format)
>+            {
>+                case GL_RGBA32UI:
>+                case GL_RGBA16UI:
>+                case GL_RGBA8UI:
>+                case GL_R32UI:
>+                    return readonly ? IMAGE2D_R_UINT4 : IMAGE2D_W_UINT4;
>+                default:
>+                    UNREACHABLE();
>+                    return IMAGE2D_UNKNOWN;
>+            }
>+        }
>+        default:
>+            UNREACHABLE();
>+            return IMAGE2D_UNKNOWN;
>+    }
>+}
>+
>+std::string Image2DHLSLGroupSuffix(Image2DHLSLGroup group)
>+{
>+    switch (group)
>+    {
>+        case IMAGE2D_R_FLOAT4:
>+            return "2D";
>+        case IMAGE2D_R_UNORM:
>+            return "2D_unorm_float4_";
>+        case IMAGE2D_R_SNORM:
>+            return "2D_snorm_float4_";
>+        case IMAGE2D_R_UINT4:
>+            return "2D_uint4_";
>+        case IMAGE2D_R_INT4:
>+            return "2D_int4_";
>+        case IMAGE2D_W_FLOAT4:
>+            return "RW2D_float4_";
>+        case IMAGE2D_W_UNORM:
>+            return "RW2D_unorm_float4_";
>+        case IMAGE2D_W_SNORM:
>+            return "RW2D_snorm_float4_";
>+        case IMAGE2D_W_UINT4:
>+            return "RW2D_uint4_";
>+        case IMAGE2D_W_INT4:
>+            return "RW2D_int4_";
>+        default:
>+            UNREACHABLE();
>+    }
>+
>+    return "<unknown group type>";
>+}
>+
>+std::string Image2DHLSLTextureString(Image2DHLSLGroup group, gl::TextureType type)
>+{
>+    std::string textureString;
>+    switch (group)
>+    {
>+        case IMAGE2D_R_FLOAT4:
>+        case IMAGE2D_R_UNORM:
>+        case IMAGE2D_R_SNORM:
>+        case IMAGE2D_R_UINT4:
>+        case IMAGE2D_R_INT4:
>+            break;
>+        case IMAGE2D_W_FLOAT4:
>+        case IMAGE2D_W_UNORM:
>+        case IMAGE2D_W_SNORM:
>+        case IMAGE2D_W_UINT4:
>+        case IMAGE2D_W_INT4:
>+            textureString += "RW";
>+            break;
>+        default:
>+            UNREACHABLE();
>+    }
>+
>+    textureString += "Texture";
>+
>+    switch (type)
>+    {
>+        case gl::TextureType::_2D:
>+            textureString += "2D";
>+            break;
>+        case gl::TextureType::_3D:
>+            textureString += "3D";
>+            break;
>+        case gl::TextureType::_2DArray:
>+            textureString += "2DArray";
>+            break;
>+        default:
>+            UNREACHABLE();
>+    }
>+
>+    switch (group)
>+    {
>+        case IMAGE2D_R_FLOAT4:
>+        case IMAGE2D_W_FLOAT4:
>+            textureString += "<float4>";
>+            break;
>+        case IMAGE2D_R_UNORM:
>+        case IMAGE2D_W_UNORM:
>+            textureString += "<unorm float4>";
>+            break;
>+        case IMAGE2D_R_SNORM:
>+        case IMAGE2D_W_SNORM:
>+            textureString += "<snorm float4>";
>+            break;
>+        case IMAGE2D_R_UINT4:
>+        case IMAGE2D_W_UINT4:
>+            textureString += "<uint4>";
>+            break;
>+        case IMAGE2D_R_INT4:
>+        case IMAGE2D_W_INT4:
>+            textureString += "<int4>";
>+            break;
>+        default:
>+            UNREACHABLE();
>+    }
>+
>+    return textureString;
>+}
>+
>+std::string Image2DHLSLGroupOffsetPrefix(Image2DHLSLGroup group)
>+{
>+    switch (group)
>+    {
>+        case IMAGE2D_R_FLOAT4:
>+        case IMAGE2D_R_UNORM:
>+        case IMAGE2D_R_SNORM:
>+        case IMAGE2D_R_UINT4:
>+        case IMAGE2D_R_INT4:
>+            return "readonlyImageIndexOffset";
>+        case IMAGE2D_W_FLOAT4:
>+        case IMAGE2D_W_UNORM:
>+        case IMAGE2D_W_SNORM:
>+        case IMAGE2D_W_UINT4:
>+        case IMAGE2D_W_INT4:
>+            return "imageIndexOffset";
>+        default:
>+            UNREACHABLE();
>+    }
>+
>+    return "<unknown group type>";
>+}
>+
>+std::string Image2DHLSLGroupDeclarationPrefix(Image2DHLSLGroup group)
>+{
>+    switch (group)
>+    {
>+        case IMAGE2D_R_FLOAT4:
>+        case IMAGE2D_R_UNORM:
>+        case IMAGE2D_R_SNORM:
>+        case IMAGE2D_R_UINT4:
>+        case IMAGE2D_R_INT4:
>+            return "readonlyImages";
>+        case IMAGE2D_W_FLOAT4:
>+        case IMAGE2D_W_UNORM:
>+        case IMAGE2D_W_SNORM:
>+        case IMAGE2D_W_UINT4:
>+        case IMAGE2D_W_INT4:
>+            return "images";
>+        default:
>+            UNREACHABLE();
>+    }
>+
>+    return "<unknown group type>";
>+}
>+
>+std::string Image2DHLSLGroupRegisterSuffix(Image2DHLSLGroup group)
>+{
>+    switch (group)
>+    {
>+        case IMAGE2D_R_FLOAT4:
>+        case IMAGE2D_R_UNORM:
>+        case IMAGE2D_R_SNORM:
>+        case IMAGE2D_R_UINT4:
>+        case IMAGE2D_R_INT4:
>+            return "t";
>+        case IMAGE2D_W_FLOAT4:
>+        case IMAGE2D_W_UNORM:
>+        case IMAGE2D_W_SNORM:
>+        case IMAGE2D_W_UINT4:
>+        case IMAGE2D_W_INT4:
>+            return "u";
>+        default:
>+            UNREACHABLE();
>+    }
>+
>+    return "<unknown group type>";
>+}
>+
>+std::string Image2DHLSLGroupFunctionName(Image2DHLSLGroup group, Image2DMethod method)
>+{
>+    std::string name = "gl_image";
>+    name += Image2DHLSLGroupSuffix(group);
>+    switch (method)
>+    {
>+        case IMAGE2DSIZE:
>+            name += "Size";
>+            break;
>+        case IMAGE2DLOAD:
>+            name += "Load";
>+            break;
>+        case IMAGE2DSTORE:
>+            name += "Store";
>+            break;
>+        default:
>+            UNREACHABLE();
>+    }
>+
>+    return name;
>+}
>+
>+std::string getImage2DGroupReturnType(Image2DHLSLGroup group, Image2DMethod method)
>+{
>+    switch (method)
>+    {
>+        case IMAGE2DSIZE:
>+            return "int2";
>+        case IMAGE2DLOAD:
>+            switch (group)
>+            {
>+                case IMAGE2D_R_FLOAT4:
>+                case IMAGE2D_R_UNORM:
>+                case IMAGE2D_R_SNORM:
>+                case IMAGE2D_W_FLOAT4:
>+                case IMAGE2D_W_UNORM:
>+                case IMAGE2D_W_SNORM:
>+                    return "float4";
>+                case IMAGE2D_R_UINT4:
>+                case IMAGE2D_W_UINT4:
>+                    return "uint4";
>+                case IMAGE2D_R_INT4:
>+                case IMAGE2D_W_INT4:
>+                    return "int4";
>+                default:
>+                    UNREACHABLE();
>+                    return "unknown group type";
>+            }
>+        case IMAGE2DSTORE:
>+            return "void";
>+        default:
>+            UNREACHABLE();
>+            return "unknown image method";
>+    }
>+}
>+
>+std::string getImageMetadataLayer(Image2DHLSLGroup group)
>+{
>+    switch (group)
>+    {
>+        case IMAGE2D_R_FLOAT4:
>+        case IMAGE2D_R_UNORM:
>+        case IMAGE2D_R_SNORM:
>+        case IMAGE2D_R_UINT4:
>+        case IMAGE2D_R_INT4:
>+            return "readonlyImageMetadata[imageIndex - readonlyImageIndexStart].layer";
>+        case IMAGE2D_W_FLOAT4:
>+        case IMAGE2D_W_UNORM:
>+        case IMAGE2D_W_SNORM:
>+        case IMAGE2D_W_UINT4:
>+        case IMAGE2D_W_INT4:
>+            return "imageMetadata[imageIndex - imageIndexStart].layer";
>+        default:
>+            UNREACHABLE();
>+            return "unknown image method";
>+    }
>+}
>+
>+void OutputImage2DFunctionArgumentList(std::ostringstream &out,
>+                                       Image2DHLSLGroup group,
>+                                       Image2DMethod method)
>+{
>+    out << "uint imageIndex";
>+
>+    if (method == IMAGE2DLOAD || method == IMAGE2DSTORE)
>+    {
>+        out << ", int2 p";
>+        if (method == IMAGE2DSTORE)
>+        {
>+            switch (group)
>+            {
>+                case IMAGE2D_R_FLOAT4:
>+                case IMAGE2D_R_UNORM:
>+                case IMAGE2D_R_SNORM:
>+                case IMAGE2D_W_FLOAT4:
>+                case IMAGE2D_W_UNORM:
>+                case IMAGE2D_W_SNORM:
>+                    out << ", float4 data";
>+                    break;
>+                case IMAGE2D_R_UINT4:
>+                case IMAGE2D_W_UINT4:
>+                    out << ", uint4 data";
>+                    break;
>+                case IMAGE2D_R_INT4:
>+                case IMAGE2D_W_INT4:
>+                    out << ", int4 data";
>+                    break;
>+                default:
>+                    UNREACHABLE();
>+            }
>+        }
>+    }
>+}
>+
>+void OutputImage2DSizeFunction(std::ostringstream &out,
>+                               Image2DHLSLGroup textureGroup,
>+                               unsigned int totalCount,
>+                               unsigned int texture2DCount,
>+                               unsigned int texture3DCount,
>+                               unsigned int texture2DArrayCount,
>+                               const std::string &offsetStr,
>+                               const std::string &declarationStr)
>+{
>+    out << getImage2DGroupReturnType(textureGroup, IMAGE2DSIZE) << " "
>+        << Image2DHLSLGroupFunctionName(textureGroup, IMAGE2DSIZE) << "(";
>+    OutputImage2DFunctionArgumentList(out, textureGroup, IMAGE2DSIZE);
>+    out << ")\n"
>+           "{\n";
>+    out << "    uint width, height;\n";
>+
>+    if (texture2DCount > 0)
>+    {
>+        if (texture2DCount == totalCount)
>+        {
>+            out << "    const uint index = imageIndex -  " << offsetStr << "2D;\n";
>+            out << "    " << declarationStr << "2D[index].GetDimensions(width, height);\n";
>+        }
>+        else
>+        {
>+            out << "    if (imageIndex >= " << offsetStr << "2D && imageIndex < " << offsetStr
>+                << "2D + " << texture2DCount << ")\n";
>+            out << "    {\n";
>+            out << "        const uint index = imageIndex -  " << offsetStr << "2D;\n";
>+            out << "        " << declarationStr << "2D[index].GetDimensions(width, height);\n";
>+            out << "    }\n";
>+        }
>+    }
>+
>+    if (texture3DCount > 0)
>+    {
>+        if (texture3DCount == totalCount)
>+        {
>+            out << "    const uint index = imageIndex -  " << offsetStr << "3D;\n";
>+            out << "    uint depth;\n";
>+            out << "    " << declarationStr << "3D[index].GetDimensions(width, height, depth);\n";
>+        }
>+        else
>+        {
>+            if (texture2DArrayCount == 0)
>+            {
>+                out << "    else\n";
>+            }
>+            else
>+            {
>+                if (texture2DCount == 0)
>+                {
>+                    out << "    if ";
>+                }
>+                else
>+                {
>+                    out << "    else if";
>+                }
>+                out << "(imageIndex >= " << offsetStr << "3D && imageIndex < " << offsetStr
>+                    << "3D + " << texture3DCount << ")\n";
>+            }
>+            out << "    {\n";
>+            out << "        const uint index = imageIndex -  " << offsetStr << "3D;\n";
>+            out << "        uint depth;\n";
>+            out << "        " << declarationStr
>+                << "3D[index].GetDimensions(width, height, depth);\n";
>+            out << "    }\n";
>+        }
>+    }
>+
>+    if (texture2DArrayCount > 0)
>+    {
>+        if (texture2DArrayCount == totalCount)
>+        {
>+            out << "    const uint index = imageIndex -  " << offsetStr << "2DArray;\n";
>+            out << "    uint depth;\n";
>+            out << "    " << declarationStr
>+                << "2DArray[index].GetDimensions(width, height, depth);\n";
>+        }
>+        else
>+        {
>+            out << "    else\n";
>+            out << "    {\n";
>+            out << "        const uint index = imageIndex -  " << offsetStr << "2DArray;\n";
>+            out << "        uint depth;\n";
>+            out << "        " << declarationStr
>+                << "2DArray[index].GetDimensions(width, height, depth);\n";
>+            out << "    }\n";
>+        }
>+    }
>+    out << "    return int2(width, height);\n";
>+
>+    out << "}\n";
>+}
>+
>+void OutputImage2DLoadFunction(std::ostringstream &out,
>+                               Image2DHLSLGroup textureGroup,
>+                               unsigned int totalCount,
>+                               unsigned int texture2DCount,
>+                               unsigned int texture3DCount,
>+                               unsigned int texture2DArrayCount,
>+                               const std::string &offsetStr,
>+                               const std::string &declarationStr)
>+{
>+    out << getImage2DGroupReturnType(textureGroup, IMAGE2DLOAD) << " "
>+        << Image2DHLSLGroupFunctionName(textureGroup, IMAGE2DLOAD) << "(";
>+    OutputImage2DFunctionArgumentList(out, textureGroup, IMAGE2DLOAD);
>+    out << ")\n"
>+           "{\n";
>+
>+    out << "    " << getImage2DGroupReturnType(textureGroup, IMAGE2DLOAD) << " result;\n";
>+
>+    if (texture2DCount > 0)
>+    {
>+        if (texture2DCount == totalCount)
>+        {
>+            out << "    const uint index = imageIndex -  " << offsetStr << "2D;\n";
>+            out << "    result = " << declarationStr << "2D[index][uint2(p.x, p.y)];\n";
>+        }
>+        else
>+        {
>+            out << "    if (imageIndex >= " << offsetStr << "2D && imageIndex < " << offsetStr
>+                << "2D + " << texture2DCount << ")\n";
>+            out << "    {\n";
>+            out << "        const uint index = imageIndex -  " << offsetStr << "2D;\n";
>+            out << "        result = " << declarationStr << "2D[index][uint2(p.x, p.y)];\n";
>+            out << "    }\n";
>+        }
>+    }
>+
>+    if (texture3DCount > 0)
>+    {
>+        if (texture3DCount == totalCount)
>+        {
>+            out << "    const uint index = imageIndex -  " << offsetStr << "3D;\n";
>+            out << "    result = " << declarationStr << "3D[index][uint3(p.x, p.y, "
>+                << getImageMetadataLayer(textureGroup) << ")];\n";
>+        }
>+        else
>+        {
>+            if (texture2DArrayCount == 0)
>+            {
>+                out << "    else\n";
>+            }
>+            else
>+            {
>+                if (texture2DCount == 0)
>+                {
>+                    out << "    if ";
>+                }
>+                else
>+                {
>+                    out << "    else if";
>+                }
>+                out << "(imageIndex >= " << offsetStr << "3D && imageIndex < " << offsetStr
>+                    << "3D + " << texture3DCount << ")\n";
>+            }
>+            out << "    {\n";
>+            out << "        const uint index = imageIndex -  " << offsetStr << "3D;\n";
>+            out << "        result = " << declarationStr << "3D[index][uint3(p.x, p.y, "
>+                << getImageMetadataLayer(textureGroup) << ")];\n";
>+            out << "    }\n";
>+        }
>+    }
>+
>+    if (texture2DArrayCount > 0)
>+    {
>+        if (texture2DArrayCount == totalCount)
>+        {
>+            out << "    const uint index = imageIndex -  " << offsetStr << "2DArray;\n";
>+            out << "    result = " << declarationStr << "2DArray[index][uint3(p.x, p.y, "
>+                << getImageMetadataLayer(textureGroup) << ")];\n";
>+        }
>+        else
>+        {
>+            out << "    else\n";
>+            out << "    {\n";
>+            out << "        const uint index = imageIndex -  " << offsetStr << "2DArray;\n";
>+            out << "        result = " << declarationStr << "2DArray[index][uint3(p.x, p.y, "
>+                << getImageMetadataLayer(textureGroup) << ")];\n";
>+            out << "    }\n";
>+        }
>+    }
>+
>+    out << "    return result;\n";
>+    out << "}\n";
>+}
>+
>+void OutputImage2DStoreFunction(std::ostringstream &out,
>+                                Image2DHLSLGroup textureGroup,
>+                                unsigned int totalCount,
>+                                unsigned int texture2DCount,
>+                                unsigned int texture3DCount,
>+                                unsigned int texture2DArrayCount,
>+                                const std::string &offsetStr,
>+                                const std::string &declarationStr)
>+{
>+    out << getImage2DGroupReturnType(textureGroup, IMAGE2DSTORE) << " "
>+        << Image2DHLSLGroupFunctionName(textureGroup, IMAGE2DSTORE) << "(";
>+    OutputImage2DFunctionArgumentList(out, textureGroup, IMAGE2DSTORE);
>+    out << ")\n"
>+           "{\n";
>+
>+    if (texture2DCount > 0)
>+    {
>+        if (texture2DCount == totalCount)
>+        {
>+            out << "    const uint index = imageIndex -  " << offsetStr << "2D;\n";
>+            out << "    " << declarationStr << "2D[index][uint2(p.x, p.y)] = data;\n";
>+        }
>+        else
>+        {
>+            out << "    if (imageIndex >= " << offsetStr << "2D && imageIndex < " << offsetStr
>+                << "2D + " << texture2DCount << ")\n";
>+            out << "    {\n";
>+            out << "        const uint index = imageIndex -  " << offsetStr << "2D;\n";
>+            out << "        " << declarationStr << "2D[index][uint2(p.x, p.y)] = data;\n";
>+            out << "    }\n";
>+        }
>+    }
>+
>+    if (texture3DCount > 0)
>+    {
>+        if (texture3DCount == totalCount)
>+        {
>+            out << "    const uint index = imageIndex -  " << offsetStr << "3D;\n";
>+            out << "    " << declarationStr << "3D[index][uint3(p.x, p.y, "
>+                << getImageMetadataLayer(textureGroup) << ")] = data;\n";
>+        }
>+        else
>+        {
>+            if (texture2DArrayCount == 0)
>+            {
>+                out << "    else\n";
>+            }
>+            else
>+            {
>+                if (texture2DCount == 0)
>+                {
>+                    out << "    if ";
>+                }
>+                else
>+                {
>+                    out << "    else if";
>+                }
>+                out << "(imageIndex >= " << offsetStr << "3D && imageIndex < " << offsetStr
>+                    << "3D + " << texture3DCount << ")\n";
>+            }
>+            out << "    {\n";
>+            out << "        const uint index = imageIndex -  " << offsetStr << "3D;\n";
>+            out << "        " << declarationStr << "3D[index][uint3(p.x, p.y, "
>+                << getImageMetadataLayer(textureGroup) << ")] = data;\n";
>+            out << "    }\n";
>+        }
>+    }
>+
>+    if (texture2DArrayCount > 0)
>+    {
>+        if (texture2DArrayCount == totalCount)
>+        {
>+            out << "    const uint index = imageIndex -  " << offsetStr << "2DArray;\n";
>+            out << "    " << declarationStr << "2DArray[index][uint3(p.x, p.y, "
>+                << getImageMetadataLayer(textureGroup) << ")] = data;\n";
>+        }
>+        else
>+        {
>+            out << "    else\n";
>+            out << "    {\n";
>+            out << "        const uint index = imageIndex -  " << offsetStr << "2DArray;\n";
>+            out << "        " << declarationStr << "2DArray[index][uint3(p.x, p.y, "
>+                << getImageMetadataLayer(textureGroup) << ")] = data;\n";
>+            out << "    }\n";
>+        }
>+    }
>+
>+    out << "}\n";
>+}
>+
>+unsigned int *GetImage2DRegisterIndex(Image2DHLSLGroup textureGroup,
>+                                      unsigned int *groupTextureRegisterIndex,
>+                                      unsigned int *groupRWTextureRegisterIndex)
>+{
>+    switch (textureGroup)
>+    {
>+        case IMAGE2D_R_FLOAT4:
>+        case IMAGE2D_R_UNORM:
>+        case IMAGE2D_R_SNORM:
>+        case IMAGE2D_R_UINT4:
>+        case IMAGE2D_R_INT4:
>+            return groupTextureRegisterIndex;
>+        case IMAGE2D_W_FLOAT4:
>+        case IMAGE2D_W_UNORM:
>+        case IMAGE2D_W_SNORM:
>+        case IMAGE2D_W_UINT4:
>+        case IMAGE2D_W_INT4:
>+            return groupRWTextureRegisterIndex;
>+        default:
>+            UNREACHABLE();
>+            return nullptr;
>+    }
>+}
>+
>+void OutputHLSLImage2DUniformGroup(ProgramD3D &programD3D,
>+                                   const gl::ProgramState &programData,
>+                                   gl::ShaderType shaderType,
>+                                   std::ostringstream &out,
>+                                   const Image2DHLSLGroup textureGroup,
>+                                   const std::vector<sh::Uniform> &group,
>+                                   const gl::ImageUnitTextureTypeMap &image2DBindLayout,
>+                                   unsigned int *groupTextureRegisterIndex,
>+                                   unsigned int *groupRWTextureRegisterIndex,
>+                                   unsigned int *image2DTexture3D,
>+                                   unsigned int *image2DTexture2DArray,
>+                                   unsigned int *image2DTexture2D)
>+{
>+    if (group.empty())
>+    {
>+        return;
>+    }
>+
>+    unsigned int texture2DCount = 0, texture3DCount = 0, texture2DArrayCount = 0;
>+    for (const sh::Uniform &uniform : group)
>+    {
>+        if (!programD3D.hasNamedUniform(uniform.name))
>+        {
>+            continue;
>+        }
>+        for (unsigned int index = 0; index < uniform.getArraySizeProduct(); index++)
>+        {
>+            switch (image2DBindLayout.at(uniform.binding + index))
>+            {
>+                case gl::TextureType::_2D:
>+                    texture2DCount++;
>+                    break;
>+                case gl::TextureType::_3D:
>+                    texture3DCount++;
>+                    break;
>+                case gl::TextureType::_2DArray:
>+                case gl::TextureType::CubeMap:
>+                    texture2DArrayCount++;
>+                    break;
>+                default:
>+                    UNREACHABLE();
>+            }
>+        }
>+    }
>+
>+    unsigned int totalCount            = texture2DCount + texture3DCount + texture2DArrayCount;
>+    unsigned int *image2DRegisterIndex = GetImage2DRegisterIndex(
>+        textureGroup, groupTextureRegisterIndex, groupRWTextureRegisterIndex);
>+    unsigned int texture2DRegisterIndex      = *image2DRegisterIndex;
>+    unsigned int texture3DRegisterIndex      = texture2DRegisterIndex + texture2DCount;
>+    unsigned int texture2DArrayRegisterIndex = texture3DRegisterIndex + texture3DCount;
>+    *image2DRegisterIndex += totalCount;
>+
>+    std::string offsetStr =
>+        Image2DHLSLGroupOffsetPrefix(textureGroup) + Image2DHLSLGroupSuffix(textureGroup);
>+    std::string declarationStr =
>+        Image2DHLSLGroupDeclarationPrefix(textureGroup) + Image2DHLSLGroupSuffix(textureGroup);
>+    std::string registerStr = Image2DHLSLGroupRegisterSuffix(textureGroup);
>+    if (texture2DCount > 0)
>+    {
>+        out << "static const uint " << offsetStr << "2D = " << texture2DRegisterIndex << ";\n";
>+        out << "uniform " << Image2DHLSLTextureString(textureGroup, gl::TextureType::_2D) << " "
>+            << declarationStr << "2D[" << texture2DCount << "]"
>+            << " : register(" << registerStr << texture2DRegisterIndex << ");\n";
>+    }
>+    if (texture3DCount > 0)
>+    {
>+        out << "static const uint " << offsetStr << "3D = " << texture3DRegisterIndex << ";\n";
>+        out << "uniform " << Image2DHLSLTextureString(textureGroup, gl::TextureType::_3D) << " "
>+            << declarationStr << "3D[" << texture3DCount << "]"
>+            << " : register(" << registerStr << texture3DRegisterIndex << ");\n";
>+    }
>+    if (texture2DArrayCount > 0)
>+    {
>+        out << "static const uint " << offsetStr << "2DArray = " << texture2DArrayRegisterIndex
>+            << ";\n";
>+        out << "uniform " << Image2DHLSLTextureString(textureGroup, gl::TextureType::_2DArray)
>+            << " " << declarationStr << "2DArray[" << texture2DArrayCount << "]"
>+            << " : register(" << registerStr << texture2DArrayRegisterIndex << ");\n";
>+    }
>+    for (const sh::Uniform &uniform : group)
>+    {
>+        if (!programD3D.hasNamedUniform(uniform.name))
>+        {
>+            continue;
>+        }
>+
>+        out << "static const uint " << DecorateVariable(uniform.name)
>+            << ArrayIndexString(uniform.arraySizes) << " = {";
>+        for (unsigned int index = 0; index < uniform.getArraySizeProduct(); index++)
>+        {
>+            if (index > 0)
>+            {
>+                out << ", ";
>+            }
>+            switch (image2DBindLayout.at(uniform.binding + index))
>+            {
>+                case gl::TextureType::_2D:
>+                {
>+                    out << texture2DRegisterIndex;
>+                    programD3D.assignImage2DRegisters(texture2DRegisterIndex,
>+                                                      uniform.binding + index, uniform.readonly);
>+                    texture2DRegisterIndex++;
>+                    break;
>+                }
>+                case gl::TextureType::_3D:
>+                {
>+                    out << texture3DRegisterIndex;
>+                    programD3D.assignImage2DRegisters(texture3DRegisterIndex,
>+                                                      uniform.binding + index, uniform.readonly);
>+                    texture3DRegisterIndex++;
>+                    break;
>+                }
>+                case gl::TextureType::_2DArray:
>+                case gl::TextureType::CubeMap:
>+                {
>+                    out << texture2DArrayRegisterIndex;
>+                    programD3D.assignImage2DRegisters(texture2DArrayRegisterIndex,
>+                                                      uniform.binding + index, uniform.readonly);
>+                    texture2DArrayRegisterIndex++;
>+                    break;
>+                }
>+                default:
>+                    UNREACHABLE();
>+            }
>+        }
>+        out << "};\n";
>+    }
>+
>+    gl::Shader *shaderGL       = programData.getAttachedShader(shaderType);
>+    const ShaderD3D *shaderD3D = GetImplAs<ShaderD3D>(shaderGL);
>+
>+    if (shaderD3D->useImage2DFunction(Image2DHLSLGroupFunctionName(textureGroup, IMAGE2DSIZE)))
>+    {
>+        OutputImage2DSizeFunction(out, textureGroup, totalCount, texture2DCount, texture3DCount,
>+                                  texture2DArrayCount, offsetStr, declarationStr);
>+    }
>+    if (shaderD3D->useImage2DFunction(Image2DHLSLGroupFunctionName(textureGroup, IMAGE2DLOAD)))
>+    {
>+        OutputImage2DLoadFunction(out, textureGroup, totalCount, texture2DCount, texture3DCount,
>+                                  texture2DArrayCount, offsetStr, declarationStr);
>+    }
>+    if (shaderD3D->useImage2DFunction(Image2DHLSLGroupFunctionName(textureGroup, IMAGE2DSTORE)))
>+    {
>+        OutputImage2DStoreFunction(out, textureGroup, totalCount, texture2DCount, texture3DCount,
>+                                   texture2DArrayCount, offsetStr, declarationStr);
>+    }
>+}
>+
>+// kImage2DFunctionString must be the same as outputHLSL.
>+constexpr const char kImage2DFunctionString[] = "// @@ IMAGE2D DECLARATION FUNCTION STRING @@";
>+}  // anonymous namespace
>+
>+std::string generateShaderForImage2DBindSignature(
>+    const d3d::Context *context,
>+    ProgramD3D &programD3D,
>+    const gl::ProgramState &programData,
>+    gl::ShaderType shaderType,
>+    std::vector<sh::Uniform> &image2DUniforms,
>+    const gl::ImageUnitTextureTypeMap &image2DBindLayout)
>+{
>+    std::vector<std::vector<sh::Uniform>> groupedImage2DUniforms(IMAGE2D_MAX + 1);
>+    unsigned int image2DTexture2DCount = 0, image2DTexture3DCount = 0,
>+                 image2DTexture2DArrayCount = 0;
>+    for (sh::Uniform &image2D : image2DUniforms)
>+    {
>+        for (unsigned int index = 0; index < image2D.getArraySizeProduct(); index++)
>+        {
>+            // Any image variable declared without a binding qualifier is initially bound to unit
>+            // zero.
>+            if (image2D.binding == -1)
>+            {
>+                image2D.binding = 0;
>+            }
>+            switch (image2DBindLayout.at(image2D.binding + index))
>+            {
>+                case gl::TextureType::_2D:
>+                    image2DTexture2DCount++;
>+                    break;
>+                case gl::TextureType::_3D:
>+                    image2DTexture3DCount++;
>+                    break;
>+                case gl::TextureType::_2DArray:
>+                case gl::TextureType::CubeMap:
>+                    image2DTexture2DArrayCount++;
>+                    break;
>+                default:
>+                    UNREACHABLE();
>+            }
>+        }
>+        Image2DHLSLGroup group = image2DHLSLGroup(image2D);
>+        groupedImage2DUniforms[group].push_back(image2D);
>+    }
>+
>+    gl::Shader *shaderGL                     = programData.getAttachedShader(shaderType);
>+    const ShaderD3D *shaderD3D               = GetImplAs<ShaderD3D>(shaderGL);
>+    unsigned int groupTextureRegisterIndex   = shaderD3D->getReadonlyImage2DRegisterIndex();
>+    unsigned int groupRWTextureRegisterIndex = shaderD3D->getImage2DRegisterIndex();
>+    unsigned int image2DTexture3DIndex       = 0;
>+    unsigned int image2DTexture2DArrayIndex  = image2DTexture3DCount;
>+    unsigned int image2DTexture2DIndex       = image2DTexture3DCount + image2DTexture2DArrayCount;
>+    std::ostringstream out;
>+
>+    for (int groupId = IMAGE2D_MIN; groupId < IMAGE2D_MAX; ++groupId)
>+    {
>+        OutputHLSLImage2DUniformGroup(programD3D, programData, shaderType, out,
>+                                      Image2DHLSLGroup(groupId), groupedImage2DUniforms[groupId],
>+                                      image2DBindLayout, &groupTextureRegisterIndex,
>+                                      &groupRWTextureRegisterIndex, &image2DTexture3DIndex,
>+                                      &image2DTexture2DArrayIndex, &image2DTexture2DIndex);
>+    }
>+
>+    std::string shaderHLSL(programData.getAttachedShader(shaderType)->getTranslatedSource());
>+    bool success = angle::ReplaceSubstring(&shaderHLSL, kImage2DFunctionString, out.str());
>+    ASSERT(success);
>+
>+    return shaderHLSL;
>+}
>+
>+}  // namespace rx
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/DynamicImage2DHLSL.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/DynamicImage2DHLSL.h
>new file mode 100644
>index 00000000000..761730176d9
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/DynamicImage2DHLSL.h
>@@ -0,0 +1,39 @@
>+//
>+// Copyright 2019 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// DynamicImage2DHLSL.h: Interface for link and run-time HLSL generation
>+//
>+
>+#ifndef LIBANGLE_RENDERER_D3D_DYNAMICIMAGE2DHLSL_H_
>+#define LIBANGLE_RENDERER_D3D_DYNAMICIMAGE2DHLSL_H_
>+
>+#include "common/angleutils.h"
>+#include "libANGLE/renderer/d3d/RendererD3D.h"
>+
>+namespace rx
>+{
>+std::string generateShaderForImage2DBindSignature(
>+    const d3d::Context *context,
>+    ProgramD3D &programD3D,
>+    const gl::ProgramState &programData,
>+    gl::ShaderType shaderType,
>+    std::vector<sh::Uniform> &image2DUniforms,
>+    const gl::ImageUnitTextureTypeMap &image2DBindLayout);
>+
>+inline std::string GenerateComputeShaderForImage2DBindSignature(
>+    const d3d::Context *context,
>+    ProgramD3D &programD3D,
>+    const gl::ProgramState &programData,
>+    std::vector<sh::Uniform> &image2DUniforms,
>+    const gl::ImageUnitTextureTypeMap &image2DBindLayout)
>+{
>+    return generateShaderForImage2DBindSignature(context, programD3D, programData,
>+                                                 gl::ShaderType::Compute, image2DUniforms,
>+                                                 image2DBindLayout);
>+}
>+
>+}  // namespace rx
>+
>+#endif  // LIBANGLE_RENDERER_D3D_DYNAMICHLSL_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/EGLImageD3D.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/EGLImageD3D.cpp
>index fcc2456bd67..a7255d0d25c 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/EGLImageD3D.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/EGLImageD3D.cpp
>@@ -11,10 +11,11 @@
> #include "common/debug.h"
> #include "common/utilities.h"
> #include "libANGLE/AttributeMap.h"
>+#include "libANGLE/Context.h"
> #include "libANGLE/Texture.h"
>+#include "libANGLE/renderer/d3d/RenderTargetD3D.h"
> #include "libANGLE/renderer/d3d/RenderbufferD3D.h"
> #include "libANGLE/renderer/d3d/RendererD3D.h"
>-#include "libANGLE/renderer/d3d/RenderTargetD3D.h"
> #include "libANGLE/renderer/d3d/TextureD3D.h"
> #include "libANGLE/renderer/d3d/TextureStorage.h"
> 
>@@ -37,51 +38,53 @@ EGLImageD3D::~EGLImageD3D()
>     SafeDelete(mRenderTarget);
> }
> 
>-egl::Error EGLImageD3D::initialize()
>+egl::Error EGLImageD3D::initialize(const egl::Display *display)
> {
>     return egl::NoError();
> }
> 
>-gl::Error EGLImageD3D::orphan(const gl::Context *context, egl::ImageSibling *sibling)
>+angle::Result EGLImageD3D::orphan(const gl::Context *context, egl::ImageSibling *sibling)
> {
>-    if (sibling == mState.source.get())
>+    if (sibling == mState.source)
>     {
>         ANGLE_TRY(copyToLocalRendertarget(context));
>     }
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error EGLImageD3D::getRenderTarget(const gl::Context *context, RenderTargetD3D **outRT) const
>+angle::Result EGLImageD3D::getRenderTarget(const gl::Context *context,
>+                                           RenderTargetD3D **outRT) const
> {
>-    if (mState.source.get())
>+    if (mState.source != nullptr)
>     {
>         ASSERT(!mRenderTarget);
>         FramebufferAttachmentRenderTarget *rt = nullptr;
>         ANGLE_TRY(
>             mState.source->getAttachmentRenderTarget(context, GL_NONE, mState.imageIndex, &rt));
>         *outRT = static_cast<RenderTargetD3D *>(rt);
>-        return gl::NoError();
>-    }
>-    else
>-    {
>-        ASSERT(mRenderTarget);
>-        *outRT = mRenderTarget;
>-        return gl::NoError();
>+        return angle::Result::Continue;
>     }
>+
>+    ASSERT(mRenderTarget);
>+    *outRT = mRenderTarget;
>+    return angle::Result::Continue;
> }
> 
>-gl::Error EGLImageD3D::copyToLocalRendertarget(const gl::Context *context)
>+angle::Result EGLImageD3D::copyToLocalRendertarget(const gl::Context *context)
> {
>-    ASSERT(mState.source.get() != nullptr);
>+    ASSERT(mState.source != nullptr);
>     ASSERT(mRenderTarget == nullptr);
> 
>     RenderTargetD3D *curRenderTarget = nullptr;
>     ANGLE_TRY(getRenderTarget(context, &curRenderTarget));
> 
>-    // This only currently applies do D3D11, where it invalidates FBOs with this Image attached.
>-    curRenderTarget->signalDirty(context);
>+    // Invalidate FBOs with this Image attached. Only currently applies to D3D11.
>+    for (egl::ImageSibling *target : mState.targets)
>+    {
>+        target->onStateChange(context, angle::SubjectMessage::STORAGE_CHANGED);
>+    }
> 
>-    return mRenderer->createRenderTargetCopy(curRenderTarget, &mRenderTarget);
>+    return mRenderer->createRenderTargetCopy(context, curRenderTarget, &mRenderTarget);
> }
> }  // namespace rx
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/EGLImageD3D.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/EGLImageD3D.h
>index 1ee79844263..0470274699c 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/EGLImageD3D.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/EGLImageD3D.h
>@@ -38,14 +38,14 @@ class EGLImageD3D final : public ImageImpl
>                 RendererD3D *renderer);
>     ~EGLImageD3D() override;
> 
>-    egl::Error initialize() override;
>+    egl::Error initialize(const egl::Display *display) override;
> 
>-    gl::Error orphan(const gl::Context *context, egl::ImageSibling *sibling) override;
>+    angle::Result orphan(const gl::Context *context, egl::ImageSibling *sibling) override;
> 
>-    gl::Error getRenderTarget(const gl::Context *context, RenderTargetD3D **outRT) const;
>+    angle::Result getRenderTarget(const gl::Context *context, RenderTargetD3D **outRT) const;
> 
>   private:
>-    gl::Error copyToLocalRendertarget(const gl::Context *context);
>+    angle::Result copyToLocalRendertarget(const gl::Context *context);
> 
>     RendererD3D *mRenderer;
>     RenderTargetD3D *mRenderTarget;
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/FramebufferD3D.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/FramebufferD3D.cpp
>index 3d73b2c840d..037ff28d1a0 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/FramebufferD3D.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/FramebufferD3D.cpp
>@@ -15,6 +15,7 @@
> #include "libANGLE/Surface.h"
> #include "libANGLE/formatutils.h"
> #include "libANGLE/renderer/ContextImpl.h"
>+#include "libANGLE/renderer/d3d/ContextD3D.h"
> #include "libANGLE/renderer/d3d/RenderTargetD3D.h"
> #include "libANGLE/renderer/d3d/RenderbufferD3D.h"
> #include "libANGLE/renderer/d3d/RendererD3D.h"
>@@ -85,34 +86,31 @@ ClearParameters GetClearParameters(const gl::State &state, GLbitfield mask)
> 
>     return clearParams;
> }
>-}
>+}  // namespace
> 
> ClearParameters::ClearParameters() = default;
> 
> ClearParameters::ClearParameters(const ClearParameters &other) = default;
> 
> FramebufferD3D::FramebufferD3D(const gl::FramebufferState &data, RendererD3D *renderer)
>-    : FramebufferImpl(data), mRenderer(renderer)
>-{
>-}
>+    : FramebufferImpl(data), mRenderer(renderer), mDummyAttachment()
>+{}
> 
>-FramebufferD3D::~FramebufferD3D()
>-{
>-}
>+FramebufferD3D::~FramebufferD3D() {}
> 
>-gl::Error FramebufferD3D::clear(const gl::Context *context, GLbitfield mask)
>+angle::Result FramebufferD3D::clear(const gl::Context *context, GLbitfield mask)
> {
>-    ClearParameters clearParams = GetClearParameters(context->getGLState(), mask);
>+    ClearParameters clearParams = GetClearParameters(context->getState(), mask);
>     return clearImpl(context, clearParams);
> }
> 
>-gl::Error FramebufferD3D::clearBufferfv(const gl::Context *context,
>-                                        GLenum buffer,
>-                                        GLint drawbuffer,
>-                                        const GLfloat *values)
>+angle::Result FramebufferD3D::clearBufferfv(const gl::Context *context,
>+                                            GLenum buffer,
>+                                            GLint drawbuffer,
>+                                            const GLfloat *values)
> {
>     // glClearBufferfv can be called to clear the color buffer or depth buffer
>-    ClearParameters clearParams = GetClearParameters(context->getGLState(), 0);
>+    ClearParameters clearParams = GetClearParameters(context->getState(), 0);
> 
>     if (buffer == GL_COLOR)
>     {
>@@ -133,13 +131,13 @@ gl::Error FramebufferD3D::clearBufferfv(const gl::Context *context,
>     return clearImpl(context, clearParams);
> }
> 
>-gl::Error FramebufferD3D::clearBufferuiv(const gl::Context *context,
>-                                         GLenum buffer,
>-                                         GLint drawbuffer,
>-                                         const GLuint *values)
>+angle::Result FramebufferD3D::clearBufferuiv(const gl::Context *context,
>+                                             GLenum buffer,
>+                                             GLint drawbuffer,
>+                                             const GLuint *values)
> {
>     // glClearBufferuiv can only be called to clear a color buffer
>-    ClearParameters clearParams = GetClearParameters(context->getGLState(), 0);
>+    ClearParameters clearParams = GetClearParameters(context->getState(), 0);
>     for (unsigned int i = 0; i < ArraySize(clearParams.clearColor); i++)
>     {
>         clearParams.clearColor[i] = (drawbuffer == static_cast<int>(i));
>@@ -150,13 +148,13 @@ gl::Error FramebufferD3D::clearBufferuiv(const gl::Context *context,
>     return clearImpl(context, clearParams);
> }
> 
>-gl::Error FramebufferD3D::clearBufferiv(const gl::Context *context,
>-                                        GLenum buffer,
>-                                        GLint drawbuffer,
>-                                        const GLint *values)
>+angle::Result FramebufferD3D::clearBufferiv(const gl::Context *context,
>+                                            GLenum buffer,
>+                                            GLint drawbuffer,
>+                                            const GLint *values)
> {
>     // glClearBufferiv can be called to clear the color buffer or stencil buffer
>-    ClearParameters clearParams = GetClearParameters(context->getGLState(), 0);
>+    ClearParameters clearParams = GetClearParameters(context->getState(), 0);
> 
>     if (buffer == GL_COLOR)
>     {
>@@ -177,18 +175,18 @@ gl::Error FramebufferD3D::clearBufferiv(const gl::Context *context,
>     return clearImpl(context, clearParams);
> }
> 
>-gl::Error FramebufferD3D::clearBufferfi(const gl::Context *context,
>-                                        GLenum buffer,
>-                                        GLint drawbuffer,
>-                                        GLfloat depth,
>-                                        GLint stencil)
>+angle::Result FramebufferD3D::clearBufferfi(const gl::Context *context,
>+                                            GLenum buffer,
>+                                            GLint drawbuffer,
>+                                            GLfloat depth,
>+                                            GLint stencil)
> {
>     // glClearBufferfi can only be called to clear a depth stencil buffer
>-    ClearParameters clearParams   = GetClearParameters(context->getGLState(), 0);
>-    clearParams.clearDepth        = true;
>-    clearParams.depthValue        = depth;
>-    clearParams.clearStencil      = true;
>-    clearParams.stencilValue      = stencil;
>+    ClearParameters clearParams = GetClearParameters(context->getState(), 0);
>+    clearParams.clearDepth      = true;
>+    clearParams.depthValue      = depth;
>+    clearParams.clearStencil    = true;
>+    clearParams.stencilValue    = stencil;
> 
>     return clearImpl(context, clearParams);
> }
>@@ -203,8 +201,8 @@ GLenum FramebufferD3D::getImplementationColorReadFormat(const gl::Context *conte
>     }
> 
>     RenderTargetD3D *attachmentRenderTarget = nullptr;
>-    gl::Error error = readAttachment->getRenderTarget(context, &attachmentRenderTarget);
>-    if (error.isError())
>+    angle::Result error = readAttachment->getRenderTarget(context, &attachmentRenderTarget);
>+    if (error != angle::Result::Continue)
>     {
>         return GL_NONE;
>     }
>@@ -226,8 +224,8 @@ GLenum FramebufferD3D::getImplementationColorReadType(const gl::Context *context
>     }
> 
>     RenderTargetD3D *attachmentRenderTarget = nullptr;
>-    gl::Error error = readAttachment->getRenderTarget(context, &attachmentRenderTarget);
>-    if (error.isError())
>+    angle::Result error = readAttachment->getRenderTarget(context, &attachmentRenderTarget);
>+    if (error != angle::Result::Continue)
>     {
>         return GL_NONE;
>     }
>@@ -239,69 +237,72 @@ GLenum FramebufferD3D::getImplementationColorReadType(const gl::Context *context
>     return implementationFormatInfo.getReadPixelsType(context->getClientVersion());
> }
> 
>-gl::Error FramebufferD3D::readPixels(const gl::Context *context,
>-                                     const gl::Rectangle &origArea,
>-                                     GLenum format,
>-                                     GLenum type,
>-                                     void *pixels)
>+angle::Result FramebufferD3D::readPixels(const gl::Context *context,
>+                                         const gl::Rectangle &area,
>+                                         GLenum format,
>+                                         GLenum type,
>+                                         void *pixels)
> {
>     // Clip read area to framebuffer.
>     const gl::Extents fbSize = getState().getReadAttachment()->getSize();
>     const gl::Rectangle fbRect(0, 0, fbSize.width, fbSize.height);
>-    gl::Rectangle area;
>-    if (!ClipRectangle(origArea, fbRect, &area))
>+    gl::Rectangle clippedArea;
>+    if (!ClipRectangle(area, fbRect, &clippedArea))
>     {
>         // nothing to read
>-        return gl::NoError();
>+        return angle::Result::Continue;
>     }
> 
>-    const gl::PixelPackState &packState = context->getGLState().getPackState();
>+    const gl::PixelPackState &packState = context->getState().getPackState();
> 
>     const gl::InternalFormat &sizedFormatInfo = gl::GetInternalFormatInfo(format, type);
> 
>+    ContextD3D *contextD3D = GetImplAs<ContextD3D>(context);
>+
>     GLuint outputPitch = 0;
>-    ANGLE_TRY_RESULT(sizedFormatInfo.computeRowPitch(type, origArea.width, packState.alignment,
>-                                                     packState.rowLength),
>-                     outputPitch);
>+    ANGLE_CHECK_GL_MATH(contextD3D,
>+                        sizedFormatInfo.computeRowPitch(type, area.width, packState.alignment,
>+                                                        packState.rowLength, &outputPitch));
>+
>     GLuint outputSkipBytes = 0;
>-    ANGLE_TRY_RESULT(sizedFormatInfo.computeSkipBytes(outputPitch, 0, packState, false),
>-                     outputSkipBytes);
>-    outputSkipBytes +=
>-        (area.x - origArea.x) * sizedFormatInfo.pixelBytes + (area.y - origArea.y) * outputPitch;
>+    ANGLE_CHECK_GL_MATH(contextD3D, sizedFormatInfo.computeSkipBytes(
>+                                        type, outputPitch, 0, packState, false, &outputSkipBytes));
>+    outputSkipBytes += (clippedArea.x - area.x) * sizedFormatInfo.pixelBytes +
>+                       (clippedArea.y - area.y) * outputPitch;
> 
>-    return readPixelsImpl(context, area, format, type, outputPitch, packState,
>-                          reinterpret_cast<uint8_t *>(pixels) + outputSkipBytes);
>+    return readPixelsImpl(context, clippedArea, format, type, outputPitch, packState,
>+                          static_cast<uint8_t *>(pixels) + outputSkipBytes);
> }
> 
>-gl::Error FramebufferD3D::blit(const gl::Context *context,
>-                               const gl::Rectangle &sourceArea,
>-                               const gl::Rectangle &destArea,
>-                               GLbitfield mask,
>-                               GLenum filter)
>+angle::Result FramebufferD3D::blit(const gl::Context *context,
>+                                   const gl::Rectangle &sourceArea,
>+                                   const gl::Rectangle &destArea,
>+                                   GLbitfield mask,
>+                                   GLenum filter)
> {
>-    const auto &glState                      = context->getGLState();
>+    const auto &glState                      = context->getState();
>     const gl::Framebuffer *sourceFramebuffer = glState.getReadFramebuffer();
>     const gl::Rectangle *scissor = glState.isScissorTestEnabled() ? &glState.getScissor() : nullptr;
>     ANGLE_TRY(blitImpl(context, sourceArea, destArea, scissor, (mask & GL_COLOR_BUFFER_BIT) != 0,
>                        (mask & GL_DEPTH_BUFFER_BIT) != 0, (mask & GL_STENCIL_BUFFER_BIT) != 0,
>                        filter, sourceFramebuffer));
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
> bool FramebufferD3D::checkStatus(const gl::Context *context) const
> {
>     // if we have both a depth and stencil buffer, they must refer to the same object
>     // since we only support packed_depth_stencil and not separate depth and stencil
>-    if (mState.getDepthAttachment() != nullptr && mState.getStencilAttachment() != nullptr &&
>-        mState.getDepthStencilAttachment() == nullptr)
>+    if (mState.hasSeparateDepthAndStencilAttachments())
>     {
>         return false;
>     }
> 
>     // D3D11 does not allow for overlapping RenderTargetViews.
>     // If WebGL compatibility is enabled, this has already been checked at a higher level.
>-    ASSERT(!context->getExtensions().webglCompatibility || mState.colorAttachmentsAreUniqueImages());
>+    ASSERT(!context->getExtensions().webglCompatibility ||
>+           mState.colorAttachmentsAreUniqueImages());
>     if (!context->getExtensions().webglCompatibility)
>     {
>         if (!mState.colorAttachmentsAreUniqueImages())
>@@ -319,12 +320,12 @@ bool FramebufferD3D::checkStatus(const gl::Context *context) const
>     return true;
> }
> 
>-void FramebufferD3D::syncState(const gl::Context *context,
>-                               const gl::Framebuffer::DirtyBits &dirtyBits)
>+angle::Result FramebufferD3D::syncState(const gl::Context *context,
>+                                        const gl::Framebuffer::DirtyBits &dirtyBits)
> {
>     if (!mColorAttachmentsForRender.valid())
>     {
>-        return;
>+        return angle::Result::Continue;
>     }
> 
>     for (auto dirtyBit : dirtyBits)
>@@ -336,12 +337,14 @@ void FramebufferD3D::syncState(const gl::Context *context,
>             mColorAttachmentsForRender.reset();
>         }
>     }
>+
>+    return angle::Result::Continue;
> }
> 
> const gl::AttachmentList &FramebufferD3D::getColorAttachmentsForRender(const gl::Context *context)
> {
>     gl::DrawBufferMask activeProgramOutputs =
>-        context->getContextState().getState().getProgram()->getActiveOutputVariables();
>+        context->getState().getProgram()->getActiveOutputVariables();
> 
>     if (mColorAttachmentsForRender.valid() && mCurrentActiveProgramOutputs == activeProgramOutputs)
>     {
>@@ -377,29 +380,54 @@ const gl::AttachmentList &FramebufferD3D::getColorAttachmentsForRender(const gl:
>     // drivers < 4815. The rendering samples always pass neglecting discard statements in pixel
>     // shader. We add a dummy texture as render target in such case.
>     if (mRenderer->getWorkarounds().addDummyTextureNoRenderTarget &&
>-        colorAttachmentsForRender.empty())
>+        colorAttachmentsForRender.empty() && activeProgramOutputs.any())
>     {
>         static_assert(static_cast<size_t>(activeProgramOutputs.size()) <= 32,
>                       "Size of active program outputs should less or equal than 32.");
>-        GLenum i = static_cast<GLenum>(
>+        const GLuint activeProgramLocation = static_cast<GLuint>(
>             gl::ScanForward(static_cast<uint32_t>(activeProgramOutputs.bits())));
> 
>-        gl::Texture *dummyTex = nullptr;
>-        // TODO(Jamie): Handle error if dummy texture can't be created.
>-        ANGLE_SWALLOW_ERR(mRenderer->getIncompleteTexture(context, GL_TEXTURE_2D, &dummyTex));
>-        if (dummyTex)
>+        if (mDummyAttachment.isAttached() &&
>+            (mDummyAttachment.getBinding() - GL_COLOR_ATTACHMENT0) == activeProgramLocation)
>         {
>-            gl::ImageIndex index                   = gl::ImageIndex::Make2D(0);
>-            gl::FramebufferAttachment *dummyAttach = new gl::FramebufferAttachment(
>-                context, GL_TEXTURE, GL_COLOR_ATTACHMENT0_EXT + i, index, dummyTex);
>-            colorAttachmentsForRender.push_back(dummyAttach);
>+            colorAttachmentsForRender.push_back(&mDummyAttachment);
>+        }
>+        else
>+        {
>+            // Remove dummy attachment to prevents us from leaking it, and the program may require
>+            // it to be attached to a new binding point.
>+            if (mDummyAttachment.isAttached())
>+            {
>+                mDummyAttachment.detach(context);
>+            }
>+
>+            gl::Texture *dummyTex = nullptr;
>+            // TODO(Jamie): Handle error if dummy texture can't be created.
>+            (void)mRenderer->getIncompleteTexture(context, gl::TextureType::_2D, &dummyTex);
>+            if (dummyTex)
>+            {
>+
>+                gl::ImageIndex index = gl::ImageIndex::Make2D(0);
>+                mDummyAttachment     = gl::FramebufferAttachment(
>+                    context, GL_TEXTURE, GL_COLOR_ATTACHMENT0_EXT + activeProgramLocation, index,
>+                    dummyTex);
>+                colorAttachmentsForRender.push_back(&mDummyAttachment);
>+            }
>         }
>     }
> 
>-    mColorAttachmentsForRender = std::move(colorAttachmentsForRender);
>+    mColorAttachmentsForRender   = std::move(colorAttachmentsForRender);
>     mCurrentActiveProgramOutputs = activeProgramOutputs;
> 
>     return mColorAttachmentsForRender.value();
> }
> 
>+void FramebufferD3D::destroy(const gl::Context *context)
>+{
>+    if (mDummyAttachment.isAttached())
>+    {
>+        mDummyAttachment.detach(context);
>+    }
>+}
>+
> }  // namespace rx
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/FramebufferD3D.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/FramebufferD3D.h
>index a7312fdef4c..6e024ac7003 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/FramebufferD3D.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/FramebufferD3D.h
>@@ -23,7 +23,7 @@ class FramebufferAttachment;
> struct PixelPackState;
> 
> typedef std::vector<const FramebufferAttachment *> AttachmentList;
>-}
>+}  // namespace gl
> 
> namespace rx
> {
>@@ -62,73 +62,78 @@ class FramebufferD3D : public FramebufferImpl
>     FramebufferD3D(const gl::FramebufferState &data, RendererD3D *renderer);
>     ~FramebufferD3D() override;
> 
>-    gl::Error clear(const gl::Context *context, GLbitfield mask) override;
>-    gl::Error clearBufferfv(const gl::Context *context,
>-                            GLenum buffer,
>-                            GLint drawbuffer,
>-                            const GLfloat *values) override;
>-    gl::Error clearBufferuiv(const gl::Context *context,
>-                             GLenum buffer,
>-                             GLint drawbuffer,
>-                             const GLuint *values) override;
>-    gl::Error clearBufferiv(const gl::Context *context,
>-                            GLenum buffer,
>-                            GLint drawbuffer,
>-                            const GLint *values) override;
>-    gl::Error clearBufferfi(const gl::Context *context,
>-                            GLenum buffer,
>-                            GLint drawbuffer,
>-                            GLfloat depth,
>-                            GLint stencil) override;
>+    angle::Result clear(const gl::Context *context, GLbitfield mask) override;
>+    angle::Result clearBufferfv(const gl::Context *context,
>+                                GLenum buffer,
>+                                GLint drawbuffer,
>+                                const GLfloat *values) override;
>+    angle::Result clearBufferuiv(const gl::Context *context,
>+                                 GLenum buffer,
>+                                 GLint drawbuffer,
>+                                 const GLuint *values) override;
>+    angle::Result clearBufferiv(const gl::Context *context,
>+                                GLenum buffer,
>+                                GLint drawbuffer,
>+                                const GLint *values) override;
>+    angle::Result clearBufferfi(const gl::Context *context,
>+                                GLenum buffer,
>+                                GLint drawbuffer,
>+                                GLfloat depth,
>+                                GLint stencil) override;
> 
>     GLenum getImplementationColorReadFormat(const gl::Context *context) const override;
>     GLenum getImplementationColorReadType(const gl::Context *context) const override;
>-    gl::Error readPixels(const gl::Context *context,
>-                         const gl::Rectangle &area,
>-                         GLenum format,
>-                         GLenum type,
>-                         void *pixels) override;
>-
>-    gl::Error blit(const gl::Context *context,
>-                   const gl::Rectangle &sourceArea,
>-                   const gl::Rectangle &destArea,
>-                   GLbitfield mask,
>-                   GLenum filter) override;
>+    angle::Result readPixels(const gl::Context *context,
>+                             const gl::Rectangle &area,
>+                             GLenum format,
>+                             GLenum type,
>+                             void *pixels) override;
>+
>+    angle::Result blit(const gl::Context *context,
>+                       const gl::Rectangle &sourceArea,
>+                       const gl::Rectangle &destArea,
>+                       GLbitfield mask,
>+                       GLenum filter) override;
> 
>     bool checkStatus(const gl::Context *context) const override;
> 
>-    void syncState(const gl::Context *context,
>-                   const gl::Framebuffer::DirtyBits &dirtyBits) override;
>+    angle::Result syncState(const gl::Context *context,
>+                            const gl::Framebuffer::DirtyBits &dirtyBits) override;
> 
>     const gl::AttachmentList &getColorAttachmentsForRender(const gl::Context *context);
> 
>+    void destroy(const gl::Context *context) override;
>+
>   private:
>-    virtual gl::Error clearImpl(const gl::Context *context, const ClearParameters &clearParams) = 0;
>-
>-    virtual gl::Error readPixelsImpl(const gl::Context *context,
>-                                     const gl::Rectangle &area,
>-                                     GLenum format,
>-                                     GLenum type,
>-                                     size_t outputPitch,
>-                                     const gl::PixelPackState &pack,
>-                                     uint8_t *pixels) = 0;
>-
>-    virtual gl::Error blitImpl(const gl::Context *context,
>-                               const gl::Rectangle &sourceArea,
>-                               const gl::Rectangle &destArea,
>-                               const gl::Rectangle *scissor,
>-                               bool blitRenderTarget,
>-                               bool blitDepth,
>-                               bool blitStencil,
>-                               GLenum filter,
>-                               const gl::Framebuffer *sourceFramebuffer) = 0;
>+    virtual angle::Result clearImpl(const gl::Context *context,
>+                                    const ClearParameters &clearParams) = 0;
>+
>+    virtual angle::Result readPixelsImpl(const gl::Context *context,
>+                                         const gl::Rectangle &area,
>+                                         GLenum format,
>+                                         GLenum type,
>+                                         size_t outputPitch,
>+                                         const gl::PixelPackState &pack,
>+                                         uint8_t *pixels) = 0;
>+
>+    virtual angle::Result blitImpl(const gl::Context *context,
>+                                   const gl::Rectangle &sourceArea,
>+                                   const gl::Rectangle &destArea,
>+                                   const gl::Rectangle *scissor,
>+                                   bool blitRenderTarget,
>+                                   bool blitDepth,
>+                                   bool blitStencil,
>+                                   GLenum filter,
>+                                   const gl::Framebuffer *sourceFramebuffer) = 0;
> 
>     virtual GLenum getRenderTargetImplementationFormat(RenderTargetD3D *renderTarget) const = 0;
> 
>     RendererD3D *mRenderer;
>     Optional<gl::AttachmentList> mColorAttachmentsForRender;
>     gl::DrawBufferMask mCurrentActiveProgramOutputs;
>+
>+    gl::FramebufferAttachment mDummyAttachment;
> };
>-}
>+}  // namespace rx
> 
> #endif  // LIBANGLE_RENDERER_D3D_FRAMBUFFERD3D_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/HLSLCompiler.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/HLSLCompiler.cpp
>index b38765070b2..31b7fe80c9d 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/HLSLCompiler.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/HLSLCompiler.cpp
>@@ -9,19 +9,24 @@
> #include <sstream>
> 
> #include "common/utilities.h"
>+#include "libANGLE/Context.h"
> #include "libANGLE/Program.h"
> #include "libANGLE/features.h"
> #include "libANGLE/histogram_macros.h"
>+#include "libANGLE/renderer/d3d/ContextD3D.h"
> #include "third_party/trace_event/trace_event.h"
> 
>-#if ANGLE_APPEND_ASSEMBLY_TO_SHADER_DEBUG_INFO == ANGLE_ENABLED
> namespace
> {
>-#ifdef CREATE_COMPILER_FLAG_INFO
>-    #undef CREATE_COMPILER_FLAG_INFO
>-#endif
>+#if ANGLE_APPEND_ASSEMBLY_TO_SHADER_DEBUG_INFO == ANGLE_ENABLED
>+#    ifdef CREATE_COMPILER_FLAG_INFO
>+#        undef CREATE_COMPILER_FLAG_INFO
>+#    endif
> 
>-#define CREATE_COMPILER_FLAG_INFO(flag) { flag, #flag }
>+#    define CREATE_COMPILER_FLAG_INFO(flag) \
>+        {                                   \
>+            flag, #flag                     \
>+        }
> 
> struct CompilerFlagInfo
> {
>@@ -29,96 +34,97 @@ struct CompilerFlagInfo
>     const char *mName;
> };
> 
>-CompilerFlagInfo CompilerFlagInfos[] =
>-{
>+CompilerFlagInfo CompilerFlagInfos[] = {
>     // NOTE: The data below is copied from d3dcompiler.h
>     // If something changes there it should be changed here as well
>-    CREATE_COMPILER_FLAG_INFO(D3DCOMPILE_DEBUG),                          // (1 << 0)
>-    CREATE_COMPILER_FLAG_INFO(D3DCOMPILE_SKIP_VALIDATION),                // (1 << 1)
>-    CREATE_COMPILER_FLAG_INFO(D3DCOMPILE_SKIP_OPTIMIZATION),              // (1 << 2)
>-    CREATE_COMPILER_FLAG_INFO(D3DCOMPILE_PACK_MATRIX_ROW_MAJOR),          // (1 << 3)
>-    CREATE_COMPILER_FLAG_INFO(D3DCOMPILE_PACK_MATRIX_COLUMN_MAJOR),       // (1 << 4)
>-    CREATE_COMPILER_FLAG_INFO(D3DCOMPILE_PARTIAL_PRECISION),              // (1 << 5)
>-    CREATE_COMPILER_FLAG_INFO(D3DCOMPILE_FORCE_VS_SOFTWARE_NO_OPT),       // (1 << 6)
>-    CREATE_COMPILER_FLAG_INFO(D3DCOMPILE_FORCE_PS_SOFTWARE_NO_OPT),       // (1 << 7)
>-    CREATE_COMPILER_FLAG_INFO(D3DCOMPILE_NO_PRESHADER),                   // (1 << 8)
>-    CREATE_COMPILER_FLAG_INFO(D3DCOMPILE_AVOID_FLOW_CONTROL),             // (1 << 9)
>-    CREATE_COMPILER_FLAG_INFO(D3DCOMPILE_PREFER_FLOW_CONTROL),            // (1 << 10)
>-    CREATE_COMPILER_FLAG_INFO(D3DCOMPILE_ENABLE_STRICTNESS),              // (1 << 11)
>-    CREATE_COMPILER_FLAG_INFO(D3DCOMPILE_ENABLE_BACKWARDS_COMPATIBILITY), // (1 << 12)
>-    CREATE_COMPILER_FLAG_INFO(D3DCOMPILE_IEEE_STRICTNESS),                // (1 << 13)
>-    CREATE_COMPILER_FLAG_INFO(D3DCOMPILE_OPTIMIZATION_LEVEL0),            // (1 << 14)
>-    CREATE_COMPILER_FLAG_INFO(D3DCOMPILE_OPTIMIZATION_LEVEL1),            // 0
>-    CREATE_COMPILER_FLAG_INFO(D3DCOMPILE_OPTIMIZATION_LEVEL2),            // ((1 << 14) | (1 << 15))
>-    CREATE_COMPILER_FLAG_INFO(D3DCOMPILE_OPTIMIZATION_LEVEL3),            // (1 << 15)
>-    CREATE_COMPILER_FLAG_INFO(D3DCOMPILE_RESERVED16),                     // (1 << 16)
>-    CREATE_COMPILER_FLAG_INFO(D3DCOMPILE_RESERVED17),                     // (1 << 17)
>-    CREATE_COMPILER_FLAG_INFO(D3DCOMPILE_WARNINGS_ARE_ERRORS)             // (1 << 18)
>+    CREATE_COMPILER_FLAG_INFO(D3DCOMPILE_DEBUG),                           // (1 << 0)
>+    CREATE_COMPILER_FLAG_INFO(D3DCOMPILE_SKIP_VALIDATION),                 // (1 << 1)
>+    CREATE_COMPILER_FLAG_INFO(D3DCOMPILE_SKIP_OPTIMIZATION),               // (1 << 2)
>+    CREATE_COMPILER_FLAG_INFO(D3DCOMPILE_PACK_MATRIX_ROW_MAJOR),           // (1 << 3)
>+    CREATE_COMPILER_FLAG_INFO(D3DCOMPILE_PACK_MATRIX_COLUMN_MAJOR),        // (1 << 4)
>+    CREATE_COMPILER_FLAG_INFO(D3DCOMPILE_PARTIAL_PRECISION),               // (1 << 5)
>+    CREATE_COMPILER_FLAG_INFO(D3DCOMPILE_FORCE_VS_SOFTWARE_NO_OPT),        // (1 << 6)
>+    CREATE_COMPILER_FLAG_INFO(D3DCOMPILE_FORCE_PS_SOFTWARE_NO_OPT),        // (1 << 7)
>+    CREATE_COMPILER_FLAG_INFO(D3DCOMPILE_NO_PRESHADER),                    // (1 << 8)
>+    CREATE_COMPILER_FLAG_INFO(D3DCOMPILE_AVOID_FLOW_CONTROL),              // (1 << 9)
>+    CREATE_COMPILER_FLAG_INFO(D3DCOMPILE_PREFER_FLOW_CONTROL),             // (1 << 10)
>+    CREATE_COMPILER_FLAG_INFO(D3DCOMPILE_ENABLE_STRICTNESS),               // (1 << 11)
>+    CREATE_COMPILER_FLAG_INFO(D3DCOMPILE_ENABLE_BACKWARDS_COMPATIBILITY),  // (1 << 12)
>+    CREATE_COMPILER_FLAG_INFO(D3DCOMPILE_IEEE_STRICTNESS),                 // (1 << 13)
>+    CREATE_COMPILER_FLAG_INFO(D3DCOMPILE_OPTIMIZATION_LEVEL0),             // (1 << 14)
>+    CREATE_COMPILER_FLAG_INFO(D3DCOMPILE_OPTIMIZATION_LEVEL1),             // 0
>+    CREATE_COMPILER_FLAG_INFO(D3DCOMPILE_OPTIMIZATION_LEVEL2),  // ((1 << 14) | (1 << 15))
>+    CREATE_COMPILER_FLAG_INFO(D3DCOMPILE_OPTIMIZATION_LEVEL3),  // (1 << 15)
>+    CREATE_COMPILER_FLAG_INFO(D3DCOMPILE_RESERVED16),           // (1 << 16)
>+    CREATE_COMPILER_FLAG_INFO(D3DCOMPILE_RESERVED17),           // (1 << 17)
>+    CREATE_COMPILER_FLAG_INFO(D3DCOMPILE_WARNINGS_ARE_ERRORS)   // (1 << 18)
> };
> 
>-#undef CREATE_COMPILER_FLAG_INFO
>+#    undef CREATE_COMPILER_FLAG_INFO
> 
> bool IsCompilerFlagSet(UINT mask, UINT flag)
> {
>     bool isFlagSet = IsMaskFlagSet(mask, flag);
> 
>-    switch(flag)
>+    switch (flag)
>     {
>-      case D3DCOMPILE_OPTIMIZATION_LEVEL0:
>-        return isFlagSet && !IsMaskFlagSet(mask, UINT(D3DCOMPILE_OPTIMIZATION_LEVEL3));
>+        case D3DCOMPILE_OPTIMIZATION_LEVEL0:
>+            return isFlagSet && !IsMaskFlagSet(mask, UINT(D3DCOMPILE_OPTIMIZATION_LEVEL3));
> 
>-      case D3DCOMPILE_OPTIMIZATION_LEVEL1:
>-        return (mask & D3DCOMPILE_OPTIMIZATION_LEVEL2) == UINT(0);
>+        case D3DCOMPILE_OPTIMIZATION_LEVEL1:
>+            return (mask & D3DCOMPILE_OPTIMIZATION_LEVEL2) == UINT(0);
> 
>-      case D3DCOMPILE_OPTIMIZATION_LEVEL3:
>-        return isFlagSet && !IsMaskFlagSet(mask, UINT(D3DCOMPILE_OPTIMIZATION_LEVEL0));
>+        case D3DCOMPILE_OPTIMIZATION_LEVEL3:
>+            return isFlagSet && !IsMaskFlagSet(mask, UINT(D3DCOMPILE_OPTIMIZATION_LEVEL0));
> 
>-      default:
>-        return isFlagSet;
>+        default:
>+            return isFlagSet;
>     }
> }
>-}  // anonymous namespace
> #endif  // ANGLE_APPEND_ASSEMBLY_TO_SHADER_DEBUG_INFO == ANGLE_ENABLED
> 
>-namespace rx
>-{
>+constexpr char kOldCompilerLibrary[] = "d3dcompiler_old.dll";
> 
>-CompileConfig::CompileConfig()
>-    : flags(0),
>-      name()
>+enum D3DCompilerLoadLibraryResult
> {
>-}
>+    D3DCompilerDefaultLibrarySuccess,
>+    D3DCompilerOldLibrarySuccess,
>+    D3DCompilerFailure,
>+    D3DCompilerEnumBoundary,
>+};
>+}  // anonymous namespace
> 
>-CompileConfig::CompileConfig(UINT flags, const std::string &name)
>-    : flags(flags),
>-      name(name)
>+namespace rx
> {
>-}
>+
>+CompileConfig::CompileConfig() : flags(0), name() {}
>+
>+CompileConfig::CompileConfig(UINT flags, const std::string &name) : flags(flags), name(name) {}
> 
> HLSLCompiler::HLSLCompiler()
>     : mInitialized(false),
>       mD3DCompilerModule(nullptr),
>       mD3DCompileFunc(nullptr),
>       mD3DDisassembleFunc(nullptr)
>-{
>-}
>+{}
> 
> HLSLCompiler::~HLSLCompiler()
> {
>     release();
> }
> 
>-gl::Error HLSLCompiler::ensureInitialized()
>+angle::Result HLSLCompiler::ensureInitialized(d3d::Context *context)
> {
>     if (mInitialized)
>     {
>-        return gl::NoError();
>+        return angle::Result::Continue;
>     }
> 
>     TRACE_EVENT0("gpu.angle", "HLSLCompiler::initialize");
> #if !defined(ANGLE_ENABLE_WINDOWS_STORE)
>-#if defined(ANGLE_PRELOADED_D3DCOMPILER_MODULE_NAMES)
>-    // Find a D3DCompiler module that had already been loaded based on a predefined list of versions.
>+#    if defined(ANGLE_PRELOADED_D3DCOMPILER_MODULE_NAMES)
>+    // Find a D3DCompiler module that had already been loaded based on a predefined list of
>+    // versions.
>     static const char *d3dCompilerNames[] = ANGLE_PRELOADED_D3DCOMPILER_MODULE_NAMES;
> 
>     for (size_t i = 0; i < ArraySize(d3dCompilerNames); ++i)
>@@ -128,41 +134,61 @@ gl::Error HLSLCompiler::ensureInitialized()
>             break;
>         }
>     }
>-#endif  // ANGLE_PRELOADED_D3DCOMPILER_MODULE_NAMES
>+#    endif  // ANGLE_PRELOADED_D3DCOMPILER_MODULE_NAMES
> 
>     if (!mD3DCompilerModule)
>     {
>-        // Load the version of the D3DCompiler DLL associated with the Direct3D version ANGLE was built with.
>-        mD3DCompilerModule = LoadLibrary(D3DCOMPILER_DLL);
>+        // Load the version of the D3DCompiler DLL associated with the Direct3D version ANGLE was
>+        // built with.
>+        mD3DCompilerModule = LoadLibraryA(D3DCOMPILER_DLL_A);
>+
>+        if (mD3DCompilerModule)
>+        {
>+            ANGLE_HISTOGRAM_ENUMERATION("GPU.ANGLE.D3DCompilerLoadLibraryResult",
>+                                        D3DCompilerDefaultLibrarySuccess, D3DCompilerEnumBoundary);
>+        }
>+        else
>+        {
>+            WARN() << "Failed to load HLSL compiler library. Using 'old' DLL.";
>+            mD3DCompilerModule = LoadLibraryA(kOldCompilerLibrary);
>+            if (mD3DCompilerModule)
>+            {
>+                ANGLE_HISTOGRAM_ENUMERATION("GPU.ANGLE.D3DCompilerLoadLibraryResult",
>+                                            D3DCompilerOldLibrarySuccess, D3DCompilerEnumBoundary);
>+            }
>+        }
>     }
> 
>     if (!mD3DCompilerModule)
>     {
>-        ERR() << "D3D compiler module not found.";
>-        return gl::OutOfMemory() << "D3D compiler module not found.";
>+        DWORD lastError = GetLastError();
>+        ERR() << "D3D Compiler LoadLibrary failed. GetLastError=" << lastError;
>+        ANGLE_HISTOGRAM_ENUMERATION("GPU.ANGLE.D3DCompilerLoadLibraryResult", D3DCompilerFailure,
>+                                    D3DCompilerEnumBoundary);
>+        ANGLE_TRY_HR(context, E_OUTOFMEMORY, "LoadLibrary failed to load D3D Compiler DLL.");
>     }
> 
>-    mD3DCompileFunc = reinterpret_cast<pD3DCompile>(GetProcAddress(mD3DCompilerModule, "D3DCompile"));
>+    mD3DCompileFunc =
>+        reinterpret_cast<pD3DCompile>(GetProcAddress(mD3DCompilerModule, "D3DCompile"));
>     ASSERT(mD3DCompileFunc);
> 
>-    mD3DDisassembleFunc = reinterpret_cast<pD3DDisassemble>(GetProcAddress(mD3DCompilerModule, "D3DDisassemble"));
>+    mD3DDisassembleFunc =
>+        reinterpret_cast<pD3DDisassemble>(GetProcAddress(mD3DCompilerModule, "D3DDisassemble"));
>     ASSERT(mD3DDisassembleFunc);
> 
> #else
>     // D3D Shader compiler is linked already into this module, so the export
>     // can be directly assigned.
>-    mD3DCompilerModule = nullptr;
>-    mD3DCompileFunc = reinterpret_cast<pD3DCompile>(D3DCompile);
>+    mD3DCompilerModule  = nullptr;
>+    mD3DCompileFunc     = reinterpret_cast<pD3DCompile>(D3DCompile);
>     mD3DDisassembleFunc = reinterpret_cast<pD3DDisassemble>(D3DDisassemble);
> #endif
> 
>-    if (mD3DCompileFunc == nullptr)
>-    {
>-        return gl::OutOfMemory() << "Error finding D3DCompile entry point.";
>-    }
>+    ANGLE_CHECK_HR(context, mD3DCompileFunc, "Error finding D3DCompile entry point.",
>+                   E_OUTOFMEMORY);
> 
>     mInitialized = true;
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
> void HLSLCompiler::release()
>@@ -170,16 +196,21 @@ void HLSLCompiler::release()
>     if (mInitialized)
>     {
>         FreeLibrary(mD3DCompilerModule);
>-        mD3DCompilerModule = nullptr;
>-        mD3DCompileFunc = nullptr;
>+        mD3DCompilerModule  = nullptr;
>+        mD3DCompileFunc     = nullptr;
>         mD3DDisassembleFunc = nullptr;
>-        mInitialized = false;
>+        mInitialized        = false;
>     }
> }
> 
>-gl::Error HLSLCompiler::compileToBinary(gl::InfoLog &infoLog, const std::string &hlsl, const std::string &profile,
>-                                        const std::vector<CompileConfig> &configs, const D3D_SHADER_MACRO *overrideMacros,
>-                                        ID3DBlob **outCompiledBlob, std::string *outDebugInfo)
>+angle::Result HLSLCompiler::compileToBinary(d3d::Context *context,
>+                                            gl::InfoLog &infoLog,
>+                                            const std::string &hlsl,
>+                                            const std::string &profile,
>+                                            const std::vector<CompileConfig> &configs,
>+                                            const D3D_SHADER_MACRO *overrideMacros,
>+                                            ID3DBlob **outCompiledBlob,
>+                                            std::string *outDebugInfo)
> {
>     ASSERT(mInitialized);
> 
>@@ -204,7 +235,7 @@ gl::Error HLSLCompiler::compileToBinary(gl::InfoLog &infoLog, const std::string
>     for (size_t i = 0; i < configs.size(); ++i)
>     {
>         ID3DBlob *errorMessage = nullptr;
>-        ID3DBlob *binary = nullptr;
>+        ID3DBlob *binary       = nullptr;
>         HRESULT result         = S_OK;
> 
>         {
>@@ -217,7 +248,7 @@ gl::Error HLSLCompiler::compileToBinary(gl::InfoLog &infoLog, const std::string
> 
>         if (errorMessage)
>         {
>-            std::string message = reinterpret_cast<const char*>(errorMessage->GetBufferPointer());
>+            std::string message = static_cast<const char *>(errorMessage->GetBufferPointer());
>             SafeRelease(errorMessage);
> 
>             infoLog.appendSanitized(message.c_str());
>@@ -227,18 +258,43 @@ gl::Error HLSLCompiler::compileToBinary(gl::InfoLog &infoLog, const std::string
> 
>             WARN() << std::endl << message;
> 
>-            if ((message.find("error X3531:") != std::string::npos ||  // "can't unroll loops marked with loop attribute"
>-                 message.find("error X4014:") != std::string::npos) && // "cannot have gradient operations inside loops with divergent flow control",
>-                                                                       // even though it is counter-intuitive to disable unrolling for this error,
>-                                                                       // some very long shaders have trouble deciding which loops to unroll and
>-                                                                       // turning off forced unrolls allows them to compile properly.
>-                macros != nullptr)
>+            if (macros != nullptr)
>             {
>-                macros = nullptr;   // Disable [loop] and [flatten]
>+                constexpr const char *kLoopRelatedErrors[] = {
>+                    // "can't unroll loops marked with loop attribute"
>+                    "error X3531:",
>+
>+                    // "cannot have gradient operations inside loops with divergent flow control",
>+                    // even though it is counter-intuitive to disable unrolling for this error, some
>+                    // very long shaders have trouble deciding which loops to unroll and turning off
>+                    // forced unrolls allows them to compile properly.
>+                    "error X4014:",
>+
>+                    // "array index out of bounds", loop unrolling can result in invalid array
>+                    // access if the indices become constant, causing loops that may never be
>+                    // executed to generate compilation errors
>+                    "error X3504:",
>+                };
>+
>+                bool hasLoopRelatedError = false;
>+                for (const char *errorType : kLoopRelatedErrors)
>+                {
>+                    if (message.find(errorType) != std::string::npos)
>+                    {
>+                        hasLoopRelatedError = true;
>+                        break;
>+                    }
>+                }
> 
>-                // Retry without changing compiler flags
>-                i--;
>-                continue;
>+                if (hasLoopRelatedError)
>+                {
>+                    // Disable [loop] and [flatten]
>+                    macros = nullptr;
>+
>+                    // Retry without changing compiler flags
>+                    i--;
>+                    continue;
>+                }
>             }
>         }
> 
>@@ -246,7 +302,8 @@ gl::Error HLSLCompiler::compileToBinary(gl::InfoLog &infoLog, const std::string
>         {
>             *outCompiledBlob = binary;
> 
>-            (*outDebugInfo) += "// COMPILER INPUT HLSL BEGIN\n\n" + hlsl + "\n// COMPILER INPUT HLSL END\n";
>+            (*outDebugInfo) +=
>+                "// COMPILER INPUT HLSL BEGIN\n\n" + hlsl + "\n// COMPILER INPUT HLSL END\n";
> 
> #if ANGLE_APPEND_ASSEMBLY_TO_SHADER_DEBUG_INFO == ANGLE_ENABLED
>             (*outDebugInfo) += "\n\n// ASSEMBLY BEGIN\n\n";
>@@ -268,22 +325,22 @@ gl::Error HLSLCompiler::compileToBinary(gl::InfoLog &infoLog, const std::string
>             {
>                 for (const D3D_SHADER_MACRO *mIt = macros; mIt->Name != nullptr; ++mIt)
>                 {
>-                    (*outDebugInfo) += std::string("// ") + mIt->Name + " : " + mIt->Definition + "\n";
>+                    (*outDebugInfo) +=
>+                        std::string("// ") + mIt->Name + " : " + mIt->Definition + "\n";
>                 }
>             }
> 
>             std::string disassembly;
>-            ANGLE_TRY(disassembleBinary(binary, &disassembly));
>+            ANGLE_TRY(disassembleBinary(context, binary, &disassembly));
>             (*outDebugInfo) += "\n" + disassembly + "\n// ASSEMBLY END\n";
> #endif  // ANGLE_APPEND_ASSEMBLY_TO_SHADER_DEBUG_INFO == ANGLE_ENABLED
>-            return gl::NoError();
>+            return angle::Result::Continue;
>         }
> 
>         if (result == E_OUTOFMEMORY)
>         {
>             *outCompiledBlob = nullptr;
>-            return gl::OutOfMemory()
>-                   << "HLSL compiler had an unexpected failure, " << gl::FmtHR(result);
>+            ANGLE_TRY_HR(context, result, "HLSL compiler had an unexpected failure");
>         }
> 
>         infoLog << "Warning: D3D shader compilation failed with " << configs[i].name << " flags. ("
>@@ -295,26 +352,29 @@ gl::Error HLSLCompiler::compileToBinary(gl::InfoLog &infoLog, const std::string
>         }
>     }
> 
>-    // None of the configurations succeeded in compiling this shader but the compiler is still intact
>+    // None of the configurations succeeded in compiling this shader but the compiler is still
>+    // intact
>     *outCompiledBlob = nullptr;
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error HLSLCompiler::disassembleBinary(ID3DBlob *shaderBinary, std::string *disassemblyOut)
>+angle::Result HLSLCompiler::disassembleBinary(d3d::Context *context,
>+                                              ID3DBlob *shaderBinary,
>+                                              std::string *disassemblyOut)
> {
>-    ANGLE_TRY(ensureInitialized());
>+    ANGLE_TRY(ensureInitialized(context));
> 
>     // Retrieve disassembly
>     UINT flags = D3D_DISASM_ENABLE_DEFAULT_VALUE_PRINTS | D3D_DISASM_ENABLE_INSTRUCTION_NUMBERING;
>-    ID3DBlob *disassembly = nullptr;
>+    ID3DBlob *disassembly           = nullptr;
>     pD3DDisassemble disassembleFunc = reinterpret_cast<pD3DDisassemble>(mD3DDisassembleFunc);
>-    LPCVOID buffer = shaderBinary->GetBufferPointer();
>-    SIZE_T bufSize = shaderBinary->GetBufferSize();
>-    HRESULT result = disassembleFunc(buffer, bufSize, flags, "", &disassembly);
>+    LPCVOID buffer                  = shaderBinary->GetBufferPointer();
>+    SIZE_T bufSize                  = shaderBinary->GetBufferSize();
>+    HRESULT result                  = disassembleFunc(buffer, bufSize, flags, "", &disassembly);
> 
>     if (SUCCEEDED(result))
>     {
>-        *disassemblyOut = std::string(reinterpret_cast<const char*>(disassembly->GetBufferPointer()));
>+        *disassemblyOut = std::string(static_cast<const char *>(disassembly->GetBufferPointer()));
>     }
>     else
>     {
>@@ -323,7 +383,7 @@ gl::Error HLSLCompiler::disassembleBinary(ID3DBlob *shaderBinary, std::string *d
> 
>     SafeRelease(disassembly);
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
> }  // namespace rx
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/HLSLCompiler.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/HLSLCompiler.h
>index c8f9eac290e..3d937520892 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/HLSLCompiler.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/HLSLCompiler.h
>@@ -14,16 +14,20 @@
> #include "common/angleutils.h"
> #include "common/platform.h"
> 
>-#include <vector>
> #include <string>
>+#include <vector>
> 
> namespace gl
> {
> class InfoLog;
>-}
>+}  // namespace gl
> 
> namespace rx
> {
>+namespace d3d
>+{
>+class Context;
>+}  // namespace d3d
> 
> struct CompileConfig
> {
>@@ -42,23 +46,29 @@ class HLSLCompiler : angle::NonCopyable
> 
>     void release();
> 
>-    // Attempt to compile a HLSL shader using the supplied configurations, may output a NULL compiled blob
>-    // even if no GL errors are returned.
>-    gl::Error compileToBinary(gl::InfoLog &infoLog, const std::string &hlsl, const std::string &profile,
>-                              const std::vector<CompileConfig> &configs, const D3D_SHADER_MACRO *overrideMacros,
>-                              ID3DBlob **outCompiledBlob, std::string *outDebugInfo);
>-
>-    gl::Error disassembleBinary(ID3DBlob *shaderBinary, std::string *disassemblyOut);
>-    gl::Error ensureInitialized();
>+    // Attempt to compile a HLSL shader using the supplied configurations, may output a NULL
>+    // compiled blob even if no GL errors are returned.
>+    angle::Result compileToBinary(d3d::Context *context,
>+                                  gl::InfoLog &infoLog,
>+                                  const std::string &hlsl,
>+                                  const std::string &profile,
>+                                  const std::vector<CompileConfig> &configs,
>+                                  const D3D_SHADER_MACRO *overrideMacros,
>+                                  ID3DBlob **outCompiledBlob,
>+                                  std::string *outDebugInfo);
>+
>+    angle::Result disassembleBinary(d3d::Context *context,
>+                                    ID3DBlob *shaderBinary,
>+                                    std::string *disassemblyOut);
>+    angle::Result ensureInitialized(d3d::Context *context);
> 
>   private:
>-
>     bool mInitialized;
>     HMODULE mD3DCompilerModule;
>     pD3DCompile mD3DCompileFunc;
>     pD3DDisassemble mD3DDisassembleFunc;
> };
> 
>-}
>+}  // namespace rx
> 
> #endif  // LIBANGLE_RENDERER_D3D_HLSLCOMPILER_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/ImageD3D.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/ImageD3D.cpp
>index dbbcbbed2aa..40e6f89f5c4 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/ImageD3D.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/ImageD3D.cpp
>@@ -10,11 +10,6 @@
> 
> #include "libANGLE/renderer/d3d/ImageD3D.h"
> 
>-#include "libANGLE/Framebuffer.h"
>-#include "libANGLE/FramebufferAttachment.h"
>-#include "libANGLE/renderer/d3d/FramebufferD3D.h"
>-#include "libANGLE/renderer/d3d/RenderTargetD3D.h"
>-
> namespace rx
> {
> 
>@@ -24,39 +19,38 @@ ImageD3D::ImageD3D()
>       mDepth(0),
>       mInternalFormat(GL_NONE),
>       mRenderable(false),
>-      mTarget(GL_NONE),
>+      mType(gl::TextureType::InvalidEnum),
>       mDirty(false)
>-{
>-}
>+{}
> 
>-gl::Error ImageD3D::setManagedSurface2D(const gl::Context *context,
>-                                        TextureStorage *storage,
>-                                        int level)
>+angle::Result ImageD3D::setManagedSurface2D(const gl::Context *context,
>+                                            TextureStorage *storage,
>+                                            int level)
> {
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error ImageD3D::setManagedSurfaceCube(const gl::Context *context,
>-                                          TextureStorage *storage,
>-                                          int face,
>-                                          int level)
>+angle::Result ImageD3D::setManagedSurfaceCube(const gl::Context *context,
>+                                              TextureStorage *storage,
>+                                              int face,
>+                                              int level)
> {
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error ImageD3D::setManagedSurface3D(const gl::Context *context,
>-                                        TextureStorage *storage,
>-                                        int level)
>+angle::Result ImageD3D::setManagedSurface3D(const gl::Context *context,
>+                                            TextureStorage *storage,
>+                                            int level)
> {
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error ImageD3D::setManagedSurface2DArray(const gl::Context *context,
>-                                             TextureStorage *storage,
>-                                             int layer,
>-                                             int level)
>+angle::Result ImageD3D::setManagedSurface2DArray(const gl::Context *context,
>+                                                 TextureStorage *storage,
>+                                                 int layer,
>+                                                 int level)
> {
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
> }  // namespace rx
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/ImageD3D.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/ImageD3D.h
>index 1b7235fbaaa..70b1e12e769 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/ImageD3D.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/ImageD3D.h
>@@ -13,19 +13,20 @@
> 
> #include "common/debug.h"
> 
>+#include "common/PackedEnums.h"
> #include "libANGLE/Error.h"
> 
> namespace gl
> {
> class Context;
> class Framebuffer;
>-struct ImageIndex;
>+class ImageIndex;
> struct Box;
> struct Extents;
> struct Offset;
> struct Rectangle;
> struct PixelUnpackState;
>-}
>+}  // namespace gl
> 
> namespace rx
> {
>@@ -37,57 +38,60 @@ class ImageD3D : angle::NonCopyable
> {
>   public:
>     ImageD3D();
>-    virtual ~ImageD3D() {};
>+    virtual ~ImageD3D() {}
> 
>     GLsizei getWidth() const { return mWidth; }
>     GLsizei getHeight() const { return mHeight; }
>     GLsizei getDepth() const { return mDepth; }
>     GLenum getInternalFormat() const { return mInternalFormat; }
>-    GLenum getTarget() const { return mTarget; }
>+    gl::TextureType getType() const { return mType; }
>     bool isRenderableFormat() const { return mRenderable; }
> 
>     void markDirty() { mDirty = true; }
>     void markClean() { mDirty = false; }
>     virtual bool isDirty() const = 0;
> 
>-    virtual bool redefine(GLenum target, GLenum internalformat, const gl::Extents &size, bool forceRelease) = 0;
>-
>-    virtual gl::Error loadData(const gl::Context *context,
>-                               const gl::Box &area,
>-                               const gl::PixelUnpackState &unpack,
>-                               GLenum type,
>-                               const void *input,
>-                               bool applySkipImages) = 0;
>-    virtual gl::Error loadCompressedData(const gl::Context *context,
>-                                         const gl::Box &area,
>-                                         const void *input) = 0;
>-
>-    virtual gl::Error setManagedSurface2D(const gl::Context *context,
>-                                          TextureStorage *storage,
>-                                          int level);
>-    virtual gl::Error setManagedSurfaceCube(const gl::Context *context,
>-                                            TextureStorage *storage,
>-                                            int face,
>-                                            int level);
>-    virtual gl::Error setManagedSurface3D(const gl::Context *context,
>-                                          TextureStorage *storage,
>-                                          int level);
>-    virtual gl::Error setManagedSurface2DArray(const gl::Context *context,
>-                                               TextureStorage *storage,
>-                                               int layer,
>-                                               int level);
>-    virtual gl::Error copyToStorage(const gl::Context *context,
>-                                    TextureStorage *storage,
>-                                    const gl::ImageIndex &index,
>-                                    const gl::Box &region) = 0;
>-
>-    virtual gl::Error copyFromTexStorage(const gl::Context *context,
>-                                         const gl::ImageIndex &imageIndex,
>-                                         TextureStorage *source) = 0;
>-    virtual gl::Error copyFromFramebuffer(const gl::Context *context,
>-                                          const gl::Offset &destOffset,
>-                                          const gl::Rectangle &sourceArea,
>-                                          const gl::Framebuffer *source) = 0;
>+    virtual bool redefine(gl::TextureType type,
>+                          GLenum internalformat,
>+                          const gl::Extents &size,
>+                          bool forceRelease) = 0;
>+
>+    virtual angle::Result loadData(const gl::Context *context,
>+                                   const gl::Box &area,
>+                                   const gl::PixelUnpackState &unpack,
>+                                   GLenum type,
>+                                   const void *input,
>+                                   bool applySkipImages)        = 0;
>+    virtual angle::Result loadCompressedData(const gl::Context *context,
>+                                             const gl::Box &area,
>+                                             const void *input) = 0;
>+
>+    virtual angle::Result setManagedSurface2D(const gl::Context *context,
>+                                              TextureStorage *storage,
>+                                              int level);
>+    virtual angle::Result setManagedSurfaceCube(const gl::Context *context,
>+                                                TextureStorage *storage,
>+                                                int face,
>+                                                int level);
>+    virtual angle::Result setManagedSurface3D(const gl::Context *context,
>+                                              TextureStorage *storage,
>+                                              int level);
>+    virtual angle::Result setManagedSurface2DArray(const gl::Context *context,
>+                                                   TextureStorage *storage,
>+                                                   int layer,
>+                                                   int level);
>+    virtual angle::Result copyToStorage(const gl::Context *context,
>+                                        TextureStorage *storage,
>+                                        const gl::ImageIndex &index,
>+                                        const gl::Box &region) = 0;
>+
>+    virtual angle::Result copyFromTexStorage(const gl::Context *context,
>+                                             const gl::ImageIndex &imageIndex,
>+                                             TextureStorage *source)         = 0;
>+    virtual angle::Result copyFromFramebuffer(const gl::Context *context,
>+                                              const gl::Offset &destOffset,
>+                                              const gl::Rectangle &sourceArea,
>+                                              const gl::Framebuffer *source) = 0;
> 
>   protected:
>     GLsizei mWidth;
>@@ -95,11 +99,10 @@ class ImageD3D : angle::NonCopyable
>     GLsizei mDepth;
>     GLenum mInternalFormat;
>     bool mRenderable;
>-    GLenum mTarget;
>+    gl::TextureType mType;
> 
>     bool mDirty;
> };
>+}  // namespace rx
> 
>-}
>-
>-#endif // LIBANGLE_RENDERER_D3D_IMAGED3D_H_
>+#endif  // LIBANGLE_RENDERER_D3D_IMAGED3D_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/IndexBuffer.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/IndexBuffer.cpp
>index 937512a96aa..96ec8dc7fad 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/IndexBuffer.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/IndexBuffer.cpp
>@@ -8,7 +8,9 @@
> // class with derivations, classes that perform graphics API agnostic index buffer operations.
> 
> #include "libANGLE/renderer/d3d/IndexBuffer.h"
>-#include "libANGLE/renderer/d3d/RendererD3D.h"
>+
>+#include "libANGLE/Context.h"
>+#include "libANGLE/renderer/d3d/ContextD3D.h"
> 
> namespace rx
> {
>@@ -20,9 +22,7 @@ IndexBuffer::IndexBuffer()
>     updateSerial();
> }
> 
>-IndexBuffer::~IndexBuffer()
>-{
>-}
>+IndexBuffer::~IndexBuffer() {}
> 
> unsigned int IndexBuffer::getSerial() const
> {
>@@ -34,12 +34,11 @@ void IndexBuffer::updateSerial()
>     mSerial = mNextSerial++;
> }
> 
>-
> IndexBufferInterface::IndexBufferInterface(BufferFactoryD3D *factory, bool dynamic)
> {
>     mIndexBuffer = factory->createIndexBuffer();
> 
>-    mDynamic = dynamic;
>+    mDynamic       = dynamic;
>     mWritePosition = 0;
> }
> 
>@@ -51,7 +50,7 @@ IndexBufferInterface::~IndexBufferInterface()
>     }
> }
> 
>-GLenum IndexBufferInterface::getIndexType() const
>+gl::DrawElementsType IndexBufferInterface::getIndexType() const
> {
>     return mIndexBuffer->getIndexType();
> }
>@@ -66,17 +65,19 @@ unsigned int IndexBufferInterface::getSerial() const
>     return mIndexBuffer->getSerial();
> }
> 
>-gl::Error IndexBufferInterface::mapBuffer(unsigned int size, void **outMappedMemory, unsigned int *streamOffset)
>+angle::Result IndexBufferInterface::mapBuffer(const gl::Context *context,
>+                                              unsigned int size,
>+                                              void **outMappedMemory,
>+                                              unsigned int *streamOffset)
> {
>     // Protect against integer overflow
>-    if (mWritePosition + size < mWritePosition)
>-    {
>-        return gl::OutOfMemory()
>-               << "Mapping of internal index buffer would cause an integer overflow.";
>-    }
>+    bool check = (mWritePosition + size < mWritePosition);
>+    ANGLE_CHECK(GetImplAs<ContextD3D>(context), !check,
>+                "Mapping of internal index buffer would cause an integer overflow.",
>+                GL_OUT_OF_MEMORY);
> 
>-    gl::Error error = mIndexBuffer->mapBuffer(mWritePosition, size, outMappedMemory);
>-    if (error.isError())
>+    angle::Result error = mIndexBuffer->mapBuffer(context, mWritePosition, size, outMappedMemory);
>+    if (error == angle::Result::Stop)
>     {
>         if (outMappedMemory)
>         {
>@@ -91,15 +92,15 @@ gl::Error IndexBufferInterface::mapBuffer(unsigned int size, void **outMappedMem
>     }
> 
>     mWritePosition += size;
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error IndexBufferInterface::unmapBuffer()
>+angle::Result IndexBufferInterface::unmapBuffer(const gl::Context *context)
> {
>-    return mIndexBuffer->unmapBuffer();
>+    return mIndexBuffer->unmapBuffer(context);
> }
> 
>-IndexBuffer * IndexBufferInterface::getIndexBuffer() const
>+IndexBuffer *IndexBufferInterface::getIndexBuffer() const
> {
>     return mIndexBuffer;
> }
>@@ -114,76 +115,69 @@ void IndexBufferInterface::setWritePosition(unsigned int writePosition)
>     mWritePosition = writePosition;
> }
> 
>-gl::Error IndexBufferInterface::discard()
>+angle::Result IndexBufferInterface::discard(const gl::Context *context)
> {
>-    return mIndexBuffer->discard();
>+    return mIndexBuffer->discard(context);
> }
> 
>-gl::Error IndexBufferInterface::setBufferSize(unsigned int bufferSize, GLenum indexType)
>+angle::Result IndexBufferInterface::setBufferSize(const gl::Context *context,
>+                                                  unsigned int bufferSize,
>+                                                  gl::DrawElementsType indexType)
> {
>     if (mIndexBuffer->getBufferSize() == 0)
>     {
>-        return mIndexBuffer->initialize(bufferSize, indexType, mDynamic);
>+        return mIndexBuffer->initialize(context, bufferSize, indexType, mDynamic);
>     }
>     else
>     {
>-        return mIndexBuffer->setSize(bufferSize, indexType);
>+        return mIndexBuffer->setSize(context, bufferSize, indexType);
>     }
> }
> 
> StreamingIndexBufferInterface::StreamingIndexBufferInterface(BufferFactoryD3D *factory)
>     : IndexBufferInterface(factory, true)
>-{
>-}
>+{}
> 
>-StreamingIndexBufferInterface::~StreamingIndexBufferInterface()
>-{
>-}
>+StreamingIndexBufferInterface::~StreamingIndexBufferInterface() {}
> 
>-gl::Error StreamingIndexBufferInterface::reserveBufferSpace(unsigned int size, GLenum indexType)
>+angle::Result StreamingIndexBufferInterface::reserveBufferSpace(const gl::Context *context,
>+                                                                unsigned int size,
>+                                                                gl::DrawElementsType indexType)
> {
>     unsigned int curBufferSize = getBufferSize();
>-    unsigned int writePos = getWritePosition();
>+    unsigned int writePos      = getWritePosition();
>     if (size > curBufferSize)
>     {
>-        ANGLE_TRY(setBufferSize(std::max(size, 2 * curBufferSize), indexType));
>+        ANGLE_TRY(setBufferSize(context, std::max(size, 2 * curBufferSize), indexType));
>         setWritePosition(0);
>     }
>     else if (writePos + size > curBufferSize || writePos + size < writePos)
>     {
>-        ANGLE_TRY(discard());
>+        ANGLE_TRY(discard(context));
>         setWritePosition(0);
>     }
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-
> StaticIndexBufferInterface::StaticIndexBufferInterface(BufferFactoryD3D *factory)
>     : IndexBufferInterface(factory, false)
>-{
>-}
>+{}
> 
>-StaticIndexBufferInterface::~StaticIndexBufferInterface()
>-{
>-}
>+StaticIndexBufferInterface::~StaticIndexBufferInterface() {}
> 
>-gl::Error StaticIndexBufferInterface::reserveBufferSpace(unsigned int size, GLenum indexType)
>+angle::Result StaticIndexBufferInterface::reserveBufferSpace(const gl::Context *context,
>+                                                             unsigned int size,
>+                                                             gl::DrawElementsType indexType)
> {
>     unsigned int curSize = getBufferSize();
>     if (curSize == 0)
>     {
>-        return setBufferSize(size, indexType);
>-    }
>-    else if (curSize >= size && indexType == getIndexType())
>-    {
>-        return gl::NoError();
>-    }
>-    else
>-    {
>-        UNREACHABLE();
>-        return gl::InternalError() << "Internal static index buffers can't be resized";
>+        return setBufferSize(context, size, indexType);
>     }
>+
>+    ASSERT(curSize >= size && indexType == getIndexType());
>+    return angle::Result::Continue;
> }
> 
> }  // namespace rx
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/IndexBuffer.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/IndexBuffer.h
>index 969cf6ae637..e21bca24208 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/IndexBuffer.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/IndexBuffer.h
>@@ -10,9 +10,15 @@
> #ifndef LIBANGLE_RENDERER_D3D_INDEXBUFFER_H_
> #define LIBANGLE_RENDERER_D3D_INDEXBUFFER_H_
> 
>+#include "common/PackedEnums.h"
> #include "common/angleutils.h"
> #include "libANGLE/Error.h"
> 
>+namespace gl
>+{
>+class Context;
>+}  // namespace gl
>+
> namespace rx
> {
> class BufferFactoryD3D;
>@@ -23,16 +29,24 @@ class IndexBuffer : angle::NonCopyable
>     IndexBuffer();
>     virtual ~IndexBuffer();
> 
>-    virtual gl::Error initialize(unsigned int bufferSize, GLenum indexType, bool dynamic) = 0;
>+    virtual angle::Result initialize(const gl::Context *context,
>+                                     unsigned int bufferSize,
>+                                     gl::DrawElementsType indexType,
>+                                     bool dynamic) = 0;
> 
>-    virtual gl::Error mapBuffer(unsigned int offset, unsigned int size, void** outMappedMemory) = 0;
>-    virtual gl::Error unmapBuffer() = 0;
>+    virtual angle::Result mapBuffer(const gl::Context *context,
>+                                    unsigned int offset,
>+                                    unsigned int size,
>+                                    void **outMappedMemory)       = 0;
>+    virtual angle::Result unmapBuffer(const gl::Context *context) = 0;
> 
>-    virtual gl::Error discard() = 0;
>+    virtual angle::Result discard(const gl::Context *context) = 0;
> 
>-    virtual GLenum getIndexType() const = 0;
>-    virtual unsigned int getBufferSize() const = 0;
>-    virtual gl::Error setSize(unsigned int bufferSize, GLenum indexType) = 0;
>+    virtual gl::DrawElementsType getIndexType() const             = 0;
>+    virtual unsigned int getBufferSize() const                    = 0;
>+    virtual angle::Result setSize(const gl::Context *context,
>+                                  unsigned int bufferSize,
>+                                  gl::DrawElementsType indexType) = 0;
> 
>     unsigned int getSerial() const;
> 
>@@ -50,15 +64,20 @@ class IndexBufferInterface : angle::NonCopyable
>     IndexBufferInterface(BufferFactoryD3D *factory, bool dynamic);
>     virtual ~IndexBufferInterface();
> 
>-    virtual gl::Error reserveBufferSpace(unsigned int size, GLenum indexType) = 0;
>+    virtual angle::Result reserveBufferSpace(const gl::Context *context,
>+                                             unsigned int size,
>+                                             gl::DrawElementsType indexType) = 0;
> 
>-    GLenum getIndexType() const;
>+    gl::DrawElementsType getIndexType() const;
>     unsigned int getBufferSize() const;
> 
>     unsigned int getSerial() const;
> 
>-    gl::Error mapBuffer(unsigned int size, void** outMappedMemory, unsigned int *streamOffset);
>-    gl::Error unmapBuffer();
>+    angle::Result mapBuffer(const gl::Context *context,
>+                            unsigned int size,
>+                            void **outMappedMemory,
>+                            unsigned int *streamOffset);
>+    angle::Result unmapBuffer(const gl::Context *context);
> 
>     IndexBuffer *getIndexBuffer() const;
> 
>@@ -66,9 +85,11 @@ class IndexBufferInterface : angle::NonCopyable
>     unsigned int getWritePosition() const;
>     void setWritePosition(unsigned int writePosition);
> 
>-    gl::Error discard();
>+    angle::Result discard(const gl::Context *context);
> 
>-    gl::Error setBufferSize(unsigned int bufferSize, GLenum indexType);
>+    angle::Result setBufferSize(const gl::Context *context,
>+                                unsigned int bufferSize,
>+                                gl::DrawElementsType indexType);
> 
>   private:
>     IndexBuffer *mIndexBuffer;
>@@ -83,7 +104,9 @@ class StreamingIndexBufferInterface : public IndexBufferInterface
>     explicit StreamingIndexBufferInterface(BufferFactoryD3D *factory);
>     ~StreamingIndexBufferInterface() override;
> 
>-    gl::Error reserveBufferSpace(unsigned int size, GLenum indexType) override;
>+    angle::Result reserveBufferSpace(const gl::Context *context,
>+                                     unsigned int size,
>+                                     gl::DrawElementsType indexType) override;
> };
> 
> class StaticIndexBufferInterface : public IndexBufferInterface
>@@ -92,9 +115,11 @@ class StaticIndexBufferInterface : public IndexBufferInterface
>     explicit StaticIndexBufferInterface(BufferFactoryD3D *factory);
>     ~StaticIndexBufferInterface() override;
> 
>-    gl::Error reserveBufferSpace(unsigned int size, GLenum indexType) override;
>+    angle::Result reserveBufferSpace(const gl::Context *context,
>+                                     unsigned int size,
>+                                     gl::DrawElementsType indexType) override;
> };
> 
>-}
>+}  // namespace rx
> 
>-#endif // LIBANGLE_RENDERER_D3D_INDEXBUFFER_H_
>+#endif  // LIBANGLE_RENDERER_D3D_INDEXBUFFER_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/IndexDataManager.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/IndexDataManager.cpp
>index e974097b450..9ce4cb66a4f 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/IndexDataManager.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/IndexDataManager.cpp
>@@ -15,6 +15,7 @@
> #include "libANGLE/VertexArray.h"
> #include "libANGLE/formatutils.h"
> #include "libANGLE/renderer/d3d/BufferD3D.h"
>+#include "libANGLE/renderer/d3d/ContextD3D.h"
> #include "libANGLE/renderer/d3d/IndexBuffer.h"
> 
> namespace rx
>@@ -25,9 +26,9 @@ namespace
> 
> template <typename InputT, typename DestT>
> void ConvertIndexArray(const void *input,
>-                       GLenum sourceType,
>+                       gl::DrawElementsType sourceType,
>                        void *output,
>-                       GLenum destinationType,
>+                       gl::DrawElementsType destinationType,
>                        GLsizei count,
>                        bool usePrimitiveRestartFixedIndex)
> {
>@@ -52,8 +53,8 @@ void ConvertIndexArray(const void *input,
>     }
> }
> 
>-void ConvertIndices(GLenum sourceType,
>-                    GLenum destinationType,
>+void ConvertIndices(gl::DrawElementsType sourceType,
>+                    gl::DrawElementsType destinationType,
>                     const void *input,
>                     GLsizei count,
>                     void *output,
>@@ -61,20 +62,20 @@ void ConvertIndices(GLenum sourceType,
> {
>     if (sourceType == destinationType)
>     {
>-        const gl::Type &typeInfo = gl::GetTypeInfo(destinationType);
>-        memcpy(output, input, count * typeInfo.bytes);
>+        const GLuint dstTypeSize = gl::GetDrawElementsTypeSize(destinationType);
>+        memcpy(output, input, count * dstTypeSize);
>         return;
>     }
> 
>-    if (sourceType == GL_UNSIGNED_BYTE)
>+    if (sourceType == gl::DrawElementsType::UnsignedByte)
>     {
>-        ASSERT(destinationType == GL_UNSIGNED_SHORT);
>+        ASSERT(destinationType == gl::DrawElementsType::UnsignedShort);
>         ConvertIndexArray<GLubyte, GLushort>(input, sourceType, output, destinationType, count,
>                                              usePrimitiveRestartFixedIndex);
>     }
>-    else if (sourceType == GL_UNSIGNED_SHORT)
>+    else if (sourceType == gl::DrawElementsType::UnsignedShort)
>     {
>-        ASSERT(destinationType == GL_UNSIGNED_INT);
>+        ASSERT(destinationType == gl::DrawElementsType::UnsignedInt);
>         ConvertIndexArray<GLushort, GLuint>(input, sourceType, output, destinationType, count,
>                                             usePrimitiveRestartFixedIndex);
>     }
>@@ -82,66 +83,40 @@ void ConvertIndices(GLenum sourceType,
>         UNREACHABLE();
> }
> 
>-gl::Error StreamInIndexBuffer(IndexBufferInterface *buffer,
>-                              const void *data,
>-                              unsigned int count,
>-                              GLenum srcType,
>-                              GLenum dstType,
>-                              bool usePrimitiveRestartFixedIndex,
>-                              unsigned int *offset)
>+angle::Result StreamInIndexBuffer(const gl::Context *context,
>+                                  IndexBufferInterface *buffer,
>+                                  const void *data,
>+                                  unsigned int count,
>+                                  gl::DrawElementsType srcType,
>+                                  gl::DrawElementsType dstType,
>+                                  bool usePrimitiveRestartFixedIndex,
>+                                  unsigned int *offset)
> {
>-    const gl::Type &dstTypeInfo = gl::GetTypeInfo(dstType);
>+    const GLuint dstTypeBytesShift = gl::GetDrawElementsTypeShift(dstType);
> 
>-    if (count > (std::numeric_limits<unsigned int>::max() >> dstTypeInfo.bytesShift))
>-    {
>-        return gl::OutOfMemory() << "Reserving " << count << " indices of " << dstTypeInfo.bytes
>-                                 << " bytes each exceeds the maximum buffer size.";
>-    }
>+    bool check = (count > (std::numeric_limits<unsigned int>::max() >> dstTypeBytesShift));
>+    ANGLE_CHECK(GetImplAs<ContextD3D>(context), !check,
>+                "Reserving indices exceeds the maximum buffer size.", GL_OUT_OF_MEMORY);
> 
>-    unsigned int bufferSizeRequired = count << dstTypeInfo.bytesShift;
>-    ANGLE_TRY(buffer->reserveBufferSpace(bufferSizeRequired, dstType));
>+    unsigned int bufferSizeRequired = count << dstTypeBytesShift;
>+    ANGLE_TRY(buffer->reserveBufferSpace(context, bufferSizeRequired, dstType));
> 
>     void *output = nullptr;
>-    ANGLE_TRY(buffer->mapBuffer(bufferSizeRequired, &output, offset));
>+    ANGLE_TRY(buffer->mapBuffer(context, bufferSizeRequired, &output, offset));
> 
>     ConvertIndices(srcType, dstType, data, count, output, usePrimitiveRestartFixedIndex);
> 
>-    ANGLE_TRY(buffer->unmapBuffer());
>-    return gl::NoError();
>+    ANGLE_TRY(buffer->unmapBuffer(context));
>+    return angle::Result::Continue;
> }
>-
>-unsigned int ElementTypeSize(GLenum elementType)
>-{
>-    switch (elementType)
>-    {
>-        case GL_UNSIGNED_BYTE:
>-            return sizeof(GLubyte);
>-        case GL_UNSIGNED_SHORT:
>-            return sizeof(GLushort);
>-        case GL_UNSIGNED_INT:
>-            return sizeof(GLuint);
>-        default:
>-            UNREACHABLE();
>-            return 0;
>-    }
>-}
>-
> }  // anonymous namespace
> 
>-bool IsOffsetAligned(GLenum elementType, unsigned int offset)
>-{
>-    return (offset % ElementTypeSize(elementType) == 0);
>-}
>-
> // IndexDataManager implementation.
> IndexDataManager::IndexDataManager(BufferFactoryD3D *factory)
>     : mFactory(factory), mStreamingBufferShort(), mStreamingBufferInt()
>-{
>-}
>+{}
> 
>-IndexDataManager::~IndexDataManager()
>-{
>-}
>+IndexDataManager::~IndexDataManager() {}
> 
> void IndexDataManager::deinitialize()
> {
>@@ -157,16 +132,17 @@ void IndexDataManager::deinitialize()
> // When we have a buffer with an unsupported format (subcase b) then we need to do some translation:
> // we will start by falling back to streaming, and after a while will start using a static
> // translated copy of the index buffer.
>-gl::Error IndexDataManager::prepareIndexData(const gl::Context *context,
>-                                             GLenum srcType,
>-                                             GLenum dstType,
>-                                             GLsizei count,
>-                                             gl::Buffer *glBuffer,
>-                                             const void *indices,
>-                                             TranslatedIndexData *translated)
>+angle::Result IndexDataManager::prepareIndexData(const gl::Context *context,
>+                                                 gl::DrawElementsType srcType,
>+                                                 gl::DrawElementsType dstType,
>+                                                 GLsizei count,
>+                                                 gl::Buffer *glBuffer,
>+                                                 const void *indices,
>+                                                 TranslatedIndexData *translated)
> {
>-    const gl::Type &srcTypeInfo = gl::GetTypeInfo(srcType);
>-    const gl::Type &dstTypeInfo = gl::GetTypeInfo(dstType);
>+    GLuint srcTypeBytes = gl::GetDrawElementsTypeSize(srcType);
>+    GLuint srcTypeShift = gl::GetDrawElementsTypeShift(srcType);
>+    GLuint dstTypeShift = gl::GetDrawElementsTypeShift(dstType);
> 
>     BufferD3D *buffer = glBuffer ? GetImplAs<BufferD3D>(glBuffer) : nullptr;
> 
>@@ -178,19 +154,19 @@ gl::Error IndexDataManager::prepareIndexData(const gl::Context *context,
> 
>     // Context can be nullptr in perf tests.
>     bool primitiveRestartFixedIndexEnabled =
>-        context ? context->getGLState().isPrimitiveRestartEnabled() : false;
>+        context ? context->getState().isPrimitiveRestartEnabled() : false;
> 
>     // Case 1: the indices are passed by pointer, which forces the streaming of index data
>     if (glBuffer == nullptr)
>     {
>         translated->storage = nullptr;
>-        return streamIndexData(indices, count, srcType, dstType, primitiveRestartFixedIndexEnabled,
>-                               translated);
>+        return streamIndexData(context, indices, count, srcType, dstType,
>+                               primitiveRestartFixedIndexEnabled, translated);
>     }
> 
>     // Case 2: the indices are already in a buffer
>     unsigned int offset = static_cast<unsigned int>(reinterpret_cast<uintptr_t>(indices));
>-    ASSERT(srcTypeInfo.bytes * static_cast<unsigned int>(count) + offset <= buffer->getSize());
>+    ASSERT(srcTypeBytes * static_cast<unsigned int>(count) + offset <= buffer->getSize());
> 
>     bool offsetAligned = IsOffsetAligned(srcType, offset);
> 
>@@ -200,9 +176,9 @@ gl::Error IndexDataManager::prepareIndexData(const gl::Context *context,
>         translated->storage     = buffer;
>         translated->indexBuffer = nullptr;
>         translated->serial      = buffer->getSerial();
>-        translated->startIndex  = (offset >> srcTypeInfo.bytesShift);
>+        translated->startIndex  = (offset >> srcTypeShift);
>         translated->startOffset = offset;
>-        return gl::NoError();
>+        return angle::Result::Continue;
>     }
> 
>     translated->storage = nullptr;
>@@ -226,9 +202,9 @@ gl::Error IndexDataManager::prepareIndexData(const gl::Context *context,
>         ANGLE_TRY(buffer->getData(context, &bufferData));
>         ASSERT(bufferData != nullptr);
> 
>-        ANGLE_TRY(streamIndexData(bufferData + offset, count, srcType, dstType,
>+        ANGLE_TRY(streamIndexData(context, bufferData + offset, count, srcType, dstType,
>                                   primitiveRestartFixedIndexEnabled, translated));
>-        buffer->promoteStaticUsage(context, count << srcTypeInfo.bytesShift);
>+        buffer->promoteStaticUsage(context, count << srcTypeShift);
>     }
>     else
>     {
>@@ -239,82 +215,104 @@ gl::Error IndexDataManager::prepareIndexData(const gl::Context *context,
>             ASSERT(bufferData != nullptr);
> 
>             unsigned int convertCount =
>-                static_cast<unsigned int>(buffer->getSize()) >> srcTypeInfo.bytesShift;
>-            ANGLE_TRY(StreamInIndexBuffer(staticBuffer, bufferData, convertCount, srcType, dstType,
>-                                          primitiveRestartFixedIndexEnabled, nullptr));
>+                static_cast<unsigned int>(buffer->getSize()) >> srcTypeShift;
>+            ANGLE_TRY(StreamInIndexBuffer(context, staticBuffer, bufferData, convertCount, srcType,
>+                                          dstType, primitiveRestartFixedIndexEnabled, nullptr));
>         }
>         ASSERT(offsetAligned && staticBuffer->getIndexType() == dstType);
> 
>         translated->indexBuffer = staticBuffer->getIndexBuffer();
>         translated->serial      = staticBuffer->getSerial();
>-        translated->startIndex  = (offset >> srcTypeInfo.bytesShift);
>-        translated->startOffset = (offset >> srcTypeInfo.bytesShift) << dstTypeInfo.bytesShift;
>+        translated->startIndex  = (offset >> srcTypeShift);
>+        translated->startOffset = (offset >> srcTypeShift) << dstTypeShift;
>     }
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error IndexDataManager::streamIndexData(const void *data,
>-                                            unsigned int count,
>-                                            GLenum srcType,
>-                                            GLenum dstType,
>-                                            bool usePrimitiveRestartFixedIndex,
>-                                            TranslatedIndexData *translated)
>+angle::Result IndexDataManager::streamIndexData(const gl::Context *context,
>+                                                const void *data,
>+                                                unsigned int count,
>+                                                gl::DrawElementsType srcType,
>+                                                gl::DrawElementsType dstType,
>+                                                bool usePrimitiveRestartFixedIndex,
>+                                                TranslatedIndexData *translated)
> {
>-    const gl::Type &dstTypeInfo = gl::GetTypeInfo(dstType);
>+    const GLuint dstTypeShift = gl::GetDrawElementsTypeShift(dstType);
> 
>     IndexBufferInterface *indexBuffer = nullptr;
>-    ANGLE_TRY(getStreamingIndexBuffer(dstType, &indexBuffer));
>+    ANGLE_TRY(getStreamingIndexBuffer(context, dstType, &indexBuffer));
>     ASSERT(indexBuffer != nullptr);
> 
>     unsigned int offset;
>-    ANGLE_TRY(StreamInIndexBuffer(indexBuffer, data, count, srcType, dstType,
>+    ANGLE_TRY(StreamInIndexBuffer(context, indexBuffer, data, count, srcType, dstType,
>                                   usePrimitiveRestartFixedIndex, &offset));
> 
>     translated->indexBuffer = indexBuffer->getIndexBuffer();
>     translated->serial      = indexBuffer->getSerial();
>-    translated->startIndex  = (offset >> dstTypeInfo.bytesShift);
>+    translated->startIndex  = (offset >> dstTypeShift);
>     translated->startOffset = offset;
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error IndexDataManager::getStreamingIndexBuffer(GLenum destinationIndexType,
>-                                                    IndexBufferInterface **outBuffer)
>+angle::Result IndexDataManager::getStreamingIndexBuffer(const gl::Context *context,
>+                                                        gl::DrawElementsType destinationIndexType,
>+                                                        IndexBufferInterface **outBuffer)
> {
>     ASSERT(outBuffer);
>-    ASSERT(destinationIndexType == GL_UNSIGNED_SHORT || destinationIndexType == GL_UNSIGNED_INT);
>+    ASSERT(destinationIndexType == gl::DrawElementsType::UnsignedShort ||
>+           destinationIndexType == gl::DrawElementsType::UnsignedInt);
> 
>-    auto &streamingBuffer =
>-        (destinationIndexType == GL_UNSIGNED_INT) ? mStreamingBufferInt : mStreamingBufferShort;
>+    auto &streamingBuffer = (destinationIndexType == gl::DrawElementsType::UnsignedInt)
>+                                ? mStreamingBufferInt
>+                                : mStreamingBufferShort;
> 
>     if (!streamingBuffer)
>     {
>         StreamingBuffer newBuffer(new StreamingIndexBufferInterface(mFactory));
>-        ANGLE_TRY(newBuffer->reserveBufferSpace(INITIAL_INDEX_BUFFER_SIZE, destinationIndexType));
>+        ANGLE_TRY(newBuffer->reserveBufferSpace(context, INITIAL_INDEX_BUFFER_SIZE,
>+                                                destinationIndexType));
>         streamingBuffer = std::move(newBuffer);
>     }
> 
>     *outBuffer = streamingBuffer.get();
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-GLenum GetIndexTranslationDestType(GLenum srcType,
>-                                   const gl::HasIndexRange &lazyIndexRange,
>-                                   bool usePrimitiveRestartWorkaround)
>+angle::Result GetIndexTranslationDestType(const gl::Context *context,
>+                                          GLsizei indexCount,
>+                                          gl::DrawElementsType indexType,
>+                                          const void *indices,
>+                                          bool usePrimitiveRestartWorkaround,
>+                                          gl::DrawElementsType *destTypeOut)
> {
>     // Avoid D3D11's primitive restart index value
>     // see http://msdn.microsoft.com/en-us/library/windows/desktop/bb205124(v=vs.85).aspx
>     if (usePrimitiveRestartWorkaround)
>     {
>-        const gl::IndexRange &indexRange = lazyIndexRange.getIndexRange().value();
>-        if (indexRange.end == gl::GetPrimitiveRestartIndex(srcType))
>+        // Conservatively assume we need to translate the indices for draw indirect.
>+        // This is a bit of a trick. We assume the count for an indirect draw is zero.
>+        if (indexCount == 0)
>+        {
>+            *destTypeOut = gl::DrawElementsType::UnsignedInt;
>+            return angle::Result::Continue;
>+        }
>+
>+        gl::IndexRange indexRange;
>+        ANGLE_TRY(context->getState().getVertexArray()->getIndexRange(
>+            context, indexType, indexCount, indices, &indexRange));
>+        if (indexRange.end == gl::GetPrimitiveRestartIndex(indexType))
>         {
>-            return GL_UNSIGNED_INT;
>+            *destTypeOut = gl::DrawElementsType::UnsignedInt;
>+            return angle::Result::Continue;
>         }
>     }
> 
>-    return (srcType == GL_UNSIGNED_INT) ? GL_UNSIGNED_INT : GL_UNSIGNED_SHORT;
>+    *destTypeOut = (indexType == gl::DrawElementsType::UnsignedInt)
>+                       ? gl::DrawElementsType::UnsignedInt
>+                       : gl::DrawElementsType::UnsignedShort;
>+    return angle::Result::Continue;
> }
> 
> }  // namespace rx
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/IndexDataManager.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/IndexDataManager.h
>index 77f05df92df..874580e5904 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/IndexDataManager.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/IndexDataManager.h
>@@ -44,7 +44,7 @@ struct SourceIndexData
>     BufferD3D *srcBuffer;
>     const void *srcIndices;
>     unsigned int srcCount;
>-    GLenum srcIndexType;
>+    gl::DrawElementsType srcIndexType;
>     bool srcIndicesChanged;
> };
> 
>@@ -55,7 +55,7 @@ struct TranslatedIndexData
> 
>     IndexBuffer *indexBuffer;
>     BufferD3D *storage;
>-    GLenum indexType;
>+    gl::DrawElementsType indexType;
>     unsigned int serial;
> 
>     SourceIndexData srcIndexData;
>@@ -69,23 +69,25 @@ class IndexDataManager : angle::NonCopyable
> 
>     void deinitialize();
> 
>-    gl::Error prepareIndexData(const gl::Context *context,
>-                               GLenum srcType,
>-                               GLenum dstType,
>-                               GLsizei count,
>-                               gl::Buffer *glBuffer,
>-                               const void *indices,
>-                               TranslatedIndexData *translated);
>+    angle::Result prepareIndexData(const gl::Context *context,
>+                                   gl::DrawElementsType srcType,
>+                                   gl::DrawElementsType dstType,
>+                                   GLsizei count,
>+                                   gl::Buffer *glBuffer,
>+                                   const void *indices,
>+                                   TranslatedIndexData *translated);
> 
>   private:
>-    gl::Error streamIndexData(const void *data,
>-                              unsigned int count,
>-                              GLenum srcType,
>-                              GLenum dstType,
>-                              bool usePrimitiveRestartFixedIndex,
>-                              TranslatedIndexData *translated);
>-    gl::Error getStreamingIndexBuffer(GLenum destinationIndexType,
>-                                      IndexBufferInterface **outBuffer);
>+    angle::Result streamIndexData(const gl::Context *context,
>+                                  const void *data,
>+                                  unsigned int count,
>+                                  gl::DrawElementsType srcType,
>+                                  gl::DrawElementsType dstType,
>+                                  bool usePrimitiveRestartFixedIndex,
>+                                  TranslatedIndexData *translated);
>+    angle::Result getStreamingIndexBuffer(const gl::Context *context,
>+                                          gl::DrawElementsType destinationIndexType,
>+                                          IndexBufferInterface **outBuffer);
> 
>     using StreamingBuffer = std::unique_ptr<StreamingIndexBufferInterface>;
> 
>@@ -94,12 +96,17 @@ class IndexDataManager : angle::NonCopyable
>     std::unique_ptr<StreamingIndexBufferInterface> mStreamingBufferInt;
> };
> 
>-GLenum GetIndexTranslationDestType(GLenum srcType,
>-                                   const gl::HasIndexRange &lazyIndexRange,
>-                                   bool usePrimitiveRestartWorkaround);
>-
>-bool IsOffsetAligned(GLenum elementType, unsigned int offset);
>+angle::Result GetIndexTranslationDestType(const gl::Context *context,
>+                                          GLsizei indexCount,
>+                                          gl::DrawElementsType indexType,
>+                                          const void *indices,
>+                                          bool usePrimitiveRestartWorkaround,
>+                                          gl::DrawElementsType *destTypeOut);
> 
>+ANGLE_INLINE bool IsOffsetAligned(gl::DrawElementsType elementType, unsigned int offset)
>+{
>+    return (offset % gl::GetDrawElementsTypeSize(elementType) == 0);
>+}
> }  // namespace rx
> 
> #endif  // LIBANGLE_INDEXDATAMANAGER_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/NativeWindowD3D.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/NativeWindowD3D.cpp
>index 113bad647c7..373bebce536 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/NativeWindowD3D.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/NativeWindowD3D.cpp
>@@ -12,12 +12,8 @@
> namespace rx
> {
> 
>-NativeWindowD3D::NativeWindowD3D(EGLNativeWindowType window) : mWindow(window)
>-{
>-}
>+NativeWindowD3D::NativeWindowD3D(EGLNativeWindowType window) : mWindow(window) {}
> 
>-NativeWindowD3D::~NativeWindowD3D()
>-{
>-}
>+NativeWindowD3D::~NativeWindowD3D() {}
> 
> }  // namespace rx
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/NativeWindowD3D.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/NativeWindowD3D.h
>index 365448488d5..e253fd814bd 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/NativeWindowD3D.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/NativeWindowD3D.h
>@@ -24,9 +24,9 @@ class NativeWindowD3D : angle::NonCopyable
>     NativeWindowD3D(EGLNativeWindowType window);
>     virtual ~NativeWindowD3D();
> 
>-    virtual bool initialize() = 0;
>+    virtual bool initialize()                     = 0;
>     virtual bool getClientRect(LPRECT rect) const = 0;
>-    virtual bool isIconic() const = 0;
>+    virtual bool isIconic() const                 = 0;
> 
>     inline EGLNativeWindowType getNativeWindow() const { return mWindow; }
> 
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/ProgramD3D.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/ProgramD3D.cpp
>index afc318d9fab..c7b7e8256b6 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/ProgramD3D.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/ProgramD3D.cpp
>@@ -8,6 +8,7 @@
> 
> #include "libANGLE/renderer/d3d/ProgramD3D.h"
> 
>+#include "common/MemoryBuffer.h"
> #include "common/bitset_utils.h"
> #include "common/string_utils.h"
> #include "common/utilities.h"
>@@ -21,12 +22,13 @@
> #include "libANGLE/features.h"
> #include "libANGLE/queryconversions.h"
> #include "libANGLE/renderer/ContextImpl.h"
>+#include "libANGLE/renderer/d3d/ContextD3D.h"
> #include "libANGLE/renderer/d3d/DynamicHLSL.h"
> #include "libANGLE/renderer/d3d/FramebufferD3D.h"
>-#include "libANGLE/renderer/d3d/RendererD3D.h"
> #include "libANGLE/renderer/d3d/ShaderD3D.h"
> #include "libANGLE/renderer/d3d/ShaderExecutableD3D.h"
> #include "libANGLE/renderer/d3d/VertexDataManager.h"
>+#include "libANGLE/renderer/renderer_utils.h"
> 
> using namespace angle;
> 
>@@ -36,13 +38,11 @@ namespace rx
> namespace
> {
> 
>-void GetDefaultInputLayoutFromShader(const gl::Context *context,
>-                                     gl::Shader *vertexShader,
>-                                     gl::InputLayout *inputLayoutOut)
>+void GetDefaultInputLayoutFromShader(gl::Shader *vertexShader, gl::InputLayout *inputLayoutOut)
> {
>     inputLayoutOut->clear();
> 
>-    for (const sh::Attribute &shaderAttr : vertexShader->getActiveAttributes(context))
>+    for (const sh::Attribute &shaderAttr : vertexShader->getActiveAttributes())
>     {
>         if (shaderAttr.type != GL_NONE)
>         {
>@@ -53,11 +53,15 @@ void GetDefaultInputLayoutFromShader(const gl::Context *context,
>             {
>                 GLenum componentType = gl::VariableComponentType(transposedType);
>                 GLuint components    = static_cast<GLuint>(gl::VariableColumnCount(transposedType));
>-                bool pureInt = (componentType != GL_FLOAT);
>-                gl::VertexFormatType defaultType =
>-                    gl::GetVertexFormatType(componentType, GL_FALSE, components, pureInt);
>+                bool pureInt         = (componentType != GL_FLOAT);
> 
>-                inputLayoutOut->push_back(defaultType);
>+                gl::VertexAttribType attribType =
>+                    gl::FromGLenum<gl::VertexAttribType>(componentType);
>+
>+                angle::FormatID defaultID =
>+                    gl::GetVertexFormatID(attribType, GL_FALSE, components, pureInt);
>+
>+                inputLayoutOut->push_back(defaultID);
>             }
>         }
>     }
>@@ -76,96 +80,61 @@ void GetDefaultOutputLayoutFromShader(
>     }
> }
> 
>-template <typename T, int cols, int rows>
>-bool TransposeExpandMatrix(T *target, const GLfloat *value)
>-{
>-    constexpr int targetWidth  = 4;
>-    constexpr int targetHeight = rows;
>-    constexpr int srcWidth     = rows;
>-    constexpr int srcHeight    = cols;
>-
>-    constexpr int copyWidth  = std::min(targetHeight, srcWidth);
>-    constexpr int copyHeight = std::min(targetWidth, srcHeight);
>-
>-    T staging[targetWidth * targetHeight] = {0};
>-
>-    for (int x = 0; x < copyWidth; x++)
>-    {
>-        for (int y = 0; y < copyHeight; y++)
>-        {
>-            staging[x * targetWidth + y] = static_cast<T>(value[y * srcWidth + x]);
>-        }
>-    }
>-
>-    if (memcmp(target, staging, targetWidth * targetHeight * sizeof(T)) == 0)
>-    {
>-        return false;
>-    }
>-
>-    memcpy(target, staging, targetWidth * targetHeight * sizeof(T));
>-    return true;
>-}
>-
>-template <typename T, int cols, int rows>
>-bool ExpandMatrix(T *target, const GLfloat *value)
>+void GetDefaultImage2DBindLayoutFromComputeShader(const std::vector<sh::Uniform> &image2DUniforms,
>+                                                  gl::ImageUnitTextureTypeMap *image2DBindLayout)
> {
>-    constexpr int targetWidth  = 4;
>-    constexpr int targetHeight = rows;
>-    constexpr int srcWidth = cols;
>-    constexpr int srcHeight = rows;
>-
>-    constexpr int copyWidth  = std::min(targetWidth, srcWidth);
>-    constexpr int copyHeight = std::min(targetHeight, srcHeight);
>-
>-    T staging[targetWidth * targetHeight] = {0};
>+    image2DBindLayout->clear();
> 
>-    for (int y = 0; y < copyHeight; y++)
>+    for (const sh::Uniform &image2D : image2DUniforms)
>     {
>-        for (int x = 0; x < copyWidth; x++)
>+        if (gl::IsImage2DType(image2D.type))
>         {
>-            staging[y * targetWidth + x] = static_cast<T>(value[y * srcWidth + x]);
>+            if (image2D.binding == -1)
>+            {
>+                image2DBindLayout->insert(std::make_pair(0, gl::TextureType::_2D));
>+            }
>+            else
>+            {
>+                for (unsigned int index = 0; index < image2D.getArraySizeProduct(); index++)
>+                {
>+                    image2DBindLayout->insert(
>+                        std::make_pair(image2D.binding + index, gl::TextureType::_2D));
>+                }
>+            }
>         }
>     }
>-
>-    if (memcmp(target, staging, targetWidth * targetHeight * sizeof(T)) == 0)
>-    {
>-        return false;
>-    }
>-
>-    memcpy(target, staging, targetWidth * targetHeight * sizeof(T));
>-    return true;
> }
> 
>-gl::PrimitiveType GetGeometryShaderTypeFromDrawMode(GLenum drawMode)
>+gl::PrimitiveMode GetGeometryShaderTypeFromDrawMode(gl::PrimitiveMode drawMode)
> {
>     switch (drawMode)
>     {
>         // Uses the point sprite geometry shader.
>-        case GL_POINTS:
>-            return gl::PRIMITIVE_POINTS;
>+        case gl::PrimitiveMode::Points:
>+            return gl::PrimitiveMode::Points;
> 
>         // All line drawing uses the same geometry shader.
>-        case GL_LINES:
>-        case GL_LINE_STRIP:
>-        case GL_LINE_LOOP:
>-            return gl::PRIMITIVE_LINES;
>+        case gl::PrimitiveMode::Lines:
>+        case gl::PrimitiveMode::LineStrip:
>+        case gl::PrimitiveMode::LineLoop:
>+            return gl::PrimitiveMode::Lines;
> 
>         // The triangle fan primitive is emulated with strips in D3D11.
>-        case GL_TRIANGLES:
>-        case GL_TRIANGLE_FAN:
>-            return gl::PRIMITIVE_TRIANGLES;
>+        case gl::PrimitiveMode::Triangles:
>+        case gl::PrimitiveMode::TriangleFan:
>+            return gl::PrimitiveMode::Triangles;
> 
>         // Special case for triangle strips.
>-        case GL_TRIANGLE_STRIP:
>-            return gl::PRIMITIVE_TRIANGLE_STRIP;
>+        case gl::PrimitiveMode::TriangleStrip:
>+            return gl::PrimitiveMode::TriangleStrip;
> 
>         default:
>             UNREACHABLE();
>-            return gl::PRIMITIVE_TYPE_MAX;
>+            return gl::PrimitiveMode::InvalidEnum;
>     }
> }
> 
>-bool FindFlatInterpolationVarying(const std::vector<sh::Varying> &varyings)
>+bool HasFlatInterpolationVarying(const std::vector<sh::Varying> &varyings)
> {
>     // Note: this assumes nested structs can only be packed with one interpolation.
>     for (const auto &varying : varyings)
>@@ -179,32 +148,49 @@ bool FindFlatInterpolationVarying(const std::vector<sh::Varying> &varyings)
>     return false;
> }
> 
>-// Helper method to de-tranpose a matrix uniform for an API query.
>-void GetMatrixUniform(GLint columns, GLint rows, GLfloat *dataOut, const GLfloat *source)
>+bool FindFlatInterpolationVaryingPerShader(gl::Shader *shader)
> {
>-    for (GLint col = 0; col < columns; ++col)
>+    ASSERT(shader);
>+    switch (shader->getType())
>     {
>-        for (GLint row = 0; row < rows; ++row)
>-        {
>-            GLfloat *outptr      = dataOut + ((col * rows) + row);
>-            const GLfloat *inptr = source + ((row * 4) + col);
>-            *outptr              = *inptr;
>-        }
>+        case gl::ShaderType::Vertex:
>+            return HasFlatInterpolationVarying(shader->getOutputVaryings());
>+        case gl::ShaderType::Fragment:
>+            return HasFlatInterpolationVarying(shader->getInputVaryings());
>+        case gl::ShaderType::Geometry:
>+            return HasFlatInterpolationVarying(shader->getInputVaryings()) ||
>+                   HasFlatInterpolationVarying(shader->getOutputVaryings());
>+        default:
>+            UNREACHABLE();
>+            return false;
>     }
> }
> 
>-template <typename NonFloatT>
>-void GetMatrixUniform(GLint columns, GLint rows, NonFloatT *dataOut, const NonFloatT *source)
>+bool FindFlatInterpolationVarying(const gl::ShaderMap<gl::Shader *> &shaders)
> {
>-    UNREACHABLE();
>+    for (gl::ShaderType shaderType : gl::kAllGraphicsShaderTypes)
>+    {
>+        gl::Shader *shader = shaders[shaderType];
>+        if (!shader)
>+        {
>+            continue;
>+        }
>+
>+        if (FindFlatInterpolationVaryingPerShader(shader))
>+        {
>+            return true;
>+        }
>+    }
>+
>+    return false;
> }
> 
>-class UniformBlockInfo final : angle::NonCopyable
>+class InterfaceBlockInfo final : angle::NonCopyable
> {
>   public:
>-    UniformBlockInfo() {}
>+    InterfaceBlockInfo() {}
> 
>-    void getShaderBlockInfo(const gl::Context *context, gl::Shader *shader);
>+    void getShaderBlockInfo(const std::vector<sh::InterfaceBlock> &interfaceBlocks);
> 
>     bool getBlockSize(const std::string &name, const std::string &mappedName, size_t *sizeOut);
>     bool getBlockMemberInfo(const std::string &name,
>@@ -218,11 +204,11 @@ class UniformBlockInfo final : angle::NonCopyable
>     sh::BlockLayoutMap mBlockLayout;
> };
> 
>-void UniformBlockInfo::getShaderBlockInfo(const gl::Context *context, gl::Shader *shader)
>+void InterfaceBlockInfo::getShaderBlockInfo(const std::vector<sh::InterfaceBlock> &interfaceBlocks)
> {
>-    for (const sh::InterfaceBlock &interfaceBlock : shader->getUniformBlocks(context))
>+    for (const sh::InterfaceBlock &interfaceBlock : interfaceBlocks)
>     {
>-        if (!interfaceBlock.staticUse && interfaceBlock.layout == sh::BLOCKLAYOUT_PACKED)
>+        if (!interfaceBlock.active && interfaceBlock.layout == sh::BLOCKLAYOUT_PACKED)
>             continue;
> 
>         if (mBlockSizes.count(interfaceBlock.name) > 0)
>@@ -233,12 +219,13 @@ void UniformBlockInfo::getShaderBlockInfo(const gl::Context *context, gl::Shader
>     }
> }
> 
>-size_t UniformBlockInfo::getBlockInfo(const sh::InterfaceBlock &interfaceBlock)
>+size_t InterfaceBlockInfo::getBlockInfo(const sh::InterfaceBlock &interfaceBlock)
> {
>-    ASSERT(interfaceBlock.staticUse || interfaceBlock.layout != sh::BLOCKLAYOUT_PACKED);
>+    ASSERT(interfaceBlock.active || interfaceBlock.layout != sh::BLOCKLAYOUT_PACKED);
> 
>     // define member uniforms
>     sh::Std140BlockEncoder std140Encoder;
>+    sh::Std430BlockEncoder std430Encoder;
>     sh::HLSLBlockEncoder hlslEncoder(sh::HLSLBlockEncoder::ENCODE_PACKED, false);
>     sh::BlockLayoutEncoder *encoder = nullptr;
> 
>@@ -246,20 +233,24 @@ size_t UniformBlockInfo::getBlockInfo(const sh::InterfaceBlock &interfaceBlock)
>     {
>         encoder = &std140Encoder;
>     }
>+    else if (interfaceBlock.layout == sh::BLOCKLAYOUT_STD430)
>+    {
>+        encoder = &std430Encoder;
>+    }
>     else
>     {
>         encoder = &hlslEncoder;
>     }
> 
>-    sh::GetUniformBlockInfo(interfaceBlock.fields, interfaceBlock.fieldPrefix(), encoder,
>-                            interfaceBlock.isRowMajorLayout, &mBlockLayout);
>+    sh::GetInterfaceBlockInfo(interfaceBlock.fields, interfaceBlock.fieldPrefix(), encoder,
>+                              &mBlockLayout);
> 
>-    return encoder->getBlockSize();
>+    return encoder->getCurrentOffset();
> }
> 
>-bool UniformBlockInfo::getBlockSize(const std::string &name,
>-                                    const std::string &mappedName,
>-                                    size_t *sizeOut)
>+bool InterfaceBlockInfo::getBlockSize(const std::string &name,
>+                                      const std::string &mappedName,
>+                                      size_t *sizeOut)
> {
>     size_t nameLengthWithoutArrayIndex;
>     gl::ParseArrayIndex(name, &nameLengthWithoutArrayIndex);
>@@ -273,43 +264,101 @@ bool UniformBlockInfo::getBlockSize(const std::string &name,
> 
>     *sizeOut = sizeIter->second;
>     return true;
>-};
>+}
> 
>-bool UniformBlockInfo::getBlockMemberInfo(const std::string &name,
>-                                          const std::string &mappedName,
>-                                          sh::BlockMemberInfo *infoOut)
>+bool InterfaceBlockInfo::getBlockMemberInfo(const std::string &name,
>+                                            const std::string &mappedName,
>+                                            sh::BlockMemberInfo *infoOut)
> {
>     auto infoIter = mBlockLayout.find(name);
>     if (infoIter == mBlockLayout.end())
>     {
>-        *infoOut = sh::BlockMemberInfo::getDefaultBlockInfo();
>+        *infoOut = sh::kDefaultBlockMemberInfo;
>         return false;
>     }
> 
>     *infoOut = infoIter->second;
>     return true;
>-};
>+}
>+
>+// Helper class that gathers uniform info from the default uniform block.
>+class UniformEncodingVisitorD3D : public sh::BlockEncoderVisitor
>+{
>+  public:
>+    UniformEncodingVisitorD3D(gl::ShaderType shaderType,
>+                              HLSLRegisterType registerType,
>+                              sh::BlockLayoutEncoder *encoder,
>+                              D3DUniformMap *uniformMapOut)
>+        : sh::BlockEncoderVisitor("", "", encoder),
>+          mShaderType(shaderType),
>+          mRegisterType(registerType),
>+          mUniformMapOut(uniformMapOut)
>+    {}
>+
>+    void visitNamedSampler(const sh::ShaderVariable &sampler,
>+                           const std::string &name,
>+                           const std::string &mappedName) override
>+    {
>+        auto uniformMapEntry = mUniformMapOut->find(name);
>+        if (uniformMapEntry == mUniformMapOut->end())
>+        {
>+            (*mUniformMapOut)[name] =
>+                new D3DUniform(sampler.type, mRegisterType, name, sampler.arraySizes, true);
>+        }
>+    }
>+
>+    void encodeVariable(const sh::ShaderVariable &variable,
>+                        const sh::BlockMemberInfo &variableInfo,
>+                        const std::string &name,
>+                        const std::string &mappedName) override
>+    {
>+        auto uniformMapEntry   = mUniformMapOut->find(name);
>+        D3DUniform *d3dUniform = nullptr;
>+
>+        if (uniformMapEntry != mUniformMapOut->end())
>+        {
>+            d3dUniform = uniformMapEntry->second;
>+        }
>+        else
>+        {
>+            d3dUniform =
>+                new D3DUniform(variable.type, mRegisterType, name, variable.arraySizes, true);
>+            (*mUniformMapOut)[name] = d3dUniform;
>+        }
>+
>+        d3dUniform->registerElement = static_cast<unsigned int>(
>+            sh::BlockLayoutEncoder::GetBlockRegisterElement(variableInfo));
>+        unsigned int reg =
>+            static_cast<unsigned int>(sh::BlockLayoutEncoder::GetBlockRegister(variableInfo));
>+
>+        ASSERT(mShaderType != gl::ShaderType::InvalidEnum);
>+        d3dUniform->mShaderRegisterIndexes[mShaderType] = reg;
>+    }
> 
>+  private:
>+    gl::ShaderType mShaderType;
>+    HLSLRegisterType mRegisterType;
>+    D3DUniformMap *mUniformMapOut;
>+};
> }  // anonymous namespace
> 
> // D3DUniform Implementation
> 
> D3DUniform::D3DUniform(GLenum type,
>+                       HLSLRegisterType reg,
>                        const std::string &nameIn,
>                        const std::vector<unsigned int> &arraySizesIn,
>                        bool defaultBlock)
>     : typeInfo(gl::GetUniformTypeInfo(type)),
>       name(nameIn),
>       arraySizes(arraySizesIn),
>-      vsData(nullptr),
>-      psData(nullptr),
>-      csData(nullptr),
>-      vsRegisterIndex(GL_INVALID_INDEX),
>-      psRegisterIndex(GL_INVALID_INDEX),
>-      csRegisterIndex(GL_INVALID_INDEX),
>+      mShaderData({}),
>+      regType(reg),
>       registerCount(0),
>       registerElement(0)
> {
>+    mShaderRegisterIndexes.fill(GL_INVALID_INDEX);
>+
>     // We use data storage for default block uniforms to cache values that are sent to D3D during
>     // rendering
>     // Uniform blocks/buffers are treated separately by the Renderer (ES3 path only)
>@@ -320,9 +369,7 @@ D3DUniform::D3DUniform(GLenum type,
>     }
> }
> 
>-D3DUniform::~D3DUniform()
>-{
>-}
>+D3DUniform::~D3DUniform() {}
> 
> unsigned int D3DUniform::getArraySizeProduct() const
> {
>@@ -347,39 +394,52 @@ bool D3DUniform::isSampler() const
>     return typeInfo.isSampler;
> }
> 
>-bool D3DUniform::isReferencedByVertexShader() const
>+bool D3DUniform::isImage() const
> {
>-    return vsRegisterIndex != GL_INVALID_INDEX;
>+    return typeInfo.isImageType;
> }
> 
>-bool D3DUniform::isReferencedByFragmentShader() const
>+bool D3DUniform::isImage2D() const
> {
>-    return psRegisterIndex != GL_INVALID_INDEX;
>+    return gl::IsImage2DType(typeInfo.type);
> }
> 
>-bool D3DUniform::isReferencedByComputeShader() const
>+bool D3DUniform::isReferencedByShader(gl::ShaderType shaderType) const
> {
>-    return csRegisterIndex != GL_INVALID_INDEX;
>+    return mShaderRegisterIndexes[shaderType] != GL_INVALID_INDEX;
> }
> 
> const uint8_t *D3DUniform::firstNonNullData() const
> {
>-    ASSERT(vsData || psData || csData || !mSamplerData.empty());
>-
>     if (!mSamplerData.empty())
>     {
>         return reinterpret_cast<const uint8_t *>(mSamplerData.data());
>     }
> 
>-    return vsData ? vsData : (psData ? psData : csData);
>-}
>+    for (gl::ShaderType shaderType : gl::AllShaderTypes())
>+    {
>+        if (mShaderData[shaderType])
>+        {
>+            return mShaderData[shaderType];
>+        }
>+    }
> 
>-// D3DVarying Implementation
>+    UNREACHABLE();
>+    return nullptr;
>+}
> 
>-D3DVarying::D3DVarying() : semanticIndex(0), componentCount(0), outputSlot(0)
>+// D3DInterfaceBlock Implementation
>+D3DInterfaceBlock::D3DInterfaceBlock()
> {
>+    mShaderRegisterIndexes.fill(GL_INVALID_INDEX);
> }
> 
>+D3DInterfaceBlock::D3DInterfaceBlock(const D3DInterfaceBlock &other) = default;
>+
>+// D3DVarying Implementation
>+
>+D3DVarying::D3DVarying() : semanticIndex(0), componentCount(0), outputSlot(0) {}
>+
> D3DVarying::D3DVarying(const std::string &semanticNameIn,
>                        unsigned int semanticIndexIn,
>                        unsigned int componentCountIn,
>@@ -388,56 +448,53 @@ D3DVarying::D3DVarying(const std::string &semanticNameIn,
>       semanticIndex(semanticIndexIn),
>       componentCount(componentCountIn),
>       outputSlot(outputSlotIn)
>-{
>-}
>+{}
> 
> // ProgramD3DMetadata Implementation
> 
> ProgramD3DMetadata::ProgramD3DMetadata(RendererD3D *renderer,
>-                                       const ShaderD3D *vertexShader,
>-                                       const ShaderD3D *fragmentShader)
>+                                       const gl::ShaderMap<const ShaderD3D *> &attachedShaders)
>     : mRendererMajorShaderModel(renderer->getMajorShaderModel()),
>       mShaderModelSuffix(renderer->getShaderModelSuffix()),
>       mUsesInstancedPointSpriteEmulation(
>           renderer->getWorkarounds().useInstancedPointSpriteEmulation),
>       mUsesViewScale(renderer->presentPathFastEnabled()),
>-      mHasANGLEMultiviewEnabled(vertexShader->hasANGLEMultiviewEnabled()),
>-      mUsesViewID(fragmentShader->usesViewID()),
>       mCanSelectViewInVertexShader(renderer->canSelectViewInVertexShader()),
>-      mVertexShader(vertexShader),
>-      mFragmentShader(fragmentShader)
>-{
>-}
>+      mAttachedShaders(attachedShaders)
>+{}
>+
>+ProgramD3DMetadata::~ProgramD3DMetadata() = default;
> 
> int ProgramD3DMetadata::getRendererMajorShaderModel() const
> {
>     return mRendererMajorShaderModel;
> }
> 
>-bool ProgramD3DMetadata::usesBroadcast(const gl::ContextState &data) const
>+bool ProgramD3DMetadata::usesBroadcast(const gl::State &data) const
> {
>-    return (mFragmentShader->usesFragColor() && mFragmentShader->usesMultipleRenderTargets() &&
>+    return (mAttachedShaders[gl::ShaderType::Fragment]->usesFragColor() &&
>+            mAttachedShaders[gl::ShaderType::Fragment]->usesMultipleRenderTargets() &&
>             data.getClientMajorVersion() < 3);
> }
> 
> bool ProgramD3DMetadata::usesFragDepth() const
> {
>-    return mFragmentShader->usesFragDepth();
>+    return mAttachedShaders[gl::ShaderType::Fragment]->usesFragDepth();
> }
> 
> bool ProgramD3DMetadata::usesPointCoord() const
> {
>-    return mFragmentShader->usesPointCoord();
>+    return mAttachedShaders[gl::ShaderType::Fragment]->usesPointCoord();
> }
> 
> bool ProgramD3DMetadata::usesFragCoord() const
> {
>-    return mFragmentShader->usesFragCoord();
>+    return mAttachedShaders[gl::ShaderType::Fragment]->usesFragCoord();
> }
> 
> bool ProgramD3DMetadata::usesPointSize() const
> {
>-    return mVertexShader->usesPointSize();
>+    return mAttachedShaders[gl::ShaderType::Vertex]->usesPointSize();
> }
> 
> bool ProgramD3DMetadata::usesInsertedPointCoordValue() const
>@@ -453,12 +510,17 @@ bool ProgramD3DMetadata::usesViewScale() const
> 
> bool ProgramD3DMetadata::hasANGLEMultiviewEnabled() const
> {
>-    return mHasANGLEMultiviewEnabled;
>+    return mAttachedShaders[gl::ShaderType::Vertex]->hasANGLEMultiviewEnabled();
>+}
>+
>+bool ProgramD3DMetadata::usesVertexID() const
>+{
>+    return mAttachedShaders[gl::ShaderType::Vertex]->usesVertexID();
> }
> 
> bool ProgramD3DMetadata::usesViewID() const
> {
>-    return mUsesViewID;
>+    return mAttachedShaders[gl::ShaderType::Fragment]->usesViewID();
> }
> 
> bool ProgramD3DMetadata::canSelectViewInVertexShader() const
>@@ -493,27 +555,70 @@ bool ProgramD3DMetadata::usesSystemValuePointSize() const
> 
> bool ProgramD3DMetadata::usesMultipleFragmentOuts() const
> {
>-    return mFragmentShader->usesMultipleRenderTargets();
>+    return mAttachedShaders[gl::ShaderType::Fragment]->usesMultipleRenderTargets();
> }
> 
> GLint ProgramD3DMetadata::getMajorShaderVersion() const
> {
>-    return mVertexShader->getData().getShaderVersion();
>+    return mAttachedShaders[gl::ShaderType::Vertex]->getData().getShaderVersion();
> }
> 
> const ShaderD3D *ProgramD3DMetadata::getFragmentShader() const
> {
>-    return mFragmentShader;
>+    return mAttachedShaders[gl::ShaderType::Fragment];
> }
> 
>+// ProgramD3D::GetExecutableTask class
>+class ProgramD3D::GetExecutableTask : public Closure, public d3d::Context
>+{
>+  public:
>+    GetExecutableTask(ProgramD3D *program) : mProgram(program) {}
>+
>+    virtual angle::Result run() = 0;
>+
>+    void operator()() override { mResult = run(); }
>+
>+    angle::Result getResult() const { return mResult; }
>+    const gl::InfoLog &getInfoLog() const { return mInfoLog; }
>+    ShaderExecutableD3D *getExecutable() { return mExecutable; }
>+
>+    void handleResult(HRESULT hr,
>+                      const char *message,
>+                      const char *file,
>+                      const char *function,
>+                      unsigned int line) override
>+    {
>+        mStoredHR       = hr;
>+        mStoredMessage  = message;
>+        mStoredFile     = file;
>+        mStoredFunction = function;
>+        mStoredLine     = line;
>+    }
>+
>+    void popError(d3d::Context *context)
>+    {
>+        context->handleResult(mStoredHR, mStoredMessage, mStoredFile, mStoredFunction, mStoredLine);
>+    }
>+
>+  protected:
>+    ProgramD3D *mProgram  = nullptr;
>+    angle::Result mResult = angle::Result::Continue;
>+    gl::InfoLog mInfoLog;
>+    ShaderExecutableD3D *mExecutable = nullptr;
>+    HRESULT mStoredHR                = S_OK;
>+    const char *mStoredMessage       = nullptr;
>+    const char *mStoredFile          = nullptr;
>+    const char *mStoredFunction      = nullptr;
>+    unsigned int mStoredLine         = 0;
>+};
>+
> // ProgramD3D Implementation
> 
> ProgramD3D::VertexExecutable::VertexExecutable(const gl::InputLayout &inputLayout,
>                                                const Signature &signature,
>                                                ShaderExecutableD3D *shaderExecutable)
>     : mInputs(inputLayout), mSignature(signature), mShaderExecutable(shaderExecutable)
>-{
>-}
>+{}
> 
> ProgramD3D::VertexExecutable::~VertexExecutable()
> {
>@@ -549,15 +654,15 @@ void ProgramD3D::VertexExecutable::getSignature(RendererD3D *renderer,
> 
>     for (size_t index = 0; index < inputLayout.size(); ++index)
>     {
>-        gl::VertexFormatType vertexFormatType = inputLayout[index];
>-        if (vertexFormatType == gl::VERTEX_FORMAT_INVALID)
>+        angle::FormatID vertexFormatID = inputLayout[index];
>+        if (vertexFormatID == angle::FormatID::NONE)
>             continue;
> 
>-        VertexConversionType conversionType = renderer->getVertexConversionType(vertexFormatType);
>+        VertexConversionType conversionType = renderer->getVertexConversionType(vertexFormatID);
>         if ((conversionType & VERTEX_CONVERT_GPU) == 0)
>             continue;
> 
>-        GLenum componentType = renderer->getVertexComponentType(vertexFormatType);
>+        GLenum componentType   = renderer->getVertexComponentType(vertexFormatID);
>         (*signatureOut)[index] = GetAttribType(componentType);
>     }
> }
>@@ -580,17 +685,26 @@ bool ProgramD3D::VertexExecutable::matchesSignature(const Signature &signature)
> ProgramD3D::PixelExecutable::PixelExecutable(const std::vector<GLenum> &outputSignature,
>                                              ShaderExecutableD3D *shaderExecutable)
>     : mOutputSignature(outputSignature), mShaderExecutable(shaderExecutable)
>-{
>-}
>+{}
> 
> ProgramD3D::PixelExecutable::~PixelExecutable()
> {
>     SafeDelete(mShaderExecutable);
> }
> 
>-ProgramD3D::Sampler::Sampler() : active(false), logicalTextureUnit(0), textureType(GL_TEXTURE_2D)
>-{
>-}
>+ProgramD3D::ComputeExecutable::ComputeExecutable(
>+    const gl::ImageUnitTextureTypeMap &signature,
>+    std::unique_ptr<ShaderExecutableD3D> shaderExecutable)
>+    : mSignature(signature), mShaderExecutable(std::move(shaderExecutable))
>+{}
>+
>+ProgramD3D::ComputeExecutable::~ComputeExecutable() {}
>+
>+ProgramD3D::Sampler::Sampler()
>+    : active(false), logicalTextureUnit(0), textureType(gl::TextureType::_2D)
>+{}
>+
>+ProgramD3D::Image::Image() : active(false), logicalImageUnit(0) {}
> 
> unsigned int ProgramD3D::mCurrentSerial = 1;
> 
>@@ -598,21 +712,14 @@ ProgramD3D::ProgramD3D(const gl::ProgramState &state, RendererD3D *renderer)
>     : ProgramImpl(state),
>       mRenderer(renderer),
>       mDynamicHLSL(nullptr),
>-      mGeometryExecutables(gl::PRIMITIVE_TYPE_MAX),
>-      mComputeExecutable(nullptr),
>       mUsesPointSize(false),
>       mUsesFlatInterpolation(false),
>-      mVertexUniformStorage(nullptr),
>-      mFragmentUniformStorage(nullptr),
>-      mComputeUniformStorage(nullptr),
>-      mUsedVertexSamplerRange(0),
>-      mUsedPixelSamplerRange(0),
>-      mUsedComputeSamplerRange(0),
>+      mUsedShaderSamplerRanges({}),
>       mDirtySamplerMapping(true),
>-      mSerial(issueSerial()),
>-      mVertexUniformsDirty(true),
>-      mFragmentUniformsDirty(true),
>-      mComputeUniformsDirty(true)
>+      mUsedComputeImageRange(0, 0),
>+      mUsedComputeReadonlyImageRange(0, 0),
>+      mUsedComputeAtomicCounterRange(0, 0),
>+      mSerial(issueSerial())
> {
>     mDynamicHLSL = new DynamicHLSL(renderer);
> }
>@@ -633,15 +740,19 @@ bool ProgramD3D::usesGeometryShaderForPointSpriteEmulation() const
>     return usesPointSpriteEmulation() && !usesInstancedPointSpriteEmulation();
> }
> 
>-bool ProgramD3D::usesGeometryShader(GLenum drawMode) const
>+bool ProgramD3D::usesGeometryShader(const gl::State &state, const gl::PrimitiveMode drawMode) const
> {
>     if (mHasANGLEMultiviewEnabled && !mRenderer->canSelectViewInVertexShader())
>     {
>         return true;
>     }
>-    if (drawMode != GL_POINTS)
>+    if (drawMode != gl::PrimitiveMode::Points)
>     {
>-        return mUsesFlatInterpolation;
>+        if (!mUsesFlatInterpolation)
>+        {
>+            return false;
>+        }
>+        return state.getProvokingVertex() == gl::ProvokingVertex::LastVertexConvention;
>     }
>     return usesGeometryShaderForPointSpriteEmulation();
> }
>@@ -651,37 +762,20 @@ bool ProgramD3D::usesInstancedPointSpriteEmulation() const
>     return mRenderer->getWorkarounds().useInstancedPointSpriteEmulation;
> }
> 
>-GLint ProgramD3D::getSamplerMapping(gl::SamplerType type,
>+GLint ProgramD3D::getSamplerMapping(gl::ShaderType type,
>                                     unsigned int samplerIndex,
>                                     const gl::Caps &caps) const
> {
>     GLint logicalTextureUnit = -1;
> 
>-    switch (type)
>+    ASSERT(type != gl::ShaderType::InvalidEnum);
>+
>+    ASSERT(samplerIndex < caps.maxShaderTextureImageUnits[type]);
>+
>+    const auto &samplers = mShaderSamplers[type];
>+    if (samplerIndex < samplers.size() && samplers[samplerIndex].active)
>     {
>-        case gl::SAMPLER_PIXEL:
>-            ASSERT(samplerIndex < caps.maxTextureImageUnits);
>-            if (samplerIndex < mSamplersPS.size() && mSamplersPS[samplerIndex].active)
>-            {
>-                logicalTextureUnit = mSamplersPS[samplerIndex].logicalTextureUnit;
>-            }
>-            break;
>-        case gl::SAMPLER_VERTEX:
>-            ASSERT(samplerIndex < caps.maxVertexTextureImageUnits);
>-            if (samplerIndex < mSamplersVS.size() && mSamplersVS[samplerIndex].active)
>-            {
>-                logicalTextureUnit = mSamplersVS[samplerIndex].logicalTextureUnit;
>-            }
>-            break;
>-        case gl::SAMPLER_COMPUTE:
>-            ASSERT(samplerIndex < caps.maxComputeTextureImageUnits);
>-            if (samplerIndex < mSamplersCS.size() && mSamplersCS[samplerIndex].active)
>-            {
>-                logicalTextureUnit = mSamplersCS[samplerIndex].logicalTextureUnit;
>-            }
>-            break;
>-        default:
>-            UNREACHABLE();
>+        logicalTextureUnit = samplers[samplerIndex].logicalTextureUnit;
>     }
> 
>     if (logicalTextureUnit >= 0 &&
>@@ -695,43 +789,22 @@ GLint ProgramD3D::getSamplerMapping(gl::SamplerType type,
> 
> // Returns the texture type for a given Direct3D 9 sampler type and
> // index (0-15 for the pixel shader and 0-3 for the vertex shader).
>-GLenum ProgramD3D::getSamplerTextureType(gl::SamplerType type, unsigned int samplerIndex) const
>+gl::TextureType ProgramD3D::getSamplerTextureType(gl::ShaderType type,
>+                                                  unsigned int samplerIndex) const
> {
>-    switch (type)
>-    {
>-        case gl::SAMPLER_PIXEL:
>-            ASSERT(samplerIndex < mSamplersPS.size());
>-            ASSERT(mSamplersPS[samplerIndex].active);
>-            return mSamplersPS[samplerIndex].textureType;
>-        case gl::SAMPLER_VERTEX:
>-            ASSERT(samplerIndex < mSamplersVS.size());
>-            ASSERT(mSamplersVS[samplerIndex].active);
>-            return mSamplersVS[samplerIndex].textureType;
>-        case gl::SAMPLER_COMPUTE:
>-            ASSERT(samplerIndex < mSamplersCS.size());
>-            ASSERT(mSamplersCS[samplerIndex].active);
>-            return mSamplersCS[samplerIndex].textureType;
>-        default:
>-            UNREACHABLE();
>-    }
>+    ASSERT(type != gl::ShaderType::InvalidEnum);
> 
>-    return GL_TEXTURE_2D;
>+    const auto &samplers = mShaderSamplers[type];
>+    ASSERT(samplerIndex < samplers.size());
>+    ASSERT(samplers[samplerIndex].active);
>+
>+    return samplers[samplerIndex].textureType;
> }
> 
>-GLuint ProgramD3D::getUsedSamplerRange(gl::SamplerType type) const
>+gl::RangeUI ProgramD3D::getUsedSamplerRange(gl::ShaderType type) const
> {
>-    switch (type)
>-    {
>-        case gl::SAMPLER_PIXEL:
>-            return mUsedPixelSamplerRange;
>-        case gl::SAMPLER_VERTEX:
>-            return mUsedVertexSamplerRange;
>-        case gl::SAMPLER_COMPUTE:
>-            return mUsedComputeSamplerRange;
>-        default:
>-            UNREACHABLE();
>-            return 0u;
>-    }
>+    ASSERT(type != gl::ShaderType::InvalidEnum);
>+    return mUsedShaderSamplerRanges[type];
> }
> 
> ProgramD3D::SamplerMapping ProgramD3D::updateSamplerMapping()
>@@ -751,62 +824,167 @@ ProgramD3D::SamplerMapping ProgramD3D::updateSamplerMapping()
> 
>         int count = d3dUniform->getArraySizeProduct();
> 
>-        if (d3dUniform->isReferencedByFragmentShader())
>+        for (gl::ShaderType shaderType : gl::AllShaderTypes())
>         {
>-            unsigned int firstIndex = d3dUniform->psRegisterIndex;
>+            if (!d3dUniform->isReferencedByShader(shaderType))
>+            {
>+                continue;
>+            }
> 
>+            unsigned int firstIndex = d3dUniform->mShaderRegisterIndexes[shaderType];
>+
>+            std::vector<Sampler> &samplers = mShaderSamplers[shaderType];
>             for (int i = 0; i < count; i++)
>             {
>                 unsigned int samplerIndex = firstIndex + i;
> 
>-                if (samplerIndex < mSamplersPS.size())
>+                if (samplerIndex < samplers.size())
>                 {
>-                    ASSERT(mSamplersPS[samplerIndex].active);
>-                    mSamplersPS[samplerIndex].logicalTextureUnit = d3dUniform->mSamplerData[i];
>+                    ASSERT(samplers[samplerIndex].active);
>+                    samplers[samplerIndex].logicalTextureUnit = d3dUniform->mSamplerData[i];
>                 }
>             }
>         }
>+    }
> 
>-        if (d3dUniform->isReferencedByVertexShader())
>-        {
>-            unsigned int firstIndex = d3dUniform->vsRegisterIndex;
>+    return SamplerMapping::WasDirty;
>+}
> 
>-            for (int i = 0; i < count; i++)
>+GLint ProgramD3D::getImageMapping(gl::ShaderType type,
>+                                  unsigned int imageIndex,
>+                                  bool readonly,
>+                                  const gl::Caps &caps) const
>+{
>+    GLint logicalImageUnit = -1;
>+    ASSERT(imageIndex < caps.maxImageUnits);
>+    switch (type)
>+    {
>+        case gl::ShaderType::Compute:
>+            if (readonly && imageIndex < mReadonlyImagesCS.size() &&
>+                mReadonlyImagesCS[imageIndex].active)
>             {
>-                unsigned int samplerIndex = firstIndex + i;
>-
>-                if (samplerIndex < mSamplersVS.size())
>-                {
>-                    ASSERT(mSamplersVS[samplerIndex].active);
>-                    mSamplersVS[samplerIndex].logicalTextureUnit = d3dUniform->mSamplerData[i];
>-                }
>+                logicalImageUnit = mReadonlyImagesCS[imageIndex].logicalImageUnit;
>+            }
>+            else if (imageIndex < mImagesCS.size() && mImagesCS[imageIndex].active)
>+            {
>+                logicalImageUnit = mImagesCS[imageIndex].logicalImageUnit;
>             }
>+            break;
>+        // TODO(xinghua.cao@intel.com): add image mapping for vertex shader and pixel shader.
>+        default:
>+            UNREACHABLE();
>+    }
>+
>+    if (logicalImageUnit >= 0 && logicalImageUnit < static_cast<GLint>(caps.maxImageUnits))
>+    {
>+        return logicalImageUnit;
>+    }
>+
>+    return -1;
>+}
>+
>+gl::RangeUI ProgramD3D::getUsedImageRange(gl::ShaderType type, bool readonly) const
>+{
>+    switch (type)
>+    {
>+        case gl::ShaderType::Compute:
>+            return readonly ? mUsedComputeReadonlyImageRange : mUsedComputeImageRange;
>+        // TODO(xinghua.cao@intel.com): add real image range of vertex shader and pixel shader.
>+        case gl::ShaderType::Vertex:
>+        case gl::ShaderType::Fragment:
>+            return {0, 0};
>+        default:
>+            UNREACHABLE();
>+            return {0, 0};
>+    }
>+}
>+
>+class ProgramD3D::LoadBinaryTask : public ProgramD3D::GetExecutableTask
>+{
>+  public:
>+    LoadBinaryTask(const gl::Context *context,
>+                   ProgramD3D *program,
>+                   gl::BinaryInputStream *stream,
>+                   gl::InfoLog &infoLog)
>+        : ProgramD3D::GetExecutableTask(program),
>+          mContext(context),
>+          mProgram(program),
>+          mInfoLog(infoLog)
>+    {
>+        ASSERT(mContext);
>+        ASSERT(mProgram);
>+        ASSERT(stream);
>+
>+        // Copy the remaining data from the stream locally so that the client can't modify it when
>+        // loading off thread.
>+        size_t dataSize    = stream->remainingSize();
>+        mDataCopySucceeded = mStreamData.resize(dataSize);
>+        if (mDataCopySucceeded)
>+        {
>+            memcpy(mStreamData.data(), stream->data() + stream->offset(), dataSize);
>         }
>+    }
> 
>-        if (d3dUniform->isReferencedByComputeShader())
>+    angle::Result run() override
>+    {
>+        if (!mDataCopySucceeded)
>         {
>-            unsigned int firstIndex = d3dUniform->csRegisterIndex;
>+            mInfoLog << "Failed to copy program binary data to local buffer.";
>+            return angle::Result::Stop;
>+        }
> 
>-            for (int i = 0; i < count; i++)
>-            {
>-                unsigned int samplerIndex = firstIndex + i;
>+        gl::BinaryInputStream stream(mStreamData.data(), mStreamData.size());
>+        return mProgram->loadBinaryShaderExecutables(mContext, &stream, mInfoLog);
>+    }
> 
>-                if (samplerIndex < mSamplersCS.size())
>-                {
>-                    ASSERT(mSamplersCS[samplerIndex].active);
>-                    mSamplersCS[samplerIndex].logicalTextureUnit = d3dUniform->mSamplerData[i];
>-                }
>-            }
>+  private:
>+    const gl::Context *mContext;
>+    ProgramD3D *mProgram;
>+    gl::InfoLog &mInfoLog;
>+
>+    bool mDataCopySucceeded;
>+    angle::MemoryBuffer mStreamData;
>+};
>+
>+class ProgramD3D::LoadBinaryLinkEvent final : public LinkEvent
>+{
>+  public:
>+    LoadBinaryLinkEvent(std::shared_ptr<WorkerThreadPool> workerPool,
>+                        const gl::Context *context,
>+                        ProgramD3D *program,
>+                        gl::BinaryInputStream *stream,
>+                        gl::InfoLog &infoLog)
>+        : mTask(std::make_shared<ProgramD3D::LoadBinaryTask>(context, program, stream, infoLog)),
>+          mWaitableEvent(angle::WorkerThreadPool::PostWorkerTask(workerPool, mTask))
>+    {}
>+
>+    angle::Result wait(const gl::Context *context) override
>+    {
>+        mWaitableEvent->wait();
>+
>+        // Continue and Incomplete are not errors. For Stop, pass the error to the ContextD3D.
>+        if (mTask->getResult() != angle::Result::Stop)
>+        {
>+            return angle::Result::Continue;
>         }
>+
>+        ContextD3D *contextD3D = GetImplAs<ContextD3D>(context);
>+        mTask->popError(contextD3D);
>+        return angle::Result::Stop;
>     }
> 
>-    return SamplerMapping::WasDirty;
>-}
>+    bool isLinking() override { return !mWaitableEvent->isReady(); }
>+
>+  private:
>+    std::shared_ptr<ProgramD3D::LoadBinaryTask> mTask;
>+    std::shared_ptr<WaitableEvent> mWaitableEvent;
>+};
> 
>-gl::LinkResult ProgramD3D::load(const gl::Context *context,
>-                                gl::InfoLog &infoLog,
>-                                gl::BinaryInputStream *stream)
>+std::unique_ptr<rx::LinkEvent> ProgramD3D::load(const gl::Context *context,
>+                                                gl::BinaryInputStream *stream,
>+                                                gl::InfoLog &infoLog)
> {
>+
>     // TODO(jmadill): Use Renderer from contextImpl.
> 
>     reset();
>@@ -819,14 +997,14 @@ gl::LinkResult ProgramD3D::load(const gl::Context *context,
>     if (memcmp(&identifier, &binaryDeviceIdentifier, sizeof(DeviceIdentifier)) != 0)
>     {
>         infoLog << "Invalid program binary, device configuration has changed.";
>-        return false;
>+        return std::make_unique<LinkEventDone>(angle::Result::Incomplete);
>     }
> 
>     int compileFlags = stream->readInt<int>();
>     if (compileFlags != ANGLE_COMPILE_OPTIMIZATION_LEVEL)
>     {
>         infoLog << "Mismatched compilation flags.";
>-        return false;
>+        return std::make_unique<LinkEventDone>(angle::Result::Incomplete);
>     }
> 
>     for (int &index : mAttribLocationToD3DSemantic)
>@@ -834,44 +1012,86 @@ gl::LinkResult ProgramD3D::load(const gl::Context *context,
>         stream->readInt(&index);
>     }
> 
>-    const unsigned int psSamplerCount = stream->readInt<unsigned int>();
>-    for (unsigned int i = 0; i < psSamplerCount; ++i)
>+    for (gl::ShaderType shaderType : gl::AllShaderTypes())
>+    {
>+        const unsigned int samplerCount = stream->readInt<unsigned int>();
>+        for (unsigned int i = 0; i < samplerCount; ++i)
>+        {
>+            Sampler sampler;
>+            stream->readBool(&sampler.active);
>+            stream->readInt(&sampler.logicalTextureUnit);
>+            stream->readEnum(&sampler.textureType);
>+            mShaderSamplers[shaderType].push_back(sampler);
>+        }
>+
>+        unsigned int samplerRangeLow, samplerRangeHigh;
>+        stream->readInt(&samplerRangeLow);
>+        stream->readInt(&samplerRangeHigh);
>+        mUsedShaderSamplerRanges[shaderType] = gl::RangeUI(samplerRangeLow, samplerRangeHigh);
>+    }
>+
>+    const unsigned int csImageCount = stream->readInt<unsigned int>();
>+    for (unsigned int i = 0; i < csImageCount; ++i)
>+    {
>+        Image image;
>+        stream->readBool(&image.active);
>+        stream->readInt(&image.logicalImageUnit);
>+        mImagesCS.push_back(image);
>+    }
>+
>+    const unsigned int csReadonlyImageCount = stream->readInt<unsigned int>();
>+    for (unsigned int i = 0; i < csReadonlyImageCount; ++i)
>     {
>-        Sampler sampler;
>-        stream->readBool(&sampler.active);
>-        stream->readInt(&sampler.logicalTextureUnit);
>-        stream->readInt(&sampler.textureType);
>-        mSamplersPS.push_back(sampler);
>+        Image image;
>+        stream->readBool(&image.active);
>+        stream->readInt(&image.logicalImageUnit);
>+        mReadonlyImagesCS.push_back(image);
>     }
>-    const unsigned int vsSamplerCount = stream->readInt<unsigned int>();
>-    for (unsigned int i = 0; i < vsSamplerCount; ++i)
>+
>+    unsigned int computeImageRangeLow, computeImageRangeHigh, computeReadonlyImageRangeLow,
>+        computeReadonlyImageRangeHigh;
>+    stream->readInt(&computeImageRangeLow);
>+    stream->readInt(&computeImageRangeHigh);
>+    stream->readInt(&computeReadonlyImageRangeLow);
>+    stream->readInt(&computeReadonlyImageRangeHigh);
>+    mUsedComputeImageRange = gl::RangeUI(computeImageRangeLow, computeImageRangeHigh);
>+    mUsedComputeReadonlyImageRange =
>+        gl::RangeUI(computeReadonlyImageRangeLow, computeReadonlyImageRangeHigh);
>+
>+    unsigned int atomicCounterRangeLow, atomicCounterRangeHigh;
>+    stream->readInt(&atomicCounterRangeLow);
>+    stream->readInt(&atomicCounterRangeHigh);
>+    mUsedComputeAtomicCounterRange = gl::RangeUI(atomicCounterRangeLow, atomicCounterRangeHigh);
>+
>+    const unsigned int shaderStorageBlockCount = stream->readInt<unsigned int>();
>+    if (stream->error())
>     {
>-        Sampler sampler;
>-        stream->readBool(&sampler.active);
>-        stream->readInt(&sampler.logicalTextureUnit);
>-        stream->readInt(&sampler.textureType);
>-        mSamplersVS.push_back(sampler);
>+        infoLog << "Invalid program binary.";
>+        return std::make_unique<LinkEventDone>(angle::Result::Incomplete);
>     }
> 
>-    const unsigned int csSamplerCount = stream->readInt<unsigned int>();
>-    for (unsigned int i = 0; i < csSamplerCount; ++i)
>+    ASSERT(mD3DShaderStorageBlocks.empty());
>+    for (unsigned int blockIndex = 0; blockIndex < shaderStorageBlockCount; ++blockIndex)
>     {
>-        Sampler sampler;
>-        stream->readBool(&sampler.active);
>-        stream->readInt(&sampler.logicalTextureUnit);
>-        stream->readInt(&sampler.textureType);
>-        mSamplersCS.push_back(sampler);
>+        D3DInterfaceBlock shaderStorageBlock;
>+        for (gl::ShaderType shaderType : gl::AllShaderTypes())
>+        {
>+            stream->readInt(&shaderStorageBlock.mShaderRegisterIndexes[shaderType]);
>+        }
>+        mD3DShaderStorageBlocks.push_back(shaderStorageBlock);
>     }
> 
>-    stream->readInt(&mUsedVertexSamplerRange);
>-    stream->readInt(&mUsedPixelSamplerRange);
>-    stream->readInt(&mUsedComputeSamplerRange);
>+    for (unsigned int ii = 0; ii < gl::IMPLEMENTATION_MAX_ATOMIC_COUNTER_BUFFERS; ++ii)
>+    {
>+        unsigned int index                             = stream->readInt<unsigned int>();
>+        mComputeAtomicCounterBufferRegisterIndices[ii] = index;
>+    }
> 
>     const unsigned int uniformCount = stream->readInt<unsigned int>();
>     if (stream->error())
>     {
>         infoLog << "Invalid program binary.";
>-        return false;
>+        return std::make_unique<LinkEventDone>(angle::Result::Incomplete);
>     }
> 
>     const auto &linkedUniforms = mState.getUniforms();
>@@ -881,11 +1101,13 @@ gl::LinkResult ProgramD3D::load(const gl::Context *context,
>         const gl::LinkedUniform &linkedUniform = linkedUniforms[uniformIndex];
> 
>         D3DUniform *d3dUniform =
>-            new D3DUniform(linkedUniform.type, linkedUniform.name, linkedUniform.arraySizes,
>-                           linkedUniform.isInDefaultBlock());
>-        stream->readInt(&d3dUniform->psRegisterIndex);
>-        stream->readInt(&d3dUniform->vsRegisterIndex);
>-        stream->readInt(&d3dUniform->csRegisterIndex);
>+            new D3DUniform(linkedUniform.type, HLSLRegisterType::None, linkedUniform.name,
>+                           linkedUniform.arraySizes, linkedUniform.isInDefaultBlock());
>+        stream->readInt<HLSLRegisterType>(&d3dUniform->regType);
>+        for (gl::ShaderType shaderType : gl::AllShaderTypes())
>+        {
>+            stream->readInt(&d3dUniform->mShaderRegisterIndexes[shaderType]);
>+        }
>         stream->readInt(&d3dUniform->registerCount);
>         stream->readInt(&d3dUniform->registerElement);
> 
>@@ -896,16 +1118,17 @@ gl::LinkResult ProgramD3D::load(const gl::Context *context,
>     if (stream->error())
>     {
>         infoLog << "Invalid program binary.";
>-        return false;
>+        return std::make_unique<LinkEventDone>(angle::Result::Incomplete);
>     }
> 
>     ASSERT(mD3DUniformBlocks.empty());
>     for (unsigned int blockIndex = 0; blockIndex < blockCount; ++blockIndex)
>     {
>-        D3DUniformBlock uniformBlock;
>-        stream->readInt(&uniformBlock.psRegisterIndex);
>-        stream->readInt(&uniformBlock.vsRegisterIndex);
>-        stream->readInt(&uniformBlock.csRegisterIndex);
>+        D3DInterfaceBlock uniformBlock;
>+        for (gl::ShaderType shaderType : gl::AllShaderTypes())
>+        {
>+            stream->readInt(&uniformBlock.mShaderRegisterIndexes[shaderType]);
>+        }
>         mD3DUniformBlocks.push_back(uniformBlock);
>     }
> 
>@@ -921,14 +1144,16 @@ gl::LinkResult ProgramD3D::load(const gl::Context *context,
>         stream->readInt(&varying->outputSlot);
>     }
> 
>-    stream->readString(&mVertexHLSL);
>-    stream->readBytes(reinterpret_cast<unsigned char *>(&mVertexWorkarounds),
>-                      sizeof(angle::CompilerWorkaroundsD3D));
>-    stream->readString(&mPixelHLSL);
>-    stream->readBytes(reinterpret_cast<unsigned char *>(&mPixelWorkarounds),
>-                      sizeof(angle::CompilerWorkaroundsD3D));
>+    for (gl::ShaderType shaderType : gl::AllShaderTypes())
>+    {
>+        stream->readString(&mShaderHLSL[shaderType]);
>+        stream->readBytes(reinterpret_cast<unsigned char *>(&mShaderWorkarounds[shaderType]),
>+                          sizeof(angle::CompilerWorkaroundsD3D));
>+    }
>+
>     stream->readBool(&mUsesFragDepth);
>     stream->readBool(&mHasANGLEMultiviewEnabled);
>+    stream->readBool(&mUsesVertexID);
>     stream->readBool(&mUsesViewID);
>     stream->readBool(&mUsesPointSize);
>     stream->readBool(&mUsesFlatInterpolation);
>@@ -946,20 +1171,30 @@ gl::LinkResult ProgramD3D::load(const gl::Context *context,
> 
>     stream->readString(&mGeometryShaderPreamble);
> 
>-    const unsigned char *binary = reinterpret_cast<const unsigned char *>(stream->data());
>+    return std::make_unique<LoadBinaryLinkEvent>(context->getWorkerThreadPool(), context, this,
>+                                                 stream, infoLog);
>+}
>+
>+angle::Result ProgramD3D::loadBinaryShaderExecutables(const gl::Context *context,
>+                                                      gl::BinaryInputStream *stream,
>+                                                      gl::InfoLog &infoLog)
>+{
>+    const unsigned char *binary = reinterpret_cast<const unsigned char *>(stream->data());
> 
>     bool separateAttribs = (mState.getTransformFeedbackBufferMode() == GL_SEPARATE_ATTRIBS);
> 
>+    d3d::Context *contextD3D = GetImplAs<ContextD3D>(context);
>+
>     const unsigned int vertexShaderCount = stream->readInt<unsigned int>();
>     for (unsigned int vertexShaderIndex = 0; vertexShaderIndex < vertexShaderCount;
>          vertexShaderIndex++)
>     {
>         size_t inputLayoutSize = stream->readInt<size_t>();
>-        gl::InputLayout inputLayout(inputLayoutSize, gl::VERTEX_FORMAT_INVALID);
>+        gl::InputLayout inputLayout(inputLayoutSize, angle::FormatID::NONE);
> 
>         for (size_t inputIndex = 0; inputIndex < inputLayoutSize; inputIndex++)
>         {
>-            inputLayout[inputIndex] = stream->readInt<gl::VertexFormatType>();
>+            inputLayout[inputIndex] = stream->readInt<angle::FormatID>();
>         }
> 
>         unsigned int vertexShaderSize             = stream->readInt<unsigned int>();
>@@ -967,14 +1202,14 @@ gl::LinkResult ProgramD3D::load(const gl::Context *context,
> 
>         ShaderExecutableD3D *shaderExecutable = nullptr;
> 
>-        ANGLE_TRY(mRenderer->loadExecutable(vertexShaderFunction, vertexShaderSize,
>-                                            gl::SHADER_VERTEX, mStreamOutVaryings, separateAttribs,
>-                                            &shaderExecutable));
>+        ANGLE_TRY(mRenderer->loadExecutable(contextD3D, vertexShaderFunction, vertexShaderSize,
>+                                            gl::ShaderType::Vertex, mStreamOutVaryings,
>+                                            separateAttribs, &shaderExecutable));
> 
>         if (!shaderExecutable)
>         {
>             infoLog << "Could not create vertex shader.";
>-            return false;
>+            return angle::Result::Incomplete;
>         }
> 
>         // generated converted input layout
>@@ -1002,14 +1237,14 @@ gl::LinkResult ProgramD3D::load(const gl::Context *context,
>         const unsigned char *pixelShaderFunction = binary + stream->offset();
>         ShaderExecutableD3D *shaderExecutable    = nullptr;
> 
>-        ANGLE_TRY(mRenderer->loadExecutable(pixelShaderFunction, pixelShaderSize,
>-                                            gl::SHADER_FRAGMENT, mStreamOutVaryings,
>+        ANGLE_TRY(mRenderer->loadExecutable(contextD3D, pixelShaderFunction, pixelShaderSize,
>+                                            gl::ShaderType::Fragment, mStreamOutVaryings,
>                                             separateAttribs, &shaderExecutable));
> 
>         if (!shaderExecutable)
>         {
>             infoLog << "Could not create pixel shader.";
>-            return false;
>+            return angle::Result::Incomplete;
>         }
> 
>         // add new binary
>@@ -1019,8 +1254,7 @@ gl::LinkResult ProgramD3D::load(const gl::Context *context,
>         stream->skip(pixelShaderSize);
>     }
> 
>-    for (unsigned int geometryExeIndex = 0; geometryExeIndex < gl::PRIMITIVE_TYPE_MAX;
>-         ++geometryExeIndex)
>+    for (auto &geometryExe : mGeometryExecutables)
>     {
>         unsigned int geometryShaderSize = stream->readInt<unsigned int>();
>         if (geometryShaderSize == 0)
>@@ -1031,43 +1265,69 @@ gl::LinkResult ProgramD3D::load(const gl::Context *context,
>         const unsigned char *geometryShaderFunction = binary + stream->offset();
> 
>         ShaderExecutableD3D *geometryExecutable = nullptr;
>-        ANGLE_TRY(mRenderer->loadExecutable(geometryShaderFunction, geometryShaderSize,
>-                                            gl::SHADER_GEOMETRY, mStreamOutVaryings,
>+        ANGLE_TRY(mRenderer->loadExecutable(contextD3D, geometryShaderFunction, geometryShaderSize,
>+                                            gl::ShaderType::Geometry, mStreamOutVaryings,
>                                             separateAttribs, &geometryExecutable));
> 
>         if (!geometryExecutable)
>         {
>             infoLog << "Could not create geometry shader.";
>-            return false;
>+            return angle::Result::Incomplete;
>         }
> 
>-        mGeometryExecutables[geometryExeIndex].reset(geometryExecutable);
>+        geometryExe.reset(geometryExecutable);
> 
>         stream->skip(geometryShaderSize);
>     }
> 
>-    unsigned int computeShaderSize = stream->readInt<unsigned int>();
>-    if (computeShaderSize > 0)
>+    const size_t computeShaderCount = stream->readInt<unsigned int>();
>+    for (size_t computeShaderIndex = 0; computeShaderIndex < computeShaderCount;
>+         computeShaderIndex++)
>     {
>+        const size_t signatureCount = stream->readInt<unsigned int>();
>+        gl::ImageUnitTextureTypeMap signatures;
>+        for (size_t signatureIndex = 0; signatureIndex < signatureCount; signatureIndex++)
>+        {
>+            unsigned int imageUint;
>+            gl::TextureType textureType;
>+            stream->readInt<unsigned int>(&imageUint);
>+            stream->readInt<gl::TextureType>(&textureType);
>+            signatures.insert(std::pair<unsigned int, gl::TextureType>(imageUint, textureType));
>+        }
>+
>+        const size_t computeShaderSize             = stream->readInt<unsigned int>();
>         const unsigned char *computeShaderFunction = binary + stream->offset();
> 
>         ShaderExecutableD3D *computeExecutable = nullptr;
>-        ANGLE_TRY(mRenderer->loadExecutable(computeShaderFunction, computeShaderSize,
>-                                            gl::SHADER_COMPUTE, std::vector<D3DVarying>(), false,
>-                                            &computeExecutable));
>+        ANGLE_TRY(mRenderer->loadExecutable(contextD3D, computeShaderFunction, computeShaderSize,
>+                                            gl::ShaderType::Compute, std::vector<D3DVarying>(),
>+                                            false, &computeExecutable));
> 
>         if (!computeExecutable)
>         {
>             infoLog << "Could not create compute shader.";
>-            return false;
>+            return angle::Result::Incomplete;
>         }
> 
>-        mComputeExecutable.reset(computeExecutable);
>+        // add new binary
>+        mComputeExecutables.push_back(std::unique_ptr<ComputeExecutable>(new ComputeExecutable(
>+            signatures, std::unique_ptr<ShaderExecutableD3D>(computeExecutable))));
>+
>+        stream->skip(computeShaderSize);
>+    }
>+
>+    const size_t bindLayoutCount = stream->readInt<unsigned int>();
>+    for (size_t bindLayoutIndex = 0; bindLayoutIndex < bindLayoutCount; bindLayoutIndex++)
>+    {
>+        mComputeShaderImage2DBindLayoutCache.insert(std::pair<unsigned int, gl::TextureType>(
>+            stream->readInt<unsigned int>(), gl::TextureType::_2D));
>     }
> 
>-    initializeUniformStorage();
>+    initializeUniformStorage(mState.getLinkedShaderStages());
> 
>-    return true;
>+    dirtyAllUniforms();
>+
>+    return angle::Result::Continue;
> }
> 
> void ProgramD3D::save(const gl::Context *context, gl::BinaryOutputStream *stream)
>@@ -1086,51 +1346,75 @@ void ProgramD3D::save(const gl::Context *context, gl::BinaryOutputStream *stream
>         stream->writeInt(d3dSemantic);
>     }
> 
>-    stream->writeInt(mSamplersPS.size());
>-    for (unsigned int i = 0; i < mSamplersPS.size(); ++i)
>+    for (gl::ShaderType shaderType : gl::AllShaderTypes())
>+    {
>+        stream->writeInt(mShaderSamplers[shaderType].size());
>+        for (unsigned int i = 0; i < mShaderSamplers[shaderType].size(); ++i)
>+        {
>+            stream->writeInt(mShaderSamplers[shaderType][i].active);
>+            stream->writeInt(mShaderSamplers[shaderType][i].logicalTextureUnit);
>+            stream->writeEnum(mShaderSamplers[shaderType][i].textureType);
>+        }
>+
>+        stream->writeInt(mUsedShaderSamplerRanges[shaderType].low());
>+        stream->writeInt(mUsedShaderSamplerRanges[shaderType].high());
>+    }
>+
>+    stream->writeInt(mImagesCS.size());
>+    for (unsigned int i = 0; i < mImagesCS.size(); ++i)
>     {
>-        stream->writeInt(mSamplersPS[i].active);
>-        stream->writeInt(mSamplersPS[i].logicalTextureUnit);
>-        stream->writeInt(mSamplersPS[i].textureType);
>+        stream->writeInt(mImagesCS[i].active);
>+        stream->writeInt(mImagesCS[i].logicalImageUnit);
>     }
> 
>-    stream->writeInt(mSamplersVS.size());
>-    for (unsigned int i = 0; i < mSamplersVS.size(); ++i)
>+    stream->writeInt(mReadonlyImagesCS.size());
>+    for (unsigned int i = 0; i < mReadonlyImagesCS.size(); ++i)
>     {
>-        stream->writeInt(mSamplersVS[i].active);
>-        stream->writeInt(mSamplersVS[i].logicalTextureUnit);
>-        stream->writeInt(mSamplersVS[i].textureType);
>+        stream->writeInt(mReadonlyImagesCS[i].active);
>+        stream->writeInt(mReadonlyImagesCS[i].logicalImageUnit);
>     }
> 
>-    stream->writeInt(mSamplersCS.size());
>-    for (unsigned int i = 0; i < mSamplersCS.size(); ++i)
>+    stream->writeInt(mUsedComputeImageRange.low());
>+    stream->writeInt(mUsedComputeImageRange.high());
>+    stream->writeInt(mUsedComputeReadonlyImageRange.low());
>+    stream->writeInt(mUsedComputeReadonlyImageRange.high());
>+    stream->writeInt(mUsedComputeAtomicCounterRange.low());
>+    stream->writeInt(mUsedComputeAtomicCounterRange.high());
>+
>+    stream->writeInt(mD3DShaderStorageBlocks.size());
>+    for (const D3DInterfaceBlock &shaderStorageBlock : mD3DShaderStorageBlocks)
>     {
>-        stream->writeInt(mSamplersCS[i].active);
>-        stream->writeInt(mSamplersCS[i].logicalTextureUnit);
>-        stream->writeInt(mSamplersCS[i].textureType);
>+        for (gl::ShaderType shaderType : gl::AllShaderTypes())
>+        {
>+            stream->writeIntOrNegOne(shaderStorageBlock.mShaderRegisterIndexes[shaderType]);
>+        }
>     }
> 
>-    stream->writeInt(mUsedVertexSamplerRange);
>-    stream->writeInt(mUsedPixelSamplerRange);
>-    stream->writeInt(mUsedComputeSamplerRange);
>+    for (unsigned int ii = 0; ii < gl::IMPLEMENTATION_MAX_ATOMIC_COUNTER_BUFFERS; ++ii)
>+    {
>+        stream->writeInt(mComputeAtomicCounterBufferRegisterIndices[ii]);
>+    }
> 
>     stream->writeInt(mD3DUniforms.size());
>     for (const D3DUniform *uniform : mD3DUniforms)
>     {
>         // Type, name and arraySize are redundant, so aren't stored in the binary.
>-        stream->writeIntOrNegOne(uniform->psRegisterIndex);
>-        stream->writeIntOrNegOne(uniform->vsRegisterIndex);
>-        stream->writeIntOrNegOne(uniform->csRegisterIndex);
>+        stream->writeInt(static_cast<unsigned int>(uniform->regType));
>+        for (gl::ShaderType shaderType : gl::AllShaderTypes())
>+        {
>+            stream->writeIntOrNegOne(uniform->mShaderRegisterIndexes[shaderType]);
>+        }
>         stream->writeInt(uniform->registerCount);
>         stream->writeInt(uniform->registerElement);
>     }
> 
>     stream->writeInt(mD3DUniformBlocks.size());
>-    for (const D3DUniformBlock &uniformBlock : mD3DUniformBlocks)
>+    for (const D3DInterfaceBlock &uniformBlock : mD3DUniformBlocks)
>     {
>-        stream->writeIntOrNegOne(uniformBlock.psRegisterIndex);
>-        stream->writeIntOrNegOne(uniformBlock.vsRegisterIndex);
>-        stream->writeIntOrNegOne(uniformBlock.csRegisterIndex);
>+        for (gl::ShaderType shaderType : gl::AllShaderTypes())
>+        {
>+            stream->writeIntOrNegOne(uniformBlock.mShaderRegisterIndexes[shaderType]);
>+        }
>     }
> 
>     stream->writeInt(mStreamOutVaryings.size());
>@@ -1142,14 +1426,16 @@ void ProgramD3D::save(const gl::Context *context, gl::BinaryOutputStream *stream
>         stream->writeInt(varying.outputSlot);
>     }
> 
>-    stream->writeString(mVertexHLSL);
>-    stream->writeBytes(reinterpret_cast<unsigned char *>(&mVertexWorkarounds),
>-                       sizeof(angle::CompilerWorkaroundsD3D));
>-    stream->writeString(mPixelHLSL);
>-    stream->writeBytes(reinterpret_cast<unsigned char *>(&mPixelWorkarounds),
>-                       sizeof(angle::CompilerWorkaroundsD3D));
>+    for (gl::ShaderType shaderType : gl::AllShaderTypes())
>+    {
>+        stream->writeString(mShaderHLSL[shaderType]);
>+        stream->writeBytes(reinterpret_cast<unsigned char *>(&mShaderWorkarounds[shaderType]),
>+                           sizeof(angle::CompilerWorkaroundsD3D));
>+    }
>+
>     stream->writeInt(mUsesFragDepth);
>     stream->writeInt(mHasANGLEMultiviewEnabled);
>+    stream->writeInt(mUsesVertexID);
>     stream->writeInt(mUsesViewID);
>     stream->writeInt(mUsesPointSize);
>     stream->writeInt(mUsesFlatInterpolation);
>@@ -1222,37 +1508,52 @@ void ProgramD3D::save(const gl::Context *context, gl::BinaryOutputStream *stream
>         stream->writeBytes(geometryExecutable->getFunction(), geometryShaderSize);
>     }
> 
>-    if (mComputeExecutable)
>+    stream->writeInt(mComputeExecutables.size());
>+    for (size_t computeExecutableIndex = 0; computeExecutableIndex < mComputeExecutables.size();
>+         computeExecutableIndex++)
>     {
>-        size_t computeShaderSize = mComputeExecutable->getLength();
>+        ComputeExecutable *computeExecutable = mComputeExecutables[computeExecutableIndex].get();
>+
>+        const gl::ImageUnitTextureTypeMap signatures = computeExecutable->signature();
>+        stream->writeInt(signatures.size());
>+        for (const auto &signature : signatures)
>+        {
>+            stream->writeInt(signature.first);
>+            stream->writeInt(static_cast<unsigned int>(signature.second));
>+        }
>+
>+        size_t computeShaderSize = computeExecutable->shaderExecutable()->getLength();
>         stream->writeInt(computeShaderSize);
>-        stream->writeBytes(mComputeExecutable->getFunction(), computeShaderSize);
>+
>+        const uint8_t *computeBlob = computeExecutable->shaderExecutable()->getFunction();
>+        stream->writeBytes(computeBlob, computeShaderSize);
>     }
>-    else
>+
>+    stream->writeInt(mComputeShaderImage2DBindLayoutCache.size());
>+    for (auto &image2DBindLayout : mComputeShaderImage2DBindLayoutCache)
>     {
>-        stream->writeInt(0);
>+        stream->writeInt(image2DBindLayout.first);
>     }
> }
> 
>-void ProgramD3D::setBinaryRetrievableHint(bool /* retrievable */)
>-{
>-}
>+void ProgramD3D::setBinaryRetrievableHint(bool /* retrievable */) {}
> 
>-void ProgramD3D::setSeparable(bool /* separable */)
>-{
>-}
>+void ProgramD3D::setSeparable(bool /* separable */) {}
> 
>-gl::Error ProgramD3D::getPixelExecutableForCachedOutputLayout(ShaderExecutableD3D **outExecutable,
>-                                                              gl::InfoLog *infoLog)
>+angle::Result ProgramD3D::getPixelExecutableForCachedOutputLayout(
>+    d3d::Context *context,
>+    ShaderExecutableD3D **outExecutable,
>+    gl::InfoLog *infoLog)
> {
>     if (mCachedPixelExecutableIndex.valid())
>     {
>         *outExecutable = mPixelExecutables[mCachedPixelExecutableIndex.value()]->shaderExecutable();
>-        return gl::NoError();
>+        return angle::Result::Continue;
>     }
> 
>     std::string finalPixelHLSL = mDynamicHLSL->generatePixelShaderForOutputSignature(
>-        mPixelHLSL, mPixelShaderKey, mUsesFragDepth, mPixelShaderOutputLayoutCache);
>+        mShaderHLSL[gl::ShaderType::Fragment], mPixelShaderKey, mUsesFragDepth,
>+        mPixelShaderOutputLayoutCache);
> 
>     // Generate new pixel executable
>     ShaderExecutableD3D *pixelExecutable = nullptr;
>@@ -1261,9 +1562,9 @@ gl::Error ProgramD3D::getPixelExecutableForCachedOutputLayout(ShaderExecutableD3
>     gl::InfoLog *currentInfoLog = infoLog ? infoLog : &tempInfoLog;
> 
>     ANGLE_TRY(mRenderer->compileToExecutable(
>-        *currentInfoLog, finalPixelHLSL, gl::SHADER_FRAGMENT, mStreamOutVaryings,
>-        (mState.getTransformFeedbackBufferMode() == GL_SEPARATE_ATTRIBS), mPixelWorkarounds,
>-        &pixelExecutable));
>+        context, *currentInfoLog, finalPixelHLSL, gl::ShaderType::Fragment, mStreamOutVaryings,
>+        (mState.getTransformFeedbackBufferMode() == GL_SEPARATE_ATTRIBS),
>+        mShaderWorkarounds[gl::ShaderType::Fragment], &pixelExecutable));
> 
>     if (pixelExecutable)
>     {
>@@ -1278,22 +1579,24 @@ gl::Error ProgramD3D::getPixelExecutableForCachedOutputLayout(ShaderExecutableD3
>     }
> 
>     *outExecutable = pixelExecutable;
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error ProgramD3D::getVertexExecutableForCachedInputLayout(ShaderExecutableD3D **outExectuable,
>-                                                              gl::InfoLog *infoLog)
>+angle::Result ProgramD3D::getVertexExecutableForCachedInputLayout(
>+    d3d::Context *context,
>+    ShaderExecutableD3D **outExectuable,
>+    gl::InfoLog *infoLog)
> {
>     if (mCachedVertexExecutableIndex.valid())
>     {
>         *outExectuable =
>             mVertexExecutables[mCachedVertexExecutableIndex.value()]->shaderExecutable();
>-        return gl::NoError();
>+        return angle::Result::Continue;
>     }
> 
>     // Generate new dynamic layout with attribute conversions
>     std::string finalVertexHLSL = mDynamicHLSL->generateVertexShaderForInputLayout(
>-        mVertexHLSL, mCachedInputLayout, mState.getAttributes());
>+        mShaderHLSL[gl::ShaderType::Vertex], mCachedInputLayout, mState.getAttributes());
> 
>     // Generate new vertex executable
>     ShaderExecutableD3D *vertexExecutable = nullptr;
>@@ -1302,9 +1605,9 @@ gl::Error ProgramD3D::getVertexExecutableForCachedInputLayout(ShaderExecutableD3
>     gl::InfoLog *currentInfoLog = infoLog ? infoLog : &tempInfoLog;
> 
>     ANGLE_TRY(mRenderer->compileToExecutable(
>-        *currentInfoLog, finalVertexHLSL, gl::SHADER_VERTEX, mStreamOutVaryings,
>-        (mState.getTransformFeedbackBufferMode() == GL_SEPARATE_ATTRIBS), mVertexWorkarounds,
>-        &vertexExecutable));
>+        context, *currentInfoLog, finalVertexHLSL, gl::ShaderType::Vertex, mStreamOutVaryings,
>+        (mState.getTransformFeedbackBufferMode() == GL_SEPARATE_ATTRIBS),
>+        mShaderWorkarounds[gl::ShaderType::Vertex], &vertexExecutable));
> 
>     if (vertexExecutable)
>     {
>@@ -1319,13 +1622,14 @@ gl::Error ProgramD3D::getVertexExecutableForCachedInputLayout(ShaderExecutableD3
>     }
> 
>     *outExectuable = vertexExecutable;
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error ProgramD3D::getGeometryExecutableForPrimitiveType(const gl::Context *context,
>-                                                            GLenum drawMode,
>-                                                            ShaderExecutableD3D **outExecutable,
>-                                                            gl::InfoLog *infoLog)
>+angle::Result ProgramD3D::getGeometryExecutableForPrimitiveType(d3d::Context *context,
>+                                                                const gl::State &state,
>+                                                                gl::PrimitiveMode drawMode,
>+                                                                ShaderExecutableD3D **outExecutable,
>+                                                                gl::InfoLog *infoLog)
> {
>     if (outExecutable)
>     {
>@@ -1333,12 +1637,12 @@ gl::Error ProgramD3D::getGeometryExecutableForPrimitiveType(const gl::Context *c
>     }
> 
>     // Return a null shader if the current rendering doesn't use a geometry shader
>-    if (!usesGeometryShader(drawMode))
>+    if (!usesGeometryShader(state, drawMode))
>     {
>-        return gl::NoError();
>+        return angle::Result::Continue;
>     }
> 
>-    gl::PrimitiveType geometryShaderType = GetGeometryShaderTypeFromDrawMode(drawMode);
>+    gl::PrimitiveMode geometryShaderType = GetGeometryShaderTypeFromDrawMode(drawMode);
> 
>     if (mGeometryExecutables[geometryShaderType])
>     {
>@@ -1346,11 +1650,11 @@ gl::Error ProgramD3D::getGeometryExecutableForPrimitiveType(const gl::Context *c
>         {
>             *outExecutable = mGeometryExecutables[geometryShaderType].get();
>         }
>-        return gl::NoError();
>+        return angle::Result::Continue;
>     }
>-
>+    const gl::Caps &caps     = state.getCaps();
>     std::string geometryHLSL = mDynamicHLSL->generateGeometryShaderHLSL(
>-        context, geometryShaderType, mState, mRenderer->presentPathFastEnabled(),
>+        caps, geometryShaderType, mState, mRenderer->presentPathFastEnabled(),
>         mHasANGLEMultiviewEnabled, mRenderer->canSelectViewInVertexShader(),
>         usesGeometryShaderForPointSpriteEmulation(), mGeometryShaderPreamble);
> 
>@@ -1358,12 +1662,12 @@ gl::Error ProgramD3D::getGeometryExecutableForPrimitiveType(const gl::Context *c
>     gl::InfoLog *currentInfoLog = infoLog ? infoLog : &tempInfoLog;
> 
>     ShaderExecutableD3D *geometryExecutable = nullptr;
>-    gl::Error error                         = mRenderer->compileToExecutable(
>-        *currentInfoLog, geometryHLSL, gl::SHADER_GEOMETRY, mStreamOutVaryings,
>+    angle::Result result                    = mRenderer->compileToExecutable(
>+        context, *currentInfoLog, geometryHLSL, gl::ShaderType::Geometry, mStreamOutVaryings,
>         (mState.getTransformFeedbackBufferMode() == GL_SEPARATE_ATTRIBS),
>         angle::CompilerWorkaroundsD3D(), &geometryExecutable);
> 
>-    if (!infoLog && error.isError())
>+    if (!infoLog && result == angle::Result::Stop)
>     {
>         ERR() << "Error compiling dynamic geometry executable:" << std::endl
>               << tempInfoLog.str() << std::endl;
>@@ -1378,55 +1682,27 @@ gl::Error ProgramD3D::getGeometryExecutableForPrimitiveType(const gl::Context *c
>     {
>         *outExecutable = mGeometryExecutables[geometryShaderType].get();
>     }
>-    return error;
>+    return result;
> }
> 
>-class ProgramD3D::GetExecutableTask : public Closure
>-{
>-  public:
>-    GetExecutableTask(ProgramD3D *program)
>-        : mProgram(program), mError(gl::NoError()), mInfoLog(), mResult(nullptr)
>-    {
>-    }
>-
>-    virtual gl::Error run() = 0;
>-
>-    void operator()() override { mError = run(); }
>-
>-    const gl::Error &getError() const { return mError; }
>-    const gl::InfoLog &getInfoLog() const { return mInfoLog; }
>-    ShaderExecutableD3D *getResult() { return mResult; }
>-
>-  protected:
>-    ProgramD3D *mProgram;
>-    gl::Error mError;
>-    gl::InfoLog mInfoLog;
>-    ShaderExecutableD3D *mResult;
>-};
>-
> class ProgramD3D::GetVertexExecutableTask : public ProgramD3D::GetExecutableTask
> {
>   public:
>-    GetVertexExecutableTask(ProgramD3D *program, const gl::Context *context)
>-        : GetExecutableTask(program), mContext(context)
>+    GetVertexExecutableTask(ProgramD3D *program) : GetExecutableTask(program) {}
>+    angle::Result run() override
>     {
>-    }
>-    gl::Error run() override
>-    {
>-        mProgram->updateCachedInputLayoutFromShader(mContext);
>+        mProgram->updateCachedInputLayoutFromShader();
> 
>-        ANGLE_TRY(mProgram->getVertexExecutableForCachedInputLayout(&mResult, &mInfoLog));
>+        ANGLE_TRY(mProgram->getVertexExecutableForCachedInputLayout(this, &mExecutable, &mInfoLog));
> 
>-        return gl::NoError();
>+        return angle::Result::Continue;
>     }
>-
>-  private:
>-    const gl::Context *mContext;
> };
> 
>-void ProgramD3D::updateCachedInputLayoutFromShader(const gl::Context *context)
>+void ProgramD3D::updateCachedInputLayoutFromShader()
> {
>-    GetDefaultInputLayoutFromShader(context, mState.getAttachedVertexShader(), &mCachedInputLayout);
>+    GetDefaultInputLayoutFromShader(mState.getAttachedShader(gl::ShaderType::Vertex),
>+                                    &mCachedInputLayout);
>     VertexExecutable::getSignature(mRenderer, mCachedInputLayout, &mCachedVertexSignature);
>     updateCachedVertexExecutableIndex();
> }
>@@ -1435,13 +1711,13 @@ class ProgramD3D::GetPixelExecutableTask : public ProgramD3D::GetExecutableTask
> {
>   public:
>     GetPixelExecutableTask(ProgramD3D *program) : GetExecutableTask(program) {}
>-    gl::Error run() override
>+    angle::Result run() override
>     {
>         mProgram->updateCachedOutputLayoutFromShader();
> 
>-        ANGLE_TRY(mProgram->getPixelExecutableForCachedOutputLayout(&mResult, &mInfoLog));
>+        ANGLE_TRY(mProgram->getPixelExecutableForCachedOutputLayout(this, &mExecutable, &mInfoLog));
> 
>-        return gl::NoError();
>+        return angle::Result::Continue;
>     }
> };
> 
>@@ -1451,203 +1727,367 @@ void ProgramD3D::updateCachedOutputLayoutFromShader()
>     updateCachedPixelExecutableIndex();
> }
> 
>+void ProgramD3D::updateCachedImage2DBindLayoutFromComputeShader()
>+{
>+    GetDefaultImage2DBindLayoutFromComputeShader(mImage2DUniforms,
>+                                                 &mComputeShaderImage2DBindLayoutCache);
>+    updateCachedComputeExecutableIndex();
>+}
>+
> class ProgramD3D::GetGeometryExecutableTask : public ProgramD3D::GetExecutableTask
> {
>   public:
>-    GetGeometryExecutableTask(ProgramD3D *program, const gl::Context *context)
>-        : GetExecutableTask(program), mContext(context)
>-    {
>-    }
>+    GetGeometryExecutableTask(ProgramD3D *program, const gl::State &state)
>+        : GetExecutableTask(program), mState(state)
>+    {}
> 
>-    gl::Error run() override
>+    angle::Result run() override
>     {
>         // Auto-generate the geometry shader here, if we expect to be using point rendering in
>         // D3D11.
>-        if (mProgram->usesGeometryShader(GL_POINTS))
>+        if (mProgram->usesGeometryShader(mState, gl::PrimitiveMode::Points))
>         {
>-            ANGLE_TRY(mProgram->getGeometryExecutableForPrimitiveType(mContext, GL_POINTS, &mResult,
>-                                                                      &mInfoLog));
>+            ANGLE_TRY(mProgram->getGeometryExecutableForPrimitiveType(
>+                this, mState, gl::PrimitiveMode::Points, &mExecutable, &mInfoLog));
>         }
> 
>-        return gl::NoError();
>+        return angle::Result::Continue;
>     }
> 
>   private:
>-    const gl::Context *mContext;
>+    const gl::State &mState;
> };
> 
>-gl::Error ProgramD3D::getComputeExecutable(ShaderExecutableD3D **outExecutable)
>+class ProgramD3D::GetComputeExecutableTask : public ProgramD3D::GetExecutableTask
> {
>-    if (outExecutable)
>+  public:
>+    GetComputeExecutableTask(ProgramD3D *program) : GetExecutableTask(program) {}
>+    angle::Result run() override
>     {
>-        *outExecutable = mComputeExecutable.get();
>-    }
>+        mProgram->updateCachedImage2DBindLayoutFromComputeShader();
>+        ShaderExecutableD3D *computeExecutable = nullptr;
>+        ANGLE_TRY(mProgram->getComputeExecutableForImage2DBindLayout(this, &computeExecutable,
>+                                                                     &mInfoLog));
> 
>-    return gl::NoError();
>-}
>+        return computeExecutable ? angle::Result::Continue : angle::Result::Incomplete;
>+    }
>+};
> 
>-gl::LinkResult ProgramD3D::compileProgramExecutables(const gl::Context *context,
>-                                                     gl::InfoLog &infoLog)
>+// The LinkEvent implementation for linking a rendering(VS, FS, GS) program.
>+class ProgramD3D::GraphicsProgramLinkEvent final : public LinkEvent
> {
>-    // Ensure the compiler is initialized to avoid race conditions.
>-    ANGLE_TRY(mRenderer->ensureHLSLCompilerInitialized());
>+  public:
>+    GraphicsProgramLinkEvent(gl::InfoLog &infoLog,
>+                             std::shared_ptr<WorkerThreadPool> workerPool,
>+                             std::shared_ptr<ProgramD3D::GetVertexExecutableTask> vertexTask,
>+                             std::shared_ptr<ProgramD3D::GetPixelExecutableTask> pixelTask,
>+                             std::shared_ptr<ProgramD3D::GetGeometryExecutableTask> geometryTask,
>+                             bool useGS,
>+                             const ShaderD3D *vertexShader,
>+                             const ShaderD3D *fragmentShader)
>+        : mInfoLog(infoLog),
>+          mVertexTask(vertexTask),
>+          mPixelTask(pixelTask),
>+          mGeometryTask(geometryTask),
>+          mWaitEvents({{std::shared_ptr<WaitableEvent>(
>+                            angle::WorkerThreadPool::PostWorkerTask(workerPool, mVertexTask)),
>+                        std::shared_ptr<WaitableEvent>(
>+                            angle::WorkerThreadPool::PostWorkerTask(workerPool, mPixelTask)),
>+                        std::shared_ptr<WaitableEvent>(
>+                            angle::WorkerThreadPool::PostWorkerTask(workerPool, mGeometryTask))}}),
>+          mUseGS(useGS),
>+          mVertexShader(vertexShader),
>+          mFragmentShader(fragmentShader)
>+    {}
> 
>-    WorkerThreadPool *workerPool = mRenderer->getWorkerThreadPool();
>+    angle::Result wait(const gl::Context *context) override
>+    {
>+        WaitableEvent::WaitMany(&mWaitEvents);
> 
>-    GetVertexExecutableTask vertexTask(this, context);
>-    GetPixelExecutableTask pixelTask(this);
>-    GetGeometryExecutableTask geometryTask(this, context);
>+        ANGLE_TRY(checkTask(context, mVertexTask.get()));
>+        ANGLE_TRY(checkTask(context, mPixelTask.get()));
>+        ANGLE_TRY(checkTask(context, mGeometryTask.get()));
> 
>-    std::array<WaitableEvent, 3> waitEvents = {{workerPool->postWorkerTask(&vertexTask),
>-                                                workerPool->postWorkerTask(&pixelTask),
>-                                                workerPool->postWorkerTask(&geometryTask)}};
>+        if (mVertexTask->getResult() == angle::Result::Incomplete ||
>+            mPixelTask->getResult() == angle::Result::Incomplete ||
>+            mGeometryTask->getResult() == angle::Result::Incomplete)
>+        {
>+            return angle::Result::Incomplete;
>+        }
> 
>-    WaitableEvent::WaitMany(&waitEvents);
>+        ShaderExecutableD3D *defaultVertexExecutable = mVertexTask->getExecutable();
>+        ShaderExecutableD3D *defaultPixelExecutable  = mPixelTask->getExecutable();
>+        ShaderExecutableD3D *pointGS                 = mGeometryTask->getExecutable();
> 
>-    infoLog << vertexTask.getInfoLog().str();
>-    infoLog << pixelTask.getInfoLog().str();
>-    infoLog << geometryTask.getInfoLog().str();
>+        if (mUseGS && pointGS)
>+        {
>+            // Geometry shaders are currently only used internally, so there is no corresponding
>+            // shader object at the interface level. For now the geometry shader debug info is
>+            // prepended to the vertex shader.
>+            mVertexShader->appendDebugInfo("// GEOMETRY SHADER BEGIN\n\n");
>+            mVertexShader->appendDebugInfo(pointGS->getDebugInfo());
>+            mVertexShader->appendDebugInfo("\nGEOMETRY SHADER END\n\n\n");
>+        }
> 
>-    ANGLE_TRY(vertexTask.getError());
>-    ANGLE_TRY(pixelTask.getError());
>-    ANGLE_TRY(geometryTask.getError());
>+        if (defaultVertexExecutable)
>+        {
>+            mVertexShader->appendDebugInfo(defaultVertexExecutable->getDebugInfo());
>+        }
> 
>-    ShaderExecutableD3D *defaultVertexExecutable = vertexTask.getResult();
>-    ShaderExecutableD3D *defaultPixelExecutable  = pixelTask.getResult();
>-    ShaderExecutableD3D *pointGS                 = geometryTask.getResult();
>+        if (defaultPixelExecutable)
>+        {
>+            mFragmentShader->appendDebugInfo(defaultPixelExecutable->getDebugInfo());
>+        }
> 
>-    const ShaderD3D *vertexShaderD3D = GetImplAs<ShaderD3D>(mState.getAttachedVertexShader());
>+        bool isLinked = (defaultVertexExecutable && defaultPixelExecutable && (!mUseGS || pointGS));
>+        if (!isLinked)
>+        {
>+            mInfoLog << "Failed to create D3D Shaders";
>+        }
>+        return isLinked ? angle::Result::Continue : angle::Result::Incomplete;
>+    }
> 
>-    if (usesGeometryShader(GL_POINTS) && pointGS)
>+    bool isLinking() override
>     {
>-        // Geometry shaders are currently only used internally, so there is no corresponding shader
>-        // object at the interface level. For now the geometry shader debug info is prepended to
>-        // the vertex shader.
>-        vertexShaderD3D->appendDebugInfo("// GEOMETRY SHADER BEGIN\n\n");
>-        vertexShaderD3D->appendDebugInfo(pointGS->getDebugInfo());
>-        vertexShaderD3D->appendDebugInfo("\nGEOMETRY SHADER END\n\n\n");
>+        for (auto &event : mWaitEvents)
>+        {
>+            if (!event->isReady())
>+            {
>+                return true;
>+            }
>+        }
>+        return false;
>     }
> 
>-    if (defaultVertexExecutable)
>+  private:
>+    angle::Result checkTask(const gl::Context *context, ProgramD3D::GetExecutableTask *task)
>     {
>-        vertexShaderD3D->appendDebugInfo(defaultVertexExecutable->getDebugInfo());
>+        if (!task->getInfoLog().empty())
>+        {
>+            mInfoLog << task->getInfoLog().str();
>+        }
>+
>+        // Continue and Incomplete are not errors. For Stop, pass the error to the ContextD3D.
>+        if (task->getResult() != angle::Result::Stop)
>+        {
>+            return angle::Result::Continue;
>+        }
>+
>+        ContextD3D *contextD3D = GetImplAs<ContextD3D>(context);
>+        task->popError(contextD3D);
>+        return angle::Result::Stop;
>     }
> 
>-    if (defaultPixelExecutable)
>+    gl::InfoLog &mInfoLog;
>+    std::shared_ptr<ProgramD3D::GetVertexExecutableTask> mVertexTask;
>+    std::shared_ptr<ProgramD3D::GetPixelExecutableTask> mPixelTask;
>+    std::shared_ptr<ProgramD3D::GetGeometryExecutableTask> mGeometryTask;
>+    std::array<std::shared_ptr<WaitableEvent>, 3> mWaitEvents;
>+    bool mUseGS;
>+    const ShaderD3D *mVertexShader;
>+    const ShaderD3D *mFragmentShader;
>+};
>+
>+// The LinkEvent implementation for linking a computing program.
>+class ProgramD3D::ComputeProgramLinkEvent final : public LinkEvent
>+{
>+  public:
>+    ComputeProgramLinkEvent(gl::InfoLog &infoLog,
>+                            std::shared_ptr<ProgramD3D::GetComputeExecutableTask> computeTask,
>+                            std::shared_ptr<WaitableEvent> event)
>+        : mInfoLog(infoLog), mComputeTask(computeTask), mWaitEvent(event)
>+    {}
>+
>+    bool isLinking() override { return !mWaitEvent->isReady(); }
>+
>+    angle::Result wait(const gl::Context *context) override
>+    {
>+        mWaitEvent->wait();
>+
>+        angle::Result result = mComputeTask->getResult();
>+        if (result != angle::Result::Continue)
>+        {
>+            mInfoLog << "Failed to create D3D compute shader.";
>+        }
>+        return result;
>+    }
>+
>+  private:
>+    gl::InfoLog &mInfoLog;
>+    std::shared_ptr<ProgramD3D::GetComputeExecutableTask> mComputeTask;
>+    std::shared_ptr<WaitableEvent> mWaitEvent;
>+};
>+
>+std::unique_ptr<LinkEvent> ProgramD3D::compileProgramExecutables(const gl::Context *context,
>+                                                                 gl::InfoLog &infoLog)
>+{
>+    // Ensure the compiler is initialized to avoid race conditions.
>+    angle::Result result = mRenderer->ensureHLSLCompilerInitialized(GetImplAs<ContextD3D>(context));
>+    if (result != angle::Result::Continue)
>     {
>-        const ShaderD3D *fragmentShaderD3D =
>-            GetImplAs<ShaderD3D>(mState.getAttachedFragmentShader());
>-        fragmentShaderD3D->appendDebugInfo(defaultPixelExecutable->getDebugInfo());
>+        return std::make_unique<LinkEventDone>(result);
>     }
> 
>-    return (defaultVertexExecutable && defaultPixelExecutable &&
>-            (!usesGeometryShader(GL_POINTS) || pointGS));
>+    auto vertexTask   = std::make_shared<GetVertexExecutableTask>(this);
>+    auto pixelTask    = std::make_shared<GetPixelExecutableTask>(this);
>+    auto geometryTask = std::make_shared<GetGeometryExecutableTask>(this, context->getState());
>+    bool useGS        = usesGeometryShader(context->getState(), gl::PrimitiveMode::Points);
>+    const ShaderD3D *vertexShaderD3D =
>+        GetImplAs<ShaderD3D>(mState.getAttachedShader(gl::ShaderType::Vertex));
>+    const ShaderD3D *fragmentShaderD3D =
>+        GetImplAs<ShaderD3D>(mState.getAttachedShader(gl::ShaderType::Fragment));
>+
>+    return std::make_unique<GraphicsProgramLinkEvent>(infoLog, context->getWorkerThreadPool(),
>+                                                      vertexTask, pixelTask, geometryTask, useGS,
>+                                                      vertexShaderD3D, fragmentShaderD3D);
> }
> 
>-gl::LinkResult ProgramD3D::compileComputeExecutable(const gl::Context *context,
>-                                                    gl::InfoLog &infoLog)
>+std::unique_ptr<LinkEvent> ProgramD3D::compileComputeExecutable(const gl::Context *context,
>+                                                                gl::InfoLog &infoLog)
> {
>     // Ensure the compiler is initialized to avoid race conditions.
>-    ANGLE_TRY(mRenderer->ensureHLSLCompilerInitialized());
>+    angle::Result result = mRenderer->ensureHLSLCompilerInitialized(GetImplAs<ContextD3D>(context));
>+    if (result != angle::Result::Continue)
>+    {
>+        return std::make_unique<LinkEventDone>(result);
>+    }
>+    auto computeTask = std::make_shared<GetComputeExecutableTask>(this);
>+
>+    std::shared_ptr<WaitableEvent> waitableEvent;
>+
>+    // TODO(jie.a.chen@intel.com): Fix the flaky bug.
>+    // http://anglebug.com/3349
>+    bool compileInParallel = false;
>+    if (!compileInParallel)
>+    {
>+        (*computeTask)();
>+        waitableEvent = std::make_shared<WaitableEventDone>();
>+    }
>+    else
>+    {
>+        waitableEvent =
>+            WorkerThreadPool::PostWorkerTask(context->getWorkerThreadPool(), computeTask);
>+    }
>+
>+    return std::make_unique<ComputeProgramLinkEvent>(infoLog, computeTask, waitableEvent);
>+}
>+
>+angle::Result ProgramD3D::getComputeExecutableForImage2DBindLayout(
>+    d3d::Context *context,
>+    ShaderExecutableD3D **outExecutable,
>+    gl::InfoLog *infoLog)
>+{
>+    if (mCachedComputeExecutableIndex.valid())
>+    {
>+        *outExecutable =
>+            mComputeExecutables[mCachedComputeExecutableIndex.value()]->shaderExecutable();
>+        return angle::Result::Continue;
>+    }
> 
>-    std::string computeShader = mDynamicHLSL->generateComputeShaderLinkHLSL(context, mState);
>+    std::string finalComputeHLSL = mDynamicHLSL->generateComputeShaderForImage2DBindSignature(
>+        context, *this, mState, mImage2DUniforms, mComputeShaderImage2DBindLayoutCache);
> 
>+    // Generate new compute executable
>     ShaderExecutableD3D *computeExecutable = nullptr;
>-    ANGLE_TRY(mRenderer->compileToExecutable(infoLog, computeShader, gl::SHADER_COMPUTE,
>-                                             std::vector<D3DVarying>(), false,
>-                                             angle::CompilerWorkaroundsD3D(), &computeExecutable));
> 
>-    if (computeExecutable == nullptr)
>+    gl::InfoLog tempInfoLog;
>+    gl::InfoLog *currentInfoLog = infoLog ? infoLog : &tempInfoLog;
>+
>+    ANGLE_TRY(mRenderer->compileToExecutable(
>+        context, *currentInfoLog, finalComputeHLSL, gl::ShaderType::Compute,
>+        std::vector<D3DVarying>(), false, angle::CompilerWorkaroundsD3D(), &computeExecutable));
>+
>+    if (computeExecutable)
>     {
>-        ERR() << "Error compiling dynamic compute executable:" << std::endl
>-              << infoLog.str() << std::endl;
>+        mComputeExecutables.push_back(std::unique_ptr<ComputeExecutable>(
>+            new ComputeExecutable(mComputeShaderImage2DBindLayoutCache,
>+                                  std::unique_ptr<ShaderExecutableD3D>(computeExecutable))));
>+        mCachedComputeExecutableIndex = mComputeExecutables.size() - 1;
>     }
>-    else
>+    else if (!infoLog)
>     {
>-        const ShaderD3D *computeShaderD3D = GetImplAs<ShaderD3D>(mState.getAttachedComputeShader());
>-        computeShaderD3D->appendDebugInfo(computeExecutable->getDebugInfo());
>-        mComputeExecutable.reset(computeExecutable);
>+        ERR() << "Error compiling dynamic compute executable:" << std::endl
>+              << tempInfoLog.str() << std::endl;
>     }
>+    *outExecutable = computeExecutable;
> 
>-    return mComputeExecutable.get() != nullptr;
>+    return angle::Result::Continue;
> }
> 
>-gl::LinkResult ProgramD3D::link(const gl::Context *context,
>-                                const gl::ProgramLinkedResources &resources,
>-                                gl::InfoLog &infoLog)
>+std::unique_ptr<LinkEvent> ProgramD3D::link(const gl::Context *context,
>+                                            const gl::ProgramLinkedResources &resources,
>+                                            gl::InfoLog &infoLog)
> {
>-    const auto &data = context->getContextState();
>+    const auto &data = context->getState();
> 
>     reset();
> 
>-    gl::Shader *computeShader = mState.getAttachedComputeShader();
>+    gl::Shader *computeShader = mState.getAttachedShader(gl::ShaderType::Compute);
>     if (computeShader)
>     {
>-        mSamplersCS.resize(data.getCaps().maxComputeTextureImageUnits);
>+        mShaderSamplers[gl::ShaderType::Compute].resize(
>+            data.getCaps().maxShaderTextureImageUnits[gl::ShaderType::Compute]);
>+        mImagesCS.resize(data.getCaps().maxImageUnits);
>+        mReadonlyImagesCS.resize(data.getCaps().maxImageUnits);
> 
>-        defineUniformsAndAssignRegisters(context);
>+        mShaderUniformsDirty.set(gl::ShaderType::Compute);
> 
>-        gl::LinkResult result = compileComputeExecutable(context, infoLog);
>-        if (result.isError())
>-        {
>-            infoLog << result.getError().getMessage();
>-            return result;
>-        }
>-        else if (!result.getResult())
>+        linkResources(resources);
>+
>+        for (const sh::Uniform &uniform : computeShader->getUniforms())
>         {
>-            infoLog << "Failed to create D3D compute shader.";
>-            return result;
>+            if (gl::IsImageType(uniform.type) && gl::IsImage2DType(uniform.type))
>+            {
>+                mImage2DUniforms.push_back(uniform);
>+            }
>         }
>+
>+        defineUniformsAndAssignRegisters();
>+
>+        return compileComputeExecutable(context, infoLog);
>     }
>     else
>     {
>-        gl::Shader *vertexShader   = mState.getAttachedVertexShader();
>-        gl::Shader *fragmentShader = mState.getAttachedFragmentShader();
>+        gl::ShaderMap<const ShaderD3D *> shadersD3D = {};
>+        for (gl::ShaderType shaderType : gl::kAllGraphicsShaderTypes)
>+        {
>+            if (mState.getAttachedShader(shaderType))
>+            {
>+                shadersD3D[shaderType] = GetImplAs<ShaderD3D>(mState.getAttachedShader(shaderType));
> 
>-        const ShaderD3D *vertexShaderD3D   = GetImplAs<ShaderD3D>(vertexShader);
>-        const ShaderD3D *fragmentShaderD3D = GetImplAs<ShaderD3D>(fragmentShader);
>+                mShaderSamplers[shaderType].resize(
>+                    data.getCaps().maxShaderTextureImageUnits[shaderType]);
> 
>-        mSamplersVS.resize(data.getCaps().maxVertexTextureImageUnits);
>-        mSamplersPS.resize(data.getCaps().maxTextureImageUnits);
>+                shadersD3D[shaderType]->generateWorkarounds(&mShaderWorkarounds[shaderType]);
> 
>-        vertexShaderD3D->generateWorkarounds(&mVertexWorkarounds);
>-        fragmentShaderD3D->generateWorkarounds(&mPixelWorkarounds);
>+                mShaderUniformsDirty.set(shaderType);
>+            }
>+        }
> 
>         if (mRenderer->getNativeLimitations().noFrontFacingSupport)
>         {
>-            if (fragmentShaderD3D->usesFrontFacing())
>+            if (shadersD3D[gl::ShaderType::Fragment]->usesFrontFacing())
>             {
>                 infoLog << "The current renderer doesn't support gl_FrontFacing";
>-                return false;
>+                return std::make_unique<LinkEventDone>(angle::Result::Incomplete);
>             }
>         }
> 
>-        // TODO(jmadill): Implement more sophisticated component packing in D3D9.
>-        // We can fail here because we use one semantic per GLSL varying. D3D11 can pack varyings
>-        // intelligently, but D3D9 assumes one semantic per register.
>-        if (mRenderer->getRendererClass() == RENDERER_D3D9 &&
>-            resources.varyingPacking.getMaxSemanticIndex() > data.getCaps().maxVaryingVectors)
>-        {
>-            infoLog << "Cannot pack these varyings on D3D9.";
>-            return false;
>-        }
>-
>-        ProgramD3DMetadata metadata(mRenderer, vertexShaderD3D, fragmentShaderD3D);
>+        ProgramD3DMetadata metadata(mRenderer, shadersD3D);
>         BuiltinVaryingsD3D builtins(metadata, resources.varyingPacking);
> 
>-        mDynamicHLSL->generateShaderLinkHLSL(context, mState, metadata, resources.varyingPacking,
>-                                             builtins, &mPixelHLSL, &mVertexHLSL);
>+        mDynamicHLSL->generateShaderLinkHLSL(context->getCaps(), mState, metadata,
>+                                             resources.varyingPacking, builtins, &mShaderHLSL);
> 
>-        mUsesPointSize = vertexShaderD3D->usesPointSize();
>+        mUsesPointSize = shadersD3D[gl::ShaderType::Vertex]->usesPointSize();
>         mDynamicHLSL->getPixelShaderOutputKey(data, mState, metadata, &mPixelShaderKey);
>-        mUsesFragDepth = metadata.usesFragDepth();
>+        mUsesFragDepth            = metadata.usesFragDepth();
>+        mUsesVertexID             = metadata.usesVertexID();
>         mUsesViewID               = metadata.usesViewID();
>         mHasANGLEMultiviewEnabled = metadata.hasANGLEMultiviewEnabled();
> 
>         // Cache if we use flat shading
>-        mUsesFlatInterpolation =
>-            (FindFlatInterpolationVarying(fragmentShader->getInputVaryings(context)) ||
>-             FindFlatInterpolationVarying(vertexShader->getOutputVaryings(context)));
>+        mUsesFlatInterpolation = FindFlatInterpolationVarying(mState.getAttachedShaders());
> 
>         if (mRenderer->getMajorShaderModel() >= 4)
>         {
>@@ -1656,28 +2096,16 @@ gl::LinkResult ProgramD3D::link(const gl::Context *context,
>                 metadata.canSelectViewInVertexShader());
>         }
> 
>-        initAttribLocationsToD3DSemantic(context);
>+        initAttribLocationsToD3DSemantic();
> 
>-        defineUniformsAndAssignRegisters(context);
>+        defineUniformsAndAssignRegisters();
> 
>-        gatherTransformFeedbackVaryings(resources.varyingPacking, builtins[gl::SHADER_VERTEX]);
>+        gatherTransformFeedbackVaryings(resources.varyingPacking, builtins[gl::ShaderType::Vertex]);
> 
>-        gl::LinkResult result = compileProgramExecutables(context, infoLog);
>-        if (result.isError())
>-        {
>-            infoLog << result.getError().getMessage();
>-            return result;
>-        }
>-        else if (!result.getResult())
>-        {
>-            infoLog << "Failed to create D3D shaders.";
>-            return result;
>-        }
>-    }
>-
>-    linkResources(context, resources);
>+        linkResources(resources);
> 
>-    return true;
>+        return compileProgramExecutables(context, infoLog);
>+    }
> }
> 
> GLboolean ProgramD3D::validate(const gl::Caps & /*caps*/, gl::InfoLog * /*infoLog*/)
>@@ -1686,6 +2114,45 @@ GLboolean ProgramD3D::validate(const gl::Caps & /*caps*/, gl::InfoLog * /*infoLo
>     return GL_TRUE;
> }
> 
>+void ProgramD3D::initializeShaderStorageBlocks()
>+{
>+    if (mState.getShaderStorageBlocks().empty())
>+    {
>+        return;
>+    }
>+
>+    ASSERT(mD3DShaderStorageBlocks.empty());
>+
>+    // Assign registers and update sizes.
>+    gl::ShaderMap<const ShaderD3D *> shadersD3D = {};
>+    for (gl::ShaderType shaderType : gl::AllShaderTypes())
>+    {
>+        shadersD3D[shaderType] = SafeGetImplAs<ShaderD3D>(mState.getAttachedShader(shaderType));
>+    }
>+
>+    for (const gl::InterfaceBlock &shaderStorageBlock : mState.getShaderStorageBlocks())
>+    {
>+        unsigned int shaderStorageBlockElement =
>+            shaderStorageBlock.isArray ? shaderStorageBlock.arrayElement : 0;
>+
>+        D3DInterfaceBlock d3dShaderStorageBlock;
>+
>+        for (gl::ShaderType shaderType : gl::AllShaderTypes())
>+        {
>+            if (shaderStorageBlock.isActive(shaderType))
>+            {
>+                ASSERT(shadersD3D[shaderType]);
>+                unsigned int baseRegister =
>+                    shadersD3D[shaderType]->getShaderStorageBlockRegister(shaderStorageBlock.name);
>+                d3dShaderStorageBlock.mShaderRegisterIndexes[shaderType] =
>+                    baseRegister + shaderStorageBlockElement;
>+            }
>+        }
>+
>+        mD3DShaderStorageBlocks.push_back(d3dShaderStorageBlock);
>+    }
>+}
>+
> void ProgramD3D::initializeUniformBlocks()
> {
>     if (mState.getUniformBlocks().empty())
>@@ -1696,78 +2163,63 @@ void ProgramD3D::initializeUniformBlocks()
>     ASSERT(mD3DUniformBlocks.empty());
> 
>     // Assign registers and update sizes.
>-    const ShaderD3D *vertexShaderD3D = SafeGetImplAs<ShaderD3D>(mState.getAttachedVertexShader());
>-    const ShaderD3D *fragmentShaderD3D =
>-        SafeGetImplAs<ShaderD3D>(mState.getAttachedFragmentShader());
>-    const ShaderD3D *computeShaderD3D = SafeGetImplAs<ShaderD3D>(mState.getAttachedComputeShader());
>+    gl::ShaderMap<const ShaderD3D *> shadersD3D = {};
>+    for (gl::ShaderType shaderType : gl::AllShaderTypes())
>+    {
>+        shadersD3D[shaderType] = SafeGetImplAs<ShaderD3D>(mState.getAttachedShader(shaderType));
>+    }
> 
>     for (const gl::InterfaceBlock &uniformBlock : mState.getUniformBlocks())
>     {
>         unsigned int uniformBlockElement = uniformBlock.isArray ? uniformBlock.arrayElement : 0;
> 
>-        D3DUniformBlock d3dUniformBlock;
>-
>-        if (uniformBlock.vertexStaticUse)
>-        {
>-            ASSERT(vertexShaderD3D != nullptr);
>-            unsigned int baseRegister = vertexShaderD3D->getUniformBlockRegister(uniformBlock.name);
>-            d3dUniformBlock.vsRegisterIndex = baseRegister + uniformBlockElement;
>-        }
>-
>-        if (uniformBlock.fragmentStaticUse)
>-        {
>-            ASSERT(fragmentShaderD3D != nullptr);
>-            unsigned int baseRegister =
>-                fragmentShaderD3D->getUniformBlockRegister(uniformBlock.name);
>-            d3dUniformBlock.psRegisterIndex = baseRegister + uniformBlockElement;
>-        }
>+        D3DInterfaceBlock d3dUniformBlock;
> 
>-        if (uniformBlock.computeStaticUse)
>+        for (gl::ShaderType shaderType : gl::AllShaderTypes())
>         {
>-            ASSERT(computeShaderD3D != nullptr);
>-            unsigned int baseRegister =
>-                computeShaderD3D->getUniformBlockRegister(uniformBlock.name);
>-            d3dUniformBlock.csRegisterIndex = baseRegister + uniformBlockElement;
>+            if (uniformBlock.isActive(shaderType))
>+            {
>+                ASSERT(shadersD3D[shaderType]);
>+                unsigned int baseRegister =
>+                    shadersD3D[shaderType]->getUniformBlockRegister(uniformBlock.name);
>+                d3dUniformBlock.mShaderRegisterIndexes[shaderType] =
>+                    baseRegister + uniformBlockElement;
>+            }
>         }
> 
>         mD3DUniformBlocks.push_back(d3dUniformBlock);
>     }
> }
> 
>-void ProgramD3D::initializeUniformStorage()
>+void ProgramD3D::initializeUniformStorage(const gl::ShaderBitSet &availableShaderStages)
> {
>     // Compute total default block size
>-    unsigned int vertexRegisters   = 0;
>-    unsigned int fragmentRegisters = 0;
>-    unsigned int computeRegisters  = 0;
>+    gl::ShaderMap<unsigned int> shaderRegisters = {};
>     for (const D3DUniform *d3dUniform : mD3DUniforms)
>     {
>-        if (!d3dUniform->isSampler())
>+        if (d3dUniform->isSampler())
>         {
>-            if (d3dUniform->isReferencedByVertexShader())
>-            {
>-                vertexRegisters = std::max(vertexRegisters,
>-                                           d3dUniform->vsRegisterIndex + d3dUniform->registerCount);
>-            }
>-            if (d3dUniform->isReferencedByFragmentShader())
>-            {
>-                fragmentRegisters = std::max(
>-                    fragmentRegisters, d3dUniform->psRegisterIndex + d3dUniform->registerCount);
>-            }
>-            if (d3dUniform->isReferencedByComputeShader())
>+            continue;
>+        }
>+
>+        for (gl::ShaderType shaderType : availableShaderStages)
>+        {
>+            if (d3dUniform->isReferencedByShader(shaderType))
>             {
>-                computeRegisters = std::max(
>-                    computeRegisters, d3dUniform->csRegisterIndex + d3dUniform->registerCount);
>+                shaderRegisters[shaderType] = std::max(
>+                    shaderRegisters[shaderType],
>+                    d3dUniform->mShaderRegisterIndexes[shaderType] + d3dUniform->registerCount);
>             }
>         }
>     }
> 
>-    mVertexUniformStorage =
>-        std::unique_ptr<UniformStorageD3D>(mRenderer->createUniformStorage(vertexRegisters * 16u));
>-    mFragmentUniformStorage = std::unique_ptr<UniformStorageD3D>(
>-        mRenderer->createUniformStorage(fragmentRegisters * 16u));
>-    mComputeUniformStorage =
>-        std::unique_ptr<UniformStorageD3D>(mRenderer->createUniformStorage(computeRegisters * 16u));
>+    // We only reset uniform storages for the shader stages available in the program (attached
>+    // shaders in ProgramD3D::link() and linkedShaderStages in ProgramD3D::load()).
>+    for (gl::ShaderType shaderType : availableShaderStages)
>+    {
>+        mShaderUniformStorages[shaderType].reset(
>+            mRenderer->createUniformStorage(shaderRegisters[shaderType] * 16u));
>+    }
> 
>     // Iterate the uniforms again to assign data pointers to default block uniforms.
>     for (D3DUniform *d3dUniform : mD3DUniforms)
>@@ -1778,102 +2230,94 @@ void ProgramD3D::initializeUniformStorage()
>             continue;
>         }
> 
>-        if (d3dUniform->isReferencedByVertexShader())
>-        {
>-            d3dUniform->vsData = mVertexUniformStorage->getDataPointer(d3dUniform->vsRegisterIndex,
>-                                                                       d3dUniform->registerElement);
>-        }
>-
>-        if (d3dUniform->isReferencedByFragmentShader())
>+        for (gl::ShaderType shaderType : availableShaderStages)
>         {
>-            d3dUniform->psData = mFragmentUniformStorage->getDataPointer(
>-                d3dUniform->psRegisterIndex, d3dUniform->registerElement);
>-        }
>-
>-        if (d3dUniform->isReferencedByComputeShader())
>-        {
>-            d3dUniform->csData = mComputeUniformStorage->getDataPointer(
>-                d3dUniform->csRegisterIndex, d3dUniform->registerElement);
>+            if (d3dUniform->isReferencedByShader(shaderType))
>+            {
>+                d3dUniform->mShaderData[shaderType] =
>+                    mShaderUniformStorages[shaderType]->getDataPointer(
>+                        d3dUniform->mShaderRegisterIndexes[shaderType],
>+                        d3dUniform->registerElement);
>+            }
>         }
>     }
> }
> 
>-void ProgramD3D::updateUniformBufferCache(const gl::Caps &caps,
>-                                          unsigned int reservedVertex,
>-                                          unsigned int reservedFragment)
>+void ProgramD3D::updateUniformBufferCache(
>+    const gl::Caps &caps,
>+    const gl::ShaderMap<unsigned int> &reservedShaderRegisterIndexes)
> {
>     if (mState.getUniformBlocks().empty())
>     {
>         return;
>     }
> 
>-    mVertexUBOCache.clear();
>-    mFragmentUBOCache.clear();
>+    for (gl::ShaderType shaderType : gl::AllShaderTypes())
>+    {
>+        mShaderUBOCaches[shaderType].clear();
>+    }
> 
>     for (unsigned int uniformBlockIndex = 0; uniformBlockIndex < mD3DUniformBlocks.size();
>          uniformBlockIndex++)
>     {
>-        const D3DUniformBlock &uniformBlock = mD3DUniformBlocks[uniformBlockIndex];
>-        GLuint blockBinding                 = mState.getUniformBlockBinding(uniformBlockIndex);
>+        const D3DInterfaceBlock &uniformBlock = mD3DUniformBlocks[uniformBlockIndex];
>+        GLuint blockBinding                   = mState.getUniformBlockBinding(uniformBlockIndex);
> 
>         // Unnecessary to apply an unreferenced standard or shared UBO
>-        if (!uniformBlock.vertexStaticUse() && !uniformBlock.fragmentStaticUse())
>-        {
>-            continue;
>-        }
>-
>-        if (uniformBlock.vertexStaticUse())
>+        for (gl::ShaderType shaderType : gl::AllShaderTypes())
>         {
>-            unsigned int registerIndex = uniformBlock.vsRegisterIndex - reservedVertex;
>-            ASSERT(registerIndex < caps.maxVertexUniformBlocks);
>-
>-            if (mVertexUBOCache.size() <= registerIndex)
>+            if (!uniformBlock.activeInShader(shaderType))
>             {
>-                mVertexUBOCache.resize(registerIndex + 1, -1);
>+                continue;
>             }
> 
>-            ASSERT(mVertexUBOCache[registerIndex] == -1);
>-            mVertexUBOCache[registerIndex] = blockBinding;
>-        }
>-
>-        if (uniformBlock.fragmentStaticUse())
>-        {
>-            unsigned int registerIndex = uniformBlock.psRegisterIndex - reservedFragment;
>-            ASSERT(registerIndex < caps.maxFragmentUniformBlocks);
>+            unsigned int registerIndex = uniformBlock.mShaderRegisterIndexes[shaderType] -
>+                                         reservedShaderRegisterIndexes[shaderType];
>+            ASSERT(registerIndex < caps.maxShaderUniformBlocks[shaderType]);
> 
>-            if (mFragmentUBOCache.size() <= registerIndex)
>+            std::vector<int> &shaderUBOcache = mShaderUBOCaches[shaderType];
>+            if (shaderUBOcache.size() <= registerIndex)
>             {
>-                mFragmentUBOCache.resize(registerIndex + 1, -1);
>+                shaderUBOcache.resize(registerIndex + 1, -1);
>             }
> 
>-            ASSERT(mFragmentUBOCache[registerIndex] == -1);
>-            mFragmentUBOCache[registerIndex] = blockBinding;
>+            ASSERT(shaderUBOcache[registerIndex] == -1);
>+            shaderUBOcache[registerIndex] = blockBinding;
>         }
>     }
> }
> 
>-const std::vector<GLint> &ProgramD3D::getVertexUniformBufferCache() const
>+unsigned int ProgramD3D::getAtomicCounterBufferRegisterIndex(GLuint binding,
>+                                                             gl::ShaderType shaderType) const
>+{
>+    if (shaderType != gl::ShaderType::Compute)
>+    {
>+        // Implement atomic counters for non-compute shaders
>+        // http://anglebug.com/1729
>+        UNIMPLEMENTED();
>+    }
>+    return mComputeAtomicCounterBufferRegisterIndices[binding];
>+}
>+
>+unsigned int ProgramD3D::getShaderStorageBufferRegisterIndex(GLuint blockIndex,
>+                                                             gl::ShaderType shaderType) const
> {
>-    return mVertexUBOCache;
>+    return mD3DShaderStorageBlocks[blockIndex].mShaderRegisterIndexes[shaderType];
> }
> 
>-const std::vector<GLint> &ProgramD3D::getFragmentUniformBufferCache() const
>+const std::vector<GLint> &ProgramD3D::getShaderUniformBufferCache(gl::ShaderType shaderType) const
> {
>-    return mFragmentUBOCache;
>+    return mShaderUBOCaches[shaderType];
> }
> 
> void ProgramD3D::dirtyAllUniforms()
> {
>-    mVertexUniformsDirty   = true;
>-    mFragmentUniformsDirty = true;
>-    mComputeUniformsDirty  = true;
>+    mShaderUniformsDirty = mState.getLinkedShaderStages();
> }
> 
> void ProgramD3D::markUniformsClean()
> {
>-    mVertexUniformsDirty   = false;
>-    mFragmentUniformsDirty = false;
>-    mComputeUniformsDirty  = false;
>+    mShaderUniformsDirty.reset();
> }
> 
> void ProgramD3D::setUniform1fv(GLint location, GLsizei count, const GLfloat *v)
>@@ -1901,7 +2345,7 @@ void ProgramD3D::setUniformMatrix2fv(GLint location,
>                                      GLboolean transpose,
>                                      const GLfloat *value)
> {
>-    setUniformMatrixfvInternal<2, 2>(location, count, transpose, value, GL_FLOAT_MAT2);
>+    setUniformMatrixfvInternal<2, 2>(location, count, transpose, value);
> }
> 
> void ProgramD3D::setUniformMatrix3fv(GLint location,
>@@ -1909,7 +2353,7 @@ void ProgramD3D::setUniformMatrix3fv(GLint location,
>                                      GLboolean transpose,
>                                      const GLfloat *value)
> {
>-    setUniformMatrixfvInternal<3, 3>(location, count, transpose, value, GL_FLOAT_MAT3);
>+    setUniformMatrixfvInternal<3, 3>(location, count, transpose, value);
> }
> 
> void ProgramD3D::setUniformMatrix4fv(GLint location,
>@@ -1917,7 +2361,7 @@ void ProgramD3D::setUniformMatrix4fv(GLint location,
>                                      GLboolean transpose,
>                                      const GLfloat *value)
> {
>-    setUniformMatrixfvInternal<4, 4>(location, count, transpose, value, GL_FLOAT_MAT4);
>+    setUniformMatrixfvInternal<4, 4>(location, count, transpose, value);
> }
> 
> void ProgramD3D::setUniformMatrix2x3fv(GLint location,
>@@ -1925,7 +2369,7 @@ void ProgramD3D::setUniformMatrix2x3fv(GLint location,
>                                        GLboolean transpose,
>                                        const GLfloat *value)
> {
>-    setUniformMatrixfvInternal<2, 3>(location, count, transpose, value, GL_FLOAT_MAT2x3);
>+    setUniformMatrixfvInternal<2, 3>(location, count, transpose, value);
> }
> 
> void ProgramD3D::setUniformMatrix3x2fv(GLint location,
>@@ -1933,7 +2377,7 @@ void ProgramD3D::setUniformMatrix3x2fv(GLint location,
>                                        GLboolean transpose,
>                                        const GLfloat *value)
> {
>-    setUniformMatrixfvInternal<3, 2>(location, count, transpose, value, GL_FLOAT_MAT3x2);
>+    setUniformMatrixfvInternal<3, 2>(location, count, transpose, value);
> }
> 
> void ProgramD3D::setUniformMatrix2x4fv(GLint location,
>@@ -1941,7 +2385,7 @@ void ProgramD3D::setUniformMatrix2x4fv(GLint location,
>                                        GLboolean transpose,
>                                        const GLfloat *value)
> {
>-    setUniformMatrixfvInternal<2, 4>(location, count, transpose, value, GL_FLOAT_MAT2x4);
>+    setUniformMatrixfvInternal<2, 4>(location, count, transpose, value);
> }
> 
> void ProgramD3D::setUniformMatrix4x2fv(GLint location,
>@@ -1949,7 +2393,7 @@ void ProgramD3D::setUniformMatrix4x2fv(GLint location,
>                                        GLboolean transpose,
>                                        const GLfloat *value)
> {
>-    setUniformMatrixfvInternal<4, 2>(location, count, transpose, value, GL_FLOAT_MAT4x2);
>+    setUniformMatrixfvInternal<4, 2>(location, count, transpose, value);
> }
> 
> void ProgramD3D::setUniformMatrix3x4fv(GLint location,
>@@ -1957,7 +2401,7 @@ void ProgramD3D::setUniformMatrix3x4fv(GLint location,
>                                        GLboolean transpose,
>                                        const GLfloat *value)
> {
>-    setUniformMatrixfvInternal<3, 4>(location, count, transpose, value, GL_FLOAT_MAT3x4);
>+    setUniformMatrixfvInternal<3, 4>(location, count, transpose, value);
> }
> 
> void ProgramD3D::setUniformMatrix4x3fv(GLint location,
>@@ -1965,7 +2409,7 @@ void ProgramD3D::setUniformMatrix4x3fv(GLint location,
>                                        GLboolean transpose,
>                                        const GLfloat *value)
> {
>-    setUniformMatrixfvInternal<4, 3>(location, count, transpose, value, GL_FLOAT_MAT4x3);
>+    setUniformMatrixfvInternal<4, 3>(location, count, transpose, value);
> }
> 
> void ProgramD3D::setUniform1iv(GLint location, GLsizei count, const GLint *v)
>@@ -2008,43 +2452,25 @@ void ProgramD3D::setUniform4uiv(GLint location, GLsizei count, const GLuint *v)
>     setUniformInternal(location, count, v, GL_UNSIGNED_INT_VEC4);
> }
> 
>-void ProgramD3D::setUniformBlockBinding(GLuint /*uniformBlockIndex*/,
>-                                        GLuint /*uniformBlockBinding*/)
>-{
>-}
>-
>-void ProgramD3D::defineUniformsAndAssignRegisters(const gl::Context *context)
>+void ProgramD3D::defineUniformsAndAssignRegisters()
> {
>     D3DUniformMap uniformMap;
>-    gl::Shader *computeShader = mState.getAttachedComputeShader();
>-    if (computeShader)
>-    {
>-        for (const sh::Uniform &computeUniform : computeShader->getUniforms(context))
>-        {
>-            if (computeUniform.staticUse)
>-            {
>-                defineUniformBase(computeShader, computeUniform, &uniformMap);
>-            }
>-        }
>-    }
>-    else
>+
>+    gl::ShaderBitSet attachedShaders;
>+    for (gl::ShaderType shaderType : gl::AllShaderTypes())
>     {
>-        gl::Shader *vertexShader = mState.getAttachedVertexShader();
>-        for (const sh::Uniform &vertexUniform : vertexShader->getUniforms(context))
>+        gl::Shader *shader = mState.getAttachedShader(shaderType);
>+        if (shader)
>         {
>-            if (vertexUniform.staticUse)
>+            for (const sh::Uniform &uniform : shader->getUniforms())
>             {
>-                defineUniformBase(vertexShader, vertexUniform, &uniformMap);
>+                if (uniform.active)
>+                {
>+                    defineUniformBase(shader, uniform, &uniformMap);
>+                }
>             }
>-        }
> 
>-        gl::Shader *fragmentShader = mState.getAttachedFragmentShader();
>-        for (const sh::Uniform &fragmentUniform : fragmentShader->getUniforms(context))
>-        {
>-            if (fragmentUniform.staticUse)
>-            {
>-                defineUniformBase(fragmentShader, fragmentUniform, &uniformMap);
>-            }
>+            attachedShaders.set(shader->getType());
>         }
>     }
> 
>@@ -2070,196 +2496,92 @@ void ProgramD3D::defineUniformsAndAssignRegisters(const gl::Context *context)
>     }
> 
>     assignAllSamplerRegisters();
>-    initializeUniformStorage();
>+    assignAllAtomicCounterRegisters();
>+    // Samplers and readonly images share shader input resource slot, adjust low value of
>+    // readonly image range.
>+    mUsedComputeReadonlyImageRange =
>+        gl::RangeUI(mUsedShaderSamplerRanges[gl::ShaderType::Compute].high(),
>+                    mUsedShaderSamplerRanges[gl::ShaderType::Compute].high());
>+    // Atomic counter buffers and non-readonly images share input resource slots
>+    mUsedComputeImageRange =
>+        gl::RangeUI(mUsedComputeAtomicCounterRange.high(), mUsedComputeAtomicCounterRange.high());
>+    assignAllImageRegisters();
>+    initializeUniformStorage(attachedShaders);
> }
> 
> void ProgramD3D::defineUniformBase(const gl::Shader *shader,
>                                    const sh::Uniform &uniform,
>                                    D3DUniformMap *uniformMap)
> {
>-    // Samplers get their registers assigned in assignAllSamplerRegisters.
>-    if (uniform.isBuiltIn() || gl::IsSamplerType(uniform.type))
>-    {
>-        defineUniform(shader->getType(), uniform, uniform.name, nullptr, uniformMap);
>-        return;
>-    }
>-
>-    const ShaderD3D *shaderD3D = GetImplAs<ShaderD3D>(shader);
>+    sh::DummyBlockEncoder dummyEncoder;
> 
>-    unsigned int startRegister = shaderD3D->getUniformRegister(uniform.name);
>-    ShShaderOutput outputType = shaderD3D->getCompilerOutputType();
>-    sh::HLSLBlockEncoder encoder(sh::HLSLBlockEncoder::GetStrategyFor(outputType), true);
>-    encoder.skipRegisters(startRegister);
>-
>-    defineUniform(shader->getType(), uniform, uniform.name, &encoder, uniformMap);
>-}
>-
>-D3DUniform *ProgramD3D::getD3DUniformByName(const std::string &name)
>-{
>-    for (D3DUniform *d3dUniform : mD3DUniforms)
>+    // Samplers get their registers assigned in assignAllSamplerRegisters, and images get their
>+    // registers assigned in assignAllImageRegisters.
>+    if (gl::IsSamplerType(uniform.type))
>     {
>-        if (d3dUniform->name == name)
>-        {
>-            return d3dUniform;
>-        }
>-    }
>-
>-    return nullptr;
>-}
>-
>-void ProgramD3D::defineStructUniformFields(GLenum shaderType,
>-                                           const std::vector<sh::ShaderVariable> &fields,
>-                                           const std::string &namePrefix,
>-                                           sh::HLSLBlockEncoder *encoder,
>-                                           D3DUniformMap *uniformMap)
>-{
>-    if (encoder)
>-        encoder->enterAggregateType();
>-
>-    for (size_t fieldIndex = 0; fieldIndex < fields.size(); fieldIndex++)
>-    {
>-        const sh::ShaderVariable &field  = fields[fieldIndex];
>-        const std::string &fieldFullName = (namePrefix + "." + field.name);
>-
>-        // Samplers get their registers assigned in assignAllSamplerRegisters.
>-        // Also they couldn't use the same encoder as the rest of the struct, since they are
>-        // extracted out of the struct by the shader translator.
>-        if (gl::IsSamplerType(field.type))
>-        {
>-            defineUniform(shaderType, field, fieldFullName, nullptr, uniformMap);
>-        }
>-        else
>-        {
>-            defineUniform(shaderType, field, fieldFullName, encoder, uniformMap);
>-        }
>+        UniformEncodingVisitorD3D visitor(shader->getType(), HLSLRegisterType::Texture,
>+                                          &dummyEncoder, uniformMap);
>+        sh::TraverseShaderVariable(uniform, false, &visitor);
>+        return;
>     }
> 
>-    if (encoder)
>-        encoder->exitAggregateType();
>-}
>-
>-void ProgramD3D::defineArrayOfStructsUniformFields(GLenum shaderType,
>-                                                   const sh::ShaderVariable &uniform,
>-                                                   unsigned int arrayNestingIndex,
>-                                                   const std::string &prefix,
>-                                                   sh::HLSLBlockEncoder *encoder,
>-                                                   D3DUniformMap *uniformMap)
>-{
>-    // Nested arrays are processed starting from outermost (arrayNestingIndex 0u) and ending at the
>-    // innermost.
>-    const unsigned int currentArraySize = uniform.getNestedArraySize(arrayNestingIndex);
>-    for (unsigned int arrayElement = 0u; arrayElement < currentArraySize; ++arrayElement)
>+    if (gl::IsImageType(uniform.type))
>     {
>-        const std::string &elementString = prefix + ArrayString(arrayElement);
>-        if (arrayNestingIndex + 1u < uniform.arraySizes.size())
>+        if (uniform.readonly)
>         {
>-            defineArrayOfStructsUniformFields(shaderType, uniform, arrayNestingIndex + 1u,
>-                                              elementString, encoder, uniformMap);
>+            UniformEncodingVisitorD3D visitor(shader->getType(), HLSLRegisterType::Texture,
>+                                              &dummyEncoder, uniformMap);
>+            sh::TraverseShaderVariable(uniform, false, &visitor);
>         }
>         else
>         {
>-            defineStructUniformFields(shaderType, uniform.fields, elementString, encoder,
>-                                      uniformMap);
>-        }
>-    }
>-}
>-
>-void ProgramD3D::defineArrayUniformElements(GLenum shaderType,
>-                                            const sh::ShaderVariable &uniform,
>-                                            const std::string &fullName,
>-                                            sh::HLSLBlockEncoder *encoder,
>-                                            D3DUniformMap *uniformMap)
>-{
>-    if (encoder)
>-        encoder->enterAggregateType();
>-
>-    sh::ShaderVariable uniformElement = uniform;
>-    uniformElement.arraySizes.pop_back();
>-    for (unsigned int arrayIndex = 0u; arrayIndex < uniform.getOutermostArraySize(); ++arrayIndex)
>-    {
>-        std::string elementFullName = fullName + ArrayString(arrayIndex);
>-        defineUniform(shaderType, uniformElement, elementFullName, encoder, uniformMap);
>-    }
>-
>-    if (encoder)
>-        encoder->exitAggregateType();
>-}
>-
>-void ProgramD3D::defineUniform(GLenum shaderType,
>-                               const sh::ShaderVariable &uniform,
>-                               const std::string &fullName,
>-                               sh::HLSLBlockEncoder *encoder,
>-                               D3DUniformMap *uniformMap)
>-{
>-    if (uniform.isStruct())
>-    {
>-        if (uniform.isArray())
>-        {
>-            defineArrayOfStructsUniformFields(shaderType, uniform, 0u, fullName, encoder,
>+            UniformEncodingVisitorD3D visitor(shader->getType(),
>+                                              HLSLRegisterType::UnorderedAccessView, &dummyEncoder,
>                                               uniformMap);
>+            sh::TraverseShaderVariable(uniform, false, &visitor);
>         }
>-        else
>-        {
>-            defineStructUniformFields(shaderType, uniform.fields, fullName, encoder, uniformMap);
>-        }
>+        mImageBindingMap[uniform.name] = uniform.binding;
>         return;
>     }
>-    if (uniform.isArrayOfArrays())
>+
>+    if (uniform.isBuiltIn() && !uniform.isEmulatedBuiltIn())
>     {
>-        defineArrayUniformElements(shaderType, uniform, fullName, encoder, uniformMap);
>+        UniformEncodingVisitorD3D visitor(shader->getType(), HLSLRegisterType::None, &dummyEncoder,
>+                                          uniformMap);
>+        sh::TraverseShaderVariable(uniform, false, &visitor);
>         return;
>     }
>-
>-    // Not a struct. Arrays are treated as aggregate types.
>-    if (uniform.isArray() && encoder)
>+    else if (gl::IsAtomicCounterType(uniform.type))
>     {
>-        encoder->enterAggregateType();
>+        UniformEncodingVisitorD3D visitor(shader->getType(), HLSLRegisterType::UnorderedAccessView,
>+                                          &dummyEncoder, uniformMap);
>+        sh::TraverseShaderVariable(uniform, false, &visitor);
>+        mAtomicBindingMap[uniform.name] = uniform.binding;
>+        return;
>     }
> 
>-    // Advance the uniform offset, to track registers allocation for structs
>-    sh::BlockMemberInfo blockInfo =
>-        encoder ? encoder->encodeType(uniform.type, uniform.arraySizes, false)
>-                : sh::BlockMemberInfo::getDefaultBlockInfo();
>-
>-    auto uniformMapEntry   = uniformMap->find(fullName);
>-    D3DUniform *d3dUniform = nullptr;
>+    const ShaderD3D *shaderD3D = GetImplAs<ShaderD3D>(shader);
>+    unsigned int startRegister = shaderD3D->getUniformRegister(uniform.name);
>+    ShShaderOutput outputType  = shaderD3D->getCompilerOutputType();
>+    sh::HLSLBlockEncoder encoder(sh::HLSLBlockEncoder::GetStrategyFor(outputType), true);
>+    encoder.skipRegisters(startRegister);
> 
>-    if (uniformMapEntry != uniformMap->end())
>-    {
>-        d3dUniform = uniformMapEntry->second;
>-    }
>-    else
>-    {
>-        d3dUniform              = new D3DUniform(uniform.type, fullName, uniform.arraySizes, true);
>-        (*uniformMap)[fullName] = d3dUniform;
>-    }
>+    UniformEncodingVisitorD3D visitor(shader->getType(), HLSLRegisterType::None, &encoder,
>+                                      uniformMap);
>+    sh::TraverseShaderVariable(uniform, false, &visitor);
>+}
> 
>-    if (encoder)
>+bool ProgramD3D::hasNamedUniform(const std::string &name)
>+{
>+    for (D3DUniform *d3dUniform : mD3DUniforms)
>     {
>-        d3dUniform->registerElement =
>-            static_cast<unsigned int>(sh::HLSLBlockEncoder::getBlockRegisterElement(blockInfo));
>-        unsigned int reg =
>-            static_cast<unsigned int>(sh::HLSLBlockEncoder::getBlockRegister(blockInfo));
>-        if (shaderType == GL_FRAGMENT_SHADER)
>-        {
>-            d3dUniform->psRegisterIndex = reg;
>-        }
>-        else if (shaderType == GL_VERTEX_SHADER)
>-        {
>-            d3dUniform->vsRegisterIndex = reg;
>-        }
>-        else
>-        {
>-            ASSERT(shaderType == GL_COMPUTE_SHADER);
>-            d3dUniform->csRegisterIndex = reg;
>-        }
>-
>-        // Arrays are treated as aggregate types
>-        if (uniform.isArray())
>+        if (d3dUniform->name == name)
>         {
>-            encoder->exitAggregateType();
>+            return true;
>         }
>     }
>+
>+    return false;
> }
> 
> // Assume count is already clamped.
>@@ -2270,8 +2592,8 @@ void ProgramD3D::setUniformImpl(const gl::VariableLocation &locationInfo,
>                                 uint8_t *targetData,
>                                 GLenum uniformType)
> {
>-    D3DUniform *targetUniform = mD3DUniforms[locationInfo.index];
>-    const int components      = targetUniform->typeInfo.componentCount;
>+    D3DUniform *targetUniform             = mD3DUniforms[locationInfo.index];
>+    const int components                  = targetUniform->typeInfo.componentCount;
>     const unsigned int arrayElementOffset = locationInfo.arrayIndex;
> 
>     if (targetUniform->typeInfo.type == uniformType)
>@@ -2321,97 +2643,41 @@ void ProgramD3D::setUniformInternal(GLint location, GLsizei count, const T *v, G
>         return;
>     }
> 
>-    if (targetUniform->vsData)
>+    for (gl::ShaderType shaderType : gl::AllShaderTypes())
>     {
>-        setUniformImpl(locationInfo, count, v, targetUniform->vsData, uniformType);
>-        mVertexUniformsDirty = true;
>-    }
>-
>-    if (targetUniform->psData)
>-    {
>-        setUniformImpl(locationInfo, count, v, targetUniform->psData, uniformType);
>-        mFragmentUniformsDirty = true;
>-    }
>-
>-    if (targetUniform->csData)
>-    {
>-        setUniformImpl(locationInfo, count, v, targetUniform->csData, uniformType);
>-        mComputeUniformsDirty = true;
>-    }
>-}
>-
>-template <int cols, int rows>
>-bool ProgramD3D::setUniformMatrixfvImpl(GLint location,
>-                                        GLsizei countIn,
>-                                        GLboolean transpose,
>-                                        const GLfloat *value,
>-                                        uint8_t *targetData,
>-                                        GLenum targetUniformType)
>-{
>-    D3DUniform *targetUniform = getD3DUniformFromLocation(location);
>-
>-    unsigned int elementCount       = targetUniform->getArraySizeProduct();
>-    unsigned int arrayElementOffset = mState.getUniformLocations()[location].arrayIndex;
>-    unsigned int count =
>-        std::min(elementCount - arrayElementOffset, static_cast<unsigned int>(countIn));
>-
>-    const unsigned int targetMatrixStride = (4 * rows);
>-    GLfloat *target                       = reinterpret_cast<GLfloat *>(
>-        targetData + arrayElementOffset * sizeof(GLfloat) * targetMatrixStride);
>-
>-    bool dirty = false;
>-
>-    for (unsigned int i = 0; i < count; i++)
>-    {
>-        // Internally store matrices as transposed versions to accomodate HLSL matrix indexing
>-        if (transpose == GL_FALSE)
>+        if (targetUniform->mShaderData[shaderType])
>         {
>-            dirty = TransposeExpandMatrix<GLfloat, cols, rows>(target, value) || dirty;
>+            setUniformImpl(locationInfo, count, v, targetUniform->mShaderData[shaderType],
>+                           uniformType);
>+            mShaderUniformsDirty.set(shaderType);
>         }
>-        else
>-        {
>-            dirty = ExpandMatrix<GLfloat, cols, rows>(target, value) || dirty;
>-        }
>-        target += targetMatrixStride;
>-        value += cols * rows;
>     }
>-
>-    return dirty;
> }
> 
> template <int cols, int rows>
> void ProgramD3D::setUniformMatrixfvInternal(GLint location,
>                                             GLsizei countIn,
>                                             GLboolean transpose,
>-                                            const GLfloat *value,
>-                                            GLenum targetUniformType)
>+                                            const GLfloat *value)
> {
>-    D3DUniform *targetUniform = getD3DUniformFromLocation(location);
>+    D3DUniform *targetUniform                   = getD3DUniformFromLocation(location);
>+    const gl::VariableLocation &uniformLocation = mState.getUniformLocations()[location];
>+    unsigned int arrayElementOffset             = uniformLocation.arrayIndex;
>+    unsigned int elementCount                   = targetUniform->getArraySizeProduct();
> 
>-    if (targetUniform->vsData)
>-    {
>-        if (setUniformMatrixfvImpl<cols, rows>(location, countIn, transpose, value,
>-                                               targetUniform->vsData, targetUniformType))
>-        {
>-            mVertexUniformsDirty = true;
>-        }
>-    }
>+    // Internally store matrices as transposed versions to accomodate HLSL matrix indexing
>+    transpose = !transpose;
> 
>-    if (targetUniform->psData)
>+    for (gl::ShaderType shaderType : gl::AllShaderTypes())
>     {
>-        if (setUniformMatrixfvImpl<cols, rows>(location, countIn, transpose, value,
>-                                               targetUniform->psData, targetUniformType))
>+        if (targetUniform->mShaderData[shaderType])
>         {
>-            mFragmentUniformsDirty = true;
>-        }
>-    }
>-
>-    if (targetUniform->csData)
>-    {
>-        if (setUniformMatrixfvImpl<cols, rows>(location, countIn, transpose, value,
>-                                               targetUniform->csData, targetUniformType))
>-        {
>-            mComputeUniformsDirty = true;
>+            if (SetFloatUniformMatrix<cols, rows>(arrayElementOffset, elementCount, countIn,
>+                                                  transpose, value,
>+                                                  targetUniform->mShaderData[shaderType]))
>+            {
>+                mShaderUniformsDirty.set(shaderType);
>+            }
>         }
>     }
> }
>@@ -2435,45 +2701,33 @@ void ProgramD3D::assignSamplerRegisters(size_t uniformIndex)
>     // mD3DUniforms. However, the sampler register info is stored in the shader only for the
>     // outermost array.
>     std::vector<unsigned int> subscripts;
>-    const std::string baseName  = gl::ParseResourceName(d3dUniform->name, &subscripts);
>-    unsigned int registerOffset = mState.getUniforms()[uniformIndex].flattenedOffsetInParentArrays *
>-                                  d3dUniform->getArraySizeProduct();
>+    const std::string baseName = gl::ParseResourceName(d3dUniform->name, &subscripts);
>+    unsigned int registerOffset =
>+        mState.getUniforms()[uniformIndex].parentArrayIndex() * d3dUniform->getArraySizeProduct();
> 
>-    const gl::Shader *computeShader = mState.getAttachedComputeShader();
>-    if (computeShader)
>-    {
>-        const ShaderD3D *computeShaderD3D = GetImplAs<ShaderD3D>(mState.getAttachedComputeShader());
>-        ASSERT(computeShaderD3D->hasUniform(baseName));
>-        d3dUniform->csRegisterIndex =
>-            computeShaderD3D->getUniformRegister(baseName) + registerOffset;
>-        ASSERT(d3dUniform->csRegisterIndex != GL_INVALID_INDEX);
>-        AssignSamplers(d3dUniform->csRegisterIndex, d3dUniform->typeInfo,
>-                       d3dUniform->getArraySizeProduct(), mSamplersCS, &mUsedComputeSamplerRange);
>-    }
>-    else
>+    bool hasUniform = false;
>+    for (gl::ShaderType shaderType : gl::AllShaderTypes())
>     {
>-        const ShaderD3D *vertexShaderD3D = GetImplAs<ShaderD3D>(mState.getAttachedVertexShader());
>-        const ShaderD3D *fragmentShaderD3D =
>-            GetImplAs<ShaderD3D>(mState.getAttachedFragmentShader());
>-        ASSERT(vertexShaderD3D->hasUniform(baseName) || fragmentShaderD3D->hasUniform(baseName));
>-        if (vertexShaderD3D->hasUniform(baseName))
>+        if (!mState.getAttachedShader(shaderType))
>         {
>-            d3dUniform->vsRegisterIndex =
>-                vertexShaderD3D->getUniformRegister(baseName) + registerOffset;
>-            ASSERT(d3dUniform->vsRegisterIndex != GL_INVALID_INDEX);
>-            AssignSamplers(d3dUniform->vsRegisterIndex, d3dUniform->typeInfo,
>-                           d3dUniform->getArraySizeProduct(), mSamplersVS,
>-                           &mUsedVertexSamplerRange);
>+            continue;
>         }
>-        if (fragmentShaderD3D->hasUniform(baseName))
>+
>+        const ShaderD3D *shaderD3D = GetImplAs<ShaderD3D>(mState.getAttachedShader(shaderType));
>+        if (shaderD3D->hasUniform(baseName))
>         {
>-            d3dUniform->psRegisterIndex =
>-                fragmentShaderD3D->getUniformRegister(baseName) + registerOffset;
>-            ASSERT(d3dUniform->psRegisterIndex != GL_INVALID_INDEX);
>-            AssignSamplers(d3dUniform->psRegisterIndex, d3dUniform->typeInfo,
>-                           d3dUniform->getArraySizeProduct(), mSamplersPS, &mUsedPixelSamplerRange);
>+            d3dUniform->mShaderRegisterIndexes[shaderType] =
>+                shaderD3D->getUniformRegister(baseName) + registerOffset;
>+            ASSERT(d3dUniform->mShaderRegisterIndexes[shaderType] != GL_INVALID_VALUE);
>+
>+            AssignSamplers(d3dUniform->mShaderRegisterIndexes[shaderType], d3dUniform->typeInfo,
>+                           d3dUniform->getArraySizeProduct(), mShaderSamplers[shaderType],
>+                           &mUsedShaderSamplerRanges[shaderType]);
>+            hasUniform = true;
>         }
>     }
>+
>+    ASSERT(hasUniform);
> }
> 
> // static
>@@ -2481,61 +2735,227 @@ void ProgramD3D::AssignSamplers(unsigned int startSamplerIndex,
>                                 const gl::UniformTypeInfo &typeInfo,
>                                 unsigned int samplerCount,
>                                 std::vector<Sampler> &outSamplers,
>-                                GLuint *outUsedRange)
>+                                gl::RangeUI *outUsedRange)
> {
>     unsigned int samplerIndex = startSamplerIndex;
>+    unsigned int low          = outUsedRange->low();
>+    unsigned int high         = outUsedRange->high();
> 
>     do
>     {
>         ASSERT(samplerIndex < outSamplers.size());
>         Sampler *sampler            = &outSamplers[samplerIndex];
>         sampler->active             = true;
>-        sampler->textureType        = typeInfo.samplerTextureType;
>+        sampler->textureType        = gl::FromGLenum<gl::TextureType>(typeInfo.textureType);
>         sampler->logicalTextureUnit = 0;
>-        *outUsedRange               = std::max(samplerIndex + 1, *outUsedRange);
>+        low                         = std::min(samplerIndex, low);
>+        high                        = std::max(samplerIndex + 1, high);
>         samplerIndex++;
>     } while (samplerIndex < startSamplerIndex + samplerCount);
>+
>+    ASSERT(low < high);
>+    *outUsedRange = gl::RangeUI(low, high);
>+}
>+
>+void ProgramD3D::assignAllImageRegisters()
>+{
>+    for (size_t uniformIndex = 0; uniformIndex < mD3DUniforms.size(); ++uniformIndex)
>+    {
>+        if (mD3DUniforms[uniformIndex]->isImage() && !mD3DUniforms[uniformIndex]->isImage2D())
>+        {
>+            assignImageRegisters(uniformIndex);
>+        }
>+    }
>+}
>+
>+void ProgramD3D::assignAllAtomicCounterRegisters()
>+{
>+    if (mAtomicBindingMap.empty())
>+    {
>+        return;
>+    }
>+    gl::ShaderType shaderType       = gl::ShaderType::Compute;
>+    const gl::Shader *computeShader = mState.getAttachedShader(shaderType);
>+    if (computeShader)
>+    {
>+        const ShaderD3D *computeShaderD3D = GetImplAs<ShaderD3D>(computeShader);
>+        auto &registerIndices             = mComputeAtomicCounterBufferRegisterIndices;
>+        unsigned int firstRegister        = GL_INVALID_VALUE;
>+        unsigned int lastRegister         = 0;
>+        for (auto &atomicBinding : mAtomicBindingMap)
>+        {
>+            ASSERT(computeShaderD3D->hasUniform(atomicBinding.first));
>+            unsigned int currentRegister =
>+                computeShaderD3D->getUniformRegister(atomicBinding.first);
>+            ASSERT(currentRegister != GL_INVALID_INDEX);
>+            const int kBinding = atomicBinding.second;
>+
>+            registerIndices[kBinding] = currentRegister;
>+
>+            firstRegister = std::min(firstRegister, currentRegister);
>+            lastRegister  = std::max(lastRegister, currentRegister);
>+        }
>+        ASSERT(firstRegister != GL_INVALID_VALUE);
>+        ASSERT(lastRegister != GL_INVALID_VALUE);
>+        mUsedComputeAtomicCounterRange = gl::RangeUI(firstRegister, lastRegister + 1);
>+    }
>+    else
>+    {
>+        // Implement atomic counters for non-compute shaders
>+        // http://anglebug.com/1729
>+        UNIMPLEMENTED();
>+    }
>+}
>+
>+void ProgramD3D::assignImageRegisters(size_t uniformIndex)
>+{
>+    D3DUniform *d3dUniform = mD3DUniforms[uniformIndex];
>+    ASSERT(d3dUniform->isImage());
>+    // If the uniform is an array of arrays, then we have separate entries for each inner array in
>+    // mD3DUniforms. However, the image register info is stored in the shader only for the
>+    // outermost array.
>+    std::vector<unsigned int> subscripts;
>+    const std::string baseName = gl::ParseResourceName(d3dUniform->name, &subscripts);
>+    unsigned int registerOffset =
>+        mState.getUniforms()[uniformIndex].parentArrayIndex() * d3dUniform->getArraySizeProduct();
>+
>+    const gl::Shader *computeShader = mState.getAttachedShader(gl::ShaderType::Compute);
>+    if (computeShader)
>+    {
>+        const ShaderD3D *computeShaderD3D =
>+            GetImplAs<ShaderD3D>(mState.getAttachedShader(gl::ShaderType::Compute));
>+        ASSERT(computeShaderD3D->hasUniform(baseName));
>+        d3dUniform->mShaderRegisterIndexes[gl::ShaderType::Compute] =
>+            computeShaderD3D->getUniformRegister(baseName) + registerOffset;
>+        ASSERT(d3dUniform->mShaderRegisterIndexes[gl::ShaderType::Compute] != GL_INVALID_INDEX);
>+        auto bindingIter = mImageBindingMap.find(baseName);
>+        ASSERT(bindingIter != mImageBindingMap.end());
>+        if (d3dUniform->regType == HLSLRegisterType::Texture)
>+        {
>+            AssignImages(d3dUniform->mShaderRegisterIndexes[gl::ShaderType::Compute],
>+                         bindingIter->second, d3dUniform->getArraySizeProduct(), mReadonlyImagesCS,
>+                         &mUsedComputeReadonlyImageRange);
>+        }
>+        else if (d3dUniform->regType == HLSLRegisterType::UnorderedAccessView)
>+        {
>+            AssignImages(d3dUniform->mShaderRegisterIndexes[gl::ShaderType::Compute],
>+                         bindingIter->second, d3dUniform->getArraySizeProduct(), mImagesCS,
>+                         &mUsedComputeImageRange);
>+        }
>+        else
>+        {
>+            UNREACHABLE();
>+        }
>+    }
>+    else
>+    {
>+        // TODO(xinghua.cao@intel.com): Implement image variables in vertex shader and pixel shader.
>+        UNIMPLEMENTED();
>+    }
>+}
>+
>+// static
>+void ProgramD3D::AssignImages(unsigned int startImageIndex,
>+                              int startLogicalImageUnit,
>+                              unsigned int imageCount,
>+                              std::vector<Image> &outImages,
>+                              gl::RangeUI *outUsedRange)
>+{
>+    unsigned int imageIndex = startImageIndex;
>+    unsigned int low        = outUsedRange->low();
>+    unsigned int high       = outUsedRange->high();
>+
>+    // If declare without a binding qualifier, any uniform image variable (include all elements of
>+    // unbound image array) shoud be bound to unit zero.
>+    if (startLogicalImageUnit == -1)
>+    {
>+        ASSERT(imageIndex < outImages.size());
>+        Image *image            = &outImages[imageIndex];
>+        image->active           = true;
>+        image->logicalImageUnit = 0;
>+        low                     = std::min(imageIndex, low);
>+        high                    = std::max(imageIndex + 1, high);
>+        ASSERT(low < high);
>+        *outUsedRange = gl::RangeUI(low, high);
>+        return;
>+    }
>+
>+    unsigned int logcalImageUnit = startLogicalImageUnit;
>+    do
>+    {
>+        ASSERT(imageIndex < outImages.size());
>+        Image *image            = &outImages[imageIndex];
>+        image->active           = true;
>+        image->logicalImageUnit = logcalImageUnit;
>+        low                     = std::min(imageIndex, low);
>+        high                    = std::max(imageIndex + 1, high);
>+        imageIndex++;
>+        logcalImageUnit++;
>+    } while (imageIndex < startImageIndex + imageCount);
>+
>+    ASSERT(low < high);
>+    *outUsedRange = gl::RangeUI(low, high);
>+}
>+
>+void ProgramD3D::assignImage2DRegisters(unsigned int startImageIndex,
>+                                        int startLogicalImageUnit,
>+                                        bool readonly)
>+{
>+    if (readonly)
>+    {
>+        AssignImages(startImageIndex, startLogicalImageUnit, 1, mReadonlyImagesCS,
>+                     &mUsedComputeReadonlyImageRange);
>+    }
>+    else
>+    {
>+        AssignImages(startImageIndex, startLogicalImageUnit, 1, mImagesCS, &mUsedComputeImageRange);
>+    }
> }
> 
> void ProgramD3D::reset()
> {
>     mVertexExecutables.clear();
>     mPixelExecutables.clear();
>+    mComputeExecutables.clear();
> 
>     for (auto &geometryExecutable : mGeometryExecutables)
>     {
>         geometryExecutable.reset(nullptr);
>     }
> 
>-    mComputeExecutable.reset(nullptr);
>-
>-    mVertexHLSL.clear();
>-    mVertexWorkarounds = angle::CompilerWorkaroundsD3D();
>+    for (gl::ShaderType shaderType : gl::AllShaderTypes())
>+    {
>+        mShaderHLSL[shaderType].clear();
>+        mShaderWorkarounds[shaderType] = CompilerWorkaroundsD3D();
>+    }
> 
>-    mPixelHLSL.clear();
>-    mPixelWorkarounds = angle::CompilerWorkaroundsD3D();
>-    mUsesFragDepth = false;
>+    mUsesFragDepth            = false;
>     mHasANGLEMultiviewEnabled = false;
>+    mUsesVertexID             = false;
>     mUsesViewID               = false;
>     mPixelShaderKey.clear();
>-    mUsesPointSize = false;
>+    mUsesPointSize         = false;
>     mUsesFlatInterpolation = false;
> 
>     SafeDeleteContainer(mD3DUniforms);
>     mD3DUniformBlocks.clear();
>+    mD3DShaderStorageBlocks.clear();
>+    mComputeAtomicCounterBufferRegisterIndices.fill({});
> 
>-    mVertexUniformStorage.reset(nullptr);
>-    mFragmentUniformStorage.reset(nullptr);
>-    mComputeUniformStorage.reset(nullptr);
>+    for (gl::ShaderType shaderType : gl::AllShaderTypes())
>+    {
>+        mShaderUniformStorages[shaderType].reset();
>+        mShaderSamplers[shaderType].clear();
>+    }
> 
>-    mSamplersPS.clear();
>-    mSamplersVS.clear();
>-    mSamplersCS.clear();
>+    mImagesCS.clear();
>+    mReadonlyImagesCS.clear();
> 
>-    mUsedVertexSamplerRange = 0;
>-    mUsedPixelSamplerRange  = 0;
>-    mUsedComputeSamplerRange = 0;
>-    mDirtySamplerMapping    = true;
>+    mUsedShaderSamplerRanges.fill({0, 0});
>+    mUsedComputeAtomicCounterRange = {0, 0};
>+    mDirtySamplerMapping           = true;
>+    mUsedComputeImageRange         = {0, 0};
>+    mUsedComputeReadonlyImageRange = {0, 0};
> 
>     mAttribLocationToD3DSemantic.fill(-1);
> 
>@@ -2543,7 +2963,7 @@ void ProgramD3D::reset()
> 
>     mGeometryShaderPreamble.clear();
> 
>-    dirtyAllUniforms();
>+    markUniformsClean();
> 
>     mCachedPixelExecutableIndex.reset();
>     mCachedVertexExecutableIndex.reset();
>@@ -2559,14 +2979,14 @@ unsigned int ProgramD3D::issueSerial()
>     return mCurrentSerial++;
> }
> 
>-void ProgramD3D::initAttribLocationsToD3DSemantic(const gl::Context *context)
>+void ProgramD3D::initAttribLocationsToD3DSemantic()
> {
>-    gl::Shader *vertexShader = mState.getAttachedVertexShader();
>+    gl::Shader *vertexShader = mState.getAttachedShader(gl::ShaderType::Vertex);
>     ASSERT(vertexShader != nullptr);
> 
>     // Init semantic index
>     int semanticIndex = 0;
>-    for (const sh::Attribute &attribute : vertexShader->getActiveAttributes(context))
>+    for (const sh::Attribute &attribute : vertexShader->getActiveAttributes())
>     {
>         int regCount    = gl::VariableRegisterCount(attribute.type);
>         GLuint location = mState.getAttributeLocation(attribute.name);
>@@ -2599,11 +3019,11 @@ void ProgramD3D::updateCachedInputLayout(Serial associatedSerial, const gl::Stat
>         {
>             if (mCachedInputLayout.size() < static_cast<size_t>(d3dSemantic + 1))
>             {
>-                mCachedInputLayout.resize(d3dSemantic + 1, gl::VERTEX_FORMAT_INVALID);
>+                mCachedInputLayout.resize(d3dSemantic + 1, angle::FormatID::NONE);
>             }
>             mCachedInputLayout[d3dSemantic] =
>-                GetVertexFormatType(vertexAttributes[locationIndex],
>-                                    state.getVertexAttribCurrentValue(locationIndex).Type);
>+                GetVertexFormatID(vertexAttributes[locationIndex],
>+                                  state.getVertexAttribCurrentValue(locationIndex).Type);
>         }
>     }
> 
>@@ -2639,6 +3059,25 @@ void ProgramD3D::updateCachedOutputLayout(const gl::Context *context,
>     updateCachedPixelExecutableIndex();
> }
> 
>+void ProgramD3D::updateCachedComputeImage2DBindLayout(const gl::Context *context)
>+{
>+    const auto &glState = context->getState();
>+    for (auto &image2DBindLayout : mComputeShaderImage2DBindLayoutCache)
>+    {
>+        const gl::ImageUnit &imageUnit = glState.getImageUnit(image2DBindLayout.first);
>+        if (imageUnit.texture.get())
>+        {
>+            image2DBindLayout.second = imageUnit.texture->getType();
>+        }
>+        else
>+        {
>+            image2DBindLayout.second = gl::TextureType::_2D;
>+        }
>+    }
>+
>+    updateCachedComputeExecutableIndex();
>+}
>+
> void ProgramD3D::gatherTransformFeedbackVaryings(const gl::VaryingPacking &varyingPacking,
>                                                  const BuiltinInfo &builtins)
> {
>@@ -2657,54 +3096,42 @@ void ProgramD3D::gatherTransformFeedbackVaryings(const gl::VaryingPacking &varyi
>         {
>             if (builtins.glPosition.enabled)
>             {
>-                mStreamOutVaryings.push_back(D3DVarying(builtins.glPosition.semantic,
>-                                                        builtins.glPosition.index, 4, outputSlot));
>+                mStreamOutVaryings.emplace_back(builtins.glPosition.semantic,
>+                                                builtins.glPosition.index, 4, outputSlot);
>             }
>         }
>         else if (tfVaryingName == "gl_FragCoord")
>         {
>             if (builtins.glFragCoord.enabled)
>             {
>-                mStreamOutVaryings.push_back(D3DVarying(builtins.glFragCoord.semantic,
>-                                                        builtins.glFragCoord.index, 4, outputSlot));
>+                mStreamOutVaryings.emplace_back(builtins.glFragCoord.semantic,
>+                                                builtins.glFragCoord.index, 4, outputSlot);
>             }
>         }
>         else if (tfVaryingName == "gl_PointSize")
>         {
>             if (builtins.glPointSize.enabled)
>             {
>-                mStreamOutVaryings.push_back(D3DVarying("PSIZE", 0, 1, outputSlot));
>+                mStreamOutVaryings.emplace_back("PSIZE", 0, 1, outputSlot);
>             }
>         }
>         else
>         {
>-            std::vector<unsigned int> subscripts;
>-            std::string baseName = gl::ParseResourceName(tfVaryingName, &subscripts);
>-            size_t subscript     = GL_INVALID_INDEX;
>-            if (!subscripts.empty())
>+            const auto &registerInfos = varyingPacking.getRegisterList();
>+            for (GLuint registerIndex = 0u; registerIndex < registerInfos.size(); ++registerIndex)
>             {
>-                subscript = subscripts.back();
>-            }
>-            for (const auto &registerInfo : varyingPacking.getRegisterList())
>-            {
>-                const auto &varying   = *registerInfo.packedVarying->varying;
>-                GLenum transposedType = gl::TransposeMatrixType(varying.type);
>-                int componentCount = gl::VariableColumnCount(transposedType);
>-                ASSERT(!varying.isBuiltIn());
>-
>-                // Transform feedback for varying structs is underspecified.
>-                // See Khronos bug 9856.
>-                // TODO(jmadill): Figure out how to be spec-compliant here.
>-                if (registerInfo.packedVarying->isStructField() || varying.isStruct())
>-                    continue;
>+                const auto &registerInfo = registerInfos[registerIndex];
>+                const auto &varying      = *registerInfo.packedVarying->varying;
>+                GLenum transposedType    = gl::TransposeMatrixType(varying.type);
>+                int componentCount       = gl::VariableColumnCount(transposedType);
>+                ASSERT(!varying.isBuiltIn() && !varying.isStruct());
> 
>                 // There can be more than one register assigned to a particular varying, and each
>                 // register needs its own stream out entry.
>-                if (baseName == registerInfo.packedVarying->varying->name &&
>-                    (subscript == GL_INVALID_INDEX || subscript == registerInfo.varyingArrayIndex))
>+                if (registerInfo.tfVaryingName() == tfVaryingName)
>                 {
>-                    mStreamOutVaryings.push_back(D3DVarying(
>-                        varyingSemantic, registerInfo.semanticIndex, componentCount, outputSlot));
>+                    mStreamOutVaryings.emplace_back(varyingSemantic, registerIndex, componentCount,
>+                                                    outputSlot);
>                 }
>             }
>         }
>@@ -2734,15 +3161,16 @@ bool ProgramD3D::hasVertexExecutableForCachedInputLayout()
>     return mCachedVertexExecutableIndex.valid();
> }
> 
>-bool ProgramD3D::hasGeometryExecutableForPrimitiveType(GLenum drawMode)
>+bool ProgramD3D::hasGeometryExecutableForPrimitiveType(const gl::State &state,
>+                                                       gl::PrimitiveMode drawMode)
> {
>-    if (!usesGeometryShader(drawMode))
>+    if (!usesGeometryShader(state, drawMode))
>     {
>         // No shader necessary mean we have the required (null) executable.
>         return true;
>     }
> 
>-    gl::PrimitiveType geometryShaderType = GetGeometryShaderTypeFromDrawMode(drawMode);
>+    gl::PrimitiveMode geometryShaderType = GetGeometryShaderTypeFromDrawMode(drawMode);
>     return mGeometryExecutables[geometryShaderType].get() != nullptr;
> }
> 
>@@ -2751,6 +3179,11 @@ bool ProgramD3D::hasPixelExecutableForCachedOutputLayout()
>     return mCachedPixelExecutableIndex.valid();
> }
> 
>+bool ProgramD3D::hasComputeExecutableForCachedImage2DBindLayout()
>+{
>+    return mCachedComputeExecutableIndex.valid();
>+}
>+
> template <typename DestT>
> void ProgramD3D::getUniformInternal(GLint location, DestT *dataOut) const
> {
>@@ -2762,8 +3195,7 @@ void ProgramD3D::getUniformInternal(GLint location, DestT *dataOut) const
> 
>     if (gl::IsMatrixType(uniform.type))
>     {
>-        GetMatrixUniform(gl::VariableColumnCount(uniform.type), gl::VariableRowCount(uniform.type),
>-                         dataOut, reinterpret_cast<const DestT *>(srcPointer));
>+        GetMatrixUniform(uniform.type, dataOut, reinterpret_cast<const DestT *>(srcPointer), true);
>     }
>     else
>     {
>@@ -2812,24 +3244,31 @@ void ProgramD3D::updateCachedPixelExecutableIndex()
>     }
> }
> 
>-void ProgramD3D::linkResources(const gl::Context *context,
>-                               const gl::ProgramLinkedResources &resources)
>+void ProgramD3D::updateCachedComputeExecutableIndex()
> {
>-    UniformBlockInfo uniformBlockInfo;
>-
>-    if (mState.getAttachedVertexShader())
>-    {
>-        uniformBlockInfo.getShaderBlockInfo(context, mState.getAttachedVertexShader());
>-    }
>-
>-    if (mState.getAttachedFragmentShader())
>+    mCachedComputeExecutableIndex.reset();
>+    for (size_t executableIndex = 0; executableIndex < mComputeExecutables.size();
>+         executableIndex++)
>     {
>-        uniformBlockInfo.getShaderBlockInfo(context, mState.getAttachedFragmentShader());
>+        if (mComputeExecutables[executableIndex]->matchesSignature(
>+                mComputeShaderImage2DBindLayoutCache))
>+        {
>+            mCachedComputeExecutableIndex = executableIndex;
>+            break;
>+        }
>     }
>+}
> 
>-    if (mState.getAttachedComputeShader())
>+void ProgramD3D::linkResources(const gl::ProgramLinkedResources &resources)
>+{
>+    InterfaceBlockInfo uniformBlockInfo;
>+    for (gl::ShaderType shaderType : gl::AllShaderTypes())
>     {
>-        uniformBlockInfo.getShaderBlockInfo(context, mState.getAttachedComputeShader());
>+        gl::Shader *shader = mState.getAttachedShader(shaderType);
>+        if (shader)
>+        {
>+            uniformBlockInfo.getShaderBlockInfo(shader->getUniformBlocks());
>+        }
>     }
> 
>     // Gather interface block info.
>@@ -2847,21 +3286,55 @@ void ProgramD3D::linkResources(const gl::Context *context,
>     resources.uniformBlockLinker.linkBlocks(getUniformBlockSize, getUniformBlockMemberInfo);
>     initializeUniformBlocks();
> 
>-    // TODO(jiajia.qin@intel.com): Determine correct shader storage block info.
>-    auto getShaderStorageBlockSize = [](const std::string &name, const std::string &mappedName,
>-                                        size_t *sizeOut) {
>-        *sizeOut = 0;
>-        return true;
>+    InterfaceBlockInfo shaderStorageBlockInfo;
>+    for (gl::ShaderType shaderType : gl::AllShaderTypes())
>+    {
>+        gl::Shader *shader = mState.getAttachedShader(shaderType);
>+        if (shader)
>+        {
>+            shaderStorageBlockInfo.getShaderBlockInfo(shader->getShaderStorageBlocks());
>+        }
>+    }
>+    auto getShaderStorageBlockSize = [&shaderStorageBlockInfo](const std::string &name,
>+                                                               const std::string &mappedName,
>+                                                               size_t *sizeOut) {
>+        return shaderStorageBlockInfo.getBlockSize(name, mappedName, sizeOut);
>     };
> 
>-    auto getShaderStorageBlockMemberInfo =
>-        [](const std::string &name, const std::string &mappedName, sh::BlockMemberInfo *infoOut) {
>-            *infoOut = sh::BlockMemberInfo::getDefaultBlockInfo();
>-            return true;
>-        };
>+    auto getShaderStorageBlockMemberInfo = [&shaderStorageBlockInfo](const std::string &name,
>+                                                                     const std::string &mappedName,
>+                                                                     sh::BlockMemberInfo *infoOut) {
>+        return shaderStorageBlockInfo.getBlockMemberInfo(name, mappedName, infoOut);
>+    };
> 
>     resources.shaderStorageBlockLinker.linkBlocks(getShaderStorageBlockSize,
>                                                   getShaderStorageBlockMemberInfo);
>+    initializeShaderStorageBlocks();
>+
>+    std::map<int, unsigned int> sizeMap;
>+    getAtomicCounterBufferSizeMap(sizeMap);
>+    resources.atomicCounterBufferLinker.link(sizeMap);
>+}
>+
>+void ProgramD3D::getAtomicCounterBufferSizeMap(std::map<int, unsigned int> &sizeMapOut) const
>+{
>+    for (unsigned int index : mState.getAtomicCounterUniformRange())
>+    {
>+        const gl::LinkedUniform &glUniform = mState.getUniforms()[index];
>+
>+        auto &bufferDataSize = sizeMapOut[glUniform.binding];
>+
>+        // Calculate the size of the buffer by finding the end of the last uniform with the same
>+        // binding. The end of the uniform is calculated by finding the initial offset of the
>+        // uniform and adding size of the uniform. For arrays, the size is the number of elements
>+        // times the element size (should always by 4 for atomic_units).
>+        unsigned dataOffset =
>+            glUniform.offset + (glUniform.getBasicTypeElementCount() * glUniform.getElementSize());
>+        if (dataOffset > bufferDataSize)
>+        {
>+            bufferDataSize = dataOffset;
>+        }
>+    }
> }
> 
> }  // namespace rx
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/ProgramD3D.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/ProgramD3D.h
>index 829757a73ef..6a0cdd260a0 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/ProgramD3D.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/ProgramD3D.h
>@@ -17,6 +17,7 @@
> #include "libANGLE/formatutils.h"
> #include "libANGLE/renderer/ProgramImpl.h"
> #include "libANGLE/renderer/d3d/DynamicHLSL.h"
>+#include "libANGLE/renderer/d3d/RendererD3D.h"
> #include "platform/WorkaroundsD3D.h"
> 
> namespace rx
>@@ -28,28 +29,34 @@ class ShaderExecutableD3D;
> #if !defined(ANGLE_COMPILE_OPTIMIZATION_LEVEL)
> // WARNING: D3DCOMPILE_OPTIMIZATION_LEVEL3 may lead to a DX9 shader compiler hang.
> // It should only be used selectively to work around specific bugs.
>-#define ANGLE_COMPILE_OPTIMIZATION_LEVEL D3DCOMPILE_OPTIMIZATION_LEVEL1
>+#    define ANGLE_COMPILE_OPTIMIZATION_LEVEL D3DCOMPILE_OPTIMIZATION_LEVEL1
> #endif
> 
>+enum class HLSLRegisterType : uint8_t
>+{
>+    None                = 0,
>+    Texture             = 1,
>+    UnorderedAccessView = 2
>+};
>+
> // Helper struct representing a single shader uniform
> // TODO(jmadill): Make uniform blocks shared between all programs, so we don't need separate
> // register indices.
> struct D3DUniform : private angle::NonCopyable
> {
>     D3DUniform(GLenum type,
>+               HLSLRegisterType reg,
>                const std::string &nameIn,
>                const std::vector<unsigned int> &arraySizesIn,
>                bool defaultBlock);
>     ~D3DUniform();
> 
>     bool isSampler() const;
>-
>+    bool isImage() const;
>+    bool isImage2D() const;
>     bool isArray() const { return !arraySizes.empty(); }
>     unsigned int getArraySizeProduct() const;
>-
>-    bool isReferencedByVertexShader() const;
>-    bool isReferencedByFragmentShader() const;
>-    bool isReferencedByComputeShader() const;
>+    bool isReferencedByShader(gl::ShaderType shaderType) const;
> 
>     const uint8_t *firstNonNullData() const;
>     const uint8_t *getDataPtrToElement(size_t elementIndex) const;
>@@ -60,14 +67,11 @@ struct D3DUniform : private angle::NonCopyable
>     std::vector<unsigned int> arraySizes;
> 
>     // Pointer to a system copies of the data. Separate pointers for each uniform storage type.
>-    uint8_t *vsData;
>-    uint8_t *psData;
>-    uint8_t *csData;
>+    gl::ShaderMap<uint8_t *> mShaderData;
> 
>     // Register information.
>-    unsigned int vsRegisterIndex;
>-    unsigned int psRegisterIndex;
>-    unsigned int csRegisterIndex;
>+    HLSLRegisterType regType;
>+    gl::ShaderMap<unsigned int> mShaderRegisterIndexes;
>     unsigned int registerCount;
> 
>     // Register "elements" are used for uniform structs in ES3, to appropriately identify single
>@@ -79,24 +83,17 @@ struct D3DUniform : private angle::NonCopyable
>     std::vector<GLint> mSamplerData;
> };
> 
>-struct D3DUniformBlock
>+struct D3DInterfaceBlock
> {
>-    D3DUniformBlock()
>-        : vsRegisterIndex(GL_INVALID_INDEX),
>-          psRegisterIndex(GL_INVALID_INDEX),
>-          csRegisterIndex(GL_INVALID_INDEX)
>+    D3DInterfaceBlock();
>+    D3DInterfaceBlock(const D3DInterfaceBlock &other);
>+
>+    bool activeInShader(gl::ShaderType shaderType) const
>     {
>+        return mShaderRegisterIndexes[shaderType] != GL_INVALID_INDEX;
>     }
> 
>-    bool vertexStaticUse() const { return vsRegisterIndex != GL_INVALID_INDEX; }
>-
>-    bool fragmentStaticUse() const { return psRegisterIndex != GL_INVALID_INDEX; }
>-
>-    bool computeStaticUse() const { return csRegisterIndex != GL_INVALID_INDEX; }
>-
>-    unsigned int vsRegisterIndex;
>-    unsigned int psRegisterIndex;
>-    unsigned int csRegisterIndex;
>+    gl::ShaderMap<unsigned int> mShaderRegisterIndexes;
> };
> 
> struct D3DVarying final
>@@ -120,11 +117,11 @@ class ProgramD3DMetadata final : angle::NonCopyable
> {
>   public:
>     ProgramD3DMetadata(RendererD3D *renderer,
>-                       const ShaderD3D *vertexShader,
>-                       const ShaderD3D *fragmentShader);
>+                       const gl::ShaderMap<const ShaderD3D *> &attachedShaders);
>+    ~ProgramD3DMetadata();
> 
>     int getRendererMajorShaderModel() const;
>-    bool usesBroadcast(const gl::ContextState &data) const;
>+    bool usesBroadcast(const gl::State &data) const;
>     bool usesFragDepth() const;
>     bool usesPointCoord() const;
>     bool usesFragCoord() const;
>@@ -132,6 +129,7 @@ class ProgramD3DMetadata final : angle::NonCopyable
>     bool usesInsertedPointCoordValue() const;
>     bool usesViewScale() const;
>     bool hasANGLEMultiviewEnabled() const;
>+    bool usesVertexID() const;
>     bool usesViewID() const;
>     bool canSelectViewInVertexShader() const;
>     bool addsPointCoordToVertexShader() const;
>@@ -146,13 +144,12 @@ class ProgramD3DMetadata final : angle::NonCopyable
>     const std::string mShaderModelSuffix;
>     const bool mUsesInstancedPointSpriteEmulation;
>     const bool mUsesViewScale;
>-    const bool mHasANGLEMultiviewEnabled;
>-    const bool mUsesViewID;
>     const bool mCanSelectViewInVertexShader;
>-    const ShaderD3D *mVertexShader;
>-    const ShaderD3D *mFragmentShader;
>+    const gl::ShaderMap<const ShaderD3D *> mAttachedShaders;
> };
> 
>+using D3DUniformMap = std::map<std::string, D3DUniform *>;
>+
> class ProgramD3D : public ProgramImpl
> {
>   public:
>@@ -161,11 +158,11 @@ class ProgramD3D : public ProgramImpl
> 
>     const std::vector<PixelShaderOutputVariable> &getPixelShaderKey() { return mPixelShaderKey; }
> 
>-    GLint getSamplerMapping(gl::SamplerType type,
>+    GLint getSamplerMapping(gl::ShaderType type,
>                             unsigned int samplerIndex,
>                             const gl::Caps &caps) const;
>-    GLenum getSamplerTextureType(gl::SamplerType type, unsigned int samplerIndex) const;
>-    GLuint getUsedSamplerRange(gl::SamplerType type) const;
>+    gl::TextureType getSamplerTextureType(gl::ShaderType type, unsigned int samplerIndex) const;
>+    gl::RangeUI getUsedSamplerRange(gl::ShaderType type) const;
> 
>     enum SamplerMapping
>     {
>@@ -175,31 +172,42 @@ class ProgramD3D : public ProgramImpl
> 
>     SamplerMapping updateSamplerMapping();
> 
>+    GLint getImageMapping(gl::ShaderType type,
>+                          unsigned int imageIndex,
>+                          bool readonly,
>+                          const gl::Caps &caps) const;
>+    gl::RangeUI getUsedImageRange(gl::ShaderType type, bool readonly) const;
>+
>     bool usesPointSize() const { return mUsesPointSize; }
>     bool usesPointSpriteEmulation() const;
>-    bool usesGeometryShader(GLenum drawMode) const;
>+    bool usesGeometryShader(const gl::State &state, gl::PrimitiveMode drawMode) const;
>     bool usesGeometryShaderForPointSpriteEmulation() const;
>     bool usesInstancedPointSpriteEmulation() const;
> 
>-    gl::LinkResult load(const gl::Context *context,
>-                        gl::InfoLog &infoLog,
>-                        gl::BinaryInputStream *stream) override;
>+    std::unique_ptr<LinkEvent> load(const gl::Context *context,
>+                                    gl::BinaryInputStream *stream,
>+                                    gl::InfoLog &infoLog) override;
>     void save(const gl::Context *context, gl::BinaryOutputStream *stream) override;
>     void setBinaryRetrievableHint(bool retrievable) override;
>     void setSeparable(bool separable) override;
> 
>-    gl::Error getVertexExecutableForCachedInputLayout(ShaderExecutableD3D **outExectuable,
>-                                                      gl::InfoLog *infoLog);
>-    gl::Error getGeometryExecutableForPrimitiveType(const gl::Context *context,
>-                                                    GLenum drawMode,
>-                                                    ShaderExecutableD3D **outExecutable,
>-                                                    gl::InfoLog *infoLog);
>-    gl::Error getPixelExecutableForCachedOutputLayout(ShaderExecutableD3D **outExectuable,
>-                                                      gl::InfoLog *infoLog);
>-    gl::Error getComputeExecutable(ShaderExecutableD3D **outExecutable);
>-    gl::LinkResult link(const gl::Context *context,
>-                        const gl::ProgramLinkedResources &resources,
>-                        gl::InfoLog &infoLog) override;
>+    angle::Result getVertexExecutableForCachedInputLayout(d3d::Context *context,
>+                                                          ShaderExecutableD3D **outExectuable,
>+                                                          gl::InfoLog *infoLog);
>+    angle::Result getGeometryExecutableForPrimitiveType(d3d::Context *errContext,
>+                                                        const gl::State &state,
>+                                                        gl::PrimitiveMode drawMode,
>+                                                        ShaderExecutableD3D **outExecutable,
>+                                                        gl::InfoLog *infoLog);
>+    angle::Result getPixelExecutableForCachedOutputLayout(d3d::Context *context,
>+                                                          ShaderExecutableD3D **outExectuable,
>+                                                          gl::InfoLog *infoLog);
>+    angle::Result getComputeExecutableForImage2DBindLayout(d3d::Context *context,
>+                                                           ShaderExecutableD3D **outExecutable,
>+                                                           gl::InfoLog *infoLog);
>+    std::unique_ptr<LinkEvent> link(const gl::Context *context,
>+                                    const gl::ProgramLinkedResources &resources,
>+                                    gl::InfoLog &infoLog) override;
>     GLboolean validate(const gl::Caps &caps, gl::InfoLog *infoLog) override;
> 
>     void setPathFragmentInputGen(const std::string &inputName,
>@@ -207,12 +215,15 @@ class ProgramD3D : public ProgramImpl
>                                  GLint components,
>                                  const GLfloat *coeffs) override;
> 
>-    void initializeUniformStorage();
>     void updateUniformBufferCache(const gl::Caps &caps,
>-                                  unsigned int reservedVertex,
>-                                  unsigned int reservedFragment);
>-    const std::vector<GLint> &getVertexUniformBufferCache() const;
>-    const std::vector<GLint> &getFragmentUniformBufferCache() const;
>+                                  const gl::ShaderMap<unsigned int> &reservedShaderRegisterIndexes);
>+
>+    unsigned int getAtomicCounterBufferRegisterIndex(GLuint binding,
>+                                                     gl::ShaderType shaderType) const;
>+
>+    unsigned int getShaderStorageBufferRegisterIndex(GLuint blockIndex,
>+                                                     gl::ShaderType shaderType) const;
>+    const std::vector<GLint> &getShaderUniformBufferCache(gl::ShaderType shaderType) const;
> 
>     void dirtyAllUniforms();
> 
>@@ -269,11 +280,10 @@ class ProgramD3D : public ProgramImpl
>     void getUniformiv(const gl::Context *context, GLint location, GLint *params) const override;
>     void getUniformuiv(const gl::Context *context, GLint location, GLuint *params) const override;
> 
>-    void setUniformBlockBinding(GLuint uniformBlockIndex, GLuint uniformBlockBinding) override;
>-
>-    UniformStorageD3D &getVertexUniformStorage() const { return *mVertexUniformStorage.get(); }
>-    UniformStorageD3D &getFragmentUniformStorage() const { return *mFragmentUniformStorage.get(); }
>-    UniformStorageD3D &getComputeUniformStorage() const { return *mComputeUniformStorage.get(); }
>+    UniformStorageD3D *getShaderUniformStorage(gl::ShaderType shaderType) const
>+    {
>+        return mShaderUniformStorages[shaderType].get();
>+    }
> 
>     unsigned int getSerial() const;
> 
>@@ -284,26 +294,51 @@ class ProgramD3D : public ProgramImpl
> 
>     void updateCachedInputLayout(Serial associatedSerial, const gl::State &state);
>     void updateCachedOutputLayout(const gl::Context *context, const gl::Framebuffer *framebuffer);
>+    void updateCachedComputeImage2DBindLayout(const gl::Context *context);
> 
>     bool isSamplerMappingDirty() { return mDirtySamplerMapping; }
> 
>     // Checks if we need to recompile certain shaders.
>     bool hasVertexExecutableForCachedInputLayout();
>-    bool hasGeometryExecutableForPrimitiveType(GLenum drawMode);
>+    bool hasGeometryExecutableForPrimitiveType(const gl::State &state, gl::PrimitiveMode drawMode);
>     bool hasPixelExecutableForCachedOutputLayout();
>+    bool hasComputeExecutableForCachedImage2DBindLayout();
>+
>+    bool anyShaderUniformsDirty() const { return mShaderUniformsDirty.any(); }
> 
>-    bool areVertexUniformsDirty() const { return mVertexUniformsDirty; }
>-    bool areFragmentUniformsDirty() const { return mFragmentUniformsDirty; }
>-    bool areComputeUniformsDirty() const { return mComputeUniformsDirty; }
>+    bool areShaderUniformsDirty(gl::ShaderType shaderType) const
>+    {
>+        return mShaderUniformsDirty[shaderType];
>+    }
>     const std::vector<D3DUniform *> &getD3DUniforms() const { return mD3DUniforms; }
>     void markUniformsClean();
> 
>+    const gl::ProgramState &getState() const { return mState; }
>+
>+    bool hasShaderStage(gl::ShaderType shaderType) const
>+    {
>+        return mState.getLinkedShaderStages()[shaderType];
>+    }
>+
>+    void assignImage2DRegisters(unsigned int startImageIndex,
>+                                int startLogicalImageUnit,
>+                                bool readonly);
>+    bool hasNamedUniform(const std::string &name);
>+
>+    bool usesVertexID() const { return mUsesVertexID; }
>+
>   private:
>     // These forward-declared tasks are used for multi-thread shader compiles.
>     class GetExecutableTask;
>     class GetVertexExecutableTask;
>     class GetPixelExecutableTask;
>     class GetGeometryExecutableTask;
>+    class GetComputeExecutableTask;
>+    class GraphicsProgramLinkEvent;
>+    class ComputeProgramLinkEvent;
>+
>+    class LoadBinaryTask;
>+    class LoadBinaryLinkEvent;
> 
>     class VertexExecutable
>     {
>@@ -359,42 +394,48 @@ class ProgramD3D : public ProgramImpl
>         ShaderExecutableD3D *mShaderExecutable;
>     };
> 
>+    class ComputeExecutable
>+    {
>+      public:
>+        ComputeExecutable(const gl::ImageUnitTextureTypeMap &signature,
>+                          std::unique_ptr<ShaderExecutableD3D> shaderExecutable);
>+        ~ComputeExecutable();
>+
>+        bool matchesSignature(const gl::ImageUnitTextureTypeMap &signature) const
>+        {
>+            return mSignature == signature;
>+        }
>+
>+        const gl::ImageUnitTextureTypeMap &signature() const { return mSignature; }
>+        ShaderExecutableD3D *shaderExecutable() const { return mShaderExecutable.get(); }
>+
>+      private:
>+        gl::ImageUnitTextureTypeMap mSignature;
>+        std::unique_ptr<ShaderExecutableD3D> mShaderExecutable;
>+    };
>+
>     struct Sampler
>     {
>         Sampler();
> 
>         bool active;
>         GLint logicalTextureUnit;
>-        GLenum textureType;
>+        gl::TextureType textureType;
>     };
> 
>-    typedef std::map<std::string, D3DUniform *> D3DUniformMap;
>+    struct Image
>+    {
>+        Image();
>+        bool active;
>+        GLint logicalImageUnit;
>+    };
> 
>-    void defineUniformsAndAssignRegisters(const gl::Context *context);
>+    void initializeUniformStorage(const gl::ShaderBitSet &availableShaderStages);
>+
>+    void defineUniformsAndAssignRegisters();
>     void defineUniformBase(const gl::Shader *shader,
>                            const sh::Uniform &uniform,
>                            D3DUniformMap *uniformMap);
>-    void defineStructUniformFields(GLenum shaderType,
>-                                   const std::vector<sh::ShaderVariable> &fields,
>-                                   const std::string &namePrefix,
>-                                   sh::HLSLBlockEncoder *encoder,
>-                                   D3DUniformMap *uniformMap);
>-    void defineArrayOfStructsUniformFields(GLenum shaderType,
>-                                           const sh::ShaderVariable &uniform,
>-                                           unsigned int arrayNestingIndex,
>-                                           const std::string &prefix,
>-                                           sh::HLSLBlockEncoder *encoder,
>-                                           D3DUniformMap *uniformMap);
>-    void defineArrayUniformElements(GLenum shaderType,
>-                                    const sh::ShaderVariable &uniform,
>-                                    const std::string &fullName,
>-                                    sh::HLSLBlockEncoder *encoder,
>-                                    D3DUniformMap *uniformMap);
>-    void defineUniform(GLenum shaderType,
>-                       const sh::ShaderVariable &uniform,
>-                       const std::string &fullName,
>-                       sh::HLSLBlockEncoder *encoder,
>-                       D3DUniformMap *uniformMap);
>     void assignAllSamplerRegisters();
>     void assignSamplerRegisters(size_t uniformIndex);
> 
>@@ -402,7 +443,18 @@ class ProgramD3D : public ProgramImpl
>                                const gl::UniformTypeInfo &typeInfo,
>                                unsigned int samplerCount,
>                                std::vector<Sampler> &outSamplers,
>-                               GLuint *outUsedRange);
>+                               gl::RangeUI *outUsedRange);
>+
>+    void assignAllImageRegisters();
>+    void assignAllAtomicCounterRegisters();
>+    void assignImageRegisters(size_t uniformIndex);
>+    static void AssignImages(unsigned int startImageIndex,
>+                             int startLogicalImageUnit,
>+                             unsigned int imageCount,
>+                             std::vector<Image> &outImages,
>+                             gl::RangeUI *outUsedRange);
>+
>+    void getAtomicCounterBufferSizeMap(std::map<int, unsigned int> &sizeMapOut) const;
> 
>     template <typename DestT>
>     void getUniformInternal(GLint location, DestT *dataOut) const;
>@@ -417,57 +469,56 @@ class ProgramD3D : public ProgramImpl
>     template <typename T>
>     void setUniformInternal(GLint location, GLsizei count, const T *v, GLenum uniformType);
> 
>-    template <int cols, int rows>
>-    bool setUniformMatrixfvImpl(GLint location,
>-                                GLsizei count,
>-                                GLboolean transpose,
>-                                const GLfloat *value,
>-                                uint8_t *targetData,
>-                                GLenum targetUniformType);
>-
>     template <int cols, int rows>
>     void setUniformMatrixfvInternal(GLint location,
>                                     GLsizei count,
>                                     GLboolean transpose,
>-                                    const GLfloat *value,
>-                                    GLenum targetUniformType);
>+                                    const GLfloat *value);
>+
>+    std::unique_ptr<LinkEvent> compileProgramExecutables(const gl::Context *context,
>+                                                         gl::InfoLog &infoLog);
>+    std::unique_ptr<LinkEvent> compileComputeExecutable(const gl::Context *context,
>+                                                        gl::InfoLog &infoLog);
> 
>-    gl::LinkResult compileProgramExecutables(const gl::Context *context, gl::InfoLog &infoLog);
>-    gl::LinkResult compileComputeExecutable(const gl::Context *context, gl::InfoLog &infoLog);
>+    angle::Result loadBinaryShaderExecutables(const gl::Context *context,
>+                                              gl::BinaryInputStream *stream,
>+                                              gl::InfoLog &infoLog);
> 
>     void gatherTransformFeedbackVaryings(const gl::VaryingPacking &varyings,
>                                          const BuiltinInfo &builtins);
>-    D3DUniform *getD3DUniformByName(const std::string &name);
>     D3DUniform *getD3DUniformFromLocation(GLint location);
>     const D3DUniform *getD3DUniformFromLocation(GLint location) const;
> 
>-    void initAttribLocationsToD3DSemantic(const gl::Context *context);
>+    void initAttribLocationsToD3DSemantic();
> 
>     void reset();
>     void initializeUniformBlocks();
>+    void initializeShaderStorageBlocks();
> 
>-    void updateCachedInputLayoutFromShader(const gl::Context *context);
>+    void updateCachedInputLayoutFromShader();
>     void updateCachedOutputLayoutFromShader();
>+    void updateCachedImage2DBindLayoutFromComputeShader();
>     void updateCachedVertexExecutableIndex();
>     void updateCachedPixelExecutableIndex();
>+    void updateCachedComputeExecutableIndex();
> 
>-    void linkResources(const gl::Context *context, const gl::ProgramLinkedResources &resources);
>+    void linkResources(const gl::ProgramLinkedResources &resources);
> 
>     RendererD3D *mRenderer;
>     DynamicHLSL *mDynamicHLSL;
> 
>     std::vector<std::unique_ptr<VertexExecutable>> mVertexExecutables;
>     std::vector<std::unique_ptr<PixelExecutable>> mPixelExecutables;
>-    std::vector<std::unique_ptr<ShaderExecutableD3D>> mGeometryExecutables;
>-    std::unique_ptr<ShaderExecutableD3D> mComputeExecutable;
>+    angle::PackedEnumMap<gl::PrimitiveMode, std::unique_ptr<ShaderExecutableD3D>>
>+        mGeometryExecutables;
>+    std::vector<std::unique_ptr<ComputeExecutable>> mComputeExecutables;
> 
>-    std::string mVertexHLSL;
>-    angle::CompilerWorkaroundsD3D mVertexWorkarounds;
>+    gl::ShaderMap<std::string> mShaderHLSL;
>+    gl::ShaderMap<angle::CompilerWorkaroundsD3D> mShaderWorkarounds;
> 
>-    std::string mPixelHLSL;
>-    angle::CompilerWorkaroundsD3D mPixelWorkarounds;
>     bool mUsesFragDepth;
>     bool mHasANGLEMultiviewEnabled;
>+    bool mUsesVertexID;
>     bool mUsesViewID;
>     std::vector<PixelShaderOutputVariable> mPixelShaderKey;
> 
>@@ -479,18 +530,18 @@ class ProgramD3D : public ProgramImpl
>     bool mUsesPointSize;
>     bool mUsesFlatInterpolation;
> 
>-    std::unique_ptr<UniformStorageD3D> mVertexUniformStorage;
>-    std::unique_ptr<UniformStorageD3D> mFragmentUniformStorage;
>-    std::unique_ptr<UniformStorageD3D> mComputeUniformStorage;
>+    gl::ShaderMap<std::unique_ptr<UniformStorageD3D>> mShaderUniformStorages;
> 
>-    std::vector<Sampler> mSamplersPS;
>-    std::vector<Sampler> mSamplersVS;
>-    std::vector<Sampler> mSamplersCS;
>-    GLuint mUsedVertexSamplerRange;
>-    GLuint mUsedPixelSamplerRange;
>-    GLuint mUsedComputeSamplerRange;
>+    gl::ShaderMap<std::vector<Sampler>> mShaderSamplers;
>+    gl::ShaderMap<gl::RangeUI> mUsedShaderSamplerRanges;
>     bool mDirtySamplerMapping;
> 
>+    std::vector<Image> mImagesCS;
>+    std::vector<Image> mReadonlyImagesCS;
>+    gl::RangeUI mUsedComputeImageRange;
>+    gl::RangeUI mUsedComputeReadonlyImageRange;
>+    gl::RangeUI mUsedComputeAtomicCounterRange;
>+
>     // Cache for pixel shader output layout to save reallocations.
>     std::vector<GLenum> mPixelShaderOutputLayoutCache;
>     Optional<size_t> mCachedPixelExecutableIndex;
>@@ -499,19 +550,25 @@ class ProgramD3D : public ProgramImpl
> 
>     unsigned int mSerial;
> 
>-    std::vector<GLint> mVertexUBOCache;
>-    std::vector<GLint> mFragmentUBOCache;
>+    gl::ShaderMap<std::vector<int>> mShaderUBOCaches;
>     VertexExecutable::Signature mCachedVertexSignature;
>     gl::InputLayout mCachedInputLayout;
>     Optional<size_t> mCachedVertexExecutableIndex;
> 
>     std::vector<D3DVarying> mStreamOutVaryings;
>     std::vector<D3DUniform *> mD3DUniforms;
>-    std::vector<D3DUniformBlock> mD3DUniformBlocks;
>-
>-    bool mVertexUniformsDirty;
>-    bool mFragmentUniformsDirty;
>-    bool mComputeUniformsDirty;
>+    std::map<std::string, int> mImageBindingMap;
>+    std::map<std::string, int> mAtomicBindingMap;
>+    std::vector<D3DInterfaceBlock> mD3DUniformBlocks;
>+    std::vector<D3DInterfaceBlock> mD3DShaderStorageBlocks;
>+    std::array<unsigned int, gl::IMPLEMENTATION_MAX_ATOMIC_COUNTER_BUFFERS>
>+        mComputeAtomicCounterBufferRegisterIndices;
>+
>+    std::vector<sh::Uniform> mImage2DUniforms;
>+    gl::ImageUnitTextureTypeMap mComputeShaderImage2DBindLayoutCache;
>+    Optional<size_t> mCachedComputeExecutableIndex;
>+
>+    gl::ShaderBitSet mShaderUniformsDirty;
> 
>     static unsigned int issueSerial();
>     static unsigned int mCurrentSerial;
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/RenderTargetD3D.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/RenderTargetD3D.cpp
>index 84b30aa1067..f8606c1f289 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/RenderTargetD3D.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/RenderTargetD3D.cpp
>@@ -12,14 +12,9 @@ namespace rx
> {
> unsigned int RenderTargetD3D::mCurrentSerial = 1;
> 
>-RenderTargetD3D::RenderTargetD3D()
>-    : mSerial(issueSerials(1))
>-{
>-}
>+RenderTargetD3D::RenderTargetD3D() : mSerial(issueSerials(1)) {}
> 
>-RenderTargetD3D::~RenderTargetD3D()
>-{
>-}
>+RenderTargetD3D::~RenderTargetD3D() {}
> 
> unsigned int RenderTargetD3D::getSerial() const
> {
>@@ -33,4 +28,4 @@ unsigned int RenderTargetD3D::issueSerials(unsigned int count)
>     return firstSerial;
> }
> 
>-}
>+}  // namespace rx
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/RenderTargetD3D.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/RenderTargetD3D.h
>index fde96133b03..8442df72626 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/RenderTargetD3D.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/RenderTargetD3D.h
>@@ -11,8 +11,8 @@
> #define LIBANGLE_RENDERER_D3D_RENDERTARGETD3D_H_
> 
> #include "common/angleutils.h"
>-#include "libANGLE/angletypes.h"
> #include "libANGLE/FramebufferAttachment.h"
>+#include "libANGLE/angletypes.h"
> 
> namespace rx
> {
>@@ -23,25 +23,22 @@ class RenderTargetD3D : public FramebufferAttachmentRenderTarget
>     RenderTargetD3D();
>     ~RenderTargetD3D() override;
> 
>-    virtual GLsizei getWidth() const = 0;
>-    virtual GLsizei getHeight() const = 0;
>-    virtual GLsizei getDepth() const = 0;
>+    virtual GLsizei getWidth() const         = 0;
>+    virtual GLsizei getHeight() const        = 0;
>+    virtual GLsizei getDepth() const         = 0;
>     virtual GLenum getInternalFormat() const = 0;
>-    virtual GLsizei getSamples() const = 0;
>+    virtual GLsizei getSamples() const       = 0;
>     gl::Extents getExtents() const { return gl::Extents(getWidth(), getHeight(), getDepth()); }
>     bool isMultisampled() const { return getSamples() > 0; }
> 
>     virtual unsigned int getSerial() const;
>     static unsigned int issueSerials(unsigned int count);
> 
>-    // Only currently applies to D3D11.
>-    virtual void signalDirty(const gl::Context *context) {}
>-
>   private:
>     const unsigned int mSerial;
>     static unsigned int mCurrentSerial;
> };
> 
>-}
>+}  // namespace rx
> 
>-#endif // LIBANGLE_RENDERER_D3D_RENDERTARGETD3D_H_
>+#endif  // LIBANGLE_RENDERER_D3D_RENDERTARGETD3D_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/RenderbufferD3D.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/RenderbufferD3D.cpp
>index d799e0b992e..a91a7be9b29 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/RenderbufferD3D.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/RenderbufferD3D.cpp
>@@ -6,20 +6,20 @@
> 
> // RenderbufferD3d.cpp: Implements the RenderbufferD3D class, a specialization of RenderbufferImpl
> 
>-
> #include "libANGLE/renderer/d3d/RenderbufferD3D.h"
> 
>+#include "libANGLE/Context.h"
> #include "libANGLE/Image.h"
>+#include "libANGLE/renderer/d3d/ContextD3D.h"
> #include "libANGLE/renderer/d3d/EGLImageD3D.h"
>-#include "libANGLE/renderer/d3d/RendererD3D.h"
> #include "libANGLE/renderer/d3d/RenderTargetD3D.h"
>+#include "libANGLE/renderer/d3d/RendererD3D.h"
> 
> namespace rx
> {
>-RenderbufferD3D::RenderbufferD3D(RendererD3D *renderer)
>-    : mRenderer(renderer), mRenderTarget(nullptr), mImage(nullptr)
>-{
>-}
>+RenderbufferD3D::RenderbufferD3D(const gl::RenderbufferState &state, RendererD3D *renderer)
>+    : RenderbufferImpl(state), mRenderer(renderer), mRenderTarget(nullptr), mImage(nullptr)
>+{}
> 
> RenderbufferD3D::~RenderbufferD3D()
> {
>@@ -27,25 +27,24 @@ RenderbufferD3D::~RenderbufferD3D()
>     mImage = nullptr;
> }
> 
>-gl::Error RenderbufferD3D::onDestroy(const gl::Context *context)
>+void RenderbufferD3D::onDestroy(const gl::Context *context)
> {
>-    deleteRenderTarget(context);
>-    return gl::NoError();
>+    SafeDelete(mRenderTarget);
> }
> 
>-gl::Error RenderbufferD3D::setStorage(const gl::Context *context,
>-                                      GLenum internalformat,
>-                                      size_t width,
>-                                      size_t height)
>+angle::Result RenderbufferD3D::setStorage(const gl::Context *context,
>+                                          GLenum internalformat,
>+                                          size_t width,
>+                                          size_t height)
> {
>     return setStorageMultisample(context, 0, internalformat, width, height);
> }
> 
>-gl::Error RenderbufferD3D::setStorageMultisample(const gl::Context *context,
>-                                                 size_t samples,
>-                                                 GLenum internalformat,
>-                                                 size_t width,
>-                                                 size_t height)
>+angle::Result RenderbufferD3D::setStorageMultisample(const gl::Context *context,
>+                                                     size_t samples,
>+                                                     GLenum internalformat,
>+                                                     size_t width,
>+                                                     size_t height)
> {
>     // If the renderbuffer parameters are queried, the calling function
>     // will expect one of the valid renderbuffer formats for use in
>@@ -59,37 +58,34 @@ gl::Error RenderbufferD3D::setStorageMultisample(const gl::Context *context,
> 
>     // ANGLE_framebuffer_multisample states GL_OUT_OF_MEMORY is generated on a failure to create
>     // the specified storage.
>-    // Because ES 3.0 already knows the exact number of supported samples, it would already have been
>-    // validated and generated GL_INVALID_VALUE.
>+    // Because ES 3.0 already knows the exact number of supported samples, it would already have
>+    // been validated and generated GL_INVALID_VALUE.
>     const gl::TextureCaps &formatCaps = mRenderer->getNativeTextureCaps().get(creationFormat);
>-    if (samples > formatCaps.getMaxSamples())
>-    {
>-        return gl::OutOfMemory() << "Renderbuffer format does not support " << samples
>-                                 << " samples, " << formatCaps.getMaxSamples()
>-                                 << " is the maximum.";
>-    }
>+    ANGLE_CHECK_GL_ALLOC(GetImplAs<ContextD3D>(context), samples <= formatCaps.getMaxSamples());
> 
>     RenderTargetD3D *newRT = nullptr;
>-    ANGLE_TRY(mRenderer->createRenderTarget(static_cast<int>(width), static_cast<int>(height),
>-                                            creationFormat, static_cast<GLsizei>(samples), &newRT));
>+    ANGLE_TRY(mRenderer->createRenderTarget(context, static_cast<int>(width),
>+                                            static_cast<int>(height), creationFormat,
>+                                            static_cast<GLsizei>(samples), &newRT));
> 
>-    deleteRenderTarget(context);
>+    SafeDelete(mRenderTarget);
>     mImage        = nullptr;
>     mRenderTarget = newRT;
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error RenderbufferD3D::setStorageEGLImageTarget(const gl::Context *context, egl::Image *image)
>+angle::Result RenderbufferD3D::setStorageEGLImageTarget(const gl::Context *context,
>+                                                        egl::Image *image)
> {
>     mImage = GetImplAs<EGLImageD3D>(image);
>-    deleteRenderTarget(context);
>+    SafeDelete(mRenderTarget);
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error RenderbufferD3D::getRenderTarget(const gl::Context *context,
>-                                           RenderTargetD3D **outRenderTarget)
>+angle::Result RenderbufferD3D::getRenderTarget(const gl::Context *context,
>+                                               RenderTargetD3D **outRenderTarget)
> {
>     if (mImage)
>     {
>@@ -98,33 +94,24 @@ gl::Error RenderbufferD3D::getRenderTarget(const gl::Context *context,
>     else
>     {
>         *outRenderTarget = mRenderTarget;
>-        return gl::NoError();
>+        return angle::Result::Continue;
>     }
> }
> 
>-gl::Error RenderbufferD3D::getAttachmentRenderTarget(const gl::Context *context,
>-                                                     GLenum /*binding*/,
>-                                                     const gl::ImageIndex & /*imageIndex*/,
>-                                                     FramebufferAttachmentRenderTarget **rtOut)
>+angle::Result RenderbufferD3D::getAttachmentRenderTarget(const gl::Context *context,
>+                                                         GLenum binding,
>+                                                         const gl::ImageIndex &imageIndex,
>+                                                         FramebufferAttachmentRenderTarget **rtOut)
> {
>     return getRenderTarget(context, reinterpret_cast<RenderTargetD3D **>(rtOut));
> }
> 
>-void RenderbufferD3D::deleteRenderTarget(const gl::Context *context)
>-{
>-    if (mRenderTarget)
>-    {
>-        mRenderTarget->signalDirty(context);
>-        SafeDelete(mRenderTarget);
>-    }
>-}
>-
>-gl::Error RenderbufferD3D::initializeContents(const gl::Context *context,
>-                                              const gl::ImageIndex &imageIndex)
>+angle::Result RenderbufferD3D::initializeContents(const gl::Context *context,
>+                                                  const gl::ImageIndex &imageIndex)
> {
>     RenderTargetD3D *renderTarget = nullptr;
>     ANGLE_TRY(getRenderTarget(context, &renderTarget));
>-    return mRenderer->initRenderTarget(renderTarget);
>+    return mRenderer->initRenderTarget(context, renderTarget);
> }
> 
> }  // namespace rx
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/RenderbufferD3D.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/RenderbufferD3D.h
>index b50eff7db73..e84f3998f27 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/RenderbufferD3D.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/RenderbufferD3D.h
>@@ -24,39 +24,37 @@ class SwapChainD3D;
> class RenderbufferD3D : public RenderbufferImpl
> {
>   public:
>-    RenderbufferD3D(RendererD3D *renderer);
>+    RenderbufferD3D(const gl::RenderbufferState &state, RendererD3D *renderer);
>     ~RenderbufferD3D() override;
> 
>-    gl::Error onDestroy(const gl::Context *context) override;
>+    void onDestroy(const gl::Context *context) override;
> 
>-    gl::Error setStorage(const gl::Context *context,
>-                         GLenum internalformat,
>-                         size_t width,
>-                         size_t height) override;
>-    gl::Error setStorageMultisample(const gl::Context *context,
>-                                    size_t samples,
>-                                    GLenum internalformat,
>-                                    size_t width,
>-                                    size_t height) override;
>-    gl::Error setStorageEGLImageTarget(const gl::Context *context, egl::Image *image) override;
>+    angle::Result setStorage(const gl::Context *context,
>+                             GLenum internalformat,
>+                             size_t width,
>+                             size_t height) override;
>+    angle::Result setStorageMultisample(const gl::Context *context,
>+                                        size_t samples,
>+                                        GLenum internalformat,
>+                                        size_t width,
>+                                        size_t height) override;
>+    angle::Result setStorageEGLImageTarget(const gl::Context *context, egl::Image *image) override;
> 
>-    gl::Error getRenderTarget(const gl::Context *context, RenderTargetD3D **outRenderTarget);
>-    gl::Error getAttachmentRenderTarget(const gl::Context *context,
>-                                        GLenum binding,
>-                                        const gl::ImageIndex &imageIndex,
>-                                        FramebufferAttachmentRenderTarget **rtOut) override;
>+    angle::Result getRenderTarget(const gl::Context *context, RenderTargetD3D **outRenderTarget);
>+    angle::Result getAttachmentRenderTarget(const gl::Context *context,
>+                                            GLenum binding,
>+                                            const gl::ImageIndex &imageIndex,
>+                                            FramebufferAttachmentRenderTarget **rtOut) override;
> 
>-    gl::Error initializeContents(const gl::Context *context,
>-                                 const gl::ImageIndex &imageIndex) override;
>+    angle::Result initializeContents(const gl::Context *context,
>+                                     const gl::ImageIndex &imageIndex) override;
> 
>   private:
>-    void deleteRenderTarget(const gl::Context *context);
>-
>     RendererD3D *mRenderer;
>     RenderTargetD3D *mRenderTarget;
>     EGLImageD3D *mImage;
> };
> 
>-}
>+}  // namespace rx
> 
>-#endif // LIBANGLE_RENDERER_D3D_RENDERBUFFERD3D_H_
>+#endif  // LIBANGLE_RENDERER_D3D_RENDERBUFFERD3D_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/RendererD3D.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/RendererD3D.cpp
>index 2167200a913..dc3f063bdf3 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/RendererD3D.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/RendererD3D.cpp
>@@ -39,24 +39,14 @@ RendererD3D::RendererD3D(egl::Display *display)
>       mCapsInitialized(false),
>       mWorkaroundsInitialized(false),
>       mDisjoint(false),
>-      mDeviceLost(false),
>-      mWorkerThreadPool(4)
>-{
>-}
>-
>-RendererD3D::~RendererD3D()
>-{
>-    cleanup();
>-}
>+      mDeviceLost(false)
>+{}
> 
>-void RendererD3D::cleanup()
>-{
>-    mIncompleteTextures.onDestroy(mDisplay->getProxyContext());
>-}
>+RendererD3D::~RendererD3D() {}
> 
>-bool RendererD3D::skipDraw(const gl::State &glState, GLenum drawMode)
>+bool RendererD3D::skipDraw(const gl::State &glState, gl::PrimitiveMode drawMode)
> {
>-    if (drawMode == GL_POINTS)
>+    if (drawMode == gl::PrimitiveMode::Points)
>     {
>         bool usesPointSize = GetImplAs<ProgramD3D>(glState.getProgram())->usesPointSize();
> 
>@@ -82,14 +72,7 @@ bool RendererD3D::skipDraw(const gl::State &glState, GLenum drawMode)
>     return false;
> }
> 
>-gl::Error RendererD3D::getIncompleteTexture(const gl::Context *context,
>-                                            GLenum type,
>-                                            gl::Texture **textureOut)
>-{
>-    return mIncompleteTextures.getIncompleteTexture(context, type, this, textureOut);
>-}
>-
>-GLenum RendererD3D::getResetStatus()
>+gl::GraphicsResetStatus RendererD3D::getResetStatus()
> {
>     if (!mDeviceLost)
>     {
>@@ -97,17 +80,17 @@ GLenum RendererD3D::getResetStatus()
>         {
>             mDeviceLost = true;
>             notifyDeviceLost();
>-            return GL_UNKNOWN_CONTEXT_RESET_EXT;
>+            return gl::GraphicsResetStatus::UnknownContextReset;
>         }
>-        return GL_NO_ERROR;
>+        return gl::GraphicsResetStatus::NoError;
>     }
> 
>     if (testDeviceResettable())
>     {
>-        return GL_NO_ERROR;
>+        return gl::GraphicsResetStatus::NoError;
>     }
> 
>-    return GL_UNKNOWN_CONTEXT_RESET_EXT;
>+    return gl::GraphicsResetStatus::UnknownContextReset;
> }
> 
> void RendererD3D::notifyDeviceLost()
>@@ -184,41 +167,26 @@ const gl::Limitations &RendererD3D::getNativeLimitations() const
>     return mNativeLimitations;
> }
> 
>-angle::WorkerThreadPool *RendererD3D::getWorkerThreadPool()
>-{
>-    return &mWorkerThreadPool;
>-}
>-
> Serial RendererD3D::generateSerial()
> {
>     return mSerialFactory.generate();
> }
> 
>-bool InstancedPointSpritesActive(ProgramD3D *programD3D, GLenum mode)
>+bool InstancedPointSpritesActive(ProgramD3D *programD3D, gl::PrimitiveMode mode)
> {
>     return programD3D->usesPointSize() && programD3D->usesInstancedPointSpriteEmulation() &&
>-           mode == GL_POINTS;
>-}
>-
>-gl::Error RendererD3D::initRenderTarget(RenderTargetD3D *renderTarget)
>-{
>-    return clearRenderTarget(renderTarget, gl::ColorF(0, 0, 0, 0), 1, 0);
>+           mode == gl::PrimitiveMode::Points;
> }
> 
>-gl::Error RendererD3D::initializeMultisampleTextureToBlack(const gl::Context *context,
>-                                                           gl::Texture *glTexture)
>+angle::Result RendererD3D::initRenderTarget(const gl::Context *context,
>+                                            RenderTargetD3D *renderTarget)
> {
>-    ASSERT(glTexture->getTarget() == GL_TEXTURE_2D_MULTISAMPLE);
>-    TextureD3D *textureD3D        = GetImplAs<TextureD3D>(glTexture);
>-    gl::ImageIndex index          = gl::ImageIndex::Make2DMultisample();
>-    RenderTargetD3D *renderTarget = nullptr;
>-    ANGLE_TRY(textureD3D->getRenderTarget(context, index, &renderTarget));
>-    return clearRenderTarget(renderTarget, gl::ColorF(0.0f, 0.0f, 0.0f, 1.0f), 1.0f, 0);
>+    return clearRenderTarget(context, renderTarget, gl::ColorF(0, 0, 0, 0), 1, 0);
> }
> 
> unsigned int GetBlendSampleMask(const gl::State &glState, int samples)
> {
>-    unsigned int mask   = 0;
>+    unsigned int mask = 0;
>     if (glState.isSampleCoverageEnabled())
>     {
>         GLfloat coverageValue = glState.getSampleCoverageValue();
>@@ -257,4 +225,15 @@ unsigned int GetBlendSampleMask(const gl::State &glState, int samples)
>     return mask;
> }
> 
>+GLenum DefaultGLErrorCode(HRESULT hr)
>+{
>+    switch (hr)
>+    {
>+        case D3DERR_OUTOFVIDEOMEMORY:
>+        case E_OUTOFMEMORY:
>+            return GL_OUT_OF_MEMORY;
>+        default:
>+            return GL_INVALID_OPERATION;
>+    }
>+}
> }  // namespace rx
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/RendererD3D.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/RendererD3D.h
>index dcc98f2ec62..8a108c22ad5 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/RendererD3D.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/RendererD3D.h
>@@ -14,10 +14,9 @@
> #include "common/Color.h"
> #include "common/MemoryBuffer.h"
> #include "common/debug.h"
>-#include "libANGLE/ContextState.h"
> #include "libANGLE/Device.h"
>+#include "libANGLE/State.h"
> #include "libANGLE/Version.h"
>-#include "libANGLE/WorkerThread.h"
> #include "libANGLE/angletypes.h"
> #include "libANGLE/formatutils.h"
> #include "libANGLE/renderer/d3d/VertexDataManager.h"
>@@ -32,11 +31,12 @@ class ConfigSet;
> 
> namespace gl
> {
>+class ErrorSet;
> class FramebufferState;
> class InfoLog;
> class Texture;
> struct LinkedVarying;
>-}
>+}  // namespace gl
> 
> namespace rx
> {
>@@ -73,6 +73,52 @@ enum RendererClass
>     RENDERER_D3D9
> };
> 
>+// A d3d::Context wraps error handling.
>+namespace d3d
>+{
>+class Context : angle::NonCopyable
>+{
>+  public:
>+    Context() {}
>+    virtual ~Context() {}
>+
>+    virtual void handleResult(HRESULT hr,
>+                              const char *message,
>+                              const char *file,
>+                              const char *function,
>+                              unsigned int line) = 0;
>+};
>+}  // namespace d3d
>+
>+// ANGLE_TRY for HRESULT errors.
>+#define ANGLE_TRY_HR(CONTEXT, EXPR, MESSAGE)                                                     \
>+    do                                                                                           \
>+    {                                                                                            \
>+        auto ANGLE_LOCAL_VAR = (EXPR);                                                           \
>+        if (ANGLE_UNLIKELY(FAILED(ANGLE_LOCAL_VAR)))                                             \
>+        {                                                                                        \
>+            CONTEXT->handleResult(ANGLE_LOCAL_VAR, MESSAGE, __FILE__, ANGLE_FUNCTION, __LINE__); \
>+            return angle::Result::Stop;                                                          \
>+        }                                                                                        \
>+    } while (0)
>+
>+#define ANGLE_CHECK_HR(CONTEXT, EXPR, MESSAGE, ERROR)                                  \
>+    do                                                                                 \
>+    {                                                                                  \
>+        if (ANGLE_UNLIKELY(!(EXPR)))                                                   \
>+        {                                                                              \
>+            CONTEXT->handleResult(ERROR, MESSAGE, __FILE__, ANGLE_FUNCTION, __LINE__); \
>+            return angle::Result::Stop;                                                \
>+        }                                                                              \
>+    } while (0)
>+
>+#define ANGLE_HR_UNREACHABLE(context) \
>+    UNREACHABLE();                    \
>+    ANGLE_CHECK_HR(context, false, "Unreachble code reached.", E_FAIL)
>+
>+// Check if the device is lost every 10 failures to get the query data
>+constexpr unsigned int kPollingD3DDeviceLostCheckFrequency = 10;
>+
> // Useful for unit testing
> class BufferFactoryD3D : angle::NonCopyable
> {
>@@ -81,24 +127,25 @@ class BufferFactoryD3D : angle::NonCopyable
>     virtual ~BufferFactoryD3D() {}
> 
>     virtual VertexBuffer *createVertexBuffer() = 0;
>-    virtual IndexBuffer *createIndexBuffer() = 0;
>+    virtual IndexBuffer *createIndexBuffer()   = 0;
> 
>     // TODO(jmadill): add VertexFormatCaps
>-    virtual VertexConversionType getVertexConversionType(gl::VertexFormatType vertexFormatType) const = 0;
>-    virtual GLenum getVertexComponentType(gl::VertexFormatType vertexFormatType) const = 0;
>+    virtual VertexConversionType getVertexConversionType(angle::FormatID vertexFormatID) const = 0;
>+    virtual GLenum getVertexComponentType(angle::FormatID vertexFormatID) const                = 0;
> 
>     // Warning: you should ensure binding really matches attrib.bindingIndex before using this
>     // function.
>-    virtual gl::ErrorOrResult<unsigned int> getVertexSpaceRequired(
>-        const gl::VertexAttribute &attrib,
>-        const gl::VertexBinding &binding,
>-        GLsizei count,
>-        GLsizei instances) const = 0;
>+    virtual angle::Result getVertexSpaceRequired(const gl::Context *context,
>+                                                 const gl::VertexAttribute &attrib,
>+                                                 const gl::VertexBinding &binding,
>+                                                 size_t count,
>+                                                 GLsizei instances,
>+                                                 unsigned int *bytesRequiredOut) const = 0;
> };
> 
>-using AttribIndexArray = std::array<int, gl::MAX_VERTEX_ATTRIBS>;
>+using AttribIndexArray = gl::AttribArray<int>;
> 
>-class RendererD3D : public BufferFactoryD3D, public MultisampleTextureInitializer
>+class RendererD3D : public BufferFactoryD3D
> {
>   public:
>     explicit RendererD3D(egl::Display *display);
>@@ -106,20 +153,20 @@ class RendererD3D : public BufferFactoryD3D, public MultisampleTextureInitialize
> 
>     virtual egl::Error initialize() = 0;
> 
>-    virtual egl::ConfigSet generateConfigs() = 0;
>+    virtual egl::ConfigSet generateConfigs()                                            = 0;
>     virtual void generateDisplayExtensions(egl::DisplayExtensions *outExtensions) const = 0;
> 
>-    virtual ContextImpl *createContext(const gl::ContextState &state) = 0;
>+    virtual ContextImpl *createContext(const gl::State &state, gl::ErrorSet *errorSet) = 0;
> 
>     std::string getVendorString() const;
> 
>-    virtual int getMinorShaderModel() const = 0;
>+    virtual int getMinorShaderModel() const          = 0;
>     virtual std::string getShaderModelSuffix() const = 0;
> 
>     // Direct3D Specific methods
>     virtual DeviceIdentifier getAdapterIdentifier() const = 0;
> 
>-    virtual bool isValidNativeWindow(EGLNativeWindowType window) const = 0;
>+    virtual bool isValidNativeWindow(EGLNativeWindowType window) const                  = 0;
>     virtual NativeWindowD3D *createNativeWindow(EGLNativeWindowType window,
>                                                 const egl::Config *config,
>                                                 const egl::AttributeMap &attribs) const = 0;
>@@ -130,12 +177,12 @@ class RendererD3D : public BufferFactoryD3D, public MultisampleTextureInitialize
>                                           GLenum backBufferFormat,
>                                           GLenum depthBufferFormat,
>                                           EGLint orientation,
>-                                          EGLint samples) = 0;
>+                                          EGLint samples)                          = 0;
>     virtual egl::Error getD3DTextureInfo(const egl::Config *configuration,
>                                          IUnknown *d3dTexture,
>                                          EGLint *width,
>                                          EGLint *height,
>-                                         GLenum *fboFormat) const = 0;
>+                                         const angle::Format **angleFormat) const  = 0;
>     virtual egl::Error validateShareHandle(const egl::Config *config,
>                                            HANDLE shareHandle,
>                                            const egl::AttributeMap &attribs) const = 0;
>@@ -145,145 +192,183 @@ class RendererD3D : public BufferFactoryD3D, public MultisampleTextureInitialize
>     const angle::WorkaroundsD3D &getWorkarounds() const;
> 
>     // Pixel operations
>-    virtual gl::Error copyImage2D(const gl::Context *context,
>-                                  const gl::Framebuffer *framebuffer,
>-                                  const gl::Rectangle &sourceRect,
>-                                  GLenum destFormat,
>-                                  const gl::Offset &destOffset,
>-                                  TextureStorage *storage,
>-                                  GLint level) = 0;
>-    virtual gl::Error copyImageCube(const gl::Context *context,
>-                                    const gl::Framebuffer *framebuffer,
>-                                    const gl::Rectangle &sourceRect,
>-                                    GLenum destFormat,
>-                                    const gl::Offset &destOffset,
>-                                    TextureStorage *storage,
>-                                    GLenum target,
>-                                    GLint level) = 0;
>-    virtual gl::Error copyImage3D(const gl::Context *context,
>-                                  const gl::Framebuffer *framebuffer,
>-                                  const gl::Rectangle &sourceRect,
>-                                  GLenum destFormat,
>-                                  const gl::Offset &destOffset,
>-                                  TextureStorage *storage,
>-                                  GLint level) = 0;
>-    virtual gl::Error copyImage2DArray(const gl::Context *context,
>-                                       const gl::Framebuffer *framebuffer,
>-                                       const gl::Rectangle &sourceRect,
>-                                       GLenum destFormat,
>-                                       const gl::Offset &destOffset,
>-                                       TextureStorage *storage,
>-                                       GLint level) = 0;
>-
>-    virtual gl::Error copyTexture(const gl::Context *context,
>-                                  const gl::Texture *source,
>-                                  GLint sourceLevel,
>-                                  const gl::Rectangle &sourceRect,
>-                                  GLenum destFormat,
>-                                  const gl::Offset &destOffset,
>-                                  TextureStorage *storage,
>-                                  GLenum destTarget,
>-                                  GLint destLevel,
>-                                  bool unpackFlipY,
>-                                  bool unpackPremultiplyAlpha,
>-                                  bool unpackUnmultiplyAlpha) = 0;
>-    virtual gl::Error copyCompressedTexture(const gl::Context *context,
>-                                            const gl::Texture *source,
>-                                            GLint sourceLevel,
>-                                            TextureStorage *storage,
>-                                            GLint destLevel) = 0;
>+    virtual angle::Result copyImage2D(const gl::Context *context,
>+                                      const gl::Framebuffer *framebuffer,
>+                                      const gl::Rectangle &sourceRect,
>+                                      GLenum destFormat,
>+                                      const gl::Offset &destOffset,
>+                                      TextureStorage *storage,
>+                                      GLint level)      = 0;
>+    virtual angle::Result copyImageCube(const gl::Context *context,
>+                                        const gl::Framebuffer *framebuffer,
>+                                        const gl::Rectangle &sourceRect,
>+                                        GLenum destFormat,
>+                                        const gl::Offset &destOffset,
>+                                        TextureStorage *storage,
>+                                        gl::TextureTarget target,
>+                                        GLint level)    = 0;
>+    virtual angle::Result copyImage3D(const gl::Context *context,
>+                                      const gl::Framebuffer *framebuffer,
>+                                      const gl::Rectangle &sourceRect,
>+                                      GLenum destFormat,
>+                                      const gl::Offset &destOffset,
>+                                      TextureStorage *storage,
>+                                      GLint level)      = 0;
>+    virtual angle::Result copyImage2DArray(const gl::Context *context,
>+                                           const gl::Framebuffer *framebuffer,
>+                                           const gl::Rectangle &sourceRect,
>+                                           GLenum destFormat,
>+                                           const gl::Offset &destOffset,
>+                                           TextureStorage *storage,
>+                                           GLint level) = 0;
>+
>+    virtual angle::Result copyTexture(const gl::Context *context,
>+                                      const gl::Texture *source,
>+                                      GLint sourceLevel,
>+                                      gl::TextureTarget srcTarget,
>+                                      const gl::Box &sourceBox,
>+                                      GLenum destFormat,
>+                                      GLenum destType,
>+                                      const gl::Offset &destOffset,
>+                                      TextureStorage *storage,
>+                                      gl::TextureTarget destTarget,
>+                                      GLint destLevel,
>+                                      bool unpackFlipY,
>+                                      bool unpackPremultiplyAlpha,
>+                                      bool unpackUnmultiplyAlpha) = 0;
>+    virtual angle::Result copyCompressedTexture(const gl::Context *context,
>+                                                const gl::Texture *source,
>+                                                GLint sourceLevel,
>+                                                TextureStorage *storage,
>+                                                GLint destLevel)  = 0;
> 
>     // RenderTarget creation
>-    virtual gl::Error createRenderTarget(int width, int height, GLenum format, GLsizei samples, RenderTargetD3D **outRT) = 0;
>-    virtual gl::Error createRenderTargetCopy(RenderTargetD3D *source, RenderTargetD3D **outRT) = 0;
>+    virtual angle::Result createRenderTarget(const gl::Context *context,
>+                                             int width,
>+                                             int height,
>+                                             GLenum format,
>+                                             GLsizei samples,
>+                                             RenderTargetD3D **outRT)     = 0;
>+    virtual angle::Result createRenderTargetCopy(const gl::Context *context,
>+                                                 RenderTargetD3D *source,
>+                                                 RenderTargetD3D **outRT) = 0;
> 
>     // Shader operations
>-    virtual gl::Error loadExecutable(const uint8_t *function,
>-                                     size_t length,
>-                                     gl::ShaderType type,
>-                                     const std::vector<D3DVarying> &streamOutVaryings,
>-                                     bool separatedOutputBuffers,
>-                                     ShaderExecutableD3D **outExecutable)      = 0;
>-    virtual gl::Error compileToExecutable(gl::InfoLog &infoLog,
>-                                          const std::string &shaderHLSL,
>-                                          gl::ShaderType type,
>-                                          const std::vector<D3DVarying> &streamOutVaryings,
>-                                          bool separatedOutputBuffers,
>-                                          const angle::CompilerWorkaroundsD3D &workarounds,
>-                                          ShaderExecutableD3D **outExectuable) = 0;
>-    virtual gl::Error ensureHLSLCompilerInitialized()                          = 0;
>+    virtual angle::Result loadExecutable(d3d::Context *context,
>+                                         const uint8_t *function,
>+                                         size_t length,
>+                                         gl::ShaderType type,
>+                                         const std::vector<D3DVarying> &streamOutVaryings,
>+                                         bool separatedOutputBuffers,
>+                                         ShaderExecutableD3D **outExecutable)      = 0;
>+    virtual angle::Result compileToExecutable(d3d::Context *context,
>+                                              gl::InfoLog &infoLog,
>+                                              const std::string &shaderHLSL,
>+                                              gl::ShaderType type,
>+                                              const std::vector<D3DVarying> &streamOutVaryings,
>+                                              bool separatedOutputBuffers,
>+                                              const angle::CompilerWorkaroundsD3D &workarounds,
>+                                              ShaderExecutableD3D **outExectuable) = 0;
>+    virtual angle::Result ensureHLSLCompilerInitialized(d3d::Context *context)     = 0;
> 
>     virtual UniformStorageD3D *createUniformStorage(size_t storageSize) = 0;
> 
>     // Image operations
>-    virtual ImageD3D *createImage() = 0;
>-    virtual gl::Error generateMipmap(const gl::Context *context,
>-                                     ImageD3D *dest,
>-                                     ImageD3D *source) = 0;
>-    virtual gl::Error generateMipmapUsingD3D(const gl::Context *context,
>-                                             TextureStorage *storage,
>-                                             const gl::TextureState &textureState) = 0;
>-    virtual gl::Error copyImage(const gl::Context *context,
>-                                ImageD3D *dest,
>-                                ImageD3D *source,
>-                                const gl::Rectangle &sourceRect,
>-                                const gl::Offset &destOffset,
>-                                bool unpackFlipY,
>-                                bool unpackPremultiplyAlpha,
>-                                bool unpackUnmultiplyAlpha)                 = 0;
>-    virtual TextureStorage *createTextureStorage2D(SwapChainD3D *swapChain) = 0;
>+    virtual ImageD3D *createImage()                                                        = 0;
>+    virtual angle::Result generateMipmap(const gl::Context *context,
>+                                         ImageD3D *dest,
>+                                         ImageD3D *source)                                 = 0;
>+    virtual angle::Result generateMipmapUsingD3D(const gl::Context *context,
>+                                                 TextureStorage *storage,
>+                                                 const gl::TextureState &textureState)     = 0;
>+    virtual angle::Result copyImage(const gl::Context *context,
>+                                    ImageD3D *dest,
>+                                    ImageD3D *source,
>+                                    const gl::Box &sourceBox,
>+                                    const gl::Offset &destOffset,
>+                                    bool unpackFlipY,
>+                                    bool unpackPremultiplyAlpha,
>+                                    bool unpackUnmultiplyAlpha)                            = 0;
>+    virtual TextureStorage *createTextureStorage2D(SwapChainD3D *swapChain)                = 0;
>     virtual TextureStorage *createTextureStorageEGLImage(EGLImageD3D *eglImage,
>                                                          RenderTargetD3D *renderTargetD3D) = 0;
>     virtual TextureStorage *createTextureStorageExternal(
>         egl::Stream *stream,
>-        const egl::Stream::GLTextureDescription &desc) = 0;
>-    virtual TextureStorage *createTextureStorage2D(GLenum internalformat, bool renderTarget, GLsizei width, GLsizei height, int levels, bool hintLevelZeroOnly) = 0;
>-    virtual TextureStorage *createTextureStorageCube(GLenum internalformat, bool renderTarget, int size, int levels, bool hintLevelZeroOnly) = 0;
>-    virtual TextureStorage *createTextureStorage3D(GLenum internalformat, bool renderTarget, GLsizei width, GLsizei height, GLsizei depth, int levels) = 0;
>-    virtual TextureStorage *createTextureStorage2DArray(GLenum internalformat, bool renderTarget, GLsizei width, GLsizei height, GLsizei depth, int levels) = 0;
>+        const egl::Stream::GLTextureDescription &desc)                                        = 0;
>+    virtual TextureStorage *createTextureStorage2D(GLenum internalformat,
>+                                                   bool renderTarget,
>+                                                   GLsizei width,
>+                                                   GLsizei height,
>+                                                   int levels,
>+                                                   bool hintLevelZeroOnly)                    = 0;
>+    virtual TextureStorage *createTextureStorageCube(GLenum internalformat,
>+                                                     bool renderTarget,
>+                                                     int size,
>+                                                     int levels,
>+                                                     bool hintLevelZeroOnly)                  = 0;
>+    virtual TextureStorage *createTextureStorage3D(GLenum internalformat,
>+                                                   bool renderTarget,
>+                                                   GLsizei width,
>+                                                   GLsizei height,
>+                                                   GLsizei depth,
>+                                                   int levels)                                = 0;
>+    virtual TextureStorage *createTextureStorage2DArray(GLenum internalformat,
>+                                                        bool renderTarget,
>+                                                        GLsizei width,
>+                                                        GLsizei height,
>+                                                        GLsizei depth,
>+                                                        int levels)                           = 0;
>     virtual TextureStorage *createTextureStorage2DMultisample(GLenum internalformat,
>                                                               GLsizei width,
>                                                               GLsizei height,
>                                                               int levels,
>                                                               int samples,
>-                                                              bool fixedSampleLocations) = 0;
>+                                                              bool fixedSampleLocations)      = 0;
>+    virtual TextureStorage *createTextureStorage2DMultisampleArray(GLenum internalformat,
>+                                                                   GLsizei width,
>+                                                                   GLsizei height,
>+                                                                   GLsizei depth,
>+                                                                   int levels,
>+                                                                   int samples,
>+                                                                   bool fixedSampleLocations) = 0;
> 
>     // Buffer-to-texture and Texture-to-buffer copies
>     virtual bool supportsFastCopyBufferToTexture(GLenum internalFormat) const = 0;
>-    virtual gl::Error fastCopyBufferToTexture(const gl::Context *context,
>-                                              const gl::PixelUnpackState &unpack,
>-                                              unsigned int offset,
>-                                              RenderTargetD3D *destRenderTarget,
>-                                              GLenum destinationFormat,
>-                                              GLenum sourcePixelsType,
>-                                              const gl::Box &destArea) = 0;
>+    virtual angle::Result fastCopyBufferToTexture(const gl::Context *context,
>+                                                  const gl::PixelUnpackState &unpack,
>+                                                  unsigned int offset,
>+                                                  RenderTargetD3D *destRenderTarget,
>+                                                  GLenum destinationFormat,
>+                                                  GLenum sourcePixelsType,
>+                                                  const gl::Box &destArea)    = 0;
> 
>     // Device lost
>-    GLenum getResetStatus();
>+    gl::GraphicsResetStatus getResetStatus();
>     void notifyDeviceLost();
>-    virtual bool resetDevice() = 0;
>+    virtual bool resetDevice()          = 0;
>     virtual bool testDeviceLost()       = 0;
>     virtual bool testDeviceResettable() = 0;
> 
>     virtual RendererClass getRendererClass() const = 0;
>-    virtual void *getD3DDevice() = 0;
>+    virtual void *getD3DDevice()                   = 0;
> 
>     void setGPUDisjoint();
> 
>     GLint getGPUDisjoint();
>     GLint64 getTimestamp();
> 
>-    virtual gl::Error clearRenderTarget(RenderTargetD3D *renderTarget,
>-                                        const gl::ColorF &clearColorValue,
>-                                        const float clearDepthValue,
>-                                        const unsigned int clearStencilValue) = 0;
>+    virtual angle::Result clearRenderTarget(const gl::Context *context,
>+                                            RenderTargetD3D *renderTarget,
>+                                            const gl::ColorF &clearColorValue,
>+                                            const float clearDepthValue,
>+                                            const unsigned int clearStencilValue) = 0;
> 
>-    virtual egl::Error getEGLDevice(DeviceImpl **device) = 0;
>+    virtual DeviceImpl *createEGLDevice() = 0;
> 
>     bool presentPathFastEnabled() const { return mPresentPathFastEnabled; }
> 
>     // Stream creation
>-    virtual StreamProducerImpl *createStreamProducerD3DTextureNV12(
>+    virtual StreamProducerImpl *createStreamProducerD3DTexture(
>         egl::Stream::ConsumerType consumerType,
>         const egl::AttributeMap &attribs) = 0;
> 
>@@ -297,31 +382,24 @@ class RendererD3D : public BufferFactoryD3D, public MultisampleTextureInitialize
> 
>     virtual gl::Version getMaxSupportedESVersion() const = 0;
> 
>-    gl::Error initRenderTarget(RenderTargetD3D *renderTarget);
>-
>-    angle::WorkerThreadPool *getWorkerThreadPool();
>+    angle::Result initRenderTarget(const gl::Context *context, RenderTargetD3D *renderTarget);
> 
>-    gl::Error getIncompleteTexture(const gl::Context *context,
>-                                   GLenum type,
>-                                   gl::Texture **textureOut);
>+    virtual angle::Result getIncompleteTexture(const gl::Context *context,
>+                                               gl::TextureType type,
>+                                               gl::Texture **textureOut) = 0;
> 
>     Serial generateSerial();
> 
>     virtual bool canSelectViewInVertexShader() const = 0;
> 
>-    gl::Error initializeMultisampleTextureToBlack(const gl::Context *context,
>-                                                  gl::Texture *glTexture) override;
>-
>   protected:
>-    virtual bool getLUID(LUID *adapterLuid) const = 0;
>+    virtual bool getLUID(LUID *adapterLuid) const                    = 0;
>     virtual void generateCaps(gl::Caps *outCaps,
>                               gl::TextureCapsMap *outTextureCaps,
>                               gl::Extensions *outExtensions,
>                               gl::Limitations *outLimitations) const = 0;
> 
>-    void cleanup();
>-
>-    bool skipDraw(const gl::State &glState, GLenum drawMode);
>+    bool skipDraw(const gl::State &glState, gl::PrimitiveMode drawMode);
> 
>     egl::Display *mDisplay;
> 
>@@ -338,22 +416,18 @@ class RendererD3D : public BufferFactoryD3D, public MultisampleTextureInitialize
>     mutable gl::Extensions mNativeExtensions;
>     mutable gl::Limitations mNativeLimitations;
> 
>-    IncompleteTextureSet mIncompleteTextures;
>-
>     mutable bool mWorkaroundsInitialized;
>     mutable angle::WorkaroundsD3D mWorkarounds;
> 
>     bool mDisjoint;
>     bool mDeviceLost;
> 
>-    angle::WorkerThreadPool mWorkerThreadPool;
>-
>     SerialFactory mSerialFactory;
> };
> 
> unsigned int GetBlendSampleMask(const gl::State &glState, int samples);
>-bool InstancedPointSpritesActive(ProgramD3D *programD3D, GLenum mode);
>-
>+bool InstancedPointSpritesActive(ProgramD3D *programD3D, gl::PrimitiveMode mode);
>+GLenum DefaultGLErrorCode(HRESULT hr);
> }  // namespace rx
> 
>-#endif // LIBANGLE_RENDERER_D3D_RENDERERD3D_H_
>+#endif  // LIBANGLE_RENDERER_D3D_RENDERERD3D_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/SamplerD3D.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/SamplerD3D.h
>index 3f8f5b9d8dd..dbb5036081a 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/SamplerD3D.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/SamplerD3D.h
>@@ -20,6 +20,6 @@ class SamplerD3D : public SamplerImpl
>     SamplerD3D(const gl::SamplerState &state) : SamplerImpl(state) {}
>     ~SamplerD3D() override {}
> };
>-}
>+}  // namespace rx
> 
> #endif  // LIBANGLE_RENDERER_D3D_SAMPLERD3D_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/ShaderD3D.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/ShaderD3D.cpp
>index 2a8f1fb11c1..8a2b81bdbba 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/ShaderD3D.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/ShaderD3D.cpp
>@@ -11,38 +11,79 @@
> #include "common/utilities.h"
> #include "libANGLE/Caps.h"
> #include "libANGLE/Compiler.h"
>+#include "libANGLE/Context.h"
> #include "libANGLE/Shader.h"
> #include "libANGLE/features.h"
> #include "libANGLE/renderer/d3d/ProgramD3D.h"
> #include "libANGLE/renderer/d3d/RendererD3D.h"
> 
>-// Definitions local to the translation unit
>-namespace
>+namespace rx
> {
> 
>-const char *GetShaderTypeString(GLenum type)
>+class TranslateTaskD3D : public angle::Closure
> {
>-    switch (type)
>+  public:
>+    TranslateTaskD3D(ShHandle handle,
>+                     ShCompileOptions options,
>+                     const std::string &source,
>+                     const std::string &sourcePath)
>+        : mHandle(handle),
>+          mOptions(options),
>+          mSource(source),
>+          mSourcePath(sourcePath),
>+          mResult(false)
>+    {}
>+
>+    void operator()() override
>     {
>-        case GL_VERTEX_SHADER:
>-            return "VERTEX";
>+        std::vector<const char *> srcStrings;
>+        if (!mSourcePath.empty())
>+        {
>+            srcStrings.push_back(mSourcePath.c_str());
>+        }
>+        srcStrings.push_back(mSource.c_str());
> 
>-        case GL_FRAGMENT_SHADER:
>-            return "FRAGMENT";
>+        mResult = sh::Compile(mHandle, &srcStrings[0], srcStrings.size(), mOptions);
>+    }
> 
>-        case GL_COMPUTE_SHADER:
>-            return "COMPUTE";
>+    bool getResult() { return mResult; }
> 
>-        default:
>-            UNREACHABLE();
>-            return "";
>-    }
>-}
>+  private:
>+    ShHandle mHandle;
>+    ShCompileOptions mOptions;
>+    std::string mSource;
>+    std::string mSourcePath;
>+    bool mResult;
>+};
> 
>-}  // anonymous namespace
>+using PostTranslateFunctor =
>+    std::function<bool(gl::ShCompilerInstance *compiler, std::string *infoLog)>;
> 
>-namespace rx
>+class WaitableCompileEventD3D final : public WaitableCompileEvent
> {
>+  public:
>+    WaitableCompileEventD3D(std::shared_ptr<angle::WaitableEvent> waitableEvent,
>+                            gl::ShCompilerInstance *compilerInstance,
>+                            PostTranslateFunctor &&postTranslateFunctor,
>+                            std::shared_ptr<TranslateTaskD3D> translateTask)
>+        : WaitableCompileEvent(waitableEvent),
>+          mCompilerInstance(compilerInstance),
>+          mPostTranslateFunctor(std::move(postTranslateFunctor)),
>+          mTranslateTask(translateTask)
>+    {}
>+
>+    bool getResult() override { return mTranslateTask->getResult(); }
>+
>+    bool postTranslate(std::string *infoLog) override
>+    {
>+        return mPostTranslateFunctor(mCompilerInstance, infoLog);
>+    }
>+
>+  private:
>+    gl::ShCompilerInstance *mCompilerInstance;
>+    PostTranslateFunctor mPostTranslateFunctor;
>+    std::shared_ptr<TranslateTaskD3D> mTranslateTask;
>+};
> 
> ShaderD3D::ShaderD3D(const gl::ShaderState &data,
>                      const angle::WorkaroundsD3D &workarounds,
>@@ -73,15 +114,21 @@ ShaderD3D::ShaderD3D(const gl::ShaderState &data,
>     {
>         mAdditionalOptions |= SH_EMULATE_ISNAN_FLOAT_FUNCTION;
>     }
>-    if (extensions.multiview)
>+    if (workarounds.skipVSConstantRegisterZero && mData.getShaderType() == gl::ShaderType::Vertex)
>+    {
>+        mAdditionalOptions |= SH_SKIP_D3D_CONSTANT_REGISTER_ZERO;
>+    }
>+    if (workarounds.forceAtomicValueResolution)
>+    {
>+        mAdditionalOptions |= SH_FORCE_ATOMIC_VALUE_RESOLUTION;
>+    }
>+    if (extensions.multiview2)
>     {
>         mAdditionalOptions |= SH_INITIALIZE_BUILTINS_FOR_INSTANCED_MULTIVIEW;
>     }
> }
> 
>-ShaderD3D::~ShaderD3D()
>-{
>-}
>+ShaderD3D::~ShaderD3D() {}
> 
> std::string ShaderD3D::getDebugInfo() const
> {
>@@ -90,7 +137,7 @@ std::string ShaderD3D::getDebugInfo() const
>         return "";
>     }
> 
>-    return mDebugInfo + std::string("\n// ") + GetShaderTypeString(mData.getShaderType()) +
>+    return mDebugInfo + std::string("\n// ") + gl::GetShaderTypeString(mData.getShaderType()) +
>            " SHADER END\n";
> }
> 
>@@ -100,19 +147,20 @@ void ShaderD3D::uncompile()
>     // set by compileToHLSL
>     mCompilerOutputType = SH_ESSL_OUTPUT;
> 
>-    mUsesMultipleRenderTargets = false;
>-    mUsesFragColor = false;
>-    mUsesFragData = false;
>-    mUsesFragCoord = false;
>-    mUsesFrontFacing = false;
>-    mUsesPointSize = false;
>-    mUsesPointCoord = false;
>-    mUsesDepthRange = false;
>-    mUsesFragDepth = false;
>+    mUsesMultipleRenderTargets   = false;
>+    mUsesFragColor               = false;
>+    mUsesFragData                = false;
>+    mUsesFragCoord               = false;
>+    mUsesFrontFacing             = false;
>+    mUsesPointSize               = false;
>+    mUsesPointCoord              = false;
>+    mUsesDepthRange              = false;
>+    mUsesFragDepth               = false;
>     mHasANGLEMultiviewEnabled    = false;
>+    mUsesVertexID                = false;
>     mUsesViewID                  = false;
>-    mUsesDiscardRewriting = false;
>-    mUsesNestedBreak = false;
>+    mUsesDiscardRewriting        = false;
>+    mUsesNestedBreak             = false;
>     mRequiresIEEEStrictCompiling = false;
> 
>     mDebugInfo.clear();
>@@ -123,14 +171,17 @@ void ShaderD3D::generateWorkarounds(angle::CompilerWorkaroundsD3D *workarounds)
>     if (mUsesDiscardRewriting)
>     {
>         // ANGLE issue 486:
>-        // Work-around a D3D9 compiler bug that presents itself when using conditional discard, by disabling optimization
>+        // Work-around a D3D9 compiler bug that presents itself when using conditional discard, by
>+        // disabling optimization
>         workarounds->skipOptimization = true;
>     }
>     else if (mUsesNestedBreak)
>     {
>         // ANGLE issue 603:
>-        // Work-around a D3D9 compiler bug that presents itself when using break in a nested loop, by maximizing optimization
>-        // We want to keep the use of ANGLE_D3D_WORKAROUND_MAX_OPTIMIZATION minimal to prevent hangs, so usesDiscard takes precedence
>+        // Work-around a D3D9 compiler bug that presents itself when using break in a nested loop,
>+        // by maximizing optimization We want to keep the use of
>+        // ANGLE_D3D_WORKAROUND_MAX_OPTIMIZATION minimal to prevent hangs, so usesDiscard takes
>+        // precedence
>         workarounds->useMaxOptimization = true;
>     }
> 
>@@ -153,38 +204,25 @@ unsigned int ShaderD3D::getUniformBlockRegister(const std::string &blockName) co
>     return mUniformBlockRegisterMap.find(blockName)->second;
> }
> 
>+unsigned int ShaderD3D::getShaderStorageBlockRegister(const std::string &blockName) const
>+{
>+    ASSERT(mShaderStorageBlockRegisterMap.count(blockName) > 0);
>+    return mShaderStorageBlockRegisterMap.find(blockName)->second;
>+}
>+
> ShShaderOutput ShaderD3D::getCompilerOutputType() const
> {
>     return mCompilerOutputType;
> }
> 
>-ShCompileOptions ShaderD3D::prepareSourceAndReturnOptions(std::stringstream *shaderSourceStream,
>-                                                          std::string *sourcePath)
>+bool ShaderD3D::useImage2DFunction(const std::string &functionName) const
> {
>-    uncompile();
>-
>-    ShCompileOptions additionalOptions = 0;
>-
>-    const std::string &source = mData.getSource();
>-
>-#if !defined(ANGLE_ENABLE_WINDOWS_STORE)
>-    if (gl::DebugAnnotationsActive())
>+    if (mUsedImage2DFunctionNames.empty())
>     {
>-        *sourcePath = getTempPath();
>-        writeFile(sourcePath->c_str(), source.c_str(), source.length());
>-        additionalOptions |= SH_LINE_DIRECTIVES | SH_SOURCE_PATH;
>+        return false;
>     }
>-#endif
> 
>-    additionalOptions |= mAdditionalOptions;
>-
>-    *shaderSourceStream << source;
>-    return additionalOptions;
>-}
>-
>-bool ShaderD3D::hasUniform(const std::string &name) const
>-{
>-    return mUniformRegisterMap.find(name) != mUniformRegisterMap.end();
>+    return mUsedImage2DFunctionNames.find(functionName) != mUsedImage2DFunctionNames.end();
> }
> 
> const std::map<std::string, unsigned int> &GetUniformRegisterMap(
>@@ -194,54 +232,117 @@ const std::map<std::string, unsigned int> &GetUniformRegisterMap(
>     return *uniformRegisterMap;
> }
> 
>-bool ShaderD3D::postTranslateCompile(gl::Compiler *compiler, std::string *infoLog)
>+const std::set<std::string> &GetUsedImage2DFunctionNames(
>+    const std::set<std::string> *usedImage2DFunctionNames)
> {
>-    // TODO(jmadill): We shouldn't need to cache this.
>-    mCompilerOutputType = compiler->getShaderOutputType();
>-
>-    const std::string &translatedSource = mData.getTranslatedSource();
>+    ASSERT(usedImage2DFunctionNames);
>+    return *usedImage2DFunctionNames;
>+}
> 
>-    mUsesMultipleRenderTargets = translatedSource.find("GL_USES_MRT") != std::string::npos;
>-    mUsesFragColor             = translatedSource.find("GL_USES_FRAG_COLOR") != std::string::npos;
>-    mUsesFragData              = translatedSource.find("GL_USES_FRAG_DATA") != std::string::npos;
>-    mUsesFragCoord             = translatedSource.find("GL_USES_FRAG_COORD") != std::string::npos;
>-    mUsesFrontFacing           = translatedSource.find("GL_USES_FRONT_FACING") != std::string::npos;
>-    mUsesPointSize             = translatedSource.find("GL_USES_POINT_SIZE") != std::string::npos;
>-    mUsesPointCoord            = translatedSource.find("GL_USES_POINT_COORD") != std::string::npos;
>-    mUsesDepthRange            = translatedSource.find("GL_USES_DEPTH_RANGE") != std::string::npos;
>-    mUsesFragDepth             = translatedSource.find("GL_USES_FRAG_DEPTH") != std::string::npos;
>-    mHasANGLEMultiviewEnabled =
>-        translatedSource.find("GL_ANGLE_MULTIVIEW_ENABLED") != std::string::npos;
>-    mUsesViewID = translatedSource.find("GL_USES_VIEW_ID") != std::string::npos;
>-    mUsesDiscardRewriting =
>-        translatedSource.find("ANGLE_USES_DISCARD_REWRITING") != std::string::npos;
>-    mUsesNestedBreak  = translatedSource.find("ANGLE_USES_NESTED_BREAK") != std::string::npos;
>-    mRequiresIEEEStrictCompiling =
>-        translatedSource.find("ANGLE_REQUIRES_IEEE_STRICT_COMPILING") != std::string::npos;
>+std::shared_ptr<WaitableCompileEvent> ShaderD3D::compile(const gl::Context *context,
>+                                                         gl::ShCompilerInstance *compilerInstance,
>+                                                         ShCompileOptions options)
>+{
>+    std::string sourcePath;
>+    uncompile();
> 
>-    ShHandle compilerHandle = compiler->getCompilerHandle(mData.getShaderType());
>+    ShCompileOptions additionalOptions = 0;
> 
>-    mUniformRegisterMap = GetUniformRegisterMap(sh::GetUniformRegisterMap(compilerHandle));
>+    const std::string &source = mData.getSource();
> 
>-    for (const sh::InterfaceBlock &interfaceBlock : mData.getUniformBlocks())
>+#if !defined(ANGLE_ENABLE_WINDOWS_STORE)
>+    if (gl::DebugAnnotationsActive())
>     {
>-        if (interfaceBlock.staticUse)
>+        sourcePath = getTempPath();
>+        writeFile(sourcePath.c_str(), source.c_str(), source.length());
>+        additionalOptions |= SH_LINE_DIRECTIVES | SH_SOURCE_PATH;
>+    }
>+#endif
>+
>+    additionalOptions |= mAdditionalOptions;
>+
>+    options |= additionalOptions;
>+
>+    auto postTranslateFunctor = [this](gl::ShCompilerInstance *compiler, std::string *infoLog) {
>+        // TODO(jmadill): We shouldn't need to cache this.
>+        mCompilerOutputType = compiler->getShaderOutputType();
>+
>+        const std::string &translatedSource = mData.getTranslatedSource();
>+
>+        mUsesMultipleRenderTargets = translatedSource.find("GL_USES_MRT") != std::string::npos;
>+        mUsesFragColor   = translatedSource.find("GL_USES_FRAG_COLOR") != std::string::npos;
>+        mUsesFragData    = translatedSource.find("GL_USES_FRAG_DATA") != std::string::npos;
>+        mUsesFragCoord   = translatedSource.find("GL_USES_FRAG_COORD") != std::string::npos;
>+        mUsesFrontFacing = translatedSource.find("GL_USES_FRONT_FACING") != std::string::npos;
>+        mUsesPointSize   = translatedSource.find("GL_USES_POINT_SIZE") != std::string::npos;
>+        mUsesPointCoord  = translatedSource.find("GL_USES_POINT_COORD") != std::string::npos;
>+        mUsesDepthRange  = translatedSource.find("GL_USES_DEPTH_RANGE") != std::string::npos;
>+        mUsesFragDepth   = translatedSource.find("GL_USES_FRAG_DEPTH") != std::string::npos;
>+        mHasANGLEMultiviewEnabled =
>+            translatedSource.find("GL_ANGLE_MULTIVIEW_ENABLED") != std::string::npos;
>+        mUsesVertexID = translatedSource.find("GL_USES_VERTEX_ID") != std::string::npos;
>+        mUsesViewID   = translatedSource.find("GL_USES_VIEW_ID") != std::string::npos;
>+        mUsesDiscardRewriting =
>+            translatedSource.find("ANGLE_USES_DISCARD_REWRITING") != std::string::npos;
>+        mUsesNestedBreak = translatedSource.find("ANGLE_USES_NESTED_BREAK") != std::string::npos;
>+        mRequiresIEEEStrictCompiling =
>+            translatedSource.find("ANGLE_REQUIRES_IEEE_STRICT_COMPILING") != std::string::npos;
>+
>+        ShHandle compilerHandle = compiler->getHandle();
>+
>+        mUniformRegisterMap = GetUniformRegisterMap(sh::GetUniformRegisterMap(compilerHandle));
>+        mReadonlyImage2DRegisterIndex = sh::GetReadonlyImage2DRegisterIndex(compilerHandle);
>+        mImage2DRegisterIndex         = sh::GetImage2DRegisterIndex(compilerHandle);
>+        mUsedImage2DFunctionNames =
>+            GetUsedImage2DFunctionNames(sh::GetUsedImage2DFunctionNames(compilerHandle));
>+
>+        for (const sh::InterfaceBlock &interfaceBlock : mData.getUniformBlocks())
>         {
>-            unsigned int index = static_cast<unsigned int>(-1);
>-            bool blockRegisterResult =
>-                sh::GetUniformBlockRegister(compilerHandle, interfaceBlock.name, &index);
>-            ASSERT(blockRegisterResult);
>+            if (interfaceBlock.active)
>+            {
>+                unsigned int index = static_cast<unsigned int>(-1);
>+                bool blockRegisterResult =
>+                    sh::GetUniformBlockRegister(compilerHandle, interfaceBlock.name, &index);
>+                ASSERT(blockRegisterResult);
>+
>+                mUniformBlockRegisterMap[interfaceBlock.name] = index;
>+            }
>+        }
> 
>-            mUniformBlockRegisterMap[interfaceBlock.name] = index;
>+        for (const sh::InterfaceBlock &interfaceBlock : mData.getShaderStorageBlocks())
>+        {
>+            if (interfaceBlock.active)
>+            {
>+                unsigned int index = static_cast<unsigned int>(-1);
>+                bool blockRegisterResult =
>+                    sh::GetShaderStorageBlockRegister(compilerHandle, interfaceBlock.name, &index);
>+                ASSERT(blockRegisterResult);
>+
>+                mShaderStorageBlockRegisterMap[interfaceBlock.name] = index;
>+            }
>         }
>-    }
> 
>-    mDebugInfo +=
>-        std::string("// ") + GetShaderTypeString(mData.getShaderType()) + " SHADER BEGIN\n";
>-    mDebugInfo += "\n// GLSL BEGIN\n\n" + mData.getSource() + "\n\n// GLSL END\n\n\n";
>-    mDebugInfo += "// INITIAL HLSL BEGIN\n\n" + translatedSource + "\n// INITIAL HLSL END\n\n\n";
>-    // Successive steps will append more info
>-    return true;
>+        mDebugInfo +=
>+            std::string("// ") + gl::GetShaderTypeString(mData.getShaderType()) + " SHADER BEGIN\n";
>+        mDebugInfo += "\n// GLSL BEGIN\n\n" + mData.getSource() + "\n\n// GLSL END\n\n\n";
>+        mDebugInfo +=
>+            "// INITIAL HLSL BEGIN\n\n" + translatedSource + "\n// INITIAL HLSL END\n\n\n";
>+        // Successive steps will append more info
>+        return true;
>+    };
>+
>+    auto workerThreadPool = context->getWorkerThreadPool();
>+    auto translateTask = std::make_shared<TranslateTaskD3D>(compilerInstance->getHandle(), options,
>+                                                            source, sourcePath);
>+
>+    return std::make_shared<WaitableCompileEventD3D>(
>+        angle::WorkerThreadPool::PostWorkerTask(workerThreadPool, translateTask), compilerInstance,
>+        std::move(postTranslateFunctor), translateTask);
>+}
>+
>+bool ShaderD3D::hasUniform(const std::string &name) const
>+{
>+    return mUniformRegisterMap.find(name) != mUniformRegisterMap.end();
> }
> 
> }  // namespace rx
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/ShaderD3D.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/ShaderD3D.h
>index f7b0b20db43..8a90b1cd37d 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/ShaderD3D.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/ShaderD3D.h
>@@ -17,7 +17,7 @@ namespace angle
> {
> struct CompilerWorkaroundsD3D;
> struct WorkaroundsD3D;
>-}
>+}  // namespace angle
> 
> namespace gl
> {
>@@ -38,10 +38,10 @@ class ShaderD3D : public ShaderImpl
>               const gl::Extensions &extensions);
>     ~ShaderD3D() override;
> 
>-    // ShaderImpl implementation
>-    ShCompileOptions prepareSourceAndReturnOptions(std::stringstream *sourceStream,
>-                                                   std::string *sourcePath) override;
>-    bool postTranslateCompile(gl::Compiler *compiler, std::string *infoLog) override;
>+    std::shared_ptr<WaitableCompileEvent> compile(const gl::Context *context,
>+                                                  gl::ShCompilerInstance *compilerInstance,
>+                                                  ShCompileOptions options) override;
>+
>     std::string getDebugInfo() const override;
> 
>     // D3D-specific methods
>@@ -54,6 +54,10 @@ class ShaderD3D : public ShaderImpl
>     unsigned int getUniformRegister(const std::string &uniformName) const;
> 
>     unsigned int getUniformBlockRegister(const std::string &blockName) const;
>+    unsigned int getShaderStorageBlockRegister(const std::string &blockName) const;
>+    unsigned int getReadonlyImage2DRegisterIndex() const { return mReadonlyImage2DRegisterIndex; }
>+    unsigned int getImage2DRegisterIndex() const { return mImage2DRegisterIndex; }
>+    bool useImage2DFunction(const std::string &functionName) const;
>     void appendDebugInfo(const std::string &info) const { mDebugInfo += info; }
> 
>     void generateWorkarounds(angle::CompilerWorkaroundsD3D *workarounds) const;
>@@ -67,6 +71,7 @@ class ShaderD3D : public ShaderImpl
>     bool usesPointCoord() const { return mUsesPointCoord; }
>     bool usesDepthRange() const { return mUsesDepthRange; }
>     bool usesFragDepth() const { return mUsesFragDepth; }
>+    bool usesVertexID() const { return mUsesVertexID; }
>     bool usesViewID() const { return mUsesViewID; }
>     bool hasANGLEMultiviewEnabled() const { return mHasANGLEMultiviewEnabled; }
> 
>@@ -83,6 +88,7 @@ class ShaderD3D : public ShaderImpl
>     bool mUsesDepthRange;
>     bool mUsesFragDepth;
>     bool mHasANGLEMultiviewEnabled;
>+    bool mUsesVertexID;
>     bool mUsesViewID;
>     bool mUsesDiscardRewriting;
>     bool mUsesNestedBreak;
>@@ -92,6 +98,10 @@ class ShaderD3D : public ShaderImpl
>     mutable std::string mDebugInfo;
>     std::map<std::string, unsigned int> mUniformRegisterMap;
>     std::map<std::string, unsigned int> mUniformBlockRegisterMap;
>+    std::map<std::string, unsigned int> mShaderStorageBlockRegisterMap;
>+    unsigned int mReadonlyImage2DRegisterIndex;
>+    unsigned int mImage2DRegisterIndex;
>+    std::set<std::string> mUsedImage2DFunctionNames;
>     ShCompileOptions mAdditionalOptions;
> };
> }  // namespace rx
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/ShaderExecutableD3D.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/ShaderExecutableD3D.cpp
>index 83a66bd1a55..ae8f35c3c54 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/ShaderExecutableD3D.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/ShaderExecutableD3D.cpp
>@@ -20,9 +20,7 @@ ShaderExecutableD3D::ShaderExecutableD3D(const void *function, size_t length)
>     memcpy(mFunctionBuffer.data(), function, length);
> }
> 
>-ShaderExecutableD3D::~ShaderExecutableD3D()
>-{
>-}
>+ShaderExecutableD3D::~ShaderExecutableD3D() {}
> 
> const uint8_t *ShaderExecutableD3D::getFunction() const
> {
>@@ -53,9 +51,7 @@ UniformStorageD3D::UniformStorageD3D(size_t initialSize) : mUniformData()
>     mUniformData.fill(0);
> }
> 
>-UniformStorageD3D::~UniformStorageD3D()
>-{
>-}
>+UniformStorageD3D::~UniformStorageD3D() {}
> 
> size_t UniformStorageD3D::size() const
> {
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/ShaderExecutableD3D.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/ShaderExecutableD3D.h
>index b8097710e2e..12179ac0b9f 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/ShaderExecutableD3D.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/ShaderExecutableD3D.h
>@@ -13,8 +13,8 @@
> #include "common/MemoryBuffer.h"
> #include "common/debug.h"
> 
>-#include <vector>
> #include <cstdint>
>+#include <vector>
> 
> namespace rx
> {
>@@ -54,4 +54,4 @@ class UniformStorageD3D : angle::NonCopyable
> 
> }  // namespace rx
> 
>-#endif // LIBANGLE_RENDERER_D3D_SHADEREXECUTABLED3D_H_
>+#endif  // LIBANGLE_RENDERER_D3D_SHADEREXECUTABLED3D_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/SurfaceD3D.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/SurfaceD3D.cpp
>index 8e78b71a36d..61dc8ffa07b 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/SurfaceD3D.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/SurfaceD3D.cpp
>@@ -11,12 +11,15 @@
> #include "libANGLE/Context.h"
> #include "libANGLE/Display.h"
> #include "libANGLE/Surface.h"
>+#include "libANGLE/renderer/Format.h"
>+#include "libANGLE/renderer/d3d/DisplayD3D.h"
> #include "libANGLE/renderer/d3d/RenderTargetD3D.h"
> #include "libANGLE/renderer/d3d/RendererD3D.h"
> #include "libANGLE/renderer/d3d/SwapChainD3D.h"
>+#include "libANGLE/renderer/d3d/d3d11/formatutils11.h"
> 
>-#include <tchar.h>
> #include <EGL/eglext.h>
>+#include <tchar.h>
> #include <algorithm>
> 
> namespace rx
>@@ -33,9 +36,12 @@ SurfaceD3D::SurfaceD3D(const egl::SurfaceState &state,
>       mRenderer(renderer),
>       mDisplay(display),
>       mFixedSize(window == nullptr || attribs.get(EGL_FIXED_SIZE_ANGLE, EGL_FALSE) == EGL_TRUE),
>+      mFixedWidth(0),
>+      mFixedHeight(0),
>       mOrientation(static_cast<EGLint>(attribs.get(EGL_SURFACE_ORIENTATION_ANGLE, 0))),
>       mRenderTargetFormat(state.config->renderTargetFormat),
>       mDepthStencilFormat(state.config->depthStencilFormat),
>+      mColorFormat(nullptr),
>       mSwapChain(nullptr),
>       mSwapIntervalDirty(true),
>       mNativeWindow(renderer->createNativeWindow(window, state.config, attribs)),
>@@ -43,7 +49,8 @@ SurfaceD3D::SurfaceD3D(const egl::SurfaceState &state,
>       mHeight(static_cast<EGLint>(attribs.get(EGL_HEIGHT, 0))),
>       mSwapInterval(1),
>       mShareHandle(0),
>-      mD3DTexture(nullptr)
>+      mD3DTexture(nullptr),
>+      mBuftype(buftype)
> {
>     if (window != nullptr && !mFixedSize)
>     {
>@@ -51,6 +58,12 @@ SurfaceD3D::SurfaceD3D(const egl::SurfaceState &state,
>         mHeight = -1;
>     }
> 
>+    if (mFixedSize)
>+    {
>+        mFixedWidth  = mWidth;
>+        mFixedHeight = mHeight;
>+    }
>+
>     switch (buftype)
>     {
>         case EGL_D3D_TEXTURE_2D_SHARE_HANDLE_ANGLE:
>@@ -61,8 +74,6 @@ SurfaceD3D::SurfaceD3D(const egl::SurfaceState &state,
>             mD3DTexture = static_cast<IUnknown *>(clientBuffer);
>             ASSERT(mD3DTexture != nullptr);
>             mD3DTexture->AddRef();
>-            ANGLE_SWALLOW_ERR(mRenderer->getD3DTextureInfo(state.config, mD3DTexture, &mWidth,
>-                                                           &mHeight, &mRenderTargetFormat));
>             break;
> 
>         default:
>@@ -92,21 +103,56 @@ egl::Error SurfaceD3D::initialize(const egl::Display *display)
>         }
>     }
> 
>+    if (mBuftype == EGL_D3D_TEXTURE_ANGLE)
>+    {
>+        ANGLE_TRY(mRenderer->getD3DTextureInfo(mState.config, mD3DTexture, &mFixedWidth,
>+                                               &mFixedHeight, &mColorFormat));
>+        if (mState.attributes.contains(EGL_GL_COLORSPACE))
>+        {
>+            if (mColorFormat->id != angle::FormatID::R8G8B8A8_TYPELESS &&
>+                mColorFormat->id != angle::FormatID::B8G8R8A8_TYPELESS)
>+            {
>+                return egl::EglBadMatch()
>+                       << "EGL_GL_COLORSPACE may only be specified for TYPELESS textures";
>+            }
>+        }
>+        if (mColorFormat->id == angle::FormatID::R8G8B8A8_TYPELESS)
>+        {
>+            EGLAttrib colorspace =
>+                mState.attributes.get(EGL_GL_COLORSPACE, EGL_GL_COLORSPACE_LINEAR);
>+            if (colorspace == EGL_GL_COLORSPACE_SRGB)
>+            {
>+                mColorFormat = &angle::Format::Get(angle::FormatID::R8G8B8A8_TYPELESS_SRGB);
>+            }
>+        }
>+        if (mColorFormat->id == angle::FormatID::B8G8R8A8_TYPELESS)
>+        {
>+            EGLAttrib colorspace =
>+                mState.attributes.get(EGL_GL_COLORSPACE, EGL_GL_COLORSPACE_LINEAR);
>+            if (colorspace == EGL_GL_COLORSPACE_SRGB)
>+            {
>+                mColorFormat = &angle::Format::Get(angle::FormatID::B8G8R8A8_TYPELESS_SRGB);
>+            }
>+        }
>+        mRenderTargetFormat = mColorFormat->fboImplementationInternalFormat;
>+    }
>+
>     ANGLE_TRY(resetSwapChain(display));
>     return egl::NoError();
> }
> 
>-FramebufferImpl *SurfaceD3D::createDefaultFramebuffer(const gl::FramebufferState &data)
>+FramebufferImpl *SurfaceD3D::createDefaultFramebuffer(const gl::Context *context,
>+                                                      const gl::FramebufferState &data)
> {
>     return mRenderer->createDefaultFramebuffer(data);
> }
> 
>-egl::Error SurfaceD3D::bindTexImage(gl::Texture *, EGLint)
>+egl::Error SurfaceD3D::bindTexImage(const gl::Context *, gl::Texture *, EGLint)
> {
>     return egl::NoError();
> }
> 
>-egl::Error SurfaceD3D::releaseTexImage(EGLint)
>+egl::Error SurfaceD3D::releaseTexImage(const gl::Context *, EGLint)
> {
>     return egl::NoError();
> }
>@@ -133,14 +179,14 @@ egl::Error SurfaceD3D::resetSwapChain(const egl::Display *display)
>             return egl::EglBadSurface() << "Could not retrieve the window dimensions";
>         }
> 
>-        width = windowRect.right - windowRect.left;
>+        width  = windowRect.right - windowRect.left;
>         height = windowRect.bottom - windowRect.top;
>     }
>     else
>     {
>         // non-window surface - size is determined at creation
>-        width = mWidth;
>-        height = mHeight;
>+        width  = mFixedWidth;
>+        height = mFixedHeight;
>     }
> 
>     mSwapChain =
>@@ -152,7 +198,8 @@ egl::Error SurfaceD3D::resetSwapChain(const egl::Display *display)
>     }
> 
>     // This is a bit risky to pass the proxy context here, but it can happen at almost any time.
>-    egl::Error error = resetSwapChain(display->getProxyContext(), width, height);
>+    DisplayD3D *displayD3D = GetImplAs<DisplayD3D>(display);
>+    egl::Error error       = resetSwapChain(displayD3D, width, height);
>     if (error.isError())
>     {
>         SafeDelete(mSwapChain);
>@@ -162,7 +209,7 @@ egl::Error SurfaceD3D::resetSwapChain(const egl::Display *display)
>     return egl::NoError();
> }
> 
>-egl::Error SurfaceD3D::resizeSwapChain(const gl::Context *context,
>+egl::Error SurfaceD3D::resizeSwapChain(DisplayD3D *displayD3D,
>                                        int backbufferWidth,
>                                        int backbufferHeight)
> {
>@@ -170,7 +217,7 @@ egl::Error SurfaceD3D::resizeSwapChain(const gl::Context *context,
>     ASSERT(mSwapChain);
> 
>     EGLint status =
>-        mSwapChain->resize(context, std::max(1, backbufferWidth), std::max(1, backbufferHeight));
>+        mSwapChain->resize(displayD3D, std::max(1, backbufferWidth), std::max(1, backbufferHeight));
> 
>     if (status == EGL_CONTEXT_LOST)
>     {
>@@ -182,20 +229,20 @@ egl::Error SurfaceD3D::resizeSwapChain(const gl::Context *context,
>         return egl::Error(status);
>     }
> 
>-    mWidth = backbufferWidth;
>+    mWidth  = backbufferWidth;
>     mHeight = backbufferHeight;
> 
>     return egl::NoError();
> }
> 
>-egl::Error SurfaceD3D::resetSwapChain(const gl::Context *context,
>+egl::Error SurfaceD3D::resetSwapChain(DisplayD3D *displayD3D,
>                                       int backbufferWidth,
>                                       int backbufferHeight)
> {
>     ASSERT(backbufferWidth >= 0 && backbufferHeight >= 0);
>     ASSERT(mSwapChain);
> 
>-    EGLint status = mSwapChain->reset(context, std::max(1, backbufferWidth),
>+    EGLint status = mSwapChain->reset(displayD3D, std::max(1, backbufferWidth),
>                                       std::max(1, backbufferHeight), mSwapInterval);
> 
>     if (status == EGL_CONTEXT_LOST)
>@@ -208,14 +255,14 @@ egl::Error SurfaceD3D::resetSwapChain(const gl::Context *context,
>         return egl::Error(status);
>     }
> 
>-    mWidth = backbufferWidth;
>-    mHeight = backbufferHeight;
>+    mWidth             = backbufferWidth;
>+    mHeight            = backbufferHeight;
>     mSwapIntervalDirty = false;
> 
>     return egl::NoError();
> }
> 
>-egl::Error SurfaceD3D::swapRect(const gl::Context *context,
>+egl::Error SurfaceD3D::swapRect(DisplayD3D *displayD3D,
>                                 EGLint x,
>                                 EGLint y,
>                                 EGLint width,
>@@ -238,7 +285,7 @@ egl::Error SurfaceD3D::swapRect(const gl::Context *context,
> 
>     if (width != 0 && height != 0)
>     {
>-        EGLint status = mSwapChain->swapRect(context, x, y, width, height);
>+        EGLint status = mSwapChain->swapRect(displayD3D, x, y, width, height);
> 
>         if (status == EGL_CONTEXT_LOST)
>         {
>@@ -251,40 +298,47 @@ egl::Error SurfaceD3D::swapRect(const gl::Context *context,
>         }
>     }
> 
>-    ANGLE_TRY(checkForOutOfDateSwapChain(context));
>+    ANGLE_TRY(checkForOutOfDateSwapChain(displayD3D));
> 
>     return egl::NoError();
> }
> 
>-egl::Error SurfaceD3D::checkForOutOfDateSwapChain(const gl::Context *context)
>+egl::Error SurfaceD3D::checkForOutOfDateSwapChain(DisplayD3D *displayD3D)
> {
>     RECT client;
>-    int clientWidth = getWidth();
>+    int clientWidth  = getWidth();
>     int clientHeight = getHeight();
>-    bool sizeDirty = false;
>+    bool sizeDirty   = false;
>     if (!mFixedSize && !mNativeWindow->isIconic())
>     {
>-        // The window is automatically resized to 150x22 when it's minimized, but the swapchain shouldn't be resized
>-        // because that's not a useful size to render to.
>+        // The window is automatically resized to 150x22 when it's minimized, but the swapchain
>+        // shouldn't be resized because that's not a useful size to render to.
>         if (!mNativeWindow->getClientRect(&client))
>         {
>             UNREACHABLE();
>             return egl::NoError();
>         }
> 
>-        // Grow the buffer now, if the window has grown. We need to grow now to avoid losing information.
>-        clientWidth = client.right - client.left;
>+        // Grow the buffer now, if the window has grown. We need to grow now to avoid losing
>+        // information.
>+        clientWidth  = client.right - client.left;
>         clientHeight = client.bottom - client.top;
>-        sizeDirty = clientWidth != getWidth() || clientHeight != getHeight();
>+        sizeDirty    = clientWidth != getWidth() || clientHeight != getHeight();
>+    }
>+    else if (mFixedSize)
>+    {
>+        clientWidth  = mFixedWidth;
>+        clientHeight = mFixedHeight;
>+        sizeDirty    = mFixedWidth != getWidth() || mFixedHeight != getHeight();
>     }
> 
>     if (mSwapIntervalDirty)
>     {
>-        ANGLE_TRY(resetSwapChain(context, clientWidth, clientHeight));
>+        ANGLE_TRY(resetSwapChain(displayD3D, clientWidth, clientHeight));
>     }
>     else if (sizeDirty)
>     {
>-        ANGLE_TRY(resizeSwapChain(context, clientWidth, clientHeight));
>+        ANGLE_TRY(resizeSwapChain(displayD3D, clientWidth, clientHeight));
>     }
> 
>     return egl::NoError();
>@@ -292,7 +346,8 @@ egl::Error SurfaceD3D::checkForOutOfDateSwapChain(const gl::Context *context)
> 
> egl::Error SurfaceD3D::swap(const gl::Context *context)
> {
>-    return swapRect(context, 0, 0, mWidth, mHeight);
>+    DisplayD3D *displayD3D = GetImplAs<DisplayD3D>(context->getDisplay());
>+    return swapRect(displayD3D, 0, 0, mWidth, mHeight);
> }
> 
> egl::Error SurfaceD3D::postSubBuffer(const gl::Context *context,
>@@ -301,7 +356,8 @@ egl::Error SurfaceD3D::postSubBuffer(const gl::Context *context,
>                                      EGLint width,
>                                      EGLint height)
> {
>-    return swapRect(context, x, y, width, height);
>+    DisplayD3D *displayD3D = GetImplAs<DisplayD3D>(context->getDisplay());
>+    return swapRect(displayD3D, x, y, width, height);
> }
> 
> rx::SwapChainD3D *SurfaceD3D::getSwapChain() const
>@@ -316,10 +372,20 @@ void SurfaceD3D::setSwapInterval(EGLint interval)
>         return;
>     }
> 
>-    mSwapInterval = interval;
>+    mSwapInterval      = interval;
>     mSwapIntervalDirty = true;
> }
> 
>+void SurfaceD3D::setFixedWidth(EGLint width)
>+{
>+    mFixedWidth = width;
>+}
>+
>+void SurfaceD3D::setFixedHeight(EGLint height)
>+{
>+    mFixedHeight = height;
>+}
>+
> EGLint SurfaceD3D::getWidth() const
> {
>     return mWidth;
>@@ -351,15 +417,21 @@ egl::Error SurfaceD3D::querySurfacePointerANGLE(EGLint attribute, void **value)
>     {
>         *value = mSwapChain->getKeyedMutex();
>     }
>-    else UNREACHABLE();
>+    else
>+        UNREACHABLE();
> 
>     return egl::NoError();
> }
> 
>-gl::Error SurfaceD3D::getAttachmentRenderTarget(const gl::Context *context,
>-                                                GLenum binding,
>-                                                const gl::ImageIndex &imageIndex,
>-                                                FramebufferAttachmentRenderTarget **rtOut)
>+const angle::Format *SurfaceD3D::getD3DTextureColorFormat() const
>+{
>+    return mColorFormat;
>+}
>+
>+angle::Result SurfaceD3D::getAttachmentRenderTarget(const gl::Context *context,
>+                                                    GLenum binding,
>+                                                    const gl::ImageIndex &imageIndex,
>+                                                    FramebufferAttachmentRenderTarget **rtOut)
> {
>     if (binding == GL_BACK)
>     {
>@@ -369,7 +441,21 @@ gl::Error SurfaceD3D::getAttachmentRenderTarget(const gl::Context *context,
>     {
>         *rtOut = mSwapChain->getDepthStencilRenderTarget();
>     }
>-    return gl::NoError();
>+    return angle::Result::Continue;
>+}
>+
>+angle::Result SurfaceD3D::initializeContents(const gl::Context *context,
>+                                             const gl::ImageIndex &imageIndex)
>+{
>+    if (mState.config->renderTargetFormat != GL_NONE)
>+    {
>+        ANGLE_TRY(mRenderer->initRenderTarget(context, mSwapChain->getColorRenderTarget()));
>+    }
>+    if (mState.config->depthStencilFormat != GL_NONE)
>+    {
>+        ANGLE_TRY(mRenderer->initRenderTarget(context, mSwapChain->getDepthStencilRenderTarget()));
>+    }
>+    return angle::Result::Continue;
> }
> 
> WindowSurfaceD3D::WindowSurfaceD3D(const egl::SurfaceState &state,
>@@ -377,19 +463,10 @@ WindowSurfaceD3D::WindowSurfaceD3D(const egl::SurfaceState &state,
>                                    egl::Display *display,
>                                    EGLNativeWindowType window,
>                                    const egl::AttributeMap &attribs)
>-    : SurfaceD3D(state,
>-                 renderer,
>-                 display,
>-                 window,
>-                 0,
>-                 static_cast<EGLClientBuffer>(0),
>-                 attribs)
>-{
>-}
>+    : SurfaceD3D(state, renderer, display, window, 0, static_cast<EGLClientBuffer>(0), attribs)
>+{}
> 
>-WindowSurfaceD3D::~WindowSurfaceD3D()
>-{
>-}
>+WindowSurfaceD3D::~WindowSurfaceD3D() {}
> 
> PbufferSurfaceD3D::PbufferSurfaceD3D(const egl::SurfaceState &state,
>                                      RendererD3D *renderer,
>@@ -404,11 +481,8 @@ PbufferSurfaceD3D::PbufferSurfaceD3D(const egl::SurfaceState &state,
>                  buftype,
>                  clientBuffer,
>                  attribs)
>-{
>-}
>+{}
> 
>-PbufferSurfaceD3D::~PbufferSurfaceD3D()
>-{
>-}
>+PbufferSurfaceD3D::~PbufferSurfaceD3D() {}
> 
>-}  // namespace rc
>+}  // namespace rx
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/SurfaceD3D.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/SurfaceD3D.h
>index 4fd45a6dfdd..e725cda9f21 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/SurfaceD3D.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/SurfaceD3D.h
>@@ -19,6 +19,7 @@ class Surface;
> 
> namespace rx
> {
>+class DisplayD3D;
> class SwapChainD3D;
> class RendererD3D;
> 
>@@ -29,7 +30,8 @@ class SurfaceD3D : public SurfaceImpl
>     void releaseSwapChain();
> 
>     egl::Error initialize(const egl::Display *display) override;
>-    FramebufferImpl *createDefaultFramebuffer(const gl::FramebufferState &state) override;
>+    FramebufferImpl *createDefaultFramebuffer(const gl::Context *context,
>+                                              const gl::FramebufferState &state) override;
> 
>     egl::Error swap(const gl::Context *context) override;
>     egl::Error postSubBuffer(const gl::Context *context,
>@@ -38,10 +40,14 @@ class SurfaceD3D : public SurfaceImpl
>                              EGLint width,
>                              EGLint height) override;
>     egl::Error querySurfacePointerANGLE(EGLint attribute, void **value) override;
>-    egl::Error bindTexImage(gl::Texture *texture, EGLint buffer) override;
>-    egl::Error releaseTexImage(EGLint buffer) override;
>+    egl::Error bindTexImage(const gl::Context *context,
>+                            gl::Texture *texture,
>+                            EGLint buffer) override;
>+    egl::Error releaseTexImage(const gl::Context *context, EGLint buffer) override;
>     egl::Error getSyncValues(EGLuint64KHR *ust, EGLuint64KHR *msc, EGLuint64KHR *sbc) override;
>     void setSwapInterval(EGLint interval) override;
>+    void setFixedWidth(EGLint width) override;
>+    void setFixedHeight(EGLint height) override;
> 
>     EGLint getWidth() const override;
>     EGLint getHeight() const override;
>@@ -54,12 +60,16 @@ class SurfaceD3D : public SurfaceImpl
> 
>     egl::Error resetSwapChain(const egl::Display *display);
> 
>-    egl::Error checkForOutOfDateSwapChain(const gl::Context *context);
>+    egl::Error checkForOutOfDateSwapChain(DisplayD3D *displayD3D);
> 
>-    gl::Error getAttachmentRenderTarget(const gl::Context *context,
>-                                        GLenum binding,
>-                                        const gl::ImageIndex &imageIndex,
>-                                        FramebufferAttachmentRenderTarget **rtOut) override;
>+    angle::Result getAttachmentRenderTarget(const gl::Context *context,
>+                                            GLenum binding,
>+                                            const gl::ImageIndex &imageIndex,
>+                                            FramebufferAttachmentRenderTarget **rtOut) override;
>+    angle::Result initializeContents(const gl::Context *context,
>+                                     const gl::ImageIndex &imageIndex) override;
>+
>+    const angle::Format *getD3DTextureColorFormat() const override;
> 
>   protected:
>     SurfaceD3D(const egl::SurfaceState &state,
>@@ -70,26 +80,21 @@ class SurfaceD3D : public SurfaceImpl
>                EGLClientBuffer clientBuffer,
>                const egl::AttributeMap &attribs);
> 
>-    egl::Error swapRect(const gl::Context *context,
>-                        EGLint x,
>-                        EGLint y,
>-                        EGLint width,
>-                        EGLint height);
>-    egl::Error resetSwapChain(const gl::Context *context,
>-                              int backbufferWidth,
>-                              int backbufferHeight);
>-    egl::Error resizeSwapChain(const gl::Context *context,
>-                               int backbufferWidth,
>-                               int backbufferHeight);
>+    egl::Error swapRect(DisplayD3D *displayD3D, EGLint x, EGLint y, EGLint width, EGLint height);
>+    egl::Error resetSwapChain(DisplayD3D *displayD3D, int backbufferWidth, int backbufferHeight);
>+    egl::Error resizeSwapChain(DisplayD3D *displayD3D, int backbufferWidth, int backbufferHeight);
> 
>     RendererD3D *mRenderer;
>     egl::Display *mDisplay;
> 
>     bool mFixedSize;
>+    GLint mFixedWidth;
>+    GLint mFixedHeight;
>     GLint mOrientation;
> 
>     GLenum mRenderTargetFormat;
>     GLenum mDepthStencilFormat;
>+    const angle::Format *mColorFormat;
> 
>     SwapChainD3D *mSwapChain;
>     bool mSwapIntervalDirty;
>@@ -102,6 +107,8 @@ class SurfaceD3D : public SurfaceImpl
> 
>     HANDLE mShareHandle;
>     IUnknown *mD3DTexture;
>+
>+    EGLenum mBuftype;
> };
> 
> class WindowSurfaceD3D : public SurfaceD3D
>@@ -129,4 +136,4 @@ class PbufferSurfaceD3D : public SurfaceD3D
> 
> }  // namespace rx
> 
>-#endif // LIBANGLE_RENDERER_D3D_SURFACED3D_H_
>+#endif  // LIBANGLE_RENDERER_D3D_SURFACED3D_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/SwapChainD3D.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/SwapChainD3D.h
>index 81c3d13da43..443cadd680a 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/SwapChainD3D.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/SwapChainD3D.h
>@@ -10,16 +10,16 @@
> #ifndef LIBANGLE_RENDERER_D3D_SWAPCHAIND3D_H_
> #define LIBANGLE_RENDERER_D3D_SWAPCHAIND3D_H_
> 
>-#include <GLES2/gl2.h>
> #include <EGL/egl.h>
> #include <EGL/eglext.h>
>+#include <GLES2/gl2.h>
> 
> #include "common/angleutils.h"
> #include "common/platform.h"
> #include "libANGLE/Error.h"
> 
> #if !defined(ANGLE_FORCE_VSYNC_OFF)
>-#define ANGLE_FORCE_VSYNC_OFF 0
>+#    define ANGLE_FORCE_VSYNC_OFF 0
> #endif
> 
> namespace gl
>@@ -34,6 +34,7 @@ class Display;
> 
> namespace rx
> {
>+class DisplayD3D;
> class RenderTargetD3D;
> 
> class SwapChainD3D : angle::NonCopyable
>@@ -45,21 +46,21 @@ class SwapChainD3D : angle::NonCopyable
>                  GLenum depthBufferFormat);
>     virtual ~SwapChainD3D();
> 
>-    virtual EGLint resize(const gl::Context *context,
>+    virtual EGLint resize(DisplayD3D *displayD3D,
>                           EGLint backbufferWidth,
>                           EGLint backbufferSize) = 0;
>-    virtual EGLint reset(const gl::Context *context,
>+    virtual EGLint reset(DisplayD3D *displayD3D,
>                          EGLint backbufferWidth,
>                          EGLint backbufferHeight,
>-                         EGLint swapInterval) = 0;
>-    virtual EGLint swapRect(const gl::Context *context,
>+                         EGLint swapInterval)    = 0;
>+    virtual EGLint swapRect(DisplayD3D *displayD3D,
>                             EGLint x,
>                             EGLint y,
>                             EGLint width,
>-                            EGLint height) = 0;
>-    virtual void recreate() = 0;
>+                            EGLint height)       = 0;
>+    virtual void recreate()                      = 0;
> 
>-    virtual RenderTargetD3D *getColorRenderTarget() = 0;
>+    virtual RenderTargetD3D *getColorRenderTarget()        = 0;
>     virtual RenderTargetD3D *getDepthStencilRenderTarget() = 0;
> 
>     GLenum getRenderTargetInternalFormat() const { return mOffscreenRenderTargetFormat; }
>@@ -79,4 +80,4 @@ class SwapChainD3D : angle::NonCopyable
> };
> 
> }  // namespace rx
>-#endif // LIBANGLE_RENDERER_D3D_SWAPCHAIND3D_H_
>+#endif  // LIBANGLE_RENDERER_D3D_SWAPCHAIND3D_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/TextureD3D.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/TextureD3D.cpp
>index bf44cbb5d22..8b043b0337a 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/TextureD3D.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/TextureD3D.cpp
>@@ -20,10 +20,10 @@
> #include "libANGLE/formatutils.h"
> #include "libANGLE/renderer/BufferImpl.h"
> #include "libANGLE/renderer/d3d/BufferD3D.h"
>+#include "libANGLE/renderer/d3d/ContextD3D.h"
> #include "libANGLE/renderer/d3d/EGLImageD3D.h"
> #include "libANGLE/renderer/d3d/ImageD3D.h"
> #include "libANGLE/renderer/d3d/RenderTargetD3D.h"
>-#include "libANGLE/renderer/d3d/RendererD3D.h"
> #include "libANGLE/renderer/d3d/SurfaceD3D.h"
> #include "libANGLE/renderer/d3d/TextureStorage.h"
> 
>@@ -33,20 +33,22 @@ namespace rx
> namespace
> {
> 
>-gl::Error GetUnpackPointer(const gl::Context *context,
>-                           const gl::PixelUnpackState &unpack,
>-                           gl::Buffer *unpackBuffer,
>-                           const uint8_t *pixels,
>-                           ptrdiff_t layerOffset,
>-                           const uint8_t **pointerOut)
>+angle::Result GetUnpackPointer(const gl::Context *context,
>+                               const gl::PixelUnpackState &unpack,
>+                               gl::Buffer *unpackBuffer,
>+                               const uint8_t *pixels,
>+                               ptrdiff_t layerOffset,
>+                               const uint8_t **pointerOut)
> {
>     if (unpackBuffer)
>     {
>-        // Do a CPU readback here, if we have an unpack buffer bound and the fast GPU path is not supported
>+        // Do a CPU readback here, if we have an unpack buffer bound and the fast GPU path is not
>+        // supported
>         ptrdiff_t offset = reinterpret_cast<ptrdiff_t>(pixels);
> 
>         // TODO: this is the only place outside of renderer that asks for a buffers raw data.
>-        // This functionality should be moved into renderer and the getData method of BufferImpl removed.
>+        // This functionality should be moved into renderer and the getData method of BufferImpl
>+        // removed.
>         BufferD3D *bufferD3D = GetImplAs<BufferD3D>(unpackBuffer);
>         ASSERT(bufferD3D);
>         const uint8_t *bufferData = nullptr;
>@@ -64,15 +66,14 @@ gl::Error GetUnpackPointer(const gl::Context *context,
>         *pointerOut += layerOffset;
>     }
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
> bool IsRenderTargetUsage(GLenum usage)
> {
>     return (usage == GL_FRAMEBUFFER_ATTACHMENT_ANGLE);
> }
>-
>-}
>+}  // namespace
> 
> TextureD3D::TextureD3D(const gl::TextureState &state, RendererD3D *renderer)
>     : TextureImpl(state),
>@@ -81,15 +82,14 @@ TextureD3D::TextureD3D(const gl::TextureState &state, RendererD3D *renderer)
>       mImmutable(false),
>       mTexStorage(nullptr),
>       mBaseLevel(0)
>-{
>-}
>+{}
> 
> TextureD3D::~TextureD3D()
> {
>     ASSERT(!mTexStorage);
> }
> 
>-gl::Error TextureD3D::getNativeTexture(const gl::Context *context, TextureStorage **outStorage)
>+angle::Result TextureD3D::getNativeTexture(const gl::Context *context, TextureStorage **outStorage)
> {
>     // ensure the underlying texture is created
>     ANGLE_TRY(initializeStorage(context, false));
>@@ -102,12 +102,12 @@ gl::Error TextureD3D::getNativeTexture(const gl::Context *context, TextureStorag
>     ASSERT(outStorage);
> 
>     *outStorage = mTexStorage;
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error TextureD3D::getImageAndSyncFromStorage(const gl::Context *context,
>-                                                 const gl::ImageIndex &index,
>-                                                 ImageD3D **outImage)
>+angle::Result TextureD3D::getImageAndSyncFromStorage(const gl::Context *context,
>+                                                     const gl::ImageIndex &index,
>+                                                     ImageD3D **outImage)
> {
>     ImageD3D *image = getImage(index);
>     if (mTexStorage && mTexStorage->isRenderTarget())
>@@ -116,7 +116,7 @@ gl::Error TextureD3D::getImageAndSyncFromStorage(const gl::Context *context,
>         mDirtyImages = true;
>     }
>     *outImage = image;
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
> GLint TextureD3D::getLevelZeroWidth() const
>@@ -163,25 +163,37 @@ GLenum TextureD3D::getBaseLevelInternalFormat() const
>     return (baseImage ? baseImage->getInternalFormat() : GL_NONE);
> }
> 
>-gl::Error TextureD3D::setStorage(const gl::Context *context,
>-                                 GLenum target,
>-                                 size_t levels,
>-                                 GLenum internalFormat,
>-                                 const gl::Extents &size)
>+angle::Result TextureD3D::setStorage(const gl::Context *context,
>+                                     gl::TextureType type,
>+                                     size_t levels,
>+                                     GLenum internalFormat,
>+                                     const gl::Extents &size)
>+{
>+    ANGLE_HR_UNREACHABLE(GetImplAs<ContextD3D>(context));
>+    return angle::Result::Continue;
>+}
>+
>+angle::Result TextureD3D::setStorageMultisample(const gl::Context *context,
>+                                                gl::TextureType type,
>+                                                GLsizei samples,
>+                                                GLint internalformat,
>+                                                const gl::Extents &size,
>+                                                bool fixedSampleLocations)
> {
>-    UNREACHABLE();
>-    return gl::InternalError();
>+    ANGLE_HR_UNREACHABLE(GetImplAs<ContextD3D>(context));
>+    return angle::Result::Continue;
> }
> 
>-gl::Error TextureD3D::setStorageMultisample(const gl::Context *context,
>-                                            GLenum target,
>-                                            GLsizei samples,
>-                                            GLint internalFormat,
>-                                            const gl::Extents &size,
>-                                            bool fixedSampleLocations)
>+angle::Result TextureD3D::setStorageExternalMemory(const gl::Context *context,
>+                                                   gl::TextureType type,
>+                                                   size_t levels,
>+                                                   GLenum internalFormat,
>+                                                   const gl::Extents &size,
>+                                                   gl::MemoryObject *memoryObject,
>+                                                   GLuint64 offset)
> {
>-    UNREACHABLE();
>-    return gl::InternalError();
>+    ANGLE_HR_UNREACHABLE(GetImplAs<ContextD3D>(context));
>+    return angle::Result::Continue;
> }
> 
> bool TextureD3D::shouldUseSetData(const ImageD3D *image) const
>@@ -209,26 +221,26 @@ bool TextureD3D::shouldUseSetData(const ImageD3D *image) const
>     return (mTexStorage && !internalFormat.compressed);
> }
> 
>-gl::Error TextureD3D::setImageImpl(const gl::Context *context,
>-                                   const gl::ImageIndex &index,
>-                                   GLenum type,
>-                                   const gl::PixelUnpackState &unpack,
>-                                   const uint8_t *pixels,
>-                                   ptrdiff_t layerOffset)
>+angle::Result TextureD3D::setImageImpl(const gl::Context *context,
>+                                       const gl::ImageIndex &index,
>+                                       GLenum type,
>+                                       const gl::PixelUnpackState &unpack,
>+                                       const uint8_t *pixels,
>+                                       ptrdiff_t layerOffset)
> {
>-    ImageD3D *image = getImage(index);
>-    gl::Buffer *unpackBuffer =
>-        context->getGLState().getTargetBuffer(gl::BufferBinding::PixelUnpack);
>+    ImageD3D *image          = getImage(index);
>+    gl::Buffer *unpackBuffer = context->getState().getTargetBuffer(gl::BufferBinding::PixelUnpack);
>     ASSERT(image);
> 
>     // No-op
>     if (image->getWidth() == 0 || image->getHeight() == 0 || image->getDepth() == 0)
>     {
>-        return gl::NoError();
>+        return angle::Result::Continue;
>     }
> 
>-    // We no longer need the "GLenum format" parameter to TexImage to determine what data format "pixels" contains.
>-    // From our image internal format we know how many channels to expect, and "type" gives the format of pixel's components.
>+    // We no longer need the "GLenum format" parameter to TexImage to determine what data format
>+    // "pixels" contains. From our image internal format we know how many channels to expect, and
>+    // "type" gives the format of pixel's components.
>     const uint8_t *pixelData = nullptr;
>     ANGLE_TRY(GetUnpackPointer(context, unpack, unpackBuffer, pixels, layerOffset, &pixelData));
> 
>@@ -241,30 +253,30 @@ gl::Error TextureD3D::setImageImpl(const gl::Context *context,
>         }
>         else
>         {
>-            gl::Box fullImageArea(0, 0, 0, image->getWidth(), image->getHeight(), image->getDepth());
>-            ANGLE_TRY(
>-                image->loadData(context, fullImageArea, unpack, type, pixelData, index.is3D()));
>+            gl::Box fullImageArea(0, 0, 0, image->getWidth(), image->getHeight(),
>+                                  image->getDepth());
>+            ANGLE_TRY(image->loadData(context, fullImageArea, unpack, type, pixelData,
>+                                      index.usesTex3D()));
>         }
> 
>         mDirtyImages = true;
>     }
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error TextureD3D::subImage(const gl::Context *context,
>-                               const gl::ImageIndex &index,
>-                               const gl::Box &area,
>-                               GLenum format,
>-                               GLenum type,
>-                               const gl::PixelUnpackState &unpack,
>-                               const uint8_t *pixels,
>-                               ptrdiff_t layerOffset)
>+angle::Result TextureD3D::subImage(const gl::Context *context,
>+                                   const gl::ImageIndex &index,
>+                                   const gl::Box &area,
>+                                   GLenum format,
>+                                   GLenum type,
>+                                   const gl::PixelUnpackState &unpack,
>+                                   gl::Buffer *unpackBuffer,
>+                                   const uint8_t *pixels,
>+                                   ptrdiff_t layerOffset)
> {
>     // CPU readback & copy where direct GPU copy is not supported
>     const uint8_t *pixelData = nullptr;
>-    gl::Buffer *unpackBuffer =
>-        context->getGLState().getTargetBuffer(gl::BufferBinding::PixelUnpack);
>     ANGLE_TRY(GetUnpackPointer(context, unpack, unpackBuffer, pixels, layerOffset, &pixelData));
> 
>     if (pixelData != nullptr)
>@@ -277,33 +289,33 @@ gl::Error TextureD3D::subImage(const gl::Context *context,
>             return mTexStorage->setData(context, index, image, &area, type, unpack, pixelData);
>         }
> 
>-        ANGLE_TRY(image->loadData(context, area, unpack, type, pixelData, index.is3D()));
>+        ANGLE_TRY(image->loadData(context, area, unpack, type, pixelData, index.usesTex3D()));
>         ANGLE_TRY(commitRegion(context, index, area));
>         mDirtyImages = true;
>     }
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error TextureD3D::setCompressedImageImpl(const gl::Context *context,
>-                                             const gl::ImageIndex &index,
>-                                             const gl::PixelUnpackState &unpack,
>-                                             const uint8_t *pixels,
>-                                             ptrdiff_t layerOffset)
>+angle::Result TextureD3D::setCompressedImageImpl(const gl::Context *context,
>+                                                 const gl::ImageIndex &index,
>+                                                 const gl::PixelUnpackState &unpack,
>+                                                 const uint8_t *pixels,
>+                                                 ptrdiff_t layerOffset)
> {
>     ImageD3D *image = getImage(index);
>     ASSERT(image);
> 
>     if (image->getWidth() == 0 || image->getHeight() == 0 || image->getDepth() == 0)
>     {
>-        return gl::NoError();
>+        return angle::Result::Continue;
>     }
> 
>-    // We no longer need the "GLenum format" parameter to TexImage to determine what data format "pixels" contains.
>-    // From our image internal format we know how many channels to expect, and "type" gives the format of pixel's components.
>+    // We no longer need the "GLenum format" parameter to TexImage to determine what data format
>+    // "pixels" contains. From our image internal format we know how many channels to expect, and
>+    // "type" gives the format of pixel's components.
>     const uint8_t *pixelData = nullptr;
>-    gl::Buffer *unpackBuffer =
>-        context->getGLState().getTargetBuffer(gl::BufferBinding::PixelUnpack);
>+    gl::Buffer *unpackBuffer = context->getState().getTargetBuffer(gl::BufferBinding::PixelUnpack);
>     ANGLE_TRY(GetUnpackPointer(context, unpack, unpackBuffer, pixels, layerOffset, &pixelData));
> 
>     if (pixelData != nullptr)
>@@ -314,20 +326,19 @@ gl::Error TextureD3D::setCompressedImageImpl(const gl::Context *context,
>         mDirtyImages = true;
>     }
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error TextureD3D::subImageCompressed(const gl::Context *context,
>-                                         const gl::ImageIndex &index,
>-                                         const gl::Box &area,
>-                                         GLenum format,
>-                                         const gl::PixelUnpackState &unpack,
>-                                         const uint8_t *pixels,
>-                                         ptrdiff_t layerOffset)
>+angle::Result TextureD3D::subImageCompressed(const gl::Context *context,
>+                                             const gl::ImageIndex &index,
>+                                             const gl::Box &area,
>+                                             GLenum format,
>+                                             const gl::PixelUnpackState &unpack,
>+                                             const uint8_t *pixels,
>+                                             ptrdiff_t layerOffset)
> {
>     const uint8_t *pixelData = nullptr;
>-    gl::Buffer *unpackBuffer =
>-        context->getGLState().getTargetBuffer(gl::BufferBinding::PixelUnpack);
>+    gl::Buffer *unpackBuffer = context->getState().getTargetBuffer(gl::BufferBinding::PixelUnpack);
>     ANGLE_TRY(GetUnpackPointer(context, unpack, unpackBuffer, pixels, layerOffset, &pixelData));
> 
>     if (pixelData != nullptr)
>@@ -340,7 +351,7 @@ gl::Error TextureD3D::subImageCompressed(const gl::Context *context,
>         mDirtyImages = true;
>     }
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
> bool TextureD3D::isFastUnpackable(const gl::Buffer *unpackBuffer, GLenum sizedInternalFormat)
>@@ -349,30 +360,27 @@ bool TextureD3D::isFastUnpackable(const gl::Buffer *unpackBuffer, GLenum sizedIn
>            mRenderer->supportsFastCopyBufferToTexture(sizedInternalFormat);
> }
> 
>-gl::Error TextureD3D::fastUnpackPixels(const gl::Context *context,
>-                                       const gl::PixelUnpackState &unpack,
>-                                       const uint8_t *pixels,
>-                                       const gl::Box &destArea,
>-                                       GLenum sizedInternalFormat,
>-                                       GLenum type,
>-                                       RenderTargetD3D *destRenderTarget)
>+angle::Result TextureD3D::fastUnpackPixels(const gl::Context *context,
>+                                           const gl::PixelUnpackState &unpack,
>+                                           const uint8_t *pixels,
>+                                           const gl::Box &destArea,
>+                                           GLenum sizedInternalFormat,
>+                                           GLenum type,
>+                                           RenderTargetD3D *destRenderTarget)
> {
>-    if (unpack.skipRows != 0 || unpack.skipPixels != 0 || unpack.imageHeight != 0 ||
>-        unpack.skipImages != 0)
>-    {
>-        // TODO(jmadill): additional unpack parameters
>-        UNIMPLEMENTED();
>-        return gl::InternalError() << "Unimplemented pixel store parameters in fastUnpackPixels";
>-    }
>+    bool check = (unpack.skipRows != 0 || unpack.skipPixels != 0 || unpack.imageHeight != 0 ||
>+                  unpack.skipImages != 0);
>+    ANGLE_CHECK(GetImplAs<ContextD3D>(context), !check,
>+                "Unimplemented pixel store parameters in fastUnpackPixels", GL_INVALID_OPERATION);
> 
>     // No-op
>     if (destArea.width <= 0 && destArea.height <= 0 && destArea.depth <= 0)
>     {
>-        return gl::NoError();
>+        return angle::Result::Continue;
>     }
> 
>-    // In order to perform the fast copy through the shader, we must have the right format, and be able
>-    // to create a render target.
>+    // In order to perform the fast copy through the shader, we must have the right format, and be
>+    // able to create a render target.
>     ASSERT(mRenderer->supportsFastCopyBufferToTexture(sizedInternalFormat));
> 
>     uintptr_t offset = reinterpret_cast<uintptr_t>(pixels);
>@@ -381,7 +389,7 @@ gl::Error TextureD3D::fastUnpackPixels(const gl::Context *context,
>                                                  destRenderTarget, sizedInternalFormat, type,
>                                                  destArea));
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
> GLint TextureD3D::creationLevels(GLsizei width, GLsizei height, GLsizei depth) const
>@@ -414,20 +422,20 @@ ImageD3D *TextureD3D::getBaseLevelImage() const
>     return getImage(getImageIndex(mBaseLevel, 0));
> }
> 
>-gl::Error TextureD3D::setImageExternal(const gl::Context *context,
>-                                       GLenum target,
>-                                       egl::Stream *stream,
>-                                       const egl::Stream::GLTextureDescription &desc)
>+angle::Result TextureD3D::setImageExternal(const gl::Context *context,
>+                                           gl::TextureType type,
>+                                           egl::Stream *stream,
>+                                           const egl::Stream::GLTextureDescription &desc)
> {
>     // Only external images can accept external textures
>-    UNREACHABLE();
>-    return gl::InternalError();
>+    ANGLE_HR_UNREACHABLE(GetImplAs<ContextD3D>(context));
>+    return angle::Result::Continue;
> }
> 
>-gl::Error TextureD3D::generateMipmap(const gl::Context *context)
>+angle::Result TextureD3D::generateMipmap(const gl::Context *context)
> {
>     const GLuint baseLevel = mState.getEffectiveBaseLevel();
>-    const GLuint maxLevel = mState.getMipmapMaxLevel();
>+    const GLuint maxLevel  = mState.getMipmapMaxLevel();
>     ASSERT(maxLevel > baseLevel);  // Should be checked before calling this.
> 
>     if (mTexStorage && mRenderer->getWorkarounds().zeroMaxLodWorkaround)
>@@ -454,10 +462,11 @@ gl::Error TextureD3D::generateMipmap(const gl::Context *context)
>         ANGLE_TRY(generateMipmapUsingImages(context, maxLevel));
>     }
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error TextureD3D::generateMipmapUsingImages(const gl::Context *context, const GLuint maxLevel)
>+angle::Result TextureD3D::generateMipmapUsingImages(const gl::Context *context,
>+                                                    const GLuint maxLevel)
> {
>     // We know that all layers have the same dimension, for the texture to be complete
>     GLint layerCount = static_cast<GLint>(getLayerCount(mBaseLevel));
>@@ -484,12 +493,15 @@ gl::Error TextureD3D::generateMipmapUsingImages(const gl::Context *context, cons
>         }
>     }
> 
>-    // TODO: Decouple this from zeroMaxLodWorkaround. This is a 9_3 restriction, unrelated to zeroMaxLodWorkaround.
>-    // The restriction is because Feature Level 9_3 can't create SRVs on individual levels of the texture.
>-    // As a result, even if the storage is a rendertarget, we can't use the GPU to generate the mipmaps without further work.
>-    // The D3D9 renderer works around this by copying each level of the texture into its own single-layer GPU texture (in Blit9::boxFilter).
>-    // Feature Level 9_3 could do something similar, or it could continue to use CPU-side mipmap generation, or something else.
>-    bool renderableStorage = (mTexStorage && mTexStorage->isRenderTarget() && !(mRenderer->getWorkarounds().zeroMaxLodWorkaround));
>+    // TODO: Decouple this from zeroMaxLodWorkaround. This is a 9_3 restriction, unrelated to
>+    // zeroMaxLodWorkaround. The restriction is because Feature Level 9_3 can't create SRVs on
>+    // individual levels of the texture. As a result, even if the storage is a rendertarget, we
>+    // can't use the GPU to generate the mipmaps without further work. The D3D9 renderer works
>+    // around this by copying each level of the texture into its own single-layer GPU texture (in
>+    // Blit9::boxFilter). Feature Level 9_3 could do something similar, or it could continue to use
>+    // CPU-side mipmap generation, or something else.
>+    bool renderableStorage = (mTexStorage && mTexStorage->isRenderTarget() &&
>+                              !(mRenderer->getWorkarounds().zeroMaxLodWorkaround));
> 
>     for (GLint layer = 0; layer < layerCount; ++layer)
>     {
>@@ -498,7 +510,7 @@ gl::Error TextureD3D::generateMipmapUsingImages(const gl::Context *context, cons
>             ASSERT(getLayerCount(mip) == layerCount);
> 
>             gl::ImageIndex sourceIndex = getImageIndex(mip - 1, layer);
>-            gl::ImageIndex destIndex = getImageIndex(mip, layer);
>+            gl::ImageIndex destIndex   = getImageIndex(mip, layer);
> 
>             if (renderableStorage)
>             {
>@@ -521,29 +533,24 @@ gl::Error TextureD3D::generateMipmapUsingImages(const gl::Context *context, cons
>         ANGLE_TRY(updateStorage(context));
>     }
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
> bool TextureD3D::isBaseImageZeroSize() const
> {
>     ImageD3D *baseImage = getBaseLevelImage();
> 
>-    if (!baseImage || baseImage->getWidth() <= 0)
>-    {
>-        return true;
>-    }
>-
>-    if (!gl::IsCubeMapTextureTarget(baseImage->getTarget()) && baseImage->getHeight() <= 0)
>+    if (!baseImage || baseImage->getWidth() <= 0 || baseImage->getHeight() <= 0)
>     {
>         return true;
>     }
> 
>-    if (baseImage->getTarget() == GL_TEXTURE_3D && baseImage->getDepth() <= 0)
>+    if (baseImage->getType() == gl::TextureType::_3D && baseImage->getDepth() <= 0)
>     {
>         return true;
>     }
> 
>-    if (baseImage->getTarget() == GL_TEXTURE_2D_ARRAY && getLayerCount(getBaseLevel()) <= 0)
>+    if (baseImage->getType() == gl::TextureType::_2DArray && getLayerCount(getBaseLevel()) <= 0)
>     {
>         return true;
>     }
>@@ -551,7 +558,7 @@ bool TextureD3D::isBaseImageZeroSize() const
>     return false;
> }
> 
>-gl::Error TextureD3D::ensureRenderTarget(const gl::Context *context)
>+angle::Result TextureD3D::ensureRenderTarget(const gl::Context *context)
> {
>     ANGLE_TRY(initializeStorage(context, true));
> 
>@@ -559,8 +566,8 @@ gl::Error TextureD3D::ensureRenderTarget(const gl::Context *context)
>     // an error for incomplete sampling, but it is a big problem for rendering.
>     if (!mTexStorage)
>     {
>-        UNREACHABLE();
>-        return gl::InternalError() << "Cannot render to incomplete texture.";
>+        ANGLE_HR_UNREACHABLE(GetImplAs<ContextD3D>(context));
>+        return angle::Result::Stop;
>     }
> 
>     if (!isBaseImageZeroSize())
>@@ -574,16 +581,23 @@ gl::Error TextureD3D::ensureRenderTarget(const gl::Context *context)
>             ANGLE_TRY(mTexStorage->copyToStorage(context, newRenderTargetStorage.get()));
>             ANGLE_TRY(setCompleteTexStorage(context, newRenderTargetStorage.get()));
>             newRenderTargetStorage.release();
>+            // If this texture is used in compute shader, we should invalidate this texture so that
>+            // the UAV/SRV is rebound again with this new texture storage in next dispatch call.
>+            mTexStorage->invalidateTextures();
>         }
>     }
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
> bool TextureD3D::canCreateRenderTargetForImage(const gl::ImageIndex &index) const
> {
>-    if (index.type == GL_TEXTURE_2D_MULTISAMPLE)
>+    if (index.getType() == gl::TextureType::_2DMultisample ||
>+        index.getType() == gl::TextureType::_2DMultisampleArray)
>+    {
>+        ASSERT(index.getType() != gl::TextureType::_2DMultisampleArray || index.hasLayer());
>         return true;
>+    }
> 
>     ImageD3D *image = getImage(index);
>     ASSERT(image);
>@@ -591,9 +605,9 @@ bool TextureD3D::canCreateRenderTargetForImage(const gl::ImageIndex &index) cons
>     return (image->isRenderableFormat() && levelsComplete);
> }
> 
>-gl::Error TextureD3D::commitRegion(const gl::Context *context,
>-                                   const gl::ImageIndex &index,
>-                                   const gl::Box &region)
>+angle::Result TextureD3D::commitRegion(const gl::Context *context,
>+                                       const gl::ImageIndex &index,
>+                                       const gl::Box &region)
> {
>     if (mTexStorage)
>     {
>@@ -603,21 +617,21 @@ gl::Error TextureD3D::commitRegion(const gl::Context *context,
>         image->markClean();
>     }
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error TextureD3D::getAttachmentRenderTarget(const gl::Context *context,
>-                                                GLenum /*binding*/,
>-                                                const gl::ImageIndex &imageIndex,
>-                                                FramebufferAttachmentRenderTarget **rtOut)
>+angle::Result TextureD3D::getAttachmentRenderTarget(const gl::Context *context,
>+                                                    GLenum binding,
>+                                                    const gl::ImageIndex &imageIndex,
>+                                                    FramebufferAttachmentRenderTarget **rtOut)
> {
>     RenderTargetD3D *rtD3D = nullptr;
>-    gl::Error error        = getRenderTarget(context, imageIndex, &rtD3D);
>+    ANGLE_TRY(getRenderTarget(context, imageIndex, &rtD3D));
>     *rtOut = static_cast<FramebufferAttachmentRenderTarget *>(rtD3D);
>-    return error;
>+    return angle::Result::Continue;
> }
> 
>-gl::Error TextureD3D::setBaseLevel(const gl::Context *context, GLuint baseLevel)
>+angle::Result TextureD3D::setBaseLevel(const gl::Context *context, GLuint baseLevel)
> {
>     const int oldStorageWidth  = std::max(1, getLevelZeroWidth());
>     const int oldStorageHeight = std::max(1, getLevelZeroHeight());
>@@ -629,7 +643,7 @@ gl::Error TextureD3D::setBaseLevel(const gl::Context *context, GLuint baseLevel)
>     // have been created based on the dimensions of the previous specified level range.
>     const int newStorageWidth  = std::max(1, getLevelZeroWidth());
>     const int newStorageHeight = std::max(1, getLevelZeroHeight());
>-    const int newStorageDepth = std::max(1, getLevelZeroDepth());
>+    const int newStorageDepth  = std::max(1, getLevelZeroDepth());
>     const int newStorageFormat = getBaseLevelInternalFormat();
>     if (mTexStorage &&
>         (newStorageWidth != oldStorageWidth || newStorageHeight != oldStorageHeight ||
>@@ -639,98 +653,124 @@ gl::Error TextureD3D::setBaseLevel(const gl::Context *context, GLuint baseLevel)
>         ANGLE_TRY(releaseTexStorage(context));
>     }
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-void TextureD3D::syncState(const gl::Texture::DirtyBits &dirtyBits)
>+angle::Result TextureD3D::syncState(const gl::Context *context,
>+                                    const gl::Texture::DirtyBits &dirtyBits)
> {
>-    // TODO(geofflang): Use dirty bits
>+    // This could be improved using dirty bits.
>+    return angle::Result::Continue;
> }
> 
>-gl::Error TextureD3D::releaseTexStorage(const gl::Context *context)
>+angle::Result TextureD3D::releaseTexStorage(const gl::Context *context)
> {
>     if (!mTexStorage)
>     {
>-        return gl::NoError();
>+        return angle::Result::Continue;
>     }
>+
>     auto err = mTexStorage->onDestroy(context);
>     SafeDelete(mTexStorage);
>     return err;
> }
> 
>-gl::Error TextureD3D::onDestroy(const gl::Context *context)
>+void TextureD3D::onDestroy(const gl::Context *context)
> {
>-    return releaseTexStorage(context);
>+    (void)releaseTexStorage(context);
> }
> 
>-gl::Error TextureD3D::initializeContents(const gl::Context *context,
>-                                         const gl::ImageIndex &imageIndexIn)
>+angle::Result TextureD3D::initializeContents(const gl::Context *context,
>+                                             const gl::ImageIndex &imageIndex)
> {
>-    gl::ImageIndex imageIndex = imageIndexIn;
>+    ContextD3D *contextD3D = GetImplAs<ContextD3D>(context);
>+    gl::ImageIndex index   = imageIndex;
> 
>     // Special case for D3D11 3D textures. We can't create render targets for individual layers of a
>     // 3D texture, so force the clear to the entire mip. There shouldn't ever be a case where we
>     // would lose existing data.
>-    if (imageIndex.type == GL_TEXTURE_3D)
>+    if (index.getType() == gl::TextureType::_3D)
>+    {
>+        index = gl::ImageIndex::Make3D(index.getLevelIndex(), gl::ImageIndex::kEntireLevel);
>+    }
>+    else if (index.getType() == gl::TextureType::_2DArray && !index.hasLayer())
>     {
>-        imageIndex.layerIndex = gl::ImageIndex::ENTIRE_LEVEL;
>+        std::array<GLint, gl::IMPLEMENTATION_MAX_TEXTURE_LEVELS> tempLayerCounts;
>+
>+        GLint levelIndex            = index.getLevelIndex();
>+        tempLayerCounts[levelIndex] = getLayerCount(levelIndex);
>+        gl::ImageIndexIterator iterator =
>+            gl::ImageIndexIterator::Make2DArray(levelIndex, levelIndex + 1, tempLayerCounts.data());
>+        while (iterator.hasNext())
>+        {
>+            ANGLE_TRY(initializeContents(context, iterator.next()));
>+        }
>+        return angle::Result::Continue;
>     }
>-    else if (imageIndex.type == GL_TEXTURE_2D_ARRAY &&
>-             imageIndex.layerIndex == gl::ImageIndex::ENTIRE_LEVEL)
>+    else if (index.getType() == gl::TextureType::_2DMultisampleArray && !index.hasLayer())
>     {
>-        GLsizei layerCount = getLayerCount(imageIndex.mipIndex);
>-        for (imageIndex.layerIndex = 0; imageIndex.layerIndex < layerCount; ++imageIndex.layerIndex)
>+        std::array<GLint, gl::IMPLEMENTATION_MAX_TEXTURE_LEVELS> tempLayerCounts;
>+
>+        ASSERT(index.getLevelIndex() == 0);
>+        tempLayerCounts[0] = getLayerCount(0);
>+        gl::ImageIndexIterator iterator =
>+            gl::ImageIndexIterator::Make2DMultisampleArray(tempLayerCounts.data());
>+        while (iterator.hasNext())
>         {
>-            ANGLE_TRY(initializeContents(context, imageIndex));
>+            ANGLE_TRY(initializeContents(context, iterator.next()));
>         }
>-        return gl::NoError();
>+        return angle::Result::Continue;
>     }
> 
>     // Force image clean.
>-    ImageD3D *image = getImage(imageIndex);
>+    ImageD3D *image = getImage(index);
>     if (image)
>     {
>         image->markClean();
>     }
> 
>     // Fast path: can use a render target clear.
>-    if (canCreateRenderTargetForImage(imageIndex))
>+    // We don't use the fast path with the zero max lod workaround because it would introduce a race
>+    // between the rendertarget and the staging images.
>+    if (canCreateRenderTargetForImage(index) && !mRenderer->getWorkarounds().zeroMaxLodWorkaround)
>     {
>         ANGLE_TRY(ensureRenderTarget(context));
>         ASSERT(mTexStorage);
>         RenderTargetD3D *renderTarget = nullptr;
>-        ANGLE_TRY(mTexStorage->getRenderTarget(context, imageIndex, &renderTarget));
>-        ANGLE_TRY(mRenderer->initRenderTarget(renderTarget));
>-        return gl::NoError();
>+        ANGLE_TRY(mTexStorage->getRenderTarget(context, index, &renderTarget));
>+        ANGLE_TRY(mRenderer->initRenderTarget(context, renderTarget));
>+        return angle::Result::Continue;
>     }
> 
>     // Slow path: non-renderable texture or the texture levels aren't set up.
>     const auto &formatInfo = gl::GetSizedInternalFormatInfo(image->getInternalFormat());
> 
>-    size_t imageBytes = 0;
>-    ANGLE_TRY_RESULT(formatInfo.computeRowPitch(formatInfo.type, image->getWidth(), 1, 0),
>-                     imageBytes);
>+    GLuint imageBytes = 0;
>+    ANGLE_CHECK_GL_MATH(contextD3D, formatInfo.computeRowPitch(formatInfo.type, image->getWidth(),
>+                                                               1, 0, &imageBytes));
>     imageBytes *= image->getHeight() * image->getDepth();
> 
>-    gl::PixelUnpackState defaultUnpackState;
>+    gl::PixelUnpackState zeroDataUnpackState;
>+    zeroDataUnpackState.alignment = 1;
> 
>     angle::MemoryBuffer *zeroBuffer = nullptr;
>-    ANGLE_TRY(context->getZeroFilledBuffer(imageBytes, &zeroBuffer));
>+    ANGLE_CHECK_GL_ALLOC(contextD3D, context->getZeroFilledBuffer(imageBytes, &zeroBuffer));
>+
>     if (shouldUseSetData(image))
>     {
>-        ANGLE_TRY(mTexStorage->setData(context, imageIndex, image, nullptr, formatInfo.type,
>-                                       defaultUnpackState, zeroBuffer->data()));
>+        ANGLE_TRY(mTexStorage->setData(context, index, image, nullptr, formatInfo.type,
>+                                       zeroDataUnpackState, zeroBuffer->data()));
>     }
>     else
>     {
>         gl::Box fullImageArea(0, 0, 0, image->getWidth(), image->getHeight(), image->getDepth());
>-        ANGLE_TRY(image->loadData(context, fullImageArea, defaultUnpackState, formatInfo.type,
>+        ANGLE_TRY(image->loadData(context, fullImageArea, zeroDataUnpackState, formatInfo.type,
>                                   zeroBuffer->data(), false));
> 
>         // Force an update to the tex storage so we avoid problems with subImage and dirty regions.
>         if (mTexStorage)
>         {
>-            ANGLE_TRY(commitRegion(context, imageIndex, fullImageArea));
>+            ANGLE_TRY(commitRegion(context, index, fullImageArea));
>             image->markClean();
>         }
>         else
>@@ -738,7 +778,7 @@ gl::Error TextureD3D::initializeContents(const gl::Context *context,
>             mDirtyImages = true;
>         }
>     }
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
> TextureD3D_2D::TextureD3D_2D(const gl::TextureState &state, RendererD3D *renderer)
>@@ -751,7 +791,7 @@ TextureD3D_2D::TextureD3D_2D(const gl::TextureState &state, RendererD3D *rendere
>     }
> }
> 
>-gl::Error TextureD3D_2D::onDestroy(const gl::Context *context)
>+void TextureD3D_2D::onDestroy(const gl::Context *context)
> {
>     // Delete the Images before the TextureStorage. Images might be relying on the TextureStorage
>     // for some of their data. If TextureStorage is deleted before the Images, then their data will
>@@ -763,9 +803,7 @@ gl::Error TextureD3D_2D::onDestroy(const gl::Context *context)
>     return TextureD3D::onDestroy(context);
> }
> 
>-TextureD3D_2D::~TextureD3D_2D()
>-{
>-}
>+TextureD3D_2D::~TextureD3D_2D() {}
> 
> ImageD3D *TextureD3D_2D::getImage(int level, int layer) const
> {
>@@ -776,10 +814,10 @@ ImageD3D *TextureD3D_2D::getImage(int level, int layer) const
> 
> ImageD3D *TextureD3D_2D::getImage(const gl::ImageIndex &index) const
> {
>-    ASSERT(index.mipIndex < gl::IMPLEMENTATION_MAX_TEXTURE_LEVELS);
>+    ASSERT(index.getLevelIndex() < gl::IMPLEMENTATION_MAX_TEXTURE_LEVELS);
>     ASSERT(!index.hasLayer());
>-    ASSERT(index.type == GL_TEXTURE_2D);
>-    return mImageArray[index.mipIndex].get();
>+    ASSERT(index.getType() == gl::TextureType::_2D);
>+    return mImageArray[index.getLevelIndex()].get();
> }
> 
> GLsizei TextureD3D_2D::getLayerCount(int level) const
>@@ -822,44 +860,41 @@ bool TextureD3D_2D::isSRGB(GLint level) const
>     return gl::GetSizedInternalFormatInfo(getInternalFormat(level)).colorEncoding == GL_SRGB;
> }
> 
>-gl::Error TextureD3D_2D::setImage(const gl::Context *context,
>-                                  GLenum target,
>-                                  size_t imageLevel,
>-                                  GLenum internalFormat,
>-                                  const gl::Extents &size,
>-                                  GLenum format,
>-                                  GLenum type,
>-                                  const gl::PixelUnpackState &unpack,
>-                                  const uint8_t *pixels)
>+angle::Result TextureD3D_2D::setImage(const gl::Context *context,
>+                                      const gl::ImageIndex &index,
>+                                      GLenum internalFormat,
>+                                      const gl::Extents &size,
>+                                      GLenum format,
>+                                      GLenum type,
>+                                      const gl::PixelUnpackState &unpack,
>+                                      const uint8_t *pixels)
> {
>-    ASSERT(target == GL_TEXTURE_2D && size.depth == 1);
>+    ASSERT(index.getTarget() == gl::TextureTarget::_2D && size.depth == 1);
> 
>     const gl::InternalFormat &internalFormatInfo = gl::GetInternalFormatInfo(internalFormat, type);
> 
>     bool fastUnpacked = false;
>-    GLint level       = static_cast<GLint>(imageLevel);
>-
>-    ANGLE_TRY(redefineImage(context, level, internalFormatInfo.sizedInternalFormat, size, false));
> 
>-    gl::ImageIndex index = gl::ImageIndex::Make2D(level);
>+    ANGLE_TRY(redefineImage(context, index.getLevelIndex(), internalFormatInfo.sizedInternalFormat,
>+                            size, false));
> 
>     // Attempt a fast gpu copy of the pixel data to the surface
>-    gl::Buffer *unpackBuffer =
>-        context->getGLState().getTargetBuffer(gl::BufferBinding::PixelUnpack);
>+    gl::Buffer *unpackBuffer = context->getState().getTargetBuffer(gl::BufferBinding::PixelUnpack);
>     if (isFastUnpackable(unpackBuffer, internalFormatInfo.sizedInternalFormat) &&
>-        isLevelComplete(level))
>+        isLevelComplete(index.getLevelIndex()))
>     {
>         // Will try to create RT storage if it does not exist
>         RenderTargetD3D *destRenderTarget = nullptr;
>         ANGLE_TRY(getRenderTarget(context, index, &destRenderTarget));
> 
>-        gl::Box destArea(0, 0, 0, getWidth(level), getHeight(level), 1);
>+        gl::Box destArea(0, 0, 0, getWidth(index.getLevelIndex()), getHeight(index.getLevelIndex()),
>+                         1);
> 
>         ANGLE_TRY(fastUnpackPixels(context, unpack, pixels, destArea,
>                                    internalFormatInfo.sizedInternalFormat, type, destRenderTarget));
> 
>         // Ensure we don't overwrite our newly initialized data
>-        mImageArray[level]->markClean();
>+        mImageArray[index.getLevelIndex()]->markClean();
> 
>         fastUnpacked = true;
>     }
>@@ -869,233 +904,211 @@ gl::Error TextureD3D_2D::setImage(const gl::Context *context,
>         ANGLE_TRY(setImageImpl(context, index, type, unpack, pixels, 0));
>     }
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error TextureD3D_2D::setSubImage(const gl::Context *context,
>-                                     GLenum target,
>-                                     size_t imageLevel,
>-                                     const gl::Box &area,
>-                                     GLenum format,
>-                                     GLenum type,
>-                                     const gl::PixelUnpackState &unpack,
>-                                     const uint8_t *pixels)
>+angle::Result TextureD3D_2D::setSubImage(const gl::Context *context,
>+                                         const gl::ImageIndex &index,
>+                                         const gl::Box &area,
>+                                         GLenum format,
>+                                         GLenum type,
>+                                         const gl::PixelUnpackState &unpack,
>+                                         gl::Buffer *unpackBuffer,
>+                                         const uint8_t *pixels)
> {
>-    ASSERT(target == GL_TEXTURE_2D && area.depth == 1 && area.z == 0);
>-
>-    GLint level          = static_cast<GLint>(imageLevel);
>-    gl::ImageIndex index = gl::ImageIndex::Make2D(level);
>+    ASSERT(index.getTarget() == gl::TextureTarget::_2D && area.depth == 1 && area.z == 0);
> 
>-    gl::Buffer *unpackBuffer =
>-        context->getGLState().getTargetBuffer(gl::BufferBinding::PixelUnpack);
>-    if (isFastUnpackable(unpackBuffer, getInternalFormat(level)) && isLevelComplete(level))
>+    GLenum mipFormat = getInternalFormat(index.getLevelIndex());
>+    if (isFastUnpackable(unpackBuffer, mipFormat) && isLevelComplete(index.getLevelIndex()))
>     {
>         RenderTargetD3D *renderTarget = nullptr;
>         ANGLE_TRY(getRenderTarget(context, index, &renderTarget));
>-        ASSERT(!mImageArray[level]->isDirty());
>+        ASSERT(!mImageArray[index.getLevelIndex()]->isDirty());
> 
>-        return fastUnpackPixels(context, unpack, pixels, area, getInternalFormat(level), type,
>-                                renderTarget);
>+        return fastUnpackPixels(context, unpack, pixels, area, mipFormat, type, renderTarget);
>     }
>     else
>     {
>-        return TextureD3D::subImage(context, index, area, format, type, unpack, pixels, 0);
>+        return TextureD3D::subImage(context, index, area, format, type, unpack, unpackBuffer,
>+                                    pixels, 0);
>     }
> }
> 
>-gl::Error TextureD3D_2D::setCompressedImage(const gl::Context *context,
>-                                            GLenum target,
>-                                            size_t imageLevel,
>-                                            GLenum internalFormat,
>-                                            const gl::Extents &size,
>-                                            const gl::PixelUnpackState &unpack,
>-                                            size_t imageSize,
>-                                            const uint8_t *pixels)
>+angle::Result TextureD3D_2D::setCompressedImage(const gl::Context *context,
>+                                                const gl::ImageIndex &index,
>+                                                GLenum internalFormat,
>+                                                const gl::Extents &size,
>+                                                const gl::PixelUnpackState &unpack,
>+                                                size_t imageSize,
>+                                                const uint8_t *pixels)
> {
>-    ASSERT(target == GL_TEXTURE_2D && size.depth == 1);
>-    GLint level = static_cast<GLint>(imageLevel);
>+    ASSERT(index.getTarget() == gl::TextureTarget::_2D && size.depth == 1);
> 
>-    // compressed formats don't have separate sized internal formats-- we can just use the compressed format directly
>-    ANGLE_TRY(redefineImage(context, level, internalFormat, size, false));
>+    // compressed formats don't have separate sized internal formats-- we can just use the
>+    // compressed format directly
>+    ANGLE_TRY(redefineImage(context, index.getLevelIndex(), internalFormat, size, false));
> 
>-    return setCompressedImageImpl(context, gl::ImageIndex::Make2D(level), unpack, pixels, 0);
>+    return setCompressedImageImpl(context, index, unpack, pixels, 0);
> }
> 
>-gl::Error TextureD3D_2D::setCompressedSubImage(const gl::Context *context,
>-                                               GLenum target,
>-                                               size_t level,
>-                                               const gl::Box &area,
>-                                               GLenum format,
>-                                               const gl::PixelUnpackState &unpack,
>-                                               size_t imageSize,
>-                                               const uint8_t *pixels)
>+angle::Result TextureD3D_2D::setCompressedSubImage(const gl::Context *context,
>+                                                   const gl::ImageIndex &index,
>+                                                   const gl::Box &area,
>+                                                   GLenum format,
>+                                                   const gl::PixelUnpackState &unpack,
>+                                                   size_t imageSize,
>+                                                   const uint8_t *pixels)
> {
>-    ASSERT(target == GL_TEXTURE_2D && area.depth == 1 && area.z == 0);
>-
>-    gl::ImageIndex index = gl::ImageIndex::Make2D(static_cast<GLint>(level));
>+    ASSERT(index.getTarget() == gl::TextureTarget::_2D && area.depth == 1 && area.z == 0);
>     ANGLE_TRY(TextureD3D::subImageCompressed(context, index, area, format, unpack, pixels, 0));
> 
>     return commitRegion(context, index, area);
> }
> 
>-gl::Error TextureD3D_2D::copyImage(const gl::Context *context,
>-                                   GLenum target,
>-                                   size_t imageLevel,
>-                                   const gl::Rectangle &origSourceArea,
>-                                   GLenum internalFormat,
>-                                   const gl::Framebuffer *source)
>+angle::Result TextureD3D_2D::copyImage(const gl::Context *context,
>+                                       const gl::ImageIndex &index,
>+                                       const gl::Rectangle &sourceArea,
>+                                       GLenum internalFormat,
>+                                       gl::Framebuffer *source)
> {
>-    ASSERT(target == GL_TEXTURE_2D);
>+    ASSERT(index.getTarget() == gl::TextureTarget::_2D);
> 
>-    GLint level = static_cast<GLint>(imageLevel);
>     const gl::InternalFormat &internalFormatInfo =
>         gl::GetInternalFormatInfo(internalFormat, GL_UNSIGNED_BYTE);
>-    gl::Extents sourceExtents(origSourceArea.width, origSourceArea.height, 1);
>-    ANGLE_TRY(redefineImage(context, level, internalFormatInfo.sizedInternalFormat, sourceExtents,
>-                            false));
>+    gl::Extents sourceExtents(sourceArea.width, sourceArea.height, 1);
>+    ANGLE_TRY(redefineImage(context, index.getLevelIndex(), internalFormatInfo.sizedInternalFormat,
>+                            sourceExtents, false));
> 
>     gl::Extents fbSize = source->getReadColorbuffer()->getSize();
> 
>     // Does the read area extend beyond the framebuffer?
>-    bool outside = origSourceArea.x < 0 || origSourceArea.y < 0 ||
>-                   origSourceArea.x + origSourceArea.width > fbSize.width ||
>-                   origSourceArea.y + origSourceArea.height > fbSize.height;
>-
>-    // In WebGL mode we need to zero the texture outside the framebuffer.
>-    // If we have robust resource init, it was already zeroed by redefineImage() above, otherwise
>-    // zero it explicitly.
>-    // TODO(fjhenigman): When robust resource is fully implemented look into making it a
>-    // prerequisite for WebGL and deleting this code.
>+    bool outside = sourceArea.x < 0 || sourceArea.y < 0 ||
>+                   sourceArea.x + sourceArea.width > fbSize.width ||
>+                   sourceArea.y + sourceArea.height > fbSize.height;
>+
>+    // WebGL requires that pixels that would be outside the framebuffer are treated as zero values,
>+    // so clear the mip level to 0 prior to making the copy if any pixel would be sampled outside.
>+    // Same thing for robust resource init.
>     if (outside &&
>         (context->getExtensions().webglCompatibility || context->isRobustResourceInitEnabled()))
>     {
>-        angle::MemoryBuffer *zero;
>-        ANGLE_TRY(context->getZeroFilledBuffer(
>-            origSourceArea.width * origSourceArea.height * internalFormatInfo.pixelBytes, &zero));
>-        gl::PixelUnpackState unpack;
>-        unpack.alignment = 1;
>-        ANGLE_TRY(setImage(context, target, imageLevel, internalFormat, sourceExtents,
>-                           internalFormatInfo.format, internalFormatInfo.type, unpack,
>-                           zero->data()));
>+        ANGLE_TRY(initializeContents(context, index));
>     }
> 
>-    gl::Rectangle sourceArea;
>-    if (!ClipRectangle(origSourceArea, gl::Rectangle(0, 0, fbSize.width, fbSize.height),
>-                       &sourceArea))
>+    gl::Rectangle clippedArea;
>+    if (!ClipRectangle(sourceArea, gl::Rectangle(0, 0, fbSize.width, fbSize.height), &clippedArea))
>     {
>         // Empty source area, nothing to do.
>-        return gl::NoError();
>+        return angle::Result::Continue;
>     }
> 
>-    gl::ImageIndex index = gl::ImageIndex::Make2D(level);
>-    gl::Offset destOffset(sourceArea.x - origSourceArea.x, sourceArea.y - origSourceArea.y, 0);
>+    gl::Offset destOffset(clippedArea.x - sourceArea.x, clippedArea.y - sourceArea.y, 0);
> 
>-    // If the zero max LOD workaround is active, then we can't sample from individual layers of the framebuffer in shaders,
>-    // so we should use the non-rendering copy path.
>+    // If the zero max LOD workaround is active, then we can't sample from individual layers of the
>+    // framebuffer in shaders, so we should use the non-rendering copy path.
>     if (!canCreateRenderTargetForImage(index) || mRenderer->getWorkarounds().zeroMaxLodWorkaround)
>     {
>-        ANGLE_TRY(mImageArray[level]->copyFromFramebuffer(context, destOffset, sourceArea, source));
>+        ANGLE_TRY(mImageArray[index.getLevelIndex()]->copyFromFramebuffer(context, destOffset,
>+                                                                          clippedArea, source));
>         mDirtyImages = true;
>     }
>     else
>     {
>         ANGLE_TRY(ensureRenderTarget(context));
> 
>-        if (sourceArea.width != 0 && sourceArea.height != 0 && isValidLevel(level))
>+        if (clippedArea.width != 0 && clippedArea.height != 0 &&
>+            isValidLevel(index.getLevelIndex()))
>         {
>-            ANGLE_TRY(updateStorageLevel(context, level));
>-            ANGLE_TRY(mRenderer->copyImage2D(context, source, sourceArea, internalFormat,
>-                                             destOffset, mTexStorage, level));
>+            ANGLE_TRY(updateStorageLevel(context, index.getLevelIndex()));
>+            ANGLE_TRY(mRenderer->copyImage2D(context, source, clippedArea, internalFormat,
>+                                             destOffset, mTexStorage, index.getLevelIndex()));
>         }
>     }
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error TextureD3D_2D::copySubImage(const gl::Context *context,
>-                                      GLenum target,
>-                                      size_t imageLevel,
>-                                      const gl::Offset &origDestOffset,
>-                                      const gl::Rectangle &origSourceArea,
>-                                      const gl::Framebuffer *source)
>+angle::Result TextureD3D_2D::copySubImage(const gl::Context *context,
>+                                          const gl::ImageIndex &index,
>+                                          const gl::Offset &destOffset,
>+                                          const gl::Rectangle &sourceArea,
>+                                          gl::Framebuffer *source)
> {
>-    ASSERT(target == GL_TEXTURE_2D && origDestOffset.z == 0);
>+    ASSERT(index.getTarget() == gl::TextureTarget::_2D && destOffset.z == 0);
> 
>     gl::Extents fbSize = source->getReadColorbuffer()->getSize();
>-    gl::Rectangle sourceArea;
>-    if (!ClipRectangle(origSourceArea, gl::Rectangle(0, 0, fbSize.width, fbSize.height),
>-                       &sourceArea))
>+    gl::Rectangle clippedArea;
>+    if (!ClipRectangle(sourceArea, gl::Rectangle(0, 0, fbSize.width, fbSize.height), &clippedArea))
>     {
>-        return gl::NoError();
>+        return angle::Result::Continue;
>     }
>-    const gl::Offset destOffset(origDestOffset.x + sourceArea.x - origSourceArea.x,
>-                                origDestOffset.y + sourceArea.y - origSourceArea.y, 0);
>+    const gl::Offset clippedOffset(destOffset.x + clippedArea.x - sourceArea.x,
>+                                   destOffset.y + clippedArea.y - sourceArea.y, 0);
> 
>-    // can only make our texture storage to a render target if level 0 is defined (with a width & height) and
>-    // the current level we're copying to is defined (with appropriate format, width & height)
>+    // can only make our texture storage to a render target if level 0 is defined (with a width &
>+    // height) and the current level we're copying to is defined (with appropriate format, width &
>+    // height)
> 
>-    GLint level          = static_cast<GLint>(imageLevel);
>-    gl::ImageIndex index = gl::ImageIndex::Make2D(level);
>-
>-    // If the zero max LOD workaround is active, then we can't sample from individual layers of the framebuffer in shaders,
>-    // so we should use the non-rendering copy path.
>+    // If the zero max LOD workaround is active, then we can't sample from individual layers of the
>+    // framebuffer in shaders, so we should use the non-rendering copy path.
>     if (!canCreateRenderTargetForImage(index) || mRenderer->getWorkarounds().zeroMaxLodWorkaround)
>     {
>-        ANGLE_TRY(mImageArray[level]->copyFromFramebuffer(context, destOffset, sourceArea, source));
>+        ANGLE_TRY(mImageArray[index.getLevelIndex()]->copyFromFramebuffer(context, clippedOffset,
>+                                                                          clippedArea, source));
>         mDirtyImages = true;
>     }
>     else
>     {
>         ANGLE_TRY(ensureRenderTarget(context));
> 
>-        if (isValidLevel(level))
>+        if (isValidLevel(index.getLevelIndex()))
>         {
>-            ANGLE_TRY(updateStorageLevel(context, level));
>-            ANGLE_TRY(mRenderer->copyImage2D(context, source, sourceArea,
>+            ANGLE_TRY(updateStorageLevel(context, index.getLevelIndex()));
>+            ANGLE_TRY(mRenderer->copyImage2D(context, source, clippedArea,
>                                              gl::GetUnsizedFormat(getBaseLevelInternalFormat()),
>-                                             destOffset, mTexStorage, level));
>+                                             clippedOffset, mTexStorage, index.getLevelIndex()));
>         }
>     }
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error TextureD3D_2D::copyTexture(const gl::Context *context,
>-                                     GLenum target,
>-                                     size_t level,
>-                                     GLenum internalFormat,
>-                                     GLenum type,
>-                                     size_t sourceLevel,
>-                                     bool unpackFlipY,
>-                                     bool unpackPremultiplyAlpha,
>-                                     bool unpackUnmultiplyAlpha,
>-                                     const gl::Texture *source)
>+angle::Result TextureD3D_2D::copyTexture(const gl::Context *context,
>+                                         const gl::ImageIndex &index,
>+                                         GLenum internalFormat,
>+                                         GLenum type,
>+                                         size_t sourceLevel,
>+                                         bool unpackFlipY,
>+                                         bool unpackPremultiplyAlpha,
>+                                         bool unpackUnmultiplyAlpha,
>+                                         const gl::Texture *source)
> {
>-    ASSERT(target == GL_TEXTURE_2D);
>-
>-    GLenum sourceTarget = source->getTarget();
>+    ASSERT(index.getTarget() == gl::TextureTarget::_2D);
> 
>-    GLint destLevel = static_cast<GLint>(level);
>+    gl::TextureType sourceType = source->getType();
> 
>     const gl::InternalFormat &internalFormatInfo = gl::GetInternalFormatInfo(internalFormat, type);
>-    gl::Extents size(static_cast<int>(source->getWidth(sourceTarget, sourceLevel)),
>-                     static_cast<int>(source->getHeight(sourceTarget, sourceLevel)), 1);
>-    ANGLE_TRY(
>-        redefineImage(context, destLevel, internalFormatInfo.sizedInternalFormat, size, false));
>+    gl::Extents size(
>+        static_cast<int>(source->getWidth(NonCubeTextureTypeToTarget(sourceType), sourceLevel)),
>+        static_cast<int>(source->getHeight(NonCubeTextureTypeToTarget(sourceType), sourceLevel)),
>+        1);
>+    ANGLE_TRY(redefineImage(context, index.getLevelIndex(), internalFormatInfo.sizedInternalFormat,
>+                            size, false));
> 
>-    gl::Rectangle sourceRect(0, 0, size.width, size.height);
>+    gl::Box sourceBox(0, 0, 0, size.width, size.height, 1);
>     gl::Offset destOffset(0, 0, 0);
> 
>-    if (!isSRGB(destLevel) && canCreateRenderTargetForImage(gl::ImageIndex::Make2D(destLevel)))
>+    if (!isSRGB(index.getLevelIndex()) && canCreateRenderTargetForImage(index))
>     {
>         ANGLE_TRY(ensureRenderTarget(context));
>-        ASSERT(isValidLevel(destLevel));
>-        ANGLE_TRY(updateStorageLevel(context, destLevel));
>+        ASSERT(isValidLevel(index.getLevelIndex()));
>+        ANGLE_TRY(updateStorageLevel(context, index.getLevelIndex()));
> 
>-        ANGLE_TRY(mRenderer->copyTexture(context, source, static_cast<GLint>(sourceLevel),
>-                                         sourceRect, internalFormatInfo.format, destOffset,
>-                                         mTexStorage, target, destLevel, unpackFlipY,
>-                                         unpackPremultiplyAlpha, unpackUnmultiplyAlpha));
>+        ANGLE_TRY(mRenderer->copyTexture(
>+            context, source, static_cast<GLint>(sourceLevel), gl::TextureTarget::_2D, sourceBox,
>+            internalFormatInfo.format, internalFormatInfo.type, destOffset, mTexStorage,
>+            index.getTarget(), index.getLevelIndex(), unpackFlipY, unpackPremultiplyAlpha,
>+            unpackUnmultiplyAlpha));
>     }
>     else
>     {
>@@ -1104,47 +1117,46 @@ gl::Error TextureD3D_2D::copyTexture(const gl::Context *context,
>         ImageD3D *sourceImage           = nullptr;
>         ANGLE_TRY(sourceD3D->getImageAndSyncFromStorage(context, sourceImageIndex, &sourceImage));
> 
>-        gl::ImageIndex destImageIndex = gl::ImageIndex::Make2D(static_cast<GLint>(destLevel));
>-        ImageD3D *destImage           = nullptr;
>-        ANGLE_TRY(getImageAndSyncFromStorage(context, destImageIndex, &destImage));
>+        ImageD3D *destImage = nullptr;
>+        ANGLE_TRY(getImageAndSyncFromStorage(context, index, &destImage));
> 
>-        ANGLE_TRY(mRenderer->copyImage(context, destImage, sourceImage, sourceRect, destOffset,
>+        ANGLE_TRY(mRenderer->copyImage(context, destImage, sourceImage, sourceBox, destOffset,
>                                        unpackFlipY, unpackPremultiplyAlpha, unpackUnmultiplyAlpha));
> 
>         mDirtyImages = true;
> 
>         gl::Box destRegion(destOffset, size);
>-        ANGLE_TRY(commitRegion(context, destImageIndex, destRegion));
>+        ANGLE_TRY(commitRegion(context, index, destRegion));
>     }
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error TextureD3D_2D::copySubTexture(const gl::Context *context,
>-                                        GLenum target,
>-                                        size_t level,
>-                                        const gl::Offset &destOffset,
>-                                        size_t sourceLevel,
>-                                        const gl::Rectangle &sourceArea,
>-                                        bool unpackFlipY,
>-                                        bool unpackPremultiplyAlpha,
>-                                        bool unpackUnmultiplyAlpha,
>-                                        const gl::Texture *source)
>+angle::Result TextureD3D_2D::copySubTexture(const gl::Context *context,
>+                                            const gl::ImageIndex &index,
>+                                            const gl::Offset &destOffset,
>+                                            size_t sourceLevel,
>+                                            const gl::Box &sourceBox,
>+                                            bool unpackFlipY,
>+                                            bool unpackPremultiplyAlpha,
>+                                            bool unpackUnmultiplyAlpha,
>+                                            const gl::Texture *source)
> {
>-    ASSERT(target == GL_TEXTURE_2D);
>-
>-    GLint destLevel = static_cast<GLint>(level);
>+    ASSERT(index.getTarget() == gl::TextureTarget::_2D);
> 
>-    if (!isSRGB(destLevel) && canCreateRenderTargetForImage(gl::ImageIndex::Make2D(destLevel)))
>+    if (!isSRGB(index.getLevelIndex()) && canCreateRenderTargetForImage(index))
>     {
>         ANGLE_TRY(ensureRenderTarget(context));
>-        ASSERT(isValidLevel(destLevel));
>-        ANGLE_TRY(updateStorageLevel(context, destLevel));
>+        ASSERT(isValidLevel(index.getLevelIndex()));
>+        ANGLE_TRY(updateStorageLevel(context, index.getLevelIndex()));
> 
>+        const gl::InternalFormat &internalFormatInfo =
>+            gl::GetSizedInternalFormatInfo(getInternalFormat(index.getLevelIndex()));
>         ANGLE_TRY(mRenderer->copyTexture(
>-            context, source, static_cast<GLint>(sourceLevel), sourceArea,
>-            gl::GetUnsizedFormat(getInternalFormat(destLevel)), destOffset, mTexStorage, target,
>-            destLevel, unpackFlipY, unpackPremultiplyAlpha, unpackUnmultiplyAlpha));
>+            context, source, static_cast<GLint>(sourceLevel), gl::TextureTarget::_2D, sourceBox,
>+            internalFormatInfo.format, internalFormatInfo.type, destOffset, mTexStorage,
>+            index.getTarget(), index.getLevelIndex(), unpackFlipY, unpackPremultiplyAlpha,
>+            unpackUnmultiplyAlpha));
>     }
>     else
>     {
>@@ -1153,27 +1165,26 @@ gl::Error TextureD3D_2D::copySubTexture(const gl::Context *context,
>         ImageD3D *sourceImage           = nullptr;
>         ANGLE_TRY(sourceD3D->getImageAndSyncFromStorage(context, sourceImageIndex, &sourceImage));
> 
>-        gl::ImageIndex destImageIndex = gl::ImageIndex::Make2D(static_cast<GLint>(destLevel));
>-        ImageD3D *destImage           = nullptr;
>-        ANGLE_TRY(getImageAndSyncFromStorage(context, destImageIndex, &destImage));
>+        ImageD3D *destImage = nullptr;
>+        ANGLE_TRY(getImageAndSyncFromStorage(context, index, &destImage));
> 
>-        ANGLE_TRY(mRenderer->copyImage(context, destImage, sourceImage, sourceArea, destOffset,
>+        ANGLE_TRY(mRenderer->copyImage(context, destImage, sourceImage, sourceBox, destOffset,
>                                        unpackFlipY, unpackPremultiplyAlpha, unpackUnmultiplyAlpha));
> 
>         mDirtyImages = true;
> 
>-        gl::Box destRegion(destOffset.x, destOffset.y, 0, sourceArea.width, sourceArea.height, 1);
>-        ANGLE_TRY(commitRegion(context, destImageIndex, destRegion));
>+        gl::Box destRegion(destOffset.x, destOffset.y, 0, sourceBox.width, sourceBox.height, 1);
>+        ANGLE_TRY(commitRegion(context, index, destRegion));
>     }
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error TextureD3D_2D::copyCompressedTexture(const gl::Context *context,
>-                                               const gl::Texture *source)
>+angle::Result TextureD3D_2D::copyCompressedTexture(const gl::Context *context,
>+                                                   const gl::Texture *source)
> {
>-    GLenum sourceTarget = source->getTarget();
>-    GLint sourceLevel   = 0;
>+    gl::TextureTarget sourceTarget = NonCubeTextureTypeToTarget(source->getType());
>+    GLint sourceLevel              = 0;
> 
>     GLint destLevel = 0;
> 
>@@ -1189,21 +1200,20 @@ gl::Error TextureD3D_2D::copyCompressedTexture(const gl::Context *context,
>     ANGLE_TRY(
>         mRenderer->copyCompressedTexture(context, source, sourceLevel, mTexStorage, destLevel));
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error TextureD3D_2D::setStorage(const gl::Context *context,
>-                                    GLenum target,
>-                                    size_t levels,
>-                                    GLenum internalFormat,
>-                                    const gl::Extents &size)
>+angle::Result TextureD3D_2D::setStorage(const gl::Context *context,
>+                                        gl::TextureType type,
>+                                        size_t levels,
>+                                        GLenum internalFormat,
>+                                        const gl::Extents &size)
> {
>-    ASSERT(GL_TEXTURE_2D && size.depth == 1);
>+    ASSERT(type == gl::TextureType::_2D && size.depth == 1);
> 
>     for (size_t level = 0; level < levels; level++)
>     {
>-        gl::Extents levelSize(std::max(1, size.width >> level),
>-                              std::max(1, size.height >> level),
>+        gl::Extents levelSize(std::max(1, size.width >> level), std::max(1, size.height >> level),
>                               1);
>         ANGLE_TRY(redefineImage(context, level, internalFormat, levelSize, true));
>     }
>@@ -1226,10 +1236,10 @@ gl::Error TextureD3D_2D::setStorage(const gl::Context *context,
> 
>     mImmutable = true;
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error TextureD3D_2D::bindTexImage(const gl::Context *context, egl::Surface *surface)
>+angle::Result TextureD3D_2D::bindTexImage(const gl::Context *context, egl::Surface *surface)
> {
>     GLenum internalformat = surface->getConfig()->renderTargetFormat;
> 
>@@ -1241,16 +1251,16 @@ gl::Error TextureD3D_2D::bindTexImage(const gl::Context *context, egl::Surface *
>     SurfaceD3D *surfaceD3D = GetImplAs<SurfaceD3D>(surface);
>     ASSERT(surfaceD3D);
> 
>-    mTexStorage = mRenderer->createTextureStorage2D(surfaceD3D->getSwapChain());
>+    mTexStorage     = mRenderer->createTextureStorage2D(surfaceD3D->getSwapChain());
>     mEGLImageTarget = false;
> 
>     mDirtyImages = false;
>     mImageArray[0]->markClean();
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error TextureD3D_2D::releaseTexImage(const gl::Context *context)
>+angle::Result TextureD3D_2D::releaseTexImage(const gl::Context *context)
> {
>     if (mTexStorage)
>     {
>@@ -1262,12 +1272,12 @@ gl::Error TextureD3D_2D::releaseTexImage(const gl::Context *context)
>         ANGLE_TRY(redefineImage(context, i, GL_NONE, gl::Extents(0, 0, 1), true));
>     }
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error TextureD3D_2D::setEGLImageTarget(const gl::Context *context,
>-                                           GLenum target,
>-                                           egl::Image *image)
>+angle::Result TextureD3D_2D::setEGLImageTarget(const gl::Context *context,
>+                                               gl::TextureType type,
>+                                               egl::Image *image)
> {
>     EGLImageD3D *eglImaged3d = GetImplAs<EGLImageD3D>(image);
> 
>@@ -1292,10 +1302,10 @@ gl::Error TextureD3D_2D::setEGLImageTarget(const gl::Context *context,
>     mTexStorage     = mRenderer->createTextureStorageEGLImage(eglImaged3d, renderTargetD3D);
>     mEGLImageTarget = true;
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error TextureD3D_2D::initMipmapImages(const gl::Context *context)
>+angle::Result TextureD3D_2D::initMipmapImages(const gl::Context *context)
> {
>     const GLuint baseLevel = mState.getEffectiveBaseLevel();
>     const GLuint maxLevel  = mState.getMipmapMaxLevel();
>@@ -1308,18 +1318,18 @@ gl::Error TextureD3D_2D::initMipmapImages(const gl::Context *context)
> 
>         ANGLE_TRY(redefineImage(context, level, getBaseLevelInternalFormat(), levelSize, false));
>     }
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error TextureD3D_2D::getRenderTarget(const gl::Context *context,
>-                                         const gl::ImageIndex &index,
>-                                         RenderTargetD3D **outRT)
>+angle::Result TextureD3D_2D::getRenderTarget(const gl::Context *context,
>+                                             const gl::ImageIndex &index,
>+                                             RenderTargetD3D **outRT)
> {
>     ASSERT(!index.hasLayer());
> 
>     // ensure the underlying texture is created
>     ANGLE_TRY(ensureRenderTarget(context));
>-    ANGLE_TRY(updateStorageLevel(context, index.mipIndex));
>+    ANGLE_TRY(updateStorageLevel(context, index.getLevelIndex()));
> 
>     return mTexStorage->getRenderTarget(context, index, outRT);
> }
>@@ -1374,22 +1384,22 @@ bool TextureD3D_2D::isLevelComplete(int level) const
> 
> bool TextureD3D_2D::isImageComplete(const gl::ImageIndex &index) const
> {
>-    return isLevelComplete(index.mipIndex);
>+    return isLevelComplete(index.getLevelIndex());
> }
> 
> // Constructs a native texture resource from the texture images
>-gl::Error TextureD3D_2D::initializeStorage(const gl::Context *context, bool renderTarget)
>+angle::Result TextureD3D_2D::initializeStorage(const gl::Context *context, bool renderTarget)
> {
>     // Only initialize the first time this texture is used as a render target or shader resource
>     if (mTexStorage)
>     {
>-        return gl::NoError();
>+        return angle::Result::Continue;
>     }
> 
>     // do not attempt to create storage for nonexistant data
>     if (!isLevelComplete(getBaseLevel()))
>     {
>-        return gl::NoError();
>+        return angle::Result::Continue;
>     }
> 
>     bool createRenderTarget = (renderTarget || IsRenderTargetUsage(mState.getUsage()));
>@@ -1405,11 +1415,11 @@ gl::Error TextureD3D_2D::initializeStorage(const gl::Context *context, bool rend
>     // flush image data to the storage
>     ANGLE_TRY(updateStorage(context));
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error TextureD3D_2D::createCompleteStorage(bool renderTarget,
>-                                               TexStoragePointer *outStorage) const
>+angle::Result TextureD3D_2D::createCompleteStorage(bool renderTarget,
>+                                                   TexStoragePointer *outStorage) const
> {
>     GLsizei width         = getLevelZeroWidth();
>     GLsizei height        = getLevelZeroHeight();
>@@ -1423,8 +1433,8 @@ gl::Error TextureD3D_2D::createCompleteStorage(bool renderTarget,
>     bool hintLevelZeroOnly = false;
>     if (mRenderer->getWorkarounds().zeroMaxLodWorkaround)
>     {
>-        // If any of the CPU images (levels >= 1) are dirty, then the textureStorage2D should use the mipped texture to begin with.
>-        // Otherwise, it should use the level-zero-only texture.
>+        // If any of the CPU images (levels >= 1) are dirty, then the textureStorage2D should use
>+        // the mipped texture to begin with. Otherwise, it should use the level-zero-only texture.
>         hintLevelZeroOnly = true;
>         for (int level = 1; level < levels && hintLevelZeroOnly; level++)
>         {
>@@ -1436,11 +1446,11 @@ gl::Error TextureD3D_2D::createCompleteStorage(bool renderTarget,
>     outStorage->reset(mRenderer->createTextureStorage2D(internalFormat, renderTarget, width, height,
>                                                         levels, hintLevelZeroOnly));
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error TextureD3D_2D::setCompleteTexStorage(const gl::Context *context,
>-                                               TextureStorage *newCompleteTexStorage)
>+angle::Result TextureD3D_2D::setCompleteTexStorage(const gl::Context *context,
>+                                                   TextureStorage *newCompleteTexStorage)
> {
>     if (newCompleteTexStorage && newCompleteTexStorage->isManaged())
>     {
>@@ -1456,14 +1466,14 @@ gl::Error TextureD3D_2D::setCompleteTexStorage(const gl::Context *context,
> 
>     mDirtyImages = true;
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error TextureD3D_2D::updateStorage(const gl::Context *context)
>+angle::Result TextureD3D_2D::updateStorage(const gl::Context *context)
> {
>     if (!mDirtyImages)
>     {
>-        return gl::NoError();
>+        return angle::Result::Continue;
>     }
> 
>     ASSERT(mTexStorage != nullptr);
>@@ -1477,10 +1487,10 @@ gl::Error TextureD3D_2D::updateStorage(const gl::Context *context)
>     }
> 
>     mDirtyImages = false;
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error TextureD3D_2D::updateStorageLevel(const gl::Context *context, int level)
>+angle::Result TextureD3D_2D::updateStorageLevel(const gl::Context *context, int level)
> {
>     ASSERT(level <= static_cast<int>(mImageArray.size()) && mImageArray[level] != nullptr);
>     ASSERT(isLevelComplete(level));
>@@ -1492,14 +1502,14 @@ gl::Error TextureD3D_2D::updateStorageLevel(const gl::Context *context, int leve
>         ANGLE_TRY(commitRegion(context, index, region));
>     }
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error TextureD3D_2D::redefineImage(const gl::Context *context,
>-                                       size_t level,
>-                                       GLenum internalformat,
>-                                       const gl::Extents &size,
>-                                       bool forceRelease)
>+angle::Result TextureD3D_2D::redefineImage(const gl::Context *context,
>+                                           size_t level,
>+                                           GLenum internalformat,
>+                                           const gl::Extents &size,
>+                                           bool forceRelease)
> {
>     ASSERT(size.depth == 1);
> 
>@@ -1508,7 +1518,7 @@ gl::Error TextureD3D_2D::redefineImage(const gl::Context *context,
>     const int storageHeight    = std::max(1, getLevelZeroHeight() >> level);
>     const GLenum storageFormat = getBaseLevelInternalFormat();
> 
>-    mImageArray[level]->redefine(GL_TEXTURE_2D, internalformat, size, forceRelease);
>+    mImageArray[level]->redefine(gl::TextureType::_2D, internalformat, size, forceRelease);
>     mDirtyImages = mDirtyImages || mImageArray[level]->isDirty();
> 
>     if (mTexStorage)
>@@ -1535,7 +1545,7 @@ gl::Error TextureD3D_2D::redefineImage(const gl::Context *context,
>     // Can't be an EGL image target after being redefined
>     mEGLImageTarget = false;
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
> gl::ImageIndexIterator TextureD3D_2D::imageIterator() const
>@@ -1551,8 +1561,8 @@ gl::ImageIndex TextureD3D_2D::getImageIndex(GLint mip, GLint /*layer*/) const
> 
> bool TextureD3D_2D::isValidIndex(const gl::ImageIndex &index) const
> {
>-    return (mTexStorage && index.type == GL_TEXTURE_2D &&
>-            index.mipIndex >= 0 && index.mipIndex < mTexStorage->getLevelCount());
>+    return (mTexStorage && index.getType() == gl::TextureType::_2D && index.getLevelIndex() >= 0 &&
>+            index.getLevelIndex() < mTexStorage->getLevelCount());
> }
> 
> void TextureD3D_2D::markAllImagesDirty()
>@@ -1576,7 +1586,7 @@ TextureD3D_Cube::TextureD3D_Cube(const gl::TextureState &state, RendererD3D *ren
>     }
> }
> 
>-gl::Error TextureD3D_Cube::onDestroy(const gl::Context *context)
>+void TextureD3D_Cube::onDestroy(const gl::Context *context)
> {
>     // Delete the Images before the TextureStorage. Images might be relying on the TextureStorage
>     // for some of their data. If TextureStorage is deleted before the Images, then their data will
>@@ -1591,28 +1601,26 @@ gl::Error TextureD3D_Cube::onDestroy(const gl::Context *context)
>     return TextureD3D::onDestroy(context);
> }
> 
>-TextureD3D_Cube::~TextureD3D_Cube()
>-{
>-}
>+TextureD3D_Cube::~TextureD3D_Cube() {}
> 
> ImageD3D *TextureD3D_Cube::getImage(int level, int layer) const
> {
>     ASSERT(level < gl::IMPLEMENTATION_MAX_TEXTURE_LEVELS);
>-    ASSERT(layer >= 0 && layer < 6);
>+    ASSERT(layer >= 0 && static_cast<size_t>(layer) < gl::kCubeFaceCount);
>     return mImageArray[layer][level].get();
> }
> 
> ImageD3D *TextureD3D_Cube::getImage(const gl::ImageIndex &index) const
> {
>-    ASSERT(index.mipIndex < gl::IMPLEMENTATION_MAX_TEXTURE_LEVELS);
>-    ASSERT(index.layerIndex >= 0 && index.layerIndex < 6);
>-    return mImageArray[index.layerIndex][index.mipIndex].get();
>+    ASSERT(index.getLevelIndex() < gl::IMPLEMENTATION_MAX_TEXTURE_LEVELS);
>+    ASSERT(gl::IsCubeMapFaceTarget(index.getTarget()));
>+    return mImageArray[index.cubeMapFaceIndex()][index.getLevelIndex()].get();
> }
> 
> GLsizei TextureD3D_Cube::getLayerCount(int level) const
> {
>     ASSERT(level < gl::IMPLEMENTATION_MAX_TEXTURE_LEVELS);
>-    return 6;
>+    return gl::kCubeFaceCount;
> }
> 
> GLenum TextureD3D_Cube::getInternalFormat(GLint level, GLint layer) const
>@@ -1633,147 +1641,123 @@ bool TextureD3D_Cube::isSRGB(GLint level, GLint layer) const
>     return gl::GetSizedInternalFormatInfo(getInternalFormat(level, layer)).colorEncoding == GL_SRGB;
> }
> 
>-gl::Error TextureD3D_Cube::setEGLImageTarget(const gl::Context *context,
>-                                             GLenum target,
>-                                             egl::Image *image)
>+angle::Result TextureD3D_Cube::setEGLImageTarget(const gl::Context *context,
>+                                                 gl::TextureType type,
>+                                                 egl::Image *image)
> {
>-    UNREACHABLE();
>-    return gl::InternalError();
>+    ANGLE_HR_UNREACHABLE(GetImplAs<ContextD3D>(context));
>+    return angle::Result::Continue;
> }
> 
>-gl::Error TextureD3D_Cube::setImage(const gl::Context *context,
>-                                    GLenum target,
>-                                    size_t level,
>-                                    GLenum internalFormat,
>-                                    const gl::Extents &size,
>-                                    GLenum format,
>-                                    GLenum type,
>-                                    const gl::PixelUnpackState &unpack,
>-                                    const uint8_t *pixels)
>+angle::Result TextureD3D_Cube::setImage(const gl::Context *context,
>+                                        const gl::ImageIndex &index,
>+                                        GLenum internalFormat,
>+                                        const gl::Extents &size,
>+                                        GLenum format,
>+                                        GLenum type,
>+                                        const gl::PixelUnpackState &unpack,
>+                                        const uint8_t *pixels)
> {
>     ASSERT(size.depth == 1);
> 
>     const gl::InternalFormat &internalFormatInfo = gl::GetInternalFormatInfo(internalFormat, type);
>-    gl::ImageIndex index       = gl::ImageIndex::MakeCube(target, static_cast<GLint>(level));
>-
>-    ANGLE_TRY(redefineImage(context, index.layerIndex, static_cast<GLint>(level),
>+    ANGLE_TRY(redefineImage(context, index.cubeMapFaceIndex(), index.getLevelIndex(),
>                             internalFormatInfo.sizedInternalFormat, size, false));
> 
>     return setImageImpl(context, index, type, unpack, pixels, 0);
> }
> 
>-gl::Error TextureD3D_Cube::setSubImage(const gl::Context *context,
>-                                       GLenum target,
>-                                       size_t level,
>-                                       const gl::Box &area,
>-                                       GLenum format,
>-                                       GLenum type,
>-                                       const gl::PixelUnpackState &unpack,
>-                                       const uint8_t *pixels)
>+angle::Result TextureD3D_Cube::setSubImage(const gl::Context *context,
>+                                           const gl::ImageIndex &index,
>+                                           const gl::Box &area,
>+                                           GLenum format,
>+                                           GLenum type,
>+                                           const gl::PixelUnpackState &unpack,
>+                                           gl::Buffer *unpackBuffer,
>+                                           const uint8_t *pixels)
> {
>     ASSERT(area.depth == 1 && area.z == 0);
>-
>-    gl::ImageIndex index = gl::ImageIndex::MakeCube(target, static_cast<GLint>(level));
>-    return TextureD3D::subImage(context, index, area, format, type, unpack, pixels, 0);
>+    return TextureD3D::subImage(context, index, area, format, type, unpack, unpackBuffer, pixels,
>+                                0);
> }
> 
>-gl::Error TextureD3D_Cube::setCompressedImage(const gl::Context *context,
>-                                              GLenum target,
>-                                              size_t level,
>-                                              GLenum internalFormat,
>-                                              const gl::Extents &size,
>-                                              const gl::PixelUnpackState &unpack,
>-                                              size_t imageSize,
>-                                              const uint8_t *pixels)
>+angle::Result TextureD3D_Cube::setCompressedImage(const gl::Context *context,
>+                                                  const gl::ImageIndex &index,
>+                                                  GLenum internalFormat,
>+                                                  const gl::Extents &size,
>+                                                  const gl::PixelUnpackState &unpack,
>+                                                  size_t imageSize,
>+                                                  const uint8_t *pixels)
> {
>     ASSERT(size.depth == 1);
> 
>-    // compressed formats don't have separate sized internal formats-- we can just use the compressed format directly
>-    size_t faceIndex = gl::CubeMapTextureTargetToLayerIndex(target);
>-
>-    ANGLE_TRY(redefineImage(context, static_cast<int>(faceIndex), static_cast<GLint>(level),
>+    // compressed formats don't have separate sized internal formats-- we can just use the
>+    // compressed format directly
>+    ANGLE_TRY(redefineImage(context, index.cubeMapFaceIndex(), index.getLevelIndex(),
>                             internalFormat, size, false));
> 
>-    gl::ImageIndex index = gl::ImageIndex::MakeCube(target, static_cast<GLint>(level));
>     return setCompressedImageImpl(context, index, unpack, pixels, 0);
> }
> 
>-gl::Error TextureD3D_Cube::setCompressedSubImage(const gl::Context *context,
>-                                                 GLenum target,
>-                                                 size_t level,
>-                                                 const gl::Box &area,
>-                                                 GLenum format,
>-                                                 const gl::PixelUnpackState &unpack,
>-                                                 size_t imageSize,
>-                                                 const uint8_t *pixels)
>+angle::Result TextureD3D_Cube::setCompressedSubImage(const gl::Context *context,
>+                                                     const gl::ImageIndex &index,
>+                                                     const gl::Box &area,
>+                                                     GLenum format,
>+                                                     const gl::PixelUnpackState &unpack,
>+                                                     size_t imageSize,
>+                                                     const uint8_t *pixels)
> {
>     ASSERT(area.depth == 1 && area.z == 0);
> 
>-    gl::ImageIndex index = gl::ImageIndex::MakeCube(target, static_cast<GLint>(level));
>-
>     ANGLE_TRY(TextureD3D::subImageCompressed(context, index, area, format, unpack, pixels, 0));
>     return commitRegion(context, index, area);
> }
> 
>-gl::Error TextureD3D_Cube::copyImage(const gl::Context *context,
>-                                     GLenum target,
>-                                     size_t imageLevel,
>-                                     const gl::Rectangle &origSourceArea,
>-                                     GLenum internalFormat,
>-                                     const gl::Framebuffer *source)
>+angle::Result TextureD3D_Cube::copyImage(const gl::Context *context,
>+                                         const gl::ImageIndex &index,
>+                                         const gl::Rectangle &sourceArea,
>+                                         GLenum internalFormat,
>+                                         gl::Framebuffer *source)
> {
>-    int faceIndex              = static_cast<int>(gl::CubeMapTextureTargetToLayerIndex(target));
>+    GLint faceIndex = index.cubeMapFaceIndex();
>     const gl::InternalFormat &internalFormatInfo =
>         gl::GetInternalFormatInfo(internalFormat, GL_UNSIGNED_BYTE);
> 
>-    GLint level = static_cast<GLint>(imageLevel);
>-
>-    gl::Extents size(origSourceArea.width, origSourceArea.height, 1);
>-    ANGLE_TRY(redefineImage(context, static_cast<int>(faceIndex), level,
>+    gl::Extents size(sourceArea.width, sourceArea.height, 1);
>+    ANGLE_TRY(redefineImage(context, faceIndex, index.getLevelIndex(),
>                             internalFormatInfo.sizedInternalFormat, size, false));
> 
>     gl::Extents fbSize = source->getReadColorbuffer()->getSize();
> 
>     // Does the read area extend beyond the framebuffer?
>-    bool outside = origSourceArea.x < 0 || origSourceArea.y < 0 ||
>-                   origSourceArea.x + origSourceArea.width > fbSize.width ||
>-                   origSourceArea.y + origSourceArea.height > fbSize.height;
>-
>-    // In WebGL mode we need to zero the texture outside the framebuffer.
>-    // If we have robust resource init, it was already zeroed by redefineImage() above, otherwise
>-    // zero it explicitly.
>-    // TODO(fjhenigman): When robust resource is fully implemented look into making it a
>-    // prerequisite for WebGL and deleting this code.
>-    if (outside && context->getExtensions().webglCompatibility &&
>-        !context->isRobustResourceInitEnabled())
>-    {
>-        angle::MemoryBuffer *zero;
>-        ANGLE_TRY(context->getZeroFilledBuffer(
>-            origSourceArea.width * origSourceArea.height * internalFormatInfo.pixelBytes, &zero));
>-        gl::PixelUnpackState unpack;
>-        unpack.alignment = 1;
>-        ANGLE_TRY(setImage(context, target, imageLevel, internalFormat, size,
>-                           internalFormatInfo.format, internalFormatInfo.type, unpack,
>-                           zero->data()));
>-    }
>-
>-    gl::Rectangle sourceArea;
>-    if (!ClipRectangle(origSourceArea, gl::Rectangle(0, 0, fbSize.width, fbSize.height),
>-                       &sourceArea))
>+    bool outside = sourceArea.x < 0 || sourceArea.y < 0 ||
>+                   sourceArea.x + sourceArea.width > fbSize.width ||
>+                   sourceArea.y + sourceArea.height > fbSize.height;
>+
>+    // WebGL requires that pixels that would be outside the framebuffer are treated as zero values,
>+    // so clear the mip level to 0 prior to making the copy if any pixel would be sampled outside.
>+    // Same thing for robust resource init.
>+    if (outside &&
>+        (context->getExtensions().webglCompatibility || context->isRobustResourceInitEnabled()))
>+    {
>+        ANGLE_TRY(initializeContents(context, index));
>+    }
>+
>+    gl::Rectangle clippedArea;
>+    if (!ClipRectangle(sourceArea, gl::Rectangle(0, 0, fbSize.width, fbSize.height), &clippedArea))
>     {
>         // Empty source area, nothing to do.
>-        return gl::NoError();
>+        return angle::Result::Continue;
>     }
> 
>-    gl::ImageIndex index = gl::ImageIndex::MakeCube(target, level);
>-    gl::Offset destOffset(sourceArea.x - origSourceArea.x, sourceArea.y - origSourceArea.y, 0);
>+    gl::Offset destOffset(clippedArea.x - sourceArea.x, clippedArea.y - sourceArea.y, 0);
> 
>-    // If the zero max LOD workaround is active, then we can't sample from individual layers of the framebuffer in shaders,
>-    // so we should use the non-rendering copy path.
>+    // If the zero max LOD workaround is active, then we can't sample from individual layers of the
>+    // framebuffer in shaders, so we should use the non-rendering copy path.
>     if (!canCreateRenderTargetForImage(index) || mRenderer->getWorkarounds().zeroMaxLodWorkaround)
>     {
>-        ANGLE_TRY(mImageArray[faceIndex][level]->copyFromFramebuffer(context, destOffset,
>-                                                                     sourceArea, source));
>+        ANGLE_TRY(mImageArray[faceIndex][index.getLevelIndex()]->copyFromFramebuffer(
>+            context, destOffset, clippedArea, source));
>         mDirtyImages = true;
>     }
>     else
>@@ -1782,100 +1766,95 @@ gl::Error TextureD3D_Cube::copyImage(const gl::Context *context,
> 
>         ASSERT(size.width == size.height);
> 
>-        if (size.width > 0 && isValidFaceLevel(faceIndex, level))
>+        if (size.width > 0 && isValidFaceLevel(faceIndex, index.getLevelIndex()))
>         {
>-            ANGLE_TRY(updateStorageFaceLevel(context, faceIndex, level));
>-            ANGLE_TRY(mRenderer->copyImageCube(context, source, sourceArea, internalFormat,
>-                                               destOffset, mTexStorage, target, level));
>+            ANGLE_TRY(updateStorageFaceLevel(context, faceIndex, index.getLevelIndex()));
>+            ANGLE_TRY(mRenderer->copyImageCube(context, source, clippedArea, internalFormat,
>+                                               destOffset, mTexStorage, index.getTarget(),
>+                                               index.getLevelIndex()));
>         }
>     }
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error TextureD3D_Cube::copySubImage(const gl::Context *context,
>-                                        GLenum target,
>-                                        size_t imageLevel,
>-                                        const gl::Offset &origDestOffset,
>-                                        const gl::Rectangle &origSourceArea,
>-                                        const gl::Framebuffer *source)
>+angle::Result TextureD3D_Cube::copySubImage(const gl::Context *context,
>+                                            const gl::ImageIndex &index,
>+                                            const gl::Offset &destOffset,
>+                                            const gl::Rectangle &sourceArea,
>+                                            gl::Framebuffer *source)
> {
>     gl::Extents fbSize = source->getReadColorbuffer()->getSize();
>-    gl::Rectangle sourceArea;
>-    if (!ClipRectangle(origSourceArea, gl::Rectangle(0, 0, fbSize.width, fbSize.height),
>-                       &sourceArea))
>+    gl::Rectangle clippedArea;
>+    if (!ClipRectangle(sourceArea, gl::Rectangle(0, 0, fbSize.width, fbSize.height), &clippedArea))
>     {
>-        return gl::NoError();
>+        return angle::Result::Continue;
>     }
>-    const gl::Offset destOffset(origDestOffset.x + sourceArea.x - origSourceArea.x,
>-                                origDestOffset.y + sourceArea.y - origSourceArea.y, 0);
>-
>-    int faceIndex = static_cast<int>(gl::CubeMapTextureTargetToLayerIndex(target));
>+    const gl::Offset clippedOffset(destOffset.x + clippedArea.x - sourceArea.x,
>+                                   destOffset.y + clippedArea.y - sourceArea.y, 0);
> 
>-    GLint level          = static_cast<GLint>(imageLevel);
>-    gl::ImageIndex index = gl::ImageIndex::MakeCube(target, level);
>+    GLint faceIndex = index.cubeMapFaceIndex();
> 
>-    // If the zero max LOD workaround is active, then we can't sample from individual layers of the framebuffer in shaders,
>-    // so we should use the non-rendering copy path.
>+    // If the zero max LOD workaround is active, then we can't sample from individual layers of the
>+    // framebuffer in shaders, so we should use the non-rendering copy path.
>     if (!canCreateRenderTargetForImage(index) || mRenderer->getWorkarounds().zeroMaxLodWorkaround)
>     {
>-        ANGLE_TRY(mImageArray[faceIndex][level]->copyFromFramebuffer(context, destOffset,
>-                                                                     sourceArea, source));
>+        ANGLE_TRY(mImageArray[faceIndex][index.getLevelIndex()]->copyFromFramebuffer(
>+            context, clippedOffset, clippedArea, source));
>         mDirtyImages = true;
>     }
>     else
>     {
>         ANGLE_TRY(ensureRenderTarget(context));
>-        if (isValidFaceLevel(faceIndex, level))
>+        if (isValidFaceLevel(faceIndex, index.getLevelIndex()))
>         {
>-            ANGLE_TRY(updateStorageFaceLevel(context, faceIndex, level));
>-            ANGLE_TRY(mRenderer->copyImageCube(context, source, sourceArea,
>-                                               gl::GetUnsizedFormat(getBaseLevelInternalFormat()),
>-                                               destOffset, mTexStorage, target, level));
>+            ANGLE_TRY(updateStorageFaceLevel(context, faceIndex, index.getLevelIndex()));
>+            ANGLE_TRY(mRenderer->copyImageCube(
>+                context, source, clippedArea, gl::GetUnsizedFormat(getBaseLevelInternalFormat()),
>+                clippedOffset, mTexStorage, index.getTarget(), index.getLevelIndex()));
>         }
>     }
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error TextureD3D_Cube::copyTexture(const gl::Context *context,
>-                                       GLenum target,
>-                                       size_t level,
>-                                       GLenum internalFormat,
>-                                       GLenum type,
>-                                       size_t sourceLevel,
>-                                       bool unpackFlipY,
>-                                       bool unpackPremultiplyAlpha,
>-                                       bool unpackUnmultiplyAlpha,
>-                                       const gl::Texture *source)
>+angle::Result TextureD3D_Cube::copyTexture(const gl::Context *context,
>+                                           const gl::ImageIndex &index,
>+                                           GLenum internalFormat,
>+                                           GLenum type,
>+                                           size_t sourceLevel,
>+                                           bool unpackFlipY,
>+                                           bool unpackPremultiplyAlpha,
>+                                           bool unpackUnmultiplyAlpha,
>+                                           const gl::Texture *source)
> {
>-    ASSERT(gl::IsCubeMapTextureTarget(target));
>+    ASSERT(gl::IsCubeMapFaceTarget(index.getTarget()));
> 
>-    GLenum sourceTarget = source->getTarget();
>+    gl::TextureTarget sourceTarget = NonCubeTextureTypeToTarget(source->getType());
> 
>-    GLint destLevel = static_cast<GLint>(level);
>-    int faceIndex   = static_cast<int>(gl::CubeMapTextureTargetToLayerIndex(target));
>+    GLint faceIndex = index.cubeMapFaceIndex();
> 
>     const gl::InternalFormat &internalFormatInfo = gl::GetInternalFormatInfo(internalFormat, type);
>     gl::Extents size(static_cast<int>(source->getWidth(sourceTarget, sourceLevel)),
>                      static_cast<int>(source->getHeight(sourceTarget, sourceLevel)), 1);
>-    ANGLE_TRY(redefineImage(context, faceIndex, destLevel, internalFormatInfo.sizedInternalFormat,
>-                            size, false));
>+    ANGLE_TRY(redefineImage(context, faceIndex, index.getLevelIndex(),
>+                            internalFormatInfo.sizedInternalFormat, size, false));
> 
>-    gl::Rectangle sourceRect(0, 0, size.width, size.height);
>+    gl::Box sourceBox(0, 0, 0, size.width, size.height, 1);
>     gl::Offset destOffset(0, 0, 0);
> 
>-    if (!isSRGB(destLevel, faceIndex) &&
>-        canCreateRenderTargetForImage(gl::ImageIndex::MakeCube(target, destLevel)))
>+    if (!isSRGB(index.getLevelIndex(), faceIndex) && canCreateRenderTargetForImage(index))
>     {
>+
>         ANGLE_TRY(ensureRenderTarget(context));
>-        ASSERT(isValidFaceLevel(faceIndex, destLevel));
>-        ANGLE_TRY(updateStorageFaceLevel(context, faceIndex, destLevel));
>+        ASSERT(isValidFaceLevel(faceIndex, index.getLevelIndex()));
>+        ANGLE_TRY(updateStorageFaceLevel(context, faceIndex, index.getLevelIndex()));
> 
>-        ANGLE_TRY(mRenderer->copyTexture(context, source, static_cast<GLint>(sourceLevel),
>-                                         sourceRect, internalFormatInfo.format, destOffset,
>-                                         mTexStorage, target, destLevel, unpackFlipY,
>-                                         unpackPremultiplyAlpha, unpackUnmultiplyAlpha));
>+        ANGLE_TRY(mRenderer->copyTexture(
>+            context, source, static_cast<GLint>(sourceLevel), gl::TextureTarget::_2D, sourceBox,
>+            internalFormatInfo.format, internalFormatInfo.type, destOffset, mTexStorage,
>+            index.getTarget(), index.getLevelIndex(), unpackFlipY, unpackPremultiplyAlpha,
>+            unpackUnmultiplyAlpha));
>     }
>     else
>     {
>@@ -1884,50 +1863,48 @@ gl::Error TextureD3D_Cube::copyTexture(const gl::Context *context,
>         ImageD3D *sourceImage           = nullptr;
>         ANGLE_TRY(sourceD3D->getImageAndSyncFromStorage(context, sourceImageIndex, &sourceImage));
> 
>-        gl::ImageIndex destImageIndex =
>-            gl::ImageIndex::MakeCube(target, static_cast<GLint>(destLevel));
>         ImageD3D *destImage = nullptr;
>-        ANGLE_TRY(getImageAndSyncFromStorage(context, destImageIndex, &destImage));
>+        ANGLE_TRY(getImageAndSyncFromStorage(context, index, &destImage));
> 
>-        ANGLE_TRY(mRenderer->copyImage(context, destImage, sourceImage, sourceRect, destOffset,
>+        ANGLE_TRY(mRenderer->copyImage(context, destImage, sourceImage, sourceBox, destOffset,
>                                        unpackFlipY, unpackPremultiplyAlpha, unpackUnmultiplyAlpha));
> 
>         mDirtyImages = true;
> 
>         gl::Box destRegion(destOffset, size);
>-        ANGLE_TRY(commitRegion(context, destImageIndex, destRegion));
>+        ANGLE_TRY(commitRegion(context, index, destRegion));
>     }
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error TextureD3D_Cube::copySubTexture(const gl::Context *context,
>-                                          GLenum target,
>-                                          size_t level,
>-                                          const gl::Offset &destOffset,
>-                                          size_t sourceLevel,
>-                                          const gl::Rectangle &sourceArea,
>-                                          bool unpackFlipY,
>-                                          bool unpackPremultiplyAlpha,
>-                                          bool unpackUnmultiplyAlpha,
>-                                          const gl::Texture *source)
>+angle::Result TextureD3D_Cube::copySubTexture(const gl::Context *context,
>+                                              const gl::ImageIndex &index,
>+                                              const gl::Offset &destOffset,
>+                                              size_t sourceLevel,
>+                                              const gl::Box &sourceBox,
>+                                              bool unpackFlipY,
>+                                              bool unpackPremultiplyAlpha,
>+                                              bool unpackUnmultiplyAlpha,
>+                                              const gl::Texture *source)
> {
>-    ASSERT(gl::IsCubeMapTextureTarget(target));
>+    ASSERT(gl::IsCubeMapFaceTarget(index.getTarget()));
> 
>-    GLint destLevel = static_cast<GLint>(level);
>-    int faceIndex   = static_cast<int>(gl::CubeMapTextureTargetToLayerIndex(target));
>+    GLint faceIndex = index.cubeMapFaceIndex();
> 
>-    if (!isSRGB(destLevel, faceIndex) &&
>-        canCreateRenderTargetForImage(gl::ImageIndex::MakeCube(target, destLevel)))
>+    if (!isSRGB(index.getLevelIndex(), faceIndex) && canCreateRenderTargetForImage(index))
>     {
>         ANGLE_TRY(ensureRenderTarget(context));
>-        ASSERT(isValidFaceLevel(faceIndex, destLevel));
>-        ANGLE_TRY(updateStorageFaceLevel(context, faceIndex, destLevel));
>+        ASSERT(isValidFaceLevel(faceIndex, index.getLevelIndex()));
>+        ANGLE_TRY(updateStorageFaceLevel(context, faceIndex, index.getLevelIndex()));
> 
>+        const gl::InternalFormat &internalFormatInfo =
>+            gl::GetSizedInternalFormatInfo(getInternalFormat(index.getLevelIndex(), faceIndex));
>         ANGLE_TRY(mRenderer->copyTexture(
>-            context, source, static_cast<GLint>(sourceLevel), sourceArea,
>-            gl::GetUnsizedFormat(getInternalFormat(destLevel, faceIndex)), destOffset, mTexStorage,
>-            target, destLevel, unpackFlipY, unpackPremultiplyAlpha, unpackUnmultiplyAlpha));
>+            context, source, static_cast<GLint>(sourceLevel), gl::TextureTarget::_2D, sourceBox,
>+            internalFormatInfo.format, internalFormatInfo.type, destOffset, mTexStorage,
>+            index.getTarget(), index.getLevelIndex(), unpackFlipY, unpackPremultiplyAlpha,
>+            unpackUnmultiplyAlpha));
>     }
>     else
>     {
>@@ -1936,28 +1913,26 @@ gl::Error TextureD3D_Cube::copySubTexture(const gl::Context *context,
>         ImageD3D *sourceImage           = nullptr;
>         ANGLE_TRY(sourceD3D->getImageAndSyncFromStorage(context, sourceImageIndex, &sourceImage));
> 
>-        gl::ImageIndex destImageIndex =
>-            gl::ImageIndex::MakeCube(target, static_cast<GLint>(destLevel));
>         ImageD3D *destImage = nullptr;
>-        ANGLE_TRY(getImageAndSyncFromStorage(context, destImageIndex, &destImage));
>+        ANGLE_TRY(getImageAndSyncFromStorage(context, index, &destImage));
> 
>-        ANGLE_TRY(mRenderer->copyImage(context, destImage, sourceImage, sourceArea, destOffset,
>+        ANGLE_TRY(mRenderer->copyImage(context, destImage, sourceImage, sourceBox, destOffset,
>                                        unpackFlipY, unpackPremultiplyAlpha, unpackUnmultiplyAlpha));
> 
>         mDirtyImages = true;
> 
>-        gl::Box destRegion(destOffset.x, destOffset.y, 0, sourceArea.width, sourceArea.height, 1);
>-        ANGLE_TRY(commitRegion(context, destImageIndex, destRegion));
>+        gl::Box destRegion(destOffset.x, destOffset.y, 0, sourceBox.width, sourceBox.height, 1);
>+        ANGLE_TRY(commitRegion(context, index, destRegion));
>     }
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error TextureD3D_Cube::setStorage(const gl::Context *context,
>-                                      GLenum target,
>-                                      size_t levels,
>-                                      GLenum internalFormat,
>-                                      const gl::Extents &size)
>+angle::Result TextureD3D_Cube::setStorage(const gl::Context *context,
>+                                          gl::TextureType type,
>+                                          size_t levels,
>+                                          GLenum internalFormat,
>+                                          const gl::Extents &size)
> {
>     ASSERT(size.width == size.height);
>     ASSERT(size.depth == 1);
>@@ -1965,17 +1940,19 @@ gl::Error TextureD3D_Cube::setStorage(const gl::Context *context,
>     for (size_t level = 0; level < levels; level++)
>     {
>         GLsizei mipSize = std::max(1, size.width >> level);
>-        for (int faceIndex = 0; faceIndex < 6; faceIndex++)
>+        for (size_t faceIndex = 0; faceIndex < gl::kCubeFaceCount; faceIndex++)
>         {
>-            mImageArray[faceIndex][level]->redefine(GL_TEXTURE_CUBE_MAP, internalFormat, gl::Extents(mipSize, mipSize, 1), true);
>+            mImageArray[faceIndex][level]->redefine(gl::TextureType::CubeMap, internalFormat,
>+                                                    gl::Extents(mipSize, mipSize, 1), true);
>         }
>     }
> 
>     for (size_t level = levels; level < gl::IMPLEMENTATION_MAX_TEXTURE_LEVELS; level++)
>     {
>-        for (int faceIndex = 0; faceIndex < 6; faceIndex++)
>+        for (size_t faceIndex = 0; faceIndex < gl::kCubeFaceCount; faceIndex++)
>         {
>-            mImageArray[faceIndex][level]->redefine(GL_TEXTURE_CUBE_MAP, GL_NONE, gl::Extents(0, 0, 0), true);
>+            mImageArray[faceIndex][level]->redefine(gl::TextureType::CubeMap, GL_NONE,
>+                                                    gl::Extents(0, 0, 0), true);
>         }
>     }
> 
>@@ -1993,14 +1970,14 @@ gl::Error TextureD3D_Cube::setStorage(const gl::Context *context,
> 
>     mImmutable = true;
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
> // Tests for cube texture completeness. [OpenGL ES 2.0.24] section 3.7.10 page 81.
> bool TextureD3D_Cube::isCubeComplete() const
> {
>-    int    baseWidth  = getBaseLevelWidth();
>-    int    baseHeight = getBaseLevelHeight();
>+    int baseWidth     = getBaseLevelWidth();
>+    int baseHeight    = getBaseLevelHeight();
>     GLenum baseFormat = getBaseLevelInternalFormat();
> 
>     if (baseWidth <= 0 || baseWidth != baseHeight)
>@@ -2008,13 +1985,12 @@ bool TextureD3D_Cube::isCubeComplete() const
>         return false;
>     }
> 
>-    for (int faceIndex = 1; faceIndex < 6; faceIndex++)
>+    for (size_t faceIndex = 1; faceIndex < gl::kCubeFaceCount; faceIndex++)
>     {
>         const ImageD3D &faceBaseImage = *mImageArray[faceIndex][getBaseLevel()];
> 
>-        if (faceBaseImage.getWidth()          != baseWidth  ||
>-            faceBaseImage.getHeight()         != baseHeight ||
>-            faceBaseImage.getInternalFormat() != baseFormat )
>+        if (faceBaseImage.getWidth() != baseWidth || faceBaseImage.getHeight() != baseHeight ||
>+            faceBaseImage.getInternalFormat() != baseFormat)
>         {
>             return false;
>         }
>@@ -2023,25 +1999,25 @@ bool TextureD3D_Cube::isCubeComplete() const
>     return true;
> }
> 
>-gl::Error TextureD3D_Cube::bindTexImage(const gl::Context *context, egl::Surface *surface)
>+angle::Result TextureD3D_Cube::bindTexImage(const gl::Context *context, egl::Surface *surface)
> {
>-    UNREACHABLE();
>-    return gl::InternalError();
>+    ANGLE_HR_UNREACHABLE(GetImplAs<ContextD3D>(context));
>+    return angle::Result::Continue;
> }
> 
>-gl::Error TextureD3D_Cube::releaseTexImage(const gl::Context *context)
>+angle::Result TextureD3D_Cube::releaseTexImage(const gl::Context *context)
> {
>-    UNREACHABLE();
>-    return gl::InternalError();
>+    ANGLE_HR_UNREACHABLE(GetImplAs<ContextD3D>(context));
>+    return angle::Result::Continue;
> }
> 
>-gl::Error TextureD3D_Cube::initMipmapImages(const gl::Context *context)
>+angle::Result TextureD3D_Cube::initMipmapImages(const gl::Context *context)
> {
>     const GLuint baseLevel = mState.getEffectiveBaseLevel();
>     const GLuint maxLevel  = mState.getMipmapMaxLevel();
>     // Purge array levels baseLevel + 1 through q and reset them to represent the generated mipmap
>     // levels.
>-    for (int faceIndex = 0; faceIndex < 6; faceIndex++)
>+    for (size_t faceIndex = 0; faceIndex < gl::kCubeFaceCount; faceIndex++)
>     {
>         for (GLuint level = baseLevel + 1; level <= maxLevel; level++)
>         {
>@@ -2052,34 +2028,34 @@ gl::Error TextureD3D_Cube::initMipmapImages(const gl::Context *context)
>                                     gl::Extents(faceLevelSize, faceLevelSize, 1), false));
>         }
>     }
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error TextureD3D_Cube::getRenderTarget(const gl::Context *context,
>-                                           const gl::ImageIndex &index,
>-                                           RenderTargetD3D **outRT)
>+angle::Result TextureD3D_Cube::getRenderTarget(const gl::Context *context,
>+                                               const gl::ImageIndex &index,
>+                                               RenderTargetD3D **outRT)
> {
>-    ASSERT(gl::IsCubeMapTextureTarget(index.type));
>+    ASSERT(gl::IsCubeMapFaceTarget(index.getTarget()));
> 
>     // ensure the underlying texture is created
>     ANGLE_TRY(ensureRenderTarget(context));
>-    ANGLE_TRY(updateStorageFaceLevel(context, index.layerIndex, index.mipIndex));
>+    ANGLE_TRY(updateStorageFaceLevel(context, index.cubeMapFaceIndex(), index.getLevelIndex()));
> 
>     return mTexStorage->getRenderTarget(context, index, outRT);
> }
> 
>-gl::Error TextureD3D_Cube::initializeStorage(const gl::Context *context, bool renderTarget)
>+angle::Result TextureD3D_Cube::initializeStorage(const gl::Context *context, bool renderTarget)
> {
>     // Only initialize the first time this texture is used as a render target or shader resource
>     if (mTexStorage)
>     {
>-        return gl::NoError();
>+        return angle::Result::Continue;
>     }
> 
>     // do not attempt to create storage for nonexistant data
>     if (!isFaceLevelComplete(0, getBaseLevel()))
>     {
>-        return gl::NoError();
>+        return angle::Result::Continue;
>     }
> 
>     bool createRenderTarget = (renderTarget || IsRenderTargetUsage(mState.getUsage()));
>@@ -2095,11 +2071,11 @@ gl::Error TextureD3D_Cube::initializeStorage(const gl::Context *context, bool re
>     // flush image data to the storage
>     ANGLE_TRY(updateStorage(context));
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error TextureD3D_Cube::createCompleteStorage(bool renderTarget,
>-                                                 TexStoragePointer *outStorage) const
>+angle::Result TextureD3D_Cube::createCompleteStorage(bool renderTarget,
>+                                                     TexStoragePointer *outStorage) const
> {
>     GLsizei size = getLevelZeroWidth();
> 
>@@ -2111,14 +2087,15 @@ gl::Error TextureD3D_Cube::createCompleteStorage(bool renderTarget,
>     bool hintLevelZeroOnly = false;
>     if (mRenderer->getWorkarounds().zeroMaxLodWorkaround)
>     {
>-        // If any of the CPU images (levels >= 1) are dirty, then the textureStorage should use the mipped texture to begin with.
>-        // Otherwise, it should use the level-zero-only texture.
>+        // If any of the CPU images (levels >= 1) are dirty, then the textureStorage should use the
>+        // mipped texture to begin with. Otherwise, it should use the level-zero-only texture.
>         hintLevelZeroOnly = true;
>-        for (int faceIndex = 0; faceIndex < 6 && hintLevelZeroOnly; faceIndex++)
>+        for (size_t faceIndex = 0; faceIndex < gl::kCubeFaceCount && hintLevelZeroOnly; faceIndex++)
>         {
>             for (int level = 1; level < levels && hintLevelZeroOnly; level++)
>             {
>-                hintLevelZeroOnly = !(mImageArray[faceIndex][level]->isDirty() && isFaceLevelComplete(faceIndex, level));
>+                hintLevelZeroOnly = !(mImageArray[faceIndex][level]->isDirty() &&
>+                                      isFaceLevelComplete(faceIndex, level));
>             }
>         }
>     }
>@@ -2127,15 +2104,15 @@ gl::Error TextureD3D_Cube::createCompleteStorage(bool renderTarget,
>     outStorage->reset(mRenderer->createTextureStorageCube(
>         getBaseLevelInternalFormat(), renderTarget, size, levels, hintLevelZeroOnly));
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error TextureD3D_Cube::setCompleteTexStorage(const gl::Context *context,
>-                                                 TextureStorage *newCompleteTexStorage)
>+angle::Result TextureD3D_Cube::setCompleteTexStorage(const gl::Context *context,
>+                                                     TextureStorage *newCompleteTexStorage)
> {
>     if (newCompleteTexStorage && newCompleteTexStorage->isManaged())
>     {
>-        for (int faceIndex = 0; faceIndex < 6; faceIndex++)
>+        for (size_t faceIndex = 0; faceIndex < gl::kCubeFaceCount; faceIndex++)
>         {
>             for (int level = 0; level < newCompleteTexStorage->getLevelCount(); level++)
>             {
>@@ -2149,19 +2126,19 @@ gl::Error TextureD3D_Cube::setCompleteTexStorage(const gl::Context *context,
>     mTexStorage = newCompleteTexStorage;
> 
>     mDirtyImages = true;
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error TextureD3D_Cube::updateStorage(const gl::Context *context)
>+angle::Result TextureD3D_Cube::updateStorage(const gl::Context *context)
> {
>     if (!mDirtyImages)
>     {
>-        return gl::NoError();
>+        return angle::Result::Continue;
>     }
> 
>     ASSERT(mTexStorage != nullptr);
>     GLint storageLevels = mTexStorage->getLevelCount();
>-    for (int face = 0; face < 6; face++)
>+    for (size_t face = 0; face < gl::kCubeFaceCount; face++)
>     {
>         for (int level = 0; level < storageLevels; level++)
>         {
>@@ -2173,7 +2150,7 @@ gl::Error TextureD3D_Cube::updateStorage(const gl::Context *context)
>     }
> 
>     mDirtyImages = false;
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
> bool TextureD3D_Cube::isValidFaceLevel(int faceIndex, int level) const
>@@ -2187,7 +2164,8 @@ bool TextureD3D_Cube::isFaceLevelComplete(int faceIndex, int level) const
>     {
>         return false;
>     }
>-    ASSERT(level >= 0 && faceIndex < 6 && level < static_cast<int>(mImageArray[faceIndex].size()) &&
>+    ASSERT(level >= 0 && static_cast<size_t>(faceIndex) < gl::kCubeFaceCount &&
>+           level < static_cast<int>(mImageArray[faceIndex].size()) &&
>            mImageArray[faceIndex][level] != nullptr);
> 
>     if (isImmutable())
>@@ -2202,14 +2180,6 @@ bool TextureD3D_Cube::isFaceLevelComplete(int faceIndex, int level) const
>         return false;
>     }
> 
>-    // "isCubeComplete" checks for base level completeness and we must call that
>-    // to determine if any face at level 0 is complete. We omit that check here
>-    // to avoid re-checking cube-completeness for every face at level 0.
>-    if (level == 0)
>-    {
>-        return true;
>-    }
>-
>     // Check that non-zero levels are consistent with the base level.
>     const ImageD3D *faceLevelImage = mImageArray[faceIndex][level].get();
> 
>@@ -2228,41 +2198,42 @@ bool TextureD3D_Cube::isFaceLevelComplete(int faceIndex, int level) const
> 
> bool TextureD3D_Cube::isImageComplete(const gl::ImageIndex &index) const
> {
>-    return isFaceLevelComplete(index.layerIndex, index.mipIndex);
>+    return isFaceLevelComplete(index.cubeMapFaceIndex(), index.getLevelIndex());
> }
> 
>-gl::Error TextureD3D_Cube::updateStorageFaceLevel(const gl::Context *context,
>-                                                  int faceIndex,
>-                                                  int level)
>+angle::Result TextureD3D_Cube::updateStorageFaceLevel(const gl::Context *context,
>+                                                      int faceIndex,
>+                                                      int level)
> {
>-    ASSERT(level >= 0 && faceIndex < 6 && level < static_cast<int>(mImageArray[faceIndex].size()) &&
>+    ASSERT(level >= 0 && static_cast<size_t>(faceIndex) < gl::kCubeFaceCount &&
>+           level < static_cast<int>(mImageArray[faceIndex].size()) &&
>            mImageArray[faceIndex][level] != nullptr);
>     ImageD3D *image = mImageArray[faceIndex][level].get();
> 
>     if (image->isDirty())
>     {
>-        GLenum faceTarget = gl::LayerIndexToCubeMapTextureTarget(faceIndex);
>-        gl::ImageIndex index = gl::ImageIndex::MakeCube(faceTarget, level);
>+        gl::TextureTarget faceTarget = gl::CubeFaceIndexToTextureTarget(faceIndex);
>+        gl::ImageIndex index         = gl::ImageIndex::MakeCubeMapFace(faceTarget, level);
>         gl::Box region(0, 0, 0, image->getWidth(), image->getHeight(), 1);
>         ANGLE_TRY(commitRegion(context, index, region));
>     }
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error TextureD3D_Cube::redefineImage(const gl::Context *context,
>-                                         int faceIndex,
>-                                         GLint level,
>-                                         GLenum internalformat,
>-                                         const gl::Extents &size,
>-                                         bool forceRelease)
>+angle::Result TextureD3D_Cube::redefineImage(const gl::Context *context,
>+                                             int faceIndex,
>+                                             GLint level,
>+                                             GLenum internalformat,
>+                                             const gl::Extents &size,
>+                                             bool forceRelease)
> {
>     // If there currently is a corresponding storage texture image, it has these parameters
>     const int storageWidth     = std::max(1, getLevelZeroWidth() >> level);
>     const int storageHeight    = std::max(1, getLevelZeroHeight() >> level);
>     const GLenum storageFormat = getBaseLevelInternalFormat();
> 
>-    mImageArray[faceIndex][level]->redefine(GL_TEXTURE_CUBE_MAP, internalformat, size,
>+    mImageArray[faceIndex][level]->redefine(gl::TextureType::CubeMap, internalformat, size,
>                                             forceRelease);
>     mDirtyImages = mDirtyImages || mImageArray[faceIndex][level]->isDirty();
> 
>@@ -2279,7 +2250,7 @@ gl::Error TextureD3D_Cube::redefineImage(const gl::Context *context,
>         }
>     }
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
> gl::ImageIndexIterator TextureD3D_Cube::imageIterator() const
>@@ -2290,20 +2261,21 @@ gl::ImageIndexIterator TextureD3D_Cube::imageIterator() const
> gl::ImageIndex TextureD3D_Cube::getImageIndex(GLint mip, GLint layer) const
> {
>     // The "layer" of the image index corresponds to the cube face
>-    return gl::ImageIndex::MakeCube(gl::LayerIndexToCubeMapTextureTarget(layer), mip);
>+    return gl::ImageIndex::MakeCubeMapFace(gl::CubeFaceIndexToTextureTarget(layer), mip);
> }
> 
> bool TextureD3D_Cube::isValidIndex(const gl::ImageIndex &index) const
> {
>-    return (mTexStorage && gl::IsCubeMapTextureTarget(index.type) &&
>-            index.mipIndex >= 0 && index.mipIndex < mTexStorage->getLevelCount());
>+    return (mTexStorage && index.getType() == gl::TextureType::CubeMap &&
>+            gl::IsCubeMapFaceTarget(index.getTarget()) && index.getLevelIndex() >= 0 &&
>+            index.getLevelIndex() < mTexStorage->getLevelCount());
> }
> 
> void TextureD3D_Cube::markAllImagesDirty()
> {
>     for (int dirtyLevel = 0; dirtyLevel < gl::IMPLEMENTATION_MAX_TEXTURE_LEVELS; dirtyLevel++)
>     {
>-        for (int dirtyFace = 0; dirtyFace < 6; dirtyFace++)
>+        for (size_t dirtyFace = 0; dirtyFace < gl::kCubeFaceCount; dirtyFace++)
>         {
>             mImageArray[dirtyFace][dirtyLevel]->markDirty();
>         }
>@@ -2320,7 +2292,7 @@ TextureD3D_3D::TextureD3D_3D(const gl::TextureState &state, RendererD3D *rendere
>     }
> }
> 
>-gl::Error TextureD3D_3D::onDestroy(const gl::Context *context)
>+void TextureD3D_3D::onDestroy(const gl::Context *context)
> {
>     // Delete the Images before the TextureStorage. Images might be relying on the TextureStorage
>     // for some of their data. If TextureStorage is deleted before the Images, then their data will
>@@ -2332,9 +2304,7 @@ gl::Error TextureD3D_3D::onDestroy(const gl::Context *context)
>     return TextureD3D::onDestroy(context);
> }
> 
>-TextureD3D_3D::~TextureD3D_3D()
>-{
>-}
>+TextureD3D_3D::~TextureD3D_3D() {}
> 
> ImageD3D *TextureD3D_3D::getImage(int level, int layer) const
> {
>@@ -2345,10 +2315,10 @@ ImageD3D *TextureD3D_3D::getImage(int level, int layer) const
> 
> ImageD3D *TextureD3D_3D::getImage(const gl::ImageIndex &index) const
> {
>-    ASSERT(index.mipIndex < gl::IMPLEMENTATION_MAX_TEXTURE_LEVELS);
>+    ASSERT(index.getLevelIndex() < gl::IMPLEMENTATION_MAX_TEXTURE_LEVELS);
>     ASSERT(!index.hasLayer());
>-    ASSERT(index.type == GL_TEXTURE_3D);
>-    return mImageArray[index.mipIndex].get();
>+    ASSERT(index.getType() == gl::TextureType::_3D);
>+    return mImageArray[index.getLevelIndex()].get();
> }
> 
> GLsizei TextureD3D_3D::getLayerCount(int level) const
>@@ -2394,51 +2364,53 @@ bool TextureD3D_3D::isDepth(GLint level) const
>     return gl::GetSizedInternalFormatInfo(getInternalFormat(level)).depthBits > 0;
> }
> 
>-gl::Error TextureD3D_3D::setEGLImageTarget(const gl::Context *context,
>-                                           GLenum target,
>-                                           egl::Image *image)
>+bool TextureD3D_3D::isSRGB(GLint level) const
> {
>-    UNREACHABLE();
>-    return gl::InternalError();
>+    return gl::GetSizedInternalFormatInfo(getInternalFormat(level)).colorEncoding == GL_SRGB;
>+}
>+
>+angle::Result TextureD3D_3D::setEGLImageTarget(const gl::Context *context,
>+                                               gl::TextureType type,
>+                                               egl::Image *image)
>+{
>+    ANGLE_HR_UNREACHABLE(GetImplAs<ContextD3D>(context));
>+    return angle::Result::Continue;
> }
> 
>-gl::Error TextureD3D_3D::setImage(const gl::Context *context,
>-                                  GLenum target,
>-                                  size_t imageLevel,
>-                                  GLenum internalFormat,
>-                                  const gl::Extents &size,
>-                                  GLenum format,
>-                                  GLenum type,
>-                                  const gl::PixelUnpackState &unpack,
>-                                  const uint8_t *pixels)
>+angle::Result TextureD3D_3D::setImage(const gl::Context *context,
>+                                      const gl::ImageIndex &index,
>+                                      GLenum internalFormat,
>+                                      const gl::Extents &size,
>+                                      GLenum format,
>+                                      GLenum type,
>+                                      const gl::PixelUnpackState &unpack,
>+                                      const uint8_t *pixels)
> {
>-    ASSERT(target == GL_TEXTURE_3D);
>+    ASSERT(index.getTarget() == gl::TextureTarget::_3D);
>     const gl::InternalFormat &internalFormatInfo = gl::GetInternalFormatInfo(internalFormat, type);
> 
>-    GLint level = static_cast<GLint>(imageLevel);
>-    ANGLE_TRY(redefineImage(context, level, internalFormatInfo.sizedInternalFormat, size, false));
>+    ANGLE_TRY(redefineImage(context, index.getLevelIndex(), internalFormatInfo.sizedInternalFormat,
>+                            size, false));
> 
>     bool fastUnpacked = false;
> 
>-    gl::ImageIndex index = gl::ImageIndex::Make3D(level);
>-
>     // Attempt a fast gpu copy of the pixel data to the surface if the app bound an unpack buffer
>-    gl::Buffer *unpackBuffer =
>-        context->getGLState().getTargetBuffer(gl::BufferBinding::PixelUnpack);
>+    gl::Buffer *unpackBuffer = context->getState().getTargetBuffer(gl::BufferBinding::PixelUnpack);
>     if (isFastUnpackable(unpackBuffer, internalFormatInfo.sizedInternalFormat) && !size.empty() &&
>-        isLevelComplete(level))
>+        isLevelComplete(index.getLevelIndex()))
>     {
>         // Will try to create RT storage if it does not exist
>         RenderTargetD3D *destRenderTarget = nullptr;
>         ANGLE_TRY(getRenderTarget(context, index, &destRenderTarget));
> 
>-        gl::Box destArea(0, 0, 0, getWidth(level), getHeight(level), getDepth(level));
>+        gl::Box destArea(0, 0, 0, getWidth(index.getLevelIndex()), getHeight(index.getLevelIndex()),
>+                         getDepth(index.getLevelIndex()));
> 
>         ANGLE_TRY(fastUnpackPixels(context, unpack, pixels, destArea,
>                                    internalFormatInfo.sizedInternalFormat, type, destRenderTarget));
> 
>         // Ensure we don't overwrite our newly initialized data
>-        mImageArray[level]->markClean();
>+        mImageArray[index.getLevelIndex()]->markClean();
> 
>         fastUnpacked = true;
>     }
>@@ -2448,104 +2420,92 @@ gl::Error TextureD3D_3D::setImage(const gl::Context *context,
>         ANGLE_TRY(setImageImpl(context, index, type, unpack, pixels, 0));
>     }
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error TextureD3D_3D::setSubImage(const gl::Context *context,
>-                                     GLenum target,
>-                                     size_t imageLevel,
>-                                     const gl::Box &area,
>-                                     GLenum format,
>-                                     GLenum type,
>-                                     const gl::PixelUnpackState &unpack,
>-                                     const uint8_t *pixels)
>+angle::Result TextureD3D_3D::setSubImage(const gl::Context *context,
>+                                         const gl::ImageIndex &index,
>+                                         const gl::Box &area,
>+                                         GLenum format,
>+                                         GLenum type,
>+                                         const gl::PixelUnpackState &unpack,
>+                                         gl::Buffer *unpackBuffer,
>+                                         const uint8_t *pixels)
> {
>-    ASSERT(target == GL_TEXTURE_3D);
>-
>-    GLint level          = static_cast<GLint>(imageLevel);
>-    gl::ImageIndex index = gl::ImageIndex::Make3D(level);
>+    ASSERT(index.getTarget() == gl::TextureTarget::_3D);
> 
>     // Attempt a fast gpu copy of the pixel data to the surface if the app bound an unpack buffer
>-    gl::Buffer *unpackBuffer =
>-        context->getGLState().getTargetBuffer(gl::BufferBinding::PixelUnpack);
>-    if (isFastUnpackable(unpackBuffer, getInternalFormat(level)) && isLevelComplete(level))
>+    GLenum mipFormat = getInternalFormat(index.getLevelIndex());
>+    if (isFastUnpackable(unpackBuffer, mipFormat) && isLevelComplete(index.getLevelIndex()))
>     {
>         RenderTargetD3D *destRenderTarget = nullptr;
>         ANGLE_TRY(getRenderTarget(context, index, &destRenderTarget));
>-        ASSERT(!mImageArray[level]->isDirty());
>+        ASSERT(!mImageArray[index.getLevelIndex()]->isDirty());
> 
>-        return fastUnpackPixels(context, unpack, pixels, area, getInternalFormat(level), type,
>-                                destRenderTarget);
>+        return fastUnpackPixels(context, unpack, pixels, area, mipFormat, type, destRenderTarget);
>     }
>     else
>     {
>-        return TextureD3D::subImage(context, index, area, format, type, unpack, pixels, 0);
>+        return TextureD3D::subImage(context, index, area, format, type, unpack, unpackBuffer,
>+                                    pixels, 0);
>     }
> }
> 
>-gl::Error TextureD3D_3D::setCompressedImage(const gl::Context *context,
>-                                            GLenum target,
>-                                            size_t imageLevel,
>-                                            GLenum internalFormat,
>-                                            const gl::Extents &size,
>-                                            const gl::PixelUnpackState &unpack,
>-                                            size_t imageSize,
>-                                            const uint8_t *pixels)
>+angle::Result TextureD3D_3D::setCompressedImage(const gl::Context *context,
>+                                                const gl::ImageIndex &index,
>+                                                GLenum internalFormat,
>+                                                const gl::Extents &size,
>+                                                const gl::PixelUnpackState &unpack,
>+                                                size_t imageSize,
>+                                                const uint8_t *pixels)
> {
>-    ASSERT(target == GL_TEXTURE_3D);
>+    ASSERT(index.getTarget() == gl::TextureTarget::_3D);
> 
>-    GLint level = static_cast<GLint>(imageLevel);
>-    // compressed formats don't have separate sized internal formats-- we can just use the compressed format directly
>-    ANGLE_TRY(redefineImage(context, level, internalFormat, size, false));
>+    // compressed formats don't have separate sized internal formats-- we can just use the
>+    // compressed format directly
>+    ANGLE_TRY(redefineImage(context, index.getLevelIndex(), internalFormat, size, false));
> 
>-    gl::ImageIndex index = gl::ImageIndex::Make3D(level);
>     return setCompressedImageImpl(context, index, unpack, pixels, 0);
> }
> 
>-gl::Error TextureD3D_3D::setCompressedSubImage(const gl::Context *context,
>-                                               GLenum target,
>-                                               size_t level,
>-                                               const gl::Box &area,
>-                                               GLenum format,
>-                                               const gl::PixelUnpackState &unpack,
>-                                               size_t imageSize,
>-                                               const uint8_t *pixels)
>+angle::Result TextureD3D_3D::setCompressedSubImage(const gl::Context *context,
>+                                                   const gl::ImageIndex &index,
>+                                                   const gl::Box &area,
>+                                                   GLenum format,
>+                                                   const gl::PixelUnpackState &unpack,
>+                                                   size_t imageSize,
>+                                                   const uint8_t *pixels)
> {
>-    ASSERT(target == GL_TEXTURE_3D);
>+    ASSERT(index.getTarget() == gl::TextureTarget::_3D);
> 
>-    gl::ImageIndex index = gl::ImageIndex::Make3D(static_cast<GLint>(level));
>     ANGLE_TRY(TextureD3D::subImageCompressed(context, index, area, format, unpack, pixels, 0));
>     return commitRegion(context, index, area);
> }
> 
>-gl::Error TextureD3D_3D::copyImage(const gl::Context *context,
>-                                   GLenum target,
>-                                   size_t level,
>-                                   const gl::Rectangle &sourceArea,
>-                                   GLenum internalFormat,
>-                                   const gl::Framebuffer *source)
>+angle::Result TextureD3D_3D::copyImage(const gl::Context *context,
>+                                       const gl::ImageIndex &index,
>+                                       const gl::Rectangle &sourceArea,
>+                                       GLenum internalFormat,
>+                                       gl::Framebuffer *source)
> {
>-    UNIMPLEMENTED();
>-    return gl::InternalError() << "Copying 3D textures is unimplemented.";
>+    ANGLE_HR_UNREACHABLE(GetImplAs<ContextD3D>(context));
>+    return angle::Result::Continue;
> }
> 
>-gl::Error TextureD3D_3D::copySubImage(const gl::Context *context,
>-                                      GLenum target,
>-                                      size_t imageLevel,
>-                                      const gl::Offset &destOffset,
>-                                      const gl::Rectangle &sourceArea,
>-                                      const gl::Framebuffer *source)
>+angle::Result TextureD3D_3D::copySubImage(const gl::Context *context,
>+                                          const gl::ImageIndex &index,
>+                                          const gl::Offset &destOffset,
>+                                          const gl::Rectangle &sourceArea,
>+                                          gl::Framebuffer *source)
> {
>-    ASSERT(target == GL_TEXTURE_3D);
>-
>-    GLint level = static_cast<GLint>(imageLevel);
>+    ASSERT(index.getTarget() == gl::TextureTarget::_3D);
> 
>     gl::Extents fbSize = source->getReadColorbuffer()->getSize();
>     gl::Rectangle clippedSourceArea;
>     if (!ClipRectangle(sourceArea, gl::Rectangle(0, 0, fbSize.width, fbSize.height),
>                        &clippedSourceArea))
>     {
>-        return gl::NoError();
>+        return angle::Result::Continue;
>     }
>     const gl::Offset clippedDestOffset(destOffset.x + clippedSourceArea.x - sourceArea.x,
>                                        destOffset.y + clippedSourceArea.y - sourceArea.y,
>@@ -2556,94 +2516,204 @@ gl::Error TextureD3D_3D::copySubImage(const gl::Context *context,
>     // date before the copy and then copy back to the storage afterwards if needed.
>     // TODO: Investigate 3D blits in D3D11.
> 
>-    bool syncTexStorage = mTexStorage && isLevelComplete(level);
>+    bool syncTexStorage = mTexStorage && isLevelComplete(index.getLevelIndex());
>     if (syncTexStorage)
>     {
>-        gl::ImageIndex index = gl::ImageIndex::Make3D(level);
>-        ANGLE_TRY(mImageArray[level]->copyFromTexStorage(context, index, mTexStorage));
>+        ANGLE_TRY(
>+            mImageArray[index.getLevelIndex()]->copyFromTexStorage(context, index, mTexStorage));
>     }
>-    ANGLE_TRY(mImageArray[level]->copyFromFramebuffer(context, clippedDestOffset, clippedSourceArea,
>-                                                      source));
>+    ANGLE_TRY(mImageArray[index.getLevelIndex()]->copyFromFramebuffer(context, clippedDestOffset,
>+                                                                      clippedSourceArea, source));
>     mDirtyImages = true;
> 
>     if (syncTexStorage)
>     {
>-        ANGLE_TRY(updateStorageLevel(context, level));
>+        ANGLE_TRY(updateStorageLevel(context, index.getLevelIndex()));
>     }
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error TextureD3D_3D::setStorage(const gl::Context *context,
>-                                    GLenum target,
>-                                    size_t levels,
>-                                    GLenum internalFormat,
>-                                    const gl::Extents &size)
>+angle::Result TextureD3D_3D::copyTexture(const gl::Context *context,
>+                                         const gl::ImageIndex &index,
>+                                         GLenum internalFormat,
>+                                         GLenum type,
>+                                         size_t sourceLevel,
>+                                         bool unpackFlipY,
>+                                         bool unpackPremultiplyAlpha,
>+                                         bool unpackUnmultiplyAlpha,
>+                                         const gl::Texture *source)
> {
>-    ASSERT(target == GL_TEXTURE_3D);
>+    ASSERT(index.getTarget() == gl::TextureTarget::_3D);
> 
>-    for (size_t level = 0; level < levels; level++)
>-    {
>-        gl::Extents levelSize(std::max(1, size.width >> level),
>-                              std::max(1, size.height >> level),
>-                              std::max(1, size.depth >> level));
>-        mImageArray[level]->redefine(GL_TEXTURE_3D, internalFormat, levelSize, true);
>-    }
>+    gl::TextureType sourceType = source->getType();
> 
>-    for (size_t level = levels; level < gl::IMPLEMENTATION_MAX_TEXTURE_LEVELS; level++)
>+    const gl::InternalFormat &internalFormatInfo = gl::GetInternalFormatInfo(internalFormat, type);
>+    gl::Extents size(
>+        static_cast<int>(source->getWidth(NonCubeTextureTypeToTarget(sourceType), sourceLevel)),
>+        static_cast<int>(source->getHeight(NonCubeTextureTypeToTarget(sourceType), sourceLevel)),
>+        static_cast<int>(source->getDepth(NonCubeTextureTypeToTarget(sourceType), sourceLevel)));
>+
>+    ANGLE_TRY(redefineImage(context, index.getLevelIndex(), internalFormatInfo.sizedInternalFormat,
>+                            size, false));
>+
>+    gl::Box sourceBox(0, 0, 0, size.width, size.height, size.depth);
>+    gl::Offset destOffset(0, 0, 0);
>+    gl::ImageIndex destIndex = gl::ImageIndex::Make3D(static_cast<GLint>(index.getLevelIndex()));
>+
>+    if (!isSRGB(index.getLevelIndex()) && canCreateRenderTargetForImage(destIndex))
>     {
>-        mImageArray[level]->redefine(GL_TEXTURE_3D, GL_NONE, gl::Extents(0, 0, 0), true);
>+        ANGLE_TRY(ensureRenderTarget(context));
>+        ASSERT(isValidLevel(index.getLevelIndex()));
>+        ANGLE_TRY(updateStorageLevel(context, index.getLevelIndex()));
>+
>+        ANGLE_TRY(mRenderer->copyTexture(
>+            context, source, static_cast<GLint>(sourceLevel), gl::TextureTarget::_3D, sourceBox,
>+            internalFormatInfo.format, internalFormatInfo.type, destOffset, mTexStorage,
>+            index.getTarget(), index.getLevelIndex(), unpackFlipY, unpackPremultiplyAlpha,
>+            unpackUnmultiplyAlpha));
>     }
>+    else
>+    {
>+        gl::ImageIndex sourceIndex = gl::ImageIndex::Make3D(static_cast<GLint>(sourceLevel));
>+        ImageD3D *sourceImage      = nullptr;
>+        ImageD3D *destImage        = nullptr;
>+        TextureD3D *sourceD3D      = GetImplAs<TextureD3D>(source);
> 
>-    // TODO(geofflang): Verify storage creation had no errors
>-    bool renderTarget = IsRenderTargetUsage(mState.getUsage());
>-    TexStoragePointer storage(context);
>-    storage.reset(mRenderer->createTextureStorage3D(internalFormat, renderTarget, size.width,
>-                                                    size.height, size.depth,
>-                                                    static_cast<int>(levels)));
>+        ANGLE_TRY(getImageAndSyncFromStorage(context, destIndex, &destImage));
>+        ANGLE_TRY(sourceD3D->getImageAndSyncFromStorage(context, sourceIndex, &sourceImage));
> 
>-    ANGLE_TRY(setCompleteTexStorage(context, storage.get()));
>-    storage.release();
>+        ANGLE_TRY(mRenderer->copyImage(context, destImage, sourceImage, sourceBox, destOffset,
>+                                       unpackFlipY, unpackPremultiplyAlpha, unpackUnmultiplyAlpha));
> 
>-    ANGLE_TRY(updateStorage(context));
>+        mDirtyImages = true;
> 
>-    mImmutable = true;
>+        gl::Box destRegion(0, 0, 0, sourceBox.width, sourceBox.height, sourceBox.depth);
>+        ANGLE_TRY(commitRegion(context, destIndex, destRegion));
>+    }
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
>-
>-gl::Error TextureD3D_3D::bindTexImage(const gl::Context *context, egl::Surface *surface)
>+angle::Result TextureD3D_3D::copySubTexture(const gl::Context *context,
>+                                            const gl::ImageIndex &index,
>+                                            const gl::Offset &destOffset,
>+                                            size_t sourceLevel,
>+                                            const gl::Box &sourceBox,
>+                                            bool unpackFlipY,
>+                                            bool unpackPremultiplyAlpha,
>+                                            bool unpackUnmultiplyAlpha,
>+                                            const gl::Texture *source)
> {
>-    UNREACHABLE();
>-    return gl::InternalError();
>-}
>+    ASSERT(index.getTarget() == gl::TextureTarget::_3D);
> 
>-gl::Error TextureD3D_3D::releaseTexImage(const gl::Context *context)
>-{
>-    UNREACHABLE();
>-    return gl::InternalError();
>-}
>+    gl::ImageIndex destIndex = gl::ImageIndex::Make3D(static_cast<GLint>(index.getLevelIndex()));
> 
>-gl::Error TextureD3D_3D::initMipmapImages(const gl::Context *context)
>-{
>-    const GLuint baseLevel = mState.getEffectiveBaseLevel();
>-    const GLuint maxLevel  = mState.getMipmapMaxLevel();
>-    // Purge array levels baseLevel + 1 through q and reset them to represent the generated mipmap
>-    // levels.
>-    for (GLuint level = baseLevel + 1; level <= maxLevel; level++)
>+    if (!isSRGB(index.getLevelIndex()) && canCreateRenderTargetForImage(destIndex))
>     {
>-        gl::Extents levelSize(std::max(getLevelZeroWidth() >> level, 1),
>-                              std::max(getLevelZeroHeight() >> level, 1),
>-                              std::max(getLevelZeroDepth() >> level, 1));
>+        ANGLE_TRY(ensureRenderTarget(context));
>+        ASSERT(isValidLevel(index.getLevelIndex()));
>+        ANGLE_TRY(updateStorageLevel(context, index.getLevelIndex()));
>+
>+        const gl::InternalFormat &internalFormatInfo =
>+            gl::GetSizedInternalFormatInfo(getInternalFormat(index.getLevelIndex()));
>+        ANGLE_TRY(mRenderer->copyTexture(
>+            context, source, static_cast<GLint>(sourceLevel), gl::TextureTarget::_3D, sourceBox,
>+            internalFormatInfo.format, internalFormatInfo.type, destOffset, mTexStorage,
>+            index.getTarget(), index.getLevelIndex(), unpackFlipY, unpackPremultiplyAlpha,
>+            unpackUnmultiplyAlpha));
>+    }
>+    else
>+    {
>+        gl::ImageIndex sourceImageIndex = gl::ImageIndex::Make3D(static_cast<GLint>(sourceLevel));
>+        TextureD3D *sourceD3D           = GetImplAs<TextureD3D>(source);
>+        ImageD3D *sourceImage           = nullptr;
>+        ANGLE_TRY(sourceD3D->getImageAndSyncFromStorage(context, sourceImageIndex, &sourceImage));
>+
>+        ImageD3D *destImage = nullptr;
>+        ANGLE_TRY(getImageAndSyncFromStorage(context, destIndex, &destImage));
>+
>+        ANGLE_TRY(mRenderer->copyImage(context, destImage, sourceImage, sourceBox, destOffset,
>+                                       unpackFlipY, unpackPremultiplyAlpha, unpackUnmultiplyAlpha));
>+
>+        mDirtyImages = true;
>+
>+        gl::Box destRegion(destOffset.x, destOffset.y, destOffset.z, sourceBox.width,
>+                           sourceBox.height, sourceBox.depth);
>+        ANGLE_TRY(commitRegion(context, destIndex, destRegion));
>+    }
>+
>+    return angle::Result::Continue;
>+}
>+
>+angle::Result TextureD3D_3D::setStorage(const gl::Context *context,
>+                                        gl::TextureType type,
>+                                        size_t levels,
>+                                        GLenum internalFormat,
>+                                        const gl::Extents &size)
>+{
>+    ASSERT(type == gl::TextureType::_3D);
>+
>+    for (size_t level = 0; level < levels; level++)
>+    {
>+        gl::Extents levelSize(std::max(1, size.width >> level), std::max(1, size.height >> level),
>+                              std::max(1, size.depth >> level));
>+        mImageArray[level]->redefine(gl::TextureType::_3D, internalFormat, levelSize, true);
>+    }
>+
>+    for (size_t level = levels; level < gl::IMPLEMENTATION_MAX_TEXTURE_LEVELS; level++)
>+    {
>+        mImageArray[level]->redefine(gl::TextureType::_3D, GL_NONE, gl::Extents(0, 0, 0), true);
>+    }
>+
>+    // TODO(geofflang): Verify storage creation had no errors
>+    bool renderTarget = IsRenderTargetUsage(mState.getUsage());
>+    TexStoragePointer storage(context);
>+    storage.reset(mRenderer->createTextureStorage3D(internalFormat, renderTarget, size.width,
>+                                                    size.height, size.depth,
>+                                                    static_cast<int>(levels)));
>+
>+    ANGLE_TRY(setCompleteTexStorage(context, storage.get()));
>+    storage.release();
>+
>+    ANGLE_TRY(updateStorage(context));
>+
>+    mImmutable = true;
>+
>+    return angle::Result::Continue;
>+}
>+
>+angle::Result TextureD3D_3D::bindTexImage(const gl::Context *context, egl::Surface *surface)
>+{
>+    ANGLE_HR_UNREACHABLE(GetImplAs<ContextD3D>(context));
>+    return angle::Result::Continue;
>+}
>+
>+angle::Result TextureD3D_3D::releaseTexImage(const gl::Context *context)
>+{
>+    ANGLE_HR_UNREACHABLE(GetImplAs<ContextD3D>(context));
>+    return angle::Result::Continue;
>+}
>+
>+angle::Result TextureD3D_3D::initMipmapImages(const gl::Context *context)
>+{
>+    const GLuint baseLevel = mState.getEffectiveBaseLevel();
>+    const GLuint maxLevel  = mState.getMipmapMaxLevel();
>+    // Purge array levels baseLevel + 1 through q and reset them to represent the generated mipmap
>+    // levels.
>+    for (GLuint level = baseLevel + 1; level <= maxLevel; level++)
>+    {
>+        gl::Extents levelSize(std::max(getLevelZeroWidth() >> level, 1),
>+                              std::max(getLevelZeroHeight() >> level, 1),
>+                              std::max(getLevelZeroDepth() >> level, 1));
>         ANGLE_TRY(redefineImage(context, level, getBaseLevelInternalFormat(), levelSize, false));
>     }
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error TextureD3D_3D::getRenderTarget(const gl::Context *context,
>-                                         const gl::ImageIndex &index,
>-                                         RenderTargetD3D **outRT)
>+angle::Result TextureD3D_3D::getRenderTarget(const gl::Context *context,
>+                                             const gl::ImageIndex &index,
>+                                             RenderTargetD3D **outRT)
> {
>     // ensure the underlying texture is created
>     ANGLE_TRY(ensureRenderTarget(context));
>@@ -2654,24 +2724,24 @@ gl::Error TextureD3D_3D::getRenderTarget(const gl::Context *context,
>     }
>     else
>     {
>-        ANGLE_TRY(updateStorageLevel(context, index.mipIndex));
>+        ANGLE_TRY(updateStorageLevel(context, index.getLevelIndex()));
>     }
> 
>     return mTexStorage->getRenderTarget(context, index, outRT);
> }
> 
>-gl::Error TextureD3D_3D::initializeStorage(const gl::Context *context, bool renderTarget)
>+angle::Result TextureD3D_3D::initializeStorage(const gl::Context *context, bool renderTarget)
> {
>     // Only initialize the first time this texture is used as a render target or shader resource
>     if (mTexStorage)
>     {
>-        return gl::NoError();
>+        return angle::Result::Continue;
>     }
> 
>     // do not attempt to create storage for nonexistant data
>     if (!isLevelComplete(getBaseLevel()))
>     {
>-        return gl::NoError();
>+        return angle::Result::Continue;
>     }
> 
>     bool createRenderTarget = (renderTarget || IsRenderTargetUsage(mState.getUsage()));
>@@ -2687,11 +2757,11 @@ gl::Error TextureD3D_3D::initializeStorage(const gl::Context *context, bool rend
>     // flush image data to the storage
>     ANGLE_TRY(updateStorage(context));
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error TextureD3D_3D::createCompleteStorage(bool renderTarget,
>-                                               TexStoragePointer *outStorage) const
>+angle::Result TextureD3D_3D::createCompleteStorage(bool renderTarget,
>+                                                   TexStoragePointer *outStorage) const
> {
>     GLsizei width         = getLevelZeroWidth();
>     GLsizei height        = getLevelZeroHeight();
>@@ -2701,33 +2771,34 @@ gl::Error TextureD3D_3D::createCompleteStorage(bool renderTarget,
>     ASSERT(width > 0 && height > 0 && depth > 0);
> 
>     // use existing storage level count, when previously specified by TexStorage*D
>-    GLint levels = (mTexStorage ? mTexStorage->getLevelCount() : creationLevels(width, height, depth));
>+    GLint levels =
>+        (mTexStorage ? mTexStorage->getLevelCount() : creationLevels(width, height, depth));
> 
>     // TODO: Verify creation of the storage succeeded
>     outStorage->reset(mRenderer->createTextureStorage3D(internalFormat, renderTarget, width, height,
>                                                         depth, levels));
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error TextureD3D_3D::setCompleteTexStorage(const gl::Context *context,
>-                                               TextureStorage *newCompleteTexStorage)
>+angle::Result TextureD3D_3D::setCompleteTexStorage(const gl::Context *context,
>+                                                   TextureStorage *newCompleteTexStorage)
> {
>     ANGLE_TRY(releaseTexStorage(context));
>-    mTexStorage = newCompleteTexStorage;
>+    mTexStorage  = newCompleteTexStorage;
>     mDirtyImages = true;
> 
>     // We do not support managed 3D storage, as that is D3D9/ES2-only
>     ASSERT(!mTexStorage->isManaged());
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error TextureD3D_3D::updateStorage(const gl::Context *context)
>+angle::Result TextureD3D_3D::updateStorage(const gl::Context *context)
> {
>     if (!mDirtyImages)
>     {
>-        return gl::NoError();
>+        return angle::Result::Continue;
>     }
> 
>     ASSERT(mTexStorage != nullptr);
>@@ -2741,7 +2812,7 @@ gl::Error TextureD3D_3D::updateStorage(const gl::Context *context)
>     }
> 
>     mDirtyImages = false;
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
> bool TextureD3D_3D::isValidLevel(int level) const
>@@ -2800,10 +2871,10 @@ bool TextureD3D_3D::isLevelComplete(int level) const
> 
> bool TextureD3D_3D::isImageComplete(const gl::ImageIndex &index) const
> {
>-    return isLevelComplete(index.mipIndex);
>+    return isLevelComplete(index.getLevelIndex());
> }
> 
>-gl::Error TextureD3D_3D::updateStorageLevel(const gl::Context *context, int level)
>+angle::Result TextureD3D_3D::updateStorageLevel(const gl::Context *context, int level)
> {
>     ASSERT(level >= 0 && level < static_cast<int>(mImageArray.size()) &&
>            mImageArray[level] != nullptr);
>@@ -2816,22 +2887,22 @@ gl::Error TextureD3D_3D::updateStorageLevel(const gl::Context *context, int leve
>         ANGLE_TRY(commitRegion(context, index, region));
>     }
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error TextureD3D_3D::redefineImage(const gl::Context *context,
>-                                       GLint level,
>-                                       GLenum internalformat,
>-                                       const gl::Extents &size,
>-                                       bool forceRelease)
>+angle::Result TextureD3D_3D::redefineImage(const gl::Context *context,
>+                                           GLint level,
>+                                           GLenum internalformat,
>+                                           const gl::Extents &size,
>+                                           bool forceRelease)
> {
>     // If there currently is a corresponding storage texture image, it has these parameters
>-    const int storageWidth  = std::max(1, getLevelZeroWidth() >> level);
>-    const int storageHeight = std::max(1, getLevelZeroHeight() >> level);
>-    const int storageDepth  = std::max(1, getLevelZeroDepth() >> level);
>+    const int storageWidth     = std::max(1, getLevelZeroWidth() >> level);
>+    const int storageHeight    = std::max(1, getLevelZeroHeight() >> level);
>+    const int storageDepth     = std::max(1, getLevelZeroDepth() >> level);
>     const GLenum storageFormat = getBaseLevelInternalFormat();
> 
>-    mImageArray[level]->redefine(GL_TEXTURE_3D, internalformat, size, forceRelease);
>+    mImageArray[level]->redefine(gl::TextureType::_3D, internalformat, size, forceRelease);
>     mDirtyImages = mDirtyImages || mImageArray[level]->isDirty();
> 
>     if (mTexStorage)
>@@ -2847,13 +2918,14 @@ gl::Error TextureD3D_3D::redefineImage(const gl::Context *context,
>         }
>     }
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
> gl::ImageIndexIterator TextureD3D_3D::imageIterator() const
> {
>     return gl::ImageIndexIterator::Make3D(0, mTexStorage->getLevelCount(),
>-                                          gl::ImageIndex::ENTIRE_LEVEL, gl::ImageIndex::ENTIRE_LEVEL);
>+                                          gl::ImageIndex::kEntireLevel,
>+                                          gl::ImageIndex::kEntireLevel);
> }
> 
> gl::ImageIndex TextureD3D_3D::getImageIndex(GLint mip, GLint /*layer*/) const
>@@ -2864,8 +2936,8 @@ gl::ImageIndex TextureD3D_3D::getImageIndex(GLint mip, GLint /*layer*/) const
> 
> bool TextureD3D_3D::isValidIndex(const gl::ImageIndex &index) const
> {
>-    return (mTexStorage && index.type == GL_TEXTURE_3D &&
>-            index.mipIndex >= 0 && index.mipIndex < mTexStorage->getLevelCount());
>+    return (mTexStorage && index.getType() == gl::TextureType::_3D && index.getLevelIndex() >= 0 &&
>+            index.getLevelIndex() < mTexStorage->getLevelCount());
> }
> 
> void TextureD3D_3D::markAllImagesDirty()
>@@ -2893,7 +2965,7 @@ TextureD3D_2DArray::TextureD3D_2DArray(const gl::TextureState &state, RendererD3
>     }
> }
> 
>-gl::Error TextureD3D_2DArray::onDestroy(const gl::Context *context)
>+void TextureD3D_2DArray::onDestroy(const gl::Context *context)
> {
>     // Delete the Images before the TextureStorage. Images might be relying on the TextureStorage
>     // for some of their data. If TextureStorage is deleted before the Images, then their data will
>@@ -2902,26 +2974,25 @@ gl::Error TextureD3D_2DArray::onDestroy(const gl::Context *context)
>     return TextureD3D::onDestroy(context);
> }
> 
>-TextureD3D_2DArray::~TextureD3D_2DArray()
>-{
>-}
>+TextureD3D_2DArray::~TextureD3D_2DArray() {}
> 
> ImageD3D *TextureD3D_2DArray::getImage(int level, int layer) const
> {
>     ASSERT(level < gl::IMPLEMENTATION_MAX_TEXTURE_LEVELS);
>-    ASSERT((layer == 0 && mLayerCounts[level] == 0) ||
>-           layer < mLayerCounts[level]);
>+    ASSERT((layer == 0 && mLayerCounts[level] == 0) || layer < mLayerCounts[level]);
>     return (mImageArray[level] ? mImageArray[level][layer] : nullptr);
> }
> 
> ImageD3D *TextureD3D_2DArray::getImage(const gl::ImageIndex &index) const
> {
>-    ASSERT(index.mipIndex < gl::IMPLEMENTATION_MAX_TEXTURE_LEVELS);
>-    ASSERT(index.layerIndex != gl::ImageIndex::ENTIRE_LEVEL);
>-    ASSERT((index.layerIndex == 0 && mLayerCounts[index.mipIndex] == 0) ||
>-           index.layerIndex < mLayerCounts[index.mipIndex]);
>-    ASSERT(index.type == GL_TEXTURE_2D_ARRAY);
>-    return (mImageArray[index.mipIndex] ? mImageArray[index.mipIndex][index.layerIndex] : nullptr);
>+    ASSERT(index.getLevelIndex() < gl::IMPLEMENTATION_MAX_TEXTURE_LEVELS);
>+    ASSERT(index.hasLayer());
>+    ASSERT((index.getLayerIndex() == 0 && mLayerCounts[index.getLevelIndex()] == 0) ||
>+           index.getLayerIndex() < mLayerCounts[index.getLevelIndex()]);
>+    ASSERT(index.getType() == gl::TextureType::_2DArray);
>+    return (mImageArray[index.getLevelIndex()]
>+                ? mImageArray[index.getLevelIndex()][index.getLayerIndex()]
>+                : nullptr);
> }
> 
> GLsizei TextureD3D_2DArray::getLayerCount(int level) const
>@@ -2932,17 +3003,23 @@ GLsizei TextureD3D_2DArray::getLayerCount(int level) const
> 
> GLsizei TextureD3D_2DArray::getWidth(GLint level) const
> {
>-    return (level < gl::IMPLEMENTATION_MAX_TEXTURE_LEVELS && mLayerCounts[level] > 0) ? mImageArray[level][0]->getWidth() : 0;
>+    return (level < gl::IMPLEMENTATION_MAX_TEXTURE_LEVELS && mLayerCounts[level] > 0)
>+               ? mImageArray[level][0]->getWidth()
>+               : 0;
> }
> 
> GLsizei TextureD3D_2DArray::getHeight(GLint level) const
> {
>-    return (level < gl::IMPLEMENTATION_MAX_TEXTURE_LEVELS && mLayerCounts[level] > 0) ? mImageArray[level][0]->getHeight() : 0;
>+    return (level < gl::IMPLEMENTATION_MAX_TEXTURE_LEVELS && mLayerCounts[level] > 0)
>+               ? mImageArray[level][0]->getHeight()
>+               : 0;
> }
> 
> GLenum TextureD3D_2DArray::getInternalFormat(GLint level) const
> {
>-    return (level < gl::IMPLEMENTATION_MAX_TEXTURE_LEVELS && mLayerCounts[level] > 0) ? mImageArray[level][0]->getInternalFormat() : GL_NONE;
>+    return (level < gl::IMPLEMENTATION_MAX_TEXTURE_LEVELS && mLayerCounts[level] > 0)
>+               ? mImageArray[level][0]->getInternalFormat()
>+               : GL_NONE;
> }
> 
> bool TextureD3D_2DArray::isDepth(GLint level) const
>@@ -2950,173 +3027,177 @@ bool TextureD3D_2DArray::isDepth(GLint level) const
>     return gl::GetSizedInternalFormatInfo(getInternalFormat(level)).depthBits > 0;
> }
> 
>-gl::Error TextureD3D_2DArray::setEGLImageTarget(const gl::Context *context,
>-                                                GLenum target,
>-                                                egl::Image *image)
>+bool TextureD3D_2DArray::isSRGB(GLint level) const
> {
>-    UNREACHABLE();
>-    return gl::InternalError();
>+    return gl::GetSizedInternalFormatInfo(getInternalFormat(level)).colorEncoding == GL_SRGB;
> }
> 
>-gl::Error TextureD3D_2DArray::setImage(const gl::Context *context,
>-                                       GLenum target,
>-                                       size_t imageLevel,
>-                                       GLenum internalFormat,
>-                                       const gl::Extents &size,
>-                                       GLenum format,
>-                                       GLenum type,
>-                                       const gl::PixelUnpackState &unpack,
>-                                       const uint8_t *pixels)
>+angle::Result TextureD3D_2DArray::setEGLImageTarget(const gl::Context *context,
>+                                                    gl::TextureType type,
>+                                                    egl::Image *image)
>+{
>+    ANGLE_HR_UNREACHABLE(GetImplAs<ContextD3D>(context));
>+    return angle::Result::Continue;
>+}
>+
>+angle::Result TextureD3D_2DArray::setImage(const gl::Context *context,
>+                                           const gl::ImageIndex &index,
>+                                           GLenum internalFormat,
>+                                           const gl::Extents &size,
>+                                           GLenum format,
>+                                           GLenum type,
>+                                           const gl::PixelUnpackState &unpack,
>+                                           const uint8_t *pixels)
> {
>-    ASSERT(target == GL_TEXTURE_2D_ARRAY);
>+    ASSERT(index.getTarget() == gl::TextureTarget::_2DArray);
> 
>     const gl::InternalFormat &formatInfo = gl::GetInternalFormatInfo(internalFormat, type);
> 
>-    GLint level = static_cast<GLint>(imageLevel);
>-    ANGLE_TRY(redefineImage(context, level, formatInfo.sizedInternalFormat, size, false));
>+    ANGLE_TRY(
>+        redefineImage(context, index.getLevelIndex(), formatInfo.sizedInternalFormat, size, false));
> 
>-    GLsizei inputDepthPitch              = 0;
>-    ANGLE_TRY_RESULT(formatInfo.computeDepthPitch(type, size.width, size.height, unpack.alignment,
>-                                                  unpack.rowLength, unpack.imageHeight),
>-                     inputDepthPitch);
>+    ContextD3D *contextD3D = GetImplAs<ContextD3D>(context);
>+
>+    GLuint inputDepthPitch = 0;
>+    ANGLE_CHECK_GL_MATH(contextD3D, formatInfo.computeDepthPitch(
>+                                        type, size.width, size.height, unpack.alignment,
>+                                        unpack.rowLength, unpack.imageHeight, &inputDepthPitch));
> 
>     for (int i = 0; i < size.depth; i++)
>     {
>         const ptrdiff_t layerOffset = (inputDepthPitch * i);
>-        gl::ImageIndex index = gl::ImageIndex::Make2DArray(level, i);
>-        ANGLE_TRY(setImageImpl(context, index, type, unpack, pixels, layerOffset));
>+        gl::ImageIndex layerIndex   = gl::ImageIndex::Make2DArray(index.getLevelIndex(), i);
>+        ANGLE_TRY(setImageImpl(context, layerIndex, type, unpack, pixels, layerOffset));
>     }
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error TextureD3D_2DArray::setSubImage(const gl::Context *context,
>-                                          GLenum target,
>-                                          size_t imageLevel,
>-                                          const gl::Box &area,
>-                                          GLenum format,
>-                                          GLenum type,
>-                                          const gl::PixelUnpackState &unpack,
>-                                          const uint8_t *pixels)
>+angle::Result TextureD3D_2DArray::setSubImage(const gl::Context *context,
>+                                              const gl::ImageIndex &index,
>+                                              const gl::Box &area,
>+                                              GLenum format,
>+                                              GLenum type,
>+                                              const gl::PixelUnpackState &unpack,
>+                                              gl::Buffer *unpackBuffer,
>+                                              const uint8_t *pixels)
> {
>-    ASSERT(target == GL_TEXTURE_2D_ARRAY);
>-    GLint level                          = static_cast<GLint>(imageLevel);
>+    ContextD3D *contextD3D = GetImplAs<ContextD3D>(context);
>+
>+    ASSERT(index.getTarget() == gl::TextureTarget::_2DArray);
>     const gl::InternalFormat &formatInfo =
>-        gl::GetInternalFormatInfo(getInternalFormat(level), type);
>-    GLsizei inputDepthPitch              = 0;
>-    ANGLE_TRY_RESULT(formatInfo.computeDepthPitch(type, area.width, area.height, unpack.alignment,
>-                                                  unpack.rowLength, unpack.imageHeight),
>-                     inputDepthPitch);
>+        gl::GetInternalFormatInfo(getInternalFormat(index.getLevelIndex()), type);
>+    GLuint inputDepthPitch = 0;
>+    ANGLE_CHECK_GL_MATH(contextD3D, formatInfo.computeDepthPitch(
>+                                        type, area.width, area.height, unpack.alignment,
>+                                        unpack.rowLength, unpack.imageHeight, &inputDepthPitch));
> 
>     for (int i = 0; i < area.depth; i++)
>     {
>-        int layer = area.z + i;
>+        int layer                   = area.z + i;
>         const ptrdiff_t layerOffset = (inputDepthPitch * i);
> 
>         gl::Box layerArea(area.x, area.y, 0, area.width, area.height, 1);
> 
>-        gl::ImageIndex index = gl::ImageIndex::Make2DArray(level, layer);
>-        ANGLE_TRY(TextureD3D::subImage(context, index, layerArea, format, type, unpack, pixels,
>-                                       layerOffset));
>+        gl::ImageIndex layerIndex = gl::ImageIndex::Make2DArray(index.getLevelIndex(), layer);
>+        ANGLE_TRY(TextureD3D::subImage(context, layerIndex, layerArea, format, type, unpack,
>+                                       unpackBuffer, pixels, layerOffset));
>     }
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error TextureD3D_2DArray::setCompressedImage(const gl::Context *context,
>-                                                 GLenum target,
>-                                                 size_t imageLevel,
>-                                                 GLenum internalFormat,
>-                                                 const gl::Extents &size,
>-                                                 const gl::PixelUnpackState &unpack,
>-                                                 size_t imageSize,
>-                                                 const uint8_t *pixels)
>+angle::Result TextureD3D_2DArray::setCompressedImage(const gl::Context *context,
>+                                                     const gl::ImageIndex &index,
>+                                                     GLenum internalFormat,
>+                                                     const gl::Extents &size,
>+                                                     const gl::PixelUnpackState &unpack,
>+                                                     size_t imageSize,
>+                                                     const uint8_t *pixels)
> {
>-    ASSERT(target == GL_TEXTURE_2D_ARRAY);
>+    ASSERT(index.getTarget() == gl::TextureTarget::_2DArray);
>+
>+    ContextD3D *contextD3D = GetImplAs<ContextD3D>(context);
> 
>-    GLint level = static_cast<GLint>(imageLevel);
>-    // compressed formats don't have separate sized internal formats-- we can just use the compressed format directly
>-    ANGLE_TRY(redefineImage(context, level, internalFormat, size, false));
>+    // compressed formats don't have separate sized internal formats-- we can just use the
>+    // compressed format directly
>+    ANGLE_TRY(redefineImage(context, index.getLevelIndex(), internalFormat, size, false));
> 
>     const gl::InternalFormat &formatInfo = gl::GetSizedInternalFormatInfo(internalFormat);
>-    GLsizei inputDepthPitch              = 0;
>-    ANGLE_TRY_RESULT(
>-        formatInfo.computeDepthPitch(GL_UNSIGNED_BYTE, size.width, size.height, 1, 0, 0),
>-        inputDepthPitch);
>+    GLuint inputDepthPitch               = 0;
>+    ANGLE_CHECK_GL_MATH(
>+        contextD3D, formatInfo.computeDepthPitch(GL_UNSIGNED_BYTE, size.width, size.height, 1, 0, 0,
>+                                                 &inputDepthPitch));
> 
>     for (int i = 0; i < size.depth; i++)
>     {
>         const ptrdiff_t layerOffset = (inputDepthPitch * i);
> 
>-        gl::ImageIndex index = gl::ImageIndex::Make2DArray(level, i);
>-        ANGLE_TRY(setCompressedImageImpl(context, index, unpack, pixels, layerOffset));
>+        gl::ImageIndex layerIndex = gl::ImageIndex::Make2DArray(index.getLevelIndex(), i);
>+        ANGLE_TRY(setCompressedImageImpl(context, layerIndex, unpack, pixels, layerOffset));
>     }
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error TextureD3D_2DArray::setCompressedSubImage(const gl::Context *context,
>-                                                    GLenum target,
>-                                                    size_t level,
>-                                                    const gl::Box &area,
>-                                                    GLenum format,
>-                                                    const gl::PixelUnpackState &unpack,
>-                                                    size_t imageSize,
>-                                                    const uint8_t *pixels)
>+angle::Result TextureD3D_2DArray::setCompressedSubImage(const gl::Context *context,
>+                                                        const gl::ImageIndex &index,
>+                                                        const gl::Box &area,
>+                                                        GLenum format,
>+                                                        const gl::PixelUnpackState &unpack,
>+                                                        size_t imageSize,
>+                                                        const uint8_t *pixels)
> {
>-    ASSERT(target == GL_TEXTURE_2D_ARRAY);
>+    ASSERT(index.getTarget() == gl::TextureTarget::_2DArray);
>+
>+    ContextD3D *contextD3D = GetImplAs<ContextD3D>(context);
> 
>     const gl::InternalFormat &formatInfo = gl::GetSizedInternalFormatInfo(format);
>-    GLsizei inputDepthPitch              = 0;
>-    ANGLE_TRY_RESULT(
>-        formatInfo.computeDepthPitch(GL_UNSIGNED_BYTE, area.width, area.height, 1, 0, 0),
>-        inputDepthPitch);
>+    GLuint inputDepthPitch               = 0;
>+    ANGLE_CHECK_GL_MATH(
>+        contextD3D, formatInfo.computeDepthPitch(GL_UNSIGNED_BYTE, area.width, area.height, 1, 0, 0,
>+                                                 &inputDepthPitch));
> 
>     for (int i = 0; i < area.depth; i++)
>     {
>-        int layer = area.z + i;
>+        int layer                   = area.z + i;
>         const ptrdiff_t layerOffset = (inputDepthPitch * i);
> 
>         gl::Box layerArea(area.x, area.y, 0, area.width, area.height, 1);
> 
>-        gl::ImageIndex index = gl::ImageIndex::Make2DArray(static_cast<GLint>(level), layer);
>-        ANGLE_TRY(TextureD3D::subImageCompressed(context, index, layerArea, format, unpack, pixels,
>-                                                 layerOffset));
>-        ANGLE_TRY(commitRegion(context, index, layerArea));
>+        gl::ImageIndex layerIndex = gl::ImageIndex::Make2DArray(index.getLevelIndex(), layer);
>+        ANGLE_TRY(TextureD3D::subImageCompressed(context, layerIndex, layerArea, format, unpack,
>+                                                 pixels, layerOffset));
>+        ANGLE_TRY(commitRegion(context, layerIndex, layerArea));
>     }
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error TextureD3D_2DArray::copyImage(const gl::Context *context,
>-                                        GLenum target,
>-                                        size_t level,
>-                                        const gl::Rectangle &sourceArea,
>-                                        GLenum internalFormat,
>-                                        const gl::Framebuffer *source)
>+angle::Result TextureD3D_2DArray::copyImage(const gl::Context *context,
>+                                            const gl::ImageIndex &index,
>+                                            const gl::Rectangle &sourceArea,
>+                                            GLenum internalFormat,
>+                                            gl::Framebuffer *source)
> {
>-    UNIMPLEMENTED();
>-    return gl::InternalError() << "Copying 2D array textures is unimplemented.";
>+    ANGLE_HR_UNREACHABLE(GetImplAs<ContextD3D>(context));
>+    return angle::Result::Continue;
> }
> 
>-gl::Error TextureD3D_2DArray::copySubImage(const gl::Context *context,
>-                                           GLenum target,
>-                                           size_t imageLevel,
>-                                           const gl::Offset &destOffset,
>-                                           const gl::Rectangle &sourceArea,
>-                                           const gl::Framebuffer *source)
>+angle::Result TextureD3D_2DArray::copySubImage(const gl::Context *context,
>+                                               const gl::ImageIndex &index,
>+                                               const gl::Offset &destOffset,
>+                                               const gl::Rectangle &sourceArea,
>+                                               gl::Framebuffer *source)
> {
>-    ASSERT(target == GL_TEXTURE_2D_ARRAY);
>-
>-    GLint level          = static_cast<GLint>(imageLevel);
>-    gl::ImageIndex index = gl::ImageIndex::Make2DArray(level, destOffset.z);
>+    ASSERT(index.getTarget() == gl::TextureTarget::_2DArray);
> 
>     gl::Extents fbSize = source->getReadColorbuffer()->getSize();
>     gl::Rectangle clippedSourceArea;
>     if (!ClipRectangle(sourceArea, gl::Rectangle(0, 0, fbSize.width, fbSize.height),
>                        &clippedSourceArea))
>     {
>-        return gl::NoError();
>+        return angle::Result::Continue;
>     }
>     const gl::Offset clippedDestOffset(destOffset.x + clippedSourceArea.x - sourceArea.x,
>                                        destOffset.y + clippedSourceArea.y - sourceArea.y,
>@@ -3125,7 +3206,7 @@ gl::Error TextureD3D_2DArray::copySubImage(const gl::Context *context,
>     if (!canCreateRenderTargetForImage(index))
>     {
>         gl::Offset destLayerOffset(clippedDestOffset.x, clippedDestOffset.y, 0);
>-        ANGLE_TRY(mImageArray[level][clippedDestOffset.z]->copyFromFramebuffer(
>+        ANGLE_TRY(mImageArray[index.getLevelIndex()][clippedDestOffset.z]->copyFromFramebuffer(
>             context, destLayerOffset, clippedSourceArea, source));
>         mDirtyImages = true;
>     }
>@@ -3133,45 +3214,182 @@ gl::Error TextureD3D_2DArray::copySubImage(const gl::Context *context,
>     {
>         ANGLE_TRY(ensureRenderTarget(context));
> 
>-        if (isValidLevel(level))
>+        if (isValidLevel(index.getLevelIndex()))
>         {
>-            ANGLE_TRY(updateStorageLevel(context, level));
>+            ANGLE_TRY(updateStorageLevel(context, index.getLevelIndex()));
>             ANGLE_TRY(
>                 mRenderer->copyImage2DArray(context, source, clippedSourceArea,
>                                             gl::GetUnsizedFormat(getInternalFormat(getBaseLevel())),
>-                                            clippedDestOffset, mTexStorage, level));
>+                                            clippedDestOffset, mTexStorage, index.getLevelIndex()));
>         }
>     }
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error TextureD3D_2DArray::setStorage(const gl::Context *context,
>-                                         GLenum target,
>-                                         size_t levels,
>-                                         GLenum internalFormat,
>-                                         const gl::Extents &size)
>+angle::Result TextureD3D_2DArray::copyTexture(const gl::Context *context,
>+                                              const gl::ImageIndex &index,
>+                                              GLenum internalFormat,
>+                                              GLenum type,
>+                                              size_t sourceLevel,
>+                                              bool unpackFlipY,
>+                                              bool unpackPremultiplyAlpha,
>+                                              bool unpackUnmultiplyAlpha,
>+                                              const gl::Texture *source)
> {
>-    ASSERT(target == GL_TEXTURE_2D_ARRAY);
>+    ASSERT(index.getTarget() == gl::TextureTarget::_2DArray);
>+
>+    gl::TextureType sourceType = source->getType();
>+
>+    const gl::InternalFormat &internalFormatInfo = gl::GetInternalFormatInfo(internalFormat, type);
>+    gl::Extents size(
>+        static_cast<int>(source->getWidth(NonCubeTextureTypeToTarget(sourceType), sourceLevel)),
>+        static_cast<int>(source->getHeight(NonCubeTextureTypeToTarget(sourceType), sourceLevel)),
>+        static_cast<int>(source->getDepth(NonCubeTextureTypeToTarget(sourceType), sourceLevel)));
>+
>+    ANGLE_TRY(redefineImage(context, index.getLevelIndex(), internalFormatInfo.sizedInternalFormat,
>+                            size, false));
>+
>+    gl::Box sourceBox(0, 0, 0, size.width, size.height, size.depth);
>+    gl::Offset destOffset(0, 0, 0);
>+
>+    gl::ImageIndex destIndex =
>+        gl::ImageIndex::Make2DArrayRange(index.getLevelIndex(), 0, size.depth);
>+
>+    if (!isSRGB(index.getLevelIndex()) &&
>+        canCreateRenderTargetForImage(
>+            gl::ImageIndex::Make2DArrayRange(index.getLevelIndex(), 0, size.depth)))
>+    {
>+        ANGLE_TRY(ensureRenderTarget(context));
>+        ASSERT(isValidLevel(index.getLevelIndex()));
>+        ANGLE_TRY(updateStorageLevel(context, index.getLevelIndex()));
>+        ANGLE_TRY(mRenderer->copyTexture(
>+            context, source, static_cast<GLint>(sourceLevel), gl::TextureTarget::_2DArray,
>+            sourceBox, internalFormatInfo.format, internalFormatInfo.type, destOffset, mTexStorage,
>+            index.getTarget(), index.getLevelIndex(), unpackFlipY, unpackPremultiplyAlpha,
>+            unpackUnmultiplyAlpha));
>+    }
>+    else
>+    {
>+        for (int i = 0; i < size.depth; i++)
>+        {
>+            gl::ImageIndex currentSourceDepthIndex =
>+                gl::ImageIndex::Make2DArray(static_cast<GLint>(sourceLevel), i);
>+            gl::ImageIndex currentDestDepthIndex =
>+                gl::ImageIndex::Make2DArray(static_cast<GLint>(index.getLevelIndex()), i);
>+            ImageD3D *sourceImage = nullptr;
>+            ImageD3D *destImage   = nullptr;
>+            TextureD3D *sourceD3D = GetImplAs<TextureD3D>(source);
>+
>+            ANGLE_TRY(getImageAndSyncFromStorage(context, currentDestDepthIndex, &destImage));
>+            ANGLE_TRY(sourceD3D->getImageAndSyncFromStorage(context, currentSourceDepthIndex,
>+                                                            &sourceImage));
>+
>+            ANGLE_TRY(mRenderer->copyImage(context, destImage, sourceImage, sourceBox, destOffset,
>+                                           unpackFlipY, unpackPremultiplyAlpha,
>+                                           unpackUnmultiplyAlpha));
>+        }
>+
>+        mDirtyImages = true;
>+
>+        gl::Box destRegion(destOffset.x, destOffset.y, destOffset.z, sourceBox.width,
>+                           sourceBox.height, sourceBox.depth);
>+        ANGLE_TRY(commitRegion(context, destIndex, destRegion));
>+    }
>+
>+    return angle::Result::Continue;
>+}
>+
>+angle::Result TextureD3D_2DArray::copySubTexture(const gl::Context *context,
>+                                                 const gl::ImageIndex &index,
>+                                                 const gl::Offset &destOffset,
>+                                                 size_t sourceLevel,
>+                                                 const gl::Box &sourceBox,
>+                                                 bool unpackFlipY,
>+                                                 bool unpackPremultiplyAlpha,
>+                                                 bool unpackUnmultiplyAlpha,
>+                                                 const gl::Texture *source)
>+{
>+    ASSERT(index.getTarget() == gl::TextureTarget::_2DArray);
>+
>+    gl::ImageIndex destIndex = gl::ImageIndex::Make2DArrayRange(
>+        static_cast<GLint>(index.getLevelIndex()), destOffset.z, sourceBox.depth - destOffset.z);
>+
>+    if (!isSRGB(destIndex.getLevelIndex()) && canCreateRenderTargetForImage(destIndex))
>+    {
>+        ANGLE_TRY(ensureRenderTarget(context));
>+        ASSERT(isValidLevel(destIndex.getLevelIndex()));
>+        ANGLE_TRY(updateStorageLevel(context, destIndex.getLevelIndex()));
>+
>+        const gl::InternalFormat &internalFormatInfo =
>+            gl::GetSizedInternalFormatInfo(getInternalFormat(destIndex.getLevelIndex()));
>+        ANGLE_TRY(mRenderer->copyTexture(
>+            context, source, static_cast<GLint>(sourceLevel), gl::TextureTarget::_2DArray,
>+            sourceBox, internalFormatInfo.format, internalFormatInfo.type, destOffset, mTexStorage,
>+            index.getTarget(), index.getLevelIndex(), unpackFlipY, unpackPremultiplyAlpha,
>+            unpackUnmultiplyAlpha));
>+    }
>+    else
>+    {
>+        for (int i = 0; i < sourceBox.depth; i++)
>+        {
>+            gl::ImageIndex currentSourceIndex =
>+                gl::ImageIndex::Make2DArray(static_cast<GLint>(sourceLevel), i + sourceBox.z);
>+            gl::ImageIndex currentDestIndex = gl::ImageIndex::Make2DArray(
>+                static_cast<GLint>(index.getLevelIndex()), i + destOffset.z);
>+
>+            gl::Box currentLayerBox(sourceBox.x, sourceBox.y, 0, sourceBox.width, sourceBox.height,
>+                                    1);
>+
>+            TextureD3D *sourceD3D = GetImplAs<TextureD3D>(source);
>+            ImageD3D *sourceImage = nullptr;
>+            ANGLE_TRY(
>+                sourceD3D->getImageAndSyncFromStorage(context, currentSourceIndex, &sourceImage));
>+
>+            ImageD3D *destImage = nullptr;
>+            ANGLE_TRY(getImageAndSyncFromStorage(context, currentDestIndex, &destImage));
>+
>+            ANGLE_TRY(mRenderer->copyImage(context, destImage, sourceImage, currentLayerBox,
>+                                           destOffset, unpackFlipY, unpackPremultiplyAlpha,
>+                                           unpackUnmultiplyAlpha));
>+        }
>+
>+        mDirtyImages = true;
>+
>+        gl::Box destRegion(destOffset.x, destOffset.y, destOffset.z, sourceBox.width,
>+                           sourceBox.height, sourceBox.depth);
>+        ANGLE_TRY(commitRegion(context, destIndex, destRegion));
>+    }
>+
>+    return angle::Result::Continue;
>+}
>+
>+angle::Result TextureD3D_2DArray::setStorage(const gl::Context *context,
>+                                             gl::TextureType type,
>+                                             size_t levels,
>+                                             GLenum internalFormat,
>+                                             const gl::Extents &size)
>+{
>+    ASSERT(type == gl::TextureType::_2DArray);
> 
>     deleteImages();
> 
>     for (size_t level = 0; level < gl::IMPLEMENTATION_MAX_TEXTURE_LEVELS; level++)
>     {
>         gl::Extents levelLayerSize(std::max(1, size.width >> level),
>-                                   std::max(1, size.height >> level),
>-                                   1);
>+                                   std::max(1, size.height >> level), 1);
> 
>         mLayerCounts[level] = (level < levels ? size.depth : 0);
> 
>         if (mLayerCounts[level] > 0)
>         {
>             // Create new images for this level
>-            mImageArray[level] = new ImageD3D*[mLayerCounts[level]];
>+            mImageArray[level] = new ImageD3D *[mLayerCounts[level]];
> 
>             for (int layer = 0; layer < mLayerCounts[level]; layer++)
>             {
>                 mImageArray[level][layer] = mRenderer->createImage();
>-                mImageArray[level][layer]->redefine(GL_TEXTURE_2D_ARRAY, internalFormat, levelLayerSize, true);
>+                mImageArray[level][layer]->redefine(gl::TextureType::_2DArray, internalFormat,
>+                                                    levelLayerSize, true);
>             }
>         }
>     }
>@@ -3190,29 +3408,29 @@ gl::Error TextureD3D_2DArray::setStorage(const gl::Context *context,
> 
>     mImmutable = true;
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error TextureD3D_2DArray::bindTexImage(const gl::Context *context, egl::Surface *surface)
>+angle::Result TextureD3D_2DArray::bindTexImage(const gl::Context *context, egl::Surface *surface)
> {
>-    UNREACHABLE();
>-    return gl::InternalError();
>+    ANGLE_HR_UNREACHABLE(GetImplAs<ContextD3D>(context));
>+    return angle::Result::Continue;
> }
> 
>-gl::Error TextureD3D_2DArray::releaseTexImage(const gl::Context *context)
>+angle::Result TextureD3D_2DArray::releaseTexImage(const gl::Context *context)
> {
>-    UNREACHABLE();
>-    return gl::InternalError();
>+    ANGLE_HR_UNREACHABLE(GetImplAs<ContextD3D>(context));
>+    return angle::Result::Continue;
> }
> 
>-gl::Error TextureD3D_2DArray::initMipmapImages(const gl::Context *context)
>+angle::Result TextureD3D_2DArray::initMipmapImages(const gl::Context *context)
> {
>     const GLuint baseLevel = mState.getEffectiveBaseLevel();
>     const GLuint maxLevel  = mState.getMipmapMaxLevel();
>-    int baseWidth     = getLevelZeroWidth();
>-    int baseHeight    = getLevelZeroHeight();
>-    int baseDepth     = getLayerCount(getBaseLevel());
>-    GLenum baseFormat = getBaseLevelInternalFormat();
>+    int baseWidth          = getLevelZeroWidth();
>+    int baseHeight         = getLevelZeroHeight();
>+    int baseDepth          = getLayerCount(getBaseLevel());
>+    GLenum baseFormat      = getBaseLevelInternalFormat();
> 
>     // Purge array levels baseLevel + 1 through q and reset them to represent the generated mipmap
>     // levels.
>@@ -3220,36 +3438,35 @@ gl::Error TextureD3D_2DArray::initMipmapImages(const gl::Context *context)
>     {
>         ASSERT((baseWidth >> level) > 0 || (baseHeight >> level) > 0);
>         gl::Extents levelLayerSize(std::max(baseWidth >> level, 1),
>-                                   std::max(baseHeight >> level, 1),
>-                                   baseDepth);
>+                                   std::max(baseHeight >> level, 1), baseDepth);
>         ANGLE_TRY(redefineImage(context, level, baseFormat, levelLayerSize, false));
>     }
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error TextureD3D_2DArray::getRenderTarget(const gl::Context *context,
>-                                              const gl::ImageIndex &index,
>-                                              RenderTargetD3D **outRT)
>+angle::Result TextureD3D_2DArray::getRenderTarget(const gl::Context *context,
>+                                                  const gl::ImageIndex &index,
>+                                                  RenderTargetD3D **outRT)
> {
>     // ensure the underlying texture is created
>     ANGLE_TRY(ensureRenderTarget(context));
>-    ANGLE_TRY(updateStorageLevel(context, index.mipIndex));
>+    ANGLE_TRY(updateStorageLevel(context, index.getLevelIndex()));
>     return mTexStorage->getRenderTarget(context, index, outRT);
> }
> 
>-gl::Error TextureD3D_2DArray::initializeStorage(const gl::Context *context, bool renderTarget)
>+angle::Result TextureD3D_2DArray::initializeStorage(const gl::Context *context, bool renderTarget)
> {
>     // Only initialize the first time this texture is used as a render target or shader resource
>     if (mTexStorage)
>     {
>-        return gl::NoError();
>+        return angle::Result::Continue;
>     }
> 
>     // do not attempt to create storage for nonexistant data
>     if (!isLevelComplete(getBaseLevel()))
>     {
>-        return gl::NoError();
>+        return angle::Result::Continue;
>     }
> 
>     bool createRenderTarget = (renderTarget || IsRenderTargetUsage(mState.getUsage()));
>@@ -3265,11 +3482,11 @@ gl::Error TextureD3D_2DArray::initializeStorage(const gl::Context *context, bool
>     // flush image data to the storage
>     ANGLE_TRY(updateStorage(context));
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error TextureD3D_2DArray::createCompleteStorage(bool renderTarget,
>-                                                    TexStoragePointer *outStorage) const
>+angle::Result TextureD3D_2DArray::createCompleteStorage(bool renderTarget,
>+                                                        TexStoragePointer *outStorage) const
> {
>     GLsizei width         = getLevelZeroWidth();
>     GLsizei height        = getLevelZeroHeight();
>@@ -3285,27 +3502,27 @@ gl::Error TextureD3D_2DArray::createCompleteStorage(bool renderTarget,
>     outStorage->reset(mRenderer->createTextureStorage2DArray(internalFormat, renderTarget, width,
>                                                              height, depth, levels));
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error TextureD3D_2DArray::setCompleteTexStorage(const gl::Context *context,
>-                                                    TextureStorage *newCompleteTexStorage)
>+angle::Result TextureD3D_2DArray::setCompleteTexStorage(const gl::Context *context,
>+                                                        TextureStorage *newCompleteTexStorage)
> {
>     ANGLE_TRY(releaseTexStorage(context));
>-    mTexStorage = newCompleteTexStorage;
>+    mTexStorage  = newCompleteTexStorage;
>     mDirtyImages = true;
> 
>     // We do not support managed 2D array storage, as managed storage is ES2/D3D9 only
>     ASSERT(!mTexStorage->isManaged());
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error TextureD3D_2DArray::updateStorage(const gl::Context *context)
>+angle::Result TextureD3D_2DArray::updateStorage(const gl::Context *context)
> {
>     if (!mDirtyImages)
>     {
>-        return gl::NoError();
>+        return angle::Result::Continue;
>     }
> 
>     ASSERT(mTexStorage != nullptr);
>@@ -3319,7 +3536,7 @@ gl::Error TextureD3D_2DArray::updateStorage(const gl::Context *context)
>     }
> 
>     mDirtyImages = false;
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
> bool TextureD3D_2DArray::isValidLevel(int level) const
>@@ -3383,10 +3600,10 @@ bool TextureD3D_2DArray::isLevelComplete(int level) const
> 
> bool TextureD3D_2DArray::isImageComplete(const gl::ImageIndex &index) const
> {
>-    return isLevelComplete(index.mipIndex);
>+    return isLevelComplete(index.getLevelIndex());
> }
> 
>-gl::Error TextureD3D_2DArray::updateStorageLevel(const gl::Context *context, int level)
>+angle::Result TextureD3D_2DArray::updateStorageLevel(const gl::Context *context, int level)
> {
>     ASSERT(level >= 0 && level < static_cast<int>(ArraySize(mLayerCounts)));
>     ASSERT(isLevelComplete(level));
>@@ -3402,7 +3619,7 @@ gl::Error TextureD3D_2DArray::updateStorageLevel(const gl::Context *context, int
>         }
>     }
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
> void TextureD3D_2DArray::deleteImages()
>@@ -3419,16 +3636,18 @@ void TextureD3D_2DArray::deleteImages()
>     }
> }
> 
>-gl::Error TextureD3D_2DArray::redefineImage(const gl::Context *context,
>-                                            GLint level,
>-                                            GLenum internalformat,
>-                                            const gl::Extents &size,
>-                                            bool forceRelease)
>+angle::Result TextureD3D_2DArray::redefineImage(const gl::Context *context,
>+                                                GLint level,
>+                                                GLenum internalformat,
>+                                                const gl::Extents &size,
>+                                                bool forceRelease)
> {
>     // If there currently is a corresponding storage texture image, it has these parameters
>-    const int storageWidth  = std::max(1, getLevelZeroWidth() >> level);
>-    const int storageHeight = std::max(1, getLevelZeroHeight() >> level);
>-    const GLuint baseLevel  = getBaseLevel();
>+    const int storageWidth     = std::max(1, getLevelZeroWidth() >> level);
>+    const int storageHeight    = std::max(1, getLevelZeroHeight() >> level);
>+    const GLuint baseLevel     = getBaseLevel();
>+    const GLenum storageFormat = getBaseLevelInternalFormat();
>+
>     int storageDepth = 0;
>     if (baseLevel < gl::IMPLEMENTATION_MAX_TEXTURE_LEVELS)
>     {
>@@ -3447,7 +3666,7 @@ gl::Error TextureD3D_2DArray::redefineImage(const gl::Context *context,
> 
>         if (size.depth > 0)
>         {
>-            mImageArray[level] = new ImageD3D*[size.depth];
>+            mImageArray[level] = new ImageD3D *[size.depth];
>             for (int layer = 0; layer < mLayerCounts[level]; layer++)
>             {
>                 mImageArray[level][layer] = mRenderer->createImage();
>@@ -3459,7 +3678,7 @@ gl::Error TextureD3D_2DArray::redefineImage(const gl::Context *context,
>     {
>         for (int layer = 0; layer < mLayerCounts[level]; layer++)
>         {
>-            mImageArray[level][layer]->redefine(GL_TEXTURE_2D_ARRAY, internalformat,
>+            mImageArray[level][layer]->redefine(gl::TextureType::_2DArray, internalformat,
>                                                 gl::Extents(size.width, size.height, 1),
>                                                 forceRelease);
>             mDirtyImages = mDirtyImages || mImageArray[level][layer]->isDirty();
>@@ -3468,7 +3687,6 @@ gl::Error TextureD3D_2DArray::redefineImage(const gl::Context *context,
> 
>     if (mTexStorage)
>     {
>-        const GLenum storageFormat = getBaseLevelInternalFormat();
>         const int storageLevels = mTexStorage->getLevelCount();
> 
>         if ((level >= storageLevels && storageLevels != 0) || size.width != storageWidth ||
>@@ -3480,7 +3698,7 @@ gl::Error TextureD3D_2DArray::redefineImage(const gl::Context *context,
>         }
>     }
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
> gl::ImageIndexIterator TextureD3D_2DArray::imageIterator() const
>@@ -3496,19 +3714,20 @@ gl::ImageIndex TextureD3D_2DArray::getImageIndex(GLint mip, GLint layer) const
> bool TextureD3D_2DArray::isValidIndex(const gl::ImageIndex &index) const
> {
>     // Check for having a storage and the right type of index
>-    if (!mTexStorage || index.type != GL_TEXTURE_2D_ARRAY)
>+    if (!mTexStorage || index.getType() != gl::TextureType::_2DArray)
>     {
>         return false;
>     }
> 
>     // Check the mip index
>-    if (index.mipIndex < 0 || index.mipIndex >= mTexStorage->getLevelCount())
>+    if (index.getLevelIndex() < 0 || index.getLevelIndex() >= mTexStorage->getLevelCount())
>     {
>         return false;
>     }
> 
>     // Check the layer index
>-    return (!index.hasLayer() || (index.layerIndex >= 0 && index.layerIndex < mLayerCounts[index.mipIndex]));
>+    return (!index.hasLayer() || (index.getLayerIndex() >= 0 &&
>+                                  index.getLayerIndex() < mLayerCounts[index.getLevelIndex()]));
> }
> 
> void TextureD3D_2DArray::markAllImagesDirty()
>@@ -3523,118 +3742,118 @@ void TextureD3D_2DArray::markAllImagesDirty()
>     mDirtyImages = true;
> }
> 
>-TextureD3D_External::TextureD3D_External(const gl::TextureState &state, RendererD3D *renderer)
>+TextureD3DImmutableBase::TextureD3DImmutableBase(const gl::TextureState &state,
>+                                                 RendererD3D *renderer)
>     : TextureD3D(state, renderer)
>-{
>-}
>+{}
> 
>-TextureD3D_External::~TextureD3D_External()
>+TextureD3DImmutableBase::~TextureD3DImmutableBase() {}
>+
>+ImageD3D *TextureD3DImmutableBase::getImage(const gl::ImageIndex &index) const
> {
>+    return nullptr;
> }
> 
>-ImageD3D *TextureD3D_External::getImage(const gl::ImageIndex &index) const
>+angle::Result TextureD3DImmutableBase::setImage(const gl::Context *context,
>+                                                const gl::ImageIndex &index,
>+                                                GLenum internalFormat,
>+                                                const gl::Extents &size,
>+                                                GLenum format,
>+                                                GLenum type,
>+                                                const gl::PixelUnpackState &unpack,
>+                                                const uint8_t *pixels)
> {
>-    UNREACHABLE();
>-    return nullptr;
>+    ANGLE_HR_UNREACHABLE(GetImplAs<ContextD3D>(context));
>+    return angle::Result::Continue;
> }
> 
>-GLsizei TextureD3D_External::getLayerCount(int level) const
>+angle::Result TextureD3DImmutableBase::setSubImage(const gl::Context *context,
>+                                                   const gl::ImageIndex &index,
>+                                                   const gl::Box &area,
>+                                                   GLenum format,
>+                                                   GLenum type,
>+                                                   const gl::PixelUnpackState &unpack,
>+                                                   gl::Buffer *unpackBuffer,
>+                                                   const uint8_t *pixels)
> {
>-    return 1;
>+    ANGLE_HR_UNREACHABLE(GetImplAs<ContextD3D>(context));
>+    return angle::Result::Continue;
> }
> 
>-gl::Error TextureD3D_External::setImage(const gl::Context *context,
>-                                        GLenum target,
>-                                        size_t imageLevel,
>-                                        GLenum internalFormat,
>-                                        const gl::Extents &size,
>-                                        GLenum format,
>-                                        GLenum type,
>-                                        const gl::PixelUnpackState &unpack,
>-                                        const uint8_t *pixels)
>+angle::Result TextureD3DImmutableBase::setCompressedImage(const gl::Context *context,
>+                                                          const gl::ImageIndex &index,
>+                                                          GLenum internalFormat,
>+                                                          const gl::Extents &size,
>+                                                          const gl::PixelUnpackState &unpack,
>+                                                          size_t imageSize,
>+                                                          const uint8_t *pixels)
> {
>-    // Image setting is not supported for external images
>-    UNREACHABLE();
>-    return gl::InternalError();
>+    ANGLE_HR_UNREACHABLE(GetImplAs<ContextD3D>(context));
>+    return angle::Result::Continue;
> }
> 
>-gl::Error TextureD3D_External::setSubImage(const gl::Context *context,
>-                                           GLenum target,
>-                                           size_t imageLevel,
>-                                           const gl::Box &area,
>-                                           GLenum format,
>-                                           GLenum type,
>-                                           const gl::PixelUnpackState &unpack,
>-                                           const uint8_t *pixels)
>+angle::Result TextureD3DImmutableBase::setCompressedSubImage(const gl::Context *context,
>+                                                             const gl::ImageIndex &index,
>+                                                             const gl::Box &area,
>+                                                             GLenum format,
>+                                                             const gl::PixelUnpackState &unpack,
>+                                                             size_t imageSize,
>+                                                             const uint8_t *pixels)
> {
>-    UNREACHABLE();
>-    return gl::InternalError();
>+    ANGLE_HR_UNREACHABLE(GetImplAs<ContextD3D>(context));
>+    return angle::Result::Continue;
> }
> 
>-gl::Error TextureD3D_External::setCompressedImage(const gl::Context *context,
>-                                                  GLenum target,
>-                                                  size_t imageLevel,
>-                                                  GLenum internalFormat,
>-                                                  const gl::Extents &size,
>-                                                  const gl::PixelUnpackState &unpack,
>-                                                  size_t imageSize,
>-                                                  const uint8_t *pixels)
>+angle::Result TextureD3DImmutableBase::copyImage(const gl::Context *context,
>+                                                 const gl::ImageIndex &index,
>+                                                 const gl::Rectangle &sourceArea,
>+                                                 GLenum internalFormat,
>+                                                 gl::Framebuffer *source)
> {
>-    UNREACHABLE();
>-    return gl::InternalError();
>+    ANGLE_HR_UNREACHABLE(GetImplAs<ContextD3D>(context));
>+    return angle::Result::Continue;
> }
> 
>-gl::Error TextureD3D_External::setCompressedSubImage(const gl::Context *context,
>-                                                     GLenum target,
>-                                                     size_t level,
>-                                                     const gl::Box &area,
>-                                                     GLenum format,
>-                                                     const gl::PixelUnpackState &unpack,
>-                                                     size_t imageSize,
>-                                                     const uint8_t *pixels)
>+angle::Result TextureD3DImmutableBase::copySubImage(const gl::Context *context,
>+                                                    const gl::ImageIndex &index,
>+                                                    const gl::Offset &destOffset,
>+                                                    const gl::Rectangle &sourceArea,
>+                                                    gl::Framebuffer *source)
> {
>-    UNREACHABLE();
>-    return gl::InternalError();
>+    ANGLE_HR_UNREACHABLE(GetImplAs<ContextD3D>(context));
>+    return angle::Result::Continue;
> }
> 
>-gl::Error TextureD3D_External::copyImage(const gl::Context *context,
>-                                         GLenum target,
>-                                         size_t imageLevel,
>-                                         const gl::Rectangle &sourceArea,
>-                                         GLenum internalFormat,
>-                                         const gl::Framebuffer *source)
>+angle::Result TextureD3DImmutableBase::bindTexImage(const gl::Context *context,
>+                                                    egl::Surface *surface)
> {
>-    UNREACHABLE();
>-    return gl::InternalError();
>+    ANGLE_HR_UNREACHABLE(GetImplAs<ContextD3D>(context));
>+    return angle::Result::Continue;
> }
> 
>-gl::Error TextureD3D_External::copySubImage(const gl::Context *context,
>-                                            GLenum target,
>-                                            size_t imageLevel,
>-                                            const gl::Offset &destOffset,
>-                                            const gl::Rectangle &sourceArea,
>-                                            const gl::Framebuffer *source)
>+angle::Result TextureD3DImmutableBase::releaseTexImage(const gl::Context *context)
> {
>-    UNREACHABLE();
>-    return gl::InternalError();
>+    ANGLE_HR_UNREACHABLE(GetImplAs<ContextD3D>(context));
>+    return angle::Result::Continue;
> }
> 
>-gl::Error TextureD3D_External::setStorage(const gl::Context *context,
>-                                          GLenum target,
>-                                          size_t levels,
>-                                          GLenum internalFormat,
>-                                          const gl::Extents &size)
>+TextureD3D_External::TextureD3D_External(const gl::TextureState &state, RendererD3D *renderer)
>+    : TextureD3DImmutableBase(state, renderer)
>+{}
>+
>+TextureD3D_External::~TextureD3D_External() {}
>+
>+GLsizei TextureD3D_External::getLayerCount(int level) const
> {
>-    UNREACHABLE();
>-    return gl::InternalError();
>+    return 1;
> }
> 
>-gl::Error TextureD3D_External::setImageExternal(const gl::Context *context,
>-                                                GLenum target,
>-                                                egl::Stream *stream,
>-                                                const egl::Stream::GLTextureDescription &desc)
>+angle::Result TextureD3D_External::setImageExternal(const gl::Context *context,
>+                                                    gl::TextureType type,
>+                                                    egl::Stream *stream,
>+                                                    const egl::Stream::GLTextureDescription &desc)
> {
>-    ASSERT(target == GL_TEXTURE_EXTERNAL_OES);
>+    ASSERT(type == gl::TextureType::External);
> 
>     ANGLE_TRY(releaseTexStorage(context));
> 
>@@ -3644,24 +3863,12 @@ gl::Error TextureD3D_External::setImageExternal(const gl::Context *context,
>         mTexStorage = mRenderer->createTextureStorageExternal(stream, desc);
>     }
> 
>-    return gl::NoError();
>-}
>-
>-gl::Error TextureD3D_External::bindTexImage(const gl::Context *context, egl::Surface *surface)
>-{
>-    UNREACHABLE();
>-    return gl::InternalError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error TextureD3D_External::releaseTexImage(const gl::Context *context)
>-{
>-    UNREACHABLE();
>-    return gl::InternalError();
>-}
>-
>-gl::Error TextureD3D_External::setEGLImageTarget(const gl::Context *context,
>-                                                 GLenum target,
>-                                                 egl::Image *image)
>+angle::Result TextureD3D_External::setEGLImageTarget(const gl::Context *context,
>+                                                     gl::TextureType type,
>+                                                     egl::Image *image)
> {
>     EGLImageD3D *eglImaged3d = GetImplAs<EGLImageD3D>(image);
> 
>@@ -3672,55 +3879,55 @@ gl::Error TextureD3D_External::setEGLImageTarget(const gl::Context *context,
>     ANGLE_TRY(releaseTexStorage(context));
>     mTexStorage = mRenderer->createTextureStorageEGLImage(eglImaged3d, renderTargetD3D);
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error TextureD3D_External::initMipmapImages(const gl::Context *context)
>+angle::Result TextureD3D_External::initMipmapImages(const gl::Context *context)
> {
>-    UNREACHABLE();
>-    return gl::InternalError();
>+    ANGLE_HR_UNREACHABLE(GetImplAs<ContextD3D>(context));
>+    return angle::Result::Stop;
> }
> 
>-gl::Error TextureD3D_External::getRenderTarget(const gl::Context *context,
>-                                               const gl::ImageIndex &index,
>-                                               RenderTargetD3D **outRT)
>+angle::Result TextureD3D_External::getRenderTarget(const gl::Context *context,
>+                                                   const gl::ImageIndex &index,
>+                                                   RenderTargetD3D **outRT)
> {
>     UNREACHABLE();
>-    return gl::InternalError();
>+    return angle::Result::Stop;
> }
> 
> bool TextureD3D_External::isImageComplete(const gl::ImageIndex &index) const
> {
>-    return (index.mipIndex == 0) ? (mTexStorage != nullptr) : false;
>+    return (index.getLevelIndex() == 0) ? (mTexStorage != nullptr) : false;
> }
> 
>-gl::Error TextureD3D_External::initializeStorage(const gl::Context *context, bool renderTarget)
>+angle::Result TextureD3D_External::initializeStorage(const gl::Context *context, bool renderTarget)
> {
>     // Texture storage is created when an external image is bound
>     ASSERT(mTexStorage);
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error TextureD3D_External::createCompleteStorage(bool renderTarget,
>-                                                     TexStoragePointer *outStorage) const
>+angle::Result TextureD3D_External::createCompleteStorage(bool renderTarget,
>+                                                         TexStoragePointer *outStorage) const
> {
>     UNREACHABLE();
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error TextureD3D_External::setCompleteTexStorage(const gl::Context *context,
>-                                                     TextureStorage *newCompleteTexStorage)
>+angle::Result TextureD3D_External::setCompleteTexStorage(const gl::Context *context,
>+                                                         TextureStorage *newCompleteTexStorage)
> {
>     UNREACHABLE();
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error TextureD3D_External::updateStorage(const gl::Context *context)
>+angle::Result TextureD3D_External::updateStorage(const gl::Context *context)
> {
>     // Texture storage does not need to be updated since it is already loaded with the latest
>     // external image
>     ASSERT(mTexStorage);
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
> gl::ImageIndexIterator TextureD3D_External::imageIterator() const
>@@ -3736,7 +3943,8 @@ gl::ImageIndex TextureD3D_External::getImageIndex(GLint mip, GLint /*layer*/) co
> 
> bool TextureD3D_External::isValidIndex(const gl::ImageIndex &index) const
> {
>-    return (mTexStorage && index.type == GL_TEXTURE_EXTERNAL_OES && index.mipIndex == 0);
>+    return (mTexStorage && index.getType() == gl::TextureType::External &&
>+            index.getLevelIndex() == 0);
> }
> 
> void TextureD3D_External::markAllImagesDirty()
>@@ -3746,227 +3954,232 @@ void TextureD3D_External::markAllImagesDirty()
> 
> TextureD3D_2DMultisample::TextureD3D_2DMultisample(const gl::TextureState &state,
>                                                    RendererD3D *renderer)
>-    : TextureD3D(state, renderer)
>+    : TextureD3DImmutableBase(state, renderer)
>+{}
>+
>+TextureD3D_2DMultisample::~TextureD3D_2DMultisample() {}
>+
>+angle::Result TextureD3D_2DMultisample::setStorageMultisample(const gl::Context *context,
>+                                                              gl::TextureType type,
>+                                                              GLsizei samples,
>+                                                              GLint internalformat,
>+                                                              const gl::Extents &size,
>+                                                              bool fixedSampleLocations)
> {
>+    ASSERT(type == gl::TextureType::_2DMultisample && size.depth == 1);
>+
>+    // We allocate storage immediately instead of doing it lazily like other TextureD3D classes do.
>+    // This requires less state in this class.
>+    TexStoragePointer storage(context);
>+    storage.reset(mRenderer->createTextureStorage2DMultisample(internalformat, size.width,
>+                                                               size.height, static_cast<int>(0),
>+                                                               samples, fixedSampleLocations));
>+
>+    ANGLE_TRY(setCompleteTexStorage(context, storage.get()));
>+    storage.release();
>+
>+    mImmutable = true;
>+
>+    return angle::Result::Continue;
> }
> 
>-TextureD3D_2DMultisample::~TextureD3D_2DMultisample()
>+angle::Result TextureD3D_2DMultisample::setEGLImageTarget(const gl::Context *context,
>+                                                          gl::TextureType type,
>+                                                          egl::Image *image)
> {
>+    ANGLE_HR_UNREACHABLE(GetImplAs<ContextD3D>(context));
>+    return angle::Result::Continue;
> }
> 
>-ImageD3D *TextureD3D_2DMultisample::getImage(const gl::ImageIndex &index) const
>+angle::Result TextureD3D_2DMultisample::getRenderTarget(const gl::Context *context,
>+                                                        const gl::ImageIndex &index,
>+                                                        RenderTargetD3D **outRT)
> {
>-    return nullptr;
>+    ASSERT(!index.hasLayer());
>+
>+    // ensure the underlying texture is created
>+    ANGLE_TRY(ensureRenderTarget(context));
>+
>+    return mTexStorage->getRenderTarget(context, index, outRT);
> }
> 
>-gl::Error TextureD3D_2DMultisample::setImage(const gl::Context *context,
>-                                             GLenum target,
>-                                             size_t level,
>-                                             GLenum internalFormat,
>-                                             const gl::Extents &size,
>-                                             GLenum format,
>-                                             GLenum type,
>-                                             const gl::PixelUnpackState &unpack,
>-                                             const uint8_t *pixels)
>+gl::ImageIndexIterator TextureD3D_2DMultisample::imageIterator() const
> {
>-    UNREACHABLE();
>-    return gl::InternalError();
>+    return gl::ImageIndexIterator::Make2DMultisample();
> }
> 
>-gl::Error TextureD3D_2DMultisample::setSubImage(const gl::Context *context,
>-                                                GLenum target,
>-                                                size_t level,
>-                                                const gl::Box &area,
>-                                                GLenum format,
>-                                                GLenum type,
>-                                                const gl::PixelUnpackState &unpack,
>-                                                const uint8_t *pixels)
>+gl::ImageIndex TextureD3D_2DMultisample::getImageIndex(GLint mip, GLint layer) const
> {
>-    UNREACHABLE();
>-    return gl::InternalError();
>+    return gl::ImageIndex::Make2DMultisample();
> }
> 
>-gl::Error TextureD3D_2DMultisample::setCompressedImage(const gl::Context *context,
>-                                                       GLenum target,
>-                                                       size_t level,
>-                                                       GLenum internalFormat,
>-                                                       const gl::Extents &size,
>-                                                       const gl::PixelUnpackState &unpack,
>-                                                       size_t imageSize,
>-                                                       const uint8_t *pixels)
>+bool TextureD3D_2DMultisample::isValidIndex(const gl::ImageIndex &index) const
> {
>-    UNREACHABLE();
>-    return gl::InternalError();
>+    return (mTexStorage && index.getType() == gl::TextureType::_2DMultisample &&
>+            index.getLevelIndex() == 0);
> }
> 
>-gl::Error TextureD3D_2DMultisample::setCompressedSubImage(const gl::Context *context,
>-                                                          GLenum target,
>-                                                          size_t level,
>-                                                          const gl::Box &area,
>-                                                          GLenum format,
>-                                                          const gl::PixelUnpackState &unpack,
>-                                                          size_t imageSize,
>-                                                          const uint8_t *pixels)
>+GLsizei TextureD3D_2DMultisample::getLayerCount(int level) const
> {
>-    UNREACHABLE();
>-    return gl::InternalError();
>+    return 1;
> }
> 
>-gl::Error TextureD3D_2DMultisample::copyImage(const gl::Context *context,
>-                                              GLenum target,
>-                                              size_t level,
>-                                              const gl::Rectangle &sourceArea,
>-                                              GLenum internalFormat,
>-                                              const gl::Framebuffer *source)
>+void TextureD3D_2DMultisample::markAllImagesDirty() {}
>+
>+angle::Result TextureD3D_2DMultisample::initializeStorage(const gl::Context *context,
>+                                                          bool renderTarget)
> {
>-    UNREACHABLE();
>-    return gl::InternalError();
>+    // initializeStorage should only be called in a situation where the texture already has storage
>+    // associated with it (storage is created in setStorageMultisample).
>+    ASSERT(mTexStorage);
>+    return angle::Result::Continue;
> }
> 
>-gl::Error TextureD3D_2DMultisample::copySubImage(const gl::Context *context,
>-                                                 GLenum target,
>-                                                 size_t level,
>-                                                 const gl::Offset &destOffset,
>-                                                 const gl::Rectangle &sourceArea,
>-                                                 const gl::Framebuffer *source)
>+angle::Result TextureD3D_2DMultisample::createCompleteStorage(bool renderTarget,
>+                                                              TexStoragePointer *outStorage) const
> {
>     UNREACHABLE();
>-    return gl::InternalError();
>+    outStorage->reset(mTexStorage);
>+    return angle::Result::Continue;
> }
> 
>-gl::Error TextureD3D_2DMultisample::setStorageMultisample(const gl::Context *context,
>-                                                          GLenum target,
>-                                                          GLsizei samples,
>-                                                          GLint internalFormat,
>-                                                          const gl::Extents &size,
>-                                                          bool fixedSampleLocations)
>+angle::Result TextureD3D_2DMultisample::setCompleteTexStorage(const gl::Context *context,
>+                                                              TextureStorage *newCompleteTexStorage)
> {
>-    ASSERT(target == GL_TEXTURE_2D_MULTISAMPLE && size.depth == 1);
>-
>-    TexStoragePointer storage(context);
>-    storage.reset(mRenderer->createTextureStorage2DMultisample(internalFormat, size.width,
>-                                                               size.height, static_cast<int>(0),
>-                                                               samples, fixedSampleLocations));
>-
>-    ANGLE_TRY(setCompleteTexStorage(context, storage.get()));
>-    storage.release();
>-
>-    ANGLE_TRY(updateStorage(context));
>-
>-    mImmutable = false;
>-
>-    return gl::NoError();
>+    // These textures are immutable, so this should only be ever called once.
>+    ASSERT(!mTexStorage);
>+    mTexStorage = newCompleteTexStorage;
>+    return angle::Result::Continue;
> }
> 
>-gl::Error TextureD3D_2DMultisample::bindTexImage(const gl::Context *context, egl::Surface *surface)
>+angle::Result TextureD3D_2DMultisample::updateStorage(const gl::Context *context)
> {
>-    UNREACHABLE();
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error TextureD3D_2DMultisample::releaseTexImage(const gl::Context *context)
>+angle::Result TextureD3D_2DMultisample::initMipmapImages(const gl::Context *context)
> {
>     UNREACHABLE();
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error TextureD3D_2DMultisample::setEGLImageTarget(const gl::Context *context,
>-                                                      GLenum target,
>-                                                      egl::Image *image)
>+bool TextureD3D_2DMultisample::isImageComplete(const gl::ImageIndex &index) const
> {
>-    UNREACHABLE();
>-    return gl::InternalError();
>+    return true;
> }
> 
>-gl::Error TextureD3D_2DMultisample::getRenderTarget(const gl::Context *context,
>-                                                    const gl::ImageIndex &index,
>-                                                    RenderTargetD3D **outRT)
>+TextureD3D_2DMultisampleArray::TextureD3D_2DMultisampleArray(const gl::TextureState &state,
>+                                                             RendererD3D *renderer)
>+    : TextureD3DImmutableBase(state, renderer)
>+{}
>+
>+TextureD3D_2DMultisampleArray::~TextureD3D_2DMultisampleArray() {}
>+
>+angle::Result TextureD3D_2DMultisampleArray::setStorageMultisample(const gl::Context *context,
>+                                                                   gl::TextureType type,
>+                                                                   GLsizei samples,
>+                                                                   GLint internalformat,
>+                                                                   const gl::Extents &size,
>+                                                                   bool fixedSampleLocations)
> {
>-    ASSERT(!index.hasLayer());
>+    ASSERT(type == gl::TextureType::_2DMultisampleArray);
> 
>-    // ensure the underlying texture is created
>-    ANGLE_TRY(ensureRenderTarget(context));
>+    mLayerCount = size.depth;
> 
>-    return mTexStorage->getRenderTarget(context, index, outRT);
>+    TexStoragePointer storage(context);
>+    storage.reset(mRenderer->createTextureStorage2DMultisampleArray(
>+        internalformat, size.width, size.height, size.depth, static_cast<int>(0), samples,
>+        fixedSampleLocations));
>+
>+    ANGLE_TRY(setCompleteTexStorage(context, storage.get()));
>+    storage.release();
>+
>+    mImmutable = true;
>+
>+    return angle::Result::Continue;
> }
> 
>-gl::ImageIndexIterator TextureD3D_2DMultisample::imageIterator() const
>+angle::Result TextureD3D_2DMultisampleArray::setEGLImageTarget(const gl::Context *context,
>+                                                               gl::TextureType type,
>+                                                               egl::Image *image)
> {
>-    return gl::ImageIndexIterator::Make2DMultisample();
>+    ANGLE_HR_UNREACHABLE(GetImplAs<ContextD3D>(context));
>+    return angle::Result::Continue;
> }
> 
>-gl::ImageIndex TextureD3D_2DMultisample::getImageIndex(GLint mip, GLint layer) const
>+angle::Result TextureD3D_2DMultisampleArray::getRenderTarget(const gl::Context *context,
>+                                                             const gl::ImageIndex &index,
>+                                                             RenderTargetD3D **outRT)
> {
>-    return gl::ImageIndex::Make2DMultisample();
>+    // ensure the underlying texture is created
>+    ANGLE_TRY(ensureRenderTarget(context));
>+
>+    return mTexStorage->getRenderTarget(context, index, outRT);
> }
> 
>-bool TextureD3D_2DMultisample::isValidIndex(const gl::ImageIndex &index) const
>+gl::ImageIndexIterator TextureD3D_2DMultisampleArray::imageIterator() const
> {
>-    return (mTexStorage && index.type == GL_TEXTURE_2D_MULTISAMPLE && index.mipIndex == 0);
>+    return gl::ImageIndexIterator::Make2DMultisampleArray(&mLayerCount);
> }
> 
>-GLsizei TextureD3D_2DMultisample::getLayerCount(int level) const
>+gl::ImageIndex TextureD3D_2DMultisampleArray::getImageIndex(GLint mip, GLint layer) const
> {
>-    return 1;
>+    return gl::ImageIndex::Make2DMultisampleArray(layer);
> }
> 
>-void TextureD3D_2DMultisample::markAllImagesDirty()
>+bool TextureD3D_2DMultisampleArray::isValidIndex(const gl::ImageIndex &index) const
> {
>+    return (mTexStorage && index.getType() == gl::TextureType::_2DMultisampleArray &&
>+            index.getLevelIndex() == 0);
> }
> 
>-gl::Error TextureD3D_2DMultisample::initializeStorage(const gl::Context *context, bool renderTarget)
>+GLsizei TextureD3D_2DMultisampleArray::getLayerCount(int level) const
> {
>-    // Only initialize the first time this texture is used as a render target or shader resource
>-    if (mTexStorage)
>-    {
>-        return gl::NoError();
>-    }
>-
>-    bool createRenderTarget = (renderTarget || IsRenderTargetUsage(mState.getUsage()));
>-
>-    TexStoragePointer storage(context);
>-    ANGLE_TRY(createCompleteStorage(createRenderTarget, &storage));
>+    return mLayerCount;
>+}
> 
>-    ANGLE_TRY(setCompleteTexStorage(context, storage.get()));
>-    storage.release();
>+void TextureD3D_2DMultisampleArray::markAllImagesDirty() {}
> 
>+angle::Result TextureD3D_2DMultisampleArray::initializeStorage(const gl::Context *context,
>+                                                               bool renderTarget)
>+{
>+    // initializeStorage should only be called in a situation where the texture already has storage
>+    // associated with it (storage is created in setStorageMultisample).
>     ASSERT(mTexStorage);
>-
>-    // flush image data to the storage
>-    ANGLE_TRY(updateStorage(context));
>-
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error TextureD3D_2DMultisample::createCompleteStorage(bool renderTarget,
>-                                                          TexStoragePointer *outStorage) const
>+angle::Result TextureD3D_2DMultisampleArray::createCompleteStorage(
>+    bool renderTarget,
>+    TexStoragePointer *outStorage) const
> {
>+    UNREACHABLE();
>     outStorage->reset(mTexStorage);
>-
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error TextureD3D_2DMultisample::setCompleteTexStorage(const gl::Context *context,
>-                                                          TextureStorage *newCompleteTexStorage)
>+angle::Result TextureD3D_2DMultisampleArray::setCompleteTexStorage(
>+    const gl::Context *context,
>+    TextureStorage *newCompleteTexStorage)
> {
>-    ANGLE_TRY(releaseTexStorage(context));
>+    // These textures are immutable, so this should only be ever called once.
>+    ASSERT(!mTexStorage);
>     mTexStorage = newCompleteTexStorage;
>-
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error TextureD3D_2DMultisample::updateStorage(const gl::Context *context)
>+angle::Result TextureD3D_2DMultisampleArray::updateStorage(const gl::Context *context)
> {
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error TextureD3D_2DMultisample::initMipmapImages(const gl::Context *context)
>+angle::Result TextureD3D_2DMultisampleArray::initMipmapImages(const gl::Context *context)
> {
>     UNIMPLEMENTED();
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-bool TextureD3D_2DMultisample::isImageComplete(const gl::ImageIndex &index) const
>+bool TextureD3D_2DMultisampleArray::isImageComplete(const gl::ImageIndex &index) const
> {
>     return true;
> }
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/TextureD3D.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/TextureD3D.h
>index eb206a6ccc1..3c8a327e82f 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/TextureD3D.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/TextureD3D.h
>@@ -29,51 +29,56 @@ class RendererD3D;
> class RenderTargetD3D;
> class TextureStorage;
> 
>-template <typename T>
>-using TexLevelsArray = std::array<T, gl::IMPLEMENTATION_MAX_TEXTURE_LEVELS>;
>-
> class TextureD3D : public TextureImpl
> {
>   public:
>     TextureD3D(const gl::TextureState &data, RendererD3D *renderer);
>     ~TextureD3D() override;
> 
>-    gl::Error onDestroy(const gl::Context *context) override;
>+    void onDestroy(const gl::Context *context) override;
> 
>-    gl::Error getNativeTexture(const gl::Context *context, TextureStorage **outStorage);
>+    angle::Result getNativeTexture(const gl::Context *context, TextureStorage **outStorage);
> 
>     bool hasDirtyImages() const { return mDirtyImages; }
>     void resetDirty() { mDirtyImages = false; }
> 
>     virtual ImageD3D *getImage(const gl::ImageIndex &index) const = 0;
>-    virtual GLsizei getLayerCount(int level) const = 0;
>+    virtual GLsizei getLayerCount(int level) const                = 0;
> 
>-    gl::Error getImageAndSyncFromStorage(const gl::Context *context,
>-                                         const gl::ImageIndex &index,
>-                                         ImageD3D **outImage);
>+    angle::Result getImageAndSyncFromStorage(const gl::Context *context,
>+                                             const gl::ImageIndex &index,
>+                                             ImageD3D **outImage);
> 
>     GLint getBaseLevelWidth() const;
>     GLint getBaseLevelHeight() const;
>     GLenum getBaseLevelInternalFormat() const;
> 
>-    gl::Error setStorage(const gl::Context *context,
>-                         GLenum target,
>-                         size_t levels,
>-                         GLenum internalFormat,
>-                         const gl::Extents &size) override;
>-
>-    gl::Error setStorageMultisample(const gl::Context *context,
>-                                    GLenum target,
>-                                    GLsizei samples,
>-                                    GLint internalFormat,
>-                                    const gl::Extents &size,
>-                                    bool fixedSampleLocations) override;
>+    angle::Result setStorage(const gl::Context *context,
>+                             gl::TextureType type,
>+                             size_t levels,
>+                             GLenum internalFormat,
>+                             const gl::Extents &size) override;
>+
>+    angle::Result setStorageMultisample(const gl::Context *context,
>+                                        gl::TextureType type,
>+                                        GLsizei samples,
>+                                        GLint internalformat,
>+                                        const gl::Extents &size,
>+                                        bool fixedSampleLocations) override;
>+
>+    angle::Result setStorageExternalMemory(const gl::Context *context,
>+                                           gl::TextureType type,
>+                                           size_t levels,
>+                                           GLenum internalFormat,
>+                                           const gl::Extents &size,
>+                                           gl::MemoryObject *memoryObject,
>+                                           GLuint64 offset) override;
> 
>     bool isImmutable() const { return mImmutable; }
> 
>-    virtual gl::Error getRenderTarget(const gl::Context *context,
>-                                      const gl::ImageIndex &index,
>-                                      RenderTargetD3D **outRT) = 0;
>+    virtual angle::Result getRenderTarget(const gl::Context *context,
>+                                          const gl::ImageIndex &index,
>+                                          RenderTargetD3D **outRT) = 0;
> 
>     // Returns an iterator over all "Images" for this particular Texture.
>     virtual gl::ImageIndexIterator imageIterator() const = 0;
>@@ -81,87 +86,89 @@ class TextureD3D : public TextureImpl
>     // Returns an ImageIndex for a particular "Image". 3D Textures do not have images for
>     // slices of their depth texures, so 3D textures ignore the layer parameter.
>     virtual gl::ImageIndex getImageIndex(GLint mip, GLint layer) const = 0;
>-    virtual bool isValidIndex(const gl::ImageIndex &index) const = 0;
>+    virtual bool isValidIndex(const gl::ImageIndex &index) const       = 0;
> 
>-    gl::Error setImageExternal(const gl::Context *context,
>-                               GLenum target,
>-                               egl::Stream *stream,
>-                               const egl::Stream::GLTextureDescription &desc) override;
>-    gl::Error generateMipmap(const gl::Context *context) override;
>+    angle::Result setImageExternal(const gl::Context *context,
>+                                   gl::TextureType type,
>+                                   egl::Stream *stream,
>+                                   const egl::Stream::GLTextureDescription &desc) override;
>+    angle::Result generateMipmap(const gl::Context *context) override;
>     TextureStorage *getStorage();
>     ImageD3D *getBaseLevelImage() const;
> 
>-    gl::Error getAttachmentRenderTarget(const gl::Context *context,
>-                                        GLenum binding,
>-                                        const gl::ImageIndex &imageIndex,
>-                                        FramebufferAttachmentRenderTarget **rtOut) override;
>+    angle::Result getAttachmentRenderTarget(const gl::Context *context,
>+                                            GLenum binding,
>+                                            const gl::ImageIndex &imageIndex,
>+                                            FramebufferAttachmentRenderTarget **rtOut) override;
> 
>-    gl::Error setBaseLevel(const gl::Context *context, GLuint baseLevel) override;
>+    angle::Result setBaseLevel(const gl::Context *context, GLuint baseLevel) override;
> 
>-    void syncState(const gl::Texture::DirtyBits &dirtyBits) override;
>+    angle::Result syncState(const gl::Context *context,
>+                            const gl::Texture::DirtyBits &dirtyBits) override;
> 
>-    gl::Error initializeContents(const gl::Context *context,
>-                                 const gl::ImageIndex &imageIndex) override;
>+    angle::Result initializeContents(const gl::Context *context,
>+                                     const gl::ImageIndex &imageIndex) override;
> 
>   protected:
>-    gl::Error setImageImpl(const gl::Context *context,
>+    angle::Result setImageImpl(const gl::Context *context,
>+                               const gl::ImageIndex &index,
>+                               GLenum type,
>+                               const gl::PixelUnpackState &unpack,
>+                               const uint8_t *pixels,
>+                               ptrdiff_t layerOffset);
>+    angle::Result subImage(const gl::Context *context,
>                            const gl::ImageIndex &index,
>+                           const gl::Box &area,
>+                           GLenum format,
>                            GLenum type,
>                            const gl::PixelUnpackState &unpack,
>+                           gl::Buffer *unpackBuffer,
>                            const uint8_t *pixels,
>                            ptrdiff_t layerOffset);
>-    gl::Error subImage(const gl::Context *context,
>-                       const gl::ImageIndex &index,
>-                       const gl::Box &area,
>-                       GLenum format,
>-                       GLenum type,
>-                       const gl::PixelUnpackState &unpack,
>-                       const uint8_t *pixels,
>-                       ptrdiff_t layerOffset);
>-    gl::Error setCompressedImageImpl(const gl::Context *context,
>+    angle::Result setCompressedImageImpl(const gl::Context *context,
>+                                         const gl::ImageIndex &index,
>+                                         const gl::PixelUnpackState &unpack,
>+                                         const uint8_t *pixels,
>+                                         ptrdiff_t layerOffset);
>+    angle::Result subImageCompressed(const gl::Context *context,
>                                      const gl::ImageIndex &index,
>+                                     const gl::Box &area,
>+                                     GLenum format,
>                                      const gl::PixelUnpackState &unpack,
>                                      const uint8_t *pixels,
>                                      ptrdiff_t layerOffset);
>-    gl::Error subImageCompressed(const gl::Context *context,
>-                                 const gl::ImageIndex &index,
>-                                 const gl::Box &area,
>-                                 GLenum format,
>-                                 const gl::PixelUnpackState &unpack,
>-                                 const uint8_t *pixels,
>-                                 ptrdiff_t layerOffset);
>     bool isFastUnpackable(const gl::Buffer *unpackBuffer, GLenum sizedInternalFormat);
>-    gl::Error fastUnpackPixels(const gl::Context *context,
>-                               const gl::PixelUnpackState &unpack,
>-                               const uint8_t *pixels,
>-                               const gl::Box &destArea,
>-                               GLenum sizedInternalFormat,
>-                               GLenum type,
>-                               RenderTargetD3D *destRenderTarget);
>+    angle::Result fastUnpackPixels(const gl::Context *context,
>+                                   const gl::PixelUnpackState &unpack,
>+                                   const uint8_t *pixels,
>+                                   const gl::Box &destArea,
>+                                   GLenum sizedInternalFormat,
>+                                   GLenum type,
>+                                   RenderTargetD3D *destRenderTarget);
> 
>     GLint getLevelZeroWidth() const;
>     GLint getLevelZeroHeight() const;
>     virtual GLint getLevelZeroDepth() const;
> 
>     GLint creationLevels(GLsizei width, GLsizei height, GLsizei depth) const;
>-    virtual gl::Error initMipmapImages(const gl::Context *context) = 0;
>+    virtual angle::Result initMipmapImages(const gl::Context *context) = 0;
>     bool isBaseImageZeroSize() const;
>     virtual bool isImageComplete(const gl::ImageIndex &index) const = 0;
> 
>     bool canCreateRenderTargetForImage(const gl::ImageIndex &index) const;
>-    gl::Error ensureRenderTarget(const gl::Context *context);
>+    angle::Result ensureRenderTarget(const gl::Context *context);
> 
>-    virtual gl::Error createCompleteStorage(bool renderTarget,
>-                                            TexStoragePointer *outTexStorage) const = 0;
>-    virtual gl::Error setCompleteTexStorage(const gl::Context *context,
>-                                            TextureStorage *newCompleteTexStorage) = 0;
>-    gl::Error commitRegion(const gl::Context *context,
>-                           const gl::ImageIndex &index,
>-                           const gl::Box &region);
>+    virtual angle::Result createCompleteStorage(bool renderTarget,
>+                                                TexStoragePointer *outTexStorage) const = 0;
>+    virtual angle::Result setCompleteTexStorage(const gl::Context *context,
>+                                                TextureStorage *newCompleteTexStorage)  = 0;
>+    angle::Result commitRegion(const gl::Context *context,
>+                               const gl::ImageIndex &index,
>+                               const gl::Box &region);
> 
>-    gl::Error releaseTexStorage(const gl::Context *context);
>+    angle::Result releaseTexStorage(const gl::Context *context);
> 
>-    GLuint getBaseLevel() const { return mBaseLevel; };
>+    GLuint getBaseLevel() const { return mBaseLevel; }
> 
>     virtual void markAllImagesDirty() = 0;
> 
>@@ -175,13 +182,13 @@ class TextureD3D : public TextureImpl
>     TextureStorage *mTexStorage;
> 
>   private:
>-    virtual gl::Error initializeStorage(const gl::Context *context, bool renderTarget) = 0;
>+    virtual angle::Result initializeStorage(const gl::Context *context, bool renderTarget) = 0;
> 
>-    virtual gl::Error updateStorage(const gl::Context *context) = 0;
>+    virtual angle::Result updateStorage(const gl::Context *context) = 0;
> 
>     bool shouldUseSetData(const ImageD3D *image) const;
> 
>-    gl::Error generateMipmapUsingImages(const gl::Context *context, const GLuint maxLevel);
>+    angle::Result generateMipmapUsingImages(const gl::Context *context, const GLuint maxLevel);
> 
>     GLuint mBaseLevel;
> };
>@@ -192,7 +199,7 @@ class TextureD3D_2D : public TextureD3D
>     TextureD3D_2D(const gl::TextureState &data, RendererD3D *renderer);
>     ~TextureD3D_2D() override;
> 
>-    gl::Error onDestroy(const gl::Context *context) override;
>+    void onDestroy(const gl::Context *context) override;
> 
>     ImageD3D *getImage(int level, int layer) const;
>     ImageD3D *getImage(const gl::ImageIndex &index) const override;
>@@ -204,92 +211,86 @@ class TextureD3D_2D : public TextureD3D
>     bool isDepth(GLint level) const;
>     bool isSRGB(GLint level) const;
> 
>-    gl::Error setImage(const gl::Context *context,
>-                       GLenum target,
>-                       size_t level,
>-                       GLenum internalFormat,
>-                       const gl::Extents &size,
>-                       GLenum format,
>-                       GLenum type,
>-                       const gl::PixelUnpackState &unpack,
>-                       const uint8_t *pixels) override;
>-    gl::Error setSubImage(const gl::Context *context,
>-                          GLenum target,
>-                          size_t level,
>-                          const gl::Box &area,
>-                          GLenum format,
>-                          GLenum type,
>-                          const gl::PixelUnpackState &unpack,
>-                          const uint8_t *pixels) override;
>-
>-    gl::Error setCompressedImage(const gl::Context *context,
>-                                 GLenum target,
>-                                 size_t level,
>-                                 GLenum internalFormat,
>-                                 const gl::Extents &size,
>-                                 const gl::PixelUnpackState &unpack,
>-                                 size_t imageSize,
>-                                 const uint8_t *pixels) override;
>-    gl::Error setCompressedSubImage(const gl::Context *context,
>-                                    GLenum target,
>-                                    size_t level,
>-                                    const gl::Box &area,
>-                                    GLenum format,
>-                                    const gl::PixelUnpackState &unpack,
>-                                    size_t imageSize,
>-                                    const uint8_t *pixels) override;
>-
>-    gl::Error copyImage(const gl::Context *context,
>-                        GLenum target,
>-                        size_t level,
>-                        const gl::Rectangle &sourceArea,
>-                        GLenum internalFormat,
>-                        const gl::Framebuffer *source) override;
>-    gl::Error copySubImage(const gl::Context *context,
>-                           GLenum target,
>-                           size_t level,
>-                           const gl::Offset &destOffset,
>-                           const gl::Rectangle &sourceArea,
>-                           const gl::Framebuffer *source) override;
>-
>-    gl::Error copyTexture(const gl::Context *context,
>-                          GLenum target,
>-                          size_t level,
>-                          GLenum internalFormat,
>-                          GLenum type,
>-                          size_t sourceLevel,
>-                          bool unpackFlipY,
>-                          bool unpackPremultiplyAlpha,
>-                          bool unpackUnmultiplyAlpha,
>-                          const gl::Texture *source) override;
>-    gl::Error copySubTexture(const gl::Context *context,
>-                             GLenum target,
>-                             size_t level,
>-                             const gl::Offset &destOffset,
>-                             size_t sourceLevel,
>-                             const gl::Rectangle &sourceArea,
>-                             bool unpackFlipY,
>-                             bool unpackPremultiplyAlpha,
>-                             bool unpackUnmultiplyAlpha,
>-                             const gl::Texture *source) override;
>-    gl::Error copyCompressedTexture(const gl::Context *context, const gl::Texture *source) override;
>-
>-    gl::Error setStorage(const gl::Context *context,
>-                         GLenum target,
>-                         size_t levels,
>-                         GLenum internalFormat,
>-                         const gl::Extents &size) override;
>-
>-    gl::Error bindTexImage(const gl::Context *context, egl::Surface *surface) override;
>-    gl::Error releaseTexImage(const gl::Context *context) override;
>-
>-    gl::Error setEGLImageTarget(const gl::Context *context,
>-                                GLenum target,
>-                                egl::Image *image) override;
>-
>-    gl::Error getRenderTarget(const gl::Context *context,
>+    angle::Result setImage(const gl::Context *context,
>+                           const gl::ImageIndex &index,
>+                           GLenum internalFormat,
>+                           const gl::Extents &size,
>+                           GLenum format,
>+                           GLenum type,
>+                           const gl::PixelUnpackState &unpack,
>+                           const uint8_t *pixels) override;
>+    angle::Result setSubImage(const gl::Context *context,
>                               const gl::ImageIndex &index,
>-                              RenderTargetD3D **outRT) override;
>+                              const gl::Box &area,
>+                              GLenum format,
>+                              GLenum type,
>+                              const gl::PixelUnpackState &unpack,
>+                              gl::Buffer *unpackBuffer,
>+                              const uint8_t *pixels) override;
>+
>+    angle::Result setCompressedImage(const gl::Context *context,
>+                                     const gl::ImageIndex &index,
>+                                     GLenum internalFormat,
>+                                     const gl::Extents &size,
>+                                     const gl::PixelUnpackState &unpack,
>+                                     size_t imageSize,
>+                                     const uint8_t *pixels) override;
>+    angle::Result setCompressedSubImage(const gl::Context *context,
>+                                        const gl::ImageIndex &index,
>+                                        const gl::Box &area,
>+                                        GLenum format,
>+                                        const gl::PixelUnpackState &unpack,
>+                                        size_t imageSize,
>+                                        const uint8_t *pixels) override;
>+
>+    angle::Result copyImage(const gl::Context *context,
>+                            const gl::ImageIndex &index,
>+                            const gl::Rectangle &sourceArea,
>+                            GLenum internalFormat,
>+                            gl::Framebuffer *source) override;
>+    angle::Result copySubImage(const gl::Context *context,
>+                               const gl::ImageIndex &index,
>+                               const gl::Offset &destOffset,
>+                               const gl::Rectangle &sourceArea,
>+                               gl::Framebuffer *source) override;
>+
>+    angle::Result copyTexture(const gl::Context *context,
>+                              const gl::ImageIndex &index,
>+                              GLenum internalFormat,
>+                              GLenum type,
>+                              size_t sourceLevel,
>+                              bool unpackFlipY,
>+                              bool unpackPremultiplyAlpha,
>+                              bool unpackUnmultiplyAlpha,
>+                              const gl::Texture *source) override;
>+    angle::Result copySubTexture(const gl::Context *context,
>+                                 const gl::ImageIndex &index,
>+                                 const gl::Offset &destOffset,
>+                                 size_t sourceLevel,
>+                                 const gl::Box &sourceBox,
>+                                 bool unpackFlipY,
>+                                 bool unpackPremultiplyAlpha,
>+                                 bool unpackUnmultiplyAlpha,
>+                                 const gl::Texture *source) override;
>+    angle::Result copyCompressedTexture(const gl::Context *context,
>+                                        const gl::Texture *source) override;
>+
>+    angle::Result setStorage(const gl::Context *context,
>+                             gl::TextureType type,
>+                             size_t levels,
>+                             GLenum internalFormat,
>+                             const gl::Extents &size) override;
>+
>+    angle::Result bindTexImage(const gl::Context *context, egl::Surface *surface) override;
>+    angle::Result releaseTexImage(const gl::Context *context) override;
>+
>+    angle::Result setEGLImageTarget(const gl::Context *context,
>+                                    gl::TextureType type,
>+                                    egl::Image *image) override;
>+
>+    angle::Result getRenderTarget(const gl::Context *context,
>+                                  const gl::ImageIndex &index,
>+                                  RenderTargetD3D **outRT) override;
> 
>     gl::ImageIndexIterator imageIterator() const override;
>     gl::ImageIndex getImageIndex(GLint mip, GLint layer) const override;
>@@ -299,29 +300,29 @@ class TextureD3D_2D : public TextureD3D
>     void markAllImagesDirty() override;
> 
>   private:
>-    gl::Error initializeStorage(const gl::Context *context, bool renderTarget) override;
>-    gl::Error createCompleteStorage(bool renderTarget,
>-                                    TexStoragePointer *outTexStorage) const override;
>-    gl::Error setCompleteTexStorage(const gl::Context *context,
>-                                    TextureStorage *newCompleteTexStorage) override;
>+    angle::Result initializeStorage(const gl::Context *context, bool renderTarget) override;
>+    angle::Result createCompleteStorage(bool renderTarget,
>+                                        TexStoragePointer *outTexStorage) const override;
>+    angle::Result setCompleteTexStorage(const gl::Context *context,
>+                                        TextureStorage *newCompleteTexStorage) override;
> 
>-    gl::Error updateStorage(const gl::Context *context) override;
>-    gl::Error initMipmapImages(const gl::Context *context) override;
>+    angle::Result updateStorage(const gl::Context *context) override;
>+    angle::Result initMipmapImages(const gl::Context *context) override;
> 
>     bool isValidLevel(int level) const;
>     bool isLevelComplete(int level) const;
>     bool isImageComplete(const gl::ImageIndex &index) const override;
> 
>-    gl::Error updateStorageLevel(const gl::Context *context, int level);
>+    angle::Result updateStorageLevel(const gl::Context *context, int level);
> 
>-    gl::Error redefineImage(const gl::Context *context,
>-                            size_t level,
>-                            GLenum internalformat,
>-                            const gl::Extents &size,
>-                            bool forceRelease);
>+    angle::Result redefineImage(const gl::Context *context,
>+                                size_t level,
>+                                GLenum internalformat,
>+                                const gl::Extents &size,
>+                                bool forceRelease);
> 
>     bool mEGLImageTarget;
>-    TexLevelsArray<std::unique_ptr<ImageD3D>> mImageArray;
>+    gl::TexLevelArray<std::unique_ptr<ImageD3D>> mImageArray;
> };
> 
> class TextureD3D_Cube : public TextureD3D
>@@ -330,7 +331,7 @@ class TextureD3D_Cube : public TextureD3D
>     TextureD3D_Cube(const gl::TextureState &data, RendererD3D *renderer);
>     ~TextureD3D_Cube() override;
> 
>-    gl::Error onDestroy(const gl::Context *context) override;
>+    void onDestroy(const gl::Context *context) override;
> 
>     ImageD3D *getImage(int level, int layer) const;
>     ImageD3D *getImage(const gl::ImageIndex &index) const override;
>@@ -340,91 +341,84 @@ class TextureD3D_Cube : public TextureD3D
>     bool isDepth(GLint level, GLint layer) const;
>     bool isSRGB(GLint level, GLint layer) const;
> 
>-    gl::Error setImage(const gl::Context *context,
>-                       GLenum target,
>-                       size_t level,
>-                       GLenum internalFormat,
>-                       const gl::Extents &size,
>-                       GLenum format,
>-                       GLenum type,
>-                       const gl::PixelUnpackState &unpack,
>-                       const uint8_t *pixels) override;
>-    gl::Error setSubImage(const gl::Context *context,
>-                          GLenum target,
>-                          size_t level,
>-                          const gl::Box &area,
>-                          GLenum format,
>-                          GLenum type,
>-                          const gl::PixelUnpackState &unpack,
>-                          const uint8_t *pixels) override;
>-
>-    gl::Error setCompressedImage(const gl::Context *context,
>-                                 GLenum target,
>-                                 size_t level,
>-                                 GLenum internalFormat,
>-                                 const gl::Extents &size,
>-                                 const gl::PixelUnpackState &unpack,
>-                                 size_t imageSize,
>-                                 const uint8_t *pixels) override;
>-    gl::Error setCompressedSubImage(const gl::Context *context,
>-                                    GLenum target,
>-                                    size_t level,
>-                                    const gl::Box &area,
>-                                    GLenum format,
>-                                    const gl::PixelUnpackState &unpack,
>-                                    size_t imageSize,
>-                                    const uint8_t *pixels) override;
>-
>-    gl::Error copyImage(const gl::Context *context,
>-                        GLenum target,
>-                        size_t level,
>-                        const gl::Rectangle &sourceArea,
>-                        GLenum internalFormat,
>-                        const gl::Framebuffer *source) override;
>-    gl::Error copySubImage(const gl::Context *context,
>-                           GLenum target,
>-                           size_t level,
>-                           const gl::Offset &destOffset,
>-                           const gl::Rectangle &sourceArea,
>-                           const gl::Framebuffer *source) override;
>-
>-    gl::Error copyTexture(const gl::Context *context,
>-                          GLenum target,
>-                          size_t level,
>-                          GLenum internalFormat,
>-                          GLenum type,
>-                          size_t sourceLevel,
>-                          bool unpackFlipY,
>-                          bool unpackPremultiplyAlpha,
>-                          bool unpackUnmultiplyAlpha,
>-                          const gl::Texture *source) override;
>-    gl::Error copySubTexture(const gl::Context *context,
>-                             GLenum target,
>-                             size_t level,
>-                             const gl::Offset &destOffset,
>-                             size_t sourceLevel,
>-                             const gl::Rectangle &sourceArea,
>-                             bool unpackFlipY,
>-                             bool unpackPremultiplyAlpha,
>-                             bool unpackUnmultiplyAlpha,
>-                             const gl::Texture *source) override;
>-
>-    gl::Error setStorage(const gl::Context *context,
>-                         GLenum target,
>-                         size_t levels,
>-                         GLenum internalFormat,
>-                         const gl::Extents &size) override;
>-
>-    gl::Error bindTexImage(const gl::Context *context, egl::Surface *surface) override;
>-    gl::Error releaseTexImage(const gl::Context *context) override;
>-
>-    gl::Error setEGLImageTarget(const gl::Context *context,
>-                                GLenum target,
>-                                egl::Image *image) override;
>-
>-    gl::Error getRenderTarget(const gl::Context *context,
>+    angle::Result setImage(const gl::Context *context,
>+                           const gl::ImageIndex &index,
>+                           GLenum internalFormat,
>+                           const gl::Extents &size,
>+                           GLenum format,
>+                           GLenum type,
>+                           const gl::PixelUnpackState &unpack,
>+                           const uint8_t *pixels) override;
>+    angle::Result setSubImage(const gl::Context *context,
>                               const gl::ImageIndex &index,
>-                              RenderTargetD3D **outRT) override;
>+                              const gl::Box &area,
>+                              GLenum format,
>+                              GLenum type,
>+                              const gl::PixelUnpackState &unpack,
>+                              gl::Buffer *unpackBuffer,
>+                              const uint8_t *pixels) override;
>+
>+    angle::Result setCompressedImage(const gl::Context *context,
>+                                     const gl::ImageIndex &index,
>+                                     GLenum internalFormat,
>+                                     const gl::Extents &size,
>+                                     const gl::PixelUnpackState &unpack,
>+                                     size_t imageSize,
>+                                     const uint8_t *pixels) override;
>+    angle::Result setCompressedSubImage(const gl::Context *context,
>+                                        const gl::ImageIndex &index,
>+                                        const gl::Box &area,
>+                                        GLenum format,
>+                                        const gl::PixelUnpackState &unpack,
>+                                        size_t imageSize,
>+                                        const uint8_t *pixels) override;
>+
>+    angle::Result copyImage(const gl::Context *context,
>+                            const gl::ImageIndex &index,
>+                            const gl::Rectangle &sourceArea,
>+                            GLenum internalFormat,
>+                            gl::Framebuffer *source) override;
>+    angle::Result copySubImage(const gl::Context *context,
>+                               const gl::ImageIndex &index,
>+                               const gl::Offset &destOffset,
>+                               const gl::Rectangle &sourceArea,
>+                               gl::Framebuffer *source) override;
>+
>+    angle::Result copyTexture(const gl::Context *context,
>+                              const gl::ImageIndex &index,
>+                              GLenum internalFormat,
>+                              GLenum type,
>+                              size_t sourceLevel,
>+                              bool unpackFlipY,
>+                              bool unpackPremultiplyAlpha,
>+                              bool unpackUnmultiplyAlpha,
>+                              const gl::Texture *source) override;
>+    angle::Result copySubTexture(const gl::Context *context,
>+                                 const gl::ImageIndex &index,
>+                                 const gl::Offset &destOffset,
>+                                 size_t sourceLevel,
>+                                 const gl::Box &sourceBox,
>+                                 bool unpackFlipY,
>+                                 bool unpackPremultiplyAlpha,
>+                                 bool unpackUnmultiplyAlpha,
>+                                 const gl::Texture *source) override;
>+
>+    angle::Result setStorage(const gl::Context *context,
>+                             gl::TextureType type,
>+                             size_t levels,
>+                             GLenum internalFormat,
>+                             const gl::Extents &size) override;
>+
>+    angle::Result bindTexImage(const gl::Context *context, egl::Surface *surface) override;
>+    angle::Result releaseTexImage(const gl::Context *context) override;
>+
>+    angle::Result setEGLImageTarget(const gl::Context *context,
>+                                    gl::TextureType type,
>+                                    egl::Image *image) override;
>+
>+    angle::Result getRenderTarget(const gl::Context *context,
>+                                  const gl::ImageIndex &index,
>+                                  RenderTargetD3D **outRT) override;
> 
>     gl::ImageIndexIterator imageIterator() const override;
>     gl::ImageIndex getImageIndex(GLint mip, GLint layer) const override;
>@@ -434,29 +428,29 @@ class TextureD3D_Cube : public TextureD3D
>     void markAllImagesDirty() override;
> 
>   private:
>-    gl::Error initializeStorage(const gl::Context *context, bool renderTarget) override;
>-    gl::Error createCompleteStorage(bool renderTarget,
>-                                    TexStoragePointer *outTexStorage) const override;
>-    gl::Error setCompleteTexStorage(const gl::Context *context,
>-                                    TextureStorage *newCompleteTexStorage) override;
>+    angle::Result initializeStorage(const gl::Context *context, bool renderTarget) override;
>+    angle::Result createCompleteStorage(bool renderTarget,
>+                                        TexStoragePointer *outTexStorage) const override;
>+    angle::Result setCompleteTexStorage(const gl::Context *context,
>+                                        TextureStorage *newCompleteTexStorage) override;
> 
>-    gl::Error updateStorage(const gl::Context *context) override;
>-    gl::Error initMipmapImages(const gl::Context *context) override;
>+    angle::Result updateStorage(const gl::Context *context) override;
>+    angle::Result initMipmapImages(const gl::Context *context) override;
> 
>     bool isValidFaceLevel(int faceIndex, int level) const;
>     bool isFaceLevelComplete(int faceIndex, int level) const;
>     bool isCubeComplete() const;
>     bool isImageComplete(const gl::ImageIndex &index) const override;
>-    gl::Error updateStorageFaceLevel(const gl::Context *context, int faceIndex, int level);
>+    angle::Result updateStorageFaceLevel(const gl::Context *context, int faceIndex, int level);
> 
>-    gl::Error redefineImage(const gl::Context *context,
>-                            int faceIndex,
>-                            GLint level,
>-                            GLenum internalformat,
>-                            const gl::Extents &size,
>-                            bool forceRelease);
>+    angle::Result redefineImage(const gl::Context *context,
>+                                int faceIndex,
>+                                GLint level,
>+                                GLenum internalformat,
>+                                const gl::Extents &size,
>+                                bool forceRelease);
> 
>-    std::array<TexLevelsArray<std::unique_ptr<ImageD3D>>, 6> mImageArray;
>+    std::array<gl::TexLevelArray<std::unique_ptr<ImageD3D>>, 6> mImageArray;
> };
> 
> class TextureD3D_3D : public TextureD3D
>@@ -465,7 +459,7 @@ class TextureD3D_3D : public TextureD3D
>     TextureD3D_3D(const gl::TextureState &data, RendererD3D *renderer);
>     ~TextureD3D_3D() override;
> 
>-    gl::Error onDestroy(const gl::Context *context) override;
>+    void onDestroy(const gl::Context *context) override;
> 
>     ImageD3D *getImage(int level, int layer) const;
>     ImageD3D *getImage(const gl::ImageIndex &index) const override;
>@@ -476,71 +470,86 @@ class TextureD3D_3D : public TextureD3D
>     GLsizei getDepth(GLint level) const;
>     GLenum getInternalFormat(GLint level) const;
>     bool isDepth(GLint level) const;
>+    bool isSRGB(GLint level) const;
> 
>-    gl::Error setImage(const gl::Context *context,
>-                       GLenum target,
>-                       size_t level,
>-                       GLenum internalFormat,
>-                       const gl::Extents &size,
>-                       GLenum format,
>-                       GLenum type,
>-                       const gl::PixelUnpackState &unpack,
>-                       const uint8_t *pixels) override;
>-    gl::Error setSubImage(const gl::Context *context,
>-                          GLenum target,
>-                          size_t level,
>-                          const gl::Box &area,
>-                          GLenum format,
>-                          GLenum type,
>-                          const gl::PixelUnpackState &unpack,
>-                          const uint8_t *pixels) override;
>-
>-    gl::Error setCompressedImage(const gl::Context *context,
>-                                 GLenum target,
>-                                 size_t level,
>-                                 GLenum internalFormat,
>-                                 const gl::Extents &size,
>-                                 const gl::PixelUnpackState &unpack,
>-                                 size_t imageSize,
>-                                 const uint8_t *pixels) override;
>-    gl::Error setCompressedSubImage(const gl::Context *context,
>-                                    GLenum target,
>-                                    size_t level,
>-                                    const gl::Box &area,
>-                                    GLenum format,
>-                                    const gl::PixelUnpackState &unpack,
>-                                    size_t imageSize,
>-                                    const uint8_t *pixels) override;
>-
>-    gl::Error copyImage(const gl::Context *context,
>-                        GLenum target,
>-                        size_t level,
>-                        const gl::Rectangle &sourceArea,
>-                        GLenum internalFormat,
>-                        const gl::Framebuffer *source) override;
>-    gl::Error copySubImage(const gl::Context *context,
>-                           GLenum target,
>-                           size_t level,
>-                           const gl::Offset &destOffset,
>-                           const gl::Rectangle &sourceArea,
>-                           const gl::Framebuffer *source) override;
>-
>-    gl::Error setStorage(const gl::Context *context,
>-                         GLenum target,
>-                         size_t levels,
>-                         GLenum internalFormat,
>-                         const gl::Extents &size) override;
>-
>-    gl::Error bindTexImage(const gl::Context *context, egl::Surface *surface) override;
>-    gl::Error releaseTexImage(const gl::Context *context) override;
>-
>-    gl::Error setEGLImageTarget(const gl::Context *context,
>-                                GLenum target,
>-                                egl::Image *image) override;
>-
>-    gl::Error getRenderTarget(const gl::Context *context,
>+    angle::Result setImage(const gl::Context *context,
>+                           const gl::ImageIndex &index,
>+                           GLenum internalFormat,
>+                           const gl::Extents &size,
>+                           GLenum format,
>+                           GLenum type,
>+                           const gl::PixelUnpackState &unpack,
>+                           const uint8_t *pixels) override;
>+    angle::Result setSubImage(const gl::Context *context,
>+                              const gl::ImageIndex &index,
>+                              const gl::Box &area,
>+                              GLenum format,
>+                              GLenum type,
>+                              const gl::PixelUnpackState &unpack,
>+                              gl::Buffer *unpackBuffer,
>+                              const uint8_t *pixels) override;
>+
>+    angle::Result setCompressedImage(const gl::Context *context,
>+                                     const gl::ImageIndex &index,
>+                                     GLenum internalFormat,
>+                                     const gl::Extents &size,
>+                                     const gl::PixelUnpackState &unpack,
>+                                     size_t imageSize,
>+                                     const uint8_t *pixels) override;
>+    angle::Result setCompressedSubImage(const gl::Context *context,
>+                                        const gl::ImageIndex &index,
>+                                        const gl::Box &area,
>+                                        GLenum format,
>+                                        const gl::PixelUnpackState &unpack,
>+                                        size_t imageSize,
>+                                        const uint8_t *pixels) override;
>+
>+    angle::Result copyImage(const gl::Context *context,
>+                            const gl::ImageIndex &index,
>+                            const gl::Rectangle &sourceArea,
>+                            GLenum internalFormat,
>+                            gl::Framebuffer *source) override;
>+    angle::Result copySubImage(const gl::Context *context,
>+                               const gl::ImageIndex &index,
>+                               const gl::Offset &destOffset,
>+                               const gl::Rectangle &sourceArea,
>+                               gl::Framebuffer *source) override;
>+
>+    angle::Result copyTexture(const gl::Context *context,
>                               const gl::ImageIndex &index,
>-                              RenderTargetD3D **outRT) override;
>+                              GLenum internalFormat,
>+                              GLenum type,
>+                              size_t sourceLevel,
>+                              bool unpackFlipY,
>+                              bool unpackPremultiplyAlpha,
>+                              bool unpackUnmultiplyAlpha,
>+                              const gl::Texture *source) override;
>+    angle::Result copySubTexture(const gl::Context *context,
>+                                 const gl::ImageIndex &index,
>+                                 const gl::Offset &destOffset,
>+                                 size_t sourceLevel,
>+                                 const gl::Box &sourceBox,
>+                                 bool unpackFlipY,
>+                                 bool unpackPremultiplyAlpha,
>+                                 bool unpackUnmultiplyAlpha,
>+                                 const gl::Texture *source) override;
>+
>+    angle::Result setStorage(const gl::Context *context,
>+                             gl::TextureType type,
>+                             size_t levels,
>+                             GLenum internalFormat,
>+                             const gl::Extents &size) override;
>+
>+    angle::Result bindTexImage(const gl::Context *context, egl::Surface *surface) override;
>+    angle::Result releaseTexImage(const gl::Context *context) override;
>+
>+    angle::Result setEGLImageTarget(const gl::Context *context,
>+                                    gl::TextureType type,
>+                                    egl::Image *image) override;
>+
>+    angle::Result getRenderTarget(const gl::Context *context,
>+                                  const gl::ImageIndex &index,
>+                                  RenderTargetD3D **outRT) override;
> 
>     gl::ImageIndexIterator imageIterator() const override;
>     gl::ImageIndex getImageIndex(GLint mip, GLint layer) const override;
>@@ -551,27 +560,27 @@ class TextureD3D_3D : public TextureD3D
>     GLint getLevelZeroDepth() const override;
> 
>   private:
>-    gl::Error initializeStorage(const gl::Context *context, bool renderTarget) override;
>-    gl::Error createCompleteStorage(bool renderTarget,
>-                                    TexStoragePointer *outStorage) const override;
>-    gl::Error setCompleteTexStorage(const gl::Context *context,
>-                                    TextureStorage *newCompleteTexStorage) override;
>+    angle::Result initializeStorage(const gl::Context *context, bool renderTarget) override;
>+    angle::Result createCompleteStorage(bool renderTarget,
>+                                        TexStoragePointer *outStorage) const override;
>+    angle::Result setCompleteTexStorage(const gl::Context *context,
>+                                        TextureStorage *newCompleteTexStorage) override;
> 
>-    gl::Error updateStorage(const gl::Context *context) override;
>-    gl::Error initMipmapImages(const gl::Context *context) override;
>+    angle::Result updateStorage(const gl::Context *context) override;
>+    angle::Result initMipmapImages(const gl::Context *context) override;
> 
>     bool isValidLevel(int level) const;
>     bool isLevelComplete(int level) const;
>     bool isImageComplete(const gl::ImageIndex &index) const override;
>-    gl::Error updateStorageLevel(const gl::Context *context, int level);
>+    angle::Result updateStorageLevel(const gl::Context *context, int level);
> 
>-    gl::Error redefineImage(const gl::Context *context,
>-                            GLint level,
>-                            GLenum internalformat,
>-                            const gl::Extents &size,
>-                            bool forceRelease);
>+    angle::Result redefineImage(const gl::Context *context,
>+                                GLint level,
>+                                GLenum internalformat,
>+                                const gl::Extents &size,
>+                                bool forceRelease);
> 
>-    TexLevelsArray<std::unique_ptr<ImageD3D>> mImageArray;
>+    gl::TexLevelArray<std::unique_ptr<ImageD3D>> mImageArray;
> };
> 
> class TextureD3D_2DArray : public TextureD3D
>@@ -580,7 +589,7 @@ class TextureD3D_2DArray : public TextureD3D
>     TextureD3D_2DArray(const gl::TextureState &data, RendererD3D *renderer);
>     ~TextureD3D_2DArray() override;
> 
>-    gl::Error onDestroy(const gl::Context *context) override;
>+    void onDestroy(const gl::Context *context) override;
> 
>     virtual ImageD3D *getImage(int level, int layer) const;
>     ImageD3D *getImage(const gl::ImageIndex &index) const override;
>@@ -591,70 +600,84 @@ class TextureD3D_2DArray : public TextureD3D
>     GLenum getInternalFormat(GLint level) const;
>     bool isDepth(GLint level) const;
> 
>-    gl::Error setImage(const gl::Context *context,
>-                       GLenum target,
>-                       size_t level,
>-                       GLenum internalFormat,
>-                       const gl::Extents &size,
>-                       GLenum format,
>-                       GLenum type,
>-                       const gl::PixelUnpackState &unpack,
>-                       const uint8_t *pixels) override;
>-    gl::Error setSubImage(const gl::Context *context,
>-                          GLenum target,
>-                          size_t level,
>-                          const gl::Box &area,
>-                          GLenum format,
>-                          GLenum type,
>-                          const gl::PixelUnpackState &unpack,
>-                          const uint8_t *pixels) override;
>-
>-    gl::Error setCompressedImage(const gl::Context *context,
>-                                 GLenum target,
>-                                 size_t level,
>-                                 GLenum internalFormat,
>-                                 const gl::Extents &size,
>-                                 const gl::PixelUnpackState &unpack,
>-                                 size_t imageSize,
>-                                 const uint8_t *pixels) override;
>-    gl::Error setCompressedSubImage(const gl::Context *context,
>-                                    GLenum target,
>-                                    size_t level,
>-                                    const gl::Box &area,
>-                                    GLenum format,
>-                                    const gl::PixelUnpackState &unpack,
>-                                    size_t imageSize,
>-                                    const uint8_t *pixels) override;
>-
>-    gl::Error copyImage(const gl::Context *context,
>-                        GLenum target,
>-                        size_t level,
>-                        const gl::Rectangle &sourceArea,
>-                        GLenum internalFormat,
>-                        const gl::Framebuffer *source) override;
>-    gl::Error copySubImage(const gl::Context *context,
>-                           GLenum target,
>-                           size_t level,
>-                           const gl::Offset &destOffset,
>-                           const gl::Rectangle &sourceArea,
>-                           const gl::Framebuffer *source) override;
>-
>-    gl::Error setStorage(const gl::Context *context,
>-                         GLenum target,
>-                         size_t levels,
>-                         GLenum internalFormat,
>-                         const gl::Extents &size) override;
>-
>-    gl::Error bindTexImage(const gl::Context *context, egl::Surface *surface) override;
>-    gl::Error releaseTexImage(const gl::Context *context) override;
>-
>-    gl::Error setEGLImageTarget(const gl::Context *context,
>-                                GLenum target,
>-                                egl::Image *image) override;
>-
>-    gl::Error getRenderTarget(const gl::Context *context,
>+    angle::Result setImage(const gl::Context *context,
>+                           const gl::ImageIndex &index,
>+                           GLenum internalFormat,
>+                           const gl::Extents &size,
>+                           GLenum format,
>+                           GLenum type,
>+                           const gl::PixelUnpackState &unpack,
>+                           const uint8_t *pixels) override;
>+    angle::Result setSubImage(const gl::Context *context,
>                               const gl::ImageIndex &index,
>-                              RenderTargetD3D **outRT) override;
>+                              const gl::Box &area,
>+                              GLenum format,
>+                              GLenum type,
>+                              const gl::PixelUnpackState &unpack,
>+                              gl::Buffer *unpackBuffer,
>+                              const uint8_t *pixels) override;
>+
>+    angle::Result setCompressedImage(const gl::Context *context,
>+                                     const gl::ImageIndex &index,
>+                                     GLenum internalFormat,
>+                                     const gl::Extents &size,
>+                                     const gl::PixelUnpackState &unpack,
>+                                     size_t imageSize,
>+                                     const uint8_t *pixels) override;
>+    angle::Result setCompressedSubImage(const gl::Context *context,
>+                                        const gl::ImageIndex &index,
>+                                        const gl::Box &area,
>+                                        GLenum format,
>+                                        const gl::PixelUnpackState &unpack,
>+                                        size_t imageSize,
>+                                        const uint8_t *pixels) override;
>+
>+    angle::Result copyImage(const gl::Context *context,
>+                            const gl::ImageIndex &index,
>+                            const gl::Rectangle &sourceArea,
>+                            GLenum internalFormat,
>+                            gl::Framebuffer *source) override;
>+    angle::Result copySubImage(const gl::Context *context,
>+                               const gl::ImageIndex &index,
>+                               const gl::Offset &destOffset,
>+                               const gl::Rectangle &sourceArea,
>+                               gl::Framebuffer *source) override;
>+
>+    angle::Result copyTexture(const gl::Context *context,
>+                              const gl::ImageIndex &index,
>+                              GLenum internalFormat,
>+                              GLenum type,
>+                              size_t sourceLevel,
>+                              bool unpackFlipY,
>+                              bool unpackPremultiplyAlpha,
>+                              bool unpackUnmultiplyAlpha,
>+                              const gl::Texture *source) override;
>+    angle::Result copySubTexture(const gl::Context *context,
>+                                 const gl::ImageIndex &index,
>+                                 const gl::Offset &destOffset,
>+                                 size_t sourceLevel,
>+                                 const gl::Box &sourceBox,
>+                                 bool unpackFlipY,
>+                                 bool unpackPremultiplyAlpha,
>+                                 bool unpackUnmultiplyAlpha,
>+                                 const gl::Texture *source) override;
>+
>+    angle::Result setStorage(const gl::Context *context,
>+                             gl::TextureType type,
>+                             size_t levels,
>+                             GLenum internalFormat,
>+                             const gl::Extents &size) override;
>+
>+    angle::Result bindTexImage(const gl::Context *context, egl::Surface *surface) override;
>+    angle::Result releaseTexImage(const gl::Context *context) override;
>+
>+    angle::Result setEGLImageTarget(const gl::Context *context,
>+                                    gl::TextureType type,
>+                                    egl::Image *image) override;
>+
>+    angle::Result getRenderTarget(const gl::Context *context,
>+                                  const gl::ImageIndex &index,
>+                                  RenderTargetD3D **outRT) override;
> 
>     gl::ImageIndexIterator imageIterator() const override;
>     gl::ImageIndex getImageIndex(GLint mip, GLint layer) const override;
>@@ -664,113 +687,112 @@ class TextureD3D_2DArray : public TextureD3D
>     void markAllImagesDirty() override;
> 
>   private:
>-    gl::Error initializeStorage(const gl::Context *context, bool renderTarget) override;
>-    gl::Error createCompleteStorage(bool renderTarget,
>-                                    TexStoragePointer *outStorage) const override;
>-    gl::Error setCompleteTexStorage(const gl::Context *context,
>-                                    TextureStorage *newCompleteTexStorage) override;
>+    angle::Result initializeStorage(const gl::Context *context, bool renderTarget) override;
>+    angle::Result createCompleteStorage(bool renderTarget,
>+                                        TexStoragePointer *outStorage) const override;
>+    angle::Result setCompleteTexStorage(const gl::Context *context,
>+                                        TextureStorage *newCompleteTexStorage) override;
> 
>-    gl::Error updateStorage(const gl::Context *context) override;
>-    gl::Error initMipmapImages(const gl::Context *context) override;
>+    angle::Result updateStorage(const gl::Context *context) override;
>+    angle::Result initMipmapImages(const gl::Context *context) override;
> 
>     bool isValidLevel(int level) const;
>     bool isLevelComplete(int level) const;
>     bool isImageComplete(const gl::ImageIndex &index) const override;
>-    gl::Error updateStorageLevel(const gl::Context *context, int level);
>+    bool isSRGB(GLint level) const;
>+    angle::Result updateStorageLevel(const gl::Context *context, int level);
> 
>     void deleteImages();
>-    gl::Error redefineImage(const gl::Context *context,
>-                            GLint level,
>-                            GLenum internalformat,
>-                            const gl::Extents &size,
>-                            bool forceRelease);
>+    angle::Result redefineImage(const gl::Context *context,
>+                                GLint level,
>+                                GLenum internalformat,
>+                                const gl::Extents &size,
>+                                bool forceRelease);
> 
>     // Storing images as an array of single depth textures since D3D11 treats each array level of a
>     // Texture2D object as a separate subresource.  Each layer would have to be looped over
>-    // to update all the texture layers since they cannot all be updated at once and it makes the most
>-    // sense for the Image class to not have to worry about layer subresource as well as mip subresources.
>+    // to update all the texture layers since they cannot all be updated at once and it makes the
>+    // most sense for the Image class to not have to worry about layer subresource as well as mip
>+    // subresources.
>     GLsizei mLayerCounts[gl::IMPLEMENTATION_MAX_TEXTURE_LEVELS];
>     ImageD3D **mImageArray[gl::IMPLEMENTATION_MAX_TEXTURE_LEVELS];
> };
> 
>-class TextureD3D_External : public TextureD3D
>+// Base class for immutable textures. These don't support manipulation of individual texture images.
>+class TextureD3DImmutableBase : public TextureD3D
>+{
>+  public:
>+    TextureD3DImmutableBase(const gl::TextureState &data, RendererD3D *renderer);
>+    ~TextureD3DImmutableBase() override;
>+
>+    ImageD3D *getImage(const gl::ImageIndex &index) const override;
>+    angle::Result setImage(const gl::Context *context,
>+                           const gl::ImageIndex &index,
>+                           GLenum internalFormat,
>+                           const gl::Extents &size,
>+                           GLenum format,
>+                           GLenum type,
>+                           const gl::PixelUnpackState &unpack,
>+                           const uint8_t *pixels) override;
>+    angle::Result setSubImage(const gl::Context *context,
>+                              const gl::ImageIndex &index,
>+                              const gl::Box &area,
>+                              GLenum format,
>+                              GLenum type,
>+                              const gl::PixelUnpackState &unpack,
>+                              gl::Buffer *unpackBuffer,
>+                              const uint8_t *pixels) override;
>+
>+    angle::Result setCompressedImage(const gl::Context *context,
>+                                     const gl::ImageIndex &index,
>+                                     GLenum internalFormat,
>+                                     const gl::Extents &size,
>+                                     const gl::PixelUnpackState &unpack,
>+                                     size_t imageSize,
>+                                     const uint8_t *pixels) override;
>+    angle::Result setCompressedSubImage(const gl::Context *context,
>+                                        const gl::ImageIndex &index,
>+                                        const gl::Box &area,
>+                                        GLenum format,
>+                                        const gl::PixelUnpackState &unpack,
>+                                        size_t imageSize,
>+                                        const uint8_t *pixels) override;
>+
>+    angle::Result copyImage(const gl::Context *context,
>+                            const gl::ImageIndex &index,
>+                            const gl::Rectangle &sourceArea,
>+                            GLenum internalFormat,
>+                            gl::Framebuffer *source) override;
>+    angle::Result copySubImage(const gl::Context *context,
>+                               const gl::ImageIndex &index,
>+                               const gl::Offset &destOffset,
>+                               const gl::Rectangle &sourceArea,
>+                               gl::Framebuffer *source) override;
>+
>+    angle::Result bindTexImage(const gl::Context *context, egl::Surface *surface) override;
>+    angle::Result releaseTexImage(const gl::Context *context) override;
>+};
>+
>+class TextureD3D_External : public TextureD3DImmutableBase
> {
>   public:
>     TextureD3D_External(const gl::TextureState &data, RendererD3D *renderer);
>     ~TextureD3D_External() override;
> 
>-    ImageD3D *getImage(const gl::ImageIndex &index) const override;
>     GLsizei getLayerCount(int level) const override;
> 
>-    gl::Error setImage(const gl::Context *context,
>-                       GLenum target,
>-                       size_t level,
>-                       GLenum internalFormat,
>-                       const gl::Extents &size,
>-                       GLenum format,
>-                       GLenum type,
>-                       const gl::PixelUnpackState &unpack,
>-                       const uint8_t *pixels) override;
>-    gl::Error setSubImage(const gl::Context *context,
>-                          GLenum target,
>-                          size_t level,
>-                          const gl::Box &area,
>-                          GLenum format,
>-                          GLenum type,
>-                          const gl::PixelUnpackState &unpack,
>-                          const uint8_t *pixels) override;
>-
>-    gl::Error setCompressedImage(const gl::Context *context,
>-                                 GLenum target,
>-                                 size_t level,
>-                                 GLenum internalFormat,
>-                                 const gl::Extents &size,
>-                                 const gl::PixelUnpackState &unpack,
>-                                 size_t imageSize,
>-                                 const uint8_t *pixels) override;
>-    gl::Error setCompressedSubImage(const gl::Context *context,
>-                                    GLenum target,
>-                                    size_t level,
>-                                    const gl::Box &area,
>-                                    GLenum format,
>-                                    const gl::PixelUnpackState &unpack,
>-                                    size_t imageSize,
>-                                    const uint8_t *pixels) override;
>-
>-    gl::Error copyImage(const gl::Context *context,
>-                        GLenum target,
>-                        size_t level,
>-                        const gl::Rectangle &sourceArea,
>-                        GLenum internalFormat,
>-                        const gl::Framebuffer *source) override;
>-    gl::Error copySubImage(const gl::Context *context,
>-                           GLenum target,
>-                           size_t level,
>-                           const gl::Offset &destOffset,
>-                           const gl::Rectangle &sourceArea,
>-                           const gl::Framebuffer *source) override;
>-
>-    gl::Error setStorage(const gl::Context *context,
>-                         GLenum target,
>-                         size_t levels,
>-                         GLenum internalFormat,
>-                         const gl::Extents &size) override;
>-
>-    gl::Error setImageExternal(const gl::Context *context,
>-                               GLenum target,
>-                               egl::Stream *stream,
>-                               const egl::Stream::GLTextureDescription &desc) override;
>-
>-    gl::Error bindTexImage(const gl::Context *context, egl::Surface *surface) override;
>-    gl::Error releaseTexImage(const gl::Context *context) override;
>-
>-    gl::Error setEGLImageTarget(const gl::Context *context,
>-                                GLenum target,
>-                                egl::Image *image) override;
>-
>-    gl::Error getRenderTarget(const gl::Context *context,
>-                              const gl::ImageIndex &index,
>-                              RenderTargetD3D **outRT) override;
>+    angle::Result setImageExternal(const gl::Context *context,
>+                                   gl::TextureType type,
>+                                   egl::Stream *stream,
>+                                   const egl::Stream::GLTextureDescription &desc) override;
>+
>+    angle::Result setEGLImageTarget(const gl::Context *context,
>+                                    gl::TextureType type,
>+                                    egl::Image *image) override;
>+
>+    angle::Result getRenderTarget(const gl::Context *context,
>+                                  const gl::ImageIndex &index,
>+                                  RenderTargetD3D **outRT) override;
> 
>     gl::ImageIndexIterator imageIterator() const override;
>     gl::ImageIndex getImageIndex(GLint mip, GLint layer) const override;
>@@ -780,90 +802,38 @@ class TextureD3D_External : public TextureD3D
>     void markAllImagesDirty() override;
> 
>   private:
>-    gl::Error initializeStorage(const gl::Context *context, bool renderTarget) override;
>-    gl::Error createCompleteStorage(bool renderTarget,
>-                                    TexStoragePointer *outTexStorage) const override;
>-    gl::Error setCompleteTexStorage(const gl::Context *context,
>-                                    TextureStorage *newCompleteTexStorage) override;
>+    angle::Result initializeStorage(const gl::Context *context, bool renderTarget) override;
>+    angle::Result createCompleteStorage(bool renderTarget,
>+                                        TexStoragePointer *outTexStorage) const override;
>+    angle::Result setCompleteTexStorage(const gl::Context *context,
>+                                        TextureStorage *newCompleteTexStorage) override;
> 
>-    gl::Error updateStorage(const gl::Context *context) override;
>-    gl::Error initMipmapImages(const gl::Context *context) override;
>+    angle::Result updateStorage(const gl::Context *context) override;
>+    angle::Result initMipmapImages(const gl::Context *context) override;
> 
>     bool isImageComplete(const gl::ImageIndex &index) const override;
> };
> 
>-class TextureD3D_2DMultisample : public TextureD3D
>+class TextureD3D_2DMultisample : public TextureD3DImmutableBase
> {
>   public:
>     TextureD3D_2DMultisample(const gl::TextureState &data, RendererD3D *renderer);
>     ~TextureD3D_2DMultisample() override;
> 
>-    ImageD3D *getImage(const gl::ImageIndex &index) const override;
>-    gl::Error setImage(const gl::Context *context,
>-                       GLenum target,
>-                       size_t level,
>-                       GLenum internalFormat,
>-                       const gl::Extents &size,
>-                       GLenum format,
>-                       GLenum type,
>-                       const gl::PixelUnpackState &unpack,
>-                       const uint8_t *pixels) override;
>-    gl::Error setSubImage(const gl::Context *context,
>-                          GLenum target,
>-                          size_t level,
>-                          const gl::Box &area,
>-                          GLenum format,
>-                          GLenum type,
>-                          const gl::PixelUnpackState &unpack,
>-                          const uint8_t *pixels) override;
>-
>-    gl::Error setCompressedImage(const gl::Context *context,
>-                                 GLenum target,
>-                                 size_t level,
>-                                 GLenum internalFormat,
>-                                 const gl::Extents &size,
>-                                 const gl::PixelUnpackState &unpack,
>-                                 size_t imageSize,
>-                                 const uint8_t *pixels) override;
>-    gl::Error setCompressedSubImage(const gl::Context *context,
>-                                    GLenum target,
>-                                    size_t level,
>-                                    const gl::Box &area,
>-                                    GLenum format,
>-                                    const gl::PixelUnpackState &unpack,
>-                                    size_t imageSize,
>-                                    const uint8_t *pixels) override;
>-
>-    gl::Error copyImage(const gl::Context *context,
>-                        GLenum target,
>-                        size_t level,
>-                        const gl::Rectangle &sourceArea,
>-                        GLenum internalFormat,
>-                        const gl::Framebuffer *source) override;
>-    gl::Error copySubImage(const gl::Context *context,
>-                           GLenum target,
>-                           size_t level,
>-                           const gl::Offset &destOffset,
>-                           const gl::Rectangle &sourceArea,
>-                           const gl::Framebuffer *source) override;
>-
>-    gl::Error setStorageMultisample(const gl::Context *context,
>-                                    GLenum target,
>-                                    GLsizei samples,
>-                                    GLint internalFormat,
>-                                    const gl::Extents &size,
>-                                    bool fixedSampleLocations) override;
>-
>-    gl::Error bindTexImage(const gl::Context *context, egl::Surface *surface) override;
>-    gl::Error releaseTexImage(const gl::Context *context) override;
>-
>-    gl::Error setEGLImageTarget(const gl::Context *context,
>-                                GLenum target,
>-                                egl::Image *image) override;
>-
>-    gl::Error getRenderTarget(const gl::Context *context,
>-                              const gl::ImageIndex &index,
>-                              RenderTargetD3D **outRT) override;
>+    angle::Result setStorageMultisample(const gl::Context *context,
>+                                        gl::TextureType type,
>+                                        GLsizei samples,
>+                                        GLint internalformat,
>+                                        const gl::Extents &size,
>+                                        bool fixedSampleLocations) override;
>+
>+    angle::Result setEGLImageTarget(const gl::Context *context,
>+                                    gl::TextureType type,
>+                                    egl::Image *image) override;
>+
>+    angle::Result getRenderTarget(const gl::Context *context,
>+                                  const gl::ImageIndex &index,
>+                                  RenderTargetD3D **outRT) override;
> 
>     gl::ImageIndexIterator imageIterator() const override;
>     gl::ImageIndex getImageIndex(GLint mip, GLint layer) const override;
>@@ -874,18 +844,65 @@ class TextureD3D_2DMultisample : public TextureD3D
>   protected:
>     void markAllImagesDirty() override;
> 
>+    angle::Result setCompleteTexStorage(const gl::Context *context,
>+                                        TextureStorage *newCompleteTexStorage) override;
>+
>+    angle::Result updateStorage(const gl::Context *context) override;
>+
>   private:
>-    gl::Error initializeStorage(const gl::Context *context, bool renderTarget) override;
>-    gl::Error createCompleteStorage(bool renderTarget,
>-                                    TexStoragePointer *outTexStorage) const override;
>-    gl::Error setCompleteTexStorage(const gl::Context *context,
>-                                    TextureStorage *newCompleteTexStorage) override;
>+    angle::Result initializeStorage(const gl::Context *context, bool renderTarget) override;
>+    angle::Result createCompleteStorage(bool renderTarget,
>+                                        TexStoragePointer *outTexStorage) const override;
>+    angle::Result initMipmapImages(const gl::Context *context) override;
> 
>-    gl::Error updateStorage(const gl::Context *context) override;
>-    gl::Error initMipmapImages(const gl::Context *context) override;
>+    bool isImageComplete(const gl::ImageIndex &index) const override;
>+};
>+
>+class TextureD3D_2DMultisampleArray : public TextureD3DImmutableBase
>+{
>+  public:
>+    TextureD3D_2DMultisampleArray(const gl::TextureState &data, RendererD3D *renderer);
>+    ~TextureD3D_2DMultisampleArray() override;
>+
>+    angle::Result setStorageMultisample(const gl::Context *context,
>+                                        gl::TextureType type,
>+                                        GLsizei samples,
>+                                        GLint internalformat,
>+                                        const gl::Extents &size,
>+                                        bool fixedSampleLocations) override;
>+
>+    angle::Result setEGLImageTarget(const gl::Context *context,
>+                                    gl::TextureType type,
>+                                    egl::Image *image) override;
>+
>+    angle::Result getRenderTarget(const gl::Context *context,
>+                                  const gl::ImageIndex &index,
>+                                  RenderTargetD3D **outRT) override;
>+
>+    gl::ImageIndexIterator imageIterator() const override;
>+    gl::ImageIndex getImageIndex(GLint mip, GLint layer) const override;
>+    bool isValidIndex(const gl::ImageIndex &index) const override;
>+
>+    GLsizei getLayerCount(int level) const override;
>+
>+  protected:
>+    void markAllImagesDirty() override;
>+
>+    angle::Result setCompleteTexStorage(const gl::Context *context,
>+                                        TextureStorage *newCompleteTexStorage) override;
>+
>+    angle::Result updateStorage(const gl::Context *context) override;
>+
>+  private:
>+    angle::Result initializeStorage(const gl::Context *context, bool renderTarget) override;
>+    angle::Result createCompleteStorage(bool renderTarget,
>+                                        TexStoragePointer *outTexStorage) const override;
>+    angle::Result initMipmapImages(const gl::Context *context) override;
> 
>     bool isImageComplete(const gl::ImageIndex &index) const override;
>+
>+    GLsizei mLayerCount;
> };
>-}
>+}  // namespace rx
> 
>-#endif // LIBANGLE_RENDERER_D3D_TEXTURED3D_H_
>+#endif  // LIBANGLE_RENDERER_D3D_TEXTURED3D_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/TextureStorage.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/TextureStorage.h
>index 383fbc21416..708ab565505 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/TextureStorage.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/TextureStorage.h
>@@ -18,11 +18,16 @@
> namespace gl
> {
> class Context;
>-struct ImageIndex;
>+class ImageIndex;
> struct Box;
> struct PixelUnpackState;
> }  // namespace gl
> 
>+namespace angle
>+{
>+class Subject;
>+}  // namespace angle
>+
> namespace rx
> {
> class SwapChainD3D;
>@@ -35,48 +40,55 @@ class TextureStorage : angle::NonCopyable
>     TextureStorage() {}
>     virtual ~TextureStorage() {}
> 
>-    virtual gl::Error onDestroy(const gl::Context *context);
>+    virtual angle::Result onDestroy(const gl::Context *context);
> 
>-    virtual int getTopLevel() const = 0;
>-    virtual bool isRenderTarget() const = 0;
>-    virtual bool isManaged() const = 0;
>+    virtual int getTopLevel() const                   = 0;
>+    virtual bool isRenderTarget() const               = 0;
>+    virtual bool isManaged() const                    = 0;
>     virtual bool supportsNativeMipmapFunction() const = 0;
>-    virtual int getLevelCount() const = 0;
>-
>-    virtual gl::Error getRenderTarget(const gl::Context *context,
>-                                      const gl::ImageIndex &index,
>-                                      RenderTargetD3D **outRT) = 0;
>-    virtual gl::Error generateMipmap(const gl::Context *context,
>-                                     const gl::ImageIndex &sourceIndex,
>-                                     const gl::ImageIndex &destIndex) = 0;
>-
>-    virtual gl::Error copyToStorage(const gl::Context *context, TextureStorage *destStorage) = 0;
>-    virtual gl::Error setData(const gl::Context *context,
>-                              const gl::ImageIndex &index,
>-                              ImageD3D *image,
>-                              const gl::Box *destBox,
>-                              GLenum type,
>-                              const gl::PixelUnpackState &unpack,
>-                              const uint8_t *pixelData) = 0;
>-
>-    // This is a no-op for most implementations of TextureStorage. Some (e.g. TextureStorage11_2D) might override it.
>-    virtual gl::Error useLevelZeroWorkaroundTexture(const gl::Context *context,
>-                                                    bool useLevelZeroTexture);
>+    virtual int getLevelCount() const                 = 0;
>+
>+    virtual angle::Result getRenderTarget(const gl::Context *context,
>+                                          const gl::ImageIndex &index,
>+                                          RenderTargetD3D **outRT)        = 0;
>+    virtual angle::Result generateMipmap(const gl::Context *context,
>+                                         const gl::ImageIndex &sourceIndex,
>+                                         const gl::ImageIndex &destIndex) = 0;
>+
>+    virtual angle::Result copyToStorage(const gl::Context *context,
>+                                        TextureStorage *destStorage) = 0;
>+    virtual angle::Result setData(const gl::Context *context,
>+                                  const gl::ImageIndex &index,
>+                                  ImageD3D *image,
>+                                  const gl::Box *destBox,
>+                                  GLenum type,
>+                                  const gl::PixelUnpackState &unpack,
>+                                  const uint8_t *pixelData)          = 0;
>+
>+    // This is a no-op for most implementations of TextureStorage. Some (e.g. TextureStorage11_2D)
>+    // might override it.
>+    virtual angle::Result useLevelZeroWorkaroundTexture(const gl::Context *context,
>+                                                        bool useLevelZeroTexture);
>+
>+    virtual void invalidateTextures() {}
>+
>+  protected:
>+    const angle::Subject *mSubject;
> };
> 
>-inline gl::Error TextureStorage::onDestroy(const gl::Context *context)
>+inline angle::Result TextureStorage::onDestroy(const gl::Context *context)
> {
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-inline gl::Error TextureStorage::useLevelZeroWorkaroundTexture(const gl::Context *context,
>-                                                               bool useLevelZeroTexture)
>+inline angle::Result TextureStorage::useLevelZeroWorkaroundTexture(const gl::Context *context,
>+                                                                   bool useLevelZeroTexture)
> {
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
> using TexStoragePointer = angle::UniqueObjectPointer<TextureStorage, gl::Context>;
> 
> }  // namespace rx
> 
>-#endif // LIBANGLE_RENDERER_D3D_TEXTURESTORAGE_H_
>+#endif  // LIBANGLE_RENDERER_D3D_TEXTURESTORAGE_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/VertexBuffer.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/VertexBuffer.cpp
>index 7c2d5aec705..78dd75bf962 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/VertexBuffer.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/VertexBuffer.cpp
>@@ -10,9 +10,10 @@
> #include "libANGLE/renderer/d3d/VertexBuffer.h"
> 
> #include "common/mathutil.h"
>-#include "libANGLE/renderer/d3d/BufferD3D.h"
>-#include "libANGLE/renderer/d3d/RendererD3D.h"
>+#include "libANGLE/Context.h"
> #include "libANGLE/VertexAttribute.h"
>+#include "libANGLE/renderer/d3d/BufferD3D.h"
>+#include "libANGLE/renderer/d3d/ContextD3D.h"
> 
> namespace rx
> {
>@@ -25,9 +26,7 @@ VertexBuffer::VertexBuffer() : mRefCount(1)
>     updateSerial();
> }
> 
>-VertexBuffer::~VertexBuffer()
>-{
>-}
>+VertexBuffer::~VertexBuffer() {}
> 
> void VertexBuffer::updateSerial()
> {
>@@ -58,125 +57,136 @@ void VertexBuffer::release()
> // VertexBufferInterface Implementation
> VertexBufferInterface::VertexBufferInterface(BufferFactoryD3D *factory, bool dynamic)
>     : mFactory(factory), mVertexBuffer(factory->createVertexBuffer()), mDynamic(dynamic)
>-{
>-}
>+{}
> 
> VertexBufferInterface::~VertexBufferInterface()
> {
>     if (mVertexBuffer)
>     {
>         mVertexBuffer->release();
>+        mVertexBuffer = nullptr;
>     }
> }
> 
> unsigned int VertexBufferInterface::getSerial() const
> {
>+    ASSERT(mVertexBuffer);
>     return mVertexBuffer->getSerial();
> }
> 
> unsigned int VertexBufferInterface::getBufferSize() const
> {
>+    ASSERT(mVertexBuffer);
>     return mVertexBuffer->getBufferSize();
> }
> 
>-gl::Error VertexBufferInterface::setBufferSize(unsigned int size)
>+angle::Result VertexBufferInterface::setBufferSize(const gl::Context *context, unsigned int size)
> {
>+    ASSERT(mVertexBuffer);
>     if (mVertexBuffer->getBufferSize() == 0)
>     {
>-        return mVertexBuffer->initialize(size, mDynamic);
>+        return mVertexBuffer->initialize(context, size, mDynamic);
>     }
> 
>-    return mVertexBuffer->setBufferSize(size);
>+    return mVertexBuffer->setBufferSize(context, size);
> }
> 
>-gl::ErrorOrResult<unsigned int> VertexBufferInterface::getSpaceRequired(
>-    const gl::VertexAttribute &attrib,
>-    const gl::VertexBinding &binding,
>-    GLsizei count,
>-    GLsizei instances) const
>+angle::Result VertexBufferInterface::getSpaceRequired(const gl::Context *context,
>+                                                      const gl::VertexAttribute &attrib,
>+                                                      const gl::VertexBinding &binding,
>+                                                      size_t count,
>+                                                      GLsizei instances,
>+                                                      unsigned int *spaceInBytesOut) const
> {
>     unsigned int spaceRequired = 0;
>-    ANGLE_TRY_RESULT(mFactory->getVertexSpaceRequired(attrib, binding, count, instances),
>-                     spaceRequired);
>+    ANGLE_TRY(mFactory->getVertexSpaceRequired(context, attrib, binding, count, instances,
>+                                               &spaceRequired));
> 
>     // Align to 16-byte boundary
>     unsigned int alignedSpaceRequired = roundUp(spaceRequired, 16u);
>+    ANGLE_CHECK_GL_ALLOC(GetImplAs<ContextD3D>(context), alignedSpaceRequired >= spaceRequired);
> 
>-    if (alignedSpaceRequired < spaceRequired)
>-    {
>-        return gl::OutOfMemory()
>-               << "Vertex buffer overflow in VertexBufferInterface::getSpaceRequired.";
>-    }
>-
>-    return alignedSpaceRequired;
>+    *spaceInBytesOut = alignedSpaceRequired;
>+    return angle::Result::Continue;
> }
> 
>-gl::Error VertexBufferInterface::discard()
>+angle::Result VertexBufferInterface::discard(const gl::Context *context)
> {
>-    return mVertexBuffer->discard();
>+    ASSERT(mVertexBuffer);
>+    return mVertexBuffer->discard(context);
> }
> 
> VertexBuffer *VertexBufferInterface::getVertexBuffer() const
> {
>+    ASSERT(mVertexBuffer);
>     return mVertexBuffer;
> }
> 
> // StreamingVertexBufferInterface Implementation
>-StreamingVertexBufferInterface::StreamingVertexBufferInterface(BufferFactoryD3D *factory,
>-                                                               std::size_t initialSize)
>+StreamingVertexBufferInterface::StreamingVertexBufferInterface(BufferFactoryD3D *factory)
>     : VertexBufferInterface(factory, true), mWritePosition(0), mReservedSpace(0)
>+{}
>+
>+angle::Result StreamingVertexBufferInterface::initialize(const gl::Context *context,
>+                                                         std::size_t initialSize)
> {
>-    // TODO(jmadill): Make an initialize method that can return an error.
>-    ANGLE_SWALLOW_ERR(setBufferSize(static_cast<unsigned int>(initialSize)));
>+    return setBufferSize(context, static_cast<unsigned int>(initialSize));
> }
> 
>-StreamingVertexBufferInterface::~StreamingVertexBufferInterface()
>+void StreamingVertexBufferInterface::reset()
> {
>+    if (mVertexBuffer)
>+    {
>+        mVertexBuffer->release();
>+        mVertexBuffer = mFactory->createVertexBuffer();
>+    }
> }
> 
>-gl::Error StreamingVertexBufferInterface::reserveSpace(unsigned int size)
>+StreamingVertexBufferInterface::~StreamingVertexBufferInterface() {}
>+
>+angle::Result StreamingVertexBufferInterface::reserveSpace(const gl::Context *context,
>+                                                           unsigned int size)
> {
>     unsigned int curBufferSize = getBufferSize();
>     if (size > curBufferSize)
>     {
>-        ANGLE_TRY(setBufferSize(std::max(size, 3 * curBufferSize / 2)));
>+        ANGLE_TRY(setBufferSize(context, std::max(size, 3 * curBufferSize / 2)));
>         mWritePosition = 0;
>     }
>     else if (mWritePosition + size > curBufferSize)
>     {
>-        ANGLE_TRY(discard());
>+        ANGLE_TRY(discard(context));
>         mWritePosition = 0;
>     }
> 
>-    return gl::NoError();
>+    mReservedSpace = size;
>+    return angle::Result::Continue;
> }
> 
>-gl::Error StreamingVertexBufferInterface::storeDynamicAttribute(const gl::VertexAttribute &attrib,
>-                                                                const gl::VertexBinding &binding,
>-                                                                GLenum currentValueType,
>-                                                                GLint start,
>-                                                                GLsizei count,
>-                                                                GLsizei instances,
>-                                                                unsigned int *outStreamOffset,
>-                                                                const uint8_t *sourceData)
>+angle::Result StreamingVertexBufferInterface::storeDynamicAttribute(
>+    const gl::Context *context,
>+    const gl::VertexAttribute &attrib,
>+    const gl::VertexBinding &binding,
>+    gl::VertexAttribType currentValueType,
>+    GLint start,
>+    size_t count,
>+    GLsizei instances,
>+    unsigned int *outStreamOffset,
>+    const uint8_t *sourceData)
> {
>     unsigned int spaceRequired = 0;
>-    ANGLE_TRY_RESULT(getSpaceRequired(attrib, binding, count, instances), spaceRequired);
>+    ANGLE_TRY(getSpaceRequired(context, attrib, binding, count, instances, &spaceRequired));
> 
>     // Protect against integer overflow
>     angle::CheckedNumeric<unsigned int> checkedPosition(mWritePosition);
>     checkedPosition += spaceRequired;
>-    if (!checkedPosition.IsValid())
>-    {
>-        return gl::OutOfMemory()
>-               << "Internal error, new vertex buffer write position would overflow.";
>-    }
>+    ANGLE_CHECK_GL_ALLOC(GetImplAs<ContextD3D>(context), checkedPosition.IsValid());
> 
>-    ANGLE_TRY(reserveSpace(mReservedSpace));
>     mReservedSpace = 0;
> 
>-    ANGLE_TRY(mVertexBuffer->storeVertexAttributes(attrib, binding, currentValueType, start, count,
>-                                                   instances, mWritePosition, sourceData));
>+    ANGLE_TRY(mVertexBuffer->storeVertexAttributes(context, attrib, binding, currentValueType,
>+                                                   start, count, instances, mWritePosition,
>+                                                   sourceData));
> 
>     if (outStreamOffset)
>     {
>@@ -185,40 +195,40 @@ gl::Error StreamingVertexBufferInterface::storeDynamicAttribute(const gl::Vertex
> 
>     mWritePosition += spaceRequired;
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error StreamingVertexBufferInterface::reserveVertexSpace(const gl::VertexAttribute &attrib,
>-                                                             const gl::VertexBinding &binding,
>-                                                             GLsizei count,
>-                                                             GLsizei instances)
>+angle::Result StreamingVertexBufferInterface::reserveVertexSpace(const gl::Context *context,
>+                                                                 const gl::VertexAttribute &attrib,
>+                                                                 const gl::VertexBinding &binding,
>+                                                                 size_t count,
>+                                                                 GLsizei instances)
> {
>     unsigned int requiredSpace = 0;
>-    ANGLE_TRY_RESULT(mFactory->getVertexSpaceRequired(attrib, binding, count, instances),
>-                     requiredSpace);
>+    ANGLE_TRY(mFactory->getVertexSpaceRequired(context, attrib, binding, count, instances,
>+                                               &requiredSpace));
> 
>     // Align to 16-byte boundary
>     auto alignedRequiredSpace = rx::CheckedRoundUp(requiredSpace, 16u);
>     alignedRequiredSpace += mReservedSpace;
> 
>     // Protect against integer overflow
>-    if (!alignedRequiredSpace.IsValid())
>-    {
>-        return gl::OutOfMemory()
>-               << "Unable to reserve " << requiredSpace
>-               << " extra bytes in internal vertex buffer, it would result in an overflow.";
>-    }
>+    ANGLE_CHECK_GL_ALLOC(GetImplAs<ContextD3D>(context), alignedRequiredSpace.IsValid());
> 
>-    mReservedSpace = alignedRequiredSpace.ValueOrDie();
>+    ANGLE_TRY(reserveSpace(context, alignedRequiredSpace.ValueOrDie()));
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
> // StaticVertexBufferInterface Implementation
> StaticVertexBufferInterface::AttributeSignature::AttributeSignature()
>-    : type(GL_NONE), size(0), stride(0), normalized(false), pureInteger(false), offset(0)
>-{
>-}
>+    : type(gl::VertexAttribType::InvalidEnum),
>+      size(0),
>+      stride(0),
>+      normalized(false),
>+      pureInteger(false),
>+      offset(0)
>+{}
> 
> bool StaticVertexBufferInterface::AttributeSignature::matchesAttribute(
>     const gl::VertexAttribute &attrib,
>@@ -251,12 +261,9 @@ void StaticVertexBufferInterface::AttributeSignature::set(const gl::VertexAttrib
> 
> StaticVertexBufferInterface::StaticVertexBufferInterface(BufferFactoryD3D *factory)
>     : VertexBufferInterface(factory, false)
>-{
>-}
>+{}
> 
>-StaticVertexBufferInterface::~StaticVertexBufferInterface()
>-{
>-}
>+StaticVertexBufferInterface::~StaticVertexBufferInterface() {}
> 
> bool StaticVertexBufferInterface::matchesAttribute(const gl::VertexAttribute &attrib,
>                                                    const gl::VertexBinding &binding) const
>@@ -270,24 +277,26 @@ void StaticVertexBufferInterface::setAttribute(const gl::VertexAttribute &attrib
>     return mSignature.set(attrib, binding);
> }
> 
>-gl::Error StaticVertexBufferInterface::storeStaticAttribute(const gl::VertexAttribute &attrib,
>-                                                            const gl::VertexBinding &binding,
>-                                                            GLint start,
>-                                                            GLsizei count,
>-                                                            GLsizei instances,
>-                                                            const uint8_t *sourceData)
>+angle::Result StaticVertexBufferInterface::storeStaticAttribute(const gl::Context *context,
>+                                                                const gl::VertexAttribute &attrib,
>+                                                                const gl::VertexBinding &binding,
>+                                                                GLint start,
>+                                                                GLsizei count,
>+                                                                GLsizei instances,
>+                                                                const uint8_t *sourceData)
> {
>     unsigned int spaceRequired = 0;
>-    ANGLE_TRY_RESULT(getSpaceRequired(attrib, binding, count, instances), spaceRequired);
>-    ANGLE_TRY(setBufferSize(spaceRequired));
>+    ANGLE_TRY(getSpaceRequired(context, attrib, binding, count, instances, &spaceRequired));
>+    ANGLE_TRY(setBufferSize(context, spaceRequired));
> 
>     ASSERT(attrib.enabled);
>-    ANGLE_TRY(mVertexBuffer->storeVertexAttributes(attrib, binding, GL_NONE, start, count,
>+    ANGLE_TRY(mVertexBuffer->storeVertexAttributes(context, attrib, binding,
>+                                                   gl::VertexAttribType::InvalidEnum, start, count,
>                                                    instances, 0, sourceData));
> 
>     mSignature.set(attrib, binding);
>     mVertexBuffer->hintUnmapResource();
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
> }  // namespace rx
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/VertexBuffer.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/VertexBuffer.h
>index df8085d3cbd..2b91b9f3d59 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/VertexBuffer.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/VertexBuffer.h
>@@ -10,6 +10,7 @@
> #ifndef LIBANGLE_RENDERER_D3D_VERTEXBUFFER_H_
> #define LIBANGLE_RENDERER_D3D_VERTEXBUFFER_H_
> 
>+#include "common/PackedEnums.h"
> #include "common/angleutils.h"
> #include "libANGLE/Error.h"
> 
>@@ -21,10 +22,11 @@
> 
> namespace gl
> {
>+class Context;
> struct VertexAttribute;
> class VertexBinding;
> struct VertexAttribCurrentValueData;
>-}
>+}  // namespace gl
> 
> namespace rx
> {
>@@ -37,27 +39,30 @@ class VertexBuffer : angle::NonCopyable
>   public:
>     VertexBuffer();
> 
>-    virtual gl::Error initialize(unsigned int size, bool dynamicUsage) = 0;
>+    virtual angle::Result initialize(const gl::Context *context,
>+                                     unsigned int size,
>+                                     bool dynamicUsage) = 0;
> 
>     // Warning: you should ensure binding really matches attrib.bindingIndex before using this
>     // function.
>-    virtual gl::Error storeVertexAttributes(const gl::VertexAttribute &attrib,
>-                                            const gl::VertexBinding &binding,
>-                                            GLenum currentValueType,
>-                                            GLint start,
>-                                            GLsizei count,
>-                                            GLsizei instances,
>-                                            unsigned int offset,
>-                                            const uint8_t *sourceData) = 0;
>-
>-    virtual unsigned int getBufferSize() const = 0;
>-    virtual gl::Error setBufferSize(unsigned int size) = 0;
>-    virtual gl::Error discard() = 0;
>+    virtual angle::Result storeVertexAttributes(const gl::Context *context,
>+                                                const gl::VertexAttribute &attrib,
>+                                                const gl::VertexBinding &binding,
>+                                                gl::VertexAttribType currentValueType,
>+                                                GLint start,
>+                                                size_t count,
>+                                                GLsizei instances,
>+                                                unsigned int offset,
>+                                                const uint8_t *sourceData) = 0;
>+
>+    virtual unsigned int getBufferSize() const                                         = 0;
>+    virtual angle::Result setBufferSize(const gl::Context *context, unsigned int size) = 0;
>+    virtual angle::Result discard(const gl::Context *context)                          = 0;
> 
>     unsigned int getSerial() const;
> 
>     // This may be overridden (e.g. by VertexBuffer11) if necessary.
>-    virtual void hintUnmapResource() { };
>+    virtual void hintUnmapResource() {}
> 
>     // Reference counting.
>     void addRef();
>@@ -87,14 +92,16 @@ class VertexBufferInterface : angle::NonCopyable
>     VertexBuffer *getVertexBuffer() const;
> 
>   protected:
>-    gl::Error discard();
>+    angle::Result discard(const gl::Context *context);
> 
>-    gl::Error setBufferSize(unsigned int size);
>+    angle::Result setBufferSize(const gl::Context *context, unsigned int size);
> 
>-    gl::ErrorOrResult<unsigned int> getSpaceRequired(const gl::VertexAttribute &attrib,
>-                                                     const gl::VertexBinding &binding,
>-                                                     GLsizei count,
>-                                                     GLsizei instances) const;
>+    angle::Result getSpaceRequired(const gl::Context *context,
>+                                   const gl::VertexAttribute &attrib,
>+                                   const gl::VertexBinding &binding,
>+                                   size_t count,
>+                                   GLsizei instances,
>+                                   unsigned int *spaceInBytesOut) const;
>     BufferFactoryD3D *const mFactory;
>     VertexBuffer *mVertexBuffer;
>     bool mDynamic;
>@@ -103,25 +110,30 @@ class VertexBufferInterface : angle::NonCopyable
> class StreamingVertexBufferInterface : public VertexBufferInterface
> {
>   public:
>-    StreamingVertexBufferInterface(BufferFactoryD3D *factory, std::size_t initialSize);
>+    StreamingVertexBufferInterface(BufferFactoryD3D *factory);
>     ~StreamingVertexBufferInterface() override;
> 
>-    gl::Error storeDynamicAttribute(const gl::VertexAttribute &attrib,
>-                                    const gl::VertexBinding &binding,
>-                                    GLenum currentValueType,
>-                                    GLint start,
>-                                    GLsizei count,
>-                                    GLsizei instances,
>-                                    unsigned int *outStreamOffset,
>-                                    const uint8_t *sourceData);
>-
>-    gl::Error reserveVertexSpace(const gl::VertexAttribute &attribute,
>-                                 const gl::VertexBinding &binding,
>-                                 GLsizei count,
>-                                 GLsizei instances);
>+    angle::Result initialize(const gl::Context *context, std::size_t initialSize);
>+    void reset();
>+
>+    angle::Result storeDynamicAttribute(const gl::Context *context,
>+                                        const gl::VertexAttribute &attrib,
>+                                        const gl::VertexBinding &binding,
>+                                        gl::VertexAttribType currentValueType,
>+                                        GLint start,
>+                                        size_t count,
>+                                        GLsizei instances,
>+                                        unsigned int *outStreamOffset,
>+                                        const uint8_t *sourceData);
>+
>+    angle::Result reserveVertexSpace(const gl::Context *context,
>+                                     const gl::VertexAttribute &attribute,
>+                                     const gl::VertexBinding &binding,
>+                                     size_t count,
>+                                     GLsizei instances);
> 
>   private:
>-    gl::Error reserveSpace(unsigned int size);
>+    angle::Result reserveSpace(const gl::Context *context, unsigned int size);
> 
>     unsigned int mWritePosition;
>     unsigned int mReservedSpace;
>@@ -135,12 +147,13 @@ class StaticVertexBufferInterface : public VertexBufferInterface
> 
>     // Warning: you should ensure binding really matches attrib.bindingIndex before using these
>     // functions.
>-    gl::Error storeStaticAttribute(const gl::VertexAttribute &attrib,
>-                                   const gl::VertexBinding &binding,
>-                                   GLint start,
>-                                   GLsizei count,
>-                                   GLsizei instances,
>-                                   const uint8_t *sourceData);
>+    angle::Result storeStaticAttribute(const gl::Context *context,
>+                                       const gl::VertexAttribute &attrib,
>+                                       const gl::VertexBinding &binding,
>+                                       GLint start,
>+                                       GLsizei count,
>+                                       GLsizei instances,
>+                                       const uint8_t *sourceData);
> 
>     bool matchesAttribute(const gl::VertexAttribute &attribute,
>                           const gl::VertexBinding &binding) const;
>@@ -159,7 +172,7 @@ class StaticVertexBufferInterface : public VertexBufferInterface
>         void set(const gl::VertexAttribute &attrib, const gl::VertexBinding &binding);
> 
>       private:
>-        GLenum type;
>+        gl::VertexAttribType type;
>         GLuint size;
>         GLuint stride;
>         bool normalized;
>@@ -172,4 +185,4 @@ class StaticVertexBufferInterface : public VertexBufferInterface
> 
> }  // namespace rx
> 
>-#endif // LIBANGLE_RENDERER_D3D_VERTEXBUFFER_H_
>+#endif  // LIBANGLE_RENDERER_D3D_VERTEXBUFFER_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/VertexDataManager.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/VertexDataManager.cpp
>index 54ad5e54f5b..227484a5426 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/VertexDataManager.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/VertexDataManager.cpp
>@@ -18,7 +18,7 @@
> #include "libANGLE/VertexAttribute.h"
> #include "libANGLE/formatutils.h"
> #include "libANGLE/renderer/d3d/BufferD3D.h"
>-#include "libANGLE/renderer/d3d/RendererD3D.h"
>+#include "libANGLE/renderer/d3d/ContextD3D.h"
> #include "libANGLE/renderer/d3d/VertexBuffer.h"
> 
> using namespace angle;
>@@ -37,7 +37,23 @@ enum
>     CONSTANT_VERTEX_BUFFER_SIZE = 4096
> };
> 
>-// Warning: you should ensure binding really matches attrib.bindingIndex before using this function.
>+// Warning: ensure the binding matches attrib.bindingIndex before using these functions.
>+int64_t GetMaxAttributeByteOffsetForDraw(const gl::VertexAttribute &attrib,
>+                                         const gl::VertexBinding &binding,
>+                                         int64_t elementCount)
>+{
>+    CheckedNumeric<int64_t> stride = ComputeVertexAttributeStride(attrib, binding);
>+    CheckedNumeric<int64_t> offset = ComputeVertexAttributeOffset(attrib, binding);
>+    CheckedNumeric<int64_t> size   = ComputeVertexAttributeTypeSize(attrib);
>+
>+    ASSERT(elementCount > 0);
>+
>+    CheckedNumeric<int64_t> result =
>+        stride * (CheckedNumeric<int64_t>(elementCount) - 1) + size + offset;
>+    return result.ValueOrDefault(std::numeric_limits<int64_t>::max());
>+}
>+
>+// Warning: ensure the binding matches attrib.bindingIndex before using these functions.
> int ElementsInBuffer(const gl::VertexAttribute &attrib,
>                      const gl::VertexBinding &binding,
>                      unsigned int size)
>@@ -56,7 +72,9 @@ int ElementsInBuffer(const gl::VertexAttribute &attrib,
> }
> 
> // Warning: you should ensure binding really matches attrib.bindingIndex before using this function.
>-bool DirectStoragePossible(const gl::VertexAttribute &attrib, const gl::VertexBinding &binding)
>+bool DirectStoragePossible(const gl::Context *context,
>+                           const gl::VertexAttribute &attrib,
>+                           const gl::VertexBinding &binding)
> {
>     // Current value attribs may not use direct storage.
>     if (!attrib.enabled)
>@@ -84,24 +102,21 @@ bool DirectStoragePossible(const gl::VertexAttribute &attrib, const gl::VertexBi
>     // TODO(jmadill): add VertexFormatCaps
>     BufferFactoryD3D *factory = bufferD3D->getFactory();
> 
>-    gl::VertexFormatType vertexFormatType = gl::GetVertexFormatType(attrib);
>+    angle::FormatID vertexFormatID = gl::GetVertexFormatID(attrib);
> 
>     // CPU-converted vertex data must be converted (naturally).
>-    if ((factory->getVertexConversionType(vertexFormatType) & VERTEX_CONVERT_CPU) != 0)
>+    if ((factory->getVertexConversionType(vertexFormatID) & VERTEX_CONVERT_CPU) != 0)
>     {
>         return false;
>     }
> 
>-    if (attrib.type != GL_FLOAT)
>+    if (attrib.type != gl::VertexAttribType::Float)
>     {
>-        auto errorOrElementSize = factory->getVertexSpaceRequired(attrib, binding, 1, 0);
>-        if (errorOrElementSize.isError())
>-        {
>-            ERR() << "Unlogged error in DirectStoragePossible.";
>-            return false;
>-        }
>-
>-        alignment = std::min<size_t>(errorOrElementSize.getResult(), 4);
>+        unsigned int elementSize = 0;
>+        angle::Result error =
>+            factory->getVertexSpaceRequired(context, attrib, binding, 1, 0, &elementSize);
>+        ASSERT(error == angle::Result::Continue);
>+        alignment = std::min<size_t>(elementSize, 4);
>     }
> 
>     GLintptr offset = ComputeVertexAttributeOffset(attrib, binding);
>@@ -115,7 +130,7 @@ TranslatedAttribute::TranslatedAttribute()
>     : active(false),
>       attribute(nullptr),
>       binding(nullptr),
>-      currentValueType(GL_NONE),
>+      currentValueType(gl::VertexAttribType::InvalidEnum),
>       baseOffset(0),
>       usesFirstVertexOffset(false),
>       stride(0),
>@@ -123,27 +138,32 @@ TranslatedAttribute::TranslatedAttribute()
>       storage(nullptr),
>       serial(0),
>       divisor(0)
>-{
>-}
>+{}
> 
> TranslatedAttribute::TranslatedAttribute(const TranslatedAttribute &other) = default;
> 
>-gl::ErrorOrResult<unsigned int> TranslatedAttribute::computeOffset(GLint startVertex) const
>+angle::Result TranslatedAttribute::computeOffset(const gl::Context *context,
>+                                                 GLint startVertex,
>+                                                 unsigned int *offsetOut) const
> {
>     if (!usesFirstVertexOffset)
>     {
>-        return baseOffset;
>+        *offsetOut = baseOffset;
>+        return angle::Result::Continue;
>     }
> 
>-    CheckedNumeric<unsigned int> offset;
>+    CheckedNumeric<unsigned int> offset(baseOffset);
>+    CheckedNumeric<unsigned int> checkedStride(stride);
> 
>-    offset = baseOffset + stride * static_cast<unsigned int>(startVertex);
>-    ANGLE_TRY_CHECKED_MATH(offset);
>-    return offset.ValueOrDie();
>+    offset += checkedStride * static_cast<unsigned int>(startVertex);
>+    ANGLE_CHECK_GL_MATH(GetImplAs<ContextD3D>(context), offset.IsValid());
>+    *offsetOut = offset.ValueOrDie();
>+    return angle::Result::Continue;
> }
> 
> // Warning: you should ensure binding really matches attrib.bindingIndex before using this function.
>-VertexStorageType ClassifyAttributeStorage(const gl::VertexAttribute &attrib,
>+VertexStorageType ClassifyAttributeStorage(const gl::Context *context,
>+                                           const gl::VertexAttribute &attrib,
>                                            const gl::VertexBinding &binding)
> {
>     // If attribute is disabled, we use the current value.
>@@ -153,14 +173,14 @@ VertexStorageType ClassifyAttributeStorage(const gl::VertexAttribute &attrib,
>     }
> 
>     // If specified with immediate data, we must use dynamic storage.
>-    auto *buffer = binding.getBuffer().get();
>+    gl::Buffer *buffer = binding.getBuffer().get();
>     if (!buffer)
>     {
>         return VertexStorageType::DYNAMIC;
>     }
> 
>     // Check if the buffer supports direct storage.
>-    if (DirectStoragePossible(attrib, binding))
>+    if (DirectStoragePossible(context, attrib, binding))
>     {
>         return VertexStorageType::DIRECT;
>     }
>@@ -180,38 +200,39 @@ VertexStorageType ClassifyAttributeStorage(const gl::VertexAttribute &attrib,
>     }
> }
> 
>-VertexDataManager::CurrentValueState::CurrentValueState() : buffer(), offset(0)
>+VertexDataManager::CurrentValueState::CurrentValueState(BufferFactoryD3D *factory)
>+    : buffer(new StreamingVertexBufferInterface(factory)), offset(0)
> {
>     data.FloatValues[0] = std::numeric_limits<float>::quiet_NaN();
>     data.FloatValues[1] = std::numeric_limits<float>::quiet_NaN();
>     data.FloatValues[2] = std::numeric_limits<float>::quiet_NaN();
>     data.FloatValues[3] = std::numeric_limits<float>::quiet_NaN();
>-    data.Type = GL_FLOAT;
>+    data.Type           = gl::VertexAttribType::Float;
> }
> 
>-VertexDataManager::CurrentValueState::~CurrentValueState()
>+VertexDataManager::CurrentValueState::CurrentValueState(CurrentValueState &&other)
> {
>+    std::swap(buffer, other.buffer);
>+    std::swap(data, other.data);
>+    std::swap(offset, other.offset);
> }
> 
>+VertexDataManager::CurrentValueState::~CurrentValueState() {}
>+
> VertexDataManager::VertexDataManager(BufferFactoryD3D *factory)
>-    : mFactory(factory), mStreamingBuffer(), mCurrentValueCache(gl::MAX_VERTEX_ATTRIBS)
>+    : mFactory(factory), mStreamingBuffer(factory)
> {
>+    for (int currentValueIndex = 0; currentValueIndex < gl::MAX_VERTEX_ATTRIBS; ++currentValueIndex)
>+    {
>+        mCurrentValueCache.emplace_back(factory);
>+    }
> }
> 
>-VertexDataManager::~VertexDataManager()
>-{
>-}
>+VertexDataManager::~VertexDataManager() {}
> 
>-gl::Error VertexDataManager::initialize()
>+angle::Result VertexDataManager::initialize(const gl::Context *context)
> {
>-    mStreamingBuffer.reset(
>-        new StreamingVertexBufferInterface(mFactory, INITIAL_STREAM_BUFFER_SIZE));
>-    if (!mStreamingBuffer)
>-    {
>-        return gl::OutOfMemory() << "Failed to allocate the streaming vertex buffer.";
>-    }
>-
>-    return gl::NoError();
>+    return mStreamingBuffer.initialize(context, INITIAL_STREAM_BUFFER_SIZE);
> }
> 
> void VertexDataManager::deinitialize()
>@@ -220,15 +241,14 @@ void VertexDataManager::deinitialize()
>     mCurrentValueCache.clear();
> }
> 
>-gl::Error VertexDataManager::prepareVertexData(const gl::Context *context,
>-                                               GLint start,
>-                                               GLsizei count,
>-                                               std::vector<TranslatedAttribute> *translatedAttribs,
>-                                               GLsizei instances)
>+angle::Result VertexDataManager::prepareVertexData(
>+    const gl::Context *context,
>+    GLint start,
>+    GLsizei count,
>+    std::vector<TranslatedAttribute> *translatedAttribs,
>+    GLsizei instances)
> {
>-    ASSERT(mStreamingBuffer);
>-
>-    const gl::State &state             = context->getGLState();
>+    const gl::State &state             = context->getState();
>     const gl::VertexArray *vertexArray = state.getVertexArray();
>     const auto &vertexAttributes       = vertexArray->getVertexAttributes();
>     const auto &vertexBindings         = vertexArray->getVertexBindings();
>@@ -244,7 +264,7 @@ gl::Error VertexDataManager::prepareVertexData(const gl::Context *context,
>         if (!program->isAttribLocationActive(attribIndex))
>             continue;
> 
>-        const auto &attrib = vertexAttributes[attribIndex];
>+        const auto &attrib  = vertexAttributes[attribIndex];
>         const auto &binding = vertexBindings[attrib.bindingIndex];
> 
>         // Resize automatically puts in empty attribs
>@@ -260,7 +280,7 @@ gl::Error VertexDataManager::prepareVertexData(const gl::Context *context,
>         translated->currentValueType = currentValueData.Type;
>         translated->divisor          = binding.getDivisor();
> 
>-        switch (ClassifyAttributeStorage(attrib, binding))
>+        switch (ClassifyAttributeStorage(context, attrib, binding))
>         {
>             case VertexStorageType::STATIC:
>             {
>@@ -274,11 +294,11 @@ gl::Error VertexDataManager::prepareVertexData(const gl::Context *context,
>                 break;
>             case VertexStorageType::DIRECT:
>                 // Update translated data for direct attributes.
>-                StoreDirectAttrib(translated);
>+                StoreDirectAttrib(context, translated);
>                 break;
>             case VertexStorageType::CURRENT_VALUE:
>             {
>-                ANGLE_TRY(storeCurrentValue(currentValueData, translated, attribIndex));
>+                ANGLE_TRY(storeCurrentValue(context, currentValueData, translated, attribIndex));
>                 break;
>             }
>             default:
>@@ -289,7 +309,7 @@ gl::Error VertexDataManager::prepareVertexData(const gl::Context *context,
> 
>     if (mDynamicAttribsMaskCache.none())
>     {
>-        return gl::NoError();
>+        return angle::Result::Continue;
>     }
> 
>     ANGLE_TRY(storeDynamicAttribs(context, translatedAttribs, mDynamicAttribsMaskCache, start,
>@@ -297,21 +317,22 @@ gl::Error VertexDataManager::prepareVertexData(const gl::Context *context,
> 
>     PromoteDynamicAttribs(context, *translatedAttribs, mDynamicAttribsMaskCache, count);
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
> // static
>-void VertexDataManager::StoreDirectAttrib(TranslatedAttribute *directAttrib)
>+void VertexDataManager::StoreDirectAttrib(const gl::Context *context,
>+                                          TranslatedAttribute *directAttrib)
> {
>     ASSERT(directAttrib->attribute && directAttrib->binding);
>     const auto &attrib  = *directAttrib->attribute;
>     const auto &binding = *directAttrib->binding;
> 
>-    gl::Buffer *buffer   = binding.getBuffer().get();
>+    gl::Buffer *buffer = binding.getBuffer().get();
>     ASSERT(buffer);
>     BufferD3D *bufferD3D = GetImplAs<BufferD3D>(buffer);
> 
>-    ASSERT(DirectStoragePossible(attrib, binding));
>+    ASSERT(DirectStoragePossible(context, attrib, binding));
>     directAttrib->vertexBuffer.set(nullptr);
>     directAttrib->storage = bufferD3D;
>     directAttrib->serial  = bufferD3D->getSerial();
>@@ -324,15 +345,15 @@ void VertexDataManager::StoreDirectAttrib(TranslatedAttribute *directAttrib)
> }
> 
> // static
>-gl::Error VertexDataManager::StoreStaticAttrib(const gl::Context *context,
>-                                               TranslatedAttribute *translated)
>+angle::Result VertexDataManager::StoreStaticAttrib(const gl::Context *context,
>+                                                   TranslatedAttribute *translated)
> {
>     ASSERT(translated->attribute && translated->binding);
>     const auto &attrib  = *translated->attribute;
>     const auto &binding = *translated->binding;
> 
>     gl::Buffer *buffer = binding.getBuffer().get();
>-    ASSERT(buffer && attrib.enabled && !DirectStoragePossible(attrib, binding));
>+    ASSERT(buffer && attrib.enabled && !DirectStoragePossible(context, attrib, binding));
>     BufferD3D *bufferD3D = GetImplAs<BufferD3D>(buffer);
> 
>     // Compute source data pointer
>@@ -340,13 +361,17 @@ gl::Error VertexDataManager::StoreStaticAttrib(const gl::Context *context,
>     const int offset          = static_cast<int>(ComputeVertexAttributeOffset(attrib, binding));
> 
>     ANGLE_TRY(bufferD3D->getData(context, &sourceData));
>-    sourceData += offset;
>+
>+    if (sourceData)
>+    {
>+        sourceData += offset;
>+    }
> 
>     unsigned int streamOffset = 0;
> 
>     translated->storage = nullptr;
>-    ANGLE_TRY_RESULT(bufferD3D->getFactory()->getVertexSpaceRequired(attrib, binding, 1, 0),
>-                     translated->stride);
>+    ANGLE_TRY(bufferD3D->getFactory()->getVertexSpaceRequired(context, attrib, binding, 1, 0,
>+                                                              &translated->stride));
> 
>     auto *staticBuffer = bufferD3D->getStaticVertexBuffer(attrib, binding);
>     ASSERT(staticBuffer);
>@@ -358,8 +383,11 @@ gl::Error VertexDataManager::StoreStaticAttrib(const gl::Context *context,
>             ElementsInBuffer(attrib, binding, static_cast<unsigned int>(bufferD3D->getSize()));
>         int startIndex = offset / static_cast<int>(ComputeVertexAttributeStride(attrib, binding));
> 
>-        ANGLE_TRY(staticBuffer->storeStaticAttribute(attrib, binding, -startIndex, totalCount, 0,
>-                                                     sourceData));
>+        if (totalCount > 0)
>+        {
>+            ANGLE_TRY(staticBuffer->storeStaticAttribute(context, attrib, binding, -startIndex,
>+                                                         totalCount, 0, sourceData));
>+        }
>     }
> 
>     unsigned int firstElementOffset =
>@@ -372,27 +400,24 @@ gl::Error VertexDataManager::StoreStaticAttrib(const gl::Context *context,
>     CheckedNumeric<unsigned int> checkedOffset(streamOffset);
>     checkedOffset += firstElementOffset;
> 
>-    if (!checkedOffset.IsValid())
>-    {
>-        return gl::InternalError() << "Integer overflow in VertexDataManager::StoreStaticAttrib";
>-    }
>+    ANGLE_CHECK_GL_MATH(GetImplAs<ContextD3D>(context), checkedOffset.IsValid());
> 
>     translated->vertexBuffer.set(vertexBuffer);
>-    translated->serial = vertexBuffer->getSerial();
>+    translated->serial     = vertexBuffer->getSerial();
>     translated->baseOffset = streamOffset + firstElementOffset;
> 
>     // Instanced vertices do not apply the 'start' offset
>     translated->usesFirstVertexOffset = (binding.getDivisor() == 0);
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error VertexDataManager::storeDynamicAttribs(
>+angle::Result VertexDataManager::storeDynamicAttribs(
>     const gl::Context *context,
>     std::vector<TranslatedAttribute> *translatedAttribs,
>     const gl::AttributesMask &dynamicAttribsMask,
>     GLint start,
>-    GLsizei count,
>+    size_t count,
>     GLsizei instances)
> {
>     // Instantiating this class will ensure the streaming buffer is never left mapped.
>@@ -411,13 +436,13 @@ gl::Error VertexDataManager::storeDynamicAttribs(
>     };
> 
>     // Will trigger unmapping on return.
>-    StreamingBufferUnmapper localUnmapper(mStreamingBuffer.get());
>+    StreamingBufferUnmapper localUnmapper(&mStreamingBuffer);
> 
>     // Reserve the required space for the dynamic buffers.
>     for (auto attribIndex : dynamicAttribsMask)
>     {
>         const auto &dynamicAttrib = (*translatedAttribs)[attribIndex];
>-        ANGLE_TRY(reserveSpaceForAttrib(dynamicAttrib, start, count, instances));
>+        ANGLE_TRY(reserveSpaceForAttrib(context, dynamicAttrib, start, count, instances));
>     }
> 
>     // Store dynamic attributes
>@@ -427,48 +452,50 @@ gl::Error VertexDataManager::storeDynamicAttribs(
>         ANGLE_TRY(storeDynamicAttrib(context, dynamicAttrib, start, count, instances));
>     }
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
> void VertexDataManager::PromoteDynamicAttribs(
>     const gl::Context *context,
>     const std::vector<TranslatedAttribute> &translatedAttribs,
>     const gl::AttributesMask &dynamicAttribsMask,
>-    GLsizei count)
>+    size_t count)
> {
>     for (auto attribIndex : dynamicAttribsMask)
>     {
>         const auto &dynamicAttrib = translatedAttribs[attribIndex];
>         ASSERT(dynamicAttrib.attribute && dynamicAttrib.binding);
>-        const auto &binding       = *dynamicAttrib.binding;
>+        const auto &binding = *dynamicAttrib.binding;
> 
>         gl::Buffer *buffer = binding.getBuffer().get();
>         if (buffer)
>         {
>+            // Note: this multiplication can overflow. It should not be a security problem.
>             BufferD3D *bufferD3D = GetImplAs<BufferD3D>(buffer);
>             size_t typeSize      = ComputeVertexAttributeTypeSize(*dynamicAttrib.attribute);
>-            bufferD3D->promoteStaticUsage(context, count * static_cast<int>(typeSize));
>+            bufferD3D->promoteStaticUsage(context, count * typeSize);
>         }
>     }
> }
> 
>-gl::Error VertexDataManager::reserveSpaceForAttrib(const TranslatedAttribute &translatedAttrib,
>-                                                   GLint start,
>-                                                   GLsizei count,
>-                                                   GLsizei instances) const
>+angle::Result VertexDataManager::reserveSpaceForAttrib(const gl::Context *context,
>+                                                       const TranslatedAttribute &translatedAttrib,
>+                                                       GLint start,
>+                                                       size_t count,
>+                                                       GLsizei instances)
> {
>     ASSERT(translatedAttrib.attribute && translatedAttrib.binding);
>     const auto &attrib  = *translatedAttrib.attribute;
>     const auto &binding = *translatedAttrib.binding;
> 
>-    ASSERT(!DirectStoragePossible(attrib, binding));
>+    ASSERT(!DirectStoragePossible(context, attrib, binding));
> 
>     gl::Buffer *buffer   = binding.getBuffer().get();
>     BufferD3D *bufferD3D = buffer ? GetImplAs<BufferD3D>(buffer) : nullptr;
>     ASSERT(!bufferD3D || bufferD3D->getStaticVertexBuffer(attrib, binding) == nullptr);
> 
>-    size_t totalCount = gl::ComputeVertexBindingElementCount(
>-        binding.getDivisor(), static_cast<size_t>(count), static_cast<size_t>(instances));
>+    size_t totalCount = gl::ComputeVertexBindingElementCount(binding.getDivisor(), count,
>+                                                             static_cast<size_t>(instances));
>     // TODO(jiajia.qin@intel.com): force the index buffer to clamp any out of range indices instead
>     // of invalid operation here.
>     if (bufferD3D)
>@@ -478,23 +505,22 @@ gl::Error VertexDataManager::reserveSpaceForAttrib(const TranslatedAttribute &tr
>         GLint firstVertexIndex = binding.getDivisor() > 0 ? 0 : start;
>         int64_t maxVertexCount =
>             static_cast<int64_t>(firstVertexIndex) + static_cast<int64_t>(totalCount);
>-        int elementsInBuffer =
>-            ElementsInBuffer(attrib, binding, static_cast<unsigned int>(bufferD3D->getSize()));
> 
>-        if (maxVertexCount > elementsInBuffer)
>-        {
>-            return gl::InvalidOperation() << "Vertex buffer is not big enough for the draw call.";
>-        }
>+        int64_t maxByte = GetMaxAttributeByteOffsetForDraw(attrib, binding, maxVertexCount);
>+
>+        ASSERT(bufferD3D->getSize() <= static_cast<size_t>(std::numeric_limits<int64_t>::max()));
>+        ANGLE_CHECK(GetImplAs<ContextD3D>(context),
>+                    maxByte <= static_cast<int64_t>(bufferD3D->getSize()),
>+                    "Vertex buffer is not big enough for the draw call.", GL_INVALID_OPERATION);
>     }
>-    return mStreamingBuffer->reserveVertexSpace(attrib, binding, static_cast<GLsizei>(totalCount),
>-                                                instances);
>+    return mStreamingBuffer.reserveVertexSpace(context, attrib, binding, totalCount, instances);
> }
> 
>-gl::Error VertexDataManager::storeDynamicAttrib(const gl::Context *context,
>-                                                TranslatedAttribute *translated,
>-                                                GLint start,
>-                                                GLsizei count,
>-                                                GLsizei instances)
>+angle::Result VertexDataManager::storeDynamicAttrib(const gl::Context *context,
>+                                                    TranslatedAttribute *translated,
>+                                                    GLint start,
>+                                                    size_t count,
>+                                                    GLsizei instances)
> {
>     ASSERT(translated->attribute && translated->binding);
>     const auto &attrib  = *translated->attribute;
>@@ -521,41 +547,44 @@ gl::Error VertexDataManager::storeDynamicAttrib(const gl::Context *context,
>     {
>         // Attributes using client memory ignore the VERTEX_ATTRIB_BINDING state.
>         // https://www.opengl.org/registry/specs/ARB/vertex_attrib_binding.txt
>-        sourceData = static_cast<const uint8_t*>(attrib.pointer);
>+        sourceData = static_cast<const uint8_t *>(attrib.pointer);
>     }
> 
>     unsigned int streamOffset = 0;
> 
>     translated->storage = nullptr;
>-    ANGLE_TRY_RESULT(mFactory->getVertexSpaceRequired(attrib, binding, 1, 0), translated->stride);
>+    ANGLE_TRY(
>+        mFactory->getVertexSpaceRequired(context, attrib, binding, 1, 0, &translated->stride));
> 
>-    size_t totalCount = gl::ComputeVertexBindingElementCount(
>-        binding.getDivisor(), static_cast<size_t>(count), static_cast<size_t>(instances));
>+    size_t totalCount = gl::ComputeVertexBindingElementCount(binding.getDivisor(), count,
>+                                                             static_cast<size_t>(instances));
> 
>-    ANGLE_TRY(mStreamingBuffer->storeDynamicAttribute(
>-        attrib, binding, translated->currentValueType, firstVertexIndex,
>+    ANGLE_TRY(mStreamingBuffer.storeDynamicAttribute(
>+        context, attrib, binding, translated->currentValueType, firstVertexIndex,
>         static_cast<GLsizei>(totalCount), instances, &streamOffset, sourceData));
> 
>-    VertexBuffer *vertexBuffer = mStreamingBuffer->getVertexBuffer();
>+    VertexBuffer *vertexBuffer = mStreamingBuffer.getVertexBuffer();
> 
>     translated->vertexBuffer.set(vertexBuffer);
>-    translated->serial = vertexBuffer->getSerial();
>+    translated->serial                = vertexBuffer->getSerial();
>     translated->baseOffset            = streamOffset;
>     translated->usesFirstVertexOffset = false;
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error VertexDataManager::storeCurrentValue(const gl::VertexAttribCurrentValueData &currentValue,
>-                                               TranslatedAttribute *translated,
>-                                               size_t attribIndex)
>+angle::Result VertexDataManager::storeCurrentValue(
>+    const gl::Context *context,
>+    const gl::VertexAttribCurrentValueData &currentValue,
>+    TranslatedAttribute *translated,
>+    size_t attribIndex)
> {
>-    CurrentValueState *cachedState = &mCurrentValueCache[attribIndex];
>-    auto &buffer                   = cachedState->buffer;
>+    CurrentValueState *cachedState         = &mCurrentValueCache[attribIndex];
>+    StreamingVertexBufferInterface &buffer = *cachedState->buffer;
> 
>-    if (!buffer)
>+    if (buffer.getBufferSize() == 0)
>     {
>-        buffer.reset(new StreamingVertexBufferInterface(mFactory, CONSTANT_VERTEX_BUFFER_SIZE));
>+        ANGLE_TRY(buffer.initialize(context, CONSTANT_VERTEX_BUFFER_SIZE));
>     }
> 
>     if (cachedState->data != currentValue)
>@@ -564,35 +593,33 @@ gl::Error VertexDataManager::storeCurrentValue(const gl::VertexAttribCurrentValu
>         const auto &attrib  = *translated->attribute;
>         const auto &binding = *translated->binding;
> 
>-        ANGLE_TRY(buffer->reserveVertexSpace(attrib, binding, 1, 0));
>+        ANGLE_TRY(buffer.reserveVertexSpace(context, attrib, binding, 1, 0));
> 
>-        const uint8_t *sourceData = reinterpret_cast<const uint8_t*>(currentValue.FloatValues);
>+        const uint8_t *sourceData = reinterpret_cast<const uint8_t *>(currentValue.FloatValues);
>         unsigned int streamOffset;
>-        ANGLE_TRY(buffer->storeDynamicAttribute(attrib, binding, currentValue.Type, 0, 1, 0,
>-                                                &streamOffset, sourceData));
>+        ANGLE_TRY(buffer.storeDynamicAttribute(context, attrib, binding, currentValue.Type, 0, 1, 0,
>+                                               &streamOffset, sourceData));
> 
>-        buffer->getVertexBuffer()->hintUnmapResource();
>+        buffer.getVertexBuffer()->hintUnmapResource();
> 
>-        cachedState->data = currentValue;
>+        cachedState->data   = currentValue;
>         cachedState->offset = streamOffset;
>     }
> 
>-    translated->vertexBuffer.set(buffer->getVertexBuffer());
>+    translated->vertexBuffer.set(buffer.getVertexBuffer());
> 
>-    translated->storage = nullptr;
>-    translated->serial  = buffer->getSerial();
>-    translated->divisor = 0;
>-    translated->stride  = 0;
>+    translated->storage               = nullptr;
>+    translated->serial                = buffer.getSerial();
>+    translated->divisor               = 0;
>+    translated->stride                = 0;
>     translated->baseOffset            = static_cast<unsigned int>(cachedState->offset);
>     translated->usesFirstVertexOffset = false;
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
> // VertexBufferBinding implementation
>-VertexBufferBinding::VertexBufferBinding() : mBoundVertexBuffer(nullptr)
>-{
>-}
>+VertexBufferBinding::VertexBufferBinding() : mBoundVertexBuffer(nullptr) {}
> 
> VertexBufferBinding::VertexBufferBinding(const VertexBufferBinding &other)
>     : mBoundVertexBuffer(other.mBoundVertexBuffer)
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/VertexDataManager.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/VertexDataManager.h
>index 694366deb70..faa5bdbc242 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/VertexDataManager.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/VertexDataManager.h
>@@ -11,9 +11,10 @@
> #define LIBANGLE_RENDERER_D3D_VERTEXDATAMANAGER_H_
> 
> #include "common/angleutils.h"
>-#include "libANGLE/angletypes.h"
> #include "libANGLE/Constants.h"
> #include "libANGLE/VertexAttribute.h"
>+#include "libANGLE/angletypes.h"
>+#include "libANGLE/renderer/d3d/VertexBuffer.h"
> 
> namespace gl
> {
>@@ -21,7 +22,7 @@ class State;
> struct VertexAttribute;
> class VertexBinding;
> struct VertexAttribCurrentValueData;
>-}
>+}  // namespace gl
> 
> namespace rx
> {
>@@ -52,16 +53,18 @@ struct TranslatedAttribute
> 
>     // Computes the correct offset from baseOffset, usesFirstVertexOffset, stride and startVertex.
>     // Can throw an error on integer overflow.
>-    gl::ErrorOrResult<unsigned int> computeOffset(GLint startVertex) const;
>+    angle::Result computeOffset(const gl::Context *context,
>+                                GLint startVertex,
>+                                unsigned int *offsetOut) const;
> 
>     bool active;
> 
>     const gl::VertexAttribute *attribute;
>     const gl::VertexBinding *binding;
>-    GLenum currentValueType;
>+    gl::VertexAttribType currentValueType;
>     unsigned int baseOffset;
>     bool usesFirstVertexOffset;
>-    unsigned int stride;   // 0 means not to advance the read pointer at all
>+    unsigned int stride;  // 0 means not to advance the read pointer at all
> 
>     VertexBufferBinding vertexBuffer;
>     BufferD3D *storage;
>@@ -79,7 +82,8 @@ enum class VertexStorageType
> };
> 
> // Given a vertex attribute, return the type of storage it will use.
>-VertexStorageType ClassifyAttributeStorage(const gl::VertexAttribute &attrib,
>+VertexStorageType ClassifyAttributeStorage(const gl::Context *context,
>+                                           const gl::VertexAttribute &attrib,
>                                            const gl::VertexBinding &binding);
> 
> class VertexDataManager : angle::NonCopyable
>@@ -88,40 +92,43 @@ class VertexDataManager : angle::NonCopyable
>     VertexDataManager(BufferFactoryD3D *factory);
>     virtual ~VertexDataManager();
> 
>-    gl::Error initialize();
>+    angle::Result initialize(const gl::Context *context);
>     void deinitialize();
> 
>-    gl::Error prepareVertexData(const gl::Context *context,
>-                                GLint start,
>-                                GLsizei count,
>-                                std::vector<TranslatedAttribute> *translatedAttribs,
>-                                GLsizei instances);
>+    angle::Result prepareVertexData(const gl::Context *context,
>+                                    GLint start,
>+                                    GLsizei count,
>+                                    std::vector<TranslatedAttribute> *translatedAttribs,
>+                                    GLsizei instances);
> 
>-    static void StoreDirectAttrib(TranslatedAttribute *directAttrib);
>+    static void StoreDirectAttrib(const gl::Context *context, TranslatedAttribute *directAttrib);
> 
>-    static gl::Error StoreStaticAttrib(const gl::Context *context, TranslatedAttribute *translated);
>+    static angle::Result StoreStaticAttrib(const gl::Context *context,
>+                                           TranslatedAttribute *translated);
> 
>-    gl::Error storeDynamicAttribs(const gl::Context *context,
>-                                  std::vector<TranslatedAttribute> *translatedAttribs,
>-                                  const gl::AttributesMask &dynamicAttribsMask,
>-                                  GLint start,
>-                                  GLsizei count,
>-                                  GLsizei instances);
>+    angle::Result storeDynamicAttribs(const gl::Context *context,
>+                                      std::vector<TranslatedAttribute> *translatedAttribs,
>+                                      const gl::AttributesMask &dynamicAttribsMask,
>+                                      GLint start,
>+                                      size_t count,
>+                                      GLsizei instances);
> 
>     // Promote static usage of dynamic buffers.
>     static void PromoteDynamicAttribs(const gl::Context *context,
>                                       const std::vector<TranslatedAttribute> &translatedAttribs,
>                                       const gl::AttributesMask &dynamicAttribsMask,
>-                                      GLsizei count);
>+                                      size_t count);
> 
>-    gl::Error storeCurrentValue(const gl::VertexAttribCurrentValueData &currentValue,
>-                                TranslatedAttribute *translated,
>-                                size_t attribIndex);
>+    angle::Result storeCurrentValue(const gl::Context *context,
>+                                    const gl::VertexAttribCurrentValueData &currentValue,
>+                                    TranslatedAttribute *translated,
>+                                    size_t attribIndex);
> 
>   private:
>-    struct CurrentValueState
>+    struct CurrentValueState final : angle::NonCopyable
>     {
>-        CurrentValueState();
>+        CurrentValueState(BufferFactoryD3D *factory);
>+        CurrentValueState(CurrentValueState &&other);
>         ~CurrentValueState();
> 
>         std::unique_ptr<StreamingVertexBufferInterface> buffer;
>@@ -129,24 +136,25 @@ class VertexDataManager : angle::NonCopyable
>         size_t offset;
>     };
> 
>-    gl::Error reserveSpaceForAttrib(const TranslatedAttribute &translatedAttrib,
>-                                    GLsizei count,
>-                                    GLint start,
>-                                    GLsizei instances) const;
>+    angle::Result reserveSpaceForAttrib(const gl::Context *context,
>+                                        const TranslatedAttribute &translatedAttrib,
>+                                        GLint start,
>+                                        size_t count,
>+                                        GLsizei instances);
> 
>-    gl::Error storeDynamicAttrib(const gl::Context *context,
>-                                 TranslatedAttribute *translated,
>-                                 GLint start,
>-                                 GLsizei count,
>-                                 GLsizei instances);
>+    angle::Result storeDynamicAttrib(const gl::Context *context,
>+                                     TranslatedAttribute *translated,
>+                                     GLint start,
>+                                     size_t count,
>+                                     GLsizei instances);
> 
>     BufferFactoryD3D *const mFactory;
> 
>-    std::unique_ptr<StreamingVertexBufferInterface> mStreamingBuffer;
>+    StreamingVertexBufferInterface mStreamingBuffer;
>     std::vector<CurrentValueState> mCurrentValueCache;
>     gl::AttributesMask mDynamicAttribsMaskCache;
> };
> 
> }  // namespace rx
> 
>-#endif   // LIBANGLE_RENDERER_D3D_VERTEXDATAMANAGER_H_
>+#endif  // LIBANGLE_RENDERER_D3D_VERTEXDATAMANAGER_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/Blit11.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/Blit11.cpp
>index f032e888f18..98c97707820 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/Blit11.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/Blit11.cpp
>@@ -11,7 +11,9 @@
> #include <float.h>
> 
> #include "common/utilities.h"
>+#include "libANGLE/Context.h"
> #include "libANGLE/formatutils.h"
>+#include "libANGLE/renderer/d3d/d3d11/Context11.h"
> #include "libANGLE/renderer/d3d/d3d11/RenderTarget11.h"
> #include "libANGLE/renderer/d3d/d3d11/Renderer11.h"
> #include "libANGLE/renderer/d3d/d3d11/formatutils11.h"
>@@ -27,54 +29,10 @@ namespace
> 
> // Include inline shaders in the anonymous namespace to make sure no symbols are exported
> #include "libANGLE/renderer/d3d/d3d11/shaders/compiled/passthrough2d11vs.h"
>-#include "libANGLE/renderer/d3d/d3d11/shaders/compiled/passthrougha2d11ps.h"
> #include "libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughdepth2d11ps.h"
>-#include "libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughlum2d11ps.h"
>-#include "libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughlumalpha2d11ps.h"
>-#include "libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughr2d11ps.h"
>-#include "libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughr2di11ps.h"
>-#include "libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughr2dui11ps.h"
>-#include "libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrg2d11ps.h"
>-#include "libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrg2di11ps.h"
>-#include "libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrg2dui11ps.h"
>-#include "libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgb2d11ps.h"
>-#include "libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgb2di11ps.h"
>-#include "libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgb2dui11ps.h"
>-#include "libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgba2d11ps.h"
>-#include "libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgba2di11ps.h"
>-#include "libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgba2dui11ps.h"
>-
>-#include "libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_pm_luma_ps.h"
>-#include "libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_pm_lumaalpha_ps.h"
>-#include "libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_pm_rgb_ps.h"
>-#include "libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_pm_rgba_ps.h"
>-#include "libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_um_luma_ps.h"
>-#include "libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_um_lumaalpha_ps.h"
>-#include "libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_um_rgb_ps.h"
>-#include "libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_um_rgba_ps.h"
>-#include "libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftou_pm_rgb_ps.h"
>-#include "libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftou_pm_rgba_ps.h"
>-#include "libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftou_pt_rgb_ps.h"
>-#include "libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftou_pt_rgba_ps.h"
>-#include "libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftou_um_rgb_ps.h"
>-#include "libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftou_um_rgba_ps.h"
> 
> #include "libANGLE/renderer/d3d/d3d11/shaders/compiled/passthrough3d11gs.h"
> #include "libANGLE/renderer/d3d/d3d11/shaders/compiled/passthrough3d11vs.h"
>-#include "libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughlum3d11ps.h"
>-#include "libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughlumalpha3d11ps.h"
>-#include "libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughr3d11ps.h"
>-#include "libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughr3di11ps.h"
>-#include "libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughr3dui11ps.h"
>-#include "libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrg3d11ps.h"
>-#include "libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrg3di11ps.h"
>-#include "libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrg3dui11ps.h"
>-#include "libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgb3d11ps.h"
>-#include "libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgb3di11ps.h"
>-#include "libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgb3dui11ps.h"
>-#include "libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgba3d11ps.h"
>-#include "libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgba3di11ps.h"
>-#include "libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgba3dui11ps.h"
> 
> #include "libANGLE/renderer/d3d/d3d11/shaders/compiled/resolvedepth11_ps.h"
> #include "libANGLE/renderer/d3d/d3d11/shaders/compiled/resolvedepthstencil11_ps.h"
>@@ -558,6 +516,8 @@ DXGI_FORMAT GetStencilSRVFormat(const d3d11::Format &formatSet)
> 
> }  // namespace
> 
>+#include "libANGLE/renderer/d3d/d3d11/Blit11Helper_autogen.inc"
>+
> Blit11::Shader::Shader() = default;
> 
> Blit11::Shader::Shader(Shader &&other) = default;
>@@ -605,18 +565,15 @@ Blit11::Blit11(Renderer11 *renderer)
>                         "Blit11::mResolveStencilPS"),
>       mStencilSRV(),
>       mResolvedDepthStencilRTView()
>-{
>-}
>+{}
> 
>-Blit11::~Blit11()
>-{
>-}
>+Blit11::~Blit11() {}
> 
>-gl::Error Blit11::initResources()
>+angle::Result Blit11::initResources(const gl::Context *context)
> {
>     if (mResourcesInitialized)
>     {
>-        return gl::NoError();
>+        return angle::Result::Continue;
>     }
> 
>     TRACE_EVENT0("gpu.angle", "Blit11::initResources");
>@@ -632,7 +589,9 @@ gl::Error Blit11::initResources()
>     vbDesc.MiscFlags           = 0;
>     vbDesc.StructureByteStride = 0;
> 
>-    ANGLE_TRY(mRenderer->allocateResource(vbDesc, &mVertexBuffer));
>+    Context11 *context11 = GetImplAs<Context11>(context);
>+
>+    ANGLE_TRY(mRenderer->allocateResource(context11, vbDesc, &mVertexBuffer));
>     mVertexBuffer.setDebugName("Blit11 vertex buffer");
> 
>     D3D11_SAMPLER_DESC pointSamplerDesc;
>@@ -650,7 +609,7 @@ gl::Error Blit11::initResources()
>     pointSamplerDesc.MinLOD         = 0.0f;
>     pointSamplerDesc.MaxLOD         = FLT_MAX;
> 
>-    ANGLE_TRY(mRenderer->allocateResource(pointSamplerDesc, &mPointSampler));
>+    ANGLE_TRY(mRenderer->allocateResource(context11, pointSamplerDesc, &mPointSampler));
>     mPointSampler.setDebugName("Blit11 point sampler");
> 
>     D3D11_SAMPLER_DESC linearSamplerDesc;
>@@ -668,7 +627,7 @@ gl::Error Blit11::initResources()
>     linearSamplerDesc.MinLOD         = 0.0f;
>     linearSamplerDesc.MaxLOD         = FLT_MAX;
> 
>-    ANGLE_TRY(mRenderer->allocateResource(linearSamplerDesc, &mLinearSampler));
>+    ANGLE_TRY(mRenderer->allocateResource(context11, linearSamplerDesc, &mLinearSampler));
>     mLinearSampler.setDebugName("Blit11 linear sampler");
> 
>     // Use a rasterizer state that will not cull so that inverted quads will not be culled
>@@ -684,11 +643,11 @@ gl::Error Blit11::initResources()
>     rasterDesc.AntialiasedLineEnable = FALSE;
> 
>     rasterDesc.ScissorEnable = TRUE;
>-    ANGLE_TRY(mRenderer->allocateResource(rasterDesc, &mScissorEnabledRasterizerState));
>+    ANGLE_TRY(mRenderer->allocateResource(context11, rasterDesc, &mScissorEnabledRasterizerState));
>     mScissorEnabledRasterizerState.setDebugName("Blit11 scissoring rasterizer state");
> 
>     rasterDesc.ScissorEnable = FALSE;
>-    ANGLE_TRY(mRenderer->allocateResource(rasterDesc, &mScissorDisabledRasterizerState));
>+    ANGLE_TRY(mRenderer->allocateResource(context11, rasterDesc, &mScissorDisabledRasterizerState));
>     mScissorDisabledRasterizerState.setDebugName("Blit11 no scissoring rasterizer state");
> 
>     D3D11_DEPTH_STENCIL_DESC depthStencilDesc;
>@@ -707,7 +666,7 @@ gl::Error Blit11::initResources()
>     depthStencilDesc.BackFace.StencilPassOp       = D3D11_STENCIL_OP_KEEP;
>     depthStencilDesc.BackFace.StencilFunc         = D3D11_COMPARISON_ALWAYS;
> 
>-    ANGLE_TRY(mRenderer->allocateResource(depthStencilDesc, &mDepthStencilState));
>+    ANGLE_TRY(mRenderer->allocateResource(context11, depthStencilDesc, &mDepthStencilState));
>     mDepthStencilState.setDebugName("Blit11 depth stencil state");
> 
>     D3D11_BUFFER_DESC swizzleBufferDesc;
>@@ -718,190 +677,12 @@ gl::Error Blit11::initResources()
>     swizzleBufferDesc.MiscFlags           = 0;
>     swizzleBufferDesc.StructureByteStride = 0;
> 
>-    ANGLE_TRY(mRenderer->allocateResource(swizzleBufferDesc, &mSwizzleCB));
>+    ANGLE_TRY(mRenderer->allocateResource(context11, swizzleBufferDesc, &mSwizzleCB));
>     mSwizzleCB.setDebugName("Blit11 swizzle constant buffer");
> 
>     mResourcesInitialized = true;
> 
>-    return gl::NoError();
>-}
>-
>-// static
>-Blit11::BlitShaderType Blit11::GetBlitShaderType(GLenum destinationFormat,
>-                                                 GLenum sourceFormat,
>-                                                 bool isSigned,
>-                                                 bool unpackPremultiplyAlpha,
>-                                                 bool unpackUnmultiplyAlpha,
>-                                                 ShaderDimension dimension)
>-{
>-    if (dimension == SHADER_3D)
>-    {
>-        ASSERT(!unpackPremultiplyAlpha && !unpackUnmultiplyAlpha);
>-
>-        if (isSigned)
>-        {
>-            switch (destinationFormat)
>-            {
>-                case GL_RGBA_INTEGER:
>-                    return BLITSHADER_3D_RGBAI;
>-                case GL_RGB_INTEGER:
>-                    return BLITSHADER_3D_RGBI;
>-                case GL_RG_INTEGER:
>-                    return BLITSHADER_3D_RGI;
>-                case GL_RED_INTEGER:
>-                    return BLITSHADER_3D_RI;
>-                default:
>-                    UNREACHABLE();
>-                    return BLITSHADER_INVALID;
>-            }
>-        }
>-        else
>-        {
>-            switch (destinationFormat)
>-            {
>-                case GL_RGBA:
>-                    return BLITSHADER_3D_RGBAF;
>-                case GL_RGBA_INTEGER:
>-                    return BLITSHADER_3D_RGBAUI;
>-                case GL_BGRA_EXT:
>-                    return BLITSHADER_3D_BGRAF;
>-                case GL_RGB:
>-                    return BLITSHADER_3D_RGBF;
>-                case GL_RGB_INTEGER:
>-                    return BLITSHADER_3D_RGBUI;
>-                case GL_RG:
>-                    return BLITSHADER_3D_RGF;
>-                case GL_RG_INTEGER:
>-                    return BLITSHADER_3D_RGUI;
>-                case GL_RED:
>-                    return BLITSHADER_3D_RF;
>-                case GL_RED_INTEGER:
>-                    return BLITSHADER_3D_RUI;
>-                case GL_ALPHA:
>-                    return BLITSHADER_3D_ALPHA;
>-                case GL_LUMINANCE:
>-                    return BLITSHADER_3D_LUMA;
>-                case GL_LUMINANCE_ALPHA:
>-                    return BLITSHADER_3D_LUMAALPHA;
>-                default:
>-                    UNREACHABLE();
>-                    return BLITSHADER_INVALID;
>-            }
>-        }
>-    }
>-    else if (isSigned)
>-    {
>-        ASSERT(!unpackPremultiplyAlpha && !unpackUnmultiplyAlpha);
>-
>-        switch (destinationFormat)
>-        {
>-            case GL_RGBA_INTEGER:
>-                return BLITSHADER_2D_RGBAI;
>-            case GL_RGB_INTEGER:
>-                return BLITSHADER_2D_RGBI;
>-            case GL_RG_INTEGER:
>-                return BLITSHADER_2D_RGI;
>-            case GL_RED_INTEGER:
>-                return BLITSHADER_2D_RI;
>-            default:
>-                UNREACHABLE();
>-                return BLITSHADER_INVALID;
>-        }
>-    }
>-    else
>-    {
>-        bool floatToIntBlit =
>-            !gl::IsIntegerFormat(sourceFormat) && gl::IsIntegerFormat(destinationFormat);
>-        if (unpackPremultiplyAlpha != unpackUnmultiplyAlpha || floatToIntBlit)
>-        {
>-            switch (destinationFormat)
>-            {
>-                case GL_RGBA:
>-                case GL_BGRA_EXT:
>-                    ASSERT(!floatToIntBlit);
>-                    return unpackPremultiplyAlpha ? BLITSHADER_2D_RGBAF_PREMULTIPLY
>-                                                  : BLITSHADER_2D_RGBAF_UNMULTIPLY;
>-
>-                case GL_RGB:
>-                case GL_RG:
>-                case GL_RED:
>-                    ASSERT(!floatToIntBlit);
>-                    return unpackPremultiplyAlpha ? BLITSHADER_2D_RGBF_PREMULTIPLY
>-                                                  : BLITSHADER_2D_RGBF_UNMULTIPLY;
>-
>-                case GL_RGBA_INTEGER:
>-                    if (unpackPremultiplyAlpha == unpackUnmultiplyAlpha)
>-                    {
>-                        return BLITSHADER_2D_RGBAF_TOUI;
>-                    }
>-                    else
>-                    {
>-                        return unpackPremultiplyAlpha ? BLITSHADER_2D_RGBAF_TOUI_PREMULTIPLY
>-                                                      : BLITSHADER_2D_RGBAF_TOUI_UNMULTIPLY;
>-                    }
>-
>-                case GL_RGB_INTEGER:
>-                case GL_RG_INTEGER:
>-                case GL_RED_INTEGER:
>-                    if (unpackPremultiplyAlpha == unpackUnmultiplyAlpha)
>-                    {
>-                        return BLITSHADER_2D_RGBF_TOUI;
>-                    }
>-                    else
>-                    {
>-                        return unpackPremultiplyAlpha ? BLITSHADER_2D_RGBF_TOUI_PREMULTIPLY
>-                                                      : BLITSHADER_2D_RGBF_TOUI_UNMULTIPLY;
>-                    }
>-                case GL_LUMINANCE:
>-                    ASSERT(!floatToIntBlit);
>-                    return unpackPremultiplyAlpha ? BLITSHADER_2D_LUMAF_PREMULTIPLY
>-                                                  : BLITSHADER_2D_LUMAF_UNMULTIPLY;
>-                case GL_LUMINANCE_ALPHA:
>-                    ASSERT(!floatToIntBlit);
>-                    return unpackPremultiplyAlpha ? BLITSHADER_2D_LUMAALPHAF_PREMULTIPLY
>-                                                  : BLITSHADER_2D_LUMAALPHAF_UNMULTIPLY;
>-                case GL_ALPHA:
>-                    ASSERT(!floatToIntBlit);
>-                    return BLITSHADER_2D_ALPHA;
>-                default:
>-                    UNREACHABLE();
>-                    return BLITSHADER_INVALID;
>-            }
>-        }
>-        else
>-        {
>-            switch (destinationFormat)
>-            {
>-                case GL_RGBA:
>-                    return BLITSHADER_2D_RGBAF;
>-                case GL_RGBA_INTEGER:
>-                    return BLITSHADER_2D_RGBAUI;
>-                case GL_BGRA_EXT:
>-                    return BLITSHADER_2D_BGRAF;
>-                case GL_RGB:
>-                    return BLITSHADER_2D_RGBF;
>-                case GL_RGB_INTEGER:
>-                    return BLITSHADER_2D_RGBUI;
>-                case GL_RG:
>-                    return BLITSHADER_2D_RGF;
>-                case GL_RG_INTEGER:
>-                    return BLITSHADER_2D_RGUI;
>-                case GL_RED:
>-                    return BLITSHADER_2D_RF;
>-                case GL_RED_INTEGER:
>-                    return BLITSHADER_2D_RUI;
>-                case GL_ALPHA:
>-                    return BLITSHADER_2D_ALPHA;
>-                case GL_LUMINANCE:
>-                    return BLITSHADER_2D_LUMA;
>-                case GL_LUMINANCE_ALPHA:
>-                    return BLITSHADER_2D_LUMAALPHA;
>-                default:
>-                    UNREACHABLE();
>-                    return BLITSHADER_INVALID;
>-            }
>-        }
>-    }
>+    return angle::Result::Continue;
> }
> 
> // static
>@@ -968,41 +749,52 @@ Blit11::SwizzleShaderType Blit11::GetSwizzleShaderType(GLenum type,
>     }
> }
> 
>-gl::Error Blit11::getShaderSupport(const Shader &shader, Blit11::ShaderSupport *supportOut)
>+angle::Result Blit11::getShaderSupport(const gl::Context *context,
>+                                       const Shader &shader,
>+                                       Blit11::ShaderSupport *supportOut)
> {
>-    if (shader.dimension == SHADER_2D)
>-    {
>-        ANGLE_TRY(mQuad2DIL.resolve(mRenderer));
>-        ANGLE_TRY(mQuad2DVS.resolve(mRenderer));
>-        supportOut->inputLayout         = &mQuad2DIL.getObj();
>-        supportOut->vertexShader        = &mQuad2DVS.getObj();
>-        supportOut->geometryShader      = nullptr;
>-        supportOut->vertexWriteFunction = Write2DVertices;
>-    }
>-    else
>+
>+    Context11 *context11 = GetImplAs<Context11>(context);
>+
>+    switch (shader.dimension)
>     {
>-        ASSERT(shader.dimension == SHADER_3D);
>-        ANGLE_TRY(mQuad3DIL.resolve(mRenderer));
>-        ANGLE_TRY(mQuad3DVS.resolve(mRenderer));
>-        ANGLE_TRY(mQuad3DGS.resolve(mRenderer));
>-        supportOut->inputLayout         = &mQuad2DIL.getObj();
>-        supportOut->vertexShader        = &mQuad3DVS.getObj();
>-        supportOut->geometryShader      = &mQuad3DGS.getObj();
>-        supportOut->vertexWriteFunction = Write3DVertices;
>+        case SHADER_2D:
>+        {
>+            ANGLE_TRY(mQuad2DIL.resolve(context11, mRenderer));
>+            ANGLE_TRY(mQuad2DVS.resolve(context11, mRenderer));
>+            supportOut->inputLayout         = &mQuad2DIL.getObj();
>+            supportOut->vertexShader        = &mQuad2DVS.getObj();
>+            supportOut->geometryShader      = nullptr;
>+            supportOut->vertexWriteFunction = Write2DVertices;
>+            break;
>+        }
>+        case SHADER_3D:
>+        case SHADER_2DARRAY:
>+        {
>+            ANGLE_TRY(mQuad3DIL.resolve(context11, mRenderer));
>+            ANGLE_TRY(mQuad3DVS.resolve(context11, mRenderer));
>+            ANGLE_TRY(mQuad3DGS.resolve(context11, mRenderer));
>+            supportOut->inputLayout         = &mQuad3DIL.getObj();
>+            supportOut->vertexShader        = &mQuad3DVS.getObj();
>+            supportOut->geometryShader      = &mQuad3DGS.getObj();
>+            supportOut->vertexWriteFunction = Write3DVertices;
>+            break;
>+        }
>+        default:
>+            UNREACHABLE();
>     }
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error Blit11::swizzleTexture(const gl::Context *context,
>-                                 const d3d11::SharedSRV &source,
>-                                 const d3d11::RenderTargetView &dest,
>-                                 const gl::Extents &size,
>-                                 const gl::SwizzleState &swizzleTarget)
>+angle::Result Blit11::swizzleTexture(const gl::Context *context,
>+                                     const d3d11::SharedSRV &source,
>+                                     const d3d11::RenderTargetView &dest,
>+                                     const gl::Extents &size,
>+                                     const gl::SwizzleState &swizzleTarget)
> {
>-    ANGLE_TRY(initResources());
>+    ANGLE_TRY(initResources(context));
> 
>-    HRESULT result;
>     ID3D11DeviceContext *deviceContext = mRenderer->getDeviceContext();
> 
>     D3D11_SHADER_RESOURCE_VIEW_DESC sourceSRVDesc;
>@@ -1046,20 +838,15 @@ gl::Error Blit11::swizzleTexture(const gl::Context *context,
>     }
> 
>     const Shader *shader = nullptr;
>-    ANGLE_TRY(getSwizzleShader(shaderType, sourceSRVDesc.ViewDimension, &shader));
>+    ANGLE_TRY(getSwizzleShader(context, shaderType, sourceSRVDesc.ViewDimension, &shader));
> 
>     // Set vertices
>     D3D11_MAPPED_SUBRESOURCE mappedResource;
>-    result =
>-        deviceContext->Map(mVertexBuffer.get(), 0, D3D11_MAP_WRITE_DISCARD, 0, &mappedResource);
>-    if (FAILED(result))
>-    {
>-        return gl::OutOfMemory() << "Failed to map internal vertex buffer for swizzle, "
>-                                 << gl::FmtHR(result);
>-    }
>+    ANGLE_TRY(mRenderer->mapResource(context, mVertexBuffer.get(), 0, D3D11_MAP_WRITE_DISCARD, 0,
>+                                     &mappedResource));
> 
>     ShaderSupport support;
>-    ANGLE_TRY(getShaderSupport(*shader, &support));
>+    ANGLE_TRY(getShaderSupport(context, *shader, &support));
> 
>     UINT stride    = 0;
>     UINT drawCount = 0;
>@@ -1072,14 +859,10 @@ gl::Error Blit11::swizzleTexture(const gl::Context *context,
>     deviceContext->Unmap(mVertexBuffer.get(), 0);
> 
>     // Set constant buffer
>-    result = deviceContext->Map(mSwizzleCB.get(), 0, D3D11_MAP_WRITE_DISCARD, 0, &mappedResource);
>-    if (FAILED(result))
>-    {
>-        return gl::OutOfMemory() << "Failed to map internal constant buffer for swizzle, "
>-                                 << gl::FmtHR(result);
>-    }
>+    ANGLE_TRY(mRenderer->mapResource(context, mSwizzleCB.get(), 0, D3D11_MAP_WRITE_DISCARD, 0,
>+                                     &mappedResource));
> 
>-    unsigned int *swizzleIndices = reinterpret_cast<unsigned int *>(mappedResource.pData);
>+    unsigned int *swizzleIndices = static_cast<unsigned int *>(mappedResource.pData);
>     swizzleIndices[0]            = GetSwizzleIndex(swizzleTarget.swizzleRed);
>     swizzleIndices[1]            = GetSwizzleIndex(swizzleTarget.swizzleGreen);
>     swizzleIndices[2]            = GetSwizzleIndex(swizzleTarget.swizzleBlue);
>@@ -1119,27 +902,27 @@ gl::Error Blit11::swizzleTexture(const gl::Context *context,
>     // Draw the quad
>     deviceContext->Draw(drawCount, 0);
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error Blit11::copyTexture(const gl::Context *context,
>-                              const d3d11::SharedSRV &source,
>-                              const gl::Box &sourceArea,
>-                              const gl::Extents &sourceSize,
>-                              GLenum sourceFormat,
>-                              const d3d11::RenderTargetView &dest,
>-                              const gl::Box &destArea,
>-                              const gl::Extents &destSize,
>-                              const gl::Rectangle *scissor,
>-                              GLenum destFormat,
>-                              GLenum filter,
>-                              bool maskOffAlpha,
>-                              bool unpackPremultiplyAlpha,
>-                              bool unpackUnmultiplyAlpha)
>+angle::Result Blit11::copyTexture(const gl::Context *context,
>+                                  const d3d11::SharedSRV &source,
>+                                  const gl::Box &sourceArea,
>+                                  const gl::Extents &sourceSize,
>+                                  GLenum sourceFormat,
>+                                  const d3d11::RenderTargetView &dest,
>+                                  const gl::Box &destArea,
>+                                  const gl::Extents &destSize,
>+                                  const gl::Rectangle *scissor,
>+                                  GLenum destFormat,
>+                                  GLenum destTypeForDownsampling,
>+                                  GLenum filter,
>+                                  bool maskOffAlpha,
>+                                  bool unpackPremultiplyAlpha,
>+                                  bool unpackUnmultiplyAlpha)
> {
>-    ANGLE_TRY(initResources());
>+    ANGLE_TRY(initResources(context));
> 
>-    HRESULT result;
>     ID3D11DeviceContext *deviceContext = mRenderer->getDeviceContext();
> 
>     // Determine if the source format is a signed integer format, the destFormat will already
>@@ -1151,27 +934,46 @@ gl::Error Blit11::copyTexture(const gl::Context *context,
> 
>     ASSERT(componentType != GL_NONE);
>     ASSERT(componentType != GL_SIGNED_NORMALIZED);
>-    bool isSigned = (componentType == GL_INT);
>+    bool isSrcSigned = (componentType == GL_INT);
>+
>+    D3D11_RENDER_TARGET_VIEW_DESC destRTVDesc;
>+    dest.get()->GetDesc(&destRTVDesc);
>+
>+    GLenum destComponentType = d3d11::GetComponentType(destRTVDesc.Format);
>+
>+    ASSERT(componentType != GL_NONE);
>+    bool isDestSigned = (destComponentType == GL_INT);
> 
>-    ShaderDimension dimension =
>-        (sourceSRVDesc.ViewDimension == D3D11_SRV_DIMENSION_TEXTURE3D) ? SHADER_3D : SHADER_2D;
>+    ShaderDimension dimension = SHADER_INVALID;
>+
>+    switch (sourceSRVDesc.ViewDimension)
>+    {
>+        case D3D11_SRV_DIMENSION_TEXTURE2D:
>+            dimension = SHADER_2D;
>+            break;
>+        case D3D11_SRV_DIMENSION_TEXTURE3D:
>+            dimension = SHADER_3D;
>+            break;
>+        case D3D11_SRV_DIMENSION_TEXTURE2DARRAY:
>+            dimension = SHADER_2DARRAY;
>+            break;
>+        default:
>+            UNREACHABLE();
>+    }
> 
>     const Shader *shader = nullptr;
>-    ANGLE_TRY(getBlitShader(destFormat, sourceFormat, isSigned, unpackPremultiplyAlpha,
>-                            unpackUnmultiplyAlpha, dimension, &shader));
>+
>+    ANGLE_TRY(getBlitShader(context, destFormat, sourceFormat, isSrcSigned, isDestSigned,
>+                            unpackPremultiplyAlpha, unpackUnmultiplyAlpha, destTypeForDownsampling,
>+                            dimension, &shader));
> 
>     ShaderSupport support;
>-    ANGLE_TRY(getShaderSupport(*shader, &support));
>+    ANGLE_TRY(getShaderSupport(context, *shader, &support));
> 
>     // Set vertices
>     D3D11_MAPPED_SUBRESOURCE mappedResource;
>-    result =
>-        deviceContext->Map(mVertexBuffer.get(), 0, D3D11_MAP_WRITE_DISCARD, 0, &mappedResource);
>-    if (FAILED(result))
>-    {
>-        return gl::OutOfMemory() << "Failed to map internal vertex buffer for texture copy, "
>-                                 << gl::FmtHR(result);
>-    }
>+    ANGLE_TRY(mRenderer->mapResource(context, mVertexBuffer.get(), 0, D3D11_MAP_WRITE_DISCARD, 0,
>+                                     &mappedResource));
> 
>     UINT stride    = 0;
>     UINT drawCount = 0;
>@@ -1190,7 +992,7 @@ gl::Error Blit11::copyTexture(const gl::Context *context,
>     // Apply state
>     if (maskOffAlpha)
>     {
>-        ANGLE_TRY(mAlphaMaskBlendState.resolve(mRenderer));
>+        ANGLE_TRY(mAlphaMaskBlendState.resolve(GetImplAs<Context11>(context), mRenderer));
>         stateManager->setSimpleBlendState(&mAlphaMaskBlendState.getObj());
>     }
>     else
>@@ -1234,53 +1036,48 @@ gl::Error Blit11::copyTexture(const gl::Context *context,
> 
>         default:
>             UNREACHABLE();
>-            return gl::InternalError() << "Internal error, unknown blit filter mode.";
>+            ANGLE_TRY_HR(GetImplAs<Context11>(context), E_FAIL,
>+                         "Internal error, unknown blit filter mode.");
>     }
> 
>     // Draw the quad
>     deviceContext->Draw(drawCount, 0);
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error Blit11::copyStencil(const gl::Context *context,
>-                              const TextureHelper11 &source,
>-                              unsigned int sourceSubresource,
>-                              const gl::Box &sourceArea,
>-                              const gl::Extents &sourceSize,
>-                              const TextureHelper11 &dest,
>-                              unsigned int destSubresource,
>-                              const gl::Box &destArea,
>-                              const gl::Extents &destSize,
>-                              const gl::Rectangle *scissor)
>+angle::Result Blit11::copyStencil(const gl::Context *context,
>+                                  const TextureHelper11 &source,
>+                                  unsigned int sourceSubresource,
>+                                  const gl::Box &sourceArea,
>+                                  const gl::Extents &sourceSize,
>+                                  const TextureHelper11 &dest,
>+                                  unsigned int destSubresource,
>+                                  const gl::Box &destArea,
>+                                  const gl::Extents &destSize,
>+                                  const gl::Rectangle *scissor)
> {
>-    return copyDepthStencilImpl(source, sourceSubresource, sourceArea, sourceSize, dest,
>+    return copyDepthStencilImpl(context, source, sourceSubresource, sourceArea, sourceSize, dest,
>                                 destSubresource, destArea, destSize, scissor, true);
> }
> 
>-gl::Error Blit11::copyDepth(const gl::Context *context,
>-                            const d3d11::SharedSRV &source,
>-                            const gl::Box &sourceArea,
>-                            const gl::Extents &sourceSize,
>-                            const d3d11::DepthStencilView &dest,
>-                            const gl::Box &destArea,
>-                            const gl::Extents &destSize,
>-                            const gl::Rectangle *scissor)
>+angle::Result Blit11::copyDepth(const gl::Context *context,
>+                                const d3d11::SharedSRV &source,
>+                                const gl::Box &sourceArea,
>+                                const gl::Extents &sourceSize,
>+                                const d3d11::DepthStencilView &dest,
>+                                const gl::Box &destArea,
>+                                const gl::Extents &destSize,
>+                                const gl::Rectangle *scissor)
> {
>-    ANGLE_TRY(initResources());
>+    ANGLE_TRY(initResources(context));
> 
>-    HRESULT result;
>     ID3D11DeviceContext *deviceContext = mRenderer->getDeviceContext();
> 
>     // Set vertices
>     D3D11_MAPPED_SUBRESOURCE mappedResource;
>-    result =
>-        deviceContext->Map(mVertexBuffer.get(), 0, D3D11_MAP_WRITE_DISCARD, 0, &mappedResource);
>-    if (FAILED(result))
>-    {
>-        return gl::OutOfMemory() << "Failed to map internal vertex buffer for texture copy, "
>-                                 << gl::FmtHR(result);
>-    }
>+    ANGLE_TRY(mRenderer->mapResource(context, mVertexBuffer.get(), 0, D3D11_MAP_WRITE_DISCARD, 0,
>+                                     &mappedResource));
> 
>     UINT stride    = 0;
>     UINT drawCount = 0;
>@@ -1310,9 +1107,11 @@ gl::Error Blit11::copyDepth(const gl::Context *context,
>         stateManager->setRasterizerState(&mScissorDisabledRasterizerState);
>     }
> 
>-    ANGLE_TRY(mQuad2DIL.resolve(mRenderer));
>-    ANGLE_TRY(mQuad2DVS.resolve(mRenderer));
>-    ANGLE_TRY(mDepthPS.resolve(mRenderer));
>+    Context11 *context11 = GetImplAs<Context11>(context);
>+
>+    ANGLE_TRY(mQuad2DIL.resolve(context11, mRenderer));
>+    ANGLE_TRY(mQuad2DVS.resolve(context11, mRenderer));
>+    ANGLE_TRY(mDepthPS.resolve(context11, mRenderer));
> 
>     // Apply shaders
>     stateManager->setInputLayout(&mQuad2DIL.getObj());
>@@ -1332,24 +1131,11 @@ gl::Error Blit11::copyDepth(const gl::Context *context,
>     // Draw the quad
>     deviceContext->Draw(drawCount, 0);
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error Blit11::copyDepthStencil(const TextureHelper11 &source,
>-                                   unsigned int sourceSubresource,
>-                                   const gl::Box &sourceArea,
>-                                   const gl::Extents &sourceSize,
>-                                   const TextureHelper11 &dest,
>-                                   unsigned int destSubresource,
>-                                   const gl::Box &destArea,
>-                                   const gl::Extents &destSize,
>-                                   const gl::Rectangle *scissor)
>-{
>-    return copyDepthStencilImpl(source, sourceSubresource, sourceArea, sourceSize, dest,
>-                                destSubresource, destArea, destSize, scissor, false);
>-}
>-
>-gl::Error Blit11::copyDepthStencilImpl(const TextureHelper11 &source,
>+angle::Result Blit11::copyDepthStencil(const gl::Context *context,
>+                                       const TextureHelper11 &source,
>                                        unsigned int sourceSubresource,
>                                        const gl::Box &sourceArea,
>                                        const gl::Extents &sourceSize,
>@@ -1357,8 +1143,23 @@ gl::Error Blit11::copyDepthStencilImpl(const TextureHelper11 &source,
>                                        unsigned int destSubresource,
>                                        const gl::Box &destArea,
>                                        const gl::Extents &destSize,
>-                                       const gl::Rectangle *scissor,
>-                                       bool stencilOnly)
>+                                       const gl::Rectangle *scissor)
>+{
>+    return copyDepthStencilImpl(context, source, sourceSubresource, sourceArea, sourceSize, dest,
>+                                destSubresource, destArea, destSize, scissor, false);
>+}
>+
>+angle::Result Blit11::copyDepthStencilImpl(const gl::Context *context,
>+                                           const TextureHelper11 &source,
>+                                           unsigned int sourceSubresource,
>+                                           const gl::Box &sourceArea,
>+                                           const gl::Extents &sourceSize,
>+                                           const TextureHelper11 &dest,
>+                                           unsigned int destSubresource,
>+                                           const gl::Box &destArea,
>+                                           const gl::Extents &destSize,
>+                                           const gl::Rectangle *scissor,
>+                                           bool stencilOnly)
> {
>     auto srcDXGIFormat         = source.getFormat();
>     const auto &srcSizeInfo    = d3d11::GetDXGIFormatSizeInfo(srcDXGIFormat);
>@@ -1393,66 +1194,61 @@ gl::Error Blit11::copyDepthStencilImpl(const TextureHelper11 &source,
>         if (srcDXGIFormat == DXGI_FORMAT_R24G8_TYPELESS)
>         {
>             ASSERT(sourceArea == destArea && sourceSize == destSize && scissor == nullptr);
>-            return copyAndConvert(source, sourceSubresource, sourceArea, sourceSize, dest,
>+            return copyAndConvert(context, source, sourceSubresource, sourceArea, sourceSize, dest,
>                                   destSubresource, destArea, destSize, scissor, copyOffset,
>                                   copyOffset, copySize, srcPixelSize, destPixelSize,
>                                   BlitD24S8ToD32F);
>         }
>         ASSERT(srcDXGIFormat == DXGI_FORMAT_R32G8X24_TYPELESS);
>-        return copyAndConvert(source, sourceSubresource, sourceArea, sourceSize, dest,
>+        return copyAndConvert(context, source, sourceSubresource, sourceArea, sourceSize, dest,
>                               destSubresource, destArea, destSize, scissor, copyOffset, copyOffset,
>                               copySize, srcPixelSize, destPixelSize, BlitD32FS8ToD32F);
>     }
> 
>-    return copyAndConvert(source, sourceSubresource, sourceArea, sourceSize, dest, destSubresource,
>-                          destArea, destSize, scissor, copyOffset, copyOffset, copySize,
>-                          srcPixelSize, destPixelSize, StretchedBlitNearest);
>+    return copyAndConvert(context, source, sourceSubresource, sourceArea, sourceSize, dest,
>+                          destSubresource, destArea, destSize, scissor, copyOffset, copyOffset,
>+                          copySize, srcPixelSize, destPixelSize, StretchedBlitNearest);
> }
> 
>-gl::Error Blit11::copyAndConvertImpl(const TextureHelper11 &source,
>-                                     unsigned int sourceSubresource,
>-                                     const gl::Box &sourceArea,
>-                                     const gl::Extents &sourceSize,
>-                                     const TextureHelper11 &destStaging,
>-                                     const gl::Box &destArea,
>-                                     const gl::Extents &destSize,
>-                                     const gl::Rectangle *scissor,
>-                                     size_t readOffset,
>-                                     size_t writeOffset,
>-                                     size_t copySize,
>-                                     size_t srcPixelStride,
>-                                     size_t destPixelStride,
>-                                     BlitConvertFunction *convertFunction)
>+angle::Result Blit11::copyAndConvertImpl(const gl::Context *context,
>+                                         const TextureHelper11 &source,
>+                                         unsigned int sourceSubresource,
>+                                         const gl::Box &sourceArea,
>+                                         const gl::Extents &sourceSize,
>+                                         const TextureHelper11 &destStaging,
>+                                         const gl::Box &destArea,
>+                                         const gl::Extents &destSize,
>+                                         const gl::Rectangle *scissor,
>+                                         size_t readOffset,
>+                                         size_t writeOffset,
>+                                         size_t copySize,
>+                                         size_t srcPixelStride,
>+                                         size_t destPixelStride,
>+                                         BlitConvertFunction *convertFunction)
> {
>-    ANGLE_TRY(initResources());
>+    ANGLE_TRY(initResources(context));
> 
>     ID3D11DeviceContext *deviceContext = mRenderer->getDeviceContext();
> 
>     TextureHelper11 sourceStaging;
>-    ANGLE_TRY_RESULT(mRenderer->createStagingTexture(ResourceType::Texture2D, source.getFormatSet(),
>-                                                     sourceSize, StagingAccess::READ),
>-                     sourceStaging);
>+    ANGLE_TRY(mRenderer->createStagingTexture(context, ResourceType::Texture2D,
>+                                              source.getFormatSet(), sourceSize,
>+                                              StagingAccess::READ, &sourceStaging));
> 
>     deviceContext->CopySubresourceRegion(sourceStaging.get(), 0, 0, 0, 0, source.get(),
>                                          sourceSubresource, nullptr);
> 
>     D3D11_MAPPED_SUBRESOURCE sourceMapping;
>-    HRESULT result = deviceContext->Map(sourceStaging.get(), 0, D3D11_MAP_READ, 0, &sourceMapping);
>-    if (FAILED(result))
>-    {
>-        return gl::OutOfMemory()
>-               << "Failed to map internal source staging texture for depth stencil blit, "
>-               << gl::FmtHR(result);
>-    }
>+    ANGLE_TRY(
>+        mRenderer->mapResource(context, sourceStaging.get(), 0, D3D11_MAP_READ, 0, &sourceMapping));
> 
>     D3D11_MAPPED_SUBRESOURCE destMapping;
>-    result = deviceContext->Map(destStaging.get(), 0, D3D11_MAP_WRITE, 0, &destMapping);
>-    if (FAILED(result))
>+    angle::Result error =
>+        mRenderer->mapResource(context, destStaging.get(), 0, D3D11_MAP_WRITE, 0, &destMapping);
>+    if (error == angle::Result::Stop)
>     {
>         deviceContext->Unmap(sourceStaging.get(), 0);
>-        return gl::OutOfMemory()
>-               << "Failed to map internal destination staging texture for depth stencil blit, "
>-               << gl::FmtHR(result);
>+        return error;
>     }
> 
>     // Clip dest area to the destination size
>@@ -1461,7 +1257,10 @@ gl::Error Blit11::copyAndConvertImpl(const TextureHelper11 &source,
>     // Clip dest area to the scissor
>     if (scissor)
>     {
>-        gl::ClipRectangle(clipRect, *scissor, &clipRect);
>+        if (!gl::ClipRectangle(clipRect, *scissor, &clipRect))
>+        {
>+            return angle::Result::Continue;
>+        }
>     }
> 
>     convertFunction(sourceArea, destArea, clipRect, sourceSize, sourceMapping.RowPitch,
>@@ -1472,26 +1271,27 @@ gl::Error Blit11::copyAndConvertImpl(const TextureHelper11 &source,
>     deviceContext->Unmap(sourceStaging.get(), 0);
>     deviceContext->Unmap(destStaging.get(), 0);
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error Blit11::copyAndConvert(const TextureHelper11 &source,
>-                                 unsigned int sourceSubresource,
>-                                 const gl::Box &sourceArea,
>-                                 const gl::Extents &sourceSize,
>-                                 const TextureHelper11 &dest,
>-                                 unsigned int destSubresource,
>-                                 const gl::Box &destArea,
>-                                 const gl::Extents &destSize,
>-                                 const gl::Rectangle *scissor,
>-                                 size_t readOffset,
>-                                 size_t writeOffset,
>-                                 size_t copySize,
>-                                 size_t srcPixelStride,
>-                                 size_t destPixelStride,
>-                                 BlitConvertFunction *convertFunction)
>+angle::Result Blit11::copyAndConvert(const gl::Context *context,
>+                                     const TextureHelper11 &source,
>+                                     unsigned int sourceSubresource,
>+                                     const gl::Box &sourceArea,
>+                                     const gl::Extents &sourceSize,
>+                                     const TextureHelper11 &dest,
>+                                     unsigned int destSubresource,
>+                                     const gl::Box &destArea,
>+                                     const gl::Extents &destSize,
>+                                     const gl::Rectangle *scissor,
>+                                     size_t readOffset,
>+                                     size_t writeOffset,
>+                                     size_t copySize,
>+                                     size_t srcPixelStride,
>+                                     size_t destPixelStride,
>+                                     BlitConvertFunction *convertFunction)
> {
>-    ANGLE_TRY(initResources());
>+    ANGLE_TRY(initResources(context));
> 
>     ID3D11DeviceContext *deviceContext = mRenderer->getDeviceContext();
> 
>@@ -1499,22 +1299,22 @@ gl::Error Blit11::copyAndConvert(const TextureHelper11 &source,
>     // ID3D11DevicContext::UpdateSubresource can be called
>     //       using it's mapped data as a source
>     TextureHelper11 destStaging;
>-    ANGLE_TRY_RESULT(mRenderer->createStagingTexture(ResourceType::Texture2D, dest.getFormatSet(),
>-                                                     destSize, StagingAccess::READ_WRITE),
>-                     destStaging);
>+    ANGLE_TRY(mRenderer->createStagingTexture(context, ResourceType::Texture2D, dest.getFormatSet(),
>+                                              destSize, StagingAccess::READ_WRITE, &destStaging));
> 
>     deviceContext->CopySubresourceRegion(destStaging.get(), 0, 0, 0, 0, dest.get(), destSubresource,
>                                          nullptr);
> 
>-    ANGLE_TRY(copyAndConvertImpl(source, sourceSubresource, sourceArea, sourceSize, destStaging,
>-                                 destArea, destSize, scissor, readOffset, writeOffset, copySize,
>-                                 srcPixelStride, destPixelStride, convertFunction));
>+    ANGLE_TRY(copyAndConvertImpl(context, source, sourceSubresource, sourceArea, sourceSize,
>+                                 destStaging, destArea, destSize, scissor, readOffset, writeOffset,
>+                                 copySize, srcPixelStride, destPixelStride, convertFunction));
> 
>     // Work around timeouts/TDRs in older NVIDIA drivers.
>     if (mRenderer->getWorkarounds().depthStencilBlitExtraCopy)
>     {
>         D3D11_MAPPED_SUBRESOURCE mapped;
>-        deviceContext->Map(destStaging.get(), 0, D3D11_MAP_READ, 0, &mapped);
>+        ANGLE_TRY(
>+            mRenderer->mapResource(context, destStaging.get(), 0, D3D11_MAP_READ, 0, &mapped));
>         deviceContext->UpdateSubresource(dest.get(), destSubresource, nullptr, mapped.pData,
>                                          mapped.RowPitch, mapped.DepthPitch);
>         deviceContext->Unmap(destStaging.get(), 0);
>@@ -1525,18 +1325,19 @@ gl::Error Blit11::copyAndConvert(const TextureHelper11 &source,
>                                              destStaging.get(), 0, nullptr);
>     }
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error Blit11::addBlitShaderToMap(BlitShaderType blitShaderType,
>-                                     ShaderDimension dimension,
>-                                     const ShaderData &shaderData,
>-                                     const char *name)
>+angle::Result Blit11::addBlitShaderToMap(const gl::Context *context,
>+                                         BlitShaderType blitShaderType,
>+                                         ShaderDimension dimension,
>+                                         const ShaderData &shaderData,
>+                                         const char *name)
> {
>     ASSERT(mBlitShaderMap.find(blitShaderType) == mBlitShaderMap.end());
> 
>     d3d11::PixelShader ps;
>-    ANGLE_TRY(mRenderer->allocateResource(shaderData, &ps));
>+    ANGLE_TRY(mRenderer->allocateResource(GetImplAs<Context11>(context), shaderData, &ps));
>     ps.setDebugName(name);
> 
>     Shader shader;
>@@ -1544,18 +1345,19 @@ gl::Error Blit11::addBlitShaderToMap(BlitShaderType blitShaderType,
>     shader.pixelShader = std::move(ps);
> 
>     mBlitShaderMap[blitShaderType] = std::move(shader);
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error Blit11::addSwizzleShaderToMap(SwizzleShaderType swizzleShaderType,
>-                                        ShaderDimension dimension,
>-                                        const ShaderData &shaderData,
>-                                        const char *name)
>+angle::Result Blit11::addSwizzleShaderToMap(const gl::Context *context,
>+                                            SwizzleShaderType swizzleShaderType,
>+                                            ShaderDimension dimension,
>+                                            const ShaderData &shaderData,
>+                                            const char *name)
> {
>     ASSERT(mSwizzleShaderMap.find(swizzleShaderType) == mSwizzleShaderMap.end());
> 
>     d3d11::PixelShader ps;
>-    ANGLE_TRY(mRenderer->allocateResource(shaderData, &ps));
>+    ANGLE_TRY(mRenderer->allocateResource(GetImplAs<Context11>(context), shaderData, &ps));
>     ps.setDebugName(name);
> 
>     Shader shader;
>@@ -1563,7 +1365,7 @@ gl::Error Blit11::addSwizzleShaderToMap(SwizzleShaderType swizzleShaderType,
>     shader.pixelShader = std::move(ps);
> 
>     mSwizzleShaderMap[swizzleShaderType] = std::move(shader);
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
> void Blit11::clearShaderMap()
>@@ -1572,287 +1374,261 @@ void Blit11::clearShaderMap()
>     mSwizzleShaderMap.clear();
> }
> 
>-gl::Error Blit11::getBlitShader(GLenum destFormat,
>-                                GLenum sourceFormat,
>-                                bool isSigned,
>-                                bool unpackPremultiplyAlpha,
>-                                bool unpackUnmultiplyAlpha,
>-                                ShaderDimension dimension,
>-                                const Shader **shader)
>+Blit11::BlitShaderOperation Blit11::getBlitShaderOperation(GLenum destinationFormat,
>+                                                           GLenum sourceFormat,
>+                                                           bool isSrcSigned,
>+                                                           bool isDestSigned,
>+                                                           bool unpackPremultiplyAlpha,
>+                                                           bool unpackUnmultiplyAlpha,
>+                                                           GLenum destTypeForDownsampling)
> {
>-    BlitShaderType blitShaderType =
>-        GetBlitShaderType(destFormat, sourceFormat, isSigned, unpackPremultiplyAlpha,
>-                          unpackUnmultiplyAlpha, dimension);
>+    bool floatToIntBlit =
>+        !gl::IsIntegerFormat(sourceFormat) && gl::IsIntegerFormat(destinationFormat);
> 
>-    if (blitShaderType == BLITSHADER_INVALID)
>+    if (isSrcSigned)
>     {
>-        return gl::InternalError() << "Internal blit shader type mismatch";
>+        ASSERT(!unpackPremultiplyAlpha && !unpackUnmultiplyAlpha);
>+        switch (destinationFormat)
>+        {
>+            case GL_RGBA_INTEGER:
>+                return RGBAI;
>+            case GL_RGB_INTEGER:
>+                return RGBI;
>+            case GL_RG_INTEGER:
>+                return RGI;
>+            case GL_RED_INTEGER:
>+                return RI;
>+            default:
>+                UNREACHABLE();
>+                return OPERATION_INVALID;
>+        }
>     }
>-
>-    auto blitShaderIt = mBlitShaderMap.find(blitShaderType);
>-    if (blitShaderIt != mBlitShaderMap.end())
>+    else if (isDestSigned)
>     {
>-        *shader = &blitShaderIt->second;
>-        return gl::NoError();
>-    }
>+        ASSERT(floatToIntBlit);
> 
>-    ASSERT(dimension == SHADER_2D || mRenderer->isES3Capable());
>-
>-    switch (blitShaderType)
>+        switch (destinationFormat)
>+        {
>+            case GL_RGBA_INTEGER:
>+                if (unpackPremultiplyAlpha == unpackUnmultiplyAlpha)
>+                {
>+                    return RGBAF_TOI;
>+                }
>+                else
>+                {
>+                    return unpackPremultiplyAlpha ? RGBAF_TOI_PREMULTIPLY : RGBAF_TOI_UNMULTIPLY;
>+                }
>+                break;
>+            case GL_RGB_INTEGER:
>+            case GL_RG_INTEGER:
>+            case GL_RED_INTEGER:
>+                if (unpackPremultiplyAlpha == unpackUnmultiplyAlpha)
>+                {
>+                    return RGBF_TOI;
>+                }
>+                else
>+                {
>+                    return unpackPremultiplyAlpha ? RGBF_TOI_PREMULTIPLY : RGBF_TOI_UNMULTIPLY;
>+                }
>+                break;
>+            default:
>+                UNREACHABLE();
>+                return OPERATION_INVALID;
>+        }
>+    }
>+    else
>     {
>-        case BLITSHADER_2D_RGBAF:
>-            ANGLE_TRY(addBlitShaderToMap(blitShaderType, SHADER_2D,
>-                                         ShaderData(g_PS_PassthroughRGBA2D),
>-                                         "Blit11 2D RGBA pixel shader"));
>-            break;
>-        case BLITSHADER_2D_BGRAF:
>-            ANGLE_TRY(addBlitShaderToMap(blitShaderType, SHADER_2D,
>-                                         ShaderData(g_PS_PassthroughRGBA2D),
>-                                         "Blit11 2D BGRA pixel shader"));
>-            break;
>-        case BLITSHADER_2D_RGBF:
>-            ANGLE_TRY(addBlitShaderToMap(blitShaderType, SHADER_2D,
>-                                         ShaderData(g_PS_PassthroughRGB2D),
>-                                         "Blit11 2D RGB pixel shader"));
>-            break;
>-        case BLITSHADER_2D_RGF:
>-            ANGLE_TRY(addBlitShaderToMap(blitShaderType, SHADER_2D,
>-                                         ShaderData(g_PS_PassthroughRG2D),
>-                                         "Blit11 2D RG pixel shader"));
>-            break;
>-        case BLITSHADER_2D_RF:
>-            ANGLE_TRY(addBlitShaderToMap(blitShaderType, SHADER_2D, ShaderData(g_PS_PassthroughR2D),
>-                                         "Blit11 2D R pixel shader"));
>-            break;
>-        case BLITSHADER_2D_ALPHA:
>-            ANGLE_TRY(addBlitShaderToMap(blitShaderType, SHADER_2D, ShaderData(g_PS_PassthroughA2D),
>-                                         "Blit11 2D alpha pixel shader"));
>-            break;
>-        case BLITSHADER_2D_LUMA:
>-            ANGLE_TRY(addBlitShaderToMap(blitShaderType, SHADER_2D,
>-                                         ShaderData(g_PS_PassthroughLum2D),
>-                                         "Blit11 2D lum pixel shader"));
>-            break;
>-        case BLITSHADER_2D_LUMAALPHA:
>-            ANGLE_TRY(addBlitShaderToMap(blitShaderType, SHADER_2D,
>-                                         ShaderData(g_PS_PassthroughLumAlpha2D),
>-                                         "Blit11 2D luminance alpha pixel shader"));
>-            break;
>-        case BLITSHADER_2D_RGBAUI:
>-            ANGLE_TRY(addBlitShaderToMap(blitShaderType, SHADER_2D,
>-                                         ShaderData(g_PS_PassthroughRGBA2DUI),
>-                                         "Blit11 2D RGBA UI pixel shader"));
>-            break;
>-        case BLITSHADER_2D_RGBAI:
>-            ANGLE_TRY(addBlitShaderToMap(blitShaderType, SHADER_2D,
>-                                         ShaderData(g_PS_PassthroughRGBA2DI),
>-                                         "Blit11 2D RGBA I pixel shader"));
>-            break;
>-        case BLITSHADER_2D_RGBUI:
>-            ANGLE_TRY(addBlitShaderToMap(blitShaderType, SHADER_2D,
>-                                         ShaderData(g_PS_PassthroughRGB2DUI),
>-                                         "Blit11 2D RGB UI pixel shader"));
>-            break;
>-        case BLITSHADER_2D_RGBI:
>-            ANGLE_TRY(addBlitShaderToMap(blitShaderType, SHADER_2D,
>-                                         ShaderData(g_PS_PassthroughRGB2DI),
>-                                         "Blit11 2D RGB I pixel shader"));
>-            break;
>-        case BLITSHADER_2D_RGUI:
>-            ANGLE_TRY(addBlitShaderToMap(blitShaderType, SHADER_2D,
>-                                         ShaderData(g_PS_PassthroughRG2DUI),
>-                                         "Blit11 2D RG UI pixel shader"));
>-            break;
>-        case BLITSHADER_2D_RGI:
>-            ANGLE_TRY(addBlitShaderToMap(blitShaderType, SHADER_2D,
>-                                         ShaderData(g_PS_PassthroughRG2DI),
>-                                         "Blit11 2D RG I pixel shader"));
>-            break;
>-        case BLITSHADER_2D_RUI:
>-            ANGLE_TRY(addBlitShaderToMap(blitShaderType, SHADER_2D,
>-                                         ShaderData(g_PS_PassthroughR2DUI),
>-                                         "Blit11 2D R UI pixel shader"));
>-            break;
>-        case BLITSHADER_2D_RI:
>-            ANGLE_TRY(addBlitShaderToMap(blitShaderType, SHADER_2D,
>-                                         ShaderData(g_PS_PassthroughR2DI),
>-                                         "Blit11 2D R I pixel shader"));
>-            break;
>-        case BLITSHADER_3D_RGBAF:
>-            ANGLE_TRY(addBlitShaderToMap(blitShaderType, SHADER_3D,
>-                                         ShaderData(g_PS_PassthroughRGBA3D),
>-                                         "Blit11 3D RGBA pixel shader"));
>-            break;
>-        case BLITSHADER_3D_RGBAUI:
>-            ANGLE_TRY(addBlitShaderToMap(blitShaderType, SHADER_3D,
>-                                         ShaderData(g_PS_PassthroughRGBA3DUI),
>-                                         "Blit11 3D UI RGBA pixel shader"));
>-            break;
>-        case BLITSHADER_3D_RGBAI:
>-            ANGLE_TRY(addBlitShaderToMap(blitShaderType, SHADER_3D,
>-                                         ShaderData(g_PS_PassthroughRGBA3DI),
>-                                         "Blit11 3D I RGBA pixel shader"));
>-            break;
>-        case BLITSHADER_3D_BGRAF:
>-            ANGLE_TRY(addBlitShaderToMap(blitShaderType, SHADER_3D,
>-                                         ShaderData(g_PS_PassthroughRGBA3D),
>-                                         "Blit11 3D BGRA pixel shader"));
>-            break;
>-        case BLITSHADER_3D_RGBF:
>-            ANGLE_TRY(addBlitShaderToMap(blitShaderType, SHADER_3D,
>-                                         ShaderData(g_PS_PassthroughRGB3D),
>-                                         "Blit11 3D RGB pixel shader"));
>-            break;
>-        case BLITSHADER_3D_RGBUI:
>-            ANGLE_TRY(addBlitShaderToMap(blitShaderType, SHADER_3D,
>-                                         ShaderData(g_PS_PassthroughRGB3DUI),
>-                                         "Blit11 3D RGB UI pixel shader"));
>-            break;
>-        case BLITSHADER_3D_RGBI:
>-            ANGLE_TRY(addBlitShaderToMap(blitShaderType, SHADER_3D,
>-                                         ShaderData(g_PS_PassthroughRGB3DI),
>-                                         "Blit11 3D RGB I pixel shader"));
>-            break;
>-        case BLITSHADER_3D_RGF:
>-            ANGLE_TRY(addBlitShaderToMap(blitShaderType, SHADER_3D,
>-                                         ShaderData(g_PS_PassthroughRG3D),
>-                                         "Blit11 3D RG pixel shader"));
>-            break;
>-        case BLITSHADER_3D_RGUI:
>-            ANGLE_TRY(addBlitShaderToMap(blitShaderType, SHADER_3D,
>-                                         ShaderData(g_PS_PassthroughRG3DUI),
>-                                         "Blit11 3D RG UI pixel shader"));
>-            break;
>-        case BLITSHADER_3D_RGI:
>-            ANGLE_TRY(addBlitShaderToMap(blitShaderType, SHADER_3D,
>-                                         ShaderData(g_PS_PassthroughRG3DI),
>-                                         "Blit11 3D RG I pixel shader"));
>-            break;
>-        case BLITSHADER_3D_RF:
>-            ANGLE_TRY(addBlitShaderToMap(blitShaderType, SHADER_3D, ShaderData(g_PS_PassthroughR3D),
>-                                         "Blit11 3D R pixel shader"));
>-            break;
>-        case BLITSHADER_3D_RUI:
>-            ANGLE_TRY(addBlitShaderToMap(blitShaderType, SHADER_3D,
>-                                         ShaderData(g_PS_PassthroughR3DUI),
>-                                         "Blit11 3D R UI pixel shader"));
>-            break;
>-        case BLITSHADER_3D_RI:
>-            ANGLE_TRY(addBlitShaderToMap(blitShaderType, SHADER_3D,
>-                                         ShaderData(g_PS_PassthroughR3DI),
>-                                         "Blit11 3D R I pixel shader"));
>-            break;
>-        case BLITSHADER_3D_ALPHA:
>-            ANGLE_TRY(addBlitShaderToMap(blitShaderType, SHADER_3D,
>-                                         ShaderData(g_PS_PassthroughRGBA3D),
>-                                         "Blit11 3D alpha pixel shader"));
>-            break;
>-        case BLITSHADER_3D_LUMA:
>-            ANGLE_TRY(addBlitShaderToMap(blitShaderType, SHADER_3D,
>-                                         ShaderData(g_PS_PassthroughLum3D),
>-                                         "Blit11 3D luminance pixel shader"));
>-            break;
>-        case BLITSHADER_3D_LUMAALPHA:
>-            ANGLE_TRY(addBlitShaderToMap(blitShaderType, SHADER_3D,
>-                                         ShaderData(g_PS_PassthroughLumAlpha3D),
>-                                         "Blit11 3D luminance alpha pixel shader"));
>-            break;
>+        // Check for the downsample formats first
>+        switch (destTypeForDownsampling)
>+        {
>+            case GL_UNSIGNED_SHORT_4_4_4_4:
>+                ASSERT(destinationFormat == GL_RGBA && !floatToIntBlit);
>+                if (unpackPremultiplyAlpha == unpackUnmultiplyAlpha)
>+                {
>+                    return RGBAF_4444;
>+                }
>+                else if (unpackPremultiplyAlpha)
>+                {
>+                    return RGBAF_4444_PREMULTIPLY;
>+                }
>+                else
>+                {
>+                    return RGBAF_4444_UNMULTIPLY;
>+                }
>+
>+            case GL_UNSIGNED_SHORT_5_6_5:
>+                ASSERT(destinationFormat == GL_RGB && !floatToIntBlit);
>+                if (unpackPremultiplyAlpha == unpackUnmultiplyAlpha)
>+                {
>+                    return RGBF_565;
>+                }
>+                else
>+                {
>+                    return unpackPremultiplyAlpha ? RGBF_565_PREMULTIPLY : RGBF_565_UNMULTIPLY;
>+                }
>+            case GL_UNSIGNED_SHORT_5_5_5_1:
>+                if (unpackPremultiplyAlpha == unpackUnmultiplyAlpha)
>+                {
>+                    return RGBAF_5551;
>+                }
>+                else
>+                {
>+                    return unpackPremultiplyAlpha ? RGBAF_5551_PREMULTIPLY : RGBAF_5551_UNMULTIPLY;
>+                }
> 
>-        case BLITSHADER_2D_RGBAF_PREMULTIPLY:
>-            ANGLE_TRY(addBlitShaderToMap(blitShaderType, SHADER_2D, ShaderData(g_PS_FtoF_PM_RGBA),
>-                                         "Blit11 2D RGBA premultiply pixel shader"));
>-            break;
>+            default:
>+                // By default, use the regular passthrough/multiply/unmultiply shaders.  The above
>+                // shaders are only needed for some emulated texture formats.
>+                break;
>+        }
> 
>-        case BLITSHADER_2D_RGBAF_UNMULTIPLY:
>-            ANGLE_TRY(addBlitShaderToMap(blitShaderType, SHADER_2D, ShaderData(g_PS_FtoF_UM_RGBA),
>-                                         "Blit11 2D RGBA unmultiply pixel shader"));
>-            break;
>+        if (unpackPremultiplyAlpha != unpackUnmultiplyAlpha || floatToIntBlit)
>+        {
>+            switch (destinationFormat)
>+            {
>+                case GL_RGBA:
>+                case GL_BGRA_EXT:
>+                    ASSERT(!floatToIntBlit);
>+                    return unpackPremultiplyAlpha ? RGBAF_PREMULTIPLY : RGBAF_UNMULTIPLY;
>+                case GL_RGB:
>+                case GL_RG:
>+                case GL_RED:
>+                    if (unpackPremultiplyAlpha == unpackUnmultiplyAlpha)
>+                    {
>+                        return RGBF_TOUI;
>+                    }
>+                    else
>+                    {
>+                        return unpackPremultiplyAlpha ? RGBF_PREMULTIPLY : RGBF_UNMULTIPLY;
>+                    }
>+                case GL_RGBA_INTEGER:
>+                    if (unpackPremultiplyAlpha == unpackUnmultiplyAlpha)
>+                    {
>+                        return RGBAF_TOUI;
>+                    }
>+                    else
>+                    {
>+                        return unpackPremultiplyAlpha ? RGBAF_TOUI_PREMULTIPLY
>+                                                      : RGBAF_TOUI_UNMULTIPLY;
>+                    }
>+                case GL_RGB_INTEGER:
>+                case GL_RG_INTEGER:
>+                case GL_RED_INTEGER:
>+                    if (unpackPremultiplyAlpha == unpackUnmultiplyAlpha)
>+                    {
>+                        return RGBF_TOUI;
>+                    }
>+                    else
>+                    {
>+                        return unpackPremultiplyAlpha ? RGBF_TOUI_PREMULTIPLY
>+                                                      : RGBF_TOUI_UNMULTIPLY;
>+                    }
>+                case GL_LUMINANCE:
>+                    ASSERT(!floatToIntBlit);
>+                    return unpackPremultiplyAlpha ? LUMAF_PREMULTIPLY : LUMAF_UNMULTIPLY;
> 
>-        case BLITSHADER_2D_RGBF_PREMULTIPLY:
>-            ANGLE_TRY(addBlitShaderToMap(blitShaderType, SHADER_2D, ShaderData(g_PS_FtoF_PM_RGB),
>-                                         "Blit11 2D RGB premultiply pixel shader"));
>-            break;
>+                case GL_LUMINANCE_ALPHA:
>+                    ASSERT(!floatToIntBlit);
>+                    return unpackPremultiplyAlpha ? LUMAALPHAF_PREMULTIPLY : LUMAALPHAF_UNMULTIPLY;
>+                case GL_ALPHA:
>+                    return ALPHA;
>+                default:
>+                    UNREACHABLE();
>+                    return OPERATION_INVALID;
>+            }
>+        }
>+        else
>+        {
>+            switch (destinationFormat)
>+            {
>+                case GL_RGBA:
>+                    return RGBAF;
>+                case GL_RGBA_INTEGER:
>+                    return RGBAUI;
>+                case GL_BGRA_EXT:
>+                    return BGRAF;
>+                case GL_RGB:
>+                    return RGBF;
>+                case GL_RGB_INTEGER:
>+                    return RGBUI;
>+                case GL_RG:
>+                    return RGF;
>+                case GL_RG_INTEGER:
>+                    return RGUI;
>+                case GL_RED:
>+                    return RF;
>+                case GL_RED_INTEGER:
>+                    return RUI;
>+                case GL_ALPHA:
>+                    return ALPHA;
>+                case GL_LUMINANCE:
>+                    return LUMA;
>+                case GL_LUMINANCE_ALPHA:
>+                    return LUMAALPHA;
>+                default:
>+                    UNREACHABLE();
>+                    return OPERATION_INVALID;
>+            }
>+        }
>+    }
>+}
> 
>-        case BLITSHADER_2D_RGBF_UNMULTIPLY:
>-            ANGLE_TRY(addBlitShaderToMap(blitShaderType, SHADER_2D, ShaderData(g_PS_FtoF_UM_RGB),
>-                                         "Blit11 2D RGB unmultiply pixel shader"));
>-            break;
>+angle::Result Blit11::getBlitShader(const gl::Context *context,
>+                                    GLenum destFormat,
>+                                    GLenum sourceFormat,
>+                                    bool isSrcSigned,
>+                                    bool isDestSigned,
>+                                    bool unpackPremultiplyAlpha,
>+                                    bool unpackUnmultiplyAlpha,
>+                                    GLenum destTypeForDownsampling,
>+                                    ShaderDimension dimension,
>+                                    const Shader **shader)
>+{
>+    BlitShaderOperation blitShaderOperation = OPERATION_INVALID;
> 
>-        case BLITSHADER_2D_RGBAF_TOUI:
>-            ANGLE_TRY(addBlitShaderToMap(blitShaderType, SHADER_2D, ShaderData(g_PS_FtoU_PT_RGBA),
>-                                         "Blit11 2D RGBA to uint pixel shader"));
>-            break;
>+    blitShaderOperation = getBlitShaderOperation(destFormat, sourceFormat, isSrcSigned,
>+                                                 isDestSigned, unpackPremultiplyAlpha,
>+                                                 unpackUnmultiplyAlpha, destTypeForDownsampling);
> 
>-        case BLITSHADER_2D_RGBAF_TOUI_PREMULTIPLY:
>-            ANGLE_TRY(addBlitShaderToMap(blitShaderType, SHADER_2D, ShaderData(g_PS_FtoU_PM_RGBA),
>-                                         "Blit11 2D RGBA to uint premultiply pixel shader"));
>-            break;
>+    BlitShaderType blitShaderType = BLITSHADER_INVALID;
> 
>-        case BLITSHADER_2D_RGBAF_TOUI_UNMULTIPLY:
>-            ANGLE_TRY(addBlitShaderToMap(blitShaderType, SHADER_2D, ShaderData(g_PS_FtoU_UM_RGBA),
>-                                         "Blit11 2D RGBA to uint unmultiply pixel shader"));
>-            break;
>+    blitShaderType = getBlitShaderType(blitShaderOperation, dimension);
> 
>-        case BLITSHADER_2D_RGBF_TOUI:
>-            ANGLE_TRY(addBlitShaderToMap(blitShaderType, SHADER_2D, ShaderData(g_PS_FtoU_PT_RGB),
>-                                         "Blit11 2D RGB to uint pixel shader"));
>-            break;
>+    ANGLE_CHECK_HR(GetImplAs<Context11>(context), blitShaderType != BLITSHADER_INVALID,
>+                   "Internal blit shader type mismatch", E_FAIL);
> 
>-        case BLITSHADER_2D_RGBF_TOUI_PREMULTIPLY:
>-            ANGLE_TRY(addBlitShaderToMap(blitShaderType, SHADER_2D, ShaderData(g_PS_FtoU_PM_RGB),
>-                                         "Blit11 2D RGB to uint premultiply pixel shader"));
>-            break;
>+    auto blitShaderIt = mBlitShaderMap.find(blitShaderType);
>+    if (blitShaderIt != mBlitShaderMap.end())
>+    {
>+        *shader = &blitShaderIt->second;
>+        return angle::Result::Continue;
>+    }
> 
>-        case BLITSHADER_2D_RGBF_TOUI_UNMULTIPLY:
>-            ANGLE_TRY(addBlitShaderToMap(blitShaderType, SHADER_2D, ShaderData(g_PS_FtoU_UM_RGB),
>-                                         "Blit11 2D RGB to uint unmultiply pixel shader"));
>-            break;
>-        case BLITSHADER_2D_LUMAF_PREMULTIPLY:
>-            ANGLE_TRY(addBlitShaderToMap(blitShaderType, SHADER_2D, ShaderData(g_PS_FtoF_PM_LUMA),
>-                                         "Blit11 2D LUMA premultiply pixel shader"));
>-            break;
>-        case BLITSHADER_2D_LUMAF_UNMULTIPLY:
>-            ANGLE_TRY(addBlitShaderToMap(blitShaderType, SHADER_2D, ShaderData(g_PS_FtoF_UM_LUMA),
>-                                         "Blit11 2D LUMA unmultiply pixel shader"));
>-            break;
>-        case BLITSHADER_2D_LUMAALPHAF_PREMULTIPLY:
>-            ANGLE_TRY(addBlitShaderToMap(blitShaderType, SHADER_2D,
>-                                         ShaderData(g_PS_FtoF_PM_LUMAALPHA),
>-                                         "Blit11 2D LUMAALPHA premultiply pixel shader"));
>-            break;
>-        case BLITSHADER_2D_LUMAALPHAF_UNMULTIPLY:
>-            ANGLE_TRY(addBlitShaderToMap(blitShaderType, SHADER_2D,
>-                                         ShaderData(g_PS_FtoF_UM_LUMAALPHA),
>-                                         "Blit11 2D LUMAALPHA unmultiply pixel shader"));
>-            break;
>+    ASSERT(dimension == SHADER_2D || mRenderer->isES3Capable());
> 
>-        default:
>-            UNREACHABLE();
>-            return gl::InternalError() << "Internal error";
>-    }
>+    ANGLE_TRY(mapBlitShader(context, blitShaderType));
> 
>     blitShaderIt = mBlitShaderMap.find(blitShaderType);
>     ASSERT(blitShaderIt != mBlitShaderMap.end());
>     *shader = &blitShaderIt->second;
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error Blit11::getSwizzleShader(GLenum type,
>-                                   D3D11_SRV_DIMENSION viewDimension,
>-                                   const Shader **shader)
>+angle::Result Blit11::getSwizzleShader(const gl::Context *context,
>+                                       GLenum type,
>+                                       D3D11_SRV_DIMENSION viewDimension,
>+                                       const Shader **shader)
> {
>     SwizzleShaderType swizzleShaderType = GetSwizzleShaderType(type, viewDimension);
> 
>-    if (swizzleShaderType == SWIZZLESHADER_INVALID)
>-    {
>-        return gl::InternalError() << "Swizzle shader type not found";
>-    }
>+    ANGLE_CHECK_HR(GetImplAs<Context11>(context), swizzleShaderType != SWIZZLESHADER_INVALID,
>+                   "Swizzle shader type not found", E_FAIL);
> 
>     auto swizzleShaderIt = mSwizzleShaderMap.find(swizzleShaderType);
>     if (swizzleShaderIt != mSwizzleShaderMap.end())
>     {
>         *shader = &swizzleShaderIt->second;
>-        return gl::NoError();
>+        return angle::Result::Continue;
>     }
> 
>     // Swizzling shaders (OpenGL ES 3+)
>@@ -1861,92 +1637,94 @@ gl::Error Blit11::getSwizzleShader(GLenum type,
>     switch (swizzleShaderType)
>     {
>         case SWIZZLESHADER_2D_FLOAT:
>-            ANGLE_TRY(addSwizzleShaderToMap(swizzleShaderType, SHADER_2D,
>+            ANGLE_TRY(addSwizzleShaderToMap(context, swizzleShaderType, SHADER_2D,
>                                             ShaderData(g_PS_SwizzleF2D),
>                                             "Blit11 2D F swizzle pixel shader"));
>             break;
>         case SWIZZLESHADER_2D_UINT:
>-            ANGLE_TRY(addSwizzleShaderToMap(swizzleShaderType, SHADER_2D,
>+            ANGLE_TRY(addSwizzleShaderToMap(context, swizzleShaderType, SHADER_2D,
>                                             ShaderData(g_PS_SwizzleUI2D),
>                                             "Blit11 2D UI swizzle pixel shader"));
>             break;
>         case SWIZZLESHADER_2D_INT:
>-            ANGLE_TRY(addSwizzleShaderToMap(swizzleShaderType, SHADER_2D,
>+            ANGLE_TRY(addSwizzleShaderToMap(context, swizzleShaderType, SHADER_2D,
>                                             ShaderData(g_PS_SwizzleI2D),
>                                             "Blit11 2D I swizzle pixel shader"));
>             break;
>         case SWIZZLESHADER_CUBE_FLOAT:
>-            ANGLE_TRY(addSwizzleShaderToMap(swizzleShaderType, SHADER_3D,
>+            ANGLE_TRY(addSwizzleShaderToMap(context, swizzleShaderType, SHADER_3D,
>                                             ShaderData(g_PS_SwizzleF2DArray),
>                                             "Blit11 2D Cube F swizzle pixel shader"));
>             break;
>         case SWIZZLESHADER_CUBE_UINT:
>-            ANGLE_TRY(addSwizzleShaderToMap(swizzleShaderType, SHADER_3D,
>+            ANGLE_TRY(addSwizzleShaderToMap(context, swizzleShaderType, SHADER_3D,
>                                             ShaderData(g_PS_SwizzleUI2DArray),
>                                             "Blit11 2D Cube UI swizzle pixel shader"));
>             break;
>         case SWIZZLESHADER_CUBE_INT:
>-            ANGLE_TRY(addSwizzleShaderToMap(swizzleShaderType, SHADER_3D,
>+            ANGLE_TRY(addSwizzleShaderToMap(context, swizzleShaderType, SHADER_3D,
>                                             ShaderData(g_PS_SwizzleI2DArray),
>                                             "Blit11 2D Cube I swizzle pixel shader"));
>             break;
>         case SWIZZLESHADER_3D_FLOAT:
>-            ANGLE_TRY(addSwizzleShaderToMap(swizzleShaderType, SHADER_3D,
>+            ANGLE_TRY(addSwizzleShaderToMap(context, swizzleShaderType, SHADER_3D,
>                                             ShaderData(g_PS_SwizzleF3D),
>                                             "Blit11 3D F swizzle pixel shader"));
>             break;
>         case SWIZZLESHADER_3D_UINT:
>-            ANGLE_TRY(addSwizzleShaderToMap(swizzleShaderType, SHADER_3D,
>+            ANGLE_TRY(addSwizzleShaderToMap(context, swizzleShaderType, SHADER_3D,
>                                             ShaderData(g_PS_SwizzleUI3D),
>                                             "Blit11 3D UI swizzle pixel shader"));
>             break;
>         case SWIZZLESHADER_3D_INT:
>-            ANGLE_TRY(addSwizzleShaderToMap(swizzleShaderType, SHADER_3D,
>+            ANGLE_TRY(addSwizzleShaderToMap(context, swizzleShaderType, SHADER_3D,
>                                             ShaderData(g_PS_SwizzleI3D),
>                                             "Blit11 3D I swizzle pixel shader"));
>             break;
>         case SWIZZLESHADER_ARRAY_FLOAT:
>-            ANGLE_TRY(addSwizzleShaderToMap(swizzleShaderType, SHADER_3D,
>+            ANGLE_TRY(addSwizzleShaderToMap(context, swizzleShaderType, SHADER_3D,
>                                             ShaderData(g_PS_SwizzleF2DArray),
>                                             "Blit11 2D Array F swizzle pixel shader"));
>             break;
>         case SWIZZLESHADER_ARRAY_UINT:
>-            ANGLE_TRY(addSwizzleShaderToMap(swizzleShaderType, SHADER_3D,
>+            ANGLE_TRY(addSwizzleShaderToMap(context, swizzleShaderType, SHADER_3D,
>                                             ShaderData(g_PS_SwizzleUI2DArray),
>                                             "Blit11 2D Array UI swizzle pixel shader"));
>             break;
>         case SWIZZLESHADER_ARRAY_INT:
>-            ANGLE_TRY(addSwizzleShaderToMap(swizzleShaderType, SHADER_3D,
>+            ANGLE_TRY(addSwizzleShaderToMap(context, swizzleShaderType, SHADER_3D,
>                                             ShaderData(g_PS_SwizzleI2DArray),
>                                             "Blit11 2D Array I swizzle pixel shader"));
>             break;
>         default:
>-            UNREACHABLE();
>-            return gl::InternalError() << "Internal error";
>+            ANGLE_HR_UNREACHABLE(GetImplAs<Context11>(context));
>     }
> 
>     swizzleShaderIt = mSwizzleShaderMap.find(swizzleShaderType);
>     ASSERT(swizzleShaderIt != mSwizzleShaderMap.end());
>     *shader = &swizzleShaderIt->second;
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::ErrorOrResult<TextureHelper11> Blit11::resolveDepth(const gl::Context *context,
>-                                                        RenderTarget11 *depth)
>+angle::Result Blit11::resolveDepth(const gl::Context *context,
>+                                   RenderTarget11 *depth,
>+                                   TextureHelper11 *textureOut)
> {
>-    ANGLE_TRY(initResources());
>+    ANGLE_TRY(initResources(context));
> 
>     // Multisampled depth stencil SRVs are not available in feature level 10.0
>     ASSERT(mRenderer->getRenderer11DeviceCaps().featureLevel > D3D_FEATURE_LEVEL_10_0);
> 
>-    const auto &extents          = depth->getExtents();
>-    auto *deviceContext          = mRenderer->getDeviceContext();
>-    auto *stateManager           = mRenderer->getStateManager();
>+    const auto &extents = depth->getExtents();
>+    auto *deviceContext = mRenderer->getDeviceContext();
>+    auto *stateManager  = mRenderer->getStateManager();
> 
>-    ANGLE_TRY(initResolveDepthOnly(depth->getFormatSet(), extents));
>+    ANGLE_TRY(initResolveDepthOnly(context, depth->getFormatSet(), extents));
> 
>-    ANGLE_TRY(mResolveDepthStencilVS.resolve(mRenderer));
>-    ANGLE_TRY(mResolveDepthPS.resolve(mRenderer));
>+    Context11 *context11 = GetImplAs<Context11>(context);
>+
>+    ANGLE_TRY(mResolveDepthStencilVS.resolve(context11, mRenderer));
>+    ANGLE_TRY(mResolveDepthPS.resolve(context11, mRenderer));
> 
>     // Apply the necessary state changes to the D3D11 immediate device context.
>     stateManager->setInputLayout(nullptr);
>@@ -1960,20 +1738,24 @@ gl::ErrorOrResult<TextureHelper11> Blit11::resolveDepth(const gl::Context *conte
>     stateManager->setSimpleViewport(extents);
> 
>     // Set the viewport
>-    stateManager->setShaderResourceShared(gl::SAMPLER_PIXEL, 0, &depth->getShaderResourceView());
>+    stateManager->setShaderResourceShared(gl::ShaderType::Fragment, 0,
>+                                          &depth->getShaderResourceView(context));
> 
>     // Trigger the blit on the GPU.
>     deviceContext->Draw(6, 0);
> 
>-    return mResolvedDepth;
>+    *textureOut = mResolvedDepth;
>+    return angle::Result::Continue;
> }
> 
>-gl::Error Blit11::initResolveDepthOnly(const d3d11::Format &format, const gl::Extents &extents)
>+angle::Result Blit11::initResolveDepthOnly(const gl::Context *context,
>+                                           const d3d11::Format &format,
>+                                           const gl::Extents &extents)
> {
>     if (mResolvedDepth.valid() && extents == mResolvedDepth.getExtents() &&
>         format.texFormat == mResolvedDepth.getFormat())
>     {
>-        return gl::NoError();
>+        return angle::Result::Continue;
>     }
> 
>     D3D11_TEXTURE2D_DESC textureDesc;
>@@ -1989,7 +1771,9 @@ gl::Error Blit11::initResolveDepthOnly(const d3d11::Format &format, const gl::Ex
>     textureDesc.CPUAccessFlags     = 0;
>     textureDesc.MiscFlags          = 0;
> 
>-    ANGLE_TRY(mRenderer->allocateTexture(textureDesc, format, &mResolvedDepth));
>+    Context11 *context11 = GetImplAs<Context11>(context);
>+
>+    ANGLE_TRY(mRenderer->allocateTexture(context11, textureDesc, format, &mResolvedDepth));
>     mResolvedDepth.setDebugName("Blit11::mResolvedDepth");
> 
>     D3D11_DEPTH_STENCIL_VIEW_DESC dsvDesc;
>@@ -1998,24 +1782,26 @@ gl::Error Blit11::initResolveDepthOnly(const d3d11::Format &format, const gl::Ex
>     dsvDesc.Texture2D.MipSlice = 0;
>     dsvDesc.ViewDimension      = D3D11_DSV_DIMENSION_TEXTURE2D;
> 
>-    ANGLE_TRY(mRenderer->allocateResource(dsvDesc, mResolvedDepth.get(), &mResolvedDepthDSView));
>+    ANGLE_TRY(mRenderer->allocateResource(context11, dsvDesc, mResolvedDepth.get(),
>+                                          &mResolvedDepthDSView));
>     mResolvedDepthDSView.setDebugName("Blit11::mResolvedDepthDSView");
> 
>     // Possibly D3D11 bug or undefined behaviour: Clear the DSV so that our first render
>     // works as expected. Otherwise the results of the first use seem to be incorrect.
>-    ID3D11DeviceContext *context = mRenderer->getDeviceContext();
>-    context->ClearDepthStencilView(mResolvedDepthDSView.get(), D3D11_CLEAR_DEPTH, 1.0f, 0);
>+    ID3D11DeviceContext *deviceContext = mRenderer->getDeviceContext();
>+    deviceContext->ClearDepthStencilView(mResolvedDepthDSView.get(), D3D11_CLEAR_DEPTH, 1.0f, 0);
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error Blit11::initResolveDepthStencil(const gl::Extents &extents)
>+angle::Result Blit11::initResolveDepthStencil(const gl::Context *context,
>+                                              const gl::Extents &extents)
> {
>     // Check if we need to recreate depth stencil view
>     if (mResolvedDepthStencil.valid() && extents == mResolvedDepthStencil.getExtents())
>     {
>         ASSERT(mResolvedDepthStencil.getFormat() == DXGI_FORMAT_R32G32_FLOAT);
>-        return gl::NoError();
>+        return angle::Result::Continue;
>     }
> 
>     if (mResolvedDepthStencil.valid())
>@@ -2038,32 +1824,36 @@ gl::Error Blit11::initResolveDepthStencil(const gl::Extents &extents)
>     textureDesc.CPUAccessFlags     = 0;
>     textureDesc.MiscFlags          = 0;
> 
>-    ANGLE_TRY(mRenderer->allocateTexture(textureDesc, formatSet, &mResolvedDepthStencil));
>+    Context11 *context11 = GetImplAs<Context11>(context);
>+
>+    ANGLE_TRY(
>+        mRenderer->allocateTexture(context11, textureDesc, formatSet, &mResolvedDepthStencil));
>     mResolvedDepthStencil.setDebugName("Blit11::mResolvedDepthStencil");
> 
>-    ANGLE_TRY(mRenderer->allocateResourceNoDesc(mResolvedDepthStencil.get(),
>+    ANGLE_TRY(mRenderer->allocateResourceNoDesc(context11, mResolvedDepthStencil.get(),
>                                                 &mResolvedDepthStencilRTView));
>     mResolvedDepthStencilRTView.setDebugName("Blit11::mResolvedDepthStencilRTView");
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::ErrorOrResult<TextureHelper11> Blit11::resolveStencil(const gl::Context *context,
>-                                                          RenderTarget11 *depthStencil,
>-                                                          bool alsoDepth)
>+angle::Result Blit11::resolveStencil(const gl::Context *context,
>+                                     RenderTarget11 *depthStencil,
>+                                     bool alsoDepth,
>+                                     TextureHelper11 *textureOut)
> {
>-    ANGLE_TRY(initResources());
>+    ANGLE_TRY(initResources(context));
> 
>     // Multisampled depth stencil SRVs are not available in feature level 10.0
>     ASSERT(mRenderer->getRenderer11DeviceCaps().featureLevel > D3D_FEATURE_LEVEL_10_0);
> 
>     const auto &extents = depthStencil->getExtents();
> 
>-    ANGLE_TRY(initResolveDepthStencil(extents));
>+    ANGLE_TRY(initResolveDepthStencil(context, extents));
> 
>     ID3D11DeviceContext *deviceContext = mRenderer->getDeviceContext();
>-    auto *stateManager              = mRenderer->getStateManager();
>-    ID3D11Resource *stencilResource = depthStencil->getTexture().get();
>+    auto *stateManager                 = mRenderer->getStateManager();
>+    ID3D11Resource *stencilResource    = depthStencil->getTexture().get();
> 
>     // Check if we need to re-create the stencil SRV.
>     if (mStencilSRV.valid())
>@@ -2079,18 +1869,21 @@ gl::ErrorOrResult<TextureHelper11> Blit11::resolveStencil(const gl::Context *con
>         SafeRelease(priorResource);
>     }
> 
>+    Context11 *context11 = GetImplAs<Context11>(context);
>+
>     if (!mStencilSRV.valid())
>     {
>         D3D11_SHADER_RESOURCE_VIEW_DESC srViewDesc;
>         srViewDesc.Format        = GetStencilSRVFormat(depthStencil->getFormatSet());
>         srViewDesc.ViewDimension = D3D11_SRV_DIMENSION_TEXTURE2DMS;
> 
>-        ANGLE_TRY(mRenderer->allocateResource(srViewDesc, stencilResource, &mStencilSRV));
>+        ANGLE_TRY(
>+            mRenderer->allocateResource(context11, srViewDesc, stencilResource, &mStencilSRV));
>         mStencilSRV.setDebugName("Blit11::mStencilSRV");
>     }
> 
>     // Notify the Renderer that all state should be invalidated.
>-    ANGLE_TRY(mResolveDepthStencilVS.resolve(mRenderer));
>+    ANGLE_TRY(mResolveDepthStencilVS.resolve(context11, mRenderer));
> 
>     // Resolving the depth buffer works by sampling the depth in the shader using a SRV, then
>     // writing to the resolved depth buffer using SV_Depth. We can't use this method for stencil
>@@ -2098,12 +1891,12 @@ gl::ErrorOrResult<TextureHelper11> Blit11::resolveStencil(const gl::Context *con
>     const d3d11::PixelShader *pixelShader = nullptr;
>     if (alsoDepth)
>     {
>-        ANGLE_TRY(mResolveDepthStencilPS.resolve(mRenderer));
>+        ANGLE_TRY(mResolveDepthStencilPS.resolve(context11, mRenderer));
>         pixelShader = &mResolveDepthStencilPS.getObj();
>     }
>     else
>     {
>-        ANGLE_TRY(mResolveStencilPS.resolve(mRenderer));
>+        ANGLE_TRY(mResolveStencilPS.resolve(context11, mRenderer));
>         pixelShader = &mResolveStencilPS.getObj();
>     }
> 
>@@ -2118,30 +1911,28 @@ gl::ErrorOrResult<TextureHelper11> Blit11::resolveStencil(const gl::Context *con
> 
>     // Set the viewport
>     stateManager->setSimpleViewport(extents);
>-    stateManager->setShaderResourceShared(gl::SAMPLER_PIXEL, 0,
>-                                          &depthStencil->getShaderResourceView());
>-    stateManager->setShaderResource(gl::SAMPLER_PIXEL, 1, &mStencilSRV);
>+    stateManager->setShaderResourceShared(gl::ShaderType::Fragment, 0,
>+                                          &depthStencil->getShaderResourceView(context));
>+    stateManager->setShaderResource(gl::ShaderType::Fragment, 1, &mStencilSRV);
> 
>     // Trigger the blit on the GPU.
>     deviceContext->Draw(6, 0);
> 
>     gl::Box copyBox(0, 0, 0, extents.width, extents.height, 1);
> 
>-    TextureHelper11 dest;
>-    ANGLE_TRY_RESULT(
>-        mRenderer->createStagingTexture(ResourceType::Texture2D, depthStencil->getFormatSet(),
>-                                        extents, StagingAccess::READ_WRITE),
>-        dest);
>+    ANGLE_TRY(mRenderer->createStagingTexture(context, ResourceType::Texture2D,
>+                                              depthStencil->getFormatSet(), extents,
>+                                              StagingAccess::READ_WRITE, textureOut));
> 
>     const auto &copyFunction = GetCopyDepthStencilFunction(depthStencil->getInternalFormat());
>     const auto &dsFormatSet  = depthStencil->getFormatSet();
>     const auto &dsDxgiInfo   = d3d11::GetDXGIFormatSizeInfo(dsFormatSet.texFormat);
> 
>-    ANGLE_TRY(copyAndConvertImpl(mResolvedDepthStencil, 0, copyBox, extents, dest, copyBox, extents,
>-                                 nullptr, 0, 0, 0, 8u, dsDxgiInfo.pixelBytes, copyFunction));
>+    ANGLE_TRY(copyAndConvertImpl(context, mResolvedDepthStencil, 0, copyBox, extents, *textureOut,
>+                                 copyBox, extents, nullptr, 0, 0, 0, 8u, dsDxgiInfo.pixelBytes,
>+                                 copyFunction));
> 
>-    // Return the resolved depth texture, which the caller must Release.
>-    return dest;
>+    return angle::Result::Continue;
> }
> 
> void Blit11::releaseResolveDepthStencilResources()
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/Blit11.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/Blit11.h
>index 14078f9db88..47ef453831e 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/Blit11.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/Blit11.h
>@@ -27,63 +27,68 @@ class Blit11 : angle::NonCopyable
>     explicit Blit11(Renderer11 *renderer);
>     ~Blit11();
> 
>-    gl::Error swizzleTexture(const gl::Context *context,
>-                             const d3d11::SharedSRV &source,
>-                             const d3d11::RenderTargetView &dest,
>-                             const gl::Extents &size,
>-                             const gl::SwizzleState &swizzleTarget);
>-
>-    gl::Error copyTexture(const gl::Context *context,
>-                          const d3d11::SharedSRV &source,
>-                          const gl::Box &sourceArea,
>-                          const gl::Extents &sourceSize,
>-                          GLenum sourceFormat,
>-                          const d3d11::RenderTargetView &dest,
>-                          const gl::Box &destArea,
>-                          const gl::Extents &destSize,
>-                          const gl::Rectangle *scissor,
>-                          GLenum destFormat,
>-                          GLenum filter,
>-                          bool maskOffAlpha,
>-                          bool unpackPremultiplyAlpha,
>-                          bool unpackUnmultiplyAlpha);
>-
>-    gl::Error copyStencil(const gl::Context *context,
>-                          const TextureHelper11 &source,
>-                          unsigned int sourceSubresource,
>-                          const gl::Box &sourceArea,
>-                          const gl::Extents &sourceSize,
>-                          const TextureHelper11 &dest,
>-                          unsigned int destSubresource,
>-                          const gl::Box &destArea,
>-                          const gl::Extents &destSize,
>-                          const gl::Rectangle *scissor);
>-
>-    gl::Error copyDepth(const gl::Context *context,
>-                        const d3d11::SharedSRV &source,
>-                        const gl::Box &sourceArea,
>-                        const gl::Extents &sourceSize,
>-                        const d3d11::DepthStencilView &dest,
>-                        const gl::Box &destArea,
>-                        const gl::Extents &destSize,
>-                        const gl::Rectangle *scissor);
>-
>-    gl::Error copyDepthStencil(const TextureHelper11 &source,
>-                               unsigned int sourceSubresource,
>-                               const gl::Box &sourceArea,
>-                               const gl::Extents &sourceSize,
>-                               const TextureHelper11 &dest,
>-                               unsigned int destSubresource,
>-                               const gl::Box &destArea,
>-                               const gl::Extents &destSize,
>-                               const gl::Rectangle *scissor);
>-
>-    gl::ErrorOrResult<TextureHelper11> resolveDepth(const gl::Context *context,
>-                                                    RenderTarget11 *depth);
>-
>-    gl::ErrorOrResult<TextureHelper11> resolveStencil(const gl::Context *context,
>-                                                      RenderTarget11 *depthStencil,
>-                                                      bool alsoDepth);
>+    angle::Result swizzleTexture(const gl::Context *context,
>+                                 const d3d11::SharedSRV &source,
>+                                 const d3d11::RenderTargetView &dest,
>+                                 const gl::Extents &size,
>+                                 const gl::SwizzleState &swizzleTarget);
>+
>+    // Set destTypeForDownsampling to GL_NONE to skip downsampling
>+    angle::Result copyTexture(const gl::Context *context,
>+                              const d3d11::SharedSRV &source,
>+                              const gl::Box &sourceArea,
>+                              const gl::Extents &sourceSize,
>+                              GLenum sourceFormat,
>+                              const d3d11::RenderTargetView &dest,
>+                              const gl::Box &destArea,
>+                              const gl::Extents &destSize,
>+                              const gl::Rectangle *scissor,
>+                              GLenum destFormat,
>+                              GLenum destTypeForDownsampling,
>+                              GLenum filter,
>+                              bool maskOffAlpha,
>+                              bool unpackPremultiplyAlpha,
>+                              bool unpackUnmultiplyAlpha);
>+
>+    angle::Result copyStencil(const gl::Context *context,
>+                              const TextureHelper11 &source,
>+                              unsigned int sourceSubresource,
>+                              const gl::Box &sourceArea,
>+                              const gl::Extents &sourceSize,
>+                              const TextureHelper11 &dest,
>+                              unsigned int destSubresource,
>+                              const gl::Box &destArea,
>+                              const gl::Extents &destSize,
>+                              const gl::Rectangle *scissor);
>+
>+    angle::Result copyDepth(const gl::Context *context,
>+                            const d3d11::SharedSRV &source,
>+                            const gl::Box &sourceArea,
>+                            const gl::Extents &sourceSize,
>+                            const d3d11::DepthStencilView &dest,
>+                            const gl::Box &destArea,
>+                            const gl::Extents &destSize,
>+                            const gl::Rectangle *scissor);
>+
>+    angle::Result copyDepthStencil(const gl::Context *context,
>+                                   const TextureHelper11 &source,
>+                                   unsigned int sourceSubresource,
>+                                   const gl::Box &sourceArea,
>+                                   const gl::Extents &sourceSize,
>+                                   const TextureHelper11 &dest,
>+                                   unsigned int destSubresource,
>+                                   const gl::Box &destArea,
>+                                   const gl::Extents &destSize,
>+                                   const gl::Rectangle *scissor);
>+
>+    angle::Result resolveDepth(const gl::Context *context,
>+                               RenderTarget11 *depth,
>+                               TextureHelper11 *textureOut);
>+
>+    angle::Result resolveStencil(const gl::Context *context,
>+                                 RenderTarget11 *depthStencil,
>+                                 bool alsoDepth,
>+                                 TextureHelper11 *textureOut);
> 
>     using BlitConvertFunction = void(const gl::Box &sourceArea,
>                                      const gl::Box &destArea,
>@@ -100,66 +105,8 @@ class Blit11 : angle::NonCopyable
>                                      uint8_t *destData);
> 
>   private:
>-    enum BlitShaderType
>-    {
>-        BLITSHADER_INVALID,
>-
>-        // Passthrough shaders
>-        BLITSHADER_2D_RGBAF,
>-        BLITSHADER_2D_BGRAF,
>-        BLITSHADER_2D_RGBF,
>-        BLITSHADER_2D_RGF,
>-        BLITSHADER_2D_RF,
>-        BLITSHADER_2D_ALPHA,
>-        BLITSHADER_2D_LUMA,
>-        BLITSHADER_2D_LUMAALPHA,
>-        BLITSHADER_2D_RGBAUI,
>-        BLITSHADER_2D_RGBAI,
>-        BLITSHADER_2D_RGBUI,
>-        BLITSHADER_2D_RGBI,
>-        BLITSHADER_2D_RGUI,
>-        BLITSHADER_2D_RGI,
>-        BLITSHADER_2D_RUI,
>-        BLITSHADER_2D_RI,
>-        BLITSHADER_3D_RGBAF,
>-        BLITSHADER_3D_RGBAUI,
>-        BLITSHADER_3D_RGBAI,
>-        BLITSHADER_3D_BGRAF,
>-        BLITSHADER_3D_RGBF,
>-        BLITSHADER_3D_RGBUI,
>-        BLITSHADER_3D_RGBI,
>-        BLITSHADER_3D_RGF,
>-        BLITSHADER_3D_RGUI,
>-        BLITSHADER_3D_RGI,
>-        BLITSHADER_3D_RF,
>-        BLITSHADER_3D_RUI,
>-        BLITSHADER_3D_RI,
>-        BLITSHADER_3D_ALPHA,
>-        BLITSHADER_3D_LUMA,
>-        BLITSHADER_3D_LUMAALPHA,
>-
>-        // Multiply alpha shaders
>-        BLITSHADER_2D_RGBAF_PREMULTIPLY,
>-        BLITSHADER_2D_RGBAF_UNMULTIPLY,
>-
>-        BLITSHADER_2D_RGBF_PREMULTIPLY,
>-        BLITSHADER_2D_RGBF_UNMULTIPLY,
>-
>-        BLITSHADER_2D_RGBAF_TOUI,
>-        BLITSHADER_2D_RGBAF_TOUI_PREMULTIPLY,
>-        BLITSHADER_2D_RGBAF_TOUI_UNMULTIPLY,
>-
>-        BLITSHADER_2D_RGBF_TOUI,
>-        BLITSHADER_2D_RGBF_TOUI_PREMULTIPLY,
>-        BLITSHADER_2D_RGBF_TOUI_UNMULTIPLY,
>-
>-        BLITSHADER_2D_LUMAF_PREMULTIPLY,
>-        BLITSHADER_2D_LUMAF_UNMULTIPLY,
>-
>-        BLITSHADER_2D_LUMAALPHAF_PREMULTIPLY,
>-        BLITSHADER_2D_LUMAALPHAF_UNMULTIPLY
>-    };
>-
>+    enum BlitShaderOperation : unsigned int;
>+    enum BlitShaderType : unsigned int;
>     enum SwizzleShaderType
>     {
>         SWIZZLESHADER_INVALID,
>@@ -188,8 +135,10 @@ class Blit11 : angle::NonCopyable
> 
>     enum ShaderDimension
>     {
>+        SHADER_INVALID,
>         SHADER_2D,
>         SHADER_3D,
>+        SHADER_2DARRAY
>     };
> 
>     struct Shader
>@@ -211,34 +160,60 @@ class Blit11 : angle::NonCopyable
>         WriteVertexFunction vertexWriteFunction;
>     };
> 
>-    gl::Error initResources();
>+    angle::Result initResources(const gl::Context *context);
>+
>+    angle::Result getShaderSupport(const gl::Context *context,
>+                                   const Shader &shader,
>+                                   ShaderSupport *supportOut);
> 
>-    gl::Error getShaderSupport(const Shader &shader, ShaderSupport *supportOut);
>+    static BlitShaderOperation getBlitShaderOperation(GLenum destinationFormat,
>+                                                      GLenum sourceFormat,
>+                                                      bool isSrcSigned,
>+                                                      bool isDestSigned,
>+                                                      bool unpackPremultiplyAlpha,
>+                                                      bool unpackUnmultiplyAlpha,
>+                                                      GLenum destTypeForDownsampling);
> 
>-    static BlitShaderType GetBlitShaderType(GLenum destinationFormat,
>-                                            GLenum sourceFormat,
>-                                            bool isSigned,
>-                                            bool unpackPremultiplyAlpha,
>-                                            bool unpackUnmultiplyAlpha,
>+    static BlitShaderType getBlitShaderType(BlitShaderOperation operation,
>                                             ShaderDimension dimension);
>+
>     static SwizzleShaderType GetSwizzleShaderType(GLenum type, D3D11_SRV_DIMENSION dimensionality);
> 
>-    gl::Error copyDepthStencilImpl(const TextureHelper11 &source,
>-                                   unsigned int sourceSubresource,
>-                                   const gl::Box &sourceArea,
>-                                   const gl::Extents &sourceSize,
>-                                   const TextureHelper11 &dest,
>-                                   unsigned int destSubresource,
>-                                   const gl::Box &destArea,
>-                                   const gl::Extents &destSize,
>-                                   const gl::Rectangle *scissor,
>-                                   bool stencilOnly);
>+    angle::Result copyDepthStencilImpl(const gl::Context *context,
>+                                       const TextureHelper11 &source,
>+                                       unsigned int sourceSubresource,
>+                                       const gl::Box &sourceArea,
>+                                       const gl::Extents &sourceSize,
>+                                       const TextureHelper11 &dest,
>+                                       unsigned int destSubresource,
>+                                       const gl::Box &destArea,
>+                                       const gl::Extents &destSize,
>+                                       const gl::Rectangle *scissor,
>+                                       bool stencilOnly);
>+
>+    angle::Result copyAndConvertImpl(const gl::Context *context,
>+                                     const TextureHelper11 &source,
>+                                     unsigned int sourceSubresource,
>+                                     const gl::Box &sourceArea,
>+                                     const gl::Extents &sourceSize,
>+                                     const TextureHelper11 &destStaging,
>+                                     const gl::Box &destArea,
>+                                     const gl::Extents &destSize,
>+                                     const gl::Rectangle *scissor,
>+                                     size_t readOffset,
>+                                     size_t writeOffset,
>+                                     size_t copySize,
>+                                     size_t srcPixelStride,
>+                                     size_t destPixelStride,
>+                                     BlitConvertFunction *convertFunction);
> 
>-    gl::Error copyAndConvertImpl(const TextureHelper11 &source,
>+    angle::Result copyAndConvert(const gl::Context *context,
>+                                 const TextureHelper11 &source,
>                                  unsigned int sourceSubresource,
>                                  const gl::Box &sourceArea,
>                                  const gl::Extents &sourceSize,
>-                                 const TextureHelper11 &destStaging,
>+                                 const TextureHelper11 &dest,
>+                                 unsigned int destSubresource,
>                                  const gl::Box &destArea,
>                                  const gl::Extents &destSize,
>                                  const gl::Rectangle *scissor,
>@@ -249,47 +224,40 @@ class Blit11 : angle::NonCopyable
>                                  size_t destPixelStride,
>                                  BlitConvertFunction *convertFunction);
> 
>-    gl::Error copyAndConvert(const TextureHelper11 &source,
>-                             unsigned int sourceSubresource,
>-                             const gl::Box &sourceArea,
>-                             const gl::Extents &sourceSize,
>-                             const TextureHelper11 &dest,
>-                             unsigned int destSubresource,
>-                             const gl::Box &destArea,
>-                             const gl::Extents &destSize,
>-                             const gl::Rectangle *scissor,
>-                             size_t readOffset,
>-                             size_t writeOffset,
>-                             size_t copySize,
>-                             size_t srcPixelStride,
>-                             size_t destPixelStride,
>-                             BlitConvertFunction *convertFunction);
>-
>-    gl::Error addBlitShaderToMap(BlitShaderType blitShaderType,
>-                                 ShaderDimension dimension,
>-                                 const ShaderData &shaderData,
>-                                 const char *name);
>-
>-    gl::Error getBlitShader(GLenum destFormat,
>-                            GLenum sourceFormat,
>-                            bool isSigned,
>-                            bool unpackPremultiplyAlpha,
>-                            bool unpackUnmultiplyAlpha,
>-                            ShaderDimension dimension,
>-                            const Shader **shaderOut);
>-    gl::Error getSwizzleShader(GLenum type,
>-                               D3D11_SRV_DIMENSION viewDimension,
>-                               const Shader **shaderOut);
>-
>-    gl::Error addSwizzleShaderToMap(SwizzleShaderType swizzleShaderType,
>-                                    ShaderDimension dimension,
>-                                    const ShaderData &shaderData,
>-                                    const char *name);
>+    angle::Result mapBlitShader(const gl::Context *context, BlitShaderType blitShaderType);
>+    angle::Result addBlitShaderToMap(const gl::Context *context,
>+                                     BlitShaderType blitShaderType,
>+                                     ShaderDimension dimension,
>+                                     const ShaderData &shaderData,
>+                                     const char *name);
>+
>+    angle::Result getBlitShader(const gl::Context *context,
>+                                GLenum destFormat,
>+                                GLenum sourceFormat,
>+                                bool isSrcSigned,
>+                                bool isDestSigned,
>+                                bool unpackPremultiplyAlpha,
>+                                bool unpackUnmultiplyAlpha,
>+                                GLenum destTypeForDownsampling,
>+                                ShaderDimension dimension,
>+                                const Shader **shaderOut);
>+    angle::Result getSwizzleShader(const gl::Context *context,
>+                                   GLenum type,
>+                                   D3D11_SRV_DIMENSION viewDimension,
>+                                   const Shader **shaderOut);
>+
>+    angle::Result addSwizzleShaderToMap(const gl::Context *context,
>+                                        SwizzleShaderType swizzleShaderType,
>+                                        ShaderDimension dimension,
>+                                        const ShaderData &shaderData,
>+                                        const char *name);
> 
>     void clearShaderMap();
>     void releaseResolveDepthStencilResources();
>-    gl::Error initResolveDepthOnly(const d3d11::Format &format, const gl::Extents &extents);
>-    gl::Error initResolveDepthStencil(const gl::Extents &extents);
>+    angle::Result initResolveDepthOnly(const gl::Context *context,
>+                                       const d3d11::Format &format,
>+                                       const gl::Extents &extents);
>+    angle::Result initResolveDepthStencil(const gl::Context *context, const gl::Extents &extents);
> 
>     Renderer11 *mRenderer;
> 
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/Blit11Helper_autogen.inc b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/Blit11Helper_autogen.inc
>new file mode 100644
>index 00000000000..566270049b1
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/Blit11Helper_autogen.inc
>@@ -0,0 +1,1575 @@
>+// GENERATED FILE - DO NOT EDIT.
>+// Generated by gen_blit11helper.py.
>+//
>+// Copyright 2019 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// Blit11Helper_autogen.inc:
>+//   Defines and retrieves blitshaders for the D3D11 backend.
>+
>+namespace
>+{
>+// Include inline shaders in the anonymous namespace to make sure no symbols are exported
>+#include "libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgba2d11ps.h"
>+#include "libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgb2d11ps.h"
>+#include "libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrg2d11ps.h"
>+#include "libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughr2d11ps.h"
>+#include "libANGLE/renderer/d3d/d3d11/shaders/compiled/passthrougha2d11ps.h"
>+#include "libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughlum2d11ps.h"
>+#include "libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughlumalpha2d11ps.h"
>+#include "libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgba2dui11ps.h"
>+#include "libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgba2di11ps.h"
>+#include "libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgb2dui11ps.h"
>+#include "libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgb2di11ps.h"
>+#include "libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrg2dui11ps.h"
>+#include "libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrg2di11ps.h"
>+#include "libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughr2dui11ps.h"
>+#include "libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughr2di11ps.h"
>+#include "libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_pm_rgba_2d_ps.h"
>+#include "libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_um_rgba_2d_ps.h"
>+#include "libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_pm_rgb_2d_ps.h"
>+#include "libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_um_rgb_2d_ps.h"
>+#include "libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftou_pt_rgba_2d_ps.h"
>+#include "libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftou_pm_rgba_2d_ps.h"
>+#include "libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftou_um_rgba_2d_ps.h"
>+#include "libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftou_pt_rgb_2d_ps.h"
>+#include "libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftou_pm_rgb_2d_ps.h"
>+#include "libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftou_um_rgb_2d_ps.h"
>+#include "libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_pm_luma_2d_ps.h"
>+#include "libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_um_luma_2d_ps.h"
>+#include "libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_pm_lumaalpha_2d_ps.h"
>+#include "libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_um_lumaalpha_2d_ps.h"
>+#include "libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgba2d_4444_11ps.h"
>+#include "libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_pm_rgba_4444_2d_ps.h"
>+#include "libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_um_rgba_4444_2d_ps.h"
>+#include "libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgb2d_565_11ps.h"
>+#include "libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_pm_rgb_565_2d_ps.h"
>+#include "libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_um_rgb_565_2d_ps.h"
>+#include "libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgba2d_5551_11ps.h"
>+#include "libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_pm_rgba_5551_2d_ps.h"
>+#include "libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_um_rgba_5551_2d_ps.h"
>+#include "libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgba3d11ps.h"
>+#include "libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgb3d11ps.h"
>+#include "libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrg3d11ps.h"
>+#include "libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughr3d11ps.h"
>+#include "libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughlum3d11ps.h"
>+#include "libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughlumalpha3d11ps.h"
>+#include "libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgba3dui11ps.h"
>+#include "libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgba3di11ps.h"
>+#include "libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgb3dui11ps.h"
>+#include "libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgb3di11ps.h"
>+#include "libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrg3dui11ps.h"
>+#include "libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrg3di11ps.h"
>+#include "libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughr3dui11ps.h"
>+#include "libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughr3di11ps.h"
>+#include "libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_pm_rgba_3d_ps.h"
>+#include "libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_um_rgba_3d_ps.h"
>+#include "libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_pm_rgb_3d_ps.h"
>+#include "libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_um_rgb_3d_ps.h"
>+#include "libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftou_pt_rgba_3d_ps.h"
>+#include "libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftou_pm_rgba_3d_ps.h"
>+#include "libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftou_um_rgba_3d_ps.h"
>+#include "libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftou_pt_rgb_3d_ps.h"
>+#include "libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftou_pm_rgb_3d_ps.h"
>+#include "libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftou_um_rgb_3d_ps.h"
>+#include "libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftoi_pt_rgba_3d_ps.h"
>+#include "libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftoi_pm_rgba_3d_ps.h"
>+#include "libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftoi_um_rgba_3d_ps.h"
>+#include "libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftoi_pt_rgb_3d_ps.h"
>+#include "libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftoi_pm_rgb_3d_ps.h"
>+#include "libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftoi_um_rgb_3d_ps.h"
>+#include "libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_pm_luma_3d_ps.h"
>+#include "libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_um_luma_3d_ps.h"
>+#include "libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_pm_lumaalpha_3d_ps.h"
>+#include "libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_um_lumaalpha_3d_ps.h"
>+#include "libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgba3d_4444_11ps.h"
>+#include "libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_pm_rgba_4444_3d_ps.h"
>+#include "libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_um_rgba_4444_3d_ps.h"
>+#include "libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgb3d_565_11ps.h"
>+#include "libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_pm_rgb_565_3d_ps.h"
>+#include "libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_um_rgb_565_3d_ps.h"
>+#include "libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgba3d_5551_11ps.h"
>+#include "libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_pm_rgba_5551_3d_ps.h"
>+#include "libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_um_rgba_5551_3d_ps.h"
>+#include "libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgba2darray11ps.h"
>+#include "libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgb2darray11ps.h"
>+#include "libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrg2darray11ps.h"
>+#include "libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughr2darray11ps.h"
>+#include "libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughlum2darray11ps.h"
>+#include "libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughlumalpha2darray11ps.h"
>+#include "libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgba2darrayui11ps.h"
>+#include "libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgba2darrayi11ps.h"
>+#include "libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgb2darrayui11ps.h"
>+#include "libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgb2darrayi11ps.h"
>+#include "libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrg2darrayui11ps.h"
>+#include "libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrg2darrayi11ps.h"
>+#include "libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughr2darrayui11ps.h"
>+#include "libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughr2darrayi11ps.h"
>+#include "libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_pm_rgba_2darray_ps.h"
>+#include "libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_um_rgba_2darray_ps.h"
>+#include "libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_pm_rgb_2darray_ps.h"
>+#include "libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_um_rgb_2darray_ps.h"
>+#include "libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftou_pt_rgba_2darray_ps.h"
>+#include "libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftou_pm_rgba_2darray_ps.h"
>+#include "libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftou_um_rgba_2darray_ps.h"
>+#include "libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftou_pt_rgb_2darray_ps.h"
>+#include "libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftou_pm_rgb_2darray_ps.h"
>+#include "libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftou_um_rgb_2darray_ps.h"
>+#include "libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftoi_pt_rgba_2darray_ps.h"
>+#include "libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftoi_pm_rgba_2darray_ps.h"
>+#include "libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftoi_um_rgba_2darray_ps.h"
>+#include "libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftoi_pt_rgb_2darray_ps.h"
>+#include "libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftoi_pm_rgb_2darray_ps.h"
>+#include "libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftoi_um_rgb_2darray_ps.h"
>+#include "libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_pm_luma_2darray_ps.h"
>+#include "libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_um_luma_2darray_ps.h"
>+#include "libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_pm_lumaalpha_2darray_ps.h"
>+#include "libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_um_lumaalpha_2darray_ps.h"
>+#include "libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgba2darray_4444_11ps.h"
>+#include "libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_pm_rgba_4444_2darray_ps.h"
>+#include "libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_um_rgba_4444_2darray_ps.h"
>+#include "libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgb2darray_565_11ps.h"
>+#include "libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_pm_rgb_565_2darray_ps.h"
>+#include "libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_um_rgb_565_2darray_ps.h"
>+#include "libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgba2darray_5551_11ps.h"
>+#include "libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_pm_rgba_5551_2darray_ps.h"
>+#include "libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_um_rgba_5551_2darray_ps.h"
>+} // namespace
>+
>+enum Blit11::BlitShaderOperation : unsigned int
>+{
>+    RGBAF,
>+    BGRAF,
>+    RGBF,
>+    RGF,
>+    RF,
>+    ALPHA,
>+    LUMA,
>+    LUMAALPHA,
>+    RGBAUI,
>+    RGBAI,
>+    RGBUI,
>+    RGBI,
>+    RGUI,
>+    RGI,
>+    RUI,
>+    RI,
>+    RGBAF_PREMULTIPLY,
>+    RGBAF_UNMULTIPLY,
>+    RGBF_PREMULTIPLY,
>+    RGBF_UNMULTIPLY,
>+    RGBAF_TOUI,
>+    RGBAF_TOUI_PREMULTIPLY,
>+    RGBAF_TOUI_UNMULTIPLY,
>+    RGBF_TOUI,
>+    RGBF_TOUI_PREMULTIPLY,
>+    RGBF_TOUI_UNMULTIPLY,
>+    RGBAF_TOI,
>+    RGBAF_TOI_PREMULTIPLY,
>+    RGBAF_TOI_UNMULTIPLY,
>+    RGBF_TOI,
>+    RGBF_TOI_PREMULTIPLY,
>+    RGBF_TOI_UNMULTIPLY,
>+    LUMAF_PREMULTIPLY,
>+    LUMAF_UNMULTIPLY,
>+    LUMAALPHAF_PREMULTIPLY,
>+    LUMAALPHAF_UNMULTIPLY,
>+    RGBAF_4444,
>+    RGBAF_4444_PREMULTIPLY,
>+    RGBAF_4444_UNMULTIPLY,
>+    RGBF_565,
>+    RGBF_565_PREMULTIPLY,
>+    RGBF_565_UNMULTIPLY,
>+    RGBAF_5551,
>+    RGBAF_5551_PREMULTIPLY,
>+    RGBAF_5551_UNMULTIPLY,
>+    OPERATION_INVALID
>+};
>+
>+enum Blit11::BlitShaderType : unsigned int
>+{
>+    BLITSHADER_2D_RGBAF,
>+    BLITSHADER_2D_BGRAF,
>+    BLITSHADER_2D_RGBF,
>+    BLITSHADER_2D_RGF,
>+    BLITSHADER_2D_RF,
>+    BLITSHADER_2D_ALPHA,
>+    BLITSHADER_2D_LUMA,
>+    BLITSHADER_2D_LUMAALPHA,
>+    BLITSHADER_2D_RGBAUI,
>+    BLITSHADER_2D_RGBAI,
>+    BLITSHADER_2D_RGBUI,
>+    BLITSHADER_2D_RGBI,
>+    BLITSHADER_2D_RGUI,
>+    BLITSHADER_2D_RGI,
>+    BLITSHADER_2D_RUI,
>+    BLITSHADER_2D_RI,
>+    BLITSHADER_2D_RGBAF_PREMULTIPLY,
>+    BLITSHADER_2D_RGBAF_UNMULTIPLY,
>+    BLITSHADER_2D_RGBF_PREMULTIPLY,
>+    BLITSHADER_2D_RGBF_UNMULTIPLY,
>+    BLITSHADER_2D_RGBAF_TOUI,
>+    BLITSHADER_2D_RGBAF_TOUI_PREMULTIPLY,
>+    BLITSHADER_2D_RGBAF_TOUI_UNMULTIPLY,
>+    BLITSHADER_2D_RGBF_TOUI,
>+    BLITSHADER_2D_RGBF_TOUI_PREMULTIPLY,
>+    BLITSHADER_2D_RGBF_TOUI_UNMULTIPLY,
>+    BLITSHADER_2D_LUMAF_PREMULTIPLY,
>+    BLITSHADER_2D_LUMAF_UNMULTIPLY,
>+    BLITSHADER_2D_LUMAALPHAF_PREMULTIPLY,
>+    BLITSHADER_2D_LUMAALPHAF_UNMULTIPLY,
>+    BLITSHADER_2D_RGBAF_4444,
>+    BLITSHADER_2D_RGBAF_4444_PREMULTIPLY,
>+    BLITSHADER_2D_RGBAF_4444_UNMULTIPLY,
>+    BLITSHADER_2D_RGBF_565,
>+    BLITSHADER_2D_RGBF_565_PREMULTIPLY,
>+    BLITSHADER_2D_RGBF_565_UNMULTIPLY,
>+    BLITSHADER_2D_RGBAF_5551,
>+    BLITSHADER_2D_RGBAF_5551_PREMULTIPLY,
>+    BLITSHADER_2D_RGBAF_5551_UNMULTIPLY,
>+    BLITSHADER_3D_RGBAF,
>+    BLITSHADER_3D_BGRAF,
>+    BLITSHADER_3D_RGBF,
>+    BLITSHADER_3D_RGF,
>+    BLITSHADER_3D_RF,
>+    BLITSHADER_3D_ALPHA,
>+    BLITSHADER_3D_LUMA,
>+    BLITSHADER_3D_LUMAALPHA,
>+    BLITSHADER_3D_RGBAUI,
>+    BLITSHADER_3D_RGBAI,
>+    BLITSHADER_3D_RGBUI,
>+    BLITSHADER_3D_RGBI,
>+    BLITSHADER_3D_RGUI,
>+    BLITSHADER_3D_RGI,
>+    BLITSHADER_3D_RUI,
>+    BLITSHADER_3D_RI,
>+    BLITSHADER_3D_RGBAF_PREMULTIPLY,
>+    BLITSHADER_3D_RGBAF_UNMULTIPLY,
>+    BLITSHADER_3D_RGBF_PREMULTIPLY,
>+    BLITSHADER_3D_RGBF_UNMULTIPLY,
>+    BLITSHADER_3D_RGBAF_TOUI,
>+    BLITSHADER_3D_RGBAF_TOUI_PREMULTIPLY,
>+    BLITSHADER_3D_RGBAF_TOUI_UNMULTIPLY,
>+    BLITSHADER_3D_RGBF_TOUI,
>+    BLITSHADER_3D_RGBF_TOUI_PREMULTIPLY,
>+    BLITSHADER_3D_RGBF_TOUI_UNMULTIPLY,
>+    BLITSHADER_3D_RGBAF_TOI,
>+    BLITSHADER_3D_RGBAF_TOI_PREMULTIPLY,
>+    BLITSHADER_3D_RGBAF_TOI_UNMULTIPLY,
>+    BLITSHADER_3D_RGBF_TOI,
>+    BLITSHADER_3D_RGBF_TOI_PREMULTIPLY,
>+    BLITSHADER_3D_RGBF_TOI_UNMULTIPLY,
>+    BLITSHADER_3D_LUMAF_PREMULTIPLY,
>+    BLITSHADER_3D_LUMAF_UNMULTIPLY,
>+    BLITSHADER_3D_LUMAALPHAF_PREMULTIPLY,
>+    BLITSHADER_3D_LUMAALPHAF_UNMULTIPLY,
>+    BLITSHADER_3D_RGBAF_4444,
>+    BLITSHADER_3D_RGBAF_4444_PREMULTIPLY,
>+    BLITSHADER_3D_RGBAF_4444_UNMULTIPLY,
>+    BLITSHADER_3D_RGBF_565,
>+    BLITSHADER_3D_RGBF_565_PREMULTIPLY,
>+    BLITSHADER_3D_RGBF_565_UNMULTIPLY,
>+    BLITSHADER_3D_RGBAF_5551,
>+    BLITSHADER_3D_RGBAF_5551_PREMULTIPLY,
>+    BLITSHADER_3D_RGBAF_5551_UNMULTIPLY,
>+    BLITSHADER_2DARRAY_RGBAF,
>+    BLITSHADER_2DARRAY_BGRAF,
>+    BLITSHADER_2DARRAY_RGBF,
>+    BLITSHADER_2DARRAY_RGF,
>+    BLITSHADER_2DARRAY_RF,
>+    BLITSHADER_2DARRAY_ALPHA,
>+    BLITSHADER_2DARRAY_LUMA,
>+    BLITSHADER_2DARRAY_LUMAALPHA,
>+    BLITSHADER_2DARRAY_RGBAUI,
>+    BLITSHADER_2DARRAY_RGBAI,
>+    BLITSHADER_2DARRAY_RGBUI,
>+    BLITSHADER_2DARRAY_RGBI,
>+    BLITSHADER_2DARRAY_RGUI,
>+    BLITSHADER_2DARRAY_RGI,
>+    BLITSHADER_2DARRAY_RUI,
>+    BLITSHADER_2DARRAY_RI,
>+    BLITSHADER_2DARRAY_RGBAF_PREMULTIPLY,
>+    BLITSHADER_2DARRAY_RGBAF_UNMULTIPLY,
>+    BLITSHADER_2DARRAY_RGBF_PREMULTIPLY,
>+    BLITSHADER_2DARRAY_RGBF_UNMULTIPLY,
>+    BLITSHADER_2DARRAY_RGBAF_TOUI,
>+    BLITSHADER_2DARRAY_RGBAF_TOUI_PREMULTIPLY,
>+    BLITSHADER_2DARRAY_RGBAF_TOUI_UNMULTIPLY,
>+    BLITSHADER_2DARRAY_RGBF_TOUI,
>+    BLITSHADER_2DARRAY_RGBF_TOUI_PREMULTIPLY,
>+    BLITSHADER_2DARRAY_RGBF_TOUI_UNMULTIPLY,
>+    BLITSHADER_2DARRAY_RGBAF_TOI,
>+    BLITSHADER_2DARRAY_RGBAF_TOI_PREMULTIPLY,
>+    BLITSHADER_2DARRAY_RGBAF_TOI_UNMULTIPLY,
>+    BLITSHADER_2DARRAY_RGBF_TOI,
>+    BLITSHADER_2DARRAY_RGBF_TOI_PREMULTIPLY,
>+    BLITSHADER_2DARRAY_RGBF_TOI_UNMULTIPLY,
>+    BLITSHADER_2DARRAY_LUMAF_PREMULTIPLY,
>+    BLITSHADER_2DARRAY_LUMAF_UNMULTIPLY,
>+    BLITSHADER_2DARRAY_LUMAALPHAF_PREMULTIPLY,
>+    BLITSHADER_2DARRAY_LUMAALPHAF_UNMULTIPLY,
>+    BLITSHADER_2DARRAY_RGBAF_4444,
>+    BLITSHADER_2DARRAY_RGBAF_4444_PREMULTIPLY,
>+    BLITSHADER_2DARRAY_RGBAF_4444_UNMULTIPLY,
>+    BLITSHADER_2DARRAY_RGBF_565,
>+    BLITSHADER_2DARRAY_RGBF_565_PREMULTIPLY,
>+    BLITSHADER_2DARRAY_RGBF_565_UNMULTIPLY,
>+    BLITSHADER_2DARRAY_RGBAF_5551,
>+    BLITSHADER_2DARRAY_RGBAF_5551_PREMULTIPLY,
>+    BLITSHADER_2DARRAY_RGBAF_5551_UNMULTIPLY,
>+    BLITSHADER_INVALID
>+};
>+
>+Blit11::BlitShaderType Blit11::getBlitShaderType(BlitShaderOperation operation, ShaderDimension dimension)
>+{
>+    switch(operation)
>+    {
>+        case RGBAF:
>+            switch (dimension)
>+            {
>+                case SHADER_2D:
>+                    return BLITSHADER_2D_RGBAF;
>+                case SHADER_3D:
>+                    return BLITSHADER_3D_RGBAF;
>+                case SHADER_2DARRAY:
>+                    return BLITSHADER_2DARRAY_RGBAF;
>+                default:
>+                    UNREACHABLE();
>+                    return BLITSHADER_INVALID;
>+            }
>+        case BGRAF:
>+            switch (dimension)
>+            {
>+                case SHADER_2D:
>+                    return BLITSHADER_2D_BGRAF;
>+                case SHADER_3D:
>+                    return BLITSHADER_3D_BGRAF;
>+                case SHADER_2DARRAY:
>+                    return BLITSHADER_2DARRAY_BGRAF;
>+                default:
>+                    UNREACHABLE();
>+                    return BLITSHADER_INVALID;
>+            }
>+        case RGBF:
>+            switch (dimension)
>+            {
>+                case SHADER_2D:
>+                    return BLITSHADER_2D_RGBF;
>+                case SHADER_3D:
>+                    return BLITSHADER_3D_RGBF;
>+                case SHADER_2DARRAY:
>+                    return BLITSHADER_2DARRAY_RGBF;
>+                default:
>+                    UNREACHABLE();
>+                    return BLITSHADER_INVALID;
>+            }
>+        case RGF:
>+            switch (dimension)
>+            {
>+                case SHADER_2D:
>+                    return BLITSHADER_2D_RGF;
>+                case SHADER_3D:
>+                    return BLITSHADER_3D_RGF;
>+                case SHADER_2DARRAY:
>+                    return BLITSHADER_2DARRAY_RGF;
>+                default:
>+                    UNREACHABLE();
>+                    return BLITSHADER_INVALID;
>+            }
>+        case RF:
>+            switch (dimension)
>+            {
>+                case SHADER_2D:
>+                    return BLITSHADER_2D_RF;
>+                case SHADER_3D:
>+                    return BLITSHADER_3D_RF;
>+                case SHADER_2DARRAY:
>+                    return BLITSHADER_2DARRAY_RF;
>+                default:
>+                    UNREACHABLE();
>+                    return BLITSHADER_INVALID;
>+            }
>+        case ALPHA:
>+            switch (dimension)
>+            {
>+                case SHADER_2D:
>+                    return BLITSHADER_2D_ALPHA;
>+                case SHADER_3D:
>+                    return BLITSHADER_3D_ALPHA;
>+                case SHADER_2DARRAY:
>+                    return BLITSHADER_2DARRAY_ALPHA;
>+                default:
>+                    UNREACHABLE();
>+                    return BLITSHADER_INVALID;
>+            }
>+        case LUMA:
>+            switch (dimension)
>+            {
>+                case SHADER_2D:
>+                    return BLITSHADER_2D_LUMA;
>+                case SHADER_3D:
>+                    return BLITSHADER_3D_LUMA;
>+                case SHADER_2DARRAY:
>+                    return BLITSHADER_2DARRAY_LUMA;
>+                default:
>+                    UNREACHABLE();
>+                    return BLITSHADER_INVALID;
>+            }
>+        case LUMAALPHA:
>+            switch (dimension)
>+            {
>+                case SHADER_2D:
>+                    return BLITSHADER_2D_LUMAALPHA;
>+                case SHADER_3D:
>+                    return BLITSHADER_3D_LUMAALPHA;
>+                case SHADER_2DARRAY:
>+                    return BLITSHADER_2DARRAY_LUMAALPHA;
>+                default:
>+                    UNREACHABLE();
>+                    return BLITSHADER_INVALID;
>+            }
>+        case RGBAUI:
>+            switch (dimension)
>+            {
>+                case SHADER_2D:
>+                    return BLITSHADER_2D_RGBAUI;
>+                case SHADER_3D:
>+                    return BLITSHADER_3D_RGBAUI;
>+                case SHADER_2DARRAY:
>+                    return BLITSHADER_2DARRAY_RGBAUI;
>+                default:
>+                    UNREACHABLE();
>+                    return BLITSHADER_INVALID;
>+            }
>+        case RGBAI:
>+            switch (dimension)
>+            {
>+                case SHADER_2D:
>+                    return BLITSHADER_2D_RGBAI;
>+                case SHADER_3D:
>+                    return BLITSHADER_3D_RGBAI;
>+                case SHADER_2DARRAY:
>+                    return BLITSHADER_2DARRAY_RGBAI;
>+                default:
>+                    UNREACHABLE();
>+                    return BLITSHADER_INVALID;
>+            }
>+        case RGBUI:
>+            switch (dimension)
>+            {
>+                case SHADER_2D:
>+                    return BLITSHADER_2D_RGBUI;
>+                case SHADER_3D:
>+                    return BLITSHADER_3D_RGBUI;
>+                case SHADER_2DARRAY:
>+                    return BLITSHADER_2DARRAY_RGBUI;
>+                default:
>+                    UNREACHABLE();
>+                    return BLITSHADER_INVALID;
>+            }
>+        case RGBI:
>+            switch (dimension)
>+            {
>+                case SHADER_2D:
>+                    return BLITSHADER_2D_RGBI;
>+                case SHADER_3D:
>+                    return BLITSHADER_3D_RGBI;
>+                case SHADER_2DARRAY:
>+                    return BLITSHADER_2DARRAY_RGBI;
>+                default:
>+                    UNREACHABLE();
>+                    return BLITSHADER_INVALID;
>+            }
>+        case RGUI:
>+            switch (dimension)
>+            {
>+                case SHADER_2D:
>+                    return BLITSHADER_2D_RGUI;
>+                case SHADER_3D:
>+                    return BLITSHADER_3D_RGUI;
>+                case SHADER_2DARRAY:
>+                    return BLITSHADER_2DARRAY_RGUI;
>+                default:
>+                    UNREACHABLE();
>+                    return BLITSHADER_INVALID;
>+            }
>+        case RGI:
>+            switch (dimension)
>+            {
>+                case SHADER_2D:
>+                    return BLITSHADER_2D_RGI;
>+                case SHADER_3D:
>+                    return BLITSHADER_3D_RGI;
>+                case SHADER_2DARRAY:
>+                    return BLITSHADER_2DARRAY_RGI;
>+                default:
>+                    UNREACHABLE();
>+                    return BLITSHADER_INVALID;
>+            }
>+        case RUI:
>+            switch (dimension)
>+            {
>+                case SHADER_2D:
>+                    return BLITSHADER_2D_RUI;
>+                case SHADER_3D:
>+                    return BLITSHADER_3D_RUI;
>+                case SHADER_2DARRAY:
>+                    return BLITSHADER_2DARRAY_RUI;
>+                default:
>+                    UNREACHABLE();
>+                    return BLITSHADER_INVALID;
>+            }
>+        case RI:
>+            switch (dimension)
>+            {
>+                case SHADER_2D:
>+                    return BLITSHADER_2D_RI;
>+                case SHADER_3D:
>+                    return BLITSHADER_3D_RI;
>+                case SHADER_2DARRAY:
>+                    return BLITSHADER_2DARRAY_RI;
>+                default:
>+                    UNREACHABLE();
>+                    return BLITSHADER_INVALID;
>+            }
>+        case RGBAF_PREMULTIPLY:
>+            switch (dimension)
>+            {
>+                case SHADER_2D:
>+                    return BLITSHADER_2D_RGBAF_PREMULTIPLY;
>+                case SHADER_3D:
>+                    return BLITSHADER_3D_RGBAF_PREMULTIPLY;
>+                case SHADER_2DARRAY:
>+                    return BLITSHADER_2DARRAY_RGBAF_PREMULTIPLY;
>+                default:
>+                    UNREACHABLE();
>+                    return BLITSHADER_INVALID;
>+            }
>+        case RGBAF_UNMULTIPLY:
>+            switch (dimension)
>+            {
>+                case SHADER_2D:
>+                    return BLITSHADER_2D_RGBAF_UNMULTIPLY;
>+                case SHADER_3D:
>+                    return BLITSHADER_3D_RGBAF_UNMULTIPLY;
>+                case SHADER_2DARRAY:
>+                    return BLITSHADER_2DARRAY_RGBAF_UNMULTIPLY;
>+                default:
>+                    UNREACHABLE();
>+                    return BLITSHADER_INVALID;
>+            }
>+        case RGBF_PREMULTIPLY:
>+            switch (dimension)
>+            {
>+                case SHADER_2D:
>+                    return BLITSHADER_2D_RGBF_PREMULTIPLY;
>+                case SHADER_3D:
>+                    return BLITSHADER_3D_RGBF_PREMULTIPLY;
>+                case SHADER_2DARRAY:
>+                    return BLITSHADER_2DARRAY_RGBF_PREMULTIPLY;
>+                default:
>+                    UNREACHABLE();
>+                    return BLITSHADER_INVALID;
>+            }
>+        case RGBF_UNMULTIPLY:
>+            switch (dimension)
>+            {
>+                case SHADER_2D:
>+                    return BLITSHADER_2D_RGBF_UNMULTIPLY;
>+                case SHADER_3D:
>+                    return BLITSHADER_3D_RGBF_UNMULTIPLY;
>+                case SHADER_2DARRAY:
>+                    return BLITSHADER_2DARRAY_RGBF_UNMULTIPLY;
>+                default:
>+                    UNREACHABLE();
>+                    return BLITSHADER_INVALID;
>+            }
>+        case RGBAF_TOUI:
>+            switch (dimension)
>+            {
>+                case SHADER_2D:
>+                    return BLITSHADER_2D_RGBAF_TOUI;
>+                case SHADER_3D:
>+                    return BLITSHADER_3D_RGBAF_TOUI;
>+                case SHADER_2DARRAY:
>+                    return BLITSHADER_2DARRAY_RGBAF_TOUI;
>+                default:
>+                    UNREACHABLE();
>+                    return BLITSHADER_INVALID;
>+            }
>+        case RGBAF_TOUI_PREMULTIPLY:
>+            switch (dimension)
>+            {
>+                case SHADER_2D:
>+                    return BLITSHADER_2D_RGBAF_TOUI_PREMULTIPLY;
>+                case SHADER_3D:
>+                    return BLITSHADER_3D_RGBAF_TOUI_PREMULTIPLY;
>+                case SHADER_2DARRAY:
>+                    return BLITSHADER_2DARRAY_RGBAF_TOUI_PREMULTIPLY;
>+                default:
>+                    UNREACHABLE();
>+                    return BLITSHADER_INVALID;
>+            }
>+        case RGBAF_TOUI_UNMULTIPLY:
>+            switch (dimension)
>+            {
>+                case SHADER_2D:
>+                    return BLITSHADER_2D_RGBAF_TOUI_UNMULTIPLY;
>+                case SHADER_3D:
>+                    return BLITSHADER_3D_RGBAF_TOUI_UNMULTIPLY;
>+                case SHADER_2DARRAY:
>+                    return BLITSHADER_2DARRAY_RGBAF_TOUI_UNMULTIPLY;
>+                default:
>+                    UNREACHABLE();
>+                    return BLITSHADER_INVALID;
>+            }
>+        case RGBF_TOUI:
>+            switch (dimension)
>+            {
>+                case SHADER_2D:
>+                    return BLITSHADER_2D_RGBF_TOUI;
>+                case SHADER_3D:
>+                    return BLITSHADER_3D_RGBF_TOUI;
>+                case SHADER_2DARRAY:
>+                    return BLITSHADER_2DARRAY_RGBF_TOUI;
>+                default:
>+                    UNREACHABLE();
>+                    return BLITSHADER_INVALID;
>+            }
>+        case RGBF_TOUI_PREMULTIPLY:
>+            switch (dimension)
>+            {
>+                case SHADER_2D:
>+                    return BLITSHADER_2D_RGBF_TOUI_PREMULTIPLY;
>+                case SHADER_3D:
>+                    return BLITSHADER_3D_RGBF_TOUI_PREMULTIPLY;
>+                case SHADER_2DARRAY:
>+                    return BLITSHADER_2DARRAY_RGBF_TOUI_PREMULTIPLY;
>+                default:
>+                    UNREACHABLE();
>+                    return BLITSHADER_INVALID;
>+            }
>+        case RGBF_TOUI_UNMULTIPLY:
>+            switch (dimension)
>+            {
>+                case SHADER_2D:
>+                    return BLITSHADER_2D_RGBF_TOUI_UNMULTIPLY;
>+                case SHADER_3D:
>+                    return BLITSHADER_3D_RGBF_TOUI_UNMULTIPLY;
>+                case SHADER_2DARRAY:
>+                    return BLITSHADER_2DARRAY_RGBF_TOUI_UNMULTIPLY;
>+                default:
>+                    UNREACHABLE();
>+                    return BLITSHADER_INVALID;
>+            }
>+        case RGBAF_TOI:
>+            switch (dimension)
>+            {
>+                case SHADER_2D:
>+                    return BLITSHADER_INVALID;
>+                case SHADER_3D:
>+                    return BLITSHADER_3D_RGBAF_TOI;
>+                case SHADER_2DARRAY:
>+                    return BLITSHADER_2DARRAY_RGBAF_TOI;
>+                default:
>+                    UNREACHABLE();
>+                    return BLITSHADER_INVALID;
>+            }
>+        case RGBAF_TOI_PREMULTIPLY:
>+            switch (dimension)
>+            {
>+                case SHADER_2D:
>+                    return BLITSHADER_INVALID;
>+                case SHADER_3D:
>+                    return BLITSHADER_3D_RGBAF_TOI_PREMULTIPLY;
>+                case SHADER_2DARRAY:
>+                    return BLITSHADER_2DARRAY_RGBAF_TOI_PREMULTIPLY;
>+                default:
>+                    UNREACHABLE();
>+                    return BLITSHADER_INVALID;
>+            }
>+        case RGBAF_TOI_UNMULTIPLY:
>+            switch (dimension)
>+            {
>+                case SHADER_2D:
>+                    return BLITSHADER_INVALID;
>+                case SHADER_3D:
>+                    return BLITSHADER_3D_RGBAF_TOI_UNMULTIPLY;
>+                case SHADER_2DARRAY:
>+                    return BLITSHADER_2DARRAY_RGBAF_TOI_UNMULTIPLY;
>+                default:
>+                    UNREACHABLE();
>+                    return BLITSHADER_INVALID;
>+            }
>+        case RGBF_TOI:
>+            switch (dimension)
>+            {
>+                case SHADER_2D:
>+                    return BLITSHADER_INVALID;
>+                case SHADER_3D:
>+                    return BLITSHADER_3D_RGBF_TOI;
>+                case SHADER_2DARRAY:
>+                    return BLITSHADER_2DARRAY_RGBF_TOI;
>+                default:
>+                    UNREACHABLE();
>+                    return BLITSHADER_INVALID;
>+            }
>+        case RGBF_TOI_PREMULTIPLY:
>+            switch (dimension)
>+            {
>+                case SHADER_2D:
>+                    return BLITSHADER_INVALID;
>+                case SHADER_3D:
>+                    return BLITSHADER_3D_RGBF_TOI_PREMULTIPLY;
>+                case SHADER_2DARRAY:
>+                    return BLITSHADER_2DARRAY_RGBF_TOI_PREMULTIPLY;
>+                default:
>+                    UNREACHABLE();
>+                    return BLITSHADER_INVALID;
>+            }
>+        case RGBF_TOI_UNMULTIPLY:
>+            switch (dimension)
>+            {
>+                case SHADER_2D:
>+                    return BLITSHADER_INVALID;
>+                case SHADER_3D:
>+                    return BLITSHADER_3D_RGBF_TOI_UNMULTIPLY;
>+                case SHADER_2DARRAY:
>+                    return BLITSHADER_2DARRAY_RGBF_TOI_UNMULTIPLY;
>+                default:
>+                    UNREACHABLE();
>+                    return BLITSHADER_INVALID;
>+            }
>+        case LUMAF_PREMULTIPLY:
>+            switch (dimension)
>+            {
>+                case SHADER_2D:
>+                    return BLITSHADER_2D_LUMAF_PREMULTIPLY;
>+                case SHADER_3D:
>+                    return BLITSHADER_3D_LUMAF_PREMULTIPLY;
>+                case SHADER_2DARRAY:
>+                    return BLITSHADER_2DARRAY_LUMAF_PREMULTIPLY;
>+                default:
>+                    UNREACHABLE();
>+                    return BLITSHADER_INVALID;
>+            }
>+        case LUMAF_UNMULTIPLY:
>+            switch (dimension)
>+            {
>+                case SHADER_2D:
>+                    return BLITSHADER_2D_LUMAF_UNMULTIPLY;
>+                case SHADER_3D:
>+                    return BLITSHADER_3D_LUMAF_UNMULTIPLY;
>+                case SHADER_2DARRAY:
>+                    return BLITSHADER_2DARRAY_LUMAF_UNMULTIPLY;
>+                default:
>+                    UNREACHABLE();
>+                    return BLITSHADER_INVALID;
>+            }
>+        case LUMAALPHAF_PREMULTIPLY:
>+            switch (dimension)
>+            {
>+                case SHADER_2D:
>+                    return BLITSHADER_2D_LUMAALPHAF_PREMULTIPLY;
>+                case SHADER_3D:
>+                    return BLITSHADER_3D_LUMAALPHAF_PREMULTIPLY;
>+                case SHADER_2DARRAY:
>+                    return BLITSHADER_2DARRAY_LUMAALPHAF_PREMULTIPLY;
>+                default:
>+                    UNREACHABLE();
>+                    return BLITSHADER_INVALID;
>+            }
>+        case LUMAALPHAF_UNMULTIPLY:
>+            switch (dimension)
>+            {
>+                case SHADER_2D:
>+                    return BLITSHADER_2D_LUMAALPHAF_UNMULTIPLY;
>+                case SHADER_3D:
>+                    return BLITSHADER_3D_LUMAALPHAF_UNMULTIPLY;
>+                case SHADER_2DARRAY:
>+                    return BLITSHADER_2DARRAY_LUMAALPHAF_UNMULTIPLY;
>+                default:
>+                    UNREACHABLE();
>+                    return BLITSHADER_INVALID;
>+            }
>+        case RGBAF_4444:
>+            switch (dimension)
>+            {
>+                case SHADER_2D:
>+                    return BLITSHADER_2D_RGBAF_4444;
>+                case SHADER_3D:
>+                    return BLITSHADER_3D_RGBAF_4444;
>+                case SHADER_2DARRAY:
>+                    return BLITSHADER_2DARRAY_RGBAF_4444;
>+                default:
>+                    UNREACHABLE();
>+                    return BLITSHADER_INVALID;
>+            }
>+        case RGBAF_4444_PREMULTIPLY:
>+            switch (dimension)
>+            {
>+                case SHADER_2D:
>+                    return BLITSHADER_2D_RGBAF_4444_PREMULTIPLY;
>+                case SHADER_3D:
>+                    return BLITSHADER_3D_RGBAF_4444_PREMULTIPLY;
>+                case SHADER_2DARRAY:
>+                    return BLITSHADER_2DARRAY_RGBAF_4444_PREMULTIPLY;
>+                default:
>+                    UNREACHABLE();
>+                    return BLITSHADER_INVALID;
>+            }
>+        case RGBAF_4444_UNMULTIPLY:
>+            switch (dimension)
>+            {
>+                case SHADER_2D:
>+                    return BLITSHADER_2D_RGBAF_4444_UNMULTIPLY;
>+                case SHADER_3D:
>+                    return BLITSHADER_3D_RGBAF_4444_UNMULTIPLY;
>+                case SHADER_2DARRAY:
>+                    return BLITSHADER_2DARRAY_RGBAF_4444_UNMULTIPLY;
>+                default:
>+                    UNREACHABLE();
>+                    return BLITSHADER_INVALID;
>+            }
>+        case RGBF_565:
>+            switch (dimension)
>+            {
>+                case SHADER_2D:
>+                    return BLITSHADER_2D_RGBF_565;
>+                case SHADER_3D:
>+                    return BLITSHADER_3D_RGBF_565;
>+                case SHADER_2DARRAY:
>+                    return BLITSHADER_2DARRAY_RGBF_565;
>+                default:
>+                    UNREACHABLE();
>+                    return BLITSHADER_INVALID;
>+            }
>+        case RGBF_565_PREMULTIPLY:
>+            switch (dimension)
>+            {
>+                case SHADER_2D:
>+                    return BLITSHADER_2D_RGBF_565_PREMULTIPLY;
>+                case SHADER_3D:
>+                    return BLITSHADER_3D_RGBF_565_PREMULTIPLY;
>+                case SHADER_2DARRAY:
>+                    return BLITSHADER_2DARRAY_RGBF_565_PREMULTIPLY;
>+                default:
>+                    UNREACHABLE();
>+                    return BLITSHADER_INVALID;
>+            }
>+        case RGBF_565_UNMULTIPLY:
>+            switch (dimension)
>+            {
>+                case SHADER_2D:
>+                    return BLITSHADER_2D_RGBF_565_UNMULTIPLY;
>+                case SHADER_3D:
>+                    return BLITSHADER_3D_RGBF_565_UNMULTIPLY;
>+                case SHADER_2DARRAY:
>+                    return BLITSHADER_2DARRAY_RGBF_565_UNMULTIPLY;
>+                default:
>+                    UNREACHABLE();
>+                    return BLITSHADER_INVALID;
>+            }
>+        case RGBAF_5551:
>+            switch (dimension)
>+            {
>+                case SHADER_2D:
>+                    return BLITSHADER_2D_RGBAF_5551;
>+                case SHADER_3D:
>+                    return BLITSHADER_3D_RGBAF_5551;
>+                case SHADER_2DARRAY:
>+                    return BLITSHADER_2DARRAY_RGBAF_5551;
>+                default:
>+                    UNREACHABLE();
>+                    return BLITSHADER_INVALID;
>+            }
>+        case RGBAF_5551_PREMULTIPLY:
>+            switch (dimension)
>+            {
>+                case SHADER_2D:
>+                    return BLITSHADER_2D_RGBAF_5551_PREMULTIPLY;
>+                case SHADER_3D:
>+                    return BLITSHADER_3D_RGBAF_5551_PREMULTIPLY;
>+                case SHADER_2DARRAY:
>+                    return BLITSHADER_2DARRAY_RGBAF_5551_PREMULTIPLY;
>+                default:
>+                    UNREACHABLE();
>+                    return BLITSHADER_INVALID;
>+            }
>+        case RGBAF_5551_UNMULTIPLY:
>+            switch (dimension)
>+            {
>+                case SHADER_2D:
>+                    return BLITSHADER_2D_RGBAF_5551_UNMULTIPLY;
>+                case SHADER_3D:
>+                    return BLITSHADER_3D_RGBAF_5551_UNMULTIPLY;
>+                case SHADER_2DARRAY:
>+                    return BLITSHADER_2DARRAY_RGBAF_5551_UNMULTIPLY;
>+                default:
>+                    UNREACHABLE();
>+                    return BLITSHADER_INVALID;
>+            }
>+        default:
>+            UNREACHABLE();
>+            return BLITSHADER_INVALID;
>+    }
>+}
>+
>+angle::Result Blit11::mapBlitShader(const gl::Context *context,
>+                                    BlitShaderType blitShaderType)
>+{
>+    switch(blitShaderType)
>+    {
>+        case BLITSHADER_2D_RGBAF:
>+            ANGLE_TRY(addBlitShaderToMap(context, blitShaderType, SHADER_2D,
>+                                         ShaderData(g_PS_PassthroughRGBA2D),
>+                                         "Blit11 2D PassthroughRGBA2D pixel shader"));
>+            break;
>+        case BLITSHADER_2D_BGRAF:
>+            ANGLE_TRY(addBlitShaderToMap(context, blitShaderType, SHADER_2D,
>+                                         ShaderData(g_PS_PassthroughRGBA2D),
>+                                         "Blit11 2D PassthroughRGBA2D pixel shader"));
>+            break;
>+        case BLITSHADER_2D_RGBF:
>+            ANGLE_TRY(addBlitShaderToMap(context, blitShaderType, SHADER_2D,
>+                                         ShaderData(g_PS_PassthroughRGB2D),
>+                                         "Blit11 2D PassthroughRGB2D pixel shader"));
>+            break;
>+        case BLITSHADER_2D_RGF:
>+            ANGLE_TRY(addBlitShaderToMap(context, blitShaderType, SHADER_2D,
>+                                         ShaderData(g_PS_PassthroughRG2D),
>+                                         "Blit11 2D PassthroughRG2D pixel shader"));
>+            break;
>+        case BLITSHADER_2D_RF:
>+            ANGLE_TRY(addBlitShaderToMap(context, blitShaderType, SHADER_2D,
>+                                         ShaderData(g_PS_PassthroughR2D),
>+                                         "Blit11 2D PassthroughR2D pixel shader"));
>+            break;
>+        case BLITSHADER_2D_ALPHA:
>+            ANGLE_TRY(addBlitShaderToMap(context, blitShaderType, SHADER_2D,
>+                                         ShaderData(g_PS_PassthroughA2D),
>+                                         "Blit11 2D PassthroughA2D pixel shader"));
>+            break;
>+        case BLITSHADER_2D_LUMA:
>+            ANGLE_TRY(addBlitShaderToMap(context, blitShaderType, SHADER_2D,
>+                                         ShaderData(g_PS_PassthroughLum2D),
>+                                         "Blit11 2D PassthroughLum2D pixel shader"));
>+            break;
>+        case BLITSHADER_2D_LUMAALPHA:
>+            ANGLE_TRY(addBlitShaderToMap(context, blitShaderType, SHADER_2D,
>+                                         ShaderData(g_PS_PassthroughLumAlpha2D),
>+                                         "Blit11 2D PassthroughLumAlpha2D pixel shader"));
>+            break;
>+        case BLITSHADER_2D_RGBAUI:
>+            ANGLE_TRY(addBlitShaderToMap(context, blitShaderType, SHADER_2D,
>+                                         ShaderData(g_PS_PassthroughRGBA2DUI),
>+                                         "Blit11 2D PassthroughRGBA2DUI pixel shader"));
>+            break;
>+        case BLITSHADER_2D_RGBAI:
>+            ANGLE_TRY(addBlitShaderToMap(context, blitShaderType, SHADER_2D,
>+                                         ShaderData(g_PS_PassthroughRGBA2DI),
>+                                         "Blit11 2D PassthroughRGBA2DI pixel shader"));
>+            break;
>+        case BLITSHADER_2D_RGBUI:
>+            ANGLE_TRY(addBlitShaderToMap(context, blitShaderType, SHADER_2D,
>+                                         ShaderData(g_PS_PassthroughRGB2DUI),
>+                                         "Blit11 2D PassthroughRGB2DUI pixel shader"));
>+            break;
>+        case BLITSHADER_2D_RGBI:
>+            ANGLE_TRY(addBlitShaderToMap(context, blitShaderType, SHADER_2D,
>+                                         ShaderData(g_PS_PassthroughRGB2DI),
>+                                         "Blit11 2D PassthroughRGB2DI pixel shader"));
>+            break;
>+        case BLITSHADER_2D_RGUI:
>+            ANGLE_TRY(addBlitShaderToMap(context, blitShaderType, SHADER_2D,
>+                                         ShaderData(g_PS_PassthroughRG2DUI),
>+                                         "Blit11 2D PassthroughRG2DUI pixel shader"));
>+            break;
>+        case BLITSHADER_2D_RGI:
>+            ANGLE_TRY(addBlitShaderToMap(context, blitShaderType, SHADER_2D,
>+                                         ShaderData(g_PS_PassthroughRG2DI),
>+                                         "Blit11 2D PassthroughRG2DI pixel shader"));
>+            break;
>+        case BLITSHADER_2D_RUI:
>+            ANGLE_TRY(addBlitShaderToMap(context, blitShaderType, SHADER_2D,
>+                                         ShaderData(g_PS_PassthroughR2DUI),
>+                                         "Blit11 2D PassthroughR2DUI pixel shader"));
>+            break;
>+        case BLITSHADER_2D_RI:
>+            ANGLE_TRY(addBlitShaderToMap(context, blitShaderType, SHADER_2D,
>+                                         ShaderData(g_PS_PassthroughR2DI),
>+                                         "Blit11 2D PassthroughR2DI pixel shader"));
>+            break;
>+        case BLITSHADER_2D_RGBAF_PREMULTIPLY:
>+            ANGLE_TRY(addBlitShaderToMap(context, blitShaderType, SHADER_2D,
>+                                         ShaderData(g_PS_FtoF_PM_RGBA_2D),
>+                                         "Blit11 2D FtoF PM RGBA 2D pixel shader"));
>+            break;
>+        case BLITSHADER_2D_RGBAF_UNMULTIPLY:
>+            ANGLE_TRY(addBlitShaderToMap(context, blitShaderType, SHADER_2D,
>+                                         ShaderData(g_PS_FtoF_UM_RGBA_2D),
>+                                         "Blit11 2D FtoF UM RGBA 2D pixel shader"));
>+            break;
>+        case BLITSHADER_2D_RGBF_PREMULTIPLY:
>+            ANGLE_TRY(addBlitShaderToMap(context, blitShaderType, SHADER_2D,
>+                                         ShaderData(g_PS_FtoF_PM_RGB_2D),
>+                                         "Blit11 2D FtoF PM RGB 2D pixel shader"));
>+            break;
>+        case BLITSHADER_2D_RGBF_UNMULTIPLY:
>+            ANGLE_TRY(addBlitShaderToMap(context, blitShaderType, SHADER_2D,
>+                                         ShaderData(g_PS_FtoF_UM_RGB_2D),
>+                                         "Blit11 2D FtoF UM RGB 2D pixel shader"));
>+            break;
>+        case BLITSHADER_2D_RGBAF_TOUI:
>+            ANGLE_TRY(addBlitShaderToMap(context, blitShaderType, SHADER_2D,
>+                                         ShaderData(g_PS_FtoU_PT_RGBA_2D),
>+                                         "Blit11 2D FtoU PT RGBA 2D pixel shader"));
>+            break;
>+        case BLITSHADER_2D_RGBAF_TOUI_PREMULTIPLY:
>+            ANGLE_TRY(addBlitShaderToMap(context, blitShaderType, SHADER_2D,
>+                                         ShaderData(g_PS_FtoU_PM_RGBA_2D),
>+                                         "Blit11 2D FtoU PM RGBA 2D pixel shader"));
>+            break;
>+        case BLITSHADER_2D_RGBAF_TOUI_UNMULTIPLY:
>+            ANGLE_TRY(addBlitShaderToMap(context, blitShaderType, SHADER_2D,
>+                                         ShaderData(g_PS_FtoU_UM_RGBA_2D),
>+                                         "Blit11 2D FtoU UM RGBA 2D pixel shader"));
>+            break;
>+        case BLITSHADER_2D_RGBF_TOUI:
>+            ANGLE_TRY(addBlitShaderToMap(context, blitShaderType, SHADER_2D,
>+                                         ShaderData(g_PS_FtoU_PT_RGB_2D),
>+                                         "Blit11 2D FtoU PT RGB 2D pixel shader"));
>+            break;
>+        case BLITSHADER_2D_RGBF_TOUI_PREMULTIPLY:
>+            ANGLE_TRY(addBlitShaderToMap(context, blitShaderType, SHADER_2D,
>+                                         ShaderData(g_PS_FtoU_PM_RGB_2D),
>+                                         "Blit11 2D FtoU PM RGB 2D pixel shader"));
>+            break;
>+        case BLITSHADER_2D_RGBF_TOUI_UNMULTIPLY:
>+            ANGLE_TRY(addBlitShaderToMap(context, blitShaderType, SHADER_2D,
>+                                         ShaderData(g_PS_FtoU_UM_RGB_2D),
>+                                         "Blit11 2D FtoU UM RGB 2D pixel shader"));
>+            break;
>+        case BLITSHADER_2D_LUMAF_PREMULTIPLY:
>+            ANGLE_TRY(addBlitShaderToMap(context, blitShaderType, SHADER_2D,
>+                                         ShaderData(g_PS_FtoF_PM_LUMA_2D),
>+                                         "Blit11 2D FtoF PM LUMA 2D pixel shader"));
>+            break;
>+        case BLITSHADER_2D_LUMAF_UNMULTIPLY:
>+            ANGLE_TRY(addBlitShaderToMap(context, blitShaderType, SHADER_2D,
>+                                         ShaderData(g_PS_FtoF_UM_LUMA_2D),
>+                                         "Blit11 2D FtoF UM LUMA 2D pixel shader"));
>+            break;
>+        case BLITSHADER_2D_LUMAALPHAF_PREMULTIPLY:
>+            ANGLE_TRY(addBlitShaderToMap(context, blitShaderType, SHADER_2D,
>+                                         ShaderData(g_PS_FtoF_PM_LUMAALPHA_2D),
>+                                         "Blit11 2D FtoF PM LUMAALPHA 2D pixel shader"));
>+            break;
>+        case BLITSHADER_2D_LUMAALPHAF_UNMULTIPLY:
>+            ANGLE_TRY(addBlitShaderToMap(context, blitShaderType, SHADER_2D,
>+                                         ShaderData(g_PS_FtoF_UM_LUMAALPHA_2D),
>+                                         "Blit11 2D FtoF UM LUMAALPHA 2D pixel shader"));
>+            break;
>+        case BLITSHADER_2D_RGBAF_4444:
>+            ANGLE_TRY(addBlitShaderToMap(context, blitShaderType, SHADER_2D,
>+                                         ShaderData(g_PS_PassthroughRGBA2D_4444),
>+                                         "Blit11 2D PassthroughRGBA2D 4444 pixel shader"));
>+            break;
>+        case BLITSHADER_2D_RGBAF_4444_PREMULTIPLY:
>+            ANGLE_TRY(addBlitShaderToMap(context, blitShaderType, SHADER_2D,
>+                                         ShaderData(g_PS_FtoF_PM_RGBA_4444_2D),
>+                                         "Blit11 2D FtoF PM RGBA 4444 2D pixel shader"));
>+            break;
>+        case BLITSHADER_2D_RGBAF_4444_UNMULTIPLY:
>+            ANGLE_TRY(addBlitShaderToMap(context, blitShaderType, SHADER_2D,
>+                                         ShaderData(g_PS_FtoF_UM_RGBA_4444_2D),
>+                                         "Blit11 2D FtoF UM RGBA 4444 2D pixel shader"));
>+            break;
>+        case BLITSHADER_2D_RGBF_565:
>+            ANGLE_TRY(addBlitShaderToMap(context, blitShaderType, SHADER_2D,
>+                                         ShaderData(g_PS_PassthroughRGB2D_565),
>+                                         "Blit11 2D PassthroughRGB2D 565 pixel shader"));
>+            break;
>+        case BLITSHADER_2D_RGBF_565_PREMULTIPLY:
>+            ANGLE_TRY(addBlitShaderToMap(context, blitShaderType, SHADER_2D,
>+                                         ShaderData(g_PS_FtoF_PM_RGB_565_2D),
>+                                         "Blit11 2D FtoF PM RGB 565 2D pixel shader"));
>+            break;
>+        case BLITSHADER_2D_RGBF_565_UNMULTIPLY:
>+            ANGLE_TRY(addBlitShaderToMap(context, blitShaderType, SHADER_2D,
>+                                         ShaderData(g_PS_FtoF_UM_RGB_565_2D),
>+                                         "Blit11 2D FtoF UM RGB 565 2D pixel shader"));
>+            break;
>+        case BLITSHADER_2D_RGBAF_5551:
>+            ANGLE_TRY(addBlitShaderToMap(context, blitShaderType, SHADER_2D,
>+                                         ShaderData(g_PS_PassthroughRGBA2D_5551),
>+                                         "Blit11 2D PassthroughRGBA2D 5551 pixel shader"));
>+            break;
>+        case BLITSHADER_2D_RGBAF_5551_PREMULTIPLY:
>+            ANGLE_TRY(addBlitShaderToMap(context, blitShaderType, SHADER_2D,
>+                                         ShaderData(g_PS_FtoF_PM_RGBA_5551_2D),
>+                                         "Blit11 2D FtoF PM RGBA 5551 2D pixel shader"));
>+            break;
>+        case BLITSHADER_2D_RGBAF_5551_UNMULTIPLY:
>+            ANGLE_TRY(addBlitShaderToMap(context, blitShaderType, SHADER_2D,
>+                                         ShaderData(g_PS_FtoF_UM_RGBA_5551_2D),
>+                                         "Blit11 2D FtoF UM RGBA 5551 2D pixel shader"));
>+            break;
>+        case BLITSHADER_3D_RGBAF:
>+            ANGLE_TRY(addBlitShaderToMap(context, blitShaderType, SHADER_3D,
>+                                         ShaderData(g_PS_PassthroughRGBA3D),
>+                                         "Blit11 3D PassthroughRGBA3D pixel shader"));
>+            break;
>+        case BLITSHADER_3D_BGRAF:
>+            ANGLE_TRY(addBlitShaderToMap(context, blitShaderType, SHADER_3D,
>+                                         ShaderData(g_PS_PassthroughRGBA3D),
>+                                         "Blit11 3D PassthroughRGBA3D pixel shader"));
>+            break;
>+        case BLITSHADER_3D_RGBF:
>+            ANGLE_TRY(addBlitShaderToMap(context, blitShaderType, SHADER_3D,
>+                                         ShaderData(g_PS_PassthroughRGB3D),
>+                                         "Blit11 3D PassthroughRGB3D pixel shader"));
>+            break;
>+        case BLITSHADER_3D_RGF:
>+            ANGLE_TRY(addBlitShaderToMap(context, blitShaderType, SHADER_3D,
>+                                         ShaderData(g_PS_PassthroughRG3D),
>+                                         "Blit11 3D PassthroughRG3D pixel shader"));
>+            break;
>+        case BLITSHADER_3D_RF:
>+            ANGLE_TRY(addBlitShaderToMap(context, blitShaderType, SHADER_3D,
>+                                         ShaderData(g_PS_PassthroughR3D),
>+                                         "Blit11 3D PassthroughR3D pixel shader"));
>+            break;
>+        case BLITSHADER_3D_ALPHA:
>+            ANGLE_TRY(addBlitShaderToMap(context, blitShaderType, SHADER_3D,
>+                                         ShaderData(g_PS_PassthroughRGBA3D),
>+                                         "Blit11 3D PassthroughRGBA3D pixel shader"));
>+            break;
>+        case BLITSHADER_3D_LUMA:
>+            ANGLE_TRY(addBlitShaderToMap(context, blitShaderType, SHADER_3D,
>+                                         ShaderData(g_PS_PassthroughLum3D),
>+                                         "Blit11 3D PassthroughLum3D pixel shader"));
>+            break;
>+        case BLITSHADER_3D_LUMAALPHA:
>+            ANGLE_TRY(addBlitShaderToMap(context, blitShaderType, SHADER_3D,
>+                                         ShaderData(g_PS_PassthroughLumAlpha3D),
>+                                         "Blit11 3D PassthroughLumAlpha3D pixel shader"));
>+            break;
>+        case BLITSHADER_3D_RGBAUI:
>+            ANGLE_TRY(addBlitShaderToMap(context, blitShaderType, SHADER_3D,
>+                                         ShaderData(g_PS_PassthroughRGBA3DUI),
>+                                         "Blit11 3D PassthroughRGBA3DUI pixel shader"));
>+            break;
>+        case BLITSHADER_3D_RGBAI:
>+            ANGLE_TRY(addBlitShaderToMap(context, blitShaderType, SHADER_3D,
>+                                         ShaderData(g_PS_PassthroughRGBA3DI),
>+                                         "Blit11 3D PassthroughRGBA3DI pixel shader"));
>+            break;
>+        case BLITSHADER_3D_RGBUI:
>+            ANGLE_TRY(addBlitShaderToMap(context, blitShaderType, SHADER_3D,
>+                                         ShaderData(g_PS_PassthroughRGB3DUI),
>+                                         "Blit11 3D PassthroughRGB3DUI pixel shader"));
>+            break;
>+        case BLITSHADER_3D_RGBI:
>+            ANGLE_TRY(addBlitShaderToMap(context, blitShaderType, SHADER_3D,
>+                                         ShaderData(g_PS_PassthroughRGB3DI),
>+                                         "Blit11 3D PassthroughRGB3DI pixel shader"));
>+            break;
>+        case BLITSHADER_3D_RGUI:
>+            ANGLE_TRY(addBlitShaderToMap(context, blitShaderType, SHADER_3D,
>+                                         ShaderData(g_PS_PassthroughRG3DUI),
>+                                         "Blit11 3D PassthroughRG3DUI pixel shader"));
>+            break;
>+        case BLITSHADER_3D_RGI:
>+            ANGLE_TRY(addBlitShaderToMap(context, blitShaderType, SHADER_3D,
>+                                         ShaderData(g_PS_PassthroughRG3DI),
>+                                         "Blit11 3D PassthroughRG3DI pixel shader"));
>+            break;
>+        case BLITSHADER_3D_RUI:
>+            ANGLE_TRY(addBlitShaderToMap(context, blitShaderType, SHADER_3D,
>+                                         ShaderData(g_PS_PassthroughR3DUI),
>+                                         "Blit11 3D PassthroughR3DUI pixel shader"));
>+            break;
>+        case BLITSHADER_3D_RI:
>+            ANGLE_TRY(addBlitShaderToMap(context, blitShaderType, SHADER_3D,
>+                                         ShaderData(g_PS_PassthroughR3DI),
>+                                         "Blit11 3D PassthroughR3DI pixel shader"));
>+            break;
>+        case BLITSHADER_3D_RGBAF_PREMULTIPLY:
>+            ANGLE_TRY(addBlitShaderToMap(context, blitShaderType, SHADER_3D,
>+                                         ShaderData(g_PS_FtoF_PM_RGBA_3D),
>+                                         "Blit11 3D FtoF PM RGBA 3D pixel shader"));
>+            break;
>+        case BLITSHADER_3D_RGBAF_UNMULTIPLY:
>+            ANGLE_TRY(addBlitShaderToMap(context, blitShaderType, SHADER_3D,
>+                                         ShaderData(g_PS_FtoF_UM_RGBA_3D),
>+                                         "Blit11 3D FtoF UM RGBA 3D pixel shader"));
>+            break;
>+        case BLITSHADER_3D_RGBF_PREMULTIPLY:
>+            ANGLE_TRY(addBlitShaderToMap(context, blitShaderType, SHADER_3D,
>+                                         ShaderData(g_PS_FtoF_PM_RGB_3D),
>+                                         "Blit11 3D FtoF PM RGB 3D pixel shader"));
>+            break;
>+        case BLITSHADER_3D_RGBF_UNMULTIPLY:
>+            ANGLE_TRY(addBlitShaderToMap(context, blitShaderType, SHADER_3D,
>+                                         ShaderData(g_PS_FtoF_UM_RGB_3D),
>+                                         "Blit11 3D FtoF UM RGB 3D pixel shader"));
>+            break;
>+        case BLITSHADER_3D_RGBAF_TOUI:
>+            ANGLE_TRY(addBlitShaderToMap(context, blitShaderType, SHADER_3D,
>+                                         ShaderData(g_PS_FtoU_PT_RGBA_3D),
>+                                         "Blit11 3D FtoU PT RGBA 3D pixel shader"));
>+            break;
>+        case BLITSHADER_3D_RGBAF_TOUI_PREMULTIPLY:
>+            ANGLE_TRY(addBlitShaderToMap(context, blitShaderType, SHADER_3D,
>+                                         ShaderData(g_PS_FtoU_PM_RGBA_3D),
>+                                         "Blit11 3D FtoU PM RGBA 3D pixel shader"));
>+            break;
>+        case BLITSHADER_3D_RGBAF_TOUI_UNMULTIPLY:
>+            ANGLE_TRY(addBlitShaderToMap(context, blitShaderType, SHADER_3D,
>+                                         ShaderData(g_PS_FtoU_UM_RGBA_3D),
>+                                         "Blit11 3D FtoU UM RGBA 3D pixel shader"));
>+            break;
>+        case BLITSHADER_3D_RGBF_TOUI:
>+            ANGLE_TRY(addBlitShaderToMap(context, blitShaderType, SHADER_3D,
>+                                         ShaderData(g_PS_FtoU_PT_RGB_3D),
>+                                         "Blit11 3D FtoU PT RGB 3D pixel shader"));
>+            break;
>+        case BLITSHADER_3D_RGBF_TOUI_PREMULTIPLY:
>+            ANGLE_TRY(addBlitShaderToMap(context, blitShaderType, SHADER_3D,
>+                                         ShaderData(g_PS_FtoU_PM_RGB_3D),
>+                                         "Blit11 3D FtoU PM RGB 3D pixel shader"));
>+            break;
>+        case BLITSHADER_3D_RGBF_TOUI_UNMULTIPLY:
>+            ANGLE_TRY(addBlitShaderToMap(context, blitShaderType, SHADER_3D,
>+                                         ShaderData(g_PS_FtoU_UM_RGB_3D),
>+                                         "Blit11 3D FtoU UM RGB 3D pixel shader"));
>+            break;
>+        case BLITSHADER_3D_RGBAF_TOI:
>+            ANGLE_TRY(addBlitShaderToMap(context, blitShaderType, SHADER_3D,
>+                                         ShaderData(g_PS_FtoI_PT_RGBA_3D),
>+                                         "Blit11 3D FtoI PT RGBA 3D pixel shader"));
>+            break;
>+        case BLITSHADER_3D_RGBAF_TOI_PREMULTIPLY:
>+            ANGLE_TRY(addBlitShaderToMap(context, blitShaderType, SHADER_3D,
>+                                         ShaderData(g_PS_FtoI_PM_RGBA_3D),
>+                                         "Blit11 3D FtoI PM RGBA 3D pixel shader"));
>+            break;
>+        case BLITSHADER_3D_RGBAF_TOI_UNMULTIPLY:
>+            ANGLE_TRY(addBlitShaderToMap(context, blitShaderType, SHADER_3D,
>+                                         ShaderData(g_PS_FtoI_UM_RGBA_3D),
>+                                         "Blit11 3D FtoI UM RGBA 3D pixel shader"));
>+            break;
>+        case BLITSHADER_3D_RGBF_TOI:
>+            ANGLE_TRY(addBlitShaderToMap(context, blitShaderType, SHADER_3D,
>+                                         ShaderData(g_PS_FtoI_PT_RGB_3D),
>+                                         "Blit11 3D FtoI PT RGB 3D pixel shader"));
>+            break;
>+        case BLITSHADER_3D_RGBF_TOI_PREMULTIPLY:
>+            ANGLE_TRY(addBlitShaderToMap(context, blitShaderType, SHADER_3D,
>+                                         ShaderData(g_PS_FtoI_PM_RGB_3D),
>+                                         "Blit11 3D FtoI PM RGB 3D pixel shader"));
>+            break;
>+        case BLITSHADER_3D_RGBF_TOI_UNMULTIPLY:
>+            ANGLE_TRY(addBlitShaderToMap(context, blitShaderType, SHADER_3D,
>+                                         ShaderData(g_PS_FtoI_UM_RGB_3D),
>+                                         "Blit11 3D FtoI UM RGB 3D pixel shader"));
>+            break;
>+        case BLITSHADER_3D_LUMAF_PREMULTIPLY:
>+            ANGLE_TRY(addBlitShaderToMap(context, blitShaderType, SHADER_3D,
>+                                         ShaderData(g_PS_FtoF_PM_LUMA_3D),
>+                                         "Blit11 3D FtoF PM LUMA 3D pixel shader"));
>+            break;
>+        case BLITSHADER_3D_LUMAF_UNMULTIPLY:
>+            ANGLE_TRY(addBlitShaderToMap(context, blitShaderType, SHADER_3D,
>+                                         ShaderData(g_PS_FtoF_UM_LUMA_3D),
>+                                         "Blit11 3D FtoF UM LUMA 3D pixel shader"));
>+            break;
>+        case BLITSHADER_3D_LUMAALPHAF_PREMULTIPLY:
>+            ANGLE_TRY(addBlitShaderToMap(context, blitShaderType, SHADER_3D,
>+                                         ShaderData(g_PS_FtoF_PM_LUMAALPHA_3D),
>+                                         "Blit11 3D FtoF PM LUMAALPHA 3D pixel shader"));
>+            break;
>+        case BLITSHADER_3D_LUMAALPHAF_UNMULTIPLY:
>+            ANGLE_TRY(addBlitShaderToMap(context, blitShaderType, SHADER_3D,
>+                                         ShaderData(g_PS_FtoF_UM_LUMAALPHA_3D),
>+                                         "Blit11 3D FtoF UM LUMAALPHA 3D pixel shader"));
>+            break;
>+        case BLITSHADER_3D_RGBAF_4444:
>+            ANGLE_TRY(addBlitShaderToMap(context, blitShaderType, SHADER_3D,
>+                                         ShaderData(g_PS_PassthroughRGBA3D_4444),
>+                                         "Blit11 3D PassthroughRGBA3D 4444 pixel shader"));
>+            break;
>+        case BLITSHADER_3D_RGBAF_4444_PREMULTIPLY:
>+            ANGLE_TRY(addBlitShaderToMap(context, blitShaderType, SHADER_3D,
>+                                         ShaderData(g_PS_FtoF_PM_RGBA_4444_3D),
>+                                         "Blit11 3D FtoF PM RGBA 4444 3D pixel shader"));
>+            break;
>+        case BLITSHADER_3D_RGBAF_4444_UNMULTIPLY:
>+            ANGLE_TRY(addBlitShaderToMap(context, blitShaderType, SHADER_3D,
>+                                         ShaderData(g_PS_FtoF_UM_RGBA_4444_3D),
>+                                         "Blit11 3D FtoF UM RGBA 4444 3D pixel shader"));
>+            break;
>+        case BLITSHADER_3D_RGBF_565:
>+            ANGLE_TRY(addBlitShaderToMap(context, blitShaderType, SHADER_3D,
>+                                         ShaderData(g_PS_PassthroughRGB3D_565),
>+                                         "Blit11 3D PassthroughRGB3D 565 pixel shader"));
>+            break;
>+        case BLITSHADER_3D_RGBF_565_PREMULTIPLY:
>+            ANGLE_TRY(addBlitShaderToMap(context, blitShaderType, SHADER_3D,
>+                                         ShaderData(g_PS_FtoF_PM_RGB_565_3D),
>+                                         "Blit11 3D FtoF PM RGB 565 3D pixel shader"));
>+            break;
>+        case BLITSHADER_3D_RGBF_565_UNMULTIPLY:
>+            ANGLE_TRY(addBlitShaderToMap(context, blitShaderType, SHADER_3D,
>+                                         ShaderData(g_PS_FtoF_UM_RGB_565_3D),
>+                                         "Blit11 3D FtoF UM RGB 565 3D pixel shader"));
>+            break;
>+        case BLITSHADER_3D_RGBAF_5551:
>+            ANGLE_TRY(addBlitShaderToMap(context, blitShaderType, SHADER_3D,
>+                                         ShaderData(g_PS_PassthroughRGBA3D_5551),
>+                                         "Blit11 3D PassthroughRGBA3D 5551 pixel shader"));
>+            break;
>+        case BLITSHADER_3D_RGBAF_5551_PREMULTIPLY:
>+            ANGLE_TRY(addBlitShaderToMap(context, blitShaderType, SHADER_3D,
>+                                         ShaderData(g_PS_FtoF_PM_RGBA_5551_3D),
>+                                         "Blit11 3D FtoF PM RGBA 5551 3D pixel shader"));
>+            break;
>+        case BLITSHADER_3D_RGBAF_5551_UNMULTIPLY:
>+            ANGLE_TRY(addBlitShaderToMap(context, blitShaderType, SHADER_3D,
>+                                         ShaderData(g_PS_FtoF_UM_RGBA_5551_3D),
>+                                         "Blit11 3D FtoF UM RGBA 5551 3D pixel shader"));
>+            break;
>+        case BLITSHADER_2DARRAY_RGBAF:
>+            ANGLE_TRY(addBlitShaderToMap(context, blitShaderType, SHADER_2DARRAY,
>+                                         ShaderData(g_PS_PassthroughRGBA2DArray),
>+                                         "Blit11 2DArray PassthroughRGBA2DArray pixel shader"));
>+            break;
>+        case BLITSHADER_2DARRAY_BGRAF:
>+            ANGLE_TRY(addBlitShaderToMap(context, blitShaderType, SHADER_2DARRAY,
>+                                         ShaderData(g_PS_PassthroughRGBA2DArray),
>+                                         "Blit11 2DArray PassthroughRGBA2DArray pixel shader"));
>+            break;
>+        case BLITSHADER_2DARRAY_RGBF:
>+            ANGLE_TRY(addBlitShaderToMap(context, blitShaderType, SHADER_2DARRAY,
>+                                         ShaderData(g_PS_PassthroughRGB2DArray),
>+                                         "Blit11 2DArray PassthroughRGB2DArray pixel shader"));
>+            break;
>+        case BLITSHADER_2DARRAY_RGF:
>+            ANGLE_TRY(addBlitShaderToMap(context, blitShaderType, SHADER_2DARRAY,
>+                                         ShaderData(g_PS_PassthroughRG2DArray),
>+                                         "Blit11 2DArray PassthroughRG2DArray pixel shader"));
>+            break;
>+        case BLITSHADER_2DARRAY_RF:
>+            ANGLE_TRY(addBlitShaderToMap(context, blitShaderType, SHADER_2DARRAY,
>+                                         ShaderData(g_PS_PassthroughR2DArray),
>+                                         "Blit11 2DArray PassthroughR2DArray pixel shader"));
>+            break;
>+        case BLITSHADER_2DARRAY_ALPHA:
>+            ANGLE_TRY(addBlitShaderToMap(context, blitShaderType, SHADER_2DARRAY,
>+                                         ShaderData(g_PS_PassthroughRGBA2DArray),
>+                                         "Blit11 2DArray PassthroughRGBA2DArray pixel shader"));
>+            break;
>+        case BLITSHADER_2DARRAY_LUMA:
>+            ANGLE_TRY(addBlitShaderToMap(context, blitShaderType, SHADER_2DARRAY,
>+                                         ShaderData(g_PS_PassthroughLum2DArray),
>+                                         "Blit11 2DArray PassthroughLum2DArray pixel shader"));
>+            break;
>+        case BLITSHADER_2DARRAY_LUMAALPHA:
>+            ANGLE_TRY(addBlitShaderToMap(context, blitShaderType, SHADER_2DARRAY,
>+                                         ShaderData(g_PS_PassthroughLumAlpha2DArray),
>+                                         "Blit11 2DArray PassthroughLumAlpha2DArray pixel shader"));
>+            break;
>+        case BLITSHADER_2DARRAY_RGBAUI:
>+            ANGLE_TRY(addBlitShaderToMap(context, blitShaderType, SHADER_2DARRAY,
>+                                         ShaderData(g_PS_PassthroughRGBA2DArrayUI),
>+                                         "Blit11 2DArray PassthroughRGBA2DArrayUI pixel shader"));
>+            break;
>+        case BLITSHADER_2DARRAY_RGBAI:
>+            ANGLE_TRY(addBlitShaderToMap(context, blitShaderType, SHADER_2DARRAY,
>+                                         ShaderData(g_PS_PassthroughRGBA2DArrayI),
>+                                         "Blit11 2DArray PassthroughRGBA2DArrayI pixel shader"));
>+            break;
>+        case BLITSHADER_2DARRAY_RGBUI:
>+            ANGLE_TRY(addBlitShaderToMap(context, blitShaderType, SHADER_2DARRAY,
>+                                         ShaderData(g_PS_PassthroughRGB2DArrayUI),
>+                                         "Blit11 2DArray PassthroughRGB2DArrayUI pixel shader"));
>+            break;
>+        case BLITSHADER_2DARRAY_RGBI:
>+            ANGLE_TRY(addBlitShaderToMap(context, blitShaderType, SHADER_2DARRAY,
>+                                         ShaderData(g_PS_PassthroughRGB2DArrayI),
>+                                         "Blit11 2DArray PassthroughRGB2DArrayI pixel shader"));
>+            break;
>+        case BLITSHADER_2DARRAY_RGUI:
>+            ANGLE_TRY(addBlitShaderToMap(context, blitShaderType, SHADER_2DARRAY,
>+                                         ShaderData(g_PS_PassthroughRG2DArrayUI),
>+                                         "Blit11 2DArray PassthroughRG2DArrayUI pixel shader"));
>+            break;
>+        case BLITSHADER_2DARRAY_RGI:
>+            ANGLE_TRY(addBlitShaderToMap(context, blitShaderType, SHADER_2DARRAY,
>+                                         ShaderData(g_PS_PassthroughRG2DArrayI),
>+                                         "Blit11 2DArray PassthroughRG2DArrayI pixel shader"));
>+            break;
>+        case BLITSHADER_2DARRAY_RUI:
>+            ANGLE_TRY(addBlitShaderToMap(context, blitShaderType, SHADER_2DARRAY,
>+                                         ShaderData(g_PS_PassthroughR2DArrayUI),
>+                                         "Blit11 2DArray PassthroughR2DArrayUI pixel shader"));
>+            break;
>+        case BLITSHADER_2DARRAY_RI:
>+            ANGLE_TRY(addBlitShaderToMap(context, blitShaderType, SHADER_2DARRAY,
>+                                         ShaderData(g_PS_PassthroughR2DArrayI),
>+                                         "Blit11 2DArray PassthroughR2DArrayI pixel shader"));
>+            break;
>+        case BLITSHADER_2DARRAY_RGBAF_PREMULTIPLY:
>+            ANGLE_TRY(addBlitShaderToMap(context, blitShaderType, SHADER_2DARRAY,
>+                                         ShaderData(g_PS_FtoF_PM_RGBA_2DArray),
>+                                         "Blit11 2DArray FtoF PM RGBA 2DArray pixel shader"));
>+            break;
>+        case BLITSHADER_2DARRAY_RGBAF_UNMULTIPLY:
>+            ANGLE_TRY(addBlitShaderToMap(context, blitShaderType, SHADER_2DARRAY,
>+                                         ShaderData(g_PS_FtoF_UM_RGBA_2DArray),
>+                                         "Blit11 2DArray FtoF UM RGBA 2DArray pixel shader"));
>+            break;
>+        case BLITSHADER_2DARRAY_RGBF_PREMULTIPLY:
>+            ANGLE_TRY(addBlitShaderToMap(context, blitShaderType, SHADER_2DARRAY,
>+                                         ShaderData(g_PS_FtoF_PM_RGB_2DArray),
>+                                         "Blit11 2DArray FtoF PM RGB 2DArray pixel shader"));
>+            break;
>+        case BLITSHADER_2DARRAY_RGBF_UNMULTIPLY:
>+            ANGLE_TRY(addBlitShaderToMap(context, blitShaderType, SHADER_2DARRAY,
>+                                         ShaderData(g_PS_FtoF_UM_RGB_2DArray),
>+                                         "Blit11 2DArray FtoF UM RGB 2DArray pixel shader"));
>+            break;
>+        case BLITSHADER_2DARRAY_RGBAF_TOUI:
>+            ANGLE_TRY(addBlitShaderToMap(context, blitShaderType, SHADER_2DARRAY,
>+                                         ShaderData(g_PS_FtoU_PT_RGBA_2DArray),
>+                                         "Blit11 2DArray FtoU PT RGBA 2DArray pixel shader"));
>+            break;
>+        case BLITSHADER_2DARRAY_RGBAF_TOUI_PREMULTIPLY:
>+            ANGLE_TRY(addBlitShaderToMap(context, blitShaderType, SHADER_2DARRAY,
>+                                         ShaderData(g_PS_FtoU_PM_RGBA_2DArray),
>+                                         "Blit11 2DArray FtoU PM RGBA 2DArray pixel shader"));
>+            break;
>+        case BLITSHADER_2DARRAY_RGBAF_TOUI_UNMULTIPLY:
>+            ANGLE_TRY(addBlitShaderToMap(context, blitShaderType, SHADER_2DARRAY,
>+                                         ShaderData(g_PS_FtoU_UM_RGBA_2DArray),
>+                                         "Blit11 2DArray FtoU UM RGBA 2DArray pixel shader"));
>+            break;
>+        case BLITSHADER_2DARRAY_RGBF_TOUI:
>+            ANGLE_TRY(addBlitShaderToMap(context, blitShaderType, SHADER_2DARRAY,
>+                                         ShaderData(g_PS_FtoU_PT_RGB_2DArray),
>+                                         "Blit11 2DArray FtoU PT RGB 2DArray pixel shader"));
>+            break;
>+        case BLITSHADER_2DARRAY_RGBF_TOUI_PREMULTIPLY:
>+            ANGLE_TRY(addBlitShaderToMap(context, blitShaderType, SHADER_2DARRAY,
>+                                         ShaderData(g_PS_FtoU_PM_RGB_2DArray),
>+                                         "Blit11 2DArray FtoU PM RGB 2DArray pixel shader"));
>+            break;
>+        case BLITSHADER_2DARRAY_RGBF_TOUI_UNMULTIPLY:
>+            ANGLE_TRY(addBlitShaderToMap(context, blitShaderType, SHADER_2DARRAY,
>+                                         ShaderData(g_PS_FtoU_UM_RGB_2DArray),
>+                                         "Blit11 2DArray FtoU UM RGB 2DArray pixel shader"));
>+            break;
>+        case BLITSHADER_2DARRAY_RGBAF_TOI:
>+            ANGLE_TRY(addBlitShaderToMap(context, blitShaderType, SHADER_2DARRAY,
>+                                         ShaderData(g_PS_FtoI_PT_RGBA_2DArray),
>+                                         "Blit11 2DArray FtoI PT RGBA 2DArray pixel shader"));
>+            break;
>+        case BLITSHADER_2DARRAY_RGBAF_TOI_PREMULTIPLY:
>+            ANGLE_TRY(addBlitShaderToMap(context, blitShaderType, SHADER_2DARRAY,
>+                                         ShaderData(g_PS_FtoI_PM_RGBA_2DArray),
>+                                         "Blit11 2DArray FtoI PM RGBA 2DArray pixel shader"));
>+            break;
>+        case BLITSHADER_2DARRAY_RGBAF_TOI_UNMULTIPLY:
>+            ANGLE_TRY(addBlitShaderToMap(context, blitShaderType, SHADER_2DARRAY,
>+                                         ShaderData(g_PS_FtoI_UM_RGBA_2DArray),
>+                                         "Blit11 2DArray FtoI UM RGBA 2DArray pixel shader"));
>+            break;
>+        case BLITSHADER_2DARRAY_RGBF_TOI:
>+            ANGLE_TRY(addBlitShaderToMap(context, blitShaderType, SHADER_2DARRAY,
>+                                         ShaderData(g_PS_FtoI_PT_RGB_2DArray),
>+                                         "Blit11 2DArray FtoI PT RGB 2DArray pixel shader"));
>+            break;
>+        case BLITSHADER_2DARRAY_RGBF_TOI_PREMULTIPLY:
>+            ANGLE_TRY(addBlitShaderToMap(context, blitShaderType, SHADER_2DARRAY,
>+                                         ShaderData(g_PS_FtoI_PM_RGB_2DArray),
>+                                         "Blit11 2DArray FtoI PM RGB 2DArray pixel shader"));
>+            break;
>+        case BLITSHADER_2DARRAY_RGBF_TOI_UNMULTIPLY:
>+            ANGLE_TRY(addBlitShaderToMap(context, blitShaderType, SHADER_2DARRAY,
>+                                         ShaderData(g_PS_FtoI_UM_RGB_2DArray),
>+                                         "Blit11 2DArray FtoI UM RGB 2DArray pixel shader"));
>+            break;
>+        case BLITSHADER_2DARRAY_LUMAF_PREMULTIPLY:
>+            ANGLE_TRY(addBlitShaderToMap(context, blitShaderType, SHADER_2DARRAY,
>+                                         ShaderData(g_PS_FtoF_PM_LUMA_2DArray),
>+                                         "Blit11 2DArray FtoF PM LUMA 2DArray pixel shader"));
>+            break;
>+        case BLITSHADER_2DARRAY_LUMAF_UNMULTIPLY:
>+            ANGLE_TRY(addBlitShaderToMap(context, blitShaderType, SHADER_2DARRAY,
>+                                         ShaderData(g_PS_FtoF_UM_LUMA_2DArray),
>+                                         "Blit11 2DArray FtoF UM LUMA 2DArray pixel shader"));
>+            break;
>+        case BLITSHADER_2DARRAY_LUMAALPHAF_PREMULTIPLY:
>+            ANGLE_TRY(addBlitShaderToMap(context, blitShaderType, SHADER_2DARRAY,
>+                                         ShaderData(g_PS_FtoF_PM_LUMAALPHA_2DArray),
>+                                         "Blit11 2DArray FtoF PM LUMAALPHA 2DArray pixel shader"));
>+            break;
>+        case BLITSHADER_2DARRAY_LUMAALPHAF_UNMULTIPLY:
>+            ANGLE_TRY(addBlitShaderToMap(context, blitShaderType, SHADER_2DARRAY,
>+                                         ShaderData(g_PS_FtoF_UM_LUMAALPHA_2DArray),
>+                                         "Blit11 2DArray FtoF UM LUMAALPHA 2DArray pixel shader"));
>+            break;
>+        case BLITSHADER_2DARRAY_RGBAF_4444:
>+            ANGLE_TRY(addBlitShaderToMap(context, blitShaderType, SHADER_2DARRAY,
>+                                         ShaderData(g_PS_PassthroughRGBA2DArray_4444),
>+                                         "Blit11 2DArray PassthroughRGBA2DArray 4444 pixel shader"));
>+            break;
>+        case BLITSHADER_2DARRAY_RGBAF_4444_PREMULTIPLY:
>+            ANGLE_TRY(addBlitShaderToMap(context, blitShaderType, SHADER_2DARRAY,
>+                                         ShaderData(g_PS_FtoF_PM_RGBA_4444_2DArray),
>+                                         "Blit11 2DArray FtoF PM RGBA 4444 2DArray pixel shader"));
>+            break;
>+        case BLITSHADER_2DARRAY_RGBAF_4444_UNMULTIPLY:
>+            ANGLE_TRY(addBlitShaderToMap(context, blitShaderType, SHADER_2DARRAY,
>+                                         ShaderData(g_PS_FtoF_UM_RGBA_4444_2DArray),
>+                                         "Blit11 2DArray FtoF UM RGBA 4444 2DArray pixel shader"));
>+            break;
>+        case BLITSHADER_2DARRAY_RGBF_565:
>+            ANGLE_TRY(addBlitShaderToMap(context, blitShaderType, SHADER_2DARRAY,
>+                                         ShaderData(g_PS_PassthroughRGB2DArray_565),
>+                                         "Blit11 2DArray PassthroughRGB2DArray 565 pixel shader"));
>+            break;
>+        case BLITSHADER_2DARRAY_RGBF_565_PREMULTIPLY:
>+            ANGLE_TRY(addBlitShaderToMap(context, blitShaderType, SHADER_2DARRAY,
>+                                         ShaderData(g_PS_FtoF_PM_RGB_565_2DArray),
>+                                         "Blit11 2DArray FtoF PM RGB 565 2DArray pixel shader"));
>+            break;
>+        case BLITSHADER_2DARRAY_RGBF_565_UNMULTIPLY:
>+            ANGLE_TRY(addBlitShaderToMap(context, blitShaderType, SHADER_2DARRAY,
>+                                         ShaderData(g_PS_FtoF_UM_RGB_565_2DArray),
>+                                         "Blit11 2DArray FtoF UM RGB 565 2DArray pixel shader"));
>+            break;
>+        case BLITSHADER_2DARRAY_RGBAF_5551:
>+            ANGLE_TRY(addBlitShaderToMap(context, blitShaderType, SHADER_2DARRAY,
>+                                         ShaderData(g_PS_PassthroughRGBA2DArray_5551),
>+                                         "Blit11 2DArray PassthroughRGBA2DArray 5551 pixel shader"));
>+            break;
>+        case BLITSHADER_2DARRAY_RGBAF_5551_PREMULTIPLY:
>+            ANGLE_TRY(addBlitShaderToMap(context, blitShaderType, SHADER_2DARRAY,
>+                                         ShaderData(g_PS_FtoF_PM_RGBA_5551_2DArray),
>+                                         "Blit11 2DArray FtoF PM RGBA 5551 2DArray pixel shader"));
>+            break;
>+        case BLITSHADER_2DARRAY_RGBAF_5551_UNMULTIPLY:
>+            ANGLE_TRY(addBlitShaderToMap(context, blitShaderType, SHADER_2DARRAY,
>+                                         ShaderData(g_PS_FtoF_UM_RGBA_5551_2DArray),
>+                                         "Blit11 2DArray FtoF UM RGBA 5551 2DArray pixel shader"));
>+            break;
>+        default:
>+            ANGLE_HR_UNREACHABLE(GetImplAs<Context11>(context));
>+    }
>+
>+    return angle::Result::Continue;
>+}
>+
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/Buffer11.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/Buffer11.cpp
>index 2317c9abdbe..9f6061fdfb9 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/Buffer11.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/Buffer11.cpp
>@@ -11,8 +11,10 @@
> #include <memory>
> 
> #include "common/MemoryBuffer.h"
>+#include "libANGLE/Context.h"
> #include "libANGLE/renderer/d3d/IndexDataManager.h"
> #include "libANGLE/renderer/d3d/VertexDataManager.h"
>+#include "libANGLE/renderer/d3d/d3d11/Context11.h"
> #include "libANGLE/renderer/d3d/d3d11/RenderTarget11.h"
> #include "libANGLE/renderer/d3d/d3d11/Renderer11.h"
> #include "libANGLE/renderer/d3d/d3d11/formatutils11.h"
>@@ -115,20 +117,25 @@ class Buffer11::BufferStorage : angle::NonCopyable
> 
>     virtual bool isGPUAccessible() const = 0;
> 
>-    virtual gl::ErrorOrResult<CopyResult> copyFromStorage(const gl::Context *context,
>-                                                          BufferStorage *source,
>-                                                          size_t sourceOffset,
>-                                                          size_t size,
>-                                                          size_t destOffset) = 0;
>-    virtual gl::Error resize(const gl::Context *context, size_t size, bool preserveData) = 0;
>-
>-    virtual gl::Error map(size_t offset,
>-                          size_t length,
>-                          GLbitfield access,
>-                          uint8_t **mapPointerOut) = 0;
>-    virtual void unmap()                           = 0;
>-
>-    gl::Error setData(const uint8_t *data, size_t offset, size_t size);
>+    virtual angle::Result copyFromStorage(const gl::Context *context,
>+                                          BufferStorage *source,
>+                                          size_t sourceOffset,
>+                                          size_t size,
>+                                          size_t destOffset,
>+                                          CopyResult *resultOut)                             = 0;
>+    virtual angle::Result resize(const gl::Context *context, size_t size, bool preserveData) = 0;
>+
>+    virtual angle::Result map(const gl::Context *context,
>+                              size_t offset,
>+                              size_t length,
>+                              GLbitfield access,
>+                              uint8_t **mapPointerOut) = 0;
>+    virtual void unmap()                               = 0;
>+
>+    angle::Result setData(const gl::Context *context,
>+                          const uint8_t *data,
>+                          size_t offset,
>+                          size_t size);
> 
>   protected:
>     BufferStorage(Renderer11 *renderer, BufferUsage usage);
>@@ -144,9 +151,7 @@ class Buffer11::BufferStorage : angle::NonCopyable
> class Buffer11::NativeStorage : public Buffer11::BufferStorage
> {
>   public:
>-    NativeStorage(Renderer11 *renderer,
>-                  BufferUsage usage,
>-                  const OnBufferDataDirtyChannel *onStorageChanged);
>+    NativeStorage(Renderer11 *renderer, BufferUsage usage, const angle::Subject *onStorageChanged);
>     ~NativeStorage() override;
> 
>     bool isCPUAccessible(GLbitfield access) const override;
>@@ -154,20 +159,28 @@ class Buffer11::NativeStorage : public Buffer11::BufferStorage
>     bool isGPUAccessible() const override { return true; }
> 
>     const d3d11::Buffer &getBuffer() const { return mBuffer; }
>-    gl::ErrorOrResult<CopyResult> copyFromStorage(const gl::Context *context,
>-                                                  BufferStorage *source,
>-                                                  size_t sourceOffset,
>-                                                  size_t size,
>-                                                  size_t destOffset) override;
>-    gl::Error resize(const gl::Context *context, size_t size, bool preserveData) override;
>-
>-    gl::Error map(size_t offset,
>-                  size_t length,
>-                  GLbitfield access,
>-                  uint8_t **mapPointerOut) override;
>+    angle::Result copyFromStorage(const gl::Context *context,
>+                                  BufferStorage *source,
>+                                  size_t sourceOffset,
>+                                  size_t size,
>+                                  size_t destOffset,
>+                                  CopyResult *resultOut) override;
>+    angle::Result resize(const gl::Context *context, size_t size, bool preserveData) override;
>+
>+    angle::Result map(const gl::Context *context,
>+                      size_t offset,
>+                      size_t length,
>+                      GLbitfield access,
>+                      uint8_t **mapPointerOut) override;
>     void unmap() override;
> 
>-    gl::ErrorOrResult<const d3d11::ShaderResourceView *> getSRVForFormat(DXGI_FORMAT srvFormat);
>+    angle::Result getSRVForFormat(const gl::Context *context,
>+                                  DXGI_FORMAT srvFormat,
>+                                  const d3d11::ShaderResourceView **srvOut);
>+    angle::Result getRawUAV(const gl::Context *context,
>+                            unsigned int offset,
>+                            unsigned int size,
>+                            d3d11::UnorderedAccessView **uavOut);
> 
>   private:
>     static void FillBufferDesc(D3D11_BUFFER_DESC *bufferDesc,
>@@ -175,10 +188,12 @@ class Buffer11::NativeStorage : public Buffer11::BufferStorage
>                                BufferUsage usage,
>                                unsigned int bufferSize);
>     void clearSRVs();
>+    void clearUAVs();
> 
>     d3d11::Buffer mBuffer;
>-    const OnBufferDataDirtyChannel *mOnStorageChanged;
>+    const angle::Subject *mOnStorageChanged;
>     std::map<DXGI_FORMAT, d3d11::ShaderResourceView> mBufferResourceViews;
>+    std::map<std::pair<unsigned int, unsigned int>, d3d11::UnorderedAccessView> mBufferRawUAVs;
> };
> 
> // A emulated indexed buffer storage represents an underlying D3D11 buffer for data
>@@ -194,22 +209,26 @@ class Buffer11::EmulatedIndexedStorage : public Buffer11::BufferStorage
> 
>     bool isGPUAccessible() const override { return false; }
> 
>-    gl::ErrorOrResult<const d3d11::Buffer *> getBuffer(SourceIndexData *indexInfo,
>-                                                       const TranslatedAttribute &attribute,
>-                                                       GLint startVertex);
>-
>-    gl::ErrorOrResult<CopyResult> copyFromStorage(const gl::Context *context,
>-                                                  BufferStorage *source,
>-                                                  size_t sourceOffset,
>-                                                  size_t size,
>-                                                  size_t destOffset) override;
>-
>-    gl::Error resize(const gl::Context *context, size_t size, bool preserveData) override;
>-
>-    gl::Error map(size_t offset,
>-                  size_t length,
>-                  GLbitfield access,
>-                  uint8_t **mapPointerOut) override;
>+    angle::Result getBuffer(const gl::Context *context,
>+                            SourceIndexData *indexInfo,
>+                            const TranslatedAttribute &attribute,
>+                            GLint startVertex,
>+                            const d3d11::Buffer **bufferOut);
>+
>+    angle::Result copyFromStorage(const gl::Context *context,
>+                                  BufferStorage *source,
>+                                  size_t sourceOffset,
>+                                  size_t size,
>+                                  size_t destOffset,
>+                                  CopyResult *resultOut) override;
>+
>+    angle::Result resize(const gl::Context *context, size_t size, bool preserveData) override;
>+
>+    angle::Result map(const gl::Context *context,
>+                      size_t offset,
>+                      size_t length,
>+                      GLbitfield access,
>+                      uint8_t **mapPointerOut) override;
>     void unmap() override;
> 
>   private:
>@@ -230,25 +249,27 @@ class Buffer11::PackStorage : public Buffer11::BufferStorage
> 
>     bool isGPUAccessible() const override { return false; }
> 
>-    gl::ErrorOrResult<CopyResult> copyFromStorage(const gl::Context *context,
>-                                                  BufferStorage *source,
>-                                                  size_t sourceOffset,
>-                                                  size_t size,
>-                                                  size_t destOffset) override;
>-    gl::Error resize(const gl::Context *context, size_t size, bool preserveData) override;
>-
>-    gl::Error map(size_t offset,
>-                  size_t length,
>-                  GLbitfield access,
>-                  uint8_t **mapPointerOut) override;
>+    angle::Result copyFromStorage(const gl::Context *context,
>+                                  BufferStorage *source,
>+                                  size_t sourceOffset,
>+                                  size_t size,
>+                                  size_t destOffset,
>+                                  CopyResult *resultOut) override;
>+    angle::Result resize(const gl::Context *context, size_t size, bool preserveData) override;
>+
>+    angle::Result map(const gl::Context *context,
>+                      size_t offset,
>+                      size_t length,
>+                      GLbitfield access,
>+                      uint8_t **mapPointerOut) override;
>     void unmap() override;
> 
>-    gl::Error packPixels(const gl::Context *context,
>-                         const gl::FramebufferAttachment &readAttachment,
>-                         const PackPixelsParams &params);
>+    angle::Result packPixels(const gl::Context *context,
>+                             const gl::FramebufferAttachment &readAttachment,
>+                             const PackPixelsParams &params);
> 
>   private:
>-    gl::Error flushQueuedPackCommand();
>+    angle::Result flushQueuedPackCommand(const gl::Context *context);
> 
>     TextureHelper11 mStagingTexture;
>     angle::MemoryBuffer mMemoryBuffer;
>@@ -270,17 +291,19 @@ class Buffer11::SystemMemoryStorage : public Buffer11::BufferStorage
> 
>     bool isGPUAccessible() const override { return false; }
> 
>-    gl::ErrorOrResult<CopyResult> copyFromStorage(const gl::Context *context,
>-                                                  BufferStorage *source,
>-                                                  size_t sourceOffset,
>-                                                  size_t size,
>-                                                  size_t destOffset) override;
>-    gl::Error resize(const gl::Context *context, size_t size, bool preserveData) override;
>-
>-    gl::Error map(size_t offset,
>-                  size_t length,
>-                  GLbitfield access,
>-                  uint8_t **mapPointerOut) override;
>+    angle::Result copyFromStorage(const gl::Context *context,
>+                                  BufferStorage *source,
>+                                  size_t sourceOffset,
>+                                  size_t size,
>+                                  size_t destOffset,
>+                                  CopyResult *resultOut) override;
>+    angle::Result resize(const gl::Context *context, size_t size, bool preserveData) override;
>+
>+    angle::Result map(const gl::Context *context,
>+                      size_t offset,
>+                      size_t length,
>+                      GLbitfield access,
>+                      uint8_t **mapPointerOut) override;
>     void unmap() override;
> 
>     angle::MemoryBuffer *getSystemCopy() { return &mSystemCopy; }
>@@ -300,8 +323,7 @@ Buffer11::Buffer11(const gl::BufferState &state, Renderer11 *renderer)
>       mIdleness({}),
>       mConstantBufferStorageAdditionalSize(0),
>       mMaxConstantBufferLruCount(0)
>-{
>-}
>+{}
> 
> Buffer11::~Buffer11()
> {
>@@ -318,41 +340,40 @@ Buffer11::~Buffer11()
>     mRenderer->onBufferDelete(this);
> }
> 
>-gl::Error Buffer11::setData(const gl::Context *context,
>-                            gl::BufferBinding target,
>-                            const void *data,
>-                            size_t size,
>-                            gl::BufferUsage usage)
>+angle::Result Buffer11::setData(const gl::Context *context,
>+                                gl::BufferBinding target,
>+                                const void *data,
>+                                size_t size,
>+                                gl::BufferUsage usage)
> {
>     updateD3DBufferUsage(context, usage);
>-    ANGLE_TRY(setSubData(context, target, data, size, 0));
>-    return gl::NoError();
>+    return setSubData(context, target, data, size, 0);
> }
> 
>-gl::Error Buffer11::getData(const gl::Context *context, const uint8_t **outData)
>+angle::Result Buffer11::getData(const gl::Context *context, const uint8_t **outData)
> {
>+    if (mSize == 0)
>+    {
>+        // TODO(http://anglebug.com/2840): This ensures that we don't crash or assert in robust
>+        // buffer access behavior mode if there are buffers without any data. However, technically
>+        // it should still be possible to draw, with fetches from this buffer returning zero.
>+        return angle::Result::Stop;
>+    }
>+
>     SystemMemoryStorage *systemMemoryStorage = nullptr;
>-    ANGLE_TRY_RESULT(getSystemMemoryStorage(context), systemMemoryStorage);
>+    ANGLE_TRY(getBufferStorage(context, BUFFER_USAGE_SYSTEM_MEMORY, &systemMemoryStorage));
> 
>     ASSERT(systemMemoryStorage->getSize() >= mSize);
> 
>     *outData = systemMemoryStorage->getSystemCopy()->data();
>-    return gl::NoError();
>-}
>-
>-gl::ErrorOrResult<Buffer11::SystemMemoryStorage *> Buffer11::getSystemMemoryStorage(
>-    const gl::Context *context)
>-{
>-    BufferStorage *storage = nullptr;
>-    ANGLE_TRY_RESULT(getBufferStorage(context, BUFFER_USAGE_SYSTEM_MEMORY), storage);
>-    return GetAs<SystemMemoryStorage>(storage);
>+    return angle::Result::Continue;
> }
> 
>-gl::Error Buffer11::setSubData(const gl::Context *context,
>-                               gl::BufferBinding target,
>-                               const void *data,
>-                               size_t size,
>-                               size_t offset)
>+angle::Result Buffer11::setSubData(const gl::Context *context,
>+                                   gl::BufferBinding target,
>+                                   const void *data,
>+                                   size_t size,
>+                                   size_t offset)
> {
>     size_t requiredSize = size + offset;
> 
>@@ -372,20 +393,20 @@ gl::Error Buffer11::setSubData(const gl::Context *context,
>                 size <= static_cast<UINT>(mRenderer->getNativeCaps().maxUniformBlockSize) &&
>                 !mRenderer->getWorkarounds().useSystemMemoryForConstantBuffers)
>             {
>-                ANGLE_TRY_RESULT(getBufferStorage(context, BUFFER_USAGE_UNIFORM), writeBuffer);
>+                ANGLE_TRY(getBufferStorage(context, BUFFER_USAGE_UNIFORM, &writeBuffer));
>             }
>             else
>             {
>-                ANGLE_TRY_RESULT(getSystemMemoryStorage(context), writeBuffer);
>+                ANGLE_TRY(getBufferStorage(context, BUFFER_USAGE_SYSTEM_MEMORY, &writeBuffer));
>             }
>         }
>         else if (supportsDirectBinding())
>         {
>-            ANGLE_TRY_RESULT(getStagingStorage(context), writeBuffer);
>+            ANGLE_TRY(getStagingStorage(context, &writeBuffer));
>         }
>         else
>         {
>-            ANGLE_TRY_RESULT(getSystemMemoryStorage(context), writeBuffer);
>+            ANGLE_TRY(getBufferStorage(context, BUFFER_USAGE_SYSTEM_MEMORY, &writeBuffer));
>         }
> 
>         ASSERT(writeBuffer);
>@@ -398,43 +419,39 @@ gl::Error Buffer11::setSubData(const gl::Context *context,
>             ANGLE_TRY(writeBuffer->resize(context, requiredSize, preserveData));
>         }
> 
>-        ANGLE_TRY(writeBuffer->setData(static_cast<const uint8_t *>(data), offset, size));
>+        ANGLE_TRY(writeBuffer->setData(context, static_cast<const uint8_t *>(data), offset, size));
>         onStorageUpdate(writeBuffer);
>-
>-        // Notify any vertex arrays that we have dirty data.
>-        // TODO(jmadill): Use a more fine grained notification for data updates.
>-        mDirectBroadcastChannel.signal(context);
>     }
> 
>     mSize = std::max(mSize, requiredSize);
>     invalidateStaticData(context);
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error Buffer11::copySubData(const gl::Context *context,
>-                                BufferImpl *source,
>-                                GLintptr sourceOffset,
>-                                GLintptr destOffset,
>-                                GLsizeiptr size)
>+angle::Result Buffer11::copySubData(const gl::Context *context,
>+                                    BufferImpl *source,
>+                                    GLintptr sourceOffset,
>+                                    GLintptr destOffset,
>+                                    GLsizeiptr size)
> {
>     Buffer11 *sourceBuffer = GetAs<Buffer11>(source);
>     ASSERT(sourceBuffer != nullptr);
> 
>     BufferStorage *copyDest = nullptr;
>-    ANGLE_TRY_RESULT(getLatestBufferStorage(context), copyDest);
>+    ANGLE_TRY(getLatestBufferStorage(context, &copyDest));
> 
>     if (!copyDest)
>     {
>-        ANGLE_TRY_RESULT(getStagingStorage(context), copyDest);
>+        ANGLE_TRY(getStagingStorage(context, &copyDest));
>     }
> 
>     BufferStorage *copySource = nullptr;
>-    ANGLE_TRY_RESULT(sourceBuffer->getLatestBufferStorage(context), copySource);
>+    ANGLE_TRY(sourceBuffer->getLatestBufferStorage(context, &copySource));
> 
>     if (!copySource)
>     {
>-        ANGLE_TRY_RESULT(sourceBuffer->getStagingStorage(context), copySource);
>+        ANGLE_TRY(sourceBuffer->getStagingStorage(context, &copySource));
>     }
> 
>     ASSERT(copySource && copyDest);
>@@ -442,11 +459,11 @@ gl::Error Buffer11::copySubData(const gl::Context *context,
>     // A staging buffer is needed if there is no cpu-cpu or gpu-gpu copy path avaiable.
>     if (!copyDest->isGPUAccessible() && !copySource->isCPUAccessible(GL_MAP_READ_BIT))
>     {
>-        ANGLE_TRY_RESULT(sourceBuffer->getStagingStorage(context), copySource);
>+        ANGLE_TRY(sourceBuffer->getStagingStorage(context, &copySource));
>     }
>     else if (!copySource->isGPUAccessible() && !copyDest->isCPUAccessible(GL_MAP_WRITE_BIT))
>     {
>-        ANGLE_TRY_RESULT(getStagingStorage(context), copyDest);
>+        ANGLE_TRY(getStagingStorage(context, &copyDest));
>     }
> 
>     // D3D11 does not allow overlapped copies until 11.1, and only if the
>@@ -456,30 +473,27 @@ gl::Error Buffer11::copySubData(const gl::Context *context,
>     {
>         if (copySource->getUsage() == BUFFER_USAGE_STAGING)
>         {
>-            ANGLE_TRY_RESULT(getBufferStorage(context, BUFFER_USAGE_VERTEX_OR_TRANSFORM_FEEDBACK),
>-                             copySource);
>+            ANGLE_TRY(
>+                getBufferStorage(context, BUFFER_USAGE_VERTEX_OR_TRANSFORM_FEEDBACK, &copySource));
>         }
>         else
>         {
>-            ANGLE_TRY_RESULT(getStagingStorage(context), copySource);
>+            ANGLE_TRY(getStagingStorage(context, &copySource));
>         }
>     }
> 
>     CopyResult copyResult = CopyResult::NOT_RECREATED;
>-    ANGLE_TRY_RESULT(copyDest->copyFromStorage(context, copySource, sourceOffset, size, destOffset),
>-                     copyResult);
>+    ANGLE_TRY(copyDest->copyFromStorage(context, copySource, sourceOffset, size, destOffset,
>+                                        &copyResult));
>     onStorageUpdate(copyDest);
> 
>     mSize = std::max<size_t>(mSize, destOffset + size);
>     invalidateStaticData(context);
> 
>-    // Also notify that direct buffers are dirty.
>-    mDirectBroadcastChannel.signal(context);
>-
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error Buffer11::map(const gl::Context *context, GLenum access, void **mapPtr)
>+angle::Result Buffer11::map(const gl::Context *context, GLenum access, void **mapPtr)
> {
>     // GL_OES_mapbuffer uses an enum instead of a bitfield for it's access, convert to a bitfield
>     // and call mapRange.
>@@ -487,16 +501,16 @@ gl::Error Buffer11::map(const gl::Context *context, GLenum access, void **mapPtr
>     return mapRange(context, 0, mSize, GL_MAP_WRITE_BIT, mapPtr);
> }
> 
>-gl::Error Buffer11::mapRange(const gl::Context *context,
>-                             size_t offset,
>-                             size_t length,
>-                             GLbitfield access,
>-                             void **mapPtr)
>+angle::Result Buffer11::mapRange(const gl::Context *context,
>+                                 size_t offset,
>+                                 size_t length,
>+                                 GLbitfield access,
>+                                 void **mapPtr)
> {
>     ASSERT(!mMappedStorage);
> 
>     BufferStorage *latestStorage = nullptr;
>-    ANGLE_TRY_RESULT(getLatestBufferStorage(context), latestStorage);
>+    ANGLE_TRY(getLatestBufferStorage(context, &latestStorage));
> 
>     if (latestStorage && (latestStorage->getUsage() == BUFFER_USAGE_PIXEL_PACK ||
>                           latestStorage->getUsage() == BUFFER_USAGE_STAGING))
>@@ -508,13 +522,11 @@ gl::Error Buffer11::mapRange(const gl::Context *context,
>     {
>         // Fall back to using the staging buffer if the latest storage does not exist or is not
>         // CPU-accessible.
>-        ANGLE_TRY_RESULT(getStagingStorage(context), mMappedStorage);
>+        ANGLE_TRY(getStagingStorage(context, &mMappedStorage));
>     }
> 
>-    if (!mMappedStorage)
>-    {
>-        return gl::OutOfMemory() << "Failed to allocate mappable internal buffer.";
>-    }
>+    Context11 *context11 = GetImplAs<Context11>(context);
>+    ANGLE_CHECK_GL_ALLOC(context11, mMappedStorage);
> 
>     if ((access & GL_MAP_WRITE_BIT) > 0)
>     {
>@@ -524,14 +536,14 @@ gl::Error Buffer11::mapRange(const gl::Context *context,
>     }
> 
>     uint8_t *mappedBuffer = nullptr;
>-    ANGLE_TRY(mMappedStorage->map(offset, length, access, &mappedBuffer));
>+    ANGLE_TRY(mMappedStorage->map(context, offset, length, access, &mappedBuffer));
>     ASSERT(mappedBuffer);
> 
>     *mapPtr = static_cast<void *>(mappedBuffer);
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error Buffer11::unmap(const gl::Context *context, GLboolean *result)
>+angle::Result Buffer11::unmap(const gl::Context *context, GLboolean *result)
> {
>     ASSERT(mMappedStorage);
>     mMappedStorage->unmap();
>@@ -540,22 +552,13 @@ gl::Error Buffer11::unmap(const gl::Context *context, GLboolean *result)
>     // TODO: detect if we had corruption. if so, return false.
>     *result = GL_TRUE;
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error Buffer11::markTransformFeedbackUsage(const gl::Context *context)
>+angle::Result Buffer11::markTransformFeedbackUsage(const gl::Context *context)
> {
>-    BufferStorage *transformFeedbackStorage = nullptr;
>-    ANGLE_TRY_RESULT(getBufferStorage(context, BUFFER_USAGE_VERTEX_OR_TRANSFORM_FEEDBACK),
>-                     transformFeedbackStorage);
>-
>-    if (transformFeedbackStorage)
>-    {
>-        onStorageUpdate(transformFeedbackStorage);
>-    }
>-
>-    invalidateStaticData(context);
>-    return gl::NoError();
>+    ANGLE_TRY(markBufferUsage(context, BUFFER_USAGE_VERTEX_OR_TRANSFORM_FEEDBACK));
>+    return angle::Result::Continue;
> }
> 
> void Buffer11::updateDeallocThreshold(BufferUsage usage)
>@@ -580,7 +583,7 @@ void Buffer11::updateDeallocThreshold(BufferUsage usage)
> }
> 
> // Free the storage if we decide it isn't being used very often.
>-gl::Error Buffer11::checkForDeallocation(const gl::Context *context, BufferUsage usage)
>+angle::Result Buffer11::checkForDeallocation(const gl::Context *context, BufferUsage usage)
> {
>     mIdleness[usage]++;
> 
>@@ -588,14 +591,14 @@ gl::Error Buffer11::checkForDeallocation(const gl::Context *context, BufferUsage
>     if (storage != nullptr && mIdleness[usage] > mDeallocThresholds[usage])
>     {
>         BufferStorage *latestStorage = nullptr;
>-        ANGLE_TRY_RESULT(getLatestBufferStorage(context), latestStorage);
>+        ANGLE_TRY(getLatestBufferStorage(context, &latestStorage));
>         if (latestStorage != storage)
>         {
>             SafeDelete(storage);
>         }
>     }
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
> // Keep system memory when we are using it for the canonical version of data.
>@@ -616,7 +619,21 @@ void Buffer11::markBufferUsage(BufferUsage usage)
>     mIdleness[usage] = 0;
> }
> 
>-gl::Error Buffer11::garbageCollection(const gl::Context *context, BufferUsage currentUsage)
>+angle::Result Buffer11::markBufferUsage(const gl::Context *context, BufferUsage usage)
>+{
>+    BufferStorage *bufferStorage = nullptr;
>+    ANGLE_TRY(getBufferStorage(context, usage, &bufferStorage));
>+
>+    if (bufferStorage)
>+    {
>+        onStorageUpdate(bufferStorage);
>+    }
>+
>+    invalidateStaticData(context);
>+    return angle::Result::Continue;
>+}
>+
>+angle::Result Buffer11::garbageCollection(const gl::Context *context, BufferUsage currentUsage)
> {
>     if (currentUsage != BUFFER_USAGE_SYSTEM_MEMORY && canDeallocateSystemMemory())
>     {
>@@ -628,83 +645,101 @@ gl::Error Buffer11::garbageCollection(const gl::Context *context, BufferUsage cu
>         ANGLE_TRY(checkForDeallocation(context, BUFFER_USAGE_STAGING));
>     }
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::ErrorOrResult<ID3D11Buffer *> Buffer11::getBuffer(const gl::Context *context, BufferUsage usage)
>+angle::Result Buffer11::getBuffer(const gl::Context *context,
>+                                  BufferUsage usage,
>+                                  ID3D11Buffer **bufferOut)
> {
>-    BufferStorage *storage = nullptr;
>-    ANGLE_TRY_RESULT(getBufferStorage(context, usage), storage);
>-    return GetAs<NativeStorage>(storage)->getBuffer().get();
>+    NativeStorage *storage = nullptr;
>+    ANGLE_TRY(getBufferStorage(context, usage, &storage));
>+    *bufferOut = storage->getBuffer().get();
>+    return angle::Result::Continue;
> }
> 
>-gl::ErrorOrResult<ID3D11Buffer *> Buffer11::getEmulatedIndexedBuffer(
>-    const gl::Context *context,
>-    SourceIndexData *indexInfo,
>-    const TranslatedAttribute &attribute,
>-    GLint startVertex)
>+angle::Result Buffer11::getEmulatedIndexedBuffer(const gl::Context *context,
>+                                                 SourceIndexData *indexInfo,
>+                                                 const TranslatedAttribute &attribute,
>+                                                 GLint startVertex,
>+                                                 ID3D11Buffer **bufferOut)
> {
>     ASSERT(indexInfo);
> 
>-    BufferStorage *untypedStorage = nullptr;
>-    ANGLE_TRY_RESULT(getBufferStorage(context, BUFFER_USAGE_EMULATED_INDEXED_VERTEX),
>-                     untypedStorage);
>+    EmulatedIndexedStorage *emulatedStorage = nullptr;
>+    ANGLE_TRY(getBufferStorage(context, BUFFER_USAGE_EMULATED_INDEXED_VERTEX, &emulatedStorage));
> 
>-    EmulatedIndexedStorage *emulatedStorage = GetAs<EmulatedIndexedStorage>(untypedStorage);
>-
>-    const d3d11::Buffer *nativeStorage = nullptr;
>-    ANGLE_TRY_RESULT(emulatedStorage->getBuffer(indexInfo, attribute, startVertex), nativeStorage);
>-
>-    return nativeStorage->get();
>+    const d3d11::Buffer *nativeBuffer = nullptr;
>+    ANGLE_TRY(
>+        emulatedStorage->getBuffer(context, indexInfo, attribute, startVertex, &nativeBuffer));
>+    *bufferOut = nativeBuffer->get();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error Buffer11::getConstantBufferRange(const gl::Context *context,
>-                                           GLintptr offset,
>-                                           GLsizeiptr size,
>-                                           const d3d11::Buffer **bufferOut,
>-                                           UINT *firstConstantOut,
>-                                           UINT *numConstantsOut)
>+angle::Result Buffer11::getConstantBufferRange(const gl::Context *context,
>+                                               GLintptr offset,
>+                                               GLsizeiptr size,
>+                                               const d3d11::Buffer **bufferOut,
>+                                               UINT *firstConstantOut,
>+                                               UINT *numConstantsOut)
> {
>-    BufferStorage *bufferStorage = nullptr;
>+    NativeStorage *bufferStorage = nullptr;
> 
>     if (offset == 0 || mRenderer->getRenderer11DeviceCaps().supportsConstantBufferOffsets)
>     {
>-        ANGLE_TRY_RESULT(getBufferStorage(context, BUFFER_USAGE_UNIFORM), bufferStorage);
>+        ANGLE_TRY(getBufferStorage(context, BUFFER_USAGE_UNIFORM, &bufferStorage));
>         CalculateConstantBufferParams(offset, size, firstConstantOut, numConstantsOut);
>     }
>     else
>     {
>-        ANGLE_TRY_RESULT(getConstantBufferRangeStorage(context, offset, size), bufferStorage);
>+        ANGLE_TRY(getConstantBufferRangeStorage(context, offset, size, &bufferStorage));
>         *firstConstantOut = 0;
>         *numConstantsOut  = 0;
>     }
> 
>-    *bufferOut = &GetAs<NativeStorage>(bufferStorage)->getBuffer();
>+    *bufferOut = &bufferStorage->getBuffer();
>+    return angle::Result::Continue;
>+}
> 
>-    return gl::NoError();
>+angle::Result Buffer11::markRawBufferUsage(const gl::Context *context)
>+{
>+    ANGLE_TRY(markBufferUsage(context, BUFFER_USAGE_RAW_UAV));
>+    return angle::Result::Continue;
> }
> 
>-gl::ErrorOrResult<const d3d11::ShaderResourceView *> Buffer11::getSRV(const gl::Context *context,
>-                                                                      DXGI_FORMAT srvFormat)
>+angle::Result Buffer11::getRawUAVRange(const gl::Context *context,
>+                                       GLintptr offset,
>+                                       GLsizeiptr size,
>+                                       d3d11::UnorderedAccessView **uavOut)
> {
>-    BufferStorage *storage = nullptr;
>-    ANGLE_TRY_RESULT(getBufferStorage(context, BUFFER_USAGE_PIXEL_UNPACK), storage);
>-    NativeStorage *nativeStorage = GetAs<NativeStorage>(storage);
>-    return nativeStorage->getSRVForFormat(srvFormat);
>+    NativeStorage *nativeStorage = nullptr;
>+    ANGLE_TRY(getBufferStorage(context, BUFFER_USAGE_RAW_UAV, &nativeStorage));
>+
>+    return nativeStorage->getRawUAV(context, static_cast<unsigned int>(offset),
>+                                    static_cast<unsigned int>(size), uavOut);
> }
> 
>-gl::Error Buffer11::packPixels(const gl::Context *context,
>-                               const gl::FramebufferAttachment &readAttachment,
>-                               const PackPixelsParams &params)
>+angle::Result Buffer11::getSRV(const gl::Context *context,
>+                               DXGI_FORMAT srvFormat,
>+                               const d3d11::ShaderResourceView **srvOut)
>+{
>+    NativeStorage *nativeStorage = nullptr;
>+    ANGLE_TRY(getBufferStorage(context, BUFFER_USAGE_PIXEL_UNPACK, &nativeStorage));
>+    return nativeStorage->getSRVForFormat(context, srvFormat, srvOut);
>+}
>+
>+angle::Result Buffer11::packPixels(const gl::Context *context,
>+                                   const gl::FramebufferAttachment &readAttachment,
>+                                   const PackPixelsParams &params)
> {
>     PackStorage *packStorage = nullptr;
>-    ANGLE_TRY_RESULT(getPackStorage(context), packStorage);
>+    ANGLE_TRY(getBufferStorage(context, BUFFER_USAGE_PIXEL_PACK, &packStorage));
> 
>     ASSERT(packStorage);
>     ANGLE_TRY(packStorage->packPixels(context, readAttachment, params));
>     onStorageUpdate(packStorage);
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
> size_t Buffer11::getTotalCPUBufferMemoryBytes() const
>@@ -720,8 +755,10 @@ size_t Buffer11::getTotalCPUBufferMemoryBytes() const
>     return allocationSize;
> }
> 
>-gl::ErrorOrResult<Buffer11::BufferStorage *> Buffer11::getBufferStorage(const gl::Context *context,
>-                                                                        BufferUsage usage)
>+template <typename StorageOutT>
>+angle::Result Buffer11::getBufferStorage(const gl::Context *context,
>+                                         BufferUsage usage,
>+                                         StorageOutT **storageOut)
> {
>     ASSERT(0 <= usage && usage < BUFFER_USAGE_COUNT);
>     BufferStorage *&newStorage = mBufferStorages[usage];
>@@ -744,7 +781,8 @@ gl::ErrorOrResult<Buffer11::BufferStorage *> Buffer11::getBufferStorage(const gl
>     ANGLE_TRY(updateBufferStorage(context, newStorage, 0, mSize));
>     ANGLE_TRY(garbageCollection(context, usage));
> 
>-    return newStorage;
>+    *storageOut = GetAs<StorageOutT>(newStorage);
>+    return angle::Result::Continue;
> }
> 
> Buffer11::BufferStorage *Buffer11::allocateStorage(BufferUsage usage)
>@@ -760,16 +798,16 @@ Buffer11::BufferStorage *Buffer11::allocateStorage(BufferUsage usage)
>             return new EmulatedIndexedStorage(mRenderer);
>         case BUFFER_USAGE_INDEX:
>         case BUFFER_USAGE_VERTEX_OR_TRANSFORM_FEEDBACK:
>-            return new NativeStorage(mRenderer, usage, &mDirectBroadcastChannel);
>+            return new NativeStorage(mRenderer, usage, this);
>         default:
>             return new NativeStorage(mRenderer, usage, nullptr);
>     }
> }
> 
>-gl::ErrorOrResult<Buffer11::BufferStorage *> Buffer11::getConstantBufferRangeStorage(
>-    const gl::Context *context,
>-    GLintptr offset,
>-    GLsizeiptr size)
>+angle::Result Buffer11::getConstantBufferRangeStorage(const gl::Context *context,
>+                                                      GLintptr offset,
>+                                                      GLsizeiptr size,
>+                                                      Buffer11::NativeStorage **storageOut)
> {
>     BufferStorage *newStorage;
> 
>@@ -824,28 +862,29 @@ gl::ErrorOrResult<Buffer11::BufferStorage *> Buffer11::getConstantBufferRangeSto
> 
>     ANGLE_TRY(updateBufferStorage(context, newStorage, offset, size));
>     ANGLE_TRY(garbageCollection(context, BUFFER_USAGE_UNIFORM));
>-    return newStorage;
>+    *storageOut = GetAs<NativeStorage>(newStorage);
>+    return angle::Result::Continue;
> }
> 
>-gl::Error Buffer11::updateBufferStorage(const gl::Context *context,
>-                                        BufferStorage *storage,
>-                                        size_t sourceOffset,
>-                                        size_t storageSize)
>+angle::Result Buffer11::updateBufferStorage(const gl::Context *context,
>+                                            BufferStorage *storage,
>+                                            size_t sourceOffset,
>+                                            size_t storageSize)
> {
>     BufferStorage *latestBuffer = nullptr;
>-    ANGLE_TRY_RESULT(getLatestBufferStorage(context), latestBuffer);
>+    ANGLE_TRY(getLatestBufferStorage(context, &latestBuffer));
> 
>     ASSERT(storage);
> 
>     if (!latestBuffer)
>     {
>         onStorageUpdate(storage);
>-        return gl::NoError();
>+        return angle::Result::Continue;
>     }
> 
>     if (latestBuffer->getDataRevision() <= storage->getDataRevision())
>     {
>-        return gl::NoError();
>+        return angle::Result::Continue;
>     }
> 
>     // Copy through a staging buffer if we're copying from or to a non-staging, mappable
>@@ -857,31 +896,30 @@ gl::Error Buffer11::updateBufferStorage(const gl::Context *context,
>          !storage->isCPUAccessible(GL_MAP_WRITE_BIT)))
>     {
>         NativeStorage *stagingBuffer = nullptr;
>-        ANGLE_TRY_RESULT(getStagingStorage(context), stagingBuffer);
>+        ANGLE_TRY(getStagingStorage(context, &stagingBuffer));
> 
>         CopyResult copyResult = CopyResult::NOT_RECREATED;
>-        ANGLE_TRY_RESULT(
>-            stagingBuffer->copyFromStorage(context, latestBuffer, 0, latestBuffer->getSize(), 0),
>-            copyResult);
>+        ANGLE_TRY(stagingBuffer->copyFromStorage(context, latestBuffer, 0, latestBuffer->getSize(),
>+                                                 0, &copyResult));
>         onCopyStorage(stagingBuffer, latestBuffer);
> 
>         latestBuffer = stagingBuffer;
>     }
> 
>     CopyResult copyResult = CopyResult::NOT_RECREATED;
>-    ANGLE_TRY_RESULT(storage->copyFromStorage(context, latestBuffer, sourceOffset, storageSize, 0),
>-                     copyResult);
>+    ANGLE_TRY(
>+        storage->copyFromStorage(context, latestBuffer, sourceOffset, storageSize, 0, &copyResult));
>     // If the D3D buffer has been recreated, we should update our serial.
>     if (copyResult == CopyResult::RECREATED)
>     {
>         updateSerial();
>     }
>     onCopyStorage(storage, latestBuffer);
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::ErrorOrResult<Buffer11::BufferStorage *> Buffer11::getLatestBufferStorage(
>-    const gl::Context *context) const
>+angle::Result Buffer11::getLatestBufferStorage(const gl::Context *context,
>+                                               Buffer11::BufferStorage **storageOut) const
> {
>     // resize buffer
>     if (mLatestBufferStorage && mLatestBufferStorage->getSize() < mSize)
>@@ -889,21 +927,14 @@ gl::ErrorOrResult<Buffer11::BufferStorage *> Buffer11::getLatestBufferStorage(
>         ANGLE_TRY(mLatestBufferStorage->resize(context, mSize, true));
>     }
> 
>-    return mLatestBufferStorage;
>+    *storageOut = mLatestBufferStorage;
>+    return angle::Result::Continue;
> }
> 
>-gl::ErrorOrResult<Buffer11::NativeStorage *> Buffer11::getStagingStorage(const gl::Context *context)
>+template <typename StorageOutT>
>+angle::Result Buffer11::getStagingStorage(const gl::Context *context, StorageOutT **storageOut)
> {
>-    BufferStorage *stagingStorage = nullptr;
>-    ANGLE_TRY_RESULT(getBufferStorage(context, BUFFER_USAGE_STAGING), stagingStorage);
>-    return GetAs<NativeStorage>(stagingStorage);
>-}
>-
>-gl::ErrorOrResult<Buffer11::PackStorage *> Buffer11::getPackStorage(const gl::Context *context)
>-{
>-    BufferStorage *packStorage = nullptr;
>-    ANGLE_TRY_RESULT(getBufferStorage(context, BUFFER_USAGE_PIXEL_PACK), packStorage);
>-    return GetAs<PackStorage>(packStorage);
>+    return getBufferStorage(context, BUFFER_USAGE_STAGING, storageOut);
> }
> 
> size_t Buffer11::getSize() const
>@@ -921,27 +952,13 @@ bool Buffer11::supportsDirectBinding() const
> void Buffer11::initializeStaticData(const gl::Context *context)
> {
>     BufferD3D::initializeStaticData(context);
>-
>-    // Notify when static data changes.
>-    mStaticBroadcastChannel.signal(context);
>+    onStateChange(context, angle::SubjectMessage::STORAGE_CHANGED);
> }
> 
> void Buffer11::invalidateStaticData(const gl::Context *context)
> {
>     BufferD3D::invalidateStaticData(context);
>-
>-    // Notify when static data changes.
>-    mStaticBroadcastChannel.signal(context);
>-}
>-
>-OnBufferDataDirtyChannel *Buffer11::getStaticBroadcastChannel()
>-{
>-    return &mStaticBroadcastChannel;
>-}
>-
>-OnBufferDataDirtyChannel *Buffer11::getDirectBroadcastChannel()
>-{
>-    return &mDirectBroadcastChannel;
>+    onStateChange(context, angle::SubjectMessage::STORAGE_CHANGED);
> }
> 
> void Buffer11::onCopyStorage(BufferStorage *dest, BufferStorage *source)
>@@ -966,10 +983,12 @@ void Buffer11::onStorageUpdate(BufferStorage *updatedStorage)
> 
> Buffer11::BufferStorage::BufferStorage(Renderer11 *renderer, BufferUsage usage)
>     : mRenderer(renderer), mRevision(0), mUsage(usage), mBufferSize(0)
>-{
>-}
>+{}
> 
>-gl::Error Buffer11::BufferStorage::setData(const uint8_t *data, size_t offset, size_t size)
>+angle::Result Buffer11::BufferStorage::setData(const gl::Context *context,
>+                                               const uint8_t *data,
>+                                               size_t offset,
>+                                               size_t size)
> {
>     ASSERT(isCPUAccessible(GL_MAP_WRITE_BIT));
> 
>@@ -978,27 +997,27 @@ gl::Error Buffer11::BufferStorage::setData(const uint8_t *data, size_t offset, s
>     size_t mapSize = std::min(size, mBufferSize - offset);
> 
>     uint8_t *writePointer = nullptr;
>-    ANGLE_TRY(map(offset, mapSize, GL_MAP_WRITE_BIT, &writePointer));
>+    ANGLE_TRY(map(context, offset, mapSize, GL_MAP_WRITE_BIT, &writePointer));
> 
>     memcpy(writePointer, data, mapSize);
> 
>     unmap();
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
> // Buffer11::NativeStorage implementation
> 
> Buffer11::NativeStorage::NativeStorage(Renderer11 *renderer,
>                                        BufferUsage usage,
>-                                       const OnBufferDataDirtyChannel *onStorageChanged)
>+                                       const angle::Subject *onStorageChanged)
>     : BufferStorage(renderer, usage), mBuffer(), mOnStorageChanged(onStorageChanged)
>-{
>-}
>+{}
> 
> Buffer11::NativeStorage::~NativeStorage()
> {
>     clearSRVs();
>+    clearUAVs();
> }
> 
> bool Buffer11::NativeStorage::isCPUAccessible(GLbitfield access) const
>@@ -1013,20 +1032,25 @@ bool Buffer11::NativeStorage::isCPUAccessible(GLbitfield access) const
> }
> 
> // Returns true if it recreates the direct buffer
>-gl::ErrorOrResult<CopyResult> Buffer11::NativeStorage::copyFromStorage(const gl::Context *context,
>-                                                                       BufferStorage *source,
>-                                                                       size_t sourceOffset,
>-                                                                       size_t size,
>-                                                                       size_t destOffset)
>+angle::Result Buffer11::NativeStorage::copyFromStorage(const gl::Context *context,
>+                                                       BufferStorage *source,
>+                                                       size_t sourceOffset,
>+                                                       size_t size,
>+                                                       size_t destOffset,
>+                                                       CopyResult *resultOut)
> {
>     size_t requiredSize = destOffset + size;
>-    bool createBuffer   = !mBuffer.valid() || mBufferSize < requiredSize;
> 
>     // (Re)initialize D3D buffer if needed
>     bool preserveData = (destOffset > 0);
>-    if (createBuffer)
>+    if (!mBuffer.valid() || mBufferSize < requiredSize)
>     {
>         ANGLE_TRY(resize(context, requiredSize, preserveData));
>+        *resultOut = CopyResult::RECREATED;
>+    }
>+    else
>+    {
>+        *resultOut = CopyResult::NOT_RECREATED;
>     }
> 
>     size_t clampedSize = size;
>@@ -1035,6 +1059,11 @@ gl::ErrorOrResult<CopyResult> Buffer11::NativeStorage::copyFromStorage(const gl:
>         clampedSize = std::min(clampedSize, mBufferSize - destOffset);
>     }
> 
>+    if (clampedSize == 0)
>+    {
>+        return angle::Result::Continue;
>+    }
>+
>     if (source->getUsage() == BUFFER_USAGE_PIXEL_PACK ||
>         source->getUsage() == BUFFER_USAGE_SYSTEM_MEMORY)
>     {
>@@ -1044,9 +1073,9 @@ gl::ErrorOrResult<CopyResult> Buffer11::NativeStorage::copyFromStorage(const gl:
>         ASSERT(!(preserveData && mUsage == BUFFER_USAGE_UNIFORM));
> 
>         uint8_t *sourcePointer = nullptr;
>-        ANGLE_TRY(source->map(sourceOffset, clampedSize, GL_MAP_READ_BIT, &sourcePointer));
>+        ANGLE_TRY(source->map(context, sourceOffset, clampedSize, GL_MAP_READ_BIT, &sourcePointer));
> 
>-        auto err = setData(sourcePointer, destOffset, clampedSize);
>+        auto err = setData(context, sourcePointer, destOffset, clampedSize);
>         source->unmap();
>         ANGLE_TRY(err);
>     }
>@@ -1068,18 +1097,26 @@ gl::ErrorOrResult<CopyResult> Buffer11::NativeStorage::copyFromStorage(const gl:
>                                              sourceBuffer->get(), 0, &srcBox);
>     }
> 
>-    return createBuffer ? CopyResult::RECREATED : CopyResult::NOT_RECREATED;
>+    return angle::Result::Continue;
> }
> 
>-gl::Error Buffer11::NativeStorage::resize(const gl::Context *context,
>-                                          size_t size,
>-                                          bool preserveData)
>+angle::Result Buffer11::NativeStorage::resize(const gl::Context *context,
>+                                              size_t size,
>+                                              bool preserveData)
> {
>+    if (size == 0)
>+    {
>+        mBuffer.reset();
>+        mBufferSize = 0;
>+        return angle::Result::Continue;
>+    }
>+
>     D3D11_BUFFER_DESC bufferDesc;
>     FillBufferDesc(&bufferDesc, mRenderer, mUsage, static_cast<unsigned int>(size));
> 
>     d3d11::Buffer newBuffer;
>-    ANGLE_TRY(mRenderer->allocateResource(bufferDesc, &newBuffer));
>+    ANGLE_TRY(
>+        mRenderer->allocateResource(SafeGetImplAs<Context11>(context), bufferDesc, &newBuffer));
>     newBuffer.setDebugName("Buffer11::NativeStorage");
> 
>     if (mBuffer.valid() && preserveData)
>@@ -1108,13 +1145,16 @@ gl::Error Buffer11::NativeStorage::resize(const gl::Context *context,
>     // Free the SRVs.
>     clearSRVs();
> 
>+    // Free the UAVs.
>+    clearUAVs();
>+
>     // Notify that the storage has changed.
>     if (mOnStorageChanged)
>     {
>-        mOnStorageChanged->signal(context);
>+        mOnStorageChanged->onStateChange(context, angle::SubjectMessage::STORAGE_CHANGED);
>     }
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
> // static
>@@ -1182,32 +1222,35 @@ void Buffer11::NativeStorage::FillBufferDesc(D3D11_BUFFER_DESC *bufferDesc,
>                                static_cast<UINT>(renderer->getNativeCaps().maxUniformBlockSize));
>             break;
> 
>+        case BUFFER_USAGE_RAW_UAV:
>+            bufferDesc->MiscFlags      = D3D11_RESOURCE_MISC_BUFFER_ALLOW_RAW_VIEWS;
>+            bufferDesc->BindFlags      = D3D11_BIND_UNORDERED_ACCESS;
>+            bufferDesc->Usage          = D3D11_USAGE_DEFAULT;
>+            bufferDesc->CPUAccessFlags = 0;
>+            break;
>+
>         default:
>             UNREACHABLE();
>     }
> }
> 
>-gl::Error Buffer11::NativeStorage::map(size_t offset,
>-                                       size_t length,
>-                                       GLbitfield access,
>-                                       uint8_t **mapPointerOut)
>+angle::Result Buffer11::NativeStorage::map(const gl::Context *context,
>+                                           size_t offset,
>+                                           size_t length,
>+                                           GLbitfield access,
>+                                           uint8_t **mapPointerOut)
> {
>     ASSERT(isCPUAccessible(access));
> 
>     D3D11_MAPPED_SUBRESOURCE mappedResource;
>-    ID3D11DeviceContext *context = mRenderer->getDeviceContext();
>-    D3D11_MAP d3dMapType         = gl_d3d11::GetD3DMapTypeFromBits(mUsage, access);
>+    D3D11_MAP d3dMapType = gl_d3d11::GetD3DMapTypeFromBits(mUsage, access);
>     UINT d3dMapFlag = ((access & GL_MAP_UNSYNCHRONIZED_BIT) != 0 ? D3D11_MAP_FLAG_DO_NOT_WAIT : 0);
> 
>-    HRESULT result = context->Map(mBuffer.get(), 0, d3dMapType, d3dMapFlag, &mappedResource);
>-    ASSERT(SUCCEEDED(result));
>-    if (FAILED(result))
>-    {
>-        return gl::OutOfMemory() << "Failed to map native storage in Buffer11::NativeStorage::map";
>-    }
>+    ANGLE_TRY(
>+        mRenderer->mapResource(context, mBuffer.get(), 0, d3dMapType, d3dMapFlag, &mappedResource));
>     ASSERT(mappedResource.pData);
>     *mapPointerOut = static_cast<uint8_t *>(mappedResource.pData) + offset;
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
> void Buffer11::NativeStorage::unmap()
>@@ -1217,14 +1260,16 @@ void Buffer11::NativeStorage::unmap()
>     context->Unmap(mBuffer.get(), 0);
> }
> 
>-gl::ErrorOrResult<const d3d11::ShaderResourceView *> Buffer11::NativeStorage::getSRVForFormat(
>-    DXGI_FORMAT srvFormat)
>+angle::Result Buffer11::NativeStorage::getSRVForFormat(const gl::Context *context,
>+                                                       DXGI_FORMAT srvFormat,
>+                                                       const d3d11::ShaderResourceView **srvOut)
> {
>     auto bufferSRVIt = mBufferResourceViews.find(srvFormat);
> 
>     if (bufferSRVIt != mBufferResourceViews.end())
>     {
>-        return &bufferSRVIt->second;
>+        *srvOut = &bufferSRVIt->second;
>+        return angle::Result::Continue;
>     }
> 
>     const d3d11::DXGIFormatSize &dxgiFormatInfo = d3d11::GetDXGIFormatSizeInfo(srvFormat);
>@@ -1235,10 +1280,42 @@ gl::ErrorOrResult<const d3d11::ShaderResourceView *> Buffer11::NativeStorage::ge
>     bufferSRVDesc.ViewDimension        = D3D11_SRV_DIMENSION_BUFFER;
>     bufferSRVDesc.Format               = srvFormat;
> 
>-    ANGLE_TRY(mRenderer->allocateResource(bufferSRVDesc, mBuffer.get(),
>-                                          &mBufferResourceViews[srvFormat]));
>+    ANGLE_TRY(mRenderer->allocateResource(GetImplAs<Context11>(context), bufferSRVDesc,
>+                                          mBuffer.get(), &mBufferResourceViews[srvFormat]));
>+
>+    *srvOut = &mBufferResourceViews[srvFormat];
>+    return angle::Result::Continue;
>+}
>+
>+angle::Result Buffer11::NativeStorage::getRawUAV(const gl::Context *context,
>+                                                 unsigned int offset,
>+                                                 unsigned int size,
>+                                                 d3d11::UnorderedAccessView **uavOut)
>+{
>+    ASSERT(offset + size <= mBufferSize);
>+
>+    auto bufferRawUAV = mBufferRawUAVs.find({offset, size});
>+    if (bufferRawUAV != mBufferRawUAVs.end())
>+    {
>+        *uavOut = &bufferRawUAV->second;
>+        return angle::Result::Continue;
>+    }
>+
>+    D3D11_UNORDERED_ACCESS_VIEW_DESC bufferUAVDesc;
>+
>+    // DXGI_FORMAT_R32_TYPELESS uses 4 bytes per element
>+    constexpr int kBytesToElement     = 4;
>+    bufferUAVDesc.Buffer.FirstElement = offset / kBytesToElement;
>+    bufferUAVDesc.Buffer.NumElements  = size / kBytesToElement;
>+    bufferUAVDesc.Buffer.Flags        = D3D11_BUFFER_UAV_FLAG_RAW;
>+    bufferUAVDesc.Format = DXGI_FORMAT_R32_TYPELESS;  // Format must be DXGI_FORMAT_R32_TYPELESS,
>+                                                      // when creating Raw Unordered Access View
>+    bufferUAVDesc.ViewDimension = D3D11_UAV_DIMENSION_BUFFER;
> 
>-    return &mBufferResourceViews[srvFormat];
>+    ANGLE_TRY(mRenderer->allocateResource(GetImplAs<Context11>(context), bufferUAVDesc,
>+                                          mBuffer.get(), &mBufferRawUAVs[{offset, size}]));
>+    *uavOut = &mBufferRawUAVs[{offset, size}];
>+    return angle::Result::Continue;
> }
> 
> void Buffer11::NativeStorage::clearSRVs()
>@@ -1246,22 +1323,27 @@ void Buffer11::NativeStorage::clearSRVs()
>     mBufferResourceViews.clear();
> }
> 
>+void Buffer11::NativeStorage::clearUAVs()
>+{
>+    mBufferRawUAVs.clear();
>+}
>+
> // Buffer11::EmulatedIndexStorage implementation
> 
> Buffer11::EmulatedIndexedStorage::EmulatedIndexedStorage(Renderer11 *renderer)
>     : BufferStorage(renderer, BUFFER_USAGE_EMULATED_INDEXED_VERTEX), mBuffer()
>-{
>-}
>+{}
> 
>-Buffer11::EmulatedIndexedStorage::~EmulatedIndexedStorage()
>-{
>-}
>+Buffer11::EmulatedIndexedStorage::~EmulatedIndexedStorage() {}
> 
>-gl::ErrorOrResult<const d3d11::Buffer *> Buffer11::EmulatedIndexedStorage::getBuffer(
>-    SourceIndexData *indexInfo,
>-    const TranslatedAttribute &attribute,
>-    GLint startVertex)
>+angle::Result Buffer11::EmulatedIndexedStorage::getBuffer(const gl::Context *context,
>+                                                          SourceIndexData *indexInfo,
>+                                                          const TranslatedAttribute &attribute,
>+                                                          GLint startVertex,
>+                                                          const d3d11::Buffer **bufferOut)
> {
>+    Context11 *context11 = GetImplAs<Context11>(context);
>+
>     // If a change in the indices applied from the last draw call is detected, then the emulated
>     // indexed buffer needs to be invalidated.  After invalidation, the change detected flag should
>     // be cleared to avoid unnecessary recreation of the buffer.
>@@ -1274,13 +1356,13 @@ gl::ErrorOrResult<const d3d11::Buffer *> Buffer11::EmulatedIndexedStorage::getBu
>         size_t indicesDataSize = 0;
>         switch (indexInfo->srcIndexType)
>         {
>-            case GL_UNSIGNED_INT:
>+            case gl::DrawElementsType::UnsignedInt:
>                 indicesDataSize = sizeof(GLuint) * indexInfo->srcCount;
>                 break;
>-            case GL_UNSIGNED_SHORT:
>+            case gl::DrawElementsType::UnsignedShort:
>                 indicesDataSize = sizeof(GLushort) * indexInfo->srcCount;
>                 break;
>-            case GL_UNSIGNED_BYTE:
>+            case gl::DrawElementsType::UnsignedByte:
>                 indicesDataSize = sizeof(GLubyte) * indexInfo->srcCount;
>                 break;
>             default:
>@@ -1288,11 +1370,7 @@ gl::ErrorOrResult<const d3d11::Buffer *> Buffer11::EmulatedIndexedStorage::getBu
>                 break;
>         }
> 
>-        if (!mIndicesMemoryBuffer.resize(indicesDataSize))
>-        {
>-            return gl::OutOfMemory() << "Error resizing index memory buffer in "
>-                                        "Buffer11::EmulatedIndexedStorage::getBuffer";
>-        }
>+        ANGLE_CHECK_GL_ALLOC(context11, mIndicesMemoryBuffer.resize(indicesDataSize));
> 
>         memcpy(mIndicesMemoryBuffer.data(), indexInfo->srcIndices, indicesDataSize);
> 
>@@ -1302,17 +1380,13 @@ gl::ErrorOrResult<const d3d11::Buffer *> Buffer11::EmulatedIndexedStorage::getBu
>     if (!mBuffer.valid())
>     {
>         unsigned int offset = 0;
>-        ANGLE_TRY_RESULT(attribute.computeOffset(startVertex), offset);
>+        ANGLE_TRY(attribute.computeOffset(context, startVertex, &offset));
> 
>         // Expand the memory storage upon request and cache the results.
>         unsigned int expandedDataSize =
>             static_cast<unsigned int>((indexInfo->srcCount * attribute.stride) + offset);
>         angle::MemoryBuffer expandedData;
>-        if (!expandedData.resize(expandedDataSize))
>-        {
>-            return gl::OutOfMemory()
>-                   << "Error resizing buffer in Buffer11::EmulatedIndexedStorage::getBuffer";
>-        }
>+        ANGLE_CHECK_GL_ALLOC(context11, expandedData.resize(expandedDataSize));
> 
>         // Clear the contents of the allocated buffer
>         ZeroMemory(expandedData.data(), expandedDataSize);
>@@ -1328,15 +1402,18 @@ gl::ErrorOrResult<const d3d11::Buffer *> Buffer11::EmulatedIndexedStorage::getBu
> 
>         switch (indexInfo->srcIndexType)
>         {
>-            case GL_UNSIGNED_INT:
>+            case gl::DrawElementsType::UnsignedInt:
>                 readIndexValue = ReadIndexValueFromIndices<GLuint>;
>                 break;
>-            case GL_UNSIGNED_SHORT:
>+            case gl::DrawElementsType::UnsignedShort:
>                 readIndexValue = ReadIndexValueFromIndices<GLushort>;
>                 break;
>-            case GL_UNSIGNED_BYTE:
>+            case gl::DrawElementsType::UnsignedByte:
>                 readIndexValue = ReadIndexValueFromIndices<GLubyte>;
>                 break;
>+            default:
>+                UNREACHABLE();
>+                return angle::Result::Stop;
>         }
> 
>         // Iterate over the cached index data and copy entries indicated into the emulated buffer.
>@@ -1359,53 +1436,55 @@ gl::ErrorOrResult<const d3d11::Buffer *> Buffer11::EmulatedIndexedStorage::getBu
> 
>         D3D11_SUBRESOURCE_DATA subResourceData = {expandedData.data(), 0, 0};
> 
>-        ANGLE_TRY(mRenderer->allocateResource(bufferDesc, &subResourceData, &mBuffer));
>+        ANGLE_TRY(mRenderer->allocateResource(GetImplAs<Context11>(context), bufferDesc,
>+                                              &subResourceData, &mBuffer));
>         mBuffer.setDebugName("Buffer11::EmulatedIndexedStorage");
>     }
> 
>-    return &mBuffer;
>+    *bufferOut = &mBuffer;
>+    return angle::Result::Continue;
> }
> 
>-gl::ErrorOrResult<CopyResult> Buffer11::EmulatedIndexedStorage::copyFromStorage(
>-    const gl::Context *context,
>-    BufferStorage *source,
>-    size_t sourceOffset,
>-    size_t size,
>-    size_t destOffset)
>+angle::Result Buffer11::EmulatedIndexedStorage::copyFromStorage(const gl::Context *context,
>+                                                                BufferStorage *source,
>+                                                                size_t sourceOffset,
>+                                                                size_t size,
>+                                                                size_t destOffset,
>+                                                                CopyResult *resultOut)
> {
>     ASSERT(source->isCPUAccessible(GL_MAP_READ_BIT));
>     uint8_t *sourceData = nullptr;
>-    ANGLE_TRY(source->map(sourceOffset, size, GL_MAP_READ_BIT, &sourceData));
>+    ANGLE_TRY(source->map(context, sourceOffset, size, GL_MAP_READ_BIT, &sourceData));
>     ASSERT(destOffset + size <= mMemoryBuffer.size());
>     memcpy(mMemoryBuffer.data() + destOffset, sourceData, size);
>     source->unmap();
>-    return CopyResult::RECREATED;
>+    *resultOut = CopyResult::RECREATED;
>+    return angle::Result::Continue;
> }
> 
>-gl::Error Buffer11::EmulatedIndexedStorage::resize(const gl::Context *context,
>-                                                   size_t size,
>-                                                   bool preserveData)
>+angle::Result Buffer11::EmulatedIndexedStorage::resize(const gl::Context *context,
>+                                                       size_t size,
>+                                                       bool preserveData)
> {
>     if (mMemoryBuffer.size() < size)
>     {
>-        if (!mMemoryBuffer.resize(size))
>-        {
>-            return gl::OutOfMemory() << "Failed to resize EmulatedIndexedStorage";
>-        }
>+        Context11 *context11 = GetImplAs<Context11>(context);
>+        ANGLE_CHECK_GL_ALLOC(context11, mMemoryBuffer.resize(size));
>         mBufferSize = size;
>     }
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error Buffer11::EmulatedIndexedStorage::map(size_t offset,
>-                                                size_t length,
>-                                                GLbitfield access,
>-                                                uint8_t **mapPointerOut)
>+angle::Result Buffer11::EmulatedIndexedStorage::map(const gl::Context *context,
>+                                                    size_t offset,
>+                                                    size_t length,
>+                                                    GLbitfield access,
>+                                                    uint8_t **mapPointerOut)
> {
>     ASSERT(!mMemoryBuffer.empty() && offset + length <= mMemoryBuffer.size());
>     *mapPointerOut = mMemoryBuffer.data() + offset;
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
> void Buffer11::EmulatedIndexedStorage::unmap()
>@@ -1417,49 +1496,49 @@ void Buffer11::EmulatedIndexedStorage::unmap()
> 
> Buffer11::PackStorage::PackStorage(Renderer11 *renderer)
>     : BufferStorage(renderer, BUFFER_USAGE_PIXEL_PACK), mStagingTexture(), mDataModified(false)
>-{
>-}
>+{}
> 
>-Buffer11::PackStorage::~PackStorage()
>-{
>-}
>+Buffer11::PackStorage::~PackStorage() {}
> 
>-gl::ErrorOrResult<CopyResult> Buffer11::PackStorage::copyFromStorage(const gl::Context *context,
>-                                                                     BufferStorage *source,
>-                                                                     size_t sourceOffset,
>-                                                                     size_t size,
>-                                                                     size_t destOffset)
>+angle::Result Buffer11::PackStorage::copyFromStorage(const gl::Context *context,
>+                                                     BufferStorage *source,
>+                                                     size_t sourceOffset,
>+                                                     size_t size,
>+                                                     size_t destOffset,
>+                                                     CopyResult *resultOut)
> {
>-    ANGLE_TRY(flushQueuedPackCommand());
>+    ANGLE_TRY(flushQueuedPackCommand(context));
> 
>     // For all use cases of pack buffers, we must copy through a readable buffer.
>     ASSERT(source->isCPUAccessible(GL_MAP_READ_BIT));
>     uint8_t *sourceData = nullptr;
>-    ANGLE_TRY(source->map(sourceOffset, size, GL_MAP_READ_BIT, &sourceData));
>+    ANGLE_TRY(source->map(context, sourceOffset, size, GL_MAP_READ_BIT, &sourceData));
>     ASSERT(destOffset + size <= mMemoryBuffer.size());
>     memcpy(mMemoryBuffer.data() + destOffset, sourceData, size);
>     source->unmap();
>-    return CopyResult::NOT_RECREATED;
>+    *resultOut = CopyResult::NOT_RECREATED;
>+    return angle::Result::Continue;
> }
> 
>-gl::Error Buffer11::PackStorage::resize(const gl::Context *context, size_t size, bool preserveData)
>+angle::Result Buffer11::PackStorage::resize(const gl::Context *context,
>+                                            size_t size,
>+                                            bool preserveData)
> {
>     if (size != mBufferSize)
>     {
>-        if (!mMemoryBuffer.resize(size))
>-        {
>-            return gl::OutOfMemory() << "Failed to resize internal buffer storage.";
>-        }
>+        Context11 *context11 = GetImplAs<Context11>(context);
>+        ANGLE_CHECK_GL_ALLOC(context11, mMemoryBuffer.resize(size));
>         mBufferSize = size;
>     }
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error Buffer11::PackStorage::map(size_t offset,
>-                                     size_t length,
>-                                     GLbitfield access,
>-                                     uint8_t **mapPointerOut)
>+angle::Result Buffer11::PackStorage::map(const gl::Context *context,
>+                                         size_t offset,
>+                                         size_t length,
>+                                         GLbitfield access,
>+                                         uint8_t **mapPointerOut)
> {
>     ASSERT(offset + length <= getSize());
>     // TODO: fast path
>@@ -1467,12 +1546,12 @@ gl::Error Buffer11::PackStorage::map(size_t offset,
>     //  and if D3D packs the staging texture memory identically to how we would fill
>     //  the pack buffer according to the current pack state.
> 
>-    ANGLE_TRY(flushQueuedPackCommand());
>+    ANGLE_TRY(flushQueuedPackCommand(context));
> 
>     mDataModified = (mDataModified || (access & GL_MAP_WRITE_BIT) != 0);
> 
>     *mapPointerOut = mMemoryBuffer.data() + offset;
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
> void Buffer11::PackStorage::unmap()
>@@ -1480,11 +1559,11 @@ void Buffer11::PackStorage::unmap()
>     // No-op
> }
> 
>-gl::Error Buffer11::PackStorage::packPixels(const gl::Context *context,
>-                                            const gl::FramebufferAttachment &readAttachment,
>-                                            const PackPixelsParams &params)
>+angle::Result Buffer11::PackStorage::packPixels(const gl::Context *context,
>+                                                const gl::FramebufferAttachment &readAttachment,
>+                                                const PackPixelsParams &params)
> {
>-    ANGLE_TRY(flushQueuedPackCommand());
>+    ANGLE_TRY(flushQueuedPackCommand(context));
> 
>     RenderTarget11 *renderTarget = nullptr;
>     ANGLE_TRY(readAttachment.getRenderTarget(context, &renderTarget));
>@@ -1499,10 +1578,9 @@ gl::Error Buffer11::PackStorage::packPixels(const gl::Context *context,
>     if (!mStagingTexture.get() || mStagingTexture.getFormat() != srcTexture.getFormat() ||
>         mStagingTexture.getExtents() != srcTextureSize)
>     {
>-        ANGLE_TRY_RESULT(
>-            mRenderer->createStagingTexture(srcTexture.getTextureType(), srcTexture.getFormatSet(),
>-                                            srcTextureSize, StagingAccess::READ),
>-            mStagingTexture);
>+        ANGLE_TRY(mRenderer->createStagingTexture(context, srcTexture.getTextureType(),
>+                                                  srcTexture.getFormatSet(), srcTextureSize,
>+                                                  StagingAccess::READ, &mStagingTexture));
>     }
> 
>     // ReadPixels from multisampled FBOs isn't supported in current GL
>@@ -1527,70 +1605,69 @@ gl::Error Buffer11::PackStorage::packPixels(const gl::Context *context,
>     immediateContext->CopySubresourceRegion(mStagingTexture.get(), 0, 0, 0, 0, srcTexture.get(),
>                                             srcSubresource, &srcBox);
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error Buffer11::PackStorage::flushQueuedPackCommand()
>+angle::Result Buffer11::PackStorage::flushQueuedPackCommand(const gl::Context *context)
> {
>     ASSERT(mMemoryBuffer.size() > 0);
> 
>     if (mQueuedPackCommand)
>     {
>-        ANGLE_TRY(
>-            mRenderer->packPixels(mStagingTexture, *mQueuedPackCommand, mMemoryBuffer.data()));
>+        ANGLE_TRY(mRenderer->packPixels(context, mStagingTexture, *mQueuedPackCommand,
>+                                        mMemoryBuffer.data()));
>         mQueuedPackCommand.reset(nullptr);
>     }
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
> // Buffer11::SystemMemoryStorage implementation
> 
> Buffer11::SystemMemoryStorage::SystemMemoryStorage(Renderer11 *renderer)
>     : Buffer11::BufferStorage(renderer, BUFFER_USAGE_SYSTEM_MEMORY)
>-{
>-}
>+{}
> 
>-gl::ErrorOrResult<CopyResult> Buffer11::SystemMemoryStorage::copyFromStorage(
>-    const gl::Context *context,
>-    BufferStorage *source,
>-    size_t sourceOffset,
>-    size_t size,
>-    size_t destOffset)
>+angle::Result Buffer11::SystemMemoryStorage::copyFromStorage(const gl::Context *context,
>+                                                             BufferStorage *source,
>+                                                             size_t sourceOffset,
>+                                                             size_t size,
>+                                                             size_t destOffset,
>+                                                             CopyResult *resultOut)
> {
>     ASSERT(source->isCPUAccessible(GL_MAP_READ_BIT));
>     uint8_t *sourceData = nullptr;
>-    ANGLE_TRY(source->map(sourceOffset, size, GL_MAP_READ_BIT, &sourceData));
>+    ANGLE_TRY(source->map(context, sourceOffset, size, GL_MAP_READ_BIT, &sourceData));
>     ASSERT(destOffset + size <= mSystemCopy.size());
>     memcpy(mSystemCopy.data() + destOffset, sourceData, size);
>     source->unmap();
>-    return CopyResult::RECREATED;
>+    *resultOut = CopyResult::RECREATED;
>+    return angle::Result::Continue;
> }
> 
>-gl::Error Buffer11::SystemMemoryStorage::resize(const gl::Context *context,
>-                                                size_t size,
>-                                                bool preserveData)
>+angle::Result Buffer11::SystemMemoryStorage::resize(const gl::Context *context,
>+                                                    size_t size,
>+                                                    bool preserveData)
> {
>     if (mSystemCopy.size() < size)
>     {
>-        if (!mSystemCopy.resize(size))
>-        {
>-            return gl::OutOfMemory() << "Failed to resize SystemMemoryStorage";
>-        }
>+        Context11 *context11 = GetImplAs<Context11>(context);
>+        ANGLE_CHECK_GL_ALLOC(context11, mSystemCopy.resize(size));
>         mBufferSize = size;
>     }
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error Buffer11::SystemMemoryStorage::map(size_t offset,
>-                                             size_t length,
>-                                             GLbitfield access,
>-                                             uint8_t **mapPointerOut)
>+angle::Result Buffer11::SystemMemoryStorage::map(const gl::Context *context,
>+                                                 size_t offset,
>+                                                 size_t length,
>+                                                 GLbitfield access,
>+                                                 uint8_t **mapPointerOut)
> {
>     ASSERT(!mSystemCopy.empty() && offset + length <= mSystemCopy.size());
>     *mapPointerOut = mSystemCopy.data() + offset;
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
> void Buffer11::SystemMemoryStorage::unmap()
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/Buffer11.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/Buffer11.h
>index ddbeeb90d25..bcf8826badc 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/Buffer11.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/Buffer11.h
>@@ -35,12 +35,12 @@ enum BufferUsage
>     BUFFER_USAGE_STAGING,
>     BUFFER_USAGE_VERTEX_OR_TRANSFORM_FEEDBACK,
>     BUFFER_USAGE_INDEX,
>-    // TODO: possibly share this buffer type with shader storage buffers.
>     BUFFER_USAGE_INDIRECT,
>     BUFFER_USAGE_PIXEL_UNPACK,
>     BUFFER_USAGE_PIXEL_PACK,
>     BUFFER_USAGE_UNIFORM,
>     BUFFER_USAGE_EMULATED_INDEXED_VERTEX,
>+    BUFFER_USAGE_RAW_UAV,
> 
>     BUFFER_USAGE_COUNT,
> };
>@@ -53,62 +53,66 @@ class Buffer11 : public BufferD3D
>     Buffer11(const gl::BufferState &state, Renderer11 *renderer);
>     ~Buffer11() override;
> 
>-    gl::ErrorOrResult<ID3D11Buffer *> getBuffer(const gl::Context *context, BufferUsage usage);
>-    gl::ErrorOrResult<ID3D11Buffer *> getEmulatedIndexedBuffer(const gl::Context *context,
>-                                                               SourceIndexData *indexInfo,
>-                                                               const TranslatedAttribute &attribute,
>-                                                               GLint startVertex);
>-    gl::Error getConstantBufferRange(const gl::Context *context,
>-                                     GLintptr offset,
>-                                     GLsizeiptr size,
>-                                     const d3d11::Buffer **bufferOut,
>-                                     UINT *firstConstantOut,
>-                                     UINT *numConstantsOut);
>-    gl::ErrorOrResult<const d3d11::ShaderResourceView *> getSRV(const gl::Context *context,
>-                                                                DXGI_FORMAT srvFormat);
>+    angle::Result getBuffer(const gl::Context *context,
>+                            BufferUsage usage,
>+                            ID3D11Buffer **bufferOut);
>+    angle::Result getEmulatedIndexedBuffer(const gl::Context *context,
>+                                           SourceIndexData *indexInfo,
>+                                           const TranslatedAttribute &attribute,
>+                                           GLint startVertex,
>+                                           ID3D11Buffer **bufferOut);
>+    angle::Result getConstantBufferRange(const gl::Context *context,
>+                                         GLintptr offset,
>+                                         GLsizeiptr size,
>+                                         const d3d11::Buffer **bufferOut,
>+                                         UINT *firstConstantOut,
>+                                         UINT *numConstantsOut);
>+    angle::Result getSRV(const gl::Context *context,
>+                         DXGI_FORMAT srvFormat,
>+                         const d3d11::ShaderResourceView **srvOut);
>+    angle::Result getRawUAVRange(const gl::Context *context,
>+                                 GLintptr offset,
>+                                 GLsizeiptr size,
>+                                 d3d11::UnorderedAccessView **uavOut);
>+
>+    angle::Result markRawBufferUsage(const gl::Context *context);
>     bool isMapped() const { return mMappedStorage != nullptr; }
>-    gl::Error packPixels(const gl::Context *context,
>-                         const gl::FramebufferAttachment &readAttachment,
>-                         const PackPixelsParams &params);
>+    angle::Result packPixels(const gl::Context *context,
>+                             const gl::FramebufferAttachment &readAttachment,
>+                             const PackPixelsParams &params);
>     size_t getTotalCPUBufferMemoryBytes() const;
> 
>     // BufferD3D implementation
>     size_t getSize() const override;
>     bool supportsDirectBinding() const override;
>-    gl::Error getData(const gl::Context *context, const uint8_t **outData) override;
>+    angle::Result getData(const gl::Context *context, const uint8_t **outData) override;
>     void initializeStaticData(const gl::Context *context) override;
>     void invalidateStaticData(const gl::Context *context) override;
> 
>     // BufferImpl implementation
>-    gl::Error setData(const gl::Context *context,
>-                      gl::BufferBinding target,
>-                      const void *data,
>-                      size_t size,
>-                      gl::BufferUsage usage) override;
>-    gl::Error setSubData(const gl::Context *context,
>-                         gl::BufferBinding target,
>-                         const void *data,
>-                         size_t size,
>-                         size_t offset) override;
>-    gl::Error copySubData(const gl::Context *context,
>-                          BufferImpl *source,
>-                          GLintptr sourceOffset,
>-                          GLintptr destOffset,
>-                          GLsizeiptr size) override;
>-    gl::Error map(const gl::Context *context, GLenum access, void **mapPtr) override;
>-    gl::Error mapRange(const gl::Context *context,
>-                       size_t offset,
>-                       size_t length,
>-                       GLbitfield access,
>-                       void **mapPtr) override;
>-    gl::Error unmap(const gl::Context *context, GLboolean *result) override;
>-    gl::Error markTransformFeedbackUsage(const gl::Context *context) override;
>-
>-    // We use two set of dirty events. Static buffers are marked dirty whenever
>-    // data changes, because they must be re-translated. Direct buffers only need to be
>-    // updated when the underlying ID3D11Buffer pointer changes - hopefully far less often.
>-    OnBufferDataDirtyChannel *getStaticBroadcastChannel();
>-    OnBufferDataDirtyChannel *getDirectBroadcastChannel();
>+    angle::Result setData(const gl::Context *context,
>+                          gl::BufferBinding target,
>+                          const void *data,
>+                          size_t size,
>+                          gl::BufferUsage usage) override;
>+    angle::Result setSubData(const gl::Context *context,
>+                             gl::BufferBinding target,
>+                             const void *data,
>+                             size_t size,
>+                             size_t offset) override;
>+    angle::Result copySubData(const gl::Context *context,
>+                              BufferImpl *source,
>+                              GLintptr sourceOffset,
>+                              GLintptr destOffset,
>+                              GLsizeiptr size) override;
>+    angle::Result map(const gl::Context *context, GLenum access, void **mapPtr) override;
>+    angle::Result mapRange(const gl::Context *context,
>+                           size_t offset,
>+                           size_t length,
>+                           GLbitfield access,
>+                           void **mapPtr) override;
>+    angle::Result unmap(const gl::Context *context, GLboolean *result) override;
>+    angle::Result markTransformFeedbackUsage(const gl::Context *context) override;
> 
>   private:
>     class BufferStorage;
>@@ -126,28 +130,38 @@ class Buffer11 : public BufferD3D
>     };
> 
>     void markBufferUsage(BufferUsage usage);
>-    gl::Error garbageCollection(const gl::Context *context, BufferUsage currentUsage);
>-    gl::ErrorOrResult<NativeStorage *> getStagingStorage(const gl::Context *context);
>-    gl::ErrorOrResult<PackStorage *> getPackStorage(const gl::Context *context);
>-    gl::ErrorOrResult<SystemMemoryStorage *> getSystemMemoryStorage(const gl::Context *context);
>-
>-    gl::Error updateBufferStorage(const gl::Context *context,
>-                                  BufferStorage *storage,
>-                                  size_t sourceOffset,
>-                                  size_t storageSize);
>-    gl::ErrorOrResult<BufferStorage *> getBufferStorage(const gl::Context *context,
>-                                                        BufferUsage usage);
>-    gl::ErrorOrResult<BufferStorage *> getLatestBufferStorage(const gl::Context *context) const;
>-
>-    gl::ErrorOrResult<BufferStorage *> getConstantBufferRangeStorage(const gl::Context *context,
>-                                                                     GLintptr offset,
>-                                                                     GLsizeiptr size);
>+    angle::Result markBufferUsage(const gl::Context *context, BufferUsage usage);
>+    angle::Result garbageCollection(const gl::Context *context, BufferUsage currentUsage);
>+
>+    angle::Result updateBufferStorage(const gl::Context *context,
>+                                      BufferStorage *storage,
>+                                      size_t sourceOffset,
>+                                      size_t storageSize);
>+
>+    angle::Result getNativeStorageForUAV(const gl::Context *context,
>+                                         Buffer11::NativeStorage **storageOut);
>+
>+    template <typename StorageOutT>
>+    angle::Result getBufferStorage(const gl::Context *context,
>+                                   BufferUsage usage,
>+                                   StorageOutT **storageOut);
>+
>+    template <typename StorageOutT>
>+    angle::Result getStagingStorage(const gl::Context *context, StorageOutT **storageOut);
>+
>+    angle::Result getLatestBufferStorage(const gl::Context *context,
>+                                         BufferStorage **storageOut) const;
>+
>+    angle::Result getConstantBufferRangeStorage(const gl::Context *context,
>+                                                GLintptr offset,
>+                                                GLsizeiptr size,
>+                                                NativeStorage **storageOut);
> 
>     BufferStorage *allocateStorage(BufferUsage usage);
>     void updateDeallocThreshold(BufferUsage usage);
> 
>     // Free the storage if we decide it isn't being used very often.
>-    gl::Error checkForDeallocation(const gl::Context *context, BufferUsage usage);
>+    angle::Result checkForDeallocation(const gl::Context *context, BufferUsage usage);
> 
>     // For some cases of uniform buffer storage, we can't deallocate system memory storage.
>     bool canDeallocateSystemMemory() const;
>@@ -179,9 +193,6 @@ class Buffer11 : public BufferD3D
>     ConstantBufferCache mConstantBufferRangeStoragesCache;
>     size_t mConstantBufferStorageAdditionalSize;
>     unsigned int mMaxConstantBufferLruCount;
>-
>-    OnBufferDataDirtyChannel mStaticBroadcastChannel;
>-    OnBufferDataDirtyChannel mDirectBroadcastChannel;
> };
> 
> }  // namespace rx
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/Clear11.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/Clear11.cpp
>index f9dda0aeb4b..189d72b74db 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/Clear11.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/Clear11.cpp
>@@ -10,13 +10,15 @@
> 
> #include <algorithm>
> 
>+#include "libANGLE/Context.h"
> #include "libANGLE/FramebufferAttachment.h"
> #include "libANGLE/formatutils.h"
> #include "libANGLE/renderer/d3d/FramebufferD3D.h"
>-#include "libANGLE/renderer/d3d/d3d11/Renderer11.h"
>-#include "libANGLE/renderer/d3d/d3d11/renderer11_utils.h"
>+#include "libANGLE/renderer/d3d/d3d11/Context11.h"
> #include "libANGLE/renderer/d3d/d3d11/RenderTarget11.h"
>+#include "libANGLE/renderer/d3d/d3d11/Renderer11.h"
> #include "libANGLE/renderer/d3d/d3d11/formatutils11.h"
>+#include "libANGLE/renderer/d3d/d3d11/renderer11_utils.h"
> #include "third_party/trace_event/trace_event.h"
> 
> // Precompiled shaders
>@@ -103,18 +105,6 @@ bool UpdateDataCache(RtvDsvClearInfo<T> *dataCache,
>     return cacheDirty;
> }
> 
>-bool AllOffsetsAreNonNegative(const std::vector<gl::Offset> &viewportOffsets)
>-{
>-    for (size_t i = 0u; i < viewportOffsets.size(); ++i)
>-    {
>-        const auto &offset = viewportOffsets[i];
>-        if (offset.x < 0 || offset.y < 0)
>-        {
>-            return false;
>-        }
>-    }
>-    return true;
>-}
> }  // anonymous namespace
> 
> #define CLEARPS(Index)                                                                    \
>@@ -135,30 +125,30 @@ Clear11::ShaderManager::ShaderManager()
>                CLEARPS(Uint6), CLEARPS(Uint7), CLEARPS(Uint8)}},
>       mPsSInt{{CLEARPS(Sint1), CLEARPS(Sint2), CLEARPS(Sint3), CLEARPS(Sint4), CLEARPS(Sint5),
>                CLEARPS(Sint6), CLEARPS(Sint7), CLEARPS(Sint8)}}
>-{
>-}
>+{}
> 
> #undef CLEARPS
> 
>-Clear11::ShaderManager::~ShaderManager()
>+Clear11::ShaderManager::~ShaderManager() {}
>+
>+angle::Result Clear11::ShaderManager::getShadersAndLayout(const gl::Context *context,
>+                                                          Renderer11 *renderer,
>+                                                          const INT clearType,
>+                                                          const uint32_t numRTs,
>+                                                          const bool hasLayeredLayout,
>+                                                          const d3d11::InputLayout **il,
>+                                                          const d3d11::VertexShader **vs,
>+                                                          const d3d11::GeometryShader **gs,
>+                                                          const d3d11::PixelShader **ps)
> {
>-}
>+    Context11 *context11 = GetImplAs<Context11>(context);
> 
>-gl::Error Clear11::ShaderManager::getShadersAndLayout(Renderer11 *renderer,
>-                                                      const INT clearType,
>-                                                      const uint32_t numRTs,
>-                                                      const bool hasLayeredLayout,
>-                                                      const d3d11::InputLayout **il,
>-                                                      const d3d11::VertexShader **vs,
>-                                                      const d3d11::GeometryShader **gs,
>-                                                      const d3d11::PixelShader **ps)
>-{
>     if (renderer->getRenderer11DeviceCaps().featureLevel <= D3D_FEATURE_LEVEL_9_3)
>     {
>         ASSERT(clearType == GL_FLOAT);
> 
>-        ANGLE_TRY(mVs9.resolve(renderer));
>-        ANGLE_TRY(mPsFloat9.resolve(renderer));
>+        ANGLE_TRY(mVs9.resolve(context11, renderer));
>+        ANGLE_TRY(mPsFloat9.resolve(context11, renderer));
> 
>         if (!mIl9.valid())
>         {
>@@ -168,26 +158,27 @@ gl::Error Clear11::ShaderManager::getShadersAndLayout(Renderer11 *renderer,
>             InputElementArray ilDescArray(ilDesc);
>             ShaderData vertexShader(g_VS_Clear_FL9);
> 
>-            ANGLE_TRY(renderer->allocateResource(ilDescArray, &vertexShader, &mIl9));
>+            ANGLE_TRY(renderer->allocateResource(context11, ilDescArray, &vertexShader, &mIl9));
>         }
> 
>         *vs = &mVs9.getObj();
>         *gs = nullptr;
>         *il = &mIl9;
>         *ps = &mPsFloat9.getObj();
>-        return gl::NoError();
>+        return angle::Result::Continue;
>     }
>+
>     if (!hasLayeredLayout)
>     {
>-        ANGLE_TRY(mVs.resolve(renderer));
>+        ANGLE_TRY(mVs.resolve(context11, renderer));
>         *vs = &mVs.getObj();
>         *gs = nullptr;
>     }
>     else
>     {
>         // For layered framebuffers we have to use the multi-view versions of the VS and GS.
>-        ANGLE_TRY(mVsMultiview.resolve(renderer));
>-        ANGLE_TRY(mGsMultiview.resolve(renderer));
>+        ANGLE_TRY(mVsMultiview.resolve(context11, renderer));
>+        ANGLE_TRY(mGsMultiview.resolve(context11, renderer));
>         *vs = &mVsMultiview.getObj();
>         *gs = &mGsMultiview.getObj();
>     }
>@@ -196,23 +187,23 @@ gl::Error Clear11::ShaderManager::getShadersAndLayout(Renderer11 *renderer,
> 
>     if (numRTs == 0)
>     {
>-        ANGLE_TRY(mPsDepth.resolve(renderer));
>+        ANGLE_TRY(mPsDepth.resolve(context11, renderer));
>         *ps = &mPsDepth.getObj();
>-        return gl::NoError();
>+        return angle::Result::Continue;
>     }
> 
>     switch (clearType)
>     {
>         case GL_FLOAT:
>-            ANGLE_TRY(mPsFloat[numRTs - 1].resolve(renderer));
>+            ANGLE_TRY(mPsFloat[numRTs - 1].resolve(context11, renderer));
>             *ps = &mPsFloat[numRTs - 1].getObj();
>             break;
>         case GL_UNSIGNED_INT:
>-            ANGLE_TRY(mPsUInt[numRTs - 1].resolve(renderer));
>+            ANGLE_TRY(mPsUInt[numRTs - 1].resolve(context11, renderer));
>             *ps = &mPsUInt[numRTs - 1].getObj();
>             break;
>         case GL_INT:
>-            ANGLE_TRY(mPsSInt[numRTs - 1].resolve(renderer));
>+            ANGLE_TRY(mPsSInt[numRTs - 1].resolve(context11, renderer));
>             *ps = &mPsSInt[numRTs - 1].getObj();
>             break;
>         default:
>@@ -220,7 +211,7 @@ gl::Error Clear11::ShaderManager::getShadersAndLayout(Renderer11 *renderer,
>             break;
>     }
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
> Clear11::Clear11(Renderer11 *renderer)
>@@ -232,18 +223,15 @@ Clear11::Clear11(Renderer11 *renderer)
>       mConstantBuffer(),
>       mVertexBuffer(),
>       mShaderData({})
>-{
>-}
>+{}
> 
>-Clear11::~Clear11()
>-{
>-}
>+Clear11::~Clear11() {}
> 
>-gl::Error Clear11::ensureResourcesInitialized()
>+angle::Result Clear11::ensureResourcesInitialized(const gl::Context *context)
> {
>     if (mResourcesInitialized)
>     {
>-        return gl::NoError();
>+        return angle::Result::Continue;
>     }
> 
>     TRACE_EVENT0("gpu.angle", "Clear11::ensureResourcesInitialized");
>@@ -271,11 +259,13 @@ gl::Error Clear11::ensureResourcesInitialized()
>     rsDesc.MultisampleEnable     = FALSE;
>     rsDesc.AntialiasedLineEnable = FALSE;
> 
>-    ANGLE_TRY(mRenderer->allocateResource(rsDesc, &mScissorDisabledRasterizerState));
>+    Context11 *context11 = GetImplAs<Context11>(context);
>+
>+    ANGLE_TRY(mRenderer->allocateResource(context11, rsDesc, &mScissorDisabledRasterizerState));
>     mScissorDisabledRasterizerState.setDebugName("Clear11 Rasterizer State with scissor disabled");
> 
>     rsDesc.ScissorEnable = TRUE;
>-    ANGLE_TRY(mRenderer->allocateResource(rsDesc, &mScissorEnabledRasterizerState));
>+    ANGLE_TRY(mRenderer->allocateResource(context11, rsDesc, &mScissorEnabledRasterizerState));
>     mScissorEnabledRasterizerState.setDebugName("Clear11 Rasterizer State with scissor enabled");
> 
>     // Initialize Depthstencil state with defaults
>@@ -308,7 +298,7 @@ gl::Error Clear11::ensureResourcesInitialized()
>     mBlendStateKey.blendState.dither                = true;
> 
>     mResourcesInitialized = true;
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
> bool Clear11::useVertexBuffer() const
>@@ -316,11 +306,11 @@ bool Clear11::useVertexBuffer() const
>     return (mRenderer->getRenderer11DeviceCaps().featureLevel <= D3D_FEATURE_LEVEL_9_3);
> }
> 
>-gl::Error Clear11::ensureConstantBufferCreated()
>+angle::Result Clear11::ensureConstantBufferCreated(const gl::Context *context)
> {
>     if (mConstantBuffer.valid())
>     {
>-        return gl::NoError();
>+        return angle::Result::Continue;
>     }
> 
>     // Create constant buffer for color & depth data
>@@ -338,18 +328,19 @@ gl::Error Clear11::ensureConstantBufferCreated()
>     initialData.SysMemPitch      = g_ConstantBufferSize;
>     initialData.SysMemSlicePitch = g_ConstantBufferSize;
> 
>-    ANGLE_TRY(mRenderer->allocateResource(bufferDesc, &initialData, &mConstantBuffer));
>+    ANGLE_TRY(mRenderer->allocateResource(GetImplAs<Context11>(context), bufferDesc, &initialData,
>+                                          &mConstantBuffer));
>     mConstantBuffer.setDebugName("Clear11 Constant Buffer");
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error Clear11::ensureVertexBufferCreated()
>+angle::Result Clear11::ensureVertexBufferCreated(const gl::Context *context)
> {
>     ASSERT(useVertexBuffer());
> 
>     if (mVertexBuffer.valid())
>     {
>-        return gl::NoError();
>+        return angle::Result::Continue;
>     }
> 
>     // Create vertex buffer with vertices for a quad covering the entire surface
>@@ -375,16 +366,17 @@ gl::Error Clear11::ensureVertexBufferCreated()
>     initialData.SysMemPitch      = vbSize;
>     initialData.SysMemSlicePitch = initialData.SysMemPitch;
> 
>-    ANGLE_TRY(mRenderer->allocateResource(bufferDesc, &initialData, &mVertexBuffer));
>+    ANGLE_TRY(mRenderer->allocateResource(GetImplAs<Context11>(context), bufferDesc, &initialData,
>+                                          &mVertexBuffer));
>     mVertexBuffer.setDebugName("Clear11 Vertex Buffer");
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error Clear11::clearFramebuffer(const gl::Context *context,
>-                                    const ClearParameters &clearParams,
>-                                    const gl::FramebufferState &fboData)
>+angle::Result Clear11::clearFramebuffer(const gl::Context *context,
>+                                        const ClearParameters &clearParams,
>+                                        const gl::FramebufferState &fboData)
> {
>-    ANGLE_TRY(ensureResourcesInitialized());
>+    ANGLE_TRY(ensureResourcesInitialized(context));
> 
>     // Iterate over the color buffers which require clearing and determine if they can be
>     // cleared with ID3D11DeviceContext::ClearRenderTargetView or ID3D11DeviceContext1::ClearView.
>@@ -423,75 +415,43 @@ gl::Error Clear11::clearFramebuffer(const gl::Context *context,
>     else
>     {
>         const gl::FramebufferAttachment *colorAttachment = fboData.getFirstColorAttachment();
>-
>-        if (!colorAttachment)
>-        {
>-            UNREACHABLE();
>-            return gl::InternalError();
>-        }
>-
>+        ASSERT(colorAttachment);
>         framebufferSize = colorAttachment->getSize();
>     }
> 
>-    const bool isSideBySideFBO =
>-        (fboData.getMultiviewLayout() == GL_FRAMEBUFFER_MULTIVIEW_SIDE_BY_SIDE_ANGLE);
>     bool needScissoredClear = false;
>-    std::vector<D3D11_RECT> scissorRects;
>+    D3D11_RECT scissorRect;
>     if (clearParams.scissorEnabled)
>     {
>-        const std::vector<gl::Offset> *viewportOffsets = fboData.getViewportOffsets();
>-        ASSERT(viewportOffsets != nullptr);
>-        ASSERT(AllOffsetsAreNonNegative(*fboData.getViewportOffsets()));
>-
>         if (clearParams.scissor.x >= framebufferSize.width ||
>             clearParams.scissor.y >= framebufferSize.height || clearParams.scissor.width == 0 ||
>             clearParams.scissor.height == 0)
>         {
>             // The check assumes that the viewport offsets are not negative as according to the
>-            // ANGLE_multiview spec.
>+            // OVR_multiview2 spec.
>             // Scissor rect is outside the renderbuffer or is an empty rect.
>-            return gl::NoError();
>+            return angle::Result::Continue;
>         }
> 
>-        if (isSideBySideFBO)
>+        if (clearParams.scissor.x + clearParams.scissor.width <= 0 ||
>+            clearParams.scissor.y + clearParams.scissor.height <= 0)
>         {
>-            // We always have to do a scissor clear for side-by-side framebuffers.
>-            needScissoredClear = true;
>-        }
>-        else
>-        {
>-            // Because the viewport offsets can generate scissor rectangles within the framebuffer's
>-            // bounds, we can do this check only for non-side-by-side framebuffers.
>-            if (clearParams.scissor.x + clearParams.scissor.width <= 0 ||
>-                clearParams.scissor.y + clearParams.scissor.height <= 0)
>-            {
>-                // Scissor rect is outside the renderbuffer.
>-                return gl::NoError();
>-            }
>-            needScissoredClear =
>-                clearParams.scissor.x > 0 || clearParams.scissor.y > 0 ||
>-                clearParams.scissor.x + clearParams.scissor.width < framebufferSize.width ||
>-                clearParams.scissor.y + clearParams.scissor.height < framebufferSize.height;
>+            // Scissor rect is outside the renderbuffer.
>+            return angle::Result::Continue;
>         }
>+        needScissoredClear =
>+            clearParams.scissor.x > 0 || clearParams.scissor.y > 0 ||
>+            clearParams.scissor.x + clearParams.scissor.width < framebufferSize.width ||
>+            clearParams.scissor.y + clearParams.scissor.height < framebufferSize.height;
> 
>         if (needScissoredClear)
>         {
>-            // Apply viewport offsets to compute the final scissor rectangles. This is valid also
>-            // for non-side-by-side framebuffers, because the default viewport offset is {0,0}.
>-            const size_t numViews = viewportOffsets->size();
>-            scissorRects.reserve(numViews);
>-            for (size_t i = 0u; i < numViews; ++i)
>-            {
>-                const gl::Offset &offset = (*viewportOffsets)[i];
>-                D3D11_RECT rect;
>-                int x       = clearParams.scissor.x + offset.x;
>-                int y       = clearParams.scissor.y + offset.y;
>-                rect.left   = x;
>-                rect.right  = x + clearParams.scissor.width;
>-                rect.top    = y;
>-                rect.bottom = y + clearParams.scissor.height;
>-                scissorRects.emplace_back(rect);
>-            }
>+            // Apply viewport offsets to compute the final scissor rectangles.
>+            // Even in multiview all layers share the same viewport and scissor.
>+            scissorRect.left   = clearParams.scissor.x;
>+            scissorRect.right  = scissorRect.left + clearParams.scissor.width;
>+            scissorRect.top    = clearParams.scissor.y;
>+            scissorRect.bottom = scissorRect.top + clearParams.scissor.height;
>         }
>     }
> 
>@@ -526,11 +486,11 @@ gl::Error Clear11::clearFramebuffer(const gl::Context *context,
>               formatInfo.componentType == GL_UNSIGNED_NORMALIZED ||
>               formatInfo.componentType == GL_SIGNED_NORMALIZED))
>         {
>-            ERR() << "It is undefined behaviour to clear a render buffer which is not "
>-                     "normalized fixed point or floating-point to floating point values (color "
>-                     "attachment "
>-                  << colorAttachmentIndex << " has internal format " << attachment.getFormat()
>-                  << ").";
>+            WARN() << "It is undefined behaviour to clear a render buffer which is not "
>+                      "normalized fixed point or floating-point to floating point values (color "
>+                      "attachment "
>+                   << colorAttachmentIndex << " has internal format " << attachment.getFormat()
>+                   << ").";
>         }
> 
>         if ((formatInfo.redBits == 0 || !clearParams.colorMaskRed) &&
>@@ -590,15 +550,10 @@ gl::Error Clear11::clearFramebuffer(const gl::Context *context,
>             {
>                 // We shouldn't reach here if deviceContext1 is unavailable.
>                 ASSERT(deviceContext1);
>-                // There must be at least one scissor rectangle.
>-                ASSERT(!scissorRects.empty());
>-                deviceContext1->ClearView(framebufferRTV.get(), clearValues, scissorRects.data(),
>-                                          static_cast<UINT>(scissorRects.size()));
>+                deviceContext1->ClearView(framebufferRTV.get(), clearValues, &scissorRect, 1);
>                 if (mRenderer->getWorkarounds().callClearTwice)
>                 {
>-                    deviceContext1->ClearView(framebufferRTV.get(), clearValues,
>-                                              scissorRects.data(),
>-                                              static_cast<UINT>(scissorRects.size()));
>+                    deviceContext1->ClearView(framebufferRTV.get(), clearValues, &scissorRect, 1);
>                 }
>             }
>             else
>@@ -624,7 +579,7 @@ gl::Error Clear11::clearFramebuffer(const gl::Context *context,
>         dsv = depthStencilRenderTarget->getDepthStencilView().get();
>         ASSERT(dsv != nullptr);
> 
>-        const auto &nativeFormat = depthStencilRenderTarget->getFormatSet().format();
>+        const auto &nativeFormat      = depthStencilRenderTarget->getFormatSet().format();
>         const auto *stencilAttachment = fboData.getStencilAttachment();
> 
>         uint32_t stencilUnmasked =
>@@ -648,7 +603,7 @@ gl::Error Clear11::clearFramebuffer(const gl::Context *context,
> 
>     if (numRtvs == 0 && dsv == nullptr)
>     {
>-        return gl::NoError();
>+        return angle::Result::Continue;
>     }
> 
>     // Clear the remaining render targets and depth stencil in one pass by rendering a quad:
>@@ -694,10 +649,10 @@ gl::Error Clear11::clearFramebuffer(const gl::Context *context,
> 
>     // Get BlendState
>     const d3d11::BlendState *blendState = nullptr;
>-    ANGLE_TRY(mRenderer->getBlendState(mBlendStateKey, &blendState));
>+    ANGLE_TRY(mRenderer->getBlendState(context, mBlendStateKey, &blendState));
> 
>     const d3d11::DepthStencilState *dsState = nullptr;
>-    const float *zValue              = nullptr;
>+    const float *zValue                     = nullptr;
> 
>     if (dsv)
>     {
>@@ -708,7 +663,7 @@ gl::Error Clear11::clearFramebuffer(const gl::Context *context,
>         mDepthStencilStateKey.stencilTest      = clearParams.clearStencil;
> 
>         // Get DepthStencilState
>-        ANGLE_TRY(mRenderer->getDepthStencilState(mDepthStencilStateKey, &dsState));
>+        ANGLE_TRY(mRenderer->getDepthStencilState(context, mDepthStencilStateKey, &dsState));
>         zValue = clearParams.clearDepth ? &clearParams.depthValue : nullptr;
>     }
> 
>@@ -718,8 +673,7 @@ gl::Error Clear11::clearFramebuffer(const gl::Context *context,
>     switch (clearParams.colorType)
>     {
>         case GL_FLOAT:
>-            dirtyCb = UpdateDataCache(reinterpret_cast<RtvDsvClearInfo<float> *>(&mShaderData),
>-                                      clearParams.colorF, zValue, numRtvs, colorMask);
>+            dirtyCb = UpdateDataCache(&mShaderData, clearParams.colorF, zValue, numRtvs, colorMask);
>             break;
>         case GL_UNSIGNED_INT:
>             dirtyCb = UpdateDataCache(reinterpret_cast<RtvDsvClearInfo<uint32_t> *>(&mShaderData),
>@@ -734,19 +688,15 @@ gl::Error Clear11::clearFramebuffer(const gl::Context *context,
>             break;
>     }
> 
>-    ANGLE_TRY(ensureConstantBufferCreated());
>+    ANGLE_TRY(ensureConstantBufferCreated(context));
> 
>     if (dirtyCb)
>     {
>         // Update the constant buffer with the updated cache contents
>         // TODO(Shahmeer): Consider using UpdateSubresource1 D3D11_COPY_DISCARD where possible.
>         D3D11_MAPPED_SUBRESOURCE mappedResource;
>-        HRESULT result = deviceContext->Map(mConstantBuffer.get(), 0, D3D11_MAP_WRITE_DISCARD, 0,
>-                                            &mappedResource);
>-        if (FAILED(result))
>-        {
>-            return gl::OutOfMemory() << "Clear11: Failed to map CB, " << gl::FmtHR(result);
>-        }
>+        ANGLE_TRY(mRenderer->mapResource(context, mConstantBuffer.get(), 0, D3D11_MAP_WRITE_DISCARD,
>+                                         0, &mappedResource));
> 
>         memcpy(mappedResource.pData, &mShaderData, g_ConstantBufferSize);
>         deviceContext->Unmap(mConstantBuffer.get(), 0);
>@@ -773,13 +723,12 @@ gl::Error Clear11::clearFramebuffer(const gl::Context *context,
>     }
> 
>     // Get Shaders
>-    const d3d11::VertexShader *vs = nullptr;
>+    const d3d11::VertexShader *vs   = nullptr;
>     const d3d11::GeometryShader *gs = nullptr;
>-    const d3d11::InputLayout *il  = nullptr;
>-    const d3d11::PixelShader *ps  = nullptr;
>-    const bool hasLayeredLayout =
>-        (fboData.getMultiviewLayout() == GL_FRAMEBUFFER_MULTIVIEW_LAYERED_ANGLE);
>-    ANGLE_TRY(mShaderManager.getShadersAndLayout(mRenderer, clearParams.colorType, numRtvs,
>+    const d3d11::InputLayout *il    = nullptr;
>+    const d3d11::PixelShader *ps    = nullptr;
>+    const bool hasLayeredLayout     = (fboData.isMultiview());
>+    ANGLE_TRY(mShaderManager.getShadersAndLayout(context, mRenderer, clearParams.colorType, numRtvs,
>                                                  hasLayeredLayout, &il, &vs, &gs, &ps));
> 
>     // Apply Shaders
>@@ -792,7 +741,7 @@ gl::Error Clear11::clearFramebuffer(const gl::Context *context,
> 
>     if (useVertexBuffer())
>     {
>-        ANGLE_TRY(ensureVertexBufferCreated());
>+        ANGLE_TRY(ensureVertexBufferCreated(context));
>         stateManager->setSingleVertexBuffer(&mVertexBuffer, g_VertexSize, 0);
>     }
>     else
>@@ -805,29 +754,22 @@ gl::Error Clear11::clearFramebuffer(const gl::Context *context,
>     // Apply render targets
>     stateManager->setRenderTargets(&rtvs[0], numRtvs, dsv);
> 
>-    // If scissors are necessary to be applied, then the number of clears is the number of scissor
>-    // rects. If no scissors are necessary, then a single full-size clear is enough.
>-    size_t necessaryNumClears = needScissoredClear ? scissorRects.size() : 1u;
>-    for (size_t i = 0u; i < necessaryNumClears; ++i)
>+    if (needScissoredClear)
>     {
>-        if (needScissoredClear)
>-        {
>-            ASSERT(i < scissorRects.size());
>-            stateManager->setScissorRectD3D(scissorRects[i]);
>-        }
>-        // Draw the fullscreen quad.
>-        if (!hasLayeredLayout || isSideBySideFBO)
>-        {
>-            deviceContext->Draw(6, 0);
>-        }
>-        else
>-        {
>-            ASSERT(hasLayeredLayout);
>-            deviceContext->DrawInstanced(6, static_cast<UINT>(fboData.getNumViews()), 0, 0);
>-        }
>+        stateManager->setScissorRectD3D(scissorRect);
>+    }
>+    // Draw the fullscreen quad.
>+    if (!hasLayeredLayout)
>+    {
>+        deviceContext->Draw(6, 0);
>+    }
>+    else
>+    {
>+        ASSERT(hasLayeredLayout);
>+        deviceContext->DrawInstanced(6, static_cast<UINT>(fboData.getNumViews()), 0, 0);
>     }
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
> }  // namespace rx
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/Clear11.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/Clear11.h
>index a09812c42be..feca4159c54 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/Clear11.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/Clear11.h
>@@ -12,9 +12,9 @@
> #include <map>
> #include <vector>
> 
>-#include "libANGLE/angletypes.h"
> #include "libANGLE/Error.h"
> #include "libANGLE/Framebuffer.h"
>+#include "libANGLE/angletypes.h"
> #include "libANGLE/renderer/d3d/d3d11/renderer11_utils.h"
> 
> namespace rx
>@@ -37,10 +37,11 @@ class Clear11 : angle::NonCopyable
>     explicit Clear11(Renderer11 *renderer);
>     ~Clear11();
> 
>-    // Clears the framebuffer with the supplied clear parameters, assumes that the framebuffer is currently applied.
>-    gl::Error clearFramebuffer(const gl::Context *context,
>-                               const ClearParameters &clearParams,
>-                               const gl::FramebufferState &fboData);
>+    // Clears the framebuffer with the supplied clear parameters, assumes that the framebuffer is
>+    // currently applied.
>+    angle::Result clearFramebuffer(const gl::Context *context,
>+                                   const ClearParameters &clearParams,
>+                                   const gl::FramebufferState &fboData);
> 
>   private:
>     class ShaderManager final : angle::NonCopyable
>@@ -48,14 +49,15 @@ class Clear11 : angle::NonCopyable
>       public:
>         ShaderManager();
>         ~ShaderManager();
>-        gl::Error getShadersAndLayout(Renderer11 *renderer,
>-                                      const INT clearType,
>-                                      const uint32_t numRTs,
>-                                      const bool hasLayeredLayout,
>-                                      const d3d11::InputLayout **il,
>-                                      const d3d11::VertexShader **vs,
>-                                      const d3d11::GeometryShader **gs,
>-                                      const d3d11::PixelShader **ps);
>+        angle::Result getShadersAndLayout(const gl::Context *context,
>+                                          Renderer11 *renderer,
>+                                          const INT clearType,
>+                                          const uint32_t numRTs,
>+                                          const bool hasLayeredLayout,
>+                                          const d3d11::InputLayout **il,
>+                                          const d3d11::VertexShader **vs,
>+                                          const d3d11::GeometryShader **gs,
>+                                          const d3d11::PixelShader **ps);
> 
>       private:
>         constexpr static size_t kNumShaders = D3D11_SIMULTANEOUS_RENDER_TARGET_COUNT;
>@@ -73,9 +75,9 @@ class Clear11 : angle::NonCopyable
>     };
> 
>     bool useVertexBuffer() const;
>-    gl::Error ensureConstantBufferCreated();
>-    gl::Error ensureVertexBufferCreated();
>-    gl::Error ensureResourcesInitialized();
>+    angle::Result ensureConstantBufferCreated(const gl::Context *context);
>+    angle::Result ensureVertexBufferCreated(const gl::Context *context);
>+    angle::Result ensureResourcesInitialized(const gl::Context *context);
> 
>     Renderer11 *mRenderer;
>     bool mResourcesInitialized;
>@@ -97,4 +99,4 @@ class Clear11 : angle::NonCopyable
> 
> }  // namespace rx
> 
>-#endif // LIBANGLE_RENDERER_D3D_D3D11_CLEAR11_H_
>+#endif  // LIBANGLE_RENDERER_D3D_D3D11_CLEAR11_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/Context11.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/Context11.cpp
>index b79dd3603a7..20dff59bcbc 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/Context11.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/Context11.cpp
>@@ -13,7 +13,6 @@
> #include "libANGLE/Context.h"
> #include "libANGLE/MemoryProgramCache.h"
> #include "libANGLE/renderer/d3d/CompilerD3D.h"
>-#include "libANGLE/renderer/d3d/ProgramD3D.h"
> #include "libANGLE/renderer/d3d/RenderbufferD3D.h"
> #include "libANGLE/renderer/d3d/SamplerD3D.h"
> #include "libANGLE/renderer/d3d/ShaderD3D.h"
>@@ -21,27 +20,111 @@
> #include "libANGLE/renderer/d3d/d3d11/Buffer11.h"
> #include "libANGLE/renderer/d3d/d3d11/Fence11.h"
> #include "libANGLE/renderer/d3d/d3d11/Framebuffer11.h"
>+#include "libANGLE/renderer/d3d/d3d11/IndexBuffer11.h"
>+#include "libANGLE/renderer/d3d/d3d11/Program11.h"
> #include "libANGLE/renderer/d3d/d3d11/ProgramPipeline11.h"
> #include "libANGLE/renderer/d3d/d3d11/Renderer11.h"
> #include "libANGLE/renderer/d3d/d3d11/StateManager11.h"
> #include "libANGLE/renderer/d3d/d3d11/TransformFeedback11.h"
> #include "libANGLE/renderer/d3d/d3d11/VertexArray11.h"
>+#include "libANGLE/renderer/d3d/d3d11/renderer11_utils.h"
> 
> namespace rx
> {
> 
>-Context11::Context11(const gl::ContextState &state, Renderer11 *renderer)
>-    : ContextImpl(state), mRenderer(renderer)
>+namespace
> {
>+ANGLE_INLINE bool DrawCallHasDynamicAttribs(const gl::Context *context)
>+{
>+    VertexArray11 *vertexArray11 = GetImplAs<VertexArray11>(context->getState().getVertexArray());
>+    return vertexArray11->hasActiveDynamicAttrib(context);
>+}
>+
>+bool DrawCallHasStreamingVertexArrays(const gl::Context *context, gl::PrimitiveMode mode)
>+{
>+    // Direct drawing doesn't support dynamic attribute storage since it needs the first and count
>+    // to translate when applyVertexBuffer. GL_LINE_LOOP and GL_TRIANGLE_FAN are not supported
>+    // either since we need to simulate them in D3D.
>+    if (DrawCallHasDynamicAttribs(context) || mode == gl::PrimitiveMode::LineLoop ||
>+        mode == gl::PrimitiveMode::TriangleFan)
>+    {
>+        return true;
>+    }
>+
>+    ProgramD3D *programD3D = GetImplAs<ProgramD3D>(context->getState().getProgram());
>+    if (InstancedPointSpritesActive(programD3D, mode))
>+    {
>+        return true;
>+    }
>+
>+    return false;
> }
> 
>-Context11::~Context11()
>+bool DrawCallHasStreamingElementArray(const gl::Context *context, gl::DrawElementsType srcType)
>+{
>+    const gl::State &glState       = context->getState();
>+    gl::Buffer *elementArrayBuffer = glState.getVertexArray()->getElementArrayBuffer();
>+
>+    bool primitiveRestartWorkaround =
>+        UsePrimitiveRestartWorkaround(glState.isPrimitiveRestartEnabled(), srcType);
>+    const gl::DrawElementsType dstType =
>+        (srcType == gl::DrawElementsType::UnsignedInt || primitiveRestartWorkaround)
>+            ? gl::DrawElementsType::UnsignedInt
>+            : gl::DrawElementsType::UnsignedShort;
>+
>+    // Not clear where the offset comes from here.
>+    switch (ClassifyIndexStorage(glState, elementArrayBuffer, srcType, dstType, 0))
>+    {
>+        case IndexStorageType::Dynamic:
>+            return true;
>+        case IndexStorageType::Direct:
>+            return false;
>+        case IndexStorageType::Static:
>+        {
>+            BufferD3D *bufferD3D                     = GetImplAs<BufferD3D>(elementArrayBuffer);
>+            StaticIndexBufferInterface *staticBuffer = bufferD3D->getStaticIndexBuffer();
>+            return (staticBuffer->getBufferSize() == 0 || staticBuffer->getIndexType() != dstType);
>+        }
>+        default:
>+            UNREACHABLE();
>+            return true;
>+    }
>+}
>+
>+template <typename IndirectBufferT>
>+angle::Result ReadbackIndirectBuffer(const gl::Context *context,
>+                                     const void *indirect,
>+                                     const IndirectBufferT **bufferPtrOut)
>+{
>+    const gl::State &glState       = context->getState();
>+    gl::Buffer *drawIndirectBuffer = glState.getTargetBuffer(gl::BufferBinding::DrawIndirect);
>+    ASSERT(drawIndirectBuffer);
>+    Buffer11 *storage = GetImplAs<Buffer11>(drawIndirectBuffer);
>+    uintptr_t offset  = reinterpret_cast<uintptr_t>(indirect);
>+
>+    const uint8_t *bufferData = nullptr;
>+    ANGLE_TRY(storage->getData(context, &bufferData));
>+    ASSERT(bufferData);
>+
>+    *bufferPtrOut = reinterpret_cast<const IndirectBufferT *>(bufferData + offset);
>+    return angle::Result::Continue;
>+}
>+}  // anonymous namespace
>+
>+Context11::Context11(const gl::State &state, gl::ErrorSet *errorSet, Renderer11 *renderer)
>+    : ContextD3D(state, errorSet), mRenderer(renderer)
>+{}
>+
>+Context11::~Context11() {}
>+
>+angle::Result Context11::initialize()
> {
>+    return angle::Result::Continue;
> }
> 
>-gl::Error Context11::initialize()
>+void Context11::onDestroy(const gl::Context *context)
> {
>-    return gl::NoError();
>+    mIncompleteTextures.onDestroy(context);
> }
> 
> CompilerImpl *Context11::createCompiler()
>@@ -63,7 +146,7 @@ ShaderImpl *Context11::createShader(const gl::ShaderState &data)
> 
> ProgramImpl *Context11::createProgram(const gl::ProgramState &data)
> {
>-    return new ProgramD3D(data, mRenderer);
>+    return new Program11(data, mRenderer);
> }
> 
> FramebufferImpl *Context11::createFramebuffer(const gl::FramebufferState &data)
>@@ -73,21 +156,22 @@ FramebufferImpl *Context11::createFramebuffer(const gl::FramebufferState &data)
> 
> TextureImpl *Context11::createTexture(const gl::TextureState &state)
> {
>-    switch (state.getTarget())
>+    switch (state.getType())
>     {
>-        case GL_TEXTURE_2D:
>+        case gl::TextureType::_2D:
>             return new TextureD3D_2D(state, mRenderer);
>-        case GL_TEXTURE_CUBE_MAP:
>+        case gl::TextureType::CubeMap:
>             return new TextureD3D_Cube(state, mRenderer);
>-        case GL_TEXTURE_3D:
>+        case gl::TextureType::_3D:
>             return new TextureD3D_3D(state, mRenderer);
>-        case GL_TEXTURE_2D_ARRAY:
>+        case gl::TextureType::_2DArray:
>             return new TextureD3D_2DArray(state, mRenderer);
>-        case GL_TEXTURE_EXTERNAL_OES:
>+        case gl::TextureType::External:
>             return new TextureD3D_External(state, mRenderer);
>-        case GL_TEXTURE_2D_MULTISAMPLE:
>+        case gl::TextureType::_2DMultisample:
>             return new TextureD3D_2DMultisample(state, mRenderer);
>-            break;
>+        case gl::TextureType::_2DMultisampleArray:
>+            return new TextureD3D_2DMultisampleArray(state, mRenderer);
>         default:
>             UNREACHABLE();
>     }
>@@ -95,9 +179,9 @@ TextureImpl *Context11::createTexture(const gl::TextureState &state)
>     return nullptr;
> }
> 
>-RenderbufferImpl *Context11::createRenderbuffer()
>+RenderbufferImpl *Context11::createRenderbuffer(const gl::RenderbufferState &state)
> {
>-    return new RenderbufferD3D(mRenderer);
>+    return new RenderbufferD3D(state, mRenderer);
> }
> 
> BufferImpl *Context11::createBuffer(const gl::BufferState &state)
>@@ -112,7 +196,7 @@ VertexArrayImpl *Context11::createVertexArray(const gl::VertexArrayState &data)
>     return new VertexArray11(data);
> }
> 
>-QueryImpl *Context11::createQuery(GLenum type)
>+QueryImpl *Context11::createQuery(gl::QueryType type)
> {
>     return new Query11(mRenderer, type);
> }
>@@ -147,83 +231,166 @@ std::vector<PathImpl *> Context11::createPaths(GLsizei)
>     return std::vector<PathImpl *>();
> }
> 
>-gl::Error Context11::flush(const gl::Context *context)
>+MemoryObjectImpl *Context11::createMemoryObject()
> {
>-    return mRenderer->flush();
>+    UNREACHABLE();
>+    return nullptr;
> }
> 
>-gl::Error Context11::finish(const gl::Context *context)
>+angle::Result Context11::flush(const gl::Context *context)
> {
>-    return mRenderer->finish();
>+    return mRenderer->flush(this);
> }
> 
>-gl::Error Context11::drawArrays(const gl::Context *context, GLenum mode, GLint first, GLsizei count)
>+angle::Result Context11::finish(const gl::Context *context)
> {
>-    ANGLE_TRY(prepareForDrawCall(context, mode));
>+    return mRenderer->finish(this);
>+}
>+
>+angle::Result Context11::drawArrays(const gl::Context *context,
>+                                    gl::PrimitiveMode mode,
>+                                    GLint first,
>+                                    GLsizei count)
>+{
>+    ASSERT(count > 0);
>+    ANGLE_TRY(mRenderer->getStateManager()->updateState(
>+        context, mode, first, count, gl::DrawElementsType::InvalidEnum, nullptr, 0, 0));
>     return mRenderer->drawArrays(context, mode, first, count, 0);
> }
> 
>-gl::Error Context11::drawArraysInstanced(const gl::Context *context,
>-                                         GLenum mode,
>-                                         GLint first,
>-                                         GLsizei count,
>-                                         GLsizei instanceCount)
>+angle::Result Context11::drawArraysInstanced(const gl::Context *context,
>+                                             gl::PrimitiveMode mode,
>+                                             GLint first,
>+                                             GLsizei count,
>+                                             GLsizei instanceCount)
> {
>-    ANGLE_TRY(prepareForDrawCall(context, mode));
>+    ASSERT(count > 0);
>+    ANGLE_TRY(mRenderer->getStateManager()->updateState(
>+        context, mode, first, count, gl::DrawElementsType::InvalidEnum, nullptr, instanceCount, 0));
>     return mRenderer->drawArrays(context, mode, first, count, instanceCount);
> }
> 
>-gl::Error Context11::drawElements(const gl::Context *context,
>-                                  GLenum mode,
>-                                  GLsizei count,
>-                                  GLenum type,
>-                                  const void *indices)
>+ANGLE_INLINE angle::Result Context11::drawElementsImpl(const gl::Context *context,
>+                                                       gl::PrimitiveMode mode,
>+                                                       GLsizei indexCount,
>+                                                       gl::DrawElementsType indexType,
>+                                                       const void *indices,
>+                                                       GLsizei instanceCount)
> {
>-    ANGLE_TRY(prepareForDrawCall(context, mode));
>-    return mRenderer->drawElements(context, mode, count, type, indices, 0);
>+    ASSERT(indexCount > 0);
>+
>+    if (DrawCallHasDynamicAttribs(context))
>+    {
>+        gl::IndexRange indexRange;
>+        ANGLE_TRY(context->getState().getVertexArray()->getIndexRange(
>+            context, indexType, indexCount, indices, &indexRange));
>+        ANGLE_TRY(mRenderer->getStateManager()->updateState(
>+            context, mode, indexRange.start, indexCount, indexType, indices, instanceCount, 0));
>+        return mRenderer->drawElements(context, mode, indexRange.start, indexCount, indexType,
>+                                       indices, instanceCount);
>+    }
>+    else
>+    {
>+        ANGLE_TRY(mRenderer->getStateManager()->updateState(context, mode, 0, indexCount, indexType,
>+                                                            indices, instanceCount, 0));
>+        return mRenderer->drawElements(context, mode, 0, indexCount, indexType, indices,
>+                                       instanceCount);
>+    }
> }
> 
>-gl::Error Context11::drawElementsInstanced(const gl::Context *context,
>-                                           GLenum mode,
>-                                           GLsizei count,
>-                                           GLenum type,
>-                                           const void *indices,
>-                                           GLsizei instances)
>+angle::Result Context11::drawElements(const gl::Context *context,
>+                                      gl::PrimitiveMode mode,
>+                                      GLsizei count,
>+                                      gl::DrawElementsType type,
>+                                      const void *indices)
> {
>-    ANGLE_TRY(prepareForDrawCall(context, mode));
>-    return mRenderer->drawElements(context, mode, count, type, indices, instances);
>+    return drawElementsImpl(context, mode, count, type, indices, 0);
> }
> 
>-gl::Error Context11::drawRangeElements(const gl::Context *context,
>-                                       GLenum mode,
>-                                       GLuint start,
>-                                       GLuint end,
>-                                       GLsizei count,
>-                                       GLenum type,
>-                                       const void *indices)
>+angle::Result Context11::drawElementsInstanced(const gl::Context *context,
>+                                               gl::PrimitiveMode mode,
>+                                               GLsizei count,
>+                                               gl::DrawElementsType type,
>+                                               const void *indices,
>+                                               GLsizei instances)
> {
>-    ANGLE_TRY(prepareForDrawCall(context, mode));
>-    return mRenderer->drawElements(context, mode, count, type, indices, 0);
>+    return drawElementsImpl(context, mode, count, type, indices, instances);
> }
> 
>-gl::Error Context11::drawArraysIndirect(const gl::Context *context,
>-                                        GLenum mode,
>-                                        const void *indirect)
>+angle::Result Context11::drawRangeElements(const gl::Context *context,
>+                                           gl::PrimitiveMode mode,
>+                                           GLuint start,
>+                                           GLuint end,
>+                                           GLsizei count,
>+                                           gl::DrawElementsType type,
>+                                           const void *indices)
> {
>-    ANGLE_TRY(prepareForDrawCall(context, mode));
>-    return mRenderer->drawArraysIndirect(context, mode, indirect);
>+    return drawElementsImpl(context, mode, count, type, indices, 0);
> }
> 
>-gl::Error Context11::drawElementsIndirect(const gl::Context *context,
>-                                          GLenum mode,
>-                                          GLenum type,
>-                                          const void *indirect)
>+angle::Result Context11::drawArraysIndirect(const gl::Context *context,
>+                                            gl::PrimitiveMode mode,
>+                                            const void *indirect)
> {
>-    ANGLE_TRY(prepareForDrawCall(context, mode));
>-    return mRenderer->drawElementsIndirect(context, mode, type, indirect);
>+    if (DrawCallHasStreamingVertexArrays(context, mode))
>+    {
>+        const gl::DrawArraysIndirectCommand *cmd = nullptr;
>+        ANGLE_TRY(ReadbackIndirectBuffer(context, indirect, &cmd));
>+
>+        ANGLE_TRY(mRenderer->getStateManager()->updateState(context, mode, cmd->first, cmd->count,
>+                                                            gl::DrawElementsType::InvalidEnum,
>+                                                            nullptr, cmd->instanceCount, 0));
>+        return mRenderer->drawArrays(context, mode, cmd->first, cmd->count, cmd->instanceCount);
>+    }
>+    else
>+    {
>+        ANGLE_TRY(mRenderer->getStateManager()->updateState(
>+            context, mode, 0, 0, gl::DrawElementsType::InvalidEnum, nullptr, 0, 0));
>+        return mRenderer->drawArraysIndirect(context, indirect);
>+    }
>+}
>+
>+angle::Result Context11::drawElementsIndirect(const gl::Context *context,
>+                                              gl::PrimitiveMode mode,
>+                                              gl::DrawElementsType type,
>+                                              const void *indirect)
>+{
>+    if (DrawCallHasStreamingVertexArrays(context, mode) ||
>+        DrawCallHasStreamingElementArray(context, type))
>+    {
>+        const gl::DrawElementsIndirectCommand *cmd = nullptr;
>+        ANGLE_TRY(ReadbackIndirectBuffer(context, indirect, &cmd));
>+
>+        const GLuint typeBytes = gl::GetDrawElementsTypeSize(type);
>+        const void *indices =
>+            reinterpret_cast<const void *>(static_cast<uintptr_t>(cmd->firstIndex * typeBytes));
>+
>+        // We must explicitly resolve the index range for the slow-path indirect drawElements to
>+        // make sure we are using the correct 'baseVertex'. This parameter does not exist for the
>+        // direct drawElements.
>+        gl::IndexRange indexRange;
>+        ANGLE_TRY(context->getState().getVertexArray()->getIndexRange(context, type, cmd->count,
>+                                                                      indices, &indexRange));
>+
>+        GLint startVertex;
>+        ANGLE_TRY(ComputeStartVertex(GetImplAs<Context11>(context), indexRange, cmd->baseVertex,
>+                                     &startVertex));
>+
>+        ANGLE_TRY(mRenderer->getStateManager()->updateState(context, mode, startVertex, cmd->count,
>+                                                            type, indices, cmd->primCount,
>+                                                            cmd->baseVertex));
>+        return mRenderer->drawElements(context, mode, indexRange.start, cmd->count, type, indices,
>+                                       cmd->primCount);
>+    }
>+    else
>+    {
>+        ANGLE_TRY(
>+            mRenderer->getStateManager()->updateState(context, mode, 0, 0, type, nullptr, 0, 0));
>+        return mRenderer->drawElementsIndirect(context, indirect);
>+    }
> }
> 
>-GLenum Context11::getResetStatus()
>+gl::GraphicsResetStatus Context11::getResetStatus()
> {
>     return mRenderer->getResetStatus();
> }
>@@ -240,31 +407,30 @@ std::string Context11::getRendererDescription() const
> 
> void Context11::insertEventMarker(GLsizei length, const char *marker)
> {
>-    auto optionalString = angle::WidenString(static_cast<size_t>(length), marker);
>-    if (optionalString.valid())
>-    {
>-        mRenderer->getAnnotator()->setMarker(optionalString.value().data());
>-    }
>+    mRenderer->getAnnotator()->setMarker(marker);
> }
> 
> void Context11::pushGroupMarker(GLsizei length, const char *marker)
> {
>-    auto optionalString = angle::WidenString(static_cast<size_t>(length), marker);
>-    if (optionalString.valid())
>-    {
>-        mRenderer->getAnnotator()->beginEvent(optionalString.value().data());
>-    }
>+    mRenderer->getAnnotator()->beginEvent(marker, marker);
>+    mMarkerStack.push(std::string(marker));
> }
> 
> void Context11::popGroupMarker()
> {
>-    mRenderer->getAnnotator()->endEvent();
>+    const char *marker = nullptr;
>+    if (!mMarkerStack.empty())
>+    {
>+        marker = mMarkerStack.top().c_str();
>+        mMarkerStack.pop();
>+        mRenderer->getAnnotator()->endEvent(marker);
>+    }
> }
> 
>-void Context11::pushDebugGroup(GLenum source, GLuint id, GLsizei length, const char *message)
>+void Context11::pushDebugGroup(GLenum source, GLuint id, const std::string &message)
> {
>     // Fall through to the EXT_debug_marker functions
>-    pushGroupMarker(length, message);
>+    pushGroupMarker(message.size(), message.c_str());
> }
> 
> void Context11::popDebugGroup()
>@@ -273,9 +439,12 @@ void Context11::popDebugGroup()
>     popGroupMarker();
> }
> 
>-void Context11::syncState(const gl::Context *context, const gl::State::DirtyBits &dirtyBits)
>+angle::Result Context11::syncState(const gl::Context *context,
>+                                   const gl::State::DirtyBits &dirtyBits,
>+                                   const gl::State::DirtyBits &bitMask)
> {
>     mRenderer->getStateManager()->syncState(context, dirtyBits);
>+    return angle::Result::Continue;
> }
> 
> GLint Context11::getGPUDisjoint()
>@@ -288,14 +457,35 @@ GLint64 Context11::getTimestamp()
>     return mRenderer->getTimestamp();
> }
> 
>-void Context11::onMakeCurrent(const gl::Context *context)
>+angle::Result Context11::onMakeCurrent(const gl::Context *context)
> {
>-    ANGLE_SWALLOW_ERR(mRenderer->getStateManager()->onMakeCurrent(context));
>+    return mRenderer->getStateManager()->onMakeCurrent(context);
> }
> 
>-const gl::Caps &Context11::getNativeCaps() const
>+gl::Caps Context11::getNativeCaps() const
> {
>-    return mRenderer->getNativeCaps();
>+    gl::Caps caps = mRenderer->getNativeCaps();
>+
>+    // For pixel shaders, the render targets and unordered access views share the same resource
>+    // slots, so the maximum number of fragment shader outputs depends on the current context
>+    // version:
>+    // - If current context is ES 3.0 and below, we use D3D11_SIMULTANEOUS_RENDER_TARGET_COUNT(8)
>+    //   as the value of max draw buffers because UAVs are not used.
>+    // - If current context is ES 3.1 and the feature level is 11_0, the RTVs and UAVs share 8
>+    //   slots. As ES 3.1 requires at least 1 atomic counter buffer in compute shaders, the value
>+    //   of max combined shader output resources is limited to 7, thus only 7 RTV slots can be
>+    //   used simultaneously.
>+    // - If current context is ES 3.1 and the feature level is 11_1, the RTVs and UAVs share 64
>+    //   slots. Currently we allocate 60 slots for combined shader output resources, so we can use
>+    //   at most D3D11_SIMULTANEOUS_RENDER_TARGET_COUNT(8) RTVs simultaneously.
>+    if (mState.getClientVersion() >= gl::ES_3_1 &&
>+        mRenderer->getRenderer11DeviceCaps().featureLevel == D3D_FEATURE_LEVEL_11_0)
>+    {
>+        caps.maxDrawBuffers      = caps.maxCombinedShaderOutputResources;
>+        caps.maxColorAttachments = caps.maxCombinedShaderOutputResources;
>+    }
>+
>+    return caps;
> }
> 
> const gl::TextureCapsMap &Context11::getNativeTextureCaps() const
>@@ -313,18 +503,23 @@ const gl::Limitations &Context11::getNativeLimitations() const
>     return mRenderer->getNativeLimitations();
> }
> 
>-gl::Error Context11::dispatchCompute(const gl::Context *context,
>-                                     GLuint numGroupsX,
>-                                     GLuint numGroupsY,
>-                                     GLuint numGroupsZ)
>+angle::Result Context11::dispatchCompute(const gl::Context *context,
>+                                         GLuint numGroupsX,
>+                                         GLuint numGroupsY,
>+                                         GLuint numGroupsZ)
> {
>     return mRenderer->dispatchCompute(context, numGroupsX, numGroupsY, numGroupsZ);
> }
> 
>-gl::Error Context11::triggerDrawCallProgramRecompilation(const gl::Context *context,
>-                                                         GLenum drawMode)
>+angle::Result Context11::dispatchComputeIndirect(const gl::Context *context, GLintptr indirect)
> {
>-    const auto &glState    = context->getGLState();
>+    return mRenderer->dispatchComputeIndirect(context, indirect);
>+}
>+
>+angle::Result Context11::triggerDrawCallProgramRecompilation(const gl::Context *context,
>+                                                             gl::PrimitiveMode drawMode)
>+{
>+    const auto &glState    = context->getState();
>     const auto *va11       = GetImplAs<VertexArray11>(glState.getVertexArray());
>     const auto *drawFBO    = glState.getDrawFramebuffer();
>     gl::Program *program   = glState.getProgram();
>@@ -334,56 +529,53 @@ gl::Error Context11::triggerDrawCallProgramRecompilation(const gl::Context *cont
>     programD3D->updateCachedOutputLayout(context, drawFBO);
> 
>     bool recompileVS = !programD3D->hasVertexExecutableForCachedInputLayout();
>-    bool recompileGS = !programD3D->hasGeometryExecutableForPrimitiveType(drawMode);
>+    bool recompileGS = !programD3D->hasGeometryExecutableForPrimitiveType(glState, drawMode);
>     bool recompilePS = !programD3D->hasPixelExecutableForCachedOutputLayout();
> 
>     if (!recompileVS && !recompileGS && !recompilePS)
>     {
>-        return gl::NoError();
>+        return angle::Result::Continue;
>     }
> 
>     // Load the compiler if necessary and recompile the programs.
>-    ANGLE_TRY(mRenderer->ensureHLSLCompilerInitialized());
>+    ANGLE_TRY(mRenderer->ensureHLSLCompilerInitialized(this));
> 
>     gl::InfoLog infoLog;
> 
>     if (recompileVS)
>     {
>         ShaderExecutableD3D *vertexExe = nullptr;
>-        ANGLE_TRY(programD3D->getVertexExecutableForCachedInputLayout(&vertexExe, &infoLog));
>+        ANGLE_TRY(programD3D->getVertexExecutableForCachedInputLayout(this, &vertexExe, &infoLog));
>         if (!programD3D->hasVertexExecutableForCachedInputLayout())
>         {
>             ASSERT(infoLog.getLength() > 0);
>-            ERR() << "Dynamic recompilation error log: " << infoLog.str();
>-            return gl::InternalError()
>-                   << "Error compiling dynamic vertex executable:" << infoLog.str();
>+            ERR() << "Error compiling dynamic vertex executable: " << infoLog.str();
>+            ANGLE_TRY_HR(this, E_FAIL, "Error compiling dynamic vertex executable");
>         }
>     }
> 
>     if (recompileGS)
>     {
>         ShaderExecutableD3D *geometryExe = nullptr;
>-        ANGLE_TRY(programD3D->getGeometryExecutableForPrimitiveType(context, drawMode, &geometryExe,
>-                                                                    &infoLog));
>-        if (!programD3D->hasGeometryExecutableForPrimitiveType(drawMode))
>+        ANGLE_TRY(programD3D->getGeometryExecutableForPrimitiveType(this, glState, drawMode,
>+                                                                    &geometryExe, &infoLog));
>+        if (!programD3D->hasGeometryExecutableForPrimitiveType(glState, drawMode))
>         {
>             ASSERT(infoLog.getLength() > 0);
>-            ERR() << "Dynamic recompilation error log: " << infoLog.str();
>-            return gl::InternalError()
>-                   << "Error compiling dynamic geometry executable:" << infoLog.str();
>+            ERR() << "Error compiling dynamic geometry executable: " << infoLog.str();
>+            ANGLE_TRY_HR(this, E_FAIL, "Error compiling dynamic geometry executable");
>         }
>     }
> 
>     if (recompilePS)
>     {
>         ShaderExecutableD3D *pixelExe = nullptr;
>-        ANGLE_TRY(programD3D->getPixelExecutableForCachedOutputLayout(&pixelExe, &infoLog));
>+        ANGLE_TRY(programD3D->getPixelExecutableForCachedOutputLayout(this, &pixelExe, &infoLog));
>         if (!programD3D->hasPixelExecutableForCachedOutputLayout())
>         {
>             ASSERT(infoLog.getLength() > 0);
>-            ERR() << "Dynamic recompilation error log: " << infoLog.str();
>-            return gl::InternalError()
>-                   << "Error compiling dynamic pixel executable:" << infoLog.str();
>+            ERR() << "Error compiling dynamic pixel executable: " << infoLog.str();
>+            ANGLE_TRY_HR(this, E_FAIL, "Error compiling dynamic pixel executable");
>         }
>     }
> 
>@@ -393,13 +585,94 @@ gl::Error Context11::triggerDrawCallProgramRecompilation(const gl::Context *cont
>         mMemoryProgramCache->updateProgram(context, program);
>     }
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
>+}
>+
>+angle::Result Context11::triggerDispatchCallProgramRecompilation(const gl::Context *context)
>+{
>+    const auto &glState    = context->getState();
>+    gl::Program *program   = glState.getProgram();
>+    ProgramD3D *programD3D = GetImplAs<ProgramD3D>(program);
>+
>+    programD3D->updateCachedComputeImage2DBindLayout(context);
>+
>+    bool recompileCS = !programD3D->hasComputeExecutableForCachedImage2DBindLayout();
>+
>+    if (!recompileCS)
>+    {
>+        return angle::Result::Continue;
>+    }
>+
>+    // Load the compiler if necessary and recompile the programs.
>+    ANGLE_TRY(mRenderer->ensureHLSLCompilerInitialized(this));
>+
>+    gl::InfoLog infoLog;
>+
>+    ShaderExecutableD3D *computeExe = nullptr;
>+    ANGLE_TRY(programD3D->getComputeExecutableForImage2DBindLayout(this, &computeExe, &infoLog));
>+    if (!programD3D->hasComputeExecutableForCachedImage2DBindLayout())
>+    {
>+        ASSERT(infoLog.getLength() > 0);
>+        ERR() << "Dynamic recompilation error log: " << infoLog.str();
>+        ANGLE_TRY_HR(this, E_FAIL, "Error compiling dynamic compute executable");
>+    }
>+
>+    // Refresh the program cache entry.
>+    if (mMemoryProgramCache)
>+    {
>+        mMemoryProgramCache->updateProgram(context, program);
>+    }
>+
>+    return angle::Result::Continue;
> }
> 
>-gl::Error Context11::prepareForDrawCall(const gl::Context *context, GLenum drawMode)
>+angle::Result Context11::memoryBarrier(const gl::Context *context, GLbitfield barriers)
> {
>-    ANGLE_TRY(mRenderer->getStateManager()->updateState(context, drawMode));
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>+angle::Result Context11::memoryBarrierByRegion(const gl::Context *context, GLbitfield barriers)
>+{
>+    return angle::Result::Continue;
>+}
>+
>+angle::Result Context11::getIncompleteTexture(const gl::Context *context,
>+                                              gl::TextureType type,
>+                                              gl::Texture **textureOut)
>+{
>+    return mIncompleteTextures.getIncompleteTexture(context, type, this, textureOut);
>+}
>+
>+angle::Result Context11::initializeMultisampleTextureToBlack(const gl::Context *context,
>+                                                             gl::Texture *glTexture)
>+{
>+    ASSERT(glTexture->getType() == gl::TextureType::_2DMultisample);
>+    TextureD3D *textureD3D        = GetImplAs<TextureD3D>(glTexture);
>+    gl::ImageIndex index          = gl::ImageIndex::Make2DMultisample();
>+    RenderTargetD3D *renderTarget = nullptr;
>+    ANGLE_TRY(textureD3D->getRenderTarget(context, index, &renderTarget));
>+    return mRenderer->clearRenderTarget(context, renderTarget, gl::ColorF(0.0f, 0.0f, 0.0f, 1.0f),
>+                                        1.0f, 0);
>+}
>+
>+void Context11::handleResult(HRESULT hr,
>+                             const char *message,
>+                             const char *file,
>+                             const char *function,
>+                             unsigned int line)
>+{
>+    ASSERT(FAILED(hr));
>+
>+    if (d3d11::isDeviceLostError(hr))
>+    {
>+        mRenderer->notifyDeviceLost();
>+    }
>+
>+    GLenum glErrorCode = DefaultGLErrorCode(hr);
>+
>+    std::stringstream errorStream;
>+    errorStream << "Internal D3D11 error: " << gl::FmtHR(hr) << ": " << message;
>+
>+    mErrors->handleError(glErrorCode, errorStream.str().c_str(), file, function, line);
>+}
> }  // namespace rx
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/Context11.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/Context11.h
>index dd99111b193..02570e67b3c 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/Context11.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/Context11.h
>@@ -10,19 +10,22 @@
> #ifndef LIBANGLE_RENDERER_D3D_D3D11_CONTEXT11_H_
> #define LIBANGLE_RENDERER_D3D_D3D11_CONTEXT11_H_
> 
>+#include <stack>
> #include "libANGLE/renderer/ContextImpl.h"
>+#include "libANGLE/renderer/d3d/ContextD3D.h"
> 
> namespace rx
> {
> class Renderer11;
> 
>-class Context11 : public ContextImpl
>+class Context11 : public ContextD3D, public MultisampleTextureInitializer
> {
>   public:
>-    Context11(const gl::ContextState &state, Renderer11 *renderer);
>+    Context11(const gl::State &state, gl::ErrorSet *errorSet, Renderer11 *renderer);
>     ~Context11() override;
> 
>-    gl::Error initialize() override;
>+    angle::Result initialize() override;
>+    void onDestroy(const gl::Context *context) override;
> 
>     // Shader creation
>     CompilerImpl *createCompiler() override;
>@@ -36,7 +39,7 @@ class Context11 : public ContextImpl
>     TextureImpl *createTexture(const gl::TextureState &state) override;
> 
>     // Renderbuffer creation
>-    RenderbufferImpl *createRenderbuffer() override;
>+    RenderbufferImpl *createRenderbuffer(const gl::RenderbufferState &state) override;
> 
>     // Buffer creation
>     BufferImpl *createBuffer(const gl::BufferState &state) override;
>@@ -45,7 +48,7 @@ class Context11 : public ContextImpl
>     VertexArrayImpl *createVertexArray(const gl::VertexArrayState &data) override;
> 
>     // Query and Fence creation
>-    QueryImpl *createQuery(GLenum type) override;
>+    QueryImpl *createQuery(gl::QueryType type) override;
>     FenceNVImpl *createFenceNV() override;
>     SyncImpl *createSync() override;
> 
>@@ -62,49 +65,52 @@ class Context11 : public ContextImpl
>     // Path object creation.
>     std::vector<PathImpl *> createPaths(GLsizei) override;
> 
>+    // Memory object creation.
>+    MemoryObjectImpl *createMemoryObject() override;
>+
>     // Flush and finish.
>-    gl::Error flush(const gl::Context *context) override;
>-    gl::Error finish(const gl::Context *context) override;
>+    angle::Result flush(const gl::Context *context) override;
>+    angle::Result finish(const gl::Context *context) override;
> 
>     // Drawing methods.
>-    gl::Error drawArrays(const gl::Context *context,
>-                         GLenum mode,
>-                         GLint first,
>-                         GLsizei count) override;
>-    gl::Error drawArraysInstanced(const gl::Context *context,
>-                                  GLenum mode,
>-                                  GLint first,
>-                                  GLsizei count,
>-                                  GLsizei instanceCount) override;
>-
>-    gl::Error drawElements(const gl::Context *context,
>-                           GLenum mode,
>-                           GLsizei count,
>-                           GLenum type,
>-                           const void *indices) override;
>-    gl::Error drawElementsInstanced(const gl::Context *context,
>-                                    GLenum mode,
>+    angle::Result drawArrays(const gl::Context *context,
>+                             gl::PrimitiveMode mode,
>+                             GLint first,
>+                             GLsizei count) override;
>+    angle::Result drawArraysInstanced(const gl::Context *context,
>+                                      gl::PrimitiveMode mode,
>+                                      GLint first,
>+                                      GLsizei count,
>+                                      GLsizei instanceCount) override;
>+
>+    angle::Result drawElements(const gl::Context *context,
>+                               gl::PrimitiveMode mode,
>+                               GLsizei count,
>+                               gl::DrawElementsType type,
>+                               const void *indices) override;
>+    angle::Result drawElementsInstanced(const gl::Context *context,
>+                                        gl::PrimitiveMode mode,
>+                                        GLsizei count,
>+                                        gl::DrawElementsType type,
>+                                        const void *indices,
>+                                        GLsizei instances) override;
>+    angle::Result drawRangeElements(const gl::Context *context,
>+                                    gl::PrimitiveMode mode,
>+                                    GLuint start,
>+                                    GLuint end,
>                                     GLsizei count,
>-                                    GLenum type,
>-                                    const void *indices,
>-                                    GLsizei instances) override;
>-    gl::Error drawRangeElements(const gl::Context *context,
>-                                GLenum mode,
>-                                GLuint start,
>-                                GLuint end,
>-                                GLsizei count,
>-                                GLenum type,
>-                                const void *indices) override;
>-    gl::Error drawArraysIndirect(const gl::Context *context,
>-                                 GLenum mode,
>-                                 const void *indirect) override;
>-    gl::Error drawElementsIndirect(const gl::Context *context,
>-                                   GLenum mode,
>-                                   GLenum type,
>-                                   const void *indirect) override;
>+                                    gl::DrawElementsType type,
>+                                    const void *indices) override;
>+    angle::Result drawArraysIndirect(const gl::Context *context,
>+                                     gl::PrimitiveMode mode,
>+                                     const void *indirect) override;
>+    angle::Result drawElementsIndirect(const gl::Context *context,
>+                                       gl::PrimitiveMode mode,
>+                                       gl::DrawElementsType type,
>+                                       const void *indirect) override;
> 
>     // Device loss
>-    GLenum getResetStatus() override;
>+    gl::GraphicsResetStatus getResetStatus() override;
> 
>     // Vendor and description strings.
>     std::string getVendorString() const override;
>@@ -116,40 +122,66 @@ class Context11 : public ContextImpl
>     void popGroupMarker() override;
> 
>     // KHR_debug
>-    void pushDebugGroup(GLenum source, GLuint id, GLsizei length, const char *message) override;
>+    void pushDebugGroup(GLenum source, GLuint id, const std::string &message) override;
>     void popDebugGroup() override;
> 
>     // State sync with dirty bits.
>-    void syncState(const gl::Context *context, const gl::State::DirtyBits &dirtyBits) override;
>+    angle::Result syncState(const gl::Context *context,
>+                            const gl::State::DirtyBits &dirtyBits,
>+                            const gl::State::DirtyBits &bitMask) override;
> 
>     // Disjoint timer queries
>     GLint getGPUDisjoint() override;
>     GLint64 getTimestamp() override;
> 
>     // Context switching
>-    void onMakeCurrent(const gl::Context *context) override;
>+    angle::Result onMakeCurrent(const gl::Context *context) override;
> 
>     // Caps queries
>-    const gl::Caps &getNativeCaps() const override;
>+    gl::Caps getNativeCaps() const override;
>     const gl::TextureCapsMap &getNativeTextureCaps() const override;
>     const gl::Extensions &getNativeExtensions() const override;
>     const gl::Limitations &getNativeLimitations() const override;
> 
>     Renderer11 *getRenderer() const { return mRenderer; }
> 
>-    gl::Error dispatchCompute(const gl::Context *context,
>-                              GLuint numGroupsX,
>-                              GLuint numGroupsY,
>-                              GLuint numGroupsZ) override;
>+    angle::Result dispatchCompute(const gl::Context *context,
>+                                  GLuint numGroupsX,
>+                                  GLuint numGroupsY,
>+                                  GLuint numGroupsZ) override;
>+    angle::Result dispatchComputeIndirect(const gl::Context *context, GLintptr indirect) override;
>+
>+    angle::Result memoryBarrier(const gl::Context *context, GLbitfield barriers) override;
>+    angle::Result memoryBarrierByRegion(const gl::Context *context, GLbitfield barriers) override;
>+
>+    angle::Result triggerDrawCallProgramRecompilation(const gl::Context *context,
>+                                                      gl::PrimitiveMode drawMode);
>+    angle::Result triggerDispatchCallProgramRecompilation(const gl::Context *context);
>+    angle::Result getIncompleteTexture(const gl::Context *context,
>+                                       gl::TextureType type,
>+                                       gl::Texture **textureOut);
> 
>-    gl::Error triggerDrawCallProgramRecompilation(const gl::Context *context, GLenum drawMode);
>+    angle::Result initializeMultisampleTextureToBlack(const gl::Context *context,
>+                                                      gl::Texture *glTexture) override;
>+
>+    void handleResult(HRESULT hr,
>+                      const char *message,
>+                      const char *file,
>+                      const char *function,
>+                      unsigned int line) override;
> 
>   private:
>-    gl::Error prepareForDrawCall(const gl::Context *context, GLenum drawMode);
>+    angle::Result drawElementsImpl(const gl::Context *context,
>+                                   gl::PrimitiveMode mode,
>+                                   GLsizei indexCount,
>+                                   gl::DrawElementsType indexType,
>+                                   const void *indices,
>+                                   GLsizei instanceCount);
> 
>     Renderer11 *mRenderer;
>+    IncompleteTextureSet mIncompleteTextures;
>+    std::stack<std::string> mMarkerStack;
> };
>-
> }  // namespace rx
> 
> #endif  // LIBANGLE_RENDERER_D3D_D3D11_CONTEXT11_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/DebugAnnotator11.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/DebugAnnotator11.cpp
>index 1e70363e119..f80a307964f 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/DebugAnnotator11.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/DebugAnnotator11.cpp
>@@ -8,112 +8,75 @@
> 
> #include "libANGLE/renderer/d3d/d3d11/DebugAnnotator11.h"
> 
>-#include "common/debug.h"
> #include "libANGLE/renderer/d3d/d3d11/renderer11_utils.h"
> 
>+#include <VersionHelpers.h>
>+
> namespace rx
> {
> 
>-DebugAnnotator11::DebugAnnotator11()
>-    : mInitialized(false),
>-      mD3d11Module(nullptr),
>-      mUserDefinedAnnotation(nullptr)
>-{
>-    // D3D11 devices can't be created during DllMain.
>-    // We defer device creation until the object is actually used.
>-}
>-
>-DebugAnnotator11::~DebugAnnotator11()
>-{
>-    if (mInitialized)
>-    {
>-        SafeRelease(mUserDefinedAnnotation);
>+DebugAnnotator11::DebugAnnotator11() {}
> 
>-#if !defined(ANGLE_ENABLE_WINDOWS_STORE)
>-        FreeLibrary(mD3d11Module);
>-#endif // !ANGLE_ENABLE_WINDOWS_STORE
>-    }
>-}
>+DebugAnnotator11::~DebugAnnotator11() {}
> 
>-void DebugAnnotator11::beginEvent(const wchar_t *eventName)
>+void DebugAnnotator11::beginEvent(const char *eventName, const char *eventMessage)
> {
>-    initializeDevice();
>-
>+    angle::LoggingAnnotator::beginEvent(eventName, eventMessage);
>     if (mUserDefinedAnnotation != nullptr)
>     {
>-        mUserDefinedAnnotation->BeginEvent(eventName);
>+        std::mbstate_t state = std::mbstate_t();
>+        std::mbsrtowcs(mWCharMessage, &eventMessage, kMaxMessageLength, &state);
>+        mUserDefinedAnnotation->BeginEvent(mWCharMessage);
>     }
> }
> 
>-void DebugAnnotator11::endEvent()
>+void DebugAnnotator11::endEvent(const char *eventName)
> {
>-    initializeDevice();
>-
>+    angle::LoggingAnnotator::endEvent(eventName);
>     if (mUserDefinedAnnotation != nullptr)
>     {
>         mUserDefinedAnnotation->EndEvent();
>     }
> }
> 
>-void DebugAnnotator11::setMarker(const wchar_t *markerName)
>+void DebugAnnotator11::setMarker(const char *markerName)
> {
>-    initializeDevice();
>-
>+    angle::LoggingAnnotator::setMarker(markerName);
>     if (mUserDefinedAnnotation != nullptr)
>     {
>-        mUserDefinedAnnotation->SetMarker(markerName);
>+        std::mbstate_t state = std::mbstate_t();
>+        std::mbsrtowcs(mWCharMessage, &markerName, kMaxMessageLength, &state);
>+        mUserDefinedAnnotation->SetMarker(mWCharMessage);
>     }
> }
> 
> bool DebugAnnotator11::getStatus()
> {
>-#if defined(ANGLE_ENABLE_WINDOWS_STORE)
>-    static_assert(NTDDI_VERSION >= NTDDI_WIN10, "GetStatus only works on Win10 and above");
>-    initializeDevice();
>-
>     if (mUserDefinedAnnotation != nullptr)
>     {
>         return !!(mUserDefinedAnnotation->GetStatus());
>     }
> 
>-    return true;  // Default if initializeDevice() failed
>-#else
>-    // We can't detect GetStatus() on desktop ANGLE builds so always return true.
>-    return true;
>-#endif  // ANGLE_ENABLE_WINDOWS_STORE
>+    return false;
> }
> 
>-void DebugAnnotator11::initializeDevice()
>+void DebugAnnotator11::initialize(ID3D11DeviceContext *context)
> {
>-    if (!mInitialized)
>+    // ID3DUserDefinedAnnotation.GetStatus only works on Windows10 or greater.
>+    // Returning true unconditionally from DebugAnnotator11::getStatus() means
>+    // writing out all compiled shaders to temporary files even if debugging
>+    // tools are not attached. See rx::ShaderD3D::prepareSourceAndReturnOptions.
>+    // If you want debug annotations, you must use Windows 10.
>+    if (IsWindows10OrGreater())
>     {
>-#if !defined(ANGLE_ENABLE_WINDOWS_STORE)
>-        mD3d11Module = LoadLibrary(TEXT("d3d11.dll"));
>-        ASSERT(mD3d11Module);
>-
>-        PFN_D3D11_CREATE_DEVICE D3D11CreateDevice = (PFN_D3D11_CREATE_DEVICE)GetProcAddress(mD3d11Module, "D3D11CreateDevice");
>-        ASSERT(D3D11CreateDevice != nullptr);
>-#endif // !ANGLE_ENABLE_WINDOWS_STORE
>-
>-        ID3D11Device *device = nullptr;
>-        ID3D11DeviceContext *context = nullptr;
>-
>-        HRESULT hr = E_FAIL;
>-
>-        // Create a D3D_DRIVER_TYPE_NULL device, which is much cheaper than other types of device.
>-        hr = D3D11CreateDevice(nullptr, D3D_DRIVER_TYPE_NULL, nullptr, 0, nullptr, 0,
>-                               D3D11_SDK_VERSION, &device, nullptr, &context);
>-        ASSERT(SUCCEEDED(hr));
>-        if (SUCCEEDED(hr))
>-        {
>-            mUserDefinedAnnotation = d3d11::DynamicCastComObject<ID3DUserDefinedAnnotation>(context);
>-            ASSERT(mUserDefinedAnnotation != nullptr);
>-            mInitialized = true;
>-        }
>-
>-        SafeRelease(device);
>-        SafeRelease(context);
>+        mUserDefinedAnnotation.Attach(
>+            d3d11::DynamicCastComObject<ID3DUserDefinedAnnotation>(context));
>     }
> }
> 
>+void DebugAnnotator11::release()
>+{
>+    mUserDefinedAnnotation.Reset();
> }
>+
>+}  // namespace rx
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/DebugAnnotator11.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/DebugAnnotator11.h
>index 62662c49ae9..c4650c27d0e 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/DebugAnnotator11.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/DebugAnnotator11.h
>@@ -19,19 +19,19 @@ class DebugAnnotator11 : public angle::LoggingAnnotator
>   public:
>     DebugAnnotator11();
>     ~DebugAnnotator11() override;
>-    void beginEvent(const wchar_t *eventName) override;
>-    void endEvent() override;
>-    void setMarker(const wchar_t *markerName) override;
>+    void initialize(ID3D11DeviceContext *context);
>+    void release();
>+    void beginEvent(const char *eventName, const char *eventMessage) override;
>+    void endEvent(const char *eventName) override;
>+    void setMarker(const char *markerName) override;
>     bool getStatus() override;
> 
>   private:
>-    void initializeDevice();
>-
>-    bool mInitialized;
>-    HMODULE mD3d11Module;
>-    ID3DUserDefinedAnnotation *mUserDefinedAnnotation;
>+    angle::ComPtr<ID3DUserDefinedAnnotation> mUserDefinedAnnotation;
>+    static constexpr size_t kMaxMessageLength = 256;
>+    wchar_t mWCharMessage[kMaxMessageLength];
> };
> 
>-}
>+}  // namespace rx
> 
>-#endif // LIBANGLE_RENDERER_D3D_D3D11_DEBUGANNOTATOR11_H_
>+#endif  // LIBANGLE_RENDERER_D3D_D3D11_DEBUGANNOTATOR11_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/Fence11.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/Fence11.cpp
>index 082f28d7943..0926b4a1859 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/Fence11.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/Fence11.cpp
>@@ -8,21 +8,21 @@
> // rx::FenceNVImpl and rx::SyncImpl.
> 
> #include "libANGLE/renderer/d3d/d3d11/Fence11.h"
>-#include "libANGLE/renderer/d3d/d3d11/Renderer11.h"
> 
> #include "common/utilities.h"
>+#include "libANGLE/Context.h"
>+#include "libANGLE/renderer/d3d/d3d11/Context11.h"
>+#include "libANGLE/renderer/d3d/d3d11/Renderer11.h"
> 
> namespace rx
> {
> 
>-static const int kDeviceLostCheckPeriod = 64;
>-
> //
> // Template helpers for set and test operations.
> //
> 
> template <class FenceClass>
>-gl::Error FenceSetHelper(FenceClass *fence)
>+angle::Result FenceSetHelper(const gl::Context *context, FenceClass *fence)
> {
>     if (!fence->mQuery)
>     {
>@@ -30,60 +30,57 @@ gl::Error FenceSetHelper(FenceClass *fence)
>         queryDesc.Query     = D3D11_QUERY_EVENT;
>         queryDesc.MiscFlags = 0;
> 
>+        Context11 *context11 = GetImplAs<Context11>(context);
>         HRESULT result = fence->mRenderer->getDevice()->CreateQuery(&queryDesc, &fence->mQuery);
>-        if (FAILED(result))
>-        {
>-            return gl::OutOfMemory() << "Failed to create event query, " << gl::FmtHR(result);
>-        }
>+        ANGLE_TRY_HR(context11, result, "Failed to create event query");
>     }
> 
>     fence->mRenderer->getDeviceContext()->End(fence->mQuery);
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
> template <class FenceClass>
>-gl::Error FenceTestHelper(FenceClass *fence, bool flushCommandBuffer, GLboolean *outFinished)
>+angle::Result FenceTestHelper(const gl::Context *context,
>+                              FenceClass *fence,
>+                              bool flushCommandBuffer,
>+                              GLboolean *outFinished)
> {
>     ASSERT(fence->mQuery);
> 
>     UINT getDataFlags = (flushCommandBuffer ? 0 : D3D11_ASYNC_GETDATA_DONOTFLUSH);
>+
>+    Context11 *context11 = GetImplAs<Context11>(context);
>     HRESULT result =
>         fence->mRenderer->getDeviceContext()->GetData(fence->mQuery, nullptr, 0, getDataFlags);
>-
>-    if (FAILED(result))
>-    {
>-        return gl::OutOfMemory() << "Failed to get query data, " << gl::FmtHR(result);
>-    }
>+    ANGLE_TRY_HR(context11, result, "Failed to get query data");
> 
>     ASSERT(result == S_OK || result == S_FALSE);
>     *outFinished = ((result == S_OK) ? GL_TRUE : GL_FALSE);
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
> //
> // FenceNV11
> //
> 
>-FenceNV11::FenceNV11(Renderer11 *renderer) : FenceNVImpl(), mRenderer(renderer), mQuery(nullptr)
>-{
>-}
>+FenceNV11::FenceNV11(Renderer11 *renderer) : FenceNVImpl(), mRenderer(renderer), mQuery(nullptr) {}
> 
> FenceNV11::~FenceNV11()
> {
>     SafeRelease(mQuery);
> }
> 
>-gl::Error FenceNV11::set(GLenum condition)
>+angle::Result FenceNV11::set(const gl::Context *context, GLenum condition)
> {
>-    return FenceSetHelper(this);
>+    return FenceSetHelper(context, this);
> }
> 
>-gl::Error FenceNV11::test(GLboolean *outFinished)
>+angle::Result FenceNV11::test(const gl::Context *context, GLboolean *outFinished)
> {
>-    return FenceTestHelper(this, true, outFinished);
>+    return FenceTestHelper(context, this, true, outFinished);
> }
> 
>-gl::Error FenceNV11::finish()
>+angle::Result FenceNV11::finish(const gl::Context *context)
> {
>     GLboolean finished = GL_FALSE;
> 
>@@ -91,17 +88,19 @@ gl::Error FenceNV11::finish()
>     while (finished != GL_TRUE)
>     {
>         loopCount++;
>-        ANGLE_TRY(FenceTestHelper(this, true, &finished));
>+        ANGLE_TRY(FenceTestHelper(context, this, true, &finished));
> 
>-        if (loopCount % kDeviceLostCheckPeriod == 0 && mRenderer->testDeviceLost())
>+        bool checkDeviceLost = (loopCount % kPollingD3DDeviceLostCheckFrequency) == 0;
>+        if (checkDeviceLost && mRenderer->testDeviceLost())
>         {
>-            return gl::OutOfMemory() << "Device was lost while querying result of an event query.";
>+            ANGLE_TRY_HR(GetImplAs<Context11>(context), DXGI_ERROR_DRIVER_INTERNAL_ERROR,
>+                         "Device was lost while querying result of an event query.");
>         }
> 
>         ScheduleYield();
>     }
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
> //
>@@ -133,36 +132,36 @@ Sync11::~Sync11()
>     SafeRelease(mQuery);
> }
> 
>-gl::Error Sync11::set(GLenum condition, GLbitfield flags)
>+angle::Result Sync11::set(const gl::Context *context, GLenum condition, GLbitfield flags)
> {
>     ASSERT(condition == GL_SYNC_GPU_COMMANDS_COMPLETE && flags == 0);
>-    return FenceSetHelper(this);
>+    return FenceSetHelper(context, this);
> }
> 
>-gl::Error Sync11::clientWait(GLbitfield flags, GLuint64 timeout, GLenum *outResult)
>+angle::Result Sync11::clientWait(const gl::Context *context,
>+                                 GLbitfield flags,
>+                                 GLuint64 timeout,
>+                                 GLenum *outResult)
> {
>     ASSERT(outResult);
> 
>     bool flushCommandBuffer = ((flags & GL_SYNC_FLUSH_COMMANDS_BIT) != 0);
> 
>+    *outResult = GL_WAIT_FAILED;
>+
>     GLboolean result = GL_FALSE;
>-    gl::Error error  = FenceTestHelper(this, flushCommandBuffer, &result);
>-    if (error.isError())
>-    {
>-        *outResult = GL_WAIT_FAILED;
>-        return error;
>-    }
>+    ANGLE_TRY(FenceTestHelper(context, this, flushCommandBuffer, &result));
> 
>     if (result == GL_TRUE)
>     {
>         *outResult = GL_ALREADY_SIGNALED;
>-        return gl::NoError();
>+        return angle::Result::Continue;
>     }
> 
>     if (timeout == 0)
>     {
>         *outResult = GL_TIMEOUT_EXPIRED;
>-        return gl::NoError();
>+        return angle::Result::Continue;
>     }
> 
>     LARGE_INTEGER currentCounter = {};
>@@ -186,17 +185,16 @@ gl::Error Sync11::clientWait(GLbitfield flags, GLuint64 timeout, GLenum *outResu
>         success = QueryPerformanceCounter(&currentCounter);
>         ASSERT(success);
> 
>-        error = FenceTestHelper(this, flushCommandBuffer, &result);
>-        if (error.isError())
>-        {
>-            *outResult = GL_WAIT_FAILED;
>-            return error;
>-        }
>+        *outResult = GL_WAIT_FAILED;
>+
>+        ANGLE_TRY(FenceTestHelper(context, this, flushCommandBuffer, &result));
> 
>-        if ((loopCount % kDeviceLostCheckPeriod) == 0 && mRenderer->testDeviceLost())
>+        bool checkDeviceLost = (loopCount % kPollingD3DDeviceLostCheckFrequency) == 0;
>+        if (checkDeviceLost && mRenderer->testDeviceLost())
>         {
>             *outResult = GL_WAIT_FAILED;
>-            return gl::OutOfMemory() << "Device was lost while querying result of an event query.";
>+            ANGLE_TRY_HR(GetImplAs<Context11>(context), DXGI_ERROR_DRIVER_INTERNAL_ERROR,
>+                         "Device was lost while querying result of an event query.");
>         }
>     }
> 
>@@ -209,32 +207,28 @@ gl::Error Sync11::clientWait(GLbitfield flags, GLuint64 timeout, GLenum *outResu
>         *outResult = GL_CONDITION_SATISFIED;
>     }
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error Sync11::serverWait(GLbitfield flags, GLuint64 timeout)
>+angle::Result Sync11::serverWait(const gl::Context *context, GLbitfield flags, GLuint64 timeout)
> {
>     // Because our API is currently designed to be called from a single thread, we don't need to do
>     // extra work for a server-side fence. GPU commands issued after the fence is created will
>     // always be processed after the fence is signaled.
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error Sync11::getStatus(GLint *outResult)
>+angle::Result Sync11::getStatus(const gl::Context *context, GLint *outResult)
> {
>     GLboolean result = GL_FALSE;
>-    gl::Error error  = FenceTestHelper(this, false, &result);
>-    if (error.isError())
>-    {
>-        // The spec does not specify any way to report errors during the status test (e.g. device
>-        // lost) so we report the fence is unblocked in case of error or signaled.
>-        *outResult = GL_SIGNALED;
> 
>-        return error;
>-    }
>+    // The spec does not specify any way to report errors during the status test (e.g. device
>+    // lost) so we report the fence is unblocked in case of error or signaled.
>+    *outResult = GL_SIGNALED;
>+    ANGLE_TRY(FenceTestHelper(context, this, false, &result));
> 
>     *outResult = (result ? GL_SIGNALED : GL_UNSIGNALED);
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
> }  // namespace rx
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/Fence11.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/Fence11.h
>index 4168df5365d..036ec58dac5 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/Fence11.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/Fence11.h
>@@ -23,13 +23,18 @@ class FenceNV11 : public FenceNVImpl
>     explicit FenceNV11(Renderer11 *renderer);
>     ~FenceNV11() override;
> 
>-    gl::Error set(GLenum condition) override;
>-    gl::Error test(GLboolean *outFinished) override;
>-    gl::Error finish() override;
>+    angle::Result set(const gl::Context *context, GLenum condition) override;
>+    angle::Result test(const gl::Context *context, GLboolean *outFinished) override;
>+    angle::Result finish(const gl::Context *context) override;
> 
>   private:
>-    template<class T> friend gl::Error FenceSetHelper(T *fence);
>-    template<class T> friend gl::Error FenceTestHelper(T *fence, bool flushCommandBuffer, GLboolean *outFinished);
>+    template <class T>
>+    friend angle::Result FenceSetHelper(const gl::Context *context, T *fence);
>+    template <class T>
>+    friend angle::Result FenceTestHelper(const gl::Context *context,
>+                                         T *fence,
>+                                         bool flushCommandBuffer,
>+                                         GLboolean *outFinished);
> 
>     Renderer11 *mRenderer;
>     ID3D11Query *mQuery;
>@@ -41,20 +46,30 @@ class Sync11 : public SyncImpl
>     explicit Sync11(Renderer11 *renderer);
>     ~Sync11() override;
> 
>-    gl::Error set(GLenum condition, GLbitfield flags) override;
>-    gl::Error clientWait(GLbitfield flags, GLuint64 timeout, GLenum *outResult) override;
>-    gl::Error serverWait(GLbitfield flags, GLuint64 timeout) override;
>-    gl::Error getStatus(GLint *outResult) override;
>+    angle::Result set(const gl::Context *context, GLenum condition, GLbitfield flags) override;
>+    angle::Result clientWait(const gl::Context *context,
>+                             GLbitfield flags,
>+                             GLuint64 timeout,
>+                             GLenum *outResult) override;
>+    angle::Result serverWait(const gl::Context *context,
>+                             GLbitfield flags,
>+                             GLuint64 timeout) override;
>+    angle::Result getStatus(const gl::Context *context, GLint *outResult) override;
> 
>   private:
>-    template<class T> friend gl::Error FenceSetHelper(T *fence);
>-    template<class T> friend gl::Error FenceTestHelper(T *fence, bool flushCommandBuffer, GLboolean *outFinished);
>+    template <class T>
>+    friend angle::Result FenceSetHelper(const gl::Context *context, T *fence);
>+    template <class T>
>+    friend angle::Result FenceTestHelper(const gl::Context *context,
>+                                         T *fence,
>+                                         bool flushCommandBuffer,
>+                                         GLboolean *outFinished);
> 
>     Renderer11 *mRenderer;
>     ID3D11Query *mQuery;
>     LONGLONG mCounterFrequency;
> };
> 
>-}
>+}  // namespace rx
> 
>-#endif // LIBANGLE_RENDERER_D3D_D3D11_FENCE11_H_
>+#endif  // LIBANGLE_RENDERER_D3D_D3D11_FENCE11_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/Framebuffer11.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/Framebuffer11.cpp
>index 02326d7b507..ecd6ecb916b 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/Framebuffer11.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/Framebuffer11.cpp
>@@ -30,8 +30,8 @@ namespace rx
> 
> namespace
> {
>-gl::Error MarkAttachmentsDirty(const gl::Context *context,
>-                               const gl::FramebufferAttachment *attachment)
>+angle::Result MarkAttachmentsDirty(const gl::Context *context,
>+                                   const gl::FramebufferAttachment *attachment)
> {
>     if (attachment->type() == GL_TEXTURE)
>     {
>@@ -51,53 +51,19 @@ gl::Error MarkAttachmentsDirty(const gl::Context *context,
>         }
>     }
> 
>-    return gl::NoError();
>-}
>-
>-void UpdateCachedRenderTarget(const gl::Context *context,
>-                              const gl::FramebufferAttachment *attachment,
>-                              RenderTarget11 *&cachedRenderTarget,
>-                              OnRenderTargetDirtyBinding *channelBinding)
>-{
>-    RenderTarget11 *newRenderTarget = nullptr;
>-    if (attachment)
>-    {
>-        // TODO(jmadill): Don't swallow this error.
>-        gl::Error error = attachment->getRenderTarget(context, &newRenderTarget);
>-        if (error.isError())
>-        {
>-            ERR() << "Internal rendertarget error: " << error;
>-        }
>-    }
>-    if (newRenderTarget != cachedRenderTarget)
>-    {
>-        OnRenderTargetDirtyChannel *channel =
>-            (newRenderTarget ? newRenderTarget->getBroadcastChannel() : nullptr);
>-        channelBinding->bind(channel);
>-        cachedRenderTarget = newRenderTarget;
>-    }
>+    return angle::Result::Continue;
> }
> }  // anonymous namespace
> 
> Framebuffer11::Framebuffer11(const gl::FramebufferState &data, Renderer11 *renderer)
>-    : FramebufferD3D(data, renderer),
>-      mRenderer(renderer),
>-      mCachedDepthStencilRenderTarget(nullptr),
>-      mDepthStencilRenderTargetDirty(this, gl::IMPLEMENTATION_MAX_FRAMEBUFFER_ATTACHMENTS)
>+    : FramebufferD3D(data, renderer), mRenderer(renderer)
> {
>     ASSERT(mRenderer != nullptr);
>-    mCachedColorRenderTargets.fill(nullptr);
>-    for (size_t colorIndex = 0; colorIndex < data.getColorAttachments().size(); ++colorIndex)
>-    {
>-        mColorRenderTargetsDirty.emplace_back(this, colorIndex);
>-    }
> }
> 
>-Framebuffer11::~Framebuffer11()
>-{
>-}
>+Framebuffer11::~Framebuffer11() {}
> 
>-gl::Error Framebuffer11::markAttachmentsDirty(const gl::Context *context) const
>+angle::Result Framebuffer11::markAttachmentsDirty(const gl::Context *context) const
> {
>     const auto &colorAttachments = mState.getColorAttachments();
>     for (size_t drawBuffer : mState.getEnabledDrawBuffers())
>@@ -113,10 +79,11 @@ gl::Error Framebuffer11::markAttachmentsDirty(const gl::Context *context) const
>         ANGLE_TRY(MarkAttachmentsDirty(context, dsAttachment));
>     }
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error Framebuffer11::clearImpl(const gl::Context *context, const ClearParameters &clearParams)
>+angle::Result Framebuffer11::clearImpl(const gl::Context *context,
>+                                       const ClearParameters &clearParams)
> {
>     Clear11 *clearer = mRenderer->getClearer();
> 
>@@ -141,60 +108,61 @@ gl::Error Framebuffer11::clearImpl(const gl::Context *context, const ClearParame
> 
>     ANGLE_TRY(markAttachmentsDirty(context));
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error Framebuffer11::invalidate(const gl::Context *context,
>-                                    size_t count,
>-                                    const GLenum *attachments)
>+angle::Result Framebuffer11::invalidate(const gl::Context *context,
>+                                        size_t count,
>+                                        const GLenum *attachments)
> {
>     return invalidateBase(context, count, attachments, false);
> }
> 
>-gl::Error Framebuffer11::discard(const gl::Context *context,
>-                                 size_t count,
>-                                 const GLenum *attachments)
>+angle::Result Framebuffer11::discard(const gl::Context *context,
>+                                     size_t count,
>+                                     const GLenum *attachments)
> {
>     return invalidateBase(context, count, attachments, true);
> }
> 
>-gl::Error Framebuffer11::invalidateBase(const gl::Context *context,
>-                                        size_t count,
>-                                        const GLenum *attachments,
>-                                        bool useEXTBehavior) const
>+angle::Result Framebuffer11::invalidateBase(const gl::Context *context,
>+                                            size_t count,
>+                                            const GLenum *attachments,
>+                                            bool useEXTBehavior) const
> {
>     ID3D11DeviceContext1 *deviceContext1 = mRenderer->getDeviceContext1IfSupported();
> 
>     if (!deviceContext1)
>     {
>         // DiscardView() is only supported on ID3D11DeviceContext1
>-        return gl::NoError();
>+        return angle::Result::Continue;
>     }
> 
>-    bool foundDepth = false;
>+    bool foundDepth   = false;
>     bool foundStencil = false;
> 
>     for (size_t i = 0; i < count; ++i)
>     {
>         switch (attachments[i])
>         {
>-          // Handle depth and stencil attachments. Defer discarding until later.
>-          case GL_DEPTH_STENCIL_ATTACHMENT:
>-            foundDepth = true;
>-            foundStencil = true;
>-            break;
>-          case GL_DEPTH_EXT:
>-          case GL_DEPTH_ATTACHMENT:
>-            foundDepth = true;
>-            break;
>-          case GL_STENCIL_EXT:
>-          case GL_STENCIL_ATTACHMENT:
>-            foundStencil = true;
>-            break;
>-          default:
>+            // Handle depth and stencil attachments. Defer discarding until later.
>+            case GL_DEPTH_STENCIL_ATTACHMENT:
>+                foundDepth   = true;
>+                foundStencil = true;
>+                break;
>+            case GL_DEPTH_EXT:
>+            case GL_DEPTH_ATTACHMENT:
>+                foundDepth = true;
>+                break;
>+            case GL_STENCIL_EXT:
>+            case GL_STENCIL_ATTACHMENT:
>+                foundStencil = true;
>+                break;
>+            default:
>             {
>                 // Handle color attachments
>-                ASSERT((attachments[i] >= GL_COLOR_ATTACHMENT0 && attachments[i] <= GL_COLOR_ATTACHMENT15) ||
>+                ASSERT((attachments[i] >= GL_COLOR_ATTACHMENT0 &&
>+                        attachments[i] <= GL_COLOR_ATTACHMENT15) ||
>                        (attachments[i] == GL_COLOR));
> 
>                 size_t colorIndex =
>@@ -210,14 +178,15 @@ gl::Error Framebuffer11::invalidateBase(const gl::Context *context,
>         }
>     }
> 
>-    bool discardDepth = false;
>+    bool discardDepth   = false;
>     bool discardStencil = false;
> 
>     // The D3D11 renderer uses the same view for depth and stencil buffers, so we must be careful.
>     if (useEXTBehavior)
>     {
>         // In the extension, if the app discards only one of the depth and stencil attachments, but
>-        // those are backed by the same packed_depth_stencil buffer, then both images become undefined.
>+        // those are backed by the same packed_depth_stencil buffer, then both images become
>+        // undefined.
>         discardDepth = foundDepth;
> 
>         // Don't bother discarding the stencil buffer if the depth buffer will already do it
>@@ -227,8 +196,9 @@ gl::Error Framebuffer11::invalidateBase(const gl::Context *context,
>     {
>         // In ES 3.0.4, if a specified attachment has base internal format DEPTH_STENCIL but the
>         // attachments list does not include DEPTH_STENCIL_ATTACHMENT or both DEPTH_ATTACHMENT and
>-        // STENCIL_ATTACHMENT, then only the specified portion of every pixel in the subregion of pixels
>-        // of the DEPTH_STENCIL buffer may be invalidated, and the other portion must be preserved.
>+        // STENCIL_ATTACHMENT, then only the specified portion of every pixel in the subregion of
>+        // pixels of the DEPTH_STENCIL buffer may be invalidated, and the other portion must be
>+        // preserved.
>         discardDepth = (foundDepth && foundStencil) ||
>                        (foundDepth && (mState.getStencilAttachment() == nullptr));
>         discardStencil = (foundStencil && (mState.getDepthAttachment() == nullptr));
>@@ -244,20 +214,20 @@ gl::Error Framebuffer11::invalidateBase(const gl::Context *context,
>         ANGLE_TRY(invalidateAttachment(context, mState.getStencilAttachment()));
>     }
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error Framebuffer11::invalidateSub(const gl::Context *context,
>-                                       size_t,
>-                                       const GLenum *,
>-                                       const gl::Rectangle &)
>+angle::Result Framebuffer11::invalidateSub(const gl::Context *context,
>+                                           size_t count,
>+                                           const GLenum *attachments,
>+                                           const gl::Rectangle &area)
> {
>     // A no-op implementation conforms to the spec, so don't call UNIMPLEMENTED()
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error Framebuffer11::invalidateAttachment(const gl::Context *context,
>-                                              const gl::FramebufferAttachment *attachment) const
>+angle::Result Framebuffer11::invalidateAttachment(const gl::Context *context,
>+                                                  const gl::FramebufferAttachment *attachment) const
> {
>     ID3D11DeviceContext1 *deviceContext1 = mRenderer->getDeviceContext1IfSupported();
>     ASSERT(deviceContext1);
>@@ -272,26 +242,28 @@ gl::Error Framebuffer11::invalidateAttachment(const gl::Context *context,
>         deviceContext1->DiscardView(rtv.get());
>     }
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error Framebuffer11::readPixelsImpl(const gl::Context *context,
>-                                        const gl::Rectangle &area,
>-                                        GLenum format,
>-                                        GLenum type,
>-                                        size_t outputPitch,
>-                                        const gl::PixelPackState &pack,
>-                                        uint8_t *pixels)
>+angle::Result Framebuffer11::readPixelsImpl(const gl::Context *context,
>+                                            const gl::Rectangle &area,
>+                                            GLenum format,
>+                                            GLenum type,
>+                                            size_t outputPitch,
>+                                            const gl::PixelPackState &pack,
>+                                            uint8_t *pixels)
> {
>     const gl::FramebufferAttachment *readAttachment = mState.getReadAttachment();
>     ASSERT(readAttachment);
> 
>-    gl::Buffer *packBuffer = context->getGLState().getTargetBuffer(gl::BufferBinding::PixelPack);
>+    gl::Buffer *packBuffer = context->getState().getTargetBuffer(gl::BufferBinding::PixelPack);
>     if (packBuffer != nullptr)
>     {
>-        Buffer11 *packBufferStorage = GetImplAs<Buffer11>(packBuffer);
>-        PackPixelsParams packParams(area, format, type, static_cast<GLuint>(outputPitch), pack,
>-                                    packBuffer, reinterpret_cast<ptrdiff_t>(pixels));
>+        Buffer11 *packBufferStorage      = GetImplAs<Buffer11>(packBuffer);
>+        const angle::Format &angleFormat = GetFormatFromFormatType(format, type);
>+        PackPixelsParams packParams(area, angleFormat, static_cast<GLuint>(outputPitch),
>+                                    pack.reverseRowOrder, packBuffer,
>+                                    reinterpret_cast<ptrdiff_t>(pixels));
> 
>         return packBufferStorage->packPixels(context, *readAttachment, packParams);
>     }
>@@ -300,15 +272,15 @@ gl::Error Framebuffer11::readPixelsImpl(const gl::Context *context,
>                                          static_cast<GLuint>(outputPitch), pack, pixels);
> }
> 
>-gl::Error Framebuffer11::blitImpl(const gl::Context *context,
>-                                  const gl::Rectangle &sourceArea,
>-                                  const gl::Rectangle &destArea,
>-                                  const gl::Rectangle *scissor,
>-                                  bool blitRenderTarget,
>-                                  bool blitDepth,
>-                                  bool blitStencil,
>-                                  GLenum filter,
>-                                  const gl::Framebuffer *sourceFramebuffer)
>+angle::Result Framebuffer11::blitImpl(const gl::Context *context,
>+                                      const gl::Rectangle &sourceArea,
>+                                      const gl::Rectangle &destArea,
>+                                      const gl::Rectangle *scissor,
>+                                      bool blitRenderTarget,
>+                                      bool blitDepth,
>+                                      bool blitStencil,
>+                                      GLenum filter,
>+                                      const gl::Framebuffer *sourceFramebuffer)
> {
>     if (blitRenderTarget)
>     {
>@@ -322,12 +294,12 @@ gl::Error Framebuffer11::blitImpl(const gl::Context *context,
>         const auto &colorAttachments = mState.getColorAttachments();
>         const auto &drawBufferStates = mState.getDrawBufferStates();
> 
>-        for (size_t colorAttachment = 0; colorAttachment < colorAttachments.size(); colorAttachment++)
>+        for (size_t colorAttachment = 0; colorAttachment < colorAttachments.size();
>+             colorAttachment++)
>         {
>             const gl::FramebufferAttachment &drawBuffer = colorAttachments[colorAttachment];
> 
>-            if (drawBuffer.isAttached() &&
>-                drawBufferStates[colorAttachment] != GL_NONE)
>+            if (drawBuffer.isAttached() && drawBufferStates[colorAttachment] != GL_NONE)
>             {
>                 RenderTargetD3D *drawRenderTarget = nullptr;
>                 ANGLE_TRY(drawBuffer.getRenderTarget(context, &drawRenderTarget));
>@@ -338,8 +310,8 @@ gl::Error Framebuffer11::blitImpl(const gl::Context *context,
>                 if (invertColorSource)
>                 {
>                     RenderTarget11 *readRenderTarget11 = GetAs<RenderTarget11>(readRenderTarget);
>-                    actualSourceArea.y                 = readRenderTarget11->getHeight() - sourceArea.y;
>-                    actualSourceArea.height            = -sourceArea.height;
>+                    actualSourceArea.y      = readRenderTarget11->getHeight() - sourceArea.y;
>+                    actualSourceArea.height = -sourceArea.height;
>                 }
> 
>                 const bool invertColorDest   = UsePresentPathFast(mRenderer, &drawBuffer);
>@@ -347,8 +319,8 @@ gl::Error Framebuffer11::blitImpl(const gl::Context *context,
>                 if (invertColorDest)
>                 {
>                     RenderTarget11 *drawRenderTarget11 = GetAs<RenderTarget11>(drawRenderTarget);
>-                    actualDestArea.y                   = drawRenderTarget11->getHeight() - destArea.y;
>-                    actualDestArea.height              = -destArea.height;
>+                    actualDestArea.y      = drawRenderTarget11->getHeight() - destArea.y;
>+                    actualDestArea.height = -destArea.height;
>                 }
> 
>                 ANGLE_TRY(mRenderer->blitRenderbufferRect(
>@@ -362,25 +334,41 @@ gl::Error Framebuffer11::blitImpl(const gl::Context *context,
>     {
>         const gl::FramebufferAttachment *readBuffer = sourceFramebuffer->getDepthOrStencilbuffer();
>         ASSERT(readBuffer);
>-
>         RenderTargetD3D *readRenderTarget = nullptr;
>         ANGLE_TRY(readBuffer->getRenderTarget(context, &readRenderTarget));
>         ASSERT(readRenderTarget);
> 
>+        const bool invertSource        = UsePresentPathFast(mRenderer, readBuffer);
>+        gl::Rectangle actualSourceArea = sourceArea;
>+        if (invertSource)
>+        {
>+            RenderTarget11 *readRenderTarget11 = GetAs<RenderTarget11>(readRenderTarget);
>+            actualSourceArea.y                 = readRenderTarget11->getHeight() - sourceArea.y;
>+            actualSourceArea.height            = -sourceArea.height;
>+        }
>+
>         const gl::FramebufferAttachment *drawBuffer = mState.getDepthOrStencilAttachment();
>         ASSERT(drawBuffer);
>-
>         RenderTargetD3D *drawRenderTarget = nullptr;
>         ANGLE_TRY(drawBuffer->getRenderTarget(context, &drawRenderTarget));
>         ASSERT(drawRenderTarget);
> 
>-        ANGLE_TRY(mRenderer->blitRenderbufferRect(context, sourceArea, destArea, readRenderTarget,
>-                                                  drawRenderTarget, filter, scissor, false,
>-                                                  blitDepth, blitStencil));
>+        bool invertDest              = UsePresentPathFast(mRenderer, drawBuffer);
>+        gl::Rectangle actualDestArea = destArea;
>+        if (invertDest)
>+        {
>+            RenderTarget11 *drawRenderTarget11 = GetAs<RenderTarget11>(drawRenderTarget);
>+            actualDestArea.y                   = drawRenderTarget11->getHeight() - destArea.y;
>+            actualDestArea.height              = -destArea.height;
>+        }
>+
>+        ANGLE_TRY(mRenderer->blitRenderbufferRect(context, actualSourceArea, actualDestArea,
>+                                                  readRenderTarget, drawRenderTarget, filter,
>+                                                  scissor, false, blitDepth, blitStencil));
>     }
> 
>     ANGLE_TRY(markAttachmentsDirty(context));
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
> GLenum Framebuffer11::getRenderTargetImplementationFormat(RenderTargetD3D *renderTarget) const
>@@ -389,57 +377,11 @@ GLenum Framebuffer11::getRenderTargetImplementationFormat(RenderTargetD3D *rende
>     return renderTarget11->getFormatSet().format().fboImplementationInternalFormat;
> }
> 
>-void Framebuffer11::updateColorRenderTarget(const gl::Context *context, size_t colorIndex)
>-{
>-    UpdateCachedRenderTarget(context, mState.getColorAttachment(colorIndex),
>-                             mCachedColorRenderTargets[colorIndex],
>-                             &mColorRenderTargetsDirty[colorIndex]);
>-}
>-
>-void Framebuffer11::updateDepthStencilRenderTarget(const gl::Context *context)
>+angle::Result Framebuffer11::syncState(const gl::Context *context,
>+                                       const gl::Framebuffer::DirtyBits &dirtyBits)
> {
>-    UpdateCachedRenderTarget(context, mState.getDepthOrStencilAttachment(),
>-                             mCachedDepthStencilRenderTarget, &mDepthStencilRenderTargetDirty);
>-}
>-
>-void Framebuffer11::syncState(const gl::Context *context,
>-                              const gl::Framebuffer::DirtyBits &dirtyBits)
>-{
>-    const auto &mergedDirtyBits = dirtyBits | mInternalDirtyBits;
>-    mInternalDirtyBits.reset();
>-
>-    for (auto dirtyBit : mergedDirtyBits)
>-    {
>-        switch (dirtyBit)
>-        {
>-            case gl::Framebuffer::DIRTY_BIT_DEPTH_ATTACHMENT:
>-            case gl::Framebuffer::DIRTY_BIT_STENCIL_ATTACHMENT:
>-                updateDepthStencilRenderTarget(context);
>-                break;
>-            case gl::Framebuffer::DIRTY_BIT_DRAW_BUFFERS:
>-            case gl::Framebuffer::DIRTY_BIT_READ_BUFFER:
>-                break;
>-            case gl::Framebuffer::DIRTY_BIT_DEFAULT_WIDTH:
>-            case gl::Framebuffer::DIRTY_BIT_DEFAULT_HEIGHT:
>-            case gl::Framebuffer::DIRTY_BIT_DEFAULT_SAMPLES:
>-            case gl::Framebuffer::DIRTY_BIT_DEFAULT_FIXED_SAMPLE_LOCATIONS:
>-                break;
>-            default:
>-            {
>-                ASSERT(gl::Framebuffer::DIRTY_BIT_COLOR_ATTACHMENT_0 == 0 &&
>-                       dirtyBit < gl::Framebuffer::DIRTY_BIT_COLOR_ATTACHMENT_MAX);
>-                size_t colorIndex =
>-                    static_cast<size_t>(dirtyBit - gl::Framebuffer::DIRTY_BIT_COLOR_ATTACHMENT_0);
>-                updateColorRenderTarget(context, colorIndex);
>-                break;
>-            }
>-        }
>-    }
>-
>-    // We should not have dirtied any additional state during our sync.
>-    ASSERT(!mInternalDirtyBits.any());
>-
>-    FramebufferD3D::syncState(context, dirtyBits);
>+    ANGLE_TRY(mRenderTargetCache.update(context, mState, dirtyBits));
>+    ANGLE_TRY(FramebufferD3D::syncState(context, dirtyBits));
> 
>     // Call this last to allow the state manager to take advantage of the cached render targets.
>     mRenderer->getStateManager()->invalidateRenderTarget();
>@@ -449,51 +391,25 @@ void Framebuffer11::syncState(const gl::Context *context,
>     {
>         mRenderer->getStateManager()->invalidateViewport(context);
>     }
>-}
>-
>-void Framebuffer11::signal(size_t channelID, const gl::Context *context)
>-{
>-    if (channelID == gl::IMPLEMENTATION_MAX_FRAMEBUFFER_ATTACHMENTS)
>-    {
>-        // Stencil is redundant in this case.
>-        mInternalDirtyBits.set(gl::Framebuffer::DIRTY_BIT_DEPTH_ATTACHMENT);
>-        mCachedDepthStencilRenderTarget = nullptr;
>-    }
>-    else
>-    {
>-        mInternalDirtyBits.set(gl::Framebuffer::DIRTY_BIT_COLOR_ATTACHMENT_0 + channelID);
>-        mCachedColorRenderTargets[channelID] = nullptr;
>-    }
> 
>-    // Notify the context we need to re-validate the RenderTarget.
>-    // TODO(jmadill): Check that we're the active draw framebuffer.
>-    mRenderer->getStateManager()->invalidateRenderTarget();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error Framebuffer11::getSamplePosition(size_t index, GLfloat *xy) const
>+angle::Result Framebuffer11::getSamplePosition(const gl::Context *context,
>+                                               size_t index,
>+                                               GLfloat *xy) const
> {
>     const gl::FramebufferAttachment *attachment = mState.getFirstNonNullAttachment();
>     ASSERT(attachment);
>     GLsizei sampleCount = attachment->getSamples();
> 
>     d3d11_gl::GetSamplePosition(sampleCount, index, xy);
>-    return gl::NoError();
>-}
>-
>-bool Framebuffer11::hasAnyInternalDirtyBit() const
>-{
>-    return mInternalDirtyBits.any();
>-}
>-
>-void Framebuffer11::syncInternalState(const gl::Context *context)
>-{
>-    syncState(context, gl::Framebuffer::DirtyBits());
>+    return angle::Result::Continue;
> }
> 
> RenderTarget11 *Framebuffer11::getFirstRenderTarget() const
> {
>-    ASSERT(mInternalDirtyBits.none());
>-    for (auto *renderTarget : mCachedColorRenderTargets)
>+    for (auto *renderTarget : mRenderTargetCache.getColors())
>     {
>         if (renderTarget)
>         {
>@@ -501,7 +417,7 @@ RenderTarget11 *Framebuffer11::getFirstRenderTarget() const
>         }
>     }
> 
>-    return mCachedDepthStencilRenderTarget;
>+    return mRenderTargetCache.getDepthStencil();
> }
> 
> }  // namespace rx
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/Framebuffer11.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/Framebuffer11.h
>index afdda299b9b..8516d7dcf29 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/Framebuffer11.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/Framebuffer11.h
>@@ -9,96 +9,88 @@
> #ifndef LIBANGLE_RENDERER_D3D_D3D11_FRAMBUFFER11_H_
> #define LIBANGLE_RENDERER_D3D_D3D11_FRAMBUFFER11_H_
> 
>+#include "libANGLE/Observer.h"
>+#include "libANGLE/renderer/RenderTargetCache.h"
> #include "libANGLE/renderer/d3d/FramebufferD3D.h"
> #include "libANGLE/renderer/d3d/d3d11/renderer11_utils.h"
>-#include "libANGLE/signal_utils.h"
> 
> namespace rx
> {
> class Renderer11;
> 
>-class Framebuffer11 : public FramebufferD3D, public OnRenderTargetDirtyReceiver
>+class Framebuffer11 : public FramebufferD3D
> {
>   public:
>     Framebuffer11(const gl::FramebufferState &data, Renderer11 *renderer);
>     ~Framebuffer11() override;
> 
>-    gl::Error discard(const gl::Context *context, size_t count, const GLenum *attachments) override;
>-    gl::Error invalidate(const gl::Context *context,
>-                         size_t count,
>-                         const GLenum *attachments) override;
>-    gl::Error invalidateSub(const gl::Context *context,
>-                            size_t count,
>-                            const GLenum *attachments,
>-                            const gl::Rectangle &area) override;
>+    angle::Result discard(const gl::Context *context,
>+                          size_t count,
>+                          const GLenum *attachments) override;
>+    angle::Result invalidate(const gl::Context *context,
>+                             size_t count,
>+                             const GLenum *attachments) override;
>+    angle::Result invalidateSub(const gl::Context *context,
>+                                size_t count,
>+                                const GLenum *attachments,
>+                                const gl::Rectangle &area) override;
> 
>     // Invalidate the cached swizzles of all bound texture attachments.
>-    gl::Error markAttachmentsDirty(const gl::Context *context) const;
>+    angle::Result markAttachmentsDirty(const gl::Context *context) const;
> 
>-    void syncState(const gl::Context *context,
>-                   const gl::Framebuffer::DirtyBits &dirtyBits) override;
>+    angle::Result syncState(const gl::Context *context,
>+                            const gl::Framebuffer::DirtyBits &dirtyBits) override;
> 
>-    const RenderTargetArray &getCachedColorRenderTargets() const
>+    const gl::AttachmentArray<RenderTarget11 *> &getCachedColorRenderTargets() const
>     {
>-        return mCachedColorRenderTargets;
>+        return mRenderTargetCache.getColors();
>     }
>     const RenderTarget11 *getCachedDepthStencilRenderTarget() const
>     {
>-        return mCachedDepthStencilRenderTarget;
>+        return mRenderTargetCache.getDepthStencil();
>     }
> 
>     RenderTarget11 *getFirstRenderTarget() const;
> 
>-    bool hasAnyInternalDirtyBit() const;
>-    void syncInternalState(const gl::Context *context);
>-
>-    void signal(size_t channelID, const gl::Context *context) override;
>-
>-    gl::Error getSamplePosition(size_t index, GLfloat *xy) const override;
>+    angle::Result getSamplePosition(const gl::Context *context,
>+                                    size_t index,
>+                                    GLfloat *xy) const override;
> 
>   private:
>-    gl::Error clearImpl(const gl::Context *context, const ClearParameters &clearParams) override;
>-
>-    gl::Error readPixelsImpl(const gl::Context *context,
>-                             const gl::Rectangle &area,
>-                             GLenum format,
>-                             GLenum type,
>-                             size_t outputPitch,
>-                             const gl::PixelPackState &pack,
>-                             uint8_t *pixels) override;
>-
>-    gl::Error blitImpl(const gl::Context *context,
>-                       const gl::Rectangle &sourceArea,
>-                       const gl::Rectangle &destArea,
>-                       const gl::Rectangle *scissor,
>-                       bool blitRenderTarget,
>-                       bool blitDepth,
>-                       bool blitStencil,
>-                       GLenum filter,
>-                       const gl::Framebuffer *sourceFramebuffer) override;
>-
>-    gl::Error invalidateBase(const gl::Context *context,
>-                             size_t count,
>-                             const GLenum *attachments,
>-                             bool useEXTBehavior) const;
>-    gl::Error invalidateAttachment(const gl::Context *context,
>-                                   const gl::FramebufferAttachment *attachment) const;
>+    angle::Result clearImpl(const gl::Context *context,
>+                            const ClearParameters &clearParams) override;
>+
>+    angle::Result readPixelsImpl(const gl::Context *context,
>+                                 const gl::Rectangle &area,
>+                                 GLenum format,
>+                                 GLenum type,
>+                                 size_t outputPitch,
>+                                 const gl::PixelPackState &pack,
>+                                 uint8_t *pixels) override;
>+
>+    angle::Result blitImpl(const gl::Context *context,
>+                           const gl::Rectangle &sourceArea,
>+                           const gl::Rectangle &destArea,
>+                           const gl::Rectangle *scissor,
>+                           bool blitRenderTarget,
>+                           bool blitDepth,
>+                           bool blitStencil,
>+                           GLenum filter,
>+                           const gl::Framebuffer *sourceFramebuffer) override;
>+
>+    angle::Result invalidateBase(const gl::Context *context,
>+                                 size_t count,
>+                                 const GLenum *attachments,
>+                                 bool useEXTBehavior) const;
>+    angle::Result invalidateAttachment(const gl::Context *context,
>+                                       const gl::FramebufferAttachment *attachment) const;
> 
>     GLenum getRenderTargetImplementationFormat(RenderTargetD3D *renderTarget) const override;
> 
>-    void updateColorRenderTarget(const gl::Context *context, size_t colorIndex);
>-    void updateDepthStencilRenderTarget(const gl::Context *context);
>-
>     Renderer11 *const mRenderer;
>-    RenderTargetArray mCachedColorRenderTargets;
>-    RenderTarget11 *mCachedDepthStencilRenderTarget;
>-
>-    std::vector<OnRenderTargetDirtyBinding> mColorRenderTargetsDirty;
>-    OnRenderTargetDirtyBinding mDepthStencilRenderTargetDirty;
>-
>-    gl::Framebuffer::DirtyBits mInternalDirtyBits;
>+    RenderTargetCache<RenderTarget11> mRenderTargetCache;
> };
> 
>-}
>+}  // namespace rx
> 
>-#endif // LIBANGLE_RENDERER_D3D_D3D11_FRAMBUFFER11_H_
>+#endif  // LIBANGLE_RENDERER_D3D_D3D11_FRAMBUFFER11_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/Image11.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/Image11.cpp
>index bd921f19359..40666cbef5d 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/Image11.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/Image11.cpp
>@@ -10,15 +10,17 @@
> #include "libANGLE/renderer/d3d/d3d11/Image11.h"
> 
> #include "common/utilities.h"
>-#include "libANGLE/formatutils.h"
>+#include "libANGLE/Context.h"
> #include "libANGLE/Framebuffer.h"
> #include "libANGLE/FramebufferAttachment.h"
>-#include "libANGLE/renderer/d3d/d3d11/formatutils11.h"
>+#include "libANGLE/formatutils.h"
>+#include "libANGLE/renderer/d3d/d3d11/Context11.h"
>+#include "libANGLE/renderer/d3d/d3d11/RenderTarget11.h"
> #include "libANGLE/renderer/d3d/d3d11/Renderer11.h"
>+#include "libANGLE/renderer/d3d/d3d11/TextureStorage11.h"
>+#include "libANGLE/renderer/d3d/d3d11/formatutils11.h"
> #include "libANGLE/renderer/d3d/d3d11/renderer11_utils.h"
>-#include "libANGLE/renderer/d3d/d3d11/RenderTarget11.h"
> #include "libANGLE/renderer/d3d/d3d11/texture_format_table.h"
>-#include "libANGLE/renderer/d3d/d3d11/TextureStorage11.h"
> 
> namespace rx
> {
>@@ -30,10 +32,9 @@ Image11::Image11(Renderer11 *renderer)
>       mStagingSubresource(0),
>       mRecoverFromStorage(false),
>       mAssociatedStorage(nullptr),
>-      mAssociatedImageIndex(gl::ImageIndex::MakeInvalid()),
>+      mAssociatedImageIndex(),
>       mRecoveredFromStorageCount(0)
>-{
>-}
>+{}
> 
> Image11::~Image11()
> {
>@@ -42,10 +43,10 @@ Image11::~Image11()
> }
> 
> // static
>-gl::Error Image11::GenerateMipmap(const gl::Context *context,
>-                                  Image11 *dest,
>-                                  Image11 *src,
>-                                  const Renderer11DeviceCaps &rendererCaps)
>+angle::Result Image11::GenerateMipmap(const gl::Context *context,
>+                                      Image11 *dest,
>+                                      Image11 *src,
>+                                      const Renderer11DeviceCaps &rendererCaps)
> {
>     ASSERT(src->getDXGIFormat() == dest->getDXGIFormat());
>     ASSERT(src->getWidth() == 1 || src->getWidth() / 2 == dest->getWidth());
>@@ -53,17 +54,14 @@ gl::Error Image11::GenerateMipmap(const gl::Context *context,
> 
>     D3D11_MAPPED_SUBRESOURCE destMapped;
>     ANGLE_TRY(dest->map(context, D3D11_MAP_WRITE, &destMapped));
>+    d3d11::ScopedUnmapper<Image11> destRAII(dest);
> 
>     D3D11_MAPPED_SUBRESOURCE srcMapped;
>-    gl::Error error = src->map(context, D3D11_MAP_READ, &srcMapped);
>-    if (error.isError())
>-    {
>-        dest->unmap();
>-        return error;
>-    }
>+    ANGLE_TRY(src->map(context, D3D11_MAP_READ, &srcMapped));
>+    d3d11::ScopedUnmapper<Image11> srcRAII(src);
> 
>-    const uint8_t *sourceData = reinterpret_cast<const uint8_t *>(srcMapped.pData);
>-    uint8_t *destData         = reinterpret_cast<uint8_t *>(destMapped.pData);
>+    const uint8_t *sourceData = static_cast<const uint8_t *>(srcMapped.pData);
>+    uint8_t *destData         = static_cast<uint8_t *>(destMapped.pData);
> 
>     auto mipGenerationFunction =
>         d3d11::Format::Get(src->getInternalFormat(), rendererCaps).format().mipGenerationFunction;
>@@ -71,35 +69,29 @@ gl::Error Image11::GenerateMipmap(const gl::Context *context,
>                           srcMapped.RowPitch, srcMapped.DepthPitch, destData, destMapped.RowPitch,
>                           destMapped.DepthPitch);
> 
>-    dest->unmap();
>-    src->unmap();
>-
>     dest->markDirty();
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
> // static
>-gl::Error Image11::CopyImage(const gl::Context *context,
>-                             Image11 *dest,
>-                             Image11 *source,
>-                             const gl::Rectangle &sourceRect,
>-                             const gl::Offset &destOffset,
>-                             bool unpackFlipY,
>-                             bool unpackPremultiplyAlpha,
>-                             bool unpackUnmultiplyAlpha,
>-                             const Renderer11DeviceCaps &rendererCaps)
>+angle::Result Image11::CopyImage(const gl::Context *context,
>+                                 Image11 *dest,
>+                                 Image11 *source,
>+                                 const gl::Box &sourceBox,
>+                                 const gl::Offset &destOffset,
>+                                 bool unpackFlipY,
>+                                 bool unpackPremultiplyAlpha,
>+                                 bool unpackUnmultiplyAlpha,
>+                                 const Renderer11DeviceCaps &rendererCaps)
> {
>     D3D11_MAPPED_SUBRESOURCE destMapped;
>     ANGLE_TRY(dest->map(context, D3D11_MAP_WRITE, &destMapped));
>+    d3d11::ScopedUnmapper<Image11> destRAII(dest);
> 
>     D3D11_MAPPED_SUBRESOURCE srcMapped;
>-    gl::Error error = source->map(context, D3D11_MAP_READ, &srcMapped);
>-    if (error.isError())
>-    {
>-        dest->unmap();
>-        return error;
>-    }
>+    ANGLE_TRY(source->map(context, D3D11_MAP_READ, &srcMapped));
>+    d3d11::ScopedUnmapper<Image11> sourceRAII(source);
> 
>     const auto &sourceFormat =
>         d3d11::Format::Get(source->getInternalFormat(), rendererCaps).format();
>@@ -107,28 +99,26 @@ gl::Error Image11::CopyImage(const gl::Context *context,
>         gl::GetSizedInternalFormatInfo(sourceFormat.fboImplementationInternalFormat).pixelBytes;
> 
>     GLenum destUnsizedFormat = gl::GetUnsizedFormat(dest->getInternalFormat());
>-    const auto &destFormat = d3d11::Format::Get(dest->getInternalFormat(), rendererCaps).format();
>+    const auto &destFormat   = d3d11::Format::Get(dest->getInternalFormat(), rendererCaps).format();
>     const auto &destFormatInfo =
>         gl::GetSizedInternalFormatInfo(destFormat.fboImplementationInternalFormat);
>     GLuint destPixelBytes = destFormatInfo.pixelBytes;
> 
>-    const uint8_t *sourceData = reinterpret_cast<const uint8_t *>(srcMapped.pData) +
>-                                sourceRect.x * sourcePixelBytes + sourceRect.y * srcMapped.RowPitch;
>-    uint8_t *destData = reinterpret_cast<uint8_t *>(destMapped.pData) +
>-                        destOffset.x * destPixelBytes + destOffset.y * destMapped.RowPitch;
>-
>-    CopyImageCHROMIUM(sourceData, srcMapped.RowPitch, sourcePixelBytes,
>-                      sourceFormat.colorReadFunction, destData, destMapped.RowPitch, destPixelBytes,
>-                      destFormat.colorWriteFunction, destUnsizedFormat,
>-                      destFormatInfo.componentType, sourceRect.width, sourceRect.height,
>-                      unpackFlipY, unpackPremultiplyAlpha, unpackUnmultiplyAlpha);
>+    const uint8_t *sourceData = static_cast<const uint8_t *>(srcMapped.pData) +
>+                                sourceBox.x * sourcePixelBytes + sourceBox.y * srcMapped.RowPitch +
>+                                sourceBox.z * srcMapped.DepthPitch;
>+    uint8_t *destData = static_cast<uint8_t *>(destMapped.pData) + destOffset.x * destPixelBytes +
>+                        destOffset.y * destMapped.RowPitch + destOffset.z * destMapped.DepthPitch;
> 
>-    dest->unmap();
>-    source->unmap();
>+    CopyImageCHROMIUM(sourceData, srcMapped.RowPitch, sourcePixelBytes, srcMapped.DepthPitch,
>+                      sourceFormat.pixelReadFunction, destData, destMapped.RowPitch, destPixelBytes,
>+                      destMapped.DepthPitch, destFormat.pixelWriteFunction, destUnsizedFormat,
>+                      destFormatInfo.componentType, sourceBox.width, sourceBox.height,
>+                      sourceBox.depth, unpackFlipY, unpackPremultiplyAlpha, unpackUnmultiplyAlpha);
> 
>     dest->markDirty();
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
> bool Image11::isDirty() const
>@@ -150,10 +140,10 @@ bool Image11::isDirty() const
>     return mDirty;
> }
> 
>-gl::Error Image11::copyToStorage(const gl::Context *context,
>-                                 TextureStorage *storage,
>-                                 const gl::ImageIndex &index,
>-                                 const gl::Box &region)
>+angle::Result Image11::copyToStorage(const gl::Context *context,
>+                                     TextureStorage *storage,
>+                                     const gl::ImageIndex &index,
>+                                     const gl::Box &region)
> {
>     TextureStorage11 *storage11 = GetAs<TextureStorage11>(storage);
> 
>@@ -171,8 +161,8 @@ gl::Error Image11::copyToStorage(const gl::Context *context,
>     }
> 
>     const TextureHelper11 *stagingTexture = nullptr;
>-    unsigned int stagingSubresourceIndex = 0;
>-    ANGLE_TRY(getStagingTexture(&stagingTexture, &stagingSubresourceIndex));
>+    unsigned int stagingSubresourceIndex  = 0;
>+    ANGLE_TRY(getStagingTexture(context, &stagingTexture, &stagingSubresourceIndex));
>     ANGLE_TRY(storage11->updateSubresourceLevel(context, *stagingTexture, stagingSubresourceIndex,
>                                                 index, region));
> 
>@@ -186,7 +176,7 @@ gl::Error Image11::copyToStorage(const gl::Context *context,
>         mAssociatedImageIndex = index;
>     }
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
> void Image11::verifyAssociatedStorageValid(TextureStorage11 *textureStorage) const
>@@ -194,11 +184,11 @@ void Image11::verifyAssociatedStorageValid(TextureStorage11 *textureStorage) con
>     ASSERT(mAssociatedStorage == textureStorage);
> }
> 
>-gl::Error Image11::recoverFromAssociatedStorage(const gl::Context *context)
>+angle::Result Image11::recoverFromAssociatedStorage(const gl::Context *context)
> {
>     if (mRecoverFromStorage)
>     {
>-        ANGLE_TRY(createStagingTexture());
>+        ANGLE_TRY(createStagingTexture(context));
> 
>         mAssociatedStorage->verifyAssociatedImageValid(mAssociatedImageIndex, this);
> 
>@@ -212,7 +202,7 @@ gl::Error Image11::recoverFromAssociatedStorage(const gl::Context *context)
>         disassociateStorage();
>     }
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
> void Image11::disassociateStorage()
>@@ -224,11 +214,11 @@ void Image11::disassociateStorage()
> 
>         mRecoverFromStorage   = false;
>         mAssociatedStorage    = nullptr;
>-        mAssociatedImageIndex = gl::ImageIndex::MakeInvalid();
>+        mAssociatedImageIndex = gl::ImageIndex();
>     }
> }
> 
>-bool Image11::redefine(GLenum target,
>+bool Image11::redefine(gl::TextureType type,
>                        GLenum internalformat,
>                        const gl::Extents &size,
>                        bool forceRelease)
>@@ -245,7 +235,7 @@ bool Image11::redefine(GLenum target,
>         mHeight         = size.height;
>         mDepth          = size.depth;
>         mInternalFormat = internalformat;
>-        mTarget         = target;
>+        mType           = type;
> 
>         // compute the d3d format that will be used
>         const d3d11::Format &formatInfo =
>@@ -274,25 +264,26 @@ DXGI_FORMAT Image11::getDXGIFormat() const
> // Store the pixel rectangle designated by xoffset,yoffset,width,height with pixels stored as
> // format/type at input
> // into the target pixel rectangle.
>-gl::Error Image11::loadData(const gl::Context *context,
>-                            const gl::Box &area,
>-                            const gl::PixelUnpackState &unpack,
>-                            GLenum type,
>-                            const void *input,
>-                            bool applySkipImages)
>+angle::Result Image11::loadData(const gl::Context *context,
>+                                const gl::Box &area,
>+                                const gl::PixelUnpackState &unpack,
>+                                GLenum type,
>+                                const void *input,
>+                                bool applySkipImages)
> {
>+    Context11 *context11 = GetImplAs<Context11>(context);
>+
>     const gl::InternalFormat &formatInfo = gl::GetSizedInternalFormatInfo(mInternalFormat);
>     GLuint inputRowPitch                 = 0;
>-    ANGLE_TRY_RESULT(
>-        formatInfo.computeRowPitch(type, area.width, unpack.alignment, unpack.rowLength),
>-        inputRowPitch);
>+    ANGLE_CHECK_GL_MATH(context11, formatInfo.computeRowPitch(type, area.width, unpack.alignment,
>+                                                              unpack.rowLength, &inputRowPitch));
>     GLuint inputDepthPitch = 0;
>-    ANGLE_TRY_RESULT(formatInfo.computeDepthPitch(area.height, unpack.imageHeight, inputRowPitch),
>-                     inputDepthPitch);
>+    ANGLE_CHECK_GL_MATH(context11, formatInfo.computeDepthPitch(area.height, unpack.imageHeight,
>+                                                                inputRowPitch, &inputDepthPitch));
>     GLuint inputSkipBytes = 0;
>-    ANGLE_TRY_RESULT(
>-        formatInfo.computeSkipBytes(inputRowPitch, inputDepthPitch, unpack, applySkipImages),
>-        inputSkipBytes);
>+    ANGLE_CHECK_GL_MATH(context11,
>+                        formatInfo.computeSkipBytes(type, inputRowPitch, inputDepthPitch, unpack,
>+                                                    applySkipImages, &inputSkipBytes));
> 
>     const d3d11::DXGIFormatSize &dxgiFormatInfo = d3d11::GetDXGIFormatSizeInfo(mDXGIFormat);
>     GLuint outputPixelSize                      = dxgiFormatInfo.pixelBytes;
>@@ -304,27 +295,31 @@ gl::Error Image11::loadData(const gl::Context *context,
>     D3D11_MAPPED_SUBRESOURCE mappedImage;
>     ANGLE_TRY(map(context, D3D11_MAP_WRITE, &mappedImage));
> 
>-    uint8_t *offsetMappedData = (reinterpret_cast<uint8_t *>(mappedImage.pData) +
>+    uint8_t *offsetMappedData = (static_cast<uint8_t *>(mappedImage.pData) +
>                                  (area.y * mappedImage.RowPitch + area.x * outputPixelSize +
>                                   area.z * mappedImage.DepthPitch));
>     loadFunction(area.width, area.height, area.depth,
>-                 reinterpret_cast<const uint8_t *>(input) + inputSkipBytes, inputRowPitch,
>+                 static_cast<const uint8_t *>(input) + inputSkipBytes, inputRowPitch,
>                  inputDepthPitch, offsetMappedData, mappedImage.RowPitch, mappedImage.DepthPitch);
> 
>     unmap();
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error Image11::loadCompressedData(const gl::Context *context,
>-                                      const gl::Box &area,
>-                                      const void *input)
>+angle::Result Image11::loadCompressedData(const gl::Context *context,
>+                                          const gl::Box &area,
>+                                          const void *input)
> {
>+    Context11 *context11 = GetImplAs<Context11>(context);
>+
>     const gl::InternalFormat &formatInfo = gl::GetSizedInternalFormatInfo(mInternalFormat);
>-    GLsizei inputRowPitch                = 0;
>-    ANGLE_TRY_RESULT(formatInfo.computeRowPitch(GL_UNSIGNED_BYTE, area.width, 1, 0), inputRowPitch);
>-    GLsizei inputDepthPitch = 0;
>-    ANGLE_TRY_RESULT(formatInfo.computeDepthPitch(area.height, 0, inputRowPitch), inputDepthPitch);
>+    GLuint inputRowPitch                 = 0;
>+    ANGLE_CHECK_GL_MATH(
>+        context11, formatInfo.computeRowPitch(GL_UNSIGNED_BYTE, area.width, 1, 0, &inputRowPitch));
>+    GLuint inputDepthPitch = 0;
>+    ANGLE_CHECK_GL_MATH(
>+        context11, formatInfo.computeDepthPitch(area.height, 0, inputRowPitch, &inputDepthPitch));
> 
>     const d3d11::DXGIFormatSize &dxgiFormatInfo = d3d11::GetDXGIFormatSizeInfo(mDXGIFormat);
>     GLuint outputPixelSize                      = dxgiFormatInfo.pixelBytes;
>@@ -343,38 +338,40 @@ gl::Error Image11::loadCompressedData(const gl::Context *context,
>     ANGLE_TRY(map(context, D3D11_MAP_WRITE, &mappedImage));
> 
>     uint8_t *offsetMappedData =
>-        reinterpret_cast<uint8_t *>(mappedImage.pData) +
>+        static_cast<uint8_t *>(mappedImage.pData) +
>         ((area.y / outputBlockHeight) * mappedImage.RowPitch +
>          (area.x / outputBlockWidth) * outputPixelSize + area.z * mappedImage.DepthPitch);
> 
>-    loadFunction(area.width, area.height, area.depth, reinterpret_cast<const uint8_t *>(input),
>+    loadFunction(area.width, area.height, area.depth, static_cast<const uint8_t *>(input),
>                  inputRowPitch, inputDepthPitch, offsetMappedData, mappedImage.RowPitch,
>                  mappedImage.DepthPitch);
> 
>     unmap();
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error Image11::copyFromTexStorage(const gl::Context *context,
>-                                      const gl::ImageIndex &imageIndex,
>-                                      TextureStorage *source)
>+angle::Result Image11::copyFromTexStorage(const gl::Context *context,
>+                                          const gl::ImageIndex &imageIndex,
>+                                          TextureStorage *source)
> {
>     TextureStorage11 *storage11 = GetAs<TextureStorage11>(source);
> 
>     const TextureHelper11 *textureHelper = nullptr;
>     ANGLE_TRY(storage11->getResource(context, &textureHelper));
> 
>-    UINT subresourceIndex = storage11->getSubresourceIndex(imageIndex);
>+    UINT subresourceIndex = 0;
>+    ANGLE_TRY(storage11->getSubresourceIndex(context, imageIndex, &subresourceIndex));
> 
>     gl::Box sourceBox(0, 0, 0, mWidth, mHeight, mDepth);
>-    return copyWithoutConversion(gl::Offset(), sourceBox, *textureHelper, subresourceIndex);
>+    return copyWithoutConversion(context, gl::Offset(), sourceBox, *textureHelper,
>+                                 subresourceIndex);
> }
> 
>-gl::Error Image11::copyFromFramebuffer(const gl::Context *context,
>-                                       const gl::Offset &destOffset,
>-                                       const gl::Rectangle &sourceArea,
>-                                       const gl::Framebuffer *sourceFBO)
>+angle::Result Image11::copyFromFramebuffer(const gl::Context *context,
>+                                           const gl::Offset &destOffset,
>+                                           const gl::Rectangle &sourceArea,
>+                                           const gl::Framebuffer *sourceFBO)
> {
>     const gl::FramebufferAttachment *srcAttachment = sourceFBO->getReadColorbuffer();
>     ASSERT(srcAttachment);
>@@ -393,7 +390,8 @@ gl::Error Image11::copyFromFramebuffer(const gl::Context *context,
>         unsigned int sourceSubResource = rt11->getSubresourceIndex();
> 
>         gl::Box sourceBox(sourceArea.x, sourceArea.y, 0, sourceArea.width, sourceArea.height, 1);
>-        return copyWithoutConversion(destOffset, sourceBox, textureHelper, sourceSubResource);
>+        return copyWithoutConversion(context, destOffset, sourceBox, textureHelper,
>+                                     sourceSubResource);
>     }
> 
>     // This format requires conversion, so we must copy the texture to staging and manually convert
>@@ -413,19 +411,20 @@ gl::Error Image11::copyFromFramebuffer(const gl::Context *context,
>     const auto &destD3D11Format =
>         d3d11::Format::Get(mInternalFormat, mRenderer->getRenderer11DeviceCaps());
> 
>-    auto loadFunction = destD3D11Format.getLoadFunctions()(destFormatInfo.type);
>-    gl::Error error   = gl::NoError();
>+    auto loadFunction    = destD3D11Format.getLoadFunctions()(destFormatInfo.type);
>+    angle::Result result = angle::Result::Continue;
>     if (loadFunction.requiresConversion)
>     {
>         size_t bufferSize = destFormatInfo.pixelBytes * sourceArea.width * sourceArea.height;
>         angle::MemoryBuffer *memoryBuffer = nullptr;
>-        error = mRenderer->getScratchMemoryBuffer(bufferSize, &memoryBuffer);
>+        result = mRenderer->getScratchMemoryBuffer(GetImplAs<Context11>(context), bufferSize,
>+                                                   &memoryBuffer);
> 
>-        if (!error.isError())
>+        if (result == angle::Result::Continue)
>         {
>             GLuint memoryBufferRowPitch = destFormatInfo.pixelBytes * sourceArea.width;
> 
>-            error = mRenderer->readFromAttachment(
>+            result = mRenderer->readFromAttachment(
>                 context, *srcAttachment, sourceArea, destFormatInfo.format, destFormatInfo.type,
>                 memoryBufferRowPitch, gl::PixelPackState(), memoryBuffer->data());
> 
>@@ -436,7 +435,7 @@ gl::Error Image11::copyFromFramebuffer(const gl::Context *context,
>     }
>     else
>     {
>-        error = mRenderer->readFromAttachment(
>+        result = mRenderer->readFromAttachment(
>             context, *srcAttachment, sourceArea, destFormatInfo.format, destFormatInfo.type,
>             mappedImage.RowPitch, gl::PixelPackState(), dataOffset);
>     }
>@@ -444,18 +443,19 @@ gl::Error Image11::copyFromFramebuffer(const gl::Context *context,
>     unmap();
>     mDirty = true;
> 
>-    return error;
>+    return result;
> }
> 
>-gl::Error Image11::copyWithoutConversion(const gl::Offset &destOffset,
>-                                         const gl::Box &sourceArea,
>-                                         const TextureHelper11 &textureHelper,
>-                                         UINT sourceSubResource)
>+angle::Result Image11::copyWithoutConversion(const gl::Context *context,
>+                                             const gl::Offset &destOffset,
>+                                             const gl::Box &sourceArea,
>+                                             const TextureHelper11 &textureHelper,
>+                                             UINT sourceSubResource)
> {
>     // No conversion needed-- use copyback fastpath
>     const TextureHelper11 *stagingTexture = nullptr;
>-    unsigned int stagingSubresourceIndex = 0;
>-    ANGLE_TRY(getStagingTexture(&stagingTexture, &stagingSubresourceIndex));
>+    unsigned int stagingSubresourceIndex  = 0;
>+    ANGLE_TRY(getStagingTexture(context, &stagingTexture, &stagingSubresourceIndex));
> 
>     ID3D11DeviceContext *deviceContext = mRenderer->getDeviceContext();
> 
>@@ -485,7 +485,8 @@ gl::Error Image11::copyWithoutConversion(const gl::Offset &destOffset,
>         resolveDesc.MiscFlags          = 0;
> 
>         d3d11::Texture2D resolveTex;
>-        ANGLE_TRY(mRenderer->allocateResource(resolveDesc, &resolveTex));
>+        ANGLE_TRY(
>+            mRenderer->allocateResource(GetImplAs<Context11>(context), resolveDesc, &resolveTex));
> 
>         deviceContext->ResolveSubresource(resolveTex.get(), 0, textureHelper.get(),
>                                           sourceSubResource, textureHelper.getFormat());
>@@ -502,17 +503,18 @@ gl::Error Image11::copyWithoutConversion(const gl::Offset &destOffset,
>     }
> 
>     mDirty = true;
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error Image11::getStagingTexture(const TextureHelper11 **outStagingTexture,
>-                                     unsigned int *outSubresourceIndex)
>+angle::Result Image11::getStagingTexture(const gl::Context *context,
>+                                         const TextureHelper11 **outStagingTexture,
>+                                         unsigned int *outSubresourceIndex)
> {
>-    ANGLE_TRY(createStagingTexture());
>+    ANGLE_TRY(createStagingTexture(context));
> 
>     *outStagingTexture   = &mStagingTexture;
>     *outSubresourceIndex = mStagingSubresource;
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
> void Image11::releaseStagingTexture()
>@@ -520,11 +522,11 @@ void Image11::releaseStagingTexture()
>     mStagingTexture.reset();
> }
> 
>-gl::Error Image11::createStagingTexture()
>+angle::Result Image11::createStagingTexture(const gl::Context *context)
> {
>     if (mStagingTexture.valid())
>     {
>-        return gl::NoError();
>+        return angle::Result::Continue;
>     }
> 
>     ASSERT(mWidth > 0 && mHeight > 0 && mDepth > 0);
>@@ -540,109 +542,109 @@ gl::Error Image11::createStagingTexture()
>     // adjust size if needed for compressed textures
>     d3d11::MakeValidSize(false, dxgiFormat, &width, &height, &lodOffset);
> 
>-    if (mTarget == GL_TEXTURE_3D)
>-    {
>-        D3D11_TEXTURE3D_DESC desc;
>-        desc.Width          = width;
>-        desc.Height         = height;
>-        desc.Depth          = mDepth;
>-        desc.MipLevels      = lodOffset + 1;
>-        desc.Format         = dxgiFormat;
>-        desc.Usage          = D3D11_USAGE_STAGING;
>-        desc.BindFlags      = 0;
>-        desc.CPUAccessFlags = D3D11_CPU_ACCESS_READ | D3D11_CPU_ACCESS_WRITE;
>-        desc.MiscFlags      = 0;
>-
>-        if (formatInfo.dataInitializerFunction != nullptr)
>-        {
>-            std::vector<D3D11_SUBRESOURCE_DATA> initialData;
>-            std::vector<std::vector<BYTE>> textureData;
>-            d3d11::GenerateInitialTextureData(mInternalFormat, mRenderer->getRenderer11DeviceCaps(),
>-                                              width, height, mDepth, lodOffset + 1, &initialData,
>-                                              &textureData);
>-
>-            ANGLE_TRY(
>-                mRenderer->allocateTexture(desc, formatInfo, initialData.data(), &mStagingTexture));
>-        }
>-        else
>-        {
>-            ANGLE_TRY(mRenderer->allocateTexture(desc, formatInfo, &mStagingTexture));
>-        }
>+    Context11 *context11 = GetImplAs<Context11>(context);
> 
>-        mStagingTexture.setDebugName("Image11::StagingTexture3D");
>-        mStagingSubresource = D3D11CalcSubresource(lodOffset, 0, lodOffset + 1);
>-    }
>-    else if (mTarget == GL_TEXTURE_2D || mTarget == GL_TEXTURE_2D_ARRAY ||
>-             mTarget == GL_TEXTURE_CUBE_MAP)
>+    switch (mType)
>     {
>-        D3D11_TEXTURE2D_DESC desc;
>-        desc.Width              = width;
>-        desc.Height             = height;
>-        desc.MipLevels          = lodOffset + 1;
>-        desc.ArraySize          = 1;
>-        desc.Format             = dxgiFormat;
>-        desc.SampleDesc.Count   = 1;
>-        desc.SampleDesc.Quality = 0;
>-        desc.Usage              = D3D11_USAGE_STAGING;
>-        desc.BindFlags          = 0;
>-        desc.CPUAccessFlags     = D3D11_CPU_ACCESS_READ | D3D11_CPU_ACCESS_WRITE;
>-        desc.MiscFlags          = 0;
>-
>-        if (formatInfo.dataInitializerFunction != nullptr)
>+        case gl::TextureType::_3D:
>         {
>-            std::vector<D3D11_SUBRESOURCE_DATA> initialData;
>-            std::vector<std::vector<BYTE>> textureData;
>-            d3d11::GenerateInitialTextureData(mInternalFormat, mRenderer->getRenderer11DeviceCaps(),
>-                                              width, height, 1, lodOffset + 1, &initialData,
>-                                              &textureData);
>-
>-            ANGLE_TRY(
>-                mRenderer->allocateTexture(desc, formatInfo, initialData.data(), &mStagingTexture));
>+            D3D11_TEXTURE3D_DESC desc;
>+            desc.Width          = width;
>+            desc.Height         = height;
>+            desc.Depth          = mDepth;
>+            desc.MipLevels      = lodOffset + 1;
>+            desc.Format         = dxgiFormat;
>+            desc.Usage          = D3D11_USAGE_STAGING;
>+            desc.BindFlags      = 0;
>+            desc.CPUAccessFlags = D3D11_CPU_ACCESS_READ | D3D11_CPU_ACCESS_WRITE;
>+            desc.MiscFlags      = 0;
>+
>+            if (formatInfo.dataInitializerFunction != nullptr)
>+            {
>+                gl::TexLevelArray<D3D11_SUBRESOURCE_DATA> initialData;
>+                ANGLE_TRY(d3d11::GenerateInitialTextureData(
>+                    context, mInternalFormat, mRenderer->getRenderer11DeviceCaps(), width, height,
>+                    mDepth, lodOffset + 1, &initialData));
>+
>+                ANGLE_TRY(mRenderer->allocateTexture(context11, desc, formatInfo,
>+                                                     initialData.data(), &mStagingTexture));
>+            }
>+            else
>+            {
>+                ANGLE_TRY(
>+                    mRenderer->allocateTexture(context11, desc, formatInfo, &mStagingTexture));
>+            }
>+
>+            mStagingTexture.setDebugName("Image11::StagingTexture3D");
>+            mStagingSubresource = D3D11CalcSubresource(lodOffset, 0, lodOffset + 1);
>         }
>-        else
>+        break;
>+
>+        case gl::TextureType::_2D:
>+        case gl::TextureType::_2DArray:
>+        case gl::TextureType::CubeMap:
>         {
>-            ANGLE_TRY(mRenderer->allocateTexture(desc, formatInfo, &mStagingTexture));
>+            D3D11_TEXTURE2D_DESC desc;
>+            desc.Width              = width;
>+            desc.Height             = height;
>+            desc.MipLevels          = lodOffset + 1;
>+            desc.ArraySize          = 1;
>+            desc.Format             = dxgiFormat;
>+            desc.SampleDesc.Count   = 1;
>+            desc.SampleDesc.Quality = 0;
>+            desc.Usage              = D3D11_USAGE_STAGING;
>+            desc.BindFlags          = 0;
>+            desc.CPUAccessFlags     = D3D11_CPU_ACCESS_READ | D3D11_CPU_ACCESS_WRITE;
>+            desc.MiscFlags          = 0;
>+
>+            if (formatInfo.dataInitializerFunction != nullptr)
>+            {
>+                gl::TexLevelArray<D3D11_SUBRESOURCE_DATA> initialData;
>+                ANGLE_TRY(d3d11::GenerateInitialTextureData(
>+                    context, mInternalFormat, mRenderer->getRenderer11DeviceCaps(), width, height,
>+                    1, lodOffset + 1, &initialData));
>+
>+                ANGLE_TRY(mRenderer->allocateTexture(context11, desc, formatInfo,
>+                                                     initialData.data(), &mStagingTexture));
>+            }
>+            else
>+            {
>+                ANGLE_TRY(
>+                    mRenderer->allocateTexture(context11, desc, formatInfo, &mStagingTexture));
>+            }
>+
>+            mStagingTexture.setDebugName("Image11::StagingTexture2D");
>+            mStagingSubresource = D3D11CalcSubresource(lodOffset, 0, lodOffset + 1);
>         }
>+        break;
> 
>-        mStagingTexture.setDebugName("Image11::StagingTexture2D");
>-        mStagingSubresource = D3D11CalcSubresource(lodOffset, 0, lodOffset + 1);
>-    }
>-    else
>-    {
>-        UNREACHABLE();
>+        default:
>+            UNREACHABLE();
>     }
> 
>     mDirty = false;
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error Image11::map(const gl::Context *context, D3D11_MAP mapType, D3D11_MAPPED_SUBRESOURCE *map)
>+angle::Result Image11::map(const gl::Context *context,
>+                           D3D11_MAP mapType,
>+                           D3D11_MAPPED_SUBRESOURCE *map)
> {
>     // We must recover from the TextureStorage if necessary, even for D3D11_MAP_WRITE.
>     ANGLE_TRY(recoverFromAssociatedStorage(context));
> 
>     const TextureHelper11 *stagingTexture = nullptr;
>-    unsigned int subresourceIndex  = 0;
>-    ANGLE_TRY(getStagingTexture(&stagingTexture, &subresourceIndex));
>-
>-    ID3D11DeviceContext *deviceContext = mRenderer->getDeviceContext();
>+    unsigned int subresourceIndex         = 0;
>+    ANGLE_TRY(getStagingTexture(context, &stagingTexture, &subresourceIndex));
> 
>     ASSERT(stagingTexture && stagingTexture->valid());
>-    HRESULT result = deviceContext->Map(stagingTexture->get(), subresourceIndex, mapType, 0, map);
> 
>-    if (FAILED(result))
>-    {
>-        // this can fail if the device is removed (from TDR)
>-        if (d3d11::isDeviceLostError(result))
>-        {
>-            mRenderer->notifyDeviceLost();
>-        }
>-        return gl::OutOfMemory() << "Failed to map staging texture, " << gl::FmtHR(result);
>-    }
>+    ANGLE_TRY(
>+        mRenderer->mapResource(context, stagingTexture->get(), subresourceIndex, mapType, 0, map));
> 
>     mDirty = true;
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
> void Image11::unmap()
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/Image11.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/Image11.h
>index 584d231b37a..59f03ac33b9 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/Image11.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/Image11.h
>@@ -20,6 +20,12 @@ namespace gl
> class Framebuffer;
> }
> 
>+namespace d3d11
>+{
>+template <typename T>
>+class ScopedUnmapper;
>+}  // namespace d3d11
>+
> namespace rx
> {
> class Renderer11;
>@@ -33,66 +39,73 @@ class Image11 : public ImageD3D
>     Image11(Renderer11 *renderer);
>     ~Image11() override;
> 
>-    static gl::Error GenerateMipmap(const gl::Context *context,
>-                                    Image11 *dest,
>-                                    Image11 *src,
>-                                    const Renderer11DeviceCaps &rendererCaps);
>-    static gl::Error CopyImage(const gl::Context *context,
>-                               Image11 *dest,
>-                               Image11 *source,
>-                               const gl::Rectangle &sourceRect,
>-                               const gl::Offset &destOffset,
>-                               bool unpackFlipY,
>-                               bool unpackPremultiplyAlpha,
>-                               bool unpackUnmultiplyAlpha,
>-                               const Renderer11DeviceCaps &rendererCaps);
>+    static angle::Result GenerateMipmap(const gl::Context *context,
>+                                        Image11 *dest,
>+                                        Image11 *src,
>+                                        const Renderer11DeviceCaps &rendererCaps);
>+    static angle::Result CopyImage(const gl::Context *context,
>+                                   Image11 *dest,
>+                                   Image11 *source,
>+                                   const gl::Box &sourceBox,
>+                                   const gl::Offset &destOffset,
>+                                   bool unpackFlipY,
>+                                   bool unpackPremultiplyAlpha,
>+                                   bool unpackUnmultiplyAlpha,
>+                                   const Renderer11DeviceCaps &rendererCaps);
> 
>     bool isDirty() const override;
> 
>-    gl::Error copyToStorage(const gl::Context *context,
>-                            TextureStorage *storage,
>-                            const gl::ImageIndex &index,
>-                            const gl::Box &region) override;
>+    angle::Result copyToStorage(const gl::Context *context,
>+                                TextureStorage *storage,
>+                                const gl::ImageIndex &index,
>+                                const gl::Box &region) override;
> 
>-    bool redefine(GLenum target, GLenum internalformat, const gl::Extents &size, bool forceRelease) override;
>+    bool redefine(gl::TextureType type,
>+                  GLenum internalformat,
>+                  const gl::Extents &size,
>+                  bool forceRelease) override;
> 
>     DXGI_FORMAT getDXGIFormat() const;
> 
>-    gl::Error loadData(const gl::Context *context,
>-                       const gl::Box &area,
>-                       const gl::PixelUnpackState &unpack,
>-                       GLenum type,
>-                       const void *input,
>-                       bool applySkipImages) override;
>-    gl::Error loadCompressedData(const gl::Context *context,
>-                                 const gl::Box &area,
>-                                 const void *input) override;
>-
>-    gl::Error copyFromTexStorage(const gl::Context *context,
>-                                 const gl::ImageIndex &imageIndex,
>-                                 TextureStorage *source) override;
>-    gl::Error copyFromFramebuffer(const gl::Context *context,
>-                                  const gl::Offset &destOffset,
>-                                  const gl::Rectangle &sourceArea,
>-                                  const gl::Framebuffer *source) override;
>-
>-    gl::Error recoverFromAssociatedStorage(const gl::Context *context);
>+    angle::Result loadData(const gl::Context *context,
>+                           const gl::Box &area,
>+                           const gl::PixelUnpackState &unpack,
>+                           GLenum type,
>+                           const void *input,
>+                           bool applySkipImages) override;
>+    angle::Result loadCompressedData(const gl::Context *context,
>+                                     const gl::Box &area,
>+                                     const void *input) override;
>+
>+    angle::Result copyFromTexStorage(const gl::Context *context,
>+                                     const gl::ImageIndex &imageIndex,
>+                                     TextureStorage *source) override;
>+    angle::Result copyFromFramebuffer(const gl::Context *context,
>+                                      const gl::Offset &destOffset,
>+                                      const gl::Rectangle &sourceArea,
>+                                      const gl::Framebuffer *source) override;
>+
>+    angle::Result recoverFromAssociatedStorage(const gl::Context *context);
>     void verifyAssociatedStorageValid(TextureStorage11 *textureStorage) const;
>     void disassociateStorage();
> 
>   protected:
>-    gl::Error map(const gl::Context *context, D3D11_MAP mapType, D3D11_MAPPED_SUBRESOURCE *map);
>+    template <typename T>
>+    friend class d3d11::ScopedUnmapper;
>+    angle::Result map(const gl::Context *context, D3D11_MAP mapType, D3D11_MAPPED_SUBRESOURCE *map);
>     void unmap();
> 
>   private:
>-    gl::Error copyWithoutConversion(const gl::Offset &destOffset,
>-                                    const gl::Box &sourceArea,
>-                                    const TextureHelper11 &textureHelper,
>-                                    UINT sourceSubResource);
>-
>-    gl::Error getStagingTexture(const TextureHelper11 **outStagingTexture,
>-                                unsigned int *outSubresourceIndex);
>-    gl::Error createStagingTexture();
>+    angle::Result copyWithoutConversion(const gl::Context *context,
>+                                        const gl::Offset &destOffset,
>+                                        const gl::Box &sourceArea,
>+                                        const TextureHelper11 &textureHelper,
>+                                        UINT sourceSubResource);
>+
>+    angle::Result getStagingTexture(const gl::Context *context,
>+                                    const TextureHelper11 **outStagingTexture,
>+                                    unsigned int *outSubresourceIndex);
>+    angle::Result createStagingTexture(const gl::Context *context);
>     void releaseStagingTexture();
> 
>     Renderer11 *mRenderer;
>@@ -107,6 +120,6 @@ class Image11 : public ImageD3D
>     unsigned int mRecoveredFromStorageCount;
> };
> 
>-}
>+}  // namespace rx
> 
>-#endif // LIBANGLE_RENDERER_D3D_D3D11_IMAGE11_H_
>+#endif  // LIBANGLE_RENDERER_D3D_D3D11_IMAGE11_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/IndexBuffer11.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/IndexBuffer11.cpp
>index a79fb71f710..cf4eecc6592 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/IndexBuffer11.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/IndexBuffer11.cpp
>@@ -8,6 +8,8 @@
> 
> #include "libANGLE/renderer/d3d/d3d11/IndexBuffer11.h"
> 
>+#include "libANGLE/Context.h"
>+#include "libANGLE/renderer/d3d/d3d11/Context11.h"
> #include "libANGLE/renderer/d3d/d3d11/Renderer11.h"
> #include "libANGLE/renderer/d3d/d3d11/renderer11_utils.h"
> 
>@@ -15,15 +17,19 @@ namespace rx
> {
> 
> IndexBuffer11::IndexBuffer11(Renderer11 *const renderer)
>-    : mRenderer(renderer), mBuffer(), mBufferSize(0), mIndexType(GL_NONE), mDynamicUsage(false)
>-{
>-}
>-
>-IndexBuffer11::~IndexBuffer11()
>-{
>-}
>-
>-gl::Error IndexBuffer11::initialize(unsigned int bufferSize, GLenum indexType, bool dynamic)
>+    : mRenderer(renderer),
>+      mBuffer(),
>+      mBufferSize(0),
>+      mIndexType(gl::DrawElementsType::InvalidEnum),
>+      mDynamicUsage(false)
>+{}
>+
>+IndexBuffer11::~IndexBuffer11() {}
>+
>+angle::Result IndexBuffer11::initialize(const gl::Context *context,
>+                                        unsigned int bufferSize,
>+                                        gl::DrawElementsType indexType,
>+                                        bool dynamic)
> {
>     mBuffer.reset();
> 
>@@ -32,14 +38,14 @@ gl::Error IndexBuffer11::initialize(unsigned int bufferSize, GLenum indexType, b
>     if (bufferSize > 0)
>     {
>         D3D11_BUFFER_DESC bufferDesc;
>-        bufferDesc.ByteWidth = bufferSize;
>-        bufferDesc.Usage = D3D11_USAGE_DYNAMIC;
>-        bufferDesc.BindFlags = D3D11_BIND_INDEX_BUFFER;
>-        bufferDesc.CPUAccessFlags = D3D11_CPU_ACCESS_WRITE;
>-        bufferDesc.MiscFlags = 0;
>+        bufferDesc.ByteWidth           = bufferSize;
>+        bufferDesc.Usage               = D3D11_USAGE_DYNAMIC;
>+        bufferDesc.BindFlags           = D3D11_BIND_INDEX_BUFFER;
>+        bufferDesc.CPUAccessFlags      = D3D11_CPU_ACCESS_WRITE;
>+        bufferDesc.MiscFlags           = 0;
>         bufferDesc.StructureByteStride = 0;
> 
>-        ANGLE_TRY(mRenderer->allocateResource(bufferDesc, &mBuffer));
>+        ANGLE_TRY(mRenderer->allocateResource(GetImplAs<Context11>(context), bufferDesc, &mBuffer));
> 
>         if (dynamic)
>         {
>@@ -51,53 +57,47 @@ gl::Error IndexBuffer11::initialize(unsigned int bufferSize, GLenum indexType, b
>         }
>     }
> 
>-    mBufferSize = bufferSize;
>-    mIndexType = indexType;
>+    mBufferSize   = bufferSize;
>+    mIndexType    = indexType;
>     mDynamicUsage = dynamic;
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error IndexBuffer11::mapBuffer(unsigned int offset, unsigned int size, void** outMappedMemory)
>+angle::Result IndexBuffer11::mapBuffer(const gl::Context *context,
>+                                       unsigned int offset,
>+                                       unsigned int size,
>+                                       void **outMappedMemory)
> {
>-    if (!mBuffer.valid())
>-    {
>-        return gl::OutOfMemory() << "Internal index buffer is not initialized.";
>-    }
>+    Context11 *context11 = GetImplAs<Context11>(context);
>+    ANGLE_CHECK_HR(context11, mBuffer.valid(), "Internal index buffer is not initialized.",
>+                   E_OUTOFMEMORY);
> 
>     // Check for integer overflows and out-out-bounds map requests
>-    if (offset + size < offset || offset + size > mBufferSize)
>-    {
>-        return gl::OutOfMemory() << "Index buffer map range is not inside the buffer.";
>-    }
>-
>-    ID3D11DeviceContext *dxContext = mRenderer->getDeviceContext();
>+    bool outOfBounds = (offset + size < offset || offset + size > mBufferSize);
>+    ANGLE_CHECK_HR(context11, !outOfBounds, "Index buffer map range is not inside the buffer.",
>+                   E_OUTOFMEMORY);
> 
>     D3D11_MAPPED_SUBRESOURCE mappedResource;
>-    HRESULT result =
>-        dxContext->Map(mBuffer.get(), 0, D3D11_MAP_WRITE_NO_OVERWRITE, 0, &mappedResource);
>-    if (FAILED(result))
>-    {
>-        return gl::OutOfMemory() << "Failed to map internal index buffer, " << gl::FmtHR(result);
>-    }
>+    ANGLE_TRY(mRenderer->mapResource(context, mBuffer.get(), 0, D3D11_MAP_WRITE_NO_OVERWRITE, 0,
>+                                     &mappedResource));
> 
>-    *outMappedMemory = reinterpret_cast<char*>(mappedResource.pData) + offset;
>-    return gl::NoError();
>+    *outMappedMemory = static_cast<char *>(mappedResource.pData) + offset;
>+    return angle::Result::Continue;
> }
> 
>-gl::Error IndexBuffer11::unmapBuffer()
>+angle::Result IndexBuffer11::unmapBuffer(const gl::Context *context)
> {
>-    if (!mBuffer.valid())
>-    {
>-        return gl::OutOfMemory() << "Internal index buffer is not initialized.";
>-    }
>+    Context11 *context11 = GetImplAs<Context11>(context);
>+    ANGLE_CHECK_HR(context11, mBuffer.valid(), "Internal index buffer is not initialized.",
>+                   E_OUTOFMEMORY);
> 
>     ID3D11DeviceContext *dxContext = mRenderer->getDeviceContext();
>     dxContext->Unmap(mBuffer.get(), 0);
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-GLenum IndexBuffer11::getIndexType() const
>+gl::DrawElementsType IndexBuffer11::getIndexType() const
> {
>     return mIndexType;
> }
>@@ -107,47 +107,48 @@ unsigned int IndexBuffer11::getBufferSize() const
>     return mBufferSize;
> }
> 
>-gl::Error IndexBuffer11::setSize(unsigned int bufferSize, GLenum indexType)
>+angle::Result IndexBuffer11::setSize(const gl::Context *context,
>+                                     unsigned int bufferSize,
>+                                     gl::DrawElementsType indexType)
> {
>     if (bufferSize > mBufferSize || indexType != mIndexType)
>     {
>-        return initialize(bufferSize, indexType, mDynamicUsage);
>-    }
>-    else
>-    {
>-        return gl::NoError();
>+        return initialize(context, bufferSize, indexType, mDynamicUsage);
>     }
>+
>+    return angle::Result::Continue;
> }
> 
>-gl::Error IndexBuffer11::discard()
>+angle::Result IndexBuffer11::discard(const gl::Context *context)
> {
>-    if (!mBuffer.valid())
>-    {
>-        return gl::OutOfMemory() << "Internal index buffer is not initialized.";
>-    }
>+    Context11 *context11 = GetImplAs<Context11>(context);
>+    ANGLE_CHECK_HR(context11, mBuffer.valid(), "Internal index buffer is not initialized.",
>+                   E_OUTOFMEMORY);
> 
>     ID3D11DeviceContext *dxContext = mRenderer->getDeviceContext();
> 
>     D3D11_MAPPED_SUBRESOURCE mappedResource;
>-    HRESULT result = dxContext->Map(mBuffer.get(), 0, D3D11_MAP_WRITE_DISCARD, 0, &mappedResource);
>-    if (FAILED(result))
>-    {
>-        return gl::OutOfMemory() << "Failed to map internal index buffer, " << gl::FmtHR(result);
>-    }
>+    ANGLE_TRY(mRenderer->mapResource(context, mBuffer.get(), 0, D3D11_MAP_WRITE_DISCARD, 0,
>+                                     &mappedResource));
> 
>     dxContext->Unmap(mBuffer.get(), 0);
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
> DXGI_FORMAT IndexBuffer11::getIndexFormat() const
> {
>     switch (mIndexType)
>     {
>-      case GL_UNSIGNED_BYTE:    return DXGI_FORMAT_R16_UINT;
>-      case GL_UNSIGNED_SHORT:   return DXGI_FORMAT_R16_UINT;
>-      case GL_UNSIGNED_INT:     return DXGI_FORMAT_R32_UINT;
>-      default: UNREACHABLE();   return DXGI_FORMAT_UNKNOWN;
>+        case gl::DrawElementsType::UnsignedByte:
>+            return DXGI_FORMAT_R16_UINT;
>+        case gl::DrawElementsType::UnsignedShort:
>+            return DXGI_FORMAT_R16_UINT;
>+        case gl::DrawElementsType::UnsignedInt:
>+            return DXGI_FORMAT_R32_UINT;
>+        default:
>+            UNREACHABLE();
>+            return DXGI_FORMAT_UNKNOWN;
>     }
> }
> 
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/IndexBuffer11.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/IndexBuffer11.h
>index 7b5d744c02c..8f6f0e65857 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/IndexBuffer11.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/IndexBuffer11.h
>@@ -22,16 +22,24 @@ class IndexBuffer11 : public IndexBuffer
>     explicit IndexBuffer11(Renderer11 *const renderer);
>     ~IndexBuffer11() override;
> 
>-    gl::Error initialize(unsigned int bufferSize, GLenum indexType, bool dynamic) override;
>-
>-    gl::Error mapBuffer(unsigned int offset, unsigned int size, void **outMappedMemory) override;
>-    gl::Error unmapBuffer() override;
>-
>-    GLenum getIndexType() const override;
>+    angle::Result initialize(const gl::Context *context,
>+                             unsigned int bufferSize,
>+                             gl::DrawElementsType indexType,
>+                             bool dynamic) override;
>+
>+    angle::Result mapBuffer(const gl::Context *context,
>+                            unsigned int offset,
>+                            unsigned int size,
>+                            void **outMappedMemory) override;
>+    angle::Result unmapBuffer(const gl::Context *context) override;
>+
>+    gl::DrawElementsType getIndexType() const override;
>     unsigned int getBufferSize() const override;
>-    gl::Error setSize(unsigned int bufferSize, GLenum indexType) override;
>+    angle::Result setSize(const gl::Context *context,
>+                          unsigned int bufferSize,
>+                          gl::DrawElementsType indexType) override;
> 
>-    gl::Error discard() override;
>+    angle::Result discard(const gl::Context *context) override;
> 
>     DXGI_FORMAT getIndexFormat() const;
>     const d3d11::Buffer &getBuffer() const;
>@@ -41,10 +49,10 @@ class IndexBuffer11 : public IndexBuffer
> 
>     d3d11::Buffer mBuffer;
>     unsigned int mBufferSize;
>-    GLenum mIndexType;
>+    gl::DrawElementsType mIndexType;
>     bool mDynamicUsage;
> };
> 
> }  // namespace rx
> 
>-#endif // LIBANGLE_RENDERER_D3D_D3D11_INDEXBUFFER11_H_
>+#endif  // LIBANGLE_RENDERER_D3D_D3D11_INDEXBUFFER11_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/InputLayoutCache.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/InputLayoutCache.cpp
>index a238f97b088..3f343d5fa0e 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/InputLayoutCache.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/InputLayoutCache.cpp
>@@ -18,12 +18,10 @@
> #include "libANGLE/renderer/d3d/IndexDataManager.h"
> #include "libANGLE/renderer/d3d/ProgramD3D.h"
> #include "libANGLE/renderer/d3d/VertexDataManager.h"
>-#include "libANGLE/renderer/d3d/d3d11/Buffer11.h"
> #include "libANGLE/renderer/d3d/d3d11/Context11.h"
> #include "libANGLE/renderer/d3d/d3d11/Renderer11.h"
> #include "libANGLE/renderer/d3d/d3d11/ShaderExecutable11.h"
> #include "libANGLE/renderer/d3d/d3d11/VertexArray11.h"
>-#include "libANGLE/renderer/d3d/d3d11/VertexBuffer11.h"
> #include "libANGLE/renderer/d3d/d3d11/formatutils11.h"
> 
> namespace rx
>@@ -32,11 +30,6 @@ namespace rx
> namespace
> {
> 
>-size_t GetReservedBufferCount(bool usesPointSpriteEmulation)
>-{
>-    return usesPointSpriteEmulation ? 1 : 0;
>-}
>-
> GLenum GetGLSLAttributeType(const std::vector<sh::Attribute> &shaderAttributes, size_t index)
> {
>     // Count matrices differently
>@@ -66,38 +59,39 @@ struct PackedAttribute
>     uint8_t attribType;
>     uint8_t semanticIndex;
>     uint8_t vertexFormatType;
>-    uint8_t divisor;
>+    uint8_t dummyPadding;
>+    uint32_t divisor;
> };
> 
>-} // anonymous namespace
>+}  // anonymous namespace
> 
>-PackedAttributeLayout::PackedAttributeLayout() : numAttributes(0), flags(0), attributeData({})
>-{
>-}
>+PackedAttributeLayout::PackedAttributeLayout() : numAttributes(0), flags(0), attributeData({}) {}
> 
> PackedAttributeLayout::PackedAttributeLayout(const PackedAttributeLayout &other) = default;
> 
> void PackedAttributeLayout::addAttributeData(GLenum glType,
>                                              UINT semanticIndex,
>-                                             gl::VertexFormatType vertexFormatType,
>+                                             angle::FormatID vertexFormatID,
>                                              unsigned int divisor)
> {
>     gl::AttributeType attribType = gl::GetAttributeType(glType);
> 
>     PackedAttribute packedAttrib;
>-    packedAttrib.attribType = static_cast<uint8_t>(attribType);
>-    packedAttrib.semanticIndex = static_cast<uint8_t>(semanticIndex);
>-    packedAttrib.vertexFormatType = static_cast<uint8_t>(vertexFormatType);
>-    packedAttrib.divisor = static_cast<uint8_t>(divisor);
>+    packedAttrib.attribType       = static_cast<uint8_t>(attribType);
>+    packedAttrib.semanticIndex    = static_cast<uint8_t>(semanticIndex);
>+    packedAttrib.vertexFormatType = static_cast<uint8_t>(vertexFormatID);
>+    packedAttrib.dummyPadding     = 0u;
>+    packedAttrib.divisor          = static_cast<uint32_t>(divisor);
> 
>     ASSERT(static_cast<gl::AttributeType>(packedAttrib.attribType) == attribType);
>     ASSERT(static_cast<UINT>(packedAttrib.semanticIndex) == semanticIndex);
>-    ASSERT(static_cast<gl::VertexFormatType>(packedAttrib.vertexFormatType) == vertexFormatType);
>+    ASSERT(static_cast<angle::FormatID>(packedAttrib.vertexFormatType) == vertexFormatID);
>     ASSERT(static_cast<unsigned int>(packedAttrib.divisor) == divisor);
> 
>-    static_assert(sizeof(uint32_t) == sizeof(PackedAttribute), "PackedAttributes must be 32-bits exactly.");
>+    static_assert(sizeof(uint64_t) == sizeof(PackedAttribute),
>+                  "PackedAttributes must be 64-bits exactly.");
> 
>-    attributeData[numAttributes++] = gl::bitCast<uint32_t>(packedAttrib);
>+    attributeData[numAttributes++] = gl::bitCast<uint64_t>(packedAttrib);
> }
> 
> bool PackedAttributeLayout::operator==(const PackedAttributeLayout &other) const
>@@ -106,210 +100,24 @@ bool PackedAttributeLayout::operator==(const PackedAttributeLayout &other) const
>            (attributeData == other.attributeData);
> }
> 
>-InputLayoutCache::InputLayoutCache()
>-    : mLayoutCache(kDefaultCacheSize * 2), mPointSpriteVertexBuffer(), mPointSpriteIndexBuffer()
>-{
>-}
>+InputLayoutCache::InputLayoutCache() : mLayoutCache(kDefaultCacheSize * 2) {}
> 
>-InputLayoutCache::~InputLayoutCache()
>-{
>-}
>+InputLayoutCache::~InputLayoutCache() {}
> 
> void InputLayoutCache::clear()
> {
>     mLayoutCache.Clear();
>-    mPointSpriteVertexBuffer.reset();
>-    mPointSpriteIndexBuffer.reset();
>-}
>-
>-gl::Error InputLayoutCache::applyVertexBuffers(
>-    const gl::Context *context,
>-    const std::vector<const TranslatedAttribute *> &currentAttributes,
>-    GLenum mode,
>-    GLint start,
>-    bool isIndexedRendering)
>-{
>-    Renderer11 *renderer   = GetImplAs<Context11>(context)->getRenderer();
>-    const gl::State &state = context->getGLState();
>-    auto *stateManager     = renderer->getStateManager();
>-    gl::Program *program   = state.getProgram();
>-    ProgramD3D *programD3D = GetImplAs<ProgramD3D>(program);
>-
>-    bool programUsesInstancedPointSprites = programD3D->usesPointSize() && programD3D->usesInstancedPointSpriteEmulation();
>-    bool instancedPointSpritesActive = programUsesInstancedPointSprites && (mode == GL_POINTS);
>-
>-    // Note that if we use instance emulation, we reserve the first buffer slot.
>-    size_t reservedBuffers = GetReservedBufferCount(programUsesInstancedPointSprites);
>-
>-    for (size_t attribIndex = 0; attribIndex < (gl::MAX_VERTEX_ATTRIBS - reservedBuffers);
>-         ++attribIndex)
>-    {
>-        ID3D11Buffer *buffer = nullptr;
>-        UINT vertexStride    = 0;
>-        UINT vertexOffset    = 0;
>-
>-        if (attribIndex < currentAttributes.size())
>-        {
>-            const auto &attrib      = *currentAttributes[attribIndex];
>-            Buffer11 *bufferStorage = attrib.storage ? GetAs<Buffer11>(attrib.storage) : nullptr;
>-
>-            // If indexed pointsprite emulation is active, then we need to take a less efficent code path.
>-            // Emulated indexed pointsprite rendering requires that the vertex buffers match exactly to
>-            // the indices passed by the caller.  This could expand or shrink the vertex buffer depending
>-            // on the number of points indicated by the index list or how many duplicates are found on the index list.
>-            if (bufferStorage == nullptr)
>-            {
>-                ASSERT(attrib.vertexBuffer.get());
>-                buffer = GetAs<VertexBuffer11>(attrib.vertexBuffer.get())->getBuffer().get();
>-            }
>-            else if (instancedPointSpritesActive && isIndexedRendering)
>-            {
>-                VertexArray11 *vao11 = GetImplAs<VertexArray11>(state.getVertexArray());
>-                ASSERT(vao11->isCachedIndexInfoValid());
>-                TranslatedIndexData *indexInfo = vao11->getCachedIndexInfo();
>-                if (indexInfo->srcIndexData.srcBuffer != nullptr)
>-                {
>-                    const uint8_t *bufferData = nullptr;
>-                    ANGLE_TRY(indexInfo->srcIndexData.srcBuffer->getData(context, &bufferData));
>-                    ASSERT(bufferData != nullptr);
>-
>-                    ptrdiff_t offset =
>-                        reinterpret_cast<ptrdiff_t>(indexInfo->srcIndexData.srcIndices);
>-                    indexInfo->srcIndexData.srcBuffer  = nullptr;
>-                    indexInfo->srcIndexData.srcIndices = bufferData + offset;
>-                }
>-
>-                ANGLE_TRY_RESULT(bufferStorage->getEmulatedIndexedBuffer(
>-                                     context, &indexInfo->srcIndexData, attrib, start),
>-                                 buffer);
>-            }
>-            else
>-            {
>-                ANGLE_TRY_RESULT(
>-                    bufferStorage->getBuffer(context, BUFFER_USAGE_VERTEX_OR_TRANSFORM_FEEDBACK),
>-                    buffer);
>-            }
>-
>-            vertexStride = attrib.stride;
>-            ANGLE_TRY_RESULT(attrib.computeOffset(start), vertexOffset);
>-        }
>-
>-        size_t bufferIndex = reservedBuffers + attribIndex;
>-
>-        stateManager->queueVertexBufferChange(bufferIndex, buffer, vertexStride, vertexOffset);
>-    }
>-
>-    // Instanced PointSprite emulation requires two additional ID3D11Buffers. A vertex buffer needs
>-    // to be created and added to the list of current buffers, strides and offsets collections.
>-    // This buffer contains the vertices for a single PointSprite quad.
>-    // An index buffer also needs to be created and applied because rendering instanced data on
>-    // D3D11 FL9_3 requires DrawIndexedInstanced() to be used. Shaders that contain gl_PointSize and
>-    // used without the GL_POINTS rendering mode require a vertex buffer because some drivers cannot
>-    // handle missing vertex data and will TDR the system.
>-    if (programUsesInstancedPointSprites)
>-    {
>-        const UINT pointSpriteVertexStride = sizeof(float) * 5;
>-
>-        if (!mPointSpriteVertexBuffer.valid())
>-        {
>-            static const float pointSpriteVertices[] =
>-            {
>-                // Position        // TexCoord
>-               -1.0f, -1.0f, 0.0f, 0.0f, 1.0f,
>-               -1.0f,  1.0f, 0.0f, 0.0f, 0.0f,
>-                1.0f,  1.0f, 0.0f, 1.0f, 0.0f,
>-                1.0f, -1.0f, 0.0f, 1.0f, 1.0f,
>-               -1.0f, -1.0f, 0.0f, 0.0f, 1.0f,
>-                1.0f,  1.0f, 0.0f, 1.0f, 0.0f,
>-            };
>-
>-            D3D11_SUBRESOURCE_DATA vertexBufferData = { pointSpriteVertices, 0, 0 };
>-            D3D11_BUFFER_DESC vertexBufferDesc;
>-            vertexBufferDesc.ByteWidth = sizeof(pointSpriteVertices);
>-            vertexBufferDesc.BindFlags = D3D11_BIND_VERTEX_BUFFER;
>-            vertexBufferDesc.Usage = D3D11_USAGE_IMMUTABLE;
>-            vertexBufferDesc.CPUAccessFlags = 0;
>-            vertexBufferDesc.MiscFlags = 0;
>-            vertexBufferDesc.StructureByteStride = 0;
>-
>-            ANGLE_TRY(renderer->allocateResource(vertexBufferDesc, &vertexBufferData,
>-                                                 &mPointSpriteVertexBuffer));
>-        }
>-
>-        // Set the stride to 0 if GL_POINTS mode is not being used to instruct the driver to avoid
>-        // indexing into the vertex buffer.
>-        UINT stride = instancedPointSpritesActive ? pointSpriteVertexStride : 0;
>-        stateManager->queueVertexBufferChange(0, mPointSpriteVertexBuffer.get(), stride, 0);
>-
>-        if (!mPointSpriteIndexBuffer.valid())
>-        {
>-            // Create an index buffer and set it for pointsprite rendering
>-            static const unsigned short pointSpriteIndices[] =
>-            {
>-                0, 1, 2, 3, 4, 5,
>-            };
>-
>-            D3D11_SUBRESOURCE_DATA indexBufferData = { pointSpriteIndices, 0, 0 };
>-            D3D11_BUFFER_DESC indexBufferDesc;
>-            indexBufferDesc.ByteWidth = sizeof(pointSpriteIndices);
>-            indexBufferDesc.BindFlags = D3D11_BIND_INDEX_BUFFER;
>-            indexBufferDesc.Usage = D3D11_USAGE_IMMUTABLE;
>-            indexBufferDesc.CPUAccessFlags = 0;
>-            indexBufferDesc.MiscFlags = 0;
>-            indexBufferDesc.StructureByteStride = 0;
>-
>-            ANGLE_TRY(renderer->allocateResource(indexBufferDesc, &indexBufferData,
>-                                                 &mPointSpriteIndexBuffer));
>-        }
>-
>-        if (instancedPointSpritesActive)
>-        {
>-            // The index buffer is applied here because Instanced PointSprite emulation uses the a
>-            // non-indexed rendering path in ANGLE (DrawArrays). This means that applyIndexBuffer()
>-            // on the renderer will not be called and setting this buffer here ensures that the
>-            // rendering path will contain the correct index buffers.
>-            stateManager->setIndexBuffer(mPointSpriteIndexBuffer.get(), DXGI_FORMAT_R16_UINT, 0);
>-        }
>-    }
>-
>-    stateManager->applyVertexBufferChanges();
>-    return gl::NoError();
>-}
>-
>-gl::Error InputLayoutCache::updateVertexOffsetsForPointSpritesEmulation(
>-    Renderer11 *renderer,
>-    const std::vector<const TranslatedAttribute *> &currentAttributes,
>-    GLint startVertex,
>-    GLsizei emulatedInstanceId)
>-{
>-    auto *stateManager = renderer->getStateManager();
>-
>-    size_t reservedBuffers = GetReservedBufferCount(true);
>-    for (size_t attribIndex = 0; attribIndex < currentAttributes.size(); ++attribIndex)
>-    {
>-        const auto &attrib = *currentAttributes[attribIndex];
>-        size_t bufferIndex = reservedBuffers + attribIndex;
>-
>-        if (attrib.divisor > 0)
>-        {
>-            unsigned int offset = 0;
>-            ANGLE_TRY_RESULT(attrib.computeOffset(startVertex), offset);
>-            offset += (attrib.stride * (emulatedInstanceId / attrib.divisor));
>-            stateManager->queueVertexOffsetChange(bufferIndex, offset);
>-        }
>-    }
>-
>-    stateManager->applyVertexBufferChanges();
>-    return gl::NoError();
> }
> 
>-gl::Error InputLayoutCache::updateInputLayout(
>-    Renderer11 *renderer,
>+angle::Result InputLayoutCache::getInputLayout(
>+    Context11 *context11,
>     const gl::State &state,
>     const std::vector<const TranslatedAttribute *> &currentAttributes,
>-    GLenum mode,
>     const AttribIndexArray &sortedSemanticIndices,
>-    const DrawCallVertexParams &vertexParams)
>+    gl::PrimitiveMode mode,
>+    GLsizei vertexCount,
>+    GLsizei instances,
>+    const d3d11::InputLayout **inputLayoutOut)
> {
>     gl::Program *program         = state.getProgram();
>     const auto &shaderAttributes = program->getAttributes();
>@@ -318,7 +126,8 @@ gl::Error InputLayoutCache::updateInputLayout(
>     ProgramD3D *programD3D = GetImplAs<ProgramD3D>(program);
>     bool programUsesInstancedPointSprites =
>         programD3D->usesPointSize() && programD3D->usesInstancedPointSpriteEmulation();
>-    bool instancedPointSpritesActive = programUsesInstancedPointSprites && (mode == GL_POINTS);
>+    bool instancedPointSpritesActive =
>+        programUsesInstancedPointSprites && (mode == gl::PrimitiveMode::Points);
> 
>     if (programUsesInstancedPointSprites)
>     {
>@@ -330,7 +139,7 @@ gl::Error InputLayoutCache::updateInputLayout(
>         layout.flags |= PackedAttributeLayout::FLAG_INSTANCED_SPRITES_ACTIVE;
>     }
> 
>-    if (vertexParams.instances() > 0)
>+    if (instances > 0)
>     {
>         layout.flags |= PackedAttributeLayout::FLAG_INSTANCED_RENDERING_ACTIVE;
>     }
>@@ -346,60 +155,59 @@ gl::Error InputLayoutCache::updateInputLayout(
>         // This will prevent mismatched vertex shaders from using the same input layout
>         GLenum glslElementType = GetGLSLAttributeType(shaderAttributes, attribIndex);
> 
>-        const auto &attrib = attribs[attribIndex];
>+        const auto &attrib  = attribs[attribIndex];
>         const auto &binding = bindings[attrib.bindingIndex];
>-        int d3dSemantic    = locationToSemantic[attribIndex];
>+        int d3dSemantic     = locationToSemantic[attribIndex];
> 
>         const auto &currentValue =
>             state.getVertexAttribCurrentValue(static_cast<unsigned int>(attribIndex));
>-        gl::VertexFormatType vertexFormatType = gl::GetVertexFormatType(attrib, currentValue.Type);
>+        angle::FormatID vertexFormatID = gl::GetVertexFormatID(attrib, currentValue.Type);
> 
>-        layout.addAttributeData(glslElementType, d3dSemantic, vertexFormatType,
>+        layout.addAttributeData(glslElementType, d3dSemantic, vertexFormatID,
>                                 binding.getDivisor() * divisorMultiplier);
>     }
> 
>-    const d3d11::InputLayout *inputLayout = nullptr;
>     if (layout.numAttributes > 0 || layout.flags != 0)
>     {
>         auto it = mLayoutCache.Get(layout);
>         if (it != mLayoutCache.end())
>         {
>-            inputLayout = &it->second;
>+            *inputLayoutOut = &it->second;
>         }
>         else
>         {
>             angle::TrimCache(mLayoutCache.max_size() / 2, kGCLimit, "input layout", &mLayoutCache);
> 
>             d3d11::InputLayout newInputLayout;
>-            ANGLE_TRY(createInputLayout(renderer, sortedSemanticIndices, currentAttributes, mode,
>-                                        program, vertexParams, &newInputLayout));
>+            ANGLE_TRY(createInputLayout(context11, sortedSemanticIndices, currentAttributes, mode,
>+                                        vertexCount, instances, &newInputLayout));
> 
>-            auto insertIt = mLayoutCache.Put(layout, std::move(newInputLayout));
>-            inputLayout   = &insertIt->second;
>+            auto insertIt   = mLayoutCache.Put(layout, std::move(newInputLayout));
>+            *inputLayoutOut = &insertIt->second;
>         }
>     }
> 
>-    renderer->getStateManager()->setInputLayout(inputLayout);
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error InputLayoutCache::createInputLayout(
>-    Renderer11 *renderer,
>+angle::Result InputLayoutCache::createInputLayout(
>+    Context11 *context11,
>     const AttribIndexArray &sortedSemanticIndices,
>     const std::vector<const TranslatedAttribute *> &currentAttributes,
>-    GLenum mode,
>-    gl::Program *program,
>-    const DrawCallVertexParams &vertexParams,
>+    gl::PrimitiveMode mode,
>+    GLsizei vertexCount,
>+    GLsizei instances,
>     d3d11::InputLayout *inputLayoutOut)
> {
>-    ProgramD3D *programD3D = GetImplAs<ProgramD3D>(program);
>-    auto featureLevel      = renderer->getRenderer11DeviceCaps().featureLevel;
>+    Renderer11 *renderer           = context11->getRenderer();
>+    ProgramD3D *programD3D         = renderer->getStateManager()->getProgramD3D();
>+    D3D_FEATURE_LEVEL featureLevel = renderer->getRenderer11DeviceCaps().featureLevel;
> 
>     bool programUsesInstancedPointSprites =
>         programD3D->usesPointSize() && programD3D->usesInstancedPointSpriteEmulation();
> 
>     unsigned int inputElementCount = 0;
>-    std::array<D3D11_INPUT_ELEMENT_DESC, gl::MAX_VERTEX_ATTRIBS> inputElements;
>+    gl::AttribArray<D3D11_INPUT_ELEMENT_DESC> inputElements;
> 
>     for (size_t attribIndex = 0; attribIndex < currentAttributes.size(); ++attribIndex)
>     {
>@@ -409,9 +217,9 @@ gl::Error InputLayoutCache::createInputLayout(
>         D3D11_INPUT_CLASSIFICATION inputClass =
>             attrib.divisor > 0 ? D3D11_INPUT_PER_INSTANCE_DATA : D3D11_INPUT_PER_VERTEX_DATA;
> 
>-        const auto &vertexFormatType =
>-            gl::GetVertexFormatType(*attrib.attribute, attrib.currentValueType);
>-        const auto &vertexFormatInfo = d3d11::GetVertexFormatInfo(vertexFormatType, featureLevel);
>+        angle::FormatID vertexFormatID =
>+            gl::GetVertexFormatID(*attrib.attribute, attrib.currentValueType);
>+        const auto &vertexFormatInfo = d3d11::GetVertexFormatInfo(vertexFormatID, featureLevel);
> 
>         auto *inputElement = &inputElements[inputElementCount];
> 
>@@ -439,18 +247,19 @@ gl::Error InputLayoutCache::createInputLayout(
>         // As per the spec for ANGLE_instanced_arrays, not all attributes can be instanced
>         // simultaneously, so a non-instanced element must exist.
> 
>-        GLsizei numIndicesPerInstance = 0;
>-        if (vertexParams.instances() > 0)
>+        UINT numIndicesPerInstance = 0;
>+        if (instances > 0)
>         {
>-            // This may trigger an evaluation of the index range.
>-            numIndicesPerInstance = vertexParams.vertexCount();
>+            // This requires that the index range is resolved.
>+            // Note: Vertex indexes can be arbitrarily large.
>+            numIndicesPerInstance = gl::clampCast<UINT>(vertexCount);
>         }
> 
>         for (size_t elementIndex = 0; elementIndex < inputElementCount; ++elementIndex)
>         {
>             // If rendering points and instanced pointsprite emulation is being used, the
>             // inputClass is required to be configured as per instance data
>-            if (mode == GL_POINTS)
>+            if (mode == gl::PrimitiveMode::Points)
>             {
>                 inputElements[elementIndex].InputSlotClass       = D3D11_INPUT_PER_INSTANCE_DATA;
>                 inputElements[elementIndex].InstanceDataStepRate = 1;
>@@ -482,15 +291,16 @@ gl::Error InputLayoutCache::createInputLayout(
>     }
> 
>     ShaderExecutableD3D *shader = nullptr;
>-    ANGLE_TRY(programD3D->getVertexExecutableForCachedInputLayout(&shader, nullptr));
>+    ANGLE_TRY(programD3D->getVertexExecutableForCachedInputLayout(context11, &shader, nullptr));
> 
>     ShaderExecutableD3D *shader11 = GetAs<ShaderExecutable11>(shader);
> 
>     InputElementArray inputElementArray(inputElements.data(), inputElementCount);
>     ShaderData vertexShaderData(shader11->getFunction(), shader11->getLength());
> 
>-    ANGLE_TRY(renderer->allocateResource(inputElementArray, &vertexShaderData, inputLayoutOut));
>-    return gl::NoError();
>+    ANGLE_TRY(renderer->allocateResource(context11, inputElementArray, &vertexShaderData,
>+                                         inputLayoutOut));
>+    return angle::Result::Continue;
> }
> 
> void InputLayoutCache::setCacheSize(size_t newCacheSize)
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/InputLayoutCache.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/InputLayoutCache.h
>index 8d7c7dd0f02..3d62ecd3d00 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/InputLayoutCache.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/InputLayoutCache.h
>@@ -27,7 +27,6 @@
> 
> namespace rx
> {
>-class DrawCallVertexParams;
> struct PackedAttributeLayout
> {
>     PackedAttributeLayout();
>@@ -35,7 +34,7 @@ struct PackedAttributeLayout
> 
>     void addAttributeData(GLenum glType,
>                           UINT semanticIndex,
>-                          gl::VertexFormatType vertexFormatType,
>+                          angle::FormatID vertexFormatID,
>                           unsigned int divisor);
> 
>     bool operator==(const PackedAttributeLayout &other) const;
>@@ -49,7 +48,7 @@ struct PackedAttributeLayout
> 
>     uint32_t numAttributes;
>     uint32_t flags;
>-    std::array<uint32_t, gl::MAX_VERTEX_ATTRIBS> attributeData;
>+    gl::AttribArray<uint64_t> attributeData;
> };
> }  // namespace rx
> 
>@@ -72,6 +71,7 @@ class Program;
> 
> namespace rx
> {
>+class Context11;
> struct TranslatedAttribute;
> struct TranslatedIndexData;
> struct SourceIndexData;
>@@ -86,36 +86,27 @@ class InputLayoutCache : angle::NonCopyable
> 
>     void clear();
> 
>-    gl::Error applyVertexBuffers(const gl::Context *context,
>-                                 const std::vector<const TranslatedAttribute *> &currentAttributes,
>-                                 GLenum mode,
>-                                 GLint start,
>-                                 bool isIndexedRendering);
>-
>-    gl::Error updateVertexOffsetsForPointSpritesEmulation(
>-        Renderer11 *renderer,
>-        const std::vector<const TranslatedAttribute *> &currentAttributes,
>-        GLint startVertex,
>-        GLsizei emulatedInstanceId);
>-
>     // Useful for testing
>     void setCacheSize(size_t newCacheSize);
> 
>-    gl::Error updateInputLayout(Renderer11 *renderer,
>-                                const gl::State &state,
>-                                const std::vector<const TranslatedAttribute *> &currentAttributes,
>-                                GLenum mode,
>-                                const AttribIndexArray &sortedSemanticIndices,
>-                                const DrawCallVertexParams &vertexParams);
>+    angle::Result getInputLayout(Context11 *context,
>+                                 const gl::State &state,
>+                                 const std::vector<const TranslatedAttribute *> &currentAttributes,
>+                                 const AttribIndexArray &sortedSemanticIndices,
>+                                 gl::PrimitiveMode mode,
>+                                 GLsizei vertexCount,
>+                                 GLsizei instances,
>+                                 const d3d11::InputLayout **inputLayoutOut);
> 
>   private:
>-    gl::Error createInputLayout(Renderer11 *renderer,
>-                                const AttribIndexArray &sortedSemanticIndices,
>-                                const std::vector<const TranslatedAttribute *> &currentAttributes,
>-                                GLenum mode,
>-                                gl::Program *program,
>-                                const DrawCallVertexParams &vertexParams,
>-                                d3d11::InputLayout *inputLayoutOut);
>+    angle::Result createInputLayout(
>+        Context11 *context11,
>+        const AttribIndexArray &sortedSemanticIndices,
>+        const std::vector<const TranslatedAttribute *> &currentAttributes,
>+        gl::PrimitiveMode mode,
>+        GLsizei vertexCount,
>+        GLsizei instances,
>+        d3d11::InputLayout *inputLayoutOut);
> 
>     // Starting cache size.
>     static constexpr size_t kDefaultCacheSize = 1024;
>@@ -125,11 +116,8 @@ class InputLayoutCache : angle::NonCopyable
> 
>     using LayoutCache = angle::base::HashingMRUCache<PackedAttributeLayout, d3d11::InputLayout>;
>     LayoutCache mLayoutCache;
>-
>-    d3d11::Buffer mPointSpriteVertexBuffer;
>-    d3d11::Buffer mPointSpriteIndexBuffer;
> };
> 
> }  // namespace rx
> 
>-#endif // LIBANGLE_RENDERER_D3D_D3D11_INPUTLAYOUTCACHE_H_
>+#endif  // LIBANGLE_RENDERER_D3D_D3D11_INPUTLAYOUTCACHE_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/NativeWindow11.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/NativeWindow11.h
>index ab234d44506..4bf14a97a84 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/NativeWindow11.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/NativeWindow11.h
>@@ -31,7 +31,7 @@ class NativeWindow11 : public NativeWindowD3D
>                                     UINT height,
>                                     UINT samples,
>                                     IDXGISwapChain **swapChain) = 0;
>-    virtual void commitChange() = 0;
>+    virtual void commitChange()                                 = 0;
> };
> }  // namespace rx
> 
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/PixelTransfer11.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/PixelTransfer11.cpp
>index 7d7ecb09761..2d96cdab52e 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/PixelTransfer11.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/PixelTransfer11.cpp
>@@ -13,15 +13,16 @@
> 
> #include "libANGLE/Buffer.h"
> #include "libANGLE/Context.h"
>+#include "libANGLE/Texture.h"
> #include "libANGLE/formatutils.h"
> #include "libANGLE/renderer/d3d/d3d11/Buffer11.h"
>-#include "libANGLE/renderer/d3d/d3d11/formatutils11.h"
>+#include "libANGLE/renderer/d3d/d3d11/Context11.h"
>+#include "libANGLE/renderer/d3d/d3d11/RenderTarget11.h"
> #include "libANGLE/renderer/d3d/d3d11/Renderer11.h"
>+#include "libANGLE/renderer/d3d/d3d11/TextureStorage11.h"
>+#include "libANGLE/renderer/d3d/d3d11/formatutils11.h"
> #include "libANGLE/renderer/d3d/d3d11/renderer11_utils.h"
>-#include "libANGLE/renderer/d3d/d3d11/RenderTarget11.h"
> #include "libANGLE/renderer/d3d/d3d11/texture_format_table.h"
>-#include "libANGLE/renderer/d3d/d3d11/TextureStorage11.h"
>-#include "libANGLE/Texture.h"
> 
> // Precompiled shaders
> #include "libANGLE/renderer/d3d/d3d11/shaders/compiled/buffertotexture11_gs.h"
>@@ -41,120 +42,129 @@ PixelTransfer11::PixelTransfer11(Renderer11 *renderer)
>       mParamsConstantBuffer(),
>       mCopyRasterizerState(),
>       mCopyDepthStencilState()
>-{
>-}
>+{}
> 
>-PixelTransfer11::~PixelTransfer11()
>-{
>-}
>+PixelTransfer11::~PixelTransfer11() {}
> 
>-gl::Error PixelTransfer11::loadResources()
>+angle::Result PixelTransfer11::loadResources(const gl::Context *context)
> {
>     if (mResourcesLoaded)
>     {
>-        return gl::NoError();
>+        return angle::Result::Continue;
>     }
> 
>     D3D11_RASTERIZER_DESC rasterDesc;
>-    rasterDesc.FillMode = D3D11_FILL_SOLID;
>-    rasterDesc.CullMode = D3D11_CULL_NONE;
>+    rasterDesc.FillMode              = D3D11_FILL_SOLID;
>+    rasterDesc.CullMode              = D3D11_CULL_NONE;
>     rasterDesc.FrontCounterClockwise = FALSE;
>-    rasterDesc.DepthBias = 0;
>-    rasterDesc.SlopeScaledDepthBias = 0.0f;
>-    rasterDesc.DepthBiasClamp = 0.0f;
>-    rasterDesc.DepthClipEnable = TRUE;
>-    rasterDesc.ScissorEnable = FALSE;
>-    rasterDesc.MultisampleEnable = FALSE;
>+    rasterDesc.DepthBias             = 0;
>+    rasterDesc.SlopeScaledDepthBias  = 0.0f;
>+    rasterDesc.DepthBiasClamp        = 0.0f;
>+    rasterDesc.DepthClipEnable       = TRUE;
>+    rasterDesc.ScissorEnable         = FALSE;
>+    rasterDesc.MultisampleEnable     = FALSE;
>     rasterDesc.AntialiasedLineEnable = FALSE;
> 
>-    ANGLE_TRY(mRenderer->allocateResource(rasterDesc, &mCopyRasterizerState));
>+    Context11 *context11 = GetImplAs<Context11>(context);
>+
>+    ANGLE_TRY(mRenderer->allocateResource(context11, rasterDesc, &mCopyRasterizerState));
> 
>     D3D11_DEPTH_STENCIL_DESC depthStencilDesc;
>-    depthStencilDesc.DepthEnable = true;
>-    depthStencilDesc.DepthWriteMask = D3D11_DEPTH_WRITE_MASK_ALL;
>-    depthStencilDesc.DepthFunc = D3D11_COMPARISON_ALWAYS;
>-    depthStencilDesc.StencilEnable = FALSE;
>-    depthStencilDesc.StencilReadMask = D3D11_DEFAULT_STENCIL_READ_MASK;
>-    depthStencilDesc.StencilWriteMask = D3D11_DEFAULT_STENCIL_WRITE_MASK;
>-    depthStencilDesc.FrontFace.StencilFailOp = D3D11_STENCIL_OP_KEEP;
>+    depthStencilDesc.DepthEnable                  = true;
>+    depthStencilDesc.DepthWriteMask               = D3D11_DEPTH_WRITE_MASK_ALL;
>+    depthStencilDesc.DepthFunc                    = D3D11_COMPARISON_ALWAYS;
>+    depthStencilDesc.StencilEnable                = FALSE;
>+    depthStencilDesc.StencilReadMask              = D3D11_DEFAULT_STENCIL_READ_MASK;
>+    depthStencilDesc.StencilWriteMask             = D3D11_DEFAULT_STENCIL_WRITE_MASK;
>+    depthStencilDesc.FrontFace.StencilFailOp      = D3D11_STENCIL_OP_KEEP;
>     depthStencilDesc.FrontFace.StencilDepthFailOp = D3D11_STENCIL_OP_KEEP;
>-    depthStencilDesc.FrontFace.StencilPassOp = D3D11_STENCIL_OP_KEEP;
>-    depthStencilDesc.FrontFace.StencilFunc = D3D11_COMPARISON_ALWAYS;
>-    depthStencilDesc.BackFace.StencilFailOp = D3D11_STENCIL_OP_KEEP;
>-    depthStencilDesc.BackFace.StencilDepthFailOp = D3D11_STENCIL_OP_KEEP;
>-    depthStencilDesc.BackFace.StencilPassOp = D3D11_STENCIL_OP_KEEP;
>-    depthStencilDesc.BackFace.StencilFunc = D3D11_COMPARISON_ALWAYS;
>-
>-    ANGLE_TRY(mRenderer->allocateResource(depthStencilDesc, &mCopyDepthStencilState));
>-
>-    D3D11_BUFFER_DESC constantBufferDesc = { 0 };
>-    constantBufferDesc.ByteWidth = roundUp<UINT>(sizeof(CopyShaderParams), 32u);
>-    constantBufferDesc.Usage = D3D11_USAGE_DYNAMIC;
>-    constantBufferDesc.BindFlags = D3D11_BIND_CONSTANT_BUFFER;
>-    constantBufferDesc.CPUAccessFlags = D3D11_CPU_ACCESS_WRITE;
>-    constantBufferDesc.MiscFlags = 0;
>+    depthStencilDesc.FrontFace.StencilPassOp      = D3D11_STENCIL_OP_KEEP;
>+    depthStencilDesc.FrontFace.StencilFunc        = D3D11_COMPARISON_ALWAYS;
>+    depthStencilDesc.BackFace.StencilFailOp       = D3D11_STENCIL_OP_KEEP;
>+    depthStencilDesc.BackFace.StencilDepthFailOp  = D3D11_STENCIL_OP_KEEP;
>+    depthStencilDesc.BackFace.StencilPassOp       = D3D11_STENCIL_OP_KEEP;
>+    depthStencilDesc.BackFace.StencilFunc         = D3D11_COMPARISON_ALWAYS;
>+
>+    ANGLE_TRY(mRenderer->allocateResource(context11, depthStencilDesc, &mCopyDepthStencilState));
>+
>+    D3D11_BUFFER_DESC constantBufferDesc   = {0};
>+    constantBufferDesc.ByteWidth           = roundUp<UINT>(sizeof(CopyShaderParams), 32u);
>+    constantBufferDesc.Usage               = D3D11_USAGE_DYNAMIC;
>+    constantBufferDesc.BindFlags           = D3D11_BIND_CONSTANT_BUFFER;
>+    constantBufferDesc.CPUAccessFlags      = D3D11_CPU_ACCESS_WRITE;
>+    constantBufferDesc.MiscFlags           = 0;
>     constantBufferDesc.StructureByteStride = 0;
> 
>-    ANGLE_TRY(mRenderer->allocateResource(constantBufferDesc, &mParamsConstantBuffer));
>+    ANGLE_TRY(mRenderer->allocateResource(context11, constantBufferDesc, &mParamsConstantBuffer));
>     mParamsConstantBuffer.setDebugName("PixelTransfer11 constant buffer");
> 
>     // init shaders
>-    ANGLE_TRY(mRenderer->allocateResource(ShaderData(g_VS_BufferToTexture), &mBufferToTextureVS));
>+    ANGLE_TRY(mRenderer->allocateResource(context11, ShaderData(g_VS_BufferToTexture),
>+                                          &mBufferToTextureVS));
>     mBufferToTextureVS.setDebugName("BufferToTexture VS");
> 
>-    ANGLE_TRY(mRenderer->allocateResource(ShaderData(g_GS_BufferToTexture), &mBufferToTextureGS));
>+    ANGLE_TRY(mRenderer->allocateResource(context11, ShaderData(g_GS_BufferToTexture),
>+                                          &mBufferToTextureGS));
>     mBufferToTextureGS.setDebugName("BufferToTexture GS");
> 
>-    ANGLE_TRY(buildShaderMap());
>+    ANGLE_TRY(buildShaderMap(context));
> 
>     StructZero(&mParamsData);
> 
>     mResourcesLoaded = true;
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-void PixelTransfer11::setBufferToTextureCopyParams(const gl::Box &destArea, const gl::Extents &destSize, GLenum internalFormat,
>-                                                   const gl::PixelUnpackState &unpack, unsigned int offset, CopyShaderParams *parametersOut)
>+void PixelTransfer11::setBufferToTextureCopyParams(const gl::Box &destArea,
>+                                                   const gl::Extents &destSize,
>+                                                   GLenum internalFormat,
>+                                                   const gl::PixelUnpackState &unpack,
>+                                                   unsigned int offset,
>+                                                   CopyShaderParams *parametersOut)
> {
>     StructZero(parametersOut);
> 
>-    float texelCenterX = 0.5f / static_cast<float>(destSize.width - 1);
>-    float texelCenterY = 0.5f / static_cast<float>(destSize.height - 1);
>+    float texelCenterX = 0.5f / static_cast<float>(destSize.width);
>+    float texelCenterY = 0.5f / static_cast<float>(destSize.height);
> 
>-    unsigned int bytesPerPixel   = gl::GetSizedInternalFormatInfo(internalFormat).pixelBytes;
>+    unsigned int bytesPerPixel  = gl::GetSizedInternalFormatInfo(internalFormat).pixelBytes;
>     unsigned int alignmentBytes = static_cast<unsigned int>(unpack.alignment);
>-    unsigned int alignmentPixels = (alignmentBytes <= bytesPerPixel ? 1 : alignmentBytes / bytesPerPixel);
>-
>-    parametersOut->FirstPixelOffset     = offset / bytesPerPixel;
>-    parametersOut->PixelsPerRow         = static_cast<unsigned int>((unpack.rowLength > 0) ? unpack.rowLength : destArea.width);
>-    parametersOut->RowStride            = roundUp(parametersOut->PixelsPerRow, alignmentPixels);
>-    parametersOut->RowsPerSlice         = static_cast<unsigned int>(destArea.height);
>-    parametersOut->PositionOffset[0]    = texelCenterX + (destArea.x / float(destSize.width)) * 2.0f - 1.0f;
>-    parametersOut->PositionOffset[1]    = texelCenterY + ((destSize.height - destArea.y - 1) / float(destSize.height)) * 2.0f - 1.0f;
>-    parametersOut->PositionScale[0]     = 2.0f / static_cast<float>(destSize.width);
>-    parametersOut->PositionScale[1]     = -2.0f / static_cast<float>(destSize.height);
>-    parametersOut->FirstSlice           = destArea.z;
>+    unsigned int alignmentPixels =
>+        (alignmentBytes <= bytesPerPixel ? 1 : alignmentBytes / bytesPerPixel);
>+
>+    parametersOut->FirstPixelOffset = offset / bytesPerPixel;
>+    parametersOut->PixelsPerRow =
>+        static_cast<unsigned int>((unpack.rowLength > 0) ? unpack.rowLength : destArea.width);
>+    parametersOut->RowStride    = roundUp(parametersOut->PixelsPerRow, alignmentPixels);
>+    parametersOut->RowsPerSlice = static_cast<unsigned int>(destArea.height);
>+    parametersOut->PositionOffset[0] =
>+        texelCenterX + (destArea.x / float(destSize.width)) * 2.0f - 1.0f;
>+    parametersOut->PositionOffset[1] =
>+        texelCenterY + ((destSize.height - destArea.y - 1) / float(destSize.height)) * 2.0f - 1.0f;
>+    parametersOut->PositionScale[0] = 2.0f / static_cast<float>(destSize.width);
>+    parametersOut->PositionScale[1] = -2.0f / static_cast<float>(destSize.height);
>+    parametersOut->FirstSlice       = destArea.z;
> }
> 
>-gl::Error PixelTransfer11::copyBufferToTexture(const gl::Context *context,
>-                                               const gl::PixelUnpackState &unpack,
>-                                               unsigned int offset,
>-                                               RenderTargetD3D *destRenderTarget,
>-                                               GLenum destinationFormat,
>-                                               GLenum sourcePixelsType,
>-                                               const gl::Box &destArea)
>+angle::Result PixelTransfer11::copyBufferToTexture(const gl::Context *context,
>+                                                   const gl::PixelUnpackState &unpack,
>+                                                   unsigned int offset,
>+                                                   RenderTargetD3D *destRenderTarget,
>+                                                   GLenum destinationFormat,
>+                                                   GLenum sourcePixelsType,
>+                                                   const gl::Box &destArea)
> {
>-    ANGLE_TRY(loadResources());
>+    ANGLE_TRY(loadResources(context));
> 
>     gl::Extents destSize = destRenderTarget->getExtents();
> 
>-    ASSERT(destArea.x >= 0 && destArea.x + destArea.width  <= destSize.width  &&
>-           destArea.y >= 0 && destArea.y + destArea.height <= destSize.height &&
>-           destArea.z >= 0 && destArea.z + destArea.depth  <= destSize.depth  );
>+    ASSERT(destArea.x >= 0 && destArea.x + destArea.width <= destSize.width && destArea.y >= 0 &&
>+           destArea.y + destArea.height <= destSize.height && destArea.z >= 0 &&
>+           destArea.z + destArea.depth <= destSize.depth);
> 
>     const gl::Buffer &sourceBuffer =
>-        *context->getGLState().getTargetBuffer(gl::BufferBinding::PixelUnpack);
>+        *context->getState().getTargetBuffer(gl::BufferBinding::PixelUnpack);
> 
>     ASSERT(mRenderer->supportsFastCopyBufferToTexture(destinationFormat));
> 
>@@ -171,9 +181,9 @@ gl::Error PixelTransfer11::copyBufferToTexture(const gl::Context *context,
>         sourceglFormatInfo.sizedInternalFormat, mRenderer->getRenderer11DeviceCaps());
>     DXGI_FORMAT srvFormat = sourceFormatInfo.srvFormat;
>     ASSERT(srvFormat != DXGI_FORMAT_UNKNOWN);
>-    Buffer11 *bufferStorage11 = GetAs<Buffer11>(sourceBuffer.getImplementation());
>+    Buffer11 *bufferStorage11                  = GetAs<Buffer11>(sourceBuffer.getImplementation());
>     const d3d11::ShaderResourceView *bufferSRV = nullptr;
>-    ANGLE_TRY_RESULT(bufferStorage11->getSRV(context, srvFormat), bufferSRV);
>+    ANGLE_TRY(bufferStorage11->getSRV(context, srvFormat, &bufferSRV));
>     ASSERT(bufferSRV != nullptr);
> 
>     const d3d11::RenderTargetView &textureRTV =
>@@ -187,11 +197,11 @@ gl::Error PixelTransfer11::copyBufferToTexture(const gl::Context *context,
>     ID3D11DeviceContext *deviceContext = mRenderer->getDeviceContext();
> 
>     // Are we doing a 2D or 3D copy?
>-    const auto *geometryShader = ((destSize.depth > 1) ? &mBufferToTextureGS : nullptr);
>+    const auto *geometryShader   = ((destSize.depth > 1) ? &mBufferToTextureGS : nullptr);
>     StateManager11 *stateManager = mRenderer->getStateManager();
> 
>     stateManager->setDrawShaders(&mBufferToTextureVS, geometryShader, pixelShader);
>-    stateManager->setShaderResource(gl::SAMPLER_PIXEL, 0, bufferSRV);
>+    stateManager->setShaderResource(gl::ShaderType::Fragment, 0, bufferSRV);
>     stateManager->setInputLayout(nullptr);
>     stateManager->setPrimitiveTopology(D3D11_PRIMITIVE_TOPOLOGY_POINTLIST);
> 
>@@ -216,21 +226,23 @@ gl::Error PixelTransfer11::copyBufferToTexture(const gl::Context *context,
>     UINT numPixels = (destArea.width * destArea.height * destArea.depth);
>     deviceContext->Draw(numPixels, 0);
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error PixelTransfer11::buildShaderMap()
>+angle::Result PixelTransfer11::buildShaderMap(const gl::Context *context)
> {
>     d3d11::PixelShader bufferToTextureFloat;
>     d3d11::PixelShader bufferToTextureInt;
>     d3d11::PixelShader bufferToTextureUint;
> 
>-    ANGLE_TRY(
>-        mRenderer->allocateResource(ShaderData(g_PS_BufferToTexture_4F), &bufferToTextureFloat));
>-    ANGLE_TRY(
>-        mRenderer->allocateResource(ShaderData(g_PS_BufferToTexture_4I), &bufferToTextureInt));
>-    ANGLE_TRY(
>-        mRenderer->allocateResource(ShaderData(g_PS_BufferToTexture_4UI), &bufferToTextureUint));
>+    Context11 *context11 = GetImplAs<Context11>(context);
>+
>+    ANGLE_TRY(mRenderer->allocateResource(context11, ShaderData(g_PS_BufferToTexture_4F),
>+                                          &bufferToTextureFloat));
>+    ANGLE_TRY(mRenderer->allocateResource(context11, ShaderData(g_PS_BufferToTexture_4I),
>+                                          &bufferToTextureInt));
>+    ANGLE_TRY(mRenderer->allocateResource(context11, ShaderData(g_PS_BufferToTexture_4UI),
>+                                          &bufferToTextureUint));
> 
>     bufferToTextureFloat.setDebugName("BufferToTexture RGBA ps");
>     bufferToTextureInt.setDebugName("BufferToTexture RGBA-I ps");
>@@ -240,7 +252,7 @@ gl::Error PixelTransfer11::buildShaderMap()
>     mBufferToTexturePSMap[GL_INT]          = std::move(bufferToTextureInt);
>     mBufferToTexturePSMap[GL_UNSIGNED_INT] = std::move(bufferToTextureUint);
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
> const d3d11::PixelShader *PixelTransfer11::findBufferToTexturePS(GLenum internalFormat) const
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/PixelTransfer11.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/PixelTransfer11.h
>index a93544247ee..49f4a3a816e 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/PixelTransfer11.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/PixelTransfer11.h
>@@ -27,7 +27,7 @@ struct Box;
> struct Extents;
> struct PixelUnpackState;
> 
>-}
>+}  // namespace gl
> 
> namespace rx
> {
>@@ -45,16 +45,15 @@ class PixelTransfer11
>     // destRenderTarget: individual slice/layer of a target texture
>     // destinationFormat/sourcePixelsType: determines shaders + shader parameters
>     // destArea: the sub-section of destRenderTarget to copy to
>-    gl::Error copyBufferToTexture(const gl::Context *context,
>-                                  const gl::PixelUnpackState &unpack,
>-                                  unsigned int offset,
>-                                  RenderTargetD3D *destRenderTarget,
>-                                  GLenum destinationFormat,
>-                                  GLenum sourcePixelsType,
>-                                  const gl::Box &destArea);
>+    angle::Result copyBufferToTexture(const gl::Context *context,
>+                                      const gl::PixelUnpackState &unpack,
>+                                      unsigned int offset,
>+                                      RenderTargetD3D *destRenderTarget,
>+                                      GLenum destinationFormat,
>+                                      GLenum sourcePixelsType,
>+                                      const gl::Box &destArea);
> 
>   private:
>-
>     struct CopyShaderParams
>     {
>         unsigned int FirstPixelOffset;
>@@ -68,11 +67,15 @@ class PixelTransfer11
>         unsigned int FirstSlice;
>     };
> 
>-    static void setBufferToTextureCopyParams(const gl::Box &destArea, const gl::Extents &destSize, GLenum internalFormat,
>-                                             const gl::PixelUnpackState &unpack, unsigned int offset, CopyShaderParams *parametersOut);
>+    static void setBufferToTextureCopyParams(const gl::Box &destArea,
>+                                             const gl::Extents &destSize,
>+                                             GLenum internalFormat,
>+                                             const gl::PixelUnpackState &unpack,
>+                                             unsigned int offset,
>+                                             CopyShaderParams *parametersOut);
> 
>-    gl::Error loadResources();
>-    gl::Error buildShaderMap();
>+    angle::Result loadResources(const gl::Context *context);
>+    angle::Result buildShaderMap(const gl::Context *context);
>     const d3d11::PixelShader *findBufferToTexturePS(GLenum internalFormat) const;
> 
>     Renderer11 *mRenderer;
>@@ -90,4 +93,4 @@ class PixelTransfer11
> 
> }  // namespace rx
> 
>-#endif // LIBANGLE_RENDERER_D3D_D3D11_PIXELTRANSFER11_H_
>+#endif  // LIBANGLE_RENDERER_D3D_D3D11_PIXELTRANSFER11_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/Program11.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/Program11.cpp
>new file mode 100644
>index 00000000000..510065ccd6d
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/Program11.cpp
>@@ -0,0 +1,34 @@
>+//
>+// Copyright 2018 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// Program11: D3D11 implementation of an OpenGL Program.
>+
>+#include "libANGLE/renderer/d3d/d3d11/Program11.h"
>+
>+#include "libANGLE/Context.h"
>+#include "libANGLE/renderer/d3d/d3d11/Context11.h"
>+#include "libANGLE/renderer/d3d/d3d11/Renderer11.h"
>+#include "libANGLE/renderer/d3d/d3d11/StateManager11.h"
>+
>+namespace rx
>+{
>+Program11::Program11(const gl::ProgramState &programState, Renderer11 *renderer)
>+    : ProgramD3D(programState, renderer)
>+{}
>+
>+Program11::~Program11() = default;
>+
>+angle::Result Program11::syncState(const gl::Context *context,
>+                                   const gl::Program::DirtyBits &dirtyBits)
>+{
>+    Renderer11 *renderer11       = GetImplAs<Context11>(context)->getRenderer();
>+    StateManager11 *stateManager = renderer11->getStateManager();
>+
>+    // This single flag should be replace by individual dirtyness.
>+    stateManager->invalidateProgramUniformBuffers();
>+
>+    return angle::Result::Continue;
>+}
>+}  // namespace rx
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/Program11.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/Program11.h
>new file mode 100644
>index 00000000000..71d06037baf
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/Program11.h
>@@ -0,0 +1,28 @@
>+//
>+// Copyright 2018 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// Program11: D3D11 implementation of an OpenGL Program.
>+
>+#ifndef LIBANGLE_RENDERER_D3D_D3D11_PROGRAM11_H_
>+#define LIBANGLE_RENDERER_D3D_D3D11_PROGRAM11_H_
>+
>+#include "libANGLE/renderer/d3d/ProgramD3D.h"
>+
>+namespace rx
>+{
>+class Renderer11;
>+
>+class Program11 : public ProgramD3D
>+{
>+  public:
>+    Program11(const gl::ProgramState &programState, Renderer11 *renderer11);
>+    ~Program11() override;
>+
>+    angle::Result syncState(const gl::Context *context,
>+                            const gl::Program::DirtyBits &dirtyBits) override;
>+};
>+}  // namespace rx
>+
>+#endif  // LIBANGLE_RENDERER_D3D_D3D11_PROGRAM11_H_
>\ No newline at end of file
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/ProgramPipeline11.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/ProgramPipeline11.cpp
>index c9554431e5d..2790809dde3 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/ProgramPipeline11.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/ProgramPipeline11.cpp
>@@ -14,11 +14,8 @@ namespace rx
> 
> ProgramPipeline11::ProgramPipeline11(const gl::ProgramPipelineState &state)
>     : ProgramPipelineImpl(state)
>-{
>-}
>+{}
> 
>-ProgramPipeline11::~ProgramPipeline11()
>-{
>-}
>+ProgramPipeline11::~ProgramPipeline11() {}
> 
> }  // namespace rx
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/Query11.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/Query11.cpp
>index 66b9476e7f4..c83fc89a4cc 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/Query11.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/Query11.cpp
>@@ -11,30 +11,32 @@
> #include <GLES2/gl2ext.h>
> 
> #include "common/utilities.h"
>+#include "libANGLE/Context.h"
>+#include "libANGLE/renderer/d3d/d3d11/Context11.h"
> #include "libANGLE/renderer/d3d/d3d11/Renderer11.h"
> #include "libANGLE/renderer/d3d/d3d11/renderer11_utils.h"
> 
> namespace
> {
> 
>-GLuint64 MergeQueryResults(GLenum type, GLuint64 currentResult, GLuint64 newResult)
>+GLuint64 MergeQueryResults(gl::QueryType type, GLuint64 currentResult, GLuint64 newResult)
> {
>     switch (type)
>     {
>-        case GL_ANY_SAMPLES_PASSED:
>-        case GL_ANY_SAMPLES_PASSED_CONSERVATIVE:
>+        case gl::QueryType::AnySamples:
>+        case gl::QueryType::AnySamplesConservative:
>             return (currentResult == GL_TRUE || newResult == GL_TRUE) ? GL_TRUE : GL_FALSE;
> 
>-        case GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN:
>+        case gl::QueryType::TransformFeedbackPrimitivesWritten:
>             return currentResult + newResult;
> 
>-        case GL_TIME_ELAPSED_EXT:
>+        case gl::QueryType::TimeElapsed:
>             return currentResult + newResult;
> 
>-        case GL_TIMESTAMP_EXT:
>+        case gl::QueryType::Timestamp:
>             return newResult;
> 
>-        case GL_COMMANDS_COMPLETED_CHROMIUM:
>+        case gl::QueryType::CommandsCompleted:
>             return newResult;
> 
>         default:
>@@ -48,15 +50,13 @@ GLuint64 MergeQueryResults(GLenum type, GLuint64 currentResult, GLuint64 newResu
> namespace rx
> {
> 
>-Query11::QueryState::QueryState() : query(), beginTimestamp(), endTimestamp(), finished(false)
>-{
>-}
>+Query11::QueryState::QueryState()
>+    : getDataAttemptCount(0), query(), beginTimestamp(), endTimestamp(), finished(false)
>+{}
> 
>-Query11::QueryState::~QueryState()
>-{
>-}
>+Query11::QueryState::~QueryState() {}
> 
>-Query11::Query11(Renderer11 *renderer, GLenum type)
>+Query11::Query11(Renderer11 *renderer, gl::QueryType type)
>     : QueryImpl(type), mResult(0), mResultSum(0), mRenderer(renderer)
> {
>     mActiveQuery = std::unique_ptr<QueryState>(new QueryState());
>@@ -67,75 +67,75 @@ Query11::~Query11()
>     mRenderer->getStateManager()->onDeleteQueryObject(this);
> }
> 
>-gl::Error Query11::begin()
>+angle::Result Query11::begin(const gl::Context *context)
> {
>     mResultSum = 0;
>     mRenderer->getStateManager()->onBeginQuery(this);
>-    return resume();
>+    return resume(GetImplAs<Context11>(context));
> }
> 
>-gl::Error Query11::end()
>+angle::Result Query11::end(const gl::Context *context)
> {
>-    return pause();
>+    return pause(GetImplAs<Context11>(context));
> }
> 
>-gl::Error Query11::queryCounter()
>+angle::Result Query11::queryCounter(const gl::Context *context)
> {
>     // This doesn't do anything for D3D11 as we don't support timestamps
>-    ASSERT(getType() == GL_TIMESTAMP_EXT);
>+    ASSERT(getType() == gl::QueryType::Timestamp);
>     mResultSum = 0;
>     mPendingQueries.push_back(std::unique_ptr<QueryState>(new QueryState()));
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
> template <typename T>
>-gl::Error Query11::getResultBase(T *params)
>+angle::Result Query11::getResultBase(Context11 *context11, T *params)
> {
>     ASSERT(!mActiveQuery->query.valid());
>-    ANGLE_TRY(flush(true));
>+    ANGLE_TRY(flush(context11, true));
>     ASSERT(mPendingQueries.empty());
>     *params = static_cast<T>(mResultSum);
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error Query11::getResult(GLint *params)
>+angle::Result Query11::getResult(const gl::Context *context, GLint *params)
> {
>-    return getResultBase(params);
>+    return getResultBase(GetImplAs<Context11>(context), params);
> }
> 
>-gl::Error Query11::getResult(GLuint *params)
>+angle::Result Query11::getResult(const gl::Context *context, GLuint *params)
> {
>-    return getResultBase(params);
>+    return getResultBase(GetImplAs<Context11>(context), params);
> }
> 
>-gl::Error Query11::getResult(GLint64 *params)
>+angle::Result Query11::getResult(const gl::Context *context, GLint64 *params)
> {
>-    return getResultBase(params);
>+    return getResultBase(GetImplAs<Context11>(context), params);
> }
> 
>-gl::Error Query11::getResult(GLuint64 *params)
>+angle::Result Query11::getResult(const gl::Context *context, GLuint64 *params)
> {
>-    return getResultBase(params);
>+    return getResultBase(GetImplAs<Context11>(context), params);
> }
> 
>-gl::Error Query11::isResultAvailable(bool *available)
>+angle::Result Query11::isResultAvailable(const gl::Context *context, bool *available)
> {
>-    ANGLE_TRY(flush(false));
>+    ANGLE_TRY(flush(GetImplAs<Context11>(context), false));
> 
>     *available = mPendingQueries.empty();
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error Query11::pause()
>+angle::Result Query11::pause(Context11 *context11)
> {
>     if (mActiveQuery->query.valid())
>     {
>         ID3D11DeviceContext *context = mRenderer->getDeviceContext();
>-        GLenum queryType             = getType();
>+        gl::QueryType type           = getType();
> 
>         // If we are doing time elapsed query the end timestamp
>-        if (queryType == GL_TIME_ELAPSED_EXT)
>+        if (type == gl::QueryType::TimeElapsed)
>         {
>             context->End(mActiveQuery->endTimestamp.get());
>         }
>@@ -146,33 +146,33 @@ gl::Error Query11::pause()
>         mActiveQuery = std::unique_ptr<QueryState>(new QueryState());
>     }
> 
>-    return flush(false);
>+    return flush(context11, false);
> }
> 
>-gl::Error Query11::resume()
>+angle::Result Query11::resume(Context11 *context11)
> {
>     if (!mActiveQuery->query.valid())
>     {
>-        ANGLE_TRY(flush(false));
>+        ANGLE_TRY(flush(context11, false));
> 
>-        GLenum queryType         = getType();
>-        D3D11_QUERY d3dQueryType = gl_d3d11::ConvertQueryType(queryType);
>+        gl::QueryType type       = getType();
>+        D3D11_QUERY d3dQueryType = gl_d3d11::ConvertQueryType(type);
> 
>         D3D11_QUERY_DESC queryDesc;
>         queryDesc.Query     = d3dQueryType;
>         queryDesc.MiscFlags = 0;
> 
>-        ANGLE_TRY(mRenderer->allocateResource(queryDesc, &mActiveQuery->query));
>+        ANGLE_TRY(mRenderer->allocateResource(context11, queryDesc, &mActiveQuery->query));
> 
>         // If we are doing time elapsed we also need a query to actually query the timestamp
>-        if (queryType == GL_TIME_ELAPSED_EXT)
>+        if (type == gl::QueryType::TimeElapsed)
>         {
>             D3D11_QUERY_DESC desc;
>             desc.Query     = D3D11_QUERY_TIMESTAMP;
>             desc.MiscFlags = 0;
> 
>-            ANGLE_TRY(mRenderer->allocateResource(desc, &mActiveQuery->beginTimestamp));
>-            ANGLE_TRY(mRenderer->allocateResource(desc, &mActiveQuery->endTimestamp));
>+            ANGLE_TRY(mRenderer->allocateResource(context11, desc, &mActiveQuery->beginTimestamp));
>+            ANGLE_TRY(mRenderer->allocateResource(context11, desc, &mActiveQuery->endTimestamp));
>         }
> 
>         ID3D11DeviceContext *context = mRenderer->getDeviceContext();
>@@ -183,16 +183,16 @@ gl::Error Query11::resume()
>         }
> 
>         // If we are doing time elapsed, query the begin timestamp
>-        if (queryType == GL_TIME_ELAPSED_EXT)
>+        if (type == gl::QueryType::TimeElapsed)
>         {
>             context->End(mActiveQuery->beginTimestamp.get());
>         }
>     }
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error Query11::flush(bool force)
>+angle::Result Query11::flush(Context11 *context11, bool force)
> {
>     while (!mPendingQueries.empty())
>     {
>@@ -200,10 +200,10 @@ gl::Error Query11::flush(bool force)
> 
>         do
>         {
>-            ANGLE_TRY(testQuery(query));
>+            ANGLE_TRY(testQuery(context11, query));
>             if (!query->finished && !force)
>             {
>-                return gl::NoError();
>+                return angle::Result::Continue;
>             }
>         } while (!query->finished);
> 
>@@ -211,28 +211,24 @@ gl::Error Query11::flush(bool force)
>         mPendingQueries.pop_front();
>     }
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error Query11::testQuery(QueryState *queryState)
>+angle::Result Query11::testQuery(Context11 *context11, QueryState *queryState)
> {
>     if (!queryState->finished)
>     {
>         ID3D11DeviceContext *context = mRenderer->getDeviceContext();
>         switch (getType())
>         {
>-            case GL_ANY_SAMPLES_PASSED_EXT:
>-            case GL_ANY_SAMPLES_PASSED_CONSERVATIVE_EXT:
>+            case gl::QueryType::AnySamples:
>+            case gl::QueryType::AnySamplesConservative:
>             {
>                 ASSERT(queryState->query.valid());
>                 UINT64 numPixels = 0;
>                 HRESULT result =
>                     context->GetData(queryState->query.get(), &numPixels, sizeof(numPixels), 0);
>-                if (FAILED(result))
>-                {
>-                    return gl::OutOfMemory()
>-                           << "Failed to get the data of an internal query, " << gl::FmtHR(result);
>-                }
>+                ANGLE_TRY_HR(context11, result, "Failed to get the data of an internal query");
> 
>                 if (result == S_OK)
>                 {
>@@ -242,17 +238,13 @@ gl::Error Query11::testQuery(QueryState *queryState)
>             }
>             break;
> 
>-            case GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN:
>+            case gl::QueryType::TransformFeedbackPrimitivesWritten:
>             {
>                 ASSERT(queryState->query.valid());
>                 D3D11_QUERY_DATA_SO_STATISTICS soStats = {0};
>                 HRESULT result =
>                     context->GetData(queryState->query.get(), &soStats, sizeof(soStats), 0);
>-                if (FAILED(result))
>-                {
>-                    return gl::OutOfMemory()
>-                           << "Failed to get the data of an internal query, " << gl::FmtHR(result);
>-                }
>+                ANGLE_TRY_HR(context11, result, "Failed to get the data of an internal query");
> 
>                 if (result == S_OK)
>                 {
>@@ -262,7 +254,7 @@ gl::Error Query11::testQuery(QueryState *queryState)
>             }
>             break;
> 
>-            case GL_TIME_ELAPSED_EXT:
>+            case gl::QueryType::TimeElapsed:
>             {
>                 ASSERT(queryState->query.valid());
>                 ASSERT(queryState->beginTimestamp.valid());
>@@ -270,30 +262,20 @@ gl::Error Query11::testQuery(QueryState *queryState)
>                 D3D11_QUERY_DATA_TIMESTAMP_DISJOINT timeStats = {0};
>                 HRESULT result =
>                     context->GetData(queryState->query.get(), &timeStats, sizeof(timeStats), 0);
>-                if (FAILED(result))
>-                {
>-                    return gl::OutOfMemory()
>-                           << "Failed to get the data of an internal query, " << gl::FmtHR(result);
>-                }
>+                ANGLE_TRY_HR(context11, result, "Failed to get the data of an internal query");
> 
>                 if (result == S_OK)
>                 {
>                     UINT64 beginTime = 0;
>                     HRESULT beginRes = context->GetData(queryState->beginTimestamp.get(),
>                                                         &beginTime, sizeof(UINT64), 0);
>-                    if (FAILED(beginRes))
>-                    {
>-                        return gl::OutOfMemory() << "Failed to get the data of an internal query, "
>-                                                 << gl::FmtHR(beginRes);
>-                    }
>+                    ANGLE_TRY_HR(context11, beginRes,
>+                                 "Failed to get the data of an internal query");
>+
>                     UINT64 endTime = 0;
>                     HRESULT endRes = context->GetData(queryState->endTimestamp.get(), &endTime,
>                                                       sizeof(UINT64), 0);
>-                    if (FAILED(endRes))
>-                    {
>-                        return gl::OutOfMemory() << "Failed to get the data of an internal query, "
>-                                                 << gl::FmtHR(endRes);
>-                    }
>+                    ANGLE_TRY_HR(context11, endRes, "Failed to get the data of an internal query");
> 
>                     if (beginRes == S_OK && endRes == S_OK)
>                     {
>@@ -325,7 +307,7 @@ gl::Error Query11::testQuery(QueryState *queryState)
>             }
>             break;
> 
>-            case GL_TIMESTAMP_EXT:
>+            case gl::QueryType::Timestamp:
>             {
>                 // D3D11 doesn't support GL timestamp queries as D3D timestamps are not guaranteed
>                 // to have any sort of continuity outside of a disjoint timestamp query block, which
>@@ -336,17 +318,13 @@ gl::Error Query11::testQuery(QueryState *queryState)
>             }
>             break;
> 
>-            case GL_COMMANDS_COMPLETED_CHROMIUM:
>+            case gl::QueryType::CommandsCompleted:
>             {
>                 ASSERT(queryState->query.valid());
>                 BOOL completed = 0;
>                 HRESULT result =
>                     context->GetData(queryState->query.get(), &completed, sizeof(completed), 0);
>-                if (FAILED(result))
>-                {
>-                    return gl::OutOfMemory()
>-                           << "Failed to get the data of an internal query, " << gl::FmtHR(result);
>-                }
>+                ANGLE_TRY_HR(context11, result, "Failed to get the data of an internal query");
> 
>                 if (result == S_OK)
>                 {
>@@ -362,14 +340,18 @@ gl::Error Query11::testQuery(QueryState *queryState)
>                 break;
>         }
> 
>-        if (!queryState->finished && mRenderer->testDeviceLost())
>+        queryState->getDataAttemptCount++;
>+        bool checkDeviceLost =
>+            (queryState->getDataAttemptCount % kPollingD3DDeviceLostCheckFrequency) == 0;
>+        if (!queryState->finished && checkDeviceLost && mRenderer->testDeviceLost())
>         {
>             mRenderer->notifyDeviceLost();
>-            return gl::OutOfMemory() << "Failed to test get query result, device is lost.";
>+            ANGLE_TRY_HR(context11, E_OUTOFMEMORY,
>+                         "Failed to test get query result, device is lost.");
>         }
>     }
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
> }  // namespace rx
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/Query11.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/Query11.h
>index a88a8892aae..911be0c77e8 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/Query11.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/Query11.h
>@@ -16,25 +16,26 @@
> 
> namespace rx
> {
>+class Context11;
> class Renderer11;
> 
> class Query11 : public QueryImpl
> {
>   public:
>-    Query11(Renderer11 *renderer, GLenum type);
>+    Query11(Renderer11 *renderer, gl::QueryType type);
>     ~Query11() override;
> 
>-    gl::Error begin() override;
>-    gl::Error end() override;
>-    gl::Error queryCounter() override;
>-    gl::Error getResult(GLint *params) override;
>-    gl::Error getResult(GLuint *params) override;
>-    gl::Error getResult(GLint64 *params) override;
>-    gl::Error getResult(GLuint64 *params) override;
>-    gl::Error isResultAvailable(bool *available) override;
>+    angle::Result begin(const gl::Context *context) override;
>+    angle::Result end(const gl::Context *context) override;
>+    angle::Result queryCounter(const gl::Context *context) override;
>+    angle::Result getResult(const gl::Context *context, GLint *params) override;
>+    angle::Result getResult(const gl::Context *context, GLuint *params) override;
>+    angle::Result getResult(const gl::Context *context, GLint64 *params) override;
>+    angle::Result getResult(const gl::Context *context, GLuint64 *params) override;
>+    angle::Result isResultAvailable(const gl::Context *context, bool *available) override;
> 
>-    gl::Error pause();
>-    gl::Error resume();
>+    angle::Result pause(Context11 *context11);
>+    angle::Result resume(Context11 *context11);
> 
>   private:
>     struct QueryState final : private angle::NonCopyable
>@@ -42,17 +43,19 @@ class Query11 : public QueryImpl
>         QueryState();
>         ~QueryState();
> 
>+        unsigned int getDataAttemptCount;
>+
>         d3d11::Query query;
>         d3d11::Query beginTimestamp;
>         d3d11::Query endTimestamp;
>         bool finished;
>     };
> 
>-    gl::Error flush(bool force);
>-    gl::Error testQuery(QueryState *queryState);
>+    angle::Result flush(Context11 *context11, bool force);
>+    angle::Result testQuery(Context11 *context11, QueryState *queryState);
> 
>     template <typename T>
>-    gl::Error getResultBase(T *params);
>+    angle::Result getResultBase(Context11 *context11, T *params);
> 
>     GLuint64 mResult;
>     GLuint64 mResultSum;
>@@ -63,6 +66,6 @@ class Query11 : public QueryImpl
>     std::deque<std::unique_ptr<QueryState>> mPendingQueries;
> };
> 
>-}
>+}  // namespace rx
> 
>-#endif // LIBANGLE_RENDERER_D3D_D3D11_QUERY11_H_
>+#endif  // LIBANGLE_RENDERER_D3D_D3D11_QUERY11_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/RenderStateCache.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/RenderStateCache.cpp
>index 5b85196c2ea..f0869309400 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/RenderStateCache.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/RenderStateCache.cpp
>@@ -11,12 +11,15 @@
> 
> #include <float.h>
> 
>+#include "common/Color.h"
> #include "common/debug.h"
>+#include "libANGLE/Context.h"
> #include "libANGLE/Framebuffer.h"
> #include "libANGLE/FramebufferAttachment.h"
>-#include "libANGLE/renderer/d3d/FramebufferD3D.h"
>-#include "libANGLE/renderer/d3d/d3d11/renderer11_utils.h"
>+#include "libANGLE/renderer/d3d/d3d11/Context11.h"
>+#include "libANGLE/renderer/d3d/d3d11/Framebuffer11.h"
> #include "libANGLE/renderer/d3d/d3d11/Renderer11.h"
>+#include "libANGLE/renderer/d3d/d3d11/renderer11_utils.h"
> 
> namespace rx
> {
>@@ -27,12 +30,9 @@ RenderStateCache::RenderStateCache()
>       mRasterizerStateCache(kMaxStates),
>       mDepthStencilStateCache(kMaxStates),
>       mSamplerStateCache(kMaxStates)
>-{
>-}
>+{}
> 
>-RenderStateCache::~RenderStateCache()
>-{
>-}
>+RenderStateCache::~RenderStateCache() {}
> 
> void RenderStateCache::clear()
> {
>@@ -44,12 +44,11 @@ void RenderStateCache::clear()
> 
> // static
> d3d11::BlendStateKey RenderStateCache::GetBlendStateKey(const gl::Context *context,
>-                                                        const gl::Framebuffer *framebuffer,
>+                                                        Framebuffer11 *framebuffer11,
>                                                         const gl::BlendState &blendState)
> {
>     d3d11::BlendStateKey key;
>-    FramebufferD3D *framebufferD3D         = GetImplAs<FramebufferD3D>(framebuffer);
>-    const gl::AttachmentList &colorbuffers = framebufferD3D->getColorAttachmentsForRender(context);
>+    const gl::AttachmentList &colorbuffers = framebuffer11->getColorAttachmentsForRender(context);
>     const UINT8 blendStateMask =
>         gl_d3d11::ConvertColorMask(blendState.colorMaskRed, blendState.colorMaskGreen,
>                                    blendState.colorMaskBlue, blendState.colorMaskAlpha);
>@@ -71,15 +70,16 @@ d3d11::BlendStateKey RenderStateCache::GetBlendStateKey(const gl::Context *conte
>     return key;
> }
> 
>-gl::Error RenderStateCache::getBlendState(Renderer11 *renderer,
>-                                          const d3d11::BlendStateKey &key,
>-                                          const d3d11::BlendState **outBlendState)
>+angle::Result RenderStateCache::getBlendState(const gl::Context *context,
>+                                              Renderer11 *renderer,
>+                                              const d3d11::BlendStateKey &key,
>+                                              const d3d11::BlendState **outBlendState)
> {
>     auto keyIter = mBlendStateCache.Get(key);
>     if (keyIter != mBlendStateCache.end())
>     {
>         *outBlendState = &keyIter->second;
>-        return gl::NoError();
>+        return angle::Result::Continue;
>     }
> 
>     TrimCache(kMaxStates, kGCLimit, "blend state", &mBlendStateCache);
>@@ -114,18 +114,19 @@ gl::Error RenderStateCache::getBlendState(Renderer11 *renderer,
>     }
> 
>     d3d11::BlendState d3dBlendState;
>-    ANGLE_TRY(renderer->allocateResource(blendDesc, &d3dBlendState));
>+    ANGLE_TRY(renderer->allocateResource(GetImplAs<Context11>(context), blendDesc, &d3dBlendState));
>     const auto &iter = mBlendStateCache.Put(key, std::move(d3dBlendState));
> 
>     *outBlendState = &iter->second;
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error RenderStateCache::getRasterizerState(Renderer11 *renderer,
>-                                               const gl::RasterizerState &rasterState,
>-                                               bool scissorEnabled,
>-                                               ID3D11RasterizerState **outRasterizerState)
>+angle::Result RenderStateCache::getRasterizerState(const gl::Context *context,
>+                                                   Renderer11 *renderer,
>+                                                   const gl::RasterizerState &rasterState,
>+                                                   bool scissorEnabled,
>+                                                   ID3D11RasterizerState **outRasterizerState)
> {
>     d3d11::RasterizerStateKey key;
>     key.rasterizerState = rasterState;
>@@ -135,7 +136,7 @@ gl::Error RenderStateCache::getRasterizerState(Renderer11 *renderer,
>     if (keyIter != mRasterizerStateCache.end())
>     {
>         *outRasterizerState = keyIter->second.get();
>-        return gl::NoError();
>+        return angle::Result::Continue;
>     }
> 
>     TrimCache(kMaxStates, kGCLimit, "rasterizer state", &mRasterizerStateCache);
>@@ -172,22 +173,24 @@ gl::Error RenderStateCache::getRasterizerState(Renderer11 *renderer,
>     }
> 
>     d3d11::RasterizerState dx11RasterizerState;
>-    ANGLE_TRY(renderer->allocateResource(rasterDesc, &dx11RasterizerState));
>+    ANGLE_TRY(renderer->allocateResource(GetImplAs<Context11>(context), rasterDesc,
>+                                         &dx11RasterizerState));
>     *outRasterizerState = dx11RasterizerState.get();
>     mRasterizerStateCache.Put(key, std::move(dx11RasterizerState));
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error RenderStateCache::getDepthStencilState(Renderer11 *renderer,
>-                                                 const gl::DepthStencilState &glState,
>-                                                 const d3d11::DepthStencilState **outDSState)
>+angle::Result RenderStateCache::getDepthStencilState(const gl::Context *context,
>+                                                     Renderer11 *renderer,
>+                                                     const gl::DepthStencilState &glState,
>+                                                     const d3d11::DepthStencilState **outDSState)
> {
>     auto keyIter = mDepthStencilStateCache.Get(glState);
>     if (keyIter != mDepthStencilStateCache.end())
>     {
>         *outDSState = &keyIter->second;
>-        return gl::NoError();
>+        return angle::Result::Continue;
>     }
> 
>     TrimCache(kMaxStates, kGCLimit, "depth stencil state", &mDepthStencilStateCache);
>@@ -209,23 +212,25 @@ gl::Error RenderStateCache::getDepthStencilState(Renderer11 *renderer,
>     dsDesc.BackFace.StencilFunc         = ConvertComparison(glState.stencilBackFunc);
> 
>     d3d11::DepthStencilState dx11DepthStencilState;
>-    ANGLE_TRY(renderer->allocateResource(dsDesc, &dx11DepthStencilState));
>+    ANGLE_TRY(
>+        renderer->allocateResource(GetImplAs<Context11>(context), dsDesc, &dx11DepthStencilState));
>     const auto &iter = mDepthStencilStateCache.Put(glState, std::move(dx11DepthStencilState));
> 
>     *outDSState = &iter->second;
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error RenderStateCache::getSamplerState(Renderer11 *renderer,
>-                                            const gl::SamplerState &samplerState,
>-                                            ID3D11SamplerState **outSamplerState)
>+angle::Result RenderStateCache::getSamplerState(const gl::Context *context,
>+                                                Renderer11 *renderer,
>+                                                const gl::SamplerState &samplerState,
>+                                                ID3D11SamplerState **outSamplerState)
> {
>     auto keyIter = mSamplerStateCache.Get(samplerState);
>     if (keyIter != mSamplerStateCache.end())
>     {
>         *outSamplerState = keyIter->second.get();
>-        return gl::NoError();
>+        return angle::Result::Continue;
>     }
> 
>     TrimCache(kMaxStates, kGCLimit, "sampler state", &mSamplerStateCache);
>@@ -234,28 +239,33 @@ gl::Error RenderStateCache::getSamplerState(Renderer11 *renderer,
> 
>     D3D11_SAMPLER_DESC samplerDesc;
>     samplerDesc.Filter =
>-        gl_d3d11::ConvertFilter(samplerState.minFilter, samplerState.magFilter,
>-                                samplerState.maxAnisotropy, samplerState.compareMode);
>-    samplerDesc.AddressU   = gl_d3d11::ConvertTextureWrap(samplerState.wrapS);
>-    samplerDesc.AddressV   = gl_d3d11::ConvertTextureWrap(samplerState.wrapT);
>-    samplerDesc.AddressW   = gl_d3d11::ConvertTextureWrap(samplerState.wrapR);
>+        gl_d3d11::ConvertFilter(samplerState.getMinFilter(), samplerState.getMagFilter(),
>+                                samplerState.getMaxAnisotropy(), samplerState.getCompareMode());
>+    samplerDesc.AddressU   = gl_d3d11::ConvertTextureWrap(samplerState.getWrapS());
>+    samplerDesc.AddressV   = gl_d3d11::ConvertTextureWrap(samplerState.getWrapT());
>+    samplerDesc.AddressW   = gl_d3d11::ConvertTextureWrap(samplerState.getWrapR());
>     samplerDesc.MipLODBias = 0;
>     samplerDesc.MaxAnisotropy =
>-        gl_d3d11::ConvertMaxAnisotropy(samplerState.maxAnisotropy, featureLevel);
>-    samplerDesc.ComparisonFunc = gl_d3d11::ConvertComparison(samplerState.compareFunc);
>-    samplerDesc.BorderColor[0] = 0.0f;
>-    samplerDesc.BorderColor[1] = 0.0f;
>-    samplerDesc.BorderColor[2] = 0.0f;
>-    samplerDesc.BorderColor[3] = 0.0f;
>-    samplerDesc.MinLOD         = samplerState.minLod;
>-    samplerDesc.MaxLOD         = samplerState.maxLod;
>+        gl_d3d11::ConvertMaxAnisotropy(samplerState.getMaxAnisotropy(), featureLevel);
>+    samplerDesc.ComparisonFunc = gl_d3d11::ConvertComparison(samplerState.getCompareFunc());
>+    angle::ColorF borderColor;
>+    if (samplerState.getBorderColor().type == angle::ColorGeneric::Type::Float)
>+    {
>+        borderColor = samplerState.getBorderColor().colorF;
>+    }
>+    samplerDesc.BorderColor[0] = borderColor.red;
>+    samplerDesc.BorderColor[1] = borderColor.green;
>+    samplerDesc.BorderColor[2] = borderColor.blue;
>+    samplerDesc.BorderColor[3] = borderColor.alpha;
>+    samplerDesc.MinLOD         = samplerState.getMinLod();
>+    samplerDesc.MaxLOD         = samplerState.getMaxLod();
> 
>     if (featureLevel <= D3D_FEATURE_LEVEL_9_3)
>     {
>         // Check that maxLOD is nearly FLT_MAX (1000.0f is the default), since 9_3 doesn't support
>         // anything other than FLT_MAX. Note that Feature Level 9_* only supports GL ES 2.0, so the
>         // consumer of ANGLE can't modify the Max LOD themselves.
>-        ASSERT(samplerState.maxLod >= 999.9f);
>+        ASSERT(samplerState.getMaxLod() >= 999.9f);
> 
>         // Now just set MaxLOD to FLT_MAX. Other parts of the renderer (e.g. the non-zero max LOD
>         // workaround) should take account of this.
>@@ -263,11 +273,12 @@ gl::Error RenderStateCache::getSamplerState(Renderer11 *renderer,
>     }
> 
>     d3d11::SamplerState dx11SamplerState;
>-    ANGLE_TRY(renderer->allocateResource(samplerDesc, &dx11SamplerState));
>+    ANGLE_TRY(
>+        renderer->allocateResource(GetImplAs<Context11>(context), samplerDesc, &dx11SamplerState));
>     *outSamplerState = dx11SamplerState.get();
>     mSamplerStateCache.Put(samplerState, std::move(dx11SamplerState));
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
> }  // namespace rx
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/RenderStateCache.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/RenderStateCache.h
>index 7501e83fc47..8db74d66b34 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/RenderStateCache.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/RenderStateCache.h
>@@ -18,11 +18,6 @@
> 
> #include <unordered_map>
> 
>-namespace gl
>-{
>-class Framebuffer;
>-}
>-
> namespace std
> {
> template <>
>@@ -61,6 +56,7 @@ struct hash<gl::SamplerState>
> 
> namespace rx
> {
>+class Framebuffer11;
> class Renderer11;
> 
> class RenderStateCache : angle::NonCopyable
>@@ -72,21 +68,25 @@ class RenderStateCache : angle::NonCopyable
>     void clear();
> 
>     static d3d11::BlendStateKey GetBlendStateKey(const gl::Context *context,
>-                                                 const gl::Framebuffer *framebuffer,
>+                                                 Framebuffer11 *framebuffer11,
>                                                  const gl::BlendState &blendState);
>-    gl::Error getBlendState(Renderer11 *renderer,
>-                            const d3d11::BlendStateKey &key,
>-                            const d3d11::BlendState **outBlendState);
>-    gl::Error getRasterizerState(Renderer11 *renderer,
>-                                 const gl::RasterizerState &rasterState,
>-                                 bool scissorEnabled,
>-                                 ID3D11RasterizerState **outRasterizerState);
>-    gl::Error getDepthStencilState(Renderer11 *renderer,
>-                                   const gl::DepthStencilState &dsState,
>-                                   const d3d11::DepthStencilState **outDSState);
>-    gl::Error getSamplerState(Renderer11 *renderer,
>-                              const gl::SamplerState &samplerState,
>-                              ID3D11SamplerState **outSamplerState);
>+    angle::Result getBlendState(const gl::Context *context,
>+                                Renderer11 *renderer,
>+                                const d3d11::BlendStateKey &key,
>+                                const d3d11::BlendState **outBlendState);
>+    angle::Result getRasterizerState(const gl::Context *context,
>+                                     Renderer11 *renderer,
>+                                     const gl::RasterizerState &rasterState,
>+                                     bool scissorEnabled,
>+                                     ID3D11RasterizerState **outRasterizerState);
>+    angle::Result getDepthStencilState(const gl::Context *context,
>+                                       Renderer11 *renderer,
>+                                       const gl::DepthStencilState &dsState,
>+                                       const d3d11::DepthStencilState **outDSState);
>+    angle::Result getSamplerState(const gl::Context *context,
>+                                  Renderer11 *renderer,
>+                                  const gl::SamplerState &samplerState,
>+                                  ID3D11SamplerState **outSamplerState);
> 
>   private:
>     // MSDN's documentation of ID3D11Device::CreateBlendState, ID3D11Device::CreateRasterizerState,
>@@ -120,4 +120,4 @@ class RenderStateCache : angle::NonCopyable
> 
> }  // namespace rx
> 
>-#endif // LIBANGLE_RENDERER_D3D_D3D11_RENDERSTATECACHE_H_
>+#endif  // LIBANGLE_RENDERER_D3D_D3D11_RENDERSTATECACHE_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/RenderTarget11.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/RenderTarget11.cpp
>index 594a382a727..be204f857dc 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/RenderTarget11.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/RenderTarget11.cpp
>@@ -9,10 +9,12 @@
> 
> #include "libANGLE/renderer/d3d/d3d11/RenderTarget11.h"
> 
>-#include "libANGLE/renderer/d3d/d3d11/formatutils11.h"
>+#include "libANGLE/Context.h"
>+#include "libANGLE/renderer/d3d/d3d11/Context11.h"
> #include "libANGLE/renderer/d3d/d3d11/Renderer11.h"
>-#include "libANGLE/renderer/d3d/d3d11/renderer11_utils.h"
> #include "libANGLE/renderer/d3d/d3d11/SwapChain11.h"
>+#include "libANGLE/renderer/d3d/d3d11/formatutils11.h"
>+#include "libANGLE/renderer/d3d/d3d11/renderer11_utils.h"
> #include "libANGLE/renderer/d3d/d3d11/texture_format_table.h"
> 
> namespace rx
>@@ -30,7 +32,7 @@ bool GetTextureProperties(ID3D11Resource *resource, unsigned int *mipLevels, uns
>         SafeRelease(texture1D);
> 
>         *mipLevels = texDesc.MipLevels;
>-        *samples = 0;
>+        *samples   = 0;
> 
>         return true;
>     }
>@@ -43,7 +45,7 @@ bool GetTextureProperties(ID3D11Resource *resource, unsigned int *mipLevels, uns
>         SafeRelease(texture2D);
> 
>         *mipLevels = texDesc.MipLevels;
>-        *samples = texDesc.SampleDesc.Count > 1 ? texDesc.SampleDesc.Count : 0;
>+        *samples   = texDesc.SampleDesc.Count > 1 ? texDesc.SampleDesc.Count : 0;
> 
>         return true;
>     }
>@@ -56,7 +58,7 @@ bool GetTextureProperties(ID3D11Resource *resource, unsigned int *mipLevels, uns
>         SafeRelease(texture3D);
> 
>         *mipLevels = texDesc.MipLevels;
>-        *samples = 0;
>+        *samples   = 0;
> 
>         return true;
>     }
>@@ -69,7 +71,7 @@ unsigned int GetRTVSubresourceIndex(ID3D11Resource *resource, ID3D11RenderTarget
>     D3D11_RENDER_TARGET_VIEW_DESC rtvDesc;
>     view->GetDesc(&rtvDesc);
> 
>-    unsigned int mipSlice = 0;
>+    unsigned int mipSlice   = 0;
>     unsigned int arraySlice = 0;
> 
>     switch (rtvDesc.ViewDimension)
>@@ -130,7 +132,7 @@ unsigned int GetDSVSubresourceIndex(ID3D11Resource *resource, ID3D11DepthStencil
>     D3D11_DEPTH_STENCIL_VIEW_DESC dsvDesc;
>     view->GetDesc(&dsvDesc);
> 
>-    unsigned int mipSlice = 0;
>+    unsigned int mipSlice   = 0;
>     unsigned int arraySlice = 0;
> 
>     switch (dsvDesc.ViewDimension)
>@@ -194,22 +196,9 @@ const d3d11::Format &GetSurfaceFormatSet(bool depth, SwapChain11 *swapChain, Ren
> 
> }  // anonymous namespace
> 
>-RenderTarget11::RenderTarget11(const d3d11::Format &formatSet) : mFormatSet(formatSet)
>-{
>-}
>-
>-RenderTarget11::~RenderTarget11()
>-{
>-    ASSERT(mBroadcastChannel.empty());
>-}
>-
>-void RenderTarget11::signalDirty(const gl::Context *context)
>-{
>-    mBroadcastChannel.signal(context);
>+RenderTarget11::RenderTarget11(const d3d11::Format &formatSet) : mFormatSet(formatSet) {}
> 
>-    // Clear the list. We can't do this in the receiver because it would mutate during iteration.
>-    mBroadcastChannel.reset();
>-}
>+RenderTarget11::~RenderTarget11() {}
> 
> TextureRenderTarget11::TextureRenderTarget11(d3d11::RenderTargetView &&rtv,
>                                              const TextureHelper11 &resource,
>@@ -238,7 +227,7 @@ TextureRenderTarget11::TextureRenderTarget11(d3d11::RenderTargetView &&rtv,
>     {
>         mSubresourceIndex = GetRTVSubresourceIndex(mTexture.get(), mRenderTarget.get());
>     }
>-    ASSERT(mFormatSet.formatID != angle::Format::ID::NONE || mWidth == 0 || mHeight == 0);
>+    ASSERT(mFormatSet.formatID != angle::FormatID::NONE || mWidth == 0 || mHeight == 0);
> }
> 
> TextureRenderTarget11::TextureRenderTarget11(d3d11::DepthStencilView &&dsv,
>@@ -267,12 +256,10 @@ TextureRenderTarget11::TextureRenderTarget11(d3d11::DepthStencilView &&dsv,
>     {
>         mSubresourceIndex = GetDSVSubresourceIndex(mTexture.get(), mDepthStencil.get());
>     }
>-    ASSERT(mFormatSet.formatID != angle::Format::ID::NONE || mWidth == 0 || mHeight == 0);
>+    ASSERT(mFormatSet.formatID != angle::FormatID::NONE || mWidth == 0 || mHeight == 0);
> }
> 
>-TextureRenderTarget11::~TextureRenderTarget11()
>-{
>-}
>+TextureRenderTarget11::~TextureRenderTarget11() {}
> 
> const TextureHelper11 &TextureRenderTarget11::getTexture() const
> {
>@@ -289,12 +276,14 @@ const d3d11::DepthStencilView &TextureRenderTarget11::getDepthStencilView() cons
>     return mDepthStencil;
> }
> 
>-const d3d11::SharedSRV &TextureRenderTarget11::getShaderResourceView() const
>+const d3d11::SharedSRV &TextureRenderTarget11::getShaderResourceView(
>+    const gl::Context *context) const
> {
>     return mShaderResource;
> }
> 
>-const d3d11::SharedSRV &TextureRenderTarget11::getBlitShaderResourceView() const
>+const d3d11::SharedSRV &TextureRenderTarget11::getBlitShaderResourceView(
>+    const gl::Context *context) const
> {
>     return mBlitShaderResource;
> }
>@@ -339,9 +328,7 @@ SurfaceRenderTarget11::SurfaceRenderTarget11(SwapChain11 *swapChain,
>     ASSERT(mSwapChain);
> }
> 
>-SurfaceRenderTarget11::~SurfaceRenderTarget11()
>-{
>-}
>+SurfaceRenderTarget11::~SurfaceRenderTarget11() {}
> 
> GLsizei SurfaceRenderTarget11::getWidth() const
> {
>@@ -385,16 +372,18 @@ const d3d11::DepthStencilView &SurfaceRenderTarget11::getDepthStencilView() cons
>     return mSwapChain->getDepthStencil();
> }
> 
>-const d3d11::SharedSRV &SurfaceRenderTarget11::getShaderResourceView() const
>+const d3d11::SharedSRV &SurfaceRenderTarget11::getShaderResourceView(
>+    const gl::Context *context) const
> {
>     return (mDepth ? mSwapChain->getDepthStencilShaderResource()
>-                   : mSwapChain->getRenderTargetShaderResource());
>+                   : mSwapChain->getRenderTargetShaderResource(GetImplAs<Context11>(context)));
> }
> 
>-const d3d11::SharedSRV &SurfaceRenderTarget11::getBlitShaderResourceView() const
>+const d3d11::SharedSRV &SurfaceRenderTarget11::getBlitShaderResourceView(
>+    const gl::Context *context) const
> {
>     // The SurfaceRenderTargetView format should always be such that the normal SRV works for blits.
>-    return getShaderResourceView();
>+    return getShaderResourceView(context);
> }
> 
> unsigned int SurfaceRenderTarget11::getSubresourceIndex() const
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/RenderTarget11.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/RenderTarget11.h
>index db49cac9f55..a492411fb0b 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/RenderTarget11.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/RenderTarget11.h
>@@ -26,21 +26,17 @@ class RenderTarget11 : public RenderTargetD3D
>     RenderTarget11(const d3d11::Format &formatSet);
>     ~RenderTarget11() override;
> 
>-    virtual const TextureHelper11 &getTexture() const                  = 0;
>-    virtual const d3d11::RenderTargetView &getRenderTargetView() const = 0;
>-    virtual const d3d11::DepthStencilView &getDepthStencilView() const = 0;
>-    virtual const d3d11::SharedSRV &getShaderResourceView() const      = 0;
>-    virtual const d3d11::SharedSRV &getBlitShaderResourceView() const  = 0;
>+    virtual const TextureHelper11 &getTexture() const                                           = 0;
>+    virtual const d3d11::RenderTargetView &getRenderTargetView() const                          = 0;
>+    virtual const d3d11::DepthStencilView &getDepthStencilView() const                          = 0;
>+    virtual const d3d11::SharedSRV &getShaderResourceView(const gl::Context *context) const     = 0;
>+    virtual const d3d11::SharedSRV &getBlitShaderResourceView(const gl::Context *context) const = 0;
> 
>     virtual unsigned int getSubresourceIndex() const = 0;
> 
>-    void signalDirty(const gl::Context *context) override;
>-    OnRenderTargetDirtyChannel *getBroadcastChannel() { return &mBroadcastChannel; }
>-
>     const d3d11::Format &getFormatSet() const { return mFormatSet; }
> 
>   protected:
>-    OnRenderTargetDirtyChannel mBroadcastChannel;
>     const d3d11::Format &mFormatSet;
> };
> 
>@@ -78,8 +74,8 @@ class TextureRenderTarget11 : public RenderTarget11
>     const TextureHelper11 &getTexture() const override;
>     const d3d11::RenderTargetView &getRenderTargetView() const override;
>     const d3d11::DepthStencilView &getDepthStencilView() const override;
>-    const d3d11::SharedSRV &getShaderResourceView() const override;
>-    const d3d11::SharedSRV &getBlitShaderResourceView() const override;
>+    const d3d11::SharedSRV &getShaderResourceView(const gl::Context *context) const override;
>+    const d3d11::SharedSRV &getBlitShaderResourceView(const gl::Context *context) const override;
> 
>     unsigned int getSubresourceIndex() const override;
> 
>@@ -116,8 +112,8 @@ class SurfaceRenderTarget11 : public RenderTarget11
>     const TextureHelper11 &getTexture() const override;
>     const d3d11::RenderTargetView &getRenderTargetView() const override;
>     const d3d11::DepthStencilView &getDepthStencilView() const override;
>-    const d3d11::SharedSRV &getShaderResourceView() const override;
>-    const d3d11::SharedSRV &getBlitShaderResourceView() const override;
>+    const d3d11::SharedSRV &getShaderResourceView(const gl::Context *context) const override;
>+    const d3d11::SharedSRV &getBlitShaderResourceView(const gl::Context *context) const override;
> 
>     unsigned int getSubresourceIndex() const override;
> 
>@@ -128,4 +124,4 @@ class SurfaceRenderTarget11 : public RenderTarget11
> 
> }  // namespace rx
> 
>-#endif // LIBANGLE_RENDERER_D3D_D3D11_RENDERTARGET11_H_
>+#endif  // LIBANGLE_RENDERER_D3D_D3D11_RENDERTARGET11_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/Renderer11.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/Renderer11.cpp
>index bd14f4de2a8..33dfa6b035e 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/Renderer11.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/Renderer11.cpp
>@@ -29,7 +29,6 @@
> #include "libANGLE/renderer/d3d/DisplayD3D.h"
> #include "libANGLE/renderer/d3d/FramebufferD3D.h"
> #include "libANGLE/renderer/d3d/IndexDataManager.h"
>-#include "libANGLE/renderer/d3d/ProgramD3D.h"
> #include "libANGLE/renderer/d3d/RenderbufferD3D.h"
> #include "libANGLE/renderer/d3d/ShaderD3D.h"
> #include "libANGLE/renderer/d3d/SurfaceD3D.h"
>@@ -44,10 +43,11 @@
> #include "libANGLE/renderer/d3d/d3d11/Image11.h"
> #include "libANGLE/renderer/d3d/d3d11/IndexBuffer11.h"
> #include "libANGLE/renderer/d3d/d3d11/PixelTransfer11.h"
>+#include "libANGLE/renderer/d3d/d3d11/Program11.h"
> #include "libANGLE/renderer/d3d/d3d11/Query11.h"
> #include "libANGLE/renderer/d3d/d3d11/RenderTarget11.h"
> #include "libANGLE/renderer/d3d/d3d11/ShaderExecutable11.h"
>-#include "libANGLE/renderer/d3d/d3d11/StreamProducerNV12.h"
>+#include "libANGLE/renderer/d3d/d3d11/StreamProducerD3DTexture.h"
> #include "libANGLE/renderer/d3d/d3d11/SwapChain11.h"
> #include "libANGLE/renderer/d3d/d3d11/TextureStorage11.h"
> #include "libANGLE/renderer/d3d/d3d11/TransformFeedback11.h"
>@@ -62,22 +62,16 @@
> #include "third_party/trace_event/trace_event.h"
> 
> #ifdef ANGLE_ENABLE_WINDOWS_STORE
>-#include "libANGLE/renderer/d3d/d3d11/winrt/NativeWindow11WinRT.h"
>+#    include "libANGLE/renderer/d3d/d3d11/winrt/NativeWindow11WinRT.h"
> #else
>-#include "libANGLE/renderer/d3d/d3d11/win32/NativeWindow11Win32.h"
>-#endif
>-
>-// Include the D3D9 debug annotator header for use by the desktop D3D11 renderer
>-// because the D3D11 interface method ID3DUserDefinedAnnotation::GetStatus
>-// doesn't work with the Graphics Diagnostics tools in Visual Studio 2013.
>-#ifdef ANGLE_ENABLE_D3D9
>-#include "libANGLE/renderer/d3d/d3d9/DebugAnnotator9.h"
>+#    include "libANGLE/renderer/d3d/d3d11/converged/CompositorNativeWindow11.h"
>+#    include "libANGLE/renderer/d3d/d3d11/win32/NativeWindow11Win32.h"
> #endif
> 
> // Enable ANGLE_SKIP_DXGI_1_2_CHECK if there is not a possibility of using cross-process
> // HWNDs or the Windows 7 Platform Update (KB2670838) is expected to be installed.
> #ifndef ANGLE_SKIP_DXGI_1_2_CHECK
>-#define ANGLE_SKIP_DXGI_1_2_CHECK 0
>+#    define ANGLE_SKIP_DXGI_1_2_CHECK 0
> #endif
> 
> namespace rx
>@@ -154,7 +148,7 @@ void SetTriangleFanIndices(GLuint *destPtr, size_t numTris)
> template <typename T>
> void CopyLineLoopIndicesWithRestart(const void *indices,
>                                     size_t count,
>-                                    GLenum indexType,
>+                                    gl::DrawElementsType indexType,
>                                     std::vector<GLuint> *bufferOut)
> {
>     GLuint restartIndex    = gl::GetPrimitiveRestartIndex(indexType);
>@@ -194,22 +188,22 @@ void CopyLineLoopIndicesWithRestart(const void *indices,
> }
> 
> void GetLineLoopIndices(const void *indices,
>-                        GLenum indexType,
>+                        gl::DrawElementsType indexType,
>                         GLuint count,
>                         bool usePrimitiveRestartFixedIndex,
>                         std::vector<GLuint> *bufferOut)
> {
>-    if (indexType != GL_NONE && usePrimitiveRestartFixedIndex)
>+    if (indexType != gl::DrawElementsType::InvalidEnum && usePrimitiveRestartFixedIndex)
>     {
>         switch (indexType)
>         {
>-            case GL_UNSIGNED_BYTE:
>+            case gl::DrawElementsType::UnsignedByte:
>                 CopyLineLoopIndicesWithRestart<GLubyte>(indices, count, indexType, bufferOut);
>                 break;
>-            case GL_UNSIGNED_SHORT:
>+            case gl::DrawElementsType::UnsignedShort:
>                 CopyLineLoopIndicesWithRestart<GLushort>(indices, count, indexType, bufferOut);
>                 break;
>-            case GL_UNSIGNED_INT:
>+            case gl::DrawElementsType::UnsignedInt:
>                 CopyLineLoopIndicesWithRestart<GLuint>(indices, count, indexType, bufferOut);
>                 break;
>             default:
>@@ -225,16 +219,16 @@ void GetLineLoopIndices(const void *indices,
>     switch (indexType)
>     {
>         // Non-indexed draw
>-        case GL_NONE:
>+        case gl::DrawElementsType::InvalidEnum:
>             SetLineLoopIndices(&(*bufferOut)[0], count);
>             break;
>-        case GL_UNSIGNED_BYTE:
>+        case gl::DrawElementsType::UnsignedByte:
>             CopyLineLoopIndices<GLubyte>(indices, &(*bufferOut)[0], count);
>             break;
>-        case GL_UNSIGNED_SHORT:
>+        case gl::DrawElementsType::UnsignedShort:
>             CopyLineLoopIndices<GLushort>(indices, &(*bufferOut)[0], count);
>             break;
>-        case GL_UNSIGNED_INT:
>+        case gl::DrawElementsType::UnsignedInt:
>             CopyLineLoopIndices<GLuint>(indices, &(*bufferOut)[0], count);
>             break;
>         default:
>@@ -259,11 +253,11 @@ void CopyTriangleFanIndices(const void *indices, GLuint *destPtr, size_t numTris
> template <typename T>
> void CopyTriangleFanIndicesWithRestart(const void *indices,
>                                        GLuint indexCount,
>-                                       GLenum indexType,
>+                                       gl::DrawElementsType indexType,
>                                        std::vector<GLuint> *bufferOut)
> {
>     GLuint restartIndex    = gl::GetPrimitiveRestartIndex(indexType);
>-    GLuint d3dRestartIndex = gl::GetPrimitiveRestartIndex(GL_UNSIGNED_INT);
>+    GLuint d3dRestartIndex = gl::GetPrimitiveRestartIndex(gl::DrawElementsType::UnsignedInt);
>     const T *srcPtr        = static_cast<const T *>(indices);
>     Optional<GLuint> vertexA;
>     Optional<GLuint> vertexB;
>@@ -302,22 +296,22 @@ void CopyTriangleFanIndicesWithRestart(const void *indices,
> }
> 
> void GetTriFanIndices(const void *indices,
>-                      GLenum indexType,
>+                      gl::DrawElementsType indexType,
>                       GLuint count,
>                       bool usePrimitiveRestartFixedIndex,
>                       std::vector<GLuint> *bufferOut)
> {
>-    if (indexType != GL_NONE && usePrimitiveRestartFixedIndex)
>+    if (indexType != gl::DrawElementsType::InvalidEnum && usePrimitiveRestartFixedIndex)
>     {
>         switch (indexType)
>         {
>-            case GL_UNSIGNED_BYTE:
>+            case gl::DrawElementsType::UnsignedByte:
>                 CopyTriangleFanIndicesWithRestart<GLubyte>(indices, count, indexType, bufferOut);
>                 break;
>-            case GL_UNSIGNED_SHORT:
>+            case gl::DrawElementsType::UnsignedShort:
>                 CopyTriangleFanIndicesWithRestart<GLushort>(indices, count, indexType, bufferOut);
>                 break;
>-            case GL_UNSIGNED_INT:
>+            case gl::DrawElementsType::UnsignedInt:
>                 CopyTriangleFanIndicesWithRestart<GLuint>(indices, count, indexType, bufferOut);
>                 break;
>             default:
>@@ -334,16 +328,16 @@ void GetTriFanIndices(const void *indices,
>     switch (indexType)
>     {
>         // Non-indexed draw
>-        case GL_NONE:
>+        case gl::DrawElementsType::InvalidEnum:
>             SetTriangleFanIndices(&(*bufferOut)[0], numTris);
>             break;
>-        case GL_UNSIGNED_BYTE:
>+        case gl::DrawElementsType::UnsignedByte:
>             CopyTriangleFanIndices<GLubyte>(indices, &(*bufferOut)[0], numTris);
>             break;
>-        case GL_UNSIGNED_SHORT:
>+        case gl::DrawElementsType::UnsignedShort:
>             CopyTriangleFanIndices<GLushort>(indices, &(*bufferOut)[0], numTris);
>             break;
>-        case GL_UNSIGNED_INT:
>+        case gl::DrawElementsType::UnsignedInt:
>             CopyTriangleFanIndices<GLuint>(indices, &(*bufferOut)[0], numTris);
>             break;
>         default:
>@@ -352,29 +346,6 @@ void GetTriFanIndices(const void *indices,
>     }
> }
> 
>-bool DrawCallNeedsTranslation(const gl::Context *context, GLenum mode)
>-{
>-    const auto &glState     = context->getGLState();
>-    const gl::VertexArray *vertexArray = glState.getVertexArray();
>-    VertexArray11 *vertexArray11       = GetImplAs<VertexArray11>(vertexArray);
>-    // Direct drawing doesn't support dynamic attribute storage since it needs the first and count
>-    // to translate when applyVertexBuffer. GL_LINE_LOOP and GL_TRIANGLE_FAN are not supported
>-    // either since we need to simulate them in D3D.
>-    if (vertexArray11->hasActiveDynamicAttrib(context) || mode == GL_LINE_LOOP ||
>-        mode == GL_TRIANGLE_FAN)
>-    {
>-        return true;
>-    }
>-
>-    ProgramD3D *programD3D = GetImplAs<ProgramD3D>(glState.getProgram());
>-    if (InstancedPointSpritesActive(programD3D, mode))
>-    {
>-        return true;
>-    }
>-
>-    return false;
>-}
>-
> bool IsArrayRTV(ID3D11RenderTargetView *rtv)
> {
>     D3D11_RENDER_TARGET_VIEW_DESC desc;
>@@ -391,17 +362,17 @@ bool IsArrayRTV(ID3D11RenderTargetView *rtv)
>     return false;
> }
> 
>-int GetAdjustedInstanceCount(const gl::Program *program, int instanceCount)
>+GLsizei GetAdjustedInstanceCount(const ProgramD3D *program, GLsizei instanceCount)
> {
>-    if (!program->usesMultiview())
>+    if (!program->getState().usesMultiview())
>     {
>         return instanceCount;
>     }
>     if (instanceCount == 0)
>     {
>-        return program->getNumViews();
>+        return program->getState().getNumViews();
>     }
>-    return program->getNumViews() * instanceCount;
>+    return program->getState().getNumViews() * instanceCount;
> }
> 
> const uint32_t ScratchMemoryBufferLifetime = 1000;
>@@ -430,12 +401,6 @@ void PopulateFormatDeviceCaps(ID3D11Device *device,
>     }
> }
> 
>-bool CullsEverything(const gl::State &glState)
>-{
>-    return (glState.getRasterizerState().cullFace &&
>-            glState.getRasterizerState().cullMode == gl::CullFaceMode::FrontAndBack);
>-}
>-
> }  // anonymous namespace
> 
> Renderer11DeviceCaps::Renderer11DeviceCaps() = default;
>@@ -448,11 +413,10 @@ Renderer11::Renderer11(egl::Display *display)
>       mLastHistogramUpdateTime(
>           ANGLEPlatformCurrent()->monotonicallyIncreasingTime(ANGLEPlatformCurrent())),
>       mDebug(nullptr),
>-      mScratchMemoryBuffer(ScratchMemoryBufferLifetime),
>-      mAnnotator(nullptr)
>+      mScratchMemoryBuffer(ScratchMemoryBufferLifetime)
> {
>-    mLineLoopIB       = nullptr;
>-    mTriangleFanIB    = nullptr;
>+    mLineLoopIB    = nullptr;
>+    mTriangleFanIB = nullptr;
> 
>     mBlit          = nullptr;
>     mPixelTransfer = nullptr;
>@@ -461,19 +425,18 @@ Renderer11::Renderer11(egl::Display *display)
> 
>     mTrim = nullptr;
> 
>-    mRenderer11DeviceCaps.supportsClearView             = false;
>-    mRenderer11DeviceCaps.supportsConstantBufferOffsets = false;
>+    mRenderer11DeviceCaps.supportsClearView                      = false;
>+    mRenderer11DeviceCaps.supportsConstantBufferOffsets          = false;
>     mRenderer11DeviceCaps.supportsVpRtIndexWriteFromVertexShader = false;
>-    mRenderer11DeviceCaps.supportsDXGI1_2               = false;
>-    mRenderer11DeviceCaps.B5G6R5support                 = 0;
>-    mRenderer11DeviceCaps.B4G4R4A4support               = 0;
>-    mRenderer11DeviceCaps.B5G5R5A1support               = 0;
>+    mRenderer11DeviceCaps.supportsDXGI1_2                        = false;
>+    mRenderer11DeviceCaps.B5G6R5support                          = 0;
>+    mRenderer11DeviceCaps.B4G4R4A4support                        = 0;
>+    mRenderer11DeviceCaps.B5G5R5A1support                        = 0;
> 
>     mD3d11Module          = nullptr;
>     mDxgiModule           = nullptr;
>     mDCompModule          = nullptr;
>     mCreatedWithDeviceEXT = false;
>-    mEGLDevice            = nullptr;
> 
>     mDevice         = nullptr;
>     mDeviceContext  = nullptr;
>@@ -484,10 +447,10 @@ Renderer11::Renderer11(egl::Display *display)
> 
>     ZeroMemory(&mAdapterDescription, sizeof(mAdapterDescription));
> 
>+    const auto &attributes = mDisplay->getAttributeMap();
>+
>     if (mDisplay->getPlatform() == EGL_PLATFORM_ANGLE_ANGLE)
>     {
>-        const auto &attributes = mDisplay->getAttributeMap();
>-
>         EGLint requestedMajorVersion = static_cast<EGLint>(
>             attributes.get(EGL_PLATFORM_ANGLE_MAX_VERSION_MAJOR_ANGLE, EGL_DONT_CARE));
>         EGLint requestedMinorVersion = static_cast<EGLint>(
>@@ -534,11 +497,11 @@ Renderer11::Renderer11(egl::Display *display)
>                 mRequestedDriverType = D3D_DRIVER_TYPE_HARDWARE;
>                 break;
> 
>-            case EGL_PLATFORM_ANGLE_DEVICE_TYPE_WARP_ANGLE:
>+            case EGL_PLATFORM_ANGLE_DEVICE_TYPE_D3D_WARP_ANGLE:
>                 mRequestedDriverType = D3D_DRIVER_TYPE_WARP;
>                 break;
> 
>-            case EGL_PLATFORM_ANGLE_DEVICE_TYPE_REFERENCE_ANGLE:
>+            case EGL_PLATFORM_ANGLE_DEVICE_TYPE_D3D_REFERENCE_ANGLE:
>                 mRequestedDriverType = D3D_DRIVER_TYPE_REFERENCE;
>                 break;
> 
>@@ -550,36 +513,21 @@ Renderer11::Renderer11(egl::Display *display)
>                 UNREACHABLE();
>         }
> 
>-        const EGLenum presentPath = static_cast<EGLenum>(attributes.get(
>-            EGL_EXPERIMENTAL_PRESENT_PATH_ANGLE, EGL_EXPERIMENTAL_PRESENT_PATH_COPY_ANGLE));
>-        mPresentPathFastEnabled = (presentPath == EGL_EXPERIMENTAL_PRESENT_PATH_FAST_ANGLE);
>-
>-        mCreateDebugDevice = ShouldUseDebugLayers(attributes);
>+        mCreateDebugDevice = false;
>     }
>-    else if (display->getPlatform() == EGL_PLATFORM_DEVICE_EXT)
>+    else if (mDisplay->getPlatform() == EGL_PLATFORM_DEVICE_EXT)
>     {
>-        mEGLDevice = GetImplAs<DeviceD3D>(display->getDevice());
>-        ASSERT(mEGLDevice != nullptr);
>+        ASSERT(mDisplay->getDevice() != nullptr);
>         mCreatedWithDeviceEXT = true;
> 
>         // Also set EGL_PLATFORM_ANGLE_ANGLE variables, in case they're used elsewhere in ANGLE
>         // mAvailableFeatureLevels defaults to empty
>-        mRequestedDriverType    = D3D_DRIVER_TYPE_UNKNOWN;
>-        mPresentPathFastEnabled = false;
>+        mRequestedDriverType = D3D_DRIVER_TYPE_UNKNOWN;
>     }
> 
>-// The D3D11 renderer must choose the D3D9 debug annotator because the D3D11 interface
>-// method ID3DUserDefinedAnnotation::GetStatus on desktop builds doesn't work with the Graphics
>-// Diagnostics tools in Visual Studio 2013.
>-// The D3D9 annotator works properly for both D3D11 and D3D9.
>-// Incorrect status reporting can cause ANGLE to log unnecessary debug events.
>-#ifdef ANGLE_ENABLE_D3D9
>-    mAnnotator = new DebugAnnotator9();
>-#else
>-    mAnnotator = new DebugAnnotator11();
>-#endif
>-    ASSERT(mAnnotator);
>-    gl::InitializeDebugAnnotations(mAnnotator);
>+    const EGLenum presentPath = static_cast<EGLenum>(attributes.get(
>+        EGL_EXPERIMENTAL_PRESENT_PATH_ANGLE, EGL_EXPERIMENTAL_PRESENT_PATH_COPY_ANGLE));
>+    mPresentPathFastEnabled   = (presentPath == EGL_EXPERIMENTAL_PRESENT_PATH_FAST_ANGLE);
> }
> 
> Renderer11::~Renderer11()
>@@ -588,7 +536,7 @@ Renderer11::~Renderer11()
> }
> 
> #ifndef __d3d11_1_h__
>-#define D3D11_MESSAGE_ID_DEVICE_DRAW_RENDERTARGETVIEW_NOT_SET ((D3D11_MESSAGE_ID)3146081)
>+#    define D3D11_MESSAGE_ID_DEVICE_DRAW_RENDERTARGETVIEW_NOT_SET ((D3D11_MESSAGE_ID)3146081)
> #endif
> 
> egl::Error Renderer11::initialize()
>@@ -598,7 +546,7 @@ egl::Error Renderer11::initialize()
>     ANGLE_TRY(initializeD3DDevice());
> 
> #if !defined(ANGLE_ENABLE_WINDOWS_STORE)
>-#if !ANGLE_SKIP_DXGI_1_2_CHECK
>+#    if !ANGLE_SKIP_DXGI_1_2_CHECK
>     {
>         TRACE_EVENT0("gpu.angle", "Renderer11::initialize (DXGICheck)");
>         // In order to create a swap chain for an HWND owned by another process, DXGI 1.2 is
>@@ -630,7 +578,7 @@ egl::Error Renderer11::initialize()
>             SafeRelease(dxgiDevice2);
>         }
>     }
>-#endif
>+#    endif
> #endif
> 
>     {
>@@ -720,7 +668,11 @@ egl::Error Renderer11::initialize()
>         if (SUCCEEDED(result))
>         {
>             D3D11_MESSAGE_ID hideMessages[] = {
>-                D3D11_MESSAGE_ID_DEVICE_DRAW_RENDERTARGETVIEW_NOT_SET};
>+                D3D11_MESSAGE_ID_DEVICE_DRAW_RENDERTARGETVIEW_NOT_SET,
>+
>+                // Robust access behaviour makes out of bounds messages safe
>+                D3D11_MESSAGE_ID_DEVICE_DRAW_VERTEX_BUFFER_TOO_SMALL,
>+            };
> 
>             D3D11_INFO_QUEUE_FILTER filter = {};
>             filter.DenyList.NumIDs         = static_cast<unsigned int>(ArraySize(hideMessages));
>@@ -832,11 +784,14 @@ egl::Error Renderer11::initializeD3DDevice()
>     }
>     else
>     {
>+        DeviceD3D *deviceD3D = GetImplAs<DeviceD3D>(mDisplay->getDevice());
>+        ASSERT(deviceD3D != nullptr);
>+
>         // We should use the inputted D3D11 device instead
>         void *device = nullptr;
>-        ANGLE_TRY(mEGLDevice->getDevice(&device));
>+        ANGLE_TRY(deviceD3D->getDevice(&device));
> 
>-        ID3D11Device *d3dDevice = reinterpret_cast<ID3D11Device *>(device);
>+        ID3D11Device *d3dDevice = static_cast<ID3D11Device *>(device);
>         if (FAILED(d3dDevice->GetDeviceRemovedReason()))
>         {
>             return egl::EglNotInitialized() << "Inputted D3D11 device has been lost.";
>@@ -859,6 +814,9 @@ egl::Error Renderer11::initializeD3DDevice()
> 
>     d3d11::SetDebugName(mDeviceContext, "DeviceContext");
> 
>+    mAnnotator.initialize(mDeviceContext);
>+    gl::InitializeDebugAnnotations(&mAnnotator);
>+
>     return egl::NoError();
> }
> 
>@@ -896,13 +854,6 @@ egl::Error Renderer11::initializeDevice()
>     ASSERT(!mPixelTransfer);
>     mPixelTransfer = new PixelTransfer11(this);
> 
>-    const gl::Caps &rendererCaps = getNativeCaps();
>-
>-    if (mStateManager.initialize(rendererCaps, getNativeExtensions()).isError())
>-    {
>-        return egl::EglBadAlloc() << "Error initializing state manager.";
>-    }
>-
>     // Gather stats on DXGI and D3D feature level
>     ANGLE_HISTOGRAM_BOOLEAN("GPU.ANGLE.SupportsDXGI1_2", mRenderer11DeviceCaps.supportsDXGI1_2);
> 
>@@ -969,7 +920,7 @@ void Renderer11::populateRenderer11DeviceCaps()
> 
>     if (getWorkarounds().disableB5G6R5Support)
>     {
>-        mRenderer11DeviceCaps.B5G6R5support = 0;
>+        mRenderer11DeviceCaps.B5G6R5support    = 0;
>         mRenderer11DeviceCaps.B5G6R5maxSamples = 0;
>     }
>     else
>@@ -1068,8 +1019,9 @@ egl::ConfigSet Renderer11::generateConfigs()
>     {
>         const gl::TextureCaps &colorBufferFormatCaps =
>             rendererTextureCaps.get(colorBufferInternalFormat);
>-        if (!colorBufferFormatCaps.renderable)
>+        if (!colorBufferFormatCaps.renderbuffer)
>         {
>+            ASSERT(!colorBufferFormatCaps.textureAttachment);
>             continue;
>         }
> 
>@@ -1077,9 +1029,10 @@ egl::ConfigSet Renderer11::generateConfigs()
>         {
>             const gl::TextureCaps &depthStencilBufferFormatCaps =
>                 rendererTextureCaps.get(depthStencilBufferInternalFormat);
>-            if (!depthStencilBufferFormatCaps.renderable &&
>+            if (!depthStencilBufferFormatCaps.renderbuffer &&
>                 depthStencilBufferInternalFormat != GL_NONE)
>             {
>+                ASSERT(!depthStencilBufferFormatCaps.textureAttachment);
>                 continue;
>             }
> 
>@@ -1109,9 +1062,9 @@ egl::ConfigSet Renderer11::generateConfigs()
>                 config.bindToTextureRGBA = (((colorBufferFormatInfo.format == GL_RGBA) ||
>                                              (colorBufferFormatInfo.format == GL_BGRA_EXT)) &&
>                                             (sampleCount <= 1));
>-                config.colorBufferType = EGL_RGB_BUFFER;
>-                config.configCaveat    = EGL_NONE;
>-                config.configID        = static_cast<EGLint>(configs.size() + 1);
>+                config.colorBufferType   = EGL_RGB_BUFFER;
>+                config.configCaveat      = EGL_NONE;
>+                config.configID          = static_cast<EGLint>(configs.size() + 1);
> 
>                 // PresentPathFast may not be conformant
>                 config.conformant = 0;
>@@ -1204,11 +1157,7 @@ void Renderer11::generateDisplayExtensions(egl::DisplayExtensions *outExtensions
>     outExtensions->stream                     = true;
>     outExtensions->streamConsumerGLTexture    = true;
>     outExtensions->streamConsumerGLTextureYUV = true;
>-    // Not all D3D11 devices support NV12 textures
>-    if (getNV12TextureSupport())
>-    {
>-        outExtensions->streamProducerD3DTextureNV12 = true;
>-    }
>+    outExtensions->streamProducerD3DTexture   = true;
> 
>     outExtensions->flexibleSurfaceCompatibility = true;
>     outExtensions->directComposition            = !!mDCompModule;
>@@ -1224,15 +1173,21 @@ void Renderer11::generateDisplayExtensions(egl::DisplayExtensions *outExtensions
> 
>     // All D3D feature levels support robust resource init
>     outExtensions->robustResourceInitialization = true;
>+
>+    // Compositor Native Window capabilies require WinVer >= 1803
>+    if (CompositorNativeWindow11::IsSupportedWinRelease())
>+    {
>+        outExtensions->windowsUIComposition = true;
>+    }
> }
> 
>-gl::Error Renderer11::flush()
>+angle::Result Renderer11::flush(Context11 *context11)
> {
>     mDeviceContext->Flush();
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error Renderer11::finish()
>+angle::Result Renderer11::finish(Context11 *context11)
> {
>     if (!mSyncQuery.valid())
>     {
>@@ -1240,7 +1195,7 @@ gl::Error Renderer11::finish()
>         queryDesc.Query     = D3D11_QUERY_EVENT;
>         queryDesc.MiscFlags = 0;
> 
>-        ANGLE_TRY(allocateResource(queryDesc, &mSyncQuery));
>+        ANGLE_TRY(allocateResource(context11, queryDesc, &mSyncQuery));
>     }
> 
>     mDeviceContext->End(mSyncQuery.get());
>@@ -1254,10 +1209,7 @@ gl::Error Renderer11::finish()
>         attempt++;
> 
>         result = mDeviceContext->GetData(mSyncQuery.get(), nullptr, 0, flags);
>-        if (FAILED(result))
>-        {
>-            return gl::OutOfMemory() << "Failed to get event query data, " << gl::FmtHR(result);
>-        }
>+        ANGLE_TRY_HR(context11, result, "Failed to get event query data");
> 
>         if (result == S_FALSE)
>         {
>@@ -1265,22 +1217,34 @@ gl::Error Renderer11::finish()
>             ScheduleYield();
>         }
> 
>-        if (testDeviceLost())
>+        // Attempt is incremented before checking if we should test for device loss so that device
>+        // loss is not checked on the first iteration
>+        bool checkDeviceLost = (attempt % kPollingD3DDeviceLostCheckFrequency) == 0;
>+        if (checkDeviceLost && testDeviceLost())
>         {
>             mDisplay->notifyDeviceLost();
>-            return gl::OutOfMemory() << "Device was lost while waiting for sync.";
>+            ANGLE_CHECK(context11, false, "Device was lost while waiting for sync.",
>+                        GL_OUT_OF_MEMORY);
>         }
>     } while (result == S_FALSE);
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
> bool Renderer11::isValidNativeWindow(EGLNativeWindowType window) const
> {
>+    static_assert(sizeof(ABI::Windows::UI::Composition::SpriteVisual *) == sizeof(HWND),
>+                  "Pointer size must match Window Handle size");
>+
> #ifdef ANGLE_ENABLE_WINDOWS_STORE
>     return NativeWindow11WinRT::IsValidNativeWindow(window);
> #else
>-    return NativeWindow11Win32::IsValidNativeWindow(window);
>+    if (NativeWindow11Win32::IsValidNativeWindow(window))
>+    {
>+        return true;
>+    }
>+
>+    return CompositorNativeWindow11::IsValidNativeWindow(window);
> #endif
> }
> 
>@@ -1288,21 +1252,30 @@ NativeWindowD3D *Renderer11::createNativeWindow(EGLNativeWindowType window,
>                                                 const egl::Config *config,
>                                                 const egl::AttributeMap &attribs) const
> {
>+    auto useWinUiComp = window != nullptr && !NativeWindow11Win32::IsValidNativeWindow(window);
>+
>+    if (useWinUiComp)
>+    {
>+        return new CompositorNativeWindow11(window, config->alphaSize > 0);
>+    }
>+    else
>+    {
> #ifdef ANGLE_ENABLE_WINDOWS_STORE
>-    UNUSED_VARIABLE(attribs);
>-    return new NativeWindow11WinRT(window, config->alphaSize > 0);
>+        UNUSED_VARIABLE(attribs);
>+        return new NativeWindow11WinRT(window, config->alphaSize > 0);
> #else
>-    return new NativeWindow11Win32(
>-        window, config->alphaSize > 0,
>-        attribs.get(EGL_DIRECT_COMPOSITION_ANGLE, EGL_FALSE) == EGL_TRUE);
>+        return new NativeWindow11Win32(
>+            window, config->alphaSize > 0,
>+            attribs.get(EGL_DIRECT_COMPOSITION_ANGLE, EGL_FALSE) == EGL_TRUE);
> #endif
>+    }
> }
> 
> egl::Error Renderer11::getD3DTextureInfo(const egl::Config *configuration,
>                                          IUnknown *d3dTexture,
>                                          EGLint *width,
>                                          EGLint *height,
>-                                         GLenum *fboFormat) const
>+                                         const angle::Format **angleFormat) const
> {
>     ID3D11Texture2D *texture = d3d11::DynamicCastComObject<ID3D11Texture2D>(d3dTexture);
>     if (texture == nullptr)
>@@ -1347,10 +1320,13 @@ egl::Error Renderer11::getD3DTextureInfo(const egl::Config *configuration,
>     {
>         case DXGI_FORMAT_R8G8B8A8_UNORM:
>         case DXGI_FORMAT_R8G8B8A8_UNORM_SRGB:
>+        case DXGI_FORMAT_R8G8B8A8_TYPELESS:
>         case DXGI_FORMAT_B8G8R8A8_UNORM:
>         case DXGI_FORMAT_B8G8R8A8_UNORM_SRGB:
>+        case DXGI_FORMAT_B8G8R8A8_TYPELESS:
>         case DXGI_FORMAT_R16G16B16A16_FLOAT:
>         case DXGI_FORMAT_R32G32B32A32_FLOAT:
>+        case DXGI_FORMAT_R10G10B10A2_UNORM:
>             break;
> 
>         default:
>@@ -1358,10 +1334,9 @@ egl::Error Renderer11::getD3DTextureInfo(const egl::Config *configuration,
>                    << "Unknown client buffer texture format: " << desc.Format;
>     }
> 
>-    if (fboFormat)
>+    if (angleFormat)
>     {
>-        const angle::Format &angleFormat = d3d11_angle::GetFormat(desc.Format);
>-        *fboFormat                       = angleFormat.fboImplementationInternalFormat;
>+        *angleFormat = &d3d11_angle::GetFormat(desc.Format);
>     }
> 
>     return egl::NoError();
>@@ -1427,267 +1402,202 @@ SwapChainD3D *Renderer11::createSwapChain(NativeWindowD3D *nativeWindow,
> 
> void *Renderer11::getD3DDevice()
> {
>-    return reinterpret_cast<void *>(mDevice);
>+    return mDevice;
> }
> 
>-bool Renderer11::applyPrimitiveType(const gl::State &glState, GLenum mode, GLsizei count)
>+angle::Result Renderer11::drawWithGeometryShaderAndTransformFeedback(Context11 *context11,
>+                                                                     gl::PrimitiveMode mode,
>+                                                                     UINT instanceCount,
>+                                                                     UINT vertexCount)
> {
>-    D3D11_PRIMITIVE_TOPOLOGY primitiveTopology = D3D_PRIMITIVE_TOPOLOGY_UNDEFINED;
>+    const gl::State &glState = context11->getState();
>+    ProgramD3D *programD3D   = mStateManager.getProgramD3D();
> 
>-    GLsizei minCount = 0;
>+    // Since we use a geometry if-and-only-if we rewrite vertex streams, transform feedback
>+    // won't get the correct output. To work around this, draw with *only* the stream out
>+    // first (no pixel shader) to feed the stream out buffers and then draw again with the
>+    // geometry shader + pixel shader to rasterize the primitives.
>+    mStateManager.setPixelShader(nullptr);
> 
>-    switch (mode)
>+    if (instanceCount > 0)
>     {
>-        case GL_POINTS:
>-        {
>-            bool usesPointSize = GetImplAs<ProgramD3D>(glState.getProgram())->usesPointSize();
>+        mDeviceContext->DrawInstanced(vertexCount, instanceCount, 0, 0);
>+    }
>+    else
>+    {
>+        mDeviceContext->Draw(vertexCount, 0);
>+    }
> 
>-            // ProgramBinary assumes non-point rendering if gl_PointSize isn't written,
>-            // which affects varying interpolation. Since the value of gl_PointSize is
>-            // undefined when not written, just skip drawing to avoid unexpected results.
>-            if (!usesPointSize && !glState.isTransformFeedbackActiveUnpaused())
>-            {
>-                // Notify developers of risking undefined behavior.
>-                WARN() << "Point rendering without writing to gl_PointSize.";
>-                return false;
>-            }
>+    rx::ShaderExecutableD3D *pixelExe = nullptr;
>+    ANGLE_TRY(programD3D->getPixelExecutableForCachedOutputLayout(context11, &pixelExe, nullptr));
> 
>-            // If instanced pointsprites are enabled and the shader uses gl_PointSize, the topology
>-            // must be D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST.
>-            if (usesPointSize && getWorkarounds().useInstancedPointSpriteEmulation)
>-            {
>-                primitiveTopology = D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST;
>-            }
>-            else
>-            {
>-                primitiveTopology = D3D11_PRIMITIVE_TOPOLOGY_POINTLIST;
>-            }
>-            minCount = 1;
>-            break;
>-        }
>-        case GL_LINES:
>-            primitiveTopology = D3D_PRIMITIVE_TOPOLOGY_LINELIST;
>-            minCount          = 2;
>-            break;
>-        case GL_LINE_LOOP:
>-            primitiveTopology = D3D_PRIMITIVE_TOPOLOGY_LINESTRIP;
>-            minCount          = 2;
>-            break;
>-        case GL_LINE_STRIP:
>-            primitiveTopology = D3D_PRIMITIVE_TOPOLOGY_LINESTRIP;
>-            minCount          = 2;
>-            break;
>-        case GL_TRIANGLES:
>-            primitiveTopology = D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST;
>-            minCount          = CullsEverything(glState) ? std::numeric_limits<GLsizei>::max() : 3;
>-            break;
>-        case GL_TRIANGLE_STRIP:
>-            primitiveTopology = D3D_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP;
>-            minCount          = CullsEverything(glState) ? std::numeric_limits<GLsizei>::max() : 3;
>-            break;
>-        // emulate fans via rewriting index buffer
>-        case GL_TRIANGLE_FAN:
>-            primitiveTopology = D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST;
>-            minCount          = CullsEverything(glState) ? std::numeric_limits<GLsizei>::max() : 3;
>-            break;
>-        default:
>-            UNREACHABLE();
>-            return false;
>+    // Skip the draw call if rasterizer discard is enabled (or no fragment shader).
>+    if (!pixelExe || glState.getRasterizerState().rasterizerDiscard)
>+    {
>+        return angle::Result::Continue;
>     }
> 
>-    mStateManager.setPrimitiveTopology(primitiveTopology);
>+    mStateManager.setPixelShader(&GetAs<ShaderExecutable11>(pixelExe)->getPixelShader());
> 
>-    return count >= minCount;
>-}
>+    // Retrieve the geometry shader.
>+    rx::ShaderExecutableD3D *geometryExe = nullptr;
>+    ANGLE_TRY(programD3D->getGeometryExecutableForPrimitiveType(context11, glState, mode,
>+                                                                &geometryExe, nullptr));
> 
>-gl::Error Renderer11::drawArrays(const gl::Context *context,
>-                                 GLenum mode,
>-                                 GLint startVertex,
>-                                 GLsizei count,
>-                                 GLsizei instances)
>-{
>-    const auto &glState = context->getGLState();
>+    mStateManager.setGeometryShader(&GetAs<ShaderExecutable11>(geometryExe)->getGeometryShader());
> 
>-    if (!applyPrimitiveType(glState, mode, count))
>+    if (instanceCount > 0)
>     {
>-        return gl::NoError();
>+        mDeviceContext->DrawInstanced(vertexCount, instanceCount, 0, 0);
>     }
>-
>-    DrawCallVertexParams vertexParams(startVertex, count, instances);
>-    ANGLE_TRY(mStateManager.applyVertexBuffer(context, mode, vertexParams, false));
>-
>-    if (glState.isTransformFeedbackActiveUnpaused())
>+    else
>     {
>-        ANGLE_TRY(markTransformFeedbackUsage(context));
>+        mDeviceContext->Draw(vertexCount, 0);
>     }
> 
>-    gl::Program *program = glState.getProgram();
>-    ASSERT(program != nullptr);
>-    GLsizei adjustedInstanceCount = GetAdjustedInstanceCount(program, instances);
>-    ProgramD3D *programD3D        = GetImplAs<ProgramD3D>(program);
>+    return angle::Result::Continue;
>+}
> 
>-    if (programD3D->usesGeometryShader(mode) && glState.isTransformFeedbackActiveUnpaused())
>+angle::Result Renderer11::drawArrays(const gl::Context *context,
>+                                     gl::PrimitiveMode mode,
>+                                     GLint firstVertex,
>+                                     GLsizei vertexCount,
>+                                     GLsizei instanceCount)
>+{
>+    if (mStateManager.getCullEverything())
>     {
>-        // Since we use a geometry if-and-only-if we rewrite vertex streams, transform feedback
>-        // won't get the correct output. To work around this, draw with *only* the stream out
>-        // first (no pixel shader) to feed the stream out buffers and then draw again with the
>-        // geometry shader + pixel shader to rasterize the primitives.
>-        mStateManager.setPixelShader(nullptr);
>-
>-        if (adjustedInstanceCount > 0)
>-        {
>-            mDeviceContext->DrawInstanced(count, adjustedInstanceCount, 0, 0);
>-        }
>-        else
>-        {
>-            mDeviceContext->Draw(count, 0);
>-        }
>-
>-        rx::ShaderExecutableD3D *pixelExe = nullptr;
>-        ANGLE_TRY(programD3D->getPixelExecutableForCachedOutputLayout(&pixelExe, nullptr));
>-
>-        // Skip the draw call if rasterizer discard is enabled (or no fragment shader).
>-        if (!pixelExe || glState.getRasterizerState().rasterizerDiscard)
>-        {
>-            return gl::NoError();
>-        }
>+        return angle::Result::Continue;
>+    }
> 
>-        mStateManager.setPixelShader(&GetAs<ShaderExecutable11>(pixelExe)->getPixelShader());
>+    ProgramD3D *programD3D        = mStateManager.getProgramD3D();
>+    GLsizei adjustedInstanceCount = GetAdjustedInstanceCount(programD3D, instanceCount);
> 
>-        // Retrieve the geometry shader.
>-        rx::ShaderExecutableD3D *geometryExe = nullptr;
>-        ANGLE_TRY(programD3D->getGeometryExecutableForPrimitiveType(context, mode, &geometryExe,
>-                                                                    nullptr));
>+    // Note: vertex indexes can be arbitrarily large.
>+    UINT clampedVertexCount = gl::GetClampedVertexCount<UINT>(vertexCount);
> 
>-        mStateManager.setGeometryShader(
>-            &GetAs<ShaderExecutable11>(geometryExe)->getGeometryShader());
>+    const auto &glState = context->getState();
>+    if (glState.getCurrentTransformFeedback() && glState.isTransformFeedbackActiveUnpaused())
>+    {
>+        ANGLE_TRY(markTransformFeedbackUsage(context));
> 
>-        if (adjustedInstanceCount > 0)
>-        {
>-            mDeviceContext->DrawInstanced(count, adjustedInstanceCount, 0, 0);
>-        }
>-        else
>+        if (programD3D->usesGeometryShader(glState, mode))
>         {
>-            mDeviceContext->Draw(count, 0);
>+            return drawWithGeometryShaderAndTransformFeedback(
>+                GetImplAs<Context11>(context), mode, adjustedInstanceCount, clampedVertexCount);
>         }
>-        return gl::NoError();
>     }
> 
>-    if (mode == GL_LINE_LOOP)
>+    switch (mode)
>     {
>-        return drawLineLoop(context, count, GL_NONE, nullptr, 0, adjustedInstanceCount);
>-    }
>+        case gl::PrimitiveMode::LineLoop:
>+            return drawLineLoop(context, clampedVertexCount, gl::DrawElementsType::InvalidEnum,
>+                                nullptr, 0, adjustedInstanceCount);
>+        case gl::PrimitiveMode::TriangleFan:
>+            return drawTriangleFan(context, clampedVertexCount, gl::DrawElementsType::InvalidEnum,
>+                                   nullptr, 0, adjustedInstanceCount);
>+        case gl::PrimitiveMode::Points:
>+            if (getWorkarounds().useInstancedPointSpriteEmulation)
>+            {
>+                // This code should not be reachable by multi-view programs.
>+                ASSERT(programD3D->getState().usesMultiview() == false);
> 
>-    if (mode == GL_TRIANGLE_FAN)
>-    {
>-        return drawTriangleFan(context, count, GL_NONE, nullptr, 0, adjustedInstanceCount);
>-    }
>+                // If the shader is writing to gl_PointSize, then pointsprites are being rendered.
>+                // Emulating instanced point sprites for FL9_3 requires the topology to be
>+                // D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST and DrawIndexedInstanced is called instead.
>+                if (adjustedInstanceCount == 0)
>+                {
>+                    mDeviceContext->DrawIndexedInstanced(6, clampedVertexCount, 0, 0, 0);
>+                    return angle::Result::Continue;
>+                }
> 
>-    bool useInstancedPointSpriteEmulation =
>-        programD3D->usesPointSize() && getWorkarounds().useInstancedPointSpriteEmulation;
>+                // If pointsprite emulation is used with glDrawArraysInstanced then we need to take
>+                // a less efficent code path. Instanced rendering of emulated pointsprites requires
>+                // a loop to draw each batch of points. An offset into the instanced data buffer is
>+                // calculated and applied on each iteration to ensure all instances are rendered
>+                // correctly. Each instance being rendered requires the inputlayout cache to reapply
>+                // buffers and offsets.
>+                for (GLsizei i = 0; i < instanceCount; i++)
>+                {
>+                    ANGLE_TRY(mStateManager.updateVertexOffsetsForPointSpritesEmulation(
>+                        context, firstVertex, i));
>+                    mDeviceContext->DrawIndexedInstanced(6, clampedVertexCount, 0, 0, 0);
>+                }
> 
>-    if (mode != GL_POINTS || !useInstancedPointSpriteEmulation)
>-    {
>-        if (adjustedInstanceCount == 0)
>-        {
>-            mDeviceContext->Draw(count, 0);
>-        }
>-        else
>-        {
>-            mDeviceContext->DrawInstanced(count, adjustedInstanceCount, 0, 0);
>-        }
>-        return gl::NoError();
>+                // This required by updateVertexOffsets... above but is outside of the loop for
>+                // speed.
>+                mStateManager.invalidateVertexBuffer();
>+                return angle::Result::Continue;
>+            }
>+            break;
>+        default:
>+            break;
>     }
> 
>-    // This code should not be reachable by multi-view programs.
>-    ASSERT(program->usesMultiview() == false);
>-
>-    // If the shader is writing to gl_PointSize, then pointsprites are being rendered.
>-    // Emulating instanced point sprites for FL9_3 requires the topology to be
>-    // D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST and DrawIndexedInstanced is called instead.
>+    // "Normal" draw case.
>     if (adjustedInstanceCount == 0)
>     {
>-        mDeviceContext->DrawIndexedInstanced(6, count, 0, 0, 0);
>-        return gl::NoError();
>+        mDeviceContext->Draw(clampedVertexCount, 0);
>     }
>-
>-    // If pointsprite emulation is used with glDrawArraysInstanced then we need to take a less
>-    // efficent code path. Instanced rendering of emulated pointsprites requires a loop to draw each
>-    // batch of points. An offset into the instanced data buffer is calculated and applied on each
>-    // iteration to ensure all instances are rendered correctly. Each instance being rendered
>-    // requires the inputlayout cache to reapply buffers and offsets.
>-    for (GLsizei i = 0; i < instances; i++)
>+    else
>     {
>-        ANGLE_TRY(mStateManager.updateVertexOffsetsForPointSpritesEmulation(startVertex, i));
>-        mDeviceContext->DrawIndexedInstanced(6, count, 0, 0, 0);
>+        mDeviceContext->DrawInstanced(clampedVertexCount, adjustedInstanceCount, 0, 0);
>     }
>-
>-    // This required by updateVertexOffsets... above but is outside of the loop for speed.
>-    mStateManager.invalidateVertexBuffer();
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error Renderer11::drawElements(const gl::Context *context,
>-                                   GLenum mode,
>-                                   GLsizei count,
>-                                   GLenum type,
>-                                   const void *indices,
>-                                   GLsizei instances)
>+angle::Result Renderer11::drawElements(const gl::Context *context,
>+                                       gl::PrimitiveMode mode,
>+                                       GLint startVertex,
>+                                       GLsizei indexCount,
>+                                       gl::DrawElementsType indexType,
>+                                       const void *indices,
>+                                       GLsizei instanceCount)
> {
>-    const auto &glState = context->getGLState();
>-
>-    if (!applyPrimitiveType(glState, mode, count))
>+    if (mStateManager.getCullEverything())
>     {
>-        return gl::NoError();
>+        return angle::Result::Continue;
>     }
> 
>     // Transform feedback is not allowed for DrawElements, this error should have been caught at the
>     // API validation layer.
>+    const gl::State &glState = context->getState();
>     ASSERT(!glState.isTransformFeedbackActiveUnpaused());
> 
>-    const auto &lazyIndexRange = context->getParams<gl::HasIndexRange>();
>-
>-    bool usePrimitiveRestartWorkaround =
>-        UsePrimitiveRestartWorkaround(glState.isPrimitiveRestartEnabled(), type);
>-    DrawCallVertexParams vertexParams(!usePrimitiveRestartWorkaround, lazyIndexRange, 0, instances);
>-
>-    ANGLE_TRY(mStateManager.applyIndexBuffer(context, indices, count, type, lazyIndexRange,
>-                                             usePrimitiveRestartWorkaround));
>-    ANGLE_TRY(mStateManager.applyVertexBuffer(context, mode, vertexParams, true));
>+    // If this draw call is coming from an indirect call, offset by the indirect call's base vertex.
>+    // No base vertex parameter exists for a normal drawElements, so params.baseVertex will be zero.
>+    int baseVertex = -startVertex;
> 
>-    int startVertex = static_cast<int>(vertexParams.firstVertex());
>-    int baseVertex  = -startVertex;
>+    const ProgramD3D *programD3D  = mStateManager.getProgramD3D();
>+    GLsizei adjustedInstanceCount = GetAdjustedInstanceCount(programD3D, instanceCount);
> 
>-    const gl::Program *program    = glState.getProgram();
>-    GLsizei adjustedInstanceCount = GetAdjustedInstanceCount(program, instances);
>-
>-    if (mode == GL_LINE_LOOP)
>+    if (mode == gl::PrimitiveMode::LineLoop)
>     {
>-        return drawLineLoop(context, count, type, indices, baseVertex, adjustedInstanceCount);
>+        return drawLineLoop(context, indexCount, indexType, indices, baseVertex,
>+                            adjustedInstanceCount);
>     }
> 
>-    if (mode == GL_TRIANGLE_FAN)
>+    if (mode == gl::PrimitiveMode::TriangleFan)
>     {
>-        return drawTriangleFan(context, count, type, indices, baseVertex, adjustedInstanceCount);
>+        return drawTriangleFan(context, indexCount, indexType, indices, baseVertex,
>+                               adjustedInstanceCount);
>     }
> 
>-    const ProgramD3D *programD3D = GetImplAs<ProgramD3D>(glState.getProgram());
>-
>-    if (mode != GL_POINTS || !programD3D->usesInstancedPointSpriteEmulation())
>+    if (mode != gl::PrimitiveMode::Points || !programD3D->usesInstancedPointSpriteEmulation())
>     {
>         if (adjustedInstanceCount == 0)
>         {
>-            mDeviceContext->DrawIndexed(count, 0, baseVertex);
>+            mDeviceContext->DrawIndexed(indexCount, 0, baseVertex);
>         }
>         else
>         {
>-            mDeviceContext->DrawIndexedInstanced(count, adjustedInstanceCount, 0, baseVertex, 0);
>+            mDeviceContext->DrawIndexedInstanced(indexCount, adjustedInstanceCount, 0, baseVertex,
>+                                                 0);
>         }
>-        return gl::NoError();
>+        return angle::Result::Continue;
>     }
> 
>     // This code should not be reachable by multi-view programs.
>-    ASSERT(program->usesMultiview() == false);
>+    ASSERT(programD3D->getState().usesMultiview() == false);
> 
>     // If the shader is writing to gl_PointSize, then pointsprites are being rendered.
>     // Emulating instanced point sprites for FL9_3 requires the topology to be
>@@ -1699,169 +1609,91 @@ gl::Error Renderer11::drawElements(const gl::Context *context,
>     // Indexed pointsprite emulation replicates data for duplicate entries found in the index
>     // buffer. This is not an efficent rendering mechanism and is only used on downlevel renderers
>     // that do not support geometry shaders.
>-    if (instances == 0)
>+    if (instanceCount == 0)
>     {
>-        mDeviceContext->DrawIndexedInstanced(6, count, 0, 0, 0);
>-        return gl::NoError();
>+        mDeviceContext->DrawIndexedInstanced(6, indexCount, 0, 0, 0);
>+        return angle::Result::Continue;
>     }
> 
>     // If pointsprite emulation is used with glDrawElementsInstanced then we need to take a less
>     // efficent code path. Instanced rendering of emulated pointsprites requires a loop to draw each
>     // batch of points. An offset into the instanced data buffer is calculated and applied on each
>     // iteration to ensure all instances are rendered correctly.
>-    GLsizei elementsToRender = vertexParams.vertexCount();
>+    gl::IndexRange indexRange;
>+    ANGLE_TRY(glState.getVertexArray()->getIndexRange(context, indexType, indexCount, indices,
>+                                                      &indexRange));
>+
>+    UINT clampedVertexCount = gl::clampCast<UINT>(indexRange.vertexCount());
> 
>     // Each instance being rendered requires the inputlayout cache to reapply buffers and offsets.
>-    for (GLsizei i = 0; i < instances; i++)
>+    for (GLsizei i = 0; i < instanceCount; i++)
>     {
>-        ANGLE_TRY(mStateManager.updateVertexOffsetsForPointSpritesEmulation(startVertex, i));
>-        mDeviceContext->DrawIndexedInstanced(6, elementsToRender, 0, 0, 0);
>+        ANGLE_TRY(
>+            mStateManager.updateVertexOffsetsForPointSpritesEmulation(context, startVertex, i));
>+        mDeviceContext->DrawIndexedInstanced(6, clampedVertexCount, 0, 0, 0);
>     }
>     mStateManager.invalidateVertexBuffer();
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error Renderer11::drawArraysIndirect(const gl::Context *context,
>-                                         GLenum mode,
>-                                         const void *indirect)
>+angle::Result Renderer11::drawArraysIndirect(const gl::Context *context, const void *indirect)
> {
>-    const auto &glState = context->getGLState();
>-    ASSERT(!glState.isTransformFeedbackActiveUnpaused());
>-
>-    if (!applyPrimitiveType(glState, mode, std::numeric_limits<int>::max() - 1))
>+    if (mStateManager.getCullEverything())
>     {
>-        return gl::NoError();
>+        return angle::Result::Continue;
>     }
> 
>+    const gl::State &glState = context->getState();
>+    ASSERT(!glState.isTransformFeedbackActiveUnpaused());
>+
>     gl::Buffer *drawIndirectBuffer = glState.getTargetBuffer(gl::BufferBinding::DrawIndirect);
>     ASSERT(drawIndirectBuffer);
>     Buffer11 *storage = GetImplAs<Buffer11>(drawIndirectBuffer);
>-    uintptr_t offset  = reinterpret_cast<uintptr_t>(indirect);
> 
>-    if (!DrawCallNeedsTranslation(context, mode))
>-    {
>-        DrawCallVertexParams vertexParams(0, 0, 0);
>-        ANGLE_TRY(mStateManager.applyVertexBuffer(context, mode, vertexParams, false));
>-        ID3D11Buffer *buffer = nullptr;
>-        ANGLE_TRY_RESULT(storage->getBuffer(context, BUFFER_USAGE_INDIRECT), buffer);
>-        mDeviceContext->DrawInstancedIndirect(buffer, static_cast<unsigned int>(offset));
>-        return gl::NoError();
>-    }
>+    uintptr_t offset = reinterpret_cast<uintptr_t>(indirect);
> 
>-    const uint8_t *bufferData = nullptr;
>-    ANGLE_TRY(storage->getData(context, &bufferData));
>-    ASSERT(bufferData);
>-    const gl::DrawArraysIndirectCommand *args =
>-        reinterpret_cast<const gl::DrawArraysIndirectCommand *>(bufferData + offset);
>-    GLuint count     = args->count;
>-    GLuint instances = args->instanceCount;
>-    GLuint first     = args->first;
>-
>-    DrawCallVertexParams vertexParams(first, count, instances);
>-    ANGLE_TRY(mStateManager.applyVertexBuffer(context, mode, vertexParams, false));
>-
>-    if (mode == GL_LINE_LOOP)
>-    {
>-        return drawLineLoop(context, count, GL_NONE, nullptr, 0, instances);
>-    }
>-    if (mode == GL_TRIANGLE_FAN)
>-    {
>-        return drawTriangleFan(context, count, GL_NONE, nullptr, 0, instances);
>-    }
>-
>-    mDeviceContext->DrawInstanced(count, instances, 0, 0);
>-    return gl::NoError();
>+    ID3D11Buffer *buffer = nullptr;
>+    ANGLE_TRY(storage->getBuffer(context, BUFFER_USAGE_INDIRECT, &buffer));
>+    mDeviceContext->DrawInstancedIndirect(buffer, static_cast<unsigned int>(offset));
>+    return angle::Result::Continue;
> }
> 
>-gl::Error Renderer11::drawElementsIndirect(const gl::Context *context,
>-                                           GLenum mode,
>-                                           GLenum type,
>-                                           const void *indirect)
>+angle::Result Renderer11::drawElementsIndirect(const gl::Context *context, const void *indirect)
> {
>-    const auto &glState = context->getGLState();
>-    ASSERT(!glState.isTransformFeedbackActiveUnpaused());
>-
>-    if (!applyPrimitiveType(glState, mode, std::numeric_limits<int>::max() - 1))
>+    if (mStateManager.getCullEverything())
>     {
>-        return gl::NoError();
>+        return angle::Result::Continue;
>     }
> 
>+    const gl::State &glState = context->getState();
>+    ASSERT(!glState.isTransformFeedbackActiveUnpaused());
>+
>     gl::Buffer *drawIndirectBuffer = glState.getTargetBuffer(gl::BufferBinding::DrawIndirect);
>     ASSERT(drawIndirectBuffer);
>     Buffer11 *storage = GetImplAs<Buffer11>(drawIndirectBuffer);
>     uintptr_t offset  = reinterpret_cast<uintptr_t>(indirect);
> 
>-    // TODO(jmadill): Remove the if statement and compute indirect parameters lazily.
>-    bool usePrimitiveRestartWorkaround =
>-        UsePrimitiveRestartWorkaround(glState.isPrimitiveRestartEnabled(), type);
>-
>-    if (!DrawCallNeedsTranslation(context, mode) && !IsStreamingIndexData(context, type))
>-    {
>-        ANGLE_TRY(mStateManager.applyIndexBuffer(context, nullptr, 0, type, gl::HasIndexRange(),
>-                                                 usePrimitiveRestartWorkaround));
>-        DrawCallVertexParams vertexParams(0, 0, 0);
>-        ANGLE_TRY(mStateManager.applyVertexBuffer(context, mode, vertexParams, true));
>-        ID3D11Buffer *buffer = nullptr;
>-        ANGLE_TRY_RESULT(storage->getBuffer(context, BUFFER_USAGE_INDIRECT), buffer);
>-        mDeviceContext->DrawIndexedInstancedIndirect(buffer, static_cast<unsigned int>(offset));
>-        return gl::NoError();
>-    }
>-
>-    const uint8_t *bufferData = nullptr;
>-    ANGLE_TRY(storage->getData(context, &bufferData));
>-    ASSERT(bufferData);
>-
>-    const gl::DrawElementsIndirectCommand *cmd =
>-        reinterpret_cast<const gl::DrawElementsIndirectCommand *>(bufferData + offset);
>-    GLsizei count     = cmd->count;
>-    GLuint instances  = cmd->primCount;
>-    GLuint firstIndex = cmd->firstIndex;
>-    GLint baseVertex  = cmd->baseVertex;
>-
>-    // TODO(jmadill): Fix const cast.
>-    const gl::Type &typeInfo = gl::GetTypeInfo(type);
>-    const void *indices =
>-        reinterpret_cast<const void *>(static_cast<uintptr_t>(firstIndex * typeInfo.bytes));
>-    gl::HasIndexRange lazyIndexRange(const_cast<gl::Context *>(context), count, type, indices);
>-
>-    ANGLE_TRY(mStateManager.applyIndexBuffer(context, indices, count, type, lazyIndexRange,
>-                                             usePrimitiveRestartWorkaround));
>-
>-    DrawCallVertexParams vertexParams(false, lazyIndexRange, baseVertex, instances);
>-
>-    ANGLE_TRY(mStateManager.applyVertexBuffer(context, mode, vertexParams, true));
>-
>-    int baseVertexLocation = -static_cast<int>(lazyIndexRange.getIndexRange().value().start);
>-
>-    if (mode == GL_LINE_LOOP)
>-    {
>-        return drawLineLoop(context, count, type, indices, baseVertexLocation, instances);
>-    }
>-
>-    if (mode == GL_TRIANGLE_FAN)
>-    {
>-        return drawTriangleFan(context, count, type, indices, baseVertexLocation, instances);
>-    }
>-
>-    mDeviceContext->DrawIndexedInstanced(count, instances, 0, baseVertexLocation, 0);
>-    return gl::NoError();
>+    ID3D11Buffer *buffer = nullptr;
>+    ANGLE_TRY(storage->getBuffer(context, BUFFER_USAGE_INDIRECT, &buffer));
>+    mDeviceContext->DrawIndexedInstancedIndirect(buffer, static_cast<unsigned int>(offset));
>+    return angle::Result::Continue;
> }
> 
>-gl::Error Renderer11::drawLineLoop(const gl::Context *context,
>-                                   GLsizei count,
>-                                   GLenum type,
>-                                   const void *indexPointer,
>-                                   int baseVertex,
>-                                   int instances)
>+angle::Result Renderer11::drawLineLoop(const gl::Context *context,
>+                                       GLuint count,
>+                                       gl::DrawElementsType type,
>+                                       const void *indexPointer,
>+                                       int baseVertex,
>+                                       int instances)
> {
>-    const gl::State &glState       = context->getGLState();
>+    const gl::State &glState       = context->getState();
>     gl::VertexArray *vao           = glState.getVertexArray();
>-    gl::Buffer *elementArrayBuffer = vao->getElementArrayBuffer().get();
>+    gl::Buffer *elementArrayBuffer = vao->getElementArrayBuffer();
> 
>     const void *indices = indexPointer;
> 
>     // Get the raw indices for an indexed draw
>-    if (type != GL_NONE && elementArrayBuffer)
>+    if (type != gl::DrawElementsType::InvalidEnum && elementArrayBuffer)
>     {
>         BufferD3D *storage = GetImplAs<BufferD3D>(elementArrayBuffer);
>         intptr_t offset    = reinterpret_cast<intptr_t>(indices);
>@@ -1875,45 +1707,39 @@ gl::Error Renderer11::drawLineLoop(const gl::Context *context,
>     if (!mLineLoopIB)
>     {
>         mLineLoopIB = new StreamingIndexBufferInterface(this);
>-        gl::Error error =
>-            mLineLoopIB->reserveBufferSpace(INITIAL_INDEX_BUFFER_SIZE, GL_UNSIGNED_INT);
>-        if (error.isError())
>-        {
>-            SafeDelete(mLineLoopIB);
>-            return error;
>-        }
>+        ANGLE_TRY(mLineLoopIB->reserveBufferSpace(context, INITIAL_INDEX_BUFFER_SIZE,
>+                                                  gl::DrawElementsType::UnsignedInt));
>     }
> 
>     // Checked by Renderer11::applyPrimitiveType
>-    ASSERT(count >= 0);
>-
>-    if (static_cast<unsigned int>(count) + 1 >
>-        (std::numeric_limits<unsigned int>::max() / sizeof(unsigned int)))
>-    {
>-        return gl::OutOfMemory() << "Failed to create a 32-bit looping index buffer for "
>-                                    "GL_LINE_LOOP, too many indices required.";
>-    }
>+    bool indexCheck = static_cast<unsigned int>(count) + 1 >
>+                      (std::numeric_limits<unsigned int>::max() / sizeof(unsigned int));
>+    ANGLE_CHECK(GetImplAs<Context11>(context), !indexCheck,
>+                "Failed to create a 32-bit looping index buffer for "
>+                "GL_LINE_LOOP, too many indices required.",
>+                GL_OUT_OF_MEMORY);
> 
>     GetLineLoopIndices(indices, type, static_cast<GLuint>(count),
>                        glState.isPrimitiveRestartEnabled(), &mScratchIndexDataBuffer);
> 
>     unsigned int spaceNeeded =
>         static_cast<unsigned int>(sizeof(GLuint) * mScratchIndexDataBuffer.size());
>-    ANGLE_TRY(mLineLoopIB->reserveBufferSpace(spaceNeeded, GL_UNSIGNED_INT));
>+    ANGLE_TRY(
>+        mLineLoopIB->reserveBufferSpace(context, spaceNeeded, gl::DrawElementsType::UnsignedInt));
> 
>     void *mappedMemory = nullptr;
>     unsigned int offset;
>-    ANGLE_TRY(mLineLoopIB->mapBuffer(spaceNeeded, &mappedMemory, &offset));
>+    ANGLE_TRY(mLineLoopIB->mapBuffer(context, spaceNeeded, &mappedMemory, &offset));
> 
>     // Copy over the converted index data.
>     memcpy(mappedMemory, &mScratchIndexDataBuffer[0],
>            sizeof(GLuint) * mScratchIndexDataBuffer.size());
> 
>-    ANGLE_TRY(mLineLoopIB->unmapBuffer());
>+    ANGLE_TRY(mLineLoopIB->unmapBuffer(context));
> 
>-    IndexBuffer11 *indexBuffer   = GetAs<IndexBuffer11>(mLineLoopIB->getIndexBuffer());
>+    IndexBuffer11 *indexBuffer          = GetAs<IndexBuffer11>(mLineLoopIB->getIndexBuffer());
>     const d3d11::Buffer &d3dIndexBuffer = indexBuffer->getBuffer();
>-    DXGI_FORMAT indexFormat      = indexBuffer->getIndexFormat();
>+    DXGI_FORMAT indexFormat             = indexBuffer->getIndexFormat();
> 
>     mStateManager.setIndexBuffer(d3dIndexBuffer.get(), indexFormat, offset);
> 
>@@ -1928,24 +1754,24 @@ gl::Error Renderer11::drawLineLoop(const gl::Context *context,
>         mDeviceContext->DrawIndexed(indexCount, 0, baseVertex);
>     }
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error Renderer11::drawTriangleFan(const gl::Context *context,
>-                                      GLsizei count,
>-                                      GLenum type,
>-                                      const void *indices,
>-                                      int baseVertex,
>-                                      int instances)
>+angle::Result Renderer11::drawTriangleFan(const gl::Context *context,
>+                                          GLuint count,
>+                                          gl::DrawElementsType type,
>+                                          const void *indices,
>+                                          int baseVertex,
>+                                          int instances)
> {
>-    const gl::State &glState       = context->getGLState();
>+    const gl::State &glState       = context->getState();
>     gl::VertexArray *vao           = glState.getVertexArray();
>-    gl::Buffer *elementArrayBuffer = vao->getElementArrayBuffer().get();
>+    gl::Buffer *elementArrayBuffer = vao->getElementArrayBuffer();
> 
>     const void *indexPointer = indices;
> 
>     // Get the raw indices for an indexed draw
>-    if (type != GL_NONE && elementArrayBuffer)
>+    if (type != gl::DrawElementsType::InvalidEnum && elementArrayBuffer)
>     {
>         BufferD3D *storage = GetImplAs<BufferD3D>(elementArrayBuffer);
>         intptr_t offset    = reinterpret_cast<intptr_t>(indices);
>@@ -1959,13 +1785,8 @@ gl::Error Renderer11::drawTriangleFan(const gl::Context *context,
>     if (!mTriangleFanIB)
>     {
>         mTriangleFanIB = new StreamingIndexBufferInterface(this);
>-        gl::Error error =
>-            mTriangleFanIB->reserveBufferSpace(INITIAL_INDEX_BUFFER_SIZE, GL_UNSIGNED_INT);
>-        if (error.isError())
>-        {
>-            SafeDelete(mTriangleFanIB);
>-            return error;
>-        }
>+        ANGLE_TRY(mTriangleFanIB->reserveBufferSpace(context, INITIAL_INDEX_BUFFER_SIZE,
>+                                                     gl::DrawElementsType::UnsignedInt));
>     }
> 
>     // Checked by Renderer11::applyPrimitiveType
>@@ -1973,30 +1794,32 @@ gl::Error Renderer11::drawTriangleFan(const gl::Context *context,
> 
>     const GLuint numTris = count - 2;
> 
>-    if (numTris > (std::numeric_limits<unsigned int>::max() / (sizeof(unsigned int) * 3)))
>-    {
>-        return gl::OutOfMemory() << "Failed to create a scratch index buffer for GL_TRIANGLE_FAN, "
>-                                    "too many indices required.";
>-    }
>+    bool indexCheck =
>+        (numTris > std::numeric_limits<unsigned int>::max() / (sizeof(unsigned int) * 3));
>+    ANGLE_CHECK(GetImplAs<Context11>(context), !indexCheck,
>+                "Failed to create a scratch index buffer for GL_TRIANGLE_FAN, "
>+                "too many indices required.",
>+                GL_OUT_OF_MEMORY);
> 
>     GetTriFanIndices(indexPointer, type, count, glState.isPrimitiveRestartEnabled(),
>                      &mScratchIndexDataBuffer);
> 
>     const unsigned int spaceNeeded =
>         static_cast<unsigned int>(mScratchIndexDataBuffer.size() * sizeof(unsigned int));
>-    ANGLE_TRY(mTriangleFanIB->reserveBufferSpace(spaceNeeded, GL_UNSIGNED_INT));
>+    ANGLE_TRY(mTriangleFanIB->reserveBufferSpace(context, spaceNeeded,
>+                                                 gl::DrawElementsType::UnsignedInt));
> 
>     void *mappedMemory = nullptr;
>     unsigned int offset;
>-    ANGLE_TRY(mTriangleFanIB->mapBuffer(spaceNeeded, &mappedMemory, &offset));
>+    ANGLE_TRY(mTriangleFanIB->mapBuffer(context, spaceNeeded, &mappedMemory, &offset));
> 
>     memcpy(mappedMemory, &mScratchIndexDataBuffer[0], spaceNeeded);
> 
>-    ANGLE_TRY(mTriangleFanIB->unmapBuffer());
>+    ANGLE_TRY(mTriangleFanIB->unmapBuffer(context));
> 
>-    IndexBuffer11 *indexBuffer   = GetAs<IndexBuffer11>(mTriangleFanIB->getIndexBuffer());
>+    IndexBuffer11 *indexBuffer          = GetAs<IndexBuffer11>(mTriangleFanIB->getIndexBuffer());
>     const d3d11::Buffer &d3dIndexBuffer = indexBuffer->getBuffer();
>-    DXGI_FORMAT indexFormat      = indexBuffer->getIndexFormat();
>+    DXGI_FORMAT indexFormat             = indexBuffer->getIndexFormat();
> 
>     mStateManager.setIndexBuffer(d3dIndexBuffer.get(), indexFormat, offset);
> 
>@@ -2011,7 +1834,7 @@ gl::Error Renderer11::drawTriangleFan(const gl::Context *context,
>         mDeviceContext->DrawIndexed(indexCount, 0, baseVertex);
>     }
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
> void Renderer11::releaseDeviceResources()
>@@ -2088,25 +1911,13 @@ bool Renderer11::testDeviceResettable()
> 
> void Renderer11::release()
> {
>-    RendererD3D::cleanup();
>-
>     mScratchMemoryBuffer.clear();
> 
>-    if (mAnnotator != nullptr)
>-    {
>-        gl::UninitializeDebugAnnotations();
>-        SafeDelete(mAnnotator);
>-    }
>+    mAnnotator.release();
>+    gl::UninitializeDebugAnnotations();
> 
>     releaseDeviceResources();
> 
>-    if (!mCreatedWithDeviceEXT)
>-    {
>-        // Only delete the device if the Renderer11 owns it
>-        // Otherwise we should keep it around in case we try to reinitialize the renderer later
>-        SafeDelete(mEGLDevice);
>-    }
>-
>     SafeRelease(mDxgiFactory);
>     SafeRelease(mDxgiAdapter);
> 
>@@ -2201,16 +2012,15 @@ unsigned int Renderer11::getReservedFragmentUniformVectors() const
>     return d3d11_gl::GetReservedFragmentUniformVectors(mRenderer11DeviceCaps.featureLevel);
> }
> 
>-unsigned int Renderer11::getReservedVertexUniformBuffers() const
>+gl::ShaderMap<unsigned int> Renderer11::getReservedShaderUniformBuffers() const
> {
>-    // we reserve one buffer for the application uniforms, and one for driver uniforms
>-    return 2;
>-}
>+    gl::ShaderMap<unsigned int> shaderReservedUniformBuffers = {};
> 
>-unsigned int Renderer11::getReservedFragmentUniformBuffers() const
>-{
>     // we reserve one buffer for the application uniforms, and one for driver uniforms
>-    return 2;
>+    shaderReservedUniformBuffers[gl::ShaderType::Vertex]   = 2;
>+    shaderReservedUniformBuffers[gl::ShaderType::Fragment] = 2;
>+
>+    return shaderReservedUniformBuffers;
> }
> 
> d3d11::ANGLED3D11DeviceType Renderer11::getDeviceType() const
>@@ -2305,18 +2115,6 @@ bool Renderer11::getShareHandleSupport() const
>     return true;
> }
> 
>-bool Renderer11::getNV12TextureSupport() const
>-{
>-    HRESULT result;
>-    UINT formatSupport;
>-    result = mDevice->CheckFormatSupport(DXGI_FORMAT_NV12, &formatSupport);
>-    if (result == E_FAIL)
>-    {
>-        return false;
>-    }
>-    return (formatSupport & D3D11_FORMAT_SUPPORT_TEXTURE2D) != 0;
>-}
>-
> int Renderer11::getMajorShaderModel() const
> {
>     switch (mRenderer11DeviceCaps.featureLevel)
>@@ -2385,12 +2183,12 @@ const angle::WorkaroundsD3D &RendererD3D::getWorkarounds() const
>     return mWorkarounds;
> }
> 
>-gl::Error Renderer11::copyImageInternal(const gl::Context *context,
>-                                        const gl::Framebuffer *framebuffer,
>-                                        const gl::Rectangle &sourceRect,
>-                                        GLenum destFormat,
>-                                        const gl::Offset &destOffset,
>-                                        RenderTargetD3D *destRenderTarget)
>+angle::Result Renderer11::copyImageInternal(const gl::Context *context,
>+                                            const gl::Framebuffer *framebuffer,
>+                                            const gl::Rectangle &sourceRect,
>+                                            GLenum destFormat,
>+                                            const gl::Offset &destOffset,
>+                                            RenderTargetD3D *destRenderTarget)
> {
>     const gl::FramebufferAttachment *colorAttachment = framebuffer->getReadColorbuffer();
>     ASSERT(colorAttachment);
>@@ -2399,9 +2197,6 @@ gl::Error Renderer11::copyImageInternal(const gl::Context *context,
>     ANGLE_TRY(colorAttachment->getRenderTarget(context, &sourceRenderTarget));
>     ASSERT(sourceRenderTarget);
> 
>-    const d3d11::SharedSRV &source = sourceRenderTarget->getBlitShaderResourceView();
>-    ASSERT(source.valid());
>-
>     const d3d11::RenderTargetView &dest =
>         GetAs<RenderTarget11>(destRenderTarget)->getRenderTargetView();
>     ASSERT(dest.valid());
>@@ -2422,20 +2217,49 @@ gl::Error Renderer11::copyImageInternal(const gl::Context *context,
>     // Use nearest filtering because source and destination are the same size for the direct copy.
>     // Convert to the unsized format before calling copyTexture.
>     GLenum sourceFormat = colorAttachment->getFormat().info->format;
>+    if (sourceRenderTarget->getTexture().is2D() && sourceRenderTarget->isMultisampled())
>+    {
>+        TextureHelper11 tex;
>+        ANGLE_TRY(resolveMultisampledTexture(context, sourceRenderTarget,
>+                                             colorAttachment->getDepthSize(),
>+                                             colorAttachment->getStencilSize(), &tex));
>+
>+        D3D11_SHADER_RESOURCE_VIEW_DESC viewDesc;
>+        viewDesc.Format                    = sourceRenderTarget->getFormatSet().srvFormat;
>+        viewDesc.ViewDimension             = D3D11_SRV_DIMENSION_TEXTURE2D;
>+        viewDesc.Texture2D.MipLevels       = 1;
>+        viewDesc.Texture2D.MostDetailedMip = 0;
>+
>+        d3d11::SharedSRV readSRV;
>+        ANGLE_TRY(allocateResource(GetImplAs<Context11>(context), viewDesc, tex.get(), &readSRV));
>+        ASSERT(readSRV.valid());
>+
>+        ANGLE_TRY(mBlit->copyTexture(context, readSRV, sourceArea, sourceSize, sourceFormat, dest,
>+                                     destArea, destSize, nullptr, gl::GetUnsizedFormat(destFormat),
>+                                     GL_NONE, GL_NEAREST, false, false, false));
>+
>+        return angle::Result::Continue;
>+    }
>+
>+    ASSERT(!sourceRenderTarget->isMultisampled());
>+
>+    const d3d11::SharedSRV &source = sourceRenderTarget->getBlitShaderResourceView(context);
>+    ASSERT(source.valid());
>+
>     ANGLE_TRY(mBlit->copyTexture(context, source, sourceArea, sourceSize, sourceFormat, dest,
>                                  destArea, destSize, nullptr, gl::GetUnsizedFormat(destFormat),
>-                                 GL_NEAREST, false, false, false));
>+                                 GL_NONE, GL_NEAREST, false, false, false));
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error Renderer11::copyImage2D(const gl::Context *context,
>-                                  const gl::Framebuffer *framebuffer,
>-                                  const gl::Rectangle &sourceRect,
>-                                  GLenum destFormat,
>-                                  const gl::Offset &destOffset,
>-                                  TextureStorage *storage,
>-                                  GLint level)
>+angle::Result Renderer11::copyImage2D(const gl::Context *context,
>+                                      const gl::Framebuffer *framebuffer,
>+                                      const gl::Rectangle &sourceRect,
>+                                      GLenum destFormat,
>+                                      const gl::Offset &destOffset,
>+                                      TextureStorage *storage,
>+                                      GLint level)
> {
>     TextureStorage11_2D *storage11 = GetAs<TextureStorage11_2D>(storage);
>     ASSERT(storage11);
>@@ -2450,22 +2274,22 @@ gl::Error Renderer11::copyImage2D(const gl::Context *context,
> 
>     storage11->markLevelDirty(level);
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error Renderer11::copyImageCube(const gl::Context *context,
>-                                    const gl::Framebuffer *framebuffer,
>-                                    const gl::Rectangle &sourceRect,
>-                                    GLenum destFormat,
>-                                    const gl::Offset &destOffset,
>-                                    TextureStorage *storage,
>-                                    GLenum target,
>-                                    GLint level)
>+angle::Result Renderer11::copyImageCube(const gl::Context *context,
>+                                        const gl::Framebuffer *framebuffer,
>+                                        const gl::Rectangle &sourceRect,
>+                                        GLenum destFormat,
>+                                        const gl::Offset &destOffset,
>+                                        TextureStorage *storage,
>+                                        gl::TextureTarget target,
>+                                        GLint level)
> {
>     TextureStorage11_Cube *storage11 = GetAs<TextureStorage11_Cube>(storage);
>     ASSERT(storage11);
> 
>-    gl::ImageIndex index              = gl::ImageIndex::MakeCube(target, level);
>+    gl::ImageIndex index              = gl::ImageIndex::MakeCubeMapFace(target, level);
>     RenderTargetD3D *destRenderTarget = nullptr;
>     ANGLE_TRY(storage11->getRenderTarget(context, index, &destRenderTarget));
>     ASSERT(destRenderTarget);
>@@ -2475,16 +2299,16 @@ gl::Error Renderer11::copyImageCube(const gl::Context *context,
> 
>     storage11->markLevelDirty(level);
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error Renderer11::copyImage3D(const gl::Context *context,
>-                                  const gl::Framebuffer *framebuffer,
>-                                  const gl::Rectangle &sourceRect,
>-                                  GLenum destFormat,
>-                                  const gl::Offset &destOffset,
>-                                  TextureStorage *storage,
>-                                  GLint level)
>+angle::Result Renderer11::copyImage3D(const gl::Context *context,
>+                                      const gl::Framebuffer *framebuffer,
>+                                      const gl::Rectangle &sourceRect,
>+                                      GLenum destFormat,
>+                                      const gl::Offset &destOffset,
>+                                      TextureStorage *storage,
>+                                      GLint level)
> {
>     TextureStorage11_3D *storage11 = GetAs<TextureStorage11_3D>(storage);
>     ASSERT(storage11);
>@@ -2499,16 +2323,16 @@ gl::Error Renderer11::copyImage3D(const gl::Context *context,
> 
>     storage11->markLevelDirty(level);
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error Renderer11::copyImage2DArray(const gl::Context *context,
>-                                       const gl::Framebuffer *framebuffer,
>-                                       const gl::Rectangle &sourceRect,
>-                                       GLenum destFormat,
>-                                       const gl::Offset &destOffset,
>-                                       TextureStorage *storage,
>-                                       GLint level)
>+angle::Result Renderer11::copyImage2DArray(const gl::Context *context,
>+                                           const gl::Framebuffer *framebuffer,
>+                                           const gl::Rectangle &sourceRect,
>+                                           GLenum destFormat,
>+                                           const gl::Offset &destOffset,
>+                                           TextureStorage *storage,
>+                                           GLint level)
> {
>     TextureStorage11_2DArray *storage11 = GetAs<TextureStorage11_2DArray>(storage);
>     ASSERT(storage11);
>@@ -2522,28 +2346,30 @@ gl::Error Renderer11::copyImage2DArray(const gl::Context *context,
>                                 destRenderTarget));
>     storage11->markLevelDirty(level);
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error Renderer11::copyTexture(const gl::Context *context,
>-                                  const gl::Texture *source,
>-                                  GLint sourceLevel,
>-                                  const gl::Rectangle &sourceRect,
>-                                  GLenum destFormat,
>-                                  const gl::Offset &destOffset,
>-                                  TextureStorage *storage,
>-                                  GLenum destTarget,
>-                                  GLint destLevel,
>-                                  bool unpackFlipY,
>-                                  bool unpackPremultiplyAlpha,
>-                                  bool unpackUnmultiplyAlpha)
>+angle::Result Renderer11::copyTexture(const gl::Context *context,
>+                                      const gl::Texture *source,
>+                                      GLint sourceLevel,
>+                                      gl::TextureTarget srcTarget,
>+                                      const gl::Box &sourceBox,
>+                                      GLenum destFormat,
>+                                      GLenum destType,
>+                                      const gl::Offset &destOffset,
>+                                      TextureStorage *storage,
>+                                      gl::TextureTarget destTarget,
>+                                      GLint destLevel,
>+                                      bool unpackFlipY,
>+                                      bool unpackPremultiplyAlpha,
>+                                      bool unpackUnmultiplyAlpha)
> {
>     TextureD3D *sourceD3D = GetImplAs<TextureD3D>(source);
> 
>     TextureStorage *sourceStorage = nullptr;
>     ANGLE_TRY(sourceD3D->getNativeTexture(context, &sourceStorage));
> 
>-    TextureStorage11_2D *sourceStorage11 = GetAs<TextureStorage11_2D>(sourceStorage);
>+    TextureStorage11 *sourceStorage11 = GetAs<TextureStorage11>(sourceStorage);
>     ASSERT(sourceStorage11);
> 
>     TextureStorage11 *destStorage11 = GetAs<TextureStorage11>(storage);
>@@ -2551,40 +2377,98 @@ gl::Error Renderer11::copyTexture(const gl::Context *context,
> 
>     // Check for fast path where a CopySubresourceRegion can be used.
>     if (unpackPremultiplyAlpha == unpackUnmultiplyAlpha && !unpackFlipY &&
>-        source->getFormat(GL_TEXTURE_2D, sourceLevel).info->format == destFormat &&
>-        sourceStorage11->getFormatSet().texFormat == destStorage11->getFormatSet().texFormat)
>+        source->getFormat(srcTarget, sourceLevel).info->format == destFormat &&
>+        sourceStorage11->getFormatSet().internalFormat ==
>+            destStorage11->getFormatSet().internalFormat)
>     {
>         const TextureHelper11 *sourceResource = nullptr;
>         ANGLE_TRY(sourceStorage11->getResource(context, &sourceResource));
> 
>-        gl::ImageIndex sourceIndex = gl::ImageIndex::Make2D(sourceLevel);
>-        UINT sourceSubresource     = sourceStorage11->getSubresourceIndex(sourceIndex);
>-
>         const TextureHelper11 *destResource = nullptr;
>         ANGLE_TRY(destStorage11->getResource(context, &destResource));
> 
>-        gl::ImageIndex destIndex = gl::ImageIndex::MakeGeneric(destTarget, destLevel);
>-        UINT destSubresource     = destStorage11->getSubresourceIndex(destIndex);
>+        if (srcTarget == gl::TextureTarget::_2D || srcTarget == gl::TextureTarget::_3D)
>+        {
>+            gl::ImageIndex sourceIndex = gl::ImageIndex::MakeFromTarget(srcTarget, sourceLevel);
>+
>+            UINT sourceSubresource = 0;
>+            ANGLE_TRY(
>+                sourceStorage11->getSubresourceIndex(context, sourceIndex, &sourceSubresource));
> 
>-        D3D11_BOX sourceBox{
>-            static_cast<UINT>(sourceRect.x),
>-            static_cast<UINT>(sourceRect.y),
>-            0u,
>-            static_cast<UINT>(sourceRect.x + sourceRect.width),
>-            static_cast<UINT>(sourceRect.y + sourceRect.height),
>-            1u,
>-        };
>+            gl::ImageIndex destIndex = gl::ImageIndex::MakeFromTarget(destTarget, destLevel);
>+
>+            UINT destSubresource = 0;
>+            ANGLE_TRY(destStorage11->getSubresourceIndex(context, destIndex, &destSubresource));
> 
>-        mDeviceContext->CopySubresourceRegion(destResource->get(), destSubresource, destOffset.x,
>-                                              destOffset.y, destOffset.z, sourceResource->get(),
>-                                              sourceSubresource, &sourceBox);
>+            D3D11_BOX d3dBox{static_cast<UINT>(sourceBox.x),
>+                             static_cast<UINT>(sourceBox.y),
>+                             static_cast<UINT>(sourceBox.z),
>+                             static_cast<UINT>(sourceBox.x + sourceBox.width),
>+                             static_cast<UINT>(sourceBox.y + sourceBox.height),
>+                             static_cast<UINT>(sourceBox.z + sourceBox.depth)};
>+
>+            mDeviceContext->CopySubresourceRegion(
>+                destResource->get(), destSubresource, destOffset.x, destOffset.y, destOffset.z,
>+                sourceResource->get(), sourceSubresource, &d3dBox);
>+        }
>+        else if (srcTarget == gl::TextureTarget::_2DArray)
>+        {
>+
>+            D3D11_BOX d3dBox{static_cast<UINT>(sourceBox.x),
>+                             static_cast<UINT>(sourceBox.y),
>+                             0,
>+                             static_cast<UINT>(sourceBox.x + sourceBox.width),
>+                             static_cast<UINT>(sourceBox.y + sourceBox.height),
>+                             1u};
>+
>+            for (int i = 0; i < sourceBox.depth; i++)
>+            {
>+                gl::ImageIndex srcIndex = gl::ImageIndex::Make2DArray(sourceLevel, i + sourceBox.z);
>+                UINT sourceSubresource  = 0;
>+                ANGLE_TRY(
>+                    sourceStorage11->getSubresourceIndex(context, srcIndex, &sourceSubresource));
>+
>+                gl::ImageIndex dIndex = gl::ImageIndex::Make2DArray(destLevel, i + destOffset.z);
>+                UINT destSubresource  = 0;
>+                ANGLE_TRY(destStorage11->getSubresourceIndex(context, dIndex, &destSubresource));
>+
>+                mDeviceContext->CopySubresourceRegion(
>+                    destResource->get(), destSubresource, destOffset.x, destOffset.y, 0,
>+                    sourceResource->get(), sourceSubresource, &d3dBox);
>+            }
>+        }
>+        else
>+        {
>+            UNREACHABLE();
>+        }
>     }
>     else
>     {
>         const d3d11::SharedSRV *sourceSRV = nullptr;
>         ANGLE_TRY(sourceStorage11->getSRVLevels(context, sourceLevel, sourceLevel, &sourceSRV));
> 
>-        gl::ImageIndex destIndex             = gl::ImageIndex::MakeGeneric(destTarget, destLevel);
>+        gl::Extents sourceSize(static_cast<int>(source->getWidth(
>+                                   NonCubeTextureTypeToTarget(source->getType()), sourceLevel)),
>+                               static_cast<int>(source->getHeight(
>+                                   NonCubeTextureTypeToTarget(source->getType()), sourceLevel)),
>+                               static_cast<int>(source->getDepth(
>+                                   NonCubeTextureTypeToTarget(source->getType()), sourceLevel)));
>+
>+        gl::ImageIndex destIndex;
>+        if (destTarget == gl::TextureTarget::_2D || destTarget == gl::TextureTarget::_3D ||
>+            gl::IsCubeMapFaceTarget(destTarget))
>+        {
>+            destIndex = gl::ImageIndex::MakeFromTarget(destTarget, destLevel);
>+        }
>+        else if (destTarget == gl::TextureTarget::_2DArray)
>+        {
>+            destIndex = gl::ImageIndex::Make2DArrayRange(destLevel, 0, sourceSize.depth);
>+        }
>+        else
>+        {
>+            UNREACHABLE();
>+        }
>+
>         RenderTargetD3D *destRenderTargetD3D = nullptr;
>         ANGLE_TRY(destStorage11->getRenderTarget(context, destIndex, &destRenderTargetD3D));
> 
>@@ -2593,37 +2477,40 @@ gl::Error Renderer11::copyTexture(const gl::Context *context,
>         const d3d11::RenderTargetView &destRTV = destRenderTarget11->getRenderTargetView();
>         ASSERT(destRTV.valid());
> 
>-        gl::Box sourceArea(sourceRect.x, sourceRect.y, 0, sourceRect.width, sourceRect.height, 1);
>-        gl::Extents sourceSize(
>-            static_cast<int>(source->getWidth(source->getTarget(), sourceLevel)),
>-            static_cast<int>(source->getHeight(source->getTarget(), sourceLevel)), 1);
>+        gl::Box sourceArea(sourceBox.x, sourceBox.y, sourceBox.z, sourceBox.width, sourceBox.height,
>+                           sourceBox.depth);
>+
>         if (unpackFlipY)
>         {
>             sourceArea.y += sourceArea.height;
>             sourceArea.height = -sourceArea.height;
>         }
> 
>-        gl::Box destArea(destOffset.x, destOffset.y, 0, sourceRect.width, sourceRect.height, 1);
>-        gl::Extents destSize(destRenderTarget11->getWidth(), destRenderTarget11->getHeight(), 1);
>+        gl::Box destArea(destOffset.x, destOffset.y, destOffset.z, sourceBox.width,
>+                         sourceBox.height, sourceBox.depth);
>+
>+        gl::Extents destSize(destRenderTarget11->getWidth(), destRenderTarget11->getHeight(),
>+                             sourceBox.depth);
> 
>         // Use nearest filtering because source and destination are the same size for the direct
>         // copy
>-        GLenum sourceFormat = source->getFormat(GL_TEXTURE_2D, sourceLevel).info->format;
>+        GLenum sourceFormat = source->getFormat(srcTarget, sourceLevel).info->format;
>         ANGLE_TRY(mBlit->copyTexture(context, *sourceSRV, sourceArea, sourceSize, sourceFormat,
>-                                     destRTV, destArea, destSize, nullptr, destFormat, GL_NEAREST,
>-                                     false, unpackPremultiplyAlpha, unpackUnmultiplyAlpha));
>+                                     destRTV, destArea, destSize, nullptr, destFormat, destType,
>+                                     GL_NEAREST, false, unpackPremultiplyAlpha,
>+                                     unpackUnmultiplyAlpha));
>     }
> 
>     destStorage11->markLevelDirty(destLevel);
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error Renderer11::copyCompressedTexture(const gl::Context *context,
>-                                            const gl::Texture *source,
>-                                            GLint sourceLevel,
>-                                            TextureStorage *storage,
>-                                            GLint destLevel)
>+angle::Result Renderer11::copyCompressedTexture(const gl::Context *context,
>+                                                const gl::Texture *source,
>+                                                GLint sourceLevel,
>+                                                TextureStorage *storage,
>+                                                GLint destLevel)
> {
>     TextureStorage11_2D *destStorage11 = GetAs<TextureStorage11_2D>(storage);
>     ASSERT(destStorage11);
>@@ -2632,7 +2519,8 @@ gl::Error Renderer11::copyCompressedTexture(const gl::Context *context,
>     ANGLE_TRY(destStorage11->getResource(context, &destResource));
> 
>     gl::ImageIndex destIndex = gl::ImageIndex::Make2D(destLevel);
>-    UINT destSubresource     = destStorage11->getSubresourceIndex(destIndex);
>+    UINT destSubresource     = 0;
>+    ANGLE_TRY(destStorage11->getSubresourceIndex(context, destIndex, &destSubresource));
> 
>     TextureD3D *sourceD3D = GetImplAs<TextureD3D>(source);
>     ASSERT(sourceD3D);
>@@ -2647,25 +2535,29 @@ gl::Error Renderer11::copyCompressedTexture(const gl::Context *context,
>     ANGLE_TRY(sourceStorage11->getResource(context, &sourceResource));
> 
>     gl::ImageIndex sourceIndex = gl::ImageIndex::Make2D(sourceLevel);
>-    UINT sourceSubresource     = sourceStorage11->getSubresourceIndex(sourceIndex);
>+    UINT sourceSubresource     = 0;
>+    ANGLE_TRY(sourceStorage11->getSubresourceIndex(context, sourceIndex, &sourceSubresource));
> 
>     mDeviceContext->CopySubresourceRegion(destResource->get(), destSubresource, 0, 0, 0,
>                                           sourceResource->get(), sourceSubresource, nullptr);
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error Renderer11::createRenderTarget(int width,
>-                                         int height,
>-                                         GLenum format,
>-                                         GLsizei samples,
>-                                         RenderTargetD3D **outRT)
>+angle::Result Renderer11::createRenderTarget(const gl::Context *context,
>+                                             int width,
>+                                             int height,
>+                                             GLenum format,
>+                                             GLsizei samples,
>+                                             RenderTargetD3D **outRT)
> {
>     const d3d11::Format &formatInfo = d3d11::Format::Get(format, mRenderer11DeviceCaps);
> 
>     const gl::TextureCaps &textureCaps = getNativeTextureCaps().get(format);
>     GLuint supportedSamples            = textureCaps.getNearestSamples(samples);
> 
>+    Context11 *context11 = GetImplAs<Context11>(context);
>+
>     if (width > 0 && height > 0)
>     {
>         // Create texture resource
>@@ -2704,7 +2596,8 @@ gl::Error Renderer11::createRenderTarget(int width,
>         ASSERT(bindRTV != bindDSV);
> 
>         TextureHelper11 texture;
>-        ANGLE_TRY(allocateTexture(desc, formatInfo, &texture));
>+        ANGLE_TRY(allocateTexture(context11, desc, formatInfo, &texture));
>+        texture.setDebugName("createRenderTarget.Texture");
> 
>         d3d11::SharedSRV srv;
>         d3d11::SharedSRV blitSRV;
>@@ -2717,7 +2610,8 @@ gl::Error Renderer11::createRenderTarget(int width,
>             srvDesc.Texture2D.MostDetailedMip = 0;
>             srvDesc.Texture2D.MipLevels       = 1;
> 
>-            ANGLE_TRY(allocateResource(srvDesc, texture.get(), &srv));
>+            ANGLE_TRY(allocateResource(context11, srvDesc, texture.get(), &srv));
>+            srv.setDebugName("createRenderTarget.SRV");
> 
>             if (formatInfo.blitSRVFormat != formatInfo.srvFormat)
>             {
>@@ -2729,7 +2623,8 @@ gl::Error Renderer11::createRenderTarget(int width,
>                 blitSRVDesc.Texture2D.MostDetailedMip = 0;
>                 blitSRVDesc.Texture2D.MipLevels       = 1;
> 
>-                ANGLE_TRY(allocateResource(blitSRVDesc, texture.get(), &blitSRV));
>+                ANGLE_TRY(allocateResource(context11, blitSRVDesc, texture.get(), &blitSRV));
>+                blitSRV.setDebugName("createRenderTarget.BlitSRV");
>             }
>             else
>             {
>@@ -2747,7 +2642,8 @@ gl::Error Renderer11::createRenderTarget(int width,
>             dsvDesc.Flags              = 0;
> 
>             d3d11::DepthStencilView dsv;
>-            ANGLE_TRY(allocateResource(dsvDesc, texture.get(), &dsv));
>+            ANGLE_TRY(allocateResource(context11, dsvDesc, texture.get(), &dsv));
>+            dsv.setDebugName("createRenderTarget.DSV");
> 
>             *outRT = new TextureRenderTarget11(std::move(dsv), texture, srv, format, formatInfo,
>                                                width, height, 1, supportedSamples);
>@@ -2761,7 +2657,8 @@ gl::Error Renderer11::createRenderTarget(int width,
>             rtvDesc.Texture2D.MipSlice = 0;
> 
>             d3d11::RenderTargetView rtv;
>-            ANGLE_TRY(allocateResource(rtvDesc, texture.get(), &rtv));
>+            ANGLE_TRY(allocateResource(context11, rtvDesc, texture.get(), &rtv));
>+            rtv.setDebugName("createRenderTarget.RTV");
> 
>             if (formatInfo.dataInitializerFunction != nullptr)
>             {
>@@ -2785,15 +2682,17 @@ gl::Error Renderer11::createRenderTarget(int width,
>                                            width, height, 1, supportedSamples);
>     }
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error Renderer11::createRenderTargetCopy(RenderTargetD3D *source, RenderTargetD3D **outRT)
>+angle::Result Renderer11::createRenderTargetCopy(const gl::Context *context,
>+                                                 RenderTargetD3D *source,
>+                                                 RenderTargetD3D **outRT)
> {
>     ASSERT(source != nullptr);
> 
>     RenderTargetD3D *newRT = nullptr;
>-    ANGLE_TRY(createRenderTarget(source->getWidth(), source->getHeight(),
>+    ANGLE_TRY(createRenderTarget(context, source->getWidth(), source->getHeight(),
>                                  source->getInternalFormat(), source->getSamples(), &newRT));
> 
>     RenderTarget11 *source11 = GetAs<RenderTarget11>(source);
>@@ -2803,25 +2702,28 @@ gl::Error Renderer11::createRenderTargetCopy(RenderTargetD3D *source, RenderTarg
>                                           0, 0, 0, source11->getTexture().get(),
>                                           source11->getSubresourceIndex(), nullptr);
>     *outRT = newRT;
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error Renderer11::loadExecutable(const uint8_t *function,
>-                                     size_t length,
>-                                     gl::ShaderType type,
>-                                     const std::vector<D3DVarying> &streamOutVaryings,
>-                                     bool separatedOutputBuffers,
>-                                     ShaderExecutableD3D **outExecutable)
>+angle::Result Renderer11::loadExecutable(d3d::Context *context,
>+                                         const uint8_t *function,
>+                                         size_t length,
>+                                         gl::ShaderType type,
>+                                         const std::vector<D3DVarying> &streamOutVaryings,
>+                                         bool separatedOutputBuffers,
>+                                         ShaderExecutableD3D **outExecutable)
> {
>     ShaderData shaderData(function, length);
> 
>+    Context11 *context11 = static_cast<Context11 *>(context);
>+
>     switch (type)
>     {
>-        case gl::SHADER_VERTEX:
>+        case gl::ShaderType::Vertex:
>         {
>             d3d11::VertexShader vertexShader;
>             d3d11::GeometryShader streamOutShader;
>-            ANGLE_TRY(allocateResource(shaderData, &vertexShader));
>+            ANGLE_TRY(allocateResource(context11, shaderData, &vertexShader));
> 
>             if (!streamOutVaryings.empty())
>             {
>@@ -2841,69 +2743,69 @@ gl::Error Renderer11::loadExecutable(const uint8_t *function,
>                     soDeclaration.push_back(entry);
>                 }
> 
>-                ANGLE_TRY(allocateResource(shaderData, &soDeclaration, &streamOutShader));
>+                ANGLE_TRY(
>+                    allocateResource(context11, shaderData, &soDeclaration, &streamOutShader));
>             }
> 
>             *outExecutable = new ShaderExecutable11(function, length, std::move(vertexShader),
>                                                     std::move(streamOutShader));
>         }
>         break;
>-        case gl::SHADER_FRAGMENT:
>+        case gl::ShaderType::Fragment:
>         {
>             d3d11::PixelShader pixelShader;
>-            ANGLE_TRY(allocateResource(shaderData, &pixelShader));
>+            ANGLE_TRY(allocateResource(context11, shaderData, &pixelShader));
>             *outExecutable = new ShaderExecutable11(function, length, std::move(pixelShader));
>         }
>         break;
>-        case gl::SHADER_GEOMETRY:
>+        case gl::ShaderType::Geometry:
>         {
>             d3d11::GeometryShader geometryShader;
>-            ANGLE_TRY(allocateResource(shaderData, &geometryShader));
>+            ANGLE_TRY(allocateResource(context11, shaderData, &geometryShader));
>             *outExecutable = new ShaderExecutable11(function, length, std::move(geometryShader));
>         }
>         break;
>-        case gl::SHADER_COMPUTE:
>+        case gl::ShaderType::Compute:
>         {
>             d3d11::ComputeShader computeShader;
>-            ANGLE_TRY(allocateResource(shaderData, &computeShader));
>+            ANGLE_TRY(allocateResource(context11, shaderData, &computeShader));
>             *outExecutable = new ShaderExecutable11(function, length, std::move(computeShader));
>         }
>         break;
>         default:
>-            UNREACHABLE();
>-            return gl::InternalError();
>+            ANGLE_HR_UNREACHABLE(context11);
>     }
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error Renderer11::compileToExecutable(gl::InfoLog &infoLog,
>-                                          const std::string &shaderHLSL,
>-                                          gl::ShaderType type,
>-                                          const std::vector<D3DVarying> &streamOutVaryings,
>-                                          bool separatedOutputBuffers,
>-                                          const angle::CompilerWorkaroundsD3D &workarounds,
>-                                          ShaderExecutableD3D **outExectuable)
>+angle::Result Renderer11::compileToExecutable(d3d::Context *context,
>+                                              gl::InfoLog &infoLog,
>+                                              const std::string &shaderHLSL,
>+                                              gl::ShaderType type,
>+                                              const std::vector<D3DVarying> &streamOutVaryings,
>+                                              bool separatedOutputBuffers,
>+                                              const angle::CompilerWorkaroundsD3D &workarounds,
>+                                              ShaderExecutableD3D **outExectuable)
> {
>     std::stringstream profileStream;
> 
>     switch (type)
>     {
>-        case gl::SHADER_VERTEX:
>+        case gl::ShaderType::Vertex:
>             profileStream << "vs";
>             break;
>-        case gl::SHADER_FRAGMENT:
>+        case gl::ShaderType::Fragment:
>             profileStream << "ps";
>             break;
>-        case gl::SHADER_GEOMETRY:
>+        case gl::ShaderType::Geometry:
>             profileStream << "gs";
>             break;
>-        case gl::SHADER_COMPUTE:
>+        case gl::ShaderType::Compute:
>             profileStream << "cs";
>             break;
>         default:
>-            UNREACHABLE();
>-            return gl::InternalError();
>+            ANGLE_HR_UNREACHABLE(context);
>     }
> 
>     profileStream << "_" << getMajorShaderModel() << "_" << getMinorShaderModel()
>@@ -2946,8 +2848,8 @@ gl::Error Renderer11::compileToExecutable(gl::InfoLog &infoLog,
>     // TODO(jmadill): Use ComPtr?
>     ID3DBlob *binary = nullptr;
>     std::string debugInfo;
>-    ANGLE_TRY(mCompiler.compileToBinary(infoLog, shaderHLSL, profile, configs, loopMacros, &binary,
>-                                        &debugInfo));
>+    ANGLE_TRY(mCompiler.compileToBinary(context, infoLog, shaderHLSL, profile, configs, loopMacros,
>+                                        &binary, &debugInfo));
> 
>     // It's possible that binary is NULL if the compiler failed in all configurations.  Set the
>     // executable to NULL and return GL_NO_ERROR to signify that there was a link error but the
>@@ -2955,15 +2857,15 @@ gl::Error Renderer11::compileToExecutable(gl::InfoLog &infoLog,
>     if (!binary)
>     {
>         *outExectuable = nullptr;
>-        return gl::NoError();
>+        return angle::Result::Continue;
>     }
> 
>-    gl::Error error = loadExecutable(reinterpret_cast<const uint8_t *>(binary->GetBufferPointer()),
>-                                     binary->GetBufferSize(), type, streamOutVaryings,
>-                                     separatedOutputBuffers, outExectuable);
>+    angle::Result error = loadExecutable(
>+        context, static_cast<const uint8_t *>(binary->GetBufferPointer()), binary->GetBufferSize(),
>+        type, streamOutVaryings, separatedOutputBuffers, outExectuable);
> 
>     SafeRelease(binary);
>-    if (error.isError())
>+    if (error == angle::Result::Stop)
>     {
>         return error;
>     }
>@@ -2973,12 +2875,12 @@ gl::Error Renderer11::compileToExecutable(gl::InfoLog &infoLog,
>         (*outExectuable)->appendDebugInfo(debugInfo);
>     }
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error Renderer11::ensureHLSLCompilerInitialized()
>+angle::Result Renderer11::ensureHLSLCompilerInitialized(d3d::Context *context)
> {
>-    return mCompiler.ensureInitialized();
>+    return mCompiler.ensureInitialized(context);
> }
> 
> UniformStorageD3D *Renderer11::createUniformStorage(size_t storageSize)
>@@ -2996,11 +2898,11 @@ IndexBuffer *Renderer11::createIndexBuffer()
>     return new IndexBuffer11(this);
> }
> 
>-StreamProducerImpl *Renderer11::createStreamProducerD3DTextureNV12(
>+StreamProducerImpl *Renderer11::createStreamProducerD3DTexture(
>     egl::Stream::ConsumerType consumerType,
>     const egl::AttributeMap &attribs)
> {
>-    return new StreamProducerNV12(this);
>+    return new StreamProducerD3DTexture(this);
> }
> 
> bool Renderer11::supportsFastCopyBufferToTexture(GLenum internalFormat) const
>@@ -3050,13 +2952,13 @@ bool Renderer11::supportsFastCopyBufferToTexture(GLenum internalFormat) const
>     return true;
> }
> 
>-gl::Error Renderer11::fastCopyBufferToTexture(const gl::Context *context,
>-                                              const gl::PixelUnpackState &unpack,
>-                                              unsigned int offset,
>-                                              RenderTargetD3D *destRenderTarget,
>-                                              GLenum destinationFormat,
>-                                              GLenum sourcePixelsType,
>-                                              const gl::Box &destArea)
>+angle::Result Renderer11::fastCopyBufferToTexture(const gl::Context *context,
>+                                                  const gl::PixelUnpackState &unpack,
>+                                                  unsigned int offset,
>+                                                  RenderTargetD3D *destRenderTarget,
>+                                                  GLenum destinationFormat,
>+                                                  GLenum sourcePixelsType,
>+                                                  const gl::Box &destArea)
> {
>     ASSERT(supportsFastCopyBufferToTexture(destinationFormat));
>     return mPixelTransfer->copyBufferToTexture(context, unpack, offset, destRenderTarget,
>@@ -3068,16 +2970,16 @@ ImageD3D *Renderer11::createImage()
>     return new Image11(this);
> }
> 
>-gl::Error Renderer11::generateMipmap(const gl::Context *context, ImageD3D *dest, ImageD3D *src)
>+angle::Result Renderer11::generateMipmap(const gl::Context *context, ImageD3D *dest, ImageD3D *src)
> {
>     Image11 *dest11 = GetAs<Image11>(dest);
>     Image11 *src11  = GetAs<Image11>(src);
>     return Image11::GenerateMipmap(context, dest11, src11, mRenderer11DeviceCaps);
> }
> 
>-gl::Error Renderer11::generateMipmapUsingD3D(const gl::Context *context,
>-                                             TextureStorage *storage,
>-                                             const gl::TextureState &textureState)
>+angle::Result Renderer11::generateMipmapUsingD3D(const gl::Context *context,
>+                                                 TextureStorage *storage,
>+                                                 const gl::TextureState &textureState)
> {
>     TextureStorage11 *storage11 = GetAs<TextureStorage11>(storage);
> 
>@@ -3090,21 +2992,21 @@ gl::Error Renderer11::generateMipmapUsingD3D(const gl::Context *context,
> 
>     mDeviceContext->GenerateMips(srv->get());
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error Renderer11::copyImage(const gl::Context *context,
>-                                ImageD3D *dest,
>-                                ImageD3D *source,
>-                                const gl::Rectangle &sourceRect,
>-                                const gl::Offset &destOffset,
>-                                bool unpackFlipY,
>-                                bool unpackPremultiplyAlpha,
>-                                bool unpackUnmultiplyAlpha)
>+angle::Result Renderer11::copyImage(const gl::Context *context,
>+                                    ImageD3D *dest,
>+                                    ImageD3D *source,
>+                                    const gl::Box &sourceBox,
>+                                    const gl::Offset &destOffset,
>+                                    bool unpackFlipY,
>+                                    bool unpackPremultiplyAlpha,
>+                                    bool unpackUnmultiplyAlpha)
> {
>     Image11 *dest11 = GetAs<Image11>(dest);
>     Image11 *src11  = GetAs<Image11>(source);
>-    return Image11::CopyImage(context, dest11, src11, sourceRect, destOffset, unpackFlipY,
>+    return Image11::CopyImage(context, dest11, src11, sourceBox, destOffset, unpackFlipY,
>                               unpackPremultiplyAlpha, unpackUnmultiplyAlpha, mRenderer11DeviceCaps);
> }
> 
>@@ -3181,14 +3083,26 @@ TextureStorage *Renderer11::createTextureStorage2DMultisample(GLenum internalfor
>                                               fixedSampleLocations);
> }
> 
>-gl::Error Renderer11::readFromAttachment(const gl::Context *context,
>-                                         const gl::FramebufferAttachment &srcAttachment,
>-                                         const gl::Rectangle &sourceArea,
>-                                         GLenum format,
>-                                         GLenum type,
>-                                         GLuint outputPitch,
>-                                         const gl::PixelPackState &pack,
>-                                         uint8_t *pixelsOut)
>+TextureStorage *Renderer11::createTextureStorage2DMultisampleArray(GLenum internalformat,
>+                                                                   GLsizei width,
>+                                                                   GLsizei height,
>+                                                                   GLsizei depth,
>+                                                                   int levels,
>+                                                                   int samples,
>+                                                                   bool fixedSampleLocations)
>+{
>+    return new TextureStorage11_2DMultisampleArray(this, internalformat, width, height, depth,
>+                                                   levels, samples, fixedSampleLocations);
>+}
>+
>+angle::Result Renderer11::readFromAttachment(const gl::Context *context,
>+                                             const gl::FramebufferAttachment &srcAttachment,
>+                                             const gl::Rectangle &sourceArea,
>+                                             GLenum format,
>+                                             GLenum type,
>+                                             GLuint outputPitch,
>+                                             const gl::PixelPackState &pack,
>+                                             uint8_t *pixelsOut)
> {
>     ASSERT(sourceArea.width >= 0);
>     ASSERT(sourceArea.height >= 0);
>@@ -3200,14 +3114,16 @@ gl::Error Renderer11::readFromAttachment(const gl::Context *context,
>     ASSERT(rt11->getTexture().valid());
> 
>     const TextureHelper11 &textureHelper = rt11->getTexture();
>-    unsigned int sourceSubResource = rt11->getSubresourceIndex();
>+    unsigned int sourceSubResource       = rt11->getSubresourceIndex();
> 
>     const gl::Extents &texSize = textureHelper.getExtents();
> 
>     gl::Rectangle actualArea = sourceArea;
>+    bool reverseRowOrder     = pack.reverseRowOrder;
>     if (invertTexture)
>     {
>-        actualArea.y = texSize.height - actualArea.y - actualArea.height;
>+        actualArea.y    = texSize.height - actualArea.y - actualArea.height;
>+        reverseRowOrder = !reverseRowOrder;
>     }
> 
>     // Clamp read region to the defined texture boundaries, preventing out of bounds reads
>@@ -3227,15 +3143,15 @@ gl::Error Renderer11::readFromAttachment(const gl::Context *context,
>     if (safeArea.width == 0 || safeArea.height == 0)
>     {
>         // no work to do
>-        return gl::NoError();
>+        return angle::Result::Continue;
>     }
> 
>     gl::Extents safeSize(safeArea.width, safeArea.height, 1);
>     TextureHelper11 stagingHelper;
>-    ANGLE_TRY_RESULT(
>-        createStagingTexture(textureHelper.getTextureType(), textureHelper.getFormatSet(), safeSize,
>-                             StagingAccess::READ),
>-        stagingHelper);
>+    ANGLE_TRY(createStagingTexture(context, textureHelper.getTextureType(),
>+                                   textureHelper.getFormatSet(), safeSize, StagingAccess::READ,
>+                                   &stagingHelper));
>+    stagingHelper.setDebugName("readFromAttachment::stagingHelper");
> 
>     TextureHelper11 resolvedTextureHelper;
> 
>@@ -3258,8 +3174,9 @@ gl::Error Renderer11::readFromAttachment(const gl::Context *context,
>         resolveDesc.CPUAccessFlags     = 0;
>         resolveDesc.MiscFlags          = 0;
> 
>-        ANGLE_TRY(
>-            allocateTexture(resolveDesc, textureHelper.getFormatSet(), &resolvedTextureHelper));
>+        ANGLE_TRY(allocateTexture(GetImplAs<Context11>(context), resolveDesc,
>+                                  textureHelper.getFormatSet(), &resolvedTextureHelper));
>+        resolvedTextureHelper.setDebugName("readFromAttachment::resolvedTextureHelper");
> 
>         mDeviceContext->ResolveSubresource(resolvedTextureHelper.get(), 0, textureHelper.get(),
>                                            sourceSubResource, textureHelper.getFormat());
>@@ -3285,41 +3202,22 @@ gl::Error Renderer11::readFromAttachment(const gl::Context *context,
>     mDeviceContext->CopySubresourceRegion(stagingHelper.get(), 0, 0, 0, 0, srcTexture->get(),
>                                           sourceSubResource, &srcBox);
> 
>-    gl::Buffer *packBuffer = context->getGLState().getTargetBuffer(gl::BufferBinding::PixelPack);
>-    if (!invertTexture)
>-    {
>-        PackPixelsParams packParams(safeArea, format, type, outputPitch, pack, packBuffer, 0);
>-        return packPixels(stagingHelper, packParams, pixelsOut);
>-    }
>+    const angle::Format &angleFormat = GetFormatFromFormatType(format, type);
>+    gl::Buffer *packBuffer = context->getState().getTargetBuffer(gl::BufferBinding::PixelPack);
> 
>-    // Create a new PixelPackState with reversed row order. Note that we can't just assign
>-    // 'invertTexturePack' to be 'pack' (or memcpy) since that breaks the ref counting/object
>-    // tracking in the 'pixelBuffer' members, causing leaks. Instead we must use
>-    // pixelBuffer.set() twice, which performs the addRef/release correctly
>-    gl::PixelPackState invertTexturePack;
>-    invertTexturePack.alignment = pack.alignment;
>-    invertTexturePack.reverseRowOrder = !pack.reverseRowOrder;
>-
>-    PackPixelsParams packParams(safeArea, format, type, outputPitch, invertTexturePack, packBuffer,
>-                                0);
>-    gl::Error error = packPixels(stagingHelper, packParams, pixelsOut);
>-    ANGLE_TRY(error);
>-    return gl::NoError();
>+    PackPixelsParams packParams(safeArea, angleFormat, outputPitch, reverseRowOrder, packBuffer, 0);
>+    return packPixels(context, stagingHelper, packParams, pixelsOut);
> }
> 
>-gl::Error Renderer11::packPixels(const TextureHelper11 &textureHelper,
>-                                 const PackPixelsParams &params,
>-                                 uint8_t *pixelsOut)
>+angle::Result Renderer11::packPixels(const gl::Context *context,
>+                                     const TextureHelper11 &textureHelper,
>+                                     const PackPixelsParams &params,
>+                                     uint8_t *pixelsOut)
> {
>     ID3D11Resource *readResource = textureHelper.get();
> 
>     D3D11_MAPPED_SUBRESOURCE mapping;
>-    HRESULT hr = mDeviceContext->Map(readResource, 0, D3D11_MAP_READ, 0, &mapping);
>-    if (FAILED(hr))
>-    {
>-        ASSERT(hr == E_OUTOFMEMORY);
>-        return gl::OutOfMemory() << "Failed to map internal texture for reading, " << gl::FmtHR(hr);
>-    }
>+    ANGLE_TRY(mapResource(context, readResource, 0, D3D11_MAP_READ, 0, &mapping));
> 
>     uint8_t *source = static_cast<uint8_t *>(mapping.pData);
>     int inputPitch  = static_cast<int>(mapping.RowPitch);
>@@ -3331,19 +3229,19 @@ gl::Error Renderer11::packPixels(const TextureHelper11 &textureHelper,
> 
>     mDeviceContext->Unmap(readResource, 0);
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error Renderer11::blitRenderbufferRect(const gl::Context *context,
>-                                           const gl::Rectangle &readRectIn,
>-                                           const gl::Rectangle &drawRectIn,
>-                                           RenderTargetD3D *readRenderTarget,
>-                                           RenderTargetD3D *drawRenderTarget,
>-                                           GLenum filter,
>-                                           const gl::Rectangle *scissor,
>-                                           bool colorBlit,
>-                                           bool depthBlit,
>-                                           bool stencilBlit)
>+angle::Result Renderer11::blitRenderbufferRect(const gl::Context *context,
>+                                               const gl::Rectangle &readRectIn,
>+                                               const gl::Rectangle &drawRectIn,
>+                                               RenderTargetD3D *readRenderTarget,
>+                                               RenderTargetD3D *drawRenderTarget,
>+                                               GLenum filter,
>+                                               const gl::Rectangle *scissor,
>+                                               bool colorBlit,
>+                                               bool depthBlit,
>+                                               bool stencilBlit)
> {
>     // Since blitRenderbufferRect is called for each render buffer that needs to be blitted,
>     // it should never be the case that both color and depth/stencil need to be blitted at
>@@ -3351,31 +3249,22 @@ gl::Error Renderer11::blitRenderbufferRect(const gl::Context *context,
>     ASSERT(colorBlit != (depthBlit || stencilBlit));
> 
>     RenderTarget11 *drawRenderTarget11 = GetAs<RenderTarget11>(drawRenderTarget);
>-    if (!drawRenderTarget11)
>-    {
>-        return gl::OutOfMemory()
>-               << "Failed to retrieve the internal draw render target from the draw framebuffer.";
>-    }
>+    ASSERT(drawRenderTarget11);
> 
>     const TextureHelper11 &drawTexture = drawRenderTarget11->getTexture();
>-    unsigned int drawSubresource    = drawRenderTarget11->getSubresourceIndex();
>+    unsigned int drawSubresource       = drawRenderTarget11->getSubresourceIndex();
> 
>     RenderTarget11 *readRenderTarget11 = GetAs<RenderTarget11>(readRenderTarget);
>-    if (!readRenderTarget11)
>-    {
>-        return gl::OutOfMemory()
>-               << "Failed to retrieve the internal read render target from the read framebuffer.";
>-    }
>+    ASSERT(readRenderTarget11);
> 
>     TextureHelper11 readTexture;
>-    unsigned int readSubresource      = 0;
>+    unsigned int readSubresource = 0;
>     d3d11::SharedSRV readSRV;
> 
>     if (readRenderTarget->isMultisampled())
>     {
>-        ANGLE_TRY_RESULT(
>-            resolveMultisampledTexture(context, readRenderTarget11, depthBlit, stencilBlit),
>-            readTexture);
>+        ANGLE_TRY(resolveMultisampledTexture(context, readRenderTarget11, depthBlit, stencilBlit,
>+                                             &readTexture));
> 
>         if (!stencilBlit)
>         {
>@@ -3387,7 +3276,8 @@ gl::Error Renderer11::blitRenderbufferRect(const gl::Context *context,
>             viewDesc.Texture2D.MipLevels       = 1;
>             viewDesc.Texture2D.MostDetailedMip = 0;
> 
>-            ANGLE_TRY(allocateResource(viewDesc, readTexture.get(), &readSRV));
>+            ANGLE_TRY(allocateResource(GetImplAs<Context11>(context), viewDesc, readTexture.get(),
>+                                       &readSRV));
>         }
>     }
>     else
>@@ -3395,11 +3285,11 @@ gl::Error Renderer11::blitRenderbufferRect(const gl::Context *context,
>         ASSERT(readRenderTarget11);
>         readTexture     = readRenderTarget11->getTexture();
>         readSubresource = readRenderTarget11->getSubresourceIndex();
>-        readSRV         = readRenderTarget11->getBlitShaderResourceView().makeCopy();
>+        readSRV         = readRenderTarget11->getBlitShaderResourceView(context).makeCopy();
>         if (!readSRV.valid())
>         {
>             ASSERT(depthBlit || stencilBlit);
>-            readSRV = readRenderTarget11->getShaderResourceView().makeCopy();
>+            readSRV = readRenderTarget11->getShaderResourceView(context).makeCopy();
>         }
>         ASSERT(readSRV.valid());
>     }
>@@ -3416,99 +3306,69 @@ gl::Error Renderer11::blitRenderbufferRect(const gl::Context *context,
>     // buffer, the depth buffer, and / or the stencil buffer depending on mask."
>     // This means negative x and y are out of bounds, and not to be read from. We handle this here
>     // by internally scaling the read and draw rectangles.
>+
>+    // Remove reversal from readRect to simplify further operations.
>     gl::Rectangle readRect = readRectIn;
>     gl::Rectangle drawRect = drawRectIn;
>-
>-    auto flip = [](int val) { return val >= 0 ? 1 : -1; };
>-
>-    if (readRect.x > readSize.width && readRect.width < 0)
>+    if (readRect.isReversedX())
>     {
>-        int delta = readRect.x - readSize.width;
>-        readRect.x -= delta;
>-        readRect.width += delta;
>-
>-        int drawDelta = delta * flip(drawRect.width);
>-        drawRect.x += drawDelta;
>-        drawRect.width -= drawDelta;
>+        readRect.x     = readRect.x + readRect.width;
>+        readRect.width = -readRect.width;
>+        drawRect.x     = drawRect.x + drawRect.width;
>+        drawRect.width = -drawRect.width;
>     }
>-
>-    if (readRect.y > readSize.height && readRect.height < 0)
>+    if (readRect.isReversedY())
>     {
>-        int delta = readRect.y - readSize.height;
>-        readRect.y -= delta;
>-        readRect.height += delta;
>-
>-        int drawDelta = delta * flip(drawRect.height);
>-        drawRect.y += drawDelta;
>-        drawRect.height -= drawDelta;
>+        readRect.y      = readRect.y + readRect.height;
>+        readRect.height = -readRect.height;
>+        drawRect.y      = drawRect.y + drawRect.height;
>+        drawRect.height = -drawRect.height;
>     }
> 
>-    auto readToDrawX       = [&drawRectIn, &readRectIn](int readOffset) {
>-        double readToDrawScale =
>-            static_cast<double>(drawRectIn.width) / static_cast<double>(readRectIn.width);
>-        return static_cast<int>(round(static_cast<double>(readOffset) * readToDrawScale));
>-    };
>-    if (readRect.x < 0)
>+    gl::Rectangle readBounds(0, 0, readSize.width, readSize.height);
>+    gl::Rectangle inBoundsReadRect;
>+    if (!gl::ClipRectangle(readRect, readBounds, &inBoundsReadRect))
>     {
>-        int readOffset = -readRect.x;
>-        readRect.x += readOffset;
>-        readRect.width -= readOffset;
>-
>-        int drawOffset = readToDrawX(readOffset);
>-        drawRect.x += drawOffset;
>-        drawRect.width -= drawOffset;
>+        return angle::Result::Continue;
>     }
> 
>-    auto readToDrawY = [&drawRectIn, &readRectIn](int readOffset) {
>-        double readToDrawScale =
>-            static_cast<double>(drawRectIn.height) / static_cast<double>(readRectIn.height);
>-        return static_cast<int>(round(static_cast<double>(readOffset) * readToDrawScale));
>-    };
>-    if (readRect.y < 0)
>-    {
>-        int readOffset = -readRect.y;
>-        readRect.y += readOffset;
>-        readRect.height -= readOffset;
>-
>-        int drawOffset = readToDrawY(readOffset);
>-        drawRect.y += drawOffset;
>-        drawRect.height -= drawOffset;
>-    }
>-
>-    if (readRect.x1() < 0)
>     {
>-        int readOffset = -readRect.x1();
>-        readRect.width += readOffset;
>-
>-        int drawOffset = readToDrawX(readOffset);
>-        drawRect.width += drawOffset;
>-    }
>-
>-    if (readRect.y1() < 0)
>-    {
>-        int readOffset = -readRect.y1();
>-        readRect.height += readOffset;
>-
>-        int drawOffset = readToDrawY(readOffset);
>-        drawRect.height += drawOffset;
>-    }
>+        // Calculate the drawRect that corresponds to inBoundsReadRect.
>+        auto readToDrawX = [&drawRect, &readRect](int readOffset) {
>+            double readToDrawScale =
>+                static_cast<double>(drawRect.width) / static_cast<double>(readRect.width);
>+            return static_cast<int>(
>+                round(static_cast<double>(readOffset - readRect.x) * readToDrawScale) + drawRect.x);
>+        };
>+        auto readToDrawY = [&drawRect, &readRect](int readOffset) {
>+            double readToDrawScale =
>+                static_cast<double>(drawRect.height) / static_cast<double>(readRect.height);
>+            return static_cast<int>(
>+                round(static_cast<double>(readOffset - readRect.y) * readToDrawScale) + drawRect.y);
>+        };
> 
>-    if (readRect.x1() > readSize.width)
>-    {
>-        int delta = readRect.x1() - readSize.width;
>-        readRect.width -= delta;
>-        drawRect.width -= delta * flip(drawRect.width);
>+        gl::Rectangle drawRectMatchingInBoundsReadRect;
>+        drawRectMatchingInBoundsReadRect.x = readToDrawX(inBoundsReadRect.x);
>+        drawRectMatchingInBoundsReadRect.y = readToDrawY(inBoundsReadRect.y);
>+        drawRectMatchingInBoundsReadRect.width =
>+            readToDrawX(inBoundsReadRect.x1()) - drawRectMatchingInBoundsReadRect.x;
>+        drawRectMatchingInBoundsReadRect.height =
>+            readToDrawY(inBoundsReadRect.y1()) - drawRectMatchingInBoundsReadRect.y;
>+        drawRect = drawRectMatchingInBoundsReadRect;
>+        readRect = inBoundsReadRect;
>     }
> 
>-    if (readRect.y1() > readSize.height)
>+    bool scissorNeeded = false;
>+    if (scissor)
>     {
>-        int delta = readRect.y1() - readSize.height;
>-        readRect.height -= delta;
>-        drawRect.height -= delta * flip(drawRect.height);
>+        gl::Rectangle scissoredDrawRect;
>+        if (!gl::ClipRectangle(drawRect, *scissor, &scissoredDrawRect))
>+        {
>+            return angle::Result::Continue;
>+        }
>+        scissorNeeded = scissoredDrawRect != drawRect;
>     }
> 
>-    bool scissorNeeded = scissor && gl::ClipRectangle(drawRect, *scissor, nullptr);
>-
>     const auto &destFormatInfo =
>         gl::GetSizedInternalFormatInfo(drawRenderTarget->getInternalFormat());
>     const auto &srcFormatInfo =
>@@ -3541,8 +3401,8 @@ gl::Error Renderer11::blitRenderbufferRect(const gl::Context *context,
> 
>     bool stretchRequired = readRect.width != drawRect.width || readRect.height != drawRect.height;
> 
>-    bool flipRequired =
>-        readRect.width < 0 || readRect.height < 0 || drawRect.width < 0 || drawRect.height < 0;
>+    ASSERT(!readRect.isReversedX() && !readRect.isReversedY());
>+    bool reversalRequired = drawRect.isReversedX() || drawRect.isReversedY();
> 
>     bool outOfBounds = readRect.x < 0 || readRect.x + readRect.width > readSize.width ||
>                        readRect.y < 0 || readRect.y + readRect.height > readSize.height ||
>@@ -3554,7 +3414,7 @@ gl::Error Renderer11::blitRenderbufferRect(const gl::Context *context,
> 
>     if (readRenderTarget11->getFormatSet().formatID ==
>             drawRenderTarget11->getFormatSet().formatID &&
>-        !stretchRequired && !outOfBounds && !flipRequired && !partialDSBlit &&
>+        !stretchRequired && !outOfBounds && !reversalRequired && !partialDSBlit &&
>         !colorMaskingNeeded && (!(depthBlit || stencilBlit) || wholeBufferCopy))
>     {
>         UINT dstX = drawRect.x;
>@@ -3608,9 +3468,9 @@ gl::Error Renderer11::blitRenderbufferRect(const gl::Context *context,
> 
>         if (depthBlit && stencilBlit)
>         {
>-            ANGLE_TRY(mBlit->copyDepthStencil(readTexture, readSubresource, readArea, readSize,
>-                                              drawTexture, drawSubresource, drawArea, drawSize,
>-                                              scissor));
>+            ANGLE_TRY(mBlit->copyDepthStencil(context, readTexture, readSubresource, readArea,
>+                                              readSize, drawTexture, drawSubresource, drawArea,
>+                                              drawSize, scissor));
>         }
>         else if (depthBlit)
>         {
>@@ -3632,13 +3492,14 @@ gl::Error Renderer11::blitRenderbufferRect(const gl::Context *context,
>             // We don't currently support masking off any other channel than alpha
>             bool maskOffAlpha = colorMaskingNeeded && colorMask.alpha;
>             ASSERT(readSRV.valid());
>-            ANGLE_TRY(mBlit->copyTexture(
>-                context, readSRV, readArea, readSize, srcFormatInfo.format, drawRTV, drawArea,
>-                drawSize, scissor, destFormatInfo.format, filter, maskOffAlpha, false, false));
>+            ANGLE_TRY(mBlit->copyTexture(context, readSRV, readArea, readSize, srcFormatInfo.format,
>+                                         drawRTV, drawArea, drawSize, scissor,
>+                                         destFormatInfo.format, GL_NONE, filter, maskOffAlpha,
>+                                         false, false));
>         }
>     }
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
> bool Renderer11::isES3Capable() const
>@@ -3692,29 +3553,30 @@ void Renderer11::onBufferDelete(const Buffer11 *deleted)
>     mAliveBuffers.erase(deleted);
> }
> 
>-gl::ErrorOrResult<TextureHelper11> Renderer11::resolveMultisampledTexture(
>-    const gl::Context *context,
>-    RenderTarget11 *renderTarget,
>-    bool depth,
>-    bool stencil)
>+angle::Result Renderer11::resolveMultisampledTexture(const gl::Context *context,
>+                                                     RenderTarget11 *renderTarget,
>+                                                     bool depth,
>+                                                     bool stencil,
>+                                                     TextureHelper11 *textureOut)
> {
>     if (depth && !stencil)
>     {
>-        return mBlit->resolveDepth(context, renderTarget);
>+        return mBlit->resolveDepth(context, renderTarget, textureOut);
>     }
> 
>     if (stencil)
>     {
>-        return mBlit->resolveStencil(context, renderTarget, depth);
>+        return mBlit->resolveStencil(context, renderTarget, depth, textureOut);
>     }
> 
>     const auto &formatSet = renderTarget->getFormatSet();
> 
>     ASSERT(renderTarget->isMultisampled());
>-    const d3d11::SharedSRV &sourceSRV = renderTarget->getShaderResourceView();
>+    const d3d11::SharedSRV &sourceSRV = renderTarget->getShaderResourceView(context);
>     D3D11_SHADER_RESOURCE_VIEW_DESC sourceSRVDesc;
>     sourceSRV.get()->GetDesc(&sourceSRVDesc);
>-    ASSERT(sourceSRVDesc.ViewDimension == D3D_SRV_DIMENSION_TEXTURE2DMS);
>+    ASSERT(sourceSRVDesc.ViewDimension == D3D_SRV_DIMENSION_TEXTURE2DMS ||
>+           sourceSRVDesc.ViewDimension == D3D_SRV_DIMENSION_TEXTURE2DMSARRAY);
> 
>     if (!mCachedResolveTexture.valid() ||
>         mCachedResolveTexture.getExtents().width != renderTarget->getWidth() ||
>@@ -3734,13 +3596,15 @@ gl::ErrorOrResult<TextureHelper11> Renderer11::resolveMultisampledTexture(
>         resolveDesc.CPUAccessFlags     = 0;
>         resolveDesc.MiscFlags          = 0;
> 
>-        ANGLE_TRY(allocateTexture(resolveDesc, formatSet, &mCachedResolveTexture));
>+        ANGLE_TRY(allocateTexture(GetImplAs<Context11>(context), resolveDesc, formatSet,
>+                                  &mCachedResolveTexture));
>     }
> 
>     mDeviceContext->ResolveSubresource(mCachedResolveTexture.get(), 0,
>                                        renderTarget->getTexture().get(),
>                                        renderTarget->getSubresourceIndex(), formatSet.texFormat);
>-    return mCachedResolveTexture;
>+    *textureOut = mCachedResolveTexture;
>+    return angle::Result::Continue;
> }
> 
> bool Renderer11::getLUID(LUID *adapterLuid) const
>@@ -3763,36 +3627,38 @@ bool Renderer11::getLUID(LUID *adapterLuid) const
>     return true;
> }
> 
>-VertexConversionType Renderer11::getVertexConversionType(
>-    gl::VertexFormatType vertexFormatType) const
>+VertexConversionType Renderer11::getVertexConversionType(angle::FormatID vertexFormatID) const
> {
>-    return d3d11::GetVertexFormatInfo(vertexFormatType, mRenderer11DeviceCaps.featureLevel)
>+    return d3d11::GetVertexFormatInfo(vertexFormatID, mRenderer11DeviceCaps.featureLevel)
>         .conversionType;
> }
> 
>-GLenum Renderer11::getVertexComponentType(gl::VertexFormatType vertexFormatType) const
>+GLenum Renderer11::getVertexComponentType(angle::FormatID vertexFormatID) const
> {
>     const auto &format =
>-        d3d11::GetVertexFormatInfo(vertexFormatType, mRenderer11DeviceCaps.featureLevel);
>+        d3d11::GetVertexFormatInfo(vertexFormatID, mRenderer11DeviceCaps.featureLevel);
>     return d3d11::GetComponentType(format.nativeFormat);
> }
> 
>-gl::ErrorOrResult<unsigned int> Renderer11::getVertexSpaceRequired(
>-    const gl::VertexAttribute &attrib,
>-    const gl::VertexBinding &binding,
>-    GLsizei count,
>-    GLsizei instances) const
>+angle::Result Renderer11::getVertexSpaceRequired(const gl::Context *context,
>+                                                 const gl::VertexAttribute &attrib,
>+                                                 const gl::VertexBinding &binding,
>+                                                 size_t count,
>+                                                 GLsizei instances,
>+                                                 unsigned int *bytesRequiredOut) const
> {
>     if (!attrib.enabled)
>     {
>-        return 16u;
>+        *bytesRequiredOut = 16u;
>+        return angle::Result::Continue;
>     }
> 
>     unsigned int elementCount  = 0;
>     const unsigned int divisor = binding.getDivisor();
>     if (instances == 0 || divisor == 0)
>     {
>-        elementCount = count;
>+        // This could be a clipped cast.
>+        elementCount = gl::clampCast<unsigned int>(count);
>     }
>     else
>     {
>@@ -3800,19 +3666,21 @@ gl::ErrorOrResult<unsigned int> Renderer11::getVertexSpaceRequired(
>         elementCount = UnsignedCeilDivide(static_cast<unsigned int>(instances), divisor);
>     }
> 
>-    gl::VertexFormatType formatType      = gl::GetVertexFormatType(attrib);
>+    ASSERT(elementCount > 0);
>+
>+    angle::FormatID formatID             = gl::GetVertexFormatID(attrib);
>     const D3D_FEATURE_LEVEL featureLevel = mRenderer11DeviceCaps.featureLevel;
>     const d3d11::VertexFormat &vertexFormatInfo =
>-        d3d11::GetVertexFormatInfo(formatType, featureLevel);
>+        d3d11::GetVertexFormatInfo(formatID, featureLevel);
>     const d3d11::DXGIFormatSize &dxgiFormatInfo =
>         d3d11::GetDXGIFormatSizeInfo(vertexFormatInfo.nativeFormat);
>     unsigned int elementSize = dxgiFormatInfo.pixelBytes;
>-    if (elementSize > std::numeric_limits<unsigned int>::max() / elementCount)
>-    {
>-        return gl::OutOfMemory() << "New vertex buffer size would result in an overflow.";
>-    }
>+    bool check = (elementSize > std::numeric_limits<unsigned int>::max() / elementCount);
>+    ANGLE_CHECK(GetImplAs<Context11>(context), !check,
>+                "New vertex buffer size would result in an overflow.", GL_OUT_OF_MEMORY);
> 
>-    return elementSize * elementCount;
>+    *bytesRequiredOut = elementSize * elementCount;
>+    return angle::Result::Continue;
> }
> 
> void Renderer11::generateCaps(gl::Caps *outCaps,
>@@ -3820,8 +3688,8 @@ void Renderer11::generateCaps(gl::Caps *outCaps,
>                               gl::Extensions *outExtensions,
>                               gl::Limitations *outLimitations) const
> {
>-    d3d11_gl::GenerateCaps(mDevice, mDeviceContext, mRenderer11DeviceCaps, outCaps, outTextureCaps,
>-                           outExtensions, outLimitations);
>+    d3d11_gl::GenerateCaps(mDevice, mDeviceContext, mRenderer11DeviceCaps, getWorkarounds(),
>+                           outCaps, outTextureCaps, outExtensions, outLimitations);
> }
> 
> angle::WorkaroundsD3D Renderer11::generateWorkarounds() const
>@@ -3829,29 +3697,14 @@ angle::WorkaroundsD3D Renderer11::generateWorkarounds() const
>     return d3d11::GenerateWorkarounds(mRenderer11DeviceCaps, mAdapterDescription);
> }
> 
>-egl::Error Renderer11::getEGLDevice(DeviceImpl **device)
>+DeviceImpl *Renderer11::createEGLDevice()
> {
>-    if (mEGLDevice == nullptr)
>-    {
>-        ASSERT(mDevice != nullptr);
>-        mEGLDevice       = new DeviceD3D();
>-        egl::Error error = mEGLDevice->initialize(reinterpret_cast<void *>(mDevice),
>-                                                  EGL_D3D11_DEVICE_ANGLE, EGL_FALSE);
>-
>-        if (error.isError())
>-        {
>-            SafeDelete(mEGLDevice);
>-            return error;
>-        }
>-    }
>-
>-    *device = static_cast<DeviceImpl *>(mEGLDevice);
>-    return egl::NoError();
>+    return new DeviceD3D(EGL_D3D11_DEVICE_ANGLE, mDevice);
> }
> 
>-ContextImpl *Renderer11::createContext(const gl::ContextState &state)
>+ContextImpl *Renderer11::createContext(const gl::State &state, gl::ErrorSet *errorSet)
> {
>-    return new Context11(state, this);
>+    return new Context11(state, errorSet, this);
> }
> 
> FramebufferImpl *Renderer11::createDefaultFramebuffer(const gl::FramebufferState &state)
>@@ -3859,13 +3712,12 @@ FramebufferImpl *Renderer11::createDefaultFramebuffer(const gl::FramebufferState
>     return new Framebuffer11(state, this);
> }
> 
>-gl::Error Renderer11::getScratchMemoryBuffer(size_t requestedSize, angle::MemoryBuffer **bufferOut)
>+angle::Result Renderer11::getScratchMemoryBuffer(Context11 *context11,
>+                                                 size_t requestedSize,
>+                                                 angle::MemoryBuffer **bufferOut)
> {
>-    if (!mScratchMemoryBuffer.get(requestedSize, bufferOut))
>-    {
>-        return gl::OutOfMemory() << "Failed to allocate internal buffer.";
>-    }
>-    return gl::NoError();
>+    ANGLE_CHECK_GL_ALLOC(context11, mScratchMemoryBuffer.get(requestedSize, bufferOut));
>+    return angle::Result::Continue;
> }
> 
> gl::Version Renderer11::getMaxSupportedESVersion() const
>@@ -3875,45 +3727,66 @@ gl::Version Renderer11::getMaxSupportedESVersion() const
> 
> gl::DebugAnnotator *Renderer11::getAnnotator()
> {
>-    return mAnnotator;
>+    return &mAnnotator;
> }
> 
>-gl::Error Renderer11::applyComputeShader(const gl::Context *context)
>+angle::Result Renderer11::dispatchCompute(const gl::Context *context,
>+                                          GLuint numGroupsX,
>+                                          GLuint numGroupsY,
>+                                          GLuint numGroupsZ)
> {
>-    ANGLE_TRY(ensureHLSLCompilerInitialized());
>-
>-    const auto &glState    = context->getGLState();
>-    ProgramD3D *programD3D = GetImplAs<ProgramD3D>(glState.getProgram());
>-
>-    ShaderExecutableD3D *computeExe = nullptr;
>-    ANGLE_TRY(programD3D->getComputeExecutable(&computeExe));
>-    ASSERT(computeExe != nullptr);
>+    const gl::State &glState   = context->getState();
>+    const gl::Program *program = glState.getProgram();
>+    if (program->getActiveShaderStorageBlockCount() > 0 ||
>+        program->getActiveAtomicCounterBufferCount() > 0)
>+    {
>+        ANGLE_TRY(markRawBufferUsage(context));
>+    }
> 
>-    mStateManager.setComputeShader(&GetAs<ShaderExecutable11>(computeExe)->getComputeShader());
>-    ANGLE_TRY(mStateManager.applyComputeUniforms(programD3D));
>+    ANGLE_TRY(mStateManager.updateStateForCompute(context, numGroupsX, numGroupsY, numGroupsZ));
>+    mDeviceContext->Dispatch(numGroupsX, numGroupsY, numGroupsZ);
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
>-
>-gl::Error Renderer11::dispatchCompute(const gl::Context *context,
>-                                      GLuint numGroupsX,
>-                                      GLuint numGroupsY,
>-                                      GLuint numGroupsZ)
>+angle::Result Renderer11::dispatchComputeIndirect(const gl::Context *context, GLintptr indirect)
> {
>-    ANGLE_TRY(mStateManager.updateStateForCompute(context, numGroupsX, numGroupsY, numGroupsZ));
>-    ANGLE_TRY(applyComputeShader(context));
>+    const auto &glState          = context->getState();
>+    const gl::Program *program   = glState.getProgram();
>+    if (program->getActiveShaderStorageBlockCount() > 0 ||
>+        program->getActiveAtomicCounterBufferCount() > 0)
>+    {
>+        ANGLE_TRY(markRawBufferUsage(context));
>+    }
> 
>-    mDeviceContext->Dispatch(numGroupsX, numGroupsY, numGroupsZ);
>+    auto *dispatchIndirectBuffer = glState.getTargetBuffer(gl::BufferBinding::DispatchIndirect);
>+    ASSERT(dispatchIndirectBuffer);
>+
>+    Buffer11 *storage         = GetImplAs<Buffer11>(dispatchIndirectBuffer);
>+    const uint8_t *bufferData = nullptr;
>+    // TODO(jie.a.chen@intel.com): num_groups_x,y,z have to be written into the driver constant
>+    // buffer for the built-in variable gl_NumWorkGroups. There is an opportunity for optimization
>+    // to use GPU->GPU copy instead.
>+    // http://anglebug.com/2807
>+    ANGLE_TRY(storage->getData(context, &bufferData));
>+    const GLuint *groups = reinterpret_cast<const GLuint *>(bufferData + indirect);
>+    ANGLE_TRY(mStateManager.updateStateForCompute(context, groups[0], groups[1], groups[2]));
> 
>-    return gl::NoError();
>+    ID3D11Buffer *buffer = nullptr;
>+    ANGLE_TRY(storage->getBuffer(context, BUFFER_USAGE_INDIRECT, &buffer));
>+
>+    mDeviceContext->DispatchIndirect(buffer, static_cast<UINT>(indirect));
>+    return angle::Result::Continue;
> }
> 
>-gl::ErrorOrResult<TextureHelper11> Renderer11::createStagingTexture(
>-    ResourceType textureType,
>-    const d3d11::Format &formatSet,
>-    const gl::Extents &size,
>-    StagingAccess readAndWriteAccess)
>+angle::Result Renderer11::createStagingTexture(const gl::Context *context,
>+                                               ResourceType textureType,
>+                                               const d3d11::Format &formatSet,
>+                                               const gl::Extents &size,
>+                                               StagingAccess readAndWriteAccess,
>+                                               TextureHelper11 *textureOut)
> {
>+    Context11 *context11 = GetImplAs<Context11>(context);
>+
>     if (textureType == ResourceType::Texture2D)
>     {
>         D3D11_TEXTURE2D_DESC stagingDesc;
>@@ -3934,9 +3807,8 @@ gl::ErrorOrResult<TextureHelper11> Renderer11::createStagingTexture(
>             stagingDesc.CPUAccessFlags |= D3D11_CPU_ACCESS_WRITE;
>         }
> 
>-        TextureHelper11 stagingTex;
>-        ANGLE_TRY(allocateTexture(stagingDesc, formatSet, &stagingTex));
>-        return stagingTex;
>+        ANGLE_TRY(allocateTexture(context11, stagingDesc, formatSet, textureOut));
>+        return angle::Result::Continue;
>     }
>     ASSERT(textureType == ResourceType::Texture3D);
> 
>@@ -3951,74 +3823,83 @@ gl::ErrorOrResult<TextureHelper11> Renderer11::createStagingTexture(
>     stagingDesc.CPUAccessFlags = D3D11_CPU_ACCESS_READ;
>     stagingDesc.MiscFlags      = 0;
> 
>-    TextureHelper11 stagingTex;
>-    ANGLE_TRY(allocateTexture(stagingDesc, formatSet, &stagingTex));
>-    return stagingTex;
>+    ANGLE_TRY(allocateTexture(context11, stagingDesc, formatSet, textureOut));
>+    return angle::Result::Continue;
> }
> 
>-gl::Error Renderer11::allocateTexture(const D3D11_TEXTURE2D_DESC &desc,
>-                                      const d3d11::Format &format,
>-                                      const D3D11_SUBRESOURCE_DATA *initData,
>-                                      TextureHelper11 *textureOut)
>+angle::Result Renderer11::allocateTexture(d3d::Context *context,
>+                                          const D3D11_TEXTURE2D_DESC &desc,
>+                                          const d3d11::Format &format,
>+                                          const D3D11_SUBRESOURCE_DATA *initData,
>+                                          TextureHelper11 *textureOut)
> {
>     d3d11::Texture2D texture;
>-    ANGLE_TRY(mResourceManager11.allocate(this, &desc, initData, &texture));
>+    ANGLE_TRY(mResourceManager11.allocate(context, this, &desc, initData, &texture));
>     textureOut->init(std::move(texture), desc, format);
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error Renderer11::allocateTexture(const D3D11_TEXTURE3D_DESC &desc,
>-                                      const d3d11::Format &format,
>-                                      const D3D11_SUBRESOURCE_DATA *initData,
>-                                      TextureHelper11 *textureOut)
>+angle::Result Renderer11::allocateTexture(d3d::Context *context,
>+                                          const D3D11_TEXTURE3D_DESC &desc,
>+                                          const d3d11::Format &format,
>+                                          const D3D11_SUBRESOURCE_DATA *initData,
>+                                          TextureHelper11 *textureOut)
> {
>     d3d11::Texture3D texture;
>-    ANGLE_TRY(mResourceManager11.allocate(this, &desc, initData, &texture));
>+    ANGLE_TRY(mResourceManager11.allocate(context, this, &desc, initData, &texture));
>     textureOut->init(std::move(texture), desc, format);
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error Renderer11::getBlendState(const d3d11::BlendStateKey &key,
>-                                    const d3d11::BlendState **outBlendState)
>+angle::Result Renderer11::getBlendState(const gl::Context *context,
>+                                        const d3d11::BlendStateKey &key,
>+                                        const d3d11::BlendState **outBlendState)
> {
>-    return mStateCache.getBlendState(this, key, outBlendState);
>+    return mStateCache.getBlendState(context, this, key, outBlendState);
> }
> 
>-gl::Error Renderer11::getRasterizerState(const gl::RasterizerState &rasterState,
>-                                         bool scissorEnabled,
>-                                         ID3D11RasterizerState **outRasterizerState)
>+angle::Result Renderer11::getRasterizerState(const gl::Context *context,
>+                                             const gl::RasterizerState &rasterState,
>+                                             bool scissorEnabled,
>+                                             ID3D11RasterizerState **outRasterizerState)
> {
>-    return mStateCache.getRasterizerState(this, rasterState, scissorEnabled, outRasterizerState);
>+    return mStateCache.getRasterizerState(context, this, rasterState, scissorEnabled,
>+                                          outRasterizerState);
> }
> 
>-gl::Error Renderer11::getDepthStencilState(const gl::DepthStencilState &dsState,
>-                                           const d3d11::DepthStencilState **outDSState)
>+angle::Result Renderer11::getDepthStencilState(const gl::Context *context,
>+                                               const gl::DepthStencilState &dsState,
>+                                               const d3d11::DepthStencilState **outDSState)
> {
>-    return mStateCache.getDepthStencilState(this, dsState, outDSState);
>+    return mStateCache.getDepthStencilState(context, this, dsState, outDSState);
> }
> 
>-gl::Error Renderer11::getSamplerState(const gl::SamplerState &samplerState,
>-                                      ID3D11SamplerState **outSamplerState)
>+angle::Result Renderer11::getSamplerState(const gl::Context *context,
>+                                          const gl::SamplerState &samplerState,
>+                                          ID3D11SamplerState **outSamplerState)
> {
>-    return mStateCache.getSamplerState(this, samplerState, outSamplerState);
>+    return mStateCache.getSamplerState(context, this, samplerState, outSamplerState);
> }
> 
>-gl::Error Renderer11::clearRenderTarget(RenderTargetD3D *renderTarget,
>-                                        const gl::ColorF &clearColorValue,
>-                                        const float clearDepthValue,
>-                                        const unsigned int clearStencilValue)
>+angle::Result Renderer11::clearRenderTarget(const gl::Context *context,
>+                                            RenderTargetD3D *renderTarget,
>+                                            const gl::ColorF &clearColorValue,
>+                                            const float clearDepthValue,
>+                                            const unsigned int clearStencilValue)
> {
>     RenderTarget11 *rt11 = GetAs<RenderTarget11>(renderTarget);
> 
>-    if (rt11->getDepthStencilView().valid())
>+    if (rt11->getFormatSet().dsvFormat != DXGI_FORMAT_UNKNOWN)
>     {
>+        ASSERT(rt11->getDepthStencilView().valid());
>+
>         const auto &format    = rt11->getFormatSet();
>         const UINT clearFlags = (format.format().depthBits > 0 ? D3D11_CLEAR_DEPTH : 0) |
>                                 (format.format().stencilBits ? D3D11_CLEAR_STENCIL : 0);
>         mDeviceContext->ClearDepthStencilView(rt11->getDepthStencilView().get(), clearFlags,
>                                               clearDepthValue,
>                                               static_cast<UINT8>(clearStencilValue));
>-        return gl::NoError();
>+        return angle::Result::Continue;
>     }
> 
>     ASSERT(rt11->getRenderTargetView().valid());
>@@ -4039,7 +3920,7 @@ gl::Error Renderer11::clearRenderTarget(RenderTargetD3D *renderTarget,
>     }
> 
>     mDeviceContext->ClearRenderTargetView(rtv, &safeClearColor.red);
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
> bool Renderer11::canSelectViewInVertexShader() const
>@@ -4048,9 +3929,51 @@ bool Renderer11::canSelectViewInVertexShader() const
>            getRenderer11DeviceCaps().supportsVpRtIndexWriteFromVertexShader;
> }
> 
>-gl::Error Renderer11::markTransformFeedbackUsage(const gl::Context *context)
>+angle::Result Renderer11::mapResource(const gl::Context *context,
>+                                      ID3D11Resource *resource,
>+                                      UINT subResource,
>+                                      D3D11_MAP mapType,
>+                                      UINT mapFlags,
>+                                      D3D11_MAPPED_SUBRESOURCE *mappedResource)
>+{
>+    HRESULT hr = mDeviceContext->Map(resource, subResource, mapType, mapFlags, mappedResource);
>+    ANGLE_TRY_HR(GetImplAs<Context11>(context), hr, "Failed to map D3D11 resource.");
>+    return angle::Result::Continue;
>+}
>+
>+angle::Result Renderer11::markRawBufferUsage(const gl::Context *context)
> {
>-    const gl::State &glState                       = context->getGLState();
>+    const gl::State &glState   = context->getState();
>+    const gl::Program *program = glState.getProgram();
>+    for (size_t blockIndex = 0; blockIndex < program->getActiveShaderStorageBlockCount();
>+         blockIndex++)
>+    {
>+        GLuint binding = program->getShaderStorageBlockBinding(static_cast<GLuint>(blockIndex));
>+        const auto &shaderStorageBuffer = glState.getIndexedShaderStorageBuffer(binding);
>+        if (shaderStorageBuffer.get() != nullptr)
>+        {
>+            Buffer11 *bufferStorage = GetImplAs<Buffer11>(shaderStorageBuffer.get());
>+            ANGLE_TRY(bufferStorage->markRawBufferUsage(context));
>+        }
>+    }
>+
>+    for (const auto &atomicCounterBuffer : program->getState().getAtomicCounterBuffers())
>+    {
>+        GLuint binding     = atomicCounterBuffer.binding;
>+        const auto &buffer = glState.getIndexedAtomicCounterBuffer(binding);
>+
>+        if (buffer.get() != nullptr)
>+        {
>+            Buffer11 *bufferStorage = GetImplAs<Buffer11>(buffer.get());
>+            ANGLE_TRY(bufferStorage->markRawBufferUsage(context));
>+        }
>+    }
>+    return angle::Result::Continue;
>+}
>+
>+angle::Result Renderer11::markTransformFeedbackUsage(const gl::Context *context)
>+{
>+    const gl::State &glState                       = context->getState();
>     const gl::TransformFeedback *transformFeedback = glState.getCurrentTransformFeedback();
>     for (size_t i = 0; i < transformFeedback->getIndexedBufferCount(); i++)
>     {
>@@ -4063,7 +3986,13 @@ gl::Error Renderer11::markTransformFeedbackUsage(const gl::Context *context)
>         }
>     }
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>+angle::Result Renderer11::getIncompleteTexture(const gl::Context *context,
>+                                               gl::TextureType type,
>+                                               gl::Texture **textureOut)
>+{
>+    return GetImplAs<Context11>(context)->getIncompleteTexture(context, type, textureOut);
>+}
> }  // namespace rx
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/Renderer11.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/Renderer11.h
>index a8c24e681b9..0929bfd369d 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/Renderer11.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/Renderer11.h
>@@ -26,8 +26,8 @@
> namespace gl
> {
> class FramebufferAttachment;
>-struct ImageIndex;
>-}
>+class ImageIndex;
>+}  // namespace gl
> 
> namespace rx
> {
>@@ -48,16 +48,16 @@ struct Renderer11DeviceCaps
>     Renderer11DeviceCaps();
> 
>     D3D_FEATURE_LEVEL featureLevel;
>-    bool supportsDXGI1_2;                // Support for DXGI 1.2
>-    bool supportsClearView;              // Support for ID3D11DeviceContext1::ClearView
>-    bool supportsConstantBufferOffsets;  // Support for Constant buffer offset
>+    bool supportsDXGI1_2;                         // Support for DXGI 1.2
>+    bool supportsClearView;                       // Support for ID3D11DeviceContext1::ClearView
>+    bool supportsConstantBufferOffsets;           // Support for Constant buffer offset
>     bool supportsVpRtIndexWriteFromVertexShader;  // VP/RT can be selected in the Vertex Shader
>                                                   // stage.
>     bool supportsMultisampledDepthStencilSRVs;  // D3D feature level 10.0 no longer allows creation
>                                                 // of textures with both the bind SRV and DSV flags
>                                                 // when multisampled.  Textures will need to be
>                                                 // resolved before reading. crbug.com/656989
>-    UINT B5G6R5support;    // Bitfield of D3D11_FORMAT_SUPPORT values for DXGI_FORMAT_B5G6R5_UNORM
>+    UINT B5G6R5support;     // Bitfield of D3D11_FORMAT_SUPPORT values for DXGI_FORMAT_B5G6R5_UNORM
>     UINT B5G6R5maxSamples;  // Maximum number of samples supported by DXGI_FORMAT_B5G6R5_UNORM
>     UINT B4G4R4A4support;  // Bitfield of D3D11_FORMAT_SUPPORT values for DXGI_FORMAT_B4G4R4A4_UNORM
>     UINT B4G4R4A4maxSamples;  // Maximum number of samples supported by DXGI_FORMAT_B4G4R4A4_UNORM
>@@ -122,10 +122,10 @@ class Renderer11 : public RendererD3D
>     egl::ConfigSet generateConfigs() override;
>     void generateDisplayExtensions(egl::DisplayExtensions *outExtensions) const override;
> 
>-    ContextImpl *createContext(const gl::ContextState &state) override;
>+    ContextImpl *createContext(const gl::State &state, gl::ErrorSet *errorSet) override;
> 
>-    gl::Error flush();
>-    gl::Error finish();
>+    angle::Result flush(Context11 *context11);
>+    angle::Result finish(Context11 *context11);
> 
>     bool isValidNativeWindow(EGLNativeWindowType window) const override;
>     NativeWindowD3D *createNativeWindow(EGLNativeWindowType window,
>@@ -143,13 +143,11 @@ class Renderer11 : public RendererD3D
>                                  IUnknown *d3dTexture,
>                                  EGLint *width,
>                                  EGLint *height,
>-                                 GLenum *fboFormat) const override;
>+                                 const angle::Format **angleFormat) const override;
>     egl::Error validateShareHandle(const egl::Config *config,
>                                    HANDLE shareHandle,
>                                    const egl::AttributeMap &attribs) const override;
> 
>-    bool applyPrimitiveType(const gl::State &glState, GLenum mode, GLsizei count);
>-
>     // lost device
>     bool testDeviceLost() override;
>     bool testDeviceResettable() override;
>@@ -159,106 +157,113 @@ class Renderer11 : public RendererD3D
> 
>     unsigned int getReservedVertexUniformVectors() const;
>     unsigned int getReservedFragmentUniformVectors() const;
>-    unsigned int getReservedVertexUniformBuffers() const;
>-    unsigned int getReservedFragmentUniformBuffers() const;
>+    gl::ShaderMap<unsigned int> getReservedShaderUniformBuffers() const;
> 
>     bool getShareHandleSupport() const;
> 
>-    bool getNV12TextureSupport() const;
>-
>     int getMajorShaderModel() const override;
>     int getMinorShaderModel() const override;
>     std::string getShaderModelSuffix() const override;
> 
>     // Pixel operations
>-    gl::Error copyImage2D(const gl::Context *context,
>-                          const gl::Framebuffer *framebuffer,
>-                          const gl::Rectangle &sourceRect,
>-                          GLenum destFormat,
>-                          const gl::Offset &destOffset,
>-                          TextureStorage *storage,
>-                          GLint level) override;
>-    gl::Error copyImageCube(const gl::Context *context,
>-                            const gl::Framebuffer *framebuffer,
>-                            const gl::Rectangle &sourceRect,
>-                            GLenum destFormat,
>-                            const gl::Offset &destOffset,
>-                            TextureStorage *storage,
>-                            GLenum target,
>-                            GLint level) override;
>-    gl::Error copyImage3D(const gl::Context *context,
>-                          const gl::Framebuffer *framebuffer,
>-                          const gl::Rectangle &sourceRect,
>-                          GLenum destFormat,
>-                          const gl::Offset &destOffset,
>-                          TextureStorage *storage,
>-                          GLint level) override;
>-    gl::Error copyImage2DArray(const gl::Context *context,
>-                               const gl::Framebuffer *framebuffer,
>-                               const gl::Rectangle &sourceRect,
>-                               GLenum destFormat,
>-                               const gl::Offset &destOffset,
>-                               TextureStorage *storage,
>-                               GLint level) override;
>-
>-    gl::Error copyTexture(const gl::Context *context,
>-                          const gl::Texture *source,
>-                          GLint sourceLevel,
>-                          const gl::Rectangle &sourceRect,
>-                          GLenum destFormat,
>-                          const gl::Offset &destOffset,
>-                          TextureStorage *storage,
>-                          GLenum destTarget,
>-                          GLint destLevel,
>-                          bool unpackFlipY,
>-                          bool unpackPremultiplyAlpha,
>-                          bool unpackUnmultiplyAlpha) override;
>-    gl::Error copyCompressedTexture(const gl::Context *context,
>-                                    const gl::Texture *source,
>-                                    GLint sourceLevel,
>-                                    TextureStorage *storage,
>-                                    GLint destLevel) override;
>+    angle::Result copyImage2D(const gl::Context *context,
>+                              const gl::Framebuffer *framebuffer,
>+                              const gl::Rectangle &sourceRect,
>+                              GLenum destFormat,
>+                              const gl::Offset &destOffset,
>+                              TextureStorage *storage,
>+                              GLint level) override;
>+    angle::Result copyImageCube(const gl::Context *context,
>+                                const gl::Framebuffer *framebuffer,
>+                                const gl::Rectangle &sourceRect,
>+                                GLenum destFormat,
>+                                const gl::Offset &destOffset,
>+                                TextureStorage *storage,
>+                                gl::TextureTarget target,
>+                                GLint level) override;
>+    angle::Result copyImage3D(const gl::Context *context,
>+                              const gl::Framebuffer *framebuffer,
>+                              const gl::Rectangle &sourceRect,
>+                              GLenum destFormat,
>+                              const gl::Offset &destOffset,
>+                              TextureStorage *storage,
>+                              GLint level) override;
>+    angle::Result copyImage2DArray(const gl::Context *context,
>+                                   const gl::Framebuffer *framebuffer,
>+                                   const gl::Rectangle &sourceRect,
>+                                   GLenum destFormat,
>+                                   const gl::Offset &destOffset,
>+                                   TextureStorage *storage,
>+                                   GLint level) override;
>+
>+    angle::Result copyTexture(const gl::Context *context,
>+                              const gl::Texture *source,
>+                              GLint sourceLevel,
>+                              gl::TextureTarget srcTarget,
>+                              const gl::Box &sourceBox,
>+                              GLenum destFormat,
>+                              GLenum destType,
>+                              const gl::Offset &destOffset,
>+                              TextureStorage *storage,
>+                              gl::TextureTarget destTarget,
>+                              GLint destLevel,
>+                              bool unpackFlipY,
>+                              bool unpackPremultiplyAlpha,
>+                              bool unpackUnmultiplyAlpha) override;
>+    angle::Result copyCompressedTexture(const gl::Context *context,
>+                                        const gl::Texture *source,
>+                                        GLint sourceLevel,
>+                                        TextureStorage *storage,
>+                                        GLint destLevel) override;
> 
>     // RenderTarget creation
>-    gl::Error createRenderTarget(int width,
>-                                 int height,
>-                                 GLenum format,
>-                                 GLsizei samples,
>-                                 RenderTargetD3D **outRT) override;
>-    gl::Error createRenderTargetCopy(RenderTargetD3D *source, RenderTargetD3D **outRT) override;
>+    angle::Result createRenderTarget(const gl::Context *context,
>+                                     int width,
>+                                     int height,
>+                                     GLenum format,
>+                                     GLsizei samples,
>+                                     RenderTargetD3D **outRT) override;
>+    angle::Result createRenderTargetCopy(const gl::Context *context,
>+                                         RenderTargetD3D *source,
>+                                         RenderTargetD3D **outRT) override;
> 
>     // Shader operations
>-    gl::Error loadExecutable(const uint8_t *function,
>-                             size_t length,
>-                             gl::ShaderType type,
>-                             const std::vector<D3DVarying> &streamOutVaryings,
>-                             bool separatedOutputBuffers,
>-                             ShaderExecutableD3D **outExecutable) override;
>-    gl::Error compileToExecutable(gl::InfoLog &infoLog,
>-                                  const std::string &shaderHLSL,
>-                                  gl::ShaderType type,
>-                                  const std::vector<D3DVarying> &streamOutVaryings,
>-                                  bool separatedOutputBuffers,
>-                                  const angle::CompilerWorkaroundsD3D &workarounds,
>-                                  ShaderExecutableD3D **outExectuable) override;
>-    gl::Error ensureHLSLCompilerInitialized() override;
>+    angle::Result loadExecutable(d3d::Context *context,
>+                                 const uint8_t *function,
>+                                 size_t length,
>+                                 gl::ShaderType type,
>+                                 const std::vector<D3DVarying> &streamOutVaryings,
>+                                 bool separatedOutputBuffers,
>+                                 ShaderExecutableD3D **outExecutable) override;
>+    angle::Result compileToExecutable(d3d::Context *context,
>+                                      gl::InfoLog &infoLog,
>+                                      const std::string &shaderHLSL,
>+                                      gl::ShaderType type,
>+                                      const std::vector<D3DVarying> &streamOutVaryings,
>+                                      bool separatedOutputBuffers,
>+                                      const angle::CompilerWorkaroundsD3D &workarounds,
>+                                      ShaderExecutableD3D **outExectuable) override;
>+    angle::Result ensureHLSLCompilerInitialized(d3d::Context *context) override;
> 
>     UniformStorageD3D *createUniformStorage(size_t storageSize) override;
> 
>     // Image operations
>     ImageD3D *createImage() override;
>-    gl::Error generateMipmap(const gl::Context *context, ImageD3D *dest, ImageD3D *source) override;
>-    gl::Error generateMipmapUsingD3D(const gl::Context *context,
>-                                     TextureStorage *storage,
>-                                     const gl::TextureState &textureState) override;
>-    gl::Error copyImage(const gl::Context *context,
>-                        ImageD3D *dest,
>-                        ImageD3D *source,
>-                        const gl::Rectangle &sourceRect,
>-                        const gl::Offset &destOffset,
>-                        bool unpackFlipY,
>-                        bool unpackPremultiplyAlpha,
>-                        bool unpackUnmultiplyAlpha) override;
>+    angle::Result generateMipmap(const gl::Context *context,
>+                                 ImageD3D *dest,
>+                                 ImageD3D *source) override;
>+    angle::Result generateMipmapUsingD3D(const gl::Context *context,
>+                                         TextureStorage *storage,
>+                                         const gl::TextureState &textureState) override;
>+    angle::Result copyImage(const gl::Context *context,
>+                            ImageD3D *dest,
>+                            ImageD3D *source,
>+                            const gl::Box &sourceBox,
>+                            const gl::Offset &destOffset,
>+                            bool unpackFlipY,
>+                            bool unpackPremultiplyAlpha,
>+                            bool unpackUnmultiplyAlpha) override;
>+
>     TextureStorage *createTextureStorage2D(SwapChainD3D *swapChain) override;
>     TextureStorage *createTextureStorageEGLImage(EGLImageD3D *eglImage,
>                                                  RenderTargetD3D *renderTargetD3D) override;
>@@ -294,31 +299,41 @@ class Renderer11 : public RendererD3D
>                                                       int levels,
>                                                       int samples,
>                                                       bool fixedSampleLocations) override;
>+    TextureStorage *createTextureStorage2DMultisampleArray(GLenum internalformat,
>+                                                           GLsizei width,
>+                                                           GLsizei height,
>+                                                           GLsizei depth,
>+                                                           int levels,
>+                                                           int samples,
>+                                                           bool fixedSampleLocations) override;
> 
>     VertexBuffer *createVertexBuffer() override;
>     IndexBuffer *createIndexBuffer() override;
> 
>     // Stream Creation
>-    StreamProducerImpl *createStreamProducerD3DTextureNV12(
>-        egl::Stream::ConsumerType consumerType,
>-        const egl::AttributeMap &attribs) override;
>+    StreamProducerImpl *createStreamProducerD3DTexture(egl::Stream::ConsumerType consumerType,
>+                                                       const egl::AttributeMap &attribs) override;
> 
>     // D3D11-renderer specific methods
>     ID3D11Device *getDevice() { return mDevice; }
>     void *getD3DDevice() override;
>-    ID3D11DeviceContext *getDeviceContext() { return mDeviceContext; };
>-    ID3D11DeviceContext1 *getDeviceContext1IfSupported() { return mDeviceContext1; };
>-    IDXGIFactory *getDxgiFactory() { return mDxgiFactory; };
>-
>-    gl::Error getBlendState(const d3d11::BlendStateKey &key,
>-                            const d3d11::BlendState **outBlendState);
>-    gl::Error getRasterizerState(const gl::RasterizerState &rasterState,
>-                                 bool scissorEnabled,
>-                                 ID3D11RasterizerState **outRasterizerState);
>-    gl::Error getDepthStencilState(const gl::DepthStencilState &dsState,
>-                                   const d3d11::DepthStencilState **outDSState);
>-    gl::Error getSamplerState(const gl::SamplerState &samplerState,
>-                              ID3D11SamplerState **outSamplerState);
>+    ID3D11DeviceContext *getDeviceContext() { return mDeviceContext; }
>+    ID3D11DeviceContext1 *getDeviceContext1IfSupported() { return mDeviceContext1; }
>+    IDXGIFactory *getDxgiFactory() { return mDxgiFactory; }
>+
>+    angle::Result getBlendState(const gl::Context *context,
>+                                const d3d11::BlendStateKey &key,
>+                                const d3d11::BlendState **outBlendState);
>+    angle::Result getRasterizerState(const gl::Context *context,
>+                                     const gl::RasterizerState &rasterState,
>+                                     bool scissorEnabled,
>+                                     ID3D11RasterizerState **outRasterizerState);
>+    angle::Result getDepthStencilState(const gl::Context *context,
>+                                       const gl::DepthStencilState &dsState,
>+                                       const d3d11::DepthStencilState **outDSState);
>+    angle::Result getSamplerState(const gl::Context *context,
>+                                  const gl::SamplerState &samplerState,
>+                                  ID3D11SamplerState **outSamplerState);
> 
>     Blit11 *getBlitter() { return mBlit; }
>     Clear11 *getClearer() { return mClear; }
>@@ -326,52 +341,54 @@ class Renderer11 : public RendererD3D
> 
>     // Buffer-to-texture and Texture-to-buffer copies
>     bool supportsFastCopyBufferToTexture(GLenum internalFormat) const override;
>-    gl::Error fastCopyBufferToTexture(const gl::Context *context,
>-                                      const gl::PixelUnpackState &unpack,
>-                                      unsigned int offset,
>-                                      RenderTargetD3D *destRenderTarget,
>-                                      GLenum destinationFormat,
>-                                      GLenum sourcePixelsType,
>-                                      const gl::Box &destArea) override;
>-
>-    gl::Error packPixels(const TextureHelper11 &textureHelper,
>-                         const PackPixelsParams &params,
>-                         uint8_t *pixelsOut);
>+    angle::Result fastCopyBufferToTexture(const gl::Context *context,
>+                                          const gl::PixelUnpackState &unpack,
>+                                          unsigned int offset,
>+                                          RenderTargetD3D *destRenderTarget,
>+                                          GLenum destinationFormat,
>+                                          GLenum sourcePixelsType,
>+                                          const gl::Box &destArea) override;
>+
>+    angle::Result packPixels(const gl::Context *context,
>+                             const TextureHelper11 &textureHelper,
>+                             const PackPixelsParams &params,
>+                             uint8_t *pixelsOut);
> 
>     bool getLUID(LUID *adapterLuid) const override;
>-    VertexConversionType getVertexConversionType(
>-        gl::VertexFormatType vertexFormatType) const override;
>-    GLenum getVertexComponentType(gl::VertexFormatType vertexFormatType) const override;
>+    VertexConversionType getVertexConversionType(angle::FormatID vertexFormatID) const override;
>+    GLenum getVertexComponentType(angle::FormatID vertexFormatID) const override;
> 
>     // Warning: you should ensure binding really matches attrib.bindingIndex before using this
>     // function.
>-    gl::ErrorOrResult<unsigned int> getVertexSpaceRequired(const gl::VertexAttribute &attrib,
>-                                                           const gl::VertexBinding &binding,
>-                                                           GLsizei count,
>-                                                           GLsizei instances) const override;
>-
>-    gl::Error readFromAttachment(const gl::Context *context,
>-                                 const gl::FramebufferAttachment &srcAttachment,
>-                                 const gl::Rectangle &sourceArea,
>-                                 GLenum format,
>-                                 GLenum type,
>-                                 GLuint outputPitch,
>-                                 const gl::PixelPackState &pack,
>-                                 uint8_t *pixels);
>-
>-    gl::Error blitRenderbufferRect(const gl::Context *context,
>-                                   const gl::Rectangle &readRect,
>-                                   const gl::Rectangle &drawRect,
>-                                   RenderTargetD3D *readRenderTarget,
>-                                   RenderTargetD3D *drawRenderTarget,
>-                                   GLenum filter,
>-                                   const gl::Rectangle *scissor,
>-                                   bool colorBlit,
>-                                   bool depthBlit,
>-                                   bool stencilBlit);
>+    angle::Result getVertexSpaceRequired(const gl::Context *context,
>+                                         const gl::VertexAttribute &attrib,
>+                                         const gl::VertexBinding &binding,
>+                                         size_t count,
>+                                         GLsizei instances,
>+                                         unsigned int *bytesRequiredOut) const override;
>+
>+    angle::Result readFromAttachment(const gl::Context *context,
>+                                     const gl::FramebufferAttachment &srcAttachment,
>+                                     const gl::Rectangle &sourceArea,
>+                                     GLenum format,
>+                                     GLenum type,
>+                                     GLuint outputPitch,
>+                                     const gl::PixelPackState &pack,
>+                                     uint8_t *pixels);
>+
>+    angle::Result blitRenderbufferRect(const gl::Context *context,
>+                                       const gl::Rectangle &readRect,
>+                                       const gl::Rectangle &drawRect,
>+                                       RenderTargetD3D *readRenderTarget,
>+                                       RenderTargetD3D *drawRenderTarget,
>+                                       GLenum filter,
>+                                       const gl::Rectangle *scissor,
>+                                       bool colorBlit,
>+                                       bool depthBlit,
>+                                       bool stencilBlit);
> 
>     bool isES3Capable() const;
>-    const Renderer11DeviceCaps &getRenderer11DeviceCaps() const { return mRenderer11DeviceCaps; };
>+    const Renderer11DeviceCaps &getRenderer11DeviceCaps() const { return mRenderer11DeviceCaps; }
> 
>     RendererClass getRendererClass() const override;
>     StateManager11 *getStateManager() { return &mStateManager; }
>@@ -380,88 +397,108 @@ class Renderer11 : public RendererD3D
>     void onBufferCreate(const Buffer11 *created);
>     void onBufferDelete(const Buffer11 *deleted);
> 
>-    egl::Error getEGLDevice(DeviceImpl **device) override;
>-
>-    gl::Error drawArrays(const gl::Context *context,
>-                         GLenum mode,
>-                         GLint startVertex,
>-                         GLsizei count,
>-                         GLsizei instances);
>-
>-    gl::Error drawElements(const gl::Context *context,
>-                           GLenum mode,
>-                           GLsizei count,
>-                           GLenum type,
>-                           const void *indices,
>-                           GLsizei instances);
>-
>-    gl::Error drawArraysIndirect(const gl::Context *context, GLenum mode, const void *indirect);
>-    gl::Error drawElementsIndirect(const gl::Context *context,
>-                                   GLenum mode,
>-                                   GLenum type,
>-                                   const void *indirect);
>+    DeviceImpl *createEGLDevice() override;
>+
>+    angle::Result drawArrays(const gl::Context *context,
>+                             gl::PrimitiveMode mode,
>+                             GLint firstVertex,
>+                             GLsizei vertexCount,
>+                             GLsizei instanceCount);
>+    angle::Result drawElements(const gl::Context *context,
>+                               gl::PrimitiveMode mode,
>+                               GLint startVertex,
>+                               GLsizei indexCount,
>+                               gl::DrawElementsType indexType,
>+                               const void *indices,
>+                               GLsizei instanceCount);
>+    angle::Result drawArraysIndirect(const gl::Context *context, const void *indirect);
>+    angle::Result drawElementsIndirect(const gl::Context *context, const void *indirect);
> 
>     // Necessary hack for default framebuffers in D3D.
>     FramebufferImpl *createDefaultFramebuffer(const gl::FramebufferState &state) override;
> 
>-    gl::Error getScratchMemoryBuffer(size_t requestedSize, angle::MemoryBuffer **bufferOut);
>+    angle::Result getScratchMemoryBuffer(Context11 *context11,
>+                                         size_t requestedSize,
>+                                         angle::MemoryBuffer **bufferOut);
> 
>     gl::Version getMaxSupportedESVersion() const override;
> 
>-    gl::Error dispatchCompute(const gl::Context *context,
>-                              GLuint numGroupsX,
>-                              GLuint numGroupsY,
>-                              GLuint numGroupsZ);
>-    gl::Error applyComputeShader(const gl::Context *context);
>+    angle::Result dispatchCompute(const gl::Context *context,
>+                                  GLuint numGroupsX,
>+                                  GLuint numGroupsY,
>+                                  GLuint numGroupsZ);
>+    angle::Result dispatchComputeIndirect(const gl::Context *context, GLintptr indirect);
> 
>-    gl::ErrorOrResult<TextureHelper11> createStagingTexture(ResourceType textureType,
>-                                                            const d3d11::Format &formatSet,
>-                                                            const gl::Extents &size,
>-                                                            StagingAccess readAndWriteAccess);
>+    angle::Result createStagingTexture(const gl::Context *context,
>+                                       ResourceType textureType,
>+                                       const d3d11::Format &formatSet,
>+                                       const gl::Extents &size,
>+                                       StagingAccess readAndWriteAccess,
>+                                       TextureHelper11 *textureOut);
> 
>     template <typename DescT, typename ResourceT>
>-    gl::Error allocateResource(const DescT &desc, ResourceT *resourceOut)
>+    angle::Result allocateResource(d3d::Context *context, const DescT &desc, ResourceT *resourceOut)
>     {
>-        return mResourceManager11.allocate(this, &desc, nullptr, resourceOut);
>+        return mResourceManager11.allocate(context, this, &desc, nullptr, resourceOut);
>     }
> 
>     template <typename DescT, typename InitDataT, typename ResourceT>
>-    gl::Error allocateResource(const DescT &desc, InitDataT *initData, ResourceT *resourceOut)
>+    angle::Result allocateResource(d3d::Context *context,
>+                                   const DescT &desc,
>+                                   InitDataT *initData,
>+                                   ResourceT *resourceOut)
>     {
>-        return mResourceManager11.allocate(this, &desc, initData, resourceOut);
>+        return mResourceManager11.allocate(context, this, &desc, initData, resourceOut);
>     }
> 
>     template <typename InitDataT, typename ResourceT>
>-    gl::Error allocateResourceNoDesc(InitDataT *initData, ResourceT *resourceOut)
>+    angle::Result allocateResourceNoDesc(d3d::Context *context,
>+                                         InitDataT *initData,
>+                                         ResourceT *resourceOut)
>     {
>-        return mResourceManager11.allocate(this, nullptr, initData, resourceOut);
>+        return mResourceManager11.allocate(context, this, nullptr, initData, resourceOut);
>     }
> 
>     template <typename DescT>
>-    gl::Error allocateTexture(const DescT &desc,
>-                              const d3d11::Format &format,
>-                              TextureHelper11 *textureOut)
>+    angle::Result allocateTexture(d3d::Context *context,
>+                                  const DescT &desc,
>+                                  const d3d11::Format &format,
>+                                  TextureHelper11 *textureOut)
>     {
>-        return allocateTexture(desc, format, nullptr, textureOut);
>+        return allocateTexture(context, desc, format, nullptr, textureOut);
>     }
> 
>-    gl::Error allocateTexture(const D3D11_TEXTURE2D_DESC &desc,
>-                              const d3d11::Format &format,
>-                              const D3D11_SUBRESOURCE_DATA *initData,
>-                              TextureHelper11 *textureOut);
>+    angle::Result allocateTexture(d3d::Context *context,
>+                                  const D3D11_TEXTURE2D_DESC &desc,
>+                                  const d3d11::Format &format,
>+                                  const D3D11_SUBRESOURCE_DATA *initData,
>+                                  TextureHelper11 *textureOut);
> 
>-    gl::Error allocateTexture(const D3D11_TEXTURE3D_DESC &desc,
>-                              const d3d11::Format &format,
>-                              const D3D11_SUBRESOURCE_DATA *initData,
>-                              TextureHelper11 *textureOut);
>+    angle::Result allocateTexture(d3d::Context *context,
>+                                  const D3D11_TEXTURE3D_DESC &desc,
>+                                  const d3d11::Format &format,
>+                                  const D3D11_SUBRESOURCE_DATA *initData,
>+                                  TextureHelper11 *textureOut);
> 
>-    gl::Error clearRenderTarget(RenderTargetD3D *renderTarget,
>-                                const gl::ColorF &clearColorValue,
>-                                const float clearDepthValue,
>-                                const unsigned int clearStencilValue) override;
>+    angle::Result clearRenderTarget(const gl::Context *context,
>+                                    RenderTargetD3D *renderTarget,
>+                                    const gl::ColorF &clearColorValue,
>+                                    const float clearDepthValue,
>+                                    const unsigned int clearStencilValue) override;
> 
>     bool canSelectViewInVertexShader() const override;
> 
>+    angle::Result mapResource(const gl::Context *context,
>+                              ID3D11Resource *resource,
>+                              UINT subResource,
>+                              D3D11_MAP mapType,
>+                              UINT mapFlags,
>+                              D3D11_MAPPED_SUBRESOURCE *mappedResource);
>+
>+    angle::Result getIncompleteTexture(const gl::Context *context,
>+                                       gl::TextureType type,
>+                                       gl::Texture **textureOut) override;
>+
>   private:
>     void generateCaps(gl::Caps *outCaps,
>                       gl::TextureCapsMap *outTextureCaps,
>@@ -470,34 +507,35 @@ class Renderer11 : public RendererD3D
> 
>     angle::WorkaroundsD3D generateWorkarounds() const override;
> 
>-    gl::Error drawLineLoop(const gl::Context *context,
>-                           GLsizei count,
>-                           GLenum type,
>-                           const void *indices,
>-                           int baseVertex,
>-                           int instances);
>-    gl::Error drawTriangleFan(const gl::Context *context,
>-                              GLsizei count,
>-                              GLenum type,
>-                              const void *indices,
>-                              int baseVertex,
>-                              int instances);
>-
>-    gl::ErrorOrResult<TextureHelper11> resolveMultisampledTexture(const gl::Context *context,
>-                                                                  RenderTarget11 *renderTarget,
>-                                                                  bool depth,
>-                                                                  bool stencil);
>+    angle::Result drawLineLoop(const gl::Context *context,
>+                               GLuint count,
>+                               gl::DrawElementsType type,
>+                               const void *indices,
>+                               int baseVertex,
>+                               int instances);
>+    angle::Result drawTriangleFan(const gl::Context *context,
>+                                  GLuint count,
>+                                  gl::DrawElementsType type,
>+                                  const void *indices,
>+                                  int baseVertex,
>+                                  int instances);
>+
>+    angle::Result resolveMultisampledTexture(const gl::Context *context,
>+                                             RenderTarget11 *renderTarget,
>+                                             bool depth,
>+                                             bool stencil,
>+                                             TextureHelper11 *textureOut);
> 
>     void populateRenderer11DeviceCaps();
> 
>     void updateHistograms();
> 
>-    gl::Error copyImageInternal(const gl::Context *context,
>-                                const gl::Framebuffer *framebuffer,
>-                                const gl::Rectangle &sourceRect,
>-                                GLenum destFormat,
>-                                const gl::Offset &destOffset,
>-                                RenderTargetD3D *destRenderTarget);
>+    angle::Result copyImageInternal(const gl::Context *context,
>+                                    const gl::Framebuffer *framebuffer,
>+                                    const gl::Rectangle &sourceRect,
>+                                    GLenum destFormat,
>+                                    const gl::Offset &destOffset,
>+                                    RenderTargetD3D *destRenderTarget);
> 
>     gl::SupportedSampleSet generateSampleSetForEGLConfig(
>         const gl::TextureCaps &colorBufferFormatCaps,
>@@ -511,7 +549,13 @@ class Renderer11 : public RendererD3D
> 
>     d3d11::ANGLED3D11DeviceType getDeviceType() const;
> 
>-    gl::Error markTransformFeedbackUsage(const gl::Context *context);
>+    // Make sure that the raw buffer is the latest buffer.
>+    angle::Result markRawBufferUsage(const gl::Context *context);
>+    angle::Result markTransformFeedbackUsage(const gl::Context *context);
>+    angle::Result drawWithGeometryShaderAndTransformFeedback(Context11 *context11,
>+                                                             gl::PrimitiveMode mode,
>+                                                             UINT instanceCount,
>+                                                             UINT vertexCount);
> 
>     HMODULE mD3d11Module;
>     HMODULE mDxgiModule;
>@@ -520,7 +564,6 @@ class Renderer11 : public RendererD3D
>     D3D_DRIVER_TYPE mRequestedDriverType;
>     bool mCreateDebugDevice;
>     bool mCreatedWithDeviceEXT;
>-    DeviceD3D *mEGLDevice;
> 
>     HLSLCompiler mCompiler;
> 
>@@ -564,7 +607,7 @@ class Renderer11 : public RendererD3D
> 
>     angle::ScratchBuffer mScratchMemoryBuffer;
> 
>-    gl::DebugAnnotator *mAnnotator;
>+    DebugAnnotator11 mAnnotator;
> 
>     mutable Optional<bool> mSupportsShareHandles;
>     ResourceManager11 mResourceManager11;
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/ResourceManager11.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/ResourceManager11.cpp
>index c228380a344..2506200afad 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/ResourceManager11.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/ResourceManager11.cpp
>@@ -23,6 +23,11 @@ constexpr FLOAT kDebugColorInitClearValue[4] = {0.3f, 0.5f, 0.7f, 0.5f};
> constexpr FLOAT kDebugDepthInitValue         = 0.2f;
> constexpr UINT8 kDebugStencilInitValue       = 3;
> 
>+// A hard limit on buffer size. This works around a problem in the NVIDIA drivers where buffer sizes
>+// close to MAX_UINT would give undefined results. The limit of MAX_UINT/2 should be generous enough
>+// for almost any demanding application.
>+constexpr UINT kMaximumBufferSizeHardLimit = std::numeric_limits<UINT>::max() >> 1;
>+
> uint64_t ComputeMippedMemoryUsage(unsigned int width,
>                                   unsigned int height,
>                                   unsigned int depth,
>@@ -109,6 +114,12 @@ HRESULT CreateResource(ID3D11Device *device,
>                        const D3D11_SUBRESOURCE_DATA *initData,
>                        ID3D11Buffer **buffer)
> {
>+    // Force buffers to be limited to a fixed max size.
>+    if (desc->ByteWidth > kMaximumBufferSizeHardLimit)
>+    {
>+        return E_OUTOFMEMORY;
>+    }
>+
>     return device->CreateBuffer(desc, initData, buffer);
> }
> 
>@@ -210,6 +221,14 @@ HRESULT CreateResource(ID3D11Device *device,
>     return device->CreateShaderResourceView(resource, desc, resourceOut);
> }
> 
>+HRESULT CreateResource(ID3D11Device *device,
>+                       const D3D11_UNORDERED_ACCESS_VIEW_DESC *desc,
>+                       ID3D11Resource *resource,
>+                       ID3D11UnorderedAccessView **resourceOut)
>+{
>+    return device->CreateUnorderedAccessView(resource, desc, resourceOut);
>+}
>+
> HRESULT CreateResource(ID3D11Device *device,
>                        const D3D11_TEXTURE2D_DESC *desc,
>                        const D3D11_SUBRESOURCE_DATA *initData,
>@@ -252,18 +271,22 @@ DXGI_FORMAT GetTypedDepthStencilFormat(DXGI_FORMAT dxgiFormat)
> }
> 
> template <typename DescT, typename ResourceT>
>-gl::Error ClearResource(Renderer11 *renderer, const DescT *desc, ResourceT *texture)
>+angle::Result ClearResource(d3d::Context *context,
>+                            Renderer11 *renderer,
>+                            const DescT *desc,
>+                            ResourceT *texture)
> {
>     // No-op.
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
> template <>
>-gl::Error ClearResource(Renderer11 *renderer,
>-                        const D3D11_TEXTURE2D_DESC *desc,
>-                        ID3D11Texture2D *texture)
>+angle::Result ClearResource(d3d::Context *context,
>+                            Renderer11 *renderer,
>+                            const D3D11_TEXTURE2D_DESC *desc,
>+                            ID3D11Texture2D *texture)
> {
>-    ID3D11DeviceContext *context = renderer->getDeviceContext();
>+    ID3D11DeviceContext *deviceContext = renderer->getDeviceContext();
> 
>     if ((desc->BindFlags & D3D11_BIND_DEPTH_STENCIL) != 0)
>     {
>@@ -289,56 +312,63 @@ gl::Error ClearResource(Renderer11 *renderer,
>             }
> 
>             d3d11::DepthStencilView dsv;
>-            ANGLE_TRY(renderer->allocateResource(dsvDesc, texture, &dsv));
>+            ANGLE_TRY(renderer->allocateResource(context, dsvDesc, texture, &dsv));
> 
>-            context->ClearDepthStencilView(dsv.get(), clearFlags, kDebugDepthInitValue,
>-                                           kDebugStencilInitValue);
>+            deviceContext->ClearDepthStencilView(dsv.get(), clearFlags, kDebugDepthInitValue,
>+                                                 kDebugStencilInitValue);
>         }
>     }
>     else
>     {
>         ASSERT((desc->BindFlags & D3D11_BIND_RENDER_TARGET) != 0);
>         d3d11::RenderTargetView rtv;
>-        ANGLE_TRY(renderer->allocateResourceNoDesc(texture, &rtv));
>+        ANGLE_TRY(renderer->allocateResourceNoDesc(context, texture, &rtv));
> 
>-        context->ClearRenderTargetView(rtv.get(), kDebugColorInitClearValue);
>+        deviceContext->ClearRenderTargetView(rtv.get(), kDebugColorInitClearValue);
>     }
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
> template <>
>-gl::Error ClearResource(Renderer11 *renderer,
>-                        const D3D11_TEXTURE3D_DESC *desc,
>-                        ID3D11Texture3D *texture)
>+angle::Result ClearResource(d3d::Context *context,
>+                            Renderer11 *renderer,
>+                            const D3D11_TEXTURE3D_DESC *desc,
>+                            ID3D11Texture3D *texture)
> {
>-    ID3D11DeviceContext *context = renderer->getDeviceContext();
>+    ID3D11DeviceContext *deviceContext = renderer->getDeviceContext();
> 
>     ASSERT((desc->BindFlags & D3D11_BIND_DEPTH_STENCIL) == 0);
>     ASSERT((desc->BindFlags & D3D11_BIND_RENDER_TARGET) != 0);
> 
>     d3d11::RenderTargetView rtv;
>-    ANGLE_TRY(renderer->allocateResourceNoDesc(texture, &rtv));
>+    ANGLE_TRY(renderer->allocateResourceNoDesc(context, texture, &rtv));
> 
>-    context->ClearRenderTargetView(rtv.get(), kDebugColorInitClearValue);
>-    return gl::NoError();
>+    deviceContext->ClearRenderTargetView(rtv.get(), kDebugColorInitClearValue);
>+    return angle::Result::Continue;
> }
> 
>-#define ANGLE_RESOURCE_STRINGIFY_OP(NAME, RESTYPE, D3D11TYPE, DESCTYPE, INITDATATYPE) #RESTYPE,
>+#define ANGLE_RESOURCE_STRINGIFY_OP(NAME, RESTYPE, D3D11TYPE, DESCTYPE, INITDATATYPE) \
>+    "Error allocating " #RESTYPE,
> 
>-constexpr std::array<const char *, NumResourceTypes> kResourceTypeNames = {
>+constexpr std::array<const char *, NumResourceTypes> kResourceTypeErrors = {
>     {ANGLE_RESOURCE_TYPE_OP(Stringify, ANGLE_RESOURCE_STRINGIFY_OP)}};
>-static_assert(kResourceTypeNames[NumResourceTypes - 1] != nullptr,
>+static_assert(kResourceTypeErrors[NumResourceTypes - 1] != nullptr,
>               "All members must be initialized.");
> 
> }  // anonymous namespace
> 
> // ResourceManager11 Implementation.
>-ResourceManager11::ResourceManager11()
>-    : mInitializeAllocations(false),
>-      mAllocatedResourceCounts({{}}),
>-      mAllocatedResourceDeviceMemory({{}})
>+ResourceManager11::ResourceManager11() : mInitializeAllocations(false)
> {
>+    for (auto &count : mAllocatedResourceCounts)
>+    {
>+        count = 0;
>+    }
>+    for (auto &memorySize : mAllocatedResourceDeviceMemory)
>+    {
>+        memorySize = 0;
>+    }
> }
> 
> ResourceManager11::~ResourceManager11()
>@@ -355,10 +385,11 @@ ResourceManager11::~ResourceManager11()
> }
> 
> template <typename T>
>-gl::Error ResourceManager11::allocate(Renderer11 *renderer,
>-                                      const GetDescFromD3D11<T> *desc,
>-                                      GetInitDataFromD3D11<T> *initData,
>-                                      Resource11<T> *resourceOut)
>+angle::Result ResourceManager11::allocate(d3d::Context *context,
>+                                          Renderer11 *renderer,
>+                                          const GetDescFromD3D11<T> *desc,
>+                                          GetInitDataFromD3D11<T> *initData,
>+                                          Resource11<T> *resourceOut)
> {
>     ID3D11Device *device = renderer->getDevice();
>     T *resource          = nullptr;
>@@ -370,27 +401,17 @@ gl::Error ResourceManager11::allocate(Renderer11 *renderer,
>     }
> 
>     HRESULT hr = CreateResource(device, desc, shadowInitData, &resource);
>-    if (FAILED(hr))
>-    {
>-        ASSERT(!resource);
>-        if (d3d11::isDeviceLostError(hr))
>-        {
>-            renderer->notifyDeviceLost();
>-        }
>-        return gl::OutOfMemory() << "Error allocating "
>-                                 << std::string(kResourceTypeNames[ResourceTypeIndex<T>()]) << ". "
>-                                 << gl::FmtHR(hr);
>-    }
>+    ANGLE_TRY_HR(context, hr, kResourceTypeErrors[ResourceTypeIndex<T>()]);
> 
>     if (!shadowInitData && mInitializeAllocations)
>     {
>-        ANGLE_TRY(ClearResource(renderer, desc, resource));
>+        ANGLE_TRY(ClearResource(context, renderer, desc, resource));
>     }
> 
>     ASSERT(resource);
>     incrResource(GetResourceTypeFromD3D11<T>(), ComputeMemoryUsage(desc));
>     *resourceOut = std::move(Resource11<T>(resource, this));
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
> void ResourceManager11::incrResource(ResourceType resourceType, uint64_t memorySize)
>@@ -522,12 +543,10 @@ void ResourceManager11::setAllocationsInitialized(bool initialize)
>     mInitializeAllocations = initialize;
> }
> 
>-#define ANGLE_INSTANTIATE_OP(NAME, RESTYPE, D3D11TYPE, DESCTYPE, INITDATATYPE)  \
>-    \
>-template \
>-gl::Error                                                                       \
>-    ResourceManager11::allocate(Renderer11 *, const DESCTYPE *, INITDATATYPE *, \
>-                                Resource11<D3D11TYPE> *);
>+#define ANGLE_INSTANTIATE_OP(NAME, RESTYPE, D3D11TYPE, DESCTYPE, INITDATATYPE) \
>+                                                                               \
>+    template angle::Result ResourceManager11::allocate(                        \
>+        d3d::Context *, Renderer11 *, const DESCTYPE *, INITDATATYPE *, Resource11<D3D11TYPE> *);
> 
> ANGLE_RESOURCE_TYPE_OP(Instantitate, ANGLE_INSTANTIATE_OP)
> }  // namespace rx
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/ResourceManager11.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/ResourceManager11.h
>index 0bdde9f8b6b..e794c358e9d 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/ResourceManager11.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/ResourceManager11.h
>@@ -10,6 +10,7 @@
> #define LIBANGLE_RENDERER_D3D_D3D11_RESOURCEFACTORY11_H_
> 
> #include <array>
>+#include <atomic>
> #include <memory>
> 
> #include "common/MemoryBuffer.h"
>@@ -32,6 +33,11 @@ HRESULT SetDebugName(angle::ComPtr<T> &resource, const char *name)
> }
> }  // namespace d3d11
> 
>+namespace d3d
>+{
>+class Context;
>+}  // namespace d3d
>+
> class Renderer11;
> class ResourceManager11;
> template <typename T>
>@@ -42,26 +48,28 @@ using InputElementArray = WrappedArray<D3D11_INPUT_ELEMENT_DESC>;
> using ShaderData        = WrappedArray<uint8_t>;
> 
> // Format: ResourceType, D3D11 type, DESC type, init data type.
>-#define ANGLE_RESOURCE_TYPE_OP(NAME, OP)                                                     \
>-    OP(NAME, BlendState, ID3D11BlendState, D3D11_BLEND_DESC, void)                           \
>-    OP(NAME, Buffer, ID3D11Buffer, D3D11_BUFFER_DESC, const D3D11_SUBRESOURCE_DATA)          \
>-    OP(NAME, ComputeShader, ID3D11ComputeShader, ShaderData, void)                           \
>-    OP(NAME, DepthStencilState, ID3D11DepthStencilState, D3D11_DEPTH_STENCIL_DESC, void)     \
>-    OP(NAME, DepthStencilView, ID3D11DepthStencilView, D3D11_DEPTH_STENCIL_VIEW_DESC,        \
>-       ID3D11Resource)                                                                       \
>-    OP(NAME, GeometryShader, ID3D11GeometryShader, ShaderData,                               \
>-       const std::vector<D3D11_SO_DECLARATION_ENTRY>)                                        \
>-    OP(NAME, InputLayout, ID3D11InputLayout, InputElementArray, const ShaderData)            \
>-    OP(NAME, PixelShader, ID3D11PixelShader, ShaderData, void)                               \
>-    OP(NAME, Query, ID3D11Query, D3D11_QUERY_DESC, void)                                     \
>-    OP(NAME, RasterizerState, ID3D11RasterizerState, D3D11_RASTERIZER_DESC, void)            \
>-    OP(NAME, RenderTargetView, ID3D11RenderTargetView, D3D11_RENDER_TARGET_VIEW_DESC,        \
>-       ID3D11Resource)                                                                       \
>-    OP(NAME, SamplerState, ID3D11SamplerState, D3D11_SAMPLER_DESC, void)                     \
>-    OP(NAME, ShaderResourceView, ID3D11ShaderResourceView, D3D11_SHADER_RESOURCE_VIEW_DESC,  \
>-       ID3D11Resource)                                                                       \
>-    OP(NAME, Texture2D, ID3D11Texture2D, D3D11_TEXTURE2D_DESC, const D3D11_SUBRESOURCE_DATA) \
>-    OP(NAME, Texture3D, ID3D11Texture3D, D3D11_TEXTURE3D_DESC, const D3D11_SUBRESOURCE_DATA) \
>+#define ANGLE_RESOURCE_TYPE_OP(NAME, OP)                                                       \
>+    OP(NAME, BlendState, ID3D11BlendState, D3D11_BLEND_DESC, void)                             \
>+    OP(NAME, Buffer, ID3D11Buffer, D3D11_BUFFER_DESC, const D3D11_SUBRESOURCE_DATA)            \
>+    OP(NAME, ComputeShader, ID3D11ComputeShader, ShaderData, void)                             \
>+    OP(NAME, DepthStencilState, ID3D11DepthStencilState, D3D11_DEPTH_STENCIL_DESC, void)       \
>+    OP(NAME, DepthStencilView, ID3D11DepthStencilView, D3D11_DEPTH_STENCIL_VIEW_DESC,          \
>+       ID3D11Resource)                                                                         \
>+    OP(NAME, GeometryShader, ID3D11GeometryShader, ShaderData,                                 \
>+       const std::vector<D3D11_SO_DECLARATION_ENTRY>)                                          \
>+    OP(NAME, InputLayout, ID3D11InputLayout, InputElementArray, const ShaderData)              \
>+    OP(NAME, PixelShader, ID3D11PixelShader, ShaderData, void)                                 \
>+    OP(NAME, Query, ID3D11Query, D3D11_QUERY_DESC, void)                                       \
>+    OP(NAME, RasterizerState, ID3D11RasterizerState, D3D11_RASTERIZER_DESC, void)              \
>+    OP(NAME, RenderTargetView, ID3D11RenderTargetView, D3D11_RENDER_TARGET_VIEW_DESC,          \
>+       ID3D11Resource)                                                                         \
>+    OP(NAME, SamplerState, ID3D11SamplerState, D3D11_SAMPLER_DESC, void)                       \
>+    OP(NAME, ShaderResourceView, ID3D11ShaderResourceView, D3D11_SHADER_RESOURCE_VIEW_DESC,    \
>+       ID3D11Resource)                                                                         \
>+    OP(NAME, UnorderedAccessView, ID3D11UnorderedAccessView, D3D11_UNORDERED_ACCESS_VIEW_DESC, \
>+       ID3D11Resource)                                                                         \
>+    OP(NAME, Texture2D, ID3D11Texture2D, D3D11_TEXTURE2D_DESC, const D3D11_SUBRESOURCE_DATA)   \
>+    OP(NAME, Texture3D, ID3D11Texture3D, D3D11_TEXTURE3D_DESC, const D3D11_SUBRESOURCE_DATA)   \
>     OP(NAME, VertexShader, ID3D11VertexShader, ShaderData, void)
> 
> #define ANGLE_RESOURCE_TYPE_LIST(NAME, RESTYPE, D3D11TYPE, DESCTYPE, INITDATATYPE) RESTYPE,
>@@ -81,22 +89,25 @@ constexpr size_t ResourceTypeIndex(ResourceType resourceType)
> constexpr size_t NumResourceTypes = ResourceTypeIndex(ResourceType::Last);
> 
> #define ANGLE_RESOURCE_TYPE_TO_D3D11(NAME, RESTYPE, D3D11TYPE, DESCTYPE, INITDATATYPE) \
>-    \
>-template<> struct NAME<ResourceType::RESTYPE>                                          \
>+                                                                                       \
>+    template <>                                                                        \
>+    struct NAME<ResourceType::RESTYPE>                                                 \
>     {                                                                                  \
>         using Value = D3D11TYPE;                                                       \
>     };
> 
> #define ANGLE_RESOURCE_TYPE_TO_DESC(NAME, RESTYPE, D3D11TYPE, DESCTYPE, INITDATATYPE) \
>-    \
>-template<> struct NAME<ResourceType::RESTYPE>                                         \
>+                                                                                      \
>+    template <>                                                                       \
>+    struct NAME<ResourceType::RESTYPE>                                                \
>     {                                                                                 \
>         using Value = DESCTYPE;                                                       \
>     };
> 
> #define ANGLE_RESOURCE_TYPE_TO_INIT_DATA(NAME, RESTYPE, D3D11TYPE, DESCTYPE, INITDATATYPE) \
>-    \
>-template<> struct NAME<ResourceType::RESTYPE>                                              \
>+                                                                                           \
>+    template <>                                                                            \
>+    struct NAME<ResourceType::RESTYPE>                                                     \
>     {                                                                                      \
>         using Value = INITDATATYPE;                                                        \
>     };
>@@ -105,12 +116,13 @@ template<> struct NAME<ResourceType::RESTYPE>
>     template <ResourceType Param>             \
>     struct NAME;                              \
>     ANGLE_RESOURCE_TYPE_OP(NAME, OP)          \
>-    \
>-template<ResourceType Param> struct NAME      \
>-    {                                         \
>-    };                                        \
>-    \
>-template<ResourceType Param> using Get##NAME = typename NAME<Param>::Value;
>+                                              \
>+    template <ResourceType Param>             \
>+    struct NAME                               \
>+    {};                                       \
>+                                              \
>+    template <ResourceType Param>             \
>+    using Get##NAME = typename NAME<Param>::Value;
> 
> ANGLE_RESOURCE_TYPE_TO_TYPE(D3D11Type, ANGLE_RESOURCE_TYPE_TO_D3D11)
> ANGLE_RESOURCE_TYPE_TO_TYPE(DescType, ANGLE_RESOURCE_TYPE_TO_DESC)
>@@ -121,23 +133,25 @@ ANGLE_RESOURCE_TYPE_TO_TYPE(InitDataType, ANGLE_RESOURCE_TYPE_TO_INIT_DATA)
> #undef ANGLE_RESOURCE_TYPE_TO_INIT_DATA
> #undef ANGLE_RESOURCE_TYPE_TO_TYPE
> 
>-#define ANGLE_TYPE_TO_RESOURCE_TYPE(NAME, OP)               \
>-    template <typename Param>                               \
>-    struct NAME;                                            \
>-    ANGLE_RESOURCE_TYPE_OP(NAME, OP)                        \
>-    \
>-template<typename Param> struct NAME                        \
>-    {                                                       \
>-    };                                                      \
>-    \
>-template<typename Param> constexpr ResourceType Get##NAME() \
>-    {                                                       \
>-        return NAME<Param>::Value;                          \
>+#define ANGLE_TYPE_TO_RESOURCE_TYPE(NAME, OP) \
>+    template <typename Param>                 \
>+    struct NAME;                              \
>+    ANGLE_RESOURCE_TYPE_OP(NAME, OP)          \
>+                                              \
>+    template <typename Param>                 \
>+    struct NAME                               \
>+    {};                                       \
>+                                              \
>+    template <typename Param>                 \
>+    constexpr ResourceType Get##NAME()        \
>+    {                                         \
>+        return NAME<Param>::Value;            \
>     }
> 
> #define ANGLE_D3D11_TO_RESOURCE_TYPE(NAME, RESTYPE, D3D11TYPE, DESCTYPE, INITDATATYPE) \
>-    \
>-template<> struct NAME<D3D11TYPE>                                                      \
>+                                                                                       \
>+    template <>                                                                        \
>+    struct NAME<D3D11TYPE>                                                             \
>     {                                                                                  \
>         static constexpr ResourceType Value = ResourceType::RESTYPE;                   \
>     };
>@@ -229,8 +243,7 @@ class Resource11 : public Resource11Base<ResourceT, UniquePtr, TypedData<Resourc
>     Resource11() {}
>     Resource11(Resource11 &&other)
>         : Resource11Base<ResourceT, UniquePtr, TypedData<ResourceT>>(std::move(other))
>-    {
>-    }
>+    {}
>     Resource11 &operator=(Resource11 &&other)
>     {
>         std::swap(this->mData, other.mData);
>@@ -256,8 +269,7 @@ class SharedResource11 : public Resource11Base<T, std::shared_ptr, TypedData<T>>
>     SharedResource11() {}
>     SharedResource11(SharedResource11 &&movedObj)
>         : Resource11Base<T, std::shared_ptr, TypedData<T>>(std::move(movedObj))
>-    {
>-    }
>+    {}
> 
>     SharedResource11 &operator=(SharedResource11 &&other)
>     {
>@@ -292,21 +304,23 @@ class ResourceManager11 final : angle::NonCopyable
>     ~ResourceManager11();
> 
>     template <typename T>
>-    gl::Error allocate(Renderer11 *renderer,
>-                       const GetDescFromD3D11<T> *desc,
>-                       GetInitDataFromD3D11<T> *initData,
>-                       Resource11<T> *resourceOut);
>+    angle::Result allocate(d3d::Context *context,
>+                           Renderer11 *renderer,
>+                           const GetDescFromD3D11<T> *desc,
>+                           GetInitDataFromD3D11<T> *initData,
>+                           Resource11<T> *resourceOut);
> 
>     template <typename T>
>-    gl::Error allocate(Renderer11 *renderer,
>-                       const GetDescFromD3D11<T> *desc,
>-                       GetInitDataFromD3D11<T> *initData,
>-                       SharedResource11<T> *sharedRes)
>+    angle::Result allocate(d3d::Context *context,
>+                           Renderer11 *renderer,
>+                           const GetDescFromD3D11<T> *desc,
>+                           GetInitDataFromD3D11<T> *initData,
>+                           SharedResource11<T> *sharedRes)
>     {
>         Resource11<T> res;
>-        ANGLE_TRY(allocate(renderer, desc, initData, &res));
>+        ANGLE_TRY(allocate(context, renderer, desc, initData, &res));
>         *sharedRes = std::move(res);
>-        return gl::NoError();
>+        return angle::Result::Continue;
>     }
> 
>     template <typename T>
>@@ -328,8 +342,8 @@ class ResourceManager11 final : angle::NonCopyable
> 
>     bool mInitializeAllocations;
> 
>-    std::array<size_t, NumResourceTypes> mAllocatedResourceCounts;
>-    std::array<uint64_t, NumResourceTypes> mAllocatedResourceDeviceMemory;
>+    std::array<std::atomic_size_t, NumResourceTypes> mAllocatedResourceCounts;
>+    std::array<std::atomic_uint64_t, NumResourceTypes> mAllocatedResourceDeviceMemory;
>     angle::MemoryBuffer mZeroMemory;
> 
>     std::vector<D3D11_SUBRESOURCE_DATA> mShadowInitData;
>@@ -357,6 +371,7 @@ namespace d3d11
> ANGLE_RESOURCE_TYPE_OP(ClassList, ANGLE_RESOURCE_TYPE_CLASS)
> 
> using SharedSRV = SharedResource11<ID3D11ShaderResourceView>;
>+using SharedUAV = SharedResource11<ID3D11UnorderedAccessView>;
> }  // namespace d3d11
> 
> #undef ANGLE_RESOURCE_TYPE_CLASS
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/ShaderExecutable11.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/ShaderExecutable11.cpp
>index 73a530add02..af910e1464c 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/ShaderExecutable11.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/ShaderExecutable11.cpp
>@@ -8,6 +8,9 @@
> // executable implementation details.
> 
> #include "libANGLE/renderer/d3d/d3d11/ShaderExecutable11.h"
>+
>+#include "libANGLE/Context.h"
>+#include "libANGLE/renderer/d3d/d3d11/Context11.h"
> #include "libANGLE/renderer/d3d/d3d11/Renderer11.h"
> 
> namespace rx
>@@ -22,8 +25,7 @@ ShaderExecutable11::ShaderExecutable11(const void *function,
>       mGeometryExecutable(),
>       mStreamOutExecutable(),
>       mComputeExecutable()
>-{
>-}
>+{}
> 
> ShaderExecutable11::ShaderExecutable11(const void *function,
>                                        size_t length,
>@@ -35,8 +37,7 @@ ShaderExecutable11::ShaderExecutable11(const void *function,
>       mGeometryExecutable(),
>       mStreamOutExecutable(std::move(streamOut)),
>       mComputeExecutable()
>-{
>-}
>+{}
> 
> ShaderExecutable11::ShaderExecutable11(const void *function,
>                                        size_t length,
>@@ -47,8 +48,7 @@ ShaderExecutable11::ShaderExecutable11(const void *function,
>       mGeometryExecutable(std::move(executable)),
>       mStreamOutExecutable(),
>       mComputeExecutable()
>-{
>-}
>+{}
> 
> ShaderExecutable11::ShaderExecutable11(const void *function,
>                                        size_t length,
>@@ -59,12 +59,9 @@ ShaderExecutable11::ShaderExecutable11(const void *function,
>       mGeometryExecutable(),
>       mStreamOutExecutable(),
>       mComputeExecutable(std::move(executable))
>-{
>-}
>+{}
> 
>-ShaderExecutable11::~ShaderExecutable11()
>-{
>-}
>+ShaderExecutable11::~ShaderExecutable11() {}
> 
> const d3d11::VertexShader &ShaderExecutable11::getVertexShader() const
> {
>@@ -93,14 +90,13 @@ const d3d11::ComputeShader &ShaderExecutable11::getComputeShader() const
> 
> UniformStorage11::UniformStorage11(size_t initialSize)
>     : UniformStorageD3D(initialSize), mConstantBuffer()
>-{
>-}
>+{}
> 
>-UniformStorage11::~UniformStorage11()
>-{
>-}
>+UniformStorage11::~UniformStorage11() {}
> 
>-gl::Error UniformStorage11::getConstantBuffer(Renderer11 *renderer, const d3d11::Buffer **bufferOut)
>+angle::Result UniformStorage11::getConstantBuffer(const gl::Context *context,
>+                                                  Renderer11 *renderer,
>+                                                  const d3d11::Buffer **bufferOut)
> {
>     if (size() > 0 && !mConstantBuffer.valid())
>     {
>@@ -109,11 +105,12 @@ gl::Error UniformStorage11::getConstantBuffer(Renderer11 *renderer, const d3d11:
>         desc.Usage             = D3D11_USAGE_DEFAULT;
>         desc.BindFlags         = D3D11_BIND_CONSTANT_BUFFER;
> 
>-        ANGLE_TRY(renderer->allocateResource(desc, &mConstantBuffer));
>+        ANGLE_TRY(
>+            renderer->allocateResource(GetImplAs<Context11>(context), desc, &mConstantBuffer));
>     }
> 
>     *bufferOut = &mConstantBuffer;
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
> }  // namespace rx
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/ShaderExecutable11.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/ShaderExecutable11.h
>index 3f417578a37..e2892a44d79 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/ShaderExecutable11.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/ShaderExecutable11.h
>@@ -51,7 +51,9 @@ class UniformStorage11 : public UniformStorageD3D
>     UniformStorage11(size_t initialSize);
>     ~UniformStorage11() override;
> 
>-    gl::Error getConstantBuffer(Renderer11 *renderer, const d3d11::Buffer **bufferOut);
>+    angle::Result getConstantBuffer(const gl::Context *context,
>+                                    Renderer11 *renderer,
>+                                    const d3d11::Buffer **bufferOut);
> 
>   private:
>     d3d11::Buffer mConstantBuffer;
>@@ -59,4 +61,4 @@ class UniformStorage11 : public UniformStorageD3D
> 
> }  // namespace rx
> 
>-#endif // LIBANGLE_RENDERER_D3D_D3D11_SHADEREXECUTABLE11_H_
>+#endif  // LIBANGLE_RENDERER_D3D_D3D11_SHADEREXECUTABLE11_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/StateManager11.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/StateManager11.cpp
>index e9902d3f143..cce51910797 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/StateManager11.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/StateManager11.cpp
>@@ -8,11 +8,14 @@
> 
> #include "libANGLE/renderer/d3d/d3d11/StateManager11.h"
> 
>+#include "common/angleutils.h"
> #include "common/bitset_utils.h"
>+#include "common/mathutil.h"
> #include "common/utilities.h"
> #include "libANGLE/Context.h"
> #include "libANGLE/Query.h"
> #include "libANGLE/VertexArray.h"
>+#include "libANGLE/renderer/d3d/DisplayD3D.h"
> #include "libANGLE/renderer/d3d/TextureD3D.h"
> #include "libANGLE/renderer/d3d/d3d11/Buffer11.h"
> #include "libANGLE/renderer/d3d/d3d11/Context11.h"
>@@ -24,6 +27,7 @@
> #include "libANGLE/renderer/d3d/d3d11/TextureStorage11.h"
> #include "libANGLE/renderer/d3d/d3d11/TransformFeedback11.h"
> #include "libANGLE/renderer/d3d/d3d11/VertexArray11.h"
>+#include "libANGLE/renderer/d3d/d3d11/VertexBuffer11.h"
> 
> namespace rx
> {
>@@ -32,9 +36,8 @@ namespace
> {
> bool ImageIndexConflictsWithSRV(const gl::ImageIndex &index, D3D11_SHADER_RESOURCE_VIEW_DESC desc)
> {
>-    unsigned mipLevel   = index.mipIndex;
>-    GLint layerIndex    = index.layerIndex;
>-    GLenum type         = index.type;
>+    unsigned mipLevel           = index.getLevelIndex();
>+    gl::TextureType textureType = index.getType();
> 
>     switch (desc.ViewDimension)
>     {
>@@ -44,16 +47,18 @@ bool ImageIndexConflictsWithSRV(const gl::ImageIndex &index, D3D11_SHADER_RESOUR
>             unsigned int maxSrvMip = desc.Texture2D.MipLevels + desc.Texture2D.MostDetailedMip;
>             maxSrvMip              = allLevels ? INT_MAX : maxSrvMip;
> 
>-            unsigned mipMin = index.mipIndex;
>-            unsigned mipMax = (layerIndex == -1) ? INT_MAX : layerIndex;
>+            unsigned mipMin = index.getLevelIndex();
>+            unsigned mipMax = INT_MAX;
> 
>-            return type == GL_TEXTURE_2D &&
>+            return textureType == gl::TextureType::_2D &&
>                    gl::RangeUI(mipMin, mipMax)
>                        .intersects(gl::RangeUI(desc.Texture2D.MostDetailedMip, maxSrvMip));
>         }
> 
>         case D3D11_SRV_DIMENSION_TEXTURE2DARRAY:
>         {
>+            GLint layerIndex = index.getLayerIndex();
>+
>             bool allLevels = (desc.Texture2DArray.MipLevels == std::numeric_limits<UINT>::max());
>             unsigned int maxSrvMip =
>                 desc.Texture2DArray.MipLevels + desc.Texture2DArray.MostDetailedMip;
>@@ -62,7 +67,8 @@ bool ImageIndexConflictsWithSRV(const gl::ImageIndex &index, D3D11_SHADER_RESOUR
>             unsigned maxSlice = desc.Texture2DArray.FirstArraySlice + desc.Texture2DArray.ArraySize;
> 
>             // Cube maps can be mapped to Texture2DArray SRVs
>-            return (type == GL_TEXTURE_2D_ARRAY || gl::IsCubeMapTextureTarget(type)) &&
>+            return (textureType == gl::TextureType::_2DArray ||
>+                    textureType == gl::TextureType::CubeMap) &&
>                    desc.Texture2DArray.MostDetailedMip <= mipLevel && mipLevel < maxSrvMip &&
>                    desc.Texture2DArray.FirstArraySlice <= static_cast<UINT>(layerIndex) &&
>                    static_cast<UINT>(layerIndex) < maxSlice;
>@@ -74,7 +80,7 @@ bool ImageIndexConflictsWithSRV(const gl::ImageIndex &index, D3D11_SHADER_RESOUR
>             unsigned int maxSrvMip = desc.TextureCube.MipLevels + desc.TextureCube.MostDetailedMip;
>             maxSrvMip              = allLevels ? INT_MAX : maxSrvMip;
> 
>-            return gl::IsCubeMapTextureTarget(type) &&
>+            return textureType == gl::TextureType::CubeMap &&
>                    desc.TextureCube.MostDetailedMip <= mipLevel && mipLevel < maxSrvMip;
>         }
> 
>@@ -84,8 +90,8 @@ bool ImageIndexConflictsWithSRV(const gl::ImageIndex &index, D3D11_SHADER_RESOUR
>             unsigned int maxSrvMip = desc.Texture3D.MipLevels + desc.Texture3D.MostDetailedMip;
>             maxSrvMip              = allLevels ? INT_MAX : maxSrvMip;
> 
>-            return type == GL_TEXTURE_3D && desc.Texture3D.MostDetailedMip <= mipLevel &&
>-                   mipLevel < maxSrvMip;
>+            return textureType == gl::TextureType::_3D &&
>+                   desc.Texture3D.MostDetailedMip <= mipLevel && mipLevel < maxSrvMip;
>         }
>         default:
>             // We only handle the cases corresponding to valid image indexes
>@@ -110,10 +116,12 @@ int GetWrapBits(GLenum wrap)
>     switch (wrap)
>     {
>         case GL_CLAMP_TO_EDGE:
>-            return 0x1;
>+            return 0x0;
>         case GL_REPEAT:
>-            return 0x2;
>+            return 0x1;
>         case GL_MIRRORED_REPEAT:
>+            return 0x2;
>+        case GL_CLAMP_TO_BORDER:
>             return 0x3;
>         default:
>             UNREACHABLE();
>@@ -135,7 +143,7 @@ Optional<size_t> FindFirstNonInstanced(
>     return Optional<size_t>::Invalid();
> }
> 
>-void SortAttributesByLayout(const gl::Program *program,
>+void SortAttributesByLayout(const ProgramD3D &programD3D,
>                             const std::vector<TranslatedAttribute> &vertexArrayAttribs,
>                             const std::vector<TranslatedAttribute> &currentValueAttribs,
>                             AttribIndexArray *sortedD3DSemanticsOut,
>@@ -143,10 +151,9 @@ void SortAttributesByLayout(const gl::Program *program,
> {
>     sortedAttributesOut->clear();
> 
>-    const auto &locationToSemantic =
>-        GetImplAs<ProgramD3D>(program)->getAttribLocationToD3DSemantics();
>+    const AttribIndexArray &locationToSemantic = programD3D.getAttribLocationToD3DSemantics();
> 
>-    for (auto locationIndex : program->getActiveAttribLocationsMask())
>+    for (auto locationIndex : programD3D.getState().getActiveAttribLocationsMask())
>     {
>         int d3dSemantic = locationToSemantic[locationIndex];
>         if (sortedAttributesOut->size() <= static_cast<size_t>(d3dSemantic))
>@@ -177,110 +184,136 @@ void UpdateUniformBuffer(ID3D11DeviceContext *deviceContext,
>                                      0);
> }
> 
>-}  // anonymous namespace
>-
>-// StateManager11::SRVCache Implementation.
>-
>-StateManager11::SRVCache::SRVCache() : mHighestUsedSRV(0)
>+size_t GetReservedBufferCount(bool usesPointSpriteEmulation)
> {
>+    return usesPointSpriteEmulation ? 1 : 0;
> }
> 
>-StateManager11::SRVCache::~SRVCache()
>+bool CullsEverything(const gl::State &glState)
> {
>+    return (glState.getRasterizerState().cullFace &&
>+            glState.getRasterizerState().cullMode == gl::CullFaceMode::FrontAndBack);
> }
>+}  // anonymous namespace
>+
>+// StateManager11::ViewCache Implementation.
>+template <typename ViewType, typename DescType>
>+StateManager11::ViewCache<ViewType, DescType>::ViewCache() : mHighestUsedView(0)
>+{}
> 
>-void StateManager11::SRVCache::update(size_t resourceIndex, ID3D11ShaderResourceView *srv)
>+template <typename ViewType, typename DescType>
>+StateManager11::ViewCache<ViewType, DescType>::~ViewCache()
>+{}
>+
>+template <typename ViewType, typename DescType>
>+void StateManager11::ViewCache<ViewType, DescType>::update(size_t resourceIndex, ViewType *view)
> {
>-    ASSERT(resourceIndex < mCurrentSRVs.size());
>-    SRVRecord *record = &mCurrentSRVs[resourceIndex];
>+    ASSERT(resourceIndex < mCurrentViews.size());
>+    ViewRecord<DescType> *record = &mCurrentViews[resourceIndex];
> 
>-    record->srv = reinterpret_cast<uintptr_t>(srv);
>-    if (srv)
>+    record->view = reinterpret_cast<uintptr_t>(view);
>+    if (view)
>     {
>-        record->resource = reinterpret_cast<uintptr_t>(GetViewResource(srv));
>-        srv->GetDesc(&record->desc);
>-        mHighestUsedSRV = std::max(resourceIndex + 1, mHighestUsedSRV);
>+        record->resource = reinterpret_cast<uintptr_t>(GetViewResource(view));
>+        view->GetDesc(&record->desc);
>+        mHighestUsedView = std::max(resourceIndex + 1, mHighestUsedView);
>     }
>     else
>     {
>         record->resource = 0;
> 
>-        if (resourceIndex + 1 == mHighestUsedSRV)
>+        if (resourceIndex + 1 == mHighestUsedView)
>         {
>             do
>             {
>-                --mHighestUsedSRV;
>-            } while (mHighestUsedSRV > 0 && mCurrentSRVs[mHighestUsedSRV].srv == 0);
>+                --mHighestUsedView;
>+            } while (mHighestUsedView > 0 && mCurrentViews[mHighestUsedView].view == 0);
>         }
>     }
> }
> 
>-void StateManager11::SRVCache::clear()
>+template <typename ViewType, typename DescType>
>+void StateManager11::ViewCache<ViewType, DescType>::clear()
> {
>-    if (mCurrentSRVs.empty())
>+    if (mCurrentViews.empty())
>     {
>         return;
>     }
> 
>-    memset(&mCurrentSRVs[0], 0, sizeof(SRVRecord) * mCurrentSRVs.size());
>-    mHighestUsedSRV = 0;
>+    memset(&mCurrentViews[0], 0, sizeof(ViewRecord<DescType>) * mCurrentViews.size());
>+    mHighestUsedView = 0;
> }
> 
>-// ShaderConstants11 implementation
>-
>-ShaderConstants11::ShaderConstants11()
>-    : mVertexDirty(true),
>-      mPixelDirty(true),
>-      mComputeDirty(true),
>-      mSamplerMetadataVSDirty(true),
>-      mSamplerMetadataPSDirty(true),
>-      mSamplerMetadataCSDirty(true)
>+StateManager11::SRVCache *StateManager11::getSRVCache(gl::ShaderType shaderType)
> {
>+    ASSERT(shaderType != gl::ShaderType::InvalidEnum);
>+    return &mCurShaderSRVs[shaderType];
> }
> 
>-ShaderConstants11::~ShaderConstants11()
>+// ShaderConstants11 implementation
>+ShaderConstants11::ShaderConstants11() : mNumActiveShaderSamplers({})
> {
>+    mShaderConstantsDirty.set();
> }
> 
>+ShaderConstants11::~ShaderConstants11() {}
>+
> void ShaderConstants11::init(const gl::Caps &caps)
> {
>-    mSamplerMetadataVS.resize(caps.maxVertexTextureImageUnits);
>-    mSamplerMetadataPS.resize(caps.maxTextureImageUnits);
>-    mSamplerMetadataCS.resize(caps.maxComputeTextureImageUnits);
>+    for (gl::ShaderType shaderType : gl::AllShaderTypes())
>+    {
>+        mShaderSamplerMetadata[shaderType].resize(caps.maxShaderTextureImageUnits[shaderType]);
>+        mShaderReadonlyImageMetadata[shaderType].resize(caps.maxShaderImageUniforms[shaderType]);
>+        mShaderImageMetadata[shaderType].resize(caps.maxShaderImageUniforms[shaderType]);
>+    }
> }
> 
>-size_t ShaderConstants11::getRequiredBufferSize(gl::SamplerType samplerType) const
>+size_t ShaderConstants11::GetShaderConstantsStructSize(gl::ShaderType shaderType)
> {
>-    switch (samplerType)
>+    switch (shaderType)
>     {
>-        case gl::SAMPLER_VERTEX:
>-            return sizeof(Vertex) + mSamplerMetadataVS.size() * sizeof(SamplerMetadata);
>-        case gl::SAMPLER_PIXEL:
>-            return sizeof(Pixel) + mSamplerMetadataPS.size() * sizeof(SamplerMetadata);
>-        case gl::SAMPLER_COMPUTE:
>-            return sizeof(Compute) + mSamplerMetadataCS.size() * sizeof(SamplerMetadata);
>+        case gl::ShaderType::Vertex:
>+            return sizeof(Vertex);
>+        case gl::ShaderType::Fragment:
>+            return sizeof(Pixel);
>+        case gl::ShaderType::Compute:
>+            return sizeof(Compute);
>+
>+        // TODO(jiawei.shao@intel.com): return geometry shader constant struct size
>+        case gl::ShaderType::Geometry:
>+            return 0u;
>+
>         default:
>             UNREACHABLE();
>-            return 0;
>+            return 0u;
>     }
> }
> 
>+size_t ShaderConstants11::getRequiredBufferSize(gl::ShaderType shaderType) const
>+{
>+    ASSERT(shaderType != gl::ShaderType::InvalidEnum);
>+    return GetShaderConstantsStructSize(shaderType) +
>+           mShaderSamplerMetadata[shaderType].size() * sizeof(SamplerMetadata) +
>+           mShaderImageMetadata[shaderType].size() * sizeof(ImageMetadata) +
>+           mShaderReadonlyImageMetadata[shaderType].size() * sizeof(ImageMetadata);
>+}
>+
> void ShaderConstants11::markDirty()
> {
>-    mVertexDirty            = true;
>-    mPixelDirty             = true;
>-    mComputeDirty           = true;
>-    mSamplerMetadataVSDirty = true;
>-    mSamplerMetadataPSDirty = true;
>-    mSamplerMetadataCSDirty = true;
>+    mShaderConstantsDirty.set();
>+    mNumActiveShaderSamplers.fill(0);
> }
> 
>-bool ShaderConstants11::updateSamplerMetadata(SamplerMetadata *data, const gl::Texture &texture)
>+bool ShaderConstants11::updateSamplerMetadata(SamplerMetadata *data,
>+                                              const gl::Texture &texture,
>+                                              const gl::SamplerState &samplerState)
> {
>-    bool dirty             = false;
>-    unsigned int baseLevel = texture.getTextureState().getEffectiveBaseLevel();
>-    GLenum sizedFormat =
>-        texture.getFormat(texture.getTarget(), baseLevel).info->sizedInternalFormat;
>+    bool dirty               = false;
>+    unsigned int baseLevel   = texture.getTextureState().getEffectiveBaseLevel();
>+    gl::TextureTarget target = (texture.getType() == gl::TextureType::CubeMap)
>+                                   ? gl::kCubeMapTextureTargetMin
>+                                   : gl::NonCubeTextureTypeToTarget(texture.getType());
>+    GLenum sizedFormat = texture.getFormat(target, baseLevel).info->sizedInternalFormat;
>     if (data->baseLevel != static_cast<int>(baseLevel))
>     {
>         data->baseLevel = static_cast<int>(baseLevel);
>@@ -341,17 +374,42 @@ bool ShaderConstants11::updateSamplerMetadata(SamplerMetadata *data, const gl::T
>             data->internalFormatBits = internalFormatBits;
>             dirty                    = true;
>         }
>-        // Pack the wrap values into one integer so we can fit all the metadata in one 4-integer
>-        // vector.
>-        GLenum wrapS  = texture.getWrapS();
>-        GLenum wrapT  = texture.getWrapT();
>-        GLenum wrapR  = texture.getWrapR();
>+        // Pack the wrap values into one integer so we can fit all the metadata in two 4-integer
>+        // vectors.
>+        GLenum wrapS  = samplerState.getWrapS();
>+        GLenum wrapT  = samplerState.getWrapT();
>+        GLenum wrapR  = samplerState.getWrapR();
>         int wrapModes = GetWrapBits(wrapS) | (GetWrapBits(wrapT) << 2) | (GetWrapBits(wrapR) << 4);
>         if (data->wrapModes != wrapModes)
>         {
>             data->wrapModes = wrapModes;
>             dirty           = true;
>         }
>+
>+        const angle::ColorGeneric &borderColor(samplerState.getBorderColor());
>+        constexpr int kBlack[4]          = {0};
>+        const void *const intBorderColor = (borderColor.type == angle::ColorGeneric::Type::Float)
>+                                               ? kBlack
>+                                               : borderColor.colorI.data();
>+        ASSERT(static_cast<const void *>(borderColor.colorI.data()) ==
>+               static_cast<const void *>(borderColor.colorUI.data()));
>+        if (memcmp(data->intBorderColor, intBorderColor, sizeof(data->intBorderColor)) != 0)
>+        {
>+            memcpy(data->intBorderColor, intBorderColor, sizeof(data->intBorderColor));
>+            dirty = true;
>+        }
>+    }
>+
>+    return dirty;
>+}
>+
>+bool ShaderConstants11::updateImageMetadata(ImageMetadata *data, const gl::ImageUnit &imageUnit)
>+{
>+    bool dirty = false;
>+    if (data->layer != static_cast<int>(imageUnit.layer))
>+    {
>+        data->layer = static_cast<int>(imageUnit.layer);
>+        dirty       = true;
>     }
> 
>     return dirty;
>@@ -364,15 +422,15 @@ void ShaderConstants11::setComputeWorkGroups(GLuint numGroupsX,
>     mCompute.numWorkGroups[0] = numGroupsX;
>     mCompute.numWorkGroups[1] = numGroupsY;
>     mCompute.numWorkGroups[2] = numGroupsZ;
>-    mComputeDirty             = true;
>+    mShaderConstantsDirty.set(gl::ShaderType::Compute);
> }
> 
> void ShaderConstants11::setMultiviewWriteToViewportIndex(GLfloat index)
> {
>     mVertex.multiviewWriteToViewportIndex = index;
>-    mVertexDirty                          = true;
>     mPixel.multiviewWriteToViewportIndex  = index;
>-    mPixelDirty                           = true;
>+    mShaderConstantsDirty.set(gl::ShaderType::Vertex);
>+    mShaderConstantsDirty.set(gl::ShaderType::Fragment);
> }
> 
> void ShaderConstants11::onViewportChange(const gl::Rectangle &glViewport,
>@@ -380,8 +438,8 @@ void ShaderConstants11::onViewportChange(const gl::Rectangle &glViewport,
>                                          bool is9_3,
>                                          bool presentPathFast)
> {
>-    mVertexDirty = true;
>-    mPixelDirty  = true;
>+    mShaderConstantsDirty.set(gl::ShaderType::Vertex);
>+    mShaderConstantsDirty.set(gl::ShaderType::Fragment);
> 
>     // On Feature Level 9_*, we must emulate large and/or negative viewports in the shaders
>     // using viewAdjust (like the D3D9 renderer).
>@@ -432,71 +490,97 @@ void ShaderConstants11::onViewportChange(const gl::Rectangle &glViewport,
>     mVertex.viewScale[1] = mPixel.viewScale[1];
> }
> 
>-void ShaderConstants11::onSamplerChange(gl::SamplerType samplerType,
>-                                        unsigned int samplerIndex,
>-                                        const gl::Texture &texture)
>+// Update the ShaderConstants with a new first vertex and return whether the update dirties them.
>+ANGLE_INLINE bool ShaderConstants11::onFirstVertexChange(GLint firstVertex)
> {
>-    switch (samplerType)
>+    uint32_t newFirstVertex = static_cast<uint32_t>(firstVertex);
>+    bool firstVertexDirty   = (mVertex.firstVertex != newFirstVertex);
>+    if (firstVertexDirty)
>     {
>-        case gl::SAMPLER_VERTEX:
>-            if (updateSamplerMetadata(&mSamplerMetadataVS[samplerIndex], texture))
>-            {
>-                mSamplerMetadataVSDirty = true;
>-            }
>-            break;
>-        case gl::SAMPLER_PIXEL:
>-            if (updateSamplerMetadata(&mSamplerMetadataPS[samplerIndex], texture))
>-            {
>-                mSamplerMetadataPSDirty = true;
>-            }
>-            break;
>-        case gl::SAMPLER_COMPUTE:
>-            if (updateSamplerMetadata(&mSamplerMetadataCS[samplerIndex], texture))
>-            {
>-                mSamplerMetadataCSDirty = true;
>-            }
>-            break;
>-        default:
>-            UNREACHABLE();
>-            break;
>+        mVertex.firstVertex = newFirstVertex;
>+        mShaderConstantsDirty.set(gl::ShaderType::Vertex);
>     }
>+    return firstVertexDirty;
> }
> 
>-gl::Error ShaderConstants11::updateBuffer(ID3D11DeviceContext *deviceContext,
>-                                          gl::SamplerType samplerType,
>-                                          const ProgramD3D &programD3D,
>-                                          const d3d11::Buffer &driverConstantBuffer)
>+void ShaderConstants11::onSamplerChange(gl::ShaderType shaderType,
>+                                        unsigned int samplerIndex,
>+                                        const gl::Texture &texture,
>+                                        const gl::SamplerState &samplerState)
> {
>-    bool dirty                 = false;
>-    size_t dataSize            = 0;
>-    const uint8_t *data        = nullptr;
>-    const uint8_t *samplerData = nullptr;
>+    ASSERT(shaderType != gl::ShaderType::InvalidEnum);
>+    if (updateSamplerMetadata(&mShaderSamplerMetadata[shaderType][samplerIndex], texture,
>+                              samplerState))
>+    {
>+        mNumActiveShaderSamplers[shaderType] = 0;
>+    }
>+}
> 
>-    switch (samplerType)
>+void ShaderConstants11::onImageChange(gl::ShaderType shaderType,
>+                                      unsigned int imageIndex,
>+                                      const gl::ImageUnit &imageUnit)
>+{
>+    ASSERT(shaderType != gl::ShaderType::InvalidEnum);
>+    if (imageUnit.access == GL_READ_ONLY)
>+    {
>+        if (updateImageMetadata(&mShaderReadonlyImageMetadata[shaderType][imageIndex], imageUnit))
>+        {
>+            mNumActiveShaderReadonlyImages[shaderType] = 0;
>+        }
>+    }
>+    else
>     {
>-        case gl::SAMPLER_VERTEX:
>-            dirty                   = mVertexDirty || mSamplerMetadataVSDirty;
>-            dataSize                = sizeof(Vertex);
>-            data                    = reinterpret_cast<const uint8_t *>(&mVertex);
>-            samplerData             = reinterpret_cast<const uint8_t *>(mSamplerMetadataVS.data());
>-            mVertexDirty            = false;
>-            mSamplerMetadataVSDirty = false;
>+        if (updateImageMetadata(&mShaderImageMetadata[shaderType][imageIndex], imageUnit))
>+        {
>+            mNumActiveShaderImages[shaderType] = 0;
>+        }
>+    }
>+}
>+
>+angle::Result ShaderConstants11::updateBuffer(const gl::Context *context,
>+                                              Renderer11 *renderer,
>+                                              gl::ShaderType shaderType,
>+                                              const ProgramD3D &programD3D,
>+                                              const d3d11::Buffer &driverConstantBuffer)
>+{
>+    // Re-upload the sampler meta-data if the current program uses more samplers
>+    // than we previously uploaded.
>+    const int numSamplers       = programD3D.getUsedSamplerRange(shaderType).length();
>+    const int numReadonlyImages = programD3D.getUsedImageRange(shaderType, true).length();
>+    const int numImages         = programD3D.getUsedImageRange(shaderType, false).length();
>+
>+    const bool dirty = mShaderConstantsDirty[shaderType] ||
>+                       (mNumActiveShaderSamplers[shaderType] < numSamplers) ||
>+                       (mNumActiveShaderReadonlyImages[shaderType] < numReadonlyImages) ||
>+                       (mNumActiveShaderImages[shaderType] < numImages);
>+
>+    const size_t dataSize = GetShaderConstantsStructSize(shaderType);
>+    const uint8_t *samplerData =
>+        reinterpret_cast<const uint8_t *>(mShaderSamplerMetadata[shaderType].data());
>+    const size_t samplerDataSize = sizeof(SamplerMetadata) * numSamplers;
>+    const uint8_t *readonlyImageData =
>+        reinterpret_cast<const uint8_t *>(mShaderReadonlyImageMetadata[shaderType].data());
>+    const size_t readonlyImageDataSize = sizeof(ImageMetadata) * numReadonlyImages;
>+    const uint8_t *imageData =
>+        reinterpret_cast<const uint8_t *>(mShaderImageMetadata[shaderType].data());
>+    const size_t imageDataSize = sizeof(ImageMetadata) * numImages;
>+
>+    mNumActiveShaderSamplers[shaderType]       = numSamplers;
>+    mNumActiveShaderReadonlyImages[shaderType] = numReadonlyImages;
>+    mNumActiveShaderImages[shaderType]         = numImages;
>+    mShaderConstantsDirty.set(shaderType, false);
>+
>+    const uint8_t *data = nullptr;
>+    switch (shaderType)
>+    {
>+        case gl::ShaderType::Vertex:
>+            data = reinterpret_cast<const uint8_t *>(&mVertex);
>             break;
>-        case gl::SAMPLER_PIXEL:
>-            dirty                   = mPixelDirty || mSamplerMetadataPSDirty;
>-            dataSize                = sizeof(Pixel);
>-            data                    = reinterpret_cast<const uint8_t *>(&mPixel);
>-            samplerData             = reinterpret_cast<const uint8_t *>(mSamplerMetadataPS.data());
>-            mPixelDirty             = false;
>-            mSamplerMetadataPSDirty = false;
>+        case gl::ShaderType::Fragment:
>+            data = reinterpret_cast<const uint8_t *>(&mPixel);
>             break;
>-        case gl::SAMPLER_COMPUTE:
>-            dirty                   = mComputeDirty || mSamplerMetadataCSDirty;
>-            dataSize                = sizeof(Compute);
>-            data                    = reinterpret_cast<const uint8_t *>(&mCompute);
>-            samplerData             = reinterpret_cast<const uint8_t *>(mSamplerMetadataCS.data());
>-            mComputeDirty           = false;
>-            mSamplerMetadataCSDirty = false;
>+        case gl::ShaderType::Compute:
>+            data = reinterpret_cast<const uint8_t *>(&mCompute);
>             break;
>         default:
>             UNREACHABLE();
>@@ -507,33 +591,28 @@ gl::Error ShaderConstants11::updateBuffer(ID3D11DeviceContext *deviceContext,
> 
>     if (!dirty)
>     {
>-        return gl::NoError();
>+        return angle::Result::Continue;
>     }
> 
>     // Previous buffer contents are discarded, so we need to refresh the whole buffer.
>     D3D11_MAPPED_SUBRESOURCE mapping = {0};
>-    HRESULT result =
>-        deviceContext->Map(driverConstantBuffer.get(), 0, D3D11_MAP_WRITE_DISCARD, 0, &mapping);
>-
>-    if (FAILED(result))
>-    {
>-        return gl::OutOfMemory() << "Internal error mapping constant buffer: " << gl::FmtHR(result);
>-    }
>-
>-    size_t samplerDataBytes = sizeof(SamplerMetadata) * programD3D.getUsedSamplerRange(samplerType);
>+    ANGLE_TRY(renderer->mapResource(context, driverConstantBuffer.get(), 0, D3D11_MAP_WRITE_DISCARD,
>+                                    0, &mapping));
> 
>     memcpy(mapping.pData, data, dataSize);
>-    memcpy(reinterpret_cast<uint8_t *>(mapping.pData) + dataSize, samplerData, samplerDataBytes);
>+    memcpy(static_cast<uint8_t *>(mapping.pData) + dataSize, samplerData,
>+           sizeof(SamplerMetadata) * numSamplers);
> 
>-    deviceContext->Unmap(driverConstantBuffer.get(), 0);
>+    memcpy(static_cast<uint8_t *>(mapping.pData) + dataSize + samplerDataSize, readonlyImageData,
>+           readonlyImageDataSize);
>+    memcpy(
>+        static_cast<uint8_t *>(mapping.pData) + dataSize + samplerDataSize + readonlyImageDataSize,
>+        imageData, imageDataSize);
>+    renderer->getDeviceContext()->Unmap(driverConstantBuffer.get(), 0);
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-static const GLenum QueryTypes[] = {GL_ANY_SAMPLES_PASSED, GL_ANY_SAMPLES_PASSED_CONSERVATIVE,
>-                                    GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN, GL_TIME_ELAPSED_EXT,
>-                                    GL_COMMANDS_COMPLETED_CHROMIUM};
>-
> StateManager11::StateManager11(Renderer11 *renderer)
>     : mRenderer(renderer),
>       mInternalDirtyBits(),
>@@ -554,10 +633,10 @@ StateManager11::StateManager11(Renderer11 *renderer)
>       mDirtyCurrentValueAttribs(),
>       mCurrentValueAttribs(),
>       mCurrentInputLayout(),
>-      mInputLayoutIsDirty(false),
>-      mVertexAttribsNeedTranslation(false),
>       mDirtyVertexBufferRange(gl::MAX_VERTEX_ATTRIBS, 0),
>       mCurrentPrimitiveTopology(D3D_PRIMITIVE_TOPOLOGY_UNDEFINED),
>+      mLastAppliedDrawMode(gl::PrimitiveMode::InvalidEnum),
>+      mCullEverything(false),
>       mDirtySwizzles(false),
>       mAppliedIB(nullptr),
>       mAppliedIBFormat(DXGI_FORMAT_UNKNOWN),
>@@ -567,7 +646,9 @@ StateManager11::StateManager11(Renderer11 *renderer)
>       mIndexDataManager(renderer),
>       mIsMultiviewEnabled(false),
>       mEmptySerial(mRenderer->generateSerial()),
>-      mIsTransformFeedbackCurrentlyActiveUnpaused(false)
>+      mProgramD3D(nullptr),
>+      mVertexArray11(nullptr),
>+      mFramebuffer11(nullptr)
> {
>     mCurBlendState.blend                 = false;
>     mCurBlendState.sourceBlendRGB        = GL_ONE;
>@@ -612,6 +693,14 @@ StateManager11::StateManager11(Renderer11 *renderer)
>     // Start with all internal dirty bits set.
>     mInternalDirtyBits.set();
> 
>+    mComputeDirtyBitsMask.set(DIRTY_BIT_TEXTURE_AND_SAMPLER_STATE);
>+    mComputeDirtyBitsMask.set(DIRTY_BIT_PROGRAM_UNIFORMS);
>+    mComputeDirtyBitsMask.set(DIRTY_BIT_DRIVER_UNIFORMS);
>+    mComputeDirtyBitsMask.set(DIRTY_BIT_PROGRAM_UNIFORM_BUFFERS);
>+    mComputeDirtyBitsMask.set(DIRTY_BIT_PROGRAM_ATOMIC_COUNTER_BUFFERS);
>+    mComputeDirtyBitsMask.set(DIRTY_BIT_PROGRAM_SHADER_STORAGE_BUFFERS);
>+    mComputeDirtyBitsMask.set(DIRTY_BIT_SHADERS);
>+
>     // Initially all current value attributes must be updated on first use.
>     mDirtyCurrentValueAttribs.set();
> 
>@@ -620,34 +709,62 @@ StateManager11::StateManager11(Renderer11 *renderer)
>     mCurrentVertexOffsets.fill(std::numeric_limits<UINT>::max());
> }
> 
>-StateManager11::~StateManager11()
>-{
>-}
>+StateManager11::~StateManager11() {}
> 
> template <typename SRVType>
>-void StateManager11::setShaderResourceInternal(gl::SamplerType shaderType,
>+void StateManager11::setShaderResourceInternal(gl::ShaderType shaderType,
>                                                UINT resourceSlot,
>                                                const SRVType *srv)
> {
>-    auto &currentSRVs = (shaderType == gl::SAMPLER_VERTEX ? mCurVertexSRVs : mCurPixelSRVs);
>-
>-    ASSERT(static_cast<size_t>(resourceSlot) < currentSRVs.size());
>-    const SRVRecord &record = currentSRVs[resourceSlot];
>+    auto *currentSRVs = getSRVCache(shaderType);
>+    ASSERT(static_cast<size_t>(resourceSlot) < currentSRVs->size());
>+    const ViewRecord<D3D11_SHADER_RESOURCE_VIEW_DESC> &record = (*currentSRVs)[resourceSlot];
> 
>-    if (record.srv != reinterpret_cast<uintptr_t>(srv))
>+    if (record.view != reinterpret_cast<uintptr_t>(srv))
>     {
>         ID3D11DeviceContext *deviceContext = mRenderer->getDeviceContext();
>-        ID3D11ShaderResourceView *srvPtr = srv ? srv->get() : nullptr;
>-        if (shaderType == gl::SAMPLER_VERTEX)
>+        ID3D11ShaderResourceView *srvPtr   = srv ? srv->get() : nullptr;
>+        switch (shaderType)
>         {
>-            deviceContext->VSSetShaderResources(resourceSlot, 1, &srvPtr);
>+            case gl::ShaderType::Vertex:
>+                deviceContext->VSSetShaderResources(resourceSlot, 1, &srvPtr);
>+                break;
>+            case gl::ShaderType::Fragment:
>+                deviceContext->PSSetShaderResources(resourceSlot, 1, &srvPtr);
>+                break;
>+            case gl::ShaderType::Compute:
>+                deviceContext->CSSetShaderResources(resourceSlot, 1, &srvPtr);
>+                break;
>+            default:
>+                UNREACHABLE();
>         }
>-        else
>+
>+        currentSRVs->update(resourceSlot, srvPtr);
>+    }
>+}
>+
>+template <typename UAVType>
>+void StateManager11::setUnorderedAccessViewInternal(gl::ShaderType shaderType,
>+                                                    UINT resourceSlot,
>+                                                    const UAVType *uav)
>+{
>+    ASSERT(shaderType == gl::ShaderType::Compute);
>+    ASSERT(static_cast<size_t>(resourceSlot) < mCurComputeUAVs.size());
>+    const ViewRecord<D3D11_UNORDERED_ACCESS_VIEW_DESC> &record = mCurComputeUAVs[resourceSlot];
>+
>+    if (record.view != reinterpret_cast<uintptr_t>(uav))
>+    {
>+        ID3D11DeviceContext *deviceContext = mRenderer->getDeviceContext();
>+        ID3D11UnorderedAccessView *uavPtr  = uav ? uav->get() : nullptr;
>+        // We need to make sure that resource being set to UnorderedAccessView slot |resourceSlot|
>+        // is not bound on SRV.
>+        if (uavPtr && unsetConflictingView(uavPtr))
>         {
>-            deviceContext->PSSetShaderResources(resourceSlot, 1, &srvPtr);
>+            mInternalDirtyBits.set(DIRTY_BIT_TEXTURE_AND_SAMPLER_STATE);
>         }
>+        deviceContext->CSSetUnorderedAccessViews(resourceSlot, 1, &uavPtr, nullptr);
> 
>-        currentSRVs.update(resourceSlot, srvPtr);
>+        mCurComputeUAVs.update(resourceSlot, uavPtr);
>     }
> }
> 
>@@ -666,7 +783,7 @@ void StateManager11::checkPresentPath(const gl::Context *context)
>     if (!mRenderer->presentPathFastEnabled())
>         return;
> 
>-    const auto *framebuffer          = context->getGLState().getDrawFramebuffer();
>+    const auto *framebuffer          = context->getState().getDrawFramebuffer();
>     const auto *firstColorAttachment = framebuffer->getFirstColorbuffer();
>     const bool presentPathFastActive = UsePresentPathFast(mRenderer, firstColorAttachment);
> 
>@@ -689,27 +806,61 @@ void StateManager11::checkPresentPath(const gl::Context *context)
>     }
> }
> 
>-gl::Error StateManager11::updateStateForCompute(const gl::Context *context,
>-                                                GLuint numGroupsX,
>-                                                GLuint numGroupsY,
>-                                                GLuint numGroupsZ)
>+angle::Result StateManager11::updateStateForCompute(const gl::Context *context,
>+                                                    GLuint numGroupsX,
>+                                                    GLuint numGroupsY,
>+                                                    GLuint numGroupsZ)
> {
>     mShaderConstants.setComputeWorkGroups(numGroupsX, numGroupsY, numGroupsZ);
> 
>-    // TODO(jmadill): Use dirty bits.
>-    const auto &glState = context->getGLState();
>-    auto *programD3D    = GetImplAs<ProgramD3D>(glState.getProgram());
>-    programD3D->updateSamplerMapping();
>+    if (mProgramD3D->updateSamplerMapping() == ProgramD3D::SamplerMapping::WasDirty)
>+    {
>+        invalidateTexturesAndSamplers();
>+    }
> 
>-    // TODO(jmadill): Use dirty bits.
>-    ANGLE_TRY(generateSwizzlesForShader(context, gl::SAMPLER_COMPUTE));
>+    if (mDirtySwizzles)
>+    {
>+        ANGLE_TRY(generateSwizzlesForShader(context, gl::ShaderType::Compute));
>+        mDirtySwizzles = false;
>+    }
> 
>-    // TODO(jmadill): More complete implementation.
>-    ANGLE_TRY(syncTextures(context));
>+    if (mProgramD3D->anyShaderUniformsDirty())
>+    {
>+        mInternalDirtyBits.set(DIRTY_BIT_PROGRAM_UNIFORMS);
>+    }
> 
>-    // TODO(Xinghua): applyUniformBuffers for compute shader.
>+    auto dirtyBitsCopy = mInternalDirtyBits & mComputeDirtyBitsMask;
>+    mInternalDirtyBits &= ~mComputeDirtyBitsMask;
>+    for (auto dirtyBit : dirtyBitsCopy)
>+    {
>+        switch (dirtyBit)
>+        {
>+            case DIRTY_BIT_TEXTURE_AND_SAMPLER_STATE:
>+                ANGLE_TRY(syncTexturesForCompute(context));
>+                break;
>+            case DIRTY_BIT_PROGRAM_UNIFORMS:
>+            case DIRTY_BIT_DRIVER_UNIFORMS:
>+                ANGLE_TRY(applyComputeUniforms(context, mProgramD3D));
>+                break;
>+            case DIRTY_BIT_PROGRAM_UNIFORM_BUFFERS:
>+                ANGLE_TRY(syncUniformBuffers(context));
>+                break;
>+            case DIRTY_BIT_PROGRAM_ATOMIC_COUNTER_BUFFERS:
>+                ANGLE_TRY(syncAtomicCounterBuffers(context));
>+                break;
>+            case DIRTY_BIT_PROGRAM_SHADER_STORAGE_BUFFERS:
>+                ANGLE_TRY(syncShaderStorageBuffers(context));
>+                break;
>+            case DIRTY_BIT_SHADERS:
>+                ANGLE_TRY(syncProgramForCompute(context));
>+                break;
>+            default:
>+                UNREACHABLE();
>+                break;
>+        }
>+    }
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
> void StateManager11::syncState(const gl::Context *context, const gl::State::DirtyBits &dirtyBits)
>@@ -719,9 +870,9 @@ void StateManager11::syncState(const gl::Context *context, const gl::State::Dirt
>         return;
>     }
> 
>-    const auto &state = context->getGLState();
>+    const gl::State &state = context->getState();
> 
>-    for (auto dirtyBit : dirtyBits)
>+    for (size_t dirtyBit : dirtyBits)
>     {
>         switch (dirtyBit)
>         {
>@@ -873,18 +1024,21 @@ void StateManager11::syncState(const gl::Context *context, const gl::State::Dirt
>                 if (state.getRasterizerState().cullFace != mCurRasterState.cullFace)
>                 {
>                     mInternalDirtyBits.set(DIRTY_BIT_RASTERIZER_STATE);
>+                    mInternalDirtyBits.set(DIRTY_BIT_PRIMITIVE_TOPOLOGY);
>                 }
>                 break;
>             case gl::State::DIRTY_BIT_CULL_FACE:
>                 if (state.getRasterizerState().cullMode != mCurRasterState.cullMode)
>                 {
>                     mInternalDirtyBits.set(DIRTY_BIT_RASTERIZER_STATE);
>+                    mInternalDirtyBits.set(DIRTY_BIT_PRIMITIVE_TOPOLOGY);
>                 }
>                 break;
>             case gl::State::DIRTY_BIT_FRONT_FACE:
>                 if (state.getRasterizerState().frontFace != mCurRasterState.frontFace)
>                 {
>                     mInternalDirtyBits.set(DIRTY_BIT_RASTERIZER_STATE);
>+                    mInternalDirtyBits.set(DIRTY_BIT_PRIMITIVE_TOPOLOGY);
>                 }
>                 break;
>             case gl::State::DIRTY_BIT_POLYGON_OFFSET_FILL_ENABLED:
>@@ -946,6 +1100,7 @@ void StateManager11::syncState(const gl::Context *context, const gl::State::Dirt
>                 {
>                     handleMultiviewDrawFramebufferChange(context);
>                 }
>+                mFramebuffer11 = GetImplAs<Framebuffer11>(state.getDrawFramebuffer());
>                 break;
>             case gl::State::DIRTY_BIT_VERTEX_ARRAY_BINDING:
>                 invalidateVertexBuffer();
>@@ -954,7 +1109,17 @@ void StateManager11::syncState(const gl::Context *context, const gl::State::Dirt
>                 // owned by the StateManager11/Context.
>                 mDirtyCurrentValueAttribs.set();
>                 // Invalidate the cached index buffer.
>-                mIndexBufferIsDirty = true;
>+                invalidateIndexBuffer();
>+                mVertexArray11 = GetImplAs<VertexArray11>(state.getVertexArray());
>+                break;
>+            case gl::State::DIRTY_BIT_UNIFORM_BUFFER_BINDINGS:
>+                invalidateProgramUniformBuffers();
>+                break;
>+            case gl::State::DIRTY_BIT_ATOMIC_COUNTER_BUFFER_BINDING:
>+                invalidateProgramAtomicCounterBuffers();
>+                break;
>+            case gl::State::DIRTY_BIT_SHADER_STORAGE_BUFFER_BINDING:
>+                invalidateProgramShaderStorageBuffers();
>                 break;
>             case gl::State::DIRTY_BIT_TEXTURE_BINDINGS:
>                 invalidateTexturesAndSamplers();
>@@ -962,27 +1127,39 @@ void StateManager11::syncState(const gl::Context *context, const gl::State::Dirt
>             case gl::State::DIRTY_BIT_SAMPLER_BINDINGS:
>                 invalidateTexturesAndSamplers();
>                 break;
>+            case gl::State::DIRTY_BIT_IMAGE_BINDINGS:
>+                // TODO(jie.a.chen@intel.com): More fine-grained update.
>+                // Currently images are updated together with textures and samplers. It would be
>+                // better to update them separately.
>+                // http://anglebug.com/2814
>+                invalidateTexturesAndSamplers();
>+                break;
>+            case gl::State::DIRTY_BIT_TRANSFORM_FEEDBACK_BINDING:
>+                invalidateTransformFeedback();
>+                break;
>+            case gl::State::DIRTY_BIT_PROGRAM_BINDING:
>+                mProgramD3D = GetImplAs<ProgramD3D>(state.getProgram());
>+                break;
>             case gl::State::DIRTY_BIT_PROGRAM_EXECUTABLE:
>             {
>-                mInternalDirtyBits.set(DIRTY_BIT_SHADERS);
>+                mInternalDirtyBits.set(DIRTY_BIT_PRIMITIVE_TOPOLOGY);
>+                invalidateShaders();
>                 invalidateVertexBuffer();
>                 invalidateRenderTarget();
>                 invalidateTexturesAndSamplers();
>                 invalidateProgramUniforms();
>                 invalidateProgramUniformBuffers();
>-                gl::VertexArray *vao = state.getVertexArray();
>-                if (mIsMultiviewEnabled && vao != nullptr)
>+                invalidateProgramAtomicCounterBuffers();
>+                invalidateProgramShaderStorageBuffers();
>+                invalidateDriverUniforms();
>+                // If OVR_multiview2 is enabled, the attribute divisor has to be updated for each
>+                // binding. When using compute, there could be no vertex array.
>+                if (mIsMultiviewEnabled && mVertexArray11)
>                 {
>-                    // If ANGLE_multiview is enabled, the attribute divisor has to be updated for
>-                    // each binding.
>-                    VertexArray11 *vao11       = GetImplAs<VertexArray11>(vao);
>-                    const gl::Program *program = state.getProgram();
>-                    int numViews               = 1;
>-                    if (program != nullptr && program->usesMultiview())
>-                    {
>-                        numViews = program->getNumViews();
>-                    }
>-                    vao11->markAllAttributeDivisorsForAdjustment(numViews);
>+                    ASSERT(mProgramD3D);
>+                    const gl::ProgramState &programState = mProgramD3D->getState();
>+                    int numViews = programState.usesMultiview() ? programState.getNumViews() : 1;
>+                    mVertexArray11->markAllAttributeDivisorsForAdjustment(numViews);
>                 }
>                 break;
>             }
>@@ -992,7 +1169,11 @@ void StateManager11::syncState(const gl::Context *context, const gl::State::Dirt
>                 {
>                     invalidateCurrentValueAttrib(attribIndex);
>                 }
>+                break;
>             }
>+            case gl::State::DIRTY_BIT_PROVOKING_VERTEX:
>+                invalidateShaders();
>+                break;
>             default:
>                 break;
>         }
>@@ -1003,55 +1184,29 @@ void StateManager11::syncState(const gl::Context *context, const gl::State::Dirt
> 
> void StateManager11::handleMultiviewDrawFramebufferChange(const gl::Context *context)
> {
>-    const auto &glState                    = context->getGLState();
>+    const auto &glState                    = context->getState();
>     const gl::Framebuffer *drawFramebuffer = glState.getDrawFramebuffer();
>     ASSERT(drawFramebuffer != nullptr);
> 
>-    // Update viewport offsets.
>-    const std::vector<gl::Offset> *attachmentViewportOffsets =
>-        drawFramebuffer->getViewportOffsets();
>-    const std::vector<gl::Offset> &viewportOffsets =
>-        attachmentViewportOffsets != nullptr
>-            ? *attachmentViewportOffsets
>-            : gl::FramebufferAttachment::GetDefaultViewportOffsetVector();
>-    if (mViewportOffsets != viewportOffsets)
>-    {
>-        mViewportOffsets = viewportOffsets;
>-
>-        // Because new viewport offsets are to be applied, we have to mark the internal viewport and
>-        // scissor state as dirty.
>-        invalidateViewport(context);
>-        mInternalDirtyBits.set(DIRTY_BIT_SCISSOR_STATE);
>-    }
>-    switch (drawFramebuffer->getMultiviewLayout())
>+    if (drawFramebuffer->isMultiview())
>     {
>-        case GL_FRAMEBUFFER_MULTIVIEW_SIDE_BY_SIDE_ANGLE:
>-            mShaderConstants.setMultiviewWriteToViewportIndex(1.0f);
>-            break;
>-        case GL_FRAMEBUFFER_MULTIVIEW_LAYERED_ANGLE:
>-            // Because the base view index is applied as an offset to the 2D texture array when the
>-            // RTV is created, we just have to pass a boolean to select which code path is to be
>-            // used.
>-            mShaderConstants.setMultiviewWriteToViewportIndex(0.0f);
>-            break;
>-        default:
>-            // There is no need to update the value in the constant buffer if the active framebuffer
>-            // object does not have a multiview layout.
>-            break;
>+        // Because the base view index is applied as an offset to the 2D texture array when the
>+        // RTV is created, we just have to pass a boolean to select which code path is to be
>+        // used.
>+        mShaderConstants.setMultiviewWriteToViewportIndex(0.0f);
>     }
> }
> 
>-gl::Error StateManager11::syncBlendState(const gl::Context *context,
>-                                         const gl::Framebuffer *framebuffer,
>-                                         const gl::BlendState &blendState,
>-                                         const gl::ColorF &blendColor,
>-                                         unsigned int sampleMask)
>+angle::Result StateManager11::syncBlendState(const gl::Context *context,
>+                                             const gl::BlendState &blendState,
>+                                             const gl::ColorF &blendColor,
>+                                             unsigned int sampleMask)
> {
>     const d3d11::BlendState *dxBlendState = nullptr;
>     const d3d11::BlendStateKey &key =
>-        RenderStateCache::GetBlendStateKey(context, framebuffer, blendState);
>+        RenderStateCache::GetBlendStateKey(context, mFramebuffer11, blendState);
> 
>-    ANGLE_TRY(mRenderer->getBlendState(key, &dxBlendState));
>+    ANGLE_TRY(mRenderer->getBlendState(context, key, &dxBlendState));
> 
>     ASSERT(dxBlendState != nullptr);
> 
>@@ -1080,11 +1235,13 @@ gl::Error StateManager11::syncBlendState(const gl::Context *context,
>     mCurBlendColor = blendColor;
>     mCurSampleMask = sampleMask;
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error StateManager11::syncDepthStencilState(const gl::State &glState)
>+angle::Result StateManager11::syncDepthStencilState(const gl::Context *context)
> {
>+    const gl::State &glState = context->getState();
>+
>     mCurDepthStencilState = glState.getDepthStencilState();
>     mCurStencilRef        = glState.getStencilRef();
>     mCurStencilBackRef    = glState.getStencilBackRef();
>@@ -1097,7 +1254,8 @@ gl::Error StateManager11::syncDepthStencilState(const gl::State &glState)
>     }
>     ASSERT((mCurDepthStencilState.stencilWritemask & maxStencil) ==
>            (mCurDepthStencilState.stencilBackWritemask & maxStencil));
>-    ASSERT(mCurStencilRef == mCurStencilBackRef);
>+    ASSERT(gl::clamp(mCurStencilRef, 0, static_cast<int>(maxStencil)) ==
>+           gl::clamp(mCurStencilBackRef, 0, static_cast<int>(maxStencil)));
>     ASSERT((mCurDepthStencilState.stencilMask & maxStencil) ==
>            (mCurDepthStencilState.stencilBackMask & maxStencil));
> 
>@@ -1112,14 +1270,23 @@ gl::Error StateManager11::syncDepthStencilState(const gl::State &glState)
>     }
> 
>     if (mCurDisableStencil.value())
>+    {
>+        modifiedGLState.stencilTest = false;
>+    }
>+    if (!modifiedGLState.stencilTest)
>     {
>         modifiedGLState.stencilWritemask     = 0;
>         modifiedGLState.stencilBackWritemask = 0;
>-        modifiedGLState.stencilTest          = false;
>     }
> 
>+    // If STENCIL_TEST is disabled in glState, stencil testing and writing should be disabled.
>+    // Verify that's true in the modifiedGLState so it is propagated to d3dState.
>+    ASSERT(glState.getDepthStencilState().stencilTest ||
>+           (!modifiedGLState.stencilTest && modifiedGLState.stencilWritemask == 0 &&
>+            modifiedGLState.stencilBackWritemask == 0));
>+
>     const d3d11::DepthStencilState *d3dState = nullptr;
>-    ANGLE_TRY(mRenderer->getDepthStencilState(modifiedGLState, &d3dState));
>+    ANGLE_TRY(mRenderer->getDepthStencilState(context, modifiedGLState, &d3dState));
>     ASSERT(d3dState);
> 
>     // Max D3D11 stencil reference value is 0xFF,
>@@ -1130,18 +1297,19 @@ gl::Error StateManager11::syncDepthStencilState(const gl::State &glState)
>                   "Unexpected value of D3D11_DEFAULT_STENCIL_READ_MASK");
>     static_assert(D3D11_DEFAULT_STENCIL_WRITE_MASK == 0xFF,
>                   "Unexpected value of D3D11_DEFAULT_STENCIL_WRITE_MASK");
>-    UINT dxStencilRef = std::min<UINT>(mCurStencilRef, 0xFFu);
>+    UINT dxStencilRef = static_cast<UINT>(gl::clamp(mCurStencilRef, 0, 0xFF));
> 
>     mRenderer->getDeviceContext()->OMSetDepthStencilState(d3dState->get(), dxStencilRef);
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error StateManager11::syncRasterizerState(const gl::Context *context, bool pointDrawMode)
>+angle::Result StateManager11::syncRasterizerState(const gl::Context *context,
>+                                                  gl::PrimitiveMode mode)
> {
>     // TODO: Remove pointDrawMode and multiSample from gl::RasterizerState.
>-    gl::RasterizerState rasterState = context->getGLState().getRasterizerState();
>-    rasterState.pointDrawMode       = pointDrawMode;
>+    gl::RasterizerState rasterState = context->getState().getRasterizerState();
>+    rasterState.pointDrawMode       = (mode == gl::PrimitiveMode::Points);
>     rasterState.multiSample         = mCurRasterState.multiSample;
> 
>     ID3D11RasterizerState *dxRasterState = nullptr;
>@@ -1163,19 +1331,20 @@ gl::Error StateManager11::syncRasterizerState(const gl::Context *context, bool p
>             modifiedRasterState.frontFace = GL_CCW;
>         }
> 
>-        ANGLE_TRY(
>-            mRenderer->getRasterizerState(modifiedRasterState, mCurScissorEnabled, &dxRasterState));
>+        ANGLE_TRY(mRenderer->getRasterizerState(context, modifiedRasterState, mCurScissorEnabled,
>+                                                &dxRasterState));
>     }
>     else
>     {
>-        ANGLE_TRY(mRenderer->getRasterizerState(rasterState, mCurScissorEnabled, &dxRasterState));
>+        ANGLE_TRY(mRenderer->getRasterizerState(context, rasterState, mCurScissorEnabled,
>+                                                &dxRasterState));
>     }
> 
>     mRenderer->getDeviceContext()->RSSetState(dxRasterState);
> 
>     mCurRasterState = rasterState;
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
> void StateManager11::syncScissorRectangle(const gl::Rectangle &scissor, bool enabled)
>@@ -1188,28 +1357,23 @@ void StateManager11::syncScissorRectangle(const gl::Rectangle &scissor, bool ena
> 
>     if (enabled)
>     {
>-        std::array<D3D11_RECT, gl::IMPLEMENTATION_ANGLE_MULTIVIEW_MAX_VIEWS> rectangles;
>-        const UINT numRectangles = static_cast<UINT>(mViewportOffsets.size());
>-        for (UINT i = 0u; i < numRectangles; ++i)
>-        {
>-            D3D11_RECT &rect = rectangles[i];
>-            int x            = scissor.x + mViewportOffsets[i].x;
>-            int y            = modifiedScissorY + mViewportOffsets[i].y;
>-            rect.left        = std::max(0, x);
>-            rect.top         = std::max(0, y);
>-            rect.right       = x + std::max(0, scissor.width);
>-            rect.bottom      = y + std::max(0, scissor.height);
>-        }
>-        mRenderer->getDeviceContext()->RSSetScissorRects(numRectangles, rectangles.data());
>+        D3D11_RECT rect;
>+        int x       = scissor.x;
>+        int y       = modifiedScissorY;
>+        rect.left   = std::max(0, x);
>+        rect.top    = std::max(0, y);
>+        rect.right  = x + std::max(0, scissor.width);
>+        rect.bottom = y + std::max(0, scissor.height);
>+        mRenderer->getDeviceContext()->RSSetScissorRects(1, &rect);
>     }
> 
>-    mCurScissorRect      = scissor;
>-    mCurScissorEnabled   = enabled;
>+    mCurScissorRect    = scissor;
>+    mCurScissorEnabled = enabled;
> }
> 
> void StateManager11::syncViewport(const gl::Context *context)
> {
>-    const auto &glState          = context->getGLState();
>+    const auto &glState          = context->getState();
>     gl::Framebuffer *framebuffer = glState.getDrawFramebuffer();
>     float actualZNear            = gl::clamp01(glState.getNearPlane());
>     float actualZFar             = gl::clamp01(glState.getFarPlane());
>@@ -1232,65 +1396,58 @@ void StateManager11::syncViewport(const gl::Context *context)
>     }
> 
>     const auto &viewport = glState.getViewport();
>-    std::array<D3D11_VIEWPORT, gl::IMPLEMENTATION_ANGLE_MULTIVIEW_MAX_VIEWS> dxViewports;
>-    const UINT numRectangles = static_cast<UINT>(mViewportOffsets.size());
> 
>     int dxViewportTopLeftX = 0;
>     int dxViewportTopLeftY = 0;
>     int dxViewportWidth    = 0;
>     int dxViewportHeight   = 0;
> 
>-    for (UINT i = 0u; i < numRectangles; ++i)
>-    {
>-        dxViewportTopLeftX = gl::clamp(viewport.x + mViewportOffsets[i].x, dxMinViewportBoundsX,
>-                                       dxMaxViewportBoundsX);
>-        dxViewportTopLeftY = gl::clamp(viewport.y + mViewportOffsets[i].y, dxMinViewportBoundsY,
>-                                       dxMaxViewportBoundsY);
>-        dxViewportWidth  = gl::clamp(viewport.width, 0, dxMaxViewportBoundsX - dxViewportTopLeftX);
>-        dxViewportHeight = gl::clamp(viewport.height, 0, dxMaxViewportBoundsY - dxViewportTopLeftY);
>+    dxViewportTopLeftX = gl::clamp(viewport.x, dxMinViewportBoundsX, dxMaxViewportBoundsX);
>+    dxViewportTopLeftY = gl::clamp(viewport.y, dxMinViewportBoundsY, dxMaxViewportBoundsY);
>+    dxViewportWidth    = gl::clamp(viewport.width, 0, dxMaxViewportBoundsX - dxViewportTopLeftX);
>+    dxViewportHeight   = gl::clamp(viewport.height, 0, dxMaxViewportBoundsY - dxViewportTopLeftY);
> 
>-        D3D11_VIEWPORT &dxViewport = dxViewports[i];
>-        dxViewport.TopLeftX        = static_cast<float>(dxViewportTopLeftX);
>-        if (mCurPresentPathFastEnabled)
>-        {
>-            // When present path fast is active and we're rendering to framebuffer 0, we must invert
>-            // the viewport in Y-axis.
>-            // NOTE: We delay the inversion until right before the call to RSSetViewports, and leave
>-            // dxViewportTopLeftY unchanged. This allows us to calculate viewAdjust below using the
>-            // unaltered dxViewportTopLeftY value.
>-            dxViewport.TopLeftY = static_cast<float>(mCurPresentPathFastColorBufferHeight -
>-                                                     dxViewportTopLeftY - dxViewportHeight);
>-        }
>-        else
>-        {
>-            dxViewport.TopLeftY = static_cast<float>(dxViewportTopLeftY);
>-        }
>+    D3D11_VIEWPORT dxViewport;
>+    dxViewport.TopLeftX = static_cast<float>(dxViewportTopLeftX);
>+    if (mCurPresentPathFastEnabled)
>+    {
>+        // When present path fast is active and we're rendering to framebuffer 0, we must invert
>+        // the viewport in Y-axis.
>+        // NOTE: We delay the inversion until right before the call to RSSetViewports, and leave
>+        // dxViewportTopLeftY unchanged. This allows us to calculate viewAdjust below using the
>+        // unaltered dxViewportTopLeftY value.
>+        dxViewport.TopLeftY = static_cast<float>(mCurPresentPathFastColorBufferHeight -
>+                                                 dxViewportTopLeftY - dxViewportHeight);
>+    }
>+    else
>+    {
>+        dxViewport.TopLeftY = static_cast<float>(dxViewportTopLeftY);
>+    }
> 
>-        // The es 3.1 spec section 9.2 states that, "If there are no attachments, rendering
>-        // will be limited to a rectangle having a lower left of (0, 0) and an upper right of
>-        // (width, height), where width and height are the framebuffer object's default width
>-        // and height." See http://anglebug.com/1594
>-        // If the Framebuffer has no color attachment and the default width or height is smaller
>-        // than the current viewport, use the smaller of the two sizes.
>-        // If framebuffer default width or height is 0, the params should not set.
>-        if (!framebuffer->getFirstNonNullAttachment() &&
>-            (framebuffer->getDefaultWidth() || framebuffer->getDefaultHeight()))
>-        {
>-            dxViewport.Width =
>-                static_cast<GLfloat>(std::min(viewport.width, framebuffer->getDefaultWidth()));
>-            dxViewport.Height =
>-                static_cast<GLfloat>(std::min(viewport.height, framebuffer->getDefaultHeight()));
>-        }
>-        else
>-        {
>-            dxViewport.Width  = static_cast<float>(dxViewportWidth);
>-            dxViewport.Height = static_cast<float>(dxViewportHeight);
>-        }
>-        dxViewport.MinDepth = actualZNear;
>-        dxViewport.MaxDepth = actualZFar;
>+    // The es 3.1 spec section 9.2 states that, "If there are no attachments, rendering
>+    // will be limited to a rectangle having a lower left of (0, 0) and an upper right of
>+    // (width, height), where width and height are the framebuffer object's default width
>+    // and height." See http://anglebug.com/1594
>+    // If the Framebuffer has no color attachment and the default width or height is smaller
>+    // than the current viewport, use the smaller of the two sizes.
>+    // If framebuffer default width or height is 0, the params should not set.
>+    if (!framebuffer->getFirstNonNullAttachment() &&
>+        (framebuffer->getDefaultWidth() || framebuffer->getDefaultHeight()))
>+    {
>+        dxViewport.Width =
>+            static_cast<GLfloat>(std::min(viewport.width, framebuffer->getDefaultWidth()));
>+        dxViewport.Height =
>+            static_cast<GLfloat>(std::min(viewport.height, framebuffer->getDefaultHeight()));
>     }
>+    else
>+    {
>+        dxViewport.Width  = static_cast<float>(dxViewportWidth);
>+        dxViewport.Height = static_cast<float>(dxViewportHeight);
>+    }
>+    dxViewport.MinDepth = actualZNear;
>+    dxViewport.MaxDepth = actualZFar;
> 
>-    mRenderer->getDeviceContext()->RSSetViewports(numRectangles, dxViewports.data());
>+    mRenderer->getDeviceContext()->RSSetViewports(1, &dxViewport);
> 
>     mCurViewport = viewport;
>     mCurNear     = actualZNear;
>@@ -1312,14 +1469,9 @@ void StateManager11::invalidateRenderTarget()
> 
> void StateManager11::processFramebufferInvalidation(const gl::Context *context)
> {
>-    if (!mRenderTargetIsDirty)
>-    {
>-        return;
>-    }
>-
>+    ASSERT(mRenderTargetIsDirty);
>     ASSERT(context);
> 
>-    mRenderTargetIsDirty = false;
>     mInternalDirtyBits.set(DIRTY_BIT_RENDER_TARGET);
> 
>     // The pixel shader is dependent on the output layout.
>@@ -1328,7 +1480,7 @@ void StateManager11::processFramebufferInvalidation(const gl::Context *context)
>     // The D3D11 blend state is heavily dependent on the current render target.
>     mInternalDirtyBits.set(DIRTY_BIT_BLEND_STATE);
> 
>-    gl::Framebuffer *fbo = context->getGLState().getDrawFramebuffer();
>+    gl::Framebuffer *fbo = context->getState().getDrawFramebuffer();
>     ASSERT(fbo);
> 
>     // Disable the depth test/depth write if we are using a stencil-only attachment.
>@@ -1373,20 +1525,22 @@ void StateManager11::processFramebufferInvalidation(const gl::Context *context)
> 
> void StateManager11::invalidateBoundViews()
> {
>-    mCurVertexSRVs.clear();
>-    mCurPixelSRVs.clear();
>+    for (SRVCache &curShaderSRV : mCurShaderSRVs)
>+    {
>+        curShaderSRV.clear();
>+    }
> 
>     invalidateRenderTarget();
> }
> 
> void StateManager11::invalidateVertexBuffer()
> {
>-    unsigned int limit = std::min<unsigned int>(mRenderer->getNativeCaps().maxVertexAttributes,
>+    unsigned int limit      = std::min<unsigned int>(mRenderer->getNativeCaps().maxVertexAttributes,
>                                                 gl::MAX_VERTEX_ATTRIBS);
>     mDirtyVertexBufferRange = gl::RangeUI(0, limit);
>-    mInputLayoutIsDirty     = true;
>+    invalidateInputLayout();
>+    invalidateShaders();
>     mInternalDirtyBits.set(DIRTY_BIT_CURRENT_VALUE_ATTRIBS);
>-    invalidateVertexAttributeTranslation();
> }
> 
> void StateManager11::invalidateViewport(const gl::Context *context)
>@@ -1426,6 +1580,16 @@ void StateManager11::invalidateProgramUniformBuffers()
>     mInternalDirtyBits.set(DIRTY_BIT_PROGRAM_UNIFORM_BUFFERS);
> }
> 
>+void StateManager11::invalidateProgramAtomicCounterBuffers()
>+{
>+    mInternalDirtyBits.set(DIRTY_BIT_PROGRAM_ATOMIC_COUNTER_BUFFERS);
>+}
>+
>+void StateManager11::invalidateProgramShaderStorageBuffers()
>+{
>+    mInternalDirtyBits.set(DIRTY_BIT_PROGRAM_SHADER_STORAGE_BUFFERS);
>+}
>+
> void StateManager11::invalidateConstantBuffer(unsigned int slot)
> {
>     if (slot == d3d11::RESERVED_CONSTANT_BUFFER_SLOT_DRIVER)
>@@ -1447,6 +1611,25 @@ void StateManager11::invalidateShaders()
>     mInternalDirtyBits.set(DIRTY_BIT_SHADERS);
> }
> 
>+void StateManager11::invalidateTransformFeedback()
>+{
>+    // Transform feedback affects the stream-out geometry shader.
>+    invalidateShaders();
>+    mInternalDirtyBits.set(DIRTY_BIT_TRANSFORM_FEEDBACK);
>+    // syncPrimitiveTopology checks the transform feedback state.
>+    mInternalDirtyBits.set(DIRTY_BIT_PRIMITIVE_TOPOLOGY);
>+}
>+
>+void StateManager11::invalidateInputLayout()
>+{
>+    mInternalDirtyBits.set(DIRTY_BIT_VERTEX_BUFFERS_AND_INPUT_LAYOUT);
>+}
>+
>+void StateManager11::invalidateIndexBuffer()
>+{
>+    mIndexBufferIsDirty = true;
>+}
>+
> void StateManager11::setRenderTarget(ID3D11RenderTargetView *rtv, ID3D11DepthStencilView *dsv)
> {
>     if ((rtv && unsetConflictingView(rtv)) || (dsv && unsetConflictingView(dsv)))
>@@ -1483,11 +1666,6 @@ void StateManager11::setRenderTargets(ID3D11RenderTargetView **rtvs,
>     mInternalDirtyBits.set(DIRTY_BIT_RENDER_TARGET);
> }
> 
>-void StateManager11::invalidateVertexAttributeTranslation()
>-{
>-    mVertexAttribsNeedTranslation = true;
>-}
>-
> void StateManager11::onBeginQuery(Query11 *query)
> {
>     mCurrentQueries.insert(query);
>@@ -1498,93 +1676,135 @@ void StateManager11::onDeleteQueryObject(Query11 *query)
>     mCurrentQueries.erase(query);
> }
> 
>-gl::Error StateManager11::onMakeCurrent(const gl::Context *context)
>+angle::Result StateManager11::onMakeCurrent(const gl::Context *context)
> {
>-    const gl::State &state = context->getGLState();
>+    ANGLE_TRY(ensureInitialized(context));
>+
>+    const gl::State &state = context->getState();
>+
>+    Context11 *context11 = GetImplAs<Context11>(context);
> 
>     for (Query11 *query : mCurrentQueries)
>     {
>-        ANGLE_TRY(query->pause());
>+        ANGLE_TRY(query->pause(context11));
>     }
>     mCurrentQueries.clear();
> 
>-    for (GLenum queryType : QueryTypes)
>+    for (gl::QueryType type : angle::AllEnums<gl::QueryType>())
>     {
>-        gl::Query *query = state.getActiveQuery(queryType);
>+        gl::Query *query = state.getActiveQuery(type);
>         if (query != nullptr)
>         {
>             Query11 *query11 = GetImplAs<Query11>(query);
>-            ANGLE_TRY(query11->resume());
>+            ANGLE_TRY(query11->resume(context11));
>             mCurrentQueries.insert(query11);
>         }
>     }
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error StateManager11::clearTextures(gl::SamplerType samplerType,
>+angle::Result StateManager11::clearSRVs(gl::ShaderType shaderType,
>                                         size_t rangeStart,
>                                         size_t rangeEnd)
> {
>     if (rangeStart == rangeEnd)
>     {
>-        return gl::NoError();
>+        return angle::Result::Continue;
>     }
> 
>-    auto &currentSRVs = (samplerType == gl::SAMPLER_VERTEX ? mCurVertexSRVs : mCurPixelSRVs);
>-
>-    gl::Range<size_t> clearRange(rangeStart, std::min(rangeEnd, currentSRVs.highestUsed()));
>+    auto *currentSRVs = getSRVCache(shaderType);
>+    gl::Range<size_t> clearRange(rangeStart, std::min(rangeEnd, currentSRVs->highestUsed()));
>     if (clearRange.empty())
>     {
>-        return gl::NoError();
>+        return angle::Result::Continue;
>     }
> 
>     ID3D11DeviceContext *deviceContext = mRenderer->getDeviceContext();
>-    if (samplerType == gl::SAMPLER_VERTEX)
>+    switch (shaderType)
>     {
>-        deviceContext->VSSetShaderResources(static_cast<unsigned int>(clearRange.low()),
>-                                            static_cast<unsigned int>(clearRange.length()),
>-                                            &mNullSRVs[0]);
>+        case gl::ShaderType::Vertex:
>+            deviceContext->VSSetShaderResources(static_cast<unsigned int>(clearRange.low()),
>+                                                static_cast<unsigned int>(clearRange.length()),
>+                                                &mNullSRVs[0]);
>+            break;
>+        case gl::ShaderType::Fragment:
>+            deviceContext->PSSetShaderResources(static_cast<unsigned int>(clearRange.low()),
>+                                                static_cast<unsigned int>(clearRange.length()),
>+                                                &mNullSRVs[0]);
>+            break;
>+        case gl::ShaderType::Compute:
>+            deviceContext->CSSetShaderResources(static_cast<unsigned int>(clearRange.low()),
>+                                                static_cast<unsigned int>(clearRange.length()),
>+                                                &mNullSRVs[0]);
>+            break;
>+        default:
>+            UNREACHABLE();
>+            break;
>     }
>-    else
>+
>+    for (size_t samplerIndex : clearRange)
>     {
>-        deviceContext->PSSetShaderResources(static_cast<unsigned int>(clearRange.low()),
>-                                            static_cast<unsigned int>(clearRange.length()),
>-                                            &mNullSRVs[0]);
>+        currentSRVs->update(samplerIndex, nullptr);
>     }
> 
>-    for (size_t samplerIndex : clearRange)
>+    return angle::Result::Continue;
>+}
>+
>+angle::Result StateManager11::clearUAVs(gl::ShaderType shaderType,
>+                                        size_t rangeStart,
>+                                        size_t rangeEnd)
>+{
>+    ASSERT(shaderType == gl::ShaderType::Compute);
>+    if (rangeStart == rangeEnd)
>+    {
>+        return angle::Result::Continue;
>+    }
>+
>+    gl::Range<size_t> clearRange(rangeStart, std::min(rangeEnd, mCurComputeUAVs.highestUsed()));
>+    if (clearRange.empty())
>+    {
>+        return angle::Result::Continue;
>+    }
>+
>+    ID3D11DeviceContext *deviceContext = mRenderer->getDeviceContext();
>+    deviceContext->CSSetUnorderedAccessViews(static_cast<unsigned int>(clearRange.low()),
>+                                             static_cast<unsigned int>(clearRange.length()),
>+                                             &mNullUAVs[0], nullptr);
>+
>+    for (size_t index : clearRange)
>     {
>-        currentSRVs.update(samplerIndex, nullptr);
>+        mCurComputeUAVs.update(index, nullptr);
>     }
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
> bool StateManager11::unsetConflictingView(ID3D11View *view)
> {
>     uintptr_t resource = reinterpret_cast<uintptr_t>(GetViewResource(view));
>-    return unsetConflictingSRVs(gl::SAMPLER_VERTEX, resource, nullptr) ||
>-           unsetConflictingSRVs(gl::SAMPLER_PIXEL, resource, nullptr);
>+    return unsetConflictingSRVs(gl::ShaderType::Vertex, resource, nullptr) ||
>+           unsetConflictingSRVs(gl::ShaderType::Fragment, resource, nullptr) ||
>+           unsetConflictingSRVs(gl::ShaderType::Compute, resource, nullptr);
> }
> 
>-bool StateManager11::unsetConflictingSRVs(gl::SamplerType samplerType,
>+bool StateManager11::unsetConflictingSRVs(gl::ShaderType shaderType,
>                                           uintptr_t resource,
>                                           const gl::ImageIndex *index)
> {
>-    auto &currentSRVs = (samplerType == gl::SAMPLER_VERTEX ? mCurVertexSRVs : mCurPixelSRVs);
>+    auto *currentSRVs = getSRVCache(shaderType);
> 
>     bool foundOne = false;
> 
>-    for (size_t resourceIndex = 0; resourceIndex < currentSRVs.size(); ++resourceIndex)
>+    for (size_t resourceIndex = 0; resourceIndex < currentSRVs->size(); ++resourceIndex)
>     {
>-        auto &record = currentSRVs[resourceIndex];
>+        auto &record = (*currentSRVs)[resourceIndex];
> 
>-        if (record.srv && record.resource == resource &&
>+        if (record.view && record.resource == resource &&
>             (!index || ImageIndexConflictsWithSRV(*index, record.desc)))
>         {
>             setShaderResourceInternal<d3d11::ShaderResourceView>(
>-                samplerType, static_cast<UINT>(resourceIndex), nullptr);
>+                shaderType, static_cast<UINT>(resourceIndex), nullptr);
>             foundOne = true;
>         }
>     }
>@@ -1593,55 +1813,61 @@ bool StateManager11::unsetConflictingSRVs(gl::SamplerType samplerType,
> }
> 
> void StateManager11::unsetConflictingAttachmentResources(
>-    const gl::FramebufferAttachment *attachment,
>+    const gl::FramebufferAttachment &attachment,
>     ID3D11Resource *resource)
> {
>     // Unbind render target SRVs from the shader here to prevent D3D11 warnings.
>-    if (attachment->type() == GL_TEXTURE)
>+    if (attachment.type() == GL_TEXTURE)
>     {
>         uintptr_t resourcePtr       = reinterpret_cast<uintptr_t>(resource);
>-        const gl::ImageIndex &index = attachment->getTextureImageIndex();
>+        const gl::ImageIndex &index = attachment.getTextureImageIndex();
>         // The index doesn't need to be corrected for the small compressed texture workaround
>         // because a rendertarget is never compressed.
>-        unsetConflictingSRVs(gl::SAMPLER_VERTEX, resourcePtr, &index);
>-        unsetConflictingSRVs(gl::SAMPLER_PIXEL, resourcePtr, &index);
>+        unsetConflictingSRVs(gl::ShaderType::Vertex, resourcePtr, &index);
>+        unsetConflictingSRVs(gl::ShaderType::Fragment, resourcePtr, &index);
>     }
>-    else if (attachment->type() == GL_FRAMEBUFFER_DEFAULT)
>+    else if (attachment.type() == GL_FRAMEBUFFER_DEFAULT)
>     {
>         uintptr_t resourcePtr = reinterpret_cast<uintptr_t>(resource);
>-        unsetConflictingSRVs(gl::SAMPLER_VERTEX, resourcePtr, nullptr);
>-        unsetConflictingSRVs(gl::SAMPLER_PIXEL, resourcePtr, nullptr);
>+        unsetConflictingSRVs(gl::ShaderType::Vertex, resourcePtr, nullptr);
>+        unsetConflictingSRVs(gl::ShaderType::Fragment, resourcePtr, nullptr);
>     }
> }
> 
>-gl::Error StateManager11::initialize(const gl::Caps &caps, const gl::Extensions &extensions)
>+angle::Result StateManager11::ensureInitialized(const gl::Context *context)
> {
>-    mCurVertexSRVs.initialize(caps.maxVertexTextureImageUnits);
>-    mCurPixelSRVs.initialize(caps.maxTextureImageUnits);
>+    Renderer11 *renderer = GetImplAs<Context11>(context)->getRenderer();
> 
>-    // Initialize cached NULL SRV block
>-    mNullSRVs.resize(caps.maxTextureImageUnits, nullptr);
>+    const gl::Caps &caps             = renderer->getNativeCaps();
>+    const gl::Extensions &extensions = renderer->getNativeExtensions();
> 
>-    mCurrentValueAttribs.resize(caps.maxVertexAttributes);
>+    for (gl::ShaderType shaderType : gl::AllShaderTypes())
>+    {
>+        const GLuint maxShaderTextureImageUnits = caps.maxShaderTextureImageUnits[shaderType];
>+
>+        mCurShaderSRVs[shaderType].initialize(maxShaderTextureImageUnits);
>+        mForceSetShaderSamplerStates[shaderType].resize(maxShaderTextureImageUnits, true);
>+        mCurShaderSamplerStates[shaderType].resize(maxShaderTextureImageUnits);
>+    }
> 
>-    mForceSetVertexSamplerStates.resize(caps.maxVertexTextureImageUnits, true);
>-    mForceSetPixelSamplerStates.resize(caps.maxTextureImageUnits, true);
>-    mForceSetComputeSamplerStates.resize(caps.maxComputeTextureImageUnits, true);
>+    mCurComputeUAVs.initialize(caps.maxImageUnits);
> 
>-    mCurVertexSamplerStates.resize(caps.maxVertexTextureImageUnits);
>-    mCurPixelSamplerStates.resize(caps.maxTextureImageUnits);
>-    mCurComputeSamplerStates.resize(caps.maxComputeTextureImageUnits);
>+    // Initialize cached NULL SRV block
>+    mNullSRVs.resize(caps.maxShaderTextureImageUnits[gl::ShaderType::Fragment], nullptr);
>+
>+    mNullUAVs.resize(caps.maxImageUnits, nullptr);
>+
>+    mCurrentValueAttribs.resize(caps.maxVertexAttributes);
> 
>     mShaderConstants.init(caps);
> 
>-    mIsMultiviewEnabled = extensions.multiview;
>-    mViewportOffsets.resize(1u);
>+    mIsMultiviewEnabled = extensions.multiview2;
> 
>-    ANGLE_TRY(mVertexDataManager.initialize());
>+    ANGLE_TRY(mVertexDataManager.initialize(context));
> 
>     mCurrentAttributes.reserve(gl::MAX_VERTEX_ATTRIBS);
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
> void StateManager11::deinitialize()
>@@ -1651,42 +1877,41 @@ void StateManager11::deinitialize()
>     mVertexDataManager.deinitialize();
>     mIndexDataManager.deinitialize();
> 
>-    mDriverConstantBufferVS.reset();
>-    mDriverConstantBufferPS.reset();
>-    mDriverConstantBufferCS.reset();
>+    for (d3d11::Buffer &ShaderDriverConstantBuffer : mShaderDriverConstantBuffers)
>+    {
>+        ShaderDriverConstantBuffer.reset();
>+    }
>+
>+    mPointSpriteVertexBuffer.reset();
>+    mPointSpriteIndexBuffer.reset();
> }
> 
>-gl::Error StateManager11::syncFramebuffer(const gl::Context *context, gl::Framebuffer *framebuffer)
>+// Applies the render target surface, depth stencil surface, viewport rectangle and
>+// scissor rectangle to the renderer
>+angle::Result StateManager11::syncFramebuffer(const gl::Context *context)
> {
>-    Framebuffer11 *framebuffer11 = GetImplAs<Framebuffer11>(framebuffer);
>-
>-    // Applies the render target surface, depth stencil surface, viewport rectangle and
>-    // scissor rectangle to the renderer
>-    ASSERT(framebuffer && !framebuffer->hasAnyDirtyBit() && framebuffer->cachedComplete());
>-
>     // Check for zero-sized default framebuffer, which is a special case.
>     // in this case we do not wish to modify any state and just silently return false.
>     // this will not report any gl error but will cause the calling method to return.
>-    if (framebuffer->id() == 0)
>+    if (mFramebuffer11->getState().id() == 0)
>     {
>-        ASSERT(!framebuffer11->hasAnyInternalDirtyBit());
>-        const gl::Extents &size = framebuffer->getFirstColorbuffer()->getSize();
>-        if (size.width == 0 || size.height == 0)
>+        RenderTarget11 *firstRT = mFramebuffer11->getFirstRenderTarget();
>+        const gl::Extents &size = firstRT->getExtents();
>+        if (size.empty())
>         {
>-            return gl::NoError();
>+            return angle::Result::Continue;
>         }
>     }
> 
>     RTVArray framebufferRTVs = {{}};
>+    const auto &colorRTs     = mFramebuffer11->getCachedColorRenderTargets();
> 
>-    const auto &colorRTs = framebuffer11->getCachedColorRenderTargets();
>-
>-    size_t appliedRTIndex  = 0;
>-    bool skipInactiveRTs   = mRenderer->getWorkarounds().mrtPerfWorkaround;
>-    const auto &drawStates = framebuffer->getDrawBufferStates();
>-    gl::DrawBufferMask activeProgramOutputs =
>-        context->getContextState().getState().getProgram()->getActiveOutputVariables();
>-    UINT maxExistingRT = 0;
>+    size_t appliedRTIndex                   = 0;
>+    bool skipInactiveRTs                    = mRenderer->getWorkarounds().mrtPerfWorkaround;
>+    const auto &drawStates                  = mFramebuffer11->getState().getDrawBufferStates();
>+    gl::DrawBufferMask activeProgramOutputs = mProgramD3D->getState().getActiveOutputVariables();
>+    UINT maxExistingRT                      = 0;
>+    const auto &colorAttachments            = mFramebuffer11->getState().getColorAttachments();
> 
>     for (size_t rtIndex = 0; rtIndex < colorRTs.size(); ++rtIndex)
>     {
>@@ -1706,8 +1931,8 @@ gl::Error StateManager11::syncFramebuffer(const gl::Context *context, gl::Frameb
>             maxExistingRT = static_cast<UINT>(appliedRTIndex) + 1;
> 
>             // Unset conflicting texture SRVs
>-            const auto *attachment = framebuffer->getColorbuffer(rtIndex);
>-            ASSERT(attachment);
>+            const gl::FramebufferAttachment &attachment = colorAttachments[rtIndex];
>+            ASSERT(attachment.isAttached());
>             unsetConflictingAttachmentResources(attachment, renderTarget->getTexture().get());
>         }
> 
>@@ -1716,47 +1941,51 @@ gl::Error StateManager11::syncFramebuffer(const gl::Context *context, gl::Frameb
> 
>     // Get the depth stencil buffers
>     ID3D11DepthStencilView *framebufferDSV = nullptr;
>-    const auto *depthStencilRenderTarget   = framebuffer11->getCachedDepthStencilRenderTarget();
>+    const auto *depthStencilRenderTarget   = mFramebuffer11->getCachedDepthStencilRenderTarget();
>     if (depthStencilRenderTarget)
>     {
>         framebufferDSV = depthStencilRenderTarget->getDepthStencilView().get();
>         ASSERT(framebufferDSV);
> 
>         // Unset conflicting texture SRVs
>-        const auto *attachment = framebuffer->getDepthOrStencilbuffer();
>+        const gl::FramebufferAttachment *attachment =
>+            mFramebuffer11->getState().getDepthOrStencilAttachment();
>         ASSERT(attachment);
>-        unsetConflictingAttachmentResources(attachment,
>+        unsetConflictingAttachmentResources(*attachment,
>                                             depthStencilRenderTarget->getTexture().get());
>     }
> 
>-    // TODO(jmadill): Use context caps?
>-    ASSERT(maxExistingRT <= static_cast<UINT>(mRenderer->getNativeCaps().maxDrawBuffers));
>+    ASSERT(maxExistingRT <= static_cast<UINT>(context->getCaps().maxDrawBuffers));
> 
>     // Apply the render target and depth stencil
>     mRenderer->getDeviceContext()->OMSetRenderTargets(maxExistingRT, framebufferRTVs.data(),
>                                                       framebufferDSV);
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
> void StateManager11::invalidateCurrentValueAttrib(size_t attribIndex)
> {
>     mDirtyCurrentValueAttribs.set(attribIndex);
>     mInternalDirtyBits.set(DIRTY_BIT_CURRENT_VALUE_ATTRIBS);
>+    invalidateInputLayout();
>+    invalidateShaders();
> }
> 
>-gl::Error StateManager11::syncCurrentValueAttribs(const gl::State &glState)
>+angle::Result StateManager11::syncCurrentValueAttribs(
>+    const gl::Context *context,
>+    const std::vector<gl::VertexAttribCurrentValueData> &currentValues)
> {
>-    const auto &activeAttribsMask  = glState.getProgram()->getActiveAttribLocationsMask();
>+    const auto &activeAttribsMask  = mProgramD3D->getState().getActiveAttribLocationsMask();
>     const auto &dirtyActiveAttribs = (activeAttribsMask & mDirtyCurrentValueAttribs);
> 
>     if (!dirtyActiveAttribs.any())
>     {
>-        return gl::NoError();
>+        return angle::Result::Continue;
>     }
> 
>-    const auto &vertexAttributes = glState.getVertexArray()->getVertexAttributes();
>-    const auto &vertexBindings   = glState.getVertexArray()->getVertexBindings();
>+    const auto &vertexAttributes = mVertexArray11->getState().getVertexAttributes();
>+    const auto &vertexBindings   = mVertexArray11->getState().getVertexBindings();
>     mDirtyCurrentValueAttribs    = (mDirtyCurrentValueAttribs & ~dirtyActiveAttribs);
> 
>     for (auto attribIndex : dirtyActiveAttribs)
>@@ -1764,24 +1993,31 @@ gl::Error StateManager11::syncCurrentValueAttribs(const gl::State &glState)
>         if (vertexAttributes[attribIndex].enabled)
>             continue;
> 
>-        const auto *attrib                   = &vertexAttributes[attribIndex];
>-        const auto &currentValue             = glState.getVertexAttribCurrentValue(attribIndex);
>+        const auto *attrib                      = &vertexAttributes[attribIndex];
>+        const auto &currentValue                = currentValues[attribIndex];
>         TranslatedAttribute *currentValueAttrib = &mCurrentValueAttribs[attribIndex];
>-        currentValueAttrib->currentValueType = currentValue.Type;
>-        currentValueAttrib->attribute        = attrib;
>-        currentValueAttrib->binding          = &vertexBindings[attrib->bindingIndex];
>+        currentValueAttrib->currentValueType    = currentValue.Type;
>+        currentValueAttrib->attribute           = attrib;
>+        currentValueAttrib->binding             = &vertexBindings[attrib->bindingIndex];
> 
>         mDirtyVertexBufferRange.extend(static_cast<unsigned int>(attribIndex));
>-        mInputLayoutIsDirty = true;
> 
>-        ANGLE_TRY(mVertexDataManager.storeCurrentValue(currentValue, currentValueAttrib,
>+        ANGLE_TRY(mVertexDataManager.storeCurrentValue(context, currentValue, currentValueAttrib,
>                                                        static_cast<size_t>(attribIndex)));
>     }
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
> void StateManager11::setInputLayout(const d3d11::InputLayout *inputLayout)
>+{
>+    if (setInputLayoutInternal(inputLayout))
>+    {
>+        invalidateInputLayout();
>+    }
>+}
>+
>+bool StateManager11::setInputLayoutInternal(const d3d11::InputLayout *inputLayout)
> {
>     ID3D11DeviceContext *deviceContext = mRenderer->getDeviceContext();
>     if (inputLayout == nullptr)
>@@ -1790,15 +2026,17 @@ void StateManager11::setInputLayout(const d3d11::InputLayout *inputLayout)
>         {
>             deviceContext->IASetInputLayout(nullptr);
>             mCurrentInputLayout.clear();
>-            mInputLayoutIsDirty = true;
>+            return true;
>         }
>     }
>     else if (inputLayout->getSerial() != mCurrentInputLayout)
>     {
>         deviceContext->IASetInputLayout(inputLayout->get());
>         mCurrentInputLayout = inputLayout->getSerial();
>-        mInputLayoutIsDirty = true;
>+        return true;
>     }
>+
>+    return false;
> }
> 
> bool StateManager11::queueVertexBufferChange(size_t bufferIndex,
>@@ -1810,7 +2048,6 @@ bool StateManager11::queueVertexBufferChange(size_t bufferIndex,
>         stride != mCurrentVertexStrides[bufferIndex] ||
>         offset != mCurrentVertexOffsets[bufferIndex])
>     {
>-        mInputLayoutIsDirty = true;
>         mDirtyVertexBufferRange.extend(static_cast<unsigned int>(bufferIndex));
> 
>         mCurrentVertexBuffers[bufferIndex] = buffer;
>@@ -1822,18 +2059,6 @@ bool StateManager11::queueVertexBufferChange(size_t bufferIndex,
>     return false;
> }
> 
>-bool StateManager11::queueVertexOffsetChange(size_t bufferIndex, UINT offsetOnly)
>-{
>-    if (offsetOnly != mCurrentVertexOffsets[bufferIndex])
>-    {
>-        mInputLayoutIsDirty = true;
>-        mDirtyVertexBufferRange.extend(static_cast<unsigned int>(bufferIndex));
>-        mCurrentVertexOffsets[bufferIndex] = offsetOnly;
>-        return true;
>-    }
>-    return false;
>-}
>-
> void StateManager11::applyVertexBufferChanges()
> {
>     if (mDirtyVertexBufferRange.empty())
>@@ -1858,38 +2083,41 @@ void StateManager11::setSingleVertexBuffer(const d3d11::Buffer *buffer, UINT str
>     ID3D11Buffer *native = buffer ? buffer->get() : nullptr;
>     if (queueVertexBufferChange(0, native, stride, offset))
>     {
>+        invalidateInputLayout();
>         applyVertexBufferChanges();
>     }
> }
> 
>-gl::Error StateManager11::updateState(const gl::Context *context, GLenum drawMode)
>+angle::Result StateManager11::updateState(const gl::Context *context,
>+                                          gl::PrimitiveMode mode,
>+                                          GLint firstVertex,
>+                                          GLsizei vertexOrIndexCount,
>+                                          gl::DrawElementsType indexTypeOrInvalid,
>+                                          const void *indices,
>+                                          GLsizei instanceCount,
>+                                          GLint baseVertex)
> {
>-    const auto &glState = context->getGLState();
>-    auto *programD3D    = GetImplAs<ProgramD3D>(glState.getProgram());
>+    const gl::State &glState = context->getState();
> 
>     // TODO(jmadill): Use dirty bits.
>-    processFramebufferInvalidation(context);
>+    if (mRenderTargetIsDirty)
>+    {
>+        processFramebufferInvalidation(context);
>+        mRenderTargetIsDirty = false;
>+    }
> 
>     // TODO(jmadill): Use dirty bits.
>-    if (programD3D->updateSamplerMapping() == ProgramD3D::SamplerMapping::WasDirty)
>+    if (mProgramD3D->updateSamplerMapping() == ProgramD3D::SamplerMapping::WasDirty)
>     {
>         invalidateTexturesAndSamplers();
>     }
> 
>     // TODO(jmadill): Use dirty bits.
>-    if (programD3D->areVertexUniformsDirty() || programD3D->areFragmentUniformsDirty())
>+    if (mProgramD3D->anyShaderUniformsDirty())
>     {
>         mInternalDirtyBits.set(DIRTY_BIT_PROGRAM_UNIFORMS);
>     }
> 
>-    // Transform feedback affects the stream-out geometry shader.
>-    // TODO(jmadill): Use dirty bits.
>-    if (glState.isTransformFeedbackActiveUnpaused() != mIsTransformFeedbackCurrentlyActiveUnpaused)
>-    {
>-        mIsTransformFeedbackCurrentlyActiveUnpaused = glState.isTransformFeedbackActiveUnpaused();
>-        invalidateShaders();
>-    }
>-
>     // Swizzling can cause internal state changes with blit shaders.
>     if (mDirtySwizzles)
>     {
>@@ -1897,41 +2125,56 @@ gl::Error StateManager11::updateState(const gl::Context *context, GLenum drawMod
>         mDirtySwizzles = false;
>     }
> 
>-    gl::Framebuffer *framebuffer = glState.getDrawFramebuffer();
>-    Framebuffer11 *framebuffer11 = GetImplAs<Framebuffer11>(framebuffer);
>-    ANGLE_TRY(framebuffer11->markAttachmentsDirty(context));
>+    ANGLE_TRY(mFramebuffer11->markAttachmentsDirty(context));
> 
>-    if (framebuffer11->hasAnyInternalDirtyBit())
>+    // TODO(jiawei.shao@intel.com): This can be recomputed only on framebuffer or multisample mask
>+    // state changes.
>+    RenderTarget11 *firstRT = mFramebuffer11->getFirstRenderTarget();
>+    int samples             = (firstRT ? firstRT->getSamples() : 0);
>+    unsigned int sampleMask = GetBlendSampleMask(glState, samples);
>+    if (sampleMask != mCurSampleMask)
>     {
>-        ASSERT(framebuffer->id() != 0);
>-        framebuffer11->syncInternalState(context);
>+        mInternalDirtyBits.set(DIRTY_BIT_BLEND_STATE);
>     }
> 
>-    bool pointDrawMode = (drawMode == GL_POINTS);
>-    if (pointDrawMode != mCurRasterState.pointDrawMode)
>+    ANGLE_TRY(mVertexArray11->syncStateForDraw(context, firstVertex, vertexOrIndexCount,
>+                                               indexTypeOrInvalid, indices, instanceCount,
>+                                               baseVertex));
>+
>+    // Changes in the draw call can affect the vertex buffer translations.
>+    if (!mLastFirstVertex.valid() || mLastFirstVertex.value() != firstVertex)
>     {
>-        mInternalDirtyBits.set(DIRTY_BIT_RASTERIZER_STATE);
>+        mLastFirstVertex = firstVertex;
>+        invalidateInputLayout();
>+    }
> 
>-        // Changing from points to not points (or vice-versa) affects the geometry shader.
>-        invalidateShaders();
>+    // The ShaderConstants only need to be updated when the program uses vertexID
>+    if (mProgramD3D->usesVertexID())
>+    {
>+        if (mShaderConstants.onFirstVertexChange(firstVertex))
>+        {
>+            mInternalDirtyBits.set(DIRTY_BIT_DRIVER_UNIFORMS);
>+        }
>     }
> 
>-    // TODO(jiawei.shao@intel.com): This can be recomputed only on framebuffer or multisample mask
>-    // state changes.
>-    RenderTarget11 *firstRT = framebuffer11->getFirstRenderTarget();
>-    int samples             = (firstRT ? firstRT->getSamples() : 0);
>-    unsigned int sampleMask = GetBlendSampleMask(glState, samples);
>-    if (sampleMask != mCurSampleMask)
>+    if (indexTypeOrInvalid != gl::DrawElementsType::InvalidEnum)
>     {
>-        mInternalDirtyBits.set(DIRTY_BIT_BLEND_STATE);
>+        ANGLE_TRY(applyIndexBuffer(context, vertexOrIndexCount, indexTypeOrInvalid, indices));
>     }
> 
>-    // Changing the vertex attribute state can affect the vertex shader.
>-    gl::VertexArray *vao = glState.getVertexArray();
>-    VertexArray11 *vao11 = GetImplAs<VertexArray11>(vao);
>-    if (vao11->flushAttribUpdates(context))
>+    if (mLastAppliedDrawMode != mode)
>     {
>-        mInternalDirtyBits.set(DIRTY_BIT_SHADERS);
>+        mLastAppliedDrawMode = mode;
>+        mInternalDirtyBits.set(DIRTY_BIT_PRIMITIVE_TOPOLOGY);
>+
>+        bool pointDrawMode = (mode == gl::PrimitiveMode::Points);
>+        if (pointDrawMode != mCurRasterState.pointDrawMode)
>+        {
>+            mInternalDirtyBits.set(DIRTY_BIT_RASTERIZER_STATE);
>+
>+            // Changing from points to not points (or vice-versa) affects the geometry shader.
>+            invalidateShaders();
>+        }
>     }
> 
>     auto dirtyBitsCopy = mInternalDirtyBits;
>@@ -1942,7 +2185,7 @@ gl::Error StateManager11::updateState(const gl::Context *context, GLenum drawMod
>         switch (dirtyBit)
>         {
>             case DIRTY_BIT_RENDER_TARGET:
>-                ANGLE_TRY(syncFramebuffer(context, framebuffer));
>+                ANGLE_TRY(syncFramebuffer(context));
>                 break;
>             case DIRTY_BIT_VIEWPORT_STATE:
>                 syncViewport(context);
>@@ -1951,34 +2194,51 @@ gl::Error StateManager11::updateState(const gl::Context *context, GLenum drawMod
>                 syncScissorRectangle(glState.getScissor(), glState.isScissorTestEnabled());
>                 break;
>             case DIRTY_BIT_RASTERIZER_STATE:
>-                ANGLE_TRY(syncRasterizerState(context, pointDrawMode));
>+                ANGLE_TRY(syncRasterizerState(context, mode));
>                 break;
>             case DIRTY_BIT_BLEND_STATE:
>-                ANGLE_TRY(syncBlendState(context, framebuffer, glState.getBlendState(),
>-                                         glState.getBlendColor(), sampleMask));
>+                ANGLE_TRY(syncBlendState(context, glState.getBlendState(), glState.getBlendColor(),
>+                                         sampleMask));
>                 break;
>             case DIRTY_BIT_DEPTH_STENCIL_STATE:
>-                ANGLE_TRY(syncDepthStencilState(glState));
>+                ANGLE_TRY(syncDepthStencilState(context));
>                 break;
>             case DIRTY_BIT_TEXTURE_AND_SAMPLER_STATE:
>                 // TODO(jmadill): More fine-grained update.
>                 ANGLE_TRY(syncTextures(context));
>                 break;
>             case DIRTY_BIT_PROGRAM_UNIFORMS:
>-                ANGLE_TRY(applyUniforms(programD3D));
>+                ANGLE_TRY(applyUniforms(context));
>                 break;
>             case DIRTY_BIT_DRIVER_UNIFORMS:
>                 // This must happen after viewport sync; the viewport affects builtin uniforms.
>-                ANGLE_TRY(applyDriverUniforms(*programD3D));
>+                ANGLE_TRY(applyDriverUniforms(context));
>                 break;
>             case DIRTY_BIT_PROGRAM_UNIFORM_BUFFERS:
>-                ANGLE_TRY(syncUniformBuffers(context, programD3D));
>+                ANGLE_TRY(syncUniformBuffers(context));
>+                break;
>+            case DIRTY_BIT_PROGRAM_ATOMIC_COUNTER_BUFFERS:
>+                // TODO(jie.a.chen@intel.com): http://anglebug.com/1729
>+                break;
>+            case DIRTY_BIT_PROGRAM_SHADER_STORAGE_BUFFERS:
>+                // TODO(jie.a.chen@intel.com): http://anglebug.com/1951
>                 break;
>             case DIRTY_BIT_SHADERS:
>-                ANGLE_TRY(syncProgram(context, drawMode));
>+                ANGLE_TRY(syncProgram(context, mode));
>                 break;
>             case DIRTY_BIT_CURRENT_VALUE_ATTRIBS:
>-                ANGLE_TRY(syncCurrentValueAttribs(glState));
>+                ANGLE_TRY(syncCurrentValueAttribs(context, glState.getVertexAttribCurrentValues()));
>+                break;
>+            case DIRTY_BIT_TRANSFORM_FEEDBACK:
>+                ANGLE_TRY(syncTransformFeedbackBuffers(context));
>+                break;
>+            case DIRTY_BIT_VERTEX_BUFFERS_AND_INPUT_LAYOUT:
>+                ANGLE_TRY(syncVertexBuffersAndInputLayout(context, mode, firstVertex,
>+                                                          vertexOrIndexCount, indexTypeOrInvalid,
>+                                                          instanceCount));
>+                break;
>+            case DIRTY_BIT_PRIMITIVE_TOPOLOGY:
>+                syncPrimitiveTopology(glState, mode);
>                 break;
>             default:
>                 UNREACHABLE();
>@@ -1986,15 +2246,13 @@ gl::Error StateManager11::updateState(const gl::Context *context, GLenum drawMod
>         }
>     }
> 
>-    ANGLE_TRY(syncTransformFeedbackBuffers(context));
>-
>     // Check that we haven't set any dirty bits in the flushing of the dirty bits loop.
>     ASSERT(mInternalDirtyBits.none());
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-void StateManager11::setShaderResourceShared(gl::SamplerType shaderType,
>+void StateManager11::setShaderResourceShared(gl::ShaderType shaderType,
>                                              UINT resourceSlot,
>                                              const d3d11::SharedSRV *srv)
> {
>@@ -2004,7 +2262,7 @@ void StateManager11::setShaderResourceShared(gl::SamplerType shaderType,
>     mInternalDirtyBits.set(DIRTY_BIT_TEXTURE_AND_SAMPLER_STATE);
> }
> 
>-void StateManager11::setShaderResource(gl::SamplerType shaderType,
>+void StateManager11::setShaderResource(gl::ShaderType shaderType,
>                                        UINT resourceSlot,
>                                        const d3d11::ShaderResourceView *srv)
> {
>@@ -2015,11 +2273,24 @@ void StateManager11::setShaderResource(gl::SamplerType shaderType,
> }
> 
> void StateManager11::setPrimitiveTopology(D3D11_PRIMITIVE_TOPOLOGY primitiveTopology)
>+{
>+    if (setPrimitiveTopologyInternal(primitiveTopology))
>+    {
>+        mInternalDirtyBits.set(DIRTY_BIT_PRIMITIVE_TOPOLOGY);
>+    }
>+}
>+
>+bool StateManager11::setPrimitiveTopologyInternal(D3D11_PRIMITIVE_TOPOLOGY primitiveTopology)
> {
>     if (primitiveTopology != mCurrentPrimitiveTopology)
>     {
>         mRenderer->getDeviceContext()->IASetPrimitiveTopology(primitiveTopology);
>         mCurrentPrimitiveTopology = primitiveTopology;
>+        return true;
>+    }
>+    else
>+    {
>+        return false;
>     }
> }
> 
>@@ -2036,11 +2307,11 @@ void StateManager11::setVertexShader(const d3d11::VertexShader *shader)
> {
>     ResourceSerial serial = shader ? shader->getSerial() : ResourceSerial(0);
> 
>-    if (serial != mAppliedVertexShader)
>+    if (serial != mAppliedShaders[gl::ShaderType::Vertex])
>     {
>         ID3D11VertexShader *appliedShader = shader ? shader->get() : nullptr;
>         mRenderer->getDeviceContext()->VSSetShader(appliedShader, nullptr, 0);
>-        mAppliedVertexShader = serial;
>+        mAppliedShaders[gl::ShaderType::Vertex] = serial;
>         invalidateShaders();
>     }
> }
>@@ -2049,11 +2320,11 @@ void StateManager11::setGeometryShader(const d3d11::GeometryShader *shader)
> {
>     ResourceSerial serial = shader ? shader->getSerial() : ResourceSerial(0);
> 
>-    if (serial != mAppliedGeometryShader)
>+    if (serial != mAppliedShaders[gl::ShaderType::Geometry])
>     {
>         ID3D11GeometryShader *appliedShader = shader ? shader->get() : nullptr;
>         mRenderer->getDeviceContext()->GSSetShader(appliedShader, nullptr, 0);
>-        mAppliedGeometryShader = serial;
>+        mAppliedShaders[gl::ShaderType::Geometry] = serial;
>         invalidateShaders();
>     }
> }
>@@ -2062,11 +2333,11 @@ void StateManager11::setPixelShader(const d3d11::PixelShader *shader)
> {
>     ResourceSerial serial = shader ? shader->getSerial() : ResourceSerial(0);
> 
>-    if (serial != mAppliedPixelShader)
>+    if (serial != mAppliedShaders[gl::ShaderType::Fragment])
>     {
>         ID3D11PixelShader *appliedShader = shader ? shader->get() : nullptr;
>         mRenderer->getDeviceContext()->PSSetShader(appliedShader, nullptr, 0);
>-        mAppliedPixelShader = serial;
>+        mAppliedShaders[gl::ShaderType::Fragment] = serial;
>         invalidateShaders();
>     }
> }
>@@ -2075,12 +2346,12 @@ void StateManager11::setComputeShader(const d3d11::ComputeShader *shader)
> {
>     ResourceSerial serial = shader ? shader->getSerial() : ResourceSerial(0);
> 
>-    if (serial != mAppliedComputeShader)
>+    if (serial != mAppliedShaders[gl::ShaderType::Compute])
>     {
>         ID3D11ComputeShader *appliedShader = shader ? shader->get() : nullptr;
>         mRenderer->getDeviceContext()->CSSetShader(appliedShader, nullptr, 0);
>-        mAppliedComputeShader = serial;
>-        // TODO(jmadill): Dirty bits for compute.
>+        mAppliedShaders[gl::ShaderType::Compute] = serial;
>+        invalidateShaders();
>     }
> }
> 
>@@ -2215,11 +2486,11 @@ void StateManager11::setSimplePixelTextureAndSampler(const d3d11::SharedSRV &srv
> {
>     ID3D11DeviceContext *deviceContext = mRenderer->getDeviceContext();
> 
>-    setShaderResourceInternal(gl::SAMPLER_PIXEL, 0, &srv);
>+    setShaderResourceInternal(gl::ShaderType::Fragment, 0, &srv);
>     deviceContext->PSSetSamplers(0, 1, samplerState.getPointer());
> 
>     mInternalDirtyBits.set(DIRTY_BIT_TEXTURE_AND_SAMPLER_STATE);
>-    mForceSetPixelSamplerStates[0] = true;
>+    mForceSetShaderSamplerStates[gl::ShaderType::Fragment][0] = true;
> }
> 
> void StateManager11::setSimpleScissorRect(const gl::Rectangle &glRect)
>@@ -2238,25 +2509,155 @@ void StateManager11::setScissorRectD3D(const D3D11_RECT &d3dRect)
>     mInternalDirtyBits.set(DIRTY_BIT_SCISSOR_STATE);
> }
> 
>+angle::Result StateManager11::syncTextures(const gl::Context *context)
>+{
>+    ANGLE_TRY(applyTexturesForSRVs(context, gl::ShaderType::Vertex));
>+    ANGLE_TRY(applyTexturesForSRVs(context, gl::ShaderType::Fragment));
>+    if (mProgramD3D->hasShaderStage(gl::ShaderType::Geometry))
>+    {
>+        ANGLE_TRY(applyTexturesForSRVs(context, gl::ShaderType::Geometry));
>+    }
>+
>+    return angle::Result::Continue;
>+}
>+
>+angle::Result StateManager11::setSamplerState(const gl::Context *context,
>+                                              gl::ShaderType type,
>+                                              int index,
>+                                              gl::Texture *texture,
>+                                              const gl::SamplerState &samplerState)
>+{
>+#if !defined(NDEBUG)
>+    // Storage should exist, texture should be complete. Only verified in Debug.
>+    TextureD3D *textureD3D  = GetImplAs<TextureD3D>(texture);
>+    TextureStorage *storage = nullptr;
>+    ANGLE_TRY(textureD3D->getNativeTexture(context, &storage));
>+    ASSERT(storage);
>+#endif  // !defined(NDEBUG)
>+
>+    auto *deviceContext = mRenderer->getDeviceContext();
>+
>+    ASSERT(static_cast<unsigned int>(index) <
>+           mRenderer->getNativeCaps().maxShaderTextureImageUnits[type]);
>+
>+    if (mForceSetShaderSamplerStates[type][index] ||
>+        memcmp(&samplerState, &mCurShaderSamplerStates[type][index], sizeof(gl::SamplerState)) != 0)
>+    {
>+        ID3D11SamplerState *dxSamplerState = nullptr;
>+        ANGLE_TRY(mRenderer->getSamplerState(context, samplerState, &dxSamplerState));
>+
>+        ASSERT(dxSamplerState != nullptr);
>+
>+        switch (type)
>+        {
>+            case gl::ShaderType::Vertex:
>+                deviceContext->VSSetSamplers(index, 1, &dxSamplerState);
>+                break;
>+            case gl::ShaderType::Fragment:
>+                deviceContext->PSSetSamplers(index, 1, &dxSamplerState);
>+                break;
>+            case gl::ShaderType::Compute:
>+                deviceContext->CSSetSamplers(index, 1, &dxSamplerState);
>+                break;
>+            case gl::ShaderType::Geometry:
>+                deviceContext->GSSetSamplers(index, 1, &dxSamplerState);
>+                break;
>+            default:
>+                UNREACHABLE();
>+                break;
>+        }
>+
>+        mCurShaderSamplerStates[type][index] = samplerState;
>+    }
>+
>+    mForceSetShaderSamplerStates[type][index] = false;
>+
>+    // Sampler metadata that's passed to shaders in uniforms is stored separately from rest of the
>+    // sampler state since having it in contiguous memory makes it possible to memcpy to a constant
>+    // buffer, and it doesn't affect the state set by
>+    // PSSetSamplers/VSSetSamplers/CSSetSamplers/GSSetSamplers.
>+    mShaderConstants.onSamplerChange(type, index, *texture, samplerState);
>+
>+    return angle::Result::Continue;
>+}
>+
>+angle::Result StateManager11::setTextureForSampler(const gl::Context *context,
>+                                                   gl::ShaderType type,
>+                                                   int index,
>+                                                   gl::Texture *texture,
>+                                                   const gl::SamplerState &sampler)
>+{
>+    const d3d11::SharedSRV *textureSRV = nullptr;
>+
>+    if (texture)
>+    {
>+        TextureD3D *textureImpl = GetImplAs<TextureD3D>(texture);
>+
>+        TextureStorage *texStorage = nullptr;
>+        ANGLE_TRY(textureImpl->getNativeTexture(context, &texStorage));
>+
>+        // Texture should be complete and have a storage
>+        ASSERT(texStorage);
>+
>+        TextureStorage11 *storage11 = GetAs<TextureStorage11>(texStorage);
>+
>+        ANGLE_TRY(
>+            storage11->getSRVForSampler(context, texture->getTextureState(), sampler, &textureSRV));
>+
>+        // If we get an invalid SRV here, something went wrong in the texture class and we're
>+        // unexpectedly missing the shader resource view.
>+        ASSERT(textureSRV->valid());
>+
>+        textureImpl->resetDirty();
>+    }
>+
>+    ASSERT((type == gl::ShaderType::Fragment &&
>+            static_cast<unsigned int>(index) <
>+                mRenderer->getNativeCaps().maxShaderTextureImageUnits[gl::ShaderType::Fragment]) ||
>+           (type == gl::ShaderType::Vertex &&
>+            static_cast<unsigned int>(index) <
>+                mRenderer->getNativeCaps().maxShaderTextureImageUnits[gl::ShaderType::Vertex]) ||
>+           (type == gl::ShaderType::Compute &&
>+            static_cast<unsigned int>(index) <
>+                mRenderer->getNativeCaps().maxShaderTextureImageUnits[gl::ShaderType::Compute]));
>+
>+    setShaderResourceInternal(type, index, textureSRV);
>+    return angle::Result::Continue;
>+}
>+
>+angle::Result StateManager11::setImageState(const gl::Context *context,
>+                                            gl::ShaderType type,
>+                                            int index,
>+                                            const gl::ImageUnit &imageUnit)
>+{
>+    ASSERT(static_cast<unsigned int>(index) <
>+           mRenderer->getNativeCaps().maxShaderImageUniforms[type]);
>+
>+    mShaderConstants.onImageChange(type, index, imageUnit);
>+
>+    return angle::Result::Continue;
>+}
>+
> // For each Direct3D sampler of either the pixel or vertex stage,
> // looks up the corresponding OpenGL texture image unit and texture type,
> // and sets the texture and its addressing/filtering state (or NULL when inactive).
> // Sampler mapping needs to be up-to-date on the program object before this is called.
>-gl::Error StateManager11::applyTextures(const gl::Context *context, gl::SamplerType shaderType)
>+angle::Result StateManager11::applyTexturesForSRVs(const gl::Context *context,
>+                                                   gl::ShaderType shaderType)
> {
>-    const auto &glState    = context->getGLState();
>-    const auto &caps       = context->getCaps();
>-    ProgramD3D *programD3D = GetImplAs<ProgramD3D>(glState.getProgram());
>+    const auto &glState = context->getState();
>+    const auto &caps    = context->getCaps();
> 
>-    ASSERT(!programD3D->isSamplerMappingDirty());
>+    ASSERT(!mProgramD3D->isSamplerMappingDirty());
> 
>     // TODO(jmadill): Use the Program's sampler bindings.
>-    const auto &completeTextures = glState.getCompleteTextureCache();
>+    const gl::ActiveTexturePointerArray &completeTextures = glState.getActiveTexturesCache();
> 
>-    unsigned int samplerRange = programD3D->getUsedSamplerRange(shaderType);
>-    for (unsigned int samplerIndex = 0; samplerIndex < samplerRange; samplerIndex++)
>+    const gl::RangeUI samplerRange = mProgramD3D->getUsedSamplerRange(shaderType);
>+    for (unsigned int samplerIndex = samplerRange.low(); samplerIndex < samplerRange.high();
>+         samplerIndex++)
>     {
>-        GLint textureUnit = programD3D->getSamplerMapping(shaderType, samplerIndex, caps);
>+        GLint textureUnit = mProgramD3D->getSamplerMapping(shaderType, samplerIndex, caps);
>         ASSERT(textureUnit != -1);
>         gl::Texture *texture = completeTextures[textureUnit];
> 
>@@ -2269,11 +2670,13 @@ gl::Error StateManager11::applyTextures(const gl::Context *context, gl::SamplerT
>                 samplerObject ? samplerObject->getSamplerState() : texture->getSamplerState();
> 
>             ANGLE_TRY(setSamplerState(context, shaderType, samplerIndex, texture, samplerState));
>-            ANGLE_TRY(setTexture(context, shaderType, samplerIndex, texture));
>+            ANGLE_TRY(
>+                setTextureForSampler(context, shaderType, samplerIndex, texture, samplerState));
>         }
>         else
>         {
>-            GLenum textureType = programD3D->getSamplerTextureType(shaderType, samplerIndex);
>+            gl::TextureType textureType =
>+                mProgramD3D->getSamplerTextureType(shaderType, samplerIndex);
> 
>             // Texture is not sampler complete or it is in use by the framebuffer.  Bind the
>             // incomplete texture.
>@@ -2281,144 +2684,121 @@ gl::Error StateManager11::applyTextures(const gl::Context *context, gl::SamplerT
>             ANGLE_TRY(mRenderer->getIncompleteTexture(context, textureType, &incompleteTexture));
>             ANGLE_TRY(setSamplerState(context, shaderType, samplerIndex, incompleteTexture,
>                                       incompleteTexture->getSamplerState()));
>-            ANGLE_TRY(setTexture(context, shaderType, samplerIndex, incompleteTexture));
>+            ANGLE_TRY(setTextureForSampler(context, shaderType, samplerIndex, incompleteTexture,
>+                                           incompleteTexture->getSamplerState()));
>         }
>     }
> 
>-    // Set all the remaining textures to NULL
>-    size_t samplerCount = (shaderType == gl::SAMPLER_PIXEL) ? caps.maxTextureImageUnits
>-                                                            : caps.maxVertexTextureImageUnits;
>-    ANGLE_TRY(clearTextures(shaderType, samplerRange, samplerCount));
>-
>-    return gl::NoError();
>-}
>-
>-gl::Error StateManager11::syncTextures(const gl::Context *context)
>-{
>-    ANGLE_TRY(applyTextures(context, gl::SAMPLER_VERTEX));
>-    ANGLE_TRY(applyTextures(context, gl::SAMPLER_PIXEL));
>-    return gl::NoError();
>-}
>-
>-gl::Error StateManager11::setSamplerState(const gl::Context *context,
>-                                          gl::SamplerType type,
>-                                          int index,
>-                                          gl::Texture *texture,
>-                                          const gl::SamplerState &samplerState)
>-{
>-#if !defined(NDEBUG)
>-    // Storage should exist, texture should be complete. Only verified in Debug.
>-    TextureD3D *textureD3D  = GetImplAs<TextureD3D>(texture);
>-    TextureStorage *storage = nullptr;
>-    ANGLE_TRY(textureD3D->getNativeTexture(context, &storage));
>-    ASSERT(storage);
>-#endif  // !defined(NDEBUG)
>-
>-    auto *deviceContext = mRenderer->getDeviceContext();
>-
>-    if (type == gl::SAMPLER_PIXEL)
>+    const gl::RangeUI readonlyImageRange = mProgramD3D->getUsedImageRange(shaderType, true);
>+    for (unsigned int readonlyImageIndex = readonlyImageRange.low();
>+         readonlyImageIndex < readonlyImageRange.high(); readonlyImageIndex++)
>     {
>-        ASSERT(static_cast<unsigned int>(index) < mRenderer->getNativeCaps().maxTextureImageUnits);
>-
>-        if (mForceSetPixelSamplerStates[index] ||
>-            memcmp(&samplerState, &mCurPixelSamplerStates[index], sizeof(gl::SamplerState)) != 0)
>+        GLint imageUnitIndex =
>+            mProgramD3D->getImageMapping(shaderType, readonlyImageIndex, true, caps);
>+        ASSERT(imageUnitIndex != -1);
>+        const gl::ImageUnit &imageUnit = glState.getImageUnit(imageUnitIndex);
>+        if (!imageUnit.layered)
>         {
>-            ID3D11SamplerState *dxSamplerState = nullptr;
>-            ANGLE_TRY(mRenderer->getSamplerState(samplerState, &dxSamplerState));
>-
>-            ASSERT(dxSamplerState != nullptr);
>-            deviceContext->PSSetSamplers(index, 1, &dxSamplerState);
>-
>-            mCurPixelSamplerStates[index] = samplerState;
>+            ANGLE_TRY(setImageState(context, gl::ShaderType::Compute,
>+                                    readonlyImageIndex - readonlyImageRange.low(), imageUnit));
>+            invalidateProgramUniforms();
>         }
>-
>-        mForceSetPixelSamplerStates[index] = false;
>+        ANGLE_TRY(setTextureForImage(context, shaderType, readonlyImageIndex, true, imageUnit));
>     }
>-    else if (type == gl::SAMPLER_VERTEX)
>-    {
>-        ASSERT(static_cast<unsigned int>(index) <
>-               mRenderer->getNativeCaps().maxVertexTextureImageUnits);
> 
>-        if (mForceSetVertexSamplerStates[index] ||
>-            memcmp(&samplerState, &mCurVertexSamplerStates[index], sizeof(gl::SamplerState)) != 0)
>-        {
>-            ID3D11SamplerState *dxSamplerState = nullptr;
>-            ANGLE_TRY(mRenderer->getSamplerState(samplerState, &dxSamplerState));
>+    size_t samplerCount = caps.maxShaderTextureImageUnits[shaderType];
>+    size_t readonlyImageCount =
>+        context->getClientVersion() >= gl::Version(3, 1) ? caps.maxImageUnits : 0;
> 
>-            ASSERT(dxSamplerState != nullptr);
>-            deviceContext->VSSetSamplers(index, 1, &dxSamplerState);
>+    // Samplers and readonly images share the SRVs here, their range is
>+    // [0, max(samplerRange.high(), readonlyImageRange.high()).
>+    ANGLE_TRY(clearSRVs(shaderType, std::max(samplerRange.high(), readonlyImageRange.high()),
>+                        samplerCount + readonlyImageCount));
> 
>-            mCurVertexSamplerStates[index] = samplerState;
>-        }
>+    return angle::Result::Continue;
>+}
> 
>-        mForceSetVertexSamplerStates[index] = false;
>-    }
>-    else if (type == gl::SAMPLER_COMPUTE)
>-    {
>-        ASSERT(static_cast<unsigned int>(index) <
>-               mRenderer->getNativeCaps().maxComputeTextureImageUnits);
>+angle::Result StateManager11::applyTexturesForUAVs(const gl::Context *context,
>+                                                   gl::ShaderType shaderType)
>+{
>+    ASSERT(shaderType == gl::ShaderType::Compute);
>+    const auto &glState = context->getState();
>+    const auto &caps    = context->getCaps();
> 
>-        if (mForceSetComputeSamplerStates[index] ||
>-            memcmp(&samplerState, &mCurComputeSamplerStates[index], sizeof(gl::SamplerState)) != 0)
>+    const gl::RangeUI imageRange = mProgramD3D->getUsedImageRange(shaderType, false);
>+    for (unsigned int imageIndex = imageRange.low(); imageIndex < imageRange.high(); imageIndex++)
>+    {
>+        GLint imageUnitIndex = mProgramD3D->getImageMapping(shaderType, imageIndex, false, caps);
>+        ASSERT(imageUnitIndex != -1);
>+        const gl::ImageUnit &imageUnit = glState.getImageUnit(imageUnitIndex);
>+        if (!imageUnit.layered)
>         {
>-            ID3D11SamplerState *dxSamplerState = nullptr;
>-            ANGLE_TRY(mRenderer->getSamplerState(samplerState, &dxSamplerState));
>-
>-            ASSERT(dxSamplerState != nullptr);
>-            deviceContext->CSSetSamplers(index, 1, &dxSamplerState);
>-
>-            mCurComputeSamplerStates[index] = samplerState;
>+            ANGLE_TRY(setImageState(context, gl::ShaderType::Compute, imageIndex - imageRange.low(),
>+                                    imageUnit));
>+            invalidateProgramUniforms();
>         }
>-
>-        mForceSetComputeSamplerStates[index] = false;
>+        ANGLE_TRY(setTextureForImage(context, shaderType, imageIndex, false, imageUnit));
>     }
>-    else
>-        UNREACHABLE();
> 
>-    // Sampler metadata that's passed to shaders in uniforms is stored separately from rest of the
>-    // sampler state since having it in contiguous memory makes it possible to memcpy to a constant
>-    // buffer, and it doesn't affect the state set by PSSetSamplers/VSSetSamplers.
>-    mShaderConstants.onSamplerChange(type, index, *texture);
>+    size_t imageCount = caps.maxImageUnits;
>+    ANGLE_TRY(clearUAVs(shaderType, imageRange.high(), imageCount));
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error StateManager11::setTexture(const gl::Context *context,
>-                                     gl::SamplerType type,
>-                                     int index,
>-                                     gl::Texture *texture)
>+angle::Result StateManager11::syncTexturesForCompute(const gl::Context *context)
> {
>-    const d3d11::SharedSRV *textureSRV = nullptr;
>+    // applyTexturesForUAVs must be earlier than applyTexturesForSRVs since we need to do clearUVAs
>+    // before set resources to SRVs. Otherwise, it will report the following error:
>+    // ID3D11DeviceContext::CSSetShaderResources: Resource being set to CS shader resource slot 0 is
>+    // still bound on output! Forcing to NULL.
>+    ANGLE_TRY(applyTexturesForUAVs(context, gl::ShaderType::Compute));
>+    ANGLE_TRY(applyTexturesForSRVs(context, gl::ShaderType::Compute));
>+    return angle::Result::Continue;
>+}
> 
>-    if (texture)
>+angle::Result StateManager11::setTextureForImage(const gl::Context *context,
>+                                                 gl::ShaderType type,
>+                                                 int index,
>+                                                 bool readonly,
>+                                                 const gl::ImageUnit &imageUnit)
>+{
>+    TextureD3D *textureImpl = nullptr;
>+    if (!imageUnit.texture.get())
>     {
>-        TextureD3D *textureImpl = GetImplAs<TextureD3D>(texture);
>-
>-        TextureStorage *texStorage = nullptr;
>-        ANGLE_TRY(textureImpl->getNativeTexture(context, &texStorage));
>-
>-        // Texture should be complete and have a storage
>-        ASSERT(texStorage);
>-
>-        TextureStorage11 *storage11 = GetAs<TextureStorage11>(texStorage);
>+        return angle::Result::Continue;
>+    }
> 
>-        ANGLE_TRY(storage11->getSRV(context, texture->getTextureState(), &textureSRV));
>+    textureImpl                = GetImplAs<TextureD3D>(imageUnit.texture.get());
>+    TextureStorage *texStorage = nullptr;
>+    ANGLE_TRY(textureImpl->getNativeTexture(context, &texStorage));
>+    // Texture should be complete and have a storage
>+    ASSERT(texStorage);
>+    TextureStorage11 *storage11 = GetAs<TextureStorage11>(texStorage);
> 
>+    if (readonly)
>+    {
>+        const d3d11::SharedSRV *textureSRV = nullptr;
>+        ANGLE_TRY(storage11->getSRVForImage(context, imageUnit, &textureSRV));
>         // If we get an invalid SRV here, something went wrong in the texture class and we're
>         // unexpectedly missing the shader resource view.
>         ASSERT(textureSRV->valid());
>-
>-        textureImpl->resetDirty();
>+        ASSERT((static_cast<unsigned int>(index) < mRenderer->getNativeCaps().maxImageUnits));
>+        setShaderResourceInternal(type, index, textureSRV);
>+    }
>+    else
>+    {
>+        const d3d11::SharedUAV *textureUAV = nullptr;
>+        ANGLE_TRY(storage11->getUAVForImage(context, imageUnit, &textureUAV));
>+        // If we get an invalid UAV here, something went wrong in the texture class and we're
>+        // unexpectedly missing the unordered access view.
>+        ASSERT(textureUAV->valid());
>+        ASSERT((static_cast<unsigned int>(index) < mRenderer->getNativeCaps().maxImageUnits));
>+        setUnorderedAccessViewInternal(type, index, textureUAV);
>     }
> 
>-    ASSERT(
>-        (type == gl::SAMPLER_PIXEL &&
>-         static_cast<unsigned int>(index) < mRenderer->getNativeCaps().maxTextureImageUnits) ||
>-        (type == gl::SAMPLER_VERTEX &&
>-         static_cast<unsigned int>(index) < mRenderer->getNativeCaps().maxVertexTextureImageUnits));
>-
>-    setShaderResourceInternal(type, index, textureSRV);
>-    return gl::NoError();
>+    textureImpl->resetDirty();
>+    return angle::Result::Continue;
> }
> 
> // Things that affect a program's dirtyness:
>@@ -2430,31 +2810,29 @@ gl::Error StateManager11::setTexture(const gl::Context *context,
> // 6. An internal shader was used.             -> triggered in StateManager11::set*Shader.
> // 7. Drawing with/without point sprites.      -> checked in StateManager11::updateState.
> // TODO(jmadill): Use dirty bits for transform feedback.
>-gl::Error StateManager11::syncProgram(const gl::Context *context, GLenum drawMode)
>+angle::Result StateManager11::syncProgram(const gl::Context *context, gl::PrimitiveMode drawMode)
> {
>     Context11 *context11 = GetImplAs<Context11>(context);
>     ANGLE_TRY(context11->triggerDrawCallProgramRecompilation(context, drawMode));
> 
>-    const auto &glState = context->getGLState();
>-    const auto *va11    = GetImplAs<VertexArray11>(glState.getVertexArray());
>-    auto *programD3D    = GetImplAs<ProgramD3D>(glState.getProgram());
>+    const auto &glState = context->getState();
> 
>-    programD3D->updateCachedInputLayout(va11->getCurrentStateSerial(), glState);
>+    mProgramD3D->updateCachedInputLayout(mVertexArray11->getCurrentStateSerial(), glState);
> 
>     // Binaries must be compiled before the sync.
>-    ASSERT(programD3D->hasVertexExecutableForCachedInputLayout());
>-    ASSERT(programD3D->hasGeometryExecutableForPrimitiveType(drawMode));
>-    ASSERT(programD3D->hasPixelExecutableForCachedOutputLayout());
>+    ASSERT(mProgramD3D->hasVertexExecutableForCachedInputLayout());
>+    ASSERT(mProgramD3D->hasGeometryExecutableForPrimitiveType(glState, drawMode));
>+    ASSERT(mProgramD3D->hasPixelExecutableForCachedOutputLayout());
> 
>     ShaderExecutableD3D *vertexExe = nullptr;
>-    ANGLE_TRY(programD3D->getVertexExecutableForCachedInputLayout(&vertexExe, nullptr));
>+    ANGLE_TRY(mProgramD3D->getVertexExecutableForCachedInputLayout(context11, &vertexExe, nullptr));
> 
>     ShaderExecutableD3D *pixelExe = nullptr;
>-    ANGLE_TRY(programD3D->getPixelExecutableForCachedOutputLayout(&pixelExe, nullptr));
>+    ANGLE_TRY(mProgramD3D->getPixelExecutableForCachedOutputLayout(context11, &pixelExe, nullptr));
> 
>     ShaderExecutableD3D *geometryExe = nullptr;
>-    ANGLE_TRY(programD3D->getGeometryExecutableForPrimitiveType(context, drawMode, &geometryExe,
>-                                                                nullptr));
>+    ANGLE_TRY(mProgramD3D->getGeometryExecutableForPrimitiveType(context11, glState, drawMode,
>+                                                                 &geometryExe, nullptr));
> 
>     const d3d11::VertexShader *vertexShader =
>         (vertexExe ? &GetAs<ShaderExecutable11>(vertexExe)->getVertexShader() : nullptr);
>@@ -2483,48 +2861,48 @@ gl::Error StateManager11::syncProgram(const gl::Context *context, GLenum drawMod
>     // Explicitly clear the shaders dirty bit.
>     mInternalDirtyBits.reset(DIRTY_BIT_SHADERS);
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error StateManager11::applyVertexBuffer(const gl::Context *context,
>-                                            GLenum mode,
>-                                            const DrawCallVertexParams &vertexParams,
>-                                            bool isIndexedRendering)
>+angle::Result StateManager11::syncProgramForCompute(const gl::Context *context)
> {
>-    const auto &state       = context->getGLState();
>-    const gl::VertexArray *vertexArray = state.getVertexArray();
>-    VertexArray11 *vertexArray11       = GetImplAs<VertexArray11>(vertexArray);
>+    Context11 *context11 = GetImplAs<Context11>(context);
>+    ANGLE_TRY(context11->triggerDispatchCallProgramRecompilation(context));
> 
>-    if (mVertexAttribsNeedTranslation)
>-    {
>-        ANGLE_TRY(vertexArray11->updateDirtyAndDynamicAttribs(context, &mVertexDataManager,
>-                                                              vertexParams));
>-        mInputLayoutIsDirty = true;
>+    mProgramD3D->updateCachedComputeImage2DBindLayout(context);
> 
>-        // Determine if we need to update attribs on the next draw.
>-        mVertexAttribsNeedTranslation = (vertexArray11->hasActiveDynamicAttrib(context));
>-    }
>+    // Binaries must be compiled before the sync.
>+    ASSERT(mProgramD3D->hasComputeExecutableForCachedImage2DBindLayout());
> 
>-    if (!mLastFirstVertex.valid() || mLastFirstVertex.value() != vertexParams.firstVertex())
>-    {
>-        mLastFirstVertex    = vertexParams.firstVertex();
>-        mInputLayoutIsDirty = true;
>-    }
>+    ShaderExecutableD3D *computeExe = nullptr;
>+    ANGLE_TRY(
>+        mProgramD3D->getComputeExecutableForImage2DBindLayout(context11, &computeExe, nullptr));
> 
>-    if (!mInputLayoutIsDirty)
>-    {
>-        return gl::NoError();
>-    }
>+    const d3d11::ComputeShader *computeShader =
>+        (computeExe ? &GetAs<ShaderExecutable11>(computeExe)->getComputeShader() : nullptr);
>+    setComputeShader(computeShader);
>+    // Explicitly clear the shaders dirty bit.
>+    mInternalDirtyBits.reset(DIRTY_BIT_SHADERS);
> 
>-    const auto &vertexArrayAttribs = vertexArray11->getTranslatedAttribs();
>-    gl::Program *program           = state.getProgram();
>+    return angle::Result::Continue;
>+}
>+
>+angle::Result StateManager11::syncVertexBuffersAndInputLayout(
>+    const gl::Context *context,
>+    gl::PrimitiveMode mode,
>+    GLint firstVertex,
>+    GLsizei vertexOrIndexCount,
>+    gl::DrawElementsType indexTypeOrInvalid,
>+    GLsizei instanceCount)
>+{
>+    const auto &vertexArrayAttribs = mVertexArray11->getTranslatedAttribs();
> 
>     // Sort the attributes according to ensure we re-use similar input layouts.
>     AttribIndexArray sortedSemanticIndices;
>-    SortAttributesByLayout(program, vertexArrayAttribs, mCurrentValueAttribs,
>+    SortAttributesByLayout(*mProgramD3D, vertexArrayAttribs, mCurrentValueAttribs,
>                            &sortedSemanticIndices, &mCurrentAttributes);
> 
>-    auto featureLevel = mRenderer->getRenderer11DeviceCaps().featureLevel;
>+    D3D_FEATURE_LEVEL featureLevel = mRenderer->getRenderer11DeviceCaps().featureLevel;
> 
>     // If we are using FL 9_3, make sure the first attribute is not instanced
>     if (featureLevel <= D3D_FEATURE_LEVEL_9_3 && !mCurrentAttributes.empty())
>@@ -2542,76 +2920,210 @@ gl::Error StateManager11::applyVertexBuffer(const gl::Context *context,
>     }
> 
>     // Update the applied input layout by querying the cache.
>-    ANGLE_TRY(mInputLayoutCache.updateInputLayout(mRenderer, state, mCurrentAttributes, mode,
>-                                                  sortedSemanticIndices, vertexParams));
>+    const gl::State &state                = context->getState();
>+    const d3d11::InputLayout *inputLayout = nullptr;
>+    ANGLE_TRY(mInputLayoutCache.getInputLayout(GetImplAs<Context11>(context), state,
>+                                               mCurrentAttributes, sortedSemanticIndices, mode,
>+                                               vertexOrIndexCount, instanceCount, &inputLayout));
>+    setInputLayoutInternal(inputLayout);
> 
>     // Update the applied vertex buffers.
>-    ANGLE_TRY(mInputLayoutCache.applyVertexBuffers(context, mCurrentAttributes, mode,
>-                                                   vertexParams.firstVertex(), isIndexedRendering));
>-
>-    // InputLayoutCache::applyVertexBuffers calls through to the Bufer11 to get the native vertex
>-    // buffer (ID3D11Buffer *). Because we allocate these buffers lazily, this will trigger
>-    // allocation. This in turn will signal that the buffer is dirty. Since we just resolved the
>-    // dirty-ness in VertexArray11::updateDirtyAndDynamicAttribs, this can make us do a needless
>-    // update on the second draw call.
>-    // Hence we clear the flags here, after we've applied vertex data, since we know everything
>-    // is clean. This is a bit of a hack.
>-    vertexArray11->clearDirtyAndPromoteDynamicAttribs(context, vertexParams);
>+    ANGLE_TRY(applyVertexBuffers(context, mode, indexTypeOrInvalid, firstVertex));
> 
>-    mInputLayoutIsDirty = false;
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error StateManager11::applyIndexBuffer(const gl::Context *context,
>-                                           const void *indices,
>-                                           GLsizei count,
>-                                           GLenum type,
>-                                           const gl::HasIndexRange &lazyIndexRange,
>-                                           bool usePrimitiveRestartWorkaround)
>+angle::Result StateManager11::applyVertexBuffers(const gl::Context *context,
>+                                                 gl::PrimitiveMode mode,
>+                                                 gl::DrawElementsType indexTypeOrInvalid,
>+                                                 GLint firstVertex)
> {
>-    const auto &glState  = context->getGLState();
>-    gl::VertexArray *vao = glState.getVertexArray();
>-    VertexArray11 *vao11 = GetImplAs<VertexArray11>(vao);
>+    bool programUsesInstancedPointSprites =
>+        mProgramD3D->usesPointSize() && mProgramD3D->usesInstancedPointSpriteEmulation();
>+    bool instancedPointSpritesActive =
>+        programUsesInstancedPointSprites && (mode == gl::PrimitiveMode::Points);
>+
>+    // Note that if we use instance emulation, we reserve the first buffer slot.
>+    size_t reservedBuffers = GetReservedBufferCount(programUsesInstancedPointSprites);
>+
>+    for (size_t attribIndex = 0; attribIndex < (gl::MAX_VERTEX_ATTRIBS - reservedBuffers);
>+         ++attribIndex)
>+    {
>+        ID3D11Buffer *buffer = nullptr;
>+        UINT vertexStride    = 0;
>+        UINT vertexOffset    = 0;
>+
>+        if (attribIndex < mCurrentAttributes.size())
>+        {
>+            const TranslatedAttribute &attrib = *mCurrentAttributes[attribIndex];
>+            Buffer11 *bufferStorage = attrib.storage ? GetAs<Buffer11>(attrib.storage) : nullptr;
>+
>+            // If indexed pointsprite emulation is active, then we need to take a less efficent code
>+            // path. Emulated indexed pointsprite rendering requires that the vertex buffers match
>+            // exactly to the indices passed by the caller.  This could expand or shrink the vertex
>+            // buffer depending on the number of points indicated by the index list or how many
>+            // duplicates are found on the index list.
>+            if (bufferStorage == nullptr)
>+            {
>+                ASSERT(attrib.vertexBuffer.get());
>+                buffer = GetAs<VertexBuffer11>(attrib.vertexBuffer.get())->getBuffer().get();
>+            }
>+            else if (instancedPointSpritesActive &&
>+                     indexTypeOrInvalid != gl::DrawElementsType::InvalidEnum)
>+            {
>+                ASSERT(mVertexArray11->isCachedIndexInfoValid());
>+                TranslatedIndexData indexInfo = mVertexArray11->getCachedIndexInfo();
>+                if (indexInfo.srcIndexData.srcBuffer != nullptr)
>+                {
>+                    const uint8_t *bufferData = nullptr;
>+                    ANGLE_TRY(indexInfo.srcIndexData.srcBuffer->getData(context, &bufferData));
>+                    ASSERT(bufferData != nullptr);
>+
>+                    ptrdiff_t offset =
>+                        reinterpret_cast<ptrdiff_t>(indexInfo.srcIndexData.srcIndices);
>+                    indexInfo.srcIndexData.srcBuffer  = nullptr;
>+                    indexInfo.srcIndexData.srcIndices = bufferData + offset;
>+                }
>+
>+                ANGLE_TRY(bufferStorage->getEmulatedIndexedBuffer(context, &indexInfo.srcIndexData,
>+                                                                  attrib, firstVertex, &buffer));
> 
>-    GLenum destElementType =
>-        GetIndexTranslationDestType(type, lazyIndexRange, usePrimitiveRestartWorkaround);
>+                mVertexArray11->updateCachedIndexInfo(indexInfo);
>+            }
>+            else
>+            {
>+                ANGLE_TRY(bufferStorage->getBuffer(
>+                    context, BUFFER_USAGE_VERTEX_OR_TRANSFORM_FEEDBACK, &buffer));
>+            }
>+
>+            vertexStride = attrib.stride;
>+            ANGLE_TRY(attrib.computeOffset(context, firstVertex, &vertexOffset));
>+        }
> 
>-    if (!vao11->updateElementArrayStorage(context, type, destElementType, indices) &&
>-        !mIndexBufferIsDirty)
>+        size_t bufferIndex = reservedBuffers + attribIndex;
>+
>+        queueVertexBufferChange(bufferIndex, buffer, vertexStride, vertexOffset);
>+    }
>+
>+    Context11 *context11 = GetImplAs<Context11>(context);
>+
>+    // Instanced PointSprite emulation requires two additional ID3D11Buffers. A vertex buffer needs
>+    // to be created and added to the list of current buffers, strides and offsets collections.
>+    // This buffer contains the vertices for a single PointSprite quad.
>+    // An index buffer also needs to be created and applied because rendering instanced data on
>+    // D3D11 FL9_3 requires DrawIndexedInstanced() to be used. Shaders that contain gl_PointSize and
>+    // used without the GL_POINTS rendering mode require a vertex buffer because some drivers cannot
>+    // handle missing vertex data and will TDR the system.
>+    if (programUsesInstancedPointSprites)
>+    {
>+        constexpr UINT kPointSpriteVertexStride = sizeof(float) * 5;
>+
>+        if (!mPointSpriteVertexBuffer.valid())
>+        {
>+            static constexpr float kPointSpriteVertices[] = {
>+                // Position        | TexCoord
>+                -1.0f, -1.0f, 0.0f, 0.0f, 1.0f, /* v0 */
>+                -1.0f, 1.0f,  0.0f, 0.0f, 0.0f, /* v1 */
>+                1.0f,  1.0f,  0.0f, 1.0f, 0.0f, /* v2 */
>+                1.0f,  -1.0f, 0.0f, 1.0f, 1.0f, /* v3 */
>+                -1.0f, -1.0f, 0.0f, 0.0f, 1.0f, /* v4 */
>+                1.0f,  1.0f,  0.0f, 1.0f, 0.0f, /* v5 */
>+            };
>+
>+            D3D11_SUBRESOURCE_DATA vertexBufferData = {kPointSpriteVertices, 0, 0};
>+            D3D11_BUFFER_DESC vertexBufferDesc;
>+            vertexBufferDesc.ByteWidth           = sizeof(kPointSpriteVertices);
>+            vertexBufferDesc.BindFlags           = D3D11_BIND_VERTEX_BUFFER;
>+            vertexBufferDesc.Usage               = D3D11_USAGE_IMMUTABLE;
>+            vertexBufferDesc.CPUAccessFlags      = 0;
>+            vertexBufferDesc.MiscFlags           = 0;
>+            vertexBufferDesc.StructureByteStride = 0;
>+
>+            ANGLE_TRY(mRenderer->allocateResource(context11, vertexBufferDesc, &vertexBufferData,
>+                                                  &mPointSpriteVertexBuffer));
>+        }
>+
>+        // Set the stride to 0 if GL_POINTS mode is not being used to instruct the driver to avoid
>+        // indexing into the vertex buffer.
>+        UINT stride = instancedPointSpritesActive ? kPointSpriteVertexStride : 0;
>+        queueVertexBufferChange(0, mPointSpriteVertexBuffer.get(), stride, 0);
>+
>+        if (!mPointSpriteIndexBuffer.valid())
>+        {
>+            // Create an index buffer and set it for pointsprite rendering
>+            static constexpr unsigned short kPointSpriteIndices[] = {
>+                0, 1, 2, 3, 4, 5,
>+            };
>+
>+            D3D11_SUBRESOURCE_DATA indexBufferData = {kPointSpriteIndices, 0, 0};
>+            D3D11_BUFFER_DESC indexBufferDesc;
>+            indexBufferDesc.ByteWidth           = sizeof(kPointSpriteIndices);
>+            indexBufferDesc.BindFlags           = D3D11_BIND_INDEX_BUFFER;
>+            indexBufferDesc.Usage               = D3D11_USAGE_IMMUTABLE;
>+            indexBufferDesc.CPUAccessFlags      = 0;
>+            indexBufferDesc.MiscFlags           = 0;
>+            indexBufferDesc.StructureByteStride = 0;
>+
>+            ANGLE_TRY(mRenderer->allocateResource(context11, indexBufferDesc, &indexBufferData,
>+                                                  &mPointSpriteIndexBuffer));
>+        }
>+
>+        if (instancedPointSpritesActive)
>+        {
>+            // The index buffer is applied here because Instanced PointSprite emulation uses the a
>+            // non-indexed rendering path in ANGLE (DrawArrays). This means that applyIndexBuffer()
>+            // on the renderer will not be called and setting this buffer here ensures that the
>+            // rendering path will contain the correct index buffers.
>+            syncIndexBuffer(mPointSpriteIndexBuffer.get(), DXGI_FORMAT_R16_UINT, 0);
>+        }
>+    }
>+
>+    applyVertexBufferChanges();
>+    return angle::Result::Continue;
>+}
>+
>+angle::Result StateManager11::applyIndexBuffer(const gl::Context *context,
>+                                               GLsizei indexCount,
>+                                               gl::DrawElementsType indexType,
>+                                               const void *indices)
>+{
>+    if (!mIndexBufferIsDirty)
>     {
>         // No streaming or index buffer application necessary.
>-        return gl::NoError();
>+        return angle::Result::Continue;
>     }
> 
>-    gl::Buffer *elementArrayBuffer = vao->getElementArrayBuffer().get();
>+    gl::DrawElementsType destElementType = mVertexArray11->getCachedDestinationIndexType();
>+    gl::Buffer *elementArrayBuffer       = mVertexArray11->getState().getElementArrayBuffer();
> 
>-    TranslatedIndexData *indexInfo = vao11->getCachedIndexInfo();
>-    ANGLE_TRY(mIndexDataManager.prepareIndexData(context, type, destElementType, count,
>-                                                 elementArrayBuffer, indices, indexInfo));
>+    TranslatedIndexData indexInfo;
>+    ANGLE_TRY(mIndexDataManager.prepareIndexData(context, indexType, destElementType, indexCount,
>+                                                 elementArrayBuffer, indices, &indexInfo));
> 
>-    ID3D11Buffer *buffer = nullptr;
>-    DXGI_FORMAT bufferFormat =
>-        (indexInfo->indexType == GL_UNSIGNED_INT) ? DXGI_FORMAT_R32_UINT : DXGI_FORMAT_R16_UINT;
>+    ID3D11Buffer *buffer     = nullptr;
>+    DXGI_FORMAT bufferFormat = (indexInfo.indexType == gl::DrawElementsType::UnsignedInt)
>+                                   ? DXGI_FORMAT_R32_UINT
>+                                   : DXGI_FORMAT_R16_UINT;
> 
>-    if (indexInfo->storage)
>+    if (indexInfo.storage)
>     {
>-        Buffer11 *storage = GetAs<Buffer11>(indexInfo->storage);
>-        ANGLE_TRY_RESULT(storage->getBuffer(context, BUFFER_USAGE_INDEX), buffer);
>+        Buffer11 *storage = GetAs<Buffer11>(indexInfo.storage);
>+        ANGLE_TRY(storage->getBuffer(context, BUFFER_USAGE_INDEX, &buffer));
>     }
>     else
>     {
>-        IndexBuffer11 *indexBuffer = GetAs<IndexBuffer11>(indexInfo->indexBuffer);
>+        IndexBuffer11 *indexBuffer = GetAs<IndexBuffer11>(indexInfo.indexBuffer);
>         buffer                     = indexBuffer->getBuffer().get();
>     }
> 
>     // Track dirty indices in the index range cache.
>-    indexInfo->srcIndexData.srcIndicesChanged =
>-        syncIndexBuffer(buffer, bufferFormat, indexInfo->startOffset);
>+    indexInfo.srcIndexData.srcIndicesChanged =
>+        syncIndexBuffer(buffer, bufferFormat, indexInfo.startOffset);
> 
>     mIndexBufferIsDirty = false;
> 
>-    vao11->setCachedIndexInfoValid();
>-    return gl::NoError();
>+    mVertexArray11->updateCachedIndexInfo(indexInfo);
>+    return angle::Result::Continue;
> }
> 
> void StateManager11::setIndexBuffer(ID3D11Buffer *buffer,
>@@ -2620,7 +3132,7 @@ void StateManager11::setIndexBuffer(ID3D11Buffer *buffer,
> {
>     if (syncIndexBuffer(buffer, indexFormat, offset))
>     {
>-        mIndexBufferIsDirty = true;
>+        invalidateIndexBuffer();
>     }
> }
> 
>@@ -2642,18 +3154,40 @@ bool StateManager11::syncIndexBuffer(ID3D11Buffer *buffer,
> }
> 
> // Vertex buffer is invalidated outside this function.
>-gl::Error StateManager11::updateVertexOffsetsForPointSpritesEmulation(GLint startVertex,
>-                                                                      GLsizei emulatedInstanceId)
>+angle::Result StateManager11::updateVertexOffsetsForPointSpritesEmulation(
>+    const gl::Context *context,
>+    GLint startVertex,
>+    GLsizei emulatedInstanceId)
> {
>-    return mInputLayoutCache.updateVertexOffsetsForPointSpritesEmulation(
>-        mRenderer, mCurrentAttributes, startVertex, emulatedInstanceId);
>+    size_t reservedBuffers = GetReservedBufferCount(true);
>+    for (size_t attribIndex = 0; attribIndex < mCurrentAttributes.size(); ++attribIndex)
>+    {
>+        const auto &attrib = *mCurrentAttributes[attribIndex];
>+        size_t bufferIndex = reservedBuffers + attribIndex;
>+
>+        if (attrib.divisor > 0)
>+        {
>+            unsigned int offset = 0;
>+            ANGLE_TRY(attrib.computeOffset(context, startVertex, &offset));
>+            offset += (attrib.stride * (emulatedInstanceId / attrib.divisor));
>+            if (offset != mCurrentVertexOffsets[bufferIndex])
>+            {
>+                invalidateInputLayout();
>+                mDirtyVertexBufferRange.extend(static_cast<unsigned int>(bufferIndex));
>+                mCurrentVertexOffsets[bufferIndex] = offset;
>+            }
>+        }
>+    }
>+
>+    applyVertexBufferChanges();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error StateManager11::generateSwizzle(const gl::Context *context, gl::Texture *texture)
>+angle::Result StateManager11::generateSwizzle(const gl::Context *context, gl::Texture *texture)
> {
>     if (!texture)
>     {
>-        return gl::NoError();
>+        return angle::Result::Continue;
>     }
> 
>     TextureD3D *textureD3D = GetImplAs<TextureD3D>(texture);
>@@ -2669,21 +3203,19 @@ gl::Error StateManager11::generateSwizzle(const gl::Context *context, gl::Textur
>         ANGLE_TRY(storage11->generateSwizzles(context, textureState.getSwizzleState()));
>     }
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error StateManager11::generateSwizzlesForShader(const gl::Context *context,
>-                                                    gl::SamplerType type)
>+angle::Result StateManager11::generateSwizzlesForShader(const gl::Context *context,
>+                                                        gl::ShaderType type)
> {
>-    const auto &glState    = context->getGLState();
>-    ProgramD3D *programD3D = GetImplAs<ProgramD3D>(glState.getProgram());
>+    const gl::State &glState       = context->getState();
>+    const gl::RangeUI samplerRange = mProgramD3D->getUsedSamplerRange(type);
> 
>-    unsigned int samplerRange = programD3D->getUsedSamplerRange(type);
>-
>-    for (unsigned int i = 0; i < samplerRange; i++)
>+    for (unsigned int i = samplerRange.low(); i < samplerRange.high(); i++)
>     {
>-        GLenum textureType = programD3D->getSamplerTextureType(type, i);
>-        GLint textureUnit  = programD3D->getSamplerMapping(type, i, context->getCaps());
>+        gl::TextureType textureType = mProgramD3D->getSamplerTextureType(type, i);
>+        GLint textureUnit           = mProgramD3D->getSamplerMapping(type, i, context->getCaps());
>         if (textureUnit != -1)
>         {
>             gl::Texture *texture = glState.getSamplerTexture(textureUnit, textureType);
>@@ -2695,129 +3227,173 @@ gl::Error StateManager11::generateSwizzlesForShader(const gl::Context *context,
>         }
>     }
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error StateManager11::generateSwizzles(const gl::Context *context)
>+angle::Result StateManager11::generateSwizzles(const gl::Context *context)
> {
>-    ANGLE_TRY(generateSwizzlesForShader(context, gl::SAMPLER_VERTEX));
>-    ANGLE_TRY(generateSwizzlesForShader(context, gl::SAMPLER_PIXEL));
>-    return gl::NoError();
>+    ANGLE_TRY(generateSwizzlesForShader(context, gl::ShaderType::Vertex));
>+    ANGLE_TRY(generateSwizzlesForShader(context, gl::ShaderType::Fragment));
>+    return angle::Result::Continue;
> }
> 
>-gl::Error StateManager11::applyUniforms(ProgramD3D *programD3D)
>+angle::Result StateManager11::applyUniformsForShader(const gl::Context *context,
>+                                                     gl::ShaderType shaderType)
> {
>-    UniformStorage11 *vertexUniformStorage =
>-        GetAs<UniformStorage11>(&programD3D->getVertexUniformStorage());
>-    UniformStorage11 *fragmentUniformStorage =
>-        GetAs<UniformStorage11>(&programD3D->getFragmentUniformStorage());
>-    ASSERT(vertexUniformStorage);
>-    ASSERT(fragmentUniformStorage);
>+    UniformStorage11 *shaderUniformStorage =
>+        GetAs<UniformStorage11>(mProgramD3D->getShaderUniformStorage(shaderType));
>+    ASSERT(shaderUniformStorage);
> 
>     ID3D11DeviceContext *deviceContext = mRenderer->getDeviceContext();
> 
>-    const d3d11::Buffer *vertexConstantBuffer = nullptr;
>-    ANGLE_TRY(vertexUniformStorage->getConstantBuffer(mRenderer, &vertexConstantBuffer));
>-    const d3d11::Buffer *pixelConstantBuffer = nullptr;
>-    ANGLE_TRY(fragmentUniformStorage->getConstantBuffer(mRenderer, &pixelConstantBuffer));
>-
>-    if (vertexUniformStorage->size() > 0 && programD3D->areVertexUniformsDirty())
>-    {
>-        UpdateUniformBuffer(deviceContext, vertexUniformStorage, vertexConstantBuffer);
>-    }
>+    const d3d11::Buffer *shaderConstantBuffer = nullptr;
>+    ANGLE_TRY(shaderUniformStorage->getConstantBuffer(context, mRenderer, &shaderConstantBuffer));
> 
>-    if (fragmentUniformStorage->size() > 0 && programD3D->areFragmentUniformsDirty())
>+    if (shaderUniformStorage->size() > 0 && mProgramD3D->areShaderUniformsDirty(shaderType))
>     {
>-        UpdateUniformBuffer(deviceContext, fragmentUniformStorage, pixelConstantBuffer);
>+        UpdateUniformBuffer(deviceContext, shaderUniformStorage, shaderConstantBuffer);
>     }
> 
>     unsigned int slot = d3d11::RESERVED_CONSTANT_BUFFER_SLOT_DEFAULT_UNIFORM_BLOCK;
> 
>-    if (mCurrentConstantBufferVS[slot] != vertexConstantBuffer->getSerial())
>+    switch (shaderType)
>     {
>-        deviceContext->VSSetConstantBuffers(slot, 1, vertexConstantBuffer->getPointer());
>-        mCurrentConstantBufferVS[slot]       = vertexConstantBuffer->getSerial();
>-        mCurrentConstantBufferVSOffset[slot] = 0;
>-        mCurrentConstantBufferVSSize[slot]   = 0;
>+        case gl::ShaderType::Vertex:
>+            if (mCurrentConstantBufferVS[slot] != shaderConstantBuffer->getSerial())
>+            {
>+                deviceContext->VSSetConstantBuffers(slot, 1, shaderConstantBuffer->getPointer());
>+                mCurrentConstantBufferVS[slot]       = shaderConstantBuffer->getSerial();
>+                mCurrentConstantBufferVSOffset[slot] = 0;
>+                mCurrentConstantBufferVSSize[slot]   = 0;
>+            }
>+            break;
>+
>+        case gl::ShaderType::Fragment:
>+            if (mCurrentConstantBufferPS[slot] != shaderConstantBuffer->getSerial())
>+            {
>+                deviceContext->PSSetConstantBuffers(slot, 1, shaderConstantBuffer->getPointer());
>+                mCurrentConstantBufferPS[slot]       = shaderConstantBuffer->getSerial();
>+                mCurrentConstantBufferPSOffset[slot] = 0;
>+                mCurrentConstantBufferPSSize[slot]   = 0;
>+            }
>+            break;
>+
>+        // TODO(jiawei.shao@intel.com): apply geometry shader uniforms
>+        case gl::ShaderType::Geometry:
>+            UNIMPLEMENTED();
>+            break;
>+
>+        default:
>+            UNREACHABLE();
>+            break;
>     }
> 
>-    if (mCurrentConstantBufferPS[slot] != pixelConstantBuffer->getSerial())
>+    return angle::Result::Continue;
>+}
>+
>+angle::Result StateManager11::applyUniforms(const gl::Context *context)
>+{
>+    ANGLE_TRY(applyUniformsForShader(context, gl::ShaderType::Vertex));
>+    ANGLE_TRY(applyUniformsForShader(context, gl::ShaderType::Fragment));
>+    if (mProgramD3D->hasShaderStage(gl::ShaderType::Geometry))
>     {
>-        deviceContext->PSSetConstantBuffers(slot, 1, pixelConstantBuffer->getPointer());
>-        mCurrentConstantBufferPS[slot]       = pixelConstantBuffer->getSerial();
>-        mCurrentConstantBufferPSOffset[slot] = 0;
>-        mCurrentConstantBufferPSSize[slot]   = 0;
>+        ANGLE_TRY(applyUniformsForShader(context, gl::ShaderType::Geometry));
>     }
> 
>-    programD3D->markUniformsClean();
>+    mProgramD3D->markUniformsClean();
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error StateManager11::applyDriverUniforms(const ProgramD3D &programD3D)
>+angle::Result StateManager11::applyDriverUniformsForShader(const gl::Context *context,
>+                                                           gl::ShaderType shaderType)
> {
>     ID3D11DeviceContext *deviceContext = mRenderer->getDeviceContext();
> 
>-    if (!mDriverConstantBufferVS.valid())
>+    d3d11::Buffer &shaderDriverConstantBuffer = mShaderDriverConstantBuffers[shaderType];
>+    if (!shaderDriverConstantBuffer.valid())
>     {
>-        size_t requiredSize = mShaderConstants.getRequiredBufferSize(gl::SAMPLER_VERTEX);
>+        size_t requiredSize = mShaderConstants.getRequiredBufferSize(shaderType);
> 
>         D3D11_BUFFER_DESC constantBufferDescription = {0};
>         d3d11::InitConstantBufferDesc(&constantBufferDescription, requiredSize);
>-        ANGLE_TRY(mRenderer->allocateResource(constantBufferDescription, &mDriverConstantBufferVS));
>+        ANGLE_TRY(mRenderer->allocateResource(
>+            GetImplAs<Context11>(context), constantBufferDescription, &shaderDriverConstantBuffer));
> 
>-        ID3D11Buffer *driverVSConstants = mDriverConstantBufferVS.get();
>-        deviceContext->VSSetConstantBuffers(d3d11::RESERVED_CONSTANT_BUFFER_SLOT_DRIVER, 1,
>-                                            &driverVSConstants);
>-    }
>+        ID3D11Buffer *driverConstants = shaderDriverConstantBuffer.get();
>+        switch (shaderType)
>+        {
>+            case gl::ShaderType::Vertex:
>+                deviceContext->VSSetConstantBuffers(d3d11::RESERVED_CONSTANT_BUFFER_SLOT_DRIVER, 1,
>+                                                    &driverConstants);
>+                break;
> 
>-    if (!mDriverConstantBufferPS.valid())
>-    {
>-        size_t requiredSize = mShaderConstants.getRequiredBufferSize(gl::SAMPLER_PIXEL);
>+            case gl::ShaderType::Fragment:
>+                deviceContext->PSSetConstantBuffers(d3d11::RESERVED_CONSTANT_BUFFER_SLOT_DRIVER, 1,
>+                                                    &driverConstants);
>+                break;
> 
>-        D3D11_BUFFER_DESC constantBufferDescription = {0};
>-        d3d11::InitConstantBufferDesc(&constantBufferDescription, requiredSize);
>-        ANGLE_TRY(mRenderer->allocateResource(constantBufferDescription, &mDriverConstantBufferPS));
>+            case gl::ShaderType::Geometry:
>+                deviceContext->GSSetConstantBuffers(d3d11::RESERVED_CONSTANT_BUFFER_SLOT_DRIVER, 1,
>+                                                    &driverConstants);
>+                break;
> 
>-        ID3D11Buffer *driverVSConstants = mDriverConstantBufferPS.get();
>-        deviceContext->PSSetConstantBuffers(d3d11::RESERVED_CONSTANT_BUFFER_SLOT_DRIVER, 1,
>-                                            &driverVSConstants);
>+            default:
>+                UNREACHABLE();
>+                return angle::Result::Continue;
>+        }
>     }
> 
>-    // Sampler metadata and driver constants need to coexist in the same constant buffer to conserve
>-    // constant buffer slots. We update both in the constant buffer if needed.
>-    ANGLE_TRY(mShaderConstants.updateBuffer(deviceContext, gl::SAMPLER_VERTEX, programD3D,
>-                                            mDriverConstantBufferVS));
>-    ANGLE_TRY(mShaderConstants.updateBuffer(deviceContext, gl::SAMPLER_PIXEL, programD3D,
>-                                            mDriverConstantBufferPS));
>+    // Sampler metadata and driver constants need to coexist in the same constant buffer to
>+    // conserve constant buffer slots. We update both in the constant buffer if needed.
>+    ANGLE_TRY(mShaderConstants.updateBuffer(context, mRenderer, shaderType, *mProgramD3D,
>+                                            shaderDriverConstantBuffer));
>+
>+    return angle::Result::Continue;
>+}
>+
>+angle::Result StateManager11::applyDriverUniforms(const gl::Context *context)
>+{
>+    ID3D11DeviceContext *deviceContext = mRenderer->getDeviceContext();
>+
>+    ANGLE_TRY(applyDriverUniformsForShader(context, gl::ShaderType::Vertex));
>+    ANGLE_TRY(applyDriverUniformsForShader(context, gl::ShaderType::Fragment));
>+    if (mProgramD3D->hasShaderStage(gl::ShaderType::Geometry))
>+    {
>+        ANGLE_TRY(applyDriverUniformsForShader(context, gl::ShaderType::Geometry));
>+    }
> 
>     // needed for the point sprite geometry shader
>     // GSSetConstantBuffers triggers device removal on 9_3, so we should only call it for ES3.
>     if (mRenderer->isES3Capable())
>     {
>-        if (mCurrentGeometryConstantBuffer != mDriverConstantBufferPS.getSerial())
>+        d3d11::Buffer &driverConstantBufferPS =
>+            mShaderDriverConstantBuffers[gl::ShaderType::Fragment];
>+        if (mCurrentGeometryConstantBuffer != driverConstantBufferPS.getSerial())
>         {
>-            ASSERT(mDriverConstantBufferPS.valid());
>-            deviceContext->GSSetConstantBuffers(0, 1, mDriverConstantBufferPS.getPointer());
>-            mCurrentGeometryConstantBuffer = mDriverConstantBufferPS.getSerial();
>+            ASSERT(driverConstantBufferPS.valid());
>+            deviceContext->GSSetConstantBuffers(0, 1, driverConstantBufferPS.getPointer());
>+            mCurrentGeometryConstantBuffer = driverConstantBufferPS.getSerial();
>         }
>     }
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error StateManager11::applyComputeUniforms(ProgramD3D *programD3D)
>+angle::Result StateManager11::applyComputeUniforms(const gl::Context *context,
>+                                                   ProgramD3D *programD3D)
> {
>     UniformStorage11 *computeUniformStorage =
>-        GetAs<UniformStorage11>(&programD3D->getComputeUniformStorage());
>+        GetAs<UniformStorage11>(programD3D->getShaderUniformStorage(gl::ShaderType::Compute));
>     ASSERT(computeUniformStorage);
> 
>     const d3d11::Buffer *constantBuffer = nullptr;
>-    ANGLE_TRY(computeUniformStorage->getConstantBuffer(mRenderer, &constantBuffer));
>+    ANGLE_TRY(computeUniformStorage->getConstantBuffer(context, mRenderer, &constantBuffer));
> 
>     ID3D11DeviceContext *deviceContext = mRenderer->getDeviceContext();
> 
>-    if (computeUniformStorage->size() > 0 && programD3D->areComputeUniformsDirty())
>+    if (computeUniformStorage->size() > 0 &&
>+        programD3D->areShaderUniformsDirty(gl::ShaderType::Compute))
>     {
>         UpdateUniformBuffer(deviceContext, computeUniformStorage, constantBuffer);
>         programD3D->markUniformsClean();
>@@ -2831,49 +3407,50 @@ gl::Error StateManager11::applyComputeUniforms(ProgramD3D *programD3D)
>         mCurrentComputeConstantBuffer = constantBuffer->getSerial();
>     }
> 
>-    if (!mDriverConstantBufferCS.valid())
>+    if (!mShaderDriverConstantBuffers[gl::ShaderType::Compute].valid())
>     {
>-        size_t requiredSize = mShaderConstants.getRequiredBufferSize(gl::SAMPLER_COMPUTE);
>+        size_t requiredSize = mShaderConstants.getRequiredBufferSize(gl::ShaderType::Compute);
> 
>         D3D11_BUFFER_DESC constantBufferDescription = {0};
>         d3d11::InitConstantBufferDesc(&constantBufferDescription, requiredSize);
>-        ANGLE_TRY(mRenderer->allocateResource(constantBufferDescription, &mDriverConstantBufferCS));
>-        ID3D11Buffer *buffer = mDriverConstantBufferCS.get();
>+        ANGLE_TRY(
>+            mRenderer->allocateResource(GetImplAs<Context11>(context), constantBufferDescription,
>+                                        &mShaderDriverConstantBuffers[gl::ShaderType::Compute]));
>+        ID3D11Buffer *buffer = mShaderDriverConstantBuffers[gl::ShaderType::Compute].get();
>         deviceContext->CSSetConstantBuffers(d3d11::RESERVED_CONSTANT_BUFFER_SLOT_DRIVER, 1,
>                                             &buffer);
>     }
> 
>-    ANGLE_TRY(mShaderConstants.updateBuffer(deviceContext, gl::SAMPLER_COMPUTE, *programD3D,
>-                                            mDriverConstantBufferCS));
>+    ANGLE_TRY(mShaderConstants.updateBuffer(context, mRenderer, gl::ShaderType::Compute,
>+                                            *programD3D,
>+                                            mShaderDriverConstantBuffers[gl::ShaderType::Compute]));
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error StateManager11::syncUniformBuffers(const gl::Context *context, ProgramD3D *programD3D)
>+angle::Result StateManager11::syncUniformBuffersForShader(const gl::Context *context,
>+                                                          gl::ShaderType shaderType)
> {
>-    unsigned int reservedVertex   = mRenderer->getReservedVertexUniformBuffers();
>-    unsigned int reservedFragment = mRenderer->getReservedFragmentUniformBuffers();
>-
>-    programD3D->updateUniformBufferCache(context->getCaps(), reservedVertex, reservedFragment);
>+    gl::ShaderMap<unsigned int> shaderReservedUBOs = mRenderer->getReservedShaderUniformBuffers();
> 
>-    const auto &vertexUniformBuffers     = programD3D->getVertexUniformBufferCache();
>-    const auto &fragmentUniformBuffers   = programD3D->getFragmentUniformBufferCache();
>-    const auto &glState                  = context->getGLState();
>+    const auto &glState                  = context->getState();
>     ID3D11DeviceContext *deviceContext   = mRenderer->getDeviceContext();
>     ID3D11DeviceContext1 *deviceContext1 = mRenderer->getDeviceContext1IfSupported();
> 
>-    for (size_t bufferIndex = 0; bufferIndex < vertexUniformBuffers.size(); bufferIndex++)
>-    {
>-        GLint binding = vertexUniformBuffers[bufferIndex];
>+    const auto &shaderUniformBuffers = mProgramD3D->getShaderUniformBufferCache(shaderType);
>+    const unsigned int reservedUBOs  = shaderReservedUBOs[shaderType];
> 
>+    for (size_t bufferIndex = 0; bufferIndex < shaderUniformBuffers.size(); ++bufferIndex)
>+    {
>+        const GLint binding = shaderUniformBuffers[bufferIndex];
>         if (binding == -1)
>         {
>             continue;
>         }
> 
>-        const auto &uniformBuffer    = glState.getIndexedUniformBuffer(binding);
>-        GLintptr uniformBufferOffset = uniformBuffer.getOffset();
>-        GLsizeiptr uniformBufferSize = uniformBuffer.getSize();
>+        const auto &uniformBuffer          = glState.getIndexedUniformBuffer(binding);
>+        const GLintptr uniformBufferOffset = uniformBuffer.getOffset();
>+        const GLsizeiptr uniformBufferSize = uniformBuffer.getSize();
> 
>         if (uniformBuffer.get() == nullptr)
>         {
>@@ -2888,93 +3465,285 @@ gl::Error StateManager11::syncUniformBuffers(const gl::Context *context, Program
>         ANGLE_TRY(bufferStorage->getConstantBufferRange(context, uniformBufferOffset,
>                                                         uniformBufferSize, &constantBuffer,
>                                                         &firstConstant, &numConstants));
>-
>         ASSERT(constantBuffer);
> 
>-        if (mCurrentConstantBufferVS[bufferIndex] == constantBuffer->getSerial() &&
>-            mCurrentConstantBufferVSOffset[bufferIndex] == uniformBufferOffset &&
>-            mCurrentConstantBufferVSSize[bufferIndex] == uniformBufferSize)
>+        const unsigned int appliedIndex = reservedUBOs + static_cast<unsigned int>(bufferIndex);
>+        switch (shaderType)
>+        {
>+            case gl::ShaderType::Vertex:
>+            {
>+                if (mCurrentConstantBufferVS[bufferIndex] == constantBuffer->getSerial() &&
>+                    mCurrentConstantBufferVSOffset[bufferIndex] == uniformBufferOffset &&
>+                    mCurrentConstantBufferVSSize[bufferIndex] == uniformBufferSize)
>+                {
>+                    continue;
>+                }
>+
>+                if (firstConstant != 0 && uniformBufferSize != 0)
>+                {
>+                    ASSERT(numConstants != 0);
>+                    deviceContext1->VSSetConstantBuffers1(appliedIndex, 1,
>+                                                          constantBuffer->getPointer(),
>+                                                          &firstConstant, &numConstants);
>+                }
>+                else
>+                {
>+                    deviceContext->VSSetConstantBuffers(appliedIndex, 1,
>+                                                        constantBuffer->getPointer());
>+                }
>+
>+                mCurrentConstantBufferVS[appliedIndex]       = constantBuffer->getSerial();
>+                mCurrentConstantBufferVSOffset[appliedIndex] = uniformBufferOffset;
>+                mCurrentConstantBufferVSSize[appliedIndex]   = uniformBufferSize;
>+                break;
>+            }
>+
>+            case gl::ShaderType::Fragment:
>+            {
>+                if (mCurrentConstantBufferPS[bufferIndex] == constantBuffer->getSerial() &&
>+                    mCurrentConstantBufferPSOffset[bufferIndex] == uniformBufferOffset &&
>+                    mCurrentConstantBufferPSSize[bufferIndex] == uniformBufferSize)
>+                {
>+                    continue;
>+                }
>+
>+                if (firstConstant != 0 && uniformBufferSize != 0)
>+                {
>+                    deviceContext1->PSSetConstantBuffers1(appliedIndex, 1,
>+                                                          constantBuffer->getPointer(),
>+                                                          &firstConstant, &numConstants);
>+                }
>+                else
>+                {
>+                    deviceContext->PSSetConstantBuffers(appliedIndex, 1,
>+                                                        constantBuffer->getPointer());
>+                }
>+
>+                mCurrentConstantBufferPS[appliedIndex]       = constantBuffer->getSerial();
>+                mCurrentConstantBufferPSOffset[appliedIndex] = uniformBufferOffset;
>+                mCurrentConstantBufferPSSize[appliedIndex]   = uniformBufferSize;
>+                break;
>+            }
>+
>+            case gl::ShaderType::Compute:
>+            {
>+                if (mCurrentConstantBufferCS[bufferIndex] == constantBuffer->getSerial() &&
>+                    mCurrentConstantBufferCSOffset[bufferIndex] == uniformBufferOffset &&
>+                    mCurrentConstantBufferCSSize[bufferIndex] == uniformBufferSize)
>+                {
>+                    continue;
>+                }
>+
>+                if (firstConstant != 0 && uniformBufferSize != 0)
>+                {
>+                    deviceContext1->CSSetConstantBuffers1(appliedIndex, 1,
>+                                                          constantBuffer->getPointer(),
>+                                                          &firstConstant, &numConstants);
>+                }
>+                else
>+                {
>+                    deviceContext->CSSetConstantBuffers(appliedIndex, 1,
>+                                                        constantBuffer->getPointer());
>+                }
>+
>+                mCurrentConstantBufferCS[appliedIndex]       = constantBuffer->getSerial();
>+                mCurrentConstantBufferCSOffset[appliedIndex] = uniformBufferOffset;
>+                mCurrentConstantBufferCSSize[appliedIndex]   = uniformBufferSize;
>+                break;
>+            }
>+
>+            // TODO(jiawei.shao@intel.com): update geometry shader uniform buffers.
>+            case gl::ShaderType::Geometry:
>+                UNIMPLEMENTED();
>+                break;
>+
>+            default:
>+                UNREACHABLE();
>+        }
>+    }
>+
>+    return angle::Result::Continue;
>+}
>+
>+angle::Result StateManager11::syncShaderStorageBuffersForShader(const gl::Context *context,
>+                                                                gl::ShaderType shaderType)
>+{
>+    const gl::State &glState   = context->getState();
>+    const gl::Program *program = glState.getProgram();
>+    angle::FixedVector<Buffer11 *, gl::IMPLEMENTATION_MAX_DRAW_BUFFERS> previouslyBound;
>+    for (size_t blockIndex = 0; blockIndex < program->getActiveShaderStorageBlockCount();
>+         blockIndex++)
>+    {
>+        GLuint binding = program->getShaderStorageBlockBinding(static_cast<GLuint>(blockIndex));
>+        const auto &shaderStorageBuffer = glState.getIndexedShaderStorageBuffer(binding);
>+        if (shaderStorageBuffer.get() == nullptr)
>         {
>             continue;
>         }
> 
>-        unsigned int appliedIndex = reservedVertex + static_cast<unsigned int>(bufferIndex);
>+        Buffer11 *bufferStorage = GetImplAs<Buffer11>(shaderStorageBuffer.get());
>+        if (std::find(previouslyBound.begin(), previouslyBound.end(), bufferStorage) !=
>+            previouslyBound.end())
>+        {
>+            // D3D11 doesn't support binding a buffer multiple times
>+            // http://anglebug.com/3032
>+            ERR() << "Writing to multiple blocks on the same buffer is not allowed.";
>+            return angle::Result::Stop;
>+        }
>+        previouslyBound.push_back(bufferStorage);
> 
>-        if (firstConstant != 0 && uniformBufferSize != 0)
>+        d3d11::UnorderedAccessView *uavPtr = nullptr;
>+        GLsizeiptr viewSize                = 0;
>+        // Bindings only have a valid size if bound using glBindBufferRange
>+        if (shaderStorageBuffer.getSize() > 0)
>         {
>-            ASSERT(numConstants != 0);
>-            deviceContext1->VSSetConstantBuffers1(appliedIndex, 1, constantBuffer->getPointer(),
>-                                                  &firstConstant, &numConstants);
>+            viewSize = shaderStorageBuffer.getSize();
>         }
>+        // We use the buffer size for glBindBufferBase
>         else
>         {
>-            deviceContext->VSSetConstantBuffers(appliedIndex, 1, constantBuffer->getPointer());
>+            viewSize = bufferStorage->getSize();
>         }
>+        ANGLE_TRY(bufferStorage->getRawUAVRange(context, shaderStorageBuffer.getOffset(), viewSize,
>+                                                &uavPtr));
> 
>-        mCurrentConstantBufferVS[appliedIndex]       = constantBuffer->getSerial();
>-        mCurrentConstantBufferVSOffset[appliedIndex] = uniformBufferOffset;
>-        mCurrentConstantBufferVSSize[appliedIndex]   = uniformBufferSize;
>-    }
>+        // We need to make sure that resource being set to UnorderedAccessView slot |registerIndex|
>+        // is not bound on SRV.
>+        if (uavPtr && unsetConflictingView(uavPtr->get()))
>+        {
>+            mInternalDirtyBits.set(DIRTY_BIT_TEXTURE_AND_SAMPLER_STATE);
>+        }
> 
>-    for (size_t bufferIndex = 0; bufferIndex < fragmentUniformBuffers.size(); bufferIndex++)
>-    {
>-        GLint binding = fragmentUniformBuffers[bufferIndex];
>+        const unsigned int registerIndex = mProgramD3D->getShaderStorageBufferRegisterIndex(
>+            static_cast<GLuint>(blockIndex), shaderType);
> 
>-        if (binding == -1)
>+        // It means this block is active but not statically used.
>+        if (registerIndex == GL_INVALID_INDEX)
>         {
>             continue;
>         }
> 
>-        const auto &uniformBuffer    = glState.getIndexedUniformBuffer(binding);
>-        GLintptr uniformBufferOffset = uniformBuffer.getOffset();
>-        GLsizeiptr uniformBufferSize = uniformBuffer.getSize();
>+        switch (shaderType)
>+        {
>+            case gl::ShaderType::Compute:
>+            {
>+                ID3D11UnorderedAccessView *uav     = uavPtr->get();
>+                ID3D11DeviceContext *deviceContext = mRenderer->getDeviceContext();
>+                deviceContext->CSSetUnorderedAccessViews(registerIndex, 1, &uav, nullptr);
>+                break;
>+            }
> 
>-        if (uniformBuffer.get() == nullptr)
>+            case gl::ShaderType::Vertex:
>+            case gl::ShaderType::Fragment:
>+            case gl::ShaderType::Geometry:
>+                UNIMPLEMENTED();
>+                break;
>+
>+            default:
>+                UNREACHABLE();
>+        }
>+    }
>+
>+    return angle::Result::Continue;
>+}
>+
>+angle::Result StateManager11::syncUniformBuffers(const gl::Context *context)
>+{
>+    gl::ShaderMap<unsigned int> shaderReservedUBOs = mRenderer->getReservedShaderUniformBuffers();
>+    mProgramD3D->updateUniformBufferCache(context->getCaps(), shaderReservedUBOs);
>+
>+    if (mProgramD3D->hasShaderStage(gl::ShaderType::Compute))
>+    {
>+        ANGLE_TRY(syncUniformBuffersForShader(context, gl::ShaderType::Compute));
>+    }
>+    else
>+    {
>+        ANGLE_TRY(syncUniformBuffersForShader(context, gl::ShaderType::Vertex));
>+        ANGLE_TRY(syncUniformBuffersForShader(context, gl::ShaderType::Fragment));
>+        if (mProgramD3D->hasShaderStage(gl::ShaderType::Geometry))
>         {
>-            continue;
>+            ANGLE_TRY(syncUniformBuffersForShader(context, gl::ShaderType::Geometry));
>         }
>+    }
> 
>-        Buffer11 *bufferStorage             = GetImplAs<Buffer11>(uniformBuffer.get());
>-        const d3d11::Buffer *constantBuffer = nullptr;
>-        UINT firstConstant                  = 0;
>-        UINT numConstants                   = 0;
>+    return angle::Result::Continue;
>+}
> 
>-        ANGLE_TRY(bufferStorage->getConstantBufferRange(context, uniformBufferOffset,
>-                                                        uniformBufferSize, &constantBuffer,
>-                                                        &firstConstant, &numConstants));
>+angle::Result StateManager11::syncAtomicCounterBuffers(const gl::Context *context)
>+{
>+    if (mProgramD3D->hasShaderStage(gl::ShaderType::Compute))
>+    {
>+        ANGLE_TRY(syncAtomicCounterBuffersForShader(context, gl::ShaderType::Compute));
>+    }
> 
>-        ASSERT(constantBuffer);
>+    return angle::Result::Continue;
>+}
> 
>-        if (mCurrentConstantBufferPS[bufferIndex] == constantBuffer->getSerial() &&
>-            mCurrentConstantBufferPSOffset[bufferIndex] == uniformBufferOffset &&
>-            mCurrentConstantBufferPSSize[bufferIndex] == uniformBufferSize)
>+angle::Result StateManager11::syncAtomicCounterBuffersForShader(const gl::Context *context,
>+                                                                gl::ShaderType shaderType)
>+{
>+    const gl::State &glState   = context->getState();
>+    const gl::Program *program = glState.getProgram();
>+    for (const auto &atomicCounterBuffer : program->getState().getAtomicCounterBuffers())
>+    {
>+        GLuint binding     = atomicCounterBuffer.binding;
>+        const auto &buffer = glState.getIndexedAtomicCounterBuffer(binding);
>+
>+        if (buffer.get() == nullptr)
>         {
>             continue;
>         }
> 
>-        unsigned int appliedIndex = reservedFragment + static_cast<unsigned int>(bufferIndex);
>+        Buffer11 *bufferStorage = GetImplAs<Buffer11>(buffer.get());
>+        // TODO(enrico.galli@intel.com): Check to make sure that we aren't binding the same buffer
>+        // multiple times, as this is unsupported by D3D11. http://anglebug.com/3141
>+
>+        // Bindings only have a valid size if bound using glBindBufferRange. Therefore, we use the
>+        // buffer size for glBindBufferBase
>+        GLsizeiptr viewSize = (buffer.getSize() > 0) ? buffer.getSize() : bufferStorage->getSize();
>+        d3d11::UnorderedAccessView *uavPtr = nullptr;
>+        ANGLE_TRY(bufferStorage->getRawUAVRange(context, buffer.getOffset(), viewSize, &uavPtr));
> 
>-        if (firstConstant != 0 && uniformBufferSize != 0)
>+        // We need to make sure that resource being set to UnorderedAccessView slot |registerIndex|
>+        // is not bound on SRV.
>+        if (uavPtr && unsetConflictingView(uavPtr->get()))
>         {
>-            deviceContext1->PSSetConstantBuffers1(appliedIndex, 1, constantBuffer->getPointer(),
>-                                                  &firstConstant, &numConstants);
>+            mInternalDirtyBits.set(DIRTY_BIT_TEXTURE_AND_SAMPLER_STATE);
>+        }
>+
>+        const unsigned int registerIndex =
>+            mProgramD3D->getAtomicCounterBufferRegisterIndex(binding, shaderType);
>+
>+        if (shaderType == gl::ShaderType::Compute)
>+        {
>+            ID3D11UnorderedAccessView *uav     = uavPtr->get();
>+            ID3D11DeviceContext *deviceContext = mRenderer->getDeviceContext();
>+            deviceContext->CSSetUnorderedAccessViews(registerIndex, 1, &uav, nullptr);
>         }
>         else
>         {
>-            deviceContext->PSSetConstantBuffers(appliedIndex, 1, constantBuffer->getPointer());
>+            // Atomic Shaders on non-compute shaders are currently unimplemented
>+            // http://anglebug.com/1729
>+            UNIMPLEMENTED();
>         }
>+    }
>+
>+    return angle::Result::Continue;
>+}
> 
>-        mCurrentConstantBufferPS[appliedIndex]       = constantBuffer->getSerial();
>-        mCurrentConstantBufferPSOffset[appliedIndex] = uniformBufferOffset;
>-        mCurrentConstantBufferPSSize[appliedIndex]   = uniformBufferSize;
>+angle::Result StateManager11::syncShaderStorageBuffers(const gl::Context *context)
>+{
>+    if (mProgramD3D->hasShaderStage(gl::ShaderType::Compute))
>+    {
>+        ANGLE_TRY(syncShaderStorageBuffersForShader(context, gl::ShaderType::Compute));
>     }
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error StateManager11::syncTransformFeedbackBuffers(const gl::Context *context)
>+angle::Result StateManager11::syncTransformFeedbackBuffers(const gl::Context *context)
> {
>-    const auto &glState = context->getGLState();
>+    const auto &glState = context->getState();
> 
>     ID3D11DeviceContext *deviceContext = mRenderer->getDeviceContext();
> 
>@@ -2986,18 +3755,18 @@ gl::Error StateManager11::syncTransformFeedbackBuffers(const gl::Context *contex
>             deviceContext->SOSetTargets(0, nullptr, nullptr);
>             mAppliedTFSerial = mEmptySerial;
>         }
>-        return gl::NoError();
>+        return angle::Result::Continue;
>     }
> 
>     gl::TransformFeedback *transformFeedback = glState.getCurrentTransformFeedback();
>     TransformFeedback11 *tf11                = GetImplAs<TransformFeedback11>(transformFeedback);
>     if (mAppliedTFSerial == tf11->getSerial() && !tf11->isDirty())
>     {
>-        return gl::NoError();
>+        return angle::Result::Continue;
>     }
> 
>     const std::vector<ID3D11Buffer *> *soBuffers = nullptr;
>-    ANGLE_TRY_RESULT(tf11->getSOBuffers(context), soBuffers);
>+    ANGLE_TRY(tf11->getSOBuffers(context, &soBuffers));
>     const std::vector<UINT> &soOffsets = tf11->getSOBufferOffsets();
> 
>     deviceContext->SOSetTargets(tf11->getNumSOBuffers(), soBuffers->data(), soOffsets.data());
>@@ -3005,71 +3774,73 @@ gl::Error StateManager11::syncTransformFeedbackBuffers(const gl::Context *contex
>     mAppliedTFSerial = tf11->getSerial();
>     tf11->onApply();
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-// DrawCallVertexParams implementation.
>-DrawCallVertexParams::DrawCallVertexParams(GLint firstVertex,
>-                                           GLsizei vertexCount,
>-                                           GLsizei instances)
>-    : mHasIndexRange(nullptr),
>-      mFirstVertex(firstVertex),
>-      mVertexCount(vertexCount),
>-      mInstances(instances),
>-      mBaseVertex(0)
>+void StateManager11::syncPrimitiveTopology(const gl::State &glState,
>+                                           gl::PrimitiveMode currentDrawMode)
> {
>-}
>+    D3D11_PRIMITIVE_TOPOLOGY primitiveTopology = D3D11_PRIMITIVE_TOPOLOGY_UNDEFINED;
>+    // Don't cull everything by default, this also resets if we were previously culling
>+    mCullEverything = false;
> 
>-// Use when in a drawElements call.
>-DrawCallVertexParams::DrawCallVertexParams(bool firstVertexDefinitelyZero,
>-                                           const gl::HasIndexRange &hasIndexRange,
>-                                           GLint baseVertex,
>-                                           GLsizei instances)
>-    : mHasIndexRange(&hasIndexRange),
>-      mFirstVertex(),
>-      mVertexCount(0),
>-      mInstances(instances),
>-      mBaseVertex(baseVertex)
>-{
>-    if (firstVertexDefinitelyZero)
>+    switch (currentDrawMode)
>     {
>-        mFirstVertex = baseVertex;
>-    }
>-}
>-
>-GLint DrawCallVertexParams::firstVertex() const
>-{
>-    if (!mFirstVertex.valid())
>-    {
>-        ensureResolved();
>-        ASSERT(mFirstVertex.valid());
>-    }
>-    return mFirstVertex.value();
>-}
>-
>-GLsizei DrawCallVertexParams::vertexCount() const
>-{
>-    ensureResolved();
>-    return mVertexCount;
>-}
>-
>-GLsizei DrawCallVertexParams::instances() const
>-{
>-    return mInstances;
>-}
>+        case gl::PrimitiveMode::Points:
>+        {
>+            bool usesPointSize = mProgramD3D->usesPointSize();
> 
>-void DrawCallVertexParams::ensureResolved() const
>-{
>-    if (mHasIndexRange)
>-    {
>-        ASSERT(!mFirstVertex.valid() || mFirstVertex == mBaseVertex);
>+            // ProgramBinary assumes non-point rendering if gl_PointSize isn't written,
>+            // which affects varying interpolation. Since the value of gl_PointSize is
>+            // undefined when not written, just skip drawing to avoid unexpected results.
>+            if (!usesPointSize && !glState.isTransformFeedbackActiveUnpaused())
>+            {
>+                // Notify developers of risking undefined behavior.
>+                WARN() << "Point rendering without writing to gl_PointSize.";
>+                mCullEverything = true;
>+                return;
>+            }
> 
>-        // Resolve the index range now if we need to.
>-        const auto &indexRange = mHasIndexRange->getIndexRange().value();
>-        mFirstVertex           = mBaseVertex + static_cast<GLint>(indexRange.start);
>-        mVertexCount           = static_cast<GLsizei>(indexRange.vertexCount());
>-        mHasIndexRange         = nullptr;
>+            // If instanced pointsprites are enabled and the shader uses gl_PointSize, the topology
>+            // must be D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST.
>+            if (usesPointSize && mRenderer->getWorkarounds().useInstancedPointSpriteEmulation)
>+            {
>+                primitiveTopology = D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST;
>+            }
>+            else
>+            {
>+                primitiveTopology = D3D11_PRIMITIVE_TOPOLOGY_POINTLIST;
>+            }
>+            break;
>+        }
>+        case gl::PrimitiveMode::Lines:
>+            primitiveTopology = D3D_PRIMITIVE_TOPOLOGY_LINELIST;
>+            break;
>+        case gl::PrimitiveMode::LineLoop:
>+            primitiveTopology = D3D_PRIMITIVE_TOPOLOGY_LINESTRIP;
>+            break;
>+        case gl::PrimitiveMode::LineStrip:
>+            primitiveTopology = D3D_PRIMITIVE_TOPOLOGY_LINESTRIP;
>+            break;
>+        case gl::PrimitiveMode::Triangles:
>+            primitiveTopology = D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST;
>+            mCullEverything   = CullsEverything(glState);
>+            break;
>+        case gl::PrimitiveMode::TriangleStrip:
>+            primitiveTopology = D3D_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP;
>+            mCullEverything   = CullsEverything(glState);
>+            break;
>+        // emulate fans via rewriting index buffer
>+        case gl::PrimitiveMode::TriangleFan:
>+            primitiveTopology = D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST;
>+            mCullEverything   = CullsEverything(glState);
>+            break;
>+        default:
>+            UNREACHABLE();
>+            break;
>     }
>+
>+    setPrimitiveTopologyInternal(primitiveTopology);
> }
> 
> }  // namespace rx
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/StateManager11.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/StateManager11.h
>index e48bc83a220..c04d0a4d419 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/StateManager11.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/StateManager11.h
>@@ -11,21 +11,22 @@
> 
> #include <array>
> 
>-#include "libANGLE/ContextState.h"
> #include "libANGLE/State.h"
> #include "libANGLE/angletypes.h"
> #include "libANGLE/renderer/d3d/IndexDataManager.h"
> #include "libANGLE/renderer/d3d/RendererD3D.h"
> #include "libANGLE/renderer/d3d/d3d11/InputLayoutCache.h"
> #include "libANGLE/renderer/d3d/d3d11/Query11.h"
>-#include "libANGLE/renderer/d3d/d3d11/RenderStateCache.h"
> #include "libANGLE/renderer/d3d/d3d11/renderer11_utils.h"
> 
> namespace rx
> {
>-
>+class Buffer11;
>+class DisplayD3D;
>+class Framebuffer11;
> struct RenderTargetDesc;
> struct Renderer11DeviceCaps;
>+class VertexArray11;
> 
> class ShaderConstants11 : angle::NonCopyable
> {
>@@ -34,7 +35,7 @@ class ShaderConstants11 : angle::NonCopyable
>     ~ShaderConstants11();
> 
>     void init(const gl::Caps &caps);
>-    size_t getRequiredBufferSize(gl::SamplerType samplerType) const;
>+    size_t getRequiredBufferSize(gl::ShaderType shaderType) const;
>     void markDirty();
> 
>     void setComputeWorkGroups(GLuint numGroupsX, GLuint numGroupsY, GLuint numGroupsZ);
>@@ -43,14 +44,21 @@ class ShaderConstants11 : angle::NonCopyable
>                           const D3D11_VIEWPORT &dxViewport,
>                           bool is9_3,
>                           bool presentPathFast);
>-    void onSamplerChange(gl::SamplerType samplerType,
>+    bool onFirstVertexChange(GLint firstVertex);
>+    void onImageLayerChange(gl::ShaderType shaderType, unsigned int imageIndex, int layer);
>+    void onSamplerChange(gl::ShaderType shaderType,
>                          unsigned int samplerIndex,
>-                         const gl::Texture &texture);
>-
>-    gl::Error updateBuffer(ID3D11DeviceContext *deviceContext,
>-                           gl::SamplerType samplerType,
>-                           const ProgramD3D &programD3D,
>-                           const d3d11::Buffer &driverConstantBuffer);
>+                         const gl::Texture &texture,
>+                         const gl::SamplerState &samplerState);
>+    void onImageChange(gl::ShaderType shaderType,
>+                       unsigned int imageIndex,
>+                       const gl::ImageUnit &imageUnit);
>+
>+    angle::Result updateBuffer(const gl::Context *context,
>+                               Renderer11 *renderer,
>+                               gl::ShaderType shaderType,
>+                               const ProgramD3D &programD3D,
>+                               const d3d11::Buffer &driverConstantBuffer);
> 
>   private:
>     struct Vertex
>@@ -61,9 +69,8 @@ class ShaderConstants11 : angle::NonCopyable
>               viewCoords{.0f},
>               viewScale{.0f},
>               multiviewWriteToViewportIndex{.0f},
>-              padding{.0f}
>-        {
>-        }
>+              firstVertex{0}
>+        {}
> 
>         float depthRange[4];
>         float viewAdjust[4];
>@@ -74,8 +81,7 @@ class ShaderConstants11 : angle::NonCopyable
>         // whenever a multi-view draw framebuffer is made active.
>         float multiviewWriteToViewportIndex;
> 
>-        // Added here to manually pad the struct.
>-        float padding;
>+        uint32_t firstVertex;
>     };
> 
>     struct Pixel
>@@ -87,8 +93,7 @@ class ShaderConstants11 : angle::NonCopyable
>               viewScale{.0f},
>               multiviewWriteToViewportIndex(0),
>               padding(0)
>-        {
>-        }
>+        {}
> 
>         float depthRange[4];
>         float viewCoords[4];
>@@ -112,62 +117,51 @@ class ShaderConstants11 : angle::NonCopyable
> 
>     struct SamplerMetadata
>     {
>-        SamplerMetadata() : baseLevel(0), internalFormatBits(0), wrapModes(0), padding(0) {}
>+        SamplerMetadata()
>+            : baseLevel(0), internalFormatBits(0), wrapModes(0), padding(0), intBorderColor{0}
>+        {}
> 
>         int baseLevel;
>         int internalFormatBits;
>         int wrapModes;
>-        int padding;  // This just pads the struct to 16 bytes
>+        int padding;  // This just pads the struct to 32 bytes
>+        int intBorderColor[4];
>     };
> 
>-    static_assert(sizeof(SamplerMetadata) == 16u,
>-                  "Sampler metadata struct must be one 4-vec / 16 bytes.");
>+    static_assert(sizeof(SamplerMetadata) == 32u,
>+                  "Sampler metadata struct must be two 4-vec --> 32 bytes.");
> 
>-    // Return true if dirty.
>-    bool updateSamplerMetadata(SamplerMetadata *data, const gl::Texture &texture);
>-
>-    Vertex mVertex;
>-    bool mVertexDirty;
>-    Pixel mPixel;
>-    bool mPixelDirty;
>-    Compute mCompute;
>-    bool mComputeDirty;
>-
>-    std::vector<SamplerMetadata> mSamplerMetadataVS;
>-    bool mSamplerMetadataVSDirty;
>-    std::vector<SamplerMetadata> mSamplerMetadataPS;
>-    bool mSamplerMetadataPSDirty;
>-    std::vector<SamplerMetadata> mSamplerMetadataCS;
>-    bool mSamplerMetadataCSDirty;
>-};
>-
>-class DrawCallVertexParams final : angle::NonCopyable
>-{
>-  public:
>-    // Use when in a drawArrays call.
>-    DrawCallVertexParams(GLint firstVertex, GLsizei vertexCount, GLsizei instances);
>+    struct ImageMetadata
>+    {
>+        ImageMetadata() : layer(0), padding{0} {}
> 
>-    // Use when in a drawElements call.
>-    DrawCallVertexParams(bool firstVertexDefinitelyZero,
>-                         const gl::HasIndexRange &hasIndexRange,
>-                         GLint baseVertex,
>-                         GLsizei instances);
>+        int layer;
>+        int padding[3];  // This just pads the struct to 16 bytes
>+    };
>+    static_assert(sizeof(ImageMetadata) == 16u,
>+                  "Image metadata struct must be one 4-vec --> 16 bytes.");
> 
>-    // It should be possible to also use an overload to handle the 'slow' indirect draw path.
>-    // TODO(jmadill): Indirect draw slow path overload.
>+    static size_t GetShaderConstantsStructSize(gl::ShaderType shaderType);
> 
>-    GLint firstVertex() const;
>-    GLsizei vertexCount() const;
>-    GLsizei instances() const;
>+    // Return true if dirty.
>+    bool updateSamplerMetadata(SamplerMetadata *data,
>+                               const gl::Texture &texture,
>+                               const gl::SamplerState &samplerState);
> 
>-  private:
>-    void ensureResolved() const;
>+    // Return true if dirty.
>+    bool updateImageMetadata(ImageMetadata *data, const gl::ImageUnit &imageUnit);
> 
>-    mutable const gl::HasIndexRange *mHasIndexRange;
>-    mutable Optional<GLint> mFirstVertex;
>-    mutable GLsizei mVertexCount;
>-    GLsizei mInstances;
>-    GLint mBaseVertex;
>+    Vertex mVertex;
>+    Pixel mPixel;
>+    Compute mCompute;
>+    gl::ShaderBitSet mShaderConstantsDirty;
>+
>+    gl::ShaderMap<std::vector<SamplerMetadata>> mShaderSamplerMetadata;
>+    gl::ShaderMap<int> mNumActiveShaderSamplers;
>+    gl::ShaderMap<std::vector<ImageMetadata>> mShaderReadonlyImageMetadata;
>+    gl::ShaderMap<int> mNumActiveShaderReadonlyImages;
>+    gl::ShaderMap<std::vector<ImageMetadata>> mShaderImageMetadata;
>+    gl::ShaderMap<int> mNumActiveShaderImages;
> };
> 
> class StateManager11 final : angle::NonCopyable
>@@ -176,15 +170,14 @@ class StateManager11 final : angle::NonCopyable
>     StateManager11(Renderer11 *renderer);
>     ~StateManager11();
> 
>-    gl::Error initialize(const gl::Caps &caps, const gl::Extensions &extensions);
>     void deinitialize();
> 
>     void syncState(const gl::Context *context, const gl::State::DirtyBits &dirtyBits);
> 
>-    gl::Error updateStateForCompute(const gl::Context *context,
>-                                    GLuint numGroupsX,
>-                                    GLuint numGroupsY,
>-                                    GLuint numGroupsZ);
>+    angle::Result updateStateForCompute(const gl::Context *context,
>+                                        GLuint numGroupsX,
>+                                        GLuint numGroupsY,
>+                                        GLuint numGroupsZ);
> 
>     void updateStencilSizeIfChanged(bool depthStencilInitialized, unsigned int stencilSize);
> 
>@@ -212,34 +205,45 @@ class StateManager11 final : angle::NonCopyable
>     // Called by the Framebuffer11 and VertexArray11.
>     void invalidateShaders();
> 
>-    // Called by VertexArray11 to trigger attribute translation.
>-    void invalidateVertexAttributeTranslation();
>+    // Called by the Program on Uniform Buffer change. Also called internally.
>+    void invalidateProgramUniformBuffers();
>+
>+    // Called by TransformFeedback11.
>+    void invalidateTransformFeedback();
>+
>+    // Called by VertexArray11.
>+    void invalidateInputLayout();
>+
>+    // Called by VertexArray11 element array buffer sync.
>+    void invalidateIndexBuffer();
>+
>+    // Called by TextureStorage11. Also called internally.
>+    void invalidateTexturesAndSamplers();
> 
>     void setRenderTarget(ID3D11RenderTargetView *rtv, ID3D11DepthStencilView *dsv);
>     void setRenderTargets(ID3D11RenderTargetView **rtvs, UINT numRtvs, ID3D11DepthStencilView *dsv);
> 
>     void onBeginQuery(Query11 *query);
>     void onDeleteQueryObject(Query11 *query);
>-    gl::Error onMakeCurrent(const gl::Context *context);
>+    angle::Result onMakeCurrent(const gl::Context *context);
> 
>     void setInputLayout(const d3d11::InputLayout *inputLayout);
> 
>-    // TODO(jmadill): Migrate to d3d11::Buffer.
>-    bool queueVertexBufferChange(size_t bufferIndex,
>-                                 ID3D11Buffer *buffer,
>-                                 UINT stride,
>-                                 UINT offset);
>-    bool queueVertexOffsetChange(size_t bufferIndex, UINT offsetOnly);
>-    void applyVertexBufferChanges();
>-
>     void setSingleVertexBuffer(const d3d11::Buffer *buffer, UINT stride, UINT offset);
> 
>-    gl::Error updateState(const gl::Context *context, GLenum drawMode);
>+    angle::Result updateState(const gl::Context *context,
>+                              gl::PrimitiveMode mode,
>+                              GLint firstVertex,
>+                              GLsizei vertexOrIndexCount,
>+                              gl::DrawElementsType indexTypeOrInvalid,
>+                              const void *indices,
>+                              GLsizei instanceCount,
>+                              GLint baseVertex);
> 
>-    void setShaderResourceShared(gl::SamplerType shaderType,
>+    void setShaderResourceShared(gl::ShaderType shaderType,
>                                  UINT resourceSlot,
>                                  const d3d11::SharedSRV *srv);
>-    void setShaderResource(gl::SamplerType shaderType,
>+    void setShaderResource(gl::ShaderType shaderType,
>                            UINT resourceSlot,
>                            const d3d11::ShaderResourceView *srv);
>     void setPrimitiveTopology(D3D11_PRIMITIVE_TOPOLOGY primitiveTopology);
>@@ -263,52 +267,50 @@ class StateManager11 final : angle::NonCopyable
>     void setSimpleScissorRect(const gl::Rectangle &glRect);
>     void setScissorRectD3D(const D3D11_RECT &d3dRect);
> 
>-    // Not handled by an internal dirty bit because of the extra draw parameters.
>-    gl::Error applyVertexBuffer(const gl::Context *context,
>-                                GLenum mode,
>-                                const DrawCallVertexParams &vertexParams,
>-                                bool isIndexedRendering);
>-
>-    gl::Error applyIndexBuffer(const gl::Context *context,
>-                               const void *indices,
>-                               GLsizei count,
>-                               GLenum type,
>-                               const gl::HasIndexRange &lazyIndexRange,
>-                               bool usePrimitiveRestartWorkaround);
>-
>     void setIndexBuffer(ID3D11Buffer *buffer, DXGI_FORMAT indexFormat, unsigned int offset);
> 
>-    gl::Error updateVertexOffsetsForPointSpritesEmulation(GLint startVertex,
>-                                                          GLsizei emulatedInstanceId);
>+    angle::Result updateVertexOffsetsForPointSpritesEmulation(const gl::Context *context,
>+                                                              GLint startVertex,
>+                                                              GLsizei emulatedInstanceId);
> 
>     // TODO(jmadill): Should be private.
>-    gl::Error applyComputeUniforms(ProgramD3D *programD3D);
>+    angle::Result applyComputeUniforms(const gl::Context *context, ProgramD3D *programD3D);
> 
>     // Only used in testing.
>     InputLayoutCache *getInputLayoutCache() { return &mInputLayoutCache; }
> 
>+    bool getCullEverything() const { return mCullEverything; }
>+    VertexDataManager *getVertexDataManager() { return &mVertexDataManager; }
>+
>+    ProgramD3D *getProgramD3D() const { return mProgramD3D; }
>+
>   private:
>+    angle::Result ensureInitialized(const gl::Context *context);
>+
>     template <typename SRVType>
>-    void setShaderResourceInternal(gl::SamplerType shaderType,
>+    void setShaderResourceInternal(gl::ShaderType shaderType,
>                                    UINT resourceSlot,
>                                    const SRVType *srv);
>+    template <typename UAVType>
>+    void setUnorderedAccessViewInternal(gl::ShaderType shaderType,
>+                                        UINT resourceSlot,
>+                                        const UAVType *uav);
> 
>     bool unsetConflictingView(ID3D11View *view);
>-    bool unsetConflictingSRVs(gl::SamplerType shaderType,
>+    bool unsetConflictingSRVs(gl::ShaderType shaderType,
>                               uintptr_t resource,
>                               const gl::ImageIndex *index);
>-    void unsetConflictingAttachmentResources(const gl::FramebufferAttachment *attachment,
>+    void unsetConflictingAttachmentResources(const gl::FramebufferAttachment &attachment,
>                                              ID3D11Resource *resource);
> 
>-    gl::Error syncBlendState(const gl::Context *context,
>-                             const gl::Framebuffer *framebuffer,
>-                             const gl::BlendState &blendState,
>-                             const gl::ColorF &blendColor,
>-                             unsigned int sampleMask);
>+    angle::Result syncBlendState(const gl::Context *context,
>+                                 const gl::BlendState &blendState,
>+                                 const gl::ColorF &blendColor,
>+                                 unsigned int sampleMask);
> 
>-    gl::Error syncDepthStencilState(const gl::State &glState);
>+    angle::Result syncDepthStencilState(const gl::Context *context);
> 
>-    gl::Error syncRasterizerState(const gl::Context *context, bool pointDrawMode);
>+    angle::Result syncRasterizerState(const gl::Context *context, gl::PrimitiveMode mode);
> 
>     void syncScissorRectangle(const gl::Rectangle &scissor, bool enabled);
> 
>@@ -316,49 +318,104 @@ class StateManager11 final : angle::NonCopyable
> 
>     void checkPresentPath(const gl::Context *context);
> 
>-    gl::Error syncFramebuffer(const gl::Context *context, gl::Framebuffer *framebuffer);
>-    gl::Error syncProgram(const gl::Context *context, GLenum drawMode);
>-
>-    gl::Error syncTextures(const gl::Context *context);
>-    gl::Error applyTextures(const gl::Context *context, gl::SamplerType shaderType);
>-
>-    gl::Error setSamplerState(const gl::Context *context,
>-                              gl::SamplerType type,
>-                              int index,
>-                              gl::Texture *texture,
>-                              const gl::SamplerState &sampler);
>-    gl::Error setTexture(const gl::Context *context,
>-                         gl::SamplerType type,
>-                         int index,
>-                         gl::Texture *texture);
>+    angle::Result syncFramebuffer(const gl::Context *context);
>+    angle::Result syncProgram(const gl::Context *context, gl::PrimitiveMode drawMode);
>+    angle::Result syncProgramForCompute(const gl::Context *context);
>+
>+    angle::Result syncTextures(const gl::Context *context);
>+    angle::Result applyTexturesForSRVs(const gl::Context *context, gl::ShaderType shaderType);
>+    angle::Result applyTexturesForUAVs(const gl::Context *context, gl::ShaderType shaderType);
>+    angle::Result syncTexturesForCompute(const gl::Context *context);
>+
>+    angle::Result setSamplerState(const gl::Context *context,
>+                                  gl::ShaderType type,
>+                                  int index,
>+                                  gl::Texture *texture,
>+                                  const gl::SamplerState &sampler);
>+    angle::Result setTextureForSampler(const gl::Context *context,
>+                                       gl::ShaderType type,
>+                                       int index,
>+                                       gl::Texture *texture,
>+                                       const gl::SamplerState &sampler);
>+    angle::Result setImageState(const gl::Context *context,
>+                                gl::ShaderType type,
>+                                int index,
>+                                const gl::ImageUnit &imageUnit);
>+    angle::Result setTextureForImage(const gl::Context *context,
>+                                     gl::ShaderType type,
>+                                     int index,
>+                                     bool readonly,
>+                                     const gl::ImageUnit &imageUnit);
> 
>     // Faster than calling setTexture a jillion times
>-    gl::Error clearTextures(gl::SamplerType samplerType, size_t rangeStart, size_t rangeEnd);
>+    angle::Result clearSRVs(gl::ShaderType shaderType, size_t rangeStart, size_t rangeEnd);
>+    angle::Result clearUAVs(gl::ShaderType shaderType, size_t rangeStart, size_t rangeEnd);
>     void handleMultiviewDrawFramebufferChange(const gl::Context *context);
> 
>-    gl::Error syncCurrentValueAttribs(const gl::State &glState);
>+    angle::Result syncCurrentValueAttribs(
>+        const gl::Context *context,
>+        const std::vector<gl::VertexAttribCurrentValueData> &currentValues);
>+
>+    angle::Result generateSwizzle(const gl::Context *context, gl::Texture *texture);
>+    angle::Result generateSwizzlesForShader(const gl::Context *context, gl::ShaderType type);
>+    angle::Result generateSwizzles(const gl::Context *context);
> 
>-    gl::Error generateSwizzle(const gl::Context *context, gl::Texture *texture);
>-    gl::Error generateSwizzlesForShader(const gl::Context *context, gl::SamplerType type);
>-    gl::Error generateSwizzles(const gl::Context *context);
>+    angle::Result applyDriverUniforms(const gl::Context *context);
>+    angle::Result applyDriverUniformsForShader(const gl::Context *context,
>+                                               gl::ShaderType shaderType);
>+    angle::Result applyUniforms(const gl::Context *context);
>+    angle::Result applyUniformsForShader(const gl::Context *context, gl::ShaderType shaderType);
> 
>-    gl::Error applyDriverUniforms(const ProgramD3D &programD3D);
>-    gl::Error applyUniforms(ProgramD3D *programD3D);
>+    angle::Result syncShaderStorageBuffersForShader(const gl::Context *context,
>+                                                    gl::ShaderType shaderType);
> 
>-    gl::Error syncUniformBuffers(const gl::Context *context, ProgramD3D *programD3D);
>-    gl::Error syncTransformFeedbackBuffers(const gl::Context *context);
>+    angle::Result syncUniformBuffers(const gl::Context *context);
>+    angle::Result syncUniformBuffersForShader(const gl::Context *context,
>+                                              gl::ShaderType shaderType);
>+    angle::Result syncAtomicCounterBuffers(const gl::Context *context);
>+    angle::Result syncAtomicCounterBuffersForShader(const gl::Context *context,
>+                                                    gl::ShaderType shaderType);
>+    angle::Result syncShaderStorageBuffers(const gl::Context *context);
>+    angle::Result syncTransformFeedbackBuffers(const gl::Context *context);
> 
>     // These are currently only called internally.
>-    void invalidateTexturesAndSamplers();
>     void invalidateDriverUniforms();
>     void invalidateProgramUniforms();
>-    void invalidateProgramUniformBuffers();
>     void invalidateConstantBuffer(unsigned int slot);
>+    void invalidateProgramAtomicCounterBuffers();
>+    void invalidateProgramShaderStorageBuffers();
> 
>     // Called by the Framebuffer11 directly.
>     void processFramebufferInvalidation(const gl::Context *context);
> 
>     bool syncIndexBuffer(ID3D11Buffer *buffer, DXGI_FORMAT indexFormat, unsigned int offset);
>+    angle::Result syncVertexBuffersAndInputLayout(const gl::Context *context,
>+                                                  gl::PrimitiveMode mode,
>+                                                  GLint firstVertex,
>+                                                  GLsizei vertexOrIndexCount,
>+                                                  gl::DrawElementsType indexTypeOrInvalid,
>+                                                  GLsizei instanceCount);
>+
>+    bool setInputLayoutInternal(const d3d11::InputLayout *inputLayout);
>+
>+    angle::Result applyVertexBuffers(const gl::Context *context,
>+                                     gl::PrimitiveMode mode,
>+                                     gl::DrawElementsType indexTypeOrInvalid,
>+                                     GLint firstVertex);
>+    // TODO(jmadill): Migrate to d3d11::Buffer.
>+    bool queueVertexBufferChange(size_t bufferIndex,
>+                                 ID3D11Buffer *buffer,
>+                                 UINT stride,
>+                                 UINT offset);
>+    void applyVertexBufferChanges();
>+    bool setPrimitiveTopologyInternal(D3D11_PRIMITIVE_TOPOLOGY primitiveTopology);
>+    void syncPrimitiveTopology(const gl::State &glState, gl::PrimitiveMode currentDrawMode);
>+
>+    // Not handled by an internal dirty bit because it isn't synced on drawArrays calls.
>+    angle::Result applyIndexBuffer(const gl::Context *context,
>+                                   GLsizei indexCount,
>+                                   gl::DrawElementsType indexType,
>+                                   const void *indices);
> 
>     enum DirtyBitType
>     {
>@@ -368,12 +425,19 @@ class StateManager11 final : angle::NonCopyable
>         DIRTY_BIT_RASTERIZER_STATE,
>         DIRTY_BIT_BLEND_STATE,
>         DIRTY_BIT_DEPTH_STENCIL_STATE,
>+        // DIRTY_BIT_SHADERS and DIRTY_BIT_TEXTURE_AND_SAMPLER_STATE should be dealt before
>+        // DIRTY_BIT_PROGRAM_UNIFORM_BUFFERS for update image layers.
>+        DIRTY_BIT_SHADERS,
>         DIRTY_BIT_TEXTURE_AND_SAMPLER_STATE,
>         DIRTY_BIT_PROGRAM_UNIFORMS,
>         DIRTY_BIT_DRIVER_UNIFORMS,
>         DIRTY_BIT_PROGRAM_UNIFORM_BUFFERS,
>-        DIRTY_BIT_SHADERS,
>+        DIRTY_BIT_PROGRAM_ATOMIC_COUNTER_BUFFERS,
>+        DIRTY_BIT_PROGRAM_SHADER_STORAGE_BUFFERS,
>         DIRTY_BIT_CURRENT_VALUE_ATTRIBS,
>+        DIRTY_BIT_TRANSFORM_FEEDBACK,
>+        DIRTY_BIT_VERTEX_BUFFERS_AND_INPUT_LAYOUT,
>+        DIRTY_BIT_PRIMITIVE_TOPOLOGY,
>         DIRTY_BIT_INVALID,
>         DIRTY_BIT_MAX = DIRTY_BIT_INVALID,
>     };
>@@ -384,6 +448,7 @@ class StateManager11 final : angle::NonCopyable
> 
>     // Internal dirty bits.
>     DirtyBits mInternalDirtyBits;
>+    DirtyBits mComputeDirtyBitsMask;
> 
>     // Blend State
>     gl::BlendState mCurBlendState;
>@@ -410,11 +475,6 @@ class StateManager11 final : angle::NonCopyable
>     float mCurNear;
>     float mCurFar;
> 
>-    // The viewport offsets are guaranteed to be updated whenever the gl::State::DirtyBits are
>-    // resolved and can be applied to the viewport and scissor whenever the internal viewport and
>-    // scissor bits are resolved.
>-    std::vector<gl::Offset> mViewportOffsets;
>-
>     // Things needed in viewport state
>     ShaderConstants11 mShaderConstants;
> 
>@@ -430,42 +490,48 @@ class StateManager11 final : angle::NonCopyable
>     std::set<Query11 *> mCurrentQueries;
> 
>     // Currently applied textures
>-    struct SRVRecord
>+    template <typename DescType>
>+    struct ViewRecord
>     {
>-        uintptr_t srv;
>+        uintptr_t view;
>         uintptr_t resource;
>-        D3D11_SHADER_RESOURCE_VIEW_DESC desc;
>+        DescType desc;
>     };
> 
>-    // A cache of current SRVs that also tracks the highest 'used' (non-NULL) SRV
>+    // A cache of current Views that also tracks the highest 'used' (non-NULL) View.
>     // We might want to investigate a more robust approach that is also fast when there's
>-    // a large gap between used SRVs (e.g. if SRV 0 and 7 are non-NULL, this approach will
>-    // waste time on SRVs 1-6.)
>-    class SRVCache : angle::NonCopyable
>+    // a large gap between used Views (e.g. if View 0 and 7 are non-NULL, this approach will
>+    // waste time on Views 1-6.)
>+    template <typename ViewType, typename DescType>
>+    class ViewCache : angle::NonCopyable
>     {
>       public:
>-        SRVCache();
>-        ~SRVCache();
>+        ViewCache();
>+        ~ViewCache();
> 
>-        void initialize(size_t size) { mCurrentSRVs.resize(size); }
>+        void initialize(size_t size) { mCurrentViews.resize(size); }
> 
>-        size_t size() const { return mCurrentSRVs.size(); }
>-        size_t highestUsed() const { return mHighestUsedSRV; }
>+        size_t size() const { return mCurrentViews.size(); }
>+        size_t highestUsed() const { return mHighestUsedView; }
> 
>-        const SRVRecord &operator[](size_t index) const { return mCurrentSRVs[index]; }
>+        const ViewRecord<DescType> &operator[](size_t index) const { return mCurrentViews[index]; }
>         void clear();
>-        void update(size_t resourceIndex, ID3D11ShaderResourceView *srv);
>+        void update(size_t resourceIndex, ViewType *view);
> 
>       private:
>-        std::vector<SRVRecord> mCurrentSRVs;
>-        size_t mHighestUsedSRV;
>+        std::vector<ViewRecord<DescType>> mCurrentViews;
>+        size_t mHighestUsedView;
>     };
> 
>-    SRVCache mCurVertexSRVs;
>-    SRVCache mCurPixelSRVs;
>+    using SRVCache = ViewCache<ID3D11ShaderResourceView, D3D11_SHADER_RESOURCE_VIEW_DESC>;
>+    using UAVCache = ViewCache<ID3D11UnorderedAccessView, D3D11_UNORDERED_ACCESS_VIEW_DESC>;
>+    gl::ShaderMap<SRVCache> mCurShaderSRVs;
>+    UAVCache mCurComputeUAVs;
>+    SRVCache *getSRVCache(gl::ShaderType shaderType);
> 
>     // A block of NULL pointers, cached so we don't re-allocate every draw call
>     std::vector<ID3D11ShaderResourceView *> mNullSRVs;
>+    std::vector<ID3D11UnorderedAccessView *> mNullUAVs;
> 
>     // Current translations of "Current-Value" data - owned by Context, not VertexArray.
>     gl::AttributesMask mDirtyCurrentValueAttribs;
>@@ -473,34 +539,25 @@ class StateManager11 final : angle::NonCopyable
> 
>     // Current applied input layout.
>     ResourceSerial mCurrentInputLayout;
>-    bool mInputLayoutIsDirty;
>-    bool mVertexAttribsNeedTranslation;
> 
>     // Current applied vertex states.
>     // TODO(jmadill): Figure out how to use ResourceSerial here.
>-    std::array<ID3D11Buffer *, gl::MAX_VERTEX_ATTRIBS> mCurrentVertexBuffers;
>-    std::array<UINT, gl::MAX_VERTEX_ATTRIBS> mCurrentVertexStrides;
>-    std::array<UINT, gl::MAX_VERTEX_ATTRIBS> mCurrentVertexOffsets;
>+    gl::AttribArray<ID3D11Buffer *> mCurrentVertexBuffers;
>+    gl::AttribArray<UINT> mCurrentVertexStrides;
>+    gl::AttribArray<UINT> mCurrentVertexOffsets;
>     gl::RangeUI mDirtyVertexBufferRange;
> 
>     // Currently applied primitive topology
>     D3D11_PRIMITIVE_TOPOLOGY mCurrentPrimitiveTopology;
>+    gl::PrimitiveMode mLastAppliedDrawMode;
>+    bool mCullEverything;
> 
>     // Currently applied shaders
>-    ResourceSerial mAppliedVertexShader;
>-    ResourceSerial mAppliedGeometryShader;
>-    ResourceSerial mAppliedPixelShader;
>-    ResourceSerial mAppliedComputeShader;
>+    gl::ShaderMap<ResourceSerial> mAppliedShaders;
> 
>     // Currently applied sampler states
>-    std::vector<bool> mForceSetVertexSamplerStates;
>-    std::vector<gl::SamplerState> mCurVertexSamplerStates;
>-
>-    std::vector<bool> mForceSetPixelSamplerStates;
>-    std::vector<gl::SamplerState> mCurPixelSamplerStates;
>-
>-    std::vector<bool> mForceSetComputeSamplerStates;
>-    std::vector<gl::SamplerState> mCurComputeSamplerStates;
>+    gl::ShaderMap<std::vector<bool>> mForceSetShaderSamplerStates;
>+    gl::ShaderMap<std::vector<gl::SamplerState>> mCurShaderSamplerStates;
> 
>     // Special dirty bit for swizzles. Since they use internal shaders, must be done in a pre-pass.
>     bool mDirtySwizzles;
>@@ -522,13 +579,14 @@ class StateManager11 final : angle::NonCopyable
>     bool mIsMultiviewEnabled;
> 
>     // Driver Constants.
>-    d3d11::Buffer mDriverConstantBufferVS;
>-    d3d11::Buffer mDriverConstantBufferPS;
>-    d3d11::Buffer mDriverConstantBufferCS;
>+    gl::ShaderMap<d3d11::Buffer> mShaderDriverConstantBuffers;
> 
>     ResourceSerial mCurrentComputeConstantBuffer;
>     ResourceSerial mCurrentGeometryConstantBuffer;
> 
>+    d3d11::Buffer mPointSpriteVertexBuffer;
>+    d3d11::Buffer mPointSpriteIndexBuffer;
>+
>     template <typename T>
>     using VertexConstantBufferArray =
>         std::array<T, gl::IMPLEMENTATION_MAX_VERTEX_SHADER_UNIFORM_BUFFERS>;
>@@ -545,12 +603,23 @@ class StateManager11 final : angle::NonCopyable
>     FragmentConstantBufferArray<GLintptr> mCurrentConstantBufferPSOffset;
>     FragmentConstantBufferArray<GLsizeiptr> mCurrentConstantBufferPSSize;
> 
>+    template <typename T>
>+    using ComputeConstantBufferArray =
>+        std::array<T, gl::IMPLEMENTATION_MAX_COMPUTE_SHADER_UNIFORM_BUFFERS>;
>+
>+    ComputeConstantBufferArray<ResourceSerial> mCurrentConstantBufferCS;
>+    ComputeConstantBufferArray<GLintptr> mCurrentConstantBufferCSOffset;
>+    ComputeConstantBufferArray<GLsizeiptr> mCurrentConstantBufferCSSize;
>+
>     // Currently applied transform feedback buffers
>     Serial mAppliedTFSerial;
> 
>     Serial mEmptySerial;
> 
>-    bool mIsTransformFeedbackCurrentlyActiveUnpaused;
>+    // These objects are cached to avoid having to query the impls.
>+    ProgramD3D *mProgramD3D;
>+    VertexArray11 *mVertexArray11;
>+    Framebuffer11 *mFramebuffer11;
> };
> 
> }  // namespace rx
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/StreamProducerD3DTexture.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/StreamProducerD3DTexture.cpp
>new file mode 100644
>index 00000000000..24fa9ff2c8e
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/StreamProducerD3DTexture.cpp
>@@ -0,0 +1,162 @@
>+//
>+// Copyright (c) 2016 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+
>+// StreamProducerD3DTexture.cpp: Implements the stream producer for D3D11 textures
>+
>+#include "libANGLE/renderer/d3d/d3d11/StreamProducerD3DTexture.h"
>+
>+#include "common/utilities.h"
>+#include "libANGLE/renderer/d3d/d3d11/Renderer11.h"
>+#include "libANGLE/renderer/d3d/d3d11/renderer11_utils.h"
>+
>+#include <array>
>+
>+namespace rx
>+{
>+
>+namespace
>+{
>+
>+egl::Error GetGLDescFromTex(ID3D11Texture2D *const tex,
>+                            const UINT planeIndex,
>+                            egl::Stream::GLTextureDescription *const out)
>+{
>+    if (!tex)
>+        return egl::EglBadParameter() << "Texture is null";
>+
>+    D3D11_TEXTURE2D_DESC desc;
>+    tex->GetDesc(&desc);
>+
>+    if (desc.Width < 1 || desc.Height < 1)
>+        return egl::EglBadParameter() << "Width or height < 1";
>+
>+    out->width     = desc.Width;
>+    out->height    = desc.Height;
>+    out->mipLevels = 0;
>+
>+    std::array<uint32_t, 2> planeFormats = {};
>+    switch (desc.Format)
>+    {
>+        case DXGI_FORMAT_NV12:
>+            planeFormats = {GL_R8, GL_RG8};
>+            break;
>+
>+        case DXGI_FORMAT_P010:
>+        case DXGI_FORMAT_P016:
>+            planeFormats = {GL_R16_EXT, GL_RG16_EXT};
>+            break;
>+
>+        case DXGI_FORMAT_R8_UNORM:
>+            planeFormats = {GL_R8};
>+            break;
>+        case DXGI_FORMAT_R8G8_UNORM:
>+            planeFormats[0] = GL_RG8;
>+            break;
>+        case DXGI_FORMAT_R8G8B8A8_UNORM:
>+            planeFormats[0] = GL_RGBA8;
>+            break;
>+        case DXGI_FORMAT_B8G8R8A8_UNORM:
>+            planeFormats[0] = GL_BGRA8_EXT;
>+            break;
>+
>+        case DXGI_FORMAT_R16_UNORM:
>+            planeFormats[0] = GL_R16_EXT;
>+            break;
>+        case DXGI_FORMAT_R16G16_UNORM:
>+            planeFormats[0] = GL_RG16_EXT;
>+            break;
>+        case DXGI_FORMAT_R16G16B16A16_UNORM:
>+            planeFormats[0] = GL_RGBA16_EXT;
>+            break;
>+
>+        default:
>+            return egl::EglBadParameter() << "Unsupported format";
>+    }
>+
>+    if (planeFormats[1])  // If we have YUV planes, expect 4:2:0.
>+    {
>+        if ((desc.Width % 2) != 0 || (desc.Height % 2) != 0)
>+            return egl::EglBadParameter() << "YUV 4:2:0 textures must have even width and height.";
>+    }
>+    if (planeIndex > 0)
>+    {
>+        out->width /= 2;
>+        out->height /= 2;
>+    }
>+
>+    out->internalFormat = 0;
>+    if (planeIndex < planeFormats.size())
>+    {
>+        out->internalFormat = planeFormats[planeIndex];
>+    }
>+    if (!out->internalFormat)
>+        return egl::EglBadParameter() << "Plane out of range";
>+
>+    return egl::NoError();
>+}
>+
>+}  // namespace
>+
>+StreamProducerD3DTexture::StreamProducerD3DTexture(Renderer11 *renderer)
>+    : mRenderer(renderer), mTexture(nullptr), mArraySlice(0), mPlaneOffset(0)
>+{}
>+
>+StreamProducerD3DTexture::~StreamProducerD3DTexture()
>+{
>+    SafeRelease(mTexture);
>+}
>+
>+egl::Error StreamProducerD3DTexture::validateD3DTexture(void *pointer,
>+                                                        const egl::AttributeMap &attributes) const
>+{
>+    ID3D11Texture2D *textureD3D = static_cast<ID3D11Texture2D *>(pointer);
>+
>+    // Check that the texture originated from our device
>+    ID3D11Device *device;
>+    textureD3D->GetDevice(&device);
>+    if (device != mRenderer->getDevice())
>+    {
>+        return egl::EglBadParameter() << "Texture not created on ANGLE D3D device";
>+    }
>+
>+    const auto planeId = static_cast<UINT>(attributes.get(EGL_NATIVE_BUFFER_PLANE_OFFSET_IMG, 0));
>+    egl::Stream::GLTextureDescription unused;
>+    return GetGLDescFromTex(textureD3D, planeId, &unused);
>+}
>+
>+void StreamProducerD3DTexture::postD3DTexture(void *pointer, const egl::AttributeMap &attributes)
>+{
>+    ASSERT(pointer != nullptr);
>+    ID3D11Texture2D *textureD3D = static_cast<ID3D11Texture2D *>(pointer);
>+
>+    // Release the previous texture if there is one
>+    SafeRelease(mTexture);
>+
>+    mTexture = textureD3D;
>+    mTexture->AddRef();
>+    mPlaneOffset = static_cast<UINT>(attributes.get(EGL_NATIVE_BUFFER_PLANE_OFFSET_IMG, 0));
>+    mArraySlice  = static_cast<UINT>(attributes.get(EGL_D3D_TEXTURE_SUBRESOURCE_ID_ANGLE, 0));
>+}
>+
>+egl::Stream::GLTextureDescription StreamProducerD3DTexture::getGLFrameDescription(int planeIndex)
>+{
>+    const auto planeOffsetIndex = static_cast<UINT>(planeIndex + mPlaneOffset);
>+    egl::Stream::GLTextureDescription ret;
>+    ANGLE_SWALLOW_ERR(GetGLDescFromTex(mTexture, planeOffsetIndex, &ret));
>+    return ret;
>+}
>+
>+ID3D11Texture2D *StreamProducerD3DTexture::getD3DTexture()
>+{
>+    return mTexture;
>+}
>+
>+UINT StreamProducerD3DTexture::getArraySlice()
>+{
>+    return mArraySlice;
>+}
>+
>+}  // namespace rx
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/StreamProducerD3DTexture.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/StreamProducerD3DTexture.h
>new file mode 100644
>index 00000000000..5c4bcb266c0
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/StreamProducerD3DTexture.h
>@@ -0,0 +1,44 @@
>+//
>+// Copyright (c) 2016 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+
>+// StreamProducerD3DTexture.h: Interface for a D3D11 texture stream producer
>+
>+#ifndef LIBANGLE_RENDERER_D3D_D3D11_STREAM11_H_
>+#define LIBANGLE_RENDERER_D3D_D3D11_STREAM11_H_
>+
>+#include "libANGLE/renderer/StreamProducerImpl.h"
>+
>+namespace rx
>+{
>+class Renderer11;
>+
>+class StreamProducerD3DTexture : public StreamProducerImpl
>+{
>+  public:
>+    StreamProducerD3DTexture(Renderer11 *renderer);
>+    ~StreamProducerD3DTexture() override;
>+
>+    egl::Error validateD3DTexture(void *pointer,
>+                                  const egl::AttributeMap &attributes) const override;
>+    void postD3DTexture(void *pointer, const egl::AttributeMap &attributes) override;
>+    egl::Stream::GLTextureDescription getGLFrameDescription(int planeIndex) override;
>+
>+    // Gets a pointer to the internal D3D texture
>+    ID3D11Texture2D *getD3DTexture();
>+
>+    // Gets the slice index for the D3D texture that the frame is in
>+    UINT getArraySlice();
>+
>+  private:
>+    Renderer11 *mRenderer;
>+
>+    ID3D11Texture2D *mTexture;
>+    UINT mArraySlice;
>+    UINT mPlaneOffset;
>+};
>+}  // namespace rx
>+
>+#endif  // LIBANGLE_RENDERER_D3D_D3D11_STREAM11_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/StreamProducerNV12.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/StreamProducerNV12.cpp
>deleted file mode 100644
>index 1981b5f7b26..00000000000
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/StreamProducerNV12.cpp
>+++ /dev/null
>@@ -1,102 +0,0 @@
>-//
>-// Copyright (c) 2016 The ANGLE Project Authors. All rights reserved.
>-// Use of this source code is governed by a BSD-style license that can be
>-// found in the LICENSE file.
>-//
>-
>-// StreamProducerNV12.cpp: Implements the stream producer for NV12 textures
>-
>-#include "libANGLE/renderer/d3d/d3d11/StreamProducerNV12.h"
>-
>-#include "common/utilities.h"
>-#include "libANGLE/renderer/d3d/d3d11/Renderer11.h"
>-#include "libANGLE/renderer/d3d/d3d11/renderer11_utils.h"
>-
>-namespace rx
>-{
>-
>-StreamProducerNV12::StreamProducerNV12(Renderer11 *renderer)
>-    : mRenderer(renderer), mTexture(nullptr), mArraySlice(0), mTextureWidth(0), mTextureHeight(0)
>-{
>-}
>-
>-StreamProducerNV12::~StreamProducerNV12()
>-{
>-    SafeRelease(mTexture);
>-}
>-
>-egl::Error StreamProducerNV12::validateD3DNV12Texture(void *pointer) const
>-{
>-    ID3D11Texture2D *textureD3D = static_cast<ID3D11Texture2D *>(pointer);
>-
>-    // Check that the texture originated from our device
>-    ID3D11Device *device;
>-    textureD3D->GetDevice(&device);
>-    if (device != mRenderer->getDevice())
>-    {
>-        return egl::EglBadParameter() << "Texture not created on ANGLE D3D device";
>-    }
>-
>-    // Get the description and validate it
>-    D3D11_TEXTURE2D_DESC desc;
>-    textureD3D->GetDesc(&desc);
>-    if (desc.Format != DXGI_FORMAT_NV12)
>-    {
>-        return egl::EglBadParameter() << "Texture format not DXGI_FORMAT_NV12";
>-    }
>-    if (desc.Width < 1 || desc.Height < 1)
>-    {
>-        return egl::EglBadParameter() << "Texture is of size 0";
>-    }
>-    if ((desc.Width % 2) != 0 || (desc.Height % 2) != 0)
>-    {
>-        return egl::EglBadParameter() << "Texture dimensions are not even";
>-    }
>-    return egl::NoError();
>-}
>-
>-void StreamProducerNV12::postD3DNV12Texture(void *pointer, const egl::AttributeMap &attributes)
>-{
>-    ASSERT(pointer != nullptr);
>-    ID3D11Texture2D *textureD3D = static_cast<ID3D11Texture2D *>(pointer);
>-
>-    // Check that the texture originated from our device
>-    ID3D11Device *device;
>-    textureD3D->GetDevice(&device);
>-
>-    // Get the description
>-    D3D11_TEXTURE2D_DESC desc;
>-    textureD3D->GetDesc(&desc);
>-
>-    // Release the previous texture if there is one
>-    SafeRelease(mTexture);
>-
>-    mTexture = textureD3D;
>-    mTexture->AddRef();
>-    mTextureWidth  = desc.Width;
>-    mTextureHeight = desc.Height;
>-    mArraySlice    = static_cast<UINT>(attributes.get(EGL_D3D_TEXTURE_SUBRESOURCE_ID_ANGLE, 0));
>-}
>-
>-egl::Stream::GLTextureDescription StreamProducerNV12::getGLFrameDescription(int planeIndex)
>-{
>-    // The UV plane of NV12 textures has half the width/height of the Y plane
>-    egl::Stream::GLTextureDescription desc;
>-    desc.width          = (planeIndex == 0) ? mTextureWidth : (mTextureWidth / 2);
>-    desc.height         = (planeIndex == 0) ? mTextureHeight : (mTextureHeight / 2);
>-    desc.internalFormat = (planeIndex == 0) ? GL_R8 : GL_RG8;
>-    desc.mipLevels      = 0;
>-    return desc;
>-}
>-
>-ID3D11Texture2D *StreamProducerNV12::getD3DTexture()
>-{
>-    return mTexture;
>-}
>-
>-UINT StreamProducerNV12::getArraySlice()
>-{
>-    return mArraySlice;
>-}
>-
>-}  // namespace rx
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/StreamProducerNV12.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/StreamProducerNV12.h
>deleted file mode 100644
>index 304c9dfe530..00000000000
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/StreamProducerNV12.h
>+++ /dev/null
>@@ -1,44 +0,0 @@
>-//
>-// Copyright (c) 2016 The ANGLE Project Authors. All rights reserved.
>-// Use of this source code is governed by a BSD-style license that can be
>-// found in the LICENSE file.
>-//
>-
>-// StreamProducerNV12.h: Interface for a NV12 texture stream producer
>-
>-#ifndef LIBANGLE_RENDERER_D3D_D3D11_STREAM11_H_
>-#define LIBANGLE_RENDERER_D3D_D3D11_STREAM11_H_
>-
>-#include "libANGLE/renderer/StreamProducerImpl.h"
>-
>-namespace rx
>-{
>-class Renderer11;
>-
>-class StreamProducerNV12 : public StreamProducerImpl
>-{
>-  public:
>-    StreamProducerNV12(Renderer11 *renderer);
>-    ~StreamProducerNV12() override;
>-
>-    egl::Error validateD3DNV12Texture(void *pointer) const override;
>-    void postD3DNV12Texture(void *pointer, const egl::AttributeMap &attributes) override;
>-    egl::Stream::GLTextureDescription getGLFrameDescription(int planeIndex) override;
>-
>-    // Gets a pointer to the internal D3D texture
>-    ID3D11Texture2D *getD3DTexture();
>-
>-    // Gets the slice index for the D3D texture that the frame is in
>-    UINT getArraySlice();
>-
>-  private:
>-    Renderer11 *mRenderer;
>-
>-    ID3D11Texture2D *mTexture;
>-    UINT mArraySlice;
>-    UINT mTextureWidth;
>-    UINT mTextureHeight;
>-};
>-}  // namespace rx
>-
>-#endif  // LIBANGLE_RENDERER_D3D_D3D11_STREAM11_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/SwapChain11.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/SwapChain11.cpp
>index 19bcaae776f..fe4def6eb1b 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/SwapChain11.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/SwapChain11.cpp
>@@ -11,6 +11,7 @@
> #include <EGL/eglext.h>
> 
> #include "libANGLE/features.h"
>+#include "libANGLE/renderer/d3d/DisplayD3D.h"
> #include "libANGLE/renderer/d3d/d3d11/NativeWindow11.h"
> #include "libANGLE/renderer/d3d/d3d11/Renderer11.h"
> #include "libANGLE/renderer/d3d/d3d11/formatutils11.h"
>@@ -22,11 +23,12 @@
> #include "libANGLE/renderer/d3d/d3d11/shaders/compiled/passthrough2d11vs.h"
> #include "libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgba2d11ps.h"
> #include "libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgba2dms11ps.h"
>+#include "libANGLE/renderer/d3d/d3d11/shaders/compiled/resolvecolor2dps.h"
> 
> #ifdef ANGLE_ENABLE_KEYEDMUTEX
>-#define ANGLE_RESOURCE_SHARE_TYPE D3D11_RESOURCE_MISC_SHARED_KEYEDMUTEX
>+#    define ANGLE_RESOURCE_SHARE_TYPE D3D11_RESOURCE_MISC_SHARED_KEYEDMUTEX
> #else
>-#define ANGLE_RESOURCE_SHARE_TYPE D3D11_RESOURCE_MISC_SHARED
>+#    define ANGLE_RESOURCE_SHARE_TYPE D3D11_RESOURCE_MISC_SHARED
> #endif
> 
> namespace rx
>@@ -86,7 +88,7 @@ SwapChain11::SwapChain11(Renderer11 *renderer,
>       mPassThroughSampler(),
>       mPassThroughIL(),
>       mPassThroughVS(),
>-      mPassThroughPS(),
>+      mPassThroughOrResolvePS(),
>       mPassThroughRS(),
>       mColorRenderTarget(this, renderer, false),
>       mDepthStencilRenderTarget(this, renderer, true),
>@@ -128,7 +130,7 @@ void SwapChain11::release()
>     mPassThroughSampler.reset();
>     mPassThroughIL.reset();
>     mPassThroughVS.reset();
>-    mPassThroughPS.reset();
>+    mPassThroughOrResolvePS.reset();
>     mPassThroughRS.reset();
> 
>     if (!mAppCreatedShareHandle)
>@@ -153,20 +155,20 @@ void SwapChain11::releaseOffscreenDepthBuffer()
>     mDepthStencilSRView.reset();
> }
> 
>-EGLint SwapChain11::resetOffscreenBuffers(const gl::Context *context,
>+EGLint SwapChain11::resetOffscreenBuffers(DisplayD3D *displayD3D,
>                                           int backbufferWidth,
>                                           int backbufferHeight)
> {
>     if (mNeedsOffscreenTexture)
>     {
>-        EGLint result = resetOffscreenColorBuffer(context, backbufferWidth, backbufferHeight);
>+        EGLint result = resetOffscreenColorBuffer(displayD3D, backbufferWidth, backbufferHeight);
>         if (result != EGL_SUCCESS)
>         {
>             return result;
>         }
>     }
> 
>-    EGLint result = resetOffscreenDepthBuffer(backbufferWidth, backbufferHeight);
>+    EGLint result = resetOffscreenDepthBuffer(displayD3D, backbufferWidth, backbufferHeight);
>     if (result != EGL_SUCCESS)
>     {
>         return result;
>@@ -178,7 +180,7 @@ EGLint SwapChain11::resetOffscreenBuffers(const gl::Context *context,
>     return EGL_SUCCESS;
> }
> 
>-EGLint SwapChain11::resetOffscreenColorBuffer(const gl::Context *context,
>+EGLint SwapChain11::resetOffscreenColorBuffer(DisplayD3D *displayD3D,
>                                               int backbufferWidth,
>                                               int backbufferHeight)
> {
>@@ -195,7 +197,7 @@ EGLint SwapChain11::resetOffscreenColorBuffer(const gl::Context *context,
> 
>     // Preserve the render target content
>     TextureHelper11 previousOffscreenTexture(std::move(mOffscreenTexture));
>-    const int previousWidth = mWidth;
>+    const int previousWidth  = mWidth;
>     const int previousHeight = mHeight;
> 
>     releaseOffscreenColorBuffer();
>@@ -213,7 +215,12 @@ EGLint SwapChain11::resetOffscreenColorBuffer(const gl::Context *context,
>             ID3D11Resource *tempResource11;
>             HRESULT result = device->OpenSharedResource(mShareHandle, __uuidof(ID3D11Resource),
>                                                         (void **)&tempResource11);
>-            ASSERT(SUCCEEDED(result));
>+            if (FAILED(result))
>+            {
>+                ERR() << "Could not open shared handle. " << gl::FmtHR(result);
>+                release();
>+                return EGL_BAD_SURFACE;
>+            }
> 
>             mOffscreenTexture.set(d3d11::DynamicCastComObject<ID3D11Texture2D>(tempResource11),
>                                   backbufferFormatInfo);
>@@ -244,50 +251,51 @@ EGLint SwapChain11::resetOffscreenColorBuffer(const gl::Context *context,
>         const bool useSharedResource =
>             !mNativeWindow->getNativeWindow() && mRenderer->getShareHandleSupport();
> 
>-        offscreenTextureDesc.Width = backbufferWidth;
>-        offscreenTextureDesc.Height = backbufferHeight;
>-        offscreenTextureDesc.Format               = backbufferFormatInfo.texFormat;
>-        offscreenTextureDesc.MipLevels = 1;
>-        offscreenTextureDesc.ArraySize = 1;
>-        offscreenTextureDesc.SampleDesc.Count     = getD3DSamples();
>+        offscreenTextureDesc.Width              = backbufferWidth;
>+        offscreenTextureDesc.Height             = backbufferHeight;
>+        offscreenTextureDesc.Format             = backbufferFormatInfo.texFormat;
>+        offscreenTextureDesc.MipLevels          = 1;
>+        offscreenTextureDesc.ArraySize          = 1;
>+        offscreenTextureDesc.SampleDesc.Count   = getD3DSamples();
>         offscreenTextureDesc.SampleDesc.Quality = 0;
>-        offscreenTextureDesc.Usage = D3D11_USAGE_DEFAULT;
>-        offscreenTextureDesc.BindFlags = D3D11_BIND_RENDER_TARGET | D3D11_BIND_SHADER_RESOURCE;
>+        offscreenTextureDesc.Usage              = D3D11_USAGE_DEFAULT;
>+        offscreenTextureDesc.BindFlags      = D3D11_BIND_RENDER_TARGET | D3D11_BIND_SHADER_RESOURCE;
>         offscreenTextureDesc.CPUAccessFlags = 0;
>-        offscreenTextureDesc.MiscFlags = useSharedResource ? ANGLE_RESOURCE_SHARE_TYPE : 0;
>+        offscreenTextureDesc.MiscFlags      = useSharedResource ? ANGLE_RESOURCE_SHARE_TYPE : 0;
> 
>-        gl::Error err = mRenderer->allocateTexture(offscreenTextureDesc, backbufferFormatInfo,
>-                                                   &mOffscreenTexture);
>-        if (err.isError())
>+        angle::Result result = mRenderer->allocateTexture(displayD3D, offscreenTextureDesc,
>+                                                          backbufferFormatInfo, &mOffscreenTexture);
>+        if (result == angle::Result::Stop)
>         {
>-            ERR() << "Could not create offscreen texture, " << err;
>+            ERR() << "Could not create offscreen texture, " << displayD3D->getStoredErrorString();
>             release();
>             return EGL_BAD_ALLOC;
>         }
> 
>         mOffscreenTexture.setDebugName("Offscreen back buffer texture");
> 
>-        // EGL_ANGLE_surface_d3d_texture_2d_share_handle requires that we store a share handle for the client
>+        // EGL_ANGLE_surface_d3d_texture_2d_share_handle requires that we store a share handle for
>+        // the client
>         if (useSharedResource)
>         {
>             IDXGIResource *offscreenTextureResource = nullptr;
>-            HRESULT result                          = mOffscreenTexture.get()->QueryInterface(
>+            HRESULT hr                              = mOffscreenTexture.get()->QueryInterface(
>                 __uuidof(IDXGIResource), (void **)&offscreenTextureResource);
> 
>             // Fall back to no share handle on failure
>-            if (FAILED(result))
>+            if (FAILED(hr))
>             {
>-                ERR() << "Could not query offscreen texture resource, " << gl::FmtHR(result);
>+                ERR() << "Could not query offscreen texture resource, " << gl::FmtHR(hr);
>             }
>             else
>             {
>-                result = offscreenTextureResource->GetSharedHandle(&mShareHandle);
>+                hr = offscreenTextureResource->GetSharedHandle(&mShareHandle);
>                 SafeRelease(offscreenTextureResource);
> 
>-                if (FAILED(result))
>+                if (FAILED(hr))
>                 {
>                     mShareHandle = nullptr;
>-                    ERR() << "Could not get offscreen texture shared handle, " << gl::FmtHR(result);
>+                    ERR() << "Could not get offscreen texture shared handle, " << gl::FmtHR(hr);
>                 }
>             }
>         }
>@@ -297,28 +305,28 @@ EGLint SwapChain11::resetOffscreenColorBuffer(const gl::Context *context,
>     mKeyedMutex = d3d11::DynamicCastComObject<IDXGIKeyedMutex>(mOffscreenTexture.get());
> 
>     D3D11_RENDER_TARGET_VIEW_DESC offscreenRTVDesc;
>-    offscreenRTVDesc.Format             = backbufferFormatInfo.rtvFormat;
>+    offscreenRTVDesc.Format = backbufferFormatInfo.rtvFormat;
>     offscreenRTVDesc.ViewDimension =
>         (mEGLSamples <= 1) ? D3D11_RTV_DIMENSION_TEXTURE2D : D3D11_RTV_DIMENSION_TEXTURE2DMS;
>     offscreenRTVDesc.Texture2D.MipSlice = 0;
> 
>-    gl::Error err =
>-        mRenderer->allocateResource(offscreenRTVDesc, mOffscreenTexture.get(), &mOffscreenRTView);
>-    ASSERT(!err.isError());
>+    angle::Result result = mRenderer->allocateResource(displayD3D, offscreenRTVDesc,
>+                                                       mOffscreenTexture.get(), &mOffscreenRTView);
>+    ASSERT(result != angle::Result::Stop);
>     mOffscreenRTView.setDebugName("Offscreen back buffer render target");
> 
>     D3D11_SHADER_RESOURCE_VIEW_DESC offscreenSRVDesc;
>-    offscreenSRVDesc.Format                    = backbufferFormatInfo.srvFormat;
>+    offscreenSRVDesc.Format = backbufferFormatInfo.srvFormat;
>     offscreenSRVDesc.ViewDimension =
>         (mEGLSamples <= 1) ? D3D11_SRV_DIMENSION_TEXTURE2D : D3D11_SRV_DIMENSION_TEXTURE2DMS;
>     offscreenSRVDesc.Texture2D.MostDetailedMip = 0;
>-    offscreenSRVDesc.Texture2D.MipLevels = static_cast<UINT>(-1);
>+    offscreenSRVDesc.Texture2D.MipLevels       = static_cast<UINT>(-1);
> 
>     if (offscreenTextureDesc.BindFlags & D3D11_BIND_SHADER_RESOURCE)
>     {
>-        err = mRenderer->allocateResource(offscreenSRVDesc, mOffscreenTexture.get(),
>-                                          &mOffscreenSRView);
>-        ASSERT(!err.isError());
>+        result = mRenderer->allocateResource(displayD3D, offscreenSRVDesc, mOffscreenTexture.get(),
>+                                             &mOffscreenSRView);
>+        ASSERT(result != angle::Result::Stop);
>         mOffscreenSRView.setDebugName("Offscreen back buffer shader resource");
>     }
>     else
>@@ -339,20 +347,22 @@ EGLint SwapChain11::resetOffscreenColorBuffer(const gl::Context *context,
>         sourceBox.back      = 1;
> 
>         ID3D11DeviceContext *deviceContext = mRenderer->getDeviceContext();
>-        const int yoffset = std::max(backbufferHeight - previousHeight, 0);
>+        const int yoffset                  = std::max(backbufferHeight - previousHeight, 0);
>         deviceContext->CopySubresourceRegion(mOffscreenTexture.get(), 0, 0, yoffset, 0,
>                                              previousOffscreenTexture.get(), 0, &sourceBox);
> 
>         if (mSwapChain)
>         {
>-            swapRect(context, 0, 0, backbufferWidth, backbufferHeight);
>+            swapRect(displayD3D, 0, 0, backbufferWidth, backbufferHeight);
>         }
>     }
> 
>     return EGL_SUCCESS;
> }
> 
>-EGLint SwapChain11::resetOffscreenDepthBuffer(int backbufferWidth, int backbufferHeight)
>+EGLint SwapChain11::resetOffscreenDepthBuffer(DisplayD3D *displayD3D,
>+                                              int backbufferWidth,
>+                                              int backbufferHeight)
> {
>     releaseOffscreenDepthBuffer();
> 
>@@ -362,14 +372,14 @@ EGLint SwapChain11::resetOffscreenDepthBuffer(int backbufferWidth, int backbuffe
>             d3d11::Format::Get(mDepthBufferFormat, mRenderer->getRenderer11DeviceCaps());
> 
>         D3D11_TEXTURE2D_DESC depthStencilTextureDesc;
>-        depthStencilTextureDesc.Width = backbufferWidth;
>-        depthStencilTextureDesc.Height = backbufferHeight;
>-        depthStencilTextureDesc.Format             = depthBufferFormatInfo.texFormat;
>-        depthStencilTextureDesc.MipLevels = 1;
>-        depthStencilTextureDesc.ArraySize = 1;
>-        depthStencilTextureDesc.SampleDesc.Count   = getD3DSamples();
>-        depthStencilTextureDesc.Usage = D3D11_USAGE_DEFAULT;
>-        depthStencilTextureDesc.BindFlags = D3D11_BIND_DEPTH_STENCIL;
>+        depthStencilTextureDesc.Width            = backbufferWidth;
>+        depthStencilTextureDesc.Height           = backbufferHeight;
>+        depthStencilTextureDesc.Format           = depthBufferFormatInfo.texFormat;
>+        depthStencilTextureDesc.MipLevels        = 1;
>+        depthStencilTextureDesc.ArraySize        = 1;
>+        depthStencilTextureDesc.SampleDesc.Count = getD3DSamples();
>+        depthStencilTextureDesc.Usage            = D3D11_USAGE_DEFAULT;
>+        depthStencilTextureDesc.BindFlags        = D3D11_BIND_DEPTH_STENCIL;
> 
>         // If there is a multisampled offscreen color texture, the offscreen depth-stencil texture
>         // must also have the same quality value.
>@@ -395,43 +405,44 @@ EGLint SwapChain11::resetOffscreenDepthBuffer(int backbufferWidth, int backbuffe
>         }
> 
>         depthStencilTextureDesc.CPUAccessFlags = 0;
>-        depthStencilTextureDesc.MiscFlags = 0;
>+        depthStencilTextureDesc.MiscFlags      = 0;
> 
>-        gl::Error err = mRenderer->allocateTexture(depthStencilTextureDesc, depthBufferFormatInfo,
>-                                                   &mDepthStencilTexture);
>-        if (err.isError())
>+        angle::Result result = mRenderer->allocateTexture(
>+            displayD3D, depthStencilTextureDesc, depthBufferFormatInfo, &mDepthStencilTexture);
>+        if (result == angle::Result::Stop)
>         {
>-            ERR() << "Could not create depthstencil surface for new swap chain, " << err;
>+            ERR() << "Could not create depthstencil surface for new swap chain, "
>+                  << displayD3D->getStoredErrorString();
>             release();
>             return EGL_BAD_ALLOC;
>         }
>         mDepthStencilTexture.setDebugName("Offscreen depth stencil texture");
> 
>         D3D11_DEPTH_STENCIL_VIEW_DESC depthStencilDesc;
>-        depthStencilDesc.Format             = depthBufferFormatInfo.dsvFormat;
>+        depthStencilDesc.Format = depthBufferFormatInfo.dsvFormat;
>         depthStencilDesc.ViewDimension =
>             (mEGLSamples <= 1) ? D3D11_DSV_DIMENSION_TEXTURE2D : D3D11_DSV_DIMENSION_TEXTURE2DMS;
>-        depthStencilDesc.Flags = 0;
>+        depthStencilDesc.Flags              = 0;
>         depthStencilDesc.Texture2D.MipSlice = 0;
> 
>-        err = mRenderer->allocateResource(depthStencilDesc, mDepthStencilTexture.get(),
>-                                          &mDepthStencilDSView);
>-        ASSERT(!err.isError());
>+        result = mRenderer->allocateResource(displayD3D, depthStencilDesc,
>+                                             mDepthStencilTexture.get(), &mDepthStencilDSView);
>+        ASSERT(result != angle::Result::Stop);
>         mDepthStencilDSView.setDebugName("Offscreen depth stencil view");
> 
>         if (depthStencilSRV)
>         {
>             D3D11_SHADER_RESOURCE_VIEW_DESC depthStencilSRVDesc;
>-            depthStencilSRVDesc.Format                    = depthBufferFormatInfo.srvFormat;
>-            depthStencilSRVDesc.ViewDimension             = (mEGLSamples <= 1)
>+            depthStencilSRVDesc.Format        = depthBufferFormatInfo.srvFormat;
>+            depthStencilSRVDesc.ViewDimension = (mEGLSamples <= 1)
>                                                     ? D3D11_SRV_DIMENSION_TEXTURE2D
>                                                     : D3D11_SRV_DIMENSION_TEXTURE2DMS;
>             depthStencilSRVDesc.Texture2D.MostDetailedMip = 0;
>-            depthStencilSRVDesc.Texture2D.MipLevels = static_cast<UINT>(-1);
>+            depthStencilSRVDesc.Texture2D.MipLevels       = static_cast<UINT>(-1);
> 
>-            err = mRenderer->allocateResource(depthStencilSRVDesc, mDepthStencilTexture.get(),
>-                                              &mDepthStencilSRView);
>-            ASSERT(!err.isError());
>+            result = mRenderer->allocateResource(displayD3D, depthStencilSRVDesc,
>+                                                 mDepthStencilTexture.get(), &mDepthStencilSRView);
>+            ASSERT(result != angle::Result::Stop);
>             mDepthStencilSRView.setDebugName("Offscreen depth stencil shader resource");
>         }
>     }
>@@ -439,9 +450,7 @@ EGLint SwapChain11::resetOffscreenDepthBuffer(int backbufferWidth, int backbuffe
>     return EGL_SUCCESS;
> }
> 
>-EGLint SwapChain11::resize(const gl::Context *context,
>-                           EGLint backbufferWidth,
>-                           EGLint backbufferHeight)
>+EGLint SwapChain11::resize(DisplayD3D *displayD3D, EGLint backbufferWidth, EGLint backbufferHeight)
> {
>     TRACE_EVENT0("gpu.angle", "SwapChain11::resize");
>     ID3D11Device *device = mRenderer->getDevice();
>@@ -473,22 +482,23 @@ EGLint SwapChain11::resize(const gl::Context *context,
> 
>     // Resize swap chain
>     DXGI_SWAP_CHAIN_DESC desc;
>-    HRESULT result = mSwapChain->GetDesc(&desc);
>-    if (FAILED(result))
>+    HRESULT hr = mSwapChain->GetDesc(&desc);
>+    if (FAILED(hr))
>     {
>-        ERR() << "Error reading swap chain description, " << gl::FmtHR(result);
>+        ERR() << "Error reading swap chain description, " << gl::FmtHR(hr);
>         release();
>         return EGL_BAD_ALLOC;
>     }
> 
>-    result = mSwapChain->ResizeBuffers(desc.BufferCount, backbufferWidth, backbufferHeight, getSwapChainNativeFormat(), 0);
>+    hr = mSwapChain->ResizeBuffers(desc.BufferCount, backbufferWidth, backbufferHeight,
>+                                   getSwapChainNativeFormat(), 0);
> 
>-    if (FAILED(result))
>+    if (FAILED(hr))
>     {
>-        ERR() << "Error resizing swap chain buffers, " << gl::FmtHR(result);
>+        ERR() << "Error resizing swap chain buffers, " << gl::FmtHR(hr);
>         release();
> 
>-        if (d3d11::isDeviceLostError(result))
>+        if (d3d11::isDeviceLostError(hr))
>         {
>             return EGL_CONTEXT_LOST;
>         }
>@@ -499,29 +509,30 @@ EGLint SwapChain11::resize(const gl::Context *context,
>     }
> 
>     ID3D11Texture2D *backbufferTexture = nullptr;
>-    result                             = mSwapChain->GetBuffer(0, __uuidof(ID3D11Texture2D),
>-                                   reinterpret_cast<void **>(&backbufferTexture));
>-    ASSERT(SUCCEEDED(result));
>-    if (SUCCEEDED(result))
>+    hr                                 = mSwapChain->GetBuffer(0, __uuidof(ID3D11Texture2D),
>+                               reinterpret_cast<void **>(&backbufferTexture));
>+    ASSERT(SUCCEEDED(hr));
>+    if (SUCCEEDED(hr))
>     {
>         const auto &format =
>             d3d11::Format::Get(mOffscreenRenderTargetFormat, mRenderer->getRenderer11DeviceCaps());
>         mBackBufferTexture.set(backbufferTexture, format);
>         mBackBufferTexture.setDebugName("Back buffer texture");
> 
>-        gl::Error err =
>-            mRenderer->allocateResourceNoDesc(mBackBufferTexture.get(), &mBackBufferRTView);
>-        ASSERT(!err.isError());
>+        angle::Result result = mRenderer->allocateResourceNoDesc(
>+            displayD3D, mBackBufferTexture.get(), &mBackBufferRTView);
>+        ASSERT(result != angle::Result::Stop);
>         mBackBufferRTView.setDebugName("Back buffer render target");
> 
>-        err = mRenderer->allocateResourceNoDesc(mBackBufferTexture.get(), &mBackBufferSRView);
>-        ASSERT(!err.isError());
>+        result = mRenderer->allocateResourceNoDesc(displayD3D, mBackBufferTexture.get(),
>+                                                   &mBackBufferSRView);
>+        ASSERT(result != angle::Result::Stop);
>         mBackBufferSRView.setDebugName("Back buffer shader resource");
>     }
> 
>     mFirstSwap = true;
> 
>-    return resetOffscreenBuffers(context, backbufferWidth, backbufferHeight);
>+    return resetOffscreenBuffers(displayD3D, backbufferWidth, backbufferHeight);
> }
> 
> DXGI_FORMAT SwapChain11::getSwapChainNativeFormat() const
>@@ -552,7 +563,7 @@ DXGI_FORMAT SwapChain11::getSwapChainNativeFormat() const
>     }
> }
> 
>-EGLint SwapChain11::reset(const gl::Context *context,
>+EGLint SwapChain11::reset(DisplayD3D *displayD3D,
>                           EGLint backbufferWidth,
>                           EGLint backbufferHeight,
>                           EGLint swapInterval)
>@@ -568,7 +579,7 @@ EGLint SwapChain11::reset(const gl::Context *context,
>     // If the swap chain already exists, just resize
>     if (mSwapChain != nullptr)
>     {
>-        return resize(context, backbufferWidth, backbufferHeight);
>+        return resize(displayD3D, backbufferWidth, backbufferHeight);
>     }
> 
>     TRACE_EVENT0("gpu.angle", "SwapChain11::reset");
>@@ -595,17 +606,17 @@ EGLint SwapChain11::reset(const gl::Context *context,
> 
>     if (mNativeWindow->getNativeWindow())
>     {
>-        HRESULT result = mNativeWindow->createSwapChain(
>+        HRESULT hr = mNativeWindow->createSwapChain(
>             device, mRenderer->getDxgiFactory(), getSwapChainNativeFormat(), backbufferWidth,
>-            backbufferHeight, getD3DSamples(), &mSwapChain);
>+            backbufferHeight, mNeedsOffscreenTexture ? 1 : getD3DSamples(), &mSwapChain);
> 
>-        if (FAILED(result))
>+        if (FAILED(hr))
>         {
>             ERR() << "Could not create additional swap chains or offscreen surfaces, "
>-                  << gl::FmtHR(result);
>+                  << gl::FmtHR(hr);
>             release();
> 
>-            if (d3d11::isDeviceLostError(result))
>+            if (d3d11::isDeviceLostError(hr))
>             {
>                 return EGL_CONTEXT_LOST;
>             }
>@@ -621,34 +632,35 @@ EGLint SwapChain11::reset(const gl::Context *context,
>         }
> 
>         ID3D11Texture2D *backbufferTex = nullptr;
>-        result                         = mSwapChain->GetBuffer(0, __uuidof(ID3D11Texture2D),
>-                                       reinterpret_cast<LPVOID *>(&backbufferTex));
>-        ASSERT(SUCCEEDED(result));
>+        hr                             = mSwapChain->GetBuffer(0, __uuidof(ID3D11Texture2D),
>+                                   reinterpret_cast<LPVOID *>(&backbufferTex));
>+        ASSERT(SUCCEEDED(hr));
>         const auto &format =
>             d3d11::Format::Get(mOffscreenRenderTargetFormat, mRenderer->getRenderer11DeviceCaps());
>         mBackBufferTexture.set(backbufferTex, format);
>         mBackBufferTexture.setDebugName("Back buffer texture");
> 
>-        gl::Error err =
>-            mRenderer->allocateResourceNoDesc(mBackBufferTexture.get(), &mBackBufferRTView);
>-        ASSERT(!err.isError());
>+        angle::Result result = mRenderer->allocateResourceNoDesc(
>+            displayD3D, mBackBufferTexture.get(), &mBackBufferRTView);
>+        ASSERT(result != angle::Result::Stop);
>         mBackBufferRTView.setDebugName("Back buffer render target");
> 
>-        err = mRenderer->allocateResourceNoDesc(mBackBufferTexture.get(), &mBackBufferSRView);
>-        ASSERT(!err.isError());
>+        result = mRenderer->allocateResourceNoDesc(displayD3D, mBackBufferTexture.get(),
>+                                                   &mBackBufferSRView);
>+        ASSERT(result != angle::Result::Stop);
>         mBackBufferSRView.setDebugName("Back buffer shader resource view");
>     }
> 
>     mFirstSwap = true;
> 
>-    return resetOffscreenBuffers(context, backbufferWidth, backbufferHeight);
>+    return resetOffscreenBuffers(displayD3D, backbufferWidth, backbufferHeight);
> }
> 
>-void SwapChain11::initPassThroughResources()
>+angle::Result SwapChain11::initPassThroughResources(DisplayD3D *displayD3D)
> {
>     if (mPassThroughResourcesInit)
>     {
>-        return;
>+        return angle::Result::Continue;
>     }
> 
>     TRACE_EVENT0("gpu.angle", "SwapChain11::initPassThroughResources");
>@@ -658,69 +670,75 @@ void SwapChain11::initPassThroughResources()
> 
>     // Make sure our resources are all not allocated, when we create
>     ASSERT(!mQuadVB.valid() && !mPassThroughSampler.valid());
>-    ASSERT(!mPassThroughIL.valid() && !mPassThroughVS.valid() && !mPassThroughPS.valid());
>+    ASSERT(!mPassThroughIL.valid() && !mPassThroughVS.valid() && !mPassThroughOrResolvePS.valid());
> 
>     D3D11_BUFFER_DESC vbDesc;
>-    vbDesc.ByteWidth = sizeof(d3d11::PositionTexCoordVertex) * 4;
>-    vbDesc.Usage = D3D11_USAGE_DYNAMIC;
>-    vbDesc.BindFlags = D3D11_BIND_VERTEX_BUFFER;
>-    vbDesc.CPUAccessFlags = D3D11_CPU_ACCESS_WRITE;
>-    vbDesc.MiscFlags = 0;
>+    vbDesc.ByteWidth           = sizeof(d3d11::PositionTexCoordVertex) * 4;
>+    vbDesc.Usage               = D3D11_USAGE_DYNAMIC;
>+    vbDesc.BindFlags           = D3D11_BIND_VERTEX_BUFFER;
>+    vbDesc.CPUAccessFlags      = D3D11_CPU_ACCESS_WRITE;
>+    vbDesc.MiscFlags           = 0;
>     vbDesc.StructureByteStride = 0;
> 
>-    gl::Error err = mRenderer->allocateResource(vbDesc, &mQuadVB);
>-    ASSERT(!err.isError());
>+    ANGLE_TRY(mRenderer->allocateResource(displayD3D, vbDesc, &mQuadVB));
>     mQuadVB.setDebugName("Swap chain quad vertex buffer");
> 
>     D3D11_SAMPLER_DESC samplerDesc;
>-    samplerDesc.Filter = D3D11_FILTER_MIN_MAG_MIP_POINT;
>-    samplerDesc.AddressU = D3D11_TEXTURE_ADDRESS_CLAMP;
>-    samplerDesc.AddressV = D3D11_TEXTURE_ADDRESS_CLAMP;
>-    samplerDesc.AddressW = D3D11_TEXTURE_ADDRESS_CLAMP;
>-    samplerDesc.MipLODBias = 0.0f;
>-    samplerDesc.MaxAnisotropy = 0;
>+    samplerDesc.Filter         = D3D11_FILTER_MIN_MAG_MIP_POINT;
>+    samplerDesc.AddressU       = D3D11_TEXTURE_ADDRESS_CLAMP;
>+    samplerDesc.AddressV       = D3D11_TEXTURE_ADDRESS_CLAMP;
>+    samplerDesc.AddressW       = D3D11_TEXTURE_ADDRESS_CLAMP;
>+    samplerDesc.MipLODBias     = 0.0f;
>+    samplerDesc.MaxAnisotropy  = 0;
>     samplerDesc.ComparisonFunc = D3D11_COMPARISON_NEVER;
>     samplerDesc.BorderColor[0] = 0.0f;
>     samplerDesc.BorderColor[1] = 0.0f;
>     samplerDesc.BorderColor[2] = 0.0f;
>     samplerDesc.BorderColor[3] = 0.0f;
>-    samplerDesc.MinLOD = 0;
>-    samplerDesc.MaxLOD = D3D11_FLOAT32_MAX;
>+    samplerDesc.MinLOD         = 0;
>+    samplerDesc.MaxLOD         = D3D11_FLOAT32_MAX;
> 
>-    err = mRenderer->allocateResource(samplerDesc, &mPassThroughSampler);
>-    ASSERT(!err.isError());
>+    ANGLE_TRY(mRenderer->allocateResource(displayD3D, samplerDesc, &mPassThroughSampler));
>     mPassThroughSampler.setDebugName("Swap chain pass through sampler");
> 
>-    D3D11_INPUT_ELEMENT_DESC quadLayout[] =
>-    {
>-        { "POSITION", 0, DXGI_FORMAT_R32G32_FLOAT, 0, 0, D3D11_INPUT_PER_VERTEX_DATA, 0 },
>-        { "TEXCOORD", 0, DXGI_FORMAT_R32G32_FLOAT, 0, 8, D3D11_INPUT_PER_VERTEX_DATA, 0 },
>+    D3D11_INPUT_ELEMENT_DESC quadLayout[] = {
>+        {"POSITION", 0, DXGI_FORMAT_R32G32_FLOAT, 0, 0, D3D11_INPUT_PER_VERTEX_DATA, 0},
>+        {"TEXCOORD", 0, DXGI_FORMAT_R32G32_FLOAT, 0, 8, D3D11_INPUT_PER_VERTEX_DATA, 0},
>     };
> 
>     InputElementArray quadElements(quadLayout);
>     ShaderData vertexShaderData(g_VS_Passthrough2D);
> 
>-    err = mRenderer->allocateResource(quadElements, &vertexShaderData, &mPassThroughIL);
>-    ASSERT(!err.isError());
>+    ANGLE_TRY(
>+        mRenderer->allocateResource(displayD3D, quadElements, &vertexShaderData, &mPassThroughIL));
>     mPassThroughIL.setDebugName("Swap chain pass through layout");
> 
>-    err = mRenderer->allocateResource(vertexShaderData, &mPassThroughVS);
>-    ASSERT(!err.isError());
>+    ANGLE_TRY(mRenderer->allocateResource(displayD3D, vertexShaderData, &mPassThroughVS));
>     mPassThroughVS.setDebugName("Swap chain pass through vertex shader");
> 
>     if (mEGLSamples <= 1)
>     {
>         ShaderData pixelShaderData(g_PS_PassthroughRGBA2D);
>-        err = mRenderer->allocateResource(pixelShaderData, &mPassThroughPS);
>+        ANGLE_TRY(
>+            mRenderer->allocateResource(displayD3D, pixelShaderData, &mPassThroughOrResolvePS));
>     }
>     else
>     {
>-        ShaderData pixelShaderData(g_PS_PassthroughRGBA2DMS);
>-        err = mRenderer->allocateResource(pixelShaderData, &mPassThroughPS);
>+        if (mNativeWindow->getNativeWindow() && mNeedsOffscreenTexture)
>+        {
>+            ShaderData pixelShaderData(g_PS_ResolveColor2D);
>+            ANGLE_TRY(
>+                mRenderer->allocateResource(displayD3D, pixelShaderData, &mPassThroughOrResolvePS));
>+        }
>+        else
>+        {
>+            ShaderData pixelShaderData(g_PS_PassthroughRGBA2DMS);
>+            ANGLE_TRY(
>+                mRenderer->allocateResource(displayD3D, pixelShaderData, &mPassThroughOrResolvePS));
>+        }
>     }
> 
>-    ASSERT(!err.isError());
>-    mPassThroughPS.setDebugName("Swap chain pass through pixel shader");
>+    mPassThroughOrResolvePS.setDebugName("Swap chain pass through pixel shader");
> 
>     // Use the default rasterizer state but without culling
>     D3D11_RASTERIZER_DESC rasterizerDesc;
>@@ -735,15 +753,15 @@ void SwapChain11::initPassThroughResources()
>     rasterizerDesc.MultisampleEnable     = FALSE;
>     rasterizerDesc.AntialiasedLineEnable = FALSE;
> 
>-    err = mRenderer->allocateResource(rasterizerDesc, &mPassThroughRS);
>-    ASSERT(!err.isError());
>+    ANGLE_TRY(mRenderer->allocateResource(displayD3D, rasterizerDesc, &mPassThroughRS));
>     mPassThroughRS.setDebugName("Swap chain pass through rasterizer state");
> 
>     mPassThroughResourcesInit = true;
>+    return angle::Result::Continue;
> }
> 
> // parameters should be validated/clamped by caller
>-EGLint SwapChain11::swapRect(const gl::Context *context,
>+EGLint SwapChain11::swapRect(DisplayD3D *displayD3D,
>                              EGLint x,
>                              EGLint y,
>                              EGLint width,
>@@ -751,14 +769,14 @@ EGLint SwapChain11::swapRect(const gl::Context *context,
> {
>     if (mNeedsOffscreenTexture)
>     {
>-        EGLint result = copyOffscreenToBackbuffer(context, x, y, width, height);
>+        EGLint result = copyOffscreenToBackbuffer(displayD3D, x, y, width, height);
>         if (result != EGL_SUCCESS)
>         {
>             return result;
>         }
>     }
> 
>-    EGLint result = present(context, x, y, width, height);
>+    EGLint result = present(displayD3D, x, y, width, height);
>     if (result != EGL_SUCCESS)
>     {
>         return result;
>@@ -769,7 +787,7 @@ EGLint SwapChain11::swapRect(const gl::Context *context,
>     return EGL_SUCCESS;
> }
> 
>-EGLint SwapChain11::copyOffscreenToBackbuffer(const gl::Context *context,
>+EGLint SwapChain11::copyOffscreenToBackbuffer(DisplayD3D *displayD3D,
>                                               EGLint x,
>                                               EGLint y,
>                                               EGLint width,
>@@ -780,7 +798,10 @@ EGLint SwapChain11::copyOffscreenToBackbuffer(const gl::Context *context,
>         return EGL_SUCCESS;
>     }
> 
>-    initPassThroughResources();
>+    if (initPassThroughResources(displayD3D) == angle::Result::Stop)
>+    {
>+        return EGL_BAD_ALLOC;
>+    }
> 
>     ID3D11DeviceContext *deviceContext = mRenderer->getDeviceContext();
> 
>@@ -793,7 +814,8 @@ EGLint SwapChain11::copyOffscreenToBackbuffer(const gl::Context *context,
>         return EGL_BAD_ACCESS;
>     }
> 
>-    d3d11::PositionTexCoordVertex *vertices = static_cast<d3d11::PositionTexCoordVertex*>(mappedResource.pData);
>+    d3d11::PositionTexCoordVertex *vertices =
>+        static_cast<d3d11::PositionTexCoordVertex *>(mappedResource.pData);
> 
>     // Create a quad in homogeneous coordinates
>     float x1 = (x / float(mWidth)) * 2.0f - 1.0f;
>@@ -836,7 +858,7 @@ EGLint SwapChain11::copyOffscreenToBackbuffer(const gl::Context *context,
>     // Apply shaders
>     stateManager->setInputLayout(&mPassThroughIL);
>     stateManager->setPrimitiveTopology(D3D_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP);
>-    stateManager->setDrawShaders(&mPassThroughVS, nullptr, &mPassThroughPS);
>+    stateManager->setDrawShaders(&mPassThroughVS, nullptr, &mPassThroughOrResolvePS);
> 
>     // Apply render targets. Use the proxy context in display.
>     stateManager->setRenderTarget(mBackBufferRTView.get(), nullptr);
>@@ -853,11 +875,7 @@ EGLint SwapChain11::copyOffscreenToBackbuffer(const gl::Context *context,
>     return EGL_SUCCESS;
> }
> 
>-EGLint SwapChain11::present(const gl::Context *context,
>-                            EGLint x,
>-                            EGLint y,
>-                            EGLint width,
>-                            EGLint height)
>+EGLint SwapChain11::present(DisplayD3D *displayD3D, EGLint x, EGLint y, EGLint width, EGLint height)
> {
>     if (!mSwapChain)
>     {
>@@ -931,7 +949,7 @@ const d3d11::RenderTargetView &SwapChain11::getRenderTarget()
>     return mNeedsOffscreenTexture ? mOffscreenRTView : mBackBufferRTView;
> }
> 
>-const d3d11::SharedSRV &SwapChain11::getRenderTargetShaderResource()
>+const d3d11::SharedSRV &SwapChain11::getRenderTargetShaderResource(d3d::Context *context)
> {
>     if (!mNeedsOffscreenTexture)
>     {
>@@ -956,9 +974,9 @@ const d3d11::SharedSRV &SwapChain11::getRenderTargetShaderResource()
>         offscreenCopyDesc.BindFlags      = D3D11_BIND_SHADER_RESOURCE;
>         offscreenCopyDesc.MiscFlags      = 0;
>         offscreenCopyDesc.CPUAccessFlags = 0;
>-        gl::Error err = mRenderer->allocateTexture(offscreenCopyDesc, backbufferFormatInfo,
>-                                                   &mOffscreenTextureCopyForSRV);
>-        ASSERT(!err.isError());
>+        angle::Result result             = mRenderer->allocateTexture(
>+            context, offscreenCopyDesc, backbufferFormatInfo, &mOffscreenTextureCopyForSRV);
>+        ASSERT(result != angle::Result::Stop);
>         mOffscreenTextureCopyForSRV.setDebugName("Offscreen back buffer copy for SRV");
> 
>         D3D11_SHADER_RESOURCE_VIEW_DESC offscreenSRVDesc;
>@@ -968,9 +986,9 @@ const d3d11::SharedSRV &SwapChain11::getRenderTargetShaderResource()
>         offscreenSRVDesc.Texture2D.MostDetailedMip = 0;
>         offscreenSRVDesc.Texture2D.MipLevels       = static_cast<UINT>(-1);
> 
>-        err = mRenderer->allocateResource(offscreenSRVDesc, mOffscreenTextureCopyForSRV.get(),
>-                                          &mOffscreenSRView);
>-        ASSERT(!err.isError());
>+        result = mRenderer->allocateResource(context, offscreenSRVDesc,
>+                                             mOffscreenTextureCopyForSRV.get(), &mOffscreenSRView);
>+        ASSERT(result != angle::Result::Stop);
>         mOffscreenSRView.setDebugName("Offscreen back buffer shader resource");
>     }
> 
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/SwapChain11.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/SwapChain11.h
>index 5ce2af193dd..c39567c104d 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/SwapChain11.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/SwapChain11.h
>@@ -31,14 +31,12 @@ class SwapChain11 final : public SwapChainD3D
>                 EGLint samples);
>     ~SwapChain11() override;
> 
>-    EGLint resize(const gl::Context *context,
>-                  EGLint backbufferWidth,
>-                  EGLint backbufferHeight) override;
>-    EGLint reset(const gl::Context *context,
>+    EGLint resize(DisplayD3D *displayD3D, EGLint backbufferWidth, EGLint backbufferHeight) override;
>+    EGLint reset(DisplayD3D *displayD3D,
>                  EGLint backbufferWidth,
>                  EGLint backbufferHeight,
>                  EGLint swapInterval) override;
>-    EGLint swapRect(const gl::Context *context,
>+    EGLint swapRect(DisplayD3D *displayD3D,
>                     EGLint x,
>                     EGLint y,
>                     EGLint width,
>@@ -50,7 +48,7 @@ class SwapChain11 final : public SwapChainD3D
> 
>     const TextureHelper11 &getOffscreenTexture();
>     const d3d11::RenderTargetView &getRenderTarget();
>-    const d3d11::SharedSRV &getRenderTargetShaderResource();
>+    const d3d11::SharedSRV &getRenderTargetShaderResource(d3d::Context *context);
> 
>     const TextureHelper11 &getDepthStencilTexture();
>     const d3d11::DepthStencilView &getDepthStencil();
>@@ -65,26 +63,26 @@ class SwapChain11 final : public SwapChainD3D
> 
>   private:
>     void release();
>-    void initPassThroughResources();
>+    angle::Result initPassThroughResources(DisplayD3D *displayD3D);
> 
>     void releaseOffscreenColorBuffer();
>     void releaseOffscreenDepthBuffer();
>-    EGLint resetOffscreenBuffers(const gl::Context *context,
>-                                 int backbufferWidth,
>-                                 int backbufferHeight);
>-    EGLint resetOffscreenColorBuffer(const gl::Context *context,
>+    EGLint resetOffscreenBuffers(DisplayD3D *displayD3D, int backbufferWidth, int backbufferHeight);
>+    EGLint resetOffscreenColorBuffer(DisplayD3D *displayD3D,
>+                                     int backbufferWidth,
>+                                     int backbufferHeight);
>+    EGLint resetOffscreenDepthBuffer(DisplayD3D *displayD3D,
>                                      int backbufferWidth,
>                                      int backbufferHeight);
>-    EGLint resetOffscreenDepthBuffer(int backbufferWidth, int backbufferHeight);
> 
>     DXGI_FORMAT getSwapChainNativeFormat() const;
> 
>-    EGLint copyOffscreenToBackbuffer(const gl::Context *context,
>+    EGLint copyOffscreenToBackbuffer(DisplayD3D *displayD3D,
>                                      EGLint x,
>                                      EGLint y,
>                                      EGLint width,
>                                      EGLint height);
>-    EGLint present(const gl::Context *context, EGLint x, EGLint y, EGLint width, EGLint height);
>+    EGLint present(DisplayD3D *displayD3D, EGLint x, EGLint y, EGLint width, EGLint height);
>     UINT getD3DSamples() const;
> 
>     Renderer11 *mRenderer;
>@@ -121,7 +119,7 @@ class SwapChain11 final : public SwapChainD3D
>     d3d11::SamplerState mPassThroughSampler;
>     d3d11::InputLayout mPassThroughIL;
>     d3d11::VertexShader mPassThroughVS;
>-    d3d11::PixelShader mPassThroughPS;
>+    d3d11::PixelShader mPassThroughOrResolvePS;
>     d3d11::RasterizerState mPassThroughRS;
> 
>     SurfaceRenderTarget11 mColorRenderTarget;
>@@ -132,4 +130,4 @@ class SwapChain11 final : public SwapChainD3D
> };
> 
> }  // namespace rx
>-#endif // LIBANGLE_RENDERER_D3D_D3D11_SWAPCHAIN11_H_
>+#endif  // LIBANGLE_RENDERER_D3D_D3D11_SWAPCHAIN11_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/TextureStorage11.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/TextureStorage11.cpp
>index 8f76d16c30d..885ef726936 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/TextureStorage11.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/TextureStorage11.cpp
>@@ -14,65 +14,57 @@
> 
> #include "common/MemoryBuffer.h"
> #include "common/utilities.h"
>-#include "libANGLE/formatutils.h"
>+#include "libANGLE/Context.h"
> #include "libANGLE/ImageIndex.h"
>+#include "libANGLE/formatutils.h"
>+#include "libANGLE/renderer/d3d/EGLImageD3D.h"
>+#include "libANGLE/renderer/d3d/TextureD3D.h"
> #include "libANGLE/renderer/d3d/d3d11/Blit11.h"
>-#include "libANGLE/renderer/d3d/d3d11/formatutils11.h"
>+#include "libANGLE/renderer/d3d/d3d11/Context11.h"
> #include "libANGLE/renderer/d3d/d3d11/Image11.h"
>-#include "libANGLE/renderer/d3d/d3d11/Renderer11.h"
>-#include "libANGLE/renderer/d3d/d3d11/renderer11_utils.h"
> #include "libANGLE/renderer/d3d/d3d11/RenderTarget11.h"
>-#include "libANGLE/renderer/d3d/d3d11/StreamProducerNV12.h"
>+#include "libANGLE/renderer/d3d/d3d11/Renderer11.h"
>+#include "libANGLE/renderer/d3d/d3d11/StreamProducerD3DTexture.h"
> #include "libANGLE/renderer/d3d/d3d11/SwapChain11.h"
>+#include "libANGLE/renderer/d3d/d3d11/formatutils11.h"
>+#include "libANGLE/renderer/d3d/d3d11/renderer11_utils.h"
> #include "libANGLE/renderer/d3d/d3d11/texture_format_table.h"
>-#include "libANGLE/renderer/d3d/EGLImageD3D.h"
>-#include "libANGLE/renderer/d3d/TextureD3D.h"
> 
> namespace rx
> {
>+TextureStorage11::SamplerKey::SamplerKey()
>+    : baseLevel(0), mipLevels(0), swizzle(false), dropStencil(false)
>+{}
> 
>-namespace
>-{
>-
>-void InvalidateRenderTarget(const gl::Context *context, RenderTarget11 *renderTarget)
>-{
>-    if (renderTarget)
>-    {
>-        renderTarget->signalDirty(context);
>-    }
>-}
>-
>-RenderTarget11 *GetRenderTarget(std::unique_ptr<RenderTarget11> *pointer)
>-{
>-    return pointer->get();
>-}
>-
>-template <typename KeyT>
>-RenderTarget11 *GetRenderTarget(std::pair<KeyT, std::unique_ptr<RenderTarget11>> *pair)
>-{
>-    return pair->second.get();
>-}
>+TextureStorage11::SamplerKey::SamplerKey(int baseLevel,
>+                                         int mipLevels,
>+                                         bool swizzle,
>+                                         bool dropStencil)
>+    : baseLevel(baseLevel), mipLevels(mipLevels), swizzle(swizzle), dropStencil(dropStencil)
>+{}
> 
>-template <typename T>
>-void InvalidateRenderTargetContainer(const gl::Context *context, T *renderTargetContainer)
>+bool TextureStorage11::SamplerKey::operator<(const SamplerKey &rhs) const
> {
>-    for (auto &rt : *renderTargetContainer)
>-    {
>-        InvalidateRenderTarget(context, GetRenderTarget(&rt));
>-    }
>+    return std::tie(baseLevel, mipLevels, swizzle, dropStencil) <
>+           std::tie(rhs.baseLevel, rhs.mipLevels, rhs.swizzle, rhs.dropStencil);
> }
> 
>-}  // anonymous namespace
>+TextureStorage11::ImageKey::ImageKey()
>+    : level(0), layered(false), layer(0), access(GL_READ_ONLY), format(GL_R32UI)
>+{}
> 
>-TextureStorage11::SRVKey::SRVKey(int baseLevel, int mipLevels, bool swizzle, bool dropStencil)
>-    : baseLevel(baseLevel), mipLevels(mipLevels), swizzle(swizzle), dropStencil(dropStencil)
>-{
>-}
>+TextureStorage11::ImageKey::ImageKey(int level,
>+                                     bool layered,
>+                                     int layer,
>+                                     GLenum access,
>+                                     GLenum format)
>+    : level(level), layered(layered), layer(layer), access(access), format(format)
>+{}
> 
>-bool TextureStorage11::SRVKey::operator<(const SRVKey &rhs) const
>+bool TextureStorage11::ImageKey::operator<(const ImageKey &rhs) const
> {
>-    return std::tie(baseLevel, mipLevels, swizzle, dropStencil) <
>-           std::tie(rhs.baseLevel, rhs.mipLevels, rhs.swizzle, rhs.dropStencil);
>+    return std::tie(level, layered, layer, access, format) <
>+           std::tie(rhs.level, rhs.layered, rhs.layer, rhs.access, rhs.format);
> }
> 
> TextureStorage11::TextureStorage11(Renderer11 *renderer,
>@@ -89,12 +81,11 @@ TextureStorage11::TextureStorage11(Renderer11 *renderer,
>       mDropStencilTexture(),
>       mBindFlags(bindFlags),
>       mMiscFlags(miscFlags)
>-{
>-}
>+{}
> 
> TextureStorage11::~TextureStorage11()
> {
>-    mSrvCache.clear();
>+    mSrvCacheForSampler.clear();
> }
> 
> DWORD TextureStorage11::GetTextureBindFlags(GLenum internalFormat,
>@@ -108,6 +99,12 @@ DWORD TextureStorage11::GetTextureBindFlags(GLenum internalFormat,
>     {
>         bindFlags |= D3D11_BIND_SHADER_RESOURCE;
>     }
>+    if (formatInfo.uavFormat != DXGI_FORMAT_UNKNOWN &&
>+        renderer11DeviceCaps.featureLevel >= d3d11_gl::GetMinimumFeatureLevelForES31())
>+    {
>+        // If we find performance issues later on some specific GPUs, this may be the cause.
>+        bindFlags |= D3D11_BIND_UNORDERED_ACCESS;
>+    }
>     if (formatInfo.dsvFormat != DXGI_FORMAT_UNKNOWN)
>     {
>         bindFlags |= D3D11_BIND_DEPTH_STENCIL;
>@@ -191,29 +188,33 @@ int TextureStorage11::getLevelDepth(int mipLevel) const
>     return std::max(static_cast<int>(mTextureDepth) >> mipLevel, 1);
> }
> 
>-gl::Error TextureStorage11::getMippedResource(const gl::Context *context,
>-                                              const TextureHelper11 **outResource)
>+angle::Result TextureStorage11::getMippedResource(const gl::Context *context,
>+                                                  const TextureHelper11 **outResource)
> {
>     return getResource(context, outResource);
> }
> 
>-UINT TextureStorage11::getSubresourceIndex(const gl::ImageIndex &index) const
>+angle::Result TextureStorage11::getSubresourceIndex(const gl::Context *context,
>+                                                    const gl::ImageIndex &index,
>+                                                    UINT *outSubresourceIndex) const
> {
>-    UINT mipSlice    = static_cast<UINT>(index.mipIndex + mTopLevel);
>-    UINT arraySlice  = static_cast<UINT>(index.hasLayer() ? index.layerIndex : 0);
>+    UINT mipSlice    = static_cast<UINT>(index.getLevelIndex() + mTopLevel);
>+    UINT arraySlice  = static_cast<UINT>(index.hasLayer() ? index.getLayerIndex() : 0);
>     UINT subresource = D3D11CalcSubresource(mipSlice, arraySlice, mMipLevels);
>     ASSERT(subresource != std::numeric_limits<UINT>::max());
>-    return subresource;
>+    *outSubresourceIndex = subresource;
>+    return angle::Result::Continue;
> }
> 
>-gl::Error TextureStorage11::getSRV(const gl::Context *context,
>-                                   const gl::TextureState &textureState,
>-                                   const d3d11::SharedSRV **outSRV)
>+angle::Result TextureStorage11::getSRVForSampler(const gl::Context *context,
>+                                                 const gl::TextureState &textureState,
>+                                                 const gl::SamplerState &sampler,
>+                                                 const d3d11::SharedSRV **outSRV)
> {
>     // Make sure to add the level offset for our tiny compressed texture workaround
>     const GLuint effectiveBaseLevel = textureState.getEffectiveBaseLevel();
>-    bool swizzleRequired            = textureState.swizzleRequired();
>-    bool mipmapping                 = gl::IsMipmapFiltered(textureState.getSamplerState());
>+    const bool swizzleRequired      = textureState.swizzleRequired();
>+    const bool mipmapping           = gl::IsMipmapFiltered(sampler);
>     unsigned int mipLevels =
>         mipmapping ? (textureState.getEffectiveMaxLevel() - effectiveBaseLevel + 1) : 1;
> 
>@@ -240,56 +241,56 @@ gl::Error TextureStorage11::getSRV(const gl::Context *context,
> 
>     // We drop the stencil when sampling from the SRV if three conditions hold:
>     // 1. the drop stencil workaround is enabled.
>-    bool workaround = mRenderer->getWorkarounds().emulateTinyStencilTextures;
>+    const bool workaround = mRenderer->getWorkarounds().emulateTinyStencilTextures;
>     // 2. this is a stencil texture.
>-    bool hasStencil = (mFormatInfo.format().stencilBits > 0);
>+    const bool hasStencil = (mFormatInfo.format().stencilBits > 0);
>     // 3. the texture has a 1x1 or 2x2 mip.
>-    int effectiveTopLevel = effectiveBaseLevel + mipLevels - 1;
>-    bool hasSmallMips =
>+    const int effectiveTopLevel = effectiveBaseLevel + mipLevels - 1;
>+    const bool hasSmallMips =
>         (getLevelWidth(effectiveTopLevel) <= 2 || getLevelHeight(effectiveTopLevel) <= 2);
> 
>-    bool useDropStencil = (workaround && hasStencil && hasSmallMips);
>-    SRVKey key(effectiveBaseLevel, mipLevels, swizzleRequired, useDropStencil);
>+    const bool useDropStencil = (workaround && hasStencil && hasSmallMips);
>+    const SamplerKey key(effectiveBaseLevel, mipLevels, swizzleRequired, useDropStencil);
>     if (useDropStencil)
>     {
>         // Ensure drop texture gets created.
>         DropStencil result = DropStencil::CREATED;
>-        ANGLE_TRY_RESULT(ensureDropStencilTexture(context), result);
>+        ANGLE_TRY(ensureDropStencilTexture(context, &result));
> 
>         // Clear the SRV cache if necessary.
>         // TODO(jmadill): Re-use find query result.
>-        auto srvEntry = mSrvCache.find(key);
>-        if (result == DropStencil::CREATED && srvEntry != mSrvCache.end())
>+        const auto srvEntry = mSrvCacheForSampler.find(key);
>+        if (result == DropStencil::CREATED && srvEntry != mSrvCacheForSampler.end())
>         {
>-            mSrvCache.erase(key);
>+            mSrvCacheForSampler.erase(key);
>         }
>     }
> 
>-    ANGLE_TRY(getCachedOrCreateSRV(context, key, outSRV));
>+    ANGLE_TRY(getCachedOrCreateSRVForSampler(context, key, outSRV));
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error TextureStorage11::getCachedOrCreateSRV(const gl::Context *context,
>-                                                 const SRVKey &key,
>-                                                 const d3d11::SharedSRV **outSRV)
>+angle::Result TextureStorage11::getCachedOrCreateSRVForSampler(const gl::Context *context,
>+                                                               const SamplerKey &key,
>+                                                               const d3d11::SharedSRV **outSRV)
> {
>-    auto iter = mSrvCache.find(key);
>-    if (iter != mSrvCache.end())
>+    auto iter = mSrvCacheForSampler.find(key);
>+    if (iter != mSrvCacheForSampler.end())
>     {
>         *outSRV = &iter->second;
>-        return gl::NoError();
>+        return angle::Result::Continue;
>     }
> 
>     const TextureHelper11 *texture = nullptr;
>-    DXGI_FORMAT format      = DXGI_FORMAT_UNKNOWN;
>+    DXGI_FORMAT format             = DXGI_FORMAT_UNKNOWN;
> 
>     if (key.swizzle)
>     {
>         const auto &swizzleFormat =
>             mFormatInfo.getSwizzleFormat(mRenderer->getRenderer11DeviceCaps());
>         ASSERT(!key.dropStencil || swizzleFormat.format().stencilBits == 0);
>-        ANGLE_TRY(getSwizzleTexture(&texture));
>+        ANGLE_TRY(getSwizzleTexture(context, &texture));
>         format = swizzleFormat.srvFormat;
>     }
>     else if (key.dropStencil)
>@@ -306,18 +307,18 @@ gl::Error TextureStorage11::getCachedOrCreateSRV(const gl::Context *context,
> 
>     d3d11::SharedSRV srv;
> 
>-    ANGLE_TRY(createSRV(context, key.baseLevel, key.mipLevels, format, *texture, &srv));
>+    ANGLE_TRY(createSRVForSampler(context, key.baseLevel, key.mipLevels, format, *texture, &srv));
> 
>-    const auto &insertIt = mSrvCache.insert(std::make_pair(key, std::move(srv)));
>+    const auto &insertIt = mSrvCacheForSampler.insert(std::make_pair(key, std::move(srv)));
>     *outSRV              = &insertIt.first->second;
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error TextureStorage11::getSRVLevel(const gl::Context *context,
>-                                        int mipLevel,
>-                                        bool blitSRV,
>-                                        const d3d11::SharedSRV **outSRV)
>+angle::Result TextureStorage11::getSRVLevel(const gl::Context *context,
>+                                            int mipLevel,
>+                                            bool blitSRV,
>+                                            const d3d11::SharedSRV **outSRV)
> {
>     ASSERT(mipLevel >= 0 && mipLevel < getLevelCount());
> 
>@@ -338,20 +339,19 @@ gl::Error TextureStorage11::getSRVLevel(const gl::Context *context,
> 
>             DXGI_FORMAT resourceFormat =
>                 blitSRV ? mFormatInfo.blitSRVFormat : mFormatInfo.srvFormat;
>-            ANGLE_TRY(
>-                createSRV(context, mipLevel, 1, resourceFormat, *resource, &levelSRVs[mipLevel]));
>+            ANGLE_TRY(createSRVForSampler(context, mipLevel, 1, resourceFormat, *resource,
>+                                          &levelSRVs[mipLevel]));
>         }
>     }
> 
>     *outSRV = &levelSRVs[mipLevel];
>-
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error TextureStorage11::getSRVLevels(const gl::Context *context,
>-                                         GLint baseLevel,
>-                                         GLint maxLevel,
>-                                         const d3d11::SharedSRV **outSRV)
>+angle::Result TextureStorage11::getSRVLevels(const gl::Context *context,
>+                                             GLint baseLevel,
>+                                             GLint maxLevel,
>+                                             const d3d11::SharedSRV **outSRV)
> {
>     unsigned int mipLevels = maxLevel - baseLevel + 1;
> 
>@@ -372,10 +372,74 @@ gl::Error TextureStorage11::getSRVLevels(const gl::Context *context,
> 
>     // TODO(jmadill): Assert we don't need to drop stencil.
> 
>-    SRVKey key(baseLevel, mipLevels, false, false);
>-    ANGLE_TRY(getCachedOrCreateSRV(context, key, outSRV));
>+    SamplerKey key(baseLevel, mipLevels, false, false);
>+    ANGLE_TRY(getCachedOrCreateSRVForSampler(context, key, outSRV));
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
>+}
>+
>+angle::Result TextureStorage11::getSRVForImage(const gl::Context *context,
>+                                               const gl::ImageUnit &imageUnit,
>+                                               const d3d11::SharedSRV **outSRV)
>+{
>+    // TODO(Xinghua.cao@intel.com): Add solution to handle swizzle required.
>+    ImageKey key(imageUnit.level, imageUnit.layered, imageUnit.layer, imageUnit.access,
>+                 imageUnit.format);
>+    ANGLE_TRY(getCachedOrCreateSRVForImage(context, key, outSRV));
>+    return angle::Result::Continue;
>+}
>+
>+angle::Result TextureStorage11::getCachedOrCreateSRVForImage(const gl::Context *context,
>+                                                             const ImageKey &key,
>+                                                             const d3d11::SharedSRV **outSRV)
>+{
>+    auto iter = mSrvCacheForImage.find(key);
>+    if (iter != mSrvCacheForImage.end())
>+    {
>+        *outSRV = &iter->second;
>+        return angle::Result::Continue;
>+    }
>+    const TextureHelper11 *texture = nullptr;
>+    ANGLE_TRY(getResource(context, &texture));
>+    DXGI_FORMAT format =
>+        d3d11::Format::Get(key.format, mRenderer->getRenderer11DeviceCaps()).srvFormat;
>+    d3d11::SharedSRV srv;
>+    ANGLE_TRY(createSRVForImage(context, key.level, format, *texture, &srv));
>+    const auto &insertIt = mSrvCacheForImage.insert(std::make_pair(key, std::move(srv)));
>+    *outSRV              = &insertIt.first->second;
>+    return angle::Result::Continue;
>+}
>+
>+angle::Result TextureStorage11::getUAVForImage(const gl::Context *context,
>+                                               const gl::ImageUnit &imageUnit,
>+                                               const d3d11::SharedUAV **outUAV)
>+{
>+    // TODO(Xinghua.cao@intel.com): Add solution to handle swizzle required.
>+    ImageKey key(imageUnit.level, imageUnit.layered, imageUnit.layer, imageUnit.access,
>+                 imageUnit.format);
>+    ANGLE_TRY(getCachedOrCreateUAVForImage(context, key, outUAV));
>+    return angle::Result::Continue;
>+}
>+
>+angle::Result TextureStorage11::getCachedOrCreateUAVForImage(const gl::Context *context,
>+                                                             const ImageKey &key,
>+                                                             const d3d11::SharedUAV **outUAV)
>+{
>+    auto iter = mUavCacheForImage.find(key);
>+    if (iter != mUavCacheForImage.end())
>+    {
>+        *outUAV = &iter->second;
>+        return angle::Result::Continue;
>+    }
>+    const TextureHelper11 *texture = nullptr;
>+    ANGLE_TRY(getResource(context, &texture));
>+    DXGI_FORMAT format =
>+        d3d11::Format::Get(key.format, mRenderer->getRenderer11DeviceCaps()).uavFormat;
>+    d3d11::SharedUAV uav;
>+    ANGLE_TRY(createUAVForImage(context, key.level, format, *texture, &uav));
>+    const auto &insertIt = mUavCacheForImage.insert(std::make_pair(key, std::move(uav)));
>+    *outUAV              = &insertIt.first->second;
>+    return angle::Result::Continue;
> }
> 
> const d3d11::Format &TextureStorage11::getFormatSet() const
>@@ -383,8 +447,8 @@ const d3d11::Format &TextureStorage11::getFormatSet() const
>     return mFormatInfo;
> }
> 
>-gl::Error TextureStorage11::generateSwizzles(const gl::Context *context,
>-                                             const gl::SwizzleState &swizzleTarget)
>+angle::Result TextureStorage11::generateSwizzles(const gl::Context *context,
>+                                                 const gl::SwizzleState &swizzleTarget)
> {
>     for (int level = 0; level < getLevelCount(); level++)
>     {
>@@ -396,7 +460,7 @@ gl::Error TextureStorage11::generateSwizzles(const gl::Context *context,
>             ANGLE_TRY(getSRVLevel(context, level, true, &sourceSRV));
> 
>             const d3d11::RenderTargetView *destRTV;
>-            ANGLE_TRY(getSwizzleRenderTarget(level, &destRTV));
>+            ANGLE_TRY(getSwizzleRenderTarget(context, level, &destRTV));
> 
>             gl::Extents size(getLevelWidth(level), getLevelHeight(level), getLevelDepth(level));
> 
>@@ -408,7 +472,7 @@ gl::Error TextureStorage11::generateSwizzles(const gl::Context *context,
>         }
>     }
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
> void TextureStorage11::markLevelDirty(int mipLevel)
>@@ -439,15 +503,15 @@ void TextureStorage11::markDirty()
>     }
> }
> 
>-gl::Error TextureStorage11::updateSubresourceLevel(const gl::Context *context,
>-                                                   const TextureHelper11 &srcTexture,
>-                                                   unsigned int sourceSubresource,
>-                                                   const gl::ImageIndex &index,
>-                                                   const gl::Box &copyArea)
>+angle::Result TextureStorage11::updateSubresourceLevel(const gl::Context *context,
>+                                                       const TextureHelper11 &srcTexture,
>+                                                       unsigned int sourceSubresource,
>+                                                       const gl::ImageIndex &index,
>+                                                       const gl::Box &copyArea)
> {
>     ASSERT(srcTexture.valid());
> 
>-    const GLint level = index.mipIndex;
>+    const GLint level = index.getLevelIndex();
> 
>     markLevelDirty(level);
> 
>@@ -461,7 +525,7 @@ gl::Error TextureStorage11::updateSubresourceLevel(const gl::Context *context,
> 
>     // If the zero-LOD workaround is active and we want to update a level greater than zero, then we
>     // should update the mipmapped texture, even if mapmaps are currently disabled.
>-    if (index.mipIndex > 0 && mRenderer->getWorkarounds().zeroMaxLodWorkaround)
>+    if (level > 0 && mRenderer->getWorkarounds().zeroMaxLodWorkaround)
>     {
>         ANGLE_TRY(getMippedResource(context, &dstTexture));
>     }
>@@ -470,7 +534,8 @@ gl::Error TextureStorage11::updateSubresourceLevel(const gl::Context *context,
>         ANGLE_TRY(getResource(context, &dstTexture));
>     }
> 
>-    unsigned int dstSubresource = getSubresourceIndex(index);
>+    unsigned int dstSubresource = 0;
>+    ANGLE_TRY(getSubresourceIndex(context, index, &dstSubresource));
> 
>     ASSERT(dstTexture->valid());
> 
>@@ -479,8 +544,8 @@ gl::Error TextureStorage11::updateSubresourceLevel(const gl::Context *context,
>     if (!fullCopy && mFormatInfo.dsvFormat != DXGI_FORMAT_UNKNOWN)
>     {
>         // CopySubresourceRegion cannot copy partial depth stencils, use the blitter instead
>-        Blit11 *blitter        = mRenderer->getBlitter();
>-        return blitter->copyDepthStencil(srcTexture, sourceSubresource, copyArea, texSize,
>+        Blit11 *blitter = mRenderer->getBlitter();
>+        return blitter->copyDepthStencil(context, srcTexture, sourceSubresource, copyArea, texSize,
>                                          *dstTexture, dstSubresource, copyArea, texSize, nullptr);
>     }
> 
>@@ -499,14 +564,14 @@ gl::Error TextureStorage11::updateSubresourceLevel(const gl::Context *context,
>     deviceContext->CopySubresourceRegion(dstTexture->get(), dstSubresource, copyArea.x, copyArea.y,
>                                          copyArea.z, srcTexture.get(), sourceSubresource,
>                                          fullCopy ? nullptr : &srcBox);
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error TextureStorage11::copySubresourceLevel(const gl::Context *context,
>-                                                 const TextureHelper11 &dstTexture,
>-                                                 unsigned int dstSubresource,
>-                                                 const gl::ImageIndex &index,
>-                                                 const gl::Box &region)
>+angle::Result TextureStorage11::copySubresourceLevel(const gl::Context *context,
>+                                                     const TextureHelper11 &dstTexture,
>+                                                     unsigned int dstSubresource,
>+                                                     const gl::ImageIndex &index,
>+                                                     const gl::Box &region)
> {
>     ASSERT(dstTexture.valid());
> 
>@@ -514,7 +579,7 @@ gl::Error TextureStorage11::copySubresourceLevel(const gl::Context *context,
> 
>     // If the zero-LOD workaround is active and we want to update a level greater than zero, then we
>     // should update the mipmapped texture, even if mapmaps are currently disabled.
>-    if (index.mipIndex > 0 && mRenderer->getWorkarounds().zeroMaxLodWorkaround)
>+    if (index.getLevelIndex() > 0 && mRenderer->getWorkarounds().zeroMaxLodWorkaround)
>     {
>         ANGLE_TRY(getMippedResource(context, &srcTexture));
>     }
>@@ -525,7 +590,8 @@ gl::Error TextureStorage11::copySubresourceLevel(const gl::Context *context,
> 
>     ASSERT(srcTexture->valid());
> 
>-    unsigned int srcSubresource = getSubresourceIndex(index);
>+    unsigned int srcSubresource = 0;
>+    ANGLE_TRY(getSubresourceIndex(context, index, &srcSubresource));
> 
>     ID3D11DeviceContext *deviceContext = mRenderer->getDeviceContext();
> 
>@@ -559,16 +625,16 @@ gl::Error TextureStorage11::copySubresourceLevel(const gl::Context *context,
>     deviceContext->CopySubresourceRegion(dstTexture.get(), dstSubresource, region.x, region.y,
>                                          region.z, srcTexture->get(), srcSubresource, pSrcBox);
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error TextureStorage11::generateMipmap(const gl::Context *context,
>-                                           const gl::ImageIndex &sourceIndex,
>-                                           const gl::ImageIndex &destIndex)
>+angle::Result TextureStorage11::generateMipmap(const gl::Context *context,
>+                                               const gl::ImageIndex &sourceIndex,
>+                                               const gl::ImageIndex &destIndex)
> {
>-    ASSERT(sourceIndex.layerIndex == destIndex.layerIndex);
>+    ASSERT(sourceIndex.getLayerIndex() == destIndex.getLayerIndex());
> 
>-    markLevelDirty(destIndex.mipIndex);
>+    markLevelDirty(destIndex.getLevelIndex());
> 
>     RenderTargetD3D *source = nullptr;
>     ANGLE_TRY(getRenderTarget(context, sourceIndex, &source));
>@@ -577,7 +643,7 @@ gl::Error TextureStorage11::generateMipmap(const gl::Context *context,
>     ANGLE_TRY(getRenderTarget(context, destIndex, &dest));
> 
>     RenderTarget11 *rt11                   = GetAs<RenderTarget11>(source);
>-    const d3d11::SharedSRV &sourceSRV      = rt11->getBlitShaderResourceView();
>+    const d3d11::SharedSRV &sourceSRV      = rt11->getBlitShaderResourceView(context);
>     const d3d11::RenderTargetView &destRTV = rt11->getRenderTargetView();
> 
>     gl::Box sourceArea(0, 0, 0, source->getWidth(), source->getHeight(), source->getDepth());
>@@ -587,9 +653,12 @@ gl::Error TextureStorage11::generateMipmap(const gl::Context *context,
>     gl::Extents destSize(dest->getWidth(), dest->getHeight(), dest->getDepth());
> 
>     Blit11 *blitter = mRenderer->getBlitter();
>-    GLenum format   = gl::GetUnsizedFormat(source->getInternalFormat());
>+    const gl::InternalFormat &sourceInternalFormat =
>+        gl::GetSizedInternalFormatInfo(source->getInternalFormat());
>+    GLenum format = sourceInternalFormat.format;
>+    GLenum type   = sourceInternalFormat.type;
>     return blitter->copyTexture(context, sourceSRV, sourceArea, sourceSize, format, destRTV,
>-                                destArea, destSize, nullptr, format, GL_LINEAR, false, false,
>+                                destArea, destSize, nullptr, format, type, GL_LINEAR, false, false,
>                                 false);
> }
> 
>@@ -604,7 +673,7 @@ void TextureStorage11::verifySwizzleExists(const gl::SwizzleState &swizzleState)
> void TextureStorage11::clearSRVCache()
> {
>     markDirty();
>-    mSrvCache.clear();
>+    mSrvCacheForSampler.clear();
> 
>     for (size_t level = 0; level < mLevelSRVs.size(); level++)
>     {
>@@ -613,14 +682,15 @@ void TextureStorage11::clearSRVCache()
>     }
> }
> 
>-gl::Error TextureStorage11::copyToStorage(const gl::Context *context, TextureStorage *destStorage)
>+angle::Result TextureStorage11::copyToStorage(const gl::Context *context,
>+                                              TextureStorage *destStorage)
> {
>     ASSERT(destStorage);
> 
>     const TextureHelper11 *sourceResouce = nullptr;
>     ANGLE_TRY(getResource(context, &sourceResouce));
> 
>-    TextureStorage11 *dest11     = GetAs<TextureStorage11>(destStorage);
>+    TextureStorage11 *dest11            = GetAs<TextureStorage11>(destStorage);
>     const TextureHelper11 *destResource = nullptr;
>     ANGLE_TRY(dest11->getResource(context, &destResource));
> 
>@@ -629,32 +699,38 @@ gl::Error TextureStorage11::copyToStorage(const gl::Context *context, TextureSto
> 
>     dest11->markDirty();
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
>+}
>+
>+void TextureStorage11::invalidateTextures()
>+{
>+    mRenderer->getStateManager()->invalidateTexturesAndSamplers();
> }
> 
>-gl::Error TextureStorage11::setData(const gl::Context *context,
>-                                    const gl::ImageIndex &index,
>-                                    ImageD3D *image,
>-                                    const gl::Box *destBox,
>-                                    GLenum type,
>-                                    const gl::PixelUnpackState &unpack,
>-                                    const uint8_t *pixelData)
>+angle::Result TextureStorage11::setData(const gl::Context *context,
>+                                        const gl::ImageIndex &index,
>+                                        ImageD3D *image,
>+                                        const gl::Box *destBox,
>+                                        GLenum type,
>+                                        const gl::PixelUnpackState &unpack,
>+                                        const uint8_t *pixelData)
> {
>     ASSERT(!image->isDirty());
> 
>-    markLevelDirty(index.mipIndex);
>+    markLevelDirty(index.getLevelIndex());
> 
>     const TextureHelper11 *resource = nullptr;
>     ANGLE_TRY(getResource(context, &resource));
>     ASSERT(resource && resource->valid());
> 
>-    UINT destSubresource = getSubresourceIndex(index);
>+    UINT destSubresource = 0;
>+    ANGLE_TRY(getSubresourceIndex(context, index, &destSubresource));
> 
>     const gl::InternalFormat &internalFormatInfo =
>         gl::GetInternalFormatInfo(image->getInternalFormat(), type);
> 
>-    gl::Box levelBox(0, 0, 0, getLevelWidth(index.mipIndex), getLevelHeight(index.mipIndex),
>-                     getLevelDepth(index.mipIndex));
>+    gl::Box levelBox(0, 0, 0, getLevelWidth(index.getLevelIndex()),
>+                     getLevelHeight(index.getLevelIndex()), getLevelDepth(index.getLevelIndex()));
>     bool fullUpdate = (destBox == nullptr || *destBox == levelBox);
>     ASSERT(internalFormatInfo.depthBits == 0 || fullUpdate);
> 
>@@ -664,20 +740,22 @@ gl::Error TextureStorage11::setData(const gl::Context *context,
>     // with compressed formats in the calling logic.
>     ASSERT(!internalFormatInfo.compressed);
> 
>+    Context11 *context11 = GetImplAs<Context11>(context);
>+
>     const int width    = destBox ? destBox->width : static_cast<int>(image->getWidth());
>     const int height   = destBox ? destBox->height : static_cast<int>(image->getHeight());
>     const int depth    = destBox ? destBox->depth : static_cast<int>(image->getDepth());
>     GLuint srcRowPitch = 0;
>-    ANGLE_TRY_RESULT(
>-        internalFormatInfo.computeRowPitch(type, width, unpack.alignment, unpack.rowLength),
>-        srcRowPitch);
>+    ANGLE_CHECK_GL_MATH(context11,
>+                        internalFormatInfo.computeRowPitch(type, width, unpack.alignment,
>+                                                           unpack.rowLength, &srcRowPitch));
>     GLuint srcDepthPitch = 0;
>-    ANGLE_TRY_RESULT(internalFormatInfo.computeDepthPitch(height, unpack.imageHeight, srcRowPitch),
>-                     srcDepthPitch);
>+    ANGLE_CHECK_GL_MATH(context11, internalFormatInfo.computeDepthPitch(
>+                                       height, unpack.imageHeight, srcRowPitch, &srcDepthPitch));
>     GLuint srcSkipBytes = 0;
>-    ANGLE_TRY_RESULT(
>-        internalFormatInfo.computeSkipBytes(srcRowPitch, srcDepthPitch, unpack, index.is3D()),
>-        srcSkipBytes);
>+    ANGLE_CHECK_GL_MATH(
>+        context11, internalFormatInfo.computeSkipBytes(type, srcRowPitch, srcDepthPitch, unpack,
>+                                                       index.usesTex3D(), &srcSkipBytes));
> 
>     const d3d11::Format &d3d11Format =
>         d3d11::Format::Get(image->getInternalFormat(), mRenderer->getRenderer11DeviceCaps());
>@@ -689,14 +767,14 @@ gl::Error TextureStorage11::setData(const gl::Context *context,
>     UINT bufferRowPitch   = static_cast<unsigned int>(outputPixelSize) * width;
>     UINT bufferDepthPitch = bufferRowPitch * height;
> 
>-    const size_t neededSize        = bufferDepthPitch * depth;
>+    const size_t neededSize               = bufferDepthPitch * depth;
>     angle::MemoryBuffer *conversionBuffer = nullptr;
>-    const uint8_t *data            = nullptr;
>+    const uint8_t *data                   = nullptr;
> 
>     LoadImageFunctionInfo loadFunctionInfo = d3d11Format.getLoadFunctions()(type);
>     if (loadFunctionInfo.requiresConversion)
>     {
>-        ANGLE_TRY(mRenderer->getScratchMemoryBuffer(neededSize, &conversionBuffer));
>+        ANGLE_TRY(mRenderer->getScratchMemoryBuffer(context11, neededSize, &conversionBuffer));
>         loadFunctionInfo.loadFunction(width, height, depth, pixelData + srcSkipBytes, srcRowPitch,
>                                       srcDepthPitch, conversionBuffer->data(), bufferRowPitch,
>                                       bufferDepthPitch);
>@@ -732,14 +810,41 @@ gl::Error TextureStorage11::setData(const gl::Context *context,
>                                             bufferRowPitch, bufferDepthPitch);
>     }
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::ErrorOrResult<TextureStorage11::DropStencil> TextureStorage11::ensureDropStencilTexture(
>-    const gl::Context *context)
>+angle::Result TextureStorage11::ensureDropStencilTexture(
>+    const gl::Context *context,
>+    TextureStorage11::DropStencil *dropStencilOut)
> {
>-    UNIMPLEMENTED();
>-    return gl::InternalError() << "Drop stencil texture not implemented.";
>+    ANGLE_HR_UNREACHABLE(GetImplAs<Context11>(context));
>+    return angle::Result::Stop;
>+}
>+
>+angle::Result TextureStorage11::initDropStencilTexture(const gl::Context *context,
>+                                                       const gl::ImageIndexIterator &it)
>+{
>+    const TextureHelper11 *sourceTexture = nullptr;
>+    ANGLE_TRY(getResource(context, &sourceTexture));
>+
>+    gl::ImageIndexIterator itCopy = it;
>+
>+    while (itCopy.hasNext())
>+    {
>+        gl::ImageIndex index = itCopy.next();
>+        gl::Box wholeArea(0, 0, 0, getLevelWidth(index.getLevelIndex()),
>+                          getLevelHeight(index.getLevelIndex()), 1);
>+        gl::Extents wholeSize(wholeArea.width, wholeArea.height, 1);
>+
>+        UINT subresource = 0;
>+        ANGLE_TRY(getSubresourceIndex(context, index, &subresource));
>+
>+        ANGLE_TRY(mRenderer->getBlitter()->copyDepthStencil(
>+            context, *sourceTexture, subresource, wholeArea, wholeSize, mDropStencilTexture,
>+            subresource, wholeArea, wholeSize, nullptr));
>+    }
>+
>+    return angle::Result::Continue;
> }
> 
> TextureStorage11_2D::TextureStorage11_2D(Renderer11 *renderer, SwapChain11 *swapchain)
>@@ -755,8 +860,8 @@ TextureStorage11_2D::TextureStorage11_2D(Renderer11 *renderer, SwapChain11 *swap
> {
>     for (unsigned int i = 0; i < gl::IMPLEMENTATION_MAX_TEXTURE_LEVELS; i++)
>     {
>-        mAssociatedImages[i]     = nullptr;
>-        mRenderTarget[i]         = nullptr;
>+        mAssociatedImages[i] = nullptr;
>+        mRenderTarget[i]     = nullptr;
>     }
> 
>     D3D11_TEXTURE2D_DESC texDesc;
>@@ -792,8 +897,8 @@ TextureStorage11_2D::TextureStorage11_2D(Renderer11 *renderer,
> {
>     for (unsigned int i = 0; i < gl::IMPLEMENTATION_MAX_TEXTURE_LEVELS; i++)
>     {
>-        mAssociatedImages[i]     = nullptr;
>-        mRenderTarget[i]         = nullptr;
>+        mAssociatedImages[i] = nullptr;
>+        mRenderTarget[i]     = nullptr;
>     }
> 
>     d3d11::MakeValidSize(false, mFormatInfo.texFormat, &width, &height, &mTopLevel);
>@@ -806,7 +911,7 @@ TextureStorage11_2D::TextureStorage11_2D(Renderer11 *renderer,
>     ASSERT(!mUseLevelZeroTexture || mRenderer->getWorkarounds().zeroMaxLodWorkaround);
> }
> 
>-gl::Error TextureStorage11_2D::onDestroy(const gl::Context *context)
>+angle::Result TextureStorage11_2D::onDestroy(const gl::Context *context)
> {
>     for (unsigned i = 0; i < gl::IMPLEMENTATION_MAX_TEXTURE_LEVELS; i++)
>     {
>@@ -827,19 +932,13 @@ gl::Error TextureStorage11_2D::onDestroy(const gl::Context *context)
>         mRenderer->getStateManager()->invalidateBoundViews();
>     }
> 
>-    // Invalidate RenderTargets.
>-    InvalidateRenderTargetContainer(context, &mRenderTarget);
>-    InvalidateRenderTarget(context, mLevelZeroRenderTarget.get());
>-
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-TextureStorage11_2D::~TextureStorage11_2D()
>-{
>-}
>+TextureStorage11_2D::~TextureStorage11_2D() {}
> 
>-gl::Error TextureStorage11_2D::copyToStorage(const gl::Context *context,
>-                                             TextureStorage *destStorage)
>+angle::Result TextureStorage11_2D::copyToStorage(const gl::Context *context,
>+                                                 TextureStorage *destStorage)
> {
>     ASSERT(destStorage);
> 
>@@ -870,7 +969,7 @@ gl::Error TextureStorage11_2D::copyToStorage(const gl::Context *context,
>             immediateContext->CopyResource(destResource->get(), mLevelZeroTexture.get());
>         }
> 
>-        return gl::NoError();
>+        return angle::Result::Continue;
>     }
> 
>     const TextureHelper11 *sourceResouce = nullptr;
>@@ -882,19 +981,17 @@ gl::Error TextureStorage11_2D::copyToStorage(const gl::Context *context,
>     immediateContext->CopyResource(destResource->get(), sourceResouce->get());
>     dest11->markDirty();
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error TextureStorage11_2D::useLevelZeroWorkaroundTexture(const gl::Context *context,
>-                                                             bool useLevelZeroTexture)
>+angle::Result TextureStorage11_2D::useLevelZeroWorkaroundTexture(const gl::Context *context,
>+                                                                 bool useLevelZeroTexture)
> {
>-    bool lastSetting = mUseLevelZeroTexture;
>-
>     if (useLevelZeroTexture && mMipLevels > 1)
>     {
>         if (!mUseLevelZeroTexture && mTexture.valid())
>         {
>-            ANGLE_TRY(ensureTextureExists(1));
>+            ANGLE_TRY(ensureTextureExists(context, 1));
> 
>             // Pull data back from the mipped texture if necessary.
>             ASSERT(mLevelZeroTexture.valid());
>@@ -909,7 +1006,7 @@ gl::Error TextureStorage11_2D::useLevelZeroWorkaroundTexture(const gl::Context *
>     {
>         if (mUseLevelZeroTexture && mLevelZeroTexture.valid())
>         {
>-            ANGLE_TRY(ensureTextureExists(mMipLevels));
>+            ANGLE_TRY(ensureTextureExists(context, mMipLevels));
> 
>             // Pull data back from the level zero texture if necessary.
>             ASSERT(mTexture.valid());
>@@ -921,31 +1018,14 @@ gl::Error TextureStorage11_2D::useLevelZeroWorkaroundTexture(const gl::Context *
>         mUseLevelZeroTexture = false;
>     }
> 
>-    if (lastSetting != mUseLevelZeroTexture)
>-    {
>-        // Mark everything as dirty to be conservative.
>-        if (mLevelZeroRenderTarget)
>-        {
>-            mLevelZeroRenderTarget->signalDirty(context);
>-        }
>-        for (auto &renderTarget : mRenderTarget)
>-        {
>-            if (renderTarget)
>-            {
>-                renderTarget->signalDirty(context);
>-            }
>-        }
>-    }
>-
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
> void TextureStorage11_2D::associateImage(Image11 *image, const gl::ImageIndex &index)
> {
>-    const GLint level = index.mipIndex;
>+    const GLint level = index.getLevelIndex();
> 
>     ASSERT(0 <= level && level < gl::IMPLEMENTATION_MAX_TEXTURE_LEVELS);
>-
>     if (0 <= level && level < gl::IMPLEMENTATION_MAX_TEXTURE_LEVELS)
>     {
>         mAssociatedImages[level] = image;
>@@ -955,7 +1035,7 @@ void TextureStorage11_2D::associateImage(Image11 *image, const gl::ImageIndex &i
> void TextureStorage11_2D::verifyAssociatedImageValid(const gl::ImageIndex &index,
>                                                      Image11 *expectedImage)
> {
>-    const GLint level = index.mipIndex;
>+    const GLint level = index.getLevelIndex();
> 
>     ASSERT(0 <= level && level < gl::IMPLEMENTATION_MAX_TEXTURE_LEVELS);
>     // This validation check should never return false. It means the Image/TextureStorage
>@@ -966,7 +1046,7 @@ void TextureStorage11_2D::verifyAssociatedImageValid(const gl::ImageIndex &index
> // disassociateImage allows an Image to end its association with a Storage.
> void TextureStorage11_2D::disassociateImage(const gl::ImageIndex &index, Image11 *expectedImage)
> {
>-    const GLint level = index.mipIndex;
>+    const GLint level = index.getLevelIndex();
> 
>     ASSERT(0 <= level && level < gl::IMPLEMENTATION_MAX_TEXTURE_LEVELS);
>     ASSERT(mAssociatedImages[level] == expectedImage);
>@@ -975,11 +1055,11 @@ void TextureStorage11_2D::disassociateImage(const gl::ImageIndex &index, Image11
> 
> // releaseAssociatedImage prepares the Storage for a new Image association. It lets the old Image
> // recover its data before ending the association.
>-gl::Error TextureStorage11_2D::releaseAssociatedImage(const gl::Context *context,
>-                                                      const gl::ImageIndex &index,
>-                                                      Image11 *incomingImage)
>+angle::Result TextureStorage11_2D::releaseAssociatedImage(const gl::Context *context,
>+                                                          const gl::ImageIndex &index,
>+                                                          Image11 *incomingImage)
> {
>-    const GLint level = index.mipIndex;
>+    const GLint level = index.getLevelIndex();
> 
>     ASSERT(0 <= level && level < gl::IMPLEMENTATION_MAX_TEXTURE_LEVELS);
> 
>@@ -997,39 +1077,39 @@ gl::Error TextureStorage11_2D::releaseAssociatedImage(const gl::Context *context
>         }
>     }
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error TextureStorage11_2D::getResource(const gl::Context *context,
>-                                           const TextureHelper11 **outResource)
>+angle::Result TextureStorage11_2D::getResource(const gl::Context *context,
>+                                               const TextureHelper11 **outResource)
> {
>     if (mUseLevelZeroTexture && mMipLevels > 1)
>     {
>-        ANGLE_TRY(ensureTextureExists(1));
>+        ANGLE_TRY(ensureTextureExists(context, 1));
> 
>         *outResource = &mLevelZeroTexture;
>-        return gl::NoError();
>+        return angle::Result::Continue;
>     }
> 
>-    ANGLE_TRY(ensureTextureExists(mMipLevels));
>+    ANGLE_TRY(ensureTextureExists(context, mMipLevels));
> 
>     *outResource = &mTexture;
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error TextureStorage11_2D::getMippedResource(const gl::Context *context,
>-                                                 const TextureHelper11 **outResource)
>+angle::Result TextureStorage11_2D::getMippedResource(const gl::Context *context,
>+                                                     const TextureHelper11 **outResource)
> {
>     // This shouldn't be called unless the zero max LOD workaround is active.
>     ASSERT(mRenderer->getWorkarounds().zeroMaxLodWorkaround);
> 
>-    ANGLE_TRY(ensureTextureExists(mMipLevels));
>+    ANGLE_TRY(ensureTextureExists(context, mMipLevels));
> 
>     *outResource = &mTexture;
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error TextureStorage11_2D::ensureTextureExists(int mipLevels)
>+angle::Result TextureStorage11_2D::ensureTextureExists(const gl::Context *context, int mipLevels)
> {
>     // If mMipLevels = 1 then always use mTexture rather than mLevelZeroTexture.
>     bool useLevelZeroTexture = mRenderer->getWorkarounds().zeroMaxLodWorkaround
>@@ -1056,20 +1136,29 @@ gl::Error TextureStorage11_2D::ensureTextureExists(int mipLevels)
>         desc.CPUAccessFlags     = 0;
>         desc.MiscFlags          = getMiscFlags();
> 
>-        ANGLE_TRY(mRenderer->allocateTexture(desc, mFormatInfo, outputTexture));
>-        outputTexture->setDebugName("TexStorage2D.Texture");
>+        ANGLE_TRY(mRenderer->allocateTexture(GetImplAs<Context11>(context), desc, mFormatInfo,
>+                                             outputTexture));
>+
>+        if (useLevelZeroTexture)
>+        {
>+            outputTexture->setDebugName("TexStorage2D.Level0Texture");
>+        }
>+        else
>+        {
>+            outputTexture->setDebugName("TexStorage2D.Texture");
>+        }
>     }
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error TextureStorage11_2D::getRenderTarget(const gl::Context *context,
>-                                               const gl::ImageIndex &index,
>-                                               RenderTargetD3D **outRT)
>+angle::Result TextureStorage11_2D::getRenderTarget(const gl::Context *context,
>+                                                   const gl::ImageIndex &index,
>+                                                   RenderTargetD3D **outRT)
> {
>     ASSERT(!index.hasLayer());
> 
>-    const int level = index.mipIndex;
>+    const int level = index.getLevelIndex();
>     ASSERT(level >= 0 && level < getLevelCount());
> 
>     // In GL ES 2.0, the application can only render to level zero of the texture (Section 4.4.3 of
>@@ -1085,12 +1174,12 @@ gl::Error TextureStorage11_2D::getRenderTarget(const gl::Context *context,
>     if (mRenderTarget[level])
>     {
>         *outRT = mRenderTarget[level].get();
>-        return gl::NoError();
>+        return angle::Result::Continue;
>     }
> 
>     if (mRenderer->getWorkarounds().zeroMaxLodWorkaround)
>     {
>-        ASSERT(index.mipIndex == 0);
>+        ASSERT(level == 0);
>         ANGLE_TRY(useLevelZeroWorkaroundTexture(context, true));
>     }
> 
>@@ -1103,6 +1192,8 @@ gl::Error TextureStorage11_2D::getRenderTarget(const gl::Context *context,
>     const d3d11::SharedSRV *blitSRV = nullptr;
>     ANGLE_TRY(getSRVLevel(context, level, true, &blitSRV));
> 
>+    Context11 *context11 = GetImplAs<Context11>(context);
>+
>     if (mUseLevelZeroTexture)
>     {
>         if (!mLevelZeroRenderTarget)
>@@ -1113,7 +1204,9 @@ gl::Error TextureStorage11_2D::getRenderTarget(const gl::Context *context,
>             rtvDesc.Texture2D.MipSlice = mTopLevel + level;
> 
>             d3d11::RenderTargetView rtv;
>-            ANGLE_TRY(mRenderer->allocateResource(rtvDesc, mLevelZeroTexture.get(), &rtv));
>+            ANGLE_TRY(
>+                mRenderer->allocateResource(context11, rtvDesc, mLevelZeroTexture.get(), &rtv));
>+            rtv.setDebugName("TexStorage2D.Level0RTV");
> 
>             mLevelZeroRenderTarget.reset(new TextureRenderTarget11(
>                 std::move(rtv), mLevelZeroTexture, d3d11::SharedSRV(), d3d11::SharedSRV(),
>@@ -1122,7 +1215,7 @@ gl::Error TextureStorage11_2D::getRenderTarget(const gl::Context *context,
>         }
> 
>         *outRT = mLevelZeroRenderTarget.get();
>-        return gl::NoError();
>+        return angle::Result::Continue;
>     }
> 
>     if (mFormatInfo.rtvFormat != DXGI_FORMAT_UNKNOWN)
>@@ -1133,14 +1226,15 @@ gl::Error TextureStorage11_2D::getRenderTarget(const gl::Context *context,
>         rtvDesc.Texture2D.MipSlice = mTopLevel + level;
> 
>         d3d11::RenderTargetView rtv;
>-        ANGLE_TRY(mRenderer->allocateResource(rtvDesc, texture->get(), &rtv));
>+        ANGLE_TRY(mRenderer->allocateResource(context11, rtvDesc, texture->get(), &rtv));
>+        rtv.setDebugName("TexStorage2D.RTV");
> 
>         mRenderTarget[level].reset(new TextureRenderTarget11(
>             std::move(rtv), *texture, *srv, *blitSRV, mFormatInfo.internalFormat, getFormatSet(),
>             getLevelWidth(level), getLevelHeight(level), 1, 0));
> 
>         *outRT = mRenderTarget[level].get();
>-        return gl::NoError();
>+        return angle::Result::Continue;
>     }
> 
>     ASSERT(mFormatInfo.dsvFormat != DXGI_FORMAT_UNKNOWN);
>@@ -1152,22 +1246,23 @@ gl::Error TextureStorage11_2D::getRenderTarget(const gl::Context *context,
>     dsvDesc.Flags              = 0;
> 
>     d3d11::DepthStencilView dsv;
>-    ANGLE_TRY(mRenderer->allocateResource(dsvDesc, texture->get(), &dsv));
>+    ANGLE_TRY(mRenderer->allocateResource(context11, dsvDesc, texture->get(), &dsv));
>+    dsv.setDebugName("TexStorage2D.DSV");
> 
>     mRenderTarget[level].reset(new TextureRenderTarget11(
>         std::move(dsv), *texture, *srv, mFormatInfo.internalFormat, getFormatSet(),
>         getLevelWidth(level), getLevelHeight(level), 1, 0));
> 
>     *outRT = mRenderTarget[level].get();
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error TextureStorage11_2D::createSRV(const gl::Context *context,
>-                                         int baseLevel,
>-                                         int mipLevels,
>-                                         DXGI_FORMAT format,
>-                                         const TextureHelper11 &texture,
>-                                         d3d11::SharedSRV *outSRV)
>+angle::Result TextureStorage11_2D::createSRVForSampler(const gl::Context *context,
>+                                                       int baseLevel,
>+                                                       int mipLevels,
>+                                                       DXGI_FORMAT format,
>+                                                       const TextureHelper11 &texture,
>+                                                       d3d11::SharedSRV *outSRV)
> {
>     ASSERT(outSRV);
> 
>@@ -1189,7 +1284,7 @@ gl::Error TextureStorage11_2D::createSRV(const gl::Context *context,
>         if (mipLevels == 1 && mMipLevels > 1)
>         {
>             // We must use a SRV on the level-zero-only texture.
>-            ANGLE_TRY(ensureTextureExists(1));
>+            ANGLE_TRY(ensureTextureExists(context, 1));
>             srvTexture = &mLevelZeroTexture;
>         }
>         else
>@@ -1200,13 +1295,50 @@ gl::Error TextureStorage11_2D::createSRV(const gl::Context *context,
>         }
>     }
> 
>-    ANGLE_TRY(mRenderer->allocateResource(srvDesc, srvTexture->get(), outSRV));
>+    ANGLE_TRY(mRenderer->allocateResource(GetImplAs<Context11>(context), srvDesc, srvTexture->get(),
>+                                          outSRV));
>     outSRV->setDebugName("TexStorage2D.SRV");
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error TextureStorage11_2D::getSwizzleTexture(const TextureHelper11 **outTexture)
>+angle::Result TextureStorage11_2D::createSRVForImage(const gl::Context *context,
>+                                                     int level,
>+                                                     DXGI_FORMAT format,
>+                                                     const TextureHelper11 &texture,
>+                                                     d3d11::SharedSRV *outSRV)
>+{
>+    ASSERT(outSRV);
>+    D3D11_SHADER_RESOURCE_VIEW_DESC srvDesc;
>+    srvDesc.Format                    = format;
>+    srvDesc.ViewDimension             = D3D11_SRV_DIMENSION_TEXTURE2D;
>+    srvDesc.Texture2D.MostDetailedMip = mTopLevel + level;
>+    srvDesc.Texture2D.MipLevels       = 1;
>+    ANGLE_TRY(
>+        mRenderer->allocateResource(GetImplAs<Context11>(context), srvDesc, texture.get(), outSRV));
>+    outSRV->setDebugName("TexStorage2D.SRVForImage");
>+    return angle::Result::Continue;
>+}
>+
>+angle::Result TextureStorage11_2D::createUAVForImage(const gl::Context *context,
>+                                                     int level,
>+                                                     DXGI_FORMAT format,
>+                                                     const TextureHelper11 &texture,
>+                                                     d3d11::SharedUAV *outUAV)
>+{
>+    ASSERT(outUAV);
>+    D3D11_UNORDERED_ACCESS_VIEW_DESC uavDesc;
>+    uavDesc.Format             = format;
>+    uavDesc.ViewDimension      = D3D11_UAV_DIMENSION_TEXTURE2D;
>+    uavDesc.Texture2D.MipSlice = mTopLevel + level;
>+    ANGLE_TRY(
>+        mRenderer->allocateResource(GetImplAs<Context11>(context), uavDesc, texture.get(), outUAV));
>+    outUAV->setDebugName("TexStorage2D.UAVForImage");
>+    return angle::Result::Continue;
>+}
>+
>+angle::Result TextureStorage11_2D::getSwizzleTexture(const gl::Context *context,
>+                                                     const TextureHelper11 **outTexture)
> {
>     ASSERT(outTexture);
> 
>@@ -1227,16 +1359,18 @@ gl::Error TextureStorage11_2D::getSwizzleTexture(const TextureHelper11 **outText
>         desc.CPUAccessFlags     = 0;
>         desc.MiscFlags          = 0;
> 
>-        ANGLE_TRY(mRenderer->allocateTexture(desc, format, &mSwizzleTexture));
>+        ANGLE_TRY(mRenderer->allocateTexture(GetImplAs<Context11>(context), desc, format,
>+                                             &mSwizzleTexture));
>         mSwizzleTexture.setDebugName("TexStorage2D.SwizzleTexture");
>     }
> 
>     *outTexture = &mSwizzleTexture;
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error TextureStorage11_2D::getSwizzleRenderTarget(int mipLevel,
>-                                                      const d3d11::RenderTargetView **outRTV)
>+angle::Result TextureStorage11_2D::getSwizzleRenderTarget(const gl::Context *context,
>+                                                          int mipLevel,
>+                                                          const d3d11::RenderTargetView **outRTV)
> {
>     ASSERT(mipLevel >= 0 && mipLevel < getLevelCount());
>     ASSERT(outRTV);
>@@ -1244,7 +1378,7 @@ gl::Error TextureStorage11_2D::getSwizzleRenderTarget(int mipLevel,
>     if (!mSwizzleRenderTargets[mipLevel].valid())
>     {
>         const TextureHelper11 *swizzleTexture = nullptr;
>-        ANGLE_TRY(getSwizzleTexture(&swizzleTexture));
>+        ANGLE_TRY(getSwizzleTexture(context, &swizzleTexture));
> 
>         D3D11_RENDER_TARGET_VIEW_DESC rtvDesc;
>         rtvDesc.Format =
>@@ -1252,20 +1386,22 @@ gl::Error TextureStorage11_2D::getSwizzleRenderTarget(int mipLevel,
>         rtvDesc.ViewDimension      = D3D11_RTV_DIMENSION_TEXTURE2D;
>         rtvDesc.Texture2D.MipSlice = mTopLevel + mipLevel;
> 
>-        ANGLE_TRY(mRenderer->allocateResource(rtvDesc, mSwizzleTexture.get(),
>+        ANGLE_TRY(mRenderer->allocateResource(GetImplAs<Context11>(context), rtvDesc,
>+                                              mSwizzleTexture.get(),
>                                               &mSwizzleRenderTargets[mipLevel]));
>     }
> 
>     *outRTV = &mSwizzleRenderTargets[mipLevel];
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::ErrorOrResult<TextureStorage11::DropStencil> TextureStorage11_2D::ensureDropStencilTexture(
>-    const gl::Context *context)
>+angle::Result TextureStorage11_2D::ensureDropStencilTexture(const gl::Context *context,
>+                                                            DropStencil *dropStencilOut)
> {
>     if (mDropStencilTexture.valid())
>     {
>-        return DropStencil::ALREADY_EXISTS;
>+        *dropStencilOut = DropStencil::ALREADY_EXISTS;
>+        return angle::Result::Continue;
>     }
> 
>     D3D11_TEXTURE2D_DESC dropDesc = {};
>@@ -1283,12 +1419,14 @@ gl::ErrorOrResult<TextureStorage11::DropStencil> TextureStorage11_2D::ensureDrop
> 
>     const auto &format =
>         d3d11::Format::Get(GL_DEPTH_COMPONENT32F, mRenderer->getRenderer11DeviceCaps());
>-    ANGLE_TRY(mRenderer->allocateTexture(dropDesc, format, &mDropStencilTexture));
>+    ANGLE_TRY(mRenderer->allocateTexture(GetImplAs<Context11>(context), dropDesc, format,
>+                                         &mDropStencilTexture));
>     mDropStencilTexture.setDebugName("TexStorage2D.DropStencil");
> 
>     ANGLE_TRY(initDropStencilTexture(context, gl::ImageIndexIterator::Make2D(0, mMipLevels)));
> 
>-    return DropStencil::CREATED;
>+    *dropStencilOut = DropStencil::CREATED;
>+    return angle::Result::Continue;
> }
> 
> TextureStorage11_External::TextureStorage11_External(
>@@ -1297,10 +1435,10 @@ TextureStorage11_External::TextureStorage11_External(
>     const egl::Stream::GLTextureDescription &glDesc)
>     : TextureStorage11(renderer, D3D11_BIND_SHADER_RESOURCE, 0, glDesc.internalFormat)
> {
>-    ASSERT(stream->getProducerType() == egl::Stream::ProducerType::D3D11TextureNV12);
>-    StreamProducerNV12 *producer = static_cast<StreamProducerNV12 *>(stream->getImplementation());
>+    ASSERT(stream->getProducerType() == egl::Stream::ProducerType::D3D11Texture);
>+    auto *producer = static_cast<StreamProducerD3DTexture *>(stream->getImplementation());
>     mTexture.set(producer->getD3DTexture(), mFormatInfo);
>-    mSubresourceIndex            = producer->getArraySlice();
>+    mSubresourceIndex = producer->getArraySlice();
>     mTexture.get()->AddRef();
>     mMipLevels = 1;
> 
>@@ -1312,7 +1450,7 @@ TextureStorage11_External::TextureStorage11_External(
>     mHasKeyedMutex = (desc.MiscFlags & D3D11_RESOURCE_MISC_SHARED_KEYEDMUTEX) != 0;
> }
> 
>-gl::Error TextureStorage11_External::onDestroy(const gl::Context *context)
>+angle::Result TextureStorage11_External::onDestroy(const gl::Context *context)
> {
>     if (mHasKeyedMutex)
>     {
>@@ -1321,45 +1459,43 @@ gl::Error TextureStorage11_External::onDestroy(const gl::Context *context)
>         mRenderer->getStateManager()->invalidateBoundViews();
>     }
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-TextureStorage11_External::~TextureStorage11_External()
>-{
>-}
>+TextureStorage11_External::~TextureStorage11_External() {}
> 
>-gl::Error TextureStorage11_External::copyToStorage(const gl::Context *context,
>-                                                   TextureStorage *destStorage)
>+angle::Result TextureStorage11_External::copyToStorage(const gl::Context *context,
>+                                                       TextureStorage *destStorage)
> {
>     UNIMPLEMENTED();
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
> void TextureStorage11_External::associateImage(Image11 *image, const gl::ImageIndex &index)
> {
>-    ASSERT(index.mipIndex == 0);
>+    ASSERT(index.getLevelIndex() == 0);
>     mAssociatedImage = image;
> }
> 
> void TextureStorage11_External::verifyAssociatedImageValid(const gl::ImageIndex &index,
>                                                            Image11 *expectedImage)
> {
>-    ASSERT(index.mipIndex == 0 && mAssociatedImage == expectedImage);
>+    ASSERT(index.getLevelIndex() == 0 && mAssociatedImage == expectedImage);
> }
> 
> void TextureStorage11_External::disassociateImage(const gl::ImageIndex &index,
>                                                   Image11 *expectedImage)
> {
>-    ASSERT(index.mipIndex == 0);
>+    ASSERT(index.getLevelIndex() == 0);
>     ASSERT(mAssociatedImage == expectedImage);
>     mAssociatedImage = nullptr;
> }
> 
>-gl::Error TextureStorage11_External::releaseAssociatedImage(const gl::Context *context,
>-                                                            const gl::ImageIndex &index,
>-                                                            Image11 *incomingImage)
>+angle::Result TextureStorage11_External::releaseAssociatedImage(const gl::Context *context,
>+                                                                const gl::ImageIndex &index,
>+                                                                Image11 *incomingImage)
> {
>-    ASSERT(index.mipIndex == 0);
>+    ASSERT(index.getLevelIndex() == 0);
> 
>     if (mAssociatedImage != nullptr && mAssociatedImage != incomingImage)
>     {
>@@ -1368,38 +1504,38 @@ gl::Error TextureStorage11_External::releaseAssociatedImage(const gl::Context *c
>         ANGLE_TRY(mAssociatedImage->recoverFromAssociatedStorage(context));
>     }
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error TextureStorage11_External::getResource(const gl::Context *context,
>-                                                 const TextureHelper11 **outResource)
>+angle::Result TextureStorage11_External::getResource(const gl::Context *context,
>+                                                     const TextureHelper11 **outResource)
> {
>     *outResource = &mTexture;
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error TextureStorage11_External::getMippedResource(const gl::Context *context,
>-                                                       const TextureHelper11 **outResource)
>+angle::Result TextureStorage11_External::getMippedResource(const gl::Context *context,
>+                                                           const TextureHelper11 **outResource)
> {
>     *outResource = &mTexture;
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error TextureStorage11_External::getRenderTarget(const gl::Context *context,
>-                                                     const gl::ImageIndex &index,
>-                                                     RenderTargetD3D **outRT)
>+angle::Result TextureStorage11_External::getRenderTarget(const gl::Context *context,
>+                                                         const gl::ImageIndex &index,
>+                                                         RenderTargetD3D **outRT)
> {
>     // Render targets are not supported for external textures
>-    UNREACHABLE();
>-    return gl::InternalError();
>+    ANGLE_HR_UNREACHABLE(GetImplAs<Context11>(context));
>+    return angle::Result::Stop;
> }
> 
>-gl::Error TextureStorage11_External::createSRV(const gl::Context *context,
>-                                               int baseLevel,
>-                                               int mipLevels,
>-                                               DXGI_FORMAT format,
>-                                               const TextureHelper11 &texture,
>-                                               d3d11::SharedSRV *outSRV)
>+angle::Result TextureStorage11_External::createSRVForSampler(const gl::Context *context,
>+                                                             int baseLevel,
>+                                                             int mipLevels,
>+                                                             DXGI_FORMAT format,
>+                                                             const TextureHelper11 &texture,
>+                                                             d3d11::SharedSRV *outSRV)
> {
>     // Since external textures are treates as non-mipmapped textures, we ignore mipmap levels and
>     // use the specified subresource ID the storage was created with.
>@@ -1415,32 +1551,96 @@ gl::Error TextureStorage11_External::createSRV(const gl::Context *context,
>     srvDesc.Texture2DArray.FirstArraySlice = mSubresourceIndex;
>     srvDesc.Texture2DArray.ArraySize       = 1;
> 
>-    ANGLE_TRY(mRenderer->allocateResource(srvDesc, texture.get(), outSRV));
>+    ANGLE_TRY(
>+        mRenderer->allocateResource(GetImplAs<Context11>(context), srvDesc, texture.get(), outSRV));
>     outSRV->setDebugName("TexStorage2D.SRV");
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error TextureStorage11_External::getSwizzleTexture(const TextureHelper11 **outTexture)
>+angle::Result TextureStorage11_External::createSRVForImage(const gl::Context *context,
>+                                                           int level,
>+                                                           DXGI_FORMAT format,
>+                                                           const TextureHelper11 &texture,
>+                                                           d3d11::SharedSRV *outSRV)
> {
>-    UNIMPLEMENTED();
>-    return gl::InternalError();
>+    ANGLE_HR_UNREACHABLE(GetImplAs<Context11>(context));
>+    return angle::Result::Stop;
> }
> 
>-gl::Error TextureStorage11_External::getSwizzleRenderTarget(int mipLevel,
>-                                                            const d3d11::RenderTargetView **outRTV)
>+angle::Result TextureStorage11_External::createUAVForImage(const gl::Context *context,
>+                                                           int level,
>+                                                           DXGI_FORMAT format,
>+                                                           const TextureHelper11 &texture,
>+                                                           d3d11::SharedUAV *outUAV)
> {
>-    UNIMPLEMENTED();
>-    return gl::InternalError();
>+    ANGLE_HR_UNREACHABLE(GetImplAs<Context11>(context));
>+    return angle::Result::Stop;
>+}
>+
>+angle::Result TextureStorage11_External::getSwizzleTexture(const gl::Context *context,
>+                                                           const TextureHelper11 **outTexture)
>+{
>+    ANGLE_HR_UNREACHABLE(GetImplAs<Context11>(context));
>+    return angle::Result::Stop;
>+}
>+
>+angle::Result TextureStorage11_External::getSwizzleRenderTarget(
>+    const gl::Context *context,
>+    int mipLevel,
>+    const d3d11::RenderTargetView **outRTV)
>+{
>+    ANGLE_HR_UNREACHABLE(GetImplAs<Context11>(context));
>+    return angle::Result::Stop;
>+}
>+
>+TextureStorage11ImmutableBase::TextureStorage11ImmutableBase(Renderer11 *renderer,
>+                                                             UINT bindFlags,
>+                                                             UINT miscFlags,
>+                                                             GLenum internalFormat)
>+    : TextureStorage11(renderer, bindFlags, miscFlags, internalFormat)
>+{}
>+
>+void TextureStorage11ImmutableBase::associateImage(Image11 *, const gl::ImageIndex &) {}
>+
>+void TextureStorage11ImmutableBase::disassociateImage(const gl::ImageIndex &, Image11 *) {}
>+
>+void TextureStorage11ImmutableBase::verifyAssociatedImageValid(const gl::ImageIndex &, Image11 *) {}
>+
>+angle::Result TextureStorage11ImmutableBase::releaseAssociatedImage(const gl::Context *context,
>+                                                                    const gl::ImageIndex &,
>+                                                                    Image11 *)
>+{
>+    return angle::Result::Continue;
>+}
>+
>+angle::Result TextureStorage11ImmutableBase::createSRVForImage(const gl::Context *context,
>+                                                               int level,
>+                                                               DXGI_FORMAT format,
>+                                                               const TextureHelper11 &texture,
>+                                                               d3d11::SharedSRV *outSRV)
>+{
>+    ANGLE_HR_UNREACHABLE(GetImplAs<Context11>(context));
>+    return angle::Result::Stop;
>+}
>+
>+angle::Result TextureStorage11ImmutableBase::createUAVForImage(const gl::Context *context,
>+                                                               int level,
>+                                                               DXGI_FORMAT format,
>+                                                               const TextureHelper11 &texture,
>+                                                               d3d11::SharedUAV *outUAV)
>+{
>+    ANGLE_HR_UNREACHABLE(GetImplAs<Context11>(context));
>+    return angle::Result::Stop;
> }
> 
> TextureStorage11_EGLImage::TextureStorage11_EGLImage(Renderer11 *renderer,
>                                                      EGLImageD3D *eglImage,
>                                                      RenderTarget11 *renderTarget11)
>-    : TextureStorage11(renderer,
>-                       D3D11_BIND_RENDER_TARGET | D3D11_BIND_SHADER_RESOURCE,
>-                       0,
>-                       renderTarget11->getInternalFormat()),
>+    : TextureStorage11ImmutableBase(renderer,
>+                                    D3D11_BIND_RENDER_TARGET | D3D11_BIND_SHADER_RESOURCE,
>+                                    0,
>+                                    renderTarget11->getInternalFormat()),
>       mImage(eglImage),
>       mCurrentRenderTarget(0),
>       mSwizzleTexture(),
>@@ -1454,58 +1654,70 @@ TextureStorage11_EGLImage::TextureStorage11_EGLImage(Renderer11 *renderer,
>     mTextureDepth  = 1;
> }
> 
>-TextureStorage11_EGLImage::~TextureStorage11_EGLImage()
>+TextureStorage11_EGLImage::~TextureStorage11_EGLImage() {}
>+
>+angle::Result TextureStorage11_EGLImage::getSubresourceIndex(const gl::Context *context,
>+                                                             const gl::ImageIndex &index,
>+                                                             UINT *outSubresourceIndex) const
> {
>+    ASSERT(index.getType() == gl::TextureType::_2D);
>+    ASSERT(index.getLevelIndex() == 0);
>+
>+    RenderTarget11 *renderTarget11 = nullptr;
>+    ANGLE_TRY(getImageRenderTarget(context, &renderTarget11));
>+    *outSubresourceIndex = renderTarget11->getSubresourceIndex();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error TextureStorage11_EGLImage::getResource(const gl::Context *context,
>-                                                 const TextureHelper11 **outResource)
>+angle::Result TextureStorage11_EGLImage::getResource(const gl::Context *context,
>+                                                     const TextureHelper11 **outResource)
> {
>     ANGLE_TRY(checkForUpdatedRenderTarget(context));
> 
>     RenderTarget11 *renderTarget11 = nullptr;
>     ANGLE_TRY(getImageRenderTarget(context, &renderTarget11));
>     *outResource = &renderTarget11->getTexture();
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error TextureStorage11_EGLImage::getSRV(const gl::Context *context,
>-                                            const gl::TextureState &textureState,
>-                                            const d3d11::SharedSRV **outSRV)
>+angle::Result TextureStorage11_EGLImage::getSRVForSampler(const gl::Context *context,
>+                                                          const gl::TextureState &textureState,
>+                                                          const gl::SamplerState &sampler,
>+                                                          const d3d11::SharedSRV **outSRV)
> {
>     ANGLE_TRY(checkForUpdatedRenderTarget(context));
>-    return TextureStorage11::getSRV(context, textureState, outSRV);
>+    return TextureStorage11::getSRVForSampler(context, textureState, sampler, outSRV);
> }
> 
>-gl::Error TextureStorage11_EGLImage::getMippedResource(const gl::Context *context,
>-                                                       const TextureHelper11 **)
>+angle::Result TextureStorage11_EGLImage::getMippedResource(const gl::Context *context,
>+                                                           const TextureHelper11 **)
> {
>     // This shouldn't be called unless the zero max LOD workaround is active.
>     // EGL images are unavailable in this configuration.
>-    UNREACHABLE();
>-    return gl::InternalError();
>+    ANGLE_HR_UNREACHABLE(GetImplAs<Context11>(context));
>+    return angle::Result::Stop;
> }
> 
>-gl::Error TextureStorage11_EGLImage::getRenderTarget(const gl::Context *context,
>-                                                     const gl::ImageIndex &index,
>-                                                     RenderTargetD3D **outRT)
>+angle::Result TextureStorage11_EGLImage::getRenderTarget(const gl::Context *context,
>+                                                         const gl::ImageIndex &index,
>+                                                         RenderTargetD3D **outRT)
> {
>     ASSERT(!index.hasLayer());
>-    ASSERT(index.mipIndex == 0);
>+    ASSERT(index.getLevelIndex() == 0);
> 
>     ANGLE_TRY(checkForUpdatedRenderTarget(context));
> 
>     return mImage->getRenderTarget(context, outRT);
> }
> 
>-gl::Error TextureStorage11_EGLImage::copyToStorage(const gl::Context *context,
>-                                                   TextureStorage *destStorage)
>+angle::Result TextureStorage11_EGLImage::copyToStorage(const gl::Context *context,
>+                                                       TextureStorage *destStorage)
> {
>     const TextureHelper11 *sourceResouce = nullptr;
>     ANGLE_TRY(getResource(context, &sourceResouce));
> 
>     ASSERT(destStorage);
>-    TextureStorage11_2D *dest11  = GetAs<TextureStorage11_2D>(destStorage);
>+    TextureStorage11_2D *dest11         = GetAs<TextureStorage11_2D>(destStorage);
>     const TextureHelper11 *destResource = nullptr;
>     ANGLE_TRY(dest11->getResource(context, &destResource));
> 
>@@ -1514,35 +1726,18 @@ gl::Error TextureStorage11_EGLImage::copyToStorage(const gl::Context *context,
> 
>     dest11->markDirty();
> 
>-    return gl::NoError();
>-}
>-
>-void TextureStorage11_EGLImage::associateImage(Image11 *, const gl::ImageIndex &)
>-{
>-}
>-
>-void TextureStorage11_EGLImage::disassociateImage(const gl::ImageIndex &, Image11 *)
>-{
>-}
>-
>-void TextureStorage11_EGLImage::verifyAssociatedImageValid(const gl::ImageIndex &, Image11 *)
>-{
>+    return angle::Result::Continue;
> }
> 
>-gl::Error TextureStorage11_EGLImage::releaseAssociatedImage(const gl::Context *context,
>-                                                            const gl::ImageIndex &,
>-                                                            Image11 *)
>+angle::Result TextureStorage11_EGLImage::useLevelZeroWorkaroundTexture(const gl::Context *context,
>+                                                                       bool)
> {
>-    return gl::NoError();
>-}
>-
>-gl::Error TextureStorage11_EGLImage::useLevelZeroWorkaroundTexture(const gl::Context *context, bool)
>-{
>-    UNREACHABLE();
>-    return gl::InternalError();
>+    ANGLE_HR_UNREACHABLE(GetImplAs<Context11>(context));
>+    return angle::Result::Stop;
> }
> 
>-gl::Error TextureStorage11_EGLImage::getSwizzleTexture(const TextureHelper11 **outTexture)
>+angle::Result TextureStorage11_EGLImage::getSwizzleTexture(const gl::Context *context,
>+                                                           const TextureHelper11 **outTexture)
> {
>     ASSERT(outTexture);
> 
>@@ -1563,16 +1758,19 @@ gl::Error TextureStorage11_EGLImage::getSwizzleTexture(const TextureHelper11 **o
>         desc.CPUAccessFlags     = 0;
>         desc.MiscFlags          = 0;
> 
>-        ANGLE_TRY(mRenderer->allocateTexture(desc, format, &mSwizzleTexture));
>+        ANGLE_TRY(mRenderer->allocateTexture(GetImplAs<Context11>(context), desc, format,
>+                                             &mSwizzleTexture));
>         mSwizzleTexture.setDebugName("TexStorageEGLImage.SwizzleTexture");
>     }
> 
>     *outTexture = &mSwizzleTexture;
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error TextureStorage11_EGLImage::getSwizzleRenderTarget(int mipLevel,
>-                                                            const d3d11::RenderTargetView **outRTV)
>+angle::Result TextureStorage11_EGLImage::getSwizzleRenderTarget(
>+    const gl::Context *context,
>+    int mipLevel,
>+    const d3d11::RenderTargetView **outRTV)
> {
>     ASSERT(mipLevel >= 0 && mipLevel < getLevelCount());
>     ASSERT(outRTV);
>@@ -1580,7 +1778,7 @@ gl::Error TextureStorage11_EGLImage::getSwizzleRenderTarget(int mipLevel,
>     if (!mSwizzleRenderTargets[mipLevel].valid())
>     {
>         const TextureHelper11 *swizzleTexture = nullptr;
>-        ANGLE_TRY(getSwizzleTexture(&swizzleTexture));
>+        ANGLE_TRY(getSwizzleTexture(context, &swizzleTexture));
> 
>         D3D11_RENDER_TARGET_VIEW_DESC rtvDesc;
>         rtvDesc.Format =
>@@ -1588,15 +1786,16 @@ gl::Error TextureStorage11_EGLImage::getSwizzleRenderTarget(int mipLevel,
>         rtvDesc.ViewDimension      = D3D11_RTV_DIMENSION_TEXTURE2D;
>         rtvDesc.Texture2D.MipSlice = mTopLevel + mipLevel;
> 
>-        ANGLE_TRY(mRenderer->allocateResource(rtvDesc, mSwizzleTexture.get(),
>+        ANGLE_TRY(mRenderer->allocateResource(GetImplAs<Context11>(context), rtvDesc,
>+                                              mSwizzleTexture.get(),
>                                               &mSwizzleRenderTargets[mipLevel]));
>     }
> 
>     *outRTV = &mSwizzleRenderTargets[mipLevel];
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error TextureStorage11_EGLImage::checkForUpdatedRenderTarget(const gl::Context *context)
>+angle::Result TextureStorage11_EGLImage::checkForUpdatedRenderTarget(const gl::Context *context)
> {
>     RenderTarget11 *renderTarget11 = nullptr;
>     ANGLE_TRY(getImageRenderTarget(context, &renderTarget11));
>@@ -1607,15 +1806,15 @@ gl::Error TextureStorage11_EGLImage::checkForUpdatedRenderTarget(const gl::Conte
>         mCurrentRenderTarget = reinterpret_cast<uintptr_t>(renderTarget11);
>     }
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error TextureStorage11_EGLImage::createSRV(const gl::Context *context,
>-                                               int baseLevel,
>-                                               int mipLevels,
>-                                               DXGI_FORMAT format,
>-                                               const TextureHelper11 &texture,
>-                                               d3d11::SharedSRV *outSRV)
>+angle::Result TextureStorage11_EGLImage::createSRVForSampler(const gl::Context *context,
>+                                                             int baseLevel,
>+                                                             int mipLevels,
>+                                                             DXGI_FORMAT format,
>+                                                             const TextureHelper11 &texture,
>+                                                             d3d11::SharedSRV *outSRV)
> {
>     ASSERT(baseLevel == 0);
>     ASSERT(mipLevels == 1);
>@@ -1631,7 +1830,8 @@ gl::Error TextureStorage11_EGLImage::createSRV(const gl::Context *context,
>         srvDesc.Texture2D.MostDetailedMip = mTopLevel + baseLevel;
>         srvDesc.Texture2D.MipLevels       = mipLevels;
> 
>-        ANGLE_TRY(mRenderer->allocateResource(srvDesc, texture.get(), outSRV));
>+        ANGLE_TRY(mRenderer->allocateResource(GetImplAs<Context11>(context), srvDesc, texture.get(),
>+                                              outSRV));
>         outSRV->setDebugName("TexStorageEGLImage.SRV");
>     }
>     else
>@@ -1641,19 +1841,19 @@ gl::Error TextureStorage11_EGLImage::createSRV(const gl::Context *context,
> 
>         ASSERT(texture == renderTarget->getTexture());
> 
>-        *outSRV = renderTarget->getShaderResourceView().makeCopy();
>+        *outSRV = renderTarget->getShaderResourceView(context).makeCopy();
>     }
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error TextureStorage11_EGLImage::getImageRenderTarget(const gl::Context *context,
>-                                                          RenderTarget11 **outRT) const
>+angle::Result TextureStorage11_EGLImage::getImageRenderTarget(const gl::Context *context,
>+                                                              RenderTarget11 **outRT) const
> {
>     RenderTargetD3D *renderTargetD3D = nullptr;
>     ANGLE_TRY(mImage->getRenderTarget(context, &renderTargetD3D));
>     *outRT = GetAs<RenderTarget11>(renderTargetD3D);
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
> TextureStorage11_Cube::TextureStorage11_Cube(Renderer11 *renderer,
>@@ -1677,14 +1877,14 @@ TextureStorage11_Cube::TextureStorage11_Cube(Renderer11 *renderer,
> {
>     for (unsigned int level = 0; level < gl::IMPLEMENTATION_MAX_TEXTURE_LEVELS; level++)
>     {
>-        for (unsigned int face = 0; face < gl::CUBE_FACE_COUNT; face++)
>+        for (unsigned int face = 0; face < gl::kCubeFaceCount; face++)
>         {
>             mAssociatedImages[face][level] = nullptr;
>             mRenderTarget[face][level]     = nullptr;
>         }
>     }
> 
>-    for (unsigned int face = 0; face < gl::CUBE_FACE_COUNT; face++)
>+    for (unsigned int face = 0; face < gl::kCubeFaceCount; face++)
>     {
>         mLevelZeroRenderTarget[face] = nullptr;
>     }
>@@ -1702,11 +1902,11 @@ TextureStorage11_Cube::TextureStorage11_Cube(Renderer11 *renderer,
>     ASSERT(!mUseLevelZeroTexture || mRenderer->getWorkarounds().zeroMaxLodWorkaround);
> }
> 
>-gl::Error TextureStorage11_Cube::onDestroy(const gl::Context *context)
>+angle::Result TextureStorage11_Cube::onDestroy(const gl::Context *context)
> {
>     for (unsigned int level = 0; level < gl::IMPLEMENTATION_MAX_TEXTURE_LEVELS; level++)
>     {
>-        for (unsigned int face = 0; face < gl::CUBE_FACE_COUNT; face++)
>+        for (unsigned int face = 0; face < gl::kCubeFaceCount; face++)
>         {
>             if (mAssociatedImages[face][level] != nullptr)
>             {
>@@ -1719,41 +1919,35 @@ gl::Error TextureStorage11_Cube::onDestroy(const gl::Context *context)
>         }
>     }
> 
>-    for (auto &faceRenderTargets : mRenderTarget)
>-    {
>-        InvalidateRenderTargetContainer(context, &faceRenderTargets);
>-    }
>-    InvalidateRenderTargetContainer(context, &mLevelZeroRenderTarget);
>-
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-TextureStorage11_Cube::~TextureStorage11_Cube()
>-{
>-}
>+TextureStorage11_Cube::~TextureStorage11_Cube() {}
> 
>-UINT TextureStorage11_Cube::getSubresourceIndex(const gl::ImageIndex &index) const
>+angle::Result TextureStorage11_Cube::getSubresourceIndex(const gl::Context *context,
>+                                                         const gl::ImageIndex &index,
>+                                                         UINT *outSubresourceIndex) const
> {
>+    UINT arraySlice = index.cubeMapFaceIndex();
>     if (mRenderer->getWorkarounds().zeroMaxLodWorkaround && mUseLevelZeroTexture &&
>-        index.mipIndex == 0)
>+        index.getLevelIndex() == 0)
>     {
>-        UINT arraySlice  = static_cast<UINT>(index.hasLayer() ? index.layerIndex : 0);
>         UINT subresource = D3D11CalcSubresource(0, arraySlice, 1);
>         ASSERT(subresource != std::numeric_limits<UINT>::max());
>-        return subresource;
>+        *outSubresourceIndex = subresource;
>     }
>     else
>     {
>-        UINT mipSlice    = static_cast<UINT>(index.mipIndex + mTopLevel);
>-        UINT arraySlice  = static_cast<UINT>(index.hasLayer() ? index.layerIndex : 0);
>+        UINT mipSlice    = static_cast<UINT>(index.getLevelIndex() + mTopLevel);
>         UINT subresource = D3D11CalcSubresource(mipSlice, arraySlice, mMipLevels);
>         ASSERT(subresource != std::numeric_limits<UINT>::max());
>-        return subresource;
>+        *outSubresourceIndex = subresource;
>     }
>+    return angle::Result::Continue;
> }
> 
>-gl::Error TextureStorage11_Cube::copyToStorage(const gl::Context *context,
>-                                               TextureStorage *destStorage)
>+angle::Result TextureStorage11_Cube::copyToStorage(const gl::Context *context,
>+                                                   TextureStorage *destStorage)
> {
>     ASSERT(destStorage);
> 
>@@ -1799,17 +1993,17 @@ gl::Error TextureStorage11_Cube::copyToStorage(const gl::Context *context,
> 
>     dest11->markDirty();
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error TextureStorage11_Cube::useLevelZeroWorkaroundTexture(const gl::Context *context,
>-                                                               bool useLevelZeroTexture)
>+angle::Result TextureStorage11_Cube::useLevelZeroWorkaroundTexture(const gl::Context *context,
>+                                                                   bool useLevelZeroTexture)
> {
>     if (useLevelZeroTexture && mMipLevels > 1)
>     {
>         if (!mUseLevelZeroTexture && mTexture.valid())
>         {
>-            ANGLE_TRY(ensureTextureExists(1));
>+            ANGLE_TRY(ensureTextureExists(context, 1));
> 
>             // Pull data back from the mipped texture if necessary.
>             ASSERT(mLevelZeroTexture.valid());
>@@ -1829,7 +2023,7 @@ gl::Error TextureStorage11_Cube::useLevelZeroWorkaroundTexture(const gl::Context
>     {
>         if (mUseLevelZeroTexture && mLevelZeroTexture.valid())
>         {
>-            ANGLE_TRY(ensureTextureExists(mMipLevels));
>+            ANGLE_TRY(ensureTextureExists(context, mMipLevels));
> 
>             // Pull data back from the level zero texture if necessary.
>             ASSERT(mTexture.valid());
>@@ -1846,20 +2040,20 @@ gl::Error TextureStorage11_Cube::useLevelZeroWorkaroundTexture(const gl::Context
>         mUseLevelZeroTexture = false;
>     }
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
> void TextureStorage11_Cube::associateImage(Image11 *image, const gl::ImageIndex &index)
> {
>-    const GLint level       = index.mipIndex;
>-    const GLint layerTarget = index.layerIndex;
>+    const GLint level       = index.getLevelIndex();
>+    const GLint layerTarget = index.cubeMapFaceIndex();
> 
>     ASSERT(0 <= level && level < gl::IMPLEMENTATION_MAX_TEXTURE_LEVELS);
>-    ASSERT(0 <= layerTarget && layerTarget < static_cast<GLint>(gl::CUBE_FACE_COUNT));
>+    ASSERT(0 <= layerTarget && layerTarget < static_cast<GLint>(gl::kCubeFaceCount));
> 
>     if (0 <= level && level < gl::IMPLEMENTATION_MAX_TEXTURE_LEVELS)
>     {
>-        if (0 <= layerTarget && layerTarget < static_cast<GLint>(gl::CUBE_FACE_COUNT))
>+        if (0 <= layerTarget && layerTarget < static_cast<GLint>(gl::kCubeFaceCount))
>         {
>             mAssociatedImages[layerTarget][level] = image;
>         }
>@@ -1869,11 +2063,11 @@ void TextureStorage11_Cube::associateImage(Image11 *image, const gl::ImageIndex
> void TextureStorage11_Cube::verifyAssociatedImageValid(const gl::ImageIndex &index,
>                                                        Image11 *expectedImage)
> {
>-    const GLint level       = index.mipIndex;
>-    const GLint layerTarget = index.layerIndex;
>+    const GLint level       = index.getLevelIndex();
>+    const GLint layerTarget = index.cubeMapFaceIndex();
> 
>     ASSERT(0 <= level && level < gl::IMPLEMENTATION_MAX_TEXTURE_LEVELS);
>-    ASSERT(0 <= layerTarget && layerTarget < static_cast<GLint>(gl::CUBE_FACE_COUNT));
>+    ASSERT(0 <= layerTarget && layerTarget < static_cast<GLint>(gl::kCubeFaceCount));
>     // This validation check should never return false. It means the Image/TextureStorage
>     // association is broken.
>     ASSERT(mAssociatedImages[layerTarget][level] == expectedImage);
>@@ -1882,30 +2076,30 @@ void TextureStorage11_Cube::verifyAssociatedImageValid(const gl::ImageIndex &ind
> // disassociateImage allows an Image to end its association with a Storage.
> void TextureStorage11_Cube::disassociateImage(const gl::ImageIndex &index, Image11 *expectedImage)
> {
>-    const GLint level       = index.mipIndex;
>-    const GLint layerTarget = index.layerIndex;
>+    const GLint level       = index.getLevelIndex();
>+    const GLint layerTarget = index.cubeMapFaceIndex();
> 
>     ASSERT(0 <= level && level < gl::IMPLEMENTATION_MAX_TEXTURE_LEVELS);
>-    ASSERT(0 <= layerTarget && layerTarget < static_cast<GLint>(gl::CUBE_FACE_COUNT));
>+    ASSERT(0 <= layerTarget && layerTarget < static_cast<GLint>(gl::kCubeFaceCount));
>     ASSERT(mAssociatedImages[layerTarget][level] == expectedImage);
>     mAssociatedImages[layerTarget][level] = nullptr;
> }
> 
> // releaseAssociatedImage prepares the Storage for a new Image association. It lets the old Image
> // recover its data before ending the association.
>-gl::Error TextureStorage11_Cube::releaseAssociatedImage(const gl::Context *context,
>-                                                        const gl::ImageIndex &index,
>-                                                        Image11 *incomingImage)
>+angle::Result TextureStorage11_Cube::releaseAssociatedImage(const gl::Context *context,
>+                                                            const gl::ImageIndex &index,
>+                                                            Image11 *incomingImage)
> {
>-    const GLint level       = index.mipIndex;
>-    const GLint layerTarget = index.layerIndex;
>+    const GLint level       = index.getLevelIndex();
>+    const GLint layerTarget = index.cubeMapFaceIndex();
> 
>     ASSERT(0 <= level && level < gl::IMPLEMENTATION_MAX_TEXTURE_LEVELS);
>-    ASSERT(0 <= layerTarget && layerTarget < static_cast<GLint>(gl::CUBE_FACE_COUNT));
>+    ASSERT(0 <= layerTarget && layerTarget < static_cast<GLint>(gl::kCubeFaceCount));
> 
>     if ((0 <= level && level < gl::IMPLEMENTATION_MAX_TEXTURE_LEVELS))
>     {
>-        if (0 <= layerTarget && layerTarget < static_cast<GLint>(gl::CUBE_FACE_COUNT))
>+        if (0 <= layerTarget && layerTarget < static_cast<GLint>(gl::kCubeFaceCount))
>         {
>             // No need to let the old Image recover its data, if it is also the incoming Image.
>             if (mAssociatedImages[layerTarget][level] != nullptr &&
>@@ -1922,38 +2116,37 @@ gl::Error TextureStorage11_Cube::releaseAssociatedImage(const gl::Context *conte
>         }
>     }
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error TextureStorage11_Cube::getResource(const gl::Context *context,
>-                                             const TextureHelper11 **outResource)
>+angle::Result TextureStorage11_Cube::getResource(const gl::Context *context,
>+                                                 const TextureHelper11 **outResource)
> {
>     if (mUseLevelZeroTexture && mMipLevels > 1)
>     {
>-        ANGLE_TRY(ensureTextureExists(1));
>+        ANGLE_TRY(ensureTextureExists(context, 1));
>         *outResource = &mLevelZeroTexture;
>-        return gl::NoError();
>     }
>     else
>     {
>-        ANGLE_TRY(ensureTextureExists(mMipLevels));
>+        ANGLE_TRY(ensureTextureExists(context, mMipLevels));
>         *outResource = &mTexture;
>-        return gl::NoError();
>     }
>+    return angle::Result::Continue;
> }
> 
>-gl::Error TextureStorage11_Cube::getMippedResource(const gl::Context *context,
>-                                                   const TextureHelper11 **outResource)
>+angle::Result TextureStorage11_Cube::getMippedResource(const gl::Context *context,
>+                                                       const TextureHelper11 **outResource)
> {
>     // This shouldn't be called unless the zero max LOD workaround is active.
>     ASSERT(mRenderer->getWorkarounds().zeroMaxLodWorkaround);
> 
>-    ANGLE_TRY(ensureTextureExists(mMipLevels));
>+    ANGLE_TRY(ensureTextureExists(context, mMipLevels));
>     *outResource = &mTexture;
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error TextureStorage11_Cube::ensureTextureExists(int mipLevels)
>+angle::Result TextureStorage11_Cube::ensureTextureExists(const gl::Context *context, int mipLevels)
> {
>     // If mMipLevels = 1 then always use mTexture rather than mLevelZeroTexture.
>     bool useLevelZeroTexture = mRenderer->getWorkarounds().zeroMaxLodWorkaround
>@@ -1971,7 +2164,7 @@ gl::Error TextureStorage11_Cube::ensureTextureExists(int mipLevels)
>         desc.Width              = mTextureWidth;
>         desc.Height             = mTextureHeight;
>         desc.MipLevels          = mipLevels;
>-        desc.ArraySize          = gl::CUBE_FACE_COUNT;
>+        desc.ArraySize          = gl::kCubeFaceCount;
>         desc.Format             = mFormatInfo.texFormat;
>         desc.SampleDesc.Count   = 1;
>         desc.SampleDesc.Quality = 0;
>@@ -1980,23 +2173,25 @@ gl::Error TextureStorage11_Cube::ensureTextureExists(int mipLevels)
>         desc.CPUAccessFlags     = 0;
>         desc.MiscFlags          = D3D11_RESOURCE_MISC_TEXTURECUBE | getMiscFlags();
> 
>-        ANGLE_TRY(mRenderer->allocateTexture(desc, mFormatInfo, outputTexture));
>+        ANGLE_TRY(mRenderer->allocateTexture(GetImplAs<Context11>(context), desc, mFormatInfo,
>+                                             outputTexture));
>         outputTexture->setDebugName("TexStorageCube.Texture");
>     }
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error TextureStorage11_Cube::createRenderTargetSRV(const TextureHelper11 &texture,
>-                                                       const gl::ImageIndex &index,
>-                                                       DXGI_FORMAT resourceFormat,
>-                                                       d3d11::SharedSRV *srv) const
>+angle::Result TextureStorage11_Cube::createRenderTargetSRV(const gl::Context *context,
>+                                                           const TextureHelper11 &texture,
>+                                                           const gl::ImageIndex &index,
>+                                                           DXGI_FORMAT resourceFormat,
>+                                                           d3d11::SharedSRV *srv) const
> {
>     D3D11_SHADER_RESOURCE_VIEW_DESC srvDesc;
>     srvDesc.Format                         = resourceFormat;
>-    srvDesc.Texture2DArray.MostDetailedMip = mTopLevel + index.mipIndex;
>+    srvDesc.Texture2DArray.MostDetailedMip = mTopLevel + index.getLevelIndex();
>     srvDesc.Texture2DArray.MipLevels       = 1;
>-    srvDesc.Texture2DArray.FirstArraySlice = index.layerIndex;
>+    srvDesc.Texture2DArray.FirstArraySlice = index.cubeMapFaceIndex();
>     srvDesc.Texture2DArray.ArraySize       = 1;
> 
>     if (mRenderer->getRenderer11DeviceCaps().featureLevel <= D3D_FEATURE_LEVEL_10_0)
>@@ -2009,25 +2204,28 @@ gl::Error TextureStorage11_Cube::createRenderTargetSRV(const TextureHelper11 &te
>         srvDesc.ViewDimension = D3D11_SRV_DIMENSION_TEXTURE2DARRAY;
>     }
> 
>-    ANGLE_TRY(mRenderer->allocateResource(srvDesc, texture.get(), srv));
>-    return gl::NoError();
>+    ANGLE_TRY(
>+        mRenderer->allocateResource(GetImplAs<Context11>(context), srvDesc, texture.get(), srv));
>+    return angle::Result::Continue;
> }
> 
>-gl::Error TextureStorage11_Cube::getRenderTarget(const gl::Context *context,
>-                                                 const gl::ImageIndex &index,
>-                                                 RenderTargetD3D **outRT)
>+angle::Result TextureStorage11_Cube::getRenderTarget(const gl::Context *context,
>+                                                     const gl::ImageIndex &index,
>+                                                     RenderTargetD3D **outRT)
> {
>-    const int faceIndex = index.layerIndex;
>-    const int level     = index.mipIndex;
>+    const int faceIndex = index.cubeMapFaceIndex();
>+    const int level     = index.getLevelIndex();
> 
>     ASSERT(level >= 0 && level < getLevelCount());
>-    ASSERT(faceIndex >= 0 && faceIndex < static_cast<GLint>(gl::CUBE_FACE_COUNT));
>+    ASSERT(faceIndex >= 0 && faceIndex < static_cast<GLint>(gl::kCubeFaceCount));
>+
>+    Context11 *context11 = GetImplAs<Context11>(context);
> 
>     if (!mRenderTarget[faceIndex][level])
>     {
>         if (mRenderer->getWorkarounds().zeroMaxLodWorkaround)
>         {
>-            ASSERT(index.mipIndex == 0);
>+            ASSERT(index.getLevelIndex() == 0);
>             ANGLE_TRY(useLevelZeroWorkaroundTexture(context, true));
>         }
> 
>@@ -2046,7 +2244,8 @@ gl::Error TextureStorage11_Cube::getRenderTarget(const gl::Context *context,
>                 rtvDesc.Texture2DArray.ArraySize       = 1;
> 
>                 d3d11::RenderTargetView rtv;
>-                ANGLE_TRY(mRenderer->allocateResource(rtvDesc, mLevelZeroTexture.get(), &rtv));
>+                ANGLE_TRY(
>+                    mRenderer->allocateResource(context11, rtvDesc, mLevelZeroTexture.get(), &rtv));
> 
>                 mLevelZeroRenderTarget[faceIndex].reset(new TextureRenderTarget11(
>                     std::move(rtv), mLevelZeroTexture, d3d11::SharedSRV(), d3d11::SharedSRV(),
>@@ -2056,15 +2255,16 @@ gl::Error TextureStorage11_Cube::getRenderTarget(const gl::Context *context,
> 
>             ASSERT(outRT);
>             *outRT = mLevelZeroRenderTarget[faceIndex].get();
>-            return gl::NoError();
>+            return angle::Result::Continue;
>         }
> 
>         d3d11::SharedSRV srv;
>-        ANGLE_TRY(createRenderTargetSRV(*texture, index, mFormatInfo.srvFormat, &srv));
>+        ANGLE_TRY(createRenderTargetSRV(context, *texture, index, mFormatInfo.srvFormat, &srv));
>         d3d11::SharedSRV blitSRV;
>         if (mFormatInfo.blitSRVFormat != mFormatInfo.srvFormat)
>         {
>-            ANGLE_TRY(createRenderTargetSRV(*texture, index, mFormatInfo.blitSRVFormat, &blitSRV));
>+            ANGLE_TRY(createRenderTargetSRV(context, *texture, index, mFormatInfo.blitSRVFormat,
>+                                            &blitSRV));
>         }
>         else
>         {
>@@ -2083,7 +2283,7 @@ gl::Error TextureStorage11_Cube::getRenderTarget(const gl::Context *context,
>             rtvDesc.Texture2DArray.ArraySize       = 1;
> 
>             d3d11::RenderTargetView rtv;
>-            ANGLE_TRY(mRenderer->allocateResource(rtvDesc, texture->get(), &rtv));
>+            ANGLE_TRY(mRenderer->allocateResource(context11, rtvDesc, texture->get(), &rtv));
>             rtv.setDebugName("TexStorageCube.RenderTargetRTV");
> 
>             mRenderTarget[faceIndex][level].reset(new TextureRenderTarget11(
>@@ -2101,7 +2301,7 @@ gl::Error TextureStorage11_Cube::getRenderTarget(const gl::Context *context,
>             dsvDesc.Texture2DArray.ArraySize       = 1;
> 
>             d3d11::DepthStencilView dsv;
>-            ANGLE_TRY(mRenderer->allocateResource(dsvDesc, texture->get(), &dsv));
>+            ANGLE_TRY(mRenderer->allocateResource(context11, dsvDesc, texture->get(), &dsv));
>             dsv.setDebugName("TexStorageCube.RenderTargetDSV");
> 
>             mRenderTarget[faceIndex][level].reset(new TextureRenderTarget11(
>@@ -2116,15 +2316,15 @@ gl::Error TextureStorage11_Cube::getRenderTarget(const gl::Context *context,
> 
>     ASSERT(outRT);
>     *outRT = mRenderTarget[faceIndex][level].get();
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error TextureStorage11_Cube::createSRV(const gl::Context *context,
>-                                           int baseLevel,
>-                                           int mipLevels,
>-                                           DXGI_FORMAT format,
>-                                           const TextureHelper11 &texture,
>-                                           d3d11::SharedSRV *outSRV)
>+angle::Result TextureStorage11_Cube::createSRVForSampler(const gl::Context *context,
>+                                                         int baseLevel,
>+                                                         int mipLevels,
>+                                                         DXGI_FORMAT format,
>+                                                         const TextureHelper11 &texture,
>+                                                         d3d11::SharedSRV *outSRV)
> {
>     ASSERT(outSRV);
> 
>@@ -2140,7 +2340,7 @@ gl::Error TextureStorage11_Cube::createSRV(const gl::Context *context,
>         srvDesc.Texture2DArray.MostDetailedMip = mTopLevel + baseLevel;
>         srvDesc.Texture2DArray.MipLevels       = mipLevels;
>         srvDesc.Texture2DArray.FirstArraySlice = 0;
>-        srvDesc.Texture2DArray.ArraySize       = gl::CUBE_FACE_COUNT;
>+        srvDesc.Texture2DArray.ArraySize       = gl::kCubeFaceCount;
>     }
>     else
>     {
>@@ -2161,7 +2361,7 @@ gl::Error TextureStorage11_Cube::createSRV(const gl::Context *context,
>         if (mipLevels == 1 && mMipLevels > 1)
>         {
>             // We must use a SRV on the level-zero-only texture.
>-            ANGLE_TRY(ensureTextureExists(1));
>+            ANGLE_TRY(ensureTextureExists(context, 1));
>             srvTexture = &mLevelZeroTexture;
>         }
>         else
>@@ -2172,13 +2372,54 @@ gl::Error TextureStorage11_Cube::createSRV(const gl::Context *context,
>         }
>     }
> 
>-    ANGLE_TRY(mRenderer->allocateResource(srvDesc, srvTexture->get(), outSRV));
>+    ANGLE_TRY(mRenderer->allocateResource(GetImplAs<Context11>(context), srvDesc, srvTexture->get(),
>+                                          outSRV));
>     outSRV->setDebugName("TexStorageCube.SRV");
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error TextureStorage11_Cube::getSwizzleTexture(const TextureHelper11 **outTexture)
>+angle::Result TextureStorage11_Cube::createSRVForImage(const gl::Context *context,
>+                                                       int level,
>+                                                       DXGI_FORMAT format,
>+                                                       const TextureHelper11 &texture,
>+                                                       d3d11::SharedSRV *outSRV)
>+{
>+    ASSERT(outSRV);
>+    D3D11_SHADER_RESOURCE_VIEW_DESC srvDesc;
>+    srvDesc.Format                         = format;
>+    srvDesc.ViewDimension                  = D3D11_SRV_DIMENSION_TEXTURE2DARRAY;
>+    srvDesc.Texture2DArray.MostDetailedMip = mTopLevel + level;
>+    srvDesc.Texture2DArray.MipLevels       = 1;
>+    srvDesc.Texture2DArray.FirstArraySlice = 0;
>+    srvDesc.Texture2DArray.ArraySize       = gl::kCubeFaceCount;
>+    ANGLE_TRY(
>+        mRenderer->allocateResource(GetImplAs<Context11>(context), srvDesc, texture.get(), outSRV));
>+    outSRV->setDebugName("TexStorageCube.SRVForImage");
>+    return angle::Result::Continue;
>+}
>+
>+angle::Result TextureStorage11_Cube::createUAVForImage(const gl::Context *context,
>+                                                       int level,
>+                                                       DXGI_FORMAT format,
>+                                                       const TextureHelper11 &texture,
>+                                                       d3d11::SharedUAV *outUAV)
>+{
>+    ASSERT(outUAV);
>+    D3D11_UNORDERED_ACCESS_VIEW_DESC uavDesc;
>+    uavDesc.Format                         = format;
>+    uavDesc.ViewDimension                  = D3D11_UAV_DIMENSION_TEXTURE2DARRAY;
>+    uavDesc.Texture2DArray.MipSlice        = mTopLevel + level;
>+    uavDesc.Texture2DArray.FirstArraySlice = 0;
>+    uavDesc.Texture2DArray.ArraySize       = gl::kCubeFaceCount;
>+    ANGLE_TRY(
>+        mRenderer->allocateResource(GetImplAs<Context11>(context), uavDesc, texture.get(), outUAV));
>+    outUAV->setDebugName("TexStorageCube.UAVForImage");
>+    return angle::Result::Continue;
>+}
>+
>+angle::Result TextureStorage11_Cube::getSwizzleTexture(const gl::Context *context,
>+                                                       const TextureHelper11 **outTexture)
> {
>     ASSERT(outTexture);
> 
>@@ -2190,7 +2431,7 @@ gl::Error TextureStorage11_Cube::getSwizzleTexture(const TextureHelper11 **outTe
>         desc.Width              = mTextureWidth;
>         desc.Height             = mTextureHeight;
>         desc.MipLevels          = mMipLevels;
>-        desc.ArraySize          = gl::CUBE_FACE_COUNT;
>+        desc.ArraySize          = gl::kCubeFaceCount;
>         desc.Format             = format.texFormat;
>         desc.SampleDesc.Count   = 1;
>         desc.SampleDesc.Quality = 0;
>@@ -2199,16 +2440,18 @@ gl::Error TextureStorage11_Cube::getSwizzleTexture(const TextureHelper11 **outTe
>         desc.CPUAccessFlags     = 0;
>         desc.MiscFlags          = D3D11_RESOURCE_MISC_TEXTURECUBE;
> 
>-        ANGLE_TRY(mRenderer->allocateTexture(desc, format, &mSwizzleTexture));
>+        ANGLE_TRY(mRenderer->allocateTexture(GetImplAs<Context11>(context), desc, format,
>+                                             &mSwizzleTexture));
>         mSwizzleTexture.setDebugName("TexStorageCube.SwizzleTexture");
>     }
> 
>     *outTexture = &mSwizzleTexture;
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error TextureStorage11_Cube::getSwizzleRenderTarget(int mipLevel,
>-                                                        const d3d11::RenderTargetView **outRTV)
>+angle::Result TextureStorage11_Cube::getSwizzleRenderTarget(const gl::Context *context,
>+                                                            int mipLevel,
>+                                                            const d3d11::RenderTargetView **outRTV)
> {
>     ASSERT(mipLevel >= 0 && mipLevel < getLevelCount());
>     ASSERT(outRTV);
>@@ -2216,7 +2459,7 @@ gl::Error TextureStorage11_Cube::getSwizzleRenderTarget(int mipLevel,
>     if (!mSwizzleRenderTargets[mipLevel].valid())
>     {
>         const TextureHelper11 *swizzleTexture = nullptr;
>-        ANGLE_TRY(getSwizzleTexture(&swizzleTexture));
>+        ANGLE_TRY(getSwizzleTexture(context, &swizzleTexture));
> 
>         D3D11_RENDER_TARGET_VIEW_DESC rtvDesc;
>         rtvDesc.Format =
>@@ -2224,45 +2467,24 @@ gl::Error TextureStorage11_Cube::getSwizzleRenderTarget(int mipLevel,
>         rtvDesc.ViewDimension                  = D3D11_RTV_DIMENSION_TEXTURE2DARRAY;
>         rtvDesc.Texture2DArray.MipSlice        = mTopLevel + mipLevel;
>         rtvDesc.Texture2DArray.FirstArraySlice = 0;
>-        rtvDesc.Texture2DArray.ArraySize       = gl::CUBE_FACE_COUNT;
>+        rtvDesc.Texture2DArray.ArraySize       = gl::kCubeFaceCount;
> 
>-        ANGLE_TRY(mRenderer->allocateResource(rtvDesc, mSwizzleTexture.get(),
>+        ANGLE_TRY(mRenderer->allocateResource(GetImplAs<Context11>(context), rtvDesc,
>+                                              mSwizzleTexture.get(),
>                                               &mSwizzleRenderTargets[mipLevel]));
>     }
> 
>     *outRTV = &mSwizzleRenderTargets[mipLevel];
>-    return gl::NoError();
>-}
>-
>-gl::Error TextureStorage11::initDropStencilTexture(const gl::Context *context,
>-                                                   const gl::ImageIndexIterator &it)
>-{
>-    const TextureHelper11 *sourceTexture = nullptr;
>-    ANGLE_TRY(getResource(context, &sourceTexture));
>-
>-    gl::ImageIndexIterator itCopy = it;
>-
>-    while (itCopy.hasNext())
>-    {
>-        gl::ImageIndex index = itCopy.next();
>-        gl::Box wholeArea(0, 0, 0, getLevelWidth(index.mipIndex), getLevelHeight(index.mipIndex),
>-                          1);
>-        gl::Extents wholeSize(wholeArea.width, wholeArea.height, 1);
>-        UINT subresource = getSubresourceIndex(index);
>-        ANGLE_TRY(mRenderer->getBlitter()->copyDepthStencil(
>-            *sourceTexture, subresource, wholeArea, wholeSize, mDropStencilTexture, subresource,
>-            wholeArea, wholeSize, nullptr));
>-    }
>-
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::ErrorOrResult<TextureStorage11::DropStencil> TextureStorage11_Cube::ensureDropStencilTexture(
>-    const gl::Context *context)
>+angle::Result TextureStorage11_Cube::ensureDropStencilTexture(const gl::Context *context,
>+                                                              DropStencil *dropStencilOut)
> {
>     if (mDropStencilTexture.valid())
>     {
>-        return DropStencil::ALREADY_EXISTS;
>+        *dropStencilOut = DropStencil::ALREADY_EXISTS;
>+        return angle::Result::Continue;
>     }
> 
>     D3D11_TEXTURE2D_DESC dropDesc = {};
>@@ -2280,12 +2502,14 @@ gl::ErrorOrResult<TextureStorage11::DropStencil> TextureStorage11_Cube::ensureDr
> 
>     const auto &format =
>         d3d11::Format::Get(GL_DEPTH_COMPONENT32F, mRenderer->getRenderer11DeviceCaps());
>-    ANGLE_TRY(mRenderer->allocateTexture(dropDesc, format, &mDropStencilTexture));
>+    ANGLE_TRY(mRenderer->allocateTexture(GetImplAs<Context11>(context), dropDesc, format,
>+                                         &mDropStencilTexture));
>     mDropStencilTexture.setDebugName("TexStorageCube.DropStencil");
> 
>     ANGLE_TRY(initDropStencilTexture(context, gl::ImageIndexIterator::MakeCube(0, mMipLevels)));
> 
>-    return DropStencil::CREATED;
>+    *dropStencilOut = DropStencil::CREATED;
>+    return angle::Result::Continue;
> }
> 
> TextureStorage11_3D::TextureStorage11_3D(Renderer11 *renderer,
>@@ -2306,8 +2530,8 @@ TextureStorage11_3D::TextureStorage11_3D(Renderer11 *renderer,
> {
>     for (unsigned int i = 0; i < gl::IMPLEMENTATION_MAX_TEXTURE_LEVELS; i++)
>     {
>-        mAssociatedImages[i]     = nullptr;
>-        mLevelRenderTargets[i]   = nullptr;
>+        mAssociatedImages[i]   = nullptr;
>+        mLevelRenderTargets[i] = nullptr;
>     }
> 
>     // adjust size if needed for compressed textures
>@@ -2319,7 +2543,7 @@ TextureStorage11_3D::TextureStorage11_3D(Renderer11 *renderer,
>     mTextureDepth  = depth;
> }
> 
>-gl::Error TextureStorage11_3D::onDestroy(const gl::Context *context)
>+angle::Result TextureStorage11_3D::onDestroy(const gl::Context *context)
> {
>     for (unsigned i = 0; i < gl::IMPLEMENTATION_MAX_TEXTURE_LEVELS; i++)
>     {
>@@ -2333,19 +2557,14 @@ gl::Error TextureStorage11_3D::onDestroy(const gl::Context *context)
>         }
>     }
> 
>-    InvalidateRenderTargetContainer(context, &mLevelRenderTargets);
>-    InvalidateRenderTargetContainer(context, &mLevelLayerRenderTargets);
>-
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-TextureStorage11_3D::~TextureStorage11_3D()
>-{
>-}
>+TextureStorage11_3D::~TextureStorage11_3D() {}
> 
> void TextureStorage11_3D::associateImage(Image11 *image, const gl::ImageIndex &index)
> {
>-    const GLint level = index.mipIndex;
>+    const GLint level = index.getLevelIndex();
> 
>     ASSERT(0 <= level && level < gl::IMPLEMENTATION_MAX_TEXTURE_LEVELS);
> 
>@@ -2358,7 +2577,7 @@ void TextureStorage11_3D::associateImage(Image11 *image, const gl::ImageIndex &i
> void TextureStorage11_3D::verifyAssociatedImageValid(const gl::ImageIndex &index,
>                                                      Image11 *expectedImage)
> {
>-    const GLint level = index.mipIndex;
>+    const GLint level = index.getLevelIndex();
> 
>     ASSERT(0 <= level && level < gl::IMPLEMENTATION_MAX_TEXTURE_LEVELS);
>     // This validation check should never return false. It means the Image/TextureStorage
>@@ -2369,7 +2588,7 @@ void TextureStorage11_3D::verifyAssociatedImageValid(const gl::ImageIndex &index
> // disassociateImage allows an Image to end its association with a Storage.
> void TextureStorage11_3D::disassociateImage(const gl::ImageIndex &index, Image11 *expectedImage)
> {
>-    const GLint level = index.mipIndex;
>+    const GLint level = index.getLevelIndex();
> 
>     ASSERT(0 <= level && level < gl::IMPLEMENTATION_MAX_TEXTURE_LEVELS);
>     ASSERT(mAssociatedImages[level] == expectedImage);
>@@ -2378,11 +2597,11 @@ void TextureStorage11_3D::disassociateImage(const gl::ImageIndex &index, Image11
> 
> // releaseAssociatedImage prepares the Storage for a new Image association. It lets the old Image
> // recover its data before ending the association.
>-gl::Error TextureStorage11_3D::releaseAssociatedImage(const gl::Context *context,
>-                                                      const gl::ImageIndex &index,
>-                                                      Image11 *incomingImage)
>+angle::Result TextureStorage11_3D::releaseAssociatedImage(const gl::Context *context,
>+                                                          const gl::ImageIndex &index,
>+                                                          Image11 *incomingImage)
> {
>-    const GLint level = index.mipIndex;
>+    const GLint level = index.getLevelIndex();
> 
>     ASSERT((0 <= level && level < gl::IMPLEMENTATION_MAX_TEXTURE_LEVELS));
> 
>@@ -2400,11 +2619,11 @@ gl::Error TextureStorage11_3D::releaseAssociatedImage(const gl::Context *context
>         }
>     }
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error TextureStorage11_3D::getResource(const gl::Context *context,
>-                                           const TextureHelper11 **outResource)
>+angle::Result TextureStorage11_3D::getResource(const gl::Context *context,
>+                                               const TextureHelper11 **outResource)
> {
>     // If the width, height or depth are not positive this should be treated as an incomplete
>     // texture. We handle that here by skipping the d3d texture creation.
>@@ -2423,20 +2642,21 @@ gl::Error TextureStorage11_3D::getResource(const gl::Context *context,
>         desc.CPUAccessFlags = 0;
>         desc.MiscFlags      = getMiscFlags();
> 
>-        ANGLE_TRY(mRenderer->allocateTexture(desc, mFormatInfo, &mTexture));
>+        ANGLE_TRY(mRenderer->allocateTexture(GetImplAs<Context11>(context), desc, mFormatInfo,
>+                                             &mTexture));
>         mTexture.setDebugName("TexStorage3D.Texture");
>     }
> 
>     *outResource = &mTexture;
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error TextureStorage11_3D::createSRV(const gl::Context *context,
>-                                         int baseLevel,
>-                                         int mipLevels,
>-                                         DXGI_FORMAT format,
>-                                         const TextureHelper11 &texture,
>-                                         d3d11::SharedSRV *outSRV)
>+angle::Result TextureStorage11_3D::createSRVForSampler(const gl::Context *context,
>+                                                       int baseLevel,
>+                                                       int mipLevels,
>+                                                       DXGI_FORMAT format,
>+                                                       const TextureHelper11 &texture,
>+                                                       d3d11::SharedSRV *outSRV)
> {
>     ASSERT(outSRV);
> 
>@@ -2446,21 +2666,61 @@ gl::Error TextureStorage11_3D::createSRV(const gl::Context *context,
>     srvDesc.Texture3D.MostDetailedMip = baseLevel;
>     srvDesc.Texture3D.MipLevels       = mipLevels;
> 
>-    ANGLE_TRY(mRenderer->allocateResource(srvDesc, texture.get(), outSRV));
>+    ANGLE_TRY(
>+        mRenderer->allocateResource(GetImplAs<Context11>(context), srvDesc, texture.get(), outSRV));
>     outSRV->setDebugName("TexStorage3D.SRV");
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error TextureStorage11_3D::getRenderTarget(const gl::Context *context,
>-                                               const gl::ImageIndex &index,
>-                                               RenderTargetD3D **outRT)
>+angle::Result TextureStorage11_3D::createSRVForImage(const gl::Context *context,
>+                                                     int level,
>+                                                     DXGI_FORMAT format,
>+                                                     const TextureHelper11 &texture,
>+                                                     d3d11::SharedSRV *outSRV)
> {
>-    const int mipLevel = index.mipIndex;
>+    ASSERT(outSRV);
>+    D3D11_SHADER_RESOURCE_VIEW_DESC srvDesc;
>+    srvDesc.Format                    = format;
>+    srvDesc.ViewDimension             = D3D11_SRV_DIMENSION_TEXTURE3D;
>+    srvDesc.Texture3D.MostDetailedMip = mTopLevel + level;
>+    srvDesc.Texture3D.MipLevels       = 1;
>+    ANGLE_TRY(
>+        mRenderer->allocateResource(GetImplAs<Context11>(context), srvDesc, texture.get(), outSRV));
>+    outSRV->setDebugName("TexStorage3D.SRVForImage");
>+    return angle::Result::Continue;
>+}
>+
>+angle::Result TextureStorage11_3D::createUAVForImage(const gl::Context *context,
>+                                                     int level,
>+                                                     DXGI_FORMAT format,
>+                                                     const TextureHelper11 &texture,
>+                                                     d3d11::SharedUAV *outUAV)
>+{
>+    ASSERT(outUAV);
>+    D3D11_UNORDERED_ACCESS_VIEW_DESC uavDesc;
>+    uavDesc.Format                = format;
>+    uavDesc.ViewDimension         = D3D11_UAV_DIMENSION_TEXTURE3D;
>+    uavDesc.Texture3D.MipSlice    = mTopLevel + level;
>+    uavDesc.Texture3D.FirstWSlice = 0;
>+    uavDesc.Texture3D.WSize       = mTextureDepth;
>+    ANGLE_TRY(
>+        mRenderer->allocateResource(GetImplAs<Context11>(context), uavDesc, texture.get(), outUAV));
>+    outUAV->setDebugName("TexStorage3D.UAVForImage");
>+    return angle::Result::Continue;
>+}
>+
>+angle::Result TextureStorage11_3D::getRenderTarget(const gl::Context *context,
>+                                                   const gl::ImageIndex &index,
>+                                                   RenderTargetD3D **outRT)
>+{
>+    const int mipLevel = index.getLevelIndex();
>     ASSERT(mipLevel >= 0 && mipLevel < getLevelCount());
> 
>     ASSERT(mFormatInfo.rtvFormat != DXGI_FORMAT_UNKNOWN);
> 
>+    Context11 *context11 = GetImplAs<Context11>(context);
>+
>     if (!index.hasLayer())
>     {
>         if (!mLevelRenderTargets[mipLevel])
>@@ -2482,7 +2742,7 @@ gl::Error TextureStorage11_3D::getRenderTarget(const gl::Context *context,
>             rtvDesc.Texture3D.WSize       = static_cast<UINT>(-1);
> 
>             d3d11::RenderTargetView rtv;
>-            ANGLE_TRY(mRenderer->allocateResource(rtvDesc, texture->get(), &rtv));
>+            ANGLE_TRY(mRenderer->allocateResource(context11, rtvDesc, texture->get(), &rtv));
>             rtv.setDebugName("TexStorage3D.RTV");
> 
>             mLevelRenderTargets[mipLevel].reset(new TextureRenderTarget11(
>@@ -2493,10 +2753,10 @@ gl::Error TextureStorage11_3D::getRenderTarget(const gl::Context *context,
> 
>         ASSERT(outRT);
>         *outRT = mLevelRenderTargets[mipLevel].get();
>-        return gl::NoError();
>+        return angle::Result::Continue;
>     }
> 
>-    const int layer = index.layerIndex;
>+    const int layer = index.getLayerIndex();
> 
>     LevelLayerKey key(mipLevel, layer);
>     if (mLevelLayerRenderTargets.find(key) == mLevelLayerRenderTargets.end())
>@@ -2516,7 +2776,7 @@ gl::Error TextureStorage11_3D::getRenderTarget(const gl::Context *context,
>         rtvDesc.Texture3D.WSize       = 1;
> 
>         d3d11::RenderTargetView rtv;
>-        ANGLE_TRY(mRenderer->allocateResource(rtvDesc, texture->get(), &rtv));
>+        ANGLE_TRY(mRenderer->allocateResource(context11, rtvDesc, texture->get(), &rtv));
>         rtv.setDebugName("TexStorage3D.LayerRTV");
> 
>         mLevelLayerRenderTargets[key].reset(new TextureRenderTarget11(
>@@ -2526,10 +2786,11 @@ gl::Error TextureStorage11_3D::getRenderTarget(const gl::Context *context,
> 
>     ASSERT(outRT);
>     *outRT = mLevelLayerRenderTargets[key].get();
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error TextureStorage11_3D::getSwizzleTexture(const TextureHelper11 **outTexture)
>+angle::Result TextureStorage11_3D::getSwizzleTexture(const gl::Context *context,
>+                                                     const TextureHelper11 **outTexture)
> {
>     ASSERT(outTexture);
> 
>@@ -2548,16 +2809,18 @@ gl::Error TextureStorage11_3D::getSwizzleTexture(const TextureHelper11 **outText
>         desc.CPUAccessFlags = 0;
>         desc.MiscFlags      = 0;
> 
>-        ANGLE_TRY(mRenderer->allocateTexture(desc, format, &mSwizzleTexture));
>+        ANGLE_TRY(mRenderer->allocateTexture(GetImplAs<Context11>(context), desc, format,
>+                                             &mSwizzleTexture));
>         mSwizzleTexture.setDebugName("TexStorage3D.SwizzleTexture");
>     }
> 
>     *outTexture = &mSwizzleTexture;
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error TextureStorage11_3D::getSwizzleRenderTarget(int mipLevel,
>-                                                      const d3d11::RenderTargetView **outRTV)
>+angle::Result TextureStorage11_3D::getSwizzleRenderTarget(const gl::Context *context,
>+                                                          int mipLevel,
>+                                                          const d3d11::RenderTargetView **outRTV)
> {
>     ASSERT(mipLevel >= 0 && mipLevel < getLevelCount());
>     ASSERT(outRTV);
>@@ -2565,7 +2828,7 @@ gl::Error TextureStorage11_3D::getSwizzleRenderTarget(int mipLevel,
>     if (!mSwizzleRenderTargets[mipLevel].valid())
>     {
>         const TextureHelper11 *swizzleTexture = nullptr;
>-        ANGLE_TRY(getSwizzleTexture(&swizzleTexture));
>+        ANGLE_TRY(getSwizzleTexture(context, &swizzleTexture));
> 
>         D3D11_RENDER_TARGET_VIEW_DESC rtvDesc;
>         rtvDesc.Format =
>@@ -2575,13 +2838,14 @@ gl::Error TextureStorage11_3D::getSwizzleRenderTarget(int mipLevel,
>         rtvDesc.Texture3D.FirstWSlice = 0;
>         rtvDesc.Texture3D.WSize       = static_cast<UINT>(-1);
> 
>-        ANGLE_TRY(mRenderer->allocateResource(rtvDesc, mSwizzleTexture.get(),
>+        ANGLE_TRY(mRenderer->allocateResource(GetImplAs<Context11>(context), rtvDesc,
>+                                              mSwizzleTexture.get(),
>                                               &mSwizzleRenderTargets[mipLevel]));
>         mSwizzleRenderTargets[mipLevel].setDebugName("TexStorage3D.SwizzleRTV");
>     }
> 
>     *outRTV = &mSwizzleRenderTargets[mipLevel];
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
> TextureStorage11_2DArray::TextureStorage11_2DArray(Renderer11 *renderer,
>@@ -2609,7 +2873,7 @@ TextureStorage11_2DArray::TextureStorage11_2DArray(Renderer11 *renderer,
>     mTextureDepth  = depth;
> }
> 
>-gl::Error TextureStorage11_2DArray::onDestroy(const gl::Context *context)
>+angle::Result TextureStorage11_2DArray::onDestroy(const gl::Context *context)
> {
>     for (auto iter : mAssociatedImages)
>     {
>@@ -2624,20 +2888,16 @@ gl::Error TextureStorage11_2DArray::onDestroy(const gl::Context *context)
>     }
>     mAssociatedImages.clear();
> 
>-    InvalidateRenderTargetContainer(context, &mRenderTargets);
>-
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-TextureStorage11_2DArray::~TextureStorage11_2DArray()
>-{
>-}
>+TextureStorage11_2DArray::~TextureStorage11_2DArray() {}
> 
> void TextureStorage11_2DArray::associateImage(Image11 *image, const gl::ImageIndex &index)
> {
>-    const GLint level       = index.mipIndex;
>-    const GLint layerTarget = index.layerIndex;
>-    const GLint numLayers   = index.numLayers;
>+    const GLint level       = index.getLevelIndex();
>+    const GLint layerTarget = index.getLayerIndex();
>+    const GLint numLayers   = index.getLayerCount();
> 
>     ASSERT(0 <= level && level < getLevelCount());
> 
>@@ -2651,9 +2911,9 @@ void TextureStorage11_2DArray::associateImage(Image11 *image, const gl::ImageInd
> void TextureStorage11_2DArray::verifyAssociatedImageValid(const gl::ImageIndex &index,
>                                                           Image11 *expectedImage)
> {
>-    const GLint level       = index.mipIndex;
>-    const GLint layerTarget = index.layerIndex;
>-    const GLint numLayers   = index.numLayers;
>+    const GLint level       = index.getLevelIndex();
>+    const GLint layerTarget = index.getLayerIndex();
>+    const GLint numLayers   = index.getLayerCount();
> 
>     LevelLayerRangeKey key(level, layerTarget, numLayers);
> 
>@@ -2668,9 +2928,9 @@ void TextureStorage11_2DArray::verifyAssociatedImageValid(const gl::ImageIndex &
> void TextureStorage11_2DArray::disassociateImage(const gl::ImageIndex &index,
>                                                  Image11 *expectedImage)
> {
>-    const GLint level       = index.mipIndex;
>-    const GLint layerTarget = index.layerIndex;
>-    const GLint numLayers   = index.numLayers;
>+    const GLint level       = index.getLevelIndex();
>+    const GLint layerTarget = index.getLayerIndex();
>+    const GLint numLayers   = index.getLayerCount();
> 
>     LevelLayerRangeKey key(level, layerTarget, numLayers);
> 
>@@ -2682,13 +2942,13 @@ void TextureStorage11_2DArray::disassociateImage(const gl::ImageIndex &index,
> 
> // releaseAssociatedImage prepares the Storage for a new Image association. It lets the old Image
> // recover its data before ending the association.
>-gl::Error TextureStorage11_2DArray::releaseAssociatedImage(const gl::Context *context,
>-                                                           const gl::ImageIndex &index,
>-                                                           Image11 *incomingImage)
>+angle::Result TextureStorage11_2DArray::releaseAssociatedImage(const gl::Context *context,
>+                                                               const gl::ImageIndex &index,
>+                                                               Image11 *incomingImage)
> {
>-    const GLint level       = index.mipIndex;
>-    const GLint layerTarget = index.layerIndex;
>-    const GLint numLayers   = index.numLayers;
>+    const GLint level       = index.getLevelIndex();
>+    const GLint layerTarget = index.getLayerIndex();
>+    const GLint numLayers   = index.getLayerCount();
> 
>     LevelLayerRangeKey key(level, layerTarget, numLayers);
> 
>@@ -2705,11 +2965,11 @@ gl::Error TextureStorage11_2DArray::releaseAssociatedImage(const gl::Context *co
>         }
>     }
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error TextureStorage11_2DArray::getResource(const gl::Context *context,
>-                                                const TextureHelper11 **outResource)
>+angle::Result TextureStorage11_2DArray::getResource(const gl::Context *context,
>+                                                    const TextureHelper11 **outResource)
> {
>     // if the width, height or depth is not positive this should be treated as an incomplete texture
>     // we handle that here by skipping the d3d texture creation
>@@ -2730,20 +2990,21 @@ gl::Error TextureStorage11_2DArray::getResource(const gl::Context *context,
>         desc.CPUAccessFlags     = 0;
>         desc.MiscFlags          = getMiscFlags();
> 
>-        ANGLE_TRY(mRenderer->allocateTexture(desc, mFormatInfo, &mTexture));
>+        ANGLE_TRY(mRenderer->allocateTexture(GetImplAs<Context11>(context), desc, mFormatInfo,
>+                                             &mTexture));
>         mTexture.setDebugName("TexStorage2DArray.Texture");
>     }
> 
>     *outResource = &mTexture;
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error TextureStorage11_2DArray::createSRV(const gl::Context *context,
>-                                              int baseLevel,
>-                                              int mipLevels,
>-                                              DXGI_FORMAT format,
>-                                              const TextureHelper11 &texture,
>-                                              d3d11::SharedSRV *outSRV)
>+angle::Result TextureStorage11_2DArray::createSRVForSampler(const gl::Context *context,
>+                                                            int baseLevel,
>+                                                            int mipLevels,
>+                                                            DXGI_FORMAT format,
>+                                                            const TextureHelper11 &texture,
>+                                                            d3d11::SharedSRV *outSRV)
> {
>     D3D11_SHADER_RESOURCE_VIEW_DESC srvDesc;
>     srvDesc.Format                         = format;
>@@ -2753,39 +3014,81 @@ gl::Error TextureStorage11_2DArray::createSRV(const gl::Context *context,
>     srvDesc.Texture2DArray.FirstArraySlice = 0;
>     srvDesc.Texture2DArray.ArraySize       = mTextureDepth;
> 
>-    ANGLE_TRY(mRenderer->allocateResource(srvDesc, texture.get(), outSRV));
>+    ANGLE_TRY(
>+        mRenderer->allocateResource(GetImplAs<Context11>(context), srvDesc, texture.get(), outSRV));
>     outSRV->setDebugName("TexStorage2DArray.SRV");
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error TextureStorage11_2DArray::createRenderTargetSRV(const TextureHelper11 &texture,
>-                                                          const gl::ImageIndex &index,
>-                                                          DXGI_FORMAT resourceFormat,
>-                                                          d3d11::SharedSRV *srv) const
>+angle::Result TextureStorage11_2DArray::createSRVForImage(const gl::Context *context,
>+                                                          int level,
>+                                                          DXGI_FORMAT format,
>+                                                          const TextureHelper11 &texture,
>+                                                          d3d11::SharedSRV *outSRV)
>+{
>+    ASSERT(outSRV);
>+    D3D11_SHADER_RESOURCE_VIEW_DESC srvDesc;
>+    srvDesc.Format                         = format;
>+    srvDesc.ViewDimension                  = D3D11_SRV_DIMENSION_TEXTURE2DARRAY;
>+    srvDesc.Texture2DArray.MostDetailedMip = mTopLevel + level;
>+    srvDesc.Texture2DArray.MipLevels       = 1;
>+    srvDesc.Texture2DArray.FirstArraySlice = 0;
>+    srvDesc.Texture2DArray.ArraySize       = mTextureDepth;
>+    ANGLE_TRY(
>+        mRenderer->allocateResource(GetImplAs<Context11>(context), srvDesc, texture.get(), outSRV));
>+    outSRV->setDebugName("TexStorage2DArray.SRVForImage");
>+    return angle::Result::Continue;
>+}
>+
>+angle::Result TextureStorage11_2DArray::createUAVForImage(const gl::Context *context,
>+                                                          int level,
>+                                                          DXGI_FORMAT format,
>+                                                          const TextureHelper11 &texture,
>+                                                          d3d11::SharedUAV *outUAV)
>+{
>+    ASSERT(outUAV);
>+    D3D11_UNORDERED_ACCESS_VIEW_DESC uavDesc;
>+    uavDesc.Format                         = format;
>+    uavDesc.ViewDimension                  = D3D11_UAV_DIMENSION_TEXTURE2DARRAY;
>+    uavDesc.Texture2DArray.MipSlice        = mTopLevel + level;
>+    uavDesc.Texture2DArray.FirstArraySlice = 0;
>+    uavDesc.Texture2DArray.ArraySize       = mTextureDepth;
>+    ANGLE_TRY(
>+        mRenderer->allocateResource(GetImplAs<Context11>(context), uavDesc, texture.get(), outUAV));
>+    outUAV->setDebugName("TexStorage2DArray.UAVForImage");
>+    return angle::Result::Continue;
>+}
>+
>+angle::Result TextureStorage11_2DArray::createRenderTargetSRV(const gl::Context *context,
>+                                                              const TextureHelper11 &texture,
>+                                                              const gl::ImageIndex &index,
>+                                                              DXGI_FORMAT resourceFormat,
>+                                                              d3d11::SharedSRV *srv) const
> {
>     D3D11_SHADER_RESOURCE_VIEW_DESC srvDesc;
>     srvDesc.Format                         = resourceFormat;
>     srvDesc.ViewDimension                  = D3D11_SRV_DIMENSION_TEXTURE2DARRAY;
>-    srvDesc.Texture2DArray.MostDetailedMip = mTopLevel + index.mipIndex;
>+    srvDesc.Texture2DArray.MostDetailedMip = mTopLevel + index.getLevelIndex();
>     srvDesc.Texture2DArray.MipLevels       = 1;
>-    srvDesc.Texture2DArray.FirstArraySlice = index.layerIndex;
>-    srvDesc.Texture2DArray.ArraySize       = index.numLayers;
>+    srvDesc.Texture2DArray.FirstArraySlice = index.getLayerIndex();
>+    srvDesc.Texture2DArray.ArraySize       = index.getLayerCount();
> 
>-    ANGLE_TRY(mRenderer->allocateResource(srvDesc, texture.get(), srv));
>+    ANGLE_TRY(
>+        mRenderer->allocateResource(GetImplAs<Context11>(context), srvDesc, texture.get(), srv));
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error TextureStorage11_2DArray::getRenderTarget(const gl::Context *context,
>-                                                    const gl::ImageIndex &index,
>-                                                    RenderTargetD3D **outRT)
>+angle::Result TextureStorage11_2DArray::getRenderTarget(const gl::Context *context,
>+                                                        const gl::ImageIndex &index,
>+                                                        RenderTargetD3D **outRT)
> {
>     ASSERT(index.hasLayer());
> 
>-    const int mipLevel = index.mipIndex;
>-    const int layer    = index.layerIndex;
>-    const int numLayers = index.numLayers;
>+    const int mipLevel  = index.getLevelIndex();
>+    const int layer     = index.getLayerIndex();
>+    const int numLayers = index.getLayerCount();
> 
>     ASSERT(mipLevel >= 0 && mipLevel < getLevelCount());
> 
>@@ -2795,11 +3098,12 @@ gl::Error TextureStorage11_2DArray::getRenderTarget(const gl::Context *context,
>         const TextureHelper11 *texture = nullptr;
>         ANGLE_TRY(getResource(context, &texture));
>         d3d11::SharedSRV srv;
>-        ANGLE_TRY(createRenderTargetSRV(*texture, index, mFormatInfo.srvFormat, &srv));
>+        ANGLE_TRY(createRenderTargetSRV(context, *texture, index, mFormatInfo.srvFormat, &srv));
>         d3d11::SharedSRV blitSRV;
>         if (mFormatInfo.blitSRVFormat != mFormatInfo.srvFormat)
>         {
>-            ANGLE_TRY(createRenderTargetSRV(*texture, index, mFormatInfo.blitSRVFormat, &blitSRV));
>+            ANGLE_TRY(createRenderTargetSRV(context, *texture, index, mFormatInfo.blitSRVFormat,
>+                                            &blitSRV));
>         }
>         else
>         {
>@@ -2818,7 +3122,8 @@ gl::Error TextureStorage11_2DArray::getRenderTarget(const gl::Context *context,
>             rtvDesc.Texture2DArray.ArraySize       = numLayers;
> 
>             d3d11::RenderTargetView rtv;
>-            ANGLE_TRY(mRenderer->allocateResource(rtvDesc, texture->get(), &rtv));
>+            ANGLE_TRY(mRenderer->allocateResource(GetImplAs<Context11>(context), rtvDesc,
>+                                                  texture->get(), &rtv));
>             rtv.setDebugName("TexStorage2DArray.RenderTargetRTV");
> 
>             mRenderTargets[key].reset(new TextureRenderTarget11(
>@@ -2838,7 +3143,8 @@ gl::Error TextureStorage11_2DArray::getRenderTarget(const gl::Context *context,
>             dsvDesc.Flags                          = 0;
> 
>             d3d11::DepthStencilView dsv;
>-            ANGLE_TRY(mRenderer->allocateResource(dsvDesc, texture->get(), &dsv));
>+            ANGLE_TRY(mRenderer->allocateResource(GetImplAs<Context11>(context), dsvDesc,
>+                                                  texture->get(), &dsv));
>             dsv.setDebugName("TexStorage2DArray.RenderTargetDSV");
> 
>             mRenderTargets[key].reset(new TextureRenderTarget11(
>@@ -2849,10 +3155,11 @@ gl::Error TextureStorage11_2DArray::getRenderTarget(const gl::Context *context,
> 
>     ASSERT(outRT);
>     *outRT = mRenderTargets[key].get();
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error TextureStorage11_2DArray::getSwizzleTexture(const TextureHelper11 **outTexture)
>+angle::Result TextureStorage11_2DArray::getSwizzleTexture(const gl::Context *context,
>+                                                          const TextureHelper11 **outTexture)
> {
>     if (!mSwizzleTexture.valid())
>     {
>@@ -2871,16 +3178,19 @@ gl::Error TextureStorage11_2DArray::getSwizzleTexture(const TextureHelper11 **ou
>         desc.CPUAccessFlags     = 0;
>         desc.MiscFlags          = 0;
> 
>-        ANGLE_TRY(mRenderer->allocateTexture(desc, format, &mSwizzleTexture));
>+        ANGLE_TRY(mRenderer->allocateTexture(GetImplAs<Context11>(context), desc, format,
>+                                             &mSwizzleTexture));
>         mSwizzleTexture.setDebugName("TexStorage2DArray.SwizzleTexture");
>     }
> 
>     *outTexture = &mSwizzleTexture;
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error TextureStorage11_2DArray::getSwizzleRenderTarget(int mipLevel,
>-                                                           const d3d11::RenderTargetView **outRTV)
>+angle::Result TextureStorage11_2DArray::getSwizzleRenderTarget(
>+    const gl::Context *context,
>+    int mipLevel,
>+    const d3d11::RenderTargetView **outRTV)
> {
>     ASSERT(mipLevel >= 0 && mipLevel < getLevelCount());
>     ASSERT(outRTV);
>@@ -2888,7 +3198,7 @@ gl::Error TextureStorage11_2DArray::getSwizzleRenderTarget(int mipLevel,
>     if (!mSwizzleRenderTargets[mipLevel].valid())
>     {
>         const TextureHelper11 *swizzleTexture = nullptr;
>-        ANGLE_TRY(getSwizzleTexture(&swizzleTexture));
>+        ANGLE_TRY(getSwizzleTexture(context, &swizzleTexture));
> 
>         D3D11_RENDER_TARGET_VIEW_DESC rtvDesc;
>         rtvDesc.Format =
>@@ -2898,20 +3208,22 @@ gl::Error TextureStorage11_2DArray::getSwizzleRenderTarget(int mipLevel,
>         rtvDesc.Texture2DArray.FirstArraySlice = 0;
>         rtvDesc.Texture2DArray.ArraySize       = mTextureDepth;
> 
>-        ANGLE_TRY(mRenderer->allocateResource(rtvDesc, mSwizzleTexture.get(),
>+        ANGLE_TRY(mRenderer->allocateResource(GetImplAs<Context11>(context), rtvDesc,
>+                                              mSwizzleTexture.get(),
>                                               &mSwizzleRenderTargets[mipLevel]));
>     }
> 
>     *outRTV = &mSwizzleRenderTargets[mipLevel];
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::ErrorOrResult<TextureStorage11::DropStencil> TextureStorage11_2DArray::ensureDropStencilTexture(
>-    const gl::Context *context)
>+angle::Result TextureStorage11_2DArray::ensureDropStencilTexture(const gl::Context *context,
>+                                                                 DropStencil *dropStencilOut)
> {
>     if (mDropStencilTexture.valid())
>     {
>-        return DropStencil::ALREADY_EXISTS;
>+        *dropStencilOut = DropStencil::ALREADY_EXISTS;
>+        return angle::Result::Continue;
>     }
> 
>     D3D11_TEXTURE2D_DESC dropDesc = {};
>@@ -2929,7 +3241,8 @@ gl::ErrorOrResult<TextureStorage11::DropStencil> TextureStorage11_2DArray::ensur
> 
>     const auto &format =
>         d3d11::Format::Get(GL_DEPTH_COMPONENT32F, mRenderer->getRenderer11DeviceCaps());
>-    ANGLE_TRY(mRenderer->allocateTexture(dropDesc, format, &mDropStencilTexture));
>+    ANGLE_TRY(mRenderer->allocateTexture(GetImplAs<Context11>(context), dropDesc, format,
>+                                         &mDropStencilTexture));
>     mDropStencilTexture.setDebugName("TexStorage2DArray.DropStencil");
> 
>     std::vector<GLsizei> layerCounts(mMipLevels, mTextureDepth);
>@@ -2937,7 +3250,8 @@ gl::ErrorOrResult<TextureStorage11::DropStencil> TextureStorage11_2DArray::ensur
>     ANGLE_TRY(initDropStencilTexture(
>         context, gl::ImageIndexIterator::Make2DArray(0, mMipLevels, layerCounts.data())));
> 
>-    return DropStencil::CREATED;
>+    *dropStencilOut = DropStencil::CREATED;
>+    return angle::Result::Continue;
> }
> 
> TextureStorage11_2DMultisample::TextureStorage11_2DMultisample(Renderer11 *renderer,
>@@ -2947,7 +3261,7 @@ TextureStorage11_2DMultisample::TextureStorage11_2DMultisample(Renderer11 *rende
>                                                                int levels,
>                                                                int samples,
>                                                                bool fixedSampleLocations)
>-    : TextureStorage11(
>+    : TextureStorage11ImmutableBase(
>           renderer,
>           GetTextureBindFlags(internalformat, renderer->getRenderer11DeviceCaps(), true),
>           GetTextureMiscFlags(internalformat, renderer->getRenderer11DeviceCaps(), true, levels),
>@@ -2955,8 +3269,10 @@ TextureStorage11_2DMultisample::TextureStorage11_2DMultisample(Renderer11 *rende
>       mTexture(),
>       mRenderTarget(nullptr)
> {
>-    // adjust size if needed for compressed textures
>-    d3d11::MakeValidSize(false, mFormatInfo.texFormat, &width, &height, &mTopLevel);
>+    // There are no multisampled compressed formats, so there's no need to adjust texture size
>+    // according to block size.
>+    ASSERT(d3d11::GetDXGIFormatSizeInfo(mFormatInfo.texFormat).blockWidth <= 1);
>+    ASSERT(d3d11::GetDXGIFormatSizeInfo(mFormatInfo.texFormat).blockHeight <= 1);
> 
>     mMipLevels            = 1;
>     mTextureWidth         = width;
>@@ -2966,55 +3282,32 @@ TextureStorage11_2DMultisample::TextureStorage11_2DMultisample(Renderer11 *rende
>     mFixedSampleLocations = fixedSampleLocations;
> }
> 
>-gl::Error TextureStorage11_2DMultisample::onDestroy(const gl::Context *context)
>+angle::Result TextureStorage11_2DMultisample::onDestroy(const gl::Context *context)
> {
>-    InvalidateRenderTarget(context, mRenderTarget.get());
>     mRenderTarget.reset();
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-TextureStorage11_2DMultisample::~TextureStorage11_2DMultisample()
>-{
>-}
>-
>-gl::Error TextureStorage11_2DMultisample::copyToStorage(const gl::Context *context,
>-                                                        TextureStorage *destStorage)
>-{
>-    UNIMPLEMENTED();
>-    return gl::InternalError() << "copyToStorage is unimplemented";
>-}
>+TextureStorage11_2DMultisample::~TextureStorage11_2DMultisample() {}
> 
>-void TextureStorage11_2DMultisample::associateImage(Image11 *image, const gl::ImageIndex &index)
>+angle::Result TextureStorage11_2DMultisample::copyToStorage(const gl::Context *context,
>+                                                            TextureStorage *destStorage)
> {
>+    ANGLE_HR_UNREACHABLE(GetImplAs<Context11>(context));
>+    return angle::Result::Stop;
> }
> 
>-void TextureStorage11_2DMultisample::verifyAssociatedImageValid(const gl::ImageIndex &index,
>-                                                                Image11 *expectedImage)
>+angle::Result TextureStorage11_2DMultisample::getResource(const gl::Context *context,
>+                                                          const TextureHelper11 **outResource)
> {
>-}
>-
>-void TextureStorage11_2DMultisample::disassociateImage(const gl::ImageIndex &index,
>-                                                       Image11 *expectedImage)
>-{
>-}
>-
>-gl::Error TextureStorage11_2DMultisample::releaseAssociatedImage(const gl::Context *context,
>-                                                                 const gl::ImageIndex &index,
>-                                                                 Image11 *incomingImage)
>-{
>-    return gl::NoError();
>-}
>-
>-gl::Error TextureStorage11_2DMultisample::getResource(const gl::Context *context,
>-                                                      const TextureHelper11 **outResource)
>-{
>-    ANGLE_TRY(ensureTextureExists(1));
>+    ANGLE_TRY(ensureTextureExists(context, 1));
> 
>     *outResource = &mTexture;
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error TextureStorage11_2DMultisample::ensureTextureExists(int mipLevels)
>+angle::Result TextureStorage11_2DMultisample::ensureTextureExists(const gl::Context *context,
>+                                                                  int mipLevels)
> {
>     // For Multisampled textures, mipLevels always equals 1.
>     ASSERT(mipLevels == 1);
>@@ -3031,7 +3324,7 @@ gl::Error TextureStorage11_2DMultisample::ensureTextureExists(int mipLevels)
>         desc.ArraySize      = 1;
>         desc.Format         = mFormatInfo.texFormat;
>         desc.Usage          = D3D11_USAGE_DEFAULT;
>-        desc.BindFlags      = getBindFlags();
>+        desc.BindFlags      = getBindFlags() & ~D3D11_BIND_UNORDERED_ACCESS;
>         desc.CPUAccessFlags = 0;
>         desc.MiscFlags      = getMiscFlags();
> 
>@@ -3041,27 +3334,28 @@ gl::Error TextureStorage11_2DMultisample::ensureTextureExists(int mipLevels)
>         desc.SampleDesc.Count   = (supportedSamples == 0) ? 1 : supportedSamples;
>         desc.SampleDesc.Quality = static_cast<UINT>(D3D11_STANDARD_MULTISAMPLE_PATTERN);
> 
>-        ANGLE_TRY(mRenderer->allocateTexture(desc, mFormatInfo, &mTexture));
>+        ANGLE_TRY(mRenderer->allocateTexture(GetImplAs<Context11>(context), desc, mFormatInfo,
>+                                             &mTexture));
>         mTexture.setDebugName("TexStorage2DMS.Texture");
>     }
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error TextureStorage11_2DMultisample::getRenderTarget(const gl::Context *context,
>-                                                          const gl::ImageIndex &index,
>-                                                          RenderTargetD3D **outRT)
>+angle::Result TextureStorage11_2DMultisample::getRenderTarget(const gl::Context *context,
>+                                                              const gl::ImageIndex &index,
>+                                                              RenderTargetD3D **outRT)
> {
>     ASSERT(!index.hasLayer());
> 
>-    const int level = index.mipIndex;
>+    const int level = index.getLevelIndex();
>     ASSERT(level == 0);
> 
>     ASSERT(outRT);
>     if (mRenderTarget)
>     {
>         *outRT = mRenderTarget.get();
>-        return gl::NoError();
>+        return angle::Result::Continue;
>     }
> 
>     const TextureHelper11 *texture = nullptr;
>@@ -3073,6 +3367,8 @@ gl::Error TextureStorage11_2DMultisample::getRenderTarget(const gl::Context *con
>     const d3d11::SharedSRV *blitSRV = nullptr;
>     ANGLE_TRY(getSRVLevel(context, level, true, &blitSRV));
> 
>+    Context11 *context11 = GetImplAs<Context11>(context);
>+
>     if (mFormatInfo.rtvFormat != DXGI_FORMAT_UNKNOWN)
>     {
>         D3D11_RENDER_TARGET_VIEW_DESC rtvDesc;
>@@ -3080,14 +3376,14 @@ gl::Error TextureStorage11_2DMultisample::getRenderTarget(const gl::Context *con
>         rtvDesc.ViewDimension = D3D11_RTV_DIMENSION_TEXTURE2DMS;
> 
>         d3d11::RenderTargetView rtv;
>-        ANGLE_TRY(mRenderer->allocateResource(rtvDesc, texture->get(), &rtv));
>+        ANGLE_TRY(mRenderer->allocateResource(context11, rtvDesc, texture->get(), &rtv));
> 
>         mRenderTarget.reset(new TextureRenderTarget11(
>             std::move(rtv), *texture, *srv, *blitSRV, mFormatInfo.internalFormat, getFormatSet(),
>             getLevelWidth(level), getLevelHeight(level), 1, mSamples));
> 
>         *outRT = mRenderTarget.get();
>-        return gl::NoError();
>+        return angle::Result::Continue;
>     }
> 
>     ASSERT(mFormatInfo.dsvFormat != DXGI_FORMAT_UNKNOWN);
>@@ -3098,22 +3394,22 @@ gl::Error TextureStorage11_2DMultisample::getRenderTarget(const gl::Context *con
>     dsvDesc.Flags         = 0;
> 
>     d3d11::DepthStencilView dsv;
>-    ANGLE_TRY(mRenderer->allocateResource(dsvDesc, texture->get(), &dsv));
>+    ANGLE_TRY(mRenderer->allocateResource(context11, dsvDesc, texture->get(), &dsv));
> 
>     mRenderTarget.reset(new TextureRenderTarget11(
>         std::move(dsv), *texture, *srv, mFormatInfo.internalFormat, getFormatSet(),
>         getLevelWidth(level), getLevelHeight(level), 1, mSamples));
> 
>     *outRT = mRenderTarget.get();
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error TextureStorage11_2DMultisample::createSRV(const gl::Context *context,
>-                                                    int baseLevel,
>-                                                    int mipLevels,
>-                                                    DXGI_FORMAT format,
>-                                                    const TextureHelper11 &texture,
>-                                                    d3d11::SharedSRV *outSRV)
>+angle::Result TextureStorage11_2DMultisample::createSRVForSampler(const gl::Context *context,
>+                                                                  int baseLevel,
>+                                                                  int mipLevels,
>+                                                                  DXGI_FORMAT format,
>+                                                                  const TextureHelper11 &texture,
>+                                                                  d3d11::SharedSRV *outSRV)
> {
>     ASSERT(outSRV);
> 
>@@ -3121,30 +3417,263 @@ gl::Error TextureStorage11_2DMultisample::createSRV(const gl::Context *context,
>     srvDesc.Format        = format;
>     srvDesc.ViewDimension = D3D11_SRV_DIMENSION_TEXTURE2DMS;
> 
>-    ANGLE_TRY(mRenderer->allocateResource(srvDesc, texture.get(), outSRV));
>+    ANGLE_TRY(
>+        mRenderer->allocateResource(GetImplAs<Context11>(context), srvDesc, texture.get(), outSRV));
>     outSRV->setDebugName("TexStorage2DMS.SRV");
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error TextureStorage11_2DMultisample::getSwizzleTexture(const TextureHelper11 **outTexture)
>+angle::Result TextureStorage11_2DMultisample::getSwizzleTexture(const gl::Context *context,
>+                                                                const TextureHelper11 **outTexture)
> {
>-    UNIMPLEMENTED();
>-    return gl::InternalError() << "getSwizzleTexture is unimplemented.";
>+    ANGLE_HR_UNREACHABLE(GetImplAs<Context11>(context));
>+    return angle::Result::Stop;
> }
> 
>-gl::Error TextureStorage11_2DMultisample::getSwizzleRenderTarget(
>+angle::Result TextureStorage11_2DMultisample::getSwizzleRenderTarget(
>+    const gl::Context *context,
>     int mipLevel,
>     const d3d11::RenderTargetView **outRTV)
> {
>-    UNIMPLEMENTED();
>-    return gl::InternalError() << "getSwizzleRenderTarget is unimplemented.";
>+    ANGLE_HR_UNREACHABLE(GetImplAs<Context11>(context));
>+    return angle::Result::Stop;
> }
> 
>-gl::ErrorOrResult<TextureStorage11::DropStencil>
>-TextureStorage11_2DMultisample::ensureDropStencilTexture(const gl::Context *context)
>+angle::Result TextureStorage11_2DMultisample::ensureDropStencilTexture(const gl::Context *context,
>+                                                                       DropStencil *dropStencilOut)
> {
>-    UNIMPLEMENTED();
>-    return gl::InternalError() << "Drop stencil texture not implemented.";
>+    ANGLE_HR_UNREACHABLE(GetImplAs<Context11>(context));
>+    return angle::Result::Stop;
>+}
>+
>+TextureStorage11_2DMultisampleArray::TextureStorage11_2DMultisampleArray(Renderer11 *renderer,
>+                                                                         GLenum internalformat,
>+                                                                         GLsizei width,
>+                                                                         GLsizei height,
>+                                                                         GLsizei depth,
>+                                                                         int levels,
>+                                                                         int samples,
>+                                                                         bool fixedSampleLocations)
>+    : TextureStorage11ImmutableBase(
>+          renderer,
>+          GetTextureBindFlags(internalformat, renderer->getRenderer11DeviceCaps(), true),
>+          GetTextureMiscFlags(internalformat, renderer->getRenderer11DeviceCaps(), true, levels),
>+          internalformat),
>+      mTexture()
>+{
>+    // There are no multisampled compressed formats, so there's no need to adjust texture size
>+    // according to block size.
>+    ASSERT(d3d11::GetDXGIFormatSizeInfo(mFormatInfo.texFormat).blockWidth <= 1);
>+    ASSERT(d3d11::GetDXGIFormatSizeInfo(mFormatInfo.texFormat).blockHeight <= 1);
>+
>+    mMipLevels            = 1;
>+    mTextureWidth         = width;
>+    mTextureHeight        = height;
>+    mTextureDepth         = depth;
>+    mSamples              = samples;
>+    mFixedSampleLocations = fixedSampleLocations;
>+}
>+
>+angle::Result TextureStorage11_2DMultisampleArray::onDestroy(const gl::Context *context)
>+{
>+    return angle::Result::Continue;
>+}
>+
>+TextureStorage11_2DMultisampleArray::~TextureStorage11_2DMultisampleArray() {}
>+
>+angle::Result TextureStorage11_2DMultisampleArray::copyToStorage(const gl::Context *context,
>+                                                                 TextureStorage *destStorage)
>+{
>+    ANGLE_HR_UNREACHABLE(GetImplAs<Context11>(context));
>+    return angle::Result::Stop;
>+}
>+
>+angle::Result TextureStorage11_2DMultisampleArray::getResource(const gl::Context *context,
>+                                                               const TextureHelper11 **outResource)
>+{
>+    ANGLE_TRY(ensureTextureExists(context, 1));
>+
>+    *outResource = &mTexture;
>+    return angle::Result::Continue;
>+}
>+
>+angle::Result TextureStorage11_2DMultisampleArray::ensureTextureExists(const gl::Context *context,
>+                                                                       int mipLevels)
>+{
>+    // For multisampled textures, mipLevels always equals 1.
>+    ASSERT(mipLevels == 1);
>+
>+    // if the width or height is not positive this should be treated as an incomplete texture
>+    // we handle that here by skipping the d3d texture creation
>+    if (!mTexture.valid() && mTextureWidth > 0 && mTextureHeight > 0)
>+    {
>+        D3D11_TEXTURE2D_DESC desc;
>+        ZeroMemory(&desc, sizeof(desc));
>+        desc.Width          = mTextureWidth;
>+        desc.Height         = mTextureHeight;
>+        desc.MipLevels      = mipLevels;
>+        desc.ArraySize      = mTextureDepth;
>+        desc.Format         = mFormatInfo.texFormat;
>+        desc.Usage          = D3D11_USAGE_DEFAULT;
>+        desc.BindFlags      = getBindFlags() & ~D3D11_BIND_UNORDERED_ACCESS;
>+        desc.CPUAccessFlags = 0;
>+        desc.MiscFlags      = getMiscFlags();
>+
>+        const gl::TextureCaps &textureCaps =
>+            mRenderer->getNativeTextureCaps().get(mFormatInfo.internalFormat);
>+        GLuint supportedSamples = textureCaps.getNearestSamples(mSamples);
>+        desc.SampleDesc.Count   = (supportedSamples == 0) ? 1 : supportedSamples;
>+        desc.SampleDesc.Quality = static_cast<UINT>(D3D11_STANDARD_MULTISAMPLE_PATTERN);
>+
>+        ANGLE_TRY(mRenderer->allocateTexture(GetImplAs<Context11>(context), desc, mFormatInfo,
>+                                             &mTexture));
>+        mTexture.setDebugName("TexStorage2DMSArray.Texture");
>+    }
>+
>+    return angle::Result::Continue;
>+}
>+
>+angle::Result TextureStorage11_2DMultisampleArray::createRenderTargetSRV(
>+    const gl::Context *context,
>+    const TextureHelper11 &texture,
>+    const gl::ImageIndex &index,
>+    DXGI_FORMAT resourceFormat,
>+    d3d11::SharedSRV *srv) const
>+{
>+    D3D11_SHADER_RESOURCE_VIEW_DESC srvDesc;
>+    srvDesc.Format                           = resourceFormat;
>+    srvDesc.ViewDimension                    = D3D11_SRV_DIMENSION_TEXTURE2DMSARRAY;
>+    srvDesc.Texture2DMSArray.FirstArraySlice = index.getLayerIndex();
>+    srvDesc.Texture2DMSArray.ArraySize       = index.getLayerCount();
>+
>+    ANGLE_TRY(
>+        mRenderer->allocateResource(GetImplAs<Context11>(context), srvDesc, texture.get(), srv));
>+
>+    return angle::Result::Continue;
>+}
>+
>+angle::Result TextureStorage11_2DMultisampleArray::getRenderTarget(const gl::Context *context,
>+                                                                   const gl::ImageIndex &index,
>+                                                                   RenderTargetD3D **outRT)
>+{
>+    ASSERT(index.hasLayer());
>+
>+    const int mipLevel = index.getLevelIndex();
>+    ASSERT(mipLevel == 0);
>+    const int layer     = index.getLayerIndex();
>+    const int numLayers = index.getLayerCount();
>+
>+    ASSERT(mipLevel >= 0 && mipLevel < getLevelCount());
>+
>+    TextureStorage11_2DArray::LevelLayerRangeKey key(mipLevel, layer, numLayers);
>+    if (mRenderTargets.find(key) == mRenderTargets.end())
>+    {
>+        const TextureHelper11 *texture = nullptr;
>+        ANGLE_TRY(getResource(context, &texture));
>+        d3d11::SharedSRV srv;
>+        ANGLE_TRY(createRenderTargetSRV(context, *texture, index, mFormatInfo.srvFormat, &srv));
>+        d3d11::SharedSRV blitSRV;
>+        if (mFormatInfo.blitSRVFormat != mFormatInfo.srvFormat)
>+        {
>+            ANGLE_TRY(createRenderTargetSRV(context, *texture, index, mFormatInfo.blitSRVFormat,
>+                                            &blitSRV));
>+        }
>+        else
>+        {
>+            blitSRV = srv.makeCopy();
>+        }
>+
>+        srv.setDebugName("TexStorage2DMSArray.RenderTargetSRV");
>+
>+        if (mFormatInfo.rtvFormat != DXGI_FORMAT_UNKNOWN)
>+        {
>+            D3D11_RENDER_TARGET_VIEW_DESC rtvDesc;
>+            rtvDesc.Format                           = mFormatInfo.rtvFormat;
>+            rtvDesc.ViewDimension                    = D3D11_RTV_DIMENSION_TEXTURE2DMSARRAY;
>+            rtvDesc.Texture2DMSArray.FirstArraySlice = layer;
>+            rtvDesc.Texture2DMSArray.ArraySize       = numLayers;
>+
>+            d3d11::RenderTargetView rtv;
>+            ANGLE_TRY(mRenderer->allocateResource(GetImplAs<Context11>(context), rtvDesc,
>+                                                  texture->get(), &rtv));
>+            rtv.setDebugName("TexStorage2DMSArray.RenderTargetRTV");
>+
>+            mRenderTargets[key].reset(new TextureRenderTarget11(
>+                std::move(rtv), *texture, srv, blitSRV, mFormatInfo.internalFormat, getFormatSet(),
>+                getLevelWidth(mipLevel), getLevelHeight(mipLevel), 1, mSamples));
>+        }
>+        else
>+        {
>+            ASSERT(mFormatInfo.dsvFormat != DXGI_FORMAT_UNKNOWN);
>+
>+            D3D11_DEPTH_STENCIL_VIEW_DESC dsvDesc;
>+            dsvDesc.Format                           = mFormatInfo.dsvFormat;
>+            dsvDesc.ViewDimension                    = D3D11_DSV_DIMENSION_TEXTURE2DMSARRAY;
>+            dsvDesc.Texture2DMSArray.FirstArraySlice = layer;
>+            dsvDesc.Texture2DMSArray.ArraySize       = numLayers;
>+            dsvDesc.Flags                            = 0;
>+
>+            d3d11::DepthStencilView dsv;
>+            ANGLE_TRY(mRenderer->allocateResource(GetImplAs<Context11>(context), dsvDesc,
>+                                                  texture->get(), &dsv));
>+            dsv.setDebugName("TexStorage2DMSArray.RenderTargetDSV");
>+
>+            mRenderTargets[key].reset(new TextureRenderTarget11(
>+                std::move(dsv), *texture, srv, mFormatInfo.internalFormat, getFormatSet(),
>+                getLevelWidth(mipLevel), getLevelHeight(mipLevel), 1, mSamples));
>+        }
>+    }
>+
>+    ASSERT(outRT);
>+    *outRT = mRenderTargets[key].get();
>+    return angle::Result::Continue;
>+}
>+
>+angle::Result TextureStorage11_2DMultisampleArray::createSRVForSampler(
>+    const gl::Context *context,
>+    int baseLevel,
>+    int mipLevels,
>+    DXGI_FORMAT format,
>+    const TextureHelper11 &texture,
>+    d3d11::SharedSRV *outSRV)
>+{
>+    ASSERT(outSRV);
>+
>+    D3D11_SHADER_RESOURCE_VIEW_DESC srvDesc;
>+    srvDesc.Format                           = format;
>+    srvDesc.ViewDimension                    = D3D11_SRV_DIMENSION_TEXTURE2DMSARRAY;
>+    srvDesc.Texture2DMSArray.FirstArraySlice = 0;
>+    srvDesc.Texture2DMSArray.ArraySize       = mTextureDepth;
>+
>+    ANGLE_TRY(
>+        mRenderer->allocateResource(GetImplAs<Context11>(context), srvDesc, texture.get(), outSRV));
>+    outSRV->setDebugName("TexStorage2DMSArray.SRV");
>+    return angle::Result::Continue;
>+}
>+
>+angle::Result TextureStorage11_2DMultisampleArray::getSwizzleTexture(
>+    const gl::Context *context,
>+    const TextureHelper11 **outTexture)
>+{
>+    ANGLE_HR_UNREACHABLE(GetImplAs<Context11>(context));
>+    return angle::Result::Stop;
>+}
>+
>+angle::Result TextureStorage11_2DMultisampleArray::getSwizzleRenderTarget(
>+    const gl::Context *context,
>+    int mipLevel,
>+    const d3d11::RenderTargetView **outRTV)
>+{
>+    ANGLE_HR_UNREACHABLE(GetImplAs<Context11>(context));
>+    return angle::Result::Stop;
>+}
>+
>+angle::Result TextureStorage11_2DMultisampleArray::ensureDropStencilTexture(
>+    const gl::Context *context,
>+    DropStencil *dropStencilOut)
>+{
>+    ANGLE_HR_UNREACHABLE(GetImplAs<Context11>(context));
>+    return angle::Result::Stop;
> }
> 
> }  // namespace rx
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/TextureStorage11.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/TextureStorage11.h
>index 336aa495a87..f49bd08acdf 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/TextureStorage11.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/TextureStorage11.h
>@@ -5,7 +5,8 @@
> //
> 
> // TextureStorage11.h: Defines the abstract rx::TextureStorage11 class and its concrete derived
>-// classes TextureStorage11_2D and TextureStorage11_Cube, which act as the interface to the D3D11 texture.
>+// classes TextureStorage11_2D and TextureStorage11_Cube, which act as the interface to the D3D11
>+// texture.
> 
> #ifndef LIBANGLE_RENDERER_D3D_D3D11_TEXTURESTORAGE11_H_
> #define LIBANGLE_RENDERER_D3D_D3D11_TEXTURESTORAGE11_H_
>@@ -21,8 +22,8 @@
> 
> namespace gl
> {
>-struct ImageIndex;
>-}
>+class ImageIndex;
>+}  // namespace gl
> 
> namespace rx
> {
>@@ -35,41 +36,44 @@ class Image11;
> struct Renderer11DeviceCaps;
> 
> template <typename T>
>-using TexLevelArray = std::array<T, gl::IMPLEMENTATION_MAX_TEXTURE_LEVELS>;
>-
>-template <typename T>
>-using CubeFaceArray = std::array<T, gl::CUBE_FACE_COUNT>;
>+using CubeFaceArray = std::array<T, gl::kCubeFaceCount>;
> 
> class TextureStorage11 : public TextureStorage
> {
>   public:
>     ~TextureStorage11() override;
> 
>-    static DWORD GetTextureBindFlags(GLenum internalFormat, const Renderer11DeviceCaps &renderer11DeviceCaps, bool renderTarget);
>-    static DWORD GetTextureMiscFlags(GLenum internalFormat, const Renderer11DeviceCaps &renderer11DeviceCaps, bool renderTarget, int levels);
>+    static DWORD GetTextureBindFlags(GLenum internalFormat,
>+                                     const Renderer11DeviceCaps &renderer11DeviceCaps,
>+                                     bool renderTarget);
>+    static DWORD GetTextureMiscFlags(GLenum internalFormat,
>+                                     const Renderer11DeviceCaps &renderer11DeviceCaps,
>+                                     bool renderTarget,
>+                                     int levels);
> 
>     UINT getBindFlags() const;
>     UINT getMiscFlags() const;
>     const d3d11::Format &getFormatSet() const;
>-    gl::Error getSRVLevels(const gl::Context *context,
>-                           GLint baseLevel,
>-                           GLint maxLevel,
>-                           const d3d11::SharedSRV **outSRV);
>-    gl::Error generateSwizzles(const gl::Context *context, const gl::SwizzleState &swizzleTarget);
>+    angle::Result getSRVLevels(const gl::Context *context,
>+                               GLint baseLevel,
>+                               GLint maxLevel,
>+                               const d3d11::SharedSRV **outSRV);
>+    angle::Result generateSwizzles(const gl::Context *context,
>+                                   const gl::SwizzleState &swizzleTarget);
>     void markLevelDirty(int mipLevel);
>     void markDirty();
> 
>-    gl::Error updateSubresourceLevel(const gl::Context *context,
>-                                     const TextureHelper11 &texture,
>-                                     unsigned int sourceSubresource,
>-                                     const gl::ImageIndex &index,
>-                                     const gl::Box &copyArea);
>+    angle::Result updateSubresourceLevel(const gl::Context *context,
>+                                         const TextureHelper11 &texture,
>+                                         unsigned int sourceSubresource,
>+                                         const gl::ImageIndex &index,
>+                                         const gl::Box &copyArea);
> 
>-    gl::Error copySubresourceLevel(const gl::Context *context,
>-                                   const TextureHelper11 &dstTexture,
>-                                   unsigned int dstSubresource,
>-                                   const gl::ImageIndex &index,
>-                                   const gl::Box &region);
>+    angle::Result copySubresourceLevel(const gl::Context *context,
>+                                       const TextureHelper11 &dstTexture,
>+                                       unsigned int dstSubresource,
>+                                       const gl::ImageIndex &index,
>+                                       const gl::Box &region);
> 
>     // TextureStorage virtual functions
>     int getTopLevel() const override;
>@@ -77,31 +81,41 @@ class TextureStorage11 : public TextureStorage
>     bool isManaged() const override;
>     bool supportsNativeMipmapFunction() const override;
>     int getLevelCount() const override;
>-    gl::Error generateMipmap(const gl::Context *context,
>-                             const gl::ImageIndex &sourceIndex,
>-                             const gl::ImageIndex &destIndex) override;
>-    gl::Error copyToStorage(const gl::Context *context, TextureStorage *destStorage) override;
>-    gl::Error setData(const gl::Context *context,
>-                      const gl::ImageIndex &index,
>-                      ImageD3D *image,
>-                      const gl::Box *destBox,
>-                      GLenum type,
>-                      const gl::PixelUnpackState &unpack,
>-                      const uint8_t *pixelData) override;
>-
>-    virtual gl::Error getSRV(const gl::Context *context,
>-                             const gl::TextureState &textureState,
>-                             const d3d11::SharedSRV **outSRV);
>-    virtual UINT getSubresourceIndex(const gl::ImageIndex &index) const;
>-    virtual gl::Error getResource(const gl::Context *context,
>-                                  const TextureHelper11 **outResource) = 0;
>-    virtual void associateImage(Image11* image, const gl::ImageIndex &index) = 0;
>-    virtual void disassociateImage(const gl::ImageIndex &index, Image11* expectedImage) = 0;
>+    angle::Result generateMipmap(const gl::Context *context,
>+                                 const gl::ImageIndex &sourceIndex,
>+                                 const gl::ImageIndex &destIndex) override;
>+    angle::Result copyToStorage(const gl::Context *context, TextureStorage *destStorage) override;
>+    angle::Result setData(const gl::Context *context,
>+                          const gl::ImageIndex &index,
>+                          ImageD3D *image,
>+                          const gl::Box *destBox,
>+                          GLenum type,
>+                          const gl::PixelUnpackState &unpack,
>+                          const uint8_t *pixelData) override;
>+    void invalidateTextures() override;
>+
>+    virtual angle::Result getSRVForSampler(const gl::Context *context,
>+                                           const gl::TextureState &textureState,
>+                                           const gl::SamplerState &sampler,
>+                                           const d3d11::SharedSRV **outSRV);
>+    angle::Result getSRVForImage(const gl::Context *context,
>+                                 const gl::ImageUnit &imageUnit,
>+                                 const d3d11::SharedSRV **outSRV);
>+    angle::Result getUAVForImage(const gl::Context *context,
>+                                 const gl::ImageUnit &imageUnit,
>+                                 const d3d11::SharedUAV **outUAV);
>+    virtual angle::Result getSubresourceIndex(const gl::Context *context,
>+                                              const gl::ImageIndex &index,
>+                                              UINT *outSubresourceIndex) const;
>+    virtual angle::Result getResource(const gl::Context *context,
>+                                      const TextureHelper11 **outResource)              = 0;
>+    virtual void associateImage(Image11 *image, const gl::ImageIndex &index)            = 0;
>+    virtual void disassociateImage(const gl::ImageIndex &index, Image11 *expectedImage) = 0;
>     virtual void verifyAssociatedImageValid(const gl::ImageIndex &index,
>-                                            Image11 *expectedImage) = 0;
>-    virtual gl::Error releaseAssociatedImage(const gl::Context *context,
>-                                             const gl::ImageIndex &index,
>-                                             Image11 *incomingImage) = 0;
>+                                            Image11 *expectedImage)                     = 0;
>+    virtual angle::Result releaseAssociatedImage(const gl::Context *context,
>+                                                 const gl::ImageIndex &index,
>+                                                 Image11 *incomingImage)                = 0;
> 
>   protected:
>     TextureStorage11(Renderer11 *renderer, UINT bindFlags, UINT miscFlags, GLenum internalFormat);
>@@ -110,16 +124,18 @@ class TextureStorage11 : public TextureStorage
>     int getLevelDepth(int mipLevel) const;
> 
>     // Some classes (e.g. TextureStorage11_2D) will override getMippedResource.
>-    virtual gl::Error getMippedResource(const gl::Context *context,
>-                                        const TextureHelper11 **outResource);
>-
>-    virtual gl::Error getSwizzleTexture(const TextureHelper11 **outTexture) = 0;
>-    virtual gl::Error getSwizzleRenderTarget(int mipLevel,
>-                                             const d3d11::RenderTargetView **outRTV) = 0;
>-    gl::Error getSRVLevel(const gl::Context *context,
>-                          int mipLevel,
>-                          bool blitSRV,
>-                          const d3d11::SharedSRV **outSRV);
>+    virtual angle::Result getMippedResource(const gl::Context *context,
>+                                            const TextureHelper11 **outResource);
>+
>+    virtual angle::Result getSwizzleTexture(const gl::Context *context,
>+                                            const TextureHelper11 **outTexture)          = 0;
>+    virtual angle::Result getSwizzleRenderTarget(const gl::Context *context,
>+                                                 int mipLevel,
>+                                                 const d3d11::RenderTargetView **outRTV) = 0;
>+    angle::Result getSRVLevel(const gl::Context *context,
>+                              int mipLevel,
>+                              bool blitSRV,
>+                              const d3d11::SharedSRV **outSRV);
> 
>     // Get a version of a depth texture with only depth information, not stencil.
>     enum DropStencil
>@@ -127,16 +143,28 @@ class TextureStorage11 : public TextureStorage
>         CREATED,
>         ALREADY_EXISTS
>     };
>-    virtual gl::ErrorOrResult<DropStencil> ensureDropStencilTexture(const gl::Context *context);
>-    gl::Error initDropStencilTexture(const gl::Context *context, const gl::ImageIndexIterator &it);
>+    virtual angle::Result ensureDropStencilTexture(const gl::Context *context,
>+                                                   DropStencil *dropStencilOut);
>+    angle::Result initDropStencilTexture(const gl::Context *context,
>+                                         const gl::ImageIndexIterator &it);
> 
>     // The baseLevel parameter should *not* have mTopLevel applied.
>-    virtual gl::Error createSRV(const gl::Context *context,
>-                                int baseLevel,
>-                                int mipLevels,
>-                                DXGI_FORMAT format,
>-                                const TextureHelper11 &texture,
>-                                d3d11::SharedSRV *outSRV) = 0;
>+    virtual angle::Result createSRVForSampler(const gl::Context *context,
>+                                              int baseLevel,
>+                                              int mipLevels,
>+                                              DXGI_FORMAT format,
>+                                              const TextureHelper11 &texture,
>+                                              d3d11::SharedSRV *outSRV) = 0;
>+    virtual angle::Result createSRVForImage(const gl::Context *context,
>+                                            int level,
>+                                            DXGI_FORMAT format,
>+                                            const TextureHelper11 &texture,
>+                                            d3d11::SharedSRV *outSRV)   = 0;
>+    virtual angle::Result createUAVForImage(const gl::Context *context,
>+                                            int level,
>+                                            DXGI_FORMAT format,
>+                                            const TextureHelper11 &texture,
>+                                            d3d11::SharedUAV *outUAV)   = 0;
> 
>     void verifySwizzleExists(const gl::SwizzleState &swizzleState);
> 
>@@ -152,101 +180,150 @@ class TextureStorage11 : public TextureStorage
>     unsigned int mTextureHeight;
>     unsigned int mTextureDepth;
> 
>-    TexLevelArray<gl::SwizzleState> mSwizzleCache;
>+    gl::TexLevelArray<gl::SwizzleState> mSwizzleCache;
>     TextureHelper11 mDropStencilTexture;
> 
>   private:
>     const UINT mBindFlags;
>     const UINT mMiscFlags;
> 
>-    struct SRVKey
>+    struct SamplerKey
>     {
>-        SRVKey(int baseLevel, int mipLevels, bool swizzle, bool dropStencil);
>+        SamplerKey();
>+        SamplerKey(int baseLevel, int mipLevels, bool swizzle, bool dropStencil);
> 
>-        bool operator<(const SRVKey &rhs) const;
>+        bool operator<(const SamplerKey &rhs) const;
> 
>-        int baseLevel    = 0;  // Without mTopLevel applied.
>-        int mipLevels    = 0;
>-        bool swizzle     = false;
>-        bool dropStencil = false;
>+        int baseLevel;
>+        int mipLevels;
>+        bool swizzle;
>+        bool dropStencil;
>     };
>-    typedef std::map<SRVKey, d3d11::SharedSRV> SRVCache;
> 
>-    gl::Error getCachedOrCreateSRV(const gl::Context *context,
>-                                   const SRVKey &key,
>-                                   const d3d11::SharedSRV **outSRV);
>+    angle::Result getCachedOrCreateSRVForSampler(const gl::Context *context,
>+                                                 const SamplerKey &key,
>+                                                 const d3d11::SharedSRV **outSRV);
>+
>+    using SRVCacheForSampler = std::map<SamplerKey, d3d11::SharedSRV>;
>+    SRVCacheForSampler mSrvCacheForSampler;
> 
>-    SRVCache mSrvCache;
>-    TexLevelArray<d3d11::SharedSRV> mLevelSRVs;
>-    TexLevelArray<d3d11::SharedSRV> mLevelBlitSRVs;
>+    struct ImageKey
>+    {
>+        ImageKey();
>+        ImageKey(int level, bool layered, int layer, GLenum access, GLenum format);
>+        bool operator<(const ImageKey &rhs) const;
>+        int level;
>+        bool layered;
>+        int layer;
>+        GLenum access;
>+        GLenum format;
>+    };
>+
>+    angle::Result getCachedOrCreateSRVForImage(const gl::Context *context,
>+                                               const ImageKey &key,
>+                                               const d3d11::SharedSRV **outSRV);
>+    angle::Result getCachedOrCreateUAVForImage(const gl::Context *context,
>+                                               const ImageKey &key,
>+                                               const d3d11::SharedUAV **outUAV);
>+
>+    using SRVCacheForImage = std::map<ImageKey, d3d11::SharedSRV>;
>+    SRVCacheForImage mSrvCacheForImage;
>+    using UAVCacheForImage = std::map<ImageKey, d3d11::SharedUAV>;
>+    UAVCacheForImage mUavCacheForImage;
>+
>+    gl::TexLevelArray<d3d11::SharedSRV> mLevelSRVs;
>+    gl::TexLevelArray<d3d11::SharedSRV> mLevelBlitSRVs;
> };
> 
> class TextureStorage11_2D : public TextureStorage11
> {
>   public:
>     TextureStorage11_2D(Renderer11 *renderer, SwapChain11 *swapchain);
>-    TextureStorage11_2D(Renderer11 *renderer, GLenum internalformat, bool renderTarget, GLsizei width, GLsizei height, int levels, bool hintLevelZeroOnly = false);
>+    TextureStorage11_2D(Renderer11 *renderer,
>+                        GLenum internalformat,
>+                        bool renderTarget,
>+                        GLsizei width,
>+                        GLsizei height,
>+                        int levels,
>+                        bool hintLevelZeroOnly = false);
>     ~TextureStorage11_2D() override;
> 
>-    gl::Error onDestroy(const gl::Context *context) override;
>+    angle::Result onDestroy(const gl::Context *context) override;
> 
>-    gl::Error getResource(const gl::Context *context, const TextureHelper11 **outResource) override;
>-    gl::Error getMippedResource(const gl::Context *context,
>-                                const TextureHelper11 **outResource) override;
>-    gl::Error getRenderTarget(const gl::Context *context,
>-                              const gl::ImageIndex &index,
>-                              RenderTargetD3D **outRT) override;
>+    angle::Result getResource(const gl::Context *context,
>+                              const TextureHelper11 **outResource) override;
>+    angle::Result getMippedResource(const gl::Context *context,
>+                                    const TextureHelper11 **outResource) override;
>+    angle::Result getRenderTarget(const gl::Context *context,
>+                                  const gl::ImageIndex &index,
>+                                  RenderTargetD3D **outRT) override;
> 
>-    gl::Error copyToStorage(const gl::Context *context, TextureStorage *destStorage) override;
>+    angle::Result copyToStorage(const gl::Context *context, TextureStorage *destStorage) override;
> 
>     void associateImage(Image11 *image, const gl::ImageIndex &index) override;
>     void disassociateImage(const gl::ImageIndex &index, Image11 *expectedImage) override;
>     void verifyAssociatedImageValid(const gl::ImageIndex &index, Image11 *expectedImage) override;
>-    gl::Error releaseAssociatedImage(const gl::Context *context,
>-                                     const gl::ImageIndex &index,
>-                                     Image11 *incomingImage) override;
>+    angle::Result releaseAssociatedImage(const gl::Context *context,
>+                                         const gl::ImageIndex &index,
>+                                         Image11 *incomingImage) override;
> 
>-    gl::Error useLevelZeroWorkaroundTexture(const gl::Context *context,
>-                                            bool useLevelZeroTexture) override;
>+    angle::Result useLevelZeroWorkaroundTexture(const gl::Context *context,
>+                                                bool useLevelZeroTexture) override;
> 
>   protected:
>-    gl::Error getSwizzleTexture(const TextureHelper11 **outTexture) override;
>-    gl::Error getSwizzleRenderTarget(int mipLevel, const d3d11::RenderTargetView **outRTV) override;
>+    angle::Result getSwizzleTexture(const gl::Context *context,
>+                                    const TextureHelper11 **outTexture) override;
>+    angle::Result getSwizzleRenderTarget(const gl::Context *context,
>+                                         int mipLevel,
>+                                         const d3d11::RenderTargetView **outRTV) override;
> 
>-    gl::ErrorOrResult<DropStencil> ensureDropStencilTexture(const gl::Context *context) override;
>+    angle::Result ensureDropStencilTexture(const gl::Context *context,
>+                                           DropStencil *dropStencilOut) override;
> 
>-    gl::Error ensureTextureExists(int mipLevels);
>+    angle::Result ensureTextureExists(const gl::Context *context, int mipLevels);
> 
>   private:
>-    gl::Error createSRV(const gl::Context *context,
>-                        int baseLevel,
>-                        int mipLevels,
>-                        DXGI_FORMAT format,
>-                        const TextureHelper11 &texture,
>-                        d3d11::SharedSRV *outSRV) override;
>+    angle::Result createSRVForSampler(const gl::Context *context,
>+                                      int baseLevel,
>+                                      int mipLevels,
>+                                      DXGI_FORMAT format,
>+                                      const TextureHelper11 &texture,
>+                                      d3d11::SharedSRV *outSRV) override;
>+    angle::Result createSRVForImage(const gl::Context *context,
>+                                    int level,
>+                                    DXGI_FORMAT format,
>+                                    const TextureHelper11 &texture,
>+                                    d3d11::SharedSRV *outSRV) override;
>+    angle::Result createUAVForImage(const gl::Context *context,
>+                                    int level,
>+                                    DXGI_FORMAT format,
>+                                    const TextureHelper11 &texture,
>+                                    d3d11::SharedUAV *outUAV) override;
> 
>     TextureHelper11 mTexture;
>-    TexLevelArray<std::unique_ptr<RenderTarget11>> mRenderTarget;
>+    gl::TexLevelArray<std::unique_ptr<RenderTarget11>> mRenderTarget;
>     bool mHasKeyedMutex;
> 
>     // These are members related to the zero max-LOD workaround.
>-    // D3D11 Feature Level 9_3 can't disable mipmaps on a mipmapped texture (i.e. solely sample from level zero).
>-    // These members are used to work around this limitation.
>-    // Usually only mTexture XOR mLevelZeroTexture will exist.
>-    // For example, if an app creates a texture with only one level, then 9_3 will only create mLevelZeroTexture.
>-    // However, in some scenarios, both textures have to be created. This incurs additional memory overhead.
>-    // One example of this is an application that creates a texture, calls glGenerateMipmap, and then disables mipmaps on the texture.
>-    // A more likely example is an app that creates an empty texture, renders to it, and then calls glGenerateMipmap
>-    // TODO: In this rendering scenario, release the mLevelZeroTexture after mTexture has been created to save memory.
>+    // D3D11 Feature Level 9_3 can't disable mipmaps on a mipmapped texture (i.e. solely sample from
>+    // level zero). These members are used to work around this limitation. Usually only mTexture XOR
>+    // mLevelZeroTexture will exist. For example, if an app creates a texture with only one level,
>+    // then 9_3 will only create mLevelZeroTexture. However, in some scenarios, both textures have
>+    // to be created. This incurs additional memory overhead. One example of this is an application
>+    // that creates a texture, calls glGenerateMipmap, and then disables mipmaps on the texture. A
>+    // more likely example is an app that creates an empty texture, renders to it, and then calls
>+    // glGenerateMipmap
>+    // TODO: In this rendering scenario, release the mLevelZeroTexture after mTexture has been
>+    // created to save memory.
>     TextureHelper11 mLevelZeroTexture;
>     std::unique_ptr<RenderTarget11> mLevelZeroRenderTarget;
>     bool mUseLevelZeroTexture;
> 
>     // Swizzle-related variables
>     TextureHelper11 mSwizzleTexture;
>-    TexLevelArray<d3d11::RenderTargetView> mSwizzleRenderTargets;
>+    gl::TexLevelArray<d3d11::RenderTargetView> mSwizzleRenderTargets;
> 
>-    TexLevelArray<Image11 *> mAssociatedImages;
>+    gl::TexLevelArray<Image11 *> mAssociatedImages;
> };
> 
> class TextureStorage11_External : public TextureStorage11
>@@ -257,35 +334,49 @@ class TextureStorage11_External : public TextureStorage11
>                               const egl::Stream::GLTextureDescription &glDesc);
>     ~TextureStorage11_External() override;
> 
>-    gl::Error onDestroy(const gl::Context *context) override;
>+    angle::Result onDestroy(const gl::Context *context) override;
> 
>-    gl::Error getResource(const gl::Context *context, const TextureHelper11 **outResource) override;
>-    gl::Error getMippedResource(const gl::Context *context,
>-                                const TextureHelper11 **outResource) override;
>-    gl::Error getRenderTarget(const gl::Context *context,
>-                              const gl::ImageIndex &index,
>-                              RenderTargetD3D **outRT) override;
>+    angle::Result getResource(const gl::Context *context,
>+                              const TextureHelper11 **outResource) override;
>+    angle::Result getMippedResource(const gl::Context *context,
>+                                    const TextureHelper11 **outResource) override;
>+    angle::Result getRenderTarget(const gl::Context *context,
>+                                  const gl::ImageIndex &index,
>+                                  RenderTargetD3D **outRT) override;
> 
>-    gl::Error copyToStorage(const gl::Context *context, TextureStorage *destStorage) override;
>+    angle::Result copyToStorage(const gl::Context *context, TextureStorage *destStorage) override;
> 
>     void associateImage(Image11 *image, const gl::ImageIndex &index) override;
>     void disassociateImage(const gl::ImageIndex &index, Image11 *expectedImage) override;
>     void verifyAssociatedImageValid(const gl::ImageIndex &index, Image11 *expectedImage) override;
>-    gl::Error releaseAssociatedImage(const gl::Context *context,
>-                                     const gl::ImageIndex &index,
>-                                     Image11 *incomingImage) override;
>+    angle::Result releaseAssociatedImage(const gl::Context *context,
>+                                         const gl::ImageIndex &index,
>+                                         Image11 *incomingImage) override;
> 
>   protected:
>-    gl::Error getSwizzleTexture(const TextureHelper11 **outTexture) override;
>-    gl::Error getSwizzleRenderTarget(int mipLevel, const d3d11::RenderTargetView **outRTV) override;
>+    angle::Result getSwizzleTexture(const gl::Context *context,
>+                                    const TextureHelper11 **outTexture) override;
>+    angle::Result getSwizzleRenderTarget(const gl::Context *context,
>+                                         int mipLevel,
>+                                         const d3d11::RenderTargetView **outRTV) override;
> 
>   private:
>-    gl::Error createSRV(const gl::Context *context,
>-                        int baseLevel,
>-                        int mipLevels,
>-                        DXGI_FORMAT format,
>-                        const TextureHelper11 &texture,
>-                        d3d11::SharedSRV *outSRV) override;
>+    angle::Result createSRVForSampler(const gl::Context *context,
>+                                      int baseLevel,
>+                                      int mipLevels,
>+                                      DXGI_FORMAT format,
>+                                      const TextureHelper11 &texture,
>+                                      d3d11::SharedSRV *outSRV) override;
>+    angle::Result createSRVForImage(const gl::Context *context,
>+                                    int level,
>+                                    DXGI_FORMAT format,
>+                                    const TextureHelper11 &texture,
>+                                    d3d11::SharedSRV *outSRV) override;
>+    angle::Result createUAVForImage(const gl::Context *context,
>+                                    int level,
>+                                    DXGI_FORMAT format,
>+                                    const TextureHelper11 &texture,
>+                                    d3d11::SharedUAV *outUAV) override;
> 
>     TextureHelper11 mTexture;
>     int mSubresourceIndex;
>@@ -294,53 +385,83 @@ class TextureStorage11_External : public TextureStorage11
>     Image11 *mAssociatedImage;
> };
> 
>-class TextureStorage11_EGLImage final : public TextureStorage11
>+// A base class for texture storage classes where the associated images are not changed, nor are
>+// they accessible as images in GLES3.1+ shaders.
>+class TextureStorage11ImmutableBase : public TextureStorage11
> {
>   public:
>-    TextureStorage11_EGLImage(Renderer11 *renderer,
>-                              EGLImageD3D *eglImage,
>-                              RenderTarget11 *renderTarget11);
>-    ~TextureStorage11_EGLImage() override;
>-
>-    gl::Error getResource(const gl::Context *context, const TextureHelper11 **outResource) override;
>-    gl::Error getSRV(const gl::Context *context,
>-                     const gl::TextureState &textureState,
>-                     const d3d11::SharedSRV **outSRV) override;
>-    gl::Error getMippedResource(const gl::Context *context,
>-                                const TextureHelper11 **outResource) override;
>-    gl::Error getRenderTarget(const gl::Context *context,
>-                              const gl::ImageIndex &index,
>-                              RenderTargetD3D **outRT) override;
>-
>-    gl::Error copyToStorage(const gl::Context *context, TextureStorage *destStorage) override;
>+    TextureStorage11ImmutableBase(Renderer11 *renderer,
>+                                  UINT bindFlags,
>+                                  UINT miscFlags,
>+                                  GLenum internalFormat);
> 
>     void associateImage(Image11 *image, const gl::ImageIndex &index) override;
>     void disassociateImage(const gl::ImageIndex &index, Image11 *expectedImage) override;
>     void verifyAssociatedImageValid(const gl::ImageIndex &index, Image11 *expectedImage) override;
>-    gl::Error releaseAssociatedImage(const gl::Context *context,
>-                                     const gl::ImageIndex &index,
>-                                     Image11 *incomingImage) override;
>+    angle::Result releaseAssociatedImage(const gl::Context *context,
>+                                         const gl::ImageIndex &index,
>+                                         Image11 *incomingImage) override;
>+
>+    angle::Result createSRVForImage(const gl::Context *context,
>+                                    int level,
>+                                    DXGI_FORMAT format,
>+                                    const TextureHelper11 &texture,
>+                                    d3d11::SharedSRV *outSRV) override;
>+    angle::Result createUAVForImage(const gl::Context *context,
>+                                    int level,
>+                                    DXGI_FORMAT format,
>+                                    const TextureHelper11 &texture,
>+                                    d3d11::SharedUAV *outUAV) override;
>+};
> 
>-    gl::Error useLevelZeroWorkaroundTexture(const gl::Context *context,
>-                                            bool useLevelZeroTexture) override;
>+class TextureStorage11_EGLImage final : public TextureStorage11ImmutableBase
>+{
>+  public:
>+    TextureStorage11_EGLImage(Renderer11 *renderer,
>+                              EGLImageD3D *eglImage,
>+                              RenderTarget11 *renderTarget11);
>+    ~TextureStorage11_EGLImage() override;
>+
>+    angle::Result getSubresourceIndex(const gl::Context *context,
>+                                      const gl::ImageIndex &index,
>+                                      UINT *outSubresourceIndex) const override;
>+    angle::Result getResource(const gl::Context *context,
>+                              const TextureHelper11 **outResource) override;
>+    angle::Result getSRVForSampler(const gl::Context *context,
>+                                   const gl::TextureState &textureState,
>+                                   const gl::SamplerState &sampler,
>+                                   const d3d11::SharedSRV **outSRV) override;
>+    angle::Result getMippedResource(const gl::Context *context,
>+                                    const TextureHelper11 **outResource) override;
>+    angle::Result getRenderTarget(const gl::Context *context,
>+                                  const gl::ImageIndex &index,
>+                                  RenderTargetD3D **outRT) override;
>+
>+    angle::Result copyToStorage(const gl::Context *context, TextureStorage *destStorage) override;
>+
>+    angle::Result useLevelZeroWorkaroundTexture(const gl::Context *context,
>+                                                bool useLevelZeroTexture) override;
> 
>   protected:
>-    gl::Error getSwizzleTexture(const TextureHelper11 **outTexture) override;
>-    gl::Error getSwizzleRenderTarget(int mipLevel, const d3d11::RenderTargetView **outRTV) override;
>+    angle::Result getSwizzleTexture(const gl::Context *context,
>+                                    const TextureHelper11 **outTexture) override;
>+    angle::Result getSwizzleRenderTarget(const gl::Context *context,
>+                                         int mipLevel,
>+                                         const d3d11::RenderTargetView **outRTV) override;
> 
>   private:
>     // Check if the EGL image's render target has been updated due to orphaning and delete
>     // any SRVs and other resources based on the image's old render target.
>-    gl::Error checkForUpdatedRenderTarget(const gl::Context *context);
>+    angle::Result checkForUpdatedRenderTarget(const gl::Context *context);
> 
>-    gl::Error createSRV(const gl::Context *context,
>-                        int baseLevel,
>-                        int mipLevels,
>-                        DXGI_FORMAT format,
>-                        const TextureHelper11 &texture,
>-                        d3d11::SharedSRV *outSRV) override;
>+    angle::Result createSRVForSampler(const gl::Context *context,
>+                                      int baseLevel,
>+                                      int mipLevels,
>+                                      DXGI_FORMAT format,
>+                                      const TextureHelper11 &texture,
>+                                      d3d11::SharedSRV *outSRV) override;
> 
>-    gl::Error getImageRenderTarget(const gl::Context *context, RenderTarget11 **outRT) const;
>+    angle::Result getImageRenderTarget(const gl::Context *context, RenderTarget11 **outRT) const;
> 
>     EGLImageD3D *mImage;
>     uintptr_t mCurrentRenderTarget;
>@@ -353,147 +474,188 @@ class TextureStorage11_EGLImage final : public TextureStorage11
> class TextureStorage11_Cube : public TextureStorage11
> {
>   public:
>-    TextureStorage11_Cube(Renderer11 *renderer, GLenum internalformat, bool renderTarget, int size, int levels, bool hintLevelZeroOnly);
>+    TextureStorage11_Cube(Renderer11 *renderer,
>+                          GLenum internalformat,
>+                          bool renderTarget,
>+                          int size,
>+                          int levels,
>+                          bool hintLevelZeroOnly);
>     ~TextureStorage11_Cube() override;
> 
>-    gl::Error onDestroy(const gl::Context *context) override;
>+    angle::Result onDestroy(const gl::Context *context) override;
> 
>-    UINT getSubresourceIndex(const gl::ImageIndex &index) const override;
>+    angle::Result getSubresourceIndex(const gl::Context *context,
>+                                      const gl::ImageIndex &index,
>+                                      UINT *outSubresourceIndex) const override;
> 
>-    gl::Error getResource(const gl::Context *context, const TextureHelper11 **outResource) override;
>-    gl::Error getMippedResource(const gl::Context *context,
>-                                const TextureHelper11 **outResource) override;
>-    gl::Error getRenderTarget(const gl::Context *context,
>-                              const gl::ImageIndex &index,
>-                              RenderTargetD3D **outRT) override;
>+    angle::Result getResource(const gl::Context *context,
>+                              const TextureHelper11 **outResource) override;
>+    angle::Result getMippedResource(const gl::Context *context,
>+                                    const TextureHelper11 **outResource) override;
>+    angle::Result getRenderTarget(const gl::Context *context,
>+                                  const gl::ImageIndex &index,
>+                                  RenderTargetD3D **outRT) override;
> 
>-    gl::Error copyToStorage(const gl::Context *context, TextureStorage *destStorage) override;
>+    angle::Result copyToStorage(const gl::Context *context, TextureStorage *destStorage) override;
> 
>     void associateImage(Image11 *image, const gl::ImageIndex &index) override;
>     void disassociateImage(const gl::ImageIndex &index, Image11 *expectedImage) override;
>     void verifyAssociatedImageValid(const gl::ImageIndex &index, Image11 *expectedImage) override;
>-    gl::Error releaseAssociatedImage(const gl::Context *context,
>-                                     const gl::ImageIndex &index,
>-                                     Image11 *incomingImage) override;
>+    angle::Result releaseAssociatedImage(const gl::Context *context,
>+                                         const gl::ImageIndex &index,
>+                                         Image11 *incomingImage) override;
> 
>-    gl::Error useLevelZeroWorkaroundTexture(const gl::Context *context,
>-                                            bool useLevelZeroTexture) override;
>+    angle::Result useLevelZeroWorkaroundTexture(const gl::Context *context,
>+                                                bool useLevelZeroTexture) override;
> 
>   protected:
>-    gl::Error getSwizzleTexture(const TextureHelper11 **outTexture) override;
>-    gl::Error getSwizzleRenderTarget(int mipLevel, const d3d11::RenderTargetView **outRTV) override;
>+    angle::Result getSwizzleTexture(const gl::Context *context,
>+                                    const TextureHelper11 **outTexture) override;
>+    angle::Result getSwizzleRenderTarget(const gl::Context *context,
>+                                         int mipLevel,
>+                                         const d3d11::RenderTargetView **outRTV) override;
> 
>-    gl::ErrorOrResult<DropStencil> ensureDropStencilTexture(const gl::Context *context) override;
>+    angle::Result ensureDropStencilTexture(const gl::Context *context,
>+                                           DropStencil *dropStencilOut) override;
> 
>-    gl::Error ensureTextureExists(int mipLevels);
>+    angle::Result ensureTextureExists(const gl::Context *context, int mipLevels);
> 
>   private:
>-    gl::Error createSRV(const gl::Context *context,
>-                        int baseLevel,
>-                        int mipLevels,
>-                        DXGI_FORMAT format,
>-                        const TextureHelper11 &texture,
>-                        d3d11::SharedSRV *outSRV) override;
>-    gl::Error createRenderTargetSRV(const TextureHelper11 &texture,
>-                                    const gl::ImageIndex &index,
>-                                    DXGI_FORMAT resourceFormat,
>-                                    d3d11::SharedSRV *srv) const;
>+    angle::Result createSRVForSampler(const gl::Context *context,
>+                                      int baseLevel,
>+                                      int mipLevels,
>+                                      DXGI_FORMAT format,
>+                                      const TextureHelper11 &texture,
>+                                      d3d11::SharedSRV *outSRV) override;
>+    angle::Result createSRVForImage(const gl::Context *context,
>+                                    int level,
>+                                    DXGI_FORMAT format,
>+                                    const TextureHelper11 &texture,
>+                                    d3d11::SharedSRV *outSRV) override;
>+    angle::Result createUAVForImage(const gl::Context *context,
>+                                    int level,
>+                                    DXGI_FORMAT format,
>+                                    const TextureHelper11 &texture,
>+                                    d3d11::SharedUAV *outUAV) override;
>+    angle::Result createRenderTargetSRV(const gl::Context *context,
>+                                        const TextureHelper11 &texture,
>+                                        const gl::ImageIndex &index,
>+                                        DXGI_FORMAT resourceFormat,
>+                                        d3d11::SharedSRV *srv) const;
> 
>     TextureHelper11 mTexture;
>-    CubeFaceArray<TexLevelArray<std::unique_ptr<RenderTarget11>>> mRenderTarget;
>+    CubeFaceArray<gl::TexLevelArray<std::unique_ptr<RenderTarget11>>> mRenderTarget;
> 
>-    // Level-zero workaround members. See TextureStorage11_2D's workaround members for a description.
>+    // Level-zero workaround members. See TextureStorage11_2D's workaround members for a
>+    // description.
>     TextureHelper11 mLevelZeroTexture;
>     CubeFaceArray<std::unique_ptr<RenderTarget11>> mLevelZeroRenderTarget;
>     bool mUseLevelZeroTexture;
> 
>     TextureHelper11 mSwizzleTexture;
>-    TexLevelArray<d3d11::RenderTargetView> mSwizzleRenderTargets;
>+    gl::TexLevelArray<d3d11::RenderTargetView> mSwizzleRenderTargets;
> 
>-    CubeFaceArray<TexLevelArray<Image11 *>> mAssociatedImages;
>+    CubeFaceArray<gl::TexLevelArray<Image11 *>> mAssociatedImages;
> };
> 
> class TextureStorage11_3D : public TextureStorage11
> {
>   public:
>-    TextureStorage11_3D(Renderer11 *renderer, GLenum internalformat, bool renderTarget,
>-                        GLsizei width, GLsizei height, GLsizei depth, int levels);
>+    TextureStorage11_3D(Renderer11 *renderer,
>+                        GLenum internalformat,
>+                        bool renderTarget,
>+                        GLsizei width,
>+                        GLsizei height,
>+                        GLsizei depth,
>+                        int levels);
>     ~TextureStorage11_3D() override;
> 
>-    gl::Error onDestroy(const gl::Context *context) override;
>+    angle::Result onDestroy(const gl::Context *context) override;
> 
>-    gl::Error getResource(const gl::Context *context, const TextureHelper11 **outResource) override;
>+    angle::Result getResource(const gl::Context *context,
>+                              const TextureHelper11 **outResource) override;
> 
>     // Handles both layer and non-layer RTs
>-    gl::Error getRenderTarget(const gl::Context *context,
>-                              const gl::ImageIndex &index,
>-                              RenderTargetD3D **outRT) override;
>+    angle::Result getRenderTarget(const gl::Context *context,
>+                                  const gl::ImageIndex &index,
>+                                  RenderTargetD3D **outRT) override;
> 
>     void associateImage(Image11 *image, const gl::ImageIndex &index) override;
>     void disassociateImage(const gl::ImageIndex &index, Image11 *expectedImage) override;
>     void verifyAssociatedImageValid(const gl::ImageIndex &index, Image11 *expectedImage) override;
>-    gl::Error releaseAssociatedImage(const gl::Context *context,
>-                                     const gl::ImageIndex &index,
>-                                     Image11 *incomingImage) override;
>+    angle::Result releaseAssociatedImage(const gl::Context *context,
>+                                         const gl::ImageIndex &index,
>+                                         Image11 *incomingImage) override;
> 
>   protected:
>-    gl::Error getSwizzleTexture(const TextureHelper11 **outTexture) override;
>-    gl::Error getSwizzleRenderTarget(int mipLevel, const d3d11::RenderTargetView **outRTV) override;
>+    angle::Result getSwizzleTexture(const gl::Context *context,
>+                                    const TextureHelper11 **outTexture) override;
>+    angle::Result getSwizzleRenderTarget(const gl::Context *context,
>+                                         int mipLevel,
>+                                         const d3d11::RenderTargetView **outRTV) override;
> 
>   private:
>-    gl::Error createSRV(const gl::Context *context,
>-                        int baseLevel,
>-                        int mipLevels,
>-                        DXGI_FORMAT format,
>-                        const TextureHelper11 &texture,
>-                        d3d11::SharedSRV *outSRV) override;
>+    angle::Result createSRVForSampler(const gl::Context *context,
>+                                      int baseLevel,
>+                                      int mipLevels,
>+                                      DXGI_FORMAT format,
>+                                      const TextureHelper11 &texture,
>+                                      d3d11::SharedSRV *outSRV) override;
>+    angle::Result createSRVForImage(const gl::Context *context,
>+                                    int level,
>+                                    DXGI_FORMAT format,
>+                                    const TextureHelper11 &texture,
>+                                    d3d11::SharedSRV *outSRV) override;
>+    angle::Result createUAVForImage(const gl::Context *context,
>+                                    int level,
>+                                    DXGI_FORMAT format,
>+                                    const TextureHelper11 &texture,
>+                                    d3d11::SharedUAV *outUAV) override;
> 
>     typedef std::pair<int, int> LevelLayerKey;
>     std::map<LevelLayerKey, std::unique_ptr<RenderTarget11>> mLevelLayerRenderTargets;
> 
>-    TexLevelArray<std::unique_ptr<RenderTarget11>> mLevelRenderTargets;
>+    gl::TexLevelArray<std::unique_ptr<RenderTarget11>> mLevelRenderTargets;
> 
>     TextureHelper11 mTexture;
>     TextureHelper11 mSwizzleTexture;
>-    TexLevelArray<d3d11::RenderTargetView> mSwizzleRenderTargets;
>+    gl::TexLevelArray<d3d11::RenderTargetView> mSwizzleRenderTargets;
> 
>-    TexLevelArray<Image11 *> mAssociatedImages;
>+    gl::TexLevelArray<Image11 *> mAssociatedImages;
> };
> 
> class TextureStorage11_2DArray : public TextureStorage11
> {
>   public:
>-    TextureStorage11_2DArray(Renderer11 *renderer, GLenum internalformat, bool renderTarget,
>-                             GLsizei width, GLsizei height, GLsizei depth, int levels);
>+    TextureStorage11_2DArray(Renderer11 *renderer,
>+                             GLenum internalformat,
>+                             bool renderTarget,
>+                             GLsizei width,
>+                             GLsizei height,
>+                             GLsizei depth,
>+                             int levels);
>     ~TextureStorage11_2DArray() override;
> 
>-    gl::Error onDestroy(const gl::Context *context) override;
>+    angle::Result onDestroy(const gl::Context *context) override;
> 
>-    gl::Error getResource(const gl::Context *context, const TextureHelper11 **outResource) override;
>-    gl::Error getRenderTarget(const gl::Context *context,
>-                              const gl::ImageIndex &index,
>-                              RenderTargetD3D **outRT) override;
>+    angle::Result getResource(const gl::Context *context,
>+                              const TextureHelper11 **outResource) override;
>+    angle::Result getRenderTarget(const gl::Context *context,
>+                                  const gl::ImageIndex &index,
>+                                  RenderTargetD3D **outRT) override;
> 
>     void associateImage(Image11 *image, const gl::ImageIndex &index) override;
>     void disassociateImage(const gl::ImageIndex &index, Image11 *expectedImage) override;
>     void verifyAssociatedImageValid(const gl::ImageIndex &index, Image11 *expectedImage) override;
>-    gl::Error releaseAssociatedImage(const gl::Context *context,
>-                                     const gl::ImageIndex &index,
>-                                     Image11 *incomingImage) override;
>-
>-  protected:
>-    gl::Error getSwizzleTexture(const TextureHelper11 **outTexture) override;
>-    gl::Error getSwizzleRenderTarget(int mipLevel, const d3d11::RenderTargetView **outRTV) override;
>+    angle::Result releaseAssociatedImage(const gl::Context *context,
>+                                         const gl::ImageIndex &index,
>+                                         Image11 *incomingImage) override;
> 
>-    gl::ErrorOrResult<DropStencil> ensureDropStencilTexture(const gl::Context *context) override;
>-
>-  private:
>     struct LevelLayerRangeKey
>     {
>         LevelLayerRangeKey(int mipLevelIn, int layerIn, int numLayersIn)
>             : mipLevel(mipLevelIn), layer(layerIn), numLayers(numLayersIn)
>-        {
>-        }
>+        {}
>         bool operator<(const LevelLayerRangeKey &other) const
>         {
>             if (mipLevel != other.mipLevel)
>@@ -511,30 +673,51 @@ class TextureStorage11_2DArray : public TextureStorage11
>         int numLayers;
>     };
> 
>+  protected:
>+    angle::Result getSwizzleTexture(const gl::Context *context,
>+                                    const TextureHelper11 **outTexture) override;
>+    angle::Result getSwizzleRenderTarget(const gl::Context *context,
>+                                         int mipLevel,
>+                                         const d3d11::RenderTargetView **outRTV) override;
>+
>+    angle::Result ensureDropStencilTexture(const gl::Context *context,
>+                                           DropStencil *dropStencilOut) override;
>+
>   private:
>-    gl::Error createSRV(const gl::Context *context,
>-                        int baseLevel,
>-                        int mipLevels,
>-                        DXGI_FORMAT format,
>-                        const TextureHelper11 &texture,
>-                        d3d11::SharedSRV *outSRV) override;
>-    gl::Error createRenderTargetSRV(const TextureHelper11 &texture,
>-                                    const gl::ImageIndex &index,
>-                                    DXGI_FORMAT resourceFormat,
>-                                    d3d11::SharedSRV *srv) const;
>+    angle::Result createSRVForSampler(const gl::Context *context,
>+                                      int baseLevel,
>+                                      int mipLevels,
>+                                      DXGI_FORMAT format,
>+                                      const TextureHelper11 &texture,
>+                                      d3d11::SharedSRV *outSRV) override;
>+    angle::Result createSRVForImage(const gl::Context *context,
>+                                    int level,
>+                                    DXGI_FORMAT format,
>+                                    const TextureHelper11 &texture,
>+                                    d3d11::SharedSRV *outSRV) override;
>+    angle::Result createUAVForImage(const gl::Context *context,
>+                                    int level,
>+                                    DXGI_FORMAT format,
>+                                    const TextureHelper11 &texture,
>+                                    d3d11::SharedUAV *outUAV) override;
>+    angle::Result createRenderTargetSRV(const gl::Context *context,
>+                                        const TextureHelper11 &texture,
>+                                        const gl::ImageIndex &index,
>+                                        DXGI_FORMAT resourceFormat,
>+                                        d3d11::SharedSRV *srv) const;
> 
>     std::map<LevelLayerRangeKey, std::unique_ptr<RenderTarget11>> mRenderTargets;
> 
>     TextureHelper11 mTexture;
> 
>     TextureHelper11 mSwizzleTexture;
>-    TexLevelArray<d3d11::RenderTargetView> mSwizzleRenderTargets;
>+    gl::TexLevelArray<d3d11::RenderTargetView> mSwizzleRenderTargets;
> 
>     typedef std::map<LevelLayerRangeKey, Image11 *> ImageMap;
>     ImageMap mAssociatedImages;
> };
> 
>-class TextureStorage11_2DMultisample : public TextureStorage11
>+class TextureStorage11_2DMultisample final : public TextureStorage11ImmutableBase
> {
>   public:
>     TextureStorage11_2DMultisample(Renderer11 *renderer,
>@@ -546,37 +729,35 @@ class TextureStorage11_2DMultisample : public TextureStorage11
>                                    bool fixedSampleLocations);
>     ~TextureStorage11_2DMultisample() override;
> 
>-    gl::Error onDestroy(const gl::Context *context) override;
>+    angle::Result onDestroy(const gl::Context *context) override;
> 
>-    gl::Error getResource(const gl::Context *context, const TextureHelper11 **outResource) override;
>-    gl::Error getRenderTarget(const gl::Context *context,
>-                              const gl::ImageIndex &index,
>-                              RenderTargetD3D **outRT) override;
>+    angle::Result getResource(const gl::Context *context,
>+                              const TextureHelper11 **outResource) override;
>+    angle::Result getRenderTarget(const gl::Context *context,
>+                                  const gl::ImageIndex &index,
>+                                  RenderTargetD3D **outRT) override;
> 
>-    gl::Error copyToStorage(const gl::Context *context, TextureStorage *destStorage) override;
>-
>-    void associateImage(Image11 *image, const gl::ImageIndex &index) override;
>-    void disassociateImage(const gl::ImageIndex &index, Image11 *expectedImage) override;
>-    void verifyAssociatedImageValid(const gl::ImageIndex &index, Image11 *expectedImage) override;
>-    gl::Error releaseAssociatedImage(const gl::Context *context,
>-                                     const gl::ImageIndex &index,
>-                                     Image11 *incomingImage) override;
>+    angle::Result copyToStorage(const gl::Context *context, TextureStorage *destStorage) override;
> 
>   protected:
>-    gl::Error getSwizzleTexture(const TextureHelper11 **outTexture) override;
>-    gl::Error getSwizzleRenderTarget(int mipLevel, const d3d11::RenderTargetView **outRTV) override;
>+    angle::Result getSwizzleTexture(const gl::Context *context,
>+                                    const TextureHelper11 **outTexture) override;
>+    angle::Result getSwizzleRenderTarget(const gl::Context *context,
>+                                         int mipLevel,
>+                                         const d3d11::RenderTargetView **outRTV) override;
> 
>-    gl::ErrorOrResult<DropStencil> ensureDropStencilTexture(const gl::Context *context) override;
>+    angle::Result ensureDropStencilTexture(const gl::Context *context,
>+                                           DropStencil *dropStencilOut) override;
> 
>-    gl::Error ensureTextureExists(int mipLevels);
>+    angle::Result ensureTextureExists(const gl::Context *context, int mipLevels);
> 
>   private:
>-    gl::Error createSRV(const gl::Context *context,
>-                        int baseLevel,
>-                        int mipLevels,
>-                        DXGI_FORMAT format,
>-                        const TextureHelper11 &texture,
>-                        d3d11::SharedSRV *outSRV) override;
>+    angle::Result createSRVForSampler(const gl::Context *context,
>+                                      int baseLevel,
>+                                      int mipLevels,
>+                                      DXGI_FORMAT format,
>+                                      const TextureHelper11 &texture,
>+                                      d3d11::SharedSRV *outSRV) override;
> 
>     TextureHelper11 mTexture;
>     std::unique_ptr<RenderTarget11> mRenderTarget;
>@@ -584,6 +765,63 @@ class TextureStorage11_2DMultisample : public TextureStorage11
>     unsigned int mSamples;
>     GLboolean mFixedSampleLocations;
> };
>-}
> 
>-#endif // LIBANGLE_RENDERER_D3D_D3D11_TEXTURESTORAGE11_H_
>+class TextureStorage11_2DMultisampleArray final : public TextureStorage11ImmutableBase
>+{
>+  public:
>+    TextureStorage11_2DMultisampleArray(Renderer11 *renderer,
>+                                        GLenum internalformat,
>+                                        GLsizei width,
>+                                        GLsizei height,
>+                                        GLsizei depth,
>+                                        int levels,
>+                                        int samples,
>+                                        bool fixedSampleLocations);
>+    ~TextureStorage11_2DMultisampleArray() override;
>+
>+    angle::Result onDestroy(const gl::Context *context) override;
>+
>+    angle::Result getResource(const gl::Context *context,
>+                              const TextureHelper11 **outResource) override;
>+    angle::Result getRenderTarget(const gl::Context *context,
>+                                  const gl::ImageIndex &index,
>+                                  RenderTargetD3D **outRT) override;
>+
>+    angle::Result copyToStorage(const gl::Context *context, TextureStorage *destStorage) override;
>+
>+  protected:
>+    angle::Result getSwizzleTexture(const gl::Context *context,
>+                                    const TextureHelper11 **outTexture) override;
>+    angle::Result getSwizzleRenderTarget(const gl::Context *context,
>+                                         int mipLevel,
>+                                         const d3d11::RenderTargetView **outRTV) override;
>+
>+    angle::Result ensureDropStencilTexture(const gl::Context *context,
>+                                           DropStencil *dropStencilOut) override;
>+
>+    angle::Result ensureTextureExists(const gl::Context *context, int mipLevels);
>+
>+  private:
>+    angle::Result createRenderTargetSRV(const gl::Context *context,
>+                                        const TextureHelper11 &texture,
>+                                        const gl::ImageIndex &index,
>+                                        DXGI_FORMAT resourceFormat,
>+                                        d3d11::SharedSRV *srv) const;
>+
>+    angle::Result createSRVForSampler(const gl::Context *context,
>+                                      int baseLevel,
>+                                      int mipLevels,
>+                                      DXGI_FORMAT format,
>+                                      const TextureHelper11 &texture,
>+                                      d3d11::SharedSRV *outSRV) override;
>+
>+    TextureHelper11 mTexture;
>+    std::map<TextureStorage11_2DArray::LevelLayerRangeKey, std::unique_ptr<RenderTarget11>>
>+        mRenderTargets;
>+
>+    unsigned int mSamples;
>+    GLboolean mFixedSampleLocations;
>+};
>+}  // namespace rx
>+
>+#endif  // LIBANGLE_RENDERER_D3D_D3D11_TEXTURESTORAGE11_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/TransformFeedback11.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/TransformFeedback11.cpp
>index 4b08edf71f4..d52338f3889 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/TransformFeedback11.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/TransformFeedback11.cpp
>@@ -23,14 +23,12 @@ TransformFeedback11::TransformFeedback11(const gl::TransformFeedbackState &state
>       mBuffers(state.getIndexedBuffers().size(), nullptr),
>       mBufferOffsets(state.getIndexedBuffers().size(), 0),
>       mSerial(mRenderer->generateSerial())
>-{
>-}
>+{}
> 
>-TransformFeedback11::~TransformFeedback11()
>-{
>-}
>+TransformFeedback11::~TransformFeedback11() {}
> 
>-void TransformFeedback11::begin(GLenum primitiveMode)
>+angle::Result TransformFeedback11::begin(const gl::Context *context,
>+                                         gl::PrimitiveMode primitiveMode)
> {
>     // Reset all the cached offsets to the binding offsets
>     mIsDirty = true;
>@@ -46,33 +44,48 @@ void TransformFeedback11::begin(GLenum primitiveMode)
>             mBufferOffsets[bindingIdx] = 0;
>         }
>     }
>+    mRenderer->getStateManager()->invalidateTransformFeedback();
>+    return angle::Result::Continue;
> }
> 
>-void TransformFeedback11::end()
>+angle::Result TransformFeedback11::end(const gl::Context *context)
> {
>+    mRenderer->getStateManager()->invalidateTransformFeedback();
>     if (mRenderer->getWorkarounds().flushAfterEndingTransformFeedback)
>     {
>         mRenderer->getDeviceContext()->Flush();
>     }
>+    return angle::Result::Continue;
> }
> 
>-void TransformFeedback11::pause()
>+angle::Result TransformFeedback11::pause(const gl::Context *context)
> {
>+    mRenderer->getStateManager()->invalidateTransformFeedback();
>+    return angle::Result::Continue;
> }
> 
>-void TransformFeedback11::resume()
>+angle::Result TransformFeedback11::resume(const gl::Context *context)
> {
>+    mRenderer->getStateManager()->invalidateTransformFeedback();
>+    return angle::Result::Continue;
> }
> 
>-void TransformFeedback11::bindGenericBuffer(const gl::BindingPointer<gl::Buffer> &binding)
>+angle::Result TransformFeedback11::bindGenericBuffer(const gl::Context *context,
>+                                                     const gl::BindingPointer<gl::Buffer> &binding)
> {
>+    mRenderer->getStateManager()->invalidateTransformFeedback();
>+    return angle::Result::Continue;
> }
> 
>-void TransformFeedback11::bindIndexedBuffer(size_t index,
>-                                            const gl::OffsetBindingPointer<gl::Buffer> &binding)
>+angle::Result TransformFeedback11::bindIndexedBuffer(
>+    const gl::Context *context,
>+    size_t index,
>+    const gl::OffsetBindingPointer<gl::Buffer> &binding)
> {
>     mIsDirty              = true;
>     mBufferOffsets[index] = static_cast<UINT>(binding.getOffset());
>+    mRenderer->getStateManager()->invalidateTransformFeedback();
>+    return angle::Result::Continue;
> }
> 
> void TransformFeedback11::onApply()
>@@ -94,8 +107,8 @@ UINT TransformFeedback11::getNumSOBuffers() const
>     return static_cast<UINT>(mBuffers.size());
> }
> 
>-gl::ErrorOrResult<const std::vector<ID3D11Buffer *> *> TransformFeedback11::getSOBuffers(
>-    const gl::Context *context)
>+angle::Result TransformFeedback11::getSOBuffers(const gl::Context *context,
>+                                                const std::vector<ID3D11Buffer *> **buffersOut)
> {
>     for (size_t bindingIdx = 0; bindingIdx < mBuffers.size(); bindingIdx++)
>     {
>@@ -103,12 +116,13 @@ gl::ErrorOrResult<const std::vector<ID3D11Buffer *> *> TransformFeedback11::getS
>         if (binding.get() != nullptr)
>         {
>             Buffer11 *storage = GetImplAs<Buffer11>(binding.get());
>-            ANGLE_TRY_RESULT(storage->getBuffer(context, BUFFER_USAGE_VERTEX_OR_TRANSFORM_FEEDBACK),
>-                             mBuffers[bindingIdx]);
>+            ANGLE_TRY(storage->getBuffer(context, BUFFER_USAGE_VERTEX_OR_TRANSFORM_FEEDBACK,
>+                                         &mBuffers[bindingIdx]));
>         }
>     }
> 
>-    return &mBuffers;
>+    *buffersOut = &mBuffers;
>+    return angle::Result::Continue;
> }
> 
> const std::vector<UINT> &TransformFeedback11::getSOBufferOffsets() const
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/TransformFeedback11.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/TransformFeedback11.h
>index cc9fcc335a3..d9895cd3599 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/TransformFeedback11.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/TransformFeedback11.h
>@@ -27,21 +27,24 @@ class TransformFeedback11 : public TransformFeedbackImpl
>     TransformFeedback11(const gl::TransformFeedbackState &state, Renderer11 *renderer);
>     ~TransformFeedback11() override;
> 
>-    void begin(GLenum primitiveMode) override;
>-    void end() override;
>-    void pause() override;
>-    void resume() override;
>+    angle::Result begin(const gl::Context *context, gl::PrimitiveMode primitiveMode) override;
>+    angle::Result end(const gl::Context *context) override;
>+    angle::Result pause(const gl::Context *context) override;
>+    angle::Result resume(const gl::Context *context) override;
> 
>-    void bindGenericBuffer(const gl::BindingPointer<gl::Buffer> &binding) override;
>-    void bindIndexedBuffer(size_t index,
>-                           const gl::OffsetBindingPointer<gl::Buffer> &binding) override;
>+    angle::Result bindGenericBuffer(const gl::Context *context,
>+                                    const gl::BindingPointer<gl::Buffer> &binding) override;
>+    angle::Result bindIndexedBuffer(const gl::Context *context,
>+                                    size_t index,
>+                                    const gl::OffsetBindingPointer<gl::Buffer> &binding) override;
> 
>     void onApply();
> 
>     bool isDirty() const;
> 
>     UINT getNumSOBuffers() const;
>-    gl::ErrorOrResult<const std::vector<ID3D11Buffer *> *> getSOBuffers(const gl::Context *context);
>+    angle::Result getSOBuffers(const gl::Context *context,
>+                               const std::vector<ID3D11Buffer *> **buffersOut);
>     const std::vector<UINT> &getSOBufferOffsets() const;
> 
>     Serial getSerial() const;
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/Trim11.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/Trim11.cpp
>index 29185a9d934..c5b5d697bae 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/Trim11.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/Trim11.cpp
>@@ -10,10 +10,10 @@
> #include "libANGLE/renderer/d3d/d3d11/Renderer11.h"
> #include "libANGLE/renderer/d3d/d3d11/renderer11_utils.h"
> 
>-#if defined (ANGLE_ENABLE_WINDOWS_STORE)
>-#include <wrl.h>
>-#include <wrl/wrappers/corewrappers.h>
>-#include <windows.applicationmodel.core.h>
>+#if defined(ANGLE_ENABLE_WINDOWS_STORE)
>+#    include <windows.applicationmodel.core.h>
>+#    include <wrl.h>
>+#    include <wrl/wrappers/corewrappers.h>
> using namespace Microsoft::WRL;
> using namespace Microsoft::WRL::Wrappers;
> using namespace ABI::Windows::ApplicationModel;
>@@ -25,11 +25,10 @@ using namespace ABI::Windows::Foundation::Collections;
> namespace rx
> {
> 
>-Trim11::Trim11(rx::Renderer11 *renderer)
>-    : mRenderer(renderer)
>+Trim11::Trim11(rx::Renderer11 *renderer) : mRenderer(renderer)
> {
>     bool result = true;
>-    result = registerForRendererTrimRequest();
>+    result      = registerForRendererTrimRequest();
>     ASSERT(result);
> }
> 
>@@ -45,8 +44,8 @@ void Trim11::trim()
>         return;
>     }
> 
>-#if defined (ANGLE_ENABLE_WINDOWS_STORE)
>-    ID3D11Device* device = mRenderer->getDevice();
>+#if defined(ANGLE_ENABLE_WINDOWS_STORE)
>+    ID3D11Device *device      = mRenderer->getDevice();
>     IDXGIDevice3 *dxgiDevice3 = d3d11::DynamicCastComObject<IDXGIDevice3>(device);
>     if (dxgiDevice3)
>     {
>@@ -58,18 +57,20 @@ void Trim11::trim()
> 
> bool Trim11::registerForRendererTrimRequest()
> {
>-#if defined (ANGLE_ENABLE_WINDOWS_STORE)
>-    ICoreApplication* coreApplication = nullptr;
>-    HRESULT result = GetActivationFactory(HStringReference(RuntimeClass_Windows_ApplicationModel_Core_CoreApplication).Get(), &coreApplication);
>+#if defined(ANGLE_ENABLE_WINDOWS_STORE)
>+    ICoreApplication *coreApplication = nullptr;
>+    HRESULT result                    = GetActivationFactory(
>+        HStringReference(RuntimeClass_Windows_ApplicationModel_Core_CoreApplication).Get(),
>+        &coreApplication);
>     if (SUCCEEDED(result))
>     {
>-        auto suspendHandler = Callback<IEventHandler<SuspendingEventArgs*>>(
>-            [this](IInspectable*, ISuspendingEventArgs*) -> HRESULT
>-        {
>-            trim();
>-            return S_OK;
>-        });
>-        result = coreApplication->add_Suspending(suspendHandler.Get(), &mApplicationSuspendedEventToken);
>+        auto suspendHandler = Callback<IEventHandler<SuspendingEventArgs *>>(
>+            [this](IInspectable *, ISuspendingEventArgs *) -> HRESULT {
>+                trim();
>+                return S_OK;
>+            });
>+        result =
>+            coreApplication->add_Suspending(suspendHandler.Get(), &mApplicationSuspendedEventToken);
>     }
>     SafeRelease(coreApplication);
> 
>@@ -83,11 +84,13 @@ bool Trim11::registerForRendererTrimRequest()
> 
> void Trim11::unregisterForRendererTrimRequest()
> {
>-#if defined (ANGLE_ENABLE_WINDOWS_STORE)
>+#if defined(ANGLE_ENABLE_WINDOWS_STORE)
>     if (mApplicationSuspendedEventToken.value != 0)
>     {
>-        ICoreApplication* coreApplication = nullptr;
>-        if (SUCCEEDED(GetActivationFactory(HStringReference(RuntimeClass_Windows_ApplicationModel_Core_CoreApplication).Get(), &coreApplication)))
>+        ICoreApplication *coreApplication = nullptr;
>+        if (SUCCEEDED(GetActivationFactory(
>+                HStringReference(RuntimeClass_Windows_ApplicationModel_Core_CoreApplication).Get(),
>+                &coreApplication)))
>         {
>             coreApplication->remove_Suspending(mApplicationSuspendedEventToken);
>         }
>@@ -97,4 +100,4 @@ void Trim11::unregisterForRendererTrimRequest()
> #endif
> }
> 
>-}
>+}  // namespace rx
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/Trim11.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/Trim11.h
>index 69fa05a57b3..6949f6343df 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/Trim11.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/Trim11.h
>@@ -10,11 +10,11 @@
> #define LIBANGLE_RENDERER_D3D_D3D11_TRIM11_H_
> 
> #include "common/angleutils.h"
>-#include "libANGLE/angletypes.h"
> #include "libANGLE/Error.h"
>+#include "libANGLE/angletypes.h"
> 
> #if defined(ANGLE_ENABLE_WINDOWS_STORE)
>-#include <EventToken.h>
>+#    include <EventToken.h>
> #endif
> 
> namespace rx
>@@ -29,7 +29,7 @@ class Trim11 : angle::NonCopyable
> 
>   private:
>     Renderer11 *mRenderer;
>-#if defined (ANGLE_ENABLE_WINDOWS_STORE)
>+#if defined(ANGLE_ENABLE_WINDOWS_STORE)
>     EventRegistrationToken mApplicationSuspendedEventToken;
> #endif
> 
>@@ -38,6 +38,6 @@ class Trim11 : angle::NonCopyable
>     void unregisterForRendererTrimRequest();
> };
> 
>-}
>+}  // namespace rx
> 
>-#endif   // LIBANGLE_RENDERER_D3D_D3D11_TRIM11_H_
>+#endif  // LIBANGLE_RENDERER_D3D_D3D11_TRIM11_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/VertexArray11.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/VertexArray11.cpp
>index 97c29415ed0..e88b9065906 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/VertexArray11.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/VertexArray11.cpp
>@@ -11,6 +11,7 @@
> 
> #include "common/bitset_utils.h"
> #include "libANGLE/Context.h"
>+#include "libANGLE/renderer/d3d/IndexBuffer.h"
> #include "libANGLE/renderer/d3d/d3d11/Buffer11.h"
> #include "libANGLE/renderer/d3d/d3d11/Context11.h"
> 
>@@ -18,372 +19,313 @@ using namespace angle;
> 
> namespace rx
> {
>-
>-namespace
>-{
>-OnBufferDataDirtyChannel *GetBufferBroadcastChannel(Buffer11 *buffer11,
>-                                                    IndexStorageType storageType)
>-{
>-    switch (storageType)
>-    {
>-        case IndexStorageType::Direct:
>-            return buffer11->getDirectBroadcastChannel();
>-        case IndexStorageType::Static:
>-            return buffer11->getStaticBroadcastChannel();
>-        case IndexStorageType::Dynamic:
>-            return buffer11 ? buffer11->getStaticBroadcastChannel() : nullptr;
>-        default:
>-            UNREACHABLE();
>-            return nullptr;
>-    }
>-}
>-}  // anonymous namespace
>-
> VertexArray11::VertexArray11(const gl::VertexArrayState &data)
>     : VertexArrayImpl(data),
>       mAttributeStorageTypes(data.getMaxAttribs(), VertexStorageType::CURRENT_VALUE),
>       mTranslatedAttribs(data.getMaxAttribs()),
>-      mCurrentArrayBuffers(data.getMaxAttribs()),
>-      mCurrentElementArrayBuffer(),
>-      mOnArrayBufferDataDirty(),
>-      mOnElementArrayBufferDataDirty(this, mCurrentArrayBuffers.size()),
>       mAppliedNumViewsToDivisor(1),
>-      mLastElementType(GL_NONE),
>-      mLastDrawElementsOffset(0),
>       mCurrentElementArrayStorage(IndexStorageType::Invalid),
>-      mCachedIndexInfoValid(false)
>-{
>-    for (size_t attribIndex = 0; attribIndex < mCurrentArrayBuffers.size(); ++attribIndex)
>-    {
>-        mOnArrayBufferDataDirty.emplace_back(this, attribIndex);
>-    }
>-}
>-
>-VertexArray11::~VertexArray11()
>-{
>-}
>-
>-void VertexArray11::destroy(const gl::Context *context)
>-{
>-    for (auto &buffer : mCurrentArrayBuffers)
>-    {
>-        if (buffer.get())
>-        {
>-            buffer.set(context, nullptr);
>-        }
>-    }
>-
>-    mCurrentElementArrayBuffer.set(context, nullptr);
>-}
>-
>-void VertexArray11::syncState(const gl::Context *context,
>-                              const gl::VertexArray::DirtyBits &dirtyBits)
>+      mCachedDestinationIndexType(gl::DrawElementsType::InvalidEnum)
>+{}
>+
>+VertexArray11::~VertexArray11() {}
>+
>+void VertexArray11::destroy(const gl::Context *context) {}
>+
>+// As VertexAttribPointer can modify both attribute and binding, we should also set other attributes
>+// that are also using this binding dirty.
>+#define ANGLE_VERTEX_DIRTY_ATTRIB_FUNC(INDEX)                                                \
>+    case gl::VertexArray::DIRTY_BIT_ATTRIB_0 + INDEX:                                        \
>+        if ((*attribBits)[INDEX][gl::VertexArray::DirtyAttribBitType::DIRTY_ATTRIB_POINTER]) \
>+        {                                                                                    \
>+            attributesToUpdate |= mState.getBindingToAttributesMask(INDEX);                  \
>+        }                                                                                    \
>+        else                                                                                 \
>+        {                                                                                    \
>+            attributesToUpdate.set(INDEX);                                                   \
>+        }                                                                                    \
>+        invalidateVertexBuffer = true;                                                       \
>+        (*attribBits)[INDEX].reset();                                                        \
>+        break;
>+
>+#define ANGLE_VERTEX_DIRTY_BINDING_FUNC(INDEX)                          \
>+    case gl::VertexArray::DIRTY_BIT_BINDING_0 + INDEX:                  \
>+        attributesToUpdate |= mState.getBindingToAttributesMask(INDEX); \
>+        invalidateVertexBuffer = true;                                  \
>+        (*bindingBits)[INDEX].reset();                                  \
>+        break;
>+
>+#define ANGLE_VERTEX_DIRTY_BUFFER_DATA_FUNC(INDEX)                      \
>+    case gl::VertexArray::DIRTY_BIT_BUFFER_DATA_0 + INDEX:              \
>+        if (mAttributeStorageTypes[INDEX] == VertexStorageType::STATIC) \
>+        {                                                               \
>+            invalidateVertexBuffer = true;                              \
>+            mAttribsToTranslate.set(INDEX);                             \
>+        }                                                               \
>+        break;
>+
>+angle::Result VertexArray11::syncState(const gl::Context *context,
>+                                       const gl::VertexArray::DirtyBits &dirtyBits,
>+                                       gl::VertexArray::DirtyAttribBitsArray *attribBits,
>+                                       gl::VertexArray::DirtyBindingBitsArray *bindingBits)
> {
>     ASSERT(dirtyBits.any());
> 
>+    Renderer11 *renderer         = GetImplAs<Context11>(context)->getRenderer();
>+    StateManager11 *stateManager = renderer->getStateManager();
>+
>     // Generate a state serial. This serial is used in the program class to validate the cached
>     // input layout, and skip recomputation in the fast path.
>-    Renderer11 *renderer = GetImplAs<Context11>(context)->getRenderer();
>     mCurrentStateSerial = renderer->generateSerial();
> 
>-    // TODO(jmadill): Individual attribute invalidation.
>-    renderer->getStateManager()->invalidateVertexBuffer();
>+    bool invalidateVertexBuffer = false;
>+
>+    gl::AttributesMask attributesToUpdate;
> 
>-    for (auto dirtyBit : dirtyBits)
>+    // Make sure we trigger re-translation for static index or vertex data.
>+    for (size_t dirtyBit : dirtyBits)
>     {
>-        if (dirtyBit == gl::VertexArray::DIRTY_BIT_ELEMENT_ARRAY_BUFFER)
>+        switch (dirtyBit)
>         {
>-            mCachedIndexInfoValid = false;
>-            mLastElementType      = GL_NONE;
>-        }
>-        else
>-        {
>-            size_t index = gl::VertexArray::GetVertexIndexFromDirtyBit(dirtyBit);
>-            // TODO(jiawei.shao@intel.com): Vertex Attrib Bindings
>-            ASSERT(index == mState.getBindingIndexFromAttribIndex(index));
>-            mAttribsToUpdate.set(index);
>+            case gl::VertexArray::DIRTY_BIT_ELEMENT_ARRAY_BUFFER:
>+            case gl::VertexArray::DIRTY_BIT_ELEMENT_ARRAY_BUFFER_DATA:
>+            {
>+                mLastDrawElementsType.reset();
>+                mLastDrawElementsIndices.reset();
>+                mLastPrimitiveRestartEnabled.reset();
>+                mCachedIndexInfo.reset();
>+                break;
>+            }
>+
>+                ANGLE_VERTEX_INDEX_CASES(ANGLE_VERTEX_DIRTY_ATTRIB_FUNC)
>+                ANGLE_VERTEX_INDEX_CASES(ANGLE_VERTEX_DIRTY_BINDING_FUNC)
>+                ANGLE_VERTEX_INDEX_CASES(ANGLE_VERTEX_DIRTY_BUFFER_DATA_FUNC)
>+
>+            default:
>+                UNREACHABLE();
>+                break;
>         }
>     }
>-}
> 
>-bool VertexArray11::flushAttribUpdates(const gl::Context *context)
>-{
>-    if (mAttribsToUpdate.any())
>+    for (size_t attribIndex : attributesToUpdate)
>     {
>-        const auto &activeLocations =
>-            context->getGLState().getProgram()->getActiveAttribLocationsMask();
>-
>-        // Skip attrib locations the program doesn't use.
>-        gl::AttributesMask activeToUpdate = mAttribsToUpdate & activeLocations;
>-
>-        for (auto toUpdateIndex : activeToUpdate)
>-        {
>-            mAttribsToUpdate.reset(toUpdateIndex);
>-            updateVertexAttribStorage(context, toUpdateIndex);
>-        }
>+        updateVertexAttribStorage(context, stateManager, attribIndex);
>+    }
> 
>-        return true;
>+    if (invalidateVertexBuffer)
>+    {
>+        // TODO(jmadill): Individual attribute invalidation.
>+        stateManager->invalidateVertexBuffer();
>     }
> 
>-    return false;
>+    return angle::Result::Continue;
> }
> 
>-bool VertexArray11::updateElementArrayStorage(const gl::Context *context,
>-                                              GLenum elementType,
>-                                              GLenum destElementType,
>-                                              const void *indices)
>+angle::Result VertexArray11::syncStateForDraw(const gl::Context *context,
>+                                              GLint firstVertex,
>+                                              GLsizei vertexOrIndexCount,
>+                                              gl::DrawElementsType indexTypeOrInvalid,
>+                                              const void *indices,
>+                                              GLsizei instances,
>+                                              GLint baseVertex)
> {
>-    unsigned int offset = static_cast<unsigned int>(reinterpret_cast<uintptr_t>(indices));
>+    Renderer11 *renderer         = GetImplAs<Context11>(context)->getRenderer();
>+    StateManager11 *stateManager = renderer->getStateManager();
> 
>-    if (mCachedIndexInfoValid && mLastElementType == elementType &&
>-        offset == mLastDrawElementsOffset)
>-    {
>-        // Dynamic index buffers must be re-streamed every draw.
>-        return (mCurrentElementArrayStorage == IndexStorageType::Dynamic);
>-    }
>+    const gl::State &glState   = context->getState();
>+    const gl::Program *program = glState.getProgram();
>+    ASSERT(program);
>+    mAppliedNumViewsToDivisor = (program->usesMultiview() ? program->getNumViews() : 1);
> 
>-    gl::Buffer *newBuffer           = mState.getElementArrayBuffer().get();
>-    gl::Buffer *oldBuffer           = mCurrentElementArrayBuffer.get();
>-    bool needsTranslation           = false;
>-    IndexStorageType newStorageType = ClassifyIndexStorage(
>-        context->getGLState(), newBuffer, elementType, destElementType, offset, &needsTranslation);
>-
>-    if (newBuffer != oldBuffer)
>+    if (mAttribsToTranslate.any())
>     {
>-        mCurrentElementArrayBuffer.set(context, newBuffer);
>+        const gl::AttributesMask &activeLocations =
>+            glState.getProgram()->getActiveAttribLocationsMask();
>+        gl::AttributesMask activeDirtyAttribs = (mAttribsToTranslate & activeLocations);
>+        if (activeDirtyAttribs.any())
>+        {
>+            ANGLE_TRY(updateDirtyAttribs(context, activeDirtyAttribs));
>+            stateManager->invalidateInputLayout();
>+        }
>     }
> 
>-    if (newStorageType != mCurrentElementArrayStorage || newBuffer != oldBuffer)
>+    if (mDynamicAttribsMask.any())
>     {
>-        Buffer11 *newBuffer11 = SafeGetImplAs<Buffer11>(newBuffer);
>-
>-        auto *newChannel = GetBufferBroadcastChannel(newBuffer11, newStorageType);
>+        const gl::AttributesMask &activeLocations =
>+            glState.getProgram()->getActiveAttribLocationsMask();
>+        gl::AttributesMask activeDynamicAttribs = (mDynamicAttribsMask & activeLocations);
> 
>-        mCurrentElementArrayStorage = newStorageType;
>-        mOnElementArrayBufferDataDirty.bind(newChannel);
>-        needsTranslation = true;
>+        if (activeDynamicAttribs.any())
>+        {
>+            ANGLE_TRY(updateDynamicAttribs(context, stateManager->getVertexDataManager(),
>+                                           firstVertex, vertexOrIndexCount, indexTypeOrInvalid,
>+                                           indices, instances, baseVertex, activeDynamicAttribs));
>+            stateManager->invalidateInputLayout();
>+        }
>     }
> 
>-    if (mLastDrawElementsOffset != offset)
>+    if (indexTypeOrInvalid != gl::DrawElementsType::InvalidEnum)
>     {
>-        needsTranslation        = true;
>-        mLastDrawElementsOffset = offset;
>-    }
>+        bool restartEnabled = context->getState().isPrimitiveRestartEnabled();
>+        if (!mLastDrawElementsType.valid() || mLastDrawElementsType.value() != indexTypeOrInvalid ||
>+            mLastDrawElementsIndices.value() != indices ||
>+            mLastPrimitiveRestartEnabled.value() != restartEnabled)
>+        {
>+            mLastDrawElementsType        = indexTypeOrInvalid;
>+            mLastDrawElementsIndices     = indices;
>+            mLastPrimitiveRestartEnabled = restartEnabled;
> 
>-    if (mLastElementType != elementType)
>-    {
>-        needsTranslation = true;
>-        mLastElementType = elementType;
>+            ANGLE_TRY(updateElementArrayStorage(context, vertexOrIndexCount, indexTypeOrInvalid,
>+                                                indices, restartEnabled));
>+            stateManager->invalidateIndexBuffer();
>+        }
>+        else if (mCurrentElementArrayStorage == IndexStorageType::Dynamic)
>+        {
>+            stateManager->invalidateIndexBuffer();
>+        }
>     }
> 
>-    // TODO(jmadill): We should probably promote static usage immediately, because this can change
>-    // the storage type for dynamic buffers.
>-    return needsTranslation || !mCachedIndexInfoValid;
>+    return angle::Result::Continue;
> }
> 
>-void VertexArray11::updateVertexAttribStorage(const gl::Context *context, size_t attribIndex)
>+angle::Result VertexArray11::updateElementArrayStorage(const gl::Context *context,
>+                                                       GLsizei indexCount,
>+                                                       gl::DrawElementsType indexType,
>+                                                       const void *indices,
>+                                                       bool restartEnabled)
> {
>-    const auto &attrib  = mState.getVertexAttribute(attribIndex);
>-    const auto &binding = mState.getBindingFromAttribIndex(attribIndex);
>+    bool usePrimitiveRestartWorkaround = UsePrimitiveRestartWorkaround(restartEnabled, indexType);
> 
>-    // Note: having an unchanged storage type doesn't mean the attribute is clean.
>-    auto oldStorageType = mAttributeStorageTypes[attribIndex];
>-    auto newStorageType = ClassifyAttributeStorage(attrib, binding);
>+    ANGLE_TRY(GetIndexTranslationDestType(context, indexCount, indexType, indices,
>+                                          usePrimitiveRestartWorkaround,
>+                                          &mCachedDestinationIndexType));
> 
>-    mAttributeStorageTypes[attribIndex] = newStorageType;
>+    unsigned int offset = static_cast<unsigned int>(reinterpret_cast<uintptr_t>(indices));
> 
>-    StateManager11 *stateManager = GetImplAs<Context11>(context)->getRenderer()->getStateManager();
>+    mCurrentElementArrayStorage =
>+        ClassifyIndexStorage(context->getState(), mState.getElementArrayBuffer(), indexType,
>+                             mCachedDestinationIndexType, offset);
> 
>-    if (newStorageType == VertexStorageType::DYNAMIC)
>-    {
>-        if (oldStorageType != VertexStorageType::DYNAMIC)
>-        {
>-            // Sync dynamic attribs in a different set.
>-            mAttribsToTranslate.reset(attribIndex);
>-            mDynamicAttribsMask.set(attribIndex);
>-        }
>-    }
>-    else
>-    {
>-        mAttribsToTranslate.set(attribIndex);
>-        stateManager->invalidateVertexAttributeTranslation();
>+    return angle::Result::Continue;
>+}
> 
>-        if (oldStorageType == VertexStorageType::DYNAMIC)
>-        {
>-            ASSERT(mDynamicAttribsMask[attribIndex]);
>-            mDynamicAttribsMask.reset(attribIndex);
>-        }
>-    }
>+void VertexArray11::updateVertexAttribStorage(const gl::Context *context,
>+                                              StateManager11 *stateManager,
>+                                              size_t attribIndex)
>+{
>+    const gl::VertexAttribute &attrib = mState.getVertexAttribute(attribIndex);
>+    const gl::VertexBinding &binding  = mState.getBindingFromAttribIndex(attribIndex);
> 
>-    gl::Buffer *oldBufferGL = mCurrentArrayBuffers[attribIndex].get();
>-    gl::Buffer *newBufferGL = binding.getBuffer().get();
>-    Buffer11 *oldBuffer11   = oldBufferGL ? GetImplAs<Buffer11>(oldBufferGL) : nullptr;
>-    Buffer11 *newBuffer11   = newBufferGL ? GetImplAs<Buffer11>(newBufferGL) : nullptr;
>+    VertexStorageType newStorageType = ClassifyAttributeStorage(context, attrib, binding);
> 
>-    if (oldBuffer11 != newBuffer11 || oldStorageType != newStorageType)
>-    {
>-        OnBufferDataDirtyChannel *newChannel = nullptr;
>+    // Note: having an unchanged storage type doesn't mean the attribute is clean.
>+    mAttribsToTranslate.set(attribIndex, newStorageType != VertexStorageType::DYNAMIC);
> 
>-        if (newStorageType == VertexStorageType::CURRENT_VALUE)
>-        {
>-            stateManager->invalidateCurrentValueAttrib(attribIndex);
>-        }
>-        else if (newBuffer11 != nullptr)
>-        {
>-            // Note that for static callbacks, promotion to a static buffer from a dynamic buffer
>-            // means we need to tag dynamic buffers with static callbacks.
>-            switch (newStorageType)
>-            {
>-                case VertexStorageType::DIRECT:
>-                    newChannel = newBuffer11->getDirectBroadcastChannel();
>-                    break;
>-                case VertexStorageType::STATIC:
>-                case VertexStorageType::DYNAMIC:
>-                    newChannel = newBuffer11->getStaticBroadcastChannel();
>-                    break;
>-                default:
>-                    UNREACHABLE();
>-                    break;
>-            }
>-        }
>+    if (mAttributeStorageTypes[attribIndex] == newStorageType)
>+        return;
>+
>+    mAttributeStorageTypes[attribIndex] = newStorageType;
>+    mDynamicAttribsMask.set(attribIndex, newStorageType == VertexStorageType::DYNAMIC);
> 
>-        mOnArrayBufferDataDirty[attribIndex].bind(newChannel);
>-        mCurrentArrayBuffers[attribIndex].set(context, binding.getBuffer().get());
>+    if (newStorageType == VertexStorageType::CURRENT_VALUE)
>+    {
>+        stateManager->invalidateCurrentValueAttrib(attribIndex);
>     }
> }
> 
> bool VertexArray11::hasActiveDynamicAttrib(const gl::Context *context)
> {
>-    flushAttribUpdates(context);
>-    const auto &activeLocations =
>-        context->getGLState().getProgram()->getActiveAttribLocationsMask();
>-    auto activeDynamicAttribs = (mDynamicAttribsMask & activeLocations);
>+    const auto &activeLocations = context->getState().getProgram()->getActiveAttribLocationsMask();
>+    gl::AttributesMask activeDynamicAttribs = (mDynamicAttribsMask & activeLocations);
>     return activeDynamicAttribs.any();
> }
> 
>-gl::Error VertexArray11::updateDirtyAndDynamicAttribs(const gl::Context *context,
>-                                                      VertexDataManager *vertexDataManager,
>-                                                      const DrawCallVertexParams &vertexParams)
>+angle::Result VertexArray11::updateDirtyAttribs(const gl::Context *context,
>+                                                const gl::AttributesMask &activeDirtyAttribs)
> {
>-    flushAttribUpdates(context);
>+    const auto &glState  = context->getState();
>+    const auto &attribs  = mState.getVertexAttributes();
>+    const auto &bindings = mState.getVertexBindings();
> 
>-    const auto &glState         = context->getGLState();
>-    const gl::Program *program  = glState.getProgram();
>-    const auto &activeLocations = program->getActiveAttribLocationsMask();
>-    const auto &attribs         = mState.getVertexAttributes();
>-    const auto &bindings        = mState.getVertexBindings();
>-    mAppliedNumViewsToDivisor =
>-        (program != nullptr && program->usesMultiview()) ? program->getNumViews() : 1;
>-
>-    if (mAttribsToTranslate.any())
>+    for (size_t dirtyAttribIndex : activeDirtyAttribs)
>     {
>-        // Skip attrib locations the program doesn't use, saving for the next frame.
>-        gl::AttributesMask dirtyActiveAttribs = (mAttribsToTranslate & activeLocations);
>+        mAttribsToTranslate.reset(dirtyAttribIndex);
> 
>-        for (auto dirtyAttribIndex : dirtyActiveAttribs)
>-        {
>-            mAttribsToTranslate.reset(dirtyAttribIndex);
>+        auto *translatedAttrib   = &mTranslatedAttribs[dirtyAttribIndex];
>+        const auto &currentValue = glState.getVertexAttribCurrentValue(dirtyAttribIndex);
> 
>-            auto *translatedAttrib = &mTranslatedAttribs[dirtyAttribIndex];
>-            const auto &currentValue = glState.getVertexAttribCurrentValue(dirtyAttribIndex);
>+        // Record basic attrib info
>+        translatedAttrib->attribute        = &attribs[dirtyAttribIndex];
>+        translatedAttrib->binding          = &bindings[translatedAttrib->attribute->bindingIndex];
>+        translatedAttrib->currentValueType = currentValue.Type;
>+        translatedAttrib->divisor =
>+            translatedAttrib->binding->getDivisor() * mAppliedNumViewsToDivisor;
> 
>-            // Record basic attrib info
>-            translatedAttrib->attribute = &attribs[dirtyAttribIndex];
>-            translatedAttrib->binding   = &bindings[translatedAttrib->attribute->bindingIndex];
>-            translatedAttrib->currentValueType = currentValue.Type;
>-            translatedAttrib->divisor =
>-                translatedAttrib->binding->getDivisor() * mAppliedNumViewsToDivisor;
>-
>-            switch (mAttributeStorageTypes[dirtyAttribIndex])
>+        switch (mAttributeStorageTypes[dirtyAttribIndex])
>+        {
>+            case VertexStorageType::DIRECT:
>+                VertexDataManager::StoreDirectAttrib(context, translatedAttrib);
>+                break;
>+            case VertexStorageType::STATIC:
>             {
>-                case VertexStorageType::DIRECT:
>-                    VertexDataManager::StoreDirectAttrib(translatedAttrib);
>-                    break;
>-                case VertexStorageType::STATIC:
>-                {
>-                    ANGLE_TRY(VertexDataManager::StoreStaticAttrib(context, translatedAttrib));
>-                    break;
>-                }
>-                case VertexStorageType::CURRENT_VALUE:
>-                    // Current value attribs are managed by the StateManager11.
>-                    break;
>-                default:
>-                    UNREACHABLE();
>-                    break;
>+                ANGLE_TRY(VertexDataManager::StoreStaticAttrib(context, translatedAttrib));
>+                break;
>             }
>+            case VertexStorageType::CURRENT_VALUE:
>+                // Current value attribs are managed by the StateManager11.
>+                break;
>+            default:
>+                UNREACHABLE();
>+                break;
>         }
>     }
> 
>-    if (mDynamicAttribsMask.any())
>-    {
>-        auto activeDynamicAttribs = (mDynamicAttribsMask & activeLocations);
>-        if (activeDynamicAttribs.none())
>-        {
>-            return gl::NoError();
>-        }
>-
>-        for (auto dynamicAttribIndex : activeDynamicAttribs)
>-        {
>-            auto *dynamicAttrib = &mTranslatedAttribs[dynamicAttribIndex];
>-            const auto &currentValue = glState.getVertexAttribCurrentValue(dynamicAttribIndex);
>-
>-            // Record basic attrib info
>-            dynamicAttrib->attribute        = &attribs[dynamicAttribIndex];
>-            dynamicAttrib->binding          = &bindings[dynamicAttrib->attribute->bindingIndex];
>-            dynamicAttrib->currentValueType = currentValue.Type;
>-            dynamicAttrib->divisor =
>-                dynamicAttrib->binding->getDivisor() * mAppliedNumViewsToDivisor;
>-        }
>-
>-        ANGLE_TRY(vertexDataManager->storeDynamicAttribs(
>-            context, &mTranslatedAttribs, activeDynamicAttribs, vertexParams.firstVertex(),
>-            vertexParams.vertexCount(), vertexParams.instances()));
>-    }
>-
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-const std::vector<TranslatedAttribute> &VertexArray11::getTranslatedAttribs() const
>+angle::Result VertexArray11::updateDynamicAttribs(const gl::Context *context,
>+                                                  VertexDataManager *vertexDataManager,
>+                                                  GLint firstVertex,
>+                                                  GLsizei vertexOrIndexCount,
>+                                                  gl::DrawElementsType indexTypeOrInvalid,
>+                                                  const void *indices,
>+                                                  GLsizei instances,
>+                                                  GLint baseVertex,
>+                                                  const gl::AttributesMask &activeDynamicAttribs)
> {
>-    return mTranslatedAttribs;
>-}
>+    const auto &glState  = context->getState();
>+    const auto &attribs  = mState.getVertexAttributes();
>+    const auto &bindings = mState.getVertexBindings();
> 
>-void VertexArray11::signal(size_t channelID, const gl::Context *context)
>-{
>-    if (channelID == mAttributeStorageTypes.size())
>+    GLint startVertex;
>+    size_t vertexCount;
>+    ANGLE_TRY(GetVertexRangeInfo(context, firstVertex, vertexOrIndexCount, indexTypeOrInvalid,
>+                                 indices, baseVertex, &startVertex, &vertexCount));
>+
>+    for (size_t dynamicAttribIndex : activeDynamicAttribs)
>     {
>-        mCachedIndexInfoValid   = false;
>-        mLastElementType        = GL_NONE;
>-        mLastDrawElementsOffset = 0;
>+        auto *dynamicAttrib      = &mTranslatedAttribs[dynamicAttribIndex];
>+        const auto &currentValue = glState.getVertexAttribCurrentValue(dynamicAttribIndex);
>+
>+        // Record basic attrib info
>+        dynamicAttrib->attribute        = &attribs[dynamicAttribIndex];
>+        dynamicAttrib->binding          = &bindings[dynamicAttrib->attribute->bindingIndex];
>+        dynamicAttrib->currentValueType = currentValue.Type;
>+        dynamicAttrib->divisor = dynamicAttrib->binding->getDivisor() * mAppliedNumViewsToDivisor;
>     }
>-    else
>-    {
>-        ASSERT(mAttributeStorageTypes[channelID] != VertexStorageType::CURRENT_VALUE);
> 
>-        // This can change a buffer's storage, we'll need to re-check.
>-        mAttribsToUpdate.set(channelID);
>+    ANGLE_TRY(vertexDataManager->storeDynamicAttribs(
>+        context, &mTranslatedAttribs, activeDynamicAttribs, startVertex, vertexCount, instances));
> 
>-        // Changing the vertex attribute state can affect the vertex shader.
>-        Renderer11 *renderer = GetImplAs<Context11>(context)->getRenderer();
>-        renderer->getStateManager()->invalidateShaders();
>-    }
>+    VertexDataManager::PromoteDynamicAttribs(context, mTranslatedAttribs, activeDynamicAttribs,
>+                                             vertexCount);
>+
>+    return angle::Result::Continue;
> }
> 
>-void VertexArray11::clearDirtyAndPromoteDynamicAttribs(const gl::Context *context,
>-                                                       const DrawCallVertexParams &vertexParams)
>+const std::vector<TranslatedAttribute> &VertexArray11::getTranslatedAttribs() const
> {
>-    const gl::State &state      = context->getGLState();
>-    const gl::Program *program  = state.getProgram();
>-    const auto &activeLocations = program->getActiveAttribLocationsMask();
>-    mAttribsToUpdate &= ~activeLocations;
>-
>-    // Promote to static after we clear the dirty attributes, otherwise we can lose dirtyness.
>-    auto activeDynamicAttribs = (mDynamicAttribsMask & activeLocations);
>-    if (activeDynamicAttribs.any())
>-    {
>-        VertexDataManager::PromoteDynamicAttribs(context, mTranslatedAttribs, activeDynamicAttribs,
>-                                                 vertexParams.vertexCount());
>-    }
>+    return mTranslatedAttribs;
> }
> 
> void VertexArray11::markAllAttributeDivisorsForAdjustment(int numViews)
>@@ -391,23 +333,29 @@ void VertexArray11::markAllAttributeDivisorsForAdjustment(int numViews)
>     if (mAppliedNumViewsToDivisor != numViews)
>     {
>         mAppliedNumViewsToDivisor = numViews;
>-        mAttribsToUpdate.set();
>+        mAttribsToTranslate.set();
>     }
> }
> 
>-TranslatedIndexData *VertexArray11::getCachedIndexInfo()
>+const TranslatedIndexData &VertexArray11::getCachedIndexInfo() const
> {
>-    return &mCachedIndexInfo;
>+    ASSERT(mCachedIndexInfo.valid());
>+    return mCachedIndexInfo.value();
> }
> 
>-void VertexArray11::setCachedIndexInfoValid()
>+void VertexArray11::updateCachedIndexInfo(const TranslatedIndexData &indexInfo)
> {
>-    mCachedIndexInfoValid = true;
>+    mCachedIndexInfo = indexInfo;
> }
> 
> bool VertexArray11::isCachedIndexInfoValid() const
> {
>-    return mCachedIndexInfoValid;
>+    return mCachedIndexInfo.valid();
>+}
>+
>+gl::DrawElementsType VertexArray11::getCachedDestinationIndexType() const
>+{
>+    return mCachedDestinationIndexType;
> }
> 
> }  // namespace rx
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/VertexArray11.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/VertexArray11.h
>index 4cdc92531dd..e259e0fe619 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/VertexArray11.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/VertexArray11.h
>@@ -13,54 +13,72 @@
> #include "libANGLE/renderer/VertexArrayImpl.h"
> #include "libANGLE/renderer/d3d/d3d11/Renderer11.h"
> #include "libANGLE/renderer/d3d/d3d11/renderer11_utils.h"
>-#include "libANGLE/signal_utils.h"
> 
> namespace rx
> {
> class Renderer11;
> 
>-class VertexArray11 : public VertexArrayImpl, public OnBufferDataDirtyReceiver
>+class VertexArray11 : public VertexArrayImpl
> {
>   public:
>     VertexArray11(const gl::VertexArrayState &data);
>     ~VertexArray11() override;
>     void destroy(const gl::Context *context) override;
> 
>-    void syncState(const gl::Context *context,
>-                   const gl::VertexArray::DirtyBits &dirtyBits) override;
>-    // This will flush any pending attrib updates and then check the dynamic attribs mask.
>+    // Does not apply any state updates - these are done in syncStateForDraw which as access to
>+    // the draw call parameters.
>+    angle::Result syncState(const gl::Context *context,
>+                            const gl::VertexArray::DirtyBits &dirtyBits,
>+                            gl::VertexArray::DirtyAttribBitsArray *attribBits,
>+                            gl::VertexArray::DirtyBindingBitsArray *bindingBits) override;
>+
>+    // Applied buffer pointers are updated here.
>+    angle::Result syncStateForDraw(const gl::Context *context,
>+                                   GLint firstVertex,
>+                                   GLsizei vertexOrIndexCount,
>+                                   gl::DrawElementsType indexTypeOrInvalid,
>+                                   const void *indices,
>+                                   GLsizei instances,
>+                                   GLint baseVertex);
>+
>+    // This will check the dynamic attribs mask.
>     bool hasActiveDynamicAttrib(const gl::Context *context);
>-    gl::Error updateDirtyAndDynamicAttribs(const gl::Context *context,
>-                                           VertexDataManager *vertexDataManager,
>-                                           const DrawCallVertexParams &vertexParams);
>-    void clearDirtyAndPromoteDynamicAttribs(const gl::Context *context,
>-                                            const DrawCallVertexParams &vertexParams);
> 
>     const std::vector<TranslatedAttribute> &getTranslatedAttribs() const;
> 
>-    // SignalReceiver implementation
>-    void signal(size_t channelID, const gl::Context *context) override;
>-
>     Serial getCurrentStateSerial() const { return mCurrentStateSerial; }
> 
>     // In case of a multi-view program change, we have to update all attributes so that the divisor
>     // is adjusted.
>     void markAllAttributeDivisorsForAdjustment(int numViews);
> 
>-    bool flushAttribUpdates(const gl::Context *context);
>-
>-    // Returns true if the element array buffer needs to be translated.
>-    bool updateElementArrayStorage(const gl::Context *context,
>-                                   GLenum elementType,
>-                                   GLenum destElementType,
>-                                   const void *indices);
>-
>-    TranslatedIndexData *getCachedIndexInfo();
>-    void setCachedIndexInfoValid();
>+    const TranslatedIndexData &getCachedIndexInfo() const;
>+    void updateCachedIndexInfo(const TranslatedIndexData &indexInfo);
>     bool isCachedIndexInfoValid() const;
> 
>+    gl::DrawElementsType getCachedDestinationIndexType() const;
>+
>   private:
>-    void updateVertexAttribStorage(const gl::Context *context, size_t attribIndex);
>+    void updateVertexAttribStorage(const gl::Context *context,
>+                                   StateManager11 *stateManager,
>+                                   size_t attribIndex);
>+    angle::Result updateDirtyAttribs(const gl::Context *context,
>+                                     const gl::AttributesMask &activeDirtyAttribs);
>+    angle::Result updateDynamicAttribs(const gl::Context *context,
>+                                       VertexDataManager *vertexDataManager,
>+                                       GLint firstVertex,
>+                                       GLsizei vertexOrIndexCount,
>+                                       gl::DrawElementsType indexTypeOrInvalid,
>+                                       const void *indices,
>+                                       GLsizei instances,
>+                                       GLint baseVertex,
>+                                       const gl::AttributesMask &activeDynamicAttribs);
>+
>+    angle::Result updateElementArrayStorage(const gl::Context *context,
>+                                            GLsizei indexCount,
>+                                            gl::DrawElementsType indexType,
>+                                            const void *indices,
>+                                            bool restartEnabled);
> 
>     std::vector<VertexStorageType> mAttributeStorageTypes;
>     std::vector<TranslatedAttribute> mTranslatedAttribs;
>@@ -68,32 +86,23 @@ class VertexArray11 : public VertexArrayImpl, public OnBufferDataDirtyReceiver
>     // The mask of attributes marked as dynamic.
>     gl::AttributesMask mDynamicAttribsMask;
> 
>-    // A mask of attributes that need to be re-evaluated.
>-    gl::AttributesMask mAttribsToUpdate;
>-
>     // A set of attributes we know are dirty, and need to be re-translated.
>     gl::AttributesMask mAttribsToTranslate;
> 
>-    // We need to keep a safe pointer to the Buffer so we can attach the correct dirty callbacks.
>-    std::vector<gl::BindingPointer<gl::Buffer>> mCurrentArrayBuffers;
>-    gl::BindingPointer<gl::Buffer> mCurrentElementArrayBuffer;
>-
>-    std::vector<OnBufferDataDirtyBinding> mOnArrayBufferDataDirty;
>-    OnBufferDataDirtyBinding mOnElementArrayBufferDataDirty;
>-
>     Serial mCurrentStateSerial;
> 
>     // The numViews value used to adjust the divisor.
>     int mAppliedNumViewsToDivisor;
> 
>     // If the index buffer needs re-streaming.
>-    GLenum mLastElementType;
>-    unsigned int mLastDrawElementsOffset;
>+    Optional<gl::DrawElementsType> mLastDrawElementsType;
>+    Optional<const void *> mLastDrawElementsIndices;
>+    Optional<bool> mLastPrimitiveRestartEnabled;
>     IndexStorageType mCurrentElementArrayStorage;
>-    TranslatedIndexData mCachedIndexInfo;
>-    bool mCachedIndexInfoValid;
>+    Optional<TranslatedIndexData> mCachedIndexInfo;
>+    gl::DrawElementsType mCachedDestinationIndexType;
> };
> 
> }  // namespace rx
> 
>-#endif // LIBANGLE_RENDERER_D3D_D3D11_VERTEXARRAY11_H_
>+#endif  // LIBANGLE_RENDERER_D3D_D3D11_VERTEXARRAY11_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/VertexBuffer11.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/VertexBuffer11.cpp
>index 611bd0f18ba..81bdfbdb751 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/VertexBuffer11.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/VertexBuffer11.cpp
>@@ -9,11 +9,13 @@
> #include "libANGLE/renderer/d3d/d3d11/VertexBuffer11.h"
> 
> #include "libANGLE/Buffer.h"
>+#include "libANGLE/Context.h"
> #include "libANGLE/VertexAttribute.h"
> #include "libANGLE/formatutils.h"
> #include "libANGLE/renderer/d3d/d3d11/Buffer11.h"
>-#include "libANGLE/renderer/d3d/d3d11/formatutils11.h"
>+#include "libANGLE/renderer/d3d/d3d11/Context11.h"
> #include "libANGLE/renderer/d3d/d3d11/Renderer11.h"
>+#include "libANGLE/renderer/d3d/d3d11/formatutils11.h"
> #include "libANGLE/renderer/d3d/d3d11/renderer11_utils.h"
> 
> namespace rx
>@@ -25,15 +27,16 @@ VertexBuffer11::VertexBuffer11(Renderer11 *const renderer)
>       mBufferSize(0),
>       mDynamicUsage(false),
>       mMappedResourceData(nullptr)
>-{
>-}
>+{}
> 
> VertexBuffer11::~VertexBuffer11()
> {
>     ASSERT(mMappedResourceData == nullptr);
> }
> 
>-gl::Error VertexBuffer11::initialize(unsigned int size, bool dynamicUsage)
>+angle::Result VertexBuffer11::initialize(const gl::Context *context,
>+                                         unsigned int size,
>+                                         bool dynamicUsage)
> {
>     mBuffer.reset();
>     updateSerial();
>@@ -48,7 +51,7 @@ gl::Error VertexBuffer11::initialize(unsigned int size, bool dynamicUsage)
>         bufferDesc.MiscFlags           = 0;
>         bufferDesc.StructureByteStride = 0;
> 
>-        ANGLE_TRY(mRenderer->allocateResource(bufferDesc, &mBuffer));
>+        ANGLE_TRY(mRenderer->allocateResource(GetImplAs<Context11>(context), bufferDesc, &mBuffer));
> 
>         if (dynamicUsage)
>         {
>@@ -63,29 +66,22 @@ gl::Error VertexBuffer11::initialize(unsigned int size, bool dynamicUsage)
>     mBufferSize   = size;
>     mDynamicUsage = dynamicUsage;
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error VertexBuffer11::mapResource()
>+angle::Result VertexBuffer11::mapResource(const gl::Context *context)
> {
>     if (mMappedResourceData == nullptr)
>     {
>-        ID3D11DeviceContext *dxContext = mRenderer->getDeviceContext();
>-
>         D3D11_MAPPED_SUBRESOURCE mappedResource;
> 
>-        HRESULT result =
>-            dxContext->Map(mBuffer.get(), 0, D3D11_MAP_WRITE_NO_OVERWRITE, 0, &mappedResource);
>-        if (FAILED(result))
>-        {
>-            return gl::OutOfMemory()
>-                   << "Failed to map internal vertex buffer, " << gl::FmtHR(result);
>-        }
>+        ANGLE_TRY(mRenderer->mapResource(context, mBuffer.get(), 0, D3D11_MAP_WRITE_NO_OVERWRITE, 0,
>+                                         &mappedResource));
> 
>-        mMappedResourceData = reinterpret_cast<uint8_t *>(mappedResource.pData);
>+        mMappedResourceData = static_cast<uint8_t *>(mappedResource.pData);
>     }
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
> void VertexBuffer11::hintUnmapResource()
>@@ -99,24 +95,22 @@ void VertexBuffer11::hintUnmapResource()
>     }
> }
> 
>-gl::Error VertexBuffer11::storeVertexAttributes(const gl::VertexAttribute &attrib,
>-                                                const gl::VertexBinding &binding,
>-                                                GLenum currentValueType,
>-                                                GLint start,
>-                                                GLsizei count,
>-                                                GLsizei instances,
>-                                                unsigned int offset,
>-                                                const uint8_t *sourceData)
>+angle::Result VertexBuffer11::storeVertexAttributes(const gl::Context *context,
>+                                                    const gl::VertexAttribute &attrib,
>+                                                    const gl::VertexBinding &binding,
>+                                                    gl::VertexAttribType currentValueType,
>+                                                    GLint start,
>+                                                    size_t count,
>+                                                    GLsizei instances,
>+                                                    unsigned int offset,
>+                                                    const uint8_t *sourceData)
> {
>-    if (!mBuffer.valid())
>-    {
>-        return gl::OutOfMemory() << "Internal vertex buffer is not initialized.";
>-    }
>+    ASSERT(mBuffer.valid());
> 
>     int inputStride = static_cast<int>(ComputeVertexAttributeStride(attrib, binding));
> 
>     // This will map the resource if it isn't already mapped.
>-    ANGLE_TRY(mapResource());
>+    ANGLE_TRY(mapResource(context));
> 
>     uint8_t *output = mMappedResourceData + offset;
> 
>@@ -127,14 +121,14 @@ gl::Error VertexBuffer11::storeVertexAttributes(const gl::VertexAttribute &attri
>         input += inputStride * start;
>     }
> 
>-    gl::VertexFormatType vertexFormatType = gl::GetVertexFormatType(attrib, currentValueType);
>-    const D3D_FEATURE_LEVEL featureLevel  = mRenderer->getRenderer11DeviceCaps().featureLevel;
>+    angle::FormatID vertexFormatID       = gl::GetVertexFormatID(attrib, currentValueType);
>+    const D3D_FEATURE_LEVEL featureLevel = mRenderer->getRenderer11DeviceCaps().featureLevel;
>     const d3d11::VertexFormat &vertexFormatInfo =
>-        d3d11::GetVertexFormatInfo(vertexFormatType, featureLevel);
>+        d3d11::GetVertexFormatInfo(vertexFormatID, featureLevel);
>     ASSERT(vertexFormatInfo.copyFunction != nullptr);
>     vertexFormatInfo.copyFunction(input, inputStride, count, output);
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
> unsigned int VertexBuffer11::getBufferSize() const
>@@ -142,38 +136,27 @@ unsigned int VertexBuffer11::getBufferSize() const
>     return mBufferSize;
> }
> 
>-gl::Error VertexBuffer11::setBufferSize(unsigned int size)
>+angle::Result VertexBuffer11::setBufferSize(const gl::Context *context, unsigned int size)
> {
>     if (size > mBufferSize)
>     {
>-        return initialize(size, mDynamicUsage);
>-    }
>-    else
>-    {
>-        return gl::NoError();
>+        return initialize(context, size, mDynamicUsage);
>     }
>+
>+    return angle::Result::Continue;
> }
> 
>-gl::Error VertexBuffer11::discard()
>+angle::Result VertexBuffer11::discard(const gl::Context *context)
> {
>-    if (!mBuffer.valid())
>-    {
>-        return gl::OutOfMemory() << "Internal vertex buffer is not initialized.";
>-    }
>-
>-    ID3D11DeviceContext *dxContext = mRenderer->getDeviceContext();
>+    ASSERT(mBuffer.valid());
> 
>     D3D11_MAPPED_SUBRESOURCE mappedResource;
>-    HRESULT result = dxContext->Map(mBuffer.get(), 0, D3D11_MAP_WRITE_DISCARD, 0, &mappedResource);
>-    if (FAILED(result))
>-    {
>-        return gl::OutOfMemory() << "Failed to map internal buffer for discarding, "
>-                                 << gl::FmtHR(result);
>-    }
>+    ANGLE_TRY(mRenderer->mapResource(context, mBuffer.get(), 0, D3D11_MAP_WRITE_DISCARD, 0,
>+                                     &mappedResource));
> 
>-    dxContext->Unmap(mBuffer.get(), 0);
>+    mRenderer->getDeviceContext()->Unmap(mBuffer.get(), 0);
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
> const d3d11::Buffer &VertexBuffer11::getBuffer() const
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/VertexBuffer11.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/VertexBuffer11.h
>index ab619ae5030..393b937c541 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/VertexBuffer11.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/VertexBuffer11.h
>@@ -23,22 +23,25 @@ class VertexBuffer11 : public VertexBuffer
>   public:
>     explicit VertexBuffer11(Renderer11 *const renderer);
> 
>-    gl::Error initialize(unsigned int size, bool dynamicUsage) override;
>+    angle::Result initialize(const gl::Context *context,
>+                             unsigned int size,
>+                             bool dynamicUsage) override;
> 
>     // Warning: you should ensure binding really matches attrib.bindingIndex before using this
>     // function.
>-    gl::Error storeVertexAttributes(const gl::VertexAttribute &attrib,
>-                                    const gl::VertexBinding &binding,
>-                                    GLenum currentValueType,
>-                                    GLint start,
>-                                    GLsizei count,
>-                                    GLsizei instances,
>-                                    unsigned int offset,
>-                                    const uint8_t *sourceData) override;
>+    angle::Result storeVertexAttributes(const gl::Context *context,
>+                                        const gl::VertexAttribute &attrib,
>+                                        const gl::VertexBinding &binding,
>+                                        gl::VertexAttribType currentValueType,
>+                                        GLint start,
>+                                        size_t count,
>+                                        GLsizei instances,
>+                                        unsigned int offset,
>+                                        const uint8_t *sourceData) override;
> 
>     unsigned int getBufferSize() const override;
>-    gl::Error setBufferSize(unsigned int size) override;
>-    gl::Error discard() override;
>+    angle::Result setBufferSize(const gl::Context *context, unsigned int size) override;
>+    angle::Result discard(const gl::Context *context) override;
> 
>     void hintUnmapResource() override;
> 
>@@ -46,7 +49,7 @@ class VertexBuffer11 : public VertexBuffer
> 
>   private:
>     ~VertexBuffer11() override;
>-    gl::Error mapResource();
>+    angle::Result mapResource(const gl::Context *context);
> 
>     Renderer11 *const mRenderer;
> 
>@@ -59,4 +62,4 @@ class VertexBuffer11 : public VertexBuffer
> 
> }  // namespace rx
> 
>-#endif // LIBANGLE_RENDERER_D3D_D3D11_VERTEXBUFFER11_H_
>+#endif  // LIBANGLE_RENDERER_D3D_D3D11_VERTEXBUFFER11_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/converged/CompositorNativeWindow11.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/converged/CompositorNativeWindow11.cpp
>new file mode 100644
>index 00000000000..826b20d08e5
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/converged/CompositorNativeWindow11.cpp
>@@ -0,0 +1,437 @@
>+//
>+// Copyright 2018 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+
>+// CompositorNativeWindow11.cpp: Implementation of NativeWindow11 using Windows.UI.Composition APIs
>+// which work in both Win32 and WinRT contexts.
>+
>+#include "libANGLE/renderer/d3d/d3d11/converged/CompositorNativeWindow11.h"
>+#include "libANGLE/renderer/d3d/d3d11/renderer11_utils.h"
>+
>+#include "common/debug.h"
>+
>+using namespace Microsoft::WRL;
>+
>+namespace rx
>+{
>+
>+CompositorNativeWindow11::CompositorNativeWindow11(EGLNativeWindowType window, bool hasAlpha)
>+    : NativeWindow11(window), mHasAlpha(hasAlpha)
>+{
>+    ABI::Windows::UI::Composition::ISpriteVisual *inspPtr =
>+        reinterpret_cast<ABI::Windows::UI::Composition::ISpriteVisual *>(window);
>+    mHostVisual = Microsoft::WRL::ComPtr<ABI::Windows::UI::Composition::ISpriteVisual>{inspPtr};
>+}
>+
>+CompositorNativeWindow11::~CompositorNativeWindow11() = default;
>+
>+bool CompositorNativeWindow11::initialize()
>+{
>+    return true;
>+}
>+
>+bool CompositorNativeWindow11::getClientRect(LPRECT rect) const
>+{
>+    ComPtr<ABI::Windows::UI::Composition::IVisual> visual;
>+    mHostVisual.As(&visual);
>+
>+    ABI::Windows::Foundation::Numerics::Vector2 size;
>+    HRESULT hr = visual->get_Size(&size);
>+    if (FAILED(hr))
>+    {
>+        return false;
>+    }
>+
>+    ABI::Windows::Foundation::Numerics::Vector3 offset;
>+    hr = visual->get_Offset(&offset);
>+    if (FAILED(hr))
>+    {
>+        return false;
>+    }
>+
>+    rect->top    = static_cast<LONG>(offset.Y);
>+    rect->left   = static_cast<LONG>(offset.X);
>+    rect->right  = static_cast<LONG>(offset.X) + static_cast<LONG>(size.X);
>+    rect->bottom = static_cast<LONG>(offset.Y) + static_cast<LONG>(size.Y);
>+
>+    return true;
>+}
>+
>+bool CompositorNativeWindow11::isIconic() const
>+{
>+    return false;
>+}
>+
>+HRESULT CompositorNativeWindow11::createSwapChain(ID3D11Device *device,
>+                                                  IDXGIFactory *factory,
>+                                                  DXGI_FORMAT format,
>+                                                  UINT width,
>+                                                  UINT height,
>+                                                  UINT samples,
>+                                                  IDXGISwapChain **swapChain)
>+{
>+    if (device == nullptr || factory == nullptr || swapChain == nullptr || width == 0 ||
>+        height == 0)
>+    {
>+        return E_INVALIDARG;
>+    }
>+
>+    HRESULT hr{E_FAIL};
>+
>+    ComPtr<ABI::Windows::UI::Composition::ICompositionObject> hostVisual;
>+    hr = mHostVisual.As(&hostVisual);
>+    if (FAILED(hr))
>+    {
>+        return hr;
>+    }
>+
>+    Microsoft::WRL::ComPtr<ABI::Windows::UI::Composition::ICompositor> compositor;
>+    hr = hostVisual->get_Compositor(&compositor);
>+    if (FAILED(hr))
>+    {
>+        return hr;
>+    }
>+
>+    ComPtr<ABI::Windows::UI::Composition::ICompositorInterop> interop;
>+
>+    hr = compositor.As(&interop);
>+    if (FAILED(hr))
>+    {
>+        return hr;
>+    }
>+
>+    ComPtr<IDXGIFactory2> factory2;
>+    factory2.Attach(d3d11::DynamicCastComObject<IDXGIFactory2>(factory));
>+
>+    DXGI_SWAP_CHAIN_DESC1 swapChainDesc = {0};
>+    swapChainDesc.Width                 = width;
>+    swapChainDesc.Height                = height;
>+    swapChainDesc.Format                = format;
>+    swapChainDesc.Stereo                = FALSE;
>+    swapChainDesc.SampleDesc.Count      = 1;
>+    swapChainDesc.SampleDesc.Quality    = 0;
>+    swapChainDesc.BufferUsage =
>+        DXGI_USAGE_RENDER_TARGET_OUTPUT | DXGI_USAGE_BACK_BUFFER | DXGI_USAGE_SHADER_INPUT;
>+    swapChainDesc.BufferCount = 2;
>+    swapChainDesc.Scaling     = DXGI_SCALING_STRETCH;
>+    swapChainDesc.SwapEffect  = DXGI_SWAP_EFFECT_FLIP_SEQUENTIAL;
>+    swapChainDesc.AlphaMode   = mHasAlpha ? DXGI_ALPHA_MODE_PREMULTIPLIED : DXGI_ALPHA_MODE_IGNORE;
>+    swapChainDesc.Flags = DXGI_SWAP_CHAIN_FLAG::DXGI_SWAP_CHAIN_FLAG_FRAME_LATENCY_WAITABLE_OBJECT;
>+    Microsoft::WRL::ComPtr<IDXGISwapChain1> swapChain1;
>+    hr = factory2->CreateSwapChainForComposition(device, &swapChainDesc, nullptr, &swapChain1);
>+    if (SUCCEEDED(hr))
>+    {
>+        swapChain1.CopyTo(swapChain);
>+    }
>+
>+    hr = interop->CreateCompositionSurfaceForSwapChain(swapChain1.Get(), &mSurface);
>+    if (FAILED(hr))
>+    {
>+        return hr;
>+    }
>+
>+    hr = compositor->CreateSurfaceBrushWithSurface(mSurface.Get(), &mSurfaceBrush);
>+    if (FAILED(hr))
>+    {
>+        return hr;
>+    }
>+
>+    hr = mSurfaceBrush.As(&mCompositionBrush);
>+    if (FAILED(hr))
>+    {
>+        return hr;
>+    }
>+
>+    hr = mHostVisual->put_Brush(mCompositionBrush.Get());
>+    if (FAILED(hr))
>+    {
>+        return hr;
>+    }
>+
>+    return hr;
>+}
>+
>+void CompositorNativeWindow11::commitChange()
>+{
>+    // Windows::UI::Composition uses an implicit commit model hence no action needed here
>+}
>+
>+// static
>+bool CompositorNativeWindow11::IsValidNativeWindow(EGLNativeWindowType window)
>+{
>+    return IsSupportedWinRelease() && IsSpriteVisual(window);
>+}
>+
>+// static
>+bool CompositorNativeWindow11::IsSupportedWinRelease()
>+{
>+    RoHelper helper;
>+    if (!helper.WinRtAvailable())
>+    {
>+        return false;
>+    }
>+
>+    return helper.SupportedWindowsRelease();
>+}
>+
>+bool CompositorNativeWindow11::IsSpriteVisual(EGLNativeWindowType window)
>+{
>+    RoHelper helper;
>+
>+    ABI::Windows::UI::Composition::ISpriteVisual *inspp =
>+        reinterpret_cast<ABI::Windows::UI::Composition::ISpriteVisual *>(window);
>+    HSTRING className, spriteClassName;
>+    HSTRING_HEADER spriteClassNameHeader;
>+
>+    auto hr = helper.GetStringReference(RuntimeClass_Windows_UI_Composition_SpriteVisual,
>+                                        &spriteClassName, &spriteClassNameHeader);
>+    if (FAILED(hr))
>+    {
>+        return false;
>+    }
>+
>+    hr = inspp->GetRuntimeClassName(&className);
>+    if (FAILED(hr))
>+    {
>+        return false;
>+    }
>+
>+    INT32 result = -1;
>+    hr           = helper.WindowsCompareStringOrdinal(className, spriteClassName, &result);
>+
>+    helper.WindowsDeleteString(className);
>+
>+    if (FAILED(hr))
>+    {
>+        return false;
>+    }
>+
>+    if (result == 0)
>+    {
>+        return true;
>+    }
>+
>+    return false;
>+}
>+
>+// RoHelperImpl
>+
>+template <typename T>
>+bool AssignProcAddress(HMODULE comBaseModule, const char *name, T *&outProc)
>+{
>+    outProc = reinterpret_cast<T *>(GetProcAddress(comBaseModule, name));
>+    return *outProc != nullptr;
>+}
>+
>+RoHelper::RoHelper()
>+    : mFpWindowsCreateStringReference(nullptr),
>+      mFpGetActivationFactory(nullptr),
>+      mFpWindowsCompareStringOrdinal(nullptr),
>+      mFpCreateDispatcherQueueController(nullptr),
>+      mFpWindowsDeleteString(nullptr),
>+      mFpRoInitialize(nullptr),
>+      mFpRoUninitialize(nullptr),
>+      mWinRtAvailable(false),
>+      mComBaseModule(nullptr),
>+      mCoreMessagingModule(nullptr)
>+{
>+    if (!IsWindows10OrGreater())
>+    {
>+        return;
>+    }
>+
>+    mComBaseModule = LoadLibraryA("ComBase.dll");
>+
>+    if (mComBaseModule == nullptr)
>+    {
>+        return;
>+    }
>+
>+    if (!AssignProcAddress(mComBaseModule, "WindowsCreateStringReference",
>+                           mFpWindowsCreateStringReference))
>+    {
>+        return;
>+    }
>+
>+    if (!AssignProcAddress(mComBaseModule, "RoGetActivationFactory", mFpGetActivationFactory))
>+    {
>+        return;
>+    }
>+
>+    if (!AssignProcAddress(mComBaseModule, "WindowsCompareStringOrdinal",
>+                           mFpWindowsCompareStringOrdinal))
>+    {
>+        return;
>+    }
>+
>+    if (!AssignProcAddress(mComBaseModule, "WindowsDeleteString", mFpWindowsDeleteString))
>+    {
>+        return;
>+    }
>+
>+    if (!AssignProcAddress(mComBaseModule, "RoInitialize", mFpRoInitialize))
>+    {
>+        return;
>+    }
>+
>+    if (!AssignProcAddress(mComBaseModule, "RoUninitialize", mFpRoUninitialize))
>+    {
>+        return;
>+    }
>+
>+    mCoreMessagingModule = LoadLibraryA("coremessaging.dll");
>+
>+    if (mCoreMessagingModule == nullptr)
>+    {
>+        return;
>+    }
>+
>+    if (!AssignProcAddress(mCoreMessagingModule, "CreateDispatcherQueueController",
>+                           mFpCreateDispatcherQueueController))
>+    {
>+        return;
>+    }
>+
>+    if (SUCCEEDED(RoInitialize(RO_INIT_MULTITHREADED)))
>+    {
>+        mWinRtAvailable = true;
>+    }
>+}
>+
>+RoHelper::~RoHelper()
>+{
>+    if (mWinRtAvailable)
>+    {
>+        RoUninitialize();
>+    }
>+
>+    if (mCoreMessagingModule != nullptr)
>+    {
>+        FreeLibrary(mCoreMessagingModule);
>+        mCoreMessagingModule = nullptr;
>+    }
>+
>+    if (mComBaseModule != nullptr)
>+    {
>+        FreeLibrary(mComBaseModule);
>+        mComBaseModule = nullptr;
>+    }
>+}
>+
>+bool RoHelper::WinRtAvailable() const
>+{
>+    return mWinRtAvailable;
>+}
>+
>+bool RoHelper::SupportedWindowsRelease()
>+{
>+    if (!IsWindows10OrGreater() || !mWinRtAvailable)
>+    {
>+        return false;
>+    }
>+
>+    HSTRING className, contractName;
>+    HSTRING_HEADER classNameHeader, contractNameHeader;
>+    boolean isSupported = false;
>+
>+    HRESULT hr = GetStringReference(RuntimeClass_Windows_Foundation_Metadata_ApiInformation,
>+                                    &className, &classNameHeader);
>+
>+    if (FAILED(hr))
>+    {
>+        return isSupported;
>+    }
>+
>+    Microsoft::WRL::ComPtr<ABI::Windows::Foundation::Metadata::IApiInformationStatics> api;
>+
>+    hr = GetActivationFactory(
>+        className, __uuidof(ABI::Windows::Foundation::Metadata::IApiInformationStatics), &api);
>+
>+    if (FAILED(hr))
>+    {
>+        return isSupported;
>+    }
>+
>+    hr = GetStringReference(L"Windows.Foundation.UniversalApiContract", &contractName,
>+                            &contractNameHeader);
>+    if (FAILED(hr))
>+    {
>+        return isSupported;
>+    }
>+
>+    api->IsApiContractPresentByMajor(contractName, 6, &isSupported);
>+
>+    return isSupported;
>+}
>+
>+HRESULT RoHelper::GetStringReference(PCWSTR source, HSTRING *act, HSTRING_HEADER *header)
>+{
>+    if (!mWinRtAvailable)
>+    {
>+        return E_FAIL;
>+    }
>+
>+    const wchar_t *str = static_cast<const wchar_t *>(source);
>+
>+    unsigned int length;
>+    HRESULT hr = SizeTToUInt32(::wcslen(str), &length);
>+    if (FAILED(hr))
>+    {
>+        return hr;
>+    }
>+
>+    return mFpWindowsCreateStringReference(source, length, header, act);
>+}
>+
>+HRESULT RoHelper::GetActivationFactory(const HSTRING act, const IID &interfaceId, void **fac)
>+{
>+    if (!mWinRtAvailable)
>+    {
>+        return E_FAIL;
>+    }
>+    auto hr = mFpGetActivationFactory(act, interfaceId, fac);
>+    return hr;
>+}
>+
>+HRESULT RoHelper::WindowsCompareStringOrdinal(HSTRING one, HSTRING two, int *result)
>+{
>+    if (!mWinRtAvailable)
>+    {
>+        return E_FAIL;
>+    }
>+    return mFpWindowsCompareStringOrdinal(one, two, result);
>+}
>+
>+HRESULT RoHelper::CreateDispatcherQueueController(
>+    DispatcherQueueOptions options,
>+    ABI::Windows::System::IDispatcherQueueController **dispatcherQueueController)
>+{
>+    if (!mWinRtAvailable)
>+    {
>+        return E_FAIL;
>+    }
>+    return mFpCreateDispatcherQueueController(options, dispatcherQueueController);
>+}
>+
>+HRESULT RoHelper::WindowsDeleteString(HSTRING one)
>+{
>+    if (!mWinRtAvailable)
>+    {
>+        return E_FAIL;
>+    }
>+    return mFpWindowsDeleteString(one);
>+}
>+
>+HRESULT RoHelper::RoInitialize(RO_INIT_TYPE type)
>+{
>+    return mFpRoInitialize(type);
>+}
>+
>+void RoHelper::RoUninitialize()
>+{
>+    mFpRoUninitialize();
>+}
>+
>+}  // namespace rx
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/converged/CompositorNativeWindow11.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/converged/CompositorNativeWindow11.h
>new file mode 100644
>index 00000000000..aebdba1a5c3
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/converged/CompositorNativeWindow11.h
>@@ -0,0 +1,115 @@
>+//
>+// Copyright 2018 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+
>+// CompositorNativeWindow11.h: Implementation of NativeWindow11 using Windows.UI.Composition APIs
>+// which work in both Win32 and WinRT contexts.
>+
>+#ifndef LIBANGLE_RENDERER_D3D_D3D11_CONVERGED_COMPOSITORNATIVEWINDOW11_H_
>+#define LIBANGLE_RENDERER_D3D_D3D11_CONVERGED_COMPOSITORNATIVEWINDOW11_H_
>+
>+#include "libANGLE/renderer/d3d/d3d11/NativeWindow11.h"
>+
>+#include <dispatcherqueue.h>
>+#include <versionhelpers.h>
>+#include <windows.foundation.metadata.h>
>+#include <windows.ui.composition.h>
>+#include <windows.ui.composition.interop.h>
>+#include <wrl.h>
>+
>+namespace rx
>+{
>+
>+class RoHelper
>+{
>+  public:
>+    RoHelper();
>+    ~RoHelper();
>+    bool WinRtAvailable() const;
>+    bool SupportedWindowsRelease();
>+    HRESULT GetStringReference(PCWSTR source, HSTRING *act, HSTRING_HEADER *header);
>+    HRESULT GetActivationFactory(const HSTRING act, const IID &interfaceId, void **fac);
>+    HRESULT WindowsCompareStringOrdinal(HSTRING one, HSTRING two, int *result);
>+    HRESULT CreateDispatcherQueueController(
>+        DispatcherQueueOptions options,
>+        ABI::Windows::System::IDispatcherQueueController **dispatcherQueueController);
>+    HRESULT WindowsDeleteString(HSTRING one);
>+    HRESULT RoInitialize(RO_INIT_TYPE type);
>+    void RoUninitialize();
>+
>+  private:
>+    using WindowsCreateStringReference_ = HRESULT __stdcall(PCWSTR,
>+                                                            UINT32,
>+                                                            HSTRING_HEADER *,
>+                                                            HSTRING *);
>+
>+    using GetActivationFactory_ = HRESULT __stdcall(HSTRING, REFIID, void **);
>+
>+    using WindowsCompareStringOrginal_ = HRESULT __stdcall(HSTRING, HSTRING, int *);
>+
>+    using WindowsDeleteString_ = HRESULT __stdcall(HSTRING);
>+
>+    using CreateDispatcherQueueController_ =
>+        HRESULT __stdcall(DispatcherQueueOptions,
>+                          ABI::Windows::System::IDispatcherQueueController **);
>+
>+    using RoInitialize_   = HRESULT __stdcall(RO_INIT_TYPE);
>+    using RoUninitialize_ = void __stdcall();
>+
>+    WindowsCreateStringReference_ *mFpWindowsCreateStringReference;
>+    GetActivationFactory_ *mFpGetActivationFactory;
>+    WindowsCompareStringOrginal_ *mFpWindowsCompareStringOrdinal;
>+    CreateDispatcherQueueController_ *mFpCreateDispatcherQueueController;
>+    WindowsDeleteString_ *mFpWindowsDeleteString;
>+    RoInitialize_ *mFpRoInitialize;
>+    RoUninitialize_ *mFpRoUninitialize;
>+
>+    bool mWinRtAvailable;
>+
>+    HMODULE mComBaseModule;
>+    HMODULE mCoreMessagingModule;
>+};
>+
>+class CompositorNativeWindow11 : public NativeWindow11
>+{
>+  public:
>+    CompositorNativeWindow11(EGLNativeWindowType window, bool hasAlpha);
>+    ~CompositorNativeWindow11() override;
>+
>+    bool initialize() override;
>+    bool getClientRect(LPRECT rect) const override;
>+    bool isIconic() const override;
>+
>+    HRESULT createSwapChain(ID3D11Device *device,
>+                            IDXGIFactory *factory,
>+                            DXGI_FORMAT format,
>+                            UINT width,
>+                            UINT height,
>+                            UINT samples,
>+                            IDXGISwapChain **swapChain) override;
>+
>+    void commitChange() override;
>+
>+    static bool IsValidNativeWindow(EGLNativeWindowType window);
>+
>+    static bool IsSupportedWinRelease();
>+
>+  private:
>+    static bool IsSpriteVisual(EGLNativeWindowType window);
>+
>+    bool mHasAlpha;
>+
>+    RoHelper mRoHelper;
>+
>+    // Namespace prefix required here for some reason despite using namespace
>+    Microsoft::WRL::ComPtr<ABI::Windows::UI::Composition::ISpriteVisual> mHostVisual;
>+    Microsoft::WRL::ComPtr<ABI::Windows::UI::Composition::ICompositionBrush> mCompositionBrush;
>+    Microsoft::WRL::ComPtr<ABI::Windows::UI::Composition::ICompositionSurface> mSurface;
>+    Microsoft::WRL::ComPtr<ABI::Windows::UI::Composition::ICompositionSurfaceBrush> mSurfaceBrush;
>+};
>+
>+}  // namespace rx
>+
>+#endif  // LIBANGLE_RENDERER_D3D_D3D11_CONVERGED_COMPOSITORNATIVEWINDOW11_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/copyvertex.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/copyvertex.h
>deleted file mode 100644
>index 5501e361f13..00000000000
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/copyvertex.h
>+++ /dev/null
>@@ -1,40 +0,0 @@
>-//
>-// Copyright (c) 2013-2015 The ANGLE Project Authors. All rights reserved.
>-// Use of this source code is governed by a BSD-style license that can be
>-// found in the LICENSE file.
>-//
>-
>-// copyvertex.h: Defines D3D11 vertex buffer copying and conversion functions
>-
>-#ifndef LIBANGLE_RENDERER_D3D_D3D11_COPYVERTEX_H_
>-#define LIBANGLE_RENDERER_D3D_D3D11_COPYVERTEX_H_
>-
>-#include "common/mathutil.h"
>-
>-namespace rx
>-{
>-
>-// 'alphaDefaultValueBits' gives the default value for the alpha channel (4th component)
>-template <typename T, size_t inputComponentCount, size_t outputComponentCount, uint32_t alphaDefaultValueBits>
>-inline void CopyNativeVertexData(const uint8_t *input, size_t stride, size_t count, uint8_t *output);
>-
>-template <size_t inputComponentCount, size_t outputComponentCount>
>-inline void Copy8SintTo16SintVertexData(const uint8_t *input, size_t stride, size_t count, uint8_t *output);
>-
>-template <size_t componentCount>
>-inline void Copy8SnormTo16SnormVertexData(const uint8_t *input, size_t stride, size_t count, uint8_t *output);
>-
>-template <size_t inputComponentCount, size_t outputComponentCount>
>-inline void Copy32FixedTo32FVertexData(const uint8_t *input, size_t stride, size_t count, uint8_t *output);
>-
>-template <typename T, size_t inputComponentCount, size_t outputComponentCount, bool normalized>
>-inline void CopyTo32FVertexData(const uint8_t *input, size_t stride, size_t count, uint8_t *output);
>-
>-template <bool isSigned, bool normalized, bool toFloat>
>-inline void CopyXYZ10W2ToXYZW32FVertexData(const uint8_t *input, size_t stride, size_t count, uint8_t *output);
>-
>-}
>-
>-#include "copyvertex.inl"
>-
>-#endif // LIBANGLE_RENDERER_D3D_D3D11_COPYVERTEX_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/copyvertex.inl b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/copyvertex.inl
>deleted file mode 100644
>index 7c5c157c6fa..00000000000
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/copyvertex.inl
>+++ /dev/null
>@@ -1,386 +0,0 @@
>-//
>-// Copyright (c) 2014-2015 The ANGLE Project Authors. All rights reserved.
>-// Use of this source code is governed by a BSD-style license that can be
>-// found in the LICENSE file.
>-//
>-
>-namespace rx
>-{
>-
>-template <typename T, size_t inputComponentCount, size_t outputComponentCount, uint32_t alphaDefaultValueBits>
>-inline void CopyNativeVertexData(const uint8_t *input, size_t stride, size_t count, uint8_t *output)
>-{
>-    const size_t attribSize = sizeof(T)* inputComponentCount;
>-
>-    if (attribSize == stride && inputComponentCount == outputComponentCount)
>-    {
>-        memcpy(output, input, count * attribSize);
>-        return;
>-    }
>-
>-    if (inputComponentCount == outputComponentCount)
>-    {
>-        for (size_t i = 0; i < count; i++)
>-        {
>-            const T *offsetInput = reinterpret_cast<const T*>(input + (i * stride));
>-            T *offsetOutput = reinterpret_cast<T*>(output) + i * outputComponentCount;
>-
>-            memcpy(offsetOutput, offsetInput, attribSize);
>-        }
>-        return;
>-    }
>-
>-    const T defaultAlphaValue = gl::bitCast<T>(alphaDefaultValueBits);
>-    const size_t lastNonAlphaOutputComponent = std::min<size_t>(outputComponentCount, 3);
>-
>-    for (size_t i = 0; i < count; i++)
>-    {
>-        const T *offsetInput = reinterpret_cast<const T*>(input + (i * stride));
>-        T *offsetOutput = reinterpret_cast<T*>(output) + i * outputComponentCount;
>-
>-        memcpy(offsetOutput, offsetInput, attribSize);
>-
>-        if (inputComponentCount < lastNonAlphaOutputComponent)
>-        {
>-            // Set the remaining G/B channels to 0.
>-            size_t numComponents = (lastNonAlphaOutputComponent - inputComponentCount);
>-            memset(&offsetOutput[inputComponentCount], 0, numComponents * sizeof(T));
>-        }
>-
>-        if (inputComponentCount < outputComponentCount && outputComponentCount == 4)
>-        {
>-            // Set the remaining alpha channel to the defaultAlphaValue.
>-            offsetOutput[3] = defaultAlphaValue;
>-        }
>-    }
>-}
>-
>-template <size_t inputComponentCount, size_t outputComponentCount>
>-inline void Copy8SintTo16SintVertexData(const uint8_t *input, size_t stride, size_t count, uint8_t *output)
>-{
>-    const size_t lastNonAlphaOutputComponent = std::min<size_t>(outputComponentCount, 3);
>-
>-    for (size_t i = 0; i < count; i++)
>-    {
>-        const GLbyte *offsetInput = reinterpret_cast<const GLbyte*>(input + i * stride);
>-        GLshort *offsetOutput = reinterpret_cast<GLshort*>(output)+i * outputComponentCount;
>-
>-        for (size_t j = 0; j < inputComponentCount; j++)
>-        {
>-            offsetOutput[j] = static_cast<GLshort>(offsetInput[j]);
>-        }
>-
>-        for (size_t j = inputComponentCount; j < lastNonAlphaOutputComponent; j++)
>-        {
>-            // Set remaining G/B channels to 0.
>-            offsetOutput[j] = 0;
>-        }
>-
>-        if (inputComponentCount < outputComponentCount && outputComponentCount == 4)
>-        {
>-            // On integer formats, we must set the Alpha channel to 1 if it's unused.
>-            offsetOutput[3] = 1;
>-        }
>-    }
>-}
>-
>-template <size_t inputComponentCount, size_t outputComponentCount>
>-inline void Copy8SnormTo16SnormVertexData(const uint8_t *input, size_t stride, size_t count, uint8_t *output)
>-{
>-    for (size_t i = 0; i < count; i++)
>-    {
>-        const GLbyte *offsetInput = reinterpret_cast<const GLbyte*>(input + i * stride);
>-        GLshort *offsetOutput = reinterpret_cast<GLshort*>(output) + i * outputComponentCount;
>-
>-        for (size_t j = 0; j < inputComponentCount; j++)
>-        {
>-            // The original GLbyte value ranges from -128 to +127 (INT8_MAX).
>-            // When converted to GLshort, the value must be scaled to between -32768 and +32767 (INT16_MAX).
>-            if (offsetInput[j] > 0)
>-            {
>-                offsetOutput[j] = offsetInput[j] << 8 | offsetInput[j] << 1 | ((offsetInput[j] & 0x40) >> 6);
>-            }
>-            else
>-            {
>-                offsetOutput[j] = offsetInput[j] << 8;
>-            }
>-        }
>-
>-        for (size_t j = inputComponentCount; j < std::min<size_t>(outputComponentCount, 3); j++)
>-        {
>-            // Set remaining G/B channels to 0.
>-            offsetOutput[j] = 0;
>-        }
>-
>-        if (inputComponentCount < outputComponentCount && outputComponentCount == 4)
>-        {
>-            // On normalized formats, we must set the Alpha channel to the max value if it's unused.
>-            offsetOutput[3] = INT16_MAX;
>-        }
>-    }
>-}
>-
>-template <size_t inputComponentCount, size_t outputComponentCount>
>-inline void Copy32FixedTo32FVertexData(const uint8_t *input, size_t stride, size_t count, uint8_t *output)
>-{
>-    static const float divisor = 1.0f / (1 << 16);
>-
>-    for (size_t i = 0; i < count; i++)
>-    {
>-        const GLfixed* offsetInput = reinterpret_cast<const GLfixed*>(input + (stride * i));
>-        float* offsetOutput = reinterpret_cast<float*>(output) + i * outputComponentCount;
>-
>-        for (size_t j = 0; j < inputComponentCount; j++)
>-        {
>-            offsetOutput[j] = static_cast<float>(offsetInput[j]) * divisor;
>-        }
>-
>-        // 4-component output formats would need special padding in the alpha channel.
>-        static_assert(!(inputComponentCount < 4 && outputComponentCount == 4),
>-                      "An inputComponentCount less than 4 and an outputComponentCount equal to 4 is not supported.");
>-
>-        for (size_t j = inputComponentCount; j < outputComponentCount; j++)
>-        {
>-            offsetOutput[j] = 0.0f;
>-        }
>-    }
>-}
>-
>-template <typename T, size_t inputComponentCount, size_t outputComponentCount, bool normalized>
>-inline void CopyTo32FVertexData(const uint8_t *input, size_t stride, size_t count, uint8_t *output)
>-{
>-    typedef std::numeric_limits<T> NL;
>-
>-    for (size_t i = 0; i < count; i++)
>-    {
>-        const T *offsetInput = reinterpret_cast<const T*>(input + (stride * i));
>-        float *offsetOutput = reinterpret_cast<float*>(output) + i * outputComponentCount;
>-
>-        for (size_t j = 0; j < inputComponentCount; j++)
>-        {
>-            if (normalized)
>-            {
>-                if (NL::is_signed)
>-                {
>-                    const float divisor = 1.0f / (2 * static_cast<float>(NL::max()) + 1);
>-                    offsetOutput[j] = (2 * static_cast<float>(offsetInput[j]) + 1) * divisor;
>-                }
>-                else
>-                {
>-                    offsetOutput[j] =  static_cast<float>(offsetInput[j]) / NL::max();
>-                }
>-            }
>-            else
>-            {
>-                offsetOutput[j] =  static_cast<float>(offsetInput[j]);
>-            }
>-        }
>-
>-        // This would require special padding.
>-        static_assert(!(inputComponentCount < 4 && outputComponentCount == 4),
>-                      "An inputComponentCount less than 4 and an outputComponentCount equal to 4 is not supported.");
>-
>-        for (size_t j = inputComponentCount; j < outputComponentCount; j++)
>-        {
>-            offsetOutput[j] = 0.0f;
>-        }
>-    }
>-}
>-
>-namespace priv
>-{
>-
>-template <bool isSigned, bool normalized, bool toFloat>
>-static inline void CopyPackedRGB(uint32_t data, uint8_t *output)
>-{
>-    const uint32_t rgbSignMask = 0x200;       // 1 set at the 9 bit
>-    const uint32_t negativeMask = 0xFFFFFC00; // All bits from 10 to 31 set to 1
>-
>-    if (toFloat)
>-    {
>-        GLfloat *floatOutput = reinterpret_cast<GLfloat*>(output);
>-        if (isSigned)
>-        {
>-            GLfloat finalValue = 0;
>-            if (data & rgbSignMask)
>-            {
>-                int negativeNumber = data | negativeMask;
>-                finalValue = static_cast<GLfloat>(negativeNumber);
>-            }
>-            else
>-            {
>-                finalValue = static_cast<GLfloat>(data);
>-            }
>-
>-            if (normalized)
>-            {
>-                const int32_t maxValue = 0x1FF;      // 1 set in bits 0 through 8
>-                const int32_t minValue = 0xFFFFFE01; // Inverse of maxValue
>-
>-                // A 10-bit two's complement number has the possibility of being minValue - 1 but
>-                // OpenGL's normalization rules dictate that it should be clamped to minValue in this
>-                // case.
>-                if (finalValue < minValue)
>-                {
>-                    finalValue = minValue;
>-                }
>-
>-                const int32_t halfRange = (maxValue - minValue) >> 1;
>-                *floatOutput = ((finalValue - minValue) / halfRange) - 1.0f;
>-            }
>-            else
>-            {
>-                *floatOutput = finalValue;
>-            }
>-        }
>-        else
>-        {
>-            if (normalized)
>-            {
>-                const uint32_t maxValue = 0x3FF; // 1 set in bits 0 through 9
>-                *floatOutput = static_cast<GLfloat>(data) / static_cast<GLfloat>(maxValue);
>-            }
>-            else
>-            {
>-                *floatOutput = static_cast<GLfloat>(data);
>-            }
>-        }
>-    }
>-    else
>-    {
>-        if (isSigned)
>-        {
>-            GLshort *intOutput = reinterpret_cast<GLshort*>(output);
>-
>-            if (data & rgbSignMask)
>-            {
>-                *intOutput = static_cast<GLshort>(data | negativeMask);
>-            }
>-            else
>-            {
>-                *intOutput = static_cast<GLshort>(data);
>-            }
>-        }
>-        else
>-        {
>-            GLushort *uintOutput = reinterpret_cast<GLushort*>(output);
>-            *uintOutput = static_cast<GLushort>(data);
>-        }
>-    }
>-}
>-
>-template <bool isSigned, bool normalized, bool toFloat>
>-inline void CopyPackedAlpha(uint32_t data, uint8_t *output)
>-{
>-    if (toFloat)
>-    {
>-        GLfloat *floatOutput = reinterpret_cast<GLfloat*>(output);
>-        if (isSigned)
>-        {
>-            if (normalized)
>-            {
>-                switch (data)
>-                {
>-                  case 0x0: *floatOutput =  0.0f; break;
>-                  case 0x1: *floatOutput =  1.0f; break;
>-                  case 0x2: *floatOutput = -1.0f; break;
>-                  case 0x3: *floatOutput = -1.0f; break;
>-                  default: UNREACHABLE();
>-                }
>-            }
>-            else
>-            {
>-                switch (data)
>-                {
>-                  case 0x0: *floatOutput =  0.0f; break;
>-                  case 0x1: *floatOutput =  1.0f; break;
>-                  case 0x2: *floatOutput = -2.0f; break;
>-                  case 0x3: *floatOutput = -1.0f; break;
>-                  default: UNREACHABLE();
>-                }
>-            }
>-        }
>-        else
>-        {
>-            if (normalized)
>-            {
>-                switch (data)
>-                {
>-                  case 0x0: *floatOutput = 0.0f / 3.0f; break;
>-                  case 0x1: *floatOutput = 1.0f / 3.0f; break;
>-                  case 0x2: *floatOutput = 2.0f / 3.0f; break;
>-                  case 0x3: *floatOutput = 3.0f / 3.0f; break;
>-                  default: UNREACHABLE();
>-                }
>-            }
>-            else
>-            {
>-                switch (data)
>-                {
>-                  case 0x0: *floatOutput = 0.0f; break;
>-                  case 0x1: *floatOutput = 1.0f; break;
>-                  case 0x2: *floatOutput = 2.0f; break;
>-                  case 0x3: *floatOutput = 3.0f; break;
>-                  default: UNREACHABLE();
>-                }
>-            }
>-        }
>-    }
>-    else
>-    {
>-        if (isSigned)
>-        {
>-            GLshort *intOutput = reinterpret_cast<GLshort*>(output);
>-            switch (data)
>-            {
>-              case 0x0: *intOutput =  0; break;
>-              case 0x1: *intOutput =  1; break;
>-              case 0x2: *intOutput = -2; break;
>-              case 0x3: *intOutput = -1; break;
>-              default: UNREACHABLE();
>-            }
>-        }
>-        else
>-        {
>-            GLushort *uintOutput = reinterpret_cast<GLushort*>(output);
>-            switch (data)
>-            {
>-              case 0x0: *uintOutput = 0; break;
>-              case 0x1: *uintOutput = 1; break;
>-              case 0x2: *uintOutput = 2; break;
>-              case 0x3: *uintOutput = 3; break;
>-              default: UNREACHABLE();
>-            }
>-        }
>-    }
>-}
>-
>-}
>-
>-template <bool isSigned, bool normalized, bool toFloat>
>-inline void CopyXYZ10W2ToXYZW32FVertexData(const uint8_t *input, size_t stride, size_t count, uint8_t *output)
>-{
>-    const size_t outputComponentSize = toFloat ? 4 : 2;
>-    const size_t componentCount = 4;
>-
>-    const uint32_t rgbMask = 0x3FF; // 1 set in bits 0 through 9
>-    const size_t redShift = 0;    // red is bits 0 through 9
>-    const size_t greenShift = 10; // green is bits 10 through 19
>-    const size_t blueShift = 20;  // blue is bits 20 through 29
>-
>-    const uint32_t alphaMask = 0x3; // 1 set in bits 0 and 1
>-    const size_t alphaShift = 30; // Alpha is the 30 and 31 bits
>-
>-    for (size_t i = 0; i < count; i++)
>-    {
>-        GLuint packedValue = *reinterpret_cast<const GLuint*>(input + (i * stride));
>-        uint8_t *offsetOutput = output + (i * outputComponentSize * componentCount);
>-
>-        priv::CopyPackedRGB<isSigned, normalized, toFloat>(  (packedValue >> redShift)   & rgbMask,   offsetOutput + (0 * outputComponentSize));
>-        priv::CopyPackedRGB<isSigned, normalized, toFloat>(  (packedValue >> greenShift) & rgbMask,   offsetOutput + (1 * outputComponentSize));
>-        priv::CopyPackedRGB<isSigned, normalized, toFloat>(  (packedValue >> blueShift)  & rgbMask,   offsetOutput + (2 * outputComponentSize));
>-        priv::CopyPackedAlpha<isSigned, normalized, toFloat>((packedValue >> alphaShift) & alphaMask, offsetOutput + (3 * outputComponentSize));
>-    }
>-}
>-
>-}
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/d3d11_blit_shaders_autogen.gni b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/d3d11_blit_shaders_autogen.gni
>new file mode 100644
>index 00000000000..988ae52724c
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/d3d11_blit_shaders_autogen.gni
>@@ -0,0 +1,136 @@
>+# GENERATED FILE - DO NOT EDIT.
>+# Generated by gen_blit11helper.py.
>+#
>+# Copyright 2019 The ANGLE Project Authors. All rights reserved.
>+# Use of this source code is governed by a BSD-style license that can be
>+# found in the LICENSE file.
>+#
>+# d3d11_blit_shaders_autogen.gni:
>+#   List of generated blit shaders for inclusion in ANGLE's build process.
>+
>+libangle_d3d11_blit_shaders = [
>+  "src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgba2d11ps.h",
>+  "src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgb2d11ps.h",
>+  "src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrg2d11ps.h",
>+  "src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughr2d11ps.h",
>+  "src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthrougha2d11ps.h",
>+  "src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughlum2d11ps.h",
>+  "src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughlumalpha2d11ps.h",
>+  "src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgba2dui11ps.h",
>+  "src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgba2di11ps.h",
>+  "src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgb2dui11ps.h",
>+  "src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgb2di11ps.h",
>+  "src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrg2dui11ps.h",
>+  "src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrg2di11ps.h",
>+  "src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughr2dui11ps.h",
>+  "src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughr2di11ps.h",
>+  "src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_pm_rgba_2d_ps.h",
>+  "src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_um_rgba_2d_ps.h",
>+  "src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_pm_rgb_2d_ps.h",
>+  "src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_um_rgb_2d_ps.h",
>+  "src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftou_pt_rgba_2d_ps.h",
>+  "src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftou_pm_rgba_2d_ps.h",
>+  "src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftou_um_rgba_2d_ps.h",
>+  "src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftou_pt_rgb_2d_ps.h",
>+  "src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftou_pm_rgb_2d_ps.h",
>+  "src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftou_um_rgb_2d_ps.h",
>+  "src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_pm_luma_2d_ps.h",
>+  "src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_um_luma_2d_ps.h",
>+  "src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_pm_lumaalpha_2d_ps.h",
>+  "src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_um_lumaalpha_2d_ps.h",
>+  "src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgba2d_4444_11ps.h",
>+  "src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_pm_rgba_4444_2d_ps.h",
>+  "src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_um_rgba_4444_2d_ps.h",
>+  "src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgb2d_565_11ps.h",
>+  "src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_pm_rgb_565_2d_ps.h",
>+  "src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_um_rgb_565_2d_ps.h",
>+  "src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgba2d_5551_11ps.h",
>+  "src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_pm_rgba_5551_2d_ps.h",
>+  "src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_um_rgba_5551_2d_ps.h",
>+  "src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgba3d11ps.h",
>+  "src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgb3d11ps.h",
>+  "src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrg3d11ps.h",
>+  "src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughr3d11ps.h",
>+  "src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughlum3d11ps.h",
>+  "src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughlumalpha3d11ps.h",
>+  "src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgba3dui11ps.h",
>+  "src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgba3di11ps.h",
>+  "src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgb3dui11ps.h",
>+  "src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgb3di11ps.h",
>+  "src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrg3dui11ps.h",
>+  "src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrg3di11ps.h",
>+  "src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughr3dui11ps.h",
>+  "src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughr3di11ps.h",
>+  "src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_pm_rgba_3d_ps.h",
>+  "src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_um_rgba_3d_ps.h",
>+  "src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_pm_rgb_3d_ps.h",
>+  "src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_um_rgb_3d_ps.h",
>+  "src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftou_pt_rgba_3d_ps.h",
>+  "src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftou_pm_rgba_3d_ps.h",
>+  "src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftou_um_rgba_3d_ps.h",
>+  "src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftou_pt_rgb_3d_ps.h",
>+  "src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftou_pm_rgb_3d_ps.h",
>+  "src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftou_um_rgb_3d_ps.h",
>+  "src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftoi_pt_rgba_3d_ps.h",
>+  "src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftoi_pm_rgba_3d_ps.h",
>+  "src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftoi_um_rgba_3d_ps.h",
>+  "src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftoi_pt_rgb_3d_ps.h",
>+  "src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftoi_pm_rgb_3d_ps.h",
>+  "src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftoi_um_rgb_3d_ps.h",
>+  "src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_pm_luma_3d_ps.h",
>+  "src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_um_luma_3d_ps.h",
>+  "src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_pm_lumaalpha_3d_ps.h",
>+  "src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_um_lumaalpha_3d_ps.h",
>+  "src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgba3d_4444_11ps.h",
>+  "src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_pm_rgba_4444_3d_ps.h",
>+  "src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_um_rgba_4444_3d_ps.h",
>+  "src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgb3d_565_11ps.h",
>+  "src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_pm_rgb_565_3d_ps.h",
>+  "src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_um_rgb_565_3d_ps.h",
>+  "src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgba3d_5551_11ps.h",
>+  "src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_pm_rgba_5551_3d_ps.h",
>+  "src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_um_rgba_5551_3d_ps.h",
>+  "src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgba2darray11ps.h",
>+  "src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgb2darray11ps.h",
>+  "src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrg2darray11ps.h",
>+  "src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughr2darray11ps.h",
>+  "src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughlum2darray11ps.h",
>+  "src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughlumalpha2darray11ps.h",
>+  "src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgba2darrayui11ps.h",
>+  "src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgba2darrayi11ps.h",
>+  "src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgb2darrayui11ps.h",
>+  "src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgb2darrayi11ps.h",
>+  "src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrg2darrayui11ps.h",
>+  "src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrg2darrayi11ps.h",
>+  "src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughr2darrayui11ps.h",
>+  "src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughr2darrayi11ps.h",
>+  "src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_pm_rgba_2darray_ps.h",
>+  "src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_um_rgba_2darray_ps.h",
>+  "src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_pm_rgb_2darray_ps.h",
>+  "src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_um_rgb_2darray_ps.h",
>+  "src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftou_pt_rgba_2darray_ps.h",
>+  "src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftou_pm_rgba_2darray_ps.h",
>+  "src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftou_um_rgba_2darray_ps.h",
>+  "src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftou_pt_rgb_2darray_ps.h",
>+  "src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftou_pm_rgb_2darray_ps.h",
>+  "src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftou_um_rgb_2darray_ps.h",
>+  "src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftoi_pt_rgba_2darray_ps.h",
>+  "src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftoi_pm_rgba_2darray_ps.h",
>+  "src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftoi_um_rgba_2darray_ps.h",
>+  "src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftoi_pt_rgb_2darray_ps.h",
>+  "src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftoi_pm_rgb_2darray_ps.h",
>+  "src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftoi_um_rgb_2darray_ps.h",
>+  "src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_pm_luma_2darray_ps.h",
>+  "src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_um_luma_2darray_ps.h",
>+  "src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_pm_lumaalpha_2darray_ps.h",
>+  "src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_um_lumaalpha_2darray_ps.h",
>+  "src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgba2darray_4444_11ps.h",
>+  "src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_pm_rgba_4444_2darray_ps.h",
>+  "src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_um_rgba_4444_2darray_ps.h",
>+  "src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgb2darray_565_11ps.h",
>+  "src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_pm_rgb_565_2darray_ps.h",
>+  "src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_um_rgb_565_2darray_ps.h",
>+  "src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgba2darray_5551_11ps.h",
>+  "src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_pm_rgba_5551_2darray_ps.h",
>+  "src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_um_rgba_5551_2darray_ps.h",
>+]
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/dxgi_format_map_autogen.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/dxgi_format_map_autogen.cpp
>index b0697bc5dbb..bfcf0550b2b 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/dxgi_format_map_autogen.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/dxgi_format_map_autogen.cpp
>@@ -1,7 +1,7 @@
> // GENERATED FILE - DO NOT EDIT.
> // Generated by gen_dxgi_format_table.py using data from dxgi_format_data.json.
> //
>-// Copyright 2017 The ANGLE Project Authors. All rights reserved.
>+// Copyright 2019 The ANGLE Project Authors. All rights reserved.
> // Use of this source code is governed by a BSD-style license that can be
> // found in the LICENSE file.
> //
>@@ -276,47 +276,47 @@ const Format &GetFormat(DXGI_FORMAT dxgiFormat)
>         case DXGI_FORMAT_A8P8:
>             break;
>         case DXGI_FORMAT_A8_UNORM:
>-            return Format::Get(Format::ID::A8_UNORM);
>+            return Format::Get(FormatID::A8_UNORM);
>         case DXGI_FORMAT_AI44:
>             break;
>         case DXGI_FORMAT_AYUV:
>             break;
>         case DXGI_FORMAT_B4G4R4A4_UNORM:
>-            return Format::Get(Format::ID::B4G4R4A4_UNORM);
>+            return Format::Get(FormatID::B4G4R4A4_UNORM);
>         case DXGI_FORMAT_B5G5R5A1_UNORM:
>-            return Format::Get(Format::ID::B5G5R5A1_UNORM);
>+            return Format::Get(FormatID::B5G5R5A1_UNORM);
>         case DXGI_FORMAT_B5G6R5_UNORM:
>-            return Format::Get(Format::ID::B5G6R5_UNORM);
>+            return Format::Get(FormatID::B5G6R5_UNORM);
>         case DXGI_FORMAT_B8G8R8A8_TYPELESS:
>-            break;
>+            return Format::Get(FormatID::B8G8R8A8_TYPELESS);
>         case DXGI_FORMAT_B8G8R8A8_UNORM:
>-            return Format::Get(Format::ID::B8G8R8A8_UNORM);
>+            return Format::Get(FormatID::B8G8R8A8_UNORM);
>         case DXGI_FORMAT_B8G8R8A8_UNORM_SRGB:
>-            return Format::Get(Format::ID::B8G8R8A8_UNORM_SRGB);
>+            return Format::Get(FormatID::B8G8R8A8_UNORM_SRGB);
>         case DXGI_FORMAT_B8G8R8X8_TYPELESS:
>             break;
>         case DXGI_FORMAT_B8G8R8X8_UNORM:
>-            return Format::Get(Format::ID::B8G8R8X8_UNORM);
>+            return Format::Get(FormatID::B8G8R8X8_UNORM);
>         case DXGI_FORMAT_B8G8R8X8_UNORM_SRGB:
>             break;
>         case DXGI_FORMAT_BC1_TYPELESS:
>             break;
>         case DXGI_FORMAT_BC1_UNORM:
>-            return Format::Get(Format::ID::BC1_RGBA_UNORM_BLOCK);
>+            return Format::Get(FormatID::BC1_RGBA_UNORM_BLOCK);
>         case DXGI_FORMAT_BC1_UNORM_SRGB:
>-            return Format::Get(Format::ID::BC1_RGBA_UNORM_SRGB_BLOCK);
>+            return Format::Get(FormatID::BC1_RGBA_UNORM_SRGB_BLOCK);
>         case DXGI_FORMAT_BC2_TYPELESS:
>             break;
>         case DXGI_FORMAT_BC2_UNORM:
>-            return Format::Get(Format::ID::BC2_RGBA_UNORM_BLOCK);
>+            return Format::Get(FormatID::BC2_RGBA_UNORM_BLOCK);
>         case DXGI_FORMAT_BC2_UNORM_SRGB:
>-            return Format::Get(Format::ID::BC2_RGBA_UNORM_SRGB_BLOCK);
>+            return Format::Get(FormatID::BC2_RGBA_UNORM_SRGB_BLOCK);
>         case DXGI_FORMAT_BC3_TYPELESS:
>             break;
>         case DXGI_FORMAT_BC3_UNORM:
>-            return Format::Get(Format::ID::BC3_RGBA_UNORM_BLOCK);
>+            return Format::Get(FormatID::BC3_RGBA_UNORM_BLOCK);
>         case DXGI_FORMAT_BC3_UNORM_SRGB:
>-            return Format::Get(Format::ID::BC3_RGBA_UNORM_SRGB_BLOCK);
>+            return Format::Get(FormatID::BC3_RGBA_UNORM_SRGB_BLOCK);
>         case DXGI_FORMAT_BC4_SNORM:
>             break;
>         case DXGI_FORMAT_BC4_TYPELESS:
>@@ -342,13 +342,13 @@ const Format &GetFormat(DXGI_FORMAT dxgiFormat)
>         case DXGI_FORMAT_BC7_UNORM_SRGB:
>             break;
>         case DXGI_FORMAT_D16_UNORM:
>-            return Format::Get(Format::ID::D16_UNORM);
>+            return Format::Get(FormatID::D16_UNORM);
>         case DXGI_FORMAT_D24_UNORM_S8_UINT:
>-            return Format::Get(Format::ID::D24_UNORM_S8_UINT);
>+            return Format::Get(FormatID::D24_UNORM_S8_UINT);
>         case DXGI_FORMAT_D32_FLOAT:
>-            return Format::Get(Format::ID::D32_FLOAT);
>+            return Format::Get(FormatID::D32_FLOAT);
>         case DXGI_FORMAT_D32_FLOAT_S8X24_UINT:
>-            return Format::Get(Format::ID::D32_FLOAT_S8X24_UINT);
>+            return Format::Get(FormatID::D32_FLOAT_S8X24_UINT);
>         case DXGI_FORMAT_G8R8_G8B8_UNORM:
>             break;
>         case DXGI_FORMAT_IA44:
>@@ -366,49 +366,49 @@ const Format &GetFormat(DXGI_FORMAT dxgiFormat)
>         case DXGI_FORMAT_R10G10B10A2_TYPELESS:
>             break;
>         case DXGI_FORMAT_R10G10B10A2_UINT:
>-            return Format::Get(Format::ID::R10G10B10A2_UINT);
>+            return Format::Get(FormatID::R10G10B10A2_UINT);
>         case DXGI_FORMAT_R10G10B10A2_UNORM:
>-            return Format::Get(Format::ID::R10G10B10A2_UNORM);
>+            return Format::Get(FormatID::R10G10B10A2_UNORM);
>         case DXGI_FORMAT_R10G10B10_XR_BIAS_A2_UNORM:
>             break;
>         case DXGI_FORMAT_R11G11B10_FLOAT:
>-            return Format::Get(Format::ID::R11G11B10_FLOAT);
>+            return Format::Get(FormatID::R11G11B10_FLOAT);
>         case DXGI_FORMAT_R16G16B16A16_FLOAT:
>-            return Format::Get(Format::ID::R16G16B16A16_FLOAT);
>+            return Format::Get(FormatID::R16G16B16A16_FLOAT);
>         case DXGI_FORMAT_R16G16B16A16_SINT:
>-            return Format::Get(Format::ID::R16G16B16A16_SINT);
>+            return Format::Get(FormatID::R16G16B16A16_SINT);
>         case DXGI_FORMAT_R16G16B16A16_SNORM:
>-            return Format::Get(Format::ID::R16G16B16A16_SNORM);
>+            return Format::Get(FormatID::R16G16B16A16_SNORM);
>         case DXGI_FORMAT_R16G16B16A16_TYPELESS:
>             break;
>         case DXGI_FORMAT_R16G16B16A16_UINT:
>-            return Format::Get(Format::ID::R16G16B16A16_UINT);
>+            return Format::Get(FormatID::R16G16B16A16_UINT);
>         case DXGI_FORMAT_R16G16B16A16_UNORM:
>-            return Format::Get(Format::ID::R16G16B16A16_UNORM);
>+            return Format::Get(FormatID::R16G16B16A16_UNORM);
>         case DXGI_FORMAT_R16G16_FLOAT:
>-            return Format::Get(Format::ID::R16G16_FLOAT);
>+            return Format::Get(FormatID::R16G16_FLOAT);
>         case DXGI_FORMAT_R16G16_SINT:
>-            return Format::Get(Format::ID::R16G16_SINT);
>+            return Format::Get(FormatID::R16G16_SINT);
>         case DXGI_FORMAT_R16G16_SNORM:
>-            return Format::Get(Format::ID::R16G16_SNORM);
>+            return Format::Get(FormatID::R16G16_SNORM);
>         case DXGI_FORMAT_R16G16_TYPELESS:
>             break;
>         case DXGI_FORMAT_R16G16_UINT:
>-            return Format::Get(Format::ID::R16G16_UINT);
>+            return Format::Get(FormatID::R16G16_UINT);
>         case DXGI_FORMAT_R16G16_UNORM:
>-            return Format::Get(Format::ID::R16G16_UNORM);
>+            return Format::Get(FormatID::R16G16_UNORM);
>         case DXGI_FORMAT_R16_FLOAT:
>-            return Format::Get(Format::ID::R16_FLOAT);
>+            return Format::Get(FormatID::R16_FLOAT);
>         case DXGI_FORMAT_R16_SINT:
>-            return Format::Get(Format::ID::R16_SINT);
>+            return Format::Get(FormatID::R16_SINT);
>         case DXGI_FORMAT_R16_SNORM:
>-            return Format::Get(Format::ID::R16_SNORM);
>+            return Format::Get(FormatID::R16_SNORM);
>         case DXGI_FORMAT_R16_TYPELESS:
>             break;
>         case DXGI_FORMAT_R16_UINT:
>-            return Format::Get(Format::ID::R16_UINT);
>+            return Format::Get(FormatID::R16_UINT);
>         case DXGI_FORMAT_R16_UNORM:
>-            return Format::Get(Format::ID::R16_UNORM);
>+            return Format::Get(FormatID::R16_UNORM);
>         case DXGI_FORMAT_R1_UNORM:
>             break;
>         case DXGI_FORMAT_R24G8_TYPELESS:
>@@ -416,79 +416,79 @@ const Format &GetFormat(DXGI_FORMAT dxgiFormat)
>         case DXGI_FORMAT_R24_UNORM_X8_TYPELESS:
>             break;
>         case DXGI_FORMAT_R32G32B32A32_FLOAT:
>-            return Format::Get(Format::ID::R32G32B32A32_FLOAT);
>+            return Format::Get(FormatID::R32G32B32A32_FLOAT);
>         case DXGI_FORMAT_R32G32B32A32_SINT:
>-            return Format::Get(Format::ID::R32G32B32A32_SINT);
>+            return Format::Get(FormatID::R32G32B32A32_SINT);
>         case DXGI_FORMAT_R32G32B32A32_TYPELESS:
>             break;
>         case DXGI_FORMAT_R32G32B32A32_UINT:
>-            return Format::Get(Format::ID::R32G32B32A32_UINT);
>+            return Format::Get(FormatID::R32G32B32A32_UINT);
>         case DXGI_FORMAT_R32G32B32_FLOAT:
>-            return Format::Get(Format::ID::R32G32B32_FLOAT);
>+            return Format::Get(FormatID::R32G32B32_FLOAT);
>         case DXGI_FORMAT_R32G32B32_SINT:
>-            return Format::Get(Format::ID::R32G32B32_SINT);
>+            return Format::Get(FormatID::R32G32B32_SINT);
>         case DXGI_FORMAT_R32G32B32_TYPELESS:
>             break;
>         case DXGI_FORMAT_R32G32B32_UINT:
>-            return Format::Get(Format::ID::R32G32B32_UINT);
>+            return Format::Get(FormatID::R32G32B32_UINT);
>         case DXGI_FORMAT_R32G32_FLOAT:
>-            return Format::Get(Format::ID::R32G32_FLOAT);
>+            return Format::Get(FormatID::R32G32_FLOAT);
>         case DXGI_FORMAT_R32G32_SINT:
>-            return Format::Get(Format::ID::R32G32_SINT);
>+            return Format::Get(FormatID::R32G32_SINT);
>         case DXGI_FORMAT_R32G32_TYPELESS:
>             break;
>         case DXGI_FORMAT_R32G32_UINT:
>-            return Format::Get(Format::ID::R32G32_UINT);
>+            return Format::Get(FormatID::R32G32_UINT);
>         case DXGI_FORMAT_R32G8X24_TYPELESS:
>             break;
>         case DXGI_FORMAT_R32_FLOAT:
>-            return Format::Get(Format::ID::R32_FLOAT);
>+            return Format::Get(FormatID::R32_FLOAT);
>         case DXGI_FORMAT_R32_FLOAT_X8X24_TYPELESS:
>             break;
>         case DXGI_FORMAT_R32_SINT:
>-            return Format::Get(Format::ID::R32_SINT);
>+            return Format::Get(FormatID::R32_SINT);
>         case DXGI_FORMAT_R32_TYPELESS:
>             break;
>         case DXGI_FORMAT_R32_UINT:
>-            return Format::Get(Format::ID::R32_UINT);
>+            return Format::Get(FormatID::R32_UINT);
>         case DXGI_FORMAT_R8G8B8A8_SINT:
>-            return Format::Get(Format::ID::R8G8B8A8_SINT);
>+            return Format::Get(FormatID::R8G8B8A8_SINT);
>         case DXGI_FORMAT_R8G8B8A8_SNORM:
>-            return Format::Get(Format::ID::R8G8B8A8_SNORM);
>+            return Format::Get(FormatID::R8G8B8A8_SNORM);
>         case DXGI_FORMAT_R8G8B8A8_TYPELESS:
>-            break;
>+            return Format::Get(FormatID::R8G8B8A8_TYPELESS);
>         case DXGI_FORMAT_R8G8B8A8_UINT:
>-            return Format::Get(Format::ID::R8G8B8A8_UINT);
>+            return Format::Get(FormatID::R8G8B8A8_UINT);
>         case DXGI_FORMAT_R8G8B8A8_UNORM:
>-            return Format::Get(Format::ID::R8G8B8A8_UNORM);
>+            return Format::Get(FormatID::R8G8B8A8_UNORM);
>         case DXGI_FORMAT_R8G8B8A8_UNORM_SRGB:
>-            return Format::Get(Format::ID::R8G8B8A8_UNORM_SRGB);
>+            return Format::Get(FormatID::R8G8B8A8_UNORM_SRGB);
>         case DXGI_FORMAT_R8G8_B8G8_UNORM:
>             break;
>         case DXGI_FORMAT_R8G8_SINT:
>-            return Format::Get(Format::ID::R8G8_SINT);
>+            return Format::Get(FormatID::R8G8_SINT);
>         case DXGI_FORMAT_R8G8_SNORM:
>-            return Format::Get(Format::ID::R8G8_SNORM);
>+            return Format::Get(FormatID::R8G8_SNORM);
>         case DXGI_FORMAT_R8G8_TYPELESS:
>             break;
>         case DXGI_FORMAT_R8G8_UINT:
>-            return Format::Get(Format::ID::R8G8_UINT);
>+            return Format::Get(FormatID::R8G8_UINT);
>         case DXGI_FORMAT_R8G8_UNORM:
>-            return Format::Get(Format::ID::R8G8_UNORM);
>+            return Format::Get(FormatID::R8G8_UNORM);
>         case DXGI_FORMAT_R8_SINT:
>-            return Format::Get(Format::ID::R8_SINT);
>+            return Format::Get(FormatID::R8_SINT);
>         case DXGI_FORMAT_R8_SNORM:
>-            return Format::Get(Format::ID::R8_SNORM);
>+            return Format::Get(FormatID::R8_SNORM);
>         case DXGI_FORMAT_R8_TYPELESS:
>             break;
>         case DXGI_FORMAT_R8_UINT:
>-            return Format::Get(Format::ID::R8_UINT);
>+            return Format::Get(FormatID::R8_UINT);
>         case DXGI_FORMAT_R8_UNORM:
>-            return Format::Get(Format::ID::R8_UNORM);
>+            return Format::Get(FormatID::R8_UNORM);
>         case DXGI_FORMAT_R9G9B9E5_SHAREDEXP:
>-            return Format::Get(Format::ID::R9G9B9E5_SHAREDEXP);
>+            return Format::Get(FormatID::R9G9B9E5_SHAREDEXP);
>         case DXGI_FORMAT_UNKNOWN:
>-            return Format::Get(Format::ID::NONE);
>+            return Format::Get(FormatID::NONE);
>         case DXGI_FORMAT_X24_TYPELESS_G8_UINT:
>             break;
>         case DXGI_FORMAT_X32_TYPELESS_G8X24_UINT:
>@@ -508,7 +508,7 @@ const Format &GetFormat(DXGI_FORMAT dxgiFormat)
>     }
> 
>     UNREACHABLE();
>-    return Format::Get(Format::ID::NONE);
>+    return Format::Get(FormatID::NONE);
> }
> 
> }  // namespace d3d11_angle
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/dxgi_support_data.json b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/dxgi_support_data.json
>index 942745674f0..d705b9ec409 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/dxgi_support_data.json
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/dxgi_support_data.json
>@@ -1005,11 +1005,11 @@
>       "texture2D": "check",
>       "texture3D": "check",
>       "textureCube": "check",
>-      "shaderSample": "10_0check11_0always",
>-      "renderTarget": "11_0",
>+      "shaderSample": "9_3check11_0always",
>+      "renderTarget": "dxgi1_2",
>       "multisampleRT": "check",
>       "depthStencil": "never",
>-      "mipAutoGen": "never"
>+      "mipAutoGen": "dxgi1_2"
>     },
>     "DXGI_FORMAT_B8G8R8X8_TYPELESS":
>     {
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/dxgi_support_table.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/dxgi_support_table.cpp
>deleted file mode 100644
>index 4d7e46bdf2c..00000000000
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/dxgi_support_table.cpp
>+++ /dev/null
>@@ -1,3042 +0,0 @@
>-// GENERATED FILE - DO NOT EDIT. See dxgi_support_data.json.
>-//
>-// Copyright 2015 The ANGLE Project Authors. All rights reserved.
>-// Use of this source code is governed by a BSD-style license that can be
>-// found in the LICENSE file.
>-//
>-// dxgi_support_table:
>-//   Queries for DXGI support of various texture formats. Depends on DXGI
>-//   version, D3D feature level, and is sometimes guaranteed or optional.
>-//
>-
>-#include "libANGLE/renderer/d3d/d3d11/dxgi_support_table.h"
>-
>-#include "common/debug.h"
>-
>-namespace rx
>-{
>-
>-namespace d3d11
>-{
>-
>-#define F_2D D3D11_FORMAT_SUPPORT_TEXTURE2D
>-#define F_3D D3D11_FORMAT_SUPPORT_TEXTURE3D
>-#define F_CUBE D3D11_FORMAT_SUPPORT_TEXTURECUBE
>-#define F_SAMPLE D3D11_FORMAT_SUPPORT_SHADER_SAMPLE
>-#define F_RT D3D11_FORMAT_SUPPORT_RENDER_TARGET
>-#define F_MS D3D11_FORMAT_SUPPORT_MULTISAMPLE_RENDERTARGET
>-#define F_DS D3D11_FORMAT_SUPPORT_DEPTH_STENCIL
>-#define F_MIPGEN D3D11_FORMAT_SUPPORT_MIP_AUTOGEN
>-
>-namespace
>-{
>-
>-const DXGISupport &GetDefaultSupport()
>-{
>-    static UINT AllSupportFlags =
>-        D3D11_FORMAT_SUPPORT_TEXTURE2D | D3D11_FORMAT_SUPPORT_TEXTURE3D |
>-        D3D11_FORMAT_SUPPORT_TEXTURECUBE | D3D11_FORMAT_SUPPORT_SHADER_SAMPLE |
>-        D3D11_FORMAT_SUPPORT_RENDER_TARGET | D3D11_FORMAT_SUPPORT_MULTISAMPLE_RENDERTARGET |
>-        D3D11_FORMAT_SUPPORT_DEPTH_STENCIL | D3D11_FORMAT_SUPPORT_MIP_AUTOGEN;
>-    static const DXGISupport defaultSupport(0, 0, AllSupportFlags);
>-    return defaultSupport;
>-}
>-
>-const DXGISupport &GetDXGISupport_9_3(DXGI_FORMAT dxgiFormat)
>-{
>-    // clang-format off
>-    switch (dxgiFormat)
>-    {
>-        case DXGI_FORMAT_420_OPAQUE:
>-        {
>-            static const DXGISupport info(0, F_3D | F_CUBE | F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_A8P8:
>-        {
>-            static const DXGISupport info(0, F_3D | F_CUBE | F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_A8_UNORM:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_RT, F_DS, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_AI44:
>-        {
>-            static const DXGISupport info(0, F_3D | F_CUBE | F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_AYUV:
>-        {
>-            static const DXGISupport info(0, F_3D | F_CUBE | F_DS | F_MIPGEN, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_B4G4R4A4_UNORM:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_MIPGEN | F_SAMPLE, F_DS, F_MS | F_RT);
>-            return info;
>-        }
>-        case DXGI_FORMAT_B5G5R5A1_UNORM:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_MIPGEN | F_SAMPLE, F_DS, F_MS | F_RT);
>-            return info;
>-        }
>-        case DXGI_FORMAT_B5G6R5_UNORM:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_MIPGEN | F_RT | F_SAMPLE, F_DS, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_B8G8R8A8_TYPELESS:
>-        {
>-            static const DXGISupport info(0, F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, F_2D | F_3D | F_CUBE);
>-            return info;
>-        }
>-        case DXGI_FORMAT_B8G8R8A8_UNORM:
>-        {
>-            static const DXGISupport info(F_MIPGEN | F_RT | F_SAMPLE, F_DS, F_2D | F_3D | F_CUBE | F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_B8G8R8A8_UNORM_SRGB:
>-        {
>-            static const DXGISupport info(0, F_DS | F_MIPGEN, F_2D | F_3D | F_CUBE | F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_B8G8R8X8_TYPELESS:
>-        {
>-            static const DXGISupport info(0, F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, F_2D | F_3D | F_CUBE);
>-            return info;
>-        }
>-        case DXGI_FORMAT_B8G8R8X8_UNORM:
>-        {
>-            static const DXGISupport info(0, F_DS | F_MIPGEN, F_2D | F_3D | F_CUBE | F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_B8G8R8X8_UNORM_SRGB:
>-        {
>-            static const DXGISupport info(0, F_DS | F_MIPGEN, F_2D | F_3D | F_CUBE | F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_BC1_TYPELESS:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE, F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_BC1_UNORM:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_SAMPLE, F_DS | F_MIPGEN | F_MS | F_RT, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_BC1_UNORM_SRGB:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_SAMPLE, F_DS | F_MIPGEN | F_MS | F_RT, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_BC2_TYPELESS:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE, F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_BC2_UNORM:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_SAMPLE, F_DS | F_MIPGEN | F_MS | F_RT, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_BC2_UNORM_SRGB:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_SAMPLE, F_DS | F_MIPGEN | F_MS | F_RT, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_BC3_TYPELESS:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE, F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_BC3_UNORM:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_SAMPLE, F_DS | F_MIPGEN | F_MS | F_RT, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_BC3_UNORM_SRGB:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_SAMPLE, F_DS | F_MIPGEN | F_MS | F_RT, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_BC4_SNORM:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE, F_DS | F_MIPGEN | F_MS | F_RT, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_BC4_TYPELESS:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE, F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_BC4_UNORM:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE, F_DS | F_MIPGEN | F_MS | F_RT, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_BC5_SNORM:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE, F_DS | F_MIPGEN | F_MS | F_RT, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_BC5_TYPELESS:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE, F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_BC5_UNORM:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE, F_DS | F_MIPGEN | F_MS | F_RT, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_BC6H_SF16:
>-        {
>-            static const DXGISupport info(0, F_DS | F_MIPGEN | F_MS | F_RT, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_BC6H_TYPELESS:
>-        {
>-            static const DXGISupport info(0, F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_BC6H_UF16:
>-        {
>-            static const DXGISupport info(0, F_DS | F_MIPGEN | F_MS | F_RT, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_BC7_TYPELESS:
>-        {
>-            static const DXGISupport info(0, F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_BC7_UNORM:
>-        {
>-            static const DXGISupport info(0, F_DS | F_MIPGEN | F_MS | F_RT, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_BC7_UNORM_SRGB:
>-        {
>-            static const DXGISupport info(0, F_DS | F_MIPGEN | F_MS | F_RT, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_D16_UNORM:
>-        {
>-            static const DXGISupport info(F_2D | F_CUBE | F_DS, F_3D | F_MIPGEN | F_RT | F_SAMPLE, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_D24_UNORM_S8_UINT:
>-        {
>-            static const DXGISupport info(F_2D | F_CUBE | F_DS, F_3D | F_RT | F_SAMPLE, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_D32_FLOAT:
>-        {
>-            static const DXGISupport info(F_2D | F_CUBE, F_3D | F_MIPGEN | F_RT | F_SAMPLE, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_D32_FLOAT_S8X24_UINT:
>-        {
>-            static const DXGISupport info(F_2D | F_CUBE, F_3D | F_MIPGEN | F_RT | F_SAMPLE, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_G8R8_G8B8_UNORM:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE, F_DS | F_MIPGEN | F_MS | F_RT, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_IA44:
>-        {
>-            static const DXGISupport info(0, F_3D | F_CUBE | F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_NV11:
>-        {
>-            static const DXGISupport info(0, F_3D | F_CUBE | F_DS | F_MIPGEN, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_NV12:
>-        {
>-            static const DXGISupport info(0, F_3D | F_CUBE | F_DS | F_MIPGEN, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_P010:
>-        {
>-            static const DXGISupport info(0, F_3D | F_CUBE | F_DS | F_MIPGEN, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_P016:
>-        {
>-            static const DXGISupport info(0, F_3D | F_CUBE | F_DS | F_MIPGEN, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_P8:
>-        {
>-            static const DXGISupport info(0, F_3D | F_CUBE | F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R10G10B10A2_TYPELESS:
>-        {
>-            static const DXGISupport info(0, F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R10G10B10A2_UINT:
>-        {
>-            static const DXGISupport info(0, F_DS | F_MIPGEN | F_SAMPLE, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R10G10B10A2_UNORM:
>-        {
>-            static const DXGISupport info(0, F_DS, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R10G10B10_XR_BIAS_A2_UNORM:
>-        {
>-            static const DXGISupport info(0, F_CUBE | F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, F_2D | F_3D);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R11G11B10_FLOAT:
>-        {
>-            static const DXGISupport info(0, F_DS, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R16G16B16A16_FLOAT:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_MIPGEN | F_RT, F_DS, F_MS | F_SAMPLE);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R16G16B16A16_SINT:
>-        {
>-            static const DXGISupport info(0, F_DS | F_MIPGEN | F_SAMPLE, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R16G16B16A16_SNORM:
>-        {
>-            static const DXGISupport info(0, F_DS, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R16G16B16A16_TYPELESS:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE, F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R16G16B16A16_UINT:
>-        {
>-            static const DXGISupport info(0, F_DS | F_MIPGEN | F_SAMPLE, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R16G16B16A16_UNORM:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_MIPGEN | F_RT | F_SAMPLE, F_DS, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R16G16_FLOAT:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_MIPGEN | F_RT, F_DS, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R16G16_SINT:
>-        {
>-            static const DXGISupport info(0, F_DS | F_MIPGEN | F_SAMPLE, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R16G16_SNORM:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_RT | F_SAMPLE, F_DS, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R16G16_TYPELESS:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE, F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R16G16_UINT:
>-        {
>-            static const DXGISupport info(0, F_DS | F_MIPGEN | F_SAMPLE, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R16G16_UNORM:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_MIPGEN | F_RT | F_SAMPLE, F_DS, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R16_FLOAT:
>-        {
>-            static const DXGISupport info(0, F_DS, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R16_SINT:
>-        {
>-            static const DXGISupport info(0, F_DS | F_MIPGEN | F_SAMPLE, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R16_SNORM:
>-        {
>-            static const DXGISupport info(0, F_DS, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R16_TYPELESS:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE, F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R16_UINT:
>-        {
>-            static const DXGISupport info(0, F_DS | F_MIPGEN | F_SAMPLE, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R16_UNORM:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_SAMPLE, F_DS, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R1_UNORM:
>-        {
>-            static const DXGISupport info(F_2D, F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R24G8_TYPELESS:
>-        {
>-            static const DXGISupport info(F_2D | F_CUBE, F_3D | F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R24_UNORM_X8_TYPELESS:
>-        {
>-            static const DXGISupport info(F_2D | F_CUBE, F_3D | F_DS | F_MIPGEN | F_MS | F_RT, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R32G32B32A32_FLOAT:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_MIPGEN | F_RT, F_DS, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R32G32B32A32_SINT:
>-        {
>-            static const DXGISupport info(0, F_DS | F_MIPGEN | F_SAMPLE, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R32G32B32A32_TYPELESS:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE, F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R32G32B32A32_UINT:
>-        {
>-            static const DXGISupport info(0, F_DS | F_MIPGEN | F_SAMPLE, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R32G32B32_FLOAT:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE, F_DS | F_MIPGEN, F_MS | F_RT);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R32G32B32_SINT:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE, F_DS | F_MIPGEN | F_SAMPLE, F_MS | F_RT);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R32G32B32_TYPELESS:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE, F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R32G32B32_UINT:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE, F_DS | F_MIPGEN | F_SAMPLE, F_MS | F_RT);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R32G32_FLOAT:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_RT, F_DS, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R32G32_SINT:
>-        {
>-            static const DXGISupport info(0, F_DS | F_MIPGEN | F_SAMPLE, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R32G32_TYPELESS:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE, F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R32G32_UINT:
>-        {
>-            static const DXGISupport info(0, F_DS | F_MIPGEN | F_SAMPLE, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R32G8X24_TYPELESS:
>-        {
>-            static const DXGISupport info(0, F_3D | F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R32_FLOAT:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_MIPGEN | F_RT, F_DS, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R32_FLOAT_X8X24_TYPELESS:
>-        {
>-            static const DXGISupport info(F_2D | F_CUBE, F_3D | F_DS | F_MIPGEN | F_MS | F_RT, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R32_SINT:
>-        {
>-            static const DXGISupport info(0, F_DS | F_MIPGEN | F_SAMPLE, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R32_TYPELESS:
>-        {
>-            static const DXGISupport info(0, F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R32_UINT:
>-        {
>-            static const DXGISupport info(0, F_DS | F_MIPGEN | F_SAMPLE, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R8G8B8A8_SINT:
>-        {
>-            static const DXGISupport info(0, F_DS | F_MIPGEN | F_SAMPLE, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R8G8B8A8_SNORM:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_RT | F_SAMPLE, F_DS, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R8G8B8A8_TYPELESS:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE, F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R8G8B8A8_UINT:
>-        {
>-            static const DXGISupport info(0, F_DS | F_MIPGEN | F_SAMPLE, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R8G8B8A8_UNORM:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_MIPGEN | F_RT | F_SAMPLE, F_DS, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R8G8B8A8_UNORM_SRGB:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_MIPGEN | F_RT | F_SAMPLE, F_DS, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R8G8_B8G8_UNORM:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE, F_DS | F_MIPGEN | F_MS | F_RT, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R8G8_SINT:
>-        {
>-            static const DXGISupport info(0, F_DS | F_MIPGEN | F_SAMPLE, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R8G8_SNORM:
>-        {
>-            static const DXGISupport info(F_2D | F_SAMPLE, F_DS, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R8G8_TYPELESS:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE, F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R8G8_UINT:
>-        {
>-            static const DXGISupport info(0, F_DS | F_MIPGEN | F_SAMPLE, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R8G8_UNORM:
>-        {
>-            static const DXGISupport info(0, F_DS, F_MS | F_RT | F_SAMPLE);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R8_SINT:
>-        {
>-            static const DXGISupport info(0, F_DS | F_MIPGEN | F_SAMPLE, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R8_SNORM:
>-        {
>-            static const DXGISupport info(0, F_DS, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R8_TYPELESS:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE, F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R8_UINT:
>-        {
>-            static const DXGISupport info(0, F_DS | F_MIPGEN | F_SAMPLE, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R8_UNORM:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_SAMPLE, F_DS, F_MS | F_RT);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R9G9B9E5_SHAREDEXP:
>-        {
>-            static const DXGISupport info(0, F_DS | F_MIPGEN | F_MS | F_RT, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_UNKNOWN:
>-        {
>-            static const DXGISupport info(0, F_2D | F_3D | F_CUBE | F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_X24_TYPELESS_G8_UINT:
>-        {
>-            static const DXGISupport info(F_2D | F_CUBE, F_3D | F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_X32_TYPELESS_G8X24_UINT:
>-        {
>-            static const DXGISupport info(F_2D | F_CUBE, F_3D | F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_Y210:
>-        {
>-            static const DXGISupport info(0, F_3D | F_CUBE | F_DS | F_MIPGEN | F_MS | F_RT, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_Y216:
>-        {
>-            static const DXGISupport info(0, F_3D | F_CUBE | F_DS | F_MIPGEN | F_MS | F_RT, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_Y410:
>-        {
>-            static const DXGISupport info(0, F_3D | F_CUBE | F_DS | F_MIPGEN | F_MS | F_RT, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_Y416:
>-        {
>-            static const DXGISupport info(0, F_3D | F_CUBE | F_DS | F_MIPGEN | F_MS | F_RT, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_YUY2:
>-        {
>-            static const DXGISupport info(0, F_3D | F_CUBE | F_DS | F_MIPGEN | F_MS | F_RT, 0);
>-            return info;
>-        }
>-
>-        default:
>-            UNREACHABLE();
>-            return GetDefaultSupport();
>-    }
>-    // clang-format on
>-}
>-
>-const DXGISupport &GetDXGISupport_10_0(DXGI_FORMAT dxgiFormat)
>-{
>-    // clang-format off
>-    switch (dxgiFormat)
>-    {
>-        case DXGI_FORMAT_420_OPAQUE:
>-        {
>-            static const DXGISupport info(0, F_3D | F_CUBE | F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_A8P8:
>-        {
>-            static const DXGISupport info(0, F_3D | F_CUBE | F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_A8_UNORM:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_MIPGEN | F_RT | F_SAMPLE, F_DS, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_AI44:
>-        {
>-            static const DXGISupport info(0, F_3D | F_CUBE | F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_AYUV:
>-        {
>-            static const DXGISupport info(0, F_3D | F_CUBE | F_DS | F_MIPGEN, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_B4G4R4A4_UNORM:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_MIPGEN | F_SAMPLE, F_DS, F_MS | F_RT);
>-            return info;
>-        }
>-        case DXGI_FORMAT_B5G5R5A1_UNORM:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_MIPGEN | F_SAMPLE, F_DS, F_MS | F_RT);
>-            return info;
>-        }
>-        case DXGI_FORMAT_B5G6R5_UNORM:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_MIPGEN | F_RT | F_SAMPLE, F_DS, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_B8G8R8A8_TYPELESS:
>-        {
>-            static const DXGISupport info(0, F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, F_2D | F_3D | F_CUBE);
>-            return info;
>-        }
>-        case DXGI_FORMAT_B8G8R8A8_UNORM:
>-        {
>-            static const DXGISupport info(F_MIPGEN, F_DS, F_2D | F_3D | F_CUBE | F_MS | F_RT | F_SAMPLE);
>-            return info;
>-        }
>-        case DXGI_FORMAT_B8G8R8A8_UNORM_SRGB:
>-        {
>-            static const DXGISupport info(0, F_DS | F_MIPGEN, F_2D | F_3D | F_CUBE | F_MS | F_SAMPLE);
>-            return info;
>-        }
>-        case DXGI_FORMAT_B8G8R8X8_TYPELESS:
>-        {
>-            static const DXGISupport info(0, F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, F_2D | F_3D | F_CUBE);
>-            return info;
>-        }
>-        case DXGI_FORMAT_B8G8R8X8_UNORM:
>-        {
>-            static const DXGISupport info(0, F_DS | F_MIPGEN, F_2D | F_3D | F_CUBE | F_MS | F_SAMPLE);
>-            return info;
>-        }
>-        case DXGI_FORMAT_B8G8R8X8_UNORM_SRGB:
>-        {
>-            static const DXGISupport info(0, F_DS | F_MIPGEN, F_2D | F_3D | F_CUBE | F_MS | F_SAMPLE);
>-            return info;
>-        }
>-        case DXGI_FORMAT_BC1_TYPELESS:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE, F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_BC1_UNORM:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_SAMPLE, F_DS | F_MIPGEN | F_MS | F_RT, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_BC1_UNORM_SRGB:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_SAMPLE, F_DS | F_MIPGEN | F_MS | F_RT, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_BC2_TYPELESS:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE, F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_BC2_UNORM:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_SAMPLE, F_DS | F_MIPGEN | F_MS | F_RT, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_BC2_UNORM_SRGB:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_SAMPLE, F_DS | F_MIPGEN | F_MS | F_RT, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_BC3_TYPELESS:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE, F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_BC3_UNORM:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_SAMPLE, F_DS | F_MIPGEN | F_MS | F_RT, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_BC3_UNORM_SRGB:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_SAMPLE, F_DS | F_MIPGEN | F_MS | F_RT, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_BC4_SNORM:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_SAMPLE, F_DS | F_MIPGEN | F_MS | F_RT, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_BC4_TYPELESS:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE, F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_BC4_UNORM:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_SAMPLE, F_DS | F_MIPGEN | F_MS | F_RT, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_BC5_SNORM:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_SAMPLE, F_DS | F_MIPGEN | F_MS | F_RT, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_BC5_TYPELESS:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE, F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_BC5_UNORM:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_SAMPLE, F_DS | F_MIPGEN | F_MS | F_RT, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_BC6H_SF16:
>-        {
>-            static const DXGISupport info(0, F_DS | F_MIPGEN | F_MS | F_RT, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_BC6H_TYPELESS:
>-        {
>-            static const DXGISupport info(0, F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_BC6H_UF16:
>-        {
>-            static const DXGISupport info(0, F_DS | F_MIPGEN | F_MS | F_RT, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_BC7_TYPELESS:
>-        {
>-            static const DXGISupport info(0, F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_BC7_UNORM:
>-        {
>-            static const DXGISupport info(0, F_DS | F_MIPGEN | F_MS | F_RT, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_BC7_UNORM_SRGB:
>-        {
>-            static const DXGISupport info(0, F_DS | F_MIPGEN | F_MS | F_RT, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_D16_UNORM:
>-        {
>-            static const DXGISupport info(F_2D | F_CUBE | F_DS, F_3D | F_MIPGEN | F_RT | F_SAMPLE, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_D24_UNORM_S8_UINT:
>-        {
>-            static const DXGISupport info(F_2D | F_CUBE | F_DS, F_3D | F_RT | F_SAMPLE, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_D32_FLOAT:
>-        {
>-            static const DXGISupport info(F_2D | F_CUBE | F_DS, F_3D | F_MIPGEN | F_RT | F_SAMPLE, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_D32_FLOAT_S8X24_UINT:
>-        {
>-            static const DXGISupport info(F_2D | F_CUBE | F_DS, F_3D | F_MIPGEN | F_RT | F_SAMPLE, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_G8R8_G8B8_UNORM:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_SAMPLE, F_DS | F_MIPGEN | F_MS | F_RT, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_IA44:
>-        {
>-            static const DXGISupport info(0, F_3D | F_CUBE | F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_NV11:
>-        {
>-            static const DXGISupport info(0, F_3D | F_CUBE | F_DS | F_MIPGEN, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_NV12:
>-        {
>-            static const DXGISupport info(0, F_3D | F_CUBE | F_DS | F_MIPGEN, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_P010:
>-        {
>-            static const DXGISupport info(0, F_3D | F_CUBE | F_DS | F_MIPGEN, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_P016:
>-        {
>-            static const DXGISupport info(0, F_3D | F_CUBE | F_DS | F_MIPGEN, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_P8:
>-        {
>-            static const DXGISupport info(0, F_3D | F_CUBE | F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R10G10B10A2_TYPELESS:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE, F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R10G10B10A2_UINT:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_RT, F_DS | F_MIPGEN | F_SAMPLE, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R10G10B10A2_UNORM:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_MIPGEN | F_RT | F_SAMPLE, F_DS, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R10G10B10_XR_BIAS_A2_UNORM:
>-        {
>-            static const DXGISupport info(0, F_CUBE | F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, F_2D | F_3D);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R11G11B10_FLOAT:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_MIPGEN | F_RT | F_SAMPLE, F_DS, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R16G16B16A16_FLOAT:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_MIPGEN | F_RT | F_SAMPLE, F_DS, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R16G16B16A16_SINT:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_RT, F_DS | F_MIPGEN | F_SAMPLE, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R16G16B16A16_SNORM:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_MIPGEN | F_RT | F_SAMPLE, F_DS, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R16G16B16A16_TYPELESS:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE, F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R16G16B16A16_UINT:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_RT, F_DS | F_MIPGEN | F_SAMPLE, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R16G16B16A16_UNORM:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_MIPGEN | F_RT | F_SAMPLE, F_DS, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R16G16_FLOAT:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_MIPGEN | F_RT | F_SAMPLE, F_DS, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R16G16_SINT:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_RT, F_DS | F_MIPGEN | F_SAMPLE, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R16G16_SNORM:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_MIPGEN | F_RT | F_SAMPLE, F_DS, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R16G16_TYPELESS:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE, F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R16G16_UINT:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_RT, F_DS | F_MIPGEN | F_SAMPLE, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R16G16_UNORM:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_MIPGEN | F_RT | F_SAMPLE, F_DS, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R16_FLOAT:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_MIPGEN | F_RT | F_SAMPLE, F_DS, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R16_SINT:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_RT, F_DS | F_MIPGEN | F_SAMPLE, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R16_SNORM:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_MIPGEN | F_RT | F_SAMPLE, F_DS, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R16_TYPELESS:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE, F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R16_UINT:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_RT, F_DS | F_MIPGEN | F_SAMPLE, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R16_UNORM:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_MIPGEN | F_RT | F_SAMPLE, F_DS, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R1_UNORM:
>-        {
>-            static const DXGISupport info(F_2D, F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R24G8_TYPELESS:
>-        {
>-            static const DXGISupport info(F_2D | F_CUBE, F_3D | F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R24_UNORM_X8_TYPELESS:
>-        {
>-            static const DXGISupport info(F_2D | F_CUBE, F_3D | F_DS | F_MIPGEN | F_MS | F_RT, F_SAMPLE);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R32G32B32A32_FLOAT:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_MIPGEN | F_RT, F_DS, F_MS | F_SAMPLE);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R32G32B32A32_SINT:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_RT, F_DS | F_MIPGEN | F_SAMPLE, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R32G32B32A32_TYPELESS:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE, F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R32G32B32A32_UINT:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_RT, F_DS | F_MIPGEN | F_SAMPLE, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R32G32B32_FLOAT:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE, F_DS | F_MIPGEN, F_MS | F_RT);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R32G32B32_SINT:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE, F_DS | F_MIPGEN | F_SAMPLE, F_MS | F_RT);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R32G32B32_TYPELESS:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE, F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R32G32B32_UINT:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE, F_DS | F_MIPGEN | F_SAMPLE, F_MS | F_RT);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R32G32_FLOAT:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_MIPGEN | F_RT, F_DS, F_MS | F_SAMPLE);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R32G32_SINT:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_RT, F_DS | F_MIPGEN | F_SAMPLE, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R32G32_TYPELESS:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE, F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R32G32_UINT:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_RT, F_DS | F_MIPGEN | F_SAMPLE, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R32G8X24_TYPELESS:
>-        {
>-            static const DXGISupport info(F_2D | F_CUBE, F_3D | F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R32_FLOAT:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_MIPGEN | F_RT, F_DS, F_MS | F_SAMPLE);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R32_FLOAT_X8X24_TYPELESS:
>-        {
>-            static const DXGISupport info(F_2D | F_CUBE, F_3D | F_DS | F_MIPGEN | F_MS | F_RT, F_SAMPLE);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R32_SINT:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_RT, F_DS | F_MIPGEN | F_SAMPLE, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R32_TYPELESS:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE, F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R32_UINT:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_RT, F_DS | F_MIPGEN | F_SAMPLE, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R8G8B8A8_SINT:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_RT, F_DS | F_MIPGEN | F_SAMPLE, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R8G8B8A8_SNORM:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_MIPGEN | F_RT | F_SAMPLE, F_DS, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R8G8B8A8_TYPELESS:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE, F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R8G8B8A8_UINT:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_RT, F_DS | F_MIPGEN | F_SAMPLE, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R8G8B8A8_UNORM:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_MIPGEN | F_RT | F_SAMPLE, F_DS, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R8G8B8A8_UNORM_SRGB:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_MIPGEN | F_RT | F_SAMPLE, F_DS, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R8G8_B8G8_UNORM:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_SAMPLE, F_DS | F_MIPGEN | F_MS | F_RT, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R8G8_SINT:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_RT, F_DS | F_MIPGEN | F_SAMPLE, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R8G8_SNORM:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_MIPGEN | F_RT | F_SAMPLE, F_DS, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R8G8_TYPELESS:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE, F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R8G8_UINT:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_RT, F_DS | F_MIPGEN | F_SAMPLE, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R8G8_UNORM:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_MIPGEN | F_RT | F_SAMPLE, F_DS, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R8_SINT:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_RT, F_DS | F_MIPGEN | F_SAMPLE, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R8_SNORM:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_MIPGEN | F_RT | F_SAMPLE, F_DS, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R8_TYPELESS:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE, F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R8_UINT:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_RT, F_DS | F_MIPGEN | F_SAMPLE, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R8_UNORM:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_MIPGEN | F_RT | F_SAMPLE, F_DS, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R9G9B9E5_SHAREDEXP:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_SAMPLE, F_DS | F_MIPGEN | F_MS | F_RT, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_UNKNOWN:
>-        {
>-            static const DXGISupport info(0, F_2D | F_3D | F_CUBE | F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_X24_TYPELESS_G8_UINT:
>-        {
>-            static const DXGISupport info(F_2D | F_CUBE, F_3D | F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_X32_TYPELESS_G8X24_UINT:
>-        {
>-            static const DXGISupport info(F_2D | F_CUBE, F_3D | F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_Y210:
>-        {
>-            static const DXGISupport info(0, F_3D | F_CUBE | F_DS | F_MIPGEN | F_MS | F_RT, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_Y216:
>-        {
>-            static const DXGISupport info(0, F_3D | F_CUBE | F_DS | F_MIPGEN | F_MS | F_RT, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_Y410:
>-        {
>-            static const DXGISupport info(0, F_3D | F_CUBE | F_DS | F_MIPGEN | F_MS | F_RT, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_Y416:
>-        {
>-            static const DXGISupport info(0, F_3D | F_CUBE | F_DS | F_MIPGEN | F_MS | F_RT, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_YUY2:
>-        {
>-            static const DXGISupport info(0, F_3D | F_CUBE | F_DS | F_MIPGEN | F_MS | F_RT, 0);
>-            return info;
>-        }
>-
>-        default:
>-            UNREACHABLE();
>-            return GetDefaultSupport();
>-    }
>-    // clang-format on
>-}
>-
>-const DXGISupport &GetDXGISupport_10_1(DXGI_FORMAT dxgiFormat)
>-{
>-    // clang-format off
>-    switch (dxgiFormat)
>-    {
>-        case DXGI_FORMAT_420_OPAQUE:
>-        {
>-            static const DXGISupport info(0, F_3D | F_CUBE | F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_A8P8:
>-        {
>-            static const DXGISupport info(0, F_3D | F_CUBE | F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_A8_UNORM:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_MIPGEN | F_RT | F_SAMPLE, F_DS, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_AI44:
>-        {
>-            static const DXGISupport info(0, F_3D | F_CUBE | F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_AYUV:
>-        {
>-            static const DXGISupport info(0, F_3D | F_CUBE | F_DS | F_MIPGEN, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_B4G4R4A4_UNORM:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_MIPGEN | F_SAMPLE, F_DS, F_MS | F_RT);
>-            return info;
>-        }
>-        case DXGI_FORMAT_B5G5R5A1_UNORM:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_MIPGEN | F_SAMPLE, F_DS, F_MS | F_RT);
>-            return info;
>-        }
>-        case DXGI_FORMAT_B5G6R5_UNORM:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_MIPGEN | F_RT | F_SAMPLE, F_DS, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_B8G8R8A8_TYPELESS:
>-        {
>-            static const DXGISupport info(0, F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, F_2D | F_3D | F_CUBE);
>-            return info;
>-        }
>-        case DXGI_FORMAT_B8G8R8A8_UNORM:
>-        {
>-            static const DXGISupport info(F_MIPGEN, F_DS, F_2D | F_3D | F_CUBE | F_MS | F_RT | F_SAMPLE);
>-            return info;
>-        }
>-        case DXGI_FORMAT_B8G8R8A8_UNORM_SRGB:
>-        {
>-            static const DXGISupport info(0, F_DS | F_MIPGEN, F_2D | F_3D | F_CUBE | F_MS | F_SAMPLE);
>-            return info;
>-        }
>-        case DXGI_FORMAT_B8G8R8X8_TYPELESS:
>-        {
>-            static const DXGISupport info(0, F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, F_2D | F_3D | F_CUBE);
>-            return info;
>-        }
>-        case DXGI_FORMAT_B8G8R8X8_UNORM:
>-        {
>-            static const DXGISupport info(0, F_DS | F_MIPGEN, F_2D | F_3D | F_CUBE | F_MS | F_SAMPLE);
>-            return info;
>-        }
>-        case DXGI_FORMAT_B8G8R8X8_UNORM_SRGB:
>-        {
>-            static const DXGISupport info(0, F_DS | F_MIPGEN, F_2D | F_3D | F_CUBE | F_MS | F_SAMPLE);
>-            return info;
>-        }
>-        case DXGI_FORMAT_BC1_TYPELESS:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE, F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_BC1_UNORM:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_SAMPLE, F_DS | F_MIPGEN | F_MS | F_RT, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_BC1_UNORM_SRGB:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_SAMPLE, F_DS | F_MIPGEN | F_MS | F_RT, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_BC2_TYPELESS:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE, F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_BC2_UNORM:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_SAMPLE, F_DS | F_MIPGEN | F_MS | F_RT, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_BC2_UNORM_SRGB:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_SAMPLE, F_DS | F_MIPGEN | F_MS | F_RT, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_BC3_TYPELESS:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE, F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_BC3_UNORM:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_SAMPLE, F_DS | F_MIPGEN | F_MS | F_RT, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_BC3_UNORM_SRGB:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_SAMPLE, F_DS | F_MIPGEN | F_MS | F_RT, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_BC4_SNORM:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_SAMPLE, F_DS | F_MIPGEN | F_MS | F_RT, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_BC4_TYPELESS:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE, F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_BC4_UNORM:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_SAMPLE, F_DS | F_MIPGEN | F_MS | F_RT, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_BC5_SNORM:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_SAMPLE, F_DS | F_MIPGEN | F_MS | F_RT, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_BC5_TYPELESS:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE, F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_BC5_UNORM:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_SAMPLE, F_DS | F_MIPGEN | F_MS | F_RT, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_BC6H_SF16:
>-        {
>-            static const DXGISupport info(0, F_DS | F_MIPGEN | F_MS | F_RT, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_BC6H_TYPELESS:
>-        {
>-            static const DXGISupport info(0, F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_BC6H_UF16:
>-        {
>-            static const DXGISupport info(0, F_DS | F_MIPGEN | F_MS | F_RT, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_BC7_TYPELESS:
>-        {
>-            static const DXGISupport info(0, F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_BC7_UNORM:
>-        {
>-            static const DXGISupport info(0, F_DS | F_MIPGEN | F_MS | F_RT, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_BC7_UNORM_SRGB:
>-        {
>-            static const DXGISupport info(0, F_DS | F_MIPGEN | F_MS | F_RT, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_D16_UNORM:
>-        {
>-            static const DXGISupport info(F_2D | F_CUBE | F_DS, F_3D | F_MIPGEN | F_RT | F_SAMPLE, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_D24_UNORM_S8_UINT:
>-        {
>-            static const DXGISupport info(F_2D | F_CUBE | F_DS, F_3D | F_RT | F_SAMPLE, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_D32_FLOAT:
>-        {
>-            static const DXGISupport info(F_2D | F_CUBE | F_DS, F_3D | F_MIPGEN | F_RT | F_SAMPLE, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_D32_FLOAT_S8X24_UINT:
>-        {
>-            static const DXGISupport info(F_2D | F_CUBE | F_DS, F_3D | F_MIPGEN | F_RT | F_SAMPLE, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_G8R8_G8B8_UNORM:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_SAMPLE, F_DS | F_MIPGEN | F_MS | F_RT, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_IA44:
>-        {
>-            static const DXGISupport info(0, F_3D | F_CUBE | F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_NV11:
>-        {
>-            static const DXGISupport info(0, F_3D | F_CUBE | F_DS | F_MIPGEN, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_NV12:
>-        {
>-            static const DXGISupport info(0, F_3D | F_CUBE | F_DS | F_MIPGEN, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_P010:
>-        {
>-            static const DXGISupport info(0, F_3D | F_CUBE | F_DS | F_MIPGEN, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_P016:
>-        {
>-            static const DXGISupport info(0, F_3D | F_CUBE | F_DS | F_MIPGEN, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_P8:
>-        {
>-            static const DXGISupport info(0, F_3D | F_CUBE | F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R10G10B10A2_TYPELESS:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE, F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R10G10B10A2_UINT:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_RT, F_DS | F_MIPGEN | F_SAMPLE, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R10G10B10A2_UNORM:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_MIPGEN | F_RT | F_SAMPLE, F_DS, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R10G10B10_XR_BIAS_A2_UNORM:
>-        {
>-            static const DXGISupport info(0, F_CUBE | F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, F_2D | F_3D);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R11G11B10_FLOAT:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_MIPGEN | F_RT | F_SAMPLE, F_DS, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R16G16B16A16_FLOAT:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_MIPGEN | F_RT | F_SAMPLE, F_DS, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R16G16B16A16_SINT:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_RT, F_DS | F_MIPGEN | F_SAMPLE, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R16G16B16A16_SNORM:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_MIPGEN | F_RT | F_SAMPLE, F_DS, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R16G16B16A16_TYPELESS:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE, F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R16G16B16A16_UINT:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_RT, F_DS | F_MIPGEN | F_SAMPLE, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R16G16B16A16_UNORM:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_MIPGEN | F_RT | F_SAMPLE, F_DS, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R16G16_FLOAT:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_MIPGEN | F_RT | F_SAMPLE, F_DS, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R16G16_SINT:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_RT, F_DS | F_MIPGEN | F_SAMPLE, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R16G16_SNORM:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_MIPGEN | F_RT | F_SAMPLE, F_DS, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R16G16_TYPELESS:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE, F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R16G16_UINT:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_RT, F_DS | F_MIPGEN | F_SAMPLE, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R16G16_UNORM:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_MIPGEN | F_RT | F_SAMPLE, F_DS, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R16_FLOAT:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_MIPGEN | F_RT | F_SAMPLE, F_DS, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R16_SINT:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_RT, F_DS | F_MIPGEN | F_SAMPLE, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R16_SNORM:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_MIPGEN | F_RT | F_SAMPLE, F_DS, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R16_TYPELESS:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE, F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R16_UINT:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_RT, F_DS | F_MIPGEN | F_SAMPLE, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R16_UNORM:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_MIPGEN | F_RT | F_SAMPLE, F_DS, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R1_UNORM:
>-        {
>-            static const DXGISupport info(F_2D, F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R24G8_TYPELESS:
>-        {
>-            static const DXGISupport info(F_2D | F_CUBE, F_3D | F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R24_UNORM_X8_TYPELESS:
>-        {
>-            static const DXGISupport info(F_2D | F_CUBE | F_SAMPLE, F_3D | F_DS | F_MIPGEN | F_MS | F_RT, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R32G32B32A32_FLOAT:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_MIPGEN | F_RT | F_SAMPLE, F_DS, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R32G32B32A32_SINT:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_RT, F_DS | F_MIPGEN | F_SAMPLE, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R32G32B32A32_TYPELESS:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE, F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R32G32B32A32_UINT:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_RT, F_DS | F_MIPGEN | F_SAMPLE, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R32G32B32_FLOAT:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE, F_DS | F_MIPGEN, F_MS | F_RT);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R32G32B32_SINT:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE, F_DS | F_MIPGEN | F_SAMPLE, F_MS | F_RT);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R32G32B32_TYPELESS:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE, F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R32G32B32_UINT:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE, F_DS | F_MIPGEN | F_SAMPLE, F_MS | F_RT);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R32G32_FLOAT:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_MIPGEN | F_RT | F_SAMPLE, F_DS, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R32G32_SINT:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_RT, F_DS | F_MIPGEN | F_SAMPLE, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R32G32_TYPELESS:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE, F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R32G32_UINT:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_RT, F_DS | F_MIPGEN | F_SAMPLE, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R32G8X24_TYPELESS:
>-        {
>-            static const DXGISupport info(F_2D | F_CUBE, F_3D | F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R32_FLOAT:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_MIPGEN | F_RT | F_SAMPLE, F_DS, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R32_FLOAT_X8X24_TYPELESS:
>-        {
>-            static const DXGISupport info(F_2D | F_CUBE | F_SAMPLE, F_3D | F_DS | F_MIPGEN | F_MS | F_RT, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R32_SINT:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_RT, F_DS | F_MIPGEN | F_SAMPLE, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R32_TYPELESS:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE, F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R32_UINT:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_RT, F_DS | F_MIPGEN | F_SAMPLE, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R8G8B8A8_SINT:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_RT, F_DS | F_MIPGEN | F_SAMPLE, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R8G8B8A8_SNORM:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_MIPGEN | F_RT | F_SAMPLE, F_DS, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R8G8B8A8_TYPELESS:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE, F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R8G8B8A8_UINT:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_RT, F_DS | F_MIPGEN | F_SAMPLE, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R8G8B8A8_UNORM:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_MIPGEN | F_RT | F_SAMPLE, F_DS, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R8G8B8A8_UNORM_SRGB:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_MIPGEN | F_RT | F_SAMPLE, F_DS, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R8G8_B8G8_UNORM:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_SAMPLE, F_DS | F_MIPGEN | F_MS | F_RT, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R8G8_SINT:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_RT, F_DS | F_MIPGEN | F_SAMPLE, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R8G8_SNORM:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_MIPGEN | F_RT | F_SAMPLE, F_DS, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R8G8_TYPELESS:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE, F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R8G8_UINT:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_RT, F_DS | F_MIPGEN | F_SAMPLE, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R8G8_UNORM:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_MIPGEN | F_RT | F_SAMPLE, F_DS, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R8_SINT:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_RT, F_DS | F_MIPGEN | F_SAMPLE, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R8_SNORM:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_MIPGEN | F_RT | F_SAMPLE, F_DS, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R8_TYPELESS:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE, F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R8_UINT:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_RT, F_DS | F_MIPGEN | F_SAMPLE, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R8_UNORM:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_MIPGEN | F_RT | F_SAMPLE, F_DS, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R9G9B9E5_SHAREDEXP:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_SAMPLE, F_DS | F_MIPGEN | F_MS | F_RT, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_UNKNOWN:
>-        {
>-            static const DXGISupport info(0, F_2D | F_3D | F_CUBE | F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_X24_TYPELESS_G8_UINT:
>-        {
>-            static const DXGISupport info(F_2D | F_CUBE, F_3D | F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_X32_TYPELESS_G8X24_UINT:
>-        {
>-            static const DXGISupport info(F_2D | F_CUBE, F_3D | F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_Y210:
>-        {
>-            static const DXGISupport info(0, F_3D | F_CUBE | F_DS | F_MIPGEN | F_MS | F_RT, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_Y216:
>-        {
>-            static const DXGISupport info(0, F_3D | F_CUBE | F_DS | F_MIPGEN | F_MS | F_RT, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_Y410:
>-        {
>-            static const DXGISupport info(0, F_3D | F_CUBE | F_DS | F_MIPGEN | F_MS | F_RT, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_Y416:
>-        {
>-            static const DXGISupport info(0, F_3D | F_CUBE | F_DS | F_MIPGEN | F_MS | F_RT, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_YUY2:
>-        {
>-            static const DXGISupport info(0, F_3D | F_CUBE | F_DS | F_MIPGEN | F_MS | F_RT, 0);
>-            return info;
>-        }
>-
>-        default:
>-            UNREACHABLE();
>-            return GetDefaultSupport();
>-    }
>-    // clang-format on
>-}
>-
>-const DXGISupport &GetDXGISupport_11_0(DXGI_FORMAT dxgiFormat)
>-{
>-    // clang-format off
>-    switch (dxgiFormat)
>-    {
>-        case DXGI_FORMAT_420_OPAQUE:
>-        {
>-            static const DXGISupport info(0, F_3D | F_CUBE | F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_A8P8:
>-        {
>-            static const DXGISupport info(0, F_3D | F_CUBE | F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_A8_UNORM:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_MIPGEN | F_RT | F_SAMPLE, F_DS, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_AI44:
>-        {
>-            static const DXGISupport info(0, F_3D | F_CUBE | F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_AYUV:
>-        {
>-            static const DXGISupport info(0, F_3D | F_CUBE | F_DS | F_MIPGEN, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_B4G4R4A4_UNORM:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_MIPGEN | F_SAMPLE, F_DS, F_MS | F_RT);
>-            return info;
>-        }
>-        case DXGI_FORMAT_B5G5R5A1_UNORM:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_MIPGEN | F_SAMPLE, F_DS, F_MS | F_RT);
>-            return info;
>-        }
>-        case DXGI_FORMAT_B5G6R5_UNORM:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_MIPGEN | F_RT | F_SAMPLE, F_DS, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_B8G8R8A8_TYPELESS:
>-        {
>-            static const DXGISupport info(0, F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, F_2D | F_3D | F_CUBE);
>-            return info;
>-        }
>-        case DXGI_FORMAT_B8G8R8A8_UNORM:
>-        {
>-            static const DXGISupport info(F_MIPGEN | F_RT | F_SAMPLE, F_DS, F_2D | F_3D | F_CUBE | F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_B8G8R8A8_UNORM_SRGB:
>-        {
>-            static const DXGISupport info(F_RT | F_SAMPLE, F_DS | F_MIPGEN, F_2D | F_3D | F_CUBE | F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_B8G8R8X8_TYPELESS:
>-        {
>-            static const DXGISupport info(0, F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, F_2D | F_3D | F_CUBE);
>-            return info;
>-        }
>-        case DXGI_FORMAT_B8G8R8X8_UNORM:
>-        {
>-            static const DXGISupport info(F_RT | F_SAMPLE, F_DS | F_MIPGEN, F_2D | F_3D | F_CUBE | F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_B8G8R8X8_UNORM_SRGB:
>-        {
>-            static const DXGISupport info(F_RT | F_SAMPLE, F_DS | F_MIPGEN, F_2D | F_3D | F_CUBE | F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_BC1_TYPELESS:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE, F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_BC1_UNORM:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_SAMPLE, F_DS | F_MIPGEN | F_MS | F_RT, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_BC1_UNORM_SRGB:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_SAMPLE, F_DS | F_MIPGEN | F_MS | F_RT, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_BC2_TYPELESS:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE, F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_BC2_UNORM:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_SAMPLE, F_DS | F_MIPGEN | F_MS | F_RT, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_BC2_UNORM_SRGB:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_SAMPLE, F_DS | F_MIPGEN | F_MS | F_RT, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_BC3_TYPELESS:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE, F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_BC3_UNORM:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_SAMPLE, F_DS | F_MIPGEN | F_MS | F_RT, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_BC3_UNORM_SRGB:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_SAMPLE, F_DS | F_MIPGEN | F_MS | F_RT, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_BC4_SNORM:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_SAMPLE, F_DS | F_MIPGEN | F_MS | F_RT, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_BC4_TYPELESS:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE, F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_BC4_UNORM:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_SAMPLE, F_DS | F_MIPGEN | F_MS | F_RT, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_BC5_SNORM:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_SAMPLE, F_DS | F_MIPGEN | F_MS | F_RT, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_BC5_TYPELESS:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE, F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_BC5_UNORM:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_SAMPLE, F_DS | F_MIPGEN | F_MS | F_RT, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_BC6H_SF16:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_SAMPLE, F_DS | F_MIPGEN | F_MS | F_RT, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_BC6H_TYPELESS:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE, F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_BC6H_UF16:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_SAMPLE, F_DS | F_MIPGEN | F_MS | F_RT, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_BC7_TYPELESS:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE, F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_BC7_UNORM:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_SAMPLE, F_DS | F_MIPGEN | F_MS | F_RT, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_BC7_UNORM_SRGB:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_SAMPLE, F_DS | F_MIPGEN | F_MS | F_RT, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_D16_UNORM:
>-        {
>-            static const DXGISupport info(F_2D | F_CUBE | F_DS, F_3D | F_MIPGEN | F_RT | F_SAMPLE, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_D24_UNORM_S8_UINT:
>-        {
>-            static const DXGISupport info(F_2D | F_CUBE | F_DS, F_3D | F_RT | F_SAMPLE, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_D32_FLOAT:
>-        {
>-            static const DXGISupport info(F_2D | F_CUBE | F_DS, F_3D | F_MIPGEN | F_RT | F_SAMPLE, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_D32_FLOAT_S8X24_UINT:
>-        {
>-            static const DXGISupport info(F_2D | F_CUBE | F_DS, F_3D | F_MIPGEN | F_RT | F_SAMPLE, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_G8R8_G8B8_UNORM:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_SAMPLE, F_DS | F_MIPGEN | F_MS | F_RT, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_IA44:
>-        {
>-            static const DXGISupport info(0, F_3D | F_CUBE | F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_NV11:
>-        {
>-            static const DXGISupport info(0, F_3D | F_CUBE | F_DS | F_MIPGEN, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_NV12:
>-        {
>-            static const DXGISupport info(0, F_3D | F_CUBE | F_DS | F_MIPGEN, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_P010:
>-        {
>-            static const DXGISupport info(0, F_3D | F_CUBE | F_DS | F_MIPGEN, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_P016:
>-        {
>-            static const DXGISupport info(0, F_3D | F_CUBE | F_DS | F_MIPGEN, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_P8:
>-        {
>-            static const DXGISupport info(0, F_3D | F_CUBE | F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R10G10B10A2_TYPELESS:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE, F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R10G10B10A2_UINT:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_RT, F_DS | F_MIPGEN | F_SAMPLE, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R10G10B10A2_UNORM:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_MIPGEN | F_RT | F_SAMPLE, F_DS, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R10G10B10_XR_BIAS_A2_UNORM:
>-        {
>-            static const DXGISupport info(0, F_CUBE | F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, F_2D | F_3D);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R11G11B10_FLOAT:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_MIPGEN | F_RT | F_SAMPLE, F_DS, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R16G16B16A16_FLOAT:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_MIPGEN | F_RT | F_SAMPLE, F_DS, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R16G16B16A16_SINT:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_RT, F_DS | F_MIPGEN | F_SAMPLE, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R16G16B16A16_SNORM:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_MIPGEN | F_RT | F_SAMPLE, F_DS, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R16G16B16A16_TYPELESS:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE, F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R16G16B16A16_UINT:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_RT, F_DS | F_MIPGEN | F_SAMPLE, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R16G16B16A16_UNORM:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_MIPGEN | F_RT | F_SAMPLE, F_DS, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R16G16_FLOAT:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_MIPGEN | F_RT | F_SAMPLE, F_DS, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R16G16_SINT:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_RT, F_DS | F_MIPGEN | F_SAMPLE, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R16G16_SNORM:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_MIPGEN | F_RT | F_SAMPLE, F_DS, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R16G16_TYPELESS:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE, F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R16G16_UINT:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_RT, F_DS | F_MIPGEN | F_SAMPLE, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R16G16_UNORM:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_MIPGEN | F_RT | F_SAMPLE, F_DS, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R16_FLOAT:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_MIPGEN | F_RT | F_SAMPLE, F_DS, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R16_SINT:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_RT, F_DS | F_MIPGEN | F_SAMPLE, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R16_SNORM:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_MIPGEN | F_RT | F_SAMPLE, F_DS, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R16_TYPELESS:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE, F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R16_UINT:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_RT, F_DS | F_MIPGEN | F_SAMPLE, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R16_UNORM:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_MIPGEN | F_RT | F_SAMPLE, F_DS, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R1_UNORM:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE, F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R24G8_TYPELESS:
>-        {
>-            static const DXGISupport info(F_2D | F_CUBE, F_3D | F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R24_UNORM_X8_TYPELESS:
>-        {
>-            static const DXGISupport info(F_2D | F_CUBE | F_SAMPLE, F_3D | F_DS | F_MIPGEN | F_MS | F_RT, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R32G32B32A32_FLOAT:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_MIPGEN | F_RT | F_SAMPLE, F_DS, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R32G32B32A32_SINT:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_RT, F_DS | F_MIPGEN | F_SAMPLE, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R32G32B32A32_TYPELESS:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE, F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R32G32B32A32_UINT:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_RT, F_DS | F_MIPGEN | F_SAMPLE, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R32G32B32_FLOAT:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE, F_DS | F_MIPGEN, F_MS | F_RT);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R32G32B32_SINT:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE, F_DS | F_MIPGEN | F_SAMPLE, F_MS | F_RT);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R32G32B32_TYPELESS:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE, F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R32G32B32_UINT:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE, F_DS | F_MIPGEN | F_SAMPLE, F_MS | F_RT);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R32G32_FLOAT:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_MIPGEN | F_RT | F_SAMPLE, F_DS, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R32G32_SINT:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_RT, F_DS | F_MIPGEN | F_SAMPLE, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R32G32_TYPELESS:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE, F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R32G32_UINT:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_RT, F_DS | F_MIPGEN | F_SAMPLE, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R32G8X24_TYPELESS:
>-        {
>-            static const DXGISupport info(F_2D | F_CUBE, F_3D | F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R32_FLOAT:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_MIPGEN | F_RT | F_SAMPLE, F_DS, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R32_FLOAT_X8X24_TYPELESS:
>-        {
>-            static const DXGISupport info(F_2D | F_CUBE | F_SAMPLE, F_3D | F_DS | F_MIPGEN | F_MS | F_RT, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R32_SINT:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_RT, F_DS | F_MIPGEN | F_SAMPLE, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R32_TYPELESS:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE, F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R32_UINT:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_RT, F_DS | F_MIPGEN | F_SAMPLE, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R8G8B8A8_SINT:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_RT, F_DS | F_MIPGEN | F_SAMPLE, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R8G8B8A8_SNORM:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_MIPGEN | F_RT | F_SAMPLE, F_DS, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R8G8B8A8_TYPELESS:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE, F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R8G8B8A8_UINT:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_RT, F_DS | F_MIPGEN | F_SAMPLE, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R8G8B8A8_UNORM:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_MIPGEN | F_RT | F_SAMPLE, F_DS, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R8G8B8A8_UNORM_SRGB:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_MIPGEN | F_RT | F_SAMPLE, F_DS, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R8G8_B8G8_UNORM:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_SAMPLE, F_DS | F_MIPGEN | F_MS | F_RT, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R8G8_SINT:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_RT, F_DS | F_MIPGEN | F_SAMPLE, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R8G8_SNORM:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_MIPGEN | F_RT | F_SAMPLE, F_DS, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R8G8_TYPELESS:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE, F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R8G8_UINT:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_RT, F_DS | F_MIPGEN | F_SAMPLE, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R8G8_UNORM:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_MIPGEN | F_RT | F_SAMPLE, F_DS, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R8_SINT:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_RT, F_DS | F_MIPGEN | F_SAMPLE, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R8_SNORM:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_MIPGEN | F_RT | F_SAMPLE, F_DS, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R8_TYPELESS:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE, F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R8_UINT:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_RT, F_DS | F_MIPGEN | F_SAMPLE, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R8_UNORM:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_MIPGEN | F_RT | F_SAMPLE, F_DS, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R9G9B9E5_SHAREDEXP:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_SAMPLE, F_DS | F_MIPGEN | F_MS | F_RT, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_UNKNOWN:
>-        {
>-            static const DXGISupport info(0, F_2D | F_3D | F_CUBE | F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_X24_TYPELESS_G8_UINT:
>-        {
>-            static const DXGISupport info(F_2D | F_CUBE, F_3D | F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_X32_TYPELESS_G8X24_UINT:
>-        {
>-            static const DXGISupport info(F_2D | F_CUBE, F_3D | F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_Y210:
>-        {
>-            static const DXGISupport info(0, F_3D | F_CUBE | F_DS | F_MIPGEN | F_MS | F_RT, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_Y216:
>-        {
>-            static const DXGISupport info(0, F_3D | F_CUBE | F_DS | F_MIPGEN | F_MS | F_RT, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_Y410:
>-        {
>-            static const DXGISupport info(0, F_3D | F_CUBE | F_DS | F_MIPGEN | F_MS | F_RT, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_Y416:
>-        {
>-            static const DXGISupport info(0, F_3D | F_CUBE | F_DS | F_MIPGEN | F_MS | F_RT, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_YUY2:
>-        {
>-            static const DXGISupport info(0, F_3D | F_CUBE | F_DS | F_MIPGEN | F_MS | F_RT, 0);
>-            return info;
>-        }
>-
>-        default:
>-            UNREACHABLE();
>-            return GetDefaultSupport();
>-    }
>-    // clang-format on
>-}
>-
>-const DXGISupport &GetDXGISupport_11_1(DXGI_FORMAT dxgiFormat)
>-{
>-    // clang-format off
>-    switch (dxgiFormat)
>-    {
>-        case DXGI_FORMAT_420_OPAQUE:
>-        {
>-            static const DXGISupport info(F_2D, F_3D | F_CUBE | F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_A8P8:
>-        {
>-            static const DXGISupport info(F_2D, F_3D | F_CUBE | F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_A8_UNORM:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_MIPGEN | F_RT | F_SAMPLE, F_DS, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_AI44:
>-        {
>-            static const DXGISupport info(F_2D, F_3D | F_CUBE | F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_AYUV:
>-        {
>-            static const DXGISupport info(F_2D | F_RT | F_SAMPLE, F_3D | F_CUBE | F_DS | F_MIPGEN, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_B4G4R4A4_UNORM:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_MIPGEN | F_SAMPLE, F_DS, F_MS | F_RT);
>-            return info;
>-        }
>-        case DXGI_FORMAT_B5G5R5A1_UNORM:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_MIPGEN | F_SAMPLE, F_DS, F_MS | F_RT);
>-            return info;
>-        }
>-        case DXGI_FORMAT_B5G6R5_UNORM:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_MIPGEN | F_RT | F_SAMPLE, F_DS, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_B8G8R8A8_TYPELESS:
>-        {
>-            static const DXGISupport info(0, F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, F_2D | F_3D | F_CUBE);
>-            return info;
>-        }
>-        case DXGI_FORMAT_B8G8R8A8_UNORM:
>-        {
>-            static const DXGISupport info(F_MIPGEN | F_RT | F_SAMPLE, F_DS, F_2D | F_3D | F_CUBE | F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_B8G8R8A8_UNORM_SRGB:
>-        {
>-            static const DXGISupport info(F_RT | F_SAMPLE, F_DS | F_MIPGEN, F_2D | F_3D | F_CUBE | F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_B8G8R8X8_TYPELESS:
>-        {
>-            static const DXGISupport info(0, F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, F_2D | F_3D | F_CUBE);
>-            return info;
>-        }
>-        case DXGI_FORMAT_B8G8R8X8_UNORM:
>-        {
>-            static const DXGISupport info(F_RT | F_SAMPLE, F_DS | F_MIPGEN, F_2D | F_3D | F_CUBE | F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_B8G8R8X8_UNORM_SRGB:
>-        {
>-            static const DXGISupport info(F_RT | F_SAMPLE, F_DS | F_MIPGEN, F_2D | F_3D | F_CUBE | F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_BC1_TYPELESS:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE, F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_BC1_UNORM:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_SAMPLE, F_DS | F_MIPGEN | F_MS | F_RT, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_BC1_UNORM_SRGB:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_SAMPLE, F_DS | F_MIPGEN | F_MS | F_RT, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_BC2_TYPELESS:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE, F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_BC2_UNORM:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_SAMPLE, F_DS | F_MIPGEN | F_MS | F_RT, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_BC2_UNORM_SRGB:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_SAMPLE, F_DS | F_MIPGEN | F_MS | F_RT, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_BC3_TYPELESS:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE, F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_BC3_UNORM:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_SAMPLE, F_DS | F_MIPGEN | F_MS | F_RT, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_BC3_UNORM_SRGB:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_SAMPLE, F_DS | F_MIPGEN | F_MS | F_RT, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_BC4_SNORM:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_SAMPLE, F_DS | F_MIPGEN | F_MS | F_RT, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_BC4_TYPELESS:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE, F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_BC4_UNORM:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_SAMPLE, F_DS | F_MIPGEN | F_MS | F_RT, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_BC5_SNORM:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_SAMPLE, F_DS | F_MIPGEN | F_MS | F_RT, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_BC5_TYPELESS:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE, F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_BC5_UNORM:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_SAMPLE, F_DS | F_MIPGEN | F_MS | F_RT, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_BC6H_SF16:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_SAMPLE, F_DS | F_MIPGEN | F_MS | F_RT, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_BC6H_TYPELESS:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE, F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_BC6H_UF16:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_SAMPLE, F_DS | F_MIPGEN | F_MS | F_RT, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_BC7_TYPELESS:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE, F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_BC7_UNORM:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_SAMPLE, F_DS | F_MIPGEN | F_MS | F_RT, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_BC7_UNORM_SRGB:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_SAMPLE, F_DS | F_MIPGEN | F_MS | F_RT, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_D16_UNORM:
>-        {
>-            static const DXGISupport info(F_2D | F_CUBE | F_DS, F_3D | F_MIPGEN | F_RT | F_SAMPLE, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_D24_UNORM_S8_UINT:
>-        {
>-            static const DXGISupport info(F_2D | F_CUBE | F_DS, F_3D | F_RT | F_SAMPLE, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_D32_FLOAT:
>-        {
>-            static const DXGISupport info(F_2D | F_CUBE | F_DS, F_3D | F_MIPGEN | F_RT | F_SAMPLE, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_D32_FLOAT_S8X24_UINT:
>-        {
>-            static const DXGISupport info(F_2D | F_CUBE | F_DS, F_3D | F_MIPGEN | F_RT | F_SAMPLE, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_G8R8_G8B8_UNORM:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_SAMPLE, F_DS | F_MIPGEN | F_MS | F_RT, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_IA44:
>-        {
>-            static const DXGISupport info(F_2D, F_3D | F_CUBE | F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_NV11:
>-        {
>-            static const DXGISupport info(F_2D | F_RT | F_SAMPLE, F_3D | F_CUBE | F_DS | F_MIPGEN, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_NV12:
>-        {
>-            static const DXGISupport info(F_2D | F_RT | F_SAMPLE, F_3D | F_CUBE | F_DS | F_MIPGEN, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_P010:
>-        {
>-            static const DXGISupport info(F_2D | F_RT | F_SAMPLE, F_3D | F_CUBE | F_DS | F_MIPGEN, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_P016:
>-        {
>-            static const DXGISupport info(F_2D | F_RT | F_SAMPLE, F_3D | F_CUBE | F_DS | F_MIPGEN, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_P8:
>-        {
>-            static const DXGISupport info(F_2D, F_3D | F_CUBE | F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R10G10B10A2_TYPELESS:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE, F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R10G10B10A2_UINT:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_RT, F_DS | F_MIPGEN | F_SAMPLE, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R10G10B10A2_UNORM:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_MIPGEN | F_RT | F_SAMPLE, F_DS, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R10G10B10_XR_BIAS_A2_UNORM:
>-        {
>-            static const DXGISupport info(0, F_CUBE | F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, F_2D | F_3D);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R11G11B10_FLOAT:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_MIPGEN | F_RT | F_SAMPLE, F_DS, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R16G16B16A16_FLOAT:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_MIPGEN | F_RT | F_SAMPLE, F_DS, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R16G16B16A16_SINT:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_RT, F_DS | F_MIPGEN | F_SAMPLE, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R16G16B16A16_SNORM:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_MIPGEN | F_RT | F_SAMPLE, F_DS, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R16G16B16A16_TYPELESS:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE, F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R16G16B16A16_UINT:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_RT, F_DS | F_MIPGEN | F_SAMPLE, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R16G16B16A16_UNORM:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_MIPGEN | F_RT | F_SAMPLE, F_DS, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R16G16_FLOAT:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_MIPGEN | F_RT | F_SAMPLE, F_DS, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R16G16_SINT:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_RT, F_DS | F_MIPGEN | F_SAMPLE, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R16G16_SNORM:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_MIPGEN | F_RT | F_SAMPLE, F_DS, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R16G16_TYPELESS:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE, F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R16G16_UINT:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_RT, F_DS | F_MIPGEN | F_SAMPLE, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R16G16_UNORM:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_MIPGEN | F_RT | F_SAMPLE, F_DS, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R16_FLOAT:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_MIPGEN | F_RT | F_SAMPLE, F_DS, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R16_SINT:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_RT, F_DS | F_MIPGEN | F_SAMPLE, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R16_SNORM:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_MIPGEN | F_RT | F_SAMPLE, F_DS, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R16_TYPELESS:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE, F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R16_UINT:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_RT, F_DS | F_MIPGEN | F_SAMPLE, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R16_UNORM:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_MIPGEN | F_RT | F_SAMPLE, F_DS, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R1_UNORM:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE, F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R24G8_TYPELESS:
>-        {
>-            static const DXGISupport info(F_2D | F_CUBE, F_3D | F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R24_UNORM_X8_TYPELESS:
>-        {
>-            static const DXGISupport info(F_2D | F_CUBE | F_SAMPLE, F_3D | F_DS | F_MIPGEN | F_MS | F_RT, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R32G32B32A32_FLOAT:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_MIPGEN | F_RT | F_SAMPLE, F_DS, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R32G32B32A32_SINT:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_RT, F_DS | F_MIPGEN | F_SAMPLE, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R32G32B32A32_TYPELESS:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE, F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R32G32B32A32_UINT:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_RT, F_DS | F_MIPGEN | F_SAMPLE, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R32G32B32_FLOAT:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE, F_DS | F_MIPGEN, F_MS | F_RT);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R32G32B32_SINT:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE, F_DS | F_MIPGEN | F_SAMPLE, F_MS | F_RT);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R32G32B32_TYPELESS:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE, F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R32G32B32_UINT:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE, F_DS | F_MIPGEN | F_SAMPLE, F_MS | F_RT);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R32G32_FLOAT:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_MIPGEN | F_RT | F_SAMPLE, F_DS, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R32G32_SINT:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_RT, F_DS | F_MIPGEN | F_SAMPLE, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R32G32_TYPELESS:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE, F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R32G32_UINT:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_RT, F_DS | F_MIPGEN | F_SAMPLE, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R32G8X24_TYPELESS:
>-        {
>-            static const DXGISupport info(F_2D | F_CUBE, F_3D | F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R32_FLOAT:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_MIPGEN | F_RT | F_SAMPLE, F_DS, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R32_FLOAT_X8X24_TYPELESS:
>-        {
>-            static const DXGISupport info(F_2D | F_CUBE | F_SAMPLE, F_3D | F_DS | F_MIPGEN | F_MS | F_RT, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R32_SINT:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_RT, F_DS | F_MIPGEN | F_SAMPLE, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R32_TYPELESS:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE, F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R32_UINT:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_RT, F_DS | F_MIPGEN | F_SAMPLE, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R8G8B8A8_SINT:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_RT, F_DS | F_MIPGEN | F_SAMPLE, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R8G8B8A8_SNORM:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_MIPGEN | F_RT | F_SAMPLE, F_DS, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R8G8B8A8_TYPELESS:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE, F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R8G8B8A8_UINT:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_RT, F_DS | F_MIPGEN | F_SAMPLE, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R8G8B8A8_UNORM:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_MIPGEN | F_RT | F_SAMPLE, F_DS, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R8G8B8A8_UNORM_SRGB:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_MIPGEN | F_RT | F_SAMPLE, F_DS, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R8G8_B8G8_UNORM:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_SAMPLE, F_DS | F_MIPGEN | F_MS | F_RT, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R8G8_SINT:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_RT, F_DS | F_MIPGEN | F_SAMPLE, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R8G8_SNORM:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_MIPGEN | F_RT | F_SAMPLE, F_DS, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R8G8_TYPELESS:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE, F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R8G8_UINT:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_RT, F_DS | F_MIPGEN | F_SAMPLE, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R8G8_UNORM:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_MIPGEN | F_RT | F_SAMPLE, F_DS, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R8_SINT:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_RT, F_DS | F_MIPGEN | F_SAMPLE, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R8_SNORM:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_MIPGEN | F_RT | F_SAMPLE, F_DS, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R8_TYPELESS:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE, F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R8_UINT:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_RT, F_DS | F_MIPGEN | F_SAMPLE, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R8_UNORM:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_MIPGEN | F_RT | F_SAMPLE, F_DS, F_MS);
>-            return info;
>-        }
>-        case DXGI_FORMAT_R9G9B9E5_SHAREDEXP:
>-        {
>-            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_SAMPLE, F_DS | F_MIPGEN | F_MS | F_RT, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_UNKNOWN:
>-        {
>-            static const DXGISupport info(0, F_2D | F_3D | F_CUBE | F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_X24_TYPELESS_G8_UINT:
>-        {
>-            static const DXGISupport info(F_2D | F_CUBE, F_3D | F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_X32_TYPELESS_G8X24_UINT:
>-        {
>-            static const DXGISupport info(F_2D | F_CUBE, F_3D | F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_Y210:
>-        {
>-            static const DXGISupport info(F_2D | F_SAMPLE, F_3D | F_CUBE | F_DS | F_MIPGEN | F_MS | F_RT, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_Y216:
>-        {
>-            static const DXGISupport info(F_2D | F_SAMPLE, F_3D | F_CUBE | F_DS | F_MIPGEN | F_MS | F_RT, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_Y410:
>-        {
>-            static const DXGISupport info(F_2D | F_SAMPLE, F_3D | F_CUBE | F_DS | F_MIPGEN | F_MS | F_RT, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_Y416:
>-        {
>-            static const DXGISupport info(F_2D | F_SAMPLE, F_3D | F_CUBE | F_DS | F_MIPGEN | F_MS | F_RT, 0);
>-            return info;
>-        }
>-        case DXGI_FORMAT_YUY2:
>-        {
>-            static const DXGISupport info(F_2D | F_SAMPLE, F_3D | F_CUBE | F_DS | F_MIPGEN | F_MS | F_RT, 0);
>-            return info;
>-        }
>-
>-        default:
>-            UNREACHABLE();
>-            return GetDefaultSupport();
>-    }
>-    // clang-format on
>-}
>-
>-}
>-
>-#undef F_2D
>-#undef F_3D
>-#undef F_CUBE
>-#undef F_SAMPLE
>-#undef F_RT
>-#undef F_MS
>-#undef F_DS
>-#undef F_MIPGEN
>-
>-const DXGISupport &GetDXGISupport(DXGI_FORMAT dxgiFormat, D3D_FEATURE_LEVEL featureLevel)
>-{
>-    switch (featureLevel)
>-    {
>-        case D3D_FEATURE_LEVEL_9_3:
>-            return GetDXGISupport_9_3(dxgiFormat);
>-        case D3D_FEATURE_LEVEL_10_0:
>-            return GetDXGISupport_10_0(dxgiFormat);
>-        case D3D_FEATURE_LEVEL_10_1:
>-            return GetDXGISupport_10_1(dxgiFormat);
>-        case D3D_FEATURE_LEVEL_11_0:
>-            return GetDXGISupport_11_0(dxgiFormat);
>-        case D3D_FEATURE_LEVEL_11_1:
>-            return GetDXGISupport_11_1(dxgiFormat);
>-        default:
>-            return GetDefaultSupport();
>-    }
>-}
>-
>-} // namespace d3d11
>-
>-} // namespace rx
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/dxgi_support_table.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/dxgi_support_table.h
>index a818f376ef3..b4dc543e14d 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/dxgi_support_table.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/dxgi_support_table.h
>@@ -21,19 +21,13 @@ namespace d3d11
> 
> struct DXGISupport
> {
>-    DXGISupport()
>-        : alwaysSupportedFlags(0),
>-          neverSupportedFlags(0),
>-          optionallySupportedFlags(0)
>-    {
>-    }
>+    DXGISupport() : alwaysSupportedFlags(0), neverSupportedFlags(0), optionallySupportedFlags(0) {}
> 
>     DXGISupport(UINT alwaysSupportedIn, UINT neverSupportedIn, UINT optionallySupportedIn)
>         : alwaysSupportedFlags(alwaysSupportedIn),
>           neverSupportedFlags(neverSupportedIn),
>           optionallySupportedFlags(optionallySupportedIn)
>-    {
>-    }
>+    {}
> 
>     UINT alwaysSupportedFlags;
>     UINT neverSupportedFlags;
>@@ -42,8 +36,8 @@ struct DXGISupport
> 
> const DXGISupport &GetDXGISupport(DXGI_FORMAT dxgiFormat, D3D_FEATURE_LEVEL featureLevel);
> 
>-} // namespace d3d11
>+}  // namespace d3d11
> 
>-} // namespace rx
>+}  // namespace rx
> 
> #endif  // LIBANGLE_RENDERER_D3D_D3D11_DXGI_SUPPORT_TABLE_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/dxgi_support_table_autogen.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/dxgi_support_table_autogen.cpp
>new file mode 100644
>index 00000000000..51668abbe9b
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/dxgi_support_table_autogen.cpp
>@@ -0,0 +1,3042 @@
>+// GENERATED FILE - DO NOT EDIT. See dxgi_support_data.json.
>+//
>+// Copyright 2015 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// dxgi_support_table:
>+//   Queries for DXGI support of various texture formats. Depends on DXGI
>+//   version, D3D feature level, and is sometimes guaranteed or optional.
>+//
>+
>+#include "libANGLE/renderer/d3d/d3d11/dxgi_support_table.h"
>+
>+#include "common/debug.h"
>+
>+namespace rx
>+{
>+
>+namespace d3d11
>+{
>+
>+#define F_2D D3D11_FORMAT_SUPPORT_TEXTURE2D
>+#define F_3D D3D11_FORMAT_SUPPORT_TEXTURE3D
>+#define F_CUBE D3D11_FORMAT_SUPPORT_TEXTURECUBE
>+#define F_SAMPLE D3D11_FORMAT_SUPPORT_SHADER_SAMPLE
>+#define F_RT D3D11_FORMAT_SUPPORT_RENDER_TARGET
>+#define F_MS D3D11_FORMAT_SUPPORT_MULTISAMPLE_RENDERTARGET
>+#define F_DS D3D11_FORMAT_SUPPORT_DEPTH_STENCIL
>+#define F_MIPGEN D3D11_FORMAT_SUPPORT_MIP_AUTOGEN
>+
>+namespace
>+{
>+
>+const DXGISupport &GetDefaultSupport()
>+{
>+    static UINT AllSupportFlags =
>+        D3D11_FORMAT_SUPPORT_TEXTURE2D | D3D11_FORMAT_SUPPORT_TEXTURE3D |
>+        D3D11_FORMAT_SUPPORT_TEXTURECUBE | D3D11_FORMAT_SUPPORT_SHADER_SAMPLE |
>+        D3D11_FORMAT_SUPPORT_RENDER_TARGET | D3D11_FORMAT_SUPPORT_MULTISAMPLE_RENDERTARGET |
>+        D3D11_FORMAT_SUPPORT_DEPTH_STENCIL | D3D11_FORMAT_SUPPORT_MIP_AUTOGEN;
>+    static const DXGISupport defaultSupport(0, 0, AllSupportFlags);
>+    return defaultSupport;
>+}
>+
>+const DXGISupport &GetDXGISupport_9_3(DXGI_FORMAT dxgiFormat)
>+{
>+    // clang-format off
>+    switch (dxgiFormat)
>+    {
>+        case DXGI_FORMAT_420_OPAQUE:
>+        {
>+            static const DXGISupport info(0, F_3D | F_CUBE | F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_A8P8:
>+        {
>+            static const DXGISupport info(0, F_3D | F_CUBE | F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_A8_UNORM:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_RT, F_DS, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_AI44:
>+        {
>+            static const DXGISupport info(0, F_3D | F_CUBE | F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_AYUV:
>+        {
>+            static const DXGISupport info(0, F_3D | F_CUBE | F_DS | F_MIPGEN, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_B4G4R4A4_UNORM:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_MIPGEN | F_SAMPLE, F_DS, F_MS | F_RT);
>+            return info;
>+        }
>+        case DXGI_FORMAT_B5G5R5A1_UNORM:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_MIPGEN | F_SAMPLE, F_DS, F_MS | F_RT);
>+            return info;
>+        }
>+        case DXGI_FORMAT_B5G6R5_UNORM:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_MIPGEN | F_RT | F_SAMPLE, F_DS, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_B8G8R8A8_TYPELESS:
>+        {
>+            static const DXGISupport info(0, F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, F_2D | F_3D | F_CUBE);
>+            return info;
>+        }
>+        case DXGI_FORMAT_B8G8R8A8_UNORM:
>+        {
>+            static const DXGISupport info(F_MIPGEN | F_RT | F_SAMPLE, F_DS, F_2D | F_3D | F_CUBE | F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_B8G8R8A8_UNORM_SRGB:
>+        {
>+            static const DXGISupport info(F_MIPGEN | F_RT, F_DS, F_2D | F_3D | F_CUBE | F_MS | F_SAMPLE);
>+            return info;
>+        }
>+        case DXGI_FORMAT_B8G8R8X8_TYPELESS:
>+        {
>+            static const DXGISupport info(0, F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, F_2D | F_3D | F_CUBE);
>+            return info;
>+        }
>+        case DXGI_FORMAT_B8G8R8X8_UNORM:
>+        {
>+            static const DXGISupport info(0, F_DS | F_MIPGEN, F_2D | F_3D | F_CUBE | F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_B8G8R8X8_UNORM_SRGB:
>+        {
>+            static const DXGISupport info(0, F_DS | F_MIPGEN, F_2D | F_3D | F_CUBE | F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_BC1_TYPELESS:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE, F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_BC1_UNORM:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_SAMPLE, F_DS | F_MIPGEN | F_MS | F_RT, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_BC1_UNORM_SRGB:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_SAMPLE, F_DS | F_MIPGEN | F_MS | F_RT, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_BC2_TYPELESS:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE, F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_BC2_UNORM:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_SAMPLE, F_DS | F_MIPGEN | F_MS | F_RT, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_BC2_UNORM_SRGB:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_SAMPLE, F_DS | F_MIPGEN | F_MS | F_RT, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_BC3_TYPELESS:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE, F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_BC3_UNORM:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_SAMPLE, F_DS | F_MIPGEN | F_MS | F_RT, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_BC3_UNORM_SRGB:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_SAMPLE, F_DS | F_MIPGEN | F_MS | F_RT, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_BC4_SNORM:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE, F_DS | F_MIPGEN | F_MS | F_RT, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_BC4_TYPELESS:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE, F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_BC4_UNORM:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE, F_DS | F_MIPGEN | F_MS | F_RT, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_BC5_SNORM:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE, F_DS | F_MIPGEN | F_MS | F_RT, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_BC5_TYPELESS:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE, F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_BC5_UNORM:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE, F_DS | F_MIPGEN | F_MS | F_RT, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_BC6H_SF16:
>+        {
>+            static const DXGISupport info(0, F_DS | F_MIPGEN | F_MS | F_RT, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_BC6H_TYPELESS:
>+        {
>+            static const DXGISupport info(0, F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_BC6H_UF16:
>+        {
>+            static const DXGISupport info(0, F_DS | F_MIPGEN | F_MS | F_RT, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_BC7_TYPELESS:
>+        {
>+            static const DXGISupport info(0, F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_BC7_UNORM:
>+        {
>+            static const DXGISupport info(0, F_DS | F_MIPGEN | F_MS | F_RT, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_BC7_UNORM_SRGB:
>+        {
>+            static const DXGISupport info(0, F_DS | F_MIPGEN | F_MS | F_RT, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_D16_UNORM:
>+        {
>+            static const DXGISupport info(F_2D | F_CUBE | F_DS, F_3D | F_MIPGEN | F_RT | F_SAMPLE, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_D24_UNORM_S8_UINT:
>+        {
>+            static const DXGISupport info(F_2D | F_CUBE | F_DS, F_3D | F_RT | F_SAMPLE, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_D32_FLOAT:
>+        {
>+            static const DXGISupport info(F_2D | F_CUBE, F_3D | F_MIPGEN | F_RT | F_SAMPLE, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_D32_FLOAT_S8X24_UINT:
>+        {
>+            static const DXGISupport info(F_2D | F_CUBE, F_3D | F_MIPGEN | F_RT | F_SAMPLE, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_G8R8_G8B8_UNORM:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE, F_DS | F_MIPGEN | F_MS | F_RT, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_IA44:
>+        {
>+            static const DXGISupport info(0, F_3D | F_CUBE | F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_NV11:
>+        {
>+            static const DXGISupport info(0, F_3D | F_CUBE | F_DS | F_MIPGEN, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_NV12:
>+        {
>+            static const DXGISupport info(0, F_3D | F_CUBE | F_DS | F_MIPGEN, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_P010:
>+        {
>+            static const DXGISupport info(0, F_3D | F_CUBE | F_DS | F_MIPGEN, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_P016:
>+        {
>+            static const DXGISupport info(0, F_3D | F_CUBE | F_DS | F_MIPGEN, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_P8:
>+        {
>+            static const DXGISupport info(0, F_3D | F_CUBE | F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R10G10B10A2_TYPELESS:
>+        {
>+            static const DXGISupport info(0, F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R10G10B10A2_UINT:
>+        {
>+            static const DXGISupport info(0, F_DS | F_MIPGEN | F_SAMPLE, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R10G10B10A2_UNORM:
>+        {
>+            static const DXGISupport info(0, F_DS, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R10G10B10_XR_BIAS_A2_UNORM:
>+        {
>+            static const DXGISupport info(0, F_CUBE | F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, F_2D | F_3D);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R11G11B10_FLOAT:
>+        {
>+            static const DXGISupport info(0, F_DS, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R16G16B16A16_FLOAT:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_MIPGEN | F_RT, F_DS, F_MS | F_SAMPLE);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R16G16B16A16_SINT:
>+        {
>+            static const DXGISupport info(0, F_DS | F_MIPGEN | F_SAMPLE, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R16G16B16A16_SNORM:
>+        {
>+            static const DXGISupport info(0, F_DS, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R16G16B16A16_TYPELESS:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE, F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R16G16B16A16_UINT:
>+        {
>+            static const DXGISupport info(0, F_DS | F_MIPGEN | F_SAMPLE, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R16G16B16A16_UNORM:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_MIPGEN | F_RT | F_SAMPLE, F_DS, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R16G16_FLOAT:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_MIPGEN | F_RT, F_DS, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R16G16_SINT:
>+        {
>+            static const DXGISupport info(0, F_DS | F_MIPGEN | F_SAMPLE, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R16G16_SNORM:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_RT | F_SAMPLE, F_DS, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R16G16_TYPELESS:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE, F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R16G16_UINT:
>+        {
>+            static const DXGISupport info(0, F_DS | F_MIPGEN | F_SAMPLE, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R16G16_UNORM:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_MIPGEN | F_RT | F_SAMPLE, F_DS, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R16_FLOAT:
>+        {
>+            static const DXGISupport info(0, F_DS, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R16_SINT:
>+        {
>+            static const DXGISupport info(0, F_DS | F_MIPGEN | F_SAMPLE, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R16_SNORM:
>+        {
>+            static const DXGISupport info(0, F_DS, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R16_TYPELESS:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE, F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R16_UINT:
>+        {
>+            static const DXGISupport info(0, F_DS | F_MIPGEN | F_SAMPLE, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R16_UNORM:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_SAMPLE, F_DS, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R1_UNORM:
>+        {
>+            static const DXGISupport info(F_2D, F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R24G8_TYPELESS:
>+        {
>+            static const DXGISupport info(F_2D | F_CUBE, F_3D | F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R24_UNORM_X8_TYPELESS:
>+        {
>+            static const DXGISupport info(F_2D | F_CUBE, F_3D | F_DS | F_MIPGEN | F_MS | F_RT, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R32G32B32A32_FLOAT:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_MIPGEN | F_RT, F_DS, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R32G32B32A32_SINT:
>+        {
>+            static const DXGISupport info(0, F_DS | F_MIPGEN | F_SAMPLE, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R32G32B32A32_TYPELESS:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE, F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R32G32B32A32_UINT:
>+        {
>+            static const DXGISupport info(0, F_DS | F_MIPGEN | F_SAMPLE, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R32G32B32_FLOAT:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE, F_DS | F_MIPGEN, F_MS | F_RT);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R32G32B32_SINT:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE, F_DS | F_MIPGEN | F_SAMPLE, F_MS | F_RT);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R32G32B32_TYPELESS:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE, F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R32G32B32_UINT:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE, F_DS | F_MIPGEN | F_SAMPLE, F_MS | F_RT);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R32G32_FLOAT:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_RT, F_DS, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R32G32_SINT:
>+        {
>+            static const DXGISupport info(0, F_DS | F_MIPGEN | F_SAMPLE, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R32G32_TYPELESS:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE, F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R32G32_UINT:
>+        {
>+            static const DXGISupport info(0, F_DS | F_MIPGEN | F_SAMPLE, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R32G8X24_TYPELESS:
>+        {
>+            static const DXGISupport info(0, F_3D | F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R32_FLOAT:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_MIPGEN | F_RT, F_DS, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R32_FLOAT_X8X24_TYPELESS:
>+        {
>+            static const DXGISupport info(F_2D | F_CUBE, F_3D | F_DS | F_MIPGEN | F_MS | F_RT, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R32_SINT:
>+        {
>+            static const DXGISupport info(0, F_DS | F_MIPGEN | F_SAMPLE, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R32_TYPELESS:
>+        {
>+            static const DXGISupport info(0, F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R32_UINT:
>+        {
>+            static const DXGISupport info(0, F_DS | F_MIPGEN | F_SAMPLE, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R8G8B8A8_SINT:
>+        {
>+            static const DXGISupport info(0, F_DS | F_MIPGEN | F_SAMPLE, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R8G8B8A8_SNORM:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_RT | F_SAMPLE, F_DS, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R8G8B8A8_TYPELESS:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE, F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R8G8B8A8_UINT:
>+        {
>+            static const DXGISupport info(0, F_DS | F_MIPGEN | F_SAMPLE, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R8G8B8A8_UNORM:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_MIPGEN | F_RT | F_SAMPLE, F_DS, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R8G8B8A8_UNORM_SRGB:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_MIPGEN | F_RT | F_SAMPLE, F_DS, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R8G8_B8G8_UNORM:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE, F_DS | F_MIPGEN | F_MS | F_RT, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R8G8_SINT:
>+        {
>+            static const DXGISupport info(0, F_DS | F_MIPGEN | F_SAMPLE, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R8G8_SNORM:
>+        {
>+            static const DXGISupport info(F_2D | F_SAMPLE, F_DS, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R8G8_TYPELESS:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE, F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R8G8_UINT:
>+        {
>+            static const DXGISupport info(0, F_DS | F_MIPGEN | F_SAMPLE, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R8G8_UNORM:
>+        {
>+            static const DXGISupport info(0, F_DS, F_MS | F_RT | F_SAMPLE);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R8_SINT:
>+        {
>+            static const DXGISupport info(0, F_DS | F_MIPGEN | F_SAMPLE, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R8_SNORM:
>+        {
>+            static const DXGISupport info(0, F_DS, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R8_TYPELESS:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE, F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R8_UINT:
>+        {
>+            static const DXGISupport info(0, F_DS | F_MIPGEN | F_SAMPLE, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R8_UNORM:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_SAMPLE, F_DS, F_MS | F_RT);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R9G9B9E5_SHAREDEXP:
>+        {
>+            static const DXGISupport info(0, F_DS | F_MIPGEN | F_MS | F_RT, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_UNKNOWN:
>+        {
>+            static const DXGISupport info(0, F_2D | F_3D | F_CUBE | F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_X24_TYPELESS_G8_UINT:
>+        {
>+            static const DXGISupport info(F_2D | F_CUBE, F_3D | F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_X32_TYPELESS_G8X24_UINT:
>+        {
>+            static const DXGISupport info(F_2D | F_CUBE, F_3D | F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_Y210:
>+        {
>+            static const DXGISupport info(0, F_3D | F_CUBE | F_DS | F_MIPGEN | F_MS | F_RT, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_Y216:
>+        {
>+            static const DXGISupport info(0, F_3D | F_CUBE | F_DS | F_MIPGEN | F_MS | F_RT, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_Y410:
>+        {
>+            static const DXGISupport info(0, F_3D | F_CUBE | F_DS | F_MIPGEN | F_MS | F_RT, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_Y416:
>+        {
>+            static const DXGISupport info(0, F_3D | F_CUBE | F_DS | F_MIPGEN | F_MS | F_RT, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_YUY2:
>+        {
>+            static const DXGISupport info(0, F_3D | F_CUBE | F_DS | F_MIPGEN | F_MS | F_RT, 0);
>+            return info;
>+        }
>+
>+        default:
>+            UNREACHABLE();
>+            return GetDefaultSupport();
>+    }
>+    // clang-format on
>+}
>+
>+const DXGISupport &GetDXGISupport_10_0(DXGI_FORMAT dxgiFormat)
>+{
>+    // clang-format off
>+    switch (dxgiFormat)
>+    {
>+        case DXGI_FORMAT_420_OPAQUE:
>+        {
>+            static const DXGISupport info(0, F_3D | F_CUBE | F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_A8P8:
>+        {
>+            static const DXGISupport info(0, F_3D | F_CUBE | F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_A8_UNORM:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_MIPGEN | F_RT | F_SAMPLE, F_DS, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_AI44:
>+        {
>+            static const DXGISupport info(0, F_3D | F_CUBE | F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_AYUV:
>+        {
>+            static const DXGISupport info(0, F_3D | F_CUBE | F_DS | F_MIPGEN, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_B4G4R4A4_UNORM:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_MIPGEN | F_SAMPLE, F_DS, F_MS | F_RT);
>+            return info;
>+        }
>+        case DXGI_FORMAT_B5G5R5A1_UNORM:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_MIPGEN | F_SAMPLE, F_DS, F_MS | F_RT);
>+            return info;
>+        }
>+        case DXGI_FORMAT_B5G6R5_UNORM:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_MIPGEN | F_RT | F_SAMPLE, F_DS, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_B8G8R8A8_TYPELESS:
>+        {
>+            static const DXGISupport info(0, F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, F_2D | F_3D | F_CUBE);
>+            return info;
>+        }
>+        case DXGI_FORMAT_B8G8R8A8_UNORM:
>+        {
>+            static const DXGISupport info(F_MIPGEN, F_DS, F_2D | F_3D | F_CUBE | F_MS | F_RT | F_SAMPLE);
>+            return info;
>+        }
>+        case DXGI_FORMAT_B8G8R8A8_UNORM_SRGB:
>+        {
>+            static const DXGISupport info(F_MIPGEN | F_RT, F_DS, F_2D | F_3D | F_CUBE | F_MS | F_SAMPLE);
>+            return info;
>+        }
>+        case DXGI_FORMAT_B8G8R8X8_TYPELESS:
>+        {
>+            static const DXGISupport info(0, F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, F_2D | F_3D | F_CUBE);
>+            return info;
>+        }
>+        case DXGI_FORMAT_B8G8R8X8_UNORM:
>+        {
>+            static const DXGISupport info(0, F_DS | F_MIPGEN, F_2D | F_3D | F_CUBE | F_MS | F_SAMPLE);
>+            return info;
>+        }
>+        case DXGI_FORMAT_B8G8R8X8_UNORM_SRGB:
>+        {
>+            static const DXGISupport info(0, F_DS | F_MIPGEN, F_2D | F_3D | F_CUBE | F_MS | F_SAMPLE);
>+            return info;
>+        }
>+        case DXGI_FORMAT_BC1_TYPELESS:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE, F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_BC1_UNORM:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_SAMPLE, F_DS | F_MIPGEN | F_MS | F_RT, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_BC1_UNORM_SRGB:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_SAMPLE, F_DS | F_MIPGEN | F_MS | F_RT, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_BC2_TYPELESS:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE, F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_BC2_UNORM:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_SAMPLE, F_DS | F_MIPGEN | F_MS | F_RT, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_BC2_UNORM_SRGB:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_SAMPLE, F_DS | F_MIPGEN | F_MS | F_RT, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_BC3_TYPELESS:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE, F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_BC3_UNORM:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_SAMPLE, F_DS | F_MIPGEN | F_MS | F_RT, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_BC3_UNORM_SRGB:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_SAMPLE, F_DS | F_MIPGEN | F_MS | F_RT, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_BC4_SNORM:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_SAMPLE, F_DS | F_MIPGEN | F_MS | F_RT, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_BC4_TYPELESS:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE, F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_BC4_UNORM:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_SAMPLE, F_DS | F_MIPGEN | F_MS | F_RT, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_BC5_SNORM:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_SAMPLE, F_DS | F_MIPGEN | F_MS | F_RT, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_BC5_TYPELESS:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE, F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_BC5_UNORM:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_SAMPLE, F_DS | F_MIPGEN | F_MS | F_RT, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_BC6H_SF16:
>+        {
>+            static const DXGISupport info(0, F_DS | F_MIPGEN | F_MS | F_RT, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_BC6H_TYPELESS:
>+        {
>+            static const DXGISupport info(0, F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_BC6H_UF16:
>+        {
>+            static const DXGISupport info(0, F_DS | F_MIPGEN | F_MS | F_RT, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_BC7_TYPELESS:
>+        {
>+            static const DXGISupport info(0, F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_BC7_UNORM:
>+        {
>+            static const DXGISupport info(0, F_DS | F_MIPGEN | F_MS | F_RT, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_BC7_UNORM_SRGB:
>+        {
>+            static const DXGISupport info(0, F_DS | F_MIPGEN | F_MS | F_RT, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_D16_UNORM:
>+        {
>+            static const DXGISupport info(F_2D | F_CUBE | F_DS, F_3D | F_MIPGEN | F_RT | F_SAMPLE, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_D24_UNORM_S8_UINT:
>+        {
>+            static const DXGISupport info(F_2D | F_CUBE | F_DS, F_3D | F_RT | F_SAMPLE, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_D32_FLOAT:
>+        {
>+            static const DXGISupport info(F_2D | F_CUBE | F_DS, F_3D | F_MIPGEN | F_RT | F_SAMPLE, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_D32_FLOAT_S8X24_UINT:
>+        {
>+            static const DXGISupport info(F_2D | F_CUBE | F_DS, F_3D | F_MIPGEN | F_RT | F_SAMPLE, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_G8R8_G8B8_UNORM:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_SAMPLE, F_DS | F_MIPGEN | F_MS | F_RT, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_IA44:
>+        {
>+            static const DXGISupport info(0, F_3D | F_CUBE | F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_NV11:
>+        {
>+            static const DXGISupport info(0, F_3D | F_CUBE | F_DS | F_MIPGEN, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_NV12:
>+        {
>+            static const DXGISupport info(0, F_3D | F_CUBE | F_DS | F_MIPGEN, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_P010:
>+        {
>+            static const DXGISupport info(0, F_3D | F_CUBE | F_DS | F_MIPGEN, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_P016:
>+        {
>+            static const DXGISupport info(0, F_3D | F_CUBE | F_DS | F_MIPGEN, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_P8:
>+        {
>+            static const DXGISupport info(0, F_3D | F_CUBE | F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R10G10B10A2_TYPELESS:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE, F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R10G10B10A2_UINT:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_RT, F_DS | F_MIPGEN | F_SAMPLE, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R10G10B10A2_UNORM:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_MIPGEN | F_RT | F_SAMPLE, F_DS, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R10G10B10_XR_BIAS_A2_UNORM:
>+        {
>+            static const DXGISupport info(0, F_CUBE | F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, F_2D | F_3D);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R11G11B10_FLOAT:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_MIPGEN | F_RT | F_SAMPLE, F_DS, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R16G16B16A16_FLOAT:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_MIPGEN | F_RT | F_SAMPLE, F_DS, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R16G16B16A16_SINT:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_RT, F_DS | F_MIPGEN | F_SAMPLE, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R16G16B16A16_SNORM:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_MIPGEN | F_RT | F_SAMPLE, F_DS, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R16G16B16A16_TYPELESS:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE, F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R16G16B16A16_UINT:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_RT, F_DS | F_MIPGEN | F_SAMPLE, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R16G16B16A16_UNORM:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_MIPGEN | F_RT | F_SAMPLE, F_DS, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R16G16_FLOAT:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_MIPGEN | F_RT | F_SAMPLE, F_DS, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R16G16_SINT:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_RT, F_DS | F_MIPGEN | F_SAMPLE, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R16G16_SNORM:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_MIPGEN | F_RT | F_SAMPLE, F_DS, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R16G16_TYPELESS:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE, F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R16G16_UINT:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_RT, F_DS | F_MIPGEN | F_SAMPLE, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R16G16_UNORM:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_MIPGEN | F_RT | F_SAMPLE, F_DS, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R16_FLOAT:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_MIPGEN | F_RT | F_SAMPLE, F_DS, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R16_SINT:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_RT, F_DS | F_MIPGEN | F_SAMPLE, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R16_SNORM:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_MIPGEN | F_RT | F_SAMPLE, F_DS, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R16_TYPELESS:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE, F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R16_UINT:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_RT, F_DS | F_MIPGEN | F_SAMPLE, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R16_UNORM:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_MIPGEN | F_RT | F_SAMPLE, F_DS, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R1_UNORM:
>+        {
>+            static const DXGISupport info(F_2D, F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R24G8_TYPELESS:
>+        {
>+            static const DXGISupport info(F_2D | F_CUBE, F_3D | F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R24_UNORM_X8_TYPELESS:
>+        {
>+            static const DXGISupport info(F_2D | F_CUBE, F_3D | F_DS | F_MIPGEN | F_MS | F_RT, F_SAMPLE);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R32G32B32A32_FLOAT:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_MIPGEN | F_RT, F_DS, F_MS | F_SAMPLE);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R32G32B32A32_SINT:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_RT, F_DS | F_MIPGEN | F_SAMPLE, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R32G32B32A32_TYPELESS:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE, F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R32G32B32A32_UINT:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_RT, F_DS | F_MIPGEN | F_SAMPLE, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R32G32B32_FLOAT:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE, F_DS | F_MIPGEN, F_MS | F_RT);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R32G32B32_SINT:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE, F_DS | F_MIPGEN | F_SAMPLE, F_MS | F_RT);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R32G32B32_TYPELESS:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE, F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R32G32B32_UINT:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE, F_DS | F_MIPGEN | F_SAMPLE, F_MS | F_RT);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R32G32_FLOAT:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_MIPGEN | F_RT, F_DS, F_MS | F_SAMPLE);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R32G32_SINT:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_RT, F_DS | F_MIPGEN | F_SAMPLE, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R32G32_TYPELESS:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE, F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R32G32_UINT:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_RT, F_DS | F_MIPGEN | F_SAMPLE, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R32G8X24_TYPELESS:
>+        {
>+            static const DXGISupport info(F_2D | F_CUBE, F_3D | F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R32_FLOAT:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_MIPGEN | F_RT, F_DS, F_MS | F_SAMPLE);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R32_FLOAT_X8X24_TYPELESS:
>+        {
>+            static const DXGISupport info(F_2D | F_CUBE, F_3D | F_DS | F_MIPGEN | F_MS | F_RT, F_SAMPLE);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R32_SINT:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_RT, F_DS | F_MIPGEN | F_SAMPLE, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R32_TYPELESS:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE, F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R32_UINT:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_RT, F_DS | F_MIPGEN | F_SAMPLE, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R8G8B8A8_SINT:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_RT, F_DS | F_MIPGEN | F_SAMPLE, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R8G8B8A8_SNORM:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_MIPGEN | F_RT | F_SAMPLE, F_DS, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R8G8B8A8_TYPELESS:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE, F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R8G8B8A8_UINT:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_RT, F_DS | F_MIPGEN | F_SAMPLE, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R8G8B8A8_UNORM:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_MIPGEN | F_RT | F_SAMPLE, F_DS, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R8G8B8A8_UNORM_SRGB:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_MIPGEN | F_RT | F_SAMPLE, F_DS, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R8G8_B8G8_UNORM:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_SAMPLE, F_DS | F_MIPGEN | F_MS | F_RT, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R8G8_SINT:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_RT, F_DS | F_MIPGEN | F_SAMPLE, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R8G8_SNORM:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_MIPGEN | F_RT | F_SAMPLE, F_DS, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R8G8_TYPELESS:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE, F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R8G8_UINT:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_RT, F_DS | F_MIPGEN | F_SAMPLE, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R8G8_UNORM:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_MIPGEN | F_RT | F_SAMPLE, F_DS, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R8_SINT:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_RT, F_DS | F_MIPGEN | F_SAMPLE, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R8_SNORM:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_MIPGEN | F_RT | F_SAMPLE, F_DS, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R8_TYPELESS:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE, F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R8_UINT:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_RT, F_DS | F_MIPGEN | F_SAMPLE, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R8_UNORM:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_MIPGEN | F_RT | F_SAMPLE, F_DS, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R9G9B9E5_SHAREDEXP:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_SAMPLE, F_DS | F_MIPGEN | F_MS | F_RT, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_UNKNOWN:
>+        {
>+            static const DXGISupport info(0, F_2D | F_3D | F_CUBE | F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_X24_TYPELESS_G8_UINT:
>+        {
>+            static const DXGISupport info(F_2D | F_CUBE, F_3D | F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_X32_TYPELESS_G8X24_UINT:
>+        {
>+            static const DXGISupport info(F_2D | F_CUBE, F_3D | F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_Y210:
>+        {
>+            static const DXGISupport info(0, F_3D | F_CUBE | F_DS | F_MIPGEN | F_MS | F_RT, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_Y216:
>+        {
>+            static const DXGISupport info(0, F_3D | F_CUBE | F_DS | F_MIPGEN | F_MS | F_RT, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_Y410:
>+        {
>+            static const DXGISupport info(0, F_3D | F_CUBE | F_DS | F_MIPGEN | F_MS | F_RT, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_Y416:
>+        {
>+            static const DXGISupport info(0, F_3D | F_CUBE | F_DS | F_MIPGEN | F_MS | F_RT, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_YUY2:
>+        {
>+            static const DXGISupport info(0, F_3D | F_CUBE | F_DS | F_MIPGEN | F_MS | F_RT, 0);
>+            return info;
>+        }
>+
>+        default:
>+            UNREACHABLE();
>+            return GetDefaultSupport();
>+    }
>+    // clang-format on
>+}
>+
>+const DXGISupport &GetDXGISupport_10_1(DXGI_FORMAT dxgiFormat)
>+{
>+    // clang-format off
>+    switch (dxgiFormat)
>+    {
>+        case DXGI_FORMAT_420_OPAQUE:
>+        {
>+            static const DXGISupport info(0, F_3D | F_CUBE | F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_A8P8:
>+        {
>+            static const DXGISupport info(0, F_3D | F_CUBE | F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_A8_UNORM:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_MIPGEN | F_RT | F_SAMPLE, F_DS, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_AI44:
>+        {
>+            static const DXGISupport info(0, F_3D | F_CUBE | F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_AYUV:
>+        {
>+            static const DXGISupport info(0, F_3D | F_CUBE | F_DS | F_MIPGEN, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_B4G4R4A4_UNORM:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_MIPGEN | F_SAMPLE, F_DS, F_MS | F_RT);
>+            return info;
>+        }
>+        case DXGI_FORMAT_B5G5R5A1_UNORM:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_MIPGEN | F_SAMPLE, F_DS, F_MS | F_RT);
>+            return info;
>+        }
>+        case DXGI_FORMAT_B5G6R5_UNORM:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_MIPGEN | F_RT | F_SAMPLE, F_DS, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_B8G8R8A8_TYPELESS:
>+        {
>+            static const DXGISupport info(0, F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, F_2D | F_3D | F_CUBE);
>+            return info;
>+        }
>+        case DXGI_FORMAT_B8G8R8A8_UNORM:
>+        {
>+            static const DXGISupport info(F_MIPGEN, F_DS, F_2D | F_3D | F_CUBE | F_MS | F_RT | F_SAMPLE);
>+            return info;
>+        }
>+        case DXGI_FORMAT_B8G8R8A8_UNORM_SRGB:
>+        {
>+            static const DXGISupport info(F_MIPGEN | F_RT, F_DS, F_2D | F_3D | F_CUBE | F_MS | F_SAMPLE);
>+            return info;
>+        }
>+        case DXGI_FORMAT_B8G8R8X8_TYPELESS:
>+        {
>+            static const DXGISupport info(0, F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, F_2D | F_3D | F_CUBE);
>+            return info;
>+        }
>+        case DXGI_FORMAT_B8G8R8X8_UNORM:
>+        {
>+            static const DXGISupport info(0, F_DS | F_MIPGEN, F_2D | F_3D | F_CUBE | F_MS | F_SAMPLE);
>+            return info;
>+        }
>+        case DXGI_FORMAT_B8G8R8X8_UNORM_SRGB:
>+        {
>+            static const DXGISupport info(0, F_DS | F_MIPGEN, F_2D | F_3D | F_CUBE | F_MS | F_SAMPLE);
>+            return info;
>+        }
>+        case DXGI_FORMAT_BC1_TYPELESS:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE, F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_BC1_UNORM:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_SAMPLE, F_DS | F_MIPGEN | F_MS | F_RT, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_BC1_UNORM_SRGB:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_SAMPLE, F_DS | F_MIPGEN | F_MS | F_RT, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_BC2_TYPELESS:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE, F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_BC2_UNORM:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_SAMPLE, F_DS | F_MIPGEN | F_MS | F_RT, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_BC2_UNORM_SRGB:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_SAMPLE, F_DS | F_MIPGEN | F_MS | F_RT, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_BC3_TYPELESS:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE, F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_BC3_UNORM:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_SAMPLE, F_DS | F_MIPGEN | F_MS | F_RT, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_BC3_UNORM_SRGB:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_SAMPLE, F_DS | F_MIPGEN | F_MS | F_RT, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_BC4_SNORM:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_SAMPLE, F_DS | F_MIPGEN | F_MS | F_RT, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_BC4_TYPELESS:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE, F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_BC4_UNORM:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_SAMPLE, F_DS | F_MIPGEN | F_MS | F_RT, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_BC5_SNORM:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_SAMPLE, F_DS | F_MIPGEN | F_MS | F_RT, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_BC5_TYPELESS:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE, F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_BC5_UNORM:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_SAMPLE, F_DS | F_MIPGEN | F_MS | F_RT, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_BC6H_SF16:
>+        {
>+            static const DXGISupport info(0, F_DS | F_MIPGEN | F_MS | F_RT, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_BC6H_TYPELESS:
>+        {
>+            static const DXGISupport info(0, F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_BC6H_UF16:
>+        {
>+            static const DXGISupport info(0, F_DS | F_MIPGEN | F_MS | F_RT, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_BC7_TYPELESS:
>+        {
>+            static const DXGISupport info(0, F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_BC7_UNORM:
>+        {
>+            static const DXGISupport info(0, F_DS | F_MIPGEN | F_MS | F_RT, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_BC7_UNORM_SRGB:
>+        {
>+            static const DXGISupport info(0, F_DS | F_MIPGEN | F_MS | F_RT, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_D16_UNORM:
>+        {
>+            static const DXGISupport info(F_2D | F_CUBE | F_DS, F_3D | F_MIPGEN | F_RT | F_SAMPLE, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_D24_UNORM_S8_UINT:
>+        {
>+            static const DXGISupport info(F_2D | F_CUBE | F_DS, F_3D | F_RT | F_SAMPLE, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_D32_FLOAT:
>+        {
>+            static const DXGISupport info(F_2D | F_CUBE | F_DS, F_3D | F_MIPGEN | F_RT | F_SAMPLE, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_D32_FLOAT_S8X24_UINT:
>+        {
>+            static const DXGISupport info(F_2D | F_CUBE | F_DS, F_3D | F_MIPGEN | F_RT | F_SAMPLE, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_G8R8_G8B8_UNORM:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_SAMPLE, F_DS | F_MIPGEN | F_MS | F_RT, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_IA44:
>+        {
>+            static const DXGISupport info(0, F_3D | F_CUBE | F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_NV11:
>+        {
>+            static const DXGISupport info(0, F_3D | F_CUBE | F_DS | F_MIPGEN, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_NV12:
>+        {
>+            static const DXGISupport info(0, F_3D | F_CUBE | F_DS | F_MIPGEN, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_P010:
>+        {
>+            static const DXGISupport info(0, F_3D | F_CUBE | F_DS | F_MIPGEN, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_P016:
>+        {
>+            static const DXGISupport info(0, F_3D | F_CUBE | F_DS | F_MIPGEN, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_P8:
>+        {
>+            static const DXGISupport info(0, F_3D | F_CUBE | F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R10G10B10A2_TYPELESS:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE, F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R10G10B10A2_UINT:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_RT, F_DS | F_MIPGEN | F_SAMPLE, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R10G10B10A2_UNORM:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_MIPGEN | F_RT | F_SAMPLE, F_DS, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R10G10B10_XR_BIAS_A2_UNORM:
>+        {
>+            static const DXGISupport info(0, F_CUBE | F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, F_2D | F_3D);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R11G11B10_FLOAT:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_MIPGEN | F_RT | F_SAMPLE, F_DS, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R16G16B16A16_FLOAT:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_MIPGEN | F_RT | F_SAMPLE, F_DS, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R16G16B16A16_SINT:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_RT, F_DS | F_MIPGEN | F_SAMPLE, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R16G16B16A16_SNORM:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_MIPGEN | F_RT | F_SAMPLE, F_DS, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R16G16B16A16_TYPELESS:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE, F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R16G16B16A16_UINT:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_RT, F_DS | F_MIPGEN | F_SAMPLE, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R16G16B16A16_UNORM:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_MIPGEN | F_RT | F_SAMPLE, F_DS, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R16G16_FLOAT:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_MIPGEN | F_RT | F_SAMPLE, F_DS, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R16G16_SINT:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_RT, F_DS | F_MIPGEN | F_SAMPLE, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R16G16_SNORM:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_MIPGEN | F_RT | F_SAMPLE, F_DS, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R16G16_TYPELESS:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE, F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R16G16_UINT:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_RT, F_DS | F_MIPGEN | F_SAMPLE, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R16G16_UNORM:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_MIPGEN | F_RT | F_SAMPLE, F_DS, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R16_FLOAT:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_MIPGEN | F_RT | F_SAMPLE, F_DS, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R16_SINT:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_RT, F_DS | F_MIPGEN | F_SAMPLE, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R16_SNORM:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_MIPGEN | F_RT | F_SAMPLE, F_DS, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R16_TYPELESS:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE, F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R16_UINT:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_RT, F_DS | F_MIPGEN | F_SAMPLE, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R16_UNORM:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_MIPGEN | F_RT | F_SAMPLE, F_DS, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R1_UNORM:
>+        {
>+            static const DXGISupport info(F_2D, F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R24G8_TYPELESS:
>+        {
>+            static const DXGISupport info(F_2D | F_CUBE, F_3D | F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R24_UNORM_X8_TYPELESS:
>+        {
>+            static const DXGISupport info(F_2D | F_CUBE | F_SAMPLE, F_3D | F_DS | F_MIPGEN | F_MS | F_RT, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R32G32B32A32_FLOAT:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_MIPGEN | F_RT | F_SAMPLE, F_DS, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R32G32B32A32_SINT:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_RT, F_DS | F_MIPGEN | F_SAMPLE, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R32G32B32A32_TYPELESS:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE, F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R32G32B32A32_UINT:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_RT, F_DS | F_MIPGEN | F_SAMPLE, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R32G32B32_FLOAT:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE, F_DS | F_MIPGEN, F_MS | F_RT);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R32G32B32_SINT:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE, F_DS | F_MIPGEN | F_SAMPLE, F_MS | F_RT);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R32G32B32_TYPELESS:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE, F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R32G32B32_UINT:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE, F_DS | F_MIPGEN | F_SAMPLE, F_MS | F_RT);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R32G32_FLOAT:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_MIPGEN | F_RT | F_SAMPLE, F_DS, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R32G32_SINT:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_RT, F_DS | F_MIPGEN | F_SAMPLE, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R32G32_TYPELESS:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE, F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R32G32_UINT:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_RT, F_DS | F_MIPGEN | F_SAMPLE, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R32G8X24_TYPELESS:
>+        {
>+            static const DXGISupport info(F_2D | F_CUBE, F_3D | F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R32_FLOAT:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_MIPGEN | F_RT | F_SAMPLE, F_DS, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R32_FLOAT_X8X24_TYPELESS:
>+        {
>+            static const DXGISupport info(F_2D | F_CUBE | F_SAMPLE, F_3D | F_DS | F_MIPGEN | F_MS | F_RT, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R32_SINT:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_RT, F_DS | F_MIPGEN | F_SAMPLE, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R32_TYPELESS:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE, F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R32_UINT:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_RT, F_DS | F_MIPGEN | F_SAMPLE, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R8G8B8A8_SINT:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_RT, F_DS | F_MIPGEN | F_SAMPLE, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R8G8B8A8_SNORM:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_MIPGEN | F_RT | F_SAMPLE, F_DS, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R8G8B8A8_TYPELESS:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE, F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R8G8B8A8_UINT:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_RT, F_DS | F_MIPGEN | F_SAMPLE, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R8G8B8A8_UNORM:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_MIPGEN | F_RT | F_SAMPLE, F_DS, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R8G8B8A8_UNORM_SRGB:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_MIPGEN | F_RT | F_SAMPLE, F_DS, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R8G8_B8G8_UNORM:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_SAMPLE, F_DS | F_MIPGEN | F_MS | F_RT, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R8G8_SINT:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_RT, F_DS | F_MIPGEN | F_SAMPLE, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R8G8_SNORM:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_MIPGEN | F_RT | F_SAMPLE, F_DS, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R8G8_TYPELESS:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE, F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R8G8_UINT:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_RT, F_DS | F_MIPGEN | F_SAMPLE, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R8G8_UNORM:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_MIPGEN | F_RT | F_SAMPLE, F_DS, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R8_SINT:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_RT, F_DS | F_MIPGEN | F_SAMPLE, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R8_SNORM:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_MIPGEN | F_RT | F_SAMPLE, F_DS, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R8_TYPELESS:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE, F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R8_UINT:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_RT, F_DS | F_MIPGEN | F_SAMPLE, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R8_UNORM:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_MIPGEN | F_RT | F_SAMPLE, F_DS, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R9G9B9E5_SHAREDEXP:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_SAMPLE, F_DS | F_MIPGEN | F_MS | F_RT, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_UNKNOWN:
>+        {
>+            static const DXGISupport info(0, F_2D | F_3D | F_CUBE | F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_X24_TYPELESS_G8_UINT:
>+        {
>+            static const DXGISupport info(F_2D | F_CUBE, F_3D | F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_X32_TYPELESS_G8X24_UINT:
>+        {
>+            static const DXGISupport info(F_2D | F_CUBE, F_3D | F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_Y210:
>+        {
>+            static const DXGISupport info(0, F_3D | F_CUBE | F_DS | F_MIPGEN | F_MS | F_RT, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_Y216:
>+        {
>+            static const DXGISupport info(0, F_3D | F_CUBE | F_DS | F_MIPGEN | F_MS | F_RT, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_Y410:
>+        {
>+            static const DXGISupport info(0, F_3D | F_CUBE | F_DS | F_MIPGEN | F_MS | F_RT, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_Y416:
>+        {
>+            static const DXGISupport info(0, F_3D | F_CUBE | F_DS | F_MIPGEN | F_MS | F_RT, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_YUY2:
>+        {
>+            static const DXGISupport info(0, F_3D | F_CUBE | F_DS | F_MIPGEN | F_MS | F_RT, 0);
>+            return info;
>+        }
>+
>+        default:
>+            UNREACHABLE();
>+            return GetDefaultSupport();
>+    }
>+    // clang-format on
>+}
>+
>+const DXGISupport &GetDXGISupport_11_0(DXGI_FORMAT dxgiFormat)
>+{
>+    // clang-format off
>+    switch (dxgiFormat)
>+    {
>+        case DXGI_FORMAT_420_OPAQUE:
>+        {
>+            static const DXGISupport info(0, F_3D | F_CUBE | F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_A8P8:
>+        {
>+            static const DXGISupport info(0, F_3D | F_CUBE | F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_A8_UNORM:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_MIPGEN | F_RT | F_SAMPLE, F_DS, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_AI44:
>+        {
>+            static const DXGISupport info(0, F_3D | F_CUBE | F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_AYUV:
>+        {
>+            static const DXGISupport info(0, F_3D | F_CUBE | F_DS | F_MIPGEN, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_B4G4R4A4_UNORM:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_MIPGEN | F_SAMPLE, F_DS, F_MS | F_RT);
>+            return info;
>+        }
>+        case DXGI_FORMAT_B5G5R5A1_UNORM:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_MIPGEN | F_SAMPLE, F_DS, F_MS | F_RT);
>+            return info;
>+        }
>+        case DXGI_FORMAT_B5G6R5_UNORM:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_MIPGEN | F_RT | F_SAMPLE, F_DS, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_B8G8R8A8_TYPELESS:
>+        {
>+            static const DXGISupport info(0, F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, F_2D | F_3D | F_CUBE);
>+            return info;
>+        }
>+        case DXGI_FORMAT_B8G8R8A8_UNORM:
>+        {
>+            static const DXGISupport info(F_MIPGEN | F_RT | F_SAMPLE, F_DS, F_2D | F_3D | F_CUBE | F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_B8G8R8A8_UNORM_SRGB:
>+        {
>+            static const DXGISupport info(F_MIPGEN | F_RT | F_SAMPLE, F_DS, F_2D | F_3D | F_CUBE | F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_B8G8R8X8_TYPELESS:
>+        {
>+            static const DXGISupport info(0, F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, F_2D | F_3D | F_CUBE);
>+            return info;
>+        }
>+        case DXGI_FORMAT_B8G8R8X8_UNORM:
>+        {
>+            static const DXGISupport info(F_RT | F_SAMPLE, F_DS | F_MIPGEN, F_2D | F_3D | F_CUBE | F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_B8G8R8X8_UNORM_SRGB:
>+        {
>+            static const DXGISupport info(F_RT | F_SAMPLE, F_DS | F_MIPGEN, F_2D | F_3D | F_CUBE | F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_BC1_TYPELESS:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE, F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_BC1_UNORM:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_SAMPLE, F_DS | F_MIPGEN | F_MS | F_RT, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_BC1_UNORM_SRGB:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_SAMPLE, F_DS | F_MIPGEN | F_MS | F_RT, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_BC2_TYPELESS:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE, F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_BC2_UNORM:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_SAMPLE, F_DS | F_MIPGEN | F_MS | F_RT, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_BC2_UNORM_SRGB:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_SAMPLE, F_DS | F_MIPGEN | F_MS | F_RT, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_BC3_TYPELESS:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE, F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_BC3_UNORM:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_SAMPLE, F_DS | F_MIPGEN | F_MS | F_RT, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_BC3_UNORM_SRGB:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_SAMPLE, F_DS | F_MIPGEN | F_MS | F_RT, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_BC4_SNORM:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_SAMPLE, F_DS | F_MIPGEN | F_MS | F_RT, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_BC4_TYPELESS:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE, F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_BC4_UNORM:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_SAMPLE, F_DS | F_MIPGEN | F_MS | F_RT, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_BC5_SNORM:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_SAMPLE, F_DS | F_MIPGEN | F_MS | F_RT, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_BC5_TYPELESS:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE, F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_BC5_UNORM:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_SAMPLE, F_DS | F_MIPGEN | F_MS | F_RT, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_BC6H_SF16:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_SAMPLE, F_DS | F_MIPGEN | F_MS | F_RT, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_BC6H_TYPELESS:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE, F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_BC6H_UF16:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_SAMPLE, F_DS | F_MIPGEN | F_MS | F_RT, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_BC7_TYPELESS:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE, F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_BC7_UNORM:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_SAMPLE, F_DS | F_MIPGEN | F_MS | F_RT, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_BC7_UNORM_SRGB:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_SAMPLE, F_DS | F_MIPGEN | F_MS | F_RT, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_D16_UNORM:
>+        {
>+            static const DXGISupport info(F_2D | F_CUBE | F_DS, F_3D | F_MIPGEN | F_RT | F_SAMPLE, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_D24_UNORM_S8_UINT:
>+        {
>+            static const DXGISupport info(F_2D | F_CUBE | F_DS, F_3D | F_RT | F_SAMPLE, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_D32_FLOAT:
>+        {
>+            static const DXGISupport info(F_2D | F_CUBE | F_DS, F_3D | F_MIPGEN | F_RT | F_SAMPLE, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_D32_FLOAT_S8X24_UINT:
>+        {
>+            static const DXGISupport info(F_2D | F_CUBE | F_DS, F_3D | F_MIPGEN | F_RT | F_SAMPLE, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_G8R8_G8B8_UNORM:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_SAMPLE, F_DS | F_MIPGEN | F_MS | F_RT, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_IA44:
>+        {
>+            static const DXGISupport info(0, F_3D | F_CUBE | F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_NV11:
>+        {
>+            static const DXGISupport info(0, F_3D | F_CUBE | F_DS | F_MIPGEN, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_NV12:
>+        {
>+            static const DXGISupport info(0, F_3D | F_CUBE | F_DS | F_MIPGEN, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_P010:
>+        {
>+            static const DXGISupport info(0, F_3D | F_CUBE | F_DS | F_MIPGEN, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_P016:
>+        {
>+            static const DXGISupport info(0, F_3D | F_CUBE | F_DS | F_MIPGEN, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_P8:
>+        {
>+            static const DXGISupport info(0, F_3D | F_CUBE | F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R10G10B10A2_TYPELESS:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE, F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R10G10B10A2_UINT:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_RT, F_DS | F_MIPGEN | F_SAMPLE, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R10G10B10A2_UNORM:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_MIPGEN | F_RT | F_SAMPLE, F_DS, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R10G10B10_XR_BIAS_A2_UNORM:
>+        {
>+            static const DXGISupport info(0, F_CUBE | F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, F_2D | F_3D);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R11G11B10_FLOAT:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_MIPGEN | F_RT | F_SAMPLE, F_DS, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R16G16B16A16_FLOAT:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_MIPGEN | F_RT | F_SAMPLE, F_DS, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R16G16B16A16_SINT:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_RT, F_DS | F_MIPGEN | F_SAMPLE, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R16G16B16A16_SNORM:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_MIPGEN | F_RT | F_SAMPLE, F_DS, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R16G16B16A16_TYPELESS:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE, F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R16G16B16A16_UINT:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_RT, F_DS | F_MIPGEN | F_SAMPLE, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R16G16B16A16_UNORM:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_MIPGEN | F_RT | F_SAMPLE, F_DS, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R16G16_FLOAT:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_MIPGEN | F_RT | F_SAMPLE, F_DS, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R16G16_SINT:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_RT, F_DS | F_MIPGEN | F_SAMPLE, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R16G16_SNORM:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_MIPGEN | F_RT | F_SAMPLE, F_DS, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R16G16_TYPELESS:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE, F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R16G16_UINT:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_RT, F_DS | F_MIPGEN | F_SAMPLE, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R16G16_UNORM:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_MIPGEN | F_RT | F_SAMPLE, F_DS, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R16_FLOAT:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_MIPGEN | F_RT | F_SAMPLE, F_DS, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R16_SINT:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_RT, F_DS | F_MIPGEN | F_SAMPLE, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R16_SNORM:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_MIPGEN | F_RT | F_SAMPLE, F_DS, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R16_TYPELESS:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE, F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R16_UINT:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_RT, F_DS | F_MIPGEN | F_SAMPLE, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R16_UNORM:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_MIPGEN | F_RT | F_SAMPLE, F_DS, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R1_UNORM:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE, F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R24G8_TYPELESS:
>+        {
>+            static const DXGISupport info(F_2D | F_CUBE, F_3D | F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R24_UNORM_X8_TYPELESS:
>+        {
>+            static const DXGISupport info(F_2D | F_CUBE | F_SAMPLE, F_3D | F_DS | F_MIPGEN | F_MS | F_RT, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R32G32B32A32_FLOAT:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_MIPGEN | F_RT | F_SAMPLE, F_DS, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R32G32B32A32_SINT:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_RT, F_DS | F_MIPGEN | F_SAMPLE, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R32G32B32A32_TYPELESS:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE, F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R32G32B32A32_UINT:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_RT, F_DS | F_MIPGEN | F_SAMPLE, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R32G32B32_FLOAT:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE, F_DS | F_MIPGEN, F_MS | F_RT);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R32G32B32_SINT:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE, F_DS | F_MIPGEN | F_SAMPLE, F_MS | F_RT);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R32G32B32_TYPELESS:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE, F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R32G32B32_UINT:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE, F_DS | F_MIPGEN | F_SAMPLE, F_MS | F_RT);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R32G32_FLOAT:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_MIPGEN | F_RT | F_SAMPLE, F_DS, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R32G32_SINT:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_RT, F_DS | F_MIPGEN | F_SAMPLE, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R32G32_TYPELESS:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE, F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R32G32_UINT:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_RT, F_DS | F_MIPGEN | F_SAMPLE, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R32G8X24_TYPELESS:
>+        {
>+            static const DXGISupport info(F_2D | F_CUBE, F_3D | F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R32_FLOAT:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_MIPGEN | F_RT | F_SAMPLE, F_DS, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R32_FLOAT_X8X24_TYPELESS:
>+        {
>+            static const DXGISupport info(F_2D | F_CUBE | F_SAMPLE, F_3D | F_DS | F_MIPGEN | F_MS | F_RT, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R32_SINT:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_RT, F_DS | F_MIPGEN | F_SAMPLE, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R32_TYPELESS:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE, F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R32_UINT:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_RT, F_DS | F_MIPGEN | F_SAMPLE, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R8G8B8A8_SINT:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_RT, F_DS | F_MIPGEN | F_SAMPLE, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R8G8B8A8_SNORM:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_MIPGEN | F_RT | F_SAMPLE, F_DS, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R8G8B8A8_TYPELESS:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE, F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R8G8B8A8_UINT:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_RT, F_DS | F_MIPGEN | F_SAMPLE, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R8G8B8A8_UNORM:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_MIPGEN | F_RT | F_SAMPLE, F_DS, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R8G8B8A8_UNORM_SRGB:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_MIPGEN | F_RT | F_SAMPLE, F_DS, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R8G8_B8G8_UNORM:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_SAMPLE, F_DS | F_MIPGEN | F_MS | F_RT, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R8G8_SINT:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_RT, F_DS | F_MIPGEN | F_SAMPLE, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R8G8_SNORM:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_MIPGEN | F_RT | F_SAMPLE, F_DS, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R8G8_TYPELESS:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE, F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R8G8_UINT:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_RT, F_DS | F_MIPGEN | F_SAMPLE, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R8G8_UNORM:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_MIPGEN | F_RT | F_SAMPLE, F_DS, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R8_SINT:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_RT, F_DS | F_MIPGEN | F_SAMPLE, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R8_SNORM:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_MIPGEN | F_RT | F_SAMPLE, F_DS, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R8_TYPELESS:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE, F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R8_UINT:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_RT, F_DS | F_MIPGEN | F_SAMPLE, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R8_UNORM:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_MIPGEN | F_RT | F_SAMPLE, F_DS, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R9G9B9E5_SHAREDEXP:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_SAMPLE, F_DS | F_MIPGEN | F_MS | F_RT, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_UNKNOWN:
>+        {
>+            static const DXGISupport info(0, F_2D | F_3D | F_CUBE | F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_X24_TYPELESS_G8_UINT:
>+        {
>+            static const DXGISupport info(F_2D | F_CUBE, F_3D | F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_X32_TYPELESS_G8X24_UINT:
>+        {
>+            static const DXGISupport info(F_2D | F_CUBE, F_3D | F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_Y210:
>+        {
>+            static const DXGISupport info(0, F_3D | F_CUBE | F_DS | F_MIPGEN | F_MS | F_RT, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_Y216:
>+        {
>+            static const DXGISupport info(0, F_3D | F_CUBE | F_DS | F_MIPGEN | F_MS | F_RT, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_Y410:
>+        {
>+            static const DXGISupport info(0, F_3D | F_CUBE | F_DS | F_MIPGEN | F_MS | F_RT, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_Y416:
>+        {
>+            static const DXGISupport info(0, F_3D | F_CUBE | F_DS | F_MIPGEN | F_MS | F_RT, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_YUY2:
>+        {
>+            static const DXGISupport info(0, F_3D | F_CUBE | F_DS | F_MIPGEN | F_MS | F_RT, 0);
>+            return info;
>+        }
>+
>+        default:
>+            UNREACHABLE();
>+            return GetDefaultSupport();
>+    }
>+    // clang-format on
>+}
>+
>+const DXGISupport &GetDXGISupport_11_1(DXGI_FORMAT dxgiFormat)
>+{
>+    // clang-format off
>+    switch (dxgiFormat)
>+    {
>+        case DXGI_FORMAT_420_OPAQUE:
>+        {
>+            static const DXGISupport info(F_2D, F_3D | F_CUBE | F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_A8P8:
>+        {
>+            static const DXGISupport info(F_2D, F_3D | F_CUBE | F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_A8_UNORM:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_MIPGEN | F_RT | F_SAMPLE, F_DS, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_AI44:
>+        {
>+            static const DXGISupport info(F_2D, F_3D | F_CUBE | F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_AYUV:
>+        {
>+            static const DXGISupport info(F_2D | F_RT | F_SAMPLE, F_3D | F_CUBE | F_DS | F_MIPGEN, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_B4G4R4A4_UNORM:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_MIPGEN | F_SAMPLE, F_DS, F_MS | F_RT);
>+            return info;
>+        }
>+        case DXGI_FORMAT_B5G5R5A1_UNORM:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_MIPGEN | F_SAMPLE, F_DS, F_MS | F_RT);
>+            return info;
>+        }
>+        case DXGI_FORMAT_B5G6R5_UNORM:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_MIPGEN | F_RT | F_SAMPLE, F_DS, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_B8G8R8A8_TYPELESS:
>+        {
>+            static const DXGISupport info(0, F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, F_2D | F_3D | F_CUBE);
>+            return info;
>+        }
>+        case DXGI_FORMAT_B8G8R8A8_UNORM:
>+        {
>+            static const DXGISupport info(F_MIPGEN | F_RT | F_SAMPLE, F_DS, F_2D | F_3D | F_CUBE | F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_B8G8R8A8_UNORM_SRGB:
>+        {
>+            static const DXGISupport info(F_MIPGEN | F_RT | F_SAMPLE, F_DS, F_2D | F_3D | F_CUBE | F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_B8G8R8X8_TYPELESS:
>+        {
>+            static const DXGISupport info(0, F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, F_2D | F_3D | F_CUBE);
>+            return info;
>+        }
>+        case DXGI_FORMAT_B8G8R8X8_UNORM:
>+        {
>+            static const DXGISupport info(F_RT | F_SAMPLE, F_DS | F_MIPGEN, F_2D | F_3D | F_CUBE | F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_B8G8R8X8_UNORM_SRGB:
>+        {
>+            static const DXGISupport info(F_RT | F_SAMPLE, F_DS | F_MIPGEN, F_2D | F_3D | F_CUBE | F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_BC1_TYPELESS:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE, F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_BC1_UNORM:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_SAMPLE, F_DS | F_MIPGEN | F_MS | F_RT, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_BC1_UNORM_SRGB:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_SAMPLE, F_DS | F_MIPGEN | F_MS | F_RT, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_BC2_TYPELESS:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE, F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_BC2_UNORM:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_SAMPLE, F_DS | F_MIPGEN | F_MS | F_RT, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_BC2_UNORM_SRGB:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_SAMPLE, F_DS | F_MIPGEN | F_MS | F_RT, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_BC3_TYPELESS:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE, F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_BC3_UNORM:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_SAMPLE, F_DS | F_MIPGEN | F_MS | F_RT, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_BC3_UNORM_SRGB:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_SAMPLE, F_DS | F_MIPGEN | F_MS | F_RT, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_BC4_SNORM:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_SAMPLE, F_DS | F_MIPGEN | F_MS | F_RT, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_BC4_TYPELESS:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE, F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_BC4_UNORM:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_SAMPLE, F_DS | F_MIPGEN | F_MS | F_RT, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_BC5_SNORM:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_SAMPLE, F_DS | F_MIPGEN | F_MS | F_RT, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_BC5_TYPELESS:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE, F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_BC5_UNORM:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_SAMPLE, F_DS | F_MIPGEN | F_MS | F_RT, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_BC6H_SF16:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_SAMPLE, F_DS | F_MIPGEN | F_MS | F_RT, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_BC6H_TYPELESS:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE, F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_BC6H_UF16:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_SAMPLE, F_DS | F_MIPGEN | F_MS | F_RT, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_BC7_TYPELESS:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE, F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_BC7_UNORM:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_SAMPLE, F_DS | F_MIPGEN | F_MS | F_RT, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_BC7_UNORM_SRGB:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_SAMPLE, F_DS | F_MIPGEN | F_MS | F_RT, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_D16_UNORM:
>+        {
>+            static const DXGISupport info(F_2D | F_CUBE | F_DS, F_3D | F_MIPGEN | F_RT | F_SAMPLE, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_D24_UNORM_S8_UINT:
>+        {
>+            static const DXGISupport info(F_2D | F_CUBE | F_DS, F_3D | F_RT | F_SAMPLE, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_D32_FLOAT:
>+        {
>+            static const DXGISupport info(F_2D | F_CUBE | F_DS, F_3D | F_MIPGEN | F_RT | F_SAMPLE, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_D32_FLOAT_S8X24_UINT:
>+        {
>+            static const DXGISupport info(F_2D | F_CUBE | F_DS, F_3D | F_MIPGEN | F_RT | F_SAMPLE, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_G8R8_G8B8_UNORM:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_SAMPLE, F_DS | F_MIPGEN | F_MS | F_RT, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_IA44:
>+        {
>+            static const DXGISupport info(F_2D, F_3D | F_CUBE | F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_NV11:
>+        {
>+            static const DXGISupport info(F_2D | F_RT | F_SAMPLE, F_3D | F_CUBE | F_DS | F_MIPGEN, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_NV12:
>+        {
>+            static const DXGISupport info(F_2D | F_RT | F_SAMPLE, F_3D | F_CUBE | F_DS | F_MIPGEN, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_P010:
>+        {
>+            static const DXGISupport info(F_2D | F_RT | F_SAMPLE, F_3D | F_CUBE | F_DS | F_MIPGEN, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_P016:
>+        {
>+            static const DXGISupport info(F_2D | F_RT | F_SAMPLE, F_3D | F_CUBE | F_DS | F_MIPGEN, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_P8:
>+        {
>+            static const DXGISupport info(F_2D, F_3D | F_CUBE | F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R10G10B10A2_TYPELESS:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE, F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R10G10B10A2_UINT:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_RT, F_DS | F_MIPGEN | F_SAMPLE, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R10G10B10A2_UNORM:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_MIPGEN | F_RT | F_SAMPLE, F_DS, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R10G10B10_XR_BIAS_A2_UNORM:
>+        {
>+            static const DXGISupport info(0, F_CUBE | F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, F_2D | F_3D);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R11G11B10_FLOAT:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_MIPGEN | F_RT | F_SAMPLE, F_DS, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R16G16B16A16_FLOAT:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_MIPGEN | F_RT | F_SAMPLE, F_DS, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R16G16B16A16_SINT:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_RT, F_DS | F_MIPGEN | F_SAMPLE, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R16G16B16A16_SNORM:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_MIPGEN | F_RT | F_SAMPLE, F_DS, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R16G16B16A16_TYPELESS:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE, F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R16G16B16A16_UINT:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_RT, F_DS | F_MIPGEN | F_SAMPLE, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R16G16B16A16_UNORM:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_MIPGEN | F_RT | F_SAMPLE, F_DS, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R16G16_FLOAT:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_MIPGEN | F_RT | F_SAMPLE, F_DS, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R16G16_SINT:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_RT, F_DS | F_MIPGEN | F_SAMPLE, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R16G16_SNORM:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_MIPGEN | F_RT | F_SAMPLE, F_DS, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R16G16_TYPELESS:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE, F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R16G16_UINT:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_RT, F_DS | F_MIPGEN | F_SAMPLE, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R16G16_UNORM:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_MIPGEN | F_RT | F_SAMPLE, F_DS, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R16_FLOAT:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_MIPGEN | F_RT | F_SAMPLE, F_DS, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R16_SINT:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_RT, F_DS | F_MIPGEN | F_SAMPLE, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R16_SNORM:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_MIPGEN | F_RT | F_SAMPLE, F_DS, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R16_TYPELESS:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE, F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R16_UINT:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_RT, F_DS | F_MIPGEN | F_SAMPLE, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R16_UNORM:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_MIPGEN | F_RT | F_SAMPLE, F_DS, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R1_UNORM:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE, F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R24G8_TYPELESS:
>+        {
>+            static const DXGISupport info(F_2D | F_CUBE, F_3D | F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R24_UNORM_X8_TYPELESS:
>+        {
>+            static const DXGISupport info(F_2D | F_CUBE | F_SAMPLE, F_3D | F_DS | F_MIPGEN | F_MS | F_RT, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R32G32B32A32_FLOAT:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_MIPGEN | F_RT | F_SAMPLE, F_DS, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R32G32B32A32_SINT:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_RT, F_DS | F_MIPGEN | F_SAMPLE, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R32G32B32A32_TYPELESS:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE, F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R32G32B32A32_UINT:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_RT, F_DS | F_MIPGEN | F_SAMPLE, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R32G32B32_FLOAT:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE, F_DS | F_MIPGEN, F_MS | F_RT);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R32G32B32_SINT:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE, F_DS | F_MIPGEN | F_SAMPLE, F_MS | F_RT);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R32G32B32_TYPELESS:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE, F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R32G32B32_UINT:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE, F_DS | F_MIPGEN | F_SAMPLE, F_MS | F_RT);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R32G32_FLOAT:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_MIPGEN | F_RT | F_SAMPLE, F_DS, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R32G32_SINT:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_RT, F_DS | F_MIPGEN | F_SAMPLE, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R32G32_TYPELESS:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE, F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R32G32_UINT:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_RT, F_DS | F_MIPGEN | F_SAMPLE, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R32G8X24_TYPELESS:
>+        {
>+            static const DXGISupport info(F_2D | F_CUBE, F_3D | F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R32_FLOAT:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_MIPGEN | F_RT | F_SAMPLE, F_DS, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R32_FLOAT_X8X24_TYPELESS:
>+        {
>+            static const DXGISupport info(F_2D | F_CUBE | F_SAMPLE, F_3D | F_DS | F_MIPGEN | F_MS | F_RT, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R32_SINT:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_RT, F_DS | F_MIPGEN | F_SAMPLE, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R32_TYPELESS:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE, F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R32_UINT:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_RT, F_DS | F_MIPGEN | F_SAMPLE, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R8G8B8A8_SINT:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_RT, F_DS | F_MIPGEN | F_SAMPLE, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R8G8B8A8_SNORM:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_MIPGEN | F_RT | F_SAMPLE, F_DS, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R8G8B8A8_TYPELESS:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE, F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R8G8B8A8_UINT:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_RT, F_DS | F_MIPGEN | F_SAMPLE, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R8G8B8A8_UNORM:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_MIPGEN | F_RT | F_SAMPLE, F_DS, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R8G8B8A8_UNORM_SRGB:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_MIPGEN | F_RT | F_SAMPLE, F_DS, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R8G8_B8G8_UNORM:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_SAMPLE, F_DS | F_MIPGEN | F_MS | F_RT, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R8G8_SINT:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_RT, F_DS | F_MIPGEN | F_SAMPLE, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R8G8_SNORM:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_MIPGEN | F_RT | F_SAMPLE, F_DS, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R8G8_TYPELESS:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE, F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R8G8_UINT:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_RT, F_DS | F_MIPGEN | F_SAMPLE, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R8G8_UNORM:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_MIPGEN | F_RT | F_SAMPLE, F_DS, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R8_SINT:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_RT, F_DS | F_MIPGEN | F_SAMPLE, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R8_SNORM:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_MIPGEN | F_RT | F_SAMPLE, F_DS, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R8_TYPELESS:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE, F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R8_UINT:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_RT, F_DS | F_MIPGEN | F_SAMPLE, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R8_UNORM:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_MIPGEN | F_RT | F_SAMPLE, F_DS, F_MS);
>+            return info;
>+        }
>+        case DXGI_FORMAT_R9G9B9E5_SHAREDEXP:
>+        {
>+            static const DXGISupport info(F_2D | F_3D | F_CUBE | F_SAMPLE, F_DS | F_MIPGEN | F_MS | F_RT, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_UNKNOWN:
>+        {
>+            static const DXGISupport info(0, F_2D | F_3D | F_CUBE | F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_X24_TYPELESS_G8_UINT:
>+        {
>+            static const DXGISupport info(F_2D | F_CUBE, F_3D | F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_X32_TYPELESS_G8X24_UINT:
>+        {
>+            static const DXGISupport info(F_2D | F_CUBE, F_3D | F_DS | F_MIPGEN | F_MS | F_RT | F_SAMPLE, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_Y210:
>+        {
>+            static const DXGISupport info(F_2D | F_SAMPLE, F_3D | F_CUBE | F_DS | F_MIPGEN | F_MS | F_RT, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_Y216:
>+        {
>+            static const DXGISupport info(F_2D | F_SAMPLE, F_3D | F_CUBE | F_DS | F_MIPGEN | F_MS | F_RT, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_Y410:
>+        {
>+            static const DXGISupport info(F_2D | F_SAMPLE, F_3D | F_CUBE | F_DS | F_MIPGEN | F_MS | F_RT, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_Y416:
>+        {
>+            static const DXGISupport info(F_2D | F_SAMPLE, F_3D | F_CUBE | F_DS | F_MIPGEN | F_MS | F_RT, 0);
>+            return info;
>+        }
>+        case DXGI_FORMAT_YUY2:
>+        {
>+            static const DXGISupport info(F_2D | F_SAMPLE, F_3D | F_CUBE | F_DS | F_MIPGEN | F_MS | F_RT, 0);
>+            return info;
>+        }
>+
>+        default:
>+            UNREACHABLE();
>+            return GetDefaultSupport();
>+    }
>+    // clang-format on
>+}
>+
>+}  // namespace
>+
>+#undef F_2D
>+#undef F_3D
>+#undef F_CUBE
>+#undef F_SAMPLE
>+#undef F_RT
>+#undef F_MS
>+#undef F_DS
>+#undef F_MIPGEN
>+
>+const DXGISupport &GetDXGISupport(DXGI_FORMAT dxgiFormat, D3D_FEATURE_LEVEL featureLevel)
>+{
>+    switch (featureLevel)
>+    {
>+        case D3D_FEATURE_LEVEL_9_3:
>+            return GetDXGISupport_9_3(dxgiFormat);
>+        case D3D_FEATURE_LEVEL_10_0:
>+            return GetDXGISupport_10_0(dxgiFormat);
>+        case D3D_FEATURE_LEVEL_10_1:
>+            return GetDXGISupport_10_1(dxgiFormat);
>+        case D3D_FEATURE_LEVEL_11_0:
>+            return GetDXGISupport_11_0(dxgiFormat);
>+        case D3D_FEATURE_LEVEL_11_1:
>+            return GetDXGISupport_11_1(dxgiFormat);
>+        default:
>+            return GetDefaultSupport();
>+    }
>+}
>+
>+}  // namespace d3d11
>+
>+}  // namespace rx
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/formatutils11.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/formatutils11.cpp
>index ce4edd26db4..8654245258b 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/formatutils11.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/formatutils11.cpp
>@@ -14,10 +14,10 @@
> #include "image_util/loadimage.h"
> 
> #include "libANGLE/formatutils.h"
>-#include "libANGLE/renderer/d3d/d3d11/copyvertex.h"
>+#include "libANGLE/renderer/copyvertex.h"
>+#include "libANGLE/renderer/d3d/d3d11/Renderer11.h"
> #include "libANGLE/renderer/d3d/d3d11/dxgi_support_table.h"
> #include "libANGLE/renderer/d3d/d3d11/renderer11_utils.h"
>-#include "libANGLE/renderer/d3d/d3d11/Renderer11.h"
> 
> namespace rx
> {
>@@ -34,8 +34,7 @@ bool SupportsMipGen(DXGI_FORMAT dxgiFormat, D3D_FEATURE_LEVEL featureLevel)
> 
> DXGIFormatSize::DXGIFormatSize(GLuint pixelBits, GLuint blockWidth, GLuint blockHeight)
>     : pixelBytes(pixelBits / 8), blockWidth(blockWidth), blockHeight(blockHeight)
>-{
>-}
>+{}
> 
> const DXGIFormatSize &GetDXGIFormatSizeInfo(DXGI_FORMAT format)
> {
>@@ -201,44 +200,42 @@ const DXGIFormatSize &GetDXGIFormatSizeInfo(DXGI_FORMAT format)
> 
> constexpr VertexFormat::VertexFormat()
>     : conversionType(VERTEX_CONVERT_NONE), nativeFormat(DXGI_FORMAT_UNKNOWN), copyFunction(nullptr)
>-{
>-}
>+{}
> 
> constexpr VertexFormat::VertexFormat(VertexConversionType conversionTypeIn,
>                                      DXGI_FORMAT nativeFormatIn,
>                                      VertexCopyFunction copyFunctionIn)
>     : conversionType(conversionTypeIn), nativeFormat(nativeFormatIn), copyFunction(copyFunctionIn)
>-{
>-}
>+{}
> 
>-const VertexFormat *GetVertexFormatInfo_FL_9_3(gl::VertexFormatType vertexFormatType)
>+const VertexFormat *GetVertexFormatInfo_FL_9_3(angle::FormatID vertexFormatID)
> {
>     // D3D11 Feature Level 9_3 doesn't support as many formats for vertex buffer resource as Feature
>     // Level 10_0+.
>     // http://msdn.microsoft.com/en-us/library/windows/desktop/ff471324(v=vs.85).aspx
> 
>-    switch (vertexFormatType)
>+    switch (vertexFormatID)
>     {
>         // GL_BYTE -- unnormalized
>-        case gl::VERTEX_FORMAT_SBYTE1:
>+        case angle::FormatID::R8_SSCALED:
>         {
>             static constexpr VertexFormat info(VERTEX_CONVERT_BOTH, DXGI_FORMAT_R16G16_SINT,
>                                                &Copy8SintTo16SintVertexData<1, 2>);
>             return &info;
>         }
>-        case gl::VERTEX_FORMAT_SBYTE2:
>+        case angle::FormatID::R8G8_SSCALED:
>         {
>             static constexpr VertexFormat info(VERTEX_CONVERT_BOTH, DXGI_FORMAT_R16G16_SINT,
>                                                &Copy8SintTo16SintVertexData<2, 2>);
>             return &info;
>         }
>-        case gl::VERTEX_FORMAT_SBYTE3:
>+        case angle::FormatID::R8G8B8_SSCALED:
>         {
>             static constexpr VertexFormat info(VERTEX_CONVERT_BOTH, DXGI_FORMAT_R16G16B16A16_SINT,
>                                                &Copy8SintTo16SintVertexData<3, 4>);
>             return &info;
>         }
>-        case gl::VERTEX_FORMAT_SBYTE4:
>+        case angle::FormatID::R8G8B8A8_SSCALED:
>         {
>             static constexpr VertexFormat info(VERTEX_CONVERT_BOTH, DXGI_FORMAT_R16G16B16A16_SINT,
>                                                &Copy8SintTo16SintVertexData<4, 4>);
>@@ -246,25 +243,25 @@ const VertexFormat *GetVertexFormatInfo_FL_9_3(gl::VertexFormatType vertexFormat
>         }
> 
>         // GL_BYTE -- normalized
>-        case gl::VERTEX_FORMAT_SBYTE1_NORM:
>+        case angle::FormatID::R8_SNORM:
>         {
>             static constexpr VertexFormat info(VERTEX_CONVERT_CPU, DXGI_FORMAT_R16G16_SNORM,
>                                                &Copy8SnormTo16SnormVertexData<1, 2>);
>             return &info;
>         }
>-        case gl::VERTEX_FORMAT_SBYTE2_NORM:
>+        case angle::FormatID::R8G8_SNORM:
>         {
>             static constexpr VertexFormat info(VERTEX_CONVERT_CPU, DXGI_FORMAT_R16G16_SNORM,
>                                                &Copy8SnormTo16SnormVertexData<2, 2>);
>             return &info;
>         }
>-        case gl::VERTEX_FORMAT_SBYTE3_NORM:
>+        case angle::FormatID::R8G8B8_SNORM:
>         {
>             static constexpr VertexFormat info(VERTEX_CONVERT_CPU, DXGI_FORMAT_R16G16B16A16_SNORM,
>                                                &Copy8SnormTo16SnormVertexData<3, 4>);
>             return &info;
>         }
>-        case gl::VERTEX_FORMAT_SBYTE4_NORM:
>+        case angle::FormatID::R8G8B8A8_SNORM:
>         {
>             static constexpr VertexFormat info(VERTEX_CONVERT_CPU, DXGI_FORMAT_R16G16B16A16_SNORM,
>                                                &Copy8SnormTo16SnormVertexData<4, 4>);
>@@ -274,13 +271,13 @@ const VertexFormat *GetVertexFormatInfo_FL_9_3(gl::VertexFormatType vertexFormat
>         // GL_UNSIGNED_BYTE -- un-normalized
>         // NOTE: 3 and 4 component unnormalized GL_UNSIGNED_BYTE should use the default format
>         // table.
>-        case gl::VERTEX_FORMAT_UBYTE1:
>+        case angle::FormatID::R8_USCALED:
>         {
>             static constexpr VertexFormat info(VERTEX_CONVERT_BOTH, DXGI_FORMAT_R8G8B8A8_UINT,
>                                                &CopyNativeVertexData<GLubyte, 1, 4, 1>);
>             return &info;
>         }
>-        case gl::VERTEX_FORMAT_UBYTE2:
>+        case angle::FormatID::R8G8_USCALED:
>         {
>             static constexpr VertexFormat info(VERTEX_CONVERT_BOTH, DXGI_FORMAT_R8G8B8A8_UINT,
>                                                &CopyNativeVertexData<GLubyte, 2, 4, 1>);
>@@ -291,13 +288,13 @@ const VertexFormat *GetVertexFormatInfo_FL_9_3(gl::VertexFormatType vertexFormat
>         // NOTE: 3 and 4 component normalized GL_UNSIGNED_BYTE should use the default format table.
> 
>         // GL_UNSIGNED_BYTE -- normalized
>-        case gl::VERTEX_FORMAT_UBYTE1_NORM:
>+        case angle::FormatID::R8_UNORM:
>         {
>             static constexpr VertexFormat info(VERTEX_CONVERT_CPU, DXGI_FORMAT_R8G8B8A8_UNORM,
>                                                &CopyNativeVertexData<GLubyte, 1, 4, UINT8_MAX>);
>             return &info;
>         }
>-        case gl::VERTEX_FORMAT_UBYTE2_NORM:
>+        case angle::FormatID::R8G8_UNORM:
>         {
>             static constexpr VertexFormat info(VERTEX_CONVERT_CPU, DXGI_FORMAT_R8G8B8A8_UNORM,
>                                                &CopyNativeVertexData<GLubyte, 2, 4, UINT8_MAX>);
>@@ -306,7 +303,7 @@ const VertexFormat *GetVertexFormatInfo_FL_9_3(gl::VertexFormatType vertexFormat
> 
>         // GL_SHORT -- un-normalized
>         // NOTE: 2, 3 and 4 component unnormalized GL_SHORT should use the default format table.
>-        case gl::VERTEX_FORMAT_SSHORT1:
>+        case angle::FormatID::R16_SSCALED:
>         {
>             static constexpr VertexFormat info(VERTEX_CONVERT_BOTH, DXGI_FORMAT_R16G16_SINT,
>                                                &CopyNativeVertexData<GLshort, 1, 2, 0>);
>@@ -315,7 +312,7 @@ const VertexFormat *GetVertexFormatInfo_FL_9_3(gl::VertexFormatType vertexFormat
> 
>         // GL_SHORT -- normalized
>         // NOTE: 2, 3 and 4 component normalized GL_SHORT should use the default format table.
>-        case gl::VERTEX_FORMAT_SSHORT1_NORM:
>+        case angle::FormatID::R16_SNORM:
>         {
>             static constexpr VertexFormat info(VERTEX_CONVERT_CPU, DXGI_FORMAT_R16G16_SNORM,
>                                                &CopyNativeVertexData<GLshort, 1, 2, 0>);
>@@ -323,25 +320,25 @@ const VertexFormat *GetVertexFormatInfo_FL_9_3(gl::VertexFormatType vertexFormat
>         }
> 
>         // GL_UNSIGNED_SHORT -- un-normalized
>-        case gl::VERTEX_FORMAT_USHORT1:
>+        case angle::FormatID::R16_USCALED:
>         {
>             static constexpr VertexFormat info(VERTEX_CONVERT_CPU, DXGI_FORMAT_R32G32_FLOAT,
>                                                &CopyTo32FVertexData<GLushort, 1, 2, false>);
>             return &info;
>         }
>-        case gl::VERTEX_FORMAT_USHORT2:
>+        case angle::FormatID::R16G16_USCALED:
>         {
>             static constexpr VertexFormat info(VERTEX_CONVERT_CPU, DXGI_FORMAT_R32G32_FLOAT,
>                                                &CopyTo32FVertexData<GLushort, 2, 2, false>);
>             return &info;
>         }
>-        case gl::VERTEX_FORMAT_USHORT3:
>+        case angle::FormatID::R16G16B16_USCALED:
>         {
>             static constexpr VertexFormat info(VERTEX_CONVERT_CPU, DXGI_FORMAT_R32G32B32_FLOAT,
>                                                &CopyTo32FVertexData<GLushort, 3, 3, false>);
>             return &info;
>         }
>-        case gl::VERTEX_FORMAT_USHORT4:
>+        case angle::FormatID::R16G16B16A16_USCALED:
>         {
>             static constexpr VertexFormat info(VERTEX_CONVERT_CPU, DXGI_FORMAT_R32G32B32A32_FLOAT,
>                                                &CopyTo32FVertexData<GLushort, 4, 4, false>);
>@@ -349,25 +346,25 @@ const VertexFormat *GetVertexFormatInfo_FL_9_3(gl::VertexFormatType vertexFormat
>         }
> 
>         // GL_UNSIGNED_SHORT -- normalized
>-        case gl::VERTEX_FORMAT_USHORT1_NORM:
>+        case angle::FormatID::R16_UNORM:
>         {
>             static constexpr VertexFormat info(VERTEX_CONVERT_CPU, DXGI_FORMAT_R32G32_FLOAT,
>                                                &CopyTo32FVertexData<GLushort, 1, 2, true>);
>             return &info;
>         }
>-        case gl::VERTEX_FORMAT_USHORT2_NORM:
>+        case angle::FormatID::R16G16_UNORM:
>         {
>             static constexpr VertexFormat info(VERTEX_CONVERT_CPU, DXGI_FORMAT_R32G32_FLOAT,
>                                                &CopyTo32FVertexData<GLushort, 2, 2, true>);
>             return &info;
>         }
>-        case gl::VERTEX_FORMAT_USHORT3_NORM:
>+        case angle::FormatID::R16G16B16_UNORM:
>         {
>             static constexpr VertexFormat info(VERTEX_CONVERT_CPU, DXGI_FORMAT_R32G32B32_FLOAT,
>                                                &CopyTo32FVertexData<GLushort, 3, 3, true>);
>             return &info;
>         }
>-        case gl::VERTEX_FORMAT_USHORT4_NORM:
>+        case angle::FormatID::R16G16B16A16_UNORM:
>         {
>             static constexpr VertexFormat info(VERTEX_CONVERT_CPU, DXGI_FORMAT_R32G32B32A32_FLOAT,
>                                                &CopyTo32FVertexData<GLushort, 4, 4, true>);
>@@ -377,7 +374,7 @@ const VertexFormat *GetVertexFormatInfo_FL_9_3(gl::VertexFormatType vertexFormat
>         // GL_FIXED
>         // TODO: Add test to verify that this works correctly.
>         // NOTE: 2, 3 and 4 component GL_FIXED should use the default format table.
>-        case gl::VERTEX_FORMAT_FIXED1:
>+        case angle::FormatID::R32_FIXED:
>         {
>             static constexpr VertexFormat info(VERTEX_CONVERT_CPU, DXGI_FORMAT_R32G32_FLOAT,
>                                                &Copy32FixedTo32FVertexData<1, 2>);
>@@ -387,7 +384,7 @@ const VertexFormat *GetVertexFormatInfo_FL_9_3(gl::VertexFormatType vertexFormat
>         // GL_FLOAT
>         // TODO: Add test to verify that this works correctly.
>         // NOTE: 2, 3 and 4 component GL_FLOAT should use the default format table.
>-        case gl::VERTEX_FORMAT_FLOAT1:
>+        case angle::FormatID::R32_FLOAT:
>         {
>             static constexpr VertexFormat info(VERTEX_CONVERT_CPU, DXGI_FORMAT_R32G32_FLOAT,
>                                                &CopyNativeVertexData<GLfloat, 1, 2, 0>);
>@@ -399,43 +396,44 @@ const VertexFormat *GetVertexFormatInfo_FL_9_3(gl::VertexFormatType vertexFormat
>     }
> }
> 
>-const VertexFormat &GetVertexFormatInfo(gl::VertexFormatType vertexFormatType, D3D_FEATURE_LEVEL featureLevel)
>+const VertexFormat &GetVertexFormatInfo(angle::FormatID vertexFormatID,
>+                                        D3D_FEATURE_LEVEL featureLevel)
> {
>     if (featureLevel == D3D_FEATURE_LEVEL_9_3)
>     {
>-        const VertexFormat *result = GetVertexFormatInfo_FL_9_3(vertexFormatType);
>+        const VertexFormat *result = GetVertexFormatInfo_FL_9_3(vertexFormatID);
>         if (result)
>         {
>             return *result;
>         }
>     }
> 
>-    switch (vertexFormatType)
>+    switch (vertexFormatID)
>     {
>         //
>         // Float formats
>         //
> 
>         // GL_BYTE -- un-normalized
>-        case gl::VERTEX_FORMAT_SBYTE1:
>+        case angle::FormatID::R8_SSCALED:
>         {
>             static constexpr VertexFormat info(VERTEX_CONVERT_GPU, DXGI_FORMAT_R8_SINT,
>                                                &CopyNativeVertexData<GLbyte, 1, 1, 0>);
>             return info;
>         }
>-        case gl::VERTEX_FORMAT_SBYTE2:
>+        case angle::FormatID::R8G8_SSCALED:
>         {
>             static constexpr VertexFormat info(VERTEX_CONVERT_GPU, DXGI_FORMAT_R8G8_SINT,
>                                                &CopyNativeVertexData<GLbyte, 2, 2, 0>);
>             return info;
>         }
>-        case gl::VERTEX_FORMAT_SBYTE3:
>+        case angle::FormatID::R8G8B8_SSCALED:
>         {
>             static constexpr VertexFormat info(VERTEX_CONVERT_BOTH, DXGI_FORMAT_R8G8B8A8_SINT,
>                                                &CopyNativeVertexData<GLbyte, 3, 4, 1>);
>             return info;
>         }
>-        case gl::VERTEX_FORMAT_SBYTE4:
>+        case angle::FormatID::R8G8B8A8_SSCALED:
>         {
>             static constexpr VertexFormat info(VERTEX_CONVERT_GPU, DXGI_FORMAT_R8G8B8A8_SINT,
>                                                &CopyNativeVertexData<GLbyte, 4, 4, 0>);
>@@ -443,25 +441,25 @@ const VertexFormat &GetVertexFormatInfo(gl::VertexFormatType vertexFormatType, D
>         }
> 
>         // GL_BYTE -- normalized
>-        case gl::VERTEX_FORMAT_SBYTE1_NORM:
>+        case angle::FormatID::R8_SNORM:
>         {
>             static constexpr VertexFormat info(VERTEX_CONVERT_NONE, DXGI_FORMAT_R8_SNORM,
>                                                &CopyNativeVertexData<GLbyte, 1, 1, 0>);
>             return info;
>         }
>-        case gl::VERTEX_FORMAT_SBYTE2_NORM:
>+        case angle::FormatID::R8G8_SNORM:
>         {
>             static constexpr VertexFormat info(VERTEX_CONVERT_NONE, DXGI_FORMAT_R8G8_SNORM,
>                                                &CopyNativeVertexData<GLbyte, 2, 2, 0>);
>             return info;
>         }
>-        case gl::VERTEX_FORMAT_SBYTE3_NORM:
>+        case angle::FormatID::R8G8B8_SNORM:
>         {
>             static constexpr VertexFormat info(VERTEX_CONVERT_CPU, DXGI_FORMAT_R8G8B8A8_SNORM,
>                                                &CopyNativeVertexData<GLbyte, 3, 4, INT8_MAX>);
>             return info;
>         }
>-        case gl::VERTEX_FORMAT_SBYTE4_NORM:
>+        case angle::FormatID::R8G8B8A8_SNORM:
>         {
>             static constexpr VertexFormat info(VERTEX_CONVERT_NONE, DXGI_FORMAT_R8G8B8A8_SNORM,
>                                                &CopyNativeVertexData<GLbyte, 4, 4, 0>);
>@@ -469,25 +467,25 @@ const VertexFormat &GetVertexFormatInfo(gl::VertexFormatType vertexFormatType, D
>         }
> 
>         // GL_UNSIGNED_BYTE -- un-normalized
>-        case gl::VERTEX_FORMAT_UBYTE1:
>+        case angle::FormatID::R8_USCALED:
>         {
>             static constexpr VertexFormat info(VERTEX_CONVERT_GPU, DXGI_FORMAT_R8_UINT,
>                                                &CopyNativeVertexData<GLubyte, 1, 1, 0>);
>             return info;
>         }
>-        case gl::VERTEX_FORMAT_UBYTE2:
>+        case angle::FormatID::R8G8_USCALED:
>         {
>             static constexpr VertexFormat info(VERTEX_CONVERT_GPU, DXGI_FORMAT_R8G8_UINT,
>                                                &CopyNativeVertexData<GLubyte, 2, 2, 0>);
>             return info;
>         }
>-        case gl::VERTEX_FORMAT_UBYTE3:
>+        case angle::FormatID::R8G8B8_USCALED:
>         {
>             static constexpr VertexFormat info(VERTEX_CONVERT_BOTH, DXGI_FORMAT_R8G8B8A8_UINT,
>                                                &CopyNativeVertexData<GLubyte, 3, 4, 1>);
>             return info;
>         }
>-        case gl::VERTEX_FORMAT_UBYTE4:
>+        case angle::FormatID::R8G8B8A8_USCALED:
>         {
>             static constexpr VertexFormat info(VERTEX_CONVERT_GPU, DXGI_FORMAT_R8G8B8A8_UINT,
>                                                &CopyNativeVertexData<GLubyte, 4, 4, 0>);
>@@ -495,25 +493,25 @@ const VertexFormat &GetVertexFormatInfo(gl::VertexFormatType vertexFormatType, D
>         }
> 
>         // GL_UNSIGNED_BYTE -- normalized
>-        case gl::VERTEX_FORMAT_UBYTE1_NORM:
>+        case angle::FormatID::R8_UNORM:
>         {
>             static constexpr VertexFormat info(VERTEX_CONVERT_NONE, DXGI_FORMAT_R8_UNORM,
>                                                &CopyNativeVertexData<GLubyte, 1, 1, 0>);
>             return info;
>         }
>-        case gl::VERTEX_FORMAT_UBYTE2_NORM:
>+        case angle::FormatID::R8G8_UNORM:
>         {
>             static constexpr VertexFormat info(VERTEX_CONVERT_NONE, DXGI_FORMAT_R8G8_UNORM,
>                                                &CopyNativeVertexData<GLubyte, 2, 2, 0>);
>             return info;
>         }
>-        case gl::VERTEX_FORMAT_UBYTE3_NORM:
>+        case angle::FormatID::R8G8B8_UNORM:
>         {
>             static constexpr VertexFormat info(VERTEX_CONVERT_CPU, DXGI_FORMAT_R8G8B8A8_UNORM,
>                                                &CopyNativeVertexData<GLubyte, 3, 4, UINT8_MAX>);
>             return info;
>         }
>-        case gl::VERTEX_FORMAT_UBYTE4_NORM:
>+        case angle::FormatID::R8G8B8A8_UNORM:
>         {
>             static constexpr VertexFormat info(VERTEX_CONVERT_NONE, DXGI_FORMAT_R8G8B8A8_UNORM,
>                                                &CopyNativeVertexData<GLubyte, 4, 4, 0>);
>@@ -521,25 +519,25 @@ const VertexFormat &GetVertexFormatInfo(gl::VertexFormatType vertexFormatType, D
>         }
> 
>         // GL_SHORT -- un-normalized
>-        case gl::VERTEX_FORMAT_SSHORT1:
>+        case angle::FormatID::R16_SSCALED:
>         {
>             static constexpr VertexFormat info(VERTEX_CONVERT_GPU, DXGI_FORMAT_R16_SINT,
>                                                &CopyNativeVertexData<GLshort, 1, 1, 0>);
>             return info;
>         }
>-        case gl::VERTEX_FORMAT_SSHORT2:
>+        case angle::FormatID::R16G16_SSCALED:
>         {
>             static constexpr VertexFormat info(VERTEX_CONVERT_GPU, DXGI_FORMAT_R16G16_SINT,
>                                                &CopyNativeVertexData<GLshort, 2, 2, 0>);
>             return info;
>         }
>-        case gl::VERTEX_FORMAT_SSHORT3:
>+        case angle::FormatID::R16G16B16_SSCALED:
>         {
>             static constexpr VertexFormat info(VERTEX_CONVERT_BOTH, DXGI_FORMAT_R16G16B16A16_SINT,
>                                                &CopyNativeVertexData<GLshort, 3, 4, 1>);
>             return info;
>         }
>-        case gl::VERTEX_FORMAT_SSHORT4:
>+        case angle::FormatID::R16G16B16A16_SSCALED:
>         {
>             static constexpr VertexFormat info(VERTEX_CONVERT_GPU, DXGI_FORMAT_R16G16B16A16_SINT,
>                                                &CopyNativeVertexData<GLshort, 4, 4, 0>);
>@@ -547,25 +545,25 @@ const VertexFormat &GetVertexFormatInfo(gl::VertexFormatType vertexFormatType, D
>         }
> 
>         // GL_SHORT -- normalized
>-        case gl::VERTEX_FORMAT_SSHORT1_NORM:
>+        case angle::FormatID::R16_SNORM:
>         {
>             static constexpr VertexFormat info(VERTEX_CONVERT_NONE, DXGI_FORMAT_R16_SNORM,
>                                                &CopyNativeVertexData<GLshort, 1, 1, 0>);
>             return info;
>         }
>-        case gl::VERTEX_FORMAT_SSHORT2_NORM:
>+        case angle::FormatID::R16G16_SNORM:
>         {
>             static constexpr VertexFormat info(VERTEX_CONVERT_NONE, DXGI_FORMAT_R16G16_SNORM,
>                                                &CopyNativeVertexData<GLshort, 2, 2, 0>);
>             return info;
>         }
>-        case gl::VERTEX_FORMAT_SSHORT3_NORM:
>+        case angle::FormatID::R16G16B16_SNORM:
>         {
>             static constexpr VertexFormat info(VERTEX_CONVERT_CPU, DXGI_FORMAT_R16G16B16A16_SNORM,
>                                                &CopyNativeVertexData<GLshort, 3, 4, INT16_MAX>);
>             return info;
>         }
>-        case gl::VERTEX_FORMAT_SSHORT4_NORM:
>+        case angle::FormatID::R16G16B16A16_SNORM:
>         {
>             static constexpr VertexFormat info(VERTEX_CONVERT_NONE, DXGI_FORMAT_R16G16B16A16_SNORM,
>                                                &CopyNativeVertexData<GLshort, 4, 4, 0>);
>@@ -573,25 +571,25 @@ const VertexFormat &GetVertexFormatInfo(gl::VertexFormatType vertexFormatType, D
>         }
> 
>         // GL_UNSIGNED_SHORT -- un-normalized
>-        case gl::VERTEX_FORMAT_USHORT1:
>+        case angle::FormatID::R16_USCALED:
>         {
>             static constexpr VertexFormat info(VERTEX_CONVERT_GPU, DXGI_FORMAT_R16_UINT,
>                                                &CopyNativeVertexData<GLushort, 1, 1, 0>);
>             return info;
>         }
>-        case gl::VERTEX_FORMAT_USHORT2:
>+        case angle::FormatID::R16G16_USCALED:
>         {
>             static constexpr VertexFormat info(VERTEX_CONVERT_GPU, DXGI_FORMAT_R16G16_UINT,
>                                                &CopyNativeVertexData<GLushort, 2, 2, 0>);
>             return info;
>         }
>-        case gl::VERTEX_FORMAT_USHORT3:
>+        case angle::FormatID::R16G16B16_USCALED:
>         {
>             static constexpr VertexFormat info(VERTEX_CONVERT_BOTH, DXGI_FORMAT_R16G16B16A16_UINT,
>                                                &CopyNativeVertexData<GLushort, 3, 4, 1>);
>             return info;
>         }
>-        case gl::VERTEX_FORMAT_USHORT4:
>+        case angle::FormatID::R16G16B16A16_USCALED:
>         {
>             static constexpr VertexFormat info(VERTEX_CONVERT_GPU, DXGI_FORMAT_R16G16B16A16_UINT,
>                                                &CopyNativeVertexData<GLushort, 4, 4, 0>);
>@@ -599,25 +597,25 @@ const VertexFormat &GetVertexFormatInfo(gl::VertexFormatType vertexFormatType, D
>         }
> 
>         // GL_UNSIGNED_SHORT -- normalized
>-        case gl::VERTEX_FORMAT_USHORT1_NORM:
>+        case angle::FormatID::R16_UNORM:
>         {
>             static constexpr VertexFormat info(VERTEX_CONVERT_NONE, DXGI_FORMAT_R16_UNORM,
>                                                &CopyNativeVertexData<GLushort, 1, 1, 0>);
>             return info;
>         }
>-        case gl::VERTEX_FORMAT_USHORT2_NORM:
>+        case angle::FormatID::R16G16_UNORM:
>         {
>             static constexpr VertexFormat info(VERTEX_CONVERT_NONE, DXGI_FORMAT_R16G16_UNORM,
>                                                &CopyNativeVertexData<GLushort, 2, 2, 0>);
>             return info;
>         }
>-        case gl::VERTEX_FORMAT_USHORT3_NORM:
>+        case angle::FormatID::R16G16B16_UNORM:
>         {
>             static constexpr VertexFormat info(VERTEX_CONVERT_CPU, DXGI_FORMAT_R16G16B16A16_UNORM,
>                                                &CopyNativeVertexData<GLushort, 3, 4, UINT16_MAX>);
>             return info;
>         }
>-        case gl::VERTEX_FORMAT_USHORT4_NORM:
>+        case angle::FormatID::R16G16B16A16_UNORM:
>         {
>             static constexpr VertexFormat info(VERTEX_CONVERT_NONE, DXGI_FORMAT_R16G16B16A16_UNORM,
>                                                &CopyNativeVertexData<GLushort, 4, 4, 0>);
>@@ -625,25 +623,25 @@ const VertexFormat &GetVertexFormatInfo(gl::VertexFormatType vertexFormatType, D
>         }
> 
>         // GL_INT -- un-normalized
>-        case gl::VERTEX_FORMAT_SINT1:
>+        case angle::FormatID::R32_SSCALED:
>         {
>             static constexpr VertexFormat info(VERTEX_CONVERT_GPU, DXGI_FORMAT_R32_SINT,
>                                                &CopyNativeVertexData<GLint, 1, 1, 0>);
>             return info;
>         }
>-        case gl::VERTEX_FORMAT_SINT2:
>+        case angle::FormatID::R32G32_SSCALED:
>         {
>             static constexpr VertexFormat info(VERTEX_CONVERT_GPU, DXGI_FORMAT_R32G32_SINT,
>                                                &CopyNativeVertexData<GLint, 2, 2, 0>);
>             return info;
>         }
>-        case gl::VERTEX_FORMAT_SINT3:
>+        case angle::FormatID::R32G32B32_SSCALED:
>         {
>             static constexpr VertexFormat info(VERTEX_CONVERT_GPU, DXGI_FORMAT_R32G32B32_SINT,
>                                                &CopyNativeVertexData<GLint, 3, 3, 0>);
>             return info;
>         }
>-        case gl::VERTEX_FORMAT_SINT4:
>+        case angle::FormatID::R32G32B32A32_SSCALED:
>         {
>             static constexpr VertexFormat info(VERTEX_CONVERT_GPU, DXGI_FORMAT_R32G32B32A32_SINT,
>                                                &CopyNativeVertexData<GLint, 4, 4, 0>);
>@@ -651,25 +649,25 @@ const VertexFormat &GetVertexFormatInfo(gl::VertexFormatType vertexFormatType, D
>         }
> 
>         // GL_INT -- normalized
>-        case gl::VERTEX_FORMAT_SINT1_NORM:
>+        case angle::FormatID::R32_SNORM:
>         {
>             static constexpr VertexFormat info(VERTEX_CONVERT_CPU, DXGI_FORMAT_R32_FLOAT,
>                                                &CopyTo32FVertexData<GLint, 1, 1, true>);
>             return info;
>         }
>-        case gl::VERTEX_FORMAT_SINT2_NORM:
>+        case angle::FormatID::R32G32_SNORM:
>         {
>             static constexpr VertexFormat info(VERTEX_CONVERT_CPU, DXGI_FORMAT_R32G32_FLOAT,
>                                                &CopyTo32FVertexData<GLint, 2, 2, true>);
>             return info;
>         }
>-        case gl::VERTEX_FORMAT_SINT3_NORM:
>+        case angle::FormatID::R32G32B32_SNORM:
>         {
>             static constexpr VertexFormat info(VERTEX_CONVERT_CPU, DXGI_FORMAT_R32G32B32_FLOAT,
>                                                &CopyTo32FVertexData<GLint, 3, 3, true>);
>             return info;
>         }
>-        case gl::VERTEX_FORMAT_SINT4_NORM:
>+        case angle::FormatID::R32G32B32A32_SNORM:
>         {
>             static constexpr VertexFormat info(VERTEX_CONVERT_CPU, DXGI_FORMAT_R32G32B32A32_FLOAT,
>                                                &CopyTo32FVertexData<GLint, 4, 4, true>);
>@@ -677,25 +675,25 @@ const VertexFormat &GetVertexFormatInfo(gl::VertexFormatType vertexFormatType, D
>         }
> 
>         // GL_UNSIGNED_INT -- un-normalized
>-        case gl::VERTEX_FORMAT_UINT1:
>+        case angle::FormatID::R32_USCALED:
>         {
>             static constexpr VertexFormat info(VERTEX_CONVERT_GPU, DXGI_FORMAT_R32_UINT,
>                                                &CopyNativeVertexData<GLuint, 1, 1, 0>);
>             return info;
>         }
>-        case gl::VERTEX_FORMAT_UINT2:
>+        case angle::FormatID::R32G32_USCALED:
>         {
>             static constexpr VertexFormat info(VERTEX_CONVERT_GPU, DXGI_FORMAT_R32G32_UINT,
>                                                &CopyNativeVertexData<GLuint, 2, 2, 0>);
>             return info;
>         }
>-        case gl::VERTEX_FORMAT_UINT3:
>+        case angle::FormatID::R32G32B32_USCALED:
>         {
>             static constexpr VertexFormat info(VERTEX_CONVERT_GPU, DXGI_FORMAT_R32G32B32_UINT,
>                                                &CopyNativeVertexData<GLuint, 3, 3, 0>);
>             return info;
>         }
>-        case gl::VERTEX_FORMAT_UINT4:
>+        case angle::FormatID::R32G32B32A32_USCALED:
>         {
>             static constexpr VertexFormat info(VERTEX_CONVERT_GPU, DXGI_FORMAT_R32G32B32A32_UINT,
>                                                &CopyNativeVertexData<GLuint, 4, 4, 0>);
>@@ -703,25 +701,25 @@ const VertexFormat &GetVertexFormatInfo(gl::VertexFormatType vertexFormatType, D
>         }
> 
>         // GL_UNSIGNED_INT -- normalized
>-        case gl::VERTEX_FORMAT_UINT1_NORM:
>+        case angle::FormatID::R32_UNORM:
>         {
>             static constexpr VertexFormat info(VERTEX_CONVERT_CPU, DXGI_FORMAT_R32_FLOAT,
>                                                &CopyTo32FVertexData<GLuint, 1, 1, true>);
>             return info;
>         }
>-        case gl::VERTEX_FORMAT_UINT2_NORM:
>+        case angle::FormatID::R32G32_UNORM:
>         {
>             static constexpr VertexFormat info(VERTEX_CONVERT_CPU, DXGI_FORMAT_R32G32_FLOAT,
>                                                &CopyTo32FVertexData<GLuint, 2, 2, true>);
>             return info;
>         }
>-        case gl::VERTEX_FORMAT_UINT3_NORM:
>+        case angle::FormatID::R32G32B32_UNORM:
>         {
>             static constexpr VertexFormat info(VERTEX_CONVERT_CPU, DXGI_FORMAT_R32G32B32_FLOAT,
>                                                &CopyTo32FVertexData<GLuint, 3, 3, true>);
>             return info;
>         }
>-        case gl::VERTEX_FORMAT_UINT4_NORM:
>+        case angle::FormatID::R32G32B32A32_UNORM:
>         {
>             static constexpr VertexFormat info(VERTEX_CONVERT_CPU, DXGI_FORMAT_R32G32B32A32_FLOAT,
>                                                &CopyTo32FVertexData<GLuint, 4, 4, true>);
>@@ -729,25 +727,25 @@ const VertexFormat &GetVertexFormatInfo(gl::VertexFormatType vertexFormatType, D
>         }
> 
>         // GL_FIXED
>-        case gl::VERTEX_FORMAT_FIXED1:
>+        case angle::FormatID::R32_FIXED:
>         {
>             static constexpr VertexFormat info(VERTEX_CONVERT_CPU, DXGI_FORMAT_R32_FLOAT,
>                                                &Copy32FixedTo32FVertexData<1, 1>);
>             return info;
>         }
>-        case gl::VERTEX_FORMAT_FIXED2:
>+        case angle::FormatID::R32G32_FIXED:
>         {
>             static constexpr VertexFormat info(VERTEX_CONVERT_CPU, DXGI_FORMAT_R32G32_FLOAT,
>                                                &Copy32FixedTo32FVertexData<2, 2>);
>             return info;
>         }
>-        case gl::VERTEX_FORMAT_FIXED3:
>+        case angle::FormatID::R32G32B32_FIXED:
>         {
>             static constexpr VertexFormat info(VERTEX_CONVERT_CPU, DXGI_FORMAT_R32G32B32_FLOAT,
>                                                &Copy32FixedTo32FVertexData<3, 3>);
>             return info;
>         }
>-        case gl::VERTEX_FORMAT_FIXED4:
>+        case angle::FormatID::R32G32B32A32_FIXED:
>         {
>             static constexpr VertexFormat info(VERTEX_CONVERT_CPU, DXGI_FORMAT_R32G32B32A32_FLOAT,
>                                                &Copy32FixedTo32FVertexData<4, 4>);
>@@ -755,25 +753,25 @@ const VertexFormat &GetVertexFormatInfo(gl::VertexFormatType vertexFormatType, D
>         }
> 
>         // GL_HALF_FLOAT
>-        case gl::VERTEX_FORMAT_HALF1:
>+        case angle::FormatID::R16_FLOAT:
>         {
>             static constexpr VertexFormat info(VERTEX_CONVERT_NONE, DXGI_FORMAT_R16_FLOAT,
>                                                &CopyNativeVertexData<GLhalf, 1, 1, 0>);
>             return info;
>         }
>-        case gl::VERTEX_FORMAT_HALF2:
>+        case angle::FormatID::R16G16_FLOAT:
>         {
>             static constexpr VertexFormat info(VERTEX_CONVERT_NONE, DXGI_FORMAT_R16G16_FLOAT,
>                                                &CopyNativeVertexData<GLhalf, 2, 2, 0>);
>             return info;
>         }
>-        case gl::VERTEX_FORMAT_HALF3:
>+        case angle::FormatID::R16G16B16_FLOAT:
>         {
>             static constexpr VertexFormat info(VERTEX_CONVERT_CPU, DXGI_FORMAT_R16G16B16A16_FLOAT,
>                                                &CopyNativeVertexData<GLhalf, 3, 4, gl::Float16One>);
>             return info;
>         }
>-        case gl::VERTEX_FORMAT_HALF4:
>+        case angle::FormatID::R16G16B16A16_FLOAT:
>         {
>             static constexpr VertexFormat info(VERTEX_CONVERT_NONE, DXGI_FORMAT_R16G16B16A16_FLOAT,
>                                                &CopyNativeVertexData<GLhalf, 4, 4, 0>);
>@@ -781,25 +779,25 @@ const VertexFormat &GetVertexFormatInfo(gl::VertexFormatType vertexFormatType, D
>         }
> 
>         // GL_FLOAT
>-        case gl::VERTEX_FORMAT_FLOAT1:
>+        case angle::FormatID::R32_FLOAT:
>         {
>             static constexpr VertexFormat info(VERTEX_CONVERT_NONE, DXGI_FORMAT_R32_FLOAT,
>                                                &CopyNativeVertexData<GLfloat, 1, 1, 0>);
>             return info;
>         }
>-        case gl::VERTEX_FORMAT_FLOAT2:
>+        case angle::FormatID::R32G32_FLOAT:
>         {
>             static constexpr VertexFormat info(VERTEX_CONVERT_NONE, DXGI_FORMAT_R32G32_FLOAT,
>                                                &CopyNativeVertexData<GLfloat, 2, 2, 0>);
>             return info;
>         }
>-        case gl::VERTEX_FORMAT_FLOAT3:
>+        case angle::FormatID::R32G32B32_FLOAT:
>         {
>             static constexpr VertexFormat info(VERTEX_CONVERT_NONE, DXGI_FORMAT_R32G32B32_FLOAT,
>                                                &CopyNativeVertexData<GLfloat, 3, 3, 0>);
>             return info;
>         }
>-        case gl::VERTEX_FORMAT_FLOAT4:
>+        case angle::FormatID::R32G32B32A32_FLOAT:
>         {
>             static constexpr VertexFormat info(VERTEX_CONVERT_NONE, DXGI_FORMAT_R32G32B32A32_FLOAT,
>                                                &CopyNativeVertexData<GLfloat, 4, 4, 0>);
>@@ -807,13 +805,13 @@ const VertexFormat &GetVertexFormatInfo(gl::VertexFormatType vertexFormatType, D
>         }
> 
>         // GL_INT_2_10_10_10_REV
>-        case gl::VERTEX_FORMAT_SINT210:
>+        case angle::FormatID::R10G10B10A2_SSCALED:
>         {
>             static constexpr VertexFormat info(VERTEX_CONVERT_CPU, DXGI_FORMAT_R32G32B32A32_FLOAT,
>                                                &CopyXYZ10W2ToXYZW32FVertexData<true, false, true>);
>             return info;
>         }
>-        case gl::VERTEX_FORMAT_SINT210_NORM:
>+        case angle::FormatID::R10G10B10A2_SNORM:
>         {
>             static constexpr VertexFormat info(VERTEX_CONVERT_CPU, DXGI_FORMAT_R32G32B32A32_FLOAT,
>                                                &CopyXYZ10W2ToXYZW32FVertexData<true, true, true>);
>@@ -821,13 +819,13 @@ const VertexFormat &GetVertexFormatInfo(gl::VertexFormatType vertexFormatType, D
>         }
> 
>         // GL_UNSIGNED_INT_2_10_10_10_REV
>-        case gl::VERTEX_FORMAT_UINT210:
>+        case angle::FormatID::R10G10B10A2_USCALED:
>         {
>             static constexpr VertexFormat info(VERTEX_CONVERT_CPU, DXGI_FORMAT_R32G32B32A32_FLOAT,
>                                                &CopyXYZ10W2ToXYZW32FVertexData<false, false, true>);
>             return info;
>         }
>-        case gl::VERTEX_FORMAT_UINT210_NORM:
>+        case angle::FormatID::R10G10B10A2_UNORM:
>         {
>             static constexpr VertexFormat info(VERTEX_CONVERT_NONE, DXGI_FORMAT_R10G10B10A2_UNORM,
>                                                &CopyNativeVertexData<GLuint, 1, 1, 0>);
>@@ -839,25 +837,25 @@ const VertexFormat &GetVertexFormatInfo(gl::VertexFormatType vertexFormatType, D
>         //
> 
>         // GL_BYTE
>-        case gl::VERTEX_FORMAT_SBYTE1_INT:
>+        case angle::FormatID::R8_SINT:
>         {
>             static constexpr VertexFormat info(VERTEX_CONVERT_NONE, DXGI_FORMAT_R8_SINT,
>                                                &CopyNativeVertexData<GLbyte, 1, 1, 0>);
>             return info;
>         }
>-        case gl::VERTEX_FORMAT_SBYTE2_INT:
>+        case angle::FormatID::R8G8_SINT:
>         {
>             static constexpr VertexFormat info(VERTEX_CONVERT_NONE, DXGI_FORMAT_R8G8_SINT,
>                                                &CopyNativeVertexData<GLbyte, 2, 2, 0>);
>             return info;
>         }
>-        case gl::VERTEX_FORMAT_SBYTE3_INT:
>+        case angle::FormatID::R8G8B8_SINT:
>         {
>             static constexpr VertexFormat info(VERTEX_CONVERT_CPU, DXGI_FORMAT_R8G8B8A8_SINT,
>                                                &CopyNativeVertexData<GLbyte, 3, 4, 1>);
>             return info;
>         }
>-        case gl::VERTEX_FORMAT_SBYTE4_INT:
>+        case angle::FormatID::R8G8B8A8_SINT:
>         {
>             static constexpr VertexFormat info(VERTEX_CONVERT_NONE, DXGI_FORMAT_R8G8B8A8_SINT,
>                                                &CopyNativeVertexData<GLbyte, 4, 4, 0>);
>@@ -865,25 +863,25 @@ const VertexFormat &GetVertexFormatInfo(gl::VertexFormatType vertexFormatType, D
>         }
> 
>         // GL_UNSIGNED_BYTE
>-        case gl::VERTEX_FORMAT_UBYTE1_INT:
>+        case angle::FormatID::R8_UINT:
>         {
>             static constexpr VertexFormat info(VERTEX_CONVERT_NONE, DXGI_FORMAT_R8_UINT,
>                                                &CopyNativeVertexData<GLubyte, 1, 1, 0>);
>             return info;
>         }
>-        case gl::VERTEX_FORMAT_UBYTE2_INT:
>+        case angle::FormatID::R8G8_UINT:
>         {
>             static constexpr VertexFormat info(VERTEX_CONVERT_NONE, DXGI_FORMAT_R8G8_UINT,
>                                                &CopyNativeVertexData<GLubyte, 2, 2, 0>);
>             return info;
>         }
>-        case gl::VERTEX_FORMAT_UBYTE3_INT:
>+        case angle::FormatID::R8G8B8_UINT:
>         {
>             static constexpr VertexFormat info(VERTEX_CONVERT_CPU, DXGI_FORMAT_R8G8B8A8_UINT,
>                                                &CopyNativeVertexData<GLubyte, 3, 4, 1>);
>             return info;
>         }
>-        case gl::VERTEX_FORMAT_UBYTE4_INT:
>+        case angle::FormatID::R8G8B8A8_UINT:
>         {
>             static constexpr VertexFormat info(VERTEX_CONVERT_NONE, DXGI_FORMAT_R8G8B8A8_UINT,
>                                                &CopyNativeVertexData<GLubyte, 4, 4, 0>);
>@@ -891,25 +889,25 @@ const VertexFormat &GetVertexFormatInfo(gl::VertexFormatType vertexFormatType, D
>         }
> 
>         // GL_SHORT
>-        case gl::VERTEX_FORMAT_SSHORT1_INT:
>+        case angle::FormatID::R16_SINT:
>         {
>             static constexpr VertexFormat info(VERTEX_CONVERT_NONE, DXGI_FORMAT_R16_SINT,
>                                                &CopyNativeVertexData<GLshort, 1, 1, 0>);
>             return info;
>         }
>-        case gl::VERTEX_FORMAT_SSHORT2_INT:
>+        case angle::FormatID::R16G16_SINT:
>         {
>             static constexpr VertexFormat info(VERTEX_CONVERT_NONE, DXGI_FORMAT_R16G16_SINT,
>                                                &CopyNativeVertexData<GLshort, 2, 2, 0>);
>             return info;
>         }
>-        case gl::VERTEX_FORMAT_SSHORT3_INT:
>+        case angle::FormatID::R16G16B16_SINT:
>         {
>             static constexpr VertexFormat info(VERTEX_CONVERT_CPU, DXGI_FORMAT_R16G16B16A16_SINT,
>                                                &CopyNativeVertexData<GLshort, 3, 4, 1>);
>             return info;
>         }
>-        case gl::VERTEX_FORMAT_SSHORT4_INT:
>+        case angle::FormatID::R16G16B16A16_SINT:
>         {
>             static constexpr VertexFormat info(VERTEX_CONVERT_NONE, DXGI_FORMAT_R16G16B16A16_SINT,
>                                                &CopyNativeVertexData<GLshort, 4, 4, 0>);
>@@ -917,25 +915,25 @@ const VertexFormat &GetVertexFormatInfo(gl::VertexFormatType vertexFormatType, D
>         }
> 
>         // GL_UNSIGNED_SHORT
>-        case gl::VERTEX_FORMAT_USHORT1_INT:
>+        case angle::FormatID::R16_UINT:
>         {
>             static constexpr VertexFormat info(VERTEX_CONVERT_NONE, DXGI_FORMAT_R16_UINT,
>                                                &CopyNativeVertexData<GLushort, 1, 1, 0>);
>             return info;
>         }
>-        case gl::VERTEX_FORMAT_USHORT2_INT:
>+        case angle::FormatID::R16G16_UINT:
>         {
>             static constexpr VertexFormat info(VERTEX_CONVERT_NONE, DXGI_FORMAT_R16G16_UINT,
>                                                &CopyNativeVertexData<GLushort, 2, 2, 0>);
>             return info;
>         }
>-        case gl::VERTEX_FORMAT_USHORT3_INT:
>+        case angle::FormatID::R16G16B16_UINT:
>         {
>             static constexpr VertexFormat info(VERTEX_CONVERT_CPU, DXGI_FORMAT_R16G16B16A16_UINT,
>                                                &CopyNativeVertexData<GLushort, 3, 4, 1>);
>             return info;
>         }
>-        case gl::VERTEX_FORMAT_USHORT4_INT:
>+        case angle::FormatID::R16G16B16A16_UINT:
>         {
>             static constexpr VertexFormat info(VERTEX_CONVERT_NONE, DXGI_FORMAT_R16G16B16A16_UINT,
>                                                &CopyNativeVertexData<GLushort, 4, 4, 0>);
>@@ -943,25 +941,25 @@ const VertexFormat &GetVertexFormatInfo(gl::VertexFormatType vertexFormatType, D
>         }
> 
>         // GL_INT
>-        case gl::VERTEX_FORMAT_SINT1_INT:
>+        case angle::FormatID::R32_SINT:
>         {
>             static constexpr VertexFormat info(VERTEX_CONVERT_NONE, DXGI_FORMAT_R32_SINT,
>                                                &CopyNativeVertexData<GLint, 1, 1, 0>);
>             return info;
>         }
>-        case gl::VERTEX_FORMAT_SINT2_INT:
>+        case angle::FormatID::R32G32_SINT:
>         {
>             static constexpr VertexFormat info(VERTEX_CONVERT_NONE, DXGI_FORMAT_R32G32_SINT,
>                                                &CopyNativeVertexData<GLint, 2, 2, 0>);
>             return info;
>         }
>-        case gl::VERTEX_FORMAT_SINT3_INT:
>+        case angle::FormatID::R32G32B32_SINT:
>         {
>             static constexpr VertexFormat info(VERTEX_CONVERT_NONE, DXGI_FORMAT_R32G32B32_SINT,
>                                                &CopyNativeVertexData<GLint, 3, 3, 0>);
>             return info;
>         }
>-        case gl::VERTEX_FORMAT_SINT4_INT:
>+        case angle::FormatID::R32G32B32A32_SINT:
>         {
>             static constexpr VertexFormat info(VERTEX_CONVERT_NONE, DXGI_FORMAT_R32G32B32A32_SINT,
>                                                &CopyNativeVertexData<GLint, 4, 4, 0>);
>@@ -969,25 +967,25 @@ const VertexFormat &GetVertexFormatInfo(gl::VertexFormatType vertexFormatType, D
>         }
> 
>         // GL_UNSIGNED_INT
>-        case gl::VERTEX_FORMAT_UINT1_INT:
>+        case angle::FormatID::R32_UINT:
>         {
>             static constexpr VertexFormat info(VERTEX_CONVERT_NONE, DXGI_FORMAT_R32_SINT,
>                                                &CopyNativeVertexData<GLuint, 1, 1, 0>);
>             return info;
>         }
>-        case gl::VERTEX_FORMAT_UINT2_INT:
>+        case angle::FormatID::R32G32_UINT:
>         {
>             static constexpr VertexFormat info(VERTEX_CONVERT_NONE, DXGI_FORMAT_R32G32_SINT,
>                                                &CopyNativeVertexData<GLuint, 2, 2, 0>);
>             return info;
>         }
>-        case gl::VERTEX_FORMAT_UINT3_INT:
>+        case angle::FormatID::R32G32B32_UINT:
>         {
>             static constexpr VertexFormat info(VERTEX_CONVERT_NONE, DXGI_FORMAT_R32G32B32_SINT,
>                                                &CopyNativeVertexData<GLuint, 3, 3, 0>);
>             return info;
>         }
>-        case gl::VERTEX_FORMAT_UINT4_INT:
>+        case angle::FormatID::R32G32B32A32_UINT:
>         {
>             static constexpr VertexFormat info(VERTEX_CONVERT_NONE, DXGI_FORMAT_R32G32B32A32_SINT,
>                                                &CopyNativeVertexData<GLuint, 4, 4, 0>);
>@@ -995,7 +993,7 @@ const VertexFormat &GetVertexFormatInfo(gl::VertexFormatType vertexFormatType, D
>         }
> 
>         // GL_INT_2_10_10_10_REV
>-        case gl::VERTEX_FORMAT_SINT210_INT:
>+        case angle::FormatID::R10G10B10A2_SINT:
>         {
>             static constexpr VertexFormat info(VERTEX_CONVERT_CPU, DXGI_FORMAT_R16G16B16A16_SINT,
>                                                &CopyXYZ10W2ToXYZW32FVertexData<true, true, false>);
>@@ -1003,7 +1001,7 @@ const VertexFormat &GetVertexFormatInfo(gl::VertexFormatType vertexFormatType, D
>         }
> 
>         // GL_UNSIGNED_INT_2_10_10_10_REV
>-        case gl::VERTEX_FORMAT_UINT210_INT:
>+        case angle::FormatID::R10G10B10A2_UINT:
>         {
>             static constexpr VertexFormat info(VERTEX_CONVERT_NONE, DXGI_FORMAT_R10G10B10A2_UINT,
>                                                &CopyNativeVertexData<GLuint, 1, 1, 0>);
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/formatutils11.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/formatutils11.h
>index 883d338377f..037fdc40881 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/formatutils11.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/formatutils11.h
>@@ -15,8 +15,9 @@
> #include "common/platform.h"
> #include "libANGLE/angletypes.h"
> #include "libANGLE/formatutils.h"
>-#include "libANGLE/renderer/renderer_utils.h"
>+#include "libANGLE/renderer/copyvertex.h"
> #include "libANGLE/renderer/d3d/formatutilsD3D.h"
>+#include "libANGLE/renderer/renderer_utils.h"
> 
> namespace rx
> {
>@@ -53,7 +54,7 @@ struct VertexFormat : private angle::NonCopyable
>     VertexCopyFunction copyFunction;
> };
> 
>-const VertexFormat &GetVertexFormatInfo(gl::VertexFormatType vertexFormatType,
>+const VertexFormat &GetVertexFormatInfo(angle::FormatID vertexFormatID,
>                                         D3D_FEATURE_LEVEL featureLevel);
> 
> // Auto-generated in dxgi_format_map_autogen.cpp.
>@@ -68,4 +69,4 @@ const angle::Format &GetFormat(DXGI_FORMAT dxgiFormat);
> 
> }  // namespace rx
> 
>-#endif // LIBANGLE_RENDERER_D3D_D3D11_FORMATUTILS11_H_
>+#endif  // LIBANGLE_RENDERER_D3D_D3D11_FORMATUTILS11_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/gen_blit11helper.py b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/gen_blit11helper.py
>new file mode 100644
>index 00000000000..4b69c5551d0
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/gen_blit11helper.py
>@@ -0,0 +1,377 @@
>+#!/usr/bin/python2
>+#
>+# Copyright 2018 The ANGLE Project Authors. All rights reserved.
>+# Use of this source code is governed by a BSD-style license that can be
>+# found in the LICENSE file.
>+#
>+# gen_blit11helper.py:
>+#   Generates the code for retrieving the various blit shaders for D3D11
>+#   NOTE: don't run this script directly. Run scripts/run_code_generation.py.
>+
>+import sys, os, pprint
>+from datetime import date
>+
>+template_blitshader_source = """// GENERATED FILE - DO NOT EDIT.
>+// Generated by {script_name}.
>+//
>+// Copyright {year} The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// Blit11Helper_autogen.inc:
>+//   Defines and retrieves blitshaders for the D3D11 backend.
>+
>+namespace
>+{{
>+// Include inline shaders in the anonymous namespace to make sure no symbols are exported
>+{shader_includes}
>+}} // namespace
>+
>+enum Blit11::BlitShaderOperation : unsigned int
>+{{
>+{blitshaderop_enums}
>+}};
>+
>+enum Blit11::BlitShaderType : unsigned int
>+{{
>+{blitshadertype_enums}
>+}};
>+
>+Blit11::BlitShaderType Blit11::getBlitShaderType(BlitShaderOperation operation, ShaderDimension dimension)
>+{{
>+    switch(operation)
>+    {{
>+{get_blitshaders_case_list}
>+        default:
>+            UNREACHABLE();
>+            return BLITSHADER_INVALID;
>+    }}
>+}}
>+
>+angle::Result Blit11::mapBlitShader(const gl::Context *context,
>+                                    BlitShaderType blitShaderType)
>+{{
>+    switch(blitShaderType)
>+    {{
>+{add_blitshader_case_list}
>+        default:
>+            ANGLE_HR_UNREACHABLE(GetImplAs<Context11>(context));
>+    }}
>+
>+    return angle::Result::Continue;
>+}}
>+
>+"""
>+
>+template_blitshaders_gni = """# GENERATED FILE - DO NOT EDIT.
>+# Generated by {script_name}.
>+#
>+# Copyright {year} The ANGLE Project Authors. All rights reserved.
>+# Use of this source code is governed by a BSD-style license that can be
>+# found in the LICENSE file.
>+#
>+# d3d11_blit_shaders_autogen.gni:
>+#   List of generated blit shaders for inclusion in ANGLE's build process.
>+
>+libangle_d3d11_blit_shaders = [
>+{shader_filename_list}
>+]"""
>+
>+template_compiled_blitshader_include = """#include "libANGLE/renderer/d3d/d3d11/shaders/compiled/{filename}\""""
>+
>+template_get_blitshader_case = """        case {operation}:
>+            switch (dimension)
>+            {{
>+{get_blitshader_dimension_cases}
>+                default:
>+                    UNREACHABLE();
>+                    return BLITSHADER_INVALID;
>+            }}"""
>+
>+template_get_blitshader_case_dimension = """                case SHADER_{dimension}:
>+                    return BLITSHADER_{blitshader};"""
>+
>+template_map_blitshader_case = """        case {blitshader_name}:
>+            ANGLE_TRY(addBlitShaderToMap(context, blitShaderType, SHADER_{dimension_upper},
>+                                         ShaderData(g_PS_{compiled_shader_name}),
>+                                         "Blit11 {dimension} {shader_comment} pixel shader"));
>+            break;"""
>+
>+supported_dimensions = ["2D", "3D", "2DArray"]
>+
>+# field 1: BlitShaderType enum
>+# field 2: Name of compiled shader
>+# field 3: Filename of compiled shader
>+blitshader_data = [
>+    ("RGBAF", "PassthroughRGBA*", "passthroughrgba*11ps.h"),
>+    ("BGRAF", "PassthroughRGBA*"),
>+    ("RGBF", "PassthroughRGB*", "passthroughrgb*11ps.h"),
>+    ("RGF", "PassthroughRG*", "passthroughrg*11ps.h"),
>+    ("RF", "PassthroughR*", "passthroughr*11ps.h"),
>+    ("ALPHA", "PassthroughA*", "passthrougha*11ps.h"),
>+    ("LUMA", "PassthroughLum*", "passthroughlum*11ps.h"),
>+    ("LUMAALPHA", "PassthroughLumAlpha*", "passthroughlumalpha*11ps.h"),
>+    ("RGBAUI", "PassthroughRGBA*UI", "passthroughrgba*ui11ps.h"),
>+    ("RGBAI", "PassthroughRGBA*I", "passthroughrgba*i11ps.h"),
>+    ("RGBUI", "PassthroughRGB*UI", "passthroughrgb*ui11ps.h"),
>+    ("RGBI", "PassthroughRGB*I", "passthroughrgb*i11ps.h"),
>+    ("RGUI", "PassthroughRG*UI", "passthroughrg*ui11ps.h"),
>+    ("RGI", "PassthroughRG*I", "passthroughrg*i11ps.h"),
>+    ("RUI", "PassthroughR*UI", "passthroughr*ui11ps.h"),
>+    ("RI", "PassthroughR*I", "passthroughr*i11ps.h"),
>+    ("RGBAF_PREMULTIPLY", "FtoF_PM_RGBA_*",
>+     "multiplyalpha_ftof_pm_rgba_*_ps.h"),
>+    ("RGBAF_UNMULTIPLY", "FtoF_UM_RGBA_*", "multiplyalpha_ftof_um_rgba_*_ps.h"),
>+    ("RGBF_PREMULTIPLY", "FtoF_PM_RGB_*", "multiplyalpha_ftof_pm_rgb_*_ps.h"),
>+    ("RGBF_UNMULTIPLY", "FtoF_UM_RGB_*", "multiplyalpha_ftof_um_rgb_*_ps.h"),
>+    ("RGBAF_TOUI", "FtoU_PT_RGBA_*", "multiplyalpha_ftou_pt_rgba_*_ps.h"),
>+    ("RGBAF_TOUI_PREMULTIPLY", "FtoU_PM_RGBA_*",
>+     "multiplyalpha_ftou_pm_rgba_*_ps.h"),
>+    ("RGBAF_TOUI_UNMULTIPLY", "FtoU_UM_RGBA_*",
>+     "multiplyalpha_ftou_um_rgba_*_ps.h"),
>+    ("RGBF_TOUI", "FtoU_PT_RGB_*", "multiplyalpha_ftou_pt_rgb_*_ps.h"),
>+    ("RGBF_TOUI_PREMULTIPLY", "FtoU_PM_RGB_*",
>+     "multiplyalpha_ftou_pm_rgb_*_ps.h"),
>+    ("RGBF_TOUI_UNMULTIPLY", "FtoU_UM_RGB_*",
>+     "multiplyalpha_ftou_um_rgb_*_ps.h"),
>+    ("RGBAF_TOI", "FtoI_PT_RGBA_*", "multiplyalpha_ftoi_pt_rgba_*_ps.h"),
>+    ("RGBAF_TOI_PREMULTIPLY", "FtoI_PM_RGBA_*",
>+     "multiplyalpha_ftoi_pm_rgba_*_ps.h"),
>+    ("RGBAF_TOI_UNMULTIPLY", "FtoI_UM_RGBA_*",
>+     "multiplyalpha_ftoi_um_rgba_*_ps.h"),
>+    ("RGBF_TOI", "FtoI_PT_RGB_*", "multiplyalpha_ftoi_pt_rgb_*_ps.h"),
>+    ("RGBF_TOI_PREMULTIPLY", "FtoI_PM_RGB_*",
>+     "multiplyalpha_ftoi_pm_rgb_*_ps.h"),
>+    ("RGBF_TOI_UNMULTIPLY", "FtoI_UM_RGB_*",
>+     "multiplyalpha_ftoi_um_rgb_*_ps.h"),
>+    ("LUMAF_PREMULTIPLY", "FtoF_PM_LUMA_*",
>+     "multiplyalpha_ftof_pm_luma_*_ps.h"),
>+    ("LUMAF_UNMULTIPLY", "FtoF_UM_LUMA_*", "multiplyalpha_ftof_um_luma_*_ps.h"),
>+    ("LUMAALPHAF_PREMULTIPLY", "FtoF_PM_LUMAALPHA_*",
>+     "multiplyalpha_ftof_pm_lumaalpha_*_ps.h"),
>+    ("LUMAALPHAF_UNMULTIPLY", "FtoF_UM_LUMAALPHA_*",
>+     "multiplyalpha_ftof_um_lumaalpha_*_ps.h"),
>+    ("RGBAF_4444", "PassthroughRGBA*_4444", "passthroughrgba*_4444_11ps.h"),
>+    ("RGBAF_4444_PREMULTIPLY", "FtoF_PM_RGBA_4444_*",
>+     "multiplyalpha_ftof_pm_rgba_4444_*_ps.h"),
>+    ("RGBAF_4444_UNMULTIPLY", "FtoF_UM_RGBA_4444_*",
>+     "multiplyalpha_ftof_um_rgba_4444_*_ps.h"),
>+    ("RGBF_565", "PassthroughRGB*_565", "passthroughrgb*_565_11ps.h"),
>+    ("RGBF_565_PREMULTIPLY", "FtoF_PM_RGB_565_*",
>+     "multiplyalpha_ftof_pm_rgb_565_*_ps.h"),
>+    ("RGBF_565_UNMULTIPLY", "FtoF_UM_RGB_565_*",
>+     "multiplyalpha_ftof_um_rgb_565_*_ps.h"),
>+    ("RGBAF_5551", "PassthroughRGBA*_5551", "passthroughrgba*_5551_11ps.h"),
>+    ("RGBAF_5551_PREMULTIPLY", "FtoF_PM_RGBA_5551_*",
>+     "multiplyalpha_ftof_pm_rgba_5551_*_ps.h"),
>+    ("RGBAF_5551_UNMULTIPLY", "FtoF_UM_RGBA_5551_*",
>+     "multiplyalpha_ftof_um_rgba_5551_*_ps.h")
>+]
>+
>+
>+def format_shader_include(dimension, blitshader):
>+  return template_compiled_blitshader_include.format(
>+      filename=blitshader[2].replace("*", dimension.lower()))
>+
>+
>+def format_get_blitshader_case(operation):
>+  dimension_cases = []
>+  for dimension in supported_dimensions:
>+    dimension_cases.append(
>+        format_get_blitshader_case_dimension(operation, dimension))
>+
>+  return template_get_blitshader_case.format(
>+      get_blitshader_dimension_cases="\n".join([c for c in dimension_cases]),
>+      operation=operation)
>+
>+
>+def format_get_blitshader_case_dimension(operation, dimension):
>+  # 2D float to int shaders have not been implemented
>+  if dimension == "2D" and operation.find("TOI") != -1:
>+    blitshader = "INVALID"
>+  else:
>+    blitshader = dimension.upper() + "_" + operation
>+
>+  return template_get_blitshader_case_dimension.format(
>+      dimension=dimension.upper(), blitshader=blitshader)
>+
>+
>+def format_map_blitshader_case(dimension, blitshader):
>+  blitshader_name = "BLITSHADER_" + dimension.upper() + "_" + blitshader[0]
>+
>+  # 3D and 2DArray use the RGBA shader for passthrough alpha
>+  if dimension != "2D" and blitshader[0] == "ALPHA":
>+    compiled_shader_name = "PassthroughRGBA" + dimension
>+  else:
>+    compiled_shader_name = blitshader[1].replace("*", dimension)
>+
>+  shader_comment = compiled_shader_name.replace("_", " ")
>+
>+  case = template_map_blitshader_case.format(
>+      blitshader_name=blitshader_name,
>+      dimension=dimension,
>+      dimension_upper=dimension.upper(),
>+      compiled_shader_name=compiled_shader_name,
>+      shader_comment=shader_comment,
>+  )
>+
>+  return case
>+
>+
>+def format_shader_filename(dimension, blitshader):
>+  return "shaders/compiled/" + blitshader[2].replace("*",
>+                                                     dimension.lower()) + ","
>+
>+
>+def get_shader_includes():
>+  includes = []
>+
>+  for dimension in supported_dimensions:
>+    for blitshader in blitshader_data:
>+      # 2D float to int shaders have not been implemented
>+      if dimension == "2D" and blitshader[0].find("TOI") != -1:
>+        continue
>+      # 3D and 2DArray just use the RGBA shader for passthrough alpha
>+      if dimension != "2D" and blitshader[0] == "ALPHA":
>+        continue
>+      if len(blitshader) == 3:
>+        includes.append(format_shader_include(dimension, blitshader))
>+
>+  return includes
>+
>+
>+def get_blitshader_cases():
>+  blitshader_cases = []
>+  for blitshader in blitshader_data:
>+    blitshader_cases.append(format_get_blitshader_case(blitshader[0]))
>+
>+  return blitshader_cases
>+
>+
>+def get_map_blitshader_cases():
>+  blitshader_cases = []
>+
>+  for dimension in supported_dimensions:
>+    for blitshader in blitshader_data:
>+      # 2D float to int shaders have not been implemented
>+      if dimension == "2D" and blitshader[0].find("TOI") != -1:
>+        continue
>+      blitshader_cases.append(format_map_blitshader_case(dimension, blitshader))
>+
>+  return blitshader_cases
>+
>+
>+def get_blitshaderop_enums():
>+  blitshaderops = []
>+
>+  for blitshader in blitshader_data:
>+    blitshaderops.append("    " + blitshader[0] + ",")
>+
>+  blitshaderops.append("    OPERATION_INVALID")
>+  return blitshaderops
>+
>+
>+def get_blitshadertype_enums():
>+  blitshaders = []
>+
>+  for dimension in supported_dimensions:
>+    for blitshader in blitshader_data:
>+      # 2D float to int shaders have not been implemented
>+      if dimension == "2D" and blitshader[0].find("TOI") != -1:
>+        continue
>+      blitshaders.append("    BLITSHADER_" + dimension.upper() + "_" +
>+                         blitshader[0] + ",")
>+
>+  blitshaders.append("    BLITSHADER_INVALID")
>+  return blitshaders
>+
>+
>+def get_shader_filenames():
>+  filenames = []
>+
>+  for dimension in supported_dimensions:
>+    for blitshader in blitshader_data:
>+      # 2D float to int shaders have not been implemented
>+      if dimension == "2D" and blitshader[0].find("TOI") != -1:
>+        continue
>+      # 3D and 2DArray just use the RGBA shader for passthrough alpha
>+      if dimension != "2D" and blitshader[0] == "ALPHA":
>+        continue
>+      if len(blitshader) == 3:
>+        filenames.append(
>+            ("    \"src/libANGLE/renderer/d3d/d3d11/shaders/compiled/{0}\","
>+            ).format(blitshader[2].replace("*", dimension.lower())))
>+
>+  return filenames
>+
>+
>+def write_inc_file(get_blitshaders_case_list, add_blitshader_case_list,
>+                   shader_includes, blitshaderop_enums, blitshadertype_enums):
>+  content = template_blitshader_source.format(
>+      script_name=os.path.basename(sys.argv[0]),
>+      year=date.today().year,
>+      blitshaderop_enums=blitshaderop_enums,
>+      blitshadertype_enums=blitshadertype_enums,
>+      get_blitshaders_case_list=get_blitshaders_case_list,
>+      add_blitshader_case_list=add_blitshader_case_list,
>+      shader_includes=shader_includes)
>+
>+  path = os.path.join("Blit11Helper_autogen.inc")
>+
>+  with open(path, "w") as out:
>+    out.write(content)
>+    out.close()
>+
>+
>+def write_gni_file(shader_filename_list):
>+  content = template_blitshaders_gni.format(
>+      script_name=os.path.basename(sys.argv[0]),
>+      year=date.today().year,
>+      shader_filename_list=shader_filename_list)
>+
>+  path = os.path.join("d3d11_blit_shaders_autogen.gni")
>+
>+  with open(path, "w") as out:
>+    out.write(content)
>+    out.close()
>+
>+
>+def main():
>+
>+    # auto_script parameters.
>+    if len(sys.argv) > 1:
>+        inputs = []
>+        outputs = ['Blit11Helper_autogen.inc', 'd3d11_blit_shaders_autogen.gni']
>+
>+        if sys.argv[1] == 'inputs':
>+            print ','.join(inputs)
>+        elif sys.argv[1] == 'outputs':
>+            print ','.join(outputs)
>+        else:
>+            print('Invalid script parameters')
>+            return 1
>+        return 0
>+
>+    map_blitshader_cases = []
>+    shader_includes = []
>+    blitshadertype_cases = []
>+    blitshadertype_enums = []
>+    blitshaderop_enums = []
>+    shader_filenames = []
>+
>+    map_blitshader_cases = get_map_blitshader_cases()
>+    shader_includes = get_shader_includes()
>+    blitshadertype_cases = get_blitshader_cases()
>+    blitshaderop_enums = get_blitshaderop_enums()
>+    blitshadertype_enums = get_blitshadertype_enums()
>+    shader_filenames = get_shader_filenames()
>+
>+    write_inc_file("\n".join([d for d in blitshadertype_cases]), "\n".join(
>+        [c for c in map_blitshader_cases]), "\n".join([i for i in shader_includes]),
>+                   "\n".join([e for e in blitshaderop_enums]), "\n".join(
>+                       [e for e in blitshadertype_enums]))
>+    write_gni_file("\n".join([s for s in shader_filenames]))
>+    return 0
>+
>+if __name__ == '__main__':
>+    sys.exit(main())
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/gen_dxgi_format_table.py b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/gen_dxgi_format_table.py
>index 6c6d1906a7b..2b7e1755ece 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/gen_dxgi_format_table.py
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/gen_dxgi_format_table.py
>@@ -5,6 +5,7 @@
> #
> # gen_dxgi_format_table.py:
> #  Code generation for DXGI format map.
>+#  NOTE: don't run this script directly. Run scripts/run_code_generation.py.
> 
> from datetime import date
> import sys
>@@ -58,7 +59,7 @@ const Format &GetFormat(DXGI_FORMAT dxgiFormat)
>     }}
> 
>     UNREACHABLE();
>-    return Format::Get(Format::ID::NONE);
>+    return Format::Get(FormatID::NONE);
> }}
> 
> }}  // namespace d3d11_angle
>@@ -82,53 +83,78 @@ def format_case(dxgi_format, result):
> def undefined_case(dxgi_format):
>     return template_undefined_case.format(dxgi_format = dxgi_format)
> 
>-component_cases = ""
>-format_cases = ""
> 
>-input_data = 'dxgi_format_data.json'
>-
>-dxgi_map = angle_format.load_json(input_data)
>-
>-types = {
>-    'SNORM': 'GL_SIGNED_NORMALIZED',
>-    'UNORM': 'GL_UNSIGNED_NORMALIZED',
>-    'SINT': 'GL_INT',
>-    'UINT': 'GL_UNSIGNED_INT',
>-    'FLOAT': 'GL_FLOAT',
>-    'SHAREDEXP': 'GL_FLOAT'
>-}
>-
>-angle_to_gl = angle_format.load_inverse_table('../../angle_format_map.json')
>-all_angle = angle_to_gl.keys()
>-
>-for dxgi_format, angle_format in sorted(dxgi_map.iteritems()):
>-
>-    found = [ctype in dxgi_format for ctype in types.keys()]
>-    count = reduce((lambda a, b: int(a) + int(b)), found)
>-
>-    component_type = 'GL_NONE'
>-
>-    if count == 1:
>-        gltype = next(gltype for ctype, gltype in types.iteritems() if ctype in dxgi_format)
>-        component_cases += format_case(dxgi_format, gltype)
>-    else:
>-        component_cases += undefined_case(dxgi_format)
>-
>-    if angle_format == "":
>-        angle_format = dxgi_format
>-
>-    if angle_format in all_angle:
>-        angle_format = "Format::Get(Format::ID::" + angle_format + ")"
>-        format_cases += format_case(dxgi_format, angle_format)
>-    else:
>-        format_cases += undefined_case(dxgi_format)
>-
>-with open('dxgi_format_map_autogen.cpp', 'wt') as out_file:
>-    output_cpp = template_cpp.format(
>-        script_name = sys.argv[0],
>-        data_source_name = input_data,
>-        copyright_year = date.today().year,
>-        component_type_cases = component_cases,
>-        format_cases = format_cases)
>-    out_file.write(output_cpp)
>-    out_file.close()
>+def main():
>+
>+    # auto_script parameters.
>+    if len(sys.argv) > 1:
>+        inputs = [
>+            '../../angle_format.py',
>+            '../../angle_format_map.json',
>+            'dxgi_format_data.json',
>+        ]
>+        outputs = ['dxgi_format_map_autogen.cpp']
>+
>+        if sys.argv[1] == 'inputs':
>+            print ','.join(inputs)
>+        elif sys.argv[1] == 'outputs':
>+            print ','.join(outputs)
>+        else:
>+            print('Invalid script parameters')
>+            return 1
>+        return 0
>+
>+    component_cases = ""
>+    format_cases = ""
>+
>+    input_data = 'dxgi_format_data.json'
>+
>+    dxgi_map = angle_format.load_json(input_data)
>+
>+    types = {
>+        'SNORM': 'GL_SIGNED_NORMALIZED',
>+        'UNORM': 'GL_UNSIGNED_NORMALIZED',
>+        'SINT': 'GL_INT',
>+        'UINT': 'GL_UNSIGNED_INT',
>+        'FLOAT': 'GL_FLOAT',
>+        'SHAREDEXP': 'GL_FLOAT'
>+    }
>+
>+    all_angle = angle_format.get_all_angle_formats()
>+
>+    for dxgi_format, a_format in sorted(dxgi_map.iteritems()):
>+
>+        found = [ctype in dxgi_format for ctype in types.keys()]
>+        count = reduce((lambda a, b: int(a) + int(b)), found)
>+
>+        component_type = 'GL_NONE'
>+
>+        if count == 1:
>+            gltype = next(gltype for ctype, gltype in types.iteritems() if ctype in dxgi_format)
>+            component_cases += format_case(dxgi_format, gltype)
>+        else:
>+            component_cases += undefined_case(dxgi_format)
>+
>+        if a_format == "":
>+            a_format = dxgi_format
>+
>+        if a_format in all_angle:
>+            a_format = "Format::Get(FormatID::" + a_format + ")"
>+            format_cases += format_case(dxgi_format, a_format)
>+        else:
>+            format_cases += undefined_case(dxgi_format)
>+
>+    with open('dxgi_format_map_autogen.cpp', 'wt') as out_file:
>+        output_cpp = template_cpp.format(
>+            script_name = sys.argv[0],
>+            data_source_name = input_data,
>+            copyright_year = date.today().year,
>+            component_type_cases = component_cases,
>+            format_cases = format_cases)
>+        out_file.write(output_cpp)
>+        out_file.close()
>+    return 0
>+
>+
>+if __name__ == '__main__':
>+    sys.exit(main())
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/gen_dxgi_support_tables.py b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/gen_dxgi_support_tables.py
>index 1fdff786d29..e31cb0ccf19 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/gen_dxgi_support_tables.py
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/gen_dxgi_support_tables.py
>@@ -6,8 +6,9 @@
> # gen_dxgi_support_tables.py:
> #  Code generation for the DXGI support tables. Determines which formats
> #  are natively support in D3D10+.
>+#  NOTE: don't run this script directly. Run scripts/run_code_generation.py.
> #
>-#  TODO: The "never supported" formats should not be combined with the
>+#  NOTE: The "never supported" formats should not be combined with the
> #  "supported" and "optional" ones. At the moment, this does not cause
> #  any issues as ANGLE does not internally check for "never supported".
> #
>@@ -167,8 +168,6 @@ const DXGISupport &GetDXGISupport(DXGI_FORMAT dxgiFormat, D3D_FEATURE_LEVEL feat
> }} // namespace rx
> """
> 
>-table_init = ""
>-
> def do_format(format_data):
>     table_data = {'9_3': '', '10_0': '', '10_1': '', '11_0': '', '11_1': ''}
> 
>@@ -231,6 +230,9 @@ def do_format(format_data):
>             elif support == '9_3check_10_0always':
>                 fl_9_3_check.update(d3d_flag)
>                 fl_10_0_supported.update(d3d_flag)
>+            elif support == '9_3check11_0always':
>+                fl_9_3_check.update(d3d_flag)
>+                fl_10_0_check_11_0_supported.update(d3d_flag)
>             else:
>                 print("Data specification error: " + support)
>                 sys.exit(1)
>@@ -287,24 +289,45 @@ def join_table_data(table_data_1, table_data_2):
>             '11_0': table_data_1['11_0'] + table_data_2['11_0'],
>             '11_1': table_data_1['11_1'] + table_data_2['11_1']}
> 
>-with open('dxgi_support_data.json') as dxgi_file:
>-    file_data = dxgi_file.read()
>-    dxgi_file.close()
>-    json_data = json.loads(file_data)
> 
>-    table_data = {'9_3': '', '10_0': '', '10_1': '', '11_0': '', '11_1': ''}
>+def main():
>+
>+    # auto_script parameters.
>+    if len(sys.argv) > 1:
>+        inputs = ['dxgi_support_data.json']
>+        outputs = ['dxgi_support_table_autogen.cpp']
>+
>+        if sys.argv[1] == 'inputs':
>+            print ','.join(inputs)
>+        elif sys.argv[1] == 'outputs':
>+            print ','.join(outputs)
>+        else:
>+            print('Invalid script parameters')
>+            return 1
>+        return 0
>+
>+    with open('dxgi_support_data.json') as dxgi_file:
>+        file_data = dxgi_file.read()
>+        dxgi_file.close()
>+        json_data = json.loads(file_data)
>+
>+        table_data = {'9_3': '', '10_0': '', '10_1': '', '11_0': '', '11_1': ''}
>+
>+        for format_data in json_data:
>+            table_data = join_table_data(table_data, do_format(format_data))
> 
>-    for format_data in json_data:
>-        table_data = join_table_data(table_data, do_format(format_data))
>+        out_data = template.format(prefix=macro_prefix,
>+                                   table_data_9_3=table_data['9_3'],
>+                                   table_data_10_0=table_data['10_0'],
>+                                   table_data_10_1=table_data['10_1'],
>+                                   table_data_11_0=table_data['11_0'],
>+                                   table_data_11_1=table_data['11_1'])
> 
>-    out_data = template.format(prefix=macro_prefix,
>-                               table_data_9_3=table_data['9_3'],
>-                               table_data_10_0=table_data['10_0'],
>-                               table_data_10_1=table_data['10_1'],
>-                               table_data_11_0=table_data['11_0'],
>-                               table_data_11_1=table_data['11_1'])
>+        with open('dxgi_support_table_autogen.cpp', 'wt') as out_file:
>+            out_file.write(out_data)
>+            out_file.close()
>+    return 0
> 
>-    with open('dxgi_support_table.cpp', 'wt') as out_file:
>-        out_file.write(out_data)
>-        out_file.close()
> 
>+if __name__ == '__main__':
>+    sys.exit(main())
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/gen_texture_format_table.py b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/gen_texture_format_table.py
>index 02c600bfab0..1a4121a91db 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/gen_texture_format_table.py
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/gen_texture_format_table.py
>@@ -5,6 +5,7 @@
> #
> # gen_texture_format_table.py:
> #  Code generation for texture format map
>+#  NOTE: don't run this script directly. Run scripts/run_code_generation.py.
> #
> 
> from datetime import date
>@@ -87,7 +88,7 @@ def get_swizzle_format_id(internal_format, angle_format):
> 
>     # The format itself can be used for swizzles if it can be accessed as a render target and
>     # sampled and the bit count for all 4 channels is the same.
>-    if "rtvFormat" in angle_format and "srvFormat" in angle_format and not channels_different and len(angle_format['channels']) == 4:
>+    if "rtvFormat" in angle_format and "srvFormat" in angle_format and "uavFormat" in angle_format and not channels_different and len(angle_format['channels']) == 4:
>         return angle_format["glInternalFormat"] if "glInternalFormat" in angle_format else internal_format
> 
>     b = int(math.ceil(float(max_component_bits) / 8) * 8)
>@@ -141,9 +142,10 @@ def get_blit_srv_format(angle_format):
> 
> format_entry_template = """{space}{{
> {space}    static constexpr Format info({internalFormat},
>-{space}                                 angle::Format::ID::{formatName},
>+{space}                                 angle::FormatID::{formatName},
> {space}                                 {texFormat},
> {space}                                 {srvFormat},
>+{space}                                 {uavFormat},
> {space}                                 {rtvFormat},
> {space}                                 {dsvFormat},
> {space}                                 {blitSRVFormat},
>@@ -156,9 +158,10 @@ format_entry_template = """{space}{{
> split_format_entry_template = """{space}    {condition}
> {space}    {{
> {space}        static constexpr Format info({internalFormat},
>-{space}                                     angle::Format::ID::{formatName},
>+{space}                                     angle::FormatID::{formatName},
> {space}                                     {texFormat},
> {space}                                     {srvFormat},
>+{space}                                     {uavFormat},
> {space}                                     {rtvFormat},
> {space}                                     {dsvFormat},
> {space}                                     {blitSRVFormat},
>@@ -178,6 +181,7 @@ def json_to_table_data(internal_format, format_name, prefix, json):
>         "formatName": format_name,
>         "texFormat": "DXGI_FORMAT_UNKNOWN",
>         "srvFormat": "DXGI_FORMAT_UNKNOWN",
>+        "uavFormat": "DXGI_FORMAT_UNKNOWN",
>         "rtvFormat": "DXGI_FORMAT_UNKNOWN",
>         "dsvFormat": "DXGI_FORMAT_UNKNOWN",
>         "condition": prefix,
>@@ -240,6 +244,12 @@ def parse_json_into_switch_angle_format_string(json_map, json_data):
>         if format_name not in json_data:
>             continue
> 
>+        # Typeless internal formats are dummy formats just used to fit support
>+        # for typeless D3D textures into the format system. Their properties
>+        # should not be queried.
>+        if 'TYPELESS' in internal_format:
>+            continue
>+
>         angle_format = json_data[format_name]
> 
>         supported_case, unsupported_case, support_test = parse_json_angle_format_case(
>@@ -257,16 +267,38 @@ def parse_json_into_switch_angle_format_string(json_map, json_data):
> 
>     return table_data
> 
>-json_map = angle_format.load_with_override(os.path.abspath('texture_format_map.json'))
>-data_source_name = 'texture_format_data.json'
>-json_data = angle_format.load_json(data_source_name)
>-
>-angle_format_cases = parse_json_into_switch_angle_format_string(json_map, json_data)
>-output_cpp = template_texture_format_table_autogen_cpp.format(
>-    script_name = sys.argv[0],
>-    copyright_year = date.today().year,
>-    angle_format_info_cases = angle_format_cases,
>-    data_source_name = data_source_name)
>-with open('texture_format_table_autogen.cpp', 'wt') as out_file:
>-    out_file.write(output_cpp)
>-    out_file.close()
>+
>+def main():
>+
>+    # auto_script parameters.
>+    if len(sys.argv) > 1:
>+        inputs = ['../../angle_format.py', 'texture_format_data.json', 'texture_format_map.json']
>+        outputs = ['texture_format_table_autogen.cpp']
>+
>+        if sys.argv[1] == 'inputs':
>+            print ','.join(inputs)
>+        elif sys.argv[1] == 'outputs':
>+            print ','.join(outputs)
>+        else:
>+            print('Invalid script parameters')
>+            return 1
>+        return 0
>+
>+    json_map = angle_format.load_with_override(os.path.abspath('texture_format_map.json'))
>+    data_source_name = 'texture_format_data.json'
>+    json_data = angle_format.load_json(data_source_name)
>+
>+    angle_format_cases = parse_json_into_switch_angle_format_string(json_map, json_data)
>+    output_cpp = template_texture_format_table_autogen_cpp.format(
>+        script_name = sys.argv[0],
>+        copyright_year = date.today().year,
>+        angle_format_info_cases = angle_format_cases,
>+        data_source_name = data_source_name)
>+    with open('texture_format_table_autogen.cpp', 'wt') as out_file:
>+        out_file.write(output_cpp)
>+        out_file.close()
>+    return 0
>+
>+
>+if __name__ == '__main__':
>+    sys.exit(main())
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/renderer11_utils.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/renderer11_utils.cpp
>index d059b361206..87900546605 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/renderer11_utils.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/renderer11_utils.cpp
>@@ -21,7 +21,7 @@
> #include "libANGLE/formatutils.h"
> #include "libANGLE/renderer/d3d/BufferD3D.h"
> #include "libANGLE/renderer/d3d/FramebufferD3D.h"
>-#include "libANGLE/renderer/d3d/IndexBuffer.h"
>+#include "libANGLE/renderer/d3d/d3d11/Context11.h"
> #include "libANGLE/renderer/d3d/d3d11/RenderTarget11.h"
> #include "libANGLE/renderer/d3d/d3d11/Renderer11.h"
> #include "libANGLE/renderer/d3d/d3d11/dxgi_support_table.h"
>@@ -40,7 +40,7 @@ namespace
> {
> // Standard D3D sample positions from
> // https://msdn.microsoft.com/en-us/library/windows/desktop/ff476218.aspx
>-using SamplePositionsArray = std::array<float, 32>;
>+using SamplePositionsArray                                            = std::array<float, 32>;
> static constexpr std::array<SamplePositionsArray, 5> kSamplePositions = {
>     {{{0.5f, 0.5f}},
>      {{0.75f, 0.75f, 0.25f, 0.25f}},
>@@ -52,14 +52,16 @@ static constexpr std::array<SamplePositionsArray, 5> kSamplePositions = {
>        0.375f,  0.875f,  0.5f,    0.0625f, 0.25f,   0.125f,  0.125f,  0.75f,
>        0.0f,    0.5f,    0.9375f, 0.25f,   0.875f,  0.9375f, 0.0625f, 0.0f}}}};
> 
>+// TODO(xinghua.cao@intel.com): Get a more accurate limit.
>+static D3D_FEATURE_LEVEL kMinimumFeatureLevelForES31 = D3D_FEATURE_LEVEL_11_0;
>+
> // Helper functor for querying DXGI support. Saves passing the parameters repeatedly.
> class DXGISupportHelper : angle::NonCopyable
> {
>   public:
>     DXGISupportHelper(ID3D11Device *device, D3D_FEATURE_LEVEL featureLevel)
>         : mDevice(device), mFeatureLevel(featureLevel)
>-    {
>-    }
>+    {}
> 
>     bool query(DXGI_FORMAT dxgiFormat, UINT supportMask)
>     {
>@@ -117,9 +119,10 @@ gl::TextureCaps GenerateTextureFormatCaps(gl::Version maxClientVersion,
>     textureCaps.texturable = support.query(formatInfo.texFormat, texSupportMask);
>     textureCaps.filterable =
>         support.query(formatInfo.srvFormat, D3D11_FORMAT_SUPPORT_SHADER_SAMPLE);
>-    textureCaps.renderable =
>+    textureCaps.textureAttachment =
>         (support.query(formatInfo.rtvFormat, D3D11_FORMAT_SUPPORT_RENDER_TARGET)) ||
>         (support.query(formatInfo.dsvFormat, D3D11_FORMAT_SUPPORT_DEPTH_STENCIL));
>+    textureCaps.renderbuffer = textureCaps.textureAttachment;
> 
>     DXGI_FORMAT renderFormat = DXGI_FORMAT_UNKNOWN;
>     if (formatInfo.dsvFormat != DXGI_FORMAT_UNKNOWN)
>@@ -890,68 +893,139 @@ size_t GetMaxComputeWorkGroupInvocations(D3D_FEATURE_LEVEL featureLevel)
>     }
> }
> 
>-size_t GetMaximumComputeUniformVectors(D3D_FEATURE_LEVEL featureLevel)
>+unsigned int GetMaxComputeSharedMemorySize(D3D_FEATURE_LEVEL featureLevel)
> {
>     switch (featureLevel)
>     {
>+        // In D3D11 the maximum total size of all variables with the groupshared storage class is
>+        // 32kb.
>+        // https://docs.microsoft.com/en-us/windows/desktop/direct3dhlsl/dx-graphics-hlsl-variable-syntax
>         case D3D_FEATURE_LEVEL_11_1:
>         case D3D_FEATURE_LEVEL_11_0:
>-            return D3D11_REQ_CONSTANT_BUFFER_ELEMENT_COUNT;
>+            return 32768u;
>         default:
>-            return 0;
>+            return 0u;
>     }
> }
> 
>-size_t GetMaximumComputeUniformBlocks(D3D_FEATURE_LEVEL featureLevel)
>+size_t GetMaximumComputeUniformVectors(D3D_FEATURE_LEVEL featureLevel)
> {
>     switch (featureLevel)
>     {
>         case D3D_FEATURE_LEVEL_11_1:
>         case D3D_FEATURE_LEVEL_11_0:
>-            return D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT -
>-                   d3d11::RESERVED_CONSTANT_BUFFER_SLOT_COUNT;
>+            return D3D11_REQ_CONSTANT_BUFFER_ELEMENT_COUNT;
>         default:
>             return 0;
>     }
> }
> 
>-size_t GetMaximumComputeTextureUnits(D3D_FEATURE_LEVEL featureLevel)
>+size_t GetMaximumComputeUniformBlocks(D3D_FEATURE_LEVEL featureLevel)
> {
>     switch (featureLevel)
>     {
>         case D3D_FEATURE_LEVEL_11_1:
>         case D3D_FEATURE_LEVEL_11_0:
>-            return D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT;
>+            return D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT -
>+                   d3d11::RESERVED_CONSTANT_BUFFER_SLOT_COUNT;
>         default:
>             return 0;
>     }
> }
> 
>-size_t GetMaximumImageUnits(D3D_FEATURE_LEVEL featureLevel)
>+size_t GetMaximumComputeTextureUnits(D3D_FEATURE_LEVEL featureLevel)
> {
>     switch (featureLevel)
>     {
>         case D3D_FEATURE_LEVEL_11_1:
>         case D3D_FEATURE_LEVEL_11_0:
>-            // TODO(xinghua.cao@intel.com): Get a more accurate limit. For now using
>-            // the minimum requirement for GLES 3.1.
>-            return 4;
>+            return D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT;
>         default:
>             return 0;
>     }
> }
> 
>-size_t GetMaximumComputeImageUniforms(D3D_FEATURE_LEVEL featureLevel)
>+void SetUAVRelatedResourceLimits(D3D_FEATURE_LEVEL featureLevel, gl::Caps *caps)
> {
>+    ASSERT(caps);
>+
>+    GLuint reservedUAVsForAtomicCounterBuffers = 0u;
>+
>+    // For pixel shaders, the render targets and unordered access views share the same resource
>+    // slots when being written out.
>+    // https://msdn.microsoft.com/en-us/library/windows/desktop/ff476465(v=vs.85).aspx
>+    GLuint maxNumRTVsAndUAVs = 0u;
>+
>     switch (featureLevel)
>     {
>         case D3D_FEATURE_LEVEL_11_1:
>+            // Currently we allocate 4 UAV slots for atomic counter buffers on feature level 11_1.
>+            reservedUAVsForAtomicCounterBuffers = 4u;
>+            maxNumRTVsAndUAVs                   = D3D11_1_UAV_SLOT_COUNT;
>+            break;
>         case D3D_FEATURE_LEVEL_11_0:
>-            // TODO(xinghua.cao@intel.com): Get a more accurate limit. For now using
>-            // the minimum requirement for GLES 3.1.
>-            return 4;
>+            // Currently we allocate 1 UAV slot for atomic counter buffers on feature level 11_0.
>+            reservedUAVsForAtomicCounterBuffers = 1u;
>+            maxNumRTVsAndUAVs                   = D3D11_PS_CS_UAV_REGISTER_COUNT;
>+            break;
>         default:
>-            return 0;
>+            return;
>+    }
>+
>+    // Set limits on atomic counter buffers in fragment shaders and compute shaders.
>+    caps->maxCombinedAtomicCounterBuffers = reservedUAVsForAtomicCounterBuffers;
>+    caps->maxShaderAtomicCounterBuffers[gl::ShaderType::Compute] =
>+        reservedUAVsForAtomicCounterBuffers;
>+    caps->maxShaderAtomicCounterBuffers[gl::ShaderType::Fragment] =
>+        reservedUAVsForAtomicCounterBuffers;
>+    caps->maxAtomicCounterBufferBindings = reservedUAVsForAtomicCounterBuffers;
>+
>+    // Setting MAX_COMPUTE_ATOMIC_COUNTERS to a conservative number of 1024 * the number of UAV
>+    // reserved for atomic counters. It could theoretically be set to max buffer size / 4 but that
>+    // number could cause problems.
>+    caps->maxCombinedAtomicCounters = reservedUAVsForAtomicCounterBuffers * 1024;
>+    caps->maxShaderAtomicCounters[gl::ShaderType::Compute] = caps->maxCombinedAtomicCounters;
>+
>+    // See
>+    // https://docs.microsoft.com/en-us/windows/desktop/direct3d11/overviews-direct3d-11-resources-limits
>+    // Resource size (in MB) for any of the preceding resources is min(max(128,0.25f * (amount of
>+    // dedicated VRAM)), 2048) MB. So we set it to 128MB to keep same with GL backend.
>+    caps->maxShaderStorageBlockSize =
>+        D3D11_REQ_RESOURCE_SIZE_IN_MEGABYTES_EXPRESSION_A_TERM * 1024 * 1024;
>+
>+    // Allocate the remaining slots for images and shader storage blocks.
>+    // The maximum number of fragment shader outputs depends on the current context version, so we
>+    // will not set it here. See comments in Context11::initialize().
>+    caps->maxCombinedShaderOutputResources =
>+        maxNumRTVsAndUAVs - reservedUAVsForAtomicCounterBuffers;
>+
>+    // Set limits on images and shader storage blocks in fragment shaders and compute shaders.
>+    caps->maxCombinedShaderStorageBlocks                   = caps->maxCombinedShaderOutputResources;
>+    caps->maxShaderStorageBlocks[gl::ShaderType::Compute]  = caps->maxCombinedShaderOutputResources;
>+    caps->maxShaderStorageBlocks[gl::ShaderType::Fragment] = caps->maxCombinedShaderOutputResources;
>+    caps->maxShaderStorageBufferBindings                   = caps->maxCombinedShaderOutputResources;
>+
>+    caps->maxImageUnits                                    = caps->maxCombinedShaderOutputResources;
>+    caps->maxCombinedImageUniforms                         = caps->maxCombinedShaderOutputResources;
>+    caps->maxShaderImageUniforms[gl::ShaderType::Compute]  = caps->maxCombinedShaderOutputResources;
>+    caps->maxShaderImageUniforms[gl::ShaderType::Fragment] = caps->maxCombinedShaderOutputResources;
>+
>+    // On feature level 11_1, UAVs are also available in vertex shaders and geometry shaders.
>+    if (featureLevel == D3D_FEATURE_LEVEL_11_1)
>+    {
>+        caps->maxShaderAtomicCounterBuffers[gl::ShaderType::Vertex] =
>+            caps->maxCombinedAtomicCounterBuffers;
>+        caps->maxShaderAtomicCounterBuffers[gl::ShaderType::Geometry] =
>+            caps->maxCombinedAtomicCounterBuffers;
>+
>+        caps->maxShaderImageUniforms[gl::ShaderType::Vertex] =
>+            caps->maxCombinedShaderOutputResources;
>+        caps->maxShaderStorageBlocks[gl::ShaderType::Vertex] =
>+            caps->maxCombinedShaderOutputResources;
>+        caps->maxShaderImageUniforms[gl::ShaderType::Geometry] =
>+            caps->maxCombinedShaderOutputResources;
>+        caps->maxShaderStorageBlocks[gl::ShaderType::Geometry] =
>+            caps->maxCombinedShaderOutputResources;
>     }
> }
> 
>@@ -1002,6 +1076,50 @@ int GetMaximumTexelOffset(D3D_FEATURE_LEVEL featureLevel)
>     }
> }
> 
>+int GetMinimumTextureGatherOffset(D3D_FEATURE_LEVEL featureLevel)
>+{
>+    switch (featureLevel)
>+    {
>+        // https://docs.microsoft.com/en-us/windows/desktop/direct3dhlsl/gather4-po--sm5---asm-
>+        case D3D_FEATURE_LEVEL_11_1:
>+        case D3D_FEATURE_LEVEL_11_0:
>+            return -32;
>+
>+        case D3D_FEATURE_LEVEL_10_1:
>+        case D3D_FEATURE_LEVEL_10_0:
>+        case D3D_FEATURE_LEVEL_9_3:
>+        case D3D_FEATURE_LEVEL_9_2:
>+        case D3D_FEATURE_LEVEL_9_1:
>+            return 0;
>+
>+        default:
>+            UNREACHABLE();
>+            return 0;
>+    }
>+}
>+
>+int GetMaximumTextureGatherOffset(D3D_FEATURE_LEVEL featureLevel)
>+{
>+    switch (featureLevel)
>+    {
>+        // https://docs.microsoft.com/en-us/windows/desktop/direct3dhlsl/gather4-po--sm5---asm-
>+        case D3D_FEATURE_LEVEL_11_1:
>+        case D3D_FEATURE_LEVEL_11_0:
>+            return 31;
>+
>+        case D3D_FEATURE_LEVEL_10_1:
>+        case D3D_FEATURE_LEVEL_10_0:
>+        case D3D_FEATURE_LEVEL_9_3:
>+        case D3D_FEATURE_LEVEL_9_2:
>+        case D3D_FEATURE_LEVEL_9_1:
>+            return 0;
>+
>+        default:
>+            UNREACHABLE();
>+            return 0;
>+    }
>+}
>+
> size_t GetMaximumConstantBufferSize(D3D_FEATURE_LEVEL featureLevel)
> {
>     // Returns a size_t despite the limit being a GLuint64 because size_t is the maximum
>@@ -1208,6 +1326,11 @@ gl::Version GetMaximumClientVersion(D3D_FEATURE_LEVEL featureLevel)
>     }
> }
> 
>+D3D_FEATURE_LEVEL GetMinimumFeatureLevelForES31()
>+{
>+    return kMinimumFeatureLevelForES31;
>+}
>+
> unsigned int GetMaxViewportAndScissorRectanglesPerPipeline(D3D_FEATURE_LEVEL featureLevel)
> {
>     switch (featureLevel)
>@@ -1260,10 +1383,16 @@ unsigned int GetMaxSampleMaskWords(D3D_FEATURE_LEVEL featureLevel)
>     }
> }
> 
>-void GenerateCaps(ID3D11Device *device, ID3D11DeviceContext *deviceContext, const Renderer11DeviceCaps &renderer11DeviceCaps, gl::Caps *caps,
>-                  gl::TextureCapsMap *textureCapsMap, gl::Extensions *extensions, gl::Limitations *limitations)
>+void GenerateCaps(ID3D11Device *device,
>+                  ID3D11DeviceContext *deviceContext,
>+                  const Renderer11DeviceCaps &renderer11DeviceCaps,
>+                  const angle::WorkaroundsD3D &workarounds,
>+                  gl::Caps *caps,
>+                  gl::TextureCapsMap *textureCapsMap,
>+                  gl::Extensions *extensions,
>+                  gl::Limitations *limitations)
> {
>-    D3D_FEATURE_LEVEL featureLevel = renderer11DeviceCaps.featureLevel;
>+    D3D_FEATURE_LEVEL featureLevel  = renderer11DeviceCaps.featureLevel;
>     const gl::FormatSet &allFormats = gl::GetAllSizedInternalFormats();
>     for (GLenum internalFormat : allFormats)
>     {
>@@ -1279,9 +1408,9 @@ void GenerateCaps(ID3D11Device *device, ID3D11DeviceContext *deviceContext, cons
> 
>     // GL core feature limits
>     // Reserve MAX_UINT for D3D11's primitive restart.
>-    caps->maxElementIndex       = static_cast<GLint64>(std::numeric_limits<unsigned int>::max() - 1);
>-    caps->max3DTextureSize      = static_cast<GLuint>(GetMaximum3DTextureSize(featureLevel));
>-    caps->max2DTextureSize      = static_cast<GLuint>(GetMaximum2DTextureSize(featureLevel));
>+    caps->maxElementIndex  = static_cast<GLint64>(std::numeric_limits<unsigned int>::max() - 1);
>+    caps->max3DTextureSize = static_cast<GLuint>(GetMaximum3DTextureSize(featureLevel));
>+    caps->max2DTextureSize = static_cast<GLuint>(GetMaximum2DTextureSize(featureLevel));
>     caps->maxCubeMapTextureSize = static_cast<GLuint>(GetMaximumCubeMapTextureSize(featureLevel));
>     caps->maxArrayTextureLayers = static_cast<GLuint>(GetMaximum2DTextureArraySize(featureLevel));
> 
>@@ -1291,8 +1420,8 @@ void GenerateCaps(ID3D11Device *device, ID3D11DeviceContext *deviceContext, cons
>     // No specific limits on render target size, maximum 2D texture size is equivalent
>     caps->maxRenderbufferSize = caps->max2DTextureSize;
> 
>-    // Maximum draw buffers and color attachments are the same, max color attachments could eventually be
>-    // increased to 16
>+    // Maximum draw buffers and color attachments are the same, max color attachments could
>+    // eventually be increased to 16
>     caps->maxDrawBuffers = static_cast<GLuint>(GetMaximumSimultaneousRenderTargets(featureLevel));
>     caps->maxColorAttachments =
>         static_cast<GLuint>(GetMaximumSimultaneousRenderTargets(featureLevel));
>@@ -1336,14 +1465,18 @@ void GenerateCaps(ID3D11Device *device, ID3D11DeviceContext *deviceContext, cons
> 
>     // Vertex shader limits
>     caps->maxVertexAttributes = static_cast<GLuint>(GetMaximumVertexInputSlots(featureLevel));
>-    caps->maxVertexUniformComponents =
>-        static_cast<GLuint>(GetMaximumVertexUniformVectors(featureLevel)) * 4;
>     caps->maxVertexUniformVectors =
>         static_cast<GLuint>(GetMaximumVertexUniformVectors(featureLevel));
>-    caps->maxVertexUniformBlocks = static_cast<GLuint>(GetMaximumVertexUniformBlocks(featureLevel));
>+    if (workarounds.skipVSConstantRegisterZero)
>+    {
>+        caps->maxVertexUniformVectors -= 1;
>+    }
>+    caps->maxShaderUniformComponents[gl::ShaderType::Vertex] = caps->maxVertexUniformVectors * 4;
>+    caps->maxShaderUniformBlocks[gl::ShaderType::Vertex] =
>+        static_cast<GLuint>(GetMaximumVertexUniformBlocks(featureLevel));
>     caps->maxVertexOutputComponents =
>         static_cast<GLuint>(GetMaximumVertexOutputVectors(featureLevel)) * 4;
>-    caps->maxVertexTextureImageUnits =
>+    caps->maxShaderTextureImageUnits[gl::ShaderType::Vertex] =
>         static_cast<GLuint>(GetMaximumVertexTextureUnits(featureLevel));
> 
>     // Vertex Attribute Bindings are emulated on D3D11.
>@@ -1355,15 +1488,16 @@ void GenerateCaps(ID3D11Device *device, ID3D11DeviceContext *deviceContext, cons
>     caps->maxVertexAttribStride = 2048;
> 
>     // Fragment shader limits
>-    caps->maxFragmentUniformComponents =
>-        static_cast<GLuint>(GetMaximumPixelUniformVectors(featureLevel)) * 4;
>     caps->maxFragmentUniformVectors =
>         static_cast<GLuint>(GetMaximumPixelUniformVectors(featureLevel));
>-    caps->maxFragmentUniformBlocks =
>+    caps->maxShaderUniformComponents[gl::ShaderType::Fragment] =
>+        caps->maxFragmentUniformVectors * 4;
>+    caps->maxShaderUniformBlocks[gl::ShaderType::Fragment] =
>         static_cast<GLuint>(GetMaximumPixelUniformBlocks(featureLevel));
>     caps->maxFragmentInputComponents =
>         static_cast<GLuint>(GetMaximumPixelInputVectors(featureLevel)) * 4;
>-    caps->maxTextureImageUnits  = static_cast<GLuint>(GetMaximumPixelTextureUnits(featureLevel));
>+    caps->maxShaderTextureImageUnits[gl::ShaderType::Fragment] =
>+        static_cast<GLuint>(GetMaximumPixelTextureUnits(featureLevel));
>     caps->minProgramTexelOffset = GetMinimumTexelOffset(featureLevel);
>     caps->maxProgramTexelOffset = GetMaximumTexelOffset(featureLevel);
> 
>@@ -1372,41 +1506,54 @@ void GenerateCaps(ID3D11Device *device, ID3D11DeviceContext *deviceContext, cons
>     caps->maxComputeWorkGroupSize  = GetMaxComputeWorkGroupSize(featureLevel);
>     caps->maxComputeWorkGroupInvocations =
>         static_cast<GLuint>(GetMaxComputeWorkGroupInvocations(featureLevel));
>-    caps->maxComputeUniformComponents =
>+    caps->maxComputeSharedMemorySize = GetMaxComputeSharedMemorySize(featureLevel);
>+    caps->maxShaderUniformComponents[gl::ShaderType::Compute] =
>         static_cast<GLuint>(GetMaximumComputeUniformVectors(featureLevel)) * 4;
>-    caps->maxComputeUniformBlocks =
>+    caps->maxShaderUniformBlocks[gl::ShaderType::Compute] =
>         static_cast<GLuint>(GetMaximumComputeUniformBlocks(featureLevel));
>-    caps->maxComputeTextureImageUnits =
>+    caps->maxShaderTextureImageUnits[gl::ShaderType::Compute] =
>         static_cast<GLuint>(GetMaximumComputeTextureUnits(featureLevel));
>-    caps->maxImageUnits = static_cast<GLuint>(GetMaximumImageUnits(featureLevel));
>-    caps->maxComputeImageUniforms =
>-        static_cast<GLuint>(GetMaximumComputeImageUniforms(featureLevel));
>+
>+    SetUAVRelatedResourceLimits(featureLevel, caps);
> 
>     // Aggregate shader limits
>-    caps->maxUniformBufferBindings = caps->maxVertexUniformBlocks + caps->maxFragmentUniformBlocks;
>+    caps->maxUniformBufferBindings = caps->maxShaderUniformBlocks[gl::ShaderType::Vertex] +
>+                                     caps->maxShaderUniformBlocks[gl::ShaderType::Fragment];
>     caps->maxUniformBlockSize = GetMaximumConstantBufferSize(featureLevel);
> 
>     // TODO(oetuaho): Get a more accurate limit. For now using the minimum requirement for GLES 3.1.
>     caps->maxUniformLocations = 1024;
> 
>-    // With DirectX 11.1, constant buffer offset and size must be a multiple of 16 constants of 16 bytes each.
>+    // With DirectX 11.1, constant buffer offset and size must be a multiple of 16 constants of 16
>+    // bytes each.
>     // https://msdn.microsoft.com/en-us/library/windows/desktop/hh404649%28v=vs.85%29.aspx
>     // With DirectX 11.0, we emulate UBO offsets using copies of ranges of the UBO however
>     // we still keep the same alignment as 11.1 for consistency.
>     caps->uniformBufferOffsetAlignment = 256;
> 
>-    caps->maxCombinedUniformBlocks = caps->maxVertexUniformBlocks + caps->maxFragmentUniformBlocks;
>-    caps->maxCombinedVertexUniformComponents = (static_cast<GLint64>(caps->maxVertexUniformBlocks) * static_cast<GLint64>(caps->maxUniformBlockSize / 4)) +
>-                                               static_cast<GLint64>(caps->maxVertexUniformComponents);
>-    caps->maxCombinedFragmentUniformComponents = (static_cast<GLint64>(caps->maxFragmentUniformBlocks) * static_cast<GLint64>(caps->maxUniformBlockSize / 4)) +
>-                                                 static_cast<GLint64>(caps->maxFragmentUniformComponents);
>-    caps->maxCombinedComputeUniformComponents =
>-        static_cast<GLuint>(caps->maxComputeUniformBlocks * (caps->maxUniformBlockSize / 4) +
>-                            caps->maxComputeUniformComponents);
>+    caps->maxCombinedUniformBlocks = caps->maxShaderUniformBlocks[gl::ShaderType::Vertex] +
>+                                     caps->maxShaderUniformBlocks[gl::ShaderType::Fragment];
>+
>+    // A shader storage block will be translated to a structure in HLSL. So We reference the HLSL
>+    // structure packing rules
>+    // https://msdn.microsoft.com/en-us/library/windows/desktop/bb509632(v=vs.85).aspx. The
>+    // resulting size of any structure will always be evenly divisible by sizeof(four-component
>+    // vector).
>+    caps->shaderStorageBufferOffsetAlignment = 16;
>+
>+    for (gl::ShaderType shaderType : gl::AllShaderTypes())
>+    {
>+        caps->maxCombinedShaderUniformComponents[shaderType] =
>+            static_cast<GLint64>(caps->maxShaderUniformBlocks[shaderType]) *
>+                static_cast<GLint64>(caps->maxUniformBlockSize / 4) +
>+            static_cast<GLint64>(caps->maxShaderUniformComponents[shaderType]);
>+    }
>+
>     caps->maxVaryingComponents =
>         static_cast<GLuint>(GetMaximumVertexOutputVectors(featureLevel)) * 4;
>-    caps->maxVaryingVectors            = static_cast<GLuint>(GetMaximumVertexOutputVectors(featureLevel));
>-    caps->maxCombinedTextureImageUnits = caps->maxVertexTextureImageUnits + caps->maxTextureImageUnits;
>+    caps->maxVaryingVectors = static_cast<GLuint>(GetMaximumVertexOutputVectors(featureLevel));
>+    caps->maxCombinedTextureImageUnits = caps->maxShaderTextureImageUnits[gl::ShaderType::Vertex] +
>+                                         caps->maxShaderTextureImageUnits[gl::ShaderType::Fragment];
> 
>     // Transform feedback limits
>     caps->maxTransformFeedbackInterleavedComponents =
>@@ -1432,22 +1579,26 @@ void GenerateCaps(ID3D11Device *device, ID3D11DeviceContext *deviceContext, cons
>         static_cast<GLuint>(GetMaximumRenderToBufferWindowSize(featureLevel));
>     caps->maxFramebufferHeight = caps->maxFramebufferWidth;
> 
>+    // Texture gather offset limits
>+    caps->minProgramTextureGatherOffset = GetMinimumTextureGatherOffset(featureLevel);
>+    caps->maxProgramTextureGatherOffset = GetMaximumTextureGatherOffset(featureLevel);
>+
>     // GL extension support
>     extensions->setTextureExtensionSupport(*textureCapsMap);
>-    extensions->elementIndexUint = true;
>-    extensions->getProgramBinary = true;
>-    extensions->rgb8rgba8 = true;
>-    extensions->readFormatBGRA = true;
>-    extensions->pixelBufferObject = true;
>-    extensions->mapBuffer = true;
>-    extensions->mapBufferRange = true;
>-    extensions->textureNPOT = GetNPOTTextureSupport(featureLevel);
>-    extensions->drawBuffers = GetMaximumSimultaneousRenderTargets(featureLevel) > 1;
>-    extensions->textureStorage = true;
>-    extensions->textureFilterAnisotropic = true;
>-    extensions->maxTextureAnisotropy = GetMaximumAnisotropy(featureLevel);
>-    extensions->occlusionQueryBoolean = GetOcclusionQuerySupport(featureLevel);
>-    extensions->fence = GetEventQuerySupport(featureLevel);
>+    extensions->elementIndexUint            = true;
>+    extensions->getProgramBinary            = true;
>+    extensions->rgb8rgba8                   = true;
>+    extensions->readFormatBGRA              = true;
>+    extensions->pixelBufferObject           = true;
>+    extensions->mapBuffer                   = true;
>+    extensions->mapBufferRange              = true;
>+    extensions->textureNPOT                 = GetNPOTTextureSupport(featureLevel);
>+    extensions->drawBuffers                 = GetMaximumSimultaneousRenderTargets(featureLevel) > 1;
>+    extensions->textureStorage              = true;
>+    extensions->textureFilterAnisotropic    = true;
>+    extensions->maxTextureAnisotropy        = GetMaximumAnisotropy(featureLevel);
>+    extensions->occlusionQueryBoolean       = GetOcclusionQuerySupport(featureLevel);
>+    extensions->fence                       = GetEventQuerySupport(featureLevel);
>     extensions->disjointTimerQuery          = true;
>     extensions->queryCounterBitsTimeElapsed = 64;
>     extensions->queryCounterBitsTimestamp =
>@@ -1457,44 +1608,57 @@ void GenerateCaps(ID3D11Device *device, ID3D11DeviceContext *deviceContext, cons
>     // See https://msdn.microsoft.com/en-us/library/windows/desktop/ff476332(v=vs.85).aspx
>     // and https://msdn.microsoft.com/en-us/library/windows/desktop/ff476900(v=vs.85).aspx
>     extensions->robustBufferAccessBehavior = true;
>-    extensions->blendMinMax = true;
>-    extensions->framebufferBlit = GetFramebufferBlitSupport(featureLevel);
>+    extensions->blendMinMax                = true;
>+    // https://docs.microsoft.com/en-us/windows/desktop/direct3ddxgi/format-support-for-direct3d-11-0-feature-level-hardware
>+    extensions->floatBlend             = true;
>+    extensions->framebufferBlit        = GetFramebufferBlitSupport(featureLevel);
>     extensions->framebufferMultisample = GetFramebufferMultisampleSupport(featureLevel);
>-    extensions->instancedArrays = GetInstancingSupport(featureLevel);
>-    extensions->packReverseRowOrder = true;
>-    extensions->standardDerivatives = GetDerivativeInstructionSupport(featureLevel);
>-    extensions->shaderTextureLOD = GetShaderTextureLODSupport(featureLevel);
>-    extensions->fragDepth = true;
>-    extensions->multiview              = IsMultiviewSupported(featureLevel);
>-    if (extensions->multiview)
>+    extensions->instancedArraysANGLE   = GetInstancingSupport(featureLevel);
>+    extensions->instancedArraysEXT     = GetInstancingSupport(featureLevel);
>+    extensions->packReverseRowOrder    = true;
>+    extensions->standardDerivatives    = GetDerivativeInstructionSupport(featureLevel);
>+    extensions->shaderTextureLOD       = GetShaderTextureLODSupport(featureLevel);
>+    extensions->fragDepth              = true;
>+    extensions->multiview2             = IsMultiviewSupported(featureLevel);
>+    if (extensions->multiview2)
>     {
>         extensions->maxViews =
>             std::min(static_cast<GLuint>(gl::IMPLEMENTATION_ANGLE_MULTIVIEW_MAX_VIEWS),
>                      std::min(static_cast<GLuint>(GetMaximum2DTextureArraySize(featureLevel)),
>                               GetMaxViewportAndScissorRectanglesPerPipeline(featureLevel)));
>     }
>-    extensions->textureUsage = true; // This could be false since it has no effect in D3D11
>+    extensions->textureUsage       = true;  // This could be false since it has no effect in D3D11
>     extensions->discardFramebuffer = true;
>-    extensions->translatedShaderSource = true;
>-    extensions->fboRenderMipmap = false;
>-    extensions->debugMarker = true;
>-    extensions->eglImage                 = true;
>-    extensions->eglImageExternal          = true;
>-    extensions->eglImageExternalEssl3     = true;
>-    extensions->eglStreamConsumerExternal = true;
>-    extensions->unpackSubimage           = true;
>-    extensions->packSubimage             = true;
>-    extensions->lossyETCDecode           = true;
>-    extensions->syncQuery                 = GetEventQuerySupport(featureLevel);
>-    extensions->copyTexture               = true;
>-    extensions->copyCompressedTexture     = true;
>+    extensions->translatedShaderSource           = true;
>+    extensions->fboRenderMipmap                  = false;
>+    extensions->debugMarker                      = true;
>+    extensions->eglImage                         = true;
>+    extensions->eglImageExternal                 = true;
>+    extensions->eglImageExternalEssl3            = true;
>+    extensions->eglStreamConsumerExternal        = true;
>+    extensions->unpackSubimage                   = true;
>+    extensions->packSubimage                     = true;
>+    extensions->lossyETCDecode                   = true;
>+    extensions->syncQuery                        = GetEventQuerySupport(featureLevel);
>+    extensions->copyTexture                      = true;
>+    extensions->copyCompressedTexture            = true;
>+    extensions->textureStorageMultisample2DArray = true;
>+    extensions->multiviewMultisample =
>+        (extensions->multiview2 && extensions->textureStorageMultisample2DArray);
>+    extensions->copyTexture3d      = true;
>+    extensions->textureBorderClamp = true;
>+    extensions->textureMultisample = true;
>+    extensions->provokingVertex    = true;
> 
>     // D3D11 Feature Level 10_0+ uses SV_IsFrontFace in HLSL to emulate gl_FrontFacing.
>-    // D3D11 Feature Level 9_3 doesn't support SV_IsFrontFace, and has no equivalent, so can't support gl_FrontFacing.
>-    limitations->noFrontFacingSupport = (renderer11DeviceCaps.featureLevel <= D3D_FEATURE_LEVEL_9_3);
>+    // D3D11 Feature Level 9_3 doesn't support SV_IsFrontFace, and has no equivalent, so can't
>+    // support gl_FrontFacing.
>+    limitations->noFrontFacingSupport =
>+        (renderer11DeviceCaps.featureLevel <= D3D_FEATURE_LEVEL_9_3);
> 
>     // D3D11 Feature Level 9_3 doesn't support alpha-to-coverage
>-    limitations->noSampleAlphaToCoverageSupport = (renderer11DeviceCaps.featureLevel <= D3D_FEATURE_LEVEL_9_3);
>+    limitations->noSampleAlphaToCoverageSupport =
>+        (renderer11DeviceCaps.featureLevel <= D3D_FEATURE_LEVEL_9_3);
> 
>     // D3D11 Feature Levels 9_3 and below do not support non-constant loop indexing and require
>     // additional
>@@ -1509,17 +1673,21 @@ void GenerateCaps(ID3D11Device *device, ID3D11DeviceContext *deviceContext, cons
>     // D3D11 cannot support constant color and alpha blend funcs together
>     limitations->noSimultaneousConstantColorAndAlphaBlendFunc = true;
> 
>+    // D3D11 does not support multiple transform feedback outputs writing to the same buffer.
>+    limitations->noDoubleBoundTransformFeedbackBuffers = true;
>+
> #ifdef ANGLE_ENABLE_WINDOWS_STORE
>-    // Setting a non-zero divisor on attribute zero doesn't work on certain Windows Phone 8-era devices.
>-    // We should prevent developers from doing this on ALL Windows Store devices. This will maintain consistency across all Windows devices.
>-    // We allow non-zero divisors on attribute zero if the Client Version >= 3, since devices affected by this issue don't support ES3+.
>+    // Setting a non-zero divisor on attribute zero doesn't work on certain Windows Phone 8-era
>+    // devices. We should prevent developers from doing this on ALL Windows Store devices. This will
>+    // maintain consistency across all Windows devices. We allow non-zero divisors on attribute zero
>+    // if the Client Version >= 3, since devices affected by this issue don't support ES3+.
>     limitations->attributeZeroRequiresZeroDivisorInEXT = true;
> #endif
> }
> 
> void GetSamplePosition(GLsizei sampleCount, size_t index, GLfloat *xy)
> {
>-    size_t indexKey = static_cast<size_t>(ceil(log(sampleCount)));
>+    size_t indexKey = static_cast<size_t>(ceil(log2(sampleCount)));
>     ASSERT(indexKey < kSamplePositions.size() &&
>            (2 * index + 1) < kSamplePositions[indexKey].size());
> 
>@@ -1823,6 +1991,8 @@ D3D11_TEXTURE_ADDRESS_MODE ConvertTextureWrap(GLenum wrap)
>             return D3D11_TEXTURE_ADDRESS_WRAP;
>         case GL_CLAMP_TO_EDGE:
>             return D3D11_TEXTURE_ADDRESS_CLAMP;
>+        case GL_CLAMP_TO_BORDER:
>+            return D3D11_TEXTURE_ADDRESS_BORDER;
>         case GL_MIRRORED_REPEAT:
>             return D3D11_TEXTURE_ADDRESS_MIRROR;
>         default:
>@@ -1837,19 +2007,19 @@ UINT ConvertMaxAnisotropy(float maxAnisotropy, D3D_FEATURE_LEVEL featureLevel)
>     return static_cast<UINT>(std::min(maxAnisotropy, d3d11_gl::GetMaximumAnisotropy(featureLevel)));
> }
> 
>-D3D11_QUERY ConvertQueryType(GLenum queryType)
>+D3D11_QUERY ConvertQueryType(gl::QueryType type)
> {
>-    switch (queryType)
>+    switch (type)
>     {
>-        case GL_ANY_SAMPLES_PASSED_EXT:
>-        case GL_ANY_SAMPLES_PASSED_CONSERVATIVE_EXT:
>+        case gl::QueryType::AnySamples:
>+        case gl::QueryType::AnySamplesConservative:
>             return D3D11_QUERY_OCCLUSION;
>-        case GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN:
>+        case gl::QueryType::TransformFeedbackPrimitivesWritten:
>             return D3D11_QUERY_SO_STATISTICS;
>-        case GL_TIME_ELAPSED_EXT:
>+        case gl::QueryType::TimeElapsed:
>             // Two internal queries are also created for begin/end timestamps
>             return D3D11_QUERY_TIMESTAMP_DISJOINT;
>-        case GL_COMMANDS_COMPLETED_CHROMIUM:
>+        case gl::QueryType::CommandsCompleted:
>             return D3D11_QUERY_EVENT;
>         default:
>             UNREACHABLE();
>@@ -1935,16 +2105,21 @@ ANGLED3D11DeviceType GetDeviceType(ID3D11Device *device)
>     return retDeviceType;
> }
> 
>-void MakeValidSize(bool isImage, DXGI_FORMAT format, GLsizei *requestWidth, GLsizei *requestHeight, int *levelOffset)
>+void MakeValidSize(bool isImage,
>+                   DXGI_FORMAT format,
>+                   GLsizei *requestWidth,
>+                   GLsizei *requestHeight,
>+                   int *levelOffset)
> {
>     const DXGIFormatSize &dxgiFormatInfo = d3d11::GetDXGIFormatSizeInfo(format);
> 
>     int upsampleCount = 0;
>     // Don't expand the size of full textures that are at least (blockWidth x blockHeight) already.
>-    if (isImage || *requestWidth  < static_cast<GLsizei>(dxgiFormatInfo.blockWidth) ||
>-                   *requestHeight < static_cast<GLsizei>(dxgiFormatInfo.blockHeight))
>+    if (isImage || *requestWidth < static_cast<GLsizei>(dxgiFormatInfo.blockWidth) ||
>+        *requestHeight < static_cast<GLsizei>(dxgiFormatInfo.blockHeight))
>     {
>-        while (*requestWidth % dxgiFormatInfo.blockWidth != 0 || *requestHeight % dxgiFormatInfo.blockHeight != 0)
>+        while (*requestWidth % dxgiFormatInfo.blockWidth != 0 ||
>+               *requestHeight % dxgiFormatInfo.blockHeight != 0)
>         {
>             *requestWidth <<= 1;
>             *requestHeight <<= 1;
>@@ -1957,14 +2132,15 @@ void MakeValidSize(bool isImage, DXGI_FORMAT format, GLsizei *requestWidth, GLsi
>     }
> }
> 
>-void GenerateInitialTextureData(GLint internalFormat,
>-                                const Renderer11DeviceCaps &renderer11DeviceCaps,
>-                                GLuint width,
>-                                GLuint height,
>-                                GLuint depth,
>-                                GLuint mipLevels,
>-                                std::vector<D3D11_SUBRESOURCE_DATA> *outSubresourceData,
>-                                std::vector<std::vector<BYTE>> *outData)
>+angle::Result GenerateInitialTextureData(
>+    const gl::Context *context,
>+    GLint internalFormat,
>+    const Renderer11DeviceCaps &renderer11DeviceCaps,
>+    GLuint width,
>+    GLuint height,
>+    GLuint depth,
>+    GLuint mipLevels,
>+    gl::TexLevelArray<D3D11_SUBRESOURCE_DATA> *outSubresourceData)
> {
>     const d3d11::Format &d3dFormatInfo = d3d11::Format::Get(internalFormat, renderer11DeviceCaps);
>     ASSERT(d3dFormatInfo.dataInitializerFunction != nullptr);
>@@ -1972,25 +2148,31 @@ void GenerateInitialTextureData(GLint internalFormat,
>     const d3d11::DXGIFormatSize &dxgiFormatInfo =
>         d3d11::GetDXGIFormatSizeInfo(d3dFormatInfo.texFormat);
> 
>-    outSubresourceData->resize(mipLevels);
>-    outData->resize(mipLevels);
>+    unsigned int rowPitch     = dxgiFormatInfo.pixelBytes * width;
>+    unsigned int depthPitch   = rowPitch * height;
>+    unsigned int maxImageSize = depthPitch * depth;
>+
>+    angle::MemoryBuffer *scratchBuffer = nullptr;
>+    ANGLE_CHECK_GL_ALLOC(GetImplAs<Context11>(context),
>+                         context->getScratchBuffer(maxImageSize, &scratchBuffer));
>+
>+    d3dFormatInfo.dataInitializerFunction(width, height, depth, scratchBuffer->data(), rowPitch,
>+                                          depthPitch);
> 
>     for (unsigned int i = 0; i < mipLevels; i++)
>     {
>-        unsigned int mipWidth = std::max(width >> i, 1U);
>+        unsigned int mipWidth  = std::max(width >> i, 1U);
>         unsigned int mipHeight = std::max(height >> i, 1U);
>-        unsigned int mipDepth = std::max(depth >> i, 1U);
>-
>-        unsigned int rowWidth = dxgiFormatInfo.pixelBytes * mipWidth;
>-        unsigned int imageSize = rowWidth * height;
> 
>-        outData->at(i).resize(rowWidth * mipHeight * mipDepth);
>-        d3dFormatInfo.dataInitializerFunction(mipWidth, mipHeight, mipDepth, outData->at(i).data(), rowWidth, imageSize);
>+        unsigned int mipRowPitch   = dxgiFormatInfo.pixelBytes * mipWidth;
>+        unsigned int mipDepthPitch = mipRowPitch * mipHeight;
> 
>-        outSubresourceData->at(i).pSysMem = outData->at(i).data();
>-        outSubresourceData->at(i).SysMemPitch = rowWidth;
>-        outSubresourceData->at(i).SysMemSlicePitch = imageSize;
>+        outSubresourceData->at(i).pSysMem          = scratchBuffer->data();
>+        outSubresourceData->at(i).SysMemPitch      = mipRowPitch;
>+        outSubresourceData->at(i).SysMemSlicePitch = mipDepthPitch;
>     }
>+
>+    return angle::Result::Continue;
> }
> 
> UINT GetPrimitiveRestartIndex()
>@@ -1998,7 +2180,7 @@ UINT GetPrimitiveRestartIndex()
>     return std::numeric_limits<UINT>::max();
> }
> 
>-void SetPositionTexCoordVertex(PositionTexCoordVertex* vertex, float x, float y, float u, float v)
>+void SetPositionTexCoordVertex(PositionTexCoordVertex *vertex, float x, float y, float u, float v)
> {
>     vertex->x = x;
>     vertex->y = y;
>@@ -2006,8 +2188,13 @@ void SetPositionTexCoordVertex(PositionTexCoordVertex* vertex, float x, float y,
>     vertex->v = v;
> }
> 
>-void SetPositionLayerTexCoord3DVertex(PositionLayerTexCoord3DVertex* vertex, float x, float y,
>-                                      unsigned int layer, float u, float v, float s)
>+void SetPositionLayerTexCoord3DVertex(PositionLayerTexCoord3DVertex *vertex,
>+                                      float x,
>+                                      float y,
>+                                      unsigned int layer,
>+                                      float u,
>+                                      float v,
>+                                      float s)
> {
>     vertex->x = x;
>     vertex->y = y;
>@@ -2089,45 +2276,54 @@ HRESULT SetDebugName(ID3D11DeviceChild *resource, const char *name)
> // allocateResource is only compatible with Clang and MSVS, which support calling a
> // method on a forward declared class in a template.
> template <ResourceType ResourceT>
>-gl::Error LazyResource<ResourceT>::resolveImpl(Renderer11 *renderer,
>-                                               const GetDescType<ResourceT> &desc,
>-                                               GetInitDataType<ResourceT> *initData,
>-                                               const char *name)
>+angle::Result LazyResource<ResourceT>::resolveImpl(d3d::Context *context,
>+                                                   Renderer11 *renderer,
>+                                                   const GetDescType<ResourceT> &desc,
>+                                                   GetInitDataType<ResourceT> *initData,
>+                                                   const char *name)
> {
>     if (!mResource.valid())
>     {
>-        ANGLE_TRY(renderer->allocateResource(desc, initData, &mResource));
>+        ANGLE_TRY(renderer->allocateResource(context, desc, initData, &mResource));
>         mResource.setDebugName(name);
>     }
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-template gl::Error LazyResource<ResourceType::BlendState>::resolveImpl(Renderer11 *renderer,
>-                                                                       const D3D11_BLEND_DESC &desc,
>-                                                                       void *initData,
>-                                                                       const char *name);
>-template gl::Error LazyResource<ResourceType::ComputeShader>::resolveImpl(Renderer11 *renderer,
>-                                                                          const ShaderData &desc,
>-                                                                          void *initData,
>-                                                                          const char *name);
>-template gl::Error LazyResource<ResourceType::GeometryShader>::resolveImpl(
>+template angle::Result LazyResource<ResourceType::BlendState>::resolveImpl(
>+    d3d::Context *context,
>+    Renderer11 *renderer,
>+    const D3D11_BLEND_DESC &desc,
>+    void *initData,
>+    const char *name);
>+template angle::Result LazyResource<ResourceType::ComputeShader>::resolveImpl(
>+    d3d::Context *context,
>+    Renderer11 *renderer,
>+    const ShaderData &desc,
>+    void *initData,
>+    const char *name);
>+template angle::Result LazyResource<ResourceType::GeometryShader>::resolveImpl(
>+    d3d::Context *context,
>     Renderer11 *renderer,
>     const ShaderData &desc,
>     const std::vector<D3D11_SO_DECLARATION_ENTRY> *initData,
>     const char *name);
>-template gl::Error LazyResource<ResourceType::InputLayout>::resolveImpl(
>+template angle::Result LazyResource<ResourceType::InputLayout>::resolveImpl(
>+    d3d::Context *context,
>     Renderer11 *renderer,
>     const InputElementArray &desc,
>     const ShaderData *initData,
>     const char *name);
>-template gl::Error LazyResource<ResourceType::PixelShader>::resolveImpl(Renderer11 *renderer,
>-                                                                        const ShaderData &desc,
>-                                                                        void *initData,
>-                                                                        const char *name);
>-template gl::Error LazyResource<ResourceType::VertexShader>::resolveImpl(Renderer11 *renderer,
>-                                                                         const ShaderData &desc,
>-                                                                         void *initData,
>-                                                                         const char *name);
>+template angle::Result LazyResource<ResourceType::PixelShader>::resolveImpl(d3d::Context *context,
>+                                                                            Renderer11 *renderer,
>+                                                                            const ShaderData &desc,
>+                                                                            void *initData,
>+                                                                            const char *name);
>+template angle::Result LazyResource<ResourceType::VertexShader>::resolveImpl(d3d::Context *context,
>+                                                                             Renderer11 *renderer,
>+                                                                             const ShaderData &desc,
>+                                                                             void *initData,
>+                                                                             const char *name);
> 
> LazyInputLayout::LazyInputLayout(const D3D11_INPUT_ELEMENT_DESC *inputDesc,
>                                  size_t inputDescLen,
>@@ -2135,26 +2331,22 @@ LazyInputLayout::LazyInputLayout(const D3D11_INPUT_ELEMENT_DESC *inputDesc,
>                                  size_t byteCodeLen,
>                                  const char *debugName)
>     : mInputDesc(inputDesc, inputDescLen), mByteCode(byteCode, byteCodeLen), mDebugName(debugName)
>-{
>-}
>+{}
> 
>-LazyInputLayout::~LazyInputLayout()
>-{
>-}
>+LazyInputLayout::~LazyInputLayout() {}
> 
>-gl::Error LazyInputLayout::resolve(Renderer11 *renderer)
>+angle::Result LazyInputLayout::resolve(d3d::Context *context, Renderer11 *renderer)
> {
>-    return resolveImpl(renderer, mInputDesc, &mByteCode, mDebugName);
>+    return resolveImpl(context, renderer, mInputDesc, &mByteCode, mDebugName);
> }
> 
> LazyBlendState::LazyBlendState(const D3D11_BLEND_DESC &desc, const char *debugName)
>     : mDesc(desc), mDebugName(debugName)
>-{
>-}
>+{}
> 
>-gl::Error LazyBlendState::resolve(Renderer11 *renderer)
>+angle::Result LazyBlendState::resolve(d3d::Context *context, Renderer11 *renderer)
> {
>-    return resolveImpl(renderer, mDesc, nullptr, mDebugName);
>+    return resolveImpl(context, renderer, mDesc, nullptr, mDebugName);
> }
> 
> angle::WorkaroundsD3D GenerateWorkarounds(const Renderer11DeviceCaps &deviceCaps,
>@@ -2163,8 +2355,8 @@ angle::WorkaroundsD3D GenerateWorkarounds(const Renderer11DeviceCaps &deviceCaps
>     bool is9_3 = (deviceCaps.featureLevel <= D3D_FEATURE_LEVEL_9_3);
> 
>     angle::WorkaroundsD3D workarounds;
>-    workarounds.mrtPerfWorkaround = true;
>-    workarounds.setDataFasterThanImageUpload = true;
>+    workarounds.mrtPerfWorkaround                = true;
>+    workarounds.setDataFasterThanImageUpload     = true;
>     workarounds.zeroMaxLodWorkaround             = is9_3;
>     workarounds.useInstancedPointSpriteEmulation = is9_3;
> 
>@@ -2190,6 +2382,8 @@ angle::WorkaroundsD3D GenerateWorkarounds(const Renderer11DeviceCaps &deviceCaps
> 
>     workarounds.flushAfterEndingTransformFeedback = IsNvidia(adapterDesc.VendorId);
>     workarounds.getDimensionsIgnoresBaseLevel     = IsNvidia(adapterDesc.VendorId);
>+    workarounds.skipVSConstantRegisterZero        = IsNvidia(adapterDesc.VendorId);
>+    workarounds.forceAtomicValueResolution        = IsNvidia(adapterDesc.VendorId);
> 
>     if (IsIntel(adapterDesc.VendorId))
>     {
>@@ -2247,9 +2441,7 @@ void InitConstantBufferDesc(D3D11_BUFFER_DESC *constantBufferDescription, size_t
> }  // namespace d3d11
> 
> // TextureHelper11 implementation.
>-TextureHelper11::TextureHelper11() : mFormatSet(nullptr), mSampleCount(0)
>-{
>-}
>+TextureHelper11::TextureHelper11() : mFormatSet(nullptr), mSampleCount(0) {}
> 
> TextureHelper11::TextureHelper11(TextureHelper11 &&toCopy) : TextureHelper11()
> {
>@@ -2262,9 +2454,7 @@ TextureHelper11::TextureHelper11(const TextureHelper11 &other)
>     mData = other.mData;
> }
> 
>-TextureHelper11::~TextureHelper11()
>-{
>-}
>+TextureHelper11::~TextureHelper11() {}
> 
> void TextureHelper11::getDesc(D3D11_TEXTURE2D_DESC *desc) const
> {
>@@ -2334,64 +2524,23 @@ bool UsePresentPathFast(const Renderer11 *renderer,
>             renderer->presentPathFastEnabled());
> }
> 
>-bool UsePrimitiveRestartWorkaround(bool primitiveRestartFixedIndexEnabled, GLenum type)
>+bool UsePrimitiveRestartWorkaround(bool primitiveRestartFixedIndexEnabled,
>+                                   gl::DrawElementsType type)
> {
>     // We should never have to deal with primitive restart workaround issue with GL_UNSIGNED_INT
>     // indices, since we restrict it via MAX_ELEMENT_INDEX.
>-    return (!primitiveRestartFixedIndexEnabled && type == GL_UNSIGNED_SHORT);
>-}
>-
>-bool IsStreamingIndexData(const gl::Context *context, GLenum srcType)
>-{
>-    const auto &glState = context->getGLState();
>-    gl::Buffer *glBuffer = glState.getVertexArray()->getElementArrayBuffer().get();
>-
>-    // Case 1: the indices are passed by pointer, which forces the streaming of index data
>-    if (glBuffer == nullptr)
>-    {
>-        return true;
>-    }
>-
>-    bool primitiveRestartWorkaround =
>-        UsePrimitiveRestartWorkaround(glState.isPrimitiveRestartEnabled(), srcType);
>-
>-    BufferD3D *buffer    = GetImplAs<BufferD3D>(glBuffer);
>-    const GLenum dstType = (srcType == GL_UNSIGNED_INT || primitiveRestartWorkaround)
>-                               ? GL_UNSIGNED_INT
>-                               : GL_UNSIGNED_SHORT;
>-
>-    // Case 2a: the buffer can be used directly
>-    if (buffer->supportsDirectBinding() && dstType == srcType)
>-    {
>-        return false;
>-    }
>-
>-    // Case 2b: use a static translated copy or fall back to streaming
>-    StaticIndexBufferInterface *staticBuffer = buffer->getStaticIndexBuffer();
>-    if (staticBuffer == nullptr)
>-    {
>-        return true;
>-    }
>-
>-    if ((staticBuffer->getBufferSize() == 0) || (staticBuffer->getIndexType() != dstType))
>-    {
>-        return true;
>-    }
>-
>-    return false;
>+    return (!primitiveRestartFixedIndexEnabled && type == gl::DrawElementsType::UnsignedShort);
> }
> 
> IndexStorageType ClassifyIndexStorage(const gl::State &glState,
>                                       const gl::Buffer *elementArrayBuffer,
>-                                      GLenum elementType,
>-                                      GLenum destElementType,
>-                                      unsigned int offset,
>-                                      bool *needsTranslation)
>+                                      gl::DrawElementsType elementType,
>+                                      gl::DrawElementsType destElementType,
>+                                      unsigned int offset)
> {
>     // No buffer bound means we are streaming from a client pointer.
>     if (!elementArrayBuffer || !IsOffsetAligned(elementType, offset))
>     {
>-        *needsTranslation = true;
>         return IndexStorageType::Dynamic;
>     }
> 
>@@ -2399,7 +2548,6 @@ IndexStorageType ClassifyIndexStorage(const gl::State &glState,
>     BufferD3D *bufferD3D = GetImplAs<BufferD3D>(elementArrayBuffer);
>     if (bufferD3D->supportsDirectBinding() && destElementType == elementType)
>     {
>-        *needsTranslation = false;
>         return IndexStorageType::Direct;
>     }
> 
>@@ -2407,15 +2555,10 @@ IndexStorageType ClassifyIndexStorage(const gl::State &glState,
>     StaticIndexBufferInterface *staticBuffer = bufferD3D->getStaticIndexBuffer();
>     if (staticBuffer != nullptr)
>     {
>-        // Need to re-translate the static data if has never been used, or changed type.
>-        *needsTranslation =
>-            (staticBuffer->getBufferSize() == 0 || staticBuffer->getIndexType() != destElementType);
>         return IndexStorageType::Static;
>     }
> 
>     // Static buffer not available, fall back to streaming.
>-    *needsTranslation = true;
>     return IndexStorageType::Dynamic;
> }
>-
> }  // namespace rx
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/renderer11_utils.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/renderer11_utils.h
>index 3af51bb0f65..ed5b5ece954 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/renderer11_utils.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/renderer11_utils.h
>@@ -29,12 +29,12 @@ class FramebufferAttachment;
> 
> namespace rx
> {
>+class Context11;
> class Renderer11;
> class RenderTarget11;
> struct Renderer11DeviceCaps;
> 
>-using RenderTargetArray = std::array<RenderTarget11 *, gl::IMPLEMENTATION_MAX_DRAW_BUFFERS>;
>-using RTVArray          = std::array<ID3D11RenderTargetView *, gl::IMPLEMENTATION_MAX_DRAW_BUFFERS>;
>+using RTVArray = std::array<ID3D11RenderTargetView *, gl::IMPLEMENTATION_MAX_DRAW_BUFFERS>;
> 
> namespace gl_d3d11
> {
>@@ -50,11 +50,14 @@ D3D11_DEPTH_WRITE_MASK ConvertDepthMask(bool depthWriteEnabled);
> UINT8 ConvertStencilMask(GLuint stencilmask);
> D3D11_STENCIL_OP ConvertStencilOp(GLenum stencilOp);
> 
>-D3D11_FILTER ConvertFilter(GLenum minFilter, GLenum magFilter, float maxAnisotropy, GLenum comparisonMode);
>+D3D11_FILTER ConvertFilter(GLenum minFilter,
>+                           GLenum magFilter,
>+                           float maxAnisotropy,
>+                           GLenum comparisonMode);
> D3D11_TEXTURE_ADDRESS_MODE ConvertTextureWrap(GLenum wrap);
> UINT ConvertMaxAnisotropy(float maxAnisotropy, D3D_FEATURE_LEVEL featureLevel);
> 
>-D3D11_QUERY ConvertQueryType(GLenum queryType);
>+D3D11_QUERY ConvertQueryType(gl::QueryType type);
> 
> UINT8 GetColorMask(const gl::InternalFormat &formatInfo);
> 
>@@ -68,11 +71,19 @@ unsigned int GetReservedVertexUniformVectors(D3D_FEATURE_LEVEL featureLevel);
> unsigned int GetReservedFragmentUniformVectors(D3D_FEATURE_LEVEL featureLevel);
> 
> gl::Version GetMaximumClientVersion(D3D_FEATURE_LEVEL featureLevel);
>-void GenerateCaps(ID3D11Device *device, ID3D11DeviceContext *deviceContext, const Renderer11DeviceCaps &renderer11DeviceCaps, gl::Caps *caps,
>-                  gl::TextureCapsMap *textureCapsMap, gl::Extensions *extensions, gl::Limitations *limitations);
>+void GenerateCaps(ID3D11Device *device,
>+                  ID3D11DeviceContext *deviceContext,
>+                  const Renderer11DeviceCaps &renderer11DeviceCaps,
>+                  const angle::WorkaroundsD3D &workarounds,
>+                  gl::Caps *caps,
>+                  gl::TextureCapsMap *textureCapsMap,
>+                  gl::Extensions *extensions,
>+                  gl::Limitations *limitations);
> 
> void GetSamplePosition(GLsizei sampleCount, size_t index, GLfloat *xy);
> 
>+D3D_FEATURE_LEVEL GetMinimumFeatureLevelForES31();
>+
> }  // namespace d3d11_gl
> 
> namespace d3d11
>@@ -88,16 +99,21 @@ enum ANGLED3D11DeviceType
> 
> ANGLED3D11DeviceType GetDeviceType(ID3D11Device *device);
> 
>-void MakeValidSize(bool isImage, DXGI_FORMAT format, GLsizei *requestWidth, GLsizei *requestHeight, int *levelOffset);
>-
>-void GenerateInitialTextureData(GLint internalFormat,
>-                                const Renderer11DeviceCaps &renderer11DeviceCaps,
>-                                GLuint width,
>-                                GLuint height,
>-                                GLuint depth,
>-                                GLuint mipLevels,
>-                                std::vector<D3D11_SUBRESOURCE_DATA> *outSubresourceData,
>-                                std::vector<std::vector<BYTE>> *outData);
>+void MakeValidSize(bool isImage,
>+                   DXGI_FORMAT format,
>+                   GLsizei *requestWidth,
>+                   GLsizei *requestHeight,
>+                   int *levelOffset);
>+
>+angle::Result GenerateInitialTextureData(
>+    const gl::Context *context,
>+    GLint internalFormat,
>+    const Renderer11DeviceCaps &renderer11DeviceCaps,
>+    GLuint width,
>+    GLuint height,
>+    GLuint depth,
>+    GLuint mipLevels,
>+    gl::TexLevelArray<D3D11_SUBRESOURCE_DATA> *outSubresourceData);
> 
> UINT GetPrimitiveRestartIndex();
> 
>@@ -106,7 +122,7 @@ struct PositionTexCoordVertex
>     float x, y;
>     float u, v;
> };
>-void SetPositionTexCoordVertex(PositionTexCoordVertex* vertex, float x, float y, float u, float v);
>+void SetPositionTexCoordVertex(PositionTexCoordVertex *vertex, float x, float y, float u, float v);
> 
> struct PositionLayerTexCoord3DVertex
> {
>@@ -114,8 +130,13 @@ struct PositionLayerTexCoord3DVertex
>     unsigned int l;
>     float u, v, s;
> };
>-void SetPositionLayerTexCoord3DVertex(PositionLayerTexCoord3DVertex* vertex, float x, float y,
>-                                      unsigned int layer, float u, float v, float s);
>+void SetPositionLayerTexCoord3DVertex(PositionLayerTexCoord3DVertex *vertex,
>+                                      float x,
>+                                      float y,
>+                                      unsigned int layer,
>+                                      float u,
>+                                      float v,
>+                                      float s);
> 
> struct PositionVertex
> {
>@@ -153,10 +174,11 @@ bool operator==(const RasterizerStateKey &a, const RasterizerStateKey &b);
> bool operator!=(const RasterizerStateKey &a, const RasterizerStateKey &b);
> 
> template <typename outType>
>-outType* DynamicCastComObject(IUnknown* object)
>+outType *DynamicCastComObject(IUnknown *object)
> {
>     outType *outObject = nullptr;
>-    HRESULT result = object->QueryInterface(__uuidof(outType), reinterpret_cast<void**>(&outObject));
>+    HRESULT result =
>+        object->QueryInterface(__uuidof(outType), reinterpret_cast<void **>(&outObject));
>     if (SUCCEEDED(result))
>     {
>         return outObject;
>@@ -172,14 +194,14 @@ inline bool isDeviceLostError(HRESULT errorCode)
> {
>     switch (errorCode)
>     {
>-      case DXGI_ERROR_DEVICE_HUNG:
>-      case DXGI_ERROR_DEVICE_REMOVED:
>-      case DXGI_ERROR_DEVICE_RESET:
>-      case DXGI_ERROR_DRIVER_INTERNAL_ERROR:
>-      case DXGI_ERROR_NOT_CURRENTLY_AVAILABLE:
>-        return true;
>-      default:
>-        return false;
>+        case DXGI_ERROR_DEVICE_HUNG:
>+        case DXGI_ERROR_DEVICE_REMOVED:
>+        case DXGI_ERROR_DEVICE_RESET:
>+        case DXGI_ERROR_DRIVER_INTERNAL_ERROR:
>+        case DXGI_ERROR_NOT_CURRENTLY_AVAILABLE:
>+            return true;
>+        default:
>+            return false;
>     }
> }
> 
>@@ -190,7 +212,7 @@ class LazyResource : angle::NonCopyable
>     constexpr LazyResource() : mResource() {}
>     virtual ~LazyResource() {}
> 
>-    virtual gl::Error resolve(Renderer11 *renderer) = 0;
>+    virtual angle::Result resolve(d3d::Context *context, Renderer11 *renderer) = 0;
>     void reset() { mResource.reset(); }
>     GetD3D11Type<ResourceT> *get() const
>     {
>@@ -204,10 +226,11 @@ class LazyResource : angle::NonCopyable
>     LazyResource(LazyResource &&other) : mResource(std::move(other.mResource)) {}
> 
>     // Specialized in the cpp file to avoid MSVS/Clang specific code.
>-    gl::Error resolveImpl(Renderer11 *renderer,
>-                          const GetDescType<ResourceT> &desc,
>-                          GetInitDataType<ResourceT> *initData,
>-                          const char *name);
>+    angle::Result resolveImpl(d3d::Context *context,
>+                              Renderer11 *renderer,
>+                              const GetDescType<ResourceT> &desc,
>+                              GetInitDataType<ResourceT> *initData,
>+                              const char *name);
> 
>     Resource11<GetD3D11Type<ResourceT>> mResource;
> };
>@@ -219,19 +242,17 @@ class LazyShader final : public LazyResource<GetResourceTypeFromD3D11<D3D11Shade
>     // All parameters must be constexpr. Not supported in VS2013.
>     constexpr LazyShader(const BYTE *byteCode, size_t byteCodeSize, const char *name)
>         : mByteCode(byteCode, byteCodeSize), mName(name)
>-    {
>-    }
>+    {}
> 
>     constexpr LazyShader(LazyShader &&shader)
>         : LazyResource<GetResourceTypeFromD3D11<D3D11ShaderType>()>(std::move(shader)),
>           mByteCode(std::move(shader.mByteCode)),
>           mName(shader.mName)
>-    {
>-    }
>+    {}
> 
>-    gl::Error resolve(Renderer11 *renderer) override
>+    angle::Result resolve(d3d::Context *context, Renderer11 *renderer) override
>     {
>-        return this->resolveImpl(renderer, mByteCode, nullptr, mName);
>+        return this->resolveImpl(context, renderer, mByteCode, nullptr, mName);
>     }
> 
>   private:
>@@ -249,7 +270,7 @@ class LazyInputLayout final : public LazyResource<ResourceType::InputLayout>
>                     const char *debugName);
>     ~LazyInputLayout() override;
> 
>-    gl::Error resolve(Renderer11 *renderer) override;
>+    angle::Result resolve(d3d::Context *context, Renderer11 *renderer) override;
> 
>   private:
>     InputElementArray mInputDesc;
>@@ -262,7 +283,7 @@ class LazyBlendState final : public LazyResource<ResourceType::BlendState>
>   public:
>     LazyBlendState(const D3D11_BLEND_DESC &desc, const char *debugName);
> 
>-    gl::Error resolve(Renderer11 *renderer) override;
>+    angle::Result resolve(d3d::Context *context, Renderer11 *renderer) override;
> 
>   private:
>     D3D11_BLEND_DESC mDesc;
>@@ -296,6 +317,18 @@ enum ReservedConstantBufferSlot
> };
> 
> void InitConstantBufferDesc(D3D11_BUFFER_DESC *constantBufferDescription, size_t byteWidth);
>+
>+// Helper class for RAII patterning.
>+template <typename T>
>+class ScopedUnmapper final : angle::NonCopyable
>+{
>+  public:
>+    ScopedUnmapper(T *object) : mObject(object) {}
>+    ~ScopedUnmapper() { mObject->unmap(); }
>+
>+  private:
>+    T *mObject;
>+};
> }  // namespace d3d11
> 
> struct GenericData
>@@ -389,8 +422,8 @@ enum class StagingAccess
> };
> 
> bool UsePresentPathFast(const Renderer11 *renderer, const gl::FramebufferAttachment *colorbuffer);
>-bool UsePrimitiveRestartWorkaround(bool primitiveRestartFixedIndexEnabled, GLenum type);
>-bool IsStreamingIndexData(const gl::Context *context, GLenum srcType);
>+bool UsePrimitiveRestartWorkaround(bool primitiveRestartFixedIndexEnabled,
>+                                   gl::DrawElementsType type);
> 
> enum class IndexStorageType
> {
>@@ -411,21 +444,10 @@ enum class IndexStorageType
> 
> IndexStorageType ClassifyIndexStorage(const gl::State &glState,
>                                       const gl::Buffer *elementArrayBuffer,
>-                                      GLenum elementType,
>-                                      GLenum destElementType,
>-                                      unsigned int offset,
>-                                      bool *needsTranslation);
>-
>-// Used for state change notifications between buffers and vertex arrays.
>-using OnBufferDataDirtyBinding  = angle::ChannelBinding<size_t, const gl::Context *>;
>-using OnBufferDataDirtyChannel  = angle::BroadcastChannel<size_t, const gl::Context *>;
>-using OnBufferDataDirtyReceiver = angle::SignalReceiver<size_t, const gl::Context *>;
>-
>-// Used for state change notifications between RenderTarget11 and Framebuffer11.
>-using OnRenderTargetDirtyBinding  = angle::ChannelBinding<size_t, const gl::Context *>;
>-using OnRenderTargetDirtyChannel  = angle::BroadcastChannel<size_t, const gl::Context *>;
>-using OnRenderTargetDirtyReceiver = angle::SignalReceiver<size_t, const gl::Context *>;
>+                                      gl::DrawElementsType elementType,
>+                                      gl::DrawElementsType destElementType,
>+                                      unsigned int offset);
> 
> }  // namespace rx
> 
>-#endif // LIBANGLE_RENDERER_D3D_D3D11_RENDERER11_UTILS_H_
>+#endif  // LIBANGLE_RENDERER_D3D_D3D11_RENDERER11_UTILS_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/MultiplyAlpha.hlsl b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/MultiplyAlpha.hlsl
>index 0d10b8eafa7..beeb8fefb21 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/MultiplyAlpha.hlsl
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/MultiplyAlpha.hlsl
>@@ -1,5 +1,13 @@
>+//
>+// Copyright (c) 2018 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+
> Texture2D<float4> TextureF  : register(t0);
> Texture2D<uint4>  TextureUI : register(t0);
>+Texture3D<float4> TextureF_3D : register(t0);
>+Texture2DArray<float4> TextureF_2DArray : register(t0);
> 
> SamplerState Sampler        : register(s0);
> 
>@@ -8,14 +16,14 @@ SamplerState Sampler        : register(s0);
> // F: float, U: uint
> 
> // Float to float LUMA
>-float4 PS_FtoF_PM_LUMA(in float4 inPosition : SV_POSITION, in float2 inTexCoord : TEXCOORD0) : SV_TARGET0
>+float4 PS_FtoF_PM_LUMA_2D(in float4 inPosition : SV_POSITION, in float2 inTexCoord : TEXCOORD0) : SV_TARGET0
> {
>     float4 color = TextureF.Sample(Sampler, inTexCoord).rgba;
>     color.rgb = color.r * color.a;
>     color.a = 1.0f;
>     return color;
> }
>-float4 PS_FtoF_UM_LUMA(in float4 inPosition : SV_POSITION, in float2 inTexCoord : TEXCOORD0) : SV_TARGET0
>+float4 PS_FtoF_UM_LUMA_2D(in float4 inPosition : SV_POSITION, in float2 inTexCoord : TEXCOORD0) : SV_TARGET0
> {
>     float4 color = TextureF.Sample(Sampler, inTexCoord).rgba;
>     if (color.a > 0.0f)
>@@ -27,14 +35,14 @@ float4 PS_FtoF_UM_LUMA(in float4 inPosition : SV_POSITION, in float2 inTexCoord
> }
> 
> // Float to float LUMAALPHA
>-float4 PS_FtoF_PM_LUMAALPHA(in float4 inPosition : SV_POSITION, in float2 inTexCoord : TEXCOORD0) : SV_TARGET0
>+float4 PS_FtoF_PM_LUMAALPHA_2D(in float4 inPosition : SV_POSITION, in float2 inTexCoord : TEXCOORD0) : SV_TARGET0
> {
>     float4 color = TextureF.Sample(Sampler, inTexCoord).rgba;
>     color.rgb = color.r * color.a;
>     return color;
> }
> 
>-float4 PS_FtoF_UM_LUMAALPHA(in float4 inPosition : SV_POSITION, in float2 inTexCoord : TEXCOORD0) : SV_TARGET0
>+float4 PS_FtoF_UM_LUMAALPHA_2D(in float4 inPosition : SV_POSITION, in float2 inTexCoord : TEXCOORD0) : SV_TARGET0
> {
>     float4 color = TextureF.Sample(Sampler, inTexCoord).rgba;
>     if (color.a > 0.0f)
>@@ -45,14 +53,14 @@ float4 PS_FtoF_UM_LUMAALPHA(in float4 inPosition : SV_POSITION, in float2 inTexC
> }
> 
> // Float to float RGBA
>-float4 PS_FtoF_PM_RGBA(in float4 inPosition : SV_POSITION, in float2 inTexCoord : TEXCOORD0) : SV_TARGET0
>+float4 PS_FtoF_PM_RGBA_2D(in float4 inPosition : SV_POSITION, in float2 inTexCoord : TEXCOORD0) : SV_TARGET0
> {
>     float4 color = TextureF.Sample(Sampler, inTexCoord).rgba;
>     color.rgb *= color.a;
>     return color;
> }
> 
>-float4 PS_FtoF_UM_RGBA(in float4 inPosition : SV_POSITION, in float2 inTexCoord : TEXCOORD0) : SV_TARGET0
>+float4 PS_FtoF_UM_RGBA_2D(in float4 inPosition : SV_POSITION, in float2 inTexCoord : TEXCOORD0) : SV_TARGET0
> {
>     float4 color = TextureF.Sample(Sampler, inTexCoord).rgba;
>     if (color.a > 0.0f)
>@@ -63,40 +71,99 @@ float4 PS_FtoF_UM_RGBA(in float4 inPosition : SV_POSITION, in float2 inTexCoord
> }
> 
> // Float to float RGB
>-float4 PS_FtoF_PM_RGB(in float4 inPosition : SV_POSITION, in float2 inTexCoord : TEXCOORD0) : SV_TARGET0
>+float4 PS_FtoF_PM_RGB_2D(in float4 inPosition : SV_POSITION, in float2 inTexCoord : TEXCOORD0) : SV_TARGET0
>+{
>+    float4 color = TextureF.Sample(Sampler, inTexCoord).rgba;
>+    color.rgb *= color.a;
>+    color.a = 1.0f;
>+    return color;
>+}
>+
>+float4 PS_FtoF_UM_RGB_2D(in float4 inPosition : SV_POSITION, in float2 inTexCoord : TEXCOORD0) : SV_TARGET0
>+{
>+    float4 color = TextureF.Sample(Sampler, inTexCoord).rgba;
>+    if (color.a > 0.0f)
>+    {
>+        color.rgb /= color.a;
>+    }
>+    color.a = 1.0f;
>+    return color;
>+}
>+
>+float4 PS_FtoF_PM_RGBA_4444_2D(in float4 inPosition : SV_POSITION, in float2 inTexCoord : TEXCOORD0) : SV_TARGET0
>+{
>+    float4 color = TextureF.Sample(Sampler, inTexCoord).rgba;
>+    color.rgb *= color.a;
>+    color = round(color * float4(15, 15, 15, 15)) / float4(15, 15, 15, 15);
>+    return color;
>+}
>+
>+float4 PS_FtoF_UM_RGBA_4444_2D(in float4 inPosition : SV_POSITION, in float2 inTexCoord : TEXCOORD0) : SV_TARGET0
>+{
>+    float4 color = TextureF.Sample(Sampler, inTexCoord).rgba;
>+    if (color.a > 0.0f)
>+    {
>+        color.rgb /= color.a;
>+    }
>+    color = round(color * float4(15, 15, 15, 15)) / float4(15, 15, 15, 15);
>+    return color;
>+}
>+
>+float4 PS_FtoF_PM_RGB_565_2D(in float4 inPosition : SV_POSITION, in float2 inTexCoord : TEXCOORD0) : SV_TARGET0
> {
>     float4 color = TextureF.Sample(Sampler, inTexCoord).rgba;
>     color.rgb *= color.a;
>+    color.rgb = round(color.rgb * float3(31, 63, 31)) / float3(31, 63, 31);
>     color.a = 1.0f;
>     return color;
> }
> 
>-float4 PS_FtoF_UM_RGB(in float4 inPosition : SV_POSITION, in float2 inTexCoord : TEXCOORD0) : SV_TARGET0
>+float4 PS_FtoF_UM_RGB_565_2D(in float4 inPosition : SV_POSITION, in float2 inTexCoord : TEXCOORD0) : SV_TARGET0
> {
>     float4 color = TextureF.Sample(Sampler, inTexCoord).rgba;
>     if (color.a > 0.0f)
>     {
>         color.rgb /= color.a;
>     }
>+    color.rgb = round(color.rgb * float3(31, 63, 31)) / float3(31, 63, 31);
>     color.a = 1.0f;
>     return color;
> }
> 
>+float4 PS_FtoF_PM_RGBA_5551_2D(in float4 inPosition : SV_POSITION, in float2 inTexCoord : TEXCOORD0) : SV_TARGET0
>+{
>+    float4 color = TextureF.Sample(Sampler, inTexCoord).rgba;
>+    color.rgb *= color.a;
>+    color = round(color * float4(31, 31, 31, 1)) / float4(31, 31, 31, 1);
>+    return color;
>+}
>+
>+float4 PS_FtoF_UM_RGBA_5551_2D(in float4 inPosition : SV_POSITION, in float2 inTexCoord : TEXCOORD0) : SV_TARGET0
>+{
>+    float4 color = TextureF.Sample(Sampler, inTexCoord).rgba;
>+    if (color.a > 0.0f)
>+    {
>+        color.rgb /= color.a;
>+    }
>+    color = round(color * float4(31, 31, 31, 1)) / float4(31, 31, 31, 1);
>+    return color;
>+}
>+
> // Float to uint RGBA
>-uint4 PS_FtoU_PT_RGBA(in float4 inPosition : SV_POSITION, in float2 inTexCoord : TEXCOORD0) : SV_TARGET0
>+uint4 PS_FtoU_PT_RGBA_2D(in float4 inPosition : SV_POSITION, in float2 inTexCoord : TEXCOORD0) : SV_TARGET0
> {
>     float4 color = TextureF.Sample(Sampler, inTexCoord).rgba;
>     return uint4(color * 255);
> }
> 
>-uint4 PS_FtoU_PM_RGBA(in float4 inPosition : SV_POSITION, in float2 inTexCoord : TEXCOORD0) : SV_TARGET0
>+uint4 PS_FtoU_PM_RGBA_2D(in float4 inPosition : SV_POSITION, in float2 inTexCoord : TEXCOORD0) : SV_TARGET0
> {
>     float4 color = TextureF.Sample(Sampler, inTexCoord).rgba;
>     color.rgb *= color.a;
>     return uint4(color * 255);
> }
> 
>-uint4 PS_FtoU_UM_RGBA(in float4 inPosition : SV_POSITION, in float2 inTexCoord : TEXCOORD0) : SV_TARGET0
>+uint4 PS_FtoU_UM_RGBA_2D(in float4 inPosition : SV_POSITION, in float2 inTexCoord : TEXCOORD0) : SV_TARGET0
> {
>     float4 color = TextureF.Sample(Sampler, inTexCoord).rgba;
>     if (color.a > 0.0f)
>@@ -107,20 +174,20 @@ uint4 PS_FtoU_UM_RGBA(in float4 inPosition : SV_POSITION, in float2 inTexCoord :
> }
> 
> // Float to uint RGB
>-uint4 PS_FtoU_PT_RGB(in float4 inPosition : SV_POSITION, in float2 inTexCoord : TEXCOORD0) : SV_TARGET0
>+uint4 PS_FtoU_PT_RGB_2D(in float4 inPosition : SV_POSITION, in float2 inTexCoord : TEXCOORD0) : SV_TARGET0
> {
>     float4 color = TextureF.Sample(Sampler, inTexCoord).rgba;
>     return uint4(color.rgb * 255, 1);
> }
> 
>-uint4 PS_FtoU_PM_RGB(in float4 inPosition : SV_POSITION, in float2 inTexCoord : TEXCOORD0) : SV_TARGET0
>+uint4 PS_FtoU_PM_RGB_2D(in float4 inPosition : SV_POSITION, in float2 inTexCoord : TEXCOORD0) : SV_TARGET0
> {
>     float4 color = TextureF.Sample(Sampler, inTexCoord).rgba;
>     color.rgb *= color.a;
>     return uint4(color.rgb * 255, 1);
> }
> 
>-uint4 PS_FtoU_UM_RGB(in float4 inPosition : SV_POSITION, in float2 inTexCoord : TEXCOORD0) : SV_TARGET0
>+uint4 PS_FtoU_UM_RGB_2D(in float4 inPosition : SV_POSITION, in float2 inTexCoord : TEXCOORD0) : SV_TARGET0
> {
>     float4 color = TextureF.Sample(Sampler, inTexCoord).rgba;
>     if (color.a > 0.0f)
>@@ -129,3 +196,479 @@ uint4 PS_FtoU_UM_RGB(in float4 inPosition : SV_POSITION, in float2 inTexCoord :
>     }
>     return uint4(color.rgb * 255, 1);
> }
>+
>+// Texture3D
>+// Float to float LUMA
>+float4 PS_FtoF_PM_LUMA_3D(in float4 inPosition : SV_POSITION, in uint inLayer : SV_RENDERTARGETARRAYINDEX, in float3 inTexCoord : TEXCOORD) : SV_TARGET0
>+{
>+    float4 color = TextureF_3D.Sample(Sampler, inTexCoord).rgba;
>+    color.rgb = color.r * color.a;
>+    color.a = 1.0f;
>+    return color;
>+}
>+
>+float4 PS_FtoF_UM_LUMA_3D(in float4 inPosition : SV_POSITION, in uint inLayer : SV_RENDERTARGETARRAYINDEX, in float3 inTexCoord : TEXCOORD) : SV_TARGET0
>+{
>+    float4 color = TextureF_3D.Sample(Sampler, inTexCoord).rgba;
>+    if (color.a > 0.0f)
>+    {
>+        color.rgb = color.r / color.a;
>+    }
>+    color.a = 1.0f;
>+    return color;
>+}
>+
>+// Float to float LUMAALPHA
>+float4 PS_FtoF_PM_LUMAALPHA_3D(in float4 inPosition : SV_POSITION, in uint inLayer : SV_RENDERTARGETARRAYINDEX, in float3 inTexCoord : TEXCOORD) : SV_TARGET0
>+{
>+    float4 color = TextureF_3D.Sample(Sampler, inTexCoord).rgba;
>+    color.rgb = color.r * color.a;
>+    return color;
>+}
>+
>+float4 PS_FtoF_UM_LUMAALPHA_3D(in float4 inPosition : SV_POSITION, in uint inLayer : SV_RENDERTARGETARRAYINDEX, in float3 inTexCoord : TEXCOORD) : SV_TARGET0
>+{
>+    float4 color = TextureF_3D.Sample(Sampler, inTexCoord).rgba;
>+    if (color.a > 0.0f)
>+    {
>+        color.rgb = color.r / color.a;
>+    }
>+    return color;
>+}
>+
>+// Float to float RGBA
>+float4 PS_FtoF_PM_RGBA_3D(in float4 inPosition : SV_POSITION, in uint inLayer : SV_RENDERTARGETARRAYINDEX, in float3 inTexCoord : TEXCOORD) : SV_TARGET0
>+{
>+    float4 color = TextureF_3D.Sample(Sampler, inTexCoord).rgba;
>+    color.rgb *= color.a;
>+    return color;
>+}
>+
>+float4 PS_FtoF_UM_RGBA_3D(in float4 inPosition : SV_POSITION, in uint inLayer : SV_RENDERTARGETARRAYINDEX, in float3 inTexCoord : TEXCOORD) : SV_TARGET0
>+{
>+    float4 color = TextureF_3D.Sample(Sampler, inTexCoord).rgba;
>+    if (color.a > 0.0f)
>+    {
>+        color.rgb /= color.a;
>+    }
>+    return color;
>+}
>+
>+// Float to float RGB
>+float4 PS_FtoF_PM_RGB_3D(in float4 inPosition : SV_POSITION, in uint inLayer : SV_RENDERTARGETARRAYINDEX, in float3 inTexCoord : TEXCOORD) : SV_TARGET0
>+{
>+    float4 color = TextureF_3D.Sample(Sampler, inTexCoord).rgba;
>+    color.rgb *= color.a;
>+    color.a = 1.0f;
>+    return color;
>+}
>+
>+float4 PS_FtoF_UM_RGB_3D(in float4 inPosition : SV_POSITION, in uint inLayer : SV_RENDERTARGETARRAYINDEX, in float3 inTexCoord : TEXCOORD) : SV_TARGET0
>+{
>+    float4 color = TextureF_3D.Sample(Sampler, inTexCoord).rgba;
>+    if (color.a > 0.0f)
>+    {
>+        color.rgb /= color.a;
>+    }
>+    color.a = 1.0f;
>+    return color;
>+}
>+
>+float4 PS_FtoF_PM_RGBA_4444_3D(in float4 inPosition : SV_POSITION, in uint inLayer : SV_RENDERTARGETARRAYINDEX, in float3 inTexCoord : TEXCOORD) : SV_TARGET0
>+{
>+    float4 color = TextureF_3D.Sample(Sampler, inTexCoord).rgba;
>+    color.rgb *= color.a;
>+    color = round(color * float4(15, 15, 15, 15)) / float4(15, 15, 15, 15);
>+    return color;
>+}
>+
>+float4 PS_FtoF_UM_RGBA_4444_3D(in float4 inPosition : SV_POSITION, in uint inLayer : SV_RENDERTARGETARRAYINDEX, in float3 inTexCoord : TEXCOORD) : SV_TARGET0
>+{
>+    float4 color = TextureF_3D.Sample(Sampler, inTexCoord).rgba;
>+    if (color.a > 0.0f)
>+    {
>+        color.rgb /= color.a;
>+    }
>+    color = round(color * float4(15, 15, 15, 15)) / float4(15, 15, 15, 15);
>+    return color;
>+}
>+
>+float4 PS_FtoF_PM_RGB_565_3D(in float4 inPosition : SV_POSITION, in uint inLayer : SV_RENDERTARGETARRAYINDEX, in float3 inTexCoord : TEXCOORD) : SV_TARGET0
>+{
>+    float4 color = TextureF_3D.Sample(Sampler, inTexCoord).rgba;
>+    color.rgb *= color.a;
>+    color.rgb = round(color.rgb * float3(31, 63, 31)) / float3(31, 63, 31);
>+    color.a = 1.0f;
>+    return color;
>+}
>+
>+float4 PS_FtoF_UM_RGB_565_3D(in float4 inPosition : SV_POSITION, in uint inLayer : SV_RENDERTARGETARRAYINDEX, in float3 inTexCoord : TEXCOORD) : SV_TARGET0
>+{
>+    float4 color = TextureF_3D.Sample(Sampler, inTexCoord).rgba;
>+    if (color.a > 0.0f)
>+    {
>+        color.rgb /= color.a;
>+    }
>+    color.rgb = round(color.rgb * float3(31, 63, 31)) / float3(31, 63, 31);
>+    color.a = 1.0f;
>+    return color;
>+}
>+
>+float4 PS_FtoF_PM_RGBA_5551_3D(in float4 inPosition : SV_POSITION, in uint inLayer : SV_RENDERTARGETARRAYINDEX, in float3 inTexCoord : TEXCOORD) : SV_TARGET0
>+{
>+    float4 color = TextureF_3D.Sample(Sampler, inTexCoord).rgba;
>+    color.rgb *= color.a;
>+    color = round(color * float4(31, 31, 31, 1)) / float4(31, 31, 31, 1);
>+    return color;
>+}
>+
>+float4 PS_FtoF_UM_RGBA_5551_3D(in float4 inPosition : SV_POSITION, in uint inLayer : SV_RENDERTARGETARRAYINDEX, in float3 inTexCoord : TEXCOORD) : SV_TARGET0
>+{
>+    float4 color = TextureF_3D.Sample(Sampler, inTexCoord).rgba;
>+    if (color.a > 0.0f)
>+    {
>+        color.rgb /= color.a;
>+    }
>+    color = round(color * float4(31, 31, 31, 1)) / float4(31, 31, 31, 1);
>+    return color;
>+}
>+
>+// Float to uint RGBA
>+uint4 PS_FtoU_PT_RGBA_3D(in float4 inPosition : SV_POSITION, in uint inLayer : SV_RENDERTARGETARRAYINDEX, in float3 inTexCoord : TEXCOORD) : SV_TARGET0
>+{
>+    float4 color = TextureF_3D.Sample(Sampler, inTexCoord).rgba;
>+    return uint4(color * 255);
>+}
>+
>+uint4 PS_FtoU_PM_RGBA_3D(in float4 inPosition : SV_POSITION, in uint inLayer : SV_RENDERTARGETARRAYINDEX, in float3 inTexCoord : TEXCOORD) : SV_TARGET0
>+{
>+    float4 color = TextureF_3D.Sample(Sampler, inTexCoord).rgba;
>+    color.rgb *= color.a;
>+    return uint4(color * 255);
>+}
>+
>+uint4 PS_FtoU_UM_RGBA_3D(in float4 inPosition : SV_POSITION, in uint inLayer : SV_RENDERTARGETARRAYINDEX, in float3 inTexCoord : TEXCOORD) : SV_TARGET0
>+{
>+    float4 color = TextureF_3D.Sample(Sampler, inTexCoord).rgba;
>+    if (color.a > 0.0f)
>+    {
>+        color.rgb /= color.a;
>+    }
>+    return uint4(color * 255);
>+}
>+
>+// Float to uint RGB
>+uint4 PS_FtoU_PT_RGB_3D(in float4 inPosition : SV_POSITION, in uint inLayer : SV_RENDERTARGETARRAYINDEX, in float3 inTexCoord : TEXCOORD) : SV_TARGET0
>+{
>+    float4 color = TextureF_3D.Sample(Sampler, inTexCoord).rgba;
>+    return uint4(color.rgb * 255, 1);
>+}
>+
>+uint4 PS_FtoU_PM_RGB_3D(in float4 inPosition : SV_POSITION, in uint inLayer : SV_RENDERTARGETARRAYINDEX, in float3 inTexCoord : TEXCOORD) : SV_TARGET0
>+{
>+    float4 color = TextureF_3D.Sample(Sampler, inTexCoord).rgba;
>+    color.rgb *= color.a;
>+    return uint4(color.rgb * 255, 1);
>+}
>+
>+uint4 PS_FtoU_UM_RGB_3D(in float4 inPosition : SV_POSITION, in uint inLayer : SV_RENDERTARGETARRAYINDEX, in float3 inTexCoord : TEXCOORD) : SV_TARGET0
>+{
>+    float4 color = TextureF_3D.Sample(Sampler, inTexCoord).rgba;
>+    if (color.a > 0.0f)
>+    {
>+        color.rgb /= color.a;
>+    }
>+    return uint4(color.rgb * 255, 1);
>+}
>+
>+// Float to int RGBA
>+int4 PS_FtoI_PT_RGBA_3D(in float4 inPosition : SV_POSITION, in uint inLayer : SV_RENDERTARGETARRAYINDEX, in float3 inTexCoord : TEXCOORD) : SV_TARGET0
>+{
>+    float4 color = TextureF_3D.Sample(Sampler, inTexCoord).rgba;
>+    color = round(color * float4(127, 127, 127, 127)) / float4(127, 127, 127, 127);
>+    return int4(color * 127);
>+}
>+
>+int4 PS_FtoI_PM_RGBA_3D(in float4 inPosition : SV_POSITION, in uint inLayer : SV_RENDERTARGETARRAYINDEX, in float3 inTexCoord : TEXCOORD) : SV_TARGET0
>+{
>+    float4 color = TextureF_3D.Sample(Sampler, inTexCoord).rgba;
>+    color.rgb *= color.a;
>+    color = round(color * float4(127, 127, 127, 127)) / float4(127, 127, 127, 127);
>+    return int4(color * 127);
>+}
>+
>+int4 PS_FtoI_UM_RGBA_3D(in float4 inPosition : SV_POSITION, in uint inLayer : SV_RENDERTARGETARRAYINDEX, in float3 inTexCoord : TEXCOORD) : SV_TARGET0
>+{
>+    float4 color = TextureF_3D.Sample(Sampler, inTexCoord).rgba;
>+    if (color.a > 0.0f)
>+    {
>+        color.rgb /= color.a;
>+    }
>+    color = round(color * float4(127, 127, 127, 127)) / float4(127, 127, 127, 127);
>+    return int4(color * 127);
>+}
>+
>+// Float to int RGB
>+int4 PS_FtoI_PT_RGB_3D(in float4 inPosition : SV_POSITION, in uint inLayer : SV_RENDERTARGETARRAYINDEX, in float3 inTexCoord : TEXCOORD) : SV_TARGET0
>+{
>+    float4 color = TextureF_3D.Sample(Sampler, inTexCoord).rgba;
>+    color = round(color * float4(127, 127, 127, 127)) / float4(127, 127, 127, 127);
>+    return int4(color.rgb * 127, 1);
>+}
>+
>+int4 PS_FtoI_PM_RGB_3D(in float4 inPosition : SV_POSITION, in uint inLayer : SV_RENDERTARGETARRAYINDEX, in float3 inTexCoord : TEXCOORD) : SV_TARGET0
>+{
>+    float4 color = TextureF_3D.Sample(Sampler, inTexCoord).rgba;
>+    color.rgb *= color.a;
>+    color = round(color * float4(127, 127, 127, 127)) / float4(127, 127, 127, 127);
>+    return int4(color.rgb * 127, 1);
>+}
>+
>+int4 PS_FtoI_UM_RGB_3D(in float4 inPosition : SV_POSITION, in uint inLayer : SV_RENDERTARGETARRAYINDEX, in float3 inTexCoord : TEXCOORD) : SV_TARGET0
>+{
>+    float4 color = TextureF_3D.Sample(Sampler, inTexCoord).rgba;
>+    if (color.a > 0.0f)
>+    {
>+        color.rgb /= color.a;
>+    }
>+    color = round(color * float4(127, 127, 127, 127)) / float4(127, 127, 127, 127);
>+    return int4(color.rgb * 127, 1);
>+}
>+
>+// Texture2DArray
>+// Float to float LUMA
>+float4 PS_FtoF_PM_LUMA_2DArray(in float4 inPosition : SV_POSITION, in uint inLayer : SV_RENDERTARGETARRAYINDEX, in float3 inTexCoord : TEXCOORD0) : SV_TARGET0
>+{
>+    float4 color = TextureF_2DArray.Sample(Sampler, float3(inTexCoord.xy, inLayer)).rgba;
>+    color.rgb = color.r * color.a;
>+    color.a = 1.0f;
>+    return color;
>+}
>+
>+float4 PS_FtoF_UM_LUMA_2DArray(in float4 inPosition : SV_POSITION, in uint inLayer : SV_RENDERTARGETARRAYINDEX, in float3 inTexCoord : TEXCOORD0) : SV_TARGET0
>+{
>+    float4 color = TextureF_2DArray.Sample(Sampler, float3(inTexCoord.xy, inLayer)).rgba;
>+    if (color.a > 0.0f)
>+    {
>+        color.rgb = color.r / color.a;
>+    }
>+    color.a = 1.0f;
>+    return color;
>+}
>+
>+// Float to float LUMAALPHA
>+float4 PS_FtoF_PM_LUMAALPHA_2DArray(in float4 inPosition : SV_POSITION, in uint inLayer : SV_RENDERTARGETARRAYINDEX, in float3 inTexCoord : TEXCOORD0) : SV_TARGET0
>+{
>+    float4 color = TextureF_2DArray.Sample(Sampler, float3(inTexCoord.xy, inLayer)).rgba;
>+    color.rgb = color.r * color.a;
>+    return color;
>+}
>+
>+float4 PS_FtoF_UM_LUMAALPHA_2DArray(in float4 inPosition : SV_POSITION, in uint inLayer : SV_RENDERTARGETARRAYINDEX, in float3 inTexCoord : TEXCOORD0) : SV_TARGET0
>+{
>+    float4 color = TextureF_2DArray.Sample(Sampler, float3(inTexCoord.xy, inLayer)).rgba;
>+    if (color.a > 0.0f)
>+    {
>+        color.rgb = color.r / color.a;
>+    }
>+    return color;
>+}
>+
>+// Float to float RGBA
>+float4 PS_FtoF_PM_RGBA_2DArray(in float4 inPosition : SV_POSITION, in uint inLayer : SV_RENDERTARGETARRAYINDEX, in float3 inTexCoord : TEXCOORD0) : SV_TARGET0
>+{
>+    float4 color = TextureF_2DArray.Sample(Sampler, float3(inTexCoord.xy, inLayer)).rgba;
>+    color.rgb *= color.a;
>+    return color;
>+}
>+
>+float4 PS_FtoF_UM_RGBA_2DArray(in float4 inPosition : SV_POSITION, in uint inLayer : SV_RENDERTARGETARRAYINDEX, in float3 inTexCoord : TEXCOORD0) : SV_TARGET0
>+{
>+    float4 color = TextureF_2DArray.Sample(Sampler, float3(inTexCoord.xy, inLayer)).rgba;
>+    if (color.a > 0.0f)
>+    {
>+        color.rgb /= color.a;
>+    }
>+    return color;
>+}
>+
>+// Float to float RGB
>+float4 PS_FtoF_PM_RGB_2DArray(in float4 inPosition : SV_POSITION, in uint inLayer : SV_RENDERTARGETARRAYINDEX, in float3 inTexCoord : TEXCOORD0) : SV_TARGET0
>+{
>+    float4 color = TextureF_2DArray.Sample(Sampler, float3(inTexCoord.xy, inLayer)).rgba;
>+    color.rgb *= color.a;
>+    color.a = 1.0f;
>+    return color;
>+}
>+
>+float4 PS_FtoF_UM_RGB_2DArray(in float4 inPosition : SV_POSITION, in uint inLayer : SV_RENDERTARGETARRAYINDEX, in float3 inTexCoord : TEXCOORD0) : SV_TARGET0
>+{
>+    float4 color = TextureF_2DArray.Sample(Sampler, float3(inTexCoord.xy, inLayer)).rgba;
>+    if (color.a > 0.0f)
>+    {
>+        color.rgb /= color.a;
>+    }
>+    color.a = 1.0f;
>+    return color;
>+}
>+
>+float4 PS_FtoF_PM_RGBA_4444_2DArray(in float4 inPosition : SV_POSITION, in uint inLayer : SV_RENDERTARGETARRAYINDEX, in float3 inTexCoord : TEXCOORD0) : SV_TARGET0
>+{
>+    float4 color = TextureF_2DArray.Sample(Sampler, float3(inTexCoord.xy, inLayer)).rgba;
>+    color.rgb *= color.a;
>+    color = round(color * float4(15, 15, 15, 15)) / float4(15, 15, 15, 15);
>+    return color;
>+}
>+
>+float4 PS_FtoF_UM_RGBA_4444_2DArray(in float4 inPosition : SV_POSITION, in uint inLayer : SV_RENDERTARGETARRAYINDEX, in float3 inTexCoord : TEXCOORD0) : SV_TARGET0
>+{
>+    float4 color = TextureF_2DArray.Sample(Sampler, float3(inTexCoord.xy, inLayer)).rgba;
>+    if (color.a > 0.0f)
>+    {
>+        color.rgb /= color.a;
>+    }
>+    color = round(color * float4(15, 15, 15, 15)) / float4(15, 15, 15, 15);
>+    return color;
>+}
>+
>+float4 PS_FtoF_PM_RGB_565_2DArray(in float4 inPosition : SV_POSITION, in uint inLayer : SV_RENDERTARGETARRAYINDEX, in float3 inTexCoord : TEXCOORD0) : SV_TARGET0
>+{
>+    float4 color = TextureF_2DArray.Sample(Sampler, float3(inTexCoord.xy, inLayer)).rgba;
>+    color.rgb *= color.a;
>+    color.rgb = round(color.rgb * float3(31, 63, 31)) / float3(31, 63, 31);
>+    color.a = 1.0f;
>+    return color;
>+}
>+
>+float4 PS_FtoF_UM_RGB_565_2DArray(in float4 inPosition : SV_POSITION, in uint inLayer : SV_RENDERTARGETARRAYINDEX, in float3 inTexCoord : TEXCOORD0) : SV_TARGET0
>+{
>+    float4 color = TextureF_2DArray.Sample(Sampler, float3(inTexCoord.xy, inLayer)).rgba;
>+    if (color.a > 0.0f)
>+    {
>+        color.rgb /= color.a;
>+    }
>+    color.rgb = round(color.rgb * float3(31, 63, 31)) / float3(31, 63, 31);
>+    color.a = 1.0f;
>+    return color;
>+}
>+
>+float4 PS_FtoF_PM_RGBA_5551_2DArray(in float4 inPosition : SV_POSITION, in uint inLayer : SV_RENDERTARGETARRAYINDEX, in float3 inTexCoord : TEXCOORD0) : SV_TARGET0
>+{
>+    float4 color = TextureF_2DArray.Sample(Sampler, float3(inTexCoord.xy, inLayer)).rgba;
>+    color.rgb *= color.a;
>+    color = round(color * float4(31, 31, 31, 1)) / float4(31, 31, 31, 1);
>+    return color;
>+}
>+
>+float4 PS_FtoF_UM_RGBA_5551_2DArray(in float4 inPosition : SV_POSITION, in uint inLayer : SV_RENDERTARGETARRAYINDEX, in float3 inTexCoord : TEXCOORD0) : SV_TARGET0
>+{
>+    float4 color = TextureF_2DArray.Sample(Sampler, float3(inTexCoord.xy, inLayer)).rgba;
>+    if (color.a > 0.0f)
>+    {
>+        color.rgb /= color.a;
>+    }
>+    color = round(color * float4(31, 31, 31, 1)) / float4(31, 31, 31, 1);
>+    return color;
>+}
>+
>+// Float to uint RGBA
>+uint4 PS_FtoU_PT_RGBA_2DArray(in float4 inPosition : SV_POSITION, in uint inLayer : SV_RENDERTARGETARRAYINDEX, in float3 inTexCoord : TEXCOORD0) : SV_TARGET0
>+{
>+    float4 color = TextureF_2DArray.Sample(Sampler, float3(inTexCoord.xy, inLayer)).rgba;
>+    return uint4(color * 255);
>+}
>+
>+uint4 PS_FtoU_PM_RGBA_2DArray(in float4 inPosition : SV_POSITION, in uint inLayer : SV_RENDERTARGETARRAYINDEX, in float3 inTexCoord : TEXCOORD0) : SV_TARGET0
>+{
>+    float4 color = TextureF_2DArray.Sample(Sampler, float3(inTexCoord.xy, inLayer)).rgba;
>+    color.rgb *= color.a;
>+    return uint4(color * 255);
>+}
>+
>+uint4 PS_FtoU_UM_RGBA_2DArray(in float4 inPosition : SV_POSITION, in uint inLayer : SV_RENDERTARGETARRAYINDEX, in float3 inTexCoord : TEXCOORD0) : SV_TARGET0
>+{
>+    float4 color = TextureF_2DArray.Sample(Sampler, float3(inTexCoord.xy, inLayer)).rgba;
>+    if (color.a > 0.0f)
>+    {
>+        color.rgb /= color.a;
>+    }
>+    return uint4(color * 255);
>+}
>+
>+// Float to uint RGB
>+uint4 PS_FtoU_PT_RGB_2DArray(in float4 inPosition : SV_POSITION, in uint inLayer : SV_RENDERTARGETARRAYINDEX, in float3 inTexCoord : TEXCOORD0) : SV_TARGET0
>+{
>+    float4 color = TextureF_2DArray.Sample(Sampler, float3(inTexCoord.xy, inLayer)).rgba;
>+    return uint4(color.rgb * 255, 1);
>+}
>+
>+uint4 PS_FtoU_PM_RGB_2DArray(in float4 inPosition : SV_POSITION, in uint inLayer : SV_RENDERTARGETARRAYINDEX, in float3 inTexCoord : TEXCOORD0) : SV_TARGET0
>+{
>+    float4 color = TextureF_2DArray.Sample(Sampler, float3(inTexCoord.xy, inLayer)).rgba;
>+    color.rgb *= color.a;
>+    return uint4(color.rgb * 255, 1);
>+}
>+
>+uint4 PS_FtoU_UM_RGB_2DArray(in float4 inPosition : SV_POSITION, in uint inLayer : SV_RENDERTARGETARRAYINDEX, in float3 inTexCoord : TEXCOORD0) : SV_TARGET0
>+{
>+    float4 color = TextureF_2DArray.Sample(Sampler, float3(inTexCoord.xy, inLayer)).rgba;
>+    if (color.a > 0.0f)
>+    {
>+        color.rgb /= color.a;
>+    }
>+    return uint4(color.rgb * 255, 1);
>+}
>+
>+// Float to int RGBA
>+int4 PS_FtoI_PT_RGBA_2DArray(in float4 inPosition : SV_POSITION, in uint inLayer : SV_RENDERTARGETARRAYINDEX, in float3 inTexCoord : TEXCOORD0) : SV_TARGET0
>+{
>+    float4 color = TextureF_2DArray.Sample(Sampler, float3(inTexCoord.xy, inLayer)).rgba;
>+    color = round(color * float4(127, 127, 127, 127)) / float4(127, 127, 127, 127);
>+    return int4(color * 127);
>+}
>+
>+int4 PS_FtoI_PM_RGBA_2DArray(in float4 inPosition : SV_POSITION, in uint inLayer : SV_RENDERTARGETARRAYINDEX, in float3 inTexCoord : TEXCOORD0) : SV_TARGET0
>+{
>+    float4 color = TextureF_2DArray.Sample(Sampler, float3(inTexCoord.xy, inLayer)).rgba;
>+    color.rgb *= color.a;
>+    color = round(color * float4(127, 127, 127, 127)) / float4(127, 127, 127, 127);
>+    return int4(color * 127);
>+}
>+
>+int4 PS_FtoI_UM_RGBA_2DArray(in float4 inPosition : SV_POSITION, in uint inLayer : SV_RENDERTARGETARRAYINDEX, in float3 inTexCoord : TEXCOORD0) : SV_TARGET0
>+{
>+    float4 color = TextureF_2DArray.Sample(Sampler, float3(inTexCoord.xy, inLayer)).rgba;
>+    if (color.a > 0.0f)
>+    {
>+        color.rgb /= color.a;
>+    }
>+    color = round(color * float4(127, 127, 127, 127)) / float4(127, 127, 127, 127);
>+    return int4(color * 127);
>+}
>+
>+// Float to int RGB
>+int4 PS_FtoI_PT_RGB_2DArray(in float4 inPosition : SV_POSITION, in uint inLayer : SV_RENDERTARGETARRAYINDEX, in float3 inTexCoord : TEXCOORD0) : SV_TARGET0
>+{
>+    float4 color = TextureF_2DArray.Sample(Sampler, float3(inTexCoord.xy, inLayer)).rgba;
>+    color = round(color * float4(127, 127, 127, 127)) / float4(127, 127, 127, 127);
>+    return int4(color.rgb * 127, 1);
>+}
>+
>+int4 PS_FtoI_PM_RGB_2DArray(in float4 inPosition : SV_POSITION, in uint inLayer : SV_RENDERTARGETARRAYINDEX, in float3 inTexCoord : TEXCOORD0) : SV_TARGET0
>+{
>+    float4 color = TextureF_2DArray.Sample(Sampler, float3(inTexCoord.xy, inLayer)).rgba;
>+    color.rgb *= color.a;
>+    color = round(color * float4(127, 127, 127, 127)) / float4(127, 127, 127, 127);
>+    return int4(color.rgb * 127, 1);
>+}
>+
>+int4 PS_FtoI_UM_RGB_2DArray(in float4 inPosition : SV_POSITION, in uint inLayer : SV_RENDERTARGETARRAYINDEX, in float3 inTexCoord : TEXCOORD0) : SV_TARGET0
>+{
>+    float4 color = TextureF_2DArray.Sample(Sampler, float3(inTexCoord.xy, inLayer)).rgba;
>+    if (color.a > 0.0f)
>+    {
>+        color.rgb /= color.a;
>+    }
>+    color = round(color * float4(127, 127, 127, 127)) / float4(127, 127, 127, 127);
>+    return int4(color.rgb * 127, 1);
>+}
>\ No newline at end of file
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/Passthrough2D11.hlsl b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/Passthrough2D11.hlsl
>index 0b1a5ad169a..2a3fb172ea9 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/Passthrough2D11.hlsl
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/Passthrough2D11.hlsl
>@@ -120,3 +120,18 @@ float4 PS_PassthroughLumAlpha2D(in float4 inPosition : SV_POSITION, in float2 in
> {
>     return TextureF.Sample(Sampler, inTexCoord).rrra;
> }
>+
>+float4 PS_PassthroughRGBA2D_4444(in float4 inPosition : SV_POSITION, in float2 inTexCoord : TEXCOORD0) : SV_TARGET0
>+{
>+    return round(TextureF.Sample(Sampler, inTexCoord) * float4(15, 15, 15, 15)) / float4(15, 15, 15, 15);
>+}
>+
>+float4 PS_PassthroughRGB2D_565(in float4 inPosition : SV_POSITION, in float2 inTexCoord : TEXCOORD0) : SV_TARGET0
>+{
>+    return float4(round(TextureF.Sample(Sampler, inTexCoord).rgb * float3(31, 63, 31)) / float3(31, 63, 31), 1.0f);
>+}
>+
>+float4 PS_PassthroughRGBA2D_5551(in float4 inPosition : SV_POSITION, in float2 inTexCoord : TEXCOORD0) : SV_TARGET0
>+{
>+    return round(TextureF.Sample(Sampler, inTexCoord) * float4(31, 31, 31, 1)) / float4(31, 31, 31, 1);
>+}
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/Passthrough2DArray11.hlsl b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/Passthrough2DArray11.hlsl
>new file mode 100644
>index 00000000000..3f5bcf22c47
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/Passthrough2DArray11.hlsl
>@@ -0,0 +1,136 @@
>+//
>+// Copyright (c) 2018 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+
>+Texture2DArray<float4> TextureF  : register(t0);
>+Texture2DArray<uint4>  TextureUI : register(t0);
>+Texture2DArray<int4>   TextureI  : register(t0);
>+
>+SamplerState      Sampler   : register(s0);
>+
>+float4 PS_PassthroughRGBA2DArray(in float4 inPosition : SV_POSITION, in uint inLayer : SV_RENDERTARGETARRAYINDEX, in float3 inTexCoord : TEXCOORD0) : SV_TARGET0
>+{
>+    return TextureF.Sample(Sampler, float3(inTexCoord.xy, inLayer)).rgba;
>+}
>+
>+uint4 PS_PassthroughRGBA2DArrayUI(in float4 inPosition : SV_POSITION, in uint inLayer : SV_RENDERTARGETARRAYINDEX, in float3 inTexCoord : TEXCOORD0) : SV_TARGET0
>+{
>+    uint3 size;
>+    TextureUI.GetDimensions(size.x, size.y, size.z);
>+
>+    int4 location = int4(size.xy * inTexCoord.xy, inLayer, 0);
>+
>+    return TextureUI.Load(location).rgba;
>+}
>+
>+int4 PS_PassthroughRGBA2DArrayI(in float4 inPosition : SV_POSITION, in uint inLayer : SV_RENDERTARGETARRAYINDEX, in float3 inTexCoord : TEXCOORD0) : SV_TARGET0
>+{
>+    uint3 size;
>+    TextureI.GetDimensions(size.x, size.y, size.z);
>+
>+    int4 location = int4(size.xy * inTexCoord.xy, inLayer, 0);
>+
>+    return TextureI.Load(location).rgba;
>+}
>+
>+float4 PS_PassthroughRGB2DArray(in float4 inPosition : SV_POSITION, in uint inLayer : SV_RENDERTARGETARRAYINDEX, in float3 inTexCoord : TEXCOORD0) : SV_TARGET0
>+{
>+    return float4(TextureF.Sample(Sampler, float3(inTexCoord.xy, inLayer)).rgb, 1.0f);
>+}
>+
>+uint4 PS_PassthroughRGB2DArrayUI(in float4 inPosition : SV_POSITION, in uint inLayer : SV_RENDERTARGETARRAYINDEX, in float3 inTexCoord : TEXCOORD0) : SV_TARGET0
>+{
>+    uint3 size;
>+    TextureUI.GetDimensions(size.x, size.y, size.z);
>+
>+    int4 location = int4(size.xy * inTexCoord.xy, inLayer, 0);
>+
>+    return uint4(TextureUI.Load(location).rgb, 1.0f);
>+}
>+
>+int4 PS_PassthroughRGB2DArrayI(in float4 inPosition : SV_POSITION, in uint inLayer : SV_RENDERTARGETARRAYINDEX, in float3 inTexCoord : TEXCOORD0) : SV_TARGET0
>+{
>+    uint3 size;
>+    TextureI.GetDimensions(size.x, size.y, size.z);
>+
>+    int4 location = int4(size.xy * inTexCoord.xy, inLayer, 0);
>+
>+    return int4(TextureI.Load(location).rgb, 1.0f);
>+}
>+
>+float4 PS_PassthroughRG2DArray(in float4 inPosition : SV_POSITION, in uint inLayer : SV_RENDERTARGETARRAYINDEX, in float3 inTexCoord : TEXCOORD0) : SV_TARGET0
>+{
>+    return float4(TextureF.Sample(Sampler, float3(inTexCoord.xy, inLayer)).rg, 0.0f, 1.0f);
>+}
>+
>+uint4 PS_PassthroughRG2DArrayUI(in float4 inPosition : SV_POSITION, in uint inLayer : SV_RENDERTARGETARRAYINDEX, in float3 inTexCoord : TEXCOORD0) : SV_TARGET0
>+{
>+    uint3 size;
>+    TextureUI.GetDimensions(size.x, size.y, size.z);
>+
>+    int4 location = int4(size.xy * inTexCoord.xy, inLayer, 0);
>+
>+    return uint4(TextureUI.Load(location).rg, 0.0f, 1.0f);
>+}
>+
>+int4 PS_PassthroughRG2DArrayI(in float4 inPosition : SV_POSITION, in uint inLayer : SV_RENDERTARGETARRAYINDEX, in float3 inTexCoord : TEXCOORD0) : SV_TARGET0
>+{
>+    uint3 size;
>+    TextureI.GetDimensions(size.x, size.y, size.z);
>+
>+    int4 location = int4(size.xy * inTexCoord.xy, inLayer, 0);
>+
>+    return int4(TextureI.Load(location).rg, 0.0f, 1.0f);
>+}
>+
>+float4 PS_PassthroughR2DArray(in float4 inPosition : SV_POSITION, in uint inLayer : SV_RENDERTARGETARRAYINDEX, in float3 inTexCoord : TEXCOORD0) : SV_TARGET0
>+{
>+    return float4(TextureF.Sample(Sampler, float3(inTexCoord.xy, inLayer)).r, 0.0f, 0.0f, 1.0f);
>+}
>+
>+uint4 PS_PassthroughR2DArrayUI(in float4 inPosition : SV_POSITION, in uint inLayer : SV_RENDERTARGETARRAYINDEX, in float3 inTexCoord : TEXCOORD0) : SV_TARGET0
>+{
>+    uint3 size;
>+    TextureUI.GetDimensions(size.x, size.y, size.z);
>+
>+    int4 location = int4(size.xy * inTexCoord.xy, inLayer, 0);
>+
>+    return uint4(TextureUI.Load(location).r, 0.0f, 0.0f, 1.0f);
>+}
>+
>+int4 PS_PassthroughR2DArrayI(in float4 inPosition : SV_POSITION, in uint inLayer : SV_RENDERTARGETARRAYINDEX, in float3 inTexCoord : TEXCOORD0) : SV_TARGET0
>+{
>+    uint3 size;
>+    TextureI.GetDimensions(size.x, size.y, size.z);
>+
>+    int4 location = int4(size.xy * inTexCoord.xy, inLayer, 0);
>+
>+    return int4(TextureI.Load(location).r, 0.0f, 0.0f, 1.0f);
>+}
>+
>+float4 PS_PassthroughLum2DArray(in float4 inPosition : SV_POSITION, in uint inLayer : SV_RENDERTARGETARRAYINDEX, in float3 inTexCoord : TEXCOORD0) : SV_TARGET0
>+{
>+    return float4(TextureF.Sample(Sampler, float3(inTexCoord.xy, inLayer)).rrr, 1.0f);
>+}
>+
>+float4 PS_PassthroughLumAlpha2DArray(in float4 inPosition : SV_POSITION, in uint inLayer : SV_RENDERTARGETARRAYINDEX, in float3 inTexCoord : TEXCOORD0) : SV_TARGET0
>+{
>+    return TextureF.Sample(Sampler, float3(inTexCoord.xy, inLayer)).rrra;
>+}
>+
>+float4 PS_PassthroughRGBA2DArray_4444(in float4 inPosition : SV_POSITION, in uint inLayer : SV_RENDERTARGETARRAYINDEX, in float3 inTexCoord : TEXCOORD0) : SV_TARGET0
>+{
>+    return round(TextureF.Sample(Sampler, float3(inTexCoord.xy, inLayer)) * float4(15, 15, 15, 15)) / float4(15, 15, 15, 15);
>+}
>+
>+float4 PS_PassthroughRGB2DArray_565(in float4 inPosition : SV_POSITION, in uint inLayer : SV_RENDERTARGETARRAYINDEX, in float3 inTexCoord : TEXCOORD0) : SV_TARGET0
>+{
>+    return float4(round(TextureF.Sample(Sampler, float3(inTexCoord.xy, inLayer)).rgb * float3(31, 63, 31)) / float3(31, 63, 31), 1.0f);
>+}
>+
>+float4 PS_PassthroughRGBA2DArray_5551(in float4 inPosition : SV_POSITION, in uint inLayer : SV_RENDERTARGETARRAYINDEX, in float3 inTexCoord : TEXCOORD0) : SV_TARGET0
>+{
>+    return round(TextureF.Sample(Sampler, float3(inTexCoord.xy, inLayer)) * float4(31, 31, 31, 1)) / float4(31, 31, 31, 1);
>+}
>\ No newline at end of file
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/Passthrough3D11.hlsl b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/Passthrough3D11.hlsl
>index c23c9032ec2..a0bbdeeeb69 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/Passthrough3D11.hlsl
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/Passthrough3D11.hlsl
>@@ -1,3 +1,9 @@
>+//
>+// Copyright (c) 2018 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+
> Texture3D<float4> TextureF  : register(t0);
> Texture3D<uint4>  TextureUI : register(t0);
> Texture3D<int4>   TextureI  : register(t0);
>@@ -144,3 +150,25 @@ float4 PS_PassthroughLumAlpha3D(GS_OUTPUT input) : SV_TARGET0
> {
>     return TextureF.Sample(Sampler, input.TexCoord).rrra;
> }
>+
>+float4 PS_PassthroughRGBA3D_4444(GS_OUTPUT input) : SV_TARGET0
>+{
>+    return round(TextureF.Sample(Sampler, input.TexCoord) * float4(15, 15, 15, 15)) / float4(15, 15, 15, 15);
>+}
>+
>+float4 PS_PassthroughRGB3D_565(GS_OUTPUT input) : SV_TARGET0
>+{
>+    return float4(round(TextureF.Sample(Sampler, input.TexCoord).rgb * float3(31, 63, 31)) / float3(31, 63, 31), 1.0f);
>+}
>+
>+float4 PS_PassthroughRGBA3D_5551(GS_OUTPUT input) : SV_TARGET0
>+{
>+    return round(TextureF.Sample(Sampler, input.TexCoord) * float4(31, 31, 31, 1)) / float4(31, 31, 31, 1);
>+}
>+
>+float4 PS_PassthroughRGBA3D_2101010(GS_OUTPUT input) : SV_TARGET0
>+{
>+    return round(TextureF.Sample(Sampler, input.TexCoord) * float4(31, 31, 31, 1)) / float4(31, 31, 31, 1);
>+}
>+
>+
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/ResolveColor.hlsl b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/ResolveColor.hlsl
>new file mode 100644
>index 00000000000..2e8d560d3a6
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/ResolveColor.hlsl
>@@ -0,0 +1,23 @@
>+Texture2DMS<float4> TextureF_MS : register(t0);
>+
>+// VS_ResolveColor2D: not needed, we reuse VS_Passthrough2D
>+
>+float4 PS_ResolveColor2D(in float4 inPosition : SV_POSITION, in float2 inTexCoord : TEXCORD0) : SV_TARGET0
>+{
>+    uint width, height, samples;
>+    TextureF_MS.GetDimensions(width, height, samples);
>+    uint2 coord = uint2(inTexCoord.x * float(width), inTexCoord.y * float(height));
>+    float4 color = float4(0.0, 0.0, 0.0, 0.0);
>+    for (uint s = 0; s < samples; s++)
>+    {
>+        color += TextureF_MS.Load(coord, s).rgba;
>+    }
>+    return color / float(samples);
>+
>+    // Potential performance improvement: We could remove the TextureF_MS.GetDimensions() call
>+    // and pass width, height, and invSamples via constants to the shader. This would allow us
>+    // to calculate the final texture coordinates in the vertex shader already and instead of
>+    // dividing by samples we could multiply by invSamples at the end.
>+    // But maybe graphics drivers even do these optimizations automatically after the texture
>+    // metrics are known at rendering time?
>+}
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/buffertotexture11_gs.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/buffertotexture11_gs.h
>index 71a2fec64cd..dbc216ae04a 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/buffertotexture11_gs.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/buffertotexture11_gs.h
>@@ -1,25 +1,29 @@
> #if 0
> //
>-// Generated by Microsoft (R) HLSL Shader Compiler 6.3.9600.16384
>+// Generated by Microsoft (R) HLSL Shader Compiler 9.29.952.3111
>+//
>+//
>+//   fxc /nologo /E GS_BufferToTexture /T gs_4_0 /Fh
>+//    compiled/buffertotexture11_gs.h BufferToTexture11.hlsl
> //
> //
> //
> // Input signature:
> //
>-// Name                 Index   Mask Register SysValue  Format   Used
>-// -------------------- ----- ------ -------- -------- ------- ------
>-// SV_Position              0   xyzw        0      POS   float   xyzw
>-// TEXCOORD                 0   x           1     NONE    uint   x   
>-// LAYER                    0    y          1     NONE    uint    y  
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_Position              0   xyzw        0      POS  float   xyzw
>+// TEXCOORD                 0   x           1     NONE   uint   x   
>+// LAYER                    0    y          1     NONE   uint    y  
> //
> //
> // Output signature:
> //
>-// Name                 Index   Mask Register SysValue  Format   Used
>-// -------------------- ----- ------ -------- -------- ------- ------
>-// SV_Position              0   xyzw        0      POS   float   xyzw
>-// TEXCOORD                 0   x           1     NONE    uint   x   
>-// SV_RenderTargetArrayIndex     0    y          1  RTINDEX    uint    y  
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_Position              0   xyzw        0      POS  float   xyzw
>+// TEXCOORD                 0   x           1     NONE   uint   x   
>+// SV_RenderTargetArrayIndex     0    y          1  RTINDEX   uint    y  
> //
> gs_4_0
> dcl_input_siv v[1][0].xyzw, position
>@@ -39,127 +43,43 @@ ret
> // Approximately 5 instruction slots used
> #endif
> 
>-const BYTE g_GS_BufferToTexture[] =
>-{
>-     68,  88,  66,  67,  79, 166, 
>-    191,  97,  16,  63, 142, 167, 
>-    231,  92, 119,  74,  86,   7, 
>-     58, 165,   1,   0,   0,   0, 
>-    212,   2,   0,   0,   5,   0, 
>-      0,   0,  52,   0,   0,   0, 
>-    140,   0,   0,   0,   0,   1, 
>-      0,   0, 136,   1,   0,   0, 
>-     88,   2,   0,   0,  82,  68, 
>-     69,  70,  80,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-     28,   0,   0,   0,   0,   4, 
>-     83,  71,   0,   1,   0,   0, 
>-     28,   0,   0,   0,  77, 105, 
>-     99, 114, 111, 115, 111, 102, 
>-    116,  32,  40,  82,  41,  32, 
>-     72,  76,  83,  76,  32,  83, 
>-    104,  97, 100, 101, 114,  32, 
>-     67, 111, 109, 112, 105, 108, 
>-    101, 114,  32,  54,  46,  51, 
>-     46,  57,  54,  48,  48,  46, 
>-     49,  54,  51,  56,  52,   0, 
>-    171, 171,  73,  83,  71,  78, 
>-    108,   0,   0,   0,   3,   0, 
>-      0,   0,   8,   0,   0,   0, 
>-     80,   0,   0,   0,   0,   0, 
>-      0,   0,   1,   0,   0,   0, 
>-      3,   0,   0,   0,   0,   0, 
>-      0,   0,  15,  15,   0,   0, 
>-     92,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      1,   0,   0,   0,   1,   0, 
>-      0,   0,   1,   1,   0,   0, 
>-    101,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      1,   0,   0,   0,   1,   0, 
>-      0,   0,   2,   2,   0,   0, 
>-     83,  86,  95,  80, 111, 115, 
>-    105, 116, 105, 111, 110,   0, 
>-     84,  69,  88,  67,  79,  79, 
>-     82,  68,   0,  76,  65,  89, 
>-     69,  82,   0, 171,  79,  83, 
>-     71,  78, 128,   0,   0,   0, 
>-      3,   0,   0,   0,   8,   0, 
>-      0,   0,  80,   0,   0,   0, 
>-      0,   0,   0,   0,   1,   0, 
>-      0,   0,   3,   0,   0,   0, 
>-      0,   0,   0,   0,  15,   0, 
>-      0,   0,  92,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   1,   0,   0,   0, 
>-      1,   0,   0,   0,   1,  14, 
>-      0,   0, 101,   0,   0,   0, 
>-      0,   0,   0,   0,   4,   0, 
>-      0,   0,   1,   0,   0,   0, 
>-      1,   0,   0,   0,   2,  13, 
>-      0,   0,  83,  86,  95,  80, 
>-    111, 115, 105, 116, 105, 111, 
>-    110,   0,  84,  69,  88,  67, 
>-     79,  79,  82,  68,   0,  83, 
>-     86,  95,  82, 101, 110, 100, 
>-    101, 114,  84,  97, 114, 103, 
>-    101, 116,  65, 114, 114,  97, 
>-    121,  73, 110, 100, 101, 120, 
>-      0, 171,  83,  72,  68,  82, 
>-    200,   0,   0,   0,  64,   0, 
>-      2,   0,  50,   0,   0,   0, 
>-     97,   0,   0,   5, 242,  16, 
>-     32,   0,   1,   0,   0,   0, 
>-      0,   0,   0,   0,   1,   0, 
>-      0,   0,  95,   0,   0,   4, 
>-     18,  16,  32,   0,   1,   0, 
>-      0,   0,   1,   0,   0,   0, 
>-     95,   0,   0,   4,  34,  16, 
>-     32,   0,   1,   0,   0,   0, 
>-      1,   0,   0,   0,  93,   8, 
>-      0,   1,  92,   8,   0,   1, 
>-    103,   0,   0,   4, 242,  32, 
>-     16,   0,   0,   0,   0,   0, 
>-      1,   0,   0,   0, 101,   0, 
>-      0,   3,  18,  32,  16,   0, 
>-      1,   0,   0,   0, 103,   0, 
>-      0,   4,  34,  32,  16,   0, 
>-      1,   0,   0,   0,   4,   0, 
>-      0,   0,  94,   0,   0,   2, 
>-      1,   0,   0,   0,  54,   0, 
>-      0,   6, 242,  32,  16,   0, 
>-      0,   0,   0,   0,  70,  30, 
>-     32,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,  54,   0, 
>-      0,   6,  18,  32,  16,   0, 
>-      1,   0,   0,   0,  10,  16, 
>-     32,   0,   0,   0,   0,   0, 
>-      1,   0,   0,   0,  54,   0, 
>-      0,   6,  34,  32,  16,   0, 
>-      1,   0,   0,   0,  26,  16, 
>-     32,   0,   0,   0,   0,   0, 
>-      1,   0,   0,   0,  19,   0, 
>-      0,   1,  62,   0,   0,   1, 
>-     83,  84,  65,  84, 116,   0, 
>-      0,   0,   5,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   6,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      1,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      1,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   1,   0, 
>-      0,   0,   1,   0,   0,   0, 
>-      1,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0
>-};
>+const BYTE g_GS_BufferToTexture[] = {
>+    68,  88,  66,  67,  253, 178, 132, 190, 125, 118, 185, 34,  196, 114, 214, 207, 219, 137, 140,
>+    138, 1,   0,   0,   0,   212, 2,   0,   0,   5,   0,   0,   0,   52,  0,   0,   0,   140, 0,
>+    0,   0,   0,   1,   0,   0,   136, 1,   0,   0,   88,  2,   0,   0,   82,  68,  69,  70,  80,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   28,  0,   0,   0,
>+    0,   4,   83,  71,  0,   1,   0,   0,   28,  0,   0,   0,   77,  105, 99,  114, 111, 115, 111,
>+    102, 116, 32,  40,  82,  41,  32,  72,  76,  83,  76,  32,  83,  104, 97,  100, 101, 114, 32,
>+    67,  111, 109, 112, 105, 108, 101, 114, 32,  57,  46,  50,  57,  46,  57,  53,  50,  46,  51,
>+    49,  49,  49,  0,   171, 171, 171, 73,  83,  71,  78,  108, 0,   0,   0,   3,   0,   0,   0,
>+    8,   0,   0,   0,   80,  0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   3,   0,   0,
>+    0,   0,   0,   0,   0,   15,  15,  0,   0,   92,  0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   1,   0,   0,   0,   1,   0,   0,   0,   1,   1,   0,   0,   101, 0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   1,   0,   0,   0,   2,   2,   0,   0,
>+    83,  86,  95,  80,  111, 115, 105, 116, 105, 111, 110, 0,   84,  69,  88,  67,  79,  79,  82,
>+    68,  0,   76,  65,  89,  69,  82,  0,   171, 79,  83,  71,  78,  128, 0,   0,   0,   3,   0,
>+    0,   0,   8,   0,   0,   0,   80,  0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   3,
>+    0,   0,   0,   0,   0,   0,   0,   15,  0,   0,   0,   92,  0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   1,   0,   0,   0,   1,   0,   0,   0,   1,   14,  0,   0,   101, 0,   0,
>+    0,   0,   0,   0,   0,   4,   0,   0,   0,   1,   0,   0,   0,   1,   0,   0,   0,   2,   13,
>+    0,   0,   83,  86,  95,  80,  111, 115, 105, 116, 105, 111, 110, 0,   84,  69,  88,  67,  79,
>+    79,  82,  68,  0,   83,  86,  95,  82,  101, 110, 100, 101, 114, 84,  97,  114, 103, 101, 116,
>+    65,  114, 114, 97,  121, 73,  110, 100, 101, 120, 0,   171, 83,  72,  68,  82,  200, 0,   0,
>+    0,   64,  0,   2,   0,   50,  0,   0,   0,   97,  0,   0,   5,   242, 16,  32,  0,   1,   0,
>+    0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   95,  0,   0,   4,   18,  16,  32,  0,   1,
>+    0,   0,   0,   1,   0,   0,   0,   95,  0,   0,   4,   34,  16,  32,  0,   1,   0,   0,   0,
>+    1,   0,   0,   0,   93,  8,   0,   1,   92,  8,   0,   1,   103, 0,   0,   4,   242, 32,  16,
>+    0,   0,   0,   0,   0,   1,   0,   0,   0,   101, 0,   0,   3,   18,  32,  16,  0,   1,   0,
>+    0,   0,   103, 0,   0,   4,   34,  32,  16,  0,   1,   0,   0,   0,   4,   0,   0,   0,   94,
>+    0,   0,   2,   1,   0,   0,   0,   54,  0,   0,   6,   242, 32,  16,  0,   0,   0,   0,   0,
>+    70,  30,  32,  0,   0,   0,   0,   0,   0,   0,   0,   0,   54,  0,   0,   6,   18,  32,  16,
>+    0,   1,   0,   0,   0,   10,  16,  32,  0,   0,   0,   0,   0,   1,   0,   0,   0,   54,  0,
>+    0,   6,   34,  32,  16,  0,   1,   0,   0,   0,   26,  16,  32,  0,   0,   0,   0,   0,   1,
>+    0,   0,   0,   19,  0,   0,   1,   62,  0,   0,   1,   83,  84,  65,  84,  116, 0,   0,   0,
>+    5,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   6,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,
>+    0,   1,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0};
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/buffertotexture11_ps_4f.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/buffertotexture11_ps_4f.h
>index cfc0c3faa25..ccb8a989e50 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/buffertotexture11_ps_4f.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/buffertotexture11_ps_4f.h
>@@ -1,6 +1,10 @@
> #if 0
> //
>-// Generated by Microsoft (R) HLSL Shader Compiler 6.3.9600.16384
>+// Generated by Microsoft (R) HLSL Shader Compiler 9.29.952.3111
>+//
>+//
>+//   fxc /nologo /E PS_BufferToTexture_4F /T ps_4_0 /Fh
>+//    compiled/buffertotexture11_ps_4f.h BufferToTexture11.hlsl
> //
> //
> // Buffer Definitions: 
>@@ -32,17 +36,17 @@
> //
> // Input signature:
> //
>-// Name                 Index   Mask Register SysValue  Format   Used
>-// -------------------- ----- ------ -------- -------- ------- ------
>-// SV_Position              0   xyzw        0      POS   float       
>-// TEXCOORD                 0   x           1     NONE    uint   x   
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_Position              0   xyzw        0      POS  float       
>+// TEXCOORD                 0   x           1     NONE   uint   x   
> //
> //
> // Output signature:
> //
>-// Name                 Index   Mask Register SysValue  Format   Used
>-// -------------------- ----- ------ -------- -------- ------- ------
>-// SV_Target                0   xyzw        0   TARGET   float   xyzw
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_Target                0   xyzw        0   TARGET  float   xyzw
> //
> ps_4_0
> dcl_constantbuffer cb0[1], immediateIndexed
>@@ -54,176 +58,58 @@ ret
> // Approximately 2 instruction slots used
> #endif
> 
>-const BYTE g_PS_BufferToTexture_4F[] =
>-{
>-     68,  88,  66,  67, 176,  15, 
>-     76, 123, 100,  38, 152,  23, 
>-    150,  99, 165, 184, 222, 157, 
>-    235,  80,   1,   0,   0,   0, 
>-    252,   3,   0,   0,   5,   0, 
>-      0,   0,  52,   0,   0,   0, 
>-    140,   2,   0,   0, 228,   2, 
>-      0,   0,  24,   3,   0,   0, 
>-    128,   3,   0,   0,  82,  68, 
>-     69,  70,  80,   2,   0,   0, 
>-      1,   0,   0,   0, 120,   0, 
>-      0,   0,   2,   0,   0,   0, 
>-     28,   0,   0,   0,   0,   4, 
>-    255, 255,   0,   1,   0,   0, 
>-     28,   2,   0,   0,  92,   0, 
>-      0,   0,   2,   0,   0,   0, 
>-      5,   0,   0,   0,   1,   0, 
>-      0,   0, 255, 255, 255, 255, 
>-      0,   0,   0,   0,   1,   0, 
>-      0,   0,  13,   0,   0,   0, 
>-    101,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      1,   0,   0,   0,   1,   0, 
>-      0,   0,  66, 117, 102, 102, 
>-    101, 114,  52,  70,   0,  66, 
>-    117, 102, 102, 101, 114,  67, 
>-    111, 112, 121,  80,  97, 114, 
>-     97, 109, 115,   0, 171, 171, 
>-    101,   0,   0,   0,   9,   0, 
>-      0,   0, 144,   0,   0,   0, 
>-     64,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-    104,   1,   0,   0,   0,   0, 
>-      0,   0,   4,   0,   0,   0, 
>-      0,   0,   0,   0, 124,   1, 
>-      0,   0,   0,   0,   0,   0, 
>-    140,   1,   0,   0,   4,   0, 
>-      0,   0,   4,   0,   0,   0, 
>-      0,   0,   0,   0, 124,   1, 
>-      0,   0,   0,   0,   0,   0, 
>-    153,   1,   0,   0,   8,   0, 
>-      0,   0,   4,   0,   0,   0, 
>-      0,   0,   0,   0, 124,   1, 
>-      0,   0,   0,   0,   0,   0, 
>-    163,   1,   0,   0,  12,   0, 
>-      0,   0,   4,   0,   0,   0, 
>-      0,   0,   0,   0, 124,   1, 
>-      0,   0,   0,   0,   0,   0, 
>-    176,   1,   0,   0,  16,   0, 
>-      0,   0,   8,   0,   0,   0, 
>-      0,   0,   0,   0, 192,   1, 
>-      0,   0,   0,   0,   0,   0, 
>-    208,   1,   0,   0,  24,   0, 
>-      0,   0,   8,   0,   0,   0, 
>-      0,   0,   0,   0, 192,   1, 
>-      0,   0,   0,   0,   0,   0, 
>-    222,   1,   0,   0,  32,   0, 
>-      0,   0,   8,   0,   0,   0, 
>-      0,   0,   0,   0, 240,   1, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   2,   0,   0,  40,   0, 
>-      0,   0,   8,   0,   0,   0, 
>-      0,   0,   0,   0, 240,   1, 
>-      0,   0,   0,   0,   0,   0, 
>-     17,   2,   0,   0,  48,   0, 
>-      0,   0,   4,   0,   0,   0, 
>-      0,   0,   0,   0, 124,   1, 
>-      0,   0,   0,   0,   0,   0, 
>-     70, 105, 114, 115, 116,  80, 
>-    105, 120, 101, 108,  79, 102, 
>-    102, 115, 101, 116,   0, 171, 
>-    171, 171,   0,   0,  19,   0, 
>-      1,   0,   1,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-     80, 105, 120, 101, 108, 115, 
>-     80, 101, 114,  82, 111, 119, 
>-      0,  82, 111, 119,  83, 116, 
>-    114, 105, 100, 101,   0,  82, 
>-    111, 119, 115,  80, 101, 114, 
>-     83, 108, 105,  99, 101,   0, 
>-     80, 111, 115, 105, 116, 105, 
>-    111, 110,  79, 102, 102, 115, 
>-    101, 116,   0, 171,   1,   0, 
>-      3,   0,   1,   0,   2,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,  80, 111, 115, 105, 
>-    116, 105, 111, 110,  83,  99, 
>-     97, 108, 101,   0,  84, 101, 
>-    120,  76, 111,  99,  97, 116, 
>-    105, 111, 110,  79, 102, 102, 
>-    115, 101, 116,   0,   1,   0, 
>-      2,   0,   1,   0,   2,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,  84, 101, 120,  76, 
>-    111,  99,  97, 116, 105, 111, 
>-    110,  83,  99,  97, 108, 101, 
>-      0,  70, 105, 114, 115, 116, 
>-     83, 108, 105,  99, 101,   0, 
>-     77, 105,  99, 114, 111, 115, 
>-    111, 102, 116,  32,  40,  82, 
>-     41,  32,  72,  76,  83,  76, 
>-     32,  83, 104,  97, 100, 101, 
>-    114,  32,  67, 111, 109, 112, 
>-    105, 108, 101, 114,  32,  54, 
>-     46,  51,  46,  57,  54,  48, 
>-     48,  46,  49,  54,  51,  56, 
>-     52,   0, 171, 171,  73,  83, 
>-     71,  78,  80,   0,   0,   0, 
>-      2,   0,   0,   0,   8,   0, 
>-      0,   0,  56,   0,   0,   0, 
>-      0,   0,   0,   0,   1,   0, 
>-      0,   0,   3,   0,   0,   0, 
>-      0,   0,   0,   0,  15,   0, 
>-      0,   0,  68,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   1,   0,   0,   0, 
>-      1,   0,   0,   0,   1,   1, 
>-      0,   0,  83,  86,  95,  80, 
>-    111, 115, 105, 116, 105, 111, 
>-    110,   0,  84,  69,  88,  67, 
>-     79,  79,  82,  68,   0, 171, 
>-    171, 171,  79,  83,  71,  78, 
>-     44,   0,   0,   0,   1,   0, 
>-      0,   0,   8,   0,   0,   0, 
>-     32,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      3,   0,   0,   0,   0,   0, 
>-      0,   0,  15,   0,   0,   0, 
>-     83,  86,  95,  84,  97, 114, 
>-    103, 101, 116,   0, 171, 171, 
>-     83,  72,  68,  82,  96,   0, 
>-      0,   0,  64,   0,   0,   0, 
>-     24,   0,   0,   0,  89,   0, 
>-      0,   4,  70, 142,  32,   0, 
>-      0,   0,   0,   0,   1,   0, 
>-      0,   0,  88,   8,   0,   4, 
>-      0, 112,  16,   0,   0,   0, 
>-      0,   0,  85,  85,   0,   0, 
>-     98,   8,   0,   3,  18,  16, 
>-     16,   0,   1,   0,   0,   0, 
>-    101,   0,   0,   3, 242,  32, 
>-     16,   0,   0,   0,   0,   0, 
>-     45,   0,   0,   7, 242,  32, 
>-     16,   0,   0,   0,   0,   0, 
>-      6,  16,  16,   0,   1,   0, 
>-      0,   0,  70, 126,  16,   0, 
>-      0,   0,   0,   0,  62,   0, 
>-      0,   1,  83,  84,  65,  84, 
>-    116,   0,   0,   0,   2,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   2,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   1,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   1,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0
>-};
>+const BYTE g_PS_BufferToTexture_4F[] = {
>+    68,  88,  66,  67,  143, 104, 46,  161, 50,  189, 182, 102, 245, 177, 159, 82,  43,  210, 80,
>+    71,  1,   0,   0,   0,   252, 3,   0,   0,   5,   0,   0,   0,   52,  0,   0,   0,   140, 2,
>+    0,   0,   228, 2,   0,   0,   24,  3,   0,   0,   128, 3,   0,   0,   82,  68,  69,  70,  80,
>+    2,   0,   0,   1,   0,   0,   0,   120, 0,   0,   0,   2,   0,   0,   0,   28,  0,   0,   0,
>+    0,   4,   255, 255, 0,   1,   0,   0,   28,  2,   0,   0,   92,  0,   0,   0,   2,   0,   0,
>+    0,   5,   0,   0,   0,   1,   0,   0,   0,   255, 255, 255, 255, 0,   0,   0,   0,   1,   0,
>+    0,   0,   13,  0,   0,   0,   101, 0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   1,   0,   0,   0,
>+    66,  117, 102, 102, 101, 114, 52,  70,  0,   66,  117, 102, 102, 101, 114, 67,  111, 112, 121,
>+    80,  97,  114, 97,  109, 115, 0,   171, 171, 101, 0,   0,   0,   9,   0,   0,   0,   144, 0,
>+    0,   0,   64,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   104, 1,   0,   0,   0,
>+    0,   0,   0,   4,   0,   0,   0,   0,   0,   0,   0,   124, 1,   0,   0,   0,   0,   0,   0,
>+    140, 1,   0,   0,   4,   0,   0,   0,   4,   0,   0,   0,   0,   0,   0,   0,   124, 1,   0,
>+    0,   0,   0,   0,   0,   153, 1,   0,   0,   8,   0,   0,   0,   4,   0,   0,   0,   0,   0,
>+    0,   0,   124, 1,   0,   0,   0,   0,   0,   0,   163, 1,   0,   0,   12,  0,   0,   0,   4,
>+    0,   0,   0,   0,   0,   0,   0,   124, 1,   0,   0,   0,   0,   0,   0,   176, 1,   0,   0,
>+    16,  0,   0,   0,   8,   0,   0,   0,   0,   0,   0,   0,   192, 1,   0,   0,   0,   0,   0,
>+    0,   208, 1,   0,   0,   24,  0,   0,   0,   8,   0,   0,   0,   0,   0,   0,   0,   192, 1,
>+    0,   0,   0,   0,   0,   0,   222, 1,   0,   0,   32,  0,   0,   0,   8,   0,   0,   0,   0,
>+    0,   0,   0,   240, 1,   0,   0,   0,   0,   0,   0,   0,   2,   0,   0,   40,  0,   0,   0,
>+    8,   0,   0,   0,   0,   0,   0,   0,   240, 1,   0,   0,   0,   0,   0,   0,   17,  2,   0,
>+    0,   48,  0,   0,   0,   4,   0,   0,   0,   0,   0,   0,   0,   124, 1,   0,   0,   0,   0,
>+    0,   0,   70,  105, 114, 115, 116, 80,  105, 120, 101, 108, 79,  102, 102, 115, 101, 116, 0,
>+    171, 171, 171, 0,   0,   19,  0,   1,   0,   1,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    80,  105, 120, 101, 108, 115, 80,  101, 114, 82,  111, 119, 0,   82,  111, 119, 83,  116, 114,
>+    105, 100, 101, 0,   82,  111, 119, 115, 80,  101, 114, 83,  108, 105, 99,  101, 0,   80,  111,
>+    115, 105, 116, 105, 111, 110, 79,  102, 102, 115, 101, 116, 0,   171, 1,   0,   3,   0,   1,
>+    0,   2,   0,   0,   0,   0,   0,   0,   0,   0,   0,   80,  111, 115, 105, 116, 105, 111, 110,
>+    83,  99,  97,  108, 101, 0,   84,  101, 120, 76,  111, 99,  97,  116, 105, 111, 110, 79,  102,
>+    102, 115, 101, 116, 0,   1,   0,   2,   0,   1,   0,   2,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   84,  101, 120, 76,  111, 99,  97,  116, 105, 111, 110, 83,  99,  97,  108, 101, 0,
>+    70,  105, 114, 115, 116, 83,  108, 105, 99,  101, 0,   77,  105, 99,  114, 111, 115, 111, 102,
>+    116, 32,  40,  82,  41,  32,  72,  76,  83,  76,  32,  83,  104, 97,  100, 101, 114, 32,  67,
>+    111, 109, 112, 105, 108, 101, 114, 32,  57,  46,  50,  57,  46,  57,  53,  50,  46,  51,  49,
>+    49,  49,  0,   171, 171, 171, 73,  83,  71,  78,  80,  0,   0,   0,   2,   0,   0,   0,   8,
>+    0,   0,   0,   56,  0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   3,   0,   0,   0,
>+    0,   0,   0,   0,   15,  0,   0,   0,   68,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   1,   0,   0,   0,   1,   0,   0,   0,   1,   1,   0,   0,   83,  86,  95,  80,  111, 115,
>+    105, 116, 105, 111, 110, 0,   84,  69,  88,  67,  79,  79,  82,  68,  0,   171, 171, 171, 79,
>+    83,  71,  78,  44,  0,   0,   0,   1,   0,   0,   0,   8,   0,   0,   0,   32,  0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   3,   0,   0,   0,   0,   0,   0,   0,   15,  0,   0,
>+    0,   83,  86,  95,  84,  97,  114, 103, 101, 116, 0,   171, 171, 83,  72,  68,  82,  96,  0,
>+    0,   0,   64,  0,   0,   0,   24,  0,   0,   0,   89,  0,   0,   4,   70,  142, 32,  0,   0,
>+    0,   0,   0,   1,   0,   0,   0,   88,  8,   0,   4,   0,   112, 16,  0,   0,   0,   0,   0,
>+    85,  85,  0,   0,   98,  8,   0,   3,   18,  16,  16,  0,   1,   0,   0,   0,   101, 0,   0,
>+    3,   242, 32,  16,  0,   0,   0,   0,   0,   45,  0,   0,   7,   242, 32,  16,  0,   0,   0,
>+    0,   0,   6,   16,  16,  0,   1,   0,   0,   0,   70,  126, 16,  0,   0,   0,   0,   0,   62,
>+    0,   0,   1,   83,  84,  65,  84,  116, 0,   0,   0,   2,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   2,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0};
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/buffertotexture11_ps_4i.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/buffertotexture11_ps_4i.h
>index ac952f6df2a..07871aabc39 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/buffertotexture11_ps_4i.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/buffertotexture11_ps_4i.h
>@@ -1,6 +1,10 @@
> #if 0
> //
>-// Generated by Microsoft (R) HLSL Shader Compiler 6.3.9600.16384
>+// Generated by Microsoft (R) HLSL Shader Compiler 9.29.952.3111
>+//
>+//
>+//   fxc /nologo /E PS_BufferToTexture_4I /T ps_4_0 /Fh
>+//    compiled/buffertotexture11_ps_4i.h BufferToTexture11.hlsl
> //
> //
> // Resource Bindings:
>@@ -13,17 +17,17 @@
> //
> // Input signature:
> //
>-// Name                 Index   Mask Register SysValue  Format   Used
>-// -------------------- ----- ------ -------- -------- ------- ------
>-// SV_Position              0   xyzw        0      POS   float       
>-// TEXCOORD                 0   x           1     NONE    uint   x   
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_Position              0   xyzw        0      POS  float       
>+// TEXCOORD                 0   x           1     NONE   uint   x   
> //
> //
> // Output signature:
> //
>-// Name                 Index   Mask Register SysValue  Format   Used
>-// -------------------- ----- ------ -------- -------- ------- ------
>-// SV_Target                0   xyzw        0   TARGET     int   xyzw
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_Target                0   xyzw        0   TARGET    int   xyzw
> //
> ps_4_0
> dcl_resource_buffer (sint,sint,sint,sint) t0
>@@ -34,95 +38,32 @@ ret
> // Approximately 2 instruction slots used
> #endif
> 
>-const BYTE g_PS_BufferToTexture_4I[] =
>-{
>-     68,  88,  66,  67, 154, 139, 
>-     95, 210,  76,  52, 228,  55, 
>-      1, 175,  60,  90,  13, 234, 
>-    138,   3,   1,   0,   0,   0, 
>-     20,   2,   0,   0,   5,   0, 
>-      0,   0,  52,   0,   0,   0, 
>-    180,   0,   0,   0,  12,   1, 
>-      0,   0,  64,   1,   0,   0, 
>-    152,   1,   0,   0,  82,  68, 
>-     69,  70, 120,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   1,   0,   0,   0, 
>-     28,   0,   0,   0,   0,   4, 
>-    255, 255,   0,   1,   0,   0, 
>-     69,   0,   0,   0,  60,   0, 
>-      0,   0,   2,   0,   0,   0, 
>-      3,   0,   0,   0,   1,   0, 
>-      0,   0, 255, 255, 255, 255, 
>-      0,   0,   0,   0,   1,   0, 
>-      0,   0,  13,   0,   0,   0, 
>-     66, 117, 102, 102, 101, 114, 
>-     52,  73,   0,  77, 105,  99, 
>-    114, 111, 115, 111, 102, 116, 
>-     32,  40,  82,  41,  32,  72, 
>-     76,  83,  76,  32,  83, 104, 
>-     97, 100, 101, 114,  32,  67, 
>-    111, 109, 112, 105, 108, 101, 
>-    114,  32,  54,  46,  51,  46, 
>-     57,  54,  48,  48,  46,  49, 
>-     54,  51,  56,  52,   0, 171, 
>-     73,  83,  71,  78,  80,   0, 
>-      0,   0,   2,   0,   0,   0, 
>-      8,   0,   0,   0,  56,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      1,   0,   0,   0,   3,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-     15,   0,   0,   0,  68,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   1,   0, 
>-      0,   0,   1,   0,   0,   0, 
>-      1,   1,   0,   0,  83,  86, 
>-     95,  80, 111, 115, 105, 116, 
>-    105, 111, 110,   0,  84,  69, 
>-     88,  67,  79,  79,  82,  68, 
>-      0, 171, 171, 171,  79,  83, 
>-     71,  78,  44,   0,   0,   0, 
>-      1,   0,   0,   0,   8,   0, 
>-      0,   0,  32,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   2,   0,   0,   0, 
>-      0,   0,   0,   0,  15,   0, 
>-      0,   0,  83,  86,  95,  84, 
>-     97, 114, 103, 101, 116,   0, 
>-    171, 171,  83,  72,  68,  82, 
>-     80,   0,   0,   0,  64,   0, 
>-      0,   0,  20,   0,   0,   0, 
>-     88,   8,   0,   4,   0, 112, 
>-     16,   0,   0,   0,   0,   0, 
>-     51,  51,   0,   0,  98,   8, 
>-      0,   3,  18,  16,  16,   0, 
>-      1,   0,   0,   0, 101,   0, 
>-      0,   3, 242,  32,  16,   0, 
>-      0,   0,   0,   0,  45,   0, 
>-      0,   7, 242,  32,  16,   0, 
>-      0,   0,   0,   0,   6,  16, 
>-     16,   0,   1,   0,   0,   0, 
>-     70, 126,  16,   0,   0,   0, 
>-      0,   0,  62,   0,   0,   1, 
>-     83,  84,  65,  84, 116,   0, 
>-      0,   0,   2,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   2,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      1,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   1,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0
>-};
>+const BYTE g_PS_BufferToTexture_4I[] = {
>+    68,  88,  66,  67,  104, 142, 165, 212, 7,   64,  44,  53,  68,  117, 135, 216, 87,  167, 148,
>+    192, 1,   0,   0,   0,   20,  2,   0,   0,   5,   0,   0,   0,   52,  0,   0,   0,   180, 0,
>+    0,   0,   12,  1,   0,   0,   64,  1,   0,   0,   152, 1,   0,   0,   82,  68,  69,  70,  120,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   28,  0,   0,   0,
>+    0,   4,   255, 255, 0,   1,   0,   0,   69,  0,   0,   0,   60,  0,   0,   0,   2,   0,   0,
>+    0,   3,   0,   0,   0,   1,   0,   0,   0,   255, 255, 255, 255, 0,   0,   0,   0,   1,   0,
>+    0,   0,   13,  0,   0,   0,   66,  117, 102, 102, 101, 114, 52,  73,  0,   77,  105, 99,  114,
>+    111, 115, 111, 102, 116, 32,  40,  82,  41,  32,  72,  76,  83,  76,  32,  83,  104, 97,  100,
>+    101, 114, 32,  67,  111, 109, 112, 105, 108, 101, 114, 32,  57,  46,  50,  57,  46,  57,  53,
>+    50,  46,  51,  49,  49,  49,  0,   171, 171, 73,  83,  71,  78,  80,  0,   0,   0,   2,   0,
>+    0,   0,   8,   0,   0,   0,   56,  0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   3,
>+    0,   0,   0,   0,   0,   0,   0,   15,  0,   0,   0,   68,  0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   1,   0,   0,   0,   1,   0,   0,   0,   1,   1,   0,   0,   83,  86,  95,
>+    80,  111, 115, 105, 116, 105, 111, 110, 0,   84,  69,  88,  67,  79,  79,  82,  68,  0,   171,
>+    171, 171, 79,  83,  71,  78,  44,  0,   0,   0,   1,   0,   0,   0,   8,   0,   0,   0,   32,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   2,   0,   0,   0,   0,   0,   0,   0,
>+    15,  0,   0,   0,   83,  86,  95,  84,  97,  114, 103, 101, 116, 0,   171, 171, 83,  72,  68,
>+    82,  80,  0,   0,   0,   64,  0,   0,   0,   20,  0,   0,   0,   88,  8,   0,   4,   0,   112,
>+    16,  0,   0,   0,   0,   0,   51,  51,  0,   0,   98,  8,   0,   3,   18,  16,  16,  0,   1,
>+    0,   0,   0,   101, 0,   0,   3,   242, 32,  16,  0,   0,   0,   0,   0,   45,  0,   0,   7,
>+    242, 32,  16,  0,   0,   0,   0,   0,   6,   16,  16,  0,   1,   0,   0,   0,   70,  126, 16,
>+    0,   0,   0,   0,   0,   62,  0,   0,   1,   83,  84,  65,  84,  116, 0,   0,   0,   2,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   2,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0};
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/buffertotexture11_ps_4ui.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/buffertotexture11_ps_4ui.h
>index fe7d6b27ab0..b66009e8647 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/buffertotexture11_ps_4ui.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/buffertotexture11_ps_4ui.h
>@@ -1,6 +1,10 @@
> #if 0
> //
>-// Generated by Microsoft (R) HLSL Shader Compiler 6.3.9600.16384
>+// Generated by Microsoft (R) HLSL Shader Compiler 9.29.952.3111
>+//
>+//
>+//   fxc /nologo /E PS_BufferToTexture_4UI /T ps_4_0 /Fh
>+//    compiled/buffertotexture11_ps_4ui.h BufferToTexture11.hlsl
> //
> //
> // Resource Bindings:
>@@ -13,17 +17,17 @@
> //
> // Input signature:
> //
>-// Name                 Index   Mask Register SysValue  Format   Used
>-// -------------------- ----- ------ -------- -------- ------- ------
>-// SV_Position              0   xyzw        0      POS   float       
>-// TEXCOORD                 0   x           1     NONE    uint   x   
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_Position              0   xyzw        0      POS  float       
>+// TEXCOORD                 0   x           1     NONE   uint   x   
> //
> //
> // Output signature:
> //
>-// Name                 Index   Mask Register SysValue  Format   Used
>-// -------------------- ----- ------ -------- -------- ------- ------
>-// SV_Target                0   xyzw        0   TARGET    uint   xyzw
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_Target                0   xyzw        0   TARGET   uint   xyzw
> //
> ps_4_0
> dcl_resource_buffer (uint,uint,uint,uint) t0
>@@ -34,95 +38,32 @@ ret
> // Approximately 2 instruction slots used
> #endif
> 
>-const BYTE g_PS_BufferToTexture_4UI[] =
>-{
>-     68,  88,  66,  67,  25, 164, 
>-      1, 224, 250, 219,  16, 200, 
>-     83,  99,  38, 137, 116, 129, 
>-    200,  39,   1,   0,   0,   0, 
>-     20,   2,   0,   0,   5,   0, 
>-      0,   0,  52,   0,   0,   0, 
>-    180,   0,   0,   0,  12,   1, 
>-      0,   0,  64,   1,   0,   0, 
>-    152,   1,   0,   0,  82,  68, 
>-     69,  70, 120,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   1,   0,   0,   0, 
>-     28,   0,   0,   0,   0,   4, 
>-    255, 255,   0,   1,   0,   0, 
>-     70,   0,   0,   0,  60,   0, 
>-      0,   0,   2,   0,   0,   0, 
>-      4,   0,   0,   0,   1,   0, 
>-      0,   0, 255, 255, 255, 255, 
>-      0,   0,   0,   0,   1,   0, 
>-      0,   0,  13,   0,   0,   0, 
>-     66, 117, 102, 102, 101, 114, 
>-     52,  85,  73,   0,  77, 105, 
>-     99, 114, 111, 115, 111, 102, 
>-    116,  32,  40,  82,  41,  32, 
>-     72,  76,  83,  76,  32,  83, 
>-    104,  97, 100, 101, 114,  32, 
>-     67, 111, 109, 112, 105, 108, 
>-    101, 114,  32,  54,  46,  51, 
>-     46,  57,  54,  48,  48,  46, 
>-     49,  54,  51,  56,  52,   0, 
>-     73,  83,  71,  78,  80,   0, 
>-      0,   0,   2,   0,   0,   0, 
>-      8,   0,   0,   0,  56,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      1,   0,   0,   0,   3,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-     15,   0,   0,   0,  68,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   1,   0, 
>-      0,   0,   1,   0,   0,   0, 
>-      1,   1,   0,   0,  83,  86, 
>-     95,  80, 111, 115, 105, 116, 
>-    105, 111, 110,   0,  84,  69, 
>-     88,  67,  79,  79,  82,  68, 
>-      0, 171, 171, 171,  79,  83, 
>-     71,  78,  44,   0,   0,   0, 
>-      1,   0,   0,   0,   8,   0, 
>-      0,   0,  32,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   1,   0,   0,   0, 
>-      0,   0,   0,   0,  15,   0, 
>-      0,   0,  83,  86,  95,  84, 
>-     97, 114, 103, 101, 116,   0, 
>-    171, 171,  83,  72,  68,  82, 
>-     80,   0,   0,   0,  64,   0, 
>-      0,   0,  20,   0,   0,   0, 
>-     88,   8,   0,   4,   0, 112, 
>-     16,   0,   0,   0,   0,   0, 
>-     68,  68,   0,   0,  98,   8, 
>-      0,   3,  18,  16,  16,   0, 
>-      1,   0,   0,   0, 101,   0, 
>-      0,   3, 242,  32,  16,   0, 
>-      0,   0,   0,   0,  45,   0, 
>-      0,   7, 242,  32,  16,   0, 
>-      0,   0,   0,   0,   6,  16, 
>-     16,   0,   1,   0,   0,   0, 
>-     70, 126,  16,   0,   0,   0, 
>-      0,   0,  62,   0,   0,   1, 
>-     83,  84,  65,  84, 116,   0, 
>-      0,   0,   2,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   2,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      1,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   1,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0
>-};
>+const BYTE g_PS_BufferToTexture_4UI[] = {
>+    68,  88,  66,  67,  150, 54,  239, 129, 105, 57,  103, 28,  8,   175, 168, 118, 153, 92,  233,
>+    98,  1,   0,   0,   0,   20,  2,   0,   0,   5,   0,   0,   0,   52,  0,   0,   0,   180, 0,
>+    0,   0,   12,  1,   0,   0,   64,  1,   0,   0,   152, 1,   0,   0,   82,  68,  69,  70,  120,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   28,  0,   0,   0,
>+    0,   4,   255, 255, 0,   1,   0,   0,   70,  0,   0,   0,   60,  0,   0,   0,   2,   0,   0,
>+    0,   4,   0,   0,   0,   1,   0,   0,   0,   255, 255, 255, 255, 0,   0,   0,   0,   1,   0,
>+    0,   0,   13,  0,   0,   0,   66,  117, 102, 102, 101, 114, 52,  85,  73,  0,   77,  105, 99,
>+    114, 111, 115, 111, 102, 116, 32,  40,  82,  41,  32,  72,  76,  83,  76,  32,  83,  104, 97,
>+    100, 101, 114, 32,  67,  111, 109, 112, 105, 108, 101, 114, 32,  57,  46,  50,  57,  46,  57,
>+    53,  50,  46,  51,  49,  49,  49,  0,   171, 73,  83,  71,  78,  80,  0,   0,   0,   2,   0,
>+    0,   0,   8,   0,   0,   0,   56,  0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   3,
>+    0,   0,   0,   0,   0,   0,   0,   15,  0,   0,   0,   68,  0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   1,   0,   0,   0,   1,   0,   0,   0,   1,   1,   0,   0,   83,  86,  95,
>+    80,  111, 115, 105, 116, 105, 111, 110, 0,   84,  69,  88,  67,  79,  79,  82,  68,  0,   171,
>+    171, 171, 79,  83,  71,  78,  44,  0,   0,   0,   1,   0,   0,   0,   8,   0,   0,   0,   32,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,
>+    15,  0,   0,   0,   83,  86,  95,  84,  97,  114, 103, 101, 116, 0,   171, 171, 83,  72,  68,
>+    82,  80,  0,   0,   0,   64,  0,   0,   0,   20,  0,   0,   0,   88,  8,   0,   4,   0,   112,
>+    16,  0,   0,   0,   0,   0,   68,  68,  0,   0,   98,  8,   0,   3,   18,  16,  16,  0,   1,
>+    0,   0,   0,   101, 0,   0,   3,   242, 32,  16,  0,   0,   0,   0,   0,   45,  0,   0,   7,
>+    242, 32,  16,  0,   0,   0,   0,   0,   6,   16,  16,  0,   1,   0,   0,   0,   70,  126, 16,
>+    0,   0,   0,   0,   0,   62,  0,   0,   1,   83,  84,  65,  84,  116, 0,   0,   0,   2,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   2,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0};
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/buffertotexture11_vs.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/buffertotexture11_vs.h
>index ac72f4be9cf..881a9750ab4 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/buffertotexture11_vs.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/buffertotexture11_vs.h
>@@ -1,6 +1,10 @@
> #if 0
> //
>-// Generated by Microsoft (R) HLSL Shader Compiler 6.3.9600.16384
>+// Generated by Microsoft (R) HLSL Shader Compiler 9.29.952.3111
>+//
>+//
>+//   fxc /nologo /E VS_BufferToTexture /T vs_4_0 /Fh
>+//    compiled/buffertotexture11_vs.h BufferToTexture11.hlsl
> //
> //
> // Buffer Definitions: 
>@@ -31,18 +35,18 @@
> //
> // Input signature:
> //
>-// Name                 Index   Mask Register SysValue  Format   Used
>-// -------------------- ----- ------ -------- -------- ------- ------
>-// SV_VertexID              0   x           0   VERTID    uint   x   
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_VertexID              0   x           0   VERTID   uint   x   
> //
> //
> // Output signature:
> //
>-// Name                 Index   Mask Register SysValue  Format   Used
>-// -------------------- ----- ------ -------- -------- ------- ------
>-// SV_Position              0   xyzw        0      POS   float   xyzw
>-// TEXCOORD                 0   x           1     NONE    uint   x   
>-// LAYER                    0    y          1     NONE    uint    y  
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_Position              0   xyzw        0      POS  float   xyzw
>+// TEXCOORD                 0   x           1     NONE   uint   x   
>+// LAYER                    0    y          1     NONE   uint    y  
> //
> vs_4_0
> dcl_constantbuffer cb0[4], immediateIndexed
>@@ -52,260 +56,95 @@ dcl_output o1.x
> dcl_output o1.y
> dcl_temps 2
> mov o0.zw, l(0,0,0,1.000000)
>-imul null, r0.xy, cb0[0].wwww, cb0[0].yzyy
>+imul null, r0.xy, cb0[0].yzyy, cb0[0].wwww
> udiv r0.z, null, v0.x, r0.x
> imad r0.x, -r0.z, r0.x, v0.x
> imad r0.y, r0.z, r0.y, cb0[0].x
>-iadd o1.y, r0.z, cb0[3].x
>+iadd o1.y, cb0[3].x, r0.z
> udiv r0.z, null, r0.x, cb0[0].y
> imad r0.x, -r0.z, cb0[0].y, r0.x
> utof r1.xy, r0.xzxx
> imad r0.y, r0.z, cb0[0].z, r0.y
>-iadd o1.x, r0.x, r0.y
>+iadd o1.x, r0.y, r0.x
> mad o0.xy, cb0[1].zwzz, r1.xyxx, cb0[1].xyxx
> ret 
> // Approximately 13 instruction slots used
> #endif
> 
>-const BYTE g_VS_BufferToTexture[] =
>-{
>-     68,  88,  66,  67,  39, 207, 
>-    138,  15,  42, 195, 141, 208, 
>-      2, 107, 135, 197, 122,  36, 
>-    114, 227,   1,   0,   0,   0, 
>-    152,   5,   0,   0,   5,   0, 
>-      0,   0,  52,   0,   0,   0, 
>-    100,   2,   0,   0, 152,   2, 
>-      0,   0,  12,   3,   0,   0, 
>-     28,   5,   0,   0,  82,  68, 
>-     69,  70,  40,   2,   0,   0, 
>-      1,   0,   0,   0,  80,   0, 
>-      0,   0,   1,   0,   0,   0, 
>-     28,   0,   0,   0,   0,   4, 
>-    254, 255,   0,   1,   0,   0, 
>-    244,   1,   0,   0,  60,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   1,   0, 
>-      0,   0,   1,   0,   0,   0, 
>-     66, 117, 102, 102, 101, 114, 
>-     67, 111, 112, 121,  80,  97, 
>-    114,  97, 109, 115,   0, 171, 
>-    171, 171,  60,   0,   0,   0, 
>-      9,   0,   0,   0, 104,   0, 
>-      0,   0,  64,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,  64,   1,   0,   0, 
>-      0,   0,   0,   0,   4,   0, 
>-      0,   0,   2,   0,   0,   0, 
>-     84,   1,   0,   0,   0,   0, 
>-      0,   0, 100,   1,   0,   0, 
>-      4,   0,   0,   0,   4,   0, 
>-      0,   0,   2,   0,   0,   0, 
>-     84,   1,   0,   0,   0,   0, 
>-      0,   0, 113,   1,   0,   0, 
>-      8,   0,   0,   0,   4,   0, 
>-      0,   0,   2,   0,   0,   0, 
>-     84,   1,   0,   0,   0,   0, 
>-      0,   0, 123,   1,   0,   0, 
>-     12,   0,   0,   0,   4,   0, 
>-      0,   0,   2,   0,   0,   0, 
>-     84,   1,   0,   0,   0,   0, 
>-      0,   0, 136,   1,   0,   0, 
>-     16,   0,   0,   0,   8,   0, 
>-      0,   0,   2,   0,   0,   0, 
>-    152,   1,   0,   0,   0,   0, 
>-      0,   0, 168,   1,   0,   0, 
>-     24,   0,   0,   0,   8,   0, 
>-      0,   0,   2,   0,   0,   0, 
>-    152,   1,   0,   0,   0,   0, 
>-      0,   0, 182,   1,   0,   0, 
>-     32,   0,   0,   0,   8,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-    200,   1,   0,   0,   0,   0, 
>-      0,   0, 216,   1,   0,   0, 
>-     40,   0,   0,   0,   8,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-    200,   1,   0,   0,   0,   0, 
>-      0,   0, 233,   1,   0,   0, 
>-     48,   0,   0,   0,   4,   0, 
>-      0,   0,   2,   0,   0,   0, 
>-     84,   1,   0,   0,   0,   0, 
>-      0,   0,  70, 105, 114, 115, 
>-    116,  80, 105, 120, 101, 108, 
>-     79, 102, 102, 115, 101, 116, 
>-      0, 171, 171, 171,   0,   0, 
>-     19,   0,   1,   0,   1,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,  80, 105, 120, 101, 
>-    108, 115,  80, 101, 114,  82, 
>-    111, 119,   0,  82, 111, 119, 
>-     83, 116, 114, 105, 100, 101, 
>-      0,  82, 111, 119, 115,  80, 
>-    101, 114,  83, 108, 105,  99, 
>-    101,   0,  80, 111, 115, 105, 
>-    116, 105, 111, 110,  79, 102, 
>-    102, 115, 101, 116,   0, 171, 
>-      1,   0,   3,   0,   1,   0, 
>-      2,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,  80, 111, 
>-    115, 105, 116, 105, 111, 110, 
>-     83,  99,  97, 108, 101,   0, 
>-     84, 101, 120,  76, 111,  99, 
>-     97, 116, 105, 111, 110,  79, 
>-    102, 102, 115, 101, 116,   0, 
>-      1,   0,   2,   0,   1,   0, 
>-      2,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,  84, 101, 
>-    120,  76, 111,  99,  97, 116, 
>-    105, 111, 110,  83,  99,  97, 
>-    108, 101,   0,  70, 105, 114, 
>-    115, 116,  83, 108, 105,  99, 
>-    101,   0,  77, 105,  99, 114, 
>-    111, 115, 111, 102, 116,  32, 
>-     40,  82,  41,  32,  72,  76, 
>-     83,  76,  32,  83, 104,  97, 
>-    100, 101, 114,  32,  67, 111, 
>-    109, 112, 105, 108, 101, 114, 
>-     32,  54,  46,  51,  46,  57, 
>-     54,  48,  48,  46,  49,  54, 
>-     51,  56,  52,   0, 171, 171, 
>-     73,  83,  71,  78,  44,   0, 
>-      0,   0,   1,   0,   0,   0, 
>-      8,   0,   0,   0,  32,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      6,   0,   0,   0,   1,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      1,   1,   0,   0,  83,  86, 
>-     95,  86, 101, 114, 116, 101, 
>-    120,  73,  68,   0,  79,  83, 
>-     71,  78, 108,   0,   0,   0, 
>-      3,   0,   0,   0,   8,   0, 
>-      0,   0,  80,   0,   0,   0, 
>-      0,   0,   0,   0,   1,   0, 
>-      0,   0,   3,   0,   0,   0, 
>-      0,   0,   0,   0,  15,   0, 
>-      0,   0,  92,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   1,   0,   0,   0, 
>-      1,   0,   0,   0,   1,  14, 
>-      0,   0, 101,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   1,   0,   0,   0, 
>-      1,   0,   0,   0,   2,  13, 
>-      0,   0,  83,  86,  95,  80, 
>-    111, 115, 105, 116, 105, 111, 
>-    110,   0,  84,  69,  88,  67, 
>-     79,  79,  82,  68,   0,  76, 
>-     65,  89,  69,  82,   0, 171, 
>-     83,  72,  68,  82,   8,   2, 
>-      0,   0,  64,   0,   1,   0, 
>-    130,   0,   0,   0,  89,   0, 
>-      0,   4,  70, 142,  32,   0, 
>-      0,   0,   0,   0,   4,   0, 
>-      0,   0,  96,   0,   0,   4, 
>-     18,  16,  16,   0,   0,   0, 
>-      0,   0,   6,   0,   0,   0, 
>-    103,   0,   0,   4, 242,  32, 
>-     16,   0,   0,   0,   0,   0, 
>-      1,   0,   0,   0, 101,   0, 
>-      0,   3,  18,  32,  16,   0, 
>-      1,   0,   0,   0, 101,   0, 
>-      0,   3,  34,  32,  16,   0, 
>-      1,   0,   0,   0, 104,   0, 
>-      0,   2,   2,   0,   0,   0, 
>-     54,   0,   0,   8, 194,  32, 
>-     16,   0,   0,   0,   0,   0, 
>-      2,  64,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-    128,  63,  38,   0,   0,  10, 
>-      0, 208,   0,   0,  50,   0, 
>-     16,   0,   0,   0,   0,   0, 
>-    246, 143,  32,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-    150, 133,  32,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-     78,   0,   0,   8,  66,   0, 
>-     16,   0,   0,   0,   0,   0, 
>-      0, 208,   0,   0,  10,  16, 
>-     16,   0,   0,   0,   0,   0, 
>-     10,   0,  16,   0,   0,   0, 
>-      0,   0,  35,   0,   0,  10, 
>-     18,   0,  16,   0,   0,   0, 
>-      0,   0,  42,   0,  16, 128, 
>-     65,   0,   0,   0,   0,   0, 
>-      0,   0,  10,   0,  16,   0, 
>-      0,   0,   0,   0,  10,  16, 
>-     16,   0,   0,   0,   0,   0, 
>-     35,   0,   0,  10,  34,   0, 
>-     16,   0,   0,   0,   0,   0, 
>-     42,   0,  16,   0,   0,   0, 
>-      0,   0,  26,   0,  16,   0, 
>-      0,   0,   0,   0,  10, 128, 
>-     32,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,  30,   0, 
>-      0,   8,  34,  32,  16,   0, 
>-      1,   0,   0,   0,  42,   0, 
>-     16,   0,   0,   0,   0,   0, 
>-     10, 128,  32,   0,   0,   0, 
>-      0,   0,   3,   0,   0,   0, 
>-     78,   0,   0,   9,  66,   0, 
>-     16,   0,   0,   0,   0,   0, 
>-      0, 208,   0,   0,  10,   0, 
>-     16,   0,   0,   0,   0,   0, 
>-     26, 128,  32,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-     35,   0,   0,  11,  18,   0, 
>-     16,   0,   0,   0,   0,   0, 
>-     42,   0,  16, 128,  65,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-     26, 128,  32,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-     10,   0,  16,   0,   0,   0, 
>-      0,   0,  86,   0,   0,   5, 
>-     50,   0,  16,   0,   1,   0, 
>-      0,   0, 134,   0,  16,   0, 
>-      0,   0,   0,   0,  35,   0, 
>-      0,  10,  34,   0,  16,   0, 
>-      0,   0,   0,   0,  42,   0, 
>-     16,   0,   0,   0,   0,   0, 
>-     42, 128,  32,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-     26,   0,  16,   0,   0,   0, 
>-      0,   0,  30,   0,   0,   7, 
>-     18,  32,  16,   0,   1,   0, 
>-      0,   0,  10,   0,  16,   0, 
>-      0,   0,   0,   0,  26,   0, 
>-     16,   0,   0,   0,   0,   0, 
>-     50,   0,   0,  11,  50,  32, 
>-     16,   0,   0,   0,   0,   0, 
>-    230, 138,  32,   0,   0,   0, 
>-      0,   0,   1,   0,   0,   0, 
>-     70,   0,  16,   0,   1,   0, 
>-      0,   0,  70, 128,  32,   0, 
>-      0,   0,   0,   0,   1,   0, 
>-      0,   0,  62,   0,   0,   1, 
>-     83,  84,  65,  84, 116,   0, 
>-      0,   0,  13,   0,   0,   0, 
>-      2,   0,   0,   0,   0,   0, 
>-      0,   0,   4,   0,   0,   0, 
>-      1,   0,   0,   0,   7,   0, 
>-      0,   0,   2,   0,   0,   0, 
>-      1,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      1,   0,   0,   0,   0,   0, 
>-      0,   0,   1,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0
>-};
>+const BYTE g_VS_BufferToTexture[] = {
>+    68,  88,  66,  67,  118, 65,  244, 232, 116, 137, 175, 126, 82,  230, 140, 17,  178, 249, 223,
>+    31,  1,   0,   0,   0,   152, 5,   0,   0,   5,   0,   0,   0,   52,  0,   0,   0,   100, 2,
>+    0,   0,   152, 2,   0,   0,   12,  3,   0,   0,   28,  5,   0,   0,   82,  68,  69,  70,  40,
>+    2,   0,   0,   1,   0,   0,   0,   80,  0,   0,   0,   1,   0,   0,   0,   28,  0,   0,   0,
>+    0,   4,   254, 255, 0,   1,   0,   0,   244, 1,   0,   0,   60,  0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,
>+    0,   0,   1,   0,   0,   0,   66,  117, 102, 102, 101, 114, 67,  111, 112, 121, 80,  97,  114,
>+    97,  109, 115, 0,   171, 171, 171, 60,  0,   0,   0,   9,   0,   0,   0,   104, 0,   0,   0,
>+    64,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   64,  1,   0,   0,   0,   0,   0,
>+    0,   4,   0,   0,   0,   2,   0,   0,   0,   84,  1,   0,   0,   0,   0,   0,   0,   100, 1,
>+    0,   0,   4,   0,   0,   0,   4,   0,   0,   0,   2,   0,   0,   0,   84,  1,   0,   0,   0,
>+    0,   0,   0,   113, 1,   0,   0,   8,   0,   0,   0,   4,   0,   0,   0,   2,   0,   0,   0,
>+    84,  1,   0,   0,   0,   0,   0,   0,   123, 1,   0,   0,   12,  0,   0,   0,   4,   0,   0,
>+    0,   2,   0,   0,   0,   84,  1,   0,   0,   0,   0,   0,   0,   136, 1,   0,   0,   16,  0,
>+    0,   0,   8,   0,   0,   0,   2,   0,   0,   0,   152, 1,   0,   0,   0,   0,   0,   0,   168,
>+    1,   0,   0,   24,  0,   0,   0,   8,   0,   0,   0,   2,   0,   0,   0,   152, 1,   0,   0,
>+    0,   0,   0,   0,   182, 1,   0,   0,   32,  0,   0,   0,   8,   0,   0,   0,   0,   0,   0,
>+    0,   200, 1,   0,   0,   0,   0,   0,   0,   216, 1,   0,   0,   40,  0,   0,   0,   8,   0,
>+    0,   0,   0,   0,   0,   0,   200, 1,   0,   0,   0,   0,   0,   0,   233, 1,   0,   0,   48,
>+    0,   0,   0,   4,   0,   0,   0,   2,   0,   0,   0,   84,  1,   0,   0,   0,   0,   0,   0,
>+    70,  105, 114, 115, 116, 80,  105, 120, 101, 108, 79,  102, 102, 115, 101, 116, 0,   171, 171,
>+    171, 0,   0,   19,  0,   1,   0,   1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   80,  105,
>+    120, 101, 108, 115, 80,  101, 114, 82,  111, 119, 0,   82,  111, 119, 83,  116, 114, 105, 100,
>+    101, 0,   82,  111, 119, 115, 80,  101, 114, 83,  108, 105, 99,  101, 0,   80,  111, 115, 105,
>+    116, 105, 111, 110, 79,  102, 102, 115, 101, 116, 0,   171, 1,   0,   3,   0,   1,   0,   2,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   80,  111, 115, 105, 116, 105, 111, 110, 83,  99,
>+    97,  108, 101, 0,   84,  101, 120, 76,  111, 99,  97,  116, 105, 111, 110, 79,  102, 102, 115,
>+    101, 116, 0,   1,   0,   2,   0,   1,   0,   2,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    84,  101, 120, 76,  111, 99,  97,  116, 105, 111, 110, 83,  99,  97,  108, 101, 0,   70,  105,
>+    114, 115, 116, 83,  108, 105, 99,  101, 0,   77,  105, 99,  114, 111, 115, 111, 102, 116, 32,
>+    40,  82,  41,  32,  72,  76,  83,  76,  32,  83,  104, 97,  100, 101, 114, 32,  67,  111, 109,
>+    112, 105, 108, 101, 114, 32,  57,  46,  50,  57,  46,  57,  53,  50,  46,  51,  49,  49,  49,
>+    0,   171, 171, 171, 73,  83,  71,  78,  44,  0,   0,   0,   1,   0,   0,   0,   8,   0,   0,
>+    0,   32,  0,   0,   0,   0,   0,   0,   0,   6,   0,   0,   0,   1,   0,   0,   0,   0,   0,
>+    0,   0,   1,   1,   0,   0,   83,  86,  95,  86,  101, 114, 116, 101, 120, 73,  68,  0,   79,
>+    83,  71,  78,  108, 0,   0,   0,   3,   0,   0,   0,   8,   0,   0,   0,   80,  0,   0,   0,
>+    0,   0,   0,   0,   1,   0,   0,   0,   3,   0,   0,   0,   0,   0,   0,   0,   15,  0,   0,
>+    0,   92,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   1,   0,
>+    0,   0,   1,   14,  0,   0,   101, 0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,
>+    0,   0,   0,   1,   0,   0,   0,   2,   13,  0,   0,   83,  86,  95,  80,  111, 115, 105, 116,
>+    105, 111, 110, 0,   84,  69,  88,  67,  79,  79,  82,  68,  0,   76,  65,  89,  69,  82,  0,
>+    171, 83,  72,  68,  82,  8,   2,   0,   0,   64,  0,   1,   0,   130, 0,   0,   0,   89,  0,
>+    0,   4,   70,  142, 32,  0,   0,   0,   0,   0,   4,   0,   0,   0,   96,  0,   0,   4,   18,
>+    16,  16,  0,   0,   0,   0,   0,   6,   0,   0,   0,   103, 0,   0,   4,   242, 32,  16,  0,
>+    0,   0,   0,   0,   1,   0,   0,   0,   101, 0,   0,   3,   18,  32,  16,  0,   1,   0,   0,
>+    0,   101, 0,   0,   3,   34,  32,  16,  0,   1,   0,   0,   0,   104, 0,   0,   2,   2,   0,
>+    0,   0,   54,  0,   0,   8,   194, 32,  16,  0,   0,   0,   0,   0,   2,   64,  0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   128, 63,  38,  0,   0,   10,
>+    0,   208, 0,   0,   50,  0,   16,  0,   0,   0,   0,   0,   150, 133, 32,  0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   246, 143, 32,  0,   0,   0,   0,   0,   0,   0,   0,   0,   78,  0,
>+    0,   8,   66,  0,   16,  0,   0,   0,   0,   0,   0,   208, 0,   0,   10,  16,  16,  0,   0,
>+    0,   0,   0,   10,  0,   16,  0,   0,   0,   0,   0,   35,  0,   0,   10,  18,  0,   16,  0,
>+    0,   0,   0,   0,   42,  0,   16,  128, 65,  0,   0,   0,   0,   0,   0,   0,   10,  0,   16,
>+    0,   0,   0,   0,   0,   10,  16,  16,  0,   0,   0,   0,   0,   35,  0,   0,   10,  34,  0,
>+    16,  0,   0,   0,   0,   0,   42,  0,   16,  0,   0,   0,   0,   0,   26,  0,   16,  0,   0,
>+    0,   0,   0,   10,  128, 32,  0,   0,   0,   0,   0,   0,   0,   0,   0,   30,  0,   0,   8,
>+    34,  32,  16,  0,   1,   0,   0,   0,   10,  128, 32,  0,   0,   0,   0,   0,   3,   0,   0,
>+    0,   42,  0,   16,  0,   0,   0,   0,   0,   78,  0,   0,   9,   66,  0,   16,  0,   0,   0,
>+    0,   0,   0,   208, 0,   0,   10,  0,   16,  0,   0,   0,   0,   0,   26,  128, 32,  0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   35,  0,   0,   11,  18,  0,   16,  0,   0,   0,   0,   0,
>+    42,  0,   16,  128, 65,  0,   0,   0,   0,   0,   0,   0,   26,  128, 32,  0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   10,  0,   16,  0,   0,   0,   0,   0,   86,  0,   0,   5,   50,  0,
>+    16,  0,   1,   0,   0,   0,   134, 0,   16,  0,   0,   0,   0,   0,   35,  0,   0,   10,  34,
>+    0,   16,  0,   0,   0,   0,   0,   42,  0,   16,  0,   0,   0,   0,   0,   42,  128, 32,  0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   26,  0,   16,  0,   0,   0,   0,   0,   30,  0,   0,
>+    7,   18,  32,  16,  0,   1,   0,   0,   0,   26,  0,   16,  0,   0,   0,   0,   0,   10,  0,
>+    16,  0,   0,   0,   0,   0,   50,  0,   0,   11,  50,  32,  16,  0,   0,   0,   0,   0,   230,
>+    138, 32,  0,   0,   0,   0,   0,   1,   0,   0,   0,   70,  0,   16,  0,   1,   0,   0,   0,
>+    70,  128, 32,  0,   0,   0,   0,   0,   1,   0,   0,   0,   62,  0,   0,   1,   83,  84,  65,
>+    84,  116, 0,   0,   0,   13,  0,   0,   0,   2,   0,   0,   0,   0,   0,   0,   0,   4,   0,
>+    0,   0,   0,   0,   0,   0,   3,   0,   0,   0,   2,   0,   0,   0,   1,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0};
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clear11_fl9vs.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clear11_fl9vs.h
>index 3427ebb741c..4998c475940 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clear11_fl9vs.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clear11_fl9vs.h
>@@ -1,21 +1,25 @@
> #if 0
> //
>-// Generated by Microsoft (R) HLSL Shader Compiler 6.3.9600.16384
>+// Generated by Microsoft (R) HLSL Shader Compiler 9.29.952.3111
>+//
>+//
>+//   fxc /nologo /E VS_Clear_FL9 /T vs_4_0_level_9_3 /Fh
>+//    compiled\clear11_fl9vs.h Clear11.hlsl
> //
> //
> //
> // Input signature:
> //
>-// Name                 Index   Mask Register SysValue  Format   Used
>-// -------------------- ----- ------ -------- -------- ------- ------
>-// POSITION                 0   xyzw        0     NONE   float   xyzw
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// POSITION                 0   xyzw        0     NONE  float   xyzw
> //
> //
> // Output signature:
> //
>-// Name                 Index   Mask Register SysValue  Format   Used
>-// -------------------- ----- ------ -------- -------- ------- ------
>-// SV_POSITION              0   xyzw        0      POS   float   xyzw
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_POSITION              0   xyzw        0      POS  float   xyzw
> //
> //
> // Runtime generated constant mappings:
>@@ -41,96 +45,31 @@ ret
> // Approximately 2 instruction slots used
> #endif
> 
>-const BYTE g_VS_Clear_FL9[] =
>-{
>-     68,  88,  66,  67, 176,  74, 
>-    193, 175,  25,  51, 252,  39, 
>-    176, 214, 107,  38, 137, 209, 
>-    240, 189,   1,   0,   0,   0, 
>-     28,   2,   0,   0,   6,   0, 
>-      0,   0,  56,   0,   0,   0, 
>-    156,   0,   0,   0, 224,   0, 
>-      0,   0,  92,   1,   0,   0, 
>-    180,   1,   0,   0, 232,   1, 
>-      0,   0,  65, 111, 110,  57, 
>-     92,   0,   0,   0,  92,   0, 
>-      0,   0,   0,   2, 254, 255, 
>-     52,   0,   0,   0,  40,   0, 
>-      0,   0,   0,   0,  36,   0, 
>-      0,   0,  36,   0,   0,   0, 
>-     36,   0,   0,   0,  36,   0, 
>-      1,   0,  36,   0,   0,   0, 
>-      0,   0,   1,   2, 254, 255, 
>-     31,   0,   0,   2,   5,   0, 
>-      0, 128,   0,   0,  15, 144, 
>-      4,   0,   0,   4,   0,   0, 
>-      3, 192,   0,   0, 255, 144, 
>-      0,   0, 228, 160,   0,   0, 
>-    228, 144,   1,   0,   0,   2, 
>-      0,   0,  12, 192,   0,   0, 
>-    228, 144, 255, 255,   0,   0, 
>-     83,  72,  68,  82,  60,   0, 
>-      0,   0,  64,   0,   1,   0, 
>-     15,   0,   0,   0,  95,   0, 
>-      0,   3, 242,  16,  16,   0, 
>-      0,   0,   0,   0, 103,   0, 
>-      0,   4, 242,  32,  16,   0, 
>-      0,   0,   0,   0,   1,   0, 
>-      0,   0,  54,   0,   0,   5, 
>-    242,  32,  16,   0,   0,   0, 
>-      0,   0,  70,  30,  16,   0, 
>-      0,   0,   0,   0,  62,   0, 
>-      0,   1,  83,  84,  65,  84, 
>-    116,   0,   0,   0,   2,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   2,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   1,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   1,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-     82,  68,  69,  70,  80,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,  28,   0,   0,   0, 
>-      0,   4, 254, 255,   0,   1, 
>-      0,   0,  28,   0,   0,   0, 
>-     77, 105,  99, 114, 111, 115, 
>-    111, 102, 116,  32,  40,  82, 
>-     41,  32,  72,  76,  83,  76, 
>-     32,  83, 104,  97, 100, 101, 
>-    114,  32,  67, 111, 109, 112, 
>-    105, 108, 101, 114,  32,  54, 
>-     46,  51,  46,  57,  54,  48, 
>-     48,  46,  49,  54,  51,  56, 
>-     52,   0, 171, 171,  73,  83, 
>-     71,  78,  44,   0,   0,   0, 
>-      1,   0,   0,   0,   8,   0, 
>-      0,   0,  32,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   3,   0,   0,   0, 
>-      0,   0,   0,   0,  15,  15, 
>-      0,   0,  80,  79,  83,  73, 
>-     84,  73,  79,  78,   0, 171, 
>-    171, 171,  79,  83,  71,  78, 
>-     44,   0,   0,   0,   1,   0, 
>-      0,   0,   8,   0,   0,   0, 
>-     32,   0,   0,   0,   0,   0, 
>-      0,   0,   1,   0,   0,   0, 
>-      3,   0,   0,   0,   0,   0, 
>-      0,   0,  15,   0,   0,   0, 
>-     83,  86,  95,  80,  79,  83, 
>-     73,  84,  73,  79,  78,   0
>-};
>+const BYTE g_VS_Clear_FL9[] = {
>+    68,  88, 66, 67, 70,  225, 22,  82,  198, 171, 210, 104, 82,  233, 227, 173, 206, 48,  250, 109,
>+    1,   0,  0,  0,  28,  2,   0,   0,   6,   0,   0,   0,   56,  0,   0,   0,   156, 0,   0,   0,
>+    224, 0,  0,  0,  92,  1,   0,   0,   180, 1,   0,   0,   232, 1,   0,   0,   65,  111, 110, 57,
>+    92,  0,  0,  0,  92,  0,   0,   0,   0,   2,   254, 255, 52,  0,   0,   0,   40,  0,   0,   0,
>+    0,   0,  36, 0,  0,   0,   36,  0,   0,   0,   36,  0,   0,   0,   36,  0,   1,   0,   36,  0,
>+    0,   0,  0,  0,  1,   2,   254, 255, 31,  0,   0,   2,   5,   0,   0,   128, 0,   0,   15,  144,
>+    4,   0,  0,  4,  0,   0,   3,   192, 0,   0,   255, 144, 0,   0,   228, 160, 0,   0,   228, 144,
>+    1,   0,  0,  2,  0,   0,   12,  192, 0,   0,   228, 144, 255, 255, 0,   0,   83,  72,  68,  82,
>+    60,  0,  0,  0,  64,  0,   1,   0,   15,  0,   0,   0,   95,  0,   0,   3,   242, 16,  16,  0,
>+    0,   0,  0,  0,  103, 0,   0,   4,   242, 32,  16,  0,   0,   0,   0,   0,   1,   0,   0,   0,
>+    54,  0,  0,  5,  242, 32,  16,  0,   0,   0,   0,   0,   70,  30,  16,  0,   0,   0,   0,   0,
>+    62,  0,  0,  1,  83,  84,  65,  84,  116, 0,   0,   0,   2,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,  0,  0,  2,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    1,   0,  0,  0,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,  0,  0,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,  0,  0,  0,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,  0,  0,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,  0,  0,  0,   0,   0,   0,   82,  68,  69,  70,  80,  0,   0,   0,   0,   0,   0,   0,
>+    0,   0,  0,  0,  0,   0,   0,   0,   28,  0,   0,   0,   0,   4,   254, 255, 0,   1,   0,   0,
>+    28,  0,  0,  0,  77,  105, 99,  114, 111, 115, 111, 102, 116, 32,  40,  82,  41,  32,  72,  76,
>+    83,  76, 32, 83, 104, 97,  100, 101, 114, 32,  67,  111, 109, 112, 105, 108, 101, 114, 32,  57,
>+    46,  50, 57, 46, 57,  53,  50,  46,  51,  49,  49,  49,  0,   171, 171, 171, 73,  83,  71,  78,
>+    44,  0,  0,  0,  1,   0,   0,   0,   8,   0,   0,   0,   32,  0,   0,   0,   0,   0,   0,   0,
>+    0,   0,  0,  0,  3,   0,   0,   0,   0,   0,   0,   0,   15,  15,  0,   0,   80,  79,  83,  73,
>+    84,  73, 79, 78, 0,   171, 171, 171, 79,  83,  71,  78,  44,  0,   0,   0,   1,   0,   0,   0,
>+    8,   0,  0,  0,  32,  0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   3,   0,   0,   0,
>+    0,   0,  0,  0,  15,  0,   0,   0,   83,  86,  95,  80,  79,  83,  73,  84,  73,  79,  78,  0};
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clear11multiviewgs.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clear11multiviewgs.h
>index 150cde921cf..fa13ac63406 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clear11multiviewgs.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clear11multiviewgs.h
>@@ -1,23 +1,27 @@
> #if 0
> //
>-// Generated by Microsoft (R) HLSL Shader Compiler 6.3.9600.16384
>+// Generated by Microsoft (R) HLSL Shader Compiler 9.29.952.3111
>+//
>+//
>+//   fxc /nologo /E GS_Multiview_Clear /T gs_4_0 /Fh
>+//    compiled\clear11multiviewgs.h Clear11.hlsl
> //
> //
> //
> // Input signature:
> //
>-// Name                 Index   Mask Register SysValue  Format   Used
>-// -------------------- ----- ------ -------- -------- ------- ------
>-// SV_Position              0   xyzw        0      POS   float   xyzw
>-// TEXCOORD                 0   x           1     NONE    uint   x   
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_Position              0   xyzw        0      POS  float   xyzw
>+// TEXCOORD                 0   x           1     NONE   uint   x   
> //
> //
> // Output signature:
> //
>-// Name                 Index   Mask Register SysValue  Format   Used
>-// -------------------- ----- ------ -------- -------- ------- ------
>-// SV_Position              0   xyzw        0      POS   float   xyzw
>-// SV_RenderTargetArrayIndex     0   x           1  RTINDEX    uint   x   
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_Position              0   xyzw        0      POS  float   xyzw
>+// SV_RenderTargetArrayIndex     0   x           1  RTINDEX   uint   x   
> //
> gs_4_0
> dcl_input_siv v[3][0].xyzw, position
>@@ -43,42 +47,42 @@ ret
> #endif
> 
> const BYTE g_GS_Multiview_Clear[] = {
>-    68,  88,  66,  67,  244, 54,  208, 241, 128, 215, 208, 159, 113, 168, 148, 173, 167, 24,  78,
>-    189, 1,   0,   0,   0,   216, 2,   0,   0,   5,   0,   0,   0,   52,  0,   0,   0,   140, 0,
>-    0,   0,   228, 0,   0,   0,   76,  1,   0,   0,   92,  2,   0,   0,   82,  68,  69,  70,  80,
>-    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   28,  0,   0,   0,
>-    0,   4,   83,  71,  0,   1,   0,   0,   28,  0,   0,   0,   77,  105, 99,  114, 111, 115, 111,
>-    102, 116, 32,  40,  82,  41,  32,  72,  76,  83,  76,  32,  83,  104, 97,  100, 101, 114, 32,
>-    67,  111, 109, 112, 105, 108, 101, 114, 32,  54,  46,  51,  46,  57,  54,  48,  48,  46,  49,
>-    54,  51,  56,  52,  0,   171, 171, 73,  83,  71,  78,  80,  0,   0,   0,   2,   0,   0,   0,
>-    8,   0,   0,   0,   56,  0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   3,   0,   0,
>-    0,   0,   0,   0,   0,   15,  15,  0,   0,   68,  0,   0,   0,   0,   0,   0,   0,   0,   0,
>-    0,   0,   1,   0,   0,   0,   1,   0,   0,   0,   1,   1,   0,   0,   83,  86,  95,  80,  111,
>-    115, 105, 116, 105, 111, 110, 0,   84,  69,  88,  67,  79,  79,  82,  68,  0,   171, 171, 171,
>-    79,  83,  71,  78,  96,  0,   0,   0,   2,   0,   0,   0,   8,   0,   0,   0,   56,  0,   0,
>-    0,   0,   0,   0,   0,   1,   0,   0,   0,   3,   0,   0,   0,   0,   0,   0,   0,   15,  0,
>-    0,   0,   68,  0,   0,   0,   0,   0,   0,   0,   4,   0,   0,   0,   1,   0,   0,   0,   1,
>-    0,   0,   0,   1,   14,  0,   0,   83,  86,  95,  80,  111, 115, 105, 116, 105, 111, 110, 0,
>-    83,  86,  95,  82,  101, 110, 100, 101, 114, 84,  97,  114, 103, 101, 116, 65,  114, 114, 97,
>-    121, 73,  110, 100, 101, 120, 0,   171, 171, 83,  72,  68,  82,  8,   1,   0,   0,   64,  0,
>-    2,   0,   66,  0,   0,   0,   97,  0,   0,   5,   242, 16,  32,  0,   3,   0,   0,   0,   0,
>-    0,   0,   0,   1,   0,   0,   0,   95,  0,   0,   4,   18,  16,  32,  0,   3,   0,   0,   0,
>-    1,   0,   0,   0,   104, 0,   0,   2,   1,   0,   0,   0,   93,  24,  0,   1,   92,  40,  0,
>-    1,   103, 0,   0,   4,   242, 32,  16,  0,   0,   0,   0,   0,   1,   0,   0,   0,   103, 0,
>-    0,   4,   18,  32,  16,  0,   1,   0,   0,   0,   4,   0,   0,   0,   94,  0,   0,   2,   3,
>-    0,   0,   0,   54,  0,   0,   5,   18,  0,   16,  0,   0,   0,   0,   0,   1,   64,  0,   0,
>-    0,   0,   0,   0,   48,  0,   0,   1,   33,  0,   0,   7,   34,  0,   16,  0,   0,   0,   0,
>-    0,   10,  0,   16,  0,   0,   0,   0,   0,   1,   64,  0,   0,   3,   0,   0,   0,   3,   0,
>-    4,   3,   26,  0,   16,  0,   0,   0,   0,   0,   54,  0,   0,   7,   242, 32,  16,  0,   0,
>-    0,   0,   0,   70,  30,  160, 0,   10,  0,   16,  0,   0,   0,   0,   0,   0,   0,   0,   0,
>-    54,  0,   0,   7,   18,  32,  16,  0,   1,   0,   0,   0,   10,  16,  160, 0,   10,  0,   16,
>-    0,   0,   0,   0,   0,   1,   0,   0,   0,   19,  0,   0,   1,   30,  0,   0,   7,   18,  0,
>-    16,  0,   0,   0,   0,   0,   10,  0,   16,  0,   0,   0,   0,   0,   1,   64,  0,   0,   1,
>-    0,   0,   0,   22,  0,   0,   1,   9,   0,   0,   1,   62,  0,   0,   1,   83,  84,  65,  84,
>-    116, 0,   0,   0,   11,  0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   4,   0,   0,
>-    0,   0,   0,   0,   0,   2,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   1,   0,
>-    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   1,
>-    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>-    0,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>-    0,   3,   0,   0,   0,   5,   0,   0,   0,   3,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    68,  88,  66,  67,  97,  213, 116, 205, 170, 60, 132, 93,  138, 100, 91,  17,  237, 138, 8,
>+    224, 1,   0,   0,   0,   216, 2,   0,   0,   5,  0,   0,   0,   52,  0,   0,   0,   140, 0,
>+    0,   0,   228, 0,   0,   0,   76,  1,   0,   0,  92,  2,   0,   0,   82,  68,  69,  70,  80,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,  0,   0,   0,   0,   0,   28,  0,   0,   0,
>+    0,   4,   83,  71,  0,   1,   0,   0,   28,  0,  0,   0,   77,  105, 99,  114, 111, 115, 111,
>+    102, 116, 32,  40,  82,  41,  32,  72,  76,  83, 76,  32,  83,  104, 97,  100, 101, 114, 32,
>+    67,  111, 109, 112, 105, 108, 101, 114, 32,  57, 46,  50,  57,  46,  57,  53,  50,  46,  51,
>+    49,  49,  49,  0,   171, 171, 171, 73,  83,  71, 78,  80,  0,   0,   0,   2,   0,   0,   0,
>+    8,   0,   0,   0,   56,  0,   0,   0,   0,   0,  0,   0,   1,   0,   0,   0,   3,   0,   0,
>+    0,   0,   0,   0,   0,   15,  15,  0,   0,   68, 0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   1,   0,   0,   0,   1,   0,   0,   0,  1,   1,   0,   0,   83,  86,  95,  80,  111,
>+    115, 105, 116, 105, 111, 110, 0,   84,  69,  88, 67,  79,  79,  82,  68,  0,   171, 171, 171,
>+    79,  83,  71,  78,  96,  0,   0,   0,   2,   0,  0,   0,   8,   0,   0,   0,   56,  0,   0,
>+    0,   0,   0,   0,   0,   1,   0,   0,   0,   3,  0,   0,   0,   0,   0,   0,   0,   15,  0,
>+    0,   0,   68,  0,   0,   0,   0,   0,   0,   0,  4,   0,   0,   0,   1,   0,   0,   0,   1,
>+    0,   0,   0,   1,   14,  0,   0,   83,  86,  95, 80,  111, 115, 105, 116, 105, 111, 110, 0,
>+    83,  86,  95,  82,  101, 110, 100, 101, 114, 84, 97,  114, 103, 101, 116, 65,  114, 114, 97,
>+    121, 73,  110, 100, 101, 120, 0,   171, 171, 83, 72,  68,  82,  8,   1,   0,   0,   64,  0,
>+    2,   0,   66,  0,   0,   0,   97,  0,   0,   5,  242, 16,  32,  0,   3,   0,   0,   0,   0,
>+    0,   0,   0,   1,   0,   0,   0,   95,  0,   0,  4,   18,  16,  32,  0,   3,   0,   0,   0,
>+    1,   0,   0,   0,   104, 0,   0,   2,   1,   0,  0,   0,   93,  24,  0,   1,   92,  40,  0,
>+    1,   103, 0,   0,   4,   242, 32,  16,  0,   0,  0,   0,   0,   1,   0,   0,   0,   103, 0,
>+    0,   4,   18,  32,  16,  0,   1,   0,   0,   0,  4,   0,   0,   0,   94,  0,   0,   2,   3,
>+    0,   0,   0,   54,  0,   0,   5,   18,  0,   16, 0,   0,   0,   0,   0,   1,   64,  0,   0,
>+    0,   0,   0,   0,   48,  0,   0,   1,   33,  0,  0,   7,   34,  0,   16,  0,   0,   0,   0,
>+    0,   10,  0,   16,  0,   0,   0,   0,   0,   1,  64,  0,   0,   3,   0,   0,   0,   3,   0,
>+    4,   3,   26,  0,   16,  0,   0,   0,   0,   0,  54,  0,   0,   7,   242, 32,  16,  0,   0,
>+    0,   0,   0,   70,  30,  160, 0,   10,  0,   16, 0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    54,  0,   0,   7,   18,  32,  16,  0,   1,   0,  0,   0,   10,  16,  160, 0,   10,  0,   16,
>+    0,   0,   0,   0,   0,   1,   0,   0,   0,   19, 0,   0,   1,   30,  0,   0,   7,   18,  0,
>+    16,  0,   0,   0,   0,   0,   10,  0,   16,  0,  0,   0,   0,   0,   1,   64,  0,   0,   1,
>+    0,   0,   0,   22,  0,   0,   1,   9,   0,   0,  1,   62,  0,   0,   1,   83,  84,  65,  84,
>+    116, 0,   0,   0,   11,  0,   0,   0,   1,   0,  0,   0,   0,   0,   0,   0,   4,   0,   0,
>+    0,   0,   0,   0,   0,   2,   0,   0,   0,   0,  0,   0,   0,   1,   0,   0,   0,   1,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,  0,   0,   0,   0,   1,   0,   0,   0,   1,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,  0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   11,  0,   0,   0,   0,   0,  0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   3,   0,   0,   0,   5,   0,   0,   0,   3,  0,   0,   0,   0,   0,   0,   0,   0,   0,
>     0,   0,   0,   0,   0,   0};
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clear11multiviewvs.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clear11multiviewvs.h
>index af31139d43e..820ffdd1154 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clear11multiviewvs.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clear11multiviewvs.h
>@@ -1,23 +1,27 @@
> #if 0
> //
>-// Generated by Microsoft (R) HLSL Shader Compiler 6.3.9600.16384
>+// Generated by Microsoft (R) HLSL Shader Compiler 9.29.952.3111
>+//
>+//
>+//   fxc /nologo /E VS_Multiview_Clear /T vs_4_0 /Fh
>+//    compiled\clear11multiviewvs.h Clear11.hlsl
> //
> //
> //
> // Input signature:
> //
>-// Name                 Index   Mask Register SysValue  Format   Used
>-// -------------------- ----- ------ -------- -------- ------- ------
>-// SV_VertexID              0   x           0   VERTID    uint   x   
>-// SV_InstanceID            0   x           1   INSTID    uint   x   
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_VertexID              0   x           0   VERTID   uint   x   
>+// SV_InstanceID            0   x           1   INSTID   uint   x   
> //
> //
> // Output signature:
> //
>-// Name                 Index   Mask Register SysValue  Format   Used
>-// -------------------- ----- ------ -------- -------- ------- ------
>-// SV_POSITION              0   xyzw        0      POS   float   xyzw
>-// TEXCOORD                 0   x           1     NONE    uint   x   
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_POSITION              0   xyzw        0      POS  float   xyzw
>+// TEXCOORD                 0   x           1     NONE   uint   x   
> //
> vs_4_0
> dcl_immediateConstantBuffer { { -1.000000, 1.000000, 0, 0},
>@@ -40,14 +44,14 @@ ret
> #endif
> 
> const BYTE g_VS_Multiview_Clear[] = {
>-    68,  88,  66,  67,  45,  246, 70,  124, 58,  101, 157, 14,  171, 136, 167, 118, 133, 161, 59,
>-    68,  1,   0,   0,   0,   220, 2,   0,   0,   5,   0,   0,   0,   52,  0,   0,   0,   140, 0,
>+    68,  88,  66,  67,  14,  99,  210, 81,  182, 39,  8,   134, 74,  169, 88,  103, 114, 197, 56,
>+    220, 1,   0,   0,   0,   220, 2,   0,   0,   5,   0,   0,   0,   52,  0,   0,   0,   140, 0,
>     0,   0,   232, 0,   0,   0,   64,  1,   0,   0,   96,  2,   0,   0,   82,  68,  69,  70,  80,
>     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   28,  0,   0,   0,
>     0,   4,   254, 255, 0,   1,   0,   0,   28,  0,   0,   0,   77,  105, 99,  114, 111, 115, 111,
>     102, 116, 32,  40,  82,  41,  32,  72,  76,  83,  76,  32,  83,  104, 97,  100, 101, 114, 32,
>-    67,  111, 109, 112, 105, 108, 101, 114, 32,  54,  46,  51,  46,  57,  54,  48,  48,  46,  49,
>-    54,  51,  56,  52,  0,   171, 171, 73,  83,  71,  78,  84,  0,   0,   0,   2,   0,   0,   0,
>+    67,  111, 109, 112, 105, 108, 101, 114, 32,  57,  46,  50,  57,  46,  57,  53,  50,  46,  51,
>+    49,  49,  49,  0,   171, 171, 171, 73,  83,  71,  78,  84,  0,   0,   0,   2,   0,   0,   0,
>     8,   0,   0,   0,   56,  0,   0,   0,   0,   0,   0,   0,   6,   0,   0,   0,   1,   0,   0,
>     0,   0,   0,   0,   0,   1,   1,   0,   0,   68,  0,   0,   0,   0,   0,   0,   0,   8,   0,
>     0,   0,   1,   0,   0,   0,   1,   0,   0,   0,   1,   1,   0,   0,   83,  86,  95,  86,  101,
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clear11vs.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clear11vs.h
>index 526d0c6f089..948452592ad 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clear11vs.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clear11vs.h
>@@ -1,21 +1,24 @@
> #if 0
> //
>-// Generated by Microsoft (R) HLSL Shader Compiler 6.3.9600.16384
>+// Generated by Microsoft (R) HLSL Shader Compiler 9.29.952.3111
>+//
>+//
>+//   fxc /nologo /E VS_Clear /T vs_4_0 /Fh compiled\clear11vs.h Clear11.hlsl
> //
> //
> //
> // Input signature:
> //
>-// Name                 Index   Mask Register SysValue  Format   Used
>-// -------------------- ----- ------ -------- -------- ------- ------
>-// SV_VertexID              0   x           0   VERTID    uint   x   
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_VertexID              0   x           0   VERTID   uint   x   
> //
> //
> // Output signature:
> //
>-// Name                 Index   Mask Register SysValue  Format   Used
>-// -------------------- ----- ------ -------- -------- ------- ------
>-// SV_POSITION              0   xyzw        0      POS   float   xyzw
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_POSITION              0   xyzw        0      POS  float   xyzw
> //
> vs_4_0
> dcl_immediateConstantBuffer { { -1.000000, 1.000000, 0, 0},
>@@ -34,108 +37,36 @@ ret
> // Approximately 4 instruction slots used
> #endif
> 
>-const BYTE g_VS_Clear[] =
>-{
>-     68,  88,  66,  67, 170,  97, 
>-     47,  88, 112,  76, 249,  40, 
>-    248, 151, 133,  76, 228, 131, 
>-     60, 115,   1,   0,   0,   0, 
>-     96,   2,   0,   0,   5,   0, 
>-      0,   0,  52,   0,   0,   0, 
>-    140,   0,   0,   0, 192,   0, 
>-      0,   0, 244,   0,   0,   0, 
>-    228,   1,   0,   0,  82,  68, 
>-     69,  70,  80,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-     28,   0,   0,   0,   0,   4, 
>-    254, 255,   0,   1,   0,   0, 
>-     28,   0,   0,   0,  77, 105, 
>-     99, 114, 111, 115, 111, 102, 
>-    116,  32,  40,  82,  41,  32, 
>-     72,  76,  83,  76,  32,  83, 
>-    104,  97, 100, 101, 114,  32, 
>-     67, 111, 109, 112, 105, 108, 
>-    101, 114,  32,  54,  46,  51, 
>-     46,  57,  54,  48,  48,  46, 
>-     49,  54,  51,  56,  52,   0, 
>-    171, 171,  73,  83,  71,  78, 
>-     44,   0,   0,   0,   1,   0, 
>-      0,   0,   8,   0,   0,   0, 
>-     32,   0,   0,   0,   0,   0, 
>-      0,   0,   6,   0,   0,   0, 
>-      1,   0,   0,   0,   0,   0, 
>-      0,   0,   1,   1,   0,   0, 
>-     83,  86,  95,  86, 101, 114, 
>-    116, 101, 120,  73,  68,   0, 
>-     79,  83,  71,  78,  44,   0, 
>-      0,   0,   1,   0,   0,   0, 
>-      8,   0,   0,   0,  32,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      1,   0,   0,   0,   3,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-     15,   0,   0,   0,  83,  86, 
>-     95,  80,  79,  83,  73,  84, 
>-     73,  79,  78,   0,  83,  72, 
>-     68,  82, 232,   0,   0,   0, 
>-     64,   0,   1,   0,  58,   0, 
>-      0,   0,  53,  24,   0,   0, 
>-     26,   0,   0,   0,   0,   0, 
>-    128, 191,   0,   0, 128,  63, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0, 128,  63, 
>-      0,   0, 128, 191,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0, 128, 191,   0,   0, 
>-    128, 191,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-    128, 191,   0,   0, 128,  63, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0, 128,  63, 
>-      0,   0, 128,  63,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0, 128,  63,   0,   0, 
>-    128, 191,   0,   0,   0,   0, 
>-      0,   0,   0,   0,  96,   0, 
>-      0,   4,  18,  16,  16,   0, 
>-      0,   0,   0,   0,   6,   0, 
>-      0,   0, 103,   0,   0,   4, 
>-    242,  32,  16,   0,   0,   0, 
>-      0,   0,   1,   0,   0,   0, 
>-    104,   0,   0,   2,   1,   0, 
>-      0,   0,  54,   0,   0,   5, 
>-     18,   0,  16,   0,   0,   0, 
>-      0,   0,  10,  16,  16,   0, 
>-      0,   0,   0,   0,  54,   0, 
>-      0,   6,  50,  32,  16,   0, 
>-      0,   0,   0,   0,  70, 144, 
>-    144,   0,  10,   0,  16,   0, 
>-      0,   0,   0,   0,  54,   0, 
>-      0,   8, 194,  32,  16,   0, 
>-      0,   0,   0,   0,   2,  64, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0, 128,  63, 
>-     62,   0,   0,   1,  83,  84, 
>-     65,  84, 116,   0,   0,   0, 
>-      4,   0,   0,   0,   1,   0, 
>-      0,   0,   6,   0,   0,   0, 
>-      2,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   1,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   3,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0
>-};
>+const BYTE g_VS_Clear[] = {
>+    68,  88,  66,  67,  103, 28,  87,  215, 135, 83, 130, 82,  213, 30,  12,  24,  41,  41,  187,
>+    87,  1,   0,   0,   0,   96,  2,   0,   0,   5,  0,   0,   0,   52,  0,   0,   0,   140, 0,
>+    0,   0,   192, 0,   0,   0,   244, 0,   0,   0,  228, 1,   0,   0,   82,  68,  69,  70,  80,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,  0,   0,   0,   0,   0,   28,  0,   0,   0,
>+    0,   4,   254, 255, 0,   1,   0,   0,   28,  0,  0,   0,   77,  105, 99,  114, 111, 115, 111,
>+    102, 116, 32,  40,  82,  41,  32,  72,  76,  83, 76,  32,  83,  104, 97,  100, 101, 114, 32,
>+    67,  111, 109, 112, 105, 108, 101, 114, 32,  57, 46,  50,  57,  46,  57,  53,  50,  46,  51,
>+    49,  49,  49,  0,   171, 171, 171, 73,  83,  71, 78,  44,  0,   0,   0,   1,   0,   0,   0,
>+    8,   0,   0,   0,   32,  0,   0,   0,   0,   0,  0,   0,   6,   0,   0,   0,   1,   0,   0,
>+    0,   0,   0,   0,   0,   1,   1,   0,   0,   83, 86,  95,  86,  101, 114, 116, 101, 120, 73,
>+    68,  0,   79,  83,  71,  78,  44,  0,   0,   0,  1,   0,   0,   0,   8,   0,   0,   0,   32,
>+    0,   0,   0,   0,   0,   0,   0,   1,   0,   0,  0,   3,   0,   0,   0,   0,   0,   0,   0,
>+    15,  0,   0,   0,   83,  86,  95,  80,  79,  83, 73,  84,  73,  79,  78,  0,   83,  72,  68,
>+    82,  232, 0,   0,   0,   64,  0,   1,   0,   58, 0,   0,   0,   53,  24,  0,   0,   26,  0,
>+    0,   0,   0,   0,   128, 191, 0,   0,   128, 63, 0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   128, 63,  0,   0,   128, 191, 0,   0,   0,  0,   0,   0,   0,   0,   0,   0,   128, 191,
>+    0,   0,   128, 191, 0,   0,   0,   0,   0,   0,  0,   0,   0,   0,   128, 191, 0,   0,   128,
>+    63,  0,   0,   0,   0,   0,   0,   0,   0,   0,  0,   128, 63,  0,   0,   128, 63,  0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   128, 63, 0,   0,   128, 191, 0,   0,   0,   0,   0,
>+    0,   0,   0,   96,  0,   0,   4,   18,  16,  16, 0,   0,   0,   0,   0,   6,   0,   0,   0,
>+    103, 0,   0,   4,   242, 32,  16,  0,   0,   0,  0,   0,   1,   0,   0,   0,   104, 0,   0,
>+    2,   1,   0,   0,   0,   54,  0,   0,   5,   18, 0,   16,  0,   0,   0,   0,   0,   10,  16,
>+    16,  0,   0,   0,   0,   0,   54,  0,   0,   6,  50,  32,  16,  0,   0,   0,   0,   0,   70,
>+    144, 144, 0,   10,  0,   16,  0,   0,   0,   0,  0,   54,  0,   0,   8,   194, 32,  16,  0,
>+    0,   0,   0,   0,   2,   64,  0,   0,   0,   0,  0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   128, 63,  62,  0,   0,   1,   83, 84,  65,  84,  116, 0,   0,   0,   4,   0,
>+    0,   0,   1,   0,   0,   0,   6,   0,   0,   0,  2,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   1,   0,   0,  0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,  0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,  0,   0,   0,   0,   0,   0,   0,   3,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,  0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,  0,   0,   0,   0,   0,   0,   0,   0,   0};
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/cleardepth11ps.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/cleardepth11ps.h
>index 326061b009c..742d511118c 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/cleardepth11ps.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/cleardepth11ps.h
>@@ -1,6 +1,10 @@
> #if 0
> //
>-// Generated by Microsoft (R) HLSL Shader Compiler 6.3.9600.16384
>+// Generated by Microsoft (R) HLSL Shader Compiler 9.29.952.3111
>+//
>+//
>+//   fxc /nologo /E PS_ClearDepth /T ps_4_0 /Fh compiled\cleardepth11ps.h
>+//    Clear11.hlsl
> //
> //
> // Buffer Definitions: 
>@@ -23,16 +27,16 @@
> //
> // Input signature:
> //
>-// Name                 Index   Mask Register SysValue  Format   Used
>-// -------------------- ----- ------ -------- -------- ------- ------
>-// SV_POSITION              0   xyzw        0      POS   float       
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_POSITION              0   xyzw        0      POS  float       
> //
> //
> // Output signature:
> //
>-// Name                 Index   Mask Register SysValue  Format   Used
>-// -------------------- ----- ------ -------- -------- ------- ------
>-// SV_DEPTH                 0    N/A   oDepth    DEPTH   float    YES
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_DEPTH                 0    N/A   oDepth    DEPTH  float    YES
> //
> ps_4_0
> dcl_constantbuffer cb0[2], immediateIndexed
>@@ -43,8 +47,8 @@ ret
> #endif
> 
> const BYTE g_PS_ClearDepth[] = {
>-    68,  88,  66,  67,  118, 105, 246, 232, 152, 45,  90,  172, 38,  100, 140, 153, 229, 217, 123,
>-    120, 1,   0,   0,   0,   48,  2,   0,   0,   5,   0,   0,   0,   52,  0,   0,   0,   12,  1,
>+    68,  88,  66,  67,  120, 231, 15,  116, 114, 21,  246, 235, 236, 14,  234, 123, 214, 247, 16,
>+    187, 1,   0,   0,   0,   48,  2,   0,   0,   5,   0,   0,   0,   52,  0,   0,   0,   12,  1,
>     0,   0,   64,  1,   0,   0,   116, 1,   0,   0,   180, 1,   0,   0,   82,  68,  69,  70,  208,
>     0,   0,   0,   1,   0,   0,   0,   76,  0,   0,   0,   1,   0,   0,   0,   28,  0,   0,   0,
>     0,   4,   255, 255, 0,   1,   0,   0,   156, 0,   0,   0,   60,  0,   0,   0,   0,   0,   0,
>@@ -56,7 +60,7 @@ const BYTE g_PS_ClearDepth[] = {
>     95,  68,  101, 112, 116, 104, 0,   171, 171, 171, 0,   0,   3,   0,   1,   0,   1,   0,   0,
>     0,   0,   0,   0,   0,   0,   0,   77,  105, 99,  114, 111, 115, 111, 102, 116, 32,  40,  82,
>     41,  32,  72,  76,  83,  76,  32,  83,  104, 97,  100, 101, 114, 32,  67,  111, 109, 112, 105,
>-    108, 101, 114, 32,  54,  46,  51,  46,  57,  54,  48,  48,  46,  49,  54,  51,  56,  52,  0,
>+    108, 101, 114, 32,  57,  46,  50,  57,  46,  57,  53,  50,  46,  51,  49,  49,  49,  0,   171,
>     171, 171, 73,  83,  71,  78,  44,  0,   0,   0,   1,   0,   0,   0,   8,   0,   0,   0,   32,
>     0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   3,   0,   0,   0,   0,   0,   0,   0,
>     15,  0,   0,   0,   83,  86,  95,  80,  79,  83,  73,  84,  73,  79,  78,  0,   79,  83,  71,
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearfloat11_fl9ps.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearfloat11_fl9ps.h
>index 97a8ce7dff2..53de4950e26 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearfloat11_fl9ps.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearfloat11_fl9ps.h
>@@ -1,6 +1,10 @@
> #if 0
> //
>-// Generated by Microsoft (R) HLSL Shader Compiler 6.3.9600.16384
>+// Generated by Microsoft (R) HLSL Shader Compiler 9.29.952.3111
>+//
>+//
>+//   fxc /nologo /E PS_ClearFloat_FL9 /T ps_4_0_level_9_3 /Fh
>+//    compiled\clearfloat11_fl9ps.h Clear11.hlsl
> //
> //
> // Buffer Definitions: 
>@@ -24,20 +28,20 @@
> //
> // Input signature:
> //
>-// Name                 Index   Mask Register SysValue  Format   Used
>-// -------------------- ----- ------ -------- -------- ------- ------
>-// SV_POSITION              0   xyzw        0      POS   float       
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_POSITION              0   xyzw        0      POS  float       
> //
> //
> // Output signature:
> //
>-// Name                 Index   Mask Register SysValue  Format   Used
>-// -------------------- ----- ------ -------- -------- ------- ------
>-// SV_TARGET                0   xyzw        0   TARGET   float   xyzw
>-// SV_TARGET                1   xyzw        1   TARGET   float   xyzw
>-// SV_TARGET                2   xyzw        2   TARGET   float   xyzw
>-// SV_TARGET                3   xyzw        3   TARGET   float   xyzw
>-// SV_DEPTH                 0    N/A   oDepth    DEPTH   float    YES
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_TARGET                0   xyzw        0   TARGET  float   xyzw
>+// SV_TARGET                1   xyzw        1   TARGET  float   xyzw
>+// SV_TARGET                2   xyzw        2   TARGET  float   xyzw
>+// SV_TARGET                3   xyzw        3   TARGET  float   xyzw
>+// SV_DEPTH                 0    N/A   oDepth    DEPTH  float    YES
> //
> //
> // Constant buffer to DX9 shader constant mappings:
>@@ -73,172 +77,57 @@ ret
> // Approximately 6 instruction slots used
> #endif
> 
>-const BYTE g_PS_ClearFloat_FL9[] =
>-{
>-     68,  88,  66,  67,  50, 112, 
>-    200, 244,  43, 179,  42,  60, 
>-      1,  54, 148, 142, 159,  31, 
>-    160, 168,   1,   0,   0,   0, 
>-    228,   3,   0,   0,   6,   0, 
>-      0,   0,  56,   0,   0,   0, 
>-    180,   0,   0,   0, 132,   1, 
>-      0,   0,   0,   2,   0,   0, 
>-     20,   3,   0,   0,  72,   3, 
>-      0,   0,  65, 111, 110,  57, 
>-    116,   0,   0,   0, 116,   0, 
>-      0,   0,   0,   2, 255, 255, 
>-     68,   0,   0,   0,  48,   0, 
>-      0,   0,   1,   0,  36,   0, 
>-      0,   0,  48,   0,   0,   0, 
>-     48,   0,   0,   0,  36,   0, 
>-      0,   0,  48,   0,   0,   0, 
>-      0,   0,   2,   0,   0,   0, 
>-      0,   0,   0,   0,   1,   2, 
>-    255, 255,   1,   0,   0,   2, 
>-      0,   8,  15, 128,   0,   0, 
>-    228, 160,   1,   0,   0,   2, 
>-      1,   8,  15, 128,   0,   0, 
>-    228, 160,   1,   0,   0,   2, 
>-      2,   8,  15, 128,   0,   0, 
>-    228, 160,   1,   0,   0,   2, 
>-      3,   8,  15, 128,   0,   0, 
>-    228, 160,   1,   0,   0,   2, 
>-      0,   8,  15, 144,   1,   0, 
>-      0, 160, 255, 255,   0,   0, 
>-     83,  72,  68,  82, 200,   0, 
>-      0,   0,  64,   0,   0,   0, 
>-     50,   0,   0,   0,  89,   0, 
>-      0,   4,  70, 142,  32,   0, 
>-      0,   0,   0,   0,   2,   0, 
>-      0,   0, 101,   0,   0,   3, 
>-    242,  32,  16,   0,   0,   0, 
>-      0,   0, 101,   0,   0,   3, 
>-    242,  32,  16,   0,   1,   0, 
>-      0,   0, 101,   0,   0,   3, 
>-    242,  32,  16,   0,   2,   0, 
>-      0,   0, 101,   0,   0,   3, 
>-    242,  32,  16,   0,   3,   0, 
>-      0,   0, 101,   0,   0,   2, 
>-      1, 192,   0,   0,  54,   0, 
>-      0,   6, 242,  32,  16,   0, 
>-      0,   0,   0,   0,  70, 142, 
>-     32,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,  54,   0, 
>-      0,   6, 242,  32,  16,   0, 
>-      1,   0,   0,   0,  70, 142, 
>-     32,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,  54,   0, 
>-      0,   6, 242,  32,  16,   0, 
>-      2,   0,   0,   0,  70, 142, 
>-     32,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,  54,   0, 
>-      0,   6, 242,  32,  16,   0, 
>-      3,   0,   0,   0,  70, 142, 
>-     32,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,  54,   0, 
>-      0,   5,   1, 192,   0,   0, 
>-     10, 128,  32,   0,   0,   0, 
>-      0,   0,   1,   0,   0,   0, 
>-     62,   0,   0,   1,  83,  84, 
>-     65,  84, 116,   0,   0,   0, 
>-      6,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      5,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   1,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   5,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,  82,  68,  69,  70, 
>-     12,   1,   0,   0,   1,   0, 
>-      0,   0,  84,   0,   0,   0, 
>-      1,   0,   0,   0,  28,   0, 
>-      0,   0,   0,   4, 255, 255, 
>-      0,   1,   0,   0, 216,   0, 
>-      0,   0,  60,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   1,   0,   0,   0, 
>-      1,   0,   0,   0,  67, 111, 
>-    108, 111, 114,  65, 110, 100, 
>-     68, 101, 112, 116, 104,  68, 
>-     97, 116,  97,  70, 108, 111, 
>-     97, 116,   0, 171,  60,   0, 
>-      0,   0,   2,   0,   0,   0, 
>-    108,   0,   0,   0,  32,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0, 156,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-     16,   0,   0,   0,   2,   0, 
>-      0,   0, 168,   0,   0,   0, 
>-      0,   0,   0,   0, 184,   0, 
>-      0,   0,  16,   0,   0,   0, 
>-      4,   0,   0,   0,   2,   0, 
>-      0,   0, 200,   0,   0,   0, 
>-      0,   0,   0,   0,  99, 111, 
>-    108, 111, 114,  95,  70, 108, 
>-    111,  97, 116,   0,   1,   0, 
>-      3,   0,   1,   0,   4,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0, 122,  86,  97, 108, 
>-    117, 101,  70,  95,  70, 108, 
>-    111,  97, 116,   0, 171, 171, 
>-      0,   0,   3,   0,   1,   0, 
>-      1,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,  77, 105, 
>-     99, 114, 111, 115, 111, 102, 
>-    116,  32,  40,  82,  41,  32, 
>-     72,  76,  83,  76,  32,  83, 
>-    104,  97, 100, 101, 114,  32, 
>-     67, 111, 109, 112, 105, 108, 
>-    101, 114,  32,  54,  46,  51, 
>-     46,  57,  54,  48,  48,  46, 
>-     49,  54,  51,  56,  52,   0, 
>-    171, 171,  73,  83,  71,  78, 
>-     44,   0,   0,   0,   1,   0, 
>-      0,   0,   8,   0,   0,   0, 
>-     32,   0,   0,   0,   0,   0, 
>-      0,   0,   1,   0,   0,   0, 
>-      3,   0,   0,   0,   0,   0, 
>-      0,   0,  15,   0,   0,   0, 
>-     83,  86,  95,  80,  79,  83, 
>-     73,  84,  73,  79,  78,   0, 
>-     79,  83,  71,  78, 148,   0, 
>-      0,   0,   5,   0,   0,   0, 
>-      8,   0,   0,   0, 128,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   3,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-     15,   0,   0,   0, 128,   0, 
>-      0,   0,   1,   0,   0,   0, 
>-      0,   0,   0,   0,   3,   0, 
>-      0,   0,   1,   0,   0,   0, 
>-     15,   0,   0,   0, 128,   0, 
>-      0,   0,   2,   0,   0,   0, 
>-      0,   0,   0,   0,   3,   0, 
>-      0,   0,   2,   0,   0,   0, 
>-     15,   0,   0,   0, 128,   0, 
>-      0,   0,   3,   0,   0,   0, 
>-      0,   0,   0,   0,   3,   0, 
>-      0,   0,   3,   0,   0,   0, 
>-     15,   0,   0,   0, 138,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   3,   0, 
>-      0,   0, 255, 255, 255, 255, 
>-      1,  14,   0,   0,  83,  86, 
>-     95,  84,  65,  82,  71,  69, 
>-     84,   0,  83,  86,  95,  68, 
>-     69,  80,  84,  72,   0, 171
>-};
>+const BYTE g_PS_ClearFloat_FL9[] = {
>+    68,  88,  66,  67,  104, 72,  248, 31,  140, 236, 7,   58,  247, 255, 77,  116, 217, 183, 170,
>+    19,  1,   0,   0,   0,   228, 3,   0,   0,   6,   0,   0,   0,   56,  0,   0,   0,   180, 0,
>+    0,   0,   132, 1,   0,   0,   0,   2,   0,   0,   20,  3,   0,   0,   72,  3,   0,   0,   65,
>+    111, 110, 57,  116, 0,   0,   0,   116, 0,   0,   0,   0,   2,   255, 255, 68,  0,   0,   0,
>+    48,  0,   0,   0,   1,   0,   36,  0,   0,   0,   48,  0,   0,   0,   48,  0,   0,   0,   36,
>+    0,   0,   0,   48,  0,   0,   0,   0,   0,   2,   0,   0,   0,   0,   0,   0,   0,   1,   2,
>+    255, 255, 1,   0,   0,   2,   0,   8,   15,  128, 0,   0,   228, 160, 1,   0,   0,   2,   1,
>+    8,   15,  128, 0,   0,   228, 160, 1,   0,   0,   2,   2,   8,   15,  128, 0,   0,   228, 160,
>+    1,   0,   0,   2,   3,   8,   15,  128, 0,   0,   228, 160, 1,   0,   0,   2,   0,   8,   15,
>+    144, 1,   0,   0,   160, 255, 255, 0,   0,   83,  72,  68,  82,  200, 0,   0,   0,   64,  0,
>+    0,   0,   50,  0,   0,   0,   89,  0,   0,   4,   70,  142, 32,  0,   0,   0,   0,   0,   2,
>+    0,   0,   0,   101, 0,   0,   3,   242, 32,  16,  0,   0,   0,   0,   0,   101, 0,   0,   3,
>+    242, 32,  16,  0,   1,   0,   0,   0,   101, 0,   0,   3,   242, 32,  16,  0,   2,   0,   0,
>+    0,   101, 0,   0,   3,   242, 32,  16,  0,   3,   0,   0,   0,   101, 0,   0,   2,   1,   192,
>+    0,   0,   54,  0,   0,   6,   242, 32,  16,  0,   0,   0,   0,   0,   70,  142, 32,  0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   54,  0,   0,   6,   242, 32,  16,  0,   1,   0,   0,   0,
>+    70,  142, 32,  0,   0,   0,   0,   0,   0,   0,   0,   0,   54,  0,   0,   6,   242, 32,  16,
>+    0,   2,   0,   0,   0,   70,  142, 32,  0,   0,   0,   0,   0,   0,   0,   0,   0,   54,  0,
>+    0,   6,   242, 32,  16,  0,   3,   0,   0,   0,   70,  142, 32,  0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   54,  0,   0,   5,   1,   192, 0,   0,   10,  128, 32,  0,   0,   0,   0,   0,
>+    1,   0,   0,   0,   62,  0,   0,   1,   83,  84,  65,  84,  116, 0,   0,   0,   6,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   5,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   5,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   82,
>+    68,  69,  70,  12,  1,   0,   0,   1,   0,   0,   0,   84,  0,   0,   0,   1,   0,   0,   0,
>+    28,  0,   0,   0,   0,   4,   255, 255, 0,   1,   0,   0,   216, 0,   0,   0,   60,  0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   1,   0,   0,   0,   1,   0,   0,   0,   67,  111, 108, 111, 114, 65,  110, 100, 68,
>+    101, 112, 116, 104, 68,  97,  116, 97,  70,  108, 111, 97,  116, 0,   171, 60,  0,   0,   0,
>+    2,   0,   0,   0,   108, 0,   0,   0,   32,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   156, 0,   0,   0,   0,   0,   0,   0,   16,  0,   0,   0,   2,   0,   0,   0,   168, 0,
>+    0,   0,   0,   0,   0,   0,   184, 0,   0,   0,   16,  0,   0,   0,   4,   0,   0,   0,   2,
>+    0,   0,   0,   200, 0,   0,   0,   0,   0,   0,   0,   99,  111, 108, 111, 114, 95,  70,  108,
>+    111, 97,  116, 0,   1,   0,   3,   0,   1,   0,   4,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   122, 86,  97,  108, 117, 101, 70,  95,  70,  108, 111, 97,  116, 0,   171, 171, 0,   0,
>+    3,   0,   1,   0,   1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   77,  105, 99,  114, 111,
>+    115, 111, 102, 116, 32,  40,  82,  41,  32,  72,  76,  83,  76,  32,  83,  104, 97,  100, 101,
>+    114, 32,  67,  111, 109, 112, 105, 108, 101, 114, 32,  57,  46,  50,  57,  46,  57,  53,  50,
>+    46,  51,  49,  49,  49,  0,   171, 171, 171, 73,  83,  71,  78,  44,  0,   0,   0,   1,   0,
>+    0,   0,   8,   0,   0,   0,   32,  0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   3,
>+    0,   0,   0,   0,   0,   0,   0,   15,  0,   0,   0,   83,  86,  95,  80,  79,  83,  73,  84,
>+    73,  79,  78,  0,   79,  83,  71,  78,  148, 0,   0,   0,   5,   0,   0,   0,   8,   0,   0,
>+    0,   128, 0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   3,   0,   0,   0,   0,   0,
>+    0,   0,   15,  0,   0,   0,   128, 0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   3,
>+    0,   0,   0,   1,   0,   0,   0,   15,  0,   0,   0,   128, 0,   0,   0,   2,   0,   0,   0,
>+    0,   0,   0,   0,   3,   0,   0,   0,   2,   0,   0,   0,   15,  0,   0,   0,   128, 0,   0,
>+    0,   3,   0,   0,   0,   0,   0,   0,   0,   3,   0,   0,   0,   3,   0,   0,   0,   15,  0,
>+    0,   0,   138, 0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   3,   0,   0,   0,   255,
>+    255, 255, 255, 1,   14,  0,   0,   83,  86,  95,  84,  65,  82,  71,  69,  84,  0,   83,  86,
>+    95,  68,  69,  80,  84,  72,  0,   171};
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearfloat11ps1.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearfloat11ps1.h
>index 0373da0b224..591b59d92a6 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearfloat11ps1.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearfloat11ps1.h
>@@ -1,6 +1,10 @@
> #if 0
> //
>-// Generated by Microsoft (R) HLSL Shader Compiler 6.3.9600.16384
>+// Generated by Microsoft (R) HLSL Shader Compiler 9.29.952.3111
>+//
>+//
>+//   fxc /nologo /E PS_ClearFloat1 /T ps_4_0 /Fh compiled\clearfloat11ps1.h
>+//    Clear11.hlsl
> //
> //
> // Buffer Definitions: 
>@@ -24,17 +28,17 @@
> //
> // Input signature:
> //
>-// Name                 Index   Mask Register SysValue  Format   Used
>-// -------------------- ----- ------ -------- -------- ------- ------
>-// SV_POSITION              0   xyzw        0      POS   float       
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_POSITION              0   xyzw        0      POS  float       
> //
> //
> // Output signature:
> //
>-// Name                 Index   Mask Register SysValue  Format   Used
>-// -------------------- ----- ------ -------- -------- ------- ------
>-// SV_TARGET                0   xyzw        0   TARGET   float   xyzw
>-// SV_DEPTH                 0    N/A   oDepth    DEPTH   float    YES
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_TARGET                0   xyzw        0   TARGET  float   xyzw
>+// SV_DEPTH                 0    N/A   oDepth    DEPTH  float    YES
> //
> ps_4_0
> dcl_constantbuffer cb0[2], immediateIndexed
>@@ -47,8 +51,8 @@ ret
> #endif
> 
> const BYTE g_PS_ClearFloat1[] = {
>-    68,  88,  66,  67,  193, 98,  147, 208, 43,  53,  161, 136, 243, 53,  114, 47,  211, 102, 138,
>-    40,  1,   0,   0,   0,   176, 2,   0,   0,   5,   0,   0,   0,   52,  0,   0,   0,   72,  1,
>+    68,  88,  66,  67,  194, 191, 135, 22,  7,   101, 39,  154, 161, 7,   119, 129, 159, 77,  141,
>+    64,  1,   0,   0,   0,   176, 2,   0,   0,   5,   0,   0,   0,   52,  0,   0,   0,   72,  1,
>     0,   0,   124, 1,   0,   0,   208, 1,   0,   0,   52,  2,   0,   0,   82,  68,  69,  70,  12,
>     1,   0,   0,   1,   0,   0,   0,   84,  0,   0,   0,   1,   0,   0,   0,   28,  0,   0,   0,
>     0,   4,   255, 255, 0,   1,   0,   0,   216, 0,   0,   0,   60,  0,   0,   0,   0,   0,   0,
>@@ -63,8 +67,8 @@ const BYTE g_PS_ClearFloat1[] = {
>     108, 117, 101, 70,  95,  70,  108, 111, 97,  116, 0,   171, 171, 0,   0,   3,   0,   1,   0,
>     1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   77,  105, 99,  114, 111, 115, 111, 102, 116,
>     32,  40,  82,  41,  32,  72,  76,  83,  76,  32,  83,  104, 97,  100, 101, 114, 32,  67,  111,
>-    109, 112, 105, 108, 101, 114, 32,  54,  46,  51,  46,  57,  54,  48,  48,  46,  49,  54,  51,
>-    56,  52,  0,   171, 171, 73,  83,  71,  78,  44,  0,   0,   0,   1,   0,   0,   0,   8,   0,
>+    109, 112, 105, 108, 101, 114, 32,  57,  46,  50,  57,  46,  57,  53,  50,  46,  51,  49,  49,
>+    49,  0,   171, 171, 171, 73,  83,  71,  78,  44,  0,   0,   0,   1,   0,   0,   0,   8,   0,
>     0,   0,   32,  0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   3,   0,   0,   0,   0,
>     0,   0,   0,   15,  0,   0,   0,   83,  86,  95,  80,  79,  83,  73,  84,  73,  79,  78,  0,
>     79,  83,  71,  78,  76,  0,   0,   0,   2,   0,   0,   0,   8,   0,   0,   0,   56,  0,   0,
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearfloat11ps2.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearfloat11ps2.h
>index 6853fb69923..52410dbe568 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearfloat11ps2.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearfloat11ps2.h
>@@ -1,6 +1,10 @@
> #if 0
> //
>-// Generated by Microsoft (R) HLSL Shader Compiler 6.3.9600.16384
>+// Generated by Microsoft (R) HLSL Shader Compiler 9.29.952.3111
>+//
>+//
>+//   fxc /nologo /E PS_ClearFloat2 /T ps_4_0 /Fh compiled\clearfloat11ps2.h
>+//    Clear11.hlsl
> //
> //
> // Buffer Definitions: 
>@@ -24,18 +28,18 @@
> //
> // Input signature:
> //
>-// Name                 Index   Mask Register SysValue  Format   Used
>-// -------------------- ----- ------ -------- -------- ------- ------
>-// SV_POSITION              0   xyzw        0      POS   float       
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_POSITION              0   xyzw        0      POS  float       
> //
> //
> // Output signature:
> //
>-// Name                 Index   Mask Register SysValue  Format   Used
>-// -------------------- ----- ------ -------- -------- ------- ------
>-// SV_TARGET                0   xyzw        0   TARGET   float   xyzw
>-// SV_TARGET                1   xyzw        1   TARGET   float   xyzw
>-// SV_DEPTH                 0    N/A   oDepth    DEPTH   float    YES
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_TARGET                0   xyzw        0   TARGET  float   xyzw
>+// SV_TARGET                1   xyzw        1   TARGET  float   xyzw
>+// SV_DEPTH                 0    N/A   oDepth    DEPTH  float    YES
> //
> ps_4_0
> dcl_constantbuffer cb0[2], immediateIndexed
>@@ -50,8 +54,8 @@ ret
> #endif
> 
> const BYTE g_PS_ClearFloat2[] = {
>-    68,  88,  66,  67,  108, 104, 239, 227, 97,  196, 142, 3,   142, 195, 239, 186, 183, 205, 245,
>-    112, 1,   0,   0,   0,   236, 2,   0,   0,   5,   0,   0,   0,   52,  0,   0,   0,   72,  1,
>+    68,  88,  66,  67,  225, 157, 134, 36,  221, 175, 143, 13,  216, 233, 141, 160, 234, 199, 6,
>+    135, 1,   0,   0,   0,   236, 2,   0,   0,   5,   0,   0,   0,   52,  0,   0,   0,   72,  1,
>     0,   0,   124, 1,   0,   0,   232, 1,   0,   0,   112, 2,   0,   0,   82,  68,  69,  70,  12,
>     1,   0,   0,   1,   0,   0,   0,   84,  0,   0,   0,   1,   0,   0,   0,   28,  0,   0,   0,
>     0,   4,   255, 255, 0,   1,   0,   0,   216, 0,   0,   0,   60,  0,   0,   0,   0,   0,   0,
>@@ -66,8 +70,8 @@ const BYTE g_PS_ClearFloat2[] = {
>     108, 117, 101, 70,  95,  70,  108, 111, 97,  116, 0,   171, 171, 0,   0,   3,   0,   1,   0,
>     1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   77,  105, 99,  114, 111, 115, 111, 102, 116,
>     32,  40,  82,  41,  32,  72,  76,  83,  76,  32,  83,  104, 97,  100, 101, 114, 32,  67,  111,
>-    109, 112, 105, 108, 101, 114, 32,  54,  46,  51,  46,  57,  54,  48,  48,  46,  49,  54,  51,
>-    56,  52,  0,   171, 171, 73,  83,  71,  78,  44,  0,   0,   0,   1,   0,   0,   0,   8,   0,
>+    109, 112, 105, 108, 101, 114, 32,  57,  46,  50,  57,  46,  57,  53,  50,  46,  51,  49,  49,
>+    49,  0,   171, 171, 171, 73,  83,  71,  78,  44,  0,   0,   0,   1,   0,   0,   0,   8,   0,
>     0,   0,   32,  0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   3,   0,   0,   0,   0,
>     0,   0,   0,   15,  0,   0,   0,   83,  86,  95,  80,  79,  83,  73,  84,  73,  79,  78,  0,
>     79,  83,  71,  78,  100, 0,   0,   0,   3,   0,   0,   0,   8,   0,   0,   0,   80,  0,   0,
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearfloat11ps3.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearfloat11ps3.h
>index d421a416203..79b5cff1909 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearfloat11ps3.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearfloat11ps3.h
>@@ -1,6 +1,10 @@
> #if 0
> //
>-// Generated by Microsoft (R) HLSL Shader Compiler 6.3.9600.16384
>+// Generated by Microsoft (R) HLSL Shader Compiler 9.29.952.3111
>+//
>+//
>+//   fxc /nologo /E PS_ClearFloat3 /T ps_4_0 /Fh compiled\clearfloat11ps3.h
>+//    Clear11.hlsl
> //
> //
> // Buffer Definitions: 
>@@ -24,19 +28,19 @@
> //
> // Input signature:
> //
>-// Name                 Index   Mask Register SysValue  Format   Used
>-// -------------------- ----- ------ -------- -------- ------- ------
>-// SV_POSITION              0   xyzw        0      POS   float       
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_POSITION              0   xyzw        0      POS  float       
> //
> //
> // Output signature:
> //
>-// Name                 Index   Mask Register SysValue  Format   Used
>-// -------------------- ----- ------ -------- -------- ------- ------
>-// SV_TARGET                0   xyzw        0   TARGET   float   xyzw
>-// SV_TARGET                1   xyzw        1   TARGET   float   xyzw
>-// SV_TARGET                2   xyzw        2   TARGET   float   xyzw
>-// SV_DEPTH                 0    N/A   oDepth    DEPTH   float    YES
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_TARGET                0   xyzw        0   TARGET  float   xyzw
>+// SV_TARGET                1   xyzw        1   TARGET  float   xyzw
>+// SV_TARGET                2   xyzw        2   TARGET  float   xyzw
>+// SV_DEPTH                 0    N/A   oDepth    DEPTH  float    YES
> //
> ps_4_0
> dcl_constantbuffer cb0[2], immediateIndexed
>@@ -53,8 +57,8 @@ ret
> #endif
> 
> const BYTE g_PS_ClearFloat3[] = {
>-    68,  88,  66,  67,  84,  28,  124, 78,  93,  18,  144, 54,  107, 173, 223, 168, 80,  58,  53,
>-    212, 1,   0,   0,   0,   40,  3,   0,   0,   5,   0,   0,   0,   52,  0,   0,   0,   72,  1,
>+    68,  88,  66,  67,  204, 19,  228, 34,  50,  163, 79,  235, 82,  71,  143, 124, 210, 54,  184,
>+    205, 1,   0,   0,   0,   40,  3,   0,   0,   5,   0,   0,   0,   52,  0,   0,   0,   72,  1,
>     0,   0,   124, 1,   0,   0,   0,   2,   0,   0,   172, 2,   0,   0,   82,  68,  69,  70,  12,
>     1,   0,   0,   1,   0,   0,   0,   84,  0,   0,   0,   1,   0,   0,   0,   28,  0,   0,   0,
>     0,   4,   255, 255, 0,   1,   0,   0,   216, 0,   0,   0,   60,  0,   0,   0,   0,   0,   0,
>@@ -69,8 +73,8 @@ const BYTE g_PS_ClearFloat3[] = {
>     108, 117, 101, 70,  95,  70,  108, 111, 97,  116, 0,   171, 171, 0,   0,   3,   0,   1,   0,
>     1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   77,  105, 99,  114, 111, 115, 111, 102, 116,
>     32,  40,  82,  41,  32,  72,  76,  83,  76,  32,  83,  104, 97,  100, 101, 114, 32,  67,  111,
>-    109, 112, 105, 108, 101, 114, 32,  54,  46,  51,  46,  57,  54,  48,  48,  46,  49,  54,  51,
>-    56,  52,  0,   171, 171, 73,  83,  71,  78,  44,  0,   0,   0,   1,   0,   0,   0,   8,   0,
>+    109, 112, 105, 108, 101, 114, 32,  57,  46,  50,  57,  46,  57,  53,  50,  46,  51,  49,  49,
>+    49,  0,   171, 171, 171, 73,  83,  71,  78,  44,  0,   0,   0,   1,   0,   0,   0,   8,   0,
>     0,   0,   32,  0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   3,   0,   0,   0,   0,
>     0,   0,   0,   15,  0,   0,   0,   83,  86,  95,  80,  79,  83,  73,  84,  73,  79,  78,  0,
>     79,  83,  71,  78,  124, 0,   0,   0,   4,   0,   0,   0,   8,   0,   0,   0,   104, 0,   0,
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearfloat11ps4.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearfloat11ps4.h
>index 5bd01b7813c..dd08fadd499 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearfloat11ps4.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearfloat11ps4.h
>@@ -1,6 +1,10 @@
> #if 0
> //
>-// Generated by Microsoft (R) HLSL Shader Compiler 6.3.9600.16384
>+// Generated by Microsoft (R) HLSL Shader Compiler 9.29.952.3111
>+//
>+//
>+//   fxc /nologo /E PS_ClearFloat4 /T ps_4_0 /Fh compiled\clearfloat11ps4.h
>+//    Clear11.hlsl
> //
> //
> // Buffer Definitions: 
>@@ -24,20 +28,20 @@
> //
> // Input signature:
> //
>-// Name                 Index   Mask Register SysValue  Format   Used
>-// -------------------- ----- ------ -------- -------- ------- ------
>-// SV_POSITION              0   xyzw        0      POS   float       
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_POSITION              0   xyzw        0      POS  float       
> //
> //
> // Output signature:
> //
>-// Name                 Index   Mask Register SysValue  Format   Used
>-// -------------------- ----- ------ -------- -------- ------- ------
>-// SV_TARGET                0   xyzw        0   TARGET   float   xyzw
>-// SV_TARGET                1   xyzw        1   TARGET   float   xyzw
>-// SV_TARGET                2   xyzw        2   TARGET   float   xyzw
>-// SV_TARGET                3   xyzw        3   TARGET   float   xyzw
>-// SV_DEPTH                 0    N/A   oDepth    DEPTH   float    YES
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_TARGET                0   xyzw        0   TARGET  float   xyzw
>+// SV_TARGET                1   xyzw        1   TARGET  float   xyzw
>+// SV_TARGET                2   xyzw        2   TARGET  float   xyzw
>+// SV_TARGET                3   xyzw        3   TARGET  float   xyzw
>+// SV_DEPTH                 0    N/A   oDepth    DEPTH  float    YES
> //
> ps_4_0
> dcl_constantbuffer cb0[2], immediateIndexed
>@@ -56,8 +60,8 @@ ret
> #endif
> 
> const BYTE g_PS_ClearFloat4[] = {
>-    68,  88,  66,  67,  207, 141, 9,   109, 48,  1,   5,   41,  68,  133, 156, 207, 12,  211, 147,
>-    112, 1,   0,   0,   0,   100, 3,   0,   0,   5,   0,   0,   0,   52,  0,   0,   0,   72,  1,
>+    68,  88,  66,  67,  118, 236, 166, 207, 85,  126, 49,  200, 223, 63,  28,  99,  129, 76,  44,
>+    101, 1,   0,   0,   0,   100, 3,   0,   0,   5,   0,   0,   0,   52,  0,   0,   0,   72,  1,
>     0,   0,   124, 1,   0,   0,   24,  2,   0,   0,   232, 2,   0,   0,   82,  68,  69,  70,  12,
>     1,   0,   0,   1,   0,   0,   0,   84,  0,   0,   0,   1,   0,   0,   0,   28,  0,   0,   0,
>     0,   4,   255, 255, 0,   1,   0,   0,   216, 0,   0,   0,   60,  0,   0,   0,   0,   0,   0,
>@@ -72,8 +76,8 @@ const BYTE g_PS_ClearFloat4[] = {
>     108, 117, 101, 70,  95,  70,  108, 111, 97,  116, 0,   171, 171, 0,   0,   3,   0,   1,   0,
>     1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   77,  105, 99,  114, 111, 115, 111, 102, 116,
>     32,  40,  82,  41,  32,  72,  76,  83,  76,  32,  83,  104, 97,  100, 101, 114, 32,  67,  111,
>-    109, 112, 105, 108, 101, 114, 32,  54,  46,  51,  46,  57,  54,  48,  48,  46,  49,  54,  51,
>-    56,  52,  0,   171, 171, 73,  83,  71,  78,  44,  0,   0,   0,   1,   0,   0,   0,   8,   0,
>+    109, 112, 105, 108, 101, 114, 32,  57,  46,  50,  57,  46,  57,  53,  50,  46,  51,  49,  49,
>+    49,  0,   171, 171, 171, 73,  83,  71,  78,  44,  0,   0,   0,   1,   0,   0,   0,   8,   0,
>     0,   0,   32,  0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   3,   0,   0,   0,   0,
>     0,   0,   0,   15,  0,   0,   0,   83,  86,  95,  80,  79,  83,  73,  84,  73,  79,  78,  0,
>     79,  83,  71,  78,  148, 0,   0,   0,   5,   0,   0,   0,   8,   0,   0,   0,   128, 0,   0,
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearfloat11ps5.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearfloat11ps5.h
>index d709cb60e13..3b80a507c70 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearfloat11ps5.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearfloat11ps5.h
>@@ -1,6 +1,10 @@
> #if 0
> //
>-// Generated by Microsoft (R) HLSL Shader Compiler 6.3.9600.16384
>+// Generated by Microsoft (R) HLSL Shader Compiler 9.29.952.3111
>+//
>+//
>+//   fxc /nologo /E PS_ClearFloat5 /T ps_4_0 /Fh compiled\clearfloat11ps5.h
>+//    Clear11.hlsl
> //
> //
> // Buffer Definitions: 
>@@ -24,21 +28,21 @@
> //
> // Input signature:
> //
>-// Name                 Index   Mask Register SysValue  Format   Used
>-// -------------------- ----- ------ -------- -------- ------- ------
>-// SV_POSITION              0   xyzw        0      POS   float       
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_POSITION              0   xyzw        0      POS  float       
> //
> //
> // Output signature:
> //
>-// Name                 Index   Mask Register SysValue  Format   Used
>-// -------------------- ----- ------ -------- -------- ------- ------
>-// SV_TARGET                0   xyzw        0   TARGET   float   xyzw
>-// SV_TARGET                1   xyzw        1   TARGET   float   xyzw
>-// SV_TARGET                2   xyzw        2   TARGET   float   xyzw
>-// SV_TARGET                3   xyzw        3   TARGET   float   xyzw
>-// SV_TARGET                4   xyzw        4   TARGET   float   xyzw
>-// SV_DEPTH                 0    N/A   oDepth    DEPTH   float    YES
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_TARGET                0   xyzw        0   TARGET  float   xyzw
>+// SV_TARGET                1   xyzw        1   TARGET  float   xyzw
>+// SV_TARGET                2   xyzw        2   TARGET  float   xyzw
>+// SV_TARGET                3   xyzw        3   TARGET  float   xyzw
>+// SV_TARGET                4   xyzw        4   TARGET  float   xyzw
>+// SV_DEPTH                 0    N/A   oDepth    DEPTH  float    YES
> //
> ps_4_0
> dcl_constantbuffer cb0[2], immediateIndexed
>@@ -59,8 +63,8 @@ ret
> #endif
> 
> const BYTE g_PS_ClearFloat5[] = {
>-    68,  88,  66,  67,  110, 251, 0,   120, 207, 72,  250, 15,  78,  51,  222, 23,  61,  180, 247,
>-    36,  1,   0,   0,   0,   160, 3,   0,   0,   5,   0,   0,   0,   52,  0,   0,   0,   72,  1,
>+    68,  88,  66,  67,  123, 52,  161, 168, 70,  129, 246, 30,  10,  53,  190, 145, 187, 163, 141,
>+    41,  1,   0,   0,   0,   160, 3,   0,   0,   5,   0,   0,   0,   52,  0,   0,   0,   72,  1,
>     0,   0,   124, 1,   0,   0,   48,  2,   0,   0,   36,  3,   0,   0,   82,  68,  69,  70,  12,
>     1,   0,   0,   1,   0,   0,   0,   84,  0,   0,   0,   1,   0,   0,   0,   28,  0,   0,   0,
>     0,   4,   255, 255, 0,   1,   0,   0,   216, 0,   0,   0,   60,  0,   0,   0,   0,   0,   0,
>@@ -75,8 +79,8 @@ const BYTE g_PS_ClearFloat5[] = {
>     108, 117, 101, 70,  95,  70,  108, 111, 97,  116, 0,   171, 171, 0,   0,   3,   0,   1,   0,
>     1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   77,  105, 99,  114, 111, 115, 111, 102, 116,
>     32,  40,  82,  41,  32,  72,  76,  83,  76,  32,  83,  104, 97,  100, 101, 114, 32,  67,  111,
>-    109, 112, 105, 108, 101, 114, 32,  54,  46,  51,  46,  57,  54,  48,  48,  46,  49,  54,  51,
>-    56,  52,  0,   171, 171, 73,  83,  71,  78,  44,  0,   0,   0,   1,   0,   0,   0,   8,   0,
>+    109, 112, 105, 108, 101, 114, 32,  57,  46,  50,  57,  46,  57,  53,  50,  46,  51,  49,  49,
>+    49,  0,   171, 171, 171, 73,  83,  71,  78,  44,  0,   0,   0,   1,   0,   0,   0,   8,   0,
>     0,   0,   32,  0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   3,   0,   0,   0,   0,
>     0,   0,   0,   15,  0,   0,   0,   83,  86,  95,  80,  79,  83,  73,  84,  73,  79,  78,  0,
>     79,  83,  71,  78,  172, 0,   0,   0,   6,   0,   0,   0,   8,   0,   0,   0,   152, 0,   0,
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearfloat11ps6.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearfloat11ps6.h
>index b74c83c7a35..5a4830c2ea3 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearfloat11ps6.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearfloat11ps6.h
>@@ -1,6 +1,10 @@
> #if 0
> //
>-// Generated by Microsoft (R) HLSL Shader Compiler 6.3.9600.16384
>+// Generated by Microsoft (R) HLSL Shader Compiler 9.29.952.3111
>+//
>+//
>+//   fxc /nologo /E PS_ClearFloat6 /T ps_4_0 /Fh compiled\clearfloat11ps6.h
>+//    Clear11.hlsl
> //
> //
> // Buffer Definitions: 
>@@ -24,22 +28,22 @@
> //
> // Input signature:
> //
>-// Name                 Index   Mask Register SysValue  Format   Used
>-// -------------------- ----- ------ -------- -------- ------- ------
>-// SV_POSITION              0   xyzw        0      POS   float       
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_POSITION              0   xyzw        0      POS  float       
> //
> //
> // Output signature:
> //
>-// Name                 Index   Mask Register SysValue  Format   Used
>-// -------------------- ----- ------ -------- -------- ------- ------
>-// SV_TARGET                0   xyzw        0   TARGET   float   xyzw
>-// SV_TARGET                1   xyzw        1   TARGET   float   xyzw
>-// SV_TARGET                2   xyzw        2   TARGET   float   xyzw
>-// SV_TARGET                3   xyzw        3   TARGET   float   xyzw
>-// SV_TARGET                4   xyzw        4   TARGET   float   xyzw
>-// SV_TARGET                5   xyzw        5   TARGET   float   xyzw
>-// SV_DEPTH                 0    N/A   oDepth    DEPTH   float    YES
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_TARGET                0   xyzw        0   TARGET  float   xyzw
>+// SV_TARGET                1   xyzw        1   TARGET  float   xyzw
>+// SV_TARGET                2   xyzw        2   TARGET  float   xyzw
>+// SV_TARGET                3   xyzw        3   TARGET  float   xyzw
>+// SV_TARGET                4   xyzw        4   TARGET  float   xyzw
>+// SV_TARGET                5   xyzw        5   TARGET  float   xyzw
>+// SV_DEPTH                 0    N/A   oDepth    DEPTH  float    YES
> //
> ps_4_0
> dcl_constantbuffer cb0[2], immediateIndexed
>@@ -62,8 +66,8 @@ ret
> #endif
> 
> const BYTE g_PS_ClearFloat6[] = {
>-    68,  88,  66,  67,  89,  150, 245, 198, 63,  119, 94,  62,  185, 247, 214, 162, 19,  194, 96,
>-    152, 1,   0,   0,   0,   220, 3,   0,   0,   5,   0,   0,   0,   52,  0,   0,   0,   72,  1,
>+    68,  88,  66,  67,  9,   231, 198, 152, 73,  204, 169, 213, 251, 221, 21,  165, 112, 13,  206,
>+    187, 1,   0,   0,   0,   220, 3,   0,   0,   5,   0,   0,   0,   52,  0,   0,   0,   72,  1,
>     0,   0,   124, 1,   0,   0,   72,  2,   0,   0,   96,  3,   0,   0,   82,  68,  69,  70,  12,
>     1,   0,   0,   1,   0,   0,   0,   84,  0,   0,   0,   1,   0,   0,   0,   28,  0,   0,   0,
>     0,   4,   255, 255, 0,   1,   0,   0,   216, 0,   0,   0,   60,  0,   0,   0,   0,   0,   0,
>@@ -78,8 +82,8 @@ const BYTE g_PS_ClearFloat6[] = {
>     108, 117, 101, 70,  95,  70,  108, 111, 97,  116, 0,   171, 171, 0,   0,   3,   0,   1,   0,
>     1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   77,  105, 99,  114, 111, 115, 111, 102, 116,
>     32,  40,  82,  41,  32,  72,  76,  83,  76,  32,  83,  104, 97,  100, 101, 114, 32,  67,  111,
>-    109, 112, 105, 108, 101, 114, 32,  54,  46,  51,  46,  57,  54,  48,  48,  46,  49,  54,  51,
>-    56,  52,  0,   171, 171, 73,  83,  71,  78,  44,  0,   0,   0,   1,   0,   0,   0,   8,   0,
>+    109, 112, 105, 108, 101, 114, 32,  57,  46,  50,  57,  46,  57,  53,  50,  46,  51,  49,  49,
>+    49,  0,   171, 171, 171, 73,  83,  71,  78,  44,  0,   0,   0,   1,   0,   0,   0,   8,   0,
>     0,   0,   32,  0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   3,   0,   0,   0,   0,
>     0,   0,   0,   15,  0,   0,   0,   83,  86,  95,  80,  79,  83,  73,  84,  73,  79,  78,  0,
>     79,  83,  71,  78,  196, 0,   0,   0,   7,   0,   0,   0,   8,   0,   0,   0,   176, 0,   0,
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearfloat11ps7.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearfloat11ps7.h
>index 2972f4d120e..2c10a6af895 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearfloat11ps7.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearfloat11ps7.h
>@@ -1,6 +1,10 @@
> #if 0
> //
>-// Generated by Microsoft (R) HLSL Shader Compiler 6.3.9600.16384
>+// Generated by Microsoft (R) HLSL Shader Compiler 9.29.952.3111
>+//
>+//
>+//   fxc /nologo /E PS_ClearFloat7 /T ps_4_0 /Fh compiled\clearfloat11ps7.h
>+//    Clear11.hlsl
> //
> //
> // Buffer Definitions: 
>@@ -24,23 +28,23 @@
> //
> // Input signature:
> //
>-// Name                 Index   Mask Register SysValue  Format   Used
>-// -------------------- ----- ------ -------- -------- ------- ------
>-// SV_POSITION              0   xyzw        0      POS   float       
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_POSITION              0   xyzw        0      POS  float       
> //
> //
> // Output signature:
> //
>-// Name                 Index   Mask Register SysValue  Format   Used
>-// -------------------- ----- ------ -------- -------- ------- ------
>-// SV_TARGET                0   xyzw        0   TARGET   float   xyzw
>-// SV_TARGET                1   xyzw        1   TARGET   float   xyzw
>-// SV_TARGET                2   xyzw        2   TARGET   float   xyzw
>-// SV_TARGET                3   xyzw        3   TARGET   float   xyzw
>-// SV_TARGET                4   xyzw        4   TARGET   float   xyzw
>-// SV_TARGET                5   xyzw        5   TARGET   float   xyzw
>-// SV_TARGET                6   xyzw        6   TARGET   float   xyzw
>-// SV_DEPTH                 0    N/A   oDepth    DEPTH   float    YES
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_TARGET                0   xyzw        0   TARGET  float   xyzw
>+// SV_TARGET                1   xyzw        1   TARGET  float   xyzw
>+// SV_TARGET                2   xyzw        2   TARGET  float   xyzw
>+// SV_TARGET                3   xyzw        3   TARGET  float   xyzw
>+// SV_TARGET                4   xyzw        4   TARGET  float   xyzw
>+// SV_TARGET                5   xyzw        5   TARGET  float   xyzw
>+// SV_TARGET                6   xyzw        6   TARGET  float   xyzw
>+// SV_DEPTH                 0    N/A   oDepth    DEPTH  float    YES
> //
> ps_4_0
> dcl_constantbuffer cb0[2], immediateIndexed
>@@ -65,8 +69,8 @@ ret
> #endif
> 
> const BYTE g_PS_ClearFloat7[] = {
>-    68,  88,  66,  67,  148, 239, 191, 126, 102, 53,  77,  186, 61,  158, 28,  92,  123, 95,  81,
>-    17,  1,   0,   0,   0,   24,  4,   0,   0,   5,   0,   0,   0,   52,  0,   0,   0,   72,  1,
>+    68,  88,  66,  67,  170, 173, 131, 172, 155, 25,  100, 152, 127, 184, 193, 251, 147, 13,  61,
>+    159, 1,   0,   0,   0,   24,  4,   0,   0,   5,   0,   0,   0,   52,  0,   0,   0,   72,  1,
>     0,   0,   124, 1,   0,   0,   96,  2,   0,   0,   156, 3,   0,   0,   82,  68,  69,  70,  12,
>     1,   0,   0,   1,   0,   0,   0,   84,  0,   0,   0,   1,   0,   0,   0,   28,  0,   0,   0,
>     0,   4,   255, 255, 0,   1,   0,   0,   216, 0,   0,   0,   60,  0,   0,   0,   0,   0,   0,
>@@ -81,8 +85,8 @@ const BYTE g_PS_ClearFloat7[] = {
>     108, 117, 101, 70,  95,  70,  108, 111, 97,  116, 0,   171, 171, 0,   0,   3,   0,   1,   0,
>     1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   77,  105, 99,  114, 111, 115, 111, 102, 116,
>     32,  40,  82,  41,  32,  72,  76,  83,  76,  32,  83,  104, 97,  100, 101, 114, 32,  67,  111,
>-    109, 112, 105, 108, 101, 114, 32,  54,  46,  51,  46,  57,  54,  48,  48,  46,  49,  54,  51,
>-    56,  52,  0,   171, 171, 73,  83,  71,  78,  44,  0,   0,   0,   1,   0,   0,   0,   8,   0,
>+    109, 112, 105, 108, 101, 114, 32,  57,  46,  50,  57,  46,  57,  53,  50,  46,  51,  49,  49,
>+    49,  0,   171, 171, 171, 73,  83,  71,  78,  44,  0,   0,   0,   1,   0,   0,   0,   8,   0,
>     0,   0,   32,  0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   3,   0,   0,   0,   0,
>     0,   0,   0,   15,  0,   0,   0,   83,  86,  95,  80,  79,  83,  73,  84,  73,  79,  78,  0,
>     79,  83,  71,  78,  220, 0,   0,   0,   8,   0,   0,   0,   8,   0,   0,   0,   200, 0,   0,
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearfloat11ps8.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearfloat11ps8.h
>index 2afddddc340..e5dc70cfe79 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearfloat11ps8.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearfloat11ps8.h
>@@ -1,6 +1,10 @@
> #if 0
> //
>-// Generated by Microsoft (R) HLSL Shader Compiler 6.3.9600.16384
>+// Generated by Microsoft (R) HLSL Shader Compiler 9.29.952.3111
>+//
>+//
>+//   fxc /nologo /E PS_ClearFloat8 /T ps_4_0 /Fh compiled\clearfloat11ps8.h
>+//    Clear11.hlsl
> //
> //
> // Buffer Definitions: 
>@@ -24,24 +28,24 @@
> //
> // Input signature:
> //
>-// Name                 Index   Mask Register SysValue  Format   Used
>-// -------------------- ----- ------ -------- -------- ------- ------
>-// SV_POSITION              0   xyzw        0      POS   float       
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_POSITION              0   xyzw        0      POS  float       
> //
> //
> // Output signature:
> //
>-// Name                 Index   Mask Register SysValue  Format   Used
>-// -------------------- ----- ------ -------- -------- ------- ------
>-// SV_TARGET                0   xyzw        0   TARGET   float   xyzw
>-// SV_TARGET                1   xyzw        1   TARGET   float   xyzw
>-// SV_TARGET                2   xyzw        2   TARGET   float   xyzw
>-// SV_TARGET                3   xyzw        3   TARGET   float   xyzw
>-// SV_TARGET                4   xyzw        4   TARGET   float   xyzw
>-// SV_TARGET                5   xyzw        5   TARGET   float   xyzw
>-// SV_TARGET                6   xyzw        6   TARGET   float   xyzw
>-// SV_TARGET                7   xyzw        7   TARGET   float   xyzw
>-// SV_DEPTH                 0    N/A   oDepth    DEPTH   float    YES
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_TARGET                0   xyzw        0   TARGET  float   xyzw
>+// SV_TARGET                1   xyzw        1   TARGET  float   xyzw
>+// SV_TARGET                2   xyzw        2   TARGET  float   xyzw
>+// SV_TARGET                3   xyzw        3   TARGET  float   xyzw
>+// SV_TARGET                4   xyzw        4   TARGET  float   xyzw
>+// SV_TARGET                5   xyzw        5   TARGET  float   xyzw
>+// SV_TARGET                6   xyzw        6   TARGET  float   xyzw
>+// SV_TARGET                7   xyzw        7   TARGET  float   xyzw
>+// SV_DEPTH                 0    N/A   oDepth    DEPTH  float    YES
> //
> ps_4_0
> dcl_constantbuffer cb0[2], immediateIndexed
>@@ -68,8 +72,8 @@ ret
> #endif
> 
> const BYTE g_PS_ClearFloat8[] = {
>-    68,  88,  66,  67,  0,   45,  15,  86,  227, 217, 47,  173, 72,  182, 197, 224, 178, 165, 77,
>-    73,  1,   0,   0,   0,   84,  4,   0,   0,   5,   0,   0,   0,   52,  0,   0,   0,   72,  1,
>+    68,  88,  66,  67,  182, 101, 16,  155, 29,  152, 163, 52,  194, 25,  110, 209, 100, 8,   227,
>+    42,  1,   0,   0,   0,   84,  4,   0,   0,   5,   0,   0,   0,   52,  0,   0,   0,   72,  1,
>     0,   0,   124, 1,   0,   0,   120, 2,   0,   0,   216, 3,   0,   0,   82,  68,  69,  70,  12,
>     1,   0,   0,   1,   0,   0,   0,   84,  0,   0,   0,   1,   0,   0,   0,   28,  0,   0,   0,
>     0,   4,   255, 255, 0,   1,   0,   0,   216, 0,   0,   0,   60,  0,   0,   0,   0,   0,   0,
>@@ -84,8 +88,8 @@ const BYTE g_PS_ClearFloat8[] = {
>     108, 117, 101, 70,  95,  70,  108, 111, 97,  116, 0,   171, 171, 0,   0,   3,   0,   1,   0,
>     1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   77,  105, 99,  114, 111, 115, 111, 102, 116,
>     32,  40,  82,  41,  32,  72,  76,  83,  76,  32,  83,  104, 97,  100, 101, 114, 32,  67,  111,
>-    109, 112, 105, 108, 101, 114, 32,  54,  46,  51,  46,  57,  54,  48,  48,  46,  49,  54,  51,
>-    56,  52,  0,   171, 171, 73,  83,  71,  78,  44,  0,   0,   0,   1,   0,   0,   0,   8,   0,
>+    109, 112, 105, 108, 101, 114, 32,  57,  46,  50,  57,  46,  57,  53,  50,  46,  51,  49,  49,
>+    49,  0,   171, 171, 171, 73,  83,  71,  78,  44,  0,   0,   0,   1,   0,   0,   0,   8,   0,
>     0,   0,   32,  0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   3,   0,   0,   0,   0,
>     0,   0,   0,   15,  0,   0,   0,   83,  86,  95,  80,  79,  83,  73,  84,  73,  79,  78,  0,
>     79,  83,  71,  78,  244, 0,   0,   0,   9,   0,   0,   0,   8,   0,   0,   0,   224, 0,   0,
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearsint11ps1.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearsint11ps1.h
>index dd944143c26..fba316f3bf1 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearsint11ps1.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearsint11ps1.h
>@@ -1,6 +1,10 @@
> #if 0
> //
>-// Generated by Microsoft (R) HLSL Shader Compiler 6.3.9600.16384
>+// Generated by Microsoft (R) HLSL Shader Compiler 9.29.952.3111
>+//
>+//
>+//   fxc /nologo /E PS_ClearSint1 /T ps_4_0 /Fh compiled\clearsint11ps1.h
>+//    Clear11.hlsl
> //
> //
> // Buffer Definitions: 
>@@ -24,17 +28,17 @@
> //
> // Input signature:
> //
>-// Name                 Index   Mask Register SysValue  Format   Used
>-// -------------------- ----- ------ -------- -------- ------- ------
>-// SV_POSITION              0   xyzw        0      POS   float       
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_POSITION              0   xyzw        0      POS  float       
> //
> //
> // Output signature:
> //
>-// Name                 Index   Mask Register SysValue  Format   Used
>-// -------------------- ----- ------ -------- -------- ------- ------
>-// SV_TARGET                0   xyzw        0   TARGET     int   xyzw
>-// SV_DEPTH                 0    N/A   oDepth    DEPTH   float    YES
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_TARGET                0   xyzw        0   TARGET    int   xyzw
>+// SV_DEPTH                 0    N/A   oDepth    DEPTH  float    YES
> //
> ps_4_0
> dcl_constantbuffer cb0[2], immediateIndexed
>@@ -47,8 +51,8 @@ ret
> #endif
> 
> const BYTE g_PS_ClearSint1[] = {
>-    68,  88,  66,  67,  234, 238, 101, 91,  76,  164, 85,  240, 165, 134, 177, 247, 216, 133, 221,
>-    129, 1,   0,   0,   0,   176, 2,   0,   0,   5,   0,   0,   0,   52,  0,   0,   0,   72,  1,
>+    68,  88,  66,  67,  88,  163, 189, 91,  71,  60,  117, 226, 154, 216, 135, 21,  77,  90,  76,
>+    124, 1,   0,   0,   0,   176, 2,   0,   0,   5,   0,   0,   0,   52,  0,   0,   0,   72,  1,
>     0,   0,   124, 1,   0,   0,   208, 1,   0,   0,   52,  2,   0,   0,   82,  68,  69,  70,  12,
>     1,   0,   0,   1,   0,   0,   0,   84,  0,   0,   0,   1,   0,   0,   0,   28,  0,   0,   0,
>     0,   4,   255, 255, 0,   1,   0,   0,   216, 0,   0,   0,   60,  0,   0,   0,   0,   0,   0,
>@@ -63,8 +67,8 @@ const BYTE g_PS_ClearSint1[] = {
>     108, 117, 101, 70,  95,  83,  105, 110, 116, 0,   171, 171, 171, 0,   0,   3,   0,   1,   0,
>     1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   77,  105, 99,  114, 111, 115, 111, 102, 116,
>     32,  40,  82,  41,  32,  72,  76,  83,  76,  32,  83,  104, 97,  100, 101, 114, 32,  67,  111,
>-    109, 112, 105, 108, 101, 114, 32,  54,  46,  51,  46,  57,  54,  48,  48,  46,  49,  54,  51,
>-    56,  52,  0,   171, 171, 73,  83,  71,  78,  44,  0,   0,   0,   1,   0,   0,   0,   8,   0,
>+    109, 112, 105, 108, 101, 114, 32,  57,  46,  50,  57,  46,  57,  53,  50,  46,  51,  49,  49,
>+    49,  0,   171, 171, 171, 73,  83,  71,  78,  44,  0,   0,   0,   1,   0,   0,   0,   8,   0,
>     0,   0,   32,  0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   3,   0,   0,   0,   0,
>     0,   0,   0,   15,  0,   0,   0,   83,  86,  95,  80,  79,  83,  73,  84,  73,  79,  78,  0,
>     79,  83,  71,  78,  76,  0,   0,   0,   2,   0,   0,   0,   8,   0,   0,   0,   56,  0,   0,
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearsint11ps2.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearsint11ps2.h
>index 5d3439681ff..ef516596197 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearsint11ps2.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearsint11ps2.h
>@@ -1,6 +1,10 @@
> #if 0
> //
>-// Generated by Microsoft (R) HLSL Shader Compiler 6.3.9600.16384
>+// Generated by Microsoft (R) HLSL Shader Compiler 9.29.952.3111
>+//
>+//
>+//   fxc /nologo /E PS_ClearSint2 /T ps_4_0 /Fh compiled\clearsint11ps2.h
>+//    Clear11.hlsl
> //
> //
> // Buffer Definitions: 
>@@ -24,18 +28,18 @@
> //
> // Input signature:
> //
>-// Name                 Index   Mask Register SysValue  Format   Used
>-// -------------------- ----- ------ -------- -------- ------- ------
>-// SV_POSITION              0   xyzw        0      POS   float       
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_POSITION              0   xyzw        0      POS  float       
> //
> //
> // Output signature:
> //
>-// Name                 Index   Mask Register SysValue  Format   Used
>-// -------------------- ----- ------ -------- -------- ------- ------
>-// SV_TARGET                0   xyzw        0   TARGET     int   xyzw
>-// SV_TARGET                1   xyzw        1   TARGET     int   xyzw
>-// SV_DEPTH                 0    N/A   oDepth    DEPTH   float    YES
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_TARGET                0   xyzw        0   TARGET    int   xyzw
>+// SV_TARGET                1   xyzw        1   TARGET    int   xyzw
>+// SV_DEPTH                 0    N/A   oDepth    DEPTH  float    YES
> //
> ps_4_0
> dcl_constantbuffer cb0[2], immediateIndexed
>@@ -50,8 +54,8 @@ ret
> #endif
> 
> const BYTE g_PS_ClearSint2[] = {
>-    68,  88,  66,  67,  222, 216, 239, 82,  222, 254, 123, 203, 132, 152, 125, 4,   154, 18,  65,
>-    65,  1,   0,   0,   0,   236, 2,   0,   0,   5,   0,   0,   0,   52,  0,   0,   0,   72,  1,
>+    68,  88,  66,  67,  78,  174, 75,  16,  146, 221, 109, 222, 248, 135, 83,  225, 132, 36,  188,
>+    212, 1,   0,   0,   0,   236, 2,   0,   0,   5,   0,   0,   0,   52,  0,   0,   0,   72,  1,
>     0,   0,   124, 1,   0,   0,   232, 1,   0,   0,   112, 2,   0,   0,   82,  68,  69,  70,  12,
>     1,   0,   0,   1,   0,   0,   0,   84,  0,   0,   0,   1,   0,   0,   0,   28,  0,   0,   0,
>     0,   4,   255, 255, 0,   1,   0,   0,   216, 0,   0,   0,   60,  0,   0,   0,   0,   0,   0,
>@@ -66,8 +70,8 @@ const BYTE g_PS_ClearSint2[] = {
>     108, 117, 101, 70,  95,  83,  105, 110, 116, 0,   171, 171, 171, 0,   0,   3,   0,   1,   0,
>     1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   77,  105, 99,  114, 111, 115, 111, 102, 116,
>     32,  40,  82,  41,  32,  72,  76,  83,  76,  32,  83,  104, 97,  100, 101, 114, 32,  67,  111,
>-    109, 112, 105, 108, 101, 114, 32,  54,  46,  51,  46,  57,  54,  48,  48,  46,  49,  54,  51,
>-    56,  52,  0,   171, 171, 73,  83,  71,  78,  44,  0,   0,   0,   1,   0,   0,   0,   8,   0,
>+    109, 112, 105, 108, 101, 114, 32,  57,  46,  50,  57,  46,  57,  53,  50,  46,  51,  49,  49,
>+    49,  0,   171, 171, 171, 73,  83,  71,  78,  44,  0,   0,   0,   1,   0,   0,   0,   8,   0,
>     0,   0,   32,  0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   3,   0,   0,   0,   0,
>     0,   0,   0,   15,  0,   0,   0,   83,  86,  95,  80,  79,  83,  73,  84,  73,  79,  78,  0,
>     79,  83,  71,  78,  100, 0,   0,   0,   3,   0,   0,   0,   8,   0,   0,   0,   80,  0,   0,
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearsint11ps3.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearsint11ps3.h
>index c29dc755301..2329b45e7a5 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearsint11ps3.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearsint11ps3.h
>@@ -1,6 +1,10 @@
> #if 0
> //
>-// Generated by Microsoft (R) HLSL Shader Compiler 6.3.9600.16384
>+// Generated by Microsoft (R) HLSL Shader Compiler 9.29.952.3111
>+//
>+//
>+//   fxc /nologo /E PS_ClearSint3 /T ps_4_0 /Fh compiled\clearsint11ps3.h
>+//    Clear11.hlsl
> //
> //
> // Buffer Definitions: 
>@@ -24,19 +28,19 @@
> //
> // Input signature:
> //
>-// Name                 Index   Mask Register SysValue  Format   Used
>-// -------------------- ----- ------ -------- -------- ------- ------
>-// SV_POSITION              0   xyzw        0      POS   float       
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_POSITION              0   xyzw        0      POS  float       
> //
> //
> // Output signature:
> //
>-// Name                 Index   Mask Register SysValue  Format   Used
>-// -------------------- ----- ------ -------- -------- ------- ------
>-// SV_TARGET                0   xyzw        0   TARGET     int   xyzw
>-// SV_TARGET                1   xyzw        1   TARGET     int   xyzw
>-// SV_TARGET                2   xyzw        2   TARGET     int   xyzw
>-// SV_DEPTH                 0    N/A   oDepth    DEPTH   float    YES
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_TARGET                0   xyzw        0   TARGET    int   xyzw
>+// SV_TARGET                1   xyzw        1   TARGET    int   xyzw
>+// SV_TARGET                2   xyzw        2   TARGET    int   xyzw
>+// SV_DEPTH                 0    N/A   oDepth    DEPTH  float    YES
> //
> ps_4_0
> dcl_constantbuffer cb0[2], immediateIndexed
>@@ -53,8 +57,8 @@ ret
> #endif
> 
> const BYTE g_PS_ClearSint3[] = {
>-    68,  88,  66,  67,  251, 25,  49,  126, 247, 6,   239, 75,  31,  240, 87,  139, 35,  246, 130,
>-    22,  1,   0,   0,   0,   40,  3,   0,   0,   5,   0,   0,   0,   52,  0,   0,   0,   72,  1,
>+    68,  88,  66,  67,  211, 173, 24,  113, 222, 43,  56,  242, 158, 91,  245, 255, 64,  66,  11,
>+    177, 1,   0,   0,   0,   40,  3,   0,   0,   5,   0,   0,   0,   52,  0,   0,   0,   72,  1,
>     0,   0,   124, 1,   0,   0,   0,   2,   0,   0,   172, 2,   0,   0,   82,  68,  69,  70,  12,
>     1,   0,   0,   1,   0,   0,   0,   84,  0,   0,   0,   1,   0,   0,   0,   28,  0,   0,   0,
>     0,   4,   255, 255, 0,   1,   0,   0,   216, 0,   0,   0,   60,  0,   0,   0,   0,   0,   0,
>@@ -69,8 +73,8 @@ const BYTE g_PS_ClearSint3[] = {
>     108, 117, 101, 70,  95,  83,  105, 110, 116, 0,   171, 171, 171, 0,   0,   3,   0,   1,   0,
>     1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   77,  105, 99,  114, 111, 115, 111, 102, 116,
>     32,  40,  82,  41,  32,  72,  76,  83,  76,  32,  83,  104, 97,  100, 101, 114, 32,  67,  111,
>-    109, 112, 105, 108, 101, 114, 32,  54,  46,  51,  46,  57,  54,  48,  48,  46,  49,  54,  51,
>-    56,  52,  0,   171, 171, 73,  83,  71,  78,  44,  0,   0,   0,   1,   0,   0,   0,   8,   0,
>+    109, 112, 105, 108, 101, 114, 32,  57,  46,  50,  57,  46,  57,  53,  50,  46,  51,  49,  49,
>+    49,  0,   171, 171, 171, 73,  83,  71,  78,  44,  0,   0,   0,   1,   0,   0,   0,   8,   0,
>     0,   0,   32,  0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   3,   0,   0,   0,   0,
>     0,   0,   0,   15,  0,   0,   0,   83,  86,  95,  80,  79,  83,  73,  84,  73,  79,  78,  0,
>     79,  83,  71,  78,  124, 0,   0,   0,   4,   0,   0,   0,   8,   0,   0,   0,   104, 0,   0,
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearsint11ps4.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearsint11ps4.h
>index 22c16bf9ca5..703d262d362 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearsint11ps4.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearsint11ps4.h
>@@ -1,6 +1,10 @@
> #if 0
> //
>-// Generated by Microsoft (R) HLSL Shader Compiler 6.3.9600.16384
>+// Generated by Microsoft (R) HLSL Shader Compiler 9.29.952.3111
>+//
>+//
>+//   fxc /nologo /E PS_ClearSint4 /T ps_4_0 /Fh compiled\clearsint11ps4.h
>+//    Clear11.hlsl
> //
> //
> // Buffer Definitions: 
>@@ -24,20 +28,20 @@
> //
> // Input signature:
> //
>-// Name                 Index   Mask Register SysValue  Format   Used
>-// -------------------- ----- ------ -------- -------- ------- ------
>-// SV_POSITION              0   xyzw        0      POS   float       
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_POSITION              0   xyzw        0      POS  float       
> //
> //
> // Output signature:
> //
>-// Name                 Index   Mask Register SysValue  Format   Used
>-// -------------------- ----- ------ -------- -------- ------- ------
>-// SV_TARGET                0   xyzw        0   TARGET     int   xyzw
>-// SV_TARGET                1   xyzw        1   TARGET     int   xyzw
>-// SV_TARGET                2   xyzw        2   TARGET     int   xyzw
>-// SV_TARGET                3   xyzw        3   TARGET     int   xyzw
>-// SV_DEPTH                 0    N/A   oDepth    DEPTH   float    YES
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_TARGET                0   xyzw        0   TARGET    int   xyzw
>+// SV_TARGET                1   xyzw        1   TARGET    int   xyzw
>+// SV_TARGET                2   xyzw        2   TARGET    int   xyzw
>+// SV_TARGET                3   xyzw        3   TARGET    int   xyzw
>+// SV_DEPTH                 0    N/A   oDepth    DEPTH  float    YES
> //
> ps_4_0
> dcl_constantbuffer cb0[2], immediateIndexed
>@@ -56,8 +60,8 @@ ret
> #endif
> 
> const BYTE g_PS_ClearSint4[] = {
>-    68,  88,  66,  67,  86,  121, 157, 133, 160, 178, 28,  19,  207, 77,  229, 165, 39,  10,  12,
>-    177, 1,   0,   0,   0,   100, 3,   0,   0,   5,   0,   0,   0,   52,  0,   0,   0,   72,  1,
>+    68,  88,  66,  67,  38,  96,  29,  166, 205, 218, 64,  123, 117, 198, 133, 227, 83,  243, 198,
>+    238, 1,   0,   0,   0,   100, 3,   0,   0,   5,   0,   0,   0,   52,  0,   0,   0,   72,  1,
>     0,   0,   124, 1,   0,   0,   24,  2,   0,   0,   232, 2,   0,   0,   82,  68,  69,  70,  12,
>     1,   0,   0,   1,   0,   0,   0,   84,  0,   0,   0,   1,   0,   0,   0,   28,  0,   0,   0,
>     0,   4,   255, 255, 0,   1,   0,   0,   216, 0,   0,   0,   60,  0,   0,   0,   0,   0,   0,
>@@ -72,8 +76,8 @@ const BYTE g_PS_ClearSint4[] = {
>     108, 117, 101, 70,  95,  83,  105, 110, 116, 0,   171, 171, 171, 0,   0,   3,   0,   1,   0,
>     1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   77,  105, 99,  114, 111, 115, 111, 102, 116,
>     32,  40,  82,  41,  32,  72,  76,  83,  76,  32,  83,  104, 97,  100, 101, 114, 32,  67,  111,
>-    109, 112, 105, 108, 101, 114, 32,  54,  46,  51,  46,  57,  54,  48,  48,  46,  49,  54,  51,
>-    56,  52,  0,   171, 171, 73,  83,  71,  78,  44,  0,   0,   0,   1,   0,   0,   0,   8,   0,
>+    109, 112, 105, 108, 101, 114, 32,  57,  46,  50,  57,  46,  57,  53,  50,  46,  51,  49,  49,
>+    49,  0,   171, 171, 171, 73,  83,  71,  78,  44,  0,   0,   0,   1,   0,   0,   0,   8,   0,
>     0,   0,   32,  0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   3,   0,   0,   0,   0,
>     0,   0,   0,   15,  0,   0,   0,   83,  86,  95,  80,  79,  83,  73,  84,  73,  79,  78,  0,
>     79,  83,  71,  78,  148, 0,   0,   0,   5,   0,   0,   0,   8,   0,   0,   0,   128, 0,   0,
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearsint11ps5.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearsint11ps5.h
>index 03e3ffe6556..d55aed2d710 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearsint11ps5.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearsint11ps5.h
>@@ -1,6 +1,10 @@
> #if 0
> //
>-// Generated by Microsoft (R) HLSL Shader Compiler 6.3.9600.16384
>+// Generated by Microsoft (R) HLSL Shader Compiler 9.29.952.3111
>+//
>+//
>+//   fxc /nologo /E PS_ClearSint5 /T ps_4_0 /Fh compiled\clearsint11ps5.h
>+//    Clear11.hlsl
> //
> //
> // Buffer Definitions: 
>@@ -24,21 +28,21 @@
> //
> // Input signature:
> //
>-// Name                 Index   Mask Register SysValue  Format   Used
>-// -------------------- ----- ------ -------- -------- ------- ------
>-// SV_POSITION              0   xyzw        0      POS   float       
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_POSITION              0   xyzw        0      POS  float       
> //
> //
> // Output signature:
> //
>-// Name                 Index   Mask Register SysValue  Format   Used
>-// -------------------- ----- ------ -------- -------- ------- ------
>-// SV_TARGET                0   xyzw        0   TARGET     int   xyzw
>-// SV_TARGET                1   xyzw        1   TARGET     int   xyzw
>-// SV_TARGET                2   xyzw        2   TARGET     int   xyzw
>-// SV_TARGET                3   xyzw        3   TARGET     int   xyzw
>-// SV_TARGET                4   xyzw        4   TARGET     int   xyzw
>-// SV_DEPTH                 0    N/A   oDepth    DEPTH   float    YES
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_TARGET                0   xyzw        0   TARGET    int   xyzw
>+// SV_TARGET                1   xyzw        1   TARGET    int   xyzw
>+// SV_TARGET                2   xyzw        2   TARGET    int   xyzw
>+// SV_TARGET                3   xyzw        3   TARGET    int   xyzw
>+// SV_TARGET                4   xyzw        4   TARGET    int   xyzw
>+// SV_DEPTH                 0    N/A   oDepth    DEPTH  float    YES
> //
> ps_4_0
> dcl_constantbuffer cb0[2], immediateIndexed
>@@ -59,8 +63,8 @@ ret
> #endif
> 
> const BYTE g_PS_ClearSint5[] = {
>-    68,  88,  66,  67,  107, 129, 105, 65,  196, 155, 48,  132, 184, 42,  88,  150, 96,  246, 10,
>-    243, 1,   0,   0,   0,   160, 3,   0,   0,   5,   0,   0,   0,   52,  0,   0,   0,   72,  1,
>+    68,  88,  66,  67,  24,  79,  49,  33,  135, 214, 214, 87,  139, 54,  205, 88,  244, 235, 83,
>+    59,  1,   0,   0,   0,   160, 3,   0,   0,   5,   0,   0,   0,   52,  0,   0,   0,   72,  1,
>     0,   0,   124, 1,   0,   0,   48,  2,   0,   0,   36,  3,   0,   0,   82,  68,  69,  70,  12,
>     1,   0,   0,   1,   0,   0,   0,   84,  0,   0,   0,   1,   0,   0,   0,   28,  0,   0,   0,
>     0,   4,   255, 255, 0,   1,   0,   0,   216, 0,   0,   0,   60,  0,   0,   0,   0,   0,   0,
>@@ -75,8 +79,8 @@ const BYTE g_PS_ClearSint5[] = {
>     108, 117, 101, 70,  95,  83,  105, 110, 116, 0,   171, 171, 171, 0,   0,   3,   0,   1,   0,
>     1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   77,  105, 99,  114, 111, 115, 111, 102, 116,
>     32,  40,  82,  41,  32,  72,  76,  83,  76,  32,  83,  104, 97,  100, 101, 114, 32,  67,  111,
>-    109, 112, 105, 108, 101, 114, 32,  54,  46,  51,  46,  57,  54,  48,  48,  46,  49,  54,  51,
>-    56,  52,  0,   171, 171, 73,  83,  71,  78,  44,  0,   0,   0,   1,   0,   0,   0,   8,   0,
>+    109, 112, 105, 108, 101, 114, 32,  57,  46,  50,  57,  46,  57,  53,  50,  46,  51,  49,  49,
>+    49,  0,   171, 171, 171, 73,  83,  71,  78,  44,  0,   0,   0,   1,   0,   0,   0,   8,   0,
>     0,   0,   32,  0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   3,   0,   0,   0,   0,
>     0,   0,   0,   15,  0,   0,   0,   83,  86,  95,  80,  79,  83,  73,  84,  73,  79,  78,  0,
>     79,  83,  71,  78,  172, 0,   0,   0,   6,   0,   0,   0,   8,   0,   0,   0,   152, 0,   0,
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearsint11ps6.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearsint11ps6.h
>index 73f4b2cdfcd..89a76f3102a 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearsint11ps6.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearsint11ps6.h
>@@ -1,6 +1,10 @@
> #if 0
> //
>-// Generated by Microsoft (R) HLSL Shader Compiler 6.3.9600.16384
>+// Generated by Microsoft (R) HLSL Shader Compiler 9.29.952.3111
>+//
>+//
>+//   fxc /nologo /E PS_ClearSint6 /T ps_4_0 /Fh compiled\clearsint11ps6.h
>+//    Clear11.hlsl
> //
> //
> // Buffer Definitions: 
>@@ -24,22 +28,22 @@
> //
> // Input signature:
> //
>-// Name                 Index   Mask Register SysValue  Format   Used
>-// -------------------- ----- ------ -------- -------- ------- ------
>-// SV_POSITION              0   xyzw        0      POS   float       
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_POSITION              0   xyzw        0      POS  float       
> //
> //
> // Output signature:
> //
>-// Name                 Index   Mask Register SysValue  Format   Used
>-// -------------------- ----- ------ -------- -------- ------- ------
>-// SV_TARGET                0   xyzw        0   TARGET     int   xyzw
>-// SV_TARGET                1   xyzw        1   TARGET     int   xyzw
>-// SV_TARGET                2   xyzw        2   TARGET     int   xyzw
>-// SV_TARGET                3   xyzw        3   TARGET     int   xyzw
>-// SV_TARGET                4   xyzw        4   TARGET     int   xyzw
>-// SV_TARGET                5   xyzw        5   TARGET     int   xyzw
>-// SV_DEPTH                 0    N/A   oDepth    DEPTH   float    YES
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_TARGET                0   xyzw        0   TARGET    int   xyzw
>+// SV_TARGET                1   xyzw        1   TARGET    int   xyzw
>+// SV_TARGET                2   xyzw        2   TARGET    int   xyzw
>+// SV_TARGET                3   xyzw        3   TARGET    int   xyzw
>+// SV_TARGET                4   xyzw        4   TARGET    int   xyzw
>+// SV_TARGET                5   xyzw        5   TARGET    int   xyzw
>+// SV_DEPTH                 0    N/A   oDepth    DEPTH  float    YES
> //
> ps_4_0
> dcl_constantbuffer cb0[2], immediateIndexed
>@@ -62,8 +66,8 @@ ret
> #endif
> 
> const BYTE g_PS_ClearSint6[] = {
>-    68,  88,  66,  67,  224, 172, 158, 172, 195, 197, 14,  59,  216, 200, 243, 209, 33,  202, 68,
>-    50,  1,   0,   0,   0,   220, 3,   0,   0,   5,   0,   0,   0,   52,  0,   0,   0,   72,  1,
>+    68,  88,  66,  67,  222, 117, 7,   238, 217, 163, 47,  39,  162, 0,   176, 159, 4,   111, 83,
>+    238, 1,   0,   0,   0,   220, 3,   0,   0,   5,   0,   0,   0,   52,  0,   0,   0,   72,  1,
>     0,   0,   124, 1,   0,   0,   72,  2,   0,   0,   96,  3,   0,   0,   82,  68,  69,  70,  12,
>     1,   0,   0,   1,   0,   0,   0,   84,  0,   0,   0,   1,   0,   0,   0,   28,  0,   0,   0,
>     0,   4,   255, 255, 0,   1,   0,   0,   216, 0,   0,   0,   60,  0,   0,   0,   0,   0,   0,
>@@ -78,8 +82,8 @@ const BYTE g_PS_ClearSint6[] = {
>     108, 117, 101, 70,  95,  83,  105, 110, 116, 0,   171, 171, 171, 0,   0,   3,   0,   1,   0,
>     1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   77,  105, 99,  114, 111, 115, 111, 102, 116,
>     32,  40,  82,  41,  32,  72,  76,  83,  76,  32,  83,  104, 97,  100, 101, 114, 32,  67,  111,
>-    109, 112, 105, 108, 101, 114, 32,  54,  46,  51,  46,  57,  54,  48,  48,  46,  49,  54,  51,
>-    56,  52,  0,   171, 171, 73,  83,  71,  78,  44,  0,   0,   0,   1,   0,   0,   0,   8,   0,
>+    109, 112, 105, 108, 101, 114, 32,  57,  46,  50,  57,  46,  57,  53,  50,  46,  51,  49,  49,
>+    49,  0,   171, 171, 171, 73,  83,  71,  78,  44,  0,   0,   0,   1,   0,   0,   0,   8,   0,
>     0,   0,   32,  0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   3,   0,   0,   0,   0,
>     0,   0,   0,   15,  0,   0,   0,   83,  86,  95,  80,  79,  83,  73,  84,  73,  79,  78,  0,
>     79,  83,  71,  78,  196, 0,   0,   0,   7,   0,   0,   0,   8,   0,   0,   0,   176, 0,   0,
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearsint11ps7.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearsint11ps7.h
>index 89a710538be..ca8e0cb86bf 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearsint11ps7.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearsint11ps7.h
>@@ -1,6 +1,10 @@
> #if 0
> //
>-// Generated by Microsoft (R) HLSL Shader Compiler 6.3.9600.16384
>+// Generated by Microsoft (R) HLSL Shader Compiler 9.29.952.3111
>+//
>+//
>+//   fxc /nologo /E PS_ClearSint7 /T ps_4_0 /Fh compiled\clearsint11ps7.h
>+//    Clear11.hlsl
> //
> //
> // Buffer Definitions: 
>@@ -24,23 +28,23 @@
> //
> // Input signature:
> //
>-// Name                 Index   Mask Register SysValue  Format   Used
>-// -------------------- ----- ------ -------- -------- ------- ------
>-// SV_POSITION              0   xyzw        0      POS   float       
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_POSITION              0   xyzw        0      POS  float       
> //
> //
> // Output signature:
> //
>-// Name                 Index   Mask Register SysValue  Format   Used
>-// -------------------- ----- ------ -------- -------- ------- ------
>-// SV_TARGET                0   xyzw        0   TARGET     int   xyzw
>-// SV_TARGET                1   xyzw        1   TARGET     int   xyzw
>-// SV_TARGET                2   xyzw        2   TARGET     int   xyzw
>-// SV_TARGET                3   xyzw        3   TARGET     int   xyzw
>-// SV_TARGET                4   xyzw        4   TARGET     int   xyzw
>-// SV_TARGET                5   xyzw        5   TARGET     int   xyzw
>-// SV_TARGET                6   xyzw        6   TARGET     int   xyzw
>-// SV_DEPTH                 0    N/A   oDepth    DEPTH   float    YES
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_TARGET                0   xyzw        0   TARGET    int   xyzw
>+// SV_TARGET                1   xyzw        1   TARGET    int   xyzw
>+// SV_TARGET                2   xyzw        2   TARGET    int   xyzw
>+// SV_TARGET                3   xyzw        3   TARGET    int   xyzw
>+// SV_TARGET                4   xyzw        4   TARGET    int   xyzw
>+// SV_TARGET                5   xyzw        5   TARGET    int   xyzw
>+// SV_TARGET                6   xyzw        6   TARGET    int   xyzw
>+// SV_DEPTH                 0    N/A   oDepth    DEPTH  float    YES
> //
> ps_4_0
> dcl_constantbuffer cb0[2], immediateIndexed
>@@ -65,8 +69,8 @@ ret
> #endif
> 
> const BYTE g_PS_ClearSint7[] = {
>-    68,  88,  66,  67,  7,   138, 112, 174, 240, 99,  49,  26,  154, 27,  225, 30,  199, 218, 197,
>-    44,  1,   0,   0,   0,   24,  4,   0,   0,   5,   0,   0,   0,   52,  0,   0,   0,   72,  1,
>+    68,  88,  66,  67,  47,  152, 142, 138, 182, 8,   198, 91,  234, 199, 6,   111, 183, 141, 38,
>+    79,  1,   0,   0,   0,   24,  4,   0,   0,   5,   0,   0,   0,   52,  0,   0,   0,   72,  1,
>     0,   0,   124, 1,   0,   0,   96,  2,   0,   0,   156, 3,   0,   0,   82,  68,  69,  70,  12,
>     1,   0,   0,   1,   0,   0,   0,   84,  0,   0,   0,   1,   0,   0,   0,   28,  0,   0,   0,
>     0,   4,   255, 255, 0,   1,   0,   0,   216, 0,   0,   0,   60,  0,   0,   0,   0,   0,   0,
>@@ -81,8 +85,8 @@ const BYTE g_PS_ClearSint7[] = {
>     108, 117, 101, 70,  95,  83,  105, 110, 116, 0,   171, 171, 171, 0,   0,   3,   0,   1,   0,
>     1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   77,  105, 99,  114, 111, 115, 111, 102, 116,
>     32,  40,  82,  41,  32,  72,  76,  83,  76,  32,  83,  104, 97,  100, 101, 114, 32,  67,  111,
>-    109, 112, 105, 108, 101, 114, 32,  54,  46,  51,  46,  57,  54,  48,  48,  46,  49,  54,  51,
>-    56,  52,  0,   171, 171, 73,  83,  71,  78,  44,  0,   0,   0,   1,   0,   0,   0,   8,   0,
>+    109, 112, 105, 108, 101, 114, 32,  57,  46,  50,  57,  46,  57,  53,  50,  46,  51,  49,  49,
>+    49,  0,   171, 171, 171, 73,  83,  71,  78,  44,  0,   0,   0,   1,   0,   0,   0,   8,   0,
>     0,   0,   32,  0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   3,   0,   0,   0,   0,
>     0,   0,   0,   15,  0,   0,   0,   83,  86,  95,  80,  79,  83,  73,  84,  73,  79,  78,  0,
>     79,  83,  71,  78,  220, 0,   0,   0,   8,   0,   0,   0,   8,   0,   0,   0,   200, 0,   0,
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearsint11ps8.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearsint11ps8.h
>index fc3880991d3..bbf564219d0 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearsint11ps8.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearsint11ps8.h
>@@ -1,6 +1,10 @@
> #if 0
> //
>-// Generated by Microsoft (R) HLSL Shader Compiler 6.3.9600.16384
>+// Generated by Microsoft (R) HLSL Shader Compiler 9.29.952.3111
>+//
>+//
>+//   fxc /nologo /E PS_ClearSint8 /T ps_4_0 /Fh compiled\clearsint11ps8.h
>+//    Clear11.hlsl
> //
> //
> // Buffer Definitions: 
>@@ -24,24 +28,24 @@
> //
> // Input signature:
> //
>-// Name                 Index   Mask Register SysValue  Format   Used
>-// -------------------- ----- ------ -------- -------- ------- ------
>-// SV_POSITION              0   xyzw        0      POS   float       
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_POSITION              0   xyzw        0      POS  float       
> //
> //
> // Output signature:
> //
>-// Name                 Index   Mask Register SysValue  Format   Used
>-// -------------------- ----- ------ -------- -------- ------- ------
>-// SV_TARGET                0   xyzw        0   TARGET     int   xyzw
>-// SV_TARGET                1   xyzw        1   TARGET     int   xyzw
>-// SV_TARGET                2   xyzw        2   TARGET     int   xyzw
>-// SV_TARGET                3   xyzw        3   TARGET     int   xyzw
>-// SV_TARGET                4   xyzw        4   TARGET     int   xyzw
>-// SV_TARGET                5   xyzw        5   TARGET     int   xyzw
>-// SV_TARGET                6   xyzw        6   TARGET     int   xyzw
>-// SV_TARGET                7   xyzw        7   TARGET     int   xyzw
>-// SV_DEPTH                 0    N/A   oDepth    DEPTH   float    YES
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_TARGET                0   xyzw        0   TARGET    int   xyzw
>+// SV_TARGET                1   xyzw        1   TARGET    int   xyzw
>+// SV_TARGET                2   xyzw        2   TARGET    int   xyzw
>+// SV_TARGET                3   xyzw        3   TARGET    int   xyzw
>+// SV_TARGET                4   xyzw        4   TARGET    int   xyzw
>+// SV_TARGET                5   xyzw        5   TARGET    int   xyzw
>+// SV_TARGET                6   xyzw        6   TARGET    int   xyzw
>+// SV_TARGET                7   xyzw        7   TARGET    int   xyzw
>+// SV_DEPTH                 0    N/A   oDepth    DEPTH  float    YES
> //
> ps_4_0
> dcl_constantbuffer cb0[2], immediateIndexed
>@@ -68,8 +72,8 @@ ret
> #endif
> 
> const BYTE g_PS_ClearSint8[] = {
>-    68,  88,  66,  67,  40,  80,  87,  20,  166, 137, 87,  18,  79,  10,  71,  118, 4,   27,  31,
>-    113, 1,   0,   0,   0,   84,  4,   0,   0,   5,   0,   0,   0,   52,  0,   0,   0,   72,  1,
>+    68,  88,  66,  67,  224, 106, 130, 91,  4,   244, 99,  23,  240, 126, 19,  252, 49,  217, 220,
>+    228, 1,   0,   0,   0,   84,  4,   0,   0,   5,   0,   0,   0,   52,  0,   0,   0,   72,  1,
>     0,   0,   124, 1,   0,   0,   120, 2,   0,   0,   216, 3,   0,   0,   82,  68,  69,  70,  12,
>     1,   0,   0,   1,   0,   0,   0,   84,  0,   0,   0,   1,   0,   0,   0,   28,  0,   0,   0,
>     0,   4,   255, 255, 0,   1,   0,   0,   216, 0,   0,   0,   60,  0,   0,   0,   0,   0,   0,
>@@ -84,8 +88,8 @@ const BYTE g_PS_ClearSint8[] = {
>     108, 117, 101, 70,  95,  83,  105, 110, 116, 0,   171, 171, 171, 0,   0,   3,   0,   1,   0,
>     1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   77,  105, 99,  114, 111, 115, 111, 102, 116,
>     32,  40,  82,  41,  32,  72,  76,  83,  76,  32,  83,  104, 97,  100, 101, 114, 32,  67,  111,
>-    109, 112, 105, 108, 101, 114, 32,  54,  46,  51,  46,  57,  54,  48,  48,  46,  49,  54,  51,
>-    56,  52,  0,   171, 171, 73,  83,  71,  78,  44,  0,   0,   0,   1,   0,   0,   0,   8,   0,
>+    109, 112, 105, 108, 101, 114, 32,  57,  46,  50,  57,  46,  57,  53,  50,  46,  51,  49,  49,
>+    49,  0,   171, 171, 171, 73,  83,  71,  78,  44,  0,   0,   0,   1,   0,   0,   0,   8,   0,
>     0,   0,   32,  0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   3,   0,   0,   0,   0,
>     0,   0,   0,   15,  0,   0,   0,   83,  86,  95,  80,  79,  83,  73,  84,  73,  79,  78,  0,
>     79,  83,  71,  78,  244, 0,   0,   0,   9,   0,   0,   0,   8,   0,   0,   0,   224, 0,   0,
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearuint11ps1.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearuint11ps1.h
>index 7ce73ae4a66..a869653bfda 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearuint11ps1.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearuint11ps1.h
>@@ -1,6 +1,10 @@
> #if 0
> //
>-// Generated by Microsoft (R) HLSL Shader Compiler 6.3.9600.16384
>+// Generated by Microsoft (R) HLSL Shader Compiler 9.29.952.3111
>+//
>+//
>+//   fxc /nologo /E PS_ClearUint1 /T ps_4_0 /Fh compiled\clearuint11ps1.h
>+//    Clear11.hlsl
> //
> //
> // Buffer Definitions: 
>@@ -24,17 +28,17 @@
> //
> // Input signature:
> //
>-// Name                 Index   Mask Register SysValue  Format   Used
>-// -------------------- ----- ------ -------- -------- ------- ------
>-// SV_POSITION              0   xyzw        0      POS   float       
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_POSITION              0   xyzw        0      POS  float       
> //
> //
> // Output signature:
> //
>-// Name                 Index   Mask Register SysValue  Format   Used
>-// -------------------- ----- ------ -------- -------- ------- ------
>-// SV_TARGET                0   xyzw        0   TARGET    uint   xyzw
>-// SV_DEPTH                 0    N/A   oDepth    DEPTH   float    YES
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_TARGET                0   xyzw        0   TARGET   uint   xyzw
>+// SV_DEPTH                 0    N/A   oDepth    DEPTH  float    YES
> //
> ps_4_0
> dcl_constantbuffer cb0[2], immediateIndexed
>@@ -47,8 +51,8 @@ ret
> #endif
> 
> const BYTE g_PS_ClearUint1[] = {
>-    68,  88,  66,  67,  165, 251, 33,  78,  86,  103, 162, 162, 213, 224, 91,  62,  153, 83,  9,
>-    114, 1,   0,   0,   0,   176, 2,   0,   0,   5,   0,   0,   0,   52,  0,   0,   0,   72,  1,
>+    68,  88,  66,  67,  220, 175, 96,  75,  216, 185, 134, 21,  58,  117, 130, 41,  133, 106, 117,
>+    72,  1,   0,   0,   0,   176, 2,   0,   0,   5,   0,   0,   0,   52,  0,   0,   0,   72,  1,
>     0,   0,   124, 1,   0,   0,   208, 1,   0,   0,   52,  2,   0,   0,   82,  68,  69,  70,  12,
>     1,   0,   0,   1,   0,   0,   0,   84,  0,   0,   0,   1,   0,   0,   0,   28,  0,   0,   0,
>     0,   4,   255, 255, 0,   1,   0,   0,   216, 0,   0,   0,   60,  0,   0,   0,   0,   0,   0,
>@@ -63,8 +67,8 @@ const BYTE g_PS_ClearUint1[] = {
>     108, 117, 101, 70,  95,  85,  105, 110, 116, 0,   171, 171, 171, 0,   0,   3,   0,   1,   0,
>     1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   77,  105, 99,  114, 111, 115, 111, 102, 116,
>     32,  40,  82,  41,  32,  72,  76,  83,  76,  32,  83,  104, 97,  100, 101, 114, 32,  67,  111,
>-    109, 112, 105, 108, 101, 114, 32,  54,  46,  51,  46,  57,  54,  48,  48,  46,  49,  54,  51,
>-    56,  52,  0,   171, 171, 73,  83,  71,  78,  44,  0,   0,   0,   1,   0,   0,   0,   8,   0,
>+    109, 112, 105, 108, 101, 114, 32,  57,  46,  50,  57,  46,  57,  53,  50,  46,  51,  49,  49,
>+    49,  0,   171, 171, 171, 73,  83,  71,  78,  44,  0,   0,   0,   1,   0,   0,   0,   8,   0,
>     0,   0,   32,  0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   3,   0,   0,   0,   0,
>     0,   0,   0,   15,  0,   0,   0,   83,  86,  95,  80,  79,  83,  73,  84,  73,  79,  78,  0,
>     79,  83,  71,  78,  76,  0,   0,   0,   2,   0,   0,   0,   8,   0,   0,   0,   56,  0,   0,
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearuint11ps2.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearuint11ps2.h
>index 392566942b6..59c62708960 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearuint11ps2.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearuint11ps2.h
>@@ -1,6 +1,10 @@
> #if 0
> //
>-// Generated by Microsoft (R) HLSL Shader Compiler 6.3.9600.16384
>+// Generated by Microsoft (R) HLSL Shader Compiler 9.29.952.3111
>+//
>+//
>+//   fxc /nologo /E PS_ClearUint2 /T ps_4_0 /Fh compiled\clearuint11ps2.h
>+//    Clear11.hlsl
> //
> //
> // Buffer Definitions: 
>@@ -24,18 +28,18 @@
> //
> // Input signature:
> //
>-// Name                 Index   Mask Register SysValue  Format   Used
>-// -------------------- ----- ------ -------- -------- ------- ------
>-// SV_POSITION              0   xyzw        0      POS   float       
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_POSITION              0   xyzw        0      POS  float       
> //
> //
> // Output signature:
> //
>-// Name                 Index   Mask Register SysValue  Format   Used
>-// -------------------- ----- ------ -------- -------- ------- ------
>-// SV_TARGET                0   xyzw        0   TARGET    uint   xyzw
>-// SV_TARGET                1   xyzw        1   TARGET    uint   xyzw
>-// SV_DEPTH                 0    N/A   oDepth    DEPTH   float    YES
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_TARGET                0   xyzw        0   TARGET   uint   xyzw
>+// SV_TARGET                1   xyzw        1   TARGET   uint   xyzw
>+// SV_DEPTH                 0    N/A   oDepth    DEPTH  float    YES
> //
> ps_4_0
> dcl_constantbuffer cb0[2], immediateIndexed
>@@ -50,8 +54,8 @@ ret
> #endif
> 
> const BYTE g_PS_ClearUint2[] = {
>-    68,  88,  66,  67,  64,  241, 9,   8,   108, 162, 163, 180, 109, 195, 189, 181, 110, 171, 114,
>-    118, 1,   0,   0,   0,   236, 2,   0,   0,   5,   0,   0,   0,   52,  0,   0,   0,   72,  1,
>+    68,  88,  66,  67,  42,  133, 132, 52,  23,  242, 4,   181, 33,  9,   143, 17,  179, 83,  209,
>+    213, 1,   0,   0,   0,   236, 2,   0,   0,   5,   0,   0,   0,   52,  0,   0,   0,   72,  1,
>     0,   0,   124, 1,   0,   0,   232, 1,   0,   0,   112, 2,   0,   0,   82,  68,  69,  70,  12,
>     1,   0,   0,   1,   0,   0,   0,   84,  0,   0,   0,   1,   0,   0,   0,   28,  0,   0,   0,
>     0,   4,   255, 255, 0,   1,   0,   0,   216, 0,   0,   0,   60,  0,   0,   0,   0,   0,   0,
>@@ -66,8 +70,8 @@ const BYTE g_PS_ClearUint2[] = {
>     108, 117, 101, 70,  95,  85,  105, 110, 116, 0,   171, 171, 171, 0,   0,   3,   0,   1,   0,
>     1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   77,  105, 99,  114, 111, 115, 111, 102, 116,
>     32,  40,  82,  41,  32,  72,  76,  83,  76,  32,  83,  104, 97,  100, 101, 114, 32,  67,  111,
>-    109, 112, 105, 108, 101, 114, 32,  54,  46,  51,  46,  57,  54,  48,  48,  46,  49,  54,  51,
>-    56,  52,  0,   171, 171, 73,  83,  71,  78,  44,  0,   0,   0,   1,   0,   0,   0,   8,   0,
>+    109, 112, 105, 108, 101, 114, 32,  57,  46,  50,  57,  46,  57,  53,  50,  46,  51,  49,  49,
>+    49,  0,   171, 171, 171, 73,  83,  71,  78,  44,  0,   0,   0,   1,   0,   0,   0,   8,   0,
>     0,   0,   32,  0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   3,   0,   0,   0,   0,
>     0,   0,   0,   15,  0,   0,   0,   83,  86,  95,  80,  79,  83,  73,  84,  73,  79,  78,  0,
>     79,  83,  71,  78,  100, 0,   0,   0,   3,   0,   0,   0,   8,   0,   0,   0,   80,  0,   0,
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearuint11ps3.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearuint11ps3.h
>index 0c0617eb06f..d3da033b67c 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearuint11ps3.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearuint11ps3.h
>@@ -1,6 +1,10 @@
> #if 0
> //
>-// Generated by Microsoft (R) HLSL Shader Compiler 6.3.9600.16384
>+// Generated by Microsoft (R) HLSL Shader Compiler 9.29.952.3111
>+//
>+//
>+//   fxc /nologo /E PS_ClearUint3 /T ps_4_0 /Fh compiled\clearuint11ps3.h
>+//    Clear11.hlsl
> //
> //
> // Buffer Definitions: 
>@@ -24,19 +28,19 @@
> //
> // Input signature:
> //
>-// Name                 Index   Mask Register SysValue  Format   Used
>-// -------------------- ----- ------ -------- -------- ------- ------
>-// SV_POSITION              0   xyzw        0      POS   float       
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_POSITION              0   xyzw        0      POS  float       
> //
> //
> // Output signature:
> //
>-// Name                 Index   Mask Register SysValue  Format   Used
>-// -------------------- ----- ------ -------- -------- ------- ------
>-// SV_TARGET                0   xyzw        0   TARGET    uint   xyzw
>-// SV_TARGET                1   xyzw        1   TARGET    uint   xyzw
>-// SV_TARGET                2   xyzw        2   TARGET    uint   xyzw
>-// SV_DEPTH                 0    N/A   oDepth    DEPTH   float    YES
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_TARGET                0   xyzw        0   TARGET   uint   xyzw
>+// SV_TARGET                1   xyzw        1   TARGET   uint   xyzw
>+// SV_TARGET                2   xyzw        2   TARGET   uint   xyzw
>+// SV_DEPTH                 0    N/A   oDepth    DEPTH  float    YES
> //
> ps_4_0
> dcl_constantbuffer cb0[2], immediateIndexed
>@@ -53,8 +57,8 @@ ret
> #endif
> 
> const BYTE g_PS_ClearUint3[] = {
>-    68,  88,  66,  67,  207, 249, 236, 218, 42,  28,  216, 245, 185, 80,  143, 139, 56,  108, 199,
>-    11,  1,   0,   0,   0,   40,  3,   0,   0,   5,   0,   0,   0,   52,  0,   0,   0,   72,  1,
>+    68,  88,  66,  67,  53,  56,  177, 56,  90,  50,  25,  21,  43,  95,  252, 133, 162, 6,   79,
>+    246, 1,   0,   0,   0,   40,  3,   0,   0,   5,   0,   0,   0,   52,  0,   0,   0,   72,  1,
>     0,   0,   124, 1,   0,   0,   0,   2,   0,   0,   172, 2,   0,   0,   82,  68,  69,  70,  12,
>     1,   0,   0,   1,   0,   0,   0,   84,  0,   0,   0,   1,   0,   0,   0,   28,  0,   0,   0,
>     0,   4,   255, 255, 0,   1,   0,   0,   216, 0,   0,   0,   60,  0,   0,   0,   0,   0,   0,
>@@ -69,8 +73,8 @@ const BYTE g_PS_ClearUint3[] = {
>     108, 117, 101, 70,  95,  85,  105, 110, 116, 0,   171, 171, 171, 0,   0,   3,   0,   1,   0,
>     1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   77,  105, 99,  114, 111, 115, 111, 102, 116,
>     32,  40,  82,  41,  32,  72,  76,  83,  76,  32,  83,  104, 97,  100, 101, 114, 32,  67,  111,
>-    109, 112, 105, 108, 101, 114, 32,  54,  46,  51,  46,  57,  54,  48,  48,  46,  49,  54,  51,
>-    56,  52,  0,   171, 171, 73,  83,  71,  78,  44,  0,   0,   0,   1,   0,   0,   0,   8,   0,
>+    109, 112, 105, 108, 101, 114, 32,  57,  46,  50,  57,  46,  57,  53,  50,  46,  51,  49,  49,
>+    49,  0,   171, 171, 171, 73,  83,  71,  78,  44,  0,   0,   0,   1,   0,   0,   0,   8,   0,
>     0,   0,   32,  0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   3,   0,   0,   0,   0,
>     0,   0,   0,   15,  0,   0,   0,   83,  86,  95,  80,  79,  83,  73,  84,  73,  79,  78,  0,
>     79,  83,  71,  78,  124, 0,   0,   0,   4,   0,   0,   0,   8,   0,   0,   0,   104, 0,   0,
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearuint11ps4.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearuint11ps4.h
>index 8a0e32cdc49..c36348e165c 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearuint11ps4.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearuint11ps4.h
>@@ -1,6 +1,10 @@
> #if 0
> //
>-// Generated by Microsoft (R) HLSL Shader Compiler 6.3.9600.16384
>+// Generated by Microsoft (R) HLSL Shader Compiler 9.29.952.3111
>+//
>+//
>+//   fxc /nologo /E PS_ClearUint4 /T ps_4_0 /Fh compiled\clearuint11ps4.h
>+//    Clear11.hlsl
> //
> //
> // Buffer Definitions: 
>@@ -24,20 +28,20 @@
> //
> // Input signature:
> //
>-// Name                 Index   Mask Register SysValue  Format   Used
>-// -------------------- ----- ------ -------- -------- ------- ------
>-// SV_POSITION              0   xyzw        0      POS   float       
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_POSITION              0   xyzw        0      POS  float       
> //
> //
> // Output signature:
> //
>-// Name                 Index   Mask Register SysValue  Format   Used
>-// -------------------- ----- ------ -------- -------- ------- ------
>-// SV_TARGET                0   xyzw        0   TARGET    uint   xyzw
>-// SV_TARGET                1   xyzw        1   TARGET    uint   xyzw
>-// SV_TARGET                2   xyzw        2   TARGET    uint   xyzw
>-// SV_TARGET                3   xyzw        3   TARGET    uint   xyzw
>-// SV_DEPTH                 0    N/A   oDepth    DEPTH   float    YES
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_TARGET                0   xyzw        0   TARGET   uint   xyzw
>+// SV_TARGET                1   xyzw        1   TARGET   uint   xyzw
>+// SV_TARGET                2   xyzw        2   TARGET   uint   xyzw
>+// SV_TARGET                3   xyzw        3   TARGET   uint   xyzw
>+// SV_DEPTH                 0    N/A   oDepth    DEPTH  float    YES
> //
> ps_4_0
> dcl_constantbuffer cb0[2], immediateIndexed
>@@ -56,8 +60,8 @@ ret
> #endif
> 
> const BYTE g_PS_ClearUint4[] = {
>-    68,  88,  66,  67,  199, 123, 16,  1,   215, 108, 177, 8,   10,  177, 4,   33,  216, 58,  53,
>-    78,  1,   0,   0,   0,   100, 3,   0,   0,   5,   0,   0,   0,   52,  0,   0,   0,   72,  1,
>+    68,  88,  66,  67,  93,  224, 233, 7,   108, 86,  206, 136, 211, 232, 189, 38,  61,  229, 240,
>+    107, 1,   0,   0,   0,   100, 3,   0,   0,   5,   0,   0,   0,   52,  0,   0,   0,   72,  1,
>     0,   0,   124, 1,   0,   0,   24,  2,   0,   0,   232, 2,   0,   0,   82,  68,  69,  70,  12,
>     1,   0,   0,   1,   0,   0,   0,   84,  0,   0,   0,   1,   0,   0,   0,   28,  0,   0,   0,
>     0,   4,   255, 255, 0,   1,   0,   0,   216, 0,   0,   0,   60,  0,   0,   0,   0,   0,   0,
>@@ -72,8 +76,8 @@ const BYTE g_PS_ClearUint4[] = {
>     108, 117, 101, 70,  95,  85,  105, 110, 116, 0,   171, 171, 171, 0,   0,   3,   0,   1,   0,
>     1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   77,  105, 99,  114, 111, 115, 111, 102, 116,
>     32,  40,  82,  41,  32,  72,  76,  83,  76,  32,  83,  104, 97,  100, 101, 114, 32,  67,  111,
>-    109, 112, 105, 108, 101, 114, 32,  54,  46,  51,  46,  57,  54,  48,  48,  46,  49,  54,  51,
>-    56,  52,  0,   171, 171, 73,  83,  71,  78,  44,  0,   0,   0,   1,   0,   0,   0,   8,   0,
>+    109, 112, 105, 108, 101, 114, 32,  57,  46,  50,  57,  46,  57,  53,  50,  46,  51,  49,  49,
>+    49,  0,   171, 171, 171, 73,  83,  71,  78,  44,  0,   0,   0,   1,   0,   0,   0,   8,   0,
>     0,   0,   32,  0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   3,   0,   0,   0,   0,
>     0,   0,   0,   15,  0,   0,   0,   83,  86,  95,  80,  79,  83,  73,  84,  73,  79,  78,  0,
>     79,  83,  71,  78,  148, 0,   0,   0,   5,   0,   0,   0,   8,   0,   0,   0,   128, 0,   0,
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearuint11ps5.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearuint11ps5.h
>index d7172fc0e94..364c59093ab 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearuint11ps5.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearuint11ps5.h
>@@ -1,6 +1,10 @@
> #if 0
> //
>-// Generated by Microsoft (R) HLSL Shader Compiler 6.3.9600.16384
>+// Generated by Microsoft (R) HLSL Shader Compiler 9.29.952.3111
>+//
>+//
>+//   fxc /nologo /E PS_ClearUint5 /T ps_4_0 /Fh compiled\clearuint11ps5.h
>+//    Clear11.hlsl
> //
> //
> // Buffer Definitions: 
>@@ -24,21 +28,21 @@
> //
> // Input signature:
> //
>-// Name                 Index   Mask Register SysValue  Format   Used
>-// -------------------- ----- ------ -------- -------- ------- ------
>-// SV_POSITION              0   xyzw        0      POS   float       
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_POSITION              0   xyzw        0      POS  float       
> //
> //
> // Output signature:
> //
>-// Name                 Index   Mask Register SysValue  Format   Used
>-// -------------------- ----- ------ -------- -------- ------- ------
>-// SV_TARGET                0   xyzw        0   TARGET    uint   xyzw
>-// SV_TARGET                1   xyzw        1   TARGET    uint   xyzw
>-// SV_TARGET                2   xyzw        2   TARGET    uint   xyzw
>-// SV_TARGET                3   xyzw        3   TARGET    uint   xyzw
>-// SV_TARGET                4   xyzw        4   TARGET    uint   xyzw
>-// SV_DEPTH                 0    N/A   oDepth    DEPTH   float    YES
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_TARGET                0   xyzw        0   TARGET   uint   xyzw
>+// SV_TARGET                1   xyzw        1   TARGET   uint   xyzw
>+// SV_TARGET                2   xyzw        2   TARGET   uint   xyzw
>+// SV_TARGET                3   xyzw        3   TARGET   uint   xyzw
>+// SV_TARGET                4   xyzw        4   TARGET   uint   xyzw
>+// SV_DEPTH                 0    N/A   oDepth    DEPTH  float    YES
> //
> ps_4_0
> dcl_constantbuffer cb0[2], immediateIndexed
>@@ -59,8 +63,8 @@ ret
> #endif
> 
> const BYTE g_PS_ClearUint5[] = {
>-    68,  88,  66,  67,  200, 229, 167, 131, 228, 54,  139, 228, 159, 151, 189, 241, 206, 62,  101,
>-    65,  1,   0,   0,   0,   160, 3,   0,   0,   5,   0,   0,   0,   52,  0,   0,   0,   72,  1,
>+    68,  88,  66,  67,  145, 170, 201, 225, 97,  45,  33,  28,  95,  98,  167, 25,  135, 24,  231,
>+    97,  1,   0,   0,   0,   160, 3,   0,   0,   5,   0,   0,   0,   52,  0,   0,   0,   72,  1,
>     0,   0,   124, 1,   0,   0,   48,  2,   0,   0,   36,  3,   0,   0,   82,  68,  69,  70,  12,
>     1,   0,   0,   1,   0,   0,   0,   84,  0,   0,   0,   1,   0,   0,   0,   28,  0,   0,   0,
>     0,   4,   255, 255, 0,   1,   0,   0,   216, 0,   0,   0,   60,  0,   0,   0,   0,   0,   0,
>@@ -75,8 +79,8 @@ const BYTE g_PS_ClearUint5[] = {
>     108, 117, 101, 70,  95,  85,  105, 110, 116, 0,   171, 171, 171, 0,   0,   3,   0,   1,   0,
>     1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   77,  105, 99,  114, 111, 115, 111, 102, 116,
>     32,  40,  82,  41,  32,  72,  76,  83,  76,  32,  83,  104, 97,  100, 101, 114, 32,  67,  111,
>-    109, 112, 105, 108, 101, 114, 32,  54,  46,  51,  46,  57,  54,  48,  48,  46,  49,  54,  51,
>-    56,  52,  0,   171, 171, 73,  83,  71,  78,  44,  0,   0,   0,   1,   0,   0,   0,   8,   0,
>+    109, 112, 105, 108, 101, 114, 32,  57,  46,  50,  57,  46,  57,  53,  50,  46,  51,  49,  49,
>+    49,  0,   171, 171, 171, 73,  83,  71,  78,  44,  0,   0,   0,   1,   0,   0,   0,   8,   0,
>     0,   0,   32,  0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   3,   0,   0,   0,   0,
>     0,   0,   0,   15,  0,   0,   0,   83,  86,  95,  80,  79,  83,  73,  84,  73,  79,  78,  0,
>     79,  83,  71,  78,  172, 0,   0,   0,   6,   0,   0,   0,   8,   0,   0,   0,   152, 0,   0,
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearuint11ps6.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearuint11ps6.h
>index 54528309f7d..c9ff5fd122f 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearuint11ps6.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearuint11ps6.h
>@@ -1,6 +1,10 @@
> #if 0
> //
>-// Generated by Microsoft (R) HLSL Shader Compiler 6.3.9600.16384
>+// Generated by Microsoft (R) HLSL Shader Compiler 9.29.952.3111
>+//
>+//
>+//   fxc /nologo /E PS_ClearUint6 /T ps_4_0 /Fh compiled\clearuint11ps6.h
>+//    Clear11.hlsl
> //
> //
> // Buffer Definitions: 
>@@ -24,22 +28,22 @@
> //
> // Input signature:
> //
>-// Name                 Index   Mask Register SysValue  Format   Used
>-// -------------------- ----- ------ -------- -------- ------- ------
>-// SV_POSITION              0   xyzw        0      POS   float       
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_POSITION              0   xyzw        0      POS  float       
> //
> //
> // Output signature:
> //
>-// Name                 Index   Mask Register SysValue  Format   Used
>-// -------------------- ----- ------ -------- -------- ------- ------
>-// SV_TARGET                0   xyzw        0   TARGET    uint   xyzw
>-// SV_TARGET                1   xyzw        1   TARGET    uint   xyzw
>-// SV_TARGET                2   xyzw        2   TARGET    uint   xyzw
>-// SV_TARGET                3   xyzw        3   TARGET    uint   xyzw
>-// SV_TARGET                4   xyzw        4   TARGET    uint   xyzw
>-// SV_TARGET                5   xyzw        5   TARGET    uint   xyzw
>-// SV_DEPTH                 0    N/A   oDepth    DEPTH   float    YES
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_TARGET                0   xyzw        0   TARGET   uint   xyzw
>+// SV_TARGET                1   xyzw        1   TARGET   uint   xyzw
>+// SV_TARGET                2   xyzw        2   TARGET   uint   xyzw
>+// SV_TARGET                3   xyzw        3   TARGET   uint   xyzw
>+// SV_TARGET                4   xyzw        4   TARGET   uint   xyzw
>+// SV_TARGET                5   xyzw        5   TARGET   uint   xyzw
>+// SV_DEPTH                 0    N/A   oDepth    DEPTH  float    YES
> //
> ps_4_0
> dcl_constantbuffer cb0[2], immediateIndexed
>@@ -62,8 +66,8 @@ ret
> #endif
> 
> const BYTE g_PS_ClearUint6[] = {
>-    68,  88,  66,  67,  92,  35,  11,  26,  168, 95,  96,  195, 79,  231, 8,   0,   53,  204, 222,
>-    121, 1,   0,   0,   0,   220, 3,   0,   0,   5,   0,   0,   0,   52,  0,   0,   0,   72,  1,
>+    68,  88,  66,  67,  59,  95,  199, 69,  225, 101, 80,  115, 38,  233, 215, 218, 240, 146, 191,
>+    41,  1,   0,   0,   0,   220, 3,   0,   0,   5,   0,   0,   0,   52,  0,   0,   0,   72,  1,
>     0,   0,   124, 1,   0,   0,   72,  2,   0,   0,   96,  3,   0,   0,   82,  68,  69,  70,  12,
>     1,   0,   0,   1,   0,   0,   0,   84,  0,   0,   0,   1,   0,   0,   0,   28,  0,   0,   0,
>     0,   4,   255, 255, 0,   1,   0,   0,   216, 0,   0,   0,   60,  0,   0,   0,   0,   0,   0,
>@@ -78,8 +82,8 @@ const BYTE g_PS_ClearUint6[] = {
>     108, 117, 101, 70,  95,  85,  105, 110, 116, 0,   171, 171, 171, 0,   0,   3,   0,   1,   0,
>     1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   77,  105, 99,  114, 111, 115, 111, 102, 116,
>     32,  40,  82,  41,  32,  72,  76,  83,  76,  32,  83,  104, 97,  100, 101, 114, 32,  67,  111,
>-    109, 112, 105, 108, 101, 114, 32,  54,  46,  51,  46,  57,  54,  48,  48,  46,  49,  54,  51,
>-    56,  52,  0,   171, 171, 73,  83,  71,  78,  44,  0,   0,   0,   1,   0,   0,   0,   8,   0,
>+    109, 112, 105, 108, 101, 114, 32,  57,  46,  50,  57,  46,  57,  53,  50,  46,  51,  49,  49,
>+    49,  0,   171, 171, 171, 73,  83,  71,  78,  44,  0,   0,   0,   1,   0,   0,   0,   8,   0,
>     0,   0,   32,  0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   3,   0,   0,   0,   0,
>     0,   0,   0,   15,  0,   0,   0,   83,  86,  95,  80,  79,  83,  73,  84,  73,  79,  78,  0,
>     79,  83,  71,  78,  196, 0,   0,   0,   7,   0,   0,   0,   8,   0,   0,   0,   176, 0,   0,
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearuint11ps7.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearuint11ps7.h
>index 67c2d0e5a59..003f8e52faa 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearuint11ps7.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearuint11ps7.h
>@@ -1,6 +1,10 @@
> #if 0
> //
>-// Generated by Microsoft (R) HLSL Shader Compiler 6.3.9600.16384
>+// Generated by Microsoft (R) HLSL Shader Compiler 9.29.952.3111
>+//
>+//
>+//   fxc /nologo /E PS_ClearUint7 /T ps_4_0 /Fh compiled\clearuint11ps7.h
>+//    Clear11.hlsl
> //
> //
> // Buffer Definitions: 
>@@ -24,23 +28,23 @@
> //
> // Input signature:
> //
>-// Name                 Index   Mask Register SysValue  Format   Used
>-// -------------------- ----- ------ -------- -------- ------- ------
>-// SV_POSITION              0   xyzw        0      POS   float       
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_POSITION              0   xyzw        0      POS  float       
> //
> //
> // Output signature:
> //
>-// Name                 Index   Mask Register SysValue  Format   Used
>-// -------------------- ----- ------ -------- -------- ------- ------
>-// SV_TARGET                0   xyzw        0   TARGET    uint   xyzw
>-// SV_TARGET                1   xyzw        1   TARGET    uint   xyzw
>-// SV_TARGET                2   xyzw        2   TARGET    uint   xyzw
>-// SV_TARGET                3   xyzw        3   TARGET    uint   xyzw
>-// SV_TARGET                4   xyzw        4   TARGET    uint   xyzw
>-// SV_TARGET                5   xyzw        5   TARGET    uint   xyzw
>-// SV_TARGET                6   xyzw        6   TARGET    uint   xyzw
>-// SV_DEPTH                 0    N/A   oDepth    DEPTH   float    YES
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_TARGET                0   xyzw        0   TARGET   uint   xyzw
>+// SV_TARGET                1   xyzw        1   TARGET   uint   xyzw
>+// SV_TARGET                2   xyzw        2   TARGET   uint   xyzw
>+// SV_TARGET                3   xyzw        3   TARGET   uint   xyzw
>+// SV_TARGET                4   xyzw        4   TARGET   uint   xyzw
>+// SV_TARGET                5   xyzw        5   TARGET   uint   xyzw
>+// SV_TARGET                6   xyzw        6   TARGET   uint   xyzw
>+// SV_DEPTH                 0    N/A   oDepth    DEPTH  float    YES
> //
> ps_4_0
> dcl_constantbuffer cb0[2], immediateIndexed
>@@ -65,8 +69,8 @@ ret
> #endif
> 
> const BYTE g_PS_ClearUint7[] = {
>-    68,  88,  66,  67,  222, 54,  153, 233, 23,  19,  230, 114, 59,  92,  55,  31,  123, 0,   252,
>-    103, 1,   0,   0,   0,   24,  4,   0,   0,   5,   0,   0,   0,   52,  0,   0,   0,   72,  1,
>+    68,  88,  66,  67,  6,   251, 248, 98,  126, 222, 114, 11,  145, 122, 100, 238, 211, 116, 210,
>+    124, 1,   0,   0,   0,   24,  4,   0,   0,   5,   0,   0,   0,   52,  0,   0,   0,   72,  1,
>     0,   0,   124, 1,   0,   0,   96,  2,   0,   0,   156, 3,   0,   0,   82,  68,  69,  70,  12,
>     1,   0,   0,   1,   0,   0,   0,   84,  0,   0,   0,   1,   0,   0,   0,   28,  0,   0,   0,
>     0,   4,   255, 255, 0,   1,   0,   0,   216, 0,   0,   0,   60,  0,   0,   0,   0,   0,   0,
>@@ -81,8 +85,8 @@ const BYTE g_PS_ClearUint7[] = {
>     108, 117, 101, 70,  95,  85,  105, 110, 116, 0,   171, 171, 171, 0,   0,   3,   0,   1,   0,
>     1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   77,  105, 99,  114, 111, 115, 111, 102, 116,
>     32,  40,  82,  41,  32,  72,  76,  83,  76,  32,  83,  104, 97,  100, 101, 114, 32,  67,  111,
>-    109, 112, 105, 108, 101, 114, 32,  54,  46,  51,  46,  57,  54,  48,  48,  46,  49,  54,  51,
>-    56,  52,  0,   171, 171, 73,  83,  71,  78,  44,  0,   0,   0,   1,   0,   0,   0,   8,   0,
>+    109, 112, 105, 108, 101, 114, 32,  57,  46,  50,  57,  46,  57,  53,  50,  46,  51,  49,  49,
>+    49,  0,   171, 171, 171, 73,  83,  71,  78,  44,  0,   0,   0,   1,   0,   0,   0,   8,   0,
>     0,   0,   32,  0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   3,   0,   0,   0,   0,
>     0,   0,   0,   15,  0,   0,   0,   83,  86,  95,  80,  79,  83,  73,  84,  73,  79,  78,  0,
>     79,  83,  71,  78,  220, 0,   0,   0,   8,   0,   0,   0,   8,   0,   0,   0,   200, 0,   0,
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearuint11ps8.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearuint11ps8.h
>index d271d6bff42..36719eba45f 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearuint11ps8.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearuint11ps8.h
>@@ -1,6 +1,10 @@
> #if 0
> //
>-// Generated by Microsoft (R) HLSL Shader Compiler 6.3.9600.16384
>+// Generated by Microsoft (R) HLSL Shader Compiler 9.29.952.3111
>+//
>+//
>+//   fxc /nologo /E PS_ClearUint8 /T ps_4_0 /Fh compiled\clearuint11ps8.h
>+//    Clear11.hlsl
> //
> //
> // Buffer Definitions: 
>@@ -24,24 +28,24 @@
> //
> // Input signature:
> //
>-// Name                 Index   Mask Register SysValue  Format   Used
>-// -------------------- ----- ------ -------- -------- ------- ------
>-// SV_POSITION              0   xyzw        0      POS   float       
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_POSITION              0   xyzw        0      POS  float       
> //
> //
> // Output signature:
> //
>-// Name                 Index   Mask Register SysValue  Format   Used
>-// -------------------- ----- ------ -------- -------- ------- ------
>-// SV_TARGET                0   xyzw        0   TARGET    uint   xyzw
>-// SV_TARGET                1   xyzw        1   TARGET    uint   xyzw
>-// SV_TARGET                2   xyzw        2   TARGET    uint   xyzw
>-// SV_TARGET                3   xyzw        3   TARGET    uint   xyzw
>-// SV_TARGET                4   xyzw        4   TARGET    uint   xyzw
>-// SV_TARGET                5   xyzw        5   TARGET    uint   xyzw
>-// SV_TARGET                6   xyzw        6   TARGET    uint   xyzw
>-// SV_TARGET                7   xyzw        7   TARGET    uint   xyzw
>-// SV_DEPTH                 0    N/A   oDepth    DEPTH   float    YES
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_TARGET                0   xyzw        0   TARGET   uint   xyzw
>+// SV_TARGET                1   xyzw        1   TARGET   uint   xyzw
>+// SV_TARGET                2   xyzw        2   TARGET   uint   xyzw
>+// SV_TARGET                3   xyzw        3   TARGET   uint   xyzw
>+// SV_TARGET                4   xyzw        4   TARGET   uint   xyzw
>+// SV_TARGET                5   xyzw        5   TARGET   uint   xyzw
>+// SV_TARGET                6   xyzw        6   TARGET   uint   xyzw
>+// SV_TARGET                7   xyzw        7   TARGET   uint   xyzw
>+// SV_DEPTH                 0    N/A   oDepth    DEPTH  float    YES
> //
> ps_4_0
> dcl_constantbuffer cb0[2], immediateIndexed
>@@ -68,8 +72,8 @@ ret
> #endif
> 
> const BYTE g_PS_ClearUint8[] = {
>-    68,  88,  66,  67,  31,  50,  232, 254, 182, 197, 174, 161, 39,  175, 44,  65,  71,  251, 37,
>-    230, 1,   0,   0,   0,   84,  4,   0,   0,   5,   0,   0,   0,   52,  0,   0,   0,   72,  1,
>+    68,  88,  66,  67,  136, 114, 184, 151, 152, 245, 97,  46,  151, 61,  117, 123, 231, 117, 211,
>+    116, 1,   0,   0,   0,   84,  4,   0,   0,   5,   0,   0,   0,   52,  0,   0,   0,   72,  1,
>     0,   0,   124, 1,   0,   0,   120, 2,   0,   0,   216, 3,   0,   0,   82,  68,  69,  70,  12,
>     1,   0,   0,   1,   0,   0,   0,   84,  0,   0,   0,   1,   0,   0,   0,   28,  0,   0,   0,
>     0,   4,   255, 255, 0,   1,   0,   0,   216, 0,   0,   0,   60,  0,   0,   0,   0,   0,   0,
>@@ -84,8 +88,8 @@ const BYTE g_PS_ClearUint8[] = {
>     108, 117, 101, 70,  95,  85,  105, 110, 116, 0,   171, 171, 171, 0,   0,   3,   0,   1,   0,
>     1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   77,  105, 99,  114, 111, 115, 111, 102, 116,
>     32,  40,  82,  41,  32,  72,  76,  83,  76,  32,  83,  104, 97,  100, 101, 114, 32,  67,  111,
>-    109, 112, 105, 108, 101, 114, 32,  54,  46,  51,  46,  57,  54,  48,  48,  46,  49,  54,  51,
>-    56,  52,  0,   171, 171, 73,  83,  71,  78,  44,  0,   0,   0,   1,   0,   0,   0,   8,   0,
>+    109, 112, 105, 108, 101, 114, 32,  57,  46,  50,  57,  46,  57,  53,  50,  46,  51,  49,  49,
>+    49,  0,   171, 171, 171, 73,  83,  71,  78,  44,  0,   0,   0,   1,   0,   0,   0,   8,   0,
>     0,   0,   32,  0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   3,   0,   0,   0,   0,
>     0,   0,   0,   15,  0,   0,   0,   83,  86,  95,  80,  79,  83,  73,  84,  73,  79,  78,  0,
>     79,  83,  71,  78,  244, 0,   0,   0,   9,   0,   0,   0,   8,   0,   0,   0,   224, 0,   0,
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_pm_luma_2d_ps.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_pm_luma_2d_ps.h
>new file mode 100644
>index 00000000000..e267c67c290
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_pm_luma_2d_ps.h
>@@ -0,0 +1,81 @@
>+#if 0
>+//
>+// Generated by Microsoft (R) HLSL Shader Compiler 9.29.952.3111
>+//
>+//
>+//   fxc /nologo /E PS_FtoF_PM_LUMA_2D /T ps_4_0 /Fh
>+//    compiled\multiplyalpha_ftof_pm_luma_2d_ps.h MultiplyAlpha.hlsl
>+//
>+//
>+// Resource Bindings:
>+//
>+// Name                                 Type  Format         Dim Slot Elements
>+// ------------------------------ ---------- ------- ----------- ---- --------
>+// Sampler                           sampler      NA          NA    0        1
>+// TextureF                          texture  float4          2d    0        1
>+//
>+//
>+//
>+// Input signature:
>+//
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_POSITION              0   xyzw        0      POS  float
>+// TEXCOORD                 0   xy          1     NONE  float   xy
>+//
>+//
>+// Output signature:
>+//
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_TARGET                0   xyzw        0   TARGET  float   xyzw
>+//
>+ps_4_0
>+dcl_sampler s0, mode_default
>+dcl_resource_texture2d (float,float,float,float) t0
>+dcl_input_ps linear v1.xy
>+dcl_output o0.xyzw
>+dcl_temps 1
>+sample r0.xyzw, v1.xyxx, t0.xyzw, s0
>+mul o0.xyz, r0.wwww, r0.xxxx
>+mov o0.w, l(1.000000)
>+ret
>+// Approximately 4 instruction slots used
>+#endif
>+
>+const BYTE g_PS_FtoF_PM_LUMA_2D[] = {
>+    68,  88,  66,  67,  209, 59,  102, 31,  237, 225, 110, 86,  236, 253, 1,   91,  155, 216, 150,
>+    240, 1,   0,   0,   0,   136, 2,   0,   0,   5,   0,   0,   0,   52,  0,   0,   0,   220, 0,
>+    0,   0,   52,  1,   0,   0,   104, 1,   0,   0,   12,  2,   0,   0,   82,  68,  69,  70,  160,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   2,   0,   0,   0,   28,  0,   0,   0,
>+    0,   4,   255, 255, 0,   1,   0,   0,   109, 0,   0,   0,   92,  0,   0,   0,   3,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,
>+    0,   0,   1,   0,   0,   0,   100, 0,   0,   0,   2,   0,   0,   0,   5,   0,   0,   0,   4,
>+    0,   0,   0,   255, 255, 255, 255, 0,   0,   0,   0,   1,   0,   0,   0,   13,  0,   0,   0,
>+    83,  97,  109, 112, 108, 101, 114, 0,   84,  101, 120, 116, 117, 114, 101, 70,  0,   77,  105,
>+    99,  114, 111, 115, 111, 102, 116, 32,  40,  82,  41,  32,  72,  76,  83,  76,  32,  83,  104,
>+    97,  100, 101, 114, 32,  67,  111, 109, 112, 105, 108, 101, 114, 32,  57,  46,  50,  57,  46,
>+    57,  53,  50,  46,  51,  49,  49,  49,  0,   171, 171, 73,  83,  71,  78,  80,  0,   0,   0,
>+    2,   0,   0,   0,   8,   0,   0,   0,   56,  0,   0,   0,   0,   0,   0,   0,   1,   0,   0,
>+    0,   3,   0,   0,   0,   0,   0,   0,   0,   15,  0,   0,   0,   68,  0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   3,   0,   0,   0,   1,   0,   0,   0,   3,   3,   0,   0,   83,
>+    86,  95,  80,  79,  83,  73,  84,  73,  79,  78,  0,   84,  69,  88,  67,  79,  79,  82,  68,
>+    0,   171, 171, 171, 79,  83,  71,  78,  44,  0,   0,   0,   1,   0,   0,   0,   8,   0,   0,
>+    0,   32,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   3,   0,   0,   0,   0,   0,
>+    0,   0,   15,  0,   0,   0,   83,  86,  95,  84,  65,  82,  71,  69,  84,  0,   171, 171, 83,
>+    72,  68,  82,  156, 0,   0,   0,   64,  0,   0,   0,   39,  0,   0,   0,   90,  0,   0,   3,
>+    0,   96,  16,  0,   0,   0,   0,   0,   88,  24,  0,   4,   0,   112, 16,  0,   0,   0,   0,
>+    0,   85,  85,  0,   0,   98,  16,  0,   3,   50,  16,  16,  0,   1,   0,   0,   0,   101, 0,
>+    0,   3,   242, 32,  16,  0,   0,   0,   0,   0,   104, 0,   0,   2,   1,   0,   0,   0,   69,
>+    0,   0,   9,   242, 0,   16,  0,   0,   0,   0,   0,   70,  16,  16,  0,   1,   0,   0,   0,
>+    70,  126, 16,  0,   0,   0,   0,   0,   0,   96,  16,  0,   0,   0,   0,   0,   56,  0,   0,
>+    7,   114, 32,  16,  0,   0,   0,   0,   0,   246, 15,  16,  0,   0,   0,   0,   0,   6,   0,
>+    16,  0,   0,   0,   0,   0,   54,  0,   0,   5,   130, 32,  16,  0,   0,   0,   0,   0,   1,
>+    64,  0,   0,   0,   0,   128, 63,  62,  0,   0,   1,   83,  84,  65,  84,  116, 0,   0,   0,
>+    4,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   2,   0,   0,   0,   1,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0};
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_pm_luma_2darray_ps.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_pm_luma_2darray_ps.h
>new file mode 100644
>index 00000000000..386203c3bf2
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_pm_luma_2darray_ps.h
>@@ -0,0 +1,90 @@
>+#if 0
>+//
>+// Generated by Microsoft (R) HLSL Shader Compiler 9.29.952.3111
>+//
>+//
>+//   fxc /nologo /E PS_FtoF_PM_LUMA_2DArray /T ps_4_0 /Fh
>+//    compiled\multiplyalpha_ftof_pm_luma_2darray_ps.h MultiplyAlpha.hlsl
>+//
>+//
>+// Resource Bindings:
>+//
>+// Name                                 Type  Format         Dim Slot Elements
>+// ------------------------------ ---------- ------- ----------- ---- --------
>+// Sampler                           sampler      NA          NA    0        1
>+// TextureF_2DArray                  texture  float4     2darray    0        1
>+//
>+//
>+//
>+// Input signature:
>+//
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_POSITION              0   xyzw        0      POS  float       
>+// SV_RENDERTARGETARRAYINDEX     0   x           1  RTINDEX   uint   x   
>+// TEXCOORD                 0   xyz         2     NONE  float   xy  
>+//
>+//
>+// Output signature:
>+//
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_TARGET                0   xyzw        0   TARGET  float   xyzw
>+//
>+ps_4_0
>+dcl_sampler s0, mode_default
>+dcl_resource_texture2darray (float,float,float,float) t0
>+dcl_input_ps_siv constant v1.x, rendertarget_array_index
>+dcl_input_ps linear v2.xy
>+dcl_output o0.xyzw
>+dcl_temps 1
>+utof r0.z, v1.x
>+mov r0.xy, v2.xyxx
>+sample r0.xyzw, r0.xyzx, t0.xyzw, s0
>+mul o0.xyz, r0.wwww, r0.xxxx
>+mov o0.w, l(1.000000)
>+ret 
>+// Approximately 6 instruction slots used
>+#endif
>+
>+const BYTE g_PS_FtoF_PM_LUMA_2DArray[] = {
>+    68,  88,  66,  67,  208, 70,  99,  71,  119, 41,  43,  184, 189, 145, 19,  67,  181, 106, 103,
>+    72,  1,   0,   0,   0,   248, 2,   0,   0,   5,   0,   0,   0,   52,  0,   0,   0,   228, 0,
>+    0,   0,   108, 1,   0,   0,   160, 1,   0,   0,   124, 2,   0,   0,   82,  68,  69,  70,  168,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   2,   0,   0,   0,   28,  0,   0,   0,
>+    0,   4,   255, 255, 0,   1,   0,   0,   117, 0,   0,   0,   92,  0,   0,   0,   3,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,
>+    0,   0,   1,   0,   0,   0,   100, 0,   0,   0,   2,   0,   0,   0,   5,   0,   0,   0,   5,
>+    0,   0,   0,   255, 255, 255, 255, 0,   0,   0,   0,   1,   0,   0,   0,   13,  0,   0,   0,
>+    83,  97,  109, 112, 108, 101, 114, 0,   84,  101, 120, 116, 117, 114, 101, 70,  95,  50,  68,
>+    65,  114, 114, 97,  121, 0,   77,  105, 99,  114, 111, 115, 111, 102, 116, 32,  40,  82,  41,
>+    32,  72,  76,  83,  76,  32,  83,  104, 97,  100, 101, 114, 32,  67,  111, 109, 112, 105, 108,
>+    101, 114, 32,  57,  46,  50,  57,  46,  57,  53,  50,  46,  51,  49,  49,  49,  0,   171, 171,
>+    73,  83,  71,  78,  128, 0,   0,   0,   3,   0,   0,   0,   8,   0,   0,   0,   80,  0,   0,
>+    0,   0,   0,   0,   0,   1,   0,   0,   0,   3,   0,   0,   0,   0,   0,   0,   0,   15,  0,
>+    0,   0,   92,  0,   0,   0,   0,   0,   0,   0,   4,   0,   0,   0,   1,   0,   0,   0,   1,
>+    0,   0,   0,   1,   1,   0,   0,   118, 0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    3,   0,   0,   0,   2,   0,   0,   0,   7,   3,   0,   0,   83,  86,  95,  80,  79,  83,  73,
>+    84,  73,  79,  78,  0,   83,  86,  95,  82,  69,  78,  68,  69,  82,  84,  65,  82,  71,  69,
>+    84,  65,  82,  82,  65,  89,  73,  78,  68,  69,  88,  0,   84,  69,  88,  67,  79,  79,  82,
>+    68,  0,   171, 79,  83,  71,  78,  44,  0,   0,   0,   1,   0,   0,   0,   8,   0,   0,   0,
>+    32,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   3,   0,   0,   0,   0,   0,   0,
>+    0,   15,  0,   0,   0,   83,  86,  95,  84,  65,  82,  71,  69,  84,  0,   171, 171, 83,  72,
>+    68,  82,  212, 0,   0,   0,   64,  0,   0,   0,   53,  0,   0,   0,   90,  0,   0,   3,   0,
>+    96,  16,  0,   0,   0,   0,   0,   88,  64,  0,   4,   0,   112, 16,  0,   0,   0,   0,   0,
>+    85,  85,  0,   0,   100, 8,   0,   4,   18,  16,  16,  0,   1,   0,   0,   0,   4,   0,   0,
>+    0,   98,  16,  0,   3,   50,  16,  16,  0,   2,   0,   0,   0,   101, 0,   0,   3,   242, 32,
>+    16,  0,   0,   0,   0,   0,   104, 0,   0,   2,   1,   0,   0,   0,   86,  0,   0,   5,   66,
>+    0,   16,  0,   0,   0,   0,   0,   10,  16,  16,  0,   1,   0,   0,   0,   54,  0,   0,   5,
>+    50,  0,   16,  0,   0,   0,   0,   0,   70,  16,  16,  0,   2,   0,   0,   0,   69,  0,   0,
>+    9,   242, 0,   16,  0,   0,   0,   0,   0,   70,  2,   16,  0,   0,   0,   0,   0,   70,  126,
>+    16,  0,   0,   0,   0,   0,   0,   96,  16,  0,   0,   0,   0,   0,   56,  0,   0,   7,   114,
>+    32,  16,  0,   0,   0,   0,   0,   246, 15,  16,  0,   0,   0,   0,   0,   6,   0,   16,  0,
>+    0,   0,   0,   0,   54,  0,   0,   5,   130, 32,  16,  0,   0,   0,   0,   0,   1,   64,  0,
>+    0,   0,   0,   128, 63,  62,  0,   0,   1,   83,  84,  65,  84,  116, 0,   0,   0,   6,   0,
>+    0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   3,   0,   0,   0,   1,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   2,   0,
>+    0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0};
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_pm_luma_3d_ps.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_pm_luma_3d_ps.h
>new file mode 100644
>index 00000000000..d3d612b6afc
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_pm_luma_3d_ps.h
>@@ -0,0 +1,84 @@
>+#if 0
>+//
>+// Generated by Microsoft (R) HLSL Shader Compiler 9.29.952.3111
>+//
>+//
>+//   fxc /nologo /E PS_FtoF_PM_LUMA_3D /T ps_4_0 /Fh
>+//    compiled\multiplyalpha_ftof_pm_luma_3d_ps.h MultiplyAlpha.hlsl
>+//
>+//
>+// Resource Bindings:
>+//
>+// Name                                 Type  Format         Dim Slot Elements
>+// ------------------------------ ---------- ------- ----------- ---- --------
>+// Sampler                           sampler      NA          NA    0        1
>+// TextureF_3D                       texture  float4          3d    0        1
>+//
>+//
>+//
>+// Input signature:
>+//
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_POSITION              0   xyzw        0      POS  float       
>+// SV_RENDERTARGETARRAYINDEX     0   x           1  RTINDEX   uint       
>+// TEXCOORD                 0   xyz         2     NONE  float   xyz 
>+//
>+//
>+// Output signature:
>+//
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_TARGET                0   xyzw        0   TARGET  float   xyzw
>+//
>+ps_4_0
>+dcl_sampler s0, mode_default
>+dcl_resource_texture3d (float,float,float,float) t0
>+dcl_input_ps linear v2.xyz
>+dcl_output o0.xyzw
>+dcl_temps 1
>+sample r0.xyzw, v2.xyzx, t0.xyzw, s0
>+mul o0.xyz, r0.wwww, r0.xxxx
>+mov o0.w, l(1.000000)
>+ret 
>+// Approximately 4 instruction slots used
>+#endif
>+
>+const BYTE g_PS_FtoF_PM_LUMA_3D[] = {
>+    68,  88, 66,  67,  214, 160, 249, 108, 182, 66,  25,  177, 36,  87,  104, 15,  250, 128, 30,
>+    24,  1,  0,   0,   0,   188, 2,   0,   0,   5,   0,   0,   0,   52,  0,   0,   0,   224, 0,
>+    0,   0,  104, 1,   0,   0,   156, 1,   0,   0,   64,  2,   0,   0,   82,  68,  69,  70,  164,
>+    0,   0,  0,   0,   0,   0,   0,   0,   0,   0,   0,   2,   0,   0,   0,   28,  0,   0,   0,
>+    0,   4,  255, 255, 0,   1,   0,   0,   112, 0,   0,   0,   92,  0,   0,   0,   3,   0,   0,
>+    0,   0,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,
>+    0,   0,  1,   0,   0,   0,   100, 0,   0,   0,   2,   0,   0,   0,   5,   0,   0,   0,   8,
>+    0,   0,  0,   255, 255, 255, 255, 0,   0,   0,   0,   1,   0,   0,   0,   13,  0,   0,   0,
>+    83,  97, 109, 112, 108, 101, 114, 0,   84,  101, 120, 116, 117, 114, 101, 70,  95,  51,  68,
>+    0,   77, 105, 99,  114, 111, 115, 111, 102, 116, 32,  40,  82,  41,  32,  72,  76,  83,  76,
>+    32,  83, 104, 97,  100, 101, 114, 32,  67,  111, 109, 112, 105, 108, 101, 114, 32,  57,  46,
>+    50,  57, 46,  57,  53,  50,  46,  51,  49,  49,  49,  0,   171, 171, 171, 73,  83,  71,  78,
>+    128, 0,  0,   0,   3,   0,   0,   0,   8,   0,   0,   0,   80,  0,   0,   0,   0,   0,   0,
>+    0,   1,  0,   0,   0,   3,   0,   0,   0,   0,   0,   0,   0,   15,  0,   0,   0,   92,  0,
>+    0,   0,  0,   0,   0,   0,   4,   0,   0,   0,   1,   0,   0,   0,   1,   0,   0,   0,   1,
>+    0,   0,  0,   118, 0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   3,   0,   0,   0,
>+    2,   0,  0,   0,   7,   7,   0,   0,   83,  86,  95,  80,  79,  83,  73,  84,  73,  79,  78,
>+    0,   83, 86,  95,  82,  69,  78,  68,  69,  82,  84,  65,  82,  71,  69,  84,  65,  82,  82,
>+    65,  89, 73,  78,  68,  69,  88,  0,   84,  69,  88,  67,  79,  79,  82,  68,  0,   171, 79,
>+    83,  71, 78,  44,  0,   0,   0,   1,   0,   0,   0,   8,   0,   0,   0,   32,  0,   0,   0,
>+    0,   0,  0,   0,   0,   0,   0,   0,   3,   0,   0,   0,   0,   0,   0,   0,   15,  0,   0,
>+    0,   83, 86,  95,  84,  65,  82,  71,  69,  84,  0,   171, 171, 83,  72,  68,  82,  156, 0,
>+    0,   0,  64,  0,   0,   0,   39,  0,   0,   0,   90,  0,   0,   3,   0,   96,  16,  0,   0,
>+    0,   0,  0,   88,  40,  0,   4,   0,   112, 16,  0,   0,   0,   0,   0,   85,  85,  0,   0,
>+    98,  16, 0,   3,   114, 16,  16,  0,   2,   0,   0,   0,   101, 0,   0,   3,   242, 32,  16,
>+    0,   0,  0,   0,   0,   104, 0,   0,   2,   1,   0,   0,   0,   69,  0,   0,   9,   242, 0,
>+    16,  0,  0,   0,   0,   0,   70,  18,  16,  0,   2,   0,   0,   0,   70,  126, 16,  0,   0,
>+    0,   0,  0,   0,   96,  16,  0,   0,   0,   0,   0,   56,  0,   0,   7,   114, 32,  16,  0,
>+    0,   0,  0,   0,   246, 15,  16,  0,   0,   0,   0,   0,   6,   0,   16,  0,   0,   0,   0,
>+    0,   54, 0,   0,   5,   130, 32,  16,  0,   0,   0,   0,   0,   1,   64,  0,   0,   0,   0,
>+    128, 63, 62,  0,   0,   1,   83,  84,  65,  84,  116, 0,   0,   0,   4,   0,   0,   0,   1,
>+    0,   0,  0,   0,   0,   0,   0,   2,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,  0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   0,   0,
>+    0,   0,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   0,
>+    0,   0,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0};
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_pm_luma_ps.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_pm_luma_ps.h
>deleted file mode 100644
>index 9d5b14b45a7..00000000000
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_pm_luma_ps.h
>+++ /dev/null
>@@ -1,77 +0,0 @@
>-#if 0
>-//
>-// Generated by Microsoft (R) HLSL Shader Compiler 6.3.9600.16384
>-//
>-//
>-// Resource Bindings:
>-//
>-// Name                                 Type  Format         Dim Slot Elements
>-// ------------------------------ ---------- ------- ----------- ---- --------
>-// Sampler                           sampler      NA          NA    0        1
>-// TextureF                          texture  float4          2d    0        1
>-//
>-//
>-//
>-// Input signature:
>-//
>-// Name                 Index   Mask Register SysValue  Format   Used
>-// -------------------- ----- ------ -------- -------- ------- ------
>-// SV_POSITION              0   xyzw        0      POS   float       
>-// TEXCOORD                 0   xy          1     NONE   float   xy  
>-//
>-//
>-// Output signature:
>-//
>-// Name                 Index   Mask Register SysValue  Format   Used
>-// -------------------- ----- ------ -------- -------- ------- ------
>-// SV_TARGET                0   xyzw        0   TARGET   float   xyzw
>-//
>-ps_4_0
>-dcl_sampler s0, mode_default
>-dcl_resource_texture2d (float,float,float,float) t0
>-dcl_input_ps linear v1.xy
>-dcl_output o0.xyzw
>-dcl_temps 1
>-sample r0.xyzw, v1.xyxx, t0.xyzw, s0
>-mul o0.xyz, r0.wwww, r0.xxxx
>-mov o0.w, l(1.000000)
>-ret 
>-// Approximately 4 instruction slots used
>-#endif
>-
>-const BYTE g_PS_FtoF_PM_LUMA[] = {
>-    68, 88,  66,  67,  61,  193, 4,   85,  218, 250, 183, 199, 231, 187, 141, 93,  80,  186, 200,
>-    74, 1,   0,   0,   0,   136, 2,   0,   0,   5,   0,   0,   0,   52,  0,   0,   0,   220, 0,
>-    0,  0,   52,  1,   0,   0,   104, 1,   0,   0,   12,  2,   0,   0,   82,  68,  69,  70,  160,
>-    0,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   2,   0,   0,   0,   28,  0,   0,   0,
>-    0,  4,   255, 255, 0,   1,   0,   0,   109, 0,   0,   0,   92,  0,   0,   0,   3,   0,   0,
>-    0,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,
>-    0,  0,   1,   0,   0,   0,   100, 0,   0,   0,   2,   0,   0,   0,   5,   0,   0,   0,   4,
>-    0,  0,   0,   255, 255, 255, 255, 0,   0,   0,   0,   1,   0,   0,   0,   13,  0,   0,   0,
>-    83, 97,  109, 112, 108, 101, 114, 0,   84,  101, 120, 116, 117, 114, 101, 70,  0,   77,  105,
>-    99, 114, 111, 115, 111, 102, 116, 32,  40,  82,  41,  32,  72,  76,  83,  76,  32,  83,  104,
>-    97, 100, 101, 114, 32,  67,  111, 109, 112, 105, 108, 101, 114, 32,  54,  46,  51,  46,  57,
>-    54, 48,  48,  46,  49,  54,  51,  56,  52,  0,   171, 73,  83,  71,  78,  80,  0,   0,   0,
>-    2,  0,   0,   0,   8,   0,   0,   0,   56,  0,   0,   0,   0,   0,   0,   0,   1,   0,   0,
>-    0,  3,   0,   0,   0,   0,   0,   0,   0,   15,  0,   0,   0,   68,  0,   0,   0,   0,   0,
>-    0,  0,   0,   0,   0,   0,   3,   0,   0,   0,   1,   0,   0,   0,   3,   3,   0,   0,   83,
>-    86, 95,  80,  79,  83,  73,  84,  73,  79,  78,  0,   84,  69,  88,  67,  79,  79,  82,  68,
>-    0,  171, 171, 171, 79,  83,  71,  78,  44,  0,   0,   0,   1,   0,   0,   0,   8,   0,   0,
>-    0,  32,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   3,   0,   0,   0,   0,   0,
>-    0,  0,   15,  0,   0,   0,   83,  86,  95,  84,  65,  82,  71,  69,  84,  0,   171, 171, 83,
>-    72, 68,  82,  156, 0,   0,   0,   64,  0,   0,   0,   39,  0,   0,   0,   90,  0,   0,   3,
>-    0,  96,  16,  0,   0,   0,   0,   0,   88,  24,  0,   4,   0,   112, 16,  0,   0,   0,   0,
>-    0,  85,  85,  0,   0,   98,  16,  0,   3,   50,  16,  16,  0,   1,   0,   0,   0,   101, 0,
>-    0,  3,   242, 32,  16,  0,   0,   0,   0,   0,   104, 0,   0,   2,   1,   0,   0,   0,   69,
>-    0,  0,   9,   242, 0,   16,  0,   0,   0,   0,   0,   70,  16,  16,  0,   1,   0,   0,   0,
>-    70, 126, 16,  0,   0,   0,   0,   0,   0,   96,  16,  0,   0,   0,   0,   0,   56,  0,   0,
>-    7,  114, 32,  16,  0,   0,   0,   0,   0,   246, 15,  16,  0,   0,   0,   0,   0,   6,   0,
>-    16, 0,   0,   0,   0,   0,   54,  0,   0,   5,   130, 32,  16,  0,   0,   0,   0,   0,   1,
>-    64, 0,   0,   0,   0,   128, 63,  62,  0,   0,   1,   83,  84,  65,  84,  116, 0,   0,   0,
>-    4,  0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   2,   0,   0,   0,   1,   0,   0,
>-    0,  0,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>-    0,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,
>-    0,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>-    1,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>-    0,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>-    0,  0};
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_pm_lumaalpha_2d_ps.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_pm_lumaalpha_2d_ps.h
>new file mode 100644
>index 00000000000..7e2fbddc6b8
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_pm_lumaalpha_2d_ps.h
>@@ -0,0 +1,81 @@
>+#if 0
>+//
>+// Generated by Microsoft (R) HLSL Shader Compiler 9.29.952.3111
>+//
>+//
>+//   fxc /nologo /E PS_FtoF_PM_LUMAALPHA_2D /T ps_4_0 /Fh
>+//    compiled\multiplyalpha_ftof_pm_lumaalpha_2d_ps.h MultiplyAlpha.hlsl
>+//
>+//
>+// Resource Bindings:
>+//
>+// Name                                 Type  Format         Dim Slot Elements
>+// ------------------------------ ---------- ------- ----------- ---- --------
>+// Sampler                           sampler      NA          NA    0        1
>+// TextureF                          texture  float4          2d    0        1
>+//
>+//
>+//
>+// Input signature:
>+//
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_POSITION              0   xyzw        0      POS  float
>+// TEXCOORD                 0   xy          1     NONE  float   xy
>+//
>+//
>+// Output signature:
>+//
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_TARGET                0   xyzw        0   TARGET  float   xyzw
>+//
>+ps_4_0
>+dcl_sampler s0, mode_default
>+dcl_resource_texture2d (float,float,float,float) t0
>+dcl_input_ps linear v1.xy
>+dcl_output o0.xyzw
>+dcl_temps 1
>+sample r0.xyzw, v1.xyxx, t0.xyzw, s0
>+mul o0.xyz, r0.wwww, r0.xxxx
>+mov o0.w, r0.w
>+ret
>+// Approximately 4 instruction slots used
>+#endif
>+
>+const BYTE g_PS_FtoF_PM_LUMAALPHA_2D[] = {
>+    68, 88,  66,  67,  115, 23,  213, 46,  252, 25,  113, 198, 165, 30,  205, 48,  189, 198, 141,
>+    23, 1,   0,   0,   0,   136, 2,   0,   0,   5,   0,   0,   0,   52,  0,   0,   0,   220, 0,
>+    0,  0,   52,  1,   0,   0,   104, 1,   0,   0,   12,  2,   0,   0,   82,  68,  69,  70,  160,
>+    0,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   2,   0,   0,   0,   28,  0,   0,   0,
>+    0,  4,   255, 255, 0,   1,   0,   0,   109, 0,   0,   0,   92,  0,   0,   0,   3,   0,   0,
>+    0,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,
>+    0,  0,   1,   0,   0,   0,   100, 0,   0,   0,   2,   0,   0,   0,   5,   0,   0,   0,   4,
>+    0,  0,   0,   255, 255, 255, 255, 0,   0,   0,   0,   1,   0,   0,   0,   13,  0,   0,   0,
>+    83, 97,  109, 112, 108, 101, 114, 0,   84,  101, 120, 116, 117, 114, 101, 70,  0,   77,  105,
>+    99, 114, 111, 115, 111, 102, 116, 32,  40,  82,  41,  32,  72,  76,  83,  76,  32,  83,  104,
>+    97, 100, 101, 114, 32,  67,  111, 109, 112, 105, 108, 101, 114, 32,  57,  46,  50,  57,  46,
>+    57, 53,  50,  46,  51,  49,  49,  49,  0,   171, 171, 73,  83,  71,  78,  80,  0,   0,   0,
>+    2,  0,   0,   0,   8,   0,   0,   0,   56,  0,   0,   0,   0,   0,   0,   0,   1,   0,   0,
>+    0,  3,   0,   0,   0,   0,   0,   0,   0,   15,  0,   0,   0,   68,  0,   0,   0,   0,   0,
>+    0,  0,   0,   0,   0,   0,   3,   0,   0,   0,   1,   0,   0,   0,   3,   3,   0,   0,   83,
>+    86, 95,  80,  79,  83,  73,  84,  73,  79,  78,  0,   84,  69,  88,  67,  79,  79,  82,  68,
>+    0,  171, 171, 171, 79,  83,  71,  78,  44,  0,   0,   0,   1,   0,   0,   0,   8,   0,   0,
>+    0,  32,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   3,   0,   0,   0,   0,   0,
>+    0,  0,   15,  0,   0,   0,   83,  86,  95,  84,  65,  82,  71,  69,  84,  0,   171, 171, 83,
>+    72, 68,  82,  156, 0,   0,   0,   64,  0,   0,   0,   39,  0,   0,   0,   90,  0,   0,   3,
>+    0,  96,  16,  0,   0,   0,   0,   0,   88,  24,  0,   4,   0,   112, 16,  0,   0,   0,   0,
>+    0,  85,  85,  0,   0,   98,  16,  0,   3,   50,  16,  16,  0,   1,   0,   0,   0,   101, 0,
>+    0,  3,   242, 32,  16,  0,   0,   0,   0,   0,   104, 0,   0,   2,   1,   0,   0,   0,   69,
>+    0,  0,   9,   242, 0,   16,  0,   0,   0,   0,   0,   70,  16,  16,  0,   1,   0,   0,   0,
>+    70, 126, 16,  0,   0,   0,   0,   0,   0,   96,  16,  0,   0,   0,   0,   0,   56,  0,   0,
>+    7,  114, 32,  16,  0,   0,   0,   0,   0,   246, 15,  16,  0,   0,   0,   0,   0,   6,   0,
>+    16, 0,   0,   0,   0,   0,   54,  0,   0,   5,   130, 32,  16,  0,   0,   0,   0,   0,   58,
>+    0,  16,  0,   0,   0,   0,   0,   62,  0,   0,   1,   83,  84,  65,  84,  116, 0,   0,   0,
>+    4,  0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   2,   0,   0,   0,   1,   0,   0,
>+    0,  0,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,
>+    0,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    1,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,  0};
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_pm_lumaalpha_2darray_ps.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_pm_lumaalpha_2darray_ps.h
>new file mode 100644
>index 00000000000..8e19b44f5a8
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_pm_lumaalpha_2darray_ps.h
>@@ -0,0 +1,90 @@
>+#if 0
>+//
>+// Generated by Microsoft (R) HLSL Shader Compiler 9.29.952.3111
>+//
>+//
>+//   fxc /nologo /E PS_FtoF_PM_LUMAALPHA_2DArray /T ps_4_0 /Fh
>+//    compiled\multiplyalpha_ftof_pm_lumaalpha_2darray_ps.h MultiplyAlpha.hlsl
>+//
>+//
>+// Resource Bindings:
>+//
>+// Name                                 Type  Format         Dim Slot Elements
>+// ------------------------------ ---------- ------- ----------- ---- --------
>+// Sampler                           sampler      NA          NA    0        1
>+// TextureF_2DArray                  texture  float4     2darray    0        1
>+//
>+//
>+//
>+// Input signature:
>+//
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_POSITION              0   xyzw        0      POS  float       
>+// SV_RENDERTARGETARRAYINDEX     0   x           1  RTINDEX   uint   x   
>+// TEXCOORD                 0   xyz         2     NONE  float   xy  
>+//
>+//
>+// Output signature:
>+//
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_TARGET                0   xyzw        0   TARGET  float   xyzw
>+//
>+ps_4_0
>+dcl_sampler s0, mode_default
>+dcl_resource_texture2darray (float,float,float,float) t0
>+dcl_input_ps_siv constant v1.x, rendertarget_array_index
>+dcl_input_ps linear v2.xy
>+dcl_output o0.xyzw
>+dcl_temps 1
>+utof r0.z, v1.x
>+mov r0.xy, v2.xyxx
>+sample r0.xyzw, r0.xyzx, t0.xyzw, s0
>+mul o0.xyz, r0.wwww, r0.xxxx
>+mov o0.w, r0.w
>+ret 
>+// Approximately 6 instruction slots used
>+#endif
>+
>+const BYTE g_PS_FtoF_PM_LUMAALPHA_2DArray[] = {
>+    68,  88,  66,  67,  93,  91,  193, 199, 207, 164, 35,  12,  201, 95,  163, 171, 218, 214, 187,
>+    51,  1,   0,   0,   0,   248, 2,   0,   0,   5,   0,   0,   0,   52,  0,   0,   0,   228, 0,
>+    0,   0,   108, 1,   0,   0,   160, 1,   0,   0,   124, 2,   0,   0,   82,  68,  69,  70,  168,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   2,   0,   0,   0,   28,  0,   0,   0,
>+    0,   4,   255, 255, 0,   1,   0,   0,   117, 0,   0,   0,   92,  0,   0,   0,   3,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,
>+    0,   0,   1,   0,   0,   0,   100, 0,   0,   0,   2,   0,   0,   0,   5,   0,   0,   0,   5,
>+    0,   0,   0,   255, 255, 255, 255, 0,   0,   0,   0,   1,   0,   0,   0,   13,  0,   0,   0,
>+    83,  97,  109, 112, 108, 101, 114, 0,   84,  101, 120, 116, 117, 114, 101, 70,  95,  50,  68,
>+    65,  114, 114, 97,  121, 0,   77,  105, 99,  114, 111, 115, 111, 102, 116, 32,  40,  82,  41,
>+    32,  72,  76,  83,  76,  32,  83,  104, 97,  100, 101, 114, 32,  67,  111, 109, 112, 105, 108,
>+    101, 114, 32,  57,  46,  50,  57,  46,  57,  53,  50,  46,  51,  49,  49,  49,  0,   171, 171,
>+    73,  83,  71,  78,  128, 0,   0,   0,   3,   0,   0,   0,   8,   0,   0,   0,   80,  0,   0,
>+    0,   0,   0,   0,   0,   1,   0,   0,   0,   3,   0,   0,   0,   0,   0,   0,   0,   15,  0,
>+    0,   0,   92,  0,   0,   0,   0,   0,   0,   0,   4,   0,   0,   0,   1,   0,   0,   0,   1,
>+    0,   0,   0,   1,   1,   0,   0,   118, 0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    3,   0,   0,   0,   2,   0,   0,   0,   7,   3,   0,   0,   83,  86,  95,  80,  79,  83,  73,
>+    84,  73,  79,  78,  0,   83,  86,  95,  82,  69,  78,  68,  69,  82,  84,  65,  82,  71,  69,
>+    84,  65,  82,  82,  65,  89,  73,  78,  68,  69,  88,  0,   84,  69,  88,  67,  79,  79,  82,
>+    68,  0,   171, 79,  83,  71,  78,  44,  0,   0,   0,   1,   0,   0,   0,   8,   0,   0,   0,
>+    32,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   3,   0,   0,   0,   0,   0,   0,
>+    0,   15,  0,   0,   0,   83,  86,  95,  84,  65,  82,  71,  69,  84,  0,   171, 171, 83,  72,
>+    68,  82,  212, 0,   0,   0,   64,  0,   0,   0,   53,  0,   0,   0,   90,  0,   0,   3,   0,
>+    96,  16,  0,   0,   0,   0,   0,   88,  64,  0,   4,   0,   112, 16,  0,   0,   0,   0,   0,
>+    85,  85,  0,   0,   100, 8,   0,   4,   18,  16,  16,  0,   1,   0,   0,   0,   4,   0,   0,
>+    0,   98,  16,  0,   3,   50,  16,  16,  0,   2,   0,   0,   0,   101, 0,   0,   3,   242, 32,
>+    16,  0,   0,   0,   0,   0,   104, 0,   0,   2,   1,   0,   0,   0,   86,  0,   0,   5,   66,
>+    0,   16,  0,   0,   0,   0,   0,   10,  16,  16,  0,   1,   0,   0,   0,   54,  0,   0,   5,
>+    50,  0,   16,  0,   0,   0,   0,   0,   70,  16,  16,  0,   2,   0,   0,   0,   69,  0,   0,
>+    9,   242, 0,   16,  0,   0,   0,   0,   0,   70,  2,   16,  0,   0,   0,   0,   0,   70,  126,
>+    16,  0,   0,   0,   0,   0,   0,   96,  16,  0,   0,   0,   0,   0,   56,  0,   0,   7,   114,
>+    32,  16,  0,   0,   0,   0,   0,   246, 15,  16,  0,   0,   0,   0,   0,   6,   0,   16,  0,
>+    0,   0,   0,   0,   54,  0,   0,   5,   130, 32,  16,  0,   0,   0,   0,   0,   58,  0,   16,
>+    0,   0,   0,   0,   0,   62,  0,   0,   1,   83,  84,  65,  84,  116, 0,   0,   0,   6,   0,
>+    0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   3,   0,   0,   0,   1,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   2,   0,
>+    0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0};
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_pm_lumaalpha_3d_ps.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_pm_lumaalpha_3d_ps.h
>new file mode 100644
>index 00000000000..003c0f28722
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_pm_lumaalpha_3d_ps.h
>@@ -0,0 +1,84 @@
>+#if 0
>+//
>+// Generated by Microsoft (R) HLSL Shader Compiler 9.29.952.3111
>+//
>+//
>+//   fxc /nologo /E PS_FtoF_PM_LUMAALPHA_3D /T ps_4_0 /Fh
>+//    compiled\multiplyalpha_ftof_pm_lumaalpha_3d_ps.h MultiplyAlpha.hlsl
>+//
>+//
>+// Resource Bindings:
>+//
>+// Name                                 Type  Format         Dim Slot Elements
>+// ------------------------------ ---------- ------- ----------- ---- --------
>+// Sampler                           sampler      NA          NA    0        1
>+// TextureF_3D                       texture  float4          3d    0        1
>+//
>+//
>+//
>+// Input signature:
>+//
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_POSITION              0   xyzw        0      POS  float       
>+// SV_RENDERTARGETARRAYINDEX     0   x           1  RTINDEX   uint       
>+// TEXCOORD                 0   xyz         2     NONE  float   xyz 
>+//
>+//
>+// Output signature:
>+//
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_TARGET                0   xyzw        0   TARGET  float   xyzw
>+//
>+ps_4_0
>+dcl_sampler s0, mode_default
>+dcl_resource_texture3d (float,float,float,float) t0
>+dcl_input_ps linear v2.xyz
>+dcl_output o0.xyzw
>+dcl_temps 1
>+sample r0.xyzw, v2.xyzx, t0.xyzw, s0
>+mul o0.xyz, r0.wwww, r0.xxxx
>+mov o0.w, r0.w
>+ret 
>+// Approximately 4 instruction slots used
>+#endif
>+
>+const BYTE g_PS_FtoF_PM_LUMAALPHA_3D[] = {
>+    68,  88, 66,  67,  246, 88,  227, 190, 126, 145, 255, 83,  3,   145, 110, 73,  19,  110, 141,
>+    116, 1,  0,   0,   0,   188, 2,   0,   0,   5,   0,   0,   0,   52,  0,   0,   0,   224, 0,
>+    0,   0,  104, 1,   0,   0,   156, 1,   0,   0,   64,  2,   0,   0,   82,  68,  69,  70,  164,
>+    0,   0,  0,   0,   0,   0,   0,   0,   0,   0,   0,   2,   0,   0,   0,   28,  0,   0,   0,
>+    0,   4,  255, 255, 0,   1,   0,   0,   112, 0,   0,   0,   92,  0,   0,   0,   3,   0,   0,
>+    0,   0,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,
>+    0,   0,  1,   0,   0,   0,   100, 0,   0,   0,   2,   0,   0,   0,   5,   0,   0,   0,   8,
>+    0,   0,  0,   255, 255, 255, 255, 0,   0,   0,   0,   1,   0,   0,   0,   13,  0,   0,   0,
>+    83,  97, 109, 112, 108, 101, 114, 0,   84,  101, 120, 116, 117, 114, 101, 70,  95,  51,  68,
>+    0,   77, 105, 99,  114, 111, 115, 111, 102, 116, 32,  40,  82,  41,  32,  72,  76,  83,  76,
>+    32,  83, 104, 97,  100, 101, 114, 32,  67,  111, 109, 112, 105, 108, 101, 114, 32,  57,  46,
>+    50,  57, 46,  57,  53,  50,  46,  51,  49,  49,  49,  0,   171, 171, 171, 73,  83,  71,  78,
>+    128, 0,  0,   0,   3,   0,   0,   0,   8,   0,   0,   0,   80,  0,   0,   0,   0,   0,   0,
>+    0,   1,  0,   0,   0,   3,   0,   0,   0,   0,   0,   0,   0,   15,  0,   0,   0,   92,  0,
>+    0,   0,  0,   0,   0,   0,   4,   0,   0,   0,   1,   0,   0,   0,   1,   0,   0,   0,   1,
>+    0,   0,  0,   118, 0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   3,   0,   0,   0,
>+    2,   0,  0,   0,   7,   7,   0,   0,   83,  86,  95,  80,  79,  83,  73,  84,  73,  79,  78,
>+    0,   83, 86,  95,  82,  69,  78,  68,  69,  82,  84,  65,  82,  71,  69,  84,  65,  82,  82,
>+    65,  89, 73,  78,  68,  69,  88,  0,   84,  69,  88,  67,  79,  79,  82,  68,  0,   171, 79,
>+    83,  71, 78,  44,  0,   0,   0,   1,   0,   0,   0,   8,   0,   0,   0,   32,  0,   0,   0,
>+    0,   0,  0,   0,   0,   0,   0,   0,   3,   0,   0,   0,   0,   0,   0,   0,   15,  0,   0,
>+    0,   83, 86,  95,  84,  65,  82,  71,  69,  84,  0,   171, 171, 83,  72,  68,  82,  156, 0,
>+    0,   0,  64,  0,   0,   0,   39,  0,   0,   0,   90,  0,   0,   3,   0,   96,  16,  0,   0,
>+    0,   0,  0,   88,  40,  0,   4,   0,   112, 16,  0,   0,   0,   0,   0,   85,  85,  0,   0,
>+    98,  16, 0,   3,   114, 16,  16,  0,   2,   0,   0,   0,   101, 0,   0,   3,   242, 32,  16,
>+    0,   0,  0,   0,   0,   104, 0,   0,   2,   1,   0,   0,   0,   69,  0,   0,   9,   242, 0,
>+    16,  0,  0,   0,   0,   0,   70,  18,  16,  0,   2,   0,   0,   0,   70,  126, 16,  0,   0,
>+    0,   0,  0,   0,   96,  16,  0,   0,   0,   0,   0,   56,  0,   0,   7,   114, 32,  16,  0,
>+    0,   0,  0,   0,   246, 15,  16,  0,   0,   0,   0,   0,   6,   0,   16,  0,   0,   0,   0,
>+    0,   54, 0,   0,   5,   130, 32,  16,  0,   0,   0,   0,   0,   58,  0,   16,  0,   0,   0,
>+    0,   0,  62,  0,   0,   1,   83,  84,  65,  84,  116, 0,   0,   0,   4,   0,   0,   0,   1,
>+    0,   0,  0,   0,   0,   0,   0,   2,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,  0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   0,   0,
>+    0,   0,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   0,
>+    0,   0,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0};
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_pm_lumaalpha_ps.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_pm_lumaalpha_ps.h
>deleted file mode 100644
>index ff2b7076ad4..00000000000
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_pm_lumaalpha_ps.h
>+++ /dev/null
>@@ -1,77 +0,0 @@
>-#if 0
>-//
>-// Generated by Microsoft (R) HLSL Shader Compiler 6.3.9600.16384
>-//
>-//
>-// Resource Bindings:
>-//
>-// Name                                 Type  Format         Dim Slot Elements
>-// ------------------------------ ---------- ------- ----------- ---- --------
>-// Sampler                           sampler      NA          NA    0        1
>-// TextureF                          texture  float4          2d    0        1
>-//
>-//
>-//
>-// Input signature:
>-//
>-// Name                 Index   Mask Register SysValue  Format   Used
>-// -------------------- ----- ------ -------- -------- ------- ------
>-// SV_POSITION              0   xyzw        0      POS   float       
>-// TEXCOORD                 0   xy          1     NONE   float   xy  
>-//
>-//
>-// Output signature:
>-//
>-// Name                 Index   Mask Register SysValue  Format   Used
>-// -------------------- ----- ------ -------- -------- ------- ------
>-// SV_TARGET                0   xyzw        0   TARGET   float   xyzw
>-//
>-ps_4_0
>-dcl_sampler s0, mode_default
>-dcl_resource_texture2d (float,float,float,float) t0
>-dcl_input_ps linear v1.xy
>-dcl_output o0.xyzw
>-dcl_temps 1
>-sample r0.xyzw, v1.xyxx, t0.xyzw, s0
>-mul o0.xyz, r0.wwww, r0.xxxx
>-mov o0.w, r0.w
>-ret 
>-// Approximately 4 instruction slots used
>-#endif
>-
>-const BYTE g_PS_FtoF_PM_LUMAALPHA[] = {
>-    68, 88,  66,  67,  16,  240, 62,  171, 253, 134, 187, 96,  66,  174, 101, 13,  101, 43,  164,
>-    23, 1,   0,   0,   0,   136, 2,   0,   0,   5,   0,   0,   0,   52,  0,   0,   0,   220, 0,
>-    0,  0,   52,  1,   0,   0,   104, 1,   0,   0,   12,  2,   0,   0,   82,  68,  69,  70,  160,
>-    0,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   2,   0,   0,   0,   28,  0,   0,   0,
>-    0,  4,   255, 255, 0,   1,   0,   0,   109, 0,   0,   0,   92,  0,   0,   0,   3,   0,   0,
>-    0,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,
>-    0,  0,   1,   0,   0,   0,   100, 0,   0,   0,   2,   0,   0,   0,   5,   0,   0,   0,   4,
>-    0,  0,   0,   255, 255, 255, 255, 0,   0,   0,   0,   1,   0,   0,   0,   13,  0,   0,   0,
>-    83, 97,  109, 112, 108, 101, 114, 0,   84,  101, 120, 116, 117, 114, 101, 70,  0,   77,  105,
>-    99, 114, 111, 115, 111, 102, 116, 32,  40,  82,  41,  32,  72,  76,  83,  76,  32,  83,  104,
>-    97, 100, 101, 114, 32,  67,  111, 109, 112, 105, 108, 101, 114, 32,  54,  46,  51,  46,  57,
>-    54, 48,  48,  46,  49,  54,  51,  56,  52,  0,   171, 73,  83,  71,  78,  80,  0,   0,   0,
>-    2,  0,   0,   0,   8,   0,   0,   0,   56,  0,   0,   0,   0,   0,   0,   0,   1,   0,   0,
>-    0,  3,   0,   0,   0,   0,   0,   0,   0,   15,  0,   0,   0,   68,  0,   0,   0,   0,   0,
>-    0,  0,   0,   0,   0,   0,   3,   0,   0,   0,   1,   0,   0,   0,   3,   3,   0,   0,   83,
>-    86, 95,  80,  79,  83,  73,  84,  73,  79,  78,  0,   84,  69,  88,  67,  79,  79,  82,  68,
>-    0,  171, 171, 171, 79,  83,  71,  78,  44,  0,   0,   0,   1,   0,   0,   0,   8,   0,   0,
>-    0,  32,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   3,   0,   0,   0,   0,   0,
>-    0,  0,   15,  0,   0,   0,   83,  86,  95,  84,  65,  82,  71,  69,  84,  0,   171, 171, 83,
>-    72, 68,  82,  156, 0,   0,   0,   64,  0,   0,   0,   39,  0,   0,   0,   90,  0,   0,   3,
>-    0,  96,  16,  0,   0,   0,   0,   0,   88,  24,  0,   4,   0,   112, 16,  0,   0,   0,   0,
>-    0,  85,  85,  0,   0,   98,  16,  0,   3,   50,  16,  16,  0,   1,   0,   0,   0,   101, 0,
>-    0,  3,   242, 32,  16,  0,   0,   0,   0,   0,   104, 0,   0,   2,   1,   0,   0,   0,   69,
>-    0,  0,   9,   242, 0,   16,  0,   0,   0,   0,   0,   70,  16,  16,  0,   1,   0,   0,   0,
>-    70, 126, 16,  0,   0,   0,   0,   0,   0,   96,  16,  0,   0,   0,   0,   0,   56,  0,   0,
>-    7,  114, 32,  16,  0,   0,   0,   0,   0,   246, 15,  16,  0,   0,   0,   0,   0,   6,   0,
>-    16, 0,   0,   0,   0,   0,   54,  0,   0,   5,   130, 32,  16,  0,   0,   0,   0,   0,   58,
>-    0,  16,  0,   0,   0,   0,   0,   62,  0,   0,   1,   83,  84,  65,  84,  116, 0,   0,   0,
>-    4,  0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   2,   0,   0,   0,   1,   0,   0,
>-    0,  0,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>-    0,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,
>-    0,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>-    1,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>-    0,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>-    0,  0};
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_pm_rgb_2d_ps.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_pm_rgb_2d_ps.h
>new file mode 100644
>index 00000000000..5e6b38058ab
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_pm_rgb_2d_ps.h
>@@ -0,0 +1,81 @@
>+#if 0
>+//
>+// Generated by Microsoft (R) HLSL Shader Compiler 9.29.952.3111
>+//
>+//
>+//   fxc /nologo /E PS_FtoF_PM_RGB_2D /T ps_4_0 /Fh
>+//    compiled\multiplyalpha_ftof_pm_rgb_2d_ps.h MultiplyAlpha.hlsl
>+//
>+//
>+// Resource Bindings:
>+//
>+// Name                                 Type  Format         Dim Slot Elements
>+// ------------------------------ ---------- ------- ----------- ---- --------
>+// Sampler                           sampler      NA          NA    0        1
>+// TextureF                          texture  float4          2d    0        1
>+//
>+//
>+//
>+// Input signature:
>+//
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_POSITION              0   xyzw        0      POS  float
>+// TEXCOORD                 0   xy          1     NONE  float   xy
>+//
>+//
>+// Output signature:
>+//
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_TARGET                0   xyzw        0   TARGET  float   xyzw
>+//
>+ps_4_0
>+dcl_sampler s0, mode_default
>+dcl_resource_texture2d (float,float,float,float) t0
>+dcl_input_ps linear v1.xy
>+dcl_output o0.xyzw
>+dcl_temps 1
>+sample r0.xyzw, v1.xyxx, t0.xyzw, s0
>+mul o0.xyz, r0.wwww, r0.xyzx
>+mov o0.w, l(1.000000)
>+ret
>+// Approximately 4 instruction slots used
>+#endif
>+
>+const BYTE g_PS_FtoF_PM_RGB_2D[] = {
>+    68,  88,  66,  67,  25,  134, 222, 46,  234, 185, 135, 172, 122, 147, 21,  58,  145, 33,  84,
>+    232, 1,   0,   0,   0,   136, 2,   0,   0,   5,   0,   0,   0,   52,  0,   0,   0,   220, 0,
>+    0,   0,   52,  1,   0,   0,   104, 1,   0,   0,   12,  2,   0,   0,   82,  68,  69,  70,  160,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   2,   0,   0,   0,   28,  0,   0,   0,
>+    0,   4,   255, 255, 0,   1,   0,   0,   109, 0,   0,   0,   92,  0,   0,   0,   3,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,
>+    0,   0,   1,   0,   0,   0,   100, 0,   0,   0,   2,   0,   0,   0,   5,   0,   0,   0,   4,
>+    0,   0,   0,   255, 255, 255, 255, 0,   0,   0,   0,   1,   0,   0,   0,   13,  0,   0,   0,
>+    83,  97,  109, 112, 108, 101, 114, 0,   84,  101, 120, 116, 117, 114, 101, 70,  0,   77,  105,
>+    99,  114, 111, 115, 111, 102, 116, 32,  40,  82,  41,  32,  72,  76,  83,  76,  32,  83,  104,
>+    97,  100, 101, 114, 32,  67,  111, 109, 112, 105, 108, 101, 114, 32,  57,  46,  50,  57,  46,
>+    57,  53,  50,  46,  51,  49,  49,  49,  0,   171, 171, 73,  83,  71,  78,  80,  0,   0,   0,
>+    2,   0,   0,   0,   8,   0,   0,   0,   56,  0,   0,   0,   0,   0,   0,   0,   1,   0,   0,
>+    0,   3,   0,   0,   0,   0,   0,   0,   0,   15,  0,   0,   0,   68,  0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   3,   0,   0,   0,   1,   0,   0,   0,   3,   3,   0,   0,   83,
>+    86,  95,  80,  79,  83,  73,  84,  73,  79,  78,  0,   84,  69,  88,  67,  79,  79,  82,  68,
>+    0,   171, 171, 171, 79,  83,  71,  78,  44,  0,   0,   0,   1,   0,   0,   0,   8,   0,   0,
>+    0,   32,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   3,   0,   0,   0,   0,   0,
>+    0,   0,   15,  0,   0,   0,   83,  86,  95,  84,  65,  82,  71,  69,  84,  0,   171, 171, 83,
>+    72,  68,  82,  156, 0,   0,   0,   64,  0,   0,   0,   39,  0,   0,   0,   90,  0,   0,   3,
>+    0,   96,  16,  0,   0,   0,   0,   0,   88,  24,  0,   4,   0,   112, 16,  0,   0,   0,   0,
>+    0,   85,  85,  0,   0,   98,  16,  0,   3,   50,  16,  16,  0,   1,   0,   0,   0,   101, 0,
>+    0,   3,   242, 32,  16,  0,   0,   0,   0,   0,   104, 0,   0,   2,   1,   0,   0,   0,   69,
>+    0,   0,   9,   242, 0,   16,  0,   0,   0,   0,   0,   70,  16,  16,  0,   1,   0,   0,   0,
>+    70,  126, 16,  0,   0,   0,   0,   0,   0,   96,  16,  0,   0,   0,   0,   0,   56,  0,   0,
>+    7,   114, 32,  16,  0,   0,   0,   0,   0,   246, 15,  16,  0,   0,   0,   0,   0,   70,  2,
>+    16,  0,   0,   0,   0,   0,   54,  0,   0,   5,   130, 32,  16,  0,   0,   0,   0,   0,   1,
>+    64,  0,   0,   0,   0,   128, 63,  62,  0,   0,   1,   83,  84,  65,  84,  116, 0,   0,   0,
>+    4,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   2,   0,   0,   0,   1,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0};
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_pm_rgb_2darray_ps.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_pm_rgb_2darray_ps.h
>new file mode 100644
>index 00000000000..8ec063df4c1
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_pm_rgb_2darray_ps.h
>@@ -0,0 +1,90 @@
>+#if 0
>+//
>+// Generated by Microsoft (R) HLSL Shader Compiler 9.29.952.3111
>+//
>+//
>+//   fxc /nologo /E PS_FtoF_PM_RGB_2DArray /T ps_4_0 /Fh
>+//    compiled\multiplyalpha_ftof_pm_rgb_2darray_ps.h MultiplyAlpha.hlsl
>+//
>+//
>+// Resource Bindings:
>+//
>+// Name                                 Type  Format         Dim Slot Elements
>+// ------------------------------ ---------- ------- ----------- ---- --------
>+// Sampler                           sampler      NA          NA    0        1
>+// TextureF_2DArray                  texture  float4     2darray    0        1
>+//
>+//
>+//
>+// Input signature:
>+//
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_POSITION              0   xyzw        0      POS  float       
>+// SV_RENDERTARGETARRAYINDEX     0   x           1  RTINDEX   uint   x   
>+// TEXCOORD                 0   xyz         2     NONE  float   xy  
>+//
>+//
>+// Output signature:
>+//
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_TARGET                0   xyzw        0   TARGET  float   xyzw
>+//
>+ps_4_0
>+dcl_sampler s0, mode_default
>+dcl_resource_texture2darray (float,float,float,float) t0
>+dcl_input_ps_siv constant v1.x, rendertarget_array_index
>+dcl_input_ps linear v2.xy
>+dcl_output o0.xyzw
>+dcl_temps 1
>+utof r0.z, v1.x
>+mov r0.xy, v2.xyxx
>+sample r0.xyzw, r0.xyzx, t0.xyzw, s0
>+mul o0.xyz, r0.wwww, r0.xyzx
>+mov o0.w, l(1.000000)
>+ret 
>+// Approximately 6 instruction slots used
>+#endif
>+
>+const BYTE g_PS_FtoF_PM_RGB_2DArray[] = {
>+    68,  88,  66,  67,  5,   209, 117, 255, 204, 165, 3,   202, 62,  237, 111, 22,  134, 7,   56,
>+    167, 1,   0,   0,   0,   248, 2,   0,   0,   5,   0,   0,   0,   52,  0,   0,   0,   228, 0,
>+    0,   0,   108, 1,   0,   0,   160, 1,   0,   0,   124, 2,   0,   0,   82,  68,  69,  70,  168,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   2,   0,   0,   0,   28,  0,   0,   0,
>+    0,   4,   255, 255, 0,   1,   0,   0,   117, 0,   0,   0,   92,  0,   0,   0,   3,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,
>+    0,   0,   1,   0,   0,   0,   100, 0,   0,   0,   2,   0,   0,   0,   5,   0,   0,   0,   5,
>+    0,   0,   0,   255, 255, 255, 255, 0,   0,   0,   0,   1,   0,   0,   0,   13,  0,   0,   0,
>+    83,  97,  109, 112, 108, 101, 114, 0,   84,  101, 120, 116, 117, 114, 101, 70,  95,  50,  68,
>+    65,  114, 114, 97,  121, 0,   77,  105, 99,  114, 111, 115, 111, 102, 116, 32,  40,  82,  41,
>+    32,  72,  76,  83,  76,  32,  83,  104, 97,  100, 101, 114, 32,  67,  111, 109, 112, 105, 108,
>+    101, 114, 32,  57,  46,  50,  57,  46,  57,  53,  50,  46,  51,  49,  49,  49,  0,   171, 171,
>+    73,  83,  71,  78,  128, 0,   0,   0,   3,   0,   0,   0,   8,   0,   0,   0,   80,  0,   0,
>+    0,   0,   0,   0,   0,   1,   0,   0,   0,   3,   0,   0,   0,   0,   0,   0,   0,   15,  0,
>+    0,   0,   92,  0,   0,   0,   0,   0,   0,   0,   4,   0,   0,   0,   1,   0,   0,   0,   1,
>+    0,   0,   0,   1,   1,   0,   0,   118, 0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    3,   0,   0,   0,   2,   0,   0,   0,   7,   3,   0,   0,   83,  86,  95,  80,  79,  83,  73,
>+    84,  73,  79,  78,  0,   83,  86,  95,  82,  69,  78,  68,  69,  82,  84,  65,  82,  71,  69,
>+    84,  65,  82,  82,  65,  89,  73,  78,  68,  69,  88,  0,   84,  69,  88,  67,  79,  79,  82,
>+    68,  0,   171, 79,  83,  71,  78,  44,  0,   0,   0,   1,   0,   0,   0,   8,   0,   0,   0,
>+    32,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   3,   0,   0,   0,   0,   0,   0,
>+    0,   15,  0,   0,   0,   83,  86,  95,  84,  65,  82,  71,  69,  84,  0,   171, 171, 83,  72,
>+    68,  82,  212, 0,   0,   0,   64,  0,   0,   0,   53,  0,   0,   0,   90,  0,   0,   3,   0,
>+    96,  16,  0,   0,   0,   0,   0,   88,  64,  0,   4,   0,   112, 16,  0,   0,   0,   0,   0,
>+    85,  85,  0,   0,   100, 8,   0,   4,   18,  16,  16,  0,   1,   0,   0,   0,   4,   0,   0,
>+    0,   98,  16,  0,   3,   50,  16,  16,  0,   2,   0,   0,   0,   101, 0,   0,   3,   242, 32,
>+    16,  0,   0,   0,   0,   0,   104, 0,   0,   2,   1,   0,   0,   0,   86,  0,   0,   5,   66,
>+    0,   16,  0,   0,   0,   0,   0,   10,  16,  16,  0,   1,   0,   0,   0,   54,  0,   0,   5,
>+    50,  0,   16,  0,   0,   0,   0,   0,   70,  16,  16,  0,   2,   0,   0,   0,   69,  0,   0,
>+    9,   242, 0,   16,  0,   0,   0,   0,   0,   70,  2,   16,  0,   0,   0,   0,   0,   70,  126,
>+    16,  0,   0,   0,   0,   0,   0,   96,  16,  0,   0,   0,   0,   0,   56,  0,   0,   7,   114,
>+    32,  16,  0,   0,   0,   0,   0,   246, 15,  16,  0,   0,   0,   0,   0,   70,  2,   16,  0,
>+    0,   0,   0,   0,   54,  0,   0,   5,   130, 32,  16,  0,   0,   0,   0,   0,   1,   64,  0,
>+    0,   0,   0,   128, 63,  62,  0,   0,   1,   83,  84,  65,  84,  116, 0,   0,   0,   6,   0,
>+    0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   3,   0,   0,   0,   1,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   2,   0,
>+    0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0};
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_pm_rgb_3d_ps.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_pm_rgb_3d_ps.h
>new file mode 100644
>index 00000000000..ba2a9484c56
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_pm_rgb_3d_ps.h
>@@ -0,0 +1,84 @@
>+#if 0
>+//
>+// Generated by Microsoft (R) HLSL Shader Compiler 9.29.952.3111
>+//
>+//
>+//   fxc /nologo /E PS_FtoF_PM_RGB_3D /T ps_4_0 /Fh
>+//    compiled\multiplyalpha_ftof_pm_rgb_3d_ps.h MultiplyAlpha.hlsl
>+//
>+//
>+// Resource Bindings:
>+//
>+// Name                                 Type  Format         Dim Slot Elements
>+// ------------------------------ ---------- ------- ----------- ---- --------
>+// Sampler                           sampler      NA          NA    0        1
>+// TextureF_3D                       texture  float4          3d    0        1
>+//
>+//
>+//
>+// Input signature:
>+//
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_POSITION              0   xyzw        0      POS  float       
>+// SV_RENDERTARGETARRAYINDEX     0   x           1  RTINDEX   uint       
>+// TEXCOORD                 0   xyz         2     NONE  float   xyz 
>+//
>+//
>+// Output signature:
>+//
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_TARGET                0   xyzw        0   TARGET  float   xyzw
>+//
>+ps_4_0
>+dcl_sampler s0, mode_default
>+dcl_resource_texture3d (float,float,float,float) t0
>+dcl_input_ps linear v2.xyz
>+dcl_output o0.xyzw
>+dcl_temps 1
>+sample r0.xyzw, v2.xyzx, t0.xyzw, s0
>+mul o0.xyz, r0.wwww, r0.xyzx
>+mov o0.w, l(1.000000)
>+ret 
>+// Approximately 4 instruction slots used
>+#endif
>+
>+const BYTE g_PS_FtoF_PM_RGB_3D[] = {
>+    68,  88, 66,  67,  105, 156, 158, 73,  245, 65,  169, 138, 164, 71,  86,  95,  185, 136, 127,
>+    70,  1,  0,   0,   0,   188, 2,   0,   0,   5,   0,   0,   0,   52,  0,   0,   0,   224, 0,
>+    0,   0,  104, 1,   0,   0,   156, 1,   0,   0,   64,  2,   0,   0,   82,  68,  69,  70,  164,
>+    0,   0,  0,   0,   0,   0,   0,   0,   0,   0,   0,   2,   0,   0,   0,   28,  0,   0,   0,
>+    0,   4,  255, 255, 0,   1,   0,   0,   112, 0,   0,   0,   92,  0,   0,   0,   3,   0,   0,
>+    0,   0,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,
>+    0,   0,  1,   0,   0,   0,   100, 0,   0,   0,   2,   0,   0,   0,   5,   0,   0,   0,   8,
>+    0,   0,  0,   255, 255, 255, 255, 0,   0,   0,   0,   1,   0,   0,   0,   13,  0,   0,   0,
>+    83,  97, 109, 112, 108, 101, 114, 0,   84,  101, 120, 116, 117, 114, 101, 70,  95,  51,  68,
>+    0,   77, 105, 99,  114, 111, 115, 111, 102, 116, 32,  40,  82,  41,  32,  72,  76,  83,  76,
>+    32,  83, 104, 97,  100, 101, 114, 32,  67,  111, 109, 112, 105, 108, 101, 114, 32,  57,  46,
>+    50,  57, 46,  57,  53,  50,  46,  51,  49,  49,  49,  0,   171, 171, 171, 73,  83,  71,  78,
>+    128, 0,  0,   0,   3,   0,   0,   0,   8,   0,   0,   0,   80,  0,   0,   0,   0,   0,   0,
>+    0,   1,  0,   0,   0,   3,   0,   0,   0,   0,   0,   0,   0,   15,  0,   0,   0,   92,  0,
>+    0,   0,  0,   0,   0,   0,   4,   0,   0,   0,   1,   0,   0,   0,   1,   0,   0,   0,   1,
>+    0,   0,  0,   118, 0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   3,   0,   0,   0,
>+    2,   0,  0,   0,   7,   7,   0,   0,   83,  86,  95,  80,  79,  83,  73,  84,  73,  79,  78,
>+    0,   83, 86,  95,  82,  69,  78,  68,  69,  82,  84,  65,  82,  71,  69,  84,  65,  82,  82,
>+    65,  89, 73,  78,  68,  69,  88,  0,   84,  69,  88,  67,  79,  79,  82,  68,  0,   171, 79,
>+    83,  71, 78,  44,  0,   0,   0,   1,   0,   0,   0,   8,   0,   0,   0,   32,  0,   0,   0,
>+    0,   0,  0,   0,   0,   0,   0,   0,   3,   0,   0,   0,   0,   0,   0,   0,   15,  0,   0,
>+    0,   83, 86,  95,  84,  65,  82,  71,  69,  84,  0,   171, 171, 83,  72,  68,  82,  156, 0,
>+    0,   0,  64,  0,   0,   0,   39,  0,   0,   0,   90,  0,   0,   3,   0,   96,  16,  0,   0,
>+    0,   0,  0,   88,  40,  0,   4,   0,   112, 16,  0,   0,   0,   0,   0,   85,  85,  0,   0,
>+    98,  16, 0,   3,   114, 16,  16,  0,   2,   0,   0,   0,   101, 0,   0,   3,   242, 32,  16,
>+    0,   0,  0,   0,   0,   104, 0,   0,   2,   1,   0,   0,   0,   69,  0,   0,   9,   242, 0,
>+    16,  0,  0,   0,   0,   0,   70,  18,  16,  0,   2,   0,   0,   0,   70,  126, 16,  0,   0,
>+    0,   0,  0,   0,   96,  16,  0,   0,   0,   0,   0,   56,  0,   0,   7,   114, 32,  16,  0,
>+    0,   0,  0,   0,   246, 15,  16,  0,   0,   0,   0,   0,   70,  2,   16,  0,   0,   0,   0,
>+    0,   54, 0,   0,   5,   130, 32,  16,  0,   0,   0,   0,   0,   1,   64,  0,   0,   0,   0,
>+    128, 63, 62,  0,   0,   1,   83,  84,  65,  84,  116, 0,   0,   0,   4,   0,   0,   0,   1,
>+    0,   0,  0,   0,   0,   0,   0,   2,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,  0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   0,   0,
>+    0,   0,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   0,
>+    0,   0,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0};
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_pm_rgb_565_2d_ps.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_pm_rgb_565_2d_ps.h
>new file mode 100644
>index 00000000000..d5d6e6055b6
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_pm_rgb_565_2d_ps.h
>@@ -0,0 +1,89 @@
>+#if 0
>+//
>+// Generated by Microsoft (R) HLSL Shader Compiler 9.29.952.3111
>+//
>+//
>+//   fxc /nologo /E PS_FtoF_PM_RGB_565_2D /T ps_4_0 /Fh
>+//    compiled\multiplyalpha_ftof_pm_rgb_565_2d_ps.h MultiplyAlpha.hlsl
>+//
>+//
>+// Resource Bindings:
>+//
>+// Name                                 Type  Format         Dim Slot Elements
>+// ------------------------------ ---------- ------- ----------- ---- --------
>+// Sampler                           sampler      NA          NA    0        1
>+// TextureF                          texture  float4          2d    0        1
>+//
>+//
>+//
>+// Input signature:
>+//
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_POSITION              0   xyzw        0      POS  float
>+// TEXCOORD                 0   xy          1     NONE  float   xy
>+//
>+//
>+// Output signature:
>+//
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_TARGET                0   xyzw        0   TARGET  float   xyzw
>+//
>+ps_4_0
>+dcl_sampler s0, mode_default
>+dcl_resource_texture2d (float,float,float,float) t0
>+dcl_input_ps linear v1.xy
>+dcl_output o0.xyzw
>+dcl_temps 1
>+sample r0.xyzw, v1.xyxx, t0.xyzw, s0
>+mul r0.xyz, r0.wwww, r0.xyzx
>+mul r0.xyz, r0.xyzx, l(31.000000, 63.000000, 31.000000, 0.000000)
>+round_ne r0.xyz, r0.xyzx
>+mul o0.xyz, r0.xyzx, l(0.032258, 0.015873, 0.032258, 0.000000)
>+mov o0.w, l(1.000000)
>+ret
>+// Approximately 7 instruction slots used
>+#endif
>+
>+const BYTE g_PS_FtoF_PM_RGB_565_2D[] = {
>+    68, 88,  66,  67,  153, 181, 200, 3,   63,  247, 199, 176, 24,  55,  137, 153, 94,  174, 61,
>+    31, 1,   0,   0,   0,   236, 2,   0,   0,   5,   0,   0,   0,   52,  0,   0,   0,   220, 0,
>+    0,  0,   52,  1,   0,   0,   104, 1,   0,   0,   112, 2,   0,   0,   82,  68,  69,  70,  160,
>+    0,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   2,   0,   0,   0,   28,  0,   0,   0,
>+    0,  4,   255, 255, 0,   1,   0,   0,   109, 0,   0,   0,   92,  0,   0,   0,   3,   0,   0,
>+    0,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,
>+    0,  0,   1,   0,   0,   0,   100, 0,   0,   0,   2,   0,   0,   0,   5,   0,   0,   0,   4,
>+    0,  0,   0,   255, 255, 255, 255, 0,   0,   0,   0,   1,   0,   0,   0,   13,  0,   0,   0,
>+    83, 97,  109, 112, 108, 101, 114, 0,   84,  101, 120, 116, 117, 114, 101, 70,  0,   77,  105,
>+    99, 114, 111, 115, 111, 102, 116, 32,  40,  82,  41,  32,  72,  76,  83,  76,  32,  83,  104,
>+    97, 100, 101, 114, 32,  67,  111, 109, 112, 105, 108, 101, 114, 32,  57,  46,  50,  57,  46,
>+    57, 53,  50,  46,  51,  49,  49,  49,  0,   171, 171, 73,  83,  71,  78,  80,  0,   0,   0,
>+    2,  0,   0,   0,   8,   0,   0,   0,   56,  0,   0,   0,   0,   0,   0,   0,   1,   0,   0,
>+    0,  3,   0,   0,   0,   0,   0,   0,   0,   15,  0,   0,   0,   68,  0,   0,   0,   0,   0,
>+    0,  0,   0,   0,   0,   0,   3,   0,   0,   0,   1,   0,   0,   0,   3,   3,   0,   0,   83,
>+    86, 95,  80,  79,  83,  73,  84,  73,  79,  78,  0,   84,  69,  88,  67,  79,  79,  82,  68,
>+    0,  171, 171, 171, 79,  83,  71,  78,  44,  0,   0,   0,   1,   0,   0,   0,   8,   0,   0,
>+    0,  32,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   3,   0,   0,   0,   0,   0,
>+    0,  0,   15,  0,   0,   0,   83,  86,  95,  84,  65,  82,  71,  69,  84,  0,   171, 171, 83,
>+    72, 68,  82,  0,   1,   0,   0,   64,  0,   0,   0,   64,  0,   0,   0,   90,  0,   0,   3,
>+    0,  96,  16,  0,   0,   0,   0,   0,   88,  24,  0,   4,   0,   112, 16,  0,   0,   0,   0,
>+    0,  85,  85,  0,   0,   98,  16,  0,   3,   50,  16,  16,  0,   1,   0,   0,   0,   101, 0,
>+    0,  3,   242, 32,  16,  0,   0,   0,   0,   0,   104, 0,   0,   2,   1,   0,   0,   0,   69,
>+    0,  0,   9,   242, 0,   16,  0,   0,   0,   0,   0,   70,  16,  16,  0,   1,   0,   0,   0,
>+    70, 126, 16,  0,   0,   0,   0,   0,   0,   96,  16,  0,   0,   0,   0,   0,   56,  0,   0,
>+    7,  114, 0,   16,  0,   0,   0,   0,   0,   246, 15,  16,  0,   0,   0,   0,   0,   70,  2,
>+    16, 0,   0,   0,   0,   0,   56,  0,   0,   10,  114, 0,   16,  0,   0,   0,   0,   0,   70,
>+    2,  16,  0,   0,   0,   0,   0,   2,   64,  0,   0,   0,   0,   248, 65,  0,   0,   124, 66,
>+    0,  0,   248, 65,  0,   0,   0,   0,   64,  0,   0,   5,   114, 0,   16,  0,   0,   0,   0,
>+    0,  70,  2,   16,  0,   0,   0,   0,   0,   56,  0,   0,   10,  114, 32,  16,  0,   0,   0,
>+    0,  0,   70,  2,   16,  0,   0,   0,   0,   0,   2,   64,  0,   0,   8,   33,  4,   61,  33,
>+    8,  130, 60,  8,   33,  4,   61,  0,   0,   0,   0,   54,  0,   0,   5,   130, 32,  16,  0,
>+    0,  0,   0,   0,   1,   64,  0,   0,   0,   0,   128, 63,  62,  0,   0,   1,   83,  84,  65,
>+    84, 116, 0,   0,   0,   7,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   2,   0,
>+    0,  0,   4,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   0,
>+    0,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,  0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,  0,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   0,   0,
>+    0,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,  0,   0,   0,   0,   0,   0};
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_pm_rgb_565_2darray_ps.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_pm_rgb_565_2darray_ps.h
>new file mode 100644
>index 00000000000..fbc1bf5220a
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_pm_rgb_565_2darray_ps.h
>@@ -0,0 +1,99 @@
>+#if 0
>+//
>+// Generated by Microsoft (R) HLSL Shader Compiler 9.29.952.3111
>+//
>+//
>+//   fxc /nologo /E PS_FtoF_PM_RGB_565_2DArray /T ps_4_0 /Fh
>+//    compiled\multiplyalpha_ftof_pm_rgb_565_2darray_ps.h MultiplyAlpha.hlsl
>+//
>+//
>+// Resource Bindings:
>+//
>+// Name                                 Type  Format         Dim Slot Elements
>+// ------------------------------ ---------- ------- ----------- ---- --------
>+// Sampler                           sampler      NA          NA    0        1
>+// TextureF_2DArray                  texture  float4     2darray    0        1
>+//
>+//
>+//
>+// Input signature:
>+//
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_POSITION              0   xyzw        0      POS  float       
>+// SV_RENDERTARGETARRAYINDEX     0   x           1  RTINDEX   uint   x   
>+// TEXCOORD                 0   xyz         2     NONE  float   xy  
>+//
>+//
>+// Output signature:
>+//
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_TARGET                0   xyzw        0   TARGET  float   xyzw
>+//
>+ps_4_0
>+dcl_sampler s0, mode_default
>+dcl_resource_texture2darray (float,float,float,float) t0
>+dcl_input_ps_siv constant v1.x, rendertarget_array_index
>+dcl_input_ps linear v2.xy
>+dcl_output o0.xyzw
>+dcl_temps 1
>+utof r0.z, v1.x
>+mov r0.xy, v2.xyxx
>+sample r0.xyzw, r0.xyzx, t0.xyzw, s0
>+mul r0.xyz, r0.wwww, r0.xyzx
>+mul r0.xyz, r0.xyzx, l(31.000000, 63.000000, 31.000000, 0.000000)
>+round_ne r0.xyz, r0.xyzx
>+mul o0.xyz, r0.xyzx, l(0.032258, 0.015873, 0.032258, 0.000000)
>+mov o0.w, l(1.000000)
>+ret 
>+// Approximately 9 instruction slots used
>+#endif
>+
>+const BYTE g_PS_FtoF_PM_RGB_565_2DArray[] = {
>+    68,  88,  66,  67,  82,  230, 180, 156, 53,  248, 202, 43,  118, 192, 10,  70,  121, 224, 218,
>+    52,  1,   0,   0,   0,   92,  3,   0,   0,   5,   0,   0,   0,   52,  0,   0,   0,   228, 0,
>+    0,   0,   108, 1,   0,   0,   160, 1,   0,   0,   224, 2,   0,   0,   82,  68,  69,  70,  168,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   2,   0,   0,   0,   28,  0,   0,   0,
>+    0,   4,   255, 255, 0,   1,   0,   0,   117, 0,   0,   0,   92,  0,   0,   0,   3,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,
>+    0,   0,   1,   0,   0,   0,   100, 0,   0,   0,   2,   0,   0,   0,   5,   0,   0,   0,   5,
>+    0,   0,   0,   255, 255, 255, 255, 0,   0,   0,   0,   1,   0,   0,   0,   13,  0,   0,   0,
>+    83,  97,  109, 112, 108, 101, 114, 0,   84,  101, 120, 116, 117, 114, 101, 70,  95,  50,  68,
>+    65,  114, 114, 97,  121, 0,   77,  105, 99,  114, 111, 115, 111, 102, 116, 32,  40,  82,  41,
>+    32,  72,  76,  83,  76,  32,  83,  104, 97,  100, 101, 114, 32,  67,  111, 109, 112, 105, 108,
>+    101, 114, 32,  57,  46,  50,  57,  46,  57,  53,  50,  46,  51,  49,  49,  49,  0,   171, 171,
>+    73,  83,  71,  78,  128, 0,   0,   0,   3,   0,   0,   0,   8,   0,   0,   0,   80,  0,   0,
>+    0,   0,   0,   0,   0,   1,   0,   0,   0,   3,   0,   0,   0,   0,   0,   0,   0,   15,  0,
>+    0,   0,   92,  0,   0,   0,   0,   0,   0,   0,   4,   0,   0,   0,   1,   0,   0,   0,   1,
>+    0,   0,   0,   1,   1,   0,   0,   118, 0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    3,   0,   0,   0,   2,   0,   0,   0,   7,   3,   0,   0,   83,  86,  95,  80,  79,  83,  73,
>+    84,  73,  79,  78,  0,   83,  86,  95,  82,  69,  78,  68,  69,  82,  84,  65,  82,  71,  69,
>+    84,  65,  82,  82,  65,  89,  73,  78,  68,  69,  88,  0,   84,  69,  88,  67,  79,  79,  82,
>+    68,  0,   171, 79,  83,  71,  78,  44,  0,   0,   0,   1,   0,   0,   0,   8,   0,   0,   0,
>+    32,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   3,   0,   0,   0,   0,   0,   0,
>+    0,   15,  0,   0,   0,   83,  86,  95,  84,  65,  82,  71,  69,  84,  0,   171, 171, 83,  72,
>+    68,  82,  56,  1,   0,   0,   64,  0,   0,   0,   78,  0,   0,   0,   90,  0,   0,   3,   0,
>+    96,  16,  0,   0,   0,   0,   0,   88,  64,  0,   4,   0,   112, 16,  0,   0,   0,   0,   0,
>+    85,  85,  0,   0,   100, 8,   0,   4,   18,  16,  16,  0,   1,   0,   0,   0,   4,   0,   0,
>+    0,   98,  16,  0,   3,   50,  16,  16,  0,   2,   0,   0,   0,   101, 0,   0,   3,   242, 32,
>+    16,  0,   0,   0,   0,   0,   104, 0,   0,   2,   1,   0,   0,   0,   86,  0,   0,   5,   66,
>+    0,   16,  0,   0,   0,   0,   0,   10,  16,  16,  0,   1,   0,   0,   0,   54,  0,   0,   5,
>+    50,  0,   16,  0,   0,   0,   0,   0,   70,  16,  16,  0,   2,   0,   0,   0,   69,  0,   0,
>+    9,   242, 0,   16,  0,   0,   0,   0,   0,   70,  2,   16,  0,   0,   0,   0,   0,   70,  126,
>+    16,  0,   0,   0,   0,   0,   0,   96,  16,  0,   0,   0,   0,   0,   56,  0,   0,   7,   114,
>+    0,   16,  0,   0,   0,   0,   0,   246, 15,  16,  0,   0,   0,   0,   0,   70,  2,   16,  0,
>+    0,   0,   0,   0,   56,  0,   0,   10,  114, 0,   16,  0,   0,   0,   0,   0,   70,  2,   16,
>+    0,   0,   0,   0,   0,   2,   64,  0,   0,   0,   0,   248, 65,  0,   0,   124, 66,  0,   0,
>+    248, 65,  0,   0,   0,   0,   64,  0,   0,   5,   114, 0,   16,  0,   0,   0,   0,   0,   70,
>+    2,   16,  0,   0,   0,   0,   0,   56,  0,   0,   10,  114, 32,  16,  0,   0,   0,   0,   0,
>+    70,  2,   16,  0,   0,   0,   0,   0,   2,   64,  0,   0,   8,   33,  4,   61,  33,  8,   130,
>+    60,  8,   33,  4,   61,  0,   0,   0,   0,   54,  0,   0,   5,   130, 32,  16,  0,   0,   0,
>+    0,   0,   1,   64,  0,   0,   0,   0,   128, 63,  62,  0,   0,   1,   83,  84,  65,  84,  116,
>+    0,   0,   0,   9,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   3,   0,   0,   0,
>+    4,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   2,   0,   0,   0,   0,   0,   0,   0,   2,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0};
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_pm_rgb_565_3d_ps.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_pm_rgb_565_3d_ps.h
>new file mode 100644
>index 00000000000..1c349a2021d
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_pm_rgb_565_3d_ps.h
>@@ -0,0 +1,93 @@
>+#if 0
>+//
>+// Generated by Microsoft (R) HLSL Shader Compiler 9.29.952.3111
>+//
>+//
>+//   fxc /nologo /E PS_FtoF_PM_RGB_565_3D /T ps_4_0 /Fh
>+//    compiled\multiplyalpha_ftof_pm_rgb_565_3d_ps.h MultiplyAlpha.hlsl
>+//
>+//
>+// Resource Bindings:
>+//
>+// Name                                 Type  Format         Dim Slot Elements
>+// ------------------------------ ---------- ------- ----------- ---- --------
>+// Sampler                           sampler      NA          NA    0        1
>+// TextureF_3D                       texture  float4          3d    0        1
>+//
>+//
>+//
>+// Input signature:
>+//
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_POSITION              0   xyzw        0      POS  float       
>+// SV_RENDERTARGETARRAYINDEX     0   x           1  RTINDEX   uint       
>+// TEXCOORD                 0   xyz         2     NONE  float   xyz 
>+//
>+//
>+// Output signature:
>+//
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_TARGET                0   xyzw        0   TARGET  float   xyzw
>+//
>+ps_4_0
>+dcl_sampler s0, mode_default
>+dcl_resource_texture3d (float,float,float,float) t0
>+dcl_input_ps linear v2.xyz
>+dcl_output o0.xyzw
>+dcl_temps 1
>+sample r0.xyzw, v2.xyzx, t0.xyzw, s0
>+mul r0.xyz, r0.wwww, r0.xyzx
>+mul r0.xyz, r0.xyzx, l(31.000000, 63.000000, 31.000000, 0.000000)
>+round_ne r0.xyz, r0.xyzx
>+mul o0.xyz, r0.xyzx, l(0.032258, 0.015873, 0.032258, 0.000000)
>+mov o0.w, l(1.000000)
>+ret 
>+// Approximately 7 instruction slots used
>+#endif
>+
>+const BYTE g_PS_FtoF_PM_RGB_565_3D[] = {
>+    68,  88, 66,  67,  151, 48,  123, 120, 147, 84,  12,  118, 27,  132, 114, 7,   119, 110, 184,
>+    103, 1,  0,   0,   0,   32,  3,   0,   0,   5,   0,   0,   0,   52,  0,   0,   0,   224, 0,
>+    0,   0,  104, 1,   0,   0,   156, 1,   0,   0,   164, 2,   0,   0,   82,  68,  69,  70,  164,
>+    0,   0,  0,   0,   0,   0,   0,   0,   0,   0,   0,   2,   0,   0,   0,   28,  0,   0,   0,
>+    0,   4,  255, 255, 0,   1,   0,   0,   112, 0,   0,   0,   92,  0,   0,   0,   3,   0,   0,
>+    0,   0,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,
>+    0,   0,  1,   0,   0,   0,   100, 0,   0,   0,   2,   0,   0,   0,   5,   0,   0,   0,   8,
>+    0,   0,  0,   255, 255, 255, 255, 0,   0,   0,   0,   1,   0,   0,   0,   13,  0,   0,   0,
>+    83,  97, 109, 112, 108, 101, 114, 0,   84,  101, 120, 116, 117, 114, 101, 70,  95,  51,  68,
>+    0,   77, 105, 99,  114, 111, 115, 111, 102, 116, 32,  40,  82,  41,  32,  72,  76,  83,  76,
>+    32,  83, 104, 97,  100, 101, 114, 32,  67,  111, 109, 112, 105, 108, 101, 114, 32,  57,  46,
>+    50,  57, 46,  57,  53,  50,  46,  51,  49,  49,  49,  0,   171, 171, 171, 73,  83,  71,  78,
>+    128, 0,  0,   0,   3,   0,   0,   0,   8,   0,   0,   0,   80,  0,   0,   0,   0,   0,   0,
>+    0,   1,  0,   0,   0,   3,   0,   0,   0,   0,   0,   0,   0,   15,  0,   0,   0,   92,  0,
>+    0,   0,  0,   0,   0,   0,   4,   0,   0,   0,   1,   0,   0,   0,   1,   0,   0,   0,   1,
>+    0,   0,  0,   118, 0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   3,   0,   0,   0,
>+    2,   0,  0,   0,   7,   7,   0,   0,   83,  86,  95,  80,  79,  83,  73,  84,  73,  79,  78,
>+    0,   83, 86,  95,  82,  69,  78,  68,  69,  82,  84,  65,  82,  71,  69,  84,  65,  82,  82,
>+    65,  89, 73,  78,  68,  69,  88,  0,   84,  69,  88,  67,  79,  79,  82,  68,  0,   171, 79,
>+    83,  71, 78,  44,  0,   0,   0,   1,   0,   0,   0,   8,   0,   0,   0,   32,  0,   0,   0,
>+    0,   0,  0,   0,   0,   0,   0,   0,   3,   0,   0,   0,   0,   0,   0,   0,   15,  0,   0,
>+    0,   83, 86,  95,  84,  65,  82,  71,  69,  84,  0,   171, 171, 83,  72,  68,  82,  0,   1,
>+    0,   0,  64,  0,   0,   0,   64,  0,   0,   0,   90,  0,   0,   3,   0,   96,  16,  0,   0,
>+    0,   0,  0,   88,  40,  0,   4,   0,   112, 16,  0,   0,   0,   0,   0,   85,  85,  0,   0,
>+    98,  16, 0,   3,   114, 16,  16,  0,   2,   0,   0,   0,   101, 0,   0,   3,   242, 32,  16,
>+    0,   0,  0,   0,   0,   104, 0,   0,   2,   1,   0,   0,   0,   69,  0,   0,   9,   242, 0,
>+    16,  0,  0,   0,   0,   0,   70,  18,  16,  0,   2,   0,   0,   0,   70,  126, 16,  0,   0,
>+    0,   0,  0,   0,   96,  16,  0,   0,   0,   0,   0,   56,  0,   0,   7,   114, 0,   16,  0,
>+    0,   0,  0,   0,   246, 15,  16,  0,   0,   0,   0,   0,   70,  2,   16,  0,   0,   0,   0,
>+    0,   56, 0,   0,   10,  114, 0,   16,  0,   0,   0,   0,   0,   70,  2,   16,  0,   0,   0,
>+    0,   0,  2,   64,  0,   0,   0,   0,   248, 65,  0,   0,   124, 66,  0,   0,   248, 65,  0,
>+    0,   0,  0,   64,  0,   0,   5,   114, 0,   16,  0,   0,   0,   0,   0,   70,  2,   16,  0,
>+    0,   0,  0,   0,   56,  0,   0,   10,  114, 32,  16,  0,   0,   0,   0,   0,   70,  2,   16,
>+    0,   0,  0,   0,   0,   2,   64,  0,   0,   8,   33,  4,   61,  33,  8,   130, 60,  8,   33,
>+    4,   61, 0,   0,   0,   0,   54,  0,   0,   5,   130, 32,  16,  0,   0,   0,   0,   0,   1,
>+    64,  0,  0,   0,   0,   128, 63,  62,  0,   0,   1,   83,  84,  65,  84,  116, 0,   0,   0,
>+    7,   0,  0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   2,   0,   0,   0,   4,   0,   0,
>+    0,   0,  0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,
>+    0,   0,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    1,   0,  0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0};
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_pm_rgb_ps.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_pm_rgb_ps.h
>deleted file mode 100644
>index 19cc207b247..00000000000
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_pm_rgb_ps.h
>+++ /dev/null
>@@ -1,77 +0,0 @@
>-#if 0
>-//
>-// Generated by Microsoft (R) HLSL Shader Compiler 6.3.9600.16384
>-//
>-//
>-// Resource Bindings:
>-//
>-// Name                                 Type  Format         Dim Slot Elements
>-// ------------------------------ ---------- ------- ----------- ---- --------
>-// Sampler                           sampler      NA          NA    0        1
>-// TextureF                          texture  float4          2d    0        1
>-//
>-//
>-//
>-// Input signature:
>-//
>-// Name                 Index   Mask Register SysValue  Format   Used
>-// -------------------- ----- ------ -------- -------- ------- ------
>-// SV_POSITION              0   xyzw        0      POS   float       
>-// TEXCOORD                 0   xy          1     NONE   float   xy  
>-//
>-//
>-// Output signature:
>-//
>-// Name                 Index   Mask Register SysValue  Format   Used
>-// -------------------- ----- ------ -------- -------- ------- ------
>-// SV_TARGET                0   xyzw        0   TARGET   float   xyzw
>-//
>-ps_4_0
>-dcl_sampler s0, mode_default
>-dcl_resource_texture2d (float,float,float,float) t0
>-dcl_input_ps linear v1.xy
>-dcl_output o0.xyzw
>-dcl_temps 1
>-sample r0.xyzw, v1.xyxx, t0.xyzw, s0
>-mul o0.xyz, r0.wwww, r0.xyzx
>-mov o0.w, l(1.000000)
>-ret 
>-// Approximately 4 instruction slots used
>-#endif
>-
>-const BYTE g_PS_FtoF_PM_RGB[] = {
>-    68, 88,  66,  67,  184, 252, 76,  134, 209, 229, 230, 149, 167, 232, 172, 33,  50,  152, 142,
>-    84, 1,   0,   0,   0,   136, 2,   0,   0,   5,   0,   0,   0,   52,  0,   0,   0,   220, 0,
>-    0,  0,   52,  1,   0,   0,   104, 1,   0,   0,   12,  2,   0,   0,   82,  68,  69,  70,  160,
>-    0,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   2,   0,   0,   0,   28,  0,   0,   0,
>-    0,  4,   255, 255, 0,   1,   0,   0,   109, 0,   0,   0,   92,  0,   0,   0,   3,   0,   0,
>-    0,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,
>-    0,  0,   1,   0,   0,   0,   100, 0,   0,   0,   2,   0,   0,   0,   5,   0,   0,   0,   4,
>-    0,  0,   0,   255, 255, 255, 255, 0,   0,   0,   0,   1,   0,   0,   0,   13,  0,   0,   0,
>-    83, 97,  109, 112, 108, 101, 114, 0,   84,  101, 120, 116, 117, 114, 101, 70,  0,   77,  105,
>-    99, 114, 111, 115, 111, 102, 116, 32,  40,  82,  41,  32,  72,  76,  83,  76,  32,  83,  104,
>-    97, 100, 101, 114, 32,  67,  111, 109, 112, 105, 108, 101, 114, 32,  54,  46,  51,  46,  57,
>-    54, 48,  48,  46,  49,  54,  51,  56,  52,  0,   171, 73,  83,  71,  78,  80,  0,   0,   0,
>-    2,  0,   0,   0,   8,   0,   0,   0,   56,  0,   0,   0,   0,   0,   0,   0,   1,   0,   0,
>-    0,  3,   0,   0,   0,   0,   0,   0,   0,   15,  0,   0,   0,   68,  0,   0,   0,   0,   0,
>-    0,  0,   0,   0,   0,   0,   3,   0,   0,   0,   1,   0,   0,   0,   3,   3,   0,   0,   83,
>-    86, 95,  80,  79,  83,  73,  84,  73,  79,  78,  0,   84,  69,  88,  67,  79,  79,  82,  68,
>-    0,  171, 171, 171, 79,  83,  71,  78,  44,  0,   0,   0,   1,   0,   0,   0,   8,   0,   0,
>-    0,  32,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   3,   0,   0,   0,   0,   0,
>-    0,  0,   15,  0,   0,   0,   83,  86,  95,  84,  65,  82,  71,  69,  84,  0,   171, 171, 83,
>-    72, 68,  82,  156, 0,   0,   0,   64,  0,   0,   0,   39,  0,   0,   0,   90,  0,   0,   3,
>-    0,  96,  16,  0,   0,   0,   0,   0,   88,  24,  0,   4,   0,   112, 16,  0,   0,   0,   0,
>-    0,  85,  85,  0,   0,   98,  16,  0,   3,   50,  16,  16,  0,   1,   0,   0,   0,   101, 0,
>-    0,  3,   242, 32,  16,  0,   0,   0,   0,   0,   104, 0,   0,   2,   1,   0,   0,   0,   69,
>-    0,  0,   9,   242, 0,   16,  0,   0,   0,   0,   0,   70,  16,  16,  0,   1,   0,   0,   0,
>-    70, 126, 16,  0,   0,   0,   0,   0,   0,   96,  16,  0,   0,   0,   0,   0,   56,  0,   0,
>-    7,  114, 32,  16,  0,   0,   0,   0,   0,   246, 15,  16,  0,   0,   0,   0,   0,   70,  2,
>-    16, 0,   0,   0,   0,   0,   54,  0,   0,   5,   130, 32,  16,  0,   0,   0,   0,   0,   1,
>-    64, 0,   0,   0,   0,   128, 63,  62,  0,   0,   1,   83,  84,  65,  84,  116, 0,   0,   0,
>-    4,  0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   2,   0,   0,   0,   1,   0,   0,
>-    0,  0,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>-    0,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,
>-    0,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>-    1,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>-    0,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>-    0,  0};
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_pm_rgba_2d_ps.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_pm_rgba_2d_ps.h
>new file mode 100644
>index 00000000000..72b11056d12
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_pm_rgba_2d_ps.h
>@@ -0,0 +1,81 @@
>+#if 0
>+//
>+// Generated by Microsoft (R) HLSL Shader Compiler 9.29.952.3111
>+//
>+//
>+//   fxc /nologo /E PS_FtoF_PM_RGBA_2D /T ps_4_0 /Fh
>+//    compiled\multiplyalpha_ftof_pm_rgba_2d_ps.h MultiplyAlpha.hlsl
>+//
>+//
>+// Resource Bindings:
>+//
>+// Name                                 Type  Format         Dim Slot Elements
>+// ------------------------------ ---------- ------- ----------- ---- --------
>+// Sampler                           sampler      NA          NA    0        1
>+// TextureF                          texture  float4          2d    0        1
>+//
>+//
>+//
>+// Input signature:
>+//
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_POSITION              0   xyzw        0      POS  float
>+// TEXCOORD                 0   xy          1     NONE  float   xy
>+//
>+//
>+// Output signature:
>+//
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_TARGET                0   xyzw        0   TARGET  float   xyzw
>+//
>+ps_4_0
>+dcl_sampler s0, mode_default
>+dcl_resource_texture2d (float,float,float,float) t0
>+dcl_input_ps linear v1.xy
>+dcl_output o0.xyzw
>+dcl_temps 1
>+sample r0.xyzw, v1.xyxx, t0.xyzw, s0
>+mul o0.xyz, r0.wwww, r0.xyzx
>+mov o0.w, r0.w
>+ret
>+// Approximately 4 instruction slots used
>+#endif
>+
>+const BYTE g_PS_FtoF_PM_RGBA_2D[] = {
>+    68, 88,  66,  67,  98,  163, 157, 38,  253, 172, 208, 179, 84,  166, 215, 117, 236, 59,  71,
>+    89, 1,   0,   0,   0,   136, 2,   0,   0,   5,   0,   0,   0,   52,  0,   0,   0,   220, 0,
>+    0,  0,   52,  1,   0,   0,   104, 1,   0,   0,   12,  2,   0,   0,   82,  68,  69,  70,  160,
>+    0,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   2,   0,   0,   0,   28,  0,   0,   0,
>+    0,  4,   255, 255, 0,   1,   0,   0,   109, 0,   0,   0,   92,  0,   0,   0,   3,   0,   0,
>+    0,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,
>+    0,  0,   1,   0,   0,   0,   100, 0,   0,   0,   2,   0,   0,   0,   5,   0,   0,   0,   4,
>+    0,  0,   0,   255, 255, 255, 255, 0,   0,   0,   0,   1,   0,   0,   0,   13,  0,   0,   0,
>+    83, 97,  109, 112, 108, 101, 114, 0,   84,  101, 120, 116, 117, 114, 101, 70,  0,   77,  105,
>+    99, 114, 111, 115, 111, 102, 116, 32,  40,  82,  41,  32,  72,  76,  83,  76,  32,  83,  104,
>+    97, 100, 101, 114, 32,  67,  111, 109, 112, 105, 108, 101, 114, 32,  57,  46,  50,  57,  46,
>+    57, 53,  50,  46,  51,  49,  49,  49,  0,   171, 171, 73,  83,  71,  78,  80,  0,   0,   0,
>+    2,  0,   0,   0,   8,   0,   0,   0,   56,  0,   0,   0,   0,   0,   0,   0,   1,   0,   0,
>+    0,  3,   0,   0,   0,   0,   0,   0,   0,   15,  0,   0,   0,   68,  0,   0,   0,   0,   0,
>+    0,  0,   0,   0,   0,   0,   3,   0,   0,   0,   1,   0,   0,   0,   3,   3,   0,   0,   83,
>+    86, 95,  80,  79,  83,  73,  84,  73,  79,  78,  0,   84,  69,  88,  67,  79,  79,  82,  68,
>+    0,  171, 171, 171, 79,  83,  71,  78,  44,  0,   0,   0,   1,   0,   0,   0,   8,   0,   0,
>+    0,  32,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   3,   0,   0,   0,   0,   0,
>+    0,  0,   15,  0,   0,   0,   83,  86,  95,  84,  65,  82,  71,  69,  84,  0,   171, 171, 83,
>+    72, 68,  82,  156, 0,   0,   0,   64,  0,   0,   0,   39,  0,   0,   0,   90,  0,   0,   3,
>+    0,  96,  16,  0,   0,   0,   0,   0,   88,  24,  0,   4,   0,   112, 16,  0,   0,   0,   0,
>+    0,  85,  85,  0,   0,   98,  16,  0,   3,   50,  16,  16,  0,   1,   0,   0,   0,   101, 0,
>+    0,  3,   242, 32,  16,  0,   0,   0,   0,   0,   104, 0,   0,   2,   1,   0,   0,   0,   69,
>+    0,  0,   9,   242, 0,   16,  0,   0,   0,   0,   0,   70,  16,  16,  0,   1,   0,   0,   0,
>+    70, 126, 16,  0,   0,   0,   0,   0,   0,   96,  16,  0,   0,   0,   0,   0,   56,  0,   0,
>+    7,  114, 32,  16,  0,   0,   0,   0,   0,   246, 15,  16,  0,   0,   0,   0,   0,   70,  2,
>+    16, 0,   0,   0,   0,   0,   54,  0,   0,   5,   130, 32,  16,  0,   0,   0,   0,   0,   58,
>+    0,  16,  0,   0,   0,   0,   0,   62,  0,   0,   1,   83,  84,  65,  84,  116, 0,   0,   0,
>+    4,  0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   2,   0,   0,   0,   1,   0,   0,
>+    0,  0,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,
>+    0,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    1,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,  0};
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_pm_rgba_2darray_ps.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_pm_rgba_2darray_ps.h
>new file mode 100644
>index 00000000000..02e93e1fd21
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_pm_rgba_2darray_ps.h
>@@ -0,0 +1,90 @@
>+#if 0
>+//
>+// Generated by Microsoft (R) HLSL Shader Compiler 9.29.952.3111
>+//
>+//
>+//   fxc /nologo /E PS_FtoF_PM_RGBA_2DArray /T ps_4_0 /Fh
>+//    compiled\multiplyalpha_ftof_pm_rgba_2darray_ps.h MultiplyAlpha.hlsl
>+//
>+//
>+// Resource Bindings:
>+//
>+// Name                                 Type  Format         Dim Slot Elements
>+// ------------------------------ ---------- ------- ----------- ---- --------
>+// Sampler                           sampler      NA          NA    0        1
>+// TextureF_2DArray                  texture  float4     2darray    0        1
>+//
>+//
>+//
>+// Input signature:
>+//
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_POSITION              0   xyzw        0      POS  float       
>+// SV_RENDERTARGETARRAYINDEX     0   x           1  RTINDEX   uint   x   
>+// TEXCOORD                 0   xyz         2     NONE  float   xy  
>+//
>+//
>+// Output signature:
>+//
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_TARGET                0   xyzw        0   TARGET  float   xyzw
>+//
>+ps_4_0
>+dcl_sampler s0, mode_default
>+dcl_resource_texture2darray (float,float,float,float) t0
>+dcl_input_ps_siv constant v1.x, rendertarget_array_index
>+dcl_input_ps linear v2.xy
>+dcl_output o0.xyzw
>+dcl_temps 1
>+utof r0.z, v1.x
>+mov r0.xy, v2.xyxx
>+sample r0.xyzw, r0.xyzx, t0.xyzw, s0
>+mul o0.xyz, r0.wwww, r0.xyzx
>+mov o0.w, r0.w
>+ret 
>+// Approximately 6 instruction slots used
>+#endif
>+
>+const BYTE g_PS_FtoF_PM_RGBA_2DArray[] = {
>+    68,  88,  66,  67,  71,  137, 115, 116, 116, 227, 120, 13,  78,  6,   238, 184, 42,  233, 145,
>+    176, 1,   0,   0,   0,   248, 2,   0,   0,   5,   0,   0,   0,   52,  0,   0,   0,   228, 0,
>+    0,   0,   108, 1,   0,   0,   160, 1,   0,   0,   124, 2,   0,   0,   82,  68,  69,  70,  168,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   2,   0,   0,   0,   28,  0,   0,   0,
>+    0,   4,   255, 255, 0,   1,   0,   0,   117, 0,   0,   0,   92,  0,   0,   0,   3,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,
>+    0,   0,   1,   0,   0,   0,   100, 0,   0,   0,   2,   0,   0,   0,   5,   0,   0,   0,   5,
>+    0,   0,   0,   255, 255, 255, 255, 0,   0,   0,   0,   1,   0,   0,   0,   13,  0,   0,   0,
>+    83,  97,  109, 112, 108, 101, 114, 0,   84,  101, 120, 116, 117, 114, 101, 70,  95,  50,  68,
>+    65,  114, 114, 97,  121, 0,   77,  105, 99,  114, 111, 115, 111, 102, 116, 32,  40,  82,  41,
>+    32,  72,  76,  83,  76,  32,  83,  104, 97,  100, 101, 114, 32,  67,  111, 109, 112, 105, 108,
>+    101, 114, 32,  57,  46,  50,  57,  46,  57,  53,  50,  46,  51,  49,  49,  49,  0,   171, 171,
>+    73,  83,  71,  78,  128, 0,   0,   0,   3,   0,   0,   0,   8,   0,   0,   0,   80,  0,   0,
>+    0,   0,   0,   0,   0,   1,   0,   0,   0,   3,   0,   0,   0,   0,   0,   0,   0,   15,  0,
>+    0,   0,   92,  0,   0,   0,   0,   0,   0,   0,   4,   0,   0,   0,   1,   0,   0,   0,   1,
>+    0,   0,   0,   1,   1,   0,   0,   118, 0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    3,   0,   0,   0,   2,   0,   0,   0,   7,   3,   0,   0,   83,  86,  95,  80,  79,  83,  73,
>+    84,  73,  79,  78,  0,   83,  86,  95,  82,  69,  78,  68,  69,  82,  84,  65,  82,  71,  69,
>+    84,  65,  82,  82,  65,  89,  73,  78,  68,  69,  88,  0,   84,  69,  88,  67,  79,  79,  82,
>+    68,  0,   171, 79,  83,  71,  78,  44,  0,   0,   0,   1,   0,   0,   0,   8,   0,   0,   0,
>+    32,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   3,   0,   0,   0,   0,   0,   0,
>+    0,   15,  0,   0,   0,   83,  86,  95,  84,  65,  82,  71,  69,  84,  0,   171, 171, 83,  72,
>+    68,  82,  212, 0,   0,   0,   64,  0,   0,   0,   53,  0,   0,   0,   90,  0,   0,   3,   0,
>+    96,  16,  0,   0,   0,   0,   0,   88,  64,  0,   4,   0,   112, 16,  0,   0,   0,   0,   0,
>+    85,  85,  0,   0,   100, 8,   0,   4,   18,  16,  16,  0,   1,   0,   0,   0,   4,   0,   0,
>+    0,   98,  16,  0,   3,   50,  16,  16,  0,   2,   0,   0,   0,   101, 0,   0,   3,   242, 32,
>+    16,  0,   0,   0,   0,   0,   104, 0,   0,   2,   1,   0,   0,   0,   86,  0,   0,   5,   66,
>+    0,   16,  0,   0,   0,   0,   0,   10,  16,  16,  0,   1,   0,   0,   0,   54,  0,   0,   5,
>+    50,  0,   16,  0,   0,   0,   0,   0,   70,  16,  16,  0,   2,   0,   0,   0,   69,  0,   0,
>+    9,   242, 0,   16,  0,   0,   0,   0,   0,   70,  2,   16,  0,   0,   0,   0,   0,   70,  126,
>+    16,  0,   0,   0,   0,   0,   0,   96,  16,  0,   0,   0,   0,   0,   56,  0,   0,   7,   114,
>+    32,  16,  0,   0,   0,   0,   0,   246, 15,  16,  0,   0,   0,   0,   0,   70,  2,   16,  0,
>+    0,   0,   0,   0,   54,  0,   0,   5,   130, 32,  16,  0,   0,   0,   0,   0,   58,  0,   16,
>+    0,   0,   0,   0,   0,   62,  0,   0,   1,   83,  84,  65,  84,  116, 0,   0,   0,   6,   0,
>+    0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   3,   0,   0,   0,   1,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   2,   0,
>+    0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0};
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_pm_rgba_3d_ps.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_pm_rgba_3d_ps.h
>new file mode 100644
>index 00000000000..588e7a87f3e
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_pm_rgba_3d_ps.h
>@@ -0,0 +1,84 @@
>+#if 0
>+//
>+// Generated by Microsoft (R) HLSL Shader Compiler 9.29.952.3111
>+//
>+//
>+//   fxc /nologo /E PS_FtoF_PM_RGBA_3D /T ps_4_0 /Fh
>+//    compiled\multiplyalpha_ftof_pm_rgba_3d_ps.h MultiplyAlpha.hlsl
>+//
>+//
>+// Resource Bindings:
>+//
>+// Name                                 Type  Format         Dim Slot Elements
>+// ------------------------------ ---------- ------- ----------- ---- --------
>+// Sampler                           sampler      NA          NA    0        1
>+// TextureF_3D                       texture  float4          3d    0        1
>+//
>+//
>+//
>+// Input signature:
>+//
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_POSITION              0   xyzw        0      POS  float       
>+// SV_RENDERTARGETARRAYINDEX     0   x           1  RTINDEX   uint       
>+// TEXCOORD                 0   xyz         2     NONE  float   xyz 
>+//
>+//
>+// Output signature:
>+//
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_TARGET                0   xyzw        0   TARGET  float   xyzw
>+//
>+ps_4_0
>+dcl_sampler s0, mode_default
>+dcl_resource_texture3d (float,float,float,float) t0
>+dcl_input_ps linear v2.xyz
>+dcl_output o0.xyzw
>+dcl_temps 1
>+sample r0.xyzw, v2.xyzx, t0.xyzw, s0
>+mul o0.xyz, r0.wwww, r0.xyzx
>+mov o0.w, r0.w
>+ret 
>+// Approximately 4 instruction slots used
>+#endif
>+
>+const BYTE g_PS_FtoF_PM_RGBA_3D[] = {
>+    68,  88, 66,  67,  18,  96,  97,  129, 150, 42,  120, 55,  5,   245, 19,  153, 24,  53,  74,
>+    155, 1,  0,   0,   0,   188, 2,   0,   0,   5,   0,   0,   0,   52,  0,   0,   0,   224, 0,
>+    0,   0,  104, 1,   0,   0,   156, 1,   0,   0,   64,  2,   0,   0,   82,  68,  69,  70,  164,
>+    0,   0,  0,   0,   0,   0,   0,   0,   0,   0,   0,   2,   0,   0,   0,   28,  0,   0,   0,
>+    0,   4,  255, 255, 0,   1,   0,   0,   112, 0,   0,   0,   92,  0,   0,   0,   3,   0,   0,
>+    0,   0,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,
>+    0,   0,  1,   0,   0,   0,   100, 0,   0,   0,   2,   0,   0,   0,   5,   0,   0,   0,   8,
>+    0,   0,  0,   255, 255, 255, 255, 0,   0,   0,   0,   1,   0,   0,   0,   13,  0,   0,   0,
>+    83,  97, 109, 112, 108, 101, 114, 0,   84,  101, 120, 116, 117, 114, 101, 70,  95,  51,  68,
>+    0,   77, 105, 99,  114, 111, 115, 111, 102, 116, 32,  40,  82,  41,  32,  72,  76,  83,  76,
>+    32,  83, 104, 97,  100, 101, 114, 32,  67,  111, 109, 112, 105, 108, 101, 114, 32,  57,  46,
>+    50,  57, 46,  57,  53,  50,  46,  51,  49,  49,  49,  0,   171, 171, 171, 73,  83,  71,  78,
>+    128, 0,  0,   0,   3,   0,   0,   0,   8,   0,   0,   0,   80,  0,   0,   0,   0,   0,   0,
>+    0,   1,  0,   0,   0,   3,   0,   0,   0,   0,   0,   0,   0,   15,  0,   0,   0,   92,  0,
>+    0,   0,  0,   0,   0,   0,   4,   0,   0,   0,   1,   0,   0,   0,   1,   0,   0,   0,   1,
>+    0,   0,  0,   118, 0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   3,   0,   0,   0,
>+    2,   0,  0,   0,   7,   7,   0,   0,   83,  86,  95,  80,  79,  83,  73,  84,  73,  79,  78,
>+    0,   83, 86,  95,  82,  69,  78,  68,  69,  82,  84,  65,  82,  71,  69,  84,  65,  82,  82,
>+    65,  89, 73,  78,  68,  69,  88,  0,   84,  69,  88,  67,  79,  79,  82,  68,  0,   171, 79,
>+    83,  71, 78,  44,  0,   0,   0,   1,   0,   0,   0,   8,   0,   0,   0,   32,  0,   0,   0,
>+    0,   0,  0,   0,   0,   0,   0,   0,   3,   0,   0,   0,   0,   0,   0,   0,   15,  0,   0,
>+    0,   83, 86,  95,  84,  65,  82,  71,  69,  84,  0,   171, 171, 83,  72,  68,  82,  156, 0,
>+    0,   0,  64,  0,   0,   0,   39,  0,   0,   0,   90,  0,   0,   3,   0,   96,  16,  0,   0,
>+    0,   0,  0,   88,  40,  0,   4,   0,   112, 16,  0,   0,   0,   0,   0,   85,  85,  0,   0,
>+    98,  16, 0,   3,   114, 16,  16,  0,   2,   0,   0,   0,   101, 0,   0,   3,   242, 32,  16,
>+    0,   0,  0,   0,   0,   104, 0,   0,   2,   1,   0,   0,   0,   69,  0,   0,   9,   242, 0,
>+    16,  0,  0,   0,   0,   0,   70,  18,  16,  0,   2,   0,   0,   0,   70,  126, 16,  0,   0,
>+    0,   0,  0,   0,   96,  16,  0,   0,   0,   0,   0,   56,  0,   0,   7,   114, 32,  16,  0,
>+    0,   0,  0,   0,   246, 15,  16,  0,   0,   0,   0,   0,   70,  2,   16,  0,   0,   0,   0,
>+    0,   54, 0,   0,   5,   130, 32,  16,  0,   0,   0,   0,   0,   58,  0,   16,  0,   0,   0,
>+    0,   0,  62,  0,   0,   1,   83,  84,  65,  84,  116, 0,   0,   0,   4,   0,   0,   0,   1,
>+    0,   0,  0,   0,   0,   0,   0,   2,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,  0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   0,   0,
>+    0,   0,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   0,
>+    0,   0,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0};
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_pm_rgba_4444_2d_ps.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_pm_rgba_4444_2d_ps.h
>new file mode 100644
>index 00000000000..de1bf9bd786
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_pm_rgba_4444_2d_ps.h
>@@ -0,0 +1,87 @@
>+#if 0
>+//
>+// Generated by Microsoft (R) HLSL Shader Compiler 9.29.952.3111
>+//
>+//
>+//   fxc /nologo /E PS_FtoF_PM_RGBA_4444_2D /T ps_4_0 /Fh
>+//    compiled\multiplyalpha_ftof_pm_rgba_4444_2d_ps.h MultiplyAlpha.hlsl
>+//
>+//
>+// Resource Bindings:
>+//
>+// Name                                 Type  Format         Dim Slot Elements
>+// ------------------------------ ---------- ------- ----------- ---- --------
>+// Sampler                           sampler      NA          NA    0        1
>+// TextureF                          texture  float4          2d    0        1
>+//
>+//
>+//
>+// Input signature:
>+//
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_POSITION              0   xyzw        0      POS  float
>+// TEXCOORD                 0   xy          1     NONE  float   xy
>+//
>+//
>+// Output signature:
>+//
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_TARGET                0   xyzw        0   TARGET  float   xyzw
>+//
>+ps_4_0
>+dcl_sampler s0, mode_default
>+dcl_resource_texture2d (float,float,float,float) t0
>+dcl_input_ps linear v1.xy
>+dcl_output o0.xyzw
>+dcl_temps 1
>+sample r0.xyzw, v1.xyxx, t0.xyzw, s0
>+mul r0.xyz, r0.wwww, r0.xyzx
>+mul r0.xyzw, r0.xyzw, l(15.000000, 15.000000, 15.000000, 15.000000)
>+round_ne r0.xyzw, r0.xyzw
>+mul o0.xyzw, r0.xyzw, l(0.066667, 0.066667, 0.066667, 0.066667)
>+ret
>+// Approximately 6 instruction slots used
>+#endif
>+
>+const BYTE g_PS_FtoF_PM_RGBA_4444_2D[] = {
>+    68,  88,  66,  67,  162, 159, 42,  148, 192, 35,  248, 166, 96,  219, 84,  153, 55,  243, 174,
>+    115, 1,   0,   0,   0,   216, 2,   0,   0,   5,   0,   0,   0,   52,  0,   0,   0,   220, 0,
>+    0,   0,   52,  1,   0,   0,   104, 1,   0,   0,   92,  2,   0,   0,   82,  68,  69,  70,  160,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   2,   0,   0,   0,   28,  0,   0,   0,
>+    0,   4,   255, 255, 0,   1,   0,   0,   109, 0,   0,   0,   92,  0,   0,   0,   3,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,
>+    0,   0,   1,   0,   0,   0,   100, 0,   0,   0,   2,   0,   0,   0,   5,   0,   0,   0,   4,
>+    0,   0,   0,   255, 255, 255, 255, 0,   0,   0,   0,   1,   0,   0,   0,   13,  0,   0,   0,
>+    83,  97,  109, 112, 108, 101, 114, 0,   84,  101, 120, 116, 117, 114, 101, 70,  0,   77,  105,
>+    99,  114, 111, 115, 111, 102, 116, 32,  40,  82,  41,  32,  72,  76,  83,  76,  32,  83,  104,
>+    97,  100, 101, 114, 32,  67,  111, 109, 112, 105, 108, 101, 114, 32,  57,  46,  50,  57,  46,
>+    57,  53,  50,  46,  51,  49,  49,  49,  0,   171, 171, 73,  83,  71,  78,  80,  0,   0,   0,
>+    2,   0,   0,   0,   8,   0,   0,   0,   56,  0,   0,   0,   0,   0,   0,   0,   1,   0,   0,
>+    0,   3,   0,   0,   0,   0,   0,   0,   0,   15,  0,   0,   0,   68,  0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   3,   0,   0,   0,   1,   0,   0,   0,   3,   3,   0,   0,   83,
>+    86,  95,  80,  79,  83,  73,  84,  73,  79,  78,  0,   84,  69,  88,  67,  79,  79,  82,  68,
>+    0,   171, 171, 171, 79,  83,  71,  78,  44,  0,   0,   0,   1,   0,   0,   0,   8,   0,   0,
>+    0,   32,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   3,   0,   0,   0,   0,   0,
>+    0,   0,   15,  0,   0,   0,   83,  86,  95,  84,  65,  82,  71,  69,  84,  0,   171, 171, 83,
>+    72,  68,  82,  236, 0,   0,   0,   64,  0,   0,   0,   59,  0,   0,   0,   90,  0,   0,   3,
>+    0,   96,  16,  0,   0,   0,   0,   0,   88,  24,  0,   4,   0,   112, 16,  0,   0,   0,   0,
>+    0,   85,  85,  0,   0,   98,  16,  0,   3,   50,  16,  16,  0,   1,   0,   0,   0,   101, 0,
>+    0,   3,   242, 32,  16,  0,   0,   0,   0,   0,   104, 0,   0,   2,   1,   0,   0,   0,   69,
>+    0,   0,   9,   242, 0,   16,  0,   0,   0,   0,   0,   70,  16,  16,  0,   1,   0,   0,   0,
>+    70,  126, 16,  0,   0,   0,   0,   0,   0,   96,  16,  0,   0,   0,   0,   0,   56,  0,   0,
>+    7,   114, 0,   16,  0,   0,   0,   0,   0,   246, 15,  16,  0,   0,   0,   0,   0,   70,  2,
>+    16,  0,   0,   0,   0,   0,   56,  0,   0,   10,  242, 0,   16,  0,   0,   0,   0,   0,   70,
>+    14,  16,  0,   0,   0,   0,   0,   2,   64,  0,   0,   0,   0,   112, 65,  0,   0,   112, 65,
>+    0,   0,   112, 65,  0,   0,   112, 65,  64,  0,   0,   5,   242, 0,   16,  0,   0,   0,   0,
>+    0,   70,  14,  16,  0,   0,   0,   0,   0,   56,  0,   0,   10,  242, 32,  16,  0,   0,   0,
>+    0,   0,   70,  14,  16,  0,   0,   0,   0,   0,   2,   64,  0,   0,   137, 136, 136, 61,  137,
>+    136, 136, 61,  137, 136, 136, 61,  137, 136, 136, 61,  62,  0,   0,   1,   83,  84,  65,  84,
>+    116, 0,   0,   0,   6,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   2,   0,   0,
>+    0,   4,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0};
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_pm_rgba_4444_2darray_ps.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_pm_rgba_4444_2darray_ps.h
>new file mode 100644
>index 00000000000..0beb462746f
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_pm_rgba_4444_2darray_ps.h
>@@ -0,0 +1,97 @@
>+#if 0
>+//
>+// Generated by Microsoft (R) HLSL Shader Compiler 9.29.952.3111
>+//
>+//
>+//   fxc /nologo /E PS_FtoF_PM_RGBA_4444_2DArray /T ps_4_0 /Fh
>+//    compiled\multiplyalpha_ftof_pm_rgba_4444_2darray_ps.h MultiplyAlpha.hlsl
>+//
>+//
>+// Resource Bindings:
>+//
>+// Name                                 Type  Format         Dim Slot Elements
>+// ------------------------------ ---------- ------- ----------- ---- --------
>+// Sampler                           sampler      NA          NA    0        1
>+// TextureF_2DArray                  texture  float4     2darray    0        1
>+//
>+//
>+//
>+// Input signature:
>+//
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_POSITION              0   xyzw        0      POS  float       
>+// SV_RENDERTARGETARRAYINDEX     0   x           1  RTINDEX   uint   x   
>+// TEXCOORD                 0   xyz         2     NONE  float   xy  
>+//
>+//
>+// Output signature:
>+//
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_TARGET                0   xyzw        0   TARGET  float   xyzw
>+//
>+ps_4_0
>+dcl_sampler s0, mode_default
>+dcl_resource_texture2darray (float,float,float,float) t0
>+dcl_input_ps_siv constant v1.x, rendertarget_array_index
>+dcl_input_ps linear v2.xy
>+dcl_output o0.xyzw
>+dcl_temps 1
>+utof r0.z, v1.x
>+mov r0.xy, v2.xyxx
>+sample r0.xyzw, r0.xyzx, t0.xyzw, s0
>+mul r0.xyz, r0.wwww, r0.xyzx
>+mul r0.xyzw, r0.xyzw, l(15.000000, 15.000000, 15.000000, 15.000000)
>+round_ne r0.xyzw, r0.xyzw
>+mul o0.xyzw, r0.xyzw, l(0.066667, 0.066667, 0.066667, 0.066667)
>+ret 
>+// Approximately 8 instruction slots used
>+#endif
>+
>+const BYTE g_PS_FtoF_PM_RGBA_4444_2DArray[] = {
>+    68,  88,  66,  67,  0,   105, 196, 49,  19,  185, 247, 82,  176, 7,   54,  252, 239, 225, 169,
>+    225, 1,   0,   0,   0,   72,  3,   0,   0,   5,   0,   0,   0,   52,  0,   0,   0,   228, 0,
>+    0,   0,   108, 1,   0,   0,   160, 1,   0,   0,   204, 2,   0,   0,   82,  68,  69,  70,  168,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   2,   0,   0,   0,   28,  0,   0,   0,
>+    0,   4,   255, 255, 0,   1,   0,   0,   117, 0,   0,   0,   92,  0,   0,   0,   3,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,
>+    0,   0,   1,   0,   0,   0,   100, 0,   0,   0,   2,   0,   0,   0,   5,   0,   0,   0,   5,
>+    0,   0,   0,   255, 255, 255, 255, 0,   0,   0,   0,   1,   0,   0,   0,   13,  0,   0,   0,
>+    83,  97,  109, 112, 108, 101, 114, 0,   84,  101, 120, 116, 117, 114, 101, 70,  95,  50,  68,
>+    65,  114, 114, 97,  121, 0,   77,  105, 99,  114, 111, 115, 111, 102, 116, 32,  40,  82,  41,
>+    32,  72,  76,  83,  76,  32,  83,  104, 97,  100, 101, 114, 32,  67,  111, 109, 112, 105, 108,
>+    101, 114, 32,  57,  46,  50,  57,  46,  57,  53,  50,  46,  51,  49,  49,  49,  0,   171, 171,
>+    73,  83,  71,  78,  128, 0,   0,   0,   3,   0,   0,   0,   8,   0,   0,   0,   80,  0,   0,
>+    0,   0,   0,   0,   0,   1,   0,   0,   0,   3,   0,   0,   0,   0,   0,   0,   0,   15,  0,
>+    0,   0,   92,  0,   0,   0,   0,   0,   0,   0,   4,   0,   0,   0,   1,   0,   0,   0,   1,
>+    0,   0,   0,   1,   1,   0,   0,   118, 0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    3,   0,   0,   0,   2,   0,   0,   0,   7,   3,   0,   0,   83,  86,  95,  80,  79,  83,  73,
>+    84,  73,  79,  78,  0,   83,  86,  95,  82,  69,  78,  68,  69,  82,  84,  65,  82,  71,  69,
>+    84,  65,  82,  82,  65,  89,  73,  78,  68,  69,  88,  0,   84,  69,  88,  67,  79,  79,  82,
>+    68,  0,   171, 79,  83,  71,  78,  44,  0,   0,   0,   1,   0,   0,   0,   8,   0,   0,   0,
>+    32,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   3,   0,   0,   0,   0,   0,   0,
>+    0,   15,  0,   0,   0,   83,  86,  95,  84,  65,  82,  71,  69,  84,  0,   171, 171, 83,  72,
>+    68,  82,  36,  1,   0,   0,   64,  0,   0,   0,   73,  0,   0,   0,   90,  0,   0,   3,   0,
>+    96,  16,  0,   0,   0,   0,   0,   88,  64,  0,   4,   0,   112, 16,  0,   0,   0,   0,   0,
>+    85,  85,  0,   0,   100, 8,   0,   4,   18,  16,  16,  0,   1,   0,   0,   0,   4,   0,   0,
>+    0,   98,  16,  0,   3,   50,  16,  16,  0,   2,   0,   0,   0,   101, 0,   0,   3,   242, 32,
>+    16,  0,   0,   0,   0,   0,   104, 0,   0,   2,   1,   0,   0,   0,   86,  0,   0,   5,   66,
>+    0,   16,  0,   0,   0,   0,   0,   10,  16,  16,  0,   1,   0,   0,   0,   54,  0,   0,   5,
>+    50,  0,   16,  0,   0,   0,   0,   0,   70,  16,  16,  0,   2,   0,   0,   0,   69,  0,   0,
>+    9,   242, 0,   16,  0,   0,   0,   0,   0,   70,  2,   16,  0,   0,   0,   0,   0,   70,  126,
>+    16,  0,   0,   0,   0,   0,   0,   96,  16,  0,   0,   0,   0,   0,   56,  0,   0,   7,   114,
>+    0,   16,  0,   0,   0,   0,   0,   246, 15,  16,  0,   0,   0,   0,   0,   70,  2,   16,  0,
>+    0,   0,   0,   0,   56,  0,   0,   10,  242, 0,   16,  0,   0,   0,   0,   0,   70,  14,  16,
>+    0,   0,   0,   0,   0,   2,   64,  0,   0,   0,   0,   112, 65,  0,   0,   112, 65,  0,   0,
>+    112, 65,  0,   0,   112, 65,  64,  0,   0,   5,   242, 0,   16,  0,   0,   0,   0,   0,   70,
>+    14,  16,  0,   0,   0,   0,   0,   56,  0,   0,   10,  242, 32,  16,  0,   0,   0,   0,   0,
>+    70,  14,  16,  0,   0,   0,   0,   0,   2,   64,  0,   0,   137, 136, 136, 61,  137, 136, 136,
>+    61,  137, 136, 136, 61,  137, 136, 136, 61,  62,  0,   0,   1,   83,  84,  65,  84,  116, 0,
>+    0,   0,   8,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   3,   0,   0,   0,   4,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   2,   0,   0,   0,   0,   0,   0,   0,   2,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0};
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_pm_rgba_4444_3d_ps.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_pm_rgba_4444_3d_ps.h
>new file mode 100644
>index 00000000000..95984d74dc4
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_pm_rgba_4444_3d_ps.h
>@@ -0,0 +1,91 @@
>+#if 0
>+//
>+// Generated by Microsoft (R) HLSL Shader Compiler 9.29.952.3111
>+//
>+//
>+//   fxc /nologo /E PS_FtoF_PM_RGBA_4444_3D /T ps_4_0 /Fh
>+//    compiled\multiplyalpha_ftof_pm_rgba_4444_3d_ps.h MultiplyAlpha.hlsl
>+//
>+//
>+// Resource Bindings:
>+//
>+// Name                                 Type  Format         Dim Slot Elements
>+// ------------------------------ ---------- ------- ----------- ---- --------
>+// Sampler                           sampler      NA          NA    0        1
>+// TextureF_3D                       texture  float4          3d    0        1
>+//
>+//
>+//
>+// Input signature:
>+//
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_POSITION              0   xyzw        0      POS  float       
>+// SV_RENDERTARGETARRAYINDEX     0   x           1  RTINDEX   uint       
>+// TEXCOORD                 0   xyz         2     NONE  float   xyz 
>+//
>+//
>+// Output signature:
>+//
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_TARGET                0   xyzw        0   TARGET  float   xyzw
>+//
>+ps_4_0
>+dcl_sampler s0, mode_default
>+dcl_resource_texture3d (float,float,float,float) t0
>+dcl_input_ps linear v2.xyz
>+dcl_output o0.xyzw
>+dcl_temps 1
>+sample r0.xyzw, v2.xyzx, t0.xyzw, s0
>+mul r0.xyz, r0.wwww, r0.xyzx
>+mul r0.xyzw, r0.xyzw, l(15.000000, 15.000000, 15.000000, 15.000000)
>+round_ne r0.xyzw, r0.xyzw
>+mul o0.xyzw, r0.xyzw, l(0.066667, 0.066667, 0.066667, 0.066667)
>+ret 
>+// Approximately 6 instruction slots used
>+#endif
>+
>+const BYTE g_PS_FtoF_PM_RGBA_4444_3D[] = {
>+    68,  88,  66,  67,  182, 254, 44,  165, 15,  39,  193, 247, 58,  244, 243, 166, 190, 236, 221,
>+    252, 1,   0,   0,   0,   12,  3,   0,   0,   5,   0,   0,   0,   52,  0,   0,   0,   224, 0,
>+    0,   0,   104, 1,   0,   0,   156, 1,   0,   0,   144, 2,   0,   0,   82,  68,  69,  70,  164,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   2,   0,   0,   0,   28,  0,   0,   0,
>+    0,   4,   255, 255, 0,   1,   0,   0,   112, 0,   0,   0,   92,  0,   0,   0,   3,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,
>+    0,   0,   1,   0,   0,   0,   100, 0,   0,   0,   2,   0,   0,   0,   5,   0,   0,   0,   8,
>+    0,   0,   0,   255, 255, 255, 255, 0,   0,   0,   0,   1,   0,   0,   0,   13,  0,   0,   0,
>+    83,  97,  109, 112, 108, 101, 114, 0,   84,  101, 120, 116, 117, 114, 101, 70,  95,  51,  68,
>+    0,   77,  105, 99,  114, 111, 115, 111, 102, 116, 32,  40,  82,  41,  32,  72,  76,  83,  76,
>+    32,  83,  104, 97,  100, 101, 114, 32,  67,  111, 109, 112, 105, 108, 101, 114, 32,  57,  46,
>+    50,  57,  46,  57,  53,  50,  46,  51,  49,  49,  49,  0,   171, 171, 171, 73,  83,  71,  78,
>+    128, 0,   0,   0,   3,   0,   0,   0,   8,   0,   0,   0,   80,  0,   0,   0,   0,   0,   0,
>+    0,   1,   0,   0,   0,   3,   0,   0,   0,   0,   0,   0,   0,   15,  0,   0,   0,   92,  0,
>+    0,   0,   0,   0,   0,   0,   4,   0,   0,   0,   1,   0,   0,   0,   1,   0,   0,   0,   1,
>+    0,   0,   0,   118, 0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   3,   0,   0,   0,
>+    2,   0,   0,   0,   7,   7,   0,   0,   83,  86,  95,  80,  79,  83,  73,  84,  73,  79,  78,
>+    0,   83,  86,  95,  82,  69,  78,  68,  69,  82,  84,  65,  82,  71,  69,  84,  65,  82,  82,
>+    65,  89,  73,  78,  68,  69,  88,  0,   84,  69,  88,  67,  79,  79,  82,  68,  0,   171, 79,
>+    83,  71,  78,  44,  0,   0,   0,   1,   0,   0,   0,   8,   0,   0,   0,   32,  0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   3,   0,   0,   0,   0,   0,   0,   0,   15,  0,   0,
>+    0,   83,  86,  95,  84,  65,  82,  71,  69,  84,  0,   171, 171, 83,  72,  68,  82,  236, 0,
>+    0,   0,   64,  0,   0,   0,   59,  0,   0,   0,   90,  0,   0,   3,   0,   96,  16,  0,   0,
>+    0,   0,   0,   88,  40,  0,   4,   0,   112, 16,  0,   0,   0,   0,   0,   85,  85,  0,   0,
>+    98,  16,  0,   3,   114, 16,  16,  0,   2,   0,   0,   0,   101, 0,   0,   3,   242, 32,  16,
>+    0,   0,   0,   0,   0,   104, 0,   0,   2,   1,   0,   0,   0,   69,  0,   0,   9,   242, 0,
>+    16,  0,   0,   0,   0,   0,   70,  18,  16,  0,   2,   0,   0,   0,   70,  126, 16,  0,   0,
>+    0,   0,   0,   0,   96,  16,  0,   0,   0,   0,   0,   56,  0,   0,   7,   114, 0,   16,  0,
>+    0,   0,   0,   0,   246, 15,  16,  0,   0,   0,   0,   0,   70,  2,   16,  0,   0,   0,   0,
>+    0,   56,  0,   0,   10,  242, 0,   16,  0,   0,   0,   0,   0,   70,  14,  16,  0,   0,   0,
>+    0,   0,   2,   64,  0,   0,   0,   0,   112, 65,  0,   0,   112, 65,  0,   0,   112, 65,  0,
>+    0,   112, 65,  64,  0,   0,   5,   242, 0,   16,  0,   0,   0,   0,   0,   70,  14,  16,  0,
>+    0,   0,   0,   0,   56,  0,   0,   10,  242, 32,  16,  0,   0,   0,   0,   0,   70,  14,  16,
>+    0,   0,   0,   0,   0,   2,   64,  0,   0,   137, 136, 136, 61,  137, 136, 136, 61,  137, 136,
>+    136, 61,  137, 136, 136, 61,  62,  0,   0,   1,   83,  84,  65,  84,  116, 0,   0,   0,   6,
>+    0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   2,   0,   0,   0,   4,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,
>+    0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0};
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_pm_rgba_5551_2d_ps.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_pm_rgba_5551_2d_ps.h
>new file mode 100644
>index 00000000000..ec165e09cbf
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_pm_rgba_5551_2d_ps.h
>@@ -0,0 +1,87 @@
>+#if 0
>+//
>+// Generated by Microsoft (R) HLSL Shader Compiler 9.29.952.3111
>+//
>+//
>+//   fxc /nologo /E PS_FtoF_PM_RGBA_5551_2D /T ps_4_0 /Fh
>+//    compiled\multiplyalpha_ftof_pm_rgba_5551_2d_ps.h MultiplyAlpha.hlsl
>+//
>+//
>+// Resource Bindings:
>+//
>+// Name                                 Type  Format         Dim Slot Elements
>+// ------------------------------ ---------- ------- ----------- ---- --------
>+// Sampler                           sampler      NA          NA    0        1
>+// TextureF                          texture  float4          2d    0        1
>+//
>+//
>+//
>+// Input signature:
>+//
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_POSITION              0   xyzw        0      POS  float
>+// TEXCOORD                 0   xy          1     NONE  float   xy
>+//
>+//
>+// Output signature:
>+//
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_TARGET                0   xyzw        0   TARGET  float   xyzw
>+//
>+ps_4_0
>+dcl_sampler s0, mode_default
>+dcl_resource_texture2d (float,float,float,float) t0
>+dcl_input_ps linear v1.xy
>+dcl_output o0.xyzw
>+dcl_temps 1
>+sample r0.xyzw, v1.xyxx, t0.xyzw, s0
>+mul r0.xyz, r0.wwww, r0.xyzx
>+mul r0.xyzw, r0.xyzw, l(31.000000, 31.000000, 31.000000, 1.000000)
>+round_ne r0.xyzw, r0.xyzw
>+mul o0.xyzw, r0.xyzw, l(0.032258, 0.032258, 0.032258, 1.000000)
>+ret
>+// Approximately 6 instruction slots used
>+#endif
>+
>+const BYTE g_PS_FtoF_PM_RGBA_5551_2D[] = {
>+    68,  88,  66,  67,  9,   162, 245, 66,  237, 195, 125, 215, 175, 86,  217, 7,  250, 144, 127,
>+    24,  1,   0,   0,   0,   216, 2,   0,   0,   5,   0,   0,   0,   52,  0,   0,  0,   220, 0,
>+    0,   0,   52,  1,   0,   0,   104, 1,   0,   0,   92,  2,   0,   0,   82,  68, 69,  70,  160,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   2,   0,   0,   0,   28, 0,   0,   0,
>+    0,   4,   255, 255, 0,   1,   0,   0,   109, 0,   0,   0,   92,  0,   0,   0,  3,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,  0,   1,   0,
>+    0,   0,   1,   0,   0,   0,   100, 0,   0,   0,   2,   0,   0,   0,   5,   0,  0,   0,   4,
>+    0,   0,   0,   255, 255, 255, 255, 0,   0,   0,   0,   1,   0,   0,   0,   13, 0,   0,   0,
>+    83,  97,  109, 112, 108, 101, 114, 0,   84,  101, 120, 116, 117, 114, 101, 70, 0,   77,  105,
>+    99,  114, 111, 115, 111, 102, 116, 32,  40,  82,  41,  32,  72,  76,  83,  76, 32,  83,  104,
>+    97,  100, 101, 114, 32,  67,  111, 109, 112, 105, 108, 101, 114, 32,  57,  46, 50,  57,  46,
>+    57,  53,  50,  46,  51,  49,  49,  49,  0,   171, 171, 73,  83,  71,  78,  80, 0,   0,   0,
>+    2,   0,   0,   0,   8,   0,   0,   0,   56,  0,   0,   0,   0,   0,   0,   0,  1,   0,   0,
>+    0,   3,   0,   0,   0,   0,   0,   0,   0,   15,  0,   0,   0,   68,  0,   0,  0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   3,   0,   0,   0,   1,   0,   0,   0,   3,   3,  0,   0,   83,
>+    86,  95,  80,  79,  83,  73,  84,  73,  79,  78,  0,   84,  69,  88,  67,  79, 79,  82,  68,
>+    0,   171, 171, 171, 79,  83,  71,  78,  44,  0,   0,   0,   1,   0,   0,   0,  8,   0,   0,
>+    0,   32,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   3,   0,   0,  0,   0,   0,
>+    0,   0,   15,  0,   0,   0,   83,  86,  95,  84,  65,  82,  71,  69,  84,  0,  171, 171, 83,
>+    72,  68,  82,  236, 0,   0,   0,   64,  0,   0,   0,   59,  0,   0,   0,   90, 0,   0,   3,
>+    0,   96,  16,  0,   0,   0,   0,   0,   88,  24,  0,   4,   0,   112, 16,  0,  0,   0,   0,
>+    0,   85,  85,  0,   0,   98,  16,  0,   3,   50,  16,  16,  0,   1,   0,   0,  0,   101, 0,
>+    0,   3,   242, 32,  16,  0,   0,   0,   0,   0,   104, 0,   0,   2,   1,   0,  0,   0,   69,
>+    0,   0,   9,   242, 0,   16,  0,   0,   0,   0,   0,   70,  16,  16,  0,   1,  0,   0,   0,
>+    70,  126, 16,  0,   0,   0,   0,   0,   0,   96,  16,  0,   0,   0,   0,   0,  56,  0,   0,
>+    7,   114, 0,   16,  0,   0,   0,   0,   0,   246, 15,  16,  0,   0,   0,   0,  0,   70,  2,
>+    16,  0,   0,   0,   0,   0,   56,  0,   0,   10,  242, 0,   16,  0,   0,   0,  0,   0,   70,
>+    14,  16,  0,   0,   0,   0,   0,   2,   64,  0,   0,   0,   0,   248, 65,  0,  0,   248, 65,
>+    0,   0,   248, 65,  0,   0,   128, 63,  64,  0,   0,   5,   242, 0,   16,  0,  0,   0,   0,
>+    0,   70,  14,  16,  0,   0,   0,   0,   0,   56,  0,   0,   10,  242, 32,  16, 0,   0,   0,
>+    0,   0,   70,  14,  16,  0,   0,   0,   0,   0,   2,   64,  0,   0,   8,   33, 4,   61,  8,
>+    33,  4,   61,  8,   33,  4,   61,  0,   0,   128, 63,  62,  0,   0,   1,   83, 84,  65,  84,
>+    116, 0,   0,   0,   6,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,  2,   0,   0,
>+    0,   4,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,  0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,  0,   0,   0,
>+    0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,  0,   0,   0,
>+    0,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,  0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,  0,   0,   0,
>+    0,   0,   0,   0,   0,   0};
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_pm_rgba_5551_2darray_ps.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_pm_rgba_5551_2darray_ps.h
>new file mode 100644
>index 00000000000..c32ad2a6175
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_pm_rgba_5551_2darray_ps.h
>@@ -0,0 +1,97 @@
>+#if 0
>+//
>+// Generated by Microsoft (R) HLSL Shader Compiler 9.29.952.3111
>+//
>+//
>+//   fxc /nologo /E PS_FtoF_PM_RGBA_5551_2DArray /T ps_4_0 /Fh
>+//    compiled\multiplyalpha_ftof_pm_rgba_5551_2darray_ps.h MultiplyAlpha.hlsl
>+//
>+//
>+// Resource Bindings:
>+//
>+// Name                                 Type  Format         Dim Slot Elements
>+// ------------------------------ ---------- ------- ----------- ---- --------
>+// Sampler                           sampler      NA          NA    0        1
>+// TextureF_2DArray                  texture  float4     2darray    0        1
>+//
>+//
>+//
>+// Input signature:
>+//
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_POSITION              0   xyzw        0      POS  float       
>+// SV_RENDERTARGETARRAYINDEX     0   x           1  RTINDEX   uint   x   
>+// TEXCOORD                 0   xyz         2     NONE  float   xy  
>+//
>+//
>+// Output signature:
>+//
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_TARGET                0   xyzw        0   TARGET  float   xyzw
>+//
>+ps_4_0
>+dcl_sampler s0, mode_default
>+dcl_resource_texture2darray (float,float,float,float) t0
>+dcl_input_ps_siv constant v1.x, rendertarget_array_index
>+dcl_input_ps linear v2.xy
>+dcl_output o0.xyzw
>+dcl_temps 1
>+utof r0.z, v1.x
>+mov r0.xy, v2.xyxx
>+sample r0.xyzw, r0.xyzx, t0.xyzw, s0
>+mul r0.xyz, r0.wwww, r0.xyzx
>+mul r0.xyzw, r0.xyzw, l(31.000000, 31.000000, 31.000000, 1.000000)
>+round_ne r0.xyzw, r0.xyzw
>+mul o0.xyzw, r0.xyzw, l(0.032258, 0.032258, 0.032258, 1.000000)
>+ret 
>+// Approximately 8 instruction slots used
>+#endif
>+
>+const BYTE g_PS_FtoF_PM_RGBA_5551_2DArray[] = {
>+    68,  88,  66,  67,  205, 80,  185, 185, 211, 249, 96,  159, 20,  215, 234, 77,  101, 157, 240,
>+    47,  1,   0,   0,   0,   72,  3,   0,   0,   5,   0,   0,   0,   52,  0,   0,   0,   228, 0,
>+    0,   0,   108, 1,   0,   0,   160, 1,   0,   0,   204, 2,   0,   0,   82,  68,  69,  70,  168,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   2,   0,   0,   0,   28,  0,   0,   0,
>+    0,   4,   255, 255, 0,   1,   0,   0,   117, 0,   0,   0,   92,  0,   0,   0,   3,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,
>+    0,   0,   1,   0,   0,   0,   100, 0,   0,   0,   2,   0,   0,   0,   5,   0,   0,   0,   5,
>+    0,   0,   0,   255, 255, 255, 255, 0,   0,   0,   0,   1,   0,   0,   0,   13,  0,   0,   0,
>+    83,  97,  109, 112, 108, 101, 114, 0,   84,  101, 120, 116, 117, 114, 101, 70,  95,  50,  68,
>+    65,  114, 114, 97,  121, 0,   77,  105, 99,  114, 111, 115, 111, 102, 116, 32,  40,  82,  41,
>+    32,  72,  76,  83,  76,  32,  83,  104, 97,  100, 101, 114, 32,  67,  111, 109, 112, 105, 108,
>+    101, 114, 32,  57,  46,  50,  57,  46,  57,  53,  50,  46,  51,  49,  49,  49,  0,   171, 171,
>+    73,  83,  71,  78,  128, 0,   0,   0,   3,   0,   0,   0,   8,   0,   0,   0,   80,  0,   0,
>+    0,   0,   0,   0,   0,   1,   0,   0,   0,   3,   0,   0,   0,   0,   0,   0,   0,   15,  0,
>+    0,   0,   92,  0,   0,   0,   0,   0,   0,   0,   4,   0,   0,   0,   1,   0,   0,   0,   1,
>+    0,   0,   0,   1,   1,   0,   0,   118, 0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    3,   0,   0,   0,   2,   0,   0,   0,   7,   3,   0,   0,   83,  86,  95,  80,  79,  83,  73,
>+    84,  73,  79,  78,  0,   83,  86,  95,  82,  69,  78,  68,  69,  82,  84,  65,  82,  71,  69,
>+    84,  65,  82,  82,  65,  89,  73,  78,  68,  69,  88,  0,   84,  69,  88,  67,  79,  79,  82,
>+    68,  0,   171, 79,  83,  71,  78,  44,  0,   0,   0,   1,   0,   0,   0,   8,   0,   0,   0,
>+    32,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   3,   0,   0,   0,   0,   0,   0,
>+    0,   15,  0,   0,   0,   83,  86,  95,  84,  65,  82,  71,  69,  84,  0,   171, 171, 83,  72,
>+    68,  82,  36,  1,   0,   0,   64,  0,   0,   0,   73,  0,   0,   0,   90,  0,   0,   3,   0,
>+    96,  16,  0,   0,   0,   0,   0,   88,  64,  0,   4,   0,   112, 16,  0,   0,   0,   0,   0,
>+    85,  85,  0,   0,   100, 8,   0,   4,   18,  16,  16,  0,   1,   0,   0,   0,   4,   0,   0,
>+    0,   98,  16,  0,   3,   50,  16,  16,  0,   2,   0,   0,   0,   101, 0,   0,   3,   242, 32,
>+    16,  0,   0,   0,   0,   0,   104, 0,   0,   2,   1,   0,   0,   0,   86,  0,   0,   5,   66,
>+    0,   16,  0,   0,   0,   0,   0,   10,  16,  16,  0,   1,   0,   0,   0,   54,  0,   0,   5,
>+    50,  0,   16,  0,   0,   0,   0,   0,   70,  16,  16,  0,   2,   0,   0,   0,   69,  0,   0,
>+    9,   242, 0,   16,  0,   0,   0,   0,   0,   70,  2,   16,  0,   0,   0,   0,   0,   70,  126,
>+    16,  0,   0,   0,   0,   0,   0,   96,  16,  0,   0,   0,   0,   0,   56,  0,   0,   7,   114,
>+    0,   16,  0,   0,   0,   0,   0,   246, 15,  16,  0,   0,   0,   0,   0,   70,  2,   16,  0,
>+    0,   0,   0,   0,   56,  0,   0,   10,  242, 0,   16,  0,   0,   0,   0,   0,   70,  14,  16,
>+    0,   0,   0,   0,   0,   2,   64,  0,   0,   0,   0,   248, 65,  0,   0,   248, 65,  0,   0,
>+    248, 65,  0,   0,   128, 63,  64,  0,   0,   5,   242, 0,   16,  0,   0,   0,   0,   0,   70,
>+    14,  16,  0,   0,   0,   0,   0,   56,  0,   0,   10,  242, 32,  16,  0,   0,   0,   0,   0,
>+    70,  14,  16,  0,   0,   0,   0,   0,   2,   64,  0,   0,   8,   33,  4,   61,  8,   33,  4,
>+    61,  8,   33,  4,   61,  0,   0,   128, 63,  62,  0,   0,   1,   83,  84,  65,  84,  116, 0,
>+    0,   0,   8,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   3,   0,   0,   0,   4,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   2,   0,   0,   0,   0,   0,   0,   0,   2,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0};
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_pm_rgba_5551_3d_ps.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_pm_rgba_5551_3d_ps.h
>new file mode 100644
>index 00000000000..1220a494fa7
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_pm_rgba_5551_3d_ps.h
>@@ -0,0 +1,91 @@
>+#if 0
>+//
>+// Generated by Microsoft (R) HLSL Shader Compiler 9.29.952.3111
>+//
>+//
>+//   fxc /nologo /E PS_FtoF_PM_RGBA_5551_3D /T ps_4_0 /Fh
>+//    compiled\multiplyalpha_ftof_pm_rgba_5551_3d_ps.h MultiplyAlpha.hlsl
>+//
>+//
>+// Resource Bindings:
>+//
>+// Name                                 Type  Format         Dim Slot Elements
>+// ------------------------------ ---------- ------- ----------- ---- --------
>+// Sampler                           sampler      NA          NA    0        1
>+// TextureF_3D                       texture  float4          3d    0        1
>+//
>+//
>+//
>+// Input signature:
>+//
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_POSITION              0   xyzw        0      POS  float       
>+// SV_RENDERTARGETARRAYINDEX     0   x           1  RTINDEX   uint       
>+// TEXCOORD                 0   xyz         2     NONE  float   xyz 
>+//
>+//
>+// Output signature:
>+//
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_TARGET                0   xyzw        0   TARGET  float   xyzw
>+//
>+ps_4_0
>+dcl_sampler s0, mode_default
>+dcl_resource_texture3d (float,float,float,float) t0
>+dcl_input_ps linear v2.xyz
>+dcl_output o0.xyzw
>+dcl_temps 1
>+sample r0.xyzw, v2.xyzx, t0.xyzw, s0
>+mul r0.xyz, r0.wwww, r0.xyzx
>+mul r0.xyzw, r0.xyzw, l(31.000000, 31.000000, 31.000000, 1.000000)
>+round_ne r0.xyzw, r0.xyzw
>+mul o0.xyzw, r0.xyzw, l(0.032258, 0.032258, 0.032258, 1.000000)
>+ret 
>+// Approximately 6 instruction slots used
>+#endif
>+
>+const BYTE g_PS_FtoF_PM_RGBA_5551_3D[] = {
>+    68,  88,  66,  67,  6,   155, 93,  120, 159, 88,  203, 149, 81,  116, 108, 30,  223, 171, 137,
>+    112, 1,   0,   0,   0,   12,  3,   0,   0,   5,   0,   0,   0,   52,  0,   0,   0,   224, 0,
>+    0,   0,   104, 1,   0,   0,   156, 1,   0,   0,   144, 2,   0,   0,   82,  68,  69,  70,  164,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   2,   0,   0,   0,   28,  0,   0,   0,
>+    0,   4,   255, 255, 0,   1,   0,   0,   112, 0,   0,   0,   92,  0,   0,   0,   3,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,
>+    0,   0,   1,   0,   0,   0,   100, 0,   0,   0,   2,   0,   0,   0,   5,   0,   0,   0,   8,
>+    0,   0,   0,   255, 255, 255, 255, 0,   0,   0,   0,   1,   0,   0,   0,   13,  0,   0,   0,
>+    83,  97,  109, 112, 108, 101, 114, 0,   84,  101, 120, 116, 117, 114, 101, 70,  95,  51,  68,
>+    0,   77,  105, 99,  114, 111, 115, 111, 102, 116, 32,  40,  82,  41,  32,  72,  76,  83,  76,
>+    32,  83,  104, 97,  100, 101, 114, 32,  67,  111, 109, 112, 105, 108, 101, 114, 32,  57,  46,
>+    50,  57,  46,  57,  53,  50,  46,  51,  49,  49,  49,  0,   171, 171, 171, 73,  83,  71,  78,
>+    128, 0,   0,   0,   3,   0,   0,   0,   8,   0,   0,   0,   80,  0,   0,   0,   0,   0,   0,
>+    0,   1,   0,   0,   0,   3,   0,   0,   0,   0,   0,   0,   0,   15,  0,   0,   0,   92,  0,
>+    0,   0,   0,   0,   0,   0,   4,   0,   0,   0,   1,   0,   0,   0,   1,   0,   0,   0,   1,
>+    0,   0,   0,   118, 0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   3,   0,   0,   0,
>+    2,   0,   0,   0,   7,   7,   0,   0,   83,  86,  95,  80,  79,  83,  73,  84,  73,  79,  78,
>+    0,   83,  86,  95,  82,  69,  78,  68,  69,  82,  84,  65,  82,  71,  69,  84,  65,  82,  82,
>+    65,  89,  73,  78,  68,  69,  88,  0,   84,  69,  88,  67,  79,  79,  82,  68,  0,   171, 79,
>+    83,  71,  78,  44,  0,   0,   0,   1,   0,   0,   0,   8,   0,   0,   0,   32,  0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   3,   0,   0,   0,   0,   0,   0,   0,   15,  0,   0,
>+    0,   83,  86,  95,  84,  65,  82,  71,  69,  84,  0,   171, 171, 83,  72,  68,  82,  236, 0,
>+    0,   0,   64,  0,   0,   0,   59,  0,   0,   0,   90,  0,   0,   3,   0,   96,  16,  0,   0,
>+    0,   0,   0,   88,  40,  0,   4,   0,   112, 16,  0,   0,   0,   0,   0,   85,  85,  0,   0,
>+    98,  16,  0,   3,   114, 16,  16,  0,   2,   0,   0,   0,   101, 0,   0,   3,   242, 32,  16,
>+    0,   0,   0,   0,   0,   104, 0,   0,   2,   1,   0,   0,   0,   69,  0,   0,   9,   242, 0,
>+    16,  0,   0,   0,   0,   0,   70,  18,  16,  0,   2,   0,   0,   0,   70,  126, 16,  0,   0,
>+    0,   0,   0,   0,   96,  16,  0,   0,   0,   0,   0,   56,  0,   0,   7,   114, 0,   16,  0,
>+    0,   0,   0,   0,   246, 15,  16,  0,   0,   0,   0,   0,   70,  2,   16,  0,   0,   0,   0,
>+    0,   56,  0,   0,   10,  242, 0,   16,  0,   0,   0,   0,   0,   70,  14,  16,  0,   0,   0,
>+    0,   0,   2,   64,  0,   0,   0,   0,   248, 65,  0,   0,   248, 65,  0,   0,   248, 65,  0,
>+    0,   128, 63,  64,  0,   0,   5,   242, 0,   16,  0,   0,   0,   0,   0,   70,  14,  16,  0,
>+    0,   0,   0,   0,   56,  0,   0,   10,  242, 32,  16,  0,   0,   0,   0,   0,   70,  14,  16,
>+    0,   0,   0,   0,   0,   2,   64,  0,   0,   8,   33,  4,   61,  8,   33,  4,   61,  8,   33,
>+    4,   61,  0,   0,   128, 63,  62,  0,   0,   1,   83,  84,  65,  84,  116, 0,   0,   0,   6,
>+    0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   2,   0,   0,   0,   4,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,
>+    0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0};
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_pm_rgba_ps.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_pm_rgba_ps.h
>deleted file mode 100644
>index 75e64f9c809..00000000000
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_pm_rgba_ps.h
>+++ /dev/null
>@@ -1,77 +0,0 @@
>-#if 0
>-//
>-// Generated by Microsoft (R) HLSL Shader Compiler 6.3.9600.16384
>-//
>-//
>-// Resource Bindings:
>-//
>-// Name                                 Type  Format         Dim Slot Elements
>-// ------------------------------ ---------- ------- ----------- ---- --------
>-// Sampler                           sampler      NA          NA    0        1
>-// TextureF                          texture  float4          2d    0        1
>-//
>-//
>-//
>-// Input signature:
>-//
>-// Name                 Index   Mask Register SysValue  Format   Used
>-// -------------------- ----- ------ -------- -------- ------- ------
>-// SV_POSITION              0   xyzw        0      POS   float       
>-// TEXCOORD                 0   xy          1     NONE   float   xy  
>-//
>-//
>-// Output signature:
>-//
>-// Name                 Index   Mask Register SysValue  Format   Used
>-// -------------------- ----- ------ -------- -------- ------- ------
>-// SV_TARGET                0   xyzw        0   TARGET   float   xyzw
>-//
>-ps_4_0
>-dcl_sampler s0, mode_default
>-dcl_resource_texture2d (float,float,float,float) t0
>-dcl_input_ps linear v1.xy
>-dcl_output o0.xyzw
>-dcl_temps 1
>-sample r0.xyzw, v1.xyxx, t0.xyzw, s0
>-mul o0.xyz, r0.wwww, r0.xyzx
>-mov o0.w, r0.w
>-ret 
>-// Approximately 4 instruction slots used
>-#endif
>-
>-const BYTE g_PS_FtoF_PM_RGBA[] = {
>-    68, 88,  66,  67,  40,  72,  131, 157, 129, 101, 255, 110, 126, 134, 111, 68,  143, 142, 219,
>-    64, 1,   0,   0,   0,   136, 2,   0,   0,   5,   0,   0,   0,   52,  0,   0,   0,   220, 0,
>-    0,  0,   52,  1,   0,   0,   104, 1,   0,   0,   12,  2,   0,   0,   82,  68,  69,  70,  160,
>-    0,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   2,   0,   0,   0,   28,  0,   0,   0,
>-    0,  4,   255, 255, 0,   1,   0,   0,   109, 0,   0,   0,   92,  0,   0,   0,   3,   0,   0,
>-    0,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,
>-    0,  0,   1,   0,   0,   0,   100, 0,   0,   0,   2,   0,   0,   0,   5,   0,   0,   0,   4,
>-    0,  0,   0,   255, 255, 255, 255, 0,   0,   0,   0,   1,   0,   0,   0,   13,  0,   0,   0,
>-    83, 97,  109, 112, 108, 101, 114, 0,   84,  101, 120, 116, 117, 114, 101, 70,  0,   77,  105,
>-    99, 114, 111, 115, 111, 102, 116, 32,  40,  82,  41,  32,  72,  76,  83,  76,  32,  83,  104,
>-    97, 100, 101, 114, 32,  67,  111, 109, 112, 105, 108, 101, 114, 32,  54,  46,  51,  46,  57,
>-    54, 48,  48,  46,  49,  54,  51,  56,  52,  0,   171, 73,  83,  71,  78,  80,  0,   0,   0,
>-    2,  0,   0,   0,   8,   0,   0,   0,   56,  0,   0,   0,   0,   0,   0,   0,   1,   0,   0,
>-    0,  3,   0,   0,   0,   0,   0,   0,   0,   15,  0,   0,   0,   68,  0,   0,   0,   0,   0,
>-    0,  0,   0,   0,   0,   0,   3,   0,   0,   0,   1,   0,   0,   0,   3,   3,   0,   0,   83,
>-    86, 95,  80,  79,  83,  73,  84,  73,  79,  78,  0,   84,  69,  88,  67,  79,  79,  82,  68,
>-    0,  171, 171, 171, 79,  83,  71,  78,  44,  0,   0,   0,   1,   0,   0,   0,   8,   0,   0,
>-    0,  32,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   3,   0,   0,   0,   0,   0,
>-    0,  0,   15,  0,   0,   0,   83,  86,  95,  84,  65,  82,  71,  69,  84,  0,   171, 171, 83,
>-    72, 68,  82,  156, 0,   0,   0,   64,  0,   0,   0,   39,  0,   0,   0,   90,  0,   0,   3,
>-    0,  96,  16,  0,   0,   0,   0,   0,   88,  24,  0,   4,   0,   112, 16,  0,   0,   0,   0,
>-    0,  85,  85,  0,   0,   98,  16,  0,   3,   50,  16,  16,  0,   1,   0,   0,   0,   101, 0,
>-    0,  3,   242, 32,  16,  0,   0,   0,   0,   0,   104, 0,   0,   2,   1,   0,   0,   0,   69,
>-    0,  0,   9,   242, 0,   16,  0,   0,   0,   0,   0,   70,  16,  16,  0,   1,   0,   0,   0,
>-    70, 126, 16,  0,   0,   0,   0,   0,   0,   96,  16,  0,   0,   0,   0,   0,   56,  0,   0,
>-    7,  114, 32,  16,  0,   0,   0,   0,   0,   246, 15,  16,  0,   0,   0,   0,   0,   70,  2,
>-    16, 0,   0,   0,   0,   0,   54,  0,   0,   5,   130, 32,  16,  0,   0,   0,   0,   0,   58,
>-    0,  16,  0,   0,   0,   0,   0,   62,  0,   0,   1,   83,  84,  65,  84,  116, 0,   0,   0,
>-    4,  0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   2,   0,   0,   0,   1,   0,   0,
>-    0,  0,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>-    0,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,
>-    0,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>-    1,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>-    0,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>-    0,  0};
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_um_luma_2d_ps.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_um_luma_2d_ps.h
>new file mode 100644
>index 00000000000..3ef4affde90
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_um_luma_2d_ps.h
>@@ -0,0 +1,86 @@
>+#if 0
>+//
>+// Generated by Microsoft (R) HLSL Shader Compiler 9.29.952.3111
>+//
>+//
>+//   fxc /nologo /E PS_FtoF_UM_LUMA_2D /T ps_4_0 /Fh
>+//    compiled\multiplyalpha_ftof_um_luma_2d_ps.h MultiplyAlpha.hlsl
>+//
>+//
>+// Resource Bindings:
>+//
>+// Name                                 Type  Format         Dim Slot Elements
>+// ------------------------------ ---------- ------- ----------- ---- --------
>+// Sampler                           sampler      NA          NA    0        1
>+// TextureF                          texture  float4          2d    0        1
>+//
>+//
>+//
>+// Input signature:
>+//
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_POSITION              0   xyzw        0      POS  float
>+// TEXCOORD                 0   xy          1     NONE  float   xy
>+//
>+//
>+// Output signature:
>+//
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_TARGET                0   xyzw        0   TARGET  float   xyzw
>+//
>+ps_4_0
>+dcl_sampler s0, mode_default
>+dcl_resource_texture2d (float,float,float,float) t0
>+dcl_input_ps linear v1.xy
>+dcl_output o0.xyzw
>+dcl_temps 2
>+sample r0.xyzw, v1.xyxx, t0.xyzw, s0
>+lt r1.x, l(0.000000), r0.w
>+div r0.w, r0.x, r0.w
>+movc o0.xyz, r1.xxxx, r0.wwww, r0.xyzx
>+mov o0.w, l(1.000000)
>+ret
>+// Approximately 6 instruction slots used
>+#endif
>+
>+const BYTE g_PS_FtoF_UM_LUMA_2D[] = {
>+    68,  88,  66,  67,  71,  14,  186, 44,  238, 163, 144, 254, 61,  126, 83,  179, 106, 64,  226,
>+    41,  1,   0,   0,   0,   200, 2,   0,   0,   5,   0,   0,   0,   52,  0,   0,   0,   220, 0,
>+    0,   0,   52,  1,   0,   0,   104, 1,   0,   0,   76,  2,   0,   0,   82,  68,  69,  70,  160,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   2,   0,   0,   0,   28,  0,   0,   0,
>+    0,   4,   255, 255, 0,   1,   0,   0,   109, 0,   0,   0,   92,  0,   0,   0,   3,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,
>+    0,   0,   1,   0,   0,   0,   100, 0,   0,   0,   2,   0,   0,   0,   5,   0,   0,   0,   4,
>+    0,   0,   0,   255, 255, 255, 255, 0,   0,   0,   0,   1,   0,   0,   0,   13,  0,   0,   0,
>+    83,  97,  109, 112, 108, 101, 114, 0,   84,  101, 120, 116, 117, 114, 101, 70,  0,   77,  105,
>+    99,  114, 111, 115, 111, 102, 116, 32,  40,  82,  41,  32,  72,  76,  83,  76,  32,  83,  104,
>+    97,  100, 101, 114, 32,  67,  111, 109, 112, 105, 108, 101, 114, 32,  57,  46,  50,  57,  46,
>+    57,  53,  50,  46,  51,  49,  49,  49,  0,   171, 171, 73,  83,  71,  78,  80,  0,   0,   0,
>+    2,   0,   0,   0,   8,   0,   0,   0,   56,  0,   0,   0,   0,   0,   0,   0,   1,   0,   0,
>+    0,   3,   0,   0,   0,   0,   0,   0,   0,   15,  0,   0,   0,   68,  0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   3,   0,   0,   0,   1,   0,   0,   0,   3,   3,   0,   0,   83,
>+    86,  95,  80,  79,  83,  73,  84,  73,  79,  78,  0,   84,  69,  88,  67,  79,  79,  82,  68,
>+    0,   171, 171, 171, 79,  83,  71,  78,  44,  0,   0,   0,   1,   0,   0,   0,   8,   0,   0,
>+    0,   32,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   3,   0,   0,   0,   0,   0,
>+    0,   0,   15,  0,   0,   0,   83,  86,  95,  84,  65,  82,  71,  69,  84,  0,   171, 171, 83,
>+    72,  68,  82,  220, 0,   0,   0,   64,  0,   0,   0,   55,  0,   0,   0,   90,  0,   0,   3,
>+    0,   96,  16,  0,   0,   0,   0,   0,   88,  24,  0,   4,   0,   112, 16,  0,   0,   0,   0,
>+    0,   85,  85,  0,   0,   98,  16,  0,   3,   50,  16,  16,  0,   1,   0,   0,   0,   101, 0,
>+    0,   3,   242, 32,  16,  0,   0,   0,   0,   0,   104, 0,   0,   2,   2,   0,   0,   0,   69,
>+    0,   0,   9,   242, 0,   16,  0,   0,   0,   0,   0,   70,  16,  16,  0,   1,   0,   0,   0,
>+    70,  126, 16,  0,   0,   0,   0,   0,   0,   96,  16,  0,   0,   0,   0,   0,   49,  0,   0,
>+    7,   18,  0,   16,  0,   1,   0,   0,   0,   1,   64,  0,   0,   0,   0,   0,   0,   58,  0,
>+    16,  0,   0,   0,   0,   0,   14,  0,   0,   7,   130, 0,   16,  0,   0,   0,   0,   0,   10,
>+    0,   16,  0,   0,   0,   0,   0,   58,  0,   16,  0,   0,   0,   0,   0,   55,  0,   0,   9,
>+    114, 32,  16,  0,   0,   0,   0,   0,   6,   0,   16,  0,   1,   0,   0,   0,   246, 15,  16,
>+    0,   0,   0,   0,   0,   70,  2,   16,  0,   0,   0,   0,   0,   54,  0,   0,   5,   130, 32,
>+    16,  0,   0,   0,   0,   0,   1,   64,  0,   0,   0,   0,   128, 63,  62,  0,   0,   1,   83,
>+    84,  65,  84,  116, 0,   0,   0,   6,   0,   0,   0,   2,   0,   0,   0,   0,   0,   0,   0,
>+    2,   0,   0,   0,   2,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0};
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_um_luma_2darray_ps.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_um_luma_2darray_ps.h
>new file mode 100644
>index 00000000000..64ab922ff03
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_um_luma_2darray_ps.h
>@@ -0,0 +1,96 @@
>+#if 0
>+//
>+// Generated by Microsoft (R) HLSL Shader Compiler 9.29.952.3111
>+//
>+//
>+//   fxc /nologo /E PS_FtoF_UM_LUMA_2DArray /T ps_4_0 /Fh
>+//    compiled\multiplyalpha_ftof_um_luma_2darray_ps.h MultiplyAlpha.hlsl
>+//
>+//
>+// Resource Bindings:
>+//
>+// Name                                 Type  Format         Dim Slot Elements
>+// ------------------------------ ---------- ------- ----------- ---- --------
>+// Sampler                           sampler      NA          NA    0        1
>+// TextureF_2DArray                  texture  float4     2darray    0        1
>+//
>+//
>+//
>+// Input signature:
>+//
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_POSITION              0   xyzw        0      POS  float       
>+// SV_RENDERTARGETARRAYINDEX     0   x           1  RTINDEX   uint   x   
>+// TEXCOORD                 0   xyz         2     NONE  float   xy  
>+//
>+//
>+// Output signature:
>+//
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_TARGET                0   xyzw        0   TARGET  float   xyzw
>+//
>+ps_4_0
>+dcl_sampler s0, mode_default
>+dcl_resource_texture2darray (float,float,float,float) t0
>+dcl_input_ps_siv constant v1.x, rendertarget_array_index
>+dcl_input_ps linear v2.xy
>+dcl_output o0.xyzw
>+dcl_temps 2
>+utof r0.z, v1.x
>+mov r0.xy, v2.xyxx
>+sample r0.xyzw, r0.xyzx, t0.xyzw, s0
>+lt r1.x, l(0.000000), r0.w
>+div r0.w, r0.x, r0.w
>+movc o0.xyz, r1.xxxx, r0.wwww, r0.xyzx
>+mov o0.w, l(1.000000)
>+ret 
>+// Approximately 8 instruction slots used
>+#endif
>+
>+const BYTE g_PS_FtoF_UM_LUMA_2DArray[] = {
>+    68,  88,  66,  67,  184, 162, 155, 43,  23,  48,  207, 131, 7,   89,  192, 94,  227, 94,  220,
>+    191, 1,   0,   0,   0,   56,  3,   0,   0,   5,   0,   0,   0,   52,  0,   0,   0,   228, 0,
>+    0,   0,   108, 1,   0,   0,   160, 1,   0,   0,   188, 2,   0,   0,   82,  68,  69,  70,  168,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   2,   0,   0,   0,   28,  0,   0,   0,
>+    0,   4,   255, 255, 0,   1,   0,   0,   117, 0,   0,   0,   92,  0,   0,   0,   3,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,
>+    0,   0,   1,   0,   0,   0,   100, 0,   0,   0,   2,   0,   0,   0,   5,   0,   0,   0,   5,
>+    0,   0,   0,   255, 255, 255, 255, 0,   0,   0,   0,   1,   0,   0,   0,   13,  0,   0,   0,
>+    83,  97,  109, 112, 108, 101, 114, 0,   84,  101, 120, 116, 117, 114, 101, 70,  95,  50,  68,
>+    65,  114, 114, 97,  121, 0,   77,  105, 99,  114, 111, 115, 111, 102, 116, 32,  40,  82,  41,
>+    32,  72,  76,  83,  76,  32,  83,  104, 97,  100, 101, 114, 32,  67,  111, 109, 112, 105, 108,
>+    101, 114, 32,  57,  46,  50,  57,  46,  57,  53,  50,  46,  51,  49,  49,  49,  0,   171, 171,
>+    73,  83,  71,  78,  128, 0,   0,   0,   3,   0,   0,   0,   8,   0,   0,   0,   80,  0,   0,
>+    0,   0,   0,   0,   0,   1,   0,   0,   0,   3,   0,   0,   0,   0,   0,   0,   0,   15,  0,
>+    0,   0,   92,  0,   0,   0,   0,   0,   0,   0,   4,   0,   0,   0,   1,   0,   0,   0,   1,
>+    0,   0,   0,   1,   1,   0,   0,   118, 0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    3,   0,   0,   0,   2,   0,   0,   0,   7,   3,   0,   0,   83,  86,  95,  80,  79,  83,  73,
>+    84,  73,  79,  78,  0,   83,  86,  95,  82,  69,  78,  68,  69,  82,  84,  65,  82,  71,  69,
>+    84,  65,  82,  82,  65,  89,  73,  78,  68,  69,  88,  0,   84,  69,  88,  67,  79,  79,  82,
>+    68,  0,   171, 79,  83,  71,  78,  44,  0,   0,   0,   1,   0,   0,   0,   8,   0,   0,   0,
>+    32,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   3,   0,   0,   0,   0,   0,   0,
>+    0,   15,  0,   0,   0,   83,  86,  95,  84,  65,  82,  71,  69,  84,  0,   171, 171, 83,  72,
>+    68,  82,  20,  1,   0,   0,   64,  0,   0,   0,   69,  0,   0,   0,   90,  0,   0,   3,   0,
>+    96,  16,  0,   0,   0,   0,   0,   88,  64,  0,   4,   0,   112, 16,  0,   0,   0,   0,   0,
>+    85,  85,  0,   0,   100, 8,   0,   4,   18,  16,  16,  0,   1,   0,   0,   0,   4,   0,   0,
>+    0,   98,  16,  0,   3,   50,  16,  16,  0,   2,   0,   0,   0,   101, 0,   0,   3,   242, 32,
>+    16,  0,   0,   0,   0,   0,   104, 0,   0,   2,   2,   0,   0,   0,   86,  0,   0,   5,   66,
>+    0,   16,  0,   0,   0,   0,   0,   10,  16,  16,  0,   1,   0,   0,   0,   54,  0,   0,   5,
>+    50,  0,   16,  0,   0,   0,   0,   0,   70,  16,  16,  0,   2,   0,   0,   0,   69,  0,   0,
>+    9,   242, 0,   16,  0,   0,   0,   0,   0,   70,  2,   16,  0,   0,   0,   0,   0,   70,  126,
>+    16,  0,   0,   0,   0,   0,   0,   96,  16,  0,   0,   0,   0,   0,   49,  0,   0,   7,   18,
>+    0,   16,  0,   1,   0,   0,   0,   1,   64,  0,   0,   0,   0,   0,   0,   58,  0,   16,  0,
>+    0,   0,   0,   0,   14,  0,   0,   7,   130, 0,   16,  0,   0,   0,   0,   0,   10,  0,   16,
>+    0,   0,   0,   0,   0,   58,  0,   16,  0,   0,   0,   0,   0,   55,  0,   0,   9,   114, 32,
>+    16,  0,   0,   0,   0,   0,   6,   0,   16,  0,   1,   0,   0,   0,   246, 15,  16,  0,   0,
>+    0,   0,   0,   70,  2,   16,  0,   0,   0,   0,   0,   54,  0,   0,   5,   130, 32,  16,  0,
>+    0,   0,   0,   0,   1,   64,  0,   0,   0,   0,   128, 63,  62,  0,   0,   1,   83,  84,  65,
>+    84,  116, 0,   0,   0,   8,   0,   0,   0,   2,   0,   0,   0,   0,   0,   0,   0,   3,   0,
>+    0,   0,   2,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   2,   0,   0,   0,   1,   0,   0,   0,   1,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0};
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_um_luma_3d_ps.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_um_luma_3d_ps.h
>new file mode 100644
>index 00000000000..7ad48953d82
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_um_luma_3d_ps.h
>@@ -0,0 +1,90 @@
>+#if 0
>+//
>+// Generated by Microsoft (R) HLSL Shader Compiler 9.29.952.3111
>+//
>+//
>+//   fxc /nologo /E PS_FtoF_UM_LUMA_3D /T ps_4_0 /Fh
>+//    compiled\multiplyalpha_ftof_um_luma_3d_ps.h MultiplyAlpha.hlsl
>+//
>+//
>+// Resource Bindings:
>+//
>+// Name                                 Type  Format         Dim Slot Elements
>+// ------------------------------ ---------- ------- ----------- ---- --------
>+// Sampler                           sampler      NA          NA    0        1
>+// TextureF_3D                       texture  float4          3d    0        1
>+//
>+//
>+//
>+// Input signature:
>+//
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_POSITION              0   xyzw        0      POS  float       
>+// SV_RENDERTARGETARRAYINDEX     0   x           1  RTINDEX   uint       
>+// TEXCOORD                 0   xyz         2     NONE  float   xyz 
>+//
>+//
>+// Output signature:
>+//
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_TARGET                0   xyzw        0   TARGET  float   xyzw
>+//
>+ps_4_0
>+dcl_sampler s0, mode_default
>+dcl_resource_texture3d (float,float,float,float) t0
>+dcl_input_ps linear v2.xyz
>+dcl_output o0.xyzw
>+dcl_temps 2
>+sample r0.xyzw, v2.xyzx, t0.xyzw, s0
>+lt r1.x, l(0.000000), r0.w
>+div r0.w, r0.x, r0.w
>+movc o0.xyz, r1.xxxx, r0.wwww, r0.xyzx
>+mov o0.w, l(1.000000)
>+ret 
>+// Approximately 6 instruction slots used
>+#endif
>+
>+const BYTE g_PS_FtoF_UM_LUMA_3D[] = {
>+    68,  88, 66,  67,  77,  171, 194, 196, 97,  109, 120, 177, 44,  223, 143, 94,  184, 55,  24,
>+    193, 1,  0,   0,   0,   252, 2,   0,   0,   5,   0,   0,   0,   52,  0,   0,   0,   224, 0,
>+    0,   0,  104, 1,   0,   0,   156, 1,   0,   0,   128, 2,   0,   0,   82,  68,  69,  70,  164,
>+    0,   0,  0,   0,   0,   0,   0,   0,   0,   0,   0,   2,   0,   0,   0,   28,  0,   0,   0,
>+    0,   4,  255, 255, 0,   1,   0,   0,   112, 0,   0,   0,   92,  0,   0,   0,   3,   0,   0,
>+    0,   0,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,
>+    0,   0,  1,   0,   0,   0,   100, 0,   0,   0,   2,   0,   0,   0,   5,   0,   0,   0,   8,
>+    0,   0,  0,   255, 255, 255, 255, 0,   0,   0,   0,   1,   0,   0,   0,   13,  0,   0,   0,
>+    83,  97, 109, 112, 108, 101, 114, 0,   84,  101, 120, 116, 117, 114, 101, 70,  95,  51,  68,
>+    0,   77, 105, 99,  114, 111, 115, 111, 102, 116, 32,  40,  82,  41,  32,  72,  76,  83,  76,
>+    32,  83, 104, 97,  100, 101, 114, 32,  67,  111, 109, 112, 105, 108, 101, 114, 32,  57,  46,
>+    50,  57, 46,  57,  53,  50,  46,  51,  49,  49,  49,  0,   171, 171, 171, 73,  83,  71,  78,
>+    128, 0,  0,   0,   3,   0,   0,   0,   8,   0,   0,   0,   80,  0,   0,   0,   0,   0,   0,
>+    0,   1,  0,   0,   0,   3,   0,   0,   0,   0,   0,   0,   0,   15,  0,   0,   0,   92,  0,
>+    0,   0,  0,   0,   0,   0,   4,   0,   0,   0,   1,   0,   0,   0,   1,   0,   0,   0,   1,
>+    0,   0,  0,   118, 0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   3,   0,   0,   0,
>+    2,   0,  0,   0,   7,   7,   0,   0,   83,  86,  95,  80,  79,  83,  73,  84,  73,  79,  78,
>+    0,   83, 86,  95,  82,  69,  78,  68,  69,  82,  84,  65,  82,  71,  69,  84,  65,  82,  82,
>+    65,  89, 73,  78,  68,  69,  88,  0,   84,  69,  88,  67,  79,  79,  82,  68,  0,   171, 79,
>+    83,  71, 78,  44,  0,   0,   0,   1,   0,   0,   0,   8,   0,   0,   0,   32,  0,   0,   0,
>+    0,   0,  0,   0,   0,   0,   0,   0,   3,   0,   0,   0,   0,   0,   0,   0,   15,  0,   0,
>+    0,   83, 86,  95,  84,  65,  82,  71,  69,  84,  0,   171, 171, 83,  72,  68,  82,  220, 0,
>+    0,   0,  64,  0,   0,   0,   55,  0,   0,   0,   90,  0,   0,   3,   0,   96,  16,  0,   0,
>+    0,   0,  0,   88,  40,  0,   4,   0,   112, 16,  0,   0,   0,   0,   0,   85,  85,  0,   0,
>+    98,  16, 0,   3,   114, 16,  16,  0,   2,   0,   0,   0,   101, 0,   0,   3,   242, 32,  16,
>+    0,   0,  0,   0,   0,   104, 0,   0,   2,   2,   0,   0,   0,   69,  0,   0,   9,   242, 0,
>+    16,  0,  0,   0,   0,   0,   70,  18,  16,  0,   2,   0,   0,   0,   70,  126, 16,  0,   0,
>+    0,   0,  0,   0,   96,  16,  0,   0,   0,   0,   0,   49,  0,   0,   7,   18,  0,   16,  0,
>+    1,   0,  0,   0,   1,   64,  0,   0,   0,   0,   0,   0,   58,  0,   16,  0,   0,   0,   0,
>+    0,   14, 0,   0,   7,   130, 0,   16,  0,   0,   0,   0,   0,   10,  0,   16,  0,   0,   0,
>+    0,   0,  58,  0,   16,  0,   0,   0,   0,   0,   55,  0,   0,   9,   114, 32,  16,  0,   0,
>+    0,   0,  0,   6,   0,   16,  0,   1,   0,   0,   0,   246, 15,  16,  0,   0,   0,   0,   0,
>+    70,  2,  16,  0,   0,   0,   0,   0,   54,  0,   0,   5,   130, 32,  16,  0,   0,   0,   0,
>+    0,   1,  64,  0,   0,   0,   0,   128, 63,  62,  0,   0,   1,   83,  84,  65,  84,  116, 0,
>+    0,   0,  6,   0,   0,   0,   2,   0,   0,   0,   0,   0,   0,   0,   2,   0,   0,   0,   2,
>+    0,   0,  0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   1,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,  1,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,  0,   0};
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_um_luma_ps.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_um_luma_ps.h
>deleted file mode 100644
>index 5abbb7c3c31..00000000000
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_um_luma_ps.h
>+++ /dev/null
>@@ -1,82 +0,0 @@
>-#if 0
>-//
>-// Generated by Microsoft (R) HLSL Shader Compiler 6.3.9600.16384
>-//
>-//
>-// Resource Bindings:
>-//
>-// Name                                 Type  Format         Dim Slot Elements
>-// ------------------------------ ---------- ------- ----------- ---- --------
>-// Sampler                           sampler      NA          NA    0        1
>-// TextureF                          texture  float4          2d    0        1
>-//
>-//
>-//
>-// Input signature:
>-//
>-// Name                 Index   Mask Register SysValue  Format   Used
>-// -------------------- ----- ------ -------- -------- ------- ------
>-// SV_POSITION              0   xyzw        0      POS   float       
>-// TEXCOORD                 0   xy          1     NONE   float   xy  
>-//
>-//
>-// Output signature:
>-//
>-// Name                 Index   Mask Register SysValue  Format   Used
>-// -------------------- ----- ------ -------- -------- ------- ------
>-// SV_TARGET                0   xyzw        0   TARGET   float   xyzw
>-//
>-ps_4_0
>-dcl_sampler s0, mode_default
>-dcl_resource_texture2d (float,float,float,float) t0
>-dcl_input_ps linear v1.xy
>-dcl_output o0.xyzw
>-dcl_temps 2
>-sample r0.xyzw, v1.xyxx, t0.xyzw, s0
>-lt r1.x, l(0.000000), r0.w
>-div r0.w, r0.x, r0.w
>-movc o0.xyz, r1.xxxx, r0.wwww, r0.xyzx
>-mov o0.w, l(1.000000)
>-ret 
>-// Approximately 6 instruction slots used
>-#endif
>-
>-const BYTE g_PS_FtoF_UM_LUMA[] = {
>-    68,  88,  66,  67,  64,  125, 110, 227, 139, 187, 78,  166, 27,  154, 215, 226, 168, 30,  14,
>-    98,  1,   0,   0,   0,   200, 2,   0,   0,   5,   0,   0,   0,   52,  0,   0,   0,   220, 0,
>-    0,   0,   52,  1,   0,   0,   104, 1,   0,   0,   76,  2,   0,   0,   82,  68,  69,  70,  160,
>-    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   2,   0,   0,   0,   28,  0,   0,   0,
>-    0,   4,   255, 255, 0,   1,   0,   0,   109, 0,   0,   0,   92,  0,   0,   0,   3,   0,   0,
>-    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,
>-    0,   0,   1,   0,   0,   0,   100, 0,   0,   0,   2,   0,   0,   0,   5,   0,   0,   0,   4,
>-    0,   0,   0,   255, 255, 255, 255, 0,   0,   0,   0,   1,   0,   0,   0,   13,  0,   0,   0,
>-    83,  97,  109, 112, 108, 101, 114, 0,   84,  101, 120, 116, 117, 114, 101, 70,  0,   77,  105,
>-    99,  114, 111, 115, 111, 102, 116, 32,  40,  82,  41,  32,  72,  76,  83,  76,  32,  83,  104,
>-    97,  100, 101, 114, 32,  67,  111, 109, 112, 105, 108, 101, 114, 32,  54,  46,  51,  46,  57,
>-    54,  48,  48,  46,  49,  54,  51,  56,  52,  0,   171, 73,  83,  71,  78,  80,  0,   0,   0,
>-    2,   0,   0,   0,   8,   0,   0,   0,   56,  0,   0,   0,   0,   0,   0,   0,   1,   0,   0,
>-    0,   3,   0,   0,   0,   0,   0,   0,   0,   15,  0,   0,   0,   68,  0,   0,   0,   0,   0,
>-    0,   0,   0,   0,   0,   0,   3,   0,   0,   0,   1,   0,   0,   0,   3,   3,   0,   0,   83,
>-    86,  95,  80,  79,  83,  73,  84,  73,  79,  78,  0,   84,  69,  88,  67,  79,  79,  82,  68,
>-    0,   171, 171, 171, 79,  83,  71,  78,  44,  0,   0,   0,   1,   0,   0,   0,   8,   0,   0,
>-    0,   32,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   3,   0,   0,   0,   0,   0,
>-    0,   0,   15,  0,   0,   0,   83,  86,  95,  84,  65,  82,  71,  69,  84,  0,   171, 171, 83,
>-    72,  68,  82,  220, 0,   0,   0,   64,  0,   0,   0,   55,  0,   0,   0,   90,  0,   0,   3,
>-    0,   96,  16,  0,   0,   0,   0,   0,   88,  24,  0,   4,   0,   112, 16,  0,   0,   0,   0,
>-    0,   85,  85,  0,   0,   98,  16,  0,   3,   50,  16,  16,  0,   1,   0,   0,   0,   101, 0,
>-    0,   3,   242, 32,  16,  0,   0,   0,   0,   0,   104, 0,   0,   2,   2,   0,   0,   0,   69,
>-    0,   0,   9,   242, 0,   16,  0,   0,   0,   0,   0,   70,  16,  16,  0,   1,   0,   0,   0,
>-    70,  126, 16,  0,   0,   0,   0,   0,   0,   96,  16,  0,   0,   0,   0,   0,   49,  0,   0,
>-    7,   18,  0,   16,  0,   1,   0,   0,   0,   1,   64,  0,   0,   0,   0,   0,   0,   58,  0,
>-    16,  0,   0,   0,   0,   0,   14,  0,   0,   7,   130, 0,   16,  0,   0,   0,   0,   0,   10,
>-    0,   16,  0,   0,   0,   0,   0,   58,  0,   16,  0,   0,   0,   0,   0,   55,  0,   0,   9,
>-    114, 32,  16,  0,   0,   0,   0,   0,   6,   0,   16,  0,   1,   0,   0,   0,   246, 15,  16,
>-    0,   0,   0,   0,   0,   70,  2,   16,  0,   0,   0,   0,   0,   54,  0,   0,   5,   130, 32,
>-    16,  0,   0,   0,   0,   0,   1,   64,  0,   0,   0,   0,   128, 63,  62,  0,   0,   1,   83,
>-    84,  65,  84,  116, 0,   0,   0,   6,   0,   0,   0,   2,   0,   0,   0,   0,   0,   0,   0,
>-    2,   0,   0,   0,   2,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,
>-    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>-    0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>-    0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,
>-    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>-    0,   0,   0,   0,   0,   0,   0,   0,   0};
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_um_lumaalpha_2d_ps.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_um_lumaalpha_2d_ps.h
>new file mode 100644
>index 00000000000..78c2c25e34c
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_um_lumaalpha_2d_ps.h
>@@ -0,0 +1,86 @@
>+#if 0
>+//
>+// Generated by Microsoft (R) HLSL Shader Compiler 9.29.952.3111
>+//
>+//
>+//   fxc /nologo /E PS_FtoF_UM_LUMAALPHA_2D /T ps_4_0 /Fh
>+//    compiled\multiplyalpha_ftof_um_lumaalpha_2d_ps.h MultiplyAlpha.hlsl
>+//
>+//
>+// Resource Bindings:
>+//
>+// Name                                 Type  Format         Dim Slot Elements
>+// ------------------------------ ---------- ------- ----------- ---- --------
>+// Sampler                           sampler      NA          NA    0        1
>+// TextureF                          texture  float4          2d    0        1
>+//
>+//
>+//
>+// Input signature:
>+//
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_POSITION              0   xyzw        0      POS  float
>+// TEXCOORD                 0   xy          1     NONE  float   xy
>+//
>+//
>+// Output signature:
>+//
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_TARGET                0   xyzw        0   TARGET  float   xyzw
>+//
>+ps_4_0
>+dcl_sampler s0, mode_default
>+dcl_resource_texture2d (float,float,float,float) t0
>+dcl_input_ps linear v1.xy
>+dcl_output o0.xyzw
>+dcl_temps 2
>+sample r0.xyzw, v1.xyxx, t0.xyzw, s0
>+lt r1.x, l(0.000000), r0.w
>+div r1.y, r0.x, r0.w
>+movc o0.xyz, r1.xxxx, r1.yyyy, r0.xyzx
>+mov o0.w, r0.w
>+ret
>+// Approximately 6 instruction slots used
>+#endif
>+
>+const BYTE g_PS_FtoF_UM_LUMAALPHA_2D[] = {
>+    68,  88,  66,  67,  22,  109, 155, 40,  201, 35,  16,  39,  85,  5,   175, 53, 227, 54,  209,
>+    235, 1,   0,   0,   0,   200, 2,   0,   0,   5,   0,   0,   0,   52,  0,   0,  0,   220, 0,
>+    0,   0,   52,  1,   0,   0,   104, 1,   0,   0,   76,  2,   0,   0,   82,  68, 69,  70,  160,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   2,   0,   0,   0,   28, 0,   0,   0,
>+    0,   4,   255, 255, 0,   1,   0,   0,   109, 0,   0,   0,   92,  0,   0,   0,  3,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,  0,   1,   0,
>+    0,   0,   1,   0,   0,   0,   100, 0,   0,   0,   2,   0,   0,   0,   5,   0,  0,   0,   4,
>+    0,   0,   0,   255, 255, 255, 255, 0,   0,   0,   0,   1,   0,   0,   0,   13, 0,   0,   0,
>+    83,  97,  109, 112, 108, 101, 114, 0,   84,  101, 120, 116, 117, 114, 101, 70, 0,   77,  105,
>+    99,  114, 111, 115, 111, 102, 116, 32,  40,  82,  41,  32,  72,  76,  83,  76, 32,  83,  104,
>+    97,  100, 101, 114, 32,  67,  111, 109, 112, 105, 108, 101, 114, 32,  57,  46, 50,  57,  46,
>+    57,  53,  50,  46,  51,  49,  49,  49,  0,   171, 171, 73,  83,  71,  78,  80, 0,   0,   0,
>+    2,   0,   0,   0,   8,   0,   0,   0,   56,  0,   0,   0,   0,   0,   0,   0,  1,   0,   0,
>+    0,   3,   0,   0,   0,   0,   0,   0,   0,   15,  0,   0,   0,   68,  0,   0,  0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   3,   0,   0,   0,   1,   0,   0,   0,   3,   3,  0,   0,   83,
>+    86,  95,  80,  79,  83,  73,  84,  73,  79,  78,  0,   84,  69,  88,  67,  79, 79,  82,  68,
>+    0,   171, 171, 171, 79,  83,  71,  78,  44,  0,   0,   0,   1,   0,   0,   0,  8,   0,   0,
>+    0,   32,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   3,   0,   0,  0,   0,   0,
>+    0,   0,   15,  0,   0,   0,   83,  86,  95,  84,  65,  82,  71,  69,  84,  0,  171, 171, 83,
>+    72,  68,  82,  220, 0,   0,   0,   64,  0,   0,   0,   55,  0,   0,   0,   90, 0,   0,   3,
>+    0,   96,  16,  0,   0,   0,   0,   0,   88,  24,  0,   4,   0,   112, 16,  0,  0,   0,   0,
>+    0,   85,  85,  0,   0,   98,  16,  0,   3,   50,  16,  16,  0,   1,   0,   0,  0,   101, 0,
>+    0,   3,   242, 32,  16,  0,   0,   0,   0,   0,   104, 0,   0,   2,   2,   0,  0,   0,   69,
>+    0,   0,   9,   242, 0,   16,  0,   0,   0,   0,   0,   70,  16,  16,  0,   1,  0,   0,   0,
>+    70,  126, 16,  0,   0,   0,   0,   0,   0,   96,  16,  0,   0,   0,   0,   0,  49,  0,   0,
>+    7,   18,  0,   16,  0,   1,   0,   0,   0,   1,   64,  0,   0,   0,   0,   0,  0,   58,  0,
>+    16,  0,   0,   0,   0,   0,   14,  0,   0,   7,   34,  0,   16,  0,   1,   0,  0,   0,   10,
>+    0,   16,  0,   0,   0,   0,   0,   58,  0,   16,  0,   0,   0,   0,   0,   55, 0,   0,   9,
>+    114, 32,  16,  0,   0,   0,   0,   0,   6,   0,   16,  0,   1,   0,   0,   0,  86,  5,   16,
>+    0,   1,   0,   0,   0,   70,  2,   16,  0,   0,   0,   0,   0,   54,  0,   0,  5,   130, 32,
>+    16,  0,   0,   0,   0,   0,   58,  0,   16,  0,   0,   0,   0,   0,   62,  0,  0,   1,   83,
>+    84,  65,  84,  116, 0,   0,   0,   6,   0,   0,   0,   2,   0,   0,   0,   0,  0,   0,   0,
>+    2,   0,   0,   0,   2,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,  1,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,  0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   0,   0,  0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   1,   0,   0,   0,   0,  0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,  0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0};
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_um_lumaalpha_2darray_ps.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_um_lumaalpha_2darray_ps.h
>new file mode 100644
>index 00000000000..297851ac871
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_um_lumaalpha_2darray_ps.h
>@@ -0,0 +1,96 @@
>+#if 0
>+//
>+// Generated by Microsoft (R) HLSL Shader Compiler 9.29.952.3111
>+//
>+//
>+//   fxc /nologo /E PS_FtoF_UM_LUMAALPHA_2DArray /T ps_4_0 /Fh
>+//    compiled\multiplyalpha_ftof_um_lumaalpha_2darray_ps.h MultiplyAlpha.hlsl
>+//
>+//
>+// Resource Bindings:
>+//
>+// Name                                 Type  Format         Dim Slot Elements
>+// ------------------------------ ---------- ------- ----------- ---- --------
>+// Sampler                           sampler      NA          NA    0        1
>+// TextureF_2DArray                  texture  float4     2darray    0        1
>+//
>+//
>+//
>+// Input signature:
>+//
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_POSITION              0   xyzw        0      POS  float       
>+// SV_RENDERTARGETARRAYINDEX     0   x           1  RTINDEX   uint   x   
>+// TEXCOORD                 0   xyz         2     NONE  float   xy  
>+//
>+//
>+// Output signature:
>+//
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_TARGET                0   xyzw        0   TARGET  float   xyzw
>+//
>+ps_4_0
>+dcl_sampler s0, mode_default
>+dcl_resource_texture2darray (float,float,float,float) t0
>+dcl_input_ps_siv constant v1.x, rendertarget_array_index
>+dcl_input_ps linear v2.xy
>+dcl_output o0.xyzw
>+dcl_temps 2
>+utof r0.z, v1.x
>+mov r0.xy, v2.xyxx
>+sample r0.xyzw, r0.xyzx, t0.xyzw, s0
>+lt r1.x, l(0.000000), r0.w
>+div r1.y, r0.x, r0.w
>+movc o0.xyz, r1.xxxx, r1.yyyy, r0.xyzx
>+mov o0.w, r0.w
>+ret 
>+// Approximately 8 instruction slots used
>+#endif
>+
>+const BYTE g_PS_FtoF_UM_LUMAALPHA_2DArray[] = {
>+    68,  88,  66,  67,  94,  117, 2,   58,  233, 207, 165, 71,  59,  41,  51,  92,  213, 80,  177,
>+    27,  1,   0,   0,   0,   56,  3,   0,   0,   5,   0,   0,   0,   52,  0,   0,   0,   228, 0,
>+    0,   0,   108, 1,   0,   0,   160, 1,   0,   0,   188, 2,   0,   0,   82,  68,  69,  70,  168,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   2,   0,   0,   0,   28,  0,   0,   0,
>+    0,   4,   255, 255, 0,   1,   0,   0,   117, 0,   0,   0,   92,  0,   0,   0,   3,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,
>+    0,   0,   1,   0,   0,   0,   100, 0,   0,   0,   2,   0,   0,   0,   5,   0,   0,   0,   5,
>+    0,   0,   0,   255, 255, 255, 255, 0,   0,   0,   0,   1,   0,   0,   0,   13,  0,   0,   0,
>+    83,  97,  109, 112, 108, 101, 114, 0,   84,  101, 120, 116, 117, 114, 101, 70,  95,  50,  68,
>+    65,  114, 114, 97,  121, 0,   77,  105, 99,  114, 111, 115, 111, 102, 116, 32,  40,  82,  41,
>+    32,  72,  76,  83,  76,  32,  83,  104, 97,  100, 101, 114, 32,  67,  111, 109, 112, 105, 108,
>+    101, 114, 32,  57,  46,  50,  57,  46,  57,  53,  50,  46,  51,  49,  49,  49,  0,   171, 171,
>+    73,  83,  71,  78,  128, 0,   0,   0,   3,   0,   0,   0,   8,   0,   0,   0,   80,  0,   0,
>+    0,   0,   0,   0,   0,   1,   0,   0,   0,   3,   0,   0,   0,   0,   0,   0,   0,   15,  0,
>+    0,   0,   92,  0,   0,   0,   0,   0,   0,   0,   4,   0,   0,   0,   1,   0,   0,   0,   1,
>+    0,   0,   0,   1,   1,   0,   0,   118, 0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    3,   0,   0,   0,   2,   0,   0,   0,   7,   3,   0,   0,   83,  86,  95,  80,  79,  83,  73,
>+    84,  73,  79,  78,  0,   83,  86,  95,  82,  69,  78,  68,  69,  82,  84,  65,  82,  71,  69,
>+    84,  65,  82,  82,  65,  89,  73,  78,  68,  69,  88,  0,   84,  69,  88,  67,  79,  79,  82,
>+    68,  0,   171, 79,  83,  71,  78,  44,  0,   0,   0,   1,   0,   0,   0,   8,   0,   0,   0,
>+    32,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   3,   0,   0,   0,   0,   0,   0,
>+    0,   15,  0,   0,   0,   83,  86,  95,  84,  65,  82,  71,  69,  84,  0,   171, 171, 83,  72,
>+    68,  82,  20,  1,   0,   0,   64,  0,   0,   0,   69,  0,   0,   0,   90,  0,   0,   3,   0,
>+    96,  16,  0,   0,   0,   0,   0,   88,  64,  0,   4,   0,   112, 16,  0,   0,   0,   0,   0,
>+    85,  85,  0,   0,   100, 8,   0,   4,   18,  16,  16,  0,   1,   0,   0,   0,   4,   0,   0,
>+    0,   98,  16,  0,   3,   50,  16,  16,  0,   2,   0,   0,   0,   101, 0,   0,   3,   242, 32,
>+    16,  0,   0,   0,   0,   0,   104, 0,   0,   2,   2,   0,   0,   0,   86,  0,   0,   5,   66,
>+    0,   16,  0,   0,   0,   0,   0,   10,  16,  16,  0,   1,   0,   0,   0,   54,  0,   0,   5,
>+    50,  0,   16,  0,   0,   0,   0,   0,   70,  16,  16,  0,   2,   0,   0,   0,   69,  0,   0,
>+    9,   242, 0,   16,  0,   0,   0,   0,   0,   70,  2,   16,  0,   0,   0,   0,   0,   70,  126,
>+    16,  0,   0,   0,   0,   0,   0,   96,  16,  0,   0,   0,   0,   0,   49,  0,   0,   7,   18,
>+    0,   16,  0,   1,   0,   0,   0,   1,   64,  0,   0,   0,   0,   0,   0,   58,  0,   16,  0,
>+    0,   0,   0,   0,   14,  0,   0,   7,   34,  0,   16,  0,   1,   0,   0,   0,   10,  0,   16,
>+    0,   0,   0,   0,   0,   58,  0,   16,  0,   0,   0,   0,   0,   55,  0,   0,   9,   114, 32,
>+    16,  0,   0,   0,   0,   0,   6,   0,   16,  0,   1,   0,   0,   0,   86,  5,   16,  0,   1,
>+    0,   0,   0,   70,  2,   16,  0,   0,   0,   0,   0,   54,  0,   0,   5,   130, 32,  16,  0,
>+    0,   0,   0,   0,   58,  0,   16,  0,   0,   0,   0,   0,   62,  0,   0,   1,   83,  84,  65,
>+    84,  116, 0,   0,   0,   8,   0,   0,   0,   2,   0,   0,   0,   0,   0,   0,   0,   3,   0,
>+    0,   0,   2,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   2,   0,   0,   0,   1,   0,   0,   0,   1,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0};
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_um_lumaalpha_3d_ps.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_um_lumaalpha_3d_ps.h
>new file mode 100644
>index 00000000000..530391aea64
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_um_lumaalpha_3d_ps.h
>@@ -0,0 +1,90 @@
>+#if 0
>+//
>+// Generated by Microsoft (R) HLSL Shader Compiler 9.29.952.3111
>+//
>+//
>+//   fxc /nologo /E PS_FtoF_UM_LUMAALPHA_3D /T ps_4_0 /Fh
>+//    compiled\multiplyalpha_ftof_um_lumaalpha_3d_ps.h MultiplyAlpha.hlsl
>+//
>+//
>+// Resource Bindings:
>+//
>+// Name                                 Type  Format         Dim Slot Elements
>+// ------------------------------ ---------- ------- ----------- ---- --------
>+// Sampler                           sampler      NA          NA    0        1
>+// TextureF_3D                       texture  float4          3d    0        1
>+//
>+//
>+//
>+// Input signature:
>+//
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_POSITION              0   xyzw        0      POS  float       
>+// SV_RENDERTARGETARRAYINDEX     0   x           1  RTINDEX   uint       
>+// TEXCOORD                 0   xyz         2     NONE  float   xyz 
>+//
>+//
>+// Output signature:
>+//
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_TARGET                0   xyzw        0   TARGET  float   xyzw
>+//
>+ps_4_0
>+dcl_sampler s0, mode_default
>+dcl_resource_texture3d (float,float,float,float) t0
>+dcl_input_ps linear v2.xyz
>+dcl_output o0.xyzw
>+dcl_temps 2
>+sample r0.xyzw, v2.xyzx, t0.xyzw, s0
>+lt r1.x, l(0.000000), r0.w
>+div r1.y, r0.x, r0.w
>+movc o0.xyz, r1.xxxx, r1.yyyy, r0.xyzx
>+mov o0.w, r0.w
>+ret 
>+// Approximately 6 instruction slots used
>+#endif
>+
>+const BYTE g_PS_FtoF_UM_LUMAALPHA_3D[] = {
>+    68,  88, 66,  67,  128, 175, 170, 32,  32,  26,  145, 52,  16,  138, 167, 233, 195, 132, 202,
>+    23,  1,  0,   0,   0,   252, 2,   0,   0,   5,   0,   0,   0,   52,  0,   0,   0,   224, 0,
>+    0,   0,  104, 1,   0,   0,   156, 1,   0,   0,   128, 2,   0,   0,   82,  68,  69,  70,  164,
>+    0,   0,  0,   0,   0,   0,   0,   0,   0,   0,   0,   2,   0,   0,   0,   28,  0,   0,   0,
>+    0,   4,  255, 255, 0,   1,   0,   0,   112, 0,   0,   0,   92,  0,   0,   0,   3,   0,   0,
>+    0,   0,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,
>+    0,   0,  1,   0,   0,   0,   100, 0,   0,   0,   2,   0,   0,   0,   5,   0,   0,   0,   8,
>+    0,   0,  0,   255, 255, 255, 255, 0,   0,   0,   0,   1,   0,   0,   0,   13,  0,   0,   0,
>+    83,  97, 109, 112, 108, 101, 114, 0,   84,  101, 120, 116, 117, 114, 101, 70,  95,  51,  68,
>+    0,   77, 105, 99,  114, 111, 115, 111, 102, 116, 32,  40,  82,  41,  32,  72,  76,  83,  76,
>+    32,  83, 104, 97,  100, 101, 114, 32,  67,  111, 109, 112, 105, 108, 101, 114, 32,  57,  46,
>+    50,  57, 46,  57,  53,  50,  46,  51,  49,  49,  49,  0,   171, 171, 171, 73,  83,  71,  78,
>+    128, 0,  0,   0,   3,   0,   0,   0,   8,   0,   0,   0,   80,  0,   0,   0,   0,   0,   0,
>+    0,   1,  0,   0,   0,   3,   0,   0,   0,   0,   0,   0,   0,   15,  0,   0,   0,   92,  0,
>+    0,   0,  0,   0,   0,   0,   4,   0,   0,   0,   1,   0,   0,   0,   1,   0,   0,   0,   1,
>+    0,   0,  0,   118, 0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   3,   0,   0,   0,
>+    2,   0,  0,   0,   7,   7,   0,   0,   83,  86,  95,  80,  79,  83,  73,  84,  73,  79,  78,
>+    0,   83, 86,  95,  82,  69,  78,  68,  69,  82,  84,  65,  82,  71,  69,  84,  65,  82,  82,
>+    65,  89, 73,  78,  68,  69,  88,  0,   84,  69,  88,  67,  79,  79,  82,  68,  0,   171, 79,
>+    83,  71, 78,  44,  0,   0,   0,   1,   0,   0,   0,   8,   0,   0,   0,   32,  0,   0,   0,
>+    0,   0,  0,   0,   0,   0,   0,   0,   3,   0,   0,   0,   0,   0,   0,   0,   15,  0,   0,
>+    0,   83, 86,  95,  84,  65,  82,  71,  69,  84,  0,   171, 171, 83,  72,  68,  82,  220, 0,
>+    0,   0,  64,  0,   0,   0,   55,  0,   0,   0,   90,  0,   0,   3,   0,   96,  16,  0,   0,
>+    0,   0,  0,   88,  40,  0,   4,   0,   112, 16,  0,   0,   0,   0,   0,   85,  85,  0,   0,
>+    98,  16, 0,   3,   114, 16,  16,  0,   2,   0,   0,   0,   101, 0,   0,   3,   242, 32,  16,
>+    0,   0,  0,   0,   0,   104, 0,   0,   2,   2,   0,   0,   0,   69,  0,   0,   9,   242, 0,
>+    16,  0,  0,   0,   0,   0,   70,  18,  16,  0,   2,   0,   0,   0,   70,  126, 16,  0,   0,
>+    0,   0,  0,   0,   96,  16,  0,   0,   0,   0,   0,   49,  0,   0,   7,   18,  0,   16,  0,
>+    1,   0,  0,   0,   1,   64,  0,   0,   0,   0,   0,   0,   58,  0,   16,  0,   0,   0,   0,
>+    0,   14, 0,   0,   7,   34,  0,   16,  0,   1,   0,   0,   0,   10,  0,   16,  0,   0,   0,
>+    0,   0,  58,  0,   16,  0,   0,   0,   0,   0,   55,  0,   0,   9,   114, 32,  16,  0,   0,
>+    0,   0,  0,   6,   0,   16,  0,   1,   0,   0,   0,   86,  5,   16,  0,   1,   0,   0,   0,
>+    70,  2,  16,  0,   0,   0,   0,   0,   54,  0,   0,   5,   130, 32,  16,  0,   0,   0,   0,
>+    0,   58, 0,   16,  0,   0,   0,   0,   0,   62,  0,   0,   1,   83,  84,  65,  84,  116, 0,
>+    0,   0,  6,   0,   0,   0,   2,   0,   0,   0,   0,   0,   0,   0,   2,   0,   0,   0,   2,
>+    0,   0,  0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   1,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,  1,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,  0,   0};
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_um_lumaalpha_ps.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_um_lumaalpha_ps.h
>deleted file mode 100644
>index d7f8a359576..00000000000
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_um_lumaalpha_ps.h
>+++ /dev/null
>@@ -1,82 +0,0 @@
>-#if 0
>-//
>-// Generated by Microsoft (R) HLSL Shader Compiler 6.3.9600.16384
>-//
>-//
>-// Resource Bindings:
>-//
>-// Name                                 Type  Format         Dim Slot Elements
>-// ------------------------------ ---------- ------- ----------- ---- --------
>-// Sampler                           sampler      NA          NA    0        1
>-// TextureF                          texture  float4          2d    0        1
>-//
>-//
>-//
>-// Input signature:
>-//
>-// Name                 Index   Mask Register SysValue  Format   Used
>-// -------------------- ----- ------ -------- -------- ------- ------
>-// SV_POSITION              0   xyzw        0      POS   float       
>-// TEXCOORD                 0   xy          1     NONE   float   xy  
>-//
>-//
>-// Output signature:
>-//
>-// Name                 Index   Mask Register SysValue  Format   Used
>-// -------------------- ----- ------ -------- -------- ------- ------
>-// SV_TARGET                0   xyzw        0   TARGET   float   xyzw
>-//
>-ps_4_0
>-dcl_sampler s0, mode_default
>-dcl_resource_texture2d (float,float,float,float) t0
>-dcl_input_ps linear v1.xy
>-dcl_output o0.xyzw
>-dcl_temps 2
>-sample r0.xyzw, v1.xyxx, t0.xyzw, s0
>-lt r1.x, l(0.000000), r0.w
>-div r1.y, r0.x, r0.w
>-movc o0.xyz, r1.xxxx, r1.yyyy, r0.xyzx
>-mov o0.w, r0.w
>-ret 
>-// Approximately 6 instruction slots used
>-#endif
>-
>-const BYTE g_PS_FtoF_UM_LUMAALPHA[] = {
>-    68,  88,  66,  67,  108, 4,   157, 10,  254, 47,  42,  8,   219, 0,   94,  160, 25,  199, 73,
>-    60,  1,   0,   0,   0,   200, 2,   0,   0,   5,   0,   0,   0,   52,  0,   0,   0,   220, 0,
>-    0,   0,   52,  1,   0,   0,   104, 1,   0,   0,   76,  2,   0,   0,   82,  68,  69,  70,  160,
>-    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   2,   0,   0,   0,   28,  0,   0,   0,
>-    0,   4,   255, 255, 0,   1,   0,   0,   109, 0,   0,   0,   92,  0,   0,   0,   3,   0,   0,
>-    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,
>-    0,   0,   1,   0,   0,   0,   100, 0,   0,   0,   2,   0,   0,   0,   5,   0,   0,   0,   4,
>-    0,   0,   0,   255, 255, 255, 255, 0,   0,   0,   0,   1,   0,   0,   0,   13,  0,   0,   0,
>-    83,  97,  109, 112, 108, 101, 114, 0,   84,  101, 120, 116, 117, 114, 101, 70,  0,   77,  105,
>-    99,  114, 111, 115, 111, 102, 116, 32,  40,  82,  41,  32,  72,  76,  83,  76,  32,  83,  104,
>-    97,  100, 101, 114, 32,  67,  111, 109, 112, 105, 108, 101, 114, 32,  54,  46,  51,  46,  57,
>-    54,  48,  48,  46,  49,  54,  51,  56,  52,  0,   171, 73,  83,  71,  78,  80,  0,   0,   0,
>-    2,   0,   0,   0,   8,   0,   0,   0,   56,  0,   0,   0,   0,   0,   0,   0,   1,   0,   0,
>-    0,   3,   0,   0,   0,   0,   0,   0,   0,   15,  0,   0,   0,   68,  0,   0,   0,   0,   0,
>-    0,   0,   0,   0,   0,   0,   3,   0,   0,   0,   1,   0,   0,   0,   3,   3,   0,   0,   83,
>-    86,  95,  80,  79,  83,  73,  84,  73,  79,  78,  0,   84,  69,  88,  67,  79,  79,  82,  68,
>-    0,   171, 171, 171, 79,  83,  71,  78,  44,  0,   0,   0,   1,   0,   0,   0,   8,   0,   0,
>-    0,   32,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   3,   0,   0,   0,   0,   0,
>-    0,   0,   15,  0,   0,   0,   83,  86,  95,  84,  65,  82,  71,  69,  84,  0,   171, 171, 83,
>-    72,  68,  82,  220, 0,   0,   0,   64,  0,   0,   0,   55,  0,   0,   0,   90,  0,   0,   3,
>-    0,   96,  16,  0,   0,   0,   0,   0,   88,  24,  0,   4,   0,   112, 16,  0,   0,   0,   0,
>-    0,   85,  85,  0,   0,   98,  16,  0,   3,   50,  16,  16,  0,   1,   0,   0,   0,   101, 0,
>-    0,   3,   242, 32,  16,  0,   0,   0,   0,   0,   104, 0,   0,   2,   2,   0,   0,   0,   69,
>-    0,   0,   9,   242, 0,   16,  0,   0,   0,   0,   0,   70,  16,  16,  0,   1,   0,   0,   0,
>-    70,  126, 16,  0,   0,   0,   0,   0,   0,   96,  16,  0,   0,   0,   0,   0,   49,  0,   0,
>-    7,   18,  0,   16,  0,   1,   0,   0,   0,   1,   64,  0,   0,   0,   0,   0,   0,   58,  0,
>-    16,  0,   0,   0,   0,   0,   14,  0,   0,   7,   34,  0,   16,  0,   1,   0,   0,   0,   10,
>-    0,   16,  0,   0,   0,   0,   0,   58,  0,   16,  0,   0,   0,   0,   0,   55,  0,   0,   9,
>-    114, 32,  16,  0,   0,   0,   0,   0,   6,   0,   16,  0,   1,   0,   0,   0,   86,  5,   16,
>-    0,   1,   0,   0,   0,   70,  2,   16,  0,   0,   0,   0,   0,   54,  0,   0,   5,   130, 32,
>-    16,  0,   0,   0,   0,   0,   58,  0,   16,  0,   0,   0,   0,   0,   62,  0,   0,   1,   83,
>-    84,  65,  84,  116, 0,   0,   0,   6,   0,   0,   0,   2,   0,   0,   0,   0,   0,   0,   0,
>-    2,   0,   0,   0,   2,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,
>-    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>-    0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>-    0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,
>-    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>-    0,   0,   0,   0,   0,   0,   0,   0,   0};
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_um_rgb_2d_ps.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_um_rgb_2d_ps.h
>new file mode 100644
>index 00000000000..bc82ff60f72
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_um_rgb_2d_ps.h
>@@ -0,0 +1,86 @@
>+#if 0
>+//
>+// Generated by Microsoft (R) HLSL Shader Compiler 9.29.952.3111
>+//
>+//
>+//   fxc /nologo /E PS_FtoF_UM_RGB_2D /T ps_4_0 /Fh
>+//    compiled\multiplyalpha_ftof_um_rgb_2d_ps.h MultiplyAlpha.hlsl
>+//
>+//
>+// Resource Bindings:
>+//
>+// Name                                 Type  Format         Dim Slot Elements
>+// ------------------------------ ---------- ------- ----------- ---- --------
>+// Sampler                           sampler      NA          NA    0        1
>+// TextureF                          texture  float4          2d    0        1
>+//
>+//
>+//
>+// Input signature:
>+//
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_POSITION              0   xyzw        0      POS  float
>+// TEXCOORD                 0   xy          1     NONE  float   xy
>+//
>+//
>+// Output signature:
>+//
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_TARGET                0   xyzw        0   TARGET  float   xyzw
>+//
>+ps_4_0
>+dcl_sampler s0, mode_default
>+dcl_resource_texture2d (float,float,float,float) t0
>+dcl_input_ps linear v1.xy
>+dcl_output o0.xyzw
>+dcl_temps 2
>+sample r0.xyzw, v1.xyxx, t0.xyzw, s0
>+lt r1.x, l(0.000000), r0.w
>+div r1.yzw, r0.xxyz, r0.wwww
>+movc o0.xyz, r1.xxxx, r1.yzwy, r0.xyzx
>+mov o0.w, l(1.000000)
>+ret
>+// Approximately 6 instruction slots used
>+#endif
>+
>+const BYTE g_PS_FtoF_UM_RGB_2D[] = {
>+    68,  88,  66,  67,  63,  117, 49,  53,  235, 146, 223, 2,   159, 166, 4,   195, 149, 255, 102,
>+    138, 1,   0,   0,   0,   200, 2,   0,   0,   5,   0,   0,   0,   52,  0,   0,   0,   220, 0,
>+    0,   0,   52,  1,   0,   0,   104, 1,   0,   0,   76,  2,   0,   0,   82,  68,  69,  70,  160,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   2,   0,   0,   0,   28,  0,   0,   0,
>+    0,   4,   255, 255, 0,   1,   0,   0,   109, 0,   0,   0,   92,  0,   0,   0,   3,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,
>+    0,   0,   1,   0,   0,   0,   100, 0,   0,   0,   2,   0,   0,   0,   5,   0,   0,   0,   4,
>+    0,   0,   0,   255, 255, 255, 255, 0,   0,   0,   0,   1,   0,   0,   0,   13,  0,   0,   0,
>+    83,  97,  109, 112, 108, 101, 114, 0,   84,  101, 120, 116, 117, 114, 101, 70,  0,   77,  105,
>+    99,  114, 111, 115, 111, 102, 116, 32,  40,  82,  41,  32,  72,  76,  83,  76,  32,  83,  104,
>+    97,  100, 101, 114, 32,  67,  111, 109, 112, 105, 108, 101, 114, 32,  57,  46,  50,  57,  46,
>+    57,  53,  50,  46,  51,  49,  49,  49,  0,   171, 171, 73,  83,  71,  78,  80,  0,   0,   0,
>+    2,   0,   0,   0,   8,   0,   0,   0,   56,  0,   0,   0,   0,   0,   0,   0,   1,   0,   0,
>+    0,   3,   0,   0,   0,   0,   0,   0,   0,   15,  0,   0,   0,   68,  0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   3,   0,   0,   0,   1,   0,   0,   0,   3,   3,   0,   0,   83,
>+    86,  95,  80,  79,  83,  73,  84,  73,  79,  78,  0,   84,  69,  88,  67,  79,  79,  82,  68,
>+    0,   171, 171, 171, 79,  83,  71,  78,  44,  0,   0,   0,   1,   0,   0,   0,   8,   0,   0,
>+    0,   32,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   3,   0,   0,   0,   0,   0,
>+    0,   0,   15,  0,   0,   0,   83,  86,  95,  84,  65,  82,  71,  69,  84,  0,   171, 171, 83,
>+    72,  68,  82,  220, 0,   0,   0,   64,  0,   0,   0,   55,  0,   0,   0,   90,  0,   0,   3,
>+    0,   96,  16,  0,   0,   0,   0,   0,   88,  24,  0,   4,   0,   112, 16,  0,   0,   0,   0,
>+    0,   85,  85,  0,   0,   98,  16,  0,   3,   50,  16,  16,  0,   1,   0,   0,   0,   101, 0,
>+    0,   3,   242, 32,  16,  0,   0,   0,   0,   0,   104, 0,   0,   2,   2,   0,   0,   0,   69,
>+    0,   0,   9,   242, 0,   16,  0,   0,   0,   0,   0,   70,  16,  16,  0,   1,   0,   0,   0,
>+    70,  126, 16,  0,   0,   0,   0,   0,   0,   96,  16,  0,   0,   0,   0,   0,   49,  0,   0,
>+    7,   18,  0,   16,  0,   1,   0,   0,   0,   1,   64,  0,   0,   0,   0,   0,   0,   58,  0,
>+    16,  0,   0,   0,   0,   0,   14,  0,   0,   7,   226, 0,   16,  0,   1,   0,   0,   0,   6,
>+    9,   16,  0,   0,   0,   0,   0,   246, 15,  16,  0,   0,   0,   0,   0,   55,  0,   0,   9,
>+    114, 32,  16,  0,   0,   0,   0,   0,   6,   0,   16,  0,   1,   0,   0,   0,   150, 7,   16,
>+    0,   1,   0,   0,   0,   70,  2,   16,  0,   0,   0,   0,   0,   54,  0,   0,   5,   130, 32,
>+    16,  0,   0,   0,   0,   0,   1,   64,  0,   0,   0,   0,   128, 63,  62,  0,   0,   1,   83,
>+    84,  65,  84,  116, 0,   0,   0,   6,   0,   0,   0,   2,   0,   0,   0,   0,   0,   0,   0,
>+    2,   0,   0,   0,   2,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0};
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_um_rgb_2darray_ps.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_um_rgb_2darray_ps.h
>new file mode 100644
>index 00000000000..7e9b05f1892
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_um_rgb_2darray_ps.h
>@@ -0,0 +1,96 @@
>+#if 0
>+//
>+// Generated by Microsoft (R) HLSL Shader Compiler 9.29.952.3111
>+//
>+//
>+//   fxc /nologo /E PS_FtoF_UM_RGB_2DArray /T ps_4_0 /Fh
>+//    compiled\multiplyalpha_ftof_um_rgb_2darray_ps.h MultiplyAlpha.hlsl
>+//
>+//
>+// Resource Bindings:
>+//
>+// Name                                 Type  Format         Dim Slot Elements
>+// ------------------------------ ---------- ------- ----------- ---- --------
>+// Sampler                           sampler      NA          NA    0        1
>+// TextureF_2DArray                  texture  float4     2darray    0        1
>+//
>+//
>+//
>+// Input signature:
>+//
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_POSITION              0   xyzw        0      POS  float       
>+// SV_RENDERTARGETARRAYINDEX     0   x           1  RTINDEX   uint   x   
>+// TEXCOORD                 0   xyz         2     NONE  float   xy  
>+//
>+//
>+// Output signature:
>+//
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_TARGET                0   xyzw        0   TARGET  float   xyzw
>+//
>+ps_4_0
>+dcl_sampler s0, mode_default
>+dcl_resource_texture2darray (float,float,float,float) t0
>+dcl_input_ps_siv constant v1.x, rendertarget_array_index
>+dcl_input_ps linear v2.xy
>+dcl_output o0.xyzw
>+dcl_temps 2
>+utof r0.z, v1.x
>+mov r0.xy, v2.xyxx
>+sample r0.xyzw, r0.xyzx, t0.xyzw, s0
>+lt r1.x, l(0.000000), r0.w
>+div r1.yzw, r0.xxyz, r0.wwww
>+movc o0.xyz, r1.xxxx, r1.yzwy, r0.xyzx
>+mov o0.w, l(1.000000)
>+ret 
>+// Approximately 8 instruction slots used
>+#endif
>+
>+const BYTE g_PS_FtoF_UM_RGB_2DArray[] = {
>+    68,  88,  66,  67,  210, 10,  53,  114, 86,  93,  161, 110, 5,   206, 177, 106, 185, 213, 179,
>+    76,  1,   0,   0,   0,   56,  3,   0,   0,   5,   0,   0,   0,   52,  0,   0,   0,   228, 0,
>+    0,   0,   108, 1,   0,   0,   160, 1,   0,   0,   188, 2,   0,   0,   82,  68,  69,  70,  168,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   2,   0,   0,   0,   28,  0,   0,   0,
>+    0,   4,   255, 255, 0,   1,   0,   0,   117, 0,   0,   0,   92,  0,   0,   0,   3,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,
>+    0,   0,   1,   0,   0,   0,   100, 0,   0,   0,   2,   0,   0,   0,   5,   0,   0,   0,   5,
>+    0,   0,   0,   255, 255, 255, 255, 0,   0,   0,   0,   1,   0,   0,   0,   13,  0,   0,   0,
>+    83,  97,  109, 112, 108, 101, 114, 0,   84,  101, 120, 116, 117, 114, 101, 70,  95,  50,  68,
>+    65,  114, 114, 97,  121, 0,   77,  105, 99,  114, 111, 115, 111, 102, 116, 32,  40,  82,  41,
>+    32,  72,  76,  83,  76,  32,  83,  104, 97,  100, 101, 114, 32,  67,  111, 109, 112, 105, 108,
>+    101, 114, 32,  57,  46,  50,  57,  46,  57,  53,  50,  46,  51,  49,  49,  49,  0,   171, 171,
>+    73,  83,  71,  78,  128, 0,   0,   0,   3,   0,   0,   0,   8,   0,   0,   0,   80,  0,   0,
>+    0,   0,   0,   0,   0,   1,   0,   0,   0,   3,   0,   0,   0,   0,   0,   0,   0,   15,  0,
>+    0,   0,   92,  0,   0,   0,   0,   0,   0,   0,   4,   0,   0,   0,   1,   0,   0,   0,   1,
>+    0,   0,   0,   1,   1,   0,   0,   118, 0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    3,   0,   0,   0,   2,   0,   0,   0,   7,   3,   0,   0,   83,  86,  95,  80,  79,  83,  73,
>+    84,  73,  79,  78,  0,   83,  86,  95,  82,  69,  78,  68,  69,  82,  84,  65,  82,  71,  69,
>+    84,  65,  82,  82,  65,  89,  73,  78,  68,  69,  88,  0,   84,  69,  88,  67,  79,  79,  82,
>+    68,  0,   171, 79,  83,  71,  78,  44,  0,   0,   0,   1,   0,   0,   0,   8,   0,   0,   0,
>+    32,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   3,   0,   0,   0,   0,   0,   0,
>+    0,   15,  0,   0,   0,   83,  86,  95,  84,  65,  82,  71,  69,  84,  0,   171, 171, 83,  72,
>+    68,  82,  20,  1,   0,   0,   64,  0,   0,   0,   69,  0,   0,   0,   90,  0,   0,   3,   0,
>+    96,  16,  0,   0,   0,   0,   0,   88,  64,  0,   4,   0,   112, 16,  0,   0,   0,   0,   0,
>+    85,  85,  0,   0,   100, 8,   0,   4,   18,  16,  16,  0,   1,   0,   0,   0,   4,   0,   0,
>+    0,   98,  16,  0,   3,   50,  16,  16,  0,   2,   0,   0,   0,   101, 0,   0,   3,   242, 32,
>+    16,  0,   0,   0,   0,   0,   104, 0,   0,   2,   2,   0,   0,   0,   86,  0,   0,   5,   66,
>+    0,   16,  0,   0,   0,   0,   0,   10,  16,  16,  0,   1,   0,   0,   0,   54,  0,   0,   5,
>+    50,  0,   16,  0,   0,   0,   0,   0,   70,  16,  16,  0,   2,   0,   0,   0,   69,  0,   0,
>+    9,   242, 0,   16,  0,   0,   0,   0,   0,   70,  2,   16,  0,   0,   0,   0,   0,   70,  126,
>+    16,  0,   0,   0,   0,   0,   0,   96,  16,  0,   0,   0,   0,   0,   49,  0,   0,   7,   18,
>+    0,   16,  0,   1,   0,   0,   0,   1,   64,  0,   0,   0,   0,   0,   0,   58,  0,   16,  0,
>+    0,   0,   0,   0,   14,  0,   0,   7,   226, 0,   16,  0,   1,   0,   0,   0,   6,   9,   16,
>+    0,   0,   0,   0,   0,   246, 15,  16,  0,   0,   0,   0,   0,   55,  0,   0,   9,   114, 32,
>+    16,  0,   0,   0,   0,   0,   6,   0,   16,  0,   1,   0,   0,   0,   150, 7,   16,  0,   1,
>+    0,   0,   0,   70,  2,   16,  0,   0,   0,   0,   0,   54,  0,   0,   5,   130, 32,  16,  0,
>+    0,   0,   0,   0,   1,   64,  0,   0,   0,   0,   128, 63,  62,  0,   0,   1,   83,  84,  65,
>+    84,  116, 0,   0,   0,   8,   0,   0,   0,   2,   0,   0,   0,   0,   0,   0,   0,   3,   0,
>+    0,   0,   2,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   2,   0,   0,   0,   1,   0,   0,   0,   1,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0};
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_um_rgb_3d_ps.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_um_rgb_3d_ps.h
>new file mode 100644
>index 00000000000..7af44b30c1e
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_um_rgb_3d_ps.h
>@@ -0,0 +1,90 @@
>+#if 0
>+//
>+// Generated by Microsoft (R) HLSL Shader Compiler 9.29.952.3111
>+//
>+//
>+//   fxc /nologo /E PS_FtoF_UM_RGB_3D /T ps_4_0 /Fh
>+//    compiled\multiplyalpha_ftof_um_rgb_3d_ps.h MultiplyAlpha.hlsl
>+//
>+//
>+// Resource Bindings:
>+//
>+// Name                                 Type  Format         Dim Slot Elements
>+// ------------------------------ ---------- ------- ----------- ---- --------
>+// Sampler                           sampler      NA          NA    0        1
>+// TextureF_3D                       texture  float4          3d    0        1
>+//
>+//
>+//
>+// Input signature:
>+//
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_POSITION              0   xyzw        0      POS  float       
>+// SV_RENDERTARGETARRAYINDEX     0   x           1  RTINDEX   uint       
>+// TEXCOORD                 0   xyz         2     NONE  float   xyz 
>+//
>+//
>+// Output signature:
>+//
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_TARGET                0   xyzw        0   TARGET  float   xyzw
>+//
>+ps_4_0
>+dcl_sampler s0, mode_default
>+dcl_resource_texture3d (float,float,float,float) t0
>+dcl_input_ps linear v2.xyz
>+dcl_output o0.xyzw
>+dcl_temps 2
>+sample r0.xyzw, v2.xyzx, t0.xyzw, s0
>+lt r1.x, l(0.000000), r0.w
>+div r1.yzw, r0.xxyz, r0.wwww
>+movc o0.xyz, r1.xxxx, r1.yzwy, r0.xyzx
>+mov o0.w, l(1.000000)
>+ret 
>+// Approximately 6 instruction slots used
>+#endif
>+
>+const BYTE g_PS_FtoF_UM_RGB_3D[] = {
>+    68,  88, 66,  67,  188, 48,  16,  8,   90,  93,  28,  229, 37,  1,   35,  250, 16,  184, 91,
>+    94,  1,  0,   0,   0,   252, 2,   0,   0,   5,   0,   0,   0,   52,  0,   0,   0,   224, 0,
>+    0,   0,  104, 1,   0,   0,   156, 1,   0,   0,   128, 2,   0,   0,   82,  68,  69,  70,  164,
>+    0,   0,  0,   0,   0,   0,   0,   0,   0,   0,   0,   2,   0,   0,   0,   28,  0,   0,   0,
>+    0,   4,  255, 255, 0,   1,   0,   0,   112, 0,   0,   0,   92,  0,   0,   0,   3,   0,   0,
>+    0,   0,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,
>+    0,   0,  1,   0,   0,   0,   100, 0,   0,   0,   2,   0,   0,   0,   5,   0,   0,   0,   8,
>+    0,   0,  0,   255, 255, 255, 255, 0,   0,   0,   0,   1,   0,   0,   0,   13,  0,   0,   0,
>+    83,  97, 109, 112, 108, 101, 114, 0,   84,  101, 120, 116, 117, 114, 101, 70,  95,  51,  68,
>+    0,   77, 105, 99,  114, 111, 115, 111, 102, 116, 32,  40,  82,  41,  32,  72,  76,  83,  76,
>+    32,  83, 104, 97,  100, 101, 114, 32,  67,  111, 109, 112, 105, 108, 101, 114, 32,  57,  46,
>+    50,  57, 46,  57,  53,  50,  46,  51,  49,  49,  49,  0,   171, 171, 171, 73,  83,  71,  78,
>+    128, 0,  0,   0,   3,   0,   0,   0,   8,   0,   0,   0,   80,  0,   0,   0,   0,   0,   0,
>+    0,   1,  0,   0,   0,   3,   0,   0,   0,   0,   0,   0,   0,   15,  0,   0,   0,   92,  0,
>+    0,   0,  0,   0,   0,   0,   4,   0,   0,   0,   1,   0,   0,   0,   1,   0,   0,   0,   1,
>+    0,   0,  0,   118, 0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   3,   0,   0,   0,
>+    2,   0,  0,   0,   7,   7,   0,   0,   83,  86,  95,  80,  79,  83,  73,  84,  73,  79,  78,
>+    0,   83, 86,  95,  82,  69,  78,  68,  69,  82,  84,  65,  82,  71,  69,  84,  65,  82,  82,
>+    65,  89, 73,  78,  68,  69,  88,  0,   84,  69,  88,  67,  79,  79,  82,  68,  0,   171, 79,
>+    83,  71, 78,  44,  0,   0,   0,   1,   0,   0,   0,   8,   0,   0,   0,   32,  0,   0,   0,
>+    0,   0,  0,   0,   0,   0,   0,   0,   3,   0,   0,   0,   0,   0,   0,   0,   15,  0,   0,
>+    0,   83, 86,  95,  84,  65,  82,  71,  69,  84,  0,   171, 171, 83,  72,  68,  82,  220, 0,
>+    0,   0,  64,  0,   0,   0,   55,  0,   0,   0,   90,  0,   0,   3,   0,   96,  16,  0,   0,
>+    0,   0,  0,   88,  40,  0,   4,   0,   112, 16,  0,   0,   0,   0,   0,   85,  85,  0,   0,
>+    98,  16, 0,   3,   114, 16,  16,  0,   2,   0,   0,   0,   101, 0,   0,   3,   242, 32,  16,
>+    0,   0,  0,   0,   0,   104, 0,   0,   2,   2,   0,   0,   0,   69,  0,   0,   9,   242, 0,
>+    16,  0,  0,   0,   0,   0,   70,  18,  16,  0,   2,   0,   0,   0,   70,  126, 16,  0,   0,
>+    0,   0,  0,   0,   96,  16,  0,   0,   0,   0,   0,   49,  0,   0,   7,   18,  0,   16,  0,
>+    1,   0,  0,   0,   1,   64,  0,   0,   0,   0,   0,   0,   58,  0,   16,  0,   0,   0,   0,
>+    0,   14, 0,   0,   7,   226, 0,   16,  0,   1,   0,   0,   0,   6,   9,   16,  0,   0,   0,
>+    0,   0,  246, 15,  16,  0,   0,   0,   0,   0,   55,  0,   0,   9,   114, 32,  16,  0,   0,
>+    0,   0,  0,   6,   0,   16,  0,   1,   0,   0,   0,   150, 7,   16,  0,   1,   0,   0,   0,
>+    70,  2,  16,  0,   0,   0,   0,   0,   54,  0,   0,   5,   130, 32,  16,  0,   0,   0,   0,
>+    0,   1,  64,  0,   0,   0,   0,   128, 63,  62,  0,   0,   1,   83,  84,  65,  84,  116, 0,
>+    0,   0,  6,   0,   0,   0,   2,   0,   0,   0,   0,   0,   0,   0,   2,   0,   0,   0,   2,
>+    0,   0,  0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   1,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,  1,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,  0,   0};
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_um_rgb_565_2d_ps.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_um_rgb_565_2d_ps.h
>new file mode 100644
>index 00000000000..7bc7ce3a318
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_um_rgb_565_2d_ps.h
>@@ -0,0 +1,94 @@
>+#if 0
>+//
>+// Generated by Microsoft (R) HLSL Shader Compiler 9.29.952.3111
>+//
>+//
>+//   fxc /nologo /E PS_FtoF_UM_RGB_565_2D /T ps_4_0 /Fh
>+//    compiled\multiplyalpha_ftof_um_rgb_565_2d_ps.h MultiplyAlpha.hlsl
>+//
>+//
>+// Resource Bindings:
>+//
>+// Name                                 Type  Format         Dim Slot Elements
>+// ------------------------------ ---------- ------- ----------- ---- --------
>+// Sampler                           sampler      NA          NA    0        1
>+// TextureF                          texture  float4          2d    0        1
>+//
>+//
>+//
>+// Input signature:
>+//
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_POSITION              0   xyzw        0      POS  float
>+// TEXCOORD                 0   xy          1     NONE  float   xy
>+//
>+//
>+// Output signature:
>+//
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_TARGET                0   xyzw        0   TARGET  float   xyzw
>+//
>+ps_4_0
>+dcl_sampler s0, mode_default
>+dcl_resource_texture2d (float,float,float,float) t0
>+dcl_input_ps linear v1.xy
>+dcl_output o0.xyzw
>+dcl_temps 2
>+sample r0.xyzw, v1.xyxx, t0.xyzw, s0
>+lt r1.x, l(0.000000), r0.w
>+div r1.yzw, r0.xxyz, r0.wwww
>+movc r0.xyz, r1.xxxx, r1.yzwy, r0.xyzx
>+mul r0.xyz, r0.xyzx, l(31.000000, 63.000000, 31.000000, 0.000000)
>+round_ne r0.xyz, r0.xyzx
>+mul o0.xyz, r0.xyzx, l(0.032258, 0.015873, 0.032258, 0.000000)
>+mov o0.w, l(1.000000)
>+ret
>+// Approximately 9 instruction slots used
>+#endif
>+
>+const BYTE g_PS_FtoF_UM_RGB_565_2D[] = {
>+    68,  88,  66,  67,  117, 81,  223, 7,   30,  231, 23,  32,  47,  120, 68,  27, 206, 77,  54,
>+    22,  1,   0,   0,   0,   44,  3,   0,   0,   5,   0,   0,   0,   52,  0,   0,  0,   220, 0,
>+    0,   0,   52,  1,   0,   0,   104, 1,   0,   0,   176, 2,   0,   0,   82,  68, 69,  70,  160,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   2,   0,   0,   0,   28, 0,   0,   0,
>+    0,   4,   255, 255, 0,   1,   0,   0,   109, 0,   0,   0,   92,  0,   0,   0,  3,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,  0,   1,   0,
>+    0,   0,   1,   0,   0,   0,   100, 0,   0,   0,   2,   0,   0,   0,   5,   0,  0,   0,   4,
>+    0,   0,   0,   255, 255, 255, 255, 0,   0,   0,   0,   1,   0,   0,   0,   13, 0,   0,   0,
>+    83,  97,  109, 112, 108, 101, 114, 0,   84,  101, 120, 116, 117, 114, 101, 70, 0,   77,  105,
>+    99,  114, 111, 115, 111, 102, 116, 32,  40,  82,  41,  32,  72,  76,  83,  76, 32,  83,  104,
>+    97,  100, 101, 114, 32,  67,  111, 109, 112, 105, 108, 101, 114, 32,  57,  46, 50,  57,  46,
>+    57,  53,  50,  46,  51,  49,  49,  49,  0,   171, 171, 73,  83,  71,  78,  80, 0,   0,   0,
>+    2,   0,   0,   0,   8,   0,   0,   0,   56,  0,   0,   0,   0,   0,   0,   0,  1,   0,   0,
>+    0,   3,   0,   0,   0,   0,   0,   0,   0,   15,  0,   0,   0,   68,  0,   0,  0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   3,   0,   0,   0,   1,   0,   0,   0,   3,   3,  0,   0,   83,
>+    86,  95,  80,  79,  83,  73,  84,  73,  79,  78,  0,   84,  69,  88,  67,  79, 79,  82,  68,
>+    0,   171, 171, 171, 79,  83,  71,  78,  44,  0,   0,   0,   1,   0,   0,   0,  8,   0,   0,
>+    0,   32,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   3,   0,   0,  0,   0,   0,
>+    0,   0,   15,  0,   0,   0,   83,  86,  95,  84,  65,  82,  71,  69,  84,  0,  171, 171, 83,
>+    72,  68,  82,  64,  1,   0,   0,   64,  0,   0,   0,   80,  0,   0,   0,   90, 0,   0,   3,
>+    0,   96,  16,  0,   0,   0,   0,   0,   88,  24,  0,   4,   0,   112, 16,  0,  0,   0,   0,
>+    0,   85,  85,  0,   0,   98,  16,  0,   3,   50,  16,  16,  0,   1,   0,   0,  0,   101, 0,
>+    0,   3,   242, 32,  16,  0,   0,   0,   0,   0,   104, 0,   0,   2,   2,   0,  0,   0,   69,
>+    0,   0,   9,   242, 0,   16,  0,   0,   0,   0,   0,   70,  16,  16,  0,   1,  0,   0,   0,
>+    70,  126, 16,  0,   0,   0,   0,   0,   0,   96,  16,  0,   0,   0,   0,   0,  49,  0,   0,
>+    7,   18,  0,   16,  0,   1,   0,   0,   0,   1,   64,  0,   0,   0,   0,   0,  0,   58,  0,
>+    16,  0,   0,   0,   0,   0,   14,  0,   0,   7,   226, 0,   16,  0,   1,   0,  0,   0,   6,
>+    9,   16,  0,   0,   0,   0,   0,   246, 15,  16,  0,   0,   0,   0,   0,   55, 0,   0,   9,
>+    114, 0,   16,  0,   0,   0,   0,   0,   6,   0,   16,  0,   1,   0,   0,   0,  150, 7,   16,
>+    0,   1,   0,   0,   0,   70,  2,   16,  0,   0,   0,   0,   0,   56,  0,   0,  10,  114, 0,
>+    16,  0,   0,   0,   0,   0,   70,  2,   16,  0,   0,   0,   0,   0,   2,   64, 0,   0,   0,
>+    0,   248, 65,  0,   0,   124, 66,  0,   0,   248, 65,  0,   0,   0,   0,   64, 0,   0,   5,
>+    114, 0,   16,  0,   0,   0,   0,   0,   70,  2,   16,  0,   0,   0,   0,   0,  56,  0,   0,
>+    10,  114, 32,  16,  0,   0,   0,   0,   0,   70,  2,   16,  0,   0,   0,   0,  0,   2,   64,
>+    0,   0,   8,   33,  4,   61,  33,  8,   130, 60,  8,   33,  4,   61,  0,   0,  0,   0,   54,
>+    0,   0,   5,   130, 32,  16,  0,   0,   0,   0,   0,   1,   64,  0,   0,   0,  0,   128, 63,
>+    62,  0,   0,   1,   83,  84,  65,  84,  116, 0,   0,   0,   9,   0,   0,   0,  2,   0,   0,
>+    0,   0,   0,   0,   0,   2,   0,   0,   0,   5,   0,   0,   0,   0,   0,   0,  0,   0,   0,
>+    0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,  0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   0,  0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,  1,   0,   0,
>+    0,   1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,  0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0};
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_um_rgb_565_2darray_ps.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_um_rgb_565_2darray_ps.h
>new file mode 100644
>index 00000000000..e45bb2a2fb1
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_um_rgb_565_2darray_ps.h
>@@ -0,0 +1,104 @@
>+#if 0
>+//
>+// Generated by Microsoft (R) HLSL Shader Compiler 9.29.952.3111
>+//
>+//
>+//   fxc /nologo /E PS_FtoF_UM_RGB_565_2DArray /T ps_4_0 /Fh
>+//    compiled\multiplyalpha_ftof_um_rgb_565_2darray_ps.h MultiplyAlpha.hlsl
>+//
>+//
>+// Resource Bindings:
>+//
>+// Name                                 Type  Format         Dim Slot Elements
>+// ------------------------------ ---------- ------- ----------- ---- --------
>+// Sampler                           sampler      NA          NA    0        1
>+// TextureF_2DArray                  texture  float4     2darray    0        1
>+//
>+//
>+//
>+// Input signature:
>+//
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_POSITION              0   xyzw        0      POS  float       
>+// SV_RENDERTARGETARRAYINDEX     0   x           1  RTINDEX   uint   x   
>+// TEXCOORD                 0   xyz         2     NONE  float   xy  
>+//
>+//
>+// Output signature:
>+//
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_TARGET                0   xyzw        0   TARGET  float   xyzw
>+//
>+ps_4_0
>+dcl_sampler s0, mode_default
>+dcl_resource_texture2darray (float,float,float,float) t0
>+dcl_input_ps_siv constant v1.x, rendertarget_array_index
>+dcl_input_ps linear v2.xy
>+dcl_output o0.xyzw
>+dcl_temps 2
>+utof r0.z, v1.x
>+mov r0.xy, v2.xyxx
>+sample r0.xyzw, r0.xyzx, t0.xyzw, s0
>+lt r1.x, l(0.000000), r0.w
>+div r1.yzw, r0.xxyz, r0.wwww
>+movc r0.xyz, r1.xxxx, r1.yzwy, r0.xyzx
>+mul r0.xyz, r0.xyzx, l(31.000000, 63.000000, 31.000000, 0.000000)
>+round_ne r0.xyz, r0.xyzx
>+mul o0.xyz, r0.xyzx, l(0.032258, 0.015873, 0.032258, 0.000000)
>+mov o0.w, l(1.000000)
>+ret 
>+// Approximately 11 instruction slots used
>+#endif
>+
>+const BYTE g_PS_FtoF_UM_RGB_565_2DArray[] = {
>+    68,  88,  66,  67,  35,  219, 151, 252, 191, 176, 177, 149, 253, 136, 157, 72,  99,  141, 43,
>+    53,  1,   0,   0,   0,   156, 3,   0,   0,   5,   0,   0,   0,   52,  0,   0,   0,   228, 0,
>+    0,   0,   108, 1,   0,   0,   160, 1,   0,   0,   32,  3,   0,   0,   82,  68,  69,  70,  168,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   2,   0,   0,   0,   28,  0,   0,   0,
>+    0,   4,   255, 255, 0,   1,   0,   0,   117, 0,   0,   0,   92,  0,   0,   0,   3,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,
>+    0,   0,   1,   0,   0,   0,   100, 0,   0,   0,   2,   0,   0,   0,   5,   0,   0,   0,   5,
>+    0,   0,   0,   255, 255, 255, 255, 0,   0,   0,   0,   1,   0,   0,   0,   13,  0,   0,   0,
>+    83,  97,  109, 112, 108, 101, 114, 0,   84,  101, 120, 116, 117, 114, 101, 70,  95,  50,  68,
>+    65,  114, 114, 97,  121, 0,   77,  105, 99,  114, 111, 115, 111, 102, 116, 32,  40,  82,  41,
>+    32,  72,  76,  83,  76,  32,  83,  104, 97,  100, 101, 114, 32,  67,  111, 109, 112, 105, 108,
>+    101, 114, 32,  57,  46,  50,  57,  46,  57,  53,  50,  46,  51,  49,  49,  49,  0,   171, 171,
>+    73,  83,  71,  78,  128, 0,   0,   0,   3,   0,   0,   0,   8,   0,   0,   0,   80,  0,   0,
>+    0,   0,   0,   0,   0,   1,   0,   0,   0,   3,   0,   0,   0,   0,   0,   0,   0,   15,  0,
>+    0,   0,   92,  0,   0,   0,   0,   0,   0,   0,   4,   0,   0,   0,   1,   0,   0,   0,   1,
>+    0,   0,   0,   1,   1,   0,   0,   118, 0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    3,   0,   0,   0,   2,   0,   0,   0,   7,   3,   0,   0,   83,  86,  95,  80,  79,  83,  73,
>+    84,  73,  79,  78,  0,   83,  86,  95,  82,  69,  78,  68,  69,  82,  84,  65,  82,  71,  69,
>+    84,  65,  82,  82,  65,  89,  73,  78,  68,  69,  88,  0,   84,  69,  88,  67,  79,  79,  82,
>+    68,  0,   171, 79,  83,  71,  78,  44,  0,   0,   0,   1,   0,   0,   0,   8,   0,   0,   0,
>+    32,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   3,   0,   0,   0,   0,   0,   0,
>+    0,   15,  0,   0,   0,   83,  86,  95,  84,  65,  82,  71,  69,  84,  0,   171, 171, 83,  72,
>+    68,  82,  120, 1,   0,   0,   64,  0,   0,   0,   94,  0,   0,   0,   90,  0,   0,   3,   0,
>+    96,  16,  0,   0,   0,   0,   0,   88,  64,  0,   4,   0,   112, 16,  0,   0,   0,   0,   0,
>+    85,  85,  0,   0,   100, 8,   0,   4,   18,  16,  16,  0,   1,   0,   0,   0,   4,   0,   0,
>+    0,   98,  16,  0,   3,   50,  16,  16,  0,   2,   0,   0,   0,   101, 0,   0,   3,   242, 32,
>+    16,  0,   0,   0,   0,   0,   104, 0,   0,   2,   2,   0,   0,   0,   86,  0,   0,   5,   66,
>+    0,   16,  0,   0,   0,   0,   0,   10,  16,  16,  0,   1,   0,   0,   0,   54,  0,   0,   5,
>+    50,  0,   16,  0,   0,   0,   0,   0,   70,  16,  16,  0,   2,   0,   0,   0,   69,  0,   0,
>+    9,   242, 0,   16,  0,   0,   0,   0,   0,   70,  2,   16,  0,   0,   0,   0,   0,   70,  126,
>+    16,  0,   0,   0,   0,   0,   0,   96,  16,  0,   0,   0,   0,   0,   49,  0,   0,   7,   18,
>+    0,   16,  0,   1,   0,   0,   0,   1,   64,  0,   0,   0,   0,   0,   0,   58,  0,   16,  0,
>+    0,   0,   0,   0,   14,  0,   0,   7,   226, 0,   16,  0,   1,   0,   0,   0,   6,   9,   16,
>+    0,   0,   0,   0,   0,   246, 15,  16,  0,   0,   0,   0,   0,   55,  0,   0,   9,   114, 0,
>+    16,  0,   0,   0,   0,   0,   6,   0,   16,  0,   1,   0,   0,   0,   150, 7,   16,  0,   1,
>+    0,   0,   0,   70,  2,   16,  0,   0,   0,   0,   0,   56,  0,   0,   10,  114, 0,   16,  0,
>+    0,   0,   0,   0,   70,  2,   16,  0,   0,   0,   0,   0,   2,   64,  0,   0,   0,   0,   248,
>+    65,  0,   0,   124, 66,  0,   0,   248, 65,  0,   0,   0,   0,   64,  0,   0,   5,   114, 0,
>+    16,  0,   0,   0,   0,   0,   70,  2,   16,  0,   0,   0,   0,   0,   56,  0,   0,   10,  114,
>+    32,  16,  0,   0,   0,   0,   0,   70,  2,   16,  0,   0,   0,   0,   0,   2,   64,  0,   0,
>+    8,   33,  4,   61,  33,  8,   130, 60,  8,   33,  4,   61,  0,   0,   0,   0,   54,  0,   0,
>+    5,   130, 32,  16,  0,   0,   0,   0,   0,   1,   64,  0,   0,   0,   0,   128, 63,  62,  0,
>+    0,   1,   83,  84,  65,  84,  116, 0,   0,   0,   11,  0,   0,   0,   2,   0,   0,   0,   0,
>+    0,   0,   0,   3,   0,   0,   0,   5,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   2,   0,   0,   0,   1,   0,   0,   0,   2,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0};
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_um_rgb_565_3d_ps.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_um_rgb_565_3d_ps.h
>new file mode 100644
>index 00000000000..7cda8da7e3c
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_um_rgb_565_3d_ps.h
>@@ -0,0 +1,98 @@
>+#if 0
>+//
>+// Generated by Microsoft (R) HLSL Shader Compiler 9.29.952.3111
>+//
>+//
>+//   fxc /nologo /E PS_FtoF_UM_RGB_565_3D /T ps_4_0 /Fh
>+//    compiled\multiplyalpha_ftof_um_rgb_565_3d_ps.h MultiplyAlpha.hlsl
>+//
>+//
>+// Resource Bindings:
>+//
>+// Name                                 Type  Format         Dim Slot Elements
>+// ------------------------------ ---------- ------- ----------- ---- --------
>+// Sampler                           sampler      NA          NA    0        1
>+// TextureF_3D                       texture  float4          3d    0        1
>+//
>+//
>+//
>+// Input signature:
>+//
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_POSITION              0   xyzw        0      POS  float       
>+// SV_RENDERTARGETARRAYINDEX     0   x           1  RTINDEX   uint       
>+// TEXCOORD                 0   xyz         2     NONE  float   xyz 
>+//
>+//
>+// Output signature:
>+//
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_TARGET                0   xyzw        0   TARGET  float   xyzw
>+//
>+ps_4_0
>+dcl_sampler s0, mode_default
>+dcl_resource_texture3d (float,float,float,float) t0
>+dcl_input_ps linear v2.xyz
>+dcl_output o0.xyzw
>+dcl_temps 2
>+sample r0.xyzw, v2.xyzx, t0.xyzw, s0
>+lt r1.x, l(0.000000), r0.w
>+div r1.yzw, r0.xxyz, r0.wwww
>+movc r0.xyz, r1.xxxx, r1.yzwy, r0.xyzx
>+mul r0.xyz, r0.xyzx, l(31.000000, 63.000000, 31.000000, 0.000000)
>+round_ne r0.xyz, r0.xyzx
>+mul o0.xyz, r0.xyzx, l(0.032258, 0.015873, 0.032258, 0.000000)
>+mov o0.w, l(1.000000)
>+ret 
>+// Approximately 9 instruction slots used
>+#endif
>+
>+const BYTE g_PS_FtoF_UM_RGB_565_3D[] = {
>+    68,  88, 66,  67,  103, 213, 3,   101, 235, 72,  224, 234, 90,  115, 96,  192, 84,  122, 216,
>+    161, 1,  0,   0,   0,   96,  3,   0,   0,   5,   0,   0,   0,   52,  0,   0,   0,   224, 0,
>+    0,   0,  104, 1,   0,   0,   156, 1,   0,   0,   228, 2,   0,   0,   82,  68,  69,  70,  164,
>+    0,   0,  0,   0,   0,   0,   0,   0,   0,   0,   0,   2,   0,   0,   0,   28,  0,   0,   0,
>+    0,   4,  255, 255, 0,   1,   0,   0,   112, 0,   0,   0,   92,  0,   0,   0,   3,   0,   0,
>+    0,   0,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,
>+    0,   0,  1,   0,   0,   0,   100, 0,   0,   0,   2,   0,   0,   0,   5,   0,   0,   0,   8,
>+    0,   0,  0,   255, 255, 255, 255, 0,   0,   0,   0,   1,   0,   0,   0,   13,  0,   0,   0,
>+    83,  97, 109, 112, 108, 101, 114, 0,   84,  101, 120, 116, 117, 114, 101, 70,  95,  51,  68,
>+    0,   77, 105, 99,  114, 111, 115, 111, 102, 116, 32,  40,  82,  41,  32,  72,  76,  83,  76,
>+    32,  83, 104, 97,  100, 101, 114, 32,  67,  111, 109, 112, 105, 108, 101, 114, 32,  57,  46,
>+    50,  57, 46,  57,  53,  50,  46,  51,  49,  49,  49,  0,   171, 171, 171, 73,  83,  71,  78,
>+    128, 0,  0,   0,   3,   0,   0,   0,   8,   0,   0,   0,   80,  0,   0,   0,   0,   0,   0,
>+    0,   1,  0,   0,   0,   3,   0,   0,   0,   0,   0,   0,   0,   15,  0,   0,   0,   92,  0,
>+    0,   0,  0,   0,   0,   0,   4,   0,   0,   0,   1,   0,   0,   0,   1,   0,   0,   0,   1,
>+    0,   0,  0,   118, 0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   3,   0,   0,   0,
>+    2,   0,  0,   0,   7,   7,   0,   0,   83,  86,  95,  80,  79,  83,  73,  84,  73,  79,  78,
>+    0,   83, 86,  95,  82,  69,  78,  68,  69,  82,  84,  65,  82,  71,  69,  84,  65,  82,  82,
>+    65,  89, 73,  78,  68,  69,  88,  0,   84,  69,  88,  67,  79,  79,  82,  68,  0,   171, 79,
>+    83,  71, 78,  44,  0,   0,   0,   1,   0,   0,   0,   8,   0,   0,   0,   32,  0,   0,   0,
>+    0,   0,  0,   0,   0,   0,   0,   0,   3,   0,   0,   0,   0,   0,   0,   0,   15,  0,   0,
>+    0,   83, 86,  95,  84,  65,  82,  71,  69,  84,  0,   171, 171, 83,  72,  68,  82,  64,  1,
>+    0,   0,  64,  0,   0,   0,   80,  0,   0,   0,   90,  0,   0,   3,   0,   96,  16,  0,   0,
>+    0,   0,  0,   88,  40,  0,   4,   0,   112, 16,  0,   0,   0,   0,   0,   85,  85,  0,   0,
>+    98,  16, 0,   3,   114, 16,  16,  0,   2,   0,   0,   0,   101, 0,   0,   3,   242, 32,  16,
>+    0,   0,  0,   0,   0,   104, 0,   0,   2,   2,   0,   0,   0,   69,  0,   0,   9,   242, 0,
>+    16,  0,  0,   0,   0,   0,   70,  18,  16,  0,   2,   0,   0,   0,   70,  126, 16,  0,   0,
>+    0,   0,  0,   0,   96,  16,  0,   0,   0,   0,   0,   49,  0,   0,   7,   18,  0,   16,  0,
>+    1,   0,  0,   0,   1,   64,  0,   0,   0,   0,   0,   0,   58,  0,   16,  0,   0,   0,   0,
>+    0,   14, 0,   0,   7,   226, 0,   16,  0,   1,   0,   0,   0,   6,   9,   16,  0,   0,   0,
>+    0,   0,  246, 15,  16,  0,   0,   0,   0,   0,   55,  0,   0,   9,   114, 0,   16,  0,   0,
>+    0,   0,  0,   6,   0,   16,  0,   1,   0,   0,   0,   150, 7,   16,  0,   1,   0,   0,   0,
>+    70,  2,  16,  0,   0,   0,   0,   0,   56,  0,   0,   10,  114, 0,   16,  0,   0,   0,   0,
>+    0,   70, 2,   16,  0,   0,   0,   0,   0,   2,   64,  0,   0,   0,   0,   248, 65,  0,   0,
>+    124, 66, 0,   0,   248, 65,  0,   0,   0,   0,   64,  0,   0,   5,   114, 0,   16,  0,   0,
>+    0,   0,  0,   70,  2,   16,  0,   0,   0,   0,   0,   56,  0,   0,   10,  114, 32,  16,  0,
>+    0,   0,  0,   0,   70,  2,   16,  0,   0,   0,   0,   0,   2,   64,  0,   0,   8,   33,  4,
>+    61,  33, 8,   130, 60,  8,   33,  4,   61,  0,   0,   0,   0,   54,  0,   0,   5,   130, 32,
>+    16,  0,  0,   0,   0,   0,   1,   64,  0,   0,   0,   0,   128, 63,  62,  0,   0,   1,   83,
>+    84,  65, 84,  116, 0,   0,   0,   9,   0,   0,   0,   2,   0,   0,   0,   0,   0,   0,   0,
>+    2,   0,  0,   0,   5,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,
>+    0,   0,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,  0,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,  0,   0,   0,   0,   0,   1,   0,   0,   0,   1,   0,   0,   0,   1,   0,   0,   0,
>+    0,   0,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,  0,   0,   0,   0,   0,   0,   0};
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_um_rgb_ps.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_um_rgb_ps.h
>deleted file mode 100644
>index 4289168398c..00000000000
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_um_rgb_ps.h
>+++ /dev/null
>@@ -1,82 +0,0 @@
>-#if 0
>-//
>-// Generated by Microsoft (R) HLSL Shader Compiler 6.3.9600.16384
>-//
>-//
>-// Resource Bindings:
>-//
>-// Name                                 Type  Format         Dim Slot Elements
>-// ------------------------------ ---------- ------- ----------- ---- --------
>-// Sampler                           sampler      NA          NA    0        1
>-// TextureF                          texture  float4          2d    0        1
>-//
>-//
>-//
>-// Input signature:
>-//
>-// Name                 Index   Mask Register SysValue  Format   Used
>-// -------------------- ----- ------ -------- -------- ------- ------
>-// SV_POSITION              0   xyzw        0      POS   float       
>-// TEXCOORD                 0   xy          1     NONE   float   xy  
>-//
>-//
>-// Output signature:
>-//
>-// Name                 Index   Mask Register SysValue  Format   Used
>-// -------------------- ----- ------ -------- -------- ------- ------
>-// SV_TARGET                0   xyzw        0   TARGET   float   xyzw
>-//
>-ps_4_0
>-dcl_sampler s0, mode_default
>-dcl_resource_texture2d (float,float,float,float) t0
>-dcl_input_ps linear v1.xy
>-dcl_output o0.xyzw
>-dcl_temps 2
>-sample r0.xyzw, v1.xyxx, t0.xyzw, s0
>-lt r1.x, l(0.000000), r0.w
>-div r1.yzw, r0.xxyz, r0.wwww
>-movc o0.xyz, r1.xxxx, r1.yzwy, r0.xyzx
>-mov o0.w, l(1.000000)
>-ret 
>-// Approximately 6 instruction slots used
>-#endif
>-
>-const BYTE g_PS_FtoF_UM_RGB[] = {
>-    68,  88,  66,  67,  14,  170, 220, 126, 255, 181, 163, 175, 235, 22,  242, 166, 140, 110, 63,
>-    74,  1,   0,   0,   0,   200, 2,   0,   0,   5,   0,   0,   0,   52,  0,   0,   0,   220, 0,
>-    0,   0,   52,  1,   0,   0,   104, 1,   0,   0,   76,  2,   0,   0,   82,  68,  69,  70,  160,
>-    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   2,   0,   0,   0,   28,  0,   0,   0,
>-    0,   4,   255, 255, 0,   1,   0,   0,   109, 0,   0,   0,   92,  0,   0,   0,   3,   0,   0,
>-    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,
>-    0,   0,   1,   0,   0,   0,   100, 0,   0,   0,   2,   0,   0,   0,   5,   0,   0,   0,   4,
>-    0,   0,   0,   255, 255, 255, 255, 0,   0,   0,   0,   1,   0,   0,   0,   13,  0,   0,   0,
>-    83,  97,  109, 112, 108, 101, 114, 0,   84,  101, 120, 116, 117, 114, 101, 70,  0,   77,  105,
>-    99,  114, 111, 115, 111, 102, 116, 32,  40,  82,  41,  32,  72,  76,  83,  76,  32,  83,  104,
>-    97,  100, 101, 114, 32,  67,  111, 109, 112, 105, 108, 101, 114, 32,  54,  46,  51,  46,  57,
>-    54,  48,  48,  46,  49,  54,  51,  56,  52,  0,   171, 73,  83,  71,  78,  80,  0,   0,   0,
>-    2,   0,   0,   0,   8,   0,   0,   0,   56,  0,   0,   0,   0,   0,   0,   0,   1,   0,   0,
>-    0,   3,   0,   0,   0,   0,   0,   0,   0,   15,  0,   0,   0,   68,  0,   0,   0,   0,   0,
>-    0,   0,   0,   0,   0,   0,   3,   0,   0,   0,   1,   0,   0,   0,   3,   3,   0,   0,   83,
>-    86,  95,  80,  79,  83,  73,  84,  73,  79,  78,  0,   84,  69,  88,  67,  79,  79,  82,  68,
>-    0,   171, 171, 171, 79,  83,  71,  78,  44,  0,   0,   0,   1,   0,   0,   0,   8,   0,   0,
>-    0,   32,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   3,   0,   0,   0,   0,   0,
>-    0,   0,   15,  0,   0,   0,   83,  86,  95,  84,  65,  82,  71,  69,  84,  0,   171, 171, 83,
>-    72,  68,  82,  220, 0,   0,   0,   64,  0,   0,   0,   55,  0,   0,   0,   90,  0,   0,   3,
>-    0,   96,  16,  0,   0,   0,   0,   0,   88,  24,  0,   4,   0,   112, 16,  0,   0,   0,   0,
>-    0,   85,  85,  0,   0,   98,  16,  0,   3,   50,  16,  16,  0,   1,   0,   0,   0,   101, 0,
>-    0,   3,   242, 32,  16,  0,   0,   0,   0,   0,   104, 0,   0,   2,   2,   0,   0,   0,   69,
>-    0,   0,   9,   242, 0,   16,  0,   0,   0,   0,   0,   70,  16,  16,  0,   1,   0,   0,   0,
>-    70,  126, 16,  0,   0,   0,   0,   0,   0,   96,  16,  0,   0,   0,   0,   0,   49,  0,   0,
>-    7,   18,  0,   16,  0,   1,   0,   0,   0,   1,   64,  0,   0,   0,   0,   0,   0,   58,  0,
>-    16,  0,   0,   0,   0,   0,   14,  0,   0,   7,   226, 0,   16,  0,   1,   0,   0,   0,   6,
>-    9,   16,  0,   0,   0,   0,   0,   246, 15,  16,  0,   0,   0,   0,   0,   55,  0,   0,   9,
>-    114, 32,  16,  0,   0,   0,   0,   0,   6,   0,   16,  0,   1,   0,   0,   0,   150, 7,   16,
>-    0,   1,   0,   0,   0,   70,  2,   16,  0,   0,   0,   0,   0,   54,  0,   0,   5,   130, 32,
>-    16,  0,   0,   0,   0,   0,   1,   64,  0,   0,   0,   0,   128, 63,  62,  0,   0,   1,   83,
>-    84,  65,  84,  116, 0,   0,   0,   6,   0,   0,   0,   2,   0,   0,   0,   0,   0,   0,   0,
>-    2,   0,   0,   0,   2,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,
>-    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>-    0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>-    0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,
>-    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>-    0,   0,   0,   0,   0,   0,   0,   0,   0};
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_um_rgba_2d_ps.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_um_rgba_2d_ps.h
>new file mode 100644
>index 00000000000..ba9d3a219b6
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_um_rgba_2d_ps.h
>@@ -0,0 +1,86 @@
>+#if 0
>+//
>+// Generated by Microsoft (R) HLSL Shader Compiler 9.29.952.3111
>+//
>+//
>+//   fxc /nologo /E PS_FtoF_UM_RGBA_2D /T ps_4_0 /Fh
>+//    compiled\multiplyalpha_ftof_um_rgba_2d_ps.h MultiplyAlpha.hlsl
>+//
>+//
>+// Resource Bindings:
>+//
>+// Name                                 Type  Format         Dim Slot Elements
>+// ------------------------------ ---------- ------- ----------- ---- --------
>+// Sampler                           sampler      NA          NA    0        1
>+// TextureF                          texture  float4          2d    0        1
>+//
>+//
>+//
>+// Input signature:
>+//
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_POSITION              0   xyzw        0      POS  float
>+// TEXCOORD                 0   xy          1     NONE  float   xy
>+//
>+//
>+// Output signature:
>+//
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_TARGET                0   xyzw        0   TARGET  float   xyzw
>+//
>+ps_4_0
>+dcl_sampler s0, mode_default
>+dcl_resource_texture2d (float,float,float,float) t0
>+dcl_input_ps linear v1.xy
>+dcl_output o0.xyzw
>+dcl_temps 2
>+sample r0.xyzw, v1.xyxx, t0.xyzw, s0
>+lt r1.x, l(0.000000), r0.w
>+div r1.yzw, r0.xxyz, r0.wwww
>+movc o0.xyz, r1.xxxx, r1.yzwy, r0.xyzx
>+mov o0.w, r0.w
>+ret
>+// Approximately 6 instruction slots used
>+#endif
>+
>+const BYTE g_PS_FtoF_UM_RGBA_2D[] = {
>+    68,  88,  66,  67,  214, 130, 152, 233, 185, 254, 78,  247, 13,  195, 81,  12, 126, 13,  130,
>+    154, 1,   0,   0,   0,   200, 2,   0,   0,   5,   0,   0,   0,   52,  0,   0,  0,   220, 0,
>+    0,   0,   52,  1,   0,   0,   104, 1,   0,   0,   76,  2,   0,   0,   82,  68, 69,  70,  160,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   2,   0,   0,   0,   28, 0,   0,   0,
>+    0,   4,   255, 255, 0,   1,   0,   0,   109, 0,   0,   0,   92,  0,   0,   0,  3,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,  0,   1,   0,
>+    0,   0,   1,   0,   0,   0,   100, 0,   0,   0,   2,   0,   0,   0,   5,   0,  0,   0,   4,
>+    0,   0,   0,   255, 255, 255, 255, 0,   0,   0,   0,   1,   0,   0,   0,   13, 0,   0,   0,
>+    83,  97,  109, 112, 108, 101, 114, 0,   84,  101, 120, 116, 117, 114, 101, 70, 0,   77,  105,
>+    99,  114, 111, 115, 111, 102, 116, 32,  40,  82,  41,  32,  72,  76,  83,  76, 32,  83,  104,
>+    97,  100, 101, 114, 32,  67,  111, 109, 112, 105, 108, 101, 114, 32,  57,  46, 50,  57,  46,
>+    57,  53,  50,  46,  51,  49,  49,  49,  0,   171, 171, 73,  83,  71,  78,  80, 0,   0,   0,
>+    2,   0,   0,   0,   8,   0,   0,   0,   56,  0,   0,   0,   0,   0,   0,   0,  1,   0,   0,
>+    0,   3,   0,   0,   0,   0,   0,   0,   0,   15,  0,   0,   0,   68,  0,   0,  0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   3,   0,   0,   0,   1,   0,   0,   0,   3,   3,  0,   0,   83,
>+    86,  95,  80,  79,  83,  73,  84,  73,  79,  78,  0,   84,  69,  88,  67,  79, 79,  82,  68,
>+    0,   171, 171, 171, 79,  83,  71,  78,  44,  0,   0,   0,   1,   0,   0,   0,  8,   0,   0,
>+    0,   32,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   3,   0,   0,  0,   0,   0,
>+    0,   0,   15,  0,   0,   0,   83,  86,  95,  84,  65,  82,  71,  69,  84,  0,  171, 171, 83,
>+    72,  68,  82,  220, 0,   0,   0,   64,  0,   0,   0,   55,  0,   0,   0,   90, 0,   0,   3,
>+    0,   96,  16,  0,   0,   0,   0,   0,   88,  24,  0,   4,   0,   112, 16,  0,  0,   0,   0,
>+    0,   85,  85,  0,   0,   98,  16,  0,   3,   50,  16,  16,  0,   1,   0,   0,  0,   101, 0,
>+    0,   3,   242, 32,  16,  0,   0,   0,   0,   0,   104, 0,   0,   2,   2,   0,  0,   0,   69,
>+    0,   0,   9,   242, 0,   16,  0,   0,   0,   0,   0,   70,  16,  16,  0,   1,  0,   0,   0,
>+    70,  126, 16,  0,   0,   0,   0,   0,   0,   96,  16,  0,   0,   0,   0,   0,  49,  0,   0,
>+    7,   18,  0,   16,  0,   1,   0,   0,   0,   1,   64,  0,   0,   0,   0,   0,  0,   58,  0,
>+    16,  0,   0,   0,   0,   0,   14,  0,   0,   7,   226, 0,   16,  0,   1,   0,  0,   0,   6,
>+    9,   16,  0,   0,   0,   0,   0,   246, 15,  16,  0,   0,   0,   0,   0,   55, 0,   0,   9,
>+    114, 32,  16,  0,   0,   0,   0,   0,   6,   0,   16,  0,   1,   0,   0,   0,  150, 7,   16,
>+    0,   1,   0,   0,   0,   70,  2,   16,  0,   0,   0,   0,   0,   54,  0,   0,  5,   130, 32,
>+    16,  0,   0,   0,   0,   0,   58,  0,   16,  0,   0,   0,   0,   0,   62,  0,  0,   1,   83,
>+    84,  65,  84,  116, 0,   0,   0,   6,   0,   0,   0,   2,   0,   0,   0,   0,  0,   0,   0,
>+    2,   0,   0,   0,   2,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,  1,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,  0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   0,   0,  0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   1,   0,   0,   0,   0,  0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,  0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0};
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_um_rgba_2darray_ps.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_um_rgba_2darray_ps.h
>new file mode 100644
>index 00000000000..8fde37e269c
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_um_rgba_2darray_ps.h
>@@ -0,0 +1,96 @@
>+#if 0
>+//
>+// Generated by Microsoft (R) HLSL Shader Compiler 9.29.952.3111
>+//
>+//
>+//   fxc /nologo /E PS_FtoF_UM_RGBA_2DArray /T ps_4_0 /Fh
>+//    compiled\multiplyalpha_ftof_um_rgba_2darray_ps.h MultiplyAlpha.hlsl
>+//
>+//
>+// Resource Bindings:
>+//
>+// Name                                 Type  Format         Dim Slot Elements
>+// ------------------------------ ---------- ------- ----------- ---- --------
>+// Sampler                           sampler      NA          NA    0        1
>+// TextureF_2DArray                  texture  float4     2darray    0        1
>+//
>+//
>+//
>+// Input signature:
>+//
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_POSITION              0   xyzw        0      POS  float       
>+// SV_RENDERTARGETARRAYINDEX     0   x           1  RTINDEX   uint   x   
>+// TEXCOORD                 0   xyz         2     NONE  float   xy  
>+//
>+//
>+// Output signature:
>+//
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_TARGET                0   xyzw        0   TARGET  float   xyzw
>+//
>+ps_4_0
>+dcl_sampler s0, mode_default
>+dcl_resource_texture2darray (float,float,float,float) t0
>+dcl_input_ps_siv constant v1.x, rendertarget_array_index
>+dcl_input_ps linear v2.xy
>+dcl_output o0.xyzw
>+dcl_temps 2
>+utof r0.z, v1.x
>+mov r0.xy, v2.xyxx
>+sample r0.xyzw, r0.xyzx, t0.xyzw, s0
>+lt r1.x, l(0.000000), r0.w
>+div r1.yzw, r0.xxyz, r0.wwww
>+movc o0.xyz, r1.xxxx, r1.yzwy, r0.xyzx
>+mov o0.w, r0.w
>+ret 
>+// Approximately 8 instruction slots used
>+#endif
>+
>+const BYTE g_PS_FtoF_UM_RGBA_2DArray[] = {
>+    68,  88,  66,  67,  94,  112, 50,  105, 113, 109, 240, 60,  172, 113, 184, 242, 235, 87,  64,
>+    32,  1,   0,   0,   0,   56,  3,   0,   0,   5,   0,   0,   0,   52,  0,   0,   0,   228, 0,
>+    0,   0,   108, 1,   0,   0,   160, 1,   0,   0,   188, 2,   0,   0,   82,  68,  69,  70,  168,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   2,   0,   0,   0,   28,  0,   0,   0,
>+    0,   4,   255, 255, 0,   1,   0,   0,   117, 0,   0,   0,   92,  0,   0,   0,   3,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,
>+    0,   0,   1,   0,   0,   0,   100, 0,   0,   0,   2,   0,   0,   0,   5,   0,   0,   0,   5,
>+    0,   0,   0,   255, 255, 255, 255, 0,   0,   0,   0,   1,   0,   0,   0,   13,  0,   0,   0,
>+    83,  97,  109, 112, 108, 101, 114, 0,   84,  101, 120, 116, 117, 114, 101, 70,  95,  50,  68,
>+    65,  114, 114, 97,  121, 0,   77,  105, 99,  114, 111, 115, 111, 102, 116, 32,  40,  82,  41,
>+    32,  72,  76,  83,  76,  32,  83,  104, 97,  100, 101, 114, 32,  67,  111, 109, 112, 105, 108,
>+    101, 114, 32,  57,  46,  50,  57,  46,  57,  53,  50,  46,  51,  49,  49,  49,  0,   171, 171,
>+    73,  83,  71,  78,  128, 0,   0,   0,   3,   0,   0,   0,   8,   0,   0,   0,   80,  0,   0,
>+    0,   0,   0,   0,   0,   1,   0,   0,   0,   3,   0,   0,   0,   0,   0,   0,   0,   15,  0,
>+    0,   0,   92,  0,   0,   0,   0,   0,   0,   0,   4,   0,   0,   0,   1,   0,   0,   0,   1,
>+    0,   0,   0,   1,   1,   0,   0,   118, 0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    3,   0,   0,   0,   2,   0,   0,   0,   7,   3,   0,   0,   83,  86,  95,  80,  79,  83,  73,
>+    84,  73,  79,  78,  0,   83,  86,  95,  82,  69,  78,  68,  69,  82,  84,  65,  82,  71,  69,
>+    84,  65,  82,  82,  65,  89,  73,  78,  68,  69,  88,  0,   84,  69,  88,  67,  79,  79,  82,
>+    68,  0,   171, 79,  83,  71,  78,  44,  0,   0,   0,   1,   0,   0,   0,   8,   0,   0,   0,
>+    32,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   3,   0,   0,   0,   0,   0,   0,
>+    0,   15,  0,   0,   0,   83,  86,  95,  84,  65,  82,  71,  69,  84,  0,   171, 171, 83,  72,
>+    68,  82,  20,  1,   0,   0,   64,  0,   0,   0,   69,  0,   0,   0,   90,  0,   0,   3,   0,
>+    96,  16,  0,   0,   0,   0,   0,   88,  64,  0,   4,   0,   112, 16,  0,   0,   0,   0,   0,
>+    85,  85,  0,   0,   100, 8,   0,   4,   18,  16,  16,  0,   1,   0,   0,   0,   4,   0,   0,
>+    0,   98,  16,  0,   3,   50,  16,  16,  0,   2,   0,   0,   0,   101, 0,   0,   3,   242, 32,
>+    16,  0,   0,   0,   0,   0,   104, 0,   0,   2,   2,   0,   0,   0,   86,  0,   0,   5,   66,
>+    0,   16,  0,   0,   0,   0,   0,   10,  16,  16,  0,   1,   0,   0,   0,   54,  0,   0,   5,
>+    50,  0,   16,  0,   0,   0,   0,   0,   70,  16,  16,  0,   2,   0,   0,   0,   69,  0,   0,
>+    9,   242, 0,   16,  0,   0,   0,   0,   0,   70,  2,   16,  0,   0,   0,   0,   0,   70,  126,
>+    16,  0,   0,   0,   0,   0,   0,   96,  16,  0,   0,   0,   0,   0,   49,  0,   0,   7,   18,
>+    0,   16,  0,   1,   0,   0,   0,   1,   64,  0,   0,   0,   0,   0,   0,   58,  0,   16,  0,
>+    0,   0,   0,   0,   14,  0,   0,   7,   226, 0,   16,  0,   1,   0,   0,   0,   6,   9,   16,
>+    0,   0,   0,   0,   0,   246, 15,  16,  0,   0,   0,   0,   0,   55,  0,   0,   9,   114, 32,
>+    16,  0,   0,   0,   0,   0,   6,   0,   16,  0,   1,   0,   0,   0,   150, 7,   16,  0,   1,
>+    0,   0,   0,   70,  2,   16,  0,   0,   0,   0,   0,   54,  0,   0,   5,   130, 32,  16,  0,
>+    0,   0,   0,   0,   58,  0,   16,  0,   0,   0,   0,   0,   62,  0,   0,   1,   83,  84,  65,
>+    84,  116, 0,   0,   0,   8,   0,   0,   0,   2,   0,   0,   0,   0,   0,   0,   0,   3,   0,
>+    0,   0,   2,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   2,   0,   0,   0,   1,   0,   0,   0,   1,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0};
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_um_rgba_3d_ps.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_um_rgba_3d_ps.h
>new file mode 100644
>index 00000000000..b3589c67535
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_um_rgba_3d_ps.h
>@@ -0,0 +1,90 @@
>+#if 0
>+//
>+// Generated by Microsoft (R) HLSL Shader Compiler 9.29.952.3111
>+//
>+//
>+//   fxc /nologo /E PS_FtoF_UM_RGBA_3D /T ps_4_0 /Fh
>+//    compiled\multiplyalpha_ftof_um_rgba_3d_ps.h MultiplyAlpha.hlsl
>+//
>+//
>+// Resource Bindings:
>+//
>+// Name                                 Type  Format         Dim Slot Elements
>+// ------------------------------ ---------- ------- ----------- ---- --------
>+// Sampler                           sampler      NA          NA    0        1
>+// TextureF_3D                       texture  float4          3d    0        1
>+//
>+//
>+//
>+// Input signature:
>+//
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_POSITION              0   xyzw        0      POS  float       
>+// SV_RENDERTARGETARRAYINDEX     0   x           1  RTINDEX   uint       
>+// TEXCOORD                 0   xyz         2     NONE  float   xyz 
>+//
>+//
>+// Output signature:
>+//
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_TARGET                0   xyzw        0   TARGET  float   xyzw
>+//
>+ps_4_0
>+dcl_sampler s0, mode_default
>+dcl_resource_texture3d (float,float,float,float) t0
>+dcl_input_ps linear v2.xyz
>+dcl_output o0.xyzw
>+dcl_temps 2
>+sample r0.xyzw, v2.xyzx, t0.xyzw, s0
>+lt r1.x, l(0.000000), r0.w
>+div r1.yzw, r0.xxyz, r0.wwww
>+movc o0.xyz, r1.xxxx, r1.yzwy, r0.xyzx
>+mov o0.w, r0.w
>+ret 
>+// Approximately 6 instruction slots used
>+#endif
>+
>+const BYTE g_PS_FtoF_UM_RGBA_3D[] = {
>+    68,  88, 66,  67,  238, 227, 231, 209, 25,  105, 137, 11,  175, 227, 234, 239, 250, 100, 198,
>+    187, 1,  0,   0,   0,   252, 2,   0,   0,   5,   0,   0,   0,   52,  0,   0,   0,   224, 0,
>+    0,   0,  104, 1,   0,   0,   156, 1,   0,   0,   128, 2,   0,   0,   82,  68,  69,  70,  164,
>+    0,   0,  0,   0,   0,   0,   0,   0,   0,   0,   0,   2,   0,   0,   0,   28,  0,   0,   0,
>+    0,   4,  255, 255, 0,   1,   0,   0,   112, 0,   0,   0,   92,  0,   0,   0,   3,   0,   0,
>+    0,   0,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,
>+    0,   0,  1,   0,   0,   0,   100, 0,   0,   0,   2,   0,   0,   0,   5,   0,   0,   0,   8,
>+    0,   0,  0,   255, 255, 255, 255, 0,   0,   0,   0,   1,   0,   0,   0,   13,  0,   0,   0,
>+    83,  97, 109, 112, 108, 101, 114, 0,   84,  101, 120, 116, 117, 114, 101, 70,  95,  51,  68,
>+    0,   77, 105, 99,  114, 111, 115, 111, 102, 116, 32,  40,  82,  41,  32,  72,  76,  83,  76,
>+    32,  83, 104, 97,  100, 101, 114, 32,  67,  111, 109, 112, 105, 108, 101, 114, 32,  57,  46,
>+    50,  57, 46,  57,  53,  50,  46,  51,  49,  49,  49,  0,   171, 171, 171, 73,  83,  71,  78,
>+    128, 0,  0,   0,   3,   0,   0,   0,   8,   0,   0,   0,   80,  0,   0,   0,   0,   0,   0,
>+    0,   1,  0,   0,   0,   3,   0,   0,   0,   0,   0,   0,   0,   15,  0,   0,   0,   92,  0,
>+    0,   0,  0,   0,   0,   0,   4,   0,   0,   0,   1,   0,   0,   0,   1,   0,   0,   0,   1,
>+    0,   0,  0,   118, 0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   3,   0,   0,   0,
>+    2,   0,  0,   0,   7,   7,   0,   0,   83,  86,  95,  80,  79,  83,  73,  84,  73,  79,  78,
>+    0,   83, 86,  95,  82,  69,  78,  68,  69,  82,  84,  65,  82,  71,  69,  84,  65,  82,  82,
>+    65,  89, 73,  78,  68,  69,  88,  0,   84,  69,  88,  67,  79,  79,  82,  68,  0,   171, 79,
>+    83,  71, 78,  44,  0,   0,   0,   1,   0,   0,   0,   8,   0,   0,   0,   32,  0,   0,   0,
>+    0,   0,  0,   0,   0,   0,   0,   0,   3,   0,   0,   0,   0,   0,   0,   0,   15,  0,   0,
>+    0,   83, 86,  95,  84,  65,  82,  71,  69,  84,  0,   171, 171, 83,  72,  68,  82,  220, 0,
>+    0,   0,  64,  0,   0,   0,   55,  0,   0,   0,   90,  0,   0,   3,   0,   96,  16,  0,   0,
>+    0,   0,  0,   88,  40,  0,   4,   0,   112, 16,  0,   0,   0,   0,   0,   85,  85,  0,   0,
>+    98,  16, 0,   3,   114, 16,  16,  0,   2,   0,   0,   0,   101, 0,   0,   3,   242, 32,  16,
>+    0,   0,  0,   0,   0,   104, 0,   0,   2,   2,   0,   0,   0,   69,  0,   0,   9,   242, 0,
>+    16,  0,  0,   0,   0,   0,   70,  18,  16,  0,   2,   0,   0,   0,   70,  126, 16,  0,   0,
>+    0,   0,  0,   0,   96,  16,  0,   0,   0,   0,   0,   49,  0,   0,   7,   18,  0,   16,  0,
>+    1,   0,  0,   0,   1,   64,  0,   0,   0,   0,   0,   0,   58,  0,   16,  0,   0,   0,   0,
>+    0,   14, 0,   0,   7,   226, 0,   16,  0,   1,   0,   0,   0,   6,   9,   16,  0,   0,   0,
>+    0,   0,  246, 15,  16,  0,   0,   0,   0,   0,   55,  0,   0,   9,   114, 32,  16,  0,   0,
>+    0,   0,  0,   6,   0,   16,  0,   1,   0,   0,   0,   150, 7,   16,  0,   1,   0,   0,   0,
>+    70,  2,  16,  0,   0,   0,   0,   0,   54,  0,   0,   5,   130, 32,  16,  0,   0,   0,   0,
>+    0,   58, 0,   16,  0,   0,   0,   0,   0,   62,  0,   0,   1,   83,  84,  65,  84,  116, 0,
>+    0,   0,  6,   0,   0,   0,   2,   0,   0,   0,   0,   0,   0,   0,   2,   0,   0,   0,   2,
>+    0,   0,  0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   1,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,  1,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,  0,   0};
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_um_rgba_4444_2d_ps.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_um_rgba_4444_2d_ps.h
>new file mode 100644
>index 00000000000..76495e70f55
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_um_rgba_4444_2d_ps.h
>@@ -0,0 +1,92 @@
>+#if 0
>+//
>+// Generated by Microsoft (R) HLSL Shader Compiler 9.29.952.3111
>+//
>+//
>+//   fxc /nologo /E PS_FtoF_UM_RGBA_4444_2D /T ps_4_0 /Fh
>+//    compiled\multiplyalpha_ftof_um_rgba_4444_2d_ps.h MultiplyAlpha.hlsl
>+//
>+//
>+// Resource Bindings:
>+//
>+// Name                                 Type  Format         Dim Slot Elements
>+// ------------------------------ ---------- ------- ----------- ---- --------
>+// Sampler                           sampler      NA          NA    0        1
>+// TextureF                          texture  float4          2d    0        1
>+//
>+//
>+//
>+// Input signature:
>+//
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_POSITION              0   xyzw        0      POS  float
>+// TEXCOORD                 0   xy          1     NONE  float   xy
>+//
>+//
>+// Output signature:
>+//
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_TARGET                0   xyzw        0   TARGET  float   xyzw
>+//
>+ps_4_0
>+dcl_sampler s0, mode_default
>+dcl_resource_texture2d (float,float,float,float) t0
>+dcl_input_ps linear v1.xy
>+dcl_output o0.xyzw
>+dcl_temps 2
>+sample r0.xyzw, v1.xyxx, t0.xyzw, s0
>+lt r1.x, l(0.000000), r0.w
>+div r1.yzw, r0.xxyz, r0.wwww
>+movc r0.xyz, r1.xxxx, r1.yzwy, r0.xyzx
>+mul r0.xyzw, r0.xyzw, l(15.000000, 15.000000, 15.000000, 15.000000)
>+round_ne r0.xyzw, r0.xyzw
>+mul o0.xyzw, r0.xyzw, l(0.066667, 0.066667, 0.066667, 0.066667)
>+ret
>+// Approximately 8 instruction slots used
>+#endif
>+
>+const BYTE g_PS_FtoF_UM_RGBA_4444_2D[] = {
>+    68,  88,  66,  67,  222, 241, 125, 211, 53,  8,   171, 225, 195, 188, 22,  118, 155, 53,  136,
>+    73,  1,   0,   0,   0,   24,  3,   0,   0,   5,   0,   0,   0,   52,  0,   0,   0,   220, 0,
>+    0,   0,   52,  1,   0,   0,   104, 1,   0,   0,   156, 2,   0,   0,   82,  68,  69,  70,  160,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   2,   0,   0,   0,   28,  0,   0,   0,
>+    0,   4,   255, 255, 0,   1,   0,   0,   109, 0,   0,   0,   92,  0,   0,   0,   3,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,
>+    0,   0,   1,   0,   0,   0,   100, 0,   0,   0,   2,   0,   0,   0,   5,   0,   0,   0,   4,
>+    0,   0,   0,   255, 255, 255, 255, 0,   0,   0,   0,   1,   0,   0,   0,   13,  0,   0,   0,
>+    83,  97,  109, 112, 108, 101, 114, 0,   84,  101, 120, 116, 117, 114, 101, 70,  0,   77,  105,
>+    99,  114, 111, 115, 111, 102, 116, 32,  40,  82,  41,  32,  72,  76,  83,  76,  32,  83,  104,
>+    97,  100, 101, 114, 32,  67,  111, 109, 112, 105, 108, 101, 114, 32,  57,  46,  50,  57,  46,
>+    57,  53,  50,  46,  51,  49,  49,  49,  0,   171, 171, 73,  83,  71,  78,  80,  0,   0,   0,
>+    2,   0,   0,   0,   8,   0,   0,   0,   56,  0,   0,   0,   0,   0,   0,   0,   1,   0,   0,
>+    0,   3,   0,   0,   0,   0,   0,   0,   0,   15,  0,   0,   0,   68,  0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   3,   0,   0,   0,   1,   0,   0,   0,   3,   3,   0,   0,   83,
>+    86,  95,  80,  79,  83,  73,  84,  73,  79,  78,  0,   84,  69,  88,  67,  79,  79,  82,  68,
>+    0,   171, 171, 171, 79,  83,  71,  78,  44,  0,   0,   0,   1,   0,   0,   0,   8,   0,   0,
>+    0,   32,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   3,   0,   0,   0,   0,   0,
>+    0,   0,   15,  0,   0,   0,   83,  86,  95,  84,  65,  82,  71,  69,  84,  0,   171, 171, 83,
>+    72,  68,  82,  44,  1,   0,   0,   64,  0,   0,   0,   75,  0,   0,   0,   90,  0,   0,   3,
>+    0,   96,  16,  0,   0,   0,   0,   0,   88,  24,  0,   4,   0,   112, 16,  0,   0,   0,   0,
>+    0,   85,  85,  0,   0,   98,  16,  0,   3,   50,  16,  16,  0,   1,   0,   0,   0,   101, 0,
>+    0,   3,   242, 32,  16,  0,   0,   0,   0,   0,   104, 0,   0,   2,   2,   0,   0,   0,   69,
>+    0,   0,   9,   242, 0,   16,  0,   0,   0,   0,   0,   70,  16,  16,  0,   1,   0,   0,   0,
>+    70,  126, 16,  0,   0,   0,   0,   0,   0,   96,  16,  0,   0,   0,   0,   0,   49,  0,   0,
>+    7,   18,  0,   16,  0,   1,   0,   0,   0,   1,   64,  0,   0,   0,   0,   0,   0,   58,  0,
>+    16,  0,   0,   0,   0,   0,   14,  0,   0,   7,   226, 0,   16,  0,   1,   0,   0,   0,   6,
>+    9,   16,  0,   0,   0,   0,   0,   246, 15,  16,  0,   0,   0,   0,   0,   55,  0,   0,   9,
>+    114, 0,   16,  0,   0,   0,   0,   0,   6,   0,   16,  0,   1,   0,   0,   0,   150, 7,   16,
>+    0,   1,   0,   0,   0,   70,  2,   16,  0,   0,   0,   0,   0,   56,  0,   0,   10,  242, 0,
>+    16,  0,   0,   0,   0,   0,   70,  14,  16,  0,   0,   0,   0,   0,   2,   64,  0,   0,   0,
>+    0,   112, 65,  0,   0,   112, 65,  0,   0,   112, 65,  0,   0,   112, 65,  64,  0,   0,   5,
>+    242, 0,   16,  0,   0,   0,   0,   0,   70,  14,  16,  0,   0,   0,   0,   0,   56,  0,   0,
>+    10,  242, 32,  16,  0,   0,   0,   0,   0,   70,  14,  16,  0,   0,   0,   0,   0,   2,   64,
>+    0,   0,   137, 136, 136, 61,  137, 136, 136, 61,  137, 136, 136, 61,  137, 136, 136, 61,  62,
>+    0,   0,   1,   83,  84,  65,  84,  116, 0,   0,   0,   8,   0,   0,   0,   2,   0,   0,   0,
>+    0,   0,   0,   0,   2,   0,   0,   0,   5,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   1,   0,   0,   0,
>+    1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0};
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_um_rgba_4444_2darray_ps.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_um_rgba_4444_2darray_ps.h
>new file mode 100644
>index 00000000000..b0e165adf3c
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_um_rgba_4444_2darray_ps.h
>@@ -0,0 +1,102 @@
>+#if 0
>+//
>+// Generated by Microsoft (R) HLSL Shader Compiler 9.29.952.3111
>+//
>+//
>+//   fxc /nologo /E PS_FtoF_UM_RGBA_4444_2DArray /T ps_4_0 /Fh
>+//    compiled\multiplyalpha_ftof_um_rgba_4444_2darray_ps.h MultiplyAlpha.hlsl
>+//
>+//
>+// Resource Bindings:
>+//
>+// Name                                 Type  Format         Dim Slot Elements
>+// ------------------------------ ---------- ------- ----------- ---- --------
>+// Sampler                           sampler      NA          NA    0        1
>+// TextureF_2DArray                  texture  float4     2darray    0        1
>+//
>+//
>+//
>+// Input signature:
>+//
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_POSITION              0   xyzw        0      POS  float       
>+// SV_RENDERTARGETARRAYINDEX     0   x           1  RTINDEX   uint   x   
>+// TEXCOORD                 0   xyz         2     NONE  float   xy  
>+//
>+//
>+// Output signature:
>+//
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_TARGET                0   xyzw        0   TARGET  float   xyzw
>+//
>+ps_4_0
>+dcl_sampler s0, mode_default
>+dcl_resource_texture2darray (float,float,float,float) t0
>+dcl_input_ps_siv constant v1.x, rendertarget_array_index
>+dcl_input_ps linear v2.xy
>+dcl_output o0.xyzw
>+dcl_temps 2
>+utof r0.z, v1.x
>+mov r0.xy, v2.xyxx
>+sample r0.xyzw, r0.xyzx, t0.xyzw, s0
>+lt r1.x, l(0.000000), r0.w
>+div r1.yzw, r0.xxyz, r0.wwww
>+movc r0.xyz, r1.xxxx, r1.yzwy, r0.xyzx
>+mul r0.xyzw, r0.xyzw, l(15.000000, 15.000000, 15.000000, 15.000000)
>+round_ne r0.xyzw, r0.xyzw
>+mul o0.xyzw, r0.xyzw, l(0.066667, 0.066667, 0.066667, 0.066667)
>+ret 
>+// Approximately 10 instruction slots used
>+#endif
>+
>+const BYTE g_PS_FtoF_UM_RGBA_4444_2DArray[] = {
>+    68,  88,  66,  67,  248, 46,  191, 7,   4,   167, 130, 163, 93,  127, 212, 211, 47,  149, 216,
>+    24,  1,   0,   0,   0,   136, 3,   0,   0,   5,   0,   0,   0,   52,  0,   0,   0,   228, 0,
>+    0,   0,   108, 1,   0,   0,   160, 1,   0,   0,   12,  3,   0,   0,   82,  68,  69,  70,  168,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   2,   0,   0,   0,   28,  0,   0,   0,
>+    0,   4,   255, 255, 0,   1,   0,   0,   117, 0,   0,   0,   92,  0,   0,   0,   3,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,
>+    0,   0,   1,   0,   0,   0,   100, 0,   0,   0,   2,   0,   0,   0,   5,   0,   0,   0,   5,
>+    0,   0,   0,   255, 255, 255, 255, 0,   0,   0,   0,   1,   0,   0,   0,   13,  0,   0,   0,
>+    83,  97,  109, 112, 108, 101, 114, 0,   84,  101, 120, 116, 117, 114, 101, 70,  95,  50,  68,
>+    65,  114, 114, 97,  121, 0,   77,  105, 99,  114, 111, 115, 111, 102, 116, 32,  40,  82,  41,
>+    32,  72,  76,  83,  76,  32,  83,  104, 97,  100, 101, 114, 32,  67,  111, 109, 112, 105, 108,
>+    101, 114, 32,  57,  46,  50,  57,  46,  57,  53,  50,  46,  51,  49,  49,  49,  0,   171, 171,
>+    73,  83,  71,  78,  128, 0,   0,   0,   3,   0,   0,   0,   8,   0,   0,   0,   80,  0,   0,
>+    0,   0,   0,   0,   0,   1,   0,   0,   0,   3,   0,   0,   0,   0,   0,   0,   0,   15,  0,
>+    0,   0,   92,  0,   0,   0,   0,   0,   0,   0,   4,   0,   0,   0,   1,   0,   0,   0,   1,
>+    0,   0,   0,   1,   1,   0,   0,   118, 0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    3,   0,   0,   0,   2,   0,   0,   0,   7,   3,   0,   0,   83,  86,  95,  80,  79,  83,  73,
>+    84,  73,  79,  78,  0,   83,  86,  95,  82,  69,  78,  68,  69,  82,  84,  65,  82,  71,  69,
>+    84,  65,  82,  82,  65,  89,  73,  78,  68,  69,  88,  0,   84,  69,  88,  67,  79,  79,  82,
>+    68,  0,   171, 79,  83,  71,  78,  44,  0,   0,   0,   1,   0,   0,   0,   8,   0,   0,   0,
>+    32,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   3,   0,   0,   0,   0,   0,   0,
>+    0,   15,  0,   0,   0,   83,  86,  95,  84,  65,  82,  71,  69,  84,  0,   171, 171, 83,  72,
>+    68,  82,  100, 1,   0,   0,   64,  0,   0,   0,   89,  0,   0,   0,   90,  0,   0,   3,   0,
>+    96,  16,  0,   0,   0,   0,   0,   88,  64,  0,   4,   0,   112, 16,  0,   0,   0,   0,   0,
>+    85,  85,  0,   0,   100, 8,   0,   4,   18,  16,  16,  0,   1,   0,   0,   0,   4,   0,   0,
>+    0,   98,  16,  0,   3,   50,  16,  16,  0,   2,   0,   0,   0,   101, 0,   0,   3,   242, 32,
>+    16,  0,   0,   0,   0,   0,   104, 0,   0,   2,   2,   0,   0,   0,   86,  0,   0,   5,   66,
>+    0,   16,  0,   0,   0,   0,   0,   10,  16,  16,  0,   1,   0,   0,   0,   54,  0,   0,   5,
>+    50,  0,   16,  0,   0,   0,   0,   0,   70,  16,  16,  0,   2,   0,   0,   0,   69,  0,   0,
>+    9,   242, 0,   16,  0,   0,   0,   0,   0,   70,  2,   16,  0,   0,   0,   0,   0,   70,  126,
>+    16,  0,   0,   0,   0,   0,   0,   96,  16,  0,   0,   0,   0,   0,   49,  0,   0,   7,   18,
>+    0,   16,  0,   1,   0,   0,   0,   1,   64,  0,   0,   0,   0,   0,   0,   58,  0,   16,  0,
>+    0,   0,   0,   0,   14,  0,   0,   7,   226, 0,   16,  0,   1,   0,   0,   0,   6,   9,   16,
>+    0,   0,   0,   0,   0,   246, 15,  16,  0,   0,   0,   0,   0,   55,  0,   0,   9,   114, 0,
>+    16,  0,   0,   0,   0,   0,   6,   0,   16,  0,   1,   0,   0,   0,   150, 7,   16,  0,   1,
>+    0,   0,   0,   70,  2,   16,  0,   0,   0,   0,   0,   56,  0,   0,   10,  242, 0,   16,  0,
>+    0,   0,   0,   0,   70,  14,  16,  0,   0,   0,   0,   0,   2,   64,  0,   0,   0,   0,   112,
>+    65,  0,   0,   112, 65,  0,   0,   112, 65,  0,   0,   112, 65,  64,  0,   0,   5,   242, 0,
>+    16,  0,   0,   0,   0,   0,   70,  14,  16,  0,   0,   0,   0,   0,   56,  0,   0,   10,  242,
>+    32,  16,  0,   0,   0,   0,   0,   70,  14,  16,  0,   0,   0,   0,   0,   2,   64,  0,   0,
>+    137, 136, 136, 61,  137, 136, 136, 61,  137, 136, 136, 61,  137, 136, 136, 61,  62,  0,   0,
>+    1,   83,  84,  65,  84,  116, 0,   0,   0,   10,  0,   0,   0,   2,   0,   0,   0,   0,   0,
>+    0,   0,   3,   0,   0,   0,   5,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   2,   0,   0,   0,   1,   0,   0,   0,   2,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0};
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_um_rgba_4444_3d_ps.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_um_rgba_4444_3d_ps.h
>new file mode 100644
>index 00000000000..a1b7ed0036f
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_um_rgba_4444_3d_ps.h
>@@ -0,0 +1,96 @@
>+#if 0
>+//
>+// Generated by Microsoft (R) HLSL Shader Compiler 9.29.952.3111
>+//
>+//
>+//   fxc /nologo /E PS_FtoF_UM_RGBA_4444_3D /T ps_4_0 /Fh
>+//    compiled\multiplyalpha_ftof_um_rgba_4444_3d_ps.h MultiplyAlpha.hlsl
>+//
>+//
>+// Resource Bindings:
>+//
>+// Name                                 Type  Format         Dim Slot Elements
>+// ------------------------------ ---------- ------- ----------- ---- --------
>+// Sampler                           sampler      NA          NA    0        1
>+// TextureF_3D                       texture  float4          3d    0        1
>+//
>+//
>+//
>+// Input signature:
>+//
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_POSITION              0   xyzw        0      POS  float       
>+// SV_RENDERTARGETARRAYINDEX     0   x           1  RTINDEX   uint       
>+// TEXCOORD                 0   xyz         2     NONE  float   xyz 
>+//
>+//
>+// Output signature:
>+//
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_TARGET                0   xyzw        0   TARGET  float   xyzw
>+//
>+ps_4_0
>+dcl_sampler s0, mode_default
>+dcl_resource_texture3d (float,float,float,float) t0
>+dcl_input_ps linear v2.xyz
>+dcl_output o0.xyzw
>+dcl_temps 2
>+sample r0.xyzw, v2.xyzx, t0.xyzw, s0
>+lt r1.x, l(0.000000), r0.w
>+div r1.yzw, r0.xxyz, r0.wwww
>+movc r0.xyz, r1.xxxx, r1.yzwy, r0.xyzx
>+mul r0.xyzw, r0.xyzw, l(15.000000, 15.000000, 15.000000, 15.000000)
>+round_ne r0.xyzw, r0.xyzw
>+mul o0.xyzw, r0.xyzw, l(0.066667, 0.066667, 0.066667, 0.066667)
>+ret 
>+// Approximately 8 instruction slots used
>+#endif
>+
>+const BYTE g_PS_FtoF_UM_RGBA_4444_3D[] = {
>+    68,  88,  66,  67,  234, 154, 253, 59,  138, 126, 10,  67,  101, 219, 116, 42,  69,  129, 73,
>+    147, 1,   0,   0,   0,   76,  3,   0,   0,   5,   0,   0,   0,   52,  0,   0,   0,   224, 0,
>+    0,   0,   104, 1,   0,   0,   156, 1,   0,   0,   208, 2,   0,   0,   82,  68,  69,  70,  164,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   2,   0,   0,   0,   28,  0,   0,   0,
>+    0,   4,   255, 255, 0,   1,   0,   0,   112, 0,   0,   0,   92,  0,   0,   0,   3,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,
>+    0,   0,   1,   0,   0,   0,   100, 0,   0,   0,   2,   0,   0,   0,   5,   0,   0,   0,   8,
>+    0,   0,   0,   255, 255, 255, 255, 0,   0,   0,   0,   1,   0,   0,   0,   13,  0,   0,   0,
>+    83,  97,  109, 112, 108, 101, 114, 0,   84,  101, 120, 116, 117, 114, 101, 70,  95,  51,  68,
>+    0,   77,  105, 99,  114, 111, 115, 111, 102, 116, 32,  40,  82,  41,  32,  72,  76,  83,  76,
>+    32,  83,  104, 97,  100, 101, 114, 32,  67,  111, 109, 112, 105, 108, 101, 114, 32,  57,  46,
>+    50,  57,  46,  57,  53,  50,  46,  51,  49,  49,  49,  0,   171, 171, 171, 73,  83,  71,  78,
>+    128, 0,   0,   0,   3,   0,   0,   0,   8,   0,   0,   0,   80,  0,   0,   0,   0,   0,   0,
>+    0,   1,   0,   0,   0,   3,   0,   0,   0,   0,   0,   0,   0,   15,  0,   0,   0,   92,  0,
>+    0,   0,   0,   0,   0,   0,   4,   0,   0,   0,   1,   0,   0,   0,   1,   0,   0,   0,   1,
>+    0,   0,   0,   118, 0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   3,   0,   0,   0,
>+    2,   0,   0,   0,   7,   7,   0,   0,   83,  86,  95,  80,  79,  83,  73,  84,  73,  79,  78,
>+    0,   83,  86,  95,  82,  69,  78,  68,  69,  82,  84,  65,  82,  71,  69,  84,  65,  82,  82,
>+    65,  89,  73,  78,  68,  69,  88,  0,   84,  69,  88,  67,  79,  79,  82,  68,  0,   171, 79,
>+    83,  71,  78,  44,  0,   0,   0,   1,   0,   0,   0,   8,   0,   0,   0,   32,  0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   3,   0,   0,   0,   0,   0,   0,   0,   15,  0,   0,
>+    0,   83,  86,  95,  84,  65,  82,  71,  69,  84,  0,   171, 171, 83,  72,  68,  82,  44,  1,
>+    0,   0,   64,  0,   0,   0,   75,  0,   0,   0,   90,  0,   0,   3,   0,   96,  16,  0,   0,
>+    0,   0,   0,   88,  40,  0,   4,   0,   112, 16,  0,   0,   0,   0,   0,   85,  85,  0,   0,
>+    98,  16,  0,   3,   114, 16,  16,  0,   2,   0,   0,   0,   101, 0,   0,   3,   242, 32,  16,
>+    0,   0,   0,   0,   0,   104, 0,   0,   2,   2,   0,   0,   0,   69,  0,   0,   9,   242, 0,
>+    16,  0,   0,   0,   0,   0,   70,  18,  16,  0,   2,   0,   0,   0,   70,  126, 16,  0,   0,
>+    0,   0,   0,   0,   96,  16,  0,   0,   0,   0,   0,   49,  0,   0,   7,   18,  0,   16,  0,
>+    1,   0,   0,   0,   1,   64,  0,   0,   0,   0,   0,   0,   58,  0,   16,  0,   0,   0,   0,
>+    0,   14,  0,   0,   7,   226, 0,   16,  0,   1,   0,   0,   0,   6,   9,   16,  0,   0,   0,
>+    0,   0,   246, 15,  16,  0,   0,   0,   0,   0,   55,  0,   0,   9,   114, 0,   16,  0,   0,
>+    0,   0,   0,   6,   0,   16,  0,   1,   0,   0,   0,   150, 7,   16,  0,   1,   0,   0,   0,
>+    70,  2,   16,  0,   0,   0,   0,   0,   56,  0,   0,   10,  242, 0,   16,  0,   0,   0,   0,
>+    0,   70,  14,  16,  0,   0,   0,   0,   0,   2,   64,  0,   0,   0,   0,   112, 65,  0,   0,
>+    112, 65,  0,   0,   112, 65,  0,   0,   112, 65,  64,  0,   0,   5,   242, 0,   16,  0,   0,
>+    0,   0,   0,   70,  14,  16,  0,   0,   0,   0,   0,   56,  0,   0,   10,  242, 32,  16,  0,
>+    0,   0,   0,   0,   70,  14,  16,  0,   0,   0,   0,   0,   2,   64,  0,   0,   137, 136, 136,
>+    61,  137, 136, 136, 61,  137, 136, 136, 61,  137, 136, 136, 61,  62,  0,   0,   1,   83,  84,
>+    65,  84,  116, 0,   0,   0,   8,   0,   0,   0,   2,   0,   0,   0,   0,   0,   0,   0,   2,
>+    0,   0,   0,   5,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   1,   0,   0,   0,   1,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0};
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_um_rgba_4444_ps.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_um_rgba_4444_ps.h
>new file mode 100644
>index 00000000000..0f46616ec4d
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_um_rgba_4444_ps.h
>@@ -0,0 +1,92 @@
>+#if 0
>+//
>+// Generated by Microsoft (R) HLSL Shader Compiler 9.29.952.3111
>+//
>+//
>+//   fxc /nologo /E PS_FtoF_UM_RGBA_4444 /T ps_4_0 /Fh
>+//    compiled\multiplyalpha_ftof_um_rgba_4444_ps.h MultiplyAlpha.hlsl
>+//
>+//
>+// Resource Bindings:
>+//
>+// Name                                 Type  Format         Dim Slot Elements
>+// ------------------------------ ---------- ------- ----------- ---- --------
>+// Sampler                           sampler      NA          NA    0        1
>+// TextureF                          texture  float4          2d    0        1
>+//
>+//
>+//
>+// Input signature:
>+//
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_POSITION              0   xyzw        0      POS  float       
>+// TEXCOORD                 0   xy          1     NONE  float   xy  
>+//
>+//
>+// Output signature:
>+//
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_TARGET                0   xyzw        0   TARGET  float   xyzw
>+//
>+ps_4_0
>+dcl_sampler s0, mode_default
>+dcl_resource_texture2d (float,float,float,float) t0
>+dcl_input_ps linear v1.xy
>+dcl_output o0.xyzw
>+dcl_temps 2
>+sample r0.xyzw, v1.xyxx, t0.xyzw, s0
>+lt r1.x, l(0.000000), r0.w
>+div r1.yzw, r0.xxyz, r0.wwww
>+movc r0.xyz, r1.xxxx, r1.yzwy, r0.xyzx
>+mul r0.xyzw, r0.xyzw, l(15.000000, 15.000000, 15.000000, 15.000000)
>+round_ne r0.xyzw, r0.xyzw
>+mul o0.xyzw, r0.xyzw, l(0.066667, 0.066667, 0.066667, 0.066667)
>+ret 
>+// Approximately 8 instruction slots used
>+#endif
>+
>+const BYTE g_PS_FtoF_UM_RGBA_4444[] = {
>+    68,  88,  66,  67,  222, 241, 125, 211, 53,  8,   171, 225, 195, 188, 22,  118, 155, 53,  136,
>+    73,  1,   0,   0,   0,   24,  3,   0,   0,   5,   0,   0,   0,   52,  0,   0,   0,   220, 0,
>+    0,   0,   52,  1,   0,   0,   104, 1,   0,   0,   156, 2,   0,   0,   82,  68,  69,  70,  160,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   2,   0,   0,   0,   28,  0,   0,   0,
>+    0,   4,   255, 255, 0,   1,   0,   0,   109, 0,   0,   0,   92,  0,   0,   0,   3,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,
>+    0,   0,   1,   0,   0,   0,   100, 0,   0,   0,   2,   0,   0,   0,   5,   0,   0,   0,   4,
>+    0,   0,   0,   255, 255, 255, 255, 0,   0,   0,   0,   1,   0,   0,   0,   13,  0,   0,   0,
>+    83,  97,  109, 112, 108, 101, 114, 0,   84,  101, 120, 116, 117, 114, 101, 70,  0,   77,  105,
>+    99,  114, 111, 115, 111, 102, 116, 32,  40,  82,  41,  32,  72,  76,  83,  76,  32,  83,  104,
>+    97,  100, 101, 114, 32,  67,  111, 109, 112, 105, 108, 101, 114, 32,  57,  46,  50,  57,  46,
>+    57,  53,  50,  46,  51,  49,  49,  49,  0,   171, 171, 73,  83,  71,  78,  80,  0,   0,   0,
>+    2,   0,   0,   0,   8,   0,   0,   0,   56,  0,   0,   0,   0,   0,   0,   0,   1,   0,   0,
>+    0,   3,   0,   0,   0,   0,   0,   0,   0,   15,  0,   0,   0,   68,  0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   3,   0,   0,   0,   1,   0,   0,   0,   3,   3,   0,   0,   83,
>+    86,  95,  80,  79,  83,  73,  84,  73,  79,  78,  0,   84,  69,  88,  67,  79,  79,  82,  68,
>+    0,   171, 171, 171, 79,  83,  71,  78,  44,  0,   0,   0,   1,   0,   0,   0,   8,   0,   0,
>+    0,   32,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   3,   0,   0,   0,   0,   0,
>+    0,   0,   15,  0,   0,   0,   83,  86,  95,  84,  65,  82,  71,  69,  84,  0,   171, 171, 83,
>+    72,  68,  82,  44,  1,   0,   0,   64,  0,   0,   0,   75,  0,   0,   0,   90,  0,   0,   3,
>+    0,   96,  16,  0,   0,   0,   0,   0,   88,  24,  0,   4,   0,   112, 16,  0,   0,   0,   0,
>+    0,   85,  85,  0,   0,   98,  16,  0,   3,   50,  16,  16,  0,   1,   0,   0,   0,   101, 0,
>+    0,   3,   242, 32,  16,  0,   0,   0,   0,   0,   104, 0,   0,   2,   2,   0,   0,   0,   69,
>+    0,   0,   9,   242, 0,   16,  0,   0,   0,   0,   0,   70,  16,  16,  0,   1,   0,   0,   0,
>+    70,  126, 16,  0,   0,   0,   0,   0,   0,   96,  16,  0,   0,   0,   0,   0,   49,  0,   0,
>+    7,   18,  0,   16,  0,   1,   0,   0,   0,   1,   64,  0,   0,   0,   0,   0,   0,   58,  0,
>+    16,  0,   0,   0,   0,   0,   14,  0,   0,   7,   226, 0,   16,  0,   1,   0,   0,   0,   6,
>+    9,   16,  0,   0,   0,   0,   0,   246, 15,  16,  0,   0,   0,   0,   0,   55,  0,   0,   9,
>+    114, 0,   16,  0,   0,   0,   0,   0,   6,   0,   16,  0,   1,   0,   0,   0,   150, 7,   16,
>+    0,   1,   0,   0,   0,   70,  2,   16,  0,   0,   0,   0,   0,   56,  0,   0,   10,  242, 0,
>+    16,  0,   0,   0,   0,   0,   70,  14,  16,  0,   0,   0,   0,   0,   2,   64,  0,   0,   0,
>+    0,   112, 65,  0,   0,   112, 65,  0,   0,   112, 65,  0,   0,   112, 65,  64,  0,   0,   5,
>+    242, 0,   16,  0,   0,   0,   0,   0,   70,  14,  16,  0,   0,   0,   0,   0,   56,  0,   0,
>+    10,  242, 32,  16,  0,   0,   0,   0,   0,   70,  14,  16,  0,   0,   0,   0,   0,   2,   64,
>+    0,   0,   137, 136, 136, 61,  137, 136, 136, 61,  137, 136, 136, 61,  137, 136, 136, 61,  62,
>+    0,   0,   1,   83,  84,  65,  84,  116, 0,   0,   0,   8,   0,   0,   0,   2,   0,   0,   0,
>+    0,   0,   0,   0,   2,   0,   0,   0,   5,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   1,   0,   0,   0,
>+    1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0};
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_um_rgba_5551_2d_ps.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_um_rgba_5551_2d_ps.h
>new file mode 100644
>index 00000000000..1fc84161bf3
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_um_rgba_5551_2d_ps.h
>@@ -0,0 +1,92 @@
>+#if 0
>+//
>+// Generated by Microsoft (R) HLSL Shader Compiler 9.29.952.3111
>+//
>+//
>+//   fxc /nologo /E PS_FtoF_UM_RGBA_5551_2D /T ps_4_0 /Fh
>+//    compiled\multiplyalpha_ftof_um_rgba_5551_2d_ps.h MultiplyAlpha.hlsl
>+//
>+//
>+// Resource Bindings:
>+//
>+// Name                                 Type  Format         Dim Slot Elements
>+// ------------------------------ ---------- ------- ----------- ---- --------
>+// Sampler                           sampler      NA          NA    0        1
>+// TextureF                          texture  float4          2d    0        1
>+//
>+//
>+//
>+// Input signature:
>+//
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_POSITION              0   xyzw        0      POS  float
>+// TEXCOORD                 0   xy          1     NONE  float   xy
>+//
>+//
>+// Output signature:
>+//
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_TARGET                0   xyzw        0   TARGET  float   xyzw
>+//
>+ps_4_0
>+dcl_sampler s0, mode_default
>+dcl_resource_texture2d (float,float,float,float) t0
>+dcl_input_ps linear v1.xy
>+dcl_output o0.xyzw
>+dcl_temps 2
>+sample r0.xyzw, v1.xyxx, t0.xyzw, s0
>+lt r1.x, l(0.000000), r0.w
>+div r1.yzw, r0.xxyz, r0.wwww
>+movc r0.xyz, r1.xxxx, r1.yzwy, r0.xyzx
>+mul r0.xyzw, r0.xyzw, l(31.000000, 31.000000, 31.000000, 1.000000)
>+round_ne r0.xyzw, r0.xyzw
>+mul o0.xyzw, r0.xyzw, l(0.032258, 0.032258, 0.032258, 1.000000)
>+ret
>+// Approximately 8 instruction slots used
>+#endif
>+
>+const BYTE g_PS_FtoF_UM_RGBA_5551_2D[] = {
>+    68,  88,  66,  67,  244, 247, 148, 118, 3,   30,  60,  3,   4,   193, 209, 178, 87,  185, 179,
>+    75,  1,   0,   0,   0,   24,  3,   0,   0,   5,   0,   0,   0,   52,  0,   0,   0,   220, 0,
>+    0,   0,   52,  1,   0,   0,   104, 1,   0,   0,   156, 2,   0,   0,   82,  68,  69,  70,  160,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   2,   0,   0,   0,   28,  0,   0,   0,
>+    0,   4,   255, 255, 0,   1,   0,   0,   109, 0,   0,   0,   92,  0,   0,   0,   3,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,
>+    0,   0,   1,   0,   0,   0,   100, 0,   0,   0,   2,   0,   0,   0,   5,   0,   0,   0,   4,
>+    0,   0,   0,   255, 255, 255, 255, 0,   0,   0,   0,   1,   0,   0,   0,   13,  0,   0,   0,
>+    83,  97,  109, 112, 108, 101, 114, 0,   84,  101, 120, 116, 117, 114, 101, 70,  0,   77,  105,
>+    99,  114, 111, 115, 111, 102, 116, 32,  40,  82,  41,  32,  72,  76,  83,  76,  32,  83,  104,
>+    97,  100, 101, 114, 32,  67,  111, 109, 112, 105, 108, 101, 114, 32,  57,  46,  50,  57,  46,
>+    57,  53,  50,  46,  51,  49,  49,  49,  0,   171, 171, 73,  83,  71,  78,  80,  0,   0,   0,
>+    2,   0,   0,   0,   8,   0,   0,   0,   56,  0,   0,   0,   0,   0,   0,   0,   1,   0,   0,
>+    0,   3,   0,   0,   0,   0,   0,   0,   0,   15,  0,   0,   0,   68,  0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   3,   0,   0,   0,   1,   0,   0,   0,   3,   3,   0,   0,   83,
>+    86,  95,  80,  79,  83,  73,  84,  73,  79,  78,  0,   84,  69,  88,  67,  79,  79,  82,  68,
>+    0,   171, 171, 171, 79,  83,  71,  78,  44,  0,   0,   0,   1,   0,   0,   0,   8,   0,   0,
>+    0,   32,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   3,   0,   0,   0,   0,   0,
>+    0,   0,   15,  0,   0,   0,   83,  86,  95,  84,  65,  82,  71,  69,  84,  0,   171, 171, 83,
>+    72,  68,  82,  44,  1,   0,   0,   64,  0,   0,   0,   75,  0,   0,   0,   90,  0,   0,   3,
>+    0,   96,  16,  0,   0,   0,   0,   0,   88,  24,  0,   4,   0,   112, 16,  0,   0,   0,   0,
>+    0,   85,  85,  0,   0,   98,  16,  0,   3,   50,  16,  16,  0,   1,   0,   0,   0,   101, 0,
>+    0,   3,   242, 32,  16,  0,   0,   0,   0,   0,   104, 0,   0,   2,   2,   0,   0,   0,   69,
>+    0,   0,   9,   242, 0,   16,  0,   0,   0,   0,   0,   70,  16,  16,  0,   1,   0,   0,   0,
>+    70,  126, 16,  0,   0,   0,   0,   0,   0,   96,  16,  0,   0,   0,   0,   0,   49,  0,   0,
>+    7,   18,  0,   16,  0,   1,   0,   0,   0,   1,   64,  0,   0,   0,   0,   0,   0,   58,  0,
>+    16,  0,   0,   0,   0,   0,   14,  0,   0,   7,   226, 0,   16,  0,   1,   0,   0,   0,   6,
>+    9,   16,  0,   0,   0,   0,   0,   246, 15,  16,  0,   0,   0,   0,   0,   55,  0,   0,   9,
>+    114, 0,   16,  0,   0,   0,   0,   0,   6,   0,   16,  0,   1,   0,   0,   0,   150, 7,   16,
>+    0,   1,   0,   0,   0,   70,  2,   16,  0,   0,   0,   0,   0,   56,  0,   0,   10,  242, 0,
>+    16,  0,   0,   0,   0,   0,   70,  14,  16,  0,   0,   0,   0,   0,   2,   64,  0,   0,   0,
>+    0,   248, 65,  0,   0,   248, 65,  0,   0,   248, 65,  0,   0,   128, 63,  64,  0,   0,   5,
>+    242, 0,   16,  0,   0,   0,   0,   0,   70,  14,  16,  0,   0,   0,   0,   0,   56,  0,   0,
>+    10,  242, 32,  16,  0,   0,   0,   0,   0,   70,  14,  16,  0,   0,   0,   0,   0,   2,   64,
>+    0,   0,   8,   33,  4,   61,  8,   33,  4,   61,  8,   33,  4,   61,  0,   0,   128, 63,  62,
>+    0,   0,   1,   83,  84,  65,  84,  116, 0,   0,   0,   8,   0,   0,   0,   2,   0,   0,   0,
>+    0,   0,   0,   0,   2,   0,   0,   0,   5,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   1,   0,   0,   0,
>+    1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0};
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_um_rgba_5551_2darray_ps.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_um_rgba_5551_2darray_ps.h
>new file mode 100644
>index 00000000000..b98fd239751
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_um_rgba_5551_2darray_ps.h
>@@ -0,0 +1,102 @@
>+#if 0
>+//
>+// Generated by Microsoft (R) HLSL Shader Compiler 9.29.952.3111
>+//
>+//
>+//   fxc /nologo /E PS_FtoF_UM_RGBA_5551_2DArray /T ps_4_0 /Fh
>+//    compiled\multiplyalpha_ftof_um_rgba_5551_2darray_ps.h MultiplyAlpha.hlsl
>+//
>+//
>+// Resource Bindings:
>+//
>+// Name                                 Type  Format         Dim Slot Elements
>+// ------------------------------ ---------- ------- ----------- ---- --------
>+// Sampler                           sampler      NA          NA    0        1
>+// TextureF_2DArray                  texture  float4     2darray    0        1
>+//
>+//
>+//
>+// Input signature:
>+//
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_POSITION              0   xyzw        0      POS  float       
>+// SV_RENDERTARGETARRAYINDEX     0   x           1  RTINDEX   uint   x   
>+// TEXCOORD                 0   xyz         2     NONE  float   xy  
>+//
>+//
>+// Output signature:
>+//
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_TARGET                0   xyzw        0   TARGET  float   xyzw
>+//
>+ps_4_0
>+dcl_sampler s0, mode_default
>+dcl_resource_texture2darray (float,float,float,float) t0
>+dcl_input_ps_siv constant v1.x, rendertarget_array_index
>+dcl_input_ps linear v2.xy
>+dcl_output o0.xyzw
>+dcl_temps 2
>+utof r0.z, v1.x
>+mov r0.xy, v2.xyxx
>+sample r0.xyzw, r0.xyzx, t0.xyzw, s0
>+lt r1.x, l(0.000000), r0.w
>+div r1.yzw, r0.xxyz, r0.wwww
>+movc r0.xyz, r1.xxxx, r1.yzwy, r0.xyzx
>+mul r0.xyzw, r0.xyzw, l(31.000000, 31.000000, 31.000000, 1.000000)
>+round_ne r0.xyzw, r0.xyzw
>+mul o0.xyzw, r0.xyzw, l(0.032258, 0.032258, 0.032258, 1.000000)
>+ret 
>+// Approximately 10 instruction slots used
>+#endif
>+
>+const BYTE g_PS_FtoF_UM_RGBA_5551_2DArray[] = {
>+    68,  88,  66,  67,  196, 233, 27,  136, 227, 152, 84,  237, 85,  28,  205, 241, 162, 112, 239,
>+    139, 1,   0,   0,   0,   136, 3,   0,   0,   5,   0,   0,   0,   52,  0,   0,   0,   228, 0,
>+    0,   0,   108, 1,   0,   0,   160, 1,   0,   0,   12,  3,   0,   0,   82,  68,  69,  70,  168,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   2,   0,   0,   0,   28,  0,   0,   0,
>+    0,   4,   255, 255, 0,   1,   0,   0,   117, 0,   0,   0,   92,  0,   0,   0,   3,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,
>+    0,   0,   1,   0,   0,   0,   100, 0,   0,   0,   2,   0,   0,   0,   5,   0,   0,   0,   5,
>+    0,   0,   0,   255, 255, 255, 255, 0,   0,   0,   0,   1,   0,   0,   0,   13,  0,   0,   0,
>+    83,  97,  109, 112, 108, 101, 114, 0,   84,  101, 120, 116, 117, 114, 101, 70,  95,  50,  68,
>+    65,  114, 114, 97,  121, 0,   77,  105, 99,  114, 111, 115, 111, 102, 116, 32,  40,  82,  41,
>+    32,  72,  76,  83,  76,  32,  83,  104, 97,  100, 101, 114, 32,  67,  111, 109, 112, 105, 108,
>+    101, 114, 32,  57,  46,  50,  57,  46,  57,  53,  50,  46,  51,  49,  49,  49,  0,   171, 171,
>+    73,  83,  71,  78,  128, 0,   0,   0,   3,   0,   0,   0,   8,   0,   0,   0,   80,  0,   0,
>+    0,   0,   0,   0,   0,   1,   0,   0,   0,   3,   0,   0,   0,   0,   0,   0,   0,   15,  0,
>+    0,   0,   92,  0,   0,   0,   0,   0,   0,   0,   4,   0,   0,   0,   1,   0,   0,   0,   1,
>+    0,   0,   0,   1,   1,   0,   0,   118, 0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    3,   0,   0,   0,   2,   0,   0,   0,   7,   3,   0,   0,   83,  86,  95,  80,  79,  83,  73,
>+    84,  73,  79,  78,  0,   83,  86,  95,  82,  69,  78,  68,  69,  82,  84,  65,  82,  71,  69,
>+    84,  65,  82,  82,  65,  89,  73,  78,  68,  69,  88,  0,   84,  69,  88,  67,  79,  79,  82,
>+    68,  0,   171, 79,  83,  71,  78,  44,  0,   0,   0,   1,   0,   0,   0,   8,   0,   0,   0,
>+    32,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   3,   0,   0,   0,   0,   0,   0,
>+    0,   15,  0,   0,   0,   83,  86,  95,  84,  65,  82,  71,  69,  84,  0,   171, 171, 83,  72,
>+    68,  82,  100, 1,   0,   0,   64,  0,   0,   0,   89,  0,   0,   0,   90,  0,   0,   3,   0,
>+    96,  16,  0,   0,   0,   0,   0,   88,  64,  0,   4,   0,   112, 16,  0,   0,   0,   0,   0,
>+    85,  85,  0,   0,   100, 8,   0,   4,   18,  16,  16,  0,   1,   0,   0,   0,   4,   0,   0,
>+    0,   98,  16,  0,   3,   50,  16,  16,  0,   2,   0,   0,   0,   101, 0,   0,   3,   242, 32,
>+    16,  0,   0,   0,   0,   0,   104, 0,   0,   2,   2,   0,   0,   0,   86,  0,   0,   5,   66,
>+    0,   16,  0,   0,   0,   0,   0,   10,  16,  16,  0,   1,   0,   0,   0,   54,  0,   0,   5,
>+    50,  0,   16,  0,   0,   0,   0,   0,   70,  16,  16,  0,   2,   0,   0,   0,   69,  0,   0,
>+    9,   242, 0,   16,  0,   0,   0,   0,   0,   70,  2,   16,  0,   0,   0,   0,   0,   70,  126,
>+    16,  0,   0,   0,   0,   0,   0,   96,  16,  0,   0,   0,   0,   0,   49,  0,   0,   7,   18,
>+    0,   16,  0,   1,   0,   0,   0,   1,   64,  0,   0,   0,   0,   0,   0,   58,  0,   16,  0,
>+    0,   0,   0,   0,   14,  0,   0,   7,   226, 0,   16,  0,   1,   0,   0,   0,   6,   9,   16,
>+    0,   0,   0,   0,   0,   246, 15,  16,  0,   0,   0,   0,   0,   55,  0,   0,   9,   114, 0,
>+    16,  0,   0,   0,   0,   0,   6,   0,   16,  0,   1,   0,   0,   0,   150, 7,   16,  0,   1,
>+    0,   0,   0,   70,  2,   16,  0,   0,   0,   0,   0,   56,  0,   0,   10,  242, 0,   16,  0,
>+    0,   0,   0,   0,   70,  14,  16,  0,   0,   0,   0,   0,   2,   64,  0,   0,   0,   0,   248,
>+    65,  0,   0,   248, 65,  0,   0,   248, 65,  0,   0,   128, 63,  64,  0,   0,   5,   242, 0,
>+    16,  0,   0,   0,   0,   0,   70,  14,  16,  0,   0,   0,   0,   0,   56,  0,   0,   10,  242,
>+    32,  16,  0,   0,   0,   0,   0,   70,  14,  16,  0,   0,   0,   0,   0,   2,   64,  0,   0,
>+    8,   33,  4,   61,  8,   33,  4,   61,  8,   33,  4,   61,  0,   0,   128, 63,  62,  0,   0,
>+    1,   83,  84,  65,  84,  116, 0,   0,   0,   10,  0,   0,   0,   2,   0,   0,   0,   0,   0,
>+    0,   0,   3,   0,   0,   0,   5,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   2,   0,   0,   0,   1,   0,   0,   0,   2,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0};
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_um_rgba_5551_3d_ps.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_um_rgba_5551_3d_ps.h
>new file mode 100644
>index 00000000000..235f5d7d628
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_um_rgba_5551_3d_ps.h
>@@ -0,0 +1,96 @@
>+#if 0
>+//
>+// Generated by Microsoft (R) HLSL Shader Compiler 9.29.952.3111
>+//
>+//
>+//   fxc /nologo /E PS_FtoF_UM_RGBA_5551_3D /T ps_4_0 /Fh
>+//    compiled\multiplyalpha_ftof_um_rgba_5551_3d_ps.h MultiplyAlpha.hlsl
>+//
>+//
>+// Resource Bindings:
>+//
>+// Name                                 Type  Format         Dim Slot Elements
>+// ------------------------------ ---------- ------- ----------- ---- --------
>+// Sampler                           sampler      NA          NA    0        1
>+// TextureF_3D                       texture  float4          3d    0        1
>+//
>+//
>+//
>+// Input signature:
>+//
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_POSITION              0   xyzw        0      POS  float       
>+// SV_RENDERTARGETARRAYINDEX     0   x           1  RTINDEX   uint       
>+// TEXCOORD                 0   xyz         2     NONE  float   xyz 
>+//
>+//
>+// Output signature:
>+//
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_TARGET                0   xyzw        0   TARGET  float   xyzw
>+//
>+ps_4_0
>+dcl_sampler s0, mode_default
>+dcl_resource_texture3d (float,float,float,float) t0
>+dcl_input_ps linear v2.xyz
>+dcl_output o0.xyzw
>+dcl_temps 2
>+sample r0.xyzw, v2.xyzx, t0.xyzw, s0
>+lt r1.x, l(0.000000), r0.w
>+div r1.yzw, r0.xxyz, r0.wwww
>+movc r0.xyz, r1.xxxx, r1.yzwy, r0.xyzx
>+mul r0.xyzw, r0.xyzw, l(31.000000, 31.000000, 31.000000, 1.000000)
>+round_ne r0.xyzw, r0.xyzw
>+mul o0.xyzw, r0.xyzw, l(0.032258, 0.032258, 0.032258, 1.000000)
>+ret 
>+// Approximately 8 instruction slots used
>+#endif
>+
>+const BYTE g_PS_FtoF_UM_RGBA_5551_3D[] = {
>+    68,  88, 66,  67,  11,  156, 219, 201, 154, 211, 248, 190, 164, 107, 120, 89,  222, 49,  246,
>+    208, 1,  0,   0,   0,   76,  3,   0,   0,   5,   0,   0,   0,   52,  0,   0,   0,   224, 0,
>+    0,   0,  104, 1,   0,   0,   156, 1,   0,   0,   208, 2,   0,   0,   82,  68,  69,  70,  164,
>+    0,   0,  0,   0,   0,   0,   0,   0,   0,   0,   0,   2,   0,   0,   0,   28,  0,   0,   0,
>+    0,   4,  255, 255, 0,   1,   0,   0,   112, 0,   0,   0,   92,  0,   0,   0,   3,   0,   0,
>+    0,   0,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,
>+    0,   0,  1,   0,   0,   0,   100, 0,   0,   0,   2,   0,   0,   0,   5,   0,   0,   0,   8,
>+    0,   0,  0,   255, 255, 255, 255, 0,   0,   0,   0,   1,   0,   0,   0,   13,  0,   0,   0,
>+    83,  97, 109, 112, 108, 101, 114, 0,   84,  101, 120, 116, 117, 114, 101, 70,  95,  51,  68,
>+    0,   77, 105, 99,  114, 111, 115, 111, 102, 116, 32,  40,  82,  41,  32,  72,  76,  83,  76,
>+    32,  83, 104, 97,  100, 101, 114, 32,  67,  111, 109, 112, 105, 108, 101, 114, 32,  57,  46,
>+    50,  57, 46,  57,  53,  50,  46,  51,  49,  49,  49,  0,   171, 171, 171, 73,  83,  71,  78,
>+    128, 0,  0,   0,   3,   0,   0,   0,   8,   0,   0,   0,   80,  0,   0,   0,   0,   0,   0,
>+    0,   1,  0,   0,   0,   3,   0,   0,   0,   0,   0,   0,   0,   15,  0,   0,   0,   92,  0,
>+    0,   0,  0,   0,   0,   0,   4,   0,   0,   0,   1,   0,   0,   0,   1,   0,   0,   0,   1,
>+    0,   0,  0,   118, 0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   3,   0,   0,   0,
>+    2,   0,  0,   0,   7,   7,   0,   0,   83,  86,  95,  80,  79,  83,  73,  84,  73,  79,  78,
>+    0,   83, 86,  95,  82,  69,  78,  68,  69,  82,  84,  65,  82,  71,  69,  84,  65,  82,  82,
>+    65,  89, 73,  78,  68,  69,  88,  0,   84,  69,  88,  67,  79,  79,  82,  68,  0,   171, 79,
>+    83,  71, 78,  44,  0,   0,   0,   1,   0,   0,   0,   8,   0,   0,   0,   32,  0,   0,   0,
>+    0,   0,  0,   0,   0,   0,   0,   0,   3,   0,   0,   0,   0,   0,   0,   0,   15,  0,   0,
>+    0,   83, 86,  95,  84,  65,  82,  71,  69,  84,  0,   171, 171, 83,  72,  68,  82,  44,  1,
>+    0,   0,  64,  0,   0,   0,   75,  0,   0,   0,   90,  0,   0,   3,   0,   96,  16,  0,   0,
>+    0,   0,  0,   88,  40,  0,   4,   0,   112, 16,  0,   0,   0,   0,   0,   85,  85,  0,   0,
>+    98,  16, 0,   3,   114, 16,  16,  0,   2,   0,   0,   0,   101, 0,   0,   3,   242, 32,  16,
>+    0,   0,  0,   0,   0,   104, 0,   0,   2,   2,   0,   0,   0,   69,  0,   0,   9,   242, 0,
>+    16,  0,  0,   0,   0,   0,   70,  18,  16,  0,   2,   0,   0,   0,   70,  126, 16,  0,   0,
>+    0,   0,  0,   0,   96,  16,  0,   0,   0,   0,   0,   49,  0,   0,   7,   18,  0,   16,  0,
>+    1,   0,  0,   0,   1,   64,  0,   0,   0,   0,   0,   0,   58,  0,   16,  0,   0,   0,   0,
>+    0,   14, 0,   0,   7,   226, 0,   16,  0,   1,   0,   0,   0,   6,   9,   16,  0,   0,   0,
>+    0,   0,  246, 15,  16,  0,   0,   0,   0,   0,   55,  0,   0,   9,   114, 0,   16,  0,   0,
>+    0,   0,  0,   6,   0,   16,  0,   1,   0,   0,   0,   150, 7,   16,  0,   1,   0,   0,   0,
>+    70,  2,  16,  0,   0,   0,   0,   0,   56,  0,   0,   10,  242, 0,   16,  0,   0,   0,   0,
>+    0,   70, 14,  16,  0,   0,   0,   0,   0,   2,   64,  0,   0,   0,   0,   248, 65,  0,   0,
>+    248, 65, 0,   0,   248, 65,  0,   0,   128, 63,  64,  0,   0,   5,   242, 0,   16,  0,   0,
>+    0,   0,  0,   70,  14,  16,  0,   0,   0,   0,   0,   56,  0,   0,   10,  242, 32,  16,  0,
>+    0,   0,  0,   0,   70,  14,  16,  0,   0,   0,   0,   0,   2,   64,  0,   0,   8,   33,  4,
>+    61,  8,  33,  4,   61,  8,   33,  4,   61,  0,   0,   128, 63,  62,  0,   0,   1,   83,  84,
>+    65,  84, 116, 0,   0,   0,   8,   0,   0,   0,   2,   0,   0,   0,   0,   0,   0,   0,   2,
>+    0,   0,  0,   5,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,
>+    0,   0,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,  0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,  0,   0,   0,   0,   1,   0,   0,   0,   1,   0,   0,   0,   1,   0,   0,   0,   0,
>+    0,   0,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,  0,   0,   0,   0,   0,   0};
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_um_rgba_5551_ps.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_um_rgba_5551_ps.h
>new file mode 100644
>index 00000000000..479d25f5c94
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_um_rgba_5551_ps.h
>@@ -0,0 +1,92 @@
>+#if 0
>+//
>+// Generated by Microsoft (R) HLSL Shader Compiler 9.29.952.3111
>+//
>+//
>+//   fxc /nologo /E PS_FtoF_UM_RGBA_5551 /T ps_4_0 /Fh
>+//    compiled\multiplyalpha_ftof_um_rgba_5551_ps.h MultiplyAlpha.hlsl
>+//
>+//
>+// Resource Bindings:
>+//
>+// Name                                 Type  Format         Dim Slot Elements
>+// ------------------------------ ---------- ------- ----------- ---- --------
>+// Sampler                           sampler      NA          NA    0        1
>+// TextureF                          texture  float4          2d    0        1
>+//
>+//
>+//
>+// Input signature:
>+//
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_POSITION              0   xyzw        0      POS  float       
>+// TEXCOORD                 0   xy          1     NONE  float   xy  
>+//
>+//
>+// Output signature:
>+//
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_TARGET                0   xyzw        0   TARGET  float   xyzw
>+//
>+ps_4_0
>+dcl_sampler s0, mode_default
>+dcl_resource_texture2d (float,float,float,float) t0
>+dcl_input_ps linear v1.xy
>+dcl_output o0.xyzw
>+dcl_temps 2
>+sample r0.xyzw, v1.xyxx, t0.xyzw, s0
>+lt r1.x, l(0.000000), r0.w
>+div r1.yzw, r0.xxyz, r0.wwww
>+movc r0.xyz, r1.xxxx, r1.yzwy, r0.xyzx
>+mul r0.xyzw, r0.xyzw, l(31.000000, 31.000000, 31.000000, 1.000000)
>+round_ne r0.xyzw, r0.xyzw
>+mul o0.xyzw, r0.xyzw, l(0.032258, 0.032258, 0.032258, 1.000000)
>+ret 
>+// Approximately 8 instruction slots used
>+#endif
>+
>+const BYTE g_PS_FtoF_UM_RGBA_5551[] = {
>+    68,  88,  66,  67,  244, 247, 148, 118, 3,   30,  60,  3,   4,   193, 209, 178, 87,  185, 179,
>+    75,  1,   0,   0,   0,   24,  3,   0,   0,   5,   0,   0,   0,   52,  0,   0,   0,   220, 0,
>+    0,   0,   52,  1,   0,   0,   104, 1,   0,   0,   156, 2,   0,   0,   82,  68,  69,  70,  160,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   2,   0,   0,   0,   28,  0,   0,   0,
>+    0,   4,   255, 255, 0,   1,   0,   0,   109, 0,   0,   0,   92,  0,   0,   0,   3,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,
>+    0,   0,   1,   0,   0,   0,   100, 0,   0,   0,   2,   0,   0,   0,   5,   0,   0,   0,   4,
>+    0,   0,   0,   255, 255, 255, 255, 0,   0,   0,   0,   1,   0,   0,   0,   13,  0,   0,   0,
>+    83,  97,  109, 112, 108, 101, 114, 0,   84,  101, 120, 116, 117, 114, 101, 70,  0,   77,  105,
>+    99,  114, 111, 115, 111, 102, 116, 32,  40,  82,  41,  32,  72,  76,  83,  76,  32,  83,  104,
>+    97,  100, 101, 114, 32,  67,  111, 109, 112, 105, 108, 101, 114, 32,  57,  46,  50,  57,  46,
>+    57,  53,  50,  46,  51,  49,  49,  49,  0,   171, 171, 73,  83,  71,  78,  80,  0,   0,   0,
>+    2,   0,   0,   0,   8,   0,   0,   0,   56,  0,   0,   0,   0,   0,   0,   0,   1,   0,   0,
>+    0,   3,   0,   0,   0,   0,   0,   0,   0,   15,  0,   0,   0,   68,  0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   3,   0,   0,   0,   1,   0,   0,   0,   3,   3,   0,   0,   83,
>+    86,  95,  80,  79,  83,  73,  84,  73,  79,  78,  0,   84,  69,  88,  67,  79,  79,  82,  68,
>+    0,   171, 171, 171, 79,  83,  71,  78,  44,  0,   0,   0,   1,   0,   0,   0,   8,   0,   0,
>+    0,   32,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   3,   0,   0,   0,   0,   0,
>+    0,   0,   15,  0,   0,   0,   83,  86,  95,  84,  65,  82,  71,  69,  84,  0,   171, 171, 83,
>+    72,  68,  82,  44,  1,   0,   0,   64,  0,   0,   0,   75,  0,   0,   0,   90,  0,   0,   3,
>+    0,   96,  16,  0,   0,   0,   0,   0,   88,  24,  0,   4,   0,   112, 16,  0,   0,   0,   0,
>+    0,   85,  85,  0,   0,   98,  16,  0,   3,   50,  16,  16,  0,   1,   0,   0,   0,   101, 0,
>+    0,   3,   242, 32,  16,  0,   0,   0,   0,   0,   104, 0,   0,   2,   2,   0,   0,   0,   69,
>+    0,   0,   9,   242, 0,   16,  0,   0,   0,   0,   0,   70,  16,  16,  0,   1,   0,   0,   0,
>+    70,  126, 16,  0,   0,   0,   0,   0,   0,   96,  16,  0,   0,   0,   0,   0,   49,  0,   0,
>+    7,   18,  0,   16,  0,   1,   0,   0,   0,   1,   64,  0,   0,   0,   0,   0,   0,   58,  0,
>+    16,  0,   0,   0,   0,   0,   14,  0,   0,   7,   226, 0,   16,  0,   1,   0,   0,   0,   6,
>+    9,   16,  0,   0,   0,   0,   0,   246, 15,  16,  0,   0,   0,   0,   0,   55,  0,   0,   9,
>+    114, 0,   16,  0,   0,   0,   0,   0,   6,   0,   16,  0,   1,   0,   0,   0,   150, 7,   16,
>+    0,   1,   0,   0,   0,   70,  2,   16,  0,   0,   0,   0,   0,   56,  0,   0,   10,  242, 0,
>+    16,  0,   0,   0,   0,   0,   70,  14,  16,  0,   0,   0,   0,   0,   2,   64,  0,   0,   0,
>+    0,   248, 65,  0,   0,   248, 65,  0,   0,   248, 65,  0,   0,   128, 63,  64,  0,   0,   5,
>+    242, 0,   16,  0,   0,   0,   0,   0,   70,  14,  16,  0,   0,   0,   0,   0,   56,  0,   0,
>+    10,  242, 32,  16,  0,   0,   0,   0,   0,   70,  14,  16,  0,   0,   0,   0,   0,   2,   64,
>+    0,   0,   8,   33,  4,   61,  8,   33,  4,   61,  8,   33,  4,   61,  0,   0,   128, 63,  62,
>+    0,   0,   1,   83,  84,  65,  84,  116, 0,   0,   0,   8,   0,   0,   0,   2,   0,   0,   0,
>+    0,   0,   0,   0,   2,   0,   0,   0,   5,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   1,   0,   0,   0,
>+    1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0};
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_um_rgba_ps.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_um_rgba_ps.h
>deleted file mode 100644
>index fe8ae71a04a..00000000000
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_um_rgba_ps.h
>+++ /dev/null
>@@ -1,82 +0,0 @@
>-#if 0
>-//
>-// Generated by Microsoft (R) HLSL Shader Compiler 6.3.9600.16384
>-//
>-//
>-// Resource Bindings:
>-//
>-// Name                                 Type  Format         Dim Slot Elements
>-// ------------------------------ ---------- ------- ----------- ---- --------
>-// Sampler                           sampler      NA          NA    0        1
>-// TextureF                          texture  float4          2d    0        1
>-//
>-//
>-//
>-// Input signature:
>-//
>-// Name                 Index   Mask Register SysValue  Format   Used
>-// -------------------- ----- ------ -------- -------- ------- ------
>-// SV_POSITION              0   xyzw        0      POS   float       
>-// TEXCOORD                 0   xy          1     NONE   float   xy  
>-//
>-//
>-// Output signature:
>-//
>-// Name                 Index   Mask Register SysValue  Format   Used
>-// -------------------- ----- ------ -------- -------- ------- ------
>-// SV_TARGET                0   xyzw        0   TARGET   float   xyzw
>-//
>-ps_4_0
>-dcl_sampler s0, mode_default
>-dcl_resource_texture2d (float,float,float,float) t0
>-dcl_input_ps linear v1.xy
>-dcl_output o0.xyzw
>-dcl_temps 2
>-sample r0.xyzw, v1.xyxx, t0.xyzw, s0
>-lt r1.x, l(0.000000), r0.w
>-div r1.yzw, r0.xxyz, r0.wwww
>-movc o0.xyz, r1.xxxx, r1.yzwy, r0.xyzx
>-mov o0.w, r0.w
>-ret 
>-// Approximately 6 instruction slots used
>-#endif
>-
>-const BYTE g_PS_FtoF_UM_RGBA[] = {
>-    68,  88,  66,  67,  186, 41,  193, 245, 39,  138, 185, 101, 12,  196, 111, 158, 103, 199, 2,
>-    40,  1,   0,   0,   0,   200, 2,   0,   0,   5,   0,   0,   0,   52,  0,   0,   0,   220, 0,
>-    0,   0,   52,  1,   0,   0,   104, 1,   0,   0,   76,  2,   0,   0,   82,  68,  69,  70,  160,
>-    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   2,   0,   0,   0,   28,  0,   0,   0,
>-    0,   4,   255, 255, 0,   1,   0,   0,   109, 0,   0,   0,   92,  0,   0,   0,   3,   0,   0,
>-    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,
>-    0,   0,   1,   0,   0,   0,   100, 0,   0,   0,   2,   0,   0,   0,   5,   0,   0,   0,   4,
>-    0,   0,   0,   255, 255, 255, 255, 0,   0,   0,   0,   1,   0,   0,   0,   13,  0,   0,   0,
>-    83,  97,  109, 112, 108, 101, 114, 0,   84,  101, 120, 116, 117, 114, 101, 70,  0,   77,  105,
>-    99,  114, 111, 115, 111, 102, 116, 32,  40,  82,  41,  32,  72,  76,  83,  76,  32,  83,  104,
>-    97,  100, 101, 114, 32,  67,  111, 109, 112, 105, 108, 101, 114, 32,  54,  46,  51,  46,  57,
>-    54,  48,  48,  46,  49,  54,  51,  56,  52,  0,   171, 73,  83,  71,  78,  80,  0,   0,   0,
>-    2,   0,   0,   0,   8,   0,   0,   0,   56,  0,   0,   0,   0,   0,   0,   0,   1,   0,   0,
>-    0,   3,   0,   0,   0,   0,   0,   0,   0,   15,  0,   0,   0,   68,  0,   0,   0,   0,   0,
>-    0,   0,   0,   0,   0,   0,   3,   0,   0,   0,   1,   0,   0,   0,   3,   3,   0,   0,   83,
>-    86,  95,  80,  79,  83,  73,  84,  73,  79,  78,  0,   84,  69,  88,  67,  79,  79,  82,  68,
>-    0,   171, 171, 171, 79,  83,  71,  78,  44,  0,   0,   0,   1,   0,   0,   0,   8,   0,   0,
>-    0,   32,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   3,   0,   0,   0,   0,   0,
>-    0,   0,   15,  0,   0,   0,   83,  86,  95,  84,  65,  82,  71,  69,  84,  0,   171, 171, 83,
>-    72,  68,  82,  220, 0,   0,   0,   64,  0,   0,   0,   55,  0,   0,   0,   90,  0,   0,   3,
>-    0,   96,  16,  0,   0,   0,   0,   0,   88,  24,  0,   4,   0,   112, 16,  0,   0,   0,   0,
>-    0,   85,  85,  0,   0,   98,  16,  0,   3,   50,  16,  16,  0,   1,   0,   0,   0,   101, 0,
>-    0,   3,   242, 32,  16,  0,   0,   0,   0,   0,   104, 0,   0,   2,   2,   0,   0,   0,   69,
>-    0,   0,   9,   242, 0,   16,  0,   0,   0,   0,   0,   70,  16,  16,  0,   1,   0,   0,   0,
>-    70,  126, 16,  0,   0,   0,   0,   0,   0,   96,  16,  0,   0,   0,   0,   0,   49,  0,   0,
>-    7,   18,  0,   16,  0,   1,   0,   0,   0,   1,   64,  0,   0,   0,   0,   0,   0,   58,  0,
>-    16,  0,   0,   0,   0,   0,   14,  0,   0,   7,   226, 0,   16,  0,   1,   0,   0,   0,   6,
>-    9,   16,  0,   0,   0,   0,   0,   246, 15,  16,  0,   0,   0,   0,   0,   55,  0,   0,   9,
>-    114, 32,  16,  0,   0,   0,   0,   0,   6,   0,   16,  0,   1,   0,   0,   0,   150, 7,   16,
>-    0,   1,   0,   0,   0,   70,  2,   16,  0,   0,   0,   0,   0,   54,  0,   0,   5,   130, 32,
>-    16,  0,   0,   0,   0,   0,   58,  0,   16,  0,   0,   0,   0,   0,   62,  0,   0,   1,   83,
>-    84,  65,  84,  116, 0,   0,   0,   6,   0,   0,   0,   2,   0,   0,   0,   0,   0,   0,   0,
>-    2,   0,   0,   0,   2,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,
>-    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>-    0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>-    0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,
>-    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>-    0,   0,   0,   0,   0,   0,   0,   0,   0};
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftoi_pm_rgb_2darray_ps.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftoi_pm_rgb_2darray_ps.h
>new file mode 100644
>index 00000000000..d04d8044e06
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftoi_pm_rgb_2darray_ps.h
>@@ -0,0 +1,98 @@
>+#if 0
>+//
>+// Generated by Microsoft (R) HLSL Shader Compiler 9.29.952.3111
>+//
>+//
>+//   fxc /nologo /E PS_FtoI_PM_RGB_2DArray /T ps_4_0 /Fh
>+//    compiled\multiplyalpha_ftoi_pm_rgb_2darray_ps.h MultiplyAlpha.hlsl
>+//
>+//
>+// Resource Bindings:
>+//
>+// Name                                 Type  Format         Dim Slot Elements
>+// ------------------------------ ---------- ------- ----------- ---- --------
>+// Sampler                           sampler      NA          NA    0        1
>+// TextureF_2DArray                  texture  float4     2darray    0        1
>+//
>+//
>+//
>+// Input signature:
>+//
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_POSITION              0   xyzw        0      POS  float       
>+// SV_RENDERTARGETARRAYINDEX     0   x           1  RTINDEX   uint   x   
>+// TEXCOORD                 0   xyz         2     NONE  float   xy  
>+//
>+//
>+// Output signature:
>+//
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_TARGET                0   xyzw        0   TARGET    int   xyzw
>+//
>+ps_4_0
>+dcl_sampler s0, mode_default
>+dcl_resource_texture2darray (float,float,float,float) t0
>+dcl_input_ps_siv constant v1.x, rendertarget_array_index
>+dcl_input_ps linear v2.xy
>+dcl_output o0.xyzw
>+dcl_temps 1
>+utof r0.z, v1.x
>+mov r0.xy, v2.xyxx
>+sample r0.xyzw, r0.xyzx, t0.xyzw, s0
>+mul r0.xyz, r0.wwww, r0.xyzx
>+mul r0.xyz, r0.xyzx, l(127.000000, 127.000000, 127.000000, 0.000000)
>+round_ne r0.xyz, r0.xyzx
>+ftoi o0.xyz, r0.xyzx
>+mov o0.w, l(1)
>+ret 
>+// Approximately 9 instruction slots used
>+#endif
>+
>+const BYTE g_PS_FtoI_PM_RGB_2DArray[] = {
>+    68,  88,  66,  67,  178, 234, 183, 182, 127, 41,  43,  30,  160, 66,  5,   227, 47,  30,  115,
>+    214, 1,   0,   0,   0,   72,  3,   0,   0,   5,   0,   0,   0,   52,  0,   0,   0,   228, 0,
>+    0,   0,   108, 1,   0,   0,   160, 1,   0,   0,   204, 2,   0,   0,   82,  68,  69,  70,  168,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   2,   0,   0,   0,   28,  0,   0,   0,
>+    0,   4,   255, 255, 0,   1,   0,   0,   117, 0,   0,   0,   92,  0,   0,   0,   3,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,
>+    0,   0,   1,   0,   0,   0,   100, 0,   0,   0,   2,   0,   0,   0,   5,   0,   0,   0,   5,
>+    0,   0,   0,   255, 255, 255, 255, 0,   0,   0,   0,   1,   0,   0,   0,   13,  0,   0,   0,
>+    83,  97,  109, 112, 108, 101, 114, 0,   84,  101, 120, 116, 117, 114, 101, 70,  95,  50,  68,
>+    65,  114, 114, 97,  121, 0,   77,  105, 99,  114, 111, 115, 111, 102, 116, 32,  40,  82,  41,
>+    32,  72,  76,  83,  76,  32,  83,  104, 97,  100, 101, 114, 32,  67,  111, 109, 112, 105, 108,
>+    101, 114, 32,  57,  46,  50,  57,  46,  57,  53,  50,  46,  51,  49,  49,  49,  0,   171, 171,
>+    73,  83,  71,  78,  128, 0,   0,   0,   3,   0,   0,   0,   8,   0,   0,   0,   80,  0,   0,
>+    0,   0,   0,   0,   0,   1,   0,   0,   0,   3,   0,   0,   0,   0,   0,   0,   0,   15,  0,
>+    0,   0,   92,  0,   0,   0,   0,   0,   0,   0,   4,   0,   0,   0,   1,   0,   0,   0,   1,
>+    0,   0,   0,   1,   1,   0,   0,   118, 0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    3,   0,   0,   0,   2,   0,   0,   0,   7,   3,   0,   0,   83,  86,  95,  80,  79,  83,  73,
>+    84,  73,  79,  78,  0,   83,  86,  95,  82,  69,  78,  68,  69,  82,  84,  65,  82,  71,  69,
>+    84,  65,  82,  82,  65,  89,  73,  78,  68,  69,  88,  0,   84,  69,  88,  67,  79,  79,  82,
>+    68,  0,   171, 79,  83,  71,  78,  44,  0,   0,   0,   1,   0,   0,   0,   8,   0,   0,   0,
>+    32,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   2,   0,   0,   0,   0,   0,   0,
>+    0,   15,  0,   0,   0,   83,  86,  95,  84,  65,  82,  71,  69,  84,  0,   171, 171, 83,  72,
>+    68,  82,  36,  1,   0,   0,   64,  0,   0,   0,   73,  0,   0,   0,   90,  0,   0,   3,   0,
>+    96,  16,  0,   0,   0,   0,   0,   88,  64,  0,   4,   0,   112, 16,  0,   0,   0,   0,   0,
>+    85,  85,  0,   0,   100, 8,   0,   4,   18,  16,  16,  0,   1,   0,   0,   0,   4,   0,   0,
>+    0,   98,  16,  0,   3,   50,  16,  16,  0,   2,   0,   0,   0,   101, 0,   0,   3,   242, 32,
>+    16,  0,   0,   0,   0,   0,   104, 0,   0,   2,   1,   0,   0,   0,   86,  0,   0,   5,   66,
>+    0,   16,  0,   0,   0,   0,   0,   10,  16,  16,  0,   1,   0,   0,   0,   54,  0,   0,   5,
>+    50,  0,   16,  0,   0,   0,   0,   0,   70,  16,  16,  0,   2,   0,   0,   0,   69,  0,   0,
>+    9,   242, 0,   16,  0,   0,   0,   0,   0,   70,  2,   16,  0,   0,   0,   0,   0,   70,  126,
>+    16,  0,   0,   0,   0,   0,   0,   96,  16,  0,   0,   0,   0,   0,   56,  0,   0,   7,   114,
>+    0,   16,  0,   0,   0,   0,   0,   246, 15,  16,  0,   0,   0,   0,   0,   70,  2,   16,  0,
>+    0,   0,   0,   0,   56,  0,   0,   10,  114, 0,   16,  0,   0,   0,   0,   0,   70,  2,   16,
>+    0,   0,   0,   0,   0,   2,   64,  0,   0,   0,   0,   254, 66,  0,   0,   254, 66,  0,   0,
>+    254, 66,  0,   0,   0,   0,   64,  0,   0,   5,   114, 0,   16,  0,   0,   0,   0,   0,   70,
>+    2,   16,  0,   0,   0,   0,   0,   27,  0,   0,   5,   114, 32,  16,  0,   0,   0,   0,   0,
>+    70,  2,   16,  0,   0,   0,   0,   0,   54,  0,   0,   5,   130, 32,  16,  0,   0,   0,   0,
>+    0,   1,   64,  0,   0,   1,   0,   0,   0,   62,  0,   0,   1,   83,  84,  65,  84,  116, 0,
>+    0,   0,   9,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   3,   0,   0,   0,   3,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   2,   0,   0,   0,   0,   0,   0,   0,   3,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0};
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftoi_pm_rgb_3d_ps.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftoi_pm_rgb_3d_ps.h
>new file mode 100644
>index 00000000000..4b51b2ac462
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftoi_pm_rgb_3d_ps.h
>@@ -0,0 +1,92 @@
>+#if 0
>+//
>+// Generated by Microsoft (R) HLSL Shader Compiler 9.29.952.3111
>+//
>+//
>+//   fxc /nologo /E PS_FtoI_PM_RGB_3D /T ps_4_0 /Fh
>+//    compiled\multiplyalpha_ftoi_pm_rgb_3d_ps.h MultiplyAlpha.hlsl
>+//
>+//
>+// Resource Bindings:
>+//
>+// Name                                 Type  Format         Dim Slot Elements
>+// ------------------------------ ---------- ------- ----------- ---- --------
>+// Sampler                           sampler      NA          NA    0        1
>+// TextureF_3D                       texture  float4          3d    0        1
>+//
>+//
>+//
>+// Input signature:
>+//
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_POSITION              0   xyzw        0      POS  float       
>+// SV_RENDERTARGETARRAYINDEX     0   x           1  RTINDEX   uint       
>+// TEXCOORD                 0   xyz         2     NONE  float   xyz 
>+//
>+//
>+// Output signature:
>+//
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_TARGET                0   xyzw        0   TARGET    int   xyzw
>+//
>+ps_4_0
>+dcl_sampler s0, mode_default
>+dcl_resource_texture3d (float,float,float,float) t0
>+dcl_input_ps linear v2.xyz
>+dcl_output o0.xyzw
>+dcl_temps 1
>+sample r0.xyzw, v2.xyzx, t0.xyzw, s0
>+mul r0.xyz, r0.wwww, r0.xyzx
>+mul r0.xyz, r0.xyzx, l(127.000000, 127.000000, 127.000000, 0.000000)
>+round_ne r0.xyz, r0.xyzx
>+ftoi o0.xyz, r0.xyzx
>+mov o0.w, l(1)
>+ret 
>+// Approximately 7 instruction slots used
>+#endif
>+
>+const BYTE g_PS_FtoI_PM_RGB_3D[] = {
>+    68,  88, 66,  67,  223, 210, 226, 205, 135, 197, 5,   16,  69,  92,  186, 191, 202, 155, 229,
>+    110, 1,  0,   0,   0,   12,  3,   0,   0,   5,   0,   0,   0,   52,  0,   0,   0,   224, 0,
>+    0,   0,  104, 1,   0,   0,   156, 1,   0,   0,   144, 2,   0,   0,   82,  68,  69,  70,  164,
>+    0,   0,  0,   0,   0,   0,   0,   0,   0,   0,   0,   2,   0,   0,   0,   28,  0,   0,   0,
>+    0,   4,  255, 255, 0,   1,   0,   0,   112, 0,   0,   0,   92,  0,   0,   0,   3,   0,   0,
>+    0,   0,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,
>+    0,   0,  1,   0,   0,   0,   100, 0,   0,   0,   2,   0,   0,   0,   5,   0,   0,   0,   8,
>+    0,   0,  0,   255, 255, 255, 255, 0,   0,   0,   0,   1,   0,   0,   0,   13,  0,   0,   0,
>+    83,  97, 109, 112, 108, 101, 114, 0,   84,  101, 120, 116, 117, 114, 101, 70,  95,  51,  68,
>+    0,   77, 105, 99,  114, 111, 115, 111, 102, 116, 32,  40,  82,  41,  32,  72,  76,  83,  76,
>+    32,  83, 104, 97,  100, 101, 114, 32,  67,  111, 109, 112, 105, 108, 101, 114, 32,  57,  46,
>+    50,  57, 46,  57,  53,  50,  46,  51,  49,  49,  49,  0,   171, 171, 171, 73,  83,  71,  78,
>+    128, 0,  0,   0,   3,   0,   0,   0,   8,   0,   0,   0,   80,  0,   0,   0,   0,   0,   0,
>+    0,   1,  0,   0,   0,   3,   0,   0,   0,   0,   0,   0,   0,   15,  0,   0,   0,   92,  0,
>+    0,   0,  0,   0,   0,   0,   4,   0,   0,   0,   1,   0,   0,   0,   1,   0,   0,   0,   1,
>+    0,   0,  0,   118, 0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   3,   0,   0,   0,
>+    2,   0,  0,   0,   7,   7,   0,   0,   83,  86,  95,  80,  79,  83,  73,  84,  73,  79,  78,
>+    0,   83, 86,  95,  82,  69,  78,  68,  69,  82,  84,  65,  82,  71,  69,  84,  65,  82,  82,
>+    65,  89, 73,  78,  68,  69,  88,  0,   84,  69,  88,  67,  79,  79,  82,  68,  0,   171, 79,
>+    83,  71, 78,  44,  0,   0,   0,   1,   0,   0,   0,   8,   0,   0,   0,   32,  0,   0,   0,
>+    0,   0,  0,   0,   0,   0,   0,   0,   2,   0,   0,   0,   0,   0,   0,   0,   15,  0,   0,
>+    0,   83, 86,  95,  84,  65,  82,  71,  69,  84,  0,   171, 171, 83,  72,  68,  82,  236, 0,
>+    0,   0,  64,  0,   0,   0,   59,  0,   0,   0,   90,  0,   0,   3,   0,   96,  16,  0,   0,
>+    0,   0,  0,   88,  40,  0,   4,   0,   112, 16,  0,   0,   0,   0,   0,   85,  85,  0,   0,
>+    98,  16, 0,   3,   114, 16,  16,  0,   2,   0,   0,   0,   101, 0,   0,   3,   242, 32,  16,
>+    0,   0,  0,   0,   0,   104, 0,   0,   2,   1,   0,   0,   0,   69,  0,   0,   9,   242, 0,
>+    16,  0,  0,   0,   0,   0,   70,  18,  16,  0,   2,   0,   0,   0,   70,  126, 16,  0,   0,
>+    0,   0,  0,   0,   96,  16,  0,   0,   0,   0,   0,   56,  0,   0,   7,   114, 0,   16,  0,
>+    0,   0,  0,   0,   246, 15,  16,  0,   0,   0,   0,   0,   70,  2,   16,  0,   0,   0,   0,
>+    0,   56, 0,   0,   10,  114, 0,   16,  0,   0,   0,   0,   0,   70,  2,   16,  0,   0,   0,
>+    0,   0,  2,   64,  0,   0,   0,   0,   254, 66,  0,   0,   254, 66,  0,   0,   254, 66,  0,
>+    0,   0,  0,   64,  0,   0,   5,   114, 0,   16,  0,   0,   0,   0,   0,   70,  2,   16,  0,
>+    0,   0,  0,   0,   27,  0,   0,   5,   114, 32,  16,  0,   0,   0,   0,   0,   70,  2,   16,
>+    0,   0,  0,   0,   0,   54,  0,   0,   5,   130, 32,  16,  0,   0,   0,   0,   0,   1,   64,
>+    0,   0,  1,   0,   0,   0,   62,  0,   0,   1,   83,  84,  65,  84,  116, 0,   0,   0,   7,
>+    0,   0,  0,   1,   0,   0,   0,   0,   0,   0,   0,   2,   0,   0,   0,   3,   0,   0,   0,
>+    0,   0,  0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,
>+    0,   0,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,
>+    0,   0,  0,   0,   0,   0,   0,   2,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0};
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftoi_pm_rgba_2darray_ps.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftoi_pm_rgba_2darray_ps.h
>new file mode 100644
>index 00000000000..b2f822152c4
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftoi_pm_rgba_2darray_ps.h
>@@ -0,0 +1,96 @@
>+#if 0
>+//
>+// Generated by Microsoft (R) HLSL Shader Compiler 9.29.952.3111
>+//
>+//
>+//   fxc /nologo /E PS_FtoI_PM_RGBA_2DArray /T ps_4_0 /Fh
>+//    compiled\multiplyalpha_ftoi_pm_rgba_2darray_ps.h MultiplyAlpha.hlsl
>+//
>+//
>+// Resource Bindings:
>+//
>+// Name                                 Type  Format         Dim Slot Elements
>+// ------------------------------ ---------- ------- ----------- ---- --------
>+// Sampler                           sampler      NA          NA    0        1
>+// TextureF_2DArray                  texture  float4     2darray    0        1
>+//
>+//
>+//
>+// Input signature:
>+//
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_POSITION              0   xyzw        0      POS  float       
>+// SV_RENDERTARGETARRAYINDEX     0   x           1  RTINDEX   uint   x   
>+// TEXCOORD                 0   xyz         2     NONE  float   xy  
>+//
>+//
>+// Output signature:
>+//
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_TARGET                0   xyzw        0   TARGET    int   xyzw
>+//
>+ps_4_0
>+dcl_sampler s0, mode_default
>+dcl_resource_texture2darray (float,float,float,float) t0
>+dcl_input_ps_siv constant v1.x, rendertarget_array_index
>+dcl_input_ps linear v2.xy
>+dcl_output o0.xyzw
>+dcl_temps 1
>+utof r0.z, v1.x
>+mov r0.xy, v2.xyxx
>+sample r0.xyzw, r0.xyzx, t0.xyzw, s0
>+mul r0.xyz, r0.wwww, r0.xyzx
>+mul r0.xyzw, r0.xyzw, l(127.000000, 127.000000, 127.000000, 127.000000)
>+round_ne r0.xyzw, r0.xyzw
>+ftoi o0.xyzw, r0.xyzw
>+ret 
>+// Approximately 8 instruction slots used
>+#endif
>+
>+const BYTE g_PS_FtoI_PM_RGBA_2DArray[] = {
>+    68,  88,  66,  67,  87,  131, 227, 32,  225, 230, 151, 126, 121, 211, 132, 157, 16,  12,  99,
>+    119, 1,   0,   0,   0,   52,  3,   0,   0,   5,   0,   0,   0,   52,  0,   0,   0,   228, 0,
>+    0,   0,   108, 1,   0,   0,   160, 1,   0,   0,   184, 2,   0,   0,   82,  68,  69,  70,  168,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   2,   0,   0,   0,   28,  0,   0,   0,
>+    0,   4,   255, 255, 0,   1,   0,   0,   117, 0,   0,   0,   92,  0,   0,   0,   3,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,
>+    0,   0,   1,   0,   0,   0,   100, 0,   0,   0,   2,   0,   0,   0,   5,   0,   0,   0,   5,
>+    0,   0,   0,   255, 255, 255, 255, 0,   0,   0,   0,   1,   0,   0,   0,   13,  0,   0,   0,
>+    83,  97,  109, 112, 108, 101, 114, 0,   84,  101, 120, 116, 117, 114, 101, 70,  95,  50,  68,
>+    65,  114, 114, 97,  121, 0,   77,  105, 99,  114, 111, 115, 111, 102, 116, 32,  40,  82,  41,
>+    32,  72,  76,  83,  76,  32,  83,  104, 97,  100, 101, 114, 32,  67,  111, 109, 112, 105, 108,
>+    101, 114, 32,  57,  46,  50,  57,  46,  57,  53,  50,  46,  51,  49,  49,  49,  0,   171, 171,
>+    73,  83,  71,  78,  128, 0,   0,   0,   3,   0,   0,   0,   8,   0,   0,   0,   80,  0,   0,
>+    0,   0,   0,   0,   0,   1,   0,   0,   0,   3,   0,   0,   0,   0,   0,   0,   0,   15,  0,
>+    0,   0,   92,  0,   0,   0,   0,   0,   0,   0,   4,   0,   0,   0,   1,   0,   0,   0,   1,
>+    0,   0,   0,   1,   1,   0,   0,   118, 0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    3,   0,   0,   0,   2,   0,   0,   0,   7,   3,   0,   0,   83,  86,  95,  80,  79,  83,  73,
>+    84,  73,  79,  78,  0,   83,  86,  95,  82,  69,  78,  68,  69,  82,  84,  65,  82,  71,  69,
>+    84,  65,  82,  82,  65,  89,  73,  78,  68,  69,  88,  0,   84,  69,  88,  67,  79,  79,  82,
>+    68,  0,   171, 79,  83,  71,  78,  44,  0,   0,   0,   1,   0,   0,   0,   8,   0,   0,   0,
>+    32,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   2,   0,   0,   0,   0,   0,   0,
>+    0,   15,  0,   0,   0,   83,  86,  95,  84,  65,  82,  71,  69,  84,  0,   171, 171, 83,  72,
>+    68,  82,  16,  1,   0,   0,   64,  0,   0,   0,   68,  0,   0,   0,   90,  0,   0,   3,   0,
>+    96,  16,  0,   0,   0,   0,   0,   88,  64,  0,   4,   0,   112, 16,  0,   0,   0,   0,   0,
>+    85,  85,  0,   0,   100, 8,   0,   4,   18,  16,  16,  0,   1,   0,   0,   0,   4,   0,   0,
>+    0,   98,  16,  0,   3,   50,  16,  16,  0,   2,   0,   0,   0,   101, 0,   0,   3,   242, 32,
>+    16,  0,   0,   0,   0,   0,   104, 0,   0,   2,   1,   0,   0,   0,   86,  0,   0,   5,   66,
>+    0,   16,  0,   0,   0,   0,   0,   10,  16,  16,  0,   1,   0,   0,   0,   54,  0,   0,   5,
>+    50,  0,   16,  0,   0,   0,   0,   0,   70,  16,  16,  0,   2,   0,   0,   0,   69,  0,   0,
>+    9,   242, 0,   16,  0,   0,   0,   0,   0,   70,  2,   16,  0,   0,   0,   0,   0,   70,  126,
>+    16,  0,   0,   0,   0,   0,   0,   96,  16,  0,   0,   0,   0,   0,   56,  0,   0,   7,   114,
>+    0,   16,  0,   0,   0,   0,   0,   246, 15,  16,  0,   0,   0,   0,   0,   70,  2,   16,  0,
>+    0,   0,   0,   0,   56,  0,   0,   10,  242, 0,   16,  0,   0,   0,   0,   0,   70,  14,  16,
>+    0,   0,   0,   0,   0,   2,   64,  0,   0,   0,   0,   254, 66,  0,   0,   254, 66,  0,   0,
>+    254, 66,  0,   0,   254, 66,  64,  0,   0,   5,   242, 0,   16,  0,   0,   0,   0,   0,   70,
>+    14,  16,  0,   0,   0,   0,   0,   27,  0,   0,   5,   242, 32,  16,  0,   0,   0,   0,   0,
>+    70,  14,  16,  0,   0,   0,   0,   0,   62,  0,   0,   1,   83,  84,  65,  84,  116, 0,   0,
>+    0,   8,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   3,   0,   0,   0,   3,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   2,   0,   0,   0,   0,   0,   0,   0,   3,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0};
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftoi_pm_rgba_3d_ps.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftoi_pm_rgba_3d_ps.h
>new file mode 100644
>index 00000000000..54bd284deaf
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftoi_pm_rgba_3d_ps.h
>@@ -0,0 +1,89 @@
>+#if 0
>+//
>+// Generated by Microsoft (R) HLSL Shader Compiler 9.29.952.3111
>+//
>+//
>+//   fxc /nologo /E PS_FtoI_PM_RGBA_3D /T ps_4_0 /Fh
>+//    compiled\multiplyalpha_ftoi_pm_rgba_3d_ps.h MultiplyAlpha.hlsl
>+//
>+//
>+// Resource Bindings:
>+//
>+// Name                                 Type  Format         Dim Slot Elements
>+// ------------------------------ ---------- ------- ----------- ---- --------
>+// Sampler                           sampler      NA          NA    0        1
>+// TextureF_3D                       texture  float4          3d    0        1
>+//
>+//
>+//
>+// Input signature:
>+//
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_POSITION              0   xyzw        0      POS  float       
>+// SV_RENDERTARGETARRAYINDEX     0   x           1  RTINDEX   uint       
>+// TEXCOORD                 0   xyz         2     NONE  float   xyz 
>+//
>+//
>+// Output signature:
>+//
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_TARGET                0   xyzw        0   TARGET    int   xyzw
>+//
>+ps_4_0
>+dcl_sampler s0, mode_default
>+dcl_resource_texture3d (float,float,float,float) t0
>+dcl_input_ps linear v2.xyz
>+dcl_output o0.xyzw
>+dcl_temps 1
>+sample r0.xyzw, v2.xyzx, t0.xyzw, s0
>+mul r0.xyz, r0.wwww, r0.xyzx
>+mul r0.xyzw, r0.xyzw, l(127.000000, 127.000000, 127.000000, 127.000000)
>+round_ne r0.xyzw, r0.xyzw
>+ftoi o0.xyzw, r0.xyzw
>+ret 
>+// Approximately 6 instruction slots used
>+#endif
>+
>+const BYTE g_PS_FtoI_PM_RGBA_3D[] = {
>+    68,  88,  66,  67,  76,  57,  132, 133, 26,  119, 131, 55,  47,  147, 155, 129, 114, 58,  103,
>+    131, 1,   0,   0,   0,   248, 2,   0,   0,   5,   0,   0,   0,   52,  0,   0,   0,   224, 0,
>+    0,   0,   104, 1,   0,   0,   156, 1,   0,   0,   124, 2,   0,   0,   82,  68,  69,  70,  164,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   2,   0,   0,   0,   28,  0,   0,   0,
>+    0,   4,   255, 255, 0,   1,   0,   0,   112, 0,   0,   0,   92,  0,   0,   0,   3,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,
>+    0,   0,   1,   0,   0,   0,   100, 0,   0,   0,   2,   0,   0,   0,   5,   0,   0,   0,   8,
>+    0,   0,   0,   255, 255, 255, 255, 0,   0,   0,   0,   1,   0,   0,   0,   13,  0,   0,   0,
>+    83,  97,  109, 112, 108, 101, 114, 0,   84,  101, 120, 116, 117, 114, 101, 70,  95,  51,  68,
>+    0,   77,  105, 99,  114, 111, 115, 111, 102, 116, 32,  40,  82,  41,  32,  72,  76,  83,  76,
>+    32,  83,  104, 97,  100, 101, 114, 32,  67,  111, 109, 112, 105, 108, 101, 114, 32,  57,  46,
>+    50,  57,  46,  57,  53,  50,  46,  51,  49,  49,  49,  0,   171, 171, 171, 73,  83,  71,  78,
>+    128, 0,   0,   0,   3,   0,   0,   0,   8,   0,   0,   0,   80,  0,   0,   0,   0,   0,   0,
>+    0,   1,   0,   0,   0,   3,   0,   0,   0,   0,   0,   0,   0,   15,  0,   0,   0,   92,  0,
>+    0,   0,   0,   0,   0,   0,   4,   0,   0,   0,   1,   0,   0,   0,   1,   0,   0,   0,   1,
>+    0,   0,   0,   118, 0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   3,   0,   0,   0,
>+    2,   0,   0,   0,   7,   7,   0,   0,   83,  86,  95,  80,  79,  83,  73,  84,  73,  79,  78,
>+    0,   83,  86,  95,  82,  69,  78,  68,  69,  82,  84,  65,  82,  71,  69,  84,  65,  82,  82,
>+    65,  89,  73,  78,  68,  69,  88,  0,   84,  69,  88,  67,  79,  79,  82,  68,  0,   171, 79,
>+    83,  71,  78,  44,  0,   0,   0,   1,   0,   0,   0,   8,   0,   0,   0,   32,  0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   2,   0,   0,   0,   0,   0,   0,   0,   15,  0,   0,
>+    0,   83,  86,  95,  84,  65,  82,  71,  69,  84,  0,   171, 171, 83,  72,  68,  82,  216, 0,
>+    0,   0,   64,  0,   0,   0,   54,  0,   0,   0,   90,  0,   0,   3,   0,   96,  16,  0,   0,
>+    0,   0,   0,   88,  40,  0,   4,   0,   112, 16,  0,   0,   0,   0,   0,   85,  85,  0,   0,
>+    98,  16,  0,   3,   114, 16,  16,  0,   2,   0,   0,   0,   101, 0,   0,   3,   242, 32,  16,
>+    0,   0,   0,   0,   0,   104, 0,   0,   2,   1,   0,   0,   0,   69,  0,   0,   9,   242, 0,
>+    16,  0,   0,   0,   0,   0,   70,  18,  16,  0,   2,   0,   0,   0,   70,  126, 16,  0,   0,
>+    0,   0,   0,   0,   96,  16,  0,   0,   0,   0,   0,   56,  0,   0,   7,   114, 0,   16,  0,
>+    0,   0,   0,   0,   246, 15,  16,  0,   0,   0,   0,   0,   70,  2,   16,  0,   0,   0,   0,
>+    0,   56,  0,   0,   10,  242, 0,   16,  0,   0,   0,   0,   0,   70,  14,  16,  0,   0,   0,
>+    0,   0,   2,   64,  0,   0,   0,   0,   254, 66,  0,   0,   254, 66,  0,   0,   254, 66,  0,
>+    0,   254, 66,  64,  0,   0,   5,   242, 0,   16,  0,   0,   0,   0,   0,   70,  14,  16,  0,
>+    0,   0,   0,   0,   27,  0,   0,   5,   242, 32,  16,  0,   0,   0,   0,   0,   70,  14,  16,
>+    0,   0,   0,   0,   0,   62,  0,   0,   1,   83,  84,  65,  84,  116, 0,   0,   0,   6,   0,
>+    0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   2,   0,   0,   0,   3,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,
>+    0,   0,   0,   0,   0,   0,   2,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0};
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftoi_pt_rgb_2darray_ps.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftoi_pt_rgb_2darray_ps.h
>new file mode 100644
>index 00000000000..ff9a4fc322a
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftoi_pt_rgb_2darray_ps.h
>@@ -0,0 +1,95 @@
>+#if 0
>+//
>+// Generated by Microsoft (R) HLSL Shader Compiler 9.29.952.3111
>+//
>+//
>+//   fxc /nologo /E PS_FtoI_PT_RGB_2DArray /T ps_4_0 /Fh
>+//    compiled\multiplyalpha_ftoi_pt_rgb_2darray_ps.h MultiplyAlpha.hlsl
>+//
>+//
>+// Resource Bindings:
>+//
>+// Name                                 Type  Format         Dim Slot Elements
>+// ------------------------------ ---------- ------- ----------- ---- --------
>+// Sampler                           sampler      NA          NA    0        1
>+// TextureF_2DArray                  texture  float4     2darray    0        1
>+//
>+//
>+//
>+// Input signature:
>+//
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_POSITION              0   xyzw        0      POS  float       
>+// SV_RENDERTARGETARRAYINDEX     0   x           1  RTINDEX   uint   x   
>+// TEXCOORD                 0   xyz         2     NONE  float   xy  
>+//
>+//
>+// Output signature:
>+//
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_TARGET                0   xyzw        0   TARGET    int   xyzw
>+//
>+ps_4_0
>+dcl_sampler s0, mode_default
>+dcl_resource_texture2darray (float,float,float,float) t0
>+dcl_input_ps_siv constant v1.x, rendertarget_array_index
>+dcl_input_ps linear v2.xy
>+dcl_output o0.xyzw
>+dcl_temps 1
>+utof r0.z, v1.x
>+mov r0.xy, v2.xyxx
>+sample r0.xyzw, r0.xyzx, t0.xyzw, s0
>+mul r0.xyz, r0.xyzx, l(127.000000, 127.000000, 127.000000, 0.000000)
>+round_ne r0.xyz, r0.xyzx
>+ftoi o0.xyz, r0.xyzx
>+mov o0.w, l(1)
>+ret 
>+// Approximately 8 instruction slots used
>+#endif
>+
>+const BYTE g_PS_FtoI_PT_RGB_2DArray[] = {
>+    68,  88,  66,  67,  222, 89,  121, 207, 53,  159, 15,  135, 134, 177, 156, 255, 37,  117, 152,
>+    141, 1,   0,   0,   0,   44,  3,   0,   0,   5,   0,   0,   0,   52,  0,   0,   0,   228, 0,
>+    0,   0,   108, 1,   0,   0,   160, 1,   0,   0,   176, 2,   0,   0,   82,  68,  69,  70,  168,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   2,   0,   0,   0,   28,  0,   0,   0,
>+    0,   4,   255, 255, 0,   1,   0,   0,   117, 0,   0,   0,   92,  0,   0,   0,   3,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,
>+    0,   0,   1,   0,   0,   0,   100, 0,   0,   0,   2,   0,   0,   0,   5,   0,   0,   0,   5,
>+    0,   0,   0,   255, 255, 255, 255, 0,   0,   0,   0,   1,   0,   0,   0,   13,  0,   0,   0,
>+    83,  97,  109, 112, 108, 101, 114, 0,   84,  101, 120, 116, 117, 114, 101, 70,  95,  50,  68,
>+    65,  114, 114, 97,  121, 0,   77,  105, 99,  114, 111, 115, 111, 102, 116, 32,  40,  82,  41,
>+    32,  72,  76,  83,  76,  32,  83,  104, 97,  100, 101, 114, 32,  67,  111, 109, 112, 105, 108,
>+    101, 114, 32,  57,  46,  50,  57,  46,  57,  53,  50,  46,  51,  49,  49,  49,  0,   171, 171,
>+    73,  83,  71,  78,  128, 0,   0,   0,   3,   0,   0,   0,   8,   0,   0,   0,   80,  0,   0,
>+    0,   0,   0,   0,   0,   1,   0,   0,   0,   3,   0,   0,   0,   0,   0,   0,   0,   15,  0,
>+    0,   0,   92,  0,   0,   0,   0,   0,   0,   0,   4,   0,   0,   0,   1,   0,   0,   0,   1,
>+    0,   0,   0,   1,   1,   0,   0,   118, 0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    3,   0,   0,   0,   2,   0,   0,   0,   7,   3,   0,   0,   83,  86,  95,  80,  79,  83,  73,
>+    84,  73,  79,  78,  0,   83,  86,  95,  82,  69,  78,  68,  69,  82,  84,  65,  82,  71,  69,
>+    84,  65,  82,  82,  65,  89,  73,  78,  68,  69,  88,  0,   84,  69,  88,  67,  79,  79,  82,
>+    68,  0,   171, 79,  83,  71,  78,  44,  0,   0,   0,   1,   0,   0,   0,   8,   0,   0,   0,
>+    32,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   2,   0,   0,   0,   0,   0,   0,
>+    0,   15,  0,   0,   0,   83,  86,  95,  84,  65,  82,  71,  69,  84,  0,   171, 171, 83,  72,
>+    68,  82,  8,   1,   0,   0,   64,  0,   0,   0,   66,  0,   0,   0,   90,  0,   0,   3,   0,
>+    96,  16,  0,   0,   0,   0,   0,   88,  64,  0,   4,   0,   112, 16,  0,   0,   0,   0,   0,
>+    85,  85,  0,   0,   100, 8,   0,   4,   18,  16,  16,  0,   1,   0,   0,   0,   4,   0,   0,
>+    0,   98,  16,  0,   3,   50,  16,  16,  0,   2,   0,   0,   0,   101, 0,   0,   3,   242, 32,
>+    16,  0,   0,   0,   0,   0,   104, 0,   0,   2,   1,   0,   0,   0,   86,  0,   0,   5,   66,
>+    0,   16,  0,   0,   0,   0,   0,   10,  16,  16,  0,   1,   0,   0,   0,   54,  0,   0,   5,
>+    50,  0,   16,  0,   0,   0,   0,   0,   70,  16,  16,  0,   2,   0,   0,   0,   69,  0,   0,
>+    9,   242, 0,   16,  0,   0,   0,   0,   0,   70,  2,   16,  0,   0,   0,   0,   0,   70,  126,
>+    16,  0,   0,   0,   0,   0,   0,   96,  16,  0,   0,   0,   0,   0,   56,  0,   0,   10,  114,
>+    0,   16,  0,   0,   0,   0,   0,   70,  2,   16,  0,   0,   0,   0,   0,   2,   64,  0,   0,
>+    0,   0,   254, 66,  0,   0,   254, 66,  0,   0,   254, 66,  0,   0,   0,   0,   64,  0,   0,
>+    5,   114, 0,   16,  0,   0,   0,   0,   0,   70,  2,   16,  0,   0,   0,   0,   0,   27,  0,
>+    0,   5,   114, 32,  16,  0,   0,   0,   0,   0,   70,  2,   16,  0,   0,   0,   0,   0,   54,
>+    0,   0,   5,   130, 32,  16,  0,   0,   0,   0,   0,   1,   64,  0,   0,   1,   0,   0,   0,
>+    62,  0,   0,   1,   83,  84,  65,  84,  116, 0,   0,   0,   8,   0,   0,   0,   1,   0,   0,
>+    0,   0,   0,   0,   0,   3,   0,   0,   0,   2,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   2,   0,   0,   0,   0,   0,   0,
>+    0,   3,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0};
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftoi_pt_rgb_3d_ps.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftoi_pt_rgb_3d_ps.h
>new file mode 100644
>index 00000000000..6e9b39d1631
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftoi_pt_rgb_3d_ps.h
>@@ -0,0 +1,89 @@
>+#if 0
>+//
>+// Generated by Microsoft (R) HLSL Shader Compiler 9.29.952.3111
>+//
>+//
>+//   fxc /nologo /E PS_FtoI_PT_RGB_3D /T ps_4_0 /Fh
>+//    compiled\multiplyalpha_ftoi_pt_rgb_3d_ps.h MultiplyAlpha.hlsl
>+//
>+//
>+// Resource Bindings:
>+//
>+// Name                                 Type  Format         Dim Slot Elements
>+// ------------------------------ ---------- ------- ----------- ---- --------
>+// Sampler                           sampler      NA          NA    0        1
>+// TextureF_3D                       texture  float4          3d    0        1
>+//
>+//
>+//
>+// Input signature:
>+//
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_POSITION              0   xyzw        0      POS  float       
>+// SV_RENDERTARGETARRAYINDEX     0   x           1  RTINDEX   uint       
>+// TEXCOORD                 0   xyz         2     NONE  float   xyz 
>+//
>+//
>+// Output signature:
>+//
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_TARGET                0   xyzw        0   TARGET    int   xyzw
>+//
>+ps_4_0
>+dcl_sampler s0, mode_default
>+dcl_resource_texture3d (float,float,float,float) t0
>+dcl_input_ps linear v2.xyz
>+dcl_output o0.xyzw
>+dcl_temps 1
>+sample r0.xyzw, v2.xyzx, t0.xyzw, s0
>+mul r0.xyz, r0.xyzx, l(127.000000, 127.000000, 127.000000, 0.000000)
>+round_ne r0.xyz, r0.xyzx
>+ftoi o0.xyz, r0.xyzx
>+mov o0.w, l(1)
>+ret 
>+// Approximately 6 instruction slots used
>+#endif
>+
>+const BYTE g_PS_FtoI_PT_RGB_3D[] = {
>+    68,  88, 66,  67,  43,  227, 90,  159, 144, 11,  2,   191, 69,  118, 253, 191, 58,  136, 178,
>+    132, 1,  0,   0,   0,   240, 2,   0,   0,   5,   0,   0,   0,   52,  0,   0,   0,   224, 0,
>+    0,   0,  104, 1,   0,   0,   156, 1,   0,   0,   116, 2,   0,   0,   82,  68,  69,  70,  164,
>+    0,   0,  0,   0,   0,   0,   0,   0,   0,   0,   0,   2,   0,   0,   0,   28,  0,   0,   0,
>+    0,   4,  255, 255, 0,   1,   0,   0,   112, 0,   0,   0,   92,  0,   0,   0,   3,   0,   0,
>+    0,   0,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,
>+    0,   0,  1,   0,   0,   0,   100, 0,   0,   0,   2,   0,   0,   0,   5,   0,   0,   0,   8,
>+    0,   0,  0,   255, 255, 255, 255, 0,   0,   0,   0,   1,   0,   0,   0,   13,  0,   0,   0,
>+    83,  97, 109, 112, 108, 101, 114, 0,   84,  101, 120, 116, 117, 114, 101, 70,  95,  51,  68,
>+    0,   77, 105, 99,  114, 111, 115, 111, 102, 116, 32,  40,  82,  41,  32,  72,  76,  83,  76,
>+    32,  83, 104, 97,  100, 101, 114, 32,  67,  111, 109, 112, 105, 108, 101, 114, 32,  57,  46,
>+    50,  57, 46,  57,  53,  50,  46,  51,  49,  49,  49,  0,   171, 171, 171, 73,  83,  71,  78,
>+    128, 0,  0,   0,   3,   0,   0,   0,   8,   0,   0,   0,   80,  0,   0,   0,   0,   0,   0,
>+    0,   1,  0,   0,   0,   3,   0,   0,   0,   0,   0,   0,   0,   15,  0,   0,   0,   92,  0,
>+    0,   0,  0,   0,   0,   0,   4,   0,   0,   0,   1,   0,   0,   0,   1,   0,   0,   0,   1,
>+    0,   0,  0,   118, 0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   3,   0,   0,   0,
>+    2,   0,  0,   0,   7,   7,   0,   0,   83,  86,  95,  80,  79,  83,  73,  84,  73,  79,  78,
>+    0,   83, 86,  95,  82,  69,  78,  68,  69,  82,  84,  65,  82,  71,  69,  84,  65,  82,  82,
>+    65,  89, 73,  78,  68,  69,  88,  0,   84,  69,  88,  67,  79,  79,  82,  68,  0,   171, 79,
>+    83,  71, 78,  44,  0,   0,   0,   1,   0,   0,   0,   8,   0,   0,   0,   32,  0,   0,   0,
>+    0,   0,  0,   0,   0,   0,   0,   0,   2,   0,   0,   0,   0,   0,   0,   0,   15,  0,   0,
>+    0,   83, 86,  95,  84,  65,  82,  71,  69,  84,  0,   171, 171, 83,  72,  68,  82,  208, 0,
>+    0,   0,  64,  0,   0,   0,   52,  0,   0,   0,   90,  0,   0,   3,   0,   96,  16,  0,   0,
>+    0,   0,  0,   88,  40,  0,   4,   0,   112, 16,  0,   0,   0,   0,   0,   85,  85,  0,   0,
>+    98,  16, 0,   3,   114, 16,  16,  0,   2,   0,   0,   0,   101, 0,   0,   3,   242, 32,  16,
>+    0,   0,  0,   0,   0,   104, 0,   0,   2,   1,   0,   0,   0,   69,  0,   0,   9,   242, 0,
>+    16,  0,  0,   0,   0,   0,   70,  18,  16,  0,   2,   0,   0,   0,   70,  126, 16,  0,   0,
>+    0,   0,  0,   0,   96,  16,  0,   0,   0,   0,   0,   56,  0,   0,   10,  114, 0,   16,  0,
>+    0,   0,  0,   0,   70,  2,   16,  0,   0,   0,   0,   0,   2,   64,  0,   0,   0,   0,   254,
>+    66,  0,  0,   254, 66,  0,   0,   254, 66,  0,   0,   0,   0,   64,  0,   0,   5,   114, 0,
>+    16,  0,  0,   0,   0,   0,   70,  2,   16,  0,   0,   0,   0,   0,   27,  0,   0,   5,   114,
>+    32,  16, 0,   0,   0,   0,   0,   70,  2,   16,  0,   0,   0,   0,   0,   54,  0,   0,   5,
>+    130, 32, 16,  0,   0,   0,   0,   0,   1,   64,  0,   0,   1,   0,   0,   0,   62,  0,   0,
>+    1,   83, 84,  65,  84,  116, 0,   0,   0,   6,   0,   0,   0,   1,   0,   0,   0,   0,   0,
>+    0,   0,  2,   0,   0,   0,   2,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,
>+    0,   0,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,  0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,  0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   2,   0,
>+    0,   0,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,  0,   0,   0,   0,   0,   0,   0,   0,   0};
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftoi_pt_rgba_2darray_ps.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftoi_pt_rgba_2darray_ps.h
>new file mode 100644
>index 00000000000..93fec3090af
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftoi_pt_rgba_2darray_ps.h
>@@ -0,0 +1,93 @@
>+#if 0
>+//
>+// Generated by Microsoft (R) HLSL Shader Compiler 9.29.952.3111
>+//
>+//
>+//   fxc /nologo /E PS_FtoI_PT_RGBA_2DArray /T ps_4_0 /Fh
>+//    compiled\multiplyalpha_ftoi_pt_rgba_2darray_ps.h MultiplyAlpha.hlsl
>+//
>+//
>+// Resource Bindings:
>+//
>+// Name                                 Type  Format         Dim Slot Elements
>+// ------------------------------ ---------- ------- ----------- ---- --------
>+// Sampler                           sampler      NA          NA    0        1
>+// TextureF_2DArray                  texture  float4     2darray    0        1
>+//
>+//
>+//
>+// Input signature:
>+//
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_POSITION              0   xyzw        0      POS  float       
>+// SV_RENDERTARGETARRAYINDEX     0   x           1  RTINDEX   uint   x   
>+// TEXCOORD                 0   xyz         2     NONE  float   xy  
>+//
>+//
>+// Output signature:
>+//
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_TARGET                0   xyzw        0   TARGET    int   xyzw
>+//
>+ps_4_0
>+dcl_sampler s0, mode_default
>+dcl_resource_texture2darray (float,float,float,float) t0
>+dcl_input_ps_siv constant v1.x, rendertarget_array_index
>+dcl_input_ps linear v2.xy
>+dcl_output o0.xyzw
>+dcl_temps 1
>+utof r0.z, v1.x
>+mov r0.xy, v2.xyxx
>+sample r0.xyzw, r0.xyzx, t0.xyzw, s0
>+mul r0.xyzw, r0.xyzw, l(127.000000, 127.000000, 127.000000, 127.000000)
>+round_ne r0.xyzw, r0.xyzw
>+ftoi o0.xyzw, r0.xyzw
>+ret 
>+// Approximately 7 instruction slots used
>+#endif
>+
>+const BYTE g_PS_FtoI_PT_RGBA_2DArray[] = {
>+    68,  88,  66,  67,  148, 84,  9,   215, 25,  45,  131, 213, 232, 230, 51,  79,  128, 66,  45,
>+    64,  1,   0,   0,   0,   24,  3,   0,   0,   5,   0,   0,   0,   52,  0,   0,   0,   228, 0,
>+    0,   0,   108, 1,   0,   0,   160, 1,   0,   0,   156, 2,   0,   0,   82,  68,  69,  70,  168,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   2,   0,   0,   0,   28,  0,   0,   0,
>+    0,   4,   255, 255, 0,   1,   0,   0,   117, 0,   0,   0,   92,  0,   0,   0,   3,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,
>+    0,   0,   1,   0,   0,   0,   100, 0,   0,   0,   2,   0,   0,   0,   5,   0,   0,   0,   5,
>+    0,   0,   0,   255, 255, 255, 255, 0,   0,   0,   0,   1,   0,   0,   0,   13,  0,   0,   0,
>+    83,  97,  109, 112, 108, 101, 114, 0,   84,  101, 120, 116, 117, 114, 101, 70,  95,  50,  68,
>+    65,  114, 114, 97,  121, 0,   77,  105, 99,  114, 111, 115, 111, 102, 116, 32,  40,  82,  41,
>+    32,  72,  76,  83,  76,  32,  83,  104, 97,  100, 101, 114, 32,  67,  111, 109, 112, 105, 108,
>+    101, 114, 32,  57,  46,  50,  57,  46,  57,  53,  50,  46,  51,  49,  49,  49,  0,   171, 171,
>+    73,  83,  71,  78,  128, 0,   0,   0,   3,   0,   0,   0,   8,   0,   0,   0,   80,  0,   0,
>+    0,   0,   0,   0,   0,   1,   0,   0,   0,   3,   0,   0,   0,   0,   0,   0,   0,   15,  0,
>+    0,   0,   92,  0,   0,   0,   0,   0,   0,   0,   4,   0,   0,   0,   1,   0,   0,   0,   1,
>+    0,   0,   0,   1,   1,   0,   0,   118, 0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    3,   0,   0,   0,   2,   0,   0,   0,   7,   3,   0,   0,   83,  86,  95,  80,  79,  83,  73,
>+    84,  73,  79,  78,  0,   83,  86,  95,  82,  69,  78,  68,  69,  82,  84,  65,  82,  71,  69,
>+    84,  65,  82,  82,  65,  89,  73,  78,  68,  69,  88,  0,   84,  69,  88,  67,  79,  79,  82,
>+    68,  0,   171, 79,  83,  71,  78,  44,  0,   0,   0,   1,   0,   0,   0,   8,   0,   0,   0,
>+    32,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   2,   0,   0,   0,   0,   0,   0,
>+    0,   15,  0,   0,   0,   83,  86,  95,  84,  65,  82,  71,  69,  84,  0,   171, 171, 83,  72,
>+    68,  82,  244, 0,   0,   0,   64,  0,   0,   0,   61,  0,   0,   0,   90,  0,   0,   3,   0,
>+    96,  16,  0,   0,   0,   0,   0,   88,  64,  0,   4,   0,   112, 16,  0,   0,   0,   0,   0,
>+    85,  85,  0,   0,   100, 8,   0,   4,   18,  16,  16,  0,   1,   0,   0,   0,   4,   0,   0,
>+    0,   98,  16,  0,   3,   50,  16,  16,  0,   2,   0,   0,   0,   101, 0,   0,   3,   242, 32,
>+    16,  0,   0,   0,   0,   0,   104, 0,   0,   2,   1,   0,   0,   0,   86,  0,   0,   5,   66,
>+    0,   16,  0,   0,   0,   0,   0,   10,  16,  16,  0,   1,   0,   0,   0,   54,  0,   0,   5,
>+    50,  0,   16,  0,   0,   0,   0,   0,   70,  16,  16,  0,   2,   0,   0,   0,   69,  0,   0,
>+    9,   242, 0,   16,  0,   0,   0,   0,   0,   70,  2,   16,  0,   0,   0,   0,   0,   70,  126,
>+    16,  0,   0,   0,   0,   0,   0,   96,  16,  0,   0,   0,   0,   0,   56,  0,   0,   10,  242,
>+    0,   16,  0,   0,   0,   0,   0,   70,  14,  16,  0,   0,   0,   0,   0,   2,   64,  0,   0,
>+    0,   0,   254, 66,  0,   0,   254, 66,  0,   0,   254, 66,  0,   0,   254, 66,  64,  0,   0,
>+    5,   242, 0,   16,  0,   0,   0,   0,   0,   70,  14,  16,  0,   0,   0,   0,   0,   27,  0,
>+    0,   5,   242, 32,  16,  0,   0,   0,   0,   0,   70,  14,  16,  0,   0,   0,   0,   0,   62,
>+    0,   0,   1,   83,  84,  65,  84,  116, 0,   0,   0,   7,   0,   0,   0,   1,   0,   0,   0,
>+    0,   0,   0,   0,   3,   0,   0,   0,   2,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,
>+    3,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0};
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftoi_pt_rgba_3d_ps.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftoi_pt_rgba_3d_ps.h
>new file mode 100644
>index 00000000000..8618026fc5b
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftoi_pt_rgba_3d_ps.h
>@@ -0,0 +1,87 @@
>+#if 0
>+//
>+// Generated by Microsoft (R) HLSL Shader Compiler 9.29.952.3111
>+//
>+//
>+//   fxc /nologo /E PS_FtoI_PT_RGBA_3D /T ps_4_0 /Fh
>+//    compiled\multiplyalpha_ftoi_pt_rgba_3d_ps.h MultiplyAlpha.hlsl
>+//
>+//
>+// Resource Bindings:
>+//
>+// Name                                 Type  Format         Dim Slot Elements
>+// ------------------------------ ---------- ------- ----------- ---- --------
>+// Sampler                           sampler      NA          NA    0        1
>+// TextureF_3D                       texture  float4          3d    0        1
>+//
>+//
>+//
>+// Input signature:
>+//
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_POSITION              0   xyzw        0      POS  float       
>+// SV_RENDERTARGETARRAYINDEX     0   x           1  RTINDEX   uint       
>+// TEXCOORD                 0   xyz         2     NONE  float   xyz 
>+//
>+//
>+// Output signature:
>+//
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_TARGET                0   xyzw        0   TARGET    int   xyzw
>+//
>+ps_4_0
>+dcl_sampler s0, mode_default
>+dcl_resource_texture3d (float,float,float,float) t0
>+dcl_input_ps linear v2.xyz
>+dcl_output o0.xyzw
>+dcl_temps 1
>+sample r0.xyzw, v2.xyzx, t0.xyzw, s0
>+mul r0.xyzw, r0.xyzw, l(127.000000, 127.000000, 127.000000, 127.000000)
>+round_ne r0.xyzw, r0.xyzw
>+ftoi o0.xyzw, r0.xyzw
>+ret 
>+// Approximately 5 instruction slots used
>+#endif
>+
>+const BYTE g_PS_FtoI_PT_RGBA_3D[] = {
>+    68,  88, 66,  67,  32,  58,  93,  84,  232, 52,  147, 45,  185, 44,  249, 218, 171, 114, 58,
>+    216, 1,  0,   0,   0,   220, 2,   0,   0,   5,   0,   0,   0,   52,  0,   0,   0,   224, 0,
>+    0,   0,  104, 1,   0,   0,   156, 1,   0,   0,   96,  2,   0,   0,   82,  68,  69,  70,  164,
>+    0,   0,  0,   0,   0,   0,   0,   0,   0,   0,   0,   2,   0,   0,   0,   28,  0,   0,   0,
>+    0,   4,  255, 255, 0,   1,   0,   0,   112, 0,   0,   0,   92,  0,   0,   0,   3,   0,   0,
>+    0,   0,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,
>+    0,   0,  1,   0,   0,   0,   100, 0,   0,   0,   2,   0,   0,   0,   5,   0,   0,   0,   8,
>+    0,   0,  0,   255, 255, 255, 255, 0,   0,   0,   0,   1,   0,   0,   0,   13,  0,   0,   0,
>+    83,  97, 109, 112, 108, 101, 114, 0,   84,  101, 120, 116, 117, 114, 101, 70,  95,  51,  68,
>+    0,   77, 105, 99,  114, 111, 115, 111, 102, 116, 32,  40,  82,  41,  32,  72,  76,  83,  76,
>+    32,  83, 104, 97,  100, 101, 114, 32,  67,  111, 109, 112, 105, 108, 101, 114, 32,  57,  46,
>+    50,  57, 46,  57,  53,  50,  46,  51,  49,  49,  49,  0,   171, 171, 171, 73,  83,  71,  78,
>+    128, 0,  0,   0,   3,   0,   0,   0,   8,   0,   0,   0,   80,  0,   0,   0,   0,   0,   0,
>+    0,   1,  0,   0,   0,   3,   0,   0,   0,   0,   0,   0,   0,   15,  0,   0,   0,   92,  0,
>+    0,   0,  0,   0,   0,   0,   4,   0,   0,   0,   1,   0,   0,   0,   1,   0,   0,   0,   1,
>+    0,   0,  0,   118, 0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   3,   0,   0,   0,
>+    2,   0,  0,   0,   7,   7,   0,   0,   83,  86,  95,  80,  79,  83,  73,  84,  73,  79,  78,
>+    0,   83, 86,  95,  82,  69,  78,  68,  69,  82,  84,  65,  82,  71,  69,  84,  65,  82,  82,
>+    65,  89, 73,  78,  68,  69,  88,  0,   84,  69,  88,  67,  79,  79,  82,  68,  0,   171, 79,
>+    83,  71, 78,  44,  0,   0,   0,   1,   0,   0,   0,   8,   0,   0,   0,   32,  0,   0,   0,
>+    0,   0,  0,   0,   0,   0,   0,   0,   2,   0,   0,   0,   0,   0,   0,   0,   15,  0,   0,
>+    0,   83, 86,  95,  84,  65,  82,  71,  69,  84,  0,   171, 171, 83,  72,  68,  82,  188, 0,
>+    0,   0,  64,  0,   0,   0,   47,  0,   0,   0,   90,  0,   0,   3,   0,   96,  16,  0,   0,
>+    0,   0,  0,   88,  40,  0,   4,   0,   112, 16,  0,   0,   0,   0,   0,   85,  85,  0,   0,
>+    98,  16, 0,   3,   114, 16,  16,  0,   2,   0,   0,   0,   101, 0,   0,   3,   242, 32,  16,
>+    0,   0,  0,   0,   0,   104, 0,   0,   2,   1,   0,   0,   0,   69,  0,   0,   9,   242, 0,
>+    16,  0,  0,   0,   0,   0,   70,  18,  16,  0,   2,   0,   0,   0,   70,  126, 16,  0,   0,
>+    0,   0,  0,   0,   96,  16,  0,   0,   0,   0,   0,   56,  0,   0,   10,  242, 0,   16,  0,
>+    0,   0,  0,   0,   70,  14,  16,  0,   0,   0,   0,   0,   2,   64,  0,   0,   0,   0,   254,
>+    66,  0,  0,   254, 66,  0,   0,   254, 66,  0,   0,   254, 66,  64,  0,   0,   5,   242, 0,
>+    16,  0,  0,   0,   0,   0,   70,  14,  16,  0,   0,   0,   0,   0,   27,  0,   0,   5,   242,
>+    32,  16, 0,   0,   0,   0,   0,   70,  14,  16,  0,   0,   0,   0,   0,   62,  0,   0,   1,
>+    83,  84, 65,  84,  116, 0,   0,   0,   5,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,
>+    0,   2,  0,   0,   0,   2,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,
>+    0,   0,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,  0,   0,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   2,   0,   0,
>+    0,   0,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,  0,   0,   0,   0,   0,   0,   0,   0};
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftoi_um_rgb_2darray_ps.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftoi_um_rgb_2darray_ps.h
>new file mode 100644
>index 00000000000..b9ffff95c35
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftoi_um_rgb_2darray_ps.h
>@@ -0,0 +1,103 @@
>+#if 0
>+//
>+// Generated by Microsoft (R) HLSL Shader Compiler 9.29.952.3111
>+//
>+//
>+//   fxc /nologo /E PS_FtoI_UM_RGB_2DArray /T ps_4_0 /Fh
>+//    compiled\multiplyalpha_ftoi_um_rgb_2darray_ps.h MultiplyAlpha.hlsl
>+//
>+//
>+// Resource Bindings:
>+//
>+// Name                                 Type  Format         Dim Slot Elements
>+// ------------------------------ ---------- ------- ----------- ---- --------
>+// Sampler                           sampler      NA          NA    0        1
>+// TextureF_2DArray                  texture  float4     2darray    0        1
>+//
>+//
>+//
>+// Input signature:
>+//
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_POSITION              0   xyzw        0      POS  float       
>+// SV_RENDERTARGETARRAYINDEX     0   x           1  RTINDEX   uint   x   
>+// TEXCOORD                 0   xyz         2     NONE  float   xy  
>+//
>+//
>+// Output signature:
>+//
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_TARGET                0   xyzw        0   TARGET    int   xyzw
>+//
>+ps_4_0
>+dcl_sampler s0, mode_default
>+dcl_resource_texture2darray (float,float,float,float) t0
>+dcl_input_ps_siv constant v1.x, rendertarget_array_index
>+dcl_input_ps linear v2.xy
>+dcl_output o0.xyzw
>+dcl_temps 2
>+utof r0.z, v1.x
>+mov r0.xy, v2.xyxx
>+sample r0.xyzw, r0.xyzx, t0.xyzw, s0
>+lt r1.x, l(0.000000), r0.w
>+div r1.yzw, r0.xxyz, r0.wwww
>+movc r0.xyz, r1.xxxx, r1.yzwy, r0.xyzx
>+mul r0.xyz, r0.xyzx, l(127.000000, 127.000000, 127.000000, 0.000000)
>+round_ne r0.xyz, r0.xyzx
>+ftoi o0.xyz, r0.xyzx
>+mov o0.w, l(1)
>+ret 
>+// Approximately 11 instruction slots used
>+#endif
>+
>+const BYTE g_PS_FtoI_UM_RGB_2DArray[] = {
>+    68,  88,  66,  67,  255, 151, 44,  91,  195, 98,  212, 246, 231, 76,  145, 99,  52,  104, 88,
>+    255, 1,   0,   0,   0,   136, 3,   0,   0,   5,   0,   0,   0,   52,  0,   0,   0,   228, 0,
>+    0,   0,   108, 1,   0,   0,   160, 1,   0,   0,   12,  3,   0,   0,   82,  68,  69,  70,  168,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   2,   0,   0,   0,   28,  0,   0,   0,
>+    0,   4,   255, 255, 0,   1,   0,   0,   117, 0,   0,   0,   92,  0,   0,   0,   3,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,
>+    0,   0,   1,   0,   0,   0,   100, 0,   0,   0,   2,   0,   0,   0,   5,   0,   0,   0,   5,
>+    0,   0,   0,   255, 255, 255, 255, 0,   0,   0,   0,   1,   0,   0,   0,   13,  0,   0,   0,
>+    83,  97,  109, 112, 108, 101, 114, 0,   84,  101, 120, 116, 117, 114, 101, 70,  95,  50,  68,
>+    65,  114, 114, 97,  121, 0,   77,  105, 99,  114, 111, 115, 111, 102, 116, 32,  40,  82,  41,
>+    32,  72,  76,  83,  76,  32,  83,  104, 97,  100, 101, 114, 32,  67,  111, 109, 112, 105, 108,
>+    101, 114, 32,  57,  46,  50,  57,  46,  57,  53,  50,  46,  51,  49,  49,  49,  0,   171, 171,
>+    73,  83,  71,  78,  128, 0,   0,   0,   3,   0,   0,   0,   8,   0,   0,   0,   80,  0,   0,
>+    0,   0,   0,   0,   0,   1,   0,   0,   0,   3,   0,   0,   0,   0,   0,   0,   0,   15,  0,
>+    0,   0,   92,  0,   0,   0,   0,   0,   0,   0,   4,   0,   0,   0,   1,   0,   0,   0,   1,
>+    0,   0,   0,   1,   1,   0,   0,   118, 0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    3,   0,   0,   0,   2,   0,   0,   0,   7,   3,   0,   0,   83,  86,  95,  80,  79,  83,  73,
>+    84,  73,  79,  78,  0,   83,  86,  95,  82,  69,  78,  68,  69,  82,  84,  65,  82,  71,  69,
>+    84,  65,  82,  82,  65,  89,  73,  78,  68,  69,  88,  0,   84,  69,  88,  67,  79,  79,  82,
>+    68,  0,   171, 79,  83,  71,  78,  44,  0,   0,   0,   1,   0,   0,   0,   8,   0,   0,   0,
>+    32,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   2,   0,   0,   0,   0,   0,   0,
>+    0,   15,  0,   0,   0,   83,  86,  95,  84,  65,  82,  71,  69,  84,  0,   171, 171, 83,  72,
>+    68,  82,  100, 1,   0,   0,   64,  0,   0,   0,   89,  0,   0,   0,   90,  0,   0,   3,   0,
>+    96,  16,  0,   0,   0,   0,   0,   88,  64,  0,   4,   0,   112, 16,  0,   0,   0,   0,   0,
>+    85,  85,  0,   0,   100, 8,   0,   4,   18,  16,  16,  0,   1,   0,   0,   0,   4,   0,   0,
>+    0,   98,  16,  0,   3,   50,  16,  16,  0,   2,   0,   0,   0,   101, 0,   0,   3,   242, 32,
>+    16,  0,   0,   0,   0,   0,   104, 0,   0,   2,   2,   0,   0,   0,   86,  0,   0,   5,   66,
>+    0,   16,  0,   0,   0,   0,   0,   10,  16,  16,  0,   1,   0,   0,   0,   54,  0,   0,   5,
>+    50,  0,   16,  0,   0,   0,   0,   0,   70,  16,  16,  0,   2,   0,   0,   0,   69,  0,   0,
>+    9,   242, 0,   16,  0,   0,   0,   0,   0,   70,  2,   16,  0,   0,   0,   0,   0,   70,  126,
>+    16,  0,   0,   0,   0,   0,   0,   96,  16,  0,   0,   0,   0,   0,   49,  0,   0,   7,   18,
>+    0,   16,  0,   1,   0,   0,   0,   1,   64,  0,   0,   0,   0,   0,   0,   58,  0,   16,  0,
>+    0,   0,   0,   0,   14,  0,   0,   7,   226, 0,   16,  0,   1,   0,   0,   0,   6,   9,   16,
>+    0,   0,   0,   0,   0,   246, 15,  16,  0,   0,   0,   0,   0,   55,  0,   0,   9,   114, 0,
>+    16,  0,   0,   0,   0,   0,   6,   0,   16,  0,   1,   0,   0,   0,   150, 7,   16,  0,   1,
>+    0,   0,   0,   70,  2,   16,  0,   0,   0,   0,   0,   56,  0,   0,   10,  114, 0,   16,  0,
>+    0,   0,   0,   0,   70,  2,   16,  0,   0,   0,   0,   0,   2,   64,  0,   0,   0,   0,   254,
>+    66,  0,   0,   254, 66,  0,   0,   254, 66,  0,   0,   0,   0,   64,  0,   0,   5,   114, 0,
>+    16,  0,   0,   0,   0,   0,   70,  2,   16,  0,   0,   0,   0,   0,   27,  0,   0,   5,   114,
>+    32,  16,  0,   0,   0,   0,   0,   70,  2,   16,  0,   0,   0,   0,   0,   54,  0,   0,   5,
>+    130, 32,  16,  0,   0,   0,   0,   0,   1,   64,  0,   0,   1,   0,   0,   0,   62,  0,   0,
>+    1,   83,  84,  65,  84,  116, 0,   0,   0,   11,  0,   0,   0,   2,   0,   0,   0,   0,   0,
>+    0,   0,   3,   0,   0,   0,   4,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   2,   0,   0,   0,   1,   0,   0,   0,   3,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0};
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftoi_um_rgb_3d_ps.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftoi_um_rgb_3d_ps.h
>new file mode 100644
>index 00000000000..30c03e1d16a
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftoi_um_rgb_3d_ps.h
>@@ -0,0 +1,97 @@
>+#if 0
>+//
>+// Generated by Microsoft (R) HLSL Shader Compiler 9.29.952.3111
>+//
>+//
>+//   fxc /nologo /E PS_FtoI_UM_RGB_3D /T ps_4_0 /Fh
>+//    compiled\multiplyalpha_ftoi_um_rgb_3d_ps.h MultiplyAlpha.hlsl
>+//
>+//
>+// Resource Bindings:
>+//
>+// Name                                 Type  Format         Dim Slot Elements
>+// ------------------------------ ---------- ------- ----------- ---- --------
>+// Sampler                           sampler      NA          NA    0        1
>+// TextureF_3D                       texture  float4          3d    0        1
>+//
>+//
>+//
>+// Input signature:
>+//
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_POSITION              0   xyzw        0      POS  float       
>+// SV_RENDERTARGETARRAYINDEX     0   x           1  RTINDEX   uint       
>+// TEXCOORD                 0   xyz         2     NONE  float   xyz 
>+//
>+//
>+// Output signature:
>+//
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_TARGET                0   xyzw        0   TARGET    int   xyzw
>+//
>+ps_4_0
>+dcl_sampler s0, mode_default
>+dcl_resource_texture3d (float,float,float,float) t0
>+dcl_input_ps linear v2.xyz
>+dcl_output o0.xyzw
>+dcl_temps 2
>+sample r0.xyzw, v2.xyzx, t0.xyzw, s0
>+lt r1.x, l(0.000000), r0.w
>+div r1.yzw, r0.xxyz, r0.wwww
>+movc r0.xyz, r1.xxxx, r1.yzwy, r0.xyzx
>+mul r0.xyz, r0.xyzx, l(127.000000, 127.000000, 127.000000, 0.000000)
>+round_ne r0.xyz, r0.xyzx
>+ftoi o0.xyz, r0.xyzx
>+mov o0.w, l(1)
>+ret 
>+// Approximately 9 instruction slots used
>+#endif
>+
>+const BYTE g_PS_FtoI_UM_RGB_3D[] = {
>+    68,  88, 66,  67,  228, 27,  253, 8,   117, 139, 69,  193, 51,  55,  44,  74,  19,  61,  157,
>+    116, 1,  0,   0,   0,   76,  3,   0,   0,   5,   0,   0,   0,   52,  0,   0,   0,   224, 0,
>+    0,   0,  104, 1,   0,   0,   156, 1,   0,   0,   208, 2,   0,   0,   82,  68,  69,  70,  164,
>+    0,   0,  0,   0,   0,   0,   0,   0,   0,   0,   0,   2,   0,   0,   0,   28,  0,   0,   0,
>+    0,   4,  255, 255, 0,   1,   0,   0,   112, 0,   0,   0,   92,  0,   0,   0,   3,   0,   0,
>+    0,   0,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,
>+    0,   0,  1,   0,   0,   0,   100, 0,   0,   0,   2,   0,   0,   0,   5,   0,   0,   0,   8,
>+    0,   0,  0,   255, 255, 255, 255, 0,   0,   0,   0,   1,   0,   0,   0,   13,  0,   0,   0,
>+    83,  97, 109, 112, 108, 101, 114, 0,   84,  101, 120, 116, 117, 114, 101, 70,  95,  51,  68,
>+    0,   77, 105, 99,  114, 111, 115, 111, 102, 116, 32,  40,  82,  41,  32,  72,  76,  83,  76,
>+    32,  83, 104, 97,  100, 101, 114, 32,  67,  111, 109, 112, 105, 108, 101, 114, 32,  57,  46,
>+    50,  57, 46,  57,  53,  50,  46,  51,  49,  49,  49,  0,   171, 171, 171, 73,  83,  71,  78,
>+    128, 0,  0,   0,   3,   0,   0,   0,   8,   0,   0,   0,   80,  0,   0,   0,   0,   0,   0,
>+    0,   1,  0,   0,   0,   3,   0,   0,   0,   0,   0,   0,   0,   15,  0,   0,   0,   92,  0,
>+    0,   0,  0,   0,   0,   0,   4,   0,   0,   0,   1,   0,   0,   0,   1,   0,   0,   0,   1,
>+    0,   0,  0,   118, 0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   3,   0,   0,   0,
>+    2,   0,  0,   0,   7,   7,   0,   0,   83,  86,  95,  80,  79,  83,  73,  84,  73,  79,  78,
>+    0,   83, 86,  95,  82,  69,  78,  68,  69,  82,  84,  65,  82,  71,  69,  84,  65,  82,  82,
>+    65,  89, 73,  78,  68,  69,  88,  0,   84,  69,  88,  67,  79,  79,  82,  68,  0,   171, 79,
>+    83,  71, 78,  44,  0,   0,   0,   1,   0,   0,   0,   8,   0,   0,   0,   32,  0,   0,   0,
>+    0,   0,  0,   0,   0,   0,   0,   0,   2,   0,   0,   0,   0,   0,   0,   0,   15,  0,   0,
>+    0,   83, 86,  95,  84,  65,  82,  71,  69,  84,  0,   171, 171, 83,  72,  68,  82,  44,  1,
>+    0,   0,  64,  0,   0,   0,   75,  0,   0,   0,   90,  0,   0,   3,   0,   96,  16,  0,   0,
>+    0,   0,  0,   88,  40,  0,   4,   0,   112, 16,  0,   0,   0,   0,   0,   85,  85,  0,   0,
>+    98,  16, 0,   3,   114, 16,  16,  0,   2,   0,   0,   0,   101, 0,   0,   3,   242, 32,  16,
>+    0,   0,  0,   0,   0,   104, 0,   0,   2,   2,   0,   0,   0,   69,  0,   0,   9,   242, 0,
>+    16,  0,  0,   0,   0,   0,   70,  18,  16,  0,   2,   0,   0,   0,   70,  126, 16,  0,   0,
>+    0,   0,  0,   0,   96,  16,  0,   0,   0,   0,   0,   49,  0,   0,   7,   18,  0,   16,  0,
>+    1,   0,  0,   0,   1,   64,  0,   0,   0,   0,   0,   0,   58,  0,   16,  0,   0,   0,   0,
>+    0,   14, 0,   0,   7,   226, 0,   16,  0,   1,   0,   0,   0,   6,   9,   16,  0,   0,   0,
>+    0,   0,  246, 15,  16,  0,   0,   0,   0,   0,   55,  0,   0,   9,   114, 0,   16,  0,   0,
>+    0,   0,  0,   6,   0,   16,  0,   1,   0,   0,   0,   150, 7,   16,  0,   1,   0,   0,   0,
>+    70,  2,  16,  0,   0,   0,   0,   0,   56,  0,   0,   10,  114, 0,   16,  0,   0,   0,   0,
>+    0,   70, 2,   16,  0,   0,   0,   0,   0,   2,   64,  0,   0,   0,   0,   254, 66,  0,   0,
>+    254, 66, 0,   0,   254, 66,  0,   0,   0,   0,   64,  0,   0,   5,   114, 0,   16,  0,   0,
>+    0,   0,  0,   70,  2,   16,  0,   0,   0,   0,   0,   27,  0,   0,   5,   114, 32,  16,  0,
>+    0,   0,  0,   0,   70,  2,   16,  0,   0,   0,   0,   0,   54,  0,   0,   5,   130, 32,  16,
>+    0,   0,  0,   0,   0,   1,   64,  0,   0,   1,   0,   0,   0,   62,  0,   0,   1,   83,  84,
>+    65,  84, 116, 0,   0,   0,   9,   0,   0,   0,   2,   0,   0,   0,   0,   0,   0,   0,   2,
>+    0,   0,  0,   4,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,
>+    0,   0,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,  0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,  0,   0,   0,   0,   1,   0,   0,   0,   1,   0,   0,   0,   2,   0,   0,   0,   0,
>+    0,   0,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,  0,   0,   0,   0,   0,   0};
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftoi_um_rgba_2darray_ps.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftoi_um_rgba_2darray_ps.h
>new file mode 100644
>index 00000000000..a4f4b862da6
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftoi_um_rgba_2darray_ps.h
>@@ -0,0 +1,101 @@
>+#if 0
>+//
>+// Generated by Microsoft (R) HLSL Shader Compiler 9.29.952.3111
>+//
>+//
>+//   fxc /nologo /E PS_FtoI_UM_RGBA_2DArray /T ps_4_0 /Fh
>+//    compiled\multiplyalpha_ftoi_um_rgba_2darray_ps.h MultiplyAlpha.hlsl
>+//
>+//
>+// Resource Bindings:
>+//
>+// Name                                 Type  Format         Dim Slot Elements
>+// ------------------------------ ---------- ------- ----------- ---- --------
>+// Sampler                           sampler      NA          NA    0        1
>+// TextureF_2DArray                  texture  float4     2darray    0        1
>+//
>+//
>+//
>+// Input signature:
>+//
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_POSITION              0   xyzw        0      POS  float       
>+// SV_RENDERTARGETARRAYINDEX     0   x           1  RTINDEX   uint   x   
>+// TEXCOORD                 0   xyz         2     NONE  float   xy  
>+//
>+//
>+// Output signature:
>+//
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_TARGET                0   xyzw        0   TARGET    int   xyzw
>+//
>+ps_4_0
>+dcl_sampler s0, mode_default
>+dcl_resource_texture2darray (float,float,float,float) t0
>+dcl_input_ps_siv constant v1.x, rendertarget_array_index
>+dcl_input_ps linear v2.xy
>+dcl_output o0.xyzw
>+dcl_temps 2
>+utof r0.z, v1.x
>+mov r0.xy, v2.xyxx
>+sample r0.xyzw, r0.xyzx, t0.xyzw, s0
>+lt r1.x, l(0.000000), r0.w
>+div r1.yzw, r0.xxyz, r0.wwww
>+movc r0.xyz, r1.xxxx, r1.yzwy, r0.xyzx
>+mul r0.xyzw, r0.xyzw, l(127.000000, 127.000000, 127.000000, 127.000000)
>+round_ne r0.xyzw, r0.xyzw
>+ftoi o0.xyzw, r0.xyzw
>+ret 
>+// Approximately 10 instruction slots used
>+#endif
>+
>+const BYTE g_PS_FtoI_UM_RGBA_2DArray[] = {
>+    68,  88,  66,  67,  18,  73,  236, 141, 229, 245, 37,  44,  233, 175, 83,  206, 219, 9,   226,
>+    133, 1,   0,   0,   0,   116, 3,   0,   0,   5,   0,   0,   0,   52,  0,   0,   0,   228, 0,
>+    0,   0,   108, 1,   0,   0,   160, 1,   0,   0,   248, 2,   0,   0,   82,  68,  69,  70,  168,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   2,   0,   0,   0,   28,  0,   0,   0,
>+    0,   4,   255, 255, 0,   1,   0,   0,   117, 0,   0,   0,   92,  0,   0,   0,   3,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,
>+    0,   0,   1,   0,   0,   0,   100, 0,   0,   0,   2,   0,   0,   0,   5,   0,   0,   0,   5,
>+    0,   0,   0,   255, 255, 255, 255, 0,   0,   0,   0,   1,   0,   0,   0,   13,  0,   0,   0,
>+    83,  97,  109, 112, 108, 101, 114, 0,   84,  101, 120, 116, 117, 114, 101, 70,  95,  50,  68,
>+    65,  114, 114, 97,  121, 0,   77,  105, 99,  114, 111, 115, 111, 102, 116, 32,  40,  82,  41,
>+    32,  72,  76,  83,  76,  32,  83,  104, 97,  100, 101, 114, 32,  67,  111, 109, 112, 105, 108,
>+    101, 114, 32,  57,  46,  50,  57,  46,  57,  53,  50,  46,  51,  49,  49,  49,  0,   171, 171,
>+    73,  83,  71,  78,  128, 0,   0,   0,   3,   0,   0,   0,   8,   0,   0,   0,   80,  0,   0,
>+    0,   0,   0,   0,   0,   1,   0,   0,   0,   3,   0,   0,   0,   0,   0,   0,   0,   15,  0,
>+    0,   0,   92,  0,   0,   0,   0,   0,   0,   0,   4,   0,   0,   0,   1,   0,   0,   0,   1,
>+    0,   0,   0,   1,   1,   0,   0,   118, 0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    3,   0,   0,   0,   2,   0,   0,   0,   7,   3,   0,   0,   83,  86,  95,  80,  79,  83,  73,
>+    84,  73,  79,  78,  0,   83,  86,  95,  82,  69,  78,  68,  69,  82,  84,  65,  82,  71,  69,
>+    84,  65,  82,  82,  65,  89,  73,  78,  68,  69,  88,  0,   84,  69,  88,  67,  79,  79,  82,
>+    68,  0,   171, 79,  83,  71,  78,  44,  0,   0,   0,   1,   0,   0,   0,   8,   0,   0,   0,
>+    32,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   2,   0,   0,   0,   0,   0,   0,
>+    0,   15,  0,   0,   0,   83,  86,  95,  84,  65,  82,  71,  69,  84,  0,   171, 171, 83,  72,
>+    68,  82,  80,  1,   0,   0,   64,  0,   0,   0,   84,  0,   0,   0,   90,  0,   0,   3,   0,
>+    96,  16,  0,   0,   0,   0,   0,   88,  64,  0,   4,   0,   112, 16,  0,   0,   0,   0,   0,
>+    85,  85,  0,   0,   100, 8,   0,   4,   18,  16,  16,  0,   1,   0,   0,   0,   4,   0,   0,
>+    0,   98,  16,  0,   3,   50,  16,  16,  0,   2,   0,   0,   0,   101, 0,   0,   3,   242, 32,
>+    16,  0,   0,   0,   0,   0,   104, 0,   0,   2,   2,   0,   0,   0,   86,  0,   0,   5,   66,
>+    0,   16,  0,   0,   0,   0,   0,   10,  16,  16,  0,   1,   0,   0,   0,   54,  0,   0,   5,
>+    50,  0,   16,  0,   0,   0,   0,   0,   70,  16,  16,  0,   2,   0,   0,   0,   69,  0,   0,
>+    9,   242, 0,   16,  0,   0,   0,   0,   0,   70,  2,   16,  0,   0,   0,   0,   0,   70,  126,
>+    16,  0,   0,   0,   0,   0,   0,   96,  16,  0,   0,   0,   0,   0,   49,  0,   0,   7,   18,
>+    0,   16,  0,   1,   0,   0,   0,   1,   64,  0,   0,   0,   0,   0,   0,   58,  0,   16,  0,
>+    0,   0,   0,   0,   14,  0,   0,   7,   226, 0,   16,  0,   1,   0,   0,   0,   6,   9,   16,
>+    0,   0,   0,   0,   0,   246, 15,  16,  0,   0,   0,   0,   0,   55,  0,   0,   9,   114, 0,
>+    16,  0,   0,   0,   0,   0,   6,   0,   16,  0,   1,   0,   0,   0,   150, 7,   16,  0,   1,
>+    0,   0,   0,   70,  2,   16,  0,   0,   0,   0,   0,   56,  0,   0,   10,  242, 0,   16,  0,
>+    0,   0,   0,   0,   70,  14,  16,  0,   0,   0,   0,   0,   2,   64,  0,   0,   0,   0,   254,
>+    66,  0,   0,   254, 66,  0,   0,   254, 66,  0,   0,   254, 66,  64,  0,   0,   5,   242, 0,
>+    16,  0,   0,   0,   0,   0,   70,  14,  16,  0,   0,   0,   0,   0,   27,  0,   0,   5,   242,
>+    32,  16,  0,   0,   0,   0,   0,   70,  14,  16,  0,   0,   0,   0,   0,   62,  0,   0,   1,
>+    83,  84,  65,  84,  116, 0,   0,   0,   10,  0,   0,   0,   2,   0,   0,   0,   0,   0,   0,
>+    0,   3,   0,   0,   0,   4,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   2,   0,   0,   0,   1,   0,   0,   0,   3,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0};
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftoi_um_rgba_3d_ps.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftoi_um_rgba_3d_ps.h
>new file mode 100644
>index 00000000000..2d31e312743
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftoi_um_rgba_3d_ps.h
>@@ -0,0 +1,95 @@
>+#if 0
>+//
>+// Generated by Microsoft (R) HLSL Shader Compiler 9.29.952.3111
>+//
>+//
>+//   fxc /nologo /E PS_FtoI_UM_RGBA_3D /T ps_4_0 /Fh
>+//    compiled\multiplyalpha_ftoi_um_rgba_3d_ps.h MultiplyAlpha.hlsl
>+//
>+//
>+// Resource Bindings:
>+//
>+// Name                                 Type  Format         Dim Slot Elements
>+// ------------------------------ ---------- ------- ----------- ---- --------
>+// Sampler                           sampler      NA          NA    0        1
>+// TextureF_3D                       texture  float4          3d    0        1
>+//
>+//
>+//
>+// Input signature:
>+//
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_POSITION              0   xyzw        0      POS  float       
>+// SV_RENDERTARGETARRAYINDEX     0   x           1  RTINDEX   uint       
>+// TEXCOORD                 0   xyz         2     NONE  float   xyz 
>+//
>+//
>+// Output signature:
>+//
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_TARGET                0   xyzw        0   TARGET    int   xyzw
>+//
>+ps_4_0
>+dcl_sampler s0, mode_default
>+dcl_resource_texture3d (float,float,float,float) t0
>+dcl_input_ps linear v2.xyz
>+dcl_output o0.xyzw
>+dcl_temps 2
>+sample r0.xyzw, v2.xyzx, t0.xyzw, s0
>+lt r1.x, l(0.000000), r0.w
>+div r1.yzw, r0.xxyz, r0.wwww
>+movc r0.xyz, r1.xxxx, r1.yzwy, r0.xyzx
>+mul r0.xyzw, r0.xyzw, l(127.000000, 127.000000, 127.000000, 127.000000)
>+round_ne r0.xyzw, r0.xyzw
>+ftoi o0.xyzw, r0.xyzw
>+ret 
>+// Approximately 8 instruction slots used
>+#endif
>+
>+const BYTE g_PS_FtoI_UM_RGBA_3D[] = {
>+    68,  88,  66,  67,  242, 33,  254, 63,  245, 177, 165, 63,  135, 115, 166, 217, 149, 184, 138,
>+    167, 1,   0,   0,   0,   56,  3,   0,   0,   5,   0,   0,   0,   52,  0,   0,   0,   224, 0,
>+    0,   0,   104, 1,   0,   0,   156, 1,   0,   0,   188, 2,   0,   0,   82,  68,  69,  70,  164,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   2,   0,   0,   0,   28,  0,   0,   0,
>+    0,   4,   255, 255, 0,   1,   0,   0,   112, 0,   0,   0,   92,  0,   0,   0,   3,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,
>+    0,   0,   1,   0,   0,   0,   100, 0,   0,   0,   2,   0,   0,   0,   5,   0,   0,   0,   8,
>+    0,   0,   0,   255, 255, 255, 255, 0,   0,   0,   0,   1,   0,   0,   0,   13,  0,   0,   0,
>+    83,  97,  109, 112, 108, 101, 114, 0,   84,  101, 120, 116, 117, 114, 101, 70,  95,  51,  68,
>+    0,   77,  105, 99,  114, 111, 115, 111, 102, 116, 32,  40,  82,  41,  32,  72,  76,  83,  76,
>+    32,  83,  104, 97,  100, 101, 114, 32,  67,  111, 109, 112, 105, 108, 101, 114, 32,  57,  46,
>+    50,  57,  46,  57,  53,  50,  46,  51,  49,  49,  49,  0,   171, 171, 171, 73,  83,  71,  78,
>+    128, 0,   0,   0,   3,   0,   0,   0,   8,   0,   0,   0,   80,  0,   0,   0,   0,   0,   0,
>+    0,   1,   0,   0,   0,   3,   0,   0,   0,   0,   0,   0,   0,   15,  0,   0,   0,   92,  0,
>+    0,   0,   0,   0,   0,   0,   4,   0,   0,   0,   1,   0,   0,   0,   1,   0,   0,   0,   1,
>+    0,   0,   0,   118, 0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   3,   0,   0,   0,
>+    2,   0,   0,   0,   7,   7,   0,   0,   83,  86,  95,  80,  79,  83,  73,  84,  73,  79,  78,
>+    0,   83,  86,  95,  82,  69,  78,  68,  69,  82,  84,  65,  82,  71,  69,  84,  65,  82,  82,
>+    65,  89,  73,  78,  68,  69,  88,  0,   84,  69,  88,  67,  79,  79,  82,  68,  0,   171, 79,
>+    83,  71,  78,  44,  0,   0,   0,   1,   0,   0,   0,   8,   0,   0,   0,   32,  0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   2,   0,   0,   0,   0,   0,   0,   0,   15,  0,   0,
>+    0,   83,  86,  95,  84,  65,  82,  71,  69,  84,  0,   171, 171, 83,  72,  68,  82,  24,  1,
>+    0,   0,   64,  0,   0,   0,   70,  0,   0,   0,   90,  0,   0,   3,   0,   96,  16,  0,   0,
>+    0,   0,   0,   88,  40,  0,   4,   0,   112, 16,  0,   0,   0,   0,   0,   85,  85,  0,   0,
>+    98,  16,  0,   3,   114, 16,  16,  0,   2,   0,   0,   0,   101, 0,   0,   3,   242, 32,  16,
>+    0,   0,   0,   0,   0,   104, 0,   0,   2,   2,   0,   0,   0,   69,  0,   0,   9,   242, 0,
>+    16,  0,   0,   0,   0,   0,   70,  18,  16,  0,   2,   0,   0,   0,   70,  126, 16,  0,   0,
>+    0,   0,   0,   0,   96,  16,  0,   0,   0,   0,   0,   49,  0,   0,   7,   18,  0,   16,  0,
>+    1,   0,   0,   0,   1,   64,  0,   0,   0,   0,   0,   0,   58,  0,   16,  0,   0,   0,   0,
>+    0,   14,  0,   0,   7,   226, 0,   16,  0,   1,   0,   0,   0,   6,   9,   16,  0,   0,   0,
>+    0,   0,   246, 15,  16,  0,   0,   0,   0,   0,   55,  0,   0,   9,   114, 0,   16,  0,   0,
>+    0,   0,   0,   6,   0,   16,  0,   1,   0,   0,   0,   150, 7,   16,  0,   1,   0,   0,   0,
>+    70,  2,   16,  0,   0,   0,   0,   0,   56,  0,   0,   10,  242, 0,   16,  0,   0,   0,   0,
>+    0,   70,  14,  16,  0,   0,   0,   0,   0,   2,   64,  0,   0,   0,   0,   254, 66,  0,   0,
>+    254, 66,  0,   0,   254, 66,  0,   0,   254, 66,  64,  0,   0,   5,   242, 0,   16,  0,   0,
>+    0,   0,   0,   70,  14,  16,  0,   0,   0,   0,   0,   27,  0,   0,   5,   242, 32,  16,  0,
>+    0,   0,   0,   0,   70,  14,  16,  0,   0,   0,   0,   0,   62,  0,   0,   1,   83,  84,  65,
>+    84,  116, 0,   0,   0,   8,   0,   0,   0,   2,   0,   0,   0,   0,   0,   0,   0,   2,   0,
>+    0,   0,   4,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   1,   0,   0,   0,   1,   0,   0,   0,   2,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0};
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftou_pm_rgb_2d_ps.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftou_pm_rgb_2d_ps.h
>new file mode 100644
>index 00000000000..6bbafe83e90
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftou_pm_rgb_2d_ps.h
>@@ -0,0 +1,86 @@
>+#if 0
>+//
>+// Generated by Microsoft (R) HLSL Shader Compiler 9.29.952.3111
>+//
>+//
>+//   fxc /nologo /E PS_FtoU_PM_RGB_2D /T ps_4_0 /Fh
>+//    compiled\multiplyalpha_ftou_pm_rgb_2d_ps.h MultiplyAlpha.hlsl
>+//
>+//
>+// Resource Bindings:
>+//
>+// Name                                 Type  Format         Dim Slot Elements
>+// ------------------------------ ---------- ------- ----------- ---- --------
>+// Sampler                           sampler      NA          NA    0        1
>+// TextureF                          texture  float4          2d    0        1
>+//
>+//
>+//
>+// Input signature:
>+//
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_POSITION              0   xyzw        0      POS  float
>+// TEXCOORD                 0   xy          1     NONE  float   xy
>+//
>+//
>+// Output signature:
>+//
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_TARGET                0   xyzw        0   TARGET   uint   xyzw
>+//
>+ps_4_0
>+dcl_sampler s0, mode_default
>+dcl_resource_texture2d (float,float,float,float) t0
>+dcl_input_ps linear v1.xy
>+dcl_output o0.xyzw
>+dcl_temps 1
>+sample r0.xyzw, v1.xyxx, t0.xyzw, s0
>+mul r0.xyz, r0.wwww, r0.xyzx
>+mul r0.xyz, r0.xyzx, l(255.000000, 255.000000, 255.000000, 0.000000)
>+ftou o0.xyz, r0.xyzx
>+mov o0.w, l(1)
>+ret
>+// Approximately 6 instruction slots used
>+#endif
>+
>+const BYTE g_PS_FtoU_PM_RGB_2D[] = {
>+    68,  88,  66,  67,  20,  77,  110, 129, 29,  108, 27,  35,  238, 173, 7,   238, 54,  53,  120,
>+    204, 1,   0,   0,   0,   196, 2,   0,   0,   5,   0,   0,   0,   52,  0,   0,   0,   220, 0,
>+    0,   0,   52,  1,   0,   0,   104, 1,   0,   0,   72,  2,   0,   0,   82,  68,  69,  70,  160,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   2,   0,   0,   0,   28,  0,   0,   0,
>+    0,   4,   255, 255, 0,   1,   0,   0,   109, 0,   0,   0,   92,  0,   0,   0,   3,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,
>+    0,   0,   1,   0,   0,   0,   100, 0,   0,   0,   2,   0,   0,   0,   5,   0,   0,   0,   4,
>+    0,   0,   0,   255, 255, 255, 255, 0,   0,   0,   0,   1,   0,   0,   0,   13,  0,   0,   0,
>+    83,  97,  109, 112, 108, 101, 114, 0,   84,  101, 120, 116, 117, 114, 101, 70,  0,   77,  105,
>+    99,  114, 111, 115, 111, 102, 116, 32,  40,  82,  41,  32,  72,  76,  83,  76,  32,  83,  104,
>+    97,  100, 101, 114, 32,  67,  111, 109, 112, 105, 108, 101, 114, 32,  57,  46,  50,  57,  46,
>+    57,  53,  50,  46,  51,  49,  49,  49,  0,   171, 171, 73,  83,  71,  78,  80,  0,   0,   0,
>+    2,   0,   0,   0,   8,   0,   0,   0,   56,  0,   0,   0,   0,   0,   0,   0,   1,   0,   0,
>+    0,   3,   0,   0,   0,   0,   0,   0,   0,   15,  0,   0,   0,   68,  0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   3,   0,   0,   0,   1,   0,   0,   0,   3,   3,   0,   0,   83,
>+    86,  95,  80,  79,  83,  73,  84,  73,  79,  78,  0,   84,  69,  88,  67,  79,  79,  82,  68,
>+    0,   171, 171, 171, 79,  83,  71,  78,  44,  0,   0,   0,   1,   0,   0,   0,   8,   0,   0,
>+    0,   32,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   0,   0,
>+    0,   0,   15,  0,   0,   0,   83,  86,  95,  84,  65,  82,  71,  69,  84,  0,   171, 171, 83,
>+    72,  68,  82,  216, 0,   0,   0,   64,  0,   0,   0,   54,  0,   0,   0,   90,  0,   0,   3,
>+    0,   96,  16,  0,   0,   0,   0,   0,   88,  24,  0,   4,   0,   112, 16,  0,   0,   0,   0,
>+    0,   85,  85,  0,   0,   98,  16,  0,   3,   50,  16,  16,  0,   1,   0,   0,   0,   101, 0,
>+    0,   3,   242, 32,  16,  0,   0,   0,   0,   0,   104, 0,   0,   2,   1,   0,   0,   0,   69,
>+    0,   0,   9,   242, 0,   16,  0,   0,   0,   0,   0,   70,  16,  16,  0,   1,   0,   0,   0,
>+    70,  126, 16,  0,   0,   0,   0,   0,   0,   96,  16,  0,   0,   0,   0,   0,   56,  0,   0,
>+    7,   114, 0,   16,  0,   0,   0,   0,   0,   246, 15,  16,  0,   0,   0,   0,   0,   70,  2,
>+    16,  0,   0,   0,   0,   0,   56,  0,   0,   10,  114, 0,   16,  0,   0,   0,   0,   0,   70,
>+    2,   16,  0,   0,   0,   0,   0,   2,   64,  0,   0,   0,   0,   127, 67,  0,   0,   127, 67,
>+    0,   0,   127, 67,  0,   0,   0,   0,   28,  0,   0,   5,   114, 32,  16,  0,   0,   0,   0,
>+    0,   70,  2,   16,  0,   0,   0,   0,   0,   54,  0,   0,   5,   130, 32,  16,  0,   0,   0,
>+    0,   0,   1,   64,  0,   0,   1,   0,   0,   0,   62,  0,   0,   1,   83,  84,  65,  84,  116,
>+    0,   0,   0,   6,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   2,   0,   0,   0,
>+    2,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0};
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftou_pm_rgb_2darray_ps.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftou_pm_rgb_2darray_ps.h
>new file mode 100644
>index 00000000000..decebddf060
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftou_pm_rgb_2darray_ps.h
>@@ -0,0 +1,96 @@
>+#if 0
>+//
>+// Generated by Microsoft (R) HLSL Shader Compiler 9.29.952.3111
>+//
>+//
>+//   fxc /nologo /E PS_FtoU_PM_RGB_2DArray /T ps_4_0 /Fh
>+//    compiled\multiplyalpha_ftou_pm_rgb_2darray_ps.h MultiplyAlpha.hlsl
>+//
>+//
>+// Resource Bindings:
>+//
>+// Name                                 Type  Format         Dim Slot Elements
>+// ------------------------------ ---------- ------- ----------- ---- --------
>+// Sampler                           sampler      NA          NA    0        1
>+// TextureF_2DArray                  texture  float4     2darray    0        1
>+//
>+//
>+//
>+// Input signature:
>+//
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_POSITION              0   xyzw        0      POS  float       
>+// SV_RENDERTARGETARRAYINDEX     0   x           1  RTINDEX   uint   x   
>+// TEXCOORD                 0   xyz         2     NONE  float   xy  
>+//
>+//
>+// Output signature:
>+//
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_TARGET                0   xyzw        0   TARGET   uint   xyzw
>+//
>+ps_4_0
>+dcl_sampler s0, mode_default
>+dcl_resource_texture2darray (float,float,float,float) t0
>+dcl_input_ps_siv constant v1.x, rendertarget_array_index
>+dcl_input_ps linear v2.xy
>+dcl_output o0.xyzw
>+dcl_temps 1
>+utof r0.z, v1.x
>+mov r0.xy, v2.xyxx
>+sample r0.xyzw, r0.xyzx, t0.xyzw, s0
>+mul r0.xyz, r0.wwww, r0.xyzx
>+mul r0.xyz, r0.xyzx, l(255.000000, 255.000000, 255.000000, 0.000000)
>+ftou o0.xyz, r0.xyzx
>+mov o0.w, l(1)
>+ret 
>+// Approximately 8 instruction slots used
>+#endif
>+
>+const BYTE g_PS_FtoU_PM_RGB_2DArray[] = {
>+    68,  88,  66,  67,  54,  224, 65,  196, 66,  244, 119, 251, 192, 102, 250, 25,  134, 201, 171,
>+    166, 1,   0,   0,   0,   52,  3,   0,   0,   5,   0,   0,   0,   52,  0,   0,   0,   228, 0,
>+    0,   0,   108, 1,   0,   0,   160, 1,   0,   0,   184, 2,   0,   0,   82,  68,  69,  70,  168,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   2,   0,   0,   0,   28,  0,   0,   0,
>+    0,   4,   255, 255, 0,   1,   0,   0,   117, 0,   0,   0,   92,  0,   0,   0,   3,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,
>+    0,   0,   1,   0,   0,   0,   100, 0,   0,   0,   2,   0,   0,   0,   5,   0,   0,   0,   5,
>+    0,   0,   0,   255, 255, 255, 255, 0,   0,   0,   0,   1,   0,   0,   0,   13,  0,   0,   0,
>+    83,  97,  109, 112, 108, 101, 114, 0,   84,  101, 120, 116, 117, 114, 101, 70,  95,  50,  68,
>+    65,  114, 114, 97,  121, 0,   77,  105, 99,  114, 111, 115, 111, 102, 116, 32,  40,  82,  41,
>+    32,  72,  76,  83,  76,  32,  83,  104, 97,  100, 101, 114, 32,  67,  111, 109, 112, 105, 108,
>+    101, 114, 32,  57,  46,  50,  57,  46,  57,  53,  50,  46,  51,  49,  49,  49,  0,   171, 171,
>+    73,  83,  71,  78,  128, 0,   0,   0,   3,   0,   0,   0,   8,   0,   0,   0,   80,  0,   0,
>+    0,   0,   0,   0,   0,   1,   0,   0,   0,   3,   0,   0,   0,   0,   0,   0,   0,   15,  0,
>+    0,   0,   92,  0,   0,   0,   0,   0,   0,   0,   4,   0,   0,   0,   1,   0,   0,   0,   1,
>+    0,   0,   0,   1,   1,   0,   0,   118, 0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    3,   0,   0,   0,   2,   0,   0,   0,   7,   3,   0,   0,   83,  86,  95,  80,  79,  83,  73,
>+    84,  73,  79,  78,  0,   83,  86,  95,  82,  69,  78,  68,  69,  82,  84,  65,  82,  71,  69,
>+    84,  65,  82,  82,  65,  89,  73,  78,  68,  69,  88,  0,   84,  69,  88,  67,  79,  79,  82,
>+    68,  0,   171, 79,  83,  71,  78,  44,  0,   0,   0,   1,   0,   0,   0,   8,   0,   0,   0,
>+    32,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,
>+    0,   15,  0,   0,   0,   83,  86,  95,  84,  65,  82,  71,  69,  84,  0,   171, 171, 83,  72,
>+    68,  82,  16,  1,   0,   0,   64,  0,   0,   0,   68,  0,   0,   0,   90,  0,   0,   3,   0,
>+    96,  16,  0,   0,   0,   0,   0,   88,  64,  0,   4,   0,   112, 16,  0,   0,   0,   0,   0,
>+    85,  85,  0,   0,   100, 8,   0,   4,   18,  16,  16,  0,   1,   0,   0,   0,   4,   0,   0,
>+    0,   98,  16,  0,   3,   50,  16,  16,  0,   2,   0,   0,   0,   101, 0,   0,   3,   242, 32,
>+    16,  0,   0,   0,   0,   0,   104, 0,   0,   2,   1,   0,   0,   0,   86,  0,   0,   5,   66,
>+    0,   16,  0,   0,   0,   0,   0,   10,  16,  16,  0,   1,   0,   0,   0,   54,  0,   0,   5,
>+    50,  0,   16,  0,   0,   0,   0,   0,   70,  16,  16,  0,   2,   0,   0,   0,   69,  0,   0,
>+    9,   242, 0,   16,  0,   0,   0,   0,   0,   70,  2,   16,  0,   0,   0,   0,   0,   70,  126,
>+    16,  0,   0,   0,   0,   0,   0,   96,  16,  0,   0,   0,   0,   0,   56,  0,   0,   7,   114,
>+    0,   16,  0,   0,   0,   0,   0,   246, 15,  16,  0,   0,   0,   0,   0,   70,  2,   16,  0,
>+    0,   0,   0,   0,   56,  0,   0,   10,  114, 0,   16,  0,   0,   0,   0,   0,   70,  2,   16,
>+    0,   0,   0,   0,   0,   2,   64,  0,   0,   0,   0,   127, 67,  0,   0,   127, 67,  0,   0,
>+    127, 67,  0,   0,   0,   0,   28,  0,   0,   5,   114, 32,  16,  0,   0,   0,   0,   0,   70,
>+    2,   16,  0,   0,   0,   0,   0,   54,  0,   0,   5,   130, 32,  16,  0,   0,   0,   0,   0,
>+    1,   64,  0,   0,   1,   0,   0,   0,   62,  0,   0,   1,   83,  84,  65,  84,  116, 0,   0,
>+    0,   8,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   3,   0,   0,   0,   2,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   2,   0,   0,   0,   0,   0,   0,   0,   2,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0};
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftou_pm_rgb_3d_ps.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftou_pm_rgb_3d_ps.h
>new file mode 100644
>index 00000000000..0480272a1d2
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftou_pm_rgb_3d_ps.h
>@@ -0,0 +1,89 @@
>+#if 0
>+//
>+// Generated by Microsoft (R) HLSL Shader Compiler 9.29.952.3111
>+//
>+//
>+//   fxc /nologo /E PS_FtoU_PM_RGB_3D /T ps_4_0 /Fh
>+//    compiled\multiplyalpha_ftou_pm_rgb_3d_ps.h MultiplyAlpha.hlsl
>+//
>+//
>+// Resource Bindings:
>+//
>+// Name                                 Type  Format         Dim Slot Elements
>+// ------------------------------ ---------- ------- ----------- ---- --------
>+// Sampler                           sampler      NA          NA    0        1
>+// TextureF_3D                       texture  float4          3d    0        1
>+//
>+//
>+//
>+// Input signature:
>+//
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_POSITION              0   xyzw        0      POS  float       
>+// SV_RENDERTARGETARRAYINDEX     0   x           1  RTINDEX   uint       
>+// TEXCOORD                 0   xyz         2     NONE  float   xyz 
>+//
>+//
>+// Output signature:
>+//
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_TARGET                0   xyzw        0   TARGET   uint   xyzw
>+//
>+ps_4_0
>+dcl_sampler s0, mode_default
>+dcl_resource_texture3d (float,float,float,float) t0
>+dcl_input_ps linear v2.xyz
>+dcl_output o0.xyzw
>+dcl_temps 1
>+sample r0.xyzw, v2.xyzx, t0.xyzw, s0
>+mul r0.xyz, r0.wwww, r0.xyzx
>+mul r0.xyz, r0.xyzx, l(255.000000, 255.000000, 255.000000, 0.000000)
>+ftou o0.xyz, r0.xyzx
>+mov o0.w, l(1)
>+ret 
>+// Approximately 6 instruction slots used
>+#endif
>+
>+const BYTE g_PS_FtoU_PM_RGB_3D[] = {
>+    68,  88, 66,  67,  20,  187, 213, 234, 155, 214, 102, 203, 113, 47,  28,  231, 206, 171, 185,
>+    96,  1,  0,   0,   0,   248, 2,   0,   0,   5,   0,   0,   0,   52,  0,   0,   0,   224, 0,
>+    0,   0,  104, 1,   0,   0,   156, 1,   0,   0,   124, 2,   0,   0,   82,  68,  69,  70,  164,
>+    0,   0,  0,   0,   0,   0,   0,   0,   0,   0,   0,   2,   0,   0,   0,   28,  0,   0,   0,
>+    0,   4,  255, 255, 0,   1,   0,   0,   112, 0,   0,   0,   92,  0,   0,   0,   3,   0,   0,
>+    0,   0,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,
>+    0,   0,  1,   0,   0,   0,   100, 0,   0,   0,   2,   0,   0,   0,   5,   0,   0,   0,   8,
>+    0,   0,  0,   255, 255, 255, 255, 0,   0,   0,   0,   1,   0,   0,   0,   13,  0,   0,   0,
>+    83,  97, 109, 112, 108, 101, 114, 0,   84,  101, 120, 116, 117, 114, 101, 70,  95,  51,  68,
>+    0,   77, 105, 99,  114, 111, 115, 111, 102, 116, 32,  40,  82,  41,  32,  72,  76,  83,  76,
>+    32,  83, 104, 97,  100, 101, 114, 32,  67,  111, 109, 112, 105, 108, 101, 114, 32,  57,  46,
>+    50,  57, 46,  57,  53,  50,  46,  51,  49,  49,  49,  0,   171, 171, 171, 73,  83,  71,  78,
>+    128, 0,  0,   0,   3,   0,   0,   0,   8,   0,   0,   0,   80,  0,   0,   0,   0,   0,   0,
>+    0,   1,  0,   0,   0,   3,   0,   0,   0,   0,   0,   0,   0,   15,  0,   0,   0,   92,  0,
>+    0,   0,  0,   0,   0,   0,   4,   0,   0,   0,   1,   0,   0,   0,   1,   0,   0,   0,   1,
>+    0,   0,  0,   118, 0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   3,   0,   0,   0,
>+    2,   0,  0,   0,   7,   7,   0,   0,   83,  86,  95,  80,  79,  83,  73,  84,  73,  79,  78,
>+    0,   83, 86,  95,  82,  69,  78,  68,  69,  82,  84,  65,  82,  71,  69,  84,  65,  82,  82,
>+    65,  89, 73,  78,  68,  69,  88,  0,   84,  69,  88,  67,  79,  79,  82,  68,  0,   171, 79,
>+    83,  71, 78,  44,  0,   0,   0,   1,   0,   0,   0,   8,   0,   0,   0,   32,  0,   0,   0,
>+    0,   0,  0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   15,  0,   0,
>+    0,   83, 86,  95,  84,  65,  82,  71,  69,  84,  0,   171, 171, 83,  72,  68,  82,  216, 0,
>+    0,   0,  64,  0,   0,   0,   54,  0,   0,   0,   90,  0,   0,   3,   0,   96,  16,  0,   0,
>+    0,   0,  0,   88,  40,  0,   4,   0,   112, 16,  0,   0,   0,   0,   0,   85,  85,  0,   0,
>+    98,  16, 0,   3,   114, 16,  16,  0,   2,   0,   0,   0,   101, 0,   0,   3,   242, 32,  16,
>+    0,   0,  0,   0,   0,   104, 0,   0,   2,   1,   0,   0,   0,   69,  0,   0,   9,   242, 0,
>+    16,  0,  0,   0,   0,   0,   70,  18,  16,  0,   2,   0,   0,   0,   70,  126, 16,  0,   0,
>+    0,   0,  0,   0,   96,  16,  0,   0,   0,   0,   0,   56,  0,   0,   7,   114, 0,   16,  0,
>+    0,   0,  0,   0,   246, 15,  16,  0,   0,   0,   0,   0,   70,  2,   16,  0,   0,   0,   0,
>+    0,   56, 0,   0,   10,  114, 0,   16,  0,   0,   0,   0,   0,   70,  2,   16,  0,   0,   0,
>+    0,   0,  2,   64,  0,   0,   0,   0,   127, 67,  0,   0,   127, 67,  0,   0,   127, 67,  0,
>+    0,   0,  0,   28,  0,   0,   5,   114, 32,  16,  0,   0,   0,   0,   0,   70,  2,   16,  0,
>+    0,   0,  0,   0,   54,  0,   0,   5,   130, 32,  16,  0,   0,   0,   0,   0,   1,   64,  0,
>+    0,   1,  0,   0,   0,   62,  0,   0,   1,   83,  84,  65,  84,  116, 0,   0,   0,   6,   0,
>+    0,   0,  1,   0,   0,   0,   0,   0,   0,   0,   2,   0,   0,   0,   2,   0,   0,   0,   0,
>+    0,   0,  0,   0,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,
>+    0,   0,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,
>+    0,   0,  0,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0};
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftou_pm_rgb_ps.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftou_pm_rgb_ps.h
>deleted file mode 100644
>index 1f2ae2b55de..00000000000
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftou_pm_rgb_ps.h
>+++ /dev/null
>@@ -1,82 +0,0 @@
>-#if 0
>-//
>-// Generated by Microsoft (R) HLSL Shader Compiler 6.3.9600.16384
>-//
>-//
>-// Resource Bindings:
>-//
>-// Name                                 Type  Format         Dim Slot Elements
>-// ------------------------------ ---------- ------- ----------- ---- --------
>-// Sampler                           sampler      NA          NA    0        1
>-// TextureF                          texture  float4          2d    0        1
>-//
>-//
>-//
>-// Input signature:
>-//
>-// Name                 Index   Mask Register SysValue  Format   Used
>-// -------------------- ----- ------ -------- -------- ------- ------
>-// SV_POSITION              0   xyzw        0      POS   float       
>-// TEXCOORD                 0   xy          1     NONE   float   xy  
>-//
>-//
>-// Output signature:
>-//
>-// Name                 Index   Mask Register SysValue  Format   Used
>-// -------------------- ----- ------ -------- -------- ------- ------
>-// SV_TARGET                0   xyzw        0   TARGET    uint   xyzw
>-//
>-ps_4_0
>-dcl_sampler s0, mode_default
>-dcl_resource_texture2d (float,float,float,float) t0
>-dcl_input_ps linear v1.xy
>-dcl_output o0.xyzw
>-dcl_temps 1
>-sample r0.xyzw, v1.xyxx, t0.xyzw, s0
>-mul r0.xyz, r0.wwww, r0.xyzx
>-mul r0.xyz, r0.xyzx, l(255.000000, 255.000000, 255.000000, 0.000000)
>-ftou o0.xyz, r0.xyzx
>-mov o0.w, l(1)
>-ret 
>-// Approximately 6 instruction slots used
>-#endif
>-
>-const BYTE g_PS_FtoU_PM_RGB[] = {
>-    68, 88,  66,  67,  155, 36,  56,  175, 46,  138, 216, 232, 30,  0,   183, 157, 15,  83,  210,
>-    88, 1,   0,   0,   0,   196, 2,   0,   0,   5,   0,   0,   0,   52,  0,   0,   0,   220, 0,
>-    0,  0,   52,  1,   0,   0,   104, 1,   0,   0,   72,  2,   0,   0,   82,  68,  69,  70,  160,
>-    0,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   2,   0,   0,   0,   28,  0,   0,   0,
>-    0,  4,   255, 255, 0,   1,   0,   0,   109, 0,   0,   0,   92,  0,   0,   0,   3,   0,   0,
>-    0,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,
>-    0,  0,   1,   0,   0,   0,   100, 0,   0,   0,   2,   0,   0,   0,   5,   0,   0,   0,   4,
>-    0,  0,   0,   255, 255, 255, 255, 0,   0,   0,   0,   1,   0,   0,   0,   13,  0,   0,   0,
>-    83, 97,  109, 112, 108, 101, 114, 0,   84,  101, 120, 116, 117, 114, 101, 70,  0,   77,  105,
>-    99, 114, 111, 115, 111, 102, 116, 32,  40,  82,  41,  32,  72,  76,  83,  76,  32,  83,  104,
>-    97, 100, 101, 114, 32,  67,  111, 109, 112, 105, 108, 101, 114, 32,  54,  46,  51,  46,  57,
>-    54, 48,  48,  46,  49,  54,  51,  56,  52,  0,   171, 73,  83,  71,  78,  80,  0,   0,   0,
>-    2,  0,   0,   0,   8,   0,   0,   0,   56,  0,   0,   0,   0,   0,   0,   0,   1,   0,   0,
>-    0,  3,   0,   0,   0,   0,   0,   0,   0,   15,  0,   0,   0,   68,  0,   0,   0,   0,   0,
>-    0,  0,   0,   0,   0,   0,   3,   0,   0,   0,   1,   0,   0,   0,   3,   3,   0,   0,   83,
>-    86, 95,  80,  79,  83,  73,  84,  73,  79,  78,  0,   84,  69,  88,  67,  79,  79,  82,  68,
>-    0,  171, 171, 171, 79,  83,  71,  78,  44,  0,   0,   0,   1,   0,   0,   0,   8,   0,   0,
>-    0,  32,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   0,   0,
>-    0,  0,   15,  0,   0,   0,   83,  86,  95,  84,  65,  82,  71,  69,  84,  0,   171, 171, 83,
>-    72, 68,  82,  216, 0,   0,   0,   64,  0,   0,   0,   54,  0,   0,   0,   90,  0,   0,   3,
>-    0,  96,  16,  0,   0,   0,   0,   0,   88,  24,  0,   4,   0,   112, 16,  0,   0,   0,   0,
>-    0,  85,  85,  0,   0,   98,  16,  0,   3,   50,  16,  16,  0,   1,   0,   0,   0,   101, 0,
>-    0,  3,   242, 32,  16,  0,   0,   0,   0,   0,   104, 0,   0,   2,   1,   0,   0,   0,   69,
>-    0,  0,   9,   242, 0,   16,  0,   0,   0,   0,   0,   70,  16,  16,  0,   1,   0,   0,   0,
>-    70, 126, 16,  0,   0,   0,   0,   0,   0,   96,  16,  0,   0,   0,   0,   0,   56,  0,   0,
>-    7,  114, 0,   16,  0,   0,   0,   0,   0,   246, 15,  16,  0,   0,   0,   0,   0,   70,  2,
>-    16, 0,   0,   0,   0,   0,   56,  0,   0,   10,  114, 0,   16,  0,   0,   0,   0,   0,   70,
>-    2,  16,  0,   0,   0,   0,   0,   2,   64,  0,   0,   0,   0,   127, 67,  0,   0,   127, 67,
>-    0,  0,   127, 67,  0,   0,   0,   0,   28,  0,   0,   5,   114, 32,  16,  0,   0,   0,   0,
>-    0,  70,  2,   16,  0,   0,   0,   0,   0,   54,  0,   0,   5,   130, 32,  16,  0,   0,   0,
>-    0,  0,   1,   64,  0,   0,   1,   0,   0,   0,   62,  0,   0,   1,   83,  84,  65,  84,  116,
>-    0,  0,   0,   6,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   2,   0,   0,   0,
>-    2,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,
>-    0,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>-    0,  0,   1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>-    0,  0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,
>-    0,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>-    0,  0,   0,   0,   0};
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftou_pm_rgba_2d_ps.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftou_pm_rgba_2d_ps.h
>new file mode 100644
>index 00000000000..eecab30929e
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftou_pm_rgba_2d_ps.h
>@@ -0,0 +1,84 @@
>+#if 0
>+//
>+// Generated by Microsoft (R) HLSL Shader Compiler 9.29.952.3111
>+//
>+//
>+//   fxc /nologo /E PS_FtoU_PM_RGBA_2D /T ps_4_0 /Fh
>+//    compiled\multiplyalpha_ftou_pm_rgba_2d_ps.h MultiplyAlpha.hlsl
>+//
>+//
>+// Resource Bindings:
>+//
>+// Name                                 Type  Format         Dim Slot Elements
>+// ------------------------------ ---------- ------- ----------- ---- --------
>+// Sampler                           sampler      NA          NA    0        1
>+// TextureF                          texture  float4          2d    0        1
>+//
>+//
>+//
>+// Input signature:
>+//
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_POSITION              0   xyzw        0      POS  float
>+// TEXCOORD                 0   xy          1     NONE  float   xy
>+//
>+//
>+// Output signature:
>+//
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_TARGET                0   xyzw        0   TARGET   uint   xyzw
>+//
>+ps_4_0
>+dcl_sampler s0, mode_default
>+dcl_resource_texture2d (float,float,float,float) t0
>+dcl_input_ps linear v1.xy
>+dcl_output o0.xyzw
>+dcl_temps 1
>+sample r0.xyzw, v1.xyxx, t0.xyzw, s0
>+mul r0.xyz, r0.wwww, r0.xyzx
>+mul r0.xyzw, r0.xyzw, l(255.000000, 255.000000, 255.000000, 255.000000)
>+ftou o0.xyzw, r0.xyzw
>+ret
>+// Approximately 5 instruction slots used
>+#endif
>+
>+const BYTE g_PS_FtoU_PM_RGBA_2D[] = {
>+    68,  88,  66,  67,  93,  192, 148, 235, 21,  122, 15,  156, 33,  238, 227, 9,  210, 97,  80,
>+    205, 1,   0,   0,   0,   176, 2,   0,   0,   5,   0,   0,   0,   52,  0,   0,  0,   220, 0,
>+    0,   0,   52,  1,   0,   0,   104, 1,   0,   0,   52,  2,   0,   0,   82,  68, 69,  70,  160,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   2,   0,   0,   0,   28, 0,   0,   0,
>+    0,   4,   255, 255, 0,   1,   0,   0,   109, 0,   0,   0,   92,  0,   0,   0,  3,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,  0,   1,   0,
>+    0,   0,   1,   0,   0,   0,   100, 0,   0,   0,   2,   0,   0,   0,   5,   0,  0,   0,   4,
>+    0,   0,   0,   255, 255, 255, 255, 0,   0,   0,   0,   1,   0,   0,   0,   13, 0,   0,   0,
>+    83,  97,  109, 112, 108, 101, 114, 0,   84,  101, 120, 116, 117, 114, 101, 70, 0,   77,  105,
>+    99,  114, 111, 115, 111, 102, 116, 32,  40,  82,  41,  32,  72,  76,  83,  76, 32,  83,  104,
>+    97,  100, 101, 114, 32,  67,  111, 109, 112, 105, 108, 101, 114, 32,  57,  46, 50,  57,  46,
>+    57,  53,  50,  46,  51,  49,  49,  49,  0,   171, 171, 73,  83,  71,  78,  80, 0,   0,   0,
>+    2,   0,   0,   0,   8,   0,   0,   0,   56,  0,   0,   0,   0,   0,   0,   0,  1,   0,   0,
>+    0,   3,   0,   0,   0,   0,   0,   0,   0,   15,  0,   0,   0,   68,  0,   0,  0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   3,   0,   0,   0,   1,   0,   0,   0,   3,   3,  0,   0,   83,
>+    86,  95,  80,  79,  83,  73,  84,  73,  79,  78,  0,   84,  69,  88,  67,  79, 79,  82,  68,
>+    0,   171, 171, 171, 79,  83,  71,  78,  44,  0,   0,   0,   1,   0,   0,   0,  8,   0,   0,
>+    0,   32,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,  0,   0,   0,
>+    0,   0,   15,  0,   0,   0,   83,  86,  95,  84,  65,  82,  71,  69,  84,  0,  171, 171, 83,
>+    72,  68,  82,  196, 0,   0,   0,   64,  0,   0,   0,   49,  0,   0,   0,   90, 0,   0,   3,
>+    0,   96,  16,  0,   0,   0,   0,   0,   88,  24,  0,   4,   0,   112, 16,  0,  0,   0,   0,
>+    0,   85,  85,  0,   0,   98,  16,  0,   3,   50,  16,  16,  0,   1,   0,   0,  0,   101, 0,
>+    0,   3,   242, 32,  16,  0,   0,   0,   0,   0,   104, 0,   0,   2,   1,   0,  0,   0,   69,
>+    0,   0,   9,   242, 0,   16,  0,   0,   0,   0,   0,   70,  16,  16,  0,   1,  0,   0,   0,
>+    70,  126, 16,  0,   0,   0,   0,   0,   0,   96,  16,  0,   0,   0,   0,   0,  56,  0,   0,
>+    7,   114, 0,   16,  0,   0,   0,   0,   0,   246, 15,  16,  0,   0,   0,   0,  0,   70,  2,
>+    16,  0,   0,   0,   0,   0,   56,  0,   0,   10,  242, 0,   16,  0,   0,   0,  0,   0,   70,
>+    14,  16,  0,   0,   0,   0,   0,   2,   64,  0,   0,   0,   0,   127, 67,  0,  0,   127, 67,
>+    0,   0,   127, 67,  0,   0,   127, 67,  28,  0,   0,   5,   242, 32,  16,  0,  0,   0,   0,
>+    0,   70,  14,  16,  0,   0,   0,   0,   0,   62,  0,   0,   1,   83,  84,  65, 84,  116, 0,
>+    0,   0,   5,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   2,   0,  0,   0,   2,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   0,  0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,  0,   0,   0,
>+    0,   1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,  0,   0,   0,
>+    0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   0,   0,  0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,  0,   0,   0,
>+    0,   0,   0,   0};
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftou_pm_rgba_2darray_ps.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftou_pm_rgba_2darray_ps.h
>new file mode 100644
>index 00000000000..f96c032a1ce
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftou_pm_rgba_2darray_ps.h
>@@ -0,0 +1,94 @@
>+#if 0
>+//
>+// Generated by Microsoft (R) HLSL Shader Compiler 9.29.952.3111
>+//
>+//
>+//   fxc /nologo /E PS_FtoU_PM_RGBA_2DArray /T ps_4_0 /Fh
>+//    compiled\multiplyalpha_ftou_pm_rgba_2darray_ps.h MultiplyAlpha.hlsl
>+//
>+//
>+// Resource Bindings:
>+//
>+// Name                                 Type  Format         Dim Slot Elements
>+// ------------------------------ ---------- ------- ----------- ---- --------
>+// Sampler                           sampler      NA          NA    0        1
>+// TextureF_2DArray                  texture  float4     2darray    0        1
>+//
>+//
>+//
>+// Input signature:
>+//
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_POSITION              0   xyzw        0      POS  float       
>+// SV_RENDERTARGETARRAYINDEX     0   x           1  RTINDEX   uint   x   
>+// TEXCOORD                 0   xyz         2     NONE  float   xy  
>+//
>+//
>+// Output signature:
>+//
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_TARGET                0   xyzw        0   TARGET   uint   xyzw
>+//
>+ps_4_0
>+dcl_sampler s0, mode_default
>+dcl_resource_texture2darray (float,float,float,float) t0
>+dcl_input_ps_siv constant v1.x, rendertarget_array_index
>+dcl_input_ps linear v2.xy
>+dcl_output o0.xyzw
>+dcl_temps 1
>+utof r0.z, v1.x
>+mov r0.xy, v2.xyxx
>+sample r0.xyzw, r0.xyzx, t0.xyzw, s0
>+mul r0.xyz, r0.wwww, r0.xyzx
>+mul r0.xyzw, r0.xyzw, l(255.000000, 255.000000, 255.000000, 255.000000)
>+ftou o0.xyzw, r0.xyzw
>+ret 
>+// Approximately 7 instruction slots used
>+#endif
>+
>+const BYTE g_PS_FtoU_PM_RGBA_2DArray[] = {
>+    68,  88,  66,  67,  42,  244, 142, 225, 76,  161, 113, 194, 50,  71,  173, 250, 202, 155, 165,
>+    106, 1,   0,   0,   0,   32,  3,   0,   0,   5,   0,   0,   0,   52,  0,   0,   0,   228, 0,
>+    0,   0,   108, 1,   0,   0,   160, 1,   0,   0,   164, 2,   0,   0,   82,  68,  69,  70,  168,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   2,   0,   0,   0,   28,  0,   0,   0,
>+    0,   4,   255, 255, 0,   1,   0,   0,   117, 0,   0,   0,   92,  0,   0,   0,   3,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,
>+    0,   0,   1,   0,   0,   0,   100, 0,   0,   0,   2,   0,   0,   0,   5,   0,   0,   0,   5,
>+    0,   0,   0,   255, 255, 255, 255, 0,   0,   0,   0,   1,   0,   0,   0,   13,  0,   0,   0,
>+    83,  97,  109, 112, 108, 101, 114, 0,   84,  101, 120, 116, 117, 114, 101, 70,  95,  50,  68,
>+    65,  114, 114, 97,  121, 0,   77,  105, 99,  114, 111, 115, 111, 102, 116, 32,  40,  82,  41,
>+    32,  72,  76,  83,  76,  32,  83,  104, 97,  100, 101, 114, 32,  67,  111, 109, 112, 105, 108,
>+    101, 114, 32,  57,  46,  50,  57,  46,  57,  53,  50,  46,  51,  49,  49,  49,  0,   171, 171,
>+    73,  83,  71,  78,  128, 0,   0,   0,   3,   0,   0,   0,   8,   0,   0,   0,   80,  0,   0,
>+    0,   0,   0,   0,   0,   1,   0,   0,   0,   3,   0,   0,   0,   0,   0,   0,   0,   15,  0,
>+    0,   0,   92,  0,   0,   0,   0,   0,   0,   0,   4,   0,   0,   0,   1,   0,   0,   0,   1,
>+    0,   0,   0,   1,   1,   0,   0,   118, 0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    3,   0,   0,   0,   2,   0,   0,   0,   7,   3,   0,   0,   83,  86,  95,  80,  79,  83,  73,
>+    84,  73,  79,  78,  0,   83,  86,  95,  82,  69,  78,  68,  69,  82,  84,  65,  82,  71,  69,
>+    84,  65,  82,  82,  65,  89,  73,  78,  68,  69,  88,  0,   84,  69,  88,  67,  79,  79,  82,
>+    68,  0,   171, 79,  83,  71,  78,  44,  0,   0,   0,   1,   0,   0,   0,   8,   0,   0,   0,
>+    32,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,
>+    0,   15,  0,   0,   0,   83,  86,  95,  84,  65,  82,  71,  69,  84,  0,   171, 171, 83,  72,
>+    68,  82,  252, 0,   0,   0,   64,  0,   0,   0,   63,  0,   0,   0,   90,  0,   0,   3,   0,
>+    96,  16,  0,   0,   0,   0,   0,   88,  64,  0,   4,   0,   112, 16,  0,   0,   0,   0,   0,
>+    85,  85,  0,   0,   100, 8,   0,   4,   18,  16,  16,  0,   1,   0,   0,   0,   4,   0,   0,
>+    0,   98,  16,  0,   3,   50,  16,  16,  0,   2,   0,   0,   0,   101, 0,   0,   3,   242, 32,
>+    16,  0,   0,   0,   0,   0,   104, 0,   0,   2,   1,   0,   0,   0,   86,  0,   0,   5,   66,
>+    0,   16,  0,   0,   0,   0,   0,   10,  16,  16,  0,   1,   0,   0,   0,   54,  0,   0,   5,
>+    50,  0,   16,  0,   0,   0,   0,   0,   70,  16,  16,  0,   2,   0,   0,   0,   69,  0,   0,
>+    9,   242, 0,   16,  0,   0,   0,   0,   0,   70,  2,   16,  0,   0,   0,   0,   0,   70,  126,
>+    16,  0,   0,   0,   0,   0,   0,   96,  16,  0,   0,   0,   0,   0,   56,  0,   0,   7,   114,
>+    0,   16,  0,   0,   0,   0,   0,   246, 15,  16,  0,   0,   0,   0,   0,   70,  2,   16,  0,
>+    0,   0,   0,   0,   56,  0,   0,   10,  242, 0,   16,  0,   0,   0,   0,   0,   70,  14,  16,
>+    0,   0,   0,   0,   0,   2,   64,  0,   0,   0,   0,   127, 67,  0,   0,   127, 67,  0,   0,
>+    127, 67,  0,   0,   127, 67,  28,  0,   0,   5,   242, 32,  16,  0,   0,   0,   0,   0,   70,
>+    14,  16,  0,   0,   0,   0,   0,   62,  0,   0,   1,   83,  84,  65,  84,  116, 0,   0,   0,
>+    7,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   3,   0,   0,   0,   2,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    2,   0,   0,   0,   0,   0,   0,   0,   2,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0};
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftou_pm_rgba_3d_ps.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftou_pm_rgba_3d_ps.h
>new file mode 100644
>index 00000000000..47204f6dde6
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftou_pm_rgba_3d_ps.h
>@@ -0,0 +1,87 @@
>+#if 0
>+//
>+// Generated by Microsoft (R) HLSL Shader Compiler 9.29.952.3111
>+//
>+//
>+//   fxc /nologo /E PS_FtoU_PM_RGBA_3D /T ps_4_0 /Fh
>+//    compiled\multiplyalpha_ftou_pm_rgba_3d_ps.h MultiplyAlpha.hlsl
>+//
>+//
>+// Resource Bindings:
>+//
>+// Name                                 Type  Format         Dim Slot Elements
>+// ------------------------------ ---------- ------- ----------- ---- --------
>+// Sampler                           sampler      NA          NA    0        1
>+// TextureF_3D                       texture  float4          3d    0        1
>+//
>+//
>+//
>+// Input signature:
>+//
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_POSITION              0   xyzw        0      POS  float       
>+// SV_RENDERTARGETARRAYINDEX     0   x           1  RTINDEX   uint       
>+// TEXCOORD                 0   xyz         2     NONE  float   xyz 
>+//
>+//
>+// Output signature:
>+//
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_TARGET                0   xyzw        0   TARGET   uint   xyzw
>+//
>+ps_4_0
>+dcl_sampler s0, mode_default
>+dcl_resource_texture3d (float,float,float,float) t0
>+dcl_input_ps linear v2.xyz
>+dcl_output o0.xyzw
>+dcl_temps 1
>+sample r0.xyzw, v2.xyzx, t0.xyzw, s0
>+mul r0.xyz, r0.wwww, r0.xyzx
>+mul r0.xyzw, r0.xyzw, l(255.000000, 255.000000, 255.000000, 255.000000)
>+ftou o0.xyzw, r0.xyzw
>+ret 
>+// Approximately 5 instruction slots used
>+#endif
>+
>+const BYTE g_PS_FtoU_PM_RGBA_3D[] = {
>+    68,  88,  66,  67,  5,   232, 61,  27,  145, 8,   233, 211, 47,  61,  219, 94,  35,  252, 253,
>+    81,  1,   0,   0,   0,   228, 2,   0,   0,   5,   0,   0,   0,   52,  0,   0,   0,   224, 0,
>+    0,   0,   104, 1,   0,   0,   156, 1,   0,   0,   104, 2,   0,   0,   82,  68,  69,  70,  164,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   2,   0,   0,   0,   28,  0,   0,   0,
>+    0,   4,   255, 255, 0,   1,   0,   0,   112, 0,   0,   0,   92,  0,   0,   0,   3,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,
>+    0,   0,   1,   0,   0,   0,   100, 0,   0,   0,   2,   0,   0,   0,   5,   0,   0,   0,   8,
>+    0,   0,   0,   255, 255, 255, 255, 0,   0,   0,   0,   1,   0,   0,   0,   13,  0,   0,   0,
>+    83,  97,  109, 112, 108, 101, 114, 0,   84,  101, 120, 116, 117, 114, 101, 70,  95,  51,  68,
>+    0,   77,  105, 99,  114, 111, 115, 111, 102, 116, 32,  40,  82,  41,  32,  72,  76,  83,  76,
>+    32,  83,  104, 97,  100, 101, 114, 32,  67,  111, 109, 112, 105, 108, 101, 114, 32,  57,  46,
>+    50,  57,  46,  57,  53,  50,  46,  51,  49,  49,  49,  0,   171, 171, 171, 73,  83,  71,  78,
>+    128, 0,   0,   0,   3,   0,   0,   0,   8,   0,   0,   0,   80,  0,   0,   0,   0,   0,   0,
>+    0,   1,   0,   0,   0,   3,   0,   0,   0,   0,   0,   0,   0,   15,  0,   0,   0,   92,  0,
>+    0,   0,   0,   0,   0,   0,   4,   0,   0,   0,   1,   0,   0,   0,   1,   0,   0,   0,   1,
>+    0,   0,   0,   118, 0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   3,   0,   0,   0,
>+    2,   0,   0,   0,   7,   7,   0,   0,   83,  86,  95,  80,  79,  83,  73,  84,  73,  79,  78,
>+    0,   83,  86,  95,  82,  69,  78,  68,  69,  82,  84,  65,  82,  71,  69,  84,  65,  82,  82,
>+    65,  89,  73,  78,  68,  69,  88,  0,   84,  69,  88,  67,  79,  79,  82,  68,  0,   171, 79,
>+    83,  71,  78,  44,  0,   0,   0,   1,   0,   0,   0,   8,   0,   0,   0,   32,  0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   15,  0,   0,
>+    0,   83,  86,  95,  84,  65,  82,  71,  69,  84,  0,   171, 171, 83,  72,  68,  82,  196, 0,
>+    0,   0,   64,  0,   0,   0,   49,  0,   0,   0,   90,  0,   0,   3,   0,   96,  16,  0,   0,
>+    0,   0,   0,   88,  40,  0,   4,   0,   112, 16,  0,   0,   0,   0,   0,   85,  85,  0,   0,
>+    98,  16,  0,   3,   114, 16,  16,  0,   2,   0,   0,   0,   101, 0,   0,   3,   242, 32,  16,
>+    0,   0,   0,   0,   0,   104, 0,   0,   2,   1,   0,   0,   0,   69,  0,   0,   9,   242, 0,
>+    16,  0,   0,   0,   0,   0,   70,  18,  16,  0,   2,   0,   0,   0,   70,  126, 16,  0,   0,
>+    0,   0,   0,   0,   96,  16,  0,   0,   0,   0,   0,   56,  0,   0,   7,   114, 0,   16,  0,
>+    0,   0,   0,   0,   246, 15,  16,  0,   0,   0,   0,   0,   70,  2,   16,  0,   0,   0,   0,
>+    0,   56,  0,   0,   10,  242, 0,   16,  0,   0,   0,   0,   0,   70,  14,  16,  0,   0,   0,
>+    0,   0,   2,   64,  0,   0,   0,   0,   127, 67,  0,   0,   127, 67,  0,   0,   127, 67,  0,
>+    0,   127, 67,  28,  0,   0,   5,   242, 32,  16,  0,   0,   0,   0,   0,   70,  14,  16,  0,
>+    0,   0,   0,   0,   62,  0,   0,   1,   83,  84,  65,  84,  116, 0,   0,   0,   5,   0,   0,
>+    0,   1,   0,   0,   0,   0,   0,   0,   0,   2,   0,   0,   0,   2,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,
>+    0,   0,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0};
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftou_pm_rgba_ps.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftou_pm_rgba_ps.h
>deleted file mode 100644
>index 2e63361b4d5..00000000000
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftou_pm_rgba_ps.h
>+++ /dev/null
>@@ -1,80 +0,0 @@
>-#if 0
>-//
>-// Generated by Microsoft (R) HLSL Shader Compiler 6.3.9600.16384
>-//
>-//
>-// Resource Bindings:
>-//
>-// Name                                 Type  Format         Dim Slot Elements
>-// ------------------------------ ---------- ------- ----------- ---- --------
>-// Sampler                           sampler      NA          NA    0        1
>-// TextureF                          texture  float4          2d    0        1
>-//
>-//
>-//
>-// Input signature:
>-//
>-// Name                 Index   Mask Register SysValue  Format   Used
>-// -------------------- ----- ------ -------- -------- ------- ------
>-// SV_POSITION              0   xyzw        0      POS   float       
>-// TEXCOORD                 0   xy          1     NONE   float   xy  
>-//
>-//
>-// Output signature:
>-//
>-// Name                 Index   Mask Register SysValue  Format   Used
>-// -------------------- ----- ------ -------- -------- ------- ------
>-// SV_TARGET                0   xyzw        0   TARGET    uint   xyzw
>-//
>-ps_4_0
>-dcl_sampler s0, mode_default
>-dcl_resource_texture2d (float,float,float,float) t0
>-dcl_input_ps linear v1.xy
>-dcl_output o0.xyzw
>-dcl_temps 1
>-sample r0.xyzw, v1.xyxx, t0.xyzw, s0
>-mul r0.xyz, r0.wwww, r0.xyzx
>-mul r0.xyzw, r0.xyzw, l(255.000000, 255.000000, 255.000000, 255.000000)
>-ftou o0.xyzw, r0.xyzw
>-ret 
>-// Approximately 5 instruction slots used
>-#endif
>-
>-const BYTE g_PS_FtoU_PM_RGBA[] = {
>-    68,  88,  66,  67,  145, 185, 8,   222, 150, 161, 126, 192, 3,   250, 167, 200, 187, 74,  70,
>-    211, 1,   0,   0,   0,   176, 2,   0,   0,   5,   0,   0,   0,   52,  0,   0,   0,   220, 0,
>-    0,   0,   52,  1,   0,   0,   104, 1,   0,   0,   52,  2,   0,   0,   82,  68,  69,  70,  160,
>-    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   2,   0,   0,   0,   28,  0,   0,   0,
>-    0,   4,   255, 255, 0,   1,   0,   0,   109, 0,   0,   0,   92,  0,   0,   0,   3,   0,   0,
>-    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,
>-    0,   0,   1,   0,   0,   0,   100, 0,   0,   0,   2,   0,   0,   0,   5,   0,   0,   0,   4,
>-    0,   0,   0,   255, 255, 255, 255, 0,   0,   0,   0,   1,   0,   0,   0,   13,  0,   0,   0,
>-    83,  97,  109, 112, 108, 101, 114, 0,   84,  101, 120, 116, 117, 114, 101, 70,  0,   77,  105,
>-    99,  114, 111, 115, 111, 102, 116, 32,  40,  82,  41,  32,  72,  76,  83,  76,  32,  83,  104,
>-    97,  100, 101, 114, 32,  67,  111, 109, 112, 105, 108, 101, 114, 32,  54,  46,  51,  46,  57,
>-    54,  48,  48,  46,  49,  54,  51,  56,  52,  0,   171, 73,  83,  71,  78,  80,  0,   0,   0,
>-    2,   0,   0,   0,   8,   0,   0,   0,   56,  0,   0,   0,   0,   0,   0,   0,   1,   0,   0,
>-    0,   3,   0,   0,   0,   0,   0,   0,   0,   15,  0,   0,   0,   68,  0,   0,   0,   0,   0,
>-    0,   0,   0,   0,   0,   0,   3,   0,   0,   0,   1,   0,   0,   0,   3,   3,   0,   0,   83,
>-    86,  95,  80,  79,  83,  73,  84,  73,  79,  78,  0,   84,  69,  88,  67,  79,  79,  82,  68,
>-    0,   171, 171, 171, 79,  83,  71,  78,  44,  0,   0,   0,   1,   0,   0,   0,   8,   0,   0,
>-    0,   32,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   0,   0,
>-    0,   0,   15,  0,   0,   0,   83,  86,  95,  84,  65,  82,  71,  69,  84,  0,   171, 171, 83,
>-    72,  68,  82,  196, 0,   0,   0,   64,  0,   0,   0,   49,  0,   0,   0,   90,  0,   0,   3,
>-    0,   96,  16,  0,   0,   0,   0,   0,   88,  24,  0,   4,   0,   112, 16,  0,   0,   0,   0,
>-    0,   85,  85,  0,   0,   98,  16,  0,   3,   50,  16,  16,  0,   1,   0,   0,   0,   101, 0,
>-    0,   3,   242, 32,  16,  0,   0,   0,   0,   0,   104, 0,   0,   2,   1,   0,   0,   0,   69,
>-    0,   0,   9,   242, 0,   16,  0,   0,   0,   0,   0,   70,  16,  16,  0,   1,   0,   0,   0,
>-    70,  126, 16,  0,   0,   0,   0,   0,   0,   96,  16,  0,   0,   0,   0,   0,   56,  0,   0,
>-    7,   114, 0,   16,  0,   0,   0,   0,   0,   246, 15,  16,  0,   0,   0,   0,   0,   70,  2,
>-    16,  0,   0,   0,   0,   0,   56,  0,   0,   10,  242, 0,   16,  0,   0,   0,   0,   0,   70,
>-    14,  16,  0,   0,   0,   0,   0,   2,   64,  0,   0,   0,   0,   127, 67,  0,   0,   127, 67,
>-    0,   0,   127, 67,  0,   0,   127, 67,  28,  0,   0,   5,   242, 32,  16,  0,   0,   0,   0,
>-    0,   70,  14,  16,  0,   0,   0,   0,   0,   62,  0,   0,   1,   83,  84,  65,  84,  116, 0,
>-    0,   0,   5,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   2,   0,   0,   0,   2,
>-    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,
>-    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>-    0,   1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>-    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   0,
>-    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>-    0,   0,   0,   0};
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftou_pt_rgb_2d_ps.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftou_pt_rgb_2d_ps.h
>new file mode 100644
>index 00000000000..b032b9b44f0
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftou_pt_rgb_2d_ps.h
>@@ -0,0 +1,83 @@
>+#if 0
>+//
>+// Generated by Microsoft (R) HLSL Shader Compiler 9.29.952.3111
>+//
>+//
>+//   fxc /nologo /E PS_FtoU_PT_RGB_2D /T ps_4_0 /Fh
>+//    compiled\multiplyalpha_ftou_pt_rgb_2d_ps.h MultiplyAlpha.hlsl
>+//
>+//
>+// Resource Bindings:
>+//
>+// Name                                 Type  Format         Dim Slot Elements
>+// ------------------------------ ---------- ------- ----------- ---- --------
>+// Sampler                           sampler      NA          NA    0        1
>+// TextureF                          texture  float4          2d    0        1
>+//
>+//
>+//
>+// Input signature:
>+//
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_POSITION              0   xyzw        0      POS  float
>+// TEXCOORD                 0   xy          1     NONE  float   xy
>+//
>+//
>+// Output signature:
>+//
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_TARGET                0   xyzw        0   TARGET   uint   xyzw
>+//
>+ps_4_0
>+dcl_sampler s0, mode_default
>+dcl_resource_texture2d (float,float,float,float) t0
>+dcl_input_ps linear v1.xy
>+dcl_output o0.xyzw
>+dcl_temps 1
>+sample r0.xyzw, v1.xyxx, t0.xyzw, s0
>+mul r0.xyz, r0.xyzx, l(255.000000, 255.000000, 255.000000, 0.000000)
>+ftou o0.xyz, r0.xyzx
>+mov o0.w, l(1)
>+ret
>+// Approximately 5 instruction slots used
>+#endif
>+
>+const BYTE g_PS_FtoU_PT_RGB_2D[] = {
>+    68,  88,  66,  67,  239, 19,  57,  191, 36,  138, 64,  19,  35,  8,   170, 114, 160, 146, 147,
>+    152, 1,   0,   0,   0,   168, 2,   0,   0,   5,   0,   0,   0,   52,  0,   0,   0,   220, 0,
>+    0,   0,   52,  1,   0,   0,   104, 1,   0,   0,   44,  2,   0,   0,   82,  68,  69,  70,  160,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   2,   0,   0,   0,   28,  0,   0,   0,
>+    0,   4,   255, 255, 0,   1,   0,   0,   109, 0,   0,   0,   92,  0,   0,   0,   3,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,
>+    0,   0,   1,   0,   0,   0,   100, 0,   0,   0,   2,   0,   0,   0,   5,   0,   0,   0,   4,
>+    0,   0,   0,   255, 255, 255, 255, 0,   0,   0,   0,   1,   0,   0,   0,   13,  0,   0,   0,
>+    83,  97,  109, 112, 108, 101, 114, 0,   84,  101, 120, 116, 117, 114, 101, 70,  0,   77,  105,
>+    99,  114, 111, 115, 111, 102, 116, 32,  40,  82,  41,  32,  72,  76,  83,  76,  32,  83,  104,
>+    97,  100, 101, 114, 32,  67,  111, 109, 112, 105, 108, 101, 114, 32,  57,  46,  50,  57,  46,
>+    57,  53,  50,  46,  51,  49,  49,  49,  0,   171, 171, 73,  83,  71,  78,  80,  0,   0,   0,
>+    2,   0,   0,   0,   8,   0,   0,   0,   56,  0,   0,   0,   0,   0,   0,   0,   1,   0,   0,
>+    0,   3,   0,   0,   0,   0,   0,   0,   0,   15,  0,   0,   0,   68,  0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   3,   0,   0,   0,   1,   0,   0,   0,   3,   3,   0,   0,   83,
>+    86,  95,  80,  79,  83,  73,  84,  73,  79,  78,  0,   84,  69,  88,  67,  79,  79,  82,  68,
>+    0,   171, 171, 171, 79,  83,  71,  78,  44,  0,   0,   0,   1,   0,   0,   0,   8,   0,   0,
>+    0,   32,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   0,   0,
>+    0,   0,   15,  0,   0,   0,   83,  86,  95,  84,  65,  82,  71,  69,  84,  0,   171, 171, 83,
>+    72,  68,  82,  188, 0,   0,   0,   64,  0,   0,   0,   47,  0,   0,   0,   90,  0,   0,   3,
>+    0,   96,  16,  0,   0,   0,   0,   0,   88,  24,  0,   4,   0,   112, 16,  0,   0,   0,   0,
>+    0,   85,  85,  0,   0,   98,  16,  0,   3,   50,  16,  16,  0,   1,   0,   0,   0,   101, 0,
>+    0,   3,   242, 32,  16,  0,   0,   0,   0,   0,   104, 0,   0,   2,   1,   0,   0,   0,   69,
>+    0,   0,   9,   242, 0,   16,  0,   0,   0,   0,   0,   70,  16,  16,  0,   1,   0,   0,   0,
>+    70,  126, 16,  0,   0,   0,   0,   0,   0,   96,  16,  0,   0,   0,   0,   0,   56,  0,   0,
>+    10,  114, 0,   16,  0,   0,   0,   0,   0,   70,  2,   16,  0,   0,   0,   0,   0,   2,   64,
>+    0,   0,   0,   0,   127, 67,  0,   0,   127, 67,  0,   0,   127, 67,  0,   0,   0,   0,   28,
>+    0,   0,   5,   114, 32,  16,  0,   0,   0,   0,   0,   70,  2,   16,  0,   0,   0,   0,   0,
>+    54,  0,   0,   5,   130, 32,  16,  0,   0,   0,   0,   0,   1,   64,  0,   0,   1,   0,   0,
>+    0,   62,  0,   0,   1,   83,  84,  65,  84,  116, 0,   0,   0,   5,   0,   0,   0,   1,   0,
>+    0,   0,   0,   0,   0,   0,   2,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   0,   0,
>+    0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0};
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftou_pt_rgb_2darray_ps.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftou_pt_rgb_2darray_ps.h
>new file mode 100644
>index 00000000000..11e56cb60eb
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftou_pt_rgb_2darray_ps.h
>@@ -0,0 +1,93 @@
>+#if 0
>+//
>+// Generated by Microsoft (R) HLSL Shader Compiler 9.29.952.3111
>+//
>+//
>+//   fxc /nologo /E PS_FtoU_PT_RGB_2DArray /T ps_4_0 /Fh
>+//    compiled\multiplyalpha_ftou_pt_rgb_2darray_ps.h MultiplyAlpha.hlsl
>+//
>+//
>+// Resource Bindings:
>+//
>+// Name                                 Type  Format         Dim Slot Elements
>+// ------------------------------ ---------- ------- ----------- ---- --------
>+// Sampler                           sampler      NA          NA    0        1
>+// TextureF_2DArray                  texture  float4     2darray    0        1
>+//
>+//
>+//
>+// Input signature:
>+//
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_POSITION              0   xyzw        0      POS  float       
>+// SV_RENDERTARGETARRAYINDEX     0   x           1  RTINDEX   uint   x   
>+// TEXCOORD                 0   xyz         2     NONE  float   xy  
>+//
>+//
>+// Output signature:
>+//
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_TARGET                0   xyzw        0   TARGET   uint   xyzw
>+//
>+ps_4_0
>+dcl_sampler s0, mode_default
>+dcl_resource_texture2darray (float,float,float,float) t0
>+dcl_input_ps_siv constant v1.x, rendertarget_array_index
>+dcl_input_ps linear v2.xy
>+dcl_output o0.xyzw
>+dcl_temps 1
>+utof r0.z, v1.x
>+mov r0.xy, v2.xyxx
>+sample r0.xyzw, r0.xyzx, t0.xyzw, s0
>+mul r0.xyz, r0.xyzx, l(255.000000, 255.000000, 255.000000, 0.000000)
>+ftou o0.xyz, r0.xyzx
>+mov o0.w, l(1)
>+ret 
>+// Approximately 7 instruction slots used
>+#endif
>+
>+const BYTE g_PS_FtoU_PT_RGB_2DArray[] = {
>+    68,  88,  66,  67,  138, 251, 49,  113, 99,  115, 227, 181, 77,  108, 206, 221, 48,  181, 111,
>+    115, 1,   0,   0,   0,   24,  3,   0,   0,   5,   0,   0,   0,   52,  0,   0,   0,   228, 0,
>+    0,   0,   108, 1,   0,   0,   160, 1,   0,   0,   156, 2,   0,   0,   82,  68,  69,  70,  168,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   2,   0,   0,   0,   28,  0,   0,   0,
>+    0,   4,   255, 255, 0,   1,   0,   0,   117, 0,   0,   0,   92,  0,   0,   0,   3,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,
>+    0,   0,   1,   0,   0,   0,   100, 0,   0,   0,   2,   0,   0,   0,   5,   0,   0,   0,   5,
>+    0,   0,   0,   255, 255, 255, 255, 0,   0,   0,   0,   1,   0,   0,   0,   13,  0,   0,   0,
>+    83,  97,  109, 112, 108, 101, 114, 0,   84,  101, 120, 116, 117, 114, 101, 70,  95,  50,  68,
>+    65,  114, 114, 97,  121, 0,   77,  105, 99,  114, 111, 115, 111, 102, 116, 32,  40,  82,  41,
>+    32,  72,  76,  83,  76,  32,  83,  104, 97,  100, 101, 114, 32,  67,  111, 109, 112, 105, 108,
>+    101, 114, 32,  57,  46,  50,  57,  46,  57,  53,  50,  46,  51,  49,  49,  49,  0,   171, 171,
>+    73,  83,  71,  78,  128, 0,   0,   0,   3,   0,   0,   0,   8,   0,   0,   0,   80,  0,   0,
>+    0,   0,   0,   0,   0,   1,   0,   0,   0,   3,   0,   0,   0,   0,   0,   0,   0,   15,  0,
>+    0,   0,   92,  0,   0,   0,   0,   0,   0,   0,   4,   0,   0,   0,   1,   0,   0,   0,   1,
>+    0,   0,   0,   1,   1,   0,   0,   118, 0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    3,   0,   0,   0,   2,   0,   0,   0,   7,   3,   0,   0,   83,  86,  95,  80,  79,  83,  73,
>+    84,  73,  79,  78,  0,   83,  86,  95,  82,  69,  78,  68,  69,  82,  84,  65,  82,  71,  69,
>+    84,  65,  82,  82,  65,  89,  73,  78,  68,  69,  88,  0,   84,  69,  88,  67,  79,  79,  82,
>+    68,  0,   171, 79,  83,  71,  78,  44,  0,   0,   0,   1,   0,   0,   0,   8,   0,   0,   0,
>+    32,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,
>+    0,   15,  0,   0,   0,   83,  86,  95,  84,  65,  82,  71,  69,  84,  0,   171, 171, 83,  72,
>+    68,  82,  244, 0,   0,   0,   64,  0,   0,   0,   61,  0,   0,   0,   90,  0,   0,   3,   0,
>+    96,  16,  0,   0,   0,   0,   0,   88,  64,  0,   4,   0,   112, 16,  0,   0,   0,   0,   0,
>+    85,  85,  0,   0,   100, 8,   0,   4,   18,  16,  16,  0,   1,   0,   0,   0,   4,   0,   0,
>+    0,   98,  16,  0,   3,   50,  16,  16,  0,   2,   0,   0,   0,   101, 0,   0,   3,   242, 32,
>+    16,  0,   0,   0,   0,   0,   104, 0,   0,   2,   1,   0,   0,   0,   86,  0,   0,   5,   66,
>+    0,   16,  0,   0,   0,   0,   0,   10,  16,  16,  0,   1,   0,   0,   0,   54,  0,   0,   5,
>+    50,  0,   16,  0,   0,   0,   0,   0,   70,  16,  16,  0,   2,   0,   0,   0,   69,  0,   0,
>+    9,   242, 0,   16,  0,   0,   0,   0,   0,   70,  2,   16,  0,   0,   0,   0,   0,   70,  126,
>+    16,  0,   0,   0,   0,   0,   0,   96,  16,  0,   0,   0,   0,   0,   56,  0,   0,   10,  114,
>+    0,   16,  0,   0,   0,   0,   0,   70,  2,   16,  0,   0,   0,   0,   0,   2,   64,  0,   0,
>+    0,   0,   127, 67,  0,   0,   127, 67,  0,   0,   127, 67,  0,   0,   0,   0,   28,  0,   0,
>+    5,   114, 32,  16,  0,   0,   0,   0,   0,   70,  2,   16,  0,   0,   0,   0,   0,   54,  0,
>+    0,   5,   130, 32,  16,  0,   0,   0,   0,   0,   1,   64,  0,   0,   1,   0,   0,   0,   62,
>+    0,   0,   1,   83,  84,  65,  84,  116, 0,   0,   0,   7,   0,   0,   0,   1,   0,   0,   0,
>+    0,   0,   0,   0,   3,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   2,   0,   0,   0,   0,   0,   0,   0,
>+    2,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0};
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftou_pt_rgb_3d_ps.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftou_pt_rgb_3d_ps.h
>new file mode 100644
>index 00000000000..b6c37cba04a
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftou_pt_rgb_3d_ps.h
>@@ -0,0 +1,87 @@
>+#if 0
>+//
>+// Generated by Microsoft (R) HLSL Shader Compiler 9.29.952.3111
>+//
>+//
>+//   fxc /nologo /E PS_FtoU_PT_RGB_3D /T ps_4_0 /Fh
>+//    compiled\multiplyalpha_ftou_pt_rgb_3d_ps.h MultiplyAlpha.hlsl
>+//
>+//
>+// Resource Bindings:
>+//
>+// Name                                 Type  Format         Dim Slot Elements
>+// ------------------------------ ---------- ------- ----------- ---- --------
>+// Sampler                           sampler      NA          NA    0        1
>+// TextureF_3D                       texture  float4          3d    0        1
>+//
>+//
>+//
>+// Input signature:
>+//
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_POSITION              0   xyzw        0      POS  float       
>+// SV_RENDERTARGETARRAYINDEX     0   x           1  RTINDEX   uint       
>+// TEXCOORD                 0   xyz         2     NONE  float   xyz 
>+//
>+//
>+// Output signature:
>+//
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_TARGET                0   xyzw        0   TARGET   uint   xyzw
>+//
>+ps_4_0
>+dcl_sampler s0, mode_default
>+dcl_resource_texture3d (float,float,float,float) t0
>+dcl_input_ps linear v2.xyz
>+dcl_output o0.xyzw
>+dcl_temps 1
>+sample r0.xyzw, v2.xyzx, t0.xyzw, s0
>+mul r0.xyz, r0.xyzx, l(255.000000, 255.000000, 255.000000, 0.000000)
>+ftou o0.xyz, r0.xyzx
>+mov o0.w, l(1)
>+ret 
>+// Approximately 5 instruction slots used
>+#endif
>+
>+const BYTE g_PS_FtoU_PT_RGB_3D[] = {
>+    68,  88, 66,  67,  230, 86,  10,  151, 92,  97,  109, 198, 34,  46,  73,  109, 246, 243, 56,
>+    31,  1,  0,   0,   0,   220, 2,   0,   0,   5,   0,   0,   0,   52,  0,   0,   0,   224, 0,
>+    0,   0,  104, 1,   0,   0,   156, 1,   0,   0,   96,  2,   0,   0,   82,  68,  69,  70,  164,
>+    0,   0,  0,   0,   0,   0,   0,   0,   0,   0,   0,   2,   0,   0,   0,   28,  0,   0,   0,
>+    0,   4,  255, 255, 0,   1,   0,   0,   112, 0,   0,   0,   92,  0,   0,   0,   3,   0,   0,
>+    0,   0,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,
>+    0,   0,  1,   0,   0,   0,   100, 0,   0,   0,   2,   0,   0,   0,   5,   0,   0,   0,   8,
>+    0,   0,  0,   255, 255, 255, 255, 0,   0,   0,   0,   1,   0,   0,   0,   13,  0,   0,   0,
>+    83,  97, 109, 112, 108, 101, 114, 0,   84,  101, 120, 116, 117, 114, 101, 70,  95,  51,  68,
>+    0,   77, 105, 99,  114, 111, 115, 111, 102, 116, 32,  40,  82,  41,  32,  72,  76,  83,  76,
>+    32,  83, 104, 97,  100, 101, 114, 32,  67,  111, 109, 112, 105, 108, 101, 114, 32,  57,  46,
>+    50,  57, 46,  57,  53,  50,  46,  51,  49,  49,  49,  0,   171, 171, 171, 73,  83,  71,  78,
>+    128, 0,  0,   0,   3,   0,   0,   0,   8,   0,   0,   0,   80,  0,   0,   0,   0,   0,   0,
>+    0,   1,  0,   0,   0,   3,   0,   0,   0,   0,   0,   0,   0,   15,  0,   0,   0,   92,  0,
>+    0,   0,  0,   0,   0,   0,   4,   0,   0,   0,   1,   0,   0,   0,   1,   0,   0,   0,   1,
>+    0,   0,  0,   118, 0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   3,   0,   0,   0,
>+    2,   0,  0,   0,   7,   7,   0,   0,   83,  86,  95,  80,  79,  83,  73,  84,  73,  79,  78,
>+    0,   83, 86,  95,  82,  69,  78,  68,  69,  82,  84,  65,  82,  71,  69,  84,  65,  82,  82,
>+    65,  89, 73,  78,  68,  69,  88,  0,   84,  69,  88,  67,  79,  79,  82,  68,  0,   171, 79,
>+    83,  71, 78,  44,  0,   0,   0,   1,   0,   0,   0,   8,   0,   0,   0,   32,  0,   0,   0,
>+    0,   0,  0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   15,  0,   0,
>+    0,   83, 86,  95,  84,  65,  82,  71,  69,  84,  0,   171, 171, 83,  72,  68,  82,  188, 0,
>+    0,   0,  64,  0,   0,   0,   47,  0,   0,   0,   90,  0,   0,   3,   0,   96,  16,  0,   0,
>+    0,   0,  0,   88,  40,  0,   4,   0,   112, 16,  0,   0,   0,   0,   0,   85,  85,  0,   0,
>+    98,  16, 0,   3,   114, 16,  16,  0,   2,   0,   0,   0,   101, 0,   0,   3,   242, 32,  16,
>+    0,   0,  0,   0,   0,   104, 0,   0,   2,   1,   0,   0,   0,   69,  0,   0,   9,   242, 0,
>+    16,  0,  0,   0,   0,   0,   70,  18,  16,  0,   2,   0,   0,   0,   70,  126, 16,  0,   0,
>+    0,   0,  0,   0,   96,  16,  0,   0,   0,   0,   0,   56,  0,   0,   10,  114, 0,   16,  0,
>+    0,   0,  0,   0,   70,  2,   16,  0,   0,   0,   0,   0,   2,   64,  0,   0,   0,   0,   127,
>+    67,  0,  0,   127, 67,  0,   0,   127, 67,  0,   0,   0,   0,   28,  0,   0,   5,   114, 32,
>+    16,  0,  0,   0,   0,   0,   70,  2,   16,  0,   0,   0,   0,   0,   54,  0,   0,   5,   130,
>+    32,  16, 0,   0,   0,   0,   0,   1,   64,  0,   0,   1,   0,   0,   0,   62,  0,   0,   1,
>+    83,  84, 65,  84,  116, 0,   0,   0,   5,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,
>+    0,   2,  0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,
>+    0,   0,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,  0,   0,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,  0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,
>+    0,   0,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,  0,   0,   0,   0,   0,   0,   0,   0};
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftou_pt_rgb_ps.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftou_pt_rgb_ps.h
>deleted file mode 100644
>index a8798d9b9a3..00000000000
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftou_pt_rgb_ps.h
>+++ /dev/null
>@@ -1,79 +0,0 @@
>-#if 0
>-//
>-// Generated by Microsoft (R) HLSL Shader Compiler 6.3.9600.16384
>-//
>-//
>-// Resource Bindings:
>-//
>-// Name                                 Type  Format         Dim Slot Elements
>-// ------------------------------ ---------- ------- ----------- ---- --------
>-// Sampler                           sampler      NA          NA    0        1
>-// TextureF                          texture  float4          2d    0        1
>-//
>-//
>-//
>-// Input signature:
>-//
>-// Name                 Index   Mask Register SysValue  Format   Used
>-// -------------------- ----- ------ -------- -------- ------- ------
>-// SV_POSITION              0   xyzw        0      POS   float       
>-// TEXCOORD                 0   xy          1     NONE   float   xy  
>-//
>-//
>-// Output signature:
>-//
>-// Name                 Index   Mask Register SysValue  Format   Used
>-// -------------------- ----- ------ -------- -------- ------- ------
>-// SV_TARGET                0   xyzw        0   TARGET    uint   xyzw
>-//
>-ps_4_0
>-dcl_sampler s0, mode_default
>-dcl_resource_texture2d (float,float,float,float) t0
>-dcl_input_ps linear v1.xy
>-dcl_output o0.xyzw
>-dcl_temps 1
>-sample r0.xyzw, v1.xyxx, t0.xyzw, s0
>-mul r0.xyz, r0.xyzx, l(255.000000, 255.000000, 255.000000, 0.000000)
>-ftou o0.xyz, r0.xyzx
>-mov o0.w, l(1)
>-ret 
>-// Approximately 5 instruction slots used
>-#endif
>-
>-const BYTE g_PS_FtoU_PT_RGB[] = {
>-    68, 88,  66,  67,  199, 233, 92,  114, 12,  127, 254, 75,  103, 144, 201, 199, 115, 189, 178,
>-    64, 1,   0,   0,   0,   168, 2,   0,   0,   5,   0,   0,   0,   52,  0,   0,   0,   220, 0,
>-    0,  0,   52,  1,   0,   0,   104, 1,   0,   0,   44,  2,   0,   0,   82,  68,  69,  70,  160,
>-    0,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   2,   0,   0,   0,   28,  0,   0,   0,
>-    0,  4,   255, 255, 0,   1,   0,   0,   109, 0,   0,   0,   92,  0,   0,   0,   3,   0,   0,
>-    0,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,
>-    0,  0,   1,   0,   0,   0,   100, 0,   0,   0,   2,   0,   0,   0,   5,   0,   0,   0,   4,
>-    0,  0,   0,   255, 255, 255, 255, 0,   0,   0,   0,   1,   0,   0,   0,   13,  0,   0,   0,
>-    83, 97,  109, 112, 108, 101, 114, 0,   84,  101, 120, 116, 117, 114, 101, 70,  0,   77,  105,
>-    99, 114, 111, 115, 111, 102, 116, 32,  40,  82,  41,  32,  72,  76,  83,  76,  32,  83,  104,
>-    97, 100, 101, 114, 32,  67,  111, 109, 112, 105, 108, 101, 114, 32,  54,  46,  51,  46,  57,
>-    54, 48,  48,  46,  49,  54,  51,  56,  52,  0,   171, 73,  83,  71,  78,  80,  0,   0,   0,
>-    2,  0,   0,   0,   8,   0,   0,   0,   56,  0,   0,   0,   0,   0,   0,   0,   1,   0,   0,
>-    0,  3,   0,   0,   0,   0,   0,   0,   0,   15,  0,   0,   0,   68,  0,   0,   0,   0,   0,
>-    0,  0,   0,   0,   0,   0,   3,   0,   0,   0,   1,   0,   0,   0,   3,   3,   0,   0,   83,
>-    86, 95,  80,  79,  83,  73,  84,  73,  79,  78,  0,   84,  69,  88,  67,  79,  79,  82,  68,
>-    0,  171, 171, 171, 79,  83,  71,  78,  44,  0,   0,   0,   1,   0,   0,   0,   8,   0,   0,
>-    0,  32,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   0,   0,
>-    0,  0,   15,  0,   0,   0,   83,  86,  95,  84,  65,  82,  71,  69,  84,  0,   171, 171, 83,
>-    72, 68,  82,  188, 0,   0,   0,   64,  0,   0,   0,   47,  0,   0,   0,   90,  0,   0,   3,
>-    0,  96,  16,  0,   0,   0,   0,   0,   88,  24,  0,   4,   0,   112, 16,  0,   0,   0,   0,
>-    0,  85,  85,  0,   0,   98,  16,  0,   3,   50,  16,  16,  0,   1,   0,   0,   0,   101, 0,
>-    0,  3,   242, 32,  16,  0,   0,   0,   0,   0,   104, 0,   0,   2,   1,   0,   0,   0,   69,
>-    0,  0,   9,   242, 0,   16,  0,   0,   0,   0,   0,   70,  16,  16,  0,   1,   0,   0,   0,
>-    70, 126, 16,  0,   0,   0,   0,   0,   0,   96,  16,  0,   0,   0,   0,   0,   56,  0,   0,
>-    10, 114, 0,   16,  0,   0,   0,   0,   0,   70,  2,   16,  0,   0,   0,   0,   0,   2,   64,
>-    0,  0,   0,   0,   127, 67,  0,   0,   127, 67,  0,   0,   127, 67,  0,   0,   0,   0,   28,
>-    0,  0,   5,   114, 32,  16,  0,   0,   0,   0,   0,   70,  2,   16,  0,   0,   0,   0,   0,
>-    54, 0,   0,   5,   130, 32,  16,  0,   0,   0,   0,   0,   1,   64,  0,   0,   1,   0,   0,
>-    0,  62,  0,   0,   1,   83,  84,  65,  84,  116, 0,   0,   0,   5,   0,   0,   0,   1,   0,
>-    0,  0,   0,   0,   0,   0,   2,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   0,
>-    0,  0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>-    0,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,
>-    0,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   0,   0,
>-    0,  0,   1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>-    0,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0};
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftou_pt_rgba_2d_ps.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftou_pt_rgba_2d_ps.h
>new file mode 100644
>index 00000000000..d5638576e85
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftou_pt_rgba_2d_ps.h
>@@ -0,0 +1,81 @@
>+#if 0
>+//
>+// Generated by Microsoft (R) HLSL Shader Compiler 9.29.952.3111
>+//
>+//
>+//   fxc /nologo /E PS_FtoU_PT_RGBA_2D /T ps_4_0 /Fh
>+//    compiled\multiplyalpha_ftou_pt_rgba_2d_ps.h MultiplyAlpha.hlsl
>+//
>+//
>+// Resource Bindings:
>+//
>+// Name                                 Type  Format         Dim Slot Elements
>+// ------------------------------ ---------- ------- ----------- ---- --------
>+// Sampler                           sampler      NA          NA    0        1
>+// TextureF                          texture  float4          2d    0        1
>+//
>+//
>+//
>+// Input signature:
>+//
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_POSITION              0   xyzw        0      POS  float
>+// TEXCOORD                 0   xy          1     NONE  float   xy
>+//
>+//
>+// Output signature:
>+//
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_TARGET                0   xyzw        0   TARGET   uint   xyzw
>+//
>+ps_4_0
>+dcl_sampler s0, mode_default
>+dcl_resource_texture2d (float,float,float,float) t0
>+dcl_input_ps linear v1.xy
>+dcl_output o0.xyzw
>+dcl_temps 1
>+sample r0.xyzw, v1.xyxx, t0.xyzw, s0
>+mul r0.xyzw, r0.xyzw, l(255.000000, 255.000000, 255.000000, 255.000000)
>+ftou o0.xyzw, r0.xyzw
>+ret
>+// Approximately 4 instruction slots used
>+#endif
>+
>+const BYTE g_PS_FtoU_PT_RGBA_2D[] = {
>+    68,  88,  66,  67,  220, 98,  155, 50,  254, 144, 222, 163, 64,  196, 167, 225, 13,  4,   27,
>+    185, 1,   0,   0,   0,   148, 2,   0,   0,   5,   0,   0,   0,   52,  0,   0,   0,   220, 0,
>+    0,   0,   52,  1,   0,   0,   104, 1,   0,   0,   24,  2,   0,   0,   82,  68,  69,  70,  160,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   2,   0,   0,   0,   28,  0,   0,   0,
>+    0,   4,   255, 255, 0,   1,   0,   0,   109, 0,   0,   0,   92,  0,   0,   0,   3,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,
>+    0,   0,   1,   0,   0,   0,   100, 0,   0,   0,   2,   0,   0,   0,   5,   0,   0,   0,   4,
>+    0,   0,   0,   255, 255, 255, 255, 0,   0,   0,   0,   1,   0,   0,   0,   13,  0,   0,   0,
>+    83,  97,  109, 112, 108, 101, 114, 0,   84,  101, 120, 116, 117, 114, 101, 70,  0,   77,  105,
>+    99,  114, 111, 115, 111, 102, 116, 32,  40,  82,  41,  32,  72,  76,  83,  76,  32,  83,  104,
>+    97,  100, 101, 114, 32,  67,  111, 109, 112, 105, 108, 101, 114, 32,  57,  46,  50,  57,  46,
>+    57,  53,  50,  46,  51,  49,  49,  49,  0,   171, 171, 73,  83,  71,  78,  80,  0,   0,   0,
>+    2,   0,   0,   0,   8,   0,   0,   0,   56,  0,   0,   0,   0,   0,   0,   0,   1,   0,   0,
>+    0,   3,   0,   0,   0,   0,   0,   0,   0,   15,  0,   0,   0,   68,  0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   3,   0,   0,   0,   1,   0,   0,   0,   3,   3,   0,   0,   83,
>+    86,  95,  80,  79,  83,  73,  84,  73,  79,  78,  0,   84,  69,  88,  67,  79,  79,  82,  68,
>+    0,   171, 171, 171, 79,  83,  71,  78,  44,  0,   0,   0,   1,   0,   0,   0,   8,   0,   0,
>+    0,   32,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   0,   0,
>+    0,   0,   15,  0,   0,   0,   83,  86,  95,  84,  65,  82,  71,  69,  84,  0,   171, 171, 83,
>+    72,  68,  82,  168, 0,   0,   0,   64,  0,   0,   0,   42,  0,   0,   0,   90,  0,   0,   3,
>+    0,   96,  16,  0,   0,   0,   0,   0,   88,  24,  0,   4,   0,   112, 16,  0,   0,   0,   0,
>+    0,   85,  85,  0,   0,   98,  16,  0,   3,   50,  16,  16,  0,   1,   0,   0,   0,   101, 0,
>+    0,   3,   242, 32,  16,  0,   0,   0,   0,   0,   104, 0,   0,   2,   1,   0,   0,   0,   69,
>+    0,   0,   9,   242, 0,   16,  0,   0,   0,   0,   0,   70,  16,  16,  0,   1,   0,   0,   0,
>+    70,  126, 16,  0,   0,   0,   0,   0,   0,   96,  16,  0,   0,   0,   0,   0,   56,  0,   0,
>+    10,  242, 0,   16,  0,   0,   0,   0,   0,   70,  14,  16,  0,   0,   0,   0,   0,   2,   64,
>+    0,   0,   0,   0,   127, 67,  0,   0,   127, 67,  0,   0,   127, 67,  0,   0,   127, 67,  28,
>+    0,   0,   5,   242, 32,  16,  0,   0,   0,   0,   0,   70,  14,  16,  0,   0,   0,   0,   0,
>+    62,  0,   0,   1,   83,  84,  65,  84,  116, 0,   0,   0,   4,   0,   0,   0,   1,   0,   0,
>+    0,   0,   0,   0,   0,   2,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0};
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftou_pt_rgba_2darray_ps.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftou_pt_rgba_2darray_ps.h
>new file mode 100644
>index 00000000000..519a857a4cf
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftou_pt_rgba_2darray_ps.h
>@@ -0,0 +1,91 @@
>+#if 0
>+//
>+// Generated by Microsoft (R) HLSL Shader Compiler 9.29.952.3111
>+//
>+//
>+//   fxc /nologo /E PS_FtoU_PT_RGBA_2DArray /T ps_4_0 /Fh
>+//    compiled\multiplyalpha_ftou_pt_rgba_2darray_ps.h MultiplyAlpha.hlsl
>+//
>+//
>+// Resource Bindings:
>+//
>+// Name                                 Type  Format         Dim Slot Elements
>+// ------------------------------ ---------- ------- ----------- ---- --------
>+// Sampler                           sampler      NA          NA    0        1
>+// TextureF_2DArray                  texture  float4     2darray    0        1
>+//
>+//
>+//
>+// Input signature:
>+//
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_POSITION              0   xyzw        0      POS  float       
>+// SV_RENDERTARGETARRAYINDEX     0   x           1  RTINDEX   uint   x   
>+// TEXCOORD                 0   xyz         2     NONE  float   xy  
>+//
>+//
>+// Output signature:
>+//
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_TARGET                0   xyzw        0   TARGET   uint   xyzw
>+//
>+ps_4_0
>+dcl_sampler s0, mode_default
>+dcl_resource_texture2darray (float,float,float,float) t0
>+dcl_input_ps_siv constant v1.x, rendertarget_array_index
>+dcl_input_ps linear v2.xy
>+dcl_output o0.xyzw
>+dcl_temps 1
>+utof r0.z, v1.x
>+mov r0.xy, v2.xyxx
>+sample r0.xyzw, r0.xyzx, t0.xyzw, s0
>+mul r0.xyzw, r0.xyzw, l(255.000000, 255.000000, 255.000000, 255.000000)
>+ftou o0.xyzw, r0.xyzw
>+ret 
>+// Approximately 6 instruction slots used
>+#endif
>+
>+const BYTE g_PS_FtoU_PT_RGBA_2DArray[] = {
>+    68,  88,  66,  67,  0,   99,  216, 74,  193, 89,  188, 62,  67,  114, 133, 110, 172, 170, 220,
>+    250, 1,   0,   0,   0,   4,   3,   0,   0,   5,   0,   0,   0,   52,  0,   0,   0,   228, 0,
>+    0,   0,   108, 1,   0,   0,   160, 1,   0,   0,   136, 2,   0,   0,   82,  68,  69,  70,  168,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   2,   0,   0,   0,   28,  0,   0,   0,
>+    0,   4,   255, 255, 0,   1,   0,   0,   117, 0,   0,   0,   92,  0,   0,   0,   3,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,
>+    0,   0,   1,   0,   0,   0,   100, 0,   0,   0,   2,   0,   0,   0,   5,   0,   0,   0,   5,
>+    0,   0,   0,   255, 255, 255, 255, 0,   0,   0,   0,   1,   0,   0,   0,   13,  0,   0,   0,
>+    83,  97,  109, 112, 108, 101, 114, 0,   84,  101, 120, 116, 117, 114, 101, 70,  95,  50,  68,
>+    65,  114, 114, 97,  121, 0,   77,  105, 99,  114, 111, 115, 111, 102, 116, 32,  40,  82,  41,
>+    32,  72,  76,  83,  76,  32,  83,  104, 97,  100, 101, 114, 32,  67,  111, 109, 112, 105, 108,
>+    101, 114, 32,  57,  46,  50,  57,  46,  57,  53,  50,  46,  51,  49,  49,  49,  0,   171, 171,
>+    73,  83,  71,  78,  128, 0,   0,   0,   3,   0,   0,   0,   8,   0,   0,   0,   80,  0,   0,
>+    0,   0,   0,   0,   0,   1,   0,   0,   0,   3,   0,   0,   0,   0,   0,   0,   0,   15,  0,
>+    0,   0,   92,  0,   0,   0,   0,   0,   0,   0,   4,   0,   0,   0,   1,   0,   0,   0,   1,
>+    0,   0,   0,   1,   1,   0,   0,   118, 0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    3,   0,   0,   0,   2,   0,   0,   0,   7,   3,   0,   0,   83,  86,  95,  80,  79,  83,  73,
>+    84,  73,  79,  78,  0,   83,  86,  95,  82,  69,  78,  68,  69,  82,  84,  65,  82,  71,  69,
>+    84,  65,  82,  82,  65,  89,  73,  78,  68,  69,  88,  0,   84,  69,  88,  67,  79,  79,  82,
>+    68,  0,   171, 79,  83,  71,  78,  44,  0,   0,   0,   1,   0,   0,   0,   8,   0,   0,   0,
>+    32,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,
>+    0,   15,  0,   0,   0,   83,  86,  95,  84,  65,  82,  71,  69,  84,  0,   171, 171, 83,  72,
>+    68,  82,  224, 0,   0,   0,   64,  0,   0,   0,   56,  0,   0,   0,   90,  0,   0,   3,   0,
>+    96,  16,  0,   0,   0,   0,   0,   88,  64,  0,   4,   0,   112, 16,  0,   0,   0,   0,   0,
>+    85,  85,  0,   0,   100, 8,   0,   4,   18,  16,  16,  0,   1,   0,   0,   0,   4,   0,   0,
>+    0,   98,  16,  0,   3,   50,  16,  16,  0,   2,   0,   0,   0,   101, 0,   0,   3,   242, 32,
>+    16,  0,   0,   0,   0,   0,   104, 0,   0,   2,   1,   0,   0,   0,   86,  0,   0,   5,   66,
>+    0,   16,  0,   0,   0,   0,   0,   10,  16,  16,  0,   1,   0,   0,   0,   54,  0,   0,   5,
>+    50,  0,   16,  0,   0,   0,   0,   0,   70,  16,  16,  0,   2,   0,   0,   0,   69,  0,   0,
>+    9,   242, 0,   16,  0,   0,   0,   0,   0,   70,  2,   16,  0,   0,   0,   0,   0,   70,  126,
>+    16,  0,   0,   0,   0,   0,   0,   96,  16,  0,   0,   0,   0,   0,   56,  0,   0,   10,  242,
>+    0,   16,  0,   0,   0,   0,   0,   70,  14,  16,  0,   0,   0,   0,   0,   2,   64,  0,   0,
>+    0,   0,   127, 67,  0,   0,   127, 67,  0,   0,   127, 67,  0,   0,   127, 67,  28,  0,   0,
>+    5,   242, 32,  16,  0,   0,   0,   0,   0,   70,  14,  16,  0,   0,   0,   0,   0,   62,  0,
>+    0,   1,   83,  84,  65,  84,  116, 0,   0,   0,   6,   0,   0,   0,   1,   0,   0,   0,   0,
>+    0,   0,   0,   3,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   2,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0};
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftou_pt_rgba_3d_ps.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftou_pt_rgba_3d_ps.h
>new file mode 100644
>index 00000000000..ed52359a2e7
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftou_pt_rgba_3d_ps.h
>@@ -0,0 +1,85 @@
>+#if 0
>+//
>+// Generated by Microsoft (R) HLSL Shader Compiler 9.29.952.3111
>+//
>+//
>+//   fxc /nologo /E PS_FtoU_PT_RGBA_3D /T ps_4_0 /Fh
>+//    compiled\multiplyalpha_ftou_pt_rgba_3d_ps.h MultiplyAlpha.hlsl
>+//
>+//
>+// Resource Bindings:
>+//
>+// Name                                 Type  Format         Dim Slot Elements
>+// ------------------------------ ---------- ------- ----------- ---- --------
>+// Sampler                           sampler      NA          NA    0        1
>+// TextureF_3D                       texture  float4          3d    0        1
>+//
>+//
>+//
>+// Input signature:
>+//
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_POSITION              0   xyzw        0      POS  float       
>+// SV_RENDERTARGETARRAYINDEX     0   x           1  RTINDEX   uint       
>+// TEXCOORD                 0   xyz         2     NONE  float   xyz 
>+//
>+//
>+// Output signature:
>+//
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_TARGET                0   xyzw        0   TARGET   uint   xyzw
>+//
>+ps_4_0
>+dcl_sampler s0, mode_default
>+dcl_resource_texture3d (float,float,float,float) t0
>+dcl_input_ps linear v2.xyz
>+dcl_output o0.xyzw
>+dcl_temps 1
>+sample r0.xyzw, v2.xyzx, t0.xyzw, s0
>+mul r0.xyzw, r0.xyzw, l(255.000000, 255.000000, 255.000000, 255.000000)
>+ftou o0.xyzw, r0.xyzw
>+ret 
>+// Approximately 4 instruction slots used
>+#endif
>+
>+const BYTE g_PS_FtoU_PT_RGBA_3D[] = {
>+    68,  88, 66,  67,  140, 33,  31,  103, 96,  28,  78,  196, 234, 153, 58,  158, 176, 167, 230,
>+    238, 1,  0,   0,   0,   200, 2,   0,   0,   5,   0,   0,   0,   52,  0,   0,   0,   224, 0,
>+    0,   0,  104, 1,   0,   0,   156, 1,   0,   0,   76,  2,   0,   0,   82,  68,  69,  70,  164,
>+    0,   0,  0,   0,   0,   0,   0,   0,   0,   0,   0,   2,   0,   0,   0,   28,  0,   0,   0,
>+    0,   4,  255, 255, 0,   1,   0,   0,   112, 0,   0,   0,   92,  0,   0,   0,   3,   0,   0,
>+    0,   0,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,
>+    0,   0,  1,   0,   0,   0,   100, 0,   0,   0,   2,   0,   0,   0,   5,   0,   0,   0,   8,
>+    0,   0,  0,   255, 255, 255, 255, 0,   0,   0,   0,   1,   0,   0,   0,   13,  0,   0,   0,
>+    83,  97, 109, 112, 108, 101, 114, 0,   84,  101, 120, 116, 117, 114, 101, 70,  95,  51,  68,
>+    0,   77, 105, 99,  114, 111, 115, 111, 102, 116, 32,  40,  82,  41,  32,  72,  76,  83,  76,
>+    32,  83, 104, 97,  100, 101, 114, 32,  67,  111, 109, 112, 105, 108, 101, 114, 32,  57,  46,
>+    50,  57, 46,  57,  53,  50,  46,  51,  49,  49,  49,  0,   171, 171, 171, 73,  83,  71,  78,
>+    128, 0,  0,   0,   3,   0,   0,   0,   8,   0,   0,   0,   80,  0,   0,   0,   0,   0,   0,
>+    0,   1,  0,   0,   0,   3,   0,   0,   0,   0,   0,   0,   0,   15,  0,   0,   0,   92,  0,
>+    0,   0,  0,   0,   0,   0,   4,   0,   0,   0,   1,   0,   0,   0,   1,   0,   0,   0,   1,
>+    0,   0,  0,   118, 0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   3,   0,   0,   0,
>+    2,   0,  0,   0,   7,   7,   0,   0,   83,  86,  95,  80,  79,  83,  73,  84,  73,  79,  78,
>+    0,   83, 86,  95,  82,  69,  78,  68,  69,  82,  84,  65,  82,  71,  69,  84,  65,  82,  82,
>+    65,  89, 73,  78,  68,  69,  88,  0,   84,  69,  88,  67,  79,  79,  82,  68,  0,   171, 79,
>+    83,  71, 78,  44,  0,   0,   0,   1,   0,   0,   0,   8,   0,   0,   0,   32,  0,   0,   0,
>+    0,   0,  0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   15,  0,   0,
>+    0,   83, 86,  95,  84,  65,  82,  71,  69,  84,  0,   171, 171, 83,  72,  68,  82,  168, 0,
>+    0,   0,  64,  0,   0,   0,   42,  0,   0,   0,   90,  0,   0,   3,   0,   96,  16,  0,   0,
>+    0,   0,  0,   88,  40,  0,   4,   0,   112, 16,  0,   0,   0,   0,   0,   85,  85,  0,   0,
>+    98,  16, 0,   3,   114, 16,  16,  0,   2,   0,   0,   0,   101, 0,   0,   3,   242, 32,  16,
>+    0,   0,  0,   0,   0,   104, 0,   0,   2,   1,   0,   0,   0,   69,  0,   0,   9,   242, 0,
>+    16,  0,  0,   0,   0,   0,   70,  18,  16,  0,   2,   0,   0,   0,   70,  126, 16,  0,   0,
>+    0,   0,  0,   0,   96,  16,  0,   0,   0,   0,   0,   56,  0,   0,   10,  242, 0,   16,  0,
>+    0,   0,  0,   0,   70,  14,  16,  0,   0,   0,   0,   0,   2,   64,  0,   0,   0,   0,   127,
>+    67,  0,  0,   127, 67,  0,   0,   127, 67,  0,   0,   127, 67,  28,  0,   0,   5,   242, 32,
>+    16,  0,  0,   0,   0,   0,   70,  14,  16,  0,   0,   0,   0,   0,   62,  0,   0,   1,   83,
>+    84,  65, 84,  116, 0,   0,   0,   4,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,
>+    2,   0,  0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,
>+    0,   0,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,  0,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,
>+    0,   0,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,  0,   0,   0,   0,   0,   0,   0};
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftou_pt_rgba_ps.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftou_pt_rgba_ps.h
>deleted file mode 100644
>index 864665f9687..00000000000
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftou_pt_rgba_ps.h
>+++ /dev/null
>@@ -1,77 +0,0 @@
>-#if 0
>-//
>-// Generated by Microsoft (R) HLSL Shader Compiler 6.3.9600.16384
>-//
>-//
>-// Resource Bindings:
>-//
>-// Name                                 Type  Format         Dim Slot Elements
>-// ------------------------------ ---------- ------- ----------- ---- --------
>-// Sampler                           sampler      NA          NA    0        1
>-// TextureF                          texture  float4          2d    0        1
>-//
>-//
>-//
>-// Input signature:
>-//
>-// Name                 Index   Mask Register SysValue  Format   Used
>-// -------------------- ----- ------ -------- -------- ------- ------
>-// SV_POSITION              0   xyzw        0      POS   float       
>-// TEXCOORD                 0   xy          1     NONE   float   xy  
>-//
>-//
>-// Output signature:
>-//
>-// Name                 Index   Mask Register SysValue  Format   Used
>-// -------------------- ----- ------ -------- -------- ------- ------
>-// SV_TARGET                0   xyzw        0   TARGET    uint   xyzw
>-//
>-ps_4_0
>-dcl_sampler s0, mode_default
>-dcl_resource_texture2d (float,float,float,float) t0
>-dcl_input_ps linear v1.xy
>-dcl_output o0.xyzw
>-dcl_temps 1
>-sample r0.xyzw, v1.xyxx, t0.xyzw, s0
>-mul r0.xyzw, r0.xyzw, l(255.000000, 255.000000, 255.000000, 255.000000)
>-ftou o0.xyzw, r0.xyzw
>-ret 
>-// Approximately 4 instruction slots used
>-#endif
>-
>-const BYTE g_PS_FtoU_PT_RGBA[] = {
>-    68,  88,  66,  67,  209, 83,  172, 72,  82,  105, 159, 134, 14,  29,  227, 217, 205, 178, 97,
>-    208, 1,   0,   0,   0,   148, 2,   0,   0,   5,   0,   0,   0,   52,  0,   0,   0,   220, 0,
>-    0,   0,   52,  1,   0,   0,   104, 1,   0,   0,   24,  2,   0,   0,   82,  68,  69,  70,  160,
>-    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   2,   0,   0,   0,   28,  0,   0,   0,
>-    0,   4,   255, 255, 0,   1,   0,   0,   109, 0,   0,   0,   92,  0,   0,   0,   3,   0,   0,
>-    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,
>-    0,   0,   1,   0,   0,   0,   100, 0,   0,   0,   2,   0,   0,   0,   5,   0,   0,   0,   4,
>-    0,   0,   0,   255, 255, 255, 255, 0,   0,   0,   0,   1,   0,   0,   0,   13,  0,   0,   0,
>-    83,  97,  109, 112, 108, 101, 114, 0,   84,  101, 120, 116, 117, 114, 101, 70,  0,   77,  105,
>-    99,  114, 111, 115, 111, 102, 116, 32,  40,  82,  41,  32,  72,  76,  83,  76,  32,  83,  104,
>-    97,  100, 101, 114, 32,  67,  111, 109, 112, 105, 108, 101, 114, 32,  54,  46,  51,  46,  57,
>-    54,  48,  48,  46,  49,  54,  51,  56,  52,  0,   171, 73,  83,  71,  78,  80,  0,   0,   0,
>-    2,   0,   0,   0,   8,   0,   0,   0,   56,  0,   0,   0,   0,   0,   0,   0,   1,   0,   0,
>-    0,   3,   0,   0,   0,   0,   0,   0,   0,   15,  0,   0,   0,   68,  0,   0,   0,   0,   0,
>-    0,   0,   0,   0,   0,   0,   3,   0,   0,   0,   1,   0,   0,   0,   3,   3,   0,   0,   83,
>-    86,  95,  80,  79,  83,  73,  84,  73,  79,  78,  0,   84,  69,  88,  67,  79,  79,  82,  68,
>-    0,   171, 171, 171, 79,  83,  71,  78,  44,  0,   0,   0,   1,   0,   0,   0,   8,   0,   0,
>-    0,   32,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   0,   0,
>-    0,   0,   15,  0,   0,   0,   83,  86,  95,  84,  65,  82,  71,  69,  84,  0,   171, 171, 83,
>-    72,  68,  82,  168, 0,   0,   0,   64,  0,   0,   0,   42,  0,   0,   0,   90,  0,   0,   3,
>-    0,   96,  16,  0,   0,   0,   0,   0,   88,  24,  0,   4,   0,   112, 16,  0,   0,   0,   0,
>-    0,   85,  85,  0,   0,   98,  16,  0,   3,   50,  16,  16,  0,   1,   0,   0,   0,   101, 0,
>-    0,   3,   242, 32,  16,  0,   0,   0,   0,   0,   104, 0,   0,   2,   1,   0,   0,   0,   69,
>-    0,   0,   9,   242, 0,   16,  0,   0,   0,   0,   0,   70,  16,  16,  0,   1,   0,   0,   0,
>-    70,  126, 16,  0,   0,   0,   0,   0,   0,   96,  16,  0,   0,   0,   0,   0,   56,  0,   0,
>-    10,  242, 0,   16,  0,   0,   0,   0,   0,   70,  14,  16,  0,   0,   0,   0,   0,   2,   64,
>-    0,   0,   0,   0,   127, 67,  0,   0,   127, 67,  0,   0,   127, 67,  0,   0,   127, 67,  28,
>-    0,   0,   5,   242, 32,  16,  0,   0,   0,   0,   0,   70,  14,  16,  0,   0,   0,   0,   0,
>-    62,  0,   0,   1,   83,  84,  65,  84,  116, 0,   0,   0,   4,   0,   0,   0,   1,   0,   0,
>-    0,   0,   0,   0,   0,   2,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>-    0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>-    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,
>-    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>-    0,   1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>-    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0};
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftou_um_rgb_2d_ps.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftou_um_rgb_2d_ps.h
>new file mode 100644
>index 00000000000..2531db22029
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftou_um_rgb_2d_ps.h
>@@ -0,0 +1,91 @@
>+#if 0
>+//
>+// Generated by Microsoft (R) HLSL Shader Compiler 9.29.952.3111
>+//
>+//
>+//   fxc /nologo /E PS_FtoU_UM_RGB_2D /T ps_4_0 /Fh
>+//    compiled\multiplyalpha_ftou_um_rgb_2d_ps.h MultiplyAlpha.hlsl
>+//
>+//
>+// Resource Bindings:
>+//
>+// Name                                 Type  Format         Dim Slot Elements
>+// ------------------------------ ---------- ------- ----------- ---- --------
>+// Sampler                           sampler      NA          NA    0        1
>+// TextureF                          texture  float4          2d    0        1
>+//
>+//
>+//
>+// Input signature:
>+//
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_POSITION              0   xyzw        0      POS  float
>+// TEXCOORD                 0   xy          1     NONE  float   xy
>+//
>+//
>+// Output signature:
>+//
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_TARGET                0   xyzw        0   TARGET   uint   xyzw
>+//
>+ps_4_0
>+dcl_sampler s0, mode_default
>+dcl_resource_texture2d (float,float,float,float) t0
>+dcl_input_ps linear v1.xy
>+dcl_output o0.xyzw
>+dcl_temps 2
>+sample r0.xyzw, v1.xyxx, t0.xyzw, s0
>+lt r1.x, l(0.000000), r0.w
>+div r1.yzw, r0.xxyz, r0.wwww
>+movc r0.xyz, r1.xxxx, r1.yzwy, r0.xyzx
>+mul r0.xyz, r0.xyzx, l(255.000000, 255.000000, 255.000000, 0.000000)
>+ftou o0.xyz, r0.xyzx
>+mov o0.w, l(1)
>+ret
>+// Approximately 8 instruction slots used
>+#endif
>+
>+const BYTE g_PS_FtoU_UM_RGB_2D[] = {
>+    68,  88,  66,  67,  114, 138, 59,  173, 45,  10,  93,  45,  253, 137, 191, 45, 53,  32,  34,
>+    110, 1,   0,   0,   0,   4,   3,   0,   0,   5,   0,   0,   0,   52,  0,   0,  0,   220, 0,
>+    0,   0,   52,  1,   0,   0,   104, 1,   0,   0,   136, 2,   0,   0,   82,  68, 69,  70,  160,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   2,   0,   0,   0,   28, 0,   0,   0,
>+    0,   4,   255, 255, 0,   1,   0,   0,   109, 0,   0,   0,   92,  0,   0,   0,  3,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,  0,   1,   0,
>+    0,   0,   1,   0,   0,   0,   100, 0,   0,   0,   2,   0,   0,   0,   5,   0,  0,   0,   4,
>+    0,   0,   0,   255, 255, 255, 255, 0,   0,   0,   0,   1,   0,   0,   0,   13, 0,   0,   0,
>+    83,  97,  109, 112, 108, 101, 114, 0,   84,  101, 120, 116, 117, 114, 101, 70, 0,   77,  105,
>+    99,  114, 111, 115, 111, 102, 116, 32,  40,  82,  41,  32,  72,  76,  83,  76, 32,  83,  104,
>+    97,  100, 101, 114, 32,  67,  111, 109, 112, 105, 108, 101, 114, 32,  57,  46, 50,  57,  46,
>+    57,  53,  50,  46,  51,  49,  49,  49,  0,   171, 171, 73,  83,  71,  78,  80, 0,   0,   0,
>+    2,   0,   0,   0,   8,   0,   0,   0,   56,  0,   0,   0,   0,   0,   0,   0,  1,   0,   0,
>+    0,   3,   0,   0,   0,   0,   0,   0,   0,   15,  0,   0,   0,   68,  0,   0,  0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   3,   0,   0,   0,   1,   0,   0,   0,   3,   3,  0,   0,   83,
>+    86,  95,  80,  79,  83,  73,  84,  73,  79,  78,  0,   84,  69,  88,  67,  79, 79,  82,  68,
>+    0,   171, 171, 171, 79,  83,  71,  78,  44,  0,   0,   0,   1,   0,   0,   0,  8,   0,   0,
>+    0,   32,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,  0,   0,   0,
>+    0,   0,   15,  0,   0,   0,   83,  86,  95,  84,  65,  82,  71,  69,  84,  0,  171, 171, 83,
>+    72,  68,  82,  24,  1,   0,   0,   64,  0,   0,   0,   70,  0,   0,   0,   90, 0,   0,   3,
>+    0,   96,  16,  0,   0,   0,   0,   0,   88,  24,  0,   4,   0,   112, 16,  0,  0,   0,   0,
>+    0,   85,  85,  0,   0,   98,  16,  0,   3,   50,  16,  16,  0,   1,   0,   0,  0,   101, 0,
>+    0,   3,   242, 32,  16,  0,   0,   0,   0,   0,   104, 0,   0,   2,   2,   0,  0,   0,   69,
>+    0,   0,   9,   242, 0,   16,  0,   0,   0,   0,   0,   70,  16,  16,  0,   1,  0,   0,   0,
>+    70,  126, 16,  0,   0,   0,   0,   0,   0,   96,  16,  0,   0,   0,   0,   0,  49,  0,   0,
>+    7,   18,  0,   16,  0,   1,   0,   0,   0,   1,   64,  0,   0,   0,   0,   0,  0,   58,  0,
>+    16,  0,   0,   0,   0,   0,   14,  0,   0,   7,   226, 0,   16,  0,   1,   0,  0,   0,   6,
>+    9,   16,  0,   0,   0,   0,   0,   246, 15,  16,  0,   0,   0,   0,   0,   55, 0,   0,   9,
>+    114, 0,   16,  0,   0,   0,   0,   0,   6,   0,   16,  0,   1,   0,   0,   0,  150, 7,   16,
>+    0,   1,   0,   0,   0,   70,  2,   16,  0,   0,   0,   0,   0,   56,  0,   0,  10,  114, 0,
>+    16,  0,   0,   0,   0,   0,   70,  2,   16,  0,   0,   0,   0,   0,   2,   64, 0,   0,   0,
>+    0,   127, 67,  0,   0,   127, 67,  0,   0,   127, 67,  0,   0,   0,   0,   28, 0,   0,   5,
>+    114, 32,  16,  0,   0,   0,   0,   0,   70,  2,   16,  0,   0,   0,   0,   0,  54,  0,   0,
>+    5,   130, 32,  16,  0,   0,   0,   0,   0,   1,   64,  0,   0,   1,   0,   0,  0,   62,  0,
>+    0,   1,   83,  84,  65,  84,  116, 0,   0,   0,   8,   0,   0,   0,   2,   0,  0,   0,   0,
>+    0,   0,   0,   2,   0,   0,   0,   3,   0,   0,   0,   0,   0,   0,   0,   0,  0,   0,   0,
>+    1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,  0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,  0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   1,   0,  0,   0,   1,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,  0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0};
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftou_um_rgb_2darray_ps.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftou_um_rgb_2darray_ps.h
>new file mode 100644
>index 00000000000..361ceff057d
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftou_um_rgb_2darray_ps.h
>@@ -0,0 +1,101 @@
>+#if 0
>+//
>+// Generated by Microsoft (R) HLSL Shader Compiler 9.29.952.3111
>+//
>+//
>+//   fxc /nologo /E PS_FtoU_UM_RGB_2DArray /T ps_4_0 /Fh
>+//    compiled\multiplyalpha_ftou_um_rgb_2darray_ps.h MultiplyAlpha.hlsl
>+//
>+//
>+// Resource Bindings:
>+//
>+// Name                                 Type  Format         Dim Slot Elements
>+// ------------------------------ ---------- ------- ----------- ---- --------
>+// Sampler                           sampler      NA          NA    0        1
>+// TextureF_2DArray                  texture  float4     2darray    0        1
>+//
>+//
>+//
>+// Input signature:
>+//
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_POSITION              0   xyzw        0      POS  float       
>+// SV_RENDERTARGETARRAYINDEX     0   x           1  RTINDEX   uint   x   
>+// TEXCOORD                 0   xyz         2     NONE  float   xy  
>+//
>+//
>+// Output signature:
>+//
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_TARGET                0   xyzw        0   TARGET   uint   xyzw
>+//
>+ps_4_0
>+dcl_sampler s0, mode_default
>+dcl_resource_texture2darray (float,float,float,float) t0
>+dcl_input_ps_siv constant v1.x, rendertarget_array_index
>+dcl_input_ps linear v2.xy
>+dcl_output o0.xyzw
>+dcl_temps 2
>+utof r0.z, v1.x
>+mov r0.xy, v2.xyxx
>+sample r0.xyzw, r0.xyzx, t0.xyzw, s0
>+lt r1.x, l(0.000000), r0.w
>+div r1.yzw, r0.xxyz, r0.wwww
>+movc r0.xyz, r1.xxxx, r1.yzwy, r0.xyzx
>+mul r0.xyz, r0.xyzx, l(255.000000, 255.000000, 255.000000, 0.000000)
>+ftou o0.xyz, r0.xyzx
>+mov o0.w, l(1)
>+ret 
>+// Approximately 10 instruction slots used
>+#endif
>+
>+const BYTE g_PS_FtoU_UM_RGB_2DArray[] = {
>+    68,  88,  66,  67,  34,  166, 61,  121, 63,  205, 72,  128, 217, 151, 52,  241, 20,  136, 182,
>+    226, 1,   0,   0,   0,   116, 3,   0,   0,   5,   0,   0,   0,   52,  0,   0,   0,   228, 0,
>+    0,   0,   108, 1,   0,   0,   160, 1,   0,   0,   248, 2,   0,   0,   82,  68,  69,  70,  168,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   2,   0,   0,   0,   28,  0,   0,   0,
>+    0,   4,   255, 255, 0,   1,   0,   0,   117, 0,   0,   0,   92,  0,   0,   0,   3,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,
>+    0,   0,   1,   0,   0,   0,   100, 0,   0,   0,   2,   0,   0,   0,   5,   0,   0,   0,   5,
>+    0,   0,   0,   255, 255, 255, 255, 0,   0,   0,   0,   1,   0,   0,   0,   13,  0,   0,   0,
>+    83,  97,  109, 112, 108, 101, 114, 0,   84,  101, 120, 116, 117, 114, 101, 70,  95,  50,  68,
>+    65,  114, 114, 97,  121, 0,   77,  105, 99,  114, 111, 115, 111, 102, 116, 32,  40,  82,  41,
>+    32,  72,  76,  83,  76,  32,  83,  104, 97,  100, 101, 114, 32,  67,  111, 109, 112, 105, 108,
>+    101, 114, 32,  57,  46,  50,  57,  46,  57,  53,  50,  46,  51,  49,  49,  49,  0,   171, 171,
>+    73,  83,  71,  78,  128, 0,   0,   0,   3,   0,   0,   0,   8,   0,   0,   0,   80,  0,   0,
>+    0,   0,   0,   0,   0,   1,   0,   0,   0,   3,   0,   0,   0,   0,   0,   0,   0,   15,  0,
>+    0,   0,   92,  0,   0,   0,   0,   0,   0,   0,   4,   0,   0,   0,   1,   0,   0,   0,   1,
>+    0,   0,   0,   1,   1,   0,   0,   118, 0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    3,   0,   0,   0,   2,   0,   0,   0,   7,   3,   0,   0,   83,  86,  95,  80,  79,  83,  73,
>+    84,  73,  79,  78,  0,   83,  86,  95,  82,  69,  78,  68,  69,  82,  84,  65,  82,  71,  69,
>+    84,  65,  82,  82,  65,  89,  73,  78,  68,  69,  88,  0,   84,  69,  88,  67,  79,  79,  82,
>+    68,  0,   171, 79,  83,  71,  78,  44,  0,   0,   0,   1,   0,   0,   0,   8,   0,   0,   0,
>+    32,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,
>+    0,   15,  0,   0,   0,   83,  86,  95,  84,  65,  82,  71,  69,  84,  0,   171, 171, 83,  72,
>+    68,  82,  80,  1,   0,   0,   64,  0,   0,   0,   84,  0,   0,   0,   90,  0,   0,   3,   0,
>+    96,  16,  0,   0,   0,   0,   0,   88,  64,  0,   4,   0,   112, 16,  0,   0,   0,   0,   0,
>+    85,  85,  0,   0,   100, 8,   0,   4,   18,  16,  16,  0,   1,   0,   0,   0,   4,   0,   0,
>+    0,   98,  16,  0,   3,   50,  16,  16,  0,   2,   0,   0,   0,   101, 0,   0,   3,   242, 32,
>+    16,  0,   0,   0,   0,   0,   104, 0,   0,   2,   2,   0,   0,   0,   86,  0,   0,   5,   66,
>+    0,   16,  0,   0,   0,   0,   0,   10,  16,  16,  0,   1,   0,   0,   0,   54,  0,   0,   5,
>+    50,  0,   16,  0,   0,   0,   0,   0,   70,  16,  16,  0,   2,   0,   0,   0,   69,  0,   0,
>+    9,   242, 0,   16,  0,   0,   0,   0,   0,   70,  2,   16,  0,   0,   0,   0,   0,   70,  126,
>+    16,  0,   0,   0,   0,   0,   0,   96,  16,  0,   0,   0,   0,   0,   49,  0,   0,   7,   18,
>+    0,   16,  0,   1,   0,   0,   0,   1,   64,  0,   0,   0,   0,   0,   0,   58,  0,   16,  0,
>+    0,   0,   0,   0,   14,  0,   0,   7,   226, 0,   16,  0,   1,   0,   0,   0,   6,   9,   16,
>+    0,   0,   0,   0,   0,   246, 15,  16,  0,   0,   0,   0,   0,   55,  0,   0,   9,   114, 0,
>+    16,  0,   0,   0,   0,   0,   6,   0,   16,  0,   1,   0,   0,   0,   150, 7,   16,  0,   1,
>+    0,   0,   0,   70,  2,   16,  0,   0,   0,   0,   0,   56,  0,   0,   10,  114, 0,   16,  0,
>+    0,   0,   0,   0,   70,  2,   16,  0,   0,   0,   0,   0,   2,   64,  0,   0,   0,   0,   127,
>+    67,  0,   0,   127, 67,  0,   0,   127, 67,  0,   0,   0,   0,   28,  0,   0,   5,   114, 32,
>+    16,  0,   0,   0,   0,   0,   70,  2,   16,  0,   0,   0,   0,   0,   54,  0,   0,   5,   130,
>+    32,  16,  0,   0,   0,   0,   0,   1,   64,  0,   0,   1,   0,   0,   0,   62,  0,   0,   1,
>+    83,  84,  65,  84,  116, 0,   0,   0,   10,  0,   0,   0,   2,   0,   0,   0,   0,   0,   0,
>+    0,   3,   0,   0,   0,   3,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   2,   0,   0,   0,   1,   0,   0,   0,   2,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0};
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftou_um_rgb_3d_ps.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftou_um_rgb_3d_ps.h
>new file mode 100644
>index 00000000000..5eb39dd8405
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftou_um_rgb_3d_ps.h
>@@ -0,0 +1,95 @@
>+#if 0
>+//
>+// Generated by Microsoft (R) HLSL Shader Compiler 9.29.952.3111
>+//
>+//
>+//   fxc /nologo /E PS_FtoU_UM_RGB_3D /T ps_4_0 /Fh
>+//    compiled\multiplyalpha_ftou_um_rgb_3d_ps.h MultiplyAlpha.hlsl
>+//
>+//
>+// Resource Bindings:
>+//
>+// Name                                 Type  Format         Dim Slot Elements
>+// ------------------------------ ---------- ------- ----------- ---- --------
>+// Sampler                           sampler      NA          NA    0        1
>+// TextureF_3D                       texture  float4          3d    0        1
>+//
>+//
>+//
>+// Input signature:
>+//
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_POSITION              0   xyzw        0      POS  float       
>+// SV_RENDERTARGETARRAYINDEX     0   x           1  RTINDEX   uint       
>+// TEXCOORD                 0   xyz         2     NONE  float   xyz 
>+//
>+//
>+// Output signature:
>+//
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_TARGET                0   xyzw        0   TARGET   uint   xyzw
>+//
>+ps_4_0
>+dcl_sampler s0, mode_default
>+dcl_resource_texture3d (float,float,float,float) t0
>+dcl_input_ps linear v2.xyz
>+dcl_output o0.xyzw
>+dcl_temps 2
>+sample r0.xyzw, v2.xyzx, t0.xyzw, s0
>+lt r1.x, l(0.000000), r0.w
>+div r1.yzw, r0.xxyz, r0.wwww
>+movc r0.xyz, r1.xxxx, r1.yzwy, r0.xyzx
>+mul r0.xyz, r0.xyzx, l(255.000000, 255.000000, 255.000000, 0.000000)
>+ftou o0.xyz, r0.xyzx
>+mov o0.w, l(1)
>+ret 
>+// Approximately 8 instruction slots used
>+#endif
>+
>+const BYTE g_PS_FtoU_UM_RGB_3D[] = {
>+    68,  88,  66,  67,  90,  1,   145, 37,  152, 68,  18,  98,  175, 189, 182, 166, 152, 58,  224,
>+    12,  1,   0,   0,   0,   56,  3,   0,   0,   5,   0,   0,   0,   52,  0,   0,   0,   224, 0,
>+    0,   0,   104, 1,   0,   0,   156, 1,   0,   0,   188, 2,   0,   0,   82,  68,  69,  70,  164,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   2,   0,   0,   0,   28,  0,   0,   0,
>+    0,   4,   255, 255, 0,   1,   0,   0,   112, 0,   0,   0,   92,  0,   0,   0,   3,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,
>+    0,   0,   1,   0,   0,   0,   100, 0,   0,   0,   2,   0,   0,   0,   5,   0,   0,   0,   8,
>+    0,   0,   0,   255, 255, 255, 255, 0,   0,   0,   0,   1,   0,   0,   0,   13,  0,   0,   0,
>+    83,  97,  109, 112, 108, 101, 114, 0,   84,  101, 120, 116, 117, 114, 101, 70,  95,  51,  68,
>+    0,   77,  105, 99,  114, 111, 115, 111, 102, 116, 32,  40,  82,  41,  32,  72,  76,  83,  76,
>+    32,  83,  104, 97,  100, 101, 114, 32,  67,  111, 109, 112, 105, 108, 101, 114, 32,  57,  46,
>+    50,  57,  46,  57,  53,  50,  46,  51,  49,  49,  49,  0,   171, 171, 171, 73,  83,  71,  78,
>+    128, 0,   0,   0,   3,   0,   0,   0,   8,   0,   0,   0,   80,  0,   0,   0,   0,   0,   0,
>+    0,   1,   0,   0,   0,   3,   0,   0,   0,   0,   0,   0,   0,   15,  0,   0,   0,   92,  0,
>+    0,   0,   0,   0,   0,   0,   4,   0,   0,   0,   1,   0,   0,   0,   1,   0,   0,   0,   1,
>+    0,   0,   0,   118, 0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   3,   0,   0,   0,
>+    2,   0,   0,   0,   7,   7,   0,   0,   83,  86,  95,  80,  79,  83,  73,  84,  73,  79,  78,
>+    0,   83,  86,  95,  82,  69,  78,  68,  69,  82,  84,  65,  82,  71,  69,  84,  65,  82,  82,
>+    65,  89,  73,  78,  68,  69,  88,  0,   84,  69,  88,  67,  79,  79,  82,  68,  0,   171, 79,
>+    83,  71,  78,  44,  0,   0,   0,   1,   0,   0,   0,   8,   0,   0,   0,   32,  0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   15,  0,   0,
>+    0,   83,  86,  95,  84,  65,  82,  71,  69,  84,  0,   171, 171, 83,  72,  68,  82,  24,  1,
>+    0,   0,   64,  0,   0,   0,   70,  0,   0,   0,   90,  0,   0,   3,   0,   96,  16,  0,   0,
>+    0,   0,   0,   88,  40,  0,   4,   0,   112, 16,  0,   0,   0,   0,   0,   85,  85,  0,   0,
>+    98,  16,  0,   3,   114, 16,  16,  0,   2,   0,   0,   0,   101, 0,   0,   3,   242, 32,  16,
>+    0,   0,   0,   0,   0,   104, 0,   0,   2,   2,   0,   0,   0,   69,  0,   0,   9,   242, 0,
>+    16,  0,   0,   0,   0,   0,   70,  18,  16,  0,   2,   0,   0,   0,   70,  126, 16,  0,   0,
>+    0,   0,   0,   0,   96,  16,  0,   0,   0,   0,   0,   49,  0,   0,   7,   18,  0,   16,  0,
>+    1,   0,   0,   0,   1,   64,  0,   0,   0,   0,   0,   0,   58,  0,   16,  0,   0,   0,   0,
>+    0,   14,  0,   0,   7,   226, 0,   16,  0,   1,   0,   0,   0,   6,   9,   16,  0,   0,   0,
>+    0,   0,   246, 15,  16,  0,   0,   0,   0,   0,   55,  0,   0,   9,   114, 0,   16,  0,   0,
>+    0,   0,   0,   6,   0,   16,  0,   1,   0,   0,   0,   150, 7,   16,  0,   1,   0,   0,   0,
>+    70,  2,   16,  0,   0,   0,   0,   0,   56,  0,   0,   10,  114, 0,   16,  0,   0,   0,   0,
>+    0,   70,  2,   16,  0,   0,   0,   0,   0,   2,   64,  0,   0,   0,   0,   127, 67,  0,   0,
>+    127, 67,  0,   0,   127, 67,  0,   0,   0,   0,   28,  0,   0,   5,   114, 32,  16,  0,   0,
>+    0,   0,   0,   70,  2,   16,  0,   0,   0,   0,   0,   54,  0,   0,   5,   130, 32,  16,  0,
>+    0,   0,   0,   0,   1,   64,  0,   0,   1,   0,   0,   0,   62,  0,   0,   1,   83,  84,  65,
>+    84,  116, 0,   0,   0,   8,   0,   0,   0,   2,   0,   0,   0,   0,   0,   0,   0,   2,   0,
>+    0,   0,   3,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   1,   0,   0,   0,   1,   0,   0,   0,   1,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0};
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftou_um_rgb_ps.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftou_um_rgb_ps.h
>deleted file mode 100644
>index 349789b5844..00000000000
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftou_um_rgb_ps.h
>+++ /dev/null
>@@ -1,87 +0,0 @@
>-#if 0
>-//
>-// Generated by Microsoft (R) HLSL Shader Compiler 6.3.9600.16384
>-//
>-//
>-// Resource Bindings:
>-//
>-// Name                                 Type  Format         Dim Slot Elements
>-// ------------------------------ ---------- ------- ----------- ---- --------
>-// Sampler                           sampler      NA          NA    0        1
>-// TextureF                          texture  float4          2d    0        1
>-//
>-//
>-//
>-// Input signature:
>-//
>-// Name                 Index   Mask Register SysValue  Format   Used
>-// -------------------- ----- ------ -------- -------- ------- ------
>-// SV_POSITION              0   xyzw        0      POS   float       
>-// TEXCOORD                 0   xy          1     NONE   float   xy  
>-//
>-//
>-// Output signature:
>-//
>-// Name                 Index   Mask Register SysValue  Format   Used
>-// -------------------- ----- ------ -------- -------- ------- ------
>-// SV_TARGET                0   xyzw        0   TARGET    uint   xyzw
>-//
>-ps_4_0
>-dcl_sampler s0, mode_default
>-dcl_resource_texture2d (float,float,float,float) t0
>-dcl_input_ps linear v1.xy
>-dcl_output o0.xyzw
>-dcl_temps 2
>-sample r0.xyzw, v1.xyxx, t0.xyzw, s0
>-lt r1.x, l(0.000000), r0.w
>-div r1.yzw, r0.xxyz, r0.wwww
>-movc r0.xyz, r1.xxxx, r1.yzwy, r0.xyzx
>-mul r0.xyz, r0.xyzx, l(255.000000, 255.000000, 255.000000, 0.000000)
>-ftou o0.xyz, r0.xyzx
>-mov o0.w, l(1)
>-ret 
>-// Approximately 8 instruction slots used
>-#endif
>-
>-const BYTE g_PS_FtoU_UM_RGB[] = {
>-    68,  88,  66,  67,  82,  251, 238, 157, 164, 167, 205, 115, 177, 233, 1,   41, 133, 200, 183,
>-    107, 1,   0,   0,   0,   4,   3,   0,   0,   5,   0,   0,   0,   52,  0,   0,  0,   220, 0,
>-    0,   0,   52,  1,   0,   0,   104, 1,   0,   0,   136, 2,   0,   0,   82,  68, 69,  70,  160,
>-    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   2,   0,   0,   0,   28, 0,   0,   0,
>-    0,   4,   255, 255, 0,   1,   0,   0,   109, 0,   0,   0,   92,  0,   0,   0,  3,   0,   0,
>-    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,  0,   1,   0,
>-    0,   0,   1,   0,   0,   0,   100, 0,   0,   0,   2,   0,   0,   0,   5,   0,  0,   0,   4,
>-    0,   0,   0,   255, 255, 255, 255, 0,   0,   0,   0,   1,   0,   0,   0,   13, 0,   0,   0,
>-    83,  97,  109, 112, 108, 101, 114, 0,   84,  101, 120, 116, 117, 114, 101, 70, 0,   77,  105,
>-    99,  114, 111, 115, 111, 102, 116, 32,  40,  82,  41,  32,  72,  76,  83,  76, 32,  83,  104,
>-    97,  100, 101, 114, 32,  67,  111, 109, 112, 105, 108, 101, 114, 32,  54,  46, 51,  46,  57,
>-    54,  48,  48,  46,  49,  54,  51,  56,  52,  0,   171, 73,  83,  71,  78,  80, 0,   0,   0,
>-    2,   0,   0,   0,   8,   0,   0,   0,   56,  0,   0,   0,   0,   0,   0,   0,  1,   0,   0,
>-    0,   3,   0,   0,   0,   0,   0,   0,   0,   15,  0,   0,   0,   68,  0,   0,  0,   0,   0,
>-    0,   0,   0,   0,   0,   0,   3,   0,   0,   0,   1,   0,   0,   0,   3,   3,  0,   0,   83,
>-    86,  95,  80,  79,  83,  73,  84,  73,  79,  78,  0,   84,  69,  88,  67,  79, 79,  82,  68,
>-    0,   171, 171, 171, 79,  83,  71,  78,  44,  0,   0,   0,   1,   0,   0,   0,  8,   0,   0,
>-    0,   32,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,  0,   0,   0,
>-    0,   0,   15,  0,   0,   0,   83,  86,  95,  84,  65,  82,  71,  69,  84,  0,  171, 171, 83,
>-    72,  68,  82,  24,  1,   0,   0,   64,  0,   0,   0,   70,  0,   0,   0,   90, 0,   0,   3,
>-    0,   96,  16,  0,   0,   0,   0,   0,   88,  24,  0,   4,   0,   112, 16,  0,  0,   0,   0,
>-    0,   85,  85,  0,   0,   98,  16,  0,   3,   50,  16,  16,  0,   1,   0,   0,  0,   101, 0,
>-    0,   3,   242, 32,  16,  0,   0,   0,   0,   0,   104, 0,   0,   2,   2,   0,  0,   0,   69,
>-    0,   0,   9,   242, 0,   16,  0,   0,   0,   0,   0,   70,  16,  16,  0,   1,  0,   0,   0,
>-    70,  126, 16,  0,   0,   0,   0,   0,   0,   96,  16,  0,   0,   0,   0,   0,  49,  0,   0,
>-    7,   18,  0,   16,  0,   1,   0,   0,   0,   1,   64,  0,   0,   0,   0,   0,  0,   58,  0,
>-    16,  0,   0,   0,   0,   0,   14,  0,   0,   7,   226, 0,   16,  0,   1,   0,  0,   0,   6,
>-    9,   16,  0,   0,   0,   0,   0,   246, 15,  16,  0,   0,   0,   0,   0,   55, 0,   0,   9,
>-    114, 0,   16,  0,   0,   0,   0,   0,   6,   0,   16,  0,   1,   0,   0,   0,  150, 7,   16,
>-    0,   1,   0,   0,   0,   70,  2,   16,  0,   0,   0,   0,   0,   56,  0,   0,  10,  114, 0,
>-    16,  0,   0,   0,   0,   0,   70,  2,   16,  0,   0,   0,   0,   0,   2,   64, 0,   0,   0,
>-    0,   127, 67,  0,   0,   127, 67,  0,   0,   127, 67,  0,   0,   0,   0,   28, 0,   0,   5,
>-    114, 32,  16,  0,   0,   0,   0,   0,   70,  2,   16,  0,   0,   0,   0,   0,  54,  0,   0,
>-    5,   130, 32,  16,  0,   0,   0,   0,   0,   1,   64,  0,   0,   1,   0,   0,  0,   62,  0,
>-    0,   1,   83,  84,  65,  84,  116, 0,   0,   0,   8,   0,   0,   0,   2,   0,  0,   0,   0,
>-    0,   0,   0,   2,   0,   0,   0,   3,   0,   0,   0,   0,   0,   0,   0,   0,  0,   0,   0,
>-    1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,  0,   0,   0,
>-    0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,  0,   0,   0,
>-    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   1,   0,  0,   0,   1,
>-    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,  0,   0,   0,
>-    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0};
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftou_um_rgba_2d_ps.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftou_um_rgba_2d_ps.h
>new file mode 100644
>index 00000000000..336a8968f1d
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftou_um_rgba_2d_ps.h
>@@ -0,0 +1,89 @@
>+#if 0
>+//
>+// Generated by Microsoft (R) HLSL Shader Compiler 9.29.952.3111
>+//
>+//
>+//   fxc /nologo /E PS_FtoU_UM_RGBA_2D /T ps_4_0 /Fh
>+//    compiled\multiplyalpha_ftou_um_rgba_2d_ps.h MultiplyAlpha.hlsl
>+//
>+//
>+// Resource Bindings:
>+//
>+// Name                                 Type  Format         Dim Slot Elements
>+// ------------------------------ ---------- ------- ----------- ---- --------
>+// Sampler                           sampler      NA          NA    0        1
>+// TextureF                          texture  float4          2d    0        1
>+//
>+//
>+//
>+// Input signature:
>+//
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_POSITION              0   xyzw        0      POS  float
>+// TEXCOORD                 0   xy          1     NONE  float   xy
>+//
>+//
>+// Output signature:
>+//
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_TARGET                0   xyzw        0   TARGET   uint   xyzw
>+//
>+ps_4_0
>+dcl_sampler s0, mode_default
>+dcl_resource_texture2d (float,float,float,float) t0
>+dcl_input_ps linear v1.xy
>+dcl_output o0.xyzw
>+dcl_temps 2
>+sample r0.xyzw, v1.xyxx, t0.xyzw, s0
>+lt r1.x, l(0.000000), r0.w
>+div r1.yzw, r0.xxyz, r0.wwww
>+movc r0.xyz, r1.xxxx, r1.yzwy, r0.xyzx
>+mul r0.xyzw, r0.xyzw, l(255.000000, 255.000000, 255.000000, 255.000000)
>+ftou o0.xyzw, r0.xyzw
>+ret
>+// Approximately 7 instruction slots used
>+#endif
>+
>+const BYTE g_PS_FtoU_UM_RGBA_2D[] = {
>+    68,  88,  66,  67,  168, 0,   97,  230, 108, 173, 2,   154, 44,  146, 249, 246, 158, 213, 153,
>+    180, 1,   0,   0,   0,   240, 2,   0,   0,   5,   0,   0,   0,   52,  0,   0,   0,   220, 0,
>+    0,   0,   52,  1,   0,   0,   104, 1,   0,   0,   116, 2,   0,   0,   82,  68,  69,  70,  160,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   2,   0,   0,   0,   28,  0,   0,   0,
>+    0,   4,   255, 255, 0,   1,   0,   0,   109, 0,   0,   0,   92,  0,   0,   0,   3,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,
>+    0,   0,   1,   0,   0,   0,   100, 0,   0,   0,   2,   0,   0,   0,   5,   0,   0,   0,   4,
>+    0,   0,   0,   255, 255, 255, 255, 0,   0,   0,   0,   1,   0,   0,   0,   13,  0,   0,   0,
>+    83,  97,  109, 112, 108, 101, 114, 0,   84,  101, 120, 116, 117, 114, 101, 70,  0,   77,  105,
>+    99,  114, 111, 115, 111, 102, 116, 32,  40,  82,  41,  32,  72,  76,  83,  76,  32,  83,  104,
>+    97,  100, 101, 114, 32,  67,  111, 109, 112, 105, 108, 101, 114, 32,  57,  46,  50,  57,  46,
>+    57,  53,  50,  46,  51,  49,  49,  49,  0,   171, 171, 73,  83,  71,  78,  80,  0,   0,   0,
>+    2,   0,   0,   0,   8,   0,   0,   0,   56,  0,   0,   0,   0,   0,   0,   0,   1,   0,   0,
>+    0,   3,   0,   0,   0,   0,   0,   0,   0,   15,  0,   0,   0,   68,  0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   3,   0,   0,   0,   1,   0,   0,   0,   3,   3,   0,   0,   83,
>+    86,  95,  80,  79,  83,  73,  84,  73,  79,  78,  0,   84,  69,  88,  67,  79,  79,  82,  68,
>+    0,   171, 171, 171, 79,  83,  71,  78,  44,  0,   0,   0,   1,   0,   0,   0,   8,   0,   0,
>+    0,   32,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   0,   0,
>+    0,   0,   15,  0,   0,   0,   83,  86,  95,  84,  65,  82,  71,  69,  84,  0,   171, 171, 83,
>+    72,  68,  82,  4,   1,   0,   0,   64,  0,   0,   0,   65,  0,   0,   0,   90,  0,   0,   3,
>+    0,   96,  16,  0,   0,   0,   0,   0,   88,  24,  0,   4,   0,   112, 16,  0,   0,   0,   0,
>+    0,   85,  85,  0,   0,   98,  16,  0,   3,   50,  16,  16,  0,   1,   0,   0,   0,   101, 0,
>+    0,   3,   242, 32,  16,  0,   0,   0,   0,   0,   104, 0,   0,   2,   2,   0,   0,   0,   69,
>+    0,   0,   9,   242, 0,   16,  0,   0,   0,   0,   0,   70,  16,  16,  0,   1,   0,   0,   0,
>+    70,  126, 16,  0,   0,   0,   0,   0,   0,   96,  16,  0,   0,   0,   0,   0,   49,  0,   0,
>+    7,   18,  0,   16,  0,   1,   0,   0,   0,   1,   64,  0,   0,   0,   0,   0,   0,   58,  0,
>+    16,  0,   0,   0,   0,   0,   14,  0,   0,   7,   226, 0,   16,  0,   1,   0,   0,   0,   6,
>+    9,   16,  0,   0,   0,   0,   0,   246, 15,  16,  0,   0,   0,   0,   0,   55,  0,   0,   9,
>+    114, 0,   16,  0,   0,   0,   0,   0,   6,   0,   16,  0,   1,   0,   0,   0,   150, 7,   16,
>+    0,   1,   0,   0,   0,   70,  2,   16,  0,   0,   0,   0,   0,   56,  0,   0,   10,  242, 0,
>+    16,  0,   0,   0,   0,   0,   70,  14,  16,  0,   0,   0,   0,   0,   2,   64,  0,   0,   0,
>+    0,   127, 67,  0,   0,   127, 67,  0,   0,   127, 67,  0,   0,   127, 67,  28,  0,   0,   5,
>+    242, 32,  16,  0,   0,   0,   0,   0,   70,  14,  16,  0,   0,   0,   0,   0,   62,  0,   0,
>+    1,   83,  84,  65,  84,  116, 0,   0,   0,   7,   0,   0,   0,   2,   0,   0,   0,   0,   0,
>+    0,   0,   2,   0,   0,   0,   3,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   1,   0,   0,   0,   1,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0};
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftou_um_rgba_2darray_ps.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftou_um_rgba_2darray_ps.h
>new file mode 100644
>index 00000000000..adf84036201
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftou_um_rgba_2darray_ps.h
>@@ -0,0 +1,99 @@
>+#if 0
>+//
>+// Generated by Microsoft (R) HLSL Shader Compiler 9.29.952.3111
>+//
>+//
>+//   fxc /nologo /E PS_FtoU_UM_RGBA_2DArray /T ps_4_0 /Fh
>+//    compiled\multiplyalpha_ftou_um_rgba_2darray_ps.h MultiplyAlpha.hlsl
>+//
>+//
>+// Resource Bindings:
>+//
>+// Name                                 Type  Format         Dim Slot Elements
>+// ------------------------------ ---------- ------- ----------- ---- --------
>+// Sampler                           sampler      NA          NA    0        1
>+// TextureF_2DArray                  texture  float4     2darray    0        1
>+//
>+//
>+//
>+// Input signature:
>+//
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_POSITION              0   xyzw        0      POS  float       
>+// SV_RENDERTARGETARRAYINDEX     0   x           1  RTINDEX   uint   x   
>+// TEXCOORD                 0   xyz         2     NONE  float   xy  
>+//
>+//
>+// Output signature:
>+//
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_TARGET                0   xyzw        0   TARGET   uint   xyzw
>+//
>+ps_4_0
>+dcl_sampler s0, mode_default
>+dcl_resource_texture2darray (float,float,float,float) t0
>+dcl_input_ps_siv constant v1.x, rendertarget_array_index
>+dcl_input_ps linear v2.xy
>+dcl_output o0.xyzw
>+dcl_temps 2
>+utof r0.z, v1.x
>+mov r0.xy, v2.xyxx
>+sample r0.xyzw, r0.xyzx, t0.xyzw, s0
>+lt r1.x, l(0.000000), r0.w
>+div r1.yzw, r0.xxyz, r0.wwww
>+movc r0.xyz, r1.xxxx, r1.yzwy, r0.xyzx
>+mul r0.xyzw, r0.xyzw, l(255.000000, 255.000000, 255.000000, 255.000000)
>+ftou o0.xyzw, r0.xyzw
>+ret 
>+// Approximately 9 instruction slots used
>+#endif
>+
>+const BYTE g_PS_FtoU_UM_RGBA_2DArray[] = {
>+    68,  88,  66,  67,  222, 115, 245, 233, 95,  182, 197, 189, 41,  105, 31,  89,  140, 176, 0,
>+    87,  1,   0,   0,   0,   96,  3,   0,   0,   5,   0,   0,   0,   52,  0,   0,   0,   228, 0,
>+    0,   0,   108, 1,   0,   0,   160, 1,   0,   0,   228, 2,   0,   0,   82,  68,  69,  70,  168,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   2,   0,   0,   0,   28,  0,   0,   0,
>+    0,   4,   255, 255, 0,   1,   0,   0,   117, 0,   0,   0,   92,  0,   0,   0,   3,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,
>+    0,   0,   1,   0,   0,   0,   100, 0,   0,   0,   2,   0,   0,   0,   5,   0,   0,   0,   5,
>+    0,   0,   0,   255, 255, 255, 255, 0,   0,   0,   0,   1,   0,   0,   0,   13,  0,   0,   0,
>+    83,  97,  109, 112, 108, 101, 114, 0,   84,  101, 120, 116, 117, 114, 101, 70,  95,  50,  68,
>+    65,  114, 114, 97,  121, 0,   77,  105, 99,  114, 111, 115, 111, 102, 116, 32,  40,  82,  41,
>+    32,  72,  76,  83,  76,  32,  83,  104, 97,  100, 101, 114, 32,  67,  111, 109, 112, 105, 108,
>+    101, 114, 32,  57,  46,  50,  57,  46,  57,  53,  50,  46,  51,  49,  49,  49,  0,   171, 171,
>+    73,  83,  71,  78,  128, 0,   0,   0,   3,   0,   0,   0,   8,   0,   0,   0,   80,  0,   0,
>+    0,   0,   0,   0,   0,   1,   0,   0,   0,   3,   0,   0,   0,   0,   0,   0,   0,   15,  0,
>+    0,   0,   92,  0,   0,   0,   0,   0,   0,   0,   4,   0,   0,   0,   1,   0,   0,   0,   1,
>+    0,   0,   0,   1,   1,   0,   0,   118, 0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    3,   0,   0,   0,   2,   0,   0,   0,   7,   3,   0,   0,   83,  86,  95,  80,  79,  83,  73,
>+    84,  73,  79,  78,  0,   83,  86,  95,  82,  69,  78,  68,  69,  82,  84,  65,  82,  71,  69,
>+    84,  65,  82,  82,  65,  89,  73,  78,  68,  69,  88,  0,   84,  69,  88,  67,  79,  79,  82,
>+    68,  0,   171, 79,  83,  71,  78,  44,  0,   0,   0,   1,   0,   0,   0,   8,   0,   0,   0,
>+    32,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,
>+    0,   15,  0,   0,   0,   83,  86,  95,  84,  65,  82,  71,  69,  84,  0,   171, 171, 83,  72,
>+    68,  82,  60,  1,   0,   0,   64,  0,   0,   0,   79,  0,   0,   0,   90,  0,   0,   3,   0,
>+    96,  16,  0,   0,   0,   0,   0,   88,  64,  0,   4,   0,   112, 16,  0,   0,   0,   0,   0,
>+    85,  85,  0,   0,   100, 8,   0,   4,   18,  16,  16,  0,   1,   0,   0,   0,   4,   0,   0,
>+    0,   98,  16,  0,   3,   50,  16,  16,  0,   2,   0,   0,   0,   101, 0,   0,   3,   242, 32,
>+    16,  0,   0,   0,   0,   0,   104, 0,   0,   2,   2,   0,   0,   0,   86,  0,   0,   5,   66,
>+    0,   16,  0,   0,   0,   0,   0,   10,  16,  16,  0,   1,   0,   0,   0,   54,  0,   0,   5,
>+    50,  0,   16,  0,   0,   0,   0,   0,   70,  16,  16,  0,   2,   0,   0,   0,   69,  0,   0,
>+    9,   242, 0,   16,  0,   0,   0,   0,   0,   70,  2,   16,  0,   0,   0,   0,   0,   70,  126,
>+    16,  0,   0,   0,   0,   0,   0,   96,  16,  0,   0,   0,   0,   0,   49,  0,   0,   7,   18,
>+    0,   16,  0,   1,   0,   0,   0,   1,   64,  0,   0,   0,   0,   0,   0,   58,  0,   16,  0,
>+    0,   0,   0,   0,   14,  0,   0,   7,   226, 0,   16,  0,   1,   0,   0,   0,   6,   9,   16,
>+    0,   0,   0,   0,   0,   246, 15,  16,  0,   0,   0,   0,   0,   55,  0,   0,   9,   114, 0,
>+    16,  0,   0,   0,   0,   0,   6,   0,   16,  0,   1,   0,   0,   0,   150, 7,   16,  0,   1,
>+    0,   0,   0,   70,  2,   16,  0,   0,   0,   0,   0,   56,  0,   0,   10,  242, 0,   16,  0,
>+    0,   0,   0,   0,   70,  14,  16,  0,   0,   0,   0,   0,   2,   64,  0,   0,   0,   0,   127,
>+    67,  0,   0,   127, 67,  0,   0,   127, 67,  0,   0,   127, 67,  28,  0,   0,   5,   242, 32,
>+    16,  0,   0,   0,   0,   0,   70,  14,  16,  0,   0,   0,   0,   0,   62,  0,   0,   1,   83,
>+    84,  65,  84,  116, 0,   0,   0,   9,   0,   0,   0,   2,   0,   0,   0,   0,   0,   0,   0,
>+    3,   0,   0,   0,   3,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   2,   0,   0,   0,   1,   0,   0,   0,   2,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0};
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftou_um_rgba_3d_ps.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftou_um_rgba_3d_ps.h
>new file mode 100644
>index 00000000000..6c98014700a
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftou_um_rgba_3d_ps.h
>@@ -0,0 +1,93 @@
>+#if 0
>+//
>+// Generated by Microsoft (R) HLSL Shader Compiler 9.29.952.3111
>+//
>+//
>+//   fxc /nologo /E PS_FtoU_UM_RGBA_3D /T ps_4_0 /Fh
>+//    compiled\multiplyalpha_ftou_um_rgba_3d_ps.h MultiplyAlpha.hlsl
>+//
>+//
>+// Resource Bindings:
>+//
>+// Name                                 Type  Format         Dim Slot Elements
>+// ------------------------------ ---------- ------- ----------- ---- --------
>+// Sampler                           sampler      NA          NA    0        1
>+// TextureF_3D                       texture  float4          3d    0        1
>+//
>+//
>+//
>+// Input signature:
>+//
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_POSITION              0   xyzw        0      POS  float       
>+// SV_RENDERTARGETARRAYINDEX     0   x           1  RTINDEX   uint       
>+// TEXCOORD                 0   xyz         2     NONE  float   xyz 
>+//
>+//
>+// Output signature:
>+//
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_TARGET                0   xyzw        0   TARGET   uint   xyzw
>+//
>+ps_4_0
>+dcl_sampler s0, mode_default
>+dcl_resource_texture3d (float,float,float,float) t0
>+dcl_input_ps linear v2.xyz
>+dcl_output o0.xyzw
>+dcl_temps 2
>+sample r0.xyzw, v2.xyzx, t0.xyzw, s0
>+lt r1.x, l(0.000000), r0.w
>+div r1.yzw, r0.xxyz, r0.wwww
>+movc r0.xyz, r1.xxxx, r1.yzwy, r0.xyzx
>+mul r0.xyzw, r0.xyzw, l(255.000000, 255.000000, 255.000000, 255.000000)
>+ftou o0.xyzw, r0.xyzw
>+ret 
>+// Approximately 7 instruction slots used
>+#endif
>+
>+const BYTE g_PS_FtoU_UM_RGBA_3D[] = {
>+    68,  88, 66,  67,  211, 213, 129, 95,  158, 84,  47,  191, 113, 114, 198, 245, 188, 65,  31,
>+    212, 1,  0,   0,   0,   36,  3,   0,   0,   5,   0,   0,   0,   52,  0,   0,   0,   224, 0,
>+    0,   0,  104, 1,   0,   0,   156, 1,   0,   0,   168, 2,   0,   0,   82,  68,  69,  70,  164,
>+    0,   0,  0,   0,   0,   0,   0,   0,   0,   0,   0,   2,   0,   0,   0,   28,  0,   0,   0,
>+    0,   4,  255, 255, 0,   1,   0,   0,   112, 0,   0,   0,   92,  0,   0,   0,   3,   0,   0,
>+    0,   0,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,
>+    0,   0,  1,   0,   0,   0,   100, 0,   0,   0,   2,   0,   0,   0,   5,   0,   0,   0,   8,
>+    0,   0,  0,   255, 255, 255, 255, 0,   0,   0,   0,   1,   0,   0,   0,   13,  0,   0,   0,
>+    83,  97, 109, 112, 108, 101, 114, 0,   84,  101, 120, 116, 117, 114, 101, 70,  95,  51,  68,
>+    0,   77, 105, 99,  114, 111, 115, 111, 102, 116, 32,  40,  82,  41,  32,  72,  76,  83,  76,
>+    32,  83, 104, 97,  100, 101, 114, 32,  67,  111, 109, 112, 105, 108, 101, 114, 32,  57,  46,
>+    50,  57, 46,  57,  53,  50,  46,  51,  49,  49,  49,  0,   171, 171, 171, 73,  83,  71,  78,
>+    128, 0,  0,   0,   3,   0,   0,   0,   8,   0,   0,   0,   80,  0,   0,   0,   0,   0,   0,
>+    0,   1,  0,   0,   0,   3,   0,   0,   0,   0,   0,   0,   0,   15,  0,   0,   0,   92,  0,
>+    0,   0,  0,   0,   0,   0,   4,   0,   0,   0,   1,   0,   0,   0,   1,   0,   0,   0,   1,
>+    0,   0,  0,   118, 0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   3,   0,   0,   0,
>+    2,   0,  0,   0,   7,   7,   0,   0,   83,  86,  95,  80,  79,  83,  73,  84,  73,  79,  78,
>+    0,   83, 86,  95,  82,  69,  78,  68,  69,  82,  84,  65,  82,  71,  69,  84,  65,  82,  82,
>+    65,  89, 73,  78,  68,  69,  88,  0,   84,  69,  88,  67,  79,  79,  82,  68,  0,   171, 79,
>+    83,  71, 78,  44,  0,   0,   0,   1,   0,   0,   0,   8,   0,   0,   0,   32,  0,   0,   0,
>+    0,   0,  0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   15,  0,   0,
>+    0,   83, 86,  95,  84,  65,  82,  71,  69,  84,  0,   171, 171, 83,  72,  68,  82,  4,   1,
>+    0,   0,  64,  0,   0,   0,   65,  0,   0,   0,   90,  0,   0,   3,   0,   96,  16,  0,   0,
>+    0,   0,  0,   88,  40,  0,   4,   0,   112, 16,  0,   0,   0,   0,   0,   85,  85,  0,   0,
>+    98,  16, 0,   3,   114, 16,  16,  0,   2,   0,   0,   0,   101, 0,   0,   3,   242, 32,  16,
>+    0,   0,  0,   0,   0,   104, 0,   0,   2,   2,   0,   0,   0,   69,  0,   0,   9,   242, 0,
>+    16,  0,  0,   0,   0,   0,   70,  18,  16,  0,   2,   0,   0,   0,   70,  126, 16,  0,   0,
>+    0,   0,  0,   0,   96,  16,  0,   0,   0,   0,   0,   49,  0,   0,   7,   18,  0,   16,  0,
>+    1,   0,  0,   0,   1,   64,  0,   0,   0,   0,   0,   0,   58,  0,   16,  0,   0,   0,   0,
>+    0,   14, 0,   0,   7,   226, 0,   16,  0,   1,   0,   0,   0,   6,   9,   16,  0,   0,   0,
>+    0,   0,  246, 15,  16,  0,   0,   0,   0,   0,   55,  0,   0,   9,   114, 0,   16,  0,   0,
>+    0,   0,  0,   6,   0,   16,  0,   1,   0,   0,   0,   150, 7,   16,  0,   1,   0,   0,   0,
>+    70,  2,  16,  0,   0,   0,   0,   0,   56,  0,   0,   10,  242, 0,   16,  0,   0,   0,   0,
>+    0,   70, 14,  16,  0,   0,   0,   0,   0,   2,   64,  0,   0,   0,   0,   127, 67,  0,   0,
>+    127, 67, 0,   0,   127, 67,  0,   0,   127, 67,  28,  0,   0,   5,   242, 32,  16,  0,   0,
>+    0,   0,  0,   70,  14,  16,  0,   0,   0,   0,   0,   62,  0,   0,   1,   83,  84,  65,  84,
>+    116, 0,  0,   0,   7,   0,   0,   0,   2,   0,   0,   0,   0,   0,   0,   0,   2,   0,   0,
>+    0,   3,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   0,   0,
>+    0,   0,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,  0,   1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,  0,   0,   1,   0,   0,   0,   1,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,
>+    0,   0,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,  0,   0,   0,   0};
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftou_um_rgba_ps.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftou_um_rgba_ps.h
>deleted file mode 100644
>index cb9d3feb1c6..00000000000
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftou_um_rgba_ps.h
>+++ /dev/null
>@@ -1,85 +0,0 @@
>-#if 0
>-//
>-// Generated by Microsoft (R) HLSL Shader Compiler 6.3.9600.16384
>-//
>-//
>-// Resource Bindings:
>-//
>-// Name                                 Type  Format         Dim Slot Elements
>-// ------------------------------ ---------- ------- ----------- ---- --------
>-// Sampler                           sampler      NA          NA    0        1
>-// TextureF                          texture  float4          2d    0        1
>-//
>-//
>-//
>-// Input signature:
>-//
>-// Name                 Index   Mask Register SysValue  Format   Used
>-// -------------------- ----- ------ -------- -------- ------- ------
>-// SV_POSITION              0   xyzw        0      POS   float       
>-// TEXCOORD                 0   xy          1     NONE   float   xy  
>-//
>-//
>-// Output signature:
>-//
>-// Name                 Index   Mask Register SysValue  Format   Used
>-// -------------------- ----- ------ -------- -------- ------- ------
>-// SV_TARGET                0   xyzw        0   TARGET    uint   xyzw
>-//
>-ps_4_0
>-dcl_sampler s0, mode_default
>-dcl_resource_texture2d (float,float,float,float) t0
>-dcl_input_ps linear v1.xy
>-dcl_output o0.xyzw
>-dcl_temps 2
>-sample r0.xyzw, v1.xyxx, t0.xyzw, s0
>-lt r1.x, l(0.000000), r0.w
>-div r1.yzw, r0.xxyz, r0.wwww
>-movc r0.xyz, r1.xxxx, r1.yzwy, r0.xyzx
>-mul r0.xyzw, r0.xyzw, l(255.000000, 255.000000, 255.000000, 255.000000)
>-ftou o0.xyzw, r0.xyzw
>-ret 
>-// Approximately 7 instruction slots used
>-#endif
>-
>-const BYTE g_PS_FtoU_UM_RGBA[] = {
>-    68,  88,  66,  67,  43,  223, 220, 54,  150, 139, 210, 139, 116, 210, 25,  161, 205, 213, 104,
>-    156, 1,   0,   0,   0,   240, 2,   0,   0,   5,   0,   0,   0,   52,  0,   0,   0,   220, 0,
>-    0,   0,   52,  1,   0,   0,   104, 1,   0,   0,   116, 2,   0,   0,   82,  68,  69,  70,  160,
>-    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   2,   0,   0,   0,   28,  0,   0,   0,
>-    0,   4,   255, 255, 0,   1,   0,   0,   109, 0,   0,   0,   92,  0,   0,   0,   3,   0,   0,
>-    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,
>-    0,   0,   1,   0,   0,   0,   100, 0,   0,   0,   2,   0,   0,   0,   5,   0,   0,   0,   4,
>-    0,   0,   0,   255, 255, 255, 255, 0,   0,   0,   0,   1,   0,   0,   0,   13,  0,   0,   0,
>-    83,  97,  109, 112, 108, 101, 114, 0,   84,  101, 120, 116, 117, 114, 101, 70,  0,   77,  105,
>-    99,  114, 111, 115, 111, 102, 116, 32,  40,  82,  41,  32,  72,  76,  83,  76,  32,  83,  104,
>-    97,  100, 101, 114, 32,  67,  111, 109, 112, 105, 108, 101, 114, 32,  54,  46,  51,  46,  57,
>-    54,  48,  48,  46,  49,  54,  51,  56,  52,  0,   171, 73,  83,  71,  78,  80,  0,   0,   0,
>-    2,   0,   0,   0,   8,   0,   0,   0,   56,  0,   0,   0,   0,   0,   0,   0,   1,   0,   0,
>-    0,   3,   0,   0,   0,   0,   0,   0,   0,   15,  0,   0,   0,   68,  0,   0,   0,   0,   0,
>-    0,   0,   0,   0,   0,   0,   3,   0,   0,   0,   1,   0,   0,   0,   3,   3,   0,   0,   83,
>-    86,  95,  80,  79,  83,  73,  84,  73,  79,  78,  0,   84,  69,  88,  67,  79,  79,  82,  68,
>-    0,   171, 171, 171, 79,  83,  71,  78,  44,  0,   0,   0,   1,   0,   0,   0,   8,   0,   0,
>-    0,   32,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   0,   0,
>-    0,   0,   15,  0,   0,   0,   83,  86,  95,  84,  65,  82,  71,  69,  84,  0,   171, 171, 83,
>-    72,  68,  82,  4,   1,   0,   0,   64,  0,   0,   0,   65,  0,   0,   0,   90,  0,   0,   3,
>-    0,   96,  16,  0,   0,   0,   0,   0,   88,  24,  0,   4,   0,   112, 16,  0,   0,   0,   0,
>-    0,   85,  85,  0,   0,   98,  16,  0,   3,   50,  16,  16,  0,   1,   0,   0,   0,   101, 0,
>-    0,   3,   242, 32,  16,  0,   0,   0,   0,   0,   104, 0,   0,   2,   2,   0,   0,   0,   69,
>-    0,   0,   9,   242, 0,   16,  0,   0,   0,   0,   0,   70,  16,  16,  0,   1,   0,   0,   0,
>-    70,  126, 16,  0,   0,   0,   0,   0,   0,   96,  16,  0,   0,   0,   0,   0,   49,  0,   0,
>-    7,   18,  0,   16,  0,   1,   0,   0,   0,   1,   64,  0,   0,   0,   0,   0,   0,   58,  0,
>-    16,  0,   0,   0,   0,   0,   14,  0,   0,   7,   226, 0,   16,  0,   1,   0,   0,   0,   6,
>-    9,   16,  0,   0,   0,   0,   0,   246, 15,  16,  0,   0,   0,   0,   0,   55,  0,   0,   9,
>-    114, 0,   16,  0,   0,   0,   0,   0,   6,   0,   16,  0,   1,   0,   0,   0,   150, 7,   16,
>-    0,   1,   0,   0,   0,   70,  2,   16,  0,   0,   0,   0,   0,   56,  0,   0,   10,  242, 0,
>-    16,  0,   0,   0,   0,   0,   70,  14,  16,  0,   0,   0,   0,   0,   2,   64,  0,   0,   0,
>-    0,   127, 67,  0,   0,   127, 67,  0,   0,   127, 67,  0,   0,   127, 67,  28,  0,   0,   5,
>-    242, 32,  16,  0,   0,   0,   0,   0,   70,  14,  16,  0,   0,   0,   0,   0,   62,  0,   0,
>-    1,   83,  84,  65,  84,  116, 0,   0,   0,   7,   0,   0,   0,   2,   0,   0,   0,   0,   0,
>-    0,   0,   2,   0,   0,   0,   3,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,
>-    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>-    0,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>-    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   1,   0,
>-    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>-    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0};
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthrough2d11vs.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthrough2d11vs.h
>index 050040e74b9..4dba0eb054e 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthrough2d11vs.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthrough2d11vs.h
>@@ -1,23 +1,27 @@
> #if 0
> //
>-// Generated by Microsoft (R) HLSL Shader Compiler 6.3.9600.16384
>+// Generated by Microsoft (R) HLSL Shader Compiler 9.29.952.3111
>+//
>+//
>+//   fxc /nologo /E VS_Passthrough2D /T vs_4_0_level_9_3 /Fh
>+//    compiled\passthrough2d11vs.h Passthrough2D11.hlsl
> //
> //
> //
> // Input signature:
> //
>-// Name                 Index   Mask Register SysValue  Format   Used
>-// -------------------- ----- ------ -------- -------- ------- ------
>-// POSITION                 0   xy          0     NONE   float   xy  
>-// TEXCOORD                 0   xy          1     NONE   float   xy  
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// POSITION                 0   xy          0     NONE  float   xy  
>+// TEXCOORD                 0   xy          1     NONE  float   xy  
> //
> //
> // Output signature:
> //
>-// Name                 Index   Mask Register SysValue  Format   Used
>-// -------------------- ----- ------ -------- -------- ------- ------
>-// SV_POSITION              0   xyzw        0      POS   float   xyzw
>-// TEXCOORD                 0   xy          1     NONE   float   xy  
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_POSITION              0   xyzw        0      POS  float   xyzw
>+// TEXCOORD                 0   xy          1     NONE  float   xy  
> //
> //
> // Runtime generated constant mappings:
>@@ -50,128 +54,43 @@ ret
> // Approximately 4 instruction slots used
> #endif
> 
>-const BYTE g_VS_Passthrough2D[] =
>-{
>-     68,  88,  66,  67, 230,  95, 
>-    115, 230,  65, 211,  74,  82, 
>-    143, 170, 109, 175,  63, 210, 
>-     14, 229,   1,   0,   0,   0, 
>-    216,   2,   0,   0,   6,   0, 
>-      0,   0,  56,   0,   0,   0, 
>-    200,   0,   0,   0,  88,   1, 
>-      0,   0, 212,   1,   0,   0, 
>-     44,   2,   0,   0, 128,   2, 
>-      0,   0,  65, 111, 110,  57, 
>-    136,   0,   0,   0, 136,   0, 
>-      0,   0,   0,   2, 254, 255, 
>-     96,   0,   0,   0,  40,   0, 
>-      0,   0,   0,   0,  36,   0, 
>-      0,   0,  36,   0,   0,   0, 
>-     36,   0,   0,   0,  36,   0, 
>-      1,   0,  36,   0,   0,   0, 
>-      0,   0,   1,   2, 254, 255, 
>-     81,   0,   0,   5,   1,   0, 
>-     15, 160,   0,   0,   0,   0, 
>-      0,   0, 128,  63,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-     31,   0,   0,   2,   5,   0, 
>-      0, 128,   0,   0,  15, 144, 
>-     31,   0,   0,   2,   5,   0, 
>-      1, 128,   1,   0,  15, 144, 
>-      2,   0,   0,   3,   0,   0, 
>-      3, 192,   0,   0, 228, 144, 
>-      0,   0, 228, 160,   1,   0, 
>-      0,   2,   0,   0,  12, 192, 
>-      1,   0,  68, 160,   1,   0, 
>-      0,   2,   0,   0,   3, 224, 
>-      1,   0, 228, 144, 255, 255, 
>-      0,   0,  83,  72,  68,  82, 
>-    136,   0,   0,   0,  64,   0, 
>-      1,   0,  34,   0,   0,   0, 
>-     95,   0,   0,   3,  50,  16, 
>-     16,   0,   0,   0,   0,   0, 
>-     95,   0,   0,   3,  50,  16, 
>-     16,   0,   1,   0,   0,   0, 
>-    103,   0,   0,   4, 242,  32, 
>-     16,   0,   0,   0,   0,   0, 
>-      1,   0,   0,   0, 101,   0, 
>-      0,   3,  50,  32,  16,   0, 
>-      1,   0,   0,   0,  54,   0, 
>-      0,   5,  50,  32,  16,   0, 
>-      0,   0,   0,   0,  70,  16, 
>-     16,   0,   0,   0,   0,   0, 
>-     54,   0,   0,   8, 194,  32, 
>-     16,   0,   0,   0,   0,   0, 
>-      2,  64,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-    128,  63,  54,   0,   0,   5, 
>-     50,  32,  16,   0,   1,   0, 
>-      0,   0,  70,  16,  16,   0, 
>-      1,   0,   0,   0,  62,   0, 
>-      0,   1,  83,  84,  65,  84, 
>-    116,   0,   0,   0,   4,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   4,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   1,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   3,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-     82,  68,  69,  70,  80,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,  28,   0,   0,   0, 
>-      0,   4, 254, 255,   0,   1, 
>-      0,   0,  28,   0,   0,   0, 
>-     77, 105,  99, 114, 111, 115, 
>-    111, 102, 116,  32,  40,  82, 
>-     41,  32,  72,  76,  83,  76, 
>-     32,  83, 104,  97, 100, 101, 
>-    114,  32,  67, 111, 109, 112, 
>-    105, 108, 101, 114,  32,  54, 
>-     46,  51,  46,  57,  54,  48, 
>-     48,  46,  49,  54,  51,  56, 
>-     52,   0, 171, 171,  73,  83, 
>-     71,  78,  76,   0,   0,   0, 
>-      2,   0,   0,   0,   8,   0, 
>-      0,   0,  56,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   3,   0,   0,   0, 
>-      0,   0,   0,   0,   3,   3, 
>-      0,   0,  65,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   3,   0,   0,   0, 
>-      1,   0,   0,   0,   3,   3, 
>-      0,   0,  80,  79,  83,  73, 
>-     84,  73,  79,  78,   0,  84, 
>-     69,  88,  67,  79,  79,  82, 
>-     68,   0, 171, 171,  79,  83, 
>-     71,  78,  80,   0,   0,   0, 
>-      2,   0,   0,   0,   8,   0, 
>-      0,   0,  56,   0,   0,   0, 
>-      0,   0,   0,   0,   1,   0, 
>-      0,   0,   3,   0,   0,   0, 
>-      0,   0,   0,   0,  15,   0, 
>-      0,   0,  68,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   3,   0,   0,   0, 
>-      1,   0,   0,   0,   3,  12, 
>-      0,   0,  83,  86,  95,  80, 
>-     79,  83,  73,  84,  73,  79, 
>-     78,   0,  84,  69,  88,  67, 
>-     79,  79,  82,  68,   0, 171, 
>-    171, 171
>-};
>+const BYTE g_VS_Passthrough2D[] = {
>+    68,  88,  66,  67,  156, 85,  202, 210, 211, 104, 132, 208, 180, 71,  55,  89,  176, 127, 12,
>+    190, 1,   0,   0,   0,   216, 2,   0,   0,   6,   0,   0,   0,   56,  0,   0,   0,   200, 0,
>+    0,   0,   88,  1,   0,   0,   212, 1,   0,   0,   44,  2,   0,   0,   128, 2,   0,   0,   65,
>+    111, 110, 57,  136, 0,   0,   0,   136, 0,   0,   0,   0,   2,   254, 255, 96,  0,   0,   0,
>+    40,  0,   0,   0,   0,   0,   36,  0,   0,   0,   36,  0,   0,   0,   36,  0,   0,   0,   36,
>+    0,   1,   0,   36,  0,   0,   0,   0,   0,   1,   2,   254, 255, 81,  0,   0,   5,   1,   0,
>+    15,  160, 0,   0,   0,   0,   0,   0,   128, 63,  0,   0,   0,   0,   0,   0,   0,   0,   31,
>+    0,   0,   2,   5,   0,   0,   128, 0,   0,   15,  144, 31,  0,   0,   2,   5,   0,   1,   128,
>+    1,   0,   15,  144, 2,   0,   0,   3,   0,   0,   3,   192, 0,   0,   228, 144, 0,   0,   228,
>+    160, 1,   0,   0,   2,   0,   0,   12,  192, 1,   0,   68,  160, 1,   0,   0,   2,   0,   0,
>+    3,   224, 1,   0,   228, 144, 255, 255, 0,   0,   83,  72,  68,  82,  136, 0,   0,   0,   64,
>+    0,   1,   0,   34,  0,   0,   0,   95,  0,   0,   3,   50,  16,  16,  0,   0,   0,   0,   0,
>+    95,  0,   0,   3,   50,  16,  16,  0,   1,   0,   0,   0,   103, 0,   0,   4,   242, 32,  16,
>+    0,   0,   0,   0,   0,   1,   0,   0,   0,   101, 0,   0,   3,   50,  32,  16,  0,   1,   0,
>+    0,   0,   54,  0,   0,   5,   50,  32,  16,  0,   0,   0,   0,   0,   70,  16,  16,  0,   0,
>+    0,   0,   0,   54,  0,   0,   8,   194, 32,  16,  0,   0,   0,   0,   0,   2,   64,  0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   128, 63,  54,  0,   0,
>+    5,   50,  32,  16,  0,   1,   0,   0,   0,   70,  16,  16,  0,   1,   0,   0,   0,   62,  0,
>+    0,   1,   83,  84,  65,  84,  116, 0,   0,   0,   4,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   4,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   3,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   82,  68,  69,  70,  80,  0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   28,  0,   0,   0,   0,   4,
>+    254, 255, 0,   1,   0,   0,   28,  0,   0,   0,   77,  105, 99,  114, 111, 115, 111, 102, 116,
>+    32,  40,  82,  41,  32,  72,  76,  83,  76,  32,  83,  104, 97,  100, 101, 114, 32,  67,  111,
>+    109, 112, 105, 108, 101, 114, 32,  57,  46,  50,  57,  46,  57,  53,  50,  46,  51,  49,  49,
>+    49,  0,   171, 171, 171, 73,  83,  71,  78,  76,  0,   0,   0,   2,   0,   0,   0,   8,   0,
>+    0,   0,   56,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   3,   0,   0,   0,   0,
>+    0,   0,   0,   3,   3,   0,   0,   65,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    3,   0,   0,   0,   1,   0,   0,   0,   3,   3,   0,   0,   80,  79,  83,  73,  84,  73,  79,
>+    78,  0,   84,  69,  88,  67,  79,  79,  82,  68,  0,   171, 171, 79,  83,  71,  78,  80,  0,
>+    0,   0,   2,   0,   0,   0,   8,   0,   0,   0,   56,  0,   0,   0,   0,   0,   0,   0,   1,
>+    0,   0,   0,   3,   0,   0,   0,   0,   0,   0,   0,   15,  0,   0,   0,   68,  0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   3,   0,   0,   0,   1,   0,   0,   0,   3,   12,  0,
>+    0,   83,  86,  95,  80,  79,  83,  73,  84,  73,  79,  78,  0,   84,  69,  88,  67,  79,  79,
>+    82,  68,  0,   171, 171, 171};
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthrough3d11gs.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthrough3d11gs.h
>index ae2d9485eb0..c160ca7c656 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthrough3d11gs.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthrough3d11gs.h
>@@ -1,25 +1,29 @@
> #if 0
> //
>-// Generated by Microsoft (R) HLSL Shader Compiler 6.3.9600.16384
>+// Generated by Microsoft (R) HLSL Shader Compiler 9.29.952.3111
>+//
>+//
>+//   fxc /nologo /E GS_Passthrough3D /T gs_4_0 /Fh compiled\passthrough3d11gs.h
>+//    Passthrough3D11.hlsl
> //
> //
> //
> // Input signature:
> //
>-// Name                 Index   Mask Register SysValue  Format   Used
>-// -------------------- ----- ------ -------- -------- ------- ------
>-// SV_POSITION              0   xyzw        0      POS   float   xyzw
>-// LAYER                    0   x           1     NONE    uint   x   
>-// TEXCOORD                 0   xyz         2     NONE   float   xyz 
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_POSITION              0   xyzw        0      POS  float   xyzw
>+// LAYER                    0   x           1     NONE   uint   x   
>+// TEXCOORD                 0   xyz         2     NONE  float   xyz 
> //
> //
> // Output signature:
> //
>-// Name                 Index   Mask Register SysValue  Format   Used
>-// -------------------- ----- ------ -------- -------- ------- ------
>-// SV_POSITION              0   xyzw        0      POS   float   xyzw
>-// SV_RENDERTARGETARRAYINDEX     0   x           1  RTINDEX    uint   x   
>-// TEXCOORD                 0   xyz         2     NONE   float   xyz 
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_POSITION              0   xyzw        0      POS  float   xyzw
>+// SV_RENDERTARGETARRAYINDEX     0   x           1  RTINDEX   uint   x   
>+// TEXCOORD                 0   xyz         2     NONE  float   xyz 
> //
> gs_4_0
> dcl_input_siv v[3][0].xyzw, position
>@@ -46,146 +50,46 @@ ret
> // Approximately 11 instruction slots used
> #endif
> 
>-const BYTE g_GS_Passthrough3D[] =
>-{
>-     68,  88,  66,  67,  92, 129, 
>-     41, 170, 114,  75, 160, 250, 
>-     95, 161, 230, 161,  11,  78, 
>-    252,  65,   1,   0,   0,   0, 
>-     72,   3,   0,   0,   5,   0, 
>-      0,   0,  52,   0,   0,   0, 
>-    140,   0,   0,   0,   0,   1, 
>-      0,   0, 136,   1,   0,   0, 
>-    204,   2,   0,   0,  82,  68, 
>-     69,  70,  80,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-     28,   0,   0,   0,   0,   4, 
>-     83,  71,   0,   1,   0,   0, 
>-     28,   0,   0,   0,  77, 105, 
>-     99, 114, 111, 115, 111, 102, 
>-    116,  32,  40,  82,  41,  32, 
>-     72,  76,  83,  76,  32,  83, 
>-    104,  97, 100, 101, 114,  32, 
>-     67, 111, 109, 112, 105, 108, 
>-    101, 114,  32,  54,  46,  51, 
>-     46,  57,  54,  48,  48,  46, 
>-     49,  54,  51,  56,  52,   0, 
>-    171, 171,  73,  83,  71,  78, 
>-    108,   0,   0,   0,   3,   0, 
>-      0,   0,   8,   0,   0,   0, 
>-     80,   0,   0,   0,   0,   0, 
>-      0,   0,   1,   0,   0,   0, 
>-      3,   0,   0,   0,   0,   0, 
>-      0,   0,  15,  15,   0,   0, 
>-     92,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      1,   0,   0,   0,   1,   0, 
>-      0,   0,   1,   1,   0,   0, 
>-     98,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      3,   0,   0,   0,   2,   0, 
>-      0,   0,   7,   7,   0,   0, 
>-     83,  86,  95,  80,  79,  83, 
>-     73,  84,  73,  79,  78,   0, 
>-     76,  65,  89,  69,  82,   0, 
>-     84,  69,  88,  67,  79,  79, 
>-     82,  68,   0, 171,  79,  83, 
>-     71,  78, 128,   0,   0,   0, 
>-      3,   0,   0,   0,   8,   0, 
>-      0,   0,  80,   0,   0,   0, 
>-      0,   0,   0,   0,   1,   0, 
>-      0,   0,   3,   0,   0,   0, 
>-      0,   0,   0,   0,  15,   0, 
>-      0,   0,  92,   0,   0,   0, 
>-      0,   0,   0,   0,   4,   0, 
>-      0,   0,   1,   0,   0,   0, 
>-      1,   0,   0,   0,   1,  14, 
>-      0,   0, 118,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   3,   0,   0,   0, 
>-      2,   0,   0,   0,   7,   8, 
>-      0,   0,  83,  86,  95,  80, 
>-     79,  83,  73,  84,  73,  79, 
>-     78,   0,  83,  86,  95,  82, 
>-     69,  78,  68,  69,  82,  84, 
>-     65,  82,  71,  69,  84,  65, 
>-     82,  82,  65,  89,  73,  78, 
>-     68,  69,  88,   0,  84,  69, 
>-     88,  67,  79,  79,  82,  68, 
>-      0, 171,  83,  72,  68,  82, 
>-     60,   1,   0,   0,  64,   0, 
>-      2,   0,  79,   0,   0,   0, 
>-     97,   0,   0,   5, 242,  16, 
>-     32,   0,   3,   0,   0,   0, 
>-      0,   0,   0,   0,   1,   0, 
>-      0,   0,  95,   0,   0,   4, 
>-     18,  16,  32,   0,   3,   0, 
>-      0,   0,   1,   0,   0,   0, 
>-     95,   0,   0,   4, 114,  16, 
>-     32,   0,   3,   0,   0,   0, 
>-      2,   0,   0,   0, 104,   0, 
>-      0,   2,   1,   0,   0,   0, 
>-     93,  24,   0,   1,  92,  40, 
>-      0,   1, 103,   0,   0,   4, 
>-    242,  32,  16,   0,   0,   0, 
>-      0,   0,   1,   0,   0,   0, 
>-    103,   0,   0,   4,  18,  32, 
>-     16,   0,   1,   0,   0,   0, 
>-      4,   0,   0,   0, 101,   0, 
>-      0,   3, 114,  32,  16,   0, 
>-      2,   0,   0,   0,  94,   0, 
>-      0,   2,   3,   0,   0,   0, 
>-     54,   0,   0,   5,  18,   0, 
>-     16,   0,   0,   0,   0,   0, 
>-      1,  64,   0,   0,   0,   0, 
>-      0,   0,  48,   0,   0,   1, 
>-     33,   0,   0,   7,  34,   0, 
>-     16,   0,   0,   0,   0,   0, 
>-     10,   0,  16,   0,   0,   0, 
>-      0,   0,   1,  64,   0,   0, 
>-      3,   0,   0,   0,   3,   0, 
>-      4,   3,  26,   0,  16,   0, 
>-      0,   0,   0,   0,  54,   0, 
>-      0,   7, 242,  32,  16,   0, 
>-      0,   0,   0,   0,  70,  30, 
>-    160,   0,  10,   0,  16,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,  54,   0,   0,   7, 
>-     18,  32,  16,   0,   1,   0, 
>-      0,   0,  10,  16, 160,   0, 
>-     10,   0,  16,   0,   0,   0, 
>-      0,   0,   1,   0,   0,   0, 
>-     54,   0,   0,   7, 114,  32, 
>-     16,   0,   2,   0,   0,   0, 
>-     70,  18, 160,   0,  10,   0, 
>-     16,   0,   0,   0,   0,   0, 
>-      2,   0,   0,   0,  19,   0, 
>-      0,   1,  30,   0,   0,   7, 
>-     18,   0,  16,   0,   0,   0, 
>-      0,   0,  10,   0,  16,   0, 
>-      0,   0,   0,   0,   1,  64, 
>-      0,   0,   1,   0,   0,   0, 
>-     22,   0,   0,   1,  62,   0, 
>-      0,   1,  83,  84,  65,  84, 
>-    116,   0,   0,   0,  11,   0, 
>-      0,   0,   1,   0,   0,   0, 
>-      0,   0,   0,   0,   6,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      2,   0,   0,   0,   0,   0, 
>-      0,   0,   1,   0,   0,   0, 
>-      1,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   1,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   1,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      3,   0,   0,   0,   5,   0, 
>-      0,   0,   3,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0
>-};
>+const BYTE g_GS_Passthrough3D[] = {
>+    68,  88,  66,  67, 180, 53, 93,  23, 14,  237, 172, 99,  214, 91,  125, 123, 81,  232, 165, 207,
>+    1,   0,   0,   0,  72,  3,  0,   0,  5,   0,   0,   0,   52,  0,   0,   0,   140, 0,   0,   0,
>+    0,   1,   0,   0,  136, 1,  0,   0,  204, 2,   0,   0,   82,  68,  69,  70,  80,  0,   0,   0,
>+    0,   0,   0,   0,  0,   0,  0,   0,  0,   0,   0,   0,   28,  0,   0,   0,   0,   4,   83,  71,
>+    0,   1,   0,   0,  28,  0,  0,   0,  77,  105, 99,  114, 111, 115, 111, 102, 116, 32,  40,  82,
>+    41,  32,  72,  76, 83,  76, 32,  83, 104, 97,  100, 101, 114, 32,  67,  111, 109, 112, 105, 108,
>+    101, 114, 32,  57, 46,  50, 57,  46, 57,  53,  50,  46,  51,  49,  49,  49,  0,   171, 171, 171,
>+    73,  83,  71,  78, 108, 0,  0,   0,  3,   0,   0,   0,   8,   0,   0,   0,   80,  0,   0,   0,
>+    0,   0,   0,   0,  1,   0,  0,   0,  3,   0,   0,   0,   0,   0,   0,   0,   15,  15,  0,   0,
>+    92,  0,   0,   0,  0,   0,  0,   0,  0,   0,   0,   0,   1,   0,   0,   0,   1,   0,   0,   0,
>+    1,   1,   0,   0,  98,  0,  0,   0,  0,   0,   0,   0,   0,   0,   0,   0,   3,   0,   0,   0,
>+    2,   0,   0,   0,  7,   7,  0,   0,  83,  86,  95,  80,  79,  83,  73,  84,  73,  79,  78,  0,
>+    76,  65,  89,  69, 82,  0,  84,  69, 88,  67,  79,  79,  82,  68,  0,   171, 79,  83,  71,  78,
>+    128, 0,   0,   0,  3,   0,  0,   0,  8,   0,   0,   0,   80,  0,   0,   0,   0,   0,   0,   0,
>+    1,   0,   0,   0,  3,   0,  0,   0,  0,   0,   0,   0,   15,  0,   0,   0,   92,  0,   0,   0,
>+    0,   0,   0,   0,  4,   0,  0,   0,  1,   0,   0,   0,   1,   0,   0,   0,   1,   14,  0,   0,
>+    118, 0,   0,   0,  0,   0,  0,   0,  0,   0,   0,   0,   3,   0,   0,   0,   2,   0,   0,   0,
>+    7,   8,   0,   0,  83,  86, 95,  80, 79,  83,  73,  84,  73,  79,  78,  0,   83,  86,  95,  82,
>+    69,  78,  68,  69, 82,  84, 65,  82, 71,  69,  84,  65,  82,  82,  65,  89,  73,  78,  68,  69,
>+    88,  0,   84,  69, 88,  67, 79,  79, 82,  68,  0,   171, 83,  72,  68,  82,  60,  1,   0,   0,
>+    64,  0,   2,   0,  79,  0,  0,   0,  97,  0,   0,   5,   242, 16,  32,  0,   3,   0,   0,   0,
>+    0,   0,   0,   0,  1,   0,  0,   0,  95,  0,   0,   4,   18,  16,  32,  0,   3,   0,   0,   0,
>+    1,   0,   0,   0,  95,  0,  0,   4,  114, 16,  32,  0,   3,   0,   0,   0,   2,   0,   0,   0,
>+    104, 0,   0,   2,  1,   0,  0,   0,  93,  24,  0,   1,   92,  40,  0,   1,   103, 0,   0,   4,
>+    242, 32,  16,  0,  0,   0,  0,   0,  1,   0,   0,   0,   103, 0,   0,   4,   18,  32,  16,  0,
>+    1,   0,   0,   0,  4,   0,  0,   0,  101, 0,   0,   3,   114, 32,  16,  0,   2,   0,   0,   0,
>+    94,  0,   0,   2,  3,   0,  0,   0,  54,  0,   0,   5,   18,  0,   16,  0,   0,   0,   0,   0,
>+    1,   64,  0,   0,  0,   0,  0,   0,  48,  0,   0,   1,   33,  0,   0,   7,   34,  0,   16,  0,
>+    0,   0,   0,   0,  10,  0,  16,  0,  0,   0,   0,   0,   1,   64,  0,   0,   3,   0,   0,   0,
>+    3,   0,   4,   3,  26,  0,  16,  0,  0,   0,   0,   0,   54,  0,   0,   7,   242, 32,  16,  0,
>+    0,   0,   0,   0,  70,  30, 160, 0,  10,  0,   16,  0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    54,  0,   0,   7,  18,  32, 16,  0,  1,   0,   0,   0,   10,  16,  160, 0,   10,  0,   16,  0,
>+    0,   0,   0,   0,  1,   0,  0,   0,  54,  0,   0,   7,   114, 32,  16,  0,   2,   0,   0,   0,
>+    70,  18,  160, 0,  10,  0,  16,  0,  0,   0,   0,   0,   2,   0,   0,   0,   19,  0,   0,   1,
>+    30,  0,   0,   7,  18,  0,  16,  0,  0,   0,   0,   0,   10,  0,   16,  0,   0,   0,   0,   0,
>+    1,   64,  0,   0,  1,   0,  0,   0,  22,  0,   0,   1,   62,  0,   0,   1,   83,  84,  65,  84,
>+    116, 0,   0,   0,  11,  0,  0,   0,  1,   0,   0,   0,   0,   0,   0,   0,   6,   0,   0,   0,
>+    0,   0,   0,   0,  2,   0,  0,   0,  0,   0,   0,   0,   1,   0,   0,   0,   1,   0,   0,   0,
>+    0,   0,   0,   0,  0,   0,  0,   0,  0,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,
>+    0,   0,   0,   0,  0,   0,  0,   0,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    11,  0,   0,   0,  0,   0,  0,   0,  0,   0,   0,   0,   0,   0,   0,   0,   3,   0,   0,   0,
>+    5,   0,   0,   0,  3,   0,  0,   0,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0};
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthrough3d11vs.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthrough3d11vs.h
>index 5701a4036a1..8141a358172 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthrough3d11vs.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthrough3d11vs.h
>@@ -1,25 +1,29 @@
> #if 0
> //
>-// Generated by Microsoft (R) HLSL Shader Compiler 6.3.9600.16384
>+// Generated by Microsoft (R) HLSL Shader Compiler 9.29.952.3111
>+//
>+//
>+//   fxc /nologo /E VS_Passthrough3D /T vs_4_0 /Fh compiled\passthrough3d11vs.h
>+//    Passthrough3D11.hlsl
> //
> //
> //
> // Input signature:
> //
>-// Name                 Index   Mask Register SysValue  Format   Used
>-// -------------------- ----- ------ -------- -------- ------- ------
>-// POSITION                 0   xy          0     NONE   float   xy  
>-// LAYER                    0   x           1     NONE    uint   x   
>-// TEXCOORD                 0   xyz         2     NONE   float   xyz 
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// POSITION                 0   xy          0     NONE  float   xy  
>+// LAYER                    0   x           1     NONE   uint   x   
>+// TEXCOORD                 0   xyz         2     NONE  float   xyz 
> //
> //
> // Output signature:
> //
>-// Name                 Index   Mask Register SysValue  Format   Used
>-// -------------------- ----- ------ -------- -------- ------- ------
>-// SV_POSITION              0   xyzw        0      POS   float   xyzw
>-// LAYER                    0   x           1     NONE    uint   x   
>-// TEXCOORD                 0   xyz         2     NONE   float   xyz 
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_POSITION              0   xyzw        0      POS  float   xyzw
>+// LAYER                    0   x           1     NONE   uint   x   
>+// TEXCOORD                 0   xyz         2     NONE  float   xyz 
> //
> vs_4_0
> dcl_input v0.xy
>@@ -36,120 +40,40 @@ ret
> // Approximately 5 instruction slots used
> #endif
> 
>-const BYTE g_VS_Passthrough3D[] =
>-{
>-     68,  88,  66,  67, 229,  65, 
>-    217, 172, 143, 180, 152,  72, 
>-     16,  12, 254,  66,   0, 215, 
>-     50, 173,   1,   0,   0,   0, 
>-    168,   2,   0,   0,   5,   0, 
>-      0,   0,  52,   0,   0,   0, 
>-    140,   0,   0,   0, 252,   0, 
>-      0,   0, 112,   1,   0,   0, 
>-     44,   2,   0,   0,  82,  68, 
>-     69,  70,  80,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-     28,   0,   0,   0,   0,   4, 
>-    254, 255,   0,   1,   0,   0, 
>-     28,   0,   0,   0,  77, 105, 
>-     99, 114, 111, 115, 111, 102, 
>-    116,  32,  40,  82,  41,  32, 
>-     72,  76,  83,  76,  32,  83, 
>-    104,  97, 100, 101, 114,  32, 
>-     67, 111, 109, 112, 105, 108, 
>-    101, 114,  32,  54,  46,  51, 
>-     46,  57,  54,  48,  48,  46, 
>-     49,  54,  51,  56,  52,   0, 
>-    171, 171,  73,  83,  71,  78, 
>-    104,   0,   0,   0,   3,   0, 
>-      0,   0,   8,   0,   0,   0, 
>-     80,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      3,   0,   0,   0,   0,   0, 
>-      0,   0,   3,   3,   0,   0, 
>-     89,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      1,   0,   0,   0,   1,   0, 
>-      0,   0,   1,   1,   0,   0, 
>-     95,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      3,   0,   0,   0,   2,   0, 
>-      0,   0,   7,   7,   0,   0, 
>-     80,  79,  83,  73,  84,  73, 
>-     79,  78,   0,  76,  65,  89, 
>-     69,  82,   0,  84,  69,  88, 
>-     67,  79,  79,  82,  68,   0, 
>-     79,  83,  71,  78, 108,   0, 
>-      0,   0,   3,   0,   0,   0, 
>-      8,   0,   0,   0,  80,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      1,   0,   0,   0,   3,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-     15,   0,   0,   0,  92,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   1,   0, 
>-      0,   0,   1,   0,   0,   0, 
>-      1,  14,   0,   0,  98,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   3,   0, 
>-      0,   0,   2,   0,   0,   0, 
>-      7,   8,   0,   0,  83,  86, 
>-     95,  80,  79,  83,  73,  84, 
>-     73,  79,  78,   0,  76,  65, 
>-     89,  69,  82,   0,  84,  69, 
>-     88,  67,  79,  79,  82,  68, 
>-      0, 171,  83,  72,  68,  82, 
>-    180,   0,   0,   0,  64,   0, 
>-      1,   0,  45,   0,   0,   0, 
>-     95,   0,   0,   3,  50,  16, 
>-     16,   0,   0,   0,   0,   0, 
>-     95,   0,   0,   3,  18,  16, 
>-     16,   0,   1,   0,   0,   0, 
>-     95,   0,   0,   3, 114,  16, 
>-     16,   0,   2,   0,   0,   0, 
>-    103,   0,   0,   4, 242,  32, 
>-     16,   0,   0,   0,   0,   0, 
>-      1,   0,   0,   0, 101,   0, 
>-      0,   3,  18,  32,  16,   0, 
>-      1,   0,   0,   0, 101,   0, 
>-      0,   3, 114,  32,  16,   0, 
>-      2,   0,   0,   0,  54,   0, 
>-      0,   5,  50,  32,  16,   0, 
>-      0,   0,   0,   0,  70,  16, 
>-     16,   0,   0,   0,   0,   0, 
>-     54,   0,   0,   8, 194,  32, 
>-     16,   0,   0,   0,   0,   0, 
>-      2,  64,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-    128,  63,  54,   0,   0,   5, 
>-     18,  32,  16,   0,   1,   0, 
>-      0,   0,  10,  16,  16,   0, 
>-      1,   0,   0,   0,  54,   0, 
>-      0,   5, 114,  32,  16,   0, 
>-      2,   0,   0,   0,  70,  18, 
>-     16,   0,   2,   0,   0,   0, 
>-     62,   0,   0,   1,  83,  84, 
>-     65,  84, 116,   0,   0,   0, 
>-      5,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      6,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   1,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   4,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0
>-};
>+const BYTE g_VS_Passthrough3D[] = {
>+    68,  88,  66,  67,  9,   205, 109, 150, 157, 96,  223, 251, 107, 10,  208, 179, 211, 20,  141,
>+    130, 1,   0,   0,   0,   168, 2,   0,   0,   5,   0,   0,   0,   52,  0,   0,   0,   140, 0,
>+    0,   0,   252, 0,   0,   0,   112, 1,   0,   0,   44,  2,   0,   0,   82,  68,  69,  70,  80,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   28,  0,   0,   0,
>+    0,   4,   254, 255, 0,   1,   0,   0,   28,  0,   0,   0,   77,  105, 99,  114, 111, 115, 111,
>+    102, 116, 32,  40,  82,  41,  32,  72,  76,  83,  76,  32,  83,  104, 97,  100, 101, 114, 32,
>+    67,  111, 109, 112, 105, 108, 101, 114, 32,  57,  46,  50,  57,  46,  57,  53,  50,  46,  51,
>+    49,  49,  49,  0,   171, 171, 171, 73,  83,  71,  78,  104, 0,   0,   0,   3,   0,   0,   0,
>+    8,   0,   0,   0,   80,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   3,   0,   0,
>+    0,   0,   0,   0,   0,   3,   3,   0,   0,   89,  0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   1,   0,   0,   0,   1,   0,   0,   0,   1,   1,   0,   0,   95,  0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   3,   0,   0,   0,   2,   0,   0,   0,   7,   7,   0,   0,
>+    80,  79,  83,  73,  84,  73,  79,  78,  0,   76,  65,  89,  69,  82,  0,   84,  69,  88,  67,
>+    79,  79,  82,  68,  0,   79,  83,  71,  78,  108, 0,   0,   0,   3,   0,   0,   0,   8,   0,
>+    0,   0,   80,  0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   3,   0,   0,   0,   0,
>+    0,   0,   0,   15,  0,   0,   0,   92,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    1,   0,   0,   0,   1,   0,   0,   0,   1,   14,  0,   0,   98,  0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   3,   0,   0,   0,   2,   0,   0,   0,   7,   8,   0,   0,   83,  86,
>+    95,  80,  79,  83,  73,  84,  73,  79,  78,  0,   76,  65,  89,  69,  82,  0,   84,  69,  88,
>+    67,  79,  79,  82,  68,  0,   171, 83,  72,  68,  82,  180, 0,   0,   0,   64,  0,   1,   0,
>+    45,  0,   0,   0,   95,  0,   0,   3,   50,  16,  16,  0,   0,   0,   0,   0,   95,  0,   0,
>+    3,   18,  16,  16,  0,   1,   0,   0,   0,   95,  0,   0,   3,   114, 16,  16,  0,   2,   0,
>+    0,   0,   103, 0,   0,   4,   242, 32,  16,  0,   0,   0,   0,   0,   1,   0,   0,   0,   101,
>+    0,   0,   3,   18,  32,  16,  0,   1,   0,   0,   0,   101, 0,   0,   3,   114, 32,  16,  0,
>+    2,   0,   0,   0,   54,  0,   0,   5,   50,  32,  16,  0,   0,   0,   0,   0,   70,  16,  16,
>+    0,   0,   0,   0,   0,   54,  0,   0,   8,   194, 32,  16,  0,   0,   0,   0,   0,   2,   64,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   128, 63,  54,
>+    0,   0,   5,   18,  32,  16,  0,   1,   0,   0,   0,   10,  16,  16,  0,   1,   0,   0,   0,
>+    54,  0,   0,   5,   114, 32,  16,  0,   2,   0,   0,   0,   70,  18,  16,  0,   2,   0,   0,
>+    0,   62,  0,   0,   1,   83,  84,  65,  84,  116, 0,   0,   0,   5,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   6,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   4,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0};
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthrougha2d11ps.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthrougha2d11ps.h
>index a9ac5cd23bd..86e33998130 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthrougha2d11ps.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthrougha2d11ps.h
>@@ -1,6 +1,10 @@
> #if 0
> //
>-// Generated by Microsoft (R) HLSL Shader Compiler 6.3.9600.16384
>+// Generated by Microsoft (R) HLSL Shader Compiler 9.29.952.3111
>+//
>+//
>+//   fxc /nologo /E PS_PassthroughA2D /T ps_4_0_level_9_3 /Fh
>+//    compiled\passthrougha2d11ps.h Passthrough2D11.hlsl
> //
> //
> // Resource Bindings:
>@@ -14,24 +18,24 @@
> //
> // Input signature:
> //
>-// Name                 Index   Mask Register SysValue  Format   Used
>-// -------------------- ----- ------ -------- -------- ------- ------
>-// SV_POSITION              0   xyzw        0      POS   float
>-// TEXCOORD                 0   xy          1     NONE   float   xy
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_POSITION              0   xyzw        0      POS  float       
>+// TEXCOORD                 0   xy          1     NONE  float   xy  
> //
> //
> // Output signature:
> //
>-// Name                 Index   Mask Register SysValue  Format   Used
>-// -------------------- ----- ------ -------- -------- ------- ------
>-// SV_TARGET                0   xyzw        0   TARGET   float   xyzw
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_TARGET                0   xyzw        0   TARGET  float   xyzw
> //
> //
> // Sampler/Resource to DX9 shader sampler mappings:
> //
> // Target Sampler Source Sampler  Source Resource
> // -------------- --------------- ----------------
>-// s0             s0              t0
>+// s0             s0              t0               
> //
> //
> // Level9 shader bytecode:
>@@ -54,13 +58,13 @@ dcl_temps 1
> sample r0.xyzw, v1.xyxx, t0.xyzw, s0
> mov o0.w, r0.w
> mov o0.xyz, l(0,0,0,0)
>-ret
>+ret 
> // Approximately 4 instruction slots used
> #endif
> 
> const BYTE g_PS_PassthroughA2D[] = {
>-    68,  88,  66,  67,  187, 163, 203, 246, 197, 116, 209, 102, 237, 185, 161, 94,  217, 199, 47,
>-    200, 1,   0,   0,   0,   36,  3,   0,   0,   6,   0,   0,   0,   56,  0,   0,   0,   204, 0,
>+    68,  88,  66,  67,  17,  105, 185, 134, 195, 189, 174, 192, 122, 0,   85,  229, 126, 190, 30,
>+    125, 1,   0,   0,   0,   36,  3,   0,   0,   6,   0,   0,   0,   56,  0,   0,   0,   204, 0,
>     0,   0,   116, 1,   0,   0,   240, 1,   0,   0,   152, 2,   0,   0,   240, 2,   0,   0,   65,
>     111, 110, 57,  140, 0,   0,   0,   140, 0,   0,   0,   0,   2,   255, 255, 100, 0,   0,   0,
>     40,  0,   0,   0,   0,   0,   40,  0,   0,   0,   40,  0,   0,   0,   40,  0,   1,   0,   36,
>@@ -93,7 +97,7 @@ const BYTE g_PS_PassthroughA2D[] = {
>     0,   0,   0,   13,  0,   0,   0,   83,  97,  109, 112, 108, 101, 114, 0,   84,  101, 120, 116,
>     117, 114, 101, 70,  0,   77,  105, 99,  114, 111, 115, 111, 102, 116, 32,  40,  82,  41,  32,
>     72,  76,  83,  76,  32,  83,  104, 97,  100, 101, 114, 32,  67,  111, 109, 112, 105, 108, 101,
>-    114, 32,  54,  46,  51,  46,  57,  54,  48,  48,  46,  49,  54,  51,  56,  52,  0,   171, 73,
>+    114, 32,  57,  46,  50,  57,  46,  57,  53,  50,  46,  51,  49,  49,  49,  0,   171, 171, 73,
>     83,  71,  78,  80,  0,   0,   0,   2,   0,   0,   0,   8,   0,   0,   0,   56,  0,   0,   0,
>     0,   0,   0,   0,   1,   0,   0,   0,   3,   0,   0,   0,   0,   0,   0,   0,   15,  0,   0,
>     0,   68,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   3,   0,   0,   0,   1,   0,
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughdepth2d11ps.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughdepth2d11ps.h
>index 38acea3aa71..b49bda2d8a9 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughdepth2d11ps.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughdepth2d11ps.h
>@@ -1,6 +1,10 @@
> #if 0
> //
>-// Generated by Microsoft (R) HLSL Shader Compiler 6.3.9600.16384
>+// Generated by Microsoft (R) HLSL Shader Compiler 9.29.952.3111
>+//
>+//
>+//   fxc /nologo /E PS_PassthroughDepth2D /T ps_4_0 /Fh
>+//    compiled\passthroughdepth2d11ps.h Passthrough2D11.hlsl
> //
> //
> // Resource Bindings:
>@@ -14,17 +18,17 @@
> //
> // Input signature:
> //
>-// Name                 Index   Mask Register SysValue  Format   Used
>-// -------------------- ----- ------ -------- -------- ------- ------
>-// SV_POSITION              0   xyzw        0      POS   float       
>-// TEXCOORD                 0   xy          1     NONE   float   xy  
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_POSITION              0   xyzw        0      POS  float       
>+// TEXCOORD                 0   xy          1     NONE  float   xy  
> //
> //
> // Output signature:
> //
>-// Name                 Index   Mask Register SysValue  Format   Used
>-// -------------------- ----- ------ -------- -------- ------- ------
>-// SV_DEPTH                 0    N/A   oDepth    DEPTH   float    YES
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_DEPTH                 0    N/A   oDepth    DEPTH  float    YES
> //
> ps_4_0
> dcl_sampler s0, mode_default
>@@ -38,108 +42,37 @@ ret
> // Approximately 3 instruction slots used
> #endif
> 
>-const BYTE g_PS_PassthroughDepth2D[] =
>-{
>-     68,  88,  66,  67,   8,  33, 
>-    154,  92, 164,  28, 139, 205, 
>-      1, 168,  30, 229,  51, 127, 
>-    173, 221,   1,   0,   0,   0, 
>-    100,   2,   0,   0,   5,   0, 
>-      0,   0,  52,   0,   0,   0, 
>-    220,   0,   0,   0,  52,   1, 
>-      0,   0, 104,   1,   0,   0, 
>-    232,   1,   0,   0,  82,  68, 
>-     69,  70, 160,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   2,   0,   0,   0, 
>-     28,   0,   0,   0,   0,   4, 
>-    255, 255,   0,   1,   0,   0, 
>-    109,   0,   0,   0,  92,   0, 
>-      0,   0,   3,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   1,   0, 
>-      0,   0,   1,   0,   0,   0, 
>-    100,   0,   0,   0,   2,   0, 
>-      0,   0,   5,   0,   0,   0, 
>-      4,   0,   0,   0, 255, 255, 
>-    255, 255,   0,   0,   0,   0, 
>-      1,   0,   0,   0,  13,   0, 
>-      0,   0,  83,  97, 109, 112, 
>-    108, 101, 114,   0,  84, 101, 
>-    120, 116, 117, 114, 101,  70, 
>-      0,  77, 105,  99, 114, 111, 
>-    115, 111, 102, 116,  32,  40, 
>-     82,  41,  32,  72,  76,  83, 
>-     76,  32,  83, 104,  97, 100, 
>-    101, 114,  32,  67, 111, 109, 
>-    112, 105, 108, 101, 114,  32, 
>-     54,  46,  51,  46,  57,  54, 
>-     48,  48,  46,  49,  54,  51, 
>-     56,  52,   0, 171,  73,  83, 
>-     71,  78,  80,   0,   0,   0, 
>-      2,   0,   0,   0,   8,   0, 
>-      0,   0,  56,   0,   0,   0, 
>-      0,   0,   0,   0,   1,   0, 
>-      0,   0,   3,   0,   0,   0, 
>-      0,   0,   0,   0,  15,   0, 
>-      0,   0,  68,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   3,   0,   0,   0, 
>-      1,   0,   0,   0,   3,   3, 
>-      0,   0,  83,  86,  95,  80, 
>-     79,  83,  73,  84,  73,  79, 
>-     78,   0,  84,  69,  88,  67, 
>-     79,  79,  82,  68,   0, 171, 
>-    171, 171,  79,  83,  71,  78, 
>-     44,   0,   0,   0,   1,   0, 
>-      0,   0,   8,   0,   0,   0, 
>-     32,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      3,   0,   0,   0, 255, 255, 
>-    255, 255,   1,  14,   0,   0, 
>-     83,  86,  95,  68,  69,  80, 
>-     84,  72,   0, 171, 171, 171, 
>-     83,  72,  68,  82, 120,   0, 
>-      0,   0,  64,   0,   0,   0, 
>-     30,   0,   0,   0,  90,   0, 
>-      0,   3,   0,  96,  16,   0, 
>-      0,   0,   0,   0,  88,  24, 
>-      0,   4,   0, 112,  16,   0, 
>-      0,   0,   0,   0,  85,  85, 
>-      0,   0,  98,  16,   0,   3, 
>-     50,  16,  16,   0,   1,   0, 
>-      0,   0, 101,   0,   0,   2, 
>-      1, 192,   0,   0, 104,   0, 
>-      0,   2,   1,   0,   0,   0, 
>-     69,   0,   0,   9, 242,   0, 
>-     16,   0,   0,   0,   0,   0, 
>-     70,  16,  16,   0,   1,   0, 
>-      0,   0,  70, 126,  16,   0, 
>-      0,   0,   0,   0,   0,  96, 
>-     16,   0,   0,   0,   0,   0, 
>-     54,   0,   0,   4,   1, 192, 
>-      0,   0,  10,   0,  16,   0, 
>-      0,   0,   0,   0,  62,   0, 
>-      0,   1,  83,  84,  65,  84, 
>-    116,   0,   0,   0,   3,   0, 
>-      0,   0,   1,   0,   0,   0, 
>-      0,   0,   0,   0,   2,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   1,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      1,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   1,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0
>-};
>+const BYTE g_PS_PassthroughDepth2D[] = {
>+    68,  88,  66,  67,  18,  100, 210, 152, 138, 132, 5,   51,  93,  169, 189, 245, 32,  164, 14,
>+    233, 1,   0,   0,   0,   100, 2,   0,   0,   5,   0,   0,   0,   52,  0,   0,   0,   220, 0,
>+    0,   0,   52,  1,   0,   0,   104, 1,   0,   0,   232, 1,   0,   0,   82,  68,  69,  70,  160,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   2,   0,   0,   0,   28,  0,   0,   0,
>+    0,   4,   255, 255, 0,   1,   0,   0,   109, 0,   0,   0,   92,  0,   0,   0,   3,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,
>+    0,   0,   1,   0,   0,   0,   100, 0,   0,   0,   2,   0,   0,   0,   5,   0,   0,   0,   4,
>+    0,   0,   0,   255, 255, 255, 255, 0,   0,   0,   0,   1,   0,   0,   0,   13,  0,   0,   0,
>+    83,  97,  109, 112, 108, 101, 114, 0,   84,  101, 120, 116, 117, 114, 101, 70,  0,   77,  105,
>+    99,  114, 111, 115, 111, 102, 116, 32,  40,  82,  41,  32,  72,  76,  83,  76,  32,  83,  104,
>+    97,  100, 101, 114, 32,  67,  111, 109, 112, 105, 108, 101, 114, 32,  57,  46,  50,  57,  46,
>+    57,  53,  50,  46,  51,  49,  49,  49,  0,   171, 171, 73,  83,  71,  78,  80,  0,   0,   0,
>+    2,   0,   0,   0,   8,   0,   0,   0,   56,  0,   0,   0,   0,   0,   0,   0,   1,   0,   0,
>+    0,   3,   0,   0,   0,   0,   0,   0,   0,   15,  0,   0,   0,   68,  0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   3,   0,   0,   0,   1,   0,   0,   0,   3,   3,   0,   0,   83,
>+    86,  95,  80,  79,  83,  73,  84,  73,  79,  78,  0,   84,  69,  88,  67,  79,  79,  82,  68,
>+    0,   171, 171, 171, 79,  83,  71,  78,  44,  0,   0,   0,   1,   0,   0,   0,   8,   0,   0,
>+    0,   32,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   3,   0,   0,   0,   255, 255,
>+    255, 255, 1,   14,  0,   0,   83,  86,  95,  68,  69,  80,  84,  72,  0,   171, 171, 171, 83,
>+    72,  68,  82,  120, 0,   0,   0,   64,  0,   0,   0,   30,  0,   0,   0,   90,  0,   0,   3,
>+    0,   96,  16,  0,   0,   0,   0,   0,   88,  24,  0,   4,   0,   112, 16,  0,   0,   0,   0,
>+    0,   85,  85,  0,   0,   98,  16,  0,   3,   50,  16,  16,  0,   1,   0,   0,   0,   101, 0,
>+    0,   2,   1,   192, 0,   0,   104, 0,   0,   2,   1,   0,   0,   0,   69,  0,   0,   9,   242,
>+    0,   16,  0,   0,   0,   0,   0,   70,  16,  16,  0,   1,   0,   0,   0,   70,  126, 16,  0,
>+    0,   0,   0,   0,   0,   96,  16,  0,   0,   0,   0,   0,   54,  0,   0,   4,   1,   192, 0,
>+    0,   10,  0,   16,  0,   0,   0,   0,   0,   62,  0,   0,   1,   83,  84,  65,  84,  116, 0,
>+    0,   0,   3,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   2,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0};
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughlum2d11ps.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughlum2d11ps.h
>index e0bcbc8fe64..7b641c98bc2 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughlum2d11ps.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughlum2d11ps.h
>@@ -1,6 +1,10 @@
> #if 0
> //
>-// Generated by Microsoft (R) HLSL Shader Compiler 6.3.9600.16384
>+// Generated by Microsoft (R) HLSL Shader Compiler 9.29.952.3111
>+//
>+//
>+//   fxc /nologo /E PS_PassthroughLum2D /T ps_4_0_level_9_3 /Fh
>+//    compiled\passthroughlum2d11ps.h Passthrough2D11.hlsl
> //
> //
> // Resource Bindings:
>@@ -14,17 +18,17 @@
> //
> // Input signature:
> //
>-// Name                 Index   Mask Register SysValue  Format   Used
>-// -------------------- ----- ------ -------- -------- ------- ------
>-// SV_POSITION              0   xyzw        0      POS   float       
>-// TEXCOORD                 0   xy          1     NONE   float   xy  
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_POSITION              0   xyzw        0      POS  float       
>+// TEXCOORD                 0   xy          1     NONE  float   xy  
> //
> //
> // Output signature:
> //
>-// Name                 Index   Mask Register SysValue  Format   Used
>-// -------------------- ----- ------ -------- -------- ------- ------
>-// SV_TARGET                0   xyzw        0   TARGET   float   xyzw
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_TARGET                0   xyzw        0   TARGET  float   xyzw
> //
> //
> // Sampler/Resource to DX9 shader sampler mappings:
>@@ -58,139 +62,46 @@ ret
> // Approximately 4 instruction slots used
> #endif
> 
>-const BYTE g_PS_PassthroughLum2D[] =
>-{
>-     68,  88,  66,  67, 144,  18, 
>-    242,  89, 150, 125,  18, 219, 
>-    193, 196, 127, 207,  14, 165, 
>-    198, 119,   1,   0,   0,   0, 
>-     28,   3,   0,   0,   6,   0, 
>-      0,   0,  56,   0,   0,   0, 
>-    208,   0,   0,   0, 108,   1, 
>-      0,   0, 232,   1,   0,   0, 
>-    144,   2,   0,   0, 232,   2, 
>-      0,   0,  65, 111, 110,  57, 
>-    144,   0,   0,   0, 144,   0, 
>-      0,   0,   0,   2, 255, 255, 
>-    104,   0,   0,   0,  40,   0, 
>-      0,   0,   0,   0,  40,   0, 
>-      0,   0,  40,   0,   0,   0, 
>-     40,   0,   1,   0,  36,   0, 
>-      0,   0,  40,   0,   0,   0, 
>-      0,   0,   1,   2, 255, 255, 
>-     81,   0,   0,   5,   0,   0, 
>-     15, 160,   0,   0, 128,  63, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-     31,   0,   0,   2,   0,   0, 
>-      0, 128,   0,   0,   3, 176, 
>-     31,   0,   0,   2,   0,   0, 
>-      0, 144,   0,   8,  15, 160, 
>-     66,   0,   0,   3,   0,   0, 
>-     15, 128,   0,   0, 228, 176, 
>-      0,   8, 228, 160,   4,   0, 
>-      0,   4,   0,   0,  15, 128, 
>-      0,   0,   0, 128,   0,   0, 
>-     64, 160,   0,   0,  21, 160, 
>-      1,   0,   0,   2,   0,   8, 
>-     15, 128,   0,   0, 228, 128, 
>-    255, 255,   0,   0,  83,  72, 
>-     68,  82, 148,   0,   0,   0, 
>-     64,   0,   0,   0,  37,   0, 
>-      0,   0,  90,   0,   0,   3, 
>-      0,  96,  16,   0,   0,   0, 
>-      0,   0,  88,  24,   0,   4, 
>-      0, 112,  16,   0,   0,   0, 
>-      0,   0,  85,  85,   0,   0, 
>-     98,  16,   0,   3,  50,  16, 
>-     16,   0,   1,   0,   0,   0, 
>-    101,   0,   0,   3, 242,  32, 
>-     16,   0,   0,   0,   0,   0, 
>-    104,   0,   0,   2,   1,   0, 
>-      0,   0,  69,   0,   0,   9, 
>-    242,   0,  16,   0,   0,   0, 
>-      0,   0,  70,  16,  16,   0, 
>-      1,   0,   0,   0,  70, 126, 
>-     16,   0,   0,   0,   0,   0, 
>-      0,  96,  16,   0,   0,   0, 
>-      0,   0,  54,   0,   0,   5, 
>-    114,  32,  16,   0,   0,   0, 
>-      0,   0,   6,   0,  16,   0, 
>-      0,   0,   0,   0,  54,   0, 
>-      0,   5, 130,  32,  16,   0, 
>-      0,   0,   0,   0,   1,  64, 
>-      0,   0,   0,   0, 128,  63, 
>-     62,   0,   0,   1,  83,  84, 
>-     65,  84, 116,   0,   0,   0, 
>-      4,   0,   0,   0,   1,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      2,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   1,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   1,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   2,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,  82,  68,  69,  70, 
>-    160,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      2,   0,   0,   0,  28,   0, 
>-      0,   0,   0,   4, 255, 255, 
>-      0,   1,   0,   0, 109,   0, 
>-      0,   0,  92,   0,   0,   0, 
>-      3,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   1,   0,   0,   0, 
>-      1,   0,   0,   0, 100,   0, 
>-      0,   0,   2,   0,   0,   0, 
>-      5,   0,   0,   0,   4,   0, 
>-      0,   0, 255, 255, 255, 255, 
>-      0,   0,   0,   0,   1,   0, 
>-      0,   0,  13,   0,   0,   0, 
>-     83,  97, 109, 112, 108, 101, 
>-    114,   0,  84, 101, 120, 116, 
>-    117, 114, 101,  70,   0,  77, 
>-    105,  99, 114, 111, 115, 111, 
>-    102, 116,  32,  40,  82,  41, 
>-     32,  72,  76,  83,  76,  32, 
>-     83, 104,  97, 100, 101, 114, 
>-     32,  67, 111, 109, 112, 105, 
>-    108, 101, 114,  32,  54,  46, 
>-     51,  46,  57,  54,  48,  48, 
>-     46,  49,  54,  51,  56,  52, 
>-      0, 171,  73,  83,  71,  78, 
>-     80,   0,   0,   0,   2,   0, 
>-      0,   0,   8,   0,   0,   0, 
>-     56,   0,   0,   0,   0,   0, 
>-      0,   0,   1,   0,   0,   0, 
>-      3,   0,   0,   0,   0,   0, 
>-      0,   0,  15,   0,   0,   0, 
>-     68,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      3,   0,   0,   0,   1,   0, 
>-      0,   0,   3,   3,   0,   0, 
>-     83,  86,  95,  80,  79,  83, 
>-     73,  84,  73,  79,  78,   0, 
>-     84,  69,  88,  67,  79,  79, 
>-     82,  68,   0, 171, 171, 171, 
>-     79,  83,  71,  78,  44,   0, 
>-      0,   0,   1,   0,   0,   0, 
>-      8,   0,   0,   0,  32,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   3,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-     15,   0,   0,   0,  83,  86, 
>-     95,  84,  65,  82,  71,  69, 
>-     84,   0, 171, 171
>-};
>+const BYTE g_PS_PassthroughLum2D[] = {
>+    68,  88,  66,  67,  188, 225, 249, 227, 93,  195, 221, 6,   89,  16,  237, 173, 184, 245, 118,
>+    123, 1,   0,   0,   0,   28,  3,   0,   0,   6,   0,   0,   0,   56,  0,   0,   0,   208, 0,
>+    0,   0,   108, 1,   0,   0,   232, 1,   0,   0,   144, 2,   0,   0,   232, 2,   0,   0,   65,
>+    111, 110, 57,  144, 0,   0,   0,   144, 0,   0,   0,   0,   2,   255, 255, 104, 0,   0,   0,
>+    40,  0,   0,   0,   0,   0,   40,  0,   0,   0,   40,  0,   0,   0,   40,  0,   1,   0,   36,
>+    0,   0,   0,   40,  0,   0,   0,   0,   0,   1,   2,   255, 255, 81,  0,   0,   5,   0,   0,
>+    15,  160, 0,   0,   128, 63,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   31,
>+    0,   0,   2,   0,   0,   0,   128, 0,   0,   3,   176, 31,  0,   0,   2,   0,   0,   0,   144,
>+    0,   8,   15,  160, 66,  0,   0,   3,   0,   0,   15,  128, 0,   0,   228, 176, 0,   8,   228,
>+    160, 4,   0,   0,   4,   0,   0,   15,  128, 0,   0,   0,   128, 0,   0,   64,  160, 0,   0,
>+    21,  160, 1,   0,   0,   2,   0,   8,   15,  128, 0,   0,   228, 128, 255, 255, 0,   0,   83,
>+    72,  68,  82,  148, 0,   0,   0,   64,  0,   0,   0,   37,  0,   0,   0,   90,  0,   0,   3,
>+    0,   96,  16,  0,   0,   0,   0,   0,   88,  24,  0,   4,   0,   112, 16,  0,   0,   0,   0,
>+    0,   85,  85,  0,   0,   98,  16,  0,   3,   50,  16,  16,  0,   1,   0,   0,   0,   101, 0,
>+    0,   3,   242, 32,  16,  0,   0,   0,   0,   0,   104, 0,   0,   2,   1,   0,   0,   0,   69,
>+    0,   0,   9,   242, 0,   16,  0,   0,   0,   0,   0,   70,  16,  16,  0,   1,   0,   0,   0,
>+    70,  126, 16,  0,   0,   0,   0,   0,   0,   96,  16,  0,   0,   0,   0,   0,   54,  0,   0,
>+    5,   114, 32,  16,  0,   0,   0,   0,   0,   6,   0,   16,  0,   0,   0,   0,   0,   54,  0,
>+    0,   5,   130, 32,  16,  0,   0,   0,   0,   0,   1,   64,  0,   0,   0,   0,   128, 63,  62,
>+    0,   0,   1,   83,  84,  65,  84,  116, 0,   0,   0,   4,   0,   0,   0,   1,   0,   0,   0,
>+    0,   0,   0,   0,   2,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   2,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   82,  68,  69,  70,  160, 0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   2,   0,   0,   0,   28,  0,   0,   0,   0,
>+    4,   255, 255, 0,   1,   0,   0,   109, 0,   0,   0,   92,  0,   0,   0,   3,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,
>+    0,   1,   0,   0,   0,   100, 0,   0,   0,   2,   0,   0,   0,   5,   0,   0,   0,   4,   0,
>+    0,   0,   255, 255, 255, 255, 0,   0,   0,   0,   1,   0,   0,   0,   13,  0,   0,   0,   83,
>+    97,  109, 112, 108, 101, 114, 0,   84,  101, 120, 116, 117, 114, 101, 70,  0,   77,  105, 99,
>+    114, 111, 115, 111, 102, 116, 32,  40,  82,  41,  32,  72,  76,  83,  76,  32,  83,  104, 97,
>+    100, 101, 114, 32,  67,  111, 109, 112, 105, 108, 101, 114, 32,  57,  46,  50,  57,  46,  57,
>+    53,  50,  46,  51,  49,  49,  49,  0,   171, 171, 73,  83,  71,  78,  80,  0,   0,   0,   2,
>+    0,   0,   0,   8,   0,   0,   0,   56,  0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,
>+    3,   0,   0,   0,   0,   0,   0,   0,   15,  0,   0,   0,   68,  0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   3,   0,   0,   0,   1,   0,   0,   0,   3,   3,   0,   0,   83,  86,
>+    95,  80,  79,  83,  73,  84,  73,  79,  78,  0,   84,  69,  88,  67,  79,  79,  82,  68,  0,
>+    171, 171, 171, 79,  83,  71,  78,  44,  0,   0,   0,   1,   0,   0,   0,   8,   0,   0,   0,
>+    32,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   3,   0,   0,   0,   0,   0,   0,
>+    0,   15,  0,   0,   0,   83,  86,  95,  84,  65,  82,  71,  69,  84,  0,   171, 171};
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughlum2darray11ps.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughlum2darray11ps.h
>new file mode 100644
>index 00000000000..916d9d001a6
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughlum2darray11ps.h
>@@ -0,0 +1,90 @@
>+#if 0
>+//
>+// Generated by Microsoft (R) HLSL Shader Compiler 9.29.952.3111
>+//
>+//
>+//   fxc /nologo /E PS_PassthroughLum2DArray /T ps_4_0 /Fh
>+//    compiled\passthroughlum2darray11ps.h Passthrough2DArray11.hlsl
>+//
>+//
>+// Resource Bindings:
>+//
>+// Name                                 Type  Format         Dim Slot Elements
>+// ------------------------------ ---------- ------- ----------- ---- --------
>+// Sampler                           sampler      NA          NA    0        1
>+// TextureF                          texture  float4     2darray    0        1
>+//
>+//
>+//
>+// Input signature:
>+//
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_POSITION              0   xyzw        0      POS  float       
>+// SV_RENDERTARGETARRAYINDEX     0   x           1  RTINDEX   uint   x   
>+// TEXCOORD                 0   xyz         2     NONE  float   xy  
>+//
>+//
>+// Output signature:
>+//
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_TARGET                0   xyzw        0   TARGET  float   xyzw
>+//
>+ps_4_0
>+dcl_sampler s0, mode_default
>+dcl_resource_texture2darray (float,float,float,float) t0
>+dcl_input_ps_siv constant v1.x, rendertarget_array_index
>+dcl_input_ps linear v2.xy
>+dcl_output o0.xyzw
>+dcl_temps 1
>+utof r0.z, v1.x
>+mov r0.xy, v2.xyxx
>+sample r0.xyzw, r0.xyzx, t0.xyzw, s0
>+mov o0.xyz, r0.xxxx
>+mov o0.w, l(1.000000)
>+ret 
>+// Approximately 6 instruction slots used
>+#endif
>+
>+const BYTE g_PS_PassthroughLum2DArray[] = {
>+    68,  88,  66,  67,  48,  31,  236, 162, 56,  23,  109, 114, 250, 90,  80,  100, 160, 102, 228,
>+    252, 1,   0,   0,   0,   232, 2,   0,   0,   5,   0,   0,   0,   52,  0,   0,   0,   220, 0,
>+    0,   0,   100, 1,   0,   0,   152, 1,   0,   0,   108, 2,   0,   0,   82,  68,  69,  70,  160,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   2,   0,   0,   0,   28,  0,   0,   0,
>+    0,   4,   255, 255, 0,   1,   0,   0,   109, 0,   0,   0,   92,  0,   0,   0,   3,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,
>+    0,   0,   1,   0,   0,   0,   100, 0,   0,   0,   2,   0,   0,   0,   5,   0,   0,   0,   5,
>+    0,   0,   0,   255, 255, 255, 255, 0,   0,   0,   0,   1,   0,   0,   0,   13,  0,   0,   0,
>+    83,  97,  109, 112, 108, 101, 114, 0,   84,  101, 120, 116, 117, 114, 101, 70,  0,   77,  105,
>+    99,  114, 111, 115, 111, 102, 116, 32,  40,  82,  41,  32,  72,  76,  83,  76,  32,  83,  104,
>+    97,  100, 101, 114, 32,  67,  111, 109, 112, 105, 108, 101, 114, 32,  57,  46,  50,  57,  46,
>+    57,  53,  50,  46,  51,  49,  49,  49,  0,   171, 171, 73,  83,  71,  78,  128, 0,   0,   0,
>+    3,   0,   0,   0,   8,   0,   0,   0,   80,  0,   0,   0,   0,   0,   0,   0,   1,   0,   0,
>+    0,   3,   0,   0,   0,   0,   0,   0,   0,   15,  0,   0,   0,   92,  0,   0,   0,   0,   0,
>+    0,   0,   4,   0,   0,   0,   1,   0,   0,   0,   1,   0,   0,   0,   1,   1,   0,   0,   118,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   3,   0,   0,   0,   2,   0,   0,   0,
>+    7,   3,   0,   0,   83,  86,  95,  80,  79,  83,  73,  84,  73,  79,  78,  0,   83,  86,  95,
>+    82,  69,  78,  68,  69,  82,  84,  65,  82,  71,  69,  84,  65,  82,  82,  65,  89,  73,  78,
>+    68,  69,  88,  0,   84,  69,  88,  67,  79,  79,  82,  68,  0,   171, 79,  83,  71,  78,  44,
>+    0,   0,   0,   1,   0,   0,   0,   8,   0,   0,   0,   32,  0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   3,   0,   0,   0,   0,   0,   0,   0,   15,  0,   0,   0,   83,  86,  95,
>+    84,  65,  82,  71,  69,  84,  0,   171, 171, 83,  72,  68,  82,  204, 0,   0,   0,   64,  0,
>+    0,   0,   51,  0,   0,   0,   90,  0,   0,   3,   0,   96,  16,  0,   0,   0,   0,   0,   88,
>+    64,  0,   4,   0,   112, 16,  0,   0,   0,   0,   0,   85,  85,  0,   0,   100, 8,   0,   4,
>+    18,  16,  16,  0,   1,   0,   0,   0,   4,   0,   0,   0,   98,  16,  0,   3,   50,  16,  16,
>+    0,   2,   0,   0,   0,   101, 0,   0,   3,   242, 32,  16,  0,   0,   0,   0,   0,   104, 0,
>+    0,   2,   1,   0,   0,   0,   86,  0,   0,   5,   66,  0,   16,  0,   0,   0,   0,   0,   10,
>+    16,  16,  0,   1,   0,   0,   0,   54,  0,   0,   5,   50,  0,   16,  0,   0,   0,   0,   0,
>+    70,  16,  16,  0,   2,   0,   0,   0,   69,  0,   0,   9,   242, 0,   16,  0,   0,   0,   0,
>+    0,   70,  2,   16,  0,   0,   0,   0,   0,   70,  126, 16,  0,   0,   0,   0,   0,   0,   96,
>+    16,  0,   0,   0,   0,   0,   54,  0,   0,   5,   114, 32,  16,  0,   0,   0,   0,   0,   6,
>+    0,   16,  0,   0,   0,   0,   0,   54,  0,   0,   5,   130, 32,  16,  0,   0,   0,   0,   0,
>+    1,   64,  0,   0,   0,   0,   128, 63,  62,  0,   0,   1,   83,  84,  65,  84,  116, 0,   0,
>+    0,   6,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   3,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   3,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0};
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughlum3d11ps.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughlum3d11ps.h
>index ac2bb40359a..fb2490ef2b0 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughlum3d11ps.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughlum3d11ps.h
>@@ -1,6 +1,10 @@
> #if 0
> //
>-// Generated by Microsoft (R) HLSL Shader Compiler 6.3.9600.16384
>+// Generated by Microsoft (R) HLSL Shader Compiler 9.29.952.3111
>+//
>+//
>+//   fxc /nologo /E PS_PassthroughLum3D /T ps_4_0 /Fh
>+//    compiled\passthroughlum3d11ps.h Passthrough3D11.hlsl
> //
> //
> // Resource Bindings:
>@@ -14,18 +18,18 @@
> //
> // Input signature:
> //
>-// Name                 Index   Mask Register SysValue  Format   Used
>-// -------------------- ----- ------ -------- -------- ------- ------
>-// SV_POSITION              0   xyzw        0      POS   float       
>-// SV_RENDERTARGETARRAYINDEX     0   x           1  RTINDEX    uint       
>-// TEXCOORD                 0   xyz         2     NONE   float   xyz 
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_POSITION              0   xyzw        0      POS  float       
>+// SV_RENDERTARGETARRAYINDEX     0   x           1  RTINDEX   uint       
>+// TEXCOORD                 0   xyz         2     NONE  float   xyz 
> //
> //
> // Output signature:
> //
>-// Name                 Index   Mask Register SysValue  Format   Used
>-// -------------------- ----- ------ -------- -------- ------- ------
>-// SV_TARGET                0   xyzw        0   TARGET   float   xyzw
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_TARGET                0   xyzw        0   TARGET  float   xyzw
> //
> ps_4_0
> dcl_sampler s0, mode_default
>@@ -40,121 +44,41 @@ ret
> // Approximately 4 instruction slots used
> #endif
> 
>-const BYTE g_PS_PassthroughLum3D[] =
>-{
>-     68,  88,  66,  67, 173, 177, 
>-    219,  35, 149, 130,  33, 215, 
>-    183, 219, 250, 244, 100,  17, 
>-     62, 106,   1,   0,   0,   0, 
>-    176,   2,   0,   0,   5,   0, 
>-      0,   0,  52,   0,   0,   0, 
>-    220,   0,   0,   0, 100,   1, 
>-      0,   0, 152,   1,   0,   0, 
>-     52,   2,   0,   0,  82,  68, 
>-     69,  70, 160,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   2,   0,   0,   0, 
>-     28,   0,   0,   0,   0,   4, 
>-    255, 255,   0,   1,   0,   0, 
>-    109,   0,   0,   0,  92,   0, 
>-      0,   0,   3,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   1,   0, 
>-      0,   0,   1,   0,   0,   0, 
>-    100,   0,   0,   0,   2,   0, 
>-      0,   0,   5,   0,   0,   0, 
>-      8,   0,   0,   0, 255, 255, 
>-    255, 255,   0,   0,   0,   0, 
>-      1,   0,   0,   0,  13,   0, 
>-      0,   0,  83,  97, 109, 112, 
>-    108, 101, 114,   0,  84, 101, 
>-    120, 116, 117, 114, 101,  70, 
>-      0,  77, 105,  99, 114, 111, 
>-    115, 111, 102, 116,  32,  40, 
>-     82,  41,  32,  72,  76,  83, 
>-     76,  32,  83, 104,  97, 100, 
>-    101, 114,  32,  67, 111, 109, 
>-    112, 105, 108, 101, 114,  32, 
>-     54,  46,  51,  46,  57,  54, 
>-     48,  48,  46,  49,  54,  51, 
>-     56,  52,   0, 171,  73,  83, 
>-     71,  78, 128,   0,   0,   0, 
>-      3,   0,   0,   0,   8,   0, 
>-      0,   0,  80,   0,   0,   0, 
>-      0,   0,   0,   0,   1,   0, 
>-      0,   0,   3,   0,   0,   0, 
>-      0,   0,   0,   0,  15,   0, 
>-      0,   0,  92,   0,   0,   0, 
>-      0,   0,   0,   0,   4,   0, 
>-      0,   0,   1,   0,   0,   0, 
>-      1,   0,   0,   0,   1,   0, 
>-      0,   0, 118,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   3,   0,   0,   0, 
>-      2,   0,   0,   0,   7,   7, 
>-      0,   0,  83,  86,  95,  80, 
>-     79,  83,  73,  84,  73,  79, 
>-     78,   0,  83,  86,  95,  82, 
>-     69,  78,  68,  69,  82,  84, 
>-     65,  82,  71,  69,  84,  65, 
>-     82,  82,  65,  89,  73,  78, 
>-     68,  69,  88,   0,  84,  69, 
>-     88,  67,  79,  79,  82,  68, 
>-      0, 171,  79,  83,  71,  78, 
>-     44,   0,   0,   0,   1,   0, 
>-      0,   0,   8,   0,   0,   0, 
>-     32,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      3,   0,   0,   0,   0,   0, 
>-      0,   0,  15,   0,   0,   0, 
>-     83,  86,  95,  84,  65,  82, 
>-     71,  69,  84,   0, 171, 171, 
>-     83,  72,  68,  82, 148,   0, 
>-      0,   0,  64,   0,   0,   0, 
>-     37,   0,   0,   0,  90,   0, 
>-      0,   3,   0,  96,  16,   0, 
>-      0,   0,   0,   0,  88,  40, 
>-      0,   4,   0, 112,  16,   0, 
>-      0,   0,   0,   0,  85,  85, 
>-      0,   0,  98,  16,   0,   3, 
>-    114,  16,  16,   0,   2,   0, 
>-      0,   0, 101,   0,   0,   3, 
>-    242,  32,  16,   0,   0,   0, 
>-      0,   0, 104,   0,   0,   2, 
>-      1,   0,   0,   0,  69,   0, 
>-      0,   9, 242,   0,  16,   0, 
>-      0,   0,   0,   0,  70,  18, 
>-     16,   0,   2,   0,   0,   0, 
>-     70, 126,  16,   0,   0,   0, 
>-      0,   0,   0,  96,  16,   0, 
>-      0,   0,   0,   0,  54,   0, 
>-      0,   5, 114,  32,  16,   0, 
>-      0,   0,   0,   0,   6,   0, 
>-     16,   0,   0,   0,   0,   0, 
>-     54,   0,   0,   5, 130,  32, 
>-     16,   0,   0,   0,   0,   0, 
>-      1,  64,   0,   0,   0,   0, 
>-    128,  63,  62,   0,   0,   1, 
>-     83,  84,  65,  84, 116,   0, 
>-      0,   0,   4,   0,   0,   0, 
>-      1,   0,   0,   0,   0,   0, 
>-      0,   0,   2,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      1,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   1,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      2,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0
>-};
>+const BYTE g_PS_PassthroughLum3D[] = {
>+    68,  88,  66,  67,  189, 19,  141, 227, 229, 153, 47,  229, 108, 56,  120, 27,  139, 44,  214,
>+    101, 1,   0,   0,   0,   176, 2,   0,   0,   5,   0,   0,   0,   52,  0,   0,   0,   220, 0,
>+    0,   0,   100, 1,   0,   0,   152, 1,   0,   0,   52,  2,   0,   0,   82,  68,  69,  70,  160,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   2,   0,   0,   0,   28,  0,   0,   0,
>+    0,   4,   255, 255, 0,   1,   0,   0,   109, 0,   0,   0,   92,  0,   0,   0,   3,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,
>+    0,   0,   1,   0,   0,   0,   100, 0,   0,   0,   2,   0,   0,   0,   5,   0,   0,   0,   8,
>+    0,   0,   0,   255, 255, 255, 255, 0,   0,   0,   0,   1,   0,   0,   0,   13,  0,   0,   0,
>+    83,  97,  109, 112, 108, 101, 114, 0,   84,  101, 120, 116, 117, 114, 101, 70,  0,   77,  105,
>+    99,  114, 111, 115, 111, 102, 116, 32,  40,  82,  41,  32,  72,  76,  83,  76,  32,  83,  104,
>+    97,  100, 101, 114, 32,  67,  111, 109, 112, 105, 108, 101, 114, 32,  57,  46,  50,  57,  46,
>+    57,  53,  50,  46,  51,  49,  49,  49,  0,   171, 171, 73,  83,  71,  78,  128, 0,   0,   0,
>+    3,   0,   0,   0,   8,   0,   0,   0,   80,  0,   0,   0,   0,   0,   0,   0,   1,   0,   0,
>+    0,   3,   0,   0,   0,   0,   0,   0,   0,   15,  0,   0,   0,   92,  0,   0,   0,   0,   0,
>+    0,   0,   4,   0,   0,   0,   1,   0,   0,   0,   1,   0,   0,   0,   1,   0,   0,   0,   118,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   3,   0,   0,   0,   2,   0,   0,   0,
>+    7,   7,   0,   0,   83,  86,  95,  80,  79,  83,  73,  84,  73,  79,  78,  0,   83,  86,  95,
>+    82,  69,  78,  68,  69,  82,  84,  65,  82,  71,  69,  84,  65,  82,  82,  65,  89,  73,  78,
>+    68,  69,  88,  0,   84,  69,  88,  67,  79,  79,  82,  68,  0,   171, 79,  83,  71,  78,  44,
>+    0,   0,   0,   1,   0,   0,   0,   8,   0,   0,   0,   32,  0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   3,   0,   0,   0,   0,   0,   0,   0,   15,  0,   0,   0,   83,  86,  95,
>+    84,  65,  82,  71,  69,  84,  0,   171, 171, 83,  72,  68,  82,  148, 0,   0,   0,   64,  0,
>+    0,   0,   37,  0,   0,   0,   90,  0,   0,   3,   0,   96,  16,  0,   0,   0,   0,   0,   88,
>+    40,  0,   4,   0,   112, 16,  0,   0,   0,   0,   0,   85,  85,  0,   0,   98,  16,  0,   3,
>+    114, 16,  16,  0,   2,   0,   0,   0,   101, 0,   0,   3,   242, 32,  16,  0,   0,   0,   0,
>+    0,   104, 0,   0,   2,   1,   0,   0,   0,   69,  0,   0,   9,   242, 0,   16,  0,   0,   0,
>+    0,   0,   70,  18,  16,  0,   2,   0,   0,   0,   70,  126, 16,  0,   0,   0,   0,   0,   0,
>+    96,  16,  0,   0,   0,   0,   0,   54,  0,   0,   5,   114, 32,  16,  0,   0,   0,   0,   0,
>+    6,   0,   16,  0,   0,   0,   0,   0,   54,  0,   0,   5,   130, 32,  16,  0,   0,   0,   0,
>+    0,   1,   64,  0,   0,   0,   0,   128, 63,  62,  0,   0,   1,   83,  84,  65,  84,  116, 0,
>+    0,   0,   4,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   2,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   2,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0};
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughlumalpha2d11ps.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughlumalpha2d11ps.h
>index 88599fca9c2..9825e7afd2f 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughlumalpha2d11ps.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughlumalpha2d11ps.h
>@@ -1,6 +1,10 @@
> #if 0
> //
>-// Generated by Microsoft (R) HLSL Shader Compiler 6.3.9600.16384
>+// Generated by Microsoft (R) HLSL Shader Compiler 9.29.952.3111
>+//
>+//
>+//   fxc /nologo /E PS_PassthroughLumAlpha2D /T ps_4_0_level_9_3 /Fh
>+//    compiled\passthroughlumalpha2d11ps.h Passthrough2D11.hlsl
> //
> //
> // Resource Bindings:
>@@ -14,17 +18,17 @@
> //
> // Input signature:
> //
>-// Name                 Index   Mask Register SysValue  Format   Used
>-// -------------------- ----- ------ -------- -------- ------- ------
>-// SV_POSITION              0   xyzw        0      POS   float       
>-// TEXCOORD                 0   xy          1     NONE   float   xy  
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_POSITION              0   xyzw        0      POS  float       
>+// TEXCOORD                 0   xy          1     NONE  float   xy  
> //
> //
> // Output signature:
> //
>-// Name                 Index   Mask Register SysValue  Format   Used
>-// -------------------- ----- ------ -------- -------- ------- ------
>-// SV_TARGET                0   xyzw        0   TARGET   float   xyzw
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_TARGET                0   xyzw        0   TARGET  float   xyzw
> //
> //
> // Sampler/Resource to DX9 shader sampler mappings:
>@@ -56,130 +60,44 @@ ret
> // Approximately 3 instruction slots used
> #endif
> 
>-const BYTE g_PS_PassthroughLumAlpha2D[] =
>-{
>-     68,  88,  66,  67, 246, 240, 
>-    158, 208, 214, 197, 166, 221, 
>-     45,  58, 235, 164,  12, 157, 
>-     62,  31,   1,   0,   0,   0, 
>-    232,   2,   0,   0,   6,   0, 
>-      0,   0,  56,   0,   0,   0, 
>-    176,   0,   0,   0,  56,   1, 
>-      0,   0, 180,   1,   0,   0, 
>-     92,   2,   0,   0, 180,   2, 
>-      0,   0,  65, 111, 110,  57, 
>-    112,   0,   0,   0, 112,   0, 
>-      0,   0,   0,   2, 255, 255, 
>-     72,   0,   0,   0,  40,   0, 
>-      0,   0,   0,   0,  40,   0, 
>-      0,   0,  40,   0,   0,   0, 
>-     40,   0,   1,   0,  36,   0, 
>-      0,   0,  40,   0,   0,   0, 
>-      0,   0,   1,   2, 255, 255, 
>-     31,   0,   0,   2,   0,   0, 
>-      0, 128,   0,   0,   3, 176, 
>-     31,   0,   0,   2,   0,   0, 
>-      0, 144,   0,   8,  15, 160, 
>-     66,   0,   0,   3,   0,   0, 
>-     15, 128,   0,   0, 228, 176, 
>-      0,   8, 228, 160,   1,   0, 
>-      0,   2,   0,   0,  15, 128, 
>-      0,   0, 192, 128,   1,   0, 
>-      0,   2,   0,   8,  15, 128, 
>-      0,   0, 228, 128, 255, 255, 
>-      0,   0,  83,  72,  68,  82, 
>-    128,   0,   0,   0,  64,   0, 
>-      0,   0,  32,   0,   0,   0, 
>-     90,   0,   0,   3,   0,  96, 
>-     16,   0,   0,   0,   0,   0, 
>-     88,  24,   0,   4,   0, 112, 
>-     16,   0,   0,   0,   0,   0, 
>-     85,  85,   0,   0,  98,  16, 
>-      0,   3,  50,  16,  16,   0, 
>-      1,   0,   0,   0, 101,   0, 
>-      0,   3, 242,  32,  16,   0, 
>-      0,   0,   0,   0, 104,   0, 
>-      0,   2,   1,   0,   0,   0, 
>-     69,   0,   0,   9, 242,   0, 
>-     16,   0,   0,   0,   0,   0, 
>-     70,  16,  16,   0,   1,   0, 
>-      0,   0,  70, 126,  16,   0, 
>-      0,   0,   0,   0,   0,  96, 
>-     16,   0,   0,   0,   0,   0, 
>-     54,   0,   0,   5, 242,  32, 
>-     16,   0,   0,   0,   0,   0, 
>-      6,  12,  16,   0,   0,   0, 
>-      0,   0,  62,   0,   0,   1, 
>-     83,  84,  65,  84, 116,   0, 
>-      0,   0,   3,   0,   0,   0, 
>-      1,   0,   0,   0,   0,   0, 
>-      0,   0,   2,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      1,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   1,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      1,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,  82,  68, 
>-     69,  70, 160,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   2,   0,   0,   0, 
>-     28,   0,   0,   0,   0,   4, 
>-    255, 255,   0,   1,   0,   0, 
>-    109,   0,   0,   0,  92,   0, 
>-      0,   0,   3,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   1,   0, 
>-      0,   0,   1,   0,   0,   0, 
>-    100,   0,   0,   0,   2,   0, 
>-      0,   0,   5,   0,   0,   0, 
>-      4,   0,   0,   0, 255, 255, 
>-    255, 255,   0,   0,   0,   0, 
>-      1,   0,   0,   0,  13,   0, 
>-      0,   0,  83,  97, 109, 112, 
>-    108, 101, 114,   0,  84, 101, 
>-    120, 116, 117, 114, 101,  70, 
>-      0,  77, 105,  99, 114, 111, 
>-    115, 111, 102, 116,  32,  40, 
>-     82,  41,  32,  72,  76,  83, 
>-     76,  32,  83, 104,  97, 100, 
>-    101, 114,  32,  67, 111, 109, 
>-    112, 105, 108, 101, 114,  32, 
>-     54,  46,  51,  46,  57,  54, 
>-     48,  48,  46,  49,  54,  51, 
>-     56,  52,   0, 171,  73,  83, 
>-     71,  78,  80,   0,   0,   0, 
>-      2,   0,   0,   0,   8,   0, 
>-      0,   0,  56,   0,   0,   0, 
>-      0,   0,   0,   0,   1,   0, 
>-      0,   0,   3,   0,   0,   0, 
>-      0,   0,   0,   0,  15,   0, 
>-      0,   0,  68,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   3,   0,   0,   0, 
>-      1,   0,   0,   0,   3,   3, 
>-      0,   0,  83,  86,  95,  80, 
>-     79,  83,  73,  84,  73,  79, 
>-     78,   0,  84,  69,  88,  67, 
>-     79,  79,  82,  68,   0, 171, 
>-    171, 171,  79,  83,  71,  78, 
>-     44,   0,   0,   0,   1,   0, 
>-      0,   0,   8,   0,   0,   0, 
>-     32,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      3,   0,   0,   0,   0,   0, 
>-      0,   0,  15,   0,   0,   0, 
>-     83,  86,  95,  84,  65,  82, 
>-     71,  69,  84,   0, 171, 171
>-};
>+const BYTE g_PS_PassthroughLumAlpha2D[] = {
>+    68,  88,  66,  67,  123, 243, 206, 171, 140, 47,  129, 32,  9,   64,  73,  124, 19,  131, 17,
>+    168, 1,   0,   0,   0,   232, 2,   0,   0,   6,   0,   0,   0,   56,  0,   0,   0,   176, 0,
>+    0,   0,   56,  1,   0,   0,   180, 1,   0,   0,   92,  2,   0,   0,   180, 2,   0,   0,   65,
>+    111, 110, 57,  112, 0,   0,   0,   112, 0,   0,   0,   0,   2,   255, 255, 72,  0,   0,   0,
>+    40,  0,   0,   0,   0,   0,   40,  0,   0,   0,   40,  0,   0,   0,   40,  0,   1,   0,   36,
>+    0,   0,   0,   40,  0,   0,   0,   0,   0,   1,   2,   255, 255, 31,  0,   0,   2,   0,   0,
>+    0,   128, 0,   0,   3,   176, 31,  0,   0,   2,   0,   0,   0,   144, 0,   8,   15,  160, 66,
>+    0,   0,   3,   0,   0,   15,  128, 0,   0,   228, 176, 0,   8,   228, 160, 1,   0,   0,   2,
>+    0,   0,   15,  128, 0,   0,   192, 128, 1,   0,   0,   2,   0,   8,   15,  128, 0,   0,   228,
>+    128, 255, 255, 0,   0,   83,  72,  68,  82,  128, 0,   0,   0,   64,  0,   0,   0,   32,  0,
>+    0,   0,   90,  0,   0,   3,   0,   96,  16,  0,   0,   0,   0,   0,   88,  24,  0,   4,   0,
>+    112, 16,  0,   0,   0,   0,   0,   85,  85,  0,   0,   98,  16,  0,   3,   50,  16,  16,  0,
>+    1,   0,   0,   0,   101, 0,   0,   3,   242, 32,  16,  0,   0,   0,   0,   0,   104, 0,   0,
>+    2,   1,   0,   0,   0,   69,  0,   0,   9,   242, 0,   16,  0,   0,   0,   0,   0,   70,  16,
>+    16,  0,   1,   0,   0,   0,   70,  126, 16,  0,   0,   0,   0,   0,   0,   96,  16,  0,   0,
>+    0,   0,   0,   54,  0,   0,   5,   242, 32,  16,  0,   0,   0,   0,   0,   6,   12,  16,  0,
>+    0,   0,   0,   0,   62,  0,   0,   1,   83,  84,  65,  84,  116, 0,   0,   0,   3,   0,   0,
>+    0,   1,   0,   0,   0,   0,   0,   0,   0,   2,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   82,
>+    68,  69,  70,  160, 0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   2,   0,   0,   0,
>+    28,  0,   0,   0,   0,   4,   255, 255, 0,   1,   0,   0,   109, 0,   0,   0,   92,  0,   0,
>+    0,   3,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   1,   0,   0,   0,   1,   0,   0,   0,   100, 0,   0,   0,   2,   0,   0,   0,   5,
>+    0,   0,   0,   4,   0,   0,   0,   255, 255, 255, 255, 0,   0,   0,   0,   1,   0,   0,   0,
>+    13,  0,   0,   0,   83,  97,  109, 112, 108, 101, 114, 0,   84,  101, 120, 116, 117, 114, 101,
>+    70,  0,   77,  105, 99,  114, 111, 115, 111, 102, 116, 32,  40,  82,  41,  32,  72,  76,  83,
>+    76,  32,  83,  104, 97,  100, 101, 114, 32,  67,  111, 109, 112, 105, 108, 101, 114, 32,  57,
>+    46,  50,  57,  46,  57,  53,  50,  46,  51,  49,  49,  49,  0,   171, 171, 73,  83,  71,  78,
>+    80,  0,   0,   0,   2,   0,   0,   0,   8,   0,   0,   0,   56,  0,   0,   0,   0,   0,   0,
>+    0,   1,   0,   0,   0,   3,   0,   0,   0,   0,   0,   0,   0,   15,  0,   0,   0,   68,  0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   3,   0,   0,   0,   1,   0,   0,   0,   3,
>+    3,   0,   0,   83,  86,  95,  80,  79,  83,  73,  84,  73,  79,  78,  0,   84,  69,  88,  67,
>+    79,  79,  82,  68,  0,   171, 171, 171, 79,  83,  71,  78,  44,  0,   0,   0,   1,   0,   0,
>+    0,   8,   0,   0,   0,   32,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   3,   0,
>+    0,   0,   0,   0,   0,   0,   15,  0,   0,   0,   83,  86,  95,  84,  65,  82,  71,  69,  84,
>+    0,   171, 171};
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughlumalpha2darray11ps.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughlumalpha2darray11ps.h
>new file mode 100644
>index 00000000000..9fe93edb488
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughlumalpha2darray11ps.h
>@@ -0,0 +1,88 @@
>+#if 0
>+//
>+// Generated by Microsoft (R) HLSL Shader Compiler 9.29.952.3111
>+//
>+//
>+//   fxc /nologo /E PS_PassthroughLumAlpha2DArray /T ps_4_0 /Fh
>+//    compiled\passthroughlumalpha2darray11ps.h Passthrough2DArray11.hlsl
>+//
>+//
>+// Resource Bindings:
>+//
>+// Name                                 Type  Format         Dim Slot Elements
>+// ------------------------------ ---------- ------- ----------- ---- --------
>+// Sampler                           sampler      NA          NA    0        1
>+// TextureF                          texture  float4     2darray    0        1
>+//
>+//
>+//
>+// Input signature:
>+//
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_POSITION              0   xyzw        0      POS  float       
>+// SV_RENDERTARGETARRAYINDEX     0   x           1  RTINDEX   uint   x   
>+// TEXCOORD                 0   xyz         2     NONE  float   xy  
>+//
>+//
>+// Output signature:
>+//
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_TARGET                0   xyzw        0   TARGET  float   xyzw
>+//
>+ps_4_0
>+dcl_sampler s0, mode_default
>+dcl_resource_texture2darray (float,float,float,float) t0
>+dcl_input_ps_siv constant v1.x, rendertarget_array_index
>+dcl_input_ps linear v2.xy
>+dcl_output o0.xyzw
>+dcl_temps 1
>+utof r0.z, v1.x
>+mov r0.xy, v2.xyxx
>+sample r0.xyzw, r0.xyzx, t0.xyzw, s0
>+mov o0.xyzw, r0.xxxw
>+ret 
>+// Approximately 5 instruction slots used
>+#endif
>+
>+const BYTE g_PS_PassthroughLumAlpha2DArray[] = {
>+    68,  88,  66,  67,  171, 126, 222, 213, 133, 151, 3,   160, 237, 58,  39,  228, 228, 109, 48,
>+    150, 1,   0,   0,   0,   212, 2,   0,   0,   5,   0,   0,   0,   52,  0,   0,   0,   220, 0,
>+    0,   0,   100, 1,   0,   0,   152, 1,   0,   0,   88,  2,   0,   0,   82,  68,  69,  70,  160,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   2,   0,   0,   0,   28,  0,   0,   0,
>+    0,   4,   255, 255, 0,   1,   0,   0,   109, 0,   0,   0,   92,  0,   0,   0,   3,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,
>+    0,   0,   1,   0,   0,   0,   100, 0,   0,   0,   2,   0,   0,   0,   5,   0,   0,   0,   5,
>+    0,   0,   0,   255, 255, 255, 255, 0,   0,   0,   0,   1,   0,   0,   0,   13,  0,   0,   0,
>+    83,  97,  109, 112, 108, 101, 114, 0,   84,  101, 120, 116, 117, 114, 101, 70,  0,   77,  105,
>+    99,  114, 111, 115, 111, 102, 116, 32,  40,  82,  41,  32,  72,  76,  83,  76,  32,  83,  104,
>+    97,  100, 101, 114, 32,  67,  111, 109, 112, 105, 108, 101, 114, 32,  57,  46,  50,  57,  46,
>+    57,  53,  50,  46,  51,  49,  49,  49,  0,   171, 171, 73,  83,  71,  78,  128, 0,   0,   0,
>+    3,   0,   0,   0,   8,   0,   0,   0,   80,  0,   0,   0,   0,   0,   0,   0,   1,   0,   0,
>+    0,   3,   0,   0,   0,   0,   0,   0,   0,   15,  0,   0,   0,   92,  0,   0,   0,   0,   0,
>+    0,   0,   4,   0,   0,   0,   1,   0,   0,   0,   1,   0,   0,   0,   1,   1,   0,   0,   118,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   3,   0,   0,   0,   2,   0,   0,   0,
>+    7,   3,   0,   0,   83,  86,  95,  80,  79,  83,  73,  84,  73,  79,  78,  0,   83,  86,  95,
>+    82,  69,  78,  68,  69,  82,  84,  65,  82,  71,  69,  84,  65,  82,  82,  65,  89,  73,  78,
>+    68,  69,  88,  0,   84,  69,  88,  67,  79,  79,  82,  68,  0,   171, 79,  83,  71,  78,  44,
>+    0,   0,   0,   1,   0,   0,   0,   8,   0,   0,   0,   32,  0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   3,   0,   0,   0,   0,   0,   0,   0,   15,  0,   0,   0,   83,  86,  95,
>+    84,  65,  82,  71,  69,  84,  0,   171, 171, 83,  72,  68,  82,  184, 0,   0,   0,   64,  0,
>+    0,   0,   46,  0,   0,   0,   90,  0,   0,   3,   0,   96,  16,  0,   0,   0,   0,   0,   88,
>+    64,  0,   4,   0,   112, 16,  0,   0,   0,   0,   0,   85,  85,  0,   0,   100, 8,   0,   4,
>+    18,  16,  16,  0,   1,   0,   0,   0,   4,   0,   0,   0,   98,  16,  0,   3,   50,  16,  16,
>+    0,   2,   0,   0,   0,   101, 0,   0,   3,   242, 32,  16,  0,   0,   0,   0,   0,   104, 0,
>+    0,   2,   1,   0,   0,   0,   86,  0,   0,   5,   66,  0,   16,  0,   0,   0,   0,   0,   10,
>+    16,  16,  0,   1,   0,   0,   0,   54,  0,   0,   5,   50,  0,   16,  0,   0,   0,   0,   0,
>+    70,  16,  16,  0,   2,   0,   0,   0,   69,  0,   0,   9,   242, 0,   16,  0,   0,   0,   0,
>+    0,   70,  2,   16,  0,   0,   0,   0,   0,   70,  126, 16,  0,   0,   0,   0,   0,   0,   96,
>+    16,  0,   0,   0,   0,   0,   54,  0,   0,   5,   242, 32,  16,  0,   0,   0,   0,   0,   6,
>+    12,  16,  0,   0,   0,   0,   0,   62,  0,   0,   1,   83,  84,  65,  84,  116, 0,   0,   0,
>+    5,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   3,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    2,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0};
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughlumalpha3d11ps.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughlumalpha3d11ps.h
>index 19091d03577..b6dcbeefb60 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughlumalpha3d11ps.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughlumalpha3d11ps.h
>@@ -1,6 +1,10 @@
> #if 0
> //
>-// Generated by Microsoft (R) HLSL Shader Compiler 6.3.9600.16384
>+// Generated by Microsoft (R) HLSL Shader Compiler 9.29.952.3111
>+//
>+//
>+//   fxc /nologo /E PS_PassthroughLumAlpha3D /T ps_4_0 /Fh
>+//    compiled\passthroughlumalpha3d11ps.h Passthrough3D11.hlsl
> //
> //
> // Resource Bindings:
>@@ -14,18 +18,18 @@
> //
> // Input signature:
> //
>-// Name                 Index   Mask Register SysValue  Format   Used
>-// -------------------- ----- ------ -------- -------- ------- ------
>-// SV_POSITION              0   xyzw        0      POS   float       
>-// SV_RENDERTARGETARRAYINDEX     0   x           1  RTINDEX    uint       
>-// TEXCOORD                 0   xyz         2     NONE   float   xyz 
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_POSITION              0   xyzw        0      POS  float       
>+// SV_RENDERTARGETARRAYINDEX     0   x           1  RTINDEX   uint       
>+// TEXCOORD                 0   xyz         2     NONE  float   xyz 
> //
> //
> // Output signature:
> //
>-// Name                 Index   Mask Register SysValue  Format   Used
>-// -------------------- ----- ------ -------- -------- ------- ------
>-// SV_TARGET                0   xyzw        0   TARGET   float   xyzw
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_TARGET                0   xyzw        0   TARGET  float   xyzw
> //
> ps_4_0
> dcl_sampler s0, mode_default
>@@ -39,118 +43,40 @@ ret
> // Approximately 3 instruction slots used
> #endif
> 
>-const BYTE g_PS_PassthroughLumAlpha3D[] =
>-{
>-     68,  88,  66,  67, 224, 152, 
>-    208, 227,  44, 106,  62, 235, 
>-    129,  97, 207, 213,  29, 232, 
>-    163,   6,   1,   0,   0,   0, 
>-    156,   2,   0,   0,   5,   0, 
>-      0,   0,  52,   0,   0,   0, 
>-    220,   0,   0,   0, 100,   1, 
>-      0,   0, 152,   1,   0,   0, 
>-     32,   2,   0,   0,  82,  68, 
>-     69,  70, 160,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   2,   0,   0,   0, 
>-     28,   0,   0,   0,   0,   4, 
>-    255, 255,   0,   1,   0,   0, 
>-    109,   0,   0,   0,  92,   0, 
>-      0,   0,   3,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   1,   0, 
>-      0,   0,   1,   0,   0,   0, 
>-    100,   0,   0,   0,   2,   0, 
>-      0,   0,   5,   0,   0,   0, 
>-      8,   0,   0,   0, 255, 255, 
>-    255, 255,   0,   0,   0,   0, 
>-      1,   0,   0,   0,  13,   0, 
>-      0,   0,  83,  97, 109, 112, 
>-    108, 101, 114,   0,  84, 101, 
>-    120, 116, 117, 114, 101,  70, 
>-      0,  77, 105,  99, 114, 111, 
>-    115, 111, 102, 116,  32,  40, 
>-     82,  41,  32,  72,  76,  83, 
>-     76,  32,  83, 104,  97, 100, 
>-    101, 114,  32,  67, 111, 109, 
>-    112, 105, 108, 101, 114,  32, 
>-     54,  46,  51,  46,  57,  54, 
>-     48,  48,  46,  49,  54,  51, 
>-     56,  52,   0, 171,  73,  83, 
>-     71,  78, 128,   0,   0,   0, 
>-      3,   0,   0,   0,   8,   0, 
>-      0,   0,  80,   0,   0,   0, 
>-      0,   0,   0,   0,   1,   0, 
>-      0,   0,   3,   0,   0,   0, 
>-      0,   0,   0,   0,  15,   0, 
>-      0,   0,  92,   0,   0,   0, 
>-      0,   0,   0,   0,   4,   0, 
>-      0,   0,   1,   0,   0,   0, 
>-      1,   0,   0,   0,   1,   0, 
>-      0,   0, 118,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   3,   0,   0,   0, 
>-      2,   0,   0,   0,   7,   7, 
>-      0,   0,  83,  86,  95,  80, 
>-     79,  83,  73,  84,  73,  79, 
>-     78,   0,  83,  86,  95,  82, 
>-     69,  78,  68,  69,  82,  84, 
>-     65,  82,  71,  69,  84,  65, 
>-     82,  82,  65,  89,  73,  78, 
>-     68,  69,  88,   0,  84,  69, 
>-     88,  67,  79,  79,  82,  68, 
>-      0, 171,  79,  83,  71,  78, 
>-     44,   0,   0,   0,   1,   0, 
>-      0,   0,   8,   0,   0,   0, 
>-     32,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      3,   0,   0,   0,   0,   0, 
>-      0,   0,  15,   0,   0,   0, 
>-     83,  86,  95,  84,  65,  82, 
>-     71,  69,  84,   0, 171, 171, 
>-     83,  72,  68,  82, 128,   0, 
>-      0,   0,  64,   0,   0,   0, 
>-     32,   0,   0,   0,  90,   0, 
>-      0,   3,   0,  96,  16,   0, 
>-      0,   0,   0,   0,  88,  40, 
>-      0,   4,   0, 112,  16,   0, 
>-      0,   0,   0,   0,  85,  85, 
>-      0,   0,  98,  16,   0,   3, 
>-    114,  16,  16,   0,   2,   0, 
>-      0,   0, 101,   0,   0,   3, 
>-    242,  32,  16,   0,   0,   0, 
>-      0,   0, 104,   0,   0,   2, 
>-      1,   0,   0,   0,  69,   0, 
>-      0,   9, 242,   0,  16,   0, 
>-      0,   0,   0,   0,  70,  18, 
>-     16,   0,   2,   0,   0,   0, 
>-     70, 126,  16,   0,   0,   0, 
>-      0,   0,   0,  96,  16,   0, 
>-      0,   0,   0,   0,  54,   0, 
>-      0,   5, 242,  32,  16,   0, 
>-      0,   0,   0,   0,   6,  12, 
>-     16,   0,   0,   0,   0,   0, 
>-     62,   0,   0,   1,  83,  84, 
>-     65,  84, 116,   0,   0,   0, 
>-      3,   0,   0,   0,   1,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      2,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   1,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   1,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   1,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0
>-};
>+const BYTE g_PS_PassthroughLumAlpha3D[] = {
>+    68,  88,  66,  67,  191, 137, 201, 175, 2,   158, 150, 52,  202, 186, 67,  28,  235, 67,  228,
>+    244, 1,   0,   0,   0,   156, 2,   0,   0,   5,   0,   0,   0,   52,  0,   0,   0,   220, 0,
>+    0,   0,   100, 1,   0,   0,   152, 1,   0,   0,   32,  2,   0,   0,   82,  68,  69,  70,  160,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   2,   0,   0,   0,   28,  0,   0,   0,
>+    0,   4,   255, 255, 0,   1,   0,   0,   109, 0,   0,   0,   92,  0,   0,   0,   3,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,
>+    0,   0,   1,   0,   0,   0,   100, 0,   0,   0,   2,   0,   0,   0,   5,   0,   0,   0,   8,
>+    0,   0,   0,   255, 255, 255, 255, 0,   0,   0,   0,   1,   0,   0,   0,   13,  0,   0,   0,
>+    83,  97,  109, 112, 108, 101, 114, 0,   84,  101, 120, 116, 117, 114, 101, 70,  0,   77,  105,
>+    99,  114, 111, 115, 111, 102, 116, 32,  40,  82,  41,  32,  72,  76,  83,  76,  32,  83,  104,
>+    97,  100, 101, 114, 32,  67,  111, 109, 112, 105, 108, 101, 114, 32,  57,  46,  50,  57,  46,
>+    57,  53,  50,  46,  51,  49,  49,  49,  0,   171, 171, 73,  83,  71,  78,  128, 0,   0,   0,
>+    3,   0,   0,   0,   8,   0,   0,   0,   80,  0,   0,   0,   0,   0,   0,   0,   1,   0,   0,
>+    0,   3,   0,   0,   0,   0,   0,   0,   0,   15,  0,   0,   0,   92,  0,   0,   0,   0,   0,
>+    0,   0,   4,   0,   0,   0,   1,   0,   0,   0,   1,   0,   0,   0,   1,   0,   0,   0,   118,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   3,   0,   0,   0,   2,   0,   0,   0,
>+    7,   7,   0,   0,   83,  86,  95,  80,  79,  83,  73,  84,  73,  79,  78,  0,   83,  86,  95,
>+    82,  69,  78,  68,  69,  82,  84,  65,  82,  71,  69,  84,  65,  82,  82,  65,  89,  73,  78,
>+    68,  69,  88,  0,   84,  69,  88,  67,  79,  79,  82,  68,  0,   171, 79,  83,  71,  78,  44,
>+    0,   0,   0,   1,   0,   0,   0,   8,   0,   0,   0,   32,  0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   3,   0,   0,   0,   0,   0,   0,   0,   15,  0,   0,   0,   83,  86,  95,
>+    84,  65,  82,  71,  69,  84,  0,   171, 171, 83,  72,  68,  82,  128, 0,   0,   0,   64,  0,
>+    0,   0,   32,  0,   0,   0,   90,  0,   0,   3,   0,   96,  16,  0,   0,   0,   0,   0,   88,
>+    40,  0,   4,   0,   112, 16,  0,   0,   0,   0,   0,   85,  85,  0,   0,   98,  16,  0,   3,
>+    114, 16,  16,  0,   2,   0,   0,   0,   101, 0,   0,   3,   242, 32,  16,  0,   0,   0,   0,
>+    0,   104, 0,   0,   2,   1,   0,   0,   0,   69,  0,   0,   9,   242, 0,   16,  0,   0,   0,
>+    0,   0,   70,  18,  16,  0,   2,   0,   0,   0,   70,  126, 16,  0,   0,   0,   0,   0,   0,
>+    96,  16,  0,   0,   0,   0,   0,   54,  0,   0,   5,   242, 32,  16,  0,   0,   0,   0,   0,
>+    6,   12,  16,  0,   0,   0,   0,   0,   62,  0,   0,   1,   83,  84,  65,  84,  116, 0,   0,
>+    0,   3,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   2,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0};
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughr2d11ps.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughr2d11ps.h
>index d4210167005..7219814e58c 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughr2d11ps.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughr2d11ps.h
>@@ -1,6 +1,10 @@
> #if 0
> //
>-// Generated by Microsoft (R) HLSL Shader Compiler 6.3.9600.16384
>+// Generated by Microsoft (R) HLSL Shader Compiler 9.29.952.3111
>+//
>+//
>+//   fxc /nologo /E PS_PassthroughR2D /T ps_4_0_level_9_3 /Fh
>+//    compiled\passthroughr2d11ps.h Passthrough2D11.hlsl
> //
> //
> // Resource Bindings:
>@@ -14,17 +18,17 @@
> //
> // Input signature:
> //
>-// Name                 Index   Mask Register SysValue  Format   Used
>-// -------------------- ----- ------ -------- -------- ------- ------
>-// SV_POSITION              0   xyzw        0      POS   float       
>-// TEXCOORD                 0   xy          1     NONE   float   xy  
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_POSITION              0   xyzw        0      POS  float       
>+// TEXCOORD                 0   xy          1     NONE  float   xy  
> //
> //
> // Output signature:
> //
>-// Name                 Index   Mask Register SysValue  Format   Used
>-// -------------------- ----- ------ -------- -------- ------- ------
>-// SV_TARGET                0   xyzw        0   TARGET   float   xyzw
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_TARGET                0   xyzw        0   TARGET  float   xyzw
> //
> //
> // Sampler/Resource to DX9 shader sampler mappings:
>@@ -58,141 +62,47 @@ ret
> // Approximately 4 instruction slots used
> #endif
> 
>-const BYTE g_PS_PassthroughR2D[] =
>-{
>-     68,  88,  66,  67, 212, 251, 
>-    117, 250,  99, 185,  28,  44, 
>-    178,  14,  83, 133, 173,   0, 
>-    182, 196,   1,   0,   0,   0, 
>-     40,   3,   0,   0,   6,   0, 
>-      0,   0,  56,   0,   0,   0, 
>-    208,   0,   0,   0, 120,   1, 
>-      0,   0, 244,   1,   0,   0, 
>-    156,   2,   0,   0, 244,   2, 
>-      0,   0,  65, 111, 110,  57, 
>-    144,   0,   0,   0, 144,   0, 
>-      0,   0,   0,   2, 255, 255, 
>-    104,   0,   0,   0,  40,   0, 
>-      0,   0,   0,   0,  40,   0, 
>-      0,   0,  40,   0,   0,   0, 
>-     40,   0,   1,   0,  36,   0, 
>-      0,   0,  40,   0,   0,   0, 
>-      0,   0,   1,   2, 255, 255, 
>-     81,   0,   0,   5,   0,   0, 
>-     15, 160,   0,   0, 128,  63, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-     31,   0,   0,   2,   0,   0, 
>-      0, 128,   0,   0,   3, 176, 
>-     31,   0,   0,   2,   0,   0, 
>-      0, 144,   0,   8,  15, 160, 
>-     66,   0,   0,   3,   0,   0, 
>-     15, 128,   0,   0, 228, 176, 
>-      0,   8, 228, 160,   4,   0, 
>-      0,   4,   0,   0,  15, 128, 
>-      0,   0,   0, 128,   0,   0, 
>-     84, 160,   0,   0,  21, 160, 
>-      1,   0,   0,   2,   0,   8, 
>-     15, 128,   0,   0, 228, 128, 
>-    255, 255,   0,   0,  83,  72, 
>-     68,  82, 160,   0,   0,   0, 
>-     64,   0,   0,   0,  40,   0, 
>-      0,   0,  90,   0,   0,   3, 
>-      0,  96,  16,   0,   0,   0, 
>-      0,   0,  88,  24,   0,   4, 
>-      0, 112,  16,   0,   0,   0, 
>-      0,   0,  85,  85,   0,   0, 
>-     98,  16,   0,   3,  50,  16, 
>-     16,   0,   1,   0,   0,   0, 
>-    101,   0,   0,   3, 242,  32, 
>-     16,   0,   0,   0,   0,   0, 
>-    104,   0,   0,   2,   1,   0, 
>-      0,   0,  69,   0,   0,   9, 
>-    242,   0,  16,   0,   0,   0, 
>-      0,   0,  70,  16,  16,   0, 
>-      1,   0,   0,   0,  70, 126, 
>-     16,   0,   0,   0,   0,   0, 
>-      0,  96,  16,   0,   0,   0, 
>-      0,   0,  54,   0,   0,   5, 
>-     18,  32,  16,   0,   0,   0, 
>-      0,   0,  10,   0,  16,   0, 
>-      0,   0,   0,   0,  54,   0, 
>-      0,   8, 226,  32,  16,   0, 
>-      0,   0,   0,   0,   2,  64, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0, 128,  63, 
>-     62,   0,   0,   1,  83,  84, 
>-     65,  84, 116,   0,   0,   0, 
>-      4,   0,   0,   0,   1,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      2,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   1,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   1,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   2,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,  82,  68,  69,  70, 
>-    160,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      2,   0,   0,   0,  28,   0, 
>-      0,   0,   0,   4, 255, 255, 
>-      0,   1,   0,   0, 109,   0, 
>-      0,   0,  92,   0,   0,   0, 
>-      3,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   1,   0,   0,   0, 
>-      1,   0,   0,   0, 100,   0, 
>-      0,   0,   2,   0,   0,   0, 
>-      5,   0,   0,   0,   4,   0, 
>-      0,   0, 255, 255, 255, 255, 
>-      0,   0,   0,   0,   1,   0, 
>-      0,   0,  13,   0,   0,   0, 
>-     83,  97, 109, 112, 108, 101, 
>-    114,   0,  84, 101, 120, 116, 
>-    117, 114, 101,  70,   0,  77, 
>-    105,  99, 114, 111, 115, 111, 
>-    102, 116,  32,  40,  82,  41, 
>-     32,  72,  76,  83,  76,  32, 
>-     83, 104,  97, 100, 101, 114, 
>-     32,  67, 111, 109, 112, 105, 
>-    108, 101, 114,  32,  54,  46, 
>-     51,  46,  57,  54,  48,  48, 
>-     46,  49,  54,  51,  56,  52, 
>-      0, 171,  73,  83,  71,  78, 
>-     80,   0,   0,   0,   2,   0, 
>-      0,   0,   8,   0,   0,   0, 
>-     56,   0,   0,   0,   0,   0, 
>-      0,   0,   1,   0,   0,   0, 
>-      3,   0,   0,   0,   0,   0, 
>-      0,   0,  15,   0,   0,   0, 
>-     68,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      3,   0,   0,   0,   1,   0, 
>-      0,   0,   3,   3,   0,   0, 
>-     83,  86,  95,  80,  79,  83, 
>-     73,  84,  73,  79,  78,   0, 
>-     84,  69,  88,  67,  79,  79, 
>-     82,  68,   0, 171, 171, 171, 
>-     79,  83,  71,  78,  44,   0, 
>-      0,   0,   1,   0,   0,   0, 
>-      8,   0,   0,   0,  32,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   3,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-     15,   0,   0,   0,  83,  86, 
>-     95,  84,  65,  82,  71,  69, 
>-     84,   0, 171, 171
>-};
>+const BYTE g_PS_PassthroughR2D[] = {
>+    68,  88,  66,  67,  192, 5,   106, 26,  153, 118, 66,  122, 234, 139, 38,  125, 56,  165, 124,
>+    152, 1,   0,   0,   0,   40,  3,   0,   0,   6,   0,   0,   0,   56,  0,   0,   0,   208, 0,
>+    0,   0,   120, 1,   0,   0,   244, 1,   0,   0,   156, 2,   0,   0,   244, 2,   0,   0,   65,
>+    111, 110, 57,  144, 0,   0,   0,   144, 0,   0,   0,   0,   2,   255, 255, 104, 0,   0,   0,
>+    40,  0,   0,   0,   0,   0,   40,  0,   0,   0,   40,  0,   0,   0,   40,  0,   1,   0,   36,
>+    0,   0,   0,   40,  0,   0,   0,   0,   0,   1,   2,   255, 255, 81,  0,   0,   5,   0,   0,
>+    15,  160, 0,   0,   128, 63,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   31,
>+    0,   0,   2,   0,   0,   0,   128, 0,   0,   3,   176, 31,  0,   0,   2,   0,   0,   0,   144,
>+    0,   8,   15,  160, 66,  0,   0,   3,   0,   0,   15,  128, 0,   0,   228, 176, 0,   8,   228,
>+    160, 4,   0,   0,   4,   0,   0,   15,  128, 0,   0,   0,   128, 0,   0,   84,  160, 0,   0,
>+    21,  160, 1,   0,   0,   2,   0,   8,   15,  128, 0,   0,   228, 128, 255, 255, 0,   0,   83,
>+    72,  68,  82,  160, 0,   0,   0,   64,  0,   0,   0,   40,  0,   0,   0,   90,  0,   0,   3,
>+    0,   96,  16,  0,   0,   0,   0,   0,   88,  24,  0,   4,   0,   112, 16,  0,   0,   0,   0,
>+    0,   85,  85,  0,   0,   98,  16,  0,   3,   50,  16,  16,  0,   1,   0,   0,   0,   101, 0,
>+    0,   3,   242, 32,  16,  0,   0,   0,   0,   0,   104, 0,   0,   2,   1,   0,   0,   0,   69,
>+    0,   0,   9,   242, 0,   16,  0,   0,   0,   0,   0,   70,  16,  16,  0,   1,   0,   0,   0,
>+    70,  126, 16,  0,   0,   0,   0,   0,   0,   96,  16,  0,   0,   0,   0,   0,   54,  0,   0,
>+    5,   18,  32,  16,  0,   0,   0,   0,   0,   10,  0,   16,  0,   0,   0,   0,   0,   54,  0,
>+    0,   8,   226, 32,  16,  0,   0,   0,   0,   0,   2,   64,  0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   128, 63,  62,  0,   0,   1,   83,  84,  65,  84,
>+    116, 0,   0,   0,   4,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   2,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   2,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   82,  68,  69,  70,  160, 0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   2,   0,   0,   0,   28,  0,   0,   0,   0,   4,   255, 255, 0,   1,   0,   0,
>+    109, 0,   0,   0,   92,  0,   0,   0,   3,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   1,   0,   0,   0,   100, 0,
>+    0,   0,   2,   0,   0,   0,   5,   0,   0,   0,   4,   0,   0,   0,   255, 255, 255, 255, 0,
>+    0,   0,   0,   1,   0,   0,   0,   13,  0,   0,   0,   83,  97,  109, 112, 108, 101, 114, 0,
>+    84,  101, 120, 116, 117, 114, 101, 70,  0,   77,  105, 99,  114, 111, 115, 111, 102, 116, 32,
>+    40,  82,  41,  32,  72,  76,  83,  76,  32,  83,  104, 97,  100, 101, 114, 32,  67,  111, 109,
>+    112, 105, 108, 101, 114, 32,  57,  46,  50,  57,  46,  57,  53,  50,  46,  51,  49,  49,  49,
>+    0,   171, 171, 73,  83,  71,  78,  80,  0,   0,   0,   2,   0,   0,   0,   8,   0,   0,   0,
>+    56,  0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   3,   0,   0,   0,   0,   0,   0,
>+    0,   15,  0,   0,   0,   68,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   3,   0,
>+    0,   0,   1,   0,   0,   0,   3,   3,   0,   0,   83,  86,  95,  80,  79,  83,  73,  84,  73,
>+    79,  78,  0,   84,  69,  88,  67,  79,  79,  82,  68,  0,   171, 171, 171, 79,  83,  71,  78,
>+    44,  0,   0,   0,   1,   0,   0,   0,   8,   0,   0,   0,   32,  0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   3,   0,   0,   0,   0,   0,   0,   0,   15,  0,   0,   0,   83,  86,
>+    95,  84,  65,  82,  71,  69,  84,  0,   171, 171};
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughr2darray11ps.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughr2darray11ps.h
>new file mode 100644
>index 00000000000..cac7073482b
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughr2darray11ps.h
>@@ -0,0 +1,90 @@
>+#if 0
>+//
>+// Generated by Microsoft (R) HLSL Shader Compiler 9.29.952.3111
>+//
>+//
>+//   fxc /nologo /E PS_PassthroughR2DArray /T ps_4_0 /Fh
>+//    compiled\passthroughr2darray11ps.h Passthrough2DArray11.hlsl
>+//
>+//
>+// Resource Bindings:
>+//
>+// Name                                 Type  Format         Dim Slot Elements
>+// ------------------------------ ---------- ------- ----------- ---- --------
>+// Sampler                           sampler      NA          NA    0        1
>+// TextureF                          texture  float4     2darray    0        1
>+//
>+//
>+//
>+// Input signature:
>+//
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_POSITION              0   xyzw        0      POS  float       
>+// SV_RENDERTARGETARRAYINDEX     0   x           1  RTINDEX   uint   x   
>+// TEXCOORD                 0   xyz         2     NONE  float   xy  
>+//
>+//
>+// Output signature:
>+//
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_TARGET                0   xyzw        0   TARGET  float   xyzw
>+//
>+ps_4_0
>+dcl_sampler s0, mode_default
>+dcl_resource_texture2darray (float,float,float,float) t0
>+dcl_input_ps_siv constant v1.x, rendertarget_array_index
>+dcl_input_ps linear v2.xy
>+dcl_output o0.xyzw
>+dcl_temps 1
>+utof r0.z, v1.x
>+mov r0.xy, v2.xyxx
>+sample r0.xyzw, r0.xyzx, t0.xyzw, s0
>+mov o0.x, r0.x
>+mov o0.yzw, l(0,0,0,1.000000)
>+ret 
>+// Approximately 6 instruction slots used
>+#endif
>+
>+const BYTE g_PS_PassthroughR2DArray[] = {
>+    68, 88,  66,  67,  153, 98,  1,   143, 57,  155, 108, 8,   63,  182, 136, 234, 41, 243, 201,
>+    84, 1,   0,   0,   0,   244, 2,   0,   0,   5,   0,   0,   0,   52,  0,   0,   0,  220, 0,
>+    0,  0,   100, 1,   0,   0,   152, 1,   0,   0,   120, 2,   0,   0,   82,  68,  69, 70,  160,
>+    0,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   2,   0,   0,   0,   28,  0,  0,   0,
>+    0,  4,   255, 255, 0,   1,   0,   0,   109, 0,   0,   0,   92,  0,   0,   0,   3,  0,   0,
>+    0,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,  1,   0,
>+    0,  0,   1,   0,   0,   0,   100, 0,   0,   0,   2,   0,   0,   0,   5,   0,   0,  0,   5,
>+    0,  0,   0,   255, 255, 255, 255, 0,   0,   0,   0,   1,   0,   0,   0,   13,  0,  0,   0,
>+    83, 97,  109, 112, 108, 101, 114, 0,   84,  101, 120, 116, 117, 114, 101, 70,  0,  77,  105,
>+    99, 114, 111, 115, 111, 102, 116, 32,  40,  82,  41,  32,  72,  76,  83,  76,  32, 83,  104,
>+    97, 100, 101, 114, 32,  67,  111, 109, 112, 105, 108, 101, 114, 32,  57,  46,  50, 57,  46,
>+    57, 53,  50,  46,  51,  49,  49,  49,  0,   171, 171, 73,  83,  71,  78,  128, 0,  0,   0,
>+    3,  0,   0,   0,   8,   0,   0,   0,   80,  0,   0,   0,   0,   0,   0,   0,   1,  0,   0,
>+    0,  3,   0,   0,   0,   0,   0,   0,   0,   15,  0,   0,   0,   92,  0,   0,   0,  0,   0,
>+    0,  0,   4,   0,   0,   0,   1,   0,   0,   0,   1,   0,   0,   0,   1,   1,   0,  0,   118,
>+    0,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   3,   0,   0,   0,   2,   0,  0,   0,
>+    7,  3,   0,   0,   83,  86,  95,  80,  79,  83,  73,  84,  73,  79,  78,  0,   83, 86,  95,
>+    82, 69,  78,  68,  69,  82,  84,  65,  82,  71,  69,  84,  65,  82,  82,  65,  89, 73,  78,
>+    68, 69,  88,  0,   84,  69,  88,  67,  79,  79,  82,  68,  0,   171, 79,  83,  71, 78,  44,
>+    0,  0,   0,   1,   0,   0,   0,   8,   0,   0,   0,   32,  0,   0,   0,   0,   0,  0,   0,
>+    0,  0,   0,   0,   3,   0,   0,   0,   0,   0,   0,   0,   15,  0,   0,   0,   83, 86,  95,
>+    84, 65,  82,  71,  69,  84,  0,   171, 171, 83,  72,  68,  82,  216, 0,   0,   0,  64,  0,
>+    0,  0,   54,  0,   0,   0,   90,  0,   0,   3,   0,   96,  16,  0,   0,   0,   0,  0,   88,
>+    64, 0,   4,   0,   112, 16,  0,   0,   0,   0,   0,   85,  85,  0,   0,   100, 8,  0,   4,
>+    18, 16,  16,  0,   1,   0,   0,   0,   4,   0,   0,   0,   98,  16,  0,   3,   50, 16,  16,
>+    0,  2,   0,   0,   0,   101, 0,   0,   3,   242, 32,  16,  0,   0,   0,   0,   0,  104, 0,
>+    0,  2,   1,   0,   0,   0,   86,  0,   0,   5,   66,  0,   16,  0,   0,   0,   0,  0,   10,
>+    16, 16,  0,   1,   0,   0,   0,   54,  0,   0,   5,   50,  0,   16,  0,   0,   0,  0,   0,
>+    70, 16,  16,  0,   2,   0,   0,   0,   69,  0,   0,   9,   242, 0,   16,  0,   0,  0,   0,
>+    0,  70,  2,   16,  0,   0,   0,   0,   0,   70,  126, 16,  0,   0,   0,   0,   0,  0,   96,
>+    16, 0,   0,   0,   0,   0,   54,  0,   0,   5,   18,  32,  16,  0,   0,   0,   0,  0,   10,
>+    0,  16,  0,   0,   0,   0,   0,   54,  0,   0,   8,   226, 32,  16,  0,   0,   0,  0,   0,
>+    2,  64,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,  0,   128,
>+    63, 62,  0,   0,   1,   83,  84,  65,  84,  116, 0,   0,   0,   6,   0,   0,   0,  1,   0,
>+    0,  0,   0,   0,   0,   0,   3,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,  0,   0,
>+    0,  0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,  0,   0,
>+    0,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   0,  0,   0,
>+    0,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   3,   0,   0,   0,  0,   0,
>+    0,  0,   1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,  0,   0,
>+    0,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0};
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughr2darrayi11ps.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughr2darrayi11ps.h
>new file mode 100644
>index 00000000000..a540a840c17
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughr2darrayi11ps.h
>@@ -0,0 +1,94 @@
>+#if 0
>+//
>+// Generated by Microsoft (R) HLSL Shader Compiler 9.29.952.3111
>+//
>+//
>+//   fxc /nologo /E PS_PassthroughR2DArrayI /T ps_4_0 /Fh
>+//    compiled\passthroughr2darrayi11ps.h Passthrough2DArray11.hlsl
>+//
>+//
>+// Resource Bindings:
>+//
>+// Name                                 Type  Format         Dim Slot Elements
>+// ------------------------------ ---------- ------- ----------- ---- --------
>+// TextureI                          texture   sint4     2darray    0        1
>+//
>+//
>+//
>+// Input signature:
>+//
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_POSITION              0   xyzw        0      POS  float       
>+// SV_RENDERTARGETARRAYINDEX     0   x           1  RTINDEX   uint   x   
>+// TEXCOORD                 0   xyz         2     NONE  float   xy  
>+//
>+//
>+// Output signature:
>+//
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_TARGET                0   xyzw        0   TARGET    int   xyzw
>+//
>+ps_4_0
>+dcl_resource_texture2darray (sint,sint,sint,sint) t0
>+dcl_input_ps_siv constant v1.x, rendertarget_array_index
>+dcl_input_ps linear v2.xy
>+dcl_output o0.xyzw
>+dcl_temps 1
>+resinfo_uint r0.xyzw, l(0), t0.xyzw
>+utof r0.xy, r0.xyxx
>+mul r0.xy, r0.xyxx, v2.xyxx
>+ftoi r0.xy, r0.xyxx
>+mov r0.z, v1.x
>+mov r0.w, l(0)
>+ld r0.xyzw, r0.xyzw, t0.xyzw
>+mov o0.x, r0.x
>+mov o0.yzw, l(0,0,0,1)
>+ret 
>+// Approximately 10 instruction slots used
>+#endif
>+
>+const BYTE g_PS_PassthroughR2DArrayI[] = {
>+    68,  88,  66,  67,  190, 14,  213, 255, 85,  29,  217, 11,  43,  5,   110, 54,  55,  146, 149,
>+    98,  1,   0,   0,   0,   24,  3,   0,   0,   5,   0,   0,   0,   52,  0,   0,   0,   180, 0,
>+    0,   0,   60,  1,   0,   0,   112, 1,   0,   0,   156, 2,   0,   0,   82,  68,  69,  70,  120,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   28,  0,   0,   0,
>+    0,   4,   255, 255, 0,   1,   0,   0,   69,  0,   0,   0,   60,  0,   0,   0,   2,   0,   0,
>+    0,   3,   0,   0,   0,   5,   0,   0,   0,   255, 255, 255, 255, 0,   0,   0,   0,   1,   0,
>+    0,   0,   13,  0,   0,   0,   84,  101, 120, 116, 117, 114, 101, 73,  0,   77,  105, 99,  114,
>+    111, 115, 111, 102, 116, 32,  40,  82,  41,  32,  72,  76,  83,  76,  32,  83,  104, 97,  100,
>+    101, 114, 32,  67,  111, 109, 112, 105, 108, 101, 114, 32,  57,  46,  50,  57,  46,  57,  53,
>+    50,  46,  51,  49,  49,  49,  0,   171, 171, 73,  83,  71,  78,  128, 0,   0,   0,   3,   0,
>+    0,   0,   8,   0,   0,   0,   80,  0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   3,
>+    0,   0,   0,   0,   0,   0,   0,   15,  0,   0,   0,   92,  0,   0,   0,   0,   0,   0,   0,
>+    4,   0,   0,   0,   1,   0,   0,   0,   1,   0,   0,   0,   1,   1,   0,   0,   118, 0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   3,   0,   0,   0,   2,   0,   0,   0,   7,   3,
>+    0,   0,   83,  86,  95,  80,  79,  83,  73,  84,  73,  79,  78,  0,   83,  86,  95,  82,  69,
>+    78,  68,  69,  82,  84,  65,  82,  71,  69,  84,  65,  82,  82,  65,  89,  73,  78,  68,  69,
>+    88,  0,   84,  69,  88,  67,  79,  79,  82,  68,  0,   171, 79,  83,  71,  78,  44,  0,   0,
>+    0,   1,   0,   0,   0,   8,   0,   0,   0,   32,  0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   2,   0,   0,   0,   0,   0,   0,   0,   15,  0,   0,   0,   83,  86,  95,  84,  65,
>+    82,  71,  69,  84,  0,   171, 171, 83,  72,  68,  82,  36,  1,   0,   0,   64,  0,   0,   0,
>+    73,  0,   0,   0,   88,  64,  0,   4,   0,   112, 16,  0,   0,   0,   0,   0,   51,  51,  0,
>+    0,   100, 8,   0,   4,   18,  16,  16,  0,   1,   0,   0,   0,   4,   0,   0,   0,   98,  16,
>+    0,   3,   50,  16,  16,  0,   2,   0,   0,   0,   101, 0,   0,   3,   242, 32,  16,  0,   0,
>+    0,   0,   0,   104, 0,   0,   2,   1,   0,   0,   0,   61,  16,  0,   7,   242, 0,   16,  0,
>+    0,   0,   0,   0,   1,   64,  0,   0,   0,   0,   0,   0,   70,  126, 16,  0,   0,   0,   0,
>+    0,   86,  0,   0,   5,   50,  0,   16,  0,   0,   0,   0,   0,   70,  0,   16,  0,   0,   0,
>+    0,   0,   56,  0,   0,   7,   50,  0,   16,  0,   0,   0,   0,   0,   70,  0,   16,  0,   0,
>+    0,   0,   0,   70,  16,  16,  0,   2,   0,   0,   0,   27,  0,   0,   5,   50,  0,   16,  0,
>+    0,   0,   0,   0,   70,  0,   16,  0,   0,   0,   0,   0,   54,  0,   0,   5,   66,  0,   16,
>+    0,   0,   0,   0,   0,   10,  16,  16,  0,   1,   0,   0,   0,   54,  0,   0,   5,   130, 0,
>+    16,  0,   0,   0,   0,   0,   1,   64,  0,   0,   0,   0,   0,   0,   45,  0,   0,   7,   242,
>+    0,   16,  0,   0,   0,   0,   0,   70,  14,  16,  0,   0,   0,   0,   0,   70,  126, 16,  0,
>+    0,   0,   0,   0,   54,  0,   0,   5,   18,  32,  16,  0,   0,   0,   0,   0,   10,  0,   16,
>+    0,   0,   0,   0,   0,   54,  0,   0,   8,   226, 32,  16,  0,   0,   0,   0,   0,   2,   64,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   62,
>+    0,   0,   1,   83,  84,  65,  84,  116, 0,   0,   0,   10,  0,   0,   0,   1,   0,   0,   0,
>+    0,   0,   0,   0,   3,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   4,   0,   0,   0,   0,   0,   0,   0,
>+    2,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0};
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughr2darrayui11ps.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughr2darrayui11ps.h
>new file mode 100644
>index 00000000000..6cc2b5635ec
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughr2darrayui11ps.h
>@@ -0,0 +1,94 @@
>+#if 0
>+//
>+// Generated by Microsoft (R) HLSL Shader Compiler 9.29.952.3111
>+//
>+//
>+//   fxc /nologo /E PS_PassthroughR2DArrayUI /T ps_4_0 /Fh
>+//    compiled\passthroughr2darrayui11ps.h Passthrough2DArray11.hlsl
>+//
>+//
>+// Resource Bindings:
>+//
>+// Name                                 Type  Format         Dim Slot Elements
>+// ------------------------------ ---------- ------- ----------- ---- --------
>+// TextureUI                         texture   uint4     2darray    0        1
>+//
>+//
>+//
>+// Input signature:
>+//
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_POSITION              0   xyzw        0      POS  float       
>+// SV_RENDERTARGETARRAYINDEX     0   x           1  RTINDEX   uint   x   
>+// TEXCOORD                 0   xyz         2     NONE  float   xy  
>+//
>+//
>+// Output signature:
>+//
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_TARGET                0   xyzw        0   TARGET   uint   xyzw
>+//
>+ps_4_0
>+dcl_resource_texture2darray (uint,uint,uint,uint) t0
>+dcl_input_ps_siv constant v1.x, rendertarget_array_index
>+dcl_input_ps linear v2.xy
>+dcl_output o0.xyzw
>+dcl_temps 1
>+resinfo_uint r0.xyzw, l(0), t0.xyzw
>+utof r0.xy, r0.xyxx
>+mul r0.xy, r0.xyxx, v2.xyxx
>+ftoi r0.xy, r0.xyxx
>+mov r0.z, v1.x
>+mov r0.w, l(0)
>+ld r0.xyzw, r0.xyzw, t0.xyzw
>+mov o0.x, r0.x
>+mov o0.yzw, l(0,0,0,1)
>+ret 
>+// Approximately 10 instruction slots used
>+#endif
>+
>+const BYTE g_PS_PassthroughR2DArrayUI[] = {
>+    68,  88,  66,  67,  97,  102, 75,  216, 41,  19,  132, 193, 57,  182, 129, 168, 6,   197, 203,
>+    131, 1,   0,   0,   0,   24,  3,   0,   0,   5,   0,   0,   0,   52,  0,   0,   0,   180, 0,
>+    0,   0,   60,  1,   0,   0,   112, 1,   0,   0,   156, 2,   0,   0,   82,  68,  69,  70,  120,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   28,  0,   0,   0,
>+    0,   4,   255, 255, 0,   1,   0,   0,   70,  0,   0,   0,   60,  0,   0,   0,   2,   0,   0,
>+    0,   4,   0,   0,   0,   5,   0,   0,   0,   255, 255, 255, 255, 0,   0,   0,   0,   1,   0,
>+    0,   0,   13,  0,   0,   0,   84,  101, 120, 116, 117, 114, 101, 85,  73,  0,   77,  105, 99,
>+    114, 111, 115, 111, 102, 116, 32,  40,  82,  41,  32,  72,  76,  83,  76,  32,  83,  104, 97,
>+    100, 101, 114, 32,  67,  111, 109, 112, 105, 108, 101, 114, 32,  57,  46,  50,  57,  46,  57,
>+    53,  50,  46,  51,  49,  49,  49,  0,   171, 73,  83,  71,  78,  128, 0,   0,   0,   3,   0,
>+    0,   0,   8,   0,   0,   0,   80,  0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   3,
>+    0,   0,   0,   0,   0,   0,   0,   15,  0,   0,   0,   92,  0,   0,   0,   0,   0,   0,   0,
>+    4,   0,   0,   0,   1,   0,   0,   0,   1,   0,   0,   0,   1,   1,   0,   0,   118, 0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   3,   0,   0,   0,   2,   0,   0,   0,   7,   3,
>+    0,   0,   83,  86,  95,  80,  79,  83,  73,  84,  73,  79,  78,  0,   83,  86,  95,  82,  69,
>+    78,  68,  69,  82,  84,  65,  82,  71,  69,  84,  65,  82,  82,  65,  89,  73,  78,  68,  69,
>+    88,  0,   84,  69,  88,  67,  79,  79,  82,  68,  0,   171, 79,  83,  71,  78,  44,  0,   0,
>+    0,   1,   0,   0,   0,   8,   0,   0,   0,   32,  0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   15,  0,   0,   0,   83,  86,  95,  84,  65,
>+    82,  71,  69,  84,  0,   171, 171, 83,  72,  68,  82,  36,  1,   0,   0,   64,  0,   0,   0,
>+    73,  0,   0,   0,   88,  64,  0,   4,   0,   112, 16,  0,   0,   0,   0,   0,   68,  68,  0,
>+    0,   100, 8,   0,   4,   18,  16,  16,  0,   1,   0,   0,   0,   4,   0,   0,   0,   98,  16,
>+    0,   3,   50,  16,  16,  0,   2,   0,   0,   0,   101, 0,   0,   3,   242, 32,  16,  0,   0,
>+    0,   0,   0,   104, 0,   0,   2,   1,   0,   0,   0,   61,  16,  0,   7,   242, 0,   16,  0,
>+    0,   0,   0,   0,   1,   64,  0,   0,   0,   0,   0,   0,   70,  126, 16,  0,   0,   0,   0,
>+    0,   86,  0,   0,   5,   50,  0,   16,  0,   0,   0,   0,   0,   70,  0,   16,  0,   0,   0,
>+    0,   0,   56,  0,   0,   7,   50,  0,   16,  0,   0,   0,   0,   0,   70,  0,   16,  0,   0,
>+    0,   0,   0,   70,  16,  16,  0,   2,   0,   0,   0,   27,  0,   0,   5,   50,  0,   16,  0,
>+    0,   0,   0,   0,   70,  0,   16,  0,   0,   0,   0,   0,   54,  0,   0,   5,   66,  0,   16,
>+    0,   0,   0,   0,   0,   10,  16,  16,  0,   1,   0,   0,   0,   54,  0,   0,   5,   130, 0,
>+    16,  0,   0,   0,   0,   0,   1,   64,  0,   0,   0,   0,   0,   0,   45,  0,   0,   7,   242,
>+    0,   16,  0,   0,   0,   0,   0,   70,  14,  16,  0,   0,   0,   0,   0,   70,  126, 16,  0,
>+    0,   0,   0,   0,   54,  0,   0,   5,   18,  32,  16,  0,   0,   0,   0,   0,   10,  0,   16,
>+    0,   0,   0,   0,   0,   54,  0,   0,   8,   226, 32,  16,  0,   0,   0,   0,   0,   2,   64,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   62,
>+    0,   0,   1,   83,  84,  65,  84,  116, 0,   0,   0,   10,  0,   0,   0,   1,   0,   0,   0,
>+    0,   0,   0,   0,   3,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   4,   0,   0,   0,   0,   0,   0,   0,
>+    2,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0};
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughr2di11ps.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughr2di11ps.h
>index 4d8d9933aab..894fd79463b 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughr2di11ps.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughr2di11ps.h
>@@ -1,6 +1,10 @@
> #if 0
> //
>-// Generated by Microsoft (R) HLSL Shader Compiler 6.3.9600.16384
>+// Generated by Microsoft (R) HLSL Shader Compiler 9.29.952.3111
>+//
>+//
>+//   fxc /nologo /E PS_PassthroughR2DI /T ps_4_0 /Fh
>+//    compiled\passthroughr2di11ps.h Passthrough2D11.hlsl
> //
> //
> // Resource Bindings:
>@@ -13,17 +17,17 @@
> //
> // Input signature:
> //
>-// Name                 Index   Mask Register SysValue  Format   Used
>-// -------------------- ----- ------ -------- -------- ------- ------
>-// SV_POSITION              0   xyzw        0      POS   float       
>-// TEXCOORD                 0   xy          1     NONE   float   xy  
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_POSITION              0   xyzw        0      POS  float       
>+// TEXCOORD                 0   xy          1     NONE  float   xy  
> //
> //
> // Output signature:
> //
>-// Name                 Index   Mask Register SysValue  Format   Used
>-// -------------------- ----- ------ -------- -------- ------- ------
>-// SV_TARGET                0   xyzw        0   TARGET     int   xyzw
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_TARGET                0   xyzw        0   TARGET    int   xyzw
> //
> ps_4_0
> dcl_resource_texture2d (sint,sint,sint,sint) t0
>@@ -42,126 +46,42 @@ ret
> // Approximately 9 instruction slots used
> #endif
> 
>-const BYTE g_PS_PassthroughR2DI[] =
>-{
>-     68,  88,  66,  67, 123, 230, 
>-     45,  18,  63, 217,  12, 210, 
>-    151, 254,  16,  78, 107, 211, 
>-     57, 255,   1,   0,   0,   0, 
>-    208,   2,   0,   0,   5,   0, 
>-      0,   0,  52,   0,   0,   0, 
>-    180,   0,   0,   0,  12,   1, 
>-      0,   0,  64,   1,   0,   0, 
>-     84,   2,   0,   0,  82,  68, 
>-     69,  70, 120,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   1,   0,   0,   0, 
>-     28,   0,   0,   0,   0,   4, 
>-    255, 255,   0,   1,   0,   0, 
>-     69,   0,   0,   0,  60,   0, 
>-      0,   0,   2,   0,   0,   0, 
>-      3,   0,   0,   0,   4,   0, 
>-      0,   0, 255, 255, 255, 255, 
>-      0,   0,   0,   0,   1,   0, 
>-      0,   0,  13,   0,   0,   0, 
>-     84, 101, 120, 116, 117, 114, 
>-    101,  73,   0,  77, 105,  99, 
>-    114, 111, 115, 111, 102, 116, 
>-     32,  40,  82,  41,  32,  72, 
>-     76,  83,  76,  32,  83, 104, 
>-     97, 100, 101, 114,  32,  67, 
>-    111, 109, 112, 105, 108, 101, 
>-    114,  32,  54,  46,  51,  46, 
>-     57,  54,  48,  48,  46,  49, 
>-     54,  51,  56,  52,   0, 171, 
>-     73,  83,  71,  78,  80,   0, 
>-      0,   0,   2,   0,   0,   0, 
>-      8,   0,   0,   0,  56,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      1,   0,   0,   0,   3,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-     15,   0,   0,   0,  68,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   3,   0, 
>-      0,   0,   1,   0,   0,   0, 
>-      3,   3,   0,   0,  83,  86, 
>-     95,  80,  79,  83,  73,  84, 
>-     73,  79,  78,   0,  84,  69, 
>-     88,  67,  79,  79,  82,  68, 
>-      0, 171, 171, 171,  79,  83, 
>-     71,  78,  44,   0,   0,   0, 
>-      1,   0,   0,   0,   8,   0, 
>-      0,   0,  32,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   2,   0,   0,   0, 
>-      0,   0,   0,   0,  15,   0, 
>-      0,   0,  83,  86,  95,  84, 
>-     65,  82,  71,  69,  84,   0, 
>-    171, 171,  83,  72,  68,  82, 
>-     12,   1,   0,   0,  64,   0, 
>-      0,   0,  67,   0,   0,   0, 
>-     88,  24,   0,   4,   0, 112, 
>-     16,   0,   0,   0,   0,   0, 
>-     51,  51,   0,   0,  98,  16, 
>-      0,   3,  50,  16,  16,   0, 
>-      1,   0,   0,   0, 101,   0, 
>-      0,   3, 242,  32,  16,   0, 
>-      0,   0,   0,   0, 104,   0, 
>-      0,   2,   1,   0,   0,   0, 
>-     61,  16,   0,   7, 242,   0, 
>-     16,   0,   0,   0,   0,   0, 
>-      1,  64,   0,   0,   0,   0, 
>-      0,   0,  70, 126,  16,   0, 
>-      0,   0,   0,   0,  86,   0, 
>-      0,   5,  50,   0,  16,   0, 
>-      0,   0,   0,   0,  70,   0, 
>-     16,   0,   0,   0,   0,   0, 
>-     56,   0,   0,   7,  50,   0, 
>-     16,   0,   0,   0,   0,   0, 
>-     70,   0,  16,   0,   0,   0, 
>-      0,   0,  70,  16,  16,   0, 
>-      1,   0,   0,   0,  27,   0, 
>-      0,   5,  50,   0,  16,   0, 
>-      0,   0,   0,   0,  70,   0, 
>-     16,   0,   0,   0,   0,   0, 
>-     54,   0,   0,   8, 194,   0, 
>-     16,   0,   0,   0,   0,   0, 
>-      2,  64,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,  45,   0,   0,   7, 
>-    242,   0,  16,   0,   0,   0, 
>-      0,   0,  70,  14,  16,   0, 
>-      0,   0,   0,   0,  70, 126, 
>-     16,   0,   0,   0,   0,   0, 
>-     54,   0,   0,   5,  18,  32, 
>-     16,   0,   0,   0,   0,   0, 
>-     10,   0,  16,   0,   0,   0, 
>-      0,   0,  54,   0,   0,   8, 
>-    226,  32,  16,   0,   0,   0, 
>-      0,   0,   2,  64,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,  62,   0, 
>-      0,   1,  83,  84,  65,  84, 
>-    116,   0,   0,   0,   9,   0, 
>-      0,   0,   1,   0,   0,   0, 
>-      0,   0,   0,   0,   2,   0, 
>-      0,   0,   1,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   1,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   1,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   3,   0,   0,   0, 
>-      0,   0,   0,   0,   2,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0
>-};
>+const BYTE g_PS_PassthroughR2DI[] = {
>+    68,  88,  66,  67,  84,  64,  112, 93,  36,  186, 166, 75,  161, 187, 231, 211, 189, 98,  8,
>+    233, 1,   0,   0,   0,   208, 2,   0,   0,   5,   0,   0,   0,   52,  0,   0,   0,   180, 0,
>+    0,   0,   12,  1,   0,   0,   64,  1,   0,   0,   84,  2,   0,   0,   82,  68,  69,  70,  120,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   28,  0,   0,   0,
>+    0,   4,   255, 255, 0,   1,   0,   0,   69,  0,   0,   0,   60,  0,   0,   0,   2,   0,   0,
>+    0,   3,   0,   0,   0,   4,   0,   0,   0,   255, 255, 255, 255, 0,   0,   0,   0,   1,   0,
>+    0,   0,   13,  0,   0,   0,   84,  101, 120, 116, 117, 114, 101, 73,  0,   77,  105, 99,  114,
>+    111, 115, 111, 102, 116, 32,  40,  82,  41,  32,  72,  76,  83,  76,  32,  83,  104, 97,  100,
>+    101, 114, 32,  67,  111, 109, 112, 105, 108, 101, 114, 32,  57,  46,  50,  57,  46,  57,  53,
>+    50,  46,  51,  49,  49,  49,  0,   171, 171, 73,  83,  71,  78,  80,  0,   0,   0,   2,   0,
>+    0,   0,   8,   0,   0,   0,   56,  0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   3,
>+    0,   0,   0,   0,   0,   0,   0,   15,  0,   0,   0,   68,  0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   3,   0,   0,   0,   1,   0,   0,   0,   3,   3,   0,   0,   83,  86,  95,
>+    80,  79,  83,  73,  84,  73,  79,  78,  0,   84,  69,  88,  67,  79,  79,  82,  68,  0,   171,
>+    171, 171, 79,  83,  71,  78,  44,  0,   0,   0,   1,   0,   0,   0,   8,   0,   0,   0,   32,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   2,   0,   0,   0,   0,   0,   0,   0,
>+    15,  0,   0,   0,   83,  86,  95,  84,  65,  82,  71,  69,  84,  0,   171, 171, 83,  72,  68,
>+    82,  12,  1,   0,   0,   64,  0,   0,   0,   67,  0,   0,   0,   88,  24,  0,   4,   0,   112,
>+    16,  0,   0,   0,   0,   0,   51,  51,  0,   0,   98,  16,  0,   3,   50,  16,  16,  0,   1,
>+    0,   0,   0,   101, 0,   0,   3,   242, 32,  16,  0,   0,   0,   0,   0,   104, 0,   0,   2,
>+    1,   0,   0,   0,   61,  16,  0,   7,   242, 0,   16,  0,   0,   0,   0,   0,   1,   64,  0,
>+    0,   0,   0,   0,   0,   70,  126, 16,  0,   0,   0,   0,   0,   86,  0,   0,   5,   50,  0,
>+    16,  0,   0,   0,   0,   0,   70,  0,   16,  0,   0,   0,   0,   0,   56,  0,   0,   7,   50,
>+    0,   16,  0,   0,   0,   0,   0,   70,  0,   16,  0,   0,   0,   0,   0,   70,  16,  16,  0,
>+    1,   0,   0,   0,   27,  0,   0,   5,   50,  0,   16,  0,   0,   0,   0,   0,   70,  0,   16,
>+    0,   0,   0,   0,   0,   54,  0,   0,   8,   194, 0,   16,  0,   0,   0,   0,   0,   2,   64,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   45,
>+    0,   0,   7,   242, 0,   16,  0,   0,   0,   0,   0,   70,  14,  16,  0,   0,   0,   0,   0,
>+    70,  126, 16,  0,   0,   0,   0,   0,   54,  0,   0,   5,   18,  32,  16,  0,   0,   0,   0,
>+    0,   10,  0,   16,  0,   0,   0,   0,   0,   54,  0,   0,   8,   226, 32,  16,  0,   0,   0,
>+    0,   0,   2,   64,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   62,  0,   0,   1,   83,  84,  65,  84,  116, 0,   0,   0,   9,   0,   0,   0,
>+    1,   0,   0,   0,   0,   0,   0,   0,   2,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   3,   0,   0,   0,
>+    0,   0,   0,   0,   2,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0};
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughr2dui11ps.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughr2dui11ps.h
>index 3f3885a1f2a..dd4c32092c1 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughr2dui11ps.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughr2dui11ps.h
>@@ -1,6 +1,10 @@
> #if 0
> //
>-// Generated by Microsoft (R) HLSL Shader Compiler 6.3.9600.16384
>+// Generated by Microsoft (R) HLSL Shader Compiler 9.29.952.3111
>+//
>+//
>+//   fxc /nologo /E PS_PassthroughR2DUI /T ps_4_0 /Fh
>+//    compiled\passthroughr2dui11ps.h Passthrough2D11.hlsl
> //
> //
> // Resource Bindings:
>@@ -13,17 +17,17 @@
> //
> // Input signature:
> //
>-// Name                 Index   Mask Register SysValue  Format   Used
>-// -------------------- ----- ------ -------- -------- ------- ------
>-// SV_POSITION              0   xyzw        0      POS   float       
>-// TEXCOORD                 0   xy          1     NONE   float   xy  
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_POSITION              0   xyzw        0      POS  float       
>+// TEXCOORD                 0   xy          1     NONE  float   xy  
> //
> //
> // Output signature:
> //
>-// Name                 Index   Mask Register SysValue  Format   Used
>-// -------------------- ----- ------ -------- -------- ------- ------
>-// SV_TARGET                0   xyzw        0   TARGET    uint   xyzw
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_TARGET                0   xyzw        0   TARGET   uint   xyzw
> //
> ps_4_0
> dcl_resource_texture2d (uint,uint,uint,uint) t0
>@@ -42,126 +46,42 @@ ret
> // Approximately 9 instruction slots used
> #endif
> 
>-const BYTE g_PS_PassthroughR2DUI[] =
>-{
>-     68,  88,  66,  67,   4,  26, 
>-     62, 109,  94,  45, 124, 238, 
>-    150, 245,  85, 155, 185,  37, 
>-    234, 152,   1,   0,   0,   0, 
>-    208,   2,   0,   0,   5,   0, 
>-      0,   0,  52,   0,   0,   0, 
>-    180,   0,   0,   0,  12,   1, 
>-      0,   0,  64,   1,   0,   0, 
>-     84,   2,   0,   0,  82,  68, 
>-     69,  70, 120,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   1,   0,   0,   0, 
>-     28,   0,   0,   0,   0,   4, 
>-    255, 255,   0,   1,   0,   0, 
>-     70,   0,   0,   0,  60,   0, 
>-      0,   0,   2,   0,   0,   0, 
>-      4,   0,   0,   0,   4,   0, 
>-      0,   0, 255, 255, 255, 255, 
>-      0,   0,   0,   0,   1,   0, 
>-      0,   0,  13,   0,   0,   0, 
>-     84, 101, 120, 116, 117, 114, 
>-    101,  85,  73,   0,  77, 105, 
>-     99, 114, 111, 115, 111, 102, 
>-    116,  32,  40,  82,  41,  32, 
>-     72,  76,  83,  76,  32,  83, 
>-    104,  97, 100, 101, 114,  32, 
>-     67, 111, 109, 112, 105, 108, 
>-    101, 114,  32,  54,  46,  51, 
>-     46,  57,  54,  48,  48,  46, 
>-     49,  54,  51,  56,  52,   0, 
>-     73,  83,  71,  78,  80,   0, 
>-      0,   0,   2,   0,   0,   0, 
>-      8,   0,   0,   0,  56,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      1,   0,   0,   0,   3,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-     15,   0,   0,   0,  68,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   3,   0, 
>-      0,   0,   1,   0,   0,   0, 
>-      3,   3,   0,   0,  83,  86, 
>-     95,  80,  79,  83,  73,  84, 
>-     73,  79,  78,   0,  84,  69, 
>-     88,  67,  79,  79,  82,  68, 
>-      0, 171, 171, 171,  79,  83, 
>-     71,  78,  44,   0,   0,   0, 
>-      1,   0,   0,   0,   8,   0, 
>-      0,   0,  32,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   1,   0,   0,   0, 
>-      0,   0,   0,   0,  15,   0, 
>-      0,   0,  83,  86,  95,  84, 
>-     65,  82,  71,  69,  84,   0, 
>-    171, 171,  83,  72,  68,  82, 
>-     12,   1,   0,   0,  64,   0, 
>-      0,   0,  67,   0,   0,   0, 
>-     88,  24,   0,   4,   0, 112, 
>-     16,   0,   0,   0,   0,   0, 
>-     68,  68,   0,   0,  98,  16, 
>-      0,   3,  50,  16,  16,   0, 
>-      1,   0,   0,   0, 101,   0, 
>-      0,   3, 242,  32,  16,   0, 
>-      0,   0,   0,   0, 104,   0, 
>-      0,   2,   1,   0,   0,   0, 
>-     61,  16,   0,   7, 242,   0, 
>-     16,   0,   0,   0,   0,   0, 
>-      1,  64,   0,   0,   0,   0, 
>-      0,   0,  70, 126,  16,   0, 
>-      0,   0,   0,   0,  86,   0, 
>-      0,   5,  50,   0,  16,   0, 
>-      0,   0,   0,   0,  70,   0, 
>-     16,   0,   0,   0,   0,   0, 
>-     56,   0,   0,   7,  50,   0, 
>-     16,   0,   0,   0,   0,   0, 
>-     70,   0,  16,   0,   0,   0, 
>-      0,   0,  70,  16,  16,   0, 
>-      1,   0,   0,   0,  27,   0, 
>-      0,   5,  50,   0,  16,   0, 
>-      0,   0,   0,   0,  70,   0, 
>-     16,   0,   0,   0,   0,   0, 
>-     54,   0,   0,   8, 194,   0, 
>-     16,   0,   0,   0,   0,   0, 
>-      2,  64,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,  45,   0,   0,   7, 
>-    242,   0,  16,   0,   0,   0, 
>-      0,   0,  70,  14,  16,   0, 
>-      0,   0,   0,   0,  70, 126, 
>-     16,   0,   0,   0,   0,   0, 
>-     54,   0,   0,   5,  18,  32, 
>-     16,   0,   0,   0,   0,   0, 
>-     10,   0,  16,   0,   0,   0, 
>-      0,   0,  54,   0,   0,   8, 
>-    226,  32,  16,   0,   0,   0, 
>-      0,   0,   2,  64,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,  62,   0, 
>-      0,   1,  83,  84,  65,  84, 
>-    116,   0,   0,   0,   9,   0, 
>-      0,   0,   1,   0,   0,   0, 
>-      0,   0,   0,   0,   2,   0, 
>-      0,   0,   1,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   1,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   1,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   3,   0,   0,   0, 
>-      0,   0,   0,   0,   2,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0
>-};
>+const BYTE g_PS_PassthroughR2DUI[] = {
>+    68,  88,  66,  67,  55,  128, 134, 94,  118, 7,   10,  194, 208, 15,  238, 95,  29, 18,  60,
>+    168, 1,   0,   0,   0,   208, 2,   0,   0,   5,   0,   0,   0,   52,  0,   0,   0,  180, 0,
>+    0,   0,   12,  1,   0,   0,   64,  1,   0,   0,   84,  2,   0,   0,   82,  68,  69, 70,  120,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   28,  0,  0,   0,
>+    0,   4,   255, 255, 0,   1,   0,   0,   70,  0,   0,   0,   60,  0,   0,   0,   2,  0,   0,
>+    0,   4,   0,   0,   0,   4,   0,   0,   0,   255, 255, 255, 255, 0,   0,   0,   0,  1,   0,
>+    0,   0,   13,  0,   0,   0,   84,  101, 120, 116, 117, 114, 101, 85,  73,  0,   77, 105, 99,
>+    114, 111, 115, 111, 102, 116, 32,  40,  82,  41,  32,  72,  76,  83,  76,  32,  83, 104, 97,
>+    100, 101, 114, 32,  67,  111, 109, 112, 105, 108, 101, 114, 32,  57,  46,  50,  57, 46,  57,
>+    53,  50,  46,  51,  49,  49,  49,  0,   171, 73,  83,  71,  78,  80,  0,   0,   0,  2,   0,
>+    0,   0,   8,   0,   0,   0,   56,  0,   0,   0,   0,   0,   0,   0,   1,   0,   0,  0,   3,
>+    0,   0,   0,   0,   0,   0,   0,   15,  0,   0,   0,   68,  0,   0,   0,   0,   0,  0,   0,
>+    0,   0,   0,   0,   3,   0,   0,   0,   1,   0,   0,   0,   3,   3,   0,   0,   83, 86,  95,
>+    80,  79,  83,  73,  84,  73,  79,  78,  0,   84,  69,  88,  67,  79,  79,  82,  68, 0,   171,
>+    171, 171, 79,  83,  71,  78,  44,  0,   0,   0,   1,   0,   0,   0,   8,   0,   0,  0,   32,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   0,   0,  0,   0,
>+    15,  0,   0,   0,   83,  86,  95,  84,  65,  82,  71,  69,  84,  0,   171, 171, 83, 72,  68,
>+    82,  12,  1,   0,   0,   64,  0,   0,   0,   67,  0,   0,   0,   88,  24,  0,   4,  0,   112,
>+    16,  0,   0,   0,   0,   0,   68,  68,  0,   0,   98,  16,  0,   3,   50,  16,  16, 0,   1,
>+    0,   0,   0,   101, 0,   0,   3,   242, 32,  16,  0,   0,   0,   0,   0,   104, 0,  0,   2,
>+    1,   0,   0,   0,   61,  16,  0,   7,   242, 0,   16,  0,   0,   0,   0,   0,   1,  64,  0,
>+    0,   0,   0,   0,   0,   70,  126, 16,  0,   0,   0,   0,   0,   86,  0,   0,   5,  50,  0,
>+    16,  0,   0,   0,   0,   0,   70,  0,   16,  0,   0,   0,   0,   0,   56,  0,   0,  7,   50,
>+    0,   16,  0,   0,   0,   0,   0,   70,  0,   16,  0,   0,   0,   0,   0,   70,  16, 16,  0,
>+    1,   0,   0,   0,   27,  0,   0,   5,   50,  0,   16,  0,   0,   0,   0,   0,   70, 0,   16,
>+    0,   0,   0,   0,   0,   54,  0,   0,   8,   194, 0,   16,  0,   0,   0,   0,   0,  2,   64,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,  0,   45,
>+    0,   0,   7,   242, 0,   16,  0,   0,   0,   0,   0,   70,  14,  16,  0,   0,   0,  0,   0,
>+    70,  126, 16,  0,   0,   0,   0,   0,   54,  0,   0,   5,   18,  32,  16,  0,   0,  0,   0,
>+    0,   10,  0,   16,  0,   0,   0,   0,   0,   54,  0,   0,   8,   226, 32,  16,  0,  0,   0,
>+    0,   0,   2,   64,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,  0,   0,
>+    0,   0,   0,   62,  0,   0,   1,   83,  84,  65,  84,  116, 0,   0,   0,   9,   0,  0,   0,
>+    1,   0,   0,   0,   0,   0,   0,   0,   2,   0,   0,   0,   1,   0,   0,   0,   0,  0,   0,
>+    0,   0,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,  0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,  0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   3,   0,  0,   0,
>+    0,   0,   0,   0,   2,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,  0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0};
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughr3d11ps.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughr3d11ps.h
>index 506baef443f..6bf38da007d 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughr3d11ps.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughr3d11ps.h
>@@ -1,6 +1,10 @@
> #if 0
> //
>-// Generated by Microsoft (R) HLSL Shader Compiler 6.3.9600.16384
>+// Generated by Microsoft (R) HLSL Shader Compiler 9.29.952.3111
>+//
>+//
>+//   fxc /nologo /E PS_PassthroughR3D /T ps_4_0 /Fh
>+//    compiled\passthroughr3d11ps.h Passthrough3D11.hlsl
> //
> //
> // Resource Bindings:
>@@ -14,18 +18,18 @@
> //
> // Input signature:
> //
>-// Name                 Index   Mask Register SysValue  Format   Used
>-// -------------------- ----- ------ -------- -------- ------- ------
>-// SV_POSITION              0   xyzw        0      POS   float       
>-// SV_RENDERTARGETARRAYINDEX     0   x           1  RTINDEX    uint       
>-// TEXCOORD                 0   xyz         2     NONE   float   xyz 
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_POSITION              0   xyzw        0      POS  float       
>+// SV_RENDERTARGETARRAYINDEX     0   x           1  RTINDEX   uint       
>+// TEXCOORD                 0   xyz         2     NONE  float   xyz 
> //
> //
> // Output signature:
> //
>-// Name                 Index   Mask Register SysValue  Format   Used
>-// -------------------- ----- ------ -------- -------- ------- ------
>-// SV_TARGET                0   xyzw        0   TARGET   float   xyzw
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_TARGET                0   xyzw        0   TARGET  float   xyzw
> //
> ps_4_0
> dcl_sampler s0, mode_default
>@@ -40,123 +44,41 @@ ret
> // Approximately 4 instruction slots used
> #endif
> 
>-const BYTE g_PS_PassthroughR3D[] =
>-{
>-     68,  88,  66,  67,  11, 235, 
>-    208, 143, 219, 183, 141,  78, 
>-    136, 182,  62, 182, 243,  12, 
>-    239, 125,   1,   0,   0,   0, 
>-    188,   2,   0,   0,   5,   0, 
>-      0,   0,  52,   0,   0,   0, 
>-    220,   0,   0,   0, 100,   1, 
>-      0,   0, 152,   1,   0,   0, 
>-     64,   2,   0,   0,  82,  68, 
>-     69,  70, 160,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   2,   0,   0,   0, 
>-     28,   0,   0,   0,   0,   4, 
>-    255, 255,   0,   1,   0,   0, 
>-    109,   0,   0,   0,  92,   0, 
>-      0,   0,   3,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   1,   0, 
>-      0,   0,   1,   0,   0,   0, 
>-    100,   0,   0,   0,   2,   0, 
>-      0,   0,   5,   0,   0,   0, 
>-      8,   0,   0,   0, 255, 255, 
>-    255, 255,   0,   0,   0,   0, 
>-      1,   0,   0,   0,  13,   0, 
>-      0,   0,  83,  97, 109, 112, 
>-    108, 101, 114,   0,  84, 101, 
>-    120, 116, 117, 114, 101,  70, 
>-      0,  77, 105,  99, 114, 111, 
>-    115, 111, 102, 116,  32,  40, 
>-     82,  41,  32,  72,  76,  83, 
>-     76,  32,  83, 104,  97, 100, 
>-    101, 114,  32,  67, 111, 109, 
>-    112, 105, 108, 101, 114,  32, 
>-     54,  46,  51,  46,  57,  54, 
>-     48,  48,  46,  49,  54,  51, 
>-     56,  52,   0, 171,  73,  83, 
>-     71,  78, 128,   0,   0,   0, 
>-      3,   0,   0,   0,   8,   0, 
>-      0,   0,  80,   0,   0,   0, 
>-      0,   0,   0,   0,   1,   0, 
>-      0,   0,   3,   0,   0,   0, 
>-      0,   0,   0,   0,  15,   0, 
>-      0,   0,  92,   0,   0,   0, 
>-      0,   0,   0,   0,   4,   0, 
>-      0,   0,   1,   0,   0,   0, 
>-      1,   0,   0,   0,   1,   0, 
>-      0,   0, 118,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   3,   0,   0,   0, 
>-      2,   0,   0,   0,   7,   7, 
>-      0,   0,  83,  86,  95,  80, 
>-     79,  83,  73,  84,  73,  79, 
>-     78,   0,  83,  86,  95,  82, 
>-     69,  78,  68,  69,  82,  84, 
>-     65,  82,  71,  69,  84,  65, 
>-     82,  82,  65,  89,  73,  78, 
>-     68,  69,  88,   0,  84,  69, 
>-     88,  67,  79,  79,  82,  68, 
>-      0, 171,  79,  83,  71,  78, 
>-     44,   0,   0,   0,   1,   0, 
>-      0,   0,   8,   0,   0,   0, 
>-     32,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      3,   0,   0,   0,   0,   0, 
>-      0,   0,  15,   0,   0,   0, 
>-     83,  86,  95,  84,  65,  82, 
>-     71,  69,  84,   0, 171, 171, 
>-     83,  72,  68,  82, 160,   0, 
>-      0,   0,  64,   0,   0,   0, 
>-     40,   0,   0,   0,  90,   0, 
>-      0,   3,   0,  96,  16,   0, 
>-      0,   0,   0,   0,  88,  40, 
>-      0,   4,   0, 112,  16,   0, 
>-      0,   0,   0,   0,  85,  85, 
>-      0,   0,  98,  16,   0,   3, 
>-    114,  16,  16,   0,   2,   0, 
>-      0,   0, 101,   0,   0,   3, 
>-    242,  32,  16,   0,   0,   0, 
>-      0,   0, 104,   0,   0,   2, 
>-      1,   0,   0,   0,  69,   0, 
>-      0,   9, 242,   0,  16,   0, 
>-      0,   0,   0,   0,  70,  18, 
>-     16,   0,   2,   0,   0,   0, 
>-     70, 126,  16,   0,   0,   0, 
>-      0,   0,   0,  96,  16,   0, 
>-      0,   0,   0,   0,  54,   0, 
>-      0,   5,  18,  32,  16,   0, 
>-      0,   0,   0,   0,  10,   0, 
>-     16,   0,   0,   0,   0,   0, 
>-     54,   0,   0,   8, 226,  32, 
>-     16,   0,   0,   0,   0,   0, 
>-      2,  64,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-    128,  63,  62,   0,   0,   1, 
>-     83,  84,  65,  84, 116,   0, 
>-      0,   0,   4,   0,   0,   0, 
>-      1,   0,   0,   0,   0,   0, 
>-      0,   0,   2,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      1,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   1,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      2,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0
>-};
>+const BYTE g_PS_PassthroughR3D[] = {
>+    68,  88,  66,  67,  163, 108, 19,  168, 114, 56,  140, 241, 17,  131, 30,  212, 85, 209, 92,
>+    73,  1,   0,   0,   0,   188, 2,   0,   0,   5,   0,   0,   0,   52,  0,   0,   0,  220, 0,
>+    0,   0,   100, 1,   0,   0,   152, 1,   0,   0,   64,  2,   0,   0,   82,  68,  69, 70,  160,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   2,   0,   0,   0,   28,  0,  0,   0,
>+    0,   4,   255, 255, 0,   1,   0,   0,   109, 0,   0,   0,   92,  0,   0,   0,   3,  0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,  1,   0,
>+    0,   0,   1,   0,   0,   0,   100, 0,   0,   0,   2,   0,   0,   0,   5,   0,   0,  0,   8,
>+    0,   0,   0,   255, 255, 255, 255, 0,   0,   0,   0,   1,   0,   0,   0,   13,  0,  0,   0,
>+    83,  97,  109, 112, 108, 101, 114, 0,   84,  101, 120, 116, 117, 114, 101, 70,  0,  77,  105,
>+    99,  114, 111, 115, 111, 102, 116, 32,  40,  82,  41,  32,  72,  76,  83,  76,  32, 83,  104,
>+    97,  100, 101, 114, 32,  67,  111, 109, 112, 105, 108, 101, 114, 32,  57,  46,  50, 57,  46,
>+    57,  53,  50,  46,  51,  49,  49,  49,  0,   171, 171, 73,  83,  71,  78,  128, 0,  0,   0,
>+    3,   0,   0,   0,   8,   0,   0,   0,   80,  0,   0,   0,   0,   0,   0,   0,   1,  0,   0,
>+    0,   3,   0,   0,   0,   0,   0,   0,   0,   15,  0,   0,   0,   92,  0,   0,   0,  0,   0,
>+    0,   0,   4,   0,   0,   0,   1,   0,   0,   0,   1,   0,   0,   0,   1,   0,   0,  0,   118,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   3,   0,   0,   0,   2,   0,  0,   0,
>+    7,   7,   0,   0,   83,  86,  95,  80,  79,  83,  73,  84,  73,  79,  78,  0,   83, 86,  95,
>+    82,  69,  78,  68,  69,  82,  84,  65,  82,  71,  69,  84,  65,  82,  82,  65,  89, 73,  78,
>+    68,  69,  88,  0,   84,  69,  88,  67,  79,  79,  82,  68,  0,   171, 79,  83,  71, 78,  44,
>+    0,   0,   0,   1,   0,   0,   0,   8,   0,   0,   0,   32,  0,   0,   0,   0,   0,  0,   0,
>+    0,   0,   0,   0,   3,   0,   0,   0,   0,   0,   0,   0,   15,  0,   0,   0,   83, 86,  95,
>+    84,  65,  82,  71,  69,  84,  0,   171, 171, 83,  72,  68,  82,  160, 0,   0,   0,  64,  0,
>+    0,   0,   40,  0,   0,   0,   90,  0,   0,   3,   0,   96,  16,  0,   0,   0,   0,  0,   88,
>+    40,  0,   4,   0,   112, 16,  0,   0,   0,   0,   0,   85,  85,  0,   0,   98,  16, 0,   3,
>+    114, 16,  16,  0,   2,   0,   0,   0,   101, 0,   0,   3,   242, 32,  16,  0,   0,  0,   0,
>+    0,   104, 0,   0,   2,   1,   0,   0,   0,   69,  0,   0,   9,   242, 0,   16,  0,  0,   0,
>+    0,   0,   70,  18,  16,  0,   2,   0,   0,   0,   70,  126, 16,  0,   0,   0,   0,  0,   0,
>+    96,  16,  0,   0,   0,   0,   0,   54,  0,   0,   5,   18,  32,  16,  0,   0,   0,  0,   0,
>+    10,  0,   16,  0,   0,   0,   0,   0,   54,  0,   0,   8,   226, 32,  16,  0,   0,  0,   0,
>+    0,   2,   64,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,  0,   0,
>+    128, 63,  62,  0,   0,   1,   83,  84,  65,  84,  116, 0,   0,   0,   4,   0,   0,  0,   1,
>+    0,   0,   0,   0,   0,   0,   0,   2,   0,   0,   0,   0,   0,   0,   0,   0,   0,  0,   0,
>+    0,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,  0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,  0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   2,   0,   0,  0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,  0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0};
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughr3di11ps.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughr3di11ps.h
>index 89c35d600c9..de572bff2b6 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughr3di11ps.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughr3di11ps.h
>@@ -1,6 +1,10 @@
> #if 0
> //
>-// Generated by Microsoft (R) HLSL Shader Compiler 6.3.9600.16384
>+// Generated by Microsoft (R) HLSL Shader Compiler 9.29.952.3111
>+//
>+//
>+//   fxc /nologo /E PS_PassthroughR3DI /T ps_4_0 /Fh
>+//    compiled\passthroughr3di11ps.h Passthrough3D11.hlsl
> //
> //
> // Resource Bindings:
>@@ -13,18 +17,18 @@
> //
> // Input signature:
> //
>-// Name                 Index   Mask Register SysValue  Format   Used
>-// -------------------- ----- ------ -------- -------- ------- ------
>-// SV_POSITION              0   xyzw        0      POS   float       
>-// SV_RENDERTARGETARRAYINDEX     0   x           1  RTINDEX    uint       
>-// TEXCOORD                 0   xyz         2     NONE   float   xyz 
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_POSITION              0   xyzw        0      POS  float       
>+// SV_RENDERTARGETARRAYINDEX     0   x           1  RTINDEX   uint       
>+// TEXCOORD                 0   xyz         2     NONE  float   xyz 
> //
> //
> // Output signature:
> //
>-// Name                 Index   Mask Register SysValue  Format   Used
>-// -------------------- ----- ------ -------- -------- ------- ------
>-// SV_TARGET                0   xyzw        0   TARGET     int   xyzw
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_TARGET                0   xyzw        0   TARGET    int   xyzw
> //
> ps_4_0
> dcl_resource_texture3d (sint,sint,sint,sint) t0
>@@ -43,132 +47,44 @@ ret
> // Approximately 9 instruction slots used
> #endif
> 
>-const BYTE g_PS_PassthroughR3DI[] =
>-{
>-     68,  88,  66,  67, 222, 251, 
>-     30,  61,  15,  80,  81, 247, 
>-    175, 137,  44,  19,  23,  84, 
>-    149, 211,   1,   0,   0,   0, 
>-    244,   2,   0,   0,   5,   0, 
>-      0,   0,  52,   0,   0,   0, 
>-    180,   0,   0,   0,  60,   1, 
>-      0,   0, 112,   1,   0,   0, 
>-    120,   2,   0,   0,  82,  68, 
>-     69,  70, 120,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   1,   0,   0,   0, 
>-     28,   0,   0,   0,   0,   4, 
>-    255, 255,   0,   1,   0,   0, 
>-     69,   0,   0,   0,  60,   0, 
>-      0,   0,   2,   0,   0,   0, 
>-      3,   0,   0,   0,   8,   0, 
>-      0,   0, 255, 255, 255, 255, 
>-      0,   0,   0,   0,   1,   0, 
>-      0,   0,  13,   0,   0,   0, 
>-     84, 101, 120, 116, 117, 114, 
>-    101,  73,   0,  77, 105,  99, 
>-    114, 111, 115, 111, 102, 116, 
>-     32,  40,  82,  41,  32,  72, 
>-     76,  83,  76,  32,  83, 104, 
>-     97, 100, 101, 114,  32,  67, 
>-    111, 109, 112, 105, 108, 101, 
>-    114,  32,  54,  46,  51,  46, 
>-     57,  54,  48,  48,  46,  49, 
>-     54,  51,  56,  52,   0, 171, 
>-     73,  83,  71,  78, 128,   0, 
>-      0,   0,   3,   0,   0,   0, 
>-      8,   0,   0,   0,  80,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      1,   0,   0,   0,   3,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-     15,   0,   0,   0,  92,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      4,   0,   0,   0,   1,   0, 
>-      0,   0,   1,   0,   0,   0, 
>-      1,   0,   0,   0, 118,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   3,   0, 
>-      0,   0,   2,   0,   0,   0, 
>-      7,   7,   0,   0,  83,  86, 
>-     95,  80,  79,  83,  73,  84, 
>-     73,  79,  78,   0,  83,  86, 
>-     95,  82,  69,  78,  68,  69, 
>-     82,  84,  65,  82,  71,  69, 
>-     84,  65,  82,  82,  65,  89, 
>-     73,  78,  68,  69,  88,   0, 
>-     84,  69,  88,  67,  79,  79, 
>-     82,  68,   0, 171,  79,  83, 
>-     71,  78,  44,   0,   0,   0, 
>-      1,   0,   0,   0,   8,   0, 
>-      0,   0,  32,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   2,   0,   0,   0, 
>-      0,   0,   0,   0,  15,   0, 
>-      0,   0,  83,  86,  95,  84, 
>-     65,  82,  71,  69,  84,   0, 
>-    171, 171,  83,  72,  68,  82, 
>-      0,   1,   0,   0,  64,   0, 
>-      0,   0,  64,   0,   0,   0, 
>-     88,  40,   0,   4,   0, 112, 
>-     16,   0,   0,   0,   0,   0, 
>-     51,  51,   0,   0,  98,  16, 
>-      0,   3, 114,  16,  16,   0, 
>-      2,   0,   0,   0, 101,   0, 
>-      0,   3, 242,  32,  16,   0, 
>-      0,   0,   0,   0, 104,   0, 
>-      0,   2,   1,   0,   0,   0, 
>-     61,  16,   0,   7, 242,   0, 
>-     16,   0,   0,   0,   0,   0, 
>-      1,  64,   0,   0,   0,   0, 
>-      0,   0,  70, 126,  16,   0, 
>-      0,   0,   0,   0,  86,   0, 
>-      0,   5, 114,   0,  16,   0, 
>-      0,   0,   0,   0,  70,   2, 
>-     16,   0,   0,   0,   0,   0, 
>-     56,   0,   0,   7, 114,   0, 
>-     16,   0,   0,   0,   0,   0, 
>-     70,   2,  16,   0,   0,   0, 
>-      0,   0,  70,  18,  16,   0, 
>-      2,   0,   0,   0,  27,   0, 
>-      0,   5, 114,   0,  16,   0, 
>-      0,   0,   0,   0,  70,   2, 
>-     16,   0,   0,   0,   0,   0, 
>-     54,   0,   0,   5, 130,   0, 
>-     16,   0,   0,   0,   0,   0, 
>-      1,  64,   0,   0,   0,   0, 
>-      0,   0,  45,   0,   0,   7, 
>-    242,   0,  16,   0,   0,   0, 
>-      0,   0,  70,  14,  16,   0, 
>-      0,   0,   0,   0,  70, 126, 
>-     16,   0,   0,   0,   0,   0, 
>-     54,   0,   0,   5,  18,  32, 
>-     16,   0,   0,   0,   0,   0, 
>-     10,   0,  16,   0,   0,   0, 
>-      0,   0,  54,   0,   0,   8, 
>-    226,  32,  16,   0,   0,   0, 
>-      0,   0,   2,  64,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,  62,   0, 
>-      0,   1,  83,  84,  65,  84, 
>-    116,   0,   0,   0,   9,   0, 
>-      0,   0,   1,   0,   0,   0, 
>-      0,   0,   0,   0,   2,   0, 
>-      0,   0,   1,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   1,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   1,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   3,   0,   0,   0, 
>-      0,   0,   0,   0,   2,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0
>-};
>+const BYTE g_PS_PassthroughR3DI[] = {
>+    68,  88,  66,  67,  127, 168, 81,  164, 11,  136, 38,  235, 9,   101, 192, 215, 64,  24,  167,
>+    101, 1,   0,   0,   0,   244, 2,   0,   0,   5,   0,   0,   0,   52,  0,   0,   0,   180, 0,
>+    0,   0,   60,  1,   0,   0,   112, 1,   0,   0,   120, 2,   0,   0,   82,  68,  69,  70,  120,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   28,  0,   0,   0,
>+    0,   4,   255, 255, 0,   1,   0,   0,   69,  0,   0,   0,   60,  0,   0,   0,   2,   0,   0,
>+    0,   3,   0,   0,   0,   8,   0,   0,   0,   255, 255, 255, 255, 0,   0,   0,   0,   1,   0,
>+    0,   0,   13,  0,   0,   0,   84,  101, 120, 116, 117, 114, 101, 73,  0,   77,  105, 99,  114,
>+    111, 115, 111, 102, 116, 32,  40,  82,  41,  32,  72,  76,  83,  76,  32,  83,  104, 97,  100,
>+    101, 114, 32,  67,  111, 109, 112, 105, 108, 101, 114, 32,  57,  46,  50,  57,  46,  57,  53,
>+    50,  46,  51,  49,  49,  49,  0,   171, 171, 73,  83,  71,  78,  128, 0,   0,   0,   3,   0,
>+    0,   0,   8,   0,   0,   0,   80,  0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   3,
>+    0,   0,   0,   0,   0,   0,   0,   15,  0,   0,   0,   92,  0,   0,   0,   0,   0,   0,   0,
>+    4,   0,   0,   0,   1,   0,   0,   0,   1,   0,   0,   0,   1,   0,   0,   0,   118, 0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   3,   0,   0,   0,   2,   0,   0,   0,   7,   7,
>+    0,   0,   83,  86,  95,  80,  79,  83,  73,  84,  73,  79,  78,  0,   83,  86,  95,  82,  69,
>+    78,  68,  69,  82,  84,  65,  82,  71,  69,  84,  65,  82,  82,  65,  89,  73,  78,  68,  69,
>+    88,  0,   84,  69,  88,  67,  79,  79,  82,  68,  0,   171, 79,  83,  71,  78,  44,  0,   0,
>+    0,   1,   0,   0,   0,   8,   0,   0,   0,   32,  0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   2,   0,   0,   0,   0,   0,   0,   0,   15,  0,   0,   0,   83,  86,  95,  84,  65,
>+    82,  71,  69,  84,  0,   171, 171, 83,  72,  68,  82,  0,   1,   0,   0,   64,  0,   0,   0,
>+    64,  0,   0,   0,   88,  40,  0,   4,   0,   112, 16,  0,   0,   0,   0,   0,   51,  51,  0,
>+    0,   98,  16,  0,   3,   114, 16,  16,  0,   2,   0,   0,   0,   101, 0,   0,   3,   242, 32,
>+    16,  0,   0,   0,   0,   0,   104, 0,   0,   2,   1,   0,   0,   0,   61,  16,  0,   7,   242,
>+    0,   16,  0,   0,   0,   0,   0,   1,   64,  0,   0,   0,   0,   0,   0,   70,  126, 16,  0,
>+    0,   0,   0,   0,   86,  0,   0,   5,   114, 0,   16,  0,   0,   0,   0,   0,   70,  2,   16,
>+    0,   0,   0,   0,   0,   56,  0,   0,   7,   114, 0,   16,  0,   0,   0,   0,   0,   70,  2,
>+    16,  0,   0,   0,   0,   0,   70,  18,  16,  0,   2,   0,   0,   0,   27,  0,   0,   5,   114,
>+    0,   16,  0,   0,   0,   0,   0,   70,  2,   16,  0,   0,   0,   0,   0,   54,  0,   0,   5,
>+    130, 0,   16,  0,   0,   0,   0,   0,   1,   64,  0,   0,   0,   0,   0,   0,   45,  0,   0,
>+    7,   242, 0,   16,  0,   0,   0,   0,   0,   70,  14,  16,  0,   0,   0,   0,   0,   70,  126,
>+    16,  0,   0,   0,   0,   0,   54,  0,   0,   5,   18,  32,  16,  0,   0,   0,   0,   0,   10,
>+    0,   16,  0,   0,   0,   0,   0,   54,  0,   0,   8,   226, 32,  16,  0,   0,   0,   0,   0,
>+    2,   64,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   62,  0,   0,   1,   83,  84,  65,  84,  116, 0,   0,   0,   9,   0,   0,   0,   1,   0,
>+    0,   0,   0,   0,   0,   0,   2,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   3,   0,   0,   0,   0,   0,
>+    0,   0,   2,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0};
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughr3dui11ps.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughr3dui11ps.h
>index 64386841c2d..47d726dc8ad 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughr3dui11ps.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughr3dui11ps.h
>@@ -1,6 +1,10 @@
> #if 0
> //
>-// Generated by Microsoft (R) HLSL Shader Compiler 6.3.9600.16384
>+// Generated by Microsoft (R) HLSL Shader Compiler 9.29.952.3111
>+//
>+//
>+//   fxc /nologo /E PS_PassthroughR3DUI /T ps_4_0 /Fh
>+//    compiled\passthroughr3dui11ps.h Passthrough3D11.hlsl
> //
> //
> // Resource Bindings:
>@@ -13,18 +17,18 @@
> //
> // Input signature:
> //
>-// Name                 Index   Mask Register SysValue  Format   Used
>-// -------------------- ----- ------ -------- -------- ------- ------
>-// SV_POSITION              0   xyzw        0      POS   float       
>-// SV_RENDERTARGETARRAYINDEX     0   x           1  RTINDEX    uint       
>-// TEXCOORD                 0   xyz         2     NONE   float   xyz 
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_POSITION              0   xyzw        0      POS  float       
>+// SV_RENDERTARGETARRAYINDEX     0   x           1  RTINDEX   uint       
>+// TEXCOORD                 0   xyz         2     NONE  float   xyz 
> //
> //
> // Output signature:
> //
>-// Name                 Index   Mask Register SysValue  Format   Used
>-// -------------------- ----- ------ -------- -------- ------- ------
>-// SV_TARGET                0   xyzw        0   TARGET    uint   xyzw
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_TARGET                0   xyzw        0   TARGET   uint   xyzw
> //
> ps_4_0
> dcl_resource_texture3d (uint,uint,uint,uint) t0
>@@ -43,132 +47,44 @@ ret
> // Approximately 9 instruction slots used
> #endif
> 
>-const BYTE g_PS_PassthroughR3DUI[] =
>-{
>-     68,  88,  66,  67,  69,   5, 
>-     86, 212, 201,  54,  97, 205, 
>-     89, 161, 100,  72, 246, 114, 
>-     40, 214,   1,   0,   0,   0, 
>-    244,   2,   0,   0,   5,   0, 
>-      0,   0,  52,   0,   0,   0, 
>-    180,   0,   0,   0,  60,   1, 
>-      0,   0, 112,   1,   0,   0, 
>-    120,   2,   0,   0,  82,  68, 
>-     69,  70, 120,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   1,   0,   0,   0, 
>-     28,   0,   0,   0,   0,   4, 
>-    255, 255,   0,   1,   0,   0, 
>-     70,   0,   0,   0,  60,   0, 
>-      0,   0,   2,   0,   0,   0, 
>-      4,   0,   0,   0,   8,   0, 
>-      0,   0, 255, 255, 255, 255, 
>-      0,   0,   0,   0,   1,   0, 
>-      0,   0,  13,   0,   0,   0, 
>-     84, 101, 120, 116, 117, 114, 
>-    101,  85,  73,   0,  77, 105, 
>-     99, 114, 111, 115, 111, 102, 
>-    116,  32,  40,  82,  41,  32, 
>-     72,  76,  83,  76,  32,  83, 
>-    104,  97, 100, 101, 114,  32, 
>-     67, 111, 109, 112, 105, 108, 
>-    101, 114,  32,  54,  46,  51, 
>-     46,  57,  54,  48,  48,  46, 
>-     49,  54,  51,  56,  52,   0, 
>-     73,  83,  71,  78, 128,   0, 
>-      0,   0,   3,   0,   0,   0, 
>-      8,   0,   0,   0,  80,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      1,   0,   0,   0,   3,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-     15,   0,   0,   0,  92,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      4,   0,   0,   0,   1,   0, 
>-      0,   0,   1,   0,   0,   0, 
>-      1,   0,   0,   0, 118,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   3,   0, 
>-      0,   0,   2,   0,   0,   0, 
>-      7,   7,   0,   0,  83,  86, 
>-     95,  80,  79,  83,  73,  84, 
>-     73,  79,  78,   0,  83,  86, 
>-     95,  82,  69,  78,  68,  69, 
>-     82,  84,  65,  82,  71,  69, 
>-     84,  65,  82,  82,  65,  89, 
>-     73,  78,  68,  69,  88,   0, 
>-     84,  69,  88,  67,  79,  79, 
>-     82,  68,   0, 171,  79,  83, 
>-     71,  78,  44,   0,   0,   0, 
>-      1,   0,   0,   0,   8,   0, 
>-      0,   0,  32,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   1,   0,   0,   0, 
>-      0,   0,   0,   0,  15,   0, 
>-      0,   0,  83,  86,  95,  84, 
>-     65,  82,  71,  69,  84,   0, 
>-    171, 171,  83,  72,  68,  82, 
>-      0,   1,   0,   0,  64,   0, 
>-      0,   0,  64,   0,   0,   0, 
>-     88,  40,   0,   4,   0, 112, 
>-     16,   0,   0,   0,   0,   0, 
>-     68,  68,   0,   0,  98,  16, 
>-      0,   3, 114,  16,  16,   0, 
>-      2,   0,   0,   0, 101,   0, 
>-      0,   3, 242,  32,  16,   0, 
>-      0,   0,   0,   0, 104,   0, 
>-      0,   2,   1,   0,   0,   0, 
>-     61,  16,   0,   7, 242,   0, 
>-     16,   0,   0,   0,   0,   0, 
>-      1,  64,   0,   0,   0,   0, 
>-      0,   0,  70, 126,  16,   0, 
>-      0,   0,   0,   0,  86,   0, 
>-      0,   5, 114,   0,  16,   0, 
>-      0,   0,   0,   0,  70,   2, 
>-     16,   0,   0,   0,   0,   0, 
>-     56,   0,   0,   7, 114,   0, 
>-     16,   0,   0,   0,   0,   0, 
>-     70,   2,  16,   0,   0,   0, 
>-      0,   0,  70,  18,  16,   0, 
>-      2,   0,   0,   0,  27,   0, 
>-      0,   5, 114,   0,  16,   0, 
>-      0,   0,   0,   0,  70,   2, 
>-     16,   0,   0,   0,   0,   0, 
>-     54,   0,   0,   5, 130,   0, 
>-     16,   0,   0,   0,   0,   0, 
>-      1,  64,   0,   0,   0,   0, 
>-      0,   0,  45,   0,   0,   7, 
>-    242,   0,  16,   0,   0,   0, 
>-      0,   0,  70,  14,  16,   0, 
>-      0,   0,   0,   0,  70, 126, 
>-     16,   0,   0,   0,   0,   0, 
>-     54,   0,   0,   5,  18,  32, 
>-     16,   0,   0,   0,   0,   0, 
>-     10,   0,  16,   0,   0,   0, 
>-      0,   0,  54,   0,   0,   8, 
>-    226,  32,  16,   0,   0,   0, 
>-      0,   0,   2,  64,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,  62,   0, 
>-      0,   1,  83,  84,  65,  84, 
>-    116,   0,   0,   0,   9,   0, 
>-      0,   0,   1,   0,   0,   0, 
>-      0,   0,   0,   0,   2,   0, 
>-      0,   0,   1,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   1,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   1,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   3,   0,   0,   0, 
>-      0,   0,   0,   0,   2,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0
>-};
>+const BYTE g_PS_PassthroughR3DUI[] = {
>+    68,  88,  66,  67,  181, 211, 48,  255, 138, 94,  31,  252, 44,  254, 92, 188, 78,  15,  80,
>+    13,  1,   0,   0,   0,   244, 2,   0,   0,   5,   0,   0,   0,   52,  0,  0,   0,   180, 0,
>+    0,   0,   60,  1,   0,   0,   112, 1,   0,   0,   120, 2,   0,   0,   82, 68,  69,  70,  120,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,  28,  0,   0,   0,
>+    0,   4,   255, 255, 0,   1,   0,   0,   70,  0,   0,   0,   60,  0,   0,  0,   2,   0,   0,
>+    0,   4,   0,   0,   0,   8,   0,   0,   0,   255, 255, 255, 255, 0,   0,  0,   0,   1,   0,
>+    0,   0,   13,  0,   0,   0,   84,  101, 120, 116, 117, 114, 101, 85,  73, 0,   77,  105, 99,
>+    114, 111, 115, 111, 102, 116, 32,  40,  82,  41,  32,  72,  76,  83,  76, 32,  83,  104, 97,
>+    100, 101, 114, 32,  67,  111, 109, 112, 105, 108, 101, 114, 32,  57,  46, 50,  57,  46,  57,
>+    53,  50,  46,  51,  49,  49,  49,  0,   171, 73,  83,  71,  78,  128, 0,  0,   0,   3,   0,
>+    0,   0,   8,   0,   0,   0,   80,  0,   0,   0,   0,   0,   0,   0,   1,  0,   0,   0,   3,
>+    0,   0,   0,   0,   0,   0,   0,   15,  0,   0,   0,   92,  0,   0,   0,  0,   0,   0,   0,
>+    4,   0,   0,   0,   1,   0,   0,   0,   1,   0,   0,   0,   1,   0,   0,  0,   118, 0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   3,   0,   0,   0,   2,   0,  0,   0,   7,   7,
>+    0,   0,   83,  86,  95,  80,  79,  83,  73,  84,  73,  79,  78,  0,   83, 86,  95,  82,  69,
>+    78,  68,  69,  82,  84,  65,  82,  71,  69,  84,  65,  82,  82,  65,  89, 73,  78,  68,  69,
>+    88,  0,   84,  69,  88,  67,  79,  79,  82,  68,  0,   171, 79,  83,  71, 78,  44,  0,   0,
>+    0,   1,   0,   0,   0,   8,   0,   0,   0,   32,  0,   0,   0,   0,   0,  0,   0,   0,   0,
>+    0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   15,  0,   0,   0,   83, 86,  95,  84,  65,
>+    82,  71,  69,  84,  0,   171, 171, 83,  72,  68,  82,  0,   1,   0,   0,  64,  0,   0,   0,
>+    64,  0,   0,   0,   88,  40,  0,   4,   0,   112, 16,  0,   0,   0,   0,  0,   68,  68,  0,
>+    0,   98,  16,  0,   3,   114, 16,  16,  0,   2,   0,   0,   0,   101, 0,  0,   3,   242, 32,
>+    16,  0,   0,   0,   0,   0,   104, 0,   0,   2,   1,   0,   0,   0,   61, 16,  0,   7,   242,
>+    0,   16,  0,   0,   0,   0,   0,   1,   64,  0,   0,   0,   0,   0,   0,  70,  126, 16,  0,
>+    0,   0,   0,   0,   86,  0,   0,   5,   114, 0,   16,  0,   0,   0,   0,  0,   70,  2,   16,
>+    0,   0,   0,   0,   0,   56,  0,   0,   7,   114, 0,   16,  0,   0,   0,  0,   0,   70,  2,
>+    16,  0,   0,   0,   0,   0,   70,  18,  16,  0,   2,   0,   0,   0,   27, 0,   0,   5,   114,
>+    0,   16,  0,   0,   0,   0,   0,   70,  2,   16,  0,   0,   0,   0,   0,  54,  0,   0,   5,
>+    130, 0,   16,  0,   0,   0,   0,   0,   1,   64,  0,   0,   0,   0,   0,  0,   45,  0,   0,
>+    7,   242, 0,   16,  0,   0,   0,   0,   0,   70,  14,  16,  0,   0,   0,  0,   0,   70,  126,
>+    16,  0,   0,   0,   0,   0,   54,  0,   0,   5,   18,  32,  16,  0,   0,  0,   0,   0,   10,
>+    0,   16,  0,   0,   0,   0,   0,   54,  0,   0,   8,   226, 32,  16,  0,  0,   0,   0,   0,
>+    2,   64,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,  0,   0,   0,   0,
>+    0,   62,  0,   0,   1,   83,  84,  65,  84,  116, 0,   0,   0,   9,   0,  0,   0,   1,   0,
>+    0,   0,   0,   0,   0,   0,   2,   0,   0,   0,   1,   0,   0,   0,   0,  0,   0,   0,   0,
>+    0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,  0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,  0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   3,   0,  0,   0,   0,   0,
>+    0,   0,   2,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,  0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0};
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrg2d11ps.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrg2d11ps.h
>index 201cbff60ca..158378a1e96 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrg2d11ps.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrg2d11ps.h
>@@ -1,6 +1,10 @@
> #if 0
> //
>-// Generated by Microsoft (R) HLSL Shader Compiler 6.3.9600.16384
>+// Generated by Microsoft (R) HLSL Shader Compiler 9.29.952.3111
>+//
>+//
>+//   fxc /nologo /E PS_PassthroughRG2D /T ps_4_0_level_9_3 /Fh
>+//    compiled\passthroughrg2d11ps.h Passthrough2D11.hlsl
> //
> //
> // Resource Bindings:
>@@ -14,17 +18,17 @@
> //
> // Input signature:
> //
>-// Name                 Index   Mask Register SysValue  Format   Used
>-// -------------------- ----- ------ -------- -------- ------- ------
>-// SV_POSITION              0   xyzw        0      POS   float       
>-// TEXCOORD                 0   xy          1     NONE   float   xy  
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_POSITION              0   xyzw        0      POS  float       
>+// TEXCOORD                 0   xy          1     NONE  float   xy  
> //
> //
> // Output signature:
> //
>-// Name                 Index   Mask Register SysValue  Format   Used
>-// -------------------- ----- ------ -------- -------- ------- ------
>-// SV_TARGET                0   xyzw        0   TARGET   float   xyzw
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_TARGET                0   xyzw        0   TARGET  float   xyzw
> //
> //
> // Sampler/Resource to DX9 shader sampler mappings:
>@@ -58,141 +62,47 @@ ret
> // Approximately 4 instruction slots used
> #endif
> 
>-const BYTE g_PS_PassthroughRG2D[] =
>-{
>-     68,  88,  66,  67, 217, 171, 
>-    153, 248,  26,  15, 102, 119, 
>-     86, 174, 121, 245, 223,  83, 
>-      2, 181,   1,   0,   0,   0, 
>-     40,   3,   0,   0,   6,   0, 
>-      0,   0,  56,   0,   0,   0, 
>-    208,   0,   0,   0, 120,   1, 
>-      0,   0, 244,   1,   0,   0, 
>-    156,   2,   0,   0, 244,   2, 
>-      0,   0,  65, 111, 110,  57, 
>-    144,   0,   0,   0, 144,   0, 
>-      0,   0,   0,   2, 255, 255, 
>-    104,   0,   0,   0,  40,   0, 
>-      0,   0,   0,   0,  40,   0, 
>-      0,   0,  40,   0,   0,   0, 
>-     40,   0,   1,   0,  36,   0, 
>-      0,   0,  40,   0,   0,   0, 
>-      0,   0,   1,   2, 255, 255, 
>-     81,   0,   0,   5,   0,   0, 
>-     15, 160,   0,   0, 128,  63, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-     31,   0,   0,   2,   0,   0, 
>-      0, 128,   0,   0,   3, 176, 
>-     31,   0,   0,   2,   0,   0, 
>-      0, 144,   0,   8,  15, 160, 
>-     66,   0,   0,   3,   0,   0, 
>-     15, 128,   0,   0, 228, 176, 
>-      0,   8, 228, 160,   4,   0, 
>-      0,   4,   0,   0,  15, 128, 
>-      0,   0,   4, 128,   0,   0, 
>-     80, 160,   0,   0,  21, 160, 
>-      1,   0,   0,   2,   0,   8, 
>-     15, 128,   0,   0, 228, 128, 
>-    255, 255,   0,   0,  83,  72, 
>-     68,  82, 160,   0,   0,   0, 
>-     64,   0,   0,   0,  40,   0, 
>-      0,   0,  90,   0,   0,   3, 
>-      0,  96,  16,   0,   0,   0, 
>-      0,   0,  88,  24,   0,   4, 
>-      0, 112,  16,   0,   0,   0, 
>-      0,   0,  85,  85,   0,   0, 
>-     98,  16,   0,   3,  50,  16, 
>-     16,   0,   1,   0,   0,   0, 
>-    101,   0,   0,   3, 242,  32, 
>-     16,   0,   0,   0,   0,   0, 
>-    104,   0,   0,   2,   1,   0, 
>-      0,   0,  69,   0,   0,   9, 
>-    242,   0,  16,   0,   0,   0, 
>-      0,   0,  70,  16,  16,   0, 
>-      1,   0,   0,   0,  70, 126, 
>-     16,   0,   0,   0,   0,   0, 
>-      0,  96,  16,   0,   0,   0, 
>-      0,   0,  54,   0,   0,   5, 
>-     50,  32,  16,   0,   0,   0, 
>-      0,   0,  70,   0,  16,   0, 
>-      0,   0,   0,   0,  54,   0, 
>-      0,   8, 194,  32,  16,   0, 
>-      0,   0,   0,   0,   2,  64, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0, 128,  63, 
>-     62,   0,   0,   1,  83,  84, 
>-     65,  84, 116,   0,   0,   0, 
>-      4,   0,   0,   0,   1,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      2,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   1,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   1,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   2,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,  82,  68,  69,  70, 
>-    160,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      2,   0,   0,   0,  28,   0, 
>-      0,   0,   0,   4, 255, 255, 
>-      0,   1,   0,   0, 109,   0, 
>-      0,   0,  92,   0,   0,   0, 
>-      3,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   1,   0,   0,   0, 
>-      1,   0,   0,   0, 100,   0, 
>-      0,   0,   2,   0,   0,   0, 
>-      5,   0,   0,   0,   4,   0, 
>-      0,   0, 255, 255, 255, 255, 
>-      0,   0,   0,   0,   1,   0, 
>-      0,   0,  13,   0,   0,   0, 
>-     83,  97, 109, 112, 108, 101, 
>-    114,   0,  84, 101, 120, 116, 
>-    117, 114, 101,  70,   0,  77, 
>-    105,  99, 114, 111, 115, 111, 
>-    102, 116,  32,  40,  82,  41, 
>-     32,  72,  76,  83,  76,  32, 
>-     83, 104,  97, 100, 101, 114, 
>-     32,  67, 111, 109, 112, 105, 
>-    108, 101, 114,  32,  54,  46, 
>-     51,  46,  57,  54,  48,  48, 
>-     46,  49,  54,  51,  56,  52, 
>-      0, 171,  73,  83,  71,  78, 
>-     80,   0,   0,   0,   2,   0, 
>-      0,   0,   8,   0,   0,   0, 
>-     56,   0,   0,   0,   0,   0, 
>-      0,   0,   1,   0,   0,   0, 
>-      3,   0,   0,   0,   0,   0, 
>-      0,   0,  15,   0,   0,   0, 
>-     68,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      3,   0,   0,   0,   1,   0, 
>-      0,   0,   3,   3,   0,   0, 
>-     83,  86,  95,  80,  79,  83, 
>-     73,  84,  73,  79,  78,   0, 
>-     84,  69,  88,  67,  79,  79, 
>-     82,  68,   0, 171, 171, 171, 
>-     79,  83,  71,  78,  44,   0, 
>-      0,   0,   1,   0,   0,   0, 
>-      8,   0,   0,   0,  32,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   3,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-     15,   0,   0,   0,  83,  86, 
>-     95,  84,  65,  82,  71,  69, 
>-     84,   0, 171, 171
>-};
>+const BYTE g_PS_PassthroughRG2D[] = {
>+    68,  88,  66,  67,  191, 201, 107, 187, 59,  10,  97,  89,  109, 87,  18,  235, 11,  52,  192,
>+    94,  1,   0,   0,   0,   40,  3,   0,   0,   6,   0,   0,   0,   56,  0,   0,   0,   208, 0,
>+    0,   0,   120, 1,   0,   0,   244, 1,   0,   0,   156, 2,   0,   0,   244, 2,   0,   0,   65,
>+    111, 110, 57,  144, 0,   0,   0,   144, 0,   0,   0,   0,   2,   255, 255, 104, 0,   0,   0,
>+    40,  0,   0,   0,   0,   0,   40,  0,   0,   0,   40,  0,   0,   0,   40,  0,   1,   0,   36,
>+    0,   0,   0,   40,  0,   0,   0,   0,   0,   1,   2,   255, 255, 81,  0,   0,   5,   0,   0,
>+    15,  160, 0,   0,   128, 63,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   31,
>+    0,   0,   2,   0,   0,   0,   128, 0,   0,   3,   176, 31,  0,   0,   2,   0,   0,   0,   144,
>+    0,   8,   15,  160, 66,  0,   0,   3,   0,   0,   15,  128, 0,   0,   228, 176, 0,   8,   228,
>+    160, 4,   0,   0,   4,   0,   0,   15,  128, 0,   0,   4,   128, 0,   0,   80,  160, 0,   0,
>+    21,  160, 1,   0,   0,   2,   0,   8,   15,  128, 0,   0,   228, 128, 255, 255, 0,   0,   83,
>+    72,  68,  82,  160, 0,   0,   0,   64,  0,   0,   0,   40,  0,   0,   0,   90,  0,   0,   3,
>+    0,   96,  16,  0,   0,   0,   0,   0,   88,  24,  0,   4,   0,   112, 16,  0,   0,   0,   0,
>+    0,   85,  85,  0,   0,   98,  16,  0,   3,   50,  16,  16,  0,   1,   0,   0,   0,   101, 0,
>+    0,   3,   242, 32,  16,  0,   0,   0,   0,   0,   104, 0,   0,   2,   1,   0,   0,   0,   69,
>+    0,   0,   9,   242, 0,   16,  0,   0,   0,   0,   0,   70,  16,  16,  0,   1,   0,   0,   0,
>+    70,  126, 16,  0,   0,   0,   0,   0,   0,   96,  16,  0,   0,   0,   0,   0,   54,  0,   0,
>+    5,   50,  32,  16,  0,   0,   0,   0,   0,   70,  0,   16,  0,   0,   0,   0,   0,   54,  0,
>+    0,   8,   194, 32,  16,  0,   0,   0,   0,   0,   2,   64,  0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   128, 63,  62,  0,   0,   1,   83,  84,  65,  84,
>+    116, 0,   0,   0,   4,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   2,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   2,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   82,  68,  69,  70,  160, 0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   2,   0,   0,   0,   28,  0,   0,   0,   0,   4,   255, 255, 0,   1,   0,   0,
>+    109, 0,   0,   0,   92,  0,   0,   0,   3,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   1,   0,   0,   0,   100, 0,
>+    0,   0,   2,   0,   0,   0,   5,   0,   0,   0,   4,   0,   0,   0,   255, 255, 255, 255, 0,
>+    0,   0,   0,   1,   0,   0,   0,   13,  0,   0,   0,   83,  97,  109, 112, 108, 101, 114, 0,
>+    84,  101, 120, 116, 117, 114, 101, 70,  0,   77,  105, 99,  114, 111, 115, 111, 102, 116, 32,
>+    40,  82,  41,  32,  72,  76,  83,  76,  32,  83,  104, 97,  100, 101, 114, 32,  67,  111, 109,
>+    112, 105, 108, 101, 114, 32,  57,  46,  50,  57,  46,  57,  53,  50,  46,  51,  49,  49,  49,
>+    0,   171, 171, 73,  83,  71,  78,  80,  0,   0,   0,   2,   0,   0,   0,   8,   0,   0,   0,
>+    56,  0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   3,   0,   0,   0,   0,   0,   0,
>+    0,   15,  0,   0,   0,   68,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   3,   0,
>+    0,   0,   1,   0,   0,   0,   3,   3,   0,   0,   83,  86,  95,  80,  79,  83,  73,  84,  73,
>+    79,  78,  0,   84,  69,  88,  67,  79,  79,  82,  68,  0,   171, 171, 171, 79,  83,  71,  78,
>+    44,  0,   0,   0,   1,   0,   0,   0,   8,   0,   0,   0,   32,  0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   3,   0,   0,   0,   0,   0,   0,   0,   15,  0,   0,   0,   83,  86,
>+    95,  84,  65,  82,  71,  69,  84,  0,   171, 171};
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrg2darray11ps.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrg2darray11ps.h
>new file mode 100644
>index 00000000000..9fd501411a0
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrg2darray11ps.h
>@@ -0,0 +1,90 @@
>+#if 0
>+//
>+// Generated by Microsoft (R) HLSL Shader Compiler 9.29.952.3111
>+//
>+//
>+//   fxc /nologo /E PS_PassthroughRG2DArray /T ps_4_0 /Fh
>+//    compiled\passthroughrg2darray11ps.h Passthrough2DArray11.hlsl
>+//
>+//
>+// Resource Bindings:
>+//
>+// Name                                 Type  Format         Dim Slot Elements
>+// ------------------------------ ---------- ------- ----------- ---- --------
>+// Sampler                           sampler      NA          NA    0        1
>+// TextureF                          texture  float4     2darray    0        1
>+//
>+//
>+//
>+// Input signature:
>+//
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_POSITION              0   xyzw        0      POS  float       
>+// SV_RENDERTARGETARRAYINDEX     0   x           1  RTINDEX   uint   x   
>+// TEXCOORD                 0   xyz         2     NONE  float   xy  
>+//
>+//
>+// Output signature:
>+//
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_TARGET                0   xyzw        0   TARGET  float   xyzw
>+//
>+ps_4_0
>+dcl_sampler s0, mode_default
>+dcl_resource_texture2darray (float,float,float,float) t0
>+dcl_input_ps_siv constant v1.x, rendertarget_array_index
>+dcl_input_ps linear v2.xy
>+dcl_output o0.xyzw
>+dcl_temps 1
>+utof r0.z, v1.x
>+mov r0.xy, v2.xyxx
>+sample r0.xyzw, r0.xyzx, t0.xyzw, s0
>+mov o0.xy, r0.xyxx
>+mov o0.zw, l(0,0,0,1.000000)
>+ret 
>+// Approximately 6 instruction slots used
>+#endif
>+
>+const BYTE g_PS_PassthroughRG2DArray[] = {
>+    68,  88,  66,  67,  113, 101, 41,  131, 63,  206, 223, 205, 209, 167, 123, 102, 201, 174, 37,
>+    186, 1,   0,   0,   0,   244, 2,   0,   0,   5,   0,   0,   0,   52,  0,   0,   0,   220, 0,
>+    0,   0,   100, 1,   0,   0,   152, 1,   0,   0,   120, 2,   0,   0,   82,  68,  69,  70,  160,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   2,   0,   0,   0,   28,  0,   0,   0,
>+    0,   4,   255, 255, 0,   1,   0,   0,   109, 0,   0,   0,   92,  0,   0,   0,   3,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,
>+    0,   0,   1,   0,   0,   0,   100, 0,   0,   0,   2,   0,   0,   0,   5,   0,   0,   0,   5,
>+    0,   0,   0,   255, 255, 255, 255, 0,   0,   0,   0,   1,   0,   0,   0,   13,  0,   0,   0,
>+    83,  97,  109, 112, 108, 101, 114, 0,   84,  101, 120, 116, 117, 114, 101, 70,  0,   77,  105,
>+    99,  114, 111, 115, 111, 102, 116, 32,  40,  82,  41,  32,  72,  76,  83,  76,  32,  83,  104,
>+    97,  100, 101, 114, 32,  67,  111, 109, 112, 105, 108, 101, 114, 32,  57,  46,  50,  57,  46,
>+    57,  53,  50,  46,  51,  49,  49,  49,  0,   171, 171, 73,  83,  71,  78,  128, 0,   0,   0,
>+    3,   0,   0,   0,   8,   0,   0,   0,   80,  0,   0,   0,   0,   0,   0,   0,   1,   0,   0,
>+    0,   3,   0,   0,   0,   0,   0,   0,   0,   15,  0,   0,   0,   92,  0,   0,   0,   0,   0,
>+    0,   0,   4,   0,   0,   0,   1,   0,   0,   0,   1,   0,   0,   0,   1,   1,   0,   0,   118,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   3,   0,   0,   0,   2,   0,   0,   0,
>+    7,   3,   0,   0,   83,  86,  95,  80,  79,  83,  73,  84,  73,  79,  78,  0,   83,  86,  95,
>+    82,  69,  78,  68,  69,  82,  84,  65,  82,  71,  69,  84,  65,  82,  82,  65,  89,  73,  78,
>+    68,  69,  88,  0,   84,  69,  88,  67,  79,  79,  82,  68,  0,   171, 79,  83,  71,  78,  44,
>+    0,   0,   0,   1,   0,   0,   0,   8,   0,   0,   0,   32,  0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   3,   0,   0,   0,   0,   0,   0,   0,   15,  0,   0,   0,   83,  86,  95,
>+    84,  65,  82,  71,  69,  84,  0,   171, 171, 83,  72,  68,  82,  216, 0,   0,   0,   64,  0,
>+    0,   0,   54,  0,   0,   0,   90,  0,   0,   3,   0,   96,  16,  0,   0,   0,   0,   0,   88,
>+    64,  0,   4,   0,   112, 16,  0,   0,   0,   0,   0,   85,  85,  0,   0,   100, 8,   0,   4,
>+    18,  16,  16,  0,   1,   0,   0,   0,   4,   0,   0,   0,   98,  16,  0,   3,   50,  16,  16,
>+    0,   2,   0,   0,   0,   101, 0,   0,   3,   242, 32,  16,  0,   0,   0,   0,   0,   104, 0,
>+    0,   2,   1,   0,   0,   0,   86,  0,   0,   5,   66,  0,   16,  0,   0,   0,   0,   0,   10,
>+    16,  16,  0,   1,   0,   0,   0,   54,  0,   0,   5,   50,  0,   16,  0,   0,   0,   0,   0,
>+    70,  16,  16,  0,   2,   0,   0,   0,   69,  0,   0,   9,   242, 0,   16,  0,   0,   0,   0,
>+    0,   70,  2,   16,  0,   0,   0,   0,   0,   70,  126, 16,  0,   0,   0,   0,   0,   0,   96,
>+    16,  0,   0,   0,   0,   0,   54,  0,   0,   5,   50,  32,  16,  0,   0,   0,   0,   0,   70,
>+    0,   16,  0,   0,   0,   0,   0,   54,  0,   0,   8,   194, 32,  16,  0,   0,   0,   0,   0,
>+    2,   64,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   128,
>+    63,  62,  0,   0,   1,   83,  84,  65,  84,  116, 0,   0,   0,   6,   0,   0,   0,   1,   0,
>+    0,   0,   0,   0,   0,   0,   3,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   3,   0,   0,   0,   0,   0,
>+    0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0};
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrg2darrayi11ps.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrg2darrayi11ps.h
>new file mode 100644
>index 00000000000..a092debfc77
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrg2darrayi11ps.h
>@@ -0,0 +1,94 @@
>+#if 0
>+//
>+// Generated by Microsoft (R) HLSL Shader Compiler 9.29.952.3111
>+//
>+//
>+//   fxc /nologo /E PS_PassthroughRG2DArrayI /T ps_4_0 /Fh
>+//    compiled\passthroughrg2darrayi11ps.h Passthrough2DArray11.hlsl
>+//
>+//
>+// Resource Bindings:
>+//
>+// Name                                 Type  Format         Dim Slot Elements
>+// ------------------------------ ---------- ------- ----------- ---- --------
>+// TextureI                          texture   sint4     2darray    0        1
>+//
>+//
>+//
>+// Input signature:
>+//
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_POSITION              0   xyzw        0      POS  float       
>+// SV_RENDERTARGETARRAYINDEX     0   x           1  RTINDEX   uint   x   
>+// TEXCOORD                 0   xyz         2     NONE  float   xy  
>+//
>+//
>+// Output signature:
>+//
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_TARGET                0   xyzw        0   TARGET    int   xyzw
>+//
>+ps_4_0
>+dcl_resource_texture2darray (sint,sint,sint,sint) t0
>+dcl_input_ps_siv constant v1.x, rendertarget_array_index
>+dcl_input_ps linear v2.xy
>+dcl_output o0.xyzw
>+dcl_temps 1
>+resinfo_uint r0.xyzw, l(0), t0.xyzw
>+utof r0.xy, r0.xyxx
>+mul r0.xy, r0.xyxx, v2.xyxx
>+ftoi r0.xy, r0.xyxx
>+mov r0.z, v1.x
>+mov r0.w, l(0)
>+ld r0.xyzw, r0.xyzw, t0.xyzw
>+mov o0.xy, r0.xyxx
>+mov o0.zw, l(0,0,0,1)
>+ret 
>+// Approximately 10 instruction slots used
>+#endif
>+
>+const BYTE g_PS_PassthroughRG2DArrayI[] = {
>+    68,  88,  66,  67,  247, 185, 135, 38,  69,  135, 207, 14,  57,  114, 126, 102, 133, 233, 225,
>+    80,  1,   0,   0,   0,   24,  3,   0,   0,   5,   0,   0,   0,   52,  0,   0,   0,   180, 0,
>+    0,   0,   60,  1,   0,   0,   112, 1,   0,   0,   156, 2,   0,   0,   82,  68,  69,  70,  120,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   28,  0,   0,   0,
>+    0,   4,   255, 255, 0,   1,   0,   0,   69,  0,   0,   0,   60,  0,   0,   0,   2,   0,   0,
>+    0,   3,   0,   0,   0,   5,   0,   0,   0,   255, 255, 255, 255, 0,   0,   0,   0,   1,   0,
>+    0,   0,   13,  0,   0,   0,   84,  101, 120, 116, 117, 114, 101, 73,  0,   77,  105, 99,  114,
>+    111, 115, 111, 102, 116, 32,  40,  82,  41,  32,  72,  76,  83,  76,  32,  83,  104, 97,  100,
>+    101, 114, 32,  67,  111, 109, 112, 105, 108, 101, 114, 32,  57,  46,  50,  57,  46,  57,  53,
>+    50,  46,  51,  49,  49,  49,  0,   171, 171, 73,  83,  71,  78,  128, 0,   0,   0,   3,   0,
>+    0,   0,   8,   0,   0,   0,   80,  0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   3,
>+    0,   0,   0,   0,   0,   0,   0,   15,  0,   0,   0,   92,  0,   0,   0,   0,   0,   0,   0,
>+    4,   0,   0,   0,   1,   0,   0,   0,   1,   0,   0,   0,   1,   1,   0,   0,   118, 0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   3,   0,   0,   0,   2,   0,   0,   0,   7,   3,
>+    0,   0,   83,  86,  95,  80,  79,  83,  73,  84,  73,  79,  78,  0,   83,  86,  95,  82,  69,
>+    78,  68,  69,  82,  84,  65,  82,  71,  69,  84,  65,  82,  82,  65,  89,  73,  78,  68,  69,
>+    88,  0,   84,  69,  88,  67,  79,  79,  82,  68,  0,   171, 79,  83,  71,  78,  44,  0,   0,
>+    0,   1,   0,   0,   0,   8,   0,   0,   0,   32,  0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   2,   0,   0,   0,   0,   0,   0,   0,   15,  0,   0,   0,   83,  86,  95,  84,  65,
>+    82,  71,  69,  84,  0,   171, 171, 83,  72,  68,  82,  36,  1,   0,   0,   64,  0,   0,   0,
>+    73,  0,   0,   0,   88,  64,  0,   4,   0,   112, 16,  0,   0,   0,   0,   0,   51,  51,  0,
>+    0,   100, 8,   0,   4,   18,  16,  16,  0,   1,   0,   0,   0,   4,   0,   0,   0,   98,  16,
>+    0,   3,   50,  16,  16,  0,   2,   0,   0,   0,   101, 0,   0,   3,   242, 32,  16,  0,   0,
>+    0,   0,   0,   104, 0,   0,   2,   1,   0,   0,   0,   61,  16,  0,   7,   242, 0,   16,  0,
>+    0,   0,   0,   0,   1,   64,  0,   0,   0,   0,   0,   0,   70,  126, 16,  0,   0,   0,   0,
>+    0,   86,  0,   0,   5,   50,  0,   16,  0,   0,   0,   0,   0,   70,  0,   16,  0,   0,   0,
>+    0,   0,   56,  0,   0,   7,   50,  0,   16,  0,   0,   0,   0,   0,   70,  0,   16,  0,   0,
>+    0,   0,   0,   70,  16,  16,  0,   2,   0,   0,   0,   27,  0,   0,   5,   50,  0,   16,  0,
>+    0,   0,   0,   0,   70,  0,   16,  0,   0,   0,   0,   0,   54,  0,   0,   5,   66,  0,   16,
>+    0,   0,   0,   0,   0,   10,  16,  16,  0,   1,   0,   0,   0,   54,  0,   0,   5,   130, 0,
>+    16,  0,   0,   0,   0,   0,   1,   64,  0,   0,   0,   0,   0,   0,   45,  0,   0,   7,   242,
>+    0,   16,  0,   0,   0,   0,   0,   70,  14,  16,  0,   0,   0,   0,   0,   70,  126, 16,  0,
>+    0,   0,   0,   0,   54,  0,   0,   5,   50,  32,  16,  0,   0,   0,   0,   0,   70,  0,   16,
>+    0,   0,   0,   0,   0,   54,  0,   0,   8,   194, 32,  16,  0,   0,   0,   0,   0,   2,   64,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   62,
>+    0,   0,   1,   83,  84,  65,  84,  116, 0,   0,   0,   10,  0,   0,   0,   1,   0,   0,   0,
>+    0,   0,   0,   0,   3,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   4,   0,   0,   0,   0,   0,   0,   0,
>+    2,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0};
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrg2darrayui11ps.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrg2darrayui11ps.h
>new file mode 100644
>index 00000000000..f5e0afcf6c4
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrg2darrayui11ps.h
>@@ -0,0 +1,94 @@
>+#if 0
>+//
>+// Generated by Microsoft (R) HLSL Shader Compiler 9.29.952.3111
>+//
>+//
>+//   fxc /nologo /E PS_PassthroughRG2DArrayUI /T ps_4_0 /Fh
>+//    compiled\passthroughrg2darrayui11ps.h Passthrough2DArray11.hlsl
>+//
>+//
>+// Resource Bindings:
>+//
>+// Name                                 Type  Format         Dim Slot Elements
>+// ------------------------------ ---------- ------- ----------- ---- --------
>+// TextureUI                         texture   uint4     2darray    0        1
>+//
>+//
>+//
>+// Input signature:
>+//
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_POSITION              0   xyzw        0      POS  float       
>+// SV_RENDERTARGETARRAYINDEX     0   x           1  RTINDEX   uint   x   
>+// TEXCOORD                 0   xyz         2     NONE  float   xy  
>+//
>+//
>+// Output signature:
>+//
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_TARGET                0   xyzw        0   TARGET   uint   xyzw
>+//
>+ps_4_0
>+dcl_resource_texture2darray (uint,uint,uint,uint) t0
>+dcl_input_ps_siv constant v1.x, rendertarget_array_index
>+dcl_input_ps linear v2.xy
>+dcl_output o0.xyzw
>+dcl_temps 1
>+resinfo_uint r0.xyzw, l(0), t0.xyzw
>+utof r0.xy, r0.xyxx
>+mul r0.xy, r0.xyxx, v2.xyxx
>+ftoi r0.xy, r0.xyxx
>+mov r0.z, v1.x
>+mov r0.w, l(0)
>+ld r0.xyzw, r0.xyzw, t0.xyzw
>+mov o0.xy, r0.xyxx
>+mov o0.zw, l(0,0,0,1)
>+ret 
>+// Approximately 10 instruction slots used
>+#endif
>+
>+const BYTE g_PS_PassthroughRG2DArrayUI[] = {
>+    68,  88,  66,  67,  63,  58,  182, 113, 143, 129, 92,  4,   182, 79,  59,  171, 155, 95,  217,
>+    111, 1,   0,   0,   0,   24,  3,   0,   0,   5,   0,   0,   0,   52,  0,   0,   0,   180, 0,
>+    0,   0,   60,  1,   0,   0,   112, 1,   0,   0,   156, 2,   0,   0,   82,  68,  69,  70,  120,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   28,  0,   0,   0,
>+    0,   4,   255, 255, 0,   1,   0,   0,   70,  0,   0,   0,   60,  0,   0,   0,   2,   0,   0,
>+    0,   4,   0,   0,   0,   5,   0,   0,   0,   255, 255, 255, 255, 0,   0,   0,   0,   1,   0,
>+    0,   0,   13,  0,   0,   0,   84,  101, 120, 116, 117, 114, 101, 85,  73,  0,   77,  105, 99,
>+    114, 111, 115, 111, 102, 116, 32,  40,  82,  41,  32,  72,  76,  83,  76,  32,  83,  104, 97,
>+    100, 101, 114, 32,  67,  111, 109, 112, 105, 108, 101, 114, 32,  57,  46,  50,  57,  46,  57,
>+    53,  50,  46,  51,  49,  49,  49,  0,   171, 73,  83,  71,  78,  128, 0,   0,   0,   3,   0,
>+    0,   0,   8,   0,   0,   0,   80,  0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   3,
>+    0,   0,   0,   0,   0,   0,   0,   15,  0,   0,   0,   92,  0,   0,   0,   0,   0,   0,   0,
>+    4,   0,   0,   0,   1,   0,   0,   0,   1,   0,   0,   0,   1,   1,   0,   0,   118, 0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   3,   0,   0,   0,   2,   0,   0,   0,   7,   3,
>+    0,   0,   83,  86,  95,  80,  79,  83,  73,  84,  73,  79,  78,  0,   83,  86,  95,  82,  69,
>+    78,  68,  69,  82,  84,  65,  82,  71,  69,  84,  65,  82,  82,  65,  89,  73,  78,  68,  69,
>+    88,  0,   84,  69,  88,  67,  79,  79,  82,  68,  0,   171, 79,  83,  71,  78,  44,  0,   0,
>+    0,   1,   0,   0,   0,   8,   0,   0,   0,   32,  0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   15,  0,   0,   0,   83,  86,  95,  84,  65,
>+    82,  71,  69,  84,  0,   171, 171, 83,  72,  68,  82,  36,  1,   0,   0,   64,  0,   0,   0,
>+    73,  0,   0,   0,   88,  64,  0,   4,   0,   112, 16,  0,   0,   0,   0,   0,   68,  68,  0,
>+    0,   100, 8,   0,   4,   18,  16,  16,  0,   1,   0,   0,   0,   4,   0,   0,   0,   98,  16,
>+    0,   3,   50,  16,  16,  0,   2,   0,   0,   0,   101, 0,   0,   3,   242, 32,  16,  0,   0,
>+    0,   0,   0,   104, 0,   0,   2,   1,   0,   0,   0,   61,  16,  0,   7,   242, 0,   16,  0,
>+    0,   0,   0,   0,   1,   64,  0,   0,   0,   0,   0,   0,   70,  126, 16,  0,   0,   0,   0,
>+    0,   86,  0,   0,   5,   50,  0,   16,  0,   0,   0,   0,   0,   70,  0,   16,  0,   0,   0,
>+    0,   0,   56,  0,   0,   7,   50,  0,   16,  0,   0,   0,   0,   0,   70,  0,   16,  0,   0,
>+    0,   0,   0,   70,  16,  16,  0,   2,   0,   0,   0,   27,  0,   0,   5,   50,  0,   16,  0,
>+    0,   0,   0,   0,   70,  0,   16,  0,   0,   0,   0,   0,   54,  0,   0,   5,   66,  0,   16,
>+    0,   0,   0,   0,   0,   10,  16,  16,  0,   1,   0,   0,   0,   54,  0,   0,   5,   130, 0,
>+    16,  0,   0,   0,   0,   0,   1,   64,  0,   0,   0,   0,   0,   0,   45,  0,   0,   7,   242,
>+    0,   16,  0,   0,   0,   0,   0,   70,  14,  16,  0,   0,   0,   0,   0,   70,  126, 16,  0,
>+    0,   0,   0,   0,   54,  0,   0,   5,   50,  32,  16,  0,   0,   0,   0,   0,   70,  0,   16,
>+    0,   0,   0,   0,   0,   54,  0,   0,   8,   194, 32,  16,  0,   0,   0,   0,   0,   2,   64,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   62,
>+    0,   0,   1,   83,  84,  65,  84,  116, 0,   0,   0,   10,  0,   0,   0,   1,   0,   0,   0,
>+    0,   0,   0,   0,   3,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   4,   0,   0,   0,   0,   0,   0,   0,
>+    2,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0};
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrg2di11ps.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrg2di11ps.h
>index a66e5309487..10f4e756d15 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrg2di11ps.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrg2di11ps.h
>@@ -1,6 +1,10 @@
> #if 0
> //
>-// Generated by Microsoft (R) HLSL Shader Compiler 6.3.9600.16384
>+// Generated by Microsoft (R) HLSL Shader Compiler 9.29.952.3111
>+//
>+//
>+//   fxc /nologo /E PS_PassthroughRG2DI /T ps_4_0 /Fh
>+//    compiled\passthroughrg2di11ps.h Passthrough2D11.hlsl
> //
> //
> // Resource Bindings:
>@@ -13,17 +17,17 @@
> //
> // Input signature:
> //
>-// Name                 Index   Mask Register SysValue  Format   Used
>-// -------------------- ----- ------ -------- -------- ------- ------
>-// SV_POSITION              0   xyzw        0      POS   float       
>-// TEXCOORD                 0   xy          1     NONE   float   xy  
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_POSITION              0   xyzw        0      POS  float       
>+// TEXCOORD                 0   xy          1     NONE  float   xy  
> //
> //
> // Output signature:
> //
>-// Name                 Index   Mask Register SysValue  Format   Used
>-// -------------------- ----- ------ -------- -------- ------- ------
>-// SV_TARGET                0   xyzw        0   TARGET     int   xyzw
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_TARGET                0   xyzw        0   TARGET    int   xyzw
> //
> ps_4_0
> dcl_resource_texture2d (sint,sint,sint,sint) t0
>@@ -42,126 +46,42 @@ ret
> // Approximately 9 instruction slots used
> #endif
> 
>-const BYTE g_PS_PassthroughRG2DI[] =
>-{
>-     68,  88,  66,  67,  89, 123, 
>-    129, 251, 206, 105, 221, 141, 
>-      5, 160, 186, 187, 168, 157, 
>-    145, 246,   1,   0,   0,   0, 
>-    208,   2,   0,   0,   5,   0, 
>-      0,   0,  52,   0,   0,   0, 
>-    180,   0,   0,   0,  12,   1, 
>-      0,   0,  64,   1,   0,   0, 
>-     84,   2,   0,   0,  82,  68, 
>-     69,  70, 120,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   1,   0,   0,   0, 
>-     28,   0,   0,   0,   0,   4, 
>-    255, 255,   0,   1,   0,   0, 
>-     69,   0,   0,   0,  60,   0, 
>-      0,   0,   2,   0,   0,   0, 
>-      3,   0,   0,   0,   4,   0, 
>-      0,   0, 255, 255, 255, 255, 
>-      0,   0,   0,   0,   1,   0, 
>-      0,   0,  13,   0,   0,   0, 
>-     84, 101, 120, 116, 117, 114, 
>-    101,  73,   0,  77, 105,  99, 
>-    114, 111, 115, 111, 102, 116, 
>-     32,  40,  82,  41,  32,  72, 
>-     76,  83,  76,  32,  83, 104, 
>-     97, 100, 101, 114,  32,  67, 
>-    111, 109, 112, 105, 108, 101, 
>-    114,  32,  54,  46,  51,  46, 
>-     57,  54,  48,  48,  46,  49, 
>-     54,  51,  56,  52,   0, 171, 
>-     73,  83,  71,  78,  80,   0, 
>-      0,   0,   2,   0,   0,   0, 
>-      8,   0,   0,   0,  56,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      1,   0,   0,   0,   3,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-     15,   0,   0,   0,  68,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   3,   0, 
>-      0,   0,   1,   0,   0,   0, 
>-      3,   3,   0,   0,  83,  86, 
>-     95,  80,  79,  83,  73,  84, 
>-     73,  79,  78,   0,  84,  69, 
>-     88,  67,  79,  79,  82,  68, 
>-      0, 171, 171, 171,  79,  83, 
>-     71,  78,  44,   0,   0,   0, 
>-      1,   0,   0,   0,   8,   0, 
>-      0,   0,  32,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   2,   0,   0,   0, 
>-      0,   0,   0,   0,  15,   0, 
>-      0,   0,  83,  86,  95,  84, 
>-     65,  82,  71,  69,  84,   0, 
>-    171, 171,  83,  72,  68,  82, 
>-     12,   1,   0,   0,  64,   0, 
>-      0,   0,  67,   0,   0,   0, 
>-     88,  24,   0,   4,   0, 112, 
>-     16,   0,   0,   0,   0,   0, 
>-     51,  51,   0,   0,  98,  16, 
>-      0,   3,  50,  16,  16,   0, 
>-      1,   0,   0,   0, 101,   0, 
>-      0,   3, 242,  32,  16,   0, 
>-      0,   0,   0,   0, 104,   0, 
>-      0,   2,   1,   0,   0,   0, 
>-     61,  16,   0,   7, 242,   0, 
>-     16,   0,   0,   0,   0,   0, 
>-      1,  64,   0,   0,   0,   0, 
>-      0,   0,  70, 126,  16,   0, 
>-      0,   0,   0,   0,  86,   0, 
>-      0,   5,  50,   0,  16,   0, 
>-      0,   0,   0,   0,  70,   0, 
>-     16,   0,   0,   0,   0,   0, 
>-     56,   0,   0,   7,  50,   0, 
>-     16,   0,   0,   0,   0,   0, 
>-     70,   0,  16,   0,   0,   0, 
>-      0,   0,  70,  16,  16,   0, 
>-      1,   0,   0,   0,  27,   0, 
>-      0,   5,  50,   0,  16,   0, 
>-      0,   0,   0,   0,  70,   0, 
>-     16,   0,   0,   0,   0,   0, 
>-     54,   0,   0,   8, 194,   0, 
>-     16,   0,   0,   0,   0,   0, 
>-      2,  64,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,  45,   0,   0,   7, 
>-    242,   0,  16,   0,   0,   0, 
>-      0,   0,  70,  14,  16,   0, 
>-      0,   0,   0,   0,  70, 126, 
>-     16,   0,   0,   0,   0,   0, 
>-     54,   0,   0,   5,  50,  32, 
>-     16,   0,   0,   0,   0,   0, 
>-     70,   0,  16,   0,   0,   0, 
>-      0,   0,  54,   0,   0,   8, 
>-    194,  32,  16,   0,   0,   0, 
>-      0,   0,   2,  64,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,  62,   0, 
>-      0,   1,  83,  84,  65,  84, 
>-    116,   0,   0,   0,   9,   0, 
>-      0,   0,   1,   0,   0,   0, 
>-      0,   0,   0,   0,   2,   0, 
>-      0,   0,   1,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   1,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   1,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   3,   0,   0,   0, 
>-      0,   0,   0,   0,   2,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0
>-};
>+const BYTE g_PS_PassthroughRG2DI[] = {
>+    68,  88,  66,  67,  154, 63,  188, 122, 50,  211, 44,  194, 175, 193, 7,   1,   234, 178, 251,
>+    83,  1,   0,   0,   0,   208, 2,   0,   0,   5,   0,   0,   0,   52,  0,   0,   0,   180, 0,
>+    0,   0,   12,  1,   0,   0,   64,  1,   0,   0,   84,  2,   0,   0,   82,  68,  69,  70,  120,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   28,  0,   0,   0,
>+    0,   4,   255, 255, 0,   1,   0,   0,   69,  0,   0,   0,   60,  0,   0,   0,   2,   0,   0,
>+    0,   3,   0,   0,   0,   4,   0,   0,   0,   255, 255, 255, 255, 0,   0,   0,   0,   1,   0,
>+    0,   0,   13,  0,   0,   0,   84,  101, 120, 116, 117, 114, 101, 73,  0,   77,  105, 99,  114,
>+    111, 115, 111, 102, 116, 32,  40,  82,  41,  32,  72,  76,  83,  76,  32,  83,  104, 97,  100,
>+    101, 114, 32,  67,  111, 109, 112, 105, 108, 101, 114, 32,  57,  46,  50,  57,  46,  57,  53,
>+    50,  46,  51,  49,  49,  49,  0,   171, 171, 73,  83,  71,  78,  80,  0,   0,   0,   2,   0,
>+    0,   0,   8,   0,   0,   0,   56,  0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   3,
>+    0,   0,   0,   0,   0,   0,   0,   15,  0,   0,   0,   68,  0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   3,   0,   0,   0,   1,   0,   0,   0,   3,   3,   0,   0,   83,  86,  95,
>+    80,  79,  83,  73,  84,  73,  79,  78,  0,   84,  69,  88,  67,  79,  79,  82,  68,  0,   171,
>+    171, 171, 79,  83,  71,  78,  44,  0,   0,   0,   1,   0,   0,   0,   8,   0,   0,   0,   32,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   2,   0,   0,   0,   0,   0,   0,   0,
>+    15,  0,   0,   0,   83,  86,  95,  84,  65,  82,  71,  69,  84,  0,   171, 171, 83,  72,  68,
>+    82,  12,  1,   0,   0,   64,  0,   0,   0,   67,  0,   0,   0,   88,  24,  0,   4,   0,   112,
>+    16,  0,   0,   0,   0,   0,   51,  51,  0,   0,   98,  16,  0,   3,   50,  16,  16,  0,   1,
>+    0,   0,   0,   101, 0,   0,   3,   242, 32,  16,  0,   0,   0,   0,   0,   104, 0,   0,   2,
>+    1,   0,   0,   0,   61,  16,  0,   7,   242, 0,   16,  0,   0,   0,   0,   0,   1,   64,  0,
>+    0,   0,   0,   0,   0,   70,  126, 16,  0,   0,   0,   0,   0,   86,  0,   0,   5,   50,  0,
>+    16,  0,   0,   0,   0,   0,   70,  0,   16,  0,   0,   0,   0,   0,   56,  0,   0,   7,   50,
>+    0,   16,  0,   0,   0,   0,   0,   70,  0,   16,  0,   0,   0,   0,   0,   70,  16,  16,  0,
>+    1,   0,   0,   0,   27,  0,   0,   5,   50,  0,   16,  0,   0,   0,   0,   0,   70,  0,   16,
>+    0,   0,   0,   0,   0,   54,  0,   0,   8,   194, 0,   16,  0,   0,   0,   0,   0,   2,   64,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   45,
>+    0,   0,   7,   242, 0,   16,  0,   0,   0,   0,   0,   70,  14,  16,  0,   0,   0,   0,   0,
>+    70,  126, 16,  0,   0,   0,   0,   0,   54,  0,   0,   5,   50,  32,  16,  0,   0,   0,   0,
>+    0,   70,  0,   16,  0,   0,   0,   0,   0,   54,  0,   0,   8,   194, 32,  16,  0,   0,   0,
>+    0,   0,   2,   64,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   62,  0,   0,   1,   83,  84,  65,  84,  116, 0,   0,   0,   9,   0,   0,   0,
>+    1,   0,   0,   0,   0,   0,   0,   0,   2,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   3,   0,   0,   0,
>+    0,   0,   0,   0,   2,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0};
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrg2dui11ps.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrg2dui11ps.h
>index 5146cd93622..28902c96115 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrg2dui11ps.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrg2dui11ps.h
>@@ -1,6 +1,10 @@
> #if 0
> //
>-// Generated by Microsoft (R) HLSL Shader Compiler 6.3.9600.16384
>+// Generated by Microsoft (R) HLSL Shader Compiler 9.29.952.3111
>+//
>+//
>+//   fxc /nologo /E PS_PassthroughRG2DUI /T ps_4_0 /Fh
>+//    compiled\passthroughrg2dui11ps.h Passthrough2D11.hlsl
> //
> //
> // Resource Bindings:
>@@ -13,17 +17,17 @@
> //
> // Input signature:
> //
>-// Name                 Index   Mask Register SysValue  Format   Used
>-// -------------------- ----- ------ -------- -------- ------- ------
>-// SV_POSITION              0   xyzw        0      POS   float       
>-// TEXCOORD                 0   xy          1     NONE   float   xy  
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_POSITION              0   xyzw        0      POS  float       
>+// TEXCOORD                 0   xy          1     NONE  float   xy  
> //
> //
> // Output signature:
> //
>-// Name                 Index   Mask Register SysValue  Format   Used
>-// -------------------- ----- ------ -------- -------- ------- ------
>-// SV_TARGET                0   xyzw        0   TARGET    uint   xyzw
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_TARGET                0   xyzw        0   TARGET   uint   xyzw
> //
> ps_4_0
> dcl_resource_texture2d (uint,uint,uint,uint) t0
>@@ -42,126 +46,42 @@ ret
> // Approximately 9 instruction slots used
> #endif
> 
>-const BYTE g_PS_PassthroughRG2DUI[] =
>-{
>-     68,  88,  66,  67, 253, 188, 
>-    138, 153, 226, 194, 182, 197, 
>-    184,  36, 111,  24, 198, 171, 
>-    241, 145,   1,   0,   0,   0, 
>-    208,   2,   0,   0,   5,   0, 
>-      0,   0,  52,   0,   0,   0, 
>-    180,   0,   0,   0,  12,   1, 
>-      0,   0,  64,   1,   0,   0, 
>-     84,   2,   0,   0,  82,  68, 
>-     69,  70, 120,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   1,   0,   0,   0, 
>-     28,   0,   0,   0,   0,   4, 
>-    255, 255,   0,   1,   0,   0, 
>-     70,   0,   0,   0,  60,   0, 
>-      0,   0,   2,   0,   0,   0, 
>-      4,   0,   0,   0,   4,   0, 
>-      0,   0, 255, 255, 255, 255, 
>-      0,   0,   0,   0,   1,   0, 
>-      0,   0,  13,   0,   0,   0, 
>-     84, 101, 120, 116, 117, 114, 
>-    101,  85,  73,   0,  77, 105, 
>-     99, 114, 111, 115, 111, 102, 
>-    116,  32,  40,  82,  41,  32, 
>-     72,  76,  83,  76,  32,  83, 
>-    104,  97, 100, 101, 114,  32, 
>-     67, 111, 109, 112, 105, 108, 
>-    101, 114,  32,  54,  46,  51, 
>-     46,  57,  54,  48,  48,  46, 
>-     49,  54,  51,  56,  52,   0, 
>-     73,  83,  71,  78,  80,   0, 
>-      0,   0,   2,   0,   0,   0, 
>-      8,   0,   0,   0,  56,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      1,   0,   0,   0,   3,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-     15,   0,   0,   0,  68,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   3,   0, 
>-      0,   0,   1,   0,   0,   0, 
>-      3,   3,   0,   0,  83,  86, 
>-     95,  80,  79,  83,  73,  84, 
>-     73,  79,  78,   0,  84,  69, 
>-     88,  67,  79,  79,  82,  68, 
>-      0, 171, 171, 171,  79,  83, 
>-     71,  78,  44,   0,   0,   0, 
>-      1,   0,   0,   0,   8,   0, 
>-      0,   0,  32,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   1,   0,   0,   0, 
>-      0,   0,   0,   0,  15,   0, 
>-      0,   0,  83,  86,  95,  84, 
>-     65,  82,  71,  69,  84,   0, 
>-    171, 171,  83,  72,  68,  82, 
>-     12,   1,   0,   0,  64,   0, 
>-      0,   0,  67,   0,   0,   0, 
>-     88,  24,   0,   4,   0, 112, 
>-     16,   0,   0,   0,   0,   0, 
>-     68,  68,   0,   0,  98,  16, 
>-      0,   3,  50,  16,  16,   0, 
>-      1,   0,   0,   0, 101,   0, 
>-      0,   3, 242,  32,  16,   0, 
>-      0,   0,   0,   0, 104,   0, 
>-      0,   2,   1,   0,   0,   0, 
>-     61,  16,   0,   7, 242,   0, 
>-     16,   0,   0,   0,   0,   0, 
>-      1,  64,   0,   0,   0,   0, 
>-      0,   0,  70, 126,  16,   0, 
>-      0,   0,   0,   0,  86,   0, 
>-      0,   5,  50,   0,  16,   0, 
>-      0,   0,   0,   0,  70,   0, 
>-     16,   0,   0,   0,   0,   0, 
>-     56,   0,   0,   7,  50,   0, 
>-     16,   0,   0,   0,   0,   0, 
>-     70,   0,  16,   0,   0,   0, 
>-      0,   0,  70,  16,  16,   0, 
>-      1,   0,   0,   0,  27,   0, 
>-      0,   5,  50,   0,  16,   0, 
>-      0,   0,   0,   0,  70,   0, 
>-     16,   0,   0,   0,   0,   0, 
>-     54,   0,   0,   8, 194,   0, 
>-     16,   0,   0,   0,   0,   0, 
>-      2,  64,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,  45,   0,   0,   7, 
>-    242,   0,  16,   0,   0,   0, 
>-      0,   0,  70,  14,  16,   0, 
>-      0,   0,   0,   0,  70, 126, 
>-     16,   0,   0,   0,   0,   0, 
>-     54,   0,   0,   5,  50,  32, 
>-     16,   0,   0,   0,   0,   0, 
>-     70,   0,  16,   0,   0,   0, 
>-      0,   0,  54,   0,   0,   8, 
>-    194,  32,  16,   0,   0,   0, 
>-      0,   0,   2,  64,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,  62,   0, 
>-      0,   1,  83,  84,  65,  84, 
>-    116,   0,   0,   0,   9,   0, 
>-      0,   0,   1,   0,   0,   0, 
>-      0,   0,   0,   0,   2,   0, 
>-      0,   0,   1,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   1,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   1,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   3,   0,   0,   0, 
>-      0,   0,   0,   0,   2,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0
>-};
>+const BYTE g_PS_PassthroughRG2DUI[] = {
>+    68,  88,  66,  67,  144, 43,  208, 108, 186, 143, 89,  184, 35,  31,  116, 8,   149, 47,  23,
>+    40,  1,   0,   0,   0,   208, 2,   0,   0,   5,   0,   0,   0,   52,  0,   0,   0,   180, 0,
>+    0,   0,   12,  1,   0,   0,   64,  1,   0,   0,   84,  2,   0,   0,   82,  68,  69,  70,  120,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   28,  0,   0,   0,
>+    0,   4,   255, 255, 0,   1,   0,   0,   70,  0,   0,   0,   60,  0,   0,   0,   2,   0,   0,
>+    0,   4,   0,   0,   0,   4,   0,   0,   0,   255, 255, 255, 255, 0,   0,   0,   0,   1,   0,
>+    0,   0,   13,  0,   0,   0,   84,  101, 120, 116, 117, 114, 101, 85,  73,  0,   77,  105, 99,
>+    114, 111, 115, 111, 102, 116, 32,  40,  82,  41,  32,  72,  76,  83,  76,  32,  83,  104, 97,
>+    100, 101, 114, 32,  67,  111, 109, 112, 105, 108, 101, 114, 32,  57,  46,  50,  57,  46,  57,
>+    53,  50,  46,  51,  49,  49,  49,  0,   171, 73,  83,  71,  78,  80,  0,   0,   0,   2,   0,
>+    0,   0,   8,   0,   0,   0,   56,  0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   3,
>+    0,   0,   0,   0,   0,   0,   0,   15,  0,   0,   0,   68,  0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   3,   0,   0,   0,   1,   0,   0,   0,   3,   3,   0,   0,   83,  86,  95,
>+    80,  79,  83,  73,  84,  73,  79,  78,  0,   84,  69,  88,  67,  79,  79,  82,  68,  0,   171,
>+    171, 171, 79,  83,  71,  78,  44,  0,   0,   0,   1,   0,   0,   0,   8,   0,   0,   0,   32,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,
>+    15,  0,   0,   0,   83,  86,  95,  84,  65,  82,  71,  69,  84,  0,   171, 171, 83,  72,  68,
>+    82,  12,  1,   0,   0,   64,  0,   0,   0,   67,  0,   0,   0,   88,  24,  0,   4,   0,   112,
>+    16,  0,   0,   0,   0,   0,   68,  68,  0,   0,   98,  16,  0,   3,   50,  16,  16,  0,   1,
>+    0,   0,   0,   101, 0,   0,   3,   242, 32,  16,  0,   0,   0,   0,   0,   104, 0,   0,   2,
>+    1,   0,   0,   0,   61,  16,  0,   7,   242, 0,   16,  0,   0,   0,   0,   0,   1,   64,  0,
>+    0,   0,   0,   0,   0,   70,  126, 16,  0,   0,   0,   0,   0,   86,  0,   0,   5,   50,  0,
>+    16,  0,   0,   0,   0,   0,   70,  0,   16,  0,   0,   0,   0,   0,   56,  0,   0,   7,   50,
>+    0,   16,  0,   0,   0,   0,   0,   70,  0,   16,  0,   0,   0,   0,   0,   70,  16,  16,  0,
>+    1,   0,   0,   0,   27,  0,   0,   5,   50,  0,   16,  0,   0,   0,   0,   0,   70,  0,   16,
>+    0,   0,   0,   0,   0,   54,  0,   0,   8,   194, 0,   16,  0,   0,   0,   0,   0,   2,   64,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   45,
>+    0,   0,   7,   242, 0,   16,  0,   0,   0,   0,   0,   70,  14,  16,  0,   0,   0,   0,   0,
>+    70,  126, 16,  0,   0,   0,   0,   0,   54,  0,   0,   5,   50,  32,  16,  0,   0,   0,   0,
>+    0,   70,  0,   16,  0,   0,   0,   0,   0,   54,  0,   0,   8,   194, 32,  16,  0,   0,   0,
>+    0,   0,   2,   64,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   62,  0,   0,   1,   83,  84,  65,  84,  116, 0,   0,   0,   9,   0,   0,   0,
>+    1,   0,   0,   0,   0,   0,   0,   0,   2,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   3,   0,   0,   0,
>+    0,   0,   0,   0,   2,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0};
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrg3d11ps.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrg3d11ps.h
>index a313011707c..55575af92d8 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrg3d11ps.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrg3d11ps.h
>@@ -1,6 +1,10 @@
> #if 0
> //
>-// Generated by Microsoft (R) HLSL Shader Compiler 6.3.9600.16384
>+// Generated by Microsoft (R) HLSL Shader Compiler 9.29.952.3111
>+//
>+//
>+//   fxc /nologo /E PS_PassthroughRG3D /T ps_4_0 /Fh
>+//    compiled\passthroughrg3d11ps.h Passthrough3D11.hlsl
> //
> //
> // Resource Bindings:
>@@ -14,18 +18,18 @@
> //
> // Input signature:
> //
>-// Name                 Index   Mask Register SysValue  Format   Used
>-// -------------------- ----- ------ -------- -------- ------- ------
>-// SV_POSITION              0   xyzw        0      POS   float       
>-// SV_RENDERTARGETARRAYINDEX     0   x           1  RTINDEX    uint       
>-// TEXCOORD                 0   xyz         2     NONE   float   xyz 
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_POSITION              0   xyzw        0      POS  float       
>+// SV_RENDERTARGETARRAYINDEX     0   x           1  RTINDEX   uint       
>+// TEXCOORD                 0   xyz         2     NONE  float   xyz 
> //
> //
> // Output signature:
> //
>-// Name                 Index   Mask Register SysValue  Format   Used
>-// -------------------- ----- ------ -------- -------- ------- ------
>-// SV_TARGET                0   xyzw        0   TARGET   float   xyzw
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_TARGET                0   xyzw        0   TARGET  float   xyzw
> //
> ps_4_0
> dcl_sampler s0, mode_default
>@@ -40,123 +44,41 @@ ret
> // Approximately 4 instruction slots used
> #endif
> 
>-const BYTE g_PS_PassthroughRG3D[] =
>-{
>-     68,  88,  66,  67, 117, 159, 
>-    238,  81,  51, 223, 126,  31, 
>-    223, 171, 227,   2, 248,   7, 
>-     72,  91,   1,   0,   0,   0, 
>-    188,   2,   0,   0,   5,   0, 
>-      0,   0,  52,   0,   0,   0, 
>-    220,   0,   0,   0, 100,   1, 
>-      0,   0, 152,   1,   0,   0, 
>-     64,   2,   0,   0,  82,  68, 
>-     69,  70, 160,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   2,   0,   0,   0, 
>-     28,   0,   0,   0,   0,   4, 
>-    255, 255,   0,   1,   0,   0, 
>-    109,   0,   0,   0,  92,   0, 
>-      0,   0,   3,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   1,   0, 
>-      0,   0,   1,   0,   0,   0, 
>-    100,   0,   0,   0,   2,   0, 
>-      0,   0,   5,   0,   0,   0, 
>-      8,   0,   0,   0, 255, 255, 
>-    255, 255,   0,   0,   0,   0, 
>-      1,   0,   0,   0,  13,   0, 
>-      0,   0,  83,  97, 109, 112, 
>-    108, 101, 114,   0,  84, 101, 
>-    120, 116, 117, 114, 101,  70, 
>-      0,  77, 105,  99, 114, 111, 
>-    115, 111, 102, 116,  32,  40, 
>-     82,  41,  32,  72,  76,  83, 
>-     76,  32,  83, 104,  97, 100, 
>-    101, 114,  32,  67, 111, 109, 
>-    112, 105, 108, 101, 114,  32, 
>-     54,  46,  51,  46,  57,  54, 
>-     48,  48,  46,  49,  54,  51, 
>-     56,  52,   0, 171,  73,  83, 
>-     71,  78, 128,   0,   0,   0, 
>-      3,   0,   0,   0,   8,   0, 
>-      0,   0,  80,   0,   0,   0, 
>-      0,   0,   0,   0,   1,   0, 
>-      0,   0,   3,   0,   0,   0, 
>-      0,   0,   0,   0,  15,   0, 
>-      0,   0,  92,   0,   0,   0, 
>-      0,   0,   0,   0,   4,   0, 
>-      0,   0,   1,   0,   0,   0, 
>-      1,   0,   0,   0,   1,   0, 
>-      0,   0, 118,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   3,   0,   0,   0, 
>-      2,   0,   0,   0,   7,   7, 
>-      0,   0,  83,  86,  95,  80, 
>-     79,  83,  73,  84,  73,  79, 
>-     78,   0,  83,  86,  95,  82, 
>-     69,  78,  68,  69,  82,  84, 
>-     65,  82,  71,  69,  84,  65, 
>-     82,  82,  65,  89,  73,  78, 
>-     68,  69,  88,   0,  84,  69, 
>-     88,  67,  79,  79,  82,  68, 
>-      0, 171,  79,  83,  71,  78, 
>-     44,   0,   0,   0,   1,   0, 
>-      0,   0,   8,   0,   0,   0, 
>-     32,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      3,   0,   0,   0,   0,   0, 
>-      0,   0,  15,   0,   0,   0, 
>-     83,  86,  95,  84,  65,  82, 
>-     71,  69,  84,   0, 171, 171, 
>-     83,  72,  68,  82, 160,   0, 
>-      0,   0,  64,   0,   0,   0, 
>-     40,   0,   0,   0,  90,   0, 
>-      0,   3,   0,  96,  16,   0, 
>-      0,   0,   0,   0,  88,  40, 
>-      0,   4,   0, 112,  16,   0, 
>-      0,   0,   0,   0,  85,  85, 
>-      0,   0,  98,  16,   0,   3, 
>-    114,  16,  16,   0,   2,   0, 
>-      0,   0, 101,   0,   0,   3, 
>-    242,  32,  16,   0,   0,   0, 
>-      0,   0, 104,   0,   0,   2, 
>-      1,   0,   0,   0,  69,   0, 
>-      0,   9, 242,   0,  16,   0, 
>-      0,   0,   0,   0,  70,  18, 
>-     16,   0,   2,   0,   0,   0, 
>-     70, 126,  16,   0,   0,   0, 
>-      0,   0,   0,  96,  16,   0, 
>-      0,   0,   0,   0,  54,   0, 
>-      0,   5,  50,  32,  16,   0, 
>-      0,   0,   0,   0,  70,   0, 
>-     16,   0,   0,   0,   0,   0, 
>-     54,   0,   0,   8, 194,  32, 
>-     16,   0,   0,   0,   0,   0, 
>-      2,  64,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-    128,  63,  62,   0,   0,   1, 
>-     83,  84,  65,  84, 116,   0, 
>-      0,   0,   4,   0,   0,   0, 
>-      1,   0,   0,   0,   0,   0, 
>-      0,   0,   2,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      1,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   1,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      2,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0
>-};
>+const BYTE g_PS_PassthroughRG3D[] = {
>+    68,  88,  66,  67,  229, 144, 152, 160, 204, 175, 158, 188, 47,  45,  65,  251, 42, 224, 182,
>+    55,  1,   0,   0,   0,   188, 2,   0,   0,   5,   0,   0,   0,   52,  0,   0,   0,  220, 0,
>+    0,   0,   100, 1,   0,   0,   152, 1,   0,   0,   64,  2,   0,   0,   82,  68,  69, 70,  160,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   2,   0,   0,   0,   28,  0,  0,   0,
>+    0,   4,   255, 255, 0,   1,   0,   0,   109, 0,   0,   0,   92,  0,   0,   0,   3,  0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,  1,   0,
>+    0,   0,   1,   0,   0,   0,   100, 0,   0,   0,   2,   0,   0,   0,   5,   0,   0,  0,   8,
>+    0,   0,   0,   255, 255, 255, 255, 0,   0,   0,   0,   1,   0,   0,   0,   13,  0,  0,   0,
>+    83,  97,  109, 112, 108, 101, 114, 0,   84,  101, 120, 116, 117, 114, 101, 70,  0,  77,  105,
>+    99,  114, 111, 115, 111, 102, 116, 32,  40,  82,  41,  32,  72,  76,  83,  76,  32, 83,  104,
>+    97,  100, 101, 114, 32,  67,  111, 109, 112, 105, 108, 101, 114, 32,  57,  46,  50, 57,  46,
>+    57,  53,  50,  46,  51,  49,  49,  49,  0,   171, 171, 73,  83,  71,  78,  128, 0,  0,   0,
>+    3,   0,   0,   0,   8,   0,   0,   0,   80,  0,   0,   0,   0,   0,   0,   0,   1,  0,   0,
>+    0,   3,   0,   0,   0,   0,   0,   0,   0,   15,  0,   0,   0,   92,  0,   0,   0,  0,   0,
>+    0,   0,   4,   0,   0,   0,   1,   0,   0,   0,   1,   0,   0,   0,   1,   0,   0,  0,   118,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   3,   0,   0,   0,   2,   0,  0,   0,
>+    7,   7,   0,   0,   83,  86,  95,  80,  79,  83,  73,  84,  73,  79,  78,  0,   83, 86,  95,
>+    82,  69,  78,  68,  69,  82,  84,  65,  82,  71,  69,  84,  65,  82,  82,  65,  89, 73,  78,
>+    68,  69,  88,  0,   84,  69,  88,  67,  79,  79,  82,  68,  0,   171, 79,  83,  71, 78,  44,
>+    0,   0,   0,   1,   0,   0,   0,   8,   0,   0,   0,   32,  0,   0,   0,   0,   0,  0,   0,
>+    0,   0,   0,   0,   3,   0,   0,   0,   0,   0,   0,   0,   15,  0,   0,   0,   83, 86,  95,
>+    84,  65,  82,  71,  69,  84,  0,   171, 171, 83,  72,  68,  82,  160, 0,   0,   0,  64,  0,
>+    0,   0,   40,  0,   0,   0,   90,  0,   0,   3,   0,   96,  16,  0,   0,   0,   0,  0,   88,
>+    40,  0,   4,   0,   112, 16,  0,   0,   0,   0,   0,   85,  85,  0,   0,   98,  16, 0,   3,
>+    114, 16,  16,  0,   2,   0,   0,   0,   101, 0,   0,   3,   242, 32,  16,  0,   0,  0,   0,
>+    0,   104, 0,   0,   2,   1,   0,   0,   0,   69,  0,   0,   9,   242, 0,   16,  0,  0,   0,
>+    0,   0,   70,  18,  16,  0,   2,   0,   0,   0,   70,  126, 16,  0,   0,   0,   0,  0,   0,
>+    96,  16,  0,   0,   0,   0,   0,   54,  0,   0,   5,   50,  32,  16,  0,   0,   0,  0,   0,
>+    70,  0,   16,  0,   0,   0,   0,   0,   54,  0,   0,   8,   194, 32,  16,  0,   0,  0,   0,
>+    0,   2,   64,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,  0,   0,
>+    128, 63,  62,  0,   0,   1,   83,  84,  65,  84,  116, 0,   0,   0,   4,   0,   0,  0,   1,
>+    0,   0,   0,   0,   0,   0,   0,   2,   0,   0,   0,   0,   0,   0,   0,   0,   0,  0,   0,
>+    0,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,  0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,  0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   2,   0,   0,  0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,  0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0};
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrg3di11ps.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrg3di11ps.h
>index ef6ec1723b7..282385e7a93 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrg3di11ps.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrg3di11ps.h
>@@ -1,6 +1,10 @@
> #if 0
> //
>-// Generated by Microsoft (R) HLSL Shader Compiler 6.3.9600.16384
>+// Generated by Microsoft (R) HLSL Shader Compiler 9.29.952.3111
>+//
>+//
>+//   fxc /nologo /E PS_PassthroughRG3DI /T ps_4_0 /Fh
>+//    compiled\passthroughrg3di11ps.h Passthrough3D11.hlsl
> //
> //
> // Resource Bindings:
>@@ -13,18 +17,18 @@
> //
> // Input signature:
> //
>-// Name                 Index   Mask Register SysValue  Format   Used
>-// -------------------- ----- ------ -------- -------- ------- ------
>-// SV_POSITION              0   xyzw        0      POS   float       
>-// SV_RENDERTARGETARRAYINDEX     0   x           1  RTINDEX    uint       
>-// TEXCOORD                 0   xyz         2     NONE   float   xyz 
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_POSITION              0   xyzw        0      POS  float       
>+// SV_RENDERTARGETARRAYINDEX     0   x           1  RTINDEX   uint       
>+// TEXCOORD                 0   xyz         2     NONE  float   xyz 
> //
> //
> // Output signature:
> //
>-// Name                 Index   Mask Register SysValue  Format   Used
>-// -------------------- ----- ------ -------- -------- ------- ------
>-// SV_TARGET                0   xyzw        0   TARGET     int   xyzw
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_TARGET                0   xyzw        0   TARGET    int   xyzw
> //
> ps_4_0
> dcl_resource_texture3d (sint,sint,sint,sint) t0
>@@ -43,132 +47,44 @@ ret
> // Approximately 9 instruction slots used
> #endif
> 
>-const BYTE g_PS_PassthroughRG3DI[] =
>-{
>-     68,  88,  66,  67,  62, 119, 
>-     61,  21,  83,  42,  80, 125, 
>-    121, 208, 247,  10, 223,  62, 
>-     33,  18,   1,   0,   0,   0, 
>-    244,   2,   0,   0,   5,   0, 
>-      0,   0,  52,   0,   0,   0, 
>-    180,   0,   0,   0,  60,   1, 
>-      0,   0, 112,   1,   0,   0, 
>-    120,   2,   0,   0,  82,  68, 
>-     69,  70, 120,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   1,   0,   0,   0, 
>-     28,   0,   0,   0,   0,   4, 
>-    255, 255,   0,   1,   0,   0, 
>-     69,   0,   0,   0,  60,   0, 
>-      0,   0,   2,   0,   0,   0, 
>-      3,   0,   0,   0,   8,   0, 
>-      0,   0, 255, 255, 255, 255, 
>-      0,   0,   0,   0,   1,   0, 
>-      0,   0,  13,   0,   0,   0, 
>-     84, 101, 120, 116, 117, 114, 
>-    101,  73,   0,  77, 105,  99, 
>-    114, 111, 115, 111, 102, 116, 
>-     32,  40,  82,  41,  32,  72, 
>-     76,  83,  76,  32,  83, 104, 
>-     97, 100, 101, 114,  32,  67, 
>-    111, 109, 112, 105, 108, 101, 
>-    114,  32,  54,  46,  51,  46, 
>-     57,  54,  48,  48,  46,  49, 
>-     54,  51,  56,  52,   0, 171, 
>-     73,  83,  71,  78, 128,   0, 
>-      0,   0,   3,   0,   0,   0, 
>-      8,   0,   0,   0,  80,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      1,   0,   0,   0,   3,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-     15,   0,   0,   0,  92,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      4,   0,   0,   0,   1,   0, 
>-      0,   0,   1,   0,   0,   0, 
>-      1,   0,   0,   0, 118,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   3,   0, 
>-      0,   0,   2,   0,   0,   0, 
>-      7,   7,   0,   0,  83,  86, 
>-     95,  80,  79,  83,  73,  84, 
>-     73,  79,  78,   0,  83,  86, 
>-     95,  82,  69,  78,  68,  69, 
>-     82,  84,  65,  82,  71,  69, 
>-     84,  65,  82,  82,  65,  89, 
>-     73,  78,  68,  69,  88,   0, 
>-     84,  69,  88,  67,  79,  79, 
>-     82,  68,   0, 171,  79,  83, 
>-     71,  78,  44,   0,   0,   0, 
>-      1,   0,   0,   0,   8,   0, 
>-      0,   0,  32,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   2,   0,   0,   0, 
>-      0,   0,   0,   0,  15,   0, 
>-      0,   0,  83,  86,  95,  84, 
>-     65,  82,  71,  69,  84,   0, 
>-    171, 171,  83,  72,  68,  82, 
>-      0,   1,   0,   0,  64,   0, 
>-      0,   0,  64,   0,   0,   0, 
>-     88,  40,   0,   4,   0, 112, 
>-     16,   0,   0,   0,   0,   0, 
>-     51,  51,   0,   0,  98,  16, 
>-      0,   3, 114,  16,  16,   0, 
>-      2,   0,   0,   0, 101,   0, 
>-      0,   3, 242,  32,  16,   0, 
>-      0,   0,   0,   0, 104,   0, 
>-      0,   2,   1,   0,   0,   0, 
>-     61,  16,   0,   7, 242,   0, 
>-     16,   0,   0,   0,   0,   0, 
>-      1,  64,   0,   0,   0,   0, 
>-      0,   0,  70, 126,  16,   0, 
>-      0,   0,   0,   0,  86,   0, 
>-      0,   5, 114,   0,  16,   0, 
>-      0,   0,   0,   0,  70,   2, 
>-     16,   0,   0,   0,   0,   0, 
>-     56,   0,   0,   7, 114,   0, 
>-     16,   0,   0,   0,   0,   0, 
>-     70,   2,  16,   0,   0,   0, 
>-      0,   0,  70,  18,  16,   0, 
>-      2,   0,   0,   0,  27,   0, 
>-      0,   5, 114,   0,  16,   0, 
>-      0,   0,   0,   0,  70,   2, 
>-     16,   0,   0,   0,   0,   0, 
>-     54,   0,   0,   5, 130,   0, 
>-     16,   0,   0,   0,   0,   0, 
>-      1,  64,   0,   0,   0,   0, 
>-      0,   0,  45,   0,   0,   7, 
>-    242,   0,  16,   0,   0,   0, 
>-      0,   0,  70,  14,  16,   0, 
>-      0,   0,   0,   0,  70, 126, 
>-     16,   0,   0,   0,   0,   0, 
>-     54,   0,   0,   5,  50,  32, 
>-     16,   0,   0,   0,   0,   0, 
>-     70,   0,  16,   0,   0,   0, 
>-      0,   0,  54,   0,   0,   8, 
>-    194,  32,  16,   0,   0,   0, 
>-      0,   0,   2,  64,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,  62,   0, 
>-      0,   1,  83,  84,  65,  84, 
>-    116,   0,   0,   0,   9,   0, 
>-      0,   0,   1,   0,   0,   0, 
>-      0,   0,   0,   0,   2,   0, 
>-      0,   0,   1,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   1,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   1,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   3,   0,   0,   0, 
>-      0,   0,   0,   0,   2,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0
>-};
>+const BYTE g_PS_PassthroughRG3DI[] = {
>+    68,  88,  66,  67,  185, 213, 244, 108, 113, 189, 253, 145, 131, 2,   68, 116, 163, 196, 223,
>+    94,  1,   0,   0,   0,   244, 2,   0,   0,   5,   0,   0,   0,   52,  0,  0,   0,   180, 0,
>+    0,   0,   60,  1,   0,   0,   112, 1,   0,   0,   120, 2,   0,   0,   82, 68,  69,  70,  120,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,  28,  0,   0,   0,
>+    0,   4,   255, 255, 0,   1,   0,   0,   69,  0,   0,   0,   60,  0,   0,  0,   2,   0,   0,
>+    0,   3,   0,   0,   0,   8,   0,   0,   0,   255, 255, 255, 255, 0,   0,  0,   0,   1,   0,
>+    0,   0,   13,  0,   0,   0,   84,  101, 120, 116, 117, 114, 101, 73,  0,  77,  105, 99,  114,
>+    111, 115, 111, 102, 116, 32,  40,  82,  41,  32,  72,  76,  83,  76,  32, 83,  104, 97,  100,
>+    101, 114, 32,  67,  111, 109, 112, 105, 108, 101, 114, 32,  57,  46,  50, 57,  46,  57,  53,
>+    50,  46,  51,  49,  49,  49,  0,   171, 171, 73,  83,  71,  78,  128, 0,  0,   0,   3,   0,
>+    0,   0,   8,   0,   0,   0,   80,  0,   0,   0,   0,   0,   0,   0,   1,  0,   0,   0,   3,
>+    0,   0,   0,   0,   0,   0,   0,   15,  0,   0,   0,   92,  0,   0,   0,  0,   0,   0,   0,
>+    4,   0,   0,   0,   1,   0,   0,   0,   1,   0,   0,   0,   1,   0,   0,  0,   118, 0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   3,   0,   0,   0,   2,   0,  0,   0,   7,   7,
>+    0,   0,   83,  86,  95,  80,  79,  83,  73,  84,  73,  79,  78,  0,   83, 86,  95,  82,  69,
>+    78,  68,  69,  82,  84,  65,  82,  71,  69,  84,  65,  82,  82,  65,  89, 73,  78,  68,  69,
>+    88,  0,   84,  69,  88,  67,  79,  79,  82,  68,  0,   171, 79,  83,  71, 78,  44,  0,   0,
>+    0,   1,   0,   0,   0,   8,   0,   0,   0,   32,  0,   0,   0,   0,   0,  0,   0,   0,   0,
>+    0,   0,   2,   0,   0,   0,   0,   0,   0,   0,   15,  0,   0,   0,   83, 86,  95,  84,  65,
>+    82,  71,  69,  84,  0,   171, 171, 83,  72,  68,  82,  0,   1,   0,   0,  64,  0,   0,   0,
>+    64,  0,   0,   0,   88,  40,  0,   4,   0,   112, 16,  0,   0,   0,   0,  0,   51,  51,  0,
>+    0,   98,  16,  0,   3,   114, 16,  16,  0,   2,   0,   0,   0,   101, 0,  0,   3,   242, 32,
>+    16,  0,   0,   0,   0,   0,   104, 0,   0,   2,   1,   0,   0,   0,   61, 16,  0,   7,   242,
>+    0,   16,  0,   0,   0,   0,   0,   1,   64,  0,   0,   0,   0,   0,   0,  70,  126, 16,  0,
>+    0,   0,   0,   0,   86,  0,   0,   5,   114, 0,   16,  0,   0,   0,   0,  0,   70,  2,   16,
>+    0,   0,   0,   0,   0,   56,  0,   0,   7,   114, 0,   16,  0,   0,   0,  0,   0,   70,  2,
>+    16,  0,   0,   0,   0,   0,   70,  18,  16,  0,   2,   0,   0,   0,   27, 0,   0,   5,   114,
>+    0,   16,  0,   0,   0,   0,   0,   70,  2,   16,  0,   0,   0,   0,   0,  54,  0,   0,   5,
>+    130, 0,   16,  0,   0,   0,   0,   0,   1,   64,  0,   0,   0,   0,   0,  0,   45,  0,   0,
>+    7,   242, 0,   16,  0,   0,   0,   0,   0,   70,  14,  16,  0,   0,   0,  0,   0,   70,  126,
>+    16,  0,   0,   0,   0,   0,   54,  0,   0,   5,   50,  32,  16,  0,   0,  0,   0,   0,   70,
>+    0,   16,  0,   0,   0,   0,   0,   54,  0,   0,   8,   194, 32,  16,  0,  0,   0,   0,   0,
>+    2,   64,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,  0,   0,   0,   0,
>+    0,   62,  0,   0,   1,   83,  84,  65,  84,  116, 0,   0,   0,   9,   0,  0,   0,   1,   0,
>+    0,   0,   0,   0,   0,   0,   2,   0,   0,   0,   1,   0,   0,   0,   0,  0,   0,   0,   0,
>+    0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,  0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,  0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   3,   0,  0,   0,   0,   0,
>+    0,   0,   2,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,  0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0};
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrg3dui11ps.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrg3dui11ps.h
>index d1540cee712..5abdfceacac 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrg3dui11ps.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrg3dui11ps.h
>@@ -1,6 +1,10 @@
> #if 0
> //
>-// Generated by Microsoft (R) HLSL Shader Compiler 6.3.9600.16384
>+// Generated by Microsoft (R) HLSL Shader Compiler 9.29.952.3111
>+//
>+//
>+//   fxc /nologo /E PS_PassthroughRG3DUI /T ps_4_0 /Fh
>+//    compiled\passthroughrg3dui11ps.h Passthrough3D11.hlsl
> //
> //
> // Resource Bindings:
>@@ -13,18 +17,18 @@
> //
> // Input signature:
> //
>-// Name                 Index   Mask Register SysValue  Format   Used
>-// -------------------- ----- ------ -------- -------- ------- ------
>-// SV_POSITION              0   xyzw        0      POS   float       
>-// SV_RENDERTARGETARRAYINDEX     0   x           1  RTINDEX    uint       
>-// TEXCOORD                 0   xyz         2     NONE   float   xyz 
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_POSITION              0   xyzw        0      POS  float       
>+// SV_RENDERTARGETARRAYINDEX     0   x           1  RTINDEX   uint       
>+// TEXCOORD                 0   xyz         2     NONE  float   xyz 
> //
> //
> // Output signature:
> //
>-// Name                 Index   Mask Register SysValue  Format   Used
>-// -------------------- ----- ------ -------- -------- ------- ------
>-// SV_TARGET                0   xyzw        0   TARGET    uint   xyzw
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_TARGET                0   xyzw        0   TARGET   uint   xyzw
> //
> ps_4_0
> dcl_resource_texture3d (uint,uint,uint,uint) t0
>@@ -43,132 +47,44 @@ ret
> // Approximately 9 instruction slots used
> #endif
> 
>-const BYTE g_PS_PassthroughRG3DUI[] =
>-{
>-     68,  88,  66,  67,  37,  56, 
>-     43, 206,  81, 137, 125, 191, 
>-    216,  50,  86,  76,  61,  78, 
>-     25, 246,   1,   0,   0,   0, 
>-    244,   2,   0,   0,   5,   0, 
>-      0,   0,  52,   0,   0,   0, 
>-    180,   0,   0,   0,  60,   1, 
>-      0,   0, 112,   1,   0,   0, 
>-    120,   2,   0,   0,  82,  68, 
>-     69,  70, 120,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   1,   0,   0,   0, 
>-     28,   0,   0,   0,   0,   4, 
>-    255, 255,   0,   1,   0,   0, 
>-     70,   0,   0,   0,  60,   0, 
>-      0,   0,   2,   0,   0,   0, 
>-      4,   0,   0,   0,   8,   0, 
>-      0,   0, 255, 255, 255, 255, 
>-      0,   0,   0,   0,   1,   0, 
>-      0,   0,  13,   0,   0,   0, 
>-     84, 101, 120, 116, 117, 114, 
>-    101,  85,  73,   0,  77, 105, 
>-     99, 114, 111, 115, 111, 102, 
>-    116,  32,  40,  82,  41,  32, 
>-     72,  76,  83,  76,  32,  83, 
>-    104,  97, 100, 101, 114,  32, 
>-     67, 111, 109, 112, 105, 108, 
>-    101, 114,  32,  54,  46,  51, 
>-     46,  57,  54,  48,  48,  46, 
>-     49,  54,  51,  56,  52,   0, 
>-     73,  83,  71,  78, 128,   0, 
>-      0,   0,   3,   0,   0,   0, 
>-      8,   0,   0,   0,  80,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      1,   0,   0,   0,   3,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-     15,   0,   0,   0,  92,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      4,   0,   0,   0,   1,   0, 
>-      0,   0,   1,   0,   0,   0, 
>-      1,   0,   0,   0, 118,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   3,   0, 
>-      0,   0,   2,   0,   0,   0, 
>-      7,   7,   0,   0,  83,  86, 
>-     95,  80,  79,  83,  73,  84, 
>-     73,  79,  78,   0,  83,  86, 
>-     95,  82,  69,  78,  68,  69, 
>-     82,  84,  65,  82,  71,  69, 
>-     84,  65,  82,  82,  65,  89, 
>-     73,  78,  68,  69,  88,   0, 
>-     84,  69,  88,  67,  79,  79, 
>-     82,  68,   0, 171,  79,  83, 
>-     71,  78,  44,   0,   0,   0, 
>-      1,   0,   0,   0,   8,   0, 
>-      0,   0,  32,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   1,   0,   0,   0, 
>-      0,   0,   0,   0,  15,   0, 
>-      0,   0,  83,  86,  95,  84, 
>-     65,  82,  71,  69,  84,   0, 
>-    171, 171,  83,  72,  68,  82, 
>-      0,   1,   0,   0,  64,   0, 
>-      0,   0,  64,   0,   0,   0, 
>-     88,  40,   0,   4,   0, 112, 
>-     16,   0,   0,   0,   0,   0, 
>-     68,  68,   0,   0,  98,  16, 
>-      0,   3, 114,  16,  16,   0, 
>-      2,   0,   0,   0, 101,   0, 
>-      0,   3, 242,  32,  16,   0, 
>-      0,   0,   0,   0, 104,   0, 
>-      0,   2,   1,   0,   0,   0, 
>-     61,  16,   0,   7, 242,   0, 
>-     16,   0,   0,   0,   0,   0, 
>-      1,  64,   0,   0,   0,   0, 
>-      0,   0,  70, 126,  16,   0, 
>-      0,   0,   0,   0,  86,   0, 
>-      0,   5, 114,   0,  16,   0, 
>-      0,   0,   0,   0,  70,   2, 
>-     16,   0,   0,   0,   0,   0, 
>-     56,   0,   0,   7, 114,   0, 
>-     16,   0,   0,   0,   0,   0, 
>-     70,   2,  16,   0,   0,   0, 
>-      0,   0,  70,  18,  16,   0, 
>-      2,   0,   0,   0,  27,   0, 
>-      0,   5, 114,   0,  16,   0, 
>-      0,   0,   0,   0,  70,   2, 
>-     16,   0,   0,   0,   0,   0, 
>-     54,   0,   0,   5, 130,   0, 
>-     16,   0,   0,   0,   0,   0, 
>-      1,  64,   0,   0,   0,   0, 
>-      0,   0,  45,   0,   0,   7, 
>-    242,   0,  16,   0,   0,   0, 
>-      0,   0,  70,  14,  16,   0, 
>-      0,   0,   0,   0,  70, 126, 
>-     16,   0,   0,   0,   0,   0, 
>-     54,   0,   0,   5,  50,  32, 
>-     16,   0,   0,   0,   0,   0, 
>-     70,   0,  16,   0,   0,   0, 
>-      0,   0,  54,   0,   0,   8, 
>-    194,  32,  16,   0,   0,   0, 
>-      0,   0,   2,  64,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,  62,   0, 
>-      0,   1,  83,  84,  65,  84, 
>-    116,   0,   0,   0,   9,   0, 
>-      0,   0,   1,   0,   0,   0, 
>-      0,   0,   0,   0,   2,   0, 
>-      0,   0,   1,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   1,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   1,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   3,   0,   0,   0, 
>-      0,   0,   0,   0,   2,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0
>-};
>+const BYTE g_PS_PassthroughRG3DUI[] = {
>+    68,  88,  66,  67,  96,  192, 36,  178, 243, 86,  188, 32,  61,  242, 109, 248, 60,  242, 238,
>+    185, 1,   0,   0,   0,   244, 2,   0,   0,   5,   0,   0,   0,   52,  0,   0,   0,   180, 0,
>+    0,   0,   60,  1,   0,   0,   112, 1,   0,   0,   120, 2,   0,   0,   82,  68,  69,  70,  120,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   28,  0,   0,   0,
>+    0,   4,   255, 255, 0,   1,   0,   0,   70,  0,   0,   0,   60,  0,   0,   0,   2,   0,   0,
>+    0,   4,   0,   0,   0,   8,   0,   0,   0,   255, 255, 255, 255, 0,   0,   0,   0,   1,   0,
>+    0,   0,   13,  0,   0,   0,   84,  101, 120, 116, 117, 114, 101, 85,  73,  0,   77,  105, 99,
>+    114, 111, 115, 111, 102, 116, 32,  40,  82,  41,  32,  72,  76,  83,  76,  32,  83,  104, 97,
>+    100, 101, 114, 32,  67,  111, 109, 112, 105, 108, 101, 114, 32,  57,  46,  50,  57,  46,  57,
>+    53,  50,  46,  51,  49,  49,  49,  0,   171, 73,  83,  71,  78,  128, 0,   0,   0,   3,   0,
>+    0,   0,   8,   0,   0,   0,   80,  0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   3,
>+    0,   0,   0,   0,   0,   0,   0,   15,  0,   0,   0,   92,  0,   0,   0,   0,   0,   0,   0,
>+    4,   0,   0,   0,   1,   0,   0,   0,   1,   0,   0,   0,   1,   0,   0,   0,   118, 0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   3,   0,   0,   0,   2,   0,   0,   0,   7,   7,
>+    0,   0,   83,  86,  95,  80,  79,  83,  73,  84,  73,  79,  78,  0,   83,  86,  95,  82,  69,
>+    78,  68,  69,  82,  84,  65,  82,  71,  69,  84,  65,  82,  82,  65,  89,  73,  78,  68,  69,
>+    88,  0,   84,  69,  88,  67,  79,  79,  82,  68,  0,   171, 79,  83,  71,  78,  44,  0,   0,
>+    0,   1,   0,   0,   0,   8,   0,   0,   0,   32,  0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   15,  0,   0,   0,   83,  86,  95,  84,  65,
>+    82,  71,  69,  84,  0,   171, 171, 83,  72,  68,  82,  0,   1,   0,   0,   64,  0,   0,   0,
>+    64,  0,   0,   0,   88,  40,  0,   4,   0,   112, 16,  0,   0,   0,   0,   0,   68,  68,  0,
>+    0,   98,  16,  0,   3,   114, 16,  16,  0,   2,   0,   0,   0,   101, 0,   0,   3,   242, 32,
>+    16,  0,   0,   0,   0,   0,   104, 0,   0,   2,   1,   0,   0,   0,   61,  16,  0,   7,   242,
>+    0,   16,  0,   0,   0,   0,   0,   1,   64,  0,   0,   0,   0,   0,   0,   70,  126, 16,  0,
>+    0,   0,   0,   0,   86,  0,   0,   5,   114, 0,   16,  0,   0,   0,   0,   0,   70,  2,   16,
>+    0,   0,   0,   0,   0,   56,  0,   0,   7,   114, 0,   16,  0,   0,   0,   0,   0,   70,  2,
>+    16,  0,   0,   0,   0,   0,   70,  18,  16,  0,   2,   0,   0,   0,   27,  0,   0,   5,   114,
>+    0,   16,  0,   0,   0,   0,   0,   70,  2,   16,  0,   0,   0,   0,   0,   54,  0,   0,   5,
>+    130, 0,   16,  0,   0,   0,   0,   0,   1,   64,  0,   0,   0,   0,   0,   0,   45,  0,   0,
>+    7,   242, 0,   16,  0,   0,   0,   0,   0,   70,  14,  16,  0,   0,   0,   0,   0,   70,  126,
>+    16,  0,   0,   0,   0,   0,   54,  0,   0,   5,   50,  32,  16,  0,   0,   0,   0,   0,   70,
>+    0,   16,  0,   0,   0,   0,   0,   54,  0,   0,   8,   194, 32,  16,  0,   0,   0,   0,   0,
>+    2,   64,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   62,  0,   0,   1,   83,  84,  65,  84,  116, 0,   0,   0,   9,   0,   0,   0,   1,   0,
>+    0,   0,   0,   0,   0,   0,   2,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   3,   0,   0,   0,   0,   0,
>+    0,   0,   2,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0};
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgb2d11ps.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgb2d11ps.h
>index 0047ef3ca14..231dd19ca4f 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgb2d11ps.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgb2d11ps.h
>@@ -1,6 +1,10 @@
> #if 0
> //
>-// Generated by Microsoft (R) HLSL Shader Compiler 6.3.9600.16384
>+// Generated by Microsoft (R) HLSL Shader Compiler 9.29.952.3111
>+//
>+//
>+//   fxc /nologo /E PS_PassthroughRGB2D /T ps_4_0_level_9_3 /Fh
>+//    compiled\passthroughrgb2d11ps.h Passthrough2D11.hlsl
> //
> //
> // Resource Bindings:
>@@ -14,17 +18,17 @@
> //
> // Input signature:
> //
>-// Name                 Index   Mask Register SysValue  Format   Used
>-// -------------------- ----- ------ -------- -------- ------- ------
>-// SV_POSITION              0   xyzw        0      POS   float       
>-// TEXCOORD                 0   xy          1     NONE   float   xy  
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_POSITION              0   xyzw        0      POS  float       
>+// TEXCOORD                 0   xy          1     NONE  float   xy  
> //
> //
> // Output signature:
> //
>-// Name                 Index   Mask Register SysValue  Format   Used
>-// -------------------- ----- ------ -------- -------- ------- ------
>-// SV_TARGET                0   xyzw        0   TARGET   float   xyzw
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_TARGET                0   xyzw        0   TARGET  float   xyzw
> //
> //
> // Sampler/Resource to DX9 shader sampler mappings:
>@@ -58,139 +62,46 @@ ret
> // Approximately 4 instruction slots used
> #endif
> 
>-const BYTE g_PS_PassthroughRGB2D[] =
>-{
>-     68,  88,  66,  67,  51,  90, 
>-     49, 167, 211,  79,  20, 215, 
>-     57, 227,  70,  56, 132, 117, 
>-     66, 156,   1,   0,   0,   0, 
>-     28,   3,   0,   0,   6,   0, 
>-      0,   0,  56,   0,   0,   0, 
>-    208,   0,   0,   0, 108,   1, 
>-      0,   0, 232,   1,   0,   0, 
>-    144,   2,   0,   0, 232,   2, 
>-      0,   0,  65, 111, 110,  57, 
>-    144,   0,   0,   0, 144,   0, 
>-      0,   0,   0,   2, 255, 255, 
>-    104,   0,   0,   0,  40,   0, 
>-      0,   0,   0,   0,  40,   0, 
>-      0,   0,  40,   0,   0,   0, 
>-     40,   0,   1,   0,  36,   0, 
>-      0,   0,  40,   0,   0,   0, 
>-      0,   0,   1,   2, 255, 255, 
>-     81,   0,   0,   5,   0,   0, 
>-     15, 160,   0,   0, 128,  63, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-     31,   0,   0,   2,   0,   0, 
>-      0, 128,   0,   0,   3, 176, 
>-     31,   0,   0,   2,   0,   0, 
>-      0, 144,   0,   8,  15, 160, 
>-     66,   0,   0,   3,   0,   0, 
>-     15, 128,   0,   0, 228, 176, 
>-      0,   8, 228, 160,   4,   0, 
>-      0,   4,   0,   0,  15, 128, 
>-      0,   0,  36, 128,   0,   0, 
>-     64, 160,   0,   0,  21, 160, 
>-      1,   0,   0,   2,   0,   8, 
>-     15, 128,   0,   0, 228, 128, 
>-    255, 255,   0,   0,  83,  72, 
>-     68,  82, 148,   0,   0,   0, 
>-     64,   0,   0,   0,  37,   0, 
>-      0,   0,  90,   0,   0,   3, 
>-      0,  96,  16,   0,   0,   0, 
>-      0,   0,  88,  24,   0,   4, 
>-      0, 112,  16,   0,   0,   0, 
>-      0,   0,  85,  85,   0,   0, 
>-     98,  16,   0,   3,  50,  16, 
>-     16,   0,   1,   0,   0,   0, 
>-    101,   0,   0,   3, 242,  32, 
>-     16,   0,   0,   0,   0,   0, 
>-    104,   0,   0,   2,   1,   0, 
>-      0,   0,  69,   0,   0,   9, 
>-    242,   0,  16,   0,   0,   0, 
>-      0,   0,  70,  16,  16,   0, 
>-      1,   0,   0,   0,  70, 126, 
>-     16,   0,   0,   0,   0,   0, 
>-      0,  96,  16,   0,   0,   0, 
>-      0,   0,  54,   0,   0,   5, 
>-    114,  32,  16,   0,   0,   0, 
>-      0,   0,  70,   2,  16,   0, 
>-      0,   0,   0,   0,  54,   0, 
>-      0,   5, 130,  32,  16,   0, 
>-      0,   0,   0,   0,   1,  64, 
>-      0,   0,   0,   0, 128,  63, 
>-     62,   0,   0,   1,  83,  84, 
>-     65,  84, 116,   0,   0,   0, 
>-      4,   0,   0,   0,   1,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      2,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   1,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   1,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   2,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,  82,  68,  69,  70, 
>-    160,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      2,   0,   0,   0,  28,   0, 
>-      0,   0,   0,   4, 255, 255, 
>-      0,   1,   0,   0, 109,   0, 
>-      0,   0,  92,   0,   0,   0, 
>-      3,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   1,   0,   0,   0, 
>-      1,   0,   0,   0, 100,   0, 
>-      0,   0,   2,   0,   0,   0, 
>-      5,   0,   0,   0,   4,   0, 
>-      0,   0, 255, 255, 255, 255, 
>-      0,   0,   0,   0,   1,   0, 
>-      0,   0,  13,   0,   0,   0, 
>-     83,  97, 109, 112, 108, 101, 
>-    114,   0,  84, 101, 120, 116, 
>-    117, 114, 101,  70,   0,  77, 
>-    105,  99, 114, 111, 115, 111, 
>-    102, 116,  32,  40,  82,  41, 
>-     32,  72,  76,  83,  76,  32, 
>-     83, 104,  97, 100, 101, 114, 
>-     32,  67, 111, 109, 112, 105, 
>-    108, 101, 114,  32,  54,  46, 
>-     51,  46,  57,  54,  48,  48, 
>-     46,  49,  54,  51,  56,  52, 
>-      0, 171,  73,  83,  71,  78, 
>-     80,   0,   0,   0,   2,   0, 
>-      0,   0,   8,   0,   0,   0, 
>-     56,   0,   0,   0,   0,   0, 
>-      0,   0,   1,   0,   0,   0, 
>-      3,   0,   0,   0,   0,   0, 
>-      0,   0,  15,   0,   0,   0, 
>-     68,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      3,   0,   0,   0,   1,   0, 
>-      0,   0,   3,   3,   0,   0, 
>-     83,  86,  95,  80,  79,  83, 
>-     73,  84,  73,  79,  78,   0, 
>-     84,  69,  88,  67,  79,  79, 
>-     82,  68,   0, 171, 171, 171, 
>-     79,  83,  71,  78,  44,   0, 
>-      0,   0,   1,   0,   0,   0, 
>-      8,   0,   0,   0,  32,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   3,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-     15,   0,   0,   0,  83,  86, 
>-     95,  84,  65,  82,  71,  69, 
>-     84,   0, 171, 171
>-};
>+const BYTE g_PS_PassthroughRGB2D[] = {
>+    68,  88,  66,  67,  85,  126, 250, 196, 188, 16,  162, 84,  25,  241, 221, 195, 112, 236, 199,
>+    254, 1,   0,   0,   0,   28,  3,   0,   0,   6,   0,   0,   0,   56,  0,   0,   0,   208, 0,
>+    0,   0,   108, 1,   0,   0,   232, 1,   0,   0,   144, 2,   0,   0,   232, 2,   0,   0,   65,
>+    111, 110, 57,  144, 0,   0,   0,   144, 0,   0,   0,   0,   2,   255, 255, 104, 0,   0,   0,
>+    40,  0,   0,   0,   0,   0,   40,  0,   0,   0,   40,  0,   0,   0,   40,  0,   1,   0,   36,
>+    0,   0,   0,   40,  0,   0,   0,   0,   0,   1,   2,   255, 255, 81,  0,   0,   5,   0,   0,
>+    15,  160, 0,   0,   128, 63,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   31,
>+    0,   0,   2,   0,   0,   0,   128, 0,   0,   3,   176, 31,  0,   0,   2,   0,   0,   0,   144,
>+    0,   8,   15,  160, 66,  0,   0,   3,   0,   0,   15,  128, 0,   0,   228, 176, 0,   8,   228,
>+    160, 4,   0,   0,   4,   0,   0,   15,  128, 0,   0,   36,  128, 0,   0,   64,  160, 0,   0,
>+    21,  160, 1,   0,   0,   2,   0,   8,   15,  128, 0,   0,   228, 128, 255, 255, 0,   0,   83,
>+    72,  68,  82,  148, 0,   0,   0,   64,  0,   0,   0,   37,  0,   0,   0,   90,  0,   0,   3,
>+    0,   96,  16,  0,   0,   0,   0,   0,   88,  24,  0,   4,   0,   112, 16,  0,   0,   0,   0,
>+    0,   85,  85,  0,   0,   98,  16,  0,   3,   50,  16,  16,  0,   1,   0,   0,   0,   101, 0,
>+    0,   3,   242, 32,  16,  0,   0,   0,   0,   0,   104, 0,   0,   2,   1,   0,   0,   0,   69,
>+    0,   0,   9,   242, 0,   16,  0,   0,   0,   0,   0,   70,  16,  16,  0,   1,   0,   0,   0,
>+    70,  126, 16,  0,   0,   0,   0,   0,   0,   96,  16,  0,   0,   0,   0,   0,   54,  0,   0,
>+    5,   114, 32,  16,  0,   0,   0,   0,   0,   70,  2,   16,  0,   0,   0,   0,   0,   54,  0,
>+    0,   5,   130, 32,  16,  0,   0,   0,   0,   0,   1,   64,  0,   0,   0,   0,   128, 63,  62,
>+    0,   0,   1,   83,  84,  65,  84,  116, 0,   0,   0,   4,   0,   0,   0,   1,   0,   0,   0,
>+    0,   0,   0,   0,   2,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   2,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   82,  68,  69,  70,  160, 0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   2,   0,   0,   0,   28,  0,   0,   0,   0,
>+    4,   255, 255, 0,   1,   0,   0,   109, 0,   0,   0,   92,  0,   0,   0,   3,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,
>+    0,   1,   0,   0,   0,   100, 0,   0,   0,   2,   0,   0,   0,   5,   0,   0,   0,   4,   0,
>+    0,   0,   255, 255, 255, 255, 0,   0,   0,   0,   1,   0,   0,   0,   13,  0,   0,   0,   83,
>+    97,  109, 112, 108, 101, 114, 0,   84,  101, 120, 116, 117, 114, 101, 70,  0,   77,  105, 99,
>+    114, 111, 115, 111, 102, 116, 32,  40,  82,  41,  32,  72,  76,  83,  76,  32,  83,  104, 97,
>+    100, 101, 114, 32,  67,  111, 109, 112, 105, 108, 101, 114, 32,  57,  46,  50,  57,  46,  57,
>+    53,  50,  46,  51,  49,  49,  49,  0,   171, 171, 73,  83,  71,  78,  80,  0,   0,   0,   2,
>+    0,   0,   0,   8,   0,   0,   0,   56,  0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,
>+    3,   0,   0,   0,   0,   0,   0,   0,   15,  0,   0,   0,   68,  0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   3,   0,   0,   0,   1,   0,   0,   0,   3,   3,   0,   0,   83,  86,
>+    95,  80,  79,  83,  73,  84,  73,  79,  78,  0,   84,  69,  88,  67,  79,  79,  82,  68,  0,
>+    171, 171, 171, 79,  83,  71,  78,  44,  0,   0,   0,   1,   0,   0,   0,   8,   0,   0,   0,
>+    32,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   3,   0,   0,   0,   0,   0,   0,
>+    0,   15,  0,   0,   0,   83,  86,  95,  84,  65,  82,  71,  69,  84,  0,   171, 171};
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgb2d_565_11ps.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgb2d_565_11ps.h
>new file mode 100644
>index 00000000000..f0dfd44034a
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgb2d_565_11ps.h
>@@ -0,0 +1,123 @@
>+#if 0
>+//
>+// Generated by Microsoft (R) HLSL Shader Compiler 9.29.952.3111
>+//
>+//
>+//   fxc /nologo /E PS_PassthroughRGB2D_565 /T ps_4_0_level_9_3 /Fh
>+//    compiled\passthroughrgb2d_565_11ps.h Passthrough2D11.hlsl
>+//
>+//
>+// Resource Bindings:
>+//
>+// Name                                 Type  Format         Dim Slot Elements
>+// ------------------------------ ---------- ------- ----------- ---- --------
>+// Sampler                           sampler      NA          NA    0        1
>+// TextureF                          texture  float4          2d    0        1
>+//
>+//
>+//
>+// Input signature:
>+//
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_POSITION              0   xyzw        0      POS  float       
>+// TEXCOORD                 0   xy          1     NONE  float   xy  
>+//
>+//
>+// Output signature:
>+//
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_TARGET                0   xyzw        0   TARGET  float   xyzw
>+//
>+//
>+// Sampler/Resource to DX9 shader sampler mappings:
>+//
>+// Target Sampler Source Sampler  Source Resource
>+// -------------- --------------- ----------------
>+// s0             s0              t0               
>+//
>+//
>+// Level9 shader bytecode:
>+//
>+    ps_2_x
>+    def c0, 31, 63, 0.5, 1
>+    def c1, 0.0322580636, 0.0158730168, 0, 0
>+    dcl t0.xy
>+    dcl_2d s0
>+    texld r0, t0, s0
>+    mad r0.xyz, r0, c0.xyxw, c0.z
>+    frc r1.xyz, r0
>+    add r0.xyz, r0, -r1
>+    mul r0.xyz, r0, c1.xyxw
>+    mov r0.w, c0.w
>+    mov oC0, r0
>+
>+// approximately 7 instruction slots used (1 texture, 6 arithmetic)
>+ps_4_0
>+dcl_sampler s0, mode_default
>+dcl_resource_texture2d (float,float,float,float) t0
>+dcl_input_ps linear v1.xy
>+dcl_output o0.xyzw
>+dcl_temps 1
>+sample r0.xyzw, v1.xyxx, t0.xyzw, s0
>+mul r0.xyz, r0.xyzx, l(31.000000, 63.000000, 31.000000, 0.000000)
>+round_ne r0.xyz, r0.xyzx
>+mul o0.xyz, r0.xyzx, l(0.032258, 0.015873, 0.032258, 0.000000)
>+mov o0.w, l(1.000000)
>+ret 
>+// Approximately 6 instruction slots used
>+#endif
>+
>+const BYTE g_PS_PassthroughRGB2D_565[] = {
>+    68,  88,  66,  67,  67,  66,  55,  172, 133, 227, 110, 204, 193, 171, 136, 102, 65,  233, 15,
>+    94,  1,   0,   0,   0,   188, 3,   0,   0,   6,   0,   0,   0,   56,  0,   0,   0,   32,  1,
>+    0,   0,   12,  2,   0,   0,   136, 2,   0,   0,   48,  3,   0,   0,   136, 3,   0,   0,   65,
>+    111, 110, 57,  224, 0,   0,   0,   224, 0,   0,   0,   0,   2,   255, 255, 184, 0,   0,   0,
>+    40,  0,   0,   0,   0,   0,   40,  0,   0,   0,   40,  0,   0,   0,   40,  0,   1,   0,   36,
>+    0,   0,   0,   40,  0,   0,   0,   0,   0,   1,   2,   255, 255, 81,  0,   0,   5,   0,   0,
>+    15,  160, 0,   0,   248, 65,  0,   0,   124, 66,  0,   0,   0,   63,  0,   0,   128, 63,  81,
>+    0,   0,   5,   1,   0,   15,  160, 8,   33,  4,   61,  33,  8,   130, 60,  0,   0,   0,   0,
>+    0,   0,   0,   0,   31,  0,   0,   2,   0,   0,   0,   128, 0,   0,   3,   176, 31,  0,   0,
>+    2,   0,   0,   0,   144, 0,   8,   15,  160, 66,  0,   0,   3,   0,   0,   15,  128, 0,   0,
>+    228, 176, 0,   8,   228, 160, 4,   0,   0,   4,   0,   0,   7,   128, 0,   0,   228, 128, 0,
>+    0,   196, 160, 0,   0,   170, 160, 19,  0,   0,   2,   1,   0,   7,   128, 0,   0,   228, 128,
>+    2,   0,   0,   3,   0,   0,   7,   128, 0,   0,   228, 128, 1,   0,   228, 129, 5,   0,   0,
>+    3,   0,   0,   7,   128, 0,   0,   228, 128, 1,   0,   196, 160, 1,   0,   0,   2,   0,   0,
>+    8,   128, 0,   0,   255, 160, 1,   0,   0,   2,   0,   8,   15,  128, 0,   0,   228, 128, 255,
>+    255, 0,   0,   83,  72,  68,  82,  228, 0,   0,   0,   64,  0,   0,   0,   57,  0,   0,   0,
>+    90,  0,   0,   3,   0,   96,  16,  0,   0,   0,   0,   0,   88,  24,  0,   4,   0,   112, 16,
>+    0,   0,   0,   0,   0,   85,  85,  0,   0,   98,  16,  0,   3,   50,  16,  16,  0,   1,   0,
>+    0,   0,   101, 0,   0,   3,   242, 32,  16,  0,   0,   0,   0,   0,   104, 0,   0,   2,   1,
>+    0,   0,   0,   69,  0,   0,   9,   242, 0,   16,  0,   0,   0,   0,   0,   70,  16,  16,  0,
>+    1,   0,   0,   0,   70,  126, 16,  0,   0,   0,   0,   0,   0,   96,  16,  0,   0,   0,   0,
>+    0,   56,  0,   0,   10,  114, 0,   16,  0,   0,   0,   0,   0,   70,  2,   16,  0,   0,   0,
>+    0,   0,   2,   64,  0,   0,   0,   0,   248, 65,  0,   0,   124, 66,  0,   0,   248, 65,  0,
>+    0,   0,   0,   64,  0,   0,   5,   114, 0,   16,  0,   0,   0,   0,   0,   70,  2,   16,  0,
>+    0,   0,   0,   0,   56,  0,   0,   10,  114, 32,  16,  0,   0,   0,   0,   0,   70,  2,   16,
>+    0,   0,   0,   0,   0,   2,   64,  0,   0,   8,   33,  4,   61,  33,  8,   130, 60,  8,   33,
>+    4,   61,  0,   0,   0,   0,   54,  0,   0,   5,   130, 32,  16,  0,   0,   0,   0,   0,   1,
>+    64,  0,   0,   0,   0,   128, 63,  62,  0,   0,   1,   83,  84,  65,  84,  116, 0,   0,   0,
>+    6,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   2,   0,   0,   0,   3,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    1,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   82,  68,  69,  70,  160, 0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   2,
>+    0,   0,   0,   28,  0,   0,   0,   0,   4,   255, 255, 0,   1,   0,   0,   109, 0,   0,   0,
>+    92,  0,   0,   0,   3,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   1,   0,   0,   0,   1,   0,   0,   0,   100, 0,   0,   0,   2,   0,
>+    0,   0,   5,   0,   0,   0,   4,   0,   0,   0,   255, 255, 255, 255, 0,   0,   0,   0,   1,
>+    0,   0,   0,   13,  0,   0,   0,   83,  97,  109, 112, 108, 101, 114, 0,   84,  101, 120, 116,
>+    117, 114, 101, 70,  0,   77,  105, 99,  114, 111, 115, 111, 102, 116, 32,  40,  82,  41,  32,
>+    72,  76,  83,  76,  32,  83,  104, 97,  100, 101, 114, 32,  67,  111, 109, 112, 105, 108, 101,
>+    114, 32,  57,  46,  50,  57,  46,  57,  53,  50,  46,  51,  49,  49,  49,  0,   171, 171, 73,
>+    83,  71,  78,  80,  0,   0,   0,   2,   0,   0,   0,   8,   0,   0,   0,   56,  0,   0,   0,
>+    0,   0,   0,   0,   1,   0,   0,   0,   3,   0,   0,   0,   0,   0,   0,   0,   15,  0,   0,
>+    0,   68,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   3,   0,   0,   0,   1,   0,
>+    0,   0,   3,   3,   0,   0,   83,  86,  95,  80,  79,  83,  73,  84,  73,  79,  78,  0,   84,
>+    69,  88,  67,  79,  79,  82,  68,  0,   171, 171, 171, 79,  83,  71,  78,  44,  0,   0,   0,
>+    1,   0,   0,   0,   8,   0,   0,   0,   32,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   3,   0,   0,   0,   0,   0,   0,   0,   15,  0,   0,   0,   83,  86,  95,  84,  65,  82,
>+    71,  69,  84,  0,   171, 171};
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgb2darray11ps.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgb2darray11ps.h
>new file mode 100644
>index 00000000000..674ecbe5324
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgb2darray11ps.h
>@@ -0,0 +1,90 @@
>+#if 0
>+//
>+// Generated by Microsoft (R) HLSL Shader Compiler 9.29.952.3111
>+//
>+//
>+//   fxc /nologo /E PS_PassthroughRGB2DArray /T ps_4_0 /Fh
>+//    compiled\passthroughrgb2darray11ps.h Passthrough2DArray11.hlsl
>+//
>+//
>+// Resource Bindings:
>+//
>+// Name                                 Type  Format         Dim Slot Elements
>+// ------------------------------ ---------- ------- ----------- ---- --------
>+// Sampler                           sampler      NA          NA    0        1
>+// TextureF                          texture  float4     2darray    0        1
>+//
>+//
>+//
>+// Input signature:
>+//
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_POSITION              0   xyzw        0      POS  float       
>+// SV_RENDERTARGETARRAYINDEX     0   x           1  RTINDEX   uint   x   
>+// TEXCOORD                 0   xyz         2     NONE  float   xy  
>+//
>+//
>+// Output signature:
>+//
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_TARGET                0   xyzw        0   TARGET  float   xyzw
>+//
>+ps_4_0
>+dcl_sampler s0, mode_default
>+dcl_resource_texture2darray (float,float,float,float) t0
>+dcl_input_ps_siv constant v1.x, rendertarget_array_index
>+dcl_input_ps linear v2.xy
>+dcl_output o0.xyzw
>+dcl_temps 1
>+utof r0.z, v1.x
>+mov r0.xy, v2.xyxx
>+sample r0.xyzw, r0.xyzx, t0.xyzw, s0
>+mov o0.xyz, r0.xyzx
>+mov o0.w, l(1.000000)
>+ret 
>+// Approximately 6 instruction slots used
>+#endif
>+
>+const BYTE g_PS_PassthroughRGB2DArray[] = {
>+    68, 88,  66,  67,  225, 163, 46,  39,  57,  32,  20,  75,  137, 40,  221, 13,  168, 142, 200,
>+    45, 1,   0,   0,   0,   232, 2,   0,   0,   5,   0,   0,   0,   52,  0,   0,   0,   220, 0,
>+    0,  0,   100, 1,   0,   0,   152, 1,   0,   0,   108, 2,   0,   0,   82,  68,  69,  70,  160,
>+    0,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   2,   0,   0,   0,   28,  0,   0,   0,
>+    0,  4,   255, 255, 0,   1,   0,   0,   109, 0,   0,   0,   92,  0,   0,   0,   3,   0,   0,
>+    0,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,
>+    0,  0,   1,   0,   0,   0,   100, 0,   0,   0,   2,   0,   0,   0,   5,   0,   0,   0,   5,
>+    0,  0,   0,   255, 255, 255, 255, 0,   0,   0,   0,   1,   0,   0,   0,   13,  0,   0,   0,
>+    83, 97,  109, 112, 108, 101, 114, 0,   84,  101, 120, 116, 117, 114, 101, 70,  0,   77,  105,
>+    99, 114, 111, 115, 111, 102, 116, 32,  40,  82,  41,  32,  72,  76,  83,  76,  32,  83,  104,
>+    97, 100, 101, 114, 32,  67,  111, 109, 112, 105, 108, 101, 114, 32,  57,  46,  50,  57,  46,
>+    57, 53,  50,  46,  51,  49,  49,  49,  0,   171, 171, 73,  83,  71,  78,  128, 0,   0,   0,
>+    3,  0,   0,   0,   8,   0,   0,   0,   80,  0,   0,   0,   0,   0,   0,   0,   1,   0,   0,
>+    0,  3,   0,   0,   0,   0,   0,   0,   0,   15,  0,   0,   0,   92,  0,   0,   0,   0,   0,
>+    0,  0,   4,   0,   0,   0,   1,   0,   0,   0,   1,   0,   0,   0,   1,   1,   0,   0,   118,
>+    0,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   3,   0,   0,   0,   2,   0,   0,   0,
>+    7,  3,   0,   0,   83,  86,  95,  80,  79,  83,  73,  84,  73,  79,  78,  0,   83,  86,  95,
>+    82, 69,  78,  68,  69,  82,  84,  65,  82,  71,  69,  84,  65,  82,  82,  65,  89,  73,  78,
>+    68, 69,  88,  0,   84,  69,  88,  67,  79,  79,  82,  68,  0,   171, 79,  83,  71,  78,  44,
>+    0,  0,   0,   1,   0,   0,   0,   8,   0,   0,   0,   32,  0,   0,   0,   0,   0,   0,   0,
>+    0,  0,   0,   0,   3,   0,   0,   0,   0,   0,   0,   0,   15,  0,   0,   0,   83,  86,  95,
>+    84, 65,  82,  71,  69,  84,  0,   171, 171, 83,  72,  68,  82,  204, 0,   0,   0,   64,  0,
>+    0,  0,   51,  0,   0,   0,   90,  0,   0,   3,   0,   96,  16,  0,   0,   0,   0,   0,   88,
>+    64, 0,   4,   0,   112, 16,  0,   0,   0,   0,   0,   85,  85,  0,   0,   100, 8,   0,   4,
>+    18, 16,  16,  0,   1,   0,   0,   0,   4,   0,   0,   0,   98,  16,  0,   3,   50,  16,  16,
>+    0,  2,   0,   0,   0,   101, 0,   0,   3,   242, 32,  16,  0,   0,   0,   0,   0,   104, 0,
>+    0,  2,   1,   0,   0,   0,   86,  0,   0,   5,   66,  0,   16,  0,   0,   0,   0,   0,   10,
>+    16, 16,  0,   1,   0,   0,   0,   54,  0,   0,   5,   50,  0,   16,  0,   0,   0,   0,   0,
>+    70, 16,  16,  0,   2,   0,   0,   0,   69,  0,   0,   9,   242, 0,   16,  0,   0,   0,   0,
>+    0,  70,  2,   16,  0,   0,   0,   0,   0,   70,  126, 16,  0,   0,   0,   0,   0,   0,   96,
>+    16, 0,   0,   0,   0,   0,   54,  0,   0,   5,   114, 32,  16,  0,   0,   0,   0,   0,   70,
>+    2,  16,  0,   0,   0,   0,   0,   54,  0,   0,   5,   130, 32,  16,  0,   0,   0,   0,   0,
>+    1,  64,  0,   0,   0,   0,   128, 63,  62,  0,   0,   1,   83,  84,  65,  84,  116, 0,   0,
>+    0,  6,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   3,   0,   0,   0,   0,   0,
>+    0,  0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    1,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,  3,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,  0,   0};
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgb2darray_565_11ps.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgb2darray_565_11ps.h
>new file mode 100644
>index 00000000000..4ac3484e0ac
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgb2darray_565_11ps.h
>@@ -0,0 +1,96 @@
>+#if 0
>+//
>+// Generated by Microsoft (R) HLSL Shader Compiler 9.29.952.3111
>+//
>+//
>+//   fxc /nologo /E PS_PassthroughRGB2DArray_565 /T ps_4_0 /Fh
>+//    compiled\passthroughrgb2darray_565_11ps.h Passthrough2DArray11.hlsl
>+//
>+//
>+// Resource Bindings:
>+//
>+// Name                                 Type  Format         Dim Slot Elements
>+// ------------------------------ ---------- ------- ----------- ---- --------
>+// Sampler                           sampler      NA          NA    0        1
>+// TextureF                          texture  float4     2darray    0        1
>+//
>+//
>+//
>+// Input signature:
>+//
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_POSITION              0   xyzw        0      POS  float       
>+// SV_RENDERTARGETARRAYINDEX     0   x           1  RTINDEX   uint   x   
>+// TEXCOORD                 0   xyz         2     NONE  float   xy  
>+//
>+//
>+// Output signature:
>+//
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_TARGET                0   xyzw        0   TARGET  float   xyzw
>+//
>+ps_4_0
>+dcl_sampler s0, mode_default
>+dcl_resource_texture2darray (float,float,float,float) t0
>+dcl_input_ps_siv constant v1.x, rendertarget_array_index
>+dcl_input_ps linear v2.xy
>+dcl_output o0.xyzw
>+dcl_temps 1
>+utof r0.z, v1.x
>+mov r0.xy, v2.xyxx
>+sample r0.xyzw, r0.xyzx, t0.xyzw, s0
>+mul r0.xyz, r0.xyzx, l(31.000000, 63.000000, 31.000000, 0.000000)
>+round_ne r0.xyz, r0.xyzx
>+mul o0.xyz, r0.xyzx, l(0.032258, 0.015873, 0.032258, 0.000000)
>+mov o0.w, l(1.000000)
>+ret 
>+// Approximately 8 instruction slots used
>+#endif
>+
>+const BYTE g_PS_PassthroughRGB2DArray_565[] = {
>+    68,  88,  66,  67,  154, 118, 191, 108, 144, 58,  136, 40,  31,  50,  241, 170, 80, 59,  111,
>+    122, 1,   0,   0,   0,   56,  3,   0,   0,   5,   0,   0,   0,   52,  0,   0,   0,  220, 0,
>+    0,   0,   100, 1,   0,   0,   152, 1,   0,   0,   188, 2,   0,   0,   82,  68,  69, 70,  160,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   2,   0,   0,   0,   28,  0,  0,   0,
>+    0,   4,   255, 255, 0,   1,   0,   0,   109, 0,   0,   0,   92,  0,   0,   0,   3,  0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,  1,   0,
>+    0,   0,   1,   0,   0,   0,   100, 0,   0,   0,   2,   0,   0,   0,   5,   0,   0,  0,   5,
>+    0,   0,   0,   255, 255, 255, 255, 0,   0,   0,   0,   1,   0,   0,   0,   13,  0,  0,   0,
>+    83,  97,  109, 112, 108, 101, 114, 0,   84,  101, 120, 116, 117, 114, 101, 70,  0,  77,  105,
>+    99,  114, 111, 115, 111, 102, 116, 32,  40,  82,  41,  32,  72,  76,  83,  76,  32, 83,  104,
>+    97,  100, 101, 114, 32,  67,  111, 109, 112, 105, 108, 101, 114, 32,  57,  46,  50, 57,  46,
>+    57,  53,  50,  46,  51,  49,  49,  49,  0,   171, 171, 73,  83,  71,  78,  128, 0,  0,   0,
>+    3,   0,   0,   0,   8,   0,   0,   0,   80,  0,   0,   0,   0,   0,   0,   0,   1,  0,   0,
>+    0,   3,   0,   0,   0,   0,   0,   0,   0,   15,  0,   0,   0,   92,  0,   0,   0,  0,   0,
>+    0,   0,   4,   0,   0,   0,   1,   0,   0,   0,   1,   0,   0,   0,   1,   1,   0,  0,   118,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   3,   0,   0,   0,   2,   0,  0,   0,
>+    7,   3,   0,   0,   83,  86,  95,  80,  79,  83,  73,  84,  73,  79,  78,  0,   83, 86,  95,
>+    82,  69,  78,  68,  69,  82,  84,  65,  82,  71,  69,  84,  65,  82,  82,  65,  89, 73,  78,
>+    68,  69,  88,  0,   84,  69,  88,  67,  79,  79,  82,  68,  0,   171, 79,  83,  71, 78,  44,
>+    0,   0,   0,   1,   0,   0,   0,   8,   0,   0,   0,   32,  0,   0,   0,   0,   0,  0,   0,
>+    0,   0,   0,   0,   3,   0,   0,   0,   0,   0,   0,   0,   15,  0,   0,   0,   83, 86,  95,
>+    84,  65,  82,  71,  69,  84,  0,   171, 171, 83,  72,  68,  82,  28,  1,   0,   0,  64,  0,
>+    0,   0,   71,  0,   0,   0,   90,  0,   0,   3,   0,   96,  16,  0,   0,   0,   0,  0,   88,
>+    64,  0,   4,   0,   112, 16,  0,   0,   0,   0,   0,   85,  85,  0,   0,   100, 8,  0,   4,
>+    18,  16,  16,  0,   1,   0,   0,   0,   4,   0,   0,   0,   98,  16,  0,   3,   50, 16,  16,
>+    0,   2,   0,   0,   0,   101, 0,   0,   3,   242, 32,  16,  0,   0,   0,   0,   0,  104, 0,
>+    0,   2,   1,   0,   0,   0,   86,  0,   0,   5,   66,  0,   16,  0,   0,   0,   0,  0,   10,
>+    16,  16,  0,   1,   0,   0,   0,   54,  0,   0,   5,   50,  0,   16,  0,   0,   0,  0,   0,
>+    70,  16,  16,  0,   2,   0,   0,   0,   69,  0,   0,   9,   242, 0,   16,  0,   0,  0,   0,
>+    0,   70,  2,   16,  0,   0,   0,   0,   0,   70,  126, 16,  0,   0,   0,   0,   0,  0,   96,
>+    16,  0,   0,   0,   0,   0,   56,  0,   0,   10,  114, 0,   16,  0,   0,   0,   0,  0,   70,
>+    2,   16,  0,   0,   0,   0,   0,   2,   64,  0,   0,   0,   0,   248, 65,  0,   0,  124, 66,
>+    0,   0,   248, 65,  0,   0,   0,   0,   64,  0,   0,   5,   114, 0,   16,  0,   0,  0,   0,
>+    0,   70,  2,   16,  0,   0,   0,   0,   0,   56,  0,   0,   10,  114, 32,  16,  0,  0,   0,
>+    0,   0,   70,  2,   16,  0,   0,   0,   0,   0,   2,   64,  0,   0,   8,   33,  4,  61,  33,
>+    8,   130, 60,  8,   33,  4,   61,  0,   0,   0,   0,   54,  0,   0,   5,   130, 32, 16,  0,
>+    0,   0,   0,   0,   1,   64,  0,   0,   0,   0,   128, 63,  62,  0,   0,   1,   83, 84,  65,
>+    84,  116, 0,   0,   0,   8,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,  3,   0,
>+    0,   0,   3,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,  0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,  0,   0,
>+    0,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,  0,   0,
>+    0,   0,   0,   0,   0,   2,   0,   0,   0,   0,   0,   0,   0,   2,   0,   0,   0,  0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,  0,   0,
>+    0,   0,   0,   0,   0,   0,   0};
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgb2darrayi11ps.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgb2darrayi11ps.h
>new file mode 100644
>index 00000000000..867c9fba842
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgb2darrayi11ps.h
>@@ -0,0 +1,94 @@
>+#if 0
>+//
>+// Generated by Microsoft (R) HLSL Shader Compiler 9.29.952.3111
>+//
>+//
>+//   fxc /nologo /E PS_PassthroughRGB2DArrayI /T ps_4_0 /Fh
>+//    compiled\passthroughrgb2darrayi11ps.h Passthrough2DArray11.hlsl
>+//
>+//
>+// Resource Bindings:
>+//
>+// Name                                 Type  Format         Dim Slot Elements
>+// ------------------------------ ---------- ------- ----------- ---- --------
>+// TextureI                          texture   sint4     2darray    0        1
>+//
>+//
>+//
>+// Input signature:
>+//
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_POSITION              0   xyzw        0      POS  float       
>+// SV_RENDERTARGETARRAYINDEX     0   x           1  RTINDEX   uint   x   
>+// TEXCOORD                 0   xyz         2     NONE  float   xy  
>+//
>+//
>+// Output signature:
>+//
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_TARGET                0   xyzw        0   TARGET    int   xyzw
>+//
>+ps_4_0
>+dcl_resource_texture2darray (sint,sint,sint,sint) t0
>+dcl_input_ps_siv constant v1.x, rendertarget_array_index
>+dcl_input_ps linear v2.xy
>+dcl_output o0.xyzw
>+dcl_temps 1
>+resinfo_uint r0.xyzw, l(0), t0.xyzw
>+utof r0.xy, r0.xyxx
>+mul r0.xy, r0.xyxx, v2.xyxx
>+ftoi r0.xy, r0.xyxx
>+mov r0.z, v1.x
>+mov r0.w, l(0)
>+ld r0.xyzw, r0.xyzw, t0.xyzw
>+mov o0.xyz, r0.xyzx
>+mov o0.w, l(1)
>+ret 
>+// Approximately 10 instruction slots used
>+#endif
>+
>+const BYTE g_PS_PassthroughRGB2DArrayI[] = {
>+    68,  88,  66,  67,  203, 204, 115, 216, 122, 41,  103, 203, 207, 35,  129, 118, 254, 235, 84,
>+    148, 1,   0,   0,   0,   12,  3,   0,   0,   5,   0,   0,   0,   52,  0,   0,   0,   180, 0,
>+    0,   0,   60,  1,   0,   0,   112, 1,   0,   0,   144, 2,   0,   0,   82,  68,  69,  70,  120,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   28,  0,   0,   0,
>+    0,   4,   255, 255, 0,   1,   0,   0,   69,  0,   0,   0,   60,  0,   0,   0,   2,   0,   0,
>+    0,   3,   0,   0,   0,   5,   0,   0,   0,   255, 255, 255, 255, 0,   0,   0,   0,   1,   0,
>+    0,   0,   13,  0,   0,   0,   84,  101, 120, 116, 117, 114, 101, 73,  0,   77,  105, 99,  114,
>+    111, 115, 111, 102, 116, 32,  40,  82,  41,  32,  72,  76,  83,  76,  32,  83,  104, 97,  100,
>+    101, 114, 32,  67,  111, 109, 112, 105, 108, 101, 114, 32,  57,  46,  50,  57,  46,  57,  53,
>+    50,  46,  51,  49,  49,  49,  0,   171, 171, 73,  83,  71,  78,  128, 0,   0,   0,   3,   0,
>+    0,   0,   8,   0,   0,   0,   80,  0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   3,
>+    0,   0,   0,   0,   0,   0,   0,   15,  0,   0,   0,   92,  0,   0,   0,   0,   0,   0,   0,
>+    4,   0,   0,   0,   1,   0,   0,   0,   1,   0,   0,   0,   1,   1,   0,   0,   118, 0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   3,   0,   0,   0,   2,   0,   0,   0,   7,   3,
>+    0,   0,   83,  86,  95,  80,  79,  83,  73,  84,  73,  79,  78,  0,   83,  86,  95,  82,  69,
>+    78,  68,  69,  82,  84,  65,  82,  71,  69,  84,  65,  82,  82,  65,  89,  73,  78,  68,  69,
>+    88,  0,   84,  69,  88,  67,  79,  79,  82,  68,  0,   171, 79,  83,  71,  78,  44,  0,   0,
>+    0,   1,   0,   0,   0,   8,   0,   0,   0,   32,  0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   2,   0,   0,   0,   0,   0,   0,   0,   15,  0,   0,   0,   83,  86,  95,  84,  65,
>+    82,  71,  69,  84,  0,   171, 171, 83,  72,  68,  82,  24,  1,   0,   0,   64,  0,   0,   0,
>+    70,  0,   0,   0,   88,  64,  0,   4,   0,   112, 16,  0,   0,   0,   0,   0,   51,  51,  0,
>+    0,   100, 8,   0,   4,   18,  16,  16,  0,   1,   0,   0,   0,   4,   0,   0,   0,   98,  16,
>+    0,   3,   50,  16,  16,  0,   2,   0,   0,   0,   101, 0,   0,   3,   242, 32,  16,  0,   0,
>+    0,   0,   0,   104, 0,   0,   2,   1,   0,   0,   0,   61,  16,  0,   7,   242, 0,   16,  0,
>+    0,   0,   0,   0,   1,   64,  0,   0,   0,   0,   0,   0,   70,  126, 16,  0,   0,   0,   0,
>+    0,   86,  0,   0,   5,   50,  0,   16,  0,   0,   0,   0,   0,   70,  0,   16,  0,   0,   0,
>+    0,   0,   56,  0,   0,   7,   50,  0,   16,  0,   0,   0,   0,   0,   70,  0,   16,  0,   0,
>+    0,   0,   0,   70,  16,  16,  0,   2,   0,   0,   0,   27,  0,   0,   5,   50,  0,   16,  0,
>+    0,   0,   0,   0,   70,  0,   16,  0,   0,   0,   0,   0,   54,  0,   0,   5,   66,  0,   16,
>+    0,   0,   0,   0,   0,   10,  16,  16,  0,   1,   0,   0,   0,   54,  0,   0,   5,   130, 0,
>+    16,  0,   0,   0,   0,   0,   1,   64,  0,   0,   0,   0,   0,   0,   45,  0,   0,   7,   242,
>+    0,   16,  0,   0,   0,   0,   0,   70,  14,  16,  0,   0,   0,   0,   0,   70,  126, 16,  0,
>+    0,   0,   0,   0,   54,  0,   0,   5,   114, 32,  16,  0,   0,   0,   0,   0,   70,  2,   16,
>+    0,   0,   0,   0,   0,   54,  0,   0,   5,   130, 32,  16,  0,   0,   0,   0,   0,   1,   64,
>+    0,   0,   1,   0,   0,   0,   62,  0,   0,   1,   83,  84,  65,  84,  116, 0,   0,   0,   10,
>+    0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   3,   0,   0,   0,   1,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   4,
>+    0,   0,   0,   0,   0,   0,   0,   2,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0};
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgb2darrayui11ps.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgb2darrayui11ps.h
>new file mode 100644
>index 00000000000..af27be1fc47
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgb2darrayui11ps.h
>@@ -0,0 +1,94 @@
>+#if 0
>+//
>+// Generated by Microsoft (R) HLSL Shader Compiler 9.29.952.3111
>+//
>+//
>+//   fxc /nologo /E PS_PassthroughRGB2DArrayUI /T ps_4_0 /Fh
>+//    compiled\passthroughrgb2darrayui11ps.h Passthrough2DArray11.hlsl
>+//
>+//
>+// Resource Bindings:
>+//
>+// Name                                 Type  Format         Dim Slot Elements
>+// ------------------------------ ---------- ------- ----------- ---- --------
>+// TextureUI                         texture   uint4     2darray    0        1
>+//
>+//
>+//
>+// Input signature:
>+//
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_POSITION              0   xyzw        0      POS  float       
>+// SV_RENDERTARGETARRAYINDEX     0   x           1  RTINDEX   uint   x   
>+// TEXCOORD                 0   xyz         2     NONE  float   xy  
>+//
>+//
>+// Output signature:
>+//
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_TARGET                0   xyzw        0   TARGET   uint   xyzw
>+//
>+ps_4_0
>+dcl_resource_texture2darray (uint,uint,uint,uint) t0
>+dcl_input_ps_siv constant v1.x, rendertarget_array_index
>+dcl_input_ps linear v2.xy
>+dcl_output o0.xyzw
>+dcl_temps 1
>+resinfo_uint r0.xyzw, l(0), t0.xyzw
>+utof r0.xy, r0.xyxx
>+mul r0.xy, r0.xyxx, v2.xyxx
>+ftoi r0.xy, r0.xyxx
>+mov r0.z, v1.x
>+mov r0.w, l(0)
>+ld r0.xyzw, r0.xyzw, t0.xyzw
>+mov o0.xyz, r0.xyzx
>+mov o0.w, l(1)
>+ret 
>+// Approximately 10 instruction slots used
>+#endif
>+
>+const BYTE g_PS_PassthroughRGB2DArrayUI[] = {
>+    68,  88,  66,  67,  253, 90,  38,  58,  32,  167, 35,  29,  29,  134, 13,  19,  245, 38,  146,
>+    38,  1,   0,   0,   0,   12,  3,   0,   0,   5,   0,   0,   0,   52,  0,   0,   0,   180, 0,
>+    0,   0,   60,  1,   0,   0,   112, 1,   0,   0,   144, 2,   0,   0,   82,  68,  69,  70,  120,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   28,  0,   0,   0,
>+    0,   4,   255, 255, 0,   1,   0,   0,   70,  0,   0,   0,   60,  0,   0,   0,   2,   0,   0,
>+    0,   4,   0,   0,   0,   5,   0,   0,   0,   255, 255, 255, 255, 0,   0,   0,   0,   1,   0,
>+    0,   0,   13,  0,   0,   0,   84,  101, 120, 116, 117, 114, 101, 85,  73,  0,   77,  105, 99,
>+    114, 111, 115, 111, 102, 116, 32,  40,  82,  41,  32,  72,  76,  83,  76,  32,  83,  104, 97,
>+    100, 101, 114, 32,  67,  111, 109, 112, 105, 108, 101, 114, 32,  57,  46,  50,  57,  46,  57,
>+    53,  50,  46,  51,  49,  49,  49,  0,   171, 73,  83,  71,  78,  128, 0,   0,   0,   3,   0,
>+    0,   0,   8,   0,   0,   0,   80,  0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   3,
>+    0,   0,   0,   0,   0,   0,   0,   15,  0,   0,   0,   92,  0,   0,   0,   0,   0,   0,   0,
>+    4,   0,   0,   0,   1,   0,   0,   0,   1,   0,   0,   0,   1,   1,   0,   0,   118, 0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   3,   0,   0,   0,   2,   0,   0,   0,   7,   3,
>+    0,   0,   83,  86,  95,  80,  79,  83,  73,  84,  73,  79,  78,  0,   83,  86,  95,  82,  69,
>+    78,  68,  69,  82,  84,  65,  82,  71,  69,  84,  65,  82,  82,  65,  89,  73,  78,  68,  69,
>+    88,  0,   84,  69,  88,  67,  79,  79,  82,  68,  0,   171, 79,  83,  71,  78,  44,  0,   0,
>+    0,   1,   0,   0,   0,   8,   0,   0,   0,   32,  0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   15,  0,   0,   0,   83,  86,  95,  84,  65,
>+    82,  71,  69,  84,  0,   171, 171, 83,  72,  68,  82,  24,  1,   0,   0,   64,  0,   0,   0,
>+    70,  0,   0,   0,   88,  64,  0,   4,   0,   112, 16,  0,   0,   0,   0,   0,   68,  68,  0,
>+    0,   100, 8,   0,   4,   18,  16,  16,  0,   1,   0,   0,   0,   4,   0,   0,   0,   98,  16,
>+    0,   3,   50,  16,  16,  0,   2,   0,   0,   0,   101, 0,   0,   3,   242, 32,  16,  0,   0,
>+    0,   0,   0,   104, 0,   0,   2,   1,   0,   0,   0,   61,  16,  0,   7,   242, 0,   16,  0,
>+    0,   0,   0,   0,   1,   64,  0,   0,   0,   0,   0,   0,   70,  126, 16,  0,   0,   0,   0,
>+    0,   86,  0,   0,   5,   50,  0,   16,  0,   0,   0,   0,   0,   70,  0,   16,  0,   0,   0,
>+    0,   0,   56,  0,   0,   7,   50,  0,   16,  0,   0,   0,   0,   0,   70,  0,   16,  0,   0,
>+    0,   0,   0,   70,  16,  16,  0,   2,   0,   0,   0,   27,  0,   0,   5,   50,  0,   16,  0,
>+    0,   0,   0,   0,   70,  0,   16,  0,   0,   0,   0,   0,   54,  0,   0,   5,   66,  0,   16,
>+    0,   0,   0,   0,   0,   10,  16,  16,  0,   1,   0,   0,   0,   54,  0,   0,   5,   130, 0,
>+    16,  0,   0,   0,   0,   0,   1,   64,  0,   0,   0,   0,   0,   0,   45,  0,   0,   7,   242,
>+    0,   16,  0,   0,   0,   0,   0,   70,  14,  16,  0,   0,   0,   0,   0,   70,  126, 16,  0,
>+    0,   0,   0,   0,   54,  0,   0,   5,   114, 32,  16,  0,   0,   0,   0,   0,   70,  2,   16,
>+    0,   0,   0,   0,   0,   54,  0,   0,   5,   130, 32,  16,  0,   0,   0,   0,   0,   1,   64,
>+    0,   0,   1,   0,   0,   0,   62,  0,   0,   1,   83,  84,  65,  84,  116, 0,   0,   0,   10,
>+    0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   3,   0,   0,   0,   1,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   4,
>+    0,   0,   0,   0,   0,   0,   0,   2,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0};
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgb2di11ps.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgb2di11ps.h
>index 0f318fd8b47..4b0b6dc37be 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgb2di11ps.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgb2di11ps.h
>@@ -1,6 +1,10 @@
> #if 0
> //
>-// Generated by Microsoft (R) HLSL Shader Compiler 6.3.9600.16384
>+// Generated by Microsoft (R) HLSL Shader Compiler 9.29.952.3111
>+//
>+//
>+//   fxc /nologo /E PS_PassthroughRGB2DI /T ps_4_0 /Fh
>+//    compiled\passthroughrgb2di11ps.h Passthrough2D11.hlsl
> //
> //
> // Resource Bindings:
>@@ -13,17 +17,17 @@
> //
> // Input signature:
> //
>-// Name                 Index   Mask Register SysValue  Format   Used
>-// -------------------- ----- ------ -------- -------- ------- ------
>-// SV_POSITION              0   xyzw        0      POS   float       
>-// TEXCOORD                 0   xy          1     NONE   float   xy  
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_POSITION              0   xyzw        0      POS  float       
>+// TEXCOORD                 0   xy          1     NONE  float   xy  
> //
> //
> // Output signature:
> //
>-// Name                 Index   Mask Register SysValue  Format   Used
>-// -------------------- ----- ------ -------- -------- ------- ------
>-// SV_TARGET                0   xyzw        0   TARGET     int   xyzw
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_TARGET                0   xyzw        0   TARGET    int   xyzw
> //
> ps_4_0
> dcl_resource_texture2d (sint,sint,sint,sint) t0
>@@ -42,124 +46,42 @@ ret
> // Approximately 9 instruction slots used
> #endif
> 
>-const BYTE g_PS_PassthroughRGB2DI[] =
>-{
>-     68,  88,  66,  67,  16, 227, 
>-    172, 190, 246, 118, 223, 239, 
>-    176,  78,  90,  11, 135, 138, 
>-    109, 174,   1,   0,   0,   0, 
>-    196,   2,   0,   0,   5,   0, 
>-      0,   0,  52,   0,   0,   0, 
>-    180,   0,   0,   0,  12,   1, 
>-      0,   0,  64,   1,   0,   0, 
>-     72,   2,   0,   0,  82,  68, 
>-     69,  70, 120,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   1,   0,   0,   0, 
>-     28,   0,   0,   0,   0,   4, 
>-    255, 255,   0,   1,   0,   0, 
>-     69,   0,   0,   0,  60,   0, 
>-      0,   0,   2,   0,   0,   0, 
>-      3,   0,   0,   0,   4,   0, 
>-      0,   0, 255, 255, 255, 255, 
>-      0,   0,   0,   0,   1,   0, 
>-      0,   0,  13,   0,   0,   0, 
>-     84, 101, 120, 116, 117, 114, 
>-    101,  73,   0,  77, 105,  99, 
>-    114, 111, 115, 111, 102, 116, 
>-     32,  40,  82,  41,  32,  72, 
>-     76,  83,  76,  32,  83, 104, 
>-     97, 100, 101, 114,  32,  67, 
>-    111, 109, 112, 105, 108, 101, 
>-    114,  32,  54,  46,  51,  46, 
>-     57,  54,  48,  48,  46,  49, 
>-     54,  51,  56,  52,   0, 171, 
>-     73,  83,  71,  78,  80,   0, 
>-      0,   0,   2,   0,   0,   0, 
>-      8,   0,   0,   0,  56,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      1,   0,   0,   0,   3,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-     15,   0,   0,   0,  68,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   3,   0, 
>-      0,   0,   1,   0,   0,   0, 
>-      3,   3,   0,   0,  83,  86, 
>-     95,  80,  79,  83,  73,  84, 
>-     73,  79,  78,   0,  84,  69, 
>-     88,  67,  79,  79,  82,  68, 
>-      0, 171, 171, 171,  79,  83, 
>-     71,  78,  44,   0,   0,   0, 
>-      1,   0,   0,   0,   8,   0, 
>-      0,   0,  32,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   2,   0,   0,   0, 
>-      0,   0,   0,   0,  15,   0, 
>-      0,   0,  83,  86,  95,  84, 
>-     65,  82,  71,  69,  84,   0, 
>-    171, 171,  83,  72,  68,  82, 
>-      0,   1,   0,   0,  64,   0, 
>-      0,   0,  64,   0,   0,   0, 
>-     88,  24,   0,   4,   0, 112, 
>-     16,   0,   0,   0,   0,   0, 
>-     51,  51,   0,   0,  98,  16, 
>-      0,   3,  50,  16,  16,   0, 
>-      1,   0,   0,   0, 101,   0, 
>-      0,   3, 242,  32,  16,   0, 
>-      0,   0,   0,   0, 104,   0, 
>-      0,   2,   1,   0,   0,   0, 
>-     61,  16,   0,   7, 242,   0, 
>-     16,   0,   0,   0,   0,   0, 
>-      1,  64,   0,   0,   0,   0, 
>-      0,   0,  70, 126,  16,   0, 
>-      0,   0,   0,   0,  86,   0, 
>-      0,   5,  50,   0,  16,   0, 
>-      0,   0,   0,   0,  70,   0, 
>-     16,   0,   0,   0,   0,   0, 
>-     56,   0,   0,   7,  50,   0, 
>-     16,   0,   0,   0,   0,   0, 
>-     70,   0,  16,   0,   0,   0, 
>-      0,   0,  70,  16,  16,   0, 
>-      1,   0,   0,   0,  27,   0, 
>-      0,   5,  50,   0,  16,   0, 
>-      0,   0,   0,   0,  70,   0, 
>-     16,   0,   0,   0,   0,   0, 
>-     54,   0,   0,   8, 194,   0, 
>-     16,   0,   0,   0,   0,   0, 
>-      2,  64,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,  45,   0,   0,   7, 
>-    242,   0,  16,   0,   0,   0, 
>-      0,   0,  70,  14,  16,   0, 
>-      0,   0,   0,   0,  70, 126, 
>-     16,   0,   0,   0,   0,   0, 
>-     54,   0,   0,   5, 114,  32, 
>-     16,   0,   0,   0,   0,   0, 
>-     70,   2,  16,   0,   0,   0, 
>-      0,   0,  54,   0,   0,   5, 
>-    130,  32,  16,   0,   0,   0, 
>-      0,   0,   1,  64,   0,   0, 
>-      0,   0,   0,   0,  62,   0, 
>-      0,   1,  83,  84,  65,  84, 
>-    116,   0,   0,   0,   9,   0, 
>-      0,   0,   1,   0,   0,   0, 
>-      0,   0,   0,   0,   2,   0, 
>-      0,   0,   1,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   1,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   1,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   3,   0,   0,   0, 
>-      0,   0,   0,   0,   2,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0
>-};
>+const BYTE g_PS_PassthroughRGB2DI[] = {
>+    68,  88,  66,  67,  103, 48,  174, 226, 36,  218, 154, 243, 36,  109, 177, 52,  89,  59,  167,
>+    243, 1,   0,   0,   0,   196, 2,   0,   0,   5,   0,   0,   0,   52,  0,   0,   0,   180, 0,
>+    0,   0,   12,  1,   0,   0,   64,  1,   0,   0,   72,  2,   0,   0,   82,  68,  69,  70,  120,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   28,  0,   0,   0,
>+    0,   4,   255, 255, 0,   1,   0,   0,   69,  0,   0,   0,   60,  0,   0,   0,   2,   0,   0,
>+    0,   3,   0,   0,   0,   4,   0,   0,   0,   255, 255, 255, 255, 0,   0,   0,   0,   1,   0,
>+    0,   0,   13,  0,   0,   0,   84,  101, 120, 116, 117, 114, 101, 73,  0,   77,  105, 99,  114,
>+    111, 115, 111, 102, 116, 32,  40,  82,  41,  32,  72,  76,  83,  76,  32,  83,  104, 97,  100,
>+    101, 114, 32,  67,  111, 109, 112, 105, 108, 101, 114, 32,  57,  46,  50,  57,  46,  57,  53,
>+    50,  46,  51,  49,  49,  49,  0,   171, 171, 73,  83,  71,  78,  80,  0,   0,   0,   2,   0,
>+    0,   0,   8,   0,   0,   0,   56,  0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   3,
>+    0,   0,   0,   0,   0,   0,   0,   15,  0,   0,   0,   68,  0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   3,   0,   0,   0,   1,   0,   0,   0,   3,   3,   0,   0,   83,  86,  95,
>+    80,  79,  83,  73,  84,  73,  79,  78,  0,   84,  69,  88,  67,  79,  79,  82,  68,  0,   171,
>+    171, 171, 79,  83,  71,  78,  44,  0,   0,   0,   1,   0,   0,   0,   8,   0,   0,   0,   32,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   2,   0,   0,   0,   0,   0,   0,   0,
>+    15,  0,   0,   0,   83,  86,  95,  84,  65,  82,  71,  69,  84,  0,   171, 171, 83,  72,  68,
>+    82,  0,   1,   0,   0,   64,  0,   0,   0,   64,  0,   0,   0,   88,  24,  0,   4,   0,   112,
>+    16,  0,   0,   0,   0,   0,   51,  51,  0,   0,   98,  16,  0,   3,   50,  16,  16,  0,   1,
>+    0,   0,   0,   101, 0,   0,   3,   242, 32,  16,  0,   0,   0,   0,   0,   104, 0,   0,   2,
>+    1,   0,   0,   0,   61,  16,  0,   7,   242, 0,   16,  0,   0,   0,   0,   0,   1,   64,  0,
>+    0,   0,   0,   0,   0,   70,  126, 16,  0,   0,   0,   0,   0,   86,  0,   0,   5,   50,  0,
>+    16,  0,   0,   0,   0,   0,   70,  0,   16,  0,   0,   0,   0,   0,   56,  0,   0,   7,   50,
>+    0,   16,  0,   0,   0,   0,   0,   70,  0,   16,  0,   0,   0,   0,   0,   70,  16,  16,  0,
>+    1,   0,   0,   0,   27,  0,   0,   5,   50,  0,   16,  0,   0,   0,   0,   0,   70,  0,   16,
>+    0,   0,   0,   0,   0,   54,  0,   0,   8,   194, 0,   16,  0,   0,   0,   0,   0,   2,   64,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   45,
>+    0,   0,   7,   242, 0,   16,  0,   0,   0,   0,   0,   70,  14,  16,  0,   0,   0,   0,   0,
>+    70,  126, 16,  0,   0,   0,   0,   0,   54,  0,   0,   5,   114, 32,  16,  0,   0,   0,   0,
>+    0,   70,  2,   16,  0,   0,   0,   0,   0,   54,  0,   0,   5,   130, 32,  16,  0,   0,   0,
>+    0,   0,   1,   64,  0,   0,   0,   0,   0,   0,   62,  0,   0,   1,   83,  84,  65,  84,  116,
>+    0,   0,   0,   9,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   2,   0,   0,   0,
>+    1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   3,   0,   0,   0,   0,   0,   0,   0,   2,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0};
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgb2dui11ps.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgb2dui11ps.h
>index 943f7a2be95..c9142de2d81 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgb2dui11ps.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgb2dui11ps.h
>@@ -1,6 +1,10 @@
> #if 0
> //
>-// Generated by Microsoft (R) HLSL Shader Compiler 6.3.9600.16384
>+// Generated by Microsoft (R) HLSL Shader Compiler 9.29.952.3111
>+//
>+//
>+//   fxc /nologo /E PS_PassthroughRGB2DUI /T ps_4_0 /Fh
>+//    compiled\passthroughrgb2dui11ps.h Passthrough2D11.hlsl
> //
> //
> // Resource Bindings:
>@@ -13,17 +17,17 @@
> //
> // Input signature:
> //
>-// Name                 Index   Mask Register SysValue  Format   Used
>-// -------------------- ----- ------ -------- -------- ------- ------
>-// SV_POSITION              0   xyzw        0      POS   float       
>-// TEXCOORD                 0   xy          1     NONE   float   xy  
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_POSITION              0   xyzw        0      POS  float       
>+// TEXCOORD                 0   xy          1     NONE  float   xy  
> //
> //
> // Output signature:
> //
>-// Name                 Index   Mask Register SysValue  Format   Used
>-// -------------------- ----- ------ -------- -------- ------- ------
>-// SV_TARGET                0   xyzw        0   TARGET    uint   xyzw
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_TARGET                0   xyzw        0   TARGET   uint   xyzw
> //
> ps_4_0
> dcl_resource_texture2d (uint,uint,uint,uint) t0
>@@ -42,124 +46,42 @@ ret
> // Approximately 9 instruction slots used
> #endif
> 
>-const BYTE g_PS_PassthroughRGB2DUI[] =
>-{
>-     68,  88,  66,  67, 245, 219, 
>-     46,  32,  34,  74,   2,  47, 
>-    124,  96, 216,  40, 253, 243, 
>-    104, 178,   1,   0,   0,   0, 
>-    196,   2,   0,   0,   5,   0, 
>-      0,   0,  52,   0,   0,   0, 
>-    180,   0,   0,   0,  12,   1, 
>-      0,   0,  64,   1,   0,   0, 
>-     72,   2,   0,   0,  82,  68, 
>-     69,  70, 120,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   1,   0,   0,   0, 
>-     28,   0,   0,   0,   0,   4, 
>-    255, 255,   0,   1,   0,   0, 
>-     70,   0,   0,   0,  60,   0, 
>-      0,   0,   2,   0,   0,   0, 
>-      4,   0,   0,   0,   4,   0, 
>-      0,   0, 255, 255, 255, 255, 
>-      0,   0,   0,   0,   1,   0, 
>-      0,   0,  13,   0,   0,   0, 
>-     84, 101, 120, 116, 117, 114, 
>-    101,  85,  73,   0,  77, 105, 
>-     99, 114, 111, 115, 111, 102, 
>-    116,  32,  40,  82,  41,  32, 
>-     72,  76,  83,  76,  32,  83, 
>-    104,  97, 100, 101, 114,  32, 
>-     67, 111, 109, 112, 105, 108, 
>-    101, 114,  32,  54,  46,  51, 
>-     46,  57,  54,  48,  48,  46, 
>-     49,  54,  51,  56,  52,   0, 
>-     73,  83,  71,  78,  80,   0, 
>-      0,   0,   2,   0,   0,   0, 
>-      8,   0,   0,   0,  56,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      1,   0,   0,   0,   3,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-     15,   0,   0,   0,  68,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   3,   0, 
>-      0,   0,   1,   0,   0,   0, 
>-      3,   3,   0,   0,  83,  86, 
>-     95,  80,  79,  83,  73,  84, 
>-     73,  79,  78,   0,  84,  69, 
>-     88,  67,  79,  79,  82,  68, 
>-      0, 171, 171, 171,  79,  83, 
>-     71,  78,  44,   0,   0,   0, 
>-      1,   0,   0,   0,   8,   0, 
>-      0,   0,  32,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   1,   0,   0,   0, 
>-      0,   0,   0,   0,  15,   0, 
>-      0,   0,  83,  86,  95,  84, 
>-     65,  82,  71,  69,  84,   0, 
>-    171, 171,  83,  72,  68,  82, 
>-      0,   1,   0,   0,  64,   0, 
>-      0,   0,  64,   0,   0,   0, 
>-     88,  24,   0,   4,   0, 112, 
>-     16,   0,   0,   0,   0,   0, 
>-     68,  68,   0,   0,  98,  16, 
>-      0,   3,  50,  16,  16,   0, 
>-      1,   0,   0,   0, 101,   0, 
>-      0,   3, 242,  32,  16,   0, 
>-      0,   0,   0,   0, 104,   0, 
>-      0,   2,   1,   0,   0,   0, 
>-     61,  16,   0,   7, 242,   0, 
>-     16,   0,   0,   0,   0,   0, 
>-      1,  64,   0,   0,   0,   0, 
>-      0,   0,  70, 126,  16,   0, 
>-      0,   0,   0,   0,  86,   0, 
>-      0,   5,  50,   0,  16,   0, 
>-      0,   0,   0,   0,  70,   0, 
>-     16,   0,   0,   0,   0,   0, 
>-     56,   0,   0,   7,  50,   0, 
>-     16,   0,   0,   0,   0,   0, 
>-     70,   0,  16,   0,   0,   0, 
>-      0,   0,  70,  16,  16,   0, 
>-      1,   0,   0,   0,  27,   0, 
>-      0,   5,  50,   0,  16,   0, 
>-      0,   0,   0,   0,  70,   0, 
>-     16,   0,   0,   0,   0,   0, 
>-     54,   0,   0,   8, 194,   0, 
>-     16,   0,   0,   0,   0,   0, 
>-      2,  64,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,  45,   0,   0,   7, 
>-    242,   0,  16,   0,   0,   0, 
>-      0,   0,  70,  14,  16,   0, 
>-      0,   0,   0,   0,  70, 126, 
>-     16,   0,   0,   0,   0,   0, 
>-     54,   0,   0,   5, 114,  32, 
>-     16,   0,   0,   0,   0,   0, 
>-     70,   2,  16,   0,   0,   0, 
>-      0,   0,  54,   0,   0,   5, 
>-    130,  32,  16,   0,   0,   0, 
>-      0,   0,   1,  64,   0,   0, 
>-      0,   0,   0,   0,  62,   0, 
>-      0,   1,  83,  84,  65,  84, 
>-    116,   0,   0,   0,   9,   0, 
>-      0,   0,   1,   0,   0,   0, 
>-      0,   0,   0,   0,   2,   0, 
>-      0,   0,   1,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   1,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   1,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   3,   0,   0,   0, 
>-      0,   0,   0,   0,   2,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0
>-};
>+const BYTE g_PS_PassthroughRGB2DUI[] = {
>+    68,  88,  66,  67,  106, 224, 213, 49,  148, 23,  134, 204, 255, 208, 89,  239, 72, 191, 144,
>+    2,   1,   0,   0,   0,   196, 2,   0,   0,   5,   0,   0,   0,   52,  0,   0,   0,  180, 0,
>+    0,   0,   12,  1,   0,   0,   64,  1,   0,   0,   72,  2,   0,   0,   82,  68,  69, 70,  120,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   28,  0,  0,   0,
>+    0,   4,   255, 255, 0,   1,   0,   0,   70,  0,   0,   0,   60,  0,   0,   0,   2,  0,   0,
>+    0,   4,   0,   0,   0,   4,   0,   0,   0,   255, 255, 255, 255, 0,   0,   0,   0,  1,   0,
>+    0,   0,   13,  0,   0,   0,   84,  101, 120, 116, 117, 114, 101, 85,  73,  0,   77, 105, 99,
>+    114, 111, 115, 111, 102, 116, 32,  40,  82,  41,  32,  72,  76,  83,  76,  32,  83, 104, 97,
>+    100, 101, 114, 32,  67,  111, 109, 112, 105, 108, 101, 114, 32,  57,  46,  50,  57, 46,  57,
>+    53,  50,  46,  51,  49,  49,  49,  0,   171, 73,  83,  71,  78,  80,  0,   0,   0,  2,   0,
>+    0,   0,   8,   0,   0,   0,   56,  0,   0,   0,   0,   0,   0,   0,   1,   0,   0,  0,   3,
>+    0,   0,   0,   0,   0,   0,   0,   15,  0,   0,   0,   68,  0,   0,   0,   0,   0,  0,   0,
>+    0,   0,   0,   0,   3,   0,   0,   0,   1,   0,   0,   0,   3,   3,   0,   0,   83, 86,  95,
>+    80,  79,  83,  73,  84,  73,  79,  78,  0,   84,  69,  88,  67,  79,  79,  82,  68, 0,   171,
>+    171, 171, 79,  83,  71,  78,  44,  0,   0,   0,   1,   0,   0,   0,   8,   0,   0,  0,   32,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   0,   0,  0,   0,
>+    15,  0,   0,   0,   83,  86,  95,  84,  65,  82,  71,  69,  84,  0,   171, 171, 83, 72,  68,
>+    82,  0,   1,   0,   0,   64,  0,   0,   0,   64,  0,   0,   0,   88,  24,  0,   4,  0,   112,
>+    16,  0,   0,   0,   0,   0,   68,  68,  0,   0,   98,  16,  0,   3,   50,  16,  16, 0,   1,
>+    0,   0,   0,   101, 0,   0,   3,   242, 32,  16,  0,   0,   0,   0,   0,   104, 0,  0,   2,
>+    1,   0,   0,   0,   61,  16,  0,   7,   242, 0,   16,  0,   0,   0,   0,   0,   1,  64,  0,
>+    0,   0,   0,   0,   0,   70,  126, 16,  0,   0,   0,   0,   0,   86,  0,   0,   5,  50,  0,
>+    16,  0,   0,   0,   0,   0,   70,  0,   16,  0,   0,   0,   0,   0,   56,  0,   0,  7,   50,
>+    0,   16,  0,   0,   0,   0,   0,   70,  0,   16,  0,   0,   0,   0,   0,   70,  16, 16,  0,
>+    1,   0,   0,   0,   27,  0,   0,   5,   50,  0,   16,  0,   0,   0,   0,   0,   70, 0,   16,
>+    0,   0,   0,   0,   0,   54,  0,   0,   8,   194, 0,   16,  0,   0,   0,   0,   0,  2,   64,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,  0,   45,
>+    0,   0,   7,   242, 0,   16,  0,   0,   0,   0,   0,   70,  14,  16,  0,   0,   0,  0,   0,
>+    70,  126, 16,  0,   0,   0,   0,   0,   54,  0,   0,   5,   114, 32,  16,  0,   0,  0,   0,
>+    0,   70,  2,   16,  0,   0,   0,   0,   0,   54,  0,   0,   5,   130, 32,  16,  0,  0,   0,
>+    0,   0,   1,   64,  0,   0,   0,   0,   0,   0,   62,  0,   0,   1,   83,  84,  65, 84,  116,
>+    0,   0,   0,   9,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   2,   0,  0,   0,
>+    1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   0,  0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,  0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,  0,   0,
>+    0,   0,   0,   3,   0,   0,   0,   0,   0,   0,   0,   2,   0,   0,   0,   0,   0,  0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,  0,   0,
>+    0,   0,   0,   0,   0};
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgb3d11ps.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgb3d11ps.h
>index 528f27361dd..21b64b0e81c 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgb3d11ps.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgb3d11ps.h
>@@ -1,6 +1,10 @@
> #if 0
> //
>-// Generated by Microsoft (R) HLSL Shader Compiler 6.3.9600.16384
>+// Generated by Microsoft (R) HLSL Shader Compiler 9.29.952.3111
>+//
>+//
>+//   fxc /nologo /E PS_PassthroughRGB3D /T ps_4_0 /Fh
>+//    compiled\passthroughrgb3d11ps.h Passthrough3D11.hlsl
> //
> //
> // Resource Bindings:
>@@ -14,18 +18,18 @@
> //
> // Input signature:
> //
>-// Name                 Index   Mask Register SysValue  Format   Used
>-// -------------------- ----- ------ -------- -------- ------- ------
>-// SV_POSITION              0   xyzw        0      POS   float       
>-// SV_RENDERTARGETARRAYINDEX     0   x           1  RTINDEX    uint       
>-// TEXCOORD                 0   xyz         2     NONE   float   xyz 
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_POSITION              0   xyzw        0      POS  float       
>+// SV_RENDERTARGETARRAYINDEX     0   x           1  RTINDEX   uint       
>+// TEXCOORD                 0   xyz         2     NONE  float   xyz 
> //
> //
> // Output signature:
> //
>-// Name                 Index   Mask Register SysValue  Format   Used
>-// -------------------- ----- ------ -------- -------- ------- ------
>-// SV_TARGET                0   xyzw        0   TARGET   float   xyzw
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_TARGET                0   xyzw        0   TARGET  float   xyzw
> //
> ps_4_0
> dcl_sampler s0, mode_default
>@@ -40,121 +44,41 @@ ret
> // Approximately 4 instruction slots used
> #endif
> 
>-const BYTE g_PS_PassthroughRGB3D[] =
>-{
>-     68,  88,  66,  67,   3, 213, 
>-    227, 200, 132, 255,   7,  95, 
>-      0, 252,  77,  33, 254, 184, 
>-     83, 110,   1,   0,   0,   0, 
>-    176,   2,   0,   0,   5,   0, 
>-      0,   0,  52,   0,   0,   0, 
>-    220,   0,   0,   0, 100,   1, 
>-      0,   0, 152,   1,   0,   0, 
>-     52,   2,   0,   0,  82,  68, 
>-     69,  70, 160,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   2,   0,   0,   0, 
>-     28,   0,   0,   0,   0,   4, 
>-    255, 255,   0,   1,   0,   0, 
>-    109,   0,   0,   0,  92,   0, 
>-      0,   0,   3,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   1,   0, 
>-      0,   0,   1,   0,   0,   0, 
>-    100,   0,   0,   0,   2,   0, 
>-      0,   0,   5,   0,   0,   0, 
>-      8,   0,   0,   0, 255, 255, 
>-    255, 255,   0,   0,   0,   0, 
>-      1,   0,   0,   0,  13,   0, 
>-      0,   0,  83,  97, 109, 112, 
>-    108, 101, 114,   0,  84, 101, 
>-    120, 116, 117, 114, 101,  70, 
>-      0,  77, 105,  99, 114, 111, 
>-    115, 111, 102, 116,  32,  40, 
>-     82,  41,  32,  72,  76,  83, 
>-     76,  32,  83, 104,  97, 100, 
>-    101, 114,  32,  67, 111, 109, 
>-    112, 105, 108, 101, 114,  32, 
>-     54,  46,  51,  46,  57,  54, 
>-     48,  48,  46,  49,  54,  51, 
>-     56,  52,   0, 171,  73,  83, 
>-     71,  78, 128,   0,   0,   0, 
>-      3,   0,   0,   0,   8,   0, 
>-      0,   0,  80,   0,   0,   0, 
>-      0,   0,   0,   0,   1,   0, 
>-      0,   0,   3,   0,   0,   0, 
>-      0,   0,   0,   0,  15,   0, 
>-      0,   0,  92,   0,   0,   0, 
>-      0,   0,   0,   0,   4,   0, 
>-      0,   0,   1,   0,   0,   0, 
>-      1,   0,   0,   0,   1,   0, 
>-      0,   0, 118,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   3,   0,   0,   0, 
>-      2,   0,   0,   0,   7,   7, 
>-      0,   0,  83,  86,  95,  80, 
>-     79,  83,  73,  84,  73,  79, 
>-     78,   0,  83,  86,  95,  82, 
>-     69,  78,  68,  69,  82,  84, 
>-     65,  82,  71,  69,  84,  65, 
>-     82,  82,  65,  89,  73,  78, 
>-     68,  69,  88,   0,  84,  69, 
>-     88,  67,  79,  79,  82,  68, 
>-      0, 171,  79,  83,  71,  78, 
>-     44,   0,   0,   0,   1,   0, 
>-      0,   0,   8,   0,   0,   0, 
>-     32,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      3,   0,   0,   0,   0,   0, 
>-      0,   0,  15,   0,   0,   0, 
>-     83,  86,  95,  84,  65,  82, 
>-     71,  69,  84,   0, 171, 171, 
>-     83,  72,  68,  82, 148,   0, 
>-      0,   0,  64,   0,   0,   0, 
>-     37,   0,   0,   0,  90,   0, 
>-      0,   3,   0,  96,  16,   0, 
>-      0,   0,   0,   0,  88,  40, 
>-      0,   4,   0, 112,  16,   0, 
>-      0,   0,   0,   0,  85,  85, 
>-      0,   0,  98,  16,   0,   3, 
>-    114,  16,  16,   0,   2,   0, 
>-      0,   0, 101,   0,   0,   3, 
>-    242,  32,  16,   0,   0,   0, 
>-      0,   0, 104,   0,   0,   2, 
>-      1,   0,   0,   0,  69,   0, 
>-      0,   9, 242,   0,  16,   0, 
>-      0,   0,   0,   0,  70,  18, 
>-     16,   0,   2,   0,   0,   0, 
>-     70, 126,  16,   0,   0,   0, 
>-      0,   0,   0,  96,  16,   0, 
>-      0,   0,   0,   0,  54,   0, 
>-      0,   5, 114,  32,  16,   0, 
>-      0,   0,   0,   0,  70,   2, 
>-     16,   0,   0,   0,   0,   0, 
>-     54,   0,   0,   5, 130,  32, 
>-     16,   0,   0,   0,   0,   0, 
>-      1,  64,   0,   0,   0,   0, 
>-    128,  63,  62,   0,   0,   1, 
>-     83,  84,  65,  84, 116,   0, 
>-      0,   0,   4,   0,   0,   0, 
>-      1,   0,   0,   0,   0,   0, 
>-      0,   0,   2,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      1,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   1,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      2,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0
>-};
>+const BYTE g_PS_PassthroughRGB3D[] = {
>+    68,  88,  66,  67,  64,  144, 204, 156, 117, 84,  185, 228, 65,  179, 80,  244, 146, 54,  206,
>+    119, 1,   0,   0,   0,   176, 2,   0,   0,   5,   0,   0,   0,   52,  0,   0,   0,   220, 0,
>+    0,   0,   100, 1,   0,   0,   152, 1,   0,   0,   52,  2,   0,   0,   82,  68,  69,  70,  160,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   2,   0,   0,   0,   28,  0,   0,   0,
>+    0,   4,   255, 255, 0,   1,   0,   0,   109, 0,   0,   0,   92,  0,   0,   0,   3,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,
>+    0,   0,   1,   0,   0,   0,   100, 0,   0,   0,   2,   0,   0,   0,   5,   0,   0,   0,   8,
>+    0,   0,   0,   255, 255, 255, 255, 0,   0,   0,   0,   1,   0,   0,   0,   13,  0,   0,   0,
>+    83,  97,  109, 112, 108, 101, 114, 0,   84,  101, 120, 116, 117, 114, 101, 70,  0,   77,  105,
>+    99,  114, 111, 115, 111, 102, 116, 32,  40,  82,  41,  32,  72,  76,  83,  76,  32,  83,  104,
>+    97,  100, 101, 114, 32,  67,  111, 109, 112, 105, 108, 101, 114, 32,  57,  46,  50,  57,  46,
>+    57,  53,  50,  46,  51,  49,  49,  49,  0,   171, 171, 73,  83,  71,  78,  128, 0,   0,   0,
>+    3,   0,   0,   0,   8,   0,   0,   0,   80,  0,   0,   0,   0,   0,   0,   0,   1,   0,   0,
>+    0,   3,   0,   0,   0,   0,   0,   0,   0,   15,  0,   0,   0,   92,  0,   0,   0,   0,   0,
>+    0,   0,   4,   0,   0,   0,   1,   0,   0,   0,   1,   0,   0,   0,   1,   0,   0,   0,   118,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   3,   0,   0,   0,   2,   0,   0,   0,
>+    7,   7,   0,   0,   83,  86,  95,  80,  79,  83,  73,  84,  73,  79,  78,  0,   83,  86,  95,
>+    82,  69,  78,  68,  69,  82,  84,  65,  82,  71,  69,  84,  65,  82,  82,  65,  89,  73,  78,
>+    68,  69,  88,  0,   84,  69,  88,  67,  79,  79,  82,  68,  0,   171, 79,  83,  71,  78,  44,
>+    0,   0,   0,   1,   0,   0,   0,   8,   0,   0,   0,   32,  0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   3,   0,   0,   0,   0,   0,   0,   0,   15,  0,   0,   0,   83,  86,  95,
>+    84,  65,  82,  71,  69,  84,  0,   171, 171, 83,  72,  68,  82,  148, 0,   0,   0,   64,  0,
>+    0,   0,   37,  0,   0,   0,   90,  0,   0,   3,   0,   96,  16,  0,   0,   0,   0,   0,   88,
>+    40,  0,   4,   0,   112, 16,  0,   0,   0,   0,   0,   85,  85,  0,   0,   98,  16,  0,   3,
>+    114, 16,  16,  0,   2,   0,   0,   0,   101, 0,   0,   3,   242, 32,  16,  0,   0,   0,   0,
>+    0,   104, 0,   0,   2,   1,   0,   0,   0,   69,  0,   0,   9,   242, 0,   16,  0,   0,   0,
>+    0,   0,   70,  18,  16,  0,   2,   0,   0,   0,   70,  126, 16,  0,   0,   0,   0,   0,   0,
>+    96,  16,  0,   0,   0,   0,   0,   54,  0,   0,   5,   114, 32,  16,  0,   0,   0,   0,   0,
>+    70,  2,   16,  0,   0,   0,   0,   0,   54,  0,   0,   5,   130, 32,  16,  0,   0,   0,   0,
>+    0,   1,   64,  0,   0,   0,   0,   128, 63,  62,  0,   0,   1,   83,  84,  65,  84,  116, 0,
>+    0,   0,   4,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   2,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   2,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0};
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgb3d_565_11ps.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgb3d_565_11ps.h
>new file mode 100644
>index 00000000000..29f83d91bc1
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgb3d_565_11ps.h
>@@ -0,0 +1,90 @@
>+#if 0
>+//
>+// Generated by Microsoft (R) HLSL Shader Compiler 9.29.952.3111
>+//
>+//
>+//   fxc /nologo /E PS_PassthroughRGB3D_565 /T ps_4_0 /Fh
>+//    compiled\passthroughrgb3d_565_11ps.h Passthrough3D11.hlsl
>+//
>+//
>+// Resource Bindings:
>+//
>+// Name                                 Type  Format         Dim Slot Elements
>+// ------------------------------ ---------- ------- ----------- ---- --------
>+// Sampler                           sampler      NA          NA    0        1
>+// TextureF                          texture  float4          3d    0        1
>+//
>+//
>+//
>+// Input signature:
>+//
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_POSITION              0   xyzw        0      POS  float       
>+// SV_RENDERTARGETARRAYINDEX     0   x           1  RTINDEX   uint       
>+// TEXCOORD                 0   xyz         2     NONE  float   xyz 
>+//
>+//
>+// Output signature:
>+//
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_TARGET                0   xyzw        0   TARGET  float   xyzw
>+//
>+ps_4_0
>+dcl_sampler s0, mode_default
>+dcl_resource_texture3d (float,float,float,float) t0
>+dcl_input_ps linear v2.xyz
>+dcl_output o0.xyzw
>+dcl_temps 1
>+sample r0.xyzw, v2.xyzx, t0.xyzw, s0
>+mul r0.xyz, r0.xyzx, l(31.000000, 63.000000, 31.000000, 0.000000)
>+round_ne r0.xyz, r0.xyzx
>+mul o0.xyz, r0.xyzx, l(0.032258, 0.015873, 0.032258, 0.000000)
>+mov o0.w, l(1.000000)
>+ret 
>+// Approximately 6 instruction slots used
>+#endif
>+
>+const BYTE g_PS_PassthroughRGB3D_565[] = {
>+    68,  88,  66,  67,  64,  214, 210, 233, 132, 86,  85,  54,  162, 63,  180, 191, 68,  70,  147,
>+    32,  1,   0,   0,   0,   0,   3,   0,   0,   5,   0,   0,   0,   52,  0,   0,   0,   220, 0,
>+    0,   0,   100, 1,   0,   0,   152, 1,   0,   0,   132, 2,   0,   0,   82,  68,  69,  70,  160,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   2,   0,   0,   0,   28,  0,   0,   0,
>+    0,   4,   255, 255, 0,   1,   0,   0,   109, 0,   0,   0,   92,  0,   0,   0,   3,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,
>+    0,   0,   1,   0,   0,   0,   100, 0,   0,   0,   2,   0,   0,   0,   5,   0,   0,   0,   8,
>+    0,   0,   0,   255, 255, 255, 255, 0,   0,   0,   0,   1,   0,   0,   0,   13,  0,   0,   0,
>+    83,  97,  109, 112, 108, 101, 114, 0,   84,  101, 120, 116, 117, 114, 101, 70,  0,   77,  105,
>+    99,  114, 111, 115, 111, 102, 116, 32,  40,  82,  41,  32,  72,  76,  83,  76,  32,  83,  104,
>+    97,  100, 101, 114, 32,  67,  111, 109, 112, 105, 108, 101, 114, 32,  57,  46,  50,  57,  46,
>+    57,  53,  50,  46,  51,  49,  49,  49,  0,   171, 171, 73,  83,  71,  78,  128, 0,   0,   0,
>+    3,   0,   0,   0,   8,   0,   0,   0,   80,  0,   0,   0,   0,   0,   0,   0,   1,   0,   0,
>+    0,   3,   0,   0,   0,   0,   0,   0,   0,   15,  0,   0,   0,   92,  0,   0,   0,   0,   0,
>+    0,   0,   4,   0,   0,   0,   1,   0,   0,   0,   1,   0,   0,   0,   1,   0,   0,   0,   118,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   3,   0,   0,   0,   2,   0,   0,   0,
>+    7,   7,   0,   0,   83,  86,  95,  80,  79,  83,  73,  84,  73,  79,  78,  0,   83,  86,  95,
>+    82,  69,  78,  68,  69,  82,  84,  65,  82,  71,  69,  84,  65,  82,  82,  65,  89,  73,  78,
>+    68,  69,  88,  0,   84,  69,  88,  67,  79,  79,  82,  68,  0,   171, 79,  83,  71,  78,  44,
>+    0,   0,   0,   1,   0,   0,   0,   8,   0,   0,   0,   32,  0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   3,   0,   0,   0,   0,   0,   0,   0,   15,  0,   0,   0,   83,  86,  95,
>+    84,  65,  82,  71,  69,  84,  0,   171, 171, 83,  72,  68,  82,  228, 0,   0,   0,   64,  0,
>+    0,   0,   57,  0,   0,   0,   90,  0,   0,   3,   0,   96,  16,  0,   0,   0,   0,   0,   88,
>+    40,  0,   4,   0,   112, 16,  0,   0,   0,   0,   0,   85,  85,  0,   0,   98,  16,  0,   3,
>+    114, 16,  16,  0,   2,   0,   0,   0,   101, 0,   0,   3,   242, 32,  16,  0,   0,   0,   0,
>+    0,   104, 0,   0,   2,   1,   0,   0,   0,   69,  0,   0,   9,   242, 0,   16,  0,   0,   0,
>+    0,   0,   70,  18,  16,  0,   2,   0,   0,   0,   70,  126, 16,  0,   0,   0,   0,   0,   0,
>+    96,  16,  0,   0,   0,   0,   0,   56,  0,   0,   10,  114, 0,   16,  0,   0,   0,   0,   0,
>+    70,  2,   16,  0,   0,   0,   0,   0,   2,   64,  0,   0,   0,   0,   248, 65,  0,   0,   124,
>+    66,  0,   0,   248, 65,  0,   0,   0,   0,   64,  0,   0,   5,   114, 0,   16,  0,   0,   0,
>+    0,   0,   70,  2,   16,  0,   0,   0,   0,   0,   56,  0,   0,   10,  114, 32,  16,  0,   0,
>+    0,   0,   0,   70,  2,   16,  0,   0,   0,   0,   0,   2,   64,  0,   0,   8,   33,  4,   61,
>+    33,  8,   130, 60,  8,   33,  4,   61,  0,   0,   0,   0,   54,  0,   0,   5,   130, 32,  16,
>+    0,   0,   0,   0,   0,   1,   64,  0,   0,   0,   0,   128, 63,  62,  0,   0,   1,   83,  84,
>+    65,  84,  116, 0,   0,   0,   6,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   2,
>+    0,   0,   0,   3,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0};
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgb3di11ps.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgb3di11ps.h
>index fa2a63959c7..f9730b87633 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgb3di11ps.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgb3di11ps.h
>@@ -1,6 +1,10 @@
> #if 0
> //
>-// Generated by Microsoft (R) HLSL Shader Compiler 6.3.9600.16384
>+// Generated by Microsoft (R) HLSL Shader Compiler 9.29.952.3111
>+//
>+//
>+//   fxc /nologo /E PS_PassthroughRGB3DI /T ps_4_0 /Fh
>+//    compiled\passthroughrgb3di11ps.h Passthrough3D11.hlsl
> //
> //
> // Resource Bindings:
>@@ -13,18 +17,18 @@
> //
> // Input signature:
> //
>-// Name                 Index   Mask Register SysValue  Format   Used
>-// -------------------- ----- ------ -------- -------- ------- ------
>-// SV_POSITION              0   xyzw        0      POS   float       
>-// SV_RENDERTARGETARRAYINDEX     0   x           1  RTINDEX    uint       
>-// TEXCOORD                 0   xyz         2     NONE   float   xyz 
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_POSITION              0   xyzw        0      POS  float       
>+// SV_RENDERTARGETARRAYINDEX     0   x           1  RTINDEX   uint       
>+// TEXCOORD                 0   xyz         2     NONE  float   xyz 
> //
> //
> // Output signature:
> //
>-// Name                 Index   Mask Register SysValue  Format   Used
>-// -------------------- ----- ------ -------- -------- ------- ------
>-// SV_TARGET                0   xyzw        0   TARGET     int   xyzw
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_TARGET                0   xyzw        0   TARGET    int   xyzw
> //
> ps_4_0
> dcl_resource_texture3d (sint,sint,sint,sint) t0
>@@ -43,130 +47,44 @@ ret
> // Approximately 9 instruction slots used
> #endif
> 
>-const BYTE g_PS_PassthroughRGB3DI[] =
>-{
>-     68,  88,  66,  67, 194, 157, 
>-      8, 194, 167, 235,  14, 127, 
>-     69, 198,  32,  35, 167,  35, 
>-    213, 248,   1,   0,   0,   0, 
>-    232,   2,   0,   0,   5,   0, 
>-      0,   0,  52,   0,   0,   0, 
>-    180,   0,   0,   0,  60,   1, 
>-      0,   0, 112,   1,   0,   0, 
>-    108,   2,   0,   0,  82,  68, 
>-     69,  70, 120,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   1,   0,   0,   0, 
>-     28,   0,   0,   0,   0,   4, 
>-    255, 255,   0,   1,   0,   0, 
>-     69,   0,   0,   0,  60,   0, 
>-      0,   0,   2,   0,   0,   0, 
>-      3,   0,   0,   0,   8,   0, 
>-      0,   0, 255, 255, 255, 255, 
>-      0,   0,   0,   0,   1,   0, 
>-      0,   0,  13,   0,   0,   0, 
>-     84, 101, 120, 116, 117, 114, 
>-    101,  73,   0,  77, 105,  99, 
>-    114, 111, 115, 111, 102, 116, 
>-     32,  40,  82,  41,  32,  72, 
>-     76,  83,  76,  32,  83, 104, 
>-     97, 100, 101, 114,  32,  67, 
>-    111, 109, 112, 105, 108, 101, 
>-    114,  32,  54,  46,  51,  46, 
>-     57,  54,  48,  48,  46,  49, 
>-     54,  51,  56,  52,   0, 171, 
>-     73,  83,  71,  78, 128,   0, 
>-      0,   0,   3,   0,   0,   0, 
>-      8,   0,   0,   0,  80,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      1,   0,   0,   0,   3,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-     15,   0,   0,   0,  92,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      4,   0,   0,   0,   1,   0, 
>-      0,   0,   1,   0,   0,   0, 
>-      1,   0,   0,   0, 118,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   3,   0, 
>-      0,   0,   2,   0,   0,   0, 
>-      7,   7,   0,   0,  83,  86, 
>-     95,  80,  79,  83,  73,  84, 
>-     73,  79,  78,   0,  83,  86, 
>-     95,  82,  69,  78,  68,  69, 
>-     82,  84,  65,  82,  71,  69, 
>-     84,  65,  82,  82,  65,  89, 
>-     73,  78,  68,  69,  88,   0, 
>-     84,  69,  88,  67,  79,  79, 
>-     82,  68,   0, 171,  79,  83, 
>-     71,  78,  44,   0,   0,   0, 
>-      1,   0,   0,   0,   8,   0, 
>-      0,   0,  32,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   2,   0,   0,   0, 
>-      0,   0,   0,   0,  15,   0, 
>-      0,   0,  83,  86,  95,  84, 
>-     65,  82,  71,  69,  84,   0, 
>-    171, 171,  83,  72,  68,  82, 
>-    244,   0,   0,   0,  64,   0, 
>-      0,   0,  61,   0,   0,   0, 
>-     88,  40,   0,   4,   0, 112, 
>-     16,   0,   0,   0,   0,   0, 
>-     51,  51,   0,   0,  98,  16, 
>-      0,   3, 114,  16,  16,   0, 
>-      2,   0,   0,   0, 101,   0, 
>-      0,   3, 242,  32,  16,   0, 
>-      0,   0,   0,   0, 104,   0, 
>-      0,   2,   1,   0,   0,   0, 
>-     61,  16,   0,   7, 242,   0, 
>-     16,   0,   0,   0,   0,   0, 
>-      1,  64,   0,   0,   0,   0, 
>-      0,   0,  70, 126,  16,   0, 
>-      0,   0,   0,   0,  86,   0, 
>-      0,   5, 114,   0,  16,   0, 
>-      0,   0,   0,   0,  70,   2, 
>-     16,   0,   0,   0,   0,   0, 
>-     56,   0,   0,   7, 114,   0, 
>-     16,   0,   0,   0,   0,   0, 
>-     70,   2,  16,   0,   0,   0, 
>-      0,   0,  70,  18,  16,   0, 
>-      2,   0,   0,   0,  27,   0, 
>-      0,   5, 114,   0,  16,   0, 
>-      0,   0,   0,   0,  70,   2, 
>-     16,   0,   0,   0,   0,   0, 
>-     54,   0,   0,   5, 130,   0, 
>-     16,   0,   0,   0,   0,   0, 
>-      1,  64,   0,   0,   0,   0, 
>-      0,   0,  45,   0,   0,   7, 
>-    242,   0,  16,   0,   0,   0, 
>-      0,   0,  70,  14,  16,   0, 
>-      0,   0,   0,   0,  70, 126, 
>-     16,   0,   0,   0,   0,   0, 
>-     54,   0,   0,   5, 114,  32, 
>-     16,   0,   0,   0,   0,   0, 
>-     70,   2,  16,   0,   0,   0, 
>-      0,   0,  54,   0,   0,   5, 
>-    130,  32,  16,   0,   0,   0, 
>-      0,   0,   1,  64,   0,   0, 
>-      0,   0,   0,   0,  62,   0, 
>-      0,   1,  83,  84,  65,  84, 
>-    116,   0,   0,   0,   9,   0, 
>-      0,   0,   1,   0,   0,   0, 
>-      0,   0,   0,   0,   2,   0, 
>-      0,   0,   1,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   1,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   1,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   3,   0,   0,   0, 
>-      0,   0,   0,   0,   2,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0
>-};
>+const BYTE g_PS_PassthroughRGB3DI[] = {
>+    68,  88,  66,  67,  154, 56,  82,  215, 167, 57,  211, 57,  235, 39,  42, 82, 164, 188, 103,
>+    126, 1,   0,   0,   0,   232, 2,   0,   0,   5,   0,   0,   0,   52,  0,  0,  0,   180, 0,
>+    0,   0,   60,  1,   0,   0,   112, 1,   0,   0,   108, 2,   0,   0,   82, 68, 69,  70,  120,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,  28, 0,   0,   0,
>+    0,   4,   255, 255, 0,   1,   0,   0,   69,  0,   0,   0,   60,  0,   0,  0,  2,   0,   0,
>+    0,   3,   0,   0,   0,   8,   0,   0,   0,   255, 255, 255, 255, 0,   0,  0,  0,   1,   0,
>+    0,   0,   13,  0,   0,   0,   84,  101, 120, 116, 117, 114, 101, 73,  0,  77, 105, 99,  114,
>+    111, 115, 111, 102, 116, 32,  40,  82,  41,  32,  72,  76,  83,  76,  32, 83, 104, 97,  100,
>+    101, 114, 32,  67,  111, 109, 112, 105, 108, 101, 114, 32,  57,  46,  50, 57, 46,  57,  53,
>+    50,  46,  51,  49,  49,  49,  0,   171, 171, 73,  83,  71,  78,  128, 0,  0,  0,   3,   0,
>+    0,   0,   8,   0,   0,   0,   80,  0,   0,   0,   0,   0,   0,   0,   1,  0,  0,   0,   3,
>+    0,   0,   0,   0,   0,   0,   0,   15,  0,   0,   0,   92,  0,   0,   0,  0,  0,   0,   0,
>+    4,   0,   0,   0,   1,   0,   0,   0,   1,   0,   0,   0,   1,   0,   0,  0,  118, 0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   3,   0,   0,   0,   2,   0,  0,  0,   7,   7,
>+    0,   0,   83,  86,  95,  80,  79,  83,  73,  84,  73,  79,  78,  0,   83, 86, 95,  82,  69,
>+    78,  68,  69,  82,  84,  65,  82,  71,  69,  84,  65,  82,  82,  65,  89, 73, 78,  68,  69,
>+    88,  0,   84,  69,  88,  67,  79,  79,  82,  68,  0,   171, 79,  83,  71, 78, 44,  0,   0,
>+    0,   1,   0,   0,   0,   8,   0,   0,   0,   32,  0,   0,   0,   0,   0,  0,  0,   0,   0,
>+    0,   0,   2,   0,   0,   0,   0,   0,   0,   0,   15,  0,   0,   0,   83, 86, 95,  84,  65,
>+    82,  71,  69,  84,  0,   171, 171, 83,  72,  68,  82,  244, 0,   0,   0,  64, 0,   0,   0,
>+    61,  0,   0,   0,   88,  40,  0,   4,   0,   112, 16,  0,   0,   0,   0,  0,  51,  51,  0,
>+    0,   98,  16,  0,   3,   114, 16,  16,  0,   2,   0,   0,   0,   101, 0,  0,  3,   242, 32,
>+    16,  0,   0,   0,   0,   0,   104, 0,   0,   2,   1,   0,   0,   0,   61, 16, 0,   7,   242,
>+    0,   16,  0,   0,   0,   0,   0,   1,   64,  0,   0,   0,   0,   0,   0,  70, 126, 16,  0,
>+    0,   0,   0,   0,   86,  0,   0,   5,   114, 0,   16,  0,   0,   0,   0,  0,  70,  2,   16,
>+    0,   0,   0,   0,   0,   56,  0,   0,   7,   114, 0,   16,  0,   0,   0,  0,  0,   70,  2,
>+    16,  0,   0,   0,   0,   0,   70,  18,  16,  0,   2,   0,   0,   0,   27, 0,  0,   5,   114,
>+    0,   16,  0,   0,   0,   0,   0,   70,  2,   16,  0,   0,   0,   0,   0,  54, 0,   0,   5,
>+    130, 0,   16,  0,   0,   0,   0,   0,   1,   64,  0,   0,   0,   0,   0,  0,  45,  0,   0,
>+    7,   242, 0,   16,  0,   0,   0,   0,   0,   70,  14,  16,  0,   0,   0,  0,  0,   70,  126,
>+    16,  0,   0,   0,   0,   0,   54,  0,   0,   5,   114, 32,  16,  0,   0,  0,  0,   0,   70,
>+    2,   16,  0,   0,   0,   0,   0,   54,  0,   0,   5,   130, 32,  16,  0,  0,  0,   0,   0,
>+    1,   64,  0,   0,   0,   0,   0,   0,   62,  0,   0,   1,   83,  84,  65, 84, 116, 0,   0,
>+    0,   9,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   2,   0,  0,  0,   1,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   0,  0,  0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,  0,  0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,  0,  0,   0,   0,
>+    0,   3,   0,   0,   0,   0,   0,   0,   0,   2,   0,   0,   0,   0,   0,  0,  0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,  0,  0,   0,   0,
>+    0,   0,   0};
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgb3dui11ps.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgb3dui11ps.h
>index e90b40d0031..afd9a438265 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgb3dui11ps.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgb3dui11ps.h
>@@ -1,6 +1,10 @@
> #if 0
> //
>-// Generated by Microsoft (R) HLSL Shader Compiler 6.3.9600.16384
>+// Generated by Microsoft (R) HLSL Shader Compiler 9.29.952.3111
>+//
>+//
>+//   fxc /nologo /E PS_PassthroughRGB3DUI /T ps_4_0 /Fh
>+//    compiled\passthroughrgb3dui11ps.h Passthrough3D11.hlsl
> //
> //
> // Resource Bindings:
>@@ -13,18 +17,18 @@
> //
> // Input signature:
> //
>-// Name                 Index   Mask Register SysValue  Format   Used
>-// -------------------- ----- ------ -------- -------- ------- ------
>-// SV_POSITION              0   xyzw        0      POS   float       
>-// SV_RENDERTARGETARRAYINDEX     0   x           1  RTINDEX    uint       
>-// TEXCOORD                 0   xyz         2     NONE   float   xyz 
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_POSITION              0   xyzw        0      POS  float       
>+// SV_RENDERTARGETARRAYINDEX     0   x           1  RTINDEX   uint       
>+// TEXCOORD                 0   xyz         2     NONE  float   xyz 
> //
> //
> // Output signature:
> //
>-// Name                 Index   Mask Register SysValue  Format   Used
>-// -------------------- ----- ------ -------- -------- ------- ------
>-// SV_TARGET                0   xyzw        0   TARGET    uint   xyzw
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_TARGET                0   xyzw        0   TARGET   uint   xyzw
> //
> ps_4_0
> dcl_resource_texture3d (uint,uint,uint,uint) t0
>@@ -43,130 +47,44 @@ ret
> // Approximately 9 instruction slots used
> #endif
> 
>-const BYTE g_PS_PassthroughRGB3DUI[] =
>-{
>-     68,  88,  66,  67, 253, 147, 
>-      1, 158,  41,  31, 253, 138, 
>-     52, 213, 103,  41, 188, 192, 
>-     79, 199,   1,   0,   0,   0, 
>-    232,   2,   0,   0,   5,   0, 
>-      0,   0,  52,   0,   0,   0, 
>-    180,   0,   0,   0,  60,   1, 
>-      0,   0, 112,   1,   0,   0, 
>-    108,   2,   0,   0,  82,  68, 
>-     69,  70, 120,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   1,   0,   0,   0, 
>-     28,   0,   0,   0,   0,   4, 
>-    255, 255,   0,   1,   0,   0, 
>-     70,   0,   0,   0,  60,   0, 
>-      0,   0,   2,   0,   0,   0, 
>-      4,   0,   0,   0,   8,   0, 
>-      0,   0, 255, 255, 255, 255, 
>-      0,   0,   0,   0,   1,   0, 
>-      0,   0,  13,   0,   0,   0, 
>-     84, 101, 120, 116, 117, 114, 
>-    101,  85,  73,   0,  77, 105, 
>-     99, 114, 111, 115, 111, 102, 
>-    116,  32,  40,  82,  41,  32, 
>-     72,  76,  83,  76,  32,  83, 
>-    104,  97, 100, 101, 114,  32, 
>-     67, 111, 109, 112, 105, 108, 
>-    101, 114,  32,  54,  46,  51, 
>-     46,  57,  54,  48,  48,  46, 
>-     49,  54,  51,  56,  52,   0, 
>-     73,  83,  71,  78, 128,   0, 
>-      0,   0,   3,   0,   0,   0, 
>-      8,   0,   0,   0,  80,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      1,   0,   0,   0,   3,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-     15,   0,   0,   0,  92,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      4,   0,   0,   0,   1,   0, 
>-      0,   0,   1,   0,   0,   0, 
>-      1,   0,   0,   0, 118,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   3,   0, 
>-      0,   0,   2,   0,   0,   0, 
>-      7,   7,   0,   0,  83,  86, 
>-     95,  80,  79,  83,  73,  84, 
>-     73,  79,  78,   0,  83,  86, 
>-     95,  82,  69,  78,  68,  69, 
>-     82,  84,  65,  82,  71,  69, 
>-     84,  65,  82,  82,  65,  89, 
>-     73,  78,  68,  69,  88,   0, 
>-     84,  69,  88,  67,  79,  79, 
>-     82,  68,   0, 171,  79,  83, 
>-     71,  78,  44,   0,   0,   0, 
>-      1,   0,   0,   0,   8,   0, 
>-      0,   0,  32,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   1,   0,   0,   0, 
>-      0,   0,   0,   0,  15,   0, 
>-      0,   0,  83,  86,  95,  84, 
>-     65,  82,  71,  69,  84,   0, 
>-    171, 171,  83,  72,  68,  82, 
>-    244,   0,   0,   0,  64,   0, 
>-      0,   0,  61,   0,   0,   0, 
>-     88,  40,   0,   4,   0, 112, 
>-     16,   0,   0,   0,   0,   0, 
>-     68,  68,   0,   0,  98,  16, 
>-      0,   3, 114,  16,  16,   0, 
>-      2,   0,   0,   0, 101,   0, 
>-      0,   3, 242,  32,  16,   0, 
>-      0,   0,   0,   0, 104,   0, 
>-      0,   2,   1,   0,   0,   0, 
>-     61,  16,   0,   7, 242,   0, 
>-     16,   0,   0,   0,   0,   0, 
>-      1,  64,   0,   0,   0,   0, 
>-      0,   0,  70, 126,  16,   0, 
>-      0,   0,   0,   0,  86,   0, 
>-      0,   5, 114,   0,  16,   0, 
>-      0,   0,   0,   0,  70,   2, 
>-     16,   0,   0,   0,   0,   0, 
>-     56,   0,   0,   7, 114,   0, 
>-     16,   0,   0,   0,   0,   0, 
>-     70,   2,  16,   0,   0,   0, 
>-      0,   0,  70,  18,  16,   0, 
>-      2,   0,   0,   0,  27,   0, 
>-      0,   5, 114,   0,  16,   0, 
>-      0,   0,   0,   0,  70,   2, 
>-     16,   0,   0,   0,   0,   0, 
>-     54,   0,   0,   5, 130,   0, 
>-     16,   0,   0,   0,   0,   0, 
>-      1,  64,   0,   0,   0,   0, 
>-      0,   0,  45,   0,   0,   7, 
>-    242,   0,  16,   0,   0,   0, 
>-      0,   0,  70,  14,  16,   0, 
>-      0,   0,   0,   0,  70, 126, 
>-     16,   0,   0,   0,   0,   0, 
>-     54,   0,   0,   5, 114,  32, 
>-     16,   0,   0,   0,   0,   0, 
>-     70,   2,  16,   0,   0,   0, 
>-      0,   0,  54,   0,   0,   5, 
>-    130,  32,  16,   0,   0,   0, 
>-      0,   0,   1,  64,   0,   0, 
>-      0,   0,   0,   0,  62,   0, 
>-      0,   1,  83,  84,  65,  84, 
>-    116,   0,   0,   0,   9,   0, 
>-      0,   0,   1,   0,   0,   0, 
>-      0,   0,   0,   0,   2,   0, 
>-      0,   0,   1,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   1,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   1,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   3,   0,   0,   0, 
>-      0,   0,   0,   0,   2,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0
>-};
>+const BYTE g_PS_PassthroughRGB3DUI[] = {
>+    68,  88,  66,  67,  206, 73,  153, 209, 111, 4,   107, 131, 207, 172, 41, 87, 186, 3,   238,
>+    41,  1,   0,   0,   0,   232, 2,   0,   0,   5,   0,   0,   0,   52,  0,  0,  0,   180, 0,
>+    0,   0,   60,  1,   0,   0,   112, 1,   0,   0,   108, 2,   0,   0,   82, 68, 69,  70,  120,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,  28, 0,   0,   0,
>+    0,   4,   255, 255, 0,   1,   0,   0,   70,  0,   0,   0,   60,  0,   0,  0,  2,   0,   0,
>+    0,   4,   0,   0,   0,   8,   0,   0,   0,   255, 255, 255, 255, 0,   0,  0,  0,   1,   0,
>+    0,   0,   13,  0,   0,   0,   84,  101, 120, 116, 117, 114, 101, 85,  73, 0,  77,  105, 99,
>+    114, 111, 115, 111, 102, 116, 32,  40,  82,  41,  32,  72,  76,  83,  76, 32, 83,  104, 97,
>+    100, 101, 114, 32,  67,  111, 109, 112, 105, 108, 101, 114, 32,  57,  46, 50, 57,  46,  57,
>+    53,  50,  46,  51,  49,  49,  49,  0,   171, 73,  83,  71,  78,  128, 0,  0,  0,   3,   0,
>+    0,   0,   8,   0,   0,   0,   80,  0,   0,   0,   0,   0,   0,   0,   1,  0,  0,   0,   3,
>+    0,   0,   0,   0,   0,   0,   0,   15,  0,   0,   0,   92,  0,   0,   0,  0,  0,   0,   0,
>+    4,   0,   0,   0,   1,   0,   0,   0,   1,   0,   0,   0,   1,   0,   0,  0,  118, 0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   3,   0,   0,   0,   2,   0,  0,  0,   7,   7,
>+    0,   0,   83,  86,  95,  80,  79,  83,  73,  84,  73,  79,  78,  0,   83, 86, 95,  82,  69,
>+    78,  68,  69,  82,  84,  65,  82,  71,  69,  84,  65,  82,  82,  65,  89, 73, 78,  68,  69,
>+    88,  0,   84,  69,  88,  67,  79,  79,  82,  68,  0,   171, 79,  83,  71, 78, 44,  0,   0,
>+    0,   1,   0,   0,   0,   8,   0,   0,   0,   32,  0,   0,   0,   0,   0,  0,  0,   0,   0,
>+    0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   15,  0,   0,   0,   83, 86, 95,  84,  65,
>+    82,  71,  69,  84,  0,   171, 171, 83,  72,  68,  82,  244, 0,   0,   0,  64, 0,   0,   0,
>+    61,  0,   0,   0,   88,  40,  0,   4,   0,   112, 16,  0,   0,   0,   0,  0,  68,  68,  0,
>+    0,   98,  16,  0,   3,   114, 16,  16,  0,   2,   0,   0,   0,   101, 0,  0,  3,   242, 32,
>+    16,  0,   0,   0,   0,   0,   104, 0,   0,   2,   1,   0,   0,   0,   61, 16, 0,   7,   242,
>+    0,   16,  0,   0,   0,   0,   0,   1,   64,  0,   0,   0,   0,   0,   0,  70, 126, 16,  0,
>+    0,   0,   0,   0,   86,  0,   0,   5,   114, 0,   16,  0,   0,   0,   0,  0,  70,  2,   16,
>+    0,   0,   0,   0,   0,   56,  0,   0,   7,   114, 0,   16,  0,   0,   0,  0,  0,   70,  2,
>+    16,  0,   0,   0,   0,   0,   70,  18,  16,  0,   2,   0,   0,   0,   27, 0,  0,   5,   114,
>+    0,   16,  0,   0,   0,   0,   0,   70,  2,   16,  0,   0,   0,   0,   0,  54, 0,   0,   5,
>+    130, 0,   16,  0,   0,   0,   0,   0,   1,   64,  0,   0,   0,   0,   0,  0,  45,  0,   0,
>+    7,   242, 0,   16,  0,   0,   0,   0,   0,   70,  14,  16,  0,   0,   0,  0,  0,   70,  126,
>+    16,  0,   0,   0,   0,   0,   54,  0,   0,   5,   114, 32,  16,  0,   0,  0,  0,   0,   70,
>+    2,   16,  0,   0,   0,   0,   0,   54,  0,   0,   5,   130, 32,  16,  0,  0,  0,   0,   0,
>+    1,   64,  0,   0,   0,   0,   0,   0,   62,  0,   0,   1,   83,  84,  65, 84, 116, 0,   0,
>+    0,   9,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   2,   0,  0,  0,   1,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   0,  0,  0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,  0,  0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,  0,  0,   0,   0,
>+    0,   3,   0,   0,   0,   0,   0,   0,   0,   2,   0,   0,   0,   0,   0,  0,  0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,  0,  0,   0,   0,
>+    0,   0,   0};
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgba2d11ps.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgba2d11ps.h
>index a4ee9d5ab44..98381a535de 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgba2d11ps.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgba2d11ps.h
>@@ -1,6 +1,10 @@
> #if 0
> //
>-// Generated by Microsoft (R) HLSL Shader Compiler 6.3.9600.16384
>+// Generated by Microsoft (R) HLSL Shader Compiler 9.29.952.3111
>+//
>+//
>+//   fxc /nologo /E PS_PassthroughRGBA2D /T ps_4_0_level_9_3 /Fh
>+//    compiled\passthroughrgba2d11ps.h Passthrough2D11.hlsl
> //
> //
> // Resource Bindings:
>@@ -14,17 +18,17 @@
> //
> // Input signature:
> //
>-// Name                 Index   Mask Register SysValue  Format   Used
>-// -------------------- ----- ------ -------- -------- ------- ------
>-// SV_POSITION              0   xyzw        0      POS   float       
>-// TEXCOORD                 0   xy          1     NONE   float   xy  
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_POSITION              0   xyzw        0      POS  float       
>+// TEXCOORD                 0   xy          1     NONE  float   xy  
> //
> //
> // Output signature:
> //
>-// Name                 Index   Mask Register SysValue  Format   Used
>-// -------------------- ----- ------ -------- -------- ------- ------
>-// SV_TARGET                0   xyzw        0   TARGET   float   xyzw
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_TARGET                0   xyzw        0   TARGET  float   xyzw
> //
> //
> // Sampler/Resource to DX9 shader sampler mappings:
>@@ -53,124 +57,42 @@ ret
> // Approximately 2 instruction slots used
> #endif
> 
>-const BYTE g_PS_PassthroughRGBA2D[] =
>-{
>-     68,  88,  66,  67, 240, 186, 
>-    163, 221, 151,  45, 139,  68, 
>-    172, 121,  30, 230, 203, 102, 
>-     92,  33,   1,   0,   0,   0, 
>-    192,   2,   0,   0,   6,   0, 
>-      0,   0,  56,   0,   0,   0, 
>-    164,   0,   0,   0,  16,   1, 
>-      0,   0, 140,   1,   0,   0, 
>-     52,   2,   0,   0, 140,   2, 
>-      0,   0,  65, 111, 110,  57, 
>-    100,   0,   0,   0, 100,   0, 
>-      0,   0,   0,   2, 255, 255, 
>-     60,   0,   0,   0,  40,   0, 
>-      0,   0,   0,   0,  40,   0, 
>-      0,   0,  40,   0,   0,   0, 
>-     40,   0,   1,   0,  36,   0, 
>-      0,   0,  40,   0,   0,   0, 
>-      0,   0,   1,   2, 255, 255, 
>-     31,   0,   0,   2,   0,   0, 
>-      0, 128,   0,   0,   3, 176, 
>-     31,   0,   0,   2,   0,   0, 
>-      0, 144,   0,   8,  15, 160, 
>-     66,   0,   0,   3,   0,   0, 
>-     15, 128,   0,   0, 228, 176, 
>-      0,   8, 228, 160,   1,   0, 
>-      0,   2,   0,   8,  15, 128, 
>-      0,   0, 228, 128, 255, 255, 
>-      0,   0,  83,  72,  68,  82, 
>-    100,   0,   0,   0,  64,   0, 
>-      0,   0,  25,   0,   0,   0, 
>-     90,   0,   0,   3,   0,  96, 
>-     16,   0,   0,   0,   0,   0, 
>-     88,  24,   0,   4,   0, 112, 
>-     16,   0,   0,   0,   0,   0, 
>-     85,  85,   0,   0,  98,  16, 
>-      0,   3,  50,  16,  16,   0, 
>-      1,   0,   0,   0, 101,   0, 
>-      0,   3, 242,  32,  16,   0, 
>-      0,   0,   0,   0,  69,   0, 
>-      0,   9, 242,  32,  16,   0, 
>-      0,   0,   0,   0,  70,  16, 
>-     16,   0,   1,   0,   0,   0, 
>-     70, 126,  16,   0,   0,   0, 
>-      0,   0,   0,  96,  16,   0, 
>-      0,   0,   0,   0,  62,   0, 
>-      0,   1,  83,  84,  65,  84, 
>-    116,   0,   0,   0,   2,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   2,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   1,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      1,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-     82,  68,  69,  70, 160,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   2,   0, 
>-      0,   0,  28,   0,   0,   0, 
>-      0,   4, 255, 255,   0,   1, 
>-      0,   0, 109,   0,   0,   0, 
>-     92,   0,   0,   0,   3,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      1,   0,   0,   0,   1,   0, 
>-      0,   0, 100,   0,   0,   0, 
>-      2,   0,   0,   0,   5,   0, 
>-      0,   0,   4,   0,   0,   0, 
>-    255, 255, 255, 255,   0,   0, 
>-      0,   0,   1,   0,   0,   0, 
>-     13,   0,   0,   0,  83,  97, 
>-    109, 112, 108, 101, 114,   0, 
>-     84, 101, 120, 116, 117, 114, 
>-    101,  70,   0,  77, 105,  99, 
>-    114, 111, 115, 111, 102, 116, 
>-     32,  40,  82,  41,  32,  72, 
>-     76,  83,  76,  32,  83, 104, 
>-     97, 100, 101, 114,  32,  67, 
>-    111, 109, 112, 105, 108, 101, 
>-    114,  32,  54,  46,  51,  46, 
>-     57,  54,  48,  48,  46,  49, 
>-     54,  51,  56,  52,   0, 171, 
>-     73,  83,  71,  78,  80,   0, 
>-      0,   0,   2,   0,   0,   0, 
>-      8,   0,   0,   0,  56,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      1,   0,   0,   0,   3,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-     15,   0,   0,   0,  68,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   3,   0, 
>-      0,   0,   1,   0,   0,   0, 
>-      3,   3,   0,   0,  83,  86, 
>-     95,  80,  79,  83,  73,  84, 
>-     73,  79,  78,   0,  84,  69, 
>-     88,  67,  79,  79,  82,  68, 
>-      0, 171, 171, 171,  79,  83, 
>-     71,  78,  44,   0,   0,   0, 
>-      1,   0,   0,   0,   8,   0, 
>-      0,   0,  32,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   3,   0,   0,   0, 
>-      0,   0,   0,   0,  15,   0, 
>-      0,   0,  83,  86,  95,  84, 
>-     65,  82,  71,  69,  84,   0, 
>-    171, 171
>-};
>+const BYTE g_PS_PassthroughRGBA2D[] = {
>+    68,  88,  66, 67,  184, 218, 64,  10,  229, 55,  228, 76,  217, 225, 255, 57,  166, 235, 140,
>+    175, 1,   0,  0,   0,   192, 2,   0,   0,   6,   0,   0,   0,   56,  0,   0,   0,   164, 0,
>+    0,   0,   16, 1,   0,   0,   140, 1,   0,   0,   52,  2,   0,   0,   140, 2,   0,   0,   65,
>+    111, 110, 57, 100, 0,   0,   0,   100, 0,   0,   0,   0,   2,   255, 255, 60,  0,   0,   0,
>+    40,  0,   0,  0,   0,   0,   40,  0,   0,   0,   40,  0,   0,   0,   40,  0,   1,   0,   36,
>+    0,   0,   0,  40,  0,   0,   0,   0,   0,   1,   2,   255, 255, 31,  0,   0,   2,   0,   0,
>+    0,   128, 0,  0,   3,   176, 31,  0,   0,   2,   0,   0,   0,   144, 0,   8,   15,  160, 66,
>+    0,   0,   3,  0,   0,   15,  128, 0,   0,   228, 176, 0,   8,   228, 160, 1,   0,   0,   2,
>+    0,   8,   15, 128, 0,   0,   228, 128, 255, 255, 0,   0,   83,  72,  68,  82,  100, 0,   0,
>+    0,   64,  0,  0,   0,   25,  0,   0,   0,   90,  0,   0,   3,   0,   96,  16,  0,   0,   0,
>+    0,   0,   88, 24,  0,   4,   0,   112, 16,  0,   0,   0,   0,   0,   85,  85,  0,   0,   98,
>+    16,  0,   3,  50,  16,  16,  0,   1,   0,   0,   0,   101, 0,   0,   3,   242, 32,  16,  0,
>+    0,   0,   0,  0,   69,  0,   0,   9,   242, 32,  16,  0,   0,   0,   0,   0,   70,  16,  16,
>+    0,   1,   0,  0,   0,   70,  126, 16,  0,   0,   0,   0,   0,   0,   96,  16,  0,   0,   0,
>+    0,   0,   62, 0,   0,   1,   83,  84,  65,  84,  116, 0,   0,   0,   2,   0,   0,   0,   0,
>+    0,   0,   0,  0,   0,   0,   0,   2,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,  0,   1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   0,   0,
>+    0,   0,   0,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   82,  68,  69,
>+    70,  160, 0,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   2,   0,   0,   0,   28,  0,
>+    0,   0,   0,  4,   255, 255, 0,   1,   0,   0,   109, 0,   0,   0,   92,  0,   0,   0,   3,
>+    0,   0,   0,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    1,   0,   0,  0,   1,   0,   0,   0,   100, 0,   0,   0,   2,   0,   0,   0,   5,   0,   0,
>+    0,   4,   0,  0,   0,   255, 255, 255, 255, 0,   0,   0,   0,   1,   0,   0,   0,   13,  0,
>+    0,   0,   83, 97,  109, 112, 108, 101, 114, 0,   84,  101, 120, 116, 117, 114, 101, 70,  0,
>+    77,  105, 99, 114, 111, 115, 111, 102, 116, 32,  40,  82,  41,  32,  72,  76,  83,  76,  32,
>+    83,  104, 97, 100, 101, 114, 32,  67,  111, 109, 112, 105, 108, 101, 114, 32,  57,  46,  50,
>+    57,  46,  57, 53,  50,  46,  51,  49,  49,  49,  0,   171, 171, 73,  83,  71,  78,  80,  0,
>+    0,   0,   2,  0,   0,   0,   8,   0,   0,   0,   56,  0,   0,   0,   0,   0,   0,   0,   1,
>+    0,   0,   0,  3,   0,   0,   0,   0,   0,   0,   0,   15,  0,   0,   0,   68,  0,   0,   0,
>+    0,   0,   0,  0,   0,   0,   0,   0,   3,   0,   0,   0,   1,   0,   0,   0,   3,   3,   0,
>+    0,   83,  86, 95,  80,  79,  83,  73,  84,  73,  79,  78,  0,   84,  69,  88,  67,  79,  79,
>+    82,  68,  0,  171, 171, 171, 79,  83,  71,  78,  44,  0,   0,   0,   1,   0,   0,   0,   8,
>+    0,   0,   0,  32,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   3,   0,   0,   0,
>+    0,   0,   0,  0,   15,  0,   0,   0,   83,  86,  95,  84,  65,  82,  71,  69,  84,  0,   171,
>+    171};
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgba2d_4444_11ps.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgba2d_4444_11ps.h
>new file mode 100644
>index 00000000000..e8f4114b45e
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgba2d_4444_11ps.h
>@@ -0,0 +1,117 @@
>+#if 0
>+//
>+// Generated by Microsoft (R) HLSL Shader Compiler 9.29.952.3111
>+//
>+//
>+//   fxc /nologo /E PS_PassthroughRGBA2D_4444 /T ps_4_0_level_9_3 /Fh
>+//    compiled\passthroughrgba2d_4444_11ps.h Passthrough2D11.hlsl
>+//
>+//
>+// Resource Bindings:
>+//
>+// Name                                 Type  Format         Dim Slot Elements
>+// ------------------------------ ---------- ------- ----------- ---- --------
>+// Sampler                           sampler      NA          NA    0        1
>+// TextureF                          texture  float4          2d    0        1
>+//
>+//
>+//
>+// Input signature:
>+//
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_POSITION              0   xyzw        0      POS  float       
>+// TEXCOORD                 0   xy          1     NONE  float   xy  
>+//
>+//
>+// Output signature:
>+//
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_TARGET                0   xyzw        0   TARGET  float   xyzw
>+//
>+//
>+// Sampler/Resource to DX9 shader sampler mappings:
>+//
>+// Target Sampler Source Sampler  Source Resource
>+// -------------- --------------- ----------------
>+// s0             s0              t0               
>+//
>+//
>+// Level9 shader bytecode:
>+//
>+    ps_2_x
>+    def c0, 15, 0.5, 0.0666666701, 0
>+    dcl t0.xy
>+    dcl_2d s0
>+    texld r0, t0, s0
>+    mad r0, r0, c0.x, c0.y
>+    frc r1, r0
>+    add r0, r0, -r1
>+    mul r0, r0, c0.z
>+    mov oC0, r0
>+
>+// approximately 6 instruction slots used (1 texture, 5 arithmetic)
>+ps_4_0
>+dcl_sampler s0, mode_default
>+dcl_resource_texture2d (float,float,float,float) t0
>+dcl_input_ps linear v1.xy
>+dcl_output o0.xyzw
>+dcl_temps 1
>+sample r0.xyzw, v1.xyxx, t0.xyzw, s0
>+mul r0.xyzw, r0.xyzw, l(15.000000, 15.000000, 15.000000, 15.000000)
>+round_ne r0.xyzw, r0.xyzw
>+mul o0.xyzw, r0.xyzw, l(0.066667, 0.066667, 0.066667, 0.066667)
>+ret 
>+// Approximately 5 instruction slots used
>+#endif
>+
>+const BYTE g_PS_PassthroughRGBA2D_4444[] = {
>+    68,  88,  66,  67,  181, 230, 28,  163, 183, 216, 19,  26,  254, 253, 53,  255, 203, 47,  5,
>+    169, 1,   0,   0,   0,   132, 3,   0,   0,   6,   0,   0,   0,   56,  0,   0,   0,   252, 0,
>+    0,   0,   212, 1,   0,   0,   80,  2,   0,   0,   248, 2,   0,   0,   80,  3,   0,   0,   65,
>+    111, 110, 57,  188, 0,   0,   0,   188, 0,   0,   0,   0,   2,   255, 255, 148, 0,   0,   0,
>+    40,  0,   0,   0,   0,   0,   40,  0,   0,   0,   40,  0,   0,   0,   40,  0,   1,   0,   36,
>+    0,   0,   0,   40,  0,   0,   0,   0,   0,   1,   2,   255, 255, 81,  0,   0,   5,   0,   0,
>+    15,  160, 0,   0,   112, 65,  0,   0,   0,   63,  137, 136, 136, 61,  0,   0,   0,   0,   31,
>+    0,   0,   2,   0,   0,   0,   128, 0,   0,   3,   176, 31,  0,   0,   2,   0,   0,   0,   144,
>+    0,   8,   15,  160, 66,  0,   0,   3,   0,   0,   15,  128, 0,   0,   228, 176, 0,   8,   228,
>+    160, 4,   0,   0,   4,   0,   0,   15,  128, 0,   0,   228, 128, 0,   0,   0,   160, 0,   0,
>+    85,  160, 19,  0,   0,   2,   1,   0,   15,  128, 0,   0,   228, 128, 2,   0,   0,   3,   0,
>+    0,   15,  128, 0,   0,   228, 128, 1,   0,   228, 129, 5,   0,   0,   3,   0,   0,   15,  128,
>+    0,   0,   228, 128, 0,   0,   170, 160, 1,   0,   0,   2,   0,   8,   15,  128, 0,   0,   228,
>+    128, 255, 255, 0,   0,   83,  72,  68,  82,  208, 0,   0,   0,   64,  0,   0,   0,   52,  0,
>+    0,   0,   90,  0,   0,   3,   0,   96,  16,  0,   0,   0,   0,   0,   88,  24,  0,   4,   0,
>+    112, 16,  0,   0,   0,   0,   0,   85,  85,  0,   0,   98,  16,  0,   3,   50,  16,  16,  0,
>+    1,   0,   0,   0,   101, 0,   0,   3,   242, 32,  16,  0,   0,   0,   0,   0,   104, 0,   0,
>+    2,   1,   0,   0,   0,   69,  0,   0,   9,   242, 0,   16,  0,   0,   0,   0,   0,   70,  16,
>+    16,  0,   1,   0,   0,   0,   70,  126, 16,  0,   0,   0,   0,   0,   0,   96,  16,  0,   0,
>+    0,   0,   0,   56,  0,   0,   10,  242, 0,   16,  0,   0,   0,   0,   0,   70,  14,  16,  0,
>+    0,   0,   0,   0,   2,   64,  0,   0,   0,   0,   112, 65,  0,   0,   112, 65,  0,   0,   112,
>+    65,  0,   0,   112, 65,  64,  0,   0,   5,   242, 0,   16,  0,   0,   0,   0,   0,   70,  14,
>+    16,  0,   0,   0,   0,   0,   56,  0,   0,   10,  242, 32,  16,  0,   0,   0,   0,   0,   70,
>+    14,  16,  0,   0,   0,   0,   0,   2,   64,  0,   0,   137, 136, 136, 61,  137, 136, 136, 61,
>+    137, 136, 136, 61,  137, 136, 136, 61,  62,  0,   0,   1,   83,  84,  65,  84,  116, 0,   0,
>+    0,   5,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   2,   0,   0,   0,   3,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   82,  68,  69,  70,  160, 0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    2,   0,   0,   0,   28,  0,   0,   0,   0,   4,   255, 255, 0,   1,   0,   0,   109, 0,   0,
>+    0,   92,  0,   0,   0,   3,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   1,   0,   0,   0,   100, 0,   0,   0,   2,
>+    0,   0,   0,   5,   0,   0,   0,   4,   0,   0,   0,   255, 255, 255, 255, 0,   0,   0,   0,
>+    1,   0,   0,   0,   13,  0,   0,   0,   83,  97,  109, 112, 108, 101, 114, 0,   84,  101, 120,
>+    116, 117, 114, 101, 70,  0,   77,  105, 99,  114, 111, 115, 111, 102, 116, 32,  40,  82,  41,
>+    32,  72,  76,  83,  76,  32,  83,  104, 97,  100, 101, 114, 32,  67,  111, 109, 112, 105, 108,
>+    101, 114, 32,  57,  46,  50,  57,  46,  57,  53,  50,  46,  51,  49,  49,  49,  0,   171, 171,
>+    73,  83,  71,  78,  80,  0,   0,   0,   2,   0,   0,   0,   8,   0,   0,   0,   56,  0,   0,
>+    0,   0,   0,   0,   0,   1,   0,   0,   0,   3,   0,   0,   0,   0,   0,   0,   0,   15,  0,
>+    0,   0,   68,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   3,   0,   0,   0,   1,
>+    0,   0,   0,   3,   3,   0,   0,   83,  86,  95,  80,  79,  83,  73,  84,  73,  79,  78,  0,
>+    84,  69,  88,  67,  79,  79,  82,  68,  0,   171, 171, 171, 79,  83,  71,  78,  44,  0,   0,
>+    0,   1,   0,   0,   0,   8,   0,   0,   0,   32,  0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   3,   0,   0,   0,   0,   0,   0,   0,   15,  0,   0,   0,   83,  86,  95,  84,  65,
>+    82,  71,  69,  84,  0,   171, 171};
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgba2d_5551_11ps.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgba2d_5551_11ps.h
>new file mode 100644
>index 00000000000..c0e6cfaa379
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgba2d_5551_11ps.h
>@@ -0,0 +1,117 @@
>+#if 0
>+//
>+// Generated by Microsoft (R) HLSL Shader Compiler 9.29.952.3111
>+//
>+//
>+//   fxc /nologo /E PS_PassthroughRGBA2D_5551 /T ps_4_0_level_9_3 /Fh
>+//    compiled\passthroughrgba2d_5551_11ps.h Passthrough2D11.hlsl
>+//
>+//
>+// Resource Bindings:
>+//
>+// Name                                 Type  Format         Dim Slot Elements
>+// ------------------------------ ---------- ------- ----------- ---- --------
>+// Sampler                           sampler      NA          NA    0        1
>+// TextureF                          texture  float4          2d    0        1
>+//
>+//
>+//
>+// Input signature:
>+//
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_POSITION              0   xyzw        0      POS  float       
>+// TEXCOORD                 0   xy          1     NONE  float   xy  
>+//
>+//
>+// Output signature:
>+//
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_TARGET                0   xyzw        0   TARGET  float   xyzw
>+//
>+//
>+// Sampler/Resource to DX9 shader sampler mappings:
>+//
>+// Target Sampler Source Sampler  Source Resource
>+// -------------- --------------- ----------------
>+// s0             s0              t0               
>+//
>+//
>+// Level9 shader bytecode:
>+//
>+    ps_2_x
>+    def c0, 31, 1, 0.5, 0.0322580636
>+    dcl t0.xy
>+    dcl_2d s0
>+    texld r0, t0, s0
>+    mad r0, r0, c0.xxxy, c0.z
>+    frc r1, r0
>+    add r0, r0, -r1
>+    mul r0, r0, c0.wwwy
>+    mov oC0, r0
>+
>+// approximately 6 instruction slots used (1 texture, 5 arithmetic)
>+ps_4_0
>+dcl_sampler s0, mode_default
>+dcl_resource_texture2d (float,float,float,float) t0
>+dcl_input_ps linear v1.xy
>+dcl_output o0.xyzw
>+dcl_temps 1
>+sample r0.xyzw, v1.xyxx, t0.xyzw, s0
>+mul r0.xyzw, r0.xyzw, l(31.000000, 31.000000, 31.000000, 1.000000)
>+round_ne r0.xyzw, r0.xyzw
>+mul o0.xyzw, r0.xyzw, l(0.032258, 0.032258, 0.032258, 1.000000)
>+ret 
>+// Approximately 5 instruction slots used
>+#endif
>+
>+const BYTE g_PS_PassthroughRGBA2D_5551[] = {
>+    68,  88,  66,  67,  187, 10,  247, 243, 253, 108, 12,  228, 143, 154, 244, 52,  216, 197, 86,
>+    249, 1,   0,   0,   0,   132, 3,   0,   0,   6,   0,   0,   0,   56,  0,   0,   0,   252, 0,
>+    0,   0,   212, 1,   0,   0,   80,  2,   0,   0,   248, 2,   0,   0,   80,  3,   0,   0,   65,
>+    111, 110, 57,  188, 0,   0,   0,   188, 0,   0,   0,   0,   2,   255, 255, 148, 0,   0,   0,
>+    40,  0,   0,   0,   0,   0,   40,  0,   0,   0,   40,  0,   0,   0,   40,  0,   1,   0,   36,
>+    0,   0,   0,   40,  0,   0,   0,   0,   0,   1,   2,   255, 255, 81,  0,   0,   5,   0,   0,
>+    15,  160, 0,   0,   248, 65,  0,   0,   128, 63,  0,   0,   0,   63,  8,   33,  4,   61,  31,
>+    0,   0,   2,   0,   0,   0,   128, 0,   0,   3,   176, 31,  0,   0,   2,   0,   0,   0,   144,
>+    0,   8,   15,  160, 66,  0,   0,   3,   0,   0,   15,  128, 0,   0,   228, 176, 0,   8,   228,
>+    160, 4,   0,   0,   4,   0,   0,   15,  128, 0,   0,   228, 128, 0,   0,   64,  160, 0,   0,
>+    170, 160, 19,  0,   0,   2,   1,   0,   15,  128, 0,   0,   228, 128, 2,   0,   0,   3,   0,
>+    0,   15,  128, 0,   0,   228, 128, 1,   0,   228, 129, 5,   0,   0,   3,   0,   0,   15,  128,
>+    0,   0,   228, 128, 0,   0,   127, 160, 1,   0,   0,   2,   0,   8,   15,  128, 0,   0,   228,
>+    128, 255, 255, 0,   0,   83,  72,  68,  82,  208, 0,   0,   0,   64,  0,   0,   0,   52,  0,
>+    0,   0,   90,  0,   0,   3,   0,   96,  16,  0,   0,   0,   0,   0,   88,  24,  0,   4,   0,
>+    112, 16,  0,   0,   0,   0,   0,   85,  85,  0,   0,   98,  16,  0,   3,   50,  16,  16,  0,
>+    1,   0,   0,   0,   101, 0,   0,   3,   242, 32,  16,  0,   0,   0,   0,   0,   104, 0,   0,
>+    2,   1,   0,   0,   0,   69,  0,   0,   9,   242, 0,   16,  0,   0,   0,   0,   0,   70,  16,
>+    16,  0,   1,   0,   0,   0,   70,  126, 16,  0,   0,   0,   0,   0,   0,   96,  16,  0,   0,
>+    0,   0,   0,   56,  0,   0,   10,  242, 0,   16,  0,   0,   0,   0,   0,   70,  14,  16,  0,
>+    0,   0,   0,   0,   2,   64,  0,   0,   0,   0,   248, 65,  0,   0,   248, 65,  0,   0,   248,
>+    65,  0,   0,   128, 63,  64,  0,   0,   5,   242, 0,   16,  0,   0,   0,   0,   0,   70,  14,
>+    16,  0,   0,   0,   0,   0,   56,  0,   0,   10,  242, 32,  16,  0,   0,   0,   0,   0,   70,
>+    14,  16,  0,   0,   0,   0,   0,   2,   64,  0,   0,   8,   33,  4,   61,  8,   33,  4,   61,
>+    8,   33,  4,   61,  0,   0,   128, 63,  62,  0,   0,   1,   83,  84,  65,  84,  116, 0,   0,
>+    0,   5,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   2,   0,   0,   0,   3,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   82,  68,  69,  70,  160, 0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    2,   0,   0,   0,   28,  0,   0,   0,   0,   4,   255, 255, 0,   1,   0,   0,   109, 0,   0,
>+    0,   92,  0,   0,   0,   3,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   1,   0,   0,   0,   100, 0,   0,   0,   2,
>+    0,   0,   0,   5,   0,   0,   0,   4,   0,   0,   0,   255, 255, 255, 255, 0,   0,   0,   0,
>+    1,   0,   0,   0,   13,  0,   0,   0,   83,  97,  109, 112, 108, 101, 114, 0,   84,  101, 120,
>+    116, 117, 114, 101, 70,  0,   77,  105, 99,  114, 111, 115, 111, 102, 116, 32,  40,  82,  41,
>+    32,  72,  76,  83,  76,  32,  83,  104, 97,  100, 101, 114, 32,  67,  111, 109, 112, 105, 108,
>+    101, 114, 32,  57,  46,  50,  57,  46,  57,  53,  50,  46,  51,  49,  49,  49,  0,   171, 171,
>+    73,  83,  71,  78,  80,  0,   0,   0,   2,   0,   0,   0,   8,   0,   0,   0,   56,  0,   0,
>+    0,   0,   0,   0,   0,   1,   0,   0,   0,   3,   0,   0,   0,   0,   0,   0,   0,   15,  0,
>+    0,   0,   68,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   3,   0,   0,   0,   1,
>+    0,   0,   0,   3,   3,   0,   0,   83,  86,  95,  80,  79,  83,  73,  84,  73,  79,  78,  0,
>+    84,  69,  88,  67,  79,  79,  82,  68,  0,   171, 171, 171, 79,  83,  71,  78,  44,  0,   0,
>+    0,   1,   0,   0,   0,   8,   0,   0,   0,   32,  0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   3,   0,   0,   0,   0,   0,   0,   0,   15,  0,   0,   0,   83,  86,  95,  84,  65,
>+    82,  71,  69,  84,  0,   171, 171};
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgba2darray11ps.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgba2darray11ps.h
>new file mode 100644
>index 00000000000..be556724c6f
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgba2darray11ps.h
>@@ -0,0 +1,86 @@
>+#if 0
>+//
>+// Generated by Microsoft (R) HLSL Shader Compiler 9.29.952.3111
>+//
>+//
>+//   fxc /nologo /E PS_PassthroughRGBA2DArray /T ps_4_0 /Fh
>+//    compiled\passthroughrgba2darray11ps.h Passthrough2DArray11.hlsl
>+//
>+//
>+// Resource Bindings:
>+//
>+// Name                                 Type  Format         Dim Slot Elements
>+// ------------------------------ ---------- ------- ----------- ---- --------
>+// Sampler                           sampler      NA          NA    0        1
>+// TextureF                          texture  float4     2darray    0        1
>+//
>+//
>+//
>+// Input signature:
>+//
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_POSITION              0   xyzw        0      POS  float       
>+// SV_RENDERTARGETARRAYINDEX     0   x           1  RTINDEX   uint   x   
>+// TEXCOORD                 0   xyz         2     NONE  float   xy  
>+//
>+//
>+// Output signature:
>+//
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_TARGET                0   xyzw        0   TARGET  float   xyzw
>+//
>+ps_4_0
>+dcl_sampler s0, mode_default
>+dcl_resource_texture2darray (float,float,float,float) t0
>+dcl_input_ps_siv constant v1.x, rendertarget_array_index
>+dcl_input_ps linear v2.xy
>+dcl_output o0.xyzw
>+dcl_temps 1
>+utof r0.z, v1.x
>+mov r0.xy, v2.xyxx
>+sample o0.xyzw, r0.xyzx, t0.xyzw, s0
>+ret 
>+// Approximately 4 instruction slots used
>+#endif
>+
>+const BYTE g_PS_PassthroughRGBA2DArray[] = {
>+    68,  88,  66,  67,  148, 154, 188, 83,  129, 94,  72,  95,  71,  120, 64,  206, 76, 52,  234,
>+    173, 1,   0,   0,   0,   192, 2,   0,   0,   5,   0,   0,   0,   52,  0,   0,   0,  220, 0,
>+    0,   0,   100, 1,   0,   0,   152, 1,   0,   0,   68,  2,   0,   0,   82,  68,  69, 70,  160,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   2,   0,   0,   0,   28,  0,  0,   0,
>+    0,   4,   255, 255, 0,   1,   0,   0,   109, 0,   0,   0,   92,  0,   0,   0,   3,  0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,  1,   0,
>+    0,   0,   1,   0,   0,   0,   100, 0,   0,   0,   2,   0,   0,   0,   5,   0,   0,  0,   5,
>+    0,   0,   0,   255, 255, 255, 255, 0,   0,   0,   0,   1,   0,   0,   0,   13,  0,  0,   0,
>+    83,  97,  109, 112, 108, 101, 114, 0,   84,  101, 120, 116, 117, 114, 101, 70,  0,  77,  105,
>+    99,  114, 111, 115, 111, 102, 116, 32,  40,  82,  41,  32,  72,  76,  83,  76,  32, 83,  104,
>+    97,  100, 101, 114, 32,  67,  111, 109, 112, 105, 108, 101, 114, 32,  57,  46,  50, 57,  46,
>+    57,  53,  50,  46,  51,  49,  49,  49,  0,   171, 171, 73,  83,  71,  78,  128, 0,  0,   0,
>+    3,   0,   0,   0,   8,   0,   0,   0,   80,  0,   0,   0,   0,   0,   0,   0,   1,  0,   0,
>+    0,   3,   0,   0,   0,   0,   0,   0,   0,   15,  0,   0,   0,   92,  0,   0,   0,  0,   0,
>+    0,   0,   4,   0,   0,   0,   1,   0,   0,   0,   1,   0,   0,   0,   1,   1,   0,  0,   118,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   3,   0,   0,   0,   2,   0,  0,   0,
>+    7,   3,   0,   0,   83,  86,  95,  80,  79,  83,  73,  84,  73,  79,  78,  0,   83, 86,  95,
>+    82,  69,  78,  68,  69,  82,  84,  65,  82,  71,  69,  84,  65,  82,  82,  65,  89, 73,  78,
>+    68,  69,  88,  0,   84,  69,  88,  67,  79,  79,  82,  68,  0,   171, 79,  83,  71, 78,  44,
>+    0,   0,   0,   1,   0,   0,   0,   8,   0,   0,   0,   32,  0,   0,   0,   0,   0,  0,   0,
>+    0,   0,   0,   0,   3,   0,   0,   0,   0,   0,   0,   0,   15,  0,   0,   0,   83, 86,  95,
>+    84,  65,  82,  71,  69,  84,  0,   171, 171, 83,  72,  68,  82,  164, 0,   0,   0,  64,  0,
>+    0,   0,   41,  0,   0,   0,   90,  0,   0,   3,   0,   96,  16,  0,   0,   0,   0,  0,   88,
>+    64,  0,   4,   0,   112, 16,  0,   0,   0,   0,   0,   85,  85,  0,   0,   100, 8,  0,   4,
>+    18,  16,  16,  0,   1,   0,   0,   0,   4,   0,   0,   0,   98,  16,  0,   3,   50, 16,  16,
>+    0,   2,   0,   0,   0,   101, 0,   0,   3,   242, 32,  16,  0,   0,   0,   0,   0,  104, 0,
>+    0,   2,   1,   0,   0,   0,   86,  0,   0,   5,   66,  0,   16,  0,   0,   0,   0,  0,   10,
>+    16,  16,  0,   1,   0,   0,   0,   54,  0,   0,   5,   50,  0,   16,  0,   0,   0,  0,   0,
>+    70,  16,  16,  0,   2,   0,   0,   0,   69,  0,   0,   9,   242, 32,  16,  0,   0,  0,   0,
>+    0,   70,  2,   16,  0,   0,   0,   0,   0,   70,  126, 16,  0,   0,   0,   0,   0,  0,   96,
>+    16,  0,   0,   0,   0,   0,   62,  0,   0,   1,   83,  84,  65,  84,  116, 0,   0,  0,   4,
>+    0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   3,   0,   0,   0,   0,   0,  0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   0,  0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,  1,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,  0,   1,
>+    0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   0,   0,  0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,  0,   0,
>+    0};
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgba2darray_4444_11ps.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgba2darray_4444_11ps.h
>new file mode 100644
>index 00000000000..7b46eb50bad
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgba2darray_4444_11ps.h
>@@ -0,0 +1,94 @@
>+#if 0
>+//
>+// Generated by Microsoft (R) HLSL Shader Compiler 9.29.952.3111
>+//
>+//
>+//   fxc /nologo /E PS_PassthroughRGBA2DArray_4444 /T ps_4_0 /Fh
>+//    compiled\passthroughrgba2darray_4444_11ps.h Passthrough2DArray11.hlsl
>+//
>+//
>+// Resource Bindings:
>+//
>+// Name                                 Type  Format         Dim Slot Elements
>+// ------------------------------ ---------- ------- ----------- ---- --------
>+// Sampler                           sampler      NA          NA    0        1
>+// TextureF                          texture  float4     2darray    0        1
>+//
>+//
>+//
>+// Input signature:
>+//
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_POSITION              0   xyzw        0      POS  float       
>+// SV_RENDERTARGETARRAYINDEX     0   x           1  RTINDEX   uint   x   
>+// TEXCOORD                 0   xyz         2     NONE  float   xy  
>+//
>+//
>+// Output signature:
>+//
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_TARGET                0   xyzw        0   TARGET  float   xyzw
>+//
>+ps_4_0
>+dcl_sampler s0, mode_default
>+dcl_resource_texture2darray (float,float,float,float) t0
>+dcl_input_ps_siv constant v1.x, rendertarget_array_index
>+dcl_input_ps linear v2.xy
>+dcl_output o0.xyzw
>+dcl_temps 1
>+utof r0.z, v1.x
>+mov r0.xy, v2.xyxx
>+sample r0.xyzw, r0.xyzx, t0.xyzw, s0
>+mul r0.xyzw, r0.xyzw, l(15.000000, 15.000000, 15.000000, 15.000000)
>+round_ne r0.xyzw, r0.xyzw
>+mul o0.xyzw, r0.xyzw, l(0.066667, 0.066667, 0.066667, 0.066667)
>+ret 
>+// Approximately 7 instruction slots used
>+#endif
>+
>+const BYTE g_PS_PassthroughRGBA2DArray_4444[] = {
>+    68,  88,  66,  67,  61,  140, 14,  155, 149, 30,  84,  37,  234, 238, 138, 36,  31,  128, 78,
>+    120, 1,   0,   0,   0,   36,  3,   0,   0,   5,   0,   0,   0,   52,  0,   0,   0,   220, 0,
>+    0,   0,   100, 1,   0,   0,   152, 1,   0,   0,   168, 2,   0,   0,   82,  68,  69,  70,  160,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   2,   0,   0,   0,   28,  0,   0,   0,
>+    0,   4,   255, 255, 0,   1,   0,   0,   109, 0,   0,   0,   92,  0,   0,   0,   3,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,
>+    0,   0,   1,   0,   0,   0,   100, 0,   0,   0,   2,   0,   0,   0,   5,   0,   0,   0,   5,
>+    0,   0,   0,   255, 255, 255, 255, 0,   0,   0,   0,   1,   0,   0,   0,   13,  0,   0,   0,
>+    83,  97,  109, 112, 108, 101, 114, 0,   84,  101, 120, 116, 117, 114, 101, 70,  0,   77,  105,
>+    99,  114, 111, 115, 111, 102, 116, 32,  40,  82,  41,  32,  72,  76,  83,  76,  32,  83,  104,
>+    97,  100, 101, 114, 32,  67,  111, 109, 112, 105, 108, 101, 114, 32,  57,  46,  50,  57,  46,
>+    57,  53,  50,  46,  51,  49,  49,  49,  0,   171, 171, 73,  83,  71,  78,  128, 0,   0,   0,
>+    3,   0,   0,   0,   8,   0,   0,   0,   80,  0,   0,   0,   0,   0,   0,   0,   1,   0,   0,
>+    0,   3,   0,   0,   0,   0,   0,   0,   0,   15,  0,   0,   0,   92,  0,   0,   0,   0,   0,
>+    0,   0,   4,   0,   0,   0,   1,   0,   0,   0,   1,   0,   0,   0,   1,   1,   0,   0,   118,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   3,   0,   0,   0,   2,   0,   0,   0,
>+    7,   3,   0,   0,   83,  86,  95,  80,  79,  83,  73,  84,  73,  79,  78,  0,   83,  86,  95,
>+    82,  69,  78,  68,  69,  82,  84,  65,  82,  71,  69,  84,  65,  82,  82,  65,  89,  73,  78,
>+    68,  69,  88,  0,   84,  69,  88,  67,  79,  79,  82,  68,  0,   171, 79,  83,  71,  78,  44,
>+    0,   0,   0,   1,   0,   0,   0,   8,   0,   0,   0,   32,  0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   3,   0,   0,   0,   0,   0,   0,   0,   15,  0,   0,   0,   83,  86,  95,
>+    84,  65,  82,  71,  69,  84,  0,   171, 171, 83,  72,  68,  82,  8,   1,   0,   0,   64,  0,
>+    0,   0,   66,  0,   0,   0,   90,  0,   0,   3,   0,   96,  16,  0,   0,   0,   0,   0,   88,
>+    64,  0,   4,   0,   112, 16,  0,   0,   0,   0,   0,   85,  85,  0,   0,   100, 8,   0,   4,
>+    18,  16,  16,  0,   1,   0,   0,   0,   4,   0,   0,   0,   98,  16,  0,   3,   50,  16,  16,
>+    0,   2,   0,   0,   0,   101, 0,   0,   3,   242, 32,  16,  0,   0,   0,   0,   0,   104, 0,
>+    0,   2,   1,   0,   0,   0,   86,  0,   0,   5,   66,  0,   16,  0,   0,   0,   0,   0,   10,
>+    16,  16,  0,   1,   0,   0,   0,   54,  0,   0,   5,   50,  0,   16,  0,   0,   0,   0,   0,
>+    70,  16,  16,  0,   2,   0,   0,   0,   69,  0,   0,   9,   242, 0,   16,  0,   0,   0,   0,
>+    0,   70,  2,   16,  0,   0,   0,   0,   0,   70,  126, 16,  0,   0,   0,   0,   0,   0,   96,
>+    16,  0,   0,   0,   0,   0,   56,  0,   0,   10,  242, 0,   16,  0,   0,   0,   0,   0,   70,
>+    14,  16,  0,   0,   0,   0,   0,   2,   64,  0,   0,   0,   0,   112, 65,  0,   0,   112, 65,
>+    0,   0,   112, 65,  0,   0,   112, 65,  64,  0,   0,   5,   242, 0,   16,  0,   0,   0,   0,
>+    0,   70,  14,  16,  0,   0,   0,   0,   0,   56,  0,   0,   10,  242, 32,  16,  0,   0,   0,
>+    0,   0,   70,  14,  16,  0,   0,   0,   0,   0,   2,   64,  0,   0,   137, 136, 136, 61,  137,
>+    136, 136, 61,  137, 136, 136, 61,  137, 136, 136, 61,  62,  0,   0,   1,   83,  84,  65,  84,
>+    116, 0,   0,   0,   7,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   3,   0,   0,
>+    0,   3,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   2,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0};
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgba2darray_5551_11ps.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgba2darray_5551_11ps.h
>new file mode 100644
>index 00000000000..c7ed3eb1a19
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgba2darray_5551_11ps.h
>@@ -0,0 +1,94 @@
>+#if 0
>+//
>+// Generated by Microsoft (R) HLSL Shader Compiler 9.29.952.3111
>+//
>+//
>+//   fxc /nologo /E PS_PassthroughRGBA2DArray_5551 /T ps_4_0 /Fh
>+//    compiled\passthroughrgba2darray_5551_11ps.h Passthrough2DArray11.hlsl
>+//
>+//
>+// Resource Bindings:
>+//
>+// Name                                 Type  Format         Dim Slot Elements
>+// ------------------------------ ---------- ------- ----------- ---- --------
>+// Sampler                           sampler      NA          NA    0        1
>+// TextureF                          texture  float4     2darray    0        1
>+//
>+//
>+//
>+// Input signature:
>+//
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_POSITION              0   xyzw        0      POS  float       
>+// SV_RENDERTARGETARRAYINDEX     0   x           1  RTINDEX   uint   x   
>+// TEXCOORD                 0   xyz         2     NONE  float   xy  
>+//
>+//
>+// Output signature:
>+//
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_TARGET                0   xyzw        0   TARGET  float   xyzw
>+//
>+ps_4_0
>+dcl_sampler s0, mode_default
>+dcl_resource_texture2darray (float,float,float,float) t0
>+dcl_input_ps_siv constant v1.x, rendertarget_array_index
>+dcl_input_ps linear v2.xy
>+dcl_output o0.xyzw
>+dcl_temps 1
>+utof r0.z, v1.x
>+mov r0.xy, v2.xyxx
>+sample r0.xyzw, r0.xyzx, t0.xyzw, s0
>+mul r0.xyzw, r0.xyzw, l(31.000000, 31.000000, 31.000000, 1.000000)
>+round_ne r0.xyzw, r0.xyzw
>+mul o0.xyzw, r0.xyzw, l(0.032258, 0.032258, 0.032258, 1.000000)
>+ret 
>+// Approximately 7 instruction slots used
>+#endif
>+
>+const BYTE g_PS_PassthroughRGBA2DArray_5551[] = {
>+    68,  88,  66,  67,  209, 124, 27,  45,  239, 120, 103, 6,   221, 133, 157, 71,  79, 73,  236,
>+    138, 1,   0,   0,   0,   36,  3,   0,   0,   5,   0,   0,   0,   52,  0,   0,   0,  220, 0,
>+    0,   0,   100, 1,   0,   0,   152, 1,   0,   0,   168, 2,   0,   0,   82,  68,  69, 70,  160,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   2,   0,   0,   0,   28,  0,  0,   0,
>+    0,   4,   255, 255, 0,   1,   0,   0,   109, 0,   0,   0,   92,  0,   0,   0,   3,  0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,  1,   0,
>+    0,   0,   1,   0,   0,   0,   100, 0,   0,   0,   2,   0,   0,   0,   5,   0,   0,  0,   5,
>+    0,   0,   0,   255, 255, 255, 255, 0,   0,   0,   0,   1,   0,   0,   0,   13,  0,  0,   0,
>+    83,  97,  109, 112, 108, 101, 114, 0,   84,  101, 120, 116, 117, 114, 101, 70,  0,  77,  105,
>+    99,  114, 111, 115, 111, 102, 116, 32,  40,  82,  41,  32,  72,  76,  83,  76,  32, 83,  104,
>+    97,  100, 101, 114, 32,  67,  111, 109, 112, 105, 108, 101, 114, 32,  57,  46,  50, 57,  46,
>+    57,  53,  50,  46,  51,  49,  49,  49,  0,   171, 171, 73,  83,  71,  78,  128, 0,  0,   0,
>+    3,   0,   0,   0,   8,   0,   0,   0,   80,  0,   0,   0,   0,   0,   0,   0,   1,  0,   0,
>+    0,   3,   0,   0,   0,   0,   0,   0,   0,   15,  0,   0,   0,   92,  0,   0,   0,  0,   0,
>+    0,   0,   4,   0,   0,   0,   1,   0,   0,   0,   1,   0,   0,   0,   1,   1,   0,  0,   118,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   3,   0,   0,   0,   2,   0,  0,   0,
>+    7,   3,   0,   0,   83,  86,  95,  80,  79,  83,  73,  84,  73,  79,  78,  0,   83, 86,  95,
>+    82,  69,  78,  68,  69,  82,  84,  65,  82,  71,  69,  84,  65,  82,  82,  65,  89, 73,  78,
>+    68,  69,  88,  0,   84,  69,  88,  67,  79,  79,  82,  68,  0,   171, 79,  83,  71, 78,  44,
>+    0,   0,   0,   1,   0,   0,   0,   8,   0,   0,   0,   32,  0,   0,   0,   0,   0,  0,   0,
>+    0,   0,   0,   0,   3,   0,   0,   0,   0,   0,   0,   0,   15,  0,   0,   0,   83, 86,  95,
>+    84,  65,  82,  71,  69,  84,  0,   171, 171, 83,  72,  68,  82,  8,   1,   0,   0,  64,  0,
>+    0,   0,   66,  0,   0,   0,   90,  0,   0,   3,   0,   96,  16,  0,   0,   0,   0,  0,   88,
>+    64,  0,   4,   0,   112, 16,  0,   0,   0,   0,   0,   85,  85,  0,   0,   100, 8,  0,   4,
>+    18,  16,  16,  0,   1,   0,   0,   0,   4,   0,   0,   0,   98,  16,  0,   3,   50, 16,  16,
>+    0,   2,   0,   0,   0,   101, 0,   0,   3,   242, 32,  16,  0,   0,   0,   0,   0,  104, 0,
>+    0,   2,   1,   0,   0,   0,   86,  0,   0,   5,   66,  0,   16,  0,   0,   0,   0,  0,   10,
>+    16,  16,  0,   1,   0,   0,   0,   54,  0,   0,   5,   50,  0,   16,  0,   0,   0,  0,   0,
>+    70,  16,  16,  0,   2,   0,   0,   0,   69,  0,   0,   9,   242, 0,   16,  0,   0,  0,   0,
>+    0,   70,  2,   16,  0,   0,   0,   0,   0,   70,  126, 16,  0,   0,   0,   0,   0,  0,   96,
>+    16,  0,   0,   0,   0,   0,   56,  0,   0,   10,  242, 0,   16,  0,   0,   0,   0,  0,   70,
>+    14,  16,  0,   0,   0,   0,   0,   2,   64,  0,   0,   0,   0,   248, 65,  0,   0,  248, 65,
>+    0,   0,   248, 65,  0,   0,   128, 63,  64,  0,   0,   5,   242, 0,   16,  0,   0,  0,   0,
>+    0,   70,  14,  16,  0,   0,   0,   0,   0,   56,  0,   0,   10,  242, 32,  16,  0,  0,   0,
>+    0,   0,   70,  14,  16,  0,   0,   0,   0,   0,   2,   64,  0,   0,   8,   33,  4,  61,  8,
>+    33,  4,   61,  8,   33,  4,   61,  0,   0,   128, 63,  62,  0,   0,   1,   83,  84, 65,  84,
>+    116, 0,   0,   0,   7,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   3,  0,   0,
>+    0,   3,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,  0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,  0,   0,
>+    0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,  0,   0,
>+    0,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   2,   0,   0,   0,   0,  0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,  0,   0,
>+    0,   0,   0,   0,   0,   0};
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgba2darrayi11ps.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgba2darrayi11ps.h
>new file mode 100644
>index 00000000000..c1d45a287c8
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgba2darrayi11ps.h
>@@ -0,0 +1,89 @@
>+#if 0
>+//
>+// Generated by Microsoft (R) HLSL Shader Compiler 9.29.952.3111
>+//
>+//
>+//   fxc /nologo /E PS_PassthroughRGBA2DArrayI /T ps_4_0 /Fh
>+//    compiled\passthroughrgba2darrayi11ps.h Passthrough2DArray11.hlsl
>+//
>+//
>+// Resource Bindings:
>+//
>+// Name                                 Type  Format         Dim Slot Elements
>+// ------------------------------ ---------- ------- ----------- ---- --------
>+// TextureI                          texture   sint4     2darray    0        1
>+//
>+//
>+//
>+// Input signature:
>+//
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_POSITION              0   xyzw        0      POS  float       
>+// SV_RENDERTARGETARRAYINDEX     0   x           1  RTINDEX   uint   x   
>+// TEXCOORD                 0   xyz         2     NONE  float   xy  
>+//
>+//
>+// Output signature:
>+//
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_TARGET                0   xyzw        0   TARGET    int   xyzw
>+//
>+ps_4_0
>+dcl_resource_texture2darray (sint,sint,sint,sint) t0
>+dcl_input_ps_siv constant v1.x, rendertarget_array_index
>+dcl_input_ps linear v2.xy
>+dcl_output o0.xyzw
>+dcl_temps 1
>+resinfo_uint r0.xyzw, l(0), t0.xyzw
>+utof r0.xy, r0.xyxx
>+mul r0.xy, r0.xyxx, v2.xyxx
>+ftoi r0.xy, r0.xyxx
>+mov r0.z, v1.x
>+mov r0.w, l(0)
>+ld o0.xyzw, r0.xyzw, t0.xyzw
>+ret 
>+// Approximately 8 instruction slots used
>+#endif
>+
>+const BYTE g_PS_PassthroughRGBA2DArrayI[] = {
>+    68,  88,  66,  67,  5,   189, 13,  241, 119, 156, 1,   197, 65,  203, 237, 2,   64,  152, 186,
>+    206, 1,   0,   0,   0,   228, 2,   0,   0,   5,   0,   0,   0,   52,  0,   0,   0,   180, 0,
>+    0,   0,   60,  1,   0,   0,   112, 1,   0,   0,   104, 2,   0,   0,   82,  68,  69,  70,  120,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   28,  0,   0,   0,
>+    0,   4,   255, 255, 0,   1,   0,   0,   69,  0,   0,   0,   60,  0,   0,   0,   2,   0,   0,
>+    0,   3,   0,   0,   0,   5,   0,   0,   0,   255, 255, 255, 255, 0,   0,   0,   0,   1,   0,
>+    0,   0,   13,  0,   0,   0,   84,  101, 120, 116, 117, 114, 101, 73,  0,   77,  105, 99,  114,
>+    111, 115, 111, 102, 116, 32,  40,  82,  41,  32,  72,  76,  83,  76,  32,  83,  104, 97,  100,
>+    101, 114, 32,  67,  111, 109, 112, 105, 108, 101, 114, 32,  57,  46,  50,  57,  46,  57,  53,
>+    50,  46,  51,  49,  49,  49,  0,   171, 171, 73,  83,  71,  78,  128, 0,   0,   0,   3,   0,
>+    0,   0,   8,   0,   0,   0,   80,  0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   3,
>+    0,   0,   0,   0,   0,   0,   0,   15,  0,   0,   0,   92,  0,   0,   0,   0,   0,   0,   0,
>+    4,   0,   0,   0,   1,   0,   0,   0,   1,   0,   0,   0,   1,   1,   0,   0,   118, 0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   3,   0,   0,   0,   2,   0,   0,   0,   7,   3,
>+    0,   0,   83,  86,  95,  80,  79,  83,  73,  84,  73,  79,  78,  0,   83,  86,  95,  82,  69,
>+    78,  68,  69,  82,  84,  65,  82,  71,  69,  84,  65,  82,  82,  65,  89,  73,  78,  68,  69,
>+    88,  0,   84,  69,  88,  67,  79,  79,  82,  68,  0,   171, 79,  83,  71,  78,  44,  0,   0,
>+    0,   1,   0,   0,   0,   8,   0,   0,   0,   32,  0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   2,   0,   0,   0,   0,   0,   0,   0,   15,  0,   0,   0,   83,  86,  95,  84,  65,
>+    82,  71,  69,  84,  0,   171, 171, 83,  72,  68,  82,  240, 0,   0,   0,   64,  0,   0,   0,
>+    60,  0,   0,   0,   88,  64,  0,   4,   0,   112, 16,  0,   0,   0,   0,   0,   51,  51,  0,
>+    0,   100, 8,   0,   4,   18,  16,  16,  0,   1,   0,   0,   0,   4,   0,   0,   0,   98,  16,
>+    0,   3,   50,  16,  16,  0,   2,   0,   0,   0,   101, 0,   0,   3,   242, 32,  16,  0,   0,
>+    0,   0,   0,   104, 0,   0,   2,   1,   0,   0,   0,   61,  16,  0,   7,   242, 0,   16,  0,
>+    0,   0,   0,   0,   1,   64,  0,   0,   0,   0,   0,   0,   70,  126, 16,  0,   0,   0,   0,
>+    0,   86,  0,   0,   5,   50,  0,   16,  0,   0,   0,   0,   0,   70,  0,   16,  0,   0,   0,
>+    0,   0,   56,  0,   0,   7,   50,  0,   16,  0,   0,   0,   0,   0,   70,  0,   16,  0,   0,
>+    0,   0,   0,   70,  16,  16,  0,   2,   0,   0,   0,   27,  0,   0,   5,   50,  0,   16,  0,
>+    0,   0,   0,   0,   70,  0,   16,  0,   0,   0,   0,   0,   54,  0,   0,   5,   66,  0,   16,
>+    0,   0,   0,   0,   0,   10,  16,  16,  0,   1,   0,   0,   0,   54,  0,   0,   5,   130, 0,
>+    16,  0,   0,   0,   0,   0,   1,   64,  0,   0,   0,   0,   0,   0,   45,  0,   0,   7,   242,
>+    32,  16,  0,   0,   0,   0,   0,   70,  14,  16,  0,   0,   0,   0,   0,   70,  126, 16,  0,
>+    0,   0,   0,   0,   62,  0,   0,   1,   83,  84,  65,  84,  116, 0,   0,   0,   8,   0,   0,
>+    0,   1,   0,   0,   0,   0,   0,   0,   0,   3,   0,   0,   0,   1,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   2,   0,   0,
>+    0,   0,   0,   0,   0,   2,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0};
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgba2darrayui11ps.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgba2darrayui11ps.h
>new file mode 100644
>index 00000000000..a1b050aebf6
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgba2darrayui11ps.h
>@@ -0,0 +1,89 @@
>+#if 0
>+//
>+// Generated by Microsoft (R) HLSL Shader Compiler 9.29.952.3111
>+//
>+//
>+//   fxc /nologo /E PS_PassthroughRGBA2DArrayUI /T ps_4_0 /Fh
>+//    compiled\passthroughrgba2darrayui11ps.h Passthrough2DArray11.hlsl
>+//
>+//
>+// Resource Bindings:
>+//
>+// Name                                 Type  Format         Dim Slot Elements
>+// ------------------------------ ---------- ------- ----------- ---- --------
>+// TextureUI                         texture   uint4     2darray    0        1
>+//
>+//
>+//
>+// Input signature:
>+//
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_POSITION              0   xyzw        0      POS  float       
>+// SV_RENDERTARGETARRAYINDEX     0   x           1  RTINDEX   uint   x   
>+// TEXCOORD                 0   xyz         2     NONE  float   xy  
>+//
>+//
>+// Output signature:
>+//
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_TARGET                0   xyzw        0   TARGET   uint   xyzw
>+//
>+ps_4_0
>+dcl_resource_texture2darray (uint,uint,uint,uint) t0
>+dcl_input_ps_siv constant v1.x, rendertarget_array_index
>+dcl_input_ps linear v2.xy
>+dcl_output o0.xyzw
>+dcl_temps 1
>+resinfo_uint r0.xyzw, l(0), t0.xyzw
>+utof r0.xy, r0.xyxx
>+mul r0.xy, r0.xyxx, v2.xyxx
>+ftoi r0.xy, r0.xyxx
>+mov r0.z, v1.x
>+mov r0.w, l(0)
>+ld o0.xyzw, r0.xyzw, t0.xyzw
>+ret 
>+// Approximately 8 instruction slots used
>+#endif
>+
>+const BYTE g_PS_PassthroughRGBA2DArrayUI[] = {
>+    68,  88,  66,  67,  5,   138, 102, 222, 93,  168, 178, 120, 117, 240, 177, 152, 209, 17,  205,
>+    155, 1,   0,   0,   0,   228, 2,   0,   0,   5,   0,   0,   0,   52,  0,   0,   0,   180, 0,
>+    0,   0,   60,  1,   0,   0,   112, 1,   0,   0,   104, 2,   0,   0,   82,  68,  69,  70,  120,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   28,  0,   0,   0,
>+    0,   4,   255, 255, 0,   1,   0,   0,   70,  0,   0,   0,   60,  0,   0,   0,   2,   0,   0,
>+    0,   4,   0,   0,   0,   5,   0,   0,   0,   255, 255, 255, 255, 0,   0,   0,   0,   1,   0,
>+    0,   0,   13,  0,   0,   0,   84,  101, 120, 116, 117, 114, 101, 85,  73,  0,   77,  105, 99,
>+    114, 111, 115, 111, 102, 116, 32,  40,  82,  41,  32,  72,  76,  83,  76,  32,  83,  104, 97,
>+    100, 101, 114, 32,  67,  111, 109, 112, 105, 108, 101, 114, 32,  57,  46,  50,  57,  46,  57,
>+    53,  50,  46,  51,  49,  49,  49,  0,   171, 73,  83,  71,  78,  128, 0,   0,   0,   3,   0,
>+    0,   0,   8,   0,   0,   0,   80,  0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   3,
>+    0,   0,   0,   0,   0,   0,   0,   15,  0,   0,   0,   92,  0,   0,   0,   0,   0,   0,   0,
>+    4,   0,   0,   0,   1,   0,   0,   0,   1,   0,   0,   0,   1,   1,   0,   0,   118, 0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   3,   0,   0,   0,   2,   0,   0,   0,   7,   3,
>+    0,   0,   83,  86,  95,  80,  79,  83,  73,  84,  73,  79,  78,  0,   83,  86,  95,  82,  69,
>+    78,  68,  69,  82,  84,  65,  82,  71,  69,  84,  65,  82,  82,  65,  89,  73,  78,  68,  69,
>+    88,  0,   84,  69,  88,  67,  79,  79,  82,  68,  0,   171, 79,  83,  71,  78,  44,  0,   0,
>+    0,   1,   0,   0,   0,   8,   0,   0,   0,   32,  0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   15,  0,   0,   0,   83,  86,  95,  84,  65,
>+    82,  71,  69,  84,  0,   171, 171, 83,  72,  68,  82,  240, 0,   0,   0,   64,  0,   0,   0,
>+    60,  0,   0,   0,   88,  64,  0,   4,   0,   112, 16,  0,   0,   0,   0,   0,   68,  68,  0,
>+    0,   100, 8,   0,   4,   18,  16,  16,  0,   1,   0,   0,   0,   4,   0,   0,   0,   98,  16,
>+    0,   3,   50,  16,  16,  0,   2,   0,   0,   0,   101, 0,   0,   3,   242, 32,  16,  0,   0,
>+    0,   0,   0,   104, 0,   0,   2,   1,   0,   0,   0,   61,  16,  0,   7,   242, 0,   16,  0,
>+    0,   0,   0,   0,   1,   64,  0,   0,   0,   0,   0,   0,   70,  126, 16,  0,   0,   0,   0,
>+    0,   86,  0,   0,   5,   50,  0,   16,  0,   0,   0,   0,   0,   70,  0,   16,  0,   0,   0,
>+    0,   0,   56,  0,   0,   7,   50,  0,   16,  0,   0,   0,   0,   0,   70,  0,   16,  0,   0,
>+    0,   0,   0,   70,  16,  16,  0,   2,   0,   0,   0,   27,  0,   0,   5,   50,  0,   16,  0,
>+    0,   0,   0,   0,   70,  0,   16,  0,   0,   0,   0,   0,   54,  0,   0,   5,   66,  0,   16,
>+    0,   0,   0,   0,   0,   10,  16,  16,  0,   1,   0,   0,   0,   54,  0,   0,   5,   130, 0,
>+    16,  0,   0,   0,   0,   0,   1,   64,  0,   0,   0,   0,   0,   0,   45,  0,   0,   7,   242,
>+    32,  16,  0,   0,   0,   0,   0,   70,  14,  16,  0,   0,   0,   0,   0,   70,  126, 16,  0,
>+    0,   0,   0,   0,   62,  0,   0,   1,   83,  84,  65,  84,  116, 0,   0,   0,   8,   0,   0,
>+    0,   1,   0,   0,   0,   0,   0,   0,   0,   3,   0,   0,   0,   1,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   2,   0,   0,
>+    0,   0,   0,   0,   0,   2,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0};
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgba2di11ps.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgba2di11ps.h
>index d87d043d8cd..c4585076cb7 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgba2di11ps.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgba2di11ps.h
>@@ -1,6 +1,10 @@
> #if 0
> //
>-// Generated by Microsoft (R) HLSL Shader Compiler 6.3.9600.16384
>+// Generated by Microsoft (R) HLSL Shader Compiler 9.29.952.3111
>+//
>+//
>+//   fxc /nologo /E PS_PassthroughRGBA2DI /T ps_4_0 /Fh
>+//    compiled\passthroughrgba2di11ps.h Passthrough2D11.hlsl
> //
> //
> // Resource Bindings:
>@@ -13,17 +17,17 @@
> //
> // Input signature:
> //
>-// Name                 Index   Mask Register SysValue  Format   Used
>-// -------------------- ----- ------ -------- -------- ------- ------
>-// SV_POSITION              0   xyzw        0      POS   float       
>-// TEXCOORD                 0   xy          1     NONE   float   xy  
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_POSITION              0   xyzw        0      POS  float       
>+// TEXCOORD                 0   xy          1     NONE  float   xy  
> //
> //
> // Output signature:
> //
>-// Name                 Index   Mask Register SysValue  Format   Used
>-// -------------------- ----- ------ -------- -------- ------- ------
>-// SV_TARGET                0   xyzw        0   TARGET     int   xyzw
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_TARGET                0   xyzw        0   TARGET    int   xyzw
> //
> ps_4_0
> dcl_resource_texture2d (sint,sint,sint,sint) t0
>@@ -40,118 +44,40 @@ ret
> // Approximately 7 instruction slots used
> #endif
> 
>-const BYTE g_PS_PassthroughRGBA2DI[] =
>-{
>-     68,  88,  66,  67,  81, 147, 
>-    194, 141,  92, 236, 184, 192, 
>-     11, 249,  14, 215, 122, 110, 
>-     35, 111,   1,   0,   0,   0, 
>-    156,   2,   0,   0,   5,   0, 
>-      0,   0,  52,   0,   0,   0, 
>-    180,   0,   0,   0,  12,   1, 
>-      0,   0,  64,   1,   0,   0, 
>-     32,   2,   0,   0,  82,  68, 
>-     69,  70, 120,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   1,   0,   0,   0, 
>-     28,   0,   0,   0,   0,   4, 
>-    255, 255,   0,   1,   0,   0, 
>-     69,   0,   0,   0,  60,   0, 
>-      0,   0,   2,   0,   0,   0, 
>-      3,   0,   0,   0,   4,   0, 
>-      0,   0, 255, 255, 255, 255, 
>-      0,   0,   0,   0,   1,   0, 
>-      0,   0,  13,   0,   0,   0, 
>-     84, 101, 120, 116, 117, 114, 
>-    101,  73,   0,  77, 105,  99, 
>-    114, 111, 115, 111, 102, 116, 
>-     32,  40,  82,  41,  32,  72, 
>-     76,  83,  76,  32,  83, 104, 
>-     97, 100, 101, 114,  32,  67, 
>-    111, 109, 112, 105, 108, 101, 
>-    114,  32,  54,  46,  51,  46, 
>-     57,  54,  48,  48,  46,  49, 
>-     54,  51,  56,  52,   0, 171, 
>-     73,  83,  71,  78,  80,   0, 
>-      0,   0,   2,   0,   0,   0, 
>-      8,   0,   0,   0,  56,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      1,   0,   0,   0,   3,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-     15,   0,   0,   0,  68,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   3,   0, 
>-      0,   0,   1,   0,   0,   0, 
>-      3,   3,   0,   0,  83,  86, 
>-     95,  80,  79,  83,  73,  84, 
>-     73,  79,  78,   0,  84,  69, 
>-     88,  67,  79,  79,  82,  68, 
>-      0, 171, 171, 171,  79,  83, 
>-     71,  78,  44,   0,   0,   0, 
>-      1,   0,   0,   0,   8,   0, 
>-      0,   0,  32,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   2,   0,   0,   0, 
>-      0,   0,   0,   0,  15,   0, 
>-      0,   0,  83,  86,  95,  84, 
>-     65,  82,  71,  69,  84,   0, 
>-    171, 171,  83,  72,  68,  82, 
>-    216,   0,   0,   0,  64,   0, 
>-      0,   0,  54,   0,   0,   0, 
>-     88,  24,   0,   4,   0, 112, 
>-     16,   0,   0,   0,   0,   0, 
>-     51,  51,   0,   0,  98,  16, 
>-      0,   3,  50,  16,  16,   0, 
>-      1,   0,   0,   0, 101,   0, 
>-      0,   3, 242,  32,  16,   0, 
>-      0,   0,   0,   0, 104,   0, 
>-      0,   2,   1,   0,   0,   0, 
>-     61,  16,   0,   7, 242,   0, 
>-     16,   0,   0,   0,   0,   0, 
>-      1,  64,   0,   0,   0,   0, 
>-      0,   0,  70, 126,  16,   0, 
>-      0,   0,   0,   0,  86,   0, 
>-      0,   5,  50,   0,  16,   0, 
>-      0,   0,   0,   0,  70,   0, 
>-     16,   0,   0,   0,   0,   0, 
>-     56,   0,   0,   7,  50,   0, 
>-     16,   0,   0,   0,   0,   0, 
>-     70,   0,  16,   0,   0,   0, 
>-      0,   0,  70,  16,  16,   0, 
>-      1,   0,   0,   0,  27,   0, 
>-      0,   5,  50,   0,  16,   0, 
>-      0,   0,   0,   0,  70,   0, 
>-     16,   0,   0,   0,   0,   0, 
>-     54,   0,   0,   8, 194,   0, 
>-     16,   0,   0,   0,   0,   0, 
>-      2,  64,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,  45,   0,   0,   7, 
>-    242,  32,  16,   0,   0,   0, 
>-      0,   0,  70,  14,  16,   0, 
>-      0,   0,   0,   0,  70, 126, 
>-     16,   0,   0,   0,   0,   0, 
>-     62,   0,   0,   1,  83,  84, 
>-     65,  84, 116,   0,   0,   0, 
>-      7,   0,   0,   0,   1,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      2,   0,   0,   0,   1,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   1,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      1,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   1,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      2,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0
>-};
>+const BYTE g_PS_PassthroughRGBA2DI[] = {
>+    68,  88,  66,  67,  95,  246, 206, 5,   65,  242, 73,  197, 5,   64, 172, 186, 253, 27,  87,
>+    195, 1,   0,   0,   0,   156, 2,   0,   0,   5,   0,   0,   0,   52, 0,   0,   0,   180, 0,
>+    0,   0,   12,  1,   0,   0,   64,  1,   0,   0,   32,  2,   0,   0,  82,  68,  69,  70,  120,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,  0,   28,  0,   0,   0,
>+    0,   4,   255, 255, 0,   1,   0,   0,   69,  0,   0,   0,   60,  0,  0,   0,   2,   0,   0,
>+    0,   3,   0,   0,   0,   4,   0,   0,   0,   255, 255, 255, 255, 0,  0,   0,   0,   1,   0,
>+    0,   0,   13,  0,   0,   0,   84,  101, 120, 116, 117, 114, 101, 73, 0,   77,  105, 99,  114,
>+    111, 115, 111, 102, 116, 32,  40,  82,  41,  32,  72,  76,  83,  76, 32,  83,  104, 97,  100,
>+    101, 114, 32,  67,  111, 109, 112, 105, 108, 101, 114, 32,  57,  46, 50,  57,  46,  57,  53,
>+    50,  46,  51,  49,  49,  49,  0,   171, 171, 73,  83,  71,  78,  80, 0,   0,   0,   2,   0,
>+    0,   0,   8,   0,   0,   0,   56,  0,   0,   0,   0,   0,   0,   0,  1,   0,   0,   0,   3,
>+    0,   0,   0,   0,   0,   0,   0,   15,  0,   0,   0,   68,  0,   0,  0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   3,   0,   0,   0,   1,   0,   0,   0,   3,   3,  0,   0,   83,  86,  95,
>+    80,  79,  83,  73,  84,  73,  79,  78,  0,   84,  69,  88,  67,  79, 79,  82,  68,  0,   171,
>+    171, 171, 79,  83,  71,  78,  44,  0,   0,   0,   1,   0,   0,   0,  8,   0,   0,   0,   32,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   2,   0,   0,  0,   0,   0,   0,   0,
>+    15,  0,   0,   0,   83,  86,  95,  84,  65,  82,  71,  69,  84,  0,  171, 171, 83,  72,  68,
>+    82,  216, 0,   0,   0,   64,  0,   0,   0,   54,  0,   0,   0,   88, 24,  0,   4,   0,   112,
>+    16,  0,   0,   0,   0,   0,   51,  51,  0,   0,   98,  16,  0,   3,  50,  16,  16,  0,   1,
>+    0,   0,   0,   101, 0,   0,   3,   242, 32,  16,  0,   0,   0,   0,  0,   104, 0,   0,   2,
>+    1,   0,   0,   0,   61,  16,  0,   7,   242, 0,   16,  0,   0,   0,  0,   0,   1,   64,  0,
>+    0,   0,   0,   0,   0,   70,  126, 16,  0,   0,   0,   0,   0,   86, 0,   0,   5,   50,  0,
>+    16,  0,   0,   0,   0,   0,   70,  0,   16,  0,   0,   0,   0,   0,  56,  0,   0,   7,   50,
>+    0,   16,  0,   0,   0,   0,   0,   70,  0,   16,  0,   0,   0,   0,  0,   70,  16,  16,  0,
>+    1,   0,   0,   0,   27,  0,   0,   5,   50,  0,   16,  0,   0,   0,  0,   0,   70,  0,   16,
>+    0,   0,   0,   0,   0,   54,  0,   0,   8,   194, 0,   16,  0,   0,  0,   0,   0,   2,   64,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,  0,   0,   0,   0,   45,
>+    0,   0,   7,   242, 32,  16,  0,   0,   0,   0,   0,   70,  14,  16, 0,   0,   0,   0,   0,
>+    70,  126, 16,  0,   0,   0,   0,   0,   62,  0,   0,   1,   83,  84, 65,  84,  116, 0,   0,
>+    0,   7,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   2,  0,   0,   0,   1,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,  0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,  0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,  0,   0,   0,   0,   0,
>+    0,   1,   0,   0,   0,   0,   0,   0,   0,   2,   0,   0,   0,   0,  0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,  0,   0,   0,   0,   0,
>+    0,   0,   0};
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgba2dui11ps.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgba2dui11ps.h
>index 35cff53a465..bda58eaa2b4 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgba2dui11ps.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgba2dui11ps.h
>@@ -1,6 +1,10 @@
> #if 0
> //
>-// Generated by Microsoft (R) HLSL Shader Compiler 6.3.9600.16384
>+// Generated by Microsoft (R) HLSL Shader Compiler 9.29.952.3111
>+//
>+//
>+//   fxc /nologo /E PS_PassthroughRGBA2DUI /T ps_4_0 /Fh
>+//    compiled\passthroughrgba2dui11ps.h Passthrough2D11.hlsl
> //
> //
> // Resource Bindings:
>@@ -13,17 +17,17 @@
> //
> // Input signature:
> //
>-// Name                 Index   Mask Register SysValue  Format   Used
>-// -------------------- ----- ------ -------- -------- ------- ------
>-// SV_POSITION              0   xyzw        0      POS   float       
>-// TEXCOORD                 0   xy          1     NONE   float   xy  
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_POSITION              0   xyzw        0      POS  float       
>+// TEXCOORD                 0   xy          1     NONE  float   xy  
> //
> //
> // Output signature:
> //
>-// Name                 Index   Mask Register SysValue  Format   Used
>-// -------------------- ----- ------ -------- -------- ------- ------
>-// SV_TARGET                0   xyzw        0   TARGET    uint   xyzw
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_TARGET                0   xyzw        0   TARGET   uint   xyzw
> //
> ps_4_0
> dcl_resource_texture2d (uint,uint,uint,uint) t0
>@@ -40,118 +44,40 @@ ret
> // Approximately 7 instruction slots used
> #endif
> 
>-const BYTE g_PS_PassthroughRGBA2DUI[] =
>-{
>-     68,  88,  66,  67, 128, 252, 
>-    255, 238,  68, 109,  10, 133, 
>-    175, 163, 216, 152, 219, 103, 
>-    163, 223,   1,   0,   0,   0, 
>-    156,   2,   0,   0,   5,   0, 
>-      0,   0,  52,   0,   0,   0, 
>-    180,   0,   0,   0,  12,   1, 
>-      0,   0,  64,   1,   0,   0, 
>-     32,   2,   0,   0,  82,  68, 
>-     69,  70, 120,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   1,   0,   0,   0, 
>-     28,   0,   0,   0,   0,   4, 
>-    255, 255,   0,   1,   0,   0, 
>-     70,   0,   0,   0,  60,   0, 
>-      0,   0,   2,   0,   0,   0, 
>-      4,   0,   0,   0,   4,   0, 
>-      0,   0, 255, 255, 255, 255, 
>-      0,   0,   0,   0,   1,   0, 
>-      0,   0,  13,   0,   0,   0, 
>-     84, 101, 120, 116, 117, 114, 
>-    101,  85,  73,   0,  77, 105, 
>-     99, 114, 111, 115, 111, 102, 
>-    116,  32,  40,  82,  41,  32, 
>-     72,  76,  83,  76,  32,  83, 
>-    104,  97, 100, 101, 114,  32, 
>-     67, 111, 109, 112, 105, 108, 
>-    101, 114,  32,  54,  46,  51, 
>-     46,  57,  54,  48,  48,  46, 
>-     49,  54,  51,  56,  52,   0, 
>-     73,  83,  71,  78,  80,   0, 
>-      0,   0,   2,   0,   0,   0, 
>-      8,   0,   0,   0,  56,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      1,   0,   0,   0,   3,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-     15,   0,   0,   0,  68,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   3,   0, 
>-      0,   0,   1,   0,   0,   0, 
>-      3,   3,   0,   0,  83,  86, 
>-     95,  80,  79,  83,  73,  84, 
>-     73,  79,  78,   0,  84,  69, 
>-     88,  67,  79,  79,  82,  68, 
>-      0, 171, 171, 171,  79,  83, 
>-     71,  78,  44,   0,   0,   0, 
>-      1,   0,   0,   0,   8,   0, 
>-      0,   0,  32,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   1,   0,   0,   0, 
>-      0,   0,   0,   0,  15,   0, 
>-      0,   0,  83,  86,  95,  84, 
>-     65,  82,  71,  69,  84,   0, 
>-    171, 171,  83,  72,  68,  82, 
>-    216,   0,   0,   0,  64,   0, 
>-      0,   0,  54,   0,   0,   0, 
>-     88,  24,   0,   4,   0, 112, 
>-     16,   0,   0,   0,   0,   0, 
>-     68,  68,   0,   0,  98,  16, 
>-      0,   3,  50,  16,  16,   0, 
>-      1,   0,   0,   0, 101,   0, 
>-      0,   3, 242,  32,  16,   0, 
>-      0,   0,   0,   0, 104,   0, 
>-      0,   2,   1,   0,   0,   0, 
>-     61,  16,   0,   7, 242,   0, 
>-     16,   0,   0,   0,   0,   0, 
>-      1,  64,   0,   0,   0,   0, 
>-      0,   0,  70, 126,  16,   0, 
>-      0,   0,   0,   0,  86,   0, 
>-      0,   5,  50,   0,  16,   0, 
>-      0,   0,   0,   0,  70,   0, 
>-     16,   0,   0,   0,   0,   0, 
>-     56,   0,   0,   7,  50,   0, 
>-     16,   0,   0,   0,   0,   0, 
>-     70,   0,  16,   0,   0,   0, 
>-      0,   0,  70,  16,  16,   0, 
>-      1,   0,   0,   0,  27,   0, 
>-      0,   5,  50,   0,  16,   0, 
>-      0,   0,   0,   0,  70,   0, 
>-     16,   0,   0,   0,   0,   0, 
>-     54,   0,   0,   8, 194,   0, 
>-     16,   0,   0,   0,   0,   0, 
>-      2,  64,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,  45,   0,   0,   7, 
>-    242,  32,  16,   0,   0,   0, 
>-      0,   0,  70,  14,  16,   0, 
>-      0,   0,   0,   0,  70, 126, 
>-     16,   0,   0,   0,   0,   0, 
>-     62,   0,   0,   1,  83,  84, 
>-     65,  84, 116,   0,   0,   0, 
>-      7,   0,   0,   0,   1,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      2,   0,   0,   0,   1,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   1,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      1,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   1,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      2,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0
>-};
>+const BYTE g_PS_PassthroughRGBA2DUI[] = {
>+    68,  88,  66,  67,  159, 192, 164, 129, 44,  28,  150, 201, 25,  200, 72,  168, 76,  37,  93,
>+    246, 1,   0,   0,   0,   156, 2,   0,   0,   5,   0,   0,   0,   52,  0,   0,   0,   180, 0,
>+    0,   0,   12,  1,   0,   0,   64,  1,   0,   0,   32,  2,   0,   0,   82,  68,  69,  70,  120,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   28,  0,   0,   0,
>+    0,   4,   255, 255, 0,   1,   0,   0,   70,  0,   0,   0,   60,  0,   0,   0,   2,   0,   0,
>+    0,   4,   0,   0,   0,   4,   0,   0,   0,   255, 255, 255, 255, 0,   0,   0,   0,   1,   0,
>+    0,   0,   13,  0,   0,   0,   84,  101, 120, 116, 117, 114, 101, 85,  73,  0,   77,  105, 99,
>+    114, 111, 115, 111, 102, 116, 32,  40,  82,  41,  32,  72,  76,  83,  76,  32,  83,  104, 97,
>+    100, 101, 114, 32,  67,  111, 109, 112, 105, 108, 101, 114, 32,  57,  46,  50,  57,  46,  57,
>+    53,  50,  46,  51,  49,  49,  49,  0,   171, 73,  83,  71,  78,  80,  0,   0,   0,   2,   0,
>+    0,   0,   8,   0,   0,   0,   56,  0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   3,
>+    0,   0,   0,   0,   0,   0,   0,   15,  0,   0,   0,   68,  0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   3,   0,   0,   0,   1,   0,   0,   0,   3,   3,   0,   0,   83,  86,  95,
>+    80,  79,  83,  73,  84,  73,  79,  78,  0,   84,  69,  88,  67,  79,  79,  82,  68,  0,   171,
>+    171, 171, 79,  83,  71,  78,  44,  0,   0,   0,   1,   0,   0,   0,   8,   0,   0,   0,   32,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,
>+    15,  0,   0,   0,   83,  86,  95,  84,  65,  82,  71,  69,  84,  0,   171, 171, 83,  72,  68,
>+    82,  216, 0,   0,   0,   64,  0,   0,   0,   54,  0,   0,   0,   88,  24,  0,   4,   0,   112,
>+    16,  0,   0,   0,   0,   0,   68,  68,  0,   0,   98,  16,  0,   3,   50,  16,  16,  0,   1,
>+    0,   0,   0,   101, 0,   0,   3,   242, 32,  16,  0,   0,   0,   0,   0,   104, 0,   0,   2,
>+    1,   0,   0,   0,   61,  16,  0,   7,   242, 0,   16,  0,   0,   0,   0,   0,   1,   64,  0,
>+    0,   0,   0,   0,   0,   70,  126, 16,  0,   0,   0,   0,   0,   86,  0,   0,   5,   50,  0,
>+    16,  0,   0,   0,   0,   0,   70,  0,   16,  0,   0,   0,   0,   0,   56,  0,   0,   7,   50,
>+    0,   16,  0,   0,   0,   0,   0,   70,  0,   16,  0,   0,   0,   0,   0,   70,  16,  16,  0,
>+    1,   0,   0,   0,   27,  0,   0,   5,   50,  0,   16,  0,   0,   0,   0,   0,   70,  0,   16,
>+    0,   0,   0,   0,   0,   54,  0,   0,   8,   194, 0,   16,  0,   0,   0,   0,   0,   2,   64,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   45,
>+    0,   0,   7,   242, 32,  16,  0,   0,   0,   0,   0,   70,  14,  16,  0,   0,   0,   0,   0,
>+    70,  126, 16,  0,   0,   0,   0,   0,   62,  0,   0,   1,   83,  84,  65,  84,  116, 0,   0,
>+    0,   7,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   2,   0,   0,   0,   1,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   1,   0,   0,   0,   0,   0,   0,   0,   2,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0};
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgba3d11ps.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgba3d11ps.h
>index ac4cbeae9fa..851787a50c5 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgba3d11ps.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgba3d11ps.h
>@@ -1,6 +1,10 @@
> #if 0
> //
>-// Generated by Microsoft (R) HLSL Shader Compiler 6.3.9600.16384
>+// Generated by Microsoft (R) HLSL Shader Compiler 9.29.952.3111
>+//
>+//
>+//   fxc /nologo /E PS_PassthroughRGBA3D /T ps_4_0 /Fh
>+//    compiled\passthroughrgba3d11ps.h Passthrough3D11.hlsl
> //
> //
> // Resource Bindings:
>@@ -14,18 +18,18 @@
> //
> // Input signature:
> //
>-// Name                 Index   Mask Register SysValue  Format   Used
>-// -------------------- ----- ------ -------- -------- ------- ------
>-// SV_POSITION              0   xyzw        0      POS   float       
>-// SV_RENDERTARGETARRAYINDEX     0   x           1  RTINDEX    uint       
>-// TEXCOORD                 0   xyz         2     NONE   float   xyz 
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_POSITION              0   xyzw        0      POS  float       
>+// SV_RENDERTARGETARRAYINDEX     0   x           1  RTINDEX   uint       
>+// TEXCOORD                 0   xyz         2     NONE  float   xyz 
> //
> //
> // Output signature:
> //
>-// Name                 Index   Mask Register SysValue  Format   Used
>-// -------------------- ----- ------ -------- -------- ------- ------
>-// SV_TARGET                0   xyzw        0   TARGET   float   xyzw
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_TARGET                0   xyzw        0   TARGET  float   xyzw
> //
> ps_4_0
> dcl_sampler s0, mode_default
>@@ -37,113 +41,38 @@ ret
> // Approximately 2 instruction slots used
> #endif
> 
>-const BYTE g_PS_PassthroughRGBA3D[] =
>-{
>-     68,  88,  66,  67, 246,  41, 
>-     15, 240, 168, 172,  91, 145, 
>-    236, 221, 187,  89,  12,   0, 
>-     93, 149,   1,   0,   0,   0, 
>-    128,   2,   0,   0,   5,   0, 
>-      0,   0,  52,   0,   0,   0, 
>-    220,   0,   0,   0, 100,   1, 
>-      0,   0, 152,   1,   0,   0, 
>-      4,   2,   0,   0,  82,  68, 
>-     69,  70, 160,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   2,   0,   0,   0, 
>-     28,   0,   0,   0,   0,   4, 
>-    255, 255,   0,   1,   0,   0, 
>-    109,   0,   0,   0,  92,   0, 
>-      0,   0,   3,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   1,   0, 
>-      0,   0,   1,   0,   0,   0, 
>-    100,   0,   0,   0,   2,   0, 
>-      0,   0,   5,   0,   0,   0, 
>-      8,   0,   0,   0, 255, 255, 
>-    255, 255,   0,   0,   0,   0, 
>-      1,   0,   0,   0,  13,   0, 
>-      0,   0,  83,  97, 109, 112, 
>-    108, 101, 114,   0,  84, 101, 
>-    120, 116, 117, 114, 101,  70, 
>-      0,  77, 105,  99, 114, 111, 
>-    115, 111, 102, 116,  32,  40, 
>-     82,  41,  32,  72,  76,  83, 
>-     76,  32,  83, 104,  97, 100, 
>-    101, 114,  32,  67, 111, 109, 
>-    112, 105, 108, 101, 114,  32, 
>-     54,  46,  51,  46,  57,  54, 
>-     48,  48,  46,  49,  54,  51, 
>-     56,  52,   0, 171,  73,  83, 
>-     71,  78, 128,   0,   0,   0, 
>-      3,   0,   0,   0,   8,   0, 
>-      0,   0,  80,   0,   0,   0, 
>-      0,   0,   0,   0,   1,   0, 
>-      0,   0,   3,   0,   0,   0, 
>-      0,   0,   0,   0,  15,   0, 
>-      0,   0,  92,   0,   0,   0, 
>-      0,   0,   0,   0,   4,   0, 
>-      0,   0,   1,   0,   0,   0, 
>-      1,   0,   0,   0,   1,   0, 
>-      0,   0, 118,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   3,   0,   0,   0, 
>-      2,   0,   0,   0,   7,   7, 
>-      0,   0,  83,  86,  95,  80, 
>-     79,  83,  73,  84,  73,  79, 
>-     78,   0,  83,  86,  95,  82, 
>-     69,  78,  68,  69,  82,  84, 
>-     65,  82,  71,  69,  84,  65, 
>-     82,  82,  65,  89,  73,  78, 
>-     68,  69,  88,   0,  84,  69, 
>-     88,  67,  79,  79,  82,  68, 
>-      0, 171,  79,  83,  71,  78, 
>-     44,   0,   0,   0,   1,   0, 
>-      0,   0,   8,   0,   0,   0, 
>-     32,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      3,   0,   0,   0,   0,   0, 
>-      0,   0,  15,   0,   0,   0, 
>-     83,  86,  95,  84,  65,  82, 
>-     71,  69,  84,   0, 171, 171, 
>-     83,  72,  68,  82, 100,   0, 
>-      0,   0,  64,   0,   0,   0, 
>-     25,   0,   0,   0,  90,   0, 
>-      0,   3,   0,  96,  16,   0, 
>-      0,   0,   0,   0,  88,  40, 
>-      0,   4,   0, 112,  16,   0, 
>-      0,   0,   0,   0,  85,  85, 
>-      0,   0,  98,  16,   0,   3, 
>-    114,  16,  16,   0,   2,   0, 
>-      0,   0, 101,   0,   0,   3, 
>-    242,  32,  16,   0,   0,   0, 
>-      0,   0,  69,   0,   0,   9, 
>-    242,  32,  16,   0,   0,   0, 
>-      0,   0,  70,  18,  16,   0, 
>-      2,   0,   0,   0,  70, 126, 
>-     16,   0,   0,   0,   0,   0, 
>-      0,  96,  16,   0,   0,   0, 
>-      0,   0,  62,   0,   0,   1, 
>-     83,  84,  65,  84, 116,   0, 
>-      0,   0,   2,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   2,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      1,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   1,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0
>-};
>+const BYTE g_PS_PassthroughRGBA3D[] = {
>+    68,  88,  66,  67,  249, 218, 187, 23,  150, 61,  9,   105, 122, 199, 110, 26,  29, 97,  207,
>+    112, 1,   0,   0,   0,   128, 2,   0,   0,   5,   0,   0,   0,   52,  0,   0,   0,  220, 0,
>+    0,   0,   100, 1,   0,   0,   152, 1,   0,   0,   4,   2,   0,   0,   82,  68,  69, 70,  160,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   2,   0,   0,   0,   28,  0,  0,   0,
>+    0,   4,   255, 255, 0,   1,   0,   0,   109, 0,   0,   0,   92,  0,   0,   0,   3,  0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,  1,   0,
>+    0,   0,   1,   0,   0,   0,   100, 0,   0,   0,   2,   0,   0,   0,   5,   0,   0,  0,   8,
>+    0,   0,   0,   255, 255, 255, 255, 0,   0,   0,   0,   1,   0,   0,   0,   13,  0,  0,   0,
>+    83,  97,  109, 112, 108, 101, 114, 0,   84,  101, 120, 116, 117, 114, 101, 70,  0,  77,  105,
>+    99,  114, 111, 115, 111, 102, 116, 32,  40,  82,  41,  32,  72,  76,  83,  76,  32, 83,  104,
>+    97,  100, 101, 114, 32,  67,  111, 109, 112, 105, 108, 101, 114, 32,  57,  46,  50, 57,  46,
>+    57,  53,  50,  46,  51,  49,  49,  49,  0,   171, 171, 73,  83,  71,  78,  128, 0,  0,   0,
>+    3,   0,   0,   0,   8,   0,   0,   0,   80,  0,   0,   0,   0,   0,   0,   0,   1,  0,   0,
>+    0,   3,   0,   0,   0,   0,   0,   0,   0,   15,  0,   0,   0,   92,  0,   0,   0,  0,   0,
>+    0,   0,   4,   0,   0,   0,   1,   0,   0,   0,   1,   0,   0,   0,   1,   0,   0,  0,   118,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   3,   0,   0,   0,   2,   0,  0,   0,
>+    7,   7,   0,   0,   83,  86,  95,  80,  79,  83,  73,  84,  73,  79,  78,  0,   83, 86,  95,
>+    82,  69,  78,  68,  69,  82,  84,  65,  82,  71,  69,  84,  65,  82,  82,  65,  89, 73,  78,
>+    68,  69,  88,  0,   84,  69,  88,  67,  79,  79,  82,  68,  0,   171, 79,  83,  71, 78,  44,
>+    0,   0,   0,   1,   0,   0,   0,   8,   0,   0,   0,   32,  0,   0,   0,   0,   0,  0,   0,
>+    0,   0,   0,   0,   3,   0,   0,   0,   0,   0,   0,   0,   15,  0,   0,   0,   83, 86,  95,
>+    84,  65,  82,  71,  69,  84,  0,   171, 171, 83,  72,  68,  82,  100, 0,   0,   0,  64,  0,
>+    0,   0,   25,  0,   0,   0,   90,  0,   0,   3,   0,   96,  16,  0,   0,   0,   0,  0,   88,
>+    40,  0,   4,   0,   112, 16,  0,   0,   0,   0,   0,   85,  85,  0,   0,   98,  16, 0,   3,
>+    114, 16,  16,  0,   2,   0,   0,   0,   101, 0,   0,   3,   242, 32,  16,  0,   0,  0,   0,
>+    0,   69,  0,   0,   9,   242, 32,  16,  0,   0,   0,   0,   0,   70,  18,  16,  0,  2,   0,
>+    0,   0,   70,  126, 16,  0,   0,   0,   0,   0,   0,   96,  16,  0,   0,   0,   0,  0,   62,
>+    0,   0,   1,   83,  84,  65,  84,  116, 0,   0,   0,   2,   0,   0,   0,   0,   0,  0,   0,
>+    0,   0,   0,   0,   2,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,  0,   0,
>+    0,   1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,  0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,  0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,  0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,  0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0};
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgba3d_4444_11ps.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgba3d_4444_11ps.h
>new file mode 100644
>index 00000000000..a19ab8f46bd
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgba3d_4444_11ps.h
>@@ -0,0 +1,88 @@
>+#if 0
>+//
>+// Generated by Microsoft (R) HLSL Shader Compiler 9.29.952.3111
>+//
>+//
>+//   fxc /nologo /E PS_PassthroughRGBA3D_4444 /T ps_4_0 /Fh
>+//    compiled\passthroughrgba3d_4444_11ps.h Passthrough3D11.hlsl
>+//
>+//
>+// Resource Bindings:
>+//
>+// Name                                 Type  Format         Dim Slot Elements
>+// ------------------------------ ---------- ------- ----------- ---- --------
>+// Sampler                           sampler      NA          NA    0        1
>+// TextureF                          texture  float4          3d    0        1
>+//
>+//
>+//
>+// Input signature:
>+//
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_POSITION              0   xyzw        0      POS  float       
>+// SV_RENDERTARGETARRAYINDEX     0   x           1  RTINDEX   uint       
>+// TEXCOORD                 0   xyz         2     NONE  float   xyz 
>+//
>+//
>+// Output signature:
>+//
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_TARGET                0   xyzw        0   TARGET  float   xyzw
>+//
>+ps_4_0
>+dcl_sampler s0, mode_default
>+dcl_resource_texture3d (float,float,float,float) t0
>+dcl_input_ps linear v2.xyz
>+dcl_output o0.xyzw
>+dcl_temps 1
>+sample r0.xyzw, v2.xyzx, t0.xyzw, s0
>+mul r0.xyzw, r0.xyzw, l(15.000000, 15.000000, 15.000000, 15.000000)
>+round_ne r0.xyzw, r0.xyzw
>+mul o0.xyzw, r0.xyzw, l(0.066667, 0.066667, 0.066667, 0.066667)
>+ret 
>+// Approximately 5 instruction slots used
>+#endif
>+
>+const BYTE g_PS_PassthroughRGBA3D_4444[] = {
>+    68,  88,  66,  67,  34,  122, 167, 6,   161, 200, 45,  27,  155, 205, 20,  94,  188, 182, 46,
>+    114, 1,   0,   0,   0,   236, 2,   0,   0,   5,   0,   0,   0,   52,  0,   0,   0,   220, 0,
>+    0,   0,   100, 1,   0,   0,   152, 1,   0,   0,   112, 2,   0,   0,   82,  68,  69,  70,  160,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   2,   0,   0,   0,   28,  0,   0,   0,
>+    0,   4,   255, 255, 0,   1,   0,   0,   109, 0,   0,   0,   92,  0,   0,   0,   3,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,
>+    0,   0,   1,   0,   0,   0,   100, 0,   0,   0,   2,   0,   0,   0,   5,   0,   0,   0,   8,
>+    0,   0,   0,   255, 255, 255, 255, 0,   0,   0,   0,   1,   0,   0,   0,   13,  0,   0,   0,
>+    83,  97,  109, 112, 108, 101, 114, 0,   84,  101, 120, 116, 117, 114, 101, 70,  0,   77,  105,
>+    99,  114, 111, 115, 111, 102, 116, 32,  40,  82,  41,  32,  72,  76,  83,  76,  32,  83,  104,
>+    97,  100, 101, 114, 32,  67,  111, 109, 112, 105, 108, 101, 114, 32,  57,  46,  50,  57,  46,
>+    57,  53,  50,  46,  51,  49,  49,  49,  0,   171, 171, 73,  83,  71,  78,  128, 0,   0,   0,
>+    3,   0,   0,   0,   8,   0,   0,   0,   80,  0,   0,   0,   0,   0,   0,   0,   1,   0,   0,
>+    0,   3,   0,   0,   0,   0,   0,   0,   0,   15,  0,   0,   0,   92,  0,   0,   0,   0,   0,
>+    0,   0,   4,   0,   0,   0,   1,   0,   0,   0,   1,   0,   0,   0,   1,   0,   0,   0,   118,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   3,   0,   0,   0,   2,   0,   0,   0,
>+    7,   7,   0,   0,   83,  86,  95,  80,  79,  83,  73,  84,  73,  79,  78,  0,   83,  86,  95,
>+    82,  69,  78,  68,  69,  82,  84,  65,  82,  71,  69,  84,  65,  82,  82,  65,  89,  73,  78,
>+    68,  69,  88,  0,   84,  69,  88,  67,  79,  79,  82,  68,  0,   171, 79,  83,  71,  78,  44,
>+    0,   0,   0,   1,   0,   0,   0,   8,   0,   0,   0,   32,  0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   3,   0,   0,   0,   0,   0,   0,   0,   15,  0,   0,   0,   83,  86,  95,
>+    84,  65,  82,  71,  69,  84,  0,   171, 171, 83,  72,  68,  82,  208, 0,   0,   0,   64,  0,
>+    0,   0,   52,  0,   0,   0,   90,  0,   0,   3,   0,   96,  16,  0,   0,   0,   0,   0,   88,
>+    40,  0,   4,   0,   112, 16,  0,   0,   0,   0,   0,   85,  85,  0,   0,   98,  16,  0,   3,
>+    114, 16,  16,  0,   2,   0,   0,   0,   101, 0,   0,   3,   242, 32,  16,  0,   0,   0,   0,
>+    0,   104, 0,   0,   2,   1,   0,   0,   0,   69,  0,   0,   9,   242, 0,   16,  0,   0,   0,
>+    0,   0,   70,  18,  16,  0,   2,   0,   0,   0,   70,  126, 16,  0,   0,   0,   0,   0,   0,
>+    96,  16,  0,   0,   0,   0,   0,   56,  0,   0,   10,  242, 0,   16,  0,   0,   0,   0,   0,
>+    70,  14,  16,  0,   0,   0,   0,   0,   2,   64,  0,   0,   0,   0,   112, 65,  0,   0,   112,
>+    65,  0,   0,   112, 65,  0,   0,   112, 65,  64,  0,   0,   5,   242, 0,   16,  0,   0,   0,
>+    0,   0,   70,  14,  16,  0,   0,   0,   0,   0,   56,  0,   0,   10,  242, 32,  16,  0,   0,
>+    0,   0,   0,   70,  14,  16,  0,   0,   0,   0,   0,   2,   64,  0,   0,   137, 136, 136, 61,
>+    137, 136, 136, 61,  137, 136, 136, 61,  137, 136, 136, 61,  62,  0,   0,   1,   83,  84,  65,
>+    84,  116, 0,   0,   0,   5,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   2,   0,
>+    0,   0,   3,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0};
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgba3d_5551_11ps.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgba3d_5551_11ps.h
>new file mode 100644
>index 00000000000..b048b5749e5
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgba3d_5551_11ps.h
>@@ -0,0 +1,88 @@
>+#if 0
>+//
>+// Generated by Microsoft (R) HLSL Shader Compiler 9.29.952.3111
>+//
>+//
>+//   fxc /nologo /E PS_PassthroughRGBA3D_5551 /T ps_4_0 /Fh
>+//    compiled\passthroughrgba3d_5551_11ps.h Passthrough3D11.hlsl
>+//
>+//
>+// Resource Bindings:
>+//
>+// Name                                 Type  Format         Dim Slot Elements
>+// ------------------------------ ---------- ------- ----------- ---- --------
>+// Sampler                           sampler      NA          NA    0        1
>+// TextureF                          texture  float4          3d    0        1
>+//
>+//
>+//
>+// Input signature:
>+//
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_POSITION              0   xyzw        0      POS  float       
>+// SV_RENDERTARGETARRAYINDEX     0   x           1  RTINDEX   uint       
>+// TEXCOORD                 0   xyz         2     NONE  float   xyz 
>+//
>+//
>+// Output signature:
>+//
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_TARGET                0   xyzw        0   TARGET  float   xyzw
>+//
>+ps_4_0
>+dcl_sampler s0, mode_default
>+dcl_resource_texture3d (float,float,float,float) t0
>+dcl_input_ps linear v2.xyz
>+dcl_output o0.xyzw
>+dcl_temps 1
>+sample r0.xyzw, v2.xyzx, t0.xyzw, s0
>+mul r0.xyzw, r0.xyzw, l(31.000000, 31.000000, 31.000000, 1.000000)
>+round_ne r0.xyzw, r0.xyzw
>+mul o0.xyzw, r0.xyzw, l(0.032258, 0.032258, 0.032258, 1.000000)
>+ret 
>+// Approximately 5 instruction slots used
>+#endif
>+
>+const BYTE g_PS_PassthroughRGBA3D_5551[] = {
>+    68,  88,  66,  67,  145, 96,  104, 51,  195, 218, 236, 165, 55,  186, 12,  206, 155, 10,  90,
>+    25,  1,   0,   0,   0,   236, 2,   0,   0,   5,   0,   0,   0,   52,  0,   0,   0,   220, 0,
>+    0,   0,   100, 1,   0,   0,   152, 1,   0,   0,   112, 2,   0,   0,   82,  68,  69,  70,  160,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   2,   0,   0,   0,   28,  0,   0,   0,
>+    0,   4,   255, 255, 0,   1,   0,   0,   109, 0,   0,   0,   92,  0,   0,   0,   3,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,
>+    0,   0,   1,   0,   0,   0,   100, 0,   0,   0,   2,   0,   0,   0,   5,   0,   0,   0,   8,
>+    0,   0,   0,   255, 255, 255, 255, 0,   0,   0,   0,   1,   0,   0,   0,   13,  0,   0,   0,
>+    83,  97,  109, 112, 108, 101, 114, 0,   84,  101, 120, 116, 117, 114, 101, 70,  0,   77,  105,
>+    99,  114, 111, 115, 111, 102, 116, 32,  40,  82,  41,  32,  72,  76,  83,  76,  32,  83,  104,
>+    97,  100, 101, 114, 32,  67,  111, 109, 112, 105, 108, 101, 114, 32,  57,  46,  50,  57,  46,
>+    57,  53,  50,  46,  51,  49,  49,  49,  0,   171, 171, 73,  83,  71,  78,  128, 0,   0,   0,
>+    3,   0,   0,   0,   8,   0,   0,   0,   80,  0,   0,   0,   0,   0,   0,   0,   1,   0,   0,
>+    0,   3,   0,   0,   0,   0,   0,   0,   0,   15,  0,   0,   0,   92,  0,   0,   0,   0,   0,
>+    0,   0,   4,   0,   0,   0,   1,   0,   0,   0,   1,   0,   0,   0,   1,   0,   0,   0,   118,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   3,   0,   0,   0,   2,   0,   0,   0,
>+    7,   7,   0,   0,   83,  86,  95,  80,  79,  83,  73,  84,  73,  79,  78,  0,   83,  86,  95,
>+    82,  69,  78,  68,  69,  82,  84,  65,  82,  71,  69,  84,  65,  82,  82,  65,  89,  73,  78,
>+    68,  69,  88,  0,   84,  69,  88,  67,  79,  79,  82,  68,  0,   171, 79,  83,  71,  78,  44,
>+    0,   0,   0,   1,   0,   0,   0,   8,   0,   0,   0,   32,  0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   3,   0,   0,   0,   0,   0,   0,   0,   15,  0,   0,   0,   83,  86,  95,
>+    84,  65,  82,  71,  69,  84,  0,   171, 171, 83,  72,  68,  82,  208, 0,   0,   0,   64,  0,
>+    0,   0,   52,  0,   0,   0,   90,  0,   0,   3,   0,   96,  16,  0,   0,   0,   0,   0,   88,
>+    40,  0,   4,   0,   112, 16,  0,   0,   0,   0,   0,   85,  85,  0,   0,   98,  16,  0,   3,
>+    114, 16,  16,  0,   2,   0,   0,   0,   101, 0,   0,   3,   242, 32,  16,  0,   0,   0,   0,
>+    0,   104, 0,   0,   2,   1,   0,   0,   0,   69,  0,   0,   9,   242, 0,   16,  0,   0,   0,
>+    0,   0,   70,  18,  16,  0,   2,   0,   0,   0,   70,  126, 16,  0,   0,   0,   0,   0,   0,
>+    96,  16,  0,   0,   0,   0,   0,   56,  0,   0,   10,  242, 0,   16,  0,   0,   0,   0,   0,
>+    70,  14,  16,  0,   0,   0,   0,   0,   2,   64,  0,   0,   0,   0,   248, 65,  0,   0,   248,
>+    65,  0,   0,   248, 65,  0,   0,   128, 63,  64,  0,   0,   5,   242, 0,   16,  0,   0,   0,
>+    0,   0,   70,  14,  16,  0,   0,   0,   0,   0,   56,  0,   0,   10,  242, 32,  16,  0,   0,
>+    0,   0,   0,   70,  14,  16,  0,   0,   0,   0,   0,   2,   64,  0,   0,   8,   33,  4,   61,
>+    8,   33,  4,   61,  8,   33,  4,   61,  0,   0,   128, 63,  62,  0,   0,   1,   83,  84,  65,
>+    84,  116, 0,   0,   0,   5,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   2,   0,
>+    0,   0,   3,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0};
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgba3di11ps.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgba3di11ps.h
>index 1921c9f20bf..58fb3e9a209 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgba3di11ps.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgba3di11ps.h
>@@ -1,6 +1,10 @@
> #if 0
> //
>-// Generated by Microsoft (R) HLSL Shader Compiler 6.3.9600.16384
>+// Generated by Microsoft (R) HLSL Shader Compiler 9.29.952.3111
>+//
>+//
>+//   fxc /nologo /E PS_PassthroughRGBA3DI /T ps_4_0 /Fh
>+//    compiled\passthroughrgba3di11ps.h Passthrough3D11.hlsl
> //
> //
> // Resource Bindings:
>@@ -13,18 +17,18 @@
> //
> // Input signature:
> //
>-// Name                 Index   Mask Register SysValue  Format   Used
>-// -------------------- ----- ------ -------- -------- ------- ------
>-// SV_POSITION              0   xyzw        0      POS   float       
>-// SV_RENDERTARGETARRAYINDEX     0   x           1  RTINDEX    uint       
>-// TEXCOORD                 0   xyz         2     NONE   float   xyz 
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_POSITION              0   xyzw        0      POS  float       
>+// SV_RENDERTARGETARRAYINDEX     0   x           1  RTINDEX   uint       
>+// TEXCOORD                 0   xyz         2     NONE  float   xyz 
> //
> //
> // Output signature:
> //
>-// Name                 Index   Mask Register SysValue  Format   Used
>-// -------------------- ----- ------ -------- -------- ------- ------
>-// SV_TARGET                0   xyzw        0   TARGET     int   xyzw
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_TARGET                0   xyzw        0   TARGET    int   xyzw
> //
> ps_4_0
> dcl_resource_texture3d (sint,sint,sint,sint) t0
>@@ -41,124 +45,42 @@ ret
> // Approximately 7 instruction slots used
> #endif
> 
>-const BYTE g_PS_PassthroughRGBA3DI[] =
>-{
>-     68,  88,  66,  67, 139, 158, 
>-      6, 251, 163, 134,   3, 183, 
>-      5, 227, 185, 108,  35,  91, 
>-     67, 191,   1,   0,   0,   0, 
>-    192,   2,   0,   0,   5,   0, 
>-      0,   0,  52,   0,   0,   0, 
>-    180,   0,   0,   0,  60,   1, 
>-      0,   0, 112,   1,   0,   0, 
>-     68,   2,   0,   0,  82,  68, 
>-     69,  70, 120,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   1,   0,   0,   0, 
>-     28,   0,   0,   0,   0,   4, 
>-    255, 255,   0,   1,   0,   0, 
>-     69,   0,   0,   0,  60,   0, 
>-      0,   0,   2,   0,   0,   0, 
>-      3,   0,   0,   0,   8,   0, 
>-      0,   0, 255, 255, 255, 255, 
>-      0,   0,   0,   0,   1,   0, 
>-      0,   0,  13,   0,   0,   0, 
>-     84, 101, 120, 116, 117, 114, 
>-    101,  73,   0,  77, 105,  99, 
>-    114, 111, 115, 111, 102, 116, 
>-     32,  40,  82,  41,  32,  72, 
>-     76,  83,  76,  32,  83, 104, 
>-     97, 100, 101, 114,  32,  67, 
>-    111, 109, 112, 105, 108, 101, 
>-    114,  32,  54,  46,  51,  46, 
>-     57,  54,  48,  48,  46,  49, 
>-     54,  51,  56,  52,   0, 171, 
>-     73,  83,  71,  78, 128,   0, 
>-      0,   0,   3,   0,   0,   0, 
>-      8,   0,   0,   0,  80,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      1,   0,   0,   0,   3,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-     15,   0,   0,   0,  92,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      4,   0,   0,   0,   1,   0, 
>-      0,   0,   1,   0,   0,   0, 
>-      1,   0,   0,   0, 118,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   3,   0, 
>-      0,   0,   2,   0,   0,   0, 
>-      7,   7,   0,   0,  83,  86, 
>-     95,  80,  79,  83,  73,  84, 
>-     73,  79,  78,   0,  83,  86, 
>-     95,  82,  69,  78,  68,  69, 
>-     82,  84,  65,  82,  71,  69, 
>-     84,  65,  82,  82,  65,  89, 
>-     73,  78,  68,  69,  88,   0, 
>-     84,  69,  88,  67,  79,  79, 
>-     82,  68,   0, 171,  79,  83, 
>-     71,  78,  44,   0,   0,   0, 
>-      1,   0,   0,   0,   8,   0, 
>-      0,   0,  32,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   2,   0,   0,   0, 
>-      0,   0,   0,   0,  15,   0, 
>-      0,   0,  83,  86,  95,  84, 
>-     65,  82,  71,  69,  84,   0, 
>-    171, 171,  83,  72,  68,  82, 
>-    204,   0,   0,   0,  64,   0, 
>-      0,   0,  51,   0,   0,   0, 
>-     88,  40,   0,   4,   0, 112, 
>-     16,   0,   0,   0,   0,   0, 
>-     51,  51,   0,   0,  98,  16, 
>-      0,   3, 114,  16,  16,   0, 
>-      2,   0,   0,   0, 101,   0, 
>-      0,   3, 242,  32,  16,   0, 
>-      0,   0,   0,   0, 104,   0, 
>-      0,   2,   1,   0,   0,   0, 
>-     61,  16,   0,   7, 242,   0, 
>-     16,   0,   0,   0,   0,   0, 
>-      1,  64,   0,   0,   0,   0, 
>-      0,   0,  70, 126,  16,   0, 
>-      0,   0,   0,   0,  86,   0, 
>-      0,   5, 114,   0,  16,   0, 
>-      0,   0,   0,   0,  70,   2, 
>-     16,   0,   0,   0,   0,   0, 
>-     56,   0,   0,   7, 114,   0, 
>-     16,   0,   0,   0,   0,   0, 
>-     70,   2,  16,   0,   0,   0, 
>-      0,   0,  70,  18,  16,   0, 
>-      2,   0,   0,   0,  27,   0, 
>-      0,   5, 114,   0,  16,   0, 
>-      0,   0,   0,   0,  70,   2, 
>-     16,   0,   0,   0,   0,   0, 
>-     54,   0,   0,   5, 130,   0, 
>-     16,   0,   0,   0,   0,   0, 
>-      1,  64,   0,   0,   0,   0, 
>-      0,   0,  45,   0,   0,   7, 
>-    242,  32,  16,   0,   0,   0, 
>-      0,   0,  70,  14,  16,   0, 
>-      0,   0,   0,   0,  70, 126, 
>-     16,   0,   0,   0,   0,   0, 
>-     62,   0,   0,   1,  83,  84, 
>-     65,  84, 116,   0,   0,   0, 
>-      7,   0,   0,   0,   1,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      2,   0,   0,   0,   1,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   1,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      1,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   1,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      2,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0
>-};
>+const BYTE g_PS_PassthroughRGBA3DI[] = {
>+    68,  88,  66,  67,  114, 209, 219, 121, 211, 105, 24,  83,  99,  59,  231, 76, 145, 78,  142,
>+    39,  1,   0,   0,   0,   192, 2,   0,   0,   5,   0,   0,   0,   52,  0,   0,  0,   180, 0,
>+    0,   0,   60,  1,   0,   0,   112, 1,   0,   0,   68,  2,   0,   0,   82,  68, 69,  70,  120,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   28, 0,   0,   0,
>+    0,   4,   255, 255, 0,   1,   0,   0,   69,  0,   0,   0,   60,  0,   0,   0,  2,   0,   0,
>+    0,   3,   0,   0,   0,   8,   0,   0,   0,   255, 255, 255, 255, 0,   0,   0,  0,   1,   0,
>+    0,   0,   13,  0,   0,   0,   84,  101, 120, 116, 117, 114, 101, 73,  0,   77, 105, 99,  114,
>+    111, 115, 111, 102, 116, 32,  40,  82,  41,  32,  72,  76,  83,  76,  32,  83, 104, 97,  100,
>+    101, 114, 32,  67,  111, 109, 112, 105, 108, 101, 114, 32,  57,  46,  50,  57, 46,  57,  53,
>+    50,  46,  51,  49,  49,  49,  0,   171, 171, 73,  83,  71,  78,  128, 0,   0,  0,   3,   0,
>+    0,   0,   8,   0,   0,   0,   80,  0,   0,   0,   0,   0,   0,   0,   1,   0,  0,   0,   3,
>+    0,   0,   0,   0,   0,   0,   0,   15,  0,   0,   0,   92,  0,   0,   0,   0,  0,   0,   0,
>+    4,   0,   0,   0,   1,   0,   0,   0,   1,   0,   0,   0,   1,   0,   0,   0,  118, 0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   3,   0,   0,   0,   2,   0,   0,  0,   7,   7,
>+    0,   0,   83,  86,  95,  80,  79,  83,  73,  84,  73,  79,  78,  0,   83,  86, 95,  82,  69,
>+    78,  68,  69,  82,  84,  65,  82,  71,  69,  84,  65,  82,  82,  65,  89,  73, 78,  68,  69,
>+    88,  0,   84,  69,  88,  67,  79,  79,  82,  68,  0,   171, 79,  83,  71,  78, 44,  0,   0,
>+    0,   1,   0,   0,   0,   8,   0,   0,   0,   32,  0,   0,   0,   0,   0,   0,  0,   0,   0,
>+    0,   0,   2,   0,   0,   0,   0,   0,   0,   0,   15,  0,   0,   0,   83,  86, 95,  84,  65,
>+    82,  71,  69,  84,  0,   171, 171, 83,  72,  68,  82,  204, 0,   0,   0,   64, 0,   0,   0,
>+    51,  0,   0,   0,   88,  40,  0,   4,   0,   112, 16,  0,   0,   0,   0,   0,  51,  51,  0,
>+    0,   98,  16,  0,   3,   114, 16,  16,  0,   2,   0,   0,   0,   101, 0,   0,  3,   242, 32,
>+    16,  0,   0,   0,   0,   0,   104, 0,   0,   2,   1,   0,   0,   0,   61,  16, 0,   7,   242,
>+    0,   16,  0,   0,   0,   0,   0,   1,   64,  0,   0,   0,   0,   0,   0,   70, 126, 16,  0,
>+    0,   0,   0,   0,   86,  0,   0,   5,   114, 0,   16,  0,   0,   0,   0,   0,  70,  2,   16,
>+    0,   0,   0,   0,   0,   56,  0,   0,   7,   114, 0,   16,  0,   0,   0,   0,  0,   70,  2,
>+    16,  0,   0,   0,   0,   0,   70,  18,  16,  0,   2,   0,   0,   0,   27,  0,  0,   5,   114,
>+    0,   16,  0,   0,   0,   0,   0,   70,  2,   16,  0,   0,   0,   0,   0,   54, 0,   0,   5,
>+    130, 0,   16,  0,   0,   0,   0,   0,   1,   64,  0,   0,   0,   0,   0,   0,  45,  0,   0,
>+    7,   242, 32,  16,  0,   0,   0,   0,   0,   70,  14,  16,  0,   0,   0,   0,  0,   70,  126,
>+    16,  0,   0,   0,   0,   0,   62,  0,   0,   1,   83,  84,  65,  84,  116, 0,  0,   0,   7,
>+    0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   2,   0,   0,   0,   1,  0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,  0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,  0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,  0,   0,   1,
>+    0,   0,   0,   0,   0,   0,   0,   2,   0,   0,   0,   0,   0,   0,   0,   0,  0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,  0,   0,   0,
>+    0};
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgba3dui11ps.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgba3dui11ps.h
>index cba1502da1b..022bb69040f 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgba3dui11ps.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgba3dui11ps.h
>@@ -1,6 +1,10 @@
> #if 0
> //
>-// Generated by Microsoft (R) HLSL Shader Compiler 6.3.9600.16384
>+// Generated by Microsoft (R) HLSL Shader Compiler 9.29.952.3111
>+//
>+//
>+//   fxc /nologo /E PS_PassthroughRGBA3DUI /T ps_4_0 /Fh
>+//    compiled\passthroughrgba3dui11ps.h Passthrough3D11.hlsl
> //
> //
> // Resource Bindings:
>@@ -13,18 +17,18 @@
> //
> // Input signature:
> //
>-// Name                 Index   Mask Register SysValue  Format   Used
>-// -------------------- ----- ------ -------- -------- ------- ------
>-// SV_POSITION              0   xyzw        0      POS   float       
>-// SV_RENDERTARGETARRAYINDEX     0   x           1  RTINDEX    uint       
>-// TEXCOORD                 0   xyz         2     NONE   float   xyz 
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_POSITION              0   xyzw        0      POS  float       
>+// SV_RENDERTARGETARRAYINDEX     0   x           1  RTINDEX   uint       
>+// TEXCOORD                 0   xyz         2     NONE  float   xyz 
> //
> //
> // Output signature:
> //
>-// Name                 Index   Mask Register SysValue  Format   Used
>-// -------------------- ----- ------ -------- -------- ------- ------
>-// SV_TARGET                0   xyzw        0   TARGET    uint   xyzw
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_TARGET                0   xyzw        0   TARGET   uint   xyzw
> //
> ps_4_0
> dcl_resource_texture3d (uint,uint,uint,uint) t0
>@@ -41,124 +45,42 @@ ret
> // Approximately 7 instruction slots used
> #endif
> 
>-const BYTE g_PS_PassthroughRGBA3DUI[] =
>-{
>-     68,  88,  66,  67,  16, 111, 
>-     56, 218, 148, 233, 100, 164, 
>-      0, 199,  73, 155, 213, 171, 
>-     78,  18,   1,   0,   0,   0, 
>-    192,   2,   0,   0,   5,   0, 
>-      0,   0,  52,   0,   0,   0, 
>-    180,   0,   0,   0,  60,   1, 
>-      0,   0, 112,   1,   0,   0, 
>-     68,   2,   0,   0,  82,  68, 
>-     69,  70, 120,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   1,   0,   0,   0, 
>-     28,   0,   0,   0,   0,   4, 
>-    255, 255,   0,   1,   0,   0, 
>-     70,   0,   0,   0,  60,   0, 
>-      0,   0,   2,   0,   0,   0, 
>-      4,   0,   0,   0,   8,   0, 
>-      0,   0, 255, 255, 255, 255, 
>-      0,   0,   0,   0,   1,   0, 
>-      0,   0,  13,   0,   0,   0, 
>-     84, 101, 120, 116, 117, 114, 
>-    101,  85,  73,   0,  77, 105, 
>-     99, 114, 111, 115, 111, 102, 
>-    116,  32,  40,  82,  41,  32, 
>-     72,  76,  83,  76,  32,  83, 
>-    104,  97, 100, 101, 114,  32, 
>-     67, 111, 109, 112, 105, 108, 
>-    101, 114,  32,  54,  46,  51, 
>-     46,  57,  54,  48,  48,  46, 
>-     49,  54,  51,  56,  52,   0, 
>-     73,  83,  71,  78, 128,   0, 
>-      0,   0,   3,   0,   0,   0, 
>-      8,   0,   0,   0,  80,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      1,   0,   0,   0,   3,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-     15,   0,   0,   0,  92,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      4,   0,   0,   0,   1,   0, 
>-      0,   0,   1,   0,   0,   0, 
>-      1,   0,   0,   0, 118,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   3,   0, 
>-      0,   0,   2,   0,   0,   0, 
>-      7,   7,   0,   0,  83,  86, 
>-     95,  80,  79,  83,  73,  84, 
>-     73,  79,  78,   0,  83,  86, 
>-     95,  82,  69,  78,  68,  69, 
>-     82,  84,  65,  82,  71,  69, 
>-     84,  65,  82,  82,  65,  89, 
>-     73,  78,  68,  69,  88,   0, 
>-     84,  69,  88,  67,  79,  79, 
>-     82,  68,   0, 171,  79,  83, 
>-     71,  78,  44,   0,   0,   0, 
>-      1,   0,   0,   0,   8,   0, 
>-      0,   0,  32,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   1,   0,   0,   0, 
>-      0,   0,   0,   0,  15,   0, 
>-      0,   0,  83,  86,  95,  84, 
>-     65,  82,  71,  69,  84,   0, 
>-    171, 171,  83,  72,  68,  82, 
>-    204,   0,   0,   0,  64,   0, 
>-      0,   0,  51,   0,   0,   0, 
>-     88,  40,   0,   4,   0, 112, 
>-     16,   0,   0,   0,   0,   0, 
>-     68,  68,   0,   0,  98,  16, 
>-      0,   3, 114,  16,  16,   0, 
>-      2,   0,   0,   0, 101,   0, 
>-      0,   3, 242,  32,  16,   0, 
>-      0,   0,   0,   0, 104,   0, 
>-      0,   2,   1,   0,   0,   0, 
>-     61,  16,   0,   7, 242,   0, 
>-     16,   0,   0,   0,   0,   0, 
>-      1,  64,   0,   0,   0,   0, 
>-      0,   0,  70, 126,  16,   0, 
>-      0,   0,   0,   0,  86,   0, 
>-      0,   5, 114,   0,  16,   0, 
>-      0,   0,   0,   0,  70,   2, 
>-     16,   0,   0,   0,   0,   0, 
>-     56,   0,   0,   7, 114,   0, 
>-     16,   0,   0,   0,   0,   0, 
>-     70,   2,  16,   0,   0,   0, 
>-      0,   0,  70,  18,  16,   0, 
>-      2,   0,   0,   0,  27,   0, 
>-      0,   5, 114,   0,  16,   0, 
>-      0,   0,   0,   0,  70,   2, 
>-     16,   0,   0,   0,   0,   0, 
>-     54,   0,   0,   5, 130,   0, 
>-     16,   0,   0,   0,   0,   0, 
>-      1,  64,   0,   0,   0,   0, 
>-      0,   0,  45,   0,   0,   7, 
>-    242,  32,  16,   0,   0,   0, 
>-      0,   0,  70,  14,  16,   0, 
>-      0,   0,   0,   0,  70, 126, 
>-     16,   0,   0,   0,   0,   0, 
>-     62,   0,   0,   1,  83,  84, 
>-     65,  84, 116,   0,   0,   0, 
>-      7,   0,   0,   0,   1,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      2,   0,   0,   0,   1,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   1,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      1,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   1,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      2,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0
>-};
>+const BYTE g_PS_PassthroughRGBA3DUI[] = {
>+    68,  88,  66,  67,  117, 34,  123, 144, 139, 50,  107, 8,   199, 58,  188, 37, 26,  62,  108,
>+    21,  1,   0,   0,   0,   192, 2,   0,   0,   5,   0,   0,   0,   52,  0,   0,  0,   180, 0,
>+    0,   0,   60,  1,   0,   0,   112, 1,   0,   0,   68,  2,   0,   0,   82,  68, 69,  70,  120,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   28, 0,   0,   0,
>+    0,   4,   255, 255, 0,   1,   0,   0,   70,  0,   0,   0,   60,  0,   0,   0,  2,   0,   0,
>+    0,   4,   0,   0,   0,   8,   0,   0,   0,   255, 255, 255, 255, 0,   0,   0,  0,   1,   0,
>+    0,   0,   13,  0,   0,   0,   84,  101, 120, 116, 117, 114, 101, 85,  73,  0,  77,  105, 99,
>+    114, 111, 115, 111, 102, 116, 32,  40,  82,  41,  32,  72,  76,  83,  76,  32, 83,  104, 97,
>+    100, 101, 114, 32,  67,  111, 109, 112, 105, 108, 101, 114, 32,  57,  46,  50, 57,  46,  57,
>+    53,  50,  46,  51,  49,  49,  49,  0,   171, 73,  83,  71,  78,  128, 0,   0,  0,   3,   0,
>+    0,   0,   8,   0,   0,   0,   80,  0,   0,   0,   0,   0,   0,   0,   1,   0,  0,   0,   3,
>+    0,   0,   0,   0,   0,   0,   0,   15,  0,   0,   0,   92,  0,   0,   0,   0,  0,   0,   0,
>+    4,   0,   0,   0,   1,   0,   0,   0,   1,   0,   0,   0,   1,   0,   0,   0,  118, 0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   3,   0,   0,   0,   2,   0,   0,  0,   7,   7,
>+    0,   0,   83,  86,  95,  80,  79,  83,  73,  84,  73,  79,  78,  0,   83,  86, 95,  82,  69,
>+    78,  68,  69,  82,  84,  65,  82,  71,  69,  84,  65,  82,  82,  65,  89,  73, 78,  68,  69,
>+    88,  0,   84,  69,  88,  67,  79,  79,  82,  68,  0,   171, 79,  83,  71,  78, 44,  0,   0,
>+    0,   1,   0,   0,   0,   8,   0,   0,   0,   32,  0,   0,   0,   0,   0,   0,  0,   0,   0,
>+    0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   15,  0,   0,   0,   83,  86, 95,  84,  65,
>+    82,  71,  69,  84,  0,   171, 171, 83,  72,  68,  82,  204, 0,   0,   0,   64, 0,   0,   0,
>+    51,  0,   0,   0,   88,  40,  0,   4,   0,   112, 16,  0,   0,   0,   0,   0,  68,  68,  0,
>+    0,   98,  16,  0,   3,   114, 16,  16,  0,   2,   0,   0,   0,   101, 0,   0,  3,   242, 32,
>+    16,  0,   0,   0,   0,   0,   104, 0,   0,   2,   1,   0,   0,   0,   61,  16, 0,   7,   242,
>+    0,   16,  0,   0,   0,   0,   0,   1,   64,  0,   0,   0,   0,   0,   0,   70, 126, 16,  0,
>+    0,   0,   0,   0,   86,  0,   0,   5,   114, 0,   16,  0,   0,   0,   0,   0,  70,  2,   16,
>+    0,   0,   0,   0,   0,   56,  0,   0,   7,   114, 0,   16,  0,   0,   0,   0,  0,   70,  2,
>+    16,  0,   0,   0,   0,   0,   70,  18,  16,  0,   2,   0,   0,   0,   27,  0,  0,   5,   114,
>+    0,   16,  0,   0,   0,   0,   0,   70,  2,   16,  0,   0,   0,   0,   0,   54, 0,   0,   5,
>+    130, 0,   16,  0,   0,   0,   0,   0,   1,   64,  0,   0,   0,   0,   0,   0,  45,  0,   0,
>+    7,   242, 32,  16,  0,   0,   0,   0,   0,   70,  14,  16,  0,   0,   0,   0,  0,   70,  126,
>+    16,  0,   0,   0,   0,   0,   62,  0,   0,   1,   83,  84,  65,  84,  116, 0,  0,   0,   7,
>+    0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   2,   0,   0,   0,   1,  0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,  0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,  0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,  0,   0,   1,
>+    0,   0,   0,   0,   0,   0,   0,   2,   0,   0,   0,   0,   0,   0,   0,   0,  0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,  0,   0,   0,
>+    0};
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/resolvecolor2dps.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/resolvecolor2dps.h
>new file mode 100644
>index 00000000000..b214a23ad80
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/resolvecolor2dps.h
>@@ -0,0 +1,107 @@
>+#if 0
>+//
>+// Generated by Microsoft (R) HLSL Shader Compiler 9.29.952.3111
>+//
>+//
>+//   fxc /nologo /E PS_ResolveColor2D /T ps_4_1 /Fh compiled\resolvecolor2dps.h
>+//    ResolveColor.hlsl
>+//
>+//
>+// Resource Bindings:
>+//
>+// Name                                 Type  Format         Dim Slot Elements
>+// ------------------------------ ---------- ------- ----------- ---- --------
>+// TextureF_MS                       texture  float4        2dMS    0        1
>+//
>+//
>+//
>+// Input signature:
>+//
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_POSITION              0   xyzw        0      POS  float       
>+// TEXCORD                  0   xy          1     NONE  float   xy  
>+//
>+//
>+// Output signature:
>+//
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_TARGET                0   xyzw        0   TARGET  float   xyzw
>+//
>+ps_4_1
>+dcl_globalFlags refactoringAllowed
>+dcl_resource_texture2dms(0) (float,float,float,float) t0
>+dcl_input_ps linear v1.xy
>+dcl_output o0.xyzw
>+dcl_temps 4
>+resinfo_uint r0.xy, l(0), t0.xyzw
>+sampleinfo_uint r0.z, t0.x
>+utof r0.xy, r0.xyxx
>+mul r0.xy, r0.xyxx, v1.xyxx
>+ftou r1.xy, r0.xyxx
>+mov r1.zw, l(0,0,0,0)
>+mov r2.xyzw, l(0,0,0,0)
>+mov r0.x, l(0)
>+loop 
>+  uge r0.y, r0.x, r0.z
>+  breakc_nz r0.y
>+  ldms r3.xyzw, r1.xyzw, t0.xyzw, r0.x
>+  add r2.xyzw, r2.xyzw, r3.xyzw
>+  iadd r0.x, r0.x, l(1)
>+endloop 
>+sampleinfo r0.x, t0.x
>+div o0.xyzw, r2.xyzw, r0.xxxx
>+ret 
>+// Approximately 18 instruction slots used
>+#endif
>+
>+const BYTE g_PS_ResolveColor2D[] = {
>+    68,  88,  66,  67,  192, 130, 252, 156, 103, 192, 177, 148, 25,  142, 181, 214, 173, 217, 123,
>+    174, 1,   0,   0,   0,   136, 3,   0,   0,   5,   0,   0,   0,   52,  0,   0,   0,   184, 0,
>+    0,   0,   12,  1,   0,   0,   64,  1,   0,   0,   12,  3,   0,   0,   82,  68,  69,  70,  124,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   28,  0,   0,   0,
>+    1,   4,   255, 255, 0,   1,   0,   0,   72,  0,   0,   0,   60,  0,   0,   0,   2,   0,   0,
>+    0,   5,   0,   0,   0,   6,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,
>+    0,   0,   13,  0,   0,   0,   84,  101, 120, 116, 117, 114, 101, 70,  95,  77,  83,  0,   77,
>+    105, 99,  114, 111, 115, 111, 102, 116, 32,  40,  82,  41,  32,  72,  76,  83,  76,  32,  83,
>+    104, 97,  100, 101, 114, 32,  67,  111, 109, 112, 105, 108, 101, 114, 32,  57,  46,  50,  57,
>+    46,  57,  53,  50,  46,  51,  49,  49,  49,  0,   171, 171, 171, 73,  83,  71,  78,  76,  0,
>+    0,   0,   2,   0,   0,   0,   8,   0,   0,   0,   56,  0,   0,   0,   0,   0,   0,   0,   1,
>+    0,   0,   0,   3,   0,   0,   0,   0,   0,   0,   0,   15,  0,   0,   0,   68,  0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   3,   0,   0,   0,   1,   0,   0,   0,   3,   3,   0,
>+    0,   83,  86,  95,  80,  79,  83,  73,  84,  73,  79,  78,  0,   84,  69,  88,  67,  79,  82,
>+    68,  0,   79,  83,  71,  78,  44,  0,   0,   0,   1,   0,   0,   0,   8,   0,   0,   0,   32,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   3,   0,   0,   0,   0,   0,   0,   0,
>+    15,  0,   0,   0,   83,  86,  95,  84,  65,  82,  71,  69,  84,  0,   171, 171, 83,  72,  68,
>+    82,  196, 1,   0,   0,   65,  0,   0,   0,   113, 0,   0,   0,   106, 8,   0,   1,   88,  32,
>+    0,   4,   0,   112, 16,  0,   0,   0,   0,   0,   85,  85,  0,   0,   98,  16,  0,   3,   50,
>+    16,  16,  0,   1,   0,   0,   0,   101, 0,   0,   3,   242, 32,  16,  0,   0,   0,   0,   0,
>+    104, 0,   0,   2,   4,   0,   0,   0,   61,  16,  0,   7,   50,  0,   16,  0,   0,   0,   0,
>+    0,   1,   64,  0,   0,   0,   0,   0,   0,   70,  126, 16,  0,   0,   0,   0,   0,   111, 8,
>+    0,   5,   66,  0,   16,  0,   0,   0,   0,   0,   10,  112, 16,  0,   0,   0,   0,   0,   86,
>+    0,   0,   5,   50,  0,   16,  0,   0,   0,   0,   0,   70,  0,   16,  0,   0,   0,   0,   0,
>+    56,  0,   0,   7,   50,  0,   16,  0,   0,   0,   0,   0,   70,  0,   16,  0,   0,   0,   0,
>+    0,   70,  16,  16,  0,   1,   0,   0,   0,   28,  0,   0,   5,   50,  0,   16,  0,   1,   0,
>+    0,   0,   70,  0,   16,  0,   0,   0,   0,   0,   54,  0,   0,   8,   194, 0,   16,  0,   1,
>+    0,   0,   0,   2,   64,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   54,  0,   0,   8,   242, 0,   16,  0,   2,   0,   0,   0,   2,   64,  0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   54,  0,
>+    0,   5,   18,  0,   16,  0,   0,   0,   0,   0,   1,   64,  0,   0,   0,   0,   0,   0,   48,
>+    0,   0,   1,   80,  0,   0,   7,   34,  0,   16,  0,   0,   0,   0,   0,   10,  0,   16,  0,
>+    0,   0,   0,   0,   42,  0,   16,  0,   0,   0,   0,   0,   3,   0,   4,   3,   26,  0,   16,
>+    0,   0,   0,   0,   0,   46,  0,   0,   9,   242, 0,   16,  0,   3,   0,   0,   0,   70,  14,
>+    16,  0,   1,   0,   0,   0,   70,  126, 16,  0,   0,   0,   0,   0,   10,  0,   16,  0,   0,
>+    0,   0,   0,   0,   0,   0,   7,   242, 0,   16,  0,   2,   0,   0,   0,   70,  14,  16,  0,
>+    2,   0,   0,   0,   70,  14,  16,  0,   3,   0,   0,   0,   30,  0,   0,   7,   18,  0,   16,
>+    0,   0,   0,   0,   0,   10,  0,   16,  0,   0,   0,   0,   0,   1,   64,  0,   0,   1,   0,
>+    0,   0,   22,  0,   0,   1,   111, 0,   0,   5,   18,  0,   16,  0,   0,   0,   0,   0,   10,
>+    112, 16,  0,   0,   0,   0,   0,   14,  0,   0,   7,   242, 32,  16,  0,   0,   0,   0,   0,
>+    70,  14,  16,  0,   2,   0,   0,   0,   6,   0,   16,  0,   0,   0,   0,   0,   62,  0,   0,
>+    1,   83,  84,  65,  84,  116, 0,   0,   0,   18,  0,   0,   0,   4,   0,   0,   0,   0,   0,
>+    0,   0,   2,   0,   0,   0,   3,   0,   0,   0,   1,   0,   0,   0,   1,   0,   0,   0,   1,
>+    0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   12,  0,   0,   0,   0,   0,   0,   0,   2,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0};
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/resolvedepth11_ps.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/resolvedepth11_ps.h
>index 0616311293f..c9ddbd8f983 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/resolvedepth11_ps.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/resolvedepth11_ps.h
>@@ -1,6 +1,10 @@
> #if 0
> //
>-// Generated by Microsoft (R) HLSL Shader Compiler 6.3.9600.16384
>+// Generated by Microsoft (R) HLSL Shader Compiler 9.29.952.3111
>+//
>+//
>+//   fxc /nologo /E PS_ResolveDepth /T ps_4_1 /Fh compiled/resolvedepth11_ps.h
>+//    ResolveDepthStencil.hlsl
> //
> //
> // Resource Bindings:
>@@ -13,17 +17,17 @@
> //
> // Input signature:
> //
>-// Name                 Index   Mask Register SysValue  Format   Used
>-// -------------------- ----- ------ -------- -------- ------- ------
>-// SV_Position              0   xyzw        0      POS   float       
>-// TEXCOORD                 0   xy          1     NONE   float   xy  
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_Position              0   xyzw        0      POS  float       
>+// TEXCOORD                 0   xy          1     NONE  float   xy  
> //
> //
> // Output signature:
> //
>-// Name                 Index   Mask Register SysValue  Format   Used
>-// -------------------- ----- ------ -------- -------- ------- ------
>-// SV_Depth                 0    N/A   oDepth    DEPTH   float    YES
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_Depth                 0    N/A   oDepth    DEPTH  float    YES
> //
> ps_4_1
> dcl_globalFlags refactoringAllowed
>@@ -43,16 +47,16 @@ ret
> #endif
> 
> const BYTE g_PS_ResolveDepth[] = {
>-    68,  88,  66,  67,  106, 43,  8,   187, 21,  3,   136, 11,  227, 249, 190, 191, 97,  127, 18,
>-    212, 1,   0,   0,   0,   176, 2,   0,   0,   5,   0,   0,   0,   52,  0,   0,   0,   176, 0,
>+    68,  88,  66,  67,  91,  30,  96,  236, 23,  31,  71,  224, 94,  101, 86,  142, 90,  12,  152,
>+    206, 1,   0,   0,   0,   176, 2,   0,   0,   5,   0,   0,   0,   52,  0,   0,   0,   176, 0,
>     0,   0,   8,   1,   0,   0,   60,  1,   0,   0,   52,  2,   0,   0,   82,  68,  69,  70,  116,
>     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   28,  0,   0,   0,
>     1,   4,   255, 255, 0,   1,   0,   0,   66,  0,   0,   0,   60,  0,   0,   0,   2,   0,   0,
>     0,   5,   0,   0,   0,   6,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,
>     0,   0,   1,   0,   0,   0,   68,  101, 112, 116, 104, 0,   77,  105, 99,  114, 111, 115, 111,
>     102, 116, 32,  40,  82,  41,  32,  72,  76,  83,  76,  32,  83,  104, 97,  100, 101, 114, 32,
>-    67,  111, 109, 112, 105, 108, 101, 114, 32,  54,  46,  51,  46,  57,  54,  48,  48,  46,  49,
>-    54,  51,  56,  52,  0,   73,  83,  71,  78,  80,  0,   0,   0,   2,   0,   0,   0,   8,   0,
>+    67,  111, 109, 112, 105, 108, 101, 114, 32,  57,  46,  50,  57,  46,  57,  53,  50,  46,  51,
>+    49,  49,  49,  0,   171, 73,  83,  71,  78,  80,  0,   0,   0,   2,   0,   0,   0,   8,   0,
>     0,   0,   56,  0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   3,   0,   0,   0,   0,
>     0,   0,   0,   15,  0,   0,   0,   68,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>     3,   0,   0,   0,   1,   0,   0,   0,   3,   3,   0,   0,   83,  86,  95,  80,  111, 115, 105,
>@@ -76,7 +80,7 @@ const BYTE g_PS_ResolveDepth[] = {
>     0,   0,   8,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   2,   0,   0,   0,   1,
>     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,
>     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>-    0,   0,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>     0,   0,   2,   0,   0,   0,   0,   0,   0,   0,   2,   0,   0,   0,   0,   0,   0,   0,   0,
>     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>     0,   0,   0,   0};
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/resolvedepthstencil11_ps.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/resolvedepthstencil11_ps.h
>index 58834eb655f..51b65bb089b 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/resolvedepthstencil11_ps.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/resolvedepthstencil11_ps.h
>@@ -1,6 +1,10 @@
> #if 0
> //
>-// Generated by Microsoft (R) HLSL Shader Compiler 6.3.9600.16384
>+// Generated by Microsoft (R) HLSL Shader Compiler 9.29.952.3111
>+//
>+//
>+//   fxc /nologo /E PS_ResolveDepthStencil /T ps_4_1 /Fh
>+//    compiled/resolvedepthstencil11_ps.h ResolveDepthStencil.hlsl
> //
> //
> // Resource Bindings:
>@@ -14,17 +18,17 @@
> //
> // Input signature:
> //
>-// Name                 Index   Mask Register SysValue  Format   Used
>-// -------------------- ----- ------ -------- -------- ------- ------
>-// SV_Position              0   xyzw        0      POS   float       
>-// TEXCOORD                 0   xy          1     NONE   float   xy  
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_Position              0   xyzw        0      POS  float       
>+// TEXCOORD                 0   xy          1     NONE  float   xy  
> //
> //
> // Output signature:
> //
>-// Name                 Index   Mask Register SysValue  Format   Used
>-// -------------------- ----- ------ -------- -------- ------- ------
>-// SV_Target                0   xy          0   TARGET   float   xy  
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_Target                0   xy          0   TARGET  float   xy  
> //
> ps_4_1
> dcl_globalFlags refactoringAllowed
>@@ -47,8 +51,8 @@ ret
> #endif
> 
> const BYTE g_PS_ResolveDepthStencil[] = {
>-    68,  88,  66,  67,  229, 191, 254, 12,  10,  19,  181, 162, 222, 203, 244, 146, 104, 226, 195,
>-    177, 1,   0,   0,   0,   40,  3,   0,   0,   5,   0,   0,   0,   52,  0,   0,   0,   216, 0,
>+    68,  88,  66,  67,  47,  137, 160, 229, 91,  11,  163, 77,  193, 134, 67,  56,  141, 222, 2,
>+    194, 1,   0,   0,   0,   40,  3,   0,   0,   5,   0,   0,   0,   52,  0,   0,   0,   216, 0,
>     0,   0,   48,  1,   0,   0,   100, 1,   0,   0,   172, 2,   0,   0,   82,  68,  69,  70,  156,
>     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   2,   0,   0,   0,   28,  0,   0,   0,
>     1,   4,   255, 255, 0,   1,   0,   0,   106, 0,   0,   0,   92,  0,   0,   0,   2,   0,   0,
>@@ -57,8 +61,8 @@ const BYTE g_PS_ResolveDepthStencil[] = {
>     0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   1,   0,   0,   0,   5,   0,   0,   0,
>     68,  101, 112, 116, 104, 0,   83,  116, 101, 110, 99,  105, 108, 0,   77,  105, 99,  114, 111,
>     115, 111, 102, 116, 32,  40,  82,  41,  32,  72,  76,  83,  76,  32,  83,  104, 97,  100, 101,
>-    114, 32,  67,  111, 109, 112, 105, 108, 101, 114, 32,  54,  46,  51,  46,  57,  54,  48,  48,
>-    46,  49,  54,  51,  56,  52,  0,   73,  83,  71,  78,  80,  0,   0,   0,   2,   0,   0,   0,
>+    114, 32,  67,  111, 109, 112, 105, 108, 101, 114, 32,  57,  46,  50,  57,  46,  57,  53,  50,
>+    46,  51,  49,  49,  49,  0,   171, 73,  83,  71,  78,  80,  0,   0,   0,   2,   0,   0,   0,
>     8,   0,   0,   0,   56,  0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   3,   0,   0,
>     0,   0,   0,   0,   0,   15,  0,   0,   0,   68,  0,   0,   0,   0,   0,   0,   0,   0,   0,
>     0,   0,   3,   0,   0,   0,   1,   0,   0,   0,   3,   3,   0,   0,   83,  86,  95,  80,  111,
>@@ -86,7 +90,7 @@ const BYTE g_PS_ResolveDepthStencil[] = {
>     83,  84,  65,  84,  116, 0,   0,   0,   10,  0,   0,   0,   1,   0,   0,   0,   0,   0,   0,
>     0,   2,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,
>     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>-    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   2,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>     0,   0,   0,   0,   0,   0,   0,   0,   2,   0,   0,   0,   0,   0,   0,   0,   3,   0,   0,
>     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>     0,   0,   0,   0,   0,   0,   0,   0,   0,   0};
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/resolvedepthstencil11_vs.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/resolvedepthstencil11_vs.h
>index 989a316f632..85adfff56cd 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/resolvedepthstencil11_vs.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/resolvedepthstencil11_vs.h
>@@ -1,22 +1,26 @@
> #if 0
> //
>-// Generated by Microsoft (R) HLSL Shader Compiler 6.3.9600.16384
>+// Generated by Microsoft (R) HLSL Shader Compiler 9.29.952.3111
>+//
>+//
>+//   fxc /nologo /E VS_ResolveDepthStencil /T vs_4_1 /Fh
>+//    compiled/resolvedepthstencil11_vs.h ResolveDepthStencil.hlsl
> //
> //
> //
> // Input signature:
> //
>-// Name                 Index   Mask Register SysValue  Format   Used
>-// -------------------- ----- ------ -------- -------- ------- ------
>-// SV_VertexID              0   x           0   VERTID    uint   x   
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_VertexID              0   x           0   VERTID   uint   x   
> //
> //
> // Output signature:
> //
>-// Name                 Index   Mask Register SysValue  Format   Used
>-// -------------------- ----- ------ -------- -------- ------- ------
>-// SV_Position              0   xyzw        0      POS   float   xyzw
>-// TEXCOORD                 0   xy          1     NONE   float   xy  
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_Position              0   xyzw        0      POS  float   xyzw
>+// TEXCOORD                 0   xy          1     NONE  float   xy  
> //
> vs_4_1
> dcl_globalFlags refactoringAllowed
>@@ -41,14 +45,14 @@ ret
> #endif
> 
> const BYTE g_VS_ResolveDepthStencil[] = {
>-    68,  88,  66,  67,  205, 15,  103, 70,  202, 235, 195, 98,  255, 82,  84,  239, 130, 6,   12,
>-    104, 1,   0,   0,   0,   0,   3,   0,   0,   5,   0,   0,   0,   52,  0,   0,   0,   140, 0,
>+    68,  88,  66,  67,  40,  8,   1,   50,  138, 208, 33,  92,  46,  194, 48,  131, 250, 159, 71,
>+    56,  1,   0,   0,   0,   0,   3,   0,   0,   5,   0,   0,   0,   52,  0,   0,   0,   140, 0,
>     0,   0,   192, 0,   0,   0,   24,  1,   0,   0,   132, 2,   0,   0,   82,  68,  69,  70,  80,
>     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   28,  0,   0,   0,
>     1,   4,   254, 255, 0,   1,   0,   0,   28,  0,   0,   0,   77,  105, 99,  114, 111, 115, 111,
>     102, 116, 32,  40,  82,  41,  32,  72,  76,  83,  76,  32,  83,  104, 97,  100, 101, 114, 32,
>-    67,  111, 109, 112, 105, 108, 101, 114, 32,  54,  46,  51,  46,  57,  54,  48,  48,  46,  49,
>-    54,  51,  56,  52,  0,   171, 171, 73,  83,  71,  78,  44,  0,   0,   0,   1,   0,   0,   0,
>+    67,  111, 109, 112, 105, 108, 101, 114, 32,  57,  46,  50,  57,  46,  57,  53,  50,  46,  51,
>+    49,  49,  49,  0,   171, 171, 171, 73,  83,  71,  78,  44,  0,   0,   0,   1,   0,   0,   0,
>     8,   0,   0,   0,   32,  0,   0,   0,   0,   0,   0,   0,   6,   0,   0,   0,   1,   0,   0,
>     0,   0,   0,   0,   0,   1,   1,   0,   0,   83,  86,  95,  86,  101, 114, 116, 101, 120, 73,
>     68,  0,   79,  83,  71,  78,  80,  0,   0,   0,   2,   0,   0,   0,   8,   0,   0,   0,   56,
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/resolvestencil11_ps.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/resolvestencil11_ps.h
>index 1730df345fe..1698c7693a3 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/resolvestencil11_ps.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/resolvestencil11_ps.h
>@@ -1,6 +1,10 @@
> #if 0
> //
>-// Generated by Microsoft (R) HLSL Shader Compiler 6.3.9600.16384
>+// Generated by Microsoft (R) HLSL Shader Compiler 9.29.952.3111
>+//
>+//
>+//   fxc /nologo /E PS_ResolveStencil /T ps_4_1 /Fh
>+//    compiled/resolvestencil11_ps.h ResolveDepthStencil.hlsl
> //
> //
> // Resource Bindings:
>@@ -13,17 +17,17 @@
> //
> // Input signature:
> //
>-// Name                 Index   Mask Register SysValue  Format   Used
>-// -------------------- ----- ------ -------- -------- ------- ------
>-// SV_Position              0   xyzw        0      POS   float       
>-// TEXCOORD                 0   xy          1     NONE   float   xy  
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_Position              0   xyzw        0      POS  float       
>+// TEXCOORD                 0   xy          1     NONE  float   xy  
> //
> //
> // Output signature:
> //
>-// Name                 Index   Mask Register SysValue  Format   Used
>-// -------------------- ----- ------ -------- -------- ------- ------
>-// SV_Target                0   xy          0   TARGET   float   xy  
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_Target                0   xy          0   TARGET  float   xy  
> //
> ps_4_1
> dcl_globalFlags refactoringAllowed
>@@ -44,41 +48,41 @@ ret
> #endif
> 
> const BYTE g_PS_ResolveStencil[] = {
>-    68,  88,  66,  67,  122, 29,  34,  146, 254, 203, 175, 97,  151, 254, 255, 190, 91, 40,  55,
>-    118, 1,   0,   0,   0,   208, 2,   0,   0,   5,   0,   0,   0,   52,  0,   0,   0,  180, 0,
>-    0,   0,   12,  1,   0,   0,   64,  1,   0,   0,   84,  2,   0,   0,   82,  68,  69, 70,  120,
>-    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   28,  0,  0,   0,
>-    1,   4,   255, 255, 0,   1,   0,   0,   68,  0,   0,   0,   60,  0,   0,   0,   2,  0,   0,
>-    0,   4,   0,   0,   0,   6,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,  1,   0,
>-    0,   0,   5,   0,   0,   0,   83,  116, 101, 110, 99,  105, 108, 0,   77,  105, 99, 114, 111,
>-    115, 111, 102, 116, 32,  40,  82,  41,  32,  72,  76,  83,  76,  32,  83,  104, 97, 100, 101,
>-    114, 32,  67,  111, 109, 112, 105, 108, 101, 114, 32,  54,  46,  51,  46,  57,  54, 48,  48,
>-    46,  49,  54,  51,  56,  52,  0,   171, 171, 73,  83,  71,  78,  80,  0,   0,   0,  2,   0,
>-    0,   0,   8,   0,   0,   0,   56,  0,   0,   0,   0,   0,   0,   0,   1,   0,   0,  0,   3,
>-    0,   0,   0,   0,   0,   0,   0,   15,  0,   0,   0,   68,  0,   0,   0,   0,   0,  0,   0,
>-    0,   0,   0,   0,   3,   0,   0,   0,   1,   0,   0,   0,   3,   3,   0,   0,   83, 86,  95,
>-    80,  111, 115, 105, 116, 105, 111, 110, 0,   84,  69,  88,  67,  79,  79,  82,  68, 0,   171,
>-    171, 171, 79,  83,  71,  78,  44,  0,   0,   0,   1,   0,   0,   0,   8,   0,   0,  0,   32,
>-    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   3,   0,   0,   0,   0,   0,  0,   0,
>-    3,   12,  0,   0,   83,  86,  95,  84,  97,  114, 103, 101, 116, 0,   171, 171, 83, 72,  68,
>-    82,  12,  1,   0,   0,   65,  0,   0,   0,   67,  0,   0,   0,   106, 8,   0,   1,  88,  32,
>-    0,   4,   0,   112, 16,  0,   1,   0,   0,   0,   68,  68,  0,   0,   98,  16,  0,  3,   50,
>-    16,  16,  0,   1,   0,   0,   0,   101, 0,   0,   3,   50,  32,  16,  0,   0,   0,  0,   0,
>-    104, 0,   0,   2,   1,   0,   0,   0,   61,  16,  0,   7,   50,  0,   16,  0,   0,  0,   0,
>-    0,   1,   64,  0,   0,   0,   0,   0,   0,   70,  126, 16,  0,   1,   0,   0,   0,  86,  0,
>-    0,   5,   50,  0,   16,  0,   0,   0,   0,   0,   70,  0,   16,  0,   0,   0,   0,  0,   56,
>-    0,   0,   7,   50,  0,   16,  0,   0,   0,   0,   0,   70,  0,   16,  0,   0,   0,  0,   0,
>-    70,  16,  16,  0,   1,   0,   0,   0,   28,  0,   0,   5,   50,  0,   16,  0,   0,  0,   0,
>-    0,   70,  0,   16,  0,   0,   0,   0,   0,   54,  0,   0,   8,   194, 0,   16,  0,  0,   0,
>-    0,   0,   2,   64,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,  0,   0,
>-    0,   0,   0,   46,  0,   0,   9,   18,  0,   16,  0,   0,   0,   0,   0,   70,  14, 16,  0,
>-    0,   0,   0,   0,   22,  126, 16,  0,   1,   0,   0,   0,   1,   64,  0,   0,   0,  0,   0,
>-    0,   86,  0,   0,   5,   34,  32,  16,  0,   0,   0,   0,   0,   10,  0,   16,  0,  0,   0,
>-    0,   0,   54,  0,   0,   5,   18,  32,  16,  0,   0,   0,   0,   0,   1,   64,  0,  0,   0,
>-    0,   0,   0,   62,  0,   0,   1,   83,  84,  65,  84,  116, 0,   0,   0,   9,   0,  0,   0,
>-    1,   0,   0,   0,   0,   0,   0,   0,   2,   0,   0,   0,   1,   0,   0,   0,   0,  0,   0,
>-    0,   0,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,  0,   0,
>-    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,  0,   1,
>-    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   2,   0,  0,   0,
>-    0,   0,   0,   0,   3,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,  0,   0,
>+    68,  88,  66,  67,  23,  194, 195, 209, 212, 28,  208, 37,  42,  21,  191, 206, 191, 0,   52,
>+    120, 1,   0,   0,   0,   208, 2,   0,   0,   5,   0,   0,   0,   52,  0,   0,   0,   180, 0,
>+    0,   0,   12,  1,   0,   0,   64,  1,   0,   0,   84,  2,   0,   0,   82,  68,  69,  70,  120,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   28,  0,   0,   0,
>+    1,   4,   255, 255, 0,   1,   0,   0,   68,  0,   0,   0,   60,  0,   0,   0,   2,   0,   0,
>+    0,   4,   0,   0,   0,   6,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   1,   0,
>+    0,   0,   5,   0,   0,   0,   83,  116, 101, 110, 99,  105, 108, 0,   77,  105, 99,  114, 111,
>+    115, 111, 102, 116, 32,  40,  82,  41,  32,  72,  76,  83,  76,  32,  83,  104, 97,  100, 101,
>+    114, 32,  67,  111, 109, 112, 105, 108, 101, 114, 32,  57,  46,  50,  57,  46,  57,  53,  50,
>+    46,  51,  49,  49,  49,  0,   171, 171, 171, 73,  83,  71,  78,  80,  0,   0,   0,   2,   0,
>+    0,   0,   8,   0,   0,   0,   56,  0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   3,
>+    0,   0,   0,   0,   0,   0,   0,   15,  0,   0,   0,   68,  0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   3,   0,   0,   0,   1,   0,   0,   0,   3,   3,   0,   0,   83,  86,  95,
>+    80,  111, 115, 105, 116, 105, 111, 110, 0,   84,  69,  88,  67,  79,  79,  82,  68,  0,   171,
>+    171, 171, 79,  83,  71,  78,  44,  0,   0,   0,   1,   0,   0,   0,   8,   0,   0,   0,   32,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   3,   0,   0,   0,   0,   0,   0,   0,
>+    3,   12,  0,   0,   83,  86,  95,  84,  97,  114, 103, 101, 116, 0,   171, 171, 83,  72,  68,
>+    82,  12,  1,   0,   0,   65,  0,   0,   0,   67,  0,   0,   0,   106, 8,   0,   1,   88,  32,
>+    0,   4,   0,   112, 16,  0,   1,   0,   0,   0,   68,  68,  0,   0,   98,  16,  0,   3,   50,
>+    16,  16,  0,   1,   0,   0,   0,   101, 0,   0,   3,   50,  32,  16,  0,   0,   0,   0,   0,
>+    104, 0,   0,   2,   1,   0,   0,   0,   61,  16,  0,   7,   50,  0,   16,  0,   0,   0,   0,
>+    0,   1,   64,  0,   0,   0,   0,   0,   0,   70,  126, 16,  0,   1,   0,   0,   0,   86,  0,
>+    0,   5,   50,  0,   16,  0,   0,   0,   0,   0,   70,  0,   16,  0,   0,   0,   0,   0,   56,
>+    0,   0,   7,   50,  0,   16,  0,   0,   0,   0,   0,   70,  0,   16,  0,   0,   0,   0,   0,
>+    70,  16,  16,  0,   1,   0,   0,   0,   28,  0,   0,   5,   50,  0,   16,  0,   0,   0,   0,
>+    0,   70,  0,   16,  0,   0,   0,   0,   0,   54,  0,   0,   8,   194, 0,   16,  0,   0,   0,
>+    0,   0,   2,   64,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   46,  0,   0,   9,   18,  0,   16,  0,   0,   0,   0,   0,   70,  14,  16,  0,
>+    0,   0,   0,   0,   22,  126, 16,  0,   1,   0,   0,   0,   1,   64,  0,   0,   0,   0,   0,
>+    0,   86,  0,   0,   5,   34,  32,  16,  0,   0,   0,   0,   0,   10,  0,   16,  0,   0,   0,
>+    0,   0,   54,  0,   0,   5,   18,  32,  16,  0,   0,   0,   0,   0,   1,   64,  0,   0,   0,
>+    0,   0,   0,   62,  0,   0,   1,   83,  84,  65,  84,  116, 0,   0,   0,   9,   0,   0,   0,
>+    1,   0,   0,   0,   0,   0,   0,   0,   2,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   2,   0,   0,   0,
>+    0,   0,   0,   0,   3,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0};
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/swizzlef2darrayps.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/swizzlef2darrayps.h
>index b34914b3947..dd88a2c5f31 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/swizzlef2darrayps.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/swizzlef2darrayps.h
>@@ -1,6 +1,10 @@
> #if 0
> //
>-// Generated by Microsoft (R) HLSL Shader Compiler 6.3.9600.16384
>+// Generated by Microsoft (R) HLSL Shader Compiler 9.29.952.3111
>+//
>+//
>+//   fxc /nologo /E PS_SwizzleF2DArray /T ps_4_0 /Fh
>+//    compiled\swizzlef2darrayps.h Swizzle11.hlsl
> //
> //
> // Buffer Definitions: 
>@@ -25,18 +29,18 @@
> //
> // Input signature:
> //
>-// Name                 Index   Mask Register SysValue  Format   Used
>-// -------------------- ----- ------ -------- -------- ------- ------
>-// SV_POSITION              0   xyzw        0      POS   float       
>-// SV_RENDERTARGETARRAYINDEX     0   x           1  RTINDEX    uint   x   
>-// TEXCOORD                 0   xyz         2     NONE   float   xy  
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_POSITION              0   xyzw        0      POS  float       
>+// SV_RENDERTARGETARRAYINDEX     0   x           1  RTINDEX   uint   x   
>+// TEXCOORD                 0   xyz         2     NONE  float   xy  
> //
> //
> // Output signature:
> //
>-// Name                 Index   Mask Register SysValue  Format   Used
>-// -------------------- ----- ------ -------- -------- ------- ------
>-// SV_TARGET                0   xyzw        0   TARGET   float   xyzw
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_TARGET                0   xyzw        0   TARGET  float   xyzw
> //
> ps_4_0
> dcl_constantbuffer cb0[1], immediateIndexed
>@@ -68,211 +72,69 @@ ret
> // Approximately 18 instruction slots used
> #endif
> 
>-const BYTE g_PS_SwizzleF2DArray[] =
>-{
>-     68,  88,  66,  67,  39, 232, 
>-     91, 166, 165, 217,  22,  39, 
>-    183, 202, 191,  64, 238, 104, 
>-    217, 199,   1,   0,   0,   0, 
>-    204,   4,   0,   0,   5,   0, 
>-      0,   0,  52,   0,   0,   0, 
>-    104,   1,   0,   0, 240,   1, 
>-      0,   0,  36,   2,   0,   0, 
>-     80,   4,   0,   0,  82,  68, 
>-     69,  70,  44,   1,   0,   0, 
>-      1,   0,   0,   0, 168,   0, 
>-      0,   0,   3,   0,   0,   0, 
>-     28,   0,   0,   0,   0,   4, 
>-    255, 255,   0,   1,   0,   0, 
>-    248,   0,   0,   0, 124,   0, 
>-      0,   0,   3,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   1,   0, 
>-      0,   0,   1,   0,   0,   0, 
>-    132,   0,   0,   0,   2,   0, 
>-      0,   0,   5,   0,   0,   0, 
>-      5,   0,   0,   0, 255, 255, 
>-    255, 255,   0,   0,   0,   0, 
>-      1,   0,   0,   0,  13,   0, 
>-      0,   0, 148,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   1,   0,   0,   0, 
>-      1,   0,   0,   0,  83,  97, 
>-    109, 112, 108, 101, 114,   0, 
>-     84, 101, 120, 116, 117, 114, 
>-    101,  70,  50,  68,  65, 114, 
>-    114,  97, 121,   0,  83, 119, 
>-    105, 122, 122, 108, 101,  80, 
>-    114, 111, 112, 101, 114, 116, 
>-    105, 101, 115,   0, 171, 171, 
>-    148,   0,   0,   0,   1,   0, 
>-      0,   0, 192,   0,   0,   0, 
>-     16,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-    216,   0,   0,   0,   0,   0, 
>-      0,   0,  16,   0,   0,   0, 
>-      2,   0,   0,   0, 232,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-     83, 119, 105, 122, 122, 108, 
>-    101,  73, 110, 100, 105,  99, 
>-    101, 115,   0, 171,   1,   0, 
>-     19,   0,   1,   0,   4,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,  77, 105,  99, 114, 
>-    111, 115, 111, 102, 116,  32, 
>-     40,  82,  41,  32,  72,  76, 
>-     83,  76,  32,  83, 104,  97, 
>-    100, 101, 114,  32,  67, 111, 
>-    109, 112, 105, 108, 101, 114, 
>-     32,  54,  46,  51,  46,  57, 
>-     54,  48,  48,  46,  49,  54, 
>-     51,  56,  52,   0, 171, 171, 
>-     73,  83,  71,  78, 128,   0, 
>-      0,   0,   3,   0,   0,   0, 
>-      8,   0,   0,   0,  80,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      1,   0,   0,   0,   3,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-     15,   0,   0,   0,  92,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      4,   0,   0,   0,   1,   0, 
>-      0,   0,   1,   0,   0,   0, 
>-      1,   1,   0,   0, 118,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   3,   0, 
>-      0,   0,   2,   0,   0,   0, 
>-      7,   3,   0,   0,  83,  86, 
>-     95,  80,  79,  83,  73,  84, 
>-     73,  79,  78,   0,  83,  86, 
>-     95,  82,  69,  78,  68,  69, 
>-     82,  84,  65,  82,  71,  69, 
>-     84,  65,  82,  82,  65,  89, 
>-     73,  78,  68,  69,  88,   0, 
>-     84,  69,  88,  67,  79,  79, 
>-     82,  68,   0, 171,  79,  83, 
>-     71,  78,  44,   0,   0,   0, 
>-      1,   0,   0,   0,   8,   0, 
>-      0,   0,  32,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   3,   0,   0,   0, 
>-      0,   0,   0,   0,  15,   0, 
>-      0,   0,  83,  86,  95,  84, 
>-     65,  82,  71,  69,  84,   0, 
>-    171, 171,  83,  72,  68,  82, 
>-     36,   2,   0,   0,  64,   0, 
>-      0,   0, 137,   0,   0,   0, 
>-     89,   0,   0,   4,  70, 142, 
>-     32,   0,   0,   0,   0,   0, 
>-      1,   0,   0,   0,  90,   0, 
>-      0,   3,   0,  96,  16,   0, 
>-      0,   0,   0,   0,  88,  64, 
>-      0,   4,   0, 112,  16,   0, 
>-      0,   0,   0,   0,  85,  85, 
>-      0,   0, 100,   8,   0,   4, 
>-     18,  16,  16,   0,   1,   0, 
>-      0,   0,   4,   0,   0,   0, 
>-     98,  16,   0,   3,  50,  16, 
>-     16,   0,   2,   0,   0,   0, 
>-    101,   0,   0,   3, 242,  32, 
>-     16,   0,   0,   0,   0,   0, 
>-    104,   0,   0,   2,   1,   0, 
>-      0,   0, 105,   0,   0,   4, 
>-      0,   0,   0,   0,   6,   0, 
>-      0,   0,   4,   0,   0,   0, 
>-     86,   0,   0,   5,  66,   0, 
>-     16,   0,   0,   0,   0,   0, 
>-     10,  16,  16,   0,   1,   0, 
>-      0,   0,  54,   0,   0,   5, 
>-     50,   0,  16,   0,   0,   0, 
>-      0,   0,  70,  16,  16,   0, 
>-      2,   0,   0,   0,  69,   0, 
>-      0,   9, 242,   0,  16,   0, 
>-      0,   0,   0,   0,  70,   2, 
>-     16,   0,   0,   0,   0,   0, 
>-     70, 126,  16,   0,   0,   0, 
>-      0,   0,   0,  96,  16,   0, 
>-      0,   0,   0,   0,  54,   0, 
>-      0,   6,  18,  48,  32,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,  10,   0,  16,   0, 
>-      0,   0,   0,   0,  54,   0, 
>-      0,   6,  18,  48,  32,   0, 
>-      0,   0,   0,   0,   1,   0, 
>-      0,   0,  26,   0,  16,   0, 
>-      0,   0,   0,   0,  54,   0, 
>-      0,   6,  18,  48,  32,   0, 
>-      0,   0,   0,   0,   2,   0, 
>-      0,   0,  42,   0,  16,   0, 
>-      0,   0,   0,   0,  54,   0, 
>-      0,   6,  18,  48,  32,   0, 
>-      0,   0,   0,   0,   3,   0, 
>-      0,   0,  58,   0,  16,   0, 
>-      0,   0,   0,   0,  54,   0, 
>-      0,   6,  18,  48,  32,   0, 
>-      0,   0,   0,   0,   4,   0, 
>-      0,   0,   1,  64,   0,   0, 
>-      0,   0,   0,   0,  54,   0, 
>-      0,   6,  18,  48,  32,   0, 
>-      0,   0,   0,   0,   5,   0, 
>-      0,   0,   1,  64,   0,   0, 
>-      0,   0, 128,  63,  54,   0, 
>-      0,   6,  18,   0,  16,   0, 
>-      0,   0,   0,   0,  10, 128, 
>-     32,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,  54,   0, 
>-      0,   7,  18,  32,  16,   0, 
>-      0,   0,   0,   0,  10,  48, 
>-     32,   4,   0,   0,   0,   0, 
>-     10,   0,  16,   0,   0,   0, 
>-      0,   0,  54,   0,   0,   6, 
>-     18,   0,  16,   0,   0,   0, 
>-      0,   0,  26, 128,  32,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,  54,   0,   0,   7, 
>-     34,  32,  16,   0,   0,   0, 
>-      0,   0,  10,  48,  32,   4, 
>-      0,   0,   0,   0,  10,   0, 
>-     16,   0,   0,   0,   0,   0, 
>-     54,   0,   0,   6,  18,   0, 
>-     16,   0,   0,   0,   0,   0, 
>-     42, 128,  32,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-     54,   0,   0,   7,  66,  32, 
>-     16,   0,   0,   0,   0,   0, 
>-     10,  48,  32,   4,   0,   0, 
>-      0,   0,  10,   0,  16,   0, 
>-      0,   0,   0,   0,  54,   0, 
>-      0,   6,  18,   0,  16,   0, 
>-      0,   0,   0,   0,  58, 128, 
>-     32,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,  54,   0, 
>-      0,   7, 130,  32,  16,   0, 
>-      0,   0,   0,   0,  10,  48, 
>-     32,   4,   0,   0,   0,   0, 
>-     10,   0,  16,   0,   0,   0, 
>-      0,   0,  62,   0,   0,   1, 
>-     83,  84,  65,  84, 116,   0, 
>-      0,   0,  18,   0,   0,   0, 
>-      1,   0,   0,   0,   0,   0, 
>-      0,   0,   3,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      1,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      6,   0,   0,   0,  10,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   1,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      5,   0,   0,   0,   0,   0, 
>-      0,   0,   1,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0
>-};
>+const BYTE g_PS_SwizzleF2DArray[] = {
>+    68,  88,  66,  67,  10,  112, 114, 208, 204, 221, 6,   130, 191, 123, 80,  111, 226, 70,  79,
>+    225, 1,   0,   0,   0,   204, 4,   0,   0,   5,   0,   0,   0,   52,  0,   0,   0,   104, 1,
>+    0,   0,   240, 1,   0,   0,   36,  2,   0,   0,   80,  4,   0,   0,   82,  68,  69,  70,  44,
>+    1,   0,   0,   1,   0,   0,   0,   168, 0,   0,   0,   3,   0,   0,   0,   28,  0,   0,   0,
>+    0,   4,   255, 255, 0,   1,   0,   0,   248, 0,   0,   0,   124, 0,   0,   0,   3,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,
>+    0,   0,   1,   0,   0,   0,   132, 0,   0,   0,   2,   0,   0,   0,   5,   0,   0,   0,   5,
>+    0,   0,   0,   255, 255, 255, 255, 0,   0,   0,   0,   1,   0,   0,   0,   13,  0,   0,   0,
>+    148, 0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   1,   0,   0,   0,   1,   0,   0,   0,   83,  97,  109, 112, 108, 101,
>+    114, 0,   84,  101, 120, 116, 117, 114, 101, 70,  50,  68,  65,  114, 114, 97,  121, 0,   83,
>+    119, 105, 122, 122, 108, 101, 80,  114, 111, 112, 101, 114, 116, 105, 101, 115, 0,   171, 171,
>+    148, 0,   0,   0,   1,   0,   0,   0,   192, 0,   0,   0,   16,  0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   216, 0,   0,   0,   0,   0,   0,   0,   16,  0,   0,   0,   2,   0,
>+    0,   0,   232, 0,   0,   0,   0,   0,   0,   0,   83,  119, 105, 122, 122, 108, 101, 73,  110,
>+    100, 105, 99,  101, 115, 0,   171, 1,   0,   19,  0,   1,   0,   4,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   77,  105, 99,  114, 111, 115, 111, 102, 116, 32,  40,  82,  41,  32,  72,
>+    76,  83,  76,  32,  83,  104, 97,  100, 101, 114, 32,  67,  111, 109, 112, 105, 108, 101, 114,
>+    32,  57,  46,  50,  57,  46,  57,  53,  50,  46,  51,  49,  49,  49,  0,   171, 171, 171, 73,
>+    83,  71,  78,  128, 0,   0,   0,   3,   0,   0,   0,   8,   0,   0,   0,   80,  0,   0,   0,
>+    0,   0,   0,   0,   1,   0,   0,   0,   3,   0,   0,   0,   0,   0,   0,   0,   15,  0,   0,
>+    0,   92,  0,   0,   0,   0,   0,   0,   0,   4,   0,   0,   0,   1,   0,   0,   0,   1,   0,
>+    0,   0,   1,   1,   0,   0,   118, 0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   3,
>+    0,   0,   0,   2,   0,   0,   0,   7,   3,   0,   0,   83,  86,  95,  80,  79,  83,  73,  84,
>+    73,  79,  78,  0,   83,  86,  95,  82,  69,  78,  68,  69,  82,  84,  65,  82,  71,  69,  84,
>+    65,  82,  82,  65,  89,  73,  78,  68,  69,  88,  0,   84,  69,  88,  67,  79,  79,  82,  68,
>+    0,   171, 79,  83,  71,  78,  44,  0,   0,   0,   1,   0,   0,   0,   8,   0,   0,   0,   32,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   3,   0,   0,   0,   0,   0,   0,   0,
>+    15,  0,   0,   0,   83,  86,  95,  84,  65,  82,  71,  69,  84,  0,   171, 171, 83,  72,  68,
>+    82,  36,  2,   0,   0,   64,  0,   0,   0,   137, 0,   0,   0,   89,  0,   0,   4,   70,  142,
>+    32,  0,   0,   0,   0,   0,   1,   0,   0,   0,   90,  0,   0,   3,   0,   96,  16,  0,   0,
>+    0,   0,   0,   88,  64,  0,   4,   0,   112, 16,  0,   0,   0,   0,   0,   85,  85,  0,   0,
>+    100, 8,   0,   4,   18,  16,  16,  0,   1,   0,   0,   0,   4,   0,   0,   0,   98,  16,  0,
>+    3,   50,  16,  16,  0,   2,   0,   0,   0,   101, 0,   0,   3,   242, 32,  16,  0,   0,   0,
>+    0,   0,   104, 0,   0,   2,   1,   0,   0,   0,   105, 0,   0,   4,   0,   0,   0,   0,   6,
>+    0,   0,   0,   4,   0,   0,   0,   86,  0,   0,   5,   66,  0,   16,  0,   0,   0,   0,   0,
>+    10,  16,  16,  0,   1,   0,   0,   0,   54,  0,   0,   5,   50,  0,   16,  0,   0,   0,   0,
>+    0,   70,  16,  16,  0,   2,   0,   0,   0,   69,  0,   0,   9,   242, 0,   16,  0,   0,   0,
>+    0,   0,   70,  2,   16,  0,   0,   0,   0,   0,   70,  126, 16,  0,   0,   0,   0,   0,   0,
>+    96,  16,  0,   0,   0,   0,   0,   54,  0,   0,   6,   18,  48,  32,  0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   10,  0,   16,  0,   0,   0,   0,   0,   54,  0,   0,   6,   18,  48,  32,
>+    0,   0,   0,   0,   0,   1,   0,   0,   0,   26,  0,   16,  0,   0,   0,   0,   0,   54,  0,
>+    0,   6,   18,  48,  32,  0,   0,   0,   0,   0,   2,   0,   0,   0,   42,  0,   16,  0,   0,
>+    0,   0,   0,   54,  0,   0,   6,   18,  48,  32,  0,   0,   0,   0,   0,   3,   0,   0,   0,
>+    58,  0,   16,  0,   0,   0,   0,   0,   54,  0,   0,   6,   18,  48,  32,  0,   0,   0,   0,
>+    0,   4,   0,   0,   0,   1,   64,  0,   0,   0,   0,   0,   0,   54,  0,   0,   6,   18,  48,
>+    32,  0,   0,   0,   0,   0,   5,   0,   0,   0,   1,   64,  0,   0,   0,   0,   128, 63,  54,
>+    0,   0,   6,   18,  0,   16,  0,   0,   0,   0,   0,   10,  128, 32,  0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   54,  0,   0,   7,   18,  32,  16,  0,   0,   0,   0,   0,   10,  48,  32,
>+    4,   0,   0,   0,   0,   10,  0,   16,  0,   0,   0,   0,   0,   54,  0,   0,   6,   18,  0,
>+    16,  0,   0,   0,   0,   0,   26,  128, 32,  0,   0,   0,   0,   0,   0,   0,   0,   0,   54,
>+    0,   0,   7,   34,  32,  16,  0,   0,   0,   0,   0,   10,  48,  32,  4,   0,   0,   0,   0,
>+    10,  0,   16,  0,   0,   0,   0,   0,   54,  0,   0,   6,   18,  0,   16,  0,   0,   0,   0,
>+    0,   42,  128, 32,  0,   0,   0,   0,   0,   0,   0,   0,   0,   54,  0,   0,   7,   66,  32,
>+    16,  0,   0,   0,   0,   0,   10,  48,  32,  4,   0,   0,   0,   0,   10,  0,   16,  0,   0,
>+    0,   0,   0,   54,  0,   0,   6,   18,  0,   16,  0,   0,   0,   0,   0,   58,  128, 32,  0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   54,  0,   0,   7,   130, 32,  16,  0,   0,   0,   0,
>+    0,   10,  48,  32,  4,   0,   0,   0,   0,   10,  0,   16,  0,   0,   0,   0,   0,   62,  0,
>+    0,   1,   83,  84,  65,  84,  116, 0,   0,   0,   18,  0,   0,   0,   1,   0,   0,   0,   0,
>+    0,   0,   0,   3,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   6,   0,   0,   0,   10,  0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   5,   0,   0,   0,   0,   0,   0,   0,   1,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0};
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/swizzlef2dps.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/swizzlef2dps.h
>index ea57e8737f5..9e923bfa99b 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/swizzlef2dps.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/swizzlef2dps.h
>@@ -1,6 +1,10 @@
> #if 0
> //
>-// Generated by Microsoft (R) HLSL Shader Compiler 6.3.9600.16384
>+// Generated by Microsoft (R) HLSL Shader Compiler 9.29.952.3111
>+//
>+//
>+//   fxc /nologo /E PS_SwizzleF2D /T ps_4_0 /Fh compiled\swizzlef2dps.h
>+//    Swizzle11.hlsl
> //
> //
> // Buffer Definitions: 
>@@ -25,17 +29,17 @@
> //
> // Input signature:
> //
>-// Name                 Index   Mask Register SysValue  Format   Used
>-// -------------------- ----- ------ -------- -------- ------- ------
>-// SV_POSITION              0   xyzw        0      POS   float       
>-// TEXCOORD                 0   xy          1     NONE   float   xy  
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_POSITION              0   xyzw        0      POS  float       
>+// TEXCOORD                 0   xy          1     NONE  float   xy  
> //
> //
> // Output signature:
> //
>-// Name                 Index   Mask Register SysValue  Format   Used
>-// -------------------- ----- ------ -------- -------- ------- ------
>-// SV_TARGET                0   xyzw        0   TARGET   float   xyzw
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_TARGET                0   xyzw        0   TARGET  float   xyzw
> //
> ps_4_0
> dcl_constantbuffer cb0[1], immediateIndexed
>@@ -64,193 +68,63 @@ ret
> // Approximately 16 instruction slots used
> #endif
> 
>-const BYTE g_PS_SwizzleF2D[] =
>-{
>-     68,  88,  66,  67, 187, 204, 
>-    160,  39, 195, 158, 245,  72, 
>-    125, 249,  70, 140, 158, 199, 
>-    246, 220,   1,   0,   0,   0, 
>-     96,   4,   0,   0,   5,   0, 
>-      0,   0,  52,   0,   0,   0, 
>-    100,   1,   0,   0, 188,   1, 
>-      0,   0, 240,   1,   0,   0, 
>-    228,   3,   0,   0,  82,  68, 
>-     69,  70,  40,   1,   0,   0, 
>-      1,   0,   0,   0, 164,   0, 
>-      0,   0,   3,   0,   0,   0, 
>-     28,   0,   0,   0,   0,   4, 
>-    255, 255,   0,   1,   0,   0, 
>-    244,   0,   0,   0, 124,   0, 
>-      0,   0,   3,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   1,   0, 
>-      0,   0,   1,   0,   0,   0, 
>-    132,   0,   0,   0,   2,   0, 
>-      0,   0,   5,   0,   0,   0, 
>-      4,   0,   0,   0, 255, 255, 
>-    255, 255,   0,   0,   0,   0, 
>-      1,   0,   0,   0,  13,   0, 
>-      0,   0, 143,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   1,   0,   0,   0, 
>-      1,   0,   0,   0,  83,  97, 
>-    109, 112, 108, 101, 114,   0, 
>-     84, 101, 120, 116, 117, 114, 
>-    101,  70,  50,  68,   0,  83, 
>-    119, 105, 122, 122, 108, 101, 
>-     80, 114, 111, 112, 101, 114, 
>-    116, 105, 101, 115,   0, 171, 
>-    171, 171, 143,   0,   0,   0, 
>-      1,   0,   0,   0, 188,   0, 
>-      0,   0,  16,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0, 212,   0,   0,   0, 
>-      0,   0,   0,   0,  16,   0, 
>-      0,   0,   2,   0,   0,   0, 
>-    228,   0,   0,   0,   0,   0, 
>-      0,   0,  83, 119, 105, 122, 
>-    122, 108, 101,  73, 110, 100, 
>-    105,  99, 101, 115,   0, 171, 
>-      1,   0,  19,   0,   1,   0, 
>-      4,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,  77, 105, 
>-     99, 114, 111, 115, 111, 102, 
>-    116,  32,  40,  82,  41,  32, 
>-     72,  76,  83,  76,  32,  83, 
>-    104,  97, 100, 101, 114,  32, 
>-     67, 111, 109, 112, 105, 108, 
>-    101, 114,  32,  54,  46,  51, 
>-     46,  57,  54,  48,  48,  46, 
>-     49,  54,  51,  56,  52,   0, 
>-    171, 171,  73,  83,  71,  78, 
>-     80,   0,   0,   0,   2,   0, 
>-      0,   0,   8,   0,   0,   0, 
>-     56,   0,   0,   0,   0,   0, 
>-      0,   0,   1,   0,   0,   0, 
>-      3,   0,   0,   0,   0,   0, 
>-      0,   0,  15,   0,   0,   0, 
>-     68,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      3,   0,   0,   0,   1,   0, 
>-      0,   0,   3,   3,   0,   0, 
>-     83,  86,  95,  80,  79,  83, 
>-     73,  84,  73,  79,  78,   0, 
>-     84,  69,  88,  67,  79,  79, 
>-     82,  68,   0, 171, 171, 171, 
>-     79,  83,  71,  78,  44,   0, 
>-      0,   0,   1,   0,   0,   0, 
>-      8,   0,   0,   0,  32,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   3,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-     15,   0,   0,   0,  83,  86, 
>-     95,  84,  65,  82,  71,  69, 
>-     84,   0, 171, 171,  83,  72, 
>-     68,  82, 236,   1,   0,   0, 
>-     64,   0,   0,   0, 123,   0, 
>-      0,   0,  89,   0,   0,   4, 
>-     70, 142,  32,   0,   0,   0, 
>-      0,   0,   1,   0,   0,   0, 
>-     90,   0,   0,   3,   0,  96, 
>-     16,   0,   0,   0,   0,   0, 
>-     88,  24,   0,   4,   0, 112, 
>-     16,   0,   0,   0,   0,   0, 
>-     85,  85,   0,   0,  98,  16, 
>-      0,   3,  50,  16,  16,   0, 
>-      1,   0,   0,   0, 101,   0, 
>-      0,   3, 242,  32,  16,   0, 
>-      0,   0,   0,   0, 104,   0, 
>-      0,   2,   1,   0,   0,   0, 
>-    105,   0,   0,   4,   0,   0, 
>-      0,   0,   6,   0,   0,   0, 
>-      4,   0,   0,   0,  69,   0, 
>-      0,   9, 242,   0,  16,   0, 
>-      0,   0,   0,   0,  70,  16, 
>-     16,   0,   1,   0,   0,   0, 
>-     70, 126,  16,   0,   0,   0, 
>-      0,   0,   0,  96,  16,   0, 
>-      0,   0,   0,   0,  54,   0, 
>-      0,   6,  18,  48,  32,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,  10,   0,  16,   0, 
>-      0,   0,   0,   0,  54,   0, 
>-      0,   6,  18,  48,  32,   0, 
>-      0,   0,   0,   0,   1,   0, 
>-      0,   0,  26,   0,  16,   0, 
>-      0,   0,   0,   0,  54,   0, 
>-      0,   6,  18,  48,  32,   0, 
>-      0,   0,   0,   0,   2,   0, 
>-      0,   0,  42,   0,  16,   0, 
>-      0,   0,   0,   0,  54,   0, 
>-      0,   6,  18,  48,  32,   0, 
>-      0,   0,   0,   0,   3,   0, 
>-      0,   0,  58,   0,  16,   0, 
>-      0,   0,   0,   0,  54,   0, 
>-      0,   6,  18,  48,  32,   0, 
>-      0,   0,   0,   0,   4,   0, 
>-      0,   0,   1,  64,   0,   0, 
>-      0,   0,   0,   0,  54,   0, 
>-      0,   6,  18,  48,  32,   0, 
>-      0,   0,   0,   0,   5,   0, 
>-      0,   0,   1,  64,   0,   0, 
>-      0,   0, 128,  63,  54,   0, 
>-      0,   6,  18,   0,  16,   0, 
>-      0,   0,   0,   0,  10, 128, 
>-     32,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,  54,   0, 
>-      0,   7,  18,  32,  16,   0, 
>-      0,   0,   0,   0,  10,  48, 
>-     32,   4,   0,   0,   0,   0, 
>-     10,   0,  16,   0,   0,   0, 
>-      0,   0,  54,   0,   0,   6, 
>-     18,   0,  16,   0,   0,   0, 
>-      0,   0,  26, 128,  32,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,  54,   0,   0,   7, 
>-     34,  32,  16,   0,   0,   0, 
>-      0,   0,  10,  48,  32,   4, 
>-      0,   0,   0,   0,  10,   0, 
>-     16,   0,   0,   0,   0,   0, 
>-     54,   0,   0,   6,  18,   0, 
>-     16,   0,   0,   0,   0,   0, 
>-     42, 128,  32,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-     54,   0,   0,   7,  66,  32, 
>-     16,   0,   0,   0,   0,   0, 
>-     10,  48,  32,   4,   0,   0, 
>-      0,   0,  10,   0,  16,   0, 
>-      0,   0,   0,   0,  54,   0, 
>-      0,   6,  18,   0,  16,   0, 
>-      0,   0,   0,   0,  58, 128, 
>-     32,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,  54,   0, 
>-      0,   7, 130,  32,  16,   0, 
>-      0,   0,   0,   0,  10,  48, 
>-     32,   4,   0,   0,   0,   0, 
>-     10,   0,  16,   0,   0,   0, 
>-      0,   0,  62,   0,   0,   1, 
>-     83,  84,  65,  84, 116,   0, 
>-      0,   0,  16,   0,   0,   0, 
>-      1,   0,   0,   0,   0,   0, 
>-      0,   0,   2,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      1,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      6,   0,   0,   0,  10,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   1,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      4,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0
>-};
>+const BYTE g_PS_SwizzleF2D[] = {
>+    68,  88,  66,  67,  231, 84,  171, 36,  174, 101, 233, 167, 224, 61,  160, 30,  113, 106, 106,
>+    125, 1,   0,   0,   0,   96,  4,   0,   0,   5,   0,   0,   0,   52,  0,   0,   0,   100, 1,
>+    0,   0,   188, 1,   0,   0,   240, 1,   0,   0,   228, 3,   0,   0,   82,  68,  69,  70,  40,
>+    1,   0,   0,   1,   0,   0,   0,   164, 0,   0,   0,   3,   0,   0,   0,   28,  0,   0,   0,
>+    0,   4,   255, 255, 0,   1,   0,   0,   244, 0,   0,   0,   124, 0,   0,   0,   3,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,
>+    0,   0,   1,   0,   0,   0,   132, 0,   0,   0,   2,   0,   0,   0,   5,   0,   0,   0,   4,
>+    0,   0,   0,   255, 255, 255, 255, 0,   0,   0,   0,   1,   0,   0,   0,   13,  0,   0,   0,
>+    143, 0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   1,   0,   0,   0,   1,   0,   0,   0,   83,  97,  109, 112, 108, 101,
>+    114, 0,   84,  101, 120, 116, 117, 114, 101, 70,  50,  68,  0,   83,  119, 105, 122, 122, 108,
>+    101, 80,  114, 111, 112, 101, 114, 116, 105, 101, 115, 0,   171, 171, 171, 143, 0,   0,   0,
>+    1,   0,   0,   0,   188, 0,   0,   0,   16,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   212, 0,   0,   0,   0,   0,   0,   0,   16,  0,   0,   0,   2,   0,   0,   0,   228, 0,
>+    0,   0,   0,   0,   0,   0,   83,  119, 105, 122, 122, 108, 101, 73,  110, 100, 105, 99,  101,
>+    115, 0,   171, 1,   0,   19,  0,   1,   0,   4,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    77,  105, 99,  114, 111, 115, 111, 102, 116, 32,  40,  82,  41,  32,  72,  76,  83,  76,  32,
>+    83,  104, 97,  100, 101, 114, 32,  67,  111, 109, 112, 105, 108, 101, 114, 32,  57,  46,  50,
>+    57,  46,  57,  53,  50,  46,  51,  49,  49,  49,  0,   171, 171, 171, 73,  83,  71,  78,  80,
>+    0,   0,   0,   2,   0,   0,   0,   8,   0,   0,   0,   56,  0,   0,   0,   0,   0,   0,   0,
>+    1,   0,   0,   0,   3,   0,   0,   0,   0,   0,   0,   0,   15,  0,   0,   0,   68,  0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   3,   0,   0,   0,   1,   0,   0,   0,   3,   3,
>+    0,   0,   83,  86,  95,  80,  79,  83,  73,  84,  73,  79,  78,  0,   84,  69,  88,  67,  79,
>+    79,  82,  68,  0,   171, 171, 171, 79,  83,  71,  78,  44,  0,   0,   0,   1,   0,   0,   0,
>+    8,   0,   0,   0,   32,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   3,   0,   0,
>+    0,   0,   0,   0,   0,   15,  0,   0,   0,   83,  86,  95,  84,  65,  82,  71,  69,  84,  0,
>+    171, 171, 83,  72,  68,  82,  236, 1,   0,   0,   64,  0,   0,   0,   123, 0,   0,   0,   89,
>+    0,   0,   4,   70,  142, 32,  0,   0,   0,   0,   0,   1,   0,   0,   0,   90,  0,   0,   3,
>+    0,   96,  16,  0,   0,   0,   0,   0,   88,  24,  0,   4,   0,   112, 16,  0,   0,   0,   0,
>+    0,   85,  85,  0,   0,   98,  16,  0,   3,   50,  16,  16,  0,   1,   0,   0,   0,   101, 0,
>+    0,   3,   242, 32,  16,  0,   0,   0,   0,   0,   104, 0,   0,   2,   1,   0,   0,   0,   105,
>+    0,   0,   4,   0,   0,   0,   0,   6,   0,   0,   0,   4,   0,   0,   0,   69,  0,   0,   9,
>+    242, 0,   16,  0,   0,   0,   0,   0,   70,  16,  16,  0,   1,   0,   0,   0,   70,  126, 16,
>+    0,   0,   0,   0,   0,   0,   96,  16,  0,   0,   0,   0,   0,   54,  0,   0,   6,   18,  48,
>+    32,  0,   0,   0,   0,   0,   0,   0,   0,   0,   10,  0,   16,  0,   0,   0,   0,   0,   54,
>+    0,   0,   6,   18,  48,  32,  0,   0,   0,   0,   0,   1,   0,   0,   0,   26,  0,   16,  0,
>+    0,   0,   0,   0,   54,  0,   0,   6,   18,  48,  32,  0,   0,   0,   0,   0,   2,   0,   0,
>+    0,   42,  0,   16,  0,   0,   0,   0,   0,   54,  0,   0,   6,   18,  48,  32,  0,   0,   0,
>+    0,   0,   3,   0,   0,   0,   58,  0,   16,  0,   0,   0,   0,   0,   54,  0,   0,   6,   18,
>+    48,  32,  0,   0,   0,   0,   0,   4,   0,   0,   0,   1,   64,  0,   0,   0,   0,   0,   0,
>+    54,  0,   0,   6,   18,  48,  32,  0,   0,   0,   0,   0,   5,   0,   0,   0,   1,   64,  0,
>+    0,   0,   0,   128, 63,  54,  0,   0,   6,   18,  0,   16,  0,   0,   0,   0,   0,   10,  128,
>+    32,  0,   0,   0,   0,   0,   0,   0,   0,   0,   54,  0,   0,   7,   18,  32,  16,  0,   0,
>+    0,   0,   0,   10,  48,  32,  4,   0,   0,   0,   0,   10,  0,   16,  0,   0,   0,   0,   0,
>+    54,  0,   0,   6,   18,  0,   16,  0,   0,   0,   0,   0,   26,  128, 32,  0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   54,  0,   0,   7,   34,  32,  16,  0,   0,   0,   0,   0,   10,  48,
>+    32,  4,   0,   0,   0,   0,   10,  0,   16,  0,   0,   0,   0,   0,   54,  0,   0,   6,   18,
>+    0,   16,  0,   0,   0,   0,   0,   42,  128, 32,  0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    54,  0,   0,   7,   66,  32,  16,  0,   0,   0,   0,   0,   10,  48,  32,  4,   0,   0,   0,
>+    0,   10,  0,   16,  0,   0,   0,   0,   0,   54,  0,   0,   6,   18,  0,   16,  0,   0,   0,
>+    0,   0,   58,  128, 32,  0,   0,   0,   0,   0,   0,   0,   0,   0,   54,  0,   0,   7,   130,
>+    32,  16,  0,   0,   0,   0,   0,   10,  48,  32,  4,   0,   0,   0,   0,   10,  0,   16,  0,
>+    0,   0,   0,   0,   62,  0,   0,   1,   83,  84,  65,  84,  116, 0,   0,   0,   16,  0,   0,
>+    0,   1,   0,   0,   0,   0,   0,   0,   0,   2,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   6,
>+    0,   0,   0,   10,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   4,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0};
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/swizzlef3dps.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/swizzlef3dps.h
>index 7938639e68a..191e83e81e4 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/swizzlef3dps.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/swizzlef3dps.h
>@@ -1,6 +1,10 @@
> #if 0
> //
>-// Generated by Microsoft (R) HLSL Shader Compiler 6.3.9600.16384
>+// Generated by Microsoft (R) HLSL Shader Compiler 9.29.952.3111
>+//
>+//
>+//   fxc /nologo /E PS_SwizzleF3D /T ps_4_0 /Fh compiled\swizzlef3dps.h
>+//    Swizzle11.hlsl
> //
> //
> // Buffer Definitions: 
>@@ -25,18 +29,18 @@
> //
> // Input signature:
> //
>-// Name                 Index   Mask Register SysValue  Format   Used
>-// -------------------- ----- ------ -------- -------- ------- ------
>-// SV_POSITION              0   xyzw        0      POS   float       
>-// SV_RENDERTARGETARRAYINDEX     0   x           1  RTINDEX    uint       
>-// TEXCOORD                 0   xyz         2     NONE   float   xyz 
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_POSITION              0   xyzw        0      POS  float       
>+// SV_RENDERTARGETARRAYINDEX     0   x           1  RTINDEX   uint       
>+// TEXCOORD                 0   xyz         2     NONE  float   xyz 
> //
> //
> // Output signature:
> //
>-// Name                 Index   Mask Register SysValue  Format   Used
>-// -------------------- ----- ------ -------- -------- ------- ------
>-// SV_TARGET                0   xyzw        0   TARGET   float   xyzw
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_TARGET                0   xyzw        0   TARGET  float   xyzw
> //
> ps_4_0
> dcl_constantbuffer cb0[1], immediateIndexed
>@@ -65,201 +69,66 @@ ret
> // Approximately 16 instruction slots used
> #endif
> 
>-const BYTE g_PS_SwizzleF3D[] =
>-{
>-     68,  88,  66,  67, 238,  60, 
>-     80,  74,  42,  65, 120, 165, 
>-    177,  91, 253, 216,  89, 102, 
>-      2, 228,   1,   0,   0,   0, 
>-    144,   4,   0,   0,   5,   0, 
>-      0,   0,  52,   0,   0,   0, 
>-    100,   1,   0,   0, 236,   1, 
>-      0,   0,  32,   2,   0,   0, 
>-     20,   4,   0,   0,  82,  68, 
>-     69,  70,  40,   1,   0,   0, 
>-      1,   0,   0,   0, 164,   0, 
>-      0,   0,   3,   0,   0,   0, 
>-     28,   0,   0,   0,   0,   4, 
>-    255, 255,   0,   1,   0,   0, 
>-    244,   0,   0,   0, 124,   0, 
>-      0,   0,   3,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   1,   0, 
>-      0,   0,   1,   0,   0,   0, 
>-    132,   0,   0,   0,   2,   0, 
>-      0,   0,   5,   0,   0,   0, 
>-      8,   0,   0,   0, 255, 255, 
>-    255, 255,   0,   0,   0,   0, 
>-      1,   0,   0,   0,  13,   0, 
>-      0,   0, 143,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   1,   0,   0,   0, 
>-      1,   0,   0,   0,  83,  97, 
>-    109, 112, 108, 101, 114,   0, 
>-     84, 101, 120, 116, 117, 114, 
>-    101,  70,  51,  68,   0,  83, 
>-    119, 105, 122, 122, 108, 101, 
>-     80, 114, 111, 112, 101, 114, 
>-    116, 105, 101, 115,   0, 171, 
>-    171, 171, 143,   0,   0,   0, 
>-      1,   0,   0,   0, 188,   0, 
>-      0,   0,  16,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0, 212,   0,   0,   0, 
>-      0,   0,   0,   0,  16,   0, 
>-      0,   0,   2,   0,   0,   0, 
>-    228,   0,   0,   0,   0,   0, 
>-      0,   0,  83, 119, 105, 122, 
>-    122, 108, 101,  73, 110, 100, 
>-    105,  99, 101, 115,   0, 171, 
>-      1,   0,  19,   0,   1,   0, 
>-      4,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,  77, 105, 
>-     99, 114, 111, 115, 111, 102, 
>-    116,  32,  40,  82,  41,  32, 
>-     72,  76,  83,  76,  32,  83, 
>-    104,  97, 100, 101, 114,  32, 
>-     67, 111, 109, 112, 105, 108, 
>-    101, 114,  32,  54,  46,  51, 
>-     46,  57,  54,  48,  48,  46, 
>-     49,  54,  51,  56,  52,   0, 
>-    171, 171,  73,  83,  71,  78, 
>-    128,   0,   0,   0,   3,   0, 
>-      0,   0,   8,   0,   0,   0, 
>-     80,   0,   0,   0,   0,   0, 
>-      0,   0,   1,   0,   0,   0, 
>-      3,   0,   0,   0,   0,   0, 
>-      0,   0,  15,   0,   0,   0, 
>-     92,   0,   0,   0,   0,   0, 
>-      0,   0,   4,   0,   0,   0, 
>-      1,   0,   0,   0,   1,   0, 
>-      0,   0,   1,   0,   0,   0, 
>-    118,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      3,   0,   0,   0,   2,   0, 
>-      0,   0,   7,   7,   0,   0, 
>-     83,  86,  95,  80,  79,  83, 
>-     73,  84,  73,  79,  78,   0, 
>-     83,  86,  95,  82,  69,  78, 
>-     68,  69,  82,  84,  65,  82, 
>-     71,  69,  84,  65,  82,  82, 
>-     65,  89,  73,  78,  68,  69, 
>-     88,   0,  84,  69,  88,  67, 
>-     79,  79,  82,  68,   0, 171, 
>-     79,  83,  71,  78,  44,   0, 
>-      0,   0,   1,   0,   0,   0, 
>-      8,   0,   0,   0,  32,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   3,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-     15,   0,   0,   0,  83,  86, 
>-     95,  84,  65,  82,  71,  69, 
>-     84,   0, 171, 171,  83,  72, 
>-     68,  82, 236,   1,   0,   0, 
>-     64,   0,   0,   0, 123,   0, 
>-      0,   0,  89,   0,   0,   4, 
>-     70, 142,  32,   0,   0,   0, 
>-      0,   0,   1,   0,   0,   0, 
>-     90,   0,   0,   3,   0,  96, 
>-     16,   0,   0,   0,   0,   0, 
>-     88,  40,   0,   4,   0, 112, 
>-     16,   0,   0,   0,   0,   0, 
>-     85,  85,   0,   0,  98,  16, 
>-      0,   3, 114,  16,  16,   0, 
>-      2,   0,   0,   0, 101,   0, 
>-      0,   3, 242,  32,  16,   0, 
>-      0,   0,   0,   0, 104,   0, 
>-      0,   2,   1,   0,   0,   0, 
>-    105,   0,   0,   4,   0,   0, 
>-      0,   0,   6,   0,   0,   0, 
>-      4,   0,   0,   0,  69,   0, 
>-      0,   9, 242,   0,  16,   0, 
>-      0,   0,   0,   0,  70,  18, 
>-     16,   0,   2,   0,   0,   0, 
>-     70, 126,  16,   0,   0,   0, 
>-      0,   0,   0,  96,  16,   0, 
>-      0,   0,   0,   0,  54,   0, 
>-      0,   6,  18,  48,  32,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,  10,   0,  16,   0, 
>-      0,   0,   0,   0,  54,   0, 
>-      0,   6,  18,  48,  32,   0, 
>-      0,   0,   0,   0,   1,   0, 
>-      0,   0,  26,   0,  16,   0, 
>-      0,   0,   0,   0,  54,   0, 
>-      0,   6,  18,  48,  32,   0, 
>-      0,   0,   0,   0,   2,   0, 
>-      0,   0,  42,   0,  16,   0, 
>-      0,   0,   0,   0,  54,   0, 
>-      0,   6,  18,  48,  32,   0, 
>-      0,   0,   0,   0,   3,   0, 
>-      0,   0,  58,   0,  16,   0, 
>-      0,   0,   0,   0,  54,   0, 
>-      0,   6,  18,  48,  32,   0, 
>-      0,   0,   0,   0,   4,   0, 
>-      0,   0,   1,  64,   0,   0, 
>-      0,   0,   0,   0,  54,   0, 
>-      0,   6,  18,  48,  32,   0, 
>-      0,   0,   0,   0,   5,   0, 
>-      0,   0,   1,  64,   0,   0, 
>-      0,   0, 128,  63,  54,   0, 
>-      0,   6,  18,   0,  16,   0, 
>-      0,   0,   0,   0,  10, 128, 
>-     32,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,  54,   0, 
>-      0,   7,  18,  32,  16,   0, 
>-      0,   0,   0,   0,  10,  48, 
>-     32,   4,   0,   0,   0,   0, 
>-     10,   0,  16,   0,   0,   0, 
>-      0,   0,  54,   0,   0,   6, 
>-     18,   0,  16,   0,   0,   0, 
>-      0,   0,  26, 128,  32,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,  54,   0,   0,   7, 
>-     34,  32,  16,   0,   0,   0, 
>-      0,   0,  10,  48,  32,   4, 
>-      0,   0,   0,   0,  10,   0, 
>-     16,   0,   0,   0,   0,   0, 
>-     54,   0,   0,   6,  18,   0, 
>-     16,   0,   0,   0,   0,   0, 
>-     42, 128,  32,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-     54,   0,   0,   7,  66,  32, 
>-     16,   0,   0,   0,   0,   0, 
>-     10,  48,  32,   4,   0,   0, 
>-      0,   0,  10,   0,  16,   0, 
>-      0,   0,   0,   0,  54,   0, 
>-      0,   6,  18,   0,  16,   0, 
>-      0,   0,   0,   0,  58, 128, 
>-     32,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,  54,   0, 
>-      0,   7, 130,  32,  16,   0, 
>-      0,   0,   0,   0,  10,  48, 
>-     32,   4,   0,   0,   0,   0, 
>-     10,   0,  16,   0,   0,   0, 
>-      0,   0,  62,   0,   0,   1, 
>-     83,  84,  65,  84, 116,   0, 
>-      0,   0,  16,   0,   0,   0, 
>-      1,   0,   0,   0,   0,   0, 
>-      0,   0,   2,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      1,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      6,   0,   0,   0,  10,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   1,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      4,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0
>-};
>+const BYTE g_PS_SwizzleF3D[] = {
>+    68,  88,  66,  67,  239, 190, 93,  16,  108, 116, 194, 88,  111, 43,  244, 26,  83,  204, 59,
>+    123, 1,   0,   0,   0,   144, 4,   0,   0,   5,   0,   0,   0,   52,  0,   0,   0,   100, 1,
>+    0,   0,   236, 1,   0,   0,   32,  2,   0,   0,   20,  4,   0,   0,   82,  68,  69,  70,  40,
>+    1,   0,   0,   1,   0,   0,   0,   164, 0,   0,   0,   3,   0,   0,   0,   28,  0,   0,   0,
>+    0,   4,   255, 255, 0,   1,   0,   0,   244, 0,   0,   0,   124, 0,   0,   0,   3,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,
>+    0,   0,   1,   0,   0,   0,   132, 0,   0,   0,   2,   0,   0,   0,   5,   0,   0,   0,   8,
>+    0,   0,   0,   255, 255, 255, 255, 0,   0,   0,   0,   1,   0,   0,   0,   13,  0,   0,   0,
>+    143, 0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   1,   0,   0,   0,   1,   0,   0,   0,   83,  97,  109, 112, 108, 101,
>+    114, 0,   84,  101, 120, 116, 117, 114, 101, 70,  51,  68,  0,   83,  119, 105, 122, 122, 108,
>+    101, 80,  114, 111, 112, 101, 114, 116, 105, 101, 115, 0,   171, 171, 171, 143, 0,   0,   0,
>+    1,   0,   0,   0,   188, 0,   0,   0,   16,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   212, 0,   0,   0,   0,   0,   0,   0,   16,  0,   0,   0,   2,   0,   0,   0,   228, 0,
>+    0,   0,   0,   0,   0,   0,   83,  119, 105, 122, 122, 108, 101, 73,  110, 100, 105, 99,  101,
>+    115, 0,   171, 1,   0,   19,  0,   1,   0,   4,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    77,  105, 99,  114, 111, 115, 111, 102, 116, 32,  40,  82,  41,  32,  72,  76,  83,  76,  32,
>+    83,  104, 97,  100, 101, 114, 32,  67,  111, 109, 112, 105, 108, 101, 114, 32,  57,  46,  50,
>+    57,  46,  57,  53,  50,  46,  51,  49,  49,  49,  0,   171, 171, 171, 73,  83,  71,  78,  128,
>+    0,   0,   0,   3,   0,   0,   0,   8,   0,   0,   0,   80,  0,   0,   0,   0,   0,   0,   0,
>+    1,   0,   0,   0,   3,   0,   0,   0,   0,   0,   0,   0,   15,  0,   0,   0,   92,  0,   0,
>+    0,   0,   0,   0,   0,   4,   0,   0,   0,   1,   0,   0,   0,   1,   0,   0,   0,   1,   0,
>+    0,   0,   118, 0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   3,   0,   0,   0,   2,
>+    0,   0,   0,   7,   7,   0,   0,   83,  86,  95,  80,  79,  83,  73,  84,  73,  79,  78,  0,
>+    83,  86,  95,  82,  69,  78,  68,  69,  82,  84,  65,  82,  71,  69,  84,  65,  82,  82,  65,
>+    89,  73,  78,  68,  69,  88,  0,   84,  69,  88,  67,  79,  79,  82,  68,  0,   171, 79,  83,
>+    71,  78,  44,  0,   0,   0,   1,   0,   0,   0,   8,   0,   0,   0,   32,  0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   3,   0,   0,   0,   0,   0,   0,   0,   15,  0,   0,   0,
>+    83,  86,  95,  84,  65,  82,  71,  69,  84,  0,   171, 171, 83,  72,  68,  82,  236, 1,   0,
>+    0,   64,  0,   0,   0,   123, 0,   0,   0,   89,  0,   0,   4,   70,  142, 32,  0,   0,   0,
>+    0,   0,   1,   0,   0,   0,   90,  0,   0,   3,   0,   96,  16,  0,   0,   0,   0,   0,   88,
>+    40,  0,   4,   0,   112, 16,  0,   0,   0,   0,   0,   85,  85,  0,   0,   98,  16,  0,   3,
>+    114, 16,  16,  0,   2,   0,   0,   0,   101, 0,   0,   3,   242, 32,  16,  0,   0,   0,   0,
>+    0,   104, 0,   0,   2,   1,   0,   0,   0,   105, 0,   0,   4,   0,   0,   0,   0,   6,   0,
>+    0,   0,   4,   0,   0,   0,   69,  0,   0,   9,   242, 0,   16,  0,   0,   0,   0,   0,   70,
>+    18,  16,  0,   2,   0,   0,   0,   70,  126, 16,  0,   0,   0,   0,   0,   0,   96,  16,  0,
>+    0,   0,   0,   0,   54,  0,   0,   6,   18,  48,  32,  0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   10,  0,   16,  0,   0,   0,   0,   0,   54,  0,   0,   6,   18,  48,  32,  0,   0,   0,
>+    0,   0,   1,   0,   0,   0,   26,  0,   16,  0,   0,   0,   0,   0,   54,  0,   0,   6,   18,
>+    48,  32,  0,   0,   0,   0,   0,   2,   0,   0,   0,   42,  0,   16,  0,   0,   0,   0,   0,
>+    54,  0,   0,   6,   18,  48,  32,  0,   0,   0,   0,   0,   3,   0,   0,   0,   58,  0,   16,
>+    0,   0,   0,   0,   0,   54,  0,   0,   6,   18,  48,  32,  0,   0,   0,   0,   0,   4,   0,
>+    0,   0,   1,   64,  0,   0,   0,   0,   0,   0,   54,  0,   0,   6,   18,  48,  32,  0,   0,
>+    0,   0,   0,   5,   0,   0,   0,   1,   64,  0,   0,   0,   0,   128, 63,  54,  0,   0,   6,
>+    18,  0,   16,  0,   0,   0,   0,   0,   10,  128, 32,  0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   54,  0,   0,   7,   18,  32,  16,  0,   0,   0,   0,   0,   10,  48,  32,  4,   0,   0,
>+    0,   0,   10,  0,   16,  0,   0,   0,   0,   0,   54,  0,   0,   6,   18,  0,   16,  0,   0,
>+    0,   0,   0,   26,  128, 32,  0,   0,   0,   0,   0,   0,   0,   0,   0,   54,  0,   0,   7,
>+    34,  32,  16,  0,   0,   0,   0,   0,   10,  48,  32,  4,   0,   0,   0,   0,   10,  0,   16,
>+    0,   0,   0,   0,   0,   54,  0,   0,   6,   18,  0,   16,  0,   0,   0,   0,   0,   42,  128,
>+    32,  0,   0,   0,   0,   0,   0,   0,   0,   0,   54,  0,   0,   7,   66,  32,  16,  0,   0,
>+    0,   0,   0,   10,  48,  32,  4,   0,   0,   0,   0,   10,  0,   16,  0,   0,   0,   0,   0,
>+    54,  0,   0,   6,   18,  0,   16,  0,   0,   0,   0,   0,   58,  128, 32,  0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   54,  0,   0,   7,   130, 32,  16,  0,   0,   0,   0,   0,   10,  48,
>+    32,  4,   0,   0,   0,   0,   10,  0,   16,  0,   0,   0,   0,   0,   62,  0,   0,   1,   83,
>+    84,  65,  84,  116, 0,   0,   0,   16,  0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,
>+    2,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   6,   0,   0,   0,   10,  0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   4,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0};
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/swizzlei2darrayps.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/swizzlei2darrayps.h
>index 76176fcbece..1b36b9598e5 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/swizzlei2darrayps.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/swizzlei2darrayps.h
>@@ -1,6 +1,10 @@
> #if 0
> //
>-// Generated by Microsoft (R) HLSL Shader Compiler 6.3.9600.16384
>+// Generated by Microsoft (R) HLSL Shader Compiler 9.29.952.3111
>+//
>+//
>+//   fxc /nologo /E PS_SwizzleI2DArray /T ps_4_0 /Fh
>+//    compiled\swizzlei2darrayps.h Swizzle11.hlsl
> //
> //
> // Buffer Definitions: 
>@@ -24,18 +28,18 @@
> //
> // Input signature:
> //
>-// Name                 Index   Mask Register SysValue  Format   Used
>-// -------------------- ----- ------ -------- -------- ------- ------
>-// SV_POSITION              0   xyzw        0      POS   float       
>-// SV_RENDERTARGETARRAYINDEX     0   x           1  RTINDEX    uint   x   
>-// TEXCOORD                 0   xyz         2     NONE   float   xy  
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_POSITION              0   xyzw        0      POS  float       
>+// SV_RENDERTARGETARRAYINDEX     0   x           1  RTINDEX   uint   x   
>+// TEXCOORD                 0   xyz         2     NONE  float   xy  
> //
> //
> // Output signature:
> //
>-// Name                 Index   Mask Register SysValue  Format   Used
>-// -------------------- ----- ------ -------- -------- ------- ------
>-// SV_TARGET                0   xyzw        0   TARGET     int   xyzw
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_TARGET                0   xyzw        0   TARGET    int   xyzw
> //
> ps_4_0
> dcl_constantbuffer cb0[1], immediateIndexed
>@@ -70,217 +74,71 @@ ret
> // Approximately 22 instruction slots used
> #endif
> 
>-const BYTE g_PS_SwizzleI2DArray[] =
>-{
>-     68,  88,  66,  67,  85,  61, 
>-     60,  36,  33, 245,  58, 113, 
>-    238, 227, 230, 200, 136, 227, 
>-     36, 193,   1,   0,   0,   0, 
>-    240,   4,   0,   0,   5,   0, 
>-      0,   0,  52,   0,   0,   0, 
>-     64,   1,   0,   0, 200,   1, 
>-      0,   0, 252,   1,   0,   0, 
>-    116,   4,   0,   0,  82,  68, 
>-     69,  70,   4,   1,   0,   0, 
>-      1,   0,   0,   0, 128,   0, 
>-      0,   0,   2,   0,   0,   0, 
>-     28,   0,   0,   0,   0,   4, 
>-    255, 255,   0,   1,   0,   0, 
>-    208,   0,   0,   0,  92,   0, 
>-      0,   0,   2,   0,   0,   0, 
>-      3,   0,   0,   0,   5,   0, 
>-      0,   0, 255, 255, 255, 255, 
>-      0,   0,   0,   0,   1,   0, 
>-      0,   0,  13,   0,   0,   0, 
>-    108,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      1,   0,   0,   0,   1,   0, 
>-      0,   0,  84, 101, 120, 116, 
>-    117, 114, 101,  73,  50,  68, 
>-     65, 114, 114,  97, 121,   0, 
>-     83, 119, 105, 122, 122, 108, 
>-    101,  80, 114, 111, 112, 101, 
>-    114, 116, 105, 101, 115,   0, 
>-    171, 171, 108,   0,   0,   0, 
>-      1,   0,   0,   0, 152,   0, 
>-      0,   0,  16,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0, 176,   0,   0,   0, 
>-      0,   0,   0,   0,  16,   0, 
>-      0,   0,   2,   0,   0,   0, 
>-    192,   0,   0,   0,   0,   0, 
>-      0,   0,  83, 119, 105, 122, 
>-    122, 108, 101,  73, 110, 100, 
>-    105,  99, 101, 115,   0, 171, 
>-      1,   0,  19,   0,   1,   0, 
>-      4,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,  77, 105, 
>-     99, 114, 111, 115, 111, 102, 
>-    116,  32,  40,  82,  41,  32, 
>-     72,  76,  83,  76,  32,  83, 
>-    104,  97, 100, 101, 114,  32, 
>-     67, 111, 109, 112, 105, 108, 
>-    101, 114,  32,  54,  46,  51, 
>-     46,  57,  54,  48,  48,  46, 
>-     49,  54,  51,  56,  52,   0, 
>-    171, 171,  73,  83,  71,  78, 
>-    128,   0,   0,   0,   3,   0, 
>-      0,   0,   8,   0,   0,   0, 
>-     80,   0,   0,   0,   0,   0, 
>-      0,   0,   1,   0,   0,   0, 
>-      3,   0,   0,   0,   0,   0, 
>-      0,   0,  15,   0,   0,   0, 
>-     92,   0,   0,   0,   0,   0, 
>-      0,   0,   4,   0,   0,   0, 
>-      1,   0,   0,   0,   1,   0, 
>-      0,   0,   1,   1,   0,   0, 
>-    118,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      3,   0,   0,   0,   2,   0, 
>-      0,   0,   7,   3,   0,   0, 
>-     83,  86,  95,  80,  79,  83, 
>-     73,  84,  73,  79,  78,   0, 
>-     83,  86,  95,  82,  69,  78, 
>-     68,  69,  82,  84,  65,  82, 
>-     71,  69,  84,  65,  82,  82, 
>-     65,  89,  73,  78,  68,  69, 
>-     88,   0,  84,  69,  88,  67, 
>-     79,  79,  82,  68,   0, 171, 
>-     79,  83,  71,  78,  44,   0, 
>-      0,   0,   1,   0,   0,   0, 
>-      8,   0,   0,   0,  32,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   2,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-     15,   0,   0,   0,  83,  86, 
>-     95,  84,  65,  82,  71,  69, 
>-     84,   0, 171, 171,  83,  72, 
>-     68,  82, 112,   2,   0,   0, 
>-     64,   0,   0,   0, 156,   0, 
>-      0,   0,  89,   0,   0,   4, 
>-     70, 142,  32,   0,   0,   0, 
>-      0,   0,   1,   0,   0,   0, 
>-     88,  64,   0,   4,   0, 112, 
>-     16,   0,   0,   0,   0,   0, 
>-     51,  51,   0,   0, 100,   8, 
>-      0,   4,  18,  16,  16,   0, 
>-      1,   0,   0,   0,   4,   0, 
>-      0,   0,  98,  16,   0,   3, 
>-     50,  16,  16,   0,   2,   0, 
>-      0,   0, 101,   0,   0,   3, 
>-    242,  32,  16,   0,   0,   0, 
>-      0,   0, 104,   0,   0,   2, 
>-      1,   0,   0,   0, 105,   0, 
>-      0,   4,   0,   0,   0,   0, 
>-      6,   0,   0,   0,   4,   0, 
>-      0,   0,  61,  16,   0,   7, 
>-    242,   0,  16,   0,   0,   0, 
>-      0,   0,   1,  64,   0,   0, 
>-      0,   0,   0,   0,  70, 126, 
>-     16,   0,   0,   0,   0,   0, 
>-     86,   0,   0,   5,  50,   0, 
>-     16,   0,   0,   0,   0,   0, 
>-     70,   0,  16,   0,   0,   0, 
>-      0,   0,  56,   0,   0,   7, 
>-     50,   0,  16,   0,   0,   0, 
>-      0,   0,  70,   0,  16,   0, 
>-      0,   0,   0,   0,  70,  16, 
>-     16,   0,   2,   0,   0,   0, 
>-     27,   0,   0,   5,  50,   0, 
>-     16,   0,   0,   0,   0,   0, 
>-     70,   0,  16,   0,   0,   0, 
>-      0,   0,  54,   0,   0,   5, 
>-     66,   0,  16,   0,   0,   0, 
>-      0,   0,  10,  16,  16,   0, 
>-      1,   0,   0,   0,  54,   0, 
>-      0,   5, 130,   0,  16,   0, 
>-      0,   0,   0,   0,   1,  64, 
>-      0,   0,   0,   0,   0,   0, 
>-     45,   0,   0,   7, 242,   0, 
>-     16,   0,   0,   0,   0,   0, 
>-     70,  14,  16,   0,   0,   0, 
>-      0,   0,  70, 126,  16,   0, 
>-      0,   0,   0,   0,  54,   0, 
>-      0,   6,  18,  48,  32,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,  10,   0,  16,   0, 
>-      0,   0,   0,   0,  54,   0, 
>-      0,   6,  18,  48,  32,   0, 
>-      0,   0,   0,   0,   1,   0, 
>-      0,   0,  26,   0,  16,   0, 
>-      0,   0,   0,   0,  54,   0, 
>-      0,   6,  18,  48,  32,   0, 
>-      0,   0,   0,   0,   2,   0, 
>-      0,   0,  42,   0,  16,   0, 
>-      0,   0,   0,   0,  54,   0, 
>-      0,   6,  18,  48,  32,   0, 
>-      0,   0,   0,   0,   3,   0, 
>-      0,   0,  58,   0,  16,   0, 
>-      0,   0,   0,   0,  54,   0, 
>-      0,   6,  18,  48,  32,   0, 
>-      0,   0,   0,   0,   4,   0, 
>-      0,   0,   1,  64,   0,   0, 
>-      0,   0,   0,   0,  54,   0, 
>-      0,   6,  18,  48,  32,   0, 
>-      0,   0,   0,   0,   5,   0, 
>-      0,   0,   1,  64,   0,   0, 
>-      1,   0,   0,   0,  54,   0, 
>-      0,   6,  18,   0,  16,   0, 
>-      0,   0,   0,   0,  10, 128, 
>-     32,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,  54,   0, 
>-      0,   7,  18,  32,  16,   0, 
>-      0,   0,   0,   0,  10,  48, 
>-     32,   4,   0,   0,   0,   0, 
>-     10,   0,  16,   0,   0,   0, 
>-      0,   0,  54,   0,   0,   6, 
>-     18,   0,  16,   0,   0,   0, 
>-      0,   0,  26, 128,  32,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,  54,   0,   0,   7, 
>-     34,  32,  16,   0,   0,   0, 
>-      0,   0,  10,  48,  32,   4, 
>-      0,   0,   0,   0,  10,   0, 
>-     16,   0,   0,   0,   0,   0, 
>-     54,   0,   0,   6,  18,   0, 
>-     16,   0,   0,   0,   0,   0, 
>-     42, 128,  32,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-     54,   0,   0,   7,  66,  32, 
>-     16,   0,   0,   0,   0,   0, 
>-     10,  48,  32,   4,   0,   0, 
>-      0,   0,  10,   0,  16,   0, 
>-      0,   0,   0,   0,  54,   0, 
>-      0,   6,  18,   0,  16,   0, 
>-      0,   0,   0,   0,  58, 128, 
>-     32,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,  54,   0, 
>-      0,   7, 130,  32,  16,   0, 
>-      0,   0,   0,   0,  10,  48, 
>-     32,   4,   0,   0,   0,   0, 
>-     10,   0,  16,   0,   0,   0, 
>-      0,   0,  62,   0,   0,   1, 
>-     83,  84,  65,  84, 116,   0, 
>-      0,   0,  22,   0,   0,   0, 
>-      1,   0,   0,   0,   0,   0, 
>-      0,   0,   3,   0,   0,   0, 
>-      1,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      1,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      6,   0,   0,   0,  10,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   1,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      6,   0,   0,   0,   0,   0, 
>-      0,   0,   2,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0
>-};
>+const BYTE g_PS_SwizzleI2DArray[] = {
>+    68,  88,  66,  67,  133, 234, 212, 67,  255, 165, 181, 252, 19,  185, 168, 29,  237, 193, 125,
>+    57,  1,   0,   0,   0,   240, 4,   0,   0,   5,   0,   0,   0,   52,  0,   0,   0,   64,  1,
>+    0,   0,   200, 1,   0,   0,   252, 1,   0,   0,   116, 4,   0,   0,   82,  68,  69,  70,  4,
>+    1,   0,   0,   1,   0,   0,   0,   128, 0,   0,   0,   2,   0,   0,   0,   28,  0,   0,   0,
>+    0,   4,   255, 255, 0,   1,   0,   0,   208, 0,   0,   0,   92,  0,   0,   0,   2,   0,   0,
>+    0,   3,   0,   0,   0,   5,   0,   0,   0,   255, 255, 255, 255, 0,   0,   0,   0,   1,   0,
>+    0,   0,   13,  0,   0,   0,   108, 0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   1,   0,   0,   0,
>+    84,  101, 120, 116, 117, 114, 101, 73,  50,  68,  65,  114, 114, 97,  121, 0,   83,  119, 105,
>+    122, 122, 108, 101, 80,  114, 111, 112, 101, 114, 116, 105, 101, 115, 0,   171, 171, 108, 0,
>+    0,   0,   1,   0,   0,   0,   152, 0,   0,   0,   16,  0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   176, 0,   0,   0,   0,   0,   0,   0,   16,  0,   0,   0,   2,   0,   0,   0,
>+    192, 0,   0,   0,   0,   0,   0,   0,   83,  119, 105, 122, 122, 108, 101, 73,  110, 100, 105,
>+    99,  101, 115, 0,   171, 1,   0,   19,  0,   1,   0,   4,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   77,  105, 99,  114, 111, 115, 111, 102, 116, 32,  40,  82,  41,  32,  72,  76,  83,
>+    76,  32,  83,  104, 97,  100, 101, 114, 32,  67,  111, 109, 112, 105, 108, 101, 114, 32,  57,
>+    46,  50,  57,  46,  57,  53,  50,  46,  51,  49,  49,  49,  0,   171, 171, 171, 73,  83,  71,
>+    78,  128, 0,   0,   0,   3,   0,   0,   0,   8,   0,   0,   0,   80,  0,   0,   0,   0,   0,
>+    0,   0,   1,   0,   0,   0,   3,   0,   0,   0,   0,   0,   0,   0,   15,  0,   0,   0,   92,
>+    0,   0,   0,   0,   0,   0,   0,   4,   0,   0,   0,   1,   0,   0,   0,   1,   0,   0,   0,
>+    1,   1,   0,   0,   118, 0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   3,   0,   0,
>+    0,   2,   0,   0,   0,   7,   3,   0,   0,   83,  86,  95,  80,  79,  83,  73,  84,  73,  79,
>+    78,  0,   83,  86,  95,  82,  69,  78,  68,  69,  82,  84,  65,  82,  71,  69,  84,  65,  82,
>+    82,  65,  89,  73,  78,  68,  69,  88,  0,   84,  69,  88,  67,  79,  79,  82,  68,  0,   171,
>+    79,  83,  71,  78,  44,  0,   0,   0,   1,   0,   0,   0,   8,   0,   0,   0,   32,  0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   2,   0,   0,   0,   0,   0,   0,   0,   15,  0,
>+    0,   0,   83,  86,  95,  84,  65,  82,  71,  69,  84,  0,   171, 171, 83,  72,  68,  82,  112,
>+    2,   0,   0,   64,  0,   0,   0,   156, 0,   0,   0,   89,  0,   0,   4,   70,  142, 32,  0,
>+    0,   0,   0,   0,   1,   0,   0,   0,   88,  64,  0,   4,   0,   112, 16,  0,   0,   0,   0,
>+    0,   51,  51,  0,   0,   100, 8,   0,   4,   18,  16,  16,  0,   1,   0,   0,   0,   4,   0,
>+    0,   0,   98,  16,  0,   3,   50,  16,  16,  0,   2,   0,   0,   0,   101, 0,   0,   3,   242,
>+    32,  16,  0,   0,   0,   0,   0,   104, 0,   0,   2,   1,   0,   0,   0,   105, 0,   0,   4,
>+    0,   0,   0,   0,   6,   0,   0,   0,   4,   0,   0,   0,   61,  16,  0,   7,   242, 0,   16,
>+    0,   0,   0,   0,   0,   1,   64,  0,   0,   0,   0,   0,   0,   70,  126, 16,  0,   0,   0,
>+    0,   0,   86,  0,   0,   5,   50,  0,   16,  0,   0,   0,   0,   0,   70,  0,   16,  0,   0,
>+    0,   0,   0,   56,  0,   0,   7,   50,  0,   16,  0,   0,   0,   0,   0,   70,  0,   16,  0,
>+    0,   0,   0,   0,   70,  16,  16,  0,   2,   0,   0,   0,   27,  0,   0,   5,   50,  0,   16,
>+    0,   0,   0,   0,   0,   70,  0,   16,  0,   0,   0,   0,   0,   54,  0,   0,   5,   66,  0,
>+    16,  0,   0,   0,   0,   0,   10,  16,  16,  0,   1,   0,   0,   0,   54,  0,   0,   5,   130,
>+    0,   16,  0,   0,   0,   0,   0,   1,   64,  0,   0,   0,   0,   0,   0,   45,  0,   0,   7,
>+    242, 0,   16,  0,   0,   0,   0,   0,   70,  14,  16,  0,   0,   0,   0,   0,   70,  126, 16,
>+    0,   0,   0,   0,   0,   54,  0,   0,   6,   18,  48,  32,  0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   10,  0,   16,  0,   0,   0,   0,   0,   54,  0,   0,   6,   18,  48,  32,  0,   0,
>+    0,   0,   0,   1,   0,   0,   0,   26,  0,   16,  0,   0,   0,   0,   0,   54,  0,   0,   6,
>+    18,  48,  32,  0,   0,   0,   0,   0,   2,   0,   0,   0,   42,  0,   16,  0,   0,   0,   0,
>+    0,   54,  0,   0,   6,   18,  48,  32,  0,   0,   0,   0,   0,   3,   0,   0,   0,   58,  0,
>+    16,  0,   0,   0,   0,   0,   54,  0,   0,   6,   18,  48,  32,  0,   0,   0,   0,   0,   4,
>+    0,   0,   0,   1,   64,  0,   0,   0,   0,   0,   0,   54,  0,   0,   6,   18,  48,  32,  0,
>+    0,   0,   0,   0,   5,   0,   0,   0,   1,   64,  0,   0,   1,   0,   0,   0,   54,  0,   0,
>+    6,   18,  0,   16,  0,   0,   0,   0,   0,   10,  128, 32,  0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   54,  0,   0,   7,   18,  32,  16,  0,   0,   0,   0,   0,   10,  48,  32,  4,   0,
>+    0,   0,   0,   10,  0,   16,  0,   0,   0,   0,   0,   54,  0,   0,   6,   18,  0,   16,  0,
>+    0,   0,   0,   0,   26,  128, 32,  0,   0,   0,   0,   0,   0,   0,   0,   0,   54,  0,   0,
>+    7,   34,  32,  16,  0,   0,   0,   0,   0,   10,  48,  32,  4,   0,   0,   0,   0,   10,  0,
>+    16,  0,   0,   0,   0,   0,   54,  0,   0,   6,   18,  0,   16,  0,   0,   0,   0,   0,   42,
>+    128, 32,  0,   0,   0,   0,   0,   0,   0,   0,   0,   54,  0,   0,   7,   66,  32,  16,  0,
>+    0,   0,   0,   0,   10,  48,  32,  4,   0,   0,   0,   0,   10,  0,   16,  0,   0,   0,   0,
>+    0,   54,  0,   0,   6,   18,  0,   16,  0,   0,   0,   0,   0,   58,  128, 32,  0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   54,  0,   0,   7,   130, 32,  16,  0,   0,   0,   0,   0,   10,
>+    48,  32,  4,   0,   0,   0,   0,   10,  0,   16,  0,   0,   0,   0,   0,   62,  0,   0,   1,
>+    83,  84,  65,  84,  116, 0,   0,   0,   22,  0,   0,   0,   1,   0,   0,   0,   0,   0,   0,
>+    0,   3,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   6,   0,   0,   0,   10,  0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   6,   0,   0,   0,   0,   0,   0,   0,   2,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0};
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/swizzlei2dps.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/swizzlei2dps.h
>index 1df27a0bfc8..a13235b0ecc 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/swizzlei2dps.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/swizzlei2dps.h
>@@ -1,6 +1,10 @@
> #if 0
> //
>-// Generated by Microsoft (R) HLSL Shader Compiler 6.3.9600.16384
>+// Generated by Microsoft (R) HLSL Shader Compiler 9.29.952.3111
>+//
>+//
>+//   fxc /nologo /E PS_SwizzleI2D /T ps_4_0 /Fh compiled\swizzlei2dps.h
>+//    Swizzle11.hlsl
> //
> //
> // Buffer Definitions: 
>@@ -24,17 +28,17 @@
> //
> // Input signature:
> //
>-// Name                 Index   Mask Register SysValue  Format   Used
>-// -------------------- ----- ------ -------- -------- ------- ------
>-// SV_POSITION              0   xyzw        0      POS   float       
>-// TEXCOORD                 0   xy          1     NONE   float   xy  
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_POSITION              0   xyzw        0      POS  float       
>+// TEXCOORD                 0   xy          1     NONE  float   xy  
> //
> //
> // Output signature:
> //
>-// Name                 Index   Mask Register SysValue  Format   Used
>-// -------------------- ----- ------ -------- -------- ------- ------
>-// SV_TARGET                0   xyzw        0   TARGET     int   xyzw
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_TARGET                0   xyzw        0   TARGET    int   xyzw
> //
> ps_4_0
> dcl_constantbuffer cb0[1], immediateIndexed
>@@ -67,204 +71,67 @@ ret
> // Approximately 21 instruction slots used
> #endif
> 
>-const BYTE g_PS_SwizzleI2D[] =
>-{
>-     68,  88,  66,  67, 180,  37, 
>-     54,  19,  39, 134, 185, 230, 
>-    234,  82, 113, 129,  69, 135, 
>-    140,  27,   1,   0,   0,   0, 
>-    164,   4,   0,   0,   5,   0, 
>-      0,   0,  52,   0,   0,   0, 
>-     60,   1,   0,   0, 148,   1, 
>-      0,   0, 200,   1,   0,   0, 
>-     40,   4,   0,   0,  82,  68, 
>-     69,  70,   0,   1,   0,   0, 
>-      1,   0,   0,   0, 124,   0, 
>-      0,   0,   2,   0,   0,   0, 
>-     28,   0,   0,   0,   0,   4, 
>-    255, 255,   0,   1,   0,   0, 
>-    204,   0,   0,   0,  92,   0, 
>-      0,   0,   2,   0,   0,   0, 
>-      3,   0,   0,   0,   4,   0, 
>-      0,   0, 255, 255, 255, 255, 
>-      0,   0,   0,   0,   1,   0, 
>-      0,   0,  13,   0,   0,   0, 
>-    103,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      1,   0,   0,   0,   1,   0, 
>-      0,   0,  84, 101, 120, 116, 
>-    117, 114, 101,  73,  50,  68, 
>-      0,  83, 119, 105, 122, 122, 
>-    108, 101,  80, 114, 111, 112, 
>-    101, 114, 116, 105, 101, 115, 
>-      0, 171, 171, 171, 103,   0, 
>-      0,   0,   1,   0,   0,   0, 
>-    148,   0,   0,   0,  16,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0, 172,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-     16,   0,   0,   0,   2,   0, 
>-      0,   0, 188,   0,   0,   0, 
>-      0,   0,   0,   0,  83, 119, 
>-    105, 122, 122, 108, 101,  73, 
>-    110, 100, 105,  99, 101, 115, 
>-      0, 171,   1,   0,  19,   0, 
>-      1,   0,   4,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-     77, 105,  99, 114, 111, 115, 
>-    111, 102, 116,  32,  40,  82, 
>-     41,  32,  72,  76,  83,  76, 
>-     32,  83, 104,  97, 100, 101, 
>-    114,  32,  67, 111, 109, 112, 
>-    105, 108, 101, 114,  32,  54, 
>-     46,  51,  46,  57,  54,  48, 
>-     48,  46,  49,  54,  51,  56, 
>-     52,   0, 171, 171,  73,  83, 
>-     71,  78,  80,   0,   0,   0, 
>-      2,   0,   0,   0,   8,   0, 
>-      0,   0,  56,   0,   0,   0, 
>-      0,   0,   0,   0,   1,   0, 
>-      0,   0,   3,   0,   0,   0, 
>-      0,   0,   0,   0,  15,   0, 
>-      0,   0,  68,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   3,   0,   0,   0, 
>-      1,   0,   0,   0,   3,   3, 
>-      0,   0,  83,  86,  95,  80, 
>-     79,  83,  73,  84,  73,  79, 
>-     78,   0,  84,  69,  88,  67, 
>-     79,  79,  82,  68,   0, 171, 
>-    171, 171,  79,  83,  71,  78, 
>-     44,   0,   0,   0,   1,   0, 
>-      0,   0,   8,   0,   0,   0, 
>-     32,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      2,   0,   0,   0,   0,   0, 
>-      0,   0,  15,   0,   0,   0, 
>-     83,  86,  95,  84,  65,  82, 
>-     71,  69,  84,   0, 171, 171, 
>-     83,  72,  68,  82,  88,   2, 
>-      0,   0,  64,   0,   0,   0, 
>-    150,   0,   0,   0,  89,   0, 
>-      0,   4,  70, 142,  32,   0, 
>-      0,   0,   0,   0,   1,   0, 
>-      0,   0,  88,  24,   0,   4, 
>-      0, 112,  16,   0,   0,   0, 
>-      0,   0,  51,  51,   0,   0, 
>-     98,  16,   0,   3,  50,  16, 
>-     16,   0,   1,   0,   0,   0, 
>-    101,   0,   0,   3, 242,  32, 
>-     16,   0,   0,   0,   0,   0, 
>-    104,   0,   0,   2,   1,   0, 
>-      0,   0, 105,   0,   0,   4, 
>-      0,   0,   0,   0,   6,   0, 
>-      0,   0,   4,   0,   0,   0, 
>-     61,  16,   0,   7, 242,   0, 
>-     16,   0,   0,   0,   0,   0, 
>-      1,  64,   0,   0,   0,   0, 
>-      0,   0,  70, 126,  16,   0, 
>-      0,   0,   0,   0,  86,   0, 
>-      0,   5,  50,   0,  16,   0, 
>-      0,   0,   0,   0,  70,   0, 
>-     16,   0,   0,   0,   0,   0, 
>-     56,   0,   0,   7,  50,   0, 
>-     16,   0,   0,   0,   0,   0, 
>-     70,   0,  16,   0,   0,   0, 
>-      0,   0,  70,  16,  16,   0, 
>-      1,   0,   0,   0,  27,   0, 
>-      0,   5,  50,   0,  16,   0, 
>-      0,   0,   0,   0,  70,   0, 
>-     16,   0,   0,   0,   0,   0, 
>-     54,   0,   0,   8, 194,   0, 
>-     16,   0,   0,   0,   0,   0, 
>-      2,  64,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,  45,   0,   0,   7, 
>-    242,   0,  16,   0,   0,   0, 
>-      0,   0,  70,  14,  16,   0, 
>-      0,   0,   0,   0,  70, 126, 
>-     16,   0,   0,   0,   0,   0, 
>-     54,   0,   0,   6,  18,  48, 
>-     32,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,  10,   0, 
>-     16,   0,   0,   0,   0,   0, 
>-     54,   0,   0,   6,  18,  48, 
>-     32,   0,   0,   0,   0,   0, 
>-      1,   0,   0,   0,  26,   0, 
>-     16,   0,   0,   0,   0,   0, 
>-     54,   0,   0,   6,  18,  48, 
>-     32,   0,   0,   0,   0,   0, 
>-      2,   0,   0,   0,  42,   0, 
>-     16,   0,   0,   0,   0,   0, 
>-     54,   0,   0,   6,  18,  48, 
>-     32,   0,   0,   0,   0,   0, 
>-      3,   0,   0,   0,  58,   0, 
>-     16,   0,   0,   0,   0,   0, 
>-     54,   0,   0,   6,  18,  48, 
>-     32,   0,   0,   0,   0,   0, 
>-      4,   0,   0,   0,   1,  64, 
>-      0,   0,   0,   0,   0,   0, 
>-     54,   0,   0,   6,  18,  48, 
>-     32,   0,   0,   0,   0,   0, 
>-      5,   0,   0,   0,   1,  64, 
>-      0,   0,   1,   0,   0,   0, 
>-     54,   0,   0,   6,  18,   0, 
>-     16,   0,   0,   0,   0,   0, 
>-     10, 128,  32,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-     54,   0,   0,   7,  18,  32, 
>-     16,   0,   0,   0,   0,   0, 
>-     10,  48,  32,   4,   0,   0, 
>-      0,   0,  10,   0,  16,   0, 
>-      0,   0,   0,   0,  54,   0, 
>-      0,   6,  18,   0,  16,   0, 
>-      0,   0,   0,   0,  26, 128, 
>-     32,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,  54,   0, 
>-      0,   7,  34,  32,  16,   0, 
>-      0,   0,   0,   0,  10,  48, 
>-     32,   4,   0,   0,   0,   0, 
>-     10,   0,  16,   0,   0,   0, 
>-      0,   0,  54,   0,   0,   6, 
>-     18,   0,  16,   0,   0,   0, 
>-      0,   0,  42, 128,  32,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,  54,   0,   0,   7, 
>-     66,  32,  16,   0,   0,   0, 
>-      0,   0,  10,  48,  32,   4, 
>-      0,   0,   0,   0,  10,   0, 
>-     16,   0,   0,   0,   0,   0, 
>-     54,   0,   0,   6,  18,   0, 
>-     16,   0,   0,   0,   0,   0, 
>-     58, 128,  32,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-     54,   0,   0,   7, 130,  32, 
>-     16,   0,   0,   0,   0,   0, 
>-     10,  48,  32,   4,   0,   0, 
>-      0,   0,  10,   0,  16,   0, 
>-      0,   0,   0,   0,  62,   0, 
>-      0,   1,  83,  84,  65,  84, 
>-    116,   0,   0,   0,  21,   0, 
>-      0,   0,   1,   0,   0,   0, 
>-      0,   0,   0,   0,   2,   0, 
>-      0,   0,   1,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   1,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   6,   0,   0,   0, 
>-     10,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   1,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   5,   0,   0,   0, 
>-      0,   0,   0,   0,   2,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0
>-};
>+const BYTE g_PS_SwizzleI2D[] = {
>+    68,  88,  66,  67,  173, 226, 173, 23,  21,  249, 148, 56,  12,  194, 17,  225, 118, 52,  31,
>+    119, 1,   0,   0,   0,   164, 4,   0,   0,   5,   0,   0,   0,   52,  0,   0,   0,   60,  1,
>+    0,   0,   148, 1,   0,   0,   200, 1,   0,   0,   40,  4,   0,   0,   82,  68,  69,  70,  0,
>+    1,   0,   0,   1,   0,   0,   0,   124, 0,   0,   0,   2,   0,   0,   0,   28,  0,   0,   0,
>+    0,   4,   255, 255, 0,   1,   0,   0,   204, 0,   0,   0,   92,  0,   0,   0,   2,   0,   0,
>+    0,   3,   0,   0,   0,   4,   0,   0,   0,   255, 255, 255, 255, 0,   0,   0,   0,   1,   0,
>+    0,   0,   13,  0,   0,   0,   103, 0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   1,   0,   0,   0,
>+    84,  101, 120, 116, 117, 114, 101, 73,  50,  68,  0,   83,  119, 105, 122, 122, 108, 101, 80,
>+    114, 111, 112, 101, 114, 116, 105, 101, 115, 0,   171, 171, 171, 103, 0,   0,   0,   1,   0,
>+    0,   0,   148, 0,   0,   0,   16,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   172,
>+    0,   0,   0,   0,   0,   0,   0,   16,  0,   0,   0,   2,   0,   0,   0,   188, 0,   0,   0,
>+    0,   0,   0,   0,   83,  119, 105, 122, 122, 108, 101, 73,  110, 100, 105, 99,  101, 115, 0,
>+    171, 1,   0,   19,  0,   1,   0,   4,   0,   0,   0,   0,   0,   0,   0,   0,   0,   77,  105,
>+    99,  114, 111, 115, 111, 102, 116, 32,  40,  82,  41,  32,  72,  76,  83,  76,  32,  83,  104,
>+    97,  100, 101, 114, 32,  67,  111, 109, 112, 105, 108, 101, 114, 32,  57,  46,  50,  57,  46,
>+    57,  53,  50,  46,  51,  49,  49,  49,  0,   171, 171, 171, 73,  83,  71,  78,  80,  0,   0,
>+    0,   2,   0,   0,   0,   8,   0,   0,   0,   56,  0,   0,   0,   0,   0,   0,   0,   1,   0,
>+    0,   0,   3,   0,   0,   0,   0,   0,   0,   0,   15,  0,   0,   0,   68,  0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   3,   0,   0,   0,   1,   0,   0,   0,   3,   3,   0,   0,
>+    83,  86,  95,  80,  79,  83,  73,  84,  73,  79,  78,  0,   84,  69,  88,  67,  79,  79,  82,
>+    68,  0,   171, 171, 171, 79,  83,  71,  78,  44,  0,   0,   0,   1,   0,   0,   0,   8,   0,
>+    0,   0,   32,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   2,   0,   0,   0,   0,
>+    0,   0,   0,   15,  0,   0,   0,   83,  86,  95,  84,  65,  82,  71,  69,  84,  0,   171, 171,
>+    83,  72,  68,  82,  88,  2,   0,   0,   64,  0,   0,   0,   150, 0,   0,   0,   89,  0,   0,
>+    4,   70,  142, 32,  0,   0,   0,   0,   0,   1,   0,   0,   0,   88,  24,  0,   4,   0,   112,
>+    16,  0,   0,   0,   0,   0,   51,  51,  0,   0,   98,  16,  0,   3,   50,  16,  16,  0,   1,
>+    0,   0,   0,   101, 0,   0,   3,   242, 32,  16,  0,   0,   0,   0,   0,   104, 0,   0,   2,
>+    1,   0,   0,   0,   105, 0,   0,   4,   0,   0,   0,   0,   6,   0,   0,   0,   4,   0,   0,
>+    0,   61,  16,  0,   7,   242, 0,   16,  0,   0,   0,   0,   0,   1,   64,  0,   0,   0,   0,
>+    0,   0,   70,  126, 16,  0,   0,   0,   0,   0,   86,  0,   0,   5,   50,  0,   16,  0,   0,
>+    0,   0,   0,   70,  0,   16,  0,   0,   0,   0,   0,   56,  0,   0,   7,   50,  0,   16,  0,
>+    0,   0,   0,   0,   70,  0,   16,  0,   0,   0,   0,   0,   70,  16,  16,  0,   1,   0,   0,
>+    0,   27,  0,   0,   5,   50,  0,   16,  0,   0,   0,   0,   0,   70,  0,   16,  0,   0,   0,
>+    0,   0,   54,  0,   0,   8,   194, 0,   16,  0,   0,   0,   0,   0,   2,   64,  0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   45,  0,   0,   7,
>+    242, 0,   16,  0,   0,   0,   0,   0,   70,  14,  16,  0,   0,   0,   0,   0,   70,  126, 16,
>+    0,   0,   0,   0,   0,   54,  0,   0,   6,   18,  48,  32,  0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   10,  0,   16,  0,   0,   0,   0,   0,   54,  0,   0,   6,   18,  48,  32,  0,   0,
>+    0,   0,   0,   1,   0,   0,   0,   26,  0,   16,  0,   0,   0,   0,   0,   54,  0,   0,   6,
>+    18,  48,  32,  0,   0,   0,   0,   0,   2,   0,   0,   0,   42,  0,   16,  0,   0,   0,   0,
>+    0,   54,  0,   0,   6,   18,  48,  32,  0,   0,   0,   0,   0,   3,   0,   0,   0,   58,  0,
>+    16,  0,   0,   0,   0,   0,   54,  0,   0,   6,   18,  48,  32,  0,   0,   0,   0,   0,   4,
>+    0,   0,   0,   1,   64,  0,   0,   0,   0,   0,   0,   54,  0,   0,   6,   18,  48,  32,  0,
>+    0,   0,   0,   0,   5,   0,   0,   0,   1,   64,  0,   0,   1,   0,   0,   0,   54,  0,   0,
>+    6,   18,  0,   16,  0,   0,   0,   0,   0,   10,  128, 32,  0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   54,  0,   0,   7,   18,  32,  16,  0,   0,   0,   0,   0,   10,  48,  32,  4,   0,
>+    0,   0,   0,   10,  0,   16,  0,   0,   0,   0,   0,   54,  0,   0,   6,   18,  0,   16,  0,
>+    0,   0,   0,   0,   26,  128, 32,  0,   0,   0,   0,   0,   0,   0,   0,   0,   54,  0,   0,
>+    7,   34,  32,  16,  0,   0,   0,   0,   0,   10,  48,  32,  4,   0,   0,   0,   0,   10,  0,
>+    16,  0,   0,   0,   0,   0,   54,  0,   0,   6,   18,  0,   16,  0,   0,   0,   0,   0,   42,
>+    128, 32,  0,   0,   0,   0,   0,   0,   0,   0,   0,   54,  0,   0,   7,   66,  32,  16,  0,
>+    0,   0,   0,   0,   10,  48,  32,  4,   0,   0,   0,   0,   10,  0,   16,  0,   0,   0,   0,
>+    0,   54,  0,   0,   6,   18,  0,   16,  0,   0,   0,   0,   0,   58,  128, 32,  0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   54,  0,   0,   7,   130, 32,  16,  0,   0,   0,   0,   0,   10,
>+    48,  32,  4,   0,   0,   0,   0,   10,  0,   16,  0,   0,   0,   0,   0,   62,  0,   0,   1,
>+    83,  84,  65,  84,  116, 0,   0,   0,   21,  0,   0,   0,   1,   0,   0,   0,   0,   0,   0,
>+    0,   2,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   6,   0,   0,   0,   10,  0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   5,   0,   0,   0,   0,   0,   0,   0,   2,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0};
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/swizzlei3dps.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/swizzlei3dps.h
>index 96f042b5b70..762bff2b0ee 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/swizzlei3dps.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/swizzlei3dps.h
>@@ -1,6 +1,10 @@
> #if 0
> //
>-// Generated by Microsoft (R) HLSL Shader Compiler 6.3.9600.16384
>+// Generated by Microsoft (R) HLSL Shader Compiler 9.29.952.3111
>+//
>+//
>+//   fxc /nologo /E PS_SwizzleI3D /T ps_4_0 /Fh compiled\swizzlei3dps.h
>+//    Swizzle11.hlsl
> //
> //
> // Buffer Definitions: 
>@@ -24,18 +28,18 @@
> //
> // Input signature:
> //
>-// Name                 Index   Mask Register SysValue  Format   Used
>-// -------------------- ----- ------ -------- -------- ------- ------
>-// SV_POSITION              0   xyzw        0      POS   float       
>-// SV_RENDERTARGETARRAYINDEX     0   x           1  RTINDEX    uint       
>-// TEXCOORD                 0   xyz         2     NONE   float   xyz 
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_POSITION              0   xyzw        0      POS  float       
>+// SV_RENDERTARGETARRAYINDEX     0   x           1  RTINDEX   uint       
>+// TEXCOORD                 0   xyz         2     NONE  float   xyz 
> //
> //
> // Output signature:
> //
>-// Name                 Index   Mask Register SysValue  Format   Used
>-// -------------------- ----- ------ -------- -------- ------- ------
>-// SV_TARGET                0   xyzw        0   TARGET     int   xyzw
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_TARGET                0   xyzw        0   TARGET    int   xyzw
> //
> ps_4_0
> dcl_constantbuffer cb0[1], immediateIndexed
>@@ -68,210 +72,69 @@ ret
> // Approximately 21 instruction slots used
> #endif
> 
>-const BYTE g_PS_SwizzleI3D[] =
>-{
>-     68,  88,  66,  67,  48,  84, 
>-     97, 193, 216, 245, 101, 196, 
>-    167,  81, 215, 168,  25, 164, 
>-    144,  38,   1,   0,   0,   0, 
>-    200,   4,   0,   0,   5,   0, 
>-      0,   0,  52,   0,   0,   0, 
>-     60,   1,   0,   0, 196,   1, 
>-      0,   0, 248,   1,   0,   0, 
>-     76,   4,   0,   0,  82,  68, 
>-     69,  70,   0,   1,   0,   0, 
>-      1,   0,   0,   0, 124,   0, 
>-      0,   0,   2,   0,   0,   0, 
>-     28,   0,   0,   0,   0,   4, 
>-    255, 255,   0,   1,   0,   0, 
>-    204,   0,   0,   0,  92,   0, 
>-      0,   0,   2,   0,   0,   0, 
>-      3,   0,   0,   0,   8,   0, 
>-      0,   0, 255, 255, 255, 255, 
>-      0,   0,   0,   0,   1,   0, 
>-      0,   0,  13,   0,   0,   0, 
>-    103,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      1,   0,   0,   0,   1,   0, 
>-      0,   0,  84, 101, 120, 116, 
>-    117, 114, 101,  73,  51,  68, 
>-      0,  83, 119, 105, 122, 122, 
>-    108, 101,  80, 114, 111, 112, 
>-    101, 114, 116, 105, 101, 115, 
>-      0, 171, 171, 171, 103,   0, 
>-      0,   0,   1,   0,   0,   0, 
>-    148,   0,   0,   0,  16,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0, 172,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-     16,   0,   0,   0,   2,   0, 
>-      0,   0, 188,   0,   0,   0, 
>-      0,   0,   0,   0,  83, 119, 
>-    105, 122, 122, 108, 101,  73, 
>-    110, 100, 105,  99, 101, 115, 
>-      0, 171,   1,   0,  19,   0, 
>-      1,   0,   4,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-     77, 105,  99, 114, 111, 115, 
>-    111, 102, 116,  32,  40,  82, 
>-     41,  32,  72,  76,  83,  76, 
>-     32,  83, 104,  97, 100, 101, 
>-    114,  32,  67, 111, 109, 112, 
>-    105, 108, 101, 114,  32,  54, 
>-     46,  51,  46,  57,  54,  48, 
>-     48,  46,  49,  54,  51,  56, 
>-     52,   0, 171, 171,  73,  83, 
>-     71,  78, 128,   0,   0,   0, 
>-      3,   0,   0,   0,   8,   0, 
>-      0,   0,  80,   0,   0,   0, 
>-      0,   0,   0,   0,   1,   0, 
>-      0,   0,   3,   0,   0,   0, 
>-      0,   0,   0,   0,  15,   0, 
>-      0,   0,  92,   0,   0,   0, 
>-      0,   0,   0,   0,   4,   0, 
>-      0,   0,   1,   0,   0,   0, 
>-      1,   0,   0,   0,   1,   0, 
>-      0,   0, 118,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   3,   0,   0,   0, 
>-      2,   0,   0,   0,   7,   7, 
>-      0,   0,  83,  86,  95,  80, 
>-     79,  83,  73,  84,  73,  79, 
>-     78,   0,  83,  86,  95,  82, 
>-     69,  78,  68,  69,  82,  84, 
>-     65,  82,  71,  69,  84,  65, 
>-     82,  82,  65,  89,  73,  78, 
>-     68,  69,  88,   0,  84,  69, 
>-     88,  67,  79,  79,  82,  68, 
>-      0, 171,  79,  83,  71,  78, 
>-     44,   0,   0,   0,   1,   0, 
>-      0,   0,   8,   0,   0,   0, 
>-     32,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      2,   0,   0,   0,   0,   0, 
>-      0,   0,  15,   0,   0,   0, 
>-     83,  86,  95,  84,  65,  82, 
>-     71,  69,  84,   0, 171, 171, 
>-     83,  72,  68,  82,  76,   2, 
>-      0,   0,  64,   0,   0,   0, 
>-    147,   0,   0,   0,  89,   0, 
>-      0,   4,  70, 142,  32,   0, 
>-      0,   0,   0,   0,   1,   0, 
>-      0,   0,  88,  40,   0,   4, 
>-      0, 112,  16,   0,   0,   0, 
>-      0,   0,  51,  51,   0,   0, 
>-     98,  16,   0,   3, 114,  16, 
>-     16,   0,   2,   0,   0,   0, 
>-    101,   0,   0,   3, 242,  32, 
>-     16,   0,   0,   0,   0,   0, 
>-    104,   0,   0,   2,   1,   0, 
>-      0,   0, 105,   0,   0,   4, 
>-      0,   0,   0,   0,   6,   0, 
>-      0,   0,   4,   0,   0,   0, 
>-     61,  16,   0,   7, 242,   0, 
>-     16,   0,   0,   0,   0,   0, 
>-      1,  64,   0,   0,   0,   0, 
>-      0,   0,  70, 126,  16,   0, 
>-      0,   0,   0,   0,  86,   0, 
>-      0,   5, 114,   0,  16,   0, 
>-      0,   0,   0,   0,  70,   2, 
>-     16,   0,   0,   0,   0,   0, 
>-     56,   0,   0,   7, 114,   0, 
>-     16,   0,   0,   0,   0,   0, 
>-     70,   2,  16,   0,   0,   0, 
>-      0,   0,  70,  18,  16,   0, 
>-      2,   0,   0,   0,  27,   0, 
>-      0,   5, 114,   0,  16,   0, 
>-      0,   0,   0,   0,  70,   2, 
>-     16,   0,   0,   0,   0,   0, 
>-     54,   0,   0,   5, 130,   0, 
>-     16,   0,   0,   0,   0,   0, 
>-      1,  64,   0,   0,   0,   0, 
>-      0,   0,  45,   0,   0,   7, 
>-    242,   0,  16,   0,   0,   0, 
>-      0,   0,  70,  14,  16,   0, 
>-      0,   0,   0,   0,  70, 126, 
>-     16,   0,   0,   0,   0,   0, 
>-     54,   0,   0,   6,  18,  48, 
>-     32,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,  10,   0, 
>-     16,   0,   0,   0,   0,   0, 
>-     54,   0,   0,   6,  18,  48, 
>-     32,   0,   0,   0,   0,   0, 
>-      1,   0,   0,   0,  26,   0, 
>-     16,   0,   0,   0,   0,   0, 
>-     54,   0,   0,   6,  18,  48, 
>-     32,   0,   0,   0,   0,   0, 
>-      2,   0,   0,   0,  42,   0, 
>-     16,   0,   0,   0,   0,   0, 
>-     54,   0,   0,   6,  18,  48, 
>-     32,   0,   0,   0,   0,   0, 
>-      3,   0,   0,   0,  58,   0, 
>-     16,   0,   0,   0,   0,   0, 
>-     54,   0,   0,   6,  18,  48, 
>-     32,   0,   0,   0,   0,   0, 
>-      4,   0,   0,   0,   1,  64, 
>-      0,   0,   0,   0,   0,   0, 
>-     54,   0,   0,   6,  18,  48, 
>-     32,   0,   0,   0,   0,   0, 
>-      5,   0,   0,   0,   1,  64, 
>-      0,   0,   1,   0,   0,   0, 
>-     54,   0,   0,   6,  18,   0, 
>-     16,   0,   0,   0,   0,   0, 
>-     10, 128,  32,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-     54,   0,   0,   7,  18,  32, 
>-     16,   0,   0,   0,   0,   0, 
>-     10,  48,  32,   4,   0,   0, 
>-      0,   0,  10,   0,  16,   0, 
>-      0,   0,   0,   0,  54,   0, 
>-      0,   6,  18,   0,  16,   0, 
>-      0,   0,   0,   0,  26, 128, 
>-     32,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,  54,   0, 
>-      0,   7,  34,  32,  16,   0, 
>-      0,   0,   0,   0,  10,  48, 
>-     32,   4,   0,   0,   0,   0, 
>-     10,   0,  16,   0,   0,   0, 
>-      0,   0,  54,   0,   0,   6, 
>-     18,   0,  16,   0,   0,   0, 
>-      0,   0,  42, 128,  32,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,  54,   0,   0,   7, 
>-     66,  32,  16,   0,   0,   0, 
>-      0,   0,  10,  48,  32,   4, 
>-      0,   0,   0,   0,  10,   0, 
>-     16,   0,   0,   0,   0,   0, 
>-     54,   0,   0,   6,  18,   0, 
>-     16,   0,   0,   0,   0,   0, 
>-     58, 128,  32,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-     54,   0,   0,   7, 130,  32, 
>-     16,   0,   0,   0,   0,   0, 
>-     10,  48,  32,   4,   0,   0, 
>-      0,   0,  10,   0,  16,   0, 
>-      0,   0,   0,   0,  62,   0, 
>-      0,   1,  83,  84,  65,  84, 
>-    116,   0,   0,   0,  21,   0, 
>-      0,   0,   1,   0,   0,   0, 
>-      0,   0,   0,   0,   2,   0, 
>-      0,   0,   1,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   1,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   6,   0,   0,   0, 
>-     10,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   1,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   5,   0,   0,   0, 
>-      0,   0,   0,   0,   2,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0
>-};
>+const BYTE g_PS_SwizzleI3D[] = {
>+    68,  88,  66,  67,  249, 178, 247, 141, 249, 115, 249, 29,  105, 250, 202, 151, 43,  0,   206,
>+    251, 1,   0,   0,   0,   200, 4,   0,   0,   5,   0,   0,   0,   52,  0,   0,   0,   60,  1,
>+    0,   0,   196, 1,   0,   0,   248, 1,   0,   0,   76,  4,   0,   0,   82,  68,  69,  70,  0,
>+    1,   0,   0,   1,   0,   0,   0,   124, 0,   0,   0,   2,   0,   0,   0,   28,  0,   0,   0,
>+    0,   4,   255, 255, 0,   1,   0,   0,   204, 0,   0,   0,   92,  0,   0,   0,   2,   0,   0,
>+    0,   3,   0,   0,   0,   8,   0,   0,   0,   255, 255, 255, 255, 0,   0,   0,   0,   1,   0,
>+    0,   0,   13,  0,   0,   0,   103, 0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   1,   0,   0,   0,
>+    84,  101, 120, 116, 117, 114, 101, 73,  51,  68,  0,   83,  119, 105, 122, 122, 108, 101, 80,
>+    114, 111, 112, 101, 114, 116, 105, 101, 115, 0,   171, 171, 171, 103, 0,   0,   0,   1,   0,
>+    0,   0,   148, 0,   0,   0,   16,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   172,
>+    0,   0,   0,   0,   0,   0,   0,   16,  0,   0,   0,   2,   0,   0,   0,   188, 0,   0,   0,
>+    0,   0,   0,   0,   83,  119, 105, 122, 122, 108, 101, 73,  110, 100, 105, 99,  101, 115, 0,
>+    171, 1,   0,   19,  0,   1,   0,   4,   0,   0,   0,   0,   0,   0,   0,   0,   0,   77,  105,
>+    99,  114, 111, 115, 111, 102, 116, 32,  40,  82,  41,  32,  72,  76,  83,  76,  32,  83,  104,
>+    97,  100, 101, 114, 32,  67,  111, 109, 112, 105, 108, 101, 114, 32,  57,  46,  50,  57,  46,
>+    57,  53,  50,  46,  51,  49,  49,  49,  0,   171, 171, 171, 73,  83,  71,  78,  128, 0,   0,
>+    0,   3,   0,   0,   0,   8,   0,   0,   0,   80,  0,   0,   0,   0,   0,   0,   0,   1,   0,
>+    0,   0,   3,   0,   0,   0,   0,   0,   0,   0,   15,  0,   0,   0,   92,  0,   0,   0,   0,
>+    0,   0,   0,   4,   0,   0,   0,   1,   0,   0,   0,   1,   0,   0,   0,   1,   0,   0,   0,
>+    118, 0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   3,   0,   0,   0,   2,   0,   0,
>+    0,   7,   7,   0,   0,   83,  86,  95,  80,  79,  83,  73,  84,  73,  79,  78,  0,   83,  86,
>+    95,  82,  69,  78,  68,  69,  82,  84,  65,  82,  71,  69,  84,  65,  82,  82,  65,  89,  73,
>+    78,  68,  69,  88,  0,   84,  69,  88,  67,  79,  79,  82,  68,  0,   171, 79,  83,  71,  78,
>+    44,  0,   0,   0,   1,   0,   0,   0,   8,   0,   0,   0,   32,  0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   2,   0,   0,   0,   0,   0,   0,   0,   15,  0,   0,   0,   83,  86,
>+    95,  84,  65,  82,  71,  69,  84,  0,   171, 171, 83,  72,  68,  82,  76,  2,   0,   0,   64,
>+    0,   0,   0,   147, 0,   0,   0,   89,  0,   0,   4,   70,  142, 32,  0,   0,   0,   0,   0,
>+    1,   0,   0,   0,   88,  40,  0,   4,   0,   112, 16,  0,   0,   0,   0,   0,   51,  51,  0,
>+    0,   98,  16,  0,   3,   114, 16,  16,  0,   2,   0,   0,   0,   101, 0,   0,   3,   242, 32,
>+    16,  0,   0,   0,   0,   0,   104, 0,   0,   2,   1,   0,   0,   0,   105, 0,   0,   4,   0,
>+    0,   0,   0,   6,   0,   0,   0,   4,   0,   0,   0,   61,  16,  0,   7,   242, 0,   16,  0,
>+    0,   0,   0,   0,   1,   64,  0,   0,   0,   0,   0,   0,   70,  126, 16,  0,   0,   0,   0,
>+    0,   86,  0,   0,   5,   114, 0,   16,  0,   0,   0,   0,   0,   70,  2,   16,  0,   0,   0,
>+    0,   0,   56,  0,   0,   7,   114, 0,   16,  0,   0,   0,   0,   0,   70,  2,   16,  0,   0,
>+    0,   0,   0,   70,  18,  16,  0,   2,   0,   0,   0,   27,  0,   0,   5,   114, 0,   16,  0,
>+    0,   0,   0,   0,   70,  2,   16,  0,   0,   0,   0,   0,   54,  0,   0,   5,   130, 0,   16,
>+    0,   0,   0,   0,   0,   1,   64,  0,   0,   0,   0,   0,   0,   45,  0,   0,   7,   242, 0,
>+    16,  0,   0,   0,   0,   0,   70,  14,  16,  0,   0,   0,   0,   0,   70,  126, 16,  0,   0,
>+    0,   0,   0,   54,  0,   0,   6,   18,  48,  32,  0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    10,  0,   16,  0,   0,   0,   0,   0,   54,  0,   0,   6,   18,  48,  32,  0,   0,   0,   0,
>+    0,   1,   0,   0,   0,   26,  0,   16,  0,   0,   0,   0,   0,   54,  0,   0,   6,   18,  48,
>+    32,  0,   0,   0,   0,   0,   2,   0,   0,   0,   42,  0,   16,  0,   0,   0,   0,   0,   54,
>+    0,   0,   6,   18,  48,  32,  0,   0,   0,   0,   0,   3,   0,   0,   0,   58,  0,   16,  0,
>+    0,   0,   0,   0,   54,  0,   0,   6,   18,  48,  32,  0,   0,   0,   0,   0,   4,   0,   0,
>+    0,   1,   64,  0,   0,   0,   0,   0,   0,   54,  0,   0,   6,   18,  48,  32,  0,   0,   0,
>+    0,   0,   5,   0,   0,   0,   1,   64,  0,   0,   1,   0,   0,   0,   54,  0,   0,   6,   18,
>+    0,   16,  0,   0,   0,   0,   0,   10,  128, 32,  0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    54,  0,   0,   7,   18,  32,  16,  0,   0,   0,   0,   0,   10,  48,  32,  4,   0,   0,   0,
>+    0,   10,  0,   16,  0,   0,   0,   0,   0,   54,  0,   0,   6,   18,  0,   16,  0,   0,   0,
>+    0,   0,   26,  128, 32,  0,   0,   0,   0,   0,   0,   0,   0,   0,   54,  0,   0,   7,   34,
>+    32,  16,  0,   0,   0,   0,   0,   10,  48,  32,  4,   0,   0,   0,   0,   10,  0,   16,  0,
>+    0,   0,   0,   0,   54,  0,   0,   6,   18,  0,   16,  0,   0,   0,   0,   0,   42,  128, 32,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   54,  0,   0,   7,   66,  32,  16,  0,   0,   0,
>+    0,   0,   10,  48,  32,  4,   0,   0,   0,   0,   10,  0,   16,  0,   0,   0,   0,   0,   54,
>+    0,   0,   6,   18,  0,   16,  0,   0,   0,   0,   0,   58,  128, 32,  0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   54,  0,   0,   7,   130, 32,  16,  0,   0,   0,   0,   0,   10,  48,  32,
>+    4,   0,   0,   0,   0,   10,  0,   16,  0,   0,   0,   0,   0,   62,  0,   0,   1,   83,  84,
>+    65,  84,  116, 0,   0,   0,   21,  0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   2,
>+    0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   6,   0,   0,   0,   10,  0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   5,   0,   0,   0,   0,   0,   0,   0,   2,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0};
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/swizzleui2darrayps.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/swizzleui2darrayps.h
>index cca965c6f24..510ee155ad2 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/swizzleui2darrayps.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/swizzleui2darrayps.h
>@@ -1,6 +1,10 @@
> #if 0
> //
>-// Generated by Microsoft (R) HLSL Shader Compiler 6.3.9600.16384
>+// Generated by Microsoft (R) HLSL Shader Compiler 9.29.952.3111
>+//
>+//
>+//   fxc /nologo /E PS_SwizzleUI2DArray /T ps_4_0 /Fh
>+//    compiled\swizzleui2darrayps.h Swizzle11.hlsl
> //
> //
> // Buffer Definitions: 
>@@ -24,18 +28,18 @@
> //
> // Input signature:
> //
>-// Name                 Index   Mask Register SysValue  Format   Used
>-// -------------------- ----- ------ -------- -------- ------- ------
>-// SV_POSITION              0   xyzw        0      POS   float       
>-// SV_RENDERTARGETARRAYINDEX     0   x           1  RTINDEX    uint   x   
>-// TEXCOORD                 0   xyz         2     NONE   float   xy  
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_POSITION              0   xyzw        0      POS  float       
>+// SV_RENDERTARGETARRAYINDEX     0   x           1  RTINDEX   uint   x   
>+// TEXCOORD                 0   xyz         2     NONE  float   xy  
> //
> //
> // Output signature:
> //
>-// Name                 Index   Mask Register SysValue  Format   Used
>-// -------------------- ----- ------ -------- -------- ------- ------
>-// SV_TARGET                0   xyzw        0   TARGET    uint   xyzw
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_TARGET                0   xyzw        0   TARGET   uint   xyzw
> //
> ps_4_0
> dcl_constantbuffer cb0[1], immediateIndexed
>@@ -70,217 +74,71 @@ ret
> // Approximately 22 instruction slots used
> #endif
> 
>-const BYTE g_PS_SwizzleUI2DArray[] =
>-{
>-     68,  88,  66,  67,  15, 124, 
>-    179,  49,  45,  69,  64, 249, 
>-    216, 189, 135, 190,  71, 234, 
>-     72,  20,   1,   0,   0,   0, 
>-    240,   4,   0,   0,   5,   0, 
>-      0,   0,  52,   0,   0,   0, 
>-     64,   1,   0,   0, 200,   1, 
>-      0,   0, 252,   1,   0,   0, 
>-    116,   4,   0,   0,  82,  68, 
>-     69,  70,   4,   1,   0,   0, 
>-      1,   0,   0,   0, 128,   0, 
>-      0,   0,   2,   0,   0,   0, 
>-     28,   0,   0,   0,   0,   4, 
>-    255, 255,   0,   1,   0,   0, 
>-    208,   0,   0,   0,  92,   0, 
>-      0,   0,   2,   0,   0,   0, 
>-      4,   0,   0,   0,   5,   0, 
>-      0,   0, 255, 255, 255, 255, 
>-      0,   0,   0,   0,   1,   0, 
>-      0,   0,  13,   0,   0,   0, 
>-    109,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      1,   0,   0,   0,   1,   0, 
>-      0,   0,  84, 101, 120, 116, 
>-    117, 114, 101,  85,  73,  50, 
>-     68,  65, 114, 114,  97, 121, 
>-      0,  83, 119, 105, 122, 122, 
>-    108, 101,  80, 114, 111, 112, 
>-    101, 114, 116, 105, 101, 115, 
>-      0, 171, 109,   0,   0,   0, 
>-      1,   0,   0,   0, 152,   0, 
>-      0,   0,  16,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0, 176,   0,   0,   0, 
>-      0,   0,   0,   0,  16,   0, 
>-      0,   0,   2,   0,   0,   0, 
>-    192,   0,   0,   0,   0,   0, 
>-      0,   0,  83, 119, 105, 122, 
>-    122, 108, 101,  73, 110, 100, 
>-    105,  99, 101, 115,   0, 171, 
>-      1,   0,  19,   0,   1,   0, 
>-      4,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,  77, 105, 
>-     99, 114, 111, 115, 111, 102, 
>-    116,  32,  40,  82,  41,  32, 
>-     72,  76,  83,  76,  32,  83, 
>-    104,  97, 100, 101, 114,  32, 
>-     67, 111, 109, 112, 105, 108, 
>-    101, 114,  32,  54,  46,  51, 
>-     46,  57,  54,  48,  48,  46, 
>-     49,  54,  51,  56,  52,   0, 
>-    171, 171,  73,  83,  71,  78, 
>-    128,   0,   0,   0,   3,   0, 
>-      0,   0,   8,   0,   0,   0, 
>-     80,   0,   0,   0,   0,   0, 
>-      0,   0,   1,   0,   0,   0, 
>-      3,   0,   0,   0,   0,   0, 
>-      0,   0,  15,   0,   0,   0, 
>-     92,   0,   0,   0,   0,   0, 
>-      0,   0,   4,   0,   0,   0, 
>-      1,   0,   0,   0,   1,   0, 
>-      0,   0,   1,   1,   0,   0, 
>-    118,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      3,   0,   0,   0,   2,   0, 
>-      0,   0,   7,   3,   0,   0, 
>-     83,  86,  95,  80,  79,  83, 
>-     73,  84,  73,  79,  78,   0, 
>-     83,  86,  95,  82,  69,  78, 
>-     68,  69,  82,  84,  65,  82, 
>-     71,  69,  84,  65,  82,  82, 
>-     65,  89,  73,  78,  68,  69, 
>-     88,   0,  84,  69,  88,  67, 
>-     79,  79,  82,  68,   0, 171, 
>-     79,  83,  71,  78,  44,   0, 
>-      0,   0,   1,   0,   0,   0, 
>-      8,   0,   0,   0,  32,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   1,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-     15,   0,   0,   0,  83,  86, 
>-     95,  84,  65,  82,  71,  69, 
>-     84,   0, 171, 171,  83,  72, 
>-     68,  82, 112,   2,   0,   0, 
>-     64,   0,   0,   0, 156,   0, 
>-      0,   0,  89,   0,   0,   4, 
>-     70, 142,  32,   0,   0,   0, 
>-      0,   0,   1,   0,   0,   0, 
>-     88,  64,   0,   4,   0, 112, 
>-     16,   0,   0,   0,   0,   0, 
>-     68,  68,   0,   0, 100,   8, 
>-      0,   4,  18,  16,  16,   0, 
>-      1,   0,   0,   0,   4,   0, 
>-      0,   0,  98,  16,   0,   3, 
>-     50,  16,  16,   0,   2,   0, 
>-      0,   0, 101,   0,   0,   3, 
>-    242,  32,  16,   0,   0,   0, 
>-      0,   0, 104,   0,   0,   2, 
>-      1,   0,   0,   0, 105,   0, 
>-      0,   4,   0,   0,   0,   0, 
>-      6,   0,   0,   0,   4,   0, 
>-      0,   0,  61,  16,   0,   7, 
>-    242,   0,  16,   0,   0,   0, 
>-      0,   0,   1,  64,   0,   0, 
>-      0,   0,   0,   0,  70, 126, 
>-     16,   0,   0,   0,   0,   0, 
>-     86,   0,   0,   5,  50,   0, 
>-     16,   0,   0,   0,   0,   0, 
>-     70,   0,  16,   0,   0,   0, 
>-      0,   0,  56,   0,   0,   7, 
>-     50,   0,  16,   0,   0,   0, 
>-      0,   0,  70,   0,  16,   0, 
>-      0,   0,   0,   0,  70,  16, 
>-     16,   0,   2,   0,   0,   0, 
>-     27,   0,   0,   5,  50,   0, 
>-     16,   0,   0,   0,   0,   0, 
>-     70,   0,  16,   0,   0,   0, 
>-      0,   0,  54,   0,   0,   5, 
>-     66,   0,  16,   0,   0,   0, 
>-      0,   0,  10,  16,  16,   0, 
>-      1,   0,   0,   0,  54,   0, 
>-      0,   5, 130,   0,  16,   0, 
>-      0,   0,   0,   0,   1,  64, 
>-      0,   0,   0,   0,   0,   0, 
>-     45,   0,   0,   7, 242,   0, 
>-     16,   0,   0,   0,   0,   0, 
>-     70,  14,  16,   0,   0,   0, 
>-      0,   0,  70, 126,  16,   0, 
>-      0,   0,   0,   0,  54,   0, 
>-      0,   6,  18,  48,  32,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,  10,   0,  16,   0, 
>-      0,   0,   0,   0,  54,   0, 
>-      0,   6,  18,  48,  32,   0, 
>-      0,   0,   0,   0,   1,   0, 
>-      0,   0,  26,   0,  16,   0, 
>-      0,   0,   0,   0,  54,   0, 
>-      0,   6,  18,  48,  32,   0, 
>-      0,   0,   0,   0,   2,   0, 
>-      0,   0,  42,   0,  16,   0, 
>-      0,   0,   0,   0,  54,   0, 
>-      0,   6,  18,  48,  32,   0, 
>-      0,   0,   0,   0,   3,   0, 
>-      0,   0,  58,   0,  16,   0, 
>-      0,   0,   0,   0,  54,   0, 
>-      0,   6,  18,  48,  32,   0, 
>-      0,   0,   0,   0,   4,   0, 
>-      0,   0,   1,  64,   0,   0, 
>-      0,   0,   0,   0,  54,   0, 
>-      0,   6,  18,  48,  32,   0, 
>-      0,   0,   0,   0,   5,   0, 
>-      0,   0,   1,  64,   0,   0, 
>-      1,   0,   0,   0,  54,   0, 
>-      0,   6,  18,   0,  16,   0, 
>-      0,   0,   0,   0,  10, 128, 
>-     32,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,  54,   0, 
>-      0,   7,  18,  32,  16,   0, 
>-      0,   0,   0,   0,  10,  48, 
>-     32,   4,   0,   0,   0,   0, 
>-     10,   0,  16,   0,   0,   0, 
>-      0,   0,  54,   0,   0,   6, 
>-     18,   0,  16,   0,   0,   0, 
>-      0,   0,  26, 128,  32,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,  54,   0,   0,   7, 
>-     34,  32,  16,   0,   0,   0, 
>-      0,   0,  10,  48,  32,   4, 
>-      0,   0,   0,   0,  10,   0, 
>-     16,   0,   0,   0,   0,   0, 
>-     54,   0,   0,   6,  18,   0, 
>-     16,   0,   0,   0,   0,   0, 
>-     42, 128,  32,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-     54,   0,   0,   7,  66,  32, 
>-     16,   0,   0,   0,   0,   0, 
>-     10,  48,  32,   4,   0,   0, 
>-      0,   0,  10,   0,  16,   0, 
>-      0,   0,   0,   0,  54,   0, 
>-      0,   6,  18,   0,  16,   0, 
>-      0,   0,   0,   0,  58, 128, 
>-     32,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,  54,   0, 
>-      0,   7, 130,  32,  16,   0, 
>-      0,   0,   0,   0,  10,  48, 
>-     32,   4,   0,   0,   0,   0, 
>-     10,   0,  16,   0,   0,   0, 
>-      0,   0,  62,   0,   0,   1, 
>-     83,  84,  65,  84, 116,   0, 
>-      0,   0,  22,   0,   0,   0, 
>-      1,   0,   0,   0,   0,   0, 
>-      0,   0,   3,   0,   0,   0, 
>-      1,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      1,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      6,   0,   0,   0,  10,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   1,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      6,   0,   0,   0,   0,   0, 
>-      0,   0,   2,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0
>-};
>+const BYTE g_PS_SwizzleUI2DArray[] = {
>+    68,  88,  66,  67,  253, 219, 132, 138, 227, 164, 143, 132, 2,   123, 116, 0,   12,  103, 207,
>+    6,   1,   0,   0,   0,   240, 4,   0,   0,   5,   0,   0,   0,   52,  0,   0,   0,   64,  1,
>+    0,   0,   200, 1,   0,   0,   252, 1,   0,   0,   116, 4,   0,   0,   82,  68,  69,  70,  4,
>+    1,   0,   0,   1,   0,   0,   0,   128, 0,   0,   0,   2,   0,   0,   0,   28,  0,   0,   0,
>+    0,   4,   255, 255, 0,   1,   0,   0,   208, 0,   0,   0,   92,  0,   0,   0,   2,   0,   0,
>+    0,   4,   0,   0,   0,   5,   0,   0,   0,   255, 255, 255, 255, 0,   0,   0,   0,   1,   0,
>+    0,   0,   13,  0,   0,   0,   109, 0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   1,   0,   0,   0,
>+    84,  101, 120, 116, 117, 114, 101, 85,  73,  50,  68,  65,  114, 114, 97,  121, 0,   83,  119,
>+    105, 122, 122, 108, 101, 80,  114, 111, 112, 101, 114, 116, 105, 101, 115, 0,   171, 109, 0,
>+    0,   0,   1,   0,   0,   0,   152, 0,   0,   0,   16,  0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   176, 0,   0,   0,   0,   0,   0,   0,   16,  0,   0,   0,   2,   0,   0,   0,
>+    192, 0,   0,   0,   0,   0,   0,   0,   83,  119, 105, 122, 122, 108, 101, 73,  110, 100, 105,
>+    99,  101, 115, 0,   171, 1,   0,   19,  0,   1,   0,   4,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   77,  105, 99,  114, 111, 115, 111, 102, 116, 32,  40,  82,  41,  32,  72,  76,  83,
>+    76,  32,  83,  104, 97,  100, 101, 114, 32,  67,  111, 109, 112, 105, 108, 101, 114, 32,  57,
>+    46,  50,  57,  46,  57,  53,  50,  46,  51,  49,  49,  49,  0,   171, 171, 171, 73,  83,  71,
>+    78,  128, 0,   0,   0,   3,   0,   0,   0,   8,   0,   0,   0,   80,  0,   0,   0,   0,   0,
>+    0,   0,   1,   0,   0,   0,   3,   0,   0,   0,   0,   0,   0,   0,   15,  0,   0,   0,   92,
>+    0,   0,   0,   0,   0,   0,   0,   4,   0,   0,   0,   1,   0,   0,   0,   1,   0,   0,   0,
>+    1,   1,   0,   0,   118, 0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   3,   0,   0,
>+    0,   2,   0,   0,   0,   7,   3,   0,   0,   83,  86,  95,  80,  79,  83,  73,  84,  73,  79,
>+    78,  0,   83,  86,  95,  82,  69,  78,  68,  69,  82,  84,  65,  82,  71,  69,  84,  65,  82,
>+    82,  65,  89,  73,  78,  68,  69,  88,  0,   84,  69,  88,  67,  79,  79,  82,  68,  0,   171,
>+    79,  83,  71,  78,  44,  0,   0,   0,   1,   0,   0,   0,   8,   0,   0,   0,   32,  0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   15,  0,
>+    0,   0,   83,  86,  95,  84,  65,  82,  71,  69,  84,  0,   171, 171, 83,  72,  68,  82,  112,
>+    2,   0,   0,   64,  0,   0,   0,   156, 0,   0,   0,   89,  0,   0,   4,   70,  142, 32,  0,
>+    0,   0,   0,   0,   1,   0,   0,   0,   88,  64,  0,   4,   0,   112, 16,  0,   0,   0,   0,
>+    0,   68,  68,  0,   0,   100, 8,   0,   4,   18,  16,  16,  0,   1,   0,   0,   0,   4,   0,
>+    0,   0,   98,  16,  0,   3,   50,  16,  16,  0,   2,   0,   0,   0,   101, 0,   0,   3,   242,
>+    32,  16,  0,   0,   0,   0,   0,   104, 0,   0,   2,   1,   0,   0,   0,   105, 0,   0,   4,
>+    0,   0,   0,   0,   6,   0,   0,   0,   4,   0,   0,   0,   61,  16,  0,   7,   242, 0,   16,
>+    0,   0,   0,   0,   0,   1,   64,  0,   0,   0,   0,   0,   0,   70,  126, 16,  0,   0,   0,
>+    0,   0,   86,  0,   0,   5,   50,  0,   16,  0,   0,   0,   0,   0,   70,  0,   16,  0,   0,
>+    0,   0,   0,   56,  0,   0,   7,   50,  0,   16,  0,   0,   0,   0,   0,   70,  0,   16,  0,
>+    0,   0,   0,   0,   70,  16,  16,  0,   2,   0,   0,   0,   27,  0,   0,   5,   50,  0,   16,
>+    0,   0,   0,   0,   0,   70,  0,   16,  0,   0,   0,   0,   0,   54,  0,   0,   5,   66,  0,
>+    16,  0,   0,   0,   0,   0,   10,  16,  16,  0,   1,   0,   0,   0,   54,  0,   0,   5,   130,
>+    0,   16,  0,   0,   0,   0,   0,   1,   64,  0,   0,   0,   0,   0,   0,   45,  0,   0,   7,
>+    242, 0,   16,  0,   0,   0,   0,   0,   70,  14,  16,  0,   0,   0,   0,   0,   70,  126, 16,
>+    0,   0,   0,   0,   0,   54,  0,   0,   6,   18,  48,  32,  0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   10,  0,   16,  0,   0,   0,   0,   0,   54,  0,   0,   6,   18,  48,  32,  0,   0,
>+    0,   0,   0,   1,   0,   0,   0,   26,  0,   16,  0,   0,   0,   0,   0,   54,  0,   0,   6,
>+    18,  48,  32,  0,   0,   0,   0,   0,   2,   0,   0,   0,   42,  0,   16,  0,   0,   0,   0,
>+    0,   54,  0,   0,   6,   18,  48,  32,  0,   0,   0,   0,   0,   3,   0,   0,   0,   58,  0,
>+    16,  0,   0,   0,   0,   0,   54,  0,   0,   6,   18,  48,  32,  0,   0,   0,   0,   0,   4,
>+    0,   0,   0,   1,   64,  0,   0,   0,   0,   0,   0,   54,  0,   0,   6,   18,  48,  32,  0,
>+    0,   0,   0,   0,   5,   0,   0,   0,   1,   64,  0,   0,   1,   0,   0,   0,   54,  0,   0,
>+    6,   18,  0,   16,  0,   0,   0,   0,   0,   10,  128, 32,  0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   54,  0,   0,   7,   18,  32,  16,  0,   0,   0,   0,   0,   10,  48,  32,  4,   0,
>+    0,   0,   0,   10,  0,   16,  0,   0,   0,   0,   0,   54,  0,   0,   6,   18,  0,   16,  0,
>+    0,   0,   0,   0,   26,  128, 32,  0,   0,   0,   0,   0,   0,   0,   0,   0,   54,  0,   0,
>+    7,   34,  32,  16,  0,   0,   0,   0,   0,   10,  48,  32,  4,   0,   0,   0,   0,   10,  0,
>+    16,  0,   0,   0,   0,   0,   54,  0,   0,   6,   18,  0,   16,  0,   0,   0,   0,   0,   42,
>+    128, 32,  0,   0,   0,   0,   0,   0,   0,   0,   0,   54,  0,   0,   7,   66,  32,  16,  0,
>+    0,   0,   0,   0,   10,  48,  32,  4,   0,   0,   0,   0,   10,  0,   16,  0,   0,   0,   0,
>+    0,   54,  0,   0,   6,   18,  0,   16,  0,   0,   0,   0,   0,   58,  128, 32,  0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   54,  0,   0,   7,   130, 32,  16,  0,   0,   0,   0,   0,   10,
>+    48,  32,  4,   0,   0,   0,   0,   10,  0,   16,  0,   0,   0,   0,   0,   62,  0,   0,   1,
>+    83,  84,  65,  84,  116, 0,   0,   0,   22,  0,   0,   0,   1,   0,   0,   0,   0,   0,   0,
>+    0,   3,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   6,   0,   0,   0,   10,  0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   6,   0,   0,   0,   0,   0,   0,   0,   2,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0};
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/swizzleui2dps.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/swizzleui2dps.h
>index 9de8b28a87e..a871082c41c 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/swizzleui2dps.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/swizzleui2dps.h
>@@ -1,6 +1,10 @@
> #if 0
> //
>-// Generated by Microsoft (R) HLSL Shader Compiler 6.3.9600.16384
>+// Generated by Microsoft (R) HLSL Shader Compiler 9.29.952.3111
>+//
>+//
>+//   fxc /nologo /E PS_SwizzleUI2D /T ps_4_0 /Fh compiled\swizzleui2dps.h
>+//    Swizzle11.hlsl
> //
> //
> // Buffer Definitions: 
>@@ -24,17 +28,17 @@
> //
> // Input signature:
> //
>-// Name                 Index   Mask Register SysValue  Format   Used
>-// -------------------- ----- ------ -------- -------- ------- ------
>-// SV_POSITION              0   xyzw        0      POS   float       
>-// TEXCOORD                 0   xy          1     NONE   float   xy  
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_POSITION              0   xyzw        0      POS  float       
>+// TEXCOORD                 0   xy          1     NONE  float   xy  
> //
> //
> // Output signature:
> //
>-// Name                 Index   Mask Register SysValue  Format   Used
>-// -------------------- ----- ------ -------- -------- ------- ------
>-// SV_TARGET                0   xyzw        0   TARGET    uint   xyzw
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_TARGET                0   xyzw        0   TARGET   uint   xyzw
> //
> ps_4_0
> dcl_constantbuffer cb0[1], immediateIndexed
>@@ -67,204 +71,67 @@ ret
> // Approximately 21 instruction slots used
> #endif
> 
>-const BYTE g_PS_SwizzleUI2D[] =
>-{
>-     68,  88,  66,  67, 165, 190, 
>-     35, 188, 235, 202, 154, 237, 
>-    226,  86, 223, 212,  34,  38, 
>-     81, 252,   1,   0,   0,   0, 
>-    164,   4,   0,   0,   5,   0, 
>-      0,   0,  52,   0,   0,   0, 
>-     60,   1,   0,   0, 148,   1, 
>-      0,   0, 200,   1,   0,   0, 
>-     40,   4,   0,   0,  82,  68, 
>-     69,  70,   0,   1,   0,   0, 
>-      1,   0,   0,   0, 124,   0, 
>-      0,   0,   2,   0,   0,   0, 
>-     28,   0,   0,   0,   0,   4, 
>-    255, 255,   0,   1,   0,   0, 
>-    204,   0,   0,   0,  92,   0, 
>-      0,   0,   2,   0,   0,   0, 
>-      4,   0,   0,   0,   4,   0, 
>-      0,   0, 255, 255, 255, 255, 
>-      0,   0,   0,   0,   1,   0, 
>-      0,   0,  13,   0,   0,   0, 
>-    104,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      1,   0,   0,   0,   1,   0, 
>-      0,   0,  84, 101, 120, 116, 
>-    117, 114, 101,  85,  73,  50, 
>-     68,   0,  83, 119, 105, 122, 
>-    122, 108, 101,  80, 114, 111, 
>-    112, 101, 114, 116, 105, 101, 
>-    115,   0, 171, 171, 104,   0, 
>-      0,   0,   1,   0,   0,   0, 
>-    148,   0,   0,   0,  16,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0, 172,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-     16,   0,   0,   0,   2,   0, 
>-      0,   0, 188,   0,   0,   0, 
>-      0,   0,   0,   0,  83, 119, 
>-    105, 122, 122, 108, 101,  73, 
>-    110, 100, 105,  99, 101, 115, 
>-      0, 171,   1,   0,  19,   0, 
>-      1,   0,   4,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-     77, 105,  99, 114, 111, 115, 
>-    111, 102, 116,  32,  40,  82, 
>-     41,  32,  72,  76,  83,  76, 
>-     32,  83, 104,  97, 100, 101, 
>-    114,  32,  67, 111, 109, 112, 
>-    105, 108, 101, 114,  32,  54, 
>-     46,  51,  46,  57,  54,  48, 
>-     48,  46,  49,  54,  51,  56, 
>-     52,   0, 171, 171,  73,  83, 
>-     71,  78,  80,   0,   0,   0, 
>-      2,   0,   0,   0,   8,   0, 
>-      0,   0,  56,   0,   0,   0, 
>-      0,   0,   0,   0,   1,   0, 
>-      0,   0,   3,   0,   0,   0, 
>-      0,   0,   0,   0,  15,   0, 
>-      0,   0,  68,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   3,   0,   0,   0, 
>-      1,   0,   0,   0,   3,   3, 
>-      0,   0,  83,  86,  95,  80, 
>-     79,  83,  73,  84,  73,  79, 
>-     78,   0,  84,  69,  88,  67, 
>-     79,  79,  82,  68,   0, 171, 
>-    171, 171,  79,  83,  71,  78, 
>-     44,   0,   0,   0,   1,   0, 
>-      0,   0,   8,   0,   0,   0, 
>-     32,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      1,   0,   0,   0,   0,   0, 
>-      0,   0,  15,   0,   0,   0, 
>-     83,  86,  95,  84,  65,  82, 
>-     71,  69,  84,   0, 171, 171, 
>-     83,  72,  68,  82,  88,   2, 
>-      0,   0,  64,   0,   0,   0, 
>-    150,   0,   0,   0,  89,   0, 
>-      0,   4,  70, 142,  32,   0, 
>-      0,   0,   0,   0,   1,   0, 
>-      0,   0,  88,  24,   0,   4, 
>-      0, 112,  16,   0,   0,   0, 
>-      0,   0,  68,  68,   0,   0, 
>-     98,  16,   0,   3,  50,  16, 
>-     16,   0,   1,   0,   0,   0, 
>-    101,   0,   0,   3, 242,  32, 
>-     16,   0,   0,   0,   0,   0, 
>-    104,   0,   0,   2,   1,   0, 
>-      0,   0, 105,   0,   0,   4, 
>-      0,   0,   0,   0,   6,   0, 
>-      0,   0,   4,   0,   0,   0, 
>-     61,  16,   0,   7, 242,   0, 
>-     16,   0,   0,   0,   0,   0, 
>-      1,  64,   0,   0,   0,   0, 
>-      0,   0,  70, 126,  16,   0, 
>-      0,   0,   0,   0,  86,   0, 
>-      0,   5,  50,   0,  16,   0, 
>-      0,   0,   0,   0,  70,   0, 
>-     16,   0,   0,   0,   0,   0, 
>-     56,   0,   0,   7,  50,   0, 
>-     16,   0,   0,   0,   0,   0, 
>-     70,   0,  16,   0,   0,   0, 
>-      0,   0,  70,  16,  16,   0, 
>-      1,   0,   0,   0,  27,   0, 
>-      0,   5,  50,   0,  16,   0, 
>-      0,   0,   0,   0,  70,   0, 
>-     16,   0,   0,   0,   0,   0, 
>-     54,   0,   0,   8, 194,   0, 
>-     16,   0,   0,   0,   0,   0, 
>-      2,  64,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,  45,   0,   0,   7, 
>-    242,   0,  16,   0,   0,   0, 
>-      0,   0,  70,  14,  16,   0, 
>-      0,   0,   0,   0,  70, 126, 
>-     16,   0,   0,   0,   0,   0, 
>-     54,   0,   0,   6,  18,  48, 
>-     32,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,  10,   0, 
>-     16,   0,   0,   0,   0,   0, 
>-     54,   0,   0,   6,  18,  48, 
>-     32,   0,   0,   0,   0,   0, 
>-      1,   0,   0,   0,  26,   0, 
>-     16,   0,   0,   0,   0,   0, 
>-     54,   0,   0,   6,  18,  48, 
>-     32,   0,   0,   0,   0,   0, 
>-      2,   0,   0,   0,  42,   0, 
>-     16,   0,   0,   0,   0,   0, 
>-     54,   0,   0,   6,  18,  48, 
>-     32,   0,   0,   0,   0,   0, 
>-      3,   0,   0,   0,  58,   0, 
>-     16,   0,   0,   0,   0,   0, 
>-     54,   0,   0,   6,  18,  48, 
>-     32,   0,   0,   0,   0,   0, 
>-      4,   0,   0,   0,   1,  64, 
>-      0,   0,   0,   0,   0,   0, 
>-     54,   0,   0,   6,  18,  48, 
>-     32,   0,   0,   0,   0,   0, 
>-      5,   0,   0,   0,   1,  64, 
>-      0,   0,   1,   0,   0,   0, 
>-     54,   0,   0,   6,  18,   0, 
>-     16,   0,   0,   0,   0,   0, 
>-     10, 128,  32,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-     54,   0,   0,   7,  18,  32, 
>-     16,   0,   0,   0,   0,   0, 
>-     10,  48,  32,   4,   0,   0, 
>-      0,   0,  10,   0,  16,   0, 
>-      0,   0,   0,   0,  54,   0, 
>-      0,   6,  18,   0,  16,   0, 
>-      0,   0,   0,   0,  26, 128, 
>-     32,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,  54,   0, 
>-      0,   7,  34,  32,  16,   0, 
>-      0,   0,   0,   0,  10,  48, 
>-     32,   4,   0,   0,   0,   0, 
>-     10,   0,  16,   0,   0,   0, 
>-      0,   0,  54,   0,   0,   6, 
>-     18,   0,  16,   0,   0,   0, 
>-      0,   0,  42, 128,  32,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,  54,   0,   0,   7, 
>-     66,  32,  16,   0,   0,   0, 
>-      0,   0,  10,  48,  32,   4, 
>-      0,   0,   0,   0,  10,   0, 
>-     16,   0,   0,   0,   0,   0, 
>-     54,   0,   0,   6,  18,   0, 
>-     16,   0,   0,   0,   0,   0, 
>-     58, 128,  32,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-     54,   0,   0,   7, 130,  32, 
>-     16,   0,   0,   0,   0,   0, 
>-     10,  48,  32,   4,   0,   0, 
>-      0,   0,  10,   0,  16,   0, 
>-      0,   0,   0,   0,  62,   0, 
>-      0,   1,  83,  84,  65,  84, 
>-    116,   0,   0,   0,  21,   0, 
>-      0,   0,   1,   0,   0,   0, 
>-      0,   0,   0,   0,   2,   0, 
>-      0,   0,   1,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   1,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   6,   0,   0,   0, 
>-     10,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   1,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   5,   0,   0,   0, 
>-      0,   0,   0,   0,   2,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0
>-};
>+const BYTE g_PS_SwizzleUI2D[] = {
>+    68,  88,  66,  67,  140, 55,  150, 179, 133, 9,   250, 249, 200, 106, 121, 178, 86,  215, 59,
>+    109, 1,   0,   0,   0,   164, 4,   0,   0,   5,   0,   0,   0,   52,  0,   0,   0,   60,  1,
>+    0,   0,   148, 1,   0,   0,   200, 1,   0,   0,   40,  4,   0,   0,   82,  68,  69,  70,  0,
>+    1,   0,   0,   1,   0,   0,   0,   124, 0,   0,   0,   2,   0,   0,   0,   28,  0,   0,   0,
>+    0,   4,   255, 255, 0,   1,   0,   0,   204, 0,   0,   0,   92,  0,   0,   0,   2,   0,   0,
>+    0,   4,   0,   0,   0,   4,   0,   0,   0,   255, 255, 255, 255, 0,   0,   0,   0,   1,   0,
>+    0,   0,   13,  0,   0,   0,   104, 0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   1,   0,   0,   0,
>+    84,  101, 120, 116, 117, 114, 101, 85,  73,  50,  68,  0,   83,  119, 105, 122, 122, 108, 101,
>+    80,  114, 111, 112, 101, 114, 116, 105, 101, 115, 0,   171, 171, 104, 0,   0,   0,   1,   0,
>+    0,   0,   148, 0,   0,   0,   16,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   172,
>+    0,   0,   0,   0,   0,   0,   0,   16,  0,   0,   0,   2,   0,   0,   0,   188, 0,   0,   0,
>+    0,   0,   0,   0,   83,  119, 105, 122, 122, 108, 101, 73,  110, 100, 105, 99,  101, 115, 0,
>+    171, 1,   0,   19,  0,   1,   0,   4,   0,   0,   0,   0,   0,   0,   0,   0,   0,   77,  105,
>+    99,  114, 111, 115, 111, 102, 116, 32,  40,  82,  41,  32,  72,  76,  83,  76,  32,  83,  104,
>+    97,  100, 101, 114, 32,  67,  111, 109, 112, 105, 108, 101, 114, 32,  57,  46,  50,  57,  46,
>+    57,  53,  50,  46,  51,  49,  49,  49,  0,   171, 171, 171, 73,  83,  71,  78,  80,  0,   0,
>+    0,   2,   0,   0,   0,   8,   0,   0,   0,   56,  0,   0,   0,   0,   0,   0,   0,   1,   0,
>+    0,   0,   3,   0,   0,   0,   0,   0,   0,   0,   15,  0,   0,   0,   68,  0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   3,   0,   0,   0,   1,   0,   0,   0,   3,   3,   0,   0,
>+    83,  86,  95,  80,  79,  83,  73,  84,  73,  79,  78,  0,   84,  69,  88,  67,  79,  79,  82,
>+    68,  0,   171, 171, 171, 79,  83,  71,  78,  44,  0,   0,   0,   1,   0,   0,   0,   8,   0,
>+    0,   0,   32,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   0,
>+    0,   0,   0,   15,  0,   0,   0,   83,  86,  95,  84,  65,  82,  71,  69,  84,  0,   171, 171,
>+    83,  72,  68,  82,  88,  2,   0,   0,   64,  0,   0,   0,   150, 0,   0,   0,   89,  0,   0,
>+    4,   70,  142, 32,  0,   0,   0,   0,   0,   1,   0,   0,   0,   88,  24,  0,   4,   0,   112,
>+    16,  0,   0,   0,   0,   0,   68,  68,  0,   0,   98,  16,  0,   3,   50,  16,  16,  0,   1,
>+    0,   0,   0,   101, 0,   0,   3,   242, 32,  16,  0,   0,   0,   0,   0,   104, 0,   0,   2,
>+    1,   0,   0,   0,   105, 0,   0,   4,   0,   0,   0,   0,   6,   0,   0,   0,   4,   0,   0,
>+    0,   61,  16,  0,   7,   242, 0,   16,  0,   0,   0,   0,   0,   1,   64,  0,   0,   0,   0,
>+    0,   0,   70,  126, 16,  0,   0,   0,   0,   0,   86,  0,   0,   5,   50,  0,   16,  0,   0,
>+    0,   0,   0,   70,  0,   16,  0,   0,   0,   0,   0,   56,  0,   0,   7,   50,  0,   16,  0,
>+    0,   0,   0,   0,   70,  0,   16,  0,   0,   0,   0,   0,   70,  16,  16,  0,   1,   0,   0,
>+    0,   27,  0,   0,   5,   50,  0,   16,  0,   0,   0,   0,   0,   70,  0,   16,  0,   0,   0,
>+    0,   0,   54,  0,   0,   8,   194, 0,   16,  0,   0,   0,   0,   0,   2,   64,  0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   45,  0,   0,   7,
>+    242, 0,   16,  0,   0,   0,   0,   0,   70,  14,  16,  0,   0,   0,   0,   0,   70,  126, 16,
>+    0,   0,   0,   0,   0,   54,  0,   0,   6,   18,  48,  32,  0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   10,  0,   16,  0,   0,   0,   0,   0,   54,  0,   0,   6,   18,  48,  32,  0,   0,
>+    0,   0,   0,   1,   0,   0,   0,   26,  0,   16,  0,   0,   0,   0,   0,   54,  0,   0,   6,
>+    18,  48,  32,  0,   0,   0,   0,   0,   2,   0,   0,   0,   42,  0,   16,  0,   0,   0,   0,
>+    0,   54,  0,   0,   6,   18,  48,  32,  0,   0,   0,   0,   0,   3,   0,   0,   0,   58,  0,
>+    16,  0,   0,   0,   0,   0,   54,  0,   0,   6,   18,  48,  32,  0,   0,   0,   0,   0,   4,
>+    0,   0,   0,   1,   64,  0,   0,   0,   0,   0,   0,   54,  0,   0,   6,   18,  48,  32,  0,
>+    0,   0,   0,   0,   5,   0,   0,   0,   1,   64,  0,   0,   1,   0,   0,   0,   54,  0,   0,
>+    6,   18,  0,   16,  0,   0,   0,   0,   0,   10,  128, 32,  0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   54,  0,   0,   7,   18,  32,  16,  0,   0,   0,   0,   0,   10,  48,  32,  4,   0,
>+    0,   0,   0,   10,  0,   16,  0,   0,   0,   0,   0,   54,  0,   0,   6,   18,  0,   16,  0,
>+    0,   0,   0,   0,   26,  128, 32,  0,   0,   0,   0,   0,   0,   0,   0,   0,   54,  0,   0,
>+    7,   34,  32,  16,  0,   0,   0,   0,   0,   10,  48,  32,  4,   0,   0,   0,   0,   10,  0,
>+    16,  0,   0,   0,   0,   0,   54,  0,   0,   6,   18,  0,   16,  0,   0,   0,   0,   0,   42,
>+    128, 32,  0,   0,   0,   0,   0,   0,   0,   0,   0,   54,  0,   0,   7,   66,  32,  16,  0,
>+    0,   0,   0,   0,   10,  48,  32,  4,   0,   0,   0,   0,   10,  0,   16,  0,   0,   0,   0,
>+    0,   54,  0,   0,   6,   18,  0,   16,  0,   0,   0,   0,   0,   58,  128, 32,  0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   54,  0,   0,   7,   130, 32,  16,  0,   0,   0,   0,   0,   10,
>+    48,  32,  4,   0,   0,   0,   0,   10,  0,   16,  0,   0,   0,   0,   0,   62,  0,   0,   1,
>+    83,  84,  65,  84,  116, 0,   0,   0,   21,  0,   0,   0,   1,   0,   0,   0,   0,   0,   0,
>+    0,   2,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   6,   0,   0,   0,   10,  0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   5,   0,   0,   0,   0,   0,   0,   0,   2,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0};
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/swizzleui3dps.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/swizzleui3dps.h
>index c66821602b7..28004edaffc 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/swizzleui3dps.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/swizzleui3dps.h
>@@ -1,6 +1,10 @@
> #if 0
> //
>-// Generated by Microsoft (R) HLSL Shader Compiler 6.3.9600.16384
>+// Generated by Microsoft (R) HLSL Shader Compiler 9.29.952.3111
>+//
>+//
>+//   fxc /nologo /E PS_SwizzleUI3D /T ps_4_0 /Fh compiled\swizzleui3dps.h
>+//    Swizzle11.hlsl
> //
> //
> // Buffer Definitions: 
>@@ -24,18 +28,18 @@
> //
> // Input signature:
> //
>-// Name                 Index   Mask Register SysValue  Format   Used
>-// -------------------- ----- ------ -------- -------- ------- ------
>-// SV_POSITION              0   xyzw        0      POS   float       
>-// SV_RENDERTARGETARRAYINDEX     0   x           1  RTINDEX    uint       
>-// TEXCOORD                 0   xyz         2     NONE   float   xyz 
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_POSITION              0   xyzw        0      POS  float       
>+// SV_RENDERTARGETARRAYINDEX     0   x           1  RTINDEX   uint       
>+// TEXCOORD                 0   xyz         2     NONE  float   xyz 
> //
> //
> // Output signature:
> //
>-// Name                 Index   Mask Register SysValue  Format   Used
>-// -------------------- ----- ------ -------- -------- ------- ------
>-// SV_TARGET                0   xyzw        0   TARGET    uint   xyzw
>+// Name                 Index   Mask Register SysValue Format   Used
>+// -------------------- ----- ------ -------- -------- ------ ------
>+// SV_TARGET                0   xyzw        0   TARGET   uint   xyzw
> //
> ps_4_0
> dcl_constantbuffer cb0[1], immediateIndexed
>@@ -68,210 +72,69 @@ ret
> // Approximately 21 instruction slots used
> #endif
> 
>-const BYTE g_PS_SwizzleUI3D[] =
>-{
>-     68,  88,  66,  67, 186, 124, 
>-    222, 110, 186, 145, 165,  56, 
>-    152,  97, 247, 114, 115, 197, 
>-    159, 190,   1,   0,   0,   0, 
>-    200,   4,   0,   0,   5,   0, 
>-      0,   0,  52,   0,   0,   0, 
>-     60,   1,   0,   0, 196,   1, 
>-      0,   0, 248,   1,   0,   0, 
>-     76,   4,   0,   0,  82,  68, 
>-     69,  70,   0,   1,   0,   0, 
>-      1,   0,   0,   0, 124,   0, 
>-      0,   0,   2,   0,   0,   0, 
>-     28,   0,   0,   0,   0,   4, 
>-    255, 255,   0,   1,   0,   0, 
>-    204,   0,   0,   0,  92,   0, 
>-      0,   0,   2,   0,   0,   0, 
>-      4,   0,   0,   0,   8,   0, 
>-      0,   0, 255, 255, 255, 255, 
>-      0,   0,   0,   0,   1,   0, 
>-      0,   0,  13,   0,   0,   0, 
>-    104,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      1,   0,   0,   0,   1,   0, 
>-      0,   0,  84, 101, 120, 116, 
>-    117, 114, 101,  85,  73,  51, 
>-     68,   0,  83, 119, 105, 122, 
>-    122, 108, 101,  80, 114, 111, 
>-    112, 101, 114, 116, 105, 101, 
>-    115,   0, 171, 171, 104,   0, 
>-      0,   0,   1,   0,   0,   0, 
>-    148,   0,   0,   0,  16,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0, 172,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-     16,   0,   0,   0,   2,   0, 
>-      0,   0, 188,   0,   0,   0, 
>-      0,   0,   0,   0,  83, 119, 
>-    105, 122, 122, 108, 101,  73, 
>-    110, 100, 105,  99, 101, 115, 
>-      0, 171,   1,   0,  19,   0, 
>-      1,   0,   4,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-     77, 105,  99, 114, 111, 115, 
>-    111, 102, 116,  32,  40,  82, 
>-     41,  32,  72,  76,  83,  76, 
>-     32,  83, 104,  97, 100, 101, 
>-    114,  32,  67, 111, 109, 112, 
>-    105, 108, 101, 114,  32,  54, 
>-     46,  51,  46,  57,  54,  48, 
>-     48,  46,  49,  54,  51,  56, 
>-     52,   0, 171, 171,  73,  83, 
>-     71,  78, 128,   0,   0,   0, 
>-      3,   0,   0,   0,   8,   0, 
>-      0,   0,  80,   0,   0,   0, 
>-      0,   0,   0,   0,   1,   0, 
>-      0,   0,   3,   0,   0,   0, 
>-      0,   0,   0,   0,  15,   0, 
>-      0,   0,  92,   0,   0,   0, 
>-      0,   0,   0,   0,   4,   0, 
>-      0,   0,   1,   0,   0,   0, 
>-      1,   0,   0,   0,   1,   0, 
>-      0,   0, 118,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   3,   0,   0,   0, 
>-      2,   0,   0,   0,   7,   7, 
>-      0,   0,  83,  86,  95,  80, 
>-     79,  83,  73,  84,  73,  79, 
>-     78,   0,  83,  86,  95,  82, 
>-     69,  78,  68,  69,  82,  84, 
>-     65,  82,  71,  69,  84,  65, 
>-     82,  82,  65,  89,  73,  78, 
>-     68,  69,  88,   0,  84,  69, 
>-     88,  67,  79,  79,  82,  68, 
>-      0, 171,  79,  83,  71,  78, 
>-     44,   0,   0,   0,   1,   0, 
>-      0,   0,   8,   0,   0,   0, 
>-     32,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      1,   0,   0,   0,   0,   0, 
>-      0,   0,  15,   0,   0,   0, 
>-     83,  86,  95,  84,  65,  82, 
>-     71,  69,  84,   0, 171, 171, 
>-     83,  72,  68,  82,  76,   2, 
>-      0,   0,  64,   0,   0,   0, 
>-    147,   0,   0,   0,  89,   0, 
>-      0,   4,  70, 142,  32,   0, 
>-      0,   0,   0,   0,   1,   0, 
>-      0,   0,  88,  40,   0,   4, 
>-      0, 112,  16,   0,   0,   0, 
>-      0,   0,  68,  68,   0,   0, 
>-     98,  16,   0,   3, 114,  16, 
>-     16,   0,   2,   0,   0,   0, 
>-    101,   0,   0,   3, 242,  32, 
>-     16,   0,   0,   0,   0,   0, 
>-    104,   0,   0,   2,   1,   0, 
>-      0,   0, 105,   0,   0,   4, 
>-      0,   0,   0,   0,   6,   0, 
>-      0,   0,   4,   0,   0,   0, 
>-     61,  16,   0,   7, 242,   0, 
>-     16,   0,   0,   0,   0,   0, 
>-      1,  64,   0,   0,   0,   0, 
>-      0,   0,  70, 126,  16,   0, 
>-      0,   0,   0,   0,  86,   0, 
>-      0,   5, 114,   0,  16,   0, 
>-      0,   0,   0,   0,  70,   2, 
>-     16,   0,   0,   0,   0,   0, 
>-     56,   0,   0,   7, 114,   0, 
>-     16,   0,   0,   0,   0,   0, 
>-     70,   2,  16,   0,   0,   0, 
>-      0,   0,  70,  18,  16,   0, 
>-      2,   0,   0,   0,  27,   0, 
>-      0,   5, 114,   0,  16,   0, 
>-      0,   0,   0,   0,  70,   2, 
>-     16,   0,   0,   0,   0,   0, 
>-     54,   0,   0,   5, 130,   0, 
>-     16,   0,   0,   0,   0,   0, 
>-      1,  64,   0,   0,   0,   0, 
>-      0,   0,  45,   0,   0,   7, 
>-    242,   0,  16,   0,   0,   0, 
>-      0,   0,  70,  14,  16,   0, 
>-      0,   0,   0,   0,  70, 126, 
>-     16,   0,   0,   0,   0,   0, 
>-     54,   0,   0,   6,  18,  48, 
>-     32,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,  10,   0, 
>-     16,   0,   0,   0,   0,   0, 
>-     54,   0,   0,   6,  18,  48, 
>-     32,   0,   0,   0,   0,   0, 
>-      1,   0,   0,   0,  26,   0, 
>-     16,   0,   0,   0,   0,   0, 
>-     54,   0,   0,   6,  18,  48, 
>-     32,   0,   0,   0,   0,   0, 
>-      2,   0,   0,   0,  42,   0, 
>-     16,   0,   0,   0,   0,   0, 
>-     54,   0,   0,   6,  18,  48, 
>-     32,   0,   0,   0,   0,   0, 
>-      3,   0,   0,   0,  58,   0, 
>-     16,   0,   0,   0,   0,   0, 
>-     54,   0,   0,   6,  18,  48, 
>-     32,   0,   0,   0,   0,   0, 
>-      4,   0,   0,   0,   1,  64, 
>-      0,   0,   0,   0,   0,   0, 
>-     54,   0,   0,   6,  18,  48, 
>-     32,   0,   0,   0,   0,   0, 
>-      5,   0,   0,   0,   1,  64, 
>-      0,   0,   1,   0,   0,   0, 
>-     54,   0,   0,   6,  18,   0, 
>-     16,   0,   0,   0,   0,   0, 
>-     10, 128,  32,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-     54,   0,   0,   7,  18,  32, 
>-     16,   0,   0,   0,   0,   0, 
>-     10,  48,  32,   4,   0,   0, 
>-      0,   0,  10,   0,  16,   0, 
>-      0,   0,   0,   0,  54,   0, 
>-      0,   6,  18,   0,  16,   0, 
>-      0,   0,   0,   0,  26, 128, 
>-     32,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,  54,   0, 
>-      0,   7,  34,  32,  16,   0, 
>-      0,   0,   0,   0,  10,  48, 
>-     32,   4,   0,   0,   0,   0, 
>-     10,   0,  16,   0,   0,   0, 
>-      0,   0,  54,   0,   0,   6, 
>-     18,   0,  16,   0,   0,   0, 
>-      0,   0,  42, 128,  32,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,  54,   0,   0,   7, 
>-     66,  32,  16,   0,   0,   0, 
>-      0,   0,  10,  48,  32,   4, 
>-      0,   0,   0,   0,  10,   0, 
>-     16,   0,   0,   0,   0,   0, 
>-     54,   0,   0,   6,  18,   0, 
>-     16,   0,   0,   0,   0,   0, 
>-     58, 128,  32,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-     54,   0,   0,   7, 130,  32, 
>-     16,   0,   0,   0,   0,   0, 
>-     10,  48,  32,   4,   0,   0, 
>-      0,   0,  10,   0,  16,   0, 
>-      0,   0,   0,   0,  62,   0, 
>-      0,   1,  83,  84,  65,  84, 
>-    116,   0,   0,   0,  21,   0, 
>-      0,   0,   1,   0,   0,   0, 
>-      0,   0,   0,   0,   2,   0, 
>-      0,   0,   1,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   1,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   6,   0,   0,   0, 
>-     10,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   1,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   5,   0,   0,   0, 
>-      0,   0,   0,   0,   2,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-      0,   0,   0,   0,   0,   0
>-};
>+const BYTE g_PS_SwizzleUI3D[] = {
>+    68,  88,  66,  67,  16,  68,  155, 94,  147, 232, 30,  147, 133, 253, 183, 22,  27,  47,  144,
>+    44,  1,   0,   0,   0,   200, 4,   0,   0,   5,   0,   0,   0,   52,  0,   0,   0,   60,  1,
>+    0,   0,   196, 1,   0,   0,   248, 1,   0,   0,   76,  4,   0,   0,   82,  68,  69,  70,  0,
>+    1,   0,   0,   1,   0,   0,   0,   124, 0,   0,   0,   2,   0,   0,   0,   28,  0,   0,   0,
>+    0,   4,   255, 255, 0,   1,   0,   0,   204, 0,   0,   0,   92,  0,   0,   0,   2,   0,   0,
>+    0,   4,   0,   0,   0,   8,   0,   0,   0,   255, 255, 255, 255, 0,   0,   0,   0,   1,   0,
>+    0,   0,   13,  0,   0,   0,   104, 0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   1,   0,   0,   0,
>+    84,  101, 120, 116, 117, 114, 101, 85,  73,  51,  68,  0,   83,  119, 105, 122, 122, 108, 101,
>+    80,  114, 111, 112, 101, 114, 116, 105, 101, 115, 0,   171, 171, 104, 0,   0,   0,   1,   0,
>+    0,   0,   148, 0,   0,   0,   16,  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   172,
>+    0,   0,   0,   0,   0,   0,   0,   16,  0,   0,   0,   2,   0,   0,   0,   188, 0,   0,   0,
>+    0,   0,   0,   0,   83,  119, 105, 122, 122, 108, 101, 73,  110, 100, 105, 99,  101, 115, 0,
>+    171, 1,   0,   19,  0,   1,   0,   4,   0,   0,   0,   0,   0,   0,   0,   0,   0,   77,  105,
>+    99,  114, 111, 115, 111, 102, 116, 32,  40,  82,  41,  32,  72,  76,  83,  76,  32,  83,  104,
>+    97,  100, 101, 114, 32,  67,  111, 109, 112, 105, 108, 101, 114, 32,  57,  46,  50,  57,  46,
>+    57,  53,  50,  46,  51,  49,  49,  49,  0,   171, 171, 171, 73,  83,  71,  78,  128, 0,   0,
>+    0,   3,   0,   0,   0,   8,   0,   0,   0,   80,  0,   0,   0,   0,   0,   0,   0,   1,   0,
>+    0,   0,   3,   0,   0,   0,   0,   0,   0,   0,   15,  0,   0,   0,   92,  0,   0,   0,   0,
>+    0,   0,   0,   4,   0,   0,   0,   1,   0,   0,   0,   1,   0,   0,   0,   1,   0,   0,   0,
>+    118, 0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   3,   0,   0,   0,   2,   0,   0,
>+    0,   7,   7,   0,   0,   83,  86,  95,  80,  79,  83,  73,  84,  73,  79,  78,  0,   83,  86,
>+    95,  82,  69,  78,  68,  69,  82,  84,  65,  82,  71,  69,  84,  65,  82,  82,  65,  89,  73,
>+    78,  68,  69,  88,  0,   84,  69,  88,  67,  79,  79,  82,  68,  0,   171, 79,  83,  71,  78,
>+    44,  0,   0,   0,   1,   0,   0,   0,   8,   0,   0,   0,   32,  0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   15,  0,   0,   0,   83,  86,
>+    95,  84,  65,  82,  71,  69,  84,  0,   171, 171, 83,  72,  68,  82,  76,  2,   0,   0,   64,
>+    0,   0,   0,   147, 0,   0,   0,   89,  0,   0,   4,   70,  142, 32,  0,   0,   0,   0,   0,
>+    1,   0,   0,   0,   88,  40,  0,   4,   0,   112, 16,  0,   0,   0,   0,   0,   68,  68,  0,
>+    0,   98,  16,  0,   3,   114, 16,  16,  0,   2,   0,   0,   0,   101, 0,   0,   3,   242, 32,
>+    16,  0,   0,   0,   0,   0,   104, 0,   0,   2,   1,   0,   0,   0,   105, 0,   0,   4,   0,
>+    0,   0,   0,   6,   0,   0,   0,   4,   0,   0,   0,   61,  16,  0,   7,   242, 0,   16,  0,
>+    0,   0,   0,   0,   1,   64,  0,   0,   0,   0,   0,   0,   70,  126, 16,  0,   0,   0,   0,
>+    0,   86,  0,   0,   5,   114, 0,   16,  0,   0,   0,   0,   0,   70,  2,   16,  0,   0,   0,
>+    0,   0,   56,  0,   0,   7,   114, 0,   16,  0,   0,   0,   0,   0,   70,  2,   16,  0,   0,
>+    0,   0,   0,   70,  18,  16,  0,   2,   0,   0,   0,   27,  0,   0,   5,   114, 0,   16,  0,
>+    0,   0,   0,   0,   70,  2,   16,  0,   0,   0,   0,   0,   54,  0,   0,   5,   130, 0,   16,
>+    0,   0,   0,   0,   0,   1,   64,  0,   0,   0,   0,   0,   0,   45,  0,   0,   7,   242, 0,
>+    16,  0,   0,   0,   0,   0,   70,  14,  16,  0,   0,   0,   0,   0,   70,  126, 16,  0,   0,
>+    0,   0,   0,   54,  0,   0,   6,   18,  48,  32,  0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    10,  0,   16,  0,   0,   0,   0,   0,   54,  0,   0,   6,   18,  48,  32,  0,   0,   0,   0,
>+    0,   1,   0,   0,   0,   26,  0,   16,  0,   0,   0,   0,   0,   54,  0,   0,   6,   18,  48,
>+    32,  0,   0,   0,   0,   0,   2,   0,   0,   0,   42,  0,   16,  0,   0,   0,   0,   0,   54,
>+    0,   0,   6,   18,  48,  32,  0,   0,   0,   0,   0,   3,   0,   0,   0,   58,  0,   16,  0,
>+    0,   0,   0,   0,   54,  0,   0,   6,   18,  48,  32,  0,   0,   0,   0,   0,   4,   0,   0,
>+    0,   1,   64,  0,   0,   0,   0,   0,   0,   54,  0,   0,   6,   18,  48,  32,  0,   0,   0,
>+    0,   0,   5,   0,   0,   0,   1,   64,  0,   0,   1,   0,   0,   0,   54,  0,   0,   6,   18,
>+    0,   16,  0,   0,   0,   0,   0,   10,  128, 32,  0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    54,  0,   0,   7,   18,  32,  16,  0,   0,   0,   0,   0,   10,  48,  32,  4,   0,   0,   0,
>+    0,   10,  0,   16,  0,   0,   0,   0,   0,   54,  0,   0,   6,   18,  0,   16,  0,   0,   0,
>+    0,   0,   26,  128, 32,  0,   0,   0,   0,   0,   0,   0,   0,   0,   54,  0,   0,   7,   34,
>+    32,  16,  0,   0,   0,   0,   0,   10,  48,  32,  4,   0,   0,   0,   0,   10,  0,   16,  0,
>+    0,   0,   0,   0,   54,  0,   0,   6,   18,  0,   16,  0,   0,   0,   0,   0,   42,  128, 32,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   54,  0,   0,   7,   66,  32,  16,  0,   0,   0,
>+    0,   0,   10,  48,  32,  4,   0,   0,   0,   0,   10,  0,   16,  0,   0,   0,   0,   0,   54,
>+    0,   0,   6,   18,  0,   16,  0,   0,   0,   0,   0,   58,  128, 32,  0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   54,  0,   0,   7,   130, 32,  16,  0,   0,   0,   0,   0,   10,  48,  32,
>+    4,   0,   0,   0,   0,   10,  0,   16,  0,   0,   0,   0,   0,   62,  0,   0,   1,   83,  84,
>+    65,  84,  116, 0,   0,   0,   21,  0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   2,
>+    0,   0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   6,   0,   0,   0,   10,  0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   5,   0,   0,   0,   0,   0,   0,   0,   2,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
>+    0,   0,   0,   0,   0,   0,   0,   0};
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/generate_shaders.bat b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/generate_shaders.bat
>index 4297c41b65d..c1dfe5d4ffe 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/generate_shaders.bat
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/generate_shaders.bat
>@@ -31,20 +31,33 @@ call:BuildShader Passthrough2D11.hlsl PS_PassthroughR2D        ps_4_0_level_9_3
> call:BuildShader Passthrough2D11.hlsl PS_PassthroughLum2D      ps_4_0_level_9_3  compiled\passthroughlum2d11ps.h      %debug%
> call:BuildShader Passthrough2D11.hlsl PS_PassthroughLumAlpha2D ps_4_0_level_9_3  compiled\passthroughlumalpha2d11ps.h %debug%
> 
>-call:BuildShader MultiplyAlpha.hlsl PS_FtoF_PM_RGBA ps_4_0 compiled\multiplyalpha_ftof_pm_rgba_ps.h %debug%
>-call:BuildShader MultiplyAlpha.hlsl PS_FtoF_UM_RGBA ps_4_0 compiled\multiplyalpha_ftof_um_rgba_ps.h %debug%
>-call:BuildShader MultiplyAlpha.hlsl PS_FtoF_PM_RGB  ps_4_0 compiled\multiplyalpha_ftof_pm_rgb_ps.h  %debug%
>-call:BuildShader MultiplyAlpha.hlsl PS_FtoF_UM_RGB  ps_4_0 compiled\multiplyalpha_ftof_um_rgb_ps.h  %debug%
>-call:BuildShader MultiplyAlpha.hlsl PS_FtoU_PT_RGBA ps_4_0 compiled\multiplyalpha_ftou_pt_rgba_ps.h %debug%
>-call:BuildShader MultiplyAlpha.hlsl PS_FtoU_PM_RGBA ps_4_0 compiled\multiplyalpha_ftou_pm_rgba_ps.h %debug%
>-call:BuildShader MultiplyAlpha.hlsl PS_FtoU_UM_RGBA ps_4_0 compiled\multiplyalpha_ftou_um_rgba_ps.h %debug%
>-call:BuildShader MultiplyAlpha.hlsl PS_FtoU_PT_RGB  ps_4_0 compiled\multiplyalpha_ftou_pt_rgb_ps.h  %debug%
>-call:BuildShader MultiplyAlpha.hlsl PS_FtoU_PM_RGB  ps_4_0 compiled\multiplyalpha_ftou_pm_rgb_ps.h  %debug%
>-call:BuildShader MultiplyAlpha.hlsl PS_FtoU_UM_RGB  ps_4_0 compiled\multiplyalpha_ftou_um_rgb_ps.h  %debug%
>-call:BuildShader MultiplyAlpha.hlsl PS_FtoF_PM_LUMA ps_4_0 compiled\multiplyalpha_ftof_pm_luma_ps.h  %debug%
>-call:BuildShader MultiplyAlpha.hlsl PS_FtoF_UM_LUMA ps_4_0 compiled\multiplyalpha_ftof_um_luma_ps.h  %debug%
>-call:BuildShader MultiplyAlpha.hlsl PS_FtoF_PM_LUMAALPHA   ps_4_0 compiled\multiplyalpha_ftof_pm_lumaalpha_ps.h  %debug%
>-call:BuildShader MultiplyAlpha.hlsl PS_FtoF_UM_LUMAALPHA   ps_4_0 compiled\multiplyalpha_ftof_um_lumaalpha_ps.h  %debug%
>+call:BuildShader Passthrough2D11.hlsl PS_PassthroughRGBA2D_4444 ps_4_0_level_9_3 compiled\passthroughrgba2d_4444_11ps.h %debug%
>+call:BuildShader Passthrough2D11.hlsl PS_PassthroughRGB2D_565   ps_4_0_level_9_3 compiled\passthroughrgb2d_565_11ps.h   %debug%
>+call:BuildShader Passthrough2D11.hlsl PS_PassthroughRGBA2D_5551 ps_4_0_level_9_3 compiled\passthroughrgba2d_5551_11ps.h %debug%
>+
>+call:BuildShader ResolveColor.hlsl PS_ResolveColor2D ps_4_1 compiled\resolvecolor2dps.h %debug%
>+
>+call:BuildShader MultiplyAlpha.hlsl PS_FtoF_PM_RGBA_2D ps_4_0 compiled\multiplyalpha_ftof_pm_rgba_2d_ps.h %debug%
>+call:BuildShader MultiplyAlpha.hlsl PS_FtoF_UM_RGBA_2D ps_4_0 compiled\multiplyalpha_ftof_um_rgba_2d_ps.h %debug%
>+call:BuildShader MultiplyAlpha.hlsl PS_FtoF_PM_RGB_2D  ps_4_0 compiled\multiplyalpha_ftof_pm_rgb_2d_ps.h  %debug%
>+call:BuildShader MultiplyAlpha.hlsl PS_FtoF_UM_RGB_2D  ps_4_0 compiled\multiplyalpha_ftof_um_rgb_2d_ps.h  %debug%
>+call:BuildShader MultiplyAlpha.hlsl PS_FtoU_PT_RGBA_2D ps_4_0 compiled\multiplyalpha_ftou_pt_rgba_2d_ps.h %debug%
>+call:BuildShader MultiplyAlpha.hlsl PS_FtoU_PM_RGBA_2D ps_4_0 compiled\multiplyalpha_ftou_pm_rgba_2d_ps.h %debug%
>+call:BuildShader MultiplyAlpha.hlsl PS_FtoU_UM_RGBA_2D ps_4_0 compiled\multiplyalpha_ftou_um_rgba_2d_ps.h %debug%
>+call:BuildShader MultiplyAlpha.hlsl PS_FtoU_PT_RGB_2D  ps_4_0 compiled\multiplyalpha_ftou_pt_rgb_2d_ps.h  %debug%
>+call:BuildShader MultiplyAlpha.hlsl PS_FtoU_PM_RGB_2D  ps_4_0 compiled\multiplyalpha_ftou_pm_rgb_2d_ps.h  %debug%
>+call:BuildShader MultiplyAlpha.hlsl PS_FtoU_UM_RGB_2D  ps_4_0 compiled\multiplyalpha_ftou_um_rgb_2d_ps.h  %debug%
>+call:BuildShader MultiplyAlpha.hlsl PS_FtoF_PM_LUMA_2D ps_4_0 compiled\multiplyalpha_ftof_pm_luma_2d_ps.h  %debug%
>+call:BuildShader MultiplyAlpha.hlsl PS_FtoF_UM_LUMA_2D ps_4_0 compiled\multiplyalpha_ftof_um_luma_2d_ps.h  %debug%
>+call:BuildShader MultiplyAlpha.hlsl PS_FtoF_PM_LUMAALPHA_2D   ps_4_0 compiled\multiplyalpha_ftof_pm_lumaalpha_2d_ps.h  %debug%
>+call:BuildShader MultiplyAlpha.hlsl PS_FtoF_UM_LUMAALPHA_2D   ps_4_0 compiled\multiplyalpha_ftof_um_lumaalpha_2d_ps.h  %debug%
>+
>+call:BuildShader MultiplyAlpha.hlsl PS_FtoF_PM_RGBA_4444_2D ps_4_0 compiled\multiplyalpha_ftof_pm_rgba_4444_2d_ps.h %debug%
>+call:BuildShader MultiplyAlpha.hlsl PS_FtoF_UM_RGBA_4444_2D ps_4_0 compiled\multiplyalpha_ftof_um_rgba_4444_2d_ps.h %debug%
>+call:BuildShader MultiplyAlpha.hlsl PS_FtoF_PM_RGB_565_2D   ps_4_0 compiled\multiplyalpha_ftof_pm_rgb_565_2d_ps.h   %debug%
>+call:BuildShader MultiplyAlpha.hlsl PS_FtoF_UM_RGB_565_2D   ps_4_0 compiled\multiplyalpha_ftof_um_rgb_565_2d_ps.h   %debug%
>+call:BuildShader MultiplyAlpha.hlsl PS_FtoF_PM_RGBA_5551_2D ps_4_0 compiled\multiplyalpha_ftof_pm_rgba_5551_2d_ps.h %debug%
>+call:BuildShader MultiplyAlpha.hlsl PS_FtoF_UM_RGBA_5551_2D ps_4_0 compiled\multiplyalpha_ftof_um_rgba_5551_2d_ps.h %debug%
> 
> call:BuildShader Clear11.hlsl           VS_Clear_FL9             vs_4_0_level_9_3  compiled\clear11_fl9vs.h             %debug%
> call:BuildShader Clear11.hlsl           PS_ClearFloat_FL9        ps_4_0_level_9_3  compiled\clearfloat11_fl9ps.h        %debug%
>@@ -91,6 +104,85 @@ call:BuildShader Passthrough3D11.hlsl       PS_PassthroughR3DI       ps_4_0   co
> call:BuildShader Passthrough3D11.hlsl       PS_PassthroughLum3D      ps_4_0   compiled\passthroughlum3d11ps.h      %debug%
> call:BuildShader Passthrough3D11.hlsl       PS_PassthroughLumAlpha3D ps_4_0   compiled\passthroughlumalpha3d11ps.h %debug%
> 
>+call:BuildShader Passthrough3D11.hlsl PS_PassthroughRGBA3D_4444 ps_4_0 compiled\passthroughrgba3d_4444_11ps.h %debug%
>+call:BuildShader Passthrough3D11.hlsl PS_PassthroughRGB3D_565   ps_4_0 compiled\passthroughrgb3d_565_11ps.h   %debug%
>+call:BuildShader Passthrough3D11.hlsl PS_PassthroughRGBA3D_5551 ps_4_0 compiled\passthroughrgba3d_5551_11ps.h %debug%
>+
>+call:BuildShader Passthrough2DArray11.hlsl       PS_PassthroughRGBA2DArray     ps_4_0   compiled\passthroughrgba2darray11ps.h     %debug%
>+call:BuildShader Passthrough2DArray11.hlsl       PS_PassthroughRGBA2DArrayUI   ps_4_0   compiled\passthroughrgba2darrayui11ps.h   %debug%
>+call:BuildShader Passthrough2DArray11.hlsl       PS_PassthroughRGBA2DArrayI    ps_4_0   compiled\passthroughrgba2darrayi11ps.h    %debug%
>+call:BuildShader Passthrough2DArray11.hlsl       PS_PassthroughRGB2DArray      ps_4_0   compiled\passthroughrgb2darray11ps.h      %debug%
>+call:BuildShader Passthrough2DArray11.hlsl       PS_PassthroughRGB2DArrayUI    ps_4_0   compiled\passthroughrgb2darrayui11ps.h    %debug%
>+call:BuildShader Passthrough2DArray11.hlsl       PS_PassthroughRGB2DArrayI     ps_4_0   compiled\passthroughrgb2darrayi11ps.h     %debug%
>+call:BuildShader Passthrough2DArray11.hlsl       PS_PassthroughRG2DArray       ps_4_0   compiled\passthroughrg2darray11ps.h       %debug%
>+call:BuildShader Passthrough2DArray11.hlsl       PS_PassthroughRG2DArrayUI     ps_4_0   compiled\passthroughrg2darrayui11ps.h     %debug%
>+call:BuildShader Passthrough2DArray11.hlsl       PS_PassthroughRG2DArrayI      ps_4_0   compiled\passthroughrg2darrayi11ps.h      %debug%
>+call:BuildShader Passthrough2DArray11.hlsl       PS_PassthroughR2DArray        ps_4_0   compiled\passthroughr2darray11ps.h        %debug%
>+call:BuildShader Passthrough2DArray11.hlsl       PS_PassthroughR2DArrayUI      ps_4_0   compiled\passthroughr2darrayui11ps.h      %debug%
>+call:BuildShader Passthrough2DArray11.hlsl       PS_PassthroughR2DArrayI       ps_4_0   compiled\passthroughr2darrayi11ps.h       %debug%
>+call:BuildShader Passthrough2DArray11.hlsl       PS_PassthroughLum2DArray      ps_4_0   compiled\passthroughlum2darray11ps.h      %debug%
>+call:BuildShader Passthrough2DArray11.hlsl       PS_PassthroughLumAlpha2DArray ps_4_0   compiled\passthroughlumalpha2darray11ps.h %debug%
>+
>+call:BuildShader Passthrough2DArray11.hlsl PS_PassthroughRGBA2DArray_4444 ps_4_0 compiled\passthroughrgba2darray_4444_11ps.h %debug%
>+call:BuildShader Passthrough2DArray11.hlsl PS_PassthroughRGB2DArray_565   ps_4_0 compiled\passthroughrgb2darray_565_11ps.h   %debug%
>+call:BuildShader Passthrough2DArray11.hlsl PS_PassthroughRGBA2DArray_5551 ps_4_0 compiled\passthroughrgba2darray_5551_11ps.h %debug%
>+
>+call:BuildShader MultiplyAlpha.hlsl PS_FtoF_PM_RGBA_3D ps_4_0 compiled\multiplyalpha_ftof_pm_rgba_3d_ps.h %debug%
>+call:BuildShader MultiplyAlpha.hlsl PS_FtoF_UM_RGBA_3D ps_4_0 compiled\multiplyalpha_ftof_um_rgba_3d_ps.h %debug%
>+call:BuildShader MultiplyAlpha.hlsl PS_FtoF_PM_RGB_3D  ps_4_0 compiled\multiplyalpha_ftof_pm_rgb_3d_ps.h  %debug%
>+call:BuildShader MultiplyAlpha.hlsl PS_FtoF_UM_RGB_3D  ps_4_0 compiled\multiplyalpha_ftof_um_rgb_3d_ps.h  %debug%
>+call:BuildShader MultiplyAlpha.hlsl PS_FtoU_PT_RGBA_3D ps_4_0 compiled\multiplyalpha_ftou_pt_rgba_3d_ps.h %debug%
>+call:BuildShader MultiplyAlpha.hlsl PS_FtoU_PM_RGBA_3D ps_4_0 compiled\multiplyalpha_ftou_pm_rgba_3d_ps.h %debug%
>+call:BuildShader MultiplyAlpha.hlsl PS_FtoU_UM_RGBA_3D ps_4_0 compiled\multiplyalpha_ftou_um_rgba_3d_ps.h %debug%
>+call:BuildShader MultiplyAlpha.hlsl PS_FtoU_PT_RGB_3D  ps_4_0 compiled\multiplyalpha_ftou_pt_rgb_3d_ps.h  %debug%
>+call:BuildShader MultiplyAlpha.hlsl PS_FtoU_PM_RGB_3D  ps_4_0 compiled\multiplyalpha_ftou_pm_rgb_3d_ps.h  %debug%
>+call:BuildShader MultiplyAlpha.hlsl PS_FtoU_UM_RGB_3D  ps_4_0 compiled\multiplyalpha_ftou_um_rgb_3d_ps.h  %debug%
>+call:BuildShader MultiplyAlpha.hlsl PS_FtoI_PT_RGBA_3D ps_4_0 compiled\multiplyalpha_ftoi_pt_rgba_3d_ps.h %debug%
>+call:BuildShader MultiplyAlpha.hlsl PS_FtoI_PM_RGBA_3D ps_4_0 compiled\multiplyalpha_ftoi_pm_rgba_3d_ps.h %debug%
>+call:BuildShader MultiplyAlpha.hlsl PS_FtoI_UM_RGBA_3D ps_4_0 compiled\multiplyalpha_ftoi_um_rgba_3d_ps.h %debug%
>+call:BuildShader MultiplyAlpha.hlsl PS_FtoI_PT_RGB_3D  ps_4_0 compiled\multiplyalpha_ftoi_pt_rgb_3d_ps.h  %debug%
>+call:BuildShader MultiplyAlpha.hlsl PS_FtoI_PM_RGB_3D  ps_4_0 compiled\multiplyalpha_ftoi_pm_rgb_3d_ps.h  %debug%
>+call:BuildShader MultiplyAlpha.hlsl PS_FtoI_UM_RGB_3D  ps_4_0 compiled\multiplyalpha_ftoi_um_rgb_3d_ps.h  %debug%
>+call:BuildShader MultiplyAlpha.hlsl PS_FtoF_PM_LUMA_3D ps_4_0 compiled\multiplyalpha_ftof_pm_luma_3d_ps.h  %debug%
>+call:BuildShader MultiplyAlpha.hlsl PS_FtoF_UM_LUMA_3D ps_4_0 compiled\multiplyalpha_ftof_um_luma_3d_ps.h  %debug%
>+call:BuildShader MultiplyAlpha.hlsl PS_FtoF_PM_LUMAALPHA_3D   ps_4_0 compiled\multiplyalpha_ftof_pm_lumaalpha_3d_ps.h  %debug%
>+call:BuildShader MultiplyAlpha.hlsl PS_FtoF_UM_LUMAALPHA_3D   ps_4_0 compiled\multiplyalpha_ftof_um_lumaalpha_3d_ps.h  %debug%
>+
>+call:BuildShader MultiplyAlpha.hlsl PS_FtoF_PM_RGBA_4444_3D ps_4_0 compiled\multiplyalpha_ftof_pm_rgba_4444_3d_ps.h %debug%
>+call:BuildShader MultiplyAlpha.hlsl PS_FtoF_UM_RGBA_4444_3D ps_4_0 compiled\multiplyalpha_ftof_um_rgba_4444_3d_ps.h %debug%
>+call:BuildShader MultiplyAlpha.hlsl PS_FtoF_PM_RGB_565_3D   ps_4_0 compiled\multiplyalpha_ftof_pm_rgb_565_3d_ps.h   %debug%
>+call:BuildShader MultiplyAlpha.hlsl PS_FtoF_UM_RGB_565_3D   ps_4_0 compiled\multiplyalpha_ftof_um_rgb_565_3d_ps.h   %debug%
>+call:BuildShader MultiplyAlpha.hlsl PS_FtoF_PM_RGBA_5551_3D ps_4_0 compiled\multiplyalpha_ftof_pm_rgba_5551_3d_ps.h %debug%
>+call:BuildShader MultiplyAlpha.hlsl PS_FtoF_UM_RGBA_5551_3D ps_4_0 compiled\multiplyalpha_ftof_um_rgba_5551_3d_ps.h %debug%
>+
>+call:BuildShader MultiplyAlpha.hlsl PS_FtoF_PM_RGBA_2DArray ps_4_0 compiled\multiplyalpha_ftof_pm_rgba_2darray_ps.h %debug%
>+call:BuildShader MultiplyAlpha.hlsl PS_FtoF_UM_RGBA_2DArray ps_4_0 compiled\multiplyalpha_ftof_um_rgba_2darray_ps.h %debug%
>+call:BuildShader MultiplyAlpha.hlsl PS_FtoF_PM_RGB_2DArray  ps_4_0 compiled\multiplyalpha_ftof_pm_rgb_2darray_ps.h  %debug%
>+call:BuildShader MultiplyAlpha.hlsl PS_FtoF_UM_RGB_2DArray  ps_4_0 compiled\multiplyalpha_ftof_um_rgb_2darray_ps.h  %debug%
>+call:BuildShader MultiplyAlpha.hlsl PS_FtoU_PT_RGBA_2DArray ps_4_0 compiled\multiplyalpha_ftou_pt_rgba_2darray_ps.h %debug%
>+call:BuildShader MultiplyAlpha.hlsl PS_FtoU_PM_RGBA_2DArray ps_4_0 compiled\multiplyalpha_ftou_pm_rgba_2darray_ps.h %debug%
>+call:BuildShader MultiplyAlpha.hlsl PS_FtoU_UM_RGBA_2DArray ps_4_0 compiled\multiplyalpha_ftou_um_rgba_2darray_ps.h %debug%
>+call:BuildShader MultiplyAlpha.hlsl PS_FtoU_PT_RGB_2DArray  ps_4_0 compiled\multiplyalpha_ftou_pt_rgb_2darray_ps.h  %debug%
>+call:BuildShader MultiplyAlpha.hlsl PS_FtoU_PM_RGB_2DArray  ps_4_0 compiled\multiplyalpha_ftou_pm_rgb_2darray_ps.h  %debug%
>+call:BuildShader MultiplyAlpha.hlsl PS_FtoU_UM_RGB_2DArray  ps_4_0 compiled\multiplyalpha_ftou_um_rgb_2darray_ps.h  %debug%
>+call:BuildShader MultiplyAlpha.hlsl PS_FtoI_PT_RGBA_2DArray ps_4_0 compiled\multiplyalpha_ftoi_pt_rgba_2darray_ps.h %debug%
>+call:BuildShader MultiplyAlpha.hlsl PS_FtoI_PM_RGBA_2DArray ps_4_0 compiled\multiplyalpha_ftoi_pm_rgba_2darray_ps.h %debug%
>+call:BuildShader MultiplyAlpha.hlsl PS_FtoI_UM_RGBA_2DArray ps_4_0 compiled\multiplyalpha_ftoi_um_rgba_2darray_ps.h %debug%
>+call:BuildShader MultiplyAlpha.hlsl PS_FtoI_PT_RGB_2DArray  ps_4_0 compiled\multiplyalpha_ftoi_pt_rgb_2darray_ps.h  %debug%
>+call:BuildShader MultiplyAlpha.hlsl PS_FtoI_PM_RGB_2DArray  ps_4_0 compiled\multiplyalpha_ftoi_pm_rgb_2darray_ps.h  %debug%
>+call:BuildShader MultiplyAlpha.hlsl PS_FtoI_UM_RGB_2DArray  ps_4_0 compiled\multiplyalpha_ftoi_um_rgb_2darray_ps.h  %debug%
>+call:BuildShader MultiplyAlpha.hlsl PS_FtoF_PM_LUMA_2DArray ps_4_0 compiled\multiplyalpha_ftof_pm_luma_2darray_ps.h  %debug%
>+call:BuildShader MultiplyAlpha.hlsl PS_FtoF_UM_LUMA_2DArray ps_4_0 compiled\multiplyalpha_ftof_um_luma_2darray_ps.h  %debug%
>+call:BuildShader MultiplyAlpha.hlsl PS_FtoF_PM_LUMAALPHA_2DArray   ps_4_0 compiled\multiplyalpha_ftof_pm_lumaalpha_2darray_ps.h  %debug%
>+call:BuildShader MultiplyAlpha.hlsl PS_FtoF_UM_LUMAALPHA_2DArray   ps_4_0 compiled\multiplyalpha_ftof_um_lumaalpha_2darray_ps.h  %debug%
>+
>+call:BuildShader MultiplyAlpha.hlsl PS_FtoF_PM_RGBA_4444_2DArray ps_4_0 compiled\multiplyalpha_ftof_pm_rgba_4444_2darray_ps.h %debug%
>+call:BuildShader MultiplyAlpha.hlsl PS_FtoF_UM_RGBA_4444_2DArray ps_4_0 compiled\multiplyalpha_ftof_um_rgba_4444_2darray_ps.h %debug%
>+call:BuildShader MultiplyAlpha.hlsl PS_FtoF_PM_RGB_565_2DArray   ps_4_0 compiled\multiplyalpha_ftof_pm_rgb_565_2darray_ps.h   %debug%
>+call:BuildShader MultiplyAlpha.hlsl PS_FtoF_UM_RGB_565_2DArray   ps_4_0 compiled\multiplyalpha_ftof_um_rgb_565_2darray_ps.h   %debug%
>+call:BuildShader MultiplyAlpha.hlsl PS_FtoF_PM_RGBA_5551_2DArray ps_4_0 compiled\multiplyalpha_ftof_pm_rgba_5551_2darray_ps.h %debug%
>+call:BuildShader MultiplyAlpha.hlsl PS_FtoF_UM_RGBA_5551_2DArray ps_4_0 compiled\multiplyalpha_ftof_um_rgba_5551_2darray_ps.h %debug%
>+
> call:BuildShader Swizzle11.hlsl             PS_SwizzleF2D            ps_4_0   compiled\swizzlef2dps.h              %debug%
> call:BuildShader Swizzle11.hlsl             PS_SwizzleI2D            ps_4_0   compiled\swizzlei2dps.h              %debug%
> call:BuildShader Swizzle11.hlsl             PS_SwizzleUI2D           ps_4_0   compiled\swizzleui2dps.h             %debug%
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/texture_format_data.json b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/texture_format_data.json
>index 61cd44a62b7..a082dc2caa5 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/texture_format_data.json
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/texture_format_data.json
>@@ -14,12 +14,31 @@
>   "R8G8B8A8_UNORM": {
>     "texFormat": "DXGI_FORMAT_R8G8B8A8_UNORM",
>     "srvFormat": "DXGI_FORMAT_R8G8B8A8_UNORM",
>+    "uavFormat": "DXGI_FORMAT_R8G8B8A8_UNORM",
>     "rtvFormat": "DXGI_FORMAT_R8G8B8A8_UNORM",
>     "channels": "rgba",
>     "componentType": "unorm",
>     "bits": { "red": 8, "green": 8, "blue": 8, "alpha": 8 },
>     "glInternalFormat": "GL_RGBA8"
>   },
>+  "R8G8B8A8_TYPELESS": {
>+    "texFormat": "DXGI_FORMAT_R8G8B8A8_TYPELESS",
>+    "srvFormat": "DXGI_FORMAT_R8G8B8A8_UNORM",
>+    "rtvFormat": "DXGI_FORMAT_R8G8B8A8_UNORM",
>+    "channels": "rgba",
>+    "componentType": "typeless",
>+    "bits": { "red": 8, "green": 8, "blue": 8, "alpha": 8 },
>+    "glInternalFormat": "GL_RGBA8"
>+  },
>+  "R8G8B8A8_TYPELESS_SRGB": {
>+    "texFormat": "DXGI_FORMAT_R8G8B8A8_TYPELESS",
>+    "srvFormat": "DXGI_FORMAT_R8G8B8A8_UNORM_SRGB",
>+    "rtvFormat": "DXGI_FORMAT_R8G8B8A8_UNORM_SRGB",
>+    "channels": "rgba",
>+    "componentType": "typeless",
>+    "bits": { "red": 8, "green": 8, "blue": 8, "alpha": 8 },
>+    "glInternalFormat": "GL_SRGB8_ALPHA8"
>+  },
>   "R16G16B16A16_UNORM": {
>     "texFormat": "DXGI_FORMAT_R16G16B16A16_UNORM",
>     "srvFormat": "DXGI_FORMAT_R16G16B16A16_UNORM",
>@@ -32,6 +51,7 @@
>   "R16G16B16A16_FLOAT": {
>     "texFormat": "DXGI_FORMAT_R16G16B16A16_FLOAT",
>     "srvFormat": "DXGI_FORMAT_R16G16B16A16_FLOAT",
>+    "uavFormat": "DXGI_FORMAT_R16G16B16A16_FLOAT",
>     "rtvFormat": "DXGI_FORMAT_R16G16B16A16_FLOAT",
>     "channels": "rgba",
>     "componentType": "float",
>@@ -41,6 +61,7 @@
>   "R32G32B32A32_FLOAT": {
>     "texFormat": "DXGI_FORMAT_R32G32B32A32_FLOAT",
>     "srvFormat": "DXGI_FORMAT_R32G32B32A32_FLOAT",
>+    "uavFormat": "DXGI_FORMAT_R32G32B32A32_FLOAT",
>     "rtvFormat": "DXGI_FORMAT_R32G32B32A32_FLOAT",
>     "channels": "rgba",
>     "componentType": "float",
>@@ -65,6 +86,35 @@
>     "bits": {"red": 8, "green": 8, "blue": 8,"alpha": 8},
>     "siwzzleFormat": "GL_RGBA8"
>   },
>+  "B8G8R8A8_TYPELESS": {
>+    "texFormat": "DXGI_FORMAT_B8G8R8A8_TYPELESS",
>+    "srvFormat": "DXGI_FORMAT_B8G8R8A8_UNORM_SRGB",
>+    "rtvFormat": "DXGI_FORMAT_B8G8R8A8_UNORM_SRGB",
>+    "channels": "bgra",
>+    "componentType": "typeless",
>+    "bits": { "red": 8, "green": 8, "blue": 8, "alpha": 8 },
>+    "glInternalFormat": "GL_BGRA8_EXT"
>+  },
>+  "B8G8R8A8_TYPELESS_SRGB": {
>+    "texFormat": "DXGI_FORMAT_B8G8R8A8_TYPELESS",
>+    "srvFormat": "DXGI_FORMAT_B8G8R8A8_UNORM_SRGB",
>+    "rtvFormat": "DXGI_FORMAT_B8G8R8A8_UNORM_SRGB",
>+    "channels": "bgra",
>+    "componentType": "typeless",
>+    "bits": { "red": 8, "green": 8, "blue": 8, "alpha": 8 },
>+    "glInternalFormat": "GL_BGRA8_SRGB_ANGLEX"
>+  },
>+  "B8G8R8X8_UNORM": {
>+    "texFormat": "DXGI_FORMAT_B8G8R8X8_UNORM",
>+    "srvFormat": "DXGI_FORMAT_B8G8R8X8_UNORM",
>+    "rtvFormat": "DXGI_FORMAT_B8G8R8X8_UNORM",
>+    "channels": "bgra",
>+    "componentType": "unorm",
>+    "bits": { "red": 8, "green": 8, "blue": 8, "alpha": 8 },
>+    "supportTest": "OnlyFL11_1Plus(deviceCaps)",
>+    "fallbackFormat": "R8G8B8A8_UNORM",
>+    "glInternalFormat": "GL_BGRX8_ANGLEX"
>+  },
>   "BC1_RGBA_UNORM_BLOCK": {
>     "texFormat": "DXGI_FORMAT_BC1_UNORM",
>     "srvFormat": "DXGI_FORMAT_BC1_UNORM",
>@@ -121,6 +171,34 @@
>     "componentType": "unorm",
>     "swizzleFormat": "GL_RGBA8"
>   },
>+  "BPTC_RGBA_UNORM_BLOCK": {
>+    "texFormat": "DXGI_FORMAT_BC7_UNORM",
>+    "srvFormat": "DXGI_FORMAT_BC7_UNORM",
>+    "channels": "rgba",
>+    "componentType": "unorm",
>+    "swizzleFormat": "GL_RGBA8"
>+  },
>+  "BPTC_SRGB_ALPHA_UNORM_BLOCK": {
>+    "texFormat": "DXGI_FORMAT_BC7_UNORM_SRGB",
>+    "srvFormat": "DXGI_FORMAT_BC7_UNORM_SRGB",
>+    "channels": "rgba",
>+    "componentType": "unorm",
>+    "swizzleFormat": "GL_SRGB8_ALPHA8"
>+  },
>+  "BPTC_RGB_SIGNED_FLOAT_BLOCK": {
>+    "texFormat": "DXGI_FORMAT_BC6H_SF16",
>+    "srvFormat": "DXGI_FORMAT_BC6H_SF16",
>+    "channels": "rgb",
>+    "componentType": "float",
>+    "swizzleFormat": "GL_RGBA32F"
>+  },
>+  "BPTC_RGB_UNSIGNED_FLOAT_BLOCK": {
>+    "texFormat": "DXGI_FORMAT_BC6H_UF16",
>+    "srvFormat": "DXGI_FORMAT_BC6H_UF16",
>+    "channels": "rgb",
>+    "componentType": "float",
>+    "swizzleFormat": "GL_RGBA32F"
>+  },
>   "D24_UNORM_S8_UINT": {
>     "FL10Plus": {
>       "texFormat": "DXGI_FORMAT_R24G8_TYPELESS",
>@@ -204,6 +282,7 @@
>   "R32_FLOAT": {
>     "texFormat": "DXGI_FORMAT_R32_FLOAT",
>     "srvFormat": "DXGI_FORMAT_R32_FLOAT",
>+    "uavFormat": "DXGI_FORMAT_R32_FLOAT",
>     "rtvFormat": "DXGI_FORMAT_R32_FLOAT",
>     "channels": "r",
>     "componentType": "float",
>@@ -213,6 +292,7 @@
>   "R32_SINT": {
>     "texFormat": "DXGI_FORMAT_R32_SINT",
>     "srvFormat": "DXGI_FORMAT_R32_SINT",
>+    "uavFormat": "DXGI_FORMAT_R32_SINT",
>     "rtvFormat": "DXGI_FORMAT_R32_SINT",
>     "channels": "r",
>     "componentType": "int",
>@@ -222,6 +302,7 @@
>   "R32_UINT": {
>     "texFormat": "DXGI_FORMAT_R32_UINT",
>     "srvFormat": "DXGI_FORMAT_R32_UINT",
>+    "uavFormat": "DXGI_FORMAT_R32_UINT",
>     "rtvFormat": "DXGI_FORMAT_R32_UINT",
>     "channels": "r",
>     "componentType": "uint",
>@@ -373,6 +454,7 @@
>   "R16G16B16A16_SINT": {
>     "texFormat": "DXGI_FORMAT_R16G16B16A16_SINT",
>     "srvFormat": "DXGI_FORMAT_R16G16B16A16_SINT",
>+    "uavFormat": "DXGI_FORMAT_R16G16B16A16_SINT",
>     "rtvFormat": "DXGI_FORMAT_R16G16B16A16_SINT",
>     "channels": "rgba",
>     "componentType": "int",
>@@ -382,6 +464,7 @@
>   "R16G16B16A16_UINT": {
>     "texFormat": "DXGI_FORMAT_R16G16B16A16_UINT",
>     "srvFormat": "DXGI_FORMAT_R16G16B16A16_UINT",
>+    "uavFormat": "DXGI_FORMAT_R16G16B16A16_UINT",
>     "rtvFormat": "DXGI_FORMAT_R16G16B16A16_UINT",
>     "channels": "rgba",
>     "componentType": "uint",
>@@ -391,6 +474,7 @@
>   "R32G32B32A32_SINT": {
>     "texFormat": "DXGI_FORMAT_R32G32B32A32_SINT",
>     "srvFormat": "DXGI_FORMAT_R32G32B32A32_SINT",
>+    "uavFormat": "DXGI_FORMAT_R32G32B32A32_SINT",
>     "rtvFormat": "DXGI_FORMAT_R32G32B32A32_SINT",
>     "channels": "rgba",
>     "componentType": "int",
>@@ -400,6 +484,7 @@
>   "R32G32B32A32_UINT": {
>     "texFormat": "DXGI_FORMAT_R32G32B32A32_UINT",
>     "srvFormat": "DXGI_FORMAT_R32G32B32A32_UINT",
>+    "uavFormat": "DXGI_FORMAT_R32G32B32A32_UINT",
>     "rtvFormat": "DXGI_FORMAT_R32G32B32A32_UINT",
>     "channels": "rgba",
>     "componentType": "uint",
>@@ -429,6 +514,7 @@
>   "R8G8B8A8_SINT": {
>     "texFormat": "DXGI_FORMAT_R8G8B8A8_SINT",
>     "srvFormat": "DXGI_FORMAT_R8G8B8A8_SINT",
>+    "uavFormat": "DXGI_FORMAT_R8G8B8A8_SINT",
>     "rtvFormat": "DXGI_FORMAT_R8G8B8A8_SINT",
>     "channels": "rgba",
>     "componentType": "int",
>@@ -438,6 +524,7 @@
>   "R8G8B8A8_UINT": {
>     "texFormat": "DXGI_FORMAT_R8G8B8A8_UINT",
>     "srvFormat": "DXGI_FORMAT_R8G8B8A8_UINT",
>+    "uavFormat": "DXGI_FORMAT_R8G8B8A8_UINT",
>     "rtvFormat": "DXGI_FORMAT_R8G8B8A8_UINT",
>     "channels": "rgba",
>     "componentType": "uint",
>@@ -447,6 +534,7 @@
>   "R8G8B8A8_SNORM": {
>     "texFormat": "DXGI_FORMAT_R8G8B8A8_SNORM",
>     "srvFormat": "DXGI_FORMAT_R8G8B8A8_SNORM",
>+    "uavFormat": "DXGI_FORMAT_R8G8B8A8_SNORM",
>     "channels": "rgba",
>     "componentType": "snorm",
>     "bits": { "red": 8, "green": 8, "blue": 8, "alpha": 8 },
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/texture_format_map.json b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/texture_format_map.json
>index 3ef23556455..baa2cf7d1ab 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/texture_format_map.json
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/texture_format_map.json
>@@ -4,8 +4,8 @@
>   "GL_BGR5_A1_ANGLEX": "B8G8R8A8_UNORM",
>   "GL_BGRA4_ANGLEX": "B8G8R8A8_UNORM",
>   "GL_BGRA8_SRGB_ANGLEX": "B8G8R8A8_UNORM_SRGB",
>-  "GL_COMPRESSED_R11_EAC": "R8_UNORM",
>-  "GL_COMPRESSED_RG11_EAC": "R8G8_UNORM",
>+  "GL_COMPRESSED_R11_EAC": "R16_UNORM",
>+  "GL_COMPRESSED_RG11_EAC": "R16G16_UNORM",
>   "GL_COMPRESSED_RGB8_ETC2": "R8G8B8A8_UNORM",
>   "GL_COMPRESSED_RGB8_PUNCHTHROUGH_ALPHA1_ETC2": "R8G8B8A8_UNORM",
>   "GL_COMPRESSED_RGBA8_ETC2_EAC": "R8G8B8A8_UNORM",
>@@ -23,8 +23,8 @@
>   "GL_COMPRESSED_RGBA_ASTC_10x10_KHR": "NONE",
>   "GL_COMPRESSED_RGBA_ASTC_12x10_KHR": "NONE",
>   "GL_COMPRESSED_RGBA_ASTC_12x12_KHR": "NONE",
>-  "GL_COMPRESSED_SIGNED_R11_EAC": "R8_SNORM",
>-  "GL_COMPRESSED_SIGNED_RG11_EAC": "R8G8_SNORM",
>+  "GL_COMPRESSED_SIGNED_R11_EAC": "R16_SNORM",
>+  "GL_COMPRESSED_SIGNED_RG11_EAC": "R16G16_SNORM",
>   "GL_COMPRESSED_SRGB8_ALPHA8_ASTC_4x4_KHR": "NONE",
>   "GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x4_KHR": "NONE",
>   "GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x5_KHR": "NONE",
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/texture_format_table.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/texture_format_table.h
>index 3efcb81adbe..b7bcba9cb4d 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/texture_format_table.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/texture_format_table.h
>@@ -15,8 +15,8 @@
> #include "common/angleutils.h"
> #include "common/platform.h"
> #include "libANGLE/renderer/Format.h"
>-#include "libANGLE/renderer/renderer_utils.h"
> #include "libANGLE/renderer/d3d/formatutilsD3D.h"
>+#include "libANGLE/renderer/renderer_utils.h"
> 
> namespace rx
> {
>@@ -32,16 +32,17 @@ namespace d3d11
> // DSVs given a GL internal format.
> struct Format final : private angle::NonCopyable
> {
>-    constexpr Format();
>-    constexpr Format(GLenum internalFormat,
>-                     angle::Format::ID formatID,
>-                     DXGI_FORMAT texFormat,
>-                     DXGI_FORMAT srvFormat,
>-                     DXGI_FORMAT rtvFormat,
>-                     DXGI_FORMAT dsvFormat,
>-                     DXGI_FORMAT blitSRVFormat,
>-                     GLenum swizzleFormat,
>-                     InitializeTextureDataFunction internalFormatInitializer);
>+    inline constexpr Format();
>+    inline constexpr Format(GLenum internalFormat,
>+                            angle::FormatID formatID,
>+                            DXGI_FORMAT texFormat,
>+                            DXGI_FORMAT srvFormat,
>+                            DXGI_FORMAT uavFormat,
>+                            DXGI_FORMAT rtvFormat,
>+                            DXGI_FORMAT dsvFormat,
>+                            DXGI_FORMAT blitSRVFormat,
>+                            GLenum swizzleFormat,
>+                            InitializeTextureDataFunction internalFormatInitializer);
> 
>     static const Format &Get(GLenum internalFormat, const Renderer11DeviceCaps &deviceCaps);
> 
>@@ -50,10 +51,11 @@ struct Format final : private angle::NonCopyable
>     const angle::Format &format() const;
> 
>     GLenum internalFormat;
>-    angle::Format::ID formatID;
>+    angle::FormatID formatID;
> 
>     DXGI_FORMAT texFormat;
>     DXGI_FORMAT srvFormat;
>+    DXGI_FORMAT uavFormat;
>     DXGI_FORMAT rtvFormat;
>     DXGI_FORMAT dsvFormat;
> 
>@@ -66,21 +68,22 @@ struct Format final : private angle::NonCopyable
> 
> constexpr Format::Format()
>     : internalFormat(GL_NONE),
>-      formatID(angle::Format::ID::NONE),
>+      formatID(angle::FormatID::NONE),
>       texFormat(DXGI_FORMAT_UNKNOWN),
>       srvFormat(DXGI_FORMAT_UNKNOWN),
>+      uavFormat(DXGI_FORMAT_UNKNOWN),
>       rtvFormat(DXGI_FORMAT_UNKNOWN),
>       dsvFormat(DXGI_FORMAT_UNKNOWN),
>       blitSRVFormat(DXGI_FORMAT_UNKNOWN),
>       swizzleFormat(GL_NONE),
>       dataInitializerFunction(nullptr)
>-{
>-}
>+{}
> 
> constexpr Format::Format(GLenum internalFormat,
>-                         angle::Format::ID formatID,
>+                         angle::FormatID formatID,
>                          DXGI_FORMAT texFormat,
>                          DXGI_FORMAT srvFormat,
>+                         DXGI_FORMAT uavFormat,
>                          DXGI_FORMAT rtvFormat,
>                          DXGI_FORMAT dsvFormat,
>                          DXGI_FORMAT blitSRVFormat,
>@@ -90,13 +93,13 @@ constexpr Format::Format(GLenum internalFormat,
>       formatID(formatID),
>       texFormat(texFormat),
>       srvFormat(srvFormat),
>+      uavFormat(uavFormat),
>       rtvFormat(rtvFormat),
>       dsvFormat(dsvFormat),
>       blitSRVFormat(blitSRVFormat),
>       swizzleFormat(swizzleFormat),
>       dataInitializerFunction(internalFormatInitializer)
>-{
>-}
>+{}
> 
> }  // namespace d3d11
> 
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/texture_format_table_autogen.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/texture_format_table_autogen.cpp
>index 3c1c2bcd505..0c94b4ea0a1 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/texture_format_table_autogen.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/texture_format_table_autogen.cpp
>@@ -1,7 +1,7 @@
> // GENERATED FILE - DO NOT EDIT.
> // Generated by gen_texture_format_table.py using data from texture_format_data.json
> //
>-// Copyright 2017 The ANGLE Project Authors. All rights reserved.
>+// Copyright 2019 The ANGLE Project Authors. All rights reserved.
> // Use of this source code is governed by a BSD-style license that can be
> // found in the LICENSE file.
> //
>@@ -36,7 +36,8 @@ const Format &Format::Get(GLenum internalFormat, const Renderer11DeviceCaps &dev
>         case GL_ALPHA16F_EXT:
>         {
>             static constexpr Format info(GL_ALPHA16F_EXT,
>-                                         angle::Format::ID::R16G16B16A16_FLOAT,
>+                                         angle::FormatID::R16G16B16A16_FLOAT,
>+                                         DXGI_FORMAT_R16G16B16A16_FLOAT,
>                                          DXGI_FORMAT_R16G16B16A16_FLOAT,
>                                          DXGI_FORMAT_R16G16B16A16_FLOAT,
>                                          DXGI_FORMAT_R16G16B16A16_FLOAT,
>@@ -49,7 +50,8 @@ const Format &Format::Get(GLenum internalFormat, const Renderer11DeviceCaps &dev
>         case GL_ALPHA32F_EXT:
>         {
>             static constexpr Format info(GL_ALPHA32F_EXT,
>-                                         angle::Format::ID::R32G32B32A32_FLOAT,
>+                                         angle::FormatID::R32G32B32A32_FLOAT,
>+                                         DXGI_FORMAT_R32G32B32A32_FLOAT,
>                                          DXGI_FORMAT_R32G32B32A32_FLOAT,
>                                          DXGI_FORMAT_R32G32B32A32_FLOAT,
>                                          DXGI_FORMAT_R32G32B32A32_FLOAT,
>@@ -64,9 +66,10 @@ const Format &Format::Get(GLenum internalFormat, const Renderer11DeviceCaps &dev
>             if (OnlyFL10Plus(deviceCaps))
>             {
>                 static constexpr Format info(GL_ALPHA8_EXT,
>-                                             angle::Format::ID::A8_UNORM,
>+                                             angle::FormatID::A8_UNORM,
>                                              DXGI_FORMAT_A8_UNORM,
>                                              DXGI_FORMAT_A8_UNORM,
>+                                             DXGI_FORMAT_UNKNOWN,
>                                              DXGI_FORMAT_A8_UNORM,
>                                              DXGI_FORMAT_UNKNOWN,
>                                              DXGI_FORMAT_A8_UNORM,
>@@ -77,7 +80,8 @@ const Format &Format::Get(GLenum internalFormat, const Renderer11DeviceCaps &dev
>             else
>             {
>                 static constexpr Format info(GL_ALPHA8_EXT,
>-                                             angle::Format::ID::R8G8B8A8_UNORM,
>+                                             angle::FormatID::R8G8B8A8_UNORM,
>+                                             DXGI_FORMAT_R8G8B8A8_UNORM,
>                                              DXGI_FORMAT_R8G8B8A8_UNORM,
>                                              DXGI_FORMAT_R8G8B8A8_UNORM,
>                                              DXGI_FORMAT_R8G8B8A8_UNORM,
>@@ -93,9 +97,10 @@ const Format &Format::Get(GLenum internalFormat, const Renderer11DeviceCaps &dev
>             if (SupportsFormat(DXGI_FORMAT_B5G6R5_UNORM, deviceCaps))
>             {
>                 static constexpr Format info(GL_BGR565_ANGLEX,
>-                                             angle::Format::ID::B5G6R5_UNORM,
>+                                             angle::FormatID::B5G6R5_UNORM,
>                                              DXGI_FORMAT_B5G6R5_UNORM,
>                                              DXGI_FORMAT_B5G6R5_UNORM,
>+                                             DXGI_FORMAT_UNKNOWN,
>                                              DXGI_FORMAT_B5G6R5_UNORM,
>                                              DXGI_FORMAT_UNKNOWN,
>                                              DXGI_FORMAT_B5G6R5_UNORM,
>@@ -106,7 +111,8 @@ const Format &Format::Get(GLenum internalFormat, const Renderer11DeviceCaps &dev
>             else
>             {
>                 static constexpr Format info(GL_BGR565_ANGLEX,
>-                                             angle::Format::ID::R8G8B8A8_UNORM,
>+                                             angle::FormatID::R8G8B8A8_UNORM,
>+                                             DXGI_FORMAT_R8G8B8A8_UNORM,
>                                              DXGI_FORMAT_R8G8B8A8_UNORM,
>                                              DXGI_FORMAT_R8G8B8A8_UNORM,
>                                              DXGI_FORMAT_R8G8B8A8_UNORM,
>@@ -120,9 +126,10 @@ const Format &Format::Get(GLenum internalFormat, const Renderer11DeviceCaps &dev
>         case GL_BGR5_A1_ANGLEX:
>         {
>             static constexpr Format info(GL_BGR5_A1_ANGLEX,
>-                                         angle::Format::ID::B8G8R8A8_UNORM,
>+                                         angle::FormatID::B8G8R8A8_UNORM,
>                                          DXGI_FORMAT_B8G8R8A8_UNORM,
>                                          DXGI_FORMAT_B8G8R8A8_UNORM,
>+                                         DXGI_FORMAT_UNKNOWN,
>                                          DXGI_FORMAT_B8G8R8A8_UNORM,
>                                          DXGI_FORMAT_UNKNOWN,
>                                          DXGI_FORMAT_B8G8R8A8_UNORM,
>@@ -133,9 +140,10 @@ const Format &Format::Get(GLenum internalFormat, const Renderer11DeviceCaps &dev
>         case GL_BGRA4_ANGLEX:
>         {
>             static constexpr Format info(GL_BGRA4_ANGLEX,
>-                                         angle::Format::ID::B8G8R8A8_UNORM,
>+                                         angle::FormatID::B8G8R8A8_UNORM,
>                                          DXGI_FORMAT_B8G8R8A8_UNORM,
>                                          DXGI_FORMAT_B8G8R8A8_UNORM,
>+                                         DXGI_FORMAT_UNKNOWN,
>                                          DXGI_FORMAT_B8G8R8A8_UNORM,
>                                          DXGI_FORMAT_UNKNOWN,
>                                          DXGI_FORMAT_B8G8R8A8_UNORM,
>@@ -146,9 +154,10 @@ const Format &Format::Get(GLenum internalFormat, const Renderer11DeviceCaps &dev
>         case GL_BGRA8_EXT:
>         {
>             static constexpr Format info(GL_BGRA8_EXT,
>-                                         angle::Format::ID::B8G8R8A8_UNORM,
>+                                         angle::FormatID::B8G8R8A8_UNORM,
>                                          DXGI_FORMAT_B8G8R8A8_UNORM,
>                                          DXGI_FORMAT_B8G8R8A8_UNORM,
>+                                         DXGI_FORMAT_UNKNOWN,
>                                          DXGI_FORMAT_B8G8R8A8_UNORM,
>                                          DXGI_FORMAT_UNKNOWN,
>                                          DXGI_FORMAT_B8G8R8A8_UNORM,
>@@ -159,9 +168,10 @@ const Format &Format::Get(GLenum internalFormat, const Renderer11DeviceCaps &dev
>         case GL_BGRA8_SRGB_ANGLEX:
>         {
>             static constexpr Format info(GL_BGRA8_SRGB_ANGLEX,
>-                                         angle::Format::ID::B8G8R8A8_UNORM_SRGB,
>+                                         angle::FormatID::B8G8R8A8_UNORM_SRGB,
>                                          DXGI_FORMAT_B8G8R8A8_UNORM_SRGB,
>                                          DXGI_FORMAT_B8G8R8A8_UNORM_SRGB,
>+                                         DXGI_FORMAT_UNKNOWN,
>                                          DXGI_FORMAT_B8G8R8A8_UNORM_SRGB,
>                                          DXGI_FORMAT_UNKNOWN,
>                                          DXGI_FORMAT_B8G8R8A8_UNORM_SRGB,
>@@ -169,36 +179,70 @@ const Format &Format::Get(GLenum internalFormat, const Renderer11DeviceCaps &dev
>                                          nullptr);
>             return info;
>         }
>+        case GL_BGRX8_ANGLEX:
>+        {
>+            if (OnlyFL11_1Plus(deviceCaps))
>+            {
>+                static constexpr Format info(GL_BGRX8_ANGLEX,
>+                                             angle::FormatID::B8G8R8X8_UNORM,
>+                                             DXGI_FORMAT_B8G8R8X8_UNORM,
>+                                             DXGI_FORMAT_B8G8R8X8_UNORM,
>+                                             DXGI_FORMAT_UNKNOWN,
>+                                             DXGI_FORMAT_B8G8R8X8_UNORM,
>+                                             DXGI_FORMAT_UNKNOWN,
>+                                             DXGI_FORMAT_B8G8R8X8_UNORM,
>+                                             GL_BGRX8_ANGLEX,
>+                                             nullptr);
>+                return info;
>+            }
>+            else
>+            {
>+                static constexpr Format info(GL_BGRX8_ANGLEX,
>+                                             angle::FormatID::R8G8B8A8_UNORM,
>+                                             DXGI_FORMAT_R8G8B8A8_UNORM,
>+                                             DXGI_FORMAT_R8G8B8A8_UNORM,
>+                                             DXGI_FORMAT_R8G8B8A8_UNORM,
>+                                             DXGI_FORMAT_R8G8B8A8_UNORM,
>+                                             DXGI_FORMAT_UNKNOWN,
>+                                             DXGI_FORMAT_R8G8B8A8_UNORM,
>+                                             GL_RGBA8,
>+                                             nullptr);
>+                return info;
>+            }
>+        }
>         case GL_COMPRESSED_R11_EAC:
>         {
>             static constexpr Format info(GL_COMPRESSED_R11_EAC,
>-                                         angle::Format::ID::R8_UNORM,
>-                                         DXGI_FORMAT_R8_UNORM,
>-                                         DXGI_FORMAT_R8_UNORM,
>-                                         DXGI_FORMAT_R8_UNORM,
>+                                         angle::FormatID::R16_UNORM,
>+                                         DXGI_FORMAT_R16_UNORM,
>+                                         DXGI_FORMAT_R16_UNORM,
>                                          DXGI_FORMAT_UNKNOWN,
>-                                         DXGI_FORMAT_R8_UNORM,
>-                                         GL_RGBA8,
>+                                         DXGI_FORMAT_R16_UNORM,
>+                                         DXGI_FORMAT_UNKNOWN,
>+                                         DXGI_FORMAT_R16_UNORM,
>+                                         GL_RGBA16_EXT,
>                                          nullptr);
>             return info;
>         }
>         case GL_COMPRESSED_RG11_EAC:
>         {
>             static constexpr Format info(GL_COMPRESSED_RG11_EAC,
>-                                         angle::Format::ID::R8G8_UNORM,
>-                                         DXGI_FORMAT_R8G8_UNORM,
>-                                         DXGI_FORMAT_R8G8_UNORM,
>-                                         DXGI_FORMAT_R8G8_UNORM,
>+                                         angle::FormatID::R16G16_UNORM,
>+                                         DXGI_FORMAT_R16G16_UNORM,
>+                                         DXGI_FORMAT_R16G16_UNORM,
>                                          DXGI_FORMAT_UNKNOWN,
>-                                         DXGI_FORMAT_R8G8_UNORM,
>-                                         GL_RGBA8,
>+                                         DXGI_FORMAT_R16G16_UNORM,
>+                                         DXGI_FORMAT_UNKNOWN,
>+                                         DXGI_FORMAT_R16G16_UNORM,
>+                                         GL_RGBA16_EXT,
>                                          nullptr);
>             return info;
>         }
>         case GL_COMPRESSED_RGB8_ETC2:
>         {
>             static constexpr Format info(GL_COMPRESSED_RGB8_ETC2,
>-                                         angle::Format::ID::R8G8B8A8_UNORM,
>+                                         angle::FormatID::R8G8B8A8_UNORM,
>+                                         DXGI_FORMAT_R8G8B8A8_UNORM,
>                                          DXGI_FORMAT_R8G8B8A8_UNORM,
>                                          DXGI_FORMAT_R8G8B8A8_UNORM,
>                                          DXGI_FORMAT_R8G8B8A8_UNORM,
>@@ -211,11 +255,12 @@ const Format &Format::Get(GLenum internalFormat, const Renderer11DeviceCaps &dev
>         case GL_COMPRESSED_RGB8_LOSSY_DECODE_ETC2_ANGLE:
>         {
>             static constexpr Format info(GL_COMPRESSED_RGB8_LOSSY_DECODE_ETC2_ANGLE,
>-                                         angle::Format::ID::BC1_RGB_UNORM_BLOCK,
>+                                         angle::FormatID::BC1_RGB_UNORM_BLOCK,
>                                          DXGI_FORMAT_BC1_UNORM,
>                                          DXGI_FORMAT_BC1_UNORM,
>                                          DXGI_FORMAT_UNKNOWN,
>                                          DXGI_FORMAT_UNKNOWN,
>+                                         DXGI_FORMAT_UNKNOWN,
>                                          DXGI_FORMAT_BC1_UNORM,
>                                          GL_RGBA8,
>                                          nullptr);
>@@ -224,7 +269,8 @@ const Format &Format::Get(GLenum internalFormat, const Renderer11DeviceCaps &dev
>         case GL_COMPRESSED_RGB8_PUNCHTHROUGH_ALPHA1_ETC2:
>         {
>             static constexpr Format info(GL_COMPRESSED_RGB8_PUNCHTHROUGH_ALPHA1_ETC2,
>-                                         angle::Format::ID::R8G8B8A8_UNORM,
>+                                         angle::FormatID::R8G8B8A8_UNORM,
>+                                         DXGI_FORMAT_R8G8B8A8_UNORM,
>                                          DXGI_FORMAT_R8G8B8A8_UNORM,
>                                          DXGI_FORMAT_R8G8B8A8_UNORM,
>                                          DXGI_FORMAT_R8G8B8A8_UNORM,
>@@ -237,11 +283,12 @@ const Format &Format::Get(GLenum internalFormat, const Renderer11DeviceCaps &dev
>         case GL_COMPRESSED_RGB8_PUNCHTHROUGH_ALPHA1_LOSSY_DECODE_ETC2_ANGLE:
>         {
>             static constexpr Format info(GL_COMPRESSED_RGB8_PUNCHTHROUGH_ALPHA1_LOSSY_DECODE_ETC2_ANGLE,
>-                                         angle::Format::ID::BC1_RGBA_UNORM_BLOCK,
>+                                         angle::FormatID::BC1_RGBA_UNORM_BLOCK,
>                                          DXGI_FORMAT_BC1_UNORM,
>                                          DXGI_FORMAT_BC1_UNORM,
>                                          DXGI_FORMAT_UNKNOWN,
>                                          DXGI_FORMAT_UNKNOWN,
>+                                         DXGI_FORMAT_UNKNOWN,
>                                          DXGI_FORMAT_BC1_UNORM,
>                                          GL_RGBA8,
>                                          nullptr);
>@@ -250,7 +297,8 @@ const Format &Format::Get(GLenum internalFormat, const Renderer11DeviceCaps &dev
>         case GL_COMPRESSED_RGBA8_ETC2_EAC:
>         {
>             static constexpr Format info(GL_COMPRESSED_RGBA8_ETC2_EAC,
>-                                         angle::Format::ID::R8G8B8A8_UNORM,
>+                                         angle::FormatID::R8G8B8A8_UNORM,
>+                                         DXGI_FORMAT_R8G8B8A8_UNORM,
>                                          DXGI_FORMAT_R8G8B8A8_UNORM,
>                                          DXGI_FORMAT_R8G8B8A8_UNORM,
>                                          DXGI_FORMAT_R8G8B8A8_UNORM,
>@@ -263,7 +311,8 @@ const Format &Format::Get(GLenum internalFormat, const Renderer11DeviceCaps &dev
>         case GL_COMPRESSED_RGBA_ASTC_10x10_KHR:
>         {
>             static constexpr Format info(GL_COMPRESSED_RGBA_ASTC_10x10_KHR,
>-                                         angle::Format::ID::NONE,
>+                                         angle::FormatID::NONE,
>+                                         DXGI_FORMAT_UNKNOWN,
>                                          DXGI_FORMAT_UNKNOWN,
>                                          DXGI_FORMAT_UNKNOWN,
>                                          DXGI_FORMAT_UNKNOWN,
>@@ -276,7 +325,8 @@ const Format &Format::Get(GLenum internalFormat, const Renderer11DeviceCaps &dev
>         case GL_COMPRESSED_RGBA_ASTC_10x5_KHR:
>         {
>             static constexpr Format info(GL_COMPRESSED_RGBA_ASTC_10x5_KHR,
>-                                         angle::Format::ID::NONE,
>+                                         angle::FormatID::NONE,
>+                                         DXGI_FORMAT_UNKNOWN,
>                                          DXGI_FORMAT_UNKNOWN,
>                                          DXGI_FORMAT_UNKNOWN,
>                                          DXGI_FORMAT_UNKNOWN,
>@@ -289,7 +339,8 @@ const Format &Format::Get(GLenum internalFormat, const Renderer11DeviceCaps &dev
>         case GL_COMPRESSED_RGBA_ASTC_10x6_KHR:
>         {
>             static constexpr Format info(GL_COMPRESSED_RGBA_ASTC_10x6_KHR,
>-                                         angle::Format::ID::NONE,
>+                                         angle::FormatID::NONE,
>+                                         DXGI_FORMAT_UNKNOWN,
>                                          DXGI_FORMAT_UNKNOWN,
>                                          DXGI_FORMAT_UNKNOWN,
>                                          DXGI_FORMAT_UNKNOWN,
>@@ -302,7 +353,8 @@ const Format &Format::Get(GLenum internalFormat, const Renderer11DeviceCaps &dev
>         case GL_COMPRESSED_RGBA_ASTC_10x8_KHR:
>         {
>             static constexpr Format info(GL_COMPRESSED_RGBA_ASTC_10x8_KHR,
>-                                         angle::Format::ID::NONE,
>+                                         angle::FormatID::NONE,
>+                                         DXGI_FORMAT_UNKNOWN,
>                                          DXGI_FORMAT_UNKNOWN,
>                                          DXGI_FORMAT_UNKNOWN,
>                                          DXGI_FORMAT_UNKNOWN,
>@@ -315,7 +367,8 @@ const Format &Format::Get(GLenum internalFormat, const Renderer11DeviceCaps &dev
>         case GL_COMPRESSED_RGBA_ASTC_12x10_KHR:
>         {
>             static constexpr Format info(GL_COMPRESSED_RGBA_ASTC_12x10_KHR,
>-                                         angle::Format::ID::NONE,
>+                                         angle::FormatID::NONE,
>+                                         DXGI_FORMAT_UNKNOWN,
>                                          DXGI_FORMAT_UNKNOWN,
>                                          DXGI_FORMAT_UNKNOWN,
>                                          DXGI_FORMAT_UNKNOWN,
>@@ -328,7 +381,8 @@ const Format &Format::Get(GLenum internalFormat, const Renderer11DeviceCaps &dev
>         case GL_COMPRESSED_RGBA_ASTC_12x12_KHR:
>         {
>             static constexpr Format info(GL_COMPRESSED_RGBA_ASTC_12x12_KHR,
>-                                         angle::Format::ID::NONE,
>+                                         angle::FormatID::NONE,
>+                                         DXGI_FORMAT_UNKNOWN,
>                                          DXGI_FORMAT_UNKNOWN,
>                                          DXGI_FORMAT_UNKNOWN,
>                                          DXGI_FORMAT_UNKNOWN,
>@@ -341,7 +395,8 @@ const Format &Format::Get(GLenum internalFormat, const Renderer11DeviceCaps &dev
>         case GL_COMPRESSED_RGBA_ASTC_4x4_KHR:
>         {
>             static constexpr Format info(GL_COMPRESSED_RGBA_ASTC_4x4_KHR,
>-                                         angle::Format::ID::NONE,
>+                                         angle::FormatID::NONE,
>+                                         DXGI_FORMAT_UNKNOWN,
>                                          DXGI_FORMAT_UNKNOWN,
>                                          DXGI_FORMAT_UNKNOWN,
>                                          DXGI_FORMAT_UNKNOWN,
>@@ -354,7 +409,8 @@ const Format &Format::Get(GLenum internalFormat, const Renderer11DeviceCaps &dev
>         case GL_COMPRESSED_RGBA_ASTC_5x4_KHR:
>         {
>             static constexpr Format info(GL_COMPRESSED_RGBA_ASTC_5x4_KHR,
>-                                         angle::Format::ID::NONE,
>+                                         angle::FormatID::NONE,
>+                                         DXGI_FORMAT_UNKNOWN,
>                                          DXGI_FORMAT_UNKNOWN,
>                                          DXGI_FORMAT_UNKNOWN,
>                                          DXGI_FORMAT_UNKNOWN,
>@@ -367,7 +423,8 @@ const Format &Format::Get(GLenum internalFormat, const Renderer11DeviceCaps &dev
>         case GL_COMPRESSED_RGBA_ASTC_5x5_KHR:
>         {
>             static constexpr Format info(GL_COMPRESSED_RGBA_ASTC_5x5_KHR,
>-                                         angle::Format::ID::NONE,
>+                                         angle::FormatID::NONE,
>+                                         DXGI_FORMAT_UNKNOWN,
>                                          DXGI_FORMAT_UNKNOWN,
>                                          DXGI_FORMAT_UNKNOWN,
>                                          DXGI_FORMAT_UNKNOWN,
>@@ -380,7 +437,8 @@ const Format &Format::Get(GLenum internalFormat, const Renderer11DeviceCaps &dev
>         case GL_COMPRESSED_RGBA_ASTC_6x5_KHR:
>         {
>             static constexpr Format info(GL_COMPRESSED_RGBA_ASTC_6x5_KHR,
>-                                         angle::Format::ID::NONE,
>+                                         angle::FormatID::NONE,
>+                                         DXGI_FORMAT_UNKNOWN,
>                                          DXGI_FORMAT_UNKNOWN,
>                                          DXGI_FORMAT_UNKNOWN,
>                                          DXGI_FORMAT_UNKNOWN,
>@@ -393,7 +451,8 @@ const Format &Format::Get(GLenum internalFormat, const Renderer11DeviceCaps &dev
>         case GL_COMPRESSED_RGBA_ASTC_6x6_KHR:
>         {
>             static constexpr Format info(GL_COMPRESSED_RGBA_ASTC_6x6_KHR,
>-                                         angle::Format::ID::NONE,
>+                                         angle::FormatID::NONE,
>+                                         DXGI_FORMAT_UNKNOWN,
>                                          DXGI_FORMAT_UNKNOWN,
>                                          DXGI_FORMAT_UNKNOWN,
>                                          DXGI_FORMAT_UNKNOWN,
>@@ -406,7 +465,8 @@ const Format &Format::Get(GLenum internalFormat, const Renderer11DeviceCaps &dev
>         case GL_COMPRESSED_RGBA_ASTC_8x5_KHR:
>         {
>             static constexpr Format info(GL_COMPRESSED_RGBA_ASTC_8x5_KHR,
>-                                         angle::Format::ID::NONE,
>+                                         angle::FormatID::NONE,
>+                                         DXGI_FORMAT_UNKNOWN,
>                                          DXGI_FORMAT_UNKNOWN,
>                                          DXGI_FORMAT_UNKNOWN,
>                                          DXGI_FORMAT_UNKNOWN,
>@@ -419,7 +479,8 @@ const Format &Format::Get(GLenum internalFormat, const Renderer11DeviceCaps &dev
>         case GL_COMPRESSED_RGBA_ASTC_8x6_KHR:
>         {
>             static constexpr Format info(GL_COMPRESSED_RGBA_ASTC_8x6_KHR,
>-                                         angle::Format::ID::NONE,
>+                                         angle::FormatID::NONE,
>+                                         DXGI_FORMAT_UNKNOWN,
>                                          DXGI_FORMAT_UNKNOWN,
>                                          DXGI_FORMAT_UNKNOWN,
>                                          DXGI_FORMAT_UNKNOWN,
>@@ -432,7 +493,8 @@ const Format &Format::Get(GLenum internalFormat, const Renderer11DeviceCaps &dev
>         case GL_COMPRESSED_RGBA_ASTC_8x8_KHR:
>         {
>             static constexpr Format info(GL_COMPRESSED_RGBA_ASTC_8x8_KHR,
>-                                         angle::Format::ID::NONE,
>+                                         angle::FormatID::NONE,
>+                                         DXGI_FORMAT_UNKNOWN,
>                                          DXGI_FORMAT_UNKNOWN,
>                                          DXGI_FORMAT_UNKNOWN,
>                                          DXGI_FORMAT_UNKNOWN,
>@@ -442,14 +504,29 @@ const Format &Format::Get(GLenum internalFormat, const Renderer11DeviceCaps &dev
>                                          nullptr);
>             return info;
>         }
>+        case GL_COMPRESSED_RGBA_BPTC_UNORM_EXT:
>+        {
>+            static constexpr Format info(GL_COMPRESSED_RGBA_BPTC_UNORM_EXT,
>+                                         angle::FormatID::BPTC_RGBA_UNORM_BLOCK,
>+                                         DXGI_FORMAT_BC7_UNORM,
>+                                         DXGI_FORMAT_BC7_UNORM,
>+                                         DXGI_FORMAT_UNKNOWN,
>+                                         DXGI_FORMAT_UNKNOWN,
>+                                         DXGI_FORMAT_UNKNOWN,
>+                                         DXGI_FORMAT_BC7_UNORM,
>+                                         GL_RGBA8,
>+                                         nullptr);
>+            return info;
>+        }
>         case GL_COMPRESSED_RGBA_S3TC_DXT1_EXT:
>         {
>             static constexpr Format info(GL_COMPRESSED_RGBA_S3TC_DXT1_EXT,
>-                                         angle::Format::ID::BC1_RGBA_UNORM_BLOCK,
>+                                         angle::FormatID::BC1_RGBA_UNORM_BLOCK,
>                                          DXGI_FORMAT_BC1_UNORM,
>                                          DXGI_FORMAT_BC1_UNORM,
>                                          DXGI_FORMAT_UNKNOWN,
>                                          DXGI_FORMAT_UNKNOWN,
>+                                         DXGI_FORMAT_UNKNOWN,
>                                          DXGI_FORMAT_BC1_UNORM,
>                                          GL_RGBA8,
>                                          nullptr);
>@@ -458,11 +535,12 @@ const Format &Format::Get(GLenum internalFormat, const Renderer11DeviceCaps &dev
>         case GL_COMPRESSED_RGBA_S3TC_DXT3_ANGLE:
>         {
>             static constexpr Format info(GL_COMPRESSED_RGBA_S3TC_DXT3_ANGLE,
>-                                         angle::Format::ID::BC2_RGBA_UNORM_BLOCK,
>+                                         angle::FormatID::BC2_RGBA_UNORM_BLOCK,
>                                          DXGI_FORMAT_BC2_UNORM,
>                                          DXGI_FORMAT_BC2_UNORM,
>                                          DXGI_FORMAT_UNKNOWN,
>                                          DXGI_FORMAT_UNKNOWN,
>+                                         DXGI_FORMAT_UNKNOWN,
>                                          DXGI_FORMAT_BC2_UNORM,
>                                          GL_RGBA8,
>                                          nullptr);
>@@ -471,24 +549,54 @@ const Format &Format::Get(GLenum internalFormat, const Renderer11DeviceCaps &dev
>         case GL_COMPRESSED_RGBA_S3TC_DXT5_ANGLE:
>         {
>             static constexpr Format info(GL_COMPRESSED_RGBA_S3TC_DXT5_ANGLE,
>-                                         angle::Format::ID::BC3_RGBA_UNORM_BLOCK,
>+                                         angle::FormatID::BC3_RGBA_UNORM_BLOCK,
>                                          DXGI_FORMAT_BC3_UNORM,
>                                          DXGI_FORMAT_BC3_UNORM,
>                                          DXGI_FORMAT_UNKNOWN,
>                                          DXGI_FORMAT_UNKNOWN,
>+                                         DXGI_FORMAT_UNKNOWN,
>                                          DXGI_FORMAT_BC3_UNORM,
>                                          GL_RGBA8,
>                                          nullptr);
>             return info;
>         }
>+        case GL_COMPRESSED_RGB_BPTC_SIGNED_FLOAT_EXT:
>+        {
>+            static constexpr Format info(GL_COMPRESSED_RGB_BPTC_SIGNED_FLOAT_EXT,
>+                                         angle::FormatID::BPTC_RGB_SIGNED_FLOAT_BLOCK,
>+                                         DXGI_FORMAT_BC6H_SF16,
>+                                         DXGI_FORMAT_BC6H_SF16,
>+                                         DXGI_FORMAT_UNKNOWN,
>+                                         DXGI_FORMAT_UNKNOWN,
>+                                         DXGI_FORMAT_UNKNOWN,
>+                                         DXGI_FORMAT_BC6H_SF16,
>+                                         GL_RGBA32F,
>+                                         nullptr);
>+            return info;
>+        }
>+        case GL_COMPRESSED_RGB_BPTC_UNSIGNED_FLOAT_EXT:
>+        {
>+            static constexpr Format info(GL_COMPRESSED_RGB_BPTC_UNSIGNED_FLOAT_EXT,
>+                                         angle::FormatID::BPTC_RGB_UNSIGNED_FLOAT_BLOCK,
>+                                         DXGI_FORMAT_BC6H_UF16,
>+                                         DXGI_FORMAT_BC6H_UF16,
>+                                         DXGI_FORMAT_UNKNOWN,
>+                                         DXGI_FORMAT_UNKNOWN,
>+                                         DXGI_FORMAT_UNKNOWN,
>+                                         DXGI_FORMAT_BC6H_UF16,
>+                                         GL_RGBA32F,
>+                                         nullptr);
>+            return info;
>+        }
>         case GL_COMPRESSED_RGB_S3TC_DXT1_EXT:
>         {
>             static constexpr Format info(GL_COMPRESSED_RGB_S3TC_DXT1_EXT,
>-                                         angle::Format::ID::BC1_RGB_UNORM_BLOCK,
>+                                         angle::FormatID::BC1_RGB_UNORM_BLOCK,
>                                          DXGI_FORMAT_BC1_UNORM,
>                                          DXGI_FORMAT_BC1_UNORM,
>                                          DXGI_FORMAT_UNKNOWN,
>                                          DXGI_FORMAT_UNKNOWN,
>+                                         DXGI_FORMAT_UNKNOWN,
>                                          DXGI_FORMAT_BC1_UNORM,
>                                          GL_RGBA8,
>                                          nullptr);
>@@ -497,33 +605,36 @@ const Format &Format::Get(GLenum internalFormat, const Renderer11DeviceCaps &dev
>         case GL_COMPRESSED_SIGNED_R11_EAC:
>         {
>             static constexpr Format info(GL_COMPRESSED_SIGNED_R11_EAC,
>-                                         angle::Format::ID::R8_SNORM,
>-                                         DXGI_FORMAT_R8_SNORM,
>-                                         DXGI_FORMAT_R8_SNORM,
>+                                         angle::FormatID::R16_SNORM,
>+                                         DXGI_FORMAT_R16_SNORM,
>+                                         DXGI_FORMAT_R16_SNORM,
>                                          DXGI_FORMAT_UNKNOWN,
>                                          DXGI_FORMAT_UNKNOWN,
>-                                         DXGI_FORMAT_R8_SNORM,
>-                                         GL_RGBA8_SNORM,
>+                                         DXGI_FORMAT_UNKNOWN,
>+                                         DXGI_FORMAT_R16_SNORM,
>+                                         GL_RGBA16_SNORM_EXT,
>                                          nullptr);
>             return info;
>         }
>         case GL_COMPRESSED_SIGNED_RG11_EAC:
>         {
>             static constexpr Format info(GL_COMPRESSED_SIGNED_RG11_EAC,
>-                                         angle::Format::ID::R8G8_SNORM,
>-                                         DXGI_FORMAT_R8G8_SNORM,
>-                                         DXGI_FORMAT_R8G8_SNORM,
>+                                         angle::FormatID::R16G16_SNORM,
>+                                         DXGI_FORMAT_R16G16_SNORM,
>+                                         DXGI_FORMAT_R16G16_SNORM,
>                                          DXGI_FORMAT_UNKNOWN,
>                                          DXGI_FORMAT_UNKNOWN,
>-                                         DXGI_FORMAT_R8G8_SNORM,
>-                                         GL_RGBA8_SNORM,
>+                                         DXGI_FORMAT_UNKNOWN,
>+                                         DXGI_FORMAT_R16G16_SNORM,
>+                                         GL_RGBA16_SNORM_EXT,
>                                          nullptr);
>             return info;
>         }
>         case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x10_KHR:
>         {
>             static constexpr Format info(GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x10_KHR,
>-                                         angle::Format::ID::NONE,
>+                                         angle::FormatID::NONE,
>+                                         DXGI_FORMAT_UNKNOWN,
>                                          DXGI_FORMAT_UNKNOWN,
>                                          DXGI_FORMAT_UNKNOWN,
>                                          DXGI_FORMAT_UNKNOWN,
>@@ -536,7 +647,8 @@ const Format &Format::Get(GLenum internalFormat, const Renderer11DeviceCaps &dev
>         case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x5_KHR:
>         {
>             static constexpr Format info(GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x5_KHR,
>-                                         angle::Format::ID::NONE,
>+                                         angle::FormatID::NONE,
>+                                         DXGI_FORMAT_UNKNOWN,
>                                          DXGI_FORMAT_UNKNOWN,
>                                          DXGI_FORMAT_UNKNOWN,
>                                          DXGI_FORMAT_UNKNOWN,
>@@ -549,7 +661,8 @@ const Format &Format::Get(GLenum internalFormat, const Renderer11DeviceCaps &dev
>         case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x6_KHR:
>         {
>             static constexpr Format info(GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x6_KHR,
>-                                         angle::Format::ID::NONE,
>+                                         angle::FormatID::NONE,
>+                                         DXGI_FORMAT_UNKNOWN,
>                                          DXGI_FORMAT_UNKNOWN,
>                                          DXGI_FORMAT_UNKNOWN,
>                                          DXGI_FORMAT_UNKNOWN,
>@@ -562,7 +675,8 @@ const Format &Format::Get(GLenum internalFormat, const Renderer11DeviceCaps &dev
>         case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x8_KHR:
>         {
>             static constexpr Format info(GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x8_KHR,
>-                                         angle::Format::ID::NONE,
>+                                         angle::FormatID::NONE,
>+                                         DXGI_FORMAT_UNKNOWN,
>                                          DXGI_FORMAT_UNKNOWN,
>                                          DXGI_FORMAT_UNKNOWN,
>                                          DXGI_FORMAT_UNKNOWN,
>@@ -575,7 +689,8 @@ const Format &Format::Get(GLenum internalFormat, const Renderer11DeviceCaps &dev
>         case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_12x10_KHR:
>         {
>             static constexpr Format info(GL_COMPRESSED_SRGB8_ALPHA8_ASTC_12x10_KHR,
>-                                         angle::Format::ID::NONE,
>+                                         angle::FormatID::NONE,
>+                                         DXGI_FORMAT_UNKNOWN,
>                                          DXGI_FORMAT_UNKNOWN,
>                                          DXGI_FORMAT_UNKNOWN,
>                                          DXGI_FORMAT_UNKNOWN,
>@@ -588,7 +703,8 @@ const Format &Format::Get(GLenum internalFormat, const Renderer11DeviceCaps &dev
>         case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_12x12_KHR:
>         {
>             static constexpr Format info(GL_COMPRESSED_SRGB8_ALPHA8_ASTC_12x12_KHR,
>-                                         angle::Format::ID::NONE,
>+                                         angle::FormatID::NONE,
>+                                         DXGI_FORMAT_UNKNOWN,
>                                          DXGI_FORMAT_UNKNOWN,
>                                          DXGI_FORMAT_UNKNOWN,
>                                          DXGI_FORMAT_UNKNOWN,
>@@ -601,7 +717,8 @@ const Format &Format::Get(GLenum internalFormat, const Renderer11DeviceCaps &dev
>         case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_4x4_KHR:
>         {
>             static constexpr Format info(GL_COMPRESSED_SRGB8_ALPHA8_ASTC_4x4_KHR,
>-                                         angle::Format::ID::NONE,
>+                                         angle::FormatID::NONE,
>+                                         DXGI_FORMAT_UNKNOWN,
>                                          DXGI_FORMAT_UNKNOWN,
>                                          DXGI_FORMAT_UNKNOWN,
>                                          DXGI_FORMAT_UNKNOWN,
>@@ -614,7 +731,8 @@ const Format &Format::Get(GLenum internalFormat, const Renderer11DeviceCaps &dev
>         case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x4_KHR:
>         {
>             static constexpr Format info(GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x4_KHR,
>-                                         angle::Format::ID::NONE,
>+                                         angle::FormatID::NONE,
>+                                         DXGI_FORMAT_UNKNOWN,
>                                          DXGI_FORMAT_UNKNOWN,
>                                          DXGI_FORMAT_UNKNOWN,
>                                          DXGI_FORMAT_UNKNOWN,
>@@ -627,7 +745,8 @@ const Format &Format::Get(GLenum internalFormat, const Renderer11DeviceCaps &dev
>         case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x5_KHR:
>         {
>             static constexpr Format info(GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x5_KHR,
>-                                         angle::Format::ID::NONE,
>+                                         angle::FormatID::NONE,
>+                                         DXGI_FORMAT_UNKNOWN,
>                                          DXGI_FORMAT_UNKNOWN,
>                                          DXGI_FORMAT_UNKNOWN,
>                                          DXGI_FORMAT_UNKNOWN,
>@@ -640,7 +759,8 @@ const Format &Format::Get(GLenum internalFormat, const Renderer11DeviceCaps &dev
>         case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x5_KHR:
>         {
>             static constexpr Format info(GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x5_KHR,
>-                                         angle::Format::ID::NONE,
>+                                         angle::FormatID::NONE,
>+                                         DXGI_FORMAT_UNKNOWN,
>                                          DXGI_FORMAT_UNKNOWN,
>                                          DXGI_FORMAT_UNKNOWN,
>                                          DXGI_FORMAT_UNKNOWN,
>@@ -653,7 +773,8 @@ const Format &Format::Get(GLenum internalFormat, const Renderer11DeviceCaps &dev
>         case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x6_KHR:
>         {
>             static constexpr Format info(GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x6_KHR,
>-                                         angle::Format::ID::NONE,
>+                                         angle::FormatID::NONE,
>+                                         DXGI_FORMAT_UNKNOWN,
>                                          DXGI_FORMAT_UNKNOWN,
>                                          DXGI_FORMAT_UNKNOWN,
>                                          DXGI_FORMAT_UNKNOWN,
>@@ -666,7 +787,8 @@ const Format &Format::Get(GLenum internalFormat, const Renderer11DeviceCaps &dev
>         case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x5_KHR:
>         {
>             static constexpr Format info(GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x5_KHR,
>-                                         angle::Format::ID::NONE,
>+                                         angle::FormatID::NONE,
>+                                         DXGI_FORMAT_UNKNOWN,
>                                          DXGI_FORMAT_UNKNOWN,
>                                          DXGI_FORMAT_UNKNOWN,
>                                          DXGI_FORMAT_UNKNOWN,
>@@ -679,7 +801,8 @@ const Format &Format::Get(GLenum internalFormat, const Renderer11DeviceCaps &dev
>         case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x6_KHR:
>         {
>             static constexpr Format info(GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x6_KHR,
>-                                         angle::Format::ID::NONE,
>+                                         angle::FormatID::NONE,
>+                                         DXGI_FORMAT_UNKNOWN,
>                                          DXGI_FORMAT_UNKNOWN,
>                                          DXGI_FORMAT_UNKNOWN,
>                                          DXGI_FORMAT_UNKNOWN,
>@@ -692,7 +815,8 @@ const Format &Format::Get(GLenum internalFormat, const Renderer11DeviceCaps &dev
>         case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x8_KHR:
>         {
>             static constexpr Format info(GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x8_KHR,
>-                                         angle::Format::ID::NONE,
>+                                         angle::FormatID::NONE,
>+                                         DXGI_FORMAT_UNKNOWN,
>                                          DXGI_FORMAT_UNKNOWN,
>                                          DXGI_FORMAT_UNKNOWN,
>                                          DXGI_FORMAT_UNKNOWN,
>@@ -705,9 +829,10 @@ const Format &Format::Get(GLenum internalFormat, const Renderer11DeviceCaps &dev
>         case GL_COMPRESSED_SRGB8_ALPHA8_ETC2_EAC:
>         {
>             static constexpr Format info(GL_COMPRESSED_SRGB8_ALPHA8_ETC2_EAC,
>-                                         angle::Format::ID::R8G8B8A8_UNORM_SRGB,
>+                                         angle::FormatID::R8G8B8A8_UNORM_SRGB,
>                                          DXGI_FORMAT_R8G8B8A8_UNORM_SRGB,
>                                          DXGI_FORMAT_R8G8B8A8_UNORM_SRGB,
>+                                         DXGI_FORMAT_UNKNOWN,
>                                          DXGI_FORMAT_R8G8B8A8_UNORM_SRGB,
>                                          DXGI_FORMAT_UNKNOWN,
>                                          DXGI_FORMAT_R8G8B8A8_UNORM_SRGB,
>@@ -718,9 +843,10 @@ const Format &Format::Get(GLenum internalFormat, const Renderer11DeviceCaps &dev
>         case GL_COMPRESSED_SRGB8_ETC2:
>         {
>             static constexpr Format info(GL_COMPRESSED_SRGB8_ETC2,
>-                                         angle::Format::ID::R8G8B8A8_UNORM_SRGB,
>+                                         angle::FormatID::R8G8B8A8_UNORM_SRGB,
>                                          DXGI_FORMAT_R8G8B8A8_UNORM_SRGB,
>                                          DXGI_FORMAT_R8G8B8A8_UNORM_SRGB,
>+                                         DXGI_FORMAT_UNKNOWN,
>                                          DXGI_FORMAT_R8G8B8A8_UNORM_SRGB,
>                                          DXGI_FORMAT_UNKNOWN,
>                                          DXGI_FORMAT_R8G8B8A8_UNORM_SRGB,
>@@ -731,11 +857,12 @@ const Format &Format::Get(GLenum internalFormat, const Renderer11DeviceCaps &dev
>         case GL_COMPRESSED_SRGB8_LOSSY_DECODE_ETC2_ANGLE:
>         {
>             static constexpr Format info(GL_COMPRESSED_SRGB8_LOSSY_DECODE_ETC2_ANGLE,
>-                                         angle::Format::ID::BC1_RGB_UNORM_SRGB_BLOCK,
>+                                         angle::FormatID::BC1_RGB_UNORM_SRGB_BLOCK,
>                                          DXGI_FORMAT_BC1_UNORM_SRGB,
>                                          DXGI_FORMAT_BC1_UNORM_SRGB,
>                                          DXGI_FORMAT_UNKNOWN,
>                                          DXGI_FORMAT_UNKNOWN,
>+                                         DXGI_FORMAT_UNKNOWN,
>                                          DXGI_FORMAT_BC1_UNORM_SRGB,
>                                          GL_RGBA8,
>                                          nullptr);
>@@ -744,9 +871,10 @@ const Format &Format::Get(GLenum internalFormat, const Renderer11DeviceCaps &dev
>         case GL_COMPRESSED_SRGB8_PUNCHTHROUGH_ALPHA1_ETC2:
>         {
>             static constexpr Format info(GL_COMPRESSED_SRGB8_PUNCHTHROUGH_ALPHA1_ETC2,
>-                                         angle::Format::ID::R8G8B8A8_UNORM_SRGB,
>+                                         angle::FormatID::R8G8B8A8_UNORM_SRGB,
>                                          DXGI_FORMAT_R8G8B8A8_UNORM_SRGB,
>                                          DXGI_FORMAT_R8G8B8A8_UNORM_SRGB,
>+                                         DXGI_FORMAT_UNKNOWN,
>                                          DXGI_FORMAT_R8G8B8A8_UNORM_SRGB,
>                                          DXGI_FORMAT_UNKNOWN,
>                                          DXGI_FORMAT_R8G8B8A8_UNORM_SRGB,
>@@ -757,24 +885,40 @@ const Format &Format::Get(GLenum internalFormat, const Renderer11DeviceCaps &dev
>         case GL_COMPRESSED_SRGB8_PUNCHTHROUGH_ALPHA1_LOSSY_DECODE_ETC2_ANGLE:
>         {
>             static constexpr Format info(GL_COMPRESSED_SRGB8_PUNCHTHROUGH_ALPHA1_LOSSY_DECODE_ETC2_ANGLE,
>-                                         angle::Format::ID::BC1_RGBA_UNORM_SRGB_BLOCK,
>+                                         angle::FormatID::BC1_RGBA_UNORM_SRGB_BLOCK,
>                                          DXGI_FORMAT_BC1_UNORM_SRGB,
>                                          DXGI_FORMAT_BC1_UNORM_SRGB,
>                                          DXGI_FORMAT_UNKNOWN,
>                                          DXGI_FORMAT_UNKNOWN,
>+                                         DXGI_FORMAT_UNKNOWN,
>                                          DXGI_FORMAT_BC1_UNORM_SRGB,
>                                          GL_RGBA8,
>                                          nullptr);
>             return info;
>         }
>+        case GL_COMPRESSED_SRGB_ALPHA_BPTC_UNORM_EXT:
>+        {
>+            static constexpr Format info(GL_COMPRESSED_SRGB_ALPHA_BPTC_UNORM_EXT,
>+                                         angle::FormatID::BPTC_SRGB_ALPHA_UNORM_BLOCK,
>+                                         DXGI_FORMAT_BC7_UNORM_SRGB,
>+                                         DXGI_FORMAT_BC7_UNORM_SRGB,
>+                                         DXGI_FORMAT_UNKNOWN,
>+                                         DXGI_FORMAT_UNKNOWN,
>+                                         DXGI_FORMAT_UNKNOWN,
>+                                         DXGI_FORMAT_BC7_UNORM_SRGB,
>+                                         GL_SRGB8_ALPHA8,
>+                                         nullptr);
>+            return info;
>+        }
>         case GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT1_EXT:
>         {
>             static constexpr Format info(GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT1_EXT,
>-                                         angle::Format::ID::BC1_RGBA_UNORM_SRGB_BLOCK,
>+                                         angle::FormatID::BC1_RGBA_UNORM_SRGB_BLOCK,
>                                          DXGI_FORMAT_BC1_UNORM_SRGB,
>                                          DXGI_FORMAT_BC1_UNORM_SRGB,
>                                          DXGI_FORMAT_UNKNOWN,
>                                          DXGI_FORMAT_UNKNOWN,
>+                                         DXGI_FORMAT_UNKNOWN,
>                                          DXGI_FORMAT_BC1_UNORM_SRGB,
>                                          GL_RGBA8,
>                                          nullptr);
>@@ -783,11 +927,12 @@ const Format &Format::Get(GLenum internalFormat, const Renderer11DeviceCaps &dev
>         case GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT3_EXT:
>         {
>             static constexpr Format info(GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT3_EXT,
>-                                         angle::Format::ID::BC2_RGBA_UNORM_SRGB_BLOCK,
>+                                         angle::FormatID::BC2_RGBA_UNORM_SRGB_BLOCK,
>                                          DXGI_FORMAT_BC2_UNORM_SRGB,
>                                          DXGI_FORMAT_BC2_UNORM_SRGB,
>                                          DXGI_FORMAT_UNKNOWN,
>                                          DXGI_FORMAT_UNKNOWN,
>+                                         DXGI_FORMAT_UNKNOWN,
>                                          DXGI_FORMAT_BC2_UNORM_SRGB,
>                                          GL_RGBA8,
>                                          nullptr);
>@@ -796,11 +941,12 @@ const Format &Format::Get(GLenum internalFormat, const Renderer11DeviceCaps &dev
>         case GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT5_EXT:
>         {
>             static constexpr Format info(GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT5_EXT,
>-                                         angle::Format::ID::BC3_RGBA_UNORM_SRGB_BLOCK,
>+                                         angle::FormatID::BC3_RGBA_UNORM_SRGB_BLOCK,
>                                          DXGI_FORMAT_BC3_UNORM_SRGB,
>                                          DXGI_FORMAT_BC3_UNORM_SRGB,
>                                          DXGI_FORMAT_UNKNOWN,
>                                          DXGI_FORMAT_UNKNOWN,
>+                                         DXGI_FORMAT_UNKNOWN,
>                                          DXGI_FORMAT_BC3_UNORM_SRGB,
>                                          GL_RGBA8,
>                                          nullptr);
>@@ -809,11 +955,12 @@ const Format &Format::Get(GLenum internalFormat, const Renderer11DeviceCaps &dev
>         case GL_COMPRESSED_SRGB_S3TC_DXT1_EXT:
>         {
>             static constexpr Format info(GL_COMPRESSED_SRGB_S3TC_DXT1_EXT,
>-                                         angle::Format::ID::BC1_RGB_UNORM_SRGB_BLOCK,
>+                                         angle::FormatID::BC1_RGB_UNORM_SRGB_BLOCK,
>                                          DXGI_FORMAT_BC1_UNORM_SRGB,
>                                          DXGI_FORMAT_BC1_UNORM_SRGB,
>                                          DXGI_FORMAT_UNKNOWN,
>                                          DXGI_FORMAT_UNKNOWN,
>+                                         DXGI_FORMAT_UNKNOWN,
>                                          DXGI_FORMAT_BC1_UNORM_SRGB,
>                                          GL_RGBA8,
>                                          nullptr);
>@@ -824,10 +971,11 @@ const Format &Format::Get(GLenum internalFormat, const Renderer11DeviceCaps &dev
>             if (OnlyFL10Plus(deviceCaps))
>             {
>                 static constexpr Format info(GL_DEPTH24_STENCIL8,
>-                                             angle::Format::ID::D24_UNORM_S8_UINT,
>+                                             angle::FormatID::D24_UNORM_S8_UINT,
>                                              DXGI_FORMAT_R24G8_TYPELESS,
>                                              DXGI_FORMAT_R24_UNORM_X8_TYPELESS,
>                                              DXGI_FORMAT_UNKNOWN,
>+                                             DXGI_FORMAT_UNKNOWN,
>                                              DXGI_FORMAT_D24_UNORM_S8_UINT,
>                                              DXGI_FORMAT_R24_UNORM_X8_TYPELESS,
>                                              GL_RGBA32F,
>@@ -837,10 +985,11 @@ const Format &Format::Get(GLenum internalFormat, const Renderer11DeviceCaps &dev
>             else
>             {
>                 static constexpr Format info(GL_DEPTH24_STENCIL8,
>-                                             angle::Format::ID::D24_UNORM_S8_UINT,
>+                                             angle::FormatID::D24_UNORM_S8_UINT,
>                                              DXGI_FORMAT_D24_UNORM_S8_UINT,
>                                              DXGI_FORMAT_UNKNOWN,
>                                              DXGI_FORMAT_UNKNOWN,
>+                                             DXGI_FORMAT_UNKNOWN,
>                                              DXGI_FORMAT_D24_UNORM_S8_UINT,
>                                              DXGI_FORMAT_UNKNOWN,
>                                              GL_RGBA32F,
>@@ -851,10 +1000,11 @@ const Format &Format::Get(GLenum internalFormat, const Renderer11DeviceCaps &dev
>         case GL_DEPTH32F_STENCIL8:
>         {
>             static constexpr Format info(GL_DEPTH32F_STENCIL8,
>-                                         angle::Format::ID::D32_FLOAT_S8X24_UINT,
>+                                         angle::FormatID::D32_FLOAT_S8X24_UINT,
>                                          DXGI_FORMAT_R32G8X24_TYPELESS,
>                                          DXGI_FORMAT_R32_FLOAT_X8X24_TYPELESS,
>                                          DXGI_FORMAT_UNKNOWN,
>+                                         DXGI_FORMAT_UNKNOWN,
>                                          DXGI_FORMAT_D32_FLOAT_S8X24_UINT,
>                                          DXGI_FORMAT_R32_FLOAT_X8X24_TYPELESS,
>                                          GL_RGBA32F,
>@@ -866,10 +1016,11 @@ const Format &Format::Get(GLenum internalFormat, const Renderer11DeviceCaps &dev
>             if (OnlyFL10Plus(deviceCaps))
>             {
>                 static constexpr Format info(GL_DEPTH_COMPONENT16,
>-                                             angle::Format::ID::D16_UNORM,
>+                                             angle::FormatID::D16_UNORM,
>                                              DXGI_FORMAT_R16_TYPELESS,
>                                              DXGI_FORMAT_R16_UNORM,
>                                              DXGI_FORMAT_UNKNOWN,
>+                                             DXGI_FORMAT_UNKNOWN,
>                                              DXGI_FORMAT_D16_UNORM,
>                                              DXGI_FORMAT_R16_UNORM,
>                                              GL_RGBA16_EXT,
>@@ -879,10 +1030,11 @@ const Format &Format::Get(GLenum internalFormat, const Renderer11DeviceCaps &dev
>             else
>             {
>                 static constexpr Format info(GL_DEPTH_COMPONENT16,
>-                                             angle::Format::ID::D16_UNORM,
>+                                             angle::FormatID::D16_UNORM,
>                                              DXGI_FORMAT_D16_UNORM,
>                                              DXGI_FORMAT_UNKNOWN,
>                                              DXGI_FORMAT_UNKNOWN,
>+                                             DXGI_FORMAT_UNKNOWN,
>                                              DXGI_FORMAT_D16_UNORM,
>                                              DXGI_FORMAT_UNKNOWN,
>                                              GL_RGBA16_EXT,
>@@ -895,10 +1047,11 @@ const Format &Format::Get(GLenum internalFormat, const Renderer11DeviceCaps &dev
>             if (OnlyFL10Plus(deviceCaps))
>             {
>                 static constexpr Format info(GL_DEPTH_COMPONENT24,
>-                                             angle::Format::ID::D24_UNORM_S8_UINT,
>+                                             angle::FormatID::D24_UNORM_S8_UINT,
>                                              DXGI_FORMAT_R24G8_TYPELESS,
>                                              DXGI_FORMAT_R24_UNORM_X8_TYPELESS,
>                                              DXGI_FORMAT_UNKNOWN,
>+                                             DXGI_FORMAT_UNKNOWN,
>                                              DXGI_FORMAT_D24_UNORM_S8_UINT,
>                                              DXGI_FORMAT_R24_UNORM_X8_TYPELESS,
>                                              GL_RGBA32F,
>@@ -908,10 +1061,11 @@ const Format &Format::Get(GLenum internalFormat, const Renderer11DeviceCaps &dev
>             else
>             {
>                 static constexpr Format info(GL_DEPTH_COMPONENT24,
>-                                             angle::Format::ID::D24_UNORM_S8_UINT,
>+                                             angle::FormatID::D24_UNORM_S8_UINT,
>                                              DXGI_FORMAT_D24_UNORM_S8_UINT,
>                                              DXGI_FORMAT_UNKNOWN,
>                                              DXGI_FORMAT_UNKNOWN,
>+                                             DXGI_FORMAT_UNKNOWN,
>                                              DXGI_FORMAT_D24_UNORM_S8_UINT,
>                                              DXGI_FORMAT_UNKNOWN,
>                                              GL_RGBA32F,
>@@ -922,10 +1076,11 @@ const Format &Format::Get(GLenum internalFormat, const Renderer11DeviceCaps &dev
>         case GL_DEPTH_COMPONENT32F:
>         {
>             static constexpr Format info(GL_DEPTH_COMPONENT32F,
>-                                         angle::Format::ID::D32_FLOAT,
>+                                         angle::FormatID::D32_FLOAT,
>                                          DXGI_FORMAT_R32_TYPELESS,
>                                          DXGI_FORMAT_R32_FLOAT,
>                                          DXGI_FORMAT_UNKNOWN,
>+                                         DXGI_FORMAT_UNKNOWN,
>                                          DXGI_FORMAT_D32_FLOAT,
>                                          DXGI_FORMAT_R32_FLOAT,
>                                          GL_RGBA32F,
>@@ -937,10 +1092,11 @@ const Format &Format::Get(GLenum internalFormat, const Renderer11DeviceCaps &dev
>             if (OnlyFL10Plus(deviceCaps))
>             {
>                 static constexpr Format info(GL_DEPTH_COMPONENT32_OES,
>-                                             angle::Format::ID::D24_UNORM_S8_UINT,
>+                                             angle::FormatID::D24_UNORM_S8_UINT,
>                                              DXGI_FORMAT_R24G8_TYPELESS,
>                                              DXGI_FORMAT_R24_UNORM_X8_TYPELESS,
>                                              DXGI_FORMAT_UNKNOWN,
>+                                             DXGI_FORMAT_UNKNOWN,
>                                              DXGI_FORMAT_D24_UNORM_S8_UINT,
>                                              DXGI_FORMAT_R24_UNORM_X8_TYPELESS,
>                                              GL_RGBA32F,
>@@ -950,10 +1106,11 @@ const Format &Format::Get(GLenum internalFormat, const Renderer11DeviceCaps &dev
>             else
>             {
>                 static constexpr Format info(GL_DEPTH_COMPONENT32_OES,
>-                                             angle::Format::ID::D24_UNORM_S8_UINT,
>+                                             angle::FormatID::D24_UNORM_S8_UINT,
>                                              DXGI_FORMAT_D24_UNORM_S8_UINT,
>                                              DXGI_FORMAT_UNKNOWN,
>                                              DXGI_FORMAT_UNKNOWN,
>+                                             DXGI_FORMAT_UNKNOWN,
>                                              DXGI_FORMAT_D24_UNORM_S8_UINT,
>                                              DXGI_FORMAT_UNKNOWN,
>                                              GL_RGBA32F,
>@@ -964,11 +1121,12 @@ const Format &Format::Get(GLenum internalFormat, const Renderer11DeviceCaps &dev
>         case GL_ETC1_RGB8_LOSSY_DECODE_ANGLE:
>         {
>             static constexpr Format info(GL_ETC1_RGB8_LOSSY_DECODE_ANGLE,
>-                                         angle::Format::ID::BC1_RGB_UNORM_BLOCK,
>+                                         angle::FormatID::BC1_RGB_UNORM_BLOCK,
>                                          DXGI_FORMAT_BC1_UNORM,
>                                          DXGI_FORMAT_BC1_UNORM,
>                                          DXGI_FORMAT_UNKNOWN,
>                                          DXGI_FORMAT_UNKNOWN,
>+                                         DXGI_FORMAT_UNKNOWN,
>                                          DXGI_FORMAT_BC1_UNORM,
>                                          GL_RGBA8,
>                                          nullptr);
>@@ -977,7 +1135,8 @@ const Format &Format::Get(GLenum internalFormat, const Renderer11DeviceCaps &dev
>         case GL_ETC1_RGB8_OES:
>         {
>             static constexpr Format info(GL_ETC1_RGB8_OES,
>-                                         angle::Format::ID::R8G8B8A8_UNORM,
>+                                         angle::FormatID::R8G8B8A8_UNORM,
>+                                         DXGI_FORMAT_R8G8B8A8_UNORM,
>                                          DXGI_FORMAT_R8G8B8A8_UNORM,
>                                          DXGI_FORMAT_R8G8B8A8_UNORM,
>                                          DXGI_FORMAT_R8G8B8A8_UNORM,
>@@ -990,7 +1149,8 @@ const Format &Format::Get(GLenum internalFormat, const Renderer11DeviceCaps &dev
>         case GL_LUMINANCE16F_EXT:
>         {
>             static constexpr Format info(GL_LUMINANCE16F_EXT,
>-                                         angle::Format::ID::R16G16B16A16_FLOAT,
>+                                         angle::FormatID::R16G16B16A16_FLOAT,
>+                                         DXGI_FORMAT_R16G16B16A16_FLOAT,
>                                          DXGI_FORMAT_R16G16B16A16_FLOAT,
>                                          DXGI_FORMAT_R16G16B16A16_FLOAT,
>                                          DXGI_FORMAT_R16G16B16A16_FLOAT,
>@@ -1003,7 +1163,8 @@ const Format &Format::Get(GLenum internalFormat, const Renderer11DeviceCaps &dev
>         case GL_LUMINANCE32F_EXT:
>         {
>             static constexpr Format info(GL_LUMINANCE32F_EXT,
>-                                         angle::Format::ID::R32G32B32A32_FLOAT,
>+                                         angle::FormatID::R32G32B32A32_FLOAT,
>+                                         DXGI_FORMAT_R32G32B32A32_FLOAT,
>                                          DXGI_FORMAT_R32G32B32A32_FLOAT,
>                                          DXGI_FORMAT_R32G32B32A32_FLOAT,
>                                          DXGI_FORMAT_R32G32B32A32_FLOAT,
>@@ -1016,7 +1177,8 @@ const Format &Format::Get(GLenum internalFormat, const Renderer11DeviceCaps &dev
>         case GL_LUMINANCE8_ALPHA8_EXT:
>         {
>             static constexpr Format info(GL_LUMINANCE8_ALPHA8_EXT,
>-                                         angle::Format::ID::R8G8B8A8_UNORM,
>+                                         angle::FormatID::R8G8B8A8_UNORM,
>+                                         DXGI_FORMAT_R8G8B8A8_UNORM,
>                                          DXGI_FORMAT_R8G8B8A8_UNORM,
>                                          DXGI_FORMAT_R8G8B8A8_UNORM,
>                                          DXGI_FORMAT_R8G8B8A8_UNORM,
>@@ -1029,7 +1191,8 @@ const Format &Format::Get(GLenum internalFormat, const Renderer11DeviceCaps &dev
>         case GL_LUMINANCE8_EXT:
>         {
>             static constexpr Format info(GL_LUMINANCE8_EXT,
>-                                         angle::Format::ID::R8G8B8A8_UNORM,
>+                                         angle::FormatID::R8G8B8A8_UNORM,
>+                                         DXGI_FORMAT_R8G8B8A8_UNORM,
>                                          DXGI_FORMAT_R8G8B8A8_UNORM,
>                                          DXGI_FORMAT_R8G8B8A8_UNORM,
>                                          DXGI_FORMAT_R8G8B8A8_UNORM,
>@@ -1042,7 +1205,8 @@ const Format &Format::Get(GLenum internalFormat, const Renderer11DeviceCaps &dev
>         case GL_LUMINANCE_ALPHA16F_EXT:
>         {
>             static constexpr Format info(GL_LUMINANCE_ALPHA16F_EXT,
>-                                         angle::Format::ID::R16G16B16A16_FLOAT,
>+                                         angle::FormatID::R16G16B16A16_FLOAT,
>+                                         DXGI_FORMAT_R16G16B16A16_FLOAT,
>                                          DXGI_FORMAT_R16G16B16A16_FLOAT,
>                                          DXGI_FORMAT_R16G16B16A16_FLOAT,
>                                          DXGI_FORMAT_R16G16B16A16_FLOAT,
>@@ -1055,7 +1219,8 @@ const Format &Format::Get(GLenum internalFormat, const Renderer11DeviceCaps &dev
>         case GL_LUMINANCE_ALPHA32F_EXT:
>         {
>             static constexpr Format info(GL_LUMINANCE_ALPHA32F_EXT,
>-                                         angle::Format::ID::R32G32B32A32_FLOAT,
>+                                         angle::FormatID::R32G32B32A32_FLOAT,
>+                                         DXGI_FORMAT_R32G32B32A32_FLOAT,
>                                          DXGI_FORMAT_R32G32B32A32_FLOAT,
>                                          DXGI_FORMAT_R32G32B32A32_FLOAT,
>                                          DXGI_FORMAT_R32G32B32A32_FLOAT,
>@@ -1068,7 +1233,8 @@ const Format &Format::Get(GLenum internalFormat, const Renderer11DeviceCaps &dev
>         case GL_NONE:
>         {
>             static constexpr Format info(GL_NONE,
>-                                         angle::Format::ID::NONE,
>+                                         angle::FormatID::NONE,
>+                                         DXGI_FORMAT_UNKNOWN,
>                                          DXGI_FORMAT_UNKNOWN,
>                                          DXGI_FORMAT_UNKNOWN,
>                                          DXGI_FORMAT_UNKNOWN,
>@@ -1081,9 +1247,10 @@ const Format &Format::Get(GLenum internalFormat, const Renderer11DeviceCaps &dev
>         case GL_R11F_G11F_B10F:
>         {
>             static constexpr Format info(GL_R11F_G11F_B10F,
>-                                         angle::Format::ID::R11G11B10_FLOAT,
>+                                         angle::FormatID::R11G11B10_FLOAT,
>                                          DXGI_FORMAT_R11G11B10_FLOAT,
>                                          DXGI_FORMAT_R11G11B10_FLOAT,
>+                                         DXGI_FORMAT_UNKNOWN,
>                                          DXGI_FORMAT_R11G11B10_FLOAT,
>                                          DXGI_FORMAT_UNKNOWN,
>                                          DXGI_FORMAT_R11G11B10_FLOAT,
>@@ -1094,9 +1261,10 @@ const Format &Format::Get(GLenum internalFormat, const Renderer11DeviceCaps &dev
>         case GL_R16F:
>         {
>             static constexpr Format info(GL_R16F,
>-                                         angle::Format::ID::R16_FLOAT,
>+                                         angle::FormatID::R16_FLOAT,
>                                          DXGI_FORMAT_R16_FLOAT,
>                                          DXGI_FORMAT_R16_FLOAT,
>+                                         DXGI_FORMAT_UNKNOWN,
>                                          DXGI_FORMAT_R16_FLOAT,
>                                          DXGI_FORMAT_UNKNOWN,
>                                          DXGI_FORMAT_R16_FLOAT,
>@@ -1107,9 +1275,10 @@ const Format &Format::Get(GLenum internalFormat, const Renderer11DeviceCaps &dev
>         case GL_R16I:
>         {
>             static constexpr Format info(GL_R16I,
>-                                         angle::Format::ID::R16_SINT,
>+                                         angle::FormatID::R16_SINT,
>                                          DXGI_FORMAT_R16_SINT,
>                                          DXGI_FORMAT_R16_SINT,
>+                                         DXGI_FORMAT_UNKNOWN,
>                                          DXGI_FORMAT_R16_SINT,
>                                          DXGI_FORMAT_UNKNOWN,
>                                          DXGI_FORMAT_R16_SINT,
>@@ -1120,9 +1289,10 @@ const Format &Format::Get(GLenum internalFormat, const Renderer11DeviceCaps &dev
>         case GL_R16UI:
>         {
>             static constexpr Format info(GL_R16UI,
>-                                         angle::Format::ID::R16_UINT,
>+                                         angle::FormatID::R16_UINT,
>                                          DXGI_FORMAT_R16_UINT,
>                                          DXGI_FORMAT_R16_UINT,
>+                                         DXGI_FORMAT_UNKNOWN,
>                                          DXGI_FORMAT_R16_UINT,
>                                          DXGI_FORMAT_UNKNOWN,
>                                          DXGI_FORMAT_R16_UINT,
>@@ -1133,9 +1303,10 @@ const Format &Format::Get(GLenum internalFormat, const Renderer11DeviceCaps &dev
>         case GL_R16_EXT:
>         {
>             static constexpr Format info(GL_R16_EXT,
>-                                         angle::Format::ID::R16_UNORM,
>+                                         angle::FormatID::R16_UNORM,
>                                          DXGI_FORMAT_R16_UNORM,
>                                          DXGI_FORMAT_R16_UNORM,
>+                                         DXGI_FORMAT_UNKNOWN,
>                                          DXGI_FORMAT_R16_UNORM,
>                                          DXGI_FORMAT_UNKNOWN,
>                                          DXGI_FORMAT_R16_UNORM,
>@@ -1146,11 +1317,12 @@ const Format &Format::Get(GLenum internalFormat, const Renderer11DeviceCaps &dev
>         case GL_R16_SNORM_EXT:
>         {
>             static constexpr Format info(GL_R16_SNORM_EXT,
>-                                         angle::Format::ID::R16_SNORM,
>+                                         angle::FormatID::R16_SNORM,
>                                          DXGI_FORMAT_R16_SNORM,
>                                          DXGI_FORMAT_R16_SNORM,
>                                          DXGI_FORMAT_UNKNOWN,
>                                          DXGI_FORMAT_UNKNOWN,
>+                                         DXGI_FORMAT_UNKNOWN,
>                                          DXGI_FORMAT_R16_SNORM,
>                                          GL_RGBA16_SNORM_EXT,
>                                          nullptr);
>@@ -1159,7 +1331,8 @@ const Format &Format::Get(GLenum internalFormat, const Renderer11DeviceCaps &dev
>         case GL_R32F:
>         {
>             static constexpr Format info(GL_R32F,
>-                                         angle::Format::ID::R32_FLOAT,
>+                                         angle::FormatID::R32_FLOAT,
>+                                         DXGI_FORMAT_R32_FLOAT,
>                                          DXGI_FORMAT_R32_FLOAT,
>                                          DXGI_FORMAT_R32_FLOAT,
>                                          DXGI_FORMAT_R32_FLOAT,
>@@ -1172,7 +1345,8 @@ const Format &Format::Get(GLenum internalFormat, const Renderer11DeviceCaps &dev
>         case GL_R32I:
>         {
>             static constexpr Format info(GL_R32I,
>-                                         angle::Format::ID::R32_SINT,
>+                                         angle::FormatID::R32_SINT,
>+                                         DXGI_FORMAT_R32_SINT,
>                                          DXGI_FORMAT_R32_SINT,
>                                          DXGI_FORMAT_R32_SINT,
>                                          DXGI_FORMAT_R32_SINT,
>@@ -1185,7 +1359,8 @@ const Format &Format::Get(GLenum internalFormat, const Renderer11DeviceCaps &dev
>         case GL_R32UI:
>         {
>             static constexpr Format info(GL_R32UI,
>-                                         angle::Format::ID::R32_UINT,
>+                                         angle::FormatID::R32_UINT,
>+                                         DXGI_FORMAT_R32_UINT,
>                                          DXGI_FORMAT_R32_UINT,
>                                          DXGI_FORMAT_R32_UINT,
>                                          DXGI_FORMAT_R32_UINT,
>@@ -1198,9 +1373,10 @@ const Format &Format::Get(GLenum internalFormat, const Renderer11DeviceCaps &dev
>         case GL_R8:
>         {
>             static constexpr Format info(GL_R8,
>-                                         angle::Format::ID::R8_UNORM,
>+                                         angle::FormatID::R8_UNORM,
>                                          DXGI_FORMAT_R8_UNORM,
>                                          DXGI_FORMAT_R8_UNORM,
>+                                         DXGI_FORMAT_UNKNOWN,
>                                          DXGI_FORMAT_R8_UNORM,
>                                          DXGI_FORMAT_UNKNOWN,
>                                          DXGI_FORMAT_R8_UNORM,
>@@ -1211,9 +1387,10 @@ const Format &Format::Get(GLenum internalFormat, const Renderer11DeviceCaps &dev
>         case GL_R8I:
>         {
>             static constexpr Format info(GL_R8I,
>-                                         angle::Format::ID::R8_SINT,
>+                                         angle::FormatID::R8_SINT,
>                                          DXGI_FORMAT_R8_SINT,
>                                          DXGI_FORMAT_R8_SINT,
>+                                         DXGI_FORMAT_UNKNOWN,
>                                          DXGI_FORMAT_R8_SINT,
>                                          DXGI_FORMAT_UNKNOWN,
>                                          DXGI_FORMAT_R8_SINT,
>@@ -1224,9 +1401,10 @@ const Format &Format::Get(GLenum internalFormat, const Renderer11DeviceCaps &dev
>         case GL_R8UI:
>         {
>             static constexpr Format info(GL_R8UI,
>-                                         angle::Format::ID::R8_UINT,
>+                                         angle::FormatID::R8_UINT,
>                                          DXGI_FORMAT_R8_UINT,
>                                          DXGI_FORMAT_R8_UINT,
>+                                         DXGI_FORMAT_UNKNOWN,
>                                          DXGI_FORMAT_R8_UINT,
>                                          DXGI_FORMAT_UNKNOWN,
>                                          DXGI_FORMAT_R8_UINT,
>@@ -1237,11 +1415,12 @@ const Format &Format::Get(GLenum internalFormat, const Renderer11DeviceCaps &dev
>         case GL_R8_SNORM:
>         {
>             static constexpr Format info(GL_R8_SNORM,
>-                                         angle::Format::ID::R8_SNORM,
>+                                         angle::FormatID::R8_SNORM,
>                                          DXGI_FORMAT_R8_SNORM,
>                                          DXGI_FORMAT_R8_SNORM,
>                                          DXGI_FORMAT_UNKNOWN,
>                                          DXGI_FORMAT_UNKNOWN,
>+                                         DXGI_FORMAT_UNKNOWN,
>                                          DXGI_FORMAT_R8_SNORM,
>                                          GL_RGBA8_SNORM,
>                                          nullptr);
>@@ -1250,9 +1429,10 @@ const Format &Format::Get(GLenum internalFormat, const Renderer11DeviceCaps &dev
>         case GL_RG16F:
>         {
>             static constexpr Format info(GL_RG16F,
>-                                         angle::Format::ID::R16G16_FLOAT,
>+                                         angle::FormatID::R16G16_FLOAT,
>                                          DXGI_FORMAT_R16G16_FLOAT,
>                                          DXGI_FORMAT_R16G16_FLOAT,
>+                                         DXGI_FORMAT_UNKNOWN,
>                                          DXGI_FORMAT_R16G16_FLOAT,
>                                          DXGI_FORMAT_UNKNOWN,
>                                          DXGI_FORMAT_R16G16_FLOAT,
>@@ -1263,9 +1443,10 @@ const Format &Format::Get(GLenum internalFormat, const Renderer11DeviceCaps &dev
>         case GL_RG16I:
>         {
>             static constexpr Format info(GL_RG16I,
>-                                         angle::Format::ID::R16G16_SINT,
>+                                         angle::FormatID::R16G16_SINT,
>                                          DXGI_FORMAT_R16G16_SINT,
>                                          DXGI_FORMAT_R16G16_SINT,
>+                                         DXGI_FORMAT_UNKNOWN,
>                                          DXGI_FORMAT_R16G16_SINT,
>                                          DXGI_FORMAT_UNKNOWN,
>                                          DXGI_FORMAT_R16G16_SINT,
>@@ -1276,9 +1457,10 @@ const Format &Format::Get(GLenum internalFormat, const Renderer11DeviceCaps &dev
>         case GL_RG16UI:
>         {
>             static constexpr Format info(GL_RG16UI,
>-                                         angle::Format::ID::R16G16_UINT,
>+                                         angle::FormatID::R16G16_UINT,
>                                          DXGI_FORMAT_R16G16_UINT,
>                                          DXGI_FORMAT_R16G16_UINT,
>+                                         DXGI_FORMAT_UNKNOWN,
>                                          DXGI_FORMAT_R16G16_UINT,
>                                          DXGI_FORMAT_UNKNOWN,
>                                          DXGI_FORMAT_R16G16_UINT,
>@@ -1289,9 +1471,10 @@ const Format &Format::Get(GLenum internalFormat, const Renderer11DeviceCaps &dev
>         case GL_RG16_EXT:
>         {
>             static constexpr Format info(GL_RG16_EXT,
>-                                         angle::Format::ID::R16G16_UNORM,
>+                                         angle::FormatID::R16G16_UNORM,
>                                          DXGI_FORMAT_R16G16_UNORM,
>                                          DXGI_FORMAT_R16G16_UNORM,
>+                                         DXGI_FORMAT_UNKNOWN,
>                                          DXGI_FORMAT_R16G16_UNORM,
>                                          DXGI_FORMAT_UNKNOWN,
>                                          DXGI_FORMAT_R16G16_UNORM,
>@@ -1302,11 +1485,12 @@ const Format &Format::Get(GLenum internalFormat, const Renderer11DeviceCaps &dev
>         case GL_RG16_SNORM_EXT:
>         {
>             static constexpr Format info(GL_RG16_SNORM_EXT,
>-                                         angle::Format::ID::R16G16_SNORM,
>+                                         angle::FormatID::R16G16_SNORM,
>                                          DXGI_FORMAT_R16G16_SNORM,
>                                          DXGI_FORMAT_R16G16_SNORM,
>                                          DXGI_FORMAT_UNKNOWN,
>                                          DXGI_FORMAT_UNKNOWN,
>+                                         DXGI_FORMAT_UNKNOWN,
>                                          DXGI_FORMAT_R16G16_SNORM,
>                                          GL_RGBA16_SNORM_EXT,
>                                          nullptr);
>@@ -1315,9 +1499,10 @@ const Format &Format::Get(GLenum internalFormat, const Renderer11DeviceCaps &dev
>         case GL_RG32F:
>         {
>             static constexpr Format info(GL_RG32F,
>-                                         angle::Format::ID::R32G32_FLOAT,
>+                                         angle::FormatID::R32G32_FLOAT,
>                                          DXGI_FORMAT_R32G32_FLOAT,
>                                          DXGI_FORMAT_R32G32_FLOAT,
>+                                         DXGI_FORMAT_UNKNOWN,
>                                          DXGI_FORMAT_R32G32_FLOAT,
>                                          DXGI_FORMAT_UNKNOWN,
>                                          DXGI_FORMAT_R32G32_FLOAT,
>@@ -1328,9 +1513,10 @@ const Format &Format::Get(GLenum internalFormat, const Renderer11DeviceCaps &dev
>         case GL_RG32I:
>         {
>             static constexpr Format info(GL_RG32I,
>-                                         angle::Format::ID::R32G32_SINT,
>+                                         angle::FormatID::R32G32_SINT,
>                                          DXGI_FORMAT_R32G32_SINT,
>                                          DXGI_FORMAT_R32G32_SINT,
>+                                         DXGI_FORMAT_UNKNOWN,
>                                          DXGI_FORMAT_R32G32_SINT,
>                                          DXGI_FORMAT_UNKNOWN,
>                                          DXGI_FORMAT_R32G32_SINT,
>@@ -1341,9 +1527,10 @@ const Format &Format::Get(GLenum internalFormat, const Renderer11DeviceCaps &dev
>         case GL_RG32UI:
>         {
>             static constexpr Format info(GL_RG32UI,
>-                                         angle::Format::ID::R32G32_UINT,
>+                                         angle::FormatID::R32G32_UINT,
>                                          DXGI_FORMAT_R32G32_UINT,
>                                          DXGI_FORMAT_R32G32_UINT,
>+                                         DXGI_FORMAT_UNKNOWN,
>                                          DXGI_FORMAT_R32G32_UINT,
>                                          DXGI_FORMAT_UNKNOWN,
>                                          DXGI_FORMAT_R32G32_UINT,
>@@ -1354,9 +1541,10 @@ const Format &Format::Get(GLenum internalFormat, const Renderer11DeviceCaps &dev
>         case GL_RG8:
>         {
>             static constexpr Format info(GL_RG8,
>-                                         angle::Format::ID::R8G8_UNORM,
>+                                         angle::FormatID::R8G8_UNORM,
>                                          DXGI_FORMAT_R8G8_UNORM,
>                                          DXGI_FORMAT_R8G8_UNORM,
>+                                         DXGI_FORMAT_UNKNOWN,
>                                          DXGI_FORMAT_R8G8_UNORM,
>                                          DXGI_FORMAT_UNKNOWN,
>                                          DXGI_FORMAT_R8G8_UNORM,
>@@ -1367,9 +1555,10 @@ const Format &Format::Get(GLenum internalFormat, const Renderer11DeviceCaps &dev
>         case GL_RG8I:
>         {
>             static constexpr Format info(GL_RG8I,
>-                                         angle::Format::ID::R8G8_SINT,
>+                                         angle::FormatID::R8G8_SINT,
>                                          DXGI_FORMAT_R8G8_SINT,
>                                          DXGI_FORMAT_R8G8_SINT,
>+                                         DXGI_FORMAT_UNKNOWN,
>                                          DXGI_FORMAT_R8G8_SINT,
>                                          DXGI_FORMAT_UNKNOWN,
>                                          DXGI_FORMAT_R8G8_SINT,
>@@ -1380,9 +1569,10 @@ const Format &Format::Get(GLenum internalFormat, const Renderer11DeviceCaps &dev
>         case GL_RG8UI:
>         {
>             static constexpr Format info(GL_RG8UI,
>-                                         angle::Format::ID::R8G8_UINT,
>+                                         angle::FormatID::R8G8_UINT,
>                                          DXGI_FORMAT_R8G8_UINT,
>                                          DXGI_FORMAT_R8G8_UINT,
>+                                         DXGI_FORMAT_UNKNOWN,
>                                          DXGI_FORMAT_R8G8_UINT,
>                                          DXGI_FORMAT_UNKNOWN,
>                                          DXGI_FORMAT_R8G8_UINT,
>@@ -1393,11 +1583,12 @@ const Format &Format::Get(GLenum internalFormat, const Renderer11DeviceCaps &dev
>         case GL_RG8_SNORM:
>         {
>             static constexpr Format info(GL_RG8_SNORM,
>-                                         angle::Format::ID::R8G8_SNORM,
>+                                         angle::FormatID::R8G8_SNORM,
>                                          DXGI_FORMAT_R8G8_SNORM,
>                                          DXGI_FORMAT_R8G8_SNORM,
>                                          DXGI_FORMAT_UNKNOWN,
>                                          DXGI_FORMAT_UNKNOWN,
>+                                         DXGI_FORMAT_UNKNOWN,
>                                          DXGI_FORMAT_R8G8_SNORM,
>                                          GL_RGBA8_SNORM,
>                                          nullptr);
>@@ -1406,7 +1597,8 @@ const Format &Format::Get(GLenum internalFormat, const Renderer11DeviceCaps &dev
>         case GL_RGB:
>         {
>             static constexpr Format info(GL_RGB,
>-                                         angle::Format::ID::R8G8B8A8_UNORM,
>+                                         angle::FormatID::R8G8B8A8_UNORM,
>+                                         DXGI_FORMAT_R8G8B8A8_UNORM,
>                                          DXGI_FORMAT_R8G8B8A8_UNORM,
>                                          DXGI_FORMAT_R8G8B8A8_UNORM,
>                                          DXGI_FORMAT_R8G8B8A8_UNORM,
>@@ -1419,9 +1611,10 @@ const Format &Format::Get(GLenum internalFormat, const Renderer11DeviceCaps &dev
>         case GL_RGB10_A2:
>         {
>             static constexpr Format info(GL_RGB10_A2,
>-                                         angle::Format::ID::R10G10B10A2_UNORM,
>+                                         angle::FormatID::R10G10B10A2_UNORM,
>                                          DXGI_FORMAT_R10G10B10A2_UNORM,
>                                          DXGI_FORMAT_R10G10B10A2_UNORM,
>+                                         DXGI_FORMAT_UNKNOWN,
>                                          DXGI_FORMAT_R10G10B10A2_UNORM,
>                                          DXGI_FORMAT_UNKNOWN,
>                                          DXGI_FORMAT_R10G10B10A2_UNORM,
>@@ -1432,9 +1625,10 @@ const Format &Format::Get(GLenum internalFormat, const Renderer11DeviceCaps &dev
>         case GL_RGB10_A2UI:
>         {
>             static constexpr Format info(GL_RGB10_A2UI,
>-                                         angle::Format::ID::R10G10B10A2_UINT,
>+                                         angle::FormatID::R10G10B10A2_UINT,
>                                          DXGI_FORMAT_R10G10B10A2_UINT,
>                                          DXGI_FORMAT_R10G10B10A2_UINT,
>+                                         DXGI_FORMAT_UNKNOWN,
>                                          DXGI_FORMAT_R10G10B10A2_UINT,
>                                          DXGI_FORMAT_UNKNOWN,
>                                          DXGI_FORMAT_R10G10B10A2_UINT,
>@@ -1445,7 +1639,8 @@ const Format &Format::Get(GLenum internalFormat, const Renderer11DeviceCaps &dev
>         case GL_RGB16F:
>         {
>             static constexpr Format info(GL_RGB16F,
>-                                         angle::Format::ID::R16G16B16A16_FLOAT,
>+                                         angle::FormatID::R16G16B16A16_FLOAT,
>+                                         DXGI_FORMAT_R16G16B16A16_FLOAT,
>                                          DXGI_FORMAT_R16G16B16A16_FLOAT,
>                                          DXGI_FORMAT_R16G16B16A16_FLOAT,
>                                          DXGI_FORMAT_R16G16B16A16_FLOAT,
>@@ -1458,7 +1653,8 @@ const Format &Format::Get(GLenum internalFormat, const Renderer11DeviceCaps &dev
>         case GL_RGB16I:
>         {
>             static constexpr Format info(GL_RGB16I,
>-                                         angle::Format::ID::R16G16B16A16_SINT,
>+                                         angle::FormatID::R16G16B16A16_SINT,
>+                                         DXGI_FORMAT_R16G16B16A16_SINT,
>                                          DXGI_FORMAT_R16G16B16A16_SINT,
>                                          DXGI_FORMAT_R16G16B16A16_SINT,
>                                          DXGI_FORMAT_R16G16B16A16_SINT,
>@@ -1471,7 +1667,8 @@ const Format &Format::Get(GLenum internalFormat, const Renderer11DeviceCaps &dev
>         case GL_RGB16UI:
>         {
>             static constexpr Format info(GL_RGB16UI,
>-                                         angle::Format::ID::R16G16B16A16_UINT,
>+                                         angle::FormatID::R16G16B16A16_UINT,
>+                                         DXGI_FORMAT_R16G16B16A16_UINT,
>                                          DXGI_FORMAT_R16G16B16A16_UINT,
>                                          DXGI_FORMAT_R16G16B16A16_UINT,
>                                          DXGI_FORMAT_R16G16B16A16_UINT,
>@@ -1484,9 +1681,10 @@ const Format &Format::Get(GLenum internalFormat, const Renderer11DeviceCaps &dev
>         case GL_RGB16_EXT:
>         {
>             static constexpr Format info(GL_RGB16_EXT,
>-                                         angle::Format::ID::R16G16B16A16_UNORM,
>+                                         angle::FormatID::R16G16B16A16_UNORM,
>                                          DXGI_FORMAT_R16G16B16A16_UNORM,
>                                          DXGI_FORMAT_R16G16B16A16_UNORM,
>+                                         DXGI_FORMAT_UNKNOWN,
>                                          DXGI_FORMAT_R16G16B16A16_UNORM,
>                                          DXGI_FORMAT_UNKNOWN,
>                                          DXGI_FORMAT_R16G16B16A16_UNORM,
>@@ -1497,11 +1695,12 @@ const Format &Format::Get(GLenum internalFormat, const Renderer11DeviceCaps &dev
>         case GL_RGB16_SNORM_EXT:
>         {
>             static constexpr Format info(GL_RGB16_SNORM_EXT,
>-                                         angle::Format::ID::R16G16B16A16_SNORM,
>+                                         angle::FormatID::R16G16B16A16_SNORM,
>                                          DXGI_FORMAT_R16G16B16A16_SNORM,
>                                          DXGI_FORMAT_R16G16B16A16_SNORM,
>                                          DXGI_FORMAT_UNKNOWN,
>                                          DXGI_FORMAT_UNKNOWN,
>+                                         DXGI_FORMAT_UNKNOWN,
>                                          DXGI_FORMAT_R16G16B16A16_SNORM,
>                                          GL_RGBA16_SNORM_EXT,
>                                          Initialize4ComponentData<GLushort, 0x0000, 0x0000, 0x0000, 0x7FFF>);
>@@ -1510,7 +1709,8 @@ const Format &Format::Get(GLenum internalFormat, const Renderer11DeviceCaps &dev
>         case GL_RGB32F:
>         {
>             static constexpr Format info(GL_RGB32F,
>-                                         angle::Format::ID::R32G32B32A32_FLOAT,
>+                                         angle::FormatID::R32G32B32A32_FLOAT,
>+                                         DXGI_FORMAT_R32G32B32A32_FLOAT,
>                                          DXGI_FORMAT_R32G32B32A32_FLOAT,
>                                          DXGI_FORMAT_R32G32B32A32_FLOAT,
>                                          DXGI_FORMAT_R32G32B32A32_FLOAT,
>@@ -1523,7 +1723,8 @@ const Format &Format::Get(GLenum internalFormat, const Renderer11DeviceCaps &dev
>         case GL_RGB32I:
>         {
>             static constexpr Format info(GL_RGB32I,
>-                                         angle::Format::ID::R32G32B32A32_SINT,
>+                                         angle::FormatID::R32G32B32A32_SINT,
>+                                         DXGI_FORMAT_R32G32B32A32_SINT,
>                                          DXGI_FORMAT_R32G32B32A32_SINT,
>                                          DXGI_FORMAT_R32G32B32A32_SINT,
>                                          DXGI_FORMAT_R32G32B32A32_SINT,
>@@ -1536,7 +1737,8 @@ const Format &Format::Get(GLenum internalFormat, const Renderer11DeviceCaps &dev
>         case GL_RGB32UI:
>         {
>             static constexpr Format info(GL_RGB32UI,
>-                                         angle::Format::ID::R32G32B32A32_UINT,
>+                                         angle::FormatID::R32G32B32A32_UINT,
>+                                         DXGI_FORMAT_R32G32B32A32_UINT,
>                                          DXGI_FORMAT_R32G32B32A32_UINT,
>                                          DXGI_FORMAT_R32G32B32A32_UINT,
>                                          DXGI_FORMAT_R32G32B32A32_UINT,
>@@ -1551,9 +1753,10 @@ const Format &Format::Get(GLenum internalFormat, const Renderer11DeviceCaps &dev
>             if (SupportsFormat(DXGI_FORMAT_B5G6R5_UNORM, deviceCaps))
>             {
>                 static constexpr Format info(GL_RGB565,
>-                                             angle::Format::ID::B5G6R5_UNORM,
>+                                             angle::FormatID::B5G6R5_UNORM,
>                                              DXGI_FORMAT_B5G6R5_UNORM,
>                                              DXGI_FORMAT_B5G6R5_UNORM,
>+                                             DXGI_FORMAT_UNKNOWN,
>                                              DXGI_FORMAT_B5G6R5_UNORM,
>                                              DXGI_FORMAT_UNKNOWN,
>                                              DXGI_FORMAT_B5G6R5_UNORM,
>@@ -1564,7 +1767,8 @@ const Format &Format::Get(GLenum internalFormat, const Renderer11DeviceCaps &dev
>             else
>             {
>                 static constexpr Format info(GL_RGB565,
>-                                             angle::Format::ID::R8G8B8A8_UNORM,
>+                                             angle::FormatID::R8G8B8A8_UNORM,
>+                                             DXGI_FORMAT_R8G8B8A8_UNORM,
>                                              DXGI_FORMAT_R8G8B8A8_UNORM,
>                                              DXGI_FORMAT_R8G8B8A8_UNORM,
>                                              DXGI_FORMAT_R8G8B8A8_UNORM,
>@@ -1580,9 +1784,10 @@ const Format &Format::Get(GLenum internalFormat, const Renderer11DeviceCaps &dev
>             if (SupportsFormat(DXGI_FORMAT_B5G5R5A1_UNORM, deviceCaps))
>             {
>                 static constexpr Format info(GL_RGB5_A1,
>-                                             angle::Format::ID::B5G5R5A1_UNORM,
>+                                             angle::FormatID::B5G5R5A1_UNORM,
>                                              DXGI_FORMAT_B5G5R5A1_UNORM,
>                                              DXGI_FORMAT_B5G5R5A1_UNORM,
>+                                             DXGI_FORMAT_UNKNOWN,
>                                              DXGI_FORMAT_B5G5R5A1_UNORM,
>                                              DXGI_FORMAT_UNKNOWN,
>                                              DXGI_FORMAT_B5G5R5A1_UNORM,
>@@ -1593,7 +1798,8 @@ const Format &Format::Get(GLenum internalFormat, const Renderer11DeviceCaps &dev
>             else
>             {
>                 static constexpr Format info(GL_RGB5_A1,
>-                                             angle::Format::ID::R8G8B8A8_UNORM,
>+                                             angle::FormatID::R8G8B8A8_UNORM,
>+                                             DXGI_FORMAT_R8G8B8A8_UNORM,
>                                              DXGI_FORMAT_R8G8B8A8_UNORM,
>                                              DXGI_FORMAT_R8G8B8A8_UNORM,
>                                              DXGI_FORMAT_R8G8B8A8_UNORM,
>@@ -1607,7 +1813,8 @@ const Format &Format::Get(GLenum internalFormat, const Renderer11DeviceCaps &dev
>         case GL_RGB8:
>         {
>             static constexpr Format info(GL_RGB8,
>-                                         angle::Format::ID::R8G8B8A8_UNORM,
>+                                         angle::FormatID::R8G8B8A8_UNORM,
>+                                         DXGI_FORMAT_R8G8B8A8_UNORM,
>                                          DXGI_FORMAT_R8G8B8A8_UNORM,
>                                          DXGI_FORMAT_R8G8B8A8_UNORM,
>                                          DXGI_FORMAT_R8G8B8A8_UNORM,
>@@ -1620,7 +1827,8 @@ const Format &Format::Get(GLenum internalFormat, const Renderer11DeviceCaps &dev
>         case GL_RGB8I:
>         {
>             static constexpr Format info(GL_RGB8I,
>-                                         angle::Format::ID::R8G8B8A8_SINT,
>+                                         angle::FormatID::R8G8B8A8_SINT,
>+                                         DXGI_FORMAT_R8G8B8A8_SINT,
>                                          DXGI_FORMAT_R8G8B8A8_SINT,
>                                          DXGI_FORMAT_R8G8B8A8_SINT,
>                                          DXGI_FORMAT_R8G8B8A8_SINT,
>@@ -1633,7 +1841,8 @@ const Format &Format::Get(GLenum internalFormat, const Renderer11DeviceCaps &dev
>         case GL_RGB8UI:
>         {
>             static constexpr Format info(GL_RGB8UI,
>-                                         angle::Format::ID::R8G8B8A8_UINT,
>+                                         angle::FormatID::R8G8B8A8_UINT,
>+                                         DXGI_FORMAT_R8G8B8A8_UINT,
>                                          DXGI_FORMAT_R8G8B8A8_UINT,
>                                          DXGI_FORMAT_R8G8B8A8_UINT,
>                                          DXGI_FORMAT_R8G8B8A8_UINT,
>@@ -1646,7 +1855,8 @@ const Format &Format::Get(GLenum internalFormat, const Renderer11DeviceCaps &dev
>         case GL_RGB8_SNORM:
>         {
>             static constexpr Format info(GL_RGB8_SNORM,
>-                                         angle::Format::ID::R8G8B8A8_SNORM,
>+                                         angle::FormatID::R8G8B8A8_SNORM,
>+                                         DXGI_FORMAT_R8G8B8A8_SNORM,
>                                          DXGI_FORMAT_R8G8B8A8_SNORM,
>                                          DXGI_FORMAT_R8G8B8A8_SNORM,
>                                          DXGI_FORMAT_UNKNOWN,
>@@ -1659,11 +1869,12 @@ const Format &Format::Get(GLenum internalFormat, const Renderer11DeviceCaps &dev
>         case GL_RGB9_E5:
>         {
>             static constexpr Format info(GL_RGB9_E5,
>-                                         angle::Format::ID::R9G9B9E5_SHAREDEXP,
>+                                         angle::FormatID::R9G9B9E5_SHAREDEXP,
>                                          DXGI_FORMAT_R9G9B9E5_SHAREDEXP,
>                                          DXGI_FORMAT_R9G9B9E5_SHAREDEXP,
>                                          DXGI_FORMAT_UNKNOWN,
>                                          DXGI_FORMAT_UNKNOWN,
>+                                         DXGI_FORMAT_UNKNOWN,
>                                          DXGI_FORMAT_R9G9B9E5_SHAREDEXP,
>                                          GL_RGBA16F_EXT,
>                                          nullptr);
>@@ -1672,7 +1883,8 @@ const Format &Format::Get(GLenum internalFormat, const Renderer11DeviceCaps &dev
>         case GL_RGBA:
>         {
>             static constexpr Format info(GL_RGBA,
>-                                         angle::Format::ID::R8G8B8A8_UNORM,
>+                                         angle::FormatID::R8G8B8A8_UNORM,
>+                                         DXGI_FORMAT_R8G8B8A8_UNORM,
>                                          DXGI_FORMAT_R8G8B8A8_UNORM,
>                                          DXGI_FORMAT_R8G8B8A8_UNORM,
>                                          DXGI_FORMAT_R8G8B8A8_UNORM,
>@@ -1685,7 +1897,8 @@ const Format &Format::Get(GLenum internalFormat, const Renderer11DeviceCaps &dev
>         case GL_RGBA16F:
>         {
>             static constexpr Format info(GL_RGBA16F,
>-                                         angle::Format::ID::R16G16B16A16_FLOAT,
>+                                         angle::FormatID::R16G16B16A16_FLOAT,
>+                                         DXGI_FORMAT_R16G16B16A16_FLOAT,
>                                          DXGI_FORMAT_R16G16B16A16_FLOAT,
>                                          DXGI_FORMAT_R16G16B16A16_FLOAT,
>                                          DXGI_FORMAT_R16G16B16A16_FLOAT,
>@@ -1698,7 +1911,8 @@ const Format &Format::Get(GLenum internalFormat, const Renderer11DeviceCaps &dev
>         case GL_RGBA16I:
>         {
>             static constexpr Format info(GL_RGBA16I,
>-                                         angle::Format::ID::R16G16B16A16_SINT,
>+                                         angle::FormatID::R16G16B16A16_SINT,
>+                                         DXGI_FORMAT_R16G16B16A16_SINT,
>                                          DXGI_FORMAT_R16G16B16A16_SINT,
>                                          DXGI_FORMAT_R16G16B16A16_SINT,
>                                          DXGI_FORMAT_R16G16B16A16_SINT,
>@@ -1711,7 +1925,8 @@ const Format &Format::Get(GLenum internalFormat, const Renderer11DeviceCaps &dev
>         case GL_RGBA16UI:
>         {
>             static constexpr Format info(GL_RGBA16UI,
>-                                         angle::Format::ID::R16G16B16A16_UINT,
>+                                         angle::FormatID::R16G16B16A16_UINT,
>+                                         DXGI_FORMAT_R16G16B16A16_UINT,
>                                          DXGI_FORMAT_R16G16B16A16_UINT,
>                                          DXGI_FORMAT_R16G16B16A16_UINT,
>                                          DXGI_FORMAT_R16G16B16A16_UINT,
>@@ -1724,9 +1939,10 @@ const Format &Format::Get(GLenum internalFormat, const Renderer11DeviceCaps &dev
>         case GL_RGBA16_EXT:
>         {
>             static constexpr Format info(GL_RGBA16_EXT,
>-                                         angle::Format::ID::R16G16B16A16_UNORM,
>+                                         angle::FormatID::R16G16B16A16_UNORM,
>                                          DXGI_FORMAT_R16G16B16A16_UNORM,
>                                          DXGI_FORMAT_R16G16B16A16_UNORM,
>+                                         DXGI_FORMAT_UNKNOWN,
>                                          DXGI_FORMAT_R16G16B16A16_UNORM,
>                                          DXGI_FORMAT_UNKNOWN,
>                                          DXGI_FORMAT_R16G16B16A16_UNORM,
>@@ -1737,11 +1953,12 @@ const Format &Format::Get(GLenum internalFormat, const Renderer11DeviceCaps &dev
>         case GL_RGBA16_SNORM_EXT:
>         {
>             static constexpr Format info(GL_RGBA16_SNORM_EXT,
>-                                         angle::Format::ID::R16G16B16A16_SNORM,
>+                                         angle::FormatID::R16G16B16A16_SNORM,
>                                          DXGI_FORMAT_R16G16B16A16_SNORM,
>                                          DXGI_FORMAT_R16G16B16A16_SNORM,
>                                          DXGI_FORMAT_UNKNOWN,
>                                          DXGI_FORMAT_UNKNOWN,
>+                                         DXGI_FORMAT_UNKNOWN,
>                                          DXGI_FORMAT_R16G16B16A16_SNORM,
>                                          GL_RGBA16_SNORM_EXT,
>                                          nullptr);
>@@ -1750,7 +1967,8 @@ const Format &Format::Get(GLenum internalFormat, const Renderer11DeviceCaps &dev
>         case GL_RGBA32F:
>         {
>             static constexpr Format info(GL_RGBA32F,
>-                                         angle::Format::ID::R32G32B32A32_FLOAT,
>+                                         angle::FormatID::R32G32B32A32_FLOAT,
>+                                         DXGI_FORMAT_R32G32B32A32_FLOAT,
>                                          DXGI_FORMAT_R32G32B32A32_FLOAT,
>                                          DXGI_FORMAT_R32G32B32A32_FLOAT,
>                                          DXGI_FORMAT_R32G32B32A32_FLOAT,
>@@ -1763,7 +1981,8 @@ const Format &Format::Get(GLenum internalFormat, const Renderer11DeviceCaps &dev
>         case GL_RGBA32I:
>         {
>             static constexpr Format info(GL_RGBA32I,
>-                                         angle::Format::ID::R32G32B32A32_SINT,
>+                                         angle::FormatID::R32G32B32A32_SINT,
>+                                         DXGI_FORMAT_R32G32B32A32_SINT,
>                                          DXGI_FORMAT_R32G32B32A32_SINT,
>                                          DXGI_FORMAT_R32G32B32A32_SINT,
>                                          DXGI_FORMAT_R32G32B32A32_SINT,
>@@ -1776,7 +1995,8 @@ const Format &Format::Get(GLenum internalFormat, const Renderer11DeviceCaps &dev
>         case GL_RGBA32UI:
>         {
>             static constexpr Format info(GL_RGBA32UI,
>-                                         angle::Format::ID::R32G32B32A32_UINT,
>+                                         angle::FormatID::R32G32B32A32_UINT,
>+                                         DXGI_FORMAT_R32G32B32A32_UINT,
>                                          DXGI_FORMAT_R32G32B32A32_UINT,
>                                          DXGI_FORMAT_R32G32B32A32_UINT,
>                                          DXGI_FORMAT_R32G32B32A32_UINT,
>@@ -1791,9 +2011,10 @@ const Format &Format::Get(GLenum internalFormat, const Renderer11DeviceCaps &dev
>             if (SupportsFormat(DXGI_FORMAT_B4G4R4A4_UNORM, deviceCaps))
>             {
>                 static constexpr Format info(GL_RGBA4,
>-                                             angle::Format::ID::B4G4R4A4_UNORM,
>+                                             angle::FormatID::B4G4R4A4_UNORM,
>                                              DXGI_FORMAT_B4G4R4A4_UNORM,
>                                              DXGI_FORMAT_B4G4R4A4_UNORM,
>+                                             DXGI_FORMAT_UNKNOWN,
>                                              DXGI_FORMAT_B4G4R4A4_UNORM,
>                                              DXGI_FORMAT_UNKNOWN,
>                                              DXGI_FORMAT_B4G4R4A4_UNORM,
>@@ -1804,7 +2025,8 @@ const Format &Format::Get(GLenum internalFormat, const Renderer11DeviceCaps &dev
>             else
>             {
>                 static constexpr Format info(GL_RGBA4,
>-                                             angle::Format::ID::R8G8B8A8_UNORM,
>+                                             angle::FormatID::R8G8B8A8_UNORM,
>+                                             DXGI_FORMAT_R8G8B8A8_UNORM,
>                                              DXGI_FORMAT_R8G8B8A8_UNORM,
>                                              DXGI_FORMAT_R8G8B8A8_UNORM,
>                                              DXGI_FORMAT_R8G8B8A8_UNORM,
>@@ -1818,7 +2040,8 @@ const Format &Format::Get(GLenum internalFormat, const Renderer11DeviceCaps &dev
>         case GL_RGBA8:
>         {
>             static constexpr Format info(GL_RGBA8,
>-                                         angle::Format::ID::R8G8B8A8_UNORM,
>+                                         angle::FormatID::R8G8B8A8_UNORM,
>+                                         DXGI_FORMAT_R8G8B8A8_UNORM,
>                                          DXGI_FORMAT_R8G8B8A8_UNORM,
>                                          DXGI_FORMAT_R8G8B8A8_UNORM,
>                                          DXGI_FORMAT_R8G8B8A8_UNORM,
>@@ -1831,7 +2054,8 @@ const Format &Format::Get(GLenum internalFormat, const Renderer11DeviceCaps &dev
>         case GL_RGBA8I:
>         {
>             static constexpr Format info(GL_RGBA8I,
>-                                         angle::Format::ID::R8G8B8A8_SINT,
>+                                         angle::FormatID::R8G8B8A8_SINT,
>+                                         DXGI_FORMAT_R8G8B8A8_SINT,
>                                          DXGI_FORMAT_R8G8B8A8_SINT,
>                                          DXGI_FORMAT_R8G8B8A8_SINT,
>                                          DXGI_FORMAT_R8G8B8A8_SINT,
>@@ -1844,7 +2068,8 @@ const Format &Format::Get(GLenum internalFormat, const Renderer11DeviceCaps &dev
>         case GL_RGBA8UI:
>         {
>             static constexpr Format info(GL_RGBA8UI,
>-                                         angle::Format::ID::R8G8B8A8_UINT,
>+                                         angle::FormatID::R8G8B8A8_UINT,
>+                                         DXGI_FORMAT_R8G8B8A8_UINT,
>                                          DXGI_FORMAT_R8G8B8A8_UINT,
>                                          DXGI_FORMAT_R8G8B8A8_UINT,
>                                          DXGI_FORMAT_R8G8B8A8_UINT,
>@@ -1857,7 +2082,8 @@ const Format &Format::Get(GLenum internalFormat, const Renderer11DeviceCaps &dev
>         case GL_RGBA8_SNORM:
>         {
>             static constexpr Format info(GL_RGBA8_SNORM,
>-                                         angle::Format::ID::R8G8B8A8_SNORM,
>+                                         angle::FormatID::R8G8B8A8_SNORM,
>+                                         DXGI_FORMAT_R8G8B8A8_SNORM,
>                                          DXGI_FORMAT_R8G8B8A8_SNORM,
>                                          DXGI_FORMAT_R8G8B8A8_SNORM,
>                                          DXGI_FORMAT_UNKNOWN,
>@@ -1870,9 +2096,10 @@ const Format &Format::Get(GLenum internalFormat, const Renderer11DeviceCaps &dev
>         case GL_SRGB8:
>         {
>             static constexpr Format info(GL_SRGB8,
>-                                         angle::Format::ID::R8G8B8A8_UNORM_SRGB,
>+                                         angle::FormatID::R8G8B8A8_UNORM_SRGB,
>                                          DXGI_FORMAT_R8G8B8A8_UNORM_SRGB,
>                                          DXGI_FORMAT_R8G8B8A8_UNORM_SRGB,
>+                                         DXGI_FORMAT_UNKNOWN,
>                                          DXGI_FORMAT_R8G8B8A8_UNORM_SRGB,
>                                          DXGI_FORMAT_UNKNOWN,
>                                          DXGI_FORMAT_R8G8B8A8_UNORM_SRGB,
>@@ -1883,9 +2110,10 @@ const Format &Format::Get(GLenum internalFormat, const Renderer11DeviceCaps &dev
>         case GL_SRGB8_ALPHA8:
>         {
>             static constexpr Format info(GL_SRGB8_ALPHA8,
>-                                         angle::Format::ID::R8G8B8A8_UNORM_SRGB,
>+                                         angle::FormatID::R8G8B8A8_UNORM_SRGB,
>                                          DXGI_FORMAT_R8G8B8A8_UNORM_SRGB,
>                                          DXGI_FORMAT_R8G8B8A8_UNORM_SRGB,
>+                                         DXGI_FORMAT_UNKNOWN,
>                                          DXGI_FORMAT_R8G8B8A8_UNORM_SRGB,
>                                          DXGI_FORMAT_UNKNOWN,
>                                          DXGI_FORMAT_R8G8B8A8_UNORM_SRGB,
>@@ -1898,10 +2126,11 @@ const Format &Format::Get(GLenum internalFormat, const Renderer11DeviceCaps &dev
>             if (OnlyFL10Plus(deviceCaps))
>             {
>                 static constexpr Format info(GL_STENCIL_INDEX8,
>-                                             angle::Format::ID::D24_UNORM_S8_UINT,
>+                                             angle::FormatID::D24_UNORM_S8_UINT,
>                                              DXGI_FORMAT_R24G8_TYPELESS,
>                                              DXGI_FORMAT_R24_UNORM_X8_TYPELESS,
>                                              DXGI_FORMAT_UNKNOWN,
>+                                             DXGI_FORMAT_UNKNOWN,
>                                              DXGI_FORMAT_D24_UNORM_S8_UINT,
>                                              DXGI_FORMAT_R24_UNORM_X8_TYPELESS,
>                                              GL_RGBA32F,
>@@ -1911,10 +2140,11 @@ const Format &Format::Get(GLenum internalFormat, const Renderer11DeviceCaps &dev
>             else
>             {
>                 static constexpr Format info(GL_STENCIL_INDEX8,
>-                                             angle::Format::ID::D24_UNORM_S8_UINT,
>+                                             angle::FormatID::D24_UNORM_S8_UINT,
>                                              DXGI_FORMAT_D24_UNORM_S8_UINT,
>                                              DXGI_FORMAT_UNKNOWN,
>                                              DXGI_FORMAT_UNKNOWN,
>+                                             DXGI_FORMAT_UNKNOWN,
>                                              DXGI_FORMAT_D24_UNORM_S8_UINT,
>                                              DXGI_FORMAT_UNKNOWN,
>                                              GL_RGBA32F,
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/texture_format_table_utils.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/texture_format_table_utils.h
>index d5351ff8828..01d75220048 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/texture_format_table_utils.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/texture_format_table_utils.h
>@@ -18,6 +18,11 @@ namespace d3d11
> 
> using FormatSupportFunction = bool (*)(const Renderer11DeviceCaps &);
> 
>+inline bool OnlyFL11_1Plus(const Renderer11DeviceCaps &deviceCaps)
>+{
>+    return (deviceCaps.featureLevel >= D3D_FEATURE_LEVEL_11_1);
>+}
>+
> inline bool OnlyFL10Plus(const Renderer11DeviceCaps &deviceCaps)
> {
>     return (deviceCaps.featureLevel >= D3D_FEATURE_LEVEL_10_0);
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/win32/NativeWindow11Win32.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/win32/NativeWindow11Win32.cpp
>index 5394e3d3e76..146c492ddb5 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/win32/NativeWindow11Win32.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/win32/NativeWindow11Win32.cpp
>@@ -11,7 +11,9 @@
> 
> #include "common/debug.h"
> 
>+// This header must be included before dcomp.h.
> #include <initguid.h>
>+
> #include <dcomp.h>
> 
> namespace rx
>@@ -26,8 +28,7 @@ NativeWindow11Win32::NativeWindow11Win32(EGLNativeWindowType window,
>       mDevice(nullptr),
>       mCompositionTarget(nullptr),
>       mVisual(nullptr)
>-{
>-}
>+{}
> 
> NativeWindow11Win32::~NativeWindow11Win32()
> {
>@@ -86,7 +87,7 @@ HRESULT NativeWindow11Win32::createSwapChain(ID3D11Device *device,
>         if (!mDevice)
>         {
>             IDXGIDevice *dxgiDevice = d3d11::DynamicCastComObject<IDXGIDevice>(device);
>-            HRESULT result = createDComp(dxgiDevice, __uuidof(IDCompositionDevice),
>+            HRESULT result          = createDComp(dxgiDevice, __uuidof(IDCompositionDevice),
>                                          reinterpret_cast<void **>(&mDevice));
>             SafeRelease(dxgiDevice);
> 
>@@ -122,12 +123,12 @@ HRESULT NativeWindow11Win32::createSwapChain(ID3D11Device *device,
>         swapChainDesc.Format                = format;
>         swapChainDesc.Stereo                = FALSE;
>         swapChainDesc.SampleDesc.Count      = 1;
>-        swapChainDesc.SampleDesc.Quality = 0;
>+        swapChainDesc.SampleDesc.Quality    = 0;
>         swapChainDesc.BufferUsage =
>             DXGI_USAGE_RENDER_TARGET_OUTPUT | DXGI_USAGE_BACK_BUFFER | DXGI_USAGE_SHADER_INPUT;
>         swapChainDesc.BufferCount = 2;
>         swapChainDesc.Scaling     = DXGI_SCALING_STRETCH;
>-        swapChainDesc.SwapEffect = DXGI_SWAP_EFFECT_FLIP_SEQUENTIAL;
>+        swapChainDesc.SwapEffect  = DXGI_SWAP_EFFECT_FLIP_SEQUENTIAL;
>         swapChainDesc.AlphaMode =
>             mHasAlpha ? DXGI_ALPHA_MODE_PREMULTIPLIED : DXGI_ALPHA_MODE_IGNORE;
>         swapChainDesc.Flags         = 0;
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/winrt/CoreWindowNativeWindow.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/winrt/CoreWindowNativeWindow.cpp
>index dd37ace87e4..cb2f279e4b7 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/winrt/CoreWindowNativeWindow.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/winrt/CoreWindowNativeWindow.cpp
>@@ -22,9 +22,9 @@ CoreWindowNativeWindow::~CoreWindowNativeWindow()
> bool CoreWindowNativeWindow::initialize(EGLNativeWindowType window, IPropertySet *propertySet)
> {
>     ComPtr<IPropertySet> props = propertySet;
>-    ComPtr<IInspectable> win = window;
>-    SIZE swapChainSize = {};
>-    HRESULT result = S_OK;
>+    ComPtr<IInspectable> win   = window;
>+    SIZE swapChainSize         = {};
>+    HRESULT result             = S_OK;
> 
>     // IPropertySet is an optional parameter and can be null.
>     // If one is specified, cache as an IMap and read the properties
>@@ -40,7 +40,8 @@ bool CoreWindowNativeWindow::initialize(EGLNativeWindowType window, IPropertySet
>         // The EGLRenderSurfaceSizeProperty is optional and may be missing. The IPropertySet
>         // was prevalidated to contain the EGLNativeWindowType before being passed to
>         // this host.
>-        result = GetOptionalSizePropertyValue(mPropertyMap, EGLRenderSurfaceSizeProperty, &swapChainSize, &mSwapChainSizeSpecified);
>+        result = GetOptionalSizePropertyValue(mPropertyMap, EGLRenderSurfaceSizeProperty,
>+                                              &swapChainSize, &mSwapChainSizeSpecified);
>         if (FAILED(result))
>         {
>             return false;
>@@ -49,7 +50,8 @@ bool CoreWindowNativeWindow::initialize(EGLNativeWindowType window, IPropertySet
>         // The EGLRenderResolutionScaleProperty is optional and may be missing. The IPropertySet
>         // was prevalidated to contain the EGLNativeWindowType before being passed to
>         // this host.
>-        result = GetOptionalSinglePropertyValue(mPropertyMap, EGLRenderResolutionScaleProperty, &mSwapChainScale, &mSwapChainScaleSpecified);
>+        result = GetOptionalSinglePropertyValue(mPropertyMap, EGLRenderResolutionScaleProperty,
>+                                                &mSwapChainScale, &mSwapChainScaleSpecified);
>         if (FAILED(result))
>         {
>             return false;
>@@ -61,7 +63,8 @@ bool CoreWindowNativeWindow::initialize(EGLNativeWindowType window, IPropertySet
>             mSwapChainScale = 1.0f;
>         }
> 
>-        // A EGLRenderSurfaceSizeProperty and a EGLRenderResolutionScaleProperty can't both be specified
>+        // A EGLRenderSurfaceSizeProperty and a EGLRenderResolutionScaleProperty can't both be
>+        // specified
>         if (mSwapChainScaleSpecified && mSwapChainSizeSpecified)
>         {
>             ERR() << "It is invalid to specify both an EGLRenderSurfaceSizeProperty and a "
>@@ -85,7 +88,7 @@ bool CoreWindowNativeWindow::initialize(EGLNativeWindowType window, IPropertySet
>         // the scaling mode setting DXGI_SCALING_STRETCH on the swapchain.
>         if (mSwapChainSizeSpecified)
>         {
>-            mClientRect = { 0, 0, swapChainSize.cx, swapChainSize.cy };
>+            mClientRect = {0, 0, swapChainSize.cx, swapChainSize.cy};
>         }
>         else
>         {
>@@ -101,7 +104,7 @@ bool CoreWindowNativeWindow::initialize(EGLNativeWindowType window, IPropertySet
> 
>     if (SUCCEEDED(result))
>     {
>-        mNewClientRect = mClientRect;
>+        mNewClientRect     = mClientRect;
>         mClientRectChanged = false;
>         return registerForSizeChangeEvents();
>     }
>@@ -112,7 +115,8 @@ bool CoreWindowNativeWindow::initialize(EGLNativeWindowType window, IPropertySet
> bool CoreWindowNativeWindow::registerForSizeChangeEvents()
> {
>     ComPtr<IWindowSizeChangedEventHandler> sizeChangedHandler;
>-    HRESULT result = Microsoft::WRL::MakeAndInitialize<CoreWindowSizeChangedHandler>(sizeChangedHandler.ReleaseAndGetAddressOf(), this->shared_from_this());
>+    HRESULT result = Microsoft::WRL::MakeAndInitialize<CoreWindowSizeChangedHandler>(
>+        sizeChangedHandler.ReleaseAndGetAddressOf(), this->shared_from_this());
>     if (SUCCEEDED(result))
>     {
>         result = mCoreWindow->add_SizeChanged(sizeChangedHandler.Get(), &mSizeChangedEventToken);
>@@ -149,24 +153,25 @@ HRESULT CoreWindowNativeWindow::createSwapChain(ID3D11Device *device,
>         return E_INVALIDARG;
>     }
> 
>-    DXGI_SWAP_CHAIN_DESC1 swapChainDesc = { 0 };
>-    swapChainDesc.Width = width;
>-    swapChainDesc.Height = height;
>-    swapChainDesc.Format = format;
>-    swapChainDesc.Stereo = FALSE;
>-    swapChainDesc.SampleDesc.Count = 1;
>-    swapChainDesc.SampleDesc.Quality = 0;
>+    DXGI_SWAP_CHAIN_DESC1 swapChainDesc = {0};
>+    swapChainDesc.Width                 = width;
>+    swapChainDesc.Height                = height;
>+    swapChainDesc.Format                = format;
>+    swapChainDesc.Stereo                = FALSE;
>+    swapChainDesc.SampleDesc.Count      = 1;
>+    swapChainDesc.SampleDesc.Quality    = 0;
>     swapChainDesc.BufferUsage =
>         DXGI_USAGE_SHADER_INPUT | DXGI_USAGE_RENDER_TARGET_OUTPUT | DXGI_USAGE_BACK_BUFFER;
>     swapChainDesc.BufferCount = 2;
>-    swapChainDesc.SwapEffect = DXGI_SWAP_EFFECT_FLIP_SEQUENTIAL;
>-    swapChainDesc.Scaling = DXGI_SCALING_STRETCH;
>-    swapChainDesc.AlphaMode             = DXGI_ALPHA_MODE_UNSPECIFIED;
>+    swapChainDesc.SwapEffect  = DXGI_SWAP_EFFECT_FLIP_SEQUENTIAL;
>+    swapChainDesc.Scaling     = DXGI_SCALING_STRETCH;
>+    swapChainDesc.AlphaMode   = DXGI_ALPHA_MODE_UNSPECIFIED;
> 
>     *swapChain = nullptr;
> 
>     ComPtr<IDXGISwapChain1> newSwapChain;
>-    HRESULT result = factory->CreateSwapChainForCoreWindow(device, mCoreWindow.Get(), &swapChainDesc, nullptr, newSwapChain.ReleaseAndGetAddressOf());
>+    HRESULT result = factory->CreateSwapChainForCoreWindow(
>+        device, mCoreWindow.Get(), &swapChainDesc, nullptr, newSwapChain.ReleaseAndGetAddressOf());
>     if (SUCCEEDED(result))
>     {
>         result = newSwapChain.CopyTo(swapChain);
>@@ -200,7 +205,7 @@ HRESULT GetCoreWindowSizeInPixels(const ComPtr<ABI::Windows::UI::Core::ICoreWind
>     HRESULT result = coreWindow->get_Bounds(&bounds);
>     if (SUCCEEDED(result))
>     {
>-        *windowSize = { ConvertDipsToPixels(bounds.Width), ConvertDipsToPixels(bounds.Height) };
>+        *windowSize = {ConvertDipsToPixels(bounds.Width), ConvertDipsToPixels(bounds.Height)};
>     }
> 
>     return result;
>@@ -210,7 +215,9 @@ static float GetLogicalDpi()
> {
>     ComPtr<ABI::Windows::Graphics::Display::IDisplayPropertiesStatics> displayProperties;
> 
>-    if (SUCCEEDED(GetActivationFactory(HStringReference(RuntimeClass_Windows_Graphics_Display_DisplayProperties).Get(), displayProperties.GetAddressOf())))
>+    if (SUCCEEDED(GetActivationFactory(
>+            HStringReference(RuntimeClass_Windows_Graphics_Display_DisplayProperties).Get(),
>+            displayProperties.GetAddressOf())))
>     {
>         float dpi = 96.0f;
>         if (SUCCEEDED(displayProperties->get_LogicalDpi(&dpi)))
>@@ -228,4 +235,4 @@ float ConvertDipsToPixels(float dips)
>     static const float dipsPerInch = 96.0f;
>     return dips * GetLogicalDpi() / dipsPerInch;
> }
>-}
>+}  // namespace rx
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/winrt/CoreWindowNativeWindow.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/winrt/CoreWindowNativeWindow.h
>index d43bf0ba5ff..ae57cfb83ca 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/winrt/CoreWindowNativeWindow.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/winrt/CoreWindowNativeWindow.h
>@@ -15,13 +15,16 @@
> 
> #include <EGL/eglplatform.h>
> 
>-typedef ABI::Windows::Foundation::__FITypedEventHandler_2_Windows__CUI__CCore__CCoreWindow_Windows__CUI__CCore__CWindowSizeChangedEventArgs_t IWindowSizeChangedEventHandler;
>+typedef ABI::Windows::Foundation::
>+    __FITypedEventHandler_2_Windows__CUI__CCore__CCoreWindow_Windows__CUI__CCore__CWindowSizeChangedEventArgs_t
>+        IWindowSizeChangedEventHandler;
> 
> namespace rx
> {
> float ConvertDipsToPixels(float dips);
> 
>-class CoreWindowNativeWindow : public InspectableNativeWindow, public std::enable_shared_from_this<CoreWindowNativeWindow>
>+class CoreWindowNativeWindow : public InspectableNativeWindow,
>+                               public std::enable_shared_from_this<CoreWindowNativeWindow>
> {
>   public:
>     ~CoreWindowNativeWindow();
>@@ -43,15 +46,16 @@ class CoreWindowNativeWindow : public InspectableNativeWindow, public std::enabl
> 
>   private:
>     ComPtr<ABI::Windows::UI::Core::ICoreWindow> mCoreWindow;
>-    ComPtr<IMap<HSTRING, IInspectable*>> mPropertyMap;
>+    ComPtr<IMap<HSTRING, IInspectable *>> mPropertyMap;
> };
> 
>-[uuid(7F924F66-EBAE-40E5-A10B-B8F35E245190)]
>-class CoreWindowSizeChangedHandler :
>-    public Microsoft::WRL::RuntimeClass<Microsoft::WRL::RuntimeClassFlags<Microsoft::WRL::ClassicCom>, IWindowSizeChangedEventHandler>
>+[uuid(7F924F66 - EBAE - 40E5 - A10B - B8F35E245190)] class CoreWindowSizeChangedHandler
>+    : public Microsoft::WRL::RuntimeClass<
>+          Microsoft::WRL::RuntimeClassFlags<Microsoft::WRL::ClassicCom>,
>+          IWindowSizeChangedEventHandler>
> {
>   public:
>-    CoreWindowSizeChangedHandler() { }
>+    CoreWindowSizeChangedHandler() {}
>     HRESULT RuntimeClassInitialize(std::shared_ptr<InspectableNativeWindow> host)
>     {
>         if (!host)
>@@ -64,7 +68,9 @@ class CoreWindowSizeChangedHandler :
>     }
> 
>     // IWindowSizeChangedEventHandler
>-    IFACEMETHOD(Invoke)(ABI::Windows::UI::Core::ICoreWindow *sender, ABI::Windows::UI::Core::IWindowSizeChangedEventArgs *sizeChangedEventArgs)
>+    IFACEMETHOD(Invoke)
>+    (ABI::Windows::UI::Core::ICoreWindow *sender,
>+     ABI::Windows::UI::Core::IWindowSizeChangedEventArgs *sizeChangedEventArgs)
>     {
>         std::shared_ptr<InspectableNativeWindow> host = mHost.lock();
>         if (host)
>@@ -89,4 +95,4 @@ HRESULT GetCoreWindowSizeInPixels(const ComPtr<ABI::Windows::UI::Core::ICoreWind
>                                   Size *windowSize);
> }
> 
>-#endif // LIBANGLE_RENDERER_D3D_D3D11_WINRT_COREWINDOWNATIVEWINDOW_H_
>+#endif  // LIBANGLE_RENDERER_D3D_D3D11_WINRT_COREWINDOWNATIVEWINDOW_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/winrt/CoreWindowNativeWindow_unittest.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/winrt/CoreWindowNativeWindow_unittest.cpp
>index a79d1733f25..4a371e9d49b 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/winrt/CoreWindowNativeWindow_unittest.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/winrt/CoreWindowNativeWindow_unittest.cpp
>@@ -15,8 +15,8 @@
> // set to WINAPI_FAMILY_DESKTOP_APP
> #undef WINAPI_FAMILY
> #define WINAPI_FAMILY WINAPI_FAMILY_PC_APP
>-#include "libANGLE/renderer/d3d/d3d11/NativeWindow.h"
> #include <angle_windowsstore.h>
>+#include "libANGLE/renderer/d3d/d3d11/NativeWindow.h"
> 
> using namespace rx;
> using namespace ABI::Windows::ApplicationModel::Core;
>@@ -31,126 +31,261 @@ namespace
> // Mock Generic interfaces which are NOT ICoreWindow or
> // IPropertySet
> MIDL_INTERFACE("A4D67D0A-0E7F-4DF7-918B-7A1395413AF2")
>-IAmInspectable : public IInspectable
>-{
>-};
>+IAmInspectable : public IInspectable{};
> 
>-class GenericIInspectable : public RuntimeClass <
>-    RuntimeClassFlags<WinRtClassicComMix>,
>-    IAmInspectable >
>-{
>-};
>+class GenericIInspectable
>+    : public RuntimeClass<RuntimeClassFlags<WinRtClassicComMix>, IAmInspectable>
>+{};
> 
> MIDL_INTERFACE("3CBCFE7A-E000-4094-B2D2-B7C9A4D67A2C")
>-IAmUnknown : public IUnknown
>-{
>-};
>+IAmUnknown : public IUnknown{};
> 
>-class GenericIUnknown : public RuntimeClass <
>-    RuntimeClassFlags<ClassicCom>,
>-    IAmUnknown >
>-{
>-};
>+class GenericIUnknown : public RuntimeClass<RuntimeClassFlags<ClassicCom>, IAmUnknown>
>+{};
> 
> // Mock ICoreWindow
> class MockCoreWindow : public ABI::Windows::UI::Core::ICoreWindow
> {
>   public:
>     // IUnknown
>-    STDMETHOD(QueryInterface)(REFIID riid, void** ppvObject)
>+    STDMETHOD(QueryInterface)(REFIID riid, void **ppvObject)
>     {
>         *ppvObject = nullptr;
> 
>         if (IsEqualIID(IID_IUnknown, riid))
>         {
>-            *ppvObject = static_cast<IUnknown*>(this);
>+            *ppvObject = static_cast<IUnknown *>(this);
>             return S_OK;
>         }
> 
>         if (IsEqualIID(IID_IInspectable, riid))
>         {
>-            *ppvObject = static_cast<IInspectable*>(this);
>+            *ppvObject = static_cast<IInspectable *>(this);
>             return S_OK;
>         }
> 
>         if (IsEqualIID(IID_ICoreWindow, riid))
>         {
>-            *ppvObject = static_cast<ABI::Windows::UI::Core::ICoreWindow*>(this);
>+            *ppvObject = static_cast<ABI::Windows::UI::Core::ICoreWindow *>(this);
>             return S_OK;
>         }
> 
>         return E_NOINTERFACE;
>     }
> 
>-    STDMETHOD_(ULONG, AddRef)(){ return 1; }
>-    STDMETHOD_(ULONG, Release)(){ return 1; }
>+    STDMETHOD_(ULONG, AddRef)() { return 1; }
>+    STDMETHOD_(ULONG, Release)() { return 1; }
> 
>     // IInspectable
>-    MOCK_METHOD2_WITH_CALLTYPE(STDMETHODCALLTYPE, GetIids, HRESULT(ULONG *, IID**));
>+    MOCK_METHOD2_WITH_CALLTYPE(STDMETHODCALLTYPE, GetIids, HRESULT(ULONG *, IID **));
>     MOCK_METHOD1_WITH_CALLTYPE(STDMETHODCALLTYPE, GetRuntimeClassName, HRESULT(HSTRING *));
>     MOCK_METHOD1_WITH_CALLTYPE(STDMETHODCALLTYPE, GetTrustLevel, HRESULT(TrustLevel *));
> 
>     // ICoreWindow
>-    MOCK_METHOD1_WITH_CALLTYPE(STDMETHODCALLTYPE, get_AutomationHostProvider, HRESULT(IInspectable **));
>+    MOCK_METHOD1_WITH_CALLTYPE(STDMETHODCALLTYPE,
>+                               get_AutomationHostProvider,
>+                               HRESULT(IInspectable **));
>     MOCK_METHOD1_WITH_CALLTYPE(STDMETHODCALLTYPE, get_Bounds, HRESULT(Rect *));
>     MOCK_METHOD1_WITH_CALLTYPE(STDMETHODCALLTYPE, get_CustomProperties, HRESULT(IPropertySet **));
>     MOCK_METHOD1_WITH_CALLTYPE(STDMETHODCALLTYPE, get_Dispatcher, HRESULT(ICoreDispatcher **));
>-    MOCK_METHOD1_WITH_CALLTYPE(STDMETHODCALLTYPE, get_FlowDirection, HRESULT(CoreWindowFlowDirection *));
>-    MOCK_METHOD1_WITH_CALLTYPE(STDMETHODCALLTYPE, put_FlowDirection, HRESULT(CoreWindowFlowDirection));
>+    MOCK_METHOD1_WITH_CALLTYPE(STDMETHODCALLTYPE,
>+                               get_FlowDirection,
>+                               HRESULT(CoreWindowFlowDirection *));
>+    MOCK_METHOD1_WITH_CALLTYPE(STDMETHODCALLTYPE,
>+                               put_FlowDirection,
>+                               HRESULT(CoreWindowFlowDirection));
>     MOCK_METHOD1_WITH_CALLTYPE(STDMETHODCALLTYPE, get_IsInputEnabled, HRESULT(boolean *));
>     MOCK_METHOD1_WITH_CALLTYPE(STDMETHODCALLTYPE, put_IsInputEnabled, HRESULT(boolean));
>-    MOCK_METHOD1_WITH_CALLTYPE(STDMETHODCALLTYPE, get_PointerCursor, HRESULT(ICoreCursor**));
>-    MOCK_METHOD1_WITH_CALLTYPE(STDMETHODCALLTYPE, put_PointerCursor, HRESULT(ICoreCursor*));
>-    MOCK_METHOD1_WITH_CALLTYPE(STDMETHODCALLTYPE, get_PointerPosition, HRESULT(Point*));
>+    MOCK_METHOD1_WITH_CALLTYPE(STDMETHODCALLTYPE, get_PointerCursor, HRESULT(ICoreCursor **));
>+    MOCK_METHOD1_WITH_CALLTYPE(STDMETHODCALLTYPE, put_PointerCursor, HRESULT(ICoreCursor *));
>+    MOCK_METHOD1_WITH_CALLTYPE(STDMETHODCALLTYPE, get_PointerPosition, HRESULT(Point *));
>     MOCK_METHOD1_WITH_CALLTYPE(STDMETHODCALLTYPE, get_Visible, HRESULT(boolean *));
>     MOCK_METHOD0_WITH_CALLTYPE(STDMETHODCALLTYPE, Activate, HRESULT());
>-    MOCK_METHOD0_WITH_CALLTYPE(STDMETHODCALLTYPE, Close , HRESULT());
>-    MOCK_METHOD2_WITH_CALLTYPE(STDMETHODCALLTYPE, GetAsyncKeyState, HRESULT(ABI::Windows::System::VirtualKey, ABI::Windows::UI::Core::CoreVirtualKeyStates*));
>-    MOCK_METHOD2_WITH_CALLTYPE(STDMETHODCALLTYPE, GetKeyState, HRESULT(ABI::Windows::System::VirtualKey, ABI::Windows::UI::Core::CoreVirtualKeyStates*));
>+    MOCK_METHOD0_WITH_CALLTYPE(STDMETHODCALLTYPE, Close, HRESULT());
>+    MOCK_METHOD2_WITH_CALLTYPE(STDMETHODCALLTYPE,
>+                               GetAsyncKeyState,
>+                               HRESULT(ABI::Windows::System::VirtualKey,
>+                                       ABI::Windows::UI::Core::CoreVirtualKeyStates *));
>+    MOCK_METHOD2_WITH_CALLTYPE(STDMETHODCALLTYPE,
>+                               GetKeyState,
>+                               HRESULT(ABI::Windows::System::VirtualKey,
>+                                       ABI::Windows::UI::Core::CoreVirtualKeyStates *));
>     MOCK_METHOD0_WITH_CALLTYPE(STDMETHODCALLTYPE, ReleasePointerCapture, HRESULT());
>     MOCK_METHOD0_WITH_CALLTYPE(STDMETHODCALLTYPE, SetPointerCapture, HRESULT());
>-    MOCK_METHOD2_WITH_CALLTYPE(STDMETHODCALLTYPE, add_Activated, HRESULT(__FITypedEventHandler_2_Windows__CUI__CCore__CCoreWindow_Windows__CUI__CCore__CWindowActivatedEventArgs*, EventRegistrationToken *));
>-    MOCK_METHOD1_WITH_CALLTYPE(STDMETHODCALLTYPE, remove_Activated, HRESULT(EventRegistrationToken));
>-    MOCK_METHOD2_WITH_CALLTYPE(STDMETHODCALLTYPE, add_AutomationProviderRequested, HRESULT(__FITypedEventHandler_2_Windows__CUI__CCore__CCoreWindow_Windows__CUI__CCore__CAutomationProviderRequestedEventArgs*, EventRegistrationToken *));
>-    MOCK_METHOD1_WITH_CALLTYPE(STDMETHODCALLTYPE, remove_AutomationProviderRequested, HRESULT(EventRegistrationToken));
>-    MOCK_METHOD2_WITH_CALLTYPE(STDMETHODCALLTYPE, add_CharacterReceived, HRESULT(__FITypedEventHandler_2_Windows__CUI__CCore__CCoreWindow_Windows__CUI__CCore__CCharacterReceivedEventArgs*, EventRegistrationToken *));
>-    MOCK_METHOD1_WITH_CALLTYPE(STDMETHODCALLTYPE, remove_CharacterReceived, HRESULT(EventRegistrationToken));
>-    MOCK_METHOD2_WITH_CALLTYPE(STDMETHODCALLTYPE, add_Closed, HRESULT(__FITypedEventHandler_2_Windows__CUI__CCore__CCoreWindow_Windows__CUI__CCore__CCoreWindowEventArgs*, EventRegistrationToken *));
>+    MOCK_METHOD2_WITH_CALLTYPE(
>+        STDMETHODCALLTYPE,
>+        add_Activated,
>+        HRESULT(
>+            __FITypedEventHandler_2_Windows__CUI__CCore__CCoreWindow_Windows__CUI__CCore__CWindowActivatedEventArgs
>+                *,
>+            EventRegistrationToken *));
>+    MOCK_METHOD1_WITH_CALLTYPE(STDMETHODCALLTYPE,
>+                               remove_Activated,
>+                               HRESULT(EventRegistrationToken));
>+    MOCK_METHOD2_WITH_CALLTYPE(
>+        STDMETHODCALLTYPE,
>+        add_AutomationProviderRequested,
>+        HRESULT(
>+            __FITypedEventHandler_2_Windows__CUI__CCore__CCoreWindow_Windows__CUI__CCore__CAutomationProviderRequestedEventArgs
>+                *,
>+            EventRegistrationToken *));
>+    MOCK_METHOD1_WITH_CALLTYPE(STDMETHODCALLTYPE,
>+                               remove_AutomationProviderRequested,
>+                               HRESULT(EventRegistrationToken));
>+    MOCK_METHOD2_WITH_CALLTYPE(
>+        STDMETHODCALLTYPE,
>+        add_CharacterReceived,
>+        HRESULT(
>+            __FITypedEventHandler_2_Windows__CUI__CCore__CCoreWindow_Windows__CUI__CCore__CCharacterReceivedEventArgs
>+                *,
>+            EventRegistrationToken *));
>+    MOCK_METHOD1_WITH_CALLTYPE(STDMETHODCALLTYPE,
>+                               remove_CharacterReceived,
>+                               HRESULT(EventRegistrationToken));
>+    MOCK_METHOD2_WITH_CALLTYPE(
>+        STDMETHODCALLTYPE,
>+        add_Closed,
>+        HRESULT(
>+            __FITypedEventHandler_2_Windows__CUI__CCore__CCoreWindow_Windows__CUI__CCore__CCoreWindowEventArgs
>+                *,
>+            EventRegistrationToken *));
>     MOCK_METHOD1_WITH_CALLTYPE(STDMETHODCALLTYPE, remove_Closed, HRESULT(EventRegistrationToken));
>-    MOCK_METHOD2_WITH_CALLTYPE(STDMETHODCALLTYPE, add_InputEnabled, HRESULT(__FITypedEventHandler_2_Windows__CUI__CCore__CCoreWindow_Windows__CUI__CCore__CInputEnabledEventArgs*, EventRegistrationToken *));
>-    MOCK_METHOD1_WITH_CALLTYPE(STDMETHODCALLTYPE, remove_InputEnabled, HRESULT(EventRegistrationToken));
>-    MOCK_METHOD2_WITH_CALLTYPE(STDMETHODCALLTYPE, add_KeyDown, HRESULT(__FITypedEventHandler_2_Windows__CUI__CCore__CCoreWindow_Windows__CUI__CCore__CKeyEventArgs*, EventRegistrationToken *));
>+    MOCK_METHOD2_WITH_CALLTYPE(
>+        STDMETHODCALLTYPE,
>+        add_InputEnabled,
>+        HRESULT(
>+            __FITypedEventHandler_2_Windows__CUI__CCore__CCoreWindow_Windows__CUI__CCore__CInputEnabledEventArgs
>+                *,
>+            EventRegistrationToken *));
>+    MOCK_METHOD1_WITH_CALLTYPE(STDMETHODCALLTYPE,
>+                               remove_InputEnabled,
>+                               HRESULT(EventRegistrationToken));
>+    MOCK_METHOD2_WITH_CALLTYPE(
>+        STDMETHODCALLTYPE,
>+        add_KeyDown,
>+        HRESULT(
>+            __FITypedEventHandler_2_Windows__CUI__CCore__CCoreWindow_Windows__CUI__CCore__CKeyEventArgs
>+                *,
>+            EventRegistrationToken *));
>     MOCK_METHOD1_WITH_CALLTYPE(STDMETHODCALLTYPE, remove_KeyDown, HRESULT(EventRegistrationToken));
>-    MOCK_METHOD2_WITH_CALLTYPE(STDMETHODCALLTYPE, add_KeyUp, HRESULT(__FITypedEventHandler_2_Windows__CUI__CCore__CCoreWindow_Windows__CUI__CCore__CKeyEventArgs*, EventRegistrationToken *));
>+    MOCK_METHOD2_WITH_CALLTYPE(
>+        STDMETHODCALLTYPE,
>+        add_KeyUp,
>+        HRESULT(
>+            __FITypedEventHandler_2_Windows__CUI__CCore__CCoreWindow_Windows__CUI__CCore__CKeyEventArgs
>+                *,
>+            EventRegistrationToken *));
>     MOCK_METHOD1_WITH_CALLTYPE(STDMETHODCALLTYPE, remove_KeyUp, HRESULT(EventRegistrationToken));
>-    MOCK_METHOD2_WITH_CALLTYPE(STDMETHODCALLTYPE, add_PointerCaptureLost, HRESULT(__FITypedEventHandler_2_Windows__CUI__CCore__CCoreWindow_Windows__CUI__CCore__CPointerEventArgs*, EventRegistrationToken *));
>-    MOCK_METHOD1_WITH_CALLTYPE(STDMETHODCALLTYPE, remove_PointerCaptureLost, HRESULT(EventRegistrationToken));
>-    MOCK_METHOD2_WITH_CALLTYPE(STDMETHODCALLTYPE, add_PointerEntered, HRESULT(__FITypedEventHandler_2_Windows__CUI__CCore__CCoreWindow_Windows__CUI__CCore__CPointerEventArgs*, EventRegistrationToken *));
>-    MOCK_METHOD1_WITH_CALLTYPE(STDMETHODCALLTYPE, remove_PointerEntered, HRESULT(EventRegistrationToken));
>-    MOCK_METHOD2_WITH_CALLTYPE(STDMETHODCALLTYPE, add_PointerExited, HRESULT(__FITypedEventHandler_2_Windows__CUI__CCore__CCoreWindow_Windows__CUI__CCore__CPointerEventArgs*, EventRegistrationToken *));
>-    MOCK_METHOD1_WITH_CALLTYPE(STDMETHODCALLTYPE, remove_PointerExited, HRESULT(EventRegistrationToken));
>-    MOCK_METHOD2_WITH_CALLTYPE(STDMETHODCALLTYPE, add_PointerMoved, HRESULT(__FITypedEventHandler_2_Windows__CUI__CCore__CCoreWindow_Windows__CUI__CCore__CPointerEventArgs*, EventRegistrationToken *));
>-    MOCK_METHOD1_WITH_CALLTYPE(STDMETHODCALLTYPE, remove_PointerMoved, HRESULT(EventRegistrationToken));
>-    MOCK_METHOD2_WITH_CALLTYPE(STDMETHODCALLTYPE, add_PointerPressed, HRESULT(__FITypedEventHandler_2_Windows__CUI__CCore__CCoreWindow_Windows__CUI__CCore__CPointerEventArgs*, EventRegistrationToken *));
>-    MOCK_METHOD1_WITH_CALLTYPE(STDMETHODCALLTYPE, remove_PointerPressed, HRESULT(EventRegistrationToken));
>-    MOCK_METHOD2_WITH_CALLTYPE(STDMETHODCALLTYPE, add_PointerReleased, HRESULT(__FITypedEventHandler_2_Windows__CUI__CCore__CCoreWindow_Windows__CUI__CCore__CPointerEventArgs*, EventRegistrationToken *));
>-    MOCK_METHOD1_WITH_CALLTYPE(STDMETHODCALLTYPE, remove_PointerReleased, HRESULT(EventRegistrationToken));
>-    MOCK_METHOD2_WITH_CALLTYPE(STDMETHODCALLTYPE, add_TouchHitTesting, HRESULT(__FITypedEventHandler_2_Windows__CUI__CCore__CCoreWindow_Windows__CUI__CCore__CTouchHitTestingEventArgs*, EventRegistrationToken *));
>-    MOCK_METHOD1_WITH_CALLTYPE(STDMETHODCALLTYPE, remove_TouchHitTesting, HRESULT(EventRegistrationToken));
>-    MOCK_METHOD2_WITH_CALLTYPE(STDMETHODCALLTYPE, add_PointerWheelChanged, HRESULT(__FITypedEventHandler_2_Windows__CUI__CCore__CCoreWindow_Windows__CUI__CCore__CPointerEventArgs*, EventRegistrationToken *));
>-    MOCK_METHOD1_WITH_CALLTYPE(STDMETHODCALLTYPE, remove_PointerWheelChanged, HRESULT(EventRegistrationToken));
>-    MOCK_METHOD2_WITH_CALLTYPE(STDMETHODCALLTYPE, add_SizeChanged, HRESULT(__FITypedEventHandler_2_Windows__CUI__CCore__CCoreWindow_Windows__CUI__CCore__CWindowSizeChangedEventArgs*, EventRegistrationToken *));
>-    MOCK_METHOD1_WITH_CALLTYPE(STDMETHODCALLTYPE, remove_SizeChanged, HRESULT(EventRegistrationToken));
>-    MOCK_METHOD2_WITH_CALLTYPE(STDMETHODCALLTYPE, add_VisibilityChanged, HRESULT(__FITypedEventHandler_2_Windows__CUI__CCore__CCoreWindow_Windows__CUI__CCore__CVisibilityChangedEventArgs*, EventRegistrationToken *));
>-    MOCK_METHOD1_WITH_CALLTYPE(STDMETHODCALLTYPE, remove_VisibilityChanged, HRESULT(EventRegistrationToken));
>+    MOCK_METHOD2_WITH_CALLTYPE(
>+        STDMETHODCALLTYPE,
>+        add_PointerCaptureLost,
>+        HRESULT(
>+            __FITypedEventHandler_2_Windows__CUI__CCore__CCoreWindow_Windows__CUI__CCore__CPointerEventArgs
>+                *,
>+            EventRegistrationToken *));
>+    MOCK_METHOD1_WITH_CALLTYPE(STDMETHODCALLTYPE,
>+                               remove_PointerCaptureLost,
>+                               HRESULT(EventRegistrationToken));
>+    MOCK_METHOD2_WITH_CALLTYPE(
>+        STDMETHODCALLTYPE,
>+        add_PointerEntered,
>+        HRESULT(
>+            __FITypedEventHandler_2_Windows__CUI__CCore__CCoreWindow_Windows__CUI__CCore__CPointerEventArgs
>+                *,
>+            EventRegistrationToken *));
>+    MOCK_METHOD1_WITH_CALLTYPE(STDMETHODCALLTYPE,
>+                               remove_PointerEntered,
>+                               HRESULT(EventRegistrationToken));
>+    MOCK_METHOD2_WITH_CALLTYPE(
>+        STDMETHODCALLTYPE,
>+        add_PointerExited,
>+        HRESULT(
>+            __FITypedEventHandler_2_Windows__CUI__CCore__CCoreWindow_Windows__CUI__CCore__CPointerEventArgs
>+                *,
>+            EventRegistrationToken *));
>+    MOCK_METHOD1_WITH_CALLTYPE(STDMETHODCALLTYPE,
>+                               remove_PointerExited,
>+                               HRESULT(EventRegistrationToken));
>+    MOCK_METHOD2_WITH_CALLTYPE(
>+        STDMETHODCALLTYPE,
>+        add_PointerMoved,
>+        HRESULT(
>+            __FITypedEventHandler_2_Windows__CUI__CCore__CCoreWindow_Windows__CUI__CCore__CPointerEventArgs
>+                *,
>+            EventRegistrationToken *));
>+    MOCK_METHOD1_WITH_CALLTYPE(STDMETHODCALLTYPE,
>+                               remove_PointerMoved,
>+                               HRESULT(EventRegistrationToken));
>+    MOCK_METHOD2_WITH_CALLTYPE(
>+        STDMETHODCALLTYPE,
>+        add_PointerPressed,
>+        HRESULT(
>+            __FITypedEventHandler_2_Windows__CUI__CCore__CCoreWindow_Windows__CUI__CCore__CPointerEventArgs
>+                *,
>+            EventRegistrationToken *));
>+    MOCK_METHOD1_WITH_CALLTYPE(STDMETHODCALLTYPE,
>+                               remove_PointerPressed,
>+                               HRESULT(EventRegistrationToken));
>+    MOCK_METHOD2_WITH_CALLTYPE(
>+        STDMETHODCALLTYPE,
>+        add_PointerReleased,
>+        HRESULT(
>+            __FITypedEventHandler_2_Windows__CUI__CCore__CCoreWindow_Windows__CUI__CCore__CPointerEventArgs
>+                *,
>+            EventRegistrationToken *));
>+    MOCK_METHOD1_WITH_CALLTYPE(STDMETHODCALLTYPE,
>+                               remove_PointerReleased,
>+                               HRESULT(EventRegistrationToken));
>+    MOCK_METHOD2_WITH_CALLTYPE(
>+        STDMETHODCALLTYPE,
>+        add_TouchHitTesting,
>+        HRESULT(
>+            __FITypedEventHandler_2_Windows__CUI__CCore__CCoreWindow_Windows__CUI__CCore__CTouchHitTestingEventArgs
>+                *,
>+            EventRegistrationToken *));
>+    MOCK_METHOD1_WITH_CALLTYPE(STDMETHODCALLTYPE,
>+                               remove_TouchHitTesting,
>+                               HRESULT(EventRegistrationToken));
>+    MOCK_METHOD2_WITH_CALLTYPE(
>+        STDMETHODCALLTYPE,
>+        add_PointerWheelChanged,
>+        HRESULT(
>+            __FITypedEventHandler_2_Windows__CUI__CCore__CCoreWindow_Windows__CUI__CCore__CPointerEventArgs
>+                *,
>+            EventRegistrationToken *));
>+    MOCK_METHOD1_WITH_CALLTYPE(STDMETHODCALLTYPE,
>+                               remove_PointerWheelChanged,
>+                               HRESULT(EventRegistrationToken));
>+    MOCK_METHOD2_WITH_CALLTYPE(
>+        STDMETHODCALLTYPE,
>+        add_SizeChanged,
>+        HRESULT(
>+            __FITypedEventHandler_2_Windows__CUI__CCore__CCoreWindow_Windows__CUI__CCore__CWindowSizeChangedEventArgs
>+                *,
>+            EventRegistrationToken *));
>+    MOCK_METHOD1_WITH_CALLTYPE(STDMETHODCALLTYPE,
>+                               remove_SizeChanged,
>+                               HRESULT(EventRegistrationToken));
>+    MOCK_METHOD2_WITH_CALLTYPE(
>+        STDMETHODCALLTYPE,
>+        add_VisibilityChanged,
>+        HRESULT(
>+            __FITypedEventHandler_2_Windows__CUI__CCore__CCoreWindow_Windows__CUI__CCore__CVisibilityChangedEventArgs
>+                *,
>+            EventRegistrationToken *));
>+    MOCK_METHOD1_WITH_CALLTYPE(STDMETHODCALLTYPE,
>+                               remove_VisibilityChanged,
>+                               HRESULT(EventRegistrationToken));
> };
> 
>-HRESULT CreatePropertyMap(IMap<HSTRING, IInspectable*>** propertyMap)
>+HRESULT CreatePropertyMap(IMap<HSTRING, IInspectable *> **propertyMap)
> {
>     HRESULT result = S_OK;
>     ComPtr<IPropertySet> propertySet;
>     ComPtr<IActivationFactory> propertySetFactory;
>-    result = GetActivationFactory(HStringReference(RuntimeClass_Windows_Foundation_Collections_PropertySet).Get(), &propertySetFactory);
>+    result = GetActivationFactory(
>+        HStringReference(RuntimeClass_Windows_Foundation_Collections_PropertySet).Get(),
>+        &propertySetFactory);
>     EXPECT_HRESULT_SUCCEEDED(result);
> 
>     result = propertySetFactory->ActivateInstance(&propertySet);
>@@ -162,10 +297,12 @@ HRESULT CreatePropertyMap(IMap<HSTRING, IInspectable*>** propertyMap)
>     return result;
> }
> 
>-HRESULT CreatePropertyValueStatics(IPropertyValueStatics** propertyStatics)
>+HRESULT CreatePropertyValueStatics(IPropertyValueStatics **propertyStatics)
> {
>     ComPtr<IPropertyValueStatics> propertyValueStatics;
>-    HRESULT result = GetActivationFactory(HStringReference(RuntimeClass_Windows_Foundation_PropertyValue).Get(), &propertyValueStatics);
>+    HRESULT result =
>+        GetActivationFactory(HStringReference(RuntimeClass_Windows_Foundation_PropertyValue).Get(),
>+                             &propertyValueStatics);
>     EXPECT_HRESULT_SUCCEEDED(result);
> 
>     result = propertyValueStatics.CopyTo(propertyStatics);
>@@ -174,10 +311,13 @@ HRESULT CreatePropertyValueStatics(IPropertyValueStatics** propertyStatics)
>     return result;
> }
> 
>-HRESULT SetInspectablePropertyValue(const ComPtr<IMap<HSTRING, IInspectable*>>& propertyMap, const wchar_t* propertyName, IInspectable* inspectable)
>+HRESULT SetInspectablePropertyValue(const ComPtr<IMap<HSTRING, IInspectable *>> &propertyMap,
>+                                    const wchar_t *propertyName,
>+                                    IInspectable *inspectable)
> {
>     boolean propertyReplaced = false;
>-    return propertyMap->Insert(HStringReference(propertyName).Get(), inspectable, &propertyReplaced);
>+    return propertyMap->Insert(HStringReference(propertyName).Get(), inspectable,
>+                               &propertyReplaced);
> }
> 
> void expectNativeWindowInitCalls(MockCoreWindow &coreWindow, bool expectBounds)
>@@ -207,7 +347,7 @@ TEST(NativeWindowTest, NativeWindowBadInspectable)
> TEST(NativeWindowTest, NativeWindowNotInspectable)
> {
>     ComPtr<IAmUnknown> notIInspectable = Make<GenericIUnknown>();
>-    NativeWindow nativeWindow((IInspectable*)notIInspectable.Get());
>+    NativeWindow nativeWindow((IInspectable *)notIInspectable.Get());
>     EXPECT_FALSE(nativeWindow.initialize());
> }
> 
>@@ -225,11 +365,12 @@ TEST(NativeWindowTest, NativeWindowValidCoreWindowInPropertySet)
>     EXPECT_HRESULT_SUCCEEDED(CoInitializeEx(nullptr, COINIT_MULTITHREADED));
>     {
>         MockCoreWindow mockCoreWindow;
>-        ComPtr<IMap<HSTRING, IInspectable*>> propertySet;
>+        ComPtr<IMap<HSTRING, IInspectable *>> propertySet;
> 
>         // Add the CoreWindow to the property set
>         EXPECT_HRESULT_SUCCEEDED(CreatePropertyMap(&propertySet));
>-        EXPECT_HRESULT_SUCCEEDED(SetInspectablePropertyValue(propertySet, EGLNativeWindowTypeProperty, &mockCoreWindow));
>+        EXPECT_HRESULT_SUCCEEDED(
>+            SetInspectablePropertyValue(propertySet, EGLNativeWindowTypeProperty, &mockCoreWindow));
> 
>         expectNativeWindowInitCalls(mockCoreWindow, true);
>         NativeWindow nativeWindow(propertySet.Get());
>@@ -244,7 +385,7 @@ TEST(NativeWindowTest, NativeWindowMissingCoreWindowInPropertySet)
>     EXPECT_HRESULT_SUCCEEDED(CoInitializeEx(nullptr, COINIT_MULTITHREADED));
>     {
>         MockCoreWindow mockCoreWindow;
>-        ComPtr<IMap<HSTRING, IInspectable*>> propertySet;
>+        ComPtr<IMap<HSTRING, IInspectable *>> propertySet;
> 
>         EXPECT_HRESULT_SUCCEEDED(CreatePropertyMap(&propertySet));
> 
>@@ -256,30 +397,34 @@ TEST(NativeWindowTest, NativeWindowMissingCoreWindowInPropertySet)
> 
> // Tests that the scale property works as expected in a property set with a SwapChainPanel
> class CoreWindowScaleTest : public testing::TestWithParam<std::pair<float, bool>>
>-{
>-};
>+{};
> 
> TEST_P(CoreWindowScaleTest, ValidateScale)
> {
>-    float scale = GetParam().first;
>+    float scale         = GetParam().first;
>     bool expectedResult = GetParam().second;
> 
>     // COM is required to be initialized for creation of the property set
>     EXPECT_HRESULT_SUCCEEDED(CoInitializeEx(nullptr, COINIT_MULTITHREADED));
>     {
>         MockCoreWindow mockCoreWindow;
>-        ComPtr<IMap<HSTRING, IInspectable*>> propertySet;
>+        ComPtr<IMap<HSTRING, IInspectable *>> propertySet;
>         ComPtr<IPropertyValueStatics> propertyValueStatics;
>         ComPtr<IPropertyValue> singleValue;
> 
>         // Create a simple property set
>         EXPECT_HRESULT_SUCCEEDED(CreatePropertyMap(&propertySet));
>-        EXPECT_HRESULT_SUCCEEDED(SetInspectablePropertyValue(propertySet, EGLNativeWindowTypeProperty, reinterpret_cast<IInspectable*>(&mockCoreWindow)));
>+        EXPECT_HRESULT_SUCCEEDED(
>+            SetInspectablePropertyValue(propertySet, EGLNativeWindowTypeProperty,
>+                                        reinterpret_cast<IInspectable *>(&mockCoreWindow)));
> 
>         // Add a valid scale factor to the property set
>         EXPECT_HRESULT_SUCCEEDED(CreatePropertyValueStatics(propertyValueStatics.GetAddressOf()));
>-        propertyValueStatics->CreateSingle(scale, reinterpret_cast<IInspectable**>(singleValue.GetAddressOf()));
>-        EXPECT_HRESULT_SUCCEEDED(SetInspectablePropertyValue(propertySet, EGLRenderResolutionScaleProperty, reinterpret_cast<IInspectable*>(singleValue.Get())));
>+        propertyValueStatics->CreateSingle(
>+            scale, reinterpret_cast<IInspectable **>(singleValue.GetAddressOf()));
>+        EXPECT_HRESULT_SUCCEEDED(
>+            SetInspectablePropertyValue(propertySet, EGLRenderResolutionScaleProperty,
>+                                        reinterpret_cast<IInspectable *>(singleValue.Get())));
> 
>         // Check native window init status and calls to the mock swapchainpanel
>         NativeWindow nativeWindow(propertySet.Get());
>@@ -294,42 +439,42 @@ TEST_P(CoreWindowScaleTest, ValidateScale)
> }
> 
> typedef std::pair<float, bool> scaleValidPair;
>-static const scaleValidPair scales[] = { scaleValidPair(1.0f,   true),
>-                                         scaleValidPair(0.5f,   true),
>-                                         scaleValidPair(0.0f,   false),
>-                                         scaleValidPair(0.01f,  true),
>-                                         scaleValidPair(2.00f,  true) };
>+static const scaleValidPair scales[] = {scaleValidPair(1.0f, true), scaleValidPair(0.5f, true),
>+                                        scaleValidPair(0.0f, false), scaleValidPair(0.01f, true),
>+                                        scaleValidPair(2.00f, true)};
> 
>-INSTANTIATE_TEST_CASE_P(NativeWindowTest,
>-                        CoreWindowScaleTest,
>-                        testing::ValuesIn(scales));
>+INSTANTIATE_TEST_SUITE_P(NativeWindowTest, CoreWindowScaleTest, testing::ValuesIn(scales));
> 
> // Tests that the size property works as expected in a property set with a SwapChainPanel
> class CoreWindowSizeTest : public testing::TestWithParam<std::tuple<float, float, bool>>
>-{
>-};
>+{};
> 
> TEST_P(CoreWindowSizeTest, ValidateSize)
> {
>-    Size renderSize = { std::get<0>(GetParam()), std::get<1>(GetParam()) };
>+    Size renderSize     = {std::get<0>(GetParam()), std::get<1>(GetParam())};
>     bool expectedResult = std::get<2>(GetParam());
> 
>     // COM is required to be initialized for creation of the property set
>     EXPECT_HRESULT_SUCCEEDED(CoInitializeEx(nullptr, COINIT_MULTITHREADED));
>     {
>         MockCoreWindow mockCoreWindow;
>-        ComPtr<IMap<HSTRING, IInspectable*>> propertySet;
>+        ComPtr<IMap<HSTRING, IInspectable *>> propertySet;
>         ComPtr<IPropertyValueStatics> propertyValueStatics;
>         ComPtr<IPropertyValue> sizeValue;
> 
>         // Create a simple property set
>         EXPECT_HRESULT_SUCCEEDED(CreatePropertyMap(&propertySet));
>-        EXPECT_HRESULT_SUCCEEDED(SetInspectablePropertyValue(propertySet, EGLNativeWindowTypeProperty, reinterpret_cast<IInspectable*>(&mockCoreWindow)));
>+        EXPECT_HRESULT_SUCCEEDED(
>+            SetInspectablePropertyValue(propertySet, EGLNativeWindowTypeProperty,
>+                                        reinterpret_cast<IInspectable *>(&mockCoreWindow)));
> 
>         // Add a valid size to the property set
>         EXPECT_HRESULT_SUCCEEDED(CreatePropertyValueStatics(propertyValueStatics.GetAddressOf()));
>-        propertyValueStatics->CreateSize(renderSize, reinterpret_cast<IInspectable**>(sizeValue.GetAddressOf()));
>-        EXPECT_HRESULT_SUCCEEDED(SetInspectablePropertyValue(propertySet, EGLRenderSurfaceSizeProperty, reinterpret_cast<IInspectable*>(sizeValue.Get())));
>+        propertyValueStatics->CreateSize(
>+            renderSize, reinterpret_cast<IInspectable **>(sizeValue.GetAddressOf()));
>+        EXPECT_HRESULT_SUCCEEDED(
>+            SetInspectablePropertyValue(propertySet, EGLRenderSurfaceSizeProperty,
>+                                        reinterpret_cast<IInspectable *>(sizeValue.Get())));
> 
>         // Check native window init status and calls to the mock swapchainpanel
>         NativeWindow nativeWindow(propertySet.Get());
>@@ -344,13 +489,9 @@ TEST_P(CoreWindowSizeTest, ValidateSize)
> }
> 
> typedef std::tuple<float, float, bool> sizeValidPair;
>-static const sizeValidPair sizes[] = { sizeValidPair( 800,  480, true),
>-                                       sizeValidPair(   0,  480, false),
>-                                       sizeValidPair( 800,    0, false),
>-                                       sizeValidPair(   0,    0, false) };
>+static const sizeValidPair sizes[] = {sizeValidPair(800, 480, true), sizeValidPair(0, 480, false),
>+                                      sizeValidPair(800, 0, false), sizeValidPair(0, 0, false)};
> 
>-INSTANTIATE_TEST_CASE_P(NativeWindowTest,
>-                        CoreWindowSizeTest,
>-                        testing::ValuesIn(sizes));
>+INSTANTIATE_TEST_SUITE_P(NativeWindowTest, CoreWindowSizeTest, testing::ValuesIn(sizes));
> 
>-} // namespace
>+}  // namespace
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/winrt/InspectableNativeWindow.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/winrt/InspectableNativeWindow.cpp
>index cc815213209..0fad1defe08 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/winrt/InspectableNativeWindow.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/winrt/InspectableNativeWindow.cpp
>@@ -4,7 +4,8 @@
> // found in the LICENSE file.
> //
> 
>-// InspectableNativeWindow.cpp: NativeWindow base class for managing IInspectable native window types.
>+// InspectableNativeWindow.cpp: NativeWindow base class for managing IInspectable native window
>+// types.
> 
> #include "libANGLE/renderer/d3d/d3d11/winrt/CoreWindowNativeWindow.h"
> #include "libANGLE/renderer/d3d/d3d11/winrt/SwapChainPanelNativeWindow.h"
>@@ -12,7 +13,8 @@
> namespace rx
> {
> 
>-bool IsCoreWindow(EGLNativeWindowType window, ComPtr<ABI::Windows::UI::Core::ICoreWindow> *coreWindow)
>+bool IsCoreWindow(EGLNativeWindowType window,
>+                  ComPtr<ABI::Windows::UI::Core::ICoreWindow> *coreWindow)
> {
>     if (!window)
>     {
>@@ -33,7 +35,8 @@ bool IsCoreWindow(EGLNativeWindowType window, ComPtr<ABI::Windows::UI::Core::ICo
>     return false;
> }
> 
>-bool IsSwapChainPanel(EGLNativeWindowType window, ComPtr<ABI::Windows::UI::Xaml::Controls::ISwapChainPanel> *swapChainPanel)
>+bool IsSwapChainPanel(EGLNativeWindowType window,
>+                      ComPtr<ABI::Windows::UI::Xaml::Controls::ISwapChainPanel> *swapChainPanel)
> {
>     if (!window)
>     {
>@@ -54,7 +57,9 @@ bool IsSwapChainPanel(EGLNativeWindowType window, ComPtr<ABI::Windows::UI::Xaml:
>     return false;
> }
> 
>-bool IsEGLConfiguredPropertySet(EGLNativeWindowType window, ABI::Windows::Foundation::Collections::IPropertySet **propertySet, IInspectable **eglNativeWindow)
>+bool IsEGLConfiguredPropertySet(EGLNativeWindowType window,
>+                                ABI::Windows::Foundation::Collections::IPropertySet **propertySet,
>+                                IInspectable **eglNativeWindow)
> {
>     if (!window)
>     {
>@@ -64,7 +69,7 @@ bool IsEGLConfiguredPropertySet(EGLNativeWindowType window, ABI::Windows::Founda
>     ComPtr<IInspectable> props = window;
>     ComPtr<IPropertySet> propSet;
>     ComPtr<IInspectable> nativeWindow;
>-    ComPtr<ABI::Windows::Foundation::Collections::IMap<HSTRING, IInspectable*>> propMap;
>+    ComPtr<ABI::Windows::Foundation::Collections::IMap<HSTRING, IInspectable *>> propMap;
>     boolean hasEglNativeWindowPropertyKey = false;
> 
>     HRESULT result = props.As(&propSet);
>@@ -76,11 +81,12 @@ bool IsEGLConfiguredPropertySet(EGLNativeWindowType window, ABI::Windows::Founda
>     // Look for the presence of the EGLNativeWindowType in the property set
>     if (SUCCEEDED(result))
>     {
>-        result = propMap->HasKey(HStringReference(EGLNativeWindowTypeProperty).Get(), &hasEglNativeWindowPropertyKey);
>+        result = propMap->HasKey(HStringReference(EGLNativeWindowTypeProperty).Get(),
>+                                 &hasEglNativeWindowPropertyKey);
>     }
> 
>-    // If the IPropertySet does not contain the required EglNativeWindowType key, the property set is
>-    // considered invalid.
>+    // If the IPropertySet does not contain the required EglNativeWindowType key, the property set
>+    // is considered invalid.
>     if (SUCCEEDED(result) && !hasEglNativeWindowPropertyKey)
>     {
>         ERR() << "Could not find EGLNativeWindowTypeProperty in IPropertySet. Valid "
>@@ -88,10 +94,12 @@ bool IsEGLConfiguredPropertySet(EGLNativeWindowType window, ABI::Windows::Founda
>         return false;
>     }
> 
>-    // The EglNativeWindowType property exists, so retreive the IInspectable that represents the EGLNativeWindowType
>+    // The EglNativeWindowType property exists, so retreive the IInspectable that represents the
>+    // EGLNativeWindowType
>     if (SUCCEEDED(result) && hasEglNativeWindowPropertyKey)
>     {
>-        result = propMap->Lookup(HStringReference(EGLNativeWindowTypeProperty).Get(), &nativeWindow);
>+        result =
>+            propMap->Lookup(HStringReference(EGLNativeWindowTypeProperty).Get(), &nativeWindow);
>     }
> 
>     if (SUCCEEDED(result))
>@@ -119,10 +127,11 @@ bool IsEGLConfiguredPropertySet(EGLNativeWindowType window, ABI::Windows::Founda
> }
> 
> // Retrieve an optional property from a property set
>-HRESULT GetOptionalPropertyValue(const ComPtr<ABI::Windows::Foundation::Collections::IMap<HSTRING, IInspectable*>> &propertyMap,
>-                                 const wchar_t *propertyName,
>-                                 boolean *hasKey,
>-                                 ComPtr<ABI::Windows::Foundation::IPropertyValue> &propertyValue)
>+HRESULT GetOptionalPropertyValue(
>+    const ComPtr<ABI::Windows::Foundation::Collections::IMap<HSTRING, IInspectable *>> &propertyMap,
>+    const wchar_t *propertyName,
>+    boolean *hasKey,
>+    ComPtr<ABI::Windows::Foundation::IPropertyValue> &propertyValue)
> {
>     if (!propertyMap || !hasKey)
>     {
>@@ -160,12 +169,16 @@ HRESULT GetOptionalPropertyValue(const ComPtr<ABI::Windows::Foundation::Collecti
> //    * Invalid property value (width/height must be > 0)
> // Additional errors may be returned from IMap or IPropertyValue
> //
>-HRESULT GetOptionalSizePropertyValue(const ComPtr<ABI::Windows::Foundation::Collections::IMap<HSTRING, IInspectable*>> &propertyMap,
>-                                     const wchar_t *propertyName, SIZE *value, bool *valueExists)
>+HRESULT GetOptionalSizePropertyValue(
>+    const ComPtr<ABI::Windows::Foundation::Collections::IMap<HSTRING, IInspectable *>> &propertyMap,
>+    const wchar_t *propertyName,
>+    SIZE *value,
>+    bool *valueExists)
> {
>     ComPtr<ABI::Windows::Foundation::IPropertyValue> propertyValue;
>-    ABI::Windows::Foundation::PropertyType propertyType = ABI::Windows::Foundation::PropertyType::PropertyType_Empty;
>-    Size sizeValue = { 0, 0 };
>+    ABI::Windows::Foundation::PropertyType propertyType =
>+        ABI::Windows::Foundation::PropertyType::PropertyType_Empty;
>+    Size sizeValue = {0, 0};
>     boolean hasKey = false;
> 
>     if (!propertyMap || !value || !valueExists)
>@@ -175,7 +188,7 @@ HRESULT GetOptionalSizePropertyValue(const ComPtr<ABI::Windows::Foundation::Coll
> 
>     // Assume that the value does not exist
>     *valueExists = false;
>-    *value = { 0, 0 };
>+    *value       = {0, 0};
> 
>     HRESULT result = GetOptionalPropertyValue(propertyMap, propertyName, &hasKey, propertyValue);
>     if (SUCCEEDED(result) && hasKey)
>@@ -183,14 +196,16 @@ HRESULT GetOptionalSizePropertyValue(const ComPtr<ABI::Windows::Foundation::Coll
>         result = propertyValue->get_Type(&propertyType);
> 
>         // Check if the expected Size property is of PropertyType_Size type.
>-        if (SUCCEEDED(result) && propertyType == ABI::Windows::Foundation::PropertyType::PropertyType_Size)
>+        if (SUCCEEDED(result) &&
>+            propertyType == ABI::Windows::Foundation::PropertyType::PropertyType_Size)
>         {
>-            if (SUCCEEDED(propertyValue->GetSize(&sizeValue)) && (sizeValue.Width > 0 && sizeValue.Height > 0))
>+            if (SUCCEEDED(propertyValue->GetSize(&sizeValue)) &&
>+                (sizeValue.Width > 0 && sizeValue.Height > 0))
>             {
>                 // A valid property value exists
>-                *value = { static_cast<long>(sizeValue.Width), static_cast<long>(sizeValue.Height) };
>+                *value = {static_cast<long>(sizeValue.Width), static_cast<long>(sizeValue.Height)};
>                 *valueExists = true;
>-                result = S_OK;
>+                result       = S_OK;
>             }
>             else
>             {
>@@ -220,13 +235,17 @@ HRESULT GetOptionalSizePropertyValue(const ComPtr<ABI::Windows::Foundation::Coll
> //    * Invalid property value (must be > 0)
> // Additional errors may be returned from IMap or IPropertyValue
> //
>-HRESULT GetOptionalSinglePropertyValue(const ComPtr<ABI::Windows::Foundation::Collections::IMap<HSTRING, IInspectable*>> &propertyMap,
>-                                       const wchar_t *propertyName, float *value, bool *valueExists)
>+HRESULT GetOptionalSinglePropertyValue(
>+    const ComPtr<ABI::Windows::Foundation::Collections::IMap<HSTRING, IInspectable *>> &propertyMap,
>+    const wchar_t *propertyName,
>+    float *value,
>+    bool *valueExists)
> {
>     ComPtr<ABI::Windows::Foundation::IPropertyValue> propertyValue;
>-    ABI::Windows::Foundation::PropertyType propertyType = ABI::Windows::Foundation::PropertyType::PropertyType_Empty;
>+    ABI::Windows::Foundation::PropertyType propertyType =
>+        ABI::Windows::Foundation::PropertyType::PropertyType_Empty;
>     float scaleValue = 0.0f;
>-    boolean hasKey = false;
>+    boolean hasKey   = false;
> 
>     if (!propertyMap || !value || !valueExists)
>     {
>@@ -235,7 +254,7 @@ HRESULT GetOptionalSinglePropertyValue(const ComPtr<ABI::Windows::Foundation::Co
> 
>     // Assume that the value does not exist
>     *valueExists = false;
>-    *value = 0.0f;
>+    *value       = 0.0f;
> 
>     HRESULT result = GetOptionalPropertyValue(propertyMap, propertyName, &hasKey, propertyValue);
>     if (SUCCEEDED(result) && hasKey)
>@@ -243,14 +262,15 @@ HRESULT GetOptionalSinglePropertyValue(const ComPtr<ABI::Windows::Foundation::Co
>         result = propertyValue->get_Type(&propertyType);
> 
>         // Check if the expected Scale property is of PropertyType_Single type.
>-        if (SUCCEEDED(result) && propertyType == ABI::Windows::Foundation::PropertyType::PropertyType_Single)
>+        if (SUCCEEDED(result) &&
>+            propertyType == ABI::Windows::Foundation::PropertyType::PropertyType_Single)
>         {
>             if (SUCCEEDED(propertyValue->GetSingle(&scaleValue)) && (scaleValue > 0.0f))
>             {
>                 // A valid property value exists
>-                *value = scaleValue;
>+                *value       = scaleValue;
>                 *valueExists = true;
>-                result = S_OK;
>+                result       = S_OK;
>             }
>             else
>             {
>@@ -274,4 +294,4 @@ RECT InspectableNativeWindow::clientRect(const Size &size)
>     // which will have no effect.
>     return {0, 0, lround(size.Width * mSwapChainScale), lround(size.Height * mSwapChainScale)};
> }
>-}
>+}  // namespace rx
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/winrt/InspectableNativeWindow.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/winrt/InspectableNativeWindow.h
>index 3e67269f369..708e8a21282 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/winrt/InspectableNativeWindow.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/winrt/InspectableNativeWindow.h
>@@ -33,18 +33,18 @@ namespace rx
> class InspectableNativeWindow
> {
>   public:
>-    InspectableNativeWindow() :
>-        mSupportsSwapChainResize(true),
>-        mSwapChainSizeSpecified(false),
>-        mSwapChainScaleSpecified(false),
>-        mSwapChainScale(1.0f),
>-        mClientRectChanged(false),
>-        mClientRect({0,0,0,0}),
>-        mNewClientRect({0,0,0,0})
>+    InspectableNativeWindow()
>+        : mSupportsSwapChainResize(true),
>+          mSwapChainSizeSpecified(false),
>+          mSwapChainScaleSpecified(false),
>+          mSwapChainScale(1.0f),
>+          mClientRectChanged(false),
>+          mClientRect({0, 0, 0, 0}),
>+          mNewClientRect({0, 0, 0, 0})
>     {
>         mSizeChangedEventToken.value = 0;
>     }
>-    virtual ~InspectableNativeWindow(){}
>+    virtual ~InspectableNativeWindow() {}
> 
>     virtual bool initialize(EGLNativeWindowType window, IPropertySet *propertySet) = 0;
>     virtual HRESULT createSwapChain(ID3D11Device *device,
>@@ -53,7 +53,7 @@ class InspectableNativeWindow
>                                     unsigned int width,
>                                     unsigned int height,
>                                     bool containsAlpha,
>-                                    IDXGISwapChain1 **swapChain) = 0;
>+                                    IDXGISwapChain1 **swapChain)                   = 0;
> 
>     bool getClientRect(RECT *rect)
>     {
>@@ -67,10 +67,12 @@ class InspectableNativeWindow
>         return true;
>     }
> 
>-    // setNewClientSize is used by the WinRT size change handler. It isn't used by the rest of ANGLE.
>+    // setNewClientSize is used by the WinRT size change handler. It isn't used by the rest of
>+    // ANGLE.
>     void setNewClientSize(const Size &newWindowSize)
>     {
>-        // If the client doesn't support swapchain resizing then we should have already unregistered from size change handler
>+        // If the client doesn't support swapchain resizing then we should have already unregistered
>+        // from size change handler
>         ASSERT(mSupportsSwapChainResize);
> 
>         if (mSupportsSwapChainResize)
>@@ -81,7 +83,8 @@ class InspectableNativeWindow
>                 mNewClientRect     = clientRect(newWindowSize);
>                 mClientRectChanged = true;
> 
>-                // If a scale was specified, then now is the time to apply the scale matrix for the new swapchain size and window size
>+                // If a scale was specified, then now is the time to apply the scale matrix for the
>+                // new swapchain size and window size
>                 if (mSwapChainScaleSpecified)
>                 {
>                     scaleSwapChain(newWindowSize, mNewClientRect);
>@@ -89,7 +92,8 @@ class InspectableNativeWindow
>             }
> 
>             // Even if the swapchain size was fixed, the window might have changed size.
>-            // In this case, we should recalculate the scale matrix to account for the new window size
>+            // In this case, we should recalculate the scale matrix to account for the new window
>+            // size
>             if (mSwapChainSizeSpecified)
>             {
>                 scaleSwapChain(newWindowSize, mClientRect);
>@@ -101,10 +105,11 @@ class InspectableNativeWindow
>     virtual HRESULT scaleSwapChain(const Size &windowSize, const RECT &clientRect) = 0;
>     RECT clientRect(const Size &size);
> 
>-    bool mSupportsSwapChainResize; // Support for IDXGISwapChain::ResizeBuffers method
>-    bool mSwapChainSizeSpecified;  // If an EGLRenderSurfaceSizeProperty was specified
>-    bool mSwapChainScaleSpecified; // If an EGLRenderResolutionScaleProperty was specified
>-    float mSwapChainScale;         // The scale value specified by the EGLRenderResolutionScaleProperty property
>+    bool mSupportsSwapChainResize;  // Support for IDXGISwapChain::ResizeBuffers method
>+    bool mSwapChainSizeSpecified;   // If an EGLRenderSurfaceSizeProperty was specified
>+    bool mSwapChainScaleSpecified;  // If an EGLRenderResolutionScaleProperty was specified
>+    float mSwapChainScale;  // The scale value specified by the EGLRenderResolutionScaleProperty
>+                            // property
>     RECT mClientRect;
>     RECT mNewClientRect;
>     bool mClientRectChanged;
>@@ -112,20 +117,33 @@ class InspectableNativeWindow
>     EventRegistrationToken mSizeChangedEventToken;
> };
> 
>-bool IsCoreWindow(EGLNativeWindowType window, ComPtr<ABI::Windows::UI::Core::ICoreWindow> *coreWindow = nullptr);
>-bool IsSwapChainPanel(EGLNativeWindowType window, ComPtr<ABI::Windows::UI::Xaml::Controls::ISwapChainPanel> *swapChainPanel = nullptr);
>-bool IsEGLConfiguredPropertySet(EGLNativeWindowType window, ABI::Windows::Foundation::Collections::IPropertySet **propertySet = nullptr, IInspectable **inspectable = nullptr);
>-
>-HRESULT GetOptionalPropertyValue(const ComPtr<ABI::Windows::Foundation::Collections::IMap<HSTRING, IInspectable*>> &propertyMap,
>-                                 const wchar_t *propertyName,
>-                                 boolean *hasKey,
>-                                 ComPtr<ABI::Windows::Foundation::IPropertyValue> &propertyValue);
>-
>-HRESULT GetOptionalSizePropertyValue(const ComPtr<ABI::Windows::Foundation::Collections::IMap<HSTRING, IInspectable*>> &propertyMap,
>-                                     const wchar_t *propertyName, SIZE *value, bool *valueExists);
>-
>-HRESULT GetOptionalSinglePropertyValue(const ComPtr<ABI::Windows::Foundation::Collections::IMap<HSTRING, IInspectable*>> &propertyMap,
>-                                       const wchar_t *propertyName, float *value, bool *valueExists);
>-}
>-
>-#endif // LIBANGLE_RENDERER_D3D_D3D11_WINRT_INSPECTABLENATIVEWINDOW_H_
>+bool IsCoreWindow(EGLNativeWindowType window,
>+                  ComPtr<ABI::Windows::UI::Core::ICoreWindow> *coreWindow = nullptr);
>+bool IsSwapChainPanel(
>+    EGLNativeWindowType window,
>+    ComPtr<ABI::Windows::UI::Xaml::Controls::ISwapChainPanel> *swapChainPanel = nullptr);
>+bool IsEGLConfiguredPropertySet(
>+    EGLNativeWindowType window,
>+    ABI::Windows::Foundation::Collections::IPropertySet **propertySet = nullptr,
>+    IInspectable **inspectable                                        = nullptr);
>+
>+HRESULT GetOptionalPropertyValue(
>+    const ComPtr<ABI::Windows::Foundation::Collections::IMap<HSTRING, IInspectable *>> &propertyMap,
>+    const wchar_t *propertyName,
>+    boolean *hasKey,
>+    ComPtr<ABI::Windows::Foundation::IPropertyValue> &propertyValue);
>+
>+HRESULT GetOptionalSizePropertyValue(
>+    const ComPtr<ABI::Windows::Foundation::Collections::IMap<HSTRING, IInspectable *>> &propertyMap,
>+    const wchar_t *propertyName,
>+    SIZE *value,
>+    bool *valueExists);
>+
>+HRESULT GetOptionalSinglePropertyValue(
>+    const ComPtr<ABI::Windows::Foundation::Collections::IMap<HSTRING, IInspectable *>> &propertyMap,
>+    const wchar_t *propertyName,
>+    float *value,
>+    bool *valueExists);
>+}  // namespace rx
>+
>+#endif  // LIBANGLE_RENDERER_D3D_D3D11_WINRT_INSPECTABLENATIVEWINDOW_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/winrt/NativeWindow11WinRT.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/winrt/NativeWindow11WinRT.cpp
>index 2ef2235c899..8972ca2279a 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/winrt/NativeWindow11WinRT.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/winrt/NativeWindow11WinRT.cpp
>@@ -20,8 +20,7 @@ namespace rx
> {
> NativeWindow11WinRT::NativeWindow11WinRT(EGLNativeWindowType window, bool hasAlpha)
>     : NativeWindow11(window), mHasAlpha(hasAlpha)
>-{
>-}
>+{}
> 
> bool NativeWindow11WinRT::initialize()
> {
>@@ -105,9 +104,7 @@ HRESULT NativeWindow11WinRT::createSwapChain(ID3D11Device *device,
>     return E_UNEXPECTED;
> }
> 
>-void NativeWindow11WinRT::commitChange()
>-{
>-}
>+void NativeWindow11WinRT::commitChange() {}
> 
> // static
> bool NativeWindow11WinRT::IsValidNativeWindow(EGLNativeWindowType window)
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/winrt/NativeWindow11WinRT.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/winrt/NativeWindow11WinRT.h
>index 996fd3a1065..eac5b21b7c7 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/winrt/NativeWindow11WinRT.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/winrt/NativeWindow11WinRT.h
>@@ -11,10 +11,10 @@
> 
> #include "libANGLE/renderer/d3d/d3d11/NativeWindow11.h"
> 
>-#include <memory>
> #include <windows.applicationmodel.core.h>
> #include <wrl.h>
> #include <wrl/wrappers/corewrappers.h>
>+#include <memory>
> 
> namespace rx
> {
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/winrt/SwapChainPanelNativeWindow.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/winrt/SwapChainPanelNativeWindow.cpp
>index c6d07fc888e..af0beb63596 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/winrt/SwapChainPanelNativeWindow.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/winrt/SwapChainPanelNativeWindow.cpp
>@@ -8,8 +8,8 @@
> 
> #include "libANGLE/renderer/d3d/d3d11/winrt/SwapChainPanelNativeWindow.h"
> 
>-#include <algorithm>
> #include <math.h>
>+#include <algorithm>
> 
> using namespace ABI::Windows::Foundation;
> using namespace ABI::Windows::Foundation::Collections;
>@@ -58,12 +58,11 @@ HRESULT RunOnUIThread(CODE &&code, const ComPtr<ICoreDispatcher> &dispatcher)
> 
>         HRESULT codeResult = E_FAIL;
>         auto handler =
>-            Callback<AddFtmBase<IDispatchedHandler>::Type>([&codeResult, &code, &waitEvent]
>-                                                           {
>-                                                               codeResult = code();
>-                                                               SetEvent(waitEvent.Get());
>-                                                               return S_OK;
>-                                                           });
>+            Callback<AddFtmBase<IDispatchedHandler>::Type>([&codeResult, &code, &waitEvent] {
>+                codeResult = code();
>+                SetEvent(waitEvent.Get());
>+                return S_OK;
>+            });
> 
>         result = dispatcher->RunAsync(CoreDispatcherPriority_Normal, handler.Get(),
>                                       asyncAction.GetAddressOf());
>@@ -92,9 +91,9 @@ HRESULT RunOnUIThread(CODE &&code, const ComPtr<ICoreDispatcher> &dispatcher)
> bool SwapChainPanelNativeWindow::initialize(EGLNativeWindowType window, IPropertySet *propertySet)
> {
>     ComPtr<IPropertySet> props = propertySet;
>-    ComPtr<IInspectable> win = window;
>-    SIZE swapChainSize = {};
>-    HRESULT result = S_OK;
>+    ComPtr<IInspectable> win   = window;
>+    SIZE swapChainSize         = {};
>+    HRESULT result             = S_OK;
> 
>     // IPropertySet is an optional parameter and can be null.
>     // If one is specified, cache as an IMap and read the properties
>@@ -110,7 +109,8 @@ bool SwapChainPanelNativeWindow::initialize(EGLNativeWindowType window, IPropert
>         // The EGLRenderSurfaceSizeProperty is optional and may be missing. The IPropertySet
>         // was prevalidated to contain the EGLNativeWindowType before being passed to
>         // this host.
>-        result = GetOptionalSizePropertyValue(mPropertyMap, EGLRenderSurfaceSizeProperty, &swapChainSize, &mSwapChainSizeSpecified);
>+        result = GetOptionalSizePropertyValue(mPropertyMap, EGLRenderSurfaceSizeProperty,
>+                                              &swapChainSize, &mSwapChainSizeSpecified);
>         if (FAILED(result))
>         {
>             return false;
>@@ -119,7 +119,8 @@ bool SwapChainPanelNativeWindow::initialize(EGLNativeWindowType window, IPropert
>         // The EGLRenderResolutionScaleProperty is optional and may be missing. The IPropertySet
>         // was prevalidated to contain the EGLNativeWindowType before being passed to
>         // this host.
>-        result = GetOptionalSinglePropertyValue(mPropertyMap, EGLRenderResolutionScaleProperty, &mSwapChainScale, &mSwapChainScaleSpecified);
>+        result = GetOptionalSinglePropertyValue(mPropertyMap, EGLRenderResolutionScaleProperty,
>+                                                &mSwapChainScale, &mSwapChainScaleSpecified);
>         if (FAILED(result))
>         {
>             return false;
>@@ -131,7 +132,8 @@ bool SwapChainPanelNativeWindow::initialize(EGLNativeWindowType window, IPropert
>             mSwapChainScale = 1.0f;
>         }
> 
>-        // A EGLRenderSurfaceSizeProperty and a EGLRenderResolutionScaleProperty can't both be specified
>+        // A EGLRenderSurfaceSizeProperty and a EGLRenderResolutionScaleProperty can't both be
>+        // specified
>         if (mSwapChainScaleSpecified && mSwapChainSizeSpecified)
>         {
>             ERR() << "It is invalid to specify both an EGLRenderSurfaceSizeProperty and a "
>@@ -168,7 +170,7 @@ bool SwapChainPanelNativeWindow::initialize(EGLNativeWindowType window, IPropert
>         // DXGI_SCALING_STRETCH is configured on the swapchain.
>         if (mSwapChainSizeSpecified)
>         {
>-            mClientRect = { 0, 0, swapChainSize.cx, swapChainSize.cy };
>+            mClientRect = {0, 0, swapChainSize.cx, swapChainSize.cy};
>         }
>         else
>         {
>@@ -186,7 +188,7 @@ bool SwapChainPanelNativeWindow::initialize(EGLNativeWindowType window, IPropert
> 
>     if (SUCCEEDED(result))
>     {
>-        mNewClientRect = mClientRect;
>+        mNewClientRect     = mClientRect;
>         mClientRectChanged = false;
>         return registerForSizeChangeEvents();
>     }
>@@ -198,7 +200,8 @@ bool SwapChainPanelNativeWindow::registerForSizeChangeEvents()
> {
>     ComPtr<ISizeChangedEventHandler> sizeChangedHandler;
>     ComPtr<IFrameworkElement> frameworkElement;
>-    HRESULT result = Microsoft::WRL::MakeAndInitialize<SwapChainPanelSizeChangedHandler>(sizeChangedHandler.ReleaseAndGetAddressOf(), this->shared_from_this());
>+    HRESULT result = Microsoft::WRL::MakeAndInitialize<SwapChainPanelSizeChangedHandler>(
>+        sizeChangedHandler.ReleaseAndGetAddressOf(), this->shared_from_this());
> 
>     if (SUCCEEDED(result))
>     {
>@@ -208,8 +211,7 @@ bool SwapChainPanelNativeWindow::registerForSizeChangeEvents()
>     if (SUCCEEDED(result))
>     {
>         result = RunOnUIThread(
>-            [this, frameworkElement, sizeChangedHandler]
>-            {
>+            [this, frameworkElement, sizeChangedHandler] {
>                 return frameworkElement->add_SizeChanged(sizeChangedHandler.Get(),
>                                                          &mSizeChangedEventToken);
>             },
>@@ -230,8 +232,7 @@ void SwapChainPanelNativeWindow::unregisterForSizeChangeEvents()
>     if (mSwapChainPanel && SUCCEEDED(mSwapChainPanel.As(&frameworkElement)))
>     {
>         RunOnUIThread(
>-            [this, frameworkElement]
>-            {
>+            [this, frameworkElement] {
>                 return frameworkElement->remove_SizeChanged(mSizeChangedEventToken);
>             },
>             mSwapChainPanelDispatcher);
>@@ -254,18 +255,18 @@ HRESULT SwapChainPanelNativeWindow::createSwapChain(ID3D11Device *device,
>         return E_INVALIDARG;
>     }
> 
>-    DXGI_SWAP_CHAIN_DESC1 swapChainDesc = { 0 };
>-    swapChainDesc.Width = width;
>-    swapChainDesc.Height = height;
>-    swapChainDesc.Format = format;
>-    swapChainDesc.Stereo = FALSE;
>-    swapChainDesc.SampleDesc.Count = 1;
>-    swapChainDesc.SampleDesc.Quality = 0;
>+    DXGI_SWAP_CHAIN_DESC1 swapChainDesc = {0};
>+    swapChainDesc.Width                 = width;
>+    swapChainDesc.Height                = height;
>+    swapChainDesc.Format                = format;
>+    swapChainDesc.Stereo                = FALSE;
>+    swapChainDesc.SampleDesc.Count      = 1;
>+    swapChainDesc.SampleDesc.Quality    = 0;
>     swapChainDesc.BufferUsage =
>         DXGI_USAGE_SHADER_INPUT | DXGI_USAGE_RENDER_TARGET_OUTPUT | DXGI_USAGE_BACK_BUFFER;
>     swapChainDesc.BufferCount = 2;
>-    swapChainDesc.SwapEffect = DXGI_SWAP_EFFECT_FLIP_SEQUENTIAL;
>-    swapChainDesc.Scaling = DXGI_SCALING_STRETCH;
>+    swapChainDesc.SwapEffect  = DXGI_SWAP_EFFECT_FLIP_SEQUENTIAL;
>+    swapChainDesc.Scaling     = DXGI_SCALING_STRETCH;
>     swapChainDesc.AlphaMode =
>         containsAlpha ? DXGI_ALPHA_MODE_PREMULTIPLIED : DXGI_ALPHA_MODE_IGNORE;
> 
>@@ -275,7 +276,8 @@ HRESULT SwapChainPanelNativeWindow::createSwapChain(ID3D11Device *device,
>     ComPtr<ISwapChainPanelNative> swapChainPanelNative;
>     Size currentPanelSize = {};
> 
>-    HRESULT result = factory->CreateSwapChainForComposition(device, &swapChainDesc, nullptr, newSwapChain.ReleaseAndGetAddressOf());
>+    HRESULT result = factory->CreateSwapChainForComposition(device, &swapChainDesc, nullptr,
>+                                                            newSwapChain.ReleaseAndGetAddressOf());
> 
>     if (SUCCEEDED(result))
>     {
>@@ -285,8 +287,7 @@ HRESULT SwapChainPanelNativeWindow::createSwapChain(ID3D11Device *device,
>     if (SUCCEEDED(result))
>     {
>         result = RunOnUIThread(
>-            [swapChainPanelNative, newSwapChain]
>-            {
>+            [swapChainPanelNative, newSwapChain] {
>                 return swapChainPanelNative->SetSwapChain(newSwapChain.Get());
>             },
>             mSwapChainPanelDispatcher);
>@@ -298,7 +299,7 @@ HRESULT SwapChainPanelNativeWindow::createSwapChain(ID3D11Device *device,
>         // to perform the runtime-scale behavior.  This swapchain is cached here because there are
>         // no methods for retreiving the currently configured on from ISwapChainPanelNative.
>         mSwapChain = newSwapChain;
>-        result = newSwapChain.CopyTo(swapChain);
>+        result     = newSwapChain.CopyTo(swapChain);
>     }
> 
>     // If the host is responsible for scaling the output of the swapchain, then
>@@ -328,8 +329,8 @@ HRESULT SwapChainPanelNativeWindow::scaleSwapChain(const Size &windowSize, const
>                         windowSize.Height / (float)clientRect.bottom};
>     // Setup a scale matrix for the swap chain
>     DXGI_MATRIX_3X2_F scaleMatrix = {};
>-    scaleMatrix._11 = renderScale.Width;
>-    scaleMatrix._22 = renderScale.Height;
>+    scaleMatrix._11               = renderScale.Width;
>+    scaleMatrix._22               = renderScale.Height;
> 
>     ComPtr<IDXGISwapChain2> swapChain2;
>     HRESULT result = mSwapChain.As(&swapChain2);
>@@ -356,4 +357,4 @@ HRESULT GetSwapChainPanelSize(
> 
>     return result;
> }
>-}
>+}  // namespace rx
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/winrt/SwapChainPanelNativeWindow.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/winrt/SwapChainPanelNativeWindow.h
>index f9a2fc0e4b9..09642eec5a6 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/winrt/SwapChainPanelNativeWindow.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/winrt/SwapChainPanelNativeWindow.h
>@@ -15,7 +15,8 @@
> 
> namespace rx
> {
>-class SwapChainPanelNativeWindow : public InspectableNativeWindow, public std::enable_shared_from_this<SwapChainPanelNativeWindow>
>+class SwapChainPanelNativeWindow : public InspectableNativeWindow,
>+                                   public std::enable_shared_from_this<SwapChainPanelNativeWindow>
> {
>   public:
>     ~SwapChainPanelNativeWindow();
>@@ -38,16 +39,17 @@ class SwapChainPanelNativeWindow : public InspectableNativeWindow, public std::e
>   private:
>     ComPtr<ABI::Windows::UI::Xaml::Controls::ISwapChainPanel> mSwapChainPanel;
>     ComPtr<ABI::Windows::UI::Core::ICoreDispatcher> mSwapChainPanelDispatcher;
>-    ComPtr<IMap<HSTRING, IInspectable*>> mPropertyMap;
>+    ComPtr<IMap<HSTRING, IInspectable *>> mPropertyMap;
>     ComPtr<IDXGISwapChain1> mSwapChain;
> };
> 
>-[uuid(8ACBD974-8187-4508-AD80-AEC77F93CF36)]
>-class SwapChainPanelSizeChangedHandler :
>-    public Microsoft::WRL::RuntimeClass<Microsoft::WRL::RuntimeClassFlags<Microsoft::WRL::ClassicCom>, ABI::Windows::UI::Xaml::ISizeChangedEventHandler>
>+[uuid(8ACBD974 - 8187 - 4508 - AD80 - AEC77F93CF36)] class SwapChainPanelSizeChangedHandler
>+    : public Microsoft::WRL::RuntimeClass<
>+          Microsoft::WRL::RuntimeClassFlags<Microsoft::WRL::ClassicCom>,
>+          ABI::Windows::UI::Xaml::ISizeChangedEventHandler>
> {
>   public:
>-    SwapChainPanelSizeChangedHandler() { }
>+    SwapChainPanelSizeChangedHandler() {}
>     HRESULT RuntimeClassInitialize(std::shared_ptr<InspectableNativeWindow> host)
>     {
>         if (!host)
>@@ -60,7 +62,8 @@ class SwapChainPanelSizeChangedHandler :
>     }
> 
>     // ISizeChangedEventHandler
>-    IFACEMETHOD(Invoke)(IInspectable *sender, ABI::Windows::UI::Xaml::ISizeChangedEventArgs *sizeChangedEventArgs)
>+    IFACEMETHOD(Invoke)
>+    (IInspectable *sender, ABI::Windows::UI::Xaml::ISizeChangedEventArgs *sizeChangedEventArgs)
>     {
>         std::shared_ptr<InspectableNativeWindow> host = mHost.lock();
>         if (host)
>@@ -90,4 +93,4 @@ HRESULT GetSwapChainPanelSize(
>     const ComPtr<ABI::Windows::UI::Core::ICoreDispatcher> &dispatcher,
>     Size *windowSize);
> }
>-#endif // LIBANGLE_RENDERER_D3D_D3D11_WINRT_SWAPCHAINPANELNATIVEWINDOW_H_
>+#endif  // LIBANGLE_RENDERER_D3D_D3D11_WINRT_SWAPCHAINPANELNATIVEWINDOW_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/winrt/SwapChainPanelNativeWindow_unittest.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/winrt/SwapChainPanelNativeWindow_unittest.cpp
>index 6e20594f13d..54a403060b1 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/winrt/SwapChainPanelNativeWindow_unittest.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/winrt/SwapChainPanelNativeWindow_unittest.cpp
>@@ -15,10 +15,10 @@
> // set to WINAPI_FAMILY_DESKTOP_APP
> #undef WINAPI_FAMILY
> #define WINAPI_FAMILY WINAPI_FAMILY_PC_APP
>-#include "libANGLE/renderer/d3d/d3d11/NativeWindow.h"
> #include <angle_windowsstore.h>
> #include <windows.ui.xaml.h>
> #include <windows.ui.xaml.media.dxinterop.h>
>+#include "libANGLE/renderer/d3d/d3d11/NativeWindow.h"
> 
> using namespace rx;
> using namespace ABI::Windows::ApplicationModel::Core;
>@@ -37,60 +37,60 @@ namespace
> 
> // Mock ISwapChainPanel
> class MockSwapChainPanel : public ISwapChainPanel,
>-                                  IFrameworkElement,
>-                                  IUIElement,
>-                                  ISwapChainPanelNative
>+                           IFrameworkElement,
>+                           IUIElement,
>+                           ISwapChainPanelNative
> {
>   public:
>     // IUnknown
>-    STDMETHOD(QueryInterface)(REFIID riid, void** ppvObject)
>+    STDMETHOD(QueryInterface)(REFIID riid, void **ppvObject)
>     {
>         *ppvObject = nullptr;
> 
>         if (IsEqualIID(IID_IUnknown, riid))
>         {
>-            *ppvObject = reinterpret_cast<IUnknown*>(this);
>+            *ppvObject = reinterpret_cast<IUnknown *>(this);
>             return S_OK;
>         }
> 
>         if (IsEqualIID(IID_IInspectable, riid))
>         {
>-            *ppvObject = reinterpret_cast<IInspectable*>(this);
>+            *ppvObject = reinterpret_cast<IInspectable *>(this);
>             return S_OK;
>         }
> 
>         if (IsEqualIID(IID_ISwapChainPanel, riid))
>         {
>-            *ppvObject = static_cast<ISwapChainPanel*>(this);
>+            *ppvObject = static_cast<ISwapChainPanel *>(this);
>             return S_OK;
>         }
> 
>         if (IsEqualIID(IID_IFrameworkElement, riid))
>         {
>-            *ppvObject = static_cast<IFrameworkElement*>(this);
>+            *ppvObject = static_cast<IFrameworkElement *>(this);
>             return S_OK;
>         }
> 
>         if (IsEqualIID(IID_IUIElement, riid))
>         {
>-            *ppvObject = static_cast<IUIElement*>(this);
>+            *ppvObject = static_cast<IUIElement *>(this);
>             return S_OK;
>         }
> 
>         if (IsEqualIID(__uuidof(ISwapChainPanelNative), riid))
>         {
>-            *ppvObject = static_cast<ISwapChainPanelNative*>(this);
>+            *ppvObject = static_cast<ISwapChainPanelNative *>(this);
>             return S_OK;
>         }
> 
>         return E_NOINTERFACE;
>     }
> 
>-    STDMETHOD_(ULONG, AddRef)(){ return 1; }
>-    STDMETHOD_(ULONG, Release)(){ return 1; }
>+    STDMETHOD_(ULONG, AddRef)() { return 1; }
>+    STDMETHOD_(ULONG, Release)() { return 1; }
> 
>     // IInspectable
>-    MOCK_METHOD2_WITH_CALLTYPE(STDMETHODCALLTYPE, GetIids, HRESULT(ULONG *, IID**));
>+    MOCK_METHOD2_WITH_CALLTYPE(STDMETHODCALLTYPE, GetIids, HRESULT(ULONG *, IID **));
>     MOCK_METHOD1_WITH_CALLTYPE(STDMETHODCALLTYPE, GetRuntimeClassName, HRESULT(HSTRING *));
>     MOCK_METHOD1_WITH_CALLTYPE(STDMETHODCALLTYPE, GetTrustLevel, HRESULT(TrustLevel *));
> 
>@@ -100,12 +100,23 @@ class MockSwapChainPanel : public ISwapChainPanel,
>     // ISwapChainPanel
>     MOCK_METHOD1_WITH_CALLTYPE(STDMETHODCALLTYPE, get_CompositionScaleX, HRESULT(FLOAT *));
>     MOCK_METHOD1_WITH_CALLTYPE(STDMETHODCALLTYPE, get_CompositionScaleY, HRESULT(FLOAT *));
>-    MOCK_METHOD2_WITH_CALLTYPE(STDMETHODCALLTYPE, add_CompositionScaleChanged, HRESULT(__FITypedEventHandler_2_Windows__CUI__CXaml__CControls__CSwapChainPanel_IInspectable*, EventRegistrationToken*));
>-    MOCK_METHOD1_WITH_CALLTYPE(STDMETHODCALLTYPE, remove_CompositionScaleChanged, HRESULT(EventRegistrationToken));
>-    MOCK_METHOD2_WITH_CALLTYPE(STDMETHODCALLTYPE, CreateCoreIndependentInputSource, HRESULT(CoreInputDeviceTypes, ICoreInputSourceBase**));
>+    MOCK_METHOD2_WITH_CALLTYPE(
>+        STDMETHODCALLTYPE,
>+        add_CompositionScaleChanged,
>+        HRESULT(
>+            __FITypedEventHandler_2_Windows__CUI__CXaml__CControls__CSwapChainPanel_IInspectable *,
>+            EventRegistrationToken *));
>+    MOCK_METHOD1_WITH_CALLTYPE(STDMETHODCALLTYPE,
>+                               remove_CompositionScaleChanged,
>+                               HRESULT(EventRegistrationToken));
>+    MOCK_METHOD2_WITH_CALLTYPE(STDMETHODCALLTYPE,
>+                               CreateCoreIndependentInputSource,
>+                               HRESULT(CoreInputDeviceTypes, ICoreInputSourceBase **));
> 
>     // IFrameworkElement
>-    MOCK_METHOD1_WITH_CALLTYPE(STDMETHODCALLTYPE, get_Triggers, HRESULT(__FIVector_1_Windows__CUI__CXaml__CTriggerBase **));
>+    MOCK_METHOD1_WITH_CALLTYPE(STDMETHODCALLTYPE,
>+                               get_Triggers,
>+                               HRESULT(__FIVector_1_Windows__CUI__CXaml__CTriggerBase **));
>     MOCK_METHOD1_WITH_CALLTYPE(STDMETHODCALLTYPE, get_Resources, HRESULT(IResourceDictionary **));
>     MOCK_METHOD1_WITH_CALLTYPE(STDMETHODCALLTYPE, put_Resources, HRESULT(IResourceDictionary *));
>     MOCK_METHOD1_WITH_CALLTYPE(STDMETHODCALLTYPE, get_Tag, HRESULT(IInspectable **));
>@@ -126,13 +137,21 @@ class MockSwapChainPanel : public ISwapChainPanel,
>     MOCK_METHOD1_WITH_CALLTYPE(STDMETHODCALLTYPE, put_MinHeight, HRESULT(DOUBLE));
>     MOCK_METHOD1_WITH_CALLTYPE(STDMETHODCALLTYPE, get_MaxHeight, HRESULT(DOUBLE *));
>     MOCK_METHOD1_WITH_CALLTYPE(STDMETHODCALLTYPE, put_MaxHeight, HRESULT(DOUBLE));
>-    MOCK_METHOD1_WITH_CALLTYPE(STDMETHODCALLTYPE, get_HorizontalAlignment, HRESULT(HorizontalAlignment *));
>-    MOCK_METHOD1_WITH_CALLTYPE(STDMETHODCALLTYPE, put_HorizontalAlignment, HRESULT(HorizontalAlignment));
>-    MOCK_METHOD1_WITH_CALLTYPE(STDMETHODCALLTYPE, get_VerticalAlignment, HRESULT(VerticalAlignment *));
>-    MOCK_METHOD1_WITH_CALLTYPE(STDMETHODCALLTYPE, put_VerticalAlignment, HRESULT(VerticalAlignment));
>+    MOCK_METHOD1_WITH_CALLTYPE(STDMETHODCALLTYPE,
>+                               get_HorizontalAlignment,
>+                               HRESULT(HorizontalAlignment *));
>+    MOCK_METHOD1_WITH_CALLTYPE(STDMETHODCALLTYPE,
>+                               put_HorizontalAlignment,
>+                               HRESULT(HorizontalAlignment));
>+    MOCK_METHOD1_WITH_CALLTYPE(STDMETHODCALLTYPE,
>+                               get_VerticalAlignment,
>+                               HRESULT(VerticalAlignment *));
>+    MOCK_METHOD1_WITH_CALLTYPE(STDMETHODCALLTYPE,
>+                               put_VerticalAlignment,
>+                               HRESULT(VerticalAlignment));
>     MOCK_METHOD1_WITH_CALLTYPE(STDMETHODCALLTYPE, get_Margin, HRESULT(Thickness *));
>     MOCK_METHOD1_WITH_CALLTYPE(STDMETHODCALLTYPE, put_Margin, HRESULT(Thickness));
>-    MOCK_METHOD1_WITH_CALLTYPE(STDMETHODCALLTYPE, get_Name, HRESULT(HSTRING*));
>+    MOCK_METHOD1_WITH_CALLTYPE(STDMETHODCALLTYPE, get_Name, HRESULT(HSTRING *));
>     MOCK_METHOD1_WITH_CALLTYPE(STDMETHODCALLTYPE, put_Name, HRESULT(HSTRING));
>     MOCK_METHOD1_WITH_CALLTYPE(STDMETHODCALLTYPE, get_BaseUri, HRESULT(IUriRuntimeClass **));
>     MOCK_METHOD1_WITH_CALLTYPE(STDMETHODCALLTYPE, get_DataContext, HRESULT(IInspectable **));
>@@ -142,19 +161,36 @@ class MockSwapChainPanel : public ISwapChainPanel,
>     MOCK_METHOD1_WITH_CALLTYPE(STDMETHODCALLTYPE, get_Parent, HRESULT(IDependencyObject **));
>     MOCK_METHOD1_WITH_CALLTYPE(STDMETHODCALLTYPE, get_FlowDirection, HRESULT(FlowDirection *));
>     MOCK_METHOD1_WITH_CALLTYPE(STDMETHODCALLTYPE, put_FlowDirection, HRESULT(FlowDirection));
>-    MOCK_METHOD2_WITH_CALLTYPE(STDMETHODCALLTYPE, add_Loaded, HRESULT(IRoutedEventHandler *, EventRegistrationToken *));
>+    MOCK_METHOD2_WITH_CALLTYPE(STDMETHODCALLTYPE,
>+                               add_Loaded,
>+                               HRESULT(IRoutedEventHandler *, EventRegistrationToken *));
>     MOCK_METHOD1_WITH_CALLTYPE(STDMETHODCALLTYPE, remove_Loaded, HRESULT(EventRegistrationToken));
>-    MOCK_METHOD2_WITH_CALLTYPE(STDMETHODCALLTYPE, add_Unloaded, HRESULT(IRoutedEventHandler *, EventRegistrationToken *));
>+    MOCK_METHOD2_WITH_CALLTYPE(STDMETHODCALLTYPE,
>+                               add_Unloaded,
>+                               HRESULT(IRoutedEventHandler *, EventRegistrationToken *));
>     MOCK_METHOD1_WITH_CALLTYPE(STDMETHODCALLTYPE, remove_Unloaded, HRESULT(EventRegistrationToken));
>-    MOCK_METHOD2_WITH_CALLTYPE(STDMETHODCALLTYPE, add_SizeChanged, HRESULT(ISizeChangedEventHandler *, EventRegistrationToken *));
>-    MOCK_METHOD1_WITH_CALLTYPE(STDMETHODCALLTYPE, remove_SizeChanged, HRESULT(EventRegistrationToken));
>-    MOCK_METHOD2_WITH_CALLTYPE(STDMETHODCALLTYPE, add_LayoutUpdated, HRESULT(__FIEventHandler_1_IInspectable *, EventRegistrationToken *));
>-    MOCK_METHOD1_WITH_CALLTYPE(STDMETHODCALLTYPE, remove_LayoutUpdated, HRESULT(EventRegistrationToken));
>+    MOCK_METHOD2_WITH_CALLTYPE(STDMETHODCALLTYPE,
>+                               add_SizeChanged,
>+                               HRESULT(ISizeChangedEventHandler *, EventRegistrationToken *));
>+    MOCK_METHOD1_WITH_CALLTYPE(STDMETHODCALLTYPE,
>+                               remove_SizeChanged,
>+                               HRESULT(EventRegistrationToken));
>+    MOCK_METHOD2_WITH_CALLTYPE(STDMETHODCALLTYPE,
>+                               add_LayoutUpdated,
>+                               HRESULT(__FIEventHandler_1_IInspectable *,
>+                                       EventRegistrationToken *));
>+    MOCK_METHOD1_WITH_CALLTYPE(STDMETHODCALLTYPE,
>+                               remove_LayoutUpdated,
>+                               HRESULT(EventRegistrationToken));
>     MOCK_METHOD2_WITH_CALLTYPE(STDMETHODCALLTYPE, FindName, HRESULT(HSTRING, IInspectable **));
>-    MOCK_METHOD2_WITH_CALLTYPE(STDMETHODCALLTYPE, SetBinding, HRESULT(IDependencyProperty *, IBindingBase *));
>+    MOCK_METHOD2_WITH_CALLTYPE(STDMETHODCALLTYPE,
>+                               SetBinding,
>+                               HRESULT(IDependencyProperty *, IBindingBase *));
> 
>     // IUIElement
>-    MOCK_METHOD1_WITH_CALLTYPE(STDMETHODCALLTYPE, get_DesiredSize, HRESULT(ABI::Windows::Foundation::Size *));
>+    MOCK_METHOD1_WITH_CALLTYPE(STDMETHODCALLTYPE,
>+                               get_DesiredSize,
>+                               HRESULT(ABI::Windows::Foundation::Size *));
>     MOCK_METHOD1_WITH_CALLTYPE(STDMETHODCALLTYPE, get_AllowDrop, HRESULT(boolean *));
>     MOCK_METHOD1_WITH_CALLTYPE(STDMETHODCALLTYPE, put_AllowDrop, HRESULT(boolean));
>     MOCK_METHOD1_WITH_CALLTYPE(STDMETHODCALLTYPE, get_Opacity, HRESULT(DOUBLE *));
>@@ -174,8 +210,14 @@ class MockSwapChainPanel : public ISwapChainPanel,
>     MOCK_METHOD1_WITH_CALLTYPE(STDMETHODCALLTYPE, get_RenderSize, HRESULT(Size *));
>     MOCK_METHOD1_WITH_CALLTYPE(STDMETHODCALLTYPE, get_UseLayoutRounding, HRESULT(boolean *));
>     MOCK_METHOD1_WITH_CALLTYPE(STDMETHODCALLTYPE, put_UseLayoutRounding, HRESULT(boolean));
>-    MOCK_METHOD1_WITH_CALLTYPE(STDMETHODCALLTYPE, get_Transitions, HRESULT(__FIVector_1_Windows__CUI__CXaml__CMedia__CAnimation__CTransition **));
>-    MOCK_METHOD1_WITH_CALLTYPE(STDMETHODCALLTYPE, put_Transitions, HRESULT(__FIVector_1_Windows__CUI__CXaml__CMedia__CAnimation__CTransition *));
>+    MOCK_METHOD1_WITH_CALLTYPE(
>+        STDMETHODCALLTYPE,
>+        get_Transitions,
>+        HRESULT(__FIVector_1_Windows__CUI__CXaml__CMedia__CAnimation__CTransition **));
>+    MOCK_METHOD1_WITH_CALLTYPE(
>+        STDMETHODCALLTYPE,
>+        put_Transitions,
>+        HRESULT(__FIVector_1_Windows__CUI__CXaml__CMedia__CAnimation__CTransition *));
>     MOCK_METHOD1_WITH_CALLTYPE(STDMETHODCALLTYPE, get_CacheMode, HRESULT(ICacheMode **));
>     MOCK_METHOD1_WITH_CALLTYPE(STDMETHODCALLTYPE, put_CacheMode, HRESULT(ICacheMode *));
>     MOCK_METHOD1_WITH_CALLTYPE(STDMETHODCALLTYPE, get_IsTapEnabled, HRESULT(boolean *));
>@@ -186,78 +228,180 @@ class MockSwapChainPanel : public ISwapChainPanel,
>     MOCK_METHOD1_WITH_CALLTYPE(STDMETHODCALLTYPE, put_IsRightTapEnabled, HRESULT(boolean));
>     MOCK_METHOD1_WITH_CALLTYPE(STDMETHODCALLTYPE, get_IsHoldingEnabled, HRESULT(boolean *));
>     MOCK_METHOD1_WITH_CALLTYPE(STDMETHODCALLTYPE, put_IsHoldingEnabled, HRESULT(boolean));
>-    MOCK_METHOD1_WITH_CALLTYPE(STDMETHODCALLTYPE, get_ManipulationMode, HRESULT(ManipulationModes *));
>+    MOCK_METHOD1_WITH_CALLTYPE(STDMETHODCALLTYPE,
>+                               get_ManipulationMode,
>+                               HRESULT(ManipulationModes *));
>     MOCK_METHOD1_WITH_CALLTYPE(STDMETHODCALLTYPE, put_ManipulationMode, HRESULT(ManipulationModes));
>-    MOCK_METHOD1_WITH_CALLTYPE(STDMETHODCALLTYPE, get_PointerCaptures, HRESULT(__FIVectorView_1_Windows__CUI__CXaml__CInput__CPointer **));
>-    MOCK_METHOD2_WITH_CALLTYPE(STDMETHODCALLTYPE, add_KeyUp, HRESULT(IKeyEventHandler *, EventRegistrationToken *));
>+    MOCK_METHOD1_WITH_CALLTYPE(STDMETHODCALLTYPE,
>+                               get_PointerCaptures,
>+                               HRESULT(__FIVectorView_1_Windows__CUI__CXaml__CInput__CPointer **));
>+    MOCK_METHOD2_WITH_CALLTYPE(STDMETHODCALLTYPE,
>+                               add_KeyUp,
>+                               HRESULT(IKeyEventHandler *, EventRegistrationToken *));
>     MOCK_METHOD1_WITH_CALLTYPE(STDMETHODCALLTYPE, remove_KeyUp, HRESULT(EventRegistrationToken));
>-    MOCK_METHOD2_WITH_CALLTYPE(STDMETHODCALLTYPE, add_KeyDown, HRESULT(IKeyEventHandler *, EventRegistrationToken *));
>+    MOCK_METHOD2_WITH_CALLTYPE(STDMETHODCALLTYPE,
>+                               add_KeyDown,
>+                               HRESULT(IKeyEventHandler *, EventRegistrationToken *));
>     MOCK_METHOD1_WITH_CALLTYPE(STDMETHODCALLTYPE, remove_KeyDown, HRESULT(EventRegistrationToken));
>-    MOCK_METHOD2_WITH_CALLTYPE(STDMETHODCALLTYPE, add_GotFocus, HRESULT(IRoutedEventHandler *, EventRegistrationToken *));
>+    MOCK_METHOD2_WITH_CALLTYPE(STDMETHODCALLTYPE,
>+                               add_GotFocus,
>+                               HRESULT(IRoutedEventHandler *, EventRegistrationToken *));
>     MOCK_METHOD1_WITH_CALLTYPE(STDMETHODCALLTYPE, remove_GotFocus, HRESULT(EventRegistrationToken));
>-    MOCK_METHOD2_WITH_CALLTYPE(STDMETHODCALLTYPE, add_LostFocus, HRESULT(IRoutedEventHandler *, EventRegistrationToken *));
>-    MOCK_METHOD1_WITH_CALLTYPE(STDMETHODCALLTYPE, remove_LostFocus, HRESULT(EventRegistrationToken));
>-    MOCK_METHOD2_WITH_CALLTYPE(STDMETHODCALLTYPE, add_DragEnter, HRESULT(IDragEventHandler *, EventRegistrationToken *));
>-    MOCK_METHOD1_WITH_CALLTYPE(STDMETHODCALLTYPE, remove_DragEnter, HRESULT(EventRegistrationToken));
>-    MOCK_METHOD2_WITH_CALLTYPE(STDMETHODCALLTYPE, add_DragLeave, HRESULT(IDragEventHandler *, EventRegistrationToken *));
>-    MOCK_METHOD1_WITH_CALLTYPE(STDMETHODCALLTYPE, remove_DragLeave, HRESULT(EventRegistrationToken));
>-    MOCK_METHOD2_WITH_CALLTYPE(STDMETHODCALLTYPE, add_DragOver, HRESULT(IDragEventHandler *, EventRegistrationToken *));
>+    MOCK_METHOD2_WITH_CALLTYPE(STDMETHODCALLTYPE,
>+                               add_LostFocus,
>+                               HRESULT(IRoutedEventHandler *, EventRegistrationToken *));
>+    MOCK_METHOD1_WITH_CALLTYPE(STDMETHODCALLTYPE,
>+                               remove_LostFocus,
>+                               HRESULT(EventRegistrationToken));
>+    MOCK_METHOD2_WITH_CALLTYPE(STDMETHODCALLTYPE,
>+                               add_DragEnter,
>+                               HRESULT(IDragEventHandler *, EventRegistrationToken *));
>+    MOCK_METHOD1_WITH_CALLTYPE(STDMETHODCALLTYPE,
>+                               remove_DragEnter,
>+                               HRESULT(EventRegistrationToken));
>+    MOCK_METHOD2_WITH_CALLTYPE(STDMETHODCALLTYPE,
>+                               add_DragLeave,
>+                               HRESULT(IDragEventHandler *, EventRegistrationToken *));
>+    MOCK_METHOD1_WITH_CALLTYPE(STDMETHODCALLTYPE,
>+                               remove_DragLeave,
>+                               HRESULT(EventRegistrationToken));
>+    MOCK_METHOD2_WITH_CALLTYPE(STDMETHODCALLTYPE,
>+                               add_DragOver,
>+                               HRESULT(IDragEventHandler *, EventRegistrationToken *));
>     MOCK_METHOD1_WITH_CALLTYPE(STDMETHODCALLTYPE, remove_DragOver, HRESULT(EventRegistrationToken));
>-    MOCK_METHOD2_WITH_CALLTYPE(STDMETHODCALLTYPE, add_Drop, HRESULT(IDragEventHandler *, EventRegistrationToken *));
>+    MOCK_METHOD2_WITH_CALLTYPE(STDMETHODCALLTYPE,
>+                               add_Drop,
>+                               HRESULT(IDragEventHandler *, EventRegistrationToken *));
>     MOCK_METHOD1_WITH_CALLTYPE(STDMETHODCALLTYPE, remove_Drop, HRESULT(EventRegistrationToken));
>-    MOCK_METHOD2_WITH_CALLTYPE(STDMETHODCALLTYPE, add_PointerPressed, HRESULT(IPointerEventHandler *, EventRegistrationToken *));
>-    MOCK_METHOD1_WITH_CALLTYPE(STDMETHODCALLTYPE, remove_PointerPressed, HRESULT(EventRegistrationToken));
>-    MOCK_METHOD2_WITH_CALLTYPE(STDMETHODCALLTYPE, add_PointerMoved, HRESULT(IPointerEventHandler *, EventRegistrationToken *));
>-    MOCK_METHOD1_WITH_CALLTYPE(STDMETHODCALLTYPE, remove_PointerMoved, HRESULT(EventRegistrationToken));
>-    MOCK_METHOD2_WITH_CALLTYPE(STDMETHODCALLTYPE, add_PointerReleased, HRESULT(IPointerEventHandler *, EventRegistrationToken *));
>-    MOCK_METHOD1_WITH_CALLTYPE(STDMETHODCALLTYPE, remove_PointerReleased, HRESULT(EventRegistrationToken));
>-    MOCK_METHOD2_WITH_CALLTYPE(STDMETHODCALLTYPE, add_PointerExited, HRESULT(IPointerEventHandler *, EventRegistrationToken *));
>-    MOCK_METHOD1_WITH_CALLTYPE(STDMETHODCALLTYPE, remove_PointerExited, HRESULT(EventRegistrationToken));
>-    MOCK_METHOD2_WITH_CALLTYPE(STDMETHODCALLTYPE, add_PointerCaptureLost, HRESULT(IPointerEventHandler *, EventRegistrationToken *));
>-    MOCK_METHOD1_WITH_CALLTYPE(STDMETHODCALLTYPE, remove_PointerCaptureLost, HRESULT(EventRegistrationToken));
>-    MOCK_METHOD2_WITH_CALLTYPE(STDMETHODCALLTYPE, add_PointerCanceled, HRESULT(IPointerEventHandler *, EventRegistrationToken *));
>-    MOCK_METHOD1_WITH_CALLTYPE(STDMETHODCALLTYPE, remove_PointerCanceled, HRESULT(EventRegistrationToken));
>-    MOCK_METHOD2_WITH_CALLTYPE(STDMETHODCALLTYPE, add_PointerWheelChanged, HRESULT(IPointerEventHandler *, EventRegistrationToken *));
>-    MOCK_METHOD1_WITH_CALLTYPE(STDMETHODCALLTYPE, remove_PointerWheelChanged, HRESULT(EventRegistrationToken));
>-    MOCK_METHOD2_WITH_CALLTYPE(STDMETHODCALLTYPE, add_PointerEntered, HRESULT(IPointerEventHandler *, EventRegistrationToken *));
>-    MOCK_METHOD1_WITH_CALLTYPE(STDMETHODCALLTYPE, remove_PointerEntered, HRESULT(EventRegistrationToken));
>-    MOCK_METHOD2_WITH_CALLTYPE(STDMETHODCALLTYPE, add_Tapped, HRESULT(ITappedEventHandler *, EventRegistrationToken *));
>+    MOCK_METHOD2_WITH_CALLTYPE(STDMETHODCALLTYPE,
>+                               add_PointerPressed,
>+                               HRESULT(IPointerEventHandler *, EventRegistrationToken *));
>+    MOCK_METHOD1_WITH_CALLTYPE(STDMETHODCALLTYPE,
>+                               remove_PointerPressed,
>+                               HRESULT(EventRegistrationToken));
>+    MOCK_METHOD2_WITH_CALLTYPE(STDMETHODCALLTYPE,
>+                               add_PointerMoved,
>+                               HRESULT(IPointerEventHandler *, EventRegistrationToken *));
>+    MOCK_METHOD1_WITH_CALLTYPE(STDMETHODCALLTYPE,
>+                               remove_PointerMoved,
>+                               HRESULT(EventRegistrationToken));
>+    MOCK_METHOD2_WITH_CALLTYPE(STDMETHODCALLTYPE,
>+                               add_PointerReleased,
>+                               HRESULT(IPointerEventHandler *, EventRegistrationToken *));
>+    MOCK_METHOD1_WITH_CALLTYPE(STDMETHODCALLTYPE,
>+                               remove_PointerReleased,
>+                               HRESULT(EventRegistrationToken));
>+    MOCK_METHOD2_WITH_CALLTYPE(STDMETHODCALLTYPE,
>+                               add_PointerExited,
>+                               HRESULT(IPointerEventHandler *, EventRegistrationToken *));
>+    MOCK_METHOD1_WITH_CALLTYPE(STDMETHODCALLTYPE,
>+                               remove_PointerExited,
>+                               HRESULT(EventRegistrationToken));
>+    MOCK_METHOD2_WITH_CALLTYPE(STDMETHODCALLTYPE,
>+                               add_PointerCaptureLost,
>+                               HRESULT(IPointerEventHandler *, EventRegistrationToken *));
>+    MOCK_METHOD1_WITH_CALLTYPE(STDMETHODCALLTYPE,
>+                               remove_PointerCaptureLost,
>+                               HRESULT(EventRegistrationToken));
>+    MOCK_METHOD2_WITH_CALLTYPE(STDMETHODCALLTYPE,
>+                               add_PointerCanceled,
>+                               HRESULT(IPointerEventHandler *, EventRegistrationToken *));
>+    MOCK_METHOD1_WITH_CALLTYPE(STDMETHODCALLTYPE,
>+                               remove_PointerCanceled,
>+                               HRESULT(EventRegistrationToken));
>+    MOCK_METHOD2_WITH_CALLTYPE(STDMETHODCALLTYPE,
>+                               add_PointerWheelChanged,
>+                               HRESULT(IPointerEventHandler *, EventRegistrationToken *));
>+    MOCK_METHOD1_WITH_CALLTYPE(STDMETHODCALLTYPE,
>+                               remove_PointerWheelChanged,
>+                               HRESULT(EventRegistrationToken));
>+    MOCK_METHOD2_WITH_CALLTYPE(STDMETHODCALLTYPE,
>+                               add_PointerEntered,
>+                               HRESULT(IPointerEventHandler *, EventRegistrationToken *));
>+    MOCK_METHOD1_WITH_CALLTYPE(STDMETHODCALLTYPE,
>+                               remove_PointerEntered,
>+                               HRESULT(EventRegistrationToken));
>+    MOCK_METHOD2_WITH_CALLTYPE(STDMETHODCALLTYPE,
>+                               add_Tapped,
>+                               HRESULT(ITappedEventHandler *, EventRegistrationToken *));
>     MOCK_METHOD1_WITH_CALLTYPE(STDMETHODCALLTYPE, remove_Tapped, HRESULT(EventRegistrationToken));
>-    MOCK_METHOD2_WITH_CALLTYPE(STDMETHODCALLTYPE, add_DoubleTapped, HRESULT(IDoubleTappedEventHandler *, EventRegistrationToken *));
>-    MOCK_METHOD1_WITH_CALLTYPE(STDMETHODCALLTYPE, remove_DoubleTapped, HRESULT(EventRegistrationToken));
>-    MOCK_METHOD2_WITH_CALLTYPE(STDMETHODCALLTYPE, add_Holding, HRESULT(IHoldingEventHandler *, EventRegistrationToken *));
>+    MOCK_METHOD2_WITH_CALLTYPE(STDMETHODCALLTYPE,
>+                               add_DoubleTapped,
>+                               HRESULT(IDoubleTappedEventHandler *, EventRegistrationToken *));
>+    MOCK_METHOD1_WITH_CALLTYPE(STDMETHODCALLTYPE,
>+                               remove_DoubleTapped,
>+                               HRESULT(EventRegistrationToken));
>+    MOCK_METHOD2_WITH_CALLTYPE(STDMETHODCALLTYPE,
>+                               add_Holding,
>+                               HRESULT(IHoldingEventHandler *, EventRegistrationToken *));
>     MOCK_METHOD1_WITH_CALLTYPE(STDMETHODCALLTYPE, remove_Holding, HRESULT(EventRegistrationToken));
>-    MOCK_METHOD2_WITH_CALLTYPE(STDMETHODCALLTYPE, add_RightTapped, HRESULT(IRightTappedEventHandler *, EventRegistrationToken *));
>-    MOCK_METHOD1_WITH_CALLTYPE(STDMETHODCALLTYPE, remove_RightTapped, HRESULT(EventRegistrationToken));
>-    MOCK_METHOD2_WITH_CALLTYPE(STDMETHODCALLTYPE, add_ManipulationStarting, HRESULT(IManipulationStartingEventHandler *, EventRegistrationToken *));
>-    MOCK_METHOD1_WITH_CALLTYPE(STDMETHODCALLTYPE, remove_ManipulationStarting, HRESULT(EventRegistrationToken));
>-    MOCK_METHOD2_WITH_CALLTYPE(STDMETHODCALLTYPE, add_ManipulationInertiaStarting, HRESULT(IManipulationInertiaStartingEventHandler *, EventRegistrationToken *));
>-    MOCK_METHOD1_WITH_CALLTYPE(STDMETHODCALLTYPE, remove_ManipulationInertiaStarting, HRESULT(EventRegistrationToken));
>-    MOCK_METHOD2_WITH_CALLTYPE(STDMETHODCALLTYPE, add_ManipulationStarted, HRESULT(IManipulationStartedEventHandler *, EventRegistrationToken *));
>-    MOCK_METHOD1_WITH_CALLTYPE(STDMETHODCALLTYPE, remove_ManipulationStarted, HRESULT(EventRegistrationToken));
>-    MOCK_METHOD2_WITH_CALLTYPE(STDMETHODCALLTYPE, add_ManipulationDelta, HRESULT(IManipulationDeltaEventHandler *, EventRegistrationToken *));
>-    MOCK_METHOD1_WITH_CALLTYPE(STDMETHODCALLTYPE, remove_ManipulationDelta, HRESULT(EventRegistrationToken));
>-    MOCK_METHOD2_WITH_CALLTYPE(STDMETHODCALLTYPE, add_ManipulationCompleted, HRESULT(IManipulationCompletedEventHandler *, EventRegistrationToken *));
>-    MOCK_METHOD1_WITH_CALLTYPE(STDMETHODCALLTYPE, remove_ManipulationCompleted, HRESULT(EventRegistrationToken));
>+    MOCK_METHOD2_WITH_CALLTYPE(STDMETHODCALLTYPE,
>+                               add_RightTapped,
>+                               HRESULT(IRightTappedEventHandler *, EventRegistrationToken *));
>+    MOCK_METHOD1_WITH_CALLTYPE(STDMETHODCALLTYPE,
>+                               remove_RightTapped,
>+                               HRESULT(EventRegistrationToken));
>+    MOCK_METHOD2_WITH_CALLTYPE(STDMETHODCALLTYPE,
>+                               add_ManipulationStarting,
>+                               HRESULT(IManipulationStartingEventHandler *,
>+                                       EventRegistrationToken *));
>+    MOCK_METHOD1_WITH_CALLTYPE(STDMETHODCALLTYPE,
>+                               remove_ManipulationStarting,
>+                               HRESULT(EventRegistrationToken));
>+    MOCK_METHOD2_WITH_CALLTYPE(STDMETHODCALLTYPE,
>+                               add_ManipulationInertiaStarting,
>+                               HRESULT(IManipulationInertiaStartingEventHandler *,
>+                                       EventRegistrationToken *));
>+    MOCK_METHOD1_WITH_CALLTYPE(STDMETHODCALLTYPE,
>+                               remove_ManipulationInertiaStarting,
>+                               HRESULT(EventRegistrationToken));
>+    MOCK_METHOD2_WITH_CALLTYPE(STDMETHODCALLTYPE,
>+                               add_ManipulationStarted,
>+                               HRESULT(IManipulationStartedEventHandler *,
>+                                       EventRegistrationToken *));
>+    MOCK_METHOD1_WITH_CALLTYPE(STDMETHODCALLTYPE,
>+                               remove_ManipulationStarted,
>+                               HRESULT(EventRegistrationToken));
>+    MOCK_METHOD2_WITH_CALLTYPE(STDMETHODCALLTYPE,
>+                               add_ManipulationDelta,
>+                               HRESULT(IManipulationDeltaEventHandler *, EventRegistrationToken *));
>+    MOCK_METHOD1_WITH_CALLTYPE(STDMETHODCALLTYPE,
>+                               remove_ManipulationDelta,
>+                               HRESULT(EventRegistrationToken));
>+    MOCK_METHOD2_WITH_CALLTYPE(STDMETHODCALLTYPE,
>+                               add_ManipulationCompleted,
>+                               HRESULT(IManipulationCompletedEventHandler *,
>+                                       EventRegistrationToken *));
>+    MOCK_METHOD1_WITH_CALLTYPE(STDMETHODCALLTYPE,
>+                               remove_ManipulationCompleted,
>+                               HRESULT(EventRegistrationToken));
>     MOCK_METHOD1_WITH_CALLTYPE(STDMETHODCALLTYPE, Measure, HRESULT(Size));
>     MOCK_METHOD1_WITH_CALLTYPE(STDMETHODCALLTYPE, Arrange, HRESULT(Rect));
>     MOCK_METHOD2_WITH_CALLTYPE(STDMETHODCALLTYPE, CapturePointer, HRESULT(IPointer *, boolean *));
>     MOCK_METHOD1_WITH_CALLTYPE(STDMETHODCALLTYPE, ReleasePointerCapture, HRESULT(IPointer *));
>     MOCK_METHOD0_WITH_CALLTYPE(STDMETHODCALLTYPE, ReleasePointerCaptures, HRESULT());
>-    MOCK_METHOD3_WITH_CALLTYPE(STDMETHODCALLTYPE, AddHandler, HRESULT(IRoutedEvent *, IInspectable *, boolean));
>-    MOCK_METHOD2_WITH_CALLTYPE(STDMETHODCALLTYPE, RemoveHandler, HRESULT(IRoutedEvent *, IInspectable *));
>-    MOCK_METHOD2_WITH_CALLTYPE(STDMETHODCALLTYPE, TransformToVisual, HRESULT(IUIElement *, IGeneralTransform **));
>+    MOCK_METHOD3_WITH_CALLTYPE(STDMETHODCALLTYPE,
>+                               AddHandler,
>+                               HRESULT(IRoutedEvent *, IInspectable *, boolean));
>+    MOCK_METHOD2_WITH_CALLTYPE(STDMETHODCALLTYPE,
>+                               RemoveHandler,
>+                               HRESULT(IRoutedEvent *, IInspectable *));
>+    MOCK_METHOD2_WITH_CALLTYPE(STDMETHODCALLTYPE,
>+                               TransformToVisual,
>+                               HRESULT(IUIElement *, IGeneralTransform **));
>     MOCK_METHOD0_WITH_CALLTYPE(STDMETHODCALLTYPE, InvalidateMeasure, HRESULT());
>     MOCK_METHOD0_WITH_CALLTYPE(STDMETHODCALLTYPE, InvalidateArrange, HRESULT());
>     MOCK_METHOD0_WITH_CALLTYPE(STDMETHODCALLTYPE, UpdateLayout, HRESULT());
> };
> 
>-HRESULT CreatePropertyMap(IMap<HSTRING, IInspectable*>** propertyMap)
>+HRESULT CreatePropertyMap(IMap<HSTRING, IInspectable *> **propertyMap)
> {
>     HRESULT result = S_OK;
>     ComPtr<IPropertySet> propertySet;
>     ComPtr<IActivationFactory> propertySetFactory;
>-    result = GetActivationFactory(HStringReference(RuntimeClass_Windows_Foundation_Collections_PropertySet).Get(), &propertySetFactory);
>+    result = GetActivationFactory(
>+        HStringReference(RuntimeClass_Windows_Foundation_Collections_PropertySet).Get(),
>+        &propertySetFactory);
>     EXPECT_HRESULT_SUCCEEDED(result);
> 
>     result = propertySetFactory->ActivateInstance(&propertySet);
>@@ -269,10 +413,12 @@ HRESULT CreatePropertyMap(IMap<HSTRING, IInspectable*>** propertyMap)
>     return result;
> }
> 
>-HRESULT CreatePropertyValueStatics(IPropertyValueStatics** propertyStatics)
>+HRESULT CreatePropertyValueStatics(IPropertyValueStatics **propertyStatics)
> {
>     ComPtr<IPropertyValueStatics> propertyValueStatics;
>-    HRESULT result = GetActivationFactory(HStringReference(RuntimeClass_Windows_Foundation_PropertyValue).Get(), &propertyValueStatics);
>+    HRESULT result =
>+        GetActivationFactory(HStringReference(RuntimeClass_Windows_Foundation_PropertyValue).Get(),
>+                             &propertyValueStatics);
>     EXPECT_HRESULT_SUCCEEDED(result);
> 
>     result = propertyValueStatics.CopyTo(propertyStatics);
>@@ -281,10 +427,13 @@ HRESULT CreatePropertyValueStatics(IPropertyValueStatics** propertyStatics)
>     return result;
> }
> 
>-HRESULT SetInspectablePropertyValue(const ComPtr<IMap<HSTRING, IInspectable*>>& propertyMap, const wchar_t* propertyName, IInspectable* inspectable)
>+HRESULT SetInspectablePropertyValue(const ComPtr<IMap<HSTRING, IInspectable *>> &propertyMap,
>+                                    const wchar_t *propertyName,
>+                                    IInspectable *inspectable)
> {
>     boolean propertyReplaced = false;
>-    return propertyMap->Insert(HStringReference(propertyName).Get(), inspectable, &propertyReplaced);
>+    return propertyMap->Insert(HStringReference(propertyName).Get(), inspectable,
>+                               &propertyReplaced);
> }
> 
> void expectNativeWindowInitCalls(MockSwapChainPanel &panel, bool expectRenderSize)
>@@ -301,7 +450,7 @@ void expectNativeWindowInitCalls(MockSwapChainPanel &panel, bool expectRenderSiz
> TEST(NativeWindowTest, SwapChainPanelByItself)
> {
>     MockSwapChainPanel mockSwapChainPanel;
>-    NativeWindow nativeWindow(reinterpret_cast<IInspectable*>(&mockSwapChainPanel));
>+    NativeWindow nativeWindow(reinterpret_cast<IInspectable *>(&mockSwapChainPanel));
>     expectNativeWindowInitCalls(mockSwapChainPanel, true);
>     EXPECT_TRUE(nativeWindow.initialize());
> }
>@@ -312,11 +461,13 @@ TEST(NativeWindowTest, SwapChainPanelInPropertySet)
>     EXPECT_HRESULT_SUCCEEDED(CoInitializeEx(nullptr, COINIT_MULTITHREADED));
>     {
>         MockSwapChainPanel mockSwapChainPanel;
>-        ComPtr<IMap<HSTRING, IInspectable*>> propertySet;
>+        ComPtr<IMap<HSTRING, IInspectable *>> propertySet;
> 
>         // Create a simple property set with the swapchainpanel
>         EXPECT_HRESULT_SUCCEEDED(CreatePropertyMap(&propertySet));
>-        EXPECT_HRESULT_SUCCEEDED(SetInspectablePropertyValue(propertySet, EGLNativeWindowTypeProperty, reinterpret_cast<IInspectable*>(&mockSwapChainPanel)));
>+        EXPECT_HRESULT_SUCCEEDED(
>+            SetInspectablePropertyValue(propertySet, EGLNativeWindowTypeProperty,
>+                                        reinterpret_cast<IInspectable *>(&mockSwapChainPanel)));
> 
>         // Check native window init calls
>         NativeWindow nativeWindow(propertySet.Get());
>@@ -332,26 +483,35 @@ TEST(NativeWindowTest, SwapChainPanelInPropertySetWithSizeAndScale)
>     EXPECT_HRESULT_SUCCEEDED(CoInitializeEx(nullptr, COINIT_MULTITHREADED));
>     {
>         MockSwapChainPanel mockSwapChainPanel;
>-        ComPtr<IMap<HSTRING, IInspectable*>> propertySet;
>+        ComPtr<IMap<HSTRING, IInspectable *>> propertySet;
>         ComPtr<IPropertyValueStatics> propertyValueStatics;
>         ComPtr<IPropertyValue> singleValue;
>         ComPtr<IPropertyValue> sizeValue;
> 
>         // Create a simple property set with the swapchainpanel
>         EXPECT_HRESULT_SUCCEEDED(CreatePropertyMap(&propertySet));
>-        EXPECT_HRESULT_SUCCEEDED(SetInspectablePropertyValue(propertySet, EGLNativeWindowTypeProperty, reinterpret_cast<IInspectable*>(&mockSwapChainPanel)));
>+        EXPECT_HRESULT_SUCCEEDED(
>+            SetInspectablePropertyValue(propertySet, EGLNativeWindowTypeProperty,
>+                                        reinterpret_cast<IInspectable *>(&mockSwapChainPanel)));
> 
>         // Add a valid scale factor to the property set
>         EXPECT_HRESULT_SUCCEEDED(CreatePropertyValueStatics(propertyValueStatics.GetAddressOf()));
>-        propertyValueStatics->CreateSingle(0.5f, reinterpret_cast<IInspectable**>(singleValue.GetAddressOf()));
>-        EXPECT_HRESULT_SUCCEEDED(SetInspectablePropertyValue(propertySet, EGLRenderResolutionScaleProperty, reinterpret_cast<IInspectable*>(singleValue.Get())));
>+        propertyValueStatics->CreateSingle(
>+            0.5f, reinterpret_cast<IInspectable **>(singleValue.GetAddressOf()));
>+        EXPECT_HRESULT_SUCCEEDED(
>+            SetInspectablePropertyValue(propertySet, EGLRenderResolutionScaleProperty,
>+                                        reinterpret_cast<IInspectable *>(singleValue.Get())));
> 
>         // Add a valid size to the property set
>         EXPECT_HRESULT_SUCCEEDED(CreatePropertyValueStatics(propertyValueStatics.GetAddressOf()));
>-        propertyValueStatics->CreateSize({ 480, 800 }, reinterpret_cast<IInspectable**>(sizeValue.GetAddressOf()));
>-        EXPECT_HRESULT_SUCCEEDED(SetInspectablePropertyValue(propertySet, EGLRenderSurfaceSizeProperty, reinterpret_cast<IInspectable*>(sizeValue.Get())));
>-
>-        // Check native window init fails, since we shouldn't be able to set a size and a scale together
>+        propertyValueStatics->CreateSize(
>+            {480, 800}, reinterpret_cast<IInspectable **>(sizeValue.GetAddressOf()));
>+        EXPECT_HRESULT_SUCCEEDED(
>+            SetInspectablePropertyValue(propertySet, EGLRenderSurfaceSizeProperty,
>+                                        reinterpret_cast<IInspectable *>(sizeValue.Get())));
>+
>+        // Check native window init fails, since we shouldn't be able to set a size and a scale
>+        // together
>         NativeWindow nativeWindow(propertySet.Get());
>         EXPECT_FALSE(nativeWindow.initialize());
>     }
>@@ -360,30 +520,34 @@ TEST(NativeWindowTest, SwapChainPanelInPropertySetWithSizeAndScale)
> 
> // Tests that the scale property works as expected in a property set with a SwapChainPanel
> class SwapChainPanelScaleTest : public testing::TestWithParam<std::pair<float, bool>>
>-{
>-};
>+{};
> 
> TEST_P(SwapChainPanelScaleTest, ValidateScale)
> {
>-    float scale = GetParam().first;
>+    float scale         = GetParam().first;
>     bool expectedResult = GetParam().second;
> 
>     // COM is required to be initialized for creation of the property set
>     EXPECT_HRESULT_SUCCEEDED(CoInitializeEx(nullptr, COINIT_MULTITHREADED));
>     {
>         MockSwapChainPanel mockSwapChainPanel;
>-        ComPtr<IMap<HSTRING, IInspectable*>> propertySet;
>+        ComPtr<IMap<HSTRING, IInspectable *>> propertySet;
>         ComPtr<IPropertyValueStatics> propertyValueStatics;
>         ComPtr<IPropertyValue> singleValue;
> 
>         // Create a simple property set
>         EXPECT_HRESULT_SUCCEEDED(CreatePropertyMap(&propertySet));
>-        EXPECT_HRESULT_SUCCEEDED(SetInspectablePropertyValue(propertySet, EGLNativeWindowTypeProperty, reinterpret_cast<IInspectable*>(&mockSwapChainPanel)));
>+        EXPECT_HRESULT_SUCCEEDED(
>+            SetInspectablePropertyValue(propertySet, EGLNativeWindowTypeProperty,
>+                                        reinterpret_cast<IInspectable *>(&mockSwapChainPanel)));
> 
>         // Add a valid scale factor to the property set
>         EXPECT_HRESULT_SUCCEEDED(CreatePropertyValueStatics(propertyValueStatics.GetAddressOf()));
>-        propertyValueStatics->CreateSingle(scale, reinterpret_cast<IInspectable**>(singleValue.GetAddressOf()));
>-        EXPECT_HRESULT_SUCCEEDED(SetInspectablePropertyValue(propertySet, EGLRenderResolutionScaleProperty, reinterpret_cast<IInspectable*>(singleValue.Get())));
>+        propertyValueStatics->CreateSingle(
>+            scale, reinterpret_cast<IInspectable **>(singleValue.GetAddressOf()));
>+        EXPECT_HRESULT_SUCCEEDED(
>+            SetInspectablePropertyValue(propertySet, EGLRenderResolutionScaleProperty,
>+                                        reinterpret_cast<IInspectable *>(singleValue.Get())));
> 
>         // Check native window init status and calls to the mock swapchainpanel
>         NativeWindow nativeWindow(propertySet.Get());
>@@ -398,42 +562,42 @@ TEST_P(SwapChainPanelScaleTest, ValidateScale)
> }
> 
> typedef std::pair<float, bool> scaleValidPair;
>-static const scaleValidPair scales[] = { scaleValidPair(1.0f,   true),
>-                                         scaleValidPair(0.5f,   true),
>-                                         scaleValidPair(0.0f,   false),
>-                                         scaleValidPair(0.01f,  true),
>-                                         scaleValidPair(2.00f,  true) };
>+static const scaleValidPair scales[] = {scaleValidPair(1.0f, true), scaleValidPair(0.5f, true),
>+                                        scaleValidPair(0.0f, false), scaleValidPair(0.01f, true),
>+                                        scaleValidPair(2.00f, true)};
> 
>-INSTANTIATE_TEST_CASE_P(NativeWindowTest,
>-                        SwapChainPanelScaleTest,
>-                        testing::ValuesIn(scales));
>+INSTANTIATE_TEST_SUITE_P(NativeWindowTest, SwapChainPanelScaleTest, testing::ValuesIn(scales));
> 
> // Tests that the size property works as expected in a property set with a SwapChainPanel
> class SwapChainPanelSizeTest : public testing::TestWithParam<std::tuple<float, float, bool>>
>-{
>-};
>+{};
> 
> TEST_P(SwapChainPanelSizeTest, ValidateSize)
> {
>-    Size renderSize = { std::get<0>(GetParam()), std::get<1>(GetParam()) };
>+    Size renderSize     = {std::get<0>(GetParam()), std::get<1>(GetParam())};
>     bool expectedResult = std::get<2>(GetParam());
> 
>     // COM is required to be initialized for creation of the property set
>     EXPECT_HRESULT_SUCCEEDED(CoInitializeEx(nullptr, COINIT_MULTITHREADED));
>     {
>         MockSwapChainPanel mockSwapChainPanel;
>-        ComPtr<IMap<HSTRING, IInspectable*>> propertySet;
>+        ComPtr<IMap<HSTRING, IInspectable *>> propertySet;
>         ComPtr<IPropertyValueStatics> propertyValueStatics;
>         ComPtr<IPropertyValue> sizeValue;
> 
>         // Create a simple property set
>         EXPECT_HRESULT_SUCCEEDED(CreatePropertyMap(&propertySet));
>-        EXPECT_HRESULT_SUCCEEDED(SetInspectablePropertyValue(propertySet, EGLNativeWindowTypeProperty, reinterpret_cast<IInspectable*>(&mockSwapChainPanel)));
>+        EXPECT_HRESULT_SUCCEEDED(
>+            SetInspectablePropertyValue(propertySet, EGLNativeWindowTypeProperty,
>+                                        reinterpret_cast<IInspectable *>(&mockSwapChainPanel)));
> 
>         // Add a valid size to the property set
>         EXPECT_HRESULT_SUCCEEDED(CreatePropertyValueStatics(propertyValueStatics.GetAddressOf()));
>-        propertyValueStatics->CreateSize(renderSize, reinterpret_cast<IInspectable**>(sizeValue.GetAddressOf()));
>-        EXPECT_HRESULT_SUCCEEDED(SetInspectablePropertyValue(propertySet, EGLRenderSurfaceSizeProperty, reinterpret_cast<IInspectable*>(sizeValue.Get())));
>+        propertyValueStatics->CreateSize(
>+            renderSize, reinterpret_cast<IInspectable **>(sizeValue.GetAddressOf()));
>+        EXPECT_HRESULT_SUCCEEDED(
>+            SetInspectablePropertyValue(propertySet, EGLRenderSurfaceSizeProperty,
>+                                        reinterpret_cast<IInspectable *>(sizeValue.Get())));
> 
>         // Check native window init status and calls to the mock swapchainpanel
>         NativeWindow nativeWindow(propertySet.Get());
>@@ -448,13 +612,9 @@ TEST_P(SwapChainPanelSizeTest, ValidateSize)
> }
> 
> typedef std::tuple<float, float, bool> sizeValidPair;
>-static const sizeValidPair sizes[] = { sizeValidPair( 800,  480, true),
>-                                       sizeValidPair(   0,  480, false),
>-                                       sizeValidPair( 800,    0, false),
>-                                       sizeValidPair(   0,    0, false) };
>+static const sizeValidPair sizes[] = {sizeValidPair(800, 480, true), sizeValidPair(0, 480, false),
>+                                      sizeValidPair(800, 0, false), sizeValidPair(0, 0, false)};
> 
>-INSTANTIATE_TEST_CASE_P(NativeWindowTest,
>-                        SwapChainPanelSizeTest,
>-                        testing::ValuesIn(sizes));
>+INSTANTIATE_TEST_SUITE_P(NativeWindowTest, SwapChainPanelSizeTest, testing::ValuesIn(sizes));
> 
>-} // namespace
>+}  // namespace
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/Blit9.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/Blit9.cpp
>index 36f2bd0db82..95e9c9f8039 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/Blit9.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/Blit9.cpp
>@@ -8,27 +8,28 @@
> 
> #include "libANGLE/renderer/d3d/d3d9/Blit9.h"
> 
>+#include "libANGLE/Context.h"
>+#include "libANGLE/Framebuffer.h"
>+#include "libANGLE/FramebufferAttachment.h"
>+#include "libANGLE/angletypes.h"
> #include "libANGLE/renderer/d3d/TextureD3D.h"
>-#include "libANGLE/renderer/d3d/d3d9/renderer9_utils.h"
>-#include "libANGLE/renderer/d3d/d3d9/formatutils9.h"
>-#include "libANGLE/renderer/d3d/d3d9/TextureStorage9.h"
> #include "libANGLE/renderer/d3d/d3d9/RenderTarget9.h"
> #include "libANGLE/renderer/d3d/d3d9/Renderer9.h"
>-#include "libANGLE/angletypes.h"
>-#include "libANGLE/Framebuffer.h"
>-#include "libANGLE/FramebufferAttachment.h"
>+#include "libANGLE/renderer/d3d/d3d9/TextureStorage9.h"
>+#include "libANGLE/renderer/d3d/d3d9/formatutils9.h"
>+#include "libANGLE/renderer/d3d/d3d9/renderer9_utils.h"
> 
> namespace
> {
> // Precompiled shaders
>-#include "libANGLE/renderer/d3d/d3d9/shaders/compiled/standardvs.h"
>-#include "libANGLE/renderer/d3d/d3d9/shaders/compiled/passthroughps.h"
>-#include "libANGLE/renderer/d3d/d3d9/shaders/compiled/luminanceps.h"
>-#include "libANGLE/renderer/d3d/d3d9/shaders/compiled/luminancepremultps.h"
>-#include "libANGLE/renderer/d3d/d3d9/shaders/compiled/luminanceunmultps.h"
>-#include "libANGLE/renderer/d3d/d3d9/shaders/compiled/componentmaskps.h"
> #include "libANGLE/renderer/d3d/d3d9/shaders/compiled/componentmaskpremultps.h"
>+#include "libANGLE/renderer/d3d/d3d9/shaders/compiled/componentmaskps.h"
> #include "libANGLE/renderer/d3d/d3d9/shaders/compiled/componentmaskunmultps.h"
>+#include "libANGLE/renderer/d3d/d3d9/shaders/compiled/luminancepremultps.h"
>+#include "libANGLE/renderer/d3d/d3d9/shaders/compiled/luminanceps.h"
>+#include "libANGLE/renderer/d3d/d3d9/shaders/compiled/luminanceunmultps.h"
>+#include "libANGLE/renderer/d3d/d3d9/shaders/compiled/passthroughps.h"
>+#include "libANGLE/renderer/d3d/d3d9/shaders/compiled/standardvs.h"
> 
> const BYTE *const g_shaderCode[] = {
>     g_vs20_standardvs,
>@@ -51,7 +52,7 @@ const size_t g_shaderSize[] = {
>     sizeof(g_ps20_componentmaskpremultps),
>     sizeof(g_ps20_componentmaskunmultps),
> };
>-}
>+}  // namespace
> 
> namespace rx
> {
>@@ -80,71 +81,50 @@ Blit9::~Blit9()
>     }
> }
> 
>-gl::Error Blit9::initialize()
>+angle::Result Blit9::initialize(Context9 *context9)
> {
>     if (mGeometryLoaded)
>     {
>-        return gl::NoError();
>+        return angle::Result::Continue;
>     }
> 
>-    static const float quad[] =
>-    {
>-        -1, -1,
>-        -1,  1,
>-         1, -1,
>-         1,  1
>-    };
>+    static const float quad[] = {-1, -1, -1, 1, 1, -1, 1, 1};
> 
>     IDirect3DDevice9 *device = mRenderer->getDevice();
> 
>     HRESULT result = device->CreateVertexBuffer(sizeof(quad), D3DUSAGE_WRITEONLY, 0,
>                                                 D3DPOOL_DEFAULT, &mQuadVertexBuffer, nullptr);
> 
>-    if (FAILED(result))
>-    {
>-        ASSERT(result == D3DERR_OUTOFVIDEOMEMORY || result == E_OUTOFMEMORY);
>-        return gl::OutOfMemory() << "Failed to create internal blit vertex shader, "
>-                                 << gl::FmtHR(result);
>-    }
>+    ANGLE_TRY_HR(context9, result, "Failed to create internal blit vertex shader");
> 
>     void *lockPtr = nullptr;
>-    result = mQuadVertexBuffer->Lock(0, 0, &lockPtr, 0);
>+    result        = mQuadVertexBuffer->Lock(0, 0, &lockPtr, 0);
> 
>-    if (FAILED(result) || lockPtr == nullptr)
>-    {
>-        ASSERT(result == D3DERR_OUTOFVIDEOMEMORY || result == E_OUTOFMEMORY);
>-        SafeRelease(mQuadVertexBuffer);
>-        return gl::OutOfMemory() << "Failed to lock internal blit vertex shader, "
>-                                 << gl::FmtHR(result);
>-    }
>+    ANGLE_TRY_HR(context9, result, "Failed to lock internal blit vertex shader");
>+    ASSERT(lockPtr);
> 
>     memcpy(lockPtr, quad, sizeof(quad));
>     mQuadVertexBuffer->Unlock();
> 
>-    static const D3DVERTEXELEMENT9 elements[] =
>-    {
>-        { 0, 0, D3DDECLTYPE_FLOAT2, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_POSITION, 0 },
>-        D3DDECL_END()
>-    };
>+    static const D3DVERTEXELEMENT9 elements[] = {
>+        {0, 0, D3DDECLTYPE_FLOAT2, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_POSITION, 0}, D3DDECL_END()};
> 
>     result = device->CreateVertexDeclaration(elements, &mQuadVertexDeclaration);
>-
>-    if (FAILED(result))
>-    {
>-        ASSERT(result == D3DERR_OUTOFVIDEOMEMORY || result == E_OUTOFMEMORY);
>-        SafeRelease(mQuadVertexBuffer);
>-        return gl::OutOfMemory() << "Failed to lock internal blit vertex declaration, "
>-                                 << gl::FmtHR(result);
>-    }
>+    ANGLE_TRY_HR(context9, result, "Failed to create internal blit vertex shader declaration");
> 
>     mGeometryLoaded = true;
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
> template <class D3DShaderType>
>-gl::Error Blit9::setShader(ShaderId source, const char *profile,
>-                           gl::Error (Renderer9::*createShader)(const DWORD *, size_t length, D3DShaderType **outShader),
>-                           HRESULT (WINAPI IDirect3DDevice9::*setShader)(D3DShaderType*))
>+angle::Result Blit9::setShader(Context9 *context9,
>+                               ShaderId source,
>+                               const char *profile,
>+                               angle::Result (Renderer9::*createShader)(Context9 *,
>+                                                                        const DWORD *,
>+                                                                        size_t length,
>+                                                                        D3DShaderType **outShader),
>+                               HRESULT (WINAPI IDirect3DDevice9::*setShader)(D3DShaderType *))
> {
>     IDirect3DDevice9 *device = mRenderer->getDevice();
> 
>@@ -152,33 +132,34 @@ gl::Error Blit9::setShader(ShaderId source, const char *profile,
> 
>     if (mCompiledShaders[source] != nullptr)
>     {
>-        shader = static_cast<D3DShaderType*>(mCompiledShaders[source]);
>+        shader = static_cast<D3DShaderType *>(mCompiledShaders[source]);
>     }
>     else
>     {
>-        const BYTE* shaderCode = g_shaderCode[source];
>-        size_t shaderSize = g_shaderSize[source];
>-        ANGLE_TRY((mRenderer->*createShader)(reinterpret_cast<const DWORD*>(shaderCode), shaderSize, &shader));
>+        const BYTE *shaderCode = g_shaderCode[source];
>+        size_t shaderSize      = g_shaderSize[source];
>+        ANGLE_TRY((mRenderer->*createShader)(context9, reinterpret_cast<const DWORD *>(shaderCode),
>+                                             shaderSize, &shader));
>         mCompiledShaders[source] = shader;
>     }
> 
>     HRESULT hr = (device->*setShader)(shader);
>-    if (FAILED(hr))
>-    {
>-        return gl::OutOfMemory() << "Failed to set shader for blit operation, " << gl::FmtHR(hr);
>-    }
>-
>-    return gl::NoError();
>+    ANGLE_TRY_HR(context9, hr, "Failed to set shader for blit operation");
>+    return angle::Result::Continue;
> }
> 
>-gl::Error Blit9::setVertexShader(ShaderId shader)
>+angle::Result Blit9::setVertexShader(Context9 *context9, ShaderId shader)
> {
>-    return setShader<IDirect3DVertexShader9>(shader, "vs_2_0", &Renderer9::createVertexShader, &IDirect3DDevice9::SetVertexShader);
>+    return setShader<IDirect3DVertexShader9>(context9, shader, "vs_2_0",
>+                                             &Renderer9::createVertexShader,
>+                                             &IDirect3DDevice9::SetVertexShader);
> }
> 
>-gl::Error Blit9::setPixelShader(ShaderId shader)
>+angle::Result Blit9::setPixelShader(Context9 *context9, ShaderId shader)
> {
>-    return setShader<IDirect3DPixelShader9>(shader, "ps_2_0", &Renderer9::createPixelShader, &IDirect3DDevice9::SetPixelShader);
>+    return setShader<IDirect3DPixelShader9>(context9, shader, "ps_2_0",
>+                                            &Renderer9::createPixelShader,
>+                                            &IDirect3DDevice9::SetPixelShader);
> }
> 
> RECT Blit9::getSurfaceRect(IDirect3DSurface9 *surface) const
>@@ -187,9 +168,9 @@ RECT Blit9::getSurfaceRect(IDirect3DSurface9 *surface) const
>     surface->GetDesc(&desc);
> 
>     RECT rect;
>-    rect.left = 0;
>-    rect.top = 0;
>-    rect.right = desc.Width;
>+    rect.left   = 0;
>+    rect.top    = 0;
>+    rect.right  = desc.Width;
>     rect.bottom = desc.Height;
> 
>     return rect;
>@@ -203,22 +184,24 @@ gl::Extents Blit9::getSurfaceSize(IDirect3DSurface9 *surface) const
>     return gl::Extents(desc.Width, desc.Height, 1);
> }
> 
>-gl::Error Blit9::boxFilter(IDirect3DSurface9 *source, IDirect3DSurface9 *dest)
>+angle::Result Blit9::boxFilter(Context9 *context9,
>+                               IDirect3DSurface9 *source,
>+                               IDirect3DSurface9 *dest)
> {
>-    ANGLE_TRY(initialize());
>+    ANGLE_TRY(initialize(context9));
> 
>-    IDirect3DBaseTexture9 *texture = nullptr;
>-    ANGLE_TRY(copySurfaceToTexture(source, getSurfaceRect(source), &texture));
>+    angle::ComPtr<IDirect3DBaseTexture9> texture = nullptr;
>+    ANGLE_TRY(copySurfaceToTexture(context9, source, getSurfaceRect(source), &texture));
> 
>     IDirect3DDevice9 *device = mRenderer->getDevice();
> 
>     saveState();
> 
>-    device->SetTexture(0, texture);
>+    device->SetTexture(0, texture.Get());
>     device->SetRenderTarget(0, dest);
> 
>-    ANGLE_TRY(setVertexShader(SHADER_VS_STANDARD));
>-    ANGLE_TRY(setPixelShader(SHADER_PS_PASSTHROUGH));
>+    ANGLE_TRY(setVertexShader(context9, SHADER_VS_STANDARD));
>+    ANGLE_TRY(setPixelShader(context9, SHADER_PS_PASSTHROUGH));
> 
>     setCommonBlitState();
>     device->SetSamplerState(0, D3DSAMP_MINFILTER, D3DTEXF_LINEAR);
>@@ -229,22 +212,22 @@ gl::Error Blit9::boxFilter(IDirect3DSurface9 *source, IDirect3DSurface9 *dest)
> 
>     render();
> 
>-    SafeRelease(texture);
>-
>     restoreState();
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error Blit9::copy2D(const gl::Context *context,
>-                        const gl::Framebuffer *framebuffer,
>-                        const RECT &sourceRect,
>-                        GLenum destFormat,
>-                        const gl::Offset &destOffset,
>-                        TextureStorage *storage,
>-                        GLint level)
>+angle::Result Blit9::copy2D(const gl::Context *context,
>+                            const gl::Framebuffer *framebuffer,
>+                            const RECT &sourceRect,
>+                            GLenum destFormat,
>+                            const gl::Offset &destOffset,
>+                            TextureStorage *storage,
>+                            GLint level)
> {
>-    ANGLE_TRY(initialize());
>+    Context9 *context9 = GetImplAs<Context9>(context);
>+
>+    ANGLE_TRY(initialize(context9));
> 
>     const gl::FramebufferAttachment *colorbuffer = framebuffer->getColorbuffer(0);
>     ASSERT(colorbuffer);
>@@ -253,95 +236,72 @@ gl::Error Blit9::copy2D(const gl::Context *context,
>     ANGLE_TRY(colorbuffer->getRenderTarget(context, &renderTarget9));
>     ASSERT(renderTarget9);
> 
>-    IDirect3DSurface9 *source = renderTarget9->getSurface();
>+    angle::ComPtr<IDirect3DSurface9> source = renderTarget9->getSurface();
>     ASSERT(source);
> 
>-    IDirect3DSurface9 *destSurface = nullptr;
>-    TextureStorage9 *storage9      = GetAs<TextureStorage9>(storage);
>-    gl::Error error = storage9->getSurfaceLevel(context, GL_TEXTURE_2D, level, true, &destSurface);
>-    if (error.isError())
>-    {
>-        SafeRelease(source);
>-        return error;
>-    }
>+    angle::ComPtr<IDirect3DSurface9> destSurface = nullptr;
>+    TextureStorage9 *storage9                    = GetAs<TextureStorage9>(storage);
>+    ANGLE_TRY(
>+        storage9->getSurfaceLevel(context, gl::TextureTarget::_2D, level, true, &destSurface));
>     ASSERT(destSurface);
> 
>-    gl::Error result =
>-        copy(source, nullptr, sourceRect, destFormat, destOffset, destSurface, false, false, false);
>-
>-    SafeRelease(destSurface);
>-    SafeRelease(source);
>-
>-    return result;
>+    ANGLE_TRY(copy(context9, source.Get(), nullptr, sourceRect, destFormat, destOffset,
>+                   destSurface.Get(), false, false, false));
>+    return angle::Result::Continue;
> }
> 
>-gl::Error Blit9::copyCube(const gl::Context *context,
>-                          const gl::Framebuffer *framebuffer,
>-                          const RECT &sourceRect,
>-                          GLenum destFormat,
>-                          const gl::Offset &destOffset,
>-                          TextureStorage *storage,
>-                          GLenum target,
>-                          GLint level)
>+angle::Result Blit9::copyCube(const gl::Context *context,
>+                              const gl::Framebuffer *framebuffer,
>+                              const RECT &sourceRect,
>+                              GLenum destFormat,
>+                              const gl::Offset &destOffset,
>+                              TextureStorage *storage,
>+                              gl::TextureTarget target,
>+                              GLint level)
> {
>-    gl::Error error = initialize();
>-    if (error.isError())
>-    {
>-        return error;
>-    }
>+    Context9 *context9 = GetImplAs<Context9>(context);
>+
>+    ANGLE_TRY(initialize(context9));
> 
>     const gl::FramebufferAttachment *colorbuffer = framebuffer->getColorbuffer(0);
>     ASSERT(colorbuffer);
> 
>     RenderTarget9 *renderTarget9 = nullptr;
>-    error                        = colorbuffer->getRenderTarget(context, &renderTarget9);
>-    if (error.isError())
>-    {
>-        return error;
>-    }
>+    ANGLE_TRY(colorbuffer->getRenderTarget(context, &renderTarget9));
>     ASSERT(renderTarget9);
> 
>-    IDirect3DSurface9 *source = renderTarget9->getSurface();
>+    angle::ComPtr<IDirect3DSurface9> source = renderTarget9->getSurface();
>     ASSERT(source);
> 
>-    IDirect3DSurface9 *destSurface = nullptr;
>-    TextureStorage9 *storage9      = GetAs<TextureStorage9>(storage);
>-    error = storage9->getSurfaceLevel(context, target, level, true, &destSurface);
>-    if (error.isError())
>-    {
>-        SafeRelease(source);
>-        return error;
>-    }
>+    angle::ComPtr<IDirect3DSurface9> destSurface = nullptr;
>+    TextureStorage9 *storage9                    = GetAs<TextureStorage9>(storage);
>+    ANGLE_TRY(storage9->getSurfaceLevel(context, target, level, true, &destSurface));
>     ASSERT(destSurface);
> 
>-    gl::Error result =
>-        copy(source, nullptr, sourceRect, destFormat, destOffset, destSurface, false, false, false);
>-
>-    SafeRelease(destSurface);
>-    SafeRelease(source);
>-
>-    return result;
>+    return copy(context9, source.Get(), nullptr, sourceRect, destFormat, destOffset,
>+                destSurface.Get(), false, false, false);
> }
> 
>-gl::Error Blit9::copyTexture(const gl::Context *context,
>-                             const gl::Texture *source,
>-                             GLint sourceLevel,
>-                             const RECT &sourceRect,
>-                             GLenum destFormat,
>-                             const gl::Offset &destOffset,
>-                             TextureStorage *storage,
>-                             GLenum destTarget,
>-                             GLint destLevel,
>-                             bool flipY,
>-                             bool premultiplyAlpha,
>-                             bool unmultiplyAlpha)
>+angle::Result Blit9::copyTexture(const gl::Context *context,
>+                                 const gl::Texture *source,
>+                                 GLint sourceLevel,
>+                                 const RECT &sourceRect,
>+                                 GLenum destFormat,
>+                                 const gl::Offset &destOffset,
>+                                 TextureStorage *storage,
>+                                 gl::TextureTarget destTarget,
>+                                 GLint destLevel,
>+                                 bool flipY,
>+                                 bool premultiplyAlpha,
>+                                 bool unmultiplyAlpha)
> {
>-    ANGLE_TRY(initialize());
>+    Context9 *context9 = GetImplAs<Context9>(context);
>+    ANGLE_TRY(initialize(context9));
> 
>-    const TextureD3D *sourceD3D = GetImplAs<TextureD3D>(source);
>+    TextureD3D *sourceD3D = GetImplAs<TextureD3D>(source);
> 
>     TextureStorage *sourceStorage = nullptr;
>-    ANGLE_TRY(const_cast<TextureD3D *>(sourceD3D)->getNativeTexture(context, &sourceStorage));
>+    ANGLE_TRY(sourceD3D->getNativeTexture(context, &sourceStorage));
> 
>     TextureStorage9_2D *sourceStorage9 = GetAs<TextureStorage9_2D>(sourceStorage);
>     ASSERT(sourceStorage9);
>@@ -353,37 +313,27 @@ gl::Error Blit9::copyTexture(const gl::Context *context,
>     IDirect3DBaseTexture9 *sourceTexture = nullptr;
>     ANGLE_TRY(sourceStorage9->getBaseTexture(context, &sourceTexture));
> 
>-    IDirect3DSurface9 *sourceSurface = nullptr;
>-    ANGLE_TRY(
>-        sourceStorage9->getSurfaceLevel(context, GL_TEXTURE_2D, sourceLevel, true, &sourceSurface));
>+    angle::ComPtr<IDirect3DSurface9> sourceSurface = nullptr;
>+    ANGLE_TRY(sourceStorage9->getSurfaceLevel(context, gl::TextureTarget::_2D, sourceLevel, true,
>+                                              &sourceSurface));
> 
>-    IDirect3DSurface9 *destSurface = nullptr;
>-    gl::Error error =
>-        destStorage9->getSurfaceLevel(context, destTarget, destLevel, true, &destSurface);
>-    if (error.isError())
>-    {
>-        SafeRelease(sourceSurface);
>-        return error;
>-    }
>+    angle::ComPtr<IDirect3DSurface9> destSurface = nullptr;
>+    ANGLE_TRY(destStorage9->getSurfaceLevel(context, destTarget, destLevel, true, &destSurface));
> 
>-    error = copy(sourceSurface, sourceTexture, sourceRect, destFormat, destOffset, destSurface,
>-                 flipY, premultiplyAlpha, unmultiplyAlpha);
>-
>-    SafeRelease(sourceSurface);
>-    SafeRelease(destSurface);
>-
>-    return error;
>+    return copy(context9, sourceSurface.Get(), sourceTexture, sourceRect, destFormat, destOffset,
>+                destSurface.Get(), flipY, premultiplyAlpha, unmultiplyAlpha);
> }
> 
>-gl::Error Blit9::copy(IDirect3DSurface9 *source,
>-                      IDirect3DBaseTexture9 *sourceTexture,
>-                      const RECT &sourceRect,
>-                      GLenum destFormat,
>-                      const gl::Offset &destOffset,
>-                      IDirect3DSurface9 *dest,
>-                      bool flipY,
>-                      bool premultiplyAlpha,
>-                      bool unmultiplyAlpha)
>+angle::Result Blit9::copy(Context9 *context9,
>+                          IDirect3DSurface9 *source,
>+                          IDirect3DBaseTexture9 *sourceTexture,
>+                          const RECT &sourceRect,
>+                          GLenum destFormat,
>+                          const gl::Offset &destOffset,
>+                          IDirect3DSurface9 *dest,
>+                          bool flipY,
>+                          bool premultiplyAlpha,
>+                          bool unmultiplyAlpha)
> {
>     ASSERT(source != nullptr && dest != nullptr);
> 
>@@ -399,63 +349,50 @@ gl::Error Blit9::copy(IDirect3DSurface9 *source,
>         d3d9_gl::IsFormatChannelEquivalent(destDesc.Format, destFormat) && !flipY &&
>         premultiplyAlpha == unmultiplyAlpha)
>     {
>-        RECT destRect = { destOffset.x, destOffset.y, destOffset.x + (sourceRect.right - sourceRect.left), destOffset.y + (sourceRect.bottom - sourceRect.top)};
>+        RECT destRect  = {destOffset.x, destOffset.y,
>+                         destOffset.x + (sourceRect.right - sourceRect.left),
>+                         destOffset.y + (sourceRect.bottom - sourceRect.top)};
>         HRESULT result = device->StretchRect(source, &sourceRect, dest, &destRect, D3DTEXF_POINT);
>+        ANGLE_TRY_HR(context9, result, "StretchRect failed to blit between textures");
>+        return angle::Result::Continue;
>+    }
> 
>-        if (FAILED(result))
>-        {
>-            ASSERT(result == D3DERR_OUTOFVIDEOMEMORY || result == E_OUTOFMEMORY);
>-            return gl::OutOfMemory()
>-                   << "Failed to blit between textures, StretchRect " << gl::FmtHR(result);
>-        }
>+    angle::ComPtr<IDirect3DBaseTexture9> texture = sourceTexture;
>+    RECT adjustedSourceRect                      = sourceRect;
>+    gl::Extents sourceSize(sourceDesc.Width, sourceDesc.Height, 1);
> 
>-        return gl::NoError();
>-    }
>-    else
>+    if (texture == nullptr)
>     {
>-        IDirect3DBaseTexture9 *texture = sourceTexture;
>-        RECT adjustedSourceRect        = sourceRect;
>-        gl::Extents sourceSize(sourceDesc.Width, sourceDesc.Height, 1);
>-
>-        if (texture == nullptr)
>-        {
>-            ANGLE_TRY(copySurfaceToTexture(source, sourceRect, &texture));
>-
>-            // copySurfaceToTexture only copies in the sourceRect area of the source surface.
>-            // Adjust sourceRect so that it is now covering the entire source texture
>-            adjustedSourceRect.left   = 0;
>-            adjustedSourceRect.right  = sourceRect.right - sourceRect.left;
>-            adjustedSourceRect.top    = 0;
>-            adjustedSourceRect.bottom = sourceRect.bottom - sourceRect.top;
>-
>-            sourceSize.width  = sourceRect.right - sourceRect.left;
>-            sourceSize.height = sourceRect.bottom - sourceRect.top;
>-        }
>-        else
>-        {
>-            texture->AddRef();
>-        }
>-
>-        gl::Error error = formatConvert(texture, adjustedSourceRect, sourceSize, destFormat,
>-                                        destOffset, dest, flipY, premultiplyAlpha, unmultiplyAlpha);
>-
>-        SafeRelease(texture);
>-
>-        return error;
>+        ANGLE_TRY(copySurfaceToTexture(context9, source, sourceRect, &texture));
>+
>+        // copySurfaceToTexture only copies in the sourceRect area of the source surface.
>+        // Adjust sourceRect so that it is now covering the entire source texture
>+        adjustedSourceRect.left   = 0;
>+        adjustedSourceRect.right  = sourceRect.right - sourceRect.left;
>+        adjustedSourceRect.top    = 0;
>+        adjustedSourceRect.bottom = sourceRect.bottom - sourceRect.top;
>+
>+        sourceSize.width  = sourceRect.right - sourceRect.left;
>+        sourceSize.height = sourceRect.bottom - sourceRect.top;
>     }
>+
>+    ANGLE_TRY(formatConvert(context9, texture.Get(), adjustedSourceRect, sourceSize, destFormat,
>+                            destOffset, dest, flipY, premultiplyAlpha, unmultiplyAlpha));
>+    return angle::Result::Continue;
> }
> 
>-gl::Error Blit9::formatConvert(IDirect3DBaseTexture9 *source,
>-                               const RECT &sourceRect,
>-                               const gl::Extents &sourceSize,
>-                               GLenum destFormat,
>-                               const gl::Offset &destOffset,
>-                               IDirect3DSurface9 *dest,
>-                               bool flipY,
>-                               bool premultiplyAlpha,
>-                               bool unmultiplyAlpha)
>+angle::Result Blit9::formatConvert(Context9 *context9,
>+                                   IDirect3DBaseTexture9 *source,
>+                                   const RECT &sourceRect,
>+                                   const gl::Extents &sourceSize,
>+                                   GLenum destFormat,
>+                                   const gl::Offset &destOffset,
>+                                   IDirect3DSurface9 *dest,
>+                                   bool flipY,
>+                                   bool premultiplyAlpha,
>+                                   bool unmultiplyAlpha)
> {
>-    ANGLE_TRY(initialize());
>+    ANGLE_TRY(initialize(context9));
> 
>     IDirect3DDevice9 *device = mRenderer->getDevice();
> 
>@@ -474,167 +411,178 @@ gl::Error Blit9::formatConvert(IDirect3DBaseTexture9 *source,
> 
>     setCommonBlitState();
> 
>-    gl::Error error = setFormatConvertShaders(destFormat, flipY, premultiplyAlpha, unmultiplyAlpha);
>-    if (!error.isError())
>+    angle::Result result =
>+        setFormatConvertShaders(context9, destFormat, flipY, premultiplyAlpha, unmultiplyAlpha);
>+    if (result == angle::Result::Continue)
>     {
>         render();
>     }
> 
>     restoreState();
> 
>-    return error;
>+    return result;
> }
> 
>-gl::Error Blit9::setFormatConvertShaders(GLenum destFormat,
>-                                         bool flipY,
>-                                         bool premultiplyAlpha,
>-                                         bool unmultiplyAlpha)
>+angle::Result Blit9::setFormatConvertShaders(Context9 *context9,
>+                                             GLenum destFormat,
>+                                             bool flipY,
>+                                             bool premultiplyAlpha,
>+                                             bool unmultiplyAlpha)
> {
>-    ANGLE_TRY(setVertexShader(SHADER_VS_STANDARD));
>+    ANGLE_TRY(setVertexShader(context9, SHADER_VS_STANDARD));
> 
>     switch (destFormat)
>     {
>-      case GL_RGBA:
>-      case GL_BGRA_EXT:
>-      case GL_RGB:
>-      case GL_RG_EXT:
>-      case GL_RED_EXT:
>-      case GL_ALPHA:
>-          if (premultiplyAlpha == unmultiplyAlpha)
>-          {
>-              ANGLE_TRY(setPixelShader(SHADER_PS_COMPONENTMASK));
>-          }
>-          else if (premultiplyAlpha)
>-          {
>-              ANGLE_TRY(setPixelShader(SHADER_PS_COMPONENTMASK_PREMULTIPLY_ALPHA));
>-          }
>-          else
>-          {
>-              ASSERT(unmultiplyAlpha);
>-              ANGLE_TRY(setPixelShader(SHADER_PS_COMPONENTMASK_UNMULTIPLY_ALPHA));
>-          }
>-          break;
>-
>-      case GL_LUMINANCE:
>-      case GL_LUMINANCE_ALPHA:
>-          if (premultiplyAlpha == unmultiplyAlpha)
>-          {
>-              ANGLE_TRY(setPixelShader(SHADER_PS_LUMINANCE));
>-          }
>-          else if (premultiplyAlpha)
>-          {
>-              ANGLE_TRY(setPixelShader(SHADER_PS_LUMINANCE_PREMULTIPLY_ALPHA));
>-          }
>-          else
>-          {
>-              ASSERT(unmultiplyAlpha);
>-              ANGLE_TRY(setPixelShader(SHADER_PS_LUMINANCE_UNMULTIPLY_ALPHA));
>-          }
>-          break;
>-
>-      default:
>-          UNREACHABLE();
>+        case GL_RGBA:
>+        case GL_BGRA_EXT:
>+        case GL_RGB:
>+        case GL_RG_EXT:
>+        case GL_RED_EXT:
>+        case GL_ALPHA:
>+            if (premultiplyAlpha == unmultiplyAlpha)
>+            {
>+                ANGLE_TRY(setPixelShader(context9, SHADER_PS_COMPONENTMASK));
>+            }
>+            else if (premultiplyAlpha)
>+            {
>+                ANGLE_TRY(setPixelShader(context9, SHADER_PS_COMPONENTMASK_PREMULTIPLY_ALPHA));
>+            }
>+            else
>+            {
>+                ASSERT(unmultiplyAlpha);
>+                ANGLE_TRY(setPixelShader(context9, SHADER_PS_COMPONENTMASK_UNMULTIPLY_ALPHA));
>+            }
>+            break;
>+
>+        case GL_LUMINANCE:
>+        case GL_LUMINANCE_ALPHA:
>+            if (premultiplyAlpha == unmultiplyAlpha)
>+            {
>+                ANGLE_TRY(setPixelShader(context9, SHADER_PS_LUMINANCE));
>+            }
>+            else if (premultiplyAlpha)
>+            {
>+                ANGLE_TRY(setPixelShader(context9, SHADER_PS_LUMINANCE_PREMULTIPLY_ALPHA));
>+            }
>+            else
>+            {
>+                ASSERT(unmultiplyAlpha);
>+                ANGLE_TRY(setPixelShader(context9, SHADER_PS_LUMINANCE_UNMULTIPLY_ALPHA));
>+            }
>+            break;
>+
>+        default:
>+            UNREACHABLE();
>     }
> 
>-    enum { X = 0, Y = 1, Z = 2, W = 3 };
>+    enum
>+    {
>+        X = 0,
>+        Y = 1,
>+        Z = 2,
>+        W = 3
>+    };
> 
>     // The meaning of this constant depends on the shader that was selected.
>     // See the shader assembly code above for details.
>     // Allocate one array for both registers and split it into two float4's.
>-    float psConst[8] = { 0 };
>+    float psConst[8] = {0};
>     float *multConst = &psConst[0];
>-    float *addConst = &psConst[4];
>+    float *addConst  = &psConst[4];
> 
>     switch (destFormat)
>     {
>-      default: UNREACHABLE();
>-      case GL_RGBA:
>-      case GL_BGRA_EXT:
>-        multConst[X] = 1;
>-        multConst[Y] = 1;
>-        multConst[Z] = 1;
>-        multConst[W] = 1;
>-        addConst[X] = 0;
>-        addConst[Y] = 0;
>-        addConst[Z] = 0;
>-        addConst[W] = 0;
>-        break;
>-
>-      case GL_RGB:
>-        multConst[X] = 1;
>-        multConst[Y] = 1;
>-        multConst[Z] = 1;
>-        multConst[W] = 0;
>-        addConst[X] = 0;
>-        addConst[Y] = 0;
>-        addConst[Z] = 0;
>-        addConst[W] = 1;
>-        break;
>-
>-      case GL_RG_EXT:
>-        multConst[X] = 1;
>-        multConst[Y] = 1;
>-        multConst[Z] = 0;
>-        multConst[W] = 0;
>-        addConst[X] = 0;
>-        addConst[Y] = 0;
>-        addConst[Z] = 0;
>-        addConst[W] = 1;
>-        break;
>-
>-      case GL_RED_EXT:
>-        multConst[X] = 1;
>-        multConst[Y] = 0;
>-        multConst[Z] = 0;
>-        multConst[W] = 0;
>-        addConst[X] = 0;
>-        addConst[Y] = 0;
>-        addConst[Z] = 0;
>-        addConst[W] = 1;
>-        break;
>-
>-      case GL_ALPHA:
>-        multConst[X] = 0;
>-        multConst[Y] = 0;
>-        multConst[Z] = 0;
>-        multConst[W] = 1;
>-        addConst[X] = 0;
>-        addConst[Y] = 0;
>-        addConst[Z] = 0;
>-        addConst[W] = 0;
>-        break;
>-
>-      case GL_LUMINANCE:
>-        multConst[X] = 1;
>-        multConst[Y] = 0;
>-        multConst[Z] = 0;
>-        multConst[W] = 0;
>-        addConst[X] = 0;
>-        addConst[Y] = 0;
>-        addConst[Z] = 0;
>-        addConst[W] = 1;
>-        break;
>-
>-      case GL_LUMINANCE_ALPHA:
>-        multConst[X] = 1;
>-        multConst[Y] = 0;
>-        multConst[Z] = 0;
>-        multConst[W] = 1;
>-        addConst[X] = 0;
>-        addConst[Y] = 0;
>-        addConst[Z] = 0;
>-        addConst[W] = 0;
>-        break;
>+        case GL_RGBA:
>+        case GL_BGRA_EXT:
>+            multConst[X] = 1;
>+            multConst[Y] = 1;
>+            multConst[Z] = 1;
>+            multConst[W] = 1;
>+            addConst[X]  = 0;
>+            addConst[Y]  = 0;
>+            addConst[Z]  = 0;
>+            addConst[W]  = 0;
>+            break;
>+
>+        case GL_RGB:
>+            multConst[X] = 1;
>+            multConst[Y] = 1;
>+            multConst[Z] = 1;
>+            multConst[W] = 0;
>+            addConst[X]  = 0;
>+            addConst[Y]  = 0;
>+            addConst[Z]  = 0;
>+            addConst[W]  = 1;
>+            break;
>+
>+        case GL_RG_EXT:
>+            multConst[X] = 1;
>+            multConst[Y] = 1;
>+            multConst[Z] = 0;
>+            multConst[W] = 0;
>+            addConst[X]  = 0;
>+            addConst[Y]  = 0;
>+            addConst[Z]  = 0;
>+            addConst[W]  = 1;
>+            break;
>+
>+        case GL_RED_EXT:
>+            multConst[X] = 1;
>+            multConst[Y] = 0;
>+            multConst[Z] = 0;
>+            multConst[W] = 0;
>+            addConst[X]  = 0;
>+            addConst[Y]  = 0;
>+            addConst[Z]  = 0;
>+            addConst[W]  = 1;
>+            break;
>+
>+        case GL_ALPHA:
>+            multConst[X] = 0;
>+            multConst[Y] = 0;
>+            multConst[Z] = 0;
>+            multConst[W] = 1;
>+            addConst[X]  = 0;
>+            addConst[Y]  = 0;
>+            addConst[Z]  = 0;
>+            addConst[W]  = 0;
>+            break;
>+
>+        case GL_LUMINANCE:
>+            multConst[X] = 1;
>+            multConst[Y] = 0;
>+            multConst[Z] = 0;
>+            multConst[W] = 0;
>+            addConst[X]  = 0;
>+            addConst[Y]  = 0;
>+            addConst[Z]  = 0;
>+            addConst[W]  = 1;
>+            break;
>+
>+        case GL_LUMINANCE_ALPHA:
>+            multConst[X] = 1;
>+            multConst[Y] = 0;
>+            multConst[Z] = 0;
>+            multConst[W] = 1;
>+            addConst[X]  = 0;
>+            addConst[Y]  = 0;
>+            addConst[Z]  = 0;
>+            addConst[W]  = 0;
>+            break;
>+
>+        default:
>+            UNREACHABLE();
>     }
> 
>     mRenderer->getDevice()->SetPixelShaderConstantF(0, psConst, 2);
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error Blit9::copySurfaceToTexture(IDirect3DSurface9 *surface,
>-                                      const RECT &sourceRect,
>-                                      IDirect3DBaseTexture9 **outTexture)
>+angle::Result Blit9::copySurfaceToTexture(Context9 *context9,
>+                                          IDirect3DSurface9 *surface,
>+                                          const RECT &sourceRect,
>+                                          angle::ComPtr<IDirect3DBaseTexture9> *outTexture)
> {
>     ASSERT(surface);
> 
>@@ -644,44 +592,22 @@ gl::Error Blit9::copySurfaceToTexture(IDirect3DSurface9 *surface,
>     surface->GetDesc(&sourceDesc);
> 
>     // Copy the render target into a texture
>-    IDirect3DTexture9 *texture;
>+    angle::ComPtr<IDirect3DTexture9> texture;
>     HRESULT result = device->CreateTexture(
>         sourceRect.right - sourceRect.left, sourceRect.bottom - sourceRect.top, 1,
>         D3DUSAGE_RENDERTARGET, sourceDesc.Format, D3DPOOL_DEFAULT, &texture, nullptr);
>+    ANGLE_TRY_HR(context9, result, "Failed to allocate internal texture for blit");
> 
>-    if (FAILED(result))
>-    {
>-        ASSERT(result == D3DERR_OUTOFVIDEOMEMORY || result == E_OUTOFMEMORY);
>-        return gl::OutOfMemory() << "Failed to allocate internal texture for blit, "
>-                                 << gl::FmtHR(result);
>-    }
>-
>-    IDirect3DSurface9 *textureSurface;
>+    angle::ComPtr<IDirect3DSurface9> textureSurface;
>     result = texture->GetSurfaceLevel(0, &textureSurface);
>-
>-    if (FAILED(result))
>-    {
>-        ASSERT(result == D3DERR_OUTOFVIDEOMEMORY || result == E_OUTOFMEMORY);
>-        SafeRelease(texture);
>-        return gl::OutOfMemory() << "Failed to query surface of internal blit texture, "
>-                                 << gl::FmtHR(result);
>-    }
>+    ANGLE_TRY_HR(context9, result, "Failed to query surface of internal blit texture");
> 
>     mRenderer->endScene();
>-    result = device->StretchRect(surface, &sourceRect, textureSurface, nullptr, D3DTEXF_NONE);
>-
>-    SafeRelease(textureSurface);
>-
>-    if (FAILED(result))
>-    {
>-        ASSERT(result == D3DERR_OUTOFVIDEOMEMORY || result == E_OUTOFMEMORY);
>-        SafeRelease(texture);
>-        return gl::OutOfMemory() << "Failed to copy between internal blit textures, "
>-                                 << gl::FmtHR(result);
>-    }
>-
>+    result = device->StretchRect(surface, &sourceRect, textureSurface.Get(), nullptr, D3DTEXF_NONE);
>+    ANGLE_TRY_HR(context9, result, "Failed to copy between internal blit textures");
>     *outTexture = texture;
>-    return gl::NoError();
>+
>+    return angle::Result::Continue;
> }
> 
> void Blit9::setViewportAndShaderConstants(const RECT &sourceRect,
>@@ -702,7 +628,10 @@ void Blit9::setViewportAndShaderConstants(const RECT &sourceRect,
> 
>     float vertexConstants[8] = {
>         // halfPixelAdjust
>-        -1.0f / vp.Width, 1.0f / vp.Height, 0, 0,
>+        -1.0f / vp.Width,
>+        1.0f / vp.Height,
>+        0,
>+        0,
>         // texcoordOffset
>         static_cast<float>(sourceRect.left) / sourceSize.width,
>         static_cast<float>(flipY ? sourceRect.bottom : sourceRect.top) / sourceSize.height,
>@@ -726,7 +655,9 @@ void Blit9::setCommonBlitState()
>     device->SetRenderState(D3DRS_ALPHABLENDENABLE, FALSE);
>     device->SetRenderState(D3DRS_CULLMODE, D3DCULL_NONE);
>     device->SetRenderState(D3DRS_CLIPPLANEENABLE, 0);
>-    device->SetRenderState(D3DRS_COLORWRITEENABLE, D3DCOLORWRITEENABLE_ALPHA | D3DCOLORWRITEENABLE_BLUE | D3DCOLORWRITEENABLE_GREEN | D3DCOLORWRITEENABLE_RED);
>+    device->SetRenderState(D3DRS_COLORWRITEENABLE,
>+                           D3DCOLORWRITEENABLE_ALPHA | D3DCOLORWRITEENABLE_BLUE |
>+                               D3DCOLORWRITEENABLE_GREEN | D3DCOLORWRITEENABLE_RED);
>     device->SetRenderState(D3DRS_SRGBWRITEENABLE, FALSE);
>     device->SetRenderState(D3DRS_SCISSORTESTENABLE, FALSE);
> 
>@@ -736,10 +667,11 @@ void Blit9::setCommonBlitState()
>     device->SetSamplerState(0, D3DSAMP_ADDRESSU, D3DTADDRESS_CLAMP);
>     device->SetSamplerState(0, D3DSAMP_ADDRESSV, D3DTADDRESS_CLAMP);
> 
>-    RECT scissorRect = {0};   // Scissoring is disabled for flipping, but we need this to capture and restore the old rectangle
>+    RECT scissorRect = {0};  // Scissoring is disabled for flipping, but we need this to capture and
>+                             // restore the old rectangle
>     device->SetScissorRect(&scissorRect);
> 
>-    for(int i = 0; i < gl::MAX_VERTEX_ATTRIBS; i++)
>+    for (int i = 0; i < gl::MAX_VERTEX_ATTRIBS; i++)
>     {
>         device->SetStreamSourceFreq(i, 1);
>     }
>@@ -750,7 +682,7 @@ void Blit9::render()
>     IDirect3DDevice9 *device = mRenderer->getDevice();
> 
>     HRESULT hr = device->SetStreamSource(0, mQuadVertexBuffer, 0, 2 * sizeof(float));
>-    hr = device->SetVertexDeclaration(mQuadVertexDeclaration);
>+    hr         = device->SetVertexDeclaration(mQuadVertexDeclaration);
> 
>     mRenderer->startScene();
>     hr = device->DrawPrimitive(D3DPT_TRIANGLESTRIP, 0, 2);
>@@ -772,7 +704,7 @@ void Blit9::saveState()
> 
>         setCommonBlitState();
> 
>-        static const float dummyConst[8] = { 0 };
>+        static const float dummyConst[8] = {0};
> 
>         device->SetVertexShader(nullptr);
>         device->SetVertexShaderConstantF(0, dummyConst, 2);
>@@ -780,12 +712,12 @@ void Blit9::saveState()
>         device->SetPixelShaderConstantF(0, dummyConst, 2);
> 
>         D3DVIEWPORT9 dummyVp;
>-        dummyVp.X = 0;
>-        dummyVp.Y = 0;
>-        dummyVp.Width = 1;
>+        dummyVp.X      = 0;
>+        dummyVp.Y      = 0;
>+        dummyVp.Width  = 1;
>         dummyVp.Height = 1;
>-        dummyVp.MinZ = 0;
>-        dummyVp.MaxZ = 1;
>+        dummyVp.MinZ   = 0;
>+        dummyVp.MaxZ   = 1;
> 
>         device->SetViewport(&dummyVp);
> 
>@@ -825,5 +757,4 @@ void Blit9::restoreState()
>         mSavedStateBlock->Apply();
>     }
> }
>-
>-}
>+}  // namespace rx
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/Blit9.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/Blit9.h
>index 026874f8ae3..d1be9b9c5ec 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/Blit9.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/Blit9.h
>@@ -9,11 +9,10 @@
> #ifndef LIBANGLE_RENDERER_D3D_D3D9_BLIT9_H_
> #define LIBANGLE_RENDERER_D3D_D3D9_BLIT9_H_
> 
>+#include "common/PackedEnums.h"
> #include "common/angleutils.h"
> #include "libANGLE/Error.h"
> 
>-#include <GLES2/gl2.h>
>-
> namespace gl
> {
> class Context;
>@@ -21,10 +20,11 @@ class Framebuffer;
> class Texture;
> struct Extents;
> struct Offset;
>-}
>+}  // namespace gl
> 
> namespace rx
> {
>+class Context9;
> class Renderer9;
> class TextureStorage;
> 
>@@ -34,41 +34,41 @@ class Blit9 : angle::NonCopyable
>     explicit Blit9(Renderer9 *renderer);
>     ~Blit9();
> 
>-    gl::Error initialize();
>+    angle::Result initialize(Context9 *context9);
> 
>     // Copy from source surface to dest surface.
>     // sourceRect, xoffset, yoffset are in D3D coordinates (0,0 in upper-left)
>-    gl::Error copy2D(const gl::Context *context,
>-                     const gl::Framebuffer *framebuffer,
>-                     const RECT &sourceRect,
>-                     GLenum destFormat,
>-                     const gl::Offset &destOffset,
>-                     TextureStorage *storage,
>-                     GLint level);
>-    gl::Error copyCube(const gl::Context *context,
>-                       const gl::Framebuffer *framebuffer,
>-                       const RECT &sourceRect,
>-                       GLenum destFormat,
>-                       const gl::Offset &destOffset,
>-                       TextureStorage *storage,
>-                       GLenum target,
>-                       GLint level);
>-    gl::Error copyTexture(const gl::Context *context,
>-                          const gl::Texture *source,
>-                          GLint sourceLevel,
>-                          const RECT &sourceRect,
>-                          GLenum destFormat,
>-                          const gl::Offset &destOffset,
>-                          TextureStorage *storage,
>-                          GLenum destTarget,
>-                          GLint destLevel,
>-                          bool flipY,
>-                          bool premultiplyAlpha,
>-                          bool unmultiplyAlpha);
>+    angle::Result copy2D(const gl::Context *context,
>+                         const gl::Framebuffer *framebuffer,
>+                         const RECT &sourceRect,
>+                         GLenum destFormat,
>+                         const gl::Offset &destOffset,
>+                         TextureStorage *storage,
>+                         GLint level);
>+    angle::Result copyCube(const gl::Context *context,
>+                           const gl::Framebuffer *framebuffer,
>+                           const RECT &sourceRect,
>+                           GLenum destFormat,
>+                           const gl::Offset &destOffset,
>+                           TextureStorage *storage,
>+                           gl::TextureTarget target,
>+                           GLint level);
>+    angle::Result copyTexture(const gl::Context *context,
>+                              const gl::Texture *source,
>+                              GLint sourceLevel,
>+                              const RECT &sourceRect,
>+                              GLenum destFormat,
>+                              const gl::Offset &destOffset,
>+                              TextureStorage *storage,
>+                              gl::TextureTarget destTarget,
>+                              GLint destLevel,
>+                              bool flipY,
>+                              bool premultiplyAlpha,
>+                              bool unmultiplyAlpha);
> 
>     // 2x2 box filter sample from source to dest.
>     // Requires that source is RGB(A) and dest has the same format as source.
>-    gl::Error boxFilter(IDirect3DSurface9 *source, IDirect3DSurface9 *dest);
>+    angle::Result boxFilter(Context9 *context9, IDirect3DSurface9 *source, IDirect3DSurface9 *dest);
> 
>   private:
>     Renderer9 *mRenderer;
>@@ -81,32 +81,36 @@ class Blit9 : angle::NonCopyable
>     // sourceRect, xoffset, yoffset are in D3D coordinates (0,0 in upper-left)
>     // source is interpreted as RGBA and destFormat specifies the desired result format. For
>     // example, if destFormat = GL_RGB, the alpha channel will be forced to 0.
>-    gl::Error formatConvert(IDirect3DBaseTexture9 *source,
>-                            const RECT &sourceRect,
>-                            const gl::Extents &sourceSize,
>-                            GLenum destFormat,
>-                            const gl::Offset &destOffset,
>-                            IDirect3DSurface9 *dest,
>-                            bool flipY,
>-                            bool premultiplyAlpha,
>-                            bool unmultiplyAlpha);
>-    gl::Error setFormatConvertShaders(GLenum destFormat,
>-                                      bool flipY,
>-                                      bool premultiplyAlpha,
>-                                      bool unmultiplyAlpha);
>-
>-    gl::Error copy(IDirect3DSurface9 *source,
>-                   IDirect3DBaseTexture9 *sourceTexture,
>-                   const RECT &sourceRect,
>-                   GLenum destFormat,
>-                   const gl::Offset &destOffset,
>-                   IDirect3DSurface9 *dest,
>-                   bool flipY,
>-                   bool premultiplyAlpha,
>-                   bool unmultiplyAlpha);
>-    gl::Error copySurfaceToTexture(IDirect3DSurface9 *surface,
>-                                   const RECT &sourceRect,
>-                                   IDirect3DBaseTexture9 **outTexture);
>+    angle::Result formatConvert(Context9 *context9,
>+                                IDirect3DBaseTexture9 *source,
>+                                const RECT &sourceRect,
>+                                const gl::Extents &sourceSize,
>+                                GLenum destFormat,
>+                                const gl::Offset &destOffset,
>+                                IDirect3DSurface9 *dest,
>+                                bool flipY,
>+                                bool premultiplyAlpha,
>+                                bool unmultiplyAlpha);
>+    angle::Result setFormatConvertShaders(Context9 *context9,
>+                                          GLenum destFormat,
>+                                          bool flipY,
>+                                          bool premultiplyAlpha,
>+                                          bool unmultiplyAlpha);
>+
>+    angle::Result copy(Context9 *context9,
>+                       IDirect3DSurface9 *source,
>+                       IDirect3DBaseTexture9 *sourceTexture,
>+                       const RECT &sourceRect,
>+                       GLenum destFormat,
>+                       const gl::Offset &destOffset,
>+                       IDirect3DSurface9 *dest,
>+                       bool flipY,
>+                       bool premultiplyAlpha,
>+                       bool unmultiplyAlpha);
>+    angle::Result copySurfaceToTexture(Context9 *context9,
>+                                       IDirect3DSurface9 *surface,
>+                                       const RECT &sourceRect,
>+                                       angle::ComPtr<IDirect3DBaseTexture9> *outTexture);
>     void setViewportAndShaderConstants(const RECT &sourceRect,
>                                        const gl::Extents &sourceSize,
>                                        const RECT &destRect,
>@@ -133,12 +137,17 @@ class Blit9 : angle::NonCopyable
>     IUnknown *mCompiledShaders[SHADER_COUNT];
> 
>     template <class D3DShaderType>
>-    gl::Error setShader(ShaderId source, const char *profile,
>-                        gl::Error (Renderer9::*createShader)(const DWORD *, size_t length, D3DShaderType **outShader),
>-                        HRESULT (WINAPI IDirect3DDevice9::*setShader)(D3DShaderType*));
>-
>-    gl::Error setVertexShader(ShaderId shader);
>-    gl::Error setPixelShader(ShaderId shader);
>+    angle::Result setShader(Context9 *,
>+                            ShaderId source,
>+                            const char *profile,
>+                            angle::Result (Renderer9::*createShader)(Context9 *context9,
>+                                                                     const DWORD *,
>+                                                                     size_t length,
>+                                                                     D3DShaderType **outShader),
>+                            HRESULT (WINAPI IDirect3DDevice9::*setShader)(D3DShaderType *));
>+
>+    angle::Result setVertexShader(Context9 *context9, ShaderId shader);
>+    angle::Result setPixelShader(Context9 *context9, ShaderId shader);
>     void render();
> 
>     void saveState();
>@@ -147,7 +156,6 @@ class Blit9 : angle::NonCopyable
>     IDirect3DSurface9 *mSavedRenderTarget;
>     IDirect3DSurface9 *mSavedDepthStencil;
> };
>+}  // namespace rx
> 
>-}
>-
>-#endif   // LIBANGLE_RENDERER_D3D_D3D9_BLIT9_H_
>+#endif  // LIBANGLE_RENDERER_D3D_D3D9_BLIT9_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/Buffer9.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/Buffer9.cpp
>index dc308e77520..dbf875134bd 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/Buffer9.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/Buffer9.cpp
>@@ -7,6 +7,8 @@
> // Buffer9.cpp Defines the Buffer9 class.
> 
> #include "libANGLE/renderer/d3d/d3d9/Buffer9.h"
>+
>+#include "libANGLE/Context.h"
> #include "libANGLE/renderer/d3d/d3d9/Renderer9.h"
> 
> namespace rx
>@@ -14,8 +16,7 @@ namespace rx
> 
> Buffer9::Buffer9(const gl::BufferState &state, Renderer9 *renderer)
>     : BufferD3D(state, renderer), mSize(0)
>-{
>-}
>+{}
> 
> Buffer9::~Buffer9()
> {
>@@ -32,18 +33,15 @@ bool Buffer9::supportsDirectBinding() const
>     return false;
> }
> 
>-gl::Error Buffer9::setData(const gl::Context *context,
>-                           gl::BufferBinding /*target*/,
>-                           const void *data,
>-                           size_t size,
>-                           gl::BufferUsage usage)
>+angle::Result Buffer9::setData(const gl::Context *context,
>+                               gl::BufferBinding target,
>+                               const void *data,
>+                               size_t size,
>+                               gl::BufferUsage usage)
> {
>     if (size > mMemory.size())
>     {
>-        if (!mMemory.resize(size))
>-        {
>-            return gl::OutOfMemory() << "Failed to resize internal buffer.";
>-        }
>+        ANGLE_CHECK_GL_ALLOC(GetImplAs<Context9>(context), mMemory.resize(size));
>     }
> 
>     mSize = size;
>@@ -56,27 +54,31 @@ gl::Error Buffer9::setData(const gl::Context *context,
> 
>     invalidateStaticData(context);
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error Buffer9::getData(const gl::Context *context, const uint8_t **outData)
>+angle::Result Buffer9::getData(const gl::Context *context, const uint8_t **outData)
> {
>-    *outData = mMemory.data();
>-    return gl::NoError();
>+    if (mMemory.empty())
>+    {
>+        *outData = nullptr;
>+    }
>+    else
>+    {
>+        *outData = mMemory.data();
>+    }
>+    return angle::Result::Continue;
> }
> 
>-gl::Error Buffer9::setSubData(const gl::Context *context,
>-                              gl::BufferBinding /*target*/,
>-                              const void *data,
>-                              size_t size,
>-                              size_t offset)
>+angle::Result Buffer9::setSubData(const gl::Context *context,
>+                                  gl::BufferBinding target,
>+                                  const void *data,
>+                                  size_t size,
>+                                  size_t offset)
> {
>     if (offset + size > mMemory.size())
>     {
>-        if (!mMemory.resize(offset + size))
>-        {
>-            return gl::OutOfMemory() << "Failed to resize internal buffer.";
>-        }
>+        ANGLE_CHECK_GL_ALLOC(GetImplAs<Context9>(context), mMemory.resize(size + offset));
>     }
> 
>     mSize = std::max(mSize, offset + size);
>@@ -87,14 +89,14 @@ gl::Error Buffer9::setSubData(const gl::Context *context,
> 
>     invalidateStaticData(context);
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error Buffer9::copySubData(const gl::Context *context,
>-                               BufferImpl *source,
>-                               GLintptr sourceOffset,
>-                               GLintptr destOffset,
>-                               GLsizeiptr size)
>+angle::Result Buffer9::copySubData(const gl::Context *context,
>+                                   BufferImpl *source,
>+                                   GLintptr sourceOffset,
>+                                   GLintptr destOffset,
>+                                   GLsizeiptr size)
> {
>     // Note: this method is currently unreachable
>     Buffer9 *sourceBuffer = GetAs<Buffer9>(source);
>@@ -104,36 +106,36 @@ gl::Error Buffer9::copySubData(const gl::Context *context,
> 
>     invalidateStaticData(context);
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
> // We do not support buffer mapping in D3D9
>-gl::Error Buffer9::map(const gl::Context *context, GLenum access, void **mapPtr)
>+angle::Result Buffer9::map(const gl::Context *context, GLenum access, void **mapPtr)
> {
>-    UNREACHABLE();
>-    return gl::InternalError();
>+    ANGLE_HR_UNREACHABLE(GetImplAs<Context9>(context));
>+    return angle::Result::Stop;
> }
> 
>-gl::Error Buffer9::mapRange(const gl::Context *context,
>-                            size_t offset,
>-                            size_t length,
>-                            GLbitfield access,
>-                            void **mapPtr)
>+angle::Result Buffer9::mapRange(const gl::Context *context,
>+                                size_t offset,
>+                                size_t length,
>+                                GLbitfield access,
>+                                void **mapPtr)
> {
>-    UNREACHABLE();
>-    return gl::InternalError();
>+    ANGLE_HR_UNREACHABLE(GetImplAs<Context9>(context));
>+    return angle::Result::Stop;
> }
> 
>-gl::Error Buffer9::unmap(const gl::Context *context, GLboolean *result)
>+angle::Result Buffer9::unmap(const gl::Context *context, GLboolean *result)
> {
>-    UNREACHABLE();
>-    return gl::InternalError();
>+    ANGLE_HR_UNREACHABLE(GetImplAs<Context9>(context));
>+    return angle::Result::Stop;
> }
> 
>-gl::Error Buffer9::markTransformFeedbackUsage(const gl::Context *context)
>+angle::Result Buffer9::markTransformFeedbackUsage(const gl::Context *context)
> {
>-    UNREACHABLE();
>-    return gl::InternalError();
>+    ANGLE_HR_UNREACHABLE(GetImplAs<Context9>(context));
>+    return angle::Result::Stop;
> }
> 
> }  // namespace rx
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/Buffer9.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/Buffer9.h
>index 960b2a2474a..dad120d75b9 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/Buffer9.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/Buffer9.h
>@@ -26,32 +26,32 @@ class Buffer9 : public BufferD3D
>     // BufferD3D implementation
>     size_t getSize() const override;
>     bool supportsDirectBinding() const override;
>-    gl::Error getData(const gl::Context *context, const uint8_t **outData) override;
>+    angle::Result getData(const gl::Context *context, const uint8_t **outData) override;
> 
>     // BufferImpl implementation
>-    gl::Error setData(const gl::Context *context,
>-                      gl::BufferBinding target,
>-                      const void *data,
>-                      size_t size,
>-                      gl::BufferUsage usage) override;
>-    gl::Error setSubData(const gl::Context *context,
>-                         gl::BufferBinding target,
>-                         const void *data,
>-                         size_t size,
>-                         size_t offset) override;
>-    gl::Error copySubData(const gl::Context *context,
>-                          BufferImpl *source,
>-                          GLintptr sourceOffset,
>-                          GLintptr destOffset,
>-                          GLsizeiptr size) override;
>-    gl::Error map(const gl::Context *context, GLenum access, void **mapPtr) override;
>-    gl::Error mapRange(const gl::Context *context,
>-                       size_t offset,
>-                       size_t length,
>-                       GLbitfield access,
>-                       void **mapPtr) override;
>-    gl::Error unmap(const gl::Context *context, GLboolean *result) override;
>-    gl::Error markTransformFeedbackUsage(const gl::Context *context) override;
>+    angle::Result setData(const gl::Context *context,
>+                          gl::BufferBinding target,
>+                          const void *data,
>+                          size_t size,
>+                          gl::BufferUsage usage) override;
>+    angle::Result setSubData(const gl::Context *context,
>+                             gl::BufferBinding target,
>+                             const void *data,
>+                             size_t size,
>+                             size_t offset) override;
>+    angle::Result copySubData(const gl::Context *context,
>+                              BufferImpl *source,
>+                              GLintptr sourceOffset,
>+                              GLintptr destOffset,
>+                              GLsizeiptr size) override;
>+    angle::Result map(const gl::Context *context, GLenum access, void **mapPtr) override;
>+    angle::Result mapRange(const gl::Context *context,
>+                           size_t offset,
>+                           size_t length,
>+                           GLbitfield access,
>+                           void **mapPtr) override;
>+    angle::Result unmap(const gl::Context *context, GLboolean *result) override;
>+    angle::Result markTransformFeedbackUsage(const gl::Context *context) override;
> 
>   private:
>     angle::MemoryBuffer mMemory;
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/Context9.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/Context9.cpp
>index 1b9874cc201..85011c4db28 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/Context9.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/Context9.cpp
>@@ -27,18 +27,20 @@
> namespace rx
> {
> 
>-Context9::Context9(const gl::ContextState &state, Renderer9 *renderer)
>-    : ContextImpl(state), mRenderer(renderer)
>-{
>-}
>+Context9::Context9(const gl::State &state, gl::ErrorSet *errorSet, Renderer9 *renderer)
>+    : ContextD3D(state, errorSet), mRenderer(renderer)
>+{}
>+
>+Context9::~Context9() {}
> 
>-Context9::~Context9()
>+angle::Result Context9::initialize()
> {
>+    return angle::Result::Continue;
> }
> 
>-gl::Error Context9::initialize()
>+void Context9::onDestroy(const gl::Context *context)
> {
>-    return gl::NoError();
>+    mIncompleteTextures.onDestroy(context);
> }
> 
> CompilerImpl *Context9::createCompiler()
>@@ -63,13 +65,13 @@ FramebufferImpl *Context9::createFramebuffer(const gl::FramebufferState &data)
> 
> TextureImpl *Context9::createTexture(const gl::TextureState &state)
> {
>-    switch (state.getTarget())
>+    switch (state.getType())
>     {
>-        case GL_TEXTURE_2D:
>+        case gl::TextureType::_2D:
>             return new TextureD3D_2D(state, mRenderer);
>-        case GL_TEXTURE_CUBE_MAP:
>+        case gl::TextureType::CubeMap:
>             return new TextureD3D_Cube(state, mRenderer);
>-        case GL_TEXTURE_EXTERNAL_OES:
>+        case gl::TextureType::External:
>             return new TextureD3D_External(state, mRenderer);
>         default:
>             UNREACHABLE();
>@@ -77,9 +79,9 @@ TextureImpl *Context9::createTexture(const gl::TextureState &state)
>     return nullptr;
> }
> 
>-RenderbufferImpl *Context9::createRenderbuffer()
>+RenderbufferImpl *Context9::createRenderbuffer(const gl::RenderbufferState &state)
> {
>-    return new RenderbufferD3D(mRenderer);
>+    return new RenderbufferD3D(state, mRenderer);
> }
> 
> BufferImpl *Context9::createBuffer(const gl::BufferState &state)
>@@ -92,7 +94,7 @@ VertexArrayImpl *Context9::createVertexArray(const gl::VertexArrayState &data)
>     return new VertexArray9(data);
> }
> 
>-QueryImpl *Context9::createQuery(GLenum type)
>+QueryImpl *Context9::createQuery(gl::QueryType type)
> {
>     return new Query9(mRenderer, type);
> }
>@@ -131,78 +133,87 @@ std::vector<PathImpl *> Context9::createPaths(GLsizei)
>     return std::vector<PathImpl *>();
> }
> 
>-gl::Error Context9::flush(const gl::Context *context)
>+MemoryObjectImpl *Context9::createMemoryObject()
>+{
>+    UNREACHABLE();
>+    return nullptr;
>+}
>+
>+angle::Result Context9::flush(const gl::Context *context)
> {
>-    return mRenderer->flush();
>+    return mRenderer->flush(context);
> }
> 
>-gl::Error Context9::finish(const gl::Context *context)
>+angle::Result Context9::finish(const gl::Context *context)
> {
>-    return mRenderer->finish();
>+    return mRenderer->finish(context);
> }
> 
>-gl::Error Context9::drawArrays(const gl::Context *context, GLenum mode, GLint first, GLsizei count)
>+angle::Result Context9::drawArrays(const gl::Context *context,
>+                                   gl::PrimitiveMode mode,
>+                                   GLint first,
>+                                   GLsizei count)
> {
>     return mRenderer->genericDrawArrays(context, mode, first, count, 0);
> }
> 
>-gl::Error Context9::drawArraysInstanced(const gl::Context *context,
>-                                        GLenum mode,
>-                                        GLint first,
>-                                        GLsizei count,
>-                                        GLsizei instanceCount)
>+angle::Result Context9::drawArraysInstanced(const gl::Context *context,
>+                                            gl::PrimitiveMode mode,
>+                                            GLint first,
>+                                            GLsizei count,
>+                                            GLsizei instanceCount)
> {
>     return mRenderer->genericDrawArrays(context, mode, first, count, instanceCount);
> }
> 
>-gl::Error Context9::drawElements(const gl::Context *context,
>-                                 GLenum mode,
>-                                 GLsizei count,
>-                                 GLenum type,
>-                                 const void *indices)
>+angle::Result Context9::drawElements(const gl::Context *context,
>+                                     gl::PrimitiveMode mode,
>+                                     GLsizei count,
>+                                     gl::DrawElementsType type,
>+                                     const void *indices)
> {
>     return mRenderer->genericDrawElements(context, mode, count, type, indices, 0);
> }
> 
>-gl::Error Context9::drawElementsInstanced(const gl::Context *context,
>-                                          GLenum mode,
>-                                          GLsizei count,
>-                                          GLenum type,
>-                                          const void *indices,
>-                                          GLsizei instances)
>+angle::Result Context9::drawElementsInstanced(const gl::Context *context,
>+                                              gl::PrimitiveMode mode,
>+                                              GLsizei count,
>+                                              gl::DrawElementsType type,
>+                                              const void *indices,
>+                                              GLsizei instances)
> {
>     return mRenderer->genericDrawElements(context, mode, count, type, indices, instances);
> }
> 
>-gl::Error Context9::drawRangeElements(const gl::Context *context,
>-                                      GLenum mode,
>-                                      GLuint start,
>-                                      GLuint end,
>-                                      GLsizei count,
>-                                      GLenum type,
>-                                      const void *indices)
>+angle::Result Context9::drawRangeElements(const gl::Context *context,
>+                                          gl::PrimitiveMode mode,
>+                                          GLuint start,
>+                                          GLuint end,
>+                                          GLsizei count,
>+                                          gl::DrawElementsType type,
>+                                          const void *indices)
> {
>     return mRenderer->genericDrawElements(context, mode, count, type, indices, 0);
> }
> 
>-gl::Error Context9::drawArraysIndirect(const gl::Context *context,
>-                                       GLenum mode,
>-                                       const void *indirect)
>+angle::Result Context9::drawArraysIndirect(const gl::Context *context,
>+                                           gl::PrimitiveMode mode,
>+                                           const void *indirect)
> {
>-    UNREACHABLE();
>-    return gl::InternalError() << "D3D9 doesn't support ES 3.1 DrawArraysIndirect API";
>+    ANGLE_HR_UNREACHABLE(this);
>+    return angle::Result::Stop;
> }
> 
>-gl::Error Context9::drawElementsIndirect(const gl::Context *context,
>-                                         GLenum mode,
>-                                         GLenum type,
>-                                         const void *indirect)
>+angle::Result Context9::drawElementsIndirect(const gl::Context *context,
>+                                             gl::PrimitiveMode mode,
>+                                             gl::DrawElementsType type,
>+                                             const void *indirect)
> {
>-    UNREACHABLE();
>-    return gl::InternalError() << "D3D9 doesn't support ES 3.1 DrawElementsIndirect API";
>+    ANGLE_HR_UNREACHABLE(this);
>+    return angle::Result::Stop;
> }
> 
>-GLenum Context9::getResetStatus()
>+gl::GraphicsResetStatus Context9::getResetStatus()
> {
>     return mRenderer->getResetStatus();
> }
>@@ -219,31 +230,30 @@ std::string Context9::getRendererDescription() const
> 
> void Context9::insertEventMarker(GLsizei length, const char *marker)
> {
>-    auto optionalString = angle::WidenString(static_cast<size_t>(length), marker);
>-    if (optionalString.valid())
>-    {
>-        mRenderer->getAnnotator()->setMarker(optionalString.value().data());
>-    }
>+    mRenderer->getAnnotator()->setMarker(marker);
> }
> 
> void Context9::pushGroupMarker(GLsizei length, const char *marker)
> {
>-    auto optionalString = angle::WidenString(static_cast<size_t>(length), marker);
>-    if (optionalString.valid())
>-    {
>-        mRenderer->getAnnotator()->beginEvent(optionalString.value().data());
>-    }
>+    mRenderer->getAnnotator()->beginEvent(marker, marker);
>+    mMarkerStack.push(std::string(marker));
> }
> 
> void Context9::popGroupMarker()
> {
>-    mRenderer->getAnnotator()->endEvent();
>+    const char *marker = nullptr;
>+    if (!mMarkerStack.empty())
>+    {
>+        marker = mMarkerStack.top().c_str();
>+        mMarkerStack.pop();
>+        mRenderer->getAnnotator()->endEvent(marker);
>+    }
> }
> 
>-void Context9::pushDebugGroup(GLenum source, GLuint id, GLsizei length, const char *message)
>+void Context9::pushDebugGroup(GLenum source, GLuint id, const std::string &message)
> {
>     // Fall through to the EXT_debug_marker functions
>-    pushGroupMarker(length, message);
>+    pushGroupMarker(message.size(), message.c_str());
> }
> 
> void Context9::popDebugGroup()
>@@ -252,9 +262,12 @@ void Context9::popDebugGroup()
>     popGroupMarker();
> }
> 
>-void Context9::syncState(const gl::Context *context, const gl::State::DirtyBits &dirtyBits)
>+angle::Result Context9::syncState(const gl::Context *context,
>+                                  const gl::State::DirtyBits &dirtyBits,
>+                                  const gl::State::DirtyBits &bitMask)
> {
>-    mRenderer->getStateManager()->syncState(mState.getState(), dirtyBits);
>+    mRenderer->getStateManager()->syncState(mState, dirtyBits);
>+    return angle::Result::Continue;
> }
> 
> GLint Context9::getGPUDisjoint()
>@@ -267,11 +280,13 @@ GLint64 Context9::getTimestamp()
>     return mRenderer->getTimestamp();
> }
> 
>-void Context9::onMakeCurrent(const gl::Context *context)
>+angle::Result Context9::onMakeCurrent(const gl::Context *context)
> {
>+    mRenderer->getStateManager()->setAllDirtyBits();
>+    return mRenderer->ensureVertexDataManagerInitialized(context);
> }
> 
>-const gl::Caps &Context9::getNativeCaps() const
>+gl::Caps Context9::getNativeCaps() const
> {
>     return mRenderer->getNativeCaps();
> }
>@@ -291,13 +306,58 @@ const gl::Limitations &Context9::getNativeLimitations() const
>     return mRenderer->getNativeLimitations();
> }
> 
>-gl::Error Context9::dispatchCompute(const gl::Context *context,
>-                                    GLuint numGroupsX,
>-                                    GLuint numGroupsY,
>-                                    GLuint numGroupsZ)
>+angle::Result Context9::dispatchCompute(const gl::Context *context,
>+                                        GLuint numGroupsX,
>+                                        GLuint numGroupsY,
>+                                        GLuint numGroupsZ)
> {
>-    UNREACHABLE();
>-    return gl::InternalError() << "D3D9 doesn't support ES 3.1 DispatchCompute API";
>+    ANGLE_HR_UNREACHABLE(this);
>+    return angle::Result::Stop;
> }
> 
>+angle::Result Context9::dispatchComputeIndirect(const gl::Context *context, GLintptr indirect)
>+{
>+    ANGLE_HR_UNREACHABLE(this);
>+    return angle::Result::Stop;
>+}
>+
>+angle::Result Context9::memoryBarrier(const gl::Context *context, GLbitfield barriers)
>+{
>+    ANGLE_HR_UNREACHABLE(this);
>+    return angle::Result::Stop;
>+}
>+
>+angle::Result Context9::memoryBarrierByRegion(const gl::Context *context, GLbitfield barriers)
>+{
>+    ANGLE_HR_UNREACHABLE(this);
>+    return angle::Result::Stop;
>+}
>+
>+angle::Result Context9::getIncompleteTexture(const gl::Context *context,
>+                                             gl::TextureType type,
>+                                             gl::Texture **textureOut)
>+{
>+    return mIncompleteTextures.getIncompleteTexture(context, type, nullptr, textureOut);
>+}
>+
>+void Context9::handleResult(HRESULT hr,
>+                            const char *message,
>+                            const char *file,
>+                            const char *function,
>+                            unsigned int line)
>+{
>+    ASSERT(FAILED(hr));
>+
>+    if (d3d9::isDeviceLostError(hr))
>+    {
>+        mRenderer->notifyDeviceLost();
>+    }
>+
>+    GLenum glErrorCode = DefaultGLErrorCode(hr);
>+
>+    std::stringstream errorStream;
>+    errorStream << "Internal D3D9 error: " << gl::FmtHR(hr) << ": " << message;
>+
>+    mErrors->handleError(glErrorCode, errorStream.str().c_str(), file, function, line);
>+}
> }  // namespace rx
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/Context9.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/Context9.h
>index d681bfde898..2960671add8 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/Context9.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/Context9.h
>@@ -10,19 +10,21 @@
> #ifndef LIBANGLE_RENDERER_D3D_D3D9_CONTEXT9_H_
> #define LIBANGLE_RENDERER_D3D_D3D9_CONTEXT9_H_
> 
>-#include "libANGLE/renderer/ContextImpl.h"
>+#include <stack>
>+#include "libANGLE/renderer/d3d/ContextD3D.h"
> 
> namespace rx
> {
> class Renderer9;
> 
>-class Context9 : public ContextImpl
>+class Context9 : public ContextD3D
> {
>   public:
>-    Context9(const gl::ContextState &state, Renderer9 *renderer);
>+    Context9(const gl::State &state, gl::ErrorSet *errorSet, Renderer9 *renderer);
>     ~Context9() override;
> 
>-    gl::Error initialize() override;
>+    angle::Result initialize() override;
>+    void onDestroy(const gl::Context *context) override;
> 
>     // Shader creation
>     CompilerImpl *createCompiler() override;
>@@ -36,7 +38,7 @@ class Context9 : public ContextImpl
>     TextureImpl *createTexture(const gl::TextureState &state) override;
> 
>     // Renderbuffer creation
>-    RenderbufferImpl *createRenderbuffer() override;
>+    RenderbufferImpl *createRenderbuffer(const gl::RenderbufferState &state) override;
> 
>     // Buffer creation
>     BufferImpl *createBuffer(const gl::BufferState &state) override;
>@@ -45,7 +47,7 @@ class Context9 : public ContextImpl
>     VertexArrayImpl *createVertexArray(const gl::VertexArrayState &data) override;
> 
>     // Query and Fence creation
>-    QueryImpl *createQuery(GLenum type) override;
>+    QueryImpl *createQuery(gl::QueryType type) override;
>     FenceNVImpl *createFenceNV() override;
>     SyncImpl *createSync() override;
> 
>@@ -62,49 +64,52 @@ class Context9 : public ContextImpl
>     // Path object creation
>     std::vector<PathImpl *> createPaths(GLsizei) override;
> 
>+    // Memory object creation.
>+    MemoryObjectImpl *createMemoryObject() override;
>+
>     // Flush and finish.
>-    gl::Error flush(const gl::Context *context) override;
>-    gl::Error finish(const gl::Context *context) override;
>+    angle::Result flush(const gl::Context *context) override;
>+    angle::Result finish(const gl::Context *context) override;
> 
>     // Drawing methods.
>-    gl::Error drawArrays(const gl::Context *context,
>-                         GLenum mode,
>-                         GLint first,
>-                         GLsizei count) override;
>-    gl::Error drawArraysInstanced(const gl::Context *context,
>-                                  GLenum mode,
>-                                  GLint first,
>-                                  GLsizei count,
>-                                  GLsizei instanceCount) override;
>-
>-    gl::Error drawElements(const gl::Context *context,
>-                           GLenum mode,
>-                           GLsizei count,
>-                           GLenum type,
>-                           const void *indices) override;
>-    gl::Error drawElementsInstanced(const gl::Context *context,
>-                                    GLenum mode,
>+    angle::Result drawArrays(const gl::Context *context,
>+                             gl::PrimitiveMode mode,
>+                             GLint first,
>+                             GLsizei count) override;
>+    angle::Result drawArraysInstanced(const gl::Context *context,
>+                                      gl::PrimitiveMode mode,
>+                                      GLint first,
>+                                      GLsizei count,
>+                                      GLsizei instanceCount) override;
>+
>+    angle::Result drawElements(const gl::Context *context,
>+                               gl::PrimitiveMode mode,
>+                               GLsizei count,
>+                               gl::DrawElementsType type,
>+                               const void *indices) override;
>+    angle::Result drawElementsInstanced(const gl::Context *context,
>+                                        gl::PrimitiveMode mode,
>+                                        GLsizei count,
>+                                        gl::DrawElementsType type,
>+                                        const void *indices,
>+                                        GLsizei instances) override;
>+    angle::Result drawRangeElements(const gl::Context *context,
>+                                    gl::PrimitiveMode mode,
>+                                    GLuint start,
>+                                    GLuint end,
>                                     GLsizei count,
>-                                    GLenum type,
>-                                    const void *indices,
>-                                    GLsizei instances) override;
>-    gl::Error drawRangeElements(const gl::Context *context,
>-                                GLenum mode,
>-                                GLuint start,
>-                                GLuint end,
>-                                GLsizei count,
>-                                GLenum type,
>-                                const void *indices) override;
>-    gl::Error drawArraysIndirect(const gl::Context *context,
>-                                 GLenum mode,
>-                                 const void *indirect) override;
>-    gl::Error drawElementsIndirect(const gl::Context *context,
>-                                   GLenum mode,
>-                                   GLenum type,
>-                                   const void *indirect) override;
>+                                    gl::DrawElementsType type,
>+                                    const void *indices) override;
>+    angle::Result drawArraysIndirect(const gl::Context *context,
>+                                     gl::PrimitiveMode mode,
>+                                     const void *indirect) override;
>+    angle::Result drawElementsIndirect(const gl::Context *context,
>+                                       gl::PrimitiveMode mode,
>+                                       gl::DrawElementsType type,
>+                                       const void *indirect) override;
> 
>     // Device loss
>-    GLenum getResetStatus() override;
>+    gl::GraphicsResetStatus getResetStatus() override;
> 
>     // Vendor and description strings.
>     std::string getVendorString() const override;
>@@ -116,34 +121,52 @@ class Context9 : public ContextImpl
>     void popGroupMarker() override;
> 
>     // KHR_debug
>-    void pushDebugGroup(GLenum source, GLuint id, GLsizei length, const char *message) override;
>+    void pushDebugGroup(GLenum source, GLuint id, const std::string &message) override;
>     void popDebugGroup() override;
> 
>     // State sync with dirty bits.
>-    void syncState(const gl::Context *context, const gl::State::DirtyBits &dirtyBits) override;
>+    angle::Result syncState(const gl::Context *context,
>+                            const gl::State::DirtyBits &dirtyBits,
>+                            const gl::State::DirtyBits &bitMask) override;
> 
>     // Disjoint timer queries
>     GLint getGPUDisjoint() override;
>     GLint64 getTimestamp() override;
> 
>     // Context switching
>-    void onMakeCurrent(const gl::Context *context) override;
>+    angle::Result onMakeCurrent(const gl::Context *context) override;
> 
>     // Caps queries
>-    const gl::Caps &getNativeCaps() const override;
>+    gl::Caps getNativeCaps() const override;
>     const gl::TextureCapsMap &getNativeTextureCaps() const override;
>     const gl::Extensions &getNativeExtensions() const override;
>     const gl::Limitations &getNativeLimitations() const override;
> 
>-    gl::Error dispatchCompute(const gl::Context *context,
>-                              GLuint numGroupsX,
>-                              GLuint numGroupsY,
>-                              GLuint numGroupsZ) override;
>+    angle::Result dispatchCompute(const gl::Context *context,
>+                                  GLuint numGroupsX,
>+                                  GLuint numGroupsY,
>+                                  GLuint numGroupsZ) override;
>+    angle::Result dispatchComputeIndirect(const gl::Context *context, GLintptr indirect) override;
>+
>+    angle::Result memoryBarrier(const gl::Context *context, GLbitfield barriers) override;
>+    angle::Result memoryBarrierByRegion(const gl::Context *context, GLbitfield barriers) override;
> 
>     Renderer9 *getRenderer() const { return mRenderer; }
> 
>+    angle::Result getIncompleteTexture(const gl::Context *context,
>+                                       gl::TextureType type,
>+                                       gl::Texture **textureOut);
>+
>+    void handleResult(HRESULT hr,
>+                      const char *message,
>+                      const char *file,
>+                      const char *function,
>+                      unsigned int line) override;
>+
>   private:
>     Renderer9 *mRenderer;
>+    IncompleteTextureSet mIncompleteTextures;
>+    std::stack<std::string> mMarkerStack;
> };
> 
> }  // namespace rx
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/DebugAnnotator9.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/DebugAnnotator9.cpp
>index 6ec35e16a78..18034b6b3c0 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/DebugAnnotator9.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/DebugAnnotator9.cpp
>@@ -13,19 +13,26 @@
> namespace rx
> {
> 
>-void DebugAnnotator9::beginEvent(const wchar_t *eventName)
>+void DebugAnnotator9::beginEvent(const char *eventName, const char *eventMessage)
> {
>-    D3DPERF_BeginEvent(0, eventName);
>+    angle::LoggingAnnotator::beginEvent(eventName, eventMessage);
>+    std::mbstate_t state = std::mbstate_t();
>+    std::mbsrtowcs(mWCharMessage, &eventMessage, kMaxMessageLength, &state);
>+    D3DPERF_BeginEvent(0, mWCharMessage);
> }
> 
>-void DebugAnnotator9::endEvent()
>+void DebugAnnotator9::endEvent(const char *eventName)
> {
>+    angle::LoggingAnnotator::endEvent(eventName);
>     D3DPERF_EndEvent();
> }
> 
>-void DebugAnnotator9::setMarker(const wchar_t *markerName)
>+void DebugAnnotator9::setMarker(const char *markerName)
> {
>-    D3DPERF_SetMarker(0, markerName);
>+    angle::LoggingAnnotator::setMarker(markerName);
>+    std::mbstate_t state = std::mbstate_t();
>+    std::mbsrtowcs(mWCharMessage, &markerName, kMaxMessageLength, &state);
>+    D3DPERF_SetMarker(0, mWCharMessage);
> }
> 
> bool DebugAnnotator9::getStatus()
>@@ -33,4 +40,4 @@ bool DebugAnnotator9::getStatus()
>     return !!D3DPERF_GetStatus();
> }
> 
>-}
>+}  // namespace rx
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/DebugAnnotator9.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/DebugAnnotator9.h
>index b28008335f2..4aa23a6e33f 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/DebugAnnotator9.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/DebugAnnotator9.h
>@@ -18,12 +18,16 @@ class DebugAnnotator9 : public angle::LoggingAnnotator
> {
>   public:
>     DebugAnnotator9() {}
>-    void beginEvent(const wchar_t *eventName) override;
>-    void endEvent() override;
>-    void setMarker(const wchar_t *markerName) override;
>+    void beginEvent(const char *eventName, const char *eventMessage) override;
>+    void endEvent(const char *eventName) override;
>+    void setMarker(const char *markerName) override;
>     bool getStatus() override;
>+
>+  private:
>+    static constexpr size_t kMaxMessageLength = 256;
>+    wchar_t mWCharMessage[kMaxMessageLength];
> };
> 
>-}
>+}  // namespace rx
> 
>-#endif // LIBANGLE_RENDERER_D3D_D3D9_DEBUGANNOTATOR9_H_
>+#endif  // LIBANGLE_RENDERER_D3D_D3D9_DEBUGANNOTATOR9_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/Fence9.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/Fence9.cpp
>index bff38816555..0113b624715 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/Fence9.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/Fence9.cpp
>@@ -7,85 +7,67 @@
> // Fence9.cpp: Defines the rx::FenceNV9 class.
> 
> #include "libANGLE/renderer/d3d/d3d9/Fence9.h"
>-#include "libANGLE/renderer/d3d/d3d9/renderer9_utils.h"
>+
>+#include "libANGLE/Context.h"
>+#include "libANGLE/renderer/d3d/d3d9/Context9.h"
> #include "libANGLE/renderer/d3d/d3d9/Renderer9.h"
>+#include "libANGLE/renderer/d3d/d3d9/renderer9_utils.h"
> 
> namespace rx
> {
> 
>-FenceNV9::FenceNV9(Renderer9 *renderer) : FenceNVImpl(), mRenderer(renderer), mQuery(nullptr)
>-{
>-}
>+FenceNV9::FenceNV9(Renderer9 *renderer) : FenceNVImpl(), mRenderer(renderer), mQuery(nullptr) {}
> 
> FenceNV9::~FenceNV9()
> {
>     SafeRelease(mQuery);
> }
> 
>-gl::Error FenceNV9::set(GLenum condition)
>+angle::Result FenceNV9::set(const gl::Context *context, GLenum condition)
> {
>     if (!mQuery)
>     {
>-        gl::Error error = mRenderer->allocateEventQuery(&mQuery);
>-        if (error.isError())
>-        {
>-            return error;
>-        }
>+        ANGLE_TRY(mRenderer->allocateEventQuery(context, &mQuery));
>     }
> 
>     HRESULT result = mQuery->Issue(D3DISSUE_END);
>     if (FAILED(result))
>     {
>-        ASSERT(result == D3DERR_OUTOFVIDEOMEMORY || result == E_OUTOFMEMORY);
>         SafeRelease(mQuery);
>-        return gl::OutOfMemory() << "Failed to end event query, " << gl::FmtHR(result);
>     }
>-
>-    return gl::NoError();
>+    ANGLE_TRY_HR(GetImplAs<Context9>(context), result, "Failed to end event query");
>+    return angle::Result::Continue;
> }
> 
>-gl::Error FenceNV9::test(GLboolean *outFinished)
>+angle::Result FenceNV9::test(const gl::Context *context, GLboolean *outFinished)
> {
>-    return testHelper(true, outFinished);
>+    return testHelper(GetImplAs<Context9>(context), true, outFinished);
> }
> 
>-gl::Error FenceNV9::finish()
>+angle::Result FenceNV9::finish(const gl::Context *context)
> {
>     GLboolean finished = GL_FALSE;
>     while (finished != GL_TRUE)
>     {
>-        gl::Error error = testHelper(true, &finished);
>-        if (error.isError())
>-        {
>-            return error;
>-        }
>-
>+        ANGLE_TRY(testHelper(GetImplAs<Context9>(context), true, &finished));
>         Sleep(0);
>     }
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error FenceNV9::testHelper(bool flushCommandBuffer, GLboolean *outFinished)
>+angle::Result FenceNV9::testHelper(Context9 *context9,
>+                                   bool flushCommandBuffer,
>+                                   GLboolean *outFinished)
> {
>     ASSERT(mQuery);
> 
>     DWORD getDataFlags = (flushCommandBuffer ? D3DGETDATA_FLUSH : 0);
>     HRESULT result     = mQuery->GetData(nullptr, 0, getDataFlags);
>-
>-    if (d3d9::isDeviceLostError(result))
>-    {
>-        mRenderer->notifyDeviceLost();
>-        return gl::OutOfMemory() << "Device was lost while querying result of an event query.";
>-    }
>-    else if (FAILED(result))
>-    {
>-        return gl::OutOfMemory() << "Failed to get query data, " << gl::FmtHR(result);
>-    }
>-
>+    ANGLE_TRY_HR(context9, result, "Failed to get query data");
>     ASSERT(result == S_OK || result == S_FALSE);
>     *outFinished = ((result == S_OK) ? GL_TRUE : GL_FALSE);
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-}
>+}  // namespace rx
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/Fence9.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/Fence9.h
>index de0ff20774d..9237301744e 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/Fence9.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/Fence9.h
>@@ -14,6 +14,7 @@
> 
> namespace rx
> {
>+class Context9;
> class Renderer9;
> 
> class FenceNV9 : public FenceNVImpl
>@@ -22,17 +23,16 @@ class FenceNV9 : public FenceNVImpl
>     explicit FenceNV9(Renderer9 *renderer);
>     ~FenceNV9() override;
> 
>-    gl::Error set(GLenum condition) override;
>-    gl::Error test(GLboolean *outFinished) override;
>-    gl::Error finish() override;
>+    angle::Result set(const gl::Context *context, GLenum condition) override;
>+    angle::Result test(const gl::Context *context, GLboolean *outFinished) override;
>+    angle::Result finish(const gl::Context *context) override;
> 
>   private:
>-    gl::Error testHelper(bool flushCommandBuffer, GLboolean *outFinished);
>+    angle::Result testHelper(Context9 *context9, bool flushCommandBuffer, GLboolean *outFinished);
> 
>     Renderer9 *mRenderer;
>     IDirect3DQuery9 *mQuery;
> };
>+}  // namespace rx
> 
>-}
>-
>-#endif // LIBANGLE_RENDERER_D3D_D3D9_FENCE9_H_
>+#endif  // LIBANGLE_RENDERER_D3D_D3D9_FENCE9_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/Framebuffer9.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/Framebuffer9.cpp
>index dff12e03f84..0b0d225d6ba 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/Framebuffer9.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/Framebuffer9.cpp
>@@ -24,66 +24,65 @@
> 
> namespace rx
> {
>-
> Framebuffer9::Framebuffer9(const gl::FramebufferState &data, Renderer9 *renderer)
>     : FramebufferD3D(data, renderer), mRenderer(renderer)
> {
>     ASSERT(mRenderer != nullptr);
> }
> 
>-Framebuffer9::~Framebuffer9()
>-{
>-}
>+Framebuffer9::~Framebuffer9() {}
> 
>-gl::Error Framebuffer9::discard(const gl::Context *context, size_t, const GLenum *)
>+angle::Result Framebuffer9::discard(const gl::Context *context,
>+                                    size_t count,
>+                                    const GLenum *attachments)
> {
>-    // Extension not implemented in D3D9 renderer
>-    UNREACHABLE();
>-    return gl::NoError();
>+    ANGLE_HR_UNREACHABLE(GetImplAs<Context9>(context));
>+    return angle::Result::Stop;
> }
> 
>-gl::Error Framebuffer9::invalidate(const gl::Context *context, size_t, const GLenum *)
>+angle::Result Framebuffer9::invalidate(const gl::Context *context,
>+                                       size_t count,
>+                                       const GLenum *attachments)
> {
>-    // Shouldn't ever reach here in D3D9
>-    UNREACHABLE();
>-    return gl::NoError();
>+    ANGLE_HR_UNREACHABLE(GetImplAs<Context9>(context));
>+    return angle::Result::Stop;
> }
> 
>-gl::Error Framebuffer9::invalidateSub(const gl::Context *context,
>-                                      size_t,
>-                                      const GLenum *,
>-                                      const gl::Rectangle &)
>+angle::Result Framebuffer9::invalidateSub(const gl::Context *context,
>+                                          size_t count,
>+                                          const GLenum *attachments,
>+                                          const gl::Rectangle &area)
> {
>-    // Shouldn't ever reach here in D3D9
>-    UNREACHABLE();
>-    return gl::NoError();
>+    ANGLE_HR_UNREACHABLE(GetImplAs<Context9>(context));
>+    return angle::Result::Stop;
> }
> 
>-gl::Error Framebuffer9::clearImpl(const gl::Context *context, const ClearParameters &clearParams)
>+angle::Result Framebuffer9::clearImpl(const gl::Context *context,
>+                                      const ClearParameters &clearParams)
> {
>-    const gl::FramebufferAttachment *colorAttachment        = mState.getColorAttachment(0);
>-    const gl::FramebufferAttachment *depthStencilAttachment = mState.getDepthOrStencilAttachment();
>+    ANGLE_TRY(mRenderer->applyRenderTarget(context, mRenderTargetCache.getColors()[0],
>+                                           mRenderTargetCache.getDepthStencil()));
> 
>-    ANGLE_TRY(mRenderer->applyRenderTarget(context, colorAttachment, depthStencilAttachment));
>-
>-    const gl::State &glState = context->getGLState();
>+    const gl::State &glState = context->getState();
>     float nearZ              = glState.getNearPlane();
>-    float farZ = glState.getFarPlane();
>-    mRenderer->setViewport(glState.getViewport(), nearZ, farZ, GL_TRIANGLES,
>+    float farZ               = glState.getFarPlane();
>+    mRenderer->setViewport(glState.getViewport(), nearZ, farZ, gl::PrimitiveMode::Triangles,
>                            glState.getRasterizerState().frontFace, true);
> 
>     mRenderer->setScissorRectangle(glState.getScissor(), glState.isScissorTestEnabled());
> 
>-    return mRenderer->clear(context, clearParams, colorAttachment, depthStencilAttachment);
>+    mRenderer->clear(clearParams, mRenderTargetCache.getColors()[0],
>+                     mRenderTargetCache.getDepthStencil());
>+    return angle::Result::Continue;
> }
> 
>-gl::Error Framebuffer9::readPixelsImpl(const gl::Context *context,
>-                                       const gl::Rectangle &area,
>-                                       GLenum format,
>-                                       GLenum type,
>-                                       size_t outputPitch,
>-                                       const gl::PixelPackState &pack,
>-                                       uint8_t *pixels)
>+angle::Result Framebuffer9::readPixelsImpl(const gl::Context *context,
>+                                           const gl::Rectangle &area,
>+                                           GLenum format,
>+                                           GLenum type,
>+                                           size_t outputPitch,
>+                                           const gl::PixelPackState &pack,
>+                                           uint8_t *pixels)
> {
>     const gl::FramebufferAttachment *colorbuffer = mState.getColorAttachment(0);
>     ASSERT(colorbuffer);
>@@ -98,12 +97,15 @@ gl::Error Framebuffer9::readPixelsImpl(const gl::Context *context,
>     D3DSURFACE_DESC desc;
>     surface->GetDesc(&desc);
> 
>+    Context9 *context9 = GetImplAs<Context9>(context);
>+
>     if (desc.MultiSampleType != D3DMULTISAMPLE_NONE)
>     {
>-        UNIMPLEMENTED();   // FIXME: Requires resolve using StretchRect into non-multisampled render target
>+        UNIMPLEMENTED();  // FIXME: Requires resolve using StretchRect into non-multisampled render
>+                          // target
>         SafeRelease(surface);
>-        return gl::OutOfMemory()
>-               << "ReadPixels is unimplemented for multisampled framebuffer attachments.";
>+        ANGLE_TRY_HR(context9, E_OUTOFMEMORY,
>+                     "ReadPixels is unimplemented for multisampled framebuffer attachments.");
>     }
> 
>     IDirect3DDevice9 *device = mRenderer->getDevice();
>@@ -111,15 +113,17 @@ gl::Error Framebuffer9::readPixelsImpl(const gl::Context *context,
> 
>     HRESULT result;
>     IDirect3DSurface9 *systemSurface = nullptr;
>-    bool directToPixels = !pack.reverseRowOrder && pack.alignment <= 4 && mRenderer->getShareHandleSupport() &&
>-                          area.x == 0 && area.y == 0 &&
>-                          static_cast<UINT>(area.width) == desc.Width && static_cast<UINT>(area.height) == desc.Height &&
>-                          desc.Format == D3DFMT_A8R8G8B8 && format == GL_BGRA_EXT && type == GL_UNSIGNED_BYTE;
>+    bool directToPixels =
>+        !pack.reverseRowOrder && pack.alignment <= 4 && mRenderer->getShareHandleSupport() &&
>+        area.x == 0 && area.y == 0 && static_cast<UINT>(area.width) == desc.Width &&
>+        static_cast<UINT>(area.height) == desc.Height && desc.Format == D3DFMT_A8R8G8B8 &&
>+        format == GL_BGRA_EXT && type == GL_UNSIGNED_BYTE;
>     if (directToPixels)
>     {
>         // Use the pixels ptr as a shared handle to write directly into client's memory
>         result = device->CreateOffscreenPlainSurface(desc.Width, desc.Height, desc.Format,
>-                                                     D3DPOOL_SYSTEMMEM, &systemSurface, reinterpret_cast<void**>(&pixels));
>+                                                     D3DPOOL_SYSTEMMEM, &systemSurface,
>+                                                     reinterpret_cast<void **>(&pixels));
>         if (FAILED(result))
>         {
>             // Try again without the shared handle
>@@ -135,7 +139,8 @@ gl::Error Framebuffer9::readPixelsImpl(const gl::Context *context,
>         {
>             ASSERT(result == D3DERR_OUTOFVIDEOMEMORY || result == E_OUTOFMEMORY);
>             SafeRelease(surface);
>-            return gl::OutOfMemory() << "Failed to allocate internal texture for ReadPixels.";
>+            ANGLE_TRY_HR(context9, E_OUTOFMEMORY,
>+                         "Failed to allocate internal texture for ReadPixels.");
>         }
>     }
> 
>@@ -157,19 +162,19 @@ gl::Error Framebuffer9::readPixelsImpl(const gl::Context *context,
>             UNREACHABLE();
>         }
> 
>-        return gl::OutOfMemory() << "Failed to read internal render target data.";
>+        ANGLE_TRY_HR(context9, E_OUTOFMEMORY, "Failed to read internal render target data.");
>     }
> 
>     if (directToPixels)
>     {
>         SafeRelease(systemSurface);
>-        return gl::NoError();
>+        return angle::Result::Continue;
>     }
> 
>     RECT rect;
>-    rect.left = gl::clamp(area.x, 0L, static_cast<LONG>(desc.Width));
>-    rect.top = gl::clamp(area.y, 0L, static_cast<LONG>(desc.Height));
>-    rect.right = gl::clamp(area.x + area.width, 0L, static_cast<LONG>(desc.Width));
>+    rect.left   = gl::clamp(area.x, 0L, static_cast<LONG>(desc.Width));
>+    rect.top    = gl::clamp(area.y, 0L, static_cast<LONG>(desc.Height));
>+    rect.right  = gl::clamp(area.x + area.width, 0L, static_cast<LONG>(desc.Width));
>     rect.bottom = gl::clamp(area.y + area.height, 0L, static_cast<LONG>(desc.Height));
> 
>     D3DLOCKED_RECT lock;
>@@ -180,42 +185,42 @@ gl::Error Framebuffer9::readPixelsImpl(const gl::Context *context,
>         UNREACHABLE();
>         SafeRelease(systemSurface);
> 
>-        return gl::OutOfMemory() << "Failed to lock internal render target.";
>+        ANGLE_TRY_HR(context9, E_OUTOFMEMORY, "Failed to lock internal render target.");
>     }
> 
>-    uint8_t *source = reinterpret_cast<uint8_t *>(lock.pBits);
>+    uint8_t *source = static_cast<uint8_t *>(lock.pBits);
>     int inputPitch  = lock.Pitch;
> 
>     const d3d9::D3DFormat &d3dFormatInfo = d3d9::GetD3DFormatInfo(desc.Format);
>+
>     gl::FormatType formatType(format, type);
> 
>     PackPixelsParams packParams;
>-    packParams.area.x      = rect.left;
>-    packParams.area.y      = rect.top;
>-    packParams.area.width  = rect.right - rect.left;
>-    packParams.area.height = rect.bottom - rect.top;
>-    packParams.format      = format;
>-    packParams.type        = type;
>-    packParams.outputPitch = static_cast<GLuint>(outputPitch);
>-    packParams.pack        = pack;
>+    packParams.area.x          = rect.left;
>+    packParams.area.y          = rect.top;
>+    packParams.area.width      = rect.right - rect.left;
>+    packParams.area.height     = rect.bottom - rect.top;
>+    packParams.destFormat      = &GetFormatFromFormatType(format, type);
>+    packParams.outputPitch     = static_cast<GLuint>(outputPitch);
>+    packParams.reverseRowOrder = pack.reverseRowOrder;
> 
>     PackPixels(packParams, d3dFormatInfo.info(), inputPitch, source, pixels);
> 
>     systemSurface->UnlockRect();
>     SafeRelease(systemSurface);
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error Framebuffer9::blitImpl(const gl::Context *context,
>-                                 const gl::Rectangle &sourceArea,
>-                                 const gl::Rectangle &destArea,
>-                                 const gl::Rectangle *scissor,
>-                                 bool blitRenderTarget,
>-                                 bool blitDepth,
>-                                 bool blitStencil,
>-                                 GLenum filter,
>-                                 const gl::Framebuffer *sourceFramebuffer)
>+angle::Result Framebuffer9::blitImpl(const gl::Context *context,
>+                                     const gl::Rectangle &sourceArea,
>+                                     const gl::Rectangle &destArea,
>+                                     const gl::Rectangle *scissor,
>+                                     bool blitRenderTarget,
>+                                     bool blitDepth,
>+                                     bool blitStencil,
>+                                     GLenum filter,
>+                                     const gl::Framebuffer *sourceFramebuffer)
> {
>     ASSERT(filter == GL_NEAREST);
> 
>@@ -224,50 +229,44 @@ gl::Error Framebuffer9::blitImpl(const gl::Context *context,
> 
>     mRenderer->endScene();
> 
>+    Context9 *context9 = GetImplAs<Context9>(context);
>+
>     if (blitRenderTarget)
>     {
>         const gl::FramebufferAttachment *readBuffer = sourceFramebuffer->getColorbuffer(0);
>         ASSERT(readBuffer);
> 
>         RenderTarget9 *readRenderTarget = nullptr;
>-        gl::Error error                 = readBuffer->getRenderTarget(context, &readRenderTarget);
>-        if (error.isError())
>-        {
>-            return error;
>-        }
>+        ANGLE_TRY(readBuffer->getRenderTarget(context, &readRenderTarget));
>         ASSERT(readRenderTarget);
> 
>         const gl::FramebufferAttachment *drawBuffer = mState.getColorAttachment(0);
>         ASSERT(drawBuffer);
> 
>         RenderTarget9 *drawRenderTarget = nullptr;
>-        error                           = drawBuffer->getRenderTarget(context, &drawRenderTarget);
>-        if (error.isError())
>-        {
>-            return error;
>-        }
>+        ANGLE_TRY(drawBuffer->getRenderTarget(context, &drawRenderTarget));
>         ASSERT(drawRenderTarget);
> 
>         // The getSurface calls do an AddRef so save them until after no errors are possible
>-        IDirect3DSurface9* readSurface = readRenderTarget->getSurface();
>+        IDirect3DSurface9 *readSurface = readRenderTarget->getSurface();
>         ASSERT(readSurface);
> 
>-        IDirect3DSurface9* drawSurface = drawRenderTarget->getSurface();
>+        IDirect3DSurface9 *drawSurface = drawRenderTarget->getSurface();
>         ASSERT(drawSurface);
> 
>         gl::Extents srcSize(readRenderTarget->getWidth(), readRenderTarget->getHeight(), 1);
>         gl::Extents dstSize(drawRenderTarget->getWidth(), drawRenderTarget->getHeight(), 1);
> 
>         RECT srcRect;
>-        srcRect.left = sourceArea.x;
>-        srcRect.right = sourceArea.x + sourceArea.width;
>-        srcRect.top = sourceArea.y;
>+        srcRect.left   = sourceArea.x;
>+        srcRect.right  = sourceArea.x + sourceArea.width;
>+        srcRect.top    = sourceArea.y;
>         srcRect.bottom = sourceArea.y + sourceArea.height;
> 
>         RECT dstRect;
>-        dstRect.left = destArea.x;
>-        dstRect.right = destArea.x + destArea.width;
>-        dstRect.top = destArea.y;
>+        dstRect.left   = destArea.x;
>+        dstRect.right  = destArea.x + destArea.width;
>+        dstRect.top    = destArea.y;
>         dstRect.bottom = destArea.y + destArea.height;
> 
>         // Clip the rectangles to the scissor rectangle
>@@ -339,15 +338,13 @@ gl::Error Framebuffer9::blitImpl(const gl::Context *context,
>             srcRect.bottom = srcSize.height;
>         }
> 
>-        HRESULT result = device->StretchRect(readSurface, &srcRect, drawSurface, &dstRect, D3DTEXF_NONE);
>+        HRESULT result =
>+            device->StretchRect(readSurface, &srcRect, drawSurface, &dstRect, D3DTEXF_NONE);
> 
>         SafeRelease(readSurface);
>         SafeRelease(drawSurface);
> 
>-        if (FAILED(result))
>-        {
>-            return gl::OutOfMemory() << "Internal blit failed, StretchRect " << gl::FmtHR(result);
>-        }
>+        ANGLE_TRY_HR(context9, result, "Internal blit failed.");
>     }
> 
>     if (blitDepth || blitStencil)
>@@ -356,56 +353,55 @@ gl::Error Framebuffer9::blitImpl(const gl::Context *context,
>         ASSERT(readBuffer);
> 
>         RenderTarget9 *readDepthStencil = nullptr;
>-        gl::Error error                 = readBuffer->getRenderTarget(context, &readDepthStencil);
>-        if (error.isError())
>-        {
>-            return error;
>-        }
>+        ANGLE_TRY(readBuffer->getRenderTarget(context, &readDepthStencil));
>         ASSERT(readDepthStencil);
> 
>         const gl::FramebufferAttachment *drawBuffer = mState.getDepthOrStencilAttachment();
>         ASSERT(drawBuffer);
> 
>         RenderTarget9 *drawDepthStencil = nullptr;
>-        error                           = drawBuffer->getRenderTarget(context, &drawDepthStencil);
>-        if (error.isError())
>-        {
>-            return error;
>-        }
>+        ANGLE_TRY(drawBuffer->getRenderTarget(context, &drawDepthStencil));
>         ASSERT(drawDepthStencil);
> 
>         // The getSurface calls do an AddRef so save them until after no errors are possible
>-        IDirect3DSurface9* readSurface = readDepthStencil->getSurface();
>+        IDirect3DSurface9 *readSurface = readDepthStencil->getSurface();
>         ASSERT(readDepthStencil);
> 
>-        IDirect3DSurface9* drawSurface = drawDepthStencil->getSurface();
>+        IDirect3DSurface9 *drawSurface = drawDepthStencil->getSurface();
>         ASSERT(drawDepthStencil);
> 
>-        HRESULT result = device->StretchRect(readSurface, nullptr, drawSurface, nullptr, D3DTEXF_NONE);
>+        HRESULT result =
>+            device->StretchRect(readSurface, nullptr, drawSurface, nullptr, D3DTEXF_NONE);
> 
>         SafeRelease(readSurface);
>         SafeRelease(drawSurface);
> 
>-        if (FAILED(result))
>-        {
>-            return gl::OutOfMemory() << "Internal blit failed, StretchRect " << gl::FmtHR(result);
>-        }
>+        ANGLE_TRY_HR(context9, result, "Internal blit failed.");
>     }
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
> GLenum Framebuffer9::getRenderTargetImplementationFormat(RenderTargetD3D *renderTarget) const
> {
>-    RenderTarget9 *renderTarget9 = GetAs<RenderTarget9>(renderTarget);
>+    RenderTarget9 *renderTarget9         = GetAs<RenderTarget9>(renderTarget);
>     const d3d9::D3DFormat &d3dFormatInfo = d3d9::GetD3DFormatInfo(renderTarget9->getD3DFormat());
>     return d3dFormatInfo.info().glInternalFormat;
> }
> 
>-gl::Error Framebuffer9::getSamplePosition(size_t index, GLfloat *xy) const
>+angle::Result Framebuffer9::getSamplePosition(const gl::Context *context,
>+                                              size_t index,
>+                                              GLfloat *xy) const
> {
>-    UNREACHABLE();
>-    return gl::InternalError() << "getSamplePosition is unsupported to d3d9.";
>+    ANGLE_HR_UNREACHABLE(GetImplAs<Context9>(context));
>+    return angle::Result::Stop;
> }
> 
>+angle::Result Framebuffer9::syncState(const gl::Context *context,
>+                                      const gl::Framebuffer::DirtyBits &dirtyBits)
>+{
>+    ANGLE_TRY(FramebufferD3D::syncState(context, dirtyBits));
>+    ANGLE_TRY(mRenderTargetCache.update(context, mState, dirtyBits));
>+    return angle::Result::Continue;
>+}
> }  // namespace rx
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/Framebuffer9.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/Framebuffer9.h
>index d2b46435ee2..d9c4d7b75dc 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/Framebuffer9.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/Framebuffer9.h
>@@ -9,7 +9,9 @@
> #ifndef LIBANGLE_RENDERER_D3D_D3D9_FRAMBUFFER9_H_
> #define LIBANGLE_RENDERER_D3D_D3D9_FRAMBUFFER9_H_
> 
>+#include "libANGLE/renderer/RenderTargetCache.h"
> #include "libANGLE/renderer/d3d/FramebufferD3D.h"
>+#include "libANGLE/renderer/d3d/d3d9/renderer9_utils.h"
> 
> namespace rx
> {
>@@ -21,43 +23,63 @@ class Framebuffer9 : public FramebufferD3D
>     Framebuffer9(const gl::FramebufferState &data, Renderer9 *renderer);
>     ~Framebuffer9() override;
> 
>-    gl::Error discard(const gl::Context *context, size_t count, const GLenum *attachments) override;
>-    gl::Error invalidate(const gl::Context *context,
>-                         size_t count,
>-                         const GLenum *attachments) override;
>-    gl::Error invalidateSub(const gl::Context *context,
>-                            size_t count,
>-                            const GLenum *attachments,
>-                            const gl::Rectangle &area) override;
>+    angle::Result discard(const gl::Context *context,
>+                          size_t count,
>+                          const GLenum *attachments) override;
>+    angle::Result invalidate(const gl::Context *context,
>+                             size_t count,
>+                             const GLenum *attachments) override;
>+    angle::Result invalidateSub(const gl::Context *context,
>+                                size_t count,
>+                                const GLenum *attachments,
>+                                const gl::Rectangle &area) override;
> 
>-    gl::Error getSamplePosition(size_t index, GLfloat *xy) const override;
>+    angle::Result getSamplePosition(const gl::Context *context,
>+                                    size_t index,
>+                                    GLfloat *xy) const override;
>+
>+    angle::Result syncState(const gl::Context *context,
>+                            const gl::Framebuffer::DirtyBits &dirtyBits) override;
>+
>+    const gl::AttachmentArray<RenderTarget9 *> &getCachedColorRenderTargets() const
>+    {
>+        return mRenderTargetCache.getColors();
>+    }
>+
>+    const RenderTarget9 *getCachedDepthStencilRenderTarget() const
>+    {
>+        return mRenderTargetCache.getDepthStencil();
>+    }
> 
>   private:
>-    gl::Error clearImpl(const gl::Context *context, const ClearParameters &clearParams) override;
>-
>-    gl::Error readPixelsImpl(const gl::Context *context,
>-                             const gl::Rectangle &area,
>-                             GLenum format,
>-                             GLenum type,
>-                             size_t outputPitch,
>-                             const gl::PixelPackState &pack,
>-                             uint8_t *pixels) override;
>-
>-    gl::Error blitImpl(const gl::Context *context,
>-                       const gl::Rectangle &sourceArea,
>-                       const gl::Rectangle &destArea,
>-                       const gl::Rectangle *scissor,
>-                       bool blitRenderTarget,
>-                       bool blitDepth,
>-                       bool blitStencil,
>-                       GLenum filter,
>-                       const gl::Framebuffer *sourceFramebuffer) override;
>+    angle::Result clearImpl(const gl::Context *context,
>+                            const ClearParameters &clearParams) override;
>+
>+    angle::Result readPixelsImpl(const gl::Context *context,
>+                                 const gl::Rectangle &area,
>+                                 GLenum format,
>+                                 GLenum type,
>+                                 size_t outputPitch,
>+                                 const gl::PixelPackState &pack,
>+                                 uint8_t *pixels) override;
>+
>+    angle::Result blitImpl(const gl::Context *context,
>+                           const gl::Rectangle &sourceArea,
>+                           const gl::Rectangle &destArea,
>+                           const gl::Rectangle *scissor,
>+                           bool blitRenderTarget,
>+                           bool blitDepth,
>+                           bool blitStencil,
>+                           GLenum filter,
>+                           const gl::Framebuffer *sourceFramebuffer) override;
> 
>     GLenum getRenderTargetImplementationFormat(RenderTargetD3D *renderTarget) const override;
> 
>     Renderer9 *const mRenderer;
>+
>+    RenderTargetCache<RenderTarget9> mRenderTargetCache;
> };
> 
>-}
>+}  // namespace rx
> 
>-#endif // LIBANGLE_RENDERER_D3D_D3D9_FRAMBUFFER9_H_
>+#endif  // LIBANGLE_RENDERER_D3D_D3D9_FRAMBUFFER9_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/Image9.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/Image9.cpp
>index 179629b3627..513c34aaaa2 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/Image9.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/Image9.cpp
>@@ -8,16 +8,20 @@
> // the actual underlying surfaces of a Texture.
> 
> #include "libANGLE/renderer/d3d/d3d9/Image9.h"
>-#include "libANGLE/renderer/d3d/d3d9/renderer9_utils.h"
>-#include "libANGLE/renderer/d3d/d3d9/formatutils9.h"
>-#include "libANGLE/renderer/d3d/d3d9/Renderer9.h"
>-#include "libANGLE/renderer/d3d/d3d9/RenderTarget9.h"
>-#include "libANGLE/renderer/d3d/d3d9/TextureStorage9.h"
>-#include "libANGLE/formatutils.h"
>+
>+#include "common/utilities.h"
>+#include "libANGLE/Context.h"
> #include "libANGLE/Framebuffer.h"
> #include "libANGLE/FramebufferAttachment.h"
> #include "libANGLE/Renderbuffer.h"
>-#include "common/utilities.h"
>+#include "libANGLE/formatutils.h"
>+#include "libANGLE/renderer/copyvertex.h"
>+#include "libANGLE/renderer/d3d/d3d9/Context9.h"
>+#include "libANGLE/renderer/d3d/d3d9/RenderTarget9.h"
>+#include "libANGLE/renderer/d3d/d3d9/Renderer9.h"
>+#include "libANGLE/renderer/d3d/d3d9/TextureStorage9.h"
>+#include "libANGLE/renderer/d3d/d3d9/formatutils9.h"
>+#include "libANGLE/renderer/d3d/d3d9/renderer9_utils.h"
> 
> namespace rx
> {
>@@ -27,7 +31,7 @@ Image9::Image9(Renderer9 *renderer)
>     mSurface  = nullptr;
>     mRenderer = nullptr;
> 
>-    mD3DPool = D3DPOOL_SYSTEMMEM;
>+    mD3DPool   = D3DPOOL_SYSTEMMEM;
>     mD3DFormat = D3DFMT_UNKNOWN;
> 
>     mRenderer = renderer;
>@@ -38,27 +42,22 @@ Image9::~Image9()
>     SafeRelease(mSurface);
> }
> 
>-gl::Error Image9::generateMip(IDirect3DSurface9 *destSurface, IDirect3DSurface9 *sourceSurface)
>+// static
>+angle::Result Image9::GenerateMip(Context9 *context9,
>+                                  IDirect3DSurface9 *destSurface,
>+                                  IDirect3DSurface9 *sourceSurface)
> {
>     D3DSURFACE_DESC destDesc;
>     HRESULT result = destSurface->GetDesc(&destDesc);
>     ASSERT(SUCCEEDED(result));
>-    if (FAILED(result))
>-    {
>-        return gl::OutOfMemory()
>-               << "Failed to query the source surface description for mipmap generation, "
>-               << gl::FmtHR(result);
>-    }
>+    ANGLE_TRY_HR(context9, result,
>+                 "Failed to query the source surface description for mipmap generation");
> 
>     D3DSURFACE_DESC sourceDesc;
>     result = sourceSurface->GetDesc(&sourceDesc);
>     ASSERT(SUCCEEDED(result));
>-    if (FAILED(result))
>-    {
>-        return gl::OutOfMemory()
>-               << "Failed to query the destination surface description for mipmap generation, "
>-               << gl::FmtHR(result);
>-    }
>+    ANGLE_TRY_HR(context9, result,
>+                 "Failed to query the destination surface description for mipmap generation");
> 
>     ASSERT(sourceDesc.Format == destDesc.Format);
>     ASSERT(sourceDesc.Width == 1 || sourceDesc.Width / 2 == destDesc.Width);
>@@ -70,24 +69,15 @@ gl::Error Image9::generateMip(IDirect3DSurface9 *destSurface, IDirect3DSurface9
>     D3DLOCKED_RECT sourceLocked = {0};
>     result                      = sourceSurface->LockRect(&sourceLocked, nullptr, D3DLOCK_READONLY);
>     ASSERT(SUCCEEDED(result));
>-    if (FAILED(result))
>-    {
>-        return gl::OutOfMemory() << "Failed to lock the source surface for mipmap generation, "
>-                                 << gl::FmtHR(result);
>-    }
>+    ANGLE_TRY_HR(context9, result, "Failed to lock the source surface for mipmap generation");
> 
>     D3DLOCKED_RECT destLocked = {0};
>     result                    = destSurface->LockRect(&destLocked, nullptr, 0);
>     ASSERT(SUCCEEDED(result));
>-    if (FAILED(result))
>-    {
>-        sourceSurface->UnlockRect();
>-        return gl::OutOfMemory() << "Failed to lock the destination surface for mipmap generation, "
>-                                 << gl::FmtHR(result);
>-    }
>+    ANGLE_TRY_HR(context9, result, "Failed to lock the destination surface for mipmap generation");
> 
>-    const uint8_t *sourceData = reinterpret_cast<const uint8_t*>(sourceLocked.pBits);
>-    uint8_t *destData = reinterpret_cast<uint8_t*>(destLocked.pBits);
>+    const uint8_t *sourceData = static_cast<const uint8_t *>(sourceLocked.pBits);
>+    uint8_t *destData         = static_cast<uint8_t *>(destLocked.pBits);
> 
>     ASSERT(sourceData && destData);
> 
>@@ -98,43 +88,44 @@ gl::Error Image9::generateMip(IDirect3DSurface9 *destSurface, IDirect3DSurface9
>     destSurface->UnlockRect();
>     sourceSurface->UnlockRect();
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error Image9::generateMipmap(Image9 *dest, Image9 *source)
>+// static
>+angle::Result Image9::GenerateMipmap(Context9 *context9, Image9 *dest, Image9 *source)
> {
>     IDirect3DSurface9 *sourceSurface = nullptr;
>-    ANGLE_TRY(source->getSurface(&sourceSurface));
>+    ANGLE_TRY(source->getSurface(context9, &sourceSurface));
> 
>     IDirect3DSurface9 *destSurface = nullptr;
>-    ANGLE_TRY(dest->getSurface(&destSurface));
>+    ANGLE_TRY(dest->getSurface(context9, &destSurface));
> 
>-    ANGLE_TRY(generateMip(destSurface, sourceSurface));
>+    ANGLE_TRY(GenerateMip(context9, destSurface, sourceSurface));
> 
>     dest->markDirty();
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error Image9::copyLockableSurfaces(IDirect3DSurface9 *dest, IDirect3DSurface9 *source)
>+// static
>+angle::Result Image9::CopyLockableSurfaces(Context9 *context9,
>+                                           IDirect3DSurface9 *dest,
>+                                           IDirect3DSurface9 *source)
> {
>     D3DLOCKED_RECT sourceLock = {0};
>-    D3DLOCKED_RECT destLock = {0};
>+    D3DLOCKED_RECT destLock   = {0};
> 
>     HRESULT result;
> 
>     result = source->LockRect(&sourceLock, nullptr, 0);
>-    if (FAILED(result))
>-    {
>-        return gl::OutOfMemory() << "Failed to lock source surface for copy, " << gl::FmtHR(result);
>-    }
>+    ANGLE_TRY_HR(context9, result, "Failed to lock source surface for copy");
> 
>     result = dest->LockRect(&destLock, nullptr, 0);
>     if (FAILED(result))
>     {
>         source->UnlockRect();
>-        return gl::OutOfMemory() << "Failed to lock source surface for copy, " << gl::FmtHR(result);
>     }
>+    ANGLE_TRY_HR(context9, result, "Failed to lock destination surface for copy");
> 
>     ASSERT(sourceLock.pBits && destLock.pBits);
> 
>@@ -142,69 +133,59 @@ gl::Error Image9::copyLockableSurfaces(IDirect3DSurface9 *dest, IDirect3DSurface
>     source->GetDesc(&desc);
> 
>     const d3d9::D3DFormat &d3dFormatInfo = d3d9::GetD3DFormatInfo(desc.Format);
>-    unsigned int rows = desc.Height / d3dFormatInfo.blockHeight;
>+    unsigned int rows                    = desc.Height / d3dFormatInfo.blockHeight;
> 
>     unsigned int bytes = d3d9::ComputeBlockSize(desc.Format, desc.Width, d3dFormatInfo.blockHeight);
>     ASSERT(bytes <= static_cast<unsigned int>(sourceLock.Pitch) &&
>            bytes <= static_cast<unsigned int>(destLock.Pitch));
> 
>-    for(unsigned int i = 0; i < rows; i++)
>+    for (unsigned int i = 0; i < rows; i++)
>     {
>-        memcpy((char*)destLock.pBits + destLock.Pitch * i, (char*)sourceLock.pBits + sourceLock.Pitch * i, bytes);
>+        memcpy((char *)destLock.pBits + destLock.Pitch * i,
>+               (char *)sourceLock.pBits + sourceLock.Pitch * i, bytes);
>     }
> 
>     source->UnlockRect();
>     dest->UnlockRect();
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
> // static
>-gl::Error Image9::CopyImage(const gl::Context *context,
>-                            Image9 *dest,
>-                            Image9 *source,
>-                            const gl::Rectangle &sourceRect,
>-                            const gl::Offset &destOffset,
>-                            bool unpackFlipY,
>-                            bool unpackPremultiplyAlpha,
>-                            bool unpackUnmultiplyAlpha)
>+angle::Result Image9::CopyImage(const gl::Context *context,
>+                                Image9 *dest,
>+                                Image9 *source,
>+                                const gl::Rectangle &sourceRect,
>+                                const gl::Offset &destOffset,
>+                                bool unpackFlipY,
>+                                bool unpackPremultiplyAlpha,
>+                                bool unpackUnmultiplyAlpha)
> {
>+    Context9 *context9 = GetImplAs<Context9>(context);
>+
>     IDirect3DSurface9 *sourceSurface = nullptr;
>-    ANGLE_TRY(source->getSurface(&sourceSurface));
>+    ANGLE_TRY(source->getSurface(context9, &sourceSurface));
> 
>     IDirect3DSurface9 *destSurface = nullptr;
>-    ANGLE_TRY(dest->getSurface(&destSurface));
>+    ANGLE_TRY(dest->getSurface(context9, &destSurface));
> 
>     D3DSURFACE_DESC destDesc;
>     HRESULT result = destSurface->GetDesc(&destDesc);
>     ASSERT(SUCCEEDED(result));
>-    if (FAILED(result))
>-    {
>-        return gl::OutOfMemory()
>-               << "Failed to query the source surface description for mipmap generation, "
>-               << gl::FmtHR(result);
>-    }
>+    ANGLE_TRY_HR(context9, result, "Failed to query the source surface description for CopyImage");
>     const d3d9::D3DFormat &destD3DFormatInfo = d3d9::GetD3DFormatInfo(destDesc.Format);
> 
>     D3DSURFACE_DESC sourceDesc;
>     result = sourceSurface->GetDesc(&sourceDesc);
>     ASSERT(SUCCEEDED(result));
>-    if (FAILED(result))
>-    {
>-        return gl::OutOfMemory()
>-               << "Failed to query the destination surface description for mipmap generation, "
>-               << gl::FmtHR(result);
>-    }
>+    ANGLE_TRY_HR(context9, result,
>+                 "Failed to query the destination surface description for CopyImage");
>     const d3d9::D3DFormat &sourceD3DFormatInfo = d3d9::GetD3DFormatInfo(sourceDesc.Format);
> 
>     D3DLOCKED_RECT sourceLocked = {0};
>     result                      = sourceSurface->LockRect(&sourceLocked, nullptr, D3DLOCK_READONLY);
>     ASSERT(SUCCEEDED(result));
>-    if (FAILED(result))
>-    {
>-        return gl::OutOfMemory() << "Failed to lock the source surface for CopyImage, "
>-                                 << gl::FmtHR(result);
>-    }
>+    ANGLE_TRY_HR(context9, result, "Failed to lock the source surface for CopyImage");
> 
>     D3DLOCKED_RECT destLocked = {0};
>     result                    = destSurface->LockRect(&destLocked, nullptr, 0);
>@@ -212,54 +193,54 @@ gl::Error Image9::CopyImage(const gl::Context *context,
>     if (FAILED(result))
>     {
>         sourceSurface->UnlockRect();
>-        return gl::OutOfMemory() << "Failed to lock the destination surface for CopyImage, "
>-                                 << gl::FmtHR(result);
>     }
>+    ANGLE_TRY_HR(context9, result, "Failed to lock the destination surface for CopyImage");
> 
>-    const uint8_t *sourceData = reinterpret_cast<const uint8_t *>(sourceLocked.pBits) +
>+    const uint8_t *sourceData = static_cast<const uint8_t *>(sourceLocked.pBits) +
>                                 sourceRect.x * sourceD3DFormatInfo.pixelBytes +
>                                 sourceRect.y * sourceLocked.Pitch;
>-    uint8_t *destData = reinterpret_cast<uint8_t *>(destLocked.pBits) +
>+    uint8_t *destData = static_cast<uint8_t *>(destLocked.pBits) +
>                         destOffset.x * destD3DFormatInfo.pixelBytes +
>                         destOffset.y * destLocked.Pitch;
>     ASSERT(sourceData && destData);
> 
>-    CopyImageCHROMIUM(sourceData, sourceLocked.Pitch, sourceD3DFormatInfo.pixelBytes,
>-                      sourceD3DFormatInfo.info().colorReadFunction, destData, destLocked.Pitch,
>-                      destD3DFormatInfo.pixelBytes, destD3DFormatInfo.info().colorWriteFunction,
>+    CopyImageCHROMIUM(sourceData, sourceLocked.Pitch, sourceD3DFormatInfo.pixelBytes, 0,
>+                      sourceD3DFormatInfo.info().pixelReadFunction, destData, destLocked.Pitch,
>+                      destD3DFormatInfo.pixelBytes, 0, destD3DFormatInfo.info().pixelWriteFunction,
>                       gl::GetUnsizedFormat(dest->getInternalFormat()),
>                       destD3DFormatInfo.info().componentType, sourceRect.width, sourceRect.height,
>-                      unpackFlipY, unpackPremultiplyAlpha, unpackUnmultiplyAlpha);
>+                      1, unpackFlipY, unpackPremultiplyAlpha, unpackUnmultiplyAlpha);
> 
>     destSurface->UnlockRect();
>     sourceSurface->UnlockRect();
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-bool Image9::redefine(GLenum target, GLenum internalformat, const gl::Extents &size, bool forceRelease)
>+bool Image9::redefine(gl::TextureType type,
>+                      GLenum internalformat,
>+                      const gl::Extents &size,
>+                      bool forceRelease)
> {
>     // 3D textures are not supported by the D3D9 backend.
>     ASSERT(size.depth <= 1);
> 
>     // Only 2D and cube texture are supported by the D3D9 backend.
>-    ASSERT(target == GL_TEXTURE_2D || target == GL_TEXTURE_CUBE_MAP);
>+    ASSERT(type == gl::TextureType::_2D || type == gl::TextureType::CubeMap);
> 
>-    if (mWidth != size.width ||
>-        mHeight != size.height ||
>-        mDepth != size.depth ||
>-        mInternalFormat != internalformat ||
>-        forceRelease)
>+    if (mWidth != size.width || mHeight != size.height || mDepth != size.depth ||
>+        mInternalFormat != internalformat || forceRelease)
>     {
>-        mWidth = size.width;
>-        mHeight = size.height;
>-        mDepth = size.depth;
>+        mWidth          = size.width;
>+        mHeight         = size.height;
>+        mDepth          = size.depth;
>+        mType           = type;
>         mInternalFormat = internalformat;
> 
>         // compute the d3d format that will be used
>         const d3d9::TextureFormat &d3d9FormatInfo = d3d9::GetTextureFormatInfo(internalformat);
>-        mD3DFormat = d3d9FormatInfo.texFormat;
>-        mRenderable = (d3d9FormatInfo.renderFormat != D3DFMT_UNKNOWN);
>+        mD3DFormat                                = d3d9FormatInfo.texFormat;
>+        mRenderable                               = (d3d9FormatInfo.renderFormat != D3DFMT_UNKNOWN);
> 
>         SafeRelease(mSurface);
>         mDirty = (d3d9FormatInfo.dataInitializerFunction != nullptr);
>@@ -270,22 +251,22 @@ bool Image9::redefine(GLenum target, GLenum internalformat, const gl::Extents &s
>     return false;
> }
> 
>-gl::Error Image9::createSurface()
>+angle::Result Image9::createSurface(Context9 *context9)
> {
>     if (mSurface)
>     {
>-        return gl::NoError();
>+        return angle::Result::Continue;
>     }
> 
>     IDirect3DTexture9 *newTexture = nullptr;
>     IDirect3DSurface9 *newSurface = nullptr;
>-    const D3DPOOL poolToUse = D3DPOOL_SYSTEMMEM;
>-    const D3DFORMAT d3dFormat = getD3DFormat();
>+    const D3DPOOL poolToUse       = D3DPOOL_SYSTEMMEM;
>+    const D3DFORMAT d3dFormat     = getD3DFormat();
> 
>     if (mWidth != 0 && mHeight != 0)
>     {
>-        int levelToFetch = 0;
>-        GLsizei requestWidth = mWidth;
>+        int levelToFetch      = 0;
>+        GLsizei requestWidth  = mWidth;
>         GLsizei requestHeight = mHeight;
>         d3d9::MakeValidSize(true, d3dFormat, &requestWidth, &requestHeight, &levelToFetch);
> 
>@@ -294,11 +275,7 @@ gl::Error Image9::createSurface()
>         HRESULT result = device->CreateTexture(requestWidth, requestHeight, levelToFetch + 1, 0,
>                                                d3dFormat, poolToUse, &newTexture, nullptr);
> 
>-        if (FAILED(result))
>-        {
>-            ASSERT(result == D3DERR_OUTOFVIDEOMEMORY || result == E_OUTOFMEMORY);
>-            return gl::OutOfMemory() << "Failed to create image surface, " << gl::FmtHR(result);
>-        }
>+        ANGLE_TRY_HR(context9, result, "Failed to create image surface");
> 
>         newTexture->GetSurfaceLevel(levelToFetch, &newSurface);
>         SafeRelease(newTexture);
>@@ -307,59 +284,45 @@ gl::Error Image9::createSurface()
>         if (d3dFormatInfo.dataInitializerFunction != nullptr)
>         {
>             RECT entireRect;
>-            entireRect.left = 0;
>-            entireRect.right = mWidth;
>-            entireRect.top = 0;
>+            entireRect.left   = 0;
>+            entireRect.right  = mWidth;
>+            entireRect.top    = 0;
>             entireRect.bottom = mHeight;
> 
>             D3DLOCKED_RECT lockedRect;
>             result = newSurface->LockRect(&lockedRect, &entireRect, 0);
>             ASSERT(SUCCEEDED(result));
>-            if (FAILED(result))
>-            {
>-                return gl::OutOfMemory() << "Failed to lock image surface, " << gl::FmtHR(result);
>-            }
>+            ANGLE_TRY_HR(context9, result, "Failed to lock image surface");
> 
>-            d3dFormatInfo.dataInitializerFunction(mWidth, mHeight, 1, reinterpret_cast<uint8_t*>(lockedRect.pBits),
>-                                                  lockedRect.Pitch, 0);
>+            d3dFormatInfo.dataInitializerFunction(
>+                mWidth, mHeight, 1, static_cast<uint8_t *>(lockedRect.pBits), lockedRect.Pitch, 0);
> 
>             result = newSurface->UnlockRect();
>             ASSERT(SUCCEEDED(result));
>-            if (FAILED(result))
>-            {
>-                return gl::OutOfMemory() << "Failed to unlock image surface, " << gl::FmtHR(result);
>-            }
>+            ANGLE_TRY_HR(context9, result, "Failed to unlock image surface");
>         }
>     }
> 
>     mSurface = newSurface;
>-    mDirty = false;
>+    mDirty   = false;
>     mD3DPool = poolToUse;
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error Image9::lock(D3DLOCKED_RECT *lockedRect, const RECT &rect)
>+angle::Result Image9::lock(Context9 *context9, D3DLOCKED_RECT *lockedRect, const RECT &rect)
> {
>-    gl::Error error = createSurface();
>-    if (error.isError())
>-    {
>-        return error;
>-    }
>+    ANGLE_TRY(createSurface(context9));
> 
>     if (mSurface)
>     {
>         HRESULT result = mSurface->LockRect(lockedRect, &rect, 0);
>         ASSERT(SUCCEEDED(result));
>-        if (FAILED(result))
>-        {
>-            return gl::OutOfMemory() << "Failed to lock image surface, " << gl::FmtHR(result);
>-        }
>-
>+        ANGLE_TRY_HR(context9, result, "Failed to lock image surface");
>         mDirty = true;
>     }
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
> void Image9::unlock()
>@@ -382,56 +345,43 @@ D3DFORMAT Image9::getD3DFormat() const
> 
> bool Image9::isDirty() const
> {
>-    // Make sure to that this image is marked as dirty even if the staging texture hasn't been created yet
>-    // if initialization is required before use.
>+    // Make sure to that this image is marked as dirty even if the staging texture hasn't been
>+    // created yet if initialization is required before use.
>     return (mSurface ||
>             d3d9::GetTextureFormatInfo(mInternalFormat).dataInitializerFunction != nullptr) &&
>            mDirty;
> }
> 
>-gl::Error Image9::getSurface(IDirect3DSurface9 **outSurface)
>+angle::Result Image9::getSurface(Context9 *context9, IDirect3DSurface9 **outSurface)
> {
>-    gl::Error error = createSurface();
>-    if (error.isError())
>-    {
>-        return error;
>-    }
>-
>+    ANGLE_TRY(createSurface(context9));
>     *outSurface = mSurface;
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error Image9::setManagedSurface2D(const gl::Context *context,
>-                                      TextureStorage *storage,
>-                                      int level)
>+angle::Result Image9::setManagedSurface2D(const gl::Context *context,
>+                                          TextureStorage *storage,
>+                                          int level)
> {
>     IDirect3DSurface9 *surface = nullptr;
>     TextureStorage9 *storage9  = GetAs<TextureStorage9>(storage);
>-    gl::Error error = storage9->getSurfaceLevel(context, GL_TEXTURE_2D, level, false, &surface);
>-    if (error.isError())
>-    {
>-        return error;
>-    }
>-    return setManagedSurface(surface);
>+    ANGLE_TRY(storage9->getSurfaceLevel(context, gl::TextureTarget::_2D, level, false, &surface));
>+    return setManagedSurface(GetImplAs<Context9>(context), surface);
> }
> 
>-gl::Error Image9::setManagedSurfaceCube(const gl::Context *context,
>-                                        TextureStorage *storage,
>-                                        int face,
>-                                        int level)
>+angle::Result Image9::setManagedSurfaceCube(const gl::Context *context,
>+                                            TextureStorage *storage,
>+                                            int face,
>+                                            int level)
> {
>     IDirect3DSurface9 *surface = nullptr;
>-    TextureStorage9 *storage9 = GetAs<TextureStorage9>(storage);
>-    gl::Error error = storage9->getSurfaceLevel(context, GL_TEXTURE_CUBE_MAP_POSITIVE_X + face,
>-                                                level, false, &surface);
>-    if (error.isError())
>-    {
>-        return error;
>-    }
>-    return setManagedSurface(surface);
>+    TextureStorage9 *storage9  = GetAs<TextureStorage9>(storage);
>+    ANGLE_TRY(storage9->getSurfaceLevel(context, gl::CubeFaceIndexToTextureTarget(face), level,
>+                                        false, &surface));
>+    return setManagedSurface(GetImplAs<Context9>(context), surface);
> }
> 
>-gl::Error Image9::setManagedSurface(IDirect3DSurface9 *surface)
>+angle::Result Image9::setManagedSurface(Context9 *context9, IDirect3DSurface9 *surface)
> {
>     D3DSURFACE_DESC desc;
>     surface->GetDesc(&desc);
>@@ -441,78 +391,51 @@ gl::Error Image9::setManagedSurface(IDirect3DSurface9 *surface)
>     {
>         if (mSurface)
>         {
>-            gl::Error error = copyLockableSurfaces(surface, mSurface);
>+            angle::Result result = CopyLockableSurfaces(context9, surface, mSurface);
>             SafeRelease(mSurface);
>-            if (error.isError())
>-            {
>-                return error;
>-            }
>+            ANGLE_TRY(result);
>         }
> 
>         mSurface = surface;
>         mD3DPool = desc.Pool;
>     }
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error Image9::copyToStorage(const gl::Context *context,
>-                                TextureStorage *storage,
>-                                const gl::ImageIndex &index,
>-                                const gl::Box &region)
>+angle::Result Image9::copyToStorage(const gl::Context *context,
>+                                    TextureStorage *storage,
>+                                    const gl::ImageIndex &index,
>+                                    const gl::Box &region)
> {
>-    gl::Error error = createSurface();
>-    if (error.isError())
>-    {
>-        return error;
>-    }
>-
>-    TextureStorage9 *storage9 = GetAs<TextureStorage9>(storage);
>+    ANGLE_TRY(createSurface(GetImplAs<Context9>(context)));
> 
>+    TextureStorage9 *storage9      = GetAs<TextureStorage9>(storage);
>     IDirect3DSurface9 *destSurface = nullptr;
>+    ANGLE_TRY(storage9->getSurfaceLevel(context, index.getTarget(), index.getLevelIndex(), true,
>+                                        &destSurface));
> 
>-    if (index.type == GL_TEXTURE_2D)
>-    {
>-        error =
>-            storage9->getSurfaceLevel(context, GL_TEXTURE_2D, index.mipIndex, true, &destSurface);
>-        if (error.isError())
>-        {
>-            return error;
>-        }
>-    }
>-    else
>-    {
>-        ASSERT(gl::IsCubeMapTextureTarget(index.type));
>-        error = storage9->getSurfaceLevel(context, index.type, index.mipIndex, true, &destSurface);
>-        if (error.isError())
>-        {
>-            return error;
>-        }
>-    }
>-
>-    error = copyToSurface(destSurface, region);
>+    angle::Result result = copyToSurface(GetImplAs<Context9>(context), destSurface, region);
>     SafeRelease(destSurface);
>-    return error;
>+    return result;
> }
> 
>-gl::Error Image9::copyToSurface(IDirect3DSurface9 *destSurface, const gl::Box &area)
>+angle::Result Image9::copyToSurface(Context9 *context9,
>+                                    IDirect3DSurface9 *destSurface,
>+                                    const gl::Box &area)
> {
>     ASSERT(area.width > 0 && area.height > 0 && area.depth == 1);
>     ASSERT(destSurface);
> 
>     IDirect3DSurface9 *sourceSurface = nullptr;
>-    gl::Error error = getSurface(&sourceSurface);
>-    if (error.isError())
>-    {
>-        return error;
>-    }
>+    ANGLE_TRY(getSurface(context9, &sourceSurface));
> 
>     ASSERT(sourceSurface && sourceSurface != destSurface);
> 
>     RECT rect;
>-    rect.left = area.x;
>-    rect.top = area.y;
>-    rect.right = area.x + area.width;
>+    rect.left   = area.x;
>+    rect.top    = area.y;
>+    rect.right  = area.x + area.width;
>     rect.bottom = area.y + area.height;
> 
>     POINT point = {rect.left, rect.top};
>@@ -527,53 +450,44 @@ gl::Error Image9::copyToSurface(IDirect3DSurface9 *destSurface, const gl::Box &a
>         IDirect3DSurface9 *surf = 0;
>         HRESULT result = device->CreateOffscreenPlainSurface(desc.Width, desc.Height, desc.Format,
>                                                              D3DPOOL_SYSTEMMEM, &surf, nullptr);
>-        if (FAILED(result))
>-        {
>-            return gl::OutOfMemory()
>-                   << "Internal CreateOffscreenPlainSurface call failed, " << gl::FmtHR(result);
>-        }
>+        ANGLE_TRY_HR(context9, result, "Internal CreateOffscreenPlainSurface call failed");
> 
>-        auto err = copyLockableSurfaces(surf, sourceSurface);
>-        result = device->UpdateSurface(surf, &rect, destSurface, &point);
>+        auto err = CopyLockableSurfaces(context9, surf, sourceSurface);
>+        result   = device->UpdateSurface(surf, &rect, destSurface, &point);
>         SafeRelease(surf);
>         ANGLE_TRY(err);
>         ASSERT(SUCCEEDED(result));
>-        if (FAILED(result))
>-        {
>-            return gl::OutOfMemory() << "Internal UpdateSurface call failed, " << gl::FmtHR(result);
>-        }
>+        ANGLE_TRY_HR(context9, result, "Internal UpdateSurface call failed");
>     }
>     else
>     {
>         // UpdateSurface: source must be SYSTEMMEM, dest must be DEFAULT pools
>         HRESULT result = device->UpdateSurface(sourceSurface, &rect, destSurface, &point);
>         ASSERT(SUCCEEDED(result));
>-        if (FAILED(result))
>-        {
>-            return gl::OutOfMemory() << "Internal UpdateSurface call failed, " << gl::FmtHR(result);
>-        }
>+        ANGLE_TRY_HR(context9, result, "Internal UpdateSurface call failed");
>     }
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-// Store the pixel rectangle designated by xoffset,yoffset,width,height with pixels stored as format/type at input
>-// into the target pixel rectangle.
>-gl::Error Image9::loadData(const gl::Context *context,
>-                           const gl::Box &area,
>-                           const gl::PixelUnpackState &unpack,
>-                           GLenum type,
>-                           const void *input,
>-                           bool applySkipImages)
>+// Store the pixel rectangle designated by xoffset,yoffset,width,height with pixels stored as
>+// format/type at input into the target pixel rectangle.
>+angle::Result Image9::loadData(const gl::Context *context,
>+                               const gl::Box &area,
>+                               const gl::PixelUnpackState &unpack,
>+                               GLenum type,
>+                               const void *input,
>+                               bool applySkipImages)
> {
>     // 3D textures are not supported by the D3D9 backend.
>     ASSERT(area.z == 0 && area.depth == 1);
> 
>+    Context9 *context9 = GetImplAs<Context9>(context);
>+
>     const gl::InternalFormat &formatInfo = gl::GetSizedInternalFormatInfo(mInternalFormat);
>     GLuint inputRowPitch                 = 0;
>-    ANGLE_TRY_RESULT(
>-        formatInfo.computeRowPitch(type, area.width, unpack.alignment, unpack.rowLength),
>-        inputRowPitch);
>+    ANGLE_CHECK_GL_MATH(context9, formatInfo.computeRowPitch(type, area.width, unpack.alignment,
>+                                                             unpack.rowLength, &inputRowPitch));
>     ASSERT(!applySkipImages);
>     ASSERT(unpack.skipPixels == 0);
>     ASSERT(unpack.skipRows == 0);
>@@ -581,41 +495,37 @@ gl::Error Image9::loadData(const gl::Context *context,
>     const d3d9::TextureFormat &d3dFormatInfo = d3d9::GetTextureFormatInfo(mInternalFormat);
>     ASSERT(d3dFormatInfo.loadFunction != nullptr);
> 
>-    RECT lockRect =
>-    {
>-        area.x, area.y,
>-        area.x + area.width, area.y + area.height
>-    };
>+    RECT lockRect = {area.x, area.y, area.x + area.width, area.y + area.height};
> 
>     D3DLOCKED_RECT locked;
>-    gl::Error error = lock(&locked, lockRect);
>-    if (error.isError())
>-    {
>-        return error;
>-    }
>+    ANGLE_TRY(lock(GetImplAs<Context9>(context), &locked, lockRect));
> 
>     d3dFormatInfo.loadFunction(area.width, area.height, area.depth,
>-                               reinterpret_cast<const uint8_t *>(input), inputRowPitch, 0,
>-                               reinterpret_cast<uint8_t *>(locked.pBits), locked.Pitch, 0);
>+                               static_cast<const uint8_t *>(input), inputRowPitch, 0,
>+                               static_cast<uint8_t *>(locked.pBits), locked.Pitch, 0);
> 
>     unlock();
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error Image9::loadCompressedData(const gl::Context *context,
>-                                     const gl::Box &area,
>-                                     const void *input)
>+angle::Result Image9::loadCompressedData(const gl::Context *context,
>+                                         const gl::Box &area,
>+                                         const void *input)
> {
>     // 3D textures are not supported by the D3D9 backend.
>     ASSERT(area.z == 0 && area.depth == 1);
> 
>+    Context9 *context9 = GetImplAs<Context9>(context);
>+
>     const gl::InternalFormat &formatInfo = gl::GetSizedInternalFormatInfo(mInternalFormat);
>-    GLsizei inputRowPitch                = 0;
>-    ANGLE_TRY_RESULT(formatInfo.computeRowPitch(GL_UNSIGNED_BYTE, area.width, 1, 0), inputRowPitch);
>-    GLsizei inputDepthPitch = 0;
>-    ANGLE_TRY_RESULT(formatInfo.computeDepthPitch(area.height, 0, inputDepthPitch),
>-                     inputDepthPitch);
>+    GLuint inputRowPitch                 = 0;
>+    ANGLE_CHECK_GL_MATH(
>+        context9, formatInfo.computeRowPitch(GL_UNSIGNED_BYTE, area.width, 1, 0, &inputRowPitch));
>+
>+    GLuint inputDepthPitch = 0;
>+    ANGLE_CHECK_GL_MATH(
>+        context9, formatInfo.computeDepthPitch(area.height, 0, inputRowPitch, &inputDepthPitch));
> 
>     const d3d9::TextureFormat &d3d9FormatInfo = d3d9::GetTextureFormatInfo(mInternalFormat);
> 
>@@ -624,32 +534,26 @@ gl::Error Image9::loadCompressedData(const gl::Context *context,
> 
>     ASSERT(d3d9FormatInfo.loadFunction != nullptr);
> 
>-    RECT lockRect =
>-    {
>-        area.x, area.y,
>-        area.x + area.width, area.y + area.height
>-    };
>+    RECT lockRect = {area.x, area.y, area.x + area.width, area.y + area.height};
> 
>     D3DLOCKED_RECT locked;
>-    gl::Error error = lock(&locked, lockRect);
>-    if (error.isError())
>-    {
>-        return error;
>-    }
>+    ANGLE_TRY(lock(GetImplAs<Context9>(context), &locked, lockRect));
> 
>     d3d9FormatInfo.loadFunction(area.width, area.height, area.depth,
>-                                reinterpret_cast<const uint8_t*>(input), inputRowPitch, inputDepthPitch,
>-                                reinterpret_cast<uint8_t*>(locked.pBits), locked.Pitch, 0);
>+                                static_cast<const uint8_t *>(input), inputRowPitch, inputDepthPitch,
>+                                static_cast<uint8_t *>(locked.pBits), locked.Pitch, 0);
> 
>     unlock();
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-// This implements glCopyTex[Sub]Image2D for non-renderable internal texture formats and incomplete textures
>-gl::Error Image9::copyFromRTInternal(const gl::Offset &destOffset,
>-                                     const gl::Rectangle &sourceArea,
>-                                     RenderTargetD3D *source)
>+// This implements glCopyTex[Sub]Image2D for non-renderable internal texture formats and incomplete
>+// textures
>+angle::Result Image9::copyFromRTInternal(Context9 *context9,
>+                                         const gl::Offset &destOffset,
>+                                         const gl::Rectangle &sourceArea,
>+                                         RenderTargetD3D *source)
> {
>     ASSERT(source);
> 
>@@ -658,263 +562,231 @@ gl::Error Image9::copyFromRTInternal(const gl::Offset &destOffset,
> 
>     RenderTarget9 *renderTarget = GetAs<RenderTarget9>(source);
> 
>-    IDirect3DSurface9 *surface = renderTarget->getSurface();
>+    angle::ComPtr<IDirect3DSurface9> surface = renderTarget->getSurface();
>     ASSERT(surface);
> 
>     IDirect3DDevice9 *device = mRenderer->getDevice();
> 
>-    IDirect3DSurface9 *renderTargetData = nullptr;
>+    angle::ComPtr<IDirect3DSurface9> renderTargetData = nullptr;
>     D3DSURFACE_DESC description;
>     surface->GetDesc(&description);
> 
>-    HRESULT result = device->CreateOffscreenPlainSurface(description.Width, description.Height,
>-                                                         description.Format, D3DPOOL_SYSTEMMEM,
>-                                                         &renderTargetData, nullptr);
>+    HRESULT hr = device->CreateOffscreenPlainSurface(description.Width, description.Height,
>+                                                     description.Format, D3DPOOL_SYSTEMMEM,
>+                                                     &renderTargetData, nullptr);
> 
>-    if (FAILED(result))
>-    {
>-        SafeRelease(surface);
>-        return gl::OutOfMemory() << "Could not create matching destination surface, "
>-                                 << gl::FmtHR(result);
>-    }
>+    ANGLE_TRY_HR(context9, hr, "Could not create matching destination surface");
> 
>-    result = device->GetRenderTargetData(surface, renderTargetData);
>+    hr = device->GetRenderTargetData(surface.Get(), renderTargetData.Get());
> 
>-    if (FAILED(result))
>-    {
>-        SafeRelease(renderTargetData);
>-        SafeRelease(surface);
>-        return gl::OutOfMemory() << "GetRenderTargetData unexpectedly failed, "
>-                                 << gl::FmtHR(result);
>-    }
>+    ANGLE_TRY_HR(context9, hr, "GetRenderTargetData unexpectedly failed");
> 
>-    int width = sourceArea.width;
>+    int width  = sourceArea.width;
>     int height = sourceArea.height;
> 
>-    RECT sourceRect = { sourceArea.x, sourceArea.y, sourceArea.x + width, sourceArea.y + height };
>-    RECT destRect = { destOffset.x, destOffset.y, destOffset.x + width, destOffset.y + height };
>+    RECT sourceRect = {sourceArea.x, sourceArea.y, sourceArea.x + width, sourceArea.y + height};
>+    RECT destRect   = {destOffset.x, destOffset.y, destOffset.x + width, destOffset.y + height};
> 
>     D3DLOCKED_RECT sourceLock = {0};
>-    result = renderTargetData->LockRect(&sourceLock, &sourceRect, 0);
>+    hr                        = renderTargetData->LockRect(&sourceLock, &sourceRect, 0);
> 
>-    if (FAILED(result))
>-    {
>-        SafeRelease(renderTargetData);
>-        SafeRelease(surface);
>-        return gl::OutOfMemory()
>-               << "Failed to lock the source surface (rectangle might be invalid), "
>-               << gl::FmtHR(result);
>-    }
>+    ANGLE_TRY_HR(context9, hr, "Failed to lock the source surface (rectangle might be invalid)");
> 
>     D3DLOCKED_RECT destLock = {0};
>-    gl::Error error = lock(&destLock, destRect);
>-    if (error.isError())
>+    angle::Result result    = lock(context9, &destLock, destRect);
>+    if (result == angle::Result::Stop)
>     {
>         renderTargetData->UnlockRect();
>-        SafeRelease(renderTargetData);
>-        SafeRelease(surface);
>-        return error;
>     }
>+    ANGLE_TRY(result);
> 
>     ASSERT(destLock.pBits && sourceLock.pBits);
> 
>-    unsigned char *sourcePixels = (unsigned char*)sourceLock.pBits;
>-    unsigned char *destPixels = (unsigned char*)destLock.pBits;
>+    unsigned char *sourcePixels = (unsigned char *)sourceLock.pBits;
>+    unsigned char *destPixels   = (unsigned char *)destLock.pBits;
> 
>     switch (description.Format)
>     {
>-      case D3DFMT_X8R8G8B8:
>-      case D3DFMT_A8R8G8B8:
>-        switch (getD3DFormat())
>-        {
>-          case D3DFMT_X8R8G8B8:
>-          case D3DFMT_A8R8G8B8:
>-            for (int y = 0; y < height; y++)
>-            {
>-                memcpy(destPixels, sourcePixels, 4 * width);
>-                sourcePixels += sourceLock.Pitch;
>-                destPixels += destLock.Pitch;
>-            }
>-            break;
>-          case D3DFMT_L8:
>-            for (int y = 0; y < height; y++)
>-            {
>-                for (int x = 0; x < width; x++)
>-                {
>-                    destPixels[x] = sourcePixels[x * 4 + 2];
>-                }
>-                sourcePixels += sourceLock.Pitch;
>-                destPixels += destLock.Pitch;
>-            }
>-            break;
>-          case D3DFMT_A8L8:
>-            for (int y = 0; y < height; y++)
>-            {
>-                for (int x = 0; x < width; x++)
>-                {
>-                    destPixels[x * 2 + 0] = sourcePixels[x * 4 + 2];
>-                    destPixels[x * 2 + 1] = sourcePixels[x * 4 + 3];
>-                }
>-                sourcePixels += sourceLock.Pitch;
>-                destPixels += destLock.Pitch;
>-            }
>-            break;
>-          default:
>-            UNREACHABLE();
>-        }
>-        break;
>-      case D3DFMT_R5G6B5:
>-        switch (getD3DFormat())
>-        {
>-          case D3DFMT_X8R8G8B8:
>-            for (int y = 0; y < height; y++)
>-            {
>-                for (int x = 0; x < width; x++)
>-                {
>-                    unsigned short rgb = ((unsigned short*)sourcePixels)[x];
>-                    unsigned char red = static_cast<unsigned char>((rgb & 0xF800) >> 8);
>-                    unsigned char green = static_cast<unsigned char>((rgb & 0x07E0) >> 3);
>-                    unsigned char blue = static_cast<unsigned char>((rgb & 0x001F) << 3);
>-                    destPixels[x + 0] = blue | (blue >> 5);
>-                    destPixels[x + 1] = green | (green >> 6);
>-                    destPixels[x + 2] = red | (red >> 5);
>-                    destPixels[x + 3] = 0xFF;
>-                }
>-                sourcePixels += sourceLock.Pitch;
>-                destPixels += destLock.Pitch;
>-            }
>-            break;
>-          case D3DFMT_L8:
>-            for (int y = 0; y < height; y++)
>+        case D3DFMT_X8R8G8B8:
>+        case D3DFMT_A8R8G8B8:
>+            switch (getD3DFormat())
>             {
>-                for (int x = 0; x < width; x++)
>-                {
>-                    unsigned char red = sourcePixels[x * 2 + 1] & 0xF8;
>-                    destPixels[x] = red | (red >> 5);
>-                }
>-                sourcePixels += sourceLock.Pitch;
>-                destPixels += destLock.Pitch;
>+                case D3DFMT_X8R8G8B8:
>+                case D3DFMT_A8R8G8B8:
>+                    for (int y = 0; y < height; y++)
>+                    {
>+                        memcpy(destPixels, sourcePixels, 4 * width);
>+                        sourcePixels += sourceLock.Pitch;
>+                        destPixels += destLock.Pitch;
>+                    }
>+                    break;
>+                case D3DFMT_L8:
>+                    for (int y = 0; y < height; y++)
>+                    {
>+                        for (int x = 0; x < width; x++)
>+                        {
>+                            destPixels[x] = sourcePixels[x * 4 + 2];
>+                        }
>+                        sourcePixels += sourceLock.Pitch;
>+                        destPixels += destLock.Pitch;
>+                    }
>+                    break;
>+                case D3DFMT_A8L8:
>+                    for (int y = 0; y < height; y++)
>+                    {
>+                        for (int x = 0; x < width; x++)
>+                        {
>+                            destPixels[x * 2 + 0] = sourcePixels[x * 4 + 2];
>+                            destPixels[x * 2 + 1] = sourcePixels[x * 4 + 3];
>+                        }
>+                        sourcePixels += sourceLock.Pitch;
>+                        destPixels += destLock.Pitch;
>+                    }
>+                    break;
>+                default:
>+                    UNREACHABLE();
>             }
>             break;
>-          default:
>-            UNREACHABLE();
>-        }
>-        break;
>-      case D3DFMT_A1R5G5B5:
>-        switch (getD3DFormat())
>-        {
>-          case D3DFMT_X8R8G8B8:
>-            for (int y = 0; y < height; y++)
>+        case D3DFMT_R5G6B5:
>+            switch (getD3DFormat())
>             {
>-                for (int x = 0; x < width; x++)
>-                {
>-                    unsigned short argb = ((unsigned short*)sourcePixels)[x];
>-                    unsigned char red = static_cast<unsigned char>((argb & 0x7C00) >> 7);
>-                    unsigned char green = static_cast<unsigned char>((argb & 0x03E0) >> 2);
>-                    unsigned char blue = static_cast<unsigned char>((argb & 0x001F) << 3);
>-                    destPixels[x + 0] = blue | (blue >> 5);
>-                    destPixels[x + 1] = green | (green >> 5);
>-                    destPixels[x + 2] = red | (red >> 5);
>-                    destPixels[x + 3] = 0xFF;
>-                }
>-                sourcePixels += sourceLock.Pitch;
>-                destPixels += destLock.Pitch;
>+                case D3DFMT_X8R8G8B8:
>+                    for (int y = 0; y < height; y++)
>+                    {
>+                        for (int x = 0; x < width; x++)
>+                        {
>+                            unsigned short rgb  = ((unsigned short *)sourcePixels)[x];
>+                            unsigned char red   = static_cast<unsigned char>((rgb & 0xF800) >> 8);
>+                            unsigned char green = static_cast<unsigned char>((rgb & 0x07E0) >> 3);
>+                            unsigned char blue  = static_cast<unsigned char>((rgb & 0x001F) << 3);
>+                            destPixels[x + 0]   = blue | (blue >> 5);
>+                            destPixels[x + 1]   = green | (green >> 6);
>+                            destPixels[x + 2]   = red | (red >> 5);
>+                            destPixels[x + 3]   = 0xFF;
>+                        }
>+                        sourcePixels += sourceLock.Pitch;
>+                        destPixels += destLock.Pitch;
>+                    }
>+                    break;
>+                case D3DFMT_L8:
>+                    for (int y = 0; y < height; y++)
>+                    {
>+                        for (int x = 0; x < width; x++)
>+                        {
>+                            unsigned char red = sourcePixels[x * 2 + 1] & 0xF8;
>+                            destPixels[x]     = red | (red >> 5);
>+                        }
>+                        sourcePixels += sourceLock.Pitch;
>+                        destPixels += destLock.Pitch;
>+                    }
>+                    break;
>+                default:
>+                    UNREACHABLE();
>             }
>             break;
>-          case D3DFMT_A8R8G8B8:
>-            for (int y = 0; y < height; y++)
>+        case D3DFMT_A1R5G5B5:
>+            switch (getD3DFormat())
>             {
>-                for (int x = 0; x < width; x++)
>-                {
>-                    unsigned short argb = ((unsigned short*)sourcePixels)[x];
>-                    unsigned char red = static_cast<unsigned char>((argb & 0x7C00) >> 7);
>-                    unsigned char green = static_cast<unsigned char>((argb & 0x03E0) >> 2);
>-                    unsigned char blue = static_cast<unsigned char>((argb & 0x001F) << 3);
>-                    unsigned char alpha = (signed short)argb >> 15;
>-                    destPixels[x + 0] = blue | (blue >> 5);
>-                    destPixels[x + 1] = green | (green >> 5);
>-                    destPixels[x + 2] = red | (red >> 5);
>-                    destPixels[x + 3] = alpha;
>-                }
>-                sourcePixels += sourceLock.Pitch;
>-                destPixels += destLock.Pitch;
>+                case D3DFMT_X8R8G8B8:
>+                    for (int y = 0; y < height; y++)
>+                    {
>+                        for (int x = 0; x < width; x++)
>+                        {
>+                            unsigned short argb = ((unsigned short *)sourcePixels)[x];
>+                            unsigned char red   = static_cast<unsigned char>((argb & 0x7C00) >> 7);
>+                            unsigned char green = static_cast<unsigned char>((argb & 0x03E0) >> 2);
>+                            unsigned char blue  = static_cast<unsigned char>((argb & 0x001F) << 3);
>+                            destPixels[x + 0]   = blue | (blue >> 5);
>+                            destPixels[x + 1]   = green | (green >> 5);
>+                            destPixels[x + 2]   = red | (red >> 5);
>+                            destPixels[x + 3]   = 0xFF;
>+                        }
>+                        sourcePixels += sourceLock.Pitch;
>+                        destPixels += destLock.Pitch;
>+                    }
>+                    break;
>+                case D3DFMT_A8R8G8B8:
>+                    for (int y = 0; y < height; y++)
>+                    {
>+                        for (int x = 0; x < width; x++)
>+                        {
>+                            unsigned short argb = ((unsigned short *)sourcePixels)[x];
>+                            unsigned char red   = static_cast<unsigned char>((argb & 0x7C00) >> 7);
>+                            unsigned char green = static_cast<unsigned char>((argb & 0x03E0) >> 2);
>+                            unsigned char blue  = static_cast<unsigned char>((argb & 0x001F) << 3);
>+                            unsigned char alpha = (signed short)argb >> 15;
>+                            destPixels[x + 0]   = blue | (blue >> 5);
>+                            destPixels[x + 1]   = green | (green >> 5);
>+                            destPixels[x + 2]   = red | (red >> 5);
>+                            destPixels[x + 3]   = alpha;
>+                        }
>+                        sourcePixels += sourceLock.Pitch;
>+                        destPixels += destLock.Pitch;
>+                    }
>+                    break;
>+                case D3DFMT_L8:
>+                    for (int y = 0; y < height; y++)
>+                    {
>+                        for (int x = 0; x < width; x++)
>+                        {
>+                            unsigned char red = sourcePixels[x * 2 + 1] & 0x7C;
>+                            destPixels[x]     = (red << 1) | (red >> 4);
>+                        }
>+                        sourcePixels += sourceLock.Pitch;
>+                        destPixels += destLock.Pitch;
>+                    }
>+                    break;
>+                case D3DFMT_A8L8:
>+                    for (int y = 0; y < height; y++)
>+                    {
>+                        for (int x = 0; x < width; x++)
>+                        {
>+                            unsigned char red     = sourcePixels[x * 2 + 1] & 0x7C;
>+                            destPixels[x * 2 + 0] = (red << 1) | (red >> 4);
>+                            destPixels[x * 2 + 1] = (signed char)sourcePixels[x * 2 + 1] >> 7;
>+                        }
>+                        sourcePixels += sourceLock.Pitch;
>+                        destPixels += destLock.Pitch;
>+                    }
>+                    break;
>+                default:
>+                    UNREACHABLE();
>             }
>             break;
>-          case D3DFMT_L8:
>-            for (int y = 0; y < height; y++)
>-            {
>-                for (int x = 0; x < width; x++)
>-                {
>-                    unsigned char red = sourcePixels[x * 2 + 1] & 0x7C;
>-                    destPixels[x] = (red << 1) | (red >> 4);
>-                }
>-                sourcePixels += sourceLock.Pitch;
>-                destPixels += destLock.Pitch;
>-            }
>-            break;
>-          case D3DFMT_A8L8:
>-            for (int y = 0; y < height; y++)
>-            {
>-                for (int x = 0; x < width; x++)
>-                {
>-                    unsigned char red = sourcePixels[x * 2 + 1] & 0x7C;
>-                    destPixels[x * 2 + 0] = (red << 1) | (red >> 4);
>-                    destPixels[x * 2 + 1] = (signed char)sourcePixels[x * 2 + 1] >> 7;
>-                }
>-                sourcePixels += sourceLock.Pitch;
>-                destPixels += destLock.Pitch;
>-            }
>-            break;
>-          default:
>+        default:
>             UNREACHABLE();
>-        }
>-        break;
>-      default:
>-        UNREACHABLE();
>     }
> 
>     unlock();
>     renderTargetData->UnlockRect();
> 
>-    SafeRelease(renderTargetData);
>-    SafeRelease(surface);
>-
>     mDirty = true;
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error Image9::copyFromTexStorage(const gl::Context *context,
>-                                     const gl::ImageIndex &imageIndex,
>-                                     TextureStorage *source)
>+angle::Result Image9::copyFromTexStorage(const gl::Context *context,
>+                                         const gl::ImageIndex &imageIndex,
>+                                         TextureStorage *source)
> {
>     RenderTargetD3D *renderTarget = nullptr;
>-    gl::Error error               = source->getRenderTarget(context, imageIndex, &renderTarget);
>-    if (error.isError())
>-    {
>-        return error;
>-    }
>+    ANGLE_TRY(source->getRenderTarget(context, imageIndex, &renderTarget));
> 
>     gl::Rectangle sourceArea(0, 0, mWidth, mHeight);
>-    return copyFromRTInternal(gl::Offset(), sourceArea, renderTarget);
>+    return copyFromRTInternal(GetImplAs<Context9>(context), gl::Offset(), sourceArea, renderTarget);
> }
> 
>-gl::Error Image9::copyFromFramebuffer(const gl::Context *context,
>-                                      const gl::Offset &destOffset,
>-                                      const gl::Rectangle &sourceArea,
>-                                      const gl::Framebuffer *source)
>+angle::Result Image9::copyFromFramebuffer(const gl::Context *context,
>+                                          const gl::Offset &destOffset,
>+                                          const gl::Rectangle &sourceArea,
>+                                          const gl::Framebuffer *source)
> {
>     const gl::FramebufferAttachment *srcAttachment = source->getReadColorbuffer();
>     ASSERT(srcAttachment);
> 
>     RenderTargetD3D *renderTarget = nullptr;
>-    gl::Error error               = srcAttachment->getRenderTarget(context, &renderTarget);
>-    if (error.isError())
>-    {
>-        return error;
>-    }
>-
>+    ANGLE_TRY(srcAttachment->getRenderTarget(context, &renderTarget));
>     ASSERT(renderTarget);
>-    return copyFromRTInternal(destOffset, sourceArea, renderTarget);
>+    return copyFromRTInternal(GetImplAs<Context9>(context), destOffset, sourceArea, renderTarget);
> }
> 
> }  // namespace rx
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/Image9.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/Image9.h
>index 01c60dc4fb4..81b8e9c12c0 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/Image9.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/Image9.h
>@@ -10,8 +10,8 @@
> #ifndef LIBANGLE_RENDERER_D3D_D3D9_IMAGE9_H_
> #define LIBANGLE_RENDERER_D3D_D3D9_IMAGE9_H_
> 
>-#include "libANGLE/renderer/d3d/ImageD3D.h"
> #include "common/debug.h"
>+#include "libANGLE/renderer/d3d/ImageD3D.h"
> 
> namespace gl
> {
>@@ -20,6 +20,7 @@ class Framebuffer;
> 
> namespace rx
> {
>+class Context9;
> class Renderer9;
> 
> class Image9 : public ImageD3D
>@@ -28,75 +29,84 @@ class Image9 : public ImageD3D
>     Image9(Renderer9 *renderer);
>     ~Image9() override;
> 
>-    static gl::Error generateMipmap(Image9 *dest, Image9 *source);
>-    static gl::Error generateMip(IDirect3DSurface9 *destSurface, IDirect3DSurface9 *sourceSurface);
>-    static gl::Error copyLockableSurfaces(IDirect3DSurface9 *dest, IDirect3DSurface9 *source);
>-    static gl::Error CopyImage(const gl::Context *context,
>-                               Image9 *dest,
>-                               Image9 *source,
>-                               const gl::Rectangle &sourceRect,
>-                               const gl::Offset &destOffset,
>-                               bool unpackFlipY,
>-                               bool unpackPremultiplyAlpha,
>-                               bool unpackUnmultiplyAlpha);
>-
>-    bool redefine(GLenum target, GLenum internalformat, const gl::Extents &size, bool forceRelease) override;
>+    static angle::Result GenerateMipmap(Context9 *context9, Image9 *dest, Image9 *source);
>+    static angle::Result GenerateMip(Context9 *context9,
>+                                     IDirect3DSurface9 *destSurface,
>+                                     IDirect3DSurface9 *sourceSurface);
>+    static angle::Result CopyLockableSurfaces(Context9 *context9,
>+                                              IDirect3DSurface9 *dest,
>+                                              IDirect3DSurface9 *source);
>+    static angle::Result CopyImage(const gl::Context *context,
>+                                   Image9 *dest,
>+                                   Image9 *source,
>+                                   const gl::Rectangle &sourceRect,
>+                                   const gl::Offset &destOffset,
>+                                   bool unpackFlipY,
>+                                   bool unpackPremultiplyAlpha,
>+                                   bool unpackUnmultiplyAlpha);
>+
>+    bool redefine(gl::TextureType type,
>+                  GLenum internalformat,
>+                  const gl::Extents &size,
>+                  bool forceRelease) override;
> 
>     D3DFORMAT getD3DFormat() const;
> 
>     bool isDirty() const override;
> 
>-    gl::Error setManagedSurface2D(const gl::Context *context,
>-                                  TextureStorage *storage,
>-                                  int level) override;
>-    gl::Error setManagedSurfaceCube(const gl::Context *context,
>-                                    TextureStorage *storage,
>-                                    int face,
>-                                    int level) override;
>-    gl::Error copyToStorage(const gl::Context *context,
>-                            TextureStorage *storage,
>-                            const gl::ImageIndex &index,
>-                            const gl::Box &region) override;
>-
>-    gl::Error loadData(const gl::Context *context,
>-                       const gl::Box &area,
>-                       const gl::PixelUnpackState &unpack,
>-                       GLenum type,
>-                       const void *input,
>-                       bool applySkipImages) override;
>-    gl::Error loadCompressedData(const gl::Context *context,
>-                                 const gl::Box &area,
>-                                 const void *input) override;
>-
>-    gl::Error copyFromTexStorage(const gl::Context *context,
>-                                 const gl::ImageIndex &imageIndex,
>-                                 TextureStorage *source) override;
>-    gl::Error copyFromFramebuffer(const gl::Context *context,
>-                                  const gl::Offset &destOffset,
>-                                  const gl::Rectangle &sourceArea,
>-                                  const gl::Framebuffer *source) override;
>+    angle::Result setManagedSurface2D(const gl::Context *context,
>+                                      TextureStorage *storage,
>+                                      int level) override;
>+    angle::Result setManagedSurfaceCube(const gl::Context *context,
>+                                        TextureStorage *storage,
>+                                        int face,
>+                                        int level) override;
>+    angle::Result copyToStorage(const gl::Context *context,
>+                                TextureStorage *storage,
>+                                const gl::ImageIndex &index,
>+                                const gl::Box &region) override;
>+
>+    angle::Result loadData(const gl::Context *context,
>+                           const gl::Box &area,
>+                           const gl::PixelUnpackState &unpack,
>+                           GLenum type,
>+                           const void *input,
>+                           bool applySkipImages) override;
>+    angle::Result loadCompressedData(const gl::Context *context,
>+                                     const gl::Box &area,
>+                                     const void *input) override;
>+
>+    angle::Result copyFromTexStorage(const gl::Context *context,
>+                                     const gl::ImageIndex &imageIndex,
>+                                     TextureStorage *source) override;
>+    angle::Result copyFromFramebuffer(const gl::Context *context,
>+                                      const gl::Offset &destOffset,
>+                                      const gl::Rectangle &sourceArea,
>+                                      const gl::Framebuffer *source) override;
> 
>   private:
>-    gl::Error getSurface(IDirect3DSurface9 **outSurface);
>+    angle::Result getSurface(Context9 *context9, IDirect3DSurface9 **outSurface);
> 
>-    gl::Error createSurface();
>-    gl::Error setManagedSurface(IDirect3DSurface9 *surface);
>-    gl::Error copyToSurface(IDirect3DSurface9 *dest, const gl::Box &area);
>+    angle::Result createSurface(Context9 *context9);
>+    angle::Result setManagedSurface(Context9 *context9, IDirect3DSurface9 *surface);
>+    angle::Result copyToSurface(Context9 *context9, IDirect3DSurface9 *dest, const gl::Box &area);
> 
>-    gl::Error lock(D3DLOCKED_RECT *lockedRect, const RECT &rect);
>+    angle::Result lock(Context9 *context9, D3DLOCKED_RECT *lockedRect, const RECT &rect);
>     void unlock();
> 
>-    gl::Error copyFromRTInternal(const gl::Offset &destOffset,
>-                                 const gl::Rectangle &sourceArea,
>-                                 RenderTargetD3D *source);
>+    angle::Result copyFromRTInternal(Context9 *context9,
>+                                     const gl::Offset &destOffset,
>+                                     const gl::Rectangle &sourceArea,
>+                                     RenderTargetD3D *source);
> 
>     Renderer9 *mRenderer;
> 
>-    D3DPOOL mD3DPool;   // can only be D3DPOOL_SYSTEMMEM or D3DPOOL_MANAGED since it needs to be lockable.
>+    D3DPOOL mD3DPool;  // can only be D3DPOOL_SYSTEMMEM or D3DPOOL_MANAGED since it needs to be
>+                       // lockable.
>     D3DFORMAT mD3DFormat;
> 
>     IDirect3DSurface9 *mSurface;
> };
>-}
>+}  // namespace rx
> 
>-#endif   // LIBANGLE_RENDERER_D3D_D3D9_IMAGE9_H_
>+#endif  // LIBANGLE_RENDERER_D3D_D3D9_IMAGE9_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/IndexBuffer9.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/IndexBuffer9.cpp
>index df86331766b..d1b1b51a64b 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/IndexBuffer9.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/IndexBuffer9.cpp
>@@ -7,6 +7,8 @@
> // Indexffer9.cpp: Defines the D3D9 IndexBuffer implementation.
> 
> #include "libANGLE/renderer/d3d/d3d9/IndexBuffer9.h"
>+
>+#include "libANGLE/Context.h"
> #include "libANGLE/renderer/d3d/d3d9/Renderer9.h"
> 
> namespace rx
>@@ -15,9 +17,9 @@ namespace rx
> IndexBuffer9::IndexBuffer9(Renderer9 *const renderer) : mRenderer(renderer)
> {
>     mIndexBuffer = nullptr;
>-    mBufferSize = 0;
>-    mIndexType = 0;
>-    mDynamic = false;
>+    mBufferSize  = 0;
>+    mIndexType   = gl::DrawElementsType::InvalidEnum;
>+    mDynamic     = false;
> }
> 
> IndexBuffer9::~IndexBuffer9()
>@@ -25,7 +27,10 @@ IndexBuffer9::~IndexBuffer9()
>     SafeRelease(mIndexBuffer);
> }
> 
>-gl::Error IndexBuffer9::initialize(unsigned int bufferSize, GLenum indexType, bool dynamic)
>+angle::Result IndexBuffer9::initialize(const gl::Context *context,
>+                                       unsigned int bufferSize,
>+                                       gl::DrawElementsType indexType,
>+                                       bool dynamic)
> {
>     SafeRelease(mIndexBuffer);
> 
>@@ -34,16 +39,18 @@ gl::Error IndexBuffer9::initialize(unsigned int bufferSize, GLenum indexType, bo
>     if (bufferSize > 0)
>     {
>         D3DFORMAT format = D3DFMT_UNKNOWN;
>-        if (indexType == GL_UNSIGNED_SHORT || indexType == GL_UNSIGNED_BYTE)
>+        if (indexType == gl::DrawElementsType::UnsignedShort ||
>+            indexType == gl::DrawElementsType::UnsignedByte)
>         {
>             format = D3DFMT_INDEX16;
>         }
>-        else if (indexType == GL_UNSIGNED_INT)
>+        else if (indexType == gl::DrawElementsType::UnsignedInt)
>         {
>             ASSERT(mRenderer->getNativeExtensions().elementIndexUint);
>             format = D3DFMT_INDEX32;
>         }
>-        else UNREACHABLE();
>+        else
>+            UNREACHABLE();
> 
>         DWORD usageFlags = D3DUSAGE_WRITEONLY;
>         if (dynamic)
>@@ -51,58 +58,46 @@ gl::Error IndexBuffer9::initialize(unsigned int bufferSize, GLenum indexType, bo
>             usageFlags |= D3DUSAGE_DYNAMIC;
>         }
> 
>-        HRESULT result = mRenderer->createIndexBuffer(bufferSize, usageFlags, format, &mIndexBuffer);
>-        if (FAILED(result))
>-        {
>-            return gl::OutOfMemory()
>-                   << "Failed to allocate internal index buffer of size " << bufferSize;
>-        }
>+        HRESULT result =
>+            mRenderer->createIndexBuffer(bufferSize, usageFlags, format, &mIndexBuffer);
>+        ANGLE_TRY_HR(GetImplAs<Context9>(context), result,
>+                     "Failed to allocate internal index buffer");
>     }
> 
>     mBufferSize = bufferSize;
>-    mIndexType = indexType;
>-    mDynamic = dynamic;
>+    mIndexType  = indexType;
>+    mDynamic    = dynamic;
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error IndexBuffer9::mapBuffer(unsigned int offset, unsigned int size, void** outMappedMemory)
>+angle::Result IndexBuffer9::mapBuffer(const gl::Context *context,
>+                                      unsigned int offset,
>+                                      unsigned int size,
>+                                      void **outMappedMemory)
> {
>-    if (!mIndexBuffer)
>-    {
>-        return gl::OutOfMemory() << "Internal index buffer is not initialized.";
>-    }
>+    ASSERT(mIndexBuffer);
> 
>     DWORD lockFlags = mDynamic ? D3DLOCK_NOOVERWRITE : 0;
> 
>     void *mapPtr   = nullptr;
>     HRESULT result = mIndexBuffer->Lock(offset, size, &mapPtr, lockFlags);
>-    if (FAILED(result))
>-    {
>-        return gl::OutOfMemory() << "Failed to lock internal index buffer, " << gl::FmtHR(result);
>-    }
>+    ANGLE_TRY_HR(GetImplAs<Context9>(context), result, "Failed to lock internal index buffer");
> 
>     *outMappedMemory = mapPtr;
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error IndexBuffer9::unmapBuffer()
>+angle::Result IndexBuffer9::unmapBuffer(const gl::Context *context)
> {
>-    if (!mIndexBuffer)
>-    {
>-        return gl::OutOfMemory() << "Internal index buffer is not initialized.";
>-    }
>-
>+    ASSERT(mIndexBuffer);
>     HRESULT result = mIndexBuffer->Unlock();
>-    if (FAILED(result))
>-    {
>-        return gl::OutOfMemory() << "Failed to unlock internal index buffer, " << gl::FmtHR(result);
>-    }
>+    ANGLE_TRY_HR(GetImplAs<Context9>(context), result, "Failed to unlock internal index buffer");
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-GLenum IndexBuffer9::getIndexType() const
>+gl::DrawElementsType IndexBuffer9::getIndexType() const
> {
>     return mIndexType;
> }
>@@ -112,57 +107,55 @@ unsigned int IndexBuffer9::getBufferSize() const
>     return mBufferSize;
> }
> 
>-gl::Error IndexBuffer9::setSize(unsigned int bufferSize, GLenum indexType)
>+angle::Result IndexBuffer9::setSize(const gl::Context *context,
>+                                    unsigned int bufferSize,
>+                                    gl::DrawElementsType indexType)
> {
>     if (bufferSize > mBufferSize || indexType != mIndexType)
>     {
>-        return initialize(bufferSize, indexType, mDynamic);
>-    }
>-    else
>-    {
>-        return gl::NoError();
>+        return initialize(context, bufferSize, indexType, mDynamic);
>     }
>+
>+    return angle::Result::Continue;
> }
> 
>-gl::Error IndexBuffer9::discard()
>+angle::Result IndexBuffer9::discard(const gl::Context *context)
> {
>-    if (!mIndexBuffer)
>-    {
>-        return gl::OutOfMemory() << "Internal index buffer is not initialized.";
>-    }
>+    ASSERT(mIndexBuffer);
> 
>     void *dummy;
>     HRESULT result;
> 
>+    Context9 *context9 = GetImplAs<Context9>(context);
>+
>     result = mIndexBuffer->Lock(0, 1, &dummy, D3DLOCK_DISCARD);
>-    if (FAILED(result))
>-    {
>-        return gl::OutOfMemory() << "Failed to lock internal index buffer, " << gl::FmtHR(result);
>-    }
>+    ANGLE_TRY_HR(context9, result, "Failed to lock internal index buffer");
> 
>     result = mIndexBuffer->Unlock();
>-    if (FAILED(result))
>-    {
>-        return gl::OutOfMemory() << "Failed to unlock internal index buffer, " << gl::FmtHR(result);
>-    }
>+    ANGLE_TRY_HR(context9, result, "Failed to unlock internal index buffer");
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
> D3DFORMAT IndexBuffer9::getIndexFormat() const
> {
>     switch (mIndexType)
>     {
>-      case GL_UNSIGNED_BYTE:    return D3DFMT_INDEX16;
>-      case GL_UNSIGNED_SHORT:   return D3DFMT_INDEX16;
>-      case GL_UNSIGNED_INT:     return D3DFMT_INDEX32;
>-      default: UNREACHABLE();   return D3DFMT_UNKNOWN;
>+        case gl::DrawElementsType::UnsignedByte:
>+            return D3DFMT_INDEX16;
>+        case gl::DrawElementsType::UnsignedShort:
>+            return D3DFMT_INDEX16;
>+        case gl::DrawElementsType::UnsignedInt:
>+            return D3DFMT_INDEX32;
>+        default:
>+            UNREACHABLE();
>+            return D3DFMT_UNKNOWN;
>     }
> }
> 
>-IDirect3DIndexBuffer9 * IndexBuffer9::getBuffer() const
>+IDirect3DIndexBuffer9 *IndexBuffer9::getBuffer() const
> {
>     return mIndexBuffer;
> }
> 
>-}
>+}  // namespace rx
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/IndexBuffer9.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/IndexBuffer9.h
>index 5921d2a859a..ca7cc20ed27 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/IndexBuffer9.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/IndexBuffer9.h
>@@ -21,16 +21,24 @@ class IndexBuffer9 : public IndexBuffer
>     explicit IndexBuffer9(Renderer9 *const renderer);
>     ~IndexBuffer9() override;
> 
>-    gl::Error initialize(unsigned int bufferSize, GLenum indexType, bool dynamic) override;
>-
>-    gl::Error mapBuffer(unsigned int offset, unsigned int size, void **outMappedMemory) override;
>-    gl::Error unmapBuffer() override;
>-
>-    GLenum getIndexType() const override;
>+    angle::Result initialize(const gl::Context *context,
>+                             unsigned int bufferSize,
>+                             gl::DrawElementsType indexType,
>+                             bool dynamic) override;
>+
>+    angle::Result mapBuffer(const gl::Context *context,
>+                            unsigned int offset,
>+                            unsigned int size,
>+                            void **outMappedMemory) override;
>+    angle::Result unmapBuffer(const gl::Context *context) override;
>+
>+    gl::DrawElementsType getIndexType() const override;
>     unsigned int getBufferSize() const override;
>-    gl::Error setSize(unsigned int bufferSize, GLenum indexType) override;
>+    angle::Result setSize(const gl::Context *context,
>+                          unsigned int bufferSize,
>+                          gl::DrawElementsType indexType) override;
> 
>-    gl::Error discard() override;
>+    angle::Result discard(const gl::Context *context) override;
> 
>     D3DFORMAT getIndexFormat() const;
>     IDirect3DIndexBuffer9 *getBuffer() const;
>@@ -40,10 +48,10 @@ class IndexBuffer9 : public IndexBuffer
> 
>     IDirect3DIndexBuffer9 *mIndexBuffer;
>     unsigned int mBufferSize;
>-    GLenum mIndexType;
>+    gl::DrawElementsType mIndexType;
>     bool mDynamic;
> };
> 
>-}
>+}  // namespace rx
> 
>-#endif // LIBANGLE_RENDERER_D3D_D3D9_INDEXBUFFER9_H_
>+#endif  // LIBANGLE_RENDERER_D3D_D3D9_INDEXBUFFER9_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/NativeWindow9.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/NativeWindow9.cpp
>index 388b8aa168a..6ee408fe8b4 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/NativeWindow9.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/NativeWindow9.cpp
>@@ -11,9 +11,7 @@
> 
> namespace rx
> {
>-NativeWindow9::NativeWindow9(EGLNativeWindowType window) : NativeWindowD3D(window)
>-{
>-}
>+NativeWindow9::NativeWindow9(EGLNativeWindowType window) : NativeWindowD3D(window) {}
> 
> bool NativeWindow9::initialize()
> {
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/Query9.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/Query9.cpp
>index 4ba053e6bd6..06a977ce10f 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/Query9.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/Query9.cpp
>@@ -7,85 +7,76 @@
> // Query9.cpp: Defines the rx::Query9 class which implements rx::QueryImpl.
> 
> #include "libANGLE/renderer/d3d/d3d9/Query9.h"
>-#include "libANGLE/renderer/d3d/d3d9/renderer9_utils.h"
>+
>+#include "libANGLE/Context.h"
>+#include "libANGLE/renderer/d3d/d3d9/Context9.h"
> #include "libANGLE/renderer/d3d/d3d9/Renderer9.h"
>+#include "libANGLE/renderer/d3d/d3d9/renderer9_utils.h"
> 
> #include <GLES2/gl2ext.h>
> 
> namespace rx
> {
>-Query9::Query9(Renderer9 *renderer, GLenum type)
>+Query9::Query9(Renderer9 *renderer, gl::QueryType type)
>     : QueryImpl(type),
>+      mGetDataAttemptCount(0),
>       mResult(GL_FALSE),
>       mQueryFinished(false),
>       mRenderer(renderer),
>       mQuery(nullptr)
>-{
>-}
>+{}
> 
> Query9::~Query9()
> {
>     SafeRelease(mQuery);
> }
> 
>-gl::Error Query9::begin()
>+angle::Result Query9::begin(const gl::Context *context)
> {
>+    Context9 *context9 = GetImplAs<Context9>(context);
>+
>     D3DQUERYTYPE d3dQueryType = gl_d3d9::ConvertQueryType(getType());
>     if (mQuery == nullptr)
>     {
>         HRESULT result = mRenderer->getDevice()->CreateQuery(d3dQueryType, &mQuery);
>-        if (FAILED(result))
>-        {
>-            return gl::OutOfMemory() << "Internal query creation failed, " << gl::FmtHR(result);
>-        }
>+        ANGLE_TRY_HR(context9, result, "Internal query creation failed");
>     }
> 
>     if (d3dQueryType != D3DQUERYTYPE_EVENT)
>     {
>         HRESULT result = mQuery->Issue(D3DISSUE_BEGIN);
>         ASSERT(SUCCEEDED(result));
>-        if (FAILED(result))
>-        {
>-            return gl::OutOfMemory() << "Failed to begin internal query, " << gl::FmtHR(result);
>-        }
>+        ANGLE_TRY_HR(context9, result, "Failed to begin internal query");
>     }
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error Query9::end()
>+angle::Result Query9::end(const gl::Context *context)
> {
>+    Context9 *context9 = GetImplAs<Context9>(context);
>     ASSERT(mQuery);
> 
>     HRESULT result = mQuery->Issue(D3DISSUE_END);
>     ASSERT(SUCCEEDED(result));
>-    if (FAILED(result))
>-    {
>-        return gl::OutOfMemory() << "Failed to end internal query, " << gl::FmtHR(result);
>-    }
>-
>+    ANGLE_TRY_HR(context9, result, "Failed to end internal query");
>     mQueryFinished = false;
>-    mResult = GL_FALSE;
>+    mResult        = GL_FALSE;
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error Query9::queryCounter()
>+angle::Result Query9::queryCounter(const gl::Context *context)
> {
>-    UNIMPLEMENTED();
>-    return gl::InternalError() << "Unimplemented";
>+    ANGLE_HR_UNREACHABLE(GetImplAs<Context9>(context));
> }
> 
> template <typename T>
>-gl::Error Query9::getResultBase(T *params)
>+angle::Result Query9::getResultBase(Context9 *context9, T *params)
> {
>     while (!mQueryFinished)
>     {
>-        gl::Error error = testQuery();
>-        if (error.isError())
>-        {
>-            return error;
>-        }
>+        ANGLE_TRY(testQuery(context9));
> 
>         if (!mQueryFinished)
>         {
>@@ -95,43 +86,37 @@ gl::Error Query9::getResultBase(T *params)
> 
>     ASSERT(mQueryFinished);
>     *params = static_cast<T>(mResult);
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error Query9::getResult(GLint *params)
>+angle::Result Query9::getResult(const gl::Context *context, GLint *params)
> {
>-    return getResultBase(params);
>+    return getResultBase(GetImplAs<Context9>(context), params);
> }
> 
>-gl::Error Query9::getResult(GLuint *params)
>+angle::Result Query9::getResult(const gl::Context *context, GLuint *params)
> {
>-    return getResultBase(params);
>+    return getResultBase(GetImplAs<Context9>(context), params);
> }
> 
>-gl::Error Query9::getResult(GLint64 *params)
>+angle::Result Query9::getResult(const gl::Context *context, GLint64 *params)
> {
>-    return getResultBase(params);
>+    return getResultBase(GetImplAs<Context9>(context), params);
> }
> 
>-gl::Error Query9::getResult(GLuint64 *params)
>+angle::Result Query9::getResult(const gl::Context *context, GLuint64 *params)
> {
>-    return getResultBase(params);
>+    return getResultBase(GetImplAs<Context9>(context), params);
> }
> 
>-gl::Error Query9::isResultAvailable(bool *available)
>+angle::Result Query9::isResultAvailable(const gl::Context *context, bool *available)
> {
>-    gl::Error error = testQuery();
>-    if (error.isError())
>-    {
>-        return error;
>-    }
>-
>+    ANGLE_TRY(testQuery(GetImplAs<Context9>(context)));
>     *available = mQueryFinished;
>-
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error Query9::testQuery()
>+angle::Result Query9::testQuery(Context9 *context9)
> {
>     if (!mQueryFinished)
>     {
>@@ -140,11 +125,11 @@ gl::Error Query9::testQuery()
>         HRESULT result = S_OK;
>         switch (getType())
>         {
>-            case GL_ANY_SAMPLES_PASSED_EXT:
>-            case GL_ANY_SAMPLES_PASSED_CONSERVATIVE_EXT:
>+            case gl::QueryType::AnySamples:
>+            case gl::QueryType::AnySamplesConservative:
>             {
>                 DWORD numPixels = 0;
>-                result = mQuery->GetData(&numPixels, sizeof(numPixels), D3DGETDATA_FLUSH);
>+                result          = mQuery->GetData(&numPixels, sizeof(numPixels), D3DGETDATA_FLUSH);
>                 if (result == S_OK)
>                 {
>                     mQueryFinished = true;
>@@ -153,10 +138,10 @@ gl::Error Query9::testQuery()
>                 break;
>             }
> 
>-            case GL_COMMANDS_COMPLETED_CHROMIUM:
>+            case gl::QueryType::CommandsCompleted:
>             {
>                 BOOL completed = FALSE;
>-                result = mQuery->GetData(&completed, sizeof(completed), D3DGETDATA_FLUSH);
>+                result         = mQuery->GetData(&completed, sizeof(completed), D3DGETDATA_FLUSH);
>                 if (result == S_OK)
>                 {
>                     mQueryFinished = true;
>@@ -170,19 +155,22 @@ gl::Error Query9::testQuery()
>                 break;
>         }
> 
>-        if (d3d9::isDeviceLostError(result))
>-        {
>-            mRenderer->notifyDeviceLost();
>-            return gl::OutOfMemory() << "Failed to test get query result, device is lost.";
>-        }
>-        else if (mRenderer->testDeviceLost())
>+        if (!mQueryFinished)
>         {
>-            mRenderer->notifyDeviceLost();
>-            return gl::OutOfMemory() << "Failed to test get query result, device is lost.";
>+            ANGLE_TRY_HR(context9, result, "Failed to test get query result");
>+
>+            mGetDataAttemptCount++;
>+            bool checkDeviceLost =
>+                (mGetDataAttemptCount % kPollingD3DDeviceLostCheckFrequency) == 0;
>+            if (checkDeviceLost && mRenderer->testDeviceLost())
>+            {
>+                ANGLE_TRY_HR(context9, D3DERR_DEVICELOST,
>+                             "Failed to test get query result, device is lost");
>+            }
>         }
>     }
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-}
>+}  // namespace rx
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/Query9.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/Query9.h
>index 6c7c22f0965..15e4be5bb50 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/Query9.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/Query9.h
>@@ -13,29 +13,31 @@
> 
> namespace rx
> {
>+class Context9;
> class Renderer9;
> 
> class Query9 : public QueryImpl
> {
>   public:
>-    Query9(Renderer9 *renderer, GLenum type);
>+    Query9(Renderer9 *renderer, gl::QueryType type);
>     ~Query9() override;
> 
>-    gl::Error begin() override;
>-    gl::Error end() override;
>-    gl::Error queryCounter() override;
>-    gl::Error getResult(GLint *params) override;
>-    gl::Error getResult(GLuint *params) override;
>-    gl::Error getResult(GLint64 *params) override;
>-    gl::Error getResult(GLuint64 *params) override;
>-    gl::Error isResultAvailable(bool *available) override;
>+    angle::Result begin(const gl::Context *context) override;
>+    angle::Result end(const gl::Context *context) override;
>+    angle::Result queryCounter(const gl::Context *context) override;
>+    angle::Result getResult(const gl::Context *context, GLint *params) override;
>+    angle::Result getResult(const gl::Context *context, GLuint *params) override;
>+    angle::Result getResult(const gl::Context *context, GLint64 *params) override;
>+    angle::Result getResult(const gl::Context *context, GLuint64 *params) override;
>+    angle::Result isResultAvailable(const gl::Context *context, bool *available) override;
> 
>   private:
>-    gl::Error testQuery();
>+    angle::Result testQuery(Context9 *context9);
> 
>     template <typename T>
>-    gl::Error getResultBase(T *params);
>+    angle::Result getResultBase(Context9 *context9, T *params);
> 
>+    unsigned int mGetDataAttemptCount;
>     GLuint64 mResult;
>     bool mQueryFinished;
> 
>@@ -43,6 +45,6 @@ class Query9 : public QueryImpl
>     IDirect3DQuery9 *mQuery;
> };
> 
>-}
>+}  // namespace rx
> 
>-#endif // LIBANGLE_RENDERER_D3D_D3D9_QUERY9_H_
>+#endif  // LIBANGLE_RENDERER_D3D_D3D9_QUERY9_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/RenderTarget9.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/RenderTarget9.cpp
>index 3e54c27f437..9104bed617f 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/RenderTarget9.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/RenderTarget9.cpp
>@@ -9,14 +9,15 @@
> 
> #include "libANGLE/renderer/d3d/d3d9/RenderTarget9.h"
> #include "libANGLE/renderer/d3d/d3d9/Renderer9.h"
>-#include "libANGLE/renderer/d3d/d3d9/renderer9_utils.h"
> #include "libANGLE/renderer/d3d/d3d9/SwapChain9.h"
> #include "libANGLE/renderer/d3d/d3d9/formatutils9.h"
>+#include "libANGLE/renderer/d3d/d3d9/renderer9_utils.h"
> 
> namespace rx
> {
> 
>-// TODO: AddRef the incoming surface to take ownership instead of expecting that its ref is being given.
>+// TODO: AddRef the incoming surface to take ownership instead of expecting that its ref is being
>+// given.
> TextureRenderTarget9::TextureRenderTarget9(IDirect3DBaseTexture9 *texture,
>                                            size_t textureLevel,
>                                            IDirect3DSurface9 *surface,
>@@ -104,14 +105,10 @@ D3DFORMAT TextureRenderTarget9::getD3DFormat() const
> }
> 
> SurfaceRenderTarget9::SurfaceRenderTarget9(SwapChain9 *swapChain, bool depth)
>-    : mSwapChain(swapChain),
>-      mDepth(depth)
>-{
>-}
>+    : mSwapChain(swapChain), mDepth(depth)
>+{}
> 
>-SurfaceRenderTarget9::~SurfaceRenderTarget9()
>-{
>-}
>+SurfaceRenderTarget9::~SurfaceRenderTarget9() {}
> 
> GLsizei SurfaceRenderTarget9::getWidth() const
> {
>@@ -160,4 +157,4 @@ D3DFORMAT SurfaceRenderTarget9::getD3DFormat() const
>     return d3d9::GetTextureFormatInfo(getInternalFormat()).texFormat;
> }
> 
>-}
>+}  // namespace rx
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/RenderTarget9.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/RenderTarget9.h
>index bb3b5a4ee49..2b189479abf 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/RenderTarget9.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/RenderTarget9.h
>@@ -20,12 +20,12 @@ class SwapChain9;
> class RenderTarget9 : public RenderTargetD3D
> {
>   public:
>-    RenderTarget9() { }
>+    RenderTarget9() {}
>     ~RenderTarget9() override {}
>     // Retrieve the texture that backs this render target, may be null for swap chain render
>     // targets.
>     virtual IDirect3DBaseTexture9 *getTexture() const = 0;
>-    virtual size_t getTextureLevel() const = 0;
>+    virtual size_t getTextureLevel() const            = 0;
> 
>     virtual IDirect3DSurface9 *getSurface() const = 0;
> 
>@@ -93,6 +93,6 @@ class SurfaceRenderTarget9 : public RenderTarget9
>     bool mDepth;
> };
> 
>-}
>+}  // namespace rx
> 
>-#endif // LIBANGLE_RENDERER_D3D_D3D9_RENDERTARGET9_H_
>+#endif  // LIBANGLE_RENDERER_D3D_D3D9_RENDERTARGET9_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/Renderer9.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/Renderer9.cpp
>index 75c62988680..f4a4ce4375b 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/Renderer9.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/Renderer9.cpp
>@@ -54,18 +54,20 @@
> #include "third_party/trace_event/trace_event.h"
> 
> #if !defined(ANGLE_COMPILE_OPTIMIZATION_LEVEL)
>-#define ANGLE_COMPILE_OPTIMIZATION_LEVEL D3DCOMPILE_OPTIMIZATION_LEVEL3
>+#    define ANGLE_COMPILE_OPTIMIZATION_LEVEL D3DCOMPILE_OPTIMIZATION_LEVEL3
> #endif
> 
> // Enable ANGLE_SUPPORT_SHADER_MODEL_2 if you wish devices with only shader model 2.
> // Such a device would not be conformant.
> #ifndef ANGLE_SUPPORT_SHADER_MODEL_2
>-#define ANGLE_SUPPORT_SHADER_MODEL_2 0
>+#    define ANGLE_SUPPORT_SHADER_MODEL_2 0
> #endif
> 
> namespace rx
> {
> 
>+namespace
>+{
> enum
> {
>     MAX_VERTEX_CONSTANT_VECTORS_D3D9 = 256,
>@@ -77,6 +79,23 @@ enum
>     MAX_TEXTURE_IMAGE_UNITS_VTF_SM3 = 4
> };
> 
>+template <typename T>
>+static void DrawPoints(IDirect3DDevice9 *device, GLsizei count, const void *indices, int minIndex)
>+{
>+    for (int i = 0; i < count; i++)
>+    {
>+        unsigned int indexValue =
>+            static_cast<unsigned int>(static_cast<const T *>(indices)[i]) - minIndex;
>+        device->DrawPrimitive(D3DPT_POINTLIST, indexValue, 1);
>+    }
>+}
>+
>+// A hard limit on buffer size. This works around a problem in the NVIDIA drivers where buffer sizes
>+// close to MAX_UINT would give undefined results. The limit of MAX_UINT/2 should be generous enough
>+// for almost any demanding application.
>+constexpr UINT kMaximumBufferSizeHardLimit = std::numeric_limits<UINT>::max() >> 1;
>+}  // anonymous namespace
>+
> Renderer9::Renderer9(egl::Display *display) : RendererD3D(display), mStateManager(this)
> {
>     mD3d9Module = nullptr;
>@@ -99,7 +118,7 @@ Renderer9::Renderer9(egl::Display *display) : RendererD3D(display), mStateManage
>             mDeviceType = D3DDEVTYPE_HAL;
>             break;
> 
>-        case EGL_PLATFORM_ANGLE_DEVICE_TYPE_REFERENCE_ANGLE:
>+        case EGL_PLATFORM_ANGLE_DEVICE_TYPE_D3D_REFERENCE_ANGLE:
>             mDeviceType = D3DDEVTYPE_REF;
>             break;
> 
>@@ -121,10 +140,10 @@ Renderer9::Renderer9(egl::Display *display) : RendererD3D(display), mStateManage
>     mMaxNullColorbufferLRU = 0;
>     for (int i = 0; i < NUM_NULL_COLORBUFFER_CACHE_ENTRIES; i++)
>     {
>-        mNullColorbufferCache[i].lruCount = 0;
>-        mNullColorbufferCache[i].width    = 0;
>-        mNullColorbufferCache[i].height   = 0;
>-        mNullColorbufferCache[i].buffer   = nullptr;
>+        mNullRenderTargetCache[i].lruCount     = 0;
>+        mNullRenderTargetCache[i].width        = 0;
>+        mNullRenderTargetCache[i].height       = 0;
>+        mNullRenderTargetCache[i].renderTarget = nullptr;
>     }
> 
>     mAppliedVertexShader  = nullptr;
>@@ -132,8 +151,6 @@ Renderer9::Renderer9(egl::Display *display) : RendererD3D(display), mStateManage
>     mAppliedProgramSerial = 0;
> 
>     gl::InitializeDebugAnnotations(&mAnnotator);
>-
>-    mEGLDevice = nullptr;
> }
> 
> Renderer9::~Renderer9()
>@@ -152,15 +169,12 @@ Renderer9::~Renderer9()
> 
> void Renderer9::release()
> {
>-    RendererD3D::cleanup();
>-
>     gl::UninitializeDebugAnnotations();
> 
>     mTranslatedAttribCache.clear();
> 
>     releaseDeviceResources();
> 
>-    SafeDelete(mEGLDevice);
>     SafeRelease(mDevice);
>     SafeRelease(mDeviceEx);
>     SafeRelease(mD3d9);
>@@ -180,7 +194,7 @@ void Renderer9::release()
> egl::Error Renderer9::initialize()
> {
>     TRACE_EVENT0("gpu.angle", "GetModuleHandle_d3d9");
>-    mD3d9Module = GetModuleHandle(TEXT("d3d9.dll"));
>+    mD3d9Module = ::LoadLibrary(TEXT("d3d9.dll"));
> 
>     if (mD3d9Module == nullptr)
>     {
>@@ -364,11 +378,12 @@ egl::Error Renderer9::initializeDevice()
> 
>     const gl::Caps &rendererCaps = getNativeCaps();
> 
>-    mCurVertexSamplerStates.resize(rendererCaps.maxVertexTextureImageUnits);
>-    mCurPixelSamplerStates.resize(rendererCaps.maxTextureImageUnits);
>+    mCurVertexSamplerStates.resize(rendererCaps.maxShaderTextureImageUnits[gl::ShaderType::Vertex]);
>+    mCurPixelSamplerStates.resize(
>+        rendererCaps.maxShaderTextureImageUnits[gl::ShaderType::Fragment]);
> 
>-    mCurVertexTextures.resize(rendererCaps.maxVertexTextureImageUnits);
>-    mCurPixelTextures.resize(rendererCaps.maxTextureImageUnits);
>+    mCurVertexTextures.resize(rendererCaps.maxShaderTextureImageUnits[gl::ShaderType::Vertex]);
>+    mCurPixelTextures.resize(rendererCaps.maxShaderTextureImageUnits[gl::ShaderType::Fragment]);
> 
>     markAllStateDirty();
> 
>@@ -376,16 +391,9 @@ egl::Error Renderer9::initializeDevice()
> 
>     ASSERT(!mBlit);
>     mBlit = new Blit9(this);
>-    ANGLE_TRY(mBlit->initialize());
> 
>     ASSERT(!mVertexDataManager && !mIndexDataManager);
>-    mVertexDataManager = new VertexDataManager(this);
>-    mIndexDataManager  = new IndexDataManager(this);
>-
>-    if (mVertexDataManager->initialize().isError())
>-    {
>-        return egl::EglBadAlloc() << "Error initializing VertexDataManager";
>-    }
>+    mIndexDataManager = new IndexDataManager(this);
> 
>     mTranslatedAttribCache.resize(getNativeCaps().maxVertexAttributes);
> 
>@@ -420,7 +428,9 @@ D3DPRESENT_PARAMETERS Renderer9::getDefaultPresentParameters()
> egl::ConfigSet Renderer9::generateConfigs()
> {
>     static const GLenum colorBufferFormats[] = {
>-        GL_BGR5_A1_ANGLEX, GL_BGRA8_EXT, GL_RGB565,
>+        GL_BGR5_A1_ANGLEX,
>+        GL_BGRA8_EXT,
>+        GL_RGB565,
> 
>     };
> 
>@@ -474,8 +484,9 @@ egl::ConfigSet Renderer9::generateConfigs()
>         GLenum colorBufferInternalFormat = colorBufferFormats[formatIndex];
>         const gl::TextureCaps &colorBufferFormatCaps =
>             rendererTextureCaps.get(colorBufferInternalFormat);
>-        if (colorBufferFormatCaps.renderable)
>+        if (colorBufferFormatCaps.renderbuffer)
>         {
>+            ASSERT(colorBufferFormatCaps.textureAttachment);
>             for (size_t depthStencilIndex = 0;
>                  depthStencilIndex < ArraySize(depthStencilBufferFormats); depthStencilIndex++)
>             {
>@@ -483,9 +494,11 @@ egl::ConfigSet Renderer9::generateConfigs()
>                     depthStencilBufferFormats[depthStencilIndex];
>                 const gl::TextureCaps &depthStencilBufferFormatCaps =
>                     rendererTextureCaps.get(depthStencilBufferInternalFormat);
>-                if (depthStencilBufferFormatCaps.renderable ||
>+                if (depthStencilBufferFormatCaps.renderbuffer ||
>                     depthStencilBufferInternalFormat == GL_NONE)
>                 {
>+                    ASSERT(depthStencilBufferFormatCaps.textureAttachment ||
>+                           depthStencilBufferInternalFormat == GL_NONE);
>                     const gl::InternalFormat &colorBufferFormatInfo =
>                         gl::GetSizedInternalFormatInfo(colorBufferInternalFormat);
>                     const gl::InternalFormat &depthStencilBufferFormatInfo =
>@@ -506,7 +519,7 @@ egl::ConfigSet Renderer9::generateConfigs()
>                     config.bindToTextureRGB   = (colorBufferFormatInfo.format == GL_RGB);
>                     config.bindToTextureRGBA  = (colorBufferFormatInfo.format == GL_RGBA ||
>                                                 colorBufferFormatInfo.format == GL_BGRA_EXT);
>-                    config.colorBufferType = EGL_RGB_BUFFER;
>+                    config.colorBufferType    = EGL_RGB_BUFFER;
>                     // Mark as slow if blits to the back-buffer won't be straight forward
>                     config.configCaveat =
>                         (currentDisplayMode.Format == d3d9ColorBufferFormatInfo.renderFormat)
>@@ -606,98 +619,74 @@ void Renderer9::endScene()
>     }
> }
> 
>-gl::Error Renderer9::flush()
>+angle::Result Renderer9::flush(const gl::Context *context)
> {
>     IDirect3DQuery9 *query = nullptr;
>-    gl::Error error        = allocateEventQuery(&query);
>-    if (error.isError())
>-    {
>-        return error;
>-    }
>+    ANGLE_TRY(allocateEventQuery(context, &query));
>+
>+    Context9 *context9 = GetImplAs<Context9>(context);
> 
>     HRESULT result = query->Issue(D3DISSUE_END);
>-    if (FAILED(result))
>-    {
>-        ASSERT(result == D3DERR_OUTOFVIDEOMEMORY || result == E_OUTOFMEMORY);
>-        return gl::OutOfMemory() << "Failed to issue event query, " << gl::FmtHR(result);
>-    }
>+    ANGLE_TRY_HR(context9, result, "Failed to issue event query");
> 
>     // Grab the query data once
>     result = query->GetData(nullptr, 0, D3DGETDATA_FLUSH);
>     freeEventQuery(query);
>-    if (FAILED(result))
>-    {
>-        if (d3d9::isDeviceLostError(result))
>-        {
>-            notifyDeviceLost();
>-        }
>+    ANGLE_TRY_HR(context9, result, "Failed to get event query data");
> 
>-        return gl::OutOfMemory() << "Failed to get event query data, " << gl::FmtHR(result);
>-    }
>-
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error Renderer9::finish()
>+angle::Result Renderer9::finish(const gl::Context *context)
> {
>     IDirect3DQuery9 *query = nullptr;
>-    gl::Error error        = allocateEventQuery(&query);
>-    if (error.isError())
>-    {
>-        return error;
>-    }
>+    ANGLE_TRY(allocateEventQuery(context, &query));
>+
>+    Context9 *context9 = GetImplAs<Context9>(context);
> 
>     HRESULT result = query->Issue(D3DISSUE_END);
>-    if (FAILED(result))
>-    {
>-        ASSERT(result == D3DERR_OUTOFVIDEOMEMORY || result == E_OUTOFMEMORY);
>-        return gl::OutOfMemory() << "Failed to issue event query, " << gl::FmtHR(result);
>-    }
>+    ANGLE_TRY_HR(context9, result, "Failed to issue event query");
> 
>     // Grab the query data once
>     result = query->GetData(nullptr, 0, D3DGETDATA_FLUSH);
>     if (FAILED(result))
>     {
>-        if (d3d9::isDeviceLostError(result))
>-        {
>-            notifyDeviceLost();
>-        }
>-
>         freeEventQuery(query);
>-        return gl::OutOfMemory() << "Failed to get event query data, " << gl::FmtHR(result);
>     }
>+    ANGLE_TRY_HR(context9, result, "Failed to get event query data");
> 
>     // Loop until the query completes
>+    unsigned int attempt = 0;
>     while (result == S_FALSE)
>     {
>         // Keep polling, but allow other threads to do something useful first
>         ScheduleYield();
> 
>         result = query->GetData(nullptr, 0, D3DGETDATA_FLUSH);
>+        attempt++;
> 
>-        // explicitly check for device loss
>-        // some drivers seem to return S_FALSE even if the device is lost
>-        // instead of D3DERR_DEVICELOST like they should
>-        if (result == S_FALSE && testDeviceLost())
>+        if (result == S_FALSE)
>         {
>-            result = D3DERR_DEVICELOST;
>+            // explicitly check for device loss
>+            // some drivers seem to return S_FALSE even if the device is lost
>+            // instead of D3DERR_DEVICELOST like they should
>+            bool checkDeviceLost = (attempt % kPollingD3DDeviceLostCheckFrequency) == 0;
>+            if (checkDeviceLost && testDeviceLost())
>+            {
>+                result = D3DERR_DEVICELOST;
>+            }
>         }
> 
>         if (FAILED(result))
>         {
>-            if (d3d9::isDeviceLostError(result))
>-            {
>-                notifyDeviceLost();
>-            }
>-
>             freeEventQuery(query);
>-            return gl::OutOfMemory() << "Failed to get event query data, " << gl::FmtHR(result);
>         }
>+        ANGLE_TRY_HR(context9, result, "Failed to get event query data");
>     }
> 
>     freeEventQuery(query);
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
> bool Renderer9::isValidNativeWindow(EGLNativeWindowType window) const
>@@ -728,7 +717,7 @@ egl::Error Renderer9::getD3DTextureInfo(const egl::Config *config,
>                                         IUnknown *d3dTexture,
>                                         EGLint *width,
>                                         EGLint *height,
>-                                        GLenum *fboFormat) const
>+                                        const angle::Format **angleFormat) const
> {
>     IDirect3DTexture9 *texture = nullptr;
>     if (FAILED(d3dTexture->QueryInterface(&texture)))
>@@ -772,11 +761,11 @@ egl::Error Renderer9::getD3DTextureInfo(const egl::Config *config,
>                    << "Unknown client buffer texture format: " << desc.Format;
>     }
> 
>-    if (fboFormat)
>+    if (angleFormat)
>     {
>         const auto &d3dFormatInfo = d3d9::GetD3DFormatInfo(desc.Format);
>-        ASSERT(d3dFormatInfo.info().id != angle::Format::ID::NONE);
>-        *fboFormat = d3dFormatInfo.info().fboImplementationInternalFormat;
>+        ASSERT(d3dFormatInfo.info().id != angle::FormatID::NONE);
>+        *angleFormat = &d3dFormatInfo.info();
>     }
> 
>     return egl::NoError();
>@@ -823,26 +812,22 @@ egl::Error Renderer9::validateShareHandle(const egl::Config *config,
>     return egl::NoError();
> }
> 
>-ContextImpl *Renderer9::createContext(const gl::ContextState &state)
>+ContextImpl *Renderer9::createContext(const gl::State &state, gl::ErrorSet *errorSet)
> {
>-    return new Context9(state, this);
>+    return new Context9(state, errorSet, this);
> }
> 
> void *Renderer9::getD3DDevice()
> {
>-    return reinterpret_cast<void *>(mDevice);
>+    return mDevice;
> }
> 
>-gl::Error Renderer9::allocateEventQuery(IDirect3DQuery9 **outQuery)
>+angle::Result Renderer9::allocateEventQuery(const gl::Context *context, IDirect3DQuery9 **outQuery)
> {
>     if (mEventQueryPool.empty())
>     {
>         HRESULT result = mDevice->CreateQuery(D3DQUERYTYPE_EVENT, outQuery);
>-        if (FAILED(result))
>-        {
>-            ASSERT(result == D3DERR_OUTOFVIDEOMEMORY || result == E_OUTOFMEMORY);
>-            return gl::OutOfMemory() << "Failed to allocate event query, " << gl::FmtHR(result);
>-        }
>+        ANGLE_TRY_HR(GetImplAs<Context9>(context), result, "Failed to allocate event query");
>     }
>     else
>     {
>@@ -850,7 +835,7 @@ gl::Error Renderer9::allocateEventQuery(IDirect3DQuery9 **outQuery)
>         mEventQueryPool.pop_back();
>     }
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
> void Renderer9::freeEventQuery(IDirect3DQuery9 *query)
>@@ -865,24 +850,32 @@ void Renderer9::freeEventQuery(IDirect3DQuery9 *query)
>     }
> }
> 
>-gl::Error Renderer9::createVertexShader(const DWORD *function,
>-                                        size_t length,
>-                                        IDirect3DVertexShader9 **outShader)
>+angle::Result Renderer9::createVertexShader(Context9 *context9,
>+                                            const DWORD *function,
>+                                            size_t length,
>+                                            IDirect3DVertexShader9 **outShader)
> {
>-    return mVertexShaderCache.create(function, length, outShader);
>+    return mVertexShaderCache.create(context9, function, length, outShader);
> }
> 
>-gl::Error Renderer9::createPixelShader(const DWORD *function,
>-                                       size_t length,
>-                                       IDirect3DPixelShader9 **outShader)
>+angle::Result Renderer9::createPixelShader(Context9 *context9,
>+                                           const DWORD *function,
>+                                           size_t length,
>+                                           IDirect3DPixelShader9 **outShader)
> {
>-    return mPixelShaderCache.create(function, length, outShader);
>+    return mPixelShaderCache.create(context9, function, length, outShader);
> }
> 
> HRESULT Renderer9::createVertexBuffer(UINT Length,
>                                       DWORD Usage,
>                                       IDirect3DVertexBuffer9 **ppVertexBuffer)
> {
>+    // Force buffers to be limited to a fixed max size.
>+    if (Length > kMaximumBufferSizeHardLimit)
>+    {
>+        return E_OUTOFMEMORY;
>+    }
>+
>     D3DPOOL Pool = getBufferPool(Usage);
>     return mDevice->CreateVertexBuffer(Length, Usage, 0, Pool, ppVertexBuffer, nullptr);
> }
>@@ -897,6 +890,12 @@ HRESULT Renderer9::createIndexBuffer(UINT Length,
>                                      D3DFORMAT Format,
>                                      IDirect3DIndexBuffer9 **ppIndexBuffer)
> {
>+    // Force buffers to be limited to a fixed max size.
>+    if (Length > kMaximumBufferSizeHardLimit)
>+    {
>+        return E_OUTOFMEMORY;
>+    }
>+
>     D3DPOOL Pool = getBufferPool(Usage);
>     return mDevice->CreateIndexBuffer(Length, Usage, Format, Pool, ppIndexBuffer, nullptr);
> }
>@@ -906,7 +905,7 @@ IndexBuffer *Renderer9::createIndexBuffer()
>     return new IndexBuffer9(this);
> }
> 
>-StreamProducerImpl *Renderer9::createStreamProducerD3DTextureNV12(
>+StreamProducerImpl *Renderer9::createStreamProducerD3DTexture(
>     egl::Stream::ConsumerType consumerType,
>     const egl::AttributeMap &attribs)
> {
>@@ -921,27 +920,28 @@ bool Renderer9::supportsFastCopyBufferToTexture(GLenum internalFormat) const
>     return false;
> }
> 
>-gl::Error Renderer9::fastCopyBufferToTexture(const gl::Context *context,
>-                                             const gl::PixelUnpackState &unpack,
>-                                             unsigned int offset,
>-                                             RenderTargetD3D *destRenderTarget,
>-                                             GLenum destinationFormat,
>-                                             GLenum sourcePixelsType,
>-                                             const gl::Box &destArea)
>+angle::Result Renderer9::fastCopyBufferToTexture(const gl::Context *context,
>+                                                 const gl::PixelUnpackState &unpack,
>+                                                 unsigned int offset,
>+                                                 RenderTargetD3D *destRenderTarget,
>+                                                 GLenum destinationFormat,
>+                                                 GLenum sourcePixelsType,
>+                                                 const gl::Box &destArea)
> {
>     // Pixel buffer objects are not supported in D3D9, since D3D9 is ES2-only and PBOs are ES3.
>-    UNREACHABLE();
>-    return gl::InternalError();
>+    ANGLE_HR_UNREACHABLE(GetImplAs<Context9>(context));
>+    return angle::Result::Stop;
> }
> 
>-gl::Error Renderer9::setSamplerState(const gl::Context *context,
>-                                     gl::SamplerType type,
>-                                     int index,
>-                                     gl::Texture *texture,
>-                                     const gl::SamplerState &samplerState)
>+angle::Result Renderer9::setSamplerState(const gl::Context *context,
>+                                         gl::ShaderType type,
>+                                         int index,
>+                                         gl::Texture *texture,
>+                                         const gl::SamplerState &samplerState)
> {
>-    CurSamplerState &appliedSampler = (type == gl::SAMPLER_PIXEL) ? mCurPixelSamplerStates[index]
>-                                                                  : mCurVertexSamplerStates[index];
>+    CurSamplerState &appliedSampler = (type == gl::ShaderType::Fragment)
>+                                          ? mCurPixelSamplerStates[index]
>+                                          : mCurVertexSamplerStates[index];
> 
>     // Make sure to add the level offset for our tiny compressed texture workaround
>     TextureD3D *textureD3D = GetImplAs<TextureD3D>(texture);
>@@ -957,53 +957,57 @@ gl::Error Renderer9::setSamplerState(const gl::Context *context,
>     if (appliedSampler.forceSet || appliedSampler.baseLevel != baseLevel ||
>         memcmp(&samplerState, &appliedSampler, sizeof(gl::SamplerState)) != 0)
>     {
>-        int d3dSamplerOffset = (type == gl::SAMPLER_PIXEL) ? 0 : D3DVERTEXTEXTURESAMPLER0;
>+        int d3dSamplerOffset = (type == gl::ShaderType::Fragment) ? 0 : D3DVERTEXTEXTURESAMPLER0;
>         int d3dSampler       = index + d3dSamplerOffset;
> 
>         mDevice->SetSamplerState(d3dSampler, D3DSAMP_ADDRESSU,
>-                                 gl_d3d9::ConvertTextureWrap(samplerState.wrapS));
>+                                 gl_d3d9::ConvertTextureWrap(samplerState.getWrapS()));
>         mDevice->SetSamplerState(d3dSampler, D3DSAMP_ADDRESSV,
>-                                 gl_d3d9::ConvertTextureWrap(samplerState.wrapT));
>+                                 gl_d3d9::ConvertTextureWrap(samplerState.getWrapT()));
> 
>-        mDevice->SetSamplerState(
>-            d3dSampler, D3DSAMP_MAGFILTER,
>-            gl_d3d9::ConvertMagFilter(samplerState.magFilter, samplerState.maxAnisotropy));
>+        mDevice->SetSamplerState(d3dSampler, D3DSAMP_MAGFILTER,
>+                                 gl_d3d9::ConvertMagFilter(samplerState.getMagFilter(),
>+                                                           samplerState.getMaxAnisotropy()));
> 
>         D3DTEXTUREFILTERTYPE d3dMinFilter, d3dMipFilter;
>         float lodBias;
>-        gl_d3d9::ConvertMinFilter(samplerState.minFilter, &d3dMinFilter, &d3dMipFilter, &lodBias,
>-                                  samplerState.maxAnisotropy, baseLevel);
>+        gl_d3d9::ConvertMinFilter(samplerState.getMinFilter(), &d3dMinFilter, &d3dMipFilter,
>+                                  &lodBias, samplerState.getMaxAnisotropy(), baseLevel);
>         mDevice->SetSamplerState(d3dSampler, D3DSAMP_MINFILTER, d3dMinFilter);
>         mDevice->SetSamplerState(d3dSampler, D3DSAMP_MIPFILTER, d3dMipFilter);
>         mDevice->SetSamplerState(d3dSampler, D3DSAMP_MAXMIPLEVEL, baseLevel);
>         mDevice->SetSamplerState(d3dSampler, D3DSAMP_MIPMAPLODBIAS, static_cast<DWORD>(lodBias));
>         if (getNativeExtensions().textureFilterAnisotropic)
>         {
>-            DWORD maxAnisotropy =
>-                std::min(mDeviceCaps.MaxAnisotropy, static_cast<DWORD>(samplerState.maxAnisotropy));
>+            DWORD maxAnisotropy = std::min(mDeviceCaps.MaxAnisotropy,
>+                                           static_cast<DWORD>(samplerState.getMaxAnisotropy()));
>             mDevice->SetSamplerState(d3dSampler, D3DSAMP_MAXANISOTROPY, maxAnisotropy);
>         }
>+
>+        ASSERT(texture->getBorderColor().type == angle::ColorGeneric::Type::Float);
>+        mDevice->SetSamplerState(d3dSampler, D3DSAMP_BORDERCOLOR,
>+                                 gl_d3d9::ConvertColor(texture->getBorderColor().colorF));
>     }
> 
>     appliedSampler.forceSet     = false;
>     appliedSampler.samplerState = samplerState;
>     appliedSampler.baseLevel    = baseLevel;
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error Renderer9::setTexture(const gl::Context *context,
>-                                gl::SamplerType type,
>-                                int index,
>-                                gl::Texture *texture)
>+angle::Result Renderer9::setTexture(const gl::Context *context,
>+                                    gl::ShaderType type,
>+                                    int index,
>+                                    gl::Texture *texture)
> {
>-    int d3dSamplerOffset              = (type == gl::SAMPLER_PIXEL) ? 0 : D3DVERTEXTEXTURESAMPLER0;
>-    int d3dSampler                    = index + d3dSamplerOffset;
>+    int d3dSamplerOffset = (type == gl::ShaderType::Fragment) ? 0 : D3DVERTEXTEXTURESAMPLER0;
>+    int d3dSampler       = index + d3dSamplerOffset;
>     IDirect3DBaseTexture9 *d3dTexture = nullptr;
>     bool forceSetTexture              = false;
> 
>     std::vector<uintptr_t> &appliedTextures =
>-        (type == gl::SAMPLER_PIXEL) ? mCurPixelTextures : mCurVertexTextures;
>+        (type == gl::ShaderType::Fragment) ? mCurPixelTextures : mCurVertexTextures;
> 
>     if (texture)
>     {
>@@ -1033,19 +1037,22 @@ gl::Error Renderer9::setTexture(const gl::Context *context,
> 
>     appliedTextures[index] = reinterpret_cast<uintptr_t>(d3dTexture);
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error Renderer9::updateState(const gl::Context *context, GLenum drawMode)
>+angle::Result Renderer9::updateState(const gl::Context *context, gl::PrimitiveMode drawMode)
> {
>-    const auto &glState = context->getGLState();
>+    const auto &glState = context->getState();
> 
>     // Applies the render target surface, depth stencil surface, viewport rectangle and
>     // scissor rectangle to the renderer
>     gl::Framebuffer *framebuffer = glState.getDrawFramebuffer();
>-    ASSERT(framebuffer && !framebuffer->hasAnyDirtyBit() && framebuffer->cachedComplete());
>+    ASSERT(framebuffer && !framebuffer->hasAnyDirtyBit());
> 
>-    ANGLE_TRY(applyRenderTarget(context, framebuffer));
>+    Framebuffer9 *framebuffer9 = GetImplAs<Framebuffer9>(framebuffer);
>+
>+    ANGLE_TRY(applyRenderTarget(context, framebuffer9->getCachedColorRenderTargets()[0],
>+                                framebuffer9->getCachedDepthStencilRenderTarget()));
> 
>     // Setting viewport state
>     setViewport(glState.getViewport(), glState.getNearPlane(), glState.getFarPlane(), drawMode,
>@@ -1058,7 +1065,7 @@ gl::Error Renderer9::updateState(const gl::Context *context, GLenum drawMode)
>     // Since framebuffer->getSamples will return the original samples which may be different with
>     // the sample counts that we set in render target view, here we use renderTarget->getSamples to
>     // get the actual samples.
>-    GLsizei samples           = 0;
>+    GLsizei samples                                       = 0;
>     const gl::FramebufferAttachment *firstColorAttachment = framebuffer->getFirstColorbuffer();
>     if (firstColorAttachment)
>     {
>@@ -1068,15 +1075,14 @@ gl::Error Renderer9::updateState(const gl::Context *context, GLenum drawMode)
>         samples = renderTarget->getSamples();
>     }
>     gl::RasterizerState rasterizer = glState.getRasterizerState();
>-    rasterizer.pointDrawMode       = (drawMode == GL_POINTS);
>+    rasterizer.pointDrawMode       = (drawMode == gl::PrimitiveMode::Points);
>     rasterizer.multiSample         = (samples != 0);
> 
>-    unsigned int mask = GetBlendSampleMask(glState, samples);
>-    ANGLE_TRY(setBlendDepthRasterStates(context, mask));
>+    ANGLE_TRY(setBlendDepthRasterStates(context, drawMode));
> 
>     mStateManager.resetDirtyBits();
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
> void Renderer9::setScissorRectangle(const gl::Rectangle &scissor, bool enabled)
>@@ -1084,15 +1090,16 @@ void Renderer9::setScissorRectangle(const gl::Rectangle &scissor, bool enabled)
>     mStateManager.setScissorState(scissor, enabled);
> }
> 
>-gl::Error Renderer9::setBlendDepthRasterStates(const gl::Context *context, GLenum drawMode)
>+angle::Result Renderer9::setBlendDepthRasterStates(const gl::Context *context,
>+                                                   gl::PrimitiveMode drawMode)
> {
>-    const auto &glState  = context->getGLState();
>+    const auto &glState              = context->getState();
>     gl::Framebuffer *drawFramebuffer = glState.getDrawFramebuffer();
>     ASSERT(!drawFramebuffer->hasAnyDirtyBit());
>     // Since framebuffer->getSamples will return the original samples which may be different with
>     // the sample counts that we set in render target view, here we use renderTarget->getSamples to
>     // get the actual samples.
>-    GLsizei samples           = 0;
>+    GLsizei samples                                       = 0;
>     const gl::FramebufferAttachment *firstColorAttachment = drawFramebuffer->getFirstColorbuffer();
>     if (firstColorAttachment)
>     {
>@@ -1102,53 +1109,54 @@ gl::Error Renderer9::setBlendDepthRasterStates(const gl::Context *context, GLenu
>         samples = renderTarget->getSamples();
>     }
>     gl::RasterizerState rasterizer = glState.getRasterizerState();
>-    rasterizer.pointDrawMode       = (drawMode == GL_POINTS);
>+    rasterizer.pointDrawMode       = (drawMode == gl::PrimitiveMode::Points);
>     rasterizer.multiSample         = (samples != 0);
> 
>     unsigned int mask = GetBlendSampleMask(glState, samples);
>-    return mStateManager.setBlendDepthRasterStates(glState, mask);
>+    mStateManager.setBlendDepthRasterStates(glState, mask);
>+    return angle::Result::Continue;
> }
> 
> void Renderer9::setViewport(const gl::Rectangle &viewport,
>                             float zNear,
>                             float zFar,
>-                            GLenum drawMode,
>+                            gl::PrimitiveMode drawMode,
>                             GLenum frontFace,
>                             bool ignoreViewport)
> {
>     mStateManager.setViewportState(viewport, zNear, zFar, drawMode, frontFace, ignoreViewport);
> }
> 
>-bool Renderer9::applyPrimitiveType(GLenum mode, GLsizei count, bool usesPointSize)
>+bool Renderer9::applyPrimitiveType(gl::PrimitiveMode mode, GLsizei count, bool usesPointSize)
> {
>     switch (mode)
>     {
>-        case GL_POINTS:
>+        case gl::PrimitiveMode::Points:
>             mPrimitiveType  = D3DPT_POINTLIST;
>             mPrimitiveCount = count;
>             break;
>-        case GL_LINES:
>+        case gl::PrimitiveMode::Lines:
>             mPrimitiveType  = D3DPT_LINELIST;
>             mPrimitiveCount = count / 2;
>             break;
>-        case GL_LINE_LOOP:
>+        case gl::PrimitiveMode::LineLoop:
>             mPrimitiveType = D3DPT_LINESTRIP;
>             mPrimitiveCount =
>                 count - 1;  // D3D doesn't support line loops, so we draw the last line separately
>             break;
>-        case GL_LINE_STRIP:
>+        case gl::PrimitiveMode::LineStrip:
>             mPrimitiveType  = D3DPT_LINESTRIP;
>             mPrimitiveCount = count - 1;
>             break;
>-        case GL_TRIANGLES:
>+        case gl::PrimitiveMode::Triangles:
>             mPrimitiveType  = D3DPT_TRIANGLELIST;
>             mPrimitiveCount = count / 3;
>             break;
>-        case GL_TRIANGLE_STRIP:
>+        case gl::PrimitiveMode::TriangleStrip:
>             mPrimitiveType  = D3DPT_TRIANGLESTRIP;
>             mPrimitiveCount = count - 2;
>             break;
>-        case GL_TRIANGLE_FAN:
>+        case gl::PrimitiveMode::TriangleFan:
>             mPrimitiveType  = D3DPT_TRIANGLEFAN;
>             mPrimitiveCount = count - 2;
>             break;
>@@ -1160,109 +1168,89 @@ bool Renderer9::applyPrimitiveType(GLenum mode, GLsizei count, bool usesPointSiz
>     return mPrimitiveCount > 0;
> }
> 
>-gl::Error Renderer9::getNullColorbuffer(const gl::Context *context,
>-                                        const gl::FramebufferAttachment *depthbuffer,
>-                                        const gl::FramebufferAttachment **outColorBuffer)
>+angle::Result Renderer9::getNullColorRenderTarget(const gl::Context *context,
>+                                                  const RenderTarget9 *depthRenderTarget,
>+                                                  const RenderTarget9 **outColorRenderTarget)
> {
>-    ASSERT(depthbuffer);
>+    ASSERT(depthRenderTarget);
> 
>-    const gl::Extents &size = depthbuffer->getSize();
>+    const gl::Extents &size = depthRenderTarget->getExtents();
> 
>     // search cached nullcolorbuffers
>     for (int i = 0; i < NUM_NULL_COLORBUFFER_CACHE_ENTRIES; i++)
>     {
>-        if (mNullColorbufferCache[i].buffer != nullptr &&
>-            mNullColorbufferCache[i].width == size.width &&
>-            mNullColorbufferCache[i].height == size.height)
>+        if (mNullRenderTargetCache[i].renderTarget != nullptr &&
>+            mNullRenderTargetCache[i].width == size.width &&
>+            mNullRenderTargetCache[i].height == size.height)
>         {
>-            mNullColorbufferCache[i].lruCount = ++mMaxNullColorbufferLRU;
>-            *outColorBuffer                   = mNullColorbufferCache[i].buffer;
>-            return gl::NoError();
>+            mNullRenderTargetCache[i].lruCount = ++mMaxNullColorbufferLRU;
>+            *outColorRenderTarget              = mNullRenderTargetCache[i].renderTarget;
>+            return angle::Result::Continue;
>         }
>     }
> 
>-    auto *implFactory = context->getImplementation();
>-
>-    gl::Renderbuffer *nullRenderbuffer = new gl::Renderbuffer(implFactory->createRenderbuffer(), 0);
>-    gl::Error error = nullRenderbuffer->setStorage(context, GL_NONE, size.width, size.height);
>-    if (error.isError())
>-    {
>-        SafeDelete(nullRenderbuffer);
>-        return error;
>-    }
>-
>-    gl::FramebufferAttachment *nullbuffer = new gl::FramebufferAttachment(
>-        context, GL_RENDERBUFFER, GL_NONE, gl::ImageIndex::MakeInvalid(), nullRenderbuffer);
>+    RenderTargetD3D *nullRenderTarget = nullptr;
>+    ANGLE_TRY(createRenderTarget(context, size.width, size.height, GL_NONE, 0, &nullRenderTarget));
> 
>     // add nullbuffer to the cache
>-    NullColorbufferCacheEntry *oldest = &mNullColorbufferCache[0];
>+    NullRenderTargetCacheEntry *oldest = &mNullRenderTargetCache[0];
>     for (int i = 1; i < NUM_NULL_COLORBUFFER_CACHE_ENTRIES; i++)
>     {
>-        if (mNullColorbufferCache[i].lruCount < oldest->lruCount)
>+        if (mNullRenderTargetCache[i].lruCount < oldest->lruCount)
>         {
>-            oldest = &mNullColorbufferCache[i];
>+            oldest = &mNullRenderTargetCache[i];
>         }
>     }
> 
>-    delete oldest->buffer;
>-    oldest->buffer   = nullbuffer;
>-    oldest->lruCount = ++mMaxNullColorbufferLRU;
>-    oldest->width    = size.width;
>-    oldest->height   = size.height;
>+    SafeDelete(oldest->renderTarget);
>+    oldest->renderTarget = GetAs<RenderTarget9>(nullRenderTarget);
>+    oldest->lruCount     = ++mMaxNullColorbufferLRU;
>+    oldest->width        = size.width;
>+    oldest->height       = size.height;
> 
>-    *outColorBuffer = nullbuffer;
>-    return gl::NoError();
>+    *outColorRenderTarget = oldest->renderTarget;
>+    return angle::Result::Continue;
> }
> 
>-gl::Error Renderer9::applyRenderTarget(const gl::Context *context,
>-                                       const gl::FramebufferAttachment *colorAttachment,
>-                                       const gl::FramebufferAttachment *depthStencilAttachment)
>+angle::Result Renderer9::applyRenderTarget(const gl::Context *context,
>+                                           const RenderTarget9 *colorRenderTargetIn,
>+                                           const RenderTarget9 *depthStencilRenderTarget)
> {
>-    const gl::FramebufferAttachment *renderAttachment = colorAttachment;
>-
>     // if there is no color attachment we must synthesize a NULL colorattachment
>     // to keep the D3D runtime happy.  This should only be possible if depth texturing.
>-    if (renderAttachment == nullptr)
>+    const RenderTarget9 *colorRenderTarget = colorRenderTargetIn;
>+    if (colorRenderTarget == nullptr)
>     {
>-        ANGLE_TRY(getNullColorbuffer(context, depthStencilAttachment, &renderAttachment));
>+        ANGLE_TRY(getNullColorRenderTarget(context, depthStencilRenderTarget, &colorRenderTarget));
>     }
>-    ASSERT(renderAttachment != nullptr);
>+    ASSERT(colorRenderTarget != nullptr);
> 
>     size_t renderTargetWidth     = 0;
>     size_t renderTargetHeight    = 0;
>     D3DFORMAT renderTargetFormat = D3DFMT_UNKNOWN;
> 
>-    RenderTarget9 *renderTarget = nullptr;
>-    ANGLE_TRY(renderAttachment->getRenderTarget(context, &renderTarget));
>-    ASSERT(renderTarget);
>-
>     bool renderTargetChanged        = false;
>-    unsigned int renderTargetSerial = renderTarget->getSerial();
>+    unsigned int renderTargetSerial = colorRenderTarget->getSerial();
>     if (renderTargetSerial != mAppliedRenderTargetSerial)
>     {
>         // Apply the render target on the device
>-        IDirect3DSurface9 *renderTargetSurface = renderTarget->getSurface();
>+        IDirect3DSurface9 *renderTargetSurface = colorRenderTarget->getSurface();
>         ASSERT(renderTargetSurface);
> 
>         mDevice->SetRenderTarget(0, renderTargetSurface);
>         SafeRelease(renderTargetSurface);
> 
>-        renderTargetWidth  = renderTarget->getWidth();
>-        renderTargetHeight = renderTarget->getHeight();
>-        renderTargetFormat = renderTarget->getD3DFormat();
>+        renderTargetWidth  = colorRenderTarget->getWidth();
>+        renderTargetHeight = colorRenderTarget->getHeight();
>+        renderTargetFormat = colorRenderTarget->getD3DFormat();
> 
>         mAppliedRenderTargetSerial = renderTargetSerial;
>         renderTargetChanged        = true;
>     }
> 
>-    RenderTarget9 *depthStencilRenderTarget = nullptr;
>-    unsigned int depthStencilSerial         = 0;
>-
>-    if (depthStencilAttachment != nullptr)
>+    unsigned int depthStencilSerial = 0;
>+    if (depthStencilRenderTarget != nullptr)
>     {
>-        ANGLE_TRY(depthStencilAttachment->getRenderTarget(context, &depthStencilRenderTarget));
>-        ASSERT(depthStencilRenderTarget);
>-
>         depthStencilSerial = depthStencilRenderTarget->getSerial();
>     }
> 
>@@ -1280,8 +1268,11 @@ gl::Error Renderer9::applyRenderTarget(const gl::Context *context,
>             mDevice->SetDepthStencilSurface(depthStencilSurface);
>             SafeRelease(depthStencilSurface);
> 
>-            depthSize   = depthStencilAttachment->getDepthSize();
>-            stencilSize = depthStencilAttachment->getStencilSize();
>+            const gl::InternalFormat &format =
>+                gl::GetSizedInternalFormatInfo(depthStencilRenderTarget->getInternalFormat());
>+
>+            depthSize   = format.depthBits;
>+            stencilSize = format.stencilBits;
>         }
>         else
>         {
>@@ -1303,48 +1294,38 @@ gl::Error Renderer9::applyRenderTarget(const gl::Context *context,
>         mRenderTargetDescInitialized = true;
>     }
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error Renderer9::applyRenderTarget(const gl::Context *context,
>-                                       const gl::Framebuffer *framebuffer)
>+angle::Result Renderer9::applyVertexBuffer(const gl::Context *context,
>+                                           gl::PrimitiveMode mode,
>+                                           GLint first,
>+                                           GLsizei count,
>+                                           GLsizei instances,
>+                                           TranslatedIndexData * /*indexInfo*/)
> {
>-    return applyRenderTarget(context, framebuffer->getColorbuffer(0),
>-                             framebuffer->getDepthOrStencilbuffer());
>-}
>+    const gl::State &state = context->getState();
>+    ANGLE_TRY(mVertexDataManager->prepareVertexData(context, first, count, &mTranslatedAttribCache,
>+                                                    instances));
> 
>-gl::Error Renderer9::applyVertexBuffer(const gl::Context *context,
>-                                       GLenum mode,
>-                                       GLint first,
>-                                       GLsizei count,
>-                                       GLsizei instances,
>-                                       TranslatedIndexData * /*indexInfo*/)
>-{
>-    const gl::State &state = context->getGLState();
>-    gl::Error error        = mVertexDataManager->prepareVertexData(context, first, count,
>-                                                            &mTranslatedAttribCache, instances);
>-    if (error.isError())
>-    {
>-        return error;
>-    }
>-
>-    return mVertexDeclarationCache.applyDeclaration(
>-        mDevice, mTranslatedAttribCache, state.getProgram(), first, instances, &mRepeatDraw);
>+    return mVertexDeclarationCache.applyDeclaration(context, mDevice, mTranslatedAttribCache,
>+                                                    state.getProgram(), first, instances,
>+                                                    &mRepeatDraw);
> }
> 
> // Applies the indices and element array bindings to the Direct3D 9 device
>-gl::Error Renderer9::applyIndexBuffer(const gl::Context *context,
>-                                      const void *indices,
>-                                      GLsizei count,
>-                                      GLenum mode,
>-                                      GLenum type,
>-                                      TranslatedIndexData *indexInfo)
>+angle::Result Renderer9::applyIndexBuffer(const gl::Context *context,
>+                                          const void *indices,
>+                                          GLsizei count,
>+                                          gl::PrimitiveMode mode,
>+                                          gl::DrawElementsType type,
>+                                          TranslatedIndexData *indexInfo)
> {
>-    gl::VertexArray *vao           = context->getGLState().getVertexArray();
>-    gl::Buffer *elementArrayBuffer = vao->getElementArrayBuffer().get();
>-    const auto &lazyIndexRange     = context->getParams<gl::HasIndexRange>();
>+    gl::VertexArray *vao           = context->getState().getVertexArray();
>+    gl::Buffer *elementArrayBuffer = vao->getElementArrayBuffer();
> 
>-    GLenum dstType = GetIndexTranslationDestType(type, lazyIndexRange, false);
>+    gl::DrawElementsType dstType = gl::DrawElementsType::InvalidEnum;
>+    ANGLE_TRY(GetIndexTranslationDestType(context, count, type, indices, false, &dstType));
> 
>     ANGLE_TRY(mIndexDataManager->prepareIndexData(context, type, dstType, count, elementArrayBuffer,
>                                                   indices, indexInfo));
>@@ -1360,31 +1341,28 @@ gl::Error Renderer9::applyIndexBuffer(const gl::Context *context,
>         mAppliedIBSerial = indexInfo->serial;
>     }
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error Renderer9::drawArraysImpl(const gl::Context *context,
>-                                    GLenum mode,
>-                                    GLint startVertex,
>-                                    GLsizei count,
>-                                    GLsizei instances)
>+angle::Result Renderer9::drawArraysImpl(const gl::Context *context,
>+                                        gl::PrimitiveMode mode,
>+                                        GLint startVertex,
>+                                        GLsizei count,
>+                                        GLsizei instances)
> {
>-    ASSERT(!context->getGLState().isTransformFeedbackActiveUnpaused());
>+    ASSERT(!context->getState().isTransformFeedbackActiveUnpaused());
> 
>     startScene();
> 
>-    if (mode == GL_LINE_LOOP)
>+    if (mode == gl::PrimitiveMode::LineLoop)
>     {
>-        return drawLineLoop(context, count, GL_NONE, nullptr, 0, nullptr);
>+        return drawLineLoop(context, count, gl::DrawElementsType::InvalidEnum, nullptr, 0, nullptr);
>     }
>-    else if (instances > 0)
>+
>+    if (instances > 0)
>     {
>         StaticIndexBufferInterface *countingIB = nullptr;
>-        gl::Error error                        = getCountingIB(count, &countingIB);
>-        if (error.isError())
>-        {
>-            return error;
>-        }
>+        ANGLE_TRY(getCountingIB(context, count, &countingIB));
> 
>         if (mAppliedIBSerial != countingIB->getSerial())
>         {
>@@ -1399,29 +1377,30 @@ gl::Error Renderer9::drawArraysImpl(const gl::Context *context,
>             mDevice->DrawIndexedPrimitive(mPrimitiveType, 0, 0, count, 0, mPrimitiveCount);
>         }
> 
>-        return gl::NoError();
>-    }
>-    else  // Regular case
>-    {
>-        mDevice->DrawPrimitive(mPrimitiveType, 0, mPrimitiveCount);
>-        return gl::NoError();
>+        return angle::Result::Continue;
>     }
>+
>+    // Regular case
>+    mDevice->DrawPrimitive(mPrimitiveType, 0, mPrimitiveCount);
>+    return angle::Result::Continue;
> }
> 
>-gl::Error Renderer9::drawElementsImpl(const gl::Context *context,
>-                                      GLenum mode,
>-                                      GLsizei count,
>-                                      GLenum type,
>-                                      const void *indices,
>-                                      GLsizei instances)
>+angle::Result Renderer9::drawElementsImpl(const gl::Context *context,
>+                                          gl::PrimitiveMode mode,
>+                                          GLsizei count,
>+                                          gl::DrawElementsType type,
>+                                          const void *indices,
>+                                          GLsizei instances)
> {
>     TranslatedIndexData indexInfo;
> 
>     ANGLE_TRY(applyIndexBuffer(context, indices, count, mode, type, &indexInfo));
> 
>-    const auto &lazyIndexRange       = context->getParams<gl::HasIndexRange>();
>-    const gl::IndexRange &indexRange = lazyIndexRange.getIndexRange().value();
>-    size_t vertexCount               = indexRange.vertexCount();
>+    gl::IndexRange indexRange;
>+    ANGLE_TRY(context->getState().getVertexArray()->getIndexRange(context, type, count, indices,
>+                                                                  &indexRange));
>+
>+    size_t vertexCount = indexRange.vertexCount();
>     ANGLE_TRY(applyVertexBuffer(context, mode, static_cast<GLsizei>(indexRange.start),
>                                 static_cast<GLsizei>(vertexCount), instances, &indexInfo));
> 
>@@ -1429,119 +1408,103 @@ gl::Error Renderer9::drawElementsImpl(const gl::Context *context,
> 
>     int minIndex = static_cast<int>(indexRange.start);
> 
>-    gl::VertexArray *vao           = context->getGLState().getVertexArray();
>-    gl::Buffer *elementArrayBuffer = vao->getElementArrayBuffer().get();
>+    gl::VertexArray *vao           = context->getState().getVertexArray();
>+    gl::Buffer *elementArrayBuffer = vao->getElementArrayBuffer();
> 
>-    if (mode == GL_POINTS)
>+    if (mode == gl::PrimitiveMode::Points)
>     {
>         return drawIndexedPoints(context, count, type, indices, minIndex, elementArrayBuffer);
>     }
>-    else if (mode == GL_LINE_LOOP)
>+
>+    if (mode == gl::PrimitiveMode::LineLoop)
>     {
>         return drawLineLoop(context, count, type, indices, minIndex, elementArrayBuffer);
>     }
>-    else
>+
>+    for (int i = 0; i < mRepeatDraw; i++)
>     {
>-        for (int i = 0; i < mRepeatDraw; i++)
>-        {
>-            mDevice->DrawIndexedPrimitive(mPrimitiveType, -minIndex, minIndex,
>-                                          static_cast<UINT>(vertexCount), indexInfo.startIndex,
>-                                          mPrimitiveCount);
>-        }
>-        return gl::NoError();
>+        mDevice->DrawIndexedPrimitive(mPrimitiveType, -minIndex, minIndex,
>+                                      static_cast<UINT>(vertexCount), indexInfo.startIndex,
>+                                      mPrimitiveCount);
>     }
>+    return angle::Result::Continue;
> }
> 
>-gl::Error Renderer9::drawLineLoop(const gl::Context *context,
>-                                  GLsizei count,
>-                                  GLenum type,
>-                                  const void *indices,
>-                                  int minIndex,
>-                                  gl::Buffer *elementArrayBuffer)
>+angle::Result Renderer9::drawLineLoop(const gl::Context *context,
>+                                      GLsizei count,
>+                                      gl::DrawElementsType type,
>+                                      const void *indices,
>+                                      int minIndex,
>+                                      gl::Buffer *elementArrayBuffer)
> {
>     // Get the raw indices for an indexed draw
>-    if (type != GL_NONE && elementArrayBuffer)
>+    if (type != gl::DrawElementsType::InvalidEnum && elementArrayBuffer)
>     {
>         BufferD3D *storage        = GetImplAs<BufferD3D>(elementArrayBuffer);
>         intptr_t offset           = reinterpret_cast<intptr_t>(indices);
>         const uint8_t *bufferData = nullptr;
>-        gl::Error error           = storage->getData(context, &bufferData);
>-        if (error.isError())
>-        {
>-            return error;
>-        }
>+        ANGLE_TRY(storage->getData(context, &bufferData));
>         indices = bufferData + offset;
>     }
> 
>     unsigned int startIndex = 0;
>+    Context9 *context9      = GetImplAs<Context9>(context);
> 
>     if (getNativeExtensions().elementIndexUint)
>     {
>         if (!mLineLoopIB)
>         {
>             mLineLoopIB = new StreamingIndexBufferInterface(this);
>-            gl::Error error =
>-                mLineLoopIB->reserveBufferSpace(INITIAL_INDEX_BUFFER_SIZE, GL_UNSIGNED_INT);
>-            if (error.isError())
>-            {
>-                SafeDelete(mLineLoopIB);
>-                return error;
>-            }
>+            ANGLE_TRY(mLineLoopIB->reserveBufferSpace(context, INITIAL_INDEX_BUFFER_SIZE,
>+                                                      gl::DrawElementsType::UnsignedInt));
>         }
> 
>         // Checked by Renderer9::applyPrimitiveType
>         ASSERT(count >= 0);
> 
>-        if (static_cast<unsigned int>(count) + 1 >
>-            (std::numeric_limits<unsigned int>::max() / sizeof(unsigned int)))
>-        {
>-            return gl::OutOfMemory() << "Failed to create a 32-bit looping index buffer for "
>-                                        "GL_LINE_LOOP, too many indices required.";
>-        }
>+        ANGLE_CHECK(context9,
>+                    static_cast<unsigned int>(count) + 1 <=
>+                        (std::numeric_limits<unsigned int>::max() / sizeof(unsigned int)),
>+                    "Failed to create a 32-bit looping index buffer for "
>+                    "GL_LINE_LOOP, too many indices required.",
>+                    GL_OUT_OF_MEMORY);
> 
>         const unsigned int spaceNeeded =
>             (static_cast<unsigned int>(count) + 1) * sizeof(unsigned int);
>-        gl::Error error = mLineLoopIB->reserveBufferSpace(spaceNeeded, GL_UNSIGNED_INT);
>-        if (error.isError())
>-        {
>-            return error;
>-        }
>+        ANGLE_TRY(mLineLoopIB->reserveBufferSpace(context, spaceNeeded,
>+                                                  gl::DrawElementsType::UnsignedInt));
> 
>         void *mappedMemory  = nullptr;
>         unsigned int offset = 0;
>-        error               = mLineLoopIB->mapBuffer(spaceNeeded, &mappedMemory, &offset);
>-        if (error.isError())
>-        {
>-            return error;
>-        }
>+        ANGLE_TRY(mLineLoopIB->mapBuffer(context, spaceNeeded, &mappedMemory, &offset));
> 
>         startIndex         = static_cast<unsigned int>(offset) / 4;
>-        unsigned int *data = reinterpret_cast<unsigned int *>(mappedMemory);
>+        unsigned int *data = static_cast<unsigned int *>(mappedMemory);
> 
>         switch (type)
>         {
>-            case GL_NONE:  // Non-indexed draw
>+            case gl::DrawElementsType::InvalidEnum:  // Non-indexed draw
>                 for (int i = 0; i < count; i++)
>                 {
>                     data[i] = i;
>                 }
>                 data[count] = 0;
>                 break;
>-            case GL_UNSIGNED_BYTE:
>+            case gl::DrawElementsType::UnsignedByte:
>                 for (int i = 0; i < count; i++)
>                 {
>                     data[i] = static_cast<const GLubyte *>(indices)[i];
>                 }
>                 data[count] = static_cast<const GLubyte *>(indices)[0];
>                 break;
>-            case GL_UNSIGNED_SHORT:
>+            case gl::DrawElementsType::UnsignedShort:
>                 for (int i = 0; i < count; i++)
>                 {
>                     data[i] = static_cast<const GLushort *>(indices)[i];
>                 }
>                 data[count] = static_cast<const GLushort *>(indices)[0];
>                 break;
>-            case GL_UNSIGNED_INT:
>+            case gl::DrawElementsType::UnsignedInt:
>                 for (int i = 0; i < count; i++)
>                 {
>                     data[i] = static_cast<const GLuint *>(indices)[i];
>@@ -1552,79 +1515,63 @@ gl::Error Renderer9::drawLineLoop(const gl::Context *context,
>                 UNREACHABLE();
>         }
> 
>-        error = mLineLoopIB->unmapBuffer();
>-        if (error.isError())
>-        {
>-            return error;
>-        }
>+        ANGLE_TRY(mLineLoopIB->unmapBuffer(context));
>     }
>     else
>     {
>         if (!mLineLoopIB)
>         {
>             mLineLoopIB = new StreamingIndexBufferInterface(this);
>-            gl::Error error =
>-                mLineLoopIB->reserveBufferSpace(INITIAL_INDEX_BUFFER_SIZE, GL_UNSIGNED_SHORT);
>-            if (error.isError())
>-            {
>-                SafeDelete(mLineLoopIB);
>-                return error;
>-            }
>+            ANGLE_TRY(mLineLoopIB->reserveBufferSpace(context, INITIAL_INDEX_BUFFER_SIZE,
>+                                                      gl::DrawElementsType::UnsignedShort));
>         }
> 
>         // Checked by Renderer9::applyPrimitiveType
>         ASSERT(count >= 0);
> 
>-        if (static_cast<unsigned int>(count) + 1 >
>-            (std::numeric_limits<unsigned short>::max() / sizeof(unsigned short)))
>-        {
>-            return gl::OutOfMemory() << "Failed to create a 16-bit looping index buffer for "
>-                                        "GL_LINE_LOOP, too many indices required.";
>-        }
>+        ANGLE_CHECK(context9,
>+                    static_cast<unsigned int>(count) + 1 <=
>+                        (std::numeric_limits<unsigned short>::max() / sizeof(unsigned short)),
>+                    "Failed to create a 16-bit looping index buffer for "
>+                    "GL_LINE_LOOP, too many indices required.",
>+                    GL_OUT_OF_MEMORY);
> 
>         const unsigned int spaceNeeded =
>             (static_cast<unsigned int>(count) + 1) * sizeof(unsigned short);
>-        gl::Error error = mLineLoopIB->reserveBufferSpace(spaceNeeded, GL_UNSIGNED_SHORT);
>-        if (error.isError())
>-        {
>-            return error;
>-        }
>+        ANGLE_TRY(mLineLoopIB->reserveBufferSpace(context, spaceNeeded,
>+                                                  gl::DrawElementsType::UnsignedShort));
> 
>         void *mappedMemory = nullptr;
>         unsigned int offset;
>-        error = mLineLoopIB->mapBuffer(spaceNeeded, &mappedMemory, &offset);
>-        if (error.isError())
>-        {
>-            return error;
>-        }
>+        ANGLE_TRY(mLineLoopIB->mapBuffer(context, spaceNeeded, &mappedMemory, &offset));
> 
>         startIndex           = static_cast<unsigned int>(offset) / 2;
>-        unsigned short *data = reinterpret_cast<unsigned short *>(mappedMemory);
>+        unsigned short *data = static_cast<unsigned short *>(mappedMemory);
> 
>         switch (type)
>         {
>-            case GL_NONE:  // Non-indexed draw
>+            case gl::DrawElementsType::InvalidEnum:  // Non-indexed draw
>                 for (int i = 0; i < count; i++)
>                 {
>                     data[i] = static_cast<unsigned short>(i);
>                 }
>                 data[count] = 0;
>                 break;
>-            case GL_UNSIGNED_BYTE:
>+            case gl::DrawElementsType::UnsignedByte:
>                 for (int i = 0; i < count; i++)
>                 {
>                     data[i] = static_cast<const GLubyte *>(indices)[i];
>                 }
>                 data[count] = static_cast<const GLubyte *>(indices)[0];
>                 break;
>-            case GL_UNSIGNED_SHORT:
>+            case gl::DrawElementsType::UnsignedShort:
>                 for (int i = 0; i < count; i++)
>                 {
>                     data[i] = static_cast<const GLushort *>(indices)[i];
>                 }
>                 data[count] = static_cast<const GLushort *>(indices)[0];
>                 break;
>-            case GL_UNSIGNED_INT:
>+            case gl::DrawElementsType::UnsignedInt:
>                 for (int i = 0; i < count; i++)
>                 {
>                     data[i] = static_cast<unsigned short>(static_cast<const GLuint *>(indices)[i]);
>@@ -1635,11 +1582,7 @@ gl::Error Renderer9::drawLineLoop(const gl::Context *context,
>                 UNREACHABLE();
>         }
> 
>-        error = mLineLoopIB->unmapBuffer();
>-        if (error.isError())
>-        {
>-            return error;
>-        }
>+        ANGLE_TRY(mLineLoopIB->unmapBuffer(context));
>     }
> 
>     if (mAppliedIBSerial != mLineLoopIB->getSerial())
>@@ -1652,31 +1595,15 @@ gl::Error Renderer9::drawLineLoop(const gl::Context *context,
> 
>     mDevice->DrawIndexedPrimitive(D3DPT_LINESTRIP, -minIndex, minIndex, count, startIndex, count);
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-template <typename T>
>-static gl::Error drawPoints(IDirect3DDevice9 *device,
>-                            GLsizei count,
>-                            const void *indices,
>-                            int minIndex)
>-{
>-    for (int i = 0; i < count; i++)
>-    {
>-        unsigned int indexValue =
>-            static_cast<unsigned int>(static_cast<const T *>(indices)[i]) - minIndex;
>-        device->DrawPrimitive(D3DPT_POINTLIST, indexValue, 1);
>-    }
>-
>-    return gl::NoError();
>-}
>-
>-gl::Error Renderer9::drawIndexedPoints(const gl::Context *context,
>-                                       GLsizei count,
>-                                       GLenum type,
>-                                       const void *indices,
>-                                       int minIndex,
>-                                       gl::Buffer *elementArrayBuffer)
>+angle::Result Renderer9::drawIndexedPoints(const gl::Context *context,
>+                                           GLsizei count,
>+                                           gl::DrawElementsType type,
>+                                           const void *indices,
>+                                           int minIndex,
>+                                           gl::Buffer *elementArrayBuffer)
> {
>     // Drawing index point lists is unsupported in d3d9, fall back to a regular DrawPrimitive call
>     // for each individual point. This call is not expected to happen often.
>@@ -1687,30 +1614,29 @@ gl::Error Renderer9::drawIndexedPoints(const gl::Context *context,
>         intptr_t offset    = reinterpret_cast<intptr_t>(indices);
> 
>         const uint8_t *bufferData = nullptr;
>-        gl::Error error           = storage->getData(context, &bufferData);
>-        if (error.isError())
>-        {
>-            return error;
>-        }
>-
>+        ANGLE_TRY(storage->getData(context, &bufferData));
>         indices = bufferData + offset;
>     }
> 
>     switch (type)
>     {
>-        case GL_UNSIGNED_BYTE:
>-            return drawPoints<GLubyte>(mDevice, count, indices, minIndex);
>-        case GL_UNSIGNED_SHORT:
>-            return drawPoints<GLushort>(mDevice, count, indices, minIndex);
>-        case GL_UNSIGNED_INT:
>-            return drawPoints<GLuint>(mDevice, count, indices, minIndex);
>+        case gl::DrawElementsType::UnsignedByte:
>+            DrawPoints<GLubyte>(mDevice, count, indices, minIndex);
>+            return angle::Result::Continue;
>+        case gl::DrawElementsType::UnsignedShort:
>+            DrawPoints<GLushort>(mDevice, count, indices, minIndex);
>+            return angle::Result::Continue;
>+        case gl::DrawElementsType::UnsignedInt:
>+            DrawPoints<GLuint>(mDevice, count, indices, minIndex);
>+            return angle::Result::Continue;
>         default:
>-            UNREACHABLE();
>-            return gl::InternalError();
>+            ANGLE_HR_UNREACHABLE(GetImplAs<Context9>(context));
>     }
> }
> 
>-gl::Error Renderer9::getCountingIB(size_t count, StaticIndexBufferInterface **outIB)
>+angle::Result Renderer9::getCountingIB(const gl::Context *context,
>+                                       size_t count,
>+                                       StaticIndexBufferInterface **outIB)
> {
>     // Update the counting index buffer if it is not large enough or has not been created yet.
>     if (count <= 65536)  // 16-bit indices
>@@ -1721,18 +1647,19 @@ gl::Error Renderer9::getCountingIB(size_t count, StaticIndexBufferInterface **ou
>         {
>             SafeDelete(mCountingIB);
>             mCountingIB = new StaticIndexBufferInterface(this);
>-            ANGLE_TRY(mCountingIB->reserveBufferSpace(spaceNeeded, GL_UNSIGNED_SHORT));
>+            ANGLE_TRY(mCountingIB->reserveBufferSpace(context, spaceNeeded,
>+                                                      gl::DrawElementsType::UnsignedShort));
> 
>             void *mappedMemory = nullptr;
>-            ANGLE_TRY(mCountingIB->mapBuffer(spaceNeeded, &mappedMemory, nullptr));
>+            ANGLE_TRY(mCountingIB->mapBuffer(context, spaceNeeded, &mappedMemory, nullptr));
> 
>-            unsigned short *data = reinterpret_cast<unsigned short *>(mappedMemory);
>+            unsigned short *data = static_cast<unsigned short *>(mappedMemory);
>             for (size_t i = 0; i < count; i++)
>             {
>                 data[i] = static_cast<unsigned short>(i);
>             }
> 
>-            ANGLE_TRY(mCountingIB->unmapBuffer());
>+            ANGLE_TRY(mCountingIB->unmapBuffer(context));
>         }
>     }
>     else if (getNativeExtensions().elementIndexUint)
>@@ -1743,48 +1670,51 @@ gl::Error Renderer9::getCountingIB(size_t count, StaticIndexBufferInterface **ou
>         {
>             SafeDelete(mCountingIB);
>             mCountingIB = new StaticIndexBufferInterface(this);
>-            ANGLE_TRY(mCountingIB->reserveBufferSpace(spaceNeeded, GL_UNSIGNED_INT));
>+            ANGLE_TRY(mCountingIB->reserveBufferSpace(context, spaceNeeded,
>+                                                      gl::DrawElementsType::UnsignedInt));
> 
>             void *mappedMemory = nullptr;
>-            ANGLE_TRY(mCountingIB->mapBuffer(spaceNeeded, &mappedMemory, nullptr));
>+            ANGLE_TRY(mCountingIB->mapBuffer(context, spaceNeeded, &mappedMemory, nullptr));
> 
>-            unsigned int *data = reinterpret_cast<unsigned int *>(mappedMemory);
>+            unsigned int *data = static_cast<unsigned int *>(mappedMemory);
>             for (unsigned int i = 0; i < count; i++)
>             {
>                 data[i] = i;
>             }
> 
>-            ANGLE_TRY(mCountingIB->unmapBuffer());
>+            ANGLE_TRY(mCountingIB->unmapBuffer(context));
>         }
>     }
>     else
>     {
>-        return gl::OutOfMemory()
>-               << "Could not create a counting index buffer for glDrawArraysInstanced.";
>+        ANGLE_TRY_HR(GetImplAs<Context9>(context), E_OUTOFMEMORY,
>+                     "Could not create a counting index buffer for glDrawArraysInstanced.");
>     }
> 
>     *outIB = mCountingIB;
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error Renderer9::applyShaders(const gl::Context *context, GLenum drawMode)
>+angle::Result Renderer9::applyShaders(const gl::Context *context, gl::PrimitiveMode drawMode)
> {
>-    const gl::State &state = context->getContextState().getState();
>+    const gl::State &state   = context->getState();
>+    d3d::Context *contextD3D = GetImplAs<ContextD3D>(context);
>+
>     // This method is called single-threaded.
>-    ANGLE_TRY(ensureHLSLCompilerInitialized());
>+    ANGLE_TRY(ensureHLSLCompilerInitialized(contextD3D));
> 
>     ProgramD3D *programD3D = GetImplAs<ProgramD3D>(state.getProgram());
>     VertexArray9 *vao      = GetImplAs<VertexArray9>(state.getVertexArray());
>     programD3D->updateCachedInputLayout(vao->getCurrentStateSerial(), state);
> 
>     ShaderExecutableD3D *vertexExe = nullptr;
>-    ANGLE_TRY(programD3D->getVertexExecutableForCachedInputLayout(&vertexExe, nullptr));
>+    ANGLE_TRY(programD3D->getVertexExecutableForCachedInputLayout(contextD3D, &vertexExe, nullptr));
> 
>     const gl::Framebuffer *drawFramebuffer = state.getDrawFramebuffer();
>     programD3D->updateCachedOutputLayout(context, drawFramebuffer);
> 
>     ShaderExecutableD3D *pixelExe = nullptr;
>-    ANGLE_TRY(programD3D->getPixelExecutableForCachedOutputLayout(&pixelExe, nullptr));
>+    ANGLE_TRY(programD3D->getPixelExecutableForCachedOutputLayout(contextD3D, &pixelExe, nullptr));
> 
>     IDirect3DVertexShader9 *vertexShader =
>         (vertexExe ? GetAs<ShaderExecutable9>(vertexExe)->getVertexShader() : nullptr);
>@@ -1816,20 +1746,20 @@ gl::Error Renderer9::applyShaders(const gl::Context *context, GLenum drawMode)
>         mAppliedProgramSerial = programSerial;
>     }
> 
>-    ANGLE_TRY(applyUniforms(programD3D));
>+    applyUniforms(programD3D);
> 
>     // Driver uniforms
>     mStateManager.setShaderConstants();
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error Renderer9::applyUniforms(ProgramD3D *programD3D)
>+void Renderer9::applyUniforms(ProgramD3D *programD3D)
> {
>-    // Skip updates if we're not dirty. Note that D3D9 cannot have compute.
>-    if (!programD3D->areVertexUniformsDirty() && !programD3D->areFragmentUniformsDirty())
>+    // Skip updates if we're not dirty. Note that D3D9 cannot have compute or geometry.
>+    if (!programD3D->anyShaderUniformsDirty())
>     {
>-        return gl::NoError();
>+        return;
>     }
> 
>     const auto &uniformArray = programD3D->getD3DUniforms();
>@@ -1837,8 +1767,8 @@ gl::Error Renderer9::applyUniforms(ProgramD3D *programD3D)
>     for (const D3DUniform *targetUniform : uniformArray)
>     {
>         // Built-in uniforms must be skipped.
>-        if (!targetUniform->isReferencedByFragmentShader() &&
>-            !targetUniform->isReferencedByVertexShader())
>+        if (!targetUniform->isReferencedByShader(gl::ShaderType::Vertex) &&
>+            !targetUniform->isReferencedByShader(gl::ShaderType::Fragment))
>             continue;
> 
>         const GLfloat *f = reinterpret_cast<const GLfloat *>(targetUniform->firstNonNullData());
>@@ -1877,21 +1807,22 @@ gl::Error Renderer9::applyUniforms(ProgramD3D *programD3D)
>     }
> 
>     programD3D->markUniformsClean();
>-    return gl::NoError();
> }
> 
> void Renderer9::applyUniformnfv(const D3DUniform *targetUniform, const GLfloat *v)
> {
>-    if (targetUniform->isReferencedByFragmentShader())
>+    if (targetUniform->isReferencedByShader(gl::ShaderType::Fragment))
>     {
>-        mDevice->SetPixelShaderConstantF(targetUniform->psRegisterIndex, v,
>-                                         targetUniform->registerCount);
>+        mDevice->SetPixelShaderConstantF(
>+            targetUniform->mShaderRegisterIndexes[gl::ShaderType::Fragment], v,
>+            targetUniform->registerCount);
>     }
> 
>-    if (targetUniform->isReferencedByVertexShader())
>+    if (targetUniform->isReferencedByShader(gl::ShaderType::Vertex))
>     {
>-        mDevice->SetVertexShaderConstantF(targetUniform->vsRegisterIndex, v,
>-                                          targetUniform->registerCount);
>+        mDevice->SetVertexShaderConstantF(
>+            targetUniform->mShaderRegisterIndexes[gl::ShaderType::Vertex], v,
>+            targetUniform->registerCount);
>     }
> }
> 
>@@ -1927,51 +1858,34 @@ void Renderer9::applyUniformnbv(const D3DUniform *targetUniform, const GLint *v)
>     applyUniformnfv(targetUniform, (GLfloat *)vector);
> }
> 
>-gl::Error Renderer9::clear(const gl::Context *context,
>-                           const ClearParameters &clearParams,
>-                           const gl::FramebufferAttachment *colorBuffer,
>-                           const gl::FramebufferAttachment *depthStencilBuffer)
>+void Renderer9::clear(const ClearParameters &clearParams,
>+                      const RenderTarget9 *colorRenderTarget,
>+                      const RenderTarget9 *depthStencilRenderTarget)
> {
>-    if (clearParams.colorType != GL_FLOAT)
>-    {
>-        // Clearing buffers with non-float values is not supported by Renderer9 and ES 2.0
>-        UNREACHABLE();
>-        return gl::InternalError();
>-    }
>+    // Clearing buffers with non-float values is not supported by Renderer9 and ES 2.0
>+    ASSERT(clearParams.colorType == GL_FLOAT);
> 
>+    // Clearing individual buffers other than buffer zero is not supported by Renderer9 and ES 2.0
>     bool clearColor = clearParams.clearColor[0];
>     for (unsigned int i = 0; i < ArraySize(clearParams.clearColor); i++)
>     {
>-        if (clearParams.clearColor[i] != clearColor)
>-        {
>-            // Clearing individual buffers other than buffer zero is not supported by Renderer9 and
>-            // ES 2.0
>-            UNREACHABLE();
>-            return gl::InternalError();
>-        }
>+        ASSERT(clearParams.clearColor[i] == clearColor);
>     }
> 
>     float depth   = gl::clamp01(clearParams.depthValue);
>     DWORD stencil = clearParams.stencilValue & 0x000000FF;
> 
>     unsigned int stencilUnmasked = 0x0;
>-    if (clearParams.clearStencil && depthStencilBuffer->getStencilSize() > 0)
>+    if (clearParams.clearStencil && depthStencilRenderTarget)
>     {
>-        ASSERT(depthStencilBuffer != nullptr);
>-
>-        RenderTargetD3D *stencilRenderTarget = nullptr;
>-        gl::Error error = depthStencilBuffer->getRenderTarget(context, &stencilRenderTarget);
>-        if (error.isError())
>+        const gl::InternalFormat &depthStencilFormat =
>+            gl::GetSizedInternalFormatInfo(depthStencilRenderTarget->getInternalFormat());
>+        if (depthStencilFormat.stencilBits > 0)
>         {
>-            return error;
>+            const d3d9::D3DFormat &d3dFormatInfo =
>+                d3d9::GetD3DFormatInfo(depthStencilRenderTarget->getD3DFormat());
>+            stencilUnmasked = (0x1 << d3dFormatInfo.stencilBits) - 1;
>         }
>-
>-        RenderTarget9 *stencilRenderTarget9 = GetAs<RenderTarget9>(stencilRenderTarget);
>-        ASSERT(stencilRenderTarget9);
>-
>-        const d3d9::D3DFormat &d3dFormatInfo =
>-            d3d9::GetD3DFormatInfo(stencilRenderTarget9->getD3DFormat());
>-        stencilUnmasked = (0x1 << d3dFormatInfo.stencilBits) - 1;
>     }
> 
>     const bool needMaskedStencilClear =
>@@ -1982,21 +1896,12 @@ gl::Error Renderer9::clear(const gl::Context *context,
>     D3DCOLOR color            = D3DCOLOR_ARGB(255, 0, 0, 0);
>     if (clearColor)
>     {
>-        ASSERT(colorBuffer != nullptr);
>+        ASSERT(colorRenderTarget != nullptr);
> 
>-        RenderTargetD3D *colorRenderTarget = nullptr;
>-        gl::Error error = colorBuffer->getRenderTarget(context, &colorRenderTarget);
>-        if (error.isError())
>-        {
>-            return error;
>-        }
>-
>-        RenderTarget9 *colorRenderTarget9 = GetAs<RenderTarget9>(colorRenderTarget);
>-        ASSERT(colorRenderTarget9);
>-
>-        const gl::InternalFormat &formatInfo = *colorBuffer->getFormat().info;
>+        const gl::InternalFormat &formatInfo =
>+            gl::GetSizedInternalFormatInfo(colorRenderTarget->getInternalFormat());
>         const d3d9::D3DFormat &d3dFormatInfo =
>-            d3d9::GetD3DFormatInfo(colorRenderTarget9->getD3DFormat());
>+            d3d9::GetD3DFormatInfo(colorRenderTarget->getD3DFormat());
> 
>         color =
>             D3DCOLOR_ARGB(gl::unorm<8>((formatInfo.alphaBits == 0 && d3dFormatInfo.alphaBits > 0)
>@@ -2181,8 +2086,6 @@ gl::Error Renderer9::clear(const gl::Context *context,
> 
>         mDevice->Clear(0, nullptr, dxClearFlags, color, depth, stencil);
>     }
>-
>-    return gl::NoError();
> }
> 
> void Renderer9::markAllStateDirty()
>@@ -2242,11 +2145,7 @@ void Renderer9::releaseDeviceResources()
> 
>     for (int i = 0; i < NUM_NULL_COLORBUFFER_CACHE_ENTRIES; i++)
>     {
>-        if (mNullColorbufferCache[i].buffer)
>-        {
>-            mNullColorbufferCache[i].buffer->detach(mDisplay->getProxyContext());
>-        }
>-        SafeDelete(mNullColorbufferCache[i].buffer);
>+        SafeDelete(mNullRenderTargetCache[i].renderTarget);
>     }
> }
> 
>@@ -2382,7 +2281,7 @@ bool Renderer9::isRemovedDeviceResettable() const
> 
>     SafeRelease(d3d9Ex);
> #else
>-    ASSERT(UNREACHABLE());
>+    UNREACHABLE();
> #endif
> 
>     return success;
>@@ -2490,13 +2389,13 @@ D3DPOOL Renderer9::getBufferPool(DWORD usage) const
>     return D3DPOOL_DEFAULT;
> }
> 
>-gl::Error Renderer9::copyImage2D(const gl::Context *context,
>-                                 const gl::Framebuffer *framebuffer,
>-                                 const gl::Rectangle &sourceRect,
>-                                 GLenum destFormat,
>-                                 const gl::Offset &destOffset,
>-                                 TextureStorage *storage,
>-                                 GLint level)
>+angle::Result Renderer9::copyImage2D(const gl::Context *context,
>+                                     const gl::Framebuffer *framebuffer,
>+                                     const gl::Rectangle &sourceRect,
>+                                     GLenum destFormat,
>+                                     const gl::Offset &destOffset,
>+                                     TextureStorage *storage,
>+                                     GLint level)
> {
>     RECT rect;
>     rect.left   = sourceRect.x;
>@@ -2507,14 +2406,14 @@ gl::Error Renderer9::copyImage2D(const gl::Context *context,
>     return mBlit->copy2D(context, framebuffer, rect, destFormat, destOffset, storage, level);
> }
> 
>-gl::Error Renderer9::copyImageCube(const gl::Context *context,
>-                                   const gl::Framebuffer *framebuffer,
>-                                   const gl::Rectangle &sourceRect,
>-                                   GLenum destFormat,
>-                                   const gl::Offset &destOffset,
>-                                   TextureStorage *storage,
>-                                   GLenum target,
>-                                   GLint level)
>+angle::Result Renderer9::copyImageCube(const gl::Context *context,
>+                                       const gl::Framebuffer *framebuffer,
>+                                       const gl::Rectangle &sourceRect,
>+                                       GLenum destFormat,
>+                                       const gl::Offset &destOffset,
>+                                       TextureStorage *storage,
>+                                       gl::TextureTarget target,
>+                                       GLint level)
> {
>     RECT rect;
>     rect.left   = sourceRect.x;
>@@ -2526,71 +2425,74 @@ gl::Error Renderer9::copyImageCube(const gl::Context *context,
>                            level);
> }
> 
>-gl::Error Renderer9::copyImage3D(const gl::Context *context,
>-                                 const gl::Framebuffer *framebuffer,
>-                                 const gl::Rectangle &sourceRect,
>-                                 GLenum destFormat,
>-                                 const gl::Offset &destOffset,
>-                                 TextureStorage *storage,
>-                                 GLint level)
>+angle::Result Renderer9::copyImage3D(const gl::Context *context,
>+                                     const gl::Framebuffer *framebuffer,
>+                                     const gl::Rectangle &sourceRect,
>+                                     GLenum destFormat,
>+                                     const gl::Offset &destOffset,
>+                                     TextureStorage *storage,
>+                                     GLint level)
> {
>     // 3D textures are not available in the D3D9 backend.
>-    UNREACHABLE();
>-    return gl::InternalError();
>+    ANGLE_HR_UNREACHABLE(GetImplAs<Context9>(context));
>+    return angle::Result::Stop;
> }
> 
>-gl::Error Renderer9::copyImage2DArray(const gl::Context *context,
>-                                      const gl::Framebuffer *framebuffer,
>-                                      const gl::Rectangle &sourceRect,
>-                                      GLenum destFormat,
>-                                      const gl::Offset &destOffset,
>-                                      TextureStorage *storage,
>-                                      GLint level)
>+angle::Result Renderer9::copyImage2DArray(const gl::Context *context,
>+                                          const gl::Framebuffer *framebuffer,
>+                                          const gl::Rectangle &sourceRect,
>+                                          GLenum destFormat,
>+                                          const gl::Offset &destOffset,
>+                                          TextureStorage *storage,
>+                                          GLint level)
> {
>     // 2D array textures are not available in the D3D9 backend.
>-    UNREACHABLE();
>-    return gl::InternalError();
>-}
>-
>-gl::Error Renderer9::copyTexture(const gl::Context *context,
>-                                 const gl::Texture *source,
>-                                 GLint sourceLevel,
>-                                 const gl::Rectangle &sourceRect,
>-                                 GLenum destFormat,
>-                                 const gl::Offset &destOffset,
>-                                 TextureStorage *storage,
>-                                 GLenum destTarget,
>-                                 GLint destLevel,
>-                                 bool unpackFlipY,
>-                                 bool unpackPremultiplyAlpha,
>-                                 bool unpackUnmultiplyAlpha)
>+    ANGLE_HR_UNREACHABLE(GetImplAs<Context9>(context));
>+    return angle::Result::Stop;
>+}
>+
>+angle::Result Renderer9::copyTexture(const gl::Context *context,
>+                                     const gl::Texture *source,
>+                                     GLint sourceLevel,
>+                                     gl::TextureTarget srcTarget,
>+                                     const gl::Box &sourceBox,
>+                                     GLenum destFormat,
>+                                     GLenum destType,
>+                                     const gl::Offset &destOffset,
>+                                     TextureStorage *storage,
>+                                     gl::TextureTarget destTarget,
>+                                     GLint destLevel,
>+                                     bool unpackFlipY,
>+                                     bool unpackPremultiplyAlpha,
>+                                     bool unpackUnmultiplyAlpha)
> {
>     RECT rect;
>-    rect.left   = sourceRect.x;
>-    rect.top    = sourceRect.y;
>-    rect.right  = sourceRect.x + sourceRect.width;
>-    rect.bottom = sourceRect.y + sourceRect.height;
>+    rect.left   = sourceBox.x;
>+    rect.top    = sourceBox.y;
>+    rect.right  = sourceBox.x + sourceBox.width;
>+    rect.bottom = sourceBox.y + sourceBox.height;
> 
>     return mBlit->copyTexture(context, source, sourceLevel, rect, destFormat, destOffset, storage,
>                               destTarget, destLevel, unpackFlipY, unpackPremultiplyAlpha,
>                               unpackUnmultiplyAlpha);
> }
> 
>-gl::Error Renderer9::copyCompressedTexture(const gl::Context *context,
>-                                           const gl::Texture *source,
>-                                           GLint sourceLevel,
>-                                           TextureStorage *storage,
>-                                           GLint destLevel)
>+angle::Result Renderer9::copyCompressedTexture(const gl::Context *context,
>+                                               const gl::Texture *source,
>+                                               GLint sourceLevel,
>+                                               TextureStorage *storage,
>+                                               GLint destLevel)
> {
>-    UNIMPLEMENTED();
>-    return gl::InternalError();
>+    ANGLE_HR_UNREACHABLE(GetImplAs<Context9>(context));
>+    return angle::Result::Stop;
> }
> 
>-gl::Error Renderer9::createRenderTarget(int width,
>-                                        int height,
>-                                        GLenum format,
>-                                        GLsizei samples,
>-                                        RenderTargetD3D **outRT)
>+angle::Result Renderer9::createRenderTarget(const gl::Context *context,
>+                                            int width,
>+                                            int height,
>+                                            GLenum format,
>+                                            GLsizei samples,
>+                                            RenderTargetD3D **outRT)
> {
>     const d3d9::TextureFormat &d3d9FormatInfo = d3d9::GetTextureFormatInfo(format);
> 
>@@ -2632,11 +2534,7 @@ gl::Error Renderer9::createRenderTarget(int width,
>             }
>         }
> 
>-        if (FAILED(result))
>-        {
>-            ASSERT(result == D3DERR_OUTOFVIDEOMEMORY || result == E_OUTOFMEMORY);
>-            return gl::OutOfMemory() << "Failed to create render target, " << gl::FmtHR(result);
>-        }
>+        ANGLE_TRY_HR(GetImplAs<Context9>(context), result, "Failed to create render target");
> 
>         if (requiresInitialization)
>         {
>@@ -2653,85 +2551,74 @@ gl::Error Renderer9::createRenderTarget(int width,
> 
>     *outRT = new TextureRenderTarget9(texture, 0, renderTarget, format, width, height, 1,
>                                       supportedSamples);
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error Renderer9::createRenderTargetCopy(RenderTargetD3D *source, RenderTargetD3D **outRT)
>+angle::Result Renderer9::createRenderTargetCopy(const gl::Context *context,
>+                                                RenderTargetD3D *source,
>+                                                RenderTargetD3D **outRT)
> {
>     ASSERT(source != nullptr);
> 
>     RenderTargetD3D *newRT = nullptr;
>-    gl::Error error        = createRenderTarget(source->getWidth(), source->getHeight(),
>-                                         source->getInternalFormat(), source->getSamples(), &newRT);
>-    if (error.isError())
>-    {
>-        return error;
>-    }
>+    ANGLE_TRY(createRenderTarget(context, source->getWidth(), source->getHeight(),
>+                                 source->getInternalFormat(), source->getSamples(), &newRT));
> 
>     RenderTarget9 *source9 = GetAs<RenderTarget9>(source);
>     RenderTarget9 *dest9   = GetAs<RenderTarget9>(newRT);
> 
>     HRESULT result = mDevice->StretchRect(source9->getSurface(), nullptr, dest9->getSurface(),
>                                           nullptr, D3DTEXF_NONE);
>-    if (FAILED(result))
>-    {
>-        ASSERT(result == D3DERR_OUTOFVIDEOMEMORY || result == E_OUTOFMEMORY);
>-        return gl::OutOfMemory() << "Failed to copy render target, " << gl::FmtHR(result);
>-    }
>+    ANGLE_TRY_HR(GetImplAs<Context9>(context), result, "Failed to copy render target");
> 
>     *outRT = newRT;
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error Renderer9::loadExecutable(const uint8_t *function,
>-                                    size_t length,
>-                                    gl::ShaderType type,
>-                                    const std::vector<D3DVarying> &streamOutVaryings,
>-                                    bool separatedOutputBuffers,
>-                                    ShaderExecutableD3D **outExecutable)
>+angle::Result Renderer9::loadExecutable(d3d::Context *context,
>+                                        const uint8_t *function,
>+                                        size_t length,
>+                                        gl::ShaderType type,
>+                                        const std::vector<D3DVarying> &streamOutVaryings,
>+                                        bool separatedOutputBuffers,
>+                                        ShaderExecutableD3D **outExecutable)
> {
>     // Transform feedback is not supported in ES2 or D3D9
>     ASSERT(streamOutVaryings.empty());
> 
>+    Context9 *context9 = static_cast<Context9 *>(context);
>+
>     switch (type)
>     {
>-        case gl::SHADER_VERTEX:
>+        case gl::ShaderType::Vertex:
>         {
>             IDirect3DVertexShader9 *vshader = nullptr;
>-            gl::Error error = createVertexShader((DWORD *)function, length, &vshader);
>-            if (error.isError())
>-            {
>-                return error;
>-            }
>+            ANGLE_TRY(createVertexShader(context9, (DWORD *)function, length, &vshader));
>             *outExecutable = new ShaderExecutable9(function, length, vshader);
>         }
>         break;
>-        case gl::SHADER_FRAGMENT:
>+        case gl::ShaderType::Fragment:
>         {
>             IDirect3DPixelShader9 *pshader = nullptr;
>-            gl::Error error                = createPixelShader((DWORD *)function, length, &pshader);
>-            if (error.isError())
>-            {
>-                return error;
>-            }
>+            ANGLE_TRY(createPixelShader(context9, (DWORD *)function, length, &pshader));
>             *outExecutable = new ShaderExecutable9(function, length, pshader);
>         }
>         break;
>         default:
>-            UNREACHABLE();
>-            return gl::InternalError();
>+            ANGLE_HR_UNREACHABLE(context);
>     }
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error Renderer9::compileToExecutable(gl::InfoLog &infoLog,
>-                                         const std::string &shaderHLSL,
>-                                         gl::ShaderType type,
>-                                         const std::vector<D3DVarying> &streamOutVaryings,
>-                                         bool separatedOutputBuffers,
>-                                         const angle::CompilerWorkaroundsD3D &workarounds,
>-                                         ShaderExecutableD3D **outExectuable)
>+angle::Result Renderer9::compileToExecutable(d3d::Context *context,
>+                                             gl::InfoLog &infoLog,
>+                                             const std::string &shaderHLSL,
>+                                             gl::ShaderType type,
>+                                             const std::vector<D3DVarying> &streamOutVaryings,
>+                                             bool separatedOutputBuffers,
>+                                             const angle::CompilerWorkaroundsD3D &workarounds,
>+                                             ShaderExecutableD3D **outExectuable)
> {
>     // Transform feedback is not supported in ES2 or D3D9
>     ASSERT(streamOutVaryings.empty());
>@@ -2740,15 +2627,14 @@ gl::Error Renderer9::compileToExecutable(gl::InfoLog &infoLog,
> 
>     switch (type)
>     {
>-        case gl::SHADER_VERTEX:
>+        case gl::ShaderType::Vertex:
>             profileStream << "vs";
>             break;
>-        case gl::SHADER_FRAGMENT:
>+        case gl::ShaderType::Fragment:
>             profileStream << "ps";
>             break;
>         default:
>-            UNREACHABLE();
>-            return gl::InternalError();
>+            ANGLE_HR_UNREACHABLE(context);
>     }
> 
>     profileStream << "_" << ((getMajorShaderModel() >= 3) ? 3 : 2);
>@@ -2787,12 +2673,9 @@ gl::Error Renderer9::compileToExecutable(gl::InfoLog &infoLog,
> 
>     ID3DBlob *binary = nullptr;
>     std::string debugInfo;
>-    gl::Error error = mCompiler.compileToBinary(infoLog, shaderHLSL, profile, configs, nullptr,
>-                                                &binary, &debugInfo);
>-    if (error.isError())
>-    {
>-        return error;
>-    }
>+    angle::Result error = mCompiler.compileToBinary(context, infoLog, shaderHLSL, profile, configs,
>+                                                    nullptr, &binary, &debugInfo);
>+    ANGLE_TRY(error);
> 
>     // It's possible that binary is NULL if the compiler failed in all configurations.  Set the
>     // executable to NULL and return GL_NO_ERROR to signify that there was a link error but the
>@@ -2800,30 +2683,27 @@ gl::Error Renderer9::compileToExecutable(gl::InfoLog &infoLog,
>     if (!binary)
>     {
>         *outExectuable = nullptr;
>-        return gl::NoError();
>+        return angle::Result::Continue;
>     }
> 
>-    error = loadExecutable(reinterpret_cast<const uint8_t *>(binary->GetBufferPointer()),
>+    error = loadExecutable(context, reinterpret_cast<const uint8_t *>(binary->GetBufferPointer()),
>                            binary->GetBufferSize(), type, streamOutVaryings, separatedOutputBuffers,
>                            outExectuable);
> 
>     SafeRelease(binary);
>-    if (error.isError())
>-    {
>-        return error;
>-    }
>+    ANGLE_TRY(error);
> 
>     if (!debugInfo.empty())
>     {
>         (*outExectuable)->appendDebugInfo(debugInfo);
>     }
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error Renderer9::ensureHLSLCompilerInitialized()
>+angle::Result Renderer9::ensureHLSLCompilerInitialized(d3d::Context *context)
> {
>-    return mCompiler.ensureInitialized();
>+    return mCompiler.ensureInitialized(context);
> }
> 
> UniformStorageD3D *Renderer9::createUniformStorage(size_t storageSize)
>@@ -2831,9 +2711,11 @@ UniformStorageD3D *Renderer9::createUniformStorage(size_t storageSize)
>     return new UniformStorageD3D(storageSize);
> }
> 
>-gl::Error Renderer9::boxFilter(IDirect3DSurface9 *source, IDirect3DSurface9 *dest)
>+angle::Result Renderer9::boxFilter(Context9 *context9,
>+                                   IDirect3DSurface9 *source,
>+                                   IDirect3DSurface9 *dest)
> {
>-    return mBlit->boxFilter(source, dest);
>+    return mBlit->boxFilter(context9, source, dest);
> }
> 
> D3DPOOL Renderer9::getTexturePool(DWORD usage) const
>@@ -2853,12 +2735,15 @@ D3DPOOL Renderer9::getTexturePool(DWORD usage) const
>     return D3DPOOL_DEFAULT;
> }
> 
>-gl::Error Renderer9::copyToRenderTarget(IDirect3DSurface9 *dest,
>-                                        IDirect3DSurface9 *source,
>-                                        bool fromManaged)
>+angle::Result Renderer9::copyToRenderTarget(const gl::Context *context,
>+                                            IDirect3DSurface9 *dest,
>+                                            IDirect3DSurface9 *source,
>+                                            bool fromManaged)
> {
>     ASSERT(source && dest);
> 
>+    Context9 *context9 = GetImplAs<Context9>(context);
>+
>     HRESULT result = D3DERR_OUTOFVIDEOMEMORY;
> 
>     if (fromManaged)
>@@ -2872,7 +2757,7 @@ gl::Error Renderer9::copyToRenderTarget(IDirect3DSurface9 *dest,
> 
>         if (SUCCEEDED(result))
>         {
>-            ANGLE_TRY(Image9::copyLockableSurfaces(surf, source));
>+            ANGLE_TRY(Image9::CopyLockableSurfaces(context9, surf, source));
>             result = mDevice->UpdateSurface(surf, nullptr, dest, nullptr);
>             SafeRelease(surf);
>         }
>@@ -2883,13 +2768,8 @@ gl::Error Renderer9::copyToRenderTarget(IDirect3DSurface9 *dest,
>         result = mDevice->StretchRect(source, nullptr, dest, nullptr, D3DTEXF_NONE);
>     }
> 
>-    if (FAILED(result))
>-    {
>-        ASSERT(result == D3DERR_OUTOFVIDEOMEMORY || result == E_OUTOFMEMORY);
>-        return gl::OutOfMemory() << "Failed to blit internal texture, " << gl::FmtHR(result);
>-    }
>-
>-    return gl::NoError();
>+    ANGLE_TRY_HR(context9, result, "Failed to blit internal texture");
>+    return angle::Result::Continue;
> }
> 
> RendererClass Renderer9::getRendererClass() const
>@@ -2902,33 +2782,33 @@ ImageD3D *Renderer9::createImage()
>     return new Image9(this);
> }
> 
>-gl::Error Renderer9::generateMipmap(const gl::Context *context, ImageD3D *dest, ImageD3D *src)
>+angle::Result Renderer9::generateMipmap(const gl::Context *context, ImageD3D *dest, ImageD3D *src)
> {
>     Image9 *src9 = GetAs<Image9>(src);
>     Image9 *dst9 = GetAs<Image9>(dest);
>-    return Image9::generateMipmap(dst9, src9);
>+    return Image9::GenerateMipmap(GetImplAs<Context9>(context), dst9, src9);
> }
> 
>-gl::Error Renderer9::generateMipmapUsingD3D(const gl::Context *context,
>-                                            TextureStorage *storage,
>-                                            const gl::TextureState &textureState)
>+angle::Result Renderer9::generateMipmapUsingD3D(const gl::Context *context,
>+                                                TextureStorage *storage,
>+                                                const gl::TextureState &textureState)
> {
>-    UNREACHABLE();
>-    return gl::NoError();
>+    ANGLE_HR_UNREACHABLE(GetImplAs<Context9>(context));
>+    return angle::Result::Stop;
> }
> 
>-gl::Error Renderer9::copyImage(const gl::Context *context,
>-                               ImageD3D *dest,
>-                               ImageD3D *source,
>-                               const gl::Rectangle &sourceRect,
>-                               const gl::Offset &destOffset,
>-                               bool unpackFlipY,
>-                               bool unpackPremultiplyAlpha,
>-                               bool unpackUnmultiplyAlpha)
>+angle::Result Renderer9::copyImage(const gl::Context *context,
>+                                   ImageD3D *dest,
>+                                   ImageD3D *source,
>+                                   const gl::Box &sourceBox,
>+                                   const gl::Offset &destOffset,
>+                                   bool unpackFlipY,
>+                                   bool unpackPremultiplyAlpha,
>+                                   bool unpackUnmultiplyAlpha)
> {
>     Image9 *dest9 = GetAs<Image9>(dest);
>     Image9 *src9  = GetAs<Image9>(source);
>-    return Image9::CopyImage(context, dest9, src9, sourceRect, destOffset, unpackFlipY,
>+    return Image9::CopyImage(context, dest9, src9, sourceBox.toRect(), destOffset, unpackFlipY,
>                              unpackPremultiplyAlpha, unpackUnmultiplyAlpha);
> }
> 
>@@ -3008,7 +2888,21 @@ TextureStorage *Renderer9::createTextureStorage2DMultisample(GLenum internalform
>     // 2D multisampled textures are not supported by the D3D9 backend.
>     UNREACHABLE();
> 
>-    return NULL;
>+    return nullptr;
>+}
>+
>+TextureStorage *Renderer9::createTextureStorage2DMultisampleArray(GLenum internalformat,
>+                                                                  GLsizei width,
>+                                                                  GLsizei height,
>+                                                                  GLsizei depth,
>+                                                                  int levels,
>+                                                                  int samples,
>+                                                                  bool fixedSampleLocations)
>+{
>+    // 2D multisampled textures are not supported by the D3D9 backend.
>+    UNREACHABLE();
>+
>+    return nullptr;
> }
> 
> bool Renderer9::getLUID(LUID *adapterLuid) const
>@@ -3025,29 +2919,32 @@ bool Renderer9::getLUID(LUID *adapterLuid) const
>     return false;
> }
> 
>-VertexConversionType Renderer9::getVertexConversionType(gl::VertexFormatType vertexFormatType) const
>+VertexConversionType Renderer9::getVertexConversionType(angle::FormatID vertexFormatID) const
> {
>-    return d3d9::GetVertexFormatInfo(getCapsDeclTypes(), vertexFormatType).conversionType;
>+    return d3d9::GetVertexFormatInfo(getCapsDeclTypes(), vertexFormatID).conversionType;
> }
> 
>-GLenum Renderer9::getVertexComponentType(gl::VertexFormatType vertexFormatType) const
>+GLenum Renderer9::getVertexComponentType(angle::FormatID vertexFormatID) const
> {
>-    return d3d9::GetVertexFormatInfo(getCapsDeclTypes(), vertexFormatType).componentType;
>+    return d3d9::GetVertexFormatInfo(getCapsDeclTypes(), vertexFormatID).componentType;
> }
> 
>-gl::ErrorOrResult<unsigned int> Renderer9::getVertexSpaceRequired(const gl::VertexAttribute &attrib,
>-                                                                  const gl::VertexBinding &binding,
>-                                                                  GLsizei count,
>-                                                                  GLsizei instances) const
>+angle::Result Renderer9::getVertexSpaceRequired(const gl::Context *context,
>+                                                const gl::VertexAttribute &attrib,
>+                                                const gl::VertexBinding &binding,
>+                                                size_t count,
>+                                                GLsizei instances,
>+                                                unsigned int *bytesRequiredOut) const
> {
>     if (!attrib.enabled)
>     {
>-        return 16u;
>+        *bytesRequiredOut = 16u;
>+        return angle::Result::Continue;
>     }
> 
>-    gl::VertexFormatType vertexFormatType = gl::GetVertexFormatType(attrib, GL_FLOAT);
>+    angle::FormatID vertexFormatID = gl::GetVertexFormatID(attrib, gl::VertexAttribType::Float);
>     const d3d9::VertexFormat &d3d9VertexInfo =
>-        d3d9::GetVertexFormatInfo(getCapsDeclTypes(), vertexFormatType);
>+        d3d9::GetVertexFormatInfo(getCapsDeclTypes(), vertexFormatID);
> 
>     unsigned int elementCount  = 0;
>     const unsigned int divisor = binding.getDivisor();
>@@ -3061,12 +2958,13 @@ gl::ErrorOrResult<unsigned int> Renderer9::getVertexSpaceRequired(const gl::Vert
>         elementCount = UnsignedCeilDivide(static_cast<unsigned int>(instances), divisor);
>     }
> 
>-    if (d3d9VertexInfo.outputElementSize > std::numeric_limits<unsigned int>::max() / elementCount)
>-    {
>-        return gl::OutOfMemory() << "New vertex buffer size would result in an overflow.";
>-    }
>+    bool check = (d3d9VertexInfo.outputElementSize >
>+                  std::numeric_limits<unsigned int>::max() / elementCount);
>+    ANGLE_CHECK(GetImplAs<Context9>(context), !check,
>+                "New vertex buffer size would result in an overflow.", GL_OUT_OF_MEMORY);
> 
>-    return static_cast<unsigned int>(d3d9VertexInfo.outputElementSize) * elementCount;
>+    *bytesRequiredOut = static_cast<unsigned int>(d3d9VertexInfo.outputElementSize) * elementCount;
>+    return angle::Result::Continue;
> }
> 
> void Renderer9::generateCaps(gl::Caps *outCaps,
>@@ -3083,40 +2981,24 @@ angle::WorkaroundsD3D Renderer9::generateWorkarounds() const
>     return d3d9::GenerateWorkarounds();
> }
> 
>-egl::Error Renderer9::getEGLDevice(DeviceImpl **device)
>+DeviceImpl *Renderer9::createEGLDevice()
> {
>-    if (mEGLDevice == nullptr)
>-    {
>-        ASSERT(mDevice != nullptr);
>-        mEGLDevice       = new DeviceD3D();
>-        egl::Error error = mEGLDevice->initialize(reinterpret_cast<void *>(mDevice),
>-                                                  EGL_D3D9_DEVICE_ANGLE, EGL_FALSE);
>-
>-        if (error.isError())
>-        {
>-            SafeDelete(mEGLDevice);
>-            return error;
>-        }
>-    }
>-
>-    *device = static_cast<DeviceImpl *>(mEGLDevice);
>-    return egl::NoError();
>+    return new DeviceD3D(EGL_D3D9_DEVICE_ANGLE, mDevice);
> }
> 
> Renderer9::CurSamplerState::CurSamplerState()
>     : forceSet(true), baseLevel(std::numeric_limits<size_t>::max()), samplerState()
>-{
>-}
>+{}
> 
>-gl::Error Renderer9::genericDrawElements(const gl::Context *context,
>-                                         GLenum mode,
>-                                         GLsizei count,
>-                                         GLenum type,
>-                                         const void *indices,
>-                                         GLsizei instances)
>+angle::Result Renderer9::genericDrawElements(const gl::Context *context,
>+                                             gl::PrimitiveMode mode,
>+                                             GLsizei count,
>+                                             gl::DrawElementsType type,
>+                                             const void *indices,
>+                                             GLsizei instances)
> {
>-    const auto &data     = context->getContextState();
>-    gl::Program *program = context->getGLState().getProgram();
>+    const gl::State &state = context->getState();
>+    gl::Program *program   = context->getState().getProgram();
>     ASSERT(program != nullptr);
>     ProgramD3D *programD3D = GetImplAs<ProgramD3D>(program);
>     bool usesPointSize     = programD3D->usesPointSize();
>@@ -3125,28 +3007,28 @@ gl::Error Renderer9::genericDrawElements(const gl::Context *context,
> 
>     if (!applyPrimitiveType(mode, count, usesPointSize))
>     {
>-        return gl::NoError();
>+        return angle::Result::Continue;
>     }
> 
>     ANGLE_TRY(updateState(context, mode));
>     ANGLE_TRY(applyTextures(context));
>     ANGLE_TRY(applyShaders(context, mode));
> 
>-    if (!skipDraw(data.getState(), mode))
>+    if (!skipDraw(state, mode))
>     {
>         ANGLE_TRY(drawElementsImpl(context, mode, count, type, indices, instances));
>     }
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error Renderer9::genericDrawArrays(const gl::Context *context,
>-                                       GLenum mode,
>-                                       GLint first,
>-                                       GLsizei count,
>-                                       GLsizei instances)
>+angle::Result Renderer9::genericDrawArrays(const gl::Context *context,
>+                                           gl::PrimitiveMode mode,
>+                                           GLint first,
>+                                           GLsizei count,
>+                                           GLsizei instances)
> {
>-    gl::Program *program = context->getGLState().getProgram();
>+    gl::Program *program = context->getState().getProgram();
>     ASSERT(program != nullptr);
>     ProgramD3D *programD3D = GetImplAs<ProgramD3D>(program);
>     bool usesPointSize     = programD3D->usesPointSize();
>@@ -3155,7 +3037,7 @@ gl::Error Renderer9::genericDrawArrays(const gl::Context *context,
> 
>     if (!applyPrimitiveType(mode, count, usesPointSize))
>     {
>-        return gl::NoError();
>+        return angle::Result::Continue;
>     }
> 
>     ANGLE_TRY(updateState(context, mode));
>@@ -3163,12 +3045,12 @@ gl::Error Renderer9::genericDrawArrays(const gl::Context *context,
>     ANGLE_TRY(applyTextures(context));
>     ANGLE_TRY(applyShaders(context, mode));
> 
>-    if (!skipDraw(context->getGLState(), mode))
>+    if (!skipDraw(context->getState(), mode))
>     {
>         ANGLE_TRY(drawArraysImpl(context, mode, first, count, instances));
>     }
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
> FramebufferImpl *Renderer9::createDefaultFramebuffer(const gl::FramebufferState &state)
>@@ -3181,10 +3063,11 @@ gl::Version Renderer9::getMaxSupportedESVersion() const
>     return gl::Version(2, 0);
> }
> 
>-gl::Error Renderer9::clearRenderTarget(RenderTargetD3D *renderTarget,
>-                                       const gl::ColorF &clearColorValue,
>-                                       const float clearDepthValue,
>-                                       const unsigned int clearStencilValue)
>+angle::Result Renderer9::clearRenderTarget(const gl::Context *context,
>+                                           RenderTargetD3D *renderTarget,
>+                                           const gl::ColorF &clearColorValue,
>+                                           const float clearDepthValue,
>+                                           const unsigned int clearStencilValue)
> {
>     D3DCOLOR color =
>         D3DCOLOR_ARGB(gl::unorm<8>(clearColorValue.alpha), gl::unorm<8>(clearColorValue.red),
>@@ -3232,7 +3115,7 @@ gl::Error Renderer9::clearRenderTarget(RenderTargetD3D *renderTarget,
> 
>     markAllStateDirty();
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
> bool Renderer9::canSelectViewInVertexShader() const
>@@ -3244,23 +3127,24 @@ bool Renderer9::canSelectViewInVertexShader() const
> // looks up the corresponding OpenGL texture image unit and texture type,
> // and sets the texture and its addressing/filtering state (or NULL when inactive).
> // Sampler mapping needs to be up-to-date on the program object before this is called.
>-gl::Error Renderer9::applyTextures(const gl::Context *context, gl::SamplerType shaderType)
>+angle::Result Renderer9::applyTextures(const gl::Context *context, gl::ShaderType shaderType)
> {
>-    const auto &glState    = context->getGLState();
>+    const auto &glState    = context->getState();
>     const auto &caps       = context->getCaps();
>     ProgramD3D *programD3D = GetImplAs<ProgramD3D>(glState.getProgram());
> 
>     ASSERT(!programD3D->isSamplerMappingDirty());
> 
>     // TODO(jmadill): Use the Program's sampler bindings.
>-    const auto &completeTextures = glState.getCompleteTextureCache();
>+    const gl::ActiveTexturePointerArray &activeTextures = glState.getActiveTexturesCache();
> 
>-    unsigned int samplerRange = programD3D->getUsedSamplerRange(shaderType);
>-    for (unsigned int samplerIndex = 0; samplerIndex < samplerRange; samplerIndex++)
>+    const gl::RangeUI samplerRange = programD3D->getUsedSamplerRange(shaderType);
>+    for (unsigned int samplerIndex = samplerRange.low(); samplerIndex < samplerRange.high();
>+         samplerIndex++)
>     {
>         GLint textureUnit = programD3D->getSamplerMapping(shaderType, samplerIndex, caps);
>         ASSERT(textureUnit != -1);
>-        gl::Texture *texture = completeTextures[textureUnit];
>+        gl::Texture *texture = activeTextures[textureUnit];
> 
>         // A nullptr texture indicates incomplete.
>         if (texture)
>@@ -3275,7 +3159,8 @@ gl::Error Renderer9::applyTextures(const gl::Context *context, gl::SamplerType s
>         }
>         else
>         {
>-            GLenum textureType = programD3D->getSamplerTextureType(shaderType, samplerIndex);
>+            gl::TextureType textureType =
>+                programD3D->getSamplerTextureType(shaderType, samplerIndex);
> 
>             // Texture is not sampler complete or it is in use by the framebuffer.  Bind the
>             // incomplete texture.
>@@ -3288,23 +3173,41 @@ gl::Error Renderer9::applyTextures(const gl::Context *context, gl::SamplerType s
>     }
> 
>     // Set all the remaining textures to NULL
>-    size_t samplerCount = (shaderType == gl::SAMPLER_PIXEL) ? caps.maxTextureImageUnits
>-                                                            : caps.maxVertexTextureImageUnits;
>+    size_t samplerCount = (shaderType == gl::ShaderType::Fragment)
>+                              ? caps.maxShaderTextureImageUnits[gl::ShaderType::Fragment]
>+                              : caps.maxShaderTextureImageUnits[gl::ShaderType::Vertex];
> 
>     // TODO(jmadill): faster way?
>-    for (size_t samplerIndex = samplerRange; samplerIndex < samplerCount; samplerIndex++)
>+    for (size_t samplerIndex = samplerRange.high(); samplerIndex < samplerCount; samplerIndex++)
>     {
>         ANGLE_TRY(setTexture(context, shaderType, static_cast<int>(samplerIndex), nullptr));
>     }
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error Renderer9::applyTextures(const gl::Context *context)
>+angle::Result Renderer9::applyTextures(const gl::Context *context)
> {
>-    ANGLE_TRY(applyTextures(context, gl::SAMPLER_VERTEX));
>-    ANGLE_TRY(applyTextures(context, gl::SAMPLER_PIXEL));
>-    return gl::NoError();
>+    ANGLE_TRY(applyTextures(context, gl::ShaderType::Vertex));
>+    ANGLE_TRY(applyTextures(context, gl::ShaderType::Fragment));
>+    return angle::Result::Continue;
> }
> 
>+angle::Result Renderer9::getIncompleteTexture(const gl::Context *context,
>+                                              gl::TextureType type,
>+                                              gl::Texture **textureOut)
>+{
>+    return GetImplAs<Context9>(context)->getIncompleteTexture(context, type, textureOut);
>+}
>+
>+angle::Result Renderer9::ensureVertexDataManagerInitialized(const gl::Context *context)
>+{
>+    if (!mVertexDataManager)
>+    {
>+        mVertexDataManager = new VertexDataManager(this);
>+        ANGLE_TRY(mVertexDataManager->initialize(context));
>+    }
>+
>+    return angle::Result::Continue;
>+}
> }  // namespace rx
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/Renderer9.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/Renderer9.h
>index 9ddee45f0f8..f72daccc2bd 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/Renderer9.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/Renderer9.h
>@@ -36,6 +36,7 @@ class Blit9;
> class Context9;
> class IndexDataManager;
> class ProgramD3D;
>+class RenderTarget9;
> class StreamingIndexBufferInterface;
> class StaticIndexBufferInterface;
> class VertexDataManager;
>@@ -78,8 +79,8 @@ class Renderer9 : public RendererD3D
>     void startScene();
>     void endScene();
> 
>-    gl::Error flush();
>-    gl::Error finish();
>+    angle::Result flush(const gl::Context *context);
>+    angle::Result finish(const gl::Context *context);
> 
>     bool isValidNativeWindow(EGLNativeWindowType window) const override;
>     NativeWindowD3D *createNativeWindow(EGLNativeWindowType window,
>@@ -97,71 +98,73 @@ class Renderer9 : public RendererD3D
>                                  IUnknown *d3dTexture,
>                                  EGLint *width,
>                                  EGLint *height,
>-                                 GLenum *fboFormat) const override;
>+                                 const angle::Format **angleFormat) const override;
>     egl::Error validateShareHandle(const egl::Config *config,
>                                    HANDLE shareHandle,
>                                    const egl::AttributeMap &attribs) const override;
> 
>-    ContextImpl *createContext(const gl::ContextState &state) override;
>+    ContextImpl *createContext(const gl::State &state, gl::ErrorSet *errorSet) override;
> 
>-    gl::Error allocateEventQuery(IDirect3DQuery9 **outQuery);
>+    angle::Result allocateEventQuery(const gl::Context *context, IDirect3DQuery9 **outQuery);
>     void freeEventQuery(IDirect3DQuery9 *query);
> 
>     // resource creation
>-    gl::Error createVertexShader(const DWORD *function,
>-                                 size_t length,
>-                                 IDirect3DVertexShader9 **outShader);
>-    gl::Error createPixelShader(const DWORD *function,
>-                                size_t length,
>-                                IDirect3DPixelShader9 **outShader);
>+    angle::Result createVertexShader(Context9 *context9,
>+                                     const DWORD *function,
>+                                     size_t length,
>+                                     IDirect3DVertexShader9 **outShader);
>+    angle::Result createPixelShader(Context9 *context9,
>+                                    const DWORD *function,
>+                                    size_t length,
>+                                    IDirect3DPixelShader9 **outShader);
>     HRESULT createVertexBuffer(UINT Length, DWORD Usage, IDirect3DVertexBuffer9 **ppVertexBuffer);
>     HRESULT createIndexBuffer(UINT Length,
>                               DWORD Usage,
>                               D3DFORMAT Format,
>                               IDirect3DIndexBuffer9 **ppIndexBuffer);
>-    gl::Error setSamplerState(const gl::Context *context,
>-                              gl::SamplerType type,
>-                              int index,
>-                              gl::Texture *texture,
>-                              const gl::SamplerState &sampler);
>-    gl::Error setTexture(const gl::Context *context,
>-                         gl::SamplerType type,
>-                         int index,
>-                         gl::Texture *texture);
>-
>-    gl::Error updateState(const gl::Context *context, GLenum drawMode);
>+    angle::Result setSamplerState(const gl::Context *context,
>+                                  gl::ShaderType type,
>+                                  int index,
>+                                  gl::Texture *texture,
>+                                  const gl::SamplerState &sampler);
>+    angle::Result setTexture(const gl::Context *context,
>+                             gl::ShaderType type,
>+                             int index,
>+                             gl::Texture *texture);
>+
>+    angle::Result updateState(const gl::Context *context, gl::PrimitiveMode drawMode);
> 
>     void setScissorRectangle(const gl::Rectangle &scissor, bool enabled);
>     void setViewport(const gl::Rectangle &viewport,
>                      float zNear,
>                      float zFar,
>-                     GLenum drawMode,
>+                     gl::PrimitiveMode drawMode,
>                      GLenum frontFace,
>                      bool ignoreViewport);
> 
>-    gl::Error applyRenderTarget(const gl::Context *context, const gl::Framebuffer *frameBuffer);
>-    gl::Error applyRenderTarget(const gl::Context *context,
>-                                const gl::FramebufferAttachment *colorAttachment,
>-                                const gl::FramebufferAttachment *depthStencilAttachment);
>-    gl::Error applyUniforms(ProgramD3D *programD3D);
>-    bool applyPrimitiveType(GLenum primitiveType, GLsizei elementCount, bool usesPointSize);
>-    gl::Error applyVertexBuffer(const gl::Context *context,
>-                                GLenum mode,
>-                                GLint first,
>-                                GLsizei count,
>-                                GLsizei instances,
>-                                TranslatedIndexData *indexInfo);
>-    gl::Error applyIndexBuffer(const gl::Context *context,
>-                               const void *indices,
>-                               GLsizei count,
>-                               GLenum mode,
>-                               GLenum type,
>-                               TranslatedIndexData *indexInfo);
>-
>-    gl::Error clear(const gl::Context *context,
>-                    const ClearParameters &clearParams,
>-                    const gl::FramebufferAttachment *colorBuffer,
>-                    const gl::FramebufferAttachment *depthStencilBuffer);
>+    angle::Result applyRenderTarget(const gl::Context *context,
>+                                    const RenderTarget9 *colorRenderTarget,
>+                                    const RenderTarget9 *depthStencilRenderTarget);
>+    void applyUniforms(ProgramD3D *programD3D);
>+    bool applyPrimitiveType(gl::PrimitiveMode primitiveType,
>+                            GLsizei elementCount,
>+                            bool usesPointSize);
>+    angle::Result applyVertexBuffer(const gl::Context *context,
>+                                    gl::PrimitiveMode mode,
>+                                    GLint first,
>+                                    GLsizei count,
>+                                    GLsizei instances,
>+                                    TranslatedIndexData *indexInfo);
>+    angle::Result applyIndexBuffer(const gl::Context *context,
>+                                   const void *indices,
>+                                   GLsizei count,
>+                                   gl::PrimitiveMode mode,
>+                                   gl::DrawElementsType type,
>+                                   TranslatedIndexData *indexInfo);
>+
>+    void clear(const ClearParameters &clearParams,
>+               const RenderTarget9 *colorRenderTarget,
>+               const RenderTarget9 *depthStencilRenderTarget);
> 
>     void markAllStateDirty();
> 
>@@ -188,94 +191,103 @@ class Renderer9 : public RendererD3D
>     DWORD getCapsDeclTypes() const;
> 
>     // Pixel operations
>-    gl::Error copyImage2D(const gl::Context *context,
>-                          const gl::Framebuffer *framebuffer,
>-                          const gl::Rectangle &sourceRect,
>-                          GLenum destFormat,
>-                          const gl::Offset &destOffset,
>-                          TextureStorage *storage,
>-                          GLint level) override;
>-    gl::Error copyImageCube(const gl::Context *context,
>-                            const gl::Framebuffer *framebuffer,
>-                            const gl::Rectangle &sourceRect,
>-                            GLenum destFormat,
>-                            const gl::Offset &destOffset,
>-                            TextureStorage *storage,
>-                            GLenum target,
>-                            GLint level) override;
>-    gl::Error copyImage3D(const gl::Context *context,
>-                          const gl::Framebuffer *framebuffer,
>-                          const gl::Rectangle &sourceRect,
>-                          GLenum destFormat,
>-                          const gl::Offset &destOffset,
>-                          TextureStorage *storage,
>-                          GLint level) override;
>-    gl::Error copyImage2DArray(const gl::Context *context,
>-                               const gl::Framebuffer *framebuffer,
>-                               const gl::Rectangle &sourceRect,
>-                               GLenum destFormat,
>-                               const gl::Offset &destOffset,
>-                               TextureStorage *storage,
>-                               GLint level) override;
>-
>-    gl::Error copyTexture(const gl::Context *context,
>-                          const gl::Texture *source,
>-                          GLint sourceLevel,
>-                          const gl::Rectangle &sourceRect,
>-                          GLenum destFormat,
>-                          const gl::Offset &destOffset,
>-                          TextureStorage *storage,
>-                          GLenum destTarget,
>-                          GLint destLevel,
>-                          bool unpackFlipY,
>-                          bool unpackPremultiplyAlpha,
>-                          bool unpackUnmultiplyAlpha) override;
>-    gl::Error copyCompressedTexture(const gl::Context *context,
>-                                    const gl::Texture *source,
>-                                    GLint sourceLevel,
>-                                    TextureStorage *storage,
>-                                    GLint destLevel) override;
>+    angle::Result copyImage2D(const gl::Context *context,
>+                              const gl::Framebuffer *framebuffer,
>+                              const gl::Rectangle &sourceRect,
>+                              GLenum destFormat,
>+                              const gl::Offset &destOffset,
>+                              TextureStorage *storage,
>+                              GLint level) override;
>+    angle::Result copyImageCube(const gl::Context *context,
>+                                const gl::Framebuffer *framebuffer,
>+                                const gl::Rectangle &sourceRect,
>+                                GLenum destFormat,
>+                                const gl::Offset &destOffset,
>+                                TextureStorage *storage,
>+                                gl::TextureTarget target,
>+                                GLint level) override;
>+    angle::Result copyImage3D(const gl::Context *context,
>+                              const gl::Framebuffer *framebuffer,
>+                              const gl::Rectangle &sourceRect,
>+                              GLenum destFormat,
>+                              const gl::Offset &destOffset,
>+                              TextureStorage *storage,
>+                              GLint level) override;
>+    angle::Result copyImage2DArray(const gl::Context *context,
>+                                   const gl::Framebuffer *framebuffer,
>+                                   const gl::Rectangle &sourceRect,
>+                                   GLenum destFormat,
>+                                   const gl::Offset &destOffset,
>+                                   TextureStorage *storage,
>+                                   GLint level) override;
>+
>+    angle::Result copyTexture(const gl::Context *context,
>+                              const gl::Texture *source,
>+                              GLint sourceLevel,
>+                              gl::TextureTarget srcTarget,
>+                              const gl::Box &sourceBox,
>+                              GLenum destFormat,
>+                              GLenum destType,
>+                              const gl::Offset &destOffset,
>+                              TextureStorage *storage,
>+                              gl::TextureTarget destTarget,
>+                              GLint destLevel,
>+                              bool unpackFlipY,
>+                              bool unpackPremultiplyAlpha,
>+                              bool unpackUnmultiplyAlpha) override;
>+    angle::Result copyCompressedTexture(const gl::Context *context,
>+                                        const gl::Texture *source,
>+                                        GLint sourceLevel,
>+                                        TextureStorage *storage,
>+                                        GLint destLevel) override;
> 
>     // RenderTarget creation
>-    gl::Error createRenderTarget(int width,
>-                                 int height,
>-                                 GLenum format,
>-                                 GLsizei samples,
>-                                 RenderTargetD3D **outRT) override;
>-    gl::Error createRenderTargetCopy(RenderTargetD3D *source, RenderTargetD3D **outRT) override;
>+    angle::Result createRenderTarget(const gl::Context *context,
>+                                     int width,
>+                                     int height,
>+                                     GLenum format,
>+                                     GLsizei samples,
>+                                     RenderTargetD3D **outRT) override;
>+    angle::Result createRenderTargetCopy(const gl::Context *context,
>+                                         RenderTargetD3D *source,
>+                                         RenderTargetD3D **outRT) override;
> 
>     // Shader operations
>-    gl::Error loadExecutable(const uint8_t *function,
>-                             size_t length,
>-                             gl::ShaderType type,
>-                             const std::vector<D3DVarying> &streamOutVaryings,
>-                             bool separatedOutputBuffers,
>-                             ShaderExecutableD3D **outExecutable) override;
>-    gl::Error compileToExecutable(gl::InfoLog &infoLog,
>-                                  const std::string &shaderHLSL,
>-                                  gl::ShaderType type,
>-                                  const std::vector<D3DVarying> &streamOutVaryings,
>-                                  bool separatedOutputBuffers,
>-                                  const angle::CompilerWorkaroundsD3D &workarounds,
>-                                  ShaderExecutableD3D **outExectuable) override;
>-    gl::Error ensureHLSLCompilerInitialized() override;
>+    angle::Result loadExecutable(d3d::Context *context,
>+                                 const uint8_t *function,
>+                                 size_t length,
>+                                 gl::ShaderType type,
>+                                 const std::vector<D3DVarying> &streamOutVaryings,
>+                                 bool separatedOutputBuffers,
>+                                 ShaderExecutableD3D **outExecutable) override;
>+    angle::Result compileToExecutable(d3d::Context *context,
>+                                      gl::InfoLog &infoLog,
>+                                      const std::string &shaderHLSL,
>+                                      gl::ShaderType type,
>+                                      const std::vector<D3DVarying> &streamOutVaryings,
>+                                      bool separatedOutputBuffers,
>+                                      const angle::CompilerWorkaroundsD3D &workarounds,
>+                                      ShaderExecutableD3D **outExectuable) override;
>+    angle::Result ensureHLSLCompilerInitialized(d3d::Context *context) override;
> 
>     UniformStorageD3D *createUniformStorage(size_t storageSize) override;
> 
>     // Image operations
>     ImageD3D *createImage() override;
>-    gl::Error generateMipmap(const gl::Context *context, ImageD3D *dest, ImageD3D *source) override;
>-    gl::Error generateMipmapUsingD3D(const gl::Context *context,
>-                                     TextureStorage *storage,
>-                                     const gl::TextureState &textureState) override;
>-    gl::Error copyImage(const gl::Context *context,
>-                        ImageD3D *dest,
>-                        ImageD3D *source,
>-                        const gl::Rectangle &sourceRect,
>-                        const gl::Offset &destOffset,
>-                        bool unpackFlipY,
>-                        bool unpackPremultiplyAlpha,
>-                        bool unpackUnmultiplyAlpha) override;
>+    angle::Result generateMipmap(const gl::Context *context,
>+                                 ImageD3D *dest,
>+                                 ImageD3D *source) override;
>+    angle::Result generateMipmapUsingD3D(const gl::Context *context,
>+                                         TextureStorage *storage,
>+                                         const gl::TextureState &textureState) override;
>+    angle::Result copyImage(const gl::Context *context,
>+                            ImageD3D *dest,
>+                            ImageD3D *source,
>+                            const gl::Box &sourceBox,
>+                            const gl::Offset &destOffset,
>+                            bool unpackFlipY,
>+                            bool unpackPremultiplyAlpha,
>+                            bool unpackUnmultiplyAlpha) override;
>     TextureStorage *createTextureStorage2D(SwapChainD3D *swapChain) override;
>     TextureStorage *createTextureStorageEGLImage(EGLImageD3D *eglImage,
>                                                  RenderTargetD3D *renderTargetD3D) override;
>@@ -312,67 +324,75 @@ class Renderer9 : public RendererD3D
>                                                       int levels,
>                                                       int samples,
>                                                       bool fixedSampleLocations) override;
>+    TextureStorage *createTextureStorage2DMultisampleArray(GLenum internalformat,
>+                                                           GLsizei width,
>+                                                           GLsizei height,
>+                                                           GLsizei depth,
>+                                                           int levels,
>+                                                           int samples,
>+                                                           bool fixedSampleLocations) override;
> 
>     // Buffer creation
>     VertexBuffer *createVertexBuffer() override;
>     IndexBuffer *createIndexBuffer() override;
> 
>     // Stream Creation
>-    StreamProducerImpl *createStreamProducerD3DTextureNV12(
>-        egl::Stream::ConsumerType consumerType,
>-        const egl::AttributeMap &attribs) override;
>+    StreamProducerImpl *createStreamProducerD3DTexture(egl::Stream::ConsumerType consumerType,
>+                                                       const egl::AttributeMap &attribs) override;
> 
>     // Buffer-to-texture and Texture-to-buffer copies
>     bool supportsFastCopyBufferToTexture(GLenum internalFormat) const override;
>-    gl::Error fastCopyBufferToTexture(const gl::Context *context,
>-                                      const gl::PixelUnpackState &unpack,
>-                                      unsigned int offset,
>-                                      RenderTargetD3D *destRenderTarget,
>-                                      GLenum destinationFormat,
>-                                      GLenum sourcePixelsType,
>-                                      const gl::Box &destArea) override;
>+    angle::Result fastCopyBufferToTexture(const gl::Context *context,
>+                                          const gl::PixelUnpackState &unpack,
>+                                          unsigned int offset,
>+                                          RenderTargetD3D *destRenderTarget,
>+                                          GLenum destinationFormat,
>+                                          GLenum sourcePixelsType,
>+                                          const gl::Box &destArea) override;
> 
>     // D3D9-renderer specific methods
>-    gl::Error boxFilter(IDirect3DSurface9 *source, IDirect3DSurface9 *dest);
>+    angle::Result boxFilter(Context9 *context9, IDirect3DSurface9 *source, IDirect3DSurface9 *dest);
> 
>     D3DPOOL getTexturePool(DWORD usage) const;
> 
>     bool getLUID(LUID *adapterLuid) const override;
>-    VertexConversionType getVertexConversionType(
>-        gl::VertexFormatType vertexFormatType) const override;
>-    GLenum getVertexComponentType(gl::VertexFormatType vertexFormatType) const override;
>+    VertexConversionType getVertexConversionType(angle::FormatID vertexFormatID) const override;
>+    GLenum getVertexComponentType(angle::FormatID vertexFormatID) const override;
> 
>     // Warning: you should ensure binding really matches attrib.bindingIndex before using this
>     // function.
>-    gl::ErrorOrResult<unsigned int> getVertexSpaceRequired(const gl::VertexAttribute &attrib,
>-                                                           const gl::VertexBinding &binding,
>-                                                           GLsizei count,
>-                                                           GLsizei instances) const override;
>-
>-    gl::Error copyToRenderTarget(IDirect3DSurface9 *dest,
>-                                 IDirect3DSurface9 *source,
>-                                 bool fromManaged);
>+    angle::Result getVertexSpaceRequired(const gl::Context *context,
>+                                         const gl::VertexAttribute &attrib,
>+                                         const gl::VertexBinding &binding,
>+                                         size_t count,
>+                                         GLsizei instances,
>+                                         unsigned int *bytesRequiredOut) const override;
>+
>+    angle::Result copyToRenderTarget(const gl::Context *context,
>+                                     IDirect3DSurface9 *dest,
>+                                     IDirect3DSurface9 *source,
>+                                     bool fromManaged);
> 
>     RendererClass getRendererClass() const override;
> 
>     D3DDEVTYPE getD3D9DeviceType() const { return mDeviceType; }
> 
>-    egl::Error getEGLDevice(DeviceImpl **device) override;
>+    DeviceImpl *createEGLDevice() override;
> 
>     StateManager9 *getStateManager() { return &mStateManager; }
> 
>-    gl::Error genericDrawArrays(const gl::Context *context,
>-                                GLenum mode,
>-                                GLint first,
>-                                GLsizei count,
>-                                GLsizei instances);
>+    angle::Result genericDrawArrays(const gl::Context *context,
>+                                    gl::PrimitiveMode mode,
>+                                    GLint first,
>+                                    GLsizei count,
>+                                    GLsizei instances);
> 
>-    gl::Error genericDrawElements(const gl::Context *context,
>-                                  GLenum mode,
>-                                  GLsizei count,
>-                                  GLenum type,
>-                                  const void *indices,
>-                                  GLsizei instances);
>+    angle::Result genericDrawElements(const gl::Context *context,
>+                                      gl::PrimitiveMode mode,
>+                                      GLsizei count,
>+                                      gl::DrawElementsType type,
>+                                      const void *indices,
>+                                      GLsizei instances);
> 
>     // Necessary hack for default framebuffers in D3D.
>     FramebufferImpl *createDefaultFramebuffer(const gl::FramebufferState &state) override;
>@@ -381,30 +401,37 @@ class Renderer9 : public RendererD3D
> 
>     gl::Version getMaxSupportedESVersion() const override;
> 
>-    gl::Error clearRenderTarget(RenderTargetD3D *renderTarget,
>-                                const gl::ColorF &clearColorValue,
>-                                const float clearDepthValue,
>-                                const unsigned int clearStencilValue) override;
>+    angle::Result clearRenderTarget(const gl::Context *context,
>+                                    RenderTargetD3D *renderTarget,
>+                                    const gl::ColorF &clearColorValue,
>+                                    const float clearDepthValue,
>+                                    const unsigned int clearStencilValue) override;
> 
>     bool canSelectViewInVertexShader() const override;
> 
>-  private:
>-    gl::Error drawArraysImpl(const gl::Context *context,
>-                             GLenum mode,
>-                             GLint startVertex,
>-                             GLsizei count,
>-                             GLsizei instances);
>-    gl::Error drawElementsImpl(const gl::Context *context,
>-                               GLenum mode,
>-                               GLsizei count,
>-                               GLenum type,
>-                               const void *indices,
>-                               GLsizei instances);
>+    angle::Result getIncompleteTexture(const gl::Context *context,
>+                                       gl::TextureType type,
>+                                       gl::Texture **textureOut) override;
> 
>-    gl::Error applyShaders(const gl::Context *context, GLenum drawMode);
>+    angle::Result ensureVertexDataManagerInitialized(const gl::Context *context);
> 
>-    gl::Error applyTextures(const gl::Context *context);
>-    gl::Error applyTextures(const gl::Context *context, gl::SamplerType shaderType);
>+  private:
>+    angle::Result drawArraysImpl(const gl::Context *context,
>+                                 gl::PrimitiveMode mode,
>+                                 GLint startVertex,
>+                                 GLsizei count,
>+                                 GLsizei instances);
>+    angle::Result drawElementsImpl(const gl::Context *context,
>+                                   gl::PrimitiveMode mode,
>+                                   GLsizei count,
>+                                   gl::DrawElementsType type,
>+                                   const void *indices,
>+                                   GLsizei instances);
>+
>+    angle::Result applyShaders(const gl::Context *context, gl::PrimitiveMode drawMode);
>+
>+    angle::Result applyTextures(const gl::Context *context);
>+    angle::Result applyTextures(const gl::Context *context, gl::ShaderType shaderType);
> 
>     void generateCaps(gl::Caps *outCaps,
>                       gl::TextureCapsMap *outTextureCaps,
>@@ -413,7 +440,7 @@ class Renderer9 : public RendererD3D
> 
>     angle::WorkaroundsD3D generateWorkarounds() const override;
> 
>-    gl::Error setBlendDepthRasterStates(const gl::Context *context, GLenum drawMode);
>+    angle::Result setBlendDepthRasterStates(const gl::Context *context, gl::PrimitiveMode drawMode);
> 
>     void release();
> 
>@@ -421,24 +448,26 @@ class Renderer9 : public RendererD3D
>     void applyUniformniv(const D3DUniform *targetUniform, const GLint *v);
>     void applyUniformnbv(const D3DUniform *targetUniform, const GLint *v);
> 
>-    gl::Error drawLineLoop(const gl::Context *context,
>-                           GLsizei count,
>-                           GLenum type,
>-                           const void *indices,
>-                           int minIndex,
>-                           gl::Buffer *elementArrayBuffer);
>-    gl::Error drawIndexedPoints(const gl::Context *context,
>-                                GLsizei count,
>-                                GLenum type,
>-                                const void *indices,
>-                                int minIndex,
>-                                gl::Buffer *elementArrayBuffer);
>-
>-    gl::Error getCountingIB(size_t count, StaticIndexBufferInterface **outIB);
>-
>-    gl::Error getNullColorbuffer(const gl::Context *context,
>-                                 const gl::FramebufferAttachment *depthbuffer,
>-                                 const gl::FramebufferAttachment **outColorBuffer);
>+    angle::Result drawLineLoop(const gl::Context *context,
>+                               GLsizei count,
>+                               gl::DrawElementsType type,
>+                               const void *indices,
>+                               int minIndex,
>+                               gl::Buffer *elementArrayBuffer);
>+    angle::Result drawIndexedPoints(const gl::Context *context,
>+                                    GLsizei count,
>+                                    gl::DrawElementsType type,
>+                                    const void *indices,
>+                                    int minIndex,
>+                                    gl::Buffer *elementArrayBuffer);
>+
>+    angle::Result getCountingIB(const gl::Context *context,
>+                                size_t count,
>+                                StaticIndexBufferInterface **outIB);
>+
>+    angle::Result getNullColorRenderTarget(const gl::Context *context,
>+                                           const RenderTarget9 *depthRenderTarget,
>+                                           const RenderTarget9 **outColorRenderTarget);
> 
>     D3DPOOL getBufferPool(DWORD usage) const;
> 
>@@ -523,16 +552,18 @@ class Renderer9 : public RendererD3D
>     {
>         NUM_NULL_COLORBUFFER_CACHE_ENTRIES = 12
>     };
>-    struct NullColorbufferCacheEntry
>+    struct NullRenderTargetCacheEntry
>     {
>         UINT lruCount;
>         int width;
>         int height;
>-        gl::FramebufferAttachment *buffer;
>-    } mNullColorbufferCache[NUM_NULL_COLORBUFFER_CACHE_ENTRIES];
>+        RenderTarget9 *renderTarget;
>+    };
>+
>+    std::array<NullRenderTargetCacheEntry, NUM_NULL_COLORBUFFER_CACHE_ENTRIES>
>+        mNullRenderTargetCache;
>     UINT mMaxNullColorbufferLRU;
> 
>-    DeviceD3D *mEGLDevice;
>     std::vector<TranslatedAttribute> mTranslatedAttribCache;
> 
>     DebugAnnotator9 mAnnotator;
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/ShaderCache.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/ShaderCache.h
>index 399770dd8d1..c5859568afd 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/ShaderCache.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/ShaderCache.h
>@@ -13,10 +13,12 @@
> #include "libANGLE/Error.h"
> 
> #include "common/debug.h"
>+#include "libANGLE/renderer/d3d/d3d9/Context9.h"
> 
> #include <cstddef>
>-#include <unordered_map>
>+#include <mutex>
> #include <string>
>+#include <unordered_map>
> 
> namespace rx
> {
>@@ -32,28 +34,27 @@ class ShaderCache : angle::NonCopyable
>         ASSERT(mMap.empty());
>     }
> 
>-    void initialize(IDirect3DDevice9* device)
>-    {
>-        mDevice = device;
>-    }
>+    void initialize(IDirect3DDevice9 *device) { mDevice = device; }
> 
>-    gl::Error create(const DWORD *function, size_t length, ShaderObject **outShaderObject)
>+    angle::Result create(Context9 *context9,
>+                         const DWORD *function,
>+                         size_t length,
>+                         ShaderObject **outShaderObject)
>     {
>-        std::string key(reinterpret_cast<const char*>(function), length);
>+        std::lock_guard<std::mutex> lock(mMutex);
>+
>+        std::string key(reinterpret_cast<const char *>(function), length);
>         typename Map::iterator it = mMap.find(key);
>         if (it != mMap.end())
>         {
>             it->second->AddRef();
>             *outShaderObject = it->second;
>-            return gl::NoError();
>+            return angle::Result::Continue;
>         }
> 
>         ShaderObject *shader;
>         HRESULT result = createShader(function, &shader);
>-        if (FAILED(result))
>-        {
>-            return gl::OutOfMemory() << "Failed to create shader, " << gl::FmtHR(result);
>-        }
>+        ANGLE_TRY_HR(context9, result, "Failed to create shader");
> 
>         // Random eviction policy.
>         if (mMap.size() >= kMaxMapSize)
>@@ -66,11 +67,13 @@ class ShaderCache : angle::NonCopyable
>         mMap[key] = shader;
> 
>         *outShaderObject = shader;
>-        return gl::NoError();
>+        return angle::Result::Continue;
>     }
> 
>     void clear()
>     {
>+        std::lock_guard<std::mutex> lock(mMutex);
>+
>         for (typename Map::iterator it = mMap.begin(); it != mMap.end(); ++it)
>         {
>             SafeRelease(it->second);
>@@ -92,8 +95,9 @@ class ShaderCache : angle::NonCopyable
>         return mDevice->CreatePixelShader(function, shader);
>     }
> 
>-    typedef std::unordered_map<std::string, ShaderObject*> Map;
>+    typedef std::unordered_map<std::string, ShaderObject *> Map;
>     Map mMap;
>+    std::mutex mMutex;
> 
>     IDirect3DDevice9 *mDevice;
> };
>@@ -101,6 +105,6 @@ class ShaderCache : angle::NonCopyable
> typedef ShaderCache<IDirect3DVertexShader9> VertexShaderCache;
> typedef ShaderCache<IDirect3DPixelShader9> PixelShaderCache;
> 
>-}
>+}  // namespace rx
> 
>-#endif   // LIBANGLE_RENDERER_D3D_D3D9_SHADERCACHE_H_
>+#endif  // LIBANGLE_RENDERER_D3D_D3D9_SHADERCACHE_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/ShaderExecutable9.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/ShaderExecutable9.cpp
>index 362c6c60a3b..c9e8e73ed6a 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/ShaderExecutable9.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/ShaderExecutable9.cpp
>@@ -14,14 +14,18 @@
> namespace rx
> {
> 
>-ShaderExecutable9::ShaderExecutable9(const void *function, size_t length, IDirect3DPixelShader9 *executable)
>+ShaderExecutable9::ShaderExecutable9(const void *function,
>+                                     size_t length,
>+                                     IDirect3DPixelShader9 *executable)
>     : ShaderExecutableD3D(function, length)
> {
>-    mPixelExecutable = executable;
>+    mPixelExecutable  = executable;
>     mVertexExecutable = nullptr;
> }
> 
>-ShaderExecutable9::ShaderExecutable9(const void *function, size_t length, IDirect3DVertexShader9 *executable)
>+ShaderExecutable9::ShaderExecutable9(const void *function,
>+                                     size_t length,
>+                                     IDirect3DVertexShader9 *executable)
>     : ShaderExecutableD3D(function, length)
> {
>     mVertexExecutable = executable;
>@@ -44,4 +48,4 @@ IDirect3DPixelShader9 *ShaderExecutable9::getPixelShader() const
>     return mPixelExecutable;
> }
> 
>-}
>+}  // namespace rx
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/ShaderExecutable9.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/ShaderExecutable9.h
>index 0b6b87947ec..599a1668704 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/ShaderExecutable9.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/ShaderExecutable9.h
>@@ -30,6 +30,6 @@ class ShaderExecutable9 : public ShaderExecutableD3D
>     IDirect3DVertexShader9 *mVertexExecutable;
> };
> 
>-}
>+}  // namespace rx
> 
>-#endif // LIBANGLE_RENDERER_D3D_D3D9_SHADEREXECUTABLE9_H_
>+#endif  // LIBANGLE_RENDERER_D3D_D3D9_SHADEREXECUTABLE9_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/StateManager9.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/StateManager9.cpp
>index a3bdc14efb3..2b05119c452 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/StateManager9.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/StateManager9.cpp
>@@ -10,9 +10,9 @@
> #include "common/bitset_utils.h"
> #include "common/utilities.h"
> #include "libANGLE/formatutils.h"
>-#include "libANGLE/renderer/d3d/d3d9/renderer9_utils.h"
> #include "libANGLE/renderer/d3d/d3d9/Framebuffer9.h"
> #include "libANGLE/renderer/d3d/d3d9/Renderer9.h"
>+#include "libANGLE/renderer/d3d/d3d9/renderer9_utils.h"
> 
> namespace rx
> {
>@@ -64,9 +64,7 @@ StateManager9::StateManager9(Renderer9 *renderer9)
>     mScissorStateDirtyBits.set(DIRTY_BIT_SCISSOR_RECT);
> }
> 
>-StateManager9::~StateManager9()
>-{
>-}
>+StateManager9::~StateManager9() {}
> 
> void StateManager9::initialize()
> {
>@@ -250,6 +248,7 @@ void StateManager9::syncState(const gl::State &state, const gl::State::DirtyBits
>                 {
>                     mDirtyBits.set(DIRTY_BIT_DEPTH_BIAS);
>                 }
>+                break;
>             }
>             case gl::State::DIRTY_BIT_DEPTH_MASK:
>                 if (state.getDepthStencilState().depthMask != mCurDepthStencilState.depthMask)
>@@ -376,8 +375,7 @@ void StateManager9::syncState(const gl::State &state, const gl::State::DirtyBits
>     }
> }
> 
>-gl::Error StateManager9::setBlendDepthRasterStates(const gl::State &glState,
>-                                                   unsigned int sampleMask)
>+void StateManager9::setBlendDepthRasterStates(const gl::State &glState, unsigned int sampleMask)
> {
>     const gl::Framebuffer *framebuffer = glState.getDrawFramebuffer();
> 
>@@ -469,14 +467,12 @@ gl::Error StateManager9::setBlendDepthRasterStates(const gl::State &glState,
>     {
>         setSampleMask(sampleMask);
>     }
>-
>-    return gl::NoError();
> }
> 
> void StateManager9::setViewportState(const gl::Rectangle &viewport,
>                                      float zNear,
>                                      float zFar,
>-                                     GLenum drawMode,
>+                                     gl::PrimitiveMode drawMode,
>                                      GLenum frontFace,
>                                      bool ignoreViewport)
> {
>@@ -610,7 +606,7 @@ void StateManager9::setScissorRect(const gl::Rectangle &scissor, bool enabled)
> 
>     RECT rect;
>     rect.left = gl::clamp(scissor.x, 0, static_cast<int>(mRenderTargetBounds.width));
>-    rect.top = gl::clamp(scissor.y, 0, static_cast<int>(mRenderTargetBounds.height));
>+    rect.top  = gl::clamp(scissor.y, 0, static_cast<int>(mRenderTargetBounds.height));
>     rect.right =
>         gl::clamp(scissor.x + scissor.width, 0, static_cast<int>(mRenderTargetBounds.width));
>     rect.bottom =
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/StateManager9.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/StateManager9.h
>index 63ce17cb1e7..2457303731a 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/StateManager9.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/StateManager9.h
>@@ -9,9 +9,8 @@
> #ifndef LIBANGLE_RENDERER_D3D9_STATEMANAGER9_H_
> #define LIBANGLE_RENDERER_D3D9_STATEMANAGER9_H_
> 
>-#include "libANGLE/angletypes.h"
>-#include "libANGLE/ContextState.h"
> #include "libANGLE/State.h"
>+#include "libANGLE/angletypes.h"
> #include "libANGLE/renderer/d3d/RendererD3D.h"
> 
> namespace rx
>@@ -43,12 +42,12 @@ class StateManager9 final : angle::NonCopyable
> 
>     void syncState(const gl::State &state, const gl::State::DirtyBits &dirtyBits);
> 
>-    gl::Error setBlendDepthRasterStates(const gl::State &glState, unsigned int sampleMask);
>+    void setBlendDepthRasterStates(const gl::State &glState, unsigned int sampleMask);
>     void setScissorState(const gl::Rectangle &scissor, bool enabled);
>     void setViewportState(const gl::Rectangle &viewport,
>                           float zNear,
>                           float zFar,
>-                          GLenum drawMode,
>+                          gl::PrimitiveMode drawMode,
>                           GLenum frontFace,
>                           bool ignoreViewport);
> 
>@@ -69,6 +68,7 @@ class StateManager9 final : angle::NonCopyable
>     int getRenderTargetWidth() const { return mRenderTargetBounds.width; }
>     int getRenderTargetHeight() const { return mRenderTargetBounds.height; }
> 
>+    void setAllDirtyBits() { mDirtyBits.set(); }
>     void resetDirtyBits() { mDirtyBits.reset(); }
> 
>   private:
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/SwapChain9.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/SwapChain9.cpp
>index bc81aa18ece..c51336cf983 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/SwapChain9.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/SwapChain9.cpp
>@@ -9,9 +9,9 @@
> #include "libANGLE/renderer/d3d/d3d9/SwapChain9.h"
> 
> #include "libANGLE/features.h"
>-#include "libANGLE/renderer/d3d/d3d9/formatutils9.h"
> #include "libANGLE/renderer/d3d/d3d9/NativeWindow9.h"
> #include "libANGLE/renderer/d3d/d3d9/Renderer9.h"
>+#include "libANGLE/renderer/d3d/d3d9/formatutils9.h"
> #include "libANGLE/renderer/d3d/d3d9/renderer9_utils.h"
> 
> namespace rx
>@@ -65,27 +65,33 @@ static DWORD convertInterval(EGLint interval)
> #if ANGLE_VSYNC == ANGLE_DISABLED
>     return D3DPRESENT_INTERVAL_IMMEDIATE;
> #else
>-    switch(interval)
>+    switch (interval)
>     {
>-      case 0: return D3DPRESENT_INTERVAL_IMMEDIATE;
>-      case 1: return D3DPRESENT_INTERVAL_ONE;
>-      case 2: return D3DPRESENT_INTERVAL_TWO;
>-      case 3: return D3DPRESENT_INTERVAL_THREE;
>-      case 4: return D3DPRESENT_INTERVAL_FOUR;
>-      default: UNREACHABLE();
>+        case 0:
>+            return D3DPRESENT_INTERVAL_IMMEDIATE;
>+        case 1:
>+            return D3DPRESENT_INTERVAL_ONE;
>+        case 2:
>+            return D3DPRESENT_INTERVAL_TWO;
>+        case 3:
>+            return D3DPRESENT_INTERVAL_THREE;
>+        case 4:
>+            return D3DPRESENT_INTERVAL_FOUR;
>+        default:
>+            UNREACHABLE();
>     }
> 
>     return D3DPRESENT_INTERVAL_DEFAULT;
> #endif
> }
> 
>-EGLint SwapChain9::resize(const gl::Context *context, int backbufferWidth, int backbufferHeight)
>+EGLint SwapChain9::resize(DisplayD3D *displayD3D, int backbufferWidth, int backbufferHeight)
> {
>     // D3D9 does not support resizing swap chains without recreating them
>-    return reset(context, backbufferWidth, backbufferHeight, mSwapInterval);
>+    return reset(displayD3D, backbufferWidth, backbufferHeight, mSwapInterval);
> }
> 
>-EGLint SwapChain9::reset(const gl::Context *context,
>+EGLint SwapChain9::reset(DisplayD3D *displayD3D,
>                          int backbufferWidth,
>                          int backbufferHeight,
>                          EGLint swapInterval)
>@@ -151,11 +157,7 @@ EGLint SwapChain9::reset(const gl::Context *context,
> 
>     if (oldRenderTarget)
>     {
>-        RECT rect =
>-        {
>-            0, 0,
>-            mWidth, mHeight
>-        };
>+        RECT rect = {0, 0, mWidth, mHeight};
> 
>         if (rect.right > static_cast<LONG>(backbufferWidth))
>         {
>@@ -175,36 +177,39 @@ EGLint SwapChain9::reset(const gl::Context *context,
>         SafeRelease(oldRenderTarget);
>     }
> 
>-    const d3d9::TextureFormat &depthBufferd3dFormatInfo = d3d9::GetTextureFormatInfo(mDepthBufferFormat);
>+    const d3d9::TextureFormat &depthBufferd3dFormatInfo =
>+        d3d9::GetTextureFormatInfo(mDepthBufferFormat);
> 
>     // Don't create a swapchain for NULLREF devices
>-    D3DDEVTYPE deviceType = mRenderer->getD3D9DeviceType();
>+    D3DDEVTYPE deviceType      = mRenderer->getD3D9DeviceType();
>     EGLNativeWindowType window = mNativeWindow->getNativeWindow();
>     if (window && deviceType != D3DDEVTYPE_NULLREF)
>     {
>-        D3DPRESENT_PARAMETERS presentParameters = {0};
>+        D3DPRESENT_PARAMETERS presentParameters  = {0};
>         presentParameters.AutoDepthStencilFormat = depthBufferd3dFormatInfo.renderFormat;
>-        presentParameters.BackBufferCount = 1;
>-        presentParameters.BackBufferFormat = backBufferd3dFormatInfo.renderFormat;
>+        presentParameters.BackBufferCount        = 1;
>+        presentParameters.BackBufferFormat       = backBufferd3dFormatInfo.renderFormat;
>         presentParameters.EnableAutoDepthStencil = FALSE;
>-        presentParameters.Flags = 0;
>-        presentParameters.hDeviceWindow = window;
>-        presentParameters.MultiSampleQuality = 0;                  // FIXME: Unimplemented
>-        presentParameters.MultiSampleType = D3DMULTISAMPLE_NONE;   // FIXME: Unimplemented
>-        presentParameters.PresentationInterval = convertInterval(swapInterval);
>-        presentParameters.SwapEffect = D3DSWAPEFFECT_DISCARD;
>-        presentParameters.Windowed = TRUE;
>-        presentParameters.BackBufferWidth = backbufferWidth;
>-        presentParameters.BackBufferHeight = backbufferHeight;
>+        presentParameters.Flags                  = 0;
>+        presentParameters.hDeviceWindow          = window;
>+        presentParameters.MultiSampleQuality     = 0;                    // FIXME: Unimplemented
>+        presentParameters.MultiSampleType        = D3DMULTISAMPLE_NONE;  // FIXME: Unimplemented
>+        presentParameters.PresentationInterval   = convertInterval(swapInterval);
>+        presentParameters.SwapEffect             = D3DSWAPEFFECT_DISCARD;
>+        presentParameters.Windowed               = TRUE;
>+        presentParameters.BackBufferWidth        = backbufferWidth;
>+        presentParameters.BackBufferHeight       = backbufferHeight;
> 
>         // http://crbug.com/140239
>         // http://crbug.com/143434
>         //
>-        // Some AMD/Intel switchable systems / drivers appear to round swap chain surfaces to a multiple of 64 pixels in width
>-        // when using the integrated Intel. This rounds the width up rather than down.
>+        // Some AMD/Intel switchable systems / drivers appear to round swap chain surfaces to a
>+        // multiple of 64 pixels in width when using the integrated Intel. This rounds the width up
>+        // rather than down.
>         //
>-        // Some non-switchable AMD GPUs / drivers do not respect the source rectangle to Present. Therefore, when the vendor ID
>-        // is not Intel, the back buffer width must be exactly the same width as the window or horizontal scaling will occur.
>+        // Some non-switchable AMD GPUs / drivers do not respect the source rectangle to Present.
>+        // Therefore, when the vendor ID is not Intel, the back buffer width must be exactly the
>+        // same width as the window or horizontal scaling will occur.
>         if (IsIntel(mRenderer->getVendorId()))
>         {
>             presentParameters.BackBufferWidth = (presentParameters.BackBufferWidth + 63) / 64 * 64;
>@@ -214,7 +219,8 @@ EGLint SwapChain9::reset(const gl::Context *context,
> 
>         if (FAILED(result))
>         {
>-            ASSERT(result == D3DERR_OUTOFVIDEOMEMORY || result == E_OUTOFMEMORY || result == D3DERR_INVALIDCALL || result == D3DERR_DEVICELOST);
>+            ASSERT(result == D3DERR_OUTOFVIDEOMEMORY || result == E_OUTOFMEMORY ||
>+                   result == D3DERR_INVALIDCALL || result == D3DERR_DEVICELOST);
> 
>             ERR() << "Could not create additional swap chains or offscreen surfaces, "
>                   << gl::FmtHR(result);
>@@ -243,7 +249,8 @@ EGLint SwapChain9::reset(const gl::Context *context,
> 
>         if (FAILED(result))
>         {
>-            ASSERT(result == D3DERR_OUTOFVIDEOMEMORY || result == E_OUTOFMEMORY || result == D3DERR_INVALIDCALL);
>+            ASSERT(result == D3DERR_OUTOFVIDEOMEMORY || result == E_OUTOFMEMORY ||
>+                   result == D3DERR_INVALIDCALL);
> 
>             ERR() << "Could not create depthstencil surface for new swap chain, "
>                   << gl::FmtHR(result);
>@@ -260,19 +267,15 @@ EGLint SwapChain9::reset(const gl::Context *context,
>         }
>     }
> 
>-    mWidth = backbufferWidth;
>-    mHeight = backbufferHeight;
>+    mWidth        = backbufferWidth;
>+    mHeight       = backbufferHeight;
>     mSwapInterval = swapInterval;
> 
>     return EGL_SUCCESS;
> }
> 
> // parameters should be validated/clamped by caller
>-EGLint SwapChain9::swapRect(const gl::Context *context,
>-                            EGLint x,
>-                            EGLint y,
>-                            EGLint width,
>-                            EGLint height)
>+EGLint SwapChain9::swapRect(DisplayD3D *displayD3D, EGLint x, EGLint y, EGLint width, EGLint height)
> {
>     if (!mSwapChain)
>     {
>@@ -289,7 +292,9 @@ EGLint SwapChain9::swapRect(const gl::Context *context,
>     device->SetRenderState(D3DRS_CULLMODE, D3DCULL_NONE);
>     device->SetRenderState(D3DRS_STENCILENABLE, FALSE);
>     device->SetRenderState(D3DRS_CLIPPLANEENABLE, 0);
>-    device->SetRenderState(D3DRS_COLORWRITEENABLE, D3DCOLORWRITEENABLE_ALPHA | D3DCOLORWRITEENABLE_BLUE | D3DCOLORWRITEENABLE_GREEN | D3DCOLORWRITEENABLE_RED);
>+    device->SetRenderState(D3DRS_COLORWRITEENABLE,
>+                           D3DCOLORWRITEENABLE_ALPHA | D3DCOLORWRITEENABLE_BLUE |
>+                               D3DCOLORWRITEENABLE_GREEN | D3DCOLORWRITEENABLE_RED);
>     device->SetRenderState(D3DRS_SRGBWRITEENABLE, FALSE);
>     device->SetRenderState(D3DRS_SCISSORTESTENABLE, FALSE);
>     device->SetPixelShader(nullptr);
>@@ -313,7 +318,8 @@ EGLint SwapChain9::swapRect(const gl::Context *context,
>         device->SetStreamSourceFreq(streamIndex, 1);
>     }
> 
>-    D3DVIEWPORT9 viewport = {0, 0, static_cast<DWORD>(mWidth), static_cast<DWORD>(mHeight), 0.0f, 1.0f};
>+    D3DVIEWPORT9 viewport = {0,    0,   static_cast<DWORD>(mWidth), static_cast<DWORD>(mHeight),
>+                             0.0f, 1.0f};
>     device->SetViewport(&viewport);
> 
>     float x1 = x - 0.5f;
>@@ -329,7 +335,7 @@ EGLint SwapChain9::swapRect(const gl::Context *context,
>     float quad[4][6] = {{x1, y1, 0.0f, 1.0f, u1, v2},
>                         {x2, y1, 0.0f, 1.0f, u2, v2},
>                         {x2, y2, 0.0f, 1.0f, u2, v1},
>-                        {x1, y2, 0.0f, 1.0f, u1, v1}};   // x, y, z, rhw, u, v
>+                        {x1, y2, 0.0f, 1.0f, u1, v1}};  // x, y, z, rhw, u, v
> 
>     mRenderer->startScene();
>     device->DrawPrimitiveUP(D3DPT_TRIANGLEFAN, 2, quad, 6 * sizeof(float));
>@@ -337,24 +343,23 @@ EGLint SwapChain9::swapRect(const gl::Context *context,
> 
>     device->SetTexture(0, nullptr);
> 
>-    RECT rect =
>-    {
>-        static_cast<LONG>(x), static_cast<LONG>(mHeight - y - height),
>-        static_cast<LONG>(x + width), static_cast<LONG>(mHeight - y)
>-    };
>+    RECT rect = {static_cast<LONG>(x), static_cast<LONG>(mHeight - y - height),
>+                 static_cast<LONG>(x + width), static_cast<LONG>(mHeight - y)};
> 
>     HRESULT result = mSwapChain->Present(&rect, &rect, nullptr, nullptr, 0);
> 
>     mRenderer->markAllStateDirty();
> 
>-    if (result == D3DERR_OUTOFVIDEOMEMORY || result == E_OUTOFMEMORY || result == D3DERR_DRIVERINTERNALERROR)
>+    if (result == D3DERR_OUTOFVIDEOMEMORY || result == E_OUTOFMEMORY ||
>+        result == D3DERR_DRIVERINTERNALERROR)
>     {
>         return EGL_BAD_ALLOC;
>     }
> 
>-    // On Windows 8 systems, IDirect3DSwapChain9::Present sometimes returns 0x88760873 when the windows is
>-    // in the process of entering/exiting fullscreen. This code doesn't seem to have any documentation.  The
>-    // device appears to be ok after emitting this error so simply return a failure to swap.
>+    // On Windows 8 systems, IDirect3DSwapChain9::Present sometimes returns 0x88760873 when the
>+    // windows is in the process of entering/exiting fullscreen. This code doesn't seem to have any
>+    // documentation.  The device appears to be ok after emitting this error so simply return a
>+    // failure to swap.
>     if (result == static_cast<HRESULT>(0x88760873))
>     {
>         return EGL_BAD_MATCH;
>@@ -464,4 +469,4 @@ RenderTargetD3D *SwapChain9::getDepthStencilRenderTarget()
> {
>     return &mDepthStencilRenderTarget;
> }
>-}
>+}  // namespace rx
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/SwapChain9.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/SwapChain9.h
>index 5753637c476..c4c9843a749 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/SwapChain9.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/SwapChain9.h
>@@ -30,13 +30,12 @@ class SwapChain9 : public SwapChainD3D
>                EGLint orientation);
>     ~SwapChain9() override;
> 
>-    EGLint resize(const gl::Context *context, EGLint backbufferWidth, EGLint backbufferHeight)
>-        override;
>-    EGLint reset(const gl::Context *context,
>+    EGLint resize(DisplayD3D *displayD3D, EGLint backbufferWidth, EGLint backbufferHeight) override;
>+    EGLint reset(DisplayD3D *displayD3D,
>                  EGLint backbufferWidth,
>                  EGLint backbufferHeight,
>                  EGLint swapInterval) override;
>-    EGLint swapRect(const gl::Context *context,
>+    EGLint swapRect(DisplayD3D *displayD3D,
>                     EGLint x,
>                     EGLint y,
>                     EGLint width,
>@@ -71,11 +70,11 @@ class SwapChain9 : public SwapChainD3D
>     IDirect3DSurface9 *mBackBuffer;
>     IDirect3DSurface9 *mRenderTarget;
>     IDirect3DSurface9 *mDepthStencil;
>-    IDirect3DTexture9* mOffscreenTexture;
>+    IDirect3DTexture9 *mOffscreenTexture;
> 
>     SurfaceRenderTarget9 mColorRenderTarget;
>     SurfaceRenderTarget9 mDepthStencilRenderTarget;
> };
> 
>-}
>-#endif // LIBANGLE_RENDERER_D3D_D3D9_SWAPCHAIN9_H_
>+}  // namespace rx
>+#endif  // LIBANGLE_RENDERER_D3D_D3D9_SWAPCHAIN9_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/TextureStorage9.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/TextureStorage9.cpp
>index 6404af6bbab..fabb773dc04 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/TextureStorage9.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/TextureStorage9.cpp
>@@ -10,15 +10,17 @@
> 
> #include "libANGLE/renderer/d3d/d3d9/TextureStorage9.h"
> 
>-#include "libANGLE/formatutils.h"
>+#include "common/utilities.h"
>+#include "libANGLE/Context.h"
> #include "libANGLE/Texture.h"
>+#include "libANGLE/formatutils.h"
> #include "libANGLE/renderer/d3d/EGLImageD3D.h"
> #include "libANGLE/renderer/d3d/TextureD3D.h"
>-#include "libANGLE/renderer/d3d/d3d9/formatutils9.h"
>-#include "libANGLE/renderer/d3d/d3d9/renderer9_utils.h"
>-#include "libANGLE/renderer/d3d/d3d9/Renderer9.h"
> #include "libANGLE/renderer/d3d/d3d9/RenderTarget9.h"
>+#include "libANGLE/renderer/d3d/d3d9/Renderer9.h"
> #include "libANGLE/renderer/d3d/d3d9/SwapChain9.h"
>+#include "libANGLE/renderer/d3d/d3d9/formatutils9.h"
>+#include "libANGLE/renderer/d3d/d3d9/renderer9_utils.h"
> 
> namespace rx
> {
>@@ -32,12 +34,9 @@ TextureStorage9::TextureStorage9(Renderer9 *renderer, DWORD usage)
>       mRenderer(renderer),
>       mD3DUsage(usage),
>       mD3DPool(mRenderer->getTexturePool(usage))
>-{
>-}
>+{}
> 
>-TextureStorage9::~TextureStorage9()
>-{
>-}
>+TextureStorage9::~TextureStorage9() {}
> 
> DWORD TextureStorage9::GetTextureUsage(GLenum internalformat, bool renderTarget)
> {
>@@ -57,7 +56,6 @@ DWORD TextureStorage9::GetTextureUsage(GLenum internalformat, bool renderTarget)
>     return d3dusage;
> }
> 
>-
> bool TextureStorage9::isRenderTarget() const
> {
>     return (mD3DUsage & (D3DUSAGE_RENDERTARGET | D3DUSAGE_DEPTHSTENCIL)) != 0;
>@@ -93,37 +91,42 @@ int TextureStorage9::getLevelCount() const
>     return static_cast<int>(mMipLevels) - mTopLevel;
> }
> 
>-gl::Error TextureStorage9::setData(const gl::Context *context,
>-                                   const gl::ImageIndex &index,
>-                                   ImageD3D *image,
>-                                   const gl::Box *destBox,
>-                                   GLenum type,
>-                                   const gl::PixelUnpackState &unpack,
>-                                   const uint8_t *pixelData)
>+angle::Result TextureStorage9::setData(const gl::Context *context,
>+                                       const gl::ImageIndex &index,
>+                                       ImageD3D *image,
>+                                       const gl::Box *destBox,
>+                                       GLenum type,
>+                                       const gl::PixelUnpackState &unpack,
>+                                       const uint8_t *pixelData)
> {
>-    UNREACHABLE();
>-    return gl::InternalError();
>+    ANGLE_HR_UNREACHABLE(GetImplAs<Context9>(context));
>+    return angle::Result::Stop;
> }
> 
> TextureStorage9_2D::TextureStorage9_2D(Renderer9 *renderer, SwapChain9 *swapchain)
>     : TextureStorage9(renderer, D3DUSAGE_RENDERTARGET)
> {
>     IDirect3DTexture9 *surfaceTexture = swapchain->getOffscreenTexture();
>-    mTexture = surfaceTexture;
>-    mMipLevels = surfaceTexture->GetLevelCount();
>+    mTexture                          = surfaceTexture;
>+    mMipLevels                        = surfaceTexture->GetLevelCount();
> 
>     mInternalFormat = swapchain->getRenderTargetInternalFormat();
> 
>     D3DSURFACE_DESC surfaceDesc;
>     surfaceTexture->GetLevelDesc(0, &surfaceDesc);
>-    mTextureWidth = surfaceDesc.Width;
>+    mTextureWidth  = surfaceDesc.Width;
>     mTextureHeight = surfaceDesc.Height;
>     mTextureFormat = surfaceDesc.Format;
> 
>     mRenderTargets.resize(mMipLevels, nullptr);
> }
> 
>-TextureStorage9_2D::TextureStorage9_2D(Renderer9 *renderer, GLenum internalformat, bool renderTarget, GLsizei width, GLsizei height, int levels)
>+TextureStorage9_2D::TextureStorage9_2D(Renderer9 *renderer,
>+                                       GLenum internalformat,
>+                                       bool renderTarget,
>+                                       GLsizei width,
>+                                       GLsizei height,
>+                                       int levels)
>     : TextureStorage9(renderer, GetTextureUsage(internalformat, renderTarget))
> {
>     mTexture = nullptr;
>@@ -131,12 +134,12 @@ TextureStorage9_2D::TextureStorage9_2D(Renderer9 *renderer, GLenum internalforma
>     mInternalFormat = internalformat;
> 
>     const d3d9::TextureFormat &d3dFormatInfo = d3d9::GetTextureFormatInfo(internalformat);
>-    mTextureFormat = d3dFormatInfo.texFormat;
>+    mTextureFormat                           = d3dFormatInfo.texFormat;
> 
>     d3d9::MakeValidSize(false, d3dFormatInfo.texFormat, &width, &height, &mTopLevel);
>-    mTextureWidth = width;
>+    mTextureWidth  = width;
>     mTextureHeight = height;
>-    mMipLevels = mTopLevel + levels;
>+    mMipLevels     = mTopLevel + levels;
> 
>     mRenderTargets.resize(levels, nullptr);
> }
>@@ -152,31 +155,21 @@ TextureStorage9_2D::~TextureStorage9_2D()
> 
> // Increments refcount on surface.
> // caller must Release() the returned surface
>-gl::Error TextureStorage9_2D::getSurfaceLevel(const gl::Context *context,
>-                                              GLenum target,
>-                                              int level,
>-                                              bool dirty,
>-                                              IDirect3DSurface9 **outSurface)
>+angle::Result TextureStorage9_2D::getSurfaceLevel(const gl::Context *context,
>+                                                  gl::TextureTarget target,
>+                                                  int level,
>+                                                  bool dirty,
>+                                                  IDirect3DSurface9 **outSurface)
> {
>-    ASSERT(target == GL_TEXTURE_2D);
>+    ASSERT(target == gl::TextureTarget::_2D);
> 
>     IDirect3DBaseTexture9 *baseTexture = nullptr;
>-    gl::Error error                    = getBaseTexture(context, &baseTexture);
>-    if (error.isError())
>-    {
>-        return error;
>-    }
>+    ANGLE_TRY(getBaseTexture(context, &baseTexture));
> 
>-    IDirect3DTexture9 *texture = static_cast<IDirect3DTexture9*>(baseTexture);
>+    IDirect3DTexture9 *texture = static_cast<IDirect3DTexture9 *>(baseTexture);
> 
>     HRESULT result = texture->GetSurfaceLevel(level + mTopLevel, outSurface);
>-
>-    ASSERT(SUCCEEDED(result));
>-    if (FAILED(result))
>-    {
>-        return gl::OutOfMemory() << "Failed to get the surface from a texture, "
>-                                 << gl::FmtHR(result);
>-    }
>+    ANGLE_TRY_HR(GetImplAs<Context9>(context), result, "Failed to get the surface from a texture");
> 
>     // With managed textures the driver needs to be informed of updates to the lower mipmap levels
>     if (level + mTopLevel != 0 && isManaged() && dirty)
>@@ -184,76 +177,57 @@ gl::Error TextureStorage9_2D::getSurfaceLevel(const gl::Context *context,
>         texture->AddDirtyRect(nullptr);
>     }
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error TextureStorage9_2D::getRenderTarget(const gl::Context *context,
>-                                              const gl::ImageIndex &index,
>-                                              RenderTargetD3D **outRT)
>+angle::Result TextureStorage9_2D::getRenderTarget(const gl::Context *context,
>+                                                  const gl::ImageIndex &index,
>+                                                  RenderTargetD3D **outRT)
> {
>-    ASSERT(index.mipIndex < getLevelCount());
>+    ASSERT(index.getLevelIndex() < getLevelCount());
> 
>-    if (!mRenderTargets[index.mipIndex] && isRenderTarget())
>+    if (!mRenderTargets[index.getLevelIndex()] && isRenderTarget())
>     {
>         IDirect3DBaseTexture9 *baseTexture = nullptr;
>-        gl::Error error                    = getBaseTexture(context, &baseTexture);
>-        if (error.isError())
>-        {
>-            return error;
>-        }
>+        ANGLE_TRY(getBaseTexture(context, &baseTexture));
> 
>         IDirect3DSurface9 *surface = nullptr;
>-        error = getSurfaceLevel(context, GL_TEXTURE_2D, index.mipIndex, false, &surface);
>-        if (error.isError())
>-        {
>-            return error;
>-        }
>+        ANGLE_TRY(getSurfaceLevel(context, gl::TextureTarget::_2D, index.getLevelIndex(), false,
>+                                  &surface));
> 
>-        size_t textureMipLevel = mTopLevel + index.mipIndex;
>+        size_t textureMipLevel = mTopLevel + index.getLevelIndex();
>         size_t mipWidth        = std::max<size_t>(mTextureWidth >> textureMipLevel, 1u);
>         size_t mipHeight       = std::max<size_t>(mTextureHeight >> textureMipLevel, 1u);
> 
>         baseTexture->AddRef();
>-        mRenderTargets[index.mipIndex] = new TextureRenderTarget9(
>+        mRenderTargets[index.getLevelIndex()] = new TextureRenderTarget9(
>             baseTexture, textureMipLevel, surface, mInternalFormat, static_cast<GLsizei>(mipWidth),
>             static_cast<GLsizei>(mipHeight), 1, 0);
>     }
> 
>     ASSERT(outRT);
>-    *outRT = mRenderTargets[index.mipIndex];
>-    return gl::NoError();
>+    *outRT = mRenderTargets[index.getLevelIndex()];
>+    return angle::Result::Continue;
> }
> 
>-gl::Error TextureStorage9_2D::generateMipmap(const gl::Context *context,
>-                                             const gl::ImageIndex &sourceIndex,
>-                                             const gl::ImageIndex &destIndex)
>+angle::Result TextureStorage9_2D::generateMipmap(const gl::Context *context,
>+                                                 const gl::ImageIndex &sourceIndex,
>+                                                 const gl::ImageIndex &destIndex)
> {
>-    IDirect3DSurface9 *upper = nullptr;
>-    gl::Error error = getSurfaceLevel(context, GL_TEXTURE_2D, sourceIndex.mipIndex, false, &upper);
>-    if (error.isError())
>-    {
>-        return error;
>-    }
>+    angle::ComPtr<IDirect3DSurface9> upper = nullptr;
>+    ANGLE_TRY(getSurfaceLevel(context, gl::TextureTarget::_2D, sourceIndex.getLevelIndex(), false,
>+                              &upper));
> 
>-    IDirect3DSurface9 *lower = nullptr;
>-    error = getSurfaceLevel(context, GL_TEXTURE_2D, destIndex.mipIndex, true, &lower);
>-    if (error.isError())
>-    {
>-        SafeRelease(upper);
>-        return error;
>-    }
>+    angle::ComPtr<IDirect3DSurface9> lower = nullptr;
>+    ANGLE_TRY(
>+        getSurfaceLevel(context, gl::TextureTarget::_2D, destIndex.getLevelIndex(), true, &lower));
> 
>     ASSERT(upper && lower);
>-    error = mRenderer->boxFilter(upper, lower);
>-
>-    SafeRelease(upper);
>-    SafeRelease(lower);
>-
>-    return error;
>+    return mRenderer->boxFilter(GetImplAs<Context9>(context), upper.Get(), lower.Get());
> }
> 
>-gl::Error TextureStorage9_2D::getBaseTexture(const gl::Context *context,
>-                                             IDirect3DBaseTexture9 **outTexture)
>+angle::Result TextureStorage9_2D::getBaseTexture(const gl::Context *context,
>+                                                 IDirect3DBaseTexture9 **outTexture)
> {
>     // if the width or height is not positive this should be treated as an incomplete texture
>     // we handle that here by skipping the d3d texture creation
>@@ -266,20 +240,15 @@ gl::Error TextureStorage9_2D::getBaseTexture(const gl::Context *context,
>                                                static_cast<unsigned int>(mTextureHeight),
>                                                static_cast<unsigned int>(mMipLevels), getUsage(),
>                                                mTextureFormat, getPool(), &mTexture, nullptr);
>-
>-        if (FAILED(result))
>-        {
>-            ASSERT(result == D3DERR_OUTOFVIDEOMEMORY || result == E_OUTOFMEMORY);
>-            return gl::OutOfMemory()
>-                   << "Failed to create 2D storage texture, " << gl::FmtHR(result);
>-        }
>+        ANGLE_TRY_HR(GetImplAs<Context9>(context), result, "Failed to create 2D storage texture");
>     }
> 
>     *outTexture = mTexture;
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error TextureStorage9_2D::copyToStorage(const gl::Context *context, TextureStorage *destStorage)
>+angle::Result TextureStorage9_2D::copyToStorage(const gl::Context *context,
>+                                                TextureStorage *destStorage)
> {
>     ASSERT(destStorage);
> 
>@@ -288,33 +257,17 @@ gl::Error TextureStorage9_2D::copyToStorage(const gl::Context *context, TextureS
>     int levels = getLevelCount();
>     for (int i = 0; i < levels; ++i)
>     {
>-        IDirect3DSurface9 *srcSurf = nullptr;
>-        gl::Error error            = getSurfaceLevel(context, GL_TEXTURE_2D, i, false, &srcSurf);
>-        if (error.isError())
>-        {
>-            return error;
>-        }
>+        angle::ComPtr<IDirect3DSurface9> srcSurf = nullptr;
>+        ANGLE_TRY(getSurfaceLevel(context, gl::TextureTarget::_2D, i, false, &srcSurf));
> 
>-        IDirect3DSurface9 *dstSurf = nullptr;
>-        error = dest9->getSurfaceLevel(context, GL_TEXTURE_2D, i, true, &dstSurf);
>-        if (error.isError())
>-        {
>-            SafeRelease(srcSurf);
>-            return error;
>-        }
>-
>-        error = mRenderer->copyToRenderTarget(dstSurf, srcSurf, isManaged());
>+        angle::ComPtr<IDirect3DSurface9> dstSurf = nullptr;
>+        ANGLE_TRY(dest9->getSurfaceLevel(context, gl::TextureTarget::_2D, i, true, &dstSurf));
> 
>-        SafeRelease(srcSurf);
>-        SafeRelease(dstSurf);
>-
>-        if (error.isError())
>-        {
>-            return error;
>-        }
>+        ANGLE_TRY(
>+            mRenderer->copyToRenderTarget(context, dstSurf.Get(), srcSurf.Get(), isManaged()));
>     }
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
> TextureStorage9_EGLImage::TextureStorage9_EGLImage(Renderer9 *renderer,
>@@ -330,69 +283,59 @@ TextureStorage9_EGLImage::TextureStorage9_EGLImage(Renderer9 *renderer,
>     mMipLevels      = mTopLevel + 1;
> }
> 
>-TextureStorage9_EGLImage::~TextureStorage9_EGLImage()
>-{
>-}
>+TextureStorage9_EGLImage::~TextureStorage9_EGLImage() {}
> 
>-gl::Error TextureStorage9_EGLImage::getSurfaceLevel(const gl::Context *context,
>-                                                    GLenum target,
>-                                                    int level,
>-                                                    bool,
>-                                                    IDirect3DSurface9 **outSurface)
>+angle::Result TextureStorage9_EGLImage::getSurfaceLevel(const gl::Context *context,
>+                                                        gl::TextureTarget target,
>+                                                        int level,
>+                                                        bool,
>+                                                        IDirect3DSurface9 **outSurface)
> {
>-    ASSERT(target == GL_TEXTURE_2D);
>+    ASSERT(target == gl::TextureTarget::_2D);
>     ASSERT(level == 0);
> 
>     RenderTargetD3D *renderTargetD3D = nullptr;
>-    gl::Error error                  = mImage->getRenderTarget(context, &renderTargetD3D);
>-    if (error.isError())
>-    {
>-        return error;
>-    }
>+    ANGLE_TRY(mImage->getRenderTarget(context, &renderTargetD3D));
> 
>     RenderTarget9 *renderTarget9 = GetAs<RenderTarget9>(renderTargetD3D);
> 
>     *outSurface = renderTarget9->getSurface();
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error TextureStorage9_EGLImage::getRenderTarget(const gl::Context *context,
>-                                                    const gl::ImageIndex &index,
>-                                                    RenderTargetD3D **outRT)
>+angle::Result TextureStorage9_EGLImage::getRenderTarget(const gl::Context *context,
>+                                                        const gl::ImageIndex &index,
>+                                                        RenderTargetD3D **outRT)
> {
>     ASSERT(!index.hasLayer());
>-    ASSERT(index.mipIndex == 0);
>+    ASSERT(index.getLevelIndex() == 0);
> 
>     return mImage->getRenderTarget(context, outRT);
> }
> 
>-gl::Error TextureStorage9_EGLImage::getBaseTexture(const gl::Context *context,
>-                                                   IDirect3DBaseTexture9 **outTexture)
>+angle::Result TextureStorage9_EGLImage::getBaseTexture(const gl::Context *context,
>+                                                       IDirect3DBaseTexture9 **outTexture)
> {
>     RenderTargetD3D *renderTargetD3D = nullptr;
>-    gl::Error error                  = mImage->getRenderTarget(context, &renderTargetD3D);
>-    if (error.isError())
>-    {
>-        return error;
>-    }
>+    ANGLE_TRY(mImage->getRenderTarget(context, &renderTargetD3D));
> 
>     RenderTarget9 *renderTarget9 = GetAs<RenderTarget9>(renderTargetD3D);
>-    *outTexture = renderTarget9->getTexture();
>+    *outTexture                  = renderTarget9->getTexture();
>     ASSERT(*outTexture != nullptr);
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error TextureStorage9_EGLImage::generateMipmap(const gl::Context *context,
>-                                                   const gl::ImageIndex &,
>-                                                   const gl::ImageIndex &)
>+angle::Result TextureStorage9_EGLImage::generateMipmap(const gl::Context *context,
>+                                                       const gl::ImageIndex &,
>+                                                       const gl::ImageIndex &)
> {
>-    UNREACHABLE();
>-    return gl::InternalError();
>+    ANGLE_HR_UNREACHABLE(GetImplAs<Context9>(context));
>+    return angle::Result::Stop;
> }
> 
>-gl::Error TextureStorage9_EGLImage::copyToStorage(const gl::Context *context,
>-                                                  TextureStorage *destStorage)
>+angle::Result TextureStorage9_EGLImage::copyToStorage(const gl::Context *context,
>+                                                      TextureStorage *destStorage)
> {
>     ASSERT(destStorage);
>     ASSERT(getLevelCount() == 1);
>@@ -400,53 +343,39 @@ gl::Error TextureStorage9_EGLImage::copyToStorage(const gl::Context *context,
>     TextureStorage9 *dest9 = GetAs<TextureStorage9>(destStorage);
> 
>     IDirect3DBaseTexture9 *destBaseTexture9 = nullptr;
>-    gl::Error error                         = dest9->getBaseTexture(context, &destBaseTexture9);
>-    if (error.isError())
>-    {
>-        return error;
>-    }
>+    ANGLE_TRY(dest9->getBaseTexture(context, &destBaseTexture9));
> 
>     IDirect3DTexture9 *destTexture9 = static_cast<IDirect3DTexture9 *>(destBaseTexture9);
> 
>-    IDirect3DSurface9 *destSurface = nullptr;
>+    angle::ComPtr<IDirect3DSurface9> destSurface = nullptr;
>     HRESULT result = destTexture9->GetSurfaceLevel(destStorage->getTopLevel(), &destSurface);
>-    if (FAILED(result))
>-    {
>-        return gl::OutOfMemory() << "Failed to get the surface from a texture, "
>-                                 << gl::FmtHR(result);
>-    }
>+    ANGLE_TRY_HR(GetImplAs<Context9>(context), result, "Failed to get the surface from a texture");
> 
>     RenderTargetD3D *sourceRenderTarget = nullptr;
>-    error                               = mImage->getRenderTarget(context, &sourceRenderTarget);
>-    if (error.isError())
>-    {
>-        SafeRelease(destSurface);
>-        return error;
>-    }
>+    ANGLE_TRY(mImage->getRenderTarget(context, &sourceRenderTarget));
> 
>     RenderTarget9 *sourceRenderTarget9 = GetAs<RenderTarget9>(sourceRenderTarget);
>-    error =
>-        mRenderer->copyToRenderTarget(destSurface, sourceRenderTarget9->getSurface(), isManaged());
>-    if (error.isError())
>-    {
>-        SafeRelease(destSurface);
>-        return error;
>-    }
>+    ANGLE_TRY(mRenderer->copyToRenderTarget(context, destSurface.Get(),
>+                                            sourceRenderTarget9->getSurface(), isManaged()));
> 
>     if (destStorage->getTopLevel() != 0)
>     {
>         destTexture9->AddDirtyRect(nullptr);
>     }
> 
>-    SafeRelease(destSurface);
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-TextureStorage9_Cube::TextureStorage9_Cube(Renderer9 *renderer, GLenum internalformat, bool renderTarget, int size, int levels, bool hintLevelZeroOnly)
>+TextureStorage9_Cube::TextureStorage9_Cube(Renderer9 *renderer,
>+                                           GLenum internalformat,
>+                                           bool renderTarget,
>+                                           int size,
>+                                           int levels,
>+                                           bool hintLevelZeroOnly)
>     : TextureStorage9(renderer, GetTextureUsage(internalformat, renderTarget))
> {
>     mTexture = nullptr;
>-    for (size_t i = 0; i < gl::CUBE_FACE_COUNT; ++i)
>+    for (size_t i = 0; i < gl::kCubeFaceCount; ++i)
>     {
>         mRenderTarget[i] = nullptr;
>     }
>@@ -454,20 +383,20 @@ TextureStorage9_Cube::TextureStorage9_Cube(Renderer9 *renderer, GLenum internalf
>     mInternalFormat = internalformat;
> 
>     const d3d9::TextureFormat &d3dFormatInfo = d3d9::GetTextureFormatInfo(internalformat);
>-    mTextureFormat = d3dFormatInfo.texFormat;
>+    mTextureFormat                           = d3dFormatInfo.texFormat;
> 
>     int height = size;
>     d3d9::MakeValidSize(false, d3dFormatInfo.texFormat, &size, &height, &mTopLevel);
>-    mTextureWidth = size;
>+    mTextureWidth  = size;
>     mTextureHeight = size;
>-    mMipLevels = mTopLevel + levels;
>+    mMipLevels     = mTopLevel + levels;
> }
> 
> TextureStorage9_Cube::~TextureStorage9_Cube()
> {
>     SafeRelease(mTexture);
> 
>-    for (size_t i = 0; i < gl::CUBE_FACE_COUNT; ++i)
>+    for (size_t i = 0; i < gl::kCubeFaceCount; ++i)
>     {
>         SafeDelete(mRenderTarget[i]);
>     }
>@@ -475,30 +404,20 @@ TextureStorage9_Cube::~TextureStorage9_Cube()
> 
> // Increments refcount on surface.
> // caller must Release() the returned surface
>-gl::Error TextureStorage9_Cube::getSurfaceLevel(const gl::Context *context,
>-                                                GLenum target,
>-                                                int level,
>-                                                bool dirty,
>-                                                IDirect3DSurface9 **outSurface)
>+angle::Result TextureStorage9_Cube::getSurfaceLevel(const gl::Context *context,
>+                                                    gl::TextureTarget target,
>+                                                    int level,
>+                                                    bool dirty,
>+                                                    IDirect3DSurface9 **outSurface)
> {
>     IDirect3DBaseTexture9 *baseTexture = nullptr;
>-    gl::Error error                    = getBaseTexture(context, &baseTexture);
>-    if (error.isError())
>-    {
>-        return error;
>-    }
>+    ANGLE_TRY(getBaseTexture(context, &baseTexture));
> 
>-    IDirect3DCubeTexture9 *texture = static_cast<IDirect3DCubeTexture9*>(baseTexture);
>+    IDirect3DCubeTexture9 *texture = static_cast<IDirect3DCubeTexture9 *>(baseTexture);
> 
>     D3DCUBEMAP_FACES face = gl_d3d9::ConvertCubeFace(target);
>     HRESULT result        = texture->GetCubeMapSurface(face, level, outSurface);
>-
>-    ASSERT(SUCCEEDED(result));
>-    if (FAILED(result))
>-    {
>-        return gl::OutOfMemory() << "Failed to get the surface from a texture, "
>-                                 << gl::FmtHR(result);
>-    }
>+    ANGLE_TRY_HR(GetImplAs<Context9>(context), result, "Failed to get the surface from a texture");
> 
>     // With managed textures the driver needs to be informed of updates to the lower mipmap levels
>     if (level != 0 && isManaged() && dirty)
>@@ -506,75 +425,57 @@ gl::Error TextureStorage9_Cube::getSurfaceLevel(const gl::Context *context,
>         texture->AddDirtyRect(face, nullptr);
>     }
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error TextureStorage9_Cube::getRenderTarget(const gl::Context *context,
>-                                                const gl::ImageIndex &index,
>-                                                RenderTargetD3D **outRT)
>+angle::Result TextureStorage9_Cube::getRenderTarget(const gl::Context *context,
>+                                                    const gl::ImageIndex &index,
>+                                                    RenderTargetD3D **outRT)
> {
>     ASSERT(outRT);
>-    ASSERT(index.mipIndex == 0);
>-    ASSERT(index.layerIndex >= 0 && static_cast<size_t>(index.layerIndex) < gl::CUBE_FACE_COUNT);
>+    ASSERT(index.getLevelIndex() == 0);
>+
>+    ASSERT(index.getType() == gl::TextureType::CubeMap &&
>+           gl::IsCubeMapFaceTarget(index.getTarget()));
>+    const size_t renderTargetIndex = index.cubeMapFaceIndex();
> 
>-    if (mRenderTarget[index.layerIndex] == nullptr && isRenderTarget())
>+    if (mRenderTarget[renderTargetIndex] == nullptr && isRenderTarget())
>     {
>         IDirect3DBaseTexture9 *baseTexture = nullptr;
>-        gl::Error error                    = getBaseTexture(context, &baseTexture);
>-        if (error.isError())
>-        {
>-            return error;
>-        }
>+        ANGLE_TRY(getBaseTexture(context, &baseTexture));
> 
>         IDirect3DSurface9 *surface = nullptr;
>-        error = getSurfaceLevel(context, GL_TEXTURE_CUBE_MAP_POSITIVE_X + index.layerIndex,
>-                                mTopLevel + index.mipIndex, false, &surface);
>-        if (error.isError())
>-        {
>-            return error;
>-        }
>+        ANGLE_TRY(getSurfaceLevel(context, index.getTarget(), mTopLevel + index.getLevelIndex(),
>+                                  false, &surface));
> 
>         baseTexture->AddRef();
>-        mRenderTarget[index.layerIndex] = new TextureRenderTarget9(
>-            baseTexture, mTopLevel + index.mipIndex, surface, mInternalFormat,
>+        mRenderTarget[renderTargetIndex] = new TextureRenderTarget9(
>+            baseTexture, mTopLevel + index.getLevelIndex(), surface, mInternalFormat,
>             static_cast<GLsizei>(mTextureWidth), static_cast<GLsizei>(mTextureHeight), 1, 0);
>     }
> 
>-    *outRT = mRenderTarget[index.layerIndex];
>-    return gl::NoError();
>+    *outRT = mRenderTarget[renderTargetIndex];
>+    return angle::Result::Continue;
> }
> 
>-gl::Error TextureStorage9_Cube::generateMipmap(const gl::Context *context,
>-                                               const gl::ImageIndex &sourceIndex,
>-                                               const gl::ImageIndex &destIndex)
>+angle::Result TextureStorage9_Cube::generateMipmap(const gl::Context *context,
>+                                                   const gl::ImageIndex &sourceIndex,
>+                                                   const gl::ImageIndex &destIndex)
> {
>-    IDirect3DSurface9 *upper = nullptr;
>-    gl::Error error =
>-        getSurfaceLevel(context, sourceIndex.type, sourceIndex.mipIndex, false, &upper);
>-    if (error.isError())
>-    {
>-        return error;
>-    }
>+    angle::ComPtr<IDirect3DSurface9> upper = nullptr;
>+    ANGLE_TRY(getSurfaceLevel(context, sourceIndex.getTarget(), sourceIndex.getLevelIndex(), false,
>+                              &upper));
> 
>-    IDirect3DSurface9 *lower = nullptr;
>-    error = getSurfaceLevel(context, destIndex.type, destIndex.mipIndex, true, &lower);
>-    if (error.isError())
>-    {
>-        SafeRelease(upper);
>-        return error;
>-    }
>+    angle::ComPtr<IDirect3DSurface9> lower = nullptr;
>+    ANGLE_TRY(
>+        getSurfaceLevel(context, destIndex.getTarget(), destIndex.getLevelIndex(), true, &lower));
> 
>     ASSERT(upper && lower);
>-    error = mRenderer->boxFilter(upper, lower);
>-
>-    SafeRelease(upper);
>-    SafeRelease(lower);
>-
>-    return error;
>+    return mRenderer->boxFilter(GetImplAs<Context9>(context), upper.Get(), lower.Get());
> }
> 
>-gl::Error TextureStorage9_Cube::getBaseTexture(const gl::Context *context,
>-                                               IDirect3DBaseTexture9 **outTexture)
>+angle::Result TextureStorage9_Cube::getBaseTexture(const gl::Context *context,
>+                                                   IDirect3DBaseTexture9 **outTexture)
> {
>     // if the size is not positive this should be treated as an incomplete texture
>     // we handle that here by skipping the d3d texture creation
>@@ -587,61 +488,36 @@ gl::Error TextureStorage9_Cube::getBaseTexture(const gl::Context *context,
>         HRESULT result           = device->CreateCubeTexture(
>             static_cast<unsigned int>(mTextureWidth), static_cast<unsigned int>(mMipLevels),
>             getUsage(), mTextureFormat, getPool(), &mTexture, nullptr);
>-
>-        if (FAILED(result))
>-        {
>-            ASSERT(result == D3DERR_OUTOFVIDEOMEMORY || result == E_OUTOFMEMORY);
>-            return gl::OutOfMemory()
>-                   << "Failed to create cube storage texture, " << gl::FmtHR(result);
>-        }
>+        ANGLE_TRY_HR(GetImplAs<Context9>(context), result, "Failed to create cube storage texture");
>     }
> 
>     *outTexture = mTexture;
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error TextureStorage9_Cube::copyToStorage(const gl::Context *context,
>-                                              TextureStorage *destStorage)
>+angle::Result TextureStorage9_Cube::copyToStorage(const gl::Context *context,
>+                                                  TextureStorage *destStorage)
> {
>     ASSERT(destStorage);
> 
>     TextureStorage9_Cube *dest9 = GetAs<TextureStorage9_Cube>(destStorage);
> 
>     int levels = getLevelCount();
>-    for (int f = 0; f < static_cast<int>(gl::CUBE_FACE_COUNT); f++)
>+    for (gl::TextureTarget face : gl::AllCubeFaceTextureTargets())
>     {
>         for (int i = 0; i < levels; i++)
>         {
>-            IDirect3DSurface9 *srcSurf = nullptr;
>-            gl::Error error =
>-                getSurfaceLevel(context, GL_TEXTURE_CUBE_MAP_POSITIVE_X + f, i, false, &srcSurf);
>-            if (error.isError())
>-            {
>-                return error;
>-            }
>-
>-            IDirect3DSurface9 *dstSurf = nullptr;
>-            error = dest9->getSurfaceLevel(context, GL_TEXTURE_CUBE_MAP_POSITIVE_X + f, i, true,
>-                                           &dstSurf);
>-            if (error.isError())
>-            {
>-                SafeRelease(srcSurf);
>-                return error;
>-            }
>-
>-            error = mRenderer->copyToRenderTarget(dstSurf, srcSurf, isManaged());
>-
>-            SafeRelease(srcSurf);
>-            SafeRelease(dstSurf);
>-
>-            if (error.isError())
>-            {
>-                return error;
>-            }
>+            angle::ComPtr<IDirect3DSurface9> srcSurf = nullptr;
>+            ANGLE_TRY(getSurfaceLevel(context, face, i, false, &srcSurf));
>+
>+            angle::ComPtr<IDirect3DSurface9> dstSurf = nullptr;
>+            ANGLE_TRY(dest9->getSurfaceLevel(context, face, i, true, &dstSurf));
>+
>+            ANGLE_TRY(
>+                mRenderer->copyToRenderTarget(context, dstSurf.Get(), srcSurf.Get(), isManaged()));
>         }
>     }
> 
>-    return gl::NoError();
>-}
>-
>+    return angle::Result::Continue;
> }
>+}  // namespace rx
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/TextureStorage9.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/TextureStorage9.h
>index 2f51901931e..7228cf68f0b 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/TextureStorage9.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/TextureStorage9.h
>@@ -11,8 +11,8 @@
> #ifndef LIBANGLE_RENDERER_D3D_D3D9_TEXTURESTORAGE9_H_
> #define LIBANGLE_RENDERER_D3D_D3D9_TEXTURESTORAGE9_H_
> 
>-#include "libANGLE/renderer/d3d/TextureStorage.h"
> #include "common/debug.h"
>+#include "libANGLE/renderer/d3d/TextureStorage.h"
> 
> namespace rx
> {
>@@ -32,13 +32,13 @@ class TextureStorage9 : public TextureStorage
>     D3DPOOL getPool() const;
>     DWORD getUsage() const;
> 
>-    virtual gl::Error getSurfaceLevel(const gl::Context *context,
>-                                      GLenum target,
>-                                      int level,
>-                                      bool dirty,
>-                                      IDirect3DSurface9 **outSurface) = 0;
>-    virtual gl::Error getBaseTexture(const gl::Context *context,
>-                                     IDirect3DBaseTexture9 **outTexture) = 0;
>+    virtual angle::Result getSurfaceLevel(const gl::Context *context,
>+                                          gl::TextureTarget target,
>+                                          int level,
>+                                          bool dirty,
>+                                          IDirect3DSurface9 **outSurface)    = 0;
>+    virtual angle::Result getBaseTexture(const gl::Context *context,
>+                                         IDirect3DBaseTexture9 **outTexture) = 0;
> 
>     int getTopLevel() const override;
>     bool isRenderTarget() const override;
>@@ -46,13 +46,13 @@ class TextureStorage9 : public TextureStorage
>     bool supportsNativeMipmapFunction() const override;
>     int getLevelCount() const override;
> 
>-    gl::Error setData(const gl::Context *context,
>-                      const gl::ImageIndex &index,
>-                      ImageD3D *image,
>-                      const gl::Box *destBox,
>-                      GLenum type,
>-                      const gl::PixelUnpackState &unpack,
>-                      const uint8_t *pixelData) override;
>+    angle::Result setData(const gl::Context *context,
>+                          const gl::ImageIndex &index,
>+                          ImageD3D *image,
>+                          const gl::Box *destBox,
>+                          GLenum type,
>+                          const gl::PixelUnpackState &unpack,
>+                          const uint8_t *pixelData) override;
> 
>   protected:
>     int mTopLevel;
>@@ -75,23 +75,28 @@ class TextureStorage9_2D : public TextureStorage9
> {
>   public:
>     TextureStorage9_2D(Renderer9 *renderer, SwapChain9 *swapchain);
>-    TextureStorage9_2D(Renderer9 *renderer, GLenum internalformat, bool renderTarget, GLsizei width, GLsizei height, int levels);
>+    TextureStorage9_2D(Renderer9 *renderer,
>+                       GLenum internalformat,
>+                       bool renderTarget,
>+                       GLsizei width,
>+                       GLsizei height,
>+                       int levels);
>     ~TextureStorage9_2D() override;
> 
>-    gl::Error getSurfaceLevel(const gl::Context *context,
>-                              GLenum target,
>-                              int level,
>-                              bool dirty,
>-                              IDirect3DSurface9 **outSurface) override;
>-    gl::Error getRenderTarget(const gl::Context *context,
>-                              const gl::ImageIndex &index,
>-                              RenderTargetD3D **outRT) override;
>-    gl::Error getBaseTexture(const gl::Context *context,
>-                             IDirect3DBaseTexture9 **outTexture) override;
>-    gl::Error generateMipmap(const gl::Context *context,
>-                             const gl::ImageIndex &sourceIndex,
>-                             const gl::ImageIndex &destIndex) override;
>-    gl::Error copyToStorage(const gl::Context *context, TextureStorage *destStorage) override;
>+    angle::Result getSurfaceLevel(const gl::Context *context,
>+                                  gl::TextureTarget target,
>+                                  int level,
>+                                  bool dirty,
>+                                  IDirect3DSurface9 **outSurface) override;
>+    angle::Result getRenderTarget(const gl::Context *context,
>+                                  const gl::ImageIndex &index,
>+                                  RenderTargetD3D **outRT) override;
>+    angle::Result getBaseTexture(const gl::Context *context,
>+                                 IDirect3DBaseTexture9 **outTexture) override;
>+    angle::Result generateMipmap(const gl::Context *context,
>+                                 const gl::ImageIndex &sourceIndex,
>+                                 const gl::ImageIndex &destIndex) override;
>+    angle::Result copyToStorage(const gl::Context *context, TextureStorage *destStorage) override;
> 
>   private:
>     IDirect3DTexture9 *mTexture;
>@@ -104,20 +109,20 @@ class TextureStorage9_EGLImage final : public TextureStorage9
>     TextureStorage9_EGLImage(Renderer9 *renderer, EGLImageD3D *image, RenderTarget9 *renderTarget9);
>     ~TextureStorage9_EGLImage() override;
> 
>-    gl::Error getSurfaceLevel(const gl::Context *context,
>-                              GLenum target,
>-                              int level,
>-                              bool dirty,
>-                              IDirect3DSurface9 **outSurface) override;
>-    gl::Error getRenderTarget(const gl::Context *context,
>-                              const gl::ImageIndex &index,
>-                              RenderTargetD3D **outRT) override;
>-    gl::Error getBaseTexture(const gl::Context *context,
>-                             IDirect3DBaseTexture9 **outTexture) override;
>-    gl::Error generateMipmap(const gl::Context *context,
>-                             const gl::ImageIndex &sourceIndex,
>-                             const gl::ImageIndex &destIndex) override;
>-    gl::Error copyToStorage(const gl::Context *context, TextureStorage *destStorage) override;
>+    angle::Result getSurfaceLevel(const gl::Context *context,
>+                                  gl::TextureTarget target,
>+                                  int level,
>+                                  bool dirty,
>+                                  IDirect3DSurface9 **outSurface) override;
>+    angle::Result getRenderTarget(const gl::Context *context,
>+                                  const gl::ImageIndex &index,
>+                                  RenderTargetD3D **outRT) override;
>+    angle::Result getBaseTexture(const gl::Context *context,
>+                                 IDirect3DBaseTexture9 **outTexture) override;
>+    angle::Result generateMipmap(const gl::Context *context,
>+                                 const gl::ImageIndex &sourceIndex,
>+                                 const gl::ImageIndex &destIndex) override;
>+    angle::Result copyToStorage(const gl::Context *context, TextureStorage *destStorage) override;
> 
>   private:
>     EGLImageD3D *mImage;
>@@ -126,29 +131,34 @@ class TextureStorage9_EGLImage final : public TextureStorage9
> class TextureStorage9_Cube : public TextureStorage9
> {
>   public:
>-    TextureStorage9_Cube(Renderer9 *renderer, GLenum internalformat, bool renderTarget, int size, int levels, bool hintLevelZeroOnly);
>+    TextureStorage9_Cube(Renderer9 *renderer,
>+                         GLenum internalformat,
>+                         bool renderTarget,
>+                         int size,
>+                         int levels,
>+                         bool hintLevelZeroOnly);
>     ~TextureStorage9_Cube() override;
> 
>-    gl::Error getSurfaceLevel(const gl::Context *context,
>-                              GLenum target,
>-                              int level,
>-                              bool dirty,
>-                              IDirect3DSurface9 **outSurface) override;
>-    gl::Error getRenderTarget(const gl::Context *context,
>-                              const gl::ImageIndex &index,
>-                              RenderTargetD3D **outRT) override;
>-    gl::Error getBaseTexture(const gl::Context *context,
>-                             IDirect3DBaseTexture9 **outTexture) override;
>-    gl::Error generateMipmap(const gl::Context *context,
>-                             const gl::ImageIndex &sourceIndex,
>-                             const gl::ImageIndex &destIndex) override;
>-    gl::Error copyToStorage(const gl::Context *context, TextureStorage *destStorage) override;
>+    angle::Result getSurfaceLevel(const gl::Context *context,
>+                                  gl::TextureTarget target,
>+                                  int level,
>+                                  bool dirty,
>+                                  IDirect3DSurface9 **outSurface) override;
>+    angle::Result getRenderTarget(const gl::Context *context,
>+                                  const gl::ImageIndex &index,
>+                                  RenderTargetD3D **outRT) override;
>+    angle::Result getBaseTexture(const gl::Context *context,
>+                                 IDirect3DBaseTexture9 **outTexture) override;
>+    angle::Result generateMipmap(const gl::Context *context,
>+                                 const gl::ImageIndex &sourceIndex,
>+                                 const gl::ImageIndex &destIndex) override;
>+    angle::Result copyToStorage(const gl::Context *context, TextureStorage *destStorage) override;
> 
>   private:
>     IDirect3DCubeTexture9 *mTexture;
>-    RenderTarget9 *mRenderTarget[gl::CUBE_FACE_COUNT];
>+    RenderTarget9 *mRenderTarget[gl::kCubeFaceCount];
> };
> 
>-}
>+}  // namespace rx
> 
>-#endif // LIBANGLE_RENDERER_D3D_D3D9_TEXTURESTORAGE9_H_
>+#endif  // LIBANGLE_RENDERER_D3D_D3D9_TEXTURESTORAGE9_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/VertexArray9.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/VertexArray9.h
>index 0f4410b8ded..a9c1ee7d4b9 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/VertexArray9.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/VertexArray9.h
>@@ -23,8 +23,10 @@ class VertexArray9 : public VertexArrayImpl
>   public:
>     VertexArray9(const gl::VertexArrayState &data) : VertexArrayImpl(data) {}
> 
>-    void syncState(const gl::Context *context,
>-                   const gl::VertexArray::DirtyBits &dirtyBits) override;
>+    angle::Result syncState(const gl::Context *context,
>+                            const gl::VertexArray::DirtyBits &dirtyBits,
>+                            gl::VertexArray::DirtyAttribBitsArray *attribBits,
>+                            gl::VertexArray::DirtyBindingBitsArray *bindingBits) override;
> 
>     ~VertexArray9() override {}
> 
>@@ -34,13 +36,22 @@ class VertexArray9 : public VertexArrayImpl
>     Serial mCurrentStateSerial;
> };
> 
>-inline void VertexArray9::syncState(const gl::Context *context,
>-                                    const gl::VertexArray::DirtyBits &dirtyBits)
>+inline angle::Result VertexArray9::syncState(const gl::Context *context,
>+                                             const gl::VertexArray::DirtyBits &dirtyBits,
>+                                             gl::VertexArray::DirtyAttribBitsArray *attribBits,
>+                                             gl::VertexArray::DirtyBindingBitsArray *bindingBits)
> {
>+
>     ASSERT(dirtyBits.any());
>     Renderer9 *renderer = GetImplAs<Context9>(context)->getRenderer();
>     mCurrentStateSerial = renderer->generateSerial();
>+
>+    // Clear the dirty bits in the back-end here.
>+    memset(attribBits, 0, sizeof(gl::VertexArray::DirtyAttribBitsArray));
>+    memset(bindingBits, 0, sizeof(gl::VertexArray::DirtyBindingBitsArray));
>+
>+    return angle::Result::Continue;
> }
>-}
>+}  // namespace rx
> 
>-#endif // LIBANGLE_RENDERER_D3D_D3D9_VERTEXARRAY9_H_
>+#endif  // LIBANGLE_RENDERER_D3D_D3D9_VERTEXARRAY9_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/VertexBuffer9.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/VertexBuffer9.cpp
>index c0b80a847c3..67517f2788e 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/VertexBuffer9.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/VertexBuffer9.cpp
>@@ -7,12 +7,14 @@
> // VertexBuffer9.cpp: Defines the D3D9 VertexBuffer implementation.
> 
> #include "libANGLE/renderer/d3d/d3d9/VertexBuffer9.h"
>+
>+#include "libANGLE/Buffer.h"
>+#include "libANGLE/Context.h"
>+#include "libANGLE/VertexAttribute.h"
>+#include "libANGLE/renderer/d3d/BufferD3D.h"
> #include "libANGLE/renderer/d3d/d3d9/Renderer9.h"
> #include "libANGLE/renderer/d3d/d3d9/formatutils9.h"
> #include "libANGLE/renderer/d3d/d3d9/vertexconversion.h"
>-#include "libANGLE/renderer/d3d/BufferD3D.h"
>-#include "libANGLE/VertexAttribute.h"
>-#include "libANGLE/Buffer.h"
> 
> namespace rx
> {
>@@ -20,7 +22,7 @@ namespace rx
> VertexBuffer9::VertexBuffer9(Renderer9 *renderer) : mRenderer(renderer)
> {
>     mVertexBuffer = nullptr;
>-    mBufferSize = 0;
>+    mBufferSize   = 0;
>     mDynamicUsage = false;
> }
> 
>@@ -29,7 +31,9 @@ VertexBuffer9::~VertexBuffer9()
>     SafeRelease(mVertexBuffer);
> }
> 
>-gl::Error VertexBuffer9::initialize(unsigned int size, bool dynamicUsage)
>+angle::Result VertexBuffer9::initialize(const gl::Context *context,
>+                                        unsigned int size,
>+                                        bool dynamicUsage)
> {
>     SafeRelease(mVertexBuffer);
> 
>@@ -44,53 +48,41 @@ gl::Error VertexBuffer9::initialize(unsigned int size, bool dynamicUsage)
>         }
> 
>         HRESULT result = mRenderer->createVertexBuffer(size, flags, &mVertexBuffer);
>-
>-        if (FAILED(result))
>-        {
>-            return gl::OutOfMemory()
>-                   << "Failed to allocate internal vertex buffer of size " << size;
>-        }
>+        ANGLE_TRY_HR(GetImplAs<Context9>(context), result,
>+                     "Failed to allocate internal vertex buffer");
>     }
> 
>-    mBufferSize = size;
>+    mBufferSize   = size;
>     mDynamicUsage = dynamicUsage;
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error VertexBuffer9::storeVertexAttributes(const gl::VertexAttribute &attrib,
>-                                               const gl::VertexBinding &binding,
>-                                               GLenum currentValueType,
>-                                               GLint start,
>-                                               GLsizei count,
>-                                               GLsizei instances,
>-                                               unsigned int offset,
>-                                               const uint8_t *sourceData)
>+angle::Result VertexBuffer9::storeVertexAttributes(const gl::Context *context,
>+                                                   const gl::VertexAttribute &attrib,
>+                                                   const gl::VertexBinding &binding,
>+                                                   gl::VertexAttribType currentValueType,
>+                                                   GLint start,
>+                                                   size_t count,
>+                                                   GLsizei instances,
>+                                                   unsigned int offset,
>+                                                   const uint8_t *sourceData)
> {
>-    if (!mVertexBuffer)
>-    {
>-        return gl::OutOfMemory() << "Internal vertex buffer is not initialized.";
>-    }
>+    ASSERT(mVertexBuffer);
> 
>-    int inputStride = static_cast<int>(gl::ComputeVertexAttributeStride(attrib, binding));
>-    int elementSize = static_cast<int>(gl::ComputeVertexAttributeTypeSize(attrib));
>+    size_t inputStride = gl::ComputeVertexAttributeStride(attrib, binding);
>+    size_t elementSize = gl::ComputeVertexAttributeTypeSize(attrib);
> 
>     DWORD lockFlags = mDynamicUsage ? D3DLOCK_NOOVERWRITE : 0;
> 
>     uint8_t *mapPtr = nullptr;
> 
>-    auto errorOrMapSize = mRenderer->getVertexSpaceRequired(attrib, binding, count, instances);
>-    if (errorOrMapSize.isError())
>-    {
>-        return errorOrMapSize.getError();
>-    }
>-
>-    unsigned int mapSize = errorOrMapSize.getResult();
>+    unsigned int mapSize = 0;
>+    ANGLE_TRY(
>+        mRenderer->getVertexSpaceRequired(context, attrib, binding, count, instances, &mapSize));
> 
>-    HRESULT result = mVertexBuffer->Lock(offset, mapSize, reinterpret_cast<void**>(&mapPtr), lockFlags);
>-    if (FAILED(result))
>-    {
>-        return gl::OutOfMemory() << "Failed to lock internal vertex buffer, " << gl::FmtHR(result);
>-    }
>+    HRESULT result =
>+        mVertexBuffer->Lock(offset, mapSize, reinterpret_cast<void **>(&mapPtr), lockFlags);
>+    ANGLE_TRY_HR(GetImplAs<Context9>(context), result, "Failed to lock internal vertex buffer");
> 
>     const uint8_t *input = sourceData;
> 
>@@ -99,13 +91,14 @@ gl::Error VertexBuffer9::storeVertexAttributes(const gl::VertexAttribute &attrib
>         input += inputStride * start;
>     }
> 
>-    gl::VertexFormatType vertexFormatType = gl::GetVertexFormatType(attrib, currentValueType);
>-    const d3d9::VertexFormat &d3dVertexInfo = d3d9::GetVertexFormatInfo(mRenderer->getCapsDeclTypes(), vertexFormatType);
>+    angle::FormatID vertexFormatID = gl::GetVertexFormatID(attrib, currentValueType);
>+    const d3d9::VertexFormat &d3dVertexInfo =
>+        d3d9::GetVertexFormatInfo(mRenderer->getCapsDeclTypes(), vertexFormatID);
>     bool needsConversion = (d3dVertexInfo.conversionType & VERTEX_CONVERT_CPU) > 0;
> 
>     if (!needsConversion && inputStride == elementSize)
>     {
>-        size_t copySize = static_cast<size_t>(count) * static_cast<size_t>(inputStride);
>+        size_t copySize = count * inputStride;
>         memcpy(mapPtr, input, copySize);
>     }
>     else
>@@ -115,7 +108,7 @@ gl::Error VertexBuffer9::storeVertexAttributes(const gl::VertexAttribute &attrib
> 
>     mVertexBuffer->Unlock();
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
> unsigned int VertexBuffer9::getBufferSize() const
>@@ -123,46 +116,37 @@ unsigned int VertexBuffer9::getBufferSize() const
>     return mBufferSize;
> }
> 
>-gl::Error VertexBuffer9::setBufferSize(unsigned int size)
>+angle::Result VertexBuffer9::setBufferSize(const gl::Context *context, unsigned int size)
> {
>     if (size > mBufferSize)
>     {
>-        return initialize(size, mDynamicUsage);
>+        return initialize(context, size, mDynamicUsage);
>     }
>     else
>     {
>-        return gl::NoError();
>+        return angle::Result::Continue;
>     }
> }
> 
>-gl::Error VertexBuffer9::discard()
>+angle::Result VertexBuffer9::discard(const gl::Context *context)
> {
>-    if (!mVertexBuffer)
>-    {
>-        return gl::OutOfMemory() << "Internal vertex buffer is not initialized.";
>-    }
>+    ASSERT(mVertexBuffer);
> 
>     void *dummy;
>     HRESULT result;
> 
>+    Context9 *context9 = GetImplAs<Context9>(context);
>+
>     result = mVertexBuffer->Lock(0, 1, &dummy, D3DLOCK_DISCARD);
>-    if (FAILED(result))
>-    {
>-        return gl::OutOfMemory() << "Failed to lock internal buffer for discarding, "
>-                                 << gl::FmtHR(result);
>-    }
>+    ANGLE_TRY_HR(context9, result, "Failed to lock internal vertex buffer for discarding");
> 
>     result = mVertexBuffer->Unlock();
>-    if (FAILED(result))
>-    {
>-        return gl::OutOfMemory() << "Failed to unlock internal buffer for discarding, "
>-                                 << gl::FmtHR(result);
>-    }
>+    ANGLE_TRY_HR(context9, result, "Failed to unlock internal vertex buffer for discarding");
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-IDirect3DVertexBuffer9 * VertexBuffer9::getBuffer() const
>+IDirect3DVertexBuffer9 *VertexBuffer9::getBuffer() const
> {
>     return mVertexBuffer;
> }
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/VertexBuffer9.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/VertexBuffer9.h
>index 983616f4e40..178a7a3f6a1 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/VertexBuffer9.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/VertexBuffer9.h
>@@ -20,22 +20,25 @@ class VertexBuffer9 : public VertexBuffer
>   public:
>     explicit VertexBuffer9(Renderer9 *renderer);
> 
>-    gl::Error initialize(unsigned int size, bool dynamicUsage) override;
>+    angle::Result initialize(const gl::Context *context,
>+                             unsigned int size,
>+                             bool dynamicUsage) override;
> 
>     // Warning: you should ensure binding really matches attrib.bindingIndex before using this
>     // function.
>-    gl::Error storeVertexAttributes(const gl::VertexAttribute &attrib,
>-                                    const gl::VertexBinding &binding,
>-                                    GLenum currentValueType,
>-                                    GLint start,
>-                                    GLsizei count,
>-                                    GLsizei instances,
>-                                    unsigned int offset,
>-                                    const uint8_t *sourceData) override;
>+    angle::Result storeVertexAttributes(const gl::Context *context,
>+                                        const gl::VertexAttribute &attrib,
>+                                        const gl::VertexBinding &binding,
>+                                        gl::VertexAttribType currentValueType,
>+                                        GLint start,
>+                                        size_t count,
>+                                        GLsizei instances,
>+                                        unsigned int offset,
>+                                        const uint8_t *sourceData) override;
> 
>     unsigned int getBufferSize() const override;
>-    gl::Error setBufferSize(unsigned int size) override;
>-    gl::Error discard() override;
>+    angle::Result setBufferSize(const gl::Context *context, unsigned int size) override;
>+    angle::Result discard(const gl::Context *context) override;
> 
>     IDirect3DVertexBuffer9 *getBuffer() const;
> 
>@@ -48,6 +51,6 @@ class VertexBuffer9 : public VertexBuffer
>     bool mDynamicUsage;
> };
> 
>-}
>+}  // namespace rx
> 
>-#endif // LIBANGLE_RENDERER_D3D_D3D9_VERTEXBUFFER9_H_
>+#endif  // LIBANGLE_RENDERER_D3D_D3D9_VERTEXBUFFER9_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/VertexDeclarationCache.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/VertexDeclarationCache.cpp
>index abadf5c0b54..c7c642404e9 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/VertexDeclarationCache.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/VertexDeclarationCache.cpp
>@@ -8,9 +8,11 @@
> 
> #include "libANGLE/renderer/d3d/d3d9/VertexDeclarationCache.h"
> 
>+#include "libANGLE/Context.h"
> #include "libANGLE/VertexAttribute.h"
> #include "libANGLE/formatutils.h"
> #include "libANGLE/renderer/d3d/ProgramD3D.h"
>+#include "libANGLE/renderer/d3d/d3d9/Context9.h"
> #include "libANGLE/renderer/d3d/d3d9/VertexBuffer9.h"
> #include "libANGLE/renderer/d3d/d3d9/formatutils9.h"
> 
>@@ -22,7 +24,7 @@ VertexDeclarationCache::VertexDeclarationCache() : mMaxLru(0)
>     for (int i = 0; i < NUM_VERTEX_DECL_CACHE_ENTRIES; i++)
>     {
>         mVertexDeclCache[i].vertexDeclaration = nullptr;
>-        mVertexDeclCache[i].lruCount = 0;
>+        mVertexDeclCache[i].lruCount          = 0;
>     }
> 
>     for (int i = 0; i < gl::MAX_VERTEX_ATTRIBS; i++)
>@@ -42,7 +44,8 @@ VertexDeclarationCache::~VertexDeclarationCache()
>     }
> }
> 
>-gl::Error VertexDeclarationCache::applyDeclaration(
>+angle::Result VertexDeclarationCache::applyDeclaration(
>+    const gl::Context *context,
>     IDirect3DDevice9 *device,
>     const std::vector<TranslatedAttribute> &attributes,
>     gl::Program *program,
>@@ -55,8 +58,8 @@ gl::Error VertexDeclarationCache::applyDeclaration(
>     *repeatDraw = 1;
> 
>     const size_t invalidAttribIndex = attributes.size();
>-    size_t indexedAttribute = invalidAttribIndex;
>-    size_t instancedAttribute = invalidAttribIndex;
>+    size_t indexedAttribute         = invalidAttribIndex;
>+    size_t instancedAttribute       = invalidAttribIndex;
> 
>     if (instances == 0)
>     {
>@@ -64,8 +67,8 @@ gl::Error VertexDeclarationCache::applyDeclaration(
>         {
>             if (attributes[i].divisor != 0)
>             {
>-                // If a divisor is set, it still applies even if an instanced draw was not used, so treat
>-                // as a single-instance draw.
>+                // If a divisor is set, it still applies even if an instanced draw was not used, so
>+                // treat as a single-instance draw.
>                 instances = 1;
>                 break;
>             }
>@@ -87,13 +90,14 @@ gl::Error VertexDeclarationCache::applyDeclaration(
>                 {
>                     instancedAttribute = i;
>                 }
>-                if (indexedAttribute != invalidAttribIndex && instancedAttribute != invalidAttribIndex)
>-                    break;   // Found both an indexed and instanced attribute
>+                if (indexedAttribute != invalidAttribIndex &&
>+                    instancedAttribute != invalidAttribIndex)
>+                    break;  // Found both an indexed and instanced attribute
>             }
>         }
> 
>-        // The validation layer checks that there is at least one active attribute with a zero divisor as per
>-        // the GL_ANGLE_instanced_arrays spec.
>+        // The validation layer checks that there is at least one active attribute with a zero
>+        // divisor as per the GL_ANGLE_instanced_arrays spec.
>         ASSERT(indexedAttribute != invalidAttribIndex);
>     }
> 
>@@ -117,7 +121,8 @@ gl::Error VertexDeclarationCache::applyDeclaration(
> 
>             if (instances > 0)
>             {
>-                // Due to a bug on ATI cards we can't enable instancing when none of the attributes are instanced.
>+                // Due to a bug on ATI cards we can't enable instancing when none of the attributes
>+                // are instanced.
>                 if (instancedAttribute == invalidAttribIndex)
>                 {
>                     *repeatDraw = instances;
>@@ -134,7 +139,7 @@ gl::Error VertexDeclarationCache::applyDeclaration(
>                     }
> 
>                     UINT frequency = 1;
>-                    
>+
>                     if (attributes[i].divisor == 0)
>                     {
>                         frequency = D3DSTREAMSOURCE_INDEXEDDATA | instances;
>@@ -143,7 +148,7 @@ gl::Error VertexDeclarationCache::applyDeclaration(
>                     {
>                         frequency = D3DSTREAMSOURCE_INSTANCEDATA | attributes[i].divisor;
>                     }
>-                    
>+
>                     device->SetStreamSourceFreq(stream, frequency);
>                     mInstancingEnabled = true;
>                 }
>@@ -152,7 +157,7 @@ gl::Error VertexDeclarationCache::applyDeclaration(
>             VertexBuffer9 *vertexBuffer = GetAs<VertexBuffer9>(attributes[i].vertexBuffer.get());
> 
>             unsigned int offset = 0;
>-            ANGLE_TRY_RESULT(attributes[i].computeOffset(start), offset);
>+            ANGLE_TRY(attributes[i].computeOffset(context, start, &offset));
> 
>             if (mAppliedVBs[stream].serial != attributes[i].serial ||
>                 mAppliedVBs[stream].stride != attributes[i].stride ||
>@@ -165,15 +170,16 @@ gl::Error VertexDeclarationCache::applyDeclaration(
>                 mAppliedVBs[stream].offset = offset;
>             }
> 
>-            gl::VertexFormatType vertexformatType =
>-                gl::GetVertexFormatType(*attributes[i].attribute, GL_FLOAT);
>-            const d3d9::VertexFormat &d3d9VertexInfo = d3d9::GetVertexFormatInfo(caps.DeclTypes, vertexformatType);
>+            angle::FormatID vertexformatID =
>+                gl::GetVertexFormatID(*attributes[i].attribute, gl::VertexAttribType::Float);
>+            const d3d9::VertexFormat &d3d9VertexInfo =
>+                d3d9::GetVertexFormatInfo(caps.DeclTypes, vertexformatID);
> 
>-            element->Stream = static_cast<WORD>(stream);
>-            element->Offset = 0;
>-            element->Type = static_cast<BYTE>(d3d9VertexInfo.nativeFormat);
>-            element->Method = D3DDECLMETHOD_DEFAULT;
>-            element->Usage = D3DDECLUSAGE_TEXCOORD;
>+            element->Stream     = static_cast<WORD>(stream);
>+            element->Offset     = 0;
>+            element->Type       = static_cast<BYTE>(d3d9VertexInfo.nativeFormat);
>+            element->Method     = D3DDECLMETHOD_DEFAULT;
>+            element->Usage      = D3DDECLUSAGE_TEXCOORD;
>             element->UsageIndex = static_cast<BYTE>(semanticIndexes[i]);
>             element++;
>         }
>@@ -193,21 +199,23 @@ gl::Error VertexDeclarationCache::applyDeclaration(
>     }
> 
>     static const D3DVERTEXELEMENT9 end = D3DDECL_END();
>-    *(element++) = end;
>+    *(element++)                       = end;
> 
>     for (int i = 0; i < NUM_VERTEX_DECL_CACHE_ENTRIES; i++)
>     {
>         VertexDeclCacheEntry *entry = &mVertexDeclCache[i];
>-        if (memcmp(entry->cachedElements, elements, (element - elements) * sizeof(D3DVERTEXELEMENT9)) == 0 && entry->vertexDeclaration)
>+        if (memcmp(entry->cachedElements, elements,
>+                   (element - elements) * sizeof(D3DVERTEXELEMENT9)) == 0 &&
>+            entry->vertexDeclaration)
>         {
>             entry->lruCount = ++mMaxLru;
>-            if(entry->vertexDeclaration != mLastSetVDecl)
>+            if (entry->vertexDeclaration != mLastSetVDecl)
>             {
>                 device->SetVertexDeclaration(entry->vertexDeclaration);
>                 mLastSetVDecl = entry->vertexDeclaration;
>             }
> 
>-            return gl::NoError();
>+            return angle::Result::Continue;
>         }
>     }
> 
>@@ -230,17 +238,14 @@ gl::Error VertexDeclarationCache::applyDeclaration(
> 
>     memcpy(lastCache->cachedElements, elements, (element - elements) * sizeof(D3DVERTEXELEMENT9));
>     HRESULT result = device->CreateVertexDeclaration(elements, &lastCache->vertexDeclaration);
>-    if (FAILED(result))
>-    {
>-        return gl::OutOfMemory() << "Failed to create internal vertex declaration, "
>-                                 << gl::FmtHR(result);
>-    }
>+    ANGLE_TRY_HR(GetImplAs<Context9>(context), result,
>+                 "Failed to create internal vertex declaration");
> 
>     device->SetVertexDeclaration(lastCache->vertexDeclaration);
>-    mLastSetVDecl = lastCache->vertexDeclaration;
>+    mLastSetVDecl       = lastCache->vertexDeclaration;
>     lastCache->lruCount = ++mMaxLru;
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
> void VertexDeclarationCache::markStateDirty()
>@@ -251,7 +256,7 @@ void VertexDeclarationCache::markStateDirty()
>     }
> 
>     mLastSetVDecl      = nullptr;
>-    mInstancingEnabled = true;   // Forces it to be disabled when not used
>+    mInstancingEnabled = true;  // Forces it to be disabled when not used
> }
> 
>-}
>+}  // namespace rx
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/VertexDeclarationCache.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/VertexDeclarationCache.h
>index 7bd7cabae49..53667f1ff8b 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/VertexDeclarationCache.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/VertexDeclarationCache.h
>@@ -16,30 +16,33 @@ namespace gl
> {
> class VertexDataManager;
> class Program;
>-}
>+}  // namespace gl
> 
> namespace rx
> {
>-
> class VertexDeclarationCache
> {
>   public:
>     VertexDeclarationCache();
>     ~VertexDeclarationCache();
> 
>-    gl::Error applyDeclaration(IDirect3DDevice9 *device,
>-                               const std::vector<TranslatedAttribute> &attributes,
>-                               gl::Program *program,
>-                               GLint start,
>-                               GLsizei instances,
>-                               GLsizei *repeatDraw);
>+    angle::Result applyDeclaration(const gl::Context *context,
>+                                   IDirect3DDevice9 *device,
>+                                   const std::vector<TranslatedAttribute> &attributes,
>+                                   gl::Program *program,
>+                                   GLint start,
>+                                   GLsizei instances,
>+                                   GLsizei *repeatDraw);
> 
>     void markStateDirty();
> 
>   private:
>     UINT mMaxLru;
> 
>-    enum { NUM_VERTEX_DECL_CACHE_ENTRIES = 32 };
>+    enum
>+    {
>+        NUM_VERTEX_DECL_CACHE_ENTRIES = 32
>+    };
> 
>     struct VBData
>     {
>@@ -60,6 +63,6 @@ class VertexDeclarationCache
>     } mVertexDeclCache[NUM_VERTEX_DECL_CACHE_ENTRIES];
> };
> 
>-}
>+}  // namespace rx
> 
>-#endif // LIBANGLE_RENDERER_D3D_D3D9_VERTEXDECLARATIONCACHE_H_
>+#endif  // LIBANGLE_RENDERER_D3D_D3D9_VERTEXDECLARATIONCACHE_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/formatutils9.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/formatutils9.cpp
>index d10fa1ee876..74fd873526f 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/formatutils9.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/formatutils9.cpp
>@@ -41,9 +41,8 @@ D3DFormat::D3DFormat()
>       luminanceBits(0),
>       depthBits(0),
>       stencilBits(0),
>-      formatID(angle::Format::ID::NONE)
>-{
>-}
>+      formatID(angle::FormatID::NONE)
>+{}
> 
> D3DFormat::D3DFormat(GLuint bits,
>                      GLuint blockWidth,
>@@ -55,7 +54,7 @@ D3DFormat::D3DFormat(GLuint bits,
>                      GLuint lumBits,
>                      GLuint depthBits,
>                      GLuint stencilBits,
>-                     Format::ID formatID)
>+                     FormatID formatID)
>     : pixelBytes(bits / 8),
>       blockWidth(blockWidth),
>       blockHeight(blockHeight),
>@@ -67,20 +66,19 @@ D3DFormat::D3DFormat(GLuint bits,
>       depthBits(depthBits),
>       stencilBits(stencilBits),
>       formatID(formatID)
>-{
>-}
>+{}
> 
> const D3DFormat &GetD3DFormatInfo(D3DFORMAT format)
> {
>     if (format == D3DFMT_NULL)
>     {
>-        static const D3DFormat info(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, Format::ID::NONE);
>+        static const D3DFormat info(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, FormatID::NONE);
>         return info;
>     }
> 
>     if (format == D3DFMT_INTZ)
>     {
>-        static const D3DFormat info(32, 1, 1, 0, 0, 0, 0, 0, 24, 8, Format::ID::D24_UNORM_S8_UINT);
>+        static const D3DFormat info(32, 1, 1, 0, 0, 0, 0, 0, 24, 8, FormatID::D24_UNORM_S8_UINT);
>         return info;
>     }
> 
>@@ -88,123 +86,123 @@ const D3DFormat &GetD3DFormatInfo(D3DFORMAT format)
>     {
>         case D3DFMT_UNKNOWN:
>         {
>-            static const D3DFormat info(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, Format::ID::NONE);
>+            static const D3DFormat info(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, FormatID::NONE);
>             return info;
>         }
> 
>         case D3DFMT_L8:
>         {
>-            static const D3DFormat info(8, 1, 1, 0, 0, 0, 0, 8, 0, 0, Format::ID::L8_UNORM);
>+            static const D3DFormat info(8, 1, 1, 0, 0, 0, 0, 8, 0, 0, FormatID::L8_UNORM);
>             return info;
>         }
>         case D3DFMT_A8:
>         {
>-            static const D3DFormat info(8, 1, 1, 0, 0, 0, 8, 0, 0, 0, Format::ID::A8_UNORM);
>+            static const D3DFormat info(8, 1, 1, 0, 0, 0, 8, 0, 0, 0, FormatID::A8_UNORM);
>             return info;
>         }
>         case D3DFMT_A8L8:
>         {
>-            static const D3DFormat info(16, 1, 1, 0, 0, 0, 8, 8, 0, 0, Format::ID::L8A8_UNORM);
>+            static const D3DFormat info(16, 1, 1, 0, 0, 0, 8, 8, 0, 0, FormatID::L8A8_UNORM);
>             return info;
>         }
> 
>         case D3DFMT_A4R4G4B4:
>         {
>-            static const D3DFormat info(16, 1, 1, 4, 4, 4, 4, 0, 0, 0, Format::ID::B4G4R4A4_UNORM);
>+            static const D3DFormat info(16, 1, 1, 4, 4, 4, 4, 0, 0, 0, FormatID::B4G4R4A4_UNORM);
>             return info;
>         }
>         case D3DFMT_A1R5G5B5:
>         {
>-            static const D3DFormat info(16, 1, 1, 5, 5, 5, 1, 0, 0, 0, Format::ID::B5G5R5A1_UNORM);
>+            static const D3DFormat info(16, 1, 1, 5, 5, 5, 1, 0, 0, 0, FormatID::B5G5R5A1_UNORM);
>             return info;
>         }
>         case D3DFMT_R5G6B5:
>         {
>-            static const D3DFormat info(16, 1, 1, 5, 6, 5, 0, 0, 0, 0, Format::ID::R5G6B5_UNORM);
>+            static const D3DFormat info(16, 1, 1, 5, 6, 5, 0, 0, 0, 0, FormatID::R5G6B5_UNORM);
>             return info;
>         }
>         case D3DFMT_X8R8G8B8:
>         {
>-            static const D3DFormat info(32, 1, 1, 8, 8, 8, 0, 0, 0, 0, Format::ID::B8G8R8X8_UNORM);
>+            static const D3DFormat info(32, 1, 1, 8, 8, 8, 0, 0, 0, 0, FormatID::B8G8R8X8_UNORM);
>             return info;
>         }
>         case D3DFMT_A8R8G8B8:
>         {
>-            static const D3DFormat info(32, 1, 1, 8, 8, 8, 8, 0, 0, 0, Format::ID::B8G8R8A8_UNORM);
>+            static const D3DFormat info(32, 1, 1, 8, 8, 8, 8, 0, 0, 0, FormatID::B8G8R8A8_UNORM);
>             return info;
>         }
> 
>         case D3DFMT_R16F:
>         {
>-            static const D3DFormat info(16, 1, 1, 16, 0, 0, 0, 0, 0, 0, Format::ID::R16_FLOAT);
>+            static const D3DFormat info(16, 1, 1, 16, 0, 0, 0, 0, 0, 0, FormatID::R16_FLOAT);
>             return info;
>         }
>         case D3DFMT_G16R16F:
>         {
>-            static const D3DFormat info(32, 1, 1, 16, 16, 0, 0, 0, 0, 0, Format::ID::R16G16_FLOAT);
>+            static const D3DFormat info(32, 1, 1, 16, 16, 0, 0, 0, 0, 0, FormatID::R16G16_FLOAT);
>             return info;
>         }
>         case D3DFMT_A16B16G16R16F:
>         {
>             static const D3DFormat info(64, 1, 1, 16, 16, 16, 16, 0, 0, 0,
>-                                        Format::ID::R16G16B16A16_FLOAT);
>+                                        FormatID::R16G16B16A16_FLOAT);
>             return info;
>         }
>         case D3DFMT_R32F:
>         {
>-            static const D3DFormat info(32, 1, 1, 32, 0, 0, 0, 0, 0, 0, Format::ID::R32_FLOAT);
>+            static const D3DFormat info(32, 1, 1, 32, 0, 0, 0, 0, 0, 0, FormatID::R32_FLOAT);
>             return info;
>         }
>         case D3DFMT_G32R32F:
>         {
>-            static const D3DFormat info(64, 1, 1, 32, 32, 0, 0, 0, 0, 0, Format::ID::R32G32_FLOAT);
>+            static const D3DFormat info(64, 1, 1, 32, 32, 0, 0, 0, 0, 0, FormatID::R32G32_FLOAT);
>             return info;
>         }
>         case D3DFMT_A32B32G32R32F:
>         {
>             static const D3DFormat info(128, 1, 1, 32, 32, 32, 32, 0, 0, 0,
>-                                        Format::ID::R32G32B32A32_FLOAT);
>+                                        FormatID::R32G32B32A32_FLOAT);
>             return info;
>         }
> 
>         case D3DFMT_D16:
>         {
>-            static const D3DFormat info(16, 1, 1, 0, 0, 0, 0, 0, 16, 0, Format::ID::D16_UNORM);
>+            static const D3DFormat info(16, 1, 1, 0, 0, 0, 0, 0, 16, 0, FormatID::D16_UNORM);
>             return info;
>         }
>         case D3DFMT_D24S8:
>         {
>             static const D3DFormat info(32, 1, 1, 0, 0, 0, 0, 0, 24, 8,
>-                                        Format::ID::D24_UNORM_S8_UINT);
>+                                        FormatID::D24_UNORM_S8_UINT);
>             return info;
>         }
>         case D3DFMT_D24X8:
>         {
>-            static const D3DFormat info(32, 1, 1, 0, 0, 0, 0, 0, 24, 0, Format::ID::D16_UNORM);
>+            static const D3DFormat info(32, 1, 1, 0, 0, 0, 0, 0, 24, 0, FormatID::D16_UNORM);
>             return info;
>         }
>         case D3DFMT_D32:
>         {
>-            static const D3DFormat info(32, 1, 1, 0, 0, 0, 0, 0, 32, 0, Format::ID::D32_UNORM);
>+            static const D3DFormat info(32, 1, 1, 0, 0, 0, 0, 0, 32, 0, FormatID::D32_UNORM);
>             return info;
>         }
> 
>         case D3DFMT_DXT1:
>         {
>             static const D3DFormat info(64, 4, 4, 0, 0, 0, 0, 0, 0, 0,
>-                                        Format::ID::BC1_RGBA_UNORM_BLOCK);
>+                                        FormatID::BC1_RGBA_UNORM_BLOCK);
>             return info;
>         }
>         case D3DFMT_DXT3:
>         {
>             static const D3DFormat info(128, 4, 4, 0, 0, 0, 0, 0, 0, 0,
>-                                        Format::ID::BC2_RGBA_UNORM_BLOCK);
>+                                        FormatID::BC2_RGBA_UNORM_BLOCK);
>             return info;
>         }
>         case D3DFMT_DXT5:
>         {
>             static const D3DFormat info(128, 4, 4, 0, 0, 0, 0, 0, 0, 0,
>-                                        Format::ID::BC3_RGBA_UNORM_BLOCK);
>+                                        FormatID::BC3_RGBA_UNORM_BLOCK);
>             return info;
>         }
> 
>@@ -225,15 +223,24 @@ static InternalFormatInitialzerMap BuildInternalFormatInitialzerMap()
> 
>     InternalFormatInitialzerMap map;
> 
>-    map.insert(InternalFormatInitialzerPair(GL_RGB16F, Initialize4ComponentData<GLhalf,   0x0000,     0x0000,     0x0000,     gl::Float16One>));
>-    map.insert(InternalFormatInitialzerPair(GL_RGB32F, Initialize4ComponentData<GLfloat,  0x00000000, 0x00000000, 0x00000000, gl::Float32One>));
>+    map.insert(InternalFormatInitialzerPair(
>+        GL_RGB16F, Initialize4ComponentData<GLhalf, 0x0000, 0x0000, 0x0000, gl::Float16One>));
>+    map.insert(InternalFormatInitialzerPair(
>+        GL_RGB32F,
>+        Initialize4ComponentData<GLfloat, 0x00000000, 0x00000000, 0x00000000, gl::Float32One>));
> 
>     return map;
> }
> 
>-static void UnreachableLoad(size_t width, size_t height, size_t depth,
>-                            const uint8_t *input, size_t inputRowPitch, size_t inputDepthPitch,
>-                            uint8_t *output, size_t outputRowPitch, size_t outputDepthPitch)
>+static void UnreachableLoad(size_t width,
>+                            size_t height,
>+                            size_t depth,
>+                            const uint8_t *input,
>+                            size_t inputRowPitch,
>+                            size_t inputDepthPitch,
>+                            uint8_t *output,
>+                            size_t outputRowPitch,
>+                            size_t outputDepthPitch)
> {
>     UNREACHABLE();
> }
>@@ -246,18 +253,22 @@ TextureFormat::TextureFormat()
>       renderFormat(D3DFMT_UNKNOWN),
>       dataInitializerFunction(nullptr),
>       loadFunction(UnreachableLoad)
>-{
>-}
>+{}
> 
>-static inline void InsertD3D9FormatInfo(D3D9FormatMap *map, GLenum internalFormat, D3DFORMAT texFormat,
>-                                        D3DFORMAT renderFormat, LoadImageFunction loadFunction)
>+static inline void InsertD3D9FormatInfo(D3D9FormatMap *map,
>+                                        GLenum internalFormat,
>+                                        D3DFORMAT texFormat,
>+                                        D3DFORMAT renderFormat,
>+                                        LoadImageFunction loadFunction)
> {
>     TextureFormat info;
>-    info.texFormat = texFormat;
>+    info.texFormat    = texFormat;
>     info.renderFormat = renderFormat;
> 
>-    static const InternalFormatInitialzerMap dataInitializationMap = BuildInternalFormatInitialzerMap();
>-    InternalFormatInitialzerMap::const_iterator dataInitIter = dataInitializationMap.find(internalFormat);
>+    static const InternalFormatInitialzerMap dataInitializationMap =
>+        BuildInternalFormatInitialzerMap();
>+    InternalFormatInitialzerMap::const_iterator dataInitIter =
>+        dataInitializationMap.find(internalFormat);
>     info.dataInitializerFunction =
>         (dataInitIter != dataInitializationMap.end()) ? dataInitIter->second : nullptr;
> 
>@@ -337,7 +348,7 @@ static D3D9FormatMap BuildD3D9FormatMap()
> const TextureFormat &GetTextureFormatInfo(GLenum internalFormat)
> {
>     static const D3D9FormatMap formatMap = BuildD3D9FormatMap();
>-    D3D9FormatMap::const_iterator iter = formatMap.find(internalFormat);
>+    D3D9FormatMap::const_iterator iter   = formatMap.find(internalFormat);
>     if (iter != formatMap.end())
>     {
>         return iter->second;
>@@ -353,24 +364,41 @@ static GLenum GetDeclTypeComponentType(D3DDECLTYPE declType)
> {
>     switch (declType)
>     {
>-      case D3DDECLTYPE_FLOAT1:   return GL_FLOAT;
>-      case D3DDECLTYPE_FLOAT2:   return GL_FLOAT;
>-      case D3DDECLTYPE_FLOAT3:   return GL_FLOAT;
>-      case D3DDECLTYPE_FLOAT4:   return GL_FLOAT;
>-      case D3DDECLTYPE_UBYTE4:   return GL_UNSIGNED_INT;
>-      case D3DDECLTYPE_SHORT2:   return GL_INT;
>-      case D3DDECLTYPE_SHORT4:   return GL_INT;
>-      case D3DDECLTYPE_UBYTE4N:  return GL_UNSIGNED_NORMALIZED;
>-      case D3DDECLTYPE_SHORT4N:  return GL_SIGNED_NORMALIZED;
>-      case D3DDECLTYPE_USHORT4N: return GL_UNSIGNED_NORMALIZED;
>-      case D3DDECLTYPE_SHORT2N:  return GL_SIGNED_NORMALIZED;
>-      case D3DDECLTYPE_USHORT2N: return GL_UNSIGNED_NORMALIZED;
>-      default: UNREACHABLE();    return GL_NONE;
>+        case D3DDECLTYPE_FLOAT1:
>+            return GL_FLOAT;
>+        case D3DDECLTYPE_FLOAT2:
>+            return GL_FLOAT;
>+        case D3DDECLTYPE_FLOAT3:
>+            return GL_FLOAT;
>+        case D3DDECLTYPE_FLOAT4:
>+            return GL_FLOAT;
>+        case D3DDECLTYPE_UBYTE4:
>+            return GL_UNSIGNED_INT;
>+        case D3DDECLTYPE_SHORT2:
>+            return GL_INT;
>+        case D3DDECLTYPE_SHORT4:
>+            return GL_INT;
>+        case D3DDECLTYPE_UBYTE4N:
>+            return GL_UNSIGNED_NORMALIZED;
>+        case D3DDECLTYPE_SHORT4N:
>+            return GL_SIGNED_NORMALIZED;
>+        case D3DDECLTYPE_USHORT4N:
>+            return GL_UNSIGNED_NORMALIZED;
>+        case D3DDECLTYPE_SHORT2N:
>+            return GL_SIGNED_NORMALIZED;
>+        case D3DDECLTYPE_USHORT2N:
>+            return GL_UNSIGNED_NORMALIZED;
>+        default:
>+            UNREACHABLE();
>+            return GL_NONE;
>     }
> }
> 
> // Attribute format conversion
>-enum { NUM_GL_VERTEX_ATTRIB_TYPES = 6 };
>+enum
>+{
>+    NUM_GL_VERTEX_ATTRIB_TYPES = 6
>+};
> 
> struct TranslationDescription
> {
>@@ -393,14 +421,40 @@ struct TranslationDescription
> // FLOAT                FLOAT (Identity)
> 
> // GLToCType maps from GL type (as GLenum) to the C typedef.
>-template <GLenum GLType> struct GLToCType { };
>+template <GLenum GLType>
>+struct GLToCType
>+{};
> 
>-template <> struct GLToCType<GL_BYTE>           { typedef GLbyte type;      };
>-template <> struct GLToCType<GL_UNSIGNED_BYTE>  { typedef GLubyte type;     };
>-template <> struct GLToCType<GL_SHORT>          { typedef GLshort type;     };
>-template <> struct GLToCType<GL_UNSIGNED_SHORT> { typedef GLushort type;    };
>-template <> struct GLToCType<GL_FIXED>          { typedef GLuint type;      };
>-template <> struct GLToCType<GL_FLOAT>          { typedef GLfloat type;     };
>+template <>
>+struct GLToCType<GL_BYTE>
>+{
>+    typedef GLbyte type;
>+};
>+template <>
>+struct GLToCType<GL_UNSIGNED_BYTE>
>+{
>+    typedef GLubyte type;
>+};
>+template <>
>+struct GLToCType<GL_SHORT>
>+{
>+    typedef GLshort type;
>+};
>+template <>
>+struct GLToCType<GL_UNSIGNED_SHORT>
>+{
>+    typedef GLushort type;
>+};
>+template <>
>+struct GLToCType<GL_FIXED>
>+{
>+    typedef GLuint type;
>+};
>+template <>
>+struct GLToCType<GL_FLOAT>
>+{
>+    typedef GLfloat type;
>+};
> 
> // This differs from D3DDECLTYPE in that it is unsized. (Size expansion is applied last.)
> enum D3DVertexType
>@@ -414,104 +468,247 @@ enum D3DVertexType
> };
> 
> // D3DToCType maps from D3D vertex type (as enum D3DVertexType) to the corresponding C type.
>-template <unsigned int D3DType> struct D3DToCType { };
>-
>-template <> struct D3DToCType<D3DVT_FLOAT> { typedef float type; };
>-template <> struct D3DToCType<D3DVT_SHORT> { typedef short type; };
>-template <> struct D3DToCType<D3DVT_SHORT_NORM> { typedef short type; };
>-template <> struct D3DToCType<D3DVT_UBYTE> { typedef unsigned char type; };
>-template <> struct D3DToCType<D3DVT_UBYTE_NORM> { typedef unsigned char type; };
>-template <> struct D3DToCType<D3DVT_USHORT_NORM> { typedef unsigned short type; };
>+template <unsigned int D3DType>
>+struct D3DToCType
>+{};
> 
>-// Encode the type/size combinations that D3D permits. For each type/size it expands to a widener that will provide the appropriate final size.
>-template <unsigned int type, int size> struct WidenRule { };
>-
>-template <int size> struct WidenRule<D3DVT_FLOAT, size>          : NoWiden<size> { };
>-template <int size> struct WidenRule<D3DVT_SHORT, size>          : WidenToEven<size> { };
>-template <int size> struct WidenRule<D3DVT_SHORT_NORM, size>     : WidenToEven<size> { };
>-template <int size> struct WidenRule<D3DVT_UBYTE, size>          : WidenToFour<size> { };
>-template <int size> struct WidenRule<D3DVT_UBYTE_NORM, size>     : WidenToFour<size> { };
>-template <int size> struct WidenRule<D3DVT_USHORT_NORM, size>    : WidenToEven<size> { };
>+template <>
>+struct D3DToCType<D3DVT_FLOAT>
>+{
>+    typedef float type;
>+};
>+template <>
>+struct D3DToCType<D3DVT_SHORT>
>+{
>+    typedef short type;
>+};
>+template <>
>+struct D3DToCType<D3DVT_SHORT_NORM>
>+{
>+    typedef short type;
>+};
>+template <>
>+struct D3DToCType<D3DVT_UBYTE>
>+{
>+    typedef unsigned char type;
>+};
>+template <>
>+struct D3DToCType<D3DVT_UBYTE_NORM>
>+{
>+    typedef unsigned char type;
>+};
>+template <>
>+struct D3DToCType<D3DVT_USHORT_NORM>
>+{
>+    typedef unsigned short type;
>+};
> 
>-// VertexTypeFlags encodes the D3DCAPS9::DeclType flag and vertex declaration flag for each D3D vertex type & size combination.
>-template <unsigned int d3dtype, int size> struct VertexTypeFlags { };
>+// Encode the type/size combinations that D3D permits. For each type/size it expands to a widener
>+// that will provide the appropriate final size.
>+template <unsigned int type, int size>
>+struct WidenRule
>+{};
>+
>+template <int size>
>+struct WidenRule<D3DVT_FLOAT, size> : NoWiden<size>
>+{};
>+template <int size>
>+struct WidenRule<D3DVT_SHORT, size> : WidenToEven<size>
>+{};
>+template <int size>
>+struct WidenRule<D3DVT_SHORT_NORM, size> : WidenToEven<size>
>+{};
>+template <int size>
>+struct WidenRule<D3DVT_UBYTE, size> : WidenToFour<size>
>+{};
>+template <int size>
>+struct WidenRule<D3DVT_UBYTE_NORM, size> : WidenToFour<size>
>+{};
>+template <int size>
>+struct WidenRule<D3DVT_USHORT_NORM, size> : WidenToEven<size>
>+{};
>+
>+// VertexTypeFlags encodes the D3DCAPS9::DeclType flag and vertex declaration flag for each D3D
>+// vertex type & size combination.
>+template <unsigned int d3dtype, int size>
>+struct VertexTypeFlags
>+{};
> 
> template <unsigned int _capflag, unsigned int _declflag>
> struct VertexTypeFlagsHelper
> {
>-    enum { capflag = _capflag };
>-    enum { declflag = _declflag };
>+    enum
>+    {
>+        capflag = _capflag
>+    };
>+    enum
>+    {
>+        declflag = _declflag
>+    };
> };
> 
>-template <> struct VertexTypeFlags<D3DVT_FLOAT, 1> : VertexTypeFlagsHelper<0, D3DDECLTYPE_FLOAT1> { };
>-template <> struct VertexTypeFlags<D3DVT_FLOAT, 2> : VertexTypeFlagsHelper<0, D3DDECLTYPE_FLOAT2> { };
>-template <> struct VertexTypeFlags<D3DVT_FLOAT, 3> : VertexTypeFlagsHelper<0, D3DDECLTYPE_FLOAT3> { };
>-template <> struct VertexTypeFlags<D3DVT_FLOAT, 4> : VertexTypeFlagsHelper<0, D3DDECLTYPE_FLOAT4> { };
>-template <> struct VertexTypeFlags<D3DVT_SHORT, 2> : VertexTypeFlagsHelper<0, D3DDECLTYPE_SHORT2> { };
>-template <> struct VertexTypeFlags<D3DVT_SHORT, 4> : VertexTypeFlagsHelper<0, D3DDECLTYPE_SHORT4> { };
>-template <> struct VertexTypeFlags<D3DVT_SHORT_NORM, 2> : VertexTypeFlagsHelper<D3DDTCAPS_SHORT2N, D3DDECLTYPE_SHORT2N> { };
>-template <> struct VertexTypeFlags<D3DVT_SHORT_NORM, 4> : VertexTypeFlagsHelper<D3DDTCAPS_SHORT4N, D3DDECLTYPE_SHORT4N> { };
>-template <> struct VertexTypeFlags<D3DVT_UBYTE, 4> : VertexTypeFlagsHelper<D3DDTCAPS_UBYTE4, D3DDECLTYPE_UBYTE4> { };
>-template <> struct VertexTypeFlags<D3DVT_UBYTE_NORM, 4> : VertexTypeFlagsHelper<D3DDTCAPS_UBYTE4N, D3DDECLTYPE_UBYTE4N> { };
>-template <> struct VertexTypeFlags<D3DVT_USHORT_NORM, 2> : VertexTypeFlagsHelper<D3DDTCAPS_USHORT2N, D3DDECLTYPE_USHORT2N> { };
>-template <> struct VertexTypeFlags<D3DVT_USHORT_NORM, 4> : VertexTypeFlagsHelper<D3DDTCAPS_USHORT4N, D3DDECLTYPE_USHORT4N> { };
>-
>-
>-// VertexTypeMapping maps GL type & normalized flag to preferred and fallback D3D vertex types (as D3DVertexType enums).
>-template <GLenum GLtype, bool normalized> struct VertexTypeMapping { };
>+template <>
>+struct VertexTypeFlags<D3DVT_FLOAT, 1> : VertexTypeFlagsHelper<0, D3DDECLTYPE_FLOAT1>
>+{};
>+template <>
>+struct VertexTypeFlags<D3DVT_FLOAT, 2> : VertexTypeFlagsHelper<0, D3DDECLTYPE_FLOAT2>
>+{};
>+template <>
>+struct VertexTypeFlags<D3DVT_FLOAT, 3> : VertexTypeFlagsHelper<0, D3DDECLTYPE_FLOAT3>
>+{};
>+template <>
>+struct VertexTypeFlags<D3DVT_FLOAT, 4> : VertexTypeFlagsHelper<0, D3DDECLTYPE_FLOAT4>
>+{};
>+template <>
>+struct VertexTypeFlags<D3DVT_SHORT, 2> : VertexTypeFlagsHelper<0, D3DDECLTYPE_SHORT2>
>+{};
>+template <>
>+struct VertexTypeFlags<D3DVT_SHORT, 4> : VertexTypeFlagsHelper<0, D3DDECLTYPE_SHORT4>
>+{};
>+template <>
>+struct VertexTypeFlags<D3DVT_SHORT_NORM, 2>
>+    : VertexTypeFlagsHelper<D3DDTCAPS_SHORT2N, D3DDECLTYPE_SHORT2N>
>+{};
>+template <>
>+struct VertexTypeFlags<D3DVT_SHORT_NORM, 4>
>+    : VertexTypeFlagsHelper<D3DDTCAPS_SHORT4N, D3DDECLTYPE_SHORT4N>
>+{};
>+template <>
>+struct VertexTypeFlags<D3DVT_UBYTE, 4> : VertexTypeFlagsHelper<D3DDTCAPS_UBYTE4, D3DDECLTYPE_UBYTE4>
>+{};
>+template <>
>+struct VertexTypeFlags<D3DVT_UBYTE_NORM, 4>
>+    : VertexTypeFlagsHelper<D3DDTCAPS_UBYTE4N, D3DDECLTYPE_UBYTE4N>
>+{};
>+template <>
>+struct VertexTypeFlags<D3DVT_USHORT_NORM, 2>
>+    : VertexTypeFlagsHelper<D3DDTCAPS_USHORT2N, D3DDECLTYPE_USHORT2N>
>+{};
>+template <>
>+struct VertexTypeFlags<D3DVT_USHORT_NORM, 4>
>+    : VertexTypeFlagsHelper<D3DDTCAPS_USHORT4N, D3DDECLTYPE_USHORT4N>
>+{};
>+
>+// VertexTypeMapping maps GL type & normalized flag to preferred and fallback D3D vertex types (as
>+// D3DVertexType enums).
>+template <GLenum GLtype, bool normalized>
>+struct VertexTypeMapping
>+{};
> 
> template <D3DVertexType Preferred, D3DVertexType Fallback = Preferred>
> struct VertexTypeMappingBase
> {
>-    enum { preferred = Preferred };
>-    enum { fallback = Fallback };
>+    enum
>+    {
>+        preferred = Preferred
>+    };
>+    enum
>+    {
>+        fallback = Fallback
>+    };
> };
> 
>-template <> struct VertexTypeMapping<GL_BYTE, false>                        : VertexTypeMappingBase<D3DVT_SHORT> { };                       // Cast
>-template <> struct VertexTypeMapping<GL_BYTE, true>                         : VertexTypeMappingBase<D3DVT_FLOAT> { };                       // Normalize
>-template <> struct VertexTypeMapping<GL_UNSIGNED_BYTE, false>               : VertexTypeMappingBase<D3DVT_UBYTE, D3DVT_FLOAT> { };          // Identity, Cast
>-template <> struct VertexTypeMapping<GL_UNSIGNED_BYTE, true>                : VertexTypeMappingBase<D3DVT_UBYTE_NORM, D3DVT_FLOAT> { };     // Identity, Normalize
>-template <> struct VertexTypeMapping<GL_SHORT, false>                       : VertexTypeMappingBase<D3DVT_SHORT> { };                       // Identity
>-template <> struct VertexTypeMapping<GL_SHORT, true>                        : VertexTypeMappingBase<D3DVT_SHORT_NORM, D3DVT_FLOAT> { };     // Cast, Normalize
>-template <> struct VertexTypeMapping<GL_UNSIGNED_SHORT, false>              : VertexTypeMappingBase<D3DVT_FLOAT> { };                       // Cast
>-template <> struct VertexTypeMapping<GL_UNSIGNED_SHORT, true>               : VertexTypeMappingBase<D3DVT_USHORT_NORM, D3DVT_FLOAT> { };    // Cast, Normalize
>-template <bool normalized> struct VertexTypeMapping<GL_FIXED, normalized>   : VertexTypeMappingBase<D3DVT_FLOAT> { };                       // FixedToFloat
>-template <bool normalized> struct VertexTypeMapping<GL_FLOAT, normalized>   : VertexTypeMappingBase<D3DVT_FLOAT> { };                       // Identity
>-
>-
>-// Given a GL type & norm flag and a D3D type, ConversionRule provides the type conversion rule (Cast, Normalize, Identity, FixedToFloat).
>-// The conversion rules themselves are defined in vertexconversion.h.
>-
>-// Almost all cases are covered by Cast (including those that are actually Identity since Cast<T,T> knows it's an identity mapping).
>+template <>
>+struct VertexTypeMapping<GL_BYTE, false> : VertexTypeMappingBase<D3DVT_SHORT>
>+{};  // Cast
>+template <>
>+struct VertexTypeMapping<GL_BYTE, true> : VertexTypeMappingBase<D3DVT_FLOAT>
>+{};  // Normalize
>+template <>
>+struct VertexTypeMapping<GL_UNSIGNED_BYTE, false> : VertexTypeMappingBase<D3DVT_UBYTE, D3DVT_FLOAT>
>+{};  // Identity, Cast
>+template <>
>+struct VertexTypeMapping<GL_UNSIGNED_BYTE, true>
>+    : VertexTypeMappingBase<D3DVT_UBYTE_NORM, D3DVT_FLOAT>
>+{};  // Identity, Normalize
>+template <>
>+struct VertexTypeMapping<GL_SHORT, false> : VertexTypeMappingBase<D3DVT_SHORT>
>+{};  // Identity
>+template <>
>+struct VertexTypeMapping<GL_SHORT, true> : VertexTypeMappingBase<D3DVT_SHORT_NORM, D3DVT_FLOAT>
>+{};  // Cast, Normalize
>+template <>
>+struct VertexTypeMapping<GL_UNSIGNED_SHORT, false> : VertexTypeMappingBase<D3DVT_FLOAT>
>+{};  // Cast
>+template <>
>+struct VertexTypeMapping<GL_UNSIGNED_SHORT, true>
>+    : VertexTypeMappingBase<D3DVT_USHORT_NORM, D3DVT_FLOAT>
>+{};  // Cast, Normalize
>+template <bool normalized>
>+struct VertexTypeMapping<GL_FIXED, normalized> : VertexTypeMappingBase<D3DVT_FLOAT>
>+{};  // FixedToFloat
>+template <bool normalized>
>+struct VertexTypeMapping<GL_FLOAT, normalized> : VertexTypeMappingBase<D3DVT_FLOAT>
>+{};  // Identity
>+
>+// Given a GL type & norm flag and a D3D type, ConversionRule provides the type conversion rule
>+// (Cast, Normalize, Identity, FixedToFloat). The conversion rules themselves are defined in
>+// vertexconversion.h.
>+
>+// Almost all cases are covered by Cast (including those that are actually Identity since Cast<T,T>
>+// knows it's an identity mapping).
> template <GLenum fromType, bool normalized, unsigned int toType>
>-struct ConversionRule : Cast<typename GLToCType<fromType>::type, typename D3DToCType<toType>::type> { };
>+struct ConversionRule : Cast<typename GLToCType<fromType>::type, typename D3DToCType<toType>::type>
>+{};
> 
> // All conversions from normalized types to float use the Normalize operator.
>-template <GLenum fromType> struct ConversionRule<fromType, true, D3DVT_FLOAT> : Normalize<typename GLToCType<fromType>::type> { };
>-
>-// Use a full specialization for this so that it preferentially matches ahead of the generic normalize-to-float rules.
>-template <> struct ConversionRule<GL_FIXED, true, D3DVT_FLOAT>  : FixedToFloat<GLint, 16> { };
>-template <> struct ConversionRule<GL_FIXED, false, D3DVT_FLOAT> : FixedToFloat<GLint, 16> { };
>-
>-// A 2-stage construction is used for DefaultVertexValues because float must use SimpleDefaultValues (i.e. 0/1)
>-// whether it is normalized or not.
>-template <class T, bool normalized> struct DefaultVertexValuesStage2 { };
>-
>-template <class T> struct DefaultVertexValuesStage2<T, true>  : NormalizedDefaultValues<T> { };
>-template <class T> struct DefaultVertexValuesStage2<T, false> : SimpleDefaultValues<T> { };
>+template <GLenum fromType>
>+struct ConversionRule<fromType, true, D3DVT_FLOAT> : Normalize<typename GLToCType<fromType>::type>
>+{};
>+
>+// Use a full specialization for this so that it preferentially matches ahead of the generic
>+// normalize-to-float rules.
>+template <>
>+struct ConversionRule<GL_FIXED, true, D3DVT_FLOAT> : FixedToFloat<GLint, 16>
>+{};
>+template <>
>+struct ConversionRule<GL_FIXED, false, D3DVT_FLOAT> : FixedToFloat<GLint, 16>
>+{};
>+
>+// A 2-stage construction is used for DefaultVertexValues because float must use SimpleDefaultValues
>+// (i.e. 0/1) whether it is normalized or not.
>+template <class T, bool normalized>
>+struct DefaultVertexValuesStage2
>+{};
>+
>+template <class T>
>+struct DefaultVertexValuesStage2<T, true> : NormalizedDefaultValues<T>
>+{};
>+template <class T>
>+struct DefaultVertexValuesStage2<T, false> : SimpleDefaultValues<T>
>+{};
> 
> // Work out the default value rule for a D3D type (expressed as the C type) and
>-template <class T, bool normalized> struct DefaultVertexValues : DefaultVertexValuesStage2<T, normalized> { };
>-template <bool normalized> struct DefaultVertexValues<float, normalized> : SimpleDefaultValues<float> { };
>-
>-// Policy rules for use with Converter, to choose whether to use the preferred or fallback conversion.
>-// The fallback conversion produces an output that all D3D9 devices must support.
>-template <class T> struct UsePreferred { enum { type = T::preferred }; };
>-template <class T> struct UseFallback { enum { type = T::fallback }; };
>+template <class T, bool normalized>
>+struct DefaultVertexValues : DefaultVertexValuesStage2<T, normalized>
>+{};
>+template <bool normalized>
>+struct DefaultVertexValues<float, normalized> : SimpleDefaultValues<float>
>+{};
>+
>+// Policy rules for use with Converter, to choose whether to use the preferred or fallback
>+// conversion. The fallback conversion produces an output that all D3D9 devices must support.
>+template <class T>
>+struct UsePreferred
>+{
>+    enum
>+    {
>+        type = T::preferred
>+    };
>+};
>+template <class T>
>+struct UseFallback
>+{
>+    enum
>+    {
>+        type = T::fallback
>+    };
>+};
> 
>-// Converter ties it all together. Given an OpenGL type/norm/size and choice of preferred/fallback conversion,
>-// it provides all the members of the appropriate VertexDataConverter, the D3DCAPS9::DeclTypes flag in cap flag
>-// and the D3DDECLTYPE member needed for the vertex declaration in declflag.
>+// Converter ties it all together. Given an OpenGL type/norm/size and choice of preferred/fallback
>+// conversion, it provides all the members of the appropriate VertexDataConverter, the
>+// D3DCAPS9::DeclTypes flag in cap flag and the D3DDECLTYPE member needed for the vertex declaration
>+// in declflag.
> template <GLenum fromType, bool normalized, int size, template <class T> class PreferenceRule>
> struct Converter
>     : VertexDataConverter<
>@@ -524,19 +721,25 @@ struct Converter
>                                   VertexTypeMapping<fromType, normalized>>::type>::type,
>                               normalized>>
> {
>-private:
>-  enum
>-  {
>-      d3dtype = PreferenceRule<VertexTypeMapping<fromType, normalized>>::type
>-  };
>-  enum
>-  {
>-      d3dsize = WidenRule<d3dtype, size>::finalWidth
>-  };
>-
>-public:
>-    enum { capflag = VertexTypeFlags<d3dtype, d3dsize>::capflag };
>-    enum { declflag = VertexTypeFlags<d3dtype, d3dsize>::declflag };
>+  private:
>+    enum
>+    {
>+        d3dtype = PreferenceRule<VertexTypeMapping<fromType, normalized>>::type
>+    };
>+    enum
>+    {
>+        d3dsize = WidenRule<d3dtype, size>::finalWidth
>+    };
>+
>+  public:
>+    enum
>+    {
>+        capflag = VertexTypeFlags<d3dtype, d3dsize>::capflag
>+    };
>+    enum
>+    {
>+        declflag = VertexTypeFlags<d3dtype, d3dsize>::declflag
>+    };
> };
> 
> VertexFormat::VertexFormat()
>@@ -545,87 +748,105 @@ VertexFormat::VertexFormat()
>       copyFunction(nullptr),
>       nativeFormat(D3DDECLTYPE_UNUSED),
>       componentType(GL_NONE)
>-{
>-}
>+{}
> 
> // Initialize a TranslationInfo
>-VertexFormat CreateVertexFormatInfo(bool identity, size_t elementSize, VertexCopyFunction copyFunc, D3DDECLTYPE nativeFormat)
>+VertexFormat CreateVertexFormatInfo(bool identity,
>+                                    size_t elementSize,
>+                                    VertexCopyFunction copyFunc,
>+                                    D3DDECLTYPE nativeFormat)
> {
>     VertexFormat formatInfo;
>-    formatInfo.conversionType = identity ? VERTEX_CONVERT_NONE : VERTEX_CONVERT_CPU;
>+    formatInfo.conversionType    = identity ? VERTEX_CONVERT_NONE : VERTEX_CONVERT_CPU;
>     formatInfo.outputElementSize = elementSize;
>-    formatInfo.copyFunction = copyFunc;
>-    formatInfo.nativeFormat = nativeFormat;
>-    formatInfo.componentType = GetDeclTypeComponentType(nativeFormat);
>+    formatInfo.copyFunction      = copyFunc;
>+    formatInfo.nativeFormat      = nativeFormat;
>+    formatInfo.componentType     = GetDeclTypeComponentType(nativeFormat);
>     return formatInfo;
> }
> 
>-#define TRANSLATION(type, norm, size, preferred)                                    \
>-    CreateVertexFormatInfo                                                          \
>-    (                                                                               \
>-        Converter<type, norm, size, preferred>::identity,                           \
>-        Converter<type, norm, size, preferred>::finalSize,                          \
>-        Converter<type, norm, size, preferred>::convertArray,                       \
>-        static_cast<D3DDECLTYPE>(Converter<type, norm, size, preferred>::declflag)  \
>-    )
>+#define TRANSLATION(type, norm, size, preferred)              \
>+    CreateVertexFormatInfo(                                   \
>+        Converter<type, norm, size, preferred>::identity,     \
>+        Converter<type, norm, size, preferred>::finalSize,    \
>+        Converter<type, norm, size, preferred>::convertArray, \
>+        static_cast<D3DDECLTYPE>(Converter<type, norm, size, preferred>::declflag))
> 
> #define TRANSLATION_FOR_TYPE_NORM_SIZE(type, norm, size)    \
>     {                                                       \
>         Converter<type, norm, size, UsePreferred>::capflag, \
>-        TRANSLATION(type, norm, size, UsePreferred),        \
>-        TRANSLATION(type, norm, size, UseFallback)          \
>+            TRANSLATION(type, norm, size, UsePreferred),    \
>+            TRANSLATION(type, norm, size, UseFallback)      \
>     }
> 
>-#define TRANSLATIONS_FOR_TYPE(type)                                                                                                                                                                         \
>-    {                                                                                                                                                                                                       \
>-        { TRANSLATION_FOR_TYPE_NORM_SIZE(type, false, 1), TRANSLATION_FOR_TYPE_NORM_SIZE(type, false, 2), TRANSLATION_FOR_TYPE_NORM_SIZE(type, false, 3), TRANSLATION_FOR_TYPE_NORM_SIZE(type, false, 4) }, \
>-        { TRANSLATION_FOR_TYPE_NORM_SIZE(type, true, 1), TRANSLATION_FOR_TYPE_NORM_SIZE(type, true, 2), TRANSLATION_FOR_TYPE_NORM_SIZE(type, true, 3), TRANSLATION_FOR_TYPE_NORM_SIZE(type, true, 4) },     \
>+#define TRANSLATIONS_FOR_TYPE(type)                          \
>+    {                                                        \
>+        {TRANSLATION_FOR_TYPE_NORM_SIZE(type, false, 1),     \
>+         TRANSLATION_FOR_TYPE_NORM_SIZE(type, false, 2),     \
>+         TRANSLATION_FOR_TYPE_NORM_SIZE(type, false, 3),     \
>+         TRANSLATION_FOR_TYPE_NORM_SIZE(type, false, 4)},    \
>+            {TRANSLATION_FOR_TYPE_NORM_SIZE(type, true, 1),  \
>+             TRANSLATION_FOR_TYPE_NORM_SIZE(type, true, 2),  \
>+             TRANSLATION_FOR_TYPE_NORM_SIZE(type, true, 3),  \
>+             TRANSLATION_FOR_TYPE_NORM_SIZE(type, true, 4)}, \
>     }
> 
>-#define TRANSLATIONS_FOR_TYPE_NO_NORM(type)                                                                                                                                                                 \
>-    {                                                                                                                                                                                                       \
>-        { TRANSLATION_FOR_TYPE_NORM_SIZE(type, false, 1), TRANSLATION_FOR_TYPE_NORM_SIZE(type, false, 2), TRANSLATION_FOR_TYPE_NORM_SIZE(type, false, 3), TRANSLATION_FOR_TYPE_NORM_SIZE(type, false, 4) }, \
>-        { TRANSLATION_FOR_TYPE_NORM_SIZE(type, false, 1), TRANSLATION_FOR_TYPE_NORM_SIZE(type, false, 2), TRANSLATION_FOR_TYPE_NORM_SIZE(type, false, 3), TRANSLATION_FOR_TYPE_NORM_SIZE(type, false, 4) }, \
>+#define TRANSLATIONS_FOR_TYPE_NO_NORM(type)                   \
>+    {                                                         \
>+        {TRANSLATION_FOR_TYPE_NORM_SIZE(type, false, 1),      \
>+         TRANSLATION_FOR_TYPE_NORM_SIZE(type, false, 2),      \
>+         TRANSLATION_FOR_TYPE_NORM_SIZE(type, false, 3),      \
>+         TRANSLATION_FOR_TYPE_NORM_SIZE(type, false, 4)},     \
>+            {TRANSLATION_FOR_TYPE_NORM_SIZE(type, false, 1),  \
>+             TRANSLATION_FOR_TYPE_NORM_SIZE(type, false, 2),  \
>+             TRANSLATION_FOR_TYPE_NORM_SIZE(type, false, 3),  \
>+             TRANSLATION_FOR_TYPE_NORM_SIZE(type, false, 4)}, \
>     }
> 
> static inline unsigned int ComputeTypeIndex(GLenum type)
> {
>     switch (type)
>     {
>-      case GL_BYTE:           return 0;
>-      case GL_UNSIGNED_BYTE:  return 1;
>-      case GL_SHORT:          return 2;
>-      case GL_UNSIGNED_SHORT: return 3;
>-      case GL_FIXED:          return 4;
>-      case GL_FLOAT:          return 5;
>-
>-      default: UNREACHABLE(); return 5;
>+        case GL_BYTE:
>+            return 0;
>+        case GL_UNSIGNED_BYTE:
>+            return 1;
>+        case GL_SHORT:
>+            return 2;
>+        case GL_UNSIGNED_SHORT:
>+            return 3;
>+        case GL_FIXED:
>+            return 4;
>+        case GL_FLOAT:
>+            return 5;
>+
>+        default:
>+            UNREACHABLE();
>+            return 5;
>     }
> }
> 
>-const VertexFormat &GetVertexFormatInfo(DWORD supportedDeclTypes, gl::VertexFormatType vertexFormatType)
>+const VertexFormat &GetVertexFormatInfo(DWORD supportedDeclTypes, angle::FormatID vertexFormatID)
> {
>-    static bool initialized = false;
>+    static bool initialized           = false;
>     static DWORD initializedDeclTypes = 0;
>     static VertexFormat formatConverters[NUM_GL_VERTEX_ATTRIB_TYPES][2][4];
>     if (initializedDeclTypes != supportedDeclTypes)
>     {
>-        const TranslationDescription translations[NUM_GL_VERTEX_ATTRIB_TYPES][2][4] = // [GL types as enumerated by typeIndex()][normalized][size-1]
>-        {
>-            TRANSLATIONS_FOR_TYPE(GL_BYTE),
>-            TRANSLATIONS_FOR_TYPE(GL_UNSIGNED_BYTE),
>-            TRANSLATIONS_FOR_TYPE(GL_SHORT),
>-            TRANSLATIONS_FOR_TYPE(GL_UNSIGNED_SHORT),
>-            TRANSLATIONS_FOR_TYPE_NO_NORM(GL_FIXED),
>-            TRANSLATIONS_FOR_TYPE_NO_NORM(GL_FLOAT)
>-        };
>+        const TranslationDescription
>+            translations[NUM_GL_VERTEX_ATTRIB_TYPES][2]
>+                        [4] =  // [GL types as enumerated by typeIndex()][normalized][size-1]
>+            {TRANSLATIONS_FOR_TYPE(GL_BYTE),          TRANSLATIONS_FOR_TYPE(GL_UNSIGNED_BYTE),
>+             TRANSLATIONS_FOR_TYPE(GL_SHORT),         TRANSLATIONS_FOR_TYPE(GL_UNSIGNED_SHORT),
>+             TRANSLATIONS_FOR_TYPE_NO_NORM(GL_FIXED), TRANSLATIONS_FOR_TYPE_NO_NORM(GL_FLOAT)};
>         for (unsigned int i = 0; i < NUM_GL_VERTEX_ATTRIB_TYPES; i++)
>         {
>             for (unsigned int j = 0; j < 2; j++)
>             {
>                 for (unsigned int k = 0; k < 4; k++)
>                 {
>-                    if (translations[i][j][k].capsFlag == 0 || (supportedDeclTypes & translations[i][j][k].capsFlag) != 0)
>+                    if (translations[i][j][k].capsFlag == 0 ||
>+                        (supportedDeclTypes & translations[i][j][k].capsFlag) != 0)
>                     {
>                         formatConverters[i][j][k] = translations[i][j][k].preferredConversion;
>                     }
>@@ -636,17 +857,16 @@ const VertexFormat &GetVertexFormatInfo(DWORD supportedDeclTypes, gl::VertexForm
>                 }
>             }
>         }
>-        initialized = true;
>+        initialized          = true;
>         initializedDeclTypes = supportedDeclTypes;
>     }
> 
>-    const gl::VertexFormat &vertexFormat = gl::GetVertexFormatFromType(vertexFormatType);
>+    const gl::VertexFormat &vertexFormat = gl::GetVertexFormatFromID(vertexFormatID);
> 
>     // Pure integer attributes only supported in ES3.0
>     ASSERT(!vertexFormat.pureInteger);
>-    return formatConverters[ComputeTypeIndex(vertexFormat.type)][vertexFormat.normalized][vertexFormat.components - 1];
>-}
>-
>-}
>-
>+    return formatConverters[ComputeTypeIndex(vertexFormat.type)][vertexFormat.normalized]
>+                           [vertexFormat.components - 1];
> }
>+}  // namespace d3d9
>+}  // namespace rx
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/formatutils9.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/formatutils9.h
>index 1bef320b53d..ba1a1ca981a 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/formatutils9.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/formatutils9.h
>@@ -16,8 +16,9 @@
> #include "libANGLE/angletypes.h"
> #include "libANGLE/formatutils.h"
> #include "libANGLE/renderer/Format.h"
>-#include "libANGLE/renderer/renderer_utils.h"
>+#include "libANGLE/renderer/copyvertex.h"
> #include "libANGLE/renderer/d3d/formatutilsD3D.h"
>+#include "libANGLE/renderer/renderer_utils.h"
> 
> namespace rx
> {
>@@ -40,7 +41,7 @@ struct D3DFormat
>               GLuint luminanceBits,
>               GLuint depthBits,
>               GLuint stencilBits,
>-              angle::Format::ID formatID);
>+              angle::FormatID formatID);
> 
>     const angle::Format &info() const { return angle::Format::Get(formatID); }
> 
>@@ -57,7 +58,7 @@ struct D3DFormat
>     GLuint depthBits;
>     GLuint stencilBits;
> 
>-    angle::Format::ID formatID;
>+    angle::FormatID formatID;
> };
> 
> const D3DFormat &GetD3DFormatInfo(D3DFORMAT format);
>@@ -72,7 +73,7 @@ struct VertexFormat
>     D3DDECLTYPE nativeFormat;
>     GLenum componentType;
> };
>-const VertexFormat &GetVertexFormatInfo(DWORD supportedDeclTypes, gl::VertexFormatType vertexFormatType);
>+const VertexFormat &GetVertexFormatInfo(DWORD supportedDeclTypes, angle::FormatID vertexFormatID);
> 
> struct TextureFormat
> {
>@@ -86,9 +87,7 @@ struct TextureFormat
>     LoadImageFunction loadFunction;
> };
> const TextureFormat &GetTextureFormatInfo(GLenum internalFormat);
>+}  // namespace d3d9
>+}  // namespace rx
> 
>-}
>-
>-}
>-
>-#endif // LIBANGLE_RENDERER_D3D_D3D9_FORMATUTILS9_H_
>+#endif  // LIBANGLE_RENDERER_D3D_D3D9_FORMATUTILS9_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/renderer9_utils.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/renderer9_utils.cpp
>index fd451a6e51c..0926a52d779 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/renderer9_utils.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/renderer9_utils.cpp
>@@ -9,14 +9,12 @@
> 
> #include "libANGLE/renderer/d3d/d3d9/renderer9_utils.h"
> 
>-#include "common/mathutil.h"
> #include "common/debug.h"
>+#include "common/mathutil.h"
> 
> #include "libANGLE/formatutils.h"
>-#include "libANGLE/Framebuffer.h"
>-#include "libANGLE/renderer/d3d/d3d9/formatutils9.h"
> #include "libANGLE/renderer/d3d/d3d9/RenderTarget9.h"
>-#include "libANGLE/renderer/d3d/FramebufferD3D.h"
>+#include "libANGLE/renderer/d3d/d3d9/formatutils9.h"
> #include "libANGLE/renderer/driver_utils.h"
> #include "platform/Platform.h"
> #include "platform/WorkaroundsD3D.h"
>@@ -34,15 +32,32 @@ D3DCMPFUNC ConvertComparison(GLenum comparison)
>     D3DCMPFUNC d3dComp = D3DCMP_ALWAYS;
>     switch (comparison)
>     {
>-      case GL_NEVER:    d3dComp = D3DCMP_NEVER;        break;
>-      case GL_ALWAYS:   d3dComp = D3DCMP_ALWAYS;       break;
>-      case GL_LESS:     d3dComp = D3DCMP_LESS;         break;
>-      case GL_LEQUAL:   d3dComp = D3DCMP_LESSEQUAL;    break;
>-      case GL_EQUAL:    d3dComp = D3DCMP_EQUAL;        break;
>-      case GL_GREATER:  d3dComp = D3DCMP_GREATER;      break;
>-      case GL_GEQUAL:   d3dComp = D3DCMP_GREATEREQUAL; break;
>-      case GL_NOTEQUAL: d3dComp = D3DCMP_NOTEQUAL;     break;
>-      default: UNREACHABLE();
>+        case GL_NEVER:
>+            d3dComp = D3DCMP_NEVER;
>+            break;
>+        case GL_ALWAYS:
>+            d3dComp = D3DCMP_ALWAYS;
>+            break;
>+        case GL_LESS:
>+            d3dComp = D3DCMP_LESS;
>+            break;
>+        case GL_LEQUAL:
>+            d3dComp = D3DCMP_LESSEQUAL;
>+            break;
>+        case GL_EQUAL:
>+            d3dComp = D3DCMP_EQUAL;
>+            break;
>+        case GL_GREATER:
>+            d3dComp = D3DCMP_GREATER;
>+            break;
>+        case GL_GEQUAL:
>+            d3dComp = D3DCMP_GREATEREQUAL;
>+            break;
>+        case GL_NOTEQUAL:
>+            d3dComp = D3DCMP_NOTEQUAL;
>+            break;
>+        default:
>+            UNREACHABLE();
>     }
> 
>     return d3dComp;
>@@ -50,10 +65,8 @@ D3DCMPFUNC ConvertComparison(GLenum comparison)
> 
> D3DCOLOR ConvertColor(gl::ColorF color)
> {
>-    return D3DCOLOR_RGBA(gl::unorm<8>(color.red),
>-                         gl::unorm<8>(color.green),
>-                         gl::unorm<8>(color.blue),
>-                         gl::unorm<8>(color.alpha));
>+    return D3DCOLOR_RGBA(gl::unorm<8>(color.red), gl::unorm<8>(color.green),
>+                         gl::unorm<8>(color.blue), gl::unorm<8>(color.alpha));
> }
> 
> D3DBLEND ConvertBlendFunc(GLenum blend)
>@@ -62,22 +75,53 @@ D3DBLEND ConvertBlendFunc(GLenum blend)
> 
>     switch (blend)
>     {
>-      case GL_ZERO:                     d3dBlend = D3DBLEND_ZERO;           break;
>-      case GL_ONE:                      d3dBlend = D3DBLEND_ONE;            break;
>-      case GL_SRC_COLOR:                d3dBlend = D3DBLEND_SRCCOLOR;       break;
>-      case GL_ONE_MINUS_SRC_COLOR:      d3dBlend = D3DBLEND_INVSRCCOLOR;    break;
>-      case GL_DST_COLOR:                d3dBlend = D3DBLEND_DESTCOLOR;      break;
>-      case GL_ONE_MINUS_DST_COLOR:      d3dBlend = D3DBLEND_INVDESTCOLOR;   break;
>-      case GL_SRC_ALPHA:                d3dBlend = D3DBLEND_SRCALPHA;       break;
>-      case GL_ONE_MINUS_SRC_ALPHA:      d3dBlend = D3DBLEND_INVSRCALPHA;    break;
>-      case GL_DST_ALPHA:                d3dBlend = D3DBLEND_DESTALPHA;      break;
>-      case GL_ONE_MINUS_DST_ALPHA:      d3dBlend = D3DBLEND_INVDESTALPHA;   break;
>-      case GL_CONSTANT_COLOR:           d3dBlend = D3DBLEND_BLENDFACTOR;    break;
>-      case GL_ONE_MINUS_CONSTANT_COLOR: d3dBlend = D3DBLEND_INVBLENDFACTOR; break;
>-      case GL_CONSTANT_ALPHA:           d3dBlend = D3DBLEND_BLENDFACTOR;    break;
>-      case GL_ONE_MINUS_CONSTANT_ALPHA: d3dBlend = D3DBLEND_INVBLENDFACTOR; break;
>-      case GL_SRC_ALPHA_SATURATE:       d3dBlend = D3DBLEND_SRCALPHASAT;    break;
>-      default: UNREACHABLE();
>+        case GL_ZERO:
>+            d3dBlend = D3DBLEND_ZERO;
>+            break;
>+        case GL_ONE:
>+            d3dBlend = D3DBLEND_ONE;
>+            break;
>+        case GL_SRC_COLOR:
>+            d3dBlend = D3DBLEND_SRCCOLOR;
>+            break;
>+        case GL_ONE_MINUS_SRC_COLOR:
>+            d3dBlend = D3DBLEND_INVSRCCOLOR;
>+            break;
>+        case GL_DST_COLOR:
>+            d3dBlend = D3DBLEND_DESTCOLOR;
>+            break;
>+        case GL_ONE_MINUS_DST_COLOR:
>+            d3dBlend = D3DBLEND_INVDESTCOLOR;
>+            break;
>+        case GL_SRC_ALPHA:
>+            d3dBlend = D3DBLEND_SRCALPHA;
>+            break;
>+        case GL_ONE_MINUS_SRC_ALPHA:
>+            d3dBlend = D3DBLEND_INVSRCALPHA;
>+            break;
>+        case GL_DST_ALPHA:
>+            d3dBlend = D3DBLEND_DESTALPHA;
>+            break;
>+        case GL_ONE_MINUS_DST_ALPHA:
>+            d3dBlend = D3DBLEND_INVDESTALPHA;
>+            break;
>+        case GL_CONSTANT_COLOR:
>+            d3dBlend = D3DBLEND_BLENDFACTOR;
>+            break;
>+        case GL_ONE_MINUS_CONSTANT_COLOR:
>+            d3dBlend = D3DBLEND_INVBLENDFACTOR;
>+            break;
>+        case GL_CONSTANT_ALPHA:
>+            d3dBlend = D3DBLEND_BLENDFACTOR;
>+            break;
>+        case GL_ONE_MINUS_CONSTANT_ALPHA:
>+            d3dBlend = D3DBLEND_INVBLENDFACTOR;
>+            break;
>+        case GL_SRC_ALPHA_SATURATE:
>+            d3dBlend = D3DBLEND_SRCALPHASAT;
>+            break;
>+        default:
>+            UNREACHABLE();
>     }
> 
>     return d3dBlend;
>@@ -89,12 +133,23 @@ D3DBLENDOP ConvertBlendOp(GLenum blendOp)
> 
>     switch (blendOp)
>     {
>-      case GL_FUNC_ADD:              d3dBlendOp = D3DBLENDOP_ADD;         break;
>-      case GL_FUNC_SUBTRACT:         d3dBlendOp = D3DBLENDOP_SUBTRACT;    break;
>-      case GL_FUNC_REVERSE_SUBTRACT: d3dBlendOp = D3DBLENDOP_REVSUBTRACT; break;
>-      case GL_MIN_EXT:               d3dBlendOp = D3DBLENDOP_MIN;         break;
>-      case GL_MAX_EXT:               d3dBlendOp = D3DBLENDOP_MAX;         break;
>-      default: UNREACHABLE();
>+        case GL_FUNC_ADD:
>+            d3dBlendOp = D3DBLENDOP_ADD;
>+            break;
>+        case GL_FUNC_SUBTRACT:
>+            d3dBlendOp = D3DBLENDOP_SUBTRACT;
>+            break;
>+        case GL_FUNC_REVERSE_SUBTRACT:
>+            d3dBlendOp = D3DBLENDOP_REVSUBTRACT;
>+            break;
>+        case GL_MIN_EXT:
>+            d3dBlendOp = D3DBLENDOP_MIN;
>+            break;
>+        case GL_MAX_EXT:
>+            d3dBlendOp = D3DBLENDOP_MAX;
>+            break;
>+        default:
>+            UNREACHABLE();
>     }
> 
>     return d3dBlendOp;
>@@ -106,15 +161,32 @@ D3DSTENCILOP ConvertStencilOp(GLenum stencilOp)
> 
>     switch (stencilOp)
>     {
>-      case GL_ZERO:      d3dStencilOp = D3DSTENCILOP_ZERO;    break;
>-      case GL_KEEP:      d3dStencilOp = D3DSTENCILOP_KEEP;    break;
>-      case GL_REPLACE:   d3dStencilOp = D3DSTENCILOP_REPLACE; break;
>-      case GL_INCR:      d3dStencilOp = D3DSTENCILOP_INCRSAT; break;
>-      case GL_DECR:      d3dStencilOp = D3DSTENCILOP_DECRSAT; break;
>-      case GL_INVERT:    d3dStencilOp = D3DSTENCILOP_INVERT;  break;
>-      case GL_INCR_WRAP: d3dStencilOp = D3DSTENCILOP_INCR;    break;
>-      case GL_DECR_WRAP: d3dStencilOp = D3DSTENCILOP_DECR;    break;
>-      default: UNREACHABLE();
>+        case GL_ZERO:
>+            d3dStencilOp = D3DSTENCILOP_ZERO;
>+            break;
>+        case GL_KEEP:
>+            d3dStencilOp = D3DSTENCILOP_KEEP;
>+            break;
>+        case GL_REPLACE:
>+            d3dStencilOp = D3DSTENCILOP_REPLACE;
>+            break;
>+        case GL_INCR:
>+            d3dStencilOp = D3DSTENCILOP_INCRSAT;
>+            break;
>+        case GL_DECR:
>+            d3dStencilOp = D3DSTENCILOP_DECRSAT;
>+            break;
>+        case GL_INVERT:
>+            d3dStencilOp = D3DSTENCILOP_INVERT;
>+            break;
>+        case GL_INCR_WRAP:
>+            d3dStencilOp = D3DSTENCILOP_INCR;
>+            break;
>+        case GL_DECR_WRAP:
>+            d3dStencilOp = D3DSTENCILOP_DECR;
>+            break;
>+        default:
>+            UNREACHABLE();
>     }
> 
>     return d3dStencilOp;
>@@ -126,10 +198,20 @@ D3DTEXTUREADDRESS ConvertTextureWrap(GLenum wrap)
> 
>     switch (wrap)
>     {
>-      case GL_REPEAT:            d3dWrap = D3DTADDRESS_WRAP;   break;
>-      case GL_CLAMP_TO_EDGE:     d3dWrap = D3DTADDRESS_CLAMP;  break;
>-      case GL_MIRRORED_REPEAT:   d3dWrap = D3DTADDRESS_MIRROR; break;
>-      default: UNREACHABLE();
>+        case GL_REPEAT:
>+            d3dWrap = D3DTADDRESS_WRAP;
>+            break;
>+        case GL_CLAMP_TO_EDGE:
>+            d3dWrap = D3DTADDRESS_CLAMP;
>+            break;
>+        case GL_CLAMP_TO_BORDER:
>+            d3dWrap = D3DTADDRESS_BORDER;
>+            break;
>+        case GL_MIRRORED_REPEAT:
>+            d3dWrap = D3DTADDRESS_MIRROR;
>+            break;
>+        default:
>+            UNREACHABLE();
>     }
> 
>     return d3dWrap;
>@@ -156,31 +238,32 @@ D3DCULL ConvertCullMode(gl::CullFaceMode cullFace, GLenum frontFace)
>     return cull;
> }
> 
>-D3DCUBEMAP_FACES ConvertCubeFace(GLenum cubeFace)
>+D3DCUBEMAP_FACES ConvertCubeFace(gl::TextureTarget cubeFace)
> {
>     D3DCUBEMAP_FACES face = D3DCUBEMAP_FACE_POSITIVE_X;
> 
>     switch (cubeFace)
>     {
>-      case GL_TEXTURE_CUBE_MAP_POSITIVE_X:
>-        face = D3DCUBEMAP_FACE_POSITIVE_X;
>-        break;
>-      case GL_TEXTURE_CUBE_MAP_NEGATIVE_X:
>-        face = D3DCUBEMAP_FACE_NEGATIVE_X;
>-        break;
>-      case GL_TEXTURE_CUBE_MAP_POSITIVE_Y:
>-        face = D3DCUBEMAP_FACE_POSITIVE_Y;
>-        break;
>-      case GL_TEXTURE_CUBE_MAP_NEGATIVE_Y:
>-        face = D3DCUBEMAP_FACE_NEGATIVE_Y;
>-        break;
>-      case GL_TEXTURE_CUBE_MAP_POSITIVE_Z:
>-        face = D3DCUBEMAP_FACE_POSITIVE_Z;
>-        break;
>-      case GL_TEXTURE_CUBE_MAP_NEGATIVE_Z:
>-        face = D3DCUBEMAP_FACE_NEGATIVE_Z;
>-        break;
>-      default: UNREACHABLE();
>+        case gl::TextureTarget::CubeMapPositiveX:
>+            face = D3DCUBEMAP_FACE_POSITIVE_X;
>+            break;
>+        case gl::TextureTarget::CubeMapNegativeX:
>+            face = D3DCUBEMAP_FACE_NEGATIVE_X;
>+            break;
>+        case gl::TextureTarget::CubeMapPositiveY:
>+            face = D3DCUBEMAP_FACE_POSITIVE_Y;
>+            break;
>+        case gl::TextureTarget::CubeMapNegativeY:
>+            face = D3DCUBEMAP_FACE_NEGATIVE_Y;
>+            break;
>+        case gl::TextureTarget::CubeMapPositiveZ:
>+            face = D3DCUBEMAP_FACE_POSITIVE_Z;
>+            break;
>+        case gl::TextureTarget::CubeMapNegativeZ:
>+            face = D3DCUBEMAP_FACE_NEGATIVE_Z;
>+            break;
>+        default:
>+            UNREACHABLE();
>     }
> 
>     return face;
>@@ -188,10 +271,8 @@ D3DCUBEMAP_FACES ConvertCubeFace(GLenum cubeFace)
> 
> DWORD ConvertColorMask(bool red, bool green, bool blue, bool alpha)
> {
>-    return (red   ? D3DCOLORWRITEENABLE_RED   : 0) |
>-           (green ? D3DCOLORWRITEENABLE_GREEN : 0) |
>-           (blue  ? D3DCOLORWRITEENABLE_BLUE  : 0) |
>-           (alpha ? D3DCOLORWRITEENABLE_ALPHA : 0);
>+    return (red ? D3DCOLORWRITEENABLE_RED : 0) | (green ? D3DCOLORWRITEENABLE_GREEN : 0) |
>+           (blue ? D3DCOLORWRITEENABLE_BLUE : 0) | (alpha ? D3DCOLORWRITEENABLE_ALPHA : 0);
> }
> 
> D3DTEXTUREFILTERTYPE ConvertMagFilter(GLenum magFilter, float maxAnisotropy)
>@@ -204,47 +285,56 @@ D3DTEXTUREFILTERTYPE ConvertMagFilter(GLenum magFilter, float maxAnisotropy)
>     D3DTEXTUREFILTERTYPE d3dMagFilter = D3DTEXF_POINT;
>     switch (magFilter)
>     {
>-      case GL_NEAREST: d3dMagFilter = D3DTEXF_POINT;  break;
>-      case GL_LINEAR:  d3dMagFilter = D3DTEXF_LINEAR; break;
>-      default: UNREACHABLE();
>+        case GL_NEAREST:
>+            d3dMagFilter = D3DTEXF_POINT;
>+            break;
>+        case GL_LINEAR:
>+            d3dMagFilter = D3DTEXF_LINEAR;
>+            break;
>+        default:
>+            UNREACHABLE();
>     }
> 
>     return d3dMagFilter;
> }
> 
>-void ConvertMinFilter(GLenum minFilter, D3DTEXTUREFILTERTYPE *d3dMinFilter, D3DTEXTUREFILTERTYPE *d3dMipFilter,
>-                      float *d3dLodBias, float maxAnisotropy, size_t baseLevel)
>+void ConvertMinFilter(GLenum minFilter,
>+                      D3DTEXTUREFILTERTYPE *d3dMinFilter,
>+                      D3DTEXTUREFILTERTYPE *d3dMipFilter,
>+                      float *d3dLodBias,
>+                      float maxAnisotropy,
>+                      size_t baseLevel)
> {
>     switch (minFilter)
>     {
>-      case GL_NEAREST:
>-        *d3dMinFilter = D3DTEXF_POINT;
>-        *d3dMipFilter = D3DTEXF_NONE;
>-        break;
>-      case GL_LINEAR:
>-        *d3dMinFilter = D3DTEXF_LINEAR;
>-        *d3dMipFilter = D3DTEXF_NONE;
>-        break;
>-      case GL_NEAREST_MIPMAP_NEAREST:
>-        *d3dMinFilter = D3DTEXF_POINT;
>-        *d3dMipFilter = D3DTEXF_POINT;
>-        break;
>-      case GL_LINEAR_MIPMAP_NEAREST:
>-        *d3dMinFilter = D3DTEXF_LINEAR;
>-        *d3dMipFilter = D3DTEXF_POINT;
>-        break;
>-      case GL_NEAREST_MIPMAP_LINEAR:
>-        *d3dMinFilter = D3DTEXF_POINT;
>-        *d3dMipFilter = D3DTEXF_LINEAR;
>-        break;
>-      case GL_LINEAR_MIPMAP_LINEAR:
>-        *d3dMinFilter = D3DTEXF_LINEAR;
>-        *d3dMipFilter = D3DTEXF_LINEAR;
>-        break;
>-      default:
>-        *d3dMinFilter = D3DTEXF_POINT;
>-        *d3dMipFilter = D3DTEXF_NONE;
>-        UNREACHABLE();
>+        case GL_NEAREST:
>+            *d3dMinFilter = D3DTEXF_POINT;
>+            *d3dMipFilter = D3DTEXF_NONE;
>+            break;
>+        case GL_LINEAR:
>+            *d3dMinFilter = D3DTEXF_LINEAR;
>+            *d3dMipFilter = D3DTEXF_NONE;
>+            break;
>+        case GL_NEAREST_MIPMAP_NEAREST:
>+            *d3dMinFilter = D3DTEXF_POINT;
>+            *d3dMipFilter = D3DTEXF_POINT;
>+            break;
>+        case GL_LINEAR_MIPMAP_NEAREST:
>+            *d3dMinFilter = D3DTEXF_LINEAR;
>+            *d3dMipFilter = D3DTEXF_POINT;
>+            break;
>+        case GL_NEAREST_MIPMAP_LINEAR:
>+            *d3dMinFilter = D3DTEXF_POINT;
>+            *d3dMipFilter = D3DTEXF_LINEAR;
>+            break;
>+        case GL_LINEAR_MIPMAP_LINEAR:
>+            *d3dMinFilter = D3DTEXF_LINEAR;
>+            *d3dMipFilter = D3DTEXF_LINEAR;
>+            break;
>+        default:
>+            *d3dMinFilter = D3DTEXF_POINT;
>+            *d3dMipFilter = D3DTEXF_NONE;
>+            UNREACHABLE();
>     }
> 
>     // Disabling mipmapping will always sample from level 0 of the texture. It is possible to work
>@@ -254,7 +344,7 @@ void ConvertMinFilter(GLenum minFilter, D3DTEXTUREFILTERTYPE *d3dMinFilter, D3DT
>     if (baseLevel > 0 && *d3dMipFilter == D3DTEXF_NONE)
>     {
>         *d3dMipFilter = D3DTEXF_POINT;
>-        *d3dLodBias = -static_cast<float>(gl::IMPLEMENTATION_MAX_TEXTURE_LEVELS);
>+        *d3dLodBias   = -static_cast<float>(gl::IMPLEMENTATION_MAX_TEXTURE_LEVELS);
>     }
>     else
>     {
>@@ -267,14 +357,14 @@ void ConvertMinFilter(GLenum minFilter, D3DTEXTUREFILTERTYPE *d3dMinFilter, D3DT
>     }
> }
> 
>-D3DQUERYTYPE ConvertQueryType(GLenum queryType)
>+D3DQUERYTYPE ConvertQueryType(gl::QueryType type)
> {
>-    switch (queryType)
>+    switch (type)
>     {
>-        case GL_ANY_SAMPLES_PASSED_EXT:
>-        case GL_ANY_SAMPLES_PASSED_CONSERVATIVE_EXT:
>+        case gl::QueryType::AnySamples:
>+        case gl::QueryType::AnySamplesConservative:
>             return D3DQUERYTYPE_OCCLUSION;
>-        case GL_COMMANDS_COMPLETED_CHROMIUM:
>+        case gl::QueryType::CommandsCompleted:
>             return D3DQUERYTYPE_EVENT;
>         default:
>             UNREACHABLE();
>@@ -287,11 +377,20 @@ D3DMULTISAMPLE_TYPE GetMultisampleType(GLuint samples)
>     return (samples > 1) ? static_cast<D3DMULTISAMPLE_TYPE>(samples) : D3DMULTISAMPLE_NONE;
> }
> 
>-}
>+}  // namespace gl_d3d9
> 
> namespace d3d9_gl
> {
> 
>+unsigned int GetReservedVaryingVectors()
>+{
>+    // We reserve two registers for "dx_Position" and "gl_Position". The spec says they
>+    // don't count towards the varying limit, so we must make space for them. We also
>+    // reserve the last register since it can only pass a PSIZE, and not any arbitrary
>+    // varying.
>+    return 3;
>+}
>+
> unsigned int GetReservedVertexUniformVectors()
> {
>     return 3;  // dx_ViewCoords, dx_ViewAdjust and dx_DepthRange.
>@@ -314,8 +413,11 @@ bool IsFormatChannelEquivalent(D3DFORMAT d3dformat, GLenum format)
>     return convertedFormat == format;
> }
> 
>-static gl::TextureCaps GenerateTextureFormatCaps(GLenum internalFormat, IDirect3D9 *d3d9, D3DDEVTYPE deviceType,
>-                                                 UINT adapter, D3DFORMAT adapterFormat)
>+static gl::TextureCaps GenerateTextureFormatCaps(GLenum internalFormat,
>+                                                 IDirect3D9 *d3d9,
>+                                                 D3DDEVTYPE deviceType,
>+                                                 UINT adapter,
>+                                                 D3DFORMAT adapterFormat)
> {
>     gl::TextureCaps textureCaps;
> 
>@@ -326,25 +428,37 @@ static gl::TextureCaps GenerateTextureFormatCaps(GLenum internalFormat, IDirect3
>     {
>         if (formatInfo.depthBits > 0 || formatInfo.stencilBits > 0)
>         {
>-            textureCaps.texturable = SUCCEEDED(d3d9->CheckDeviceFormat(adapter, deviceType, adapterFormat, 0, D3DRTYPE_TEXTURE, d3dFormatInfo.texFormat));
>+            textureCaps.texturable = SUCCEEDED(d3d9->CheckDeviceFormat(
>+                adapter, deviceType, adapterFormat, 0, D3DRTYPE_TEXTURE, d3dFormatInfo.texFormat));
>         }
>         else
>         {
>-            textureCaps.texturable = SUCCEEDED(d3d9->CheckDeviceFormat(adapter, deviceType, adapterFormat, 0, D3DRTYPE_TEXTURE, d3dFormatInfo.texFormat)) &&
>-                                     SUCCEEDED(d3d9->CheckDeviceFormat(adapter, deviceType, adapterFormat, 0, D3DRTYPE_CUBETEXTURE, d3dFormatInfo.texFormat));
>+            textureCaps.texturable =
>+                SUCCEEDED(d3d9->CheckDeviceFormat(adapter, deviceType, adapterFormat, 0,
>+                                                  D3DRTYPE_TEXTURE, d3dFormatInfo.texFormat)) &&
>+                SUCCEEDED(d3d9->CheckDeviceFormat(adapter, deviceType, adapterFormat, 0,
>+                                                  D3DRTYPE_CUBETEXTURE, d3dFormatInfo.texFormat));
>         }
> 
>-        textureCaps.filterable = SUCCEEDED(d3d9->CheckDeviceFormat(adapter, deviceType, adapterFormat, D3DUSAGE_QUERY_FILTER, D3DRTYPE_TEXTURE, d3dFormatInfo.texFormat));
>+        textureCaps.filterable = SUCCEEDED(
>+            d3d9->CheckDeviceFormat(adapter, deviceType, adapterFormat, D3DUSAGE_QUERY_FILTER,
>+                                    D3DRTYPE_TEXTURE, d3dFormatInfo.texFormat));
>     }
> 
>     if (d3dFormatInfo.renderFormat != D3DFMT_UNKNOWN)
>     {
>-        textureCaps.renderable = SUCCEEDED(d3d9->CheckDeviceFormat(adapter, deviceType, adapterFormat, D3DUSAGE_RENDERTARGET, D3DRTYPE_TEXTURE, d3dFormatInfo.renderFormat));
>+        textureCaps.textureAttachment = SUCCEEDED(
>+            d3d9->CheckDeviceFormat(adapter, deviceType, adapterFormat, D3DUSAGE_RENDERTARGET,
>+                                    D3DRTYPE_TEXTURE, d3dFormatInfo.renderFormat));
> 
>-        if ((formatInfo.depthBits > 0 || formatInfo.stencilBits > 0) && !textureCaps.renderable)
>+        if ((formatInfo.depthBits > 0 || formatInfo.stencilBits > 0) &&
>+            !textureCaps.textureAttachment)
>         {
>-            textureCaps.renderable = SUCCEEDED(d3d9->CheckDeviceFormat(adapter, deviceType, adapterFormat, D3DUSAGE_DEPTHSTENCIL, D3DRTYPE_TEXTURE, d3dFormatInfo.renderFormat));
>+            textureCaps.textureAttachment = SUCCEEDED(
>+                d3d9->CheckDeviceFormat(adapter, deviceType, adapterFormat, D3DUSAGE_DEPTHSTENCIL,
>+                                        D3DRTYPE_TEXTURE, d3dFormatInfo.renderFormat));
>         }
>+        textureCaps.renderbuffer = textureCaps.textureAttachment;
> 
>         textureCaps.sampleCounts.insert(1);
>         for (unsigned int i = D3DMULTISAMPLE_2_SAMPLES; i <= D3DMULTISAMPLE_16_SAMPLES; i++)
>@@ -419,23 +533,25 @@ void GenerateCaps(IDirect3D9 *d3d9,
>     caps->maxRenderbufferSize = caps->max2DTextureSize;
> 
>     // Draw buffers are not supported in D3D9
>-    caps->maxDrawBuffers = 1;
>+    caps->maxDrawBuffers      = 1;
>     caps->maxColorAttachments = 1;
> 
>     // No specific limits on viewport size, maximum 2D texture size is equivalent
>-    caps->maxViewportWidth = caps->max2DTextureSize;
>+    caps->maxViewportWidth  = caps->max2DTextureSize;
>     caps->maxViewportHeight = caps->maxViewportWidth;
> 
>     // Point size is clamped to 1.0f when the shader model is less than 3
>     caps->minAliasedPointSize = 1.0f;
>-    caps->maxAliasedPointSize = ((D3DSHADER_VERSION_MAJOR(deviceCaps.PixelShaderVersion) >= 3) ? deviceCaps.MaxPointSize : 1.0f);
>+    caps->maxAliasedPointSize =
>+        ((D3DSHADER_VERSION_MAJOR(deviceCaps.PixelShaderVersion) >= 3) ? deviceCaps.MaxPointSize
>+                                                                       : 1.0f);
> 
>     // Wide lines not supported
>     caps->minAliasedLineWidth = 1.0f;
>     caps->maxAliasedLineWidth = 1.0f;
> 
>     // Primitive count limits (unused in ES2)
>-    caps->maxElementsIndices = 0;
>+    caps->maxElementsIndices  = 0;
>     caps->maxElementsVertices = 0;
> 
>     // Program and shader binary formats (no supported shader binary formats)
>@@ -468,28 +584,31 @@ void GenerateCaps(IDirect3D9 *d3d9,
>     const size_t MAX_VERTEX_CONSTANT_VECTORS_D3D9 = 256;
>     caps->maxVertexUniformVectors =
>         MAX_VERTEX_CONSTANT_VECTORS_D3D9 - GetReservedVertexUniformVectors();
>-    caps->maxVertexUniformComponents = caps->maxVertexUniformVectors * 4;
>+    caps->maxShaderUniformComponents[gl::ShaderType::Vertex] = caps->maxVertexUniformVectors * 4;
> 
>-    caps->maxVertexUniformBlocks = 0;
>+    caps->maxShaderUniformBlocks[gl::ShaderType::Vertex] = 0;
> 
>-    // SM3 only supports 11 output variables, with a special 12th register for PSIZE.
>-    const size_t MAX_VERTEX_OUTPUT_VECTORS_SM3 = 9;
>-    const size_t MAX_VERTEX_OUTPUT_VECTORS_SM2 = 7;
>-    caps->maxVertexOutputComponents = ((deviceCaps.VertexShaderVersion >= D3DVS_VERSION(3, 0)) ? MAX_VERTEX_OUTPUT_VECTORS_SM3
>-                                                                                               : MAX_VERTEX_OUTPUT_VECTORS_SM2) * 4;
>+    // SM3 only supports 12 output variables, but the special 12th register is only for PSIZE.
>+    const unsigned int MAX_VERTEX_OUTPUT_VECTORS_SM3 = 12 - GetReservedVaryingVectors();
>+    const unsigned int MAX_VERTEX_OUTPUT_VECTORS_SM2 = 10 - GetReservedVaryingVectors();
>+    caps->maxVertexOutputComponents =
>+        ((deviceCaps.VertexShaderVersion >= D3DVS_VERSION(3, 0)) ? MAX_VERTEX_OUTPUT_VECTORS_SM3
>+                                                                 : MAX_VERTEX_OUTPUT_VECTORS_SM2) *
>+        4;
> 
>     // Only Direct3D 10 ready devices support all the necessary vertex texture formats.
>     // We test this using D3D9 by checking support for the R16F format.
>     if (deviceCaps.VertexShaderVersion >= D3DVS_VERSION(3, 0) &&
>         SUCCEEDED(d3d9->CheckDeviceFormat(adapter, deviceType, currentDisplayMode.Format,
>-                                          D3DUSAGE_QUERY_VERTEXTEXTURE, D3DRTYPE_TEXTURE, D3DFMT_R16F)))
>+                                          D3DUSAGE_QUERY_VERTEXTEXTURE, D3DRTYPE_TEXTURE,
>+                                          D3DFMT_R16F)))
>     {
>-        const size_t MAX_TEXTURE_IMAGE_UNITS_VTF_SM3 = 4;
>-        caps->maxVertexTextureImageUnits = MAX_TEXTURE_IMAGE_UNITS_VTF_SM3;
>+        const size_t MAX_TEXTURE_IMAGE_UNITS_VTF_SM3             = 4;
>+        caps->maxShaderTextureImageUnits[gl::ShaderType::Vertex] = MAX_TEXTURE_IMAGE_UNITS_VTF_SM3;
>     }
>     else
>     {
>-        caps->maxVertexTextureImageUnits = 0;
>+        caps->maxShaderTextureImageUnits[gl::ShaderType::Vertex] = 0;
>     }
> 
>     // Fragment shader limits
>@@ -499,43 +618,45 @@ void GenerateCaps(IDirect3D9 *d3d9,
>         ((deviceCaps.PixelShaderVersion >= D3DPS_VERSION(3, 0)) ? MAX_PIXEL_CONSTANT_VECTORS_SM3
>                                                                 : MAX_PIXEL_CONSTANT_VECTORS_SM2) -
>         GetReservedFragmentUniformVectors();
>-    caps->maxFragmentUniformComponents = caps->maxFragmentUniformVectors * 4;
>-    caps->maxFragmentUniformBlocks = 0;
>-    caps->maxFragmentInputComponents = caps->maxVertexOutputComponents;
>-    caps->maxTextureImageUnits = 16;
>-    caps->minProgramTexelOffset = 0;
>-    caps->maxProgramTexelOffset = 0;
>+    caps->maxShaderUniformComponents[gl::ShaderType::Fragment] =
>+        caps->maxFragmentUniformVectors * 4;
>+    caps->maxShaderUniformBlocks[gl::ShaderType::Fragment]     = 0;
>+    caps->maxFragmentInputComponents                           = caps->maxVertexOutputComponents;
>+    caps->maxShaderTextureImageUnits[gl::ShaderType::Fragment] = 16;
>+    caps->minProgramTexelOffset                                = 0;
>+    caps->maxProgramTexelOffset                                = 0;
> 
>     // Aggregate shader limits (unused in ES2)
>-    caps->maxUniformBufferBindings = 0;
>-    caps->maxUniformBlockSize = 0;
>-    caps->uniformBufferOffsetAlignment = 0;
>-    caps->maxCombinedUniformBlocks = 0;
>-    caps->maxCombinedVertexUniformComponents = 0;
>-    caps->maxCombinedFragmentUniformComponents = 0;
>-    caps->maxVaryingComponents = 0;
>+    caps->maxUniformBufferBindings                                     = 0;
>+    caps->maxUniformBlockSize                                          = 0;
>+    caps->uniformBufferOffsetAlignment                                 = 0;
>+    caps->maxCombinedUniformBlocks                                     = 0;
>+    caps->maxCombinedShaderUniformComponents[gl::ShaderType::Vertex]   = 0;
>+    caps->maxCombinedShaderUniformComponents[gl::ShaderType::Fragment] = 0;
>+    caps->maxVaryingComponents                                         = 0;
> 
>     // Aggregate shader limits
>-    caps->maxVaryingVectors = caps->maxVertexOutputComponents / 4;
>-    caps->maxCombinedTextureImageUnits = caps->maxVertexTextureImageUnits + caps->maxTextureImageUnits;
>+    caps->maxVaryingVectors            = caps->maxVertexOutputComponents / 4;
>+    caps->maxCombinedTextureImageUnits = caps->maxShaderTextureImageUnits[gl::ShaderType::Vertex] +
>+                                         caps->maxShaderTextureImageUnits[gl::ShaderType::Fragment];
> 
>     // Transform feedback limits
>     caps->maxTransformFeedbackInterleavedComponents = 0;
>-    caps->maxTransformFeedbackSeparateAttributes = 0;
>-    caps->maxTransformFeedbackSeparateComponents = 0;
>+    caps->maxTransformFeedbackSeparateAttributes    = 0;
>+    caps->maxTransformFeedbackSeparateComponents    = 0;
> 
>     // Multisample limits
>     caps->maxSamples = maxSamples;
> 
>     // GL extension support
>     extensions->setTextureExtensionSupport(*textureCapsMap);
>-    extensions->elementIndexUint = deviceCaps.MaxVertexIndex >= (1 << 16);
>-    extensions->getProgramBinary = true;
>-    extensions->rgb8rgba8 = true;
>-    extensions->readFormatBGRA = true;
>+    extensions->elementIndexUint  = deviceCaps.MaxVertexIndex >= (1 << 16);
>+    extensions->getProgramBinary  = true;
>+    extensions->rgb8rgba8         = true;
>+    extensions->readFormatBGRA    = true;
>     extensions->pixelBufferObject = false;
>-    extensions->mapBuffer = false;
>-    extensions->mapBufferRange = false;
>+    extensions->mapBuffer         = false;
>+    extensions->mapBufferRange    = false;
> 
>     // textureRG is emulated and not performant.
>     extensions->textureRG = false;
>@@ -560,49 +681,61 @@ void GenerateCaps(IDirect3D9 *d3d9,
>         extensions->textureNPOT = false;
>     }
> 
>-    extensions->drawBuffers = false;
>+    extensions->drawBuffers    = false;
>     extensions->textureStorage = true;
> 
>-    // Must support a minimum of 2:1 anisotropy for max anisotropy to be considered supported, per the spec
>-    extensions->textureFilterAnisotropic = (deviceCaps.RasterCaps & D3DPRASTERCAPS_ANISOTROPY) != 0 && deviceCaps.MaxAnisotropy >= 2;
>+    // Must support a minimum of 2:1 anisotropy for max anisotropy to be considered supported, per
>+    // the spec
>+    extensions->textureFilterAnisotropic =
>+        (deviceCaps.RasterCaps & D3DPRASTERCAPS_ANISOTROPY) != 0 && deviceCaps.MaxAnisotropy >= 2;
>     extensions->maxTextureAnisotropy = static_cast<GLfloat>(deviceCaps.MaxAnisotropy);
> 
>     // Check occlusion query support by trying to create one
>     IDirect3DQuery9 *occlusionQuery = nullptr;
>-    extensions->occlusionQueryBoolean = SUCCEEDED(device->CreateQuery(D3DQUERYTYPE_OCCLUSION, &occlusionQuery)) && occlusionQuery;
>+    extensions->occlusionQueryBoolean =
>+        SUCCEEDED(device->CreateQuery(D3DQUERYTYPE_OCCLUSION, &occlusionQuery)) && occlusionQuery;
>     SafeRelease(occlusionQuery);
> 
>     // Check event query support by trying to create one
>     IDirect3DQuery9 *eventQuery = nullptr;
>-    extensions->fence = SUCCEEDED(device->CreateQuery(D3DQUERYTYPE_EVENT, &eventQuery)) && eventQuery;
>+    extensions->fence =
>+        SUCCEEDED(device->CreateQuery(D3DQUERYTYPE_EVENT, &eventQuery)) && eventQuery;
>     SafeRelease(eventQuery);
> 
>-    extensions->disjointTimerQuery     = false;
>-    extensions->robustness = true;
>+    extensions->disjointTimerQuery = false;
>+    extensions->robustness         = true;
>     // It seems that only DirectX 10 and higher enforce the well-defined behavior of always
>     // returning zero values when out-of-bounds reads. See
>     // https://www.khronos.org/registry/OpenGL/extensions/ARB/ARB_robustness.txt
>     extensions->robustBufferAccessBehavior = false;
>-    extensions->blendMinMax = true;
>-    extensions->framebufferBlit = true;
>-    extensions->framebufferMultisample = true;
>-    extensions->instancedArrays = deviceCaps.PixelShaderVersion >= D3DPS_VERSION(3, 0);
>-    extensions->packReverseRowOrder = true;
>-    extensions->standardDerivatives = (deviceCaps.PS20Caps.Caps & D3DPS20CAPS_GRADIENTINSTRUCTIONS) != 0;
>-    extensions->shaderTextureLOD = true;
>-    extensions->fragDepth = true;
>-    extensions->textureUsage = true;
>+    extensions->blendMinMax                = true;
>+    // https://docs.microsoft.com/en-us/windows/desktop/direct3ddxgi/format-support-for-direct3d-feature-level-9-1-hardware
>+    extensions->floatBlend                 = false;
>+    extensions->framebufferBlit            = true;
>+    extensions->framebufferMultisample     = true;
>+    extensions->instancedArraysANGLE       = deviceCaps.PixelShaderVersion >= D3DPS_VERSION(3, 0);
>+    // D3D9 requires at least one attribute that has a divisor of 0, which isn't required by the EXT
>+    // extension
>+    extensions->instancedArraysEXT         = false;
>+    extensions->packReverseRowOrder        = true;
>+    extensions->standardDerivatives =
>+        (deviceCaps.PS20Caps.Caps & D3DPS20CAPS_GRADIENTINSTRUCTIONS) != 0;
>+    extensions->shaderTextureLOD       = true;
>+    extensions->fragDepth              = true;
>+    extensions->textureUsage           = true;
>     extensions->translatedShaderSource = true;
>-    extensions->fboRenderMipmap = false;
>-    extensions->discardFramebuffer = false; // It would be valid to set this to true, since glDiscardFramebufferEXT is just a hint
>-    extensions->colorBufferFloat = false;
>-    extensions->debugMarker = true;
>-    extensions->eglImage               = true;
>-    extensions->eglImageExternal       = true;
>-    extensions->unpackSubimage         = true;
>-    extensions->packSubimage           = true;
>-    extensions->syncQuery              = extensions->fence;
>-    extensions->copyTexture            = true;
>+    extensions->fboRenderMipmap        = false;
>+    extensions->discardFramebuffer     = false;  // It would be valid to set this to true, since
>+                                                 // glDiscardFramebufferEXT is just a hint
>+    extensions->colorBufferFloat   = false;
>+    extensions->debugMarker        = true;
>+    extensions->eglImage           = true;
>+    extensions->eglImageExternal   = true;
>+    extensions->unpackSubimage     = true;
>+    extensions->packSubimage       = true;
>+    extensions->syncQuery          = extensions->fence;
>+    extensions->copyTexture        = true;
>+    extensions->textureBorderClamp = true;
> 
>     // D3D9 has no concept of separate masks and refs for front and back faces in the depth stencil
>     // state.
>@@ -615,22 +748,30 @@ void GenerateCaps(IDirect3D9 *d3d9,
> 
>     // D3D9 cannot support constant color and alpha blend funcs together
>     limitations->noSimultaneousConstantColorAndAlphaBlendFunc = true;
>-}
> 
>+    // D3D9 cannot support packing more than one variable to a single varying.
>+    // TODO(jmadill): Implement more sophisticated component packing in D3D9.
>+    limitations->noFlexibleVaryingPacking = true;
> }
> 
>+}  // namespace d3d9_gl
>+
> namespace d3d9
> {
> 
> GLuint ComputeBlockSize(D3DFORMAT format, GLuint width, GLuint height)
> {
>     const D3DFormat &d3dFormatInfo = d3d9::GetD3DFormatInfo(format);
>-    GLuint numBlocksWide = (width + d3dFormatInfo.blockWidth - 1) / d3dFormatInfo.blockWidth;
>+    GLuint numBlocksWide  = (width + d3dFormatInfo.blockWidth - 1) / d3dFormatInfo.blockWidth;
>     GLuint numBlocksHight = (height + d3dFormatInfo.blockHeight - 1) / d3dFormatInfo.blockHeight;
>     return (d3dFormatInfo.pixelBytes * numBlocksWide * numBlocksHight);
> }
> 
>-void MakeValidSize(bool isImage, D3DFORMAT format, GLsizei *requestWidth, GLsizei *requestHeight, int *levelOffset)
>+void MakeValidSize(bool isImage,
>+                   D3DFORMAT format,
>+                   GLsizei *requestWidth,
>+                   GLsizei *requestHeight,
>+                   int *levelOffset)
> {
>     const D3DFormat &d3dFormatInfo = d3d9::GetD3DFormatInfo(format);
> 
>@@ -639,7 +780,8 @@ void MakeValidSize(bool isImage, D3DFORMAT format, GLsizei *requestWidth, GLsize
>     if (isImage || *requestWidth < static_cast<GLsizei>(d3dFormatInfo.blockWidth) ||
>         *requestHeight < static_cast<GLsizei>(d3dFormatInfo.blockHeight))
>     {
>-        while (*requestWidth % d3dFormatInfo.blockWidth != 0 || *requestHeight % d3dFormatInfo.blockHeight != 0)
>+        while (*requestWidth % d3dFormatInfo.blockWidth != 0 ||
>+               *requestHeight % d3dFormatInfo.blockHeight != 0)
>         {
>             *requestWidth <<= 1;
>             *requestHeight <<= 1;
>@@ -652,8 +794,8 @@ void MakeValidSize(bool isImage, D3DFORMAT format, GLsizei *requestWidth, GLsize
> angle::WorkaroundsD3D GenerateWorkarounds()
> {
>     angle::WorkaroundsD3D workarounds;
>-    workarounds.mrtPerfWorkaround = true;
>-    workarounds.setDataFasterThanImageUpload = false;
>+    workarounds.mrtPerfWorkaround                = true;
>+    workarounds.setDataFasterThanImageUpload     = false;
>     workarounds.useInstancedPointSpriteEmulation = false;
> 
>     // TODO(jmadill): Disable workaround when we have a fixed compiler DLL.
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/renderer9_utils.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/renderer9_utils.h
>index 5b65b8910aa..cd9299271b6 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/renderer9_utils.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/renderer9_utils.h
>@@ -34,20 +34,26 @@ D3DBLENDOP ConvertBlendOp(GLenum blendOp);
> D3DSTENCILOP ConvertStencilOp(GLenum stencilOp);
> D3DTEXTUREADDRESS ConvertTextureWrap(GLenum wrap);
> D3DCULL ConvertCullMode(gl::CullFaceMode cullFace, GLenum frontFace);
>-D3DCUBEMAP_FACES ConvertCubeFace(GLenum cubeFace);
>+D3DCUBEMAP_FACES ConvertCubeFace(gl::TextureTarget cubeFace);
> DWORD ConvertColorMask(bool red, bool green, bool blue, bool alpha);
> D3DTEXTUREFILTERTYPE ConvertMagFilter(GLenum magFilter, float maxAnisotropy);
>-void ConvertMinFilter(GLenum minFilter, D3DTEXTUREFILTERTYPE *d3dMinFilter, D3DTEXTUREFILTERTYPE *d3dMipFilter,
>-                      float *d3dLodBias, float maxAnisotropy, size_t baseLevel);
>-D3DQUERYTYPE ConvertQueryType(GLenum queryType);
>+void ConvertMinFilter(GLenum minFilter,
>+                      D3DTEXTUREFILTERTYPE *d3dMinFilter,
>+                      D3DTEXTUREFILTERTYPE *d3dMipFilter,
>+                      float *d3dLodBias,
>+                      float maxAnisotropy,
>+                      size_t baseLevel);
>+D3DQUERYTYPE ConvertQueryType(gl::QueryType type);
> 
> D3DMULTISAMPLE_TYPE GetMultisampleType(GLuint samples);
> 
>-}
>+}  // namespace gl_d3d9
> 
> namespace d3d9_gl
> {
> 
>+unsigned int GetReservedVaryingVectors();
>+
> unsigned int GetReservedVertexUniformVectors();
> 
> unsigned int GetReservedFragmentUniformVectors();
>@@ -64,32 +70,36 @@ void GenerateCaps(IDirect3D9 *d3d9,
>                   gl::TextureCapsMap *textureCapsMap,
>                   gl::Extensions *extensions,
>                   gl::Limitations *limitations);
>-}
>+}  // namespace d3d9_gl
> 
> namespace d3d9
> {
> 
> GLuint ComputeBlockSize(D3DFORMAT format, GLuint width, GLuint height);
> 
>-void MakeValidSize(bool isImage, D3DFORMAT format, GLsizei *requestWidth, GLsizei *requestHeight, int *levelOffset);
>+void MakeValidSize(bool isImage,
>+                   D3DFORMAT format,
>+                   GLsizei *requestWidth,
>+                   GLsizei *requestHeight,
>+                   int *levelOffset);
> 
> inline bool isDeviceLostError(HRESULT errorCode)
> {
>     switch (errorCode)
>     {
>-      case D3DERR_DRIVERINTERNALERROR:
>-      case D3DERR_DEVICELOST:
>-      case D3DERR_DEVICEHUNG:
>-      case D3DERR_DEVICEREMOVED:
>-        return true;
>-      default:
>-        return false;
>+        case D3DERR_DRIVERINTERNALERROR:
>+        case D3DERR_DEVICELOST:
>+        case D3DERR_DEVICEHUNG:
>+        case D3DERR_DEVICEREMOVED:
>+            return true;
>+        default:
>+            return false;
>     }
> }
> 
> angle::WorkaroundsD3D GenerateWorkarounds();
>-}
>-
> }  // namespace d3d9
> 
>-#endif // LIBANGLE_RENDERER_D3D_D3D9_RENDERER9UTILS_H_
>+}  // namespace rx
>+
>+#endif  // LIBANGLE_RENDERER_D3D_D3D9_RENDERER9UTILS_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/shaders/compiled/componentmaskps.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/shaders/compiled/componentmaskps.h
>index 24482d755c9..b4af7da19df 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/shaders/compiled/componentmaskps.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/shaders/compiled/componentmaskps.h
>@@ -29,56 +29,20 @@
> // approximately 4 instruction slots used (1 texture, 3 arithmetic)
> #endif
> 
>-const BYTE g_ps20_componentmaskps[] =
>-{
>-      0,   2, 255, 255, 254, 255, 
>-     50,   0,  67,  84,  65,  66, 
>-     28,   0,   0,   0, 143,   0, 
>-      0,   0,   0,   2, 255, 255, 
>-      3,   0,   0,   0,  28,   0, 
>-      0,   0,   0,   1,   0,   0, 
>-    136,   0,   0,   0,  88,   0, 
>-      0,   0,   2,   0,   1,   0, 
>-      1,   0,   0,   0,  92,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-    108,   0,   0,   0,   2,   0, 
>-      0,   0,   1,   0,   0,   0, 
>-     92,   0,   0,   0,   0,   0, 
>-      0,   0, 113,   0,   0,   0, 
>-      3,   0,   0,   0,   1,   0, 
>-      0,   0, 120,   0,   0,   0, 
>-      0,   0,   0,   0,  97, 100, 
>-    100,   0,   1,   0,   3,   0, 
>-      1,   0,   4,   0,   1,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-    109, 117, 108, 116,   0, 116, 
>-    101, 120,   0, 171, 171, 171, 
>-      4,   0,  12,   0,   1,   0, 
>-      1,   0,   1,   0,   0,   0, 
>-      0,   0,   0,   0, 112, 115, 
>-     95,  50,  95,  48,   0,  77, 
>-    105,  99, 114, 111, 115, 111, 
>-    102, 116,  32,  40,  82,  41, 
>-     32,  72,  76,  83,  76,  32, 
>-     83, 104,  97, 100, 101, 114, 
>-     32,  67, 111, 109, 112, 105, 
>-    108, 101, 114,  32,  54,  46, 
>-     51,  46,  57,  54,  48,  48, 
>-     46,  49,  54,  51,  56,  52, 
>-      0, 171, 171, 171,  31,   0, 
>-      0,   2,   0,   0,   0, 128, 
>-      0,   0,   3, 176,  31,   0, 
>-      0,   2,   0,   0,   0, 144, 
>-      0,   8,  15, 160,  66,   0, 
>-      0,   3,   0,   0,  15, 128, 
>-      0,   0, 228, 176,   0,   8, 
>-    228, 160,   1,   0,   0,   2, 
>-      1,   0,  15, 128,   0,   0, 
>-    228, 160,   4,   0,   0,   4, 
>-      0,   0,  15, 128,   0,   0, 
>-    228, 128,   1,   0, 228, 128, 
>-      1,   0, 228, 160,   1,   0, 
>-      0,   2,   0,   8,  15, 128, 
>-      0,   0, 228, 128, 255, 255, 
>-      0,   0
>-};
>+const BYTE g_ps20_componentmaskps[] = {
>+    0,   2,   255, 255, 254, 255, 50,  0,   67,  84,  65,  66,  28,  0,   0,   0,   143, 0,   0,
>+    0,   0,   2,   255, 255, 3,   0,   0,   0,   28,  0,   0,   0,   0,   1,   0,   0,   136, 0,
>+    0,   0,   88,  0,   0,   0,   2,   0,   1,   0,   1,   0,   0,   0,   92,  0,   0,   0,   0,
>+    0,   0,   0,   108, 0,   0,   0,   2,   0,   0,   0,   1,   0,   0,   0,   92,  0,   0,   0,
>+    0,   0,   0,   0,   113, 0,   0,   0,   3,   0,   0,   0,   1,   0,   0,   0,   120, 0,   0,
>+    0,   0,   0,   0,   0,   97,  100, 100, 0,   1,   0,   3,   0,   1,   0,   4,   0,   1,   0,
>+    0,   0,   0,   0,   0,   0,   109, 117, 108, 116, 0,   116, 101, 120, 0,   171, 171, 171, 4,
>+    0,   12,  0,   1,   0,   1,   0,   1,   0,   0,   0,   0,   0,   0,   0,   112, 115, 95,  50,
>+    95,  48,  0,   77,  105, 99,  114, 111, 115, 111, 102, 116, 32,  40,  82,  41,  32,  72,  76,
>+    83,  76,  32,  83,  104, 97,  100, 101, 114, 32,  67,  111, 109, 112, 105, 108, 101, 114, 32,
>+    54,  46,  51,  46,  57,  54,  48,  48,  46,  49,  54,  51,  56,  52,  0,   171, 171, 171, 31,
>+    0,   0,   2,   0,   0,   0,   128, 0,   0,   3,   176, 31,  0,   0,   2,   0,   0,   0,   144,
>+    0,   8,   15,  160, 66,  0,   0,   3,   0,   0,   15,  128, 0,   0,   228, 176, 0,   8,   228,
>+    160, 1,   0,   0,   2,   1,   0,   15,  128, 0,   0,   228, 160, 4,   0,   0,   4,   0,   0,
>+    15,  128, 0,   0,   228, 128, 1,   0,   228, 128, 1,   0,   228, 160, 1,   0,   0,   2,   0,
>+    8,   15,  128, 0,   0,   228, 128, 255, 255, 0,   0};
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/shaders/compiled/luminanceps.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/shaders/compiled/luminanceps.h
>index bdd25ac1363..0fe3d856f92 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/shaders/compiled/luminanceps.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/shaders/compiled/luminanceps.h
>@@ -32,63 +32,22 @@
> // approximately 7 instruction slots used (1 texture, 6 arithmetic)
> #endif
> 
>-const BYTE g_ps20_luminanceps[] =
>-{
>-      0,   2, 255, 255, 254, 255, 
>-     50,   0,  67,  84,  65,  66, 
>-     28,   0,   0,   0, 143,   0, 
>-      0,   0,   0,   2, 255, 255, 
>-      3,   0,   0,   0,  28,   0, 
>-      0,   0,   0,   1,   0,   0, 
>-    136,   0,   0,   0,  88,   0, 
>-      0,   0,   2,   0,   1,   0, 
>-      1,   0,   0,   0,  92,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-    108,   0,   0,   0,   2,   0, 
>-      0,   0,   1,   0,   0,   0, 
>-     92,   0,   0,   0,   0,   0, 
>-      0,   0, 113,   0,   0,   0, 
>-      3,   0,   0,   0,   1,   0, 
>-      0,   0, 120,   0,   0,   0, 
>-      0,   0,   0,   0,  97, 100, 
>-    100,   0,   1,   0,   3,   0, 
>-      1,   0,   4,   0,   1,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-    109, 117, 108, 116,   0, 116, 
>-    101, 120,   0, 171, 171, 171, 
>-      4,   0,  12,   0,   1,   0, 
>-      1,   0,   1,   0,   0,   0, 
>-      0,   0,   0,   0, 112, 115, 
>-     95,  50,  95,  48,   0,  77, 
>-    105,  99, 114, 111, 115, 111, 
>-    102, 116,  32,  40,  82,  41, 
>-     32,  72,  76,  83,  76,  32, 
>-     83, 104,  97, 100, 101, 114, 
>-     32,  67, 111, 109, 112, 105, 
>-    108, 101, 114,  32,  54,  46, 
>-     51,  46,  57,  54,  48,  48, 
>-     46,  49,  54,  51,  56,  52, 
>-      0, 171, 171, 171,  31,   0, 
>-      0,   2,   0,   0,   0, 128, 
>-      0,   0,   3, 176,  31,   0, 
>-      0,   2,   0,   0,   0, 144, 
>-      0,   8,  15, 160,  66,   0, 
>-      0,   3,   0,   0,  15, 128, 
>-      0,   0, 228, 176,   0,   8, 
>-    228, 160,   1,   0,   0,   2, 
>-      1,   0,   9, 128,   0,   0, 
>-    228, 160,   4,   0,   0,   4, 
>-      0,   0,   1, 128,   0,   0, 
>-      0, 128,   1,   0,   0, 128, 
>-      1,   0,   0, 160,   4,   0, 
>-      0,   4,   0,   0,   2, 128, 
>-      0,   0, 255, 128,   1,   0, 
>-    255, 128,   1,   0, 255, 160, 
>-      1,   0,   0,   2,   1,   0, 
>-      7, 128,   0,   0,   0, 128, 
>-      1,   0,   0,   2,   1,   0, 
>-      8, 128,   0,   0,  85, 128, 
>-      1,   0,   0,   2,   0,   8, 
>-     15, 128,   1,   0, 228, 128, 
>-    255, 255,   0,   0
>-};
>+const BYTE g_ps20_luminanceps[] = {
>+    0,   2,   255, 255, 254, 255, 50,  0,   67,  84,  65,  66,  28,  0,   0,   0,   143, 0,   0,
>+    0,   0,   2,   255, 255, 3,   0,   0,   0,   28,  0,   0,   0,   0,   1,   0,   0,   136, 0,
>+    0,   0,   88,  0,   0,   0,   2,   0,   1,   0,   1,   0,   0,   0,   92,  0,   0,   0,   0,
>+    0,   0,   0,   108, 0,   0,   0,   2,   0,   0,   0,   1,   0,   0,   0,   92,  0,   0,   0,
>+    0,   0,   0,   0,   113, 0,   0,   0,   3,   0,   0,   0,   1,   0,   0,   0,   120, 0,   0,
>+    0,   0,   0,   0,   0,   97,  100, 100, 0,   1,   0,   3,   0,   1,   0,   4,   0,   1,   0,
>+    0,   0,   0,   0,   0,   0,   109, 117, 108, 116, 0,   116, 101, 120, 0,   171, 171, 171, 4,
>+    0,   12,  0,   1,   0,   1,   0,   1,   0,   0,   0,   0,   0,   0,   0,   112, 115, 95,  50,
>+    95,  48,  0,   77,  105, 99,  114, 111, 115, 111, 102, 116, 32,  40,  82,  41,  32,  72,  76,
>+    83,  76,  32,  83,  104, 97,  100, 101, 114, 32,  67,  111, 109, 112, 105, 108, 101, 114, 32,
>+    54,  46,  51,  46,  57,  54,  48,  48,  46,  49,  54,  51,  56,  52,  0,   171, 171, 171, 31,
>+    0,   0,   2,   0,   0,   0,   128, 0,   0,   3,   176, 31,  0,   0,   2,   0,   0,   0,   144,
>+    0,   8,   15,  160, 66,  0,   0,   3,   0,   0,   15,  128, 0,   0,   228, 176, 0,   8,   228,
>+    160, 1,   0,   0,   2,   1,   0,   9,   128, 0,   0,   228, 160, 4,   0,   0,   4,   0,   0,
>+    1,   128, 0,   0,   0,   128, 1,   0,   0,   128, 1,   0,   0,   160, 4,   0,   0,   4,   0,
>+    0,   2,   128, 0,   0,   255, 128, 1,   0,   255, 128, 1,   0,   255, 160, 1,   0,   0,   2,
>+    1,   0,   7,   128, 0,   0,   0,   128, 1,   0,   0,   2,   1,   0,   8,   128, 0,   0,   85,
>+    128, 1,   0,   0,   2,   0,   8,   15,  128, 1,   0,   228, 128, 255, 255, 0,   0};
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/shaders/compiled/passthroughps.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/shaders/compiled/passthroughps.h
>index 337af92ec64..a74e14e7034 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/shaders/compiled/passthroughps.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/shaders/compiled/passthroughps.h
>@@ -23,39 +23,15 @@
> // approximately 2 instruction slots used (1 texture, 1 arithmetic)
> #endif
> 
>-const BYTE g_ps20_passthroughps[] =
>-{
>-      0,   2, 255, 255, 254, 255, 
>-     33,   0,  67,  84,  65,  66, 
>-     28,   0,   0,   0,  75,   0, 
>-      0,   0,   0,   2, 255, 255, 
>-      1,   0,   0,   0,  28,   0, 
>-      0,   0,   0,   1,   0,   0, 
>-     68,   0,   0,   0,  48,   0, 
>-      0,   0,   3,   0,   0,   0, 
>-      1,   0,   0,   0,  52,   0, 
>-      0,   0,   0,   0,   0,   0, 
>-    116, 101, 120,   0,   4,   0, 
>-     12,   0,   1,   0,   1,   0, 
>-      1,   0,   0,   0,   0,   0, 
>-      0,   0, 112, 115,  95,  50, 
>-     95,  48,   0,  77, 105,  99, 
>-    114, 111, 115, 111, 102, 116, 
>-     32,  40,  82,  41,  32,  72, 
>-     76,  83,  76,  32,  83, 104, 
>-     97, 100, 101, 114,  32,  67, 
>-    111, 109, 112, 105, 108, 101, 
>-    114,  32,  54,  46,  51,  46, 
>-     57,  54,  48,  48,  46,  49, 
>-     54,  51,  56,  52,   0, 171, 
>-    171, 171,  31,   0,   0,   2, 
>-      0,   0,   0, 128,   0,   0, 
>-      3, 176,  31,   0,   0,   2, 
>-      0,   0,   0, 144,   0,   8, 
>-     15, 160,  66,   0,   0,   3, 
>-      0,   0,  15, 128,   0,   0, 
>-    228, 176,   0,   8, 228, 160, 
>-      1,   0,   0,   2,   0,   8, 
>-     15, 128,   0,   0, 228, 128, 
>-    255, 255,   0,   0
>-};
>+const BYTE g_ps20_passthroughps[] = {
>+    0,   2,   255, 255, 254, 255, 33,  0,   67,  84,  65,  66,  28,  0,   0,  0,   75,  0,
>+    0,   0,   0,   2,   255, 255, 1,   0,   0,   0,   28,  0,   0,   0,   0,  1,   0,   0,
>+    68,  0,   0,   0,   48,  0,   0,   0,   3,   0,   0,   0,   1,   0,   0,  0,   52,  0,
>+    0,   0,   0,   0,   0,   0,   116, 101, 120, 0,   4,   0,   12,  0,   1,  0,   1,   0,
>+    1,   0,   0,   0,   0,   0,   0,   0,   112, 115, 95,  50,  95,  48,  0,  77,  105, 99,
>+    114, 111, 115, 111, 102, 116, 32,  40,  82,  41,  32,  72,  76,  83,  76, 32,  83,  104,
>+    97,  100, 101, 114, 32,  67,  111, 109, 112, 105, 108, 101, 114, 32,  54, 46,  51,  46,
>+    57,  54,  48,  48,  46,  49,  54,  51,  56,  52,  0,   171, 171, 171, 31, 0,   0,   2,
>+    0,   0,   0,   128, 0,   0,   3,   176, 31,  0,   0,   2,   0,   0,   0,  144, 0,   8,
>+    15,  160, 66,  0,   0,   3,   0,   0,   15,  128, 0,   0,   228, 176, 0,  8,   228, 160,
>+    1,   0,   0,   2,   0,   8,   15,  128, 0,   0,   228, 128, 255, 255, 0,  0};
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/vertexconversion.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/vertexconversion.h
>index aa05934bc88..8a702bcb614 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/vertexconversion.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/vertexconversion.h
>@@ -10,9 +10,9 @@
> #ifndef LIBANGLE_RENDERER_D3D_D3D9_VERTEXCONVERSION_H_
> #define LIBANGLE_RENDERER_D3D_D3D9_VERTEXCONVERSION_H_
> 
>-#include <limits>
>-#include <cstdint>
> #include <cstddef>
>+#include <cstdint>
>+#include <limits>
> 
> namespace rx
> {
>@@ -29,10 +29,7 @@ struct Identity
> 
>     typedef T OutputType;
> 
>-    static T convert(T x)
>-    {
>-        return x;
>-    }
>+    static T convert(T x) { return x; }
> };
> 
> template <class FromT, class ToT>
>@@ -42,10 +39,7 @@ struct Cast
> 
>     typedef ToT OutputType;
> 
>-    static ToT convert(FromT x)
>-    {
>-        return static_cast<ToT>(x);
>-    }
>+    static ToT convert(FromT x) { return static_cast<ToT>(x); }
> };
> 
> template <class T>
>@@ -55,10 +49,7 @@ struct Cast<T, T>
> 
>     typedef T OutputType;
> 
>-    static T convert(T x)
>-    {
>-        return static_cast<T>(x);
>-    }
>+    static T convert(T x) { return static_cast<T>(x); }
> };
> 
> template <class T>
>@@ -76,13 +67,14 @@ struct Normalize
>         if (NL::is_signed)
>         {
>             // const float => VC2008 computes it at compile time
>-            // static const float => VC2008 computes it the first time we get here, stores it to memory with static guard and all that.
>-            const float divisor = 1.0f/(2*static_cast<float>(NL::max())+1);
>-            return (2*f+1)*divisor;
>+            // static const float => VC2008 computes it the first time we get here, stores it to
>+            // memory with static guard and all that.
>+            const float divisor = 1.0f / (2 * static_cast<float>(NL::max()) + 1);
>+            return (2 * f + 1) * divisor;
>         }
>         else
>         {
>-            return f/NL::max();
>+            return f / NL::max();
>         }
>     }
> };
>@@ -110,7 +102,7 @@ template <std::size_t N>
> struct NoWiden
> {
>     static const std::size_t initialWidth = N;
>-    static const std::size_t finalWidth = N;
>+    static const std::size_t finalWidth   = N;
> };
> 
> // SHORT, norm-SHORT, norm-UNSIGNED_SHORT are supported but only with 2 or 4 components
>@@ -118,14 +110,14 @@ template <std::size_t N>
> struct WidenToEven
> {
>     static const std::size_t initialWidth = N;
>-    static const std::size_t finalWidth = N+(N&1);
>+    static const std::size_t finalWidth   = N + (N & 1);
> };
> 
> template <std::size_t N>
> struct WidenToFour
> {
>     static const std::size_t initialWidth = N;
>-    static const std::size_t finalWidth = 4;
>+    static const std::size_t finalWidth   = 4;
> };
> 
> // Most types have 0 and 1 that are just that.
>@@ -147,7 +139,8 @@ struct NormalizedDefaultValues
> // Converter:
> // static const bool identity: true if this is an identity transform (with no widening)
> // static const std::size_t finalSize: number of bytes per output vertex
>-// static void convertArray(const void *in, std::size_t stride, std::size_t n, void *out): convert an array of vertices. Input may be strided, but output will be unstrided.
>+// static void convertArray(const void *in, std::size_t stride, std::size_t n, void *out): convert
>+// an array of vertices. Input may be strided, but output will be unstrided.
> 
> template <class InT,
>           class WidenRule,
>@@ -158,16 +151,17 @@ struct VertexDataConverter
>     typedef typename Converter::OutputType OutputType;
>     typedef InT InputType;
> 
>-    static const bool identity = (WidenRule::initialWidth == WidenRule::finalWidth) && Converter::identity;
>+    static const bool identity =
>+        (WidenRule::initialWidth == WidenRule::finalWidth) && Converter::identity;
>     static const std::size_t finalSize = WidenRule::finalWidth * sizeof(OutputType);
> 
>     static void convertArray(const uint8_t *input, size_t stride, size_t n, uint8_t *output)
>     {
>-        OutputType *out = reinterpret_cast<OutputType*>(output);
>+        OutputType *out = reinterpret_cast<OutputType *>(output);
> 
>         for (std::size_t i = 0; i < n; i++)
>         {
>-            const InputType *ein = reinterpret_cast<const InputType*>(input + i * stride);
>+            const InputType *ein = reinterpret_cast<const InputType *>(input + i * stride);
> 
>             copyComponent(out, ein, 0, static_cast<OutputType>(DefaultValueRule::zero()));
>             copyComponent(out, ein, 1, static_cast<OutputType>(DefaultValueRule::zero()));
>@@ -179,7 +173,10 @@ struct VertexDataConverter
>     }
> 
>   private:
>-    static void copyComponent(OutputType *out, const InputType *in, std::size_t elementindex, OutputType defaultvalue)
>+    static void copyComponent(OutputType *out,
>+                              const InputType *in,
>+                              std::size_t elementindex,
>+                              OutputType defaultvalue)
>     {
>         if (WidenRule::finalWidth > elementindex)
>         {
>@@ -195,6 +192,6 @@ struct VertexDataConverter
>     }
> };
> 
>-}
>+}  // namespace rx
> 
>-#endif   // LIBANGLE_RENDERER_D3D_D3D9_VERTEXCONVERSION_H_
>+#endif  // LIBANGLE_RENDERER_D3D_D3D9_VERTEXCONVERSION_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/formatutilsD3D.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/formatutilsD3D.h
>index a245a0432f8..00d749dd0d0 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/formatutilsD3D.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/formatutilsD3D.h
>@@ -10,29 +10,15 @@
> #ifndef LIBANGLE_RENDERER_D3D_FORMATUTILSD3D_H_
> #define LIBANGLE_RENDERER_D3D_FORMATUTILSD3D_H_
> 
>-#include "angle_gl.h"
>-
>-#include <cstddef>
>-#include <stdint.h>
>-
>-#include <map>
>-
>-namespace gl
>-{
>-struct FormatType;
>-}
>-
> namespace rx
> {
>-typedef void (*VertexCopyFunction)(const uint8_t *input, size_t stride, size_t count, uint8_t *output);
>-
> enum VertexConversionType
> {
>     VERTEX_CONVERT_NONE = 0,
>-    VERTEX_CONVERT_CPU = 1,
>-    VERTEX_CONVERT_GPU = 2,
>+    VERTEX_CONVERT_CPU  = 1,
>+    VERTEX_CONVERT_GPU  = 2,
>     VERTEX_CONVERT_BOTH = 3
> };
> }  // namespace rx
> 
>-#endif // LIBANGLE_RENDERER_D3D_FORMATUTILSD3D_H_
>+#endif  // LIBANGLE_RENDERER_D3D_FORMATUTILSD3D_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/driver_utils.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/driver_utils.cpp
>index d97b8e7c22a..fbd6090c796 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/driver_utils.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/driver_utils.cpp
>@@ -47,9 +47,7 @@ const uint32_t Kabylake[] = {0x5916, 0x5913, 0x5906, 0x5926, 0x5921, 0x5915, 0x5
> 
> }  // anonymous namespace
> 
>-IntelDriverVersion::IntelDriverVersion(uint16_t lastPart) : mVersionPart(lastPart)
>-{
>-}
>+IntelDriverVersion::IntelDriverVersion(uint16_t lastPart) : mVersionPart(lastPart) {}
> 
> bool IntelDriverVersion::operator==(const IntelDriverVersion &version)
> {
>@@ -117,4 +115,23 @@ bool IsKabylake(uint32_t DeviceId)
>     return std::find(std::begin(Kabylake), std::end(Kabylake), DeviceId) != std::end(Kabylake);
> }
> 
>+const char *GetVendorString(uint32_t vendorId)
>+{
>+    switch (vendorId)
>+    {
>+        case VENDOR_ID_AMD:
>+            return "Advanced Micro Devices";
>+        case VENDOR_ID_NVIDIA:
>+            return "NVIDIA";
>+        case VENDOR_ID_INTEL:
>+            return "Intel";
>+        case VENDOR_ID_QUALCOMM:
>+            return "Qualcomm";
>+        default:
>+            // TODO(jmadill): More vendor IDs.
>+            ASSERT(vendorId == 0xba5eba11);  // Mock vendor ID used for tests.
>+            return "Unknown";
>+    }
>+}
>+
> }  // namespace rx
>\ No newline at end of file
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/driver_utils.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/driver_utils.h
>index 62bdc502fc6..228a4f4ac71 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/driver_utils.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/driver_utils.h
>@@ -9,6 +9,7 @@
> #ifndef LIBANGLE_RENDERER_DRIVER_UTILS_H_
> #define LIBANGLE_RENDERER_DRIVER_UTILS_H_
> 
>+#include "common/platform.h"
> #include "libANGLE/angletypes.h"
> 
> namespace rx
>@@ -25,26 +26,51 @@ enum VendorID : uint32_t
>     VENDOR_ID_QUALCOMM = 0x5143,
> };
> 
>-inline bool IsAMD(uint32_t vendor_id)
>+enum AndroidDeviceID : uint32_t
> {
>-    return vendor_id == VENDOR_ID_AMD;
>+    ANDROID_DEVICE_ID_UNKNOWN  = 0x0,
>+    ANDROID_DEVICE_ID_NEXUS5X  = 0x4010800,
>+    ANDROID_DEVICE_ID_PIXEL1XL = 0x5040001,
>+    ANDROID_DEVICE_ID_PIXEL2   = 0x5030004,
>+};
>+
>+inline bool IsAMD(uint32_t vendorId)
>+{
>+    return vendorId == VENDOR_ID_AMD;
> }
> 
>-inline bool IsIntel(uint32_t vendor_id)
>+inline bool IsIntel(uint32_t vendorId)
> {
>-    return vendor_id == VENDOR_ID_INTEL;
>+    return vendorId == VENDOR_ID_INTEL;
> }
> 
>-inline bool IsNvidia(uint32_t vendor_id)
>+inline bool IsNvidia(uint32_t vendorId)
> {
>-    return vendor_id == VENDOR_ID_NVIDIA;
>+    return vendorId == VENDOR_ID_NVIDIA;
> }
> 
>-inline bool IsQualcomm(uint32_t vendor_id)
>+inline bool IsQualcomm(uint32_t vendorId)
> {
>-    return vendor_id == VENDOR_ID_QUALCOMM;
>+    return vendorId == VENDOR_ID_QUALCOMM;
> }
> 
>+inline bool IsNexus5X(uint32_t vendorId, uint32_t deviceId)
>+{
>+    return IsQualcomm(vendorId) && deviceId == ANDROID_DEVICE_ID_NEXUS5X;
>+}
>+
>+inline bool IsPixel1XL(uint32_t vendorId, uint32_t deviceId)
>+{
>+    return IsQualcomm(vendorId) && deviceId == ANDROID_DEVICE_ID_PIXEL1XL;
>+}
>+
>+inline bool IsPixel2(uint32_t vendorId, uint32_t deviceId)
>+{
>+    return IsQualcomm(vendorId) && deviceId == ANDROID_DEVICE_ID_PIXEL2;
>+}
>+
>+const char *GetVendorString(uint32_t vendorId);
>+
> // Intel
> class IntelDriverVersion
> {
>@@ -69,5 +95,42 @@ bool IsSkylake(uint32_t DeviceId);
> bool IsBroxton(uint32_t DeviceId);
> bool IsKabylake(uint32_t DeviceId);
> 
>+// Platform helpers
>+inline bool IsWindows()
>+{
>+#if defined(ANGLE_PLATFORM_WINDOWS)
>+    return true;
>+#else
>+    return false;
>+#endif
>+}
>+
>+inline bool IsLinux()
>+{
>+#if defined(ANGLE_PLATFORM_LINUX)
>+    return true;
>+#else
>+    return false;
>+#endif
>+}
>+
>+inline bool IsApple()
>+{
>+#if defined(ANGLE_PLATFORM_APPLE)
>+    return true;
>+#else
>+    return false;
>+#endif
>+}
>+
>+inline bool IsAndroid()
>+{
>+#if defined(ANGLE_PLATFORM_ANDROID)
>+    return true;
>+#else
>+    return false;
>+#endif
>+}
>+
> }  // namespace rx
> #endif  // LIBANGLE_RENDERER_DRIVER_UTILS_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gen_angle_format_table.py b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gen_angle_format_table.py
>index eb55be3101b..0f48129c850 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gen_angle_format_table.py
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gen_angle_format_table.py
>@@ -5,6 +5,7 @@
> #
> # gen_angle_format_table.py:
> #  Code generation for ANGLE format map.
>+#  NOTE: don't run this script directly. Run scripts/run_code_generation.py.
> #
> 
> import angle_format
>@@ -24,10 +25,15 @@ template_autogen_h = """// GENERATED FILE - DO NOT EDIT.
> //
> // ANGLE format enumeration.
> 
>+#ifndef LIBANGLE_RENDERER_FORMATID_H_
>+#define LIBANGLE_RENDERER_FORMATID_H_
>+
>+#include <cstdint>
>+
> namespace angle
> {{
> 
>-enum class Format::ID
>+enum class FormatID
> {{
> {angle_format_enum}
> }};
>@@ -35,6 +41,8 @@ enum class Format::ID
> constexpr uint32_t kNumANGLEFormats = {num_angle_formats};
> 
> }}  // namespace angle
>+
>+#endif  // LIBANGLE_RENDERER_FORMATID_H_
> """
> 
> template_autogen_inl = """// GENERATED FILE - DO NOT EDIT.
>@@ -56,19 +64,19 @@ template_autogen_inl = """// GENERATED FILE - DO NOT EDIT.
> namespace angle
> {{
> 
>-static constexpr rx::FastCopyFunctionMap::Entry BGRAEntry = {{GL_RGBA, GL_UNSIGNED_BYTE,
>+static constexpr rx::FastCopyFunctionMap::Entry BGRAEntry = {{angle::FormatID::R8G8B8A8_UNORM,
>                                                              CopyBGRA8ToRGBA8}};
> static constexpr rx::FastCopyFunctionMap BGRACopyFunctions = {{&BGRAEntry, 1}};
> static constexpr rx::FastCopyFunctionMap NoCopyFunctions;
> 
>-constexpr Format g_formatInfoTable[] = {{
>+const Format gFormatInfoTable[] = {{
>     // clang-format off
>-    {{ Format::ID::NONE, GL_NONE, GL_NONE, nullptr, NoCopyFunctions, nullptr, nullptr, GL_NONE, 0, 0, 0, 0, 0, 0 }},
>+    {{ FormatID::NONE, GL_NONE, GL_NONE, nullptr, NoCopyFunctions, nullptr, nullptr, GL_NONE, 0, 0, 0, 0, 0, 0, 0, 0, 0, false, false }},
> {angle_format_info_cases}    // clang-format on
> }};
> 
> // static
>-Format::ID Format::InternalFormatToID(GLenum internalFormat)
>+FormatID Format::InternalFormatToID(GLenum internalFormat)
> {{
>     switch (internalFormat)
>     {{
>@@ -76,28 +84,41 @@ Format::ID Format::InternalFormatToID(GLenum internalFormat)
>     }}
> }}
> 
>-// static
>-const Format &Format::Get(ID id)
>+const Format *GetFormatInfoTable()
> {{
>-    return g_formatInfoTable[static_cast<size_t>(id)];
>+    return gFormatInfoTable;
> }}
>-
> }}  // namespace angle
> """
> 
>+
>+def is_depth_stencil(angle_format):
>+    if not 'channels' in angle_format or not angle_format['channels']:
>+        return False
>+    return 'd' in angle_format['channels'] or 's' in angle_format['channels']
>+
>+
>+def get_component_suffix(angle_format):
>+    if angle_format['componentType'] == 'float':
>+        return 'F'
>+    if angle_format['componentType'] == 'int' or angle_format['componentType'] == 'snorm':
>+        return 'S'
>+    return ""
>+
>+
> def get_channel_struct(angle_format):
>     if 'bits' not in angle_format or angle_format['bits'] is None:
>         return None
>     if 'BLOCK' in angle_format['id']:
>         return None
>     bits = angle_format['bits']
>-    if 'D' in bits or 'S' in bits:
>-        return None
> 
>     if 'channelStruct' in angle_format:
>         return angle_format['channelStruct']
> 
>     struct_name = ''
>+    component_suffix = get_component_suffix(angle_format)
>+
>     for channel in angle_format['channels']:
>         if channel == 'r':
>             struct_name += 'R{}'.format(bits['R'])
>@@ -109,18 +130,24 @@ def get_channel_struct(angle_format):
>             struct_name += 'A{}'.format(bits['A'])
>         if channel == 'l':
>             struct_name += 'L{}'.format(bits['L'])
>-    if angle_format['componentType'] == 'float':
>-        struct_name += 'F'
>-    if angle_format['componentType'] == 'int' or angle_format['componentType'] == 'snorm':
>-        struct_name += 'S'
>+        if channel == 'd':
>+            struct_name += 'D{}'.format(bits['D']) + component_suffix
>+        if channel == 's':
>+            struct_name += 'S{}'.format(bits['S'])
>+
>+    if not is_depth_stencil(angle_format):
>+        struct_name += component_suffix
>+
>     return struct_name
> 
>+
> def get_mip_generation_function(angle_format):
>     channel_struct = get_channel_struct(angle_format)
>-    if channel_struct == None or "BLOCK" in angle_format["id"]:
>+    if is_depth_stencil(angle_format) or channel_struct == None or "BLOCK" in angle_format["id"]:
>         return 'nullptr'
>     return 'GenerateMip<' + channel_struct + '>'
> 
>+
> def get_color_read_write_component_type(angle_format):
>     component_type_map = {
>         'uint': 'GLuint',
>@@ -131,22 +158,32 @@ def get_color_read_write_component_type(angle_format):
>     }
>     return component_type_map[angle_format['componentType']]
> 
>+
> def get_color_read_function(angle_format):
>     channel_struct = get_channel_struct(angle_format)
>     if channel_struct == None:
>         return 'nullptr'
>+
>+    if is_depth_stencil(angle_format):
>+        return 'ReadDepthStencil<' + channel_struct + '>'
>+
>     read_component_type = get_color_read_write_component_type(angle_format)
>     return 'ReadColor<' + channel_struct + ', '+ read_component_type + '>'
> 
>+
> def get_color_write_function(angle_format):
>     channel_struct = get_channel_struct(angle_format)
>     if channel_struct == None:
>         return 'nullptr'
>+
>+    if is_depth_stencil(angle_format):
>+        return 'WriteDepthStencil<' + channel_struct + '>'
>+
>     write_component_type = get_color_read_write_component_type(angle_format)
>     return 'WriteColor<' + channel_struct + ', '+ write_component_type + '>'
> 
> 
>-format_entry_template = """    {{ Format::ID::{id}, {glInternalFormat}, {fboImplementationInternalFormat}, {mipGenerationFunction}, {fastCopyFunctions}, {colorReadFunction}, {colorWriteFunction}, {namedComponentType}, {R}, {G}, {B}, {A}, {D}, {S} }},
>+format_entry_template = """    {{ FormatID::{id}, {glInternalFormat}, {fboImplementationInternalFormat}, {mipGenerationFunction}, {fastCopyFunctions}, {colorReadFunction}, {colorWriteFunction}, {namedComponentType}, {R}, {G}, {B}, {A}, {L}, {D}, {S}, {pixelBytes}, {componentAlignmentMask}, {isBlock}, {isFixed} }},
> """
> 
> def get_named_component_type(component_type):
>@@ -165,6 +202,30 @@ def get_named_component_type(component_type):
>     else:
>         raise ValueError("Unknown component type for " + component_type)
> 
>+
>+def get_component_alignment_mask(channels, bits):
>+    if channels == None or bits == None:
>+        return "std::numeric_limits<GLuint>::max()"
>+    bitness = bits[channels[0].upper()]
>+    for channel in channels:
>+        if channel not in "rgba":
>+            return "std::numeric_limits<GLuint>::max()"
>+        # Can happen for RGB10A2 formats.
>+        if bits[channel.upper()] != bitness:
>+            return "std::numeric_limits<GLuint>::max()"
>+    component_bytes = (int(bitness) >> 3)
>+
>+    if component_bytes == 1:
>+        return "0"
>+    elif component_bytes == 2:
>+        return "1"
>+    elif component_bytes == 4:
>+        return "3"
>+    else:
>+        # Can happen for 4-bit RGBA.
>+        return "std::numeric_limits<GLuint>::max()"
>+
>+
> def json_to_table_data(format_id, json, angle_to_gl):
> 
>     table_data = ""
>@@ -197,7 +258,7 @@ def json_to_table_data(format_id, json, angle_to_gl):
>     parsed["colorReadFunction"] = get_color_read_function(parsed)
>     parsed["colorWriteFunction"] = get_color_write_function(parsed)
> 
>-    for channel in "ABDGLRS":
>+    for channel in angle_format.kChannels:
>         if parsed["bits"] != None and channel in parsed["bits"]:
>             parsed[channel] = parsed["bits"][channel]
>         else:
>@@ -208,8 +269,28 @@ def json_to_table_data(format_id, json, angle_to_gl):
>     if format_id == "B8G8R8A8_UNORM":
>         parsed["fastCopyFunctions"] = "BGRACopyFunctions"
> 
>+    is_block = format_id.endswith("_BLOCK")
>+
>+    pixel_bytes = 0
>+    if is_block:
>+        assert 'blockPixelBytes' in parsed, \
>+            'Compressed format %s requires its block size to be specified in angle_format_data.json' % \
>+                format_id
>+        pixel_bytes = parsed['blockPixelBytes']
>+    else:
>+        sum_of_bits = 0
>+        for channel in angle_format.kChannels:
>+            sum_of_bits += int(parsed[channel])
>+        pixel_bytes = sum_of_bits / 8
>+    parsed["pixelBytes"] = pixel_bytes
>+    parsed["componentAlignmentMask"] = get_component_alignment_mask(
>+        parsed["channels"], parsed["bits"])
>+    parsed["isBlock"] = "true" if is_block else "false"
>+    parsed["isFixed"] = "true" if "FIXED" in format_id else "false"
>+
>     return format_entry_template.format(**parsed)
> 
>+
> def parse_angle_format_table(all_angle, json_data, angle_to_gl):
>     table_data = ''
>     for format_id in sorted(all_angle):
>@@ -219,6 +300,7 @@ def parse_angle_format_table(all_angle, json_data, angle_to_gl):
> 
>     return table_data
> 
>+
> def gen_enum_string(all_angle):
>     enum_data = '    NONE'
>     for format_id in sorted(all_angle):
>@@ -227,42 +309,72 @@ def gen_enum_string(all_angle):
>         enum_data += ',\n    ' + format_id
>     return enum_data
> 
>+case_template = """        case {gl_format}:
>+            return FormatID::{angle_format};
>+"""
>+
>+
> def gen_map_switch_string(gl_to_angle):
>     switch_data = '';
>-    for gl_format in gl_to_angle:
>+    for gl_format in sorted(gl_to_angle.keys()):
>         angle_format = gl_to_angle[gl_format]
>-        switch_data += "        case " + gl_format + ":\nreturn Format::ID::" + angle_format + ";\n"
>+        switch_data += case_template.format(
>+            gl_format=gl_format,
>+            angle_format=angle_format)
>     switch_data += "        default:\n"
>-    switch_data += "            return Format::ID::NONE;"
>+    switch_data += "            return FormatID::NONE;"
>     return switch_data;
> 
>-gl_to_angle = angle_format.load_forward_table('angle_format_map.json')
>-angle_to_gl = angle_format.load_inverse_table('angle_format_map.json')
>-data_source_name = 'angle_format_data.json'
>-json_data = angle_format.load_json(data_source_name)
>-all_angle = angle_to_gl.keys()
>-
>-angle_format_cases = parse_angle_format_table(
>-    all_angle, json_data, angle_to_gl)
>-switch_data = gen_map_switch_string(gl_to_angle)
>-output_cpp = template_autogen_inl.format(
>-    script_name = sys.argv[0],
>-    copyright_year = date.today().year,
>-    angle_format_info_cases = angle_format_cases,
>-    angle_format_switch = switch_data,
>-    data_source_name = data_source_name)
>-with open('Format_table_autogen.cpp', 'wt') as out_file:
>-    out_file.write(output_cpp)
>-    out_file.close()
>-
>-enum_data = gen_enum_string(all_angle)
>-num_angle_formats = len(all_angle)
>-output_h = template_autogen_h.format(
>-    script_name = sys.argv[0],
>-    copyright_year = date.today().year,
>-    angle_format_enum = enum_data,
>-    data_source_name = data_source_name,
>-    num_angle_formats = num_angle_formats)
>-with open('Format_ID_autogen.inl', 'wt') as out_file:
>-    out_file.write(output_h)
>-    out_file.close()
>+
>+def main():
>+
>+    # auto_script parameters.
>+    if len(sys.argv) > 1:
>+        inputs = ['angle_format.py', 'angle_format_data.json', 'angle_format_map.json']
>+        outputs = ['Format_table_autogen.cpp', 'FormatID_autogen.h']
>+
>+        if sys.argv[1] == 'inputs':
>+            print ','.join(inputs)
>+        elif sys.argv[1] == 'outputs':
>+            print ','.join(outputs)
>+        else:
>+            print('Invalid script parameters')
>+            return 1
>+        return 0
>+
>+    gl_to_angle = angle_format.load_forward_table('angle_format_map.json')
>+    angle_to_gl = angle_format.load_inverse_table('angle_format_map.json')
>+    data_source_name = 'angle_format_data.json'
>+    json_data = angle_format.load_json(data_source_name)
>+    all_angle = angle_to_gl.keys()
>+
>+    angle_format_cases = parse_angle_format_table(
>+        all_angle, json_data, angle_to_gl)
>+    switch_data = gen_map_switch_string(gl_to_angle)
>+    output_cpp = template_autogen_inl.format(
>+        script_name = sys.argv[0],
>+        copyright_year = date.today().year,
>+        angle_format_info_cases = angle_format_cases,
>+        angle_format_switch = switch_data,
>+        data_source_name = data_source_name)
>+    with open('Format_table_autogen.cpp', 'wt') as out_file:
>+        out_file.write(output_cpp)
>+        out_file.close()
>+
>+    enum_data = gen_enum_string(all_angle)
>+    num_angle_formats = len(all_angle)
>+    output_h = template_autogen_h.format(
>+        script_name = sys.argv[0],
>+        copyright_year = date.today().year,
>+        angle_format_enum = enum_data,
>+        data_source_name = data_source_name,
>+        num_angle_formats = num_angle_formats)
>+    with open('FormatID_autogen.h', 'wt') as out_file:
>+        out_file.write(output_h)
>+        out_file.close()
>+
>+    return 0
>+
>+
>+if __name__ == '__main__':
>+    sys.exit(main())
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gen_load_functions_table.py b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gen_load_functions_table.py
>index eb3e4c5bf08..4b08f0e8981 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gen_load_functions_table.py
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gen_load_functions_table.py
>@@ -4,7 +4,10 @@
> # found in the LICENSE file.
> #
> # gen_load_functions_table.py:
>-#  Code generation for the load function tables used for texture formats
>+#  Code generation for the load function tables used for texture formats. These mappings are
>+#  not renderer specific. The mappings are done from the GL internal format, to the ANGLE
>+#  format ID, and then for the specific data type.
>+#  NOTE: don't run this script directly. Run scripts/run_code_generation.py.
> #
> 
> import json, sys
>@@ -73,19 +76,19 @@ void UnreachableLoadFunction(size_t width,
> 
> {load_functions_data}}}  // namespace
> 
>-LoadFunctionMap GetLoadFunctionsMap(GLenum {internal_format}, Format::ID {angle_format})
>+LoadFunctionMap GetLoadFunctionsMap(GLenum {internal_format}, FormatID {angle_format})
> {{
>     // clang-format off
>     switch ({internal_format})
>     {{
> {switch_data}
>         default:
>-        {{
>-            static LoadFunctionMap emptyLoadFunctionsMap;
>-            return emptyLoadFunctionsMap;
>-        }}
>+            break;
>     }}
>     // clang-format on
>+    ASSERT(internalFormat == GL_NONE || angleFormat == angle::FormatID::NONE);
>+    static LoadFunctionMap emptyLoadFunctionsMap;
>+    return emptyLoadFunctionsMap;
> 
> }}  // GetLoadFunctionsMap
> 
>@@ -150,7 +153,7 @@ def parse_json(json_data):
>             func_name = load_functions_name(internal_format, angle_format)
> 
>             # Main case statements
>-            table_data += s + 'case Format::ID::' + angle_format + ':\n'
>+            table_data += s + 'case FormatID::' + angle_format + ':\n'
>             table_data += s + '    return ' + func_name + ';\n'
> 
>             if angle_format_unknown in angle_to_type_map:
>@@ -163,29 +166,55 @@ def parse_json(json_data):
>         if do_switch:
>             table_data += s + 'default:\n'
> 
>+        has_break_in_switch = False
>         if angle_format_unknown in angle_to_type_map:
>             table_data += s + '    return ' + unknown_func_name(internal_format) + ';\n'
>             load_functions_data += get_unknown_load_func(angle_to_type_map, internal_format)
>         else:
>+            has_break_in_switch = True
>             table_data += s + '    break;\n'
> 
>         if do_switch:
>             s = s[4:]
>             table_data += s + '}\n'
>+            if has_break_in_switch:
>+                # If the inner switch contains a break statement, add a break
>+                # statement after the switch as well.
>+                table_data += s + 'break;\n'
>             s = s[4:]
>             table_data += s + '}\n'
> 
>     return table_data, load_functions_data
> 
>-json_data = angle_format.load_json('load_functions_data.json')
>+def main():
> 
>-switch_data, load_functions_data = parse_json(json_data)
>-output = template.format(internal_format = internal_format_param,
>-                         angle_format = angle_format_param,
>-                         switch_data = switch_data,
>-                         load_functions_data = load_functions_data,
>-                         copyright_year = date.today().year)
>+    # auto_script parameters.
>+    if len(sys.argv) > 1:
>+        inputs = ['load_functions_data.json']
>+        outputs = ['load_functions_table_autogen.cpp']
> 
>-with open('load_functions_table_autogen.cpp', 'wt') as out_file:
>-    out_file.write(output)
>-    out_file.close()
>+        if sys.argv[1] == 'inputs':
>+            print ','.join(inputs)
>+        elif sys.argv[1] == 'outputs':
>+            print ','.join(outputs)
>+        else:
>+            print('Invalid script parameters')
>+            return 1
>+        return 0
>+
>+    json_data = angle_format.load_json('load_functions_data.json')
>+
>+    switch_data, load_functions_data = parse_json(json_data)
>+    output = template.format(internal_format = internal_format_param,
>+                             angle_format = angle_format_param,
>+                             switch_data = switch_data,
>+                             load_functions_data = load_functions_data,
>+                             copyright_year = date.today().year)
>+
>+    with open('load_functions_table_autogen.cpp', 'wt') as out_file:
>+        out_file.write(output)
>+        out_file.close()
>+    return 0
>+
>+if __name__ == '__main__':
>+    sys.exit(main())
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/BlitGL.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/BlitGL.cpp
>index b07182243a6..90b48394267 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/BlitGL.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/BlitGL.cpp
>@@ -8,18 +8,23 @@
> 
> #include "libANGLE/renderer/gl/BlitGL.h"
> 
>+#include "common/FixedVector.h"
>+#include "common/utilities.h"
> #include "common/vector_utils.h"
> #include "image_util/copyimage.h"
> #include "libANGLE/Context.h"
> #include "libANGLE/Framebuffer.h"
> #include "libANGLE/formatutils.h"
> #include "libANGLE/renderer/Format.h"
>+#include "libANGLE/renderer/gl/ContextGL.h"
> #include "libANGLE/renderer/gl/FramebufferGL.h"
> #include "libANGLE/renderer/gl/FunctionsGL.h"
>+#include "libANGLE/renderer/gl/RenderbufferGL.h"
> #include "libANGLE/renderer/gl/StateManagerGL.h"
> #include "libANGLE/renderer/gl/TextureGL.h"
> #include "libANGLE/renderer/gl/WorkaroundsGL.h"
> #include "libANGLE/renderer/gl/formatutilsgl.h"
>+#include "libANGLE/renderer/gl/renderergl_utils.h"
> #include "libANGLE/renderer/renderer_utils.h"
> 
> using angle::Vector2;
>@@ -30,31 +35,31 @@ namespace rx
> namespace
> {
> 
>-gl::Error CheckCompileStatus(const rx::FunctionsGL *functions, GLuint shader)
>+angle::Result CheckCompileStatus(ContextGL *contextGL,
>+                                 const rx::FunctionsGL *functions,
>+                                 GLuint shader)
> {
>     GLint compileStatus = GL_FALSE;
>     functions->getShaderiv(shader, GL_COMPILE_STATUS, &compileStatus);
> 
>     ASSERT(compileStatus == GL_TRUE);
>-    if (compileStatus == GL_FALSE)
>-    {
>-        return gl::OutOfMemory() << "Failed to compile internal blit shader.";
>-    }
>+    ANGLE_CHECK(contextGL, compileStatus == GL_TRUE, "Failed to compile internal blit shader.",
>+                GL_OUT_OF_MEMORY);
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error CheckLinkStatus(const rx::FunctionsGL *functions, GLuint program)
>+angle::Result CheckLinkStatus(ContextGL *contextGL,
>+                              const rx::FunctionsGL *functions,
>+                              GLuint program)
> {
>     GLint linkStatus = GL_FALSE;
>     functions->getProgramiv(program, GL_LINK_STATUS, &linkStatus);
>     ASSERT(linkStatus == GL_TRUE);
>-    if (linkStatus == GL_FALSE)
>-    {
>-        return gl::OutOfMemory() << "Failed to link internal blit program.";
>-    }
>+    ANGLE_CHECK(contextGL, linkStatus == GL_TRUE, "Failed to link internal blit program.",
>+                GL_OUT_OF_MEMORY);
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
> class ScopedGLState : angle::NonCopyable
>@@ -65,51 +70,132 @@ class ScopedGLState : angle::NonCopyable
>         KEEP_SCISSOR = 1,
>     };
> 
>-    ScopedGLState(StateManagerGL *stateManager,
>-                  const FunctionsGL *functions,
>-                  gl::Rectangle viewport,
>-                  int keepState = 0)
>-        : mStateManager(stateManager), mFunctions(functions)
>+    ScopedGLState() {}
>+
>+    ~ScopedGLState() { ASSERT(mExited); }
>+
>+    angle::Result enter(const gl::Context *context, gl::Rectangle viewport, int keepState = 0)
>     {
>+        ContextGL *contextGL         = GetImplAs<ContextGL>(context);
>+        StateManagerGL *stateManager = contextGL->getStateManager();
>+
>         if (!(keepState & KEEP_SCISSOR))
>         {
>-            mStateManager->setScissorTestEnabled(false);
>+            stateManager->setScissorTestEnabled(false);
>         }
>-        mStateManager->setViewport(viewport);
>-        mStateManager->setDepthRange(0.0f, 1.0f);
>-        mStateManager->setBlendEnabled(false);
>-        mStateManager->setColorMask(true, true, true, true);
>-        mStateManager->setSampleAlphaToCoverageEnabled(false);
>-        mStateManager->setSampleCoverageEnabled(false);
>-        mStateManager->setDepthTestEnabled(false);
>-        mStateManager->setStencilTestEnabled(false);
>-        mStateManager->setCullFaceEnabled(false);
>-        mStateManager->setPolygonOffsetFillEnabled(false);
>-        mStateManager->setRasterizerDiscardEnabled(false);
>-
>-        mStateManager->pauseTransformFeedback();
>-        ANGLE_SWALLOW_ERR(mStateManager->pauseAllQueries());
>+        stateManager->setViewport(viewport);
>+        stateManager->setDepthRange(0.0f, 1.0f);
>+        stateManager->setBlendEnabled(false);
>+        stateManager->setColorMask(true, true, true, true);
>+        stateManager->setSampleAlphaToCoverageEnabled(false);
>+        stateManager->setSampleCoverageEnabled(false);
>+        stateManager->setDepthTestEnabled(false);
>+        stateManager->setStencilTestEnabled(false);
>+        stateManager->setCullFaceEnabled(false);
>+        stateManager->setPolygonOffsetFillEnabled(false);
>+        stateManager->setRasterizerDiscardEnabled(false);
>+
>+        stateManager->pauseTransformFeedback();
>+        return stateManager->pauseAllQueries(context);
>     }
> 
>-    ~ScopedGLState()
>+    angle::Result exit(const gl::Context *context)
>     {
>+        mExited = true;
>+
>+        ContextGL *contextGL         = GetImplAs<ContextGL>(context);
>+        StateManagerGL *stateManager = contextGL->getStateManager();
>+
>         // XFB resuming will be done automatically
>-        ANGLE_SWALLOW_ERR(mStateManager->resumeAllQueries());
>+        return stateManager->resumeAllQueries(context);
>     }
> 
>-    void willUseTextureUnit(int unit)
>+    void willUseTextureUnit(const gl::Context *context, int unit)
>     {
>-        if (mFunctions->bindSampler)
>+        ContextGL *contextGL = GetImplAs<ContextGL>(context);
>+
>+        if (contextGL->getFunctions()->bindSampler)
>         {
>-            mStateManager->bindSampler(unit, 0);
>+            contextGL->getStateManager()->bindSampler(unit, 0);
>         }
>     }
> 
>   private:
>-    StateManagerGL *mStateManager;
>-    const FunctionsGL *mFunctions;
>+    bool mExited = false;
> };
> 
>+angle::Result SetClearState(StateManagerGL *stateManager,
>+                            bool colorClear,
>+                            bool depthClear,
>+                            bool stencilClear,
>+                            GLbitfield *outClearMask)
>+{
>+    *outClearMask = 0;
>+    if (colorClear)
>+    {
>+        stateManager->setClearColor(gl::ColorF(0.0f, 0.0f, 0.0f, 0.0f));
>+        stateManager->setColorMask(true, true, true, true);
>+        *outClearMask |= GL_COLOR_BUFFER_BIT;
>+    }
>+    if (depthClear)
>+    {
>+        stateManager->setDepthMask(true);
>+        stateManager->setClearDepth(1.0f);
>+        *outClearMask |= GL_DEPTH_BUFFER_BIT;
>+    }
>+    if (stencilClear)
>+    {
>+        stateManager->setClearStencil(0);
>+        *outClearMask |= GL_STENCIL_BUFFER_BIT;
>+    }
>+
>+    stateManager->setScissorTestEnabled(false);
>+
>+    return angle::Result::Continue;
>+}
>+
>+using ClearBindTargetVector = angle::FixedVector<GLenum, 3>;
>+
>+angle::Result PrepareForClear(StateManagerGL *stateManager,
>+                              GLenum sizedInternalFormat,
>+                              ClearBindTargetVector *outBindtargets,
>+                              GLbitfield *outClearMask)
>+{
>+    const gl::InternalFormat &internalFormatInfo =
>+        gl::GetSizedInternalFormatInfo(sizedInternalFormat);
>+    bool bindDepth   = internalFormatInfo.depthBits > 0;
>+    bool bindStencil = internalFormatInfo.stencilBits > 0;
>+    bool bindColor   = !bindDepth && !bindStencil;
>+
>+    outBindtargets->clear();
>+    if (bindColor)
>+    {
>+        outBindtargets->push_back(GL_COLOR_ATTACHMENT0);
>+    }
>+    if (bindDepth)
>+    {
>+        outBindtargets->push_back(GL_DEPTH_ATTACHMENT);
>+    }
>+    if (bindStencil)
>+    {
>+        outBindtargets->push_back(GL_STENCIL_ATTACHMENT);
>+    }
>+
>+    ANGLE_TRY(SetClearState(stateManager, bindColor, bindDepth, bindStencil, outClearMask));
>+
>+    return angle::Result::Continue;
>+}
>+
>+void UnbindAttachments(const FunctionsGL *functions,
>+                       GLenum framebufferTarget,
>+                       const ClearBindTargetVector &bindTargets)
>+{
>+    for (GLenum bindTarget : bindTargets)
>+    {
>+        functions->framebufferRenderbuffer(framebufferTarget, bindTarget, GL_RENDERBUFFER, 0);
>+    }
>+}
>+
> }  // anonymous namespace
> 
> BlitGL::BlitGL(const FunctionsGL *functions,
>@@ -161,57 +247,64 @@ BlitGL::~BlitGL()
>     }
> }
> 
>-gl::Error BlitGL::copyImageToLUMAWorkaroundTexture(const gl::Context *context,
>-                                                   GLuint texture,
>-                                                   GLenum textureType,
>-                                                   GLenum target,
>-                                                   GLenum lumaFormat,
>-                                                   size_t level,
>-                                                   const gl::Rectangle &sourceArea,
>-                                                   GLenum internalFormat,
>-                                                   const gl::Framebuffer *source)
>+angle::Result BlitGL::copyImageToLUMAWorkaroundTexture(const gl::Context *context,
>+                                                       GLuint texture,
>+                                                       gl::TextureType textureType,
>+                                                       gl::TextureTarget target,
>+                                                       GLenum lumaFormat,
>+                                                       size_t level,
>+                                                       const gl::Rectangle &sourceArea,
>+                                                       GLenum internalFormat,
>+                                                       gl::Framebuffer *source)
> {
>     mStateManager->bindTexture(textureType, texture);
> 
>     // Allocate the texture memory
>     GLenum format = gl::GetUnsizedFormat(internalFormat);
> 
>+    GLenum readType = GL_NONE;
>+    ANGLE_TRY(source->getImplementationColorReadType(context, &readType));
>+
>     gl::PixelUnpackState unpack;
>     mStateManager->setPixelUnpackState(unpack);
>     mStateManager->setPixelUnpackBuffer(
>-        context->getGLState().getTargetBuffer(gl::BufferBinding::PixelUnpack));
>-    mFunctions->texImage2D(target, static_cast<GLint>(level), internalFormat, sourceArea.width,
>-                           sourceArea.height, 0, format,
>-                           source->getImplementationColorReadType(context), nullptr);
>+        context->getState().getTargetBuffer(gl::BufferBinding::PixelUnpack));
>+    mFunctions->texImage2D(ToGLenum(target), static_cast<GLint>(level), internalFormat,
>+                           sourceArea.width, sourceArea.height, 0, format, readType, nullptr);
> 
>     return copySubImageToLUMAWorkaroundTexture(context, texture, textureType, target, lumaFormat,
>                                                level, gl::Offset(0, 0, 0), sourceArea, source);
> }
> 
>-gl::Error BlitGL::copySubImageToLUMAWorkaroundTexture(const gl::Context *context,
>-                                                      GLuint texture,
>-                                                      GLenum textureType,
>-                                                      GLenum target,
>-                                                      GLenum lumaFormat,
>-                                                      size_t level,
>-                                                      const gl::Offset &destOffset,
>-                                                      const gl::Rectangle &sourceArea,
>-                                                      const gl::Framebuffer *source)
>+angle::Result BlitGL::copySubImageToLUMAWorkaroundTexture(const gl::Context *context,
>+                                                          GLuint texture,
>+                                                          gl::TextureType textureType,
>+                                                          gl::TextureTarget target,
>+                                                          GLenum lumaFormat,
>+                                                          size_t level,
>+                                                          const gl::Offset &destOffset,
>+                                                          const gl::Rectangle &sourceArea,
>+                                                          gl::Framebuffer *source)
> {
>     ANGLE_TRY(initializeResources());
> 
>     BlitProgram *blitProgram = nullptr;
>-    ANGLE_TRY(getBlitProgram(BlitProgramType::FLOAT_TO_FLOAT, &blitProgram));
>+    ANGLE_TRY(getBlitProgram(context, BlitProgramType::FLOAT_TO_FLOAT, &blitProgram));
> 
>     // Blit the framebuffer to the first scratch texture
>     const FramebufferGL *sourceFramebufferGL = GetImplAs<FramebufferGL>(source);
>     mStateManager->bindFramebuffer(GL_FRAMEBUFFER, sourceFramebufferGL->getFramebufferID());
> 
>-    nativegl::CopyTexImageImageFormat copyTexImageFormat = nativegl::GetCopyTexImageImageFormat(
>-        mFunctions, mWorkarounds, source->getImplementationColorReadFormat(context),
>-        source->getImplementationColorReadType(context));
>+    GLenum readFormat = GL_NONE;
>+    ANGLE_TRY(source->getImplementationColorReadFormat(context, &readFormat));
>+
>+    GLenum readType = GL_NONE;
>+    ANGLE_TRY(source->getImplementationColorReadType(context, &readType));
> 
>-    mStateManager->bindTexture(GL_TEXTURE_2D, mScratchTextures[0]);
>+    nativegl::CopyTexImageImageFormat copyTexImageFormat =
>+        nativegl::GetCopyTexImageImageFormat(mFunctions, mWorkarounds, readFormat, readType);
>+
>+    mStateManager->bindTexture(gl::TextureType::_2D, mScratchTextures[0]);
>     mFunctions->copyTexImage2D(GL_TEXTURE_2D, 0, copyTexImageFormat.internalFormat, sourceArea.x,
>                                sourceArea.y, sourceArea.width, sourceArea.height, 0);
> 
>@@ -219,32 +312,33 @@ gl::Error BlitGL::copySubImageToLUMAWorkaroundTexture(const gl::Context *context
>     // LUMA channels.
>     GLint swizzle[4] = {
>         (lumaFormat == GL_ALPHA) ? GL_ALPHA : GL_RED,
>-        (lumaFormat == GL_LUMINANCE_ALPHA) ? GL_ALPHA : GL_ZERO, GL_ZERO, GL_ZERO,
>+        (lumaFormat == GL_LUMINANCE_ALPHA) ? GL_ALPHA : GL_ZERO,
>+        GL_ZERO,
>+        GL_ZERO,
>     };
>     mFunctions->texParameteriv(GL_TEXTURE_2D, GL_TEXTURE_SWIZZLE_RGBA, swizzle);
> 
>     // Make a temporary framebuffer using the second scratch texture to render the swizzled result
>     // to.
>-    mStateManager->bindTexture(GL_TEXTURE_2D, mScratchTextures[1]);
>-    mFunctions->texImage2D(GL_TEXTURE_2D, 0, copyTexImageFormat.internalFormat, sourceArea.width,
>-                           sourceArea.height, 0,
>-                           gl::GetUnsizedFormat(copyTexImageFormat.internalFormat),
>-                           source->getImplementationColorReadType(context), nullptr);
>+    mStateManager->bindTexture(gl::TextureType::_2D, mScratchTextures[1]);
>+    mFunctions->texImage2D(
>+        GL_TEXTURE_2D, 0, copyTexImageFormat.internalFormat, sourceArea.width, sourceArea.height, 0,
>+        gl::GetUnsizedFormat(copyTexImageFormat.internalFormat), readType, nullptr);
> 
>     mStateManager->bindFramebuffer(GL_FRAMEBUFFER, mScratchFBO);
>     mFunctions->framebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D,
>                                      mScratchTextures[1], 0);
> 
>     // Render to the destination texture, sampling from the scratch texture
>-    ScopedGLState scopedState(mStateManager, mFunctions,
>-                              gl::Rectangle(0, 0, sourceArea.width, sourceArea.height));
>-    scopedState.willUseTextureUnit(0);
>+    ScopedGLState scopedState;
>+    ANGLE_TRY(scopedState.enter(context, gl::Rectangle(0, 0, sourceArea.width, sourceArea.height)));
>+    scopedState.willUseTextureUnit(context, 0);
> 
>     setScratchTextureParameter(GL_TEXTURE_MIN_FILTER, GL_NEAREST);
>     setScratchTextureParameter(GL_TEXTURE_MAG_FILTER, GL_NEAREST);
> 
>     mStateManager->activeTexture(0);
>-    mStateManager->bindTexture(GL_TEXTURE_2D, mScratchTextures[0]);
>+    mStateManager->bindTexture(gl::TextureType::_2D, mScratchTextures[0]);
> 
>     mStateManager->useProgram(blitProgram->program);
>     mFunctions->uniform1i(blitProgram->sourceTextureLocation, 0);
>@@ -259,52 +353,45 @@ gl::Error BlitGL::copySubImageToLUMAWorkaroundTexture(const gl::Context *context
>     // Copy the swizzled texture to the destination texture
>     mStateManager->bindTexture(textureType, texture);
> 
>-    if (target == GL_TEXTURE_3D || target == GL_TEXTURE_2D_ARRAY)
>+    if (nativegl::UseTexImage3D(textureType))
>     {
>-        mFunctions->copyTexSubImage3D(target, static_cast<GLint>(level), destOffset.x, destOffset.y,
>-                                      destOffset.z, 0, 0, sourceArea.width, sourceArea.height);
>+        mFunctions->copyTexSubImage3D(ToGLenum(target), static_cast<GLint>(level), destOffset.x,
>+                                      destOffset.y, destOffset.z, 0, 0, sourceArea.width,
>+                                      sourceArea.height);
>     }
>     else
>     {
>-        mFunctions->copyTexSubImage2D(target, static_cast<GLint>(level), destOffset.x, destOffset.y,
>-                                      0, 0, sourceArea.width, sourceArea.height);
>+        ASSERT(nativegl::UseTexImage2D(textureType));
>+        mFunctions->copyTexSubImage2D(ToGLenum(target), static_cast<GLint>(level), destOffset.x,
>+                                      destOffset.y, 0, 0, sourceArea.width, sourceArea.height);
>     }
> 
>     // Finally orphan the scratch textures so they can be GCed by the driver.
>     orphanScratchTextures();
> 
>-    return gl::NoError();
>+    ANGLE_TRY(scopedState.exit(context));
>+    return angle::Result::Continue;
> }
> 
>-gl::Error BlitGL::blitColorBufferWithShader(const gl::Framebuffer *source,
>-                                            const gl::Framebuffer *dest,
>-                                            const gl::Rectangle &sourceAreaIn,
>-                                            const gl::Rectangle &destAreaIn,
>-                                            GLenum filter)
>+angle::Result BlitGL::blitColorBufferWithShader(const gl::Context *context,
>+                                                const gl::Framebuffer *source,
>+                                                const gl::Framebuffer *dest,
>+                                                const gl::Rectangle &sourceAreaIn,
>+                                                const gl::Rectangle &destAreaIn,
>+                                                GLenum filter)
> {
>     ANGLE_TRY(initializeResources());
> 
>     BlitProgram *blitProgram = nullptr;
>-    ANGLE_TRY(getBlitProgram(BlitProgramType::FLOAT_TO_FLOAT, &blitProgram));
>+    ANGLE_TRY(getBlitProgram(context, BlitProgramType::FLOAT_TO_FLOAT, &blitProgram));
> 
>-    // Normalize the destination area to have positive width and height because we will use
>-    // glViewport to set it, which doesn't allow negative width or height.
>-    gl::Rectangle sourceArea = sourceAreaIn;
>-    gl::Rectangle destArea   = destAreaIn;
>-    if (destArea.width < 0)
>-    {
>-        destArea.x += destArea.width;
>-        destArea.width = -destArea.width;
>-        sourceArea.x += sourceArea.width;
>-        sourceArea.width = -sourceArea.width;
>-    }
>-    if (destArea.height < 0)
>-    {
>-        destArea.y += destArea.height;
>-        destArea.height = -destArea.height;
>-        sourceArea.y += sourceArea.height;
>-        sourceArea.height = -sourceArea.height;
>-    }
>+    // We'll keep things simple by removing reversed coordinates from the rectangles. In the end
>+    // we'll apply the reversal to the source texture coordinates if needed. The destination
>+    // rectangle will be set to the gl viewport, which can't be reversed.
>+    bool reverseX            = sourceAreaIn.isReversedX() != destAreaIn.isReversedX();
>+    bool reverseY            = sourceAreaIn.isReversedY() != destAreaIn.isReversedY();
>+    gl::Rectangle sourceArea = sourceAreaIn.removeReversal();
>+    gl::Rectangle destArea   = destAreaIn.removeReversal();
> 
>     const gl::FramebufferAttachment *readAttachment = source->getReadColorbuffer();
>     ASSERT(readAttachment->getSamples() <= 1);
>@@ -314,109 +401,72 @@ gl::Error BlitGL::blitColorBufferWithShader(const gl::Framebuffer *source,
>     {
>         gl::Extents sourceSize = readAttachment->getSize();
>         gl::Rectangle sourceBounds(0, 0, sourceSize.width, sourceSize.height);
>-        gl::ClipRectangle(sourceArea, sourceBounds, &inBoundsSource);
>-
>-        // Note that inBoundsSource will have lost the orientation information.
>-        ASSERT(inBoundsSource.width >= 0 && inBoundsSource.height >= 0);
>-
>-        // Early out when the sampled part is empty as the blit will be a noop,
>-        // and it prevents a division by zero in later computations.
>-        if (inBoundsSource.width == 0 || inBoundsSource.height == 0)
>+        if (!gl::ClipRectangle(sourceArea, sourceBounds, &inBoundsSource))
>         {
>-            return gl::NoError();
>+            // Early out when the sampled part is empty as the blit will be a noop,
>+            // and it prevents a division by zero in later computations.
>+            return angle::Result::Continue;
>         }
>     }
> 
>     // The blit will be emulated by getting the source of the blit in a texture and sampling it
>-    // with CLAMP_TO_EDGE. The quad used to draw can trivially compute texture coordinates going
>-    // from (0, 0) to (1, 1). These texture coordinates will need to be transformed to make two
>-    // regions match:
>-    //  - The region of the texture representing the source framebuffer region that will be sampled
>-    //  - The region of the drawn quad that corresponds to non-clamped blit, this is the same as the
>-    //    region of the source rectangle that is inside the source attachment.
>-    //
>-    //  These two regions, T (texture) and D (dest) are defined by their offset in texcoord space
>-    //  in (0, 1)^2 and their size in texcoord space in (-1, 1)^2. The size can be negative to
>-    //  represent the orientation of the blit.
>-    //
>-    //  Then if P is the quad texcoord, Q the texcoord inside T, and R the texture texcoord:
>-    //    - Q = (P - D.offset) / D.size
>-    //    - Q = (R - T.offset) / T.size
>-    //  Hence R = (P - D.offset) / D.size * T.size - T.offset
>-    //          = P * (T.size / D.size) + (T.offset - D.offset * T.size / D.size)
>+    // with CLAMP_TO_EDGE.
> 
>     GLuint textureId;
>-    Vector2 TOffset;
>-    Vector2 TSize;
> 
>     // TODO(cwallez) once texture dirty bits are landed, reuse attached texture instead of using
>     // CopyTexImage2D
>     {
>         textureId = mScratchTextures[0];
>-        TOffset   = Vector2(0.0);
>-        TSize     = Vector2(1.0);
>-        if (sourceArea.width < 0)
>-        {
>-            TOffset.x() = 1.0;
>-            TSize.x()   = -1.0;
>-        }
>-        if (sourceArea.height < 0)
>-        {
>-            TOffset.y() = 1.0;
>-            TSize.y()   = -1.0;
>-        }
> 
>         GLenum format                 = readAttachment->getFormat().info->internalFormat;
>         const FramebufferGL *sourceGL = GetImplAs<FramebufferGL>(source);
>         mStateManager->bindFramebuffer(GL_READ_FRAMEBUFFER, sourceGL->getFramebufferID());
>-        mStateManager->bindTexture(GL_TEXTURE_2D, textureId);
>+        mStateManager->bindTexture(gl::TextureType::_2D, textureId);
> 
>         mFunctions->copyTexImage2D(GL_TEXTURE_2D, 0, format, inBoundsSource.x, inBoundsSource.y,
>                                    inBoundsSource.width, inBoundsSource.height, 0);
> 
>+        // Translate sourceArea to be relative to the copied image.
>+        sourceArea.x -= inBoundsSource.x;
>+        sourceArea.y -= inBoundsSource.y;
>+
>         setScratchTextureParameter(GL_TEXTURE_MIN_FILTER, filter);
>         setScratchTextureParameter(GL_TEXTURE_MAG_FILTER, filter);
>         setScratchTextureParameter(GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
>         setScratchTextureParameter(GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
>     }
> 
>-    // Compute normalized sampled draw quad region
>-    // It is the same as the region of the source rectangle that is in bounds.
>-    Vector2 DOffset;
>-    Vector2 DSize;
>+    // Transform the source area to the texture coordinate space (where 0.0 and 1.0 correspond to
>+    // the edges of the texture).
>+    Vector2 texCoordOffset(
>+        static_cast<float>(sourceArea.x) / static_cast<float>(inBoundsSource.width),
>+        static_cast<float>(sourceArea.y) / static_cast<float>(inBoundsSource.height));
>+    // texCoordScale is equal to the size of the source area in texture coordinates.
>+    Vector2 texCoordScale(
>+        static_cast<float>(sourceArea.width) / static_cast<float>(inBoundsSource.width),
>+        static_cast<float>(sourceArea.height) / static_cast<float>(inBoundsSource.height));
>+
>+    if (reverseX)
>     {
>-        ASSERT(sourceArea.width != 0 && sourceArea.height != 0);
>-        gl::Rectangle orientedInBounds = inBoundsSource;
>-        if (sourceArea.width < 0)
>-        {
>-            orientedInBounds.x += orientedInBounds.width;
>-            orientedInBounds.width = -orientedInBounds.width;
>-        }
>-        if (sourceArea.height < 0)
>-        {
>-            orientedInBounds.y += orientedInBounds.height;
>-            orientedInBounds.height = -orientedInBounds.height;
>-        }
>-
>-        DOffset =
>-            Vector2(static_cast<float>(orientedInBounds.x - sourceArea.x) / sourceArea.width,
>-                    static_cast<float>(orientedInBounds.y - sourceArea.y) / sourceArea.height);
>-        DSize = Vector2(static_cast<float>(orientedInBounds.width) / sourceArea.width,
>-                        static_cast<float>(orientedInBounds.height) / sourceArea.height);
>+        texCoordOffset.x() = texCoordOffset.x() + texCoordScale.x();
>+        texCoordScale.x()  = -texCoordScale.x();
>+    }
>+    if (reverseY)
>+    {
>+        texCoordOffset.y() = texCoordOffset.y() + texCoordScale.y();
>+        texCoordScale.y()  = -texCoordScale.y();
>     }
>-
>-    ASSERT(DSize.x() != 0.0 && DSize.y() != 0.0);
>-    Vector2 texCoordScale  = TSize / DSize;
>-    Vector2 texCoordOffset = TOffset - DOffset * texCoordScale;
> 
>     // Reset all the state except scissor and use the viewport to draw exactly to the destination
>     // rectangle
>-    ScopedGLState scopedState(mStateManager, mFunctions, destArea, ScopedGLState::KEEP_SCISSOR);
>-    scopedState.willUseTextureUnit(0);
>+    ScopedGLState scopedState;
>+    ANGLE_TRY(scopedState.enter(context, destArea, ScopedGLState::KEEP_SCISSOR));
>+    scopedState.willUseTextureUnit(context, 0);
> 
>     // Set uniforms
>     mStateManager->activeTexture(0);
>-    mStateManager->bindTexture(GL_TEXTURE_2D, textureId);
>+    mStateManager->bindTexture(gl::TextureType::_2D, textureId);
> 
>     mStateManager->useProgram(blitProgram->program);
>     mFunctions->uniform1i(blitProgram->sourceTextureLocation, 0);
>@@ -431,31 +481,46 @@ gl::Error BlitGL::blitColorBufferWithShader(const gl::Framebuffer *source,
>     mStateManager->bindVertexArray(mVAO, 0);
>     mFunctions->drawArrays(GL_TRIANGLES, 0, 3);
> 
>-    return gl::NoError();
>+    ANGLE_TRY(scopedState.exit(context));
>+    return angle::Result::Continue;
> }
> 
>-gl::Error BlitGL::copySubTexture(const gl::Context *context,
>-                                 TextureGL *source,
>-                                 size_t sourceLevel,
>-                                 GLenum sourceComponentType,
>-                                 TextureGL *dest,
>-                                 GLenum destTarget,
>-                                 size_t destLevel,
>-                                 GLenum destComponentType,
>-                                 const gl::Extents &sourceSize,
>-                                 const gl::Rectangle &sourceArea,
>-                                 const gl::Offset &destOffset,
>-                                 bool needsLumaWorkaround,
>-                                 GLenum lumaFormat,
>-                                 bool unpackFlipY,
>-                                 bool unpackPremultiplyAlpha,
>-                                 bool unpackUnmultiplyAlpha)
>+angle::Result BlitGL::copySubTexture(const gl::Context *context,
>+                                     TextureGL *source,
>+                                     size_t sourceLevel,
>+                                     GLenum sourceComponentType,
>+                                     TextureGL *dest,
>+                                     gl::TextureTarget destTarget,
>+                                     size_t destLevel,
>+                                     GLenum destComponentType,
>+                                     const gl::Extents &sourceSize,
>+                                     const gl::Rectangle &sourceArea,
>+                                     const gl::Offset &destOffset,
>+                                     bool needsLumaWorkaround,
>+                                     GLenum lumaFormat,
>+                                     bool unpackFlipY,
>+                                     bool unpackPremultiplyAlpha,
>+                                     bool unpackUnmultiplyAlpha,
>+                                     bool *copySucceededOut)
> {
>+    ASSERT(source->getType() == gl::TextureType::_2D);
>     ANGLE_TRY(initializeResources());
> 
>+    // Make sure the destination texture can be rendered to before setting anything else up.  Some
>+    // cube maps may not be renderable until all faces have been filled.
>+    mStateManager->bindFramebuffer(GL_FRAMEBUFFER, mScratchFBO);
>+    mFunctions->framebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, ToGLenum(destTarget),
>+                                     dest->getTextureID(), static_cast<GLint>(destLevel));
>+    GLenum status = mFunctions->checkFramebufferStatus(GL_FRAMEBUFFER);
>+    if (status != GL_FRAMEBUFFER_COMPLETE)
>+    {
>+        *copySucceededOut = false;
>+        return angle::Result::Continue;
>+    }
>+
>     BlitProgramType blitProgramType = getBlitProgramType(sourceComponentType, destComponentType);
>     BlitProgram *blitProgram        = nullptr;
>-    ANGLE_TRY(getBlitProgram(blitProgramType, &blitProgram));
>+    ANGLE_TRY(getBlitProgram(context, blitProgramType, &blitProgram));
> 
>     // Setup the source texture
>     if (needsLumaWorkaround)
>@@ -477,20 +542,20 @@ gl::Error BlitGL::copySubTexture(const gl::Context *context,
>         }
> 
>         GLint swizzle[4] = {luminance, luminance, luminance, alpha};
>-        source->setSwizzle(swizzle);
>+        source->setSwizzle(context, swizzle);
>     }
>-    source->setMinFilter(GL_NEAREST);
>-    source->setMagFilter(GL_NEAREST);
>+    source->setMinFilter(context, GL_NEAREST);
>+    source->setMagFilter(context, GL_NEAREST);
>     ANGLE_TRY(source->setBaseLevel(context, static_cast<GLuint>(sourceLevel)));
> 
>     // Render to the destination texture, sampling from the source texture
>-    ScopedGLState scopedState(
>-        mStateManager, mFunctions,
>-        gl::Rectangle(destOffset.x, destOffset.y, sourceArea.width, sourceArea.height));
>-    scopedState.willUseTextureUnit(0);
>+    ScopedGLState scopedState;
>+    ANGLE_TRY(scopedState.enter(
>+        context, gl::Rectangle(destOffset.x, destOffset.y, sourceArea.width, sourceArea.height)));
>+    scopedState.willUseTextureUnit(context, 0);
> 
>     mStateManager->activeTexture(0);
>-    mStateManager->bindTexture(GL_TEXTURE_2D, source->getTextureID());
>+    mStateManager->bindTexture(gl::TextureType::_2D, source->getTextureID());
> 
>     Vector2 scale(sourceArea.width / static_cast<float>(sourceSize.width),
>                   sourceArea.height / static_cast<float>(sourceSize.height));
>@@ -517,50 +582,56 @@ gl::Error BlitGL::copySubTexture(const gl::Context *context,
>         mFunctions->uniform1i(blitProgram->unMultiplyAlphaLocation, unpackUnmultiplyAlpha);
>     }
> 
>-    mStateManager->bindFramebuffer(GL_FRAMEBUFFER, mScratchFBO);
>-    mFunctions->framebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, destTarget,
>-                                     dest->getTextureID(), static_cast<GLint>(destLevel));
>-
>     mStateManager->bindVertexArray(mVAO, 0);
>     mFunctions->drawArrays(GL_TRIANGLES, 0, 3);
> 
>-    return gl::NoError();
>+    *copySucceededOut = true;
>+    ANGLE_TRY(scopedState.exit(context));
>+    return angle::Result::Continue;
> }
> 
>-gl::Error BlitGL::copySubTextureCPUReadback(const gl::Context *context,
>-                                            TextureGL *source,
>-                                            size_t sourceLevel,
>-                                            GLenum sourceComponentType,
>-                                            TextureGL *dest,
>-                                            GLenum destTarget,
>-                                            size_t destLevel,
>-                                            GLenum destFormat,
>-                                            GLenum destType,
>-                                            const gl::Rectangle &sourceArea,
>-                                            const gl::Offset &destOffset,
>-                                            bool unpackFlipY,
>-                                            bool unpackPremultiplyAlpha,
>-                                            bool unpackUnmultiplyAlpha)
>+angle::Result BlitGL::copySubTextureCPUReadback(const gl::Context *context,
>+                                                TextureGL *source,
>+                                                size_t sourceLevel,
>+                                                GLenum sourceComponentType,
>+                                                TextureGL *dest,
>+                                                gl::TextureTarget destTarget,
>+                                                size_t destLevel,
>+                                                GLenum destFormat,
>+                                                GLenum destType,
>+                                                const gl::Rectangle &sourceArea,
>+                                                const gl::Offset &destOffset,
>+                                                bool unpackFlipY,
>+                                                bool unpackPremultiplyAlpha,
>+                                                bool unpackUnmultiplyAlpha)
> {
>-    ASSERT(source->getTarget() == GL_TEXTURE_2D);
>+    ANGLE_TRY(initializeResources());
>+
>+    ContextGL *contextGL = GetImplAs<ContextGL>(context);
>+
>+    ASSERT(source->getType() == gl::TextureType::_2D);
>     const auto &destInternalFormatInfo = gl::GetInternalFormatInfo(destFormat, destType);
> 
>+    mStateManager->bindFramebuffer(GL_FRAMEBUFFER, mScratchFBO);
>+    mFunctions->framebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D,
>+                                     source->getTextureID(), static_cast<GLint>(sourceLevel));
>+    GLenum status = mFunctions->checkFramebufferStatus(GL_FRAMEBUFFER);
>+    ASSERT(status == GL_FRAMEBUFFER_COMPLETE);
>+
>     // Create a buffer for holding the source and destination memory
>     const size_t sourcePixelSize = 4;
>     size_t sourceBufferSize      = sourceArea.width * sourceArea.height * sourcePixelSize;
>     size_t destBufferSize =
>         sourceArea.width * sourceArea.height * destInternalFormatInfo.pixelBytes;
>     angle::MemoryBuffer *buffer = nullptr;
>-    ANGLE_TRY(context->getScratchBuffer(sourceBufferSize + destBufferSize, &buffer));
>+    ANGLE_CHECK_GL_ALLOC(contextGL,
>+                         context->getScratchBuffer(sourceBufferSize + destBufferSize, &buffer));
>+
>     uint8_t *sourceMemory = buffer->data();
>     uint8_t *destMemory   = buffer->data() + sourceBufferSize;
> 
>-    mStateManager->bindFramebuffer(GL_FRAMEBUFFER, mScratchFBO);
>-    mFunctions->framebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, source->getTarget(),
>-                                     source->getTextureID(), static_cast<GLint>(sourceLevel));
>-
>     GLenum readPixelsFormat        = GL_NONE;
>-    ColorReadFunction readFunction = nullptr;
>+    PixelReadFunction readFunction = nullptr;
>     if (sourceComponentType == GL_UNSIGNED_INT)
>     {
>         readPixelsFormat = GL_RGBA_INTEGER;
>@@ -580,15 +651,15 @@ gl::Error BlitGL::copySubTextureCPUReadback(const gl::Context *context,
>     mFunctions->readPixels(sourceArea.x, sourceArea.y, sourceArea.width, sourceArea.height,
>                            readPixelsFormat, GL_UNSIGNED_BYTE, sourceMemory);
> 
>-    angle::Format::ID destFormatID =
>+    angle::FormatID destFormatID =
>         angle::Format::InternalFormatToID(destInternalFormatInfo.sizedInternalFormat);
>     const auto &destFormatInfo = angle::Format::Get(destFormatID);
>     CopyImageCHROMIUM(
>-        sourceMemory, sourceArea.width * sourcePixelSize, sourcePixelSize, readFunction, destMemory,
>-        sourceArea.width * destInternalFormatInfo.pixelBytes, destInternalFormatInfo.pixelBytes,
>-        destFormatInfo.colorWriteFunction, destInternalFormatInfo.format,
>-        destInternalFormatInfo.componentType, sourceArea.width, sourceArea.height, unpackFlipY,
>-        unpackPremultiplyAlpha, unpackUnmultiplyAlpha);
>+        sourceMemory, sourceArea.width * sourcePixelSize, sourcePixelSize, 0, readFunction,
>+        destMemory, sourceArea.width * destInternalFormatInfo.pixelBytes,
>+        destInternalFormatInfo.pixelBytes, 0, destFormatInfo.pixelWriteFunction,
>+        destInternalFormatInfo.format, destInternalFormatInfo.componentType, sourceArea.width,
>+        sourceArea.height, 1, unpackFlipY, unpackPremultiplyAlpha, unpackUnmultiplyAlpha);
> 
>     gl::PixelPackState pack;
>     pack.alignment = 1;
>@@ -598,37 +669,186 @@ gl::Error BlitGL::copySubTextureCPUReadback(const gl::Context *context,
>     nativegl::TexSubImageFormat texSubImageFormat =
>         nativegl::GetTexSubImageFormat(mFunctions, mWorkarounds, destFormat, destType);
> 
>-    mFunctions->texSubImage2D(destTarget, static_cast<GLint>(destLevel), destOffset.x, destOffset.y,
>-                              sourceArea.width, sourceArea.height, texSubImageFormat.format,
>-                              texSubImageFormat.type, destMemory);
>+    mStateManager->bindTexture(dest->getType(), dest->getTextureID());
>+    mFunctions->texSubImage2D(ToGLenum(destTarget), static_cast<GLint>(destLevel), destOffset.x,
>+                              destOffset.y, sourceArea.width, sourceArea.height,
>+                              texSubImageFormat.format, texSubImageFormat.type, destMemory);
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error BlitGL::copyTexSubImage(TextureGL *source,
>-                                  size_t sourceLevel,
>-                                  TextureGL *dest,
>-                                  GLenum destTarget,
>-                                  size_t destLevel,
>-                                  const gl::Rectangle &sourceArea,
>-                                  const gl::Offset &destOffset)
>+angle::Result BlitGL::copyTexSubImage(TextureGL *source,
>+                                      size_t sourceLevel,
>+                                      TextureGL *dest,
>+                                      gl::TextureTarget destTarget,
>+                                      size_t destLevel,
>+                                      const gl::Rectangle &sourceArea,
>+                                      const gl::Offset &destOffset,
>+                                      bool *copySucceededOut)
> {
>     ANGLE_TRY(initializeResources());
> 
>+    // Make sure the source texture can create a complete framebuffer before continuing.
>     mStateManager->bindFramebuffer(GL_FRAMEBUFFER, mScratchFBO);
>     mFunctions->framebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D,
>                                      source->getTextureID(), static_cast<GLint>(sourceLevel));
>+    GLenum status = mFunctions->checkFramebufferStatus(GL_FRAMEBUFFER);
>+    if (status != GL_FRAMEBUFFER_COMPLETE)
>+    {
>+        *copySucceededOut = false;
>+        return angle::Result::Continue;
>+    }
> 
>-    mStateManager->bindTexture(dest->getTarget(), dest->getTextureID());
>+    mStateManager->bindTexture(dest->getType(), dest->getTextureID());
> 
>-    mFunctions->copyTexSubImage2D(destTarget, static_cast<GLint>(destLevel), destOffset.x,
>+    mFunctions->copyTexSubImage2D(ToGLenum(destTarget), static_cast<GLint>(destLevel), destOffset.x,
>                                   destOffset.y, sourceArea.x, sourceArea.y, sourceArea.width,
>                                   sourceArea.height);
> 
>-    return gl::NoError();
>+    *copySucceededOut = true;
>+    return angle::Result::Continue;
> }
> 
>-gl::Error BlitGL::initializeResources()
>+angle::Result BlitGL::clearRenderableTexture(TextureGL *source,
>+                                             GLenum sizedInternalFormat,
>+                                             int numTextureLayers,
>+                                             const gl::ImageIndex &imageIndex,
>+                                             bool *clearSucceededOut)
>+{
>+    ANGLE_TRY(initializeResources());
>+
>+    ClearBindTargetVector bindTargets;
>+    GLbitfield clearMask = 0;
>+    ANGLE_TRY(PrepareForClear(mStateManager, sizedInternalFormat, &bindTargets, &clearMask));
>+
>+    mStateManager->bindFramebuffer(GL_FRAMEBUFFER, mScratchFBO);
>+
>+    if (nativegl::UseTexImage2D(source->getType()))
>+    {
>+        ASSERT(numTextureLayers == 1);
>+        for (GLenum bindTarget : bindTargets)
>+        {
>+            mFunctions->framebufferTexture2D(GL_FRAMEBUFFER, bindTarget,
>+                                             ToGLenum(imageIndex.getTarget()),
>+                                             source->getTextureID(), imageIndex.getLevelIndex());
>+        }
>+
>+        GLenum status = mFunctions->checkFramebufferStatus(GL_FRAMEBUFFER);
>+        if (status == GL_FRAMEBUFFER_COMPLETE)
>+        {
>+            mFunctions->clear(clearMask);
>+        }
>+        else
>+        {
>+            UnbindAttachments(mFunctions, GL_FRAMEBUFFER, bindTargets);
>+            *clearSucceededOut = false;
>+            return angle::Result::Continue;
>+        }
>+    }
>+    else
>+    {
>+        ASSERT(nativegl::UseTexImage3D(source->getType()));
>+
>+        // Check if it's possible to bind all layers of the texture at once
>+        if (mFunctions->framebufferTexture && !imageIndex.hasLayer())
>+        {
>+            for (GLenum bindTarget : bindTargets)
>+            {
>+                mFunctions->framebufferTexture(GL_FRAMEBUFFER, bindTarget, source->getTextureID(),
>+                                               imageIndex.getLevelIndex());
>+            }
>+
>+            GLenum status = mFunctions->checkFramebufferStatus(GL_FRAMEBUFFER);
>+            if (status == GL_FRAMEBUFFER_COMPLETE)
>+            {
>+                mFunctions->clear(clearMask);
>+            }
>+            else
>+            {
>+                UnbindAttachments(mFunctions, GL_FRAMEBUFFER, bindTargets);
>+                *clearSucceededOut = false;
>+                return angle::Result::Continue;
>+            }
>+        }
>+        else
>+        {
>+            GLint firstLayer = 0;
>+            GLint layerCount = numTextureLayers;
>+            if (imageIndex.hasLayer())
>+            {
>+                firstLayer = imageIndex.getLayerIndex();
>+                layerCount = imageIndex.getLayerCount();
>+            }
>+
>+            for (GLint layer = 0; layer < layerCount; layer++)
>+            {
>+                for (GLenum bindTarget : bindTargets)
>+                {
>+                    mFunctions->framebufferTextureLayer(
>+                        GL_FRAMEBUFFER, bindTarget, source->getTextureID(),
>+                        imageIndex.getLevelIndex(), layer + firstLayer);
>+                }
>+
>+                GLenum status = mFunctions->checkFramebufferStatus(GL_FRAMEBUFFER);
>+                if (status == GL_FRAMEBUFFER_COMPLETE)
>+                {
>+                    mFunctions->clear(clearMask);
>+                }
>+                else
>+                {
>+                    UnbindAttachments(mFunctions, GL_FRAMEBUFFER, bindTargets);
>+                    *clearSucceededOut = false;
>+                    return angle::Result::Continue;
>+                }
>+            }
>+        }
>+    }
>+
>+    UnbindAttachments(mFunctions, GL_FRAMEBUFFER, bindTargets);
>+    *clearSucceededOut = true;
>+    return angle::Result::Continue;
>+}
>+
>+angle::Result BlitGL::clearRenderbuffer(RenderbufferGL *source, GLenum sizedInternalFormat)
>+{
>+    ANGLE_TRY(initializeResources());
>+
>+    ClearBindTargetVector bindTargets;
>+    GLbitfield clearMask = 0;
>+    ANGLE_TRY(PrepareForClear(mStateManager, sizedInternalFormat, &bindTargets, &clearMask));
>+
>+    mStateManager->bindFramebuffer(GL_FRAMEBUFFER, mScratchFBO);
>+    for (GLenum bindTarget : bindTargets)
>+    {
>+        mFunctions->framebufferRenderbuffer(GL_FRAMEBUFFER, bindTarget, GL_RENDERBUFFER,
>+                                            source->getRenderbufferID());
>+    }
>+    mFunctions->clear(clearMask);
>+
>+    // Unbind
>+    for (GLenum bindTarget : bindTargets)
>+    {
>+        mFunctions->framebufferRenderbuffer(GL_FRAMEBUFFER, bindTarget, GL_RENDERBUFFER, 0);
>+    }
>+
>+    return angle::Result::Continue;
>+}
>+
>+angle::Result BlitGL::clearFramebuffer(FramebufferGL *source)
>+{
>+    // initializeResources skipped because no local state is used
>+
>+    // Clear all attachments
>+    GLbitfield clearMask = 0;
>+    ANGLE_TRY(SetClearState(mStateManager, true, true, true, &clearMask));
>+
>+    mStateManager->bindFramebuffer(GL_FRAMEBUFFER, source->getFramebufferID());
>+    mFunctions->clear(clearMask);
>+
>+    return angle::Result::Continue;
>+}
>+
>+angle::Result BlitGL::initializeResources()
> {
>     for (size_t i = 0; i < ArraySize(mScratchTextures); i++)
>     {
>@@ -676,14 +896,14 @@ gl::Error BlitGL::initializeResources()
>         }
>     }
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
> void BlitGL::orphanScratchTextures()
> {
>     for (auto texture : mScratchTextures)
>     {
>-        mStateManager->bindTexture(GL_TEXTURE_2D, texture);
>+        mStateManager->bindTexture(gl::TextureType::_2D, texture);
>         gl::PixelUnpackState unpack;
>         mStateManager->setPixelUnpackState(unpack);
>         mStateManager->setPixelUnpackBuffer(nullptr);
>@@ -696,7 +916,7 @@ void BlitGL::setScratchTextureParameter(GLenum param, GLenum value)
> {
>     for (auto texture : mScratchTextures)
>     {
>-        mStateManager->bindTexture(GL_TEXTURE_2D, texture);
>+        mStateManager->bindTexture(gl::TextureType::_2D, texture);
>         mFunctions->texParameteri(GL_TEXTURE_2D, param, value);
>         mFunctions->texParameteri(GL_TEXTURE_2D, param, value);
>     }
>@@ -726,8 +946,12 @@ BlitGL::BlitProgramType BlitGL::getBlitProgramType(GLenum sourceComponentType,
>     }
> }
> 
>-gl::Error BlitGL::getBlitProgram(BlitProgramType type, BlitProgram **program)
>+angle::Result BlitGL::getBlitProgram(const gl::Context *context,
>+                                     BlitProgramType type,
>+                                     BlitProgram **program)
> {
>+    ContextGL *contextGL = GetImplAs<ContextGL>(context);
>+
>     BlitProgram &result = mBlitPrograms[type];
>     if (result.program == 0)
>     {
>@@ -790,7 +1014,7 @@ gl::Error BlitGL::getBlitProgram(BlitProgramType type, BlitProgram **program)
>             GLuint vs = mFunctions->createShader(GL_VERTEX_SHADER);
>             mFunctions->shaderSource(vs, 1, &vsSourceCStr, nullptr);
>             mFunctions->compileShader(vs);
>-            ANGLE_TRY(CheckCompileStatus(mFunctions, vs));
>+            ANGLE_TRY(CheckCompileStatus(contextGL, mFunctions, vs));
> 
>             mFunctions->attachShader(result.program, vs);
>             mFunctions->deleteShader(vs);
>@@ -897,14 +1121,14 @@ gl::Error BlitGL::getBlitProgram(BlitProgramType type, BlitProgram **program)
>             GLuint fs = mFunctions->createShader(GL_FRAGMENT_SHADER);
>             mFunctions->shaderSource(fs, 1, &fsSourceCStr, nullptr);
>             mFunctions->compileShader(fs);
>-            ANGLE_TRY(CheckCompileStatus(mFunctions, fs));
>+            ANGLE_TRY(CheckCompileStatus(contextGL, mFunctions, fs));
> 
>             mFunctions->attachShader(result.program, fs);
>             mFunctions->deleteShader(fs);
>         }
> 
>         mFunctions->linkProgram(result.program);
>-        ANGLE_TRY(CheckLinkStatus(mFunctions, result.program));
>+        ANGLE_TRY(CheckLinkStatus(contextGL, mFunctions, result.program));
> 
>         result.sourceTextureLocation =
>             mFunctions->getUniformLocation(result.program, "u_source_texture");
>@@ -917,7 +1141,7 @@ gl::Error BlitGL::getBlitProgram(BlitProgramType type, BlitProgram **program)
>     }
> 
>     *program = &result;
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
> }  // namespace rx
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/BlitGL.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/BlitGL.h
>index ea17b896a37..0a48fab62ea 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/BlitGL.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/BlitGL.h
>@@ -11,21 +11,23 @@
> 
> #include "angle_gl.h"
> #include "common/angleutils.h"
>-#include "libANGLE/angletypes.h"
> #include "libANGLE/Error.h"
>+#include "libANGLE/angletypes.h"
> 
> #include <map>
> 
> namespace gl
> {
> class Framebuffer;
>-}
>+class ImageIndex;
>+}  // namespace gl
> 
> namespace rx
> {
> 
> class FramebufferGL;
> class FunctionsGL;
>+class RenderbufferGL;
> class StateManagerGL;
> class TextureGL;
> struct WorkaroundsGL;
>@@ -38,73 +40,86 @@ class BlitGL : angle::NonCopyable
>            StateManagerGL *stateManager);
>     ~BlitGL();
> 
>-    gl::Error copyImageToLUMAWorkaroundTexture(const gl::Context *context,
>-                                               GLuint texture,
>-                                               GLenum textureType,
>-                                               GLenum target,
>-                                               GLenum lumaFormat,
>-                                               size_t level,
>-                                               const gl::Rectangle &sourceArea,
>-                                               GLenum internalFormat,
>-                                               const gl::Framebuffer *source);
>-
>-    gl::Error copySubImageToLUMAWorkaroundTexture(const gl::Context *context,
>-                                                  GLuint texture,
>-                                                  GLenum textureType,
>-                                                  GLenum target,
>-                                                  GLenum lumaFormat,
>-                                                  size_t level,
>-                                                  const gl::Offset &destOffset,
>-                                                  const gl::Rectangle &sourceArea,
>-                                                  const gl::Framebuffer *source);
>-
>-    gl::Error blitColorBufferWithShader(const gl::Framebuffer *source,
>-                                        const gl::Framebuffer *dest,
>-                                        const gl::Rectangle &sourceArea,
>-                                        const gl::Rectangle &destArea,
>-                                        GLenum filter);
>-
>-    gl::Error copySubTexture(const gl::Context *context,
>-                             TextureGL *source,
>-                             size_t sourceLevel,
>-                             GLenum sourceComponentType,
>-                             TextureGL *dest,
>-                             GLenum destTarget,
>-                             size_t destLevel,
>-                             GLenum destComponentType,
>-                             const gl::Extents &sourceSize,
>-                             const gl::Rectangle &sourceArea,
>-                             const gl::Offset &destOffset,
>-                             bool needsLumaWorkaround,
>-                             GLenum lumaFormat,
>-                             bool unpackFlipY,
>-                             bool unpackPremultiplyAlpha,
>-                             bool unpackUnmultiplyAlpha);
>-
>-    gl::Error copySubTextureCPUReadback(const gl::Context *context,
>-                                        TextureGL *source,
>-                                        size_t sourceLevel,
>-                                        GLenum sourceComponentType,
>-                                        TextureGL *dest,
>-                                        GLenum destTarget,
>-                                        size_t destLevel,
>-                                        GLenum destFormat,
>-                                        GLenum destType,
>-                                        const gl::Rectangle &sourceArea,
>-                                        const gl::Offset &destOffset,
>-                                        bool unpackFlipY,
>-                                        bool unpackPremultiplyAlpha,
>-                                        bool unpackUnmultiplyAlpha);
>-
>-    gl::Error copyTexSubImage(TextureGL *source,
>-                              size_t sourceLevel,
>-                              TextureGL *dest,
>-                              GLenum destTarget,
>-                              size_t destLevel,
>-                              const gl::Rectangle &sourceArea,
>-                              const gl::Offset &destOffset);
>-
>-    gl::Error initializeResources();
>+    angle::Result copyImageToLUMAWorkaroundTexture(const gl::Context *context,
>+                                                   GLuint texture,
>+                                                   gl::TextureType textureType,
>+                                                   gl::TextureTarget target,
>+                                                   GLenum lumaFormat,
>+                                                   size_t level,
>+                                                   const gl::Rectangle &sourceArea,
>+                                                   GLenum internalFormat,
>+                                                   gl::Framebuffer *source);
>+
>+    angle::Result copySubImageToLUMAWorkaroundTexture(const gl::Context *context,
>+                                                      GLuint texture,
>+                                                      gl::TextureType textureType,
>+                                                      gl::TextureTarget target,
>+                                                      GLenum lumaFormat,
>+                                                      size_t level,
>+                                                      const gl::Offset &destOffset,
>+                                                      const gl::Rectangle &sourceArea,
>+                                                      gl::Framebuffer *source);
>+
>+    angle::Result blitColorBufferWithShader(const gl::Context *context,
>+                                            const gl::Framebuffer *source,
>+                                            const gl::Framebuffer *dest,
>+                                            const gl::Rectangle &sourceArea,
>+                                            const gl::Rectangle &destArea,
>+                                            GLenum filter);
>+
>+    angle::Result copySubTexture(const gl::Context *context,
>+                                 TextureGL *source,
>+                                 size_t sourceLevel,
>+                                 GLenum sourceComponentType,
>+                                 TextureGL *dest,
>+                                 gl::TextureTarget destTarget,
>+                                 size_t destLevel,
>+                                 GLenum destComponentType,
>+                                 const gl::Extents &sourceSize,
>+                                 const gl::Rectangle &sourceArea,
>+                                 const gl::Offset &destOffset,
>+                                 bool needsLumaWorkaround,
>+                                 GLenum lumaFormat,
>+                                 bool unpackFlipY,
>+                                 bool unpackPremultiplyAlpha,
>+                                 bool unpackUnmultiplyAlpha,
>+                                 bool *copySucceededOut);
>+
>+    angle::Result copySubTextureCPUReadback(const gl::Context *context,
>+                                            TextureGL *source,
>+                                            size_t sourceLevel,
>+                                            GLenum sourceComponentType,
>+                                            TextureGL *dest,
>+                                            gl::TextureTarget destTarget,
>+                                            size_t destLevel,
>+                                            GLenum destFormat,
>+                                            GLenum destType,
>+                                            const gl::Rectangle &sourceArea,
>+                                            const gl::Offset &destOffset,
>+                                            bool unpackFlipY,
>+                                            bool unpackPremultiplyAlpha,
>+                                            bool unpackUnmultiplyAlpha);
>+
>+    angle::Result copyTexSubImage(TextureGL *source,
>+                                  size_t sourceLevel,
>+                                  TextureGL *dest,
>+                                  gl::TextureTarget destTarget,
>+                                  size_t destLevel,
>+                                  const gl::Rectangle &sourceArea,
>+                                  const gl::Offset &destOffset,
>+                                  bool *copySucceededOut);
>+
>+    angle::Result clearRenderableTexture(TextureGL *source,
>+                                         GLenum sizedInternalFormat,
>+                                         int numTextureLayers,
>+                                         const gl::ImageIndex &imageIndex,
>+                                         bool *clearSucceededOut);
>+
>+    angle::Result clearRenderbuffer(RenderbufferGL *source, GLenum sizedInternalFormat);
>+
>+    angle::Result clearFramebuffer(FramebufferGL *source);
>+
>+    angle::Result initializeResources();
> 
>   private:
>     void orphanScratchTextures();
>@@ -132,7 +147,9 @@ class BlitGL : angle::NonCopyable
>     };
> 
>     static BlitProgramType getBlitProgramType(GLenum sourceComponentType, GLenum destComponentType);
>-    gl::Error getBlitProgram(BlitProgramType type, BlitProgram **program);
>+    angle::Result getBlitProgram(const gl::Context *context,
>+                                 BlitProgramType type,
>+                                 BlitProgram **program);
> 
>     std::map<BlitProgramType, BlitProgram> mBlitPrograms;
> 
>@@ -142,6 +159,6 @@ class BlitGL : angle::NonCopyable
>     GLuint mVAO;
>     GLuint mVertexBuffer;
> };
>-}
>+}  // namespace rx
> 
> #endif  // LIBANGLE_RENDERER_GL_BLITGL_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/BufferGL.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/BufferGL.cpp
>index 50cc4670e88..5981bf0677d 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/BufferGL.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/BufferGL.cpp
>@@ -10,8 +10,10 @@
> 
> #include "common/debug.h"
> #include "common/utilities.h"
>+#include "libANGLE/Context.h"
> #include "libANGLE/angletypes.h"
> #include "libANGLE/formatutils.h"
>+#include "libANGLE/renderer/gl/ContextGL.h"
> #include "libANGLE/renderer/gl/FunctionsGL.h"
> #include "libANGLE/renderer/gl/StateManagerGL.h"
> #include "libANGLE/renderer/gl/renderergl_utils.h"
>@@ -55,21 +57,18 @@ BufferGL::~BufferGL()
>     mBufferID = 0;
> }
> 
>-gl::Error BufferGL::setData(const gl::Context * /*context*/,
>-                            gl::BufferBinding /*target*/,
>-                            const void *data,
>-                            size_t size,
>-                            gl::BufferUsage usage)
>+angle::Result BufferGL::setData(const gl::Context *context,
>+                                gl::BufferBinding target,
>+                                const void *data,
>+                                size_t size,
>+                                gl::BufferUsage usage)
> {
>     mStateManager->bindBuffer(DestBufferOperationTarget, mBufferID);
>     mFunctions->bufferData(gl::ToGLenum(DestBufferOperationTarget), size, data, ToGLenum(usage));
> 
>     if (mShadowBufferData)
>     {
>-        if (!mShadowCopy.resize(size))
>-        {
>-            return gl::OutOfMemory() << "Failed to resize buffer data shadow copy.";
>-        }
>+        ANGLE_CHECK_GL_ALLOC(GetImplAs<ContextGL>(context), mShadowCopy.resize(size));
> 
>         if (size > 0 && data != nullptr)
>         {
>@@ -79,14 +78,14 @@ gl::Error BufferGL::setData(const gl::Context * /*context*/,
> 
>     mBufferSize = size;
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error BufferGL::setSubData(const gl::Context * /*context*/,
>-                               gl::BufferBinding /*target*/,
>-                               const void *data,
>-                               size_t size,
>-                               size_t offset)
>+angle::Result BufferGL::setSubData(const gl::Context *context,
>+                                   gl::BufferBinding target,
>+                                   const void *data,
>+                                   size_t size,
>+                                   size_t offset)
> {
>     mStateManager->bindBuffer(DestBufferOperationTarget, mBufferID);
>     mFunctions->bufferSubData(gl::ToGLenum(DestBufferOperationTarget), offset, size, data);
>@@ -96,14 +95,14 @@ gl::Error BufferGL::setSubData(const gl::Context * /*context*/,
>         memcpy(mShadowCopy.data() + offset, data, size);
>     }
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error BufferGL::copySubData(const gl::Context *context,
>-                                BufferImpl *source,
>-                                GLintptr sourceOffset,
>-                                GLintptr destOffset,
>-                                GLsizeiptr size)
>+angle::Result BufferGL::copySubData(const gl::Context *context,
>+                                    BufferImpl *source,
>+                                    GLintptr sourceOffset,
>+                                    GLintptr destOffset,
>+                                    GLsizeiptr size)
> {
>     BufferGL *sourceGL = GetAs<BufferGL>(source);
> 
>@@ -120,10 +119,10 @@ gl::Error BufferGL::copySubData(const gl::Context *context,
>         memcpy(mShadowCopy.data() + destOffset, sourceGL->mShadowCopy.data() + sourceOffset, size);
>     }
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error BufferGL::map(const gl::Context *context, GLenum access, void **mapPtr)
>+angle::Result BufferGL::map(const gl::Context *context, GLenum access, void **mapPtr)
> {
>     if (mShadowBufferData)
>     {
>@@ -146,14 +145,14 @@ gl::Error BufferGL::map(const gl::Context *context, GLenum access, void **mapPtr
>     mMapOffset = 0;
>     mMapSize   = mBufferSize;
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error BufferGL::mapRange(const gl::Context *context,
>-                             size_t offset,
>-                             size_t length,
>-                             GLbitfield access,
>-                             void **mapPtr)
>+angle::Result BufferGL::mapRange(const gl::Context *context,
>+                                 size_t offset,
>+                                 size_t length,
>+                                 GLbitfield access,
>+                                 void **mapPtr)
> {
>     if (mShadowBufferData)
>     {
>@@ -170,10 +169,10 @@ gl::Error BufferGL::mapRange(const gl::Context *context,
>     mMapOffset = offset;
>     mMapSize   = length;
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error BufferGL::unmap(const gl::Context *context, GLboolean *result)
>+angle::Result BufferGL::unmap(const gl::Context *context, GLboolean *result)
> {
>     ASSERT(result);
>     ASSERT(mIsMapped);
>@@ -192,15 +191,15 @@ gl::Error BufferGL::unmap(const gl::Context *context, GLboolean *result)
>     }
> 
>     mIsMapped = false;
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error BufferGL::getIndexRange(const gl::Context *context,
>-                                  GLenum type,
>-                                  size_t offset,
>-                                  size_t count,
>-                                  bool primitiveRestartEnabled,
>-                                  gl::IndexRange *outRange)
>+angle::Result BufferGL::getIndexRange(const gl::Context *context,
>+                                      gl::DrawElementsType type,
>+                                      size_t offset,
>+                                      size_t count,
>+                                      bool primitiveRestartEnabled,
>+                                      gl::IndexRange *outRange)
> {
>     ASSERT(!mIsMapped);
> 
>@@ -213,19 +212,27 @@ gl::Error BufferGL::getIndexRange(const gl::Context *context,
>     {
>         mStateManager->bindBuffer(DestBufferOperationTarget, mBufferID);
> 
>-        const gl::Type &typeInfo  = gl::GetTypeInfo(type);
>+        const GLuint typeBytes = gl::GetDrawElementsTypeSize(type);
>         const uint8_t *bufferData =
>             MapBufferRangeWithFallback(mFunctions, gl::ToGLenum(DestBufferOperationTarget), offset,
>-                                       count * typeInfo.bytes, GL_MAP_READ_BIT);
>-        *outRange = gl::ComputeIndexRange(type, bufferData, count, primitiveRestartEnabled);
>-        mFunctions->unmapBuffer(gl::ToGLenum(DestBufferOperationTarget));
>+                                       count * typeBytes, GL_MAP_READ_BIT);
>+        if (bufferData)
>+        {
>+            *outRange = gl::ComputeIndexRange(type, bufferData, count, primitiveRestartEnabled);
>+            mFunctions->unmapBuffer(gl::ToGLenum(DestBufferOperationTarget));
>+        }
>+        else
>+        {
>+            // Workaround the null driver not having map support.
>+            *outRange = gl::IndexRange(0, 0, 1);
>+        }
>     }
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
> GLuint BufferGL::getBufferID() const
> {
>     return mBufferID;
> }
>-}
>+}  // namespace rx
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/BufferGL.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/BufferGL.h
>index fbac40cf909..1d93faa093e 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/BufferGL.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/BufferGL.h
>@@ -26,35 +26,35 @@ class BufferGL : public BufferImpl
>              StateManagerGL *stateManager);
>     ~BufferGL() override;
> 
>-    gl::Error setData(const gl::Context *context,
>-                      gl::BufferBinding target,
>-                      const void *data,
>-                      size_t size,
>-                      gl::BufferUsage usage) override;
>-    gl::Error setSubData(const gl::Context *context,
>-                         gl::BufferBinding target,
>-                         const void *data,
>-                         size_t size,
>-                         size_t offset) override;
>-    gl::Error copySubData(const gl::Context *context,
>-                          BufferImpl *source,
>-                          GLintptr sourceOffset,
>-                          GLintptr destOffset,
>-                          GLsizeiptr size) override;
>-    gl::Error map(const gl::Context *context, GLenum access, void **mapPtr) override;
>-    gl::Error mapRange(const gl::Context *context,
>-                       size_t offset,
>-                       size_t length,
>-                       GLbitfield access,
>-                       void **mapPtr) override;
>-    gl::Error unmap(const gl::Context *context, GLboolean *result) override;
>-
>-    gl::Error getIndexRange(const gl::Context *context,
>-                            GLenum type,
>-                            size_t offset,
>-                            size_t count,
>-                            bool primitiveRestartEnabled,
>-                            gl::IndexRange *outRange) override;
>+    angle::Result setData(const gl::Context *context,
>+                          gl::BufferBinding target,
>+                          const void *data,
>+                          size_t size,
>+                          gl::BufferUsage usage) override;
>+    angle::Result setSubData(const gl::Context *context,
>+                             gl::BufferBinding target,
>+                             const void *data,
>+                             size_t size,
>+                             size_t offset) override;
>+    angle::Result copySubData(const gl::Context *context,
>+                              BufferImpl *source,
>+                              GLintptr sourceOffset,
>+                              GLintptr destOffset,
>+                              GLsizeiptr size) override;
>+    angle::Result map(const gl::Context *context, GLenum access, void **mapPtr) override;
>+    angle::Result mapRange(const gl::Context *context,
>+                           size_t offset,
>+                           size_t length,
>+                           GLbitfield access,
>+                           void **mapPtr) override;
>+    angle::Result unmap(const gl::Context *context, GLboolean *result) override;
>+
>+    angle::Result getIndexRange(const gl::Context *context,
>+                                gl::DrawElementsType type,
>+                                size_t offset,
>+                                size_t count,
>+                                bool primitiveRestartEnabled,
>+                                gl::IndexRange *outRange) override;
> 
>     GLuint getBufferID() const;
> 
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/ClearMultiviewGL.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/ClearMultiviewGL.cpp
>index fb329781a58..9af41d804a9 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/ClearMultiviewGL.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/ClearMultiviewGL.cpp
>@@ -19,8 +19,7 @@ namespace rx
> 
> ClearMultiviewGL::ClearMultiviewGL(const FunctionsGL *functions, StateManagerGL *stateManager)
>     : mFunctions(functions), mStateManager(stateManager), mFramebuffer(0u)
>-{
>-}
>+{}
> 
> ClearMultiviewGL::~ClearMultiviewGL()
> {
>@@ -41,18 +40,9 @@ void ClearMultiviewGL::clearMultiviewFBO(const gl::FramebufferState &state,
>                                          GLint stencil)
> {
>     const gl::FramebufferAttachment *firstAttachment = state.getFirstNonNullAttachment();
>-    switch (firstAttachment->getMultiviewLayout())
>+    if (firstAttachment->isMultiview())
>     {
>-        case GL_FRAMEBUFFER_MULTIVIEW_LAYERED_ANGLE:
>-            clearLayeredFBO(state, clearCommandType, mask, buffer, drawbuffer, values, depth,
>-                            stencil);
>-            break;
>-        case GL_FRAMEBUFFER_MULTIVIEW_SIDE_BY_SIDE_ANGLE:
>-            clearSideBySideFBO(state, scissorBase, clearCommandType, mask, buffer, drawbuffer,
>-                               values, depth, stencil);
>-            break;
>-        default:
>-            UNREACHABLE();
>+        clearLayeredFBO(state, clearCommandType, mask, buffer, drawbuffer, values, depth, stencil);
>     }
> }
> 
>@@ -70,7 +60,7 @@ void ClearMultiviewGL::clearLayeredFBO(const gl::FramebufferState &state,
>     mStateManager->bindFramebuffer(GL_DRAW_FRAMEBUFFER, mFramebuffer);
> 
>     const gl::FramebufferAttachment *firstAttachment = state.getFirstNonNullAttachment();
>-    ASSERT(firstAttachment->getMultiviewLayout() == GL_FRAMEBUFFER_MULTIVIEW_LAYERED_ANGLE);
>+    ASSERT(firstAttachment->isMultiview());
> 
>     const auto &drawBuffers = state.getDrawBufferStates();
>     mFunctions->drawBuffers(static_cast<GLsizei>(drawBuffers.size()), drawBuffers.data());
>@@ -87,30 +77,6 @@ void ClearMultiviewGL::clearLayeredFBO(const gl::FramebufferState &state,
>     detachTextures(state);
> }
> 
>-void ClearMultiviewGL::clearSideBySideFBO(const gl::FramebufferState &state,
>-                                          const gl::Rectangle &scissorBase,
>-                                          ClearCommandType clearCommandType,
>-                                          GLbitfield mask,
>-                                          GLenum buffer,
>-                                          GLint drawbuffer,
>-                                          const uint8_t *values,
>-                                          GLfloat depth,
>-                                          GLint stencil)
>-{
>-    const gl::FramebufferAttachment *firstAttachment = state.getFirstNonNullAttachment();
>-    ASSERT(firstAttachment->getMultiviewLayout() == GL_FRAMEBUFFER_MULTIVIEW_SIDE_BY_SIDE_ANGLE);
>-
>-    const auto &viewportOffsets = firstAttachment->getMultiviewViewportOffsets();
>-    for (size_t i = 0u; i < viewportOffsets.size(); ++i)
>-    {
>-        gl::Rectangle scissor(scissorBase.x + viewportOffsets[i].x,
>-                              scissorBase.y + viewportOffsets[i].y, scissorBase.width,
>-                              scissorBase.height);
>-        mStateManager->setScissorIndexed(0u, scissor);
>-        genericClear(clearCommandType, mask, buffer, drawbuffer, values, depth, stencil);
>-    }
>-}
>-
> void ClearMultiviewGL::genericClear(ClearCommandType clearCommandType,
>                                     GLbitfield mask,
>                                     GLenum buffer,
>@@ -154,13 +120,14 @@ void ClearMultiviewGL::attachTextures(const gl::FramebufferState &state, int lay
>         }
> 
>         const auto &imageIndex = attachment->getTextureImageIndex();
>-        ASSERT(imageIndex.type == GL_TEXTURE_2D_ARRAY);
>+        ASSERT(imageIndex.getType() == gl::TextureType::_2DArray);
> 
>         GLenum colorAttachment =
>             static_cast<GLenum>(GL_COLOR_ATTACHMENT0 + static_cast<int>(drawBufferId));
>         const TextureGL *textureGL = GetImplAs<TextureGL>(attachment->getTexture());
>         mFunctions->framebufferTextureLayer(GL_DRAW_FRAMEBUFFER, colorAttachment,
>-                                            textureGL->getTextureID(), imageIndex.mipIndex, layer);
>+                                            textureGL->getTextureID(), imageIndex.getLevelIndex(),
>+                                            layer);
>     }
> 
>     const gl::FramebufferAttachment *depthStencilAttachment = state.getDepthStencilAttachment();
>@@ -169,29 +136,32 @@ void ClearMultiviewGL::attachTextures(const gl::FramebufferState &state, int lay
>     if (depthStencilAttachment != nullptr)
>     {
>         const auto &imageIndex = depthStencilAttachment->getTextureImageIndex();
>-        ASSERT(imageIndex.type == GL_TEXTURE_2D_ARRAY);
>+        ASSERT(imageIndex.getType() == gl::TextureType::_2DArray);
> 
>         const TextureGL *textureGL = GetImplAs<TextureGL>(depthStencilAttachment->getTexture());
>         mFunctions->framebufferTextureLayer(GL_DRAW_FRAMEBUFFER, GL_DEPTH_STENCIL_ATTACHMENT,
>-                                            textureGL->getTextureID(), imageIndex.mipIndex, layer);
>+                                            textureGL->getTextureID(), imageIndex.getLevelIndex(),
>+                                            layer);
>     }
>     else if (depthAttachment != nullptr)
>     {
>         const auto &imageIndex = depthAttachment->getTextureImageIndex();
>-        ASSERT(imageIndex.type == GL_TEXTURE_2D_ARRAY);
>+        ASSERT(imageIndex.getType() == gl::TextureType::_2DArray);
> 
>         const TextureGL *textureGL = GetImplAs<TextureGL>(depthAttachment->getTexture());
>         mFunctions->framebufferTextureLayer(GL_DRAW_FRAMEBUFFER, GL_DEPTH_ATTACHMENT,
>-                                            textureGL->getTextureID(), imageIndex.mipIndex, layer);
>+                                            textureGL->getTextureID(), imageIndex.getLevelIndex(),
>+                                            layer);
>     }
>     else if (stencilAttachment != nullptr)
>     {
>         const auto &imageIndex = stencilAttachment->getTextureImageIndex();
>-        ASSERT(imageIndex.type == GL_TEXTURE_2D_ARRAY);
>+        ASSERT(imageIndex.getType() == gl::TextureType::_2DArray);
> 
>         const TextureGL *textureGL = GetImplAs<TextureGL>(stencilAttachment->getTexture());
>         mFunctions->framebufferTextureLayer(GL_DRAW_FRAMEBUFFER, GL_STENCIL_ATTACHMENT,
>-                                            textureGL->getTextureID(), imageIndex.mipIndex, layer);
>+                                            textureGL->getTextureID(), imageIndex.getLevelIndex(),
>+                                            layer);
>     }
> }
> 
>@@ -237,4 +207,4 @@ void ClearMultiviewGL::initializeResources()
>     ASSERT(mFramebuffer != 0u);
> }
> 
>-}  // namespace rx
>\ No newline at end of file
>+}  // namespace rx
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/ClearMultiviewGL.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/ClearMultiviewGL.h
>index cdbbfad1327..b6c30afee6e 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/ClearMultiviewGL.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/ClearMultiviewGL.h
>@@ -68,15 +68,6 @@ class ClearMultiviewGL : angle::NonCopyable
>                          const uint8_t *values,
>                          GLfloat depth,
>                          GLint stencil);
>-    void clearSideBySideFBO(const gl::FramebufferState &state,
>-                            const gl::Rectangle &scissorBase,
>-                            ClearCommandType clearCommandType,
>-                            GLbitfield mask,
>-                            GLenum buffer,
>-                            GLint drawbuffer,
>-                            const uint8_t *values,
>-                            GLfloat depth,
>-                            GLint stencil);
>     void genericClear(ClearCommandType clearCommandType,
>                       GLbitfield mask,
>                       GLenum buffer,
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/CompilerGL.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/CompilerGL.cpp
>index 7e643f92911..9bcb8ee0f97 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/CompilerGL.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/CompilerGL.cpp
>@@ -85,13 +85,7 @@ ShShaderOutput GetShaderOutputType(const FunctionsGL *functions)
> 
> CompilerGL::CompilerGL(const FunctionsGL *functions)
>     : mTranslatorOutputType(GetShaderOutputType(functions))
>-{
>-}
>-
>-gl::Error CompilerGL::release()
>-{
>-    return gl::NoError();
>-}
>+{}
> 
> ShShaderOutput CompilerGL::getTranslatorOutputType() const
> {
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/CompilerGL.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/CompilerGL.h
>index 22e101b5bce..e47eade1ab8 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/CompilerGL.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/CompilerGL.h
>@@ -21,13 +21,12 @@ class CompilerGL : public CompilerImpl
>     CompilerGL(const FunctionsGL *functions);
>     ~CompilerGL() override {}
> 
>-    gl::Error release() override;
>     ShShaderOutput getTranslatorOutputType() const override;
> 
>   private:
>     ShShaderOutput mTranslatorOutputType;
> };
> 
>-}
>+}  // namespace rx
> 
>-#endif // LIBANGLE_RENDERER_GL_COMPILERGL_H_
>+#endif  // LIBANGLE_RENDERER_GL_COMPILERGL_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/ContextGL.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/ContextGL.cpp
>index ea37b5a561b..3e0dbcb7706 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/ContextGL.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/ContextGL.cpp
>@@ -9,6 +9,7 @@
> 
> #include "libANGLE/renderer/gl/ContextGL.h"
> 
>+#include "libANGLE/Context.h"
> #include "libANGLE/renderer/gl/BufferGL.h"
> #include "libANGLE/renderer/gl/CompilerGL.h"
> #include "libANGLE/renderer/gl/FenceNVGL.h"
>@@ -31,18 +32,17 @@
> namespace rx
> {
> 
>-ContextGL::ContextGL(const gl::ContextState &state, RendererGL *renderer)
>-    : ContextImpl(state), mRenderer(renderer)
>-{
>-}
>+ContextGL::ContextGL(const gl::State &state,
>+                     gl::ErrorSet *errorSet,
>+                     const std::shared_ptr<RendererGL> &renderer)
>+    : ContextImpl(state, errorSet), mRenderer(renderer)
>+{}
> 
>-ContextGL::~ContextGL()
>-{
>-}
>+ContextGL::~ContextGL() {}
> 
>-gl::Error ContextGL::initialize()
>+angle::Result ContextGL::initialize()
> {
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
> CompilerImpl *ContextGL::createCompiler()
>@@ -52,33 +52,44 @@ CompilerImpl *ContextGL::createCompiler()
> 
> ShaderImpl *ContextGL::createShader(const gl::ShaderState &data)
> {
>-    return new ShaderGL(data, getFunctions(), getWorkaroundsGL(),
>-                        getExtensions().webglCompatibility,
>-                        mRenderer->getMultiviewImplementationType());
>+    const FunctionsGL *functions = getFunctions();
>+    GLuint shader                = functions->createShader(ToGLenum(data.getShaderType()));
>+
>+    return new ShaderGL(data, shader, mRenderer->getMultiviewImplementationType(), mRenderer);
> }
> 
> ProgramImpl *ContextGL::createProgram(const gl::ProgramState &data)
> {
>     return new ProgramGL(data, getFunctions(), getWorkaroundsGL(), getStateManager(),
>-                         getExtensions().pathRendering);
>+                         getExtensions().pathRendering, mRenderer);
> }
> 
> FramebufferImpl *ContextGL::createFramebuffer(const gl::FramebufferState &data)
> {
>-    return new FramebufferGL(data, getFunctions(), getStateManager(), getWorkaroundsGL(),
>-                             mRenderer->getBlitter(), mRenderer->getMultiviewClearer(), false);
>+    const FunctionsGL *funcs = getFunctions();
>+
>+    GLuint fbo = 0;
>+    funcs->genFramebuffers(1, &fbo);
>+
>+    return new FramebufferGL(data, fbo, false);
> }
> 
> TextureImpl *ContextGL::createTexture(const gl::TextureState &state)
> {
>-    return new TextureGL(state, getFunctions(), getWorkaroundsGL(), getStateManager(),
>-                         mRenderer->getBlitter());
>+    const FunctionsGL *functions = getFunctions();
>+    StateManagerGL *stateManager = getStateManager();
>+
>+    GLuint texture = 0;
>+    functions->genTextures(1, &texture);
>+    stateManager->bindTexture(state.getType(), texture);
>+
>+    return new TextureGL(state, texture);
> }
> 
>-RenderbufferImpl *ContextGL::createRenderbuffer()
>+RenderbufferImpl *ContextGL::createRenderbuffer(const gl::RenderbufferState &state)
> {
>-    return new RenderbufferGL(getFunctions(), getWorkaroundsGL(), getStateManager(),
>-                              getNativeTextureCaps());
>+    return new RenderbufferGL(state, getFunctions(), getWorkaroundsGL(), getStateManager(),
>+                              mRenderer->getBlitter(), getNativeTextureCaps());
> }
> 
> BufferImpl *ContextGL::createBuffer(const gl::BufferState &state)
>@@ -91,12 +102,12 @@ VertexArrayImpl *ContextGL::createVertexArray(const gl::VertexArrayState &data)
>     return new VertexArrayGL(data, getFunctions(), getStateManager());
> }
> 
>-QueryImpl *ContextGL::createQuery(GLenum type)
>+QueryImpl *ContextGL::createQuery(gl::QueryType type)
> {
>     switch (type)
>     {
>-        case GL_COMMANDS_COMPLETED_CHROMIUM:
>-            return new SyncQueryGL(type, getFunctions(), getStateManager());
>+        case gl::QueryType::CommandsCompleted:
>+            return new SyncQueryGL(type, getFunctions());
> 
>         default:
>             return new StandardQueryGL(type, getFunctions(), getStateManager());
>@@ -105,7 +116,16 @@ QueryImpl *ContextGL::createQuery(GLenum type)
> 
> FenceNVImpl *ContextGL::createFenceNV()
> {
>-    return new FenceNVGL(getFunctions());
>+    const FunctionsGL *functions = getFunctions();
>+    if (FenceNVGL::Supported(functions))
>+    {
>+        return new FenceNVGL(functions);
>+    }
>+    else
>+    {
>+        ASSERT(FenceNVSyncGL::Supported(functions));
>+        return new FenceNVSyncGL(functions);
>+    }
> }
> 
> SyncImpl *ContextGL::createSync()
>@@ -148,73 +168,199 @@ std::vector<PathImpl *> ContextGL::createPaths(GLsizei range)
>     return ret;
> }
> 
>-gl::Error ContextGL::flush(const gl::Context *context)
>+MemoryObjectImpl *ContextGL::createMemoryObject()
>+{
>+    UNREACHABLE();
>+    return nullptr;
>+}
>+
>+angle::Result ContextGL::flush(const gl::Context *context)
> {
>     return mRenderer->flush();
> }
> 
>-gl::Error ContextGL::finish(const gl::Context *context)
>+angle::Result ContextGL::finish(const gl::Context *context)
> {
>     return mRenderer->finish();
> }
> 
>-gl::Error ContextGL::drawArrays(const gl::Context *context, GLenum mode, GLint first, GLsizei count)
>+ANGLE_INLINE angle::Result ContextGL::setDrawArraysState(const gl::Context *context,
>+                                                         GLint first,
>+                                                         GLsizei count,
>+                                                         GLsizei instanceCount)
> {
>-    return mRenderer->drawArrays(context, mode, first, count);
>+    if (context->getStateCache().hasAnyActiveClientAttrib())
>+    {
>+        const gl::State &glState   = context->getState();
>+        const gl::Program *program = glState.getProgram();
>+        const gl::VertexArray *vao = glState.getVertexArray();
>+        const VertexArrayGL *vaoGL = GetImplAs<VertexArrayGL>(vao);
>+
>+        ANGLE_TRY(vaoGL->syncClientSideData(context, program->getActiveAttribLocationsMask(), first,
>+                                            count, instanceCount));
>+    }
>+
>+    return angle::Result::Continue;
> }
> 
>-gl::Error ContextGL::drawArraysInstanced(const gl::Context *context,
>-                                         GLenum mode,
>-                                         GLint first,
>-                                         GLsizei count,
>-                                         GLsizei instanceCount)
>+ANGLE_INLINE angle::Result ContextGL::setDrawElementsState(const gl::Context *context,
>+                                                           GLsizei count,
>+                                                           gl::DrawElementsType type,
>+                                                           const void *indices,
>+                                                           GLsizei instanceCount,
>+                                                           const void **outIndices)
> {
>-    return mRenderer->drawArraysInstanced(context, mode, first, count, instanceCount);
>+    const gl::State &glState = context->getState();
>+
>+    const gl::Program *program = glState.getProgram();
>+
>+    const gl::VertexArray *vao = glState.getVertexArray();
>+
>+    const gl::StateCache &stateCache = context->getStateCache();
>+    if (stateCache.hasAnyActiveClientAttrib() || vao->getElementArrayBuffer() == nullptr)
>+    {
>+        const VertexArrayGL *vaoGL = GetImplAs<VertexArrayGL>(vao);
>+        ANGLE_TRY(vaoGL->syncDrawElementsState(context, program->getActiveAttribLocationsMask(),
>+                                               count, type, indices, instanceCount,
>+                                               glState.isPrimitiveRestartEnabled(), outIndices));
>+    }
>+    else
>+    {
>+        *outIndices = indices;
>+    }
>+
>+    return angle::Result::Continue;
> }
> 
>-gl::Error ContextGL::drawElements(const gl::Context *context,
>-                                  GLenum mode,
>-                                  GLsizei count,
>-                                  GLenum type,
>-                                  const void *indices)
>+angle::Result ContextGL::drawArrays(const gl::Context *context,
>+                                    gl::PrimitiveMode mode,
>+                                    GLint first,
>+                                    GLsizei count)
> {
>-    return mRenderer->drawElements(context, mode, count, type, indices);
>+    const gl::Program *program  = context->getState().getProgram();
>+    const bool usesMultiview    = program->usesMultiview();
>+    const GLsizei instanceCount = usesMultiview ? program->getNumViews() : 0;
>+
>+    ANGLE_TRY(setDrawArraysState(context, first, count, instanceCount));
>+    if (!usesMultiview)
>+    {
>+        getFunctions()->drawArrays(ToGLenum(mode), first, count);
>+    }
>+    else
>+    {
>+        getFunctions()->drawArraysInstanced(ToGLenum(mode), first, count, instanceCount);
>+    }
>+    return angle::Result::Continue;
> }
> 
>-gl::Error ContextGL::drawElementsInstanced(const gl::Context *context,
>-                                           GLenum mode,
>-                                           GLsizei count,
>-                                           GLenum type,
>-                                           const void *indices,
>-                                           GLsizei instances)
>+angle::Result ContextGL::drawArraysInstanced(const gl::Context *context,
>+                                             gl::PrimitiveMode mode,
>+                                             GLint first,
>+                                             GLsizei count,
>+                                             GLsizei instanceCount)
>+{
>+    GLsizei adjustedInstanceCount = instanceCount;
>+    const gl::Program *program    = context->getState().getProgram();
>+    if (program->usesMultiview())
>+    {
>+        adjustedInstanceCount *= program->getNumViews();
>+    }
>+
>+    ANGLE_TRY(setDrawArraysState(context, first, count, adjustedInstanceCount));
>+    getFunctions()->drawArraysInstanced(ToGLenum(mode), first, count, adjustedInstanceCount);
>+    return angle::Result::Continue;
>+}
>+
>+angle::Result ContextGL::drawElements(const gl::Context *context,
>+                                      gl::PrimitiveMode mode,
>+                                      GLsizei count,
>+                                      gl::DrawElementsType type,
>+                                      const void *indices)
>+{
>+    const gl::State &glState    = context->getState();
>+    const gl::Program *program  = glState.getProgram();
>+    const bool usesMultiview    = program->usesMultiview();
>+    const GLsizei instanceCount = usesMultiview ? program->getNumViews() : 0;
>+    const void *drawIndexPtr    = nullptr;
>+
>+    ANGLE_TRY(setDrawElementsState(context, count, type, indices, instanceCount, &drawIndexPtr));
>+    if (!usesMultiview)
>+    {
>+        getFunctions()->drawElements(ToGLenum(mode), count, ToGLenum(type), drawIndexPtr);
>+    }
>+    else
>+    {
>+        getFunctions()->drawElementsInstanced(ToGLenum(mode), count, ToGLenum(type), drawIndexPtr,
>+                                              instanceCount);
>+    }
>+    return angle::Result::Continue;
>+}
>+
>+angle::Result ContextGL::drawElementsInstanced(const gl::Context *context,
>+                                               gl::PrimitiveMode mode,
>+                                               GLsizei count,
>+                                               gl::DrawElementsType type,
>+                                               const void *indices,
>+                                               GLsizei instances)
> {
>-    return mRenderer->drawElementsInstanced(context, mode, count, type, indices, instances);
>+    GLsizei adjustedInstanceCount = instances;
>+    const gl::Program *program    = context->getState().getProgram();
>+    if (program->usesMultiview())
>+    {
>+        adjustedInstanceCount *= program->getNumViews();
>+    }
>+    const void *drawIndexPointer = nullptr;
>+
>+    ANGLE_TRY(setDrawElementsState(context, count, type, indices, adjustedInstanceCount,
>+                                   &drawIndexPointer));
>+    getFunctions()->drawElementsInstanced(ToGLenum(mode), count, ToGLenum(type), drawIndexPointer,
>+                                          adjustedInstanceCount);
>+    return angle::Result::Continue;
> }
> 
>-gl::Error ContextGL::drawRangeElements(const gl::Context *context,
>-                                       GLenum mode,
>-                                       GLuint start,
>-                                       GLuint end,
>-                                       GLsizei count,
>-                                       GLenum type,
>-                                       const void *indices)
>+angle::Result ContextGL::drawRangeElements(const gl::Context *context,
>+                                           gl::PrimitiveMode mode,
>+                                           GLuint start,
>+                                           GLuint end,
>+                                           GLsizei count,
>+                                           gl::DrawElementsType type,
>+                                           const void *indices)
> {
>-    return mRenderer->drawRangeElements(context, mode, start, end, count, type, indices);
>+    const gl::Program *program   = context->getState().getProgram();
>+    const bool usesMultiview     = program->usesMultiview();
>+    const GLsizei instanceCount  = usesMultiview ? program->getNumViews() : 0;
>+    const void *drawIndexPointer = nullptr;
>+
>+    ANGLE_TRY(
>+        setDrawElementsState(context, count, type, indices, instanceCount, &drawIndexPointer));
>+    if (!usesMultiview)
>+    {
>+        getFunctions()->drawRangeElements(ToGLenum(mode), start, end, count, ToGLenum(type),
>+                                          drawIndexPointer);
>+    }
>+    else
>+    {
>+        getFunctions()->drawElementsInstanced(ToGLenum(mode), count, ToGLenum(type),
>+                                              drawIndexPointer, instanceCount);
>+    }
>+    return angle::Result::Continue;
> }
> 
>-gl::Error ContextGL::drawArraysIndirect(const gl::Context *context,
>-                                        GLenum mode,
>-                                        const void *indirect)
>+angle::Result ContextGL::drawArraysIndirect(const gl::Context *context,
>+                                            gl::PrimitiveMode mode,
>+                                            const void *indirect)
> {
>-    return mRenderer->drawArraysIndirect(context, mode, indirect);
>+    getFunctions()->drawArraysIndirect(ToGLenum(mode), indirect);
>+    return angle::Result::Continue;
> }
> 
>-gl::Error ContextGL::drawElementsIndirect(const gl::Context *context,
>-                                          GLenum mode,
>-                                          GLenum type,
>-                                          const void *indirect)
>+angle::Result ContextGL::drawElementsIndirect(const gl::Context *context,
>+                                              gl::PrimitiveMode mode,
>+                                              gl::DrawElementsType type,
>+                                              const void *indirect)
> {
>-    return mRenderer->drawElementsIndirect(context, mode, type, indirect);
>+    getFunctions()->drawElementsIndirect(ToGLenum(mode), ToGLenum(type), indirect);
>+    return angle::Result::Continue;
> }
> 
> void ContextGL::stencilFillPath(const gl::Path *path, GLenum fillMode, GLuint mask)
>@@ -311,7 +457,7 @@ void ContextGL::stencilThenCoverStrokePathInstanced(const std::vector<gl::Path *
>                                                    transformType, transformValues);
> }
> 
>-GLenum ContextGL::getResetStatus()
>+gl::GraphicsResetStatus ContextGL::getResetStatus()
> {
>     return mRenderer->getResetStatus();
> }
>@@ -341,9 +487,9 @@ void ContextGL::popGroupMarker()
>     mRenderer->popGroupMarker();
> }
> 
>-void ContextGL::pushDebugGroup(GLenum source, GLuint id, GLsizei length, const char *message)
>+void ContextGL::pushDebugGroup(GLenum source, GLuint id, const std::string &message)
> {
>-    mRenderer->pushDebugGroup(source, id, length, message);
>+    mRenderer->pushDebugGroup(source, id, message);
> }
> 
> void ContextGL::popDebugGroup()
>@@ -351,9 +497,12 @@ void ContextGL::popDebugGroup()
>     mRenderer->popDebugGroup();
> }
> 
>-void ContextGL::syncState(const gl::Context *context, const gl::State::DirtyBits &dirtyBits)
>+angle::Result ContextGL::syncState(const gl::Context *context,
>+                                   const gl::State::DirtyBits &dirtyBits,
>+                                   const gl::State::DirtyBits &bitMask)
> {
>-    mRenderer->getStateManager()->syncState(context, dirtyBits);
>+    mRenderer->getStateManager()->syncState(context, dirtyBits, bitMask);
>+    return angle::Result::Continue;
> }
> 
> GLint ContextGL::getGPUDisjoint()
>@@ -366,13 +515,13 @@ GLint64 ContextGL::getTimestamp()
>     return mRenderer->getTimestamp();
> }
> 
>-void ContextGL::onMakeCurrent(const gl::Context *context)
>+angle::Result ContextGL::onMakeCurrent(const gl::Context *context)
> {
>     // Queries need to be paused/resumed on context switches
>-    ANGLE_SWALLOW_ERR(mRenderer->getStateManager()->onMakeCurrent(context));
>+    return mRenderer->getStateManager()->onMakeCurrent(context);
> }
> 
>-const gl::Caps &ContextGL::getNativeCaps() const
>+gl::Caps ContextGL::getNativeCaps() const
> {
>     return mRenderer->getNativeCaps();
> }
>@@ -397,11 +546,6 @@ void ContextGL::applyNativeWorkarounds(gl::Workarounds *workarounds) const
>     return mRenderer->applyNativeWorkarounds(workarounds);
> }
> 
>-const FunctionsGL *ContextGL::getFunctions() const
>-{
>-    return mRenderer->getFunctions();
>-}
>-
> StateManagerGL *ContextGL::getStateManager()
> {
>     return mRenderer->getStateManager();
>@@ -412,12 +556,41 @@ const WorkaroundsGL &ContextGL::getWorkaroundsGL() const
>     return mRenderer->getWorkarounds();
> }
> 
>-gl::Error ContextGL::dispatchCompute(const gl::Context *context,
>-                                     GLuint numGroupsX,
>-                                     GLuint numGroupsY,
>-                                     GLuint numGroupsZ)
>+BlitGL *ContextGL::getBlitter() const
>+{
>+    return mRenderer->getBlitter();
>+}
>+
>+ClearMultiviewGL *ContextGL::getMultiviewClearer() const
>+{
>+    return mRenderer->getMultiviewClearer();
>+}
>+
>+angle::Result ContextGL::dispatchCompute(const gl::Context *context,
>+                                         GLuint numGroupsX,
>+                                         GLuint numGroupsY,
>+                                         GLuint numGroupsZ)
> {
>     return mRenderer->dispatchCompute(context, numGroupsX, numGroupsY, numGroupsZ);
> }
> 
>+angle::Result ContextGL::dispatchComputeIndirect(const gl::Context *context, GLintptr indirect)
>+{
>+    return mRenderer->dispatchComputeIndirect(context, indirect);
>+}
>+
>+angle::Result ContextGL::memoryBarrier(const gl::Context *context, GLbitfield barriers)
>+{
>+    return mRenderer->memoryBarrier(barriers);
>+}
>+angle::Result ContextGL::memoryBarrierByRegion(const gl::Context *context, GLbitfield barriers)
>+{
>+    return mRenderer->memoryBarrierByRegion(barriers);
>+}
>+
>+void ContextGL::setMaxShaderCompilerThreads(GLuint count)
>+{
>+    mRenderer->setMaxShaderCompilerThreads(count);
>+}
>+
> }  // namespace rx
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/ContextGL.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/ContextGL.h
>index 2cd84d7305e..0b08b3c1f3c 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/ContextGL.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/ContextGL.h
>@@ -11,6 +11,7 @@
> #define LIBANGLE_RENDERER_GL_CONTEXTGL_H_
> 
> #include "libANGLE/renderer/ContextImpl.h"
>+#include "libANGLE/renderer/gl/RendererGL.h"
> 
> namespace sh
> {
>@@ -19,6 +20,8 @@ struct BlockMemberInfo;
> 
> namespace rx
> {
>+class BlitGL;
>+class ClearMultiviewGL;
> class FunctionsGL;
> class RendererGL;
> class StateManagerGL;
>@@ -27,10 +30,12 @@ struct WorkaroundsGL;
> class ContextGL : public ContextImpl
> {
>   public:
>-    ContextGL(const gl::ContextState &state, RendererGL *renderer);
>+    ContextGL(const gl::State &state,
>+              gl::ErrorSet *errorSet,
>+              const std::shared_ptr<RendererGL> &renderer);
>     ~ContextGL() override;
> 
>-    gl::Error initialize() override;
>+    angle::Result initialize() override;
> 
>     // Shader creation
>     CompilerImpl *createCompiler() override;
>@@ -44,7 +49,7 @@ class ContextGL : public ContextImpl
>     TextureImpl *createTexture(const gl::TextureState &state) override;
> 
>     // Renderbuffer creation
>-    RenderbufferImpl *createRenderbuffer() override;
>+    RenderbufferImpl *createRenderbuffer(const gl::RenderbufferState &state) override;
> 
>     // Buffer creation
>     BufferImpl *createBuffer(const gl::BufferState &state) override;
>@@ -53,7 +58,7 @@ class ContextGL : public ContextImpl
>     VertexArrayImpl *createVertexArray(const gl::VertexArrayState &data) override;
> 
>     // Query and Fence creation
>-    QueryImpl *createQuery(GLenum type) override;
>+    QueryImpl *createQuery(gl::QueryType type) override;
>     FenceNVImpl *createFenceNV() override;
>     SyncImpl *createSync() override;
> 
>@@ -70,46 +75,49 @@ class ContextGL : public ContextImpl
>     // Path object creation
>     std::vector<PathImpl *> createPaths(GLsizei range) override;
> 
>+    // Memory object creation.
>+    MemoryObjectImpl *createMemoryObject() override;
>+
>     // Flush and finish.
>-    gl::Error flush(const gl::Context *context) override;
>-    gl::Error finish(const gl::Context *context) override;
>+    angle::Result flush(const gl::Context *context) override;
>+    angle::Result finish(const gl::Context *context) override;
> 
>     // Drawing methods.
>-    gl::Error drawArrays(const gl::Context *context,
>-                         GLenum mode,
>-                         GLint first,
>-                         GLsizei count) override;
>-    gl::Error drawArraysInstanced(const gl::Context *context,
>-                                  GLenum mode,
>-                                  GLint first,
>-                                  GLsizei count,
>-                                  GLsizei instanceCount) override;
>-
>-    gl::Error drawElements(const gl::Context *context,
>-                           GLenum mode,
>-                           GLsizei count,
>-                           GLenum type,
>-                           const void *indices) override;
>-    gl::Error drawElementsInstanced(const gl::Context *context,
>-                                    GLenum mode,
>+    angle::Result drawArrays(const gl::Context *context,
>+                             gl::PrimitiveMode mode,
>+                             GLint first,
>+                             GLsizei count) override;
>+    angle::Result drawArraysInstanced(const gl::Context *context,
>+                                      gl::PrimitiveMode mode,
>+                                      GLint first,
>+                                      GLsizei count,
>+                                      GLsizei instanceCount) override;
>+
>+    angle::Result drawElements(const gl::Context *context,
>+                               gl::PrimitiveMode mode,
>+                               GLsizei count,
>+                               gl::DrawElementsType type,
>+                               const void *indices) override;
>+    angle::Result drawElementsInstanced(const gl::Context *context,
>+                                        gl::PrimitiveMode mode,
>+                                        GLsizei count,
>+                                        gl::DrawElementsType type,
>+                                        const void *indices,
>+                                        GLsizei instances) override;
>+    angle::Result drawRangeElements(const gl::Context *context,
>+                                    gl::PrimitiveMode mode,
>+                                    GLuint start,
>+                                    GLuint end,
>                                     GLsizei count,
>-                                    GLenum type,
>-                                    const void *indices,
>-                                    GLsizei instances) override;
>-    gl::Error drawRangeElements(const gl::Context *context,
>-                                GLenum mode,
>-                                GLuint start,
>-                                GLuint end,
>-                                GLsizei count,
>-                                GLenum type,
>-                                const void *indices) override;
>-    gl::Error drawArraysIndirect(const gl::Context *context,
>-                                 GLenum mode,
>-                                 const void *indirect) override;
>-    gl::Error drawElementsIndirect(const gl::Context *context,
>-                                   GLenum mode,
>-                                   GLenum type,
>-                                   const void *indirect) override;
>+                                    gl::DrawElementsType type,
>+                                    const void *indices) override;
>+    angle::Result drawArraysIndirect(const gl::Context *context,
>+                                     gl::PrimitiveMode mode,
>+                                     const void *indirect) override;
>+    angle::Result drawElementsIndirect(const gl::Context *context,
>+                                       gl::PrimitiveMode mode,
>+                                       gl::DrawElementsType type,
>+                                       const void *indirect) override;
> 
>     // CHROMIUM_path_rendering implementation
>     void stencilFillPath(const gl::Path *path, GLenum fillMode, GLuint mask) override;
>@@ -156,7 +164,7 @@ class ContextGL : public ContextImpl
>                                              const GLfloat *transformValues) override;
> 
>     // Device loss
>-    GLenum getResetStatus() override;
>+    gl::GraphicsResetStatus getResetStatus() override;
> 
>     // Vendor and description strings.
>     std::string getVendorString() const override;
>@@ -168,21 +176,23 @@ class ContextGL : public ContextImpl
>     void popGroupMarker() override;
> 
>     // KHR_debug
>-    void pushDebugGroup(GLenum source, GLuint id, GLsizei length, const char *message) override;
>+    void pushDebugGroup(GLenum source, GLuint id, const std::string &message) override;
>     void popDebugGroup() override;
> 
>     // State sync with dirty bits.
>-    void syncState(const gl::Context *context, const gl::State::DirtyBits &dirtyBits) override;
>+    angle::Result syncState(const gl::Context *context,
>+                            const gl::State::DirtyBits &dirtyBits,
>+                            const gl::State::DirtyBits &bitMask) override;
> 
>     // Disjoint timer queries
>     GLint getGPUDisjoint() override;
>     GLint64 getTimestamp() override;
> 
>     // Context switching
>-    void onMakeCurrent(const gl::Context *context) override;
>+    angle::Result onMakeCurrent(const gl::Context *context) override;
> 
>     // Caps queries
>-    const gl::Caps &getNativeCaps() const override;
>+    gl::Caps getNativeCaps() const override;
>     const gl::TextureCapsMap &getNativeTextureCaps() const override;
>     const gl::Extensions &getNativeExtensions() const override;
>     const gl::Limitations &getNativeLimitations() const override;
>@@ -190,17 +200,39 @@ class ContextGL : public ContextImpl
>     void applyNativeWorkarounds(gl::Workarounds *workarounds) const override;
> 
>     // Handle helpers
>-    const FunctionsGL *getFunctions() const;
>+    ANGLE_INLINE const FunctionsGL *getFunctions() const { return mRenderer->getFunctions(); }
>+
>     StateManagerGL *getStateManager();
>     const WorkaroundsGL &getWorkaroundsGL() const;
>+    BlitGL *getBlitter() const;
>+    ClearMultiviewGL *getMultiviewClearer() const;
>+
>+    angle::Result dispatchCompute(const gl::Context *context,
>+                                  GLuint numGroupsX,
>+                                  GLuint numGroupsY,
>+                                  GLuint numGroupsZ) override;
>+    angle::Result dispatchComputeIndirect(const gl::Context *context, GLintptr indirect) override;
>+
>+    angle::Result memoryBarrier(const gl::Context *context, GLbitfield barriers) override;
>+    angle::Result memoryBarrierByRegion(const gl::Context *context, GLbitfield barriers) override;
> 
>-    gl::Error dispatchCompute(const gl::Context *context,
>-                              GLuint numGroupsX,
>-                              GLuint numGroupsY,
>-                              GLuint numGroupsZ) override;
>+    void setMaxShaderCompilerThreads(GLuint count) override;
> 
>   private:
>-    RendererGL *mRenderer;
>+    angle::Result setDrawArraysState(const gl::Context *context,
>+                                     GLint first,
>+                                     GLsizei count,
>+                                     GLsizei instanceCount);
>+
>+    angle::Result setDrawElementsState(const gl::Context *context,
>+                                       GLsizei count,
>+                                       gl::DrawElementsType type,
>+                                       const void *indices,
>+                                       GLsizei instanceCount,
>+                                       const void **outIndices);
>+
>+  protected:
>+    std::shared_ptr<RendererGL> mRenderer;
> };
> 
> }  // namespace rx
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/DispatchTableGL_autogen.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/DispatchTableGL_autogen.cpp
>index 2c71f7fdc5e..3d9161d45a6 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/DispatchTableGL_autogen.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/DispatchTableGL_autogen.cpp
>@@ -1,7 +1,7 @@
> // GENERATED FILE - DO NOT EDIT.
> // Generated by generate_gl_dispatch_table.py using data from gl_bindings_data.json and gl.xml.
> //
>-// Copyright 2017 The ANGLE Project Authors. All rights reserved.
>+// Copyright 2019 The ANGLE Project Authors. All rights reserved.
> // Use of this source code is governed by a BSD-style license that can be
> // found in the LICENSE file.
> //
>@@ -14,7 +14,7 @@
> #include "libANGLE/renderer/gl/FunctionsGL.h"
> 
> #if defined(ANGLE_ENABLE_OPENGL_NULL)
>-#include "libANGLE/renderer/gl/null_functions.h"
>+#    include "libANGLE/renderer/gl/null_functions.h"
> #endif  // defined(ANGLE_ENABLE_OPENGL_NULL)
> 
> // Check for nullptr so extensions do not overwrite core imports.
>@@ -24,6 +24,7 @@
> 
> namespace rx
> {
>+DispatchTableGL::DispatchTableGL() = default;
> 
> void DispatchTableGL::initProcsDesktopGL(const gl::Version &version,
>                                          const std::set<std::string> &extensions)
>@@ -1127,6 +1128,11 @@ void DispatchTableGL::initProcsDesktopGL(const gl::Version &version,
>         ASSIGN("glIsQueryARB", isQuery);
>     }
> 
>+    if (extensions.count("GL_ARB_parallel_shader_compile") != 0)
>+    {
>+        ASSIGN("glMaxShaderCompilerThreadsARB", maxShaderCompilerThreadsARB);
>+    }
>+
>     if (extensions.count("GL_ARB_point_parameters") != 0)
>     {
>         ASSIGN("glPointParameterfARB", pointParameterf);
>@@ -1193,6 +1199,7 @@ void DispatchTableGL::initProcsDesktopGL(const gl::Version &version,
>         ASSIGN("glGetProgramPipelineInfoLog", getProgramPipelineInfoLog);
>         ASSIGN("glGetProgramPipelineiv", getProgramPipelineiv);
>         ASSIGN("glIsProgramPipeline", isProgramPipeline);
>+        ASSIGN("glProgramParameteri", programParameteri);
>         ASSIGN("glProgramUniform1d", programUniform1d);
>         ASSIGN("glProgramUniform1dv", programUniform1dv);
>         ASSIGN("glProgramUniform1f", programUniform1f);
>@@ -2313,6 +2320,11 @@ void DispatchTableGL::initProcsGLES(const gl::Version &version,
>         ASSIGN("glClearTexSubImageEXT", clearTexSubImage);
>     }
> 
>+    if (extensions.count("GL_EXT_clip_control") != 0)
>+    {
>+        ASSIGN("glClipControlEXT", clipControl);
>+    }
>+
>     if (extensions.count("GL_EXT_copy_image") != 0)
>     {
>         ASSIGN("glCopyImageSubDataEXT", copyImageSubData);
>@@ -2515,7 +2527,7 @@ void DispatchTableGL::initProcsGLES(const gl::Version &version,
>         ASSIGN("glDrawElementsBaseVertexOES", drawElementsBaseVertex);
>         ASSIGN("glDrawElementsInstancedBaseVertexOES", drawElementsInstancedBaseVertex);
>         ASSIGN("glDrawRangeElementsBaseVertexOES", drawRangeElementsBaseVertex);
>-        ASSIGN("glMultiDrawElementsBaseVertexOES", multiDrawElementsBaseVertex);
>+        ASSIGN("glMultiDrawElementsBaseVertexEXT", multiDrawElementsBaseVertex);
>     }
> 
>     if (extensions.count("GL_OES_geometry_shader") != 0)
>@@ -2692,6 +2704,11 @@ void DispatchTableGL::initProcsSharedExtensions(const std::set<std::string> &ext
>         ASSIGN("glValidateProgramPipelineEXT", validateProgramPipeline);
>     }
> 
>+    if (extensions.count("GL_KHR_parallel_shader_compile") != 0)
>+    {
>+        ASSIGN("glMaxShaderCompilerThreadsKHR", maxShaderCompilerThreadsKHR);
>+    }
>+
>     if (extensions.count("GL_NV_fence") != 0)
>     {
>         ASSIGN("glDeleteFencesNV", deleteFencesNV);
>@@ -2739,6 +2756,11 @@ void DispatchTableGL::initProcsSharedExtensions(const std::set<std::string> &ext
>         ASSIGN("glStencilThenCoverStrokePathInstancedNV", stencilThenCoverStrokePathInstancedNV);
>         ASSIGN("glStencilThenCoverStrokePathNV", stencilThenCoverStrokePathNV);
>     }
>+
>+    if (extensions.count("GL_OVR_multiview") != 0)
>+    {
>+        ASSIGN("glFramebufferTextureMultiviewOVR", framebufferTextureMultiviewOVR);
>+    }
> }
> 
> #if defined(ANGLE_ENABLE_OPENGL_NULL)
>@@ -3842,6 +3864,11 @@ void DispatchTableGL::initProcsDesktopGLNULL(const gl::Version &version,
>         isQuery           = &glIsQueryNULL;
>     }
> 
>+    if (extensions.count("GL_ARB_parallel_shader_compile") != 0)
>+    {
>+        maxShaderCompilerThreadsARB = &glMaxShaderCompilerThreadsARBNULL;
>+    }
>+
>     if (extensions.count("GL_ARB_point_parameters") != 0)
>     {
>         pointParameterf  = &glPointParameterfNULL;
>@@ -3908,6 +3935,7 @@ void DispatchTableGL::initProcsDesktopGLNULL(const gl::Version &version,
>         getProgramPipelineInfoLog = &glGetProgramPipelineInfoLogNULL;
>         getProgramPipelineiv      = &glGetProgramPipelineivNULL;
>         isProgramPipeline         = &glIsProgramPipelineNULL;
>+        programParameteri         = &glProgramParameteriNULL;
>         programUniform1d          = &glProgramUniform1dNULL;
>         programUniform1dv         = &glProgramUniform1dvNULL;
>         programUniform1f          = &glProgramUniform1fNULL;
>@@ -5027,6 +5055,11 @@ void DispatchTableGL::initProcsGLESNULL(const gl::Version &version,
>         clearTexSubImage = &glClearTexSubImageNULL;
>     }
> 
>+    if (extensions.count("GL_EXT_clip_control") != 0)
>+    {
>+        clipControl = &glClipControlNULL;
>+    }
>+
>     if (extensions.count("GL_EXT_copy_image") != 0)
>     {
>         copyImageSubData = &glCopyImageSubDataNULL;
>@@ -5406,6 +5439,11 @@ void DispatchTableGL::initProcsSharedExtensionsNULL(const std::set<std::string>
>         validateProgramPipeline   = &glValidateProgramPipelineNULL;
>     }
> 
>+    if (extensions.count("GL_KHR_parallel_shader_compile") != 0)
>+    {
>+        maxShaderCompilerThreadsKHR = &glMaxShaderCompilerThreadsKHRNULL;
>+    }
>+
>     if (extensions.count("GL_NV_fence") != 0)
>     {
>         deleteFencesNV = &glDeleteFencesNVNULL;
>@@ -5453,6 +5491,11 @@ void DispatchTableGL::initProcsSharedExtensionsNULL(const std::set<std::string>
>         stencilThenCoverStrokePathInstancedNV = &glStencilThenCoverStrokePathInstancedNVNULL;
>         stencilThenCoverStrokePathNV          = &glStencilThenCoverStrokePathNVNULL;
>     }
>+
>+    if (extensions.count("GL_OVR_multiview") != 0)
>+    {
>+        framebufferTextureMultiviewOVR = &glFramebufferTextureMultiviewOVRNULL;
>+    }
> }
> #endif  // defined(ANGLE_ENABLE_OPENGL_NULL)
> 
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/DispatchTableGL_autogen.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/DispatchTableGL_autogen.h
>index 1f0930963f4..f6f044a9eb3 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/DispatchTableGL_autogen.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/DispatchTableGL_autogen.h
>@@ -1,7 +1,7 @@
> // GENERATED FILE - DO NOT EDIT.
> // Generated by generate_gl_dispatch_table.py using data from gl_bindings_data.json and gl.xml.
> //
>-// Copyright 2017 The ANGLE Project Authors. All rights reserved.
>+// Copyright 2019 The ANGLE Project Authors. All rights reserved.
> // Use of this source code is governed by a BSD-style license that can be
> // found in the LICENSE file.
> //
>@@ -26,223 +26,224 @@ namespace rx
> class DispatchTableGL : angle::NonCopyable
> {
>   public:
>+    // clang-format off
>     // 1.0
>-    PFNGLBLENDFUNCPROC blendFunc                           = nullptr;
>-    PFNGLCLEARPROC clear                                   = nullptr;
>-    PFNGLCLEARCOLORPROC clearColor                         = nullptr;
>-    PFNGLCLEARDEPTHPROC clearDepth                         = nullptr;
>-    PFNGLCLEARSTENCILPROC clearStencil                     = nullptr;
>-    PFNGLCOLORMASKPROC colorMask                           = nullptr;
>-    PFNGLCULLFACEPROC cullFace                             = nullptr;
>-    PFNGLDEPTHFUNCPROC depthFunc                           = nullptr;
>-    PFNGLDEPTHMASKPROC depthMask                           = nullptr;
>-    PFNGLDEPTHRANGEPROC depthRange                         = nullptr;
>-    PFNGLDISABLEPROC disable                               = nullptr;
>-    PFNGLDRAWBUFFERPROC drawBuffer                         = nullptr;
>-    PFNGLENABLEPROC enable                                 = nullptr;
>-    PFNGLFINISHPROC finish                                 = nullptr;
>-    PFNGLFLUSHPROC flush                                   = nullptr;
>-    PFNGLFRONTFACEPROC frontFace                           = nullptr;
>-    PFNGLGETBOOLEANVPROC getBooleanv                       = nullptr;
>-    PFNGLGETDOUBLEVPROC getDoublev                         = nullptr;
>-    PFNGLGETERRORPROC getError                             = nullptr;
>-    PFNGLGETFLOATVPROC getFloatv                           = nullptr;
>-    PFNGLGETINTEGERVPROC getIntegerv                       = nullptr;
>-    PFNGLGETSTRINGPROC getString                           = nullptr;
>-    PFNGLGETTEXIMAGEPROC getTexImage                       = nullptr;
>+    PFNGLBLENDFUNCPROC blendFunc = nullptr;
>+    PFNGLCLEARPROC clear = nullptr;
>+    PFNGLCLEARCOLORPROC clearColor = nullptr;
>+    PFNGLCLEARDEPTHPROC clearDepth = nullptr;
>+    PFNGLCLEARSTENCILPROC clearStencil = nullptr;
>+    PFNGLCOLORMASKPROC colorMask = nullptr;
>+    PFNGLCULLFACEPROC cullFace = nullptr;
>+    PFNGLDEPTHFUNCPROC depthFunc = nullptr;
>+    PFNGLDEPTHMASKPROC depthMask = nullptr;
>+    PFNGLDEPTHRANGEPROC depthRange = nullptr;
>+    PFNGLDISABLEPROC disable = nullptr;
>+    PFNGLDRAWBUFFERPROC drawBuffer = nullptr;
>+    PFNGLENABLEPROC enable = nullptr;
>+    PFNGLFINISHPROC finish = nullptr;
>+    PFNGLFLUSHPROC flush = nullptr;
>+    PFNGLFRONTFACEPROC frontFace = nullptr;
>+    PFNGLGETBOOLEANVPROC getBooleanv = nullptr;
>+    PFNGLGETDOUBLEVPROC getDoublev = nullptr;
>+    PFNGLGETERRORPROC getError = nullptr;
>+    PFNGLGETFLOATVPROC getFloatv = nullptr;
>+    PFNGLGETINTEGERVPROC getIntegerv = nullptr;
>+    PFNGLGETSTRINGPROC getString = nullptr;
>+    PFNGLGETTEXIMAGEPROC getTexImage = nullptr;
>     PFNGLGETTEXLEVELPARAMETERFVPROC getTexLevelParameterfv = nullptr;
>     PFNGLGETTEXLEVELPARAMETERIVPROC getTexLevelParameteriv = nullptr;
>-    PFNGLGETTEXPARAMETERFVPROC getTexParameterfv           = nullptr;
>-    PFNGLGETTEXPARAMETERIVPROC getTexParameteriv           = nullptr;
>-    PFNGLHINTPROC hint                                     = nullptr;
>-    PFNGLISENABLEDPROC isEnabled                           = nullptr;
>-    PFNGLLINEWIDTHPROC lineWidth                           = nullptr;
>-    PFNGLLOGICOPPROC logicOp                               = nullptr;
>-    PFNGLPIXELSTOREFPROC pixelStoref                       = nullptr;
>-    PFNGLPIXELSTOREIPROC pixelStorei                       = nullptr;
>-    PFNGLPOINTSIZEPROC pointSize                           = nullptr;
>-    PFNGLPOLYGONMODEPROC polygonMode                       = nullptr;
>-    PFNGLREADBUFFERPROC readBuffer                         = nullptr;
>-    PFNGLREADPIXELSPROC readPixels                         = nullptr;
>-    PFNGLSCISSORPROC scissor                               = nullptr;
>-    PFNGLSTENCILFUNCPROC stencilFunc                       = nullptr;
>-    PFNGLSTENCILMASKPROC stencilMask                       = nullptr;
>-    PFNGLSTENCILOPPROC stencilOp                           = nullptr;
>-    PFNGLTEXIMAGE1DPROC texImage1D                         = nullptr;
>-    PFNGLTEXIMAGE2DPROC texImage2D                         = nullptr;
>-    PFNGLTEXPARAMETERFPROC texParameterf                   = nullptr;
>-    PFNGLTEXPARAMETERFVPROC texParameterfv                 = nullptr;
>-    PFNGLTEXPARAMETERIPROC texParameteri                   = nullptr;
>-    PFNGLTEXPARAMETERIVPROC texParameteriv                 = nullptr;
>-    PFNGLVIEWPORTPROC viewport                             = nullptr;
>+    PFNGLGETTEXPARAMETERFVPROC getTexParameterfv = nullptr;
>+    PFNGLGETTEXPARAMETERIVPROC getTexParameteriv = nullptr;
>+    PFNGLHINTPROC hint = nullptr;
>+    PFNGLISENABLEDPROC isEnabled = nullptr;
>+    PFNGLLINEWIDTHPROC lineWidth = nullptr;
>+    PFNGLLOGICOPPROC logicOp = nullptr;
>+    PFNGLPIXELSTOREFPROC pixelStoref = nullptr;
>+    PFNGLPIXELSTOREIPROC pixelStorei = nullptr;
>+    PFNGLPOINTSIZEPROC pointSize = nullptr;
>+    PFNGLPOLYGONMODEPROC polygonMode = nullptr;
>+    PFNGLREADBUFFERPROC readBuffer = nullptr;
>+    PFNGLREADPIXELSPROC readPixels = nullptr;
>+    PFNGLSCISSORPROC scissor = nullptr;
>+    PFNGLSTENCILFUNCPROC stencilFunc = nullptr;
>+    PFNGLSTENCILMASKPROC stencilMask = nullptr;
>+    PFNGLSTENCILOPPROC stencilOp = nullptr;
>+    PFNGLTEXIMAGE1DPROC texImage1D = nullptr;
>+    PFNGLTEXIMAGE2DPROC texImage2D = nullptr;
>+    PFNGLTEXPARAMETERFPROC texParameterf = nullptr;
>+    PFNGLTEXPARAMETERFVPROC texParameterfv = nullptr;
>+    PFNGLTEXPARAMETERIPROC texParameteri = nullptr;
>+    PFNGLTEXPARAMETERIVPROC texParameteriv = nullptr;
>+    PFNGLVIEWPORTPROC viewport = nullptr;
> 
>     // 1.1
>-    PFNGLBINDTEXTUREPROC bindTexture             = nullptr;
>-    PFNGLCOPYTEXIMAGE1DPROC copyTexImage1D       = nullptr;
>-    PFNGLCOPYTEXIMAGE2DPROC copyTexImage2D       = nullptr;
>+    PFNGLBINDTEXTUREPROC bindTexture = nullptr;
>+    PFNGLCOPYTEXIMAGE1DPROC copyTexImage1D = nullptr;
>+    PFNGLCOPYTEXIMAGE2DPROC copyTexImage2D = nullptr;
>     PFNGLCOPYTEXSUBIMAGE1DPROC copyTexSubImage1D = nullptr;
>     PFNGLCOPYTEXSUBIMAGE2DPROC copyTexSubImage2D = nullptr;
>-    PFNGLDELETETEXTURESPROC deleteTextures       = nullptr;
>-    PFNGLDRAWARRAYSPROC drawArrays               = nullptr;
>-    PFNGLDRAWELEMENTSPROC drawElements           = nullptr;
>-    PFNGLGENTEXTURESPROC genTextures             = nullptr;
>-    PFNGLISTEXTUREPROC isTexture                 = nullptr;
>-    PFNGLPOLYGONOFFSETPROC polygonOffset         = nullptr;
>-    PFNGLTEXSUBIMAGE1DPROC texSubImage1D         = nullptr;
>-    PFNGLTEXSUBIMAGE2DPROC texSubImage2D         = nullptr;
>+    PFNGLDELETETEXTURESPROC deleteTextures = nullptr;
>+    PFNGLDRAWARRAYSPROC drawArrays = nullptr;
>+    PFNGLDRAWELEMENTSPROC drawElements = nullptr;
>+    PFNGLGENTEXTURESPROC genTextures = nullptr;
>+    PFNGLISTEXTUREPROC isTexture = nullptr;
>+    PFNGLPOLYGONOFFSETPROC polygonOffset = nullptr;
>+    PFNGLTEXSUBIMAGE1DPROC texSubImage1D = nullptr;
>+    PFNGLTEXSUBIMAGE2DPROC texSubImage2D = nullptr;
> 
>     // 1.2
>-    PFNGLBLENDCOLORPROC blendColor               = nullptr;
>-    PFNGLBLENDEQUATIONPROC blendEquation         = nullptr;
>+    PFNGLBLENDCOLORPROC blendColor = nullptr;
>+    PFNGLBLENDEQUATIONPROC blendEquation = nullptr;
>     PFNGLCOPYTEXSUBIMAGE3DPROC copyTexSubImage3D = nullptr;
>     PFNGLDRAWRANGEELEMENTSPROC drawRangeElements = nullptr;
>-    PFNGLTEXIMAGE3DPROC texImage3D               = nullptr;
>-    PFNGLTEXSUBIMAGE3DPROC texSubImage3D         = nullptr;
>+    PFNGLTEXIMAGE3DPROC texImage3D = nullptr;
>+    PFNGLTEXSUBIMAGE3DPROC texSubImage3D = nullptr;
> 
>     // 1.2 Extensions
>     PFNGLDELETEFENCESNVPROC deleteFencesNV = nullptr;
>-    PFNGLFINISHFENCENVPROC finishFenceNV   = nullptr;
>-    PFNGLGENFENCESNVPROC genFencesNV       = nullptr;
>-    PFNGLGETFENCEIVNVPROC getFenceivNV     = nullptr;
>-    PFNGLISFENCENVPROC isFenceNV           = nullptr;
>-    PFNGLSETFENCENVPROC setFenceNV         = nullptr;
>-    PFNGLTESTFENCENVPROC testFenceNV       = nullptr;
>+    PFNGLFINISHFENCENVPROC finishFenceNV = nullptr;
>+    PFNGLGENFENCESNVPROC genFencesNV = nullptr;
>+    PFNGLGETFENCEIVNVPROC getFenceivNV = nullptr;
>+    PFNGLISFENCENVPROC isFenceNV = nullptr;
>+    PFNGLSETFENCENVPROC setFenceNV = nullptr;
>+    PFNGLTESTFENCENVPROC testFenceNV = nullptr;
> 
>     // 1.3
>-    PFNGLACTIVETEXTUREPROC activeTexture                     = nullptr;
>-    PFNGLCOMPRESSEDTEXIMAGE1DPROC compressedTexImage1D       = nullptr;
>-    PFNGLCOMPRESSEDTEXIMAGE2DPROC compressedTexImage2D       = nullptr;
>-    PFNGLCOMPRESSEDTEXIMAGE3DPROC compressedTexImage3D       = nullptr;
>+    PFNGLACTIVETEXTUREPROC activeTexture = nullptr;
>+    PFNGLCOMPRESSEDTEXIMAGE1DPROC compressedTexImage1D = nullptr;
>+    PFNGLCOMPRESSEDTEXIMAGE2DPROC compressedTexImage2D = nullptr;
>+    PFNGLCOMPRESSEDTEXIMAGE3DPROC compressedTexImage3D = nullptr;
>     PFNGLCOMPRESSEDTEXSUBIMAGE1DPROC compressedTexSubImage1D = nullptr;
>     PFNGLCOMPRESSEDTEXSUBIMAGE2DPROC compressedTexSubImage2D = nullptr;
>     PFNGLCOMPRESSEDTEXSUBIMAGE3DPROC compressedTexSubImage3D = nullptr;
>-    PFNGLGETCOMPRESSEDTEXIMAGEPROC getCompressedTexImage     = nullptr;
>-    PFNGLSAMPLECOVERAGEPROC sampleCoverage                   = nullptr;
>+    PFNGLGETCOMPRESSEDTEXIMAGEPROC getCompressedTexImage = nullptr;
>+    PFNGLSAMPLECOVERAGEPROC sampleCoverage = nullptr;
> 
>     // 1.4
>     PFNGLBLENDFUNCSEPARATEPROC blendFuncSeparate = nullptr;
>-    PFNGLMULTIDRAWARRAYSPROC multiDrawArrays     = nullptr;
>+    PFNGLMULTIDRAWARRAYSPROC multiDrawArrays = nullptr;
>     PFNGLMULTIDRAWELEMENTSPROC multiDrawElements = nullptr;
>-    PFNGLPOINTPARAMETERFPROC pointParameterf     = nullptr;
>-    PFNGLPOINTPARAMETERFVPROC pointParameterfv   = nullptr;
>-    PFNGLPOINTPARAMETERIPROC pointParameteri     = nullptr;
>-    PFNGLPOINTPARAMETERIVPROC pointParameteriv   = nullptr;
>+    PFNGLPOINTPARAMETERFPROC pointParameterf = nullptr;
>+    PFNGLPOINTPARAMETERFVPROC pointParameterfv = nullptr;
>+    PFNGLPOINTPARAMETERIPROC pointParameteri = nullptr;
>+    PFNGLPOINTPARAMETERIVPROC pointParameteriv = nullptr;
> 
>     // 1.5
>-    PFNGLBEGINQUERYPROC beginQuery                     = nullptr;
>-    PFNGLBINDBUFFERPROC bindBuffer                     = nullptr;
>-    PFNGLBUFFERDATAPROC bufferData                     = nullptr;
>-    PFNGLBUFFERSUBDATAPROC bufferSubData               = nullptr;
>-    PFNGLDELETEBUFFERSPROC deleteBuffers               = nullptr;
>-    PFNGLDELETEQUERIESPROC deleteQueries               = nullptr;
>-    PFNGLENDQUERYPROC endQuery                         = nullptr;
>-    PFNGLGENBUFFERSPROC genBuffers                     = nullptr;
>-    PFNGLGENQUERIESPROC genQueries                     = nullptr;
>+    PFNGLBEGINQUERYPROC beginQuery = nullptr;
>+    PFNGLBINDBUFFERPROC bindBuffer = nullptr;
>+    PFNGLBUFFERDATAPROC bufferData = nullptr;
>+    PFNGLBUFFERSUBDATAPROC bufferSubData = nullptr;
>+    PFNGLDELETEBUFFERSPROC deleteBuffers = nullptr;
>+    PFNGLDELETEQUERIESPROC deleteQueries = nullptr;
>+    PFNGLENDQUERYPROC endQuery = nullptr;
>+    PFNGLGENBUFFERSPROC genBuffers = nullptr;
>+    PFNGLGENQUERIESPROC genQueries = nullptr;
>     PFNGLGETBUFFERPARAMETERIVPROC getBufferParameteriv = nullptr;
>-    PFNGLGETBUFFERPOINTERVPROC getBufferPointerv       = nullptr;
>-    PFNGLGETBUFFERSUBDATAPROC getBufferSubData         = nullptr;
>-    PFNGLGETQUERYOBJECTIVPROC getQueryObjectiv         = nullptr;
>-    PFNGLGETQUERYOBJECTUIVPROC getQueryObjectuiv       = nullptr;
>-    PFNGLGETQUERYIVPROC getQueryiv                     = nullptr;
>-    PFNGLISBUFFERPROC isBuffer                         = nullptr;
>-    PFNGLISQUERYPROC isQuery                           = nullptr;
>-    PFNGLMAPBUFFERPROC mapBuffer                       = nullptr;
>-    PFNGLUNMAPBUFFERPROC unmapBuffer                   = nullptr;
>+    PFNGLGETBUFFERPOINTERVPROC getBufferPointerv = nullptr;
>+    PFNGLGETBUFFERSUBDATAPROC getBufferSubData = nullptr;
>+    PFNGLGETQUERYOBJECTIVPROC getQueryObjectiv = nullptr;
>+    PFNGLGETQUERYOBJECTUIVPROC getQueryObjectuiv = nullptr;
>+    PFNGLGETQUERYIVPROC getQueryiv = nullptr;
>+    PFNGLISBUFFERPROC isBuffer = nullptr;
>+    PFNGLISQUERYPROC isQuery = nullptr;
>+    PFNGLMAPBUFFERPROC mapBuffer = nullptr;
>+    PFNGLUNMAPBUFFERPROC unmapBuffer = nullptr;
> 
>     // 2.0
>-    PFNGLATTACHSHADERPROC attachShader                         = nullptr;
>-    PFNGLBINDATTRIBLOCATIONPROC bindAttribLocation             = nullptr;
>-    PFNGLBLENDEQUATIONSEPARATEPROC blendEquationSeparate       = nullptr;
>-    PFNGLCOMPILESHADERPROC compileShader                       = nullptr;
>-    PFNGLCREATEPROGRAMPROC createProgram                       = nullptr;
>-    PFNGLCREATESHADERPROC createShader                         = nullptr;
>-    PFNGLDELETEPROGRAMPROC deleteProgram                       = nullptr;
>-    PFNGLDELETESHADERPROC deleteShader                         = nullptr;
>-    PFNGLDETACHSHADERPROC detachShader                         = nullptr;
>+    PFNGLATTACHSHADERPROC attachShader = nullptr;
>+    PFNGLBINDATTRIBLOCATIONPROC bindAttribLocation = nullptr;
>+    PFNGLBLENDEQUATIONSEPARATEPROC blendEquationSeparate = nullptr;
>+    PFNGLCOMPILESHADERPROC compileShader = nullptr;
>+    PFNGLCREATEPROGRAMPROC createProgram = nullptr;
>+    PFNGLCREATESHADERPROC createShader = nullptr;
>+    PFNGLDELETEPROGRAMPROC deleteProgram = nullptr;
>+    PFNGLDELETESHADERPROC deleteShader = nullptr;
>+    PFNGLDETACHSHADERPROC detachShader = nullptr;
>     PFNGLDISABLEVERTEXATTRIBARRAYPROC disableVertexAttribArray = nullptr;
>-    PFNGLDRAWBUFFERSPROC drawBuffers                           = nullptr;
>-    PFNGLENABLEVERTEXATTRIBARRAYPROC enableVertexAttribArray   = nullptr;
>-    PFNGLGETACTIVEATTRIBPROC getActiveAttrib                   = nullptr;
>-    PFNGLGETACTIVEUNIFORMPROC getActiveUniform                 = nullptr;
>-    PFNGLGETATTACHEDSHADERSPROC getAttachedShaders             = nullptr;
>-    PFNGLGETATTRIBLOCATIONPROC getAttribLocation               = nullptr;
>-    PFNGLGETPROGRAMINFOLOGPROC getProgramInfoLog               = nullptr;
>-    PFNGLGETPROGRAMIVPROC getProgramiv                         = nullptr;
>-    PFNGLGETSHADERINFOLOGPROC getShaderInfoLog                 = nullptr;
>-    PFNGLGETSHADERSOURCEPROC getShaderSource                   = nullptr;
>-    PFNGLGETSHADERIVPROC getShaderiv                           = nullptr;
>-    PFNGLGETUNIFORMLOCATIONPROC getUniformLocation             = nullptr;
>-    PFNGLGETUNIFORMFVPROC getUniformfv                         = nullptr;
>-    PFNGLGETUNIFORMIVPROC getUniformiv                         = nullptr;
>-    PFNGLGETVERTEXATTRIBPOINTERVPROC getVertexAttribPointerv   = nullptr;
>-    PFNGLGETVERTEXATTRIBDVPROC getVertexAttribdv               = nullptr;
>-    PFNGLGETVERTEXATTRIBFVPROC getVertexAttribfv               = nullptr;
>-    PFNGLGETVERTEXATTRIBIVPROC getVertexAttribiv               = nullptr;
>-    PFNGLISPROGRAMPROC isProgram                               = nullptr;
>-    PFNGLISSHADERPROC isShader                                 = nullptr;
>-    PFNGLLINKPROGRAMPROC linkProgram                           = nullptr;
>-    PFNGLSHADERSOURCEPROC shaderSource                         = nullptr;
>-    PFNGLSTENCILFUNCSEPARATEPROC stencilFuncSeparate           = nullptr;
>-    PFNGLSTENCILMASKSEPARATEPROC stencilMaskSeparate           = nullptr;
>-    PFNGLSTENCILOPSEPARATEPROC stencilOpSeparate               = nullptr;
>-    PFNGLUNIFORM1FPROC uniform1f                               = nullptr;
>-    PFNGLUNIFORM1FVPROC uniform1fv                             = nullptr;
>-    PFNGLUNIFORM1IPROC uniform1i                               = nullptr;
>-    PFNGLUNIFORM1IVPROC uniform1iv                             = nullptr;
>-    PFNGLUNIFORM2FPROC uniform2f                               = nullptr;
>-    PFNGLUNIFORM2FVPROC uniform2fv                             = nullptr;
>-    PFNGLUNIFORM2IPROC uniform2i                               = nullptr;
>-    PFNGLUNIFORM2IVPROC uniform2iv                             = nullptr;
>-    PFNGLUNIFORM3FPROC uniform3f                               = nullptr;
>-    PFNGLUNIFORM3FVPROC uniform3fv                             = nullptr;
>-    PFNGLUNIFORM3IPROC uniform3i                               = nullptr;
>-    PFNGLUNIFORM3IVPROC uniform3iv                             = nullptr;
>-    PFNGLUNIFORM4FPROC uniform4f                               = nullptr;
>-    PFNGLUNIFORM4FVPROC uniform4fv                             = nullptr;
>-    PFNGLUNIFORM4IPROC uniform4i                               = nullptr;
>-    PFNGLUNIFORM4IVPROC uniform4iv                             = nullptr;
>-    PFNGLUNIFORMMATRIX2FVPROC uniformMatrix2fv                 = nullptr;
>-    PFNGLUNIFORMMATRIX3FVPROC uniformMatrix3fv                 = nullptr;
>-    PFNGLUNIFORMMATRIX4FVPROC uniformMatrix4fv                 = nullptr;
>-    PFNGLUSEPROGRAMPROC useProgram                             = nullptr;
>-    PFNGLVALIDATEPROGRAMPROC validateProgram                   = nullptr;
>-    PFNGLVERTEXATTRIB1DPROC vertexAttrib1d                     = nullptr;
>-    PFNGLVERTEXATTRIB1DVPROC vertexAttrib1dv                   = nullptr;
>-    PFNGLVERTEXATTRIB1FPROC vertexAttrib1f                     = nullptr;
>-    PFNGLVERTEXATTRIB1FVPROC vertexAttrib1fv                   = nullptr;
>-    PFNGLVERTEXATTRIB1SPROC vertexAttrib1s                     = nullptr;
>-    PFNGLVERTEXATTRIB1SVPROC vertexAttrib1sv                   = nullptr;
>-    PFNGLVERTEXATTRIB2DPROC vertexAttrib2d                     = nullptr;
>-    PFNGLVERTEXATTRIB2DVPROC vertexAttrib2dv                   = nullptr;
>-    PFNGLVERTEXATTRIB2FPROC vertexAttrib2f                     = nullptr;
>-    PFNGLVERTEXATTRIB2FVPROC vertexAttrib2fv                   = nullptr;
>-    PFNGLVERTEXATTRIB2SPROC vertexAttrib2s                     = nullptr;
>-    PFNGLVERTEXATTRIB2SVPROC vertexAttrib2sv                   = nullptr;
>-    PFNGLVERTEXATTRIB3DPROC vertexAttrib3d                     = nullptr;
>-    PFNGLVERTEXATTRIB3DVPROC vertexAttrib3dv                   = nullptr;
>-    PFNGLVERTEXATTRIB3FPROC vertexAttrib3f                     = nullptr;
>-    PFNGLVERTEXATTRIB3FVPROC vertexAttrib3fv                   = nullptr;
>-    PFNGLVERTEXATTRIB3SPROC vertexAttrib3s                     = nullptr;
>-    PFNGLVERTEXATTRIB3SVPROC vertexAttrib3sv                   = nullptr;
>-    PFNGLVERTEXATTRIB4NBVPROC vertexAttrib4Nbv                 = nullptr;
>-    PFNGLVERTEXATTRIB4NIVPROC vertexAttrib4Niv                 = nullptr;
>-    PFNGLVERTEXATTRIB4NSVPROC vertexAttrib4Nsv                 = nullptr;
>-    PFNGLVERTEXATTRIB4NUBPROC vertexAttrib4Nub                 = nullptr;
>-    PFNGLVERTEXATTRIB4NUBVPROC vertexAttrib4Nubv               = nullptr;
>-    PFNGLVERTEXATTRIB4NUIVPROC vertexAttrib4Nuiv               = nullptr;
>-    PFNGLVERTEXATTRIB4NUSVPROC vertexAttrib4Nusv               = nullptr;
>-    PFNGLVERTEXATTRIB4BVPROC vertexAttrib4bv                   = nullptr;
>-    PFNGLVERTEXATTRIB4DPROC vertexAttrib4d                     = nullptr;
>-    PFNGLVERTEXATTRIB4DVPROC vertexAttrib4dv                   = nullptr;
>-    PFNGLVERTEXATTRIB4FPROC vertexAttrib4f                     = nullptr;
>-    PFNGLVERTEXATTRIB4FVPROC vertexAttrib4fv                   = nullptr;
>-    PFNGLVERTEXATTRIB4IVPROC vertexAttrib4iv                   = nullptr;
>-    PFNGLVERTEXATTRIB4SPROC vertexAttrib4s                     = nullptr;
>-    PFNGLVERTEXATTRIB4SVPROC vertexAttrib4sv                   = nullptr;
>-    PFNGLVERTEXATTRIB4UBVPROC vertexAttrib4ubv                 = nullptr;
>-    PFNGLVERTEXATTRIB4UIVPROC vertexAttrib4uiv                 = nullptr;
>-    PFNGLVERTEXATTRIB4USVPROC vertexAttrib4usv                 = nullptr;
>-    PFNGLVERTEXATTRIBPOINTERPROC vertexAttribPointer           = nullptr;
>+    PFNGLDRAWBUFFERSPROC drawBuffers = nullptr;
>+    PFNGLENABLEVERTEXATTRIBARRAYPROC enableVertexAttribArray = nullptr;
>+    PFNGLGETACTIVEATTRIBPROC getActiveAttrib = nullptr;
>+    PFNGLGETACTIVEUNIFORMPROC getActiveUniform = nullptr;
>+    PFNGLGETATTACHEDSHADERSPROC getAttachedShaders = nullptr;
>+    PFNGLGETATTRIBLOCATIONPROC getAttribLocation = nullptr;
>+    PFNGLGETPROGRAMINFOLOGPROC getProgramInfoLog = nullptr;
>+    PFNGLGETPROGRAMIVPROC getProgramiv = nullptr;
>+    PFNGLGETSHADERINFOLOGPROC getShaderInfoLog = nullptr;
>+    PFNGLGETSHADERSOURCEPROC getShaderSource = nullptr;
>+    PFNGLGETSHADERIVPROC getShaderiv = nullptr;
>+    PFNGLGETUNIFORMLOCATIONPROC getUniformLocation = nullptr;
>+    PFNGLGETUNIFORMFVPROC getUniformfv = nullptr;
>+    PFNGLGETUNIFORMIVPROC getUniformiv = nullptr;
>+    PFNGLGETVERTEXATTRIBPOINTERVPROC getVertexAttribPointerv = nullptr;
>+    PFNGLGETVERTEXATTRIBDVPROC getVertexAttribdv = nullptr;
>+    PFNGLGETVERTEXATTRIBFVPROC getVertexAttribfv = nullptr;
>+    PFNGLGETVERTEXATTRIBIVPROC getVertexAttribiv = nullptr;
>+    PFNGLISPROGRAMPROC isProgram = nullptr;
>+    PFNGLISSHADERPROC isShader = nullptr;
>+    PFNGLLINKPROGRAMPROC linkProgram = nullptr;
>+    PFNGLSHADERSOURCEPROC shaderSource = nullptr;
>+    PFNGLSTENCILFUNCSEPARATEPROC stencilFuncSeparate = nullptr;
>+    PFNGLSTENCILMASKSEPARATEPROC stencilMaskSeparate = nullptr;
>+    PFNGLSTENCILOPSEPARATEPROC stencilOpSeparate = nullptr;
>+    PFNGLUNIFORM1FPROC uniform1f = nullptr;
>+    PFNGLUNIFORM1FVPROC uniform1fv = nullptr;
>+    PFNGLUNIFORM1IPROC uniform1i = nullptr;
>+    PFNGLUNIFORM1IVPROC uniform1iv = nullptr;
>+    PFNGLUNIFORM2FPROC uniform2f = nullptr;
>+    PFNGLUNIFORM2FVPROC uniform2fv = nullptr;
>+    PFNGLUNIFORM2IPROC uniform2i = nullptr;
>+    PFNGLUNIFORM2IVPROC uniform2iv = nullptr;
>+    PFNGLUNIFORM3FPROC uniform3f = nullptr;
>+    PFNGLUNIFORM3FVPROC uniform3fv = nullptr;
>+    PFNGLUNIFORM3IPROC uniform3i = nullptr;
>+    PFNGLUNIFORM3IVPROC uniform3iv = nullptr;
>+    PFNGLUNIFORM4FPROC uniform4f = nullptr;
>+    PFNGLUNIFORM4FVPROC uniform4fv = nullptr;
>+    PFNGLUNIFORM4IPROC uniform4i = nullptr;
>+    PFNGLUNIFORM4IVPROC uniform4iv = nullptr;
>+    PFNGLUNIFORMMATRIX2FVPROC uniformMatrix2fv = nullptr;
>+    PFNGLUNIFORMMATRIX3FVPROC uniformMatrix3fv = nullptr;
>+    PFNGLUNIFORMMATRIX4FVPROC uniformMatrix4fv = nullptr;
>+    PFNGLUSEPROGRAMPROC useProgram = nullptr;
>+    PFNGLVALIDATEPROGRAMPROC validateProgram = nullptr;
>+    PFNGLVERTEXATTRIB1DPROC vertexAttrib1d = nullptr;
>+    PFNGLVERTEXATTRIB1DVPROC vertexAttrib1dv = nullptr;
>+    PFNGLVERTEXATTRIB1FPROC vertexAttrib1f = nullptr;
>+    PFNGLVERTEXATTRIB1FVPROC vertexAttrib1fv = nullptr;
>+    PFNGLVERTEXATTRIB1SPROC vertexAttrib1s = nullptr;
>+    PFNGLVERTEXATTRIB1SVPROC vertexAttrib1sv = nullptr;
>+    PFNGLVERTEXATTRIB2DPROC vertexAttrib2d = nullptr;
>+    PFNGLVERTEXATTRIB2DVPROC vertexAttrib2dv = nullptr;
>+    PFNGLVERTEXATTRIB2FPROC vertexAttrib2f = nullptr;
>+    PFNGLVERTEXATTRIB2FVPROC vertexAttrib2fv = nullptr;
>+    PFNGLVERTEXATTRIB2SPROC vertexAttrib2s = nullptr;
>+    PFNGLVERTEXATTRIB2SVPROC vertexAttrib2sv = nullptr;
>+    PFNGLVERTEXATTRIB3DPROC vertexAttrib3d = nullptr;
>+    PFNGLVERTEXATTRIB3DVPROC vertexAttrib3dv = nullptr;
>+    PFNGLVERTEXATTRIB3FPROC vertexAttrib3f = nullptr;
>+    PFNGLVERTEXATTRIB3FVPROC vertexAttrib3fv = nullptr;
>+    PFNGLVERTEXATTRIB3SPROC vertexAttrib3s = nullptr;
>+    PFNGLVERTEXATTRIB3SVPROC vertexAttrib3sv = nullptr;
>+    PFNGLVERTEXATTRIB4NBVPROC vertexAttrib4Nbv = nullptr;
>+    PFNGLVERTEXATTRIB4NIVPROC vertexAttrib4Niv = nullptr;
>+    PFNGLVERTEXATTRIB4NSVPROC vertexAttrib4Nsv = nullptr;
>+    PFNGLVERTEXATTRIB4NUBPROC vertexAttrib4Nub = nullptr;
>+    PFNGLVERTEXATTRIB4NUBVPROC vertexAttrib4Nubv = nullptr;
>+    PFNGLVERTEXATTRIB4NUIVPROC vertexAttrib4Nuiv = nullptr;
>+    PFNGLVERTEXATTRIB4NUSVPROC vertexAttrib4Nusv = nullptr;
>+    PFNGLVERTEXATTRIB4BVPROC vertexAttrib4bv = nullptr;
>+    PFNGLVERTEXATTRIB4DPROC vertexAttrib4d = nullptr;
>+    PFNGLVERTEXATTRIB4DVPROC vertexAttrib4dv = nullptr;
>+    PFNGLVERTEXATTRIB4FPROC vertexAttrib4f = nullptr;
>+    PFNGLVERTEXATTRIB4FVPROC vertexAttrib4fv = nullptr;
>+    PFNGLVERTEXATTRIB4IVPROC vertexAttrib4iv = nullptr;
>+    PFNGLVERTEXATTRIB4SPROC vertexAttrib4s = nullptr;
>+    PFNGLVERTEXATTRIB4SVPROC vertexAttrib4sv = nullptr;
>+    PFNGLVERTEXATTRIB4UBVPROC vertexAttrib4ubv = nullptr;
>+    PFNGLVERTEXATTRIB4UIVPROC vertexAttrib4uiv = nullptr;
>+    PFNGLVERTEXATTRIB4USVPROC vertexAttrib4usv = nullptr;
>+    PFNGLVERTEXATTRIBPOINTERPROC vertexAttribPointer = nullptr;
> 
>     // 2.1
>     PFNGLUNIFORMMATRIX2X3FVPROC uniformMatrix2x3fv = nullptr;
>@@ -253,524 +254,533 @@ class DispatchTableGL : angle::NonCopyable
>     PFNGLUNIFORMMATRIX4X3FVPROC uniformMatrix4x3fv = nullptr;
> 
>     // 3.0
>-    PFNGLBEGINCONDITIONALRENDERPROC beginConditionalRender                           = nullptr;
>-    PFNGLBEGINTRANSFORMFEEDBACKPROC beginTransformFeedback                           = nullptr;
>-    PFNGLBINDBUFFERBASEPROC bindBufferBase                                           = nullptr;
>-    PFNGLBINDBUFFERRANGEPROC bindBufferRange                                         = nullptr;
>-    PFNGLBINDFRAGDATALOCATIONPROC bindFragDataLocation                               = nullptr;
>-    PFNGLBINDFRAMEBUFFERPROC bindFramebuffer                                         = nullptr;
>-    PFNGLBINDRENDERBUFFERPROC bindRenderbuffer                                       = nullptr;
>-    PFNGLBINDVERTEXARRAYPROC bindVertexArray                                         = nullptr;
>-    PFNGLBLITFRAMEBUFFERPROC blitFramebuffer                                         = nullptr;
>-    PFNGLCHECKFRAMEBUFFERSTATUSPROC checkFramebufferStatus                           = nullptr;
>-    PFNGLCLAMPCOLORPROC clampColor                                                   = nullptr;
>-    PFNGLCLEARBUFFERFIPROC clearBufferfi                                             = nullptr;
>-    PFNGLCLEARBUFFERFVPROC clearBufferfv                                             = nullptr;
>-    PFNGLCLEARBUFFERIVPROC clearBufferiv                                             = nullptr;
>-    PFNGLCLEARBUFFERUIVPROC clearBufferuiv                                           = nullptr;
>-    PFNGLCOLORMASKIPROC colorMaski                                                   = nullptr;
>-    PFNGLDELETEFRAMEBUFFERSPROC deleteFramebuffers                                   = nullptr;
>-    PFNGLDELETERENDERBUFFERSPROC deleteRenderbuffers                                 = nullptr;
>-    PFNGLDELETEVERTEXARRAYSPROC deleteVertexArrays                                   = nullptr;
>-    PFNGLDISABLEIPROC disablei                                                       = nullptr;
>-    PFNGLENABLEIPROC enablei                                                         = nullptr;
>-    PFNGLENDCONDITIONALRENDERPROC endConditionalRender                               = nullptr;
>-    PFNGLENDTRANSFORMFEEDBACKPROC endTransformFeedback                               = nullptr;
>-    PFNGLFLUSHMAPPEDBUFFERRANGEPROC flushMappedBufferRange                           = nullptr;
>-    PFNGLFRAMEBUFFERRENDERBUFFERPROC framebufferRenderbuffer                         = nullptr;
>-    PFNGLFRAMEBUFFERTEXTURE1DPROC framebufferTexture1D                               = nullptr;
>-    PFNGLFRAMEBUFFERTEXTURE2DPROC framebufferTexture2D                               = nullptr;
>-    PFNGLFRAMEBUFFERTEXTURE3DPROC framebufferTexture3D                               = nullptr;
>-    PFNGLFRAMEBUFFERTEXTURELAYERPROC framebufferTextureLayer                         = nullptr;
>-    PFNGLGENFRAMEBUFFERSPROC genFramebuffers                                         = nullptr;
>-    PFNGLGENRENDERBUFFERSPROC genRenderbuffers                                       = nullptr;
>-    PFNGLGENVERTEXARRAYSPROC genVertexArrays                                         = nullptr;
>-    PFNGLGENERATEMIPMAPPROC generateMipmap                                           = nullptr;
>-    PFNGLGETBOOLEANI_VPROC getBooleani_v                                             = nullptr;
>-    PFNGLGETFRAGDATALOCATIONPROC getFragDataLocation                                 = nullptr;
>+    PFNGLBEGINCONDITIONALRENDERPROC beginConditionalRender = nullptr;
>+    PFNGLBEGINTRANSFORMFEEDBACKPROC beginTransformFeedback = nullptr;
>+    PFNGLBINDBUFFERBASEPROC bindBufferBase = nullptr;
>+    PFNGLBINDBUFFERRANGEPROC bindBufferRange = nullptr;
>+    PFNGLBINDFRAGDATALOCATIONPROC bindFragDataLocation = nullptr;
>+    PFNGLBINDFRAMEBUFFERPROC bindFramebuffer = nullptr;
>+    PFNGLBINDRENDERBUFFERPROC bindRenderbuffer = nullptr;
>+    PFNGLBINDVERTEXARRAYPROC bindVertexArray = nullptr;
>+    PFNGLBLITFRAMEBUFFERPROC blitFramebuffer = nullptr;
>+    PFNGLCHECKFRAMEBUFFERSTATUSPROC checkFramebufferStatus = nullptr;
>+    PFNGLCLAMPCOLORPROC clampColor = nullptr;
>+    PFNGLCLEARBUFFERFIPROC clearBufferfi = nullptr;
>+    PFNGLCLEARBUFFERFVPROC clearBufferfv = nullptr;
>+    PFNGLCLEARBUFFERIVPROC clearBufferiv = nullptr;
>+    PFNGLCLEARBUFFERUIVPROC clearBufferuiv = nullptr;
>+    PFNGLCOLORMASKIPROC colorMaski = nullptr;
>+    PFNGLDELETEFRAMEBUFFERSPROC deleteFramebuffers = nullptr;
>+    PFNGLDELETERENDERBUFFERSPROC deleteRenderbuffers = nullptr;
>+    PFNGLDELETEVERTEXARRAYSPROC deleteVertexArrays = nullptr;
>+    PFNGLDISABLEIPROC disablei = nullptr;
>+    PFNGLENABLEIPROC enablei = nullptr;
>+    PFNGLENDCONDITIONALRENDERPROC endConditionalRender = nullptr;
>+    PFNGLENDTRANSFORMFEEDBACKPROC endTransformFeedback = nullptr;
>+    PFNGLFLUSHMAPPEDBUFFERRANGEPROC flushMappedBufferRange = nullptr;
>+    PFNGLFRAMEBUFFERRENDERBUFFERPROC framebufferRenderbuffer = nullptr;
>+    PFNGLFRAMEBUFFERTEXTURE1DPROC framebufferTexture1D = nullptr;
>+    PFNGLFRAMEBUFFERTEXTURE2DPROC framebufferTexture2D = nullptr;
>+    PFNGLFRAMEBUFFERTEXTURE3DPROC framebufferTexture3D = nullptr;
>+    PFNGLFRAMEBUFFERTEXTURELAYERPROC framebufferTextureLayer = nullptr;
>+    PFNGLGENFRAMEBUFFERSPROC genFramebuffers = nullptr;
>+    PFNGLGENRENDERBUFFERSPROC genRenderbuffers = nullptr;
>+    PFNGLGENVERTEXARRAYSPROC genVertexArrays = nullptr;
>+    PFNGLGENERATEMIPMAPPROC generateMipmap = nullptr;
>+    PFNGLGETBOOLEANI_VPROC getBooleani_v = nullptr;
>+    PFNGLGETFRAGDATALOCATIONPROC getFragDataLocation = nullptr;
>     PFNGLGETFRAMEBUFFERATTACHMENTPARAMETERIVPROC getFramebufferAttachmentParameteriv = nullptr;
>-    PFNGLGETINTEGERI_VPROC getIntegeri_v                                             = nullptr;
>-    PFNGLGETRENDERBUFFERPARAMETERIVPROC getRenderbufferParameteriv                   = nullptr;
>-    PFNGLGETSTRINGIPROC getStringi                                                   = nullptr;
>-    PFNGLGETTEXPARAMETERIIVPROC getTexParameterIiv                                   = nullptr;
>-    PFNGLGETTEXPARAMETERIUIVPROC getTexParameterIuiv                                 = nullptr;
>-    PFNGLGETTRANSFORMFEEDBACKVARYINGPROC getTransformFeedbackVarying                 = nullptr;
>-    PFNGLGETUNIFORMUIVPROC getUniformuiv                                             = nullptr;
>-    PFNGLGETVERTEXATTRIBIIVPROC getVertexAttribIiv                                   = nullptr;
>-    PFNGLGETVERTEXATTRIBIUIVPROC getVertexAttribIuiv                                 = nullptr;
>-    PFNGLISENABLEDIPROC isEnabledi                                                   = nullptr;
>-    PFNGLISFRAMEBUFFERPROC isFramebuffer                                             = nullptr;
>-    PFNGLISRENDERBUFFERPROC isRenderbuffer                                           = nullptr;
>-    PFNGLISVERTEXARRAYPROC isVertexArray                                             = nullptr;
>-    PFNGLMAPBUFFERRANGEPROC mapBufferRange                                           = nullptr;
>-    PFNGLRENDERBUFFERSTORAGEPROC renderbufferStorage                                 = nullptr;
>-    PFNGLRENDERBUFFERSTORAGEMULTISAMPLEPROC renderbufferStorageMultisample           = nullptr;
>-    PFNGLTEXPARAMETERIIVPROC texParameterIiv                                         = nullptr;
>-    PFNGLTEXPARAMETERIUIVPROC texParameterIuiv                                       = nullptr;
>-    PFNGLTRANSFORMFEEDBACKVARYINGSPROC transformFeedbackVaryings                     = nullptr;
>-    PFNGLUNIFORM1UIPROC uniform1ui                                                   = nullptr;
>-    PFNGLUNIFORM1UIVPROC uniform1uiv                                                 = nullptr;
>-    PFNGLUNIFORM2UIPROC uniform2ui                                                   = nullptr;
>-    PFNGLUNIFORM2UIVPROC uniform2uiv                                                 = nullptr;
>-    PFNGLUNIFORM3UIPROC uniform3ui                                                   = nullptr;
>-    PFNGLUNIFORM3UIVPROC uniform3uiv                                                 = nullptr;
>-    PFNGLUNIFORM4UIPROC uniform4ui                                                   = nullptr;
>-    PFNGLUNIFORM4UIVPROC uniform4uiv                                                 = nullptr;
>-    PFNGLVERTEXATTRIBI1IPROC vertexAttribI1i                                         = nullptr;
>-    PFNGLVERTEXATTRIBI1IVPROC vertexAttribI1iv                                       = nullptr;
>-    PFNGLVERTEXATTRIBI1UIPROC vertexAttribI1ui                                       = nullptr;
>-    PFNGLVERTEXATTRIBI1UIVPROC vertexAttribI1uiv                                     = nullptr;
>-    PFNGLVERTEXATTRIBI2IPROC vertexAttribI2i                                         = nullptr;
>-    PFNGLVERTEXATTRIBI2IVPROC vertexAttribI2iv                                       = nullptr;
>-    PFNGLVERTEXATTRIBI2UIPROC vertexAttribI2ui                                       = nullptr;
>-    PFNGLVERTEXATTRIBI2UIVPROC vertexAttribI2uiv                                     = nullptr;
>-    PFNGLVERTEXATTRIBI3IPROC vertexAttribI3i                                         = nullptr;
>-    PFNGLVERTEXATTRIBI3IVPROC vertexAttribI3iv                                       = nullptr;
>-    PFNGLVERTEXATTRIBI3UIPROC vertexAttribI3ui                                       = nullptr;
>-    PFNGLVERTEXATTRIBI3UIVPROC vertexAttribI3uiv                                     = nullptr;
>-    PFNGLVERTEXATTRIBI4BVPROC vertexAttribI4bv                                       = nullptr;
>-    PFNGLVERTEXATTRIBI4IPROC vertexAttribI4i                                         = nullptr;
>-    PFNGLVERTEXATTRIBI4IVPROC vertexAttribI4iv                                       = nullptr;
>-    PFNGLVERTEXATTRIBI4SVPROC vertexAttribI4sv                                       = nullptr;
>-    PFNGLVERTEXATTRIBI4UBVPROC vertexAttribI4ubv                                     = nullptr;
>-    PFNGLVERTEXATTRIBI4UIPROC vertexAttribI4ui                                       = nullptr;
>-    PFNGLVERTEXATTRIBI4UIVPROC vertexAttribI4uiv                                     = nullptr;
>-    PFNGLVERTEXATTRIBI4USVPROC vertexAttribI4usv                                     = nullptr;
>-    PFNGLVERTEXATTRIBIPOINTERPROC vertexAttribIPointer                               = nullptr;
>+    PFNGLGETINTEGERI_VPROC getIntegeri_v = nullptr;
>+    PFNGLGETRENDERBUFFERPARAMETERIVPROC getRenderbufferParameteriv = nullptr;
>+    PFNGLGETSTRINGIPROC getStringi = nullptr;
>+    PFNGLGETTEXPARAMETERIIVPROC getTexParameterIiv = nullptr;
>+    PFNGLGETTEXPARAMETERIUIVPROC getTexParameterIuiv = nullptr;
>+    PFNGLGETTRANSFORMFEEDBACKVARYINGPROC getTransformFeedbackVarying = nullptr;
>+    PFNGLGETUNIFORMUIVPROC getUniformuiv = nullptr;
>+    PFNGLGETVERTEXATTRIBIIVPROC getVertexAttribIiv = nullptr;
>+    PFNGLGETVERTEXATTRIBIUIVPROC getVertexAttribIuiv = nullptr;
>+    PFNGLISENABLEDIPROC isEnabledi = nullptr;
>+    PFNGLISFRAMEBUFFERPROC isFramebuffer = nullptr;
>+    PFNGLISRENDERBUFFERPROC isRenderbuffer = nullptr;
>+    PFNGLISVERTEXARRAYPROC isVertexArray = nullptr;
>+    PFNGLMAPBUFFERRANGEPROC mapBufferRange = nullptr;
>+    PFNGLRENDERBUFFERSTORAGEPROC renderbufferStorage = nullptr;
>+    PFNGLRENDERBUFFERSTORAGEMULTISAMPLEPROC renderbufferStorageMultisample = nullptr;
>+    PFNGLTEXPARAMETERIIVPROC texParameterIiv = nullptr;
>+    PFNGLTEXPARAMETERIUIVPROC texParameterIuiv = nullptr;
>+    PFNGLTRANSFORMFEEDBACKVARYINGSPROC transformFeedbackVaryings = nullptr;
>+    PFNGLUNIFORM1UIPROC uniform1ui = nullptr;
>+    PFNGLUNIFORM1UIVPROC uniform1uiv = nullptr;
>+    PFNGLUNIFORM2UIPROC uniform2ui = nullptr;
>+    PFNGLUNIFORM2UIVPROC uniform2uiv = nullptr;
>+    PFNGLUNIFORM3UIPROC uniform3ui = nullptr;
>+    PFNGLUNIFORM3UIVPROC uniform3uiv = nullptr;
>+    PFNGLUNIFORM4UIPROC uniform4ui = nullptr;
>+    PFNGLUNIFORM4UIVPROC uniform4uiv = nullptr;
>+    PFNGLVERTEXATTRIBI1IPROC vertexAttribI1i = nullptr;
>+    PFNGLVERTEXATTRIBI1IVPROC vertexAttribI1iv = nullptr;
>+    PFNGLVERTEXATTRIBI1UIPROC vertexAttribI1ui = nullptr;
>+    PFNGLVERTEXATTRIBI1UIVPROC vertexAttribI1uiv = nullptr;
>+    PFNGLVERTEXATTRIBI2IPROC vertexAttribI2i = nullptr;
>+    PFNGLVERTEXATTRIBI2IVPROC vertexAttribI2iv = nullptr;
>+    PFNGLVERTEXATTRIBI2UIPROC vertexAttribI2ui = nullptr;
>+    PFNGLVERTEXATTRIBI2UIVPROC vertexAttribI2uiv = nullptr;
>+    PFNGLVERTEXATTRIBI3IPROC vertexAttribI3i = nullptr;
>+    PFNGLVERTEXATTRIBI3IVPROC vertexAttribI3iv = nullptr;
>+    PFNGLVERTEXATTRIBI3UIPROC vertexAttribI3ui = nullptr;
>+    PFNGLVERTEXATTRIBI3UIVPROC vertexAttribI3uiv = nullptr;
>+    PFNGLVERTEXATTRIBI4BVPROC vertexAttribI4bv = nullptr;
>+    PFNGLVERTEXATTRIBI4IPROC vertexAttribI4i = nullptr;
>+    PFNGLVERTEXATTRIBI4IVPROC vertexAttribI4iv = nullptr;
>+    PFNGLVERTEXATTRIBI4SVPROC vertexAttribI4sv = nullptr;
>+    PFNGLVERTEXATTRIBI4UBVPROC vertexAttribI4ubv = nullptr;
>+    PFNGLVERTEXATTRIBI4UIPROC vertexAttribI4ui = nullptr;
>+    PFNGLVERTEXATTRIBI4UIVPROC vertexAttribI4uiv = nullptr;
>+    PFNGLVERTEXATTRIBI4USVPROC vertexAttribI4usv = nullptr;
>+    PFNGLVERTEXATTRIBIPOINTERPROC vertexAttribIPointer = nullptr;
> 
>     // 3.1
>-    PFNGLCOPYBUFFERSUBDATAPROC copyBufferSubData                 = nullptr;
>-    PFNGLDRAWARRAYSINSTANCEDPROC drawArraysInstanced             = nullptr;
>-    PFNGLDRAWELEMENTSINSTANCEDPROC drawElementsInstanced         = nullptr;
>+    PFNGLCOPYBUFFERSUBDATAPROC copyBufferSubData = nullptr;
>+    PFNGLDRAWARRAYSINSTANCEDPROC drawArraysInstanced = nullptr;
>+    PFNGLDRAWELEMENTSINSTANCEDPROC drawElementsInstanced = nullptr;
>     PFNGLGETACTIVEUNIFORMBLOCKNAMEPROC getActiveUniformBlockName = nullptr;
>-    PFNGLGETACTIVEUNIFORMBLOCKIVPROC getActiveUniformBlockiv     = nullptr;
>-    PFNGLGETACTIVEUNIFORMNAMEPROC getActiveUniformName           = nullptr;
>-    PFNGLGETACTIVEUNIFORMSIVPROC getActiveUniformsiv             = nullptr;
>-    PFNGLGETUNIFORMBLOCKINDEXPROC getUniformBlockIndex           = nullptr;
>-    PFNGLGETUNIFORMINDICESPROC getUniformIndices                 = nullptr;
>-    PFNGLPRIMITIVERESTARTINDEXPROC primitiveRestartIndex         = nullptr;
>-    PFNGLTEXBUFFERPROC texBuffer                                 = nullptr;
>-    PFNGLUNIFORMBLOCKBINDINGPROC uniformBlockBinding             = nullptr;
>+    PFNGLGETACTIVEUNIFORMBLOCKIVPROC getActiveUniformBlockiv = nullptr;
>+    PFNGLGETACTIVEUNIFORMNAMEPROC getActiveUniformName = nullptr;
>+    PFNGLGETACTIVEUNIFORMSIVPROC getActiveUniformsiv = nullptr;
>+    PFNGLGETUNIFORMBLOCKINDEXPROC getUniformBlockIndex = nullptr;
>+    PFNGLGETUNIFORMINDICESPROC getUniformIndices = nullptr;
>+    PFNGLPRIMITIVERESTARTINDEXPROC primitiveRestartIndex = nullptr;
>+    PFNGLTEXBUFFERPROC texBuffer = nullptr;
>+    PFNGLUNIFORMBLOCKBINDINGPROC uniformBlockBinding = nullptr;
> 
>     // 3.2
>-    PFNGLCLIENTWAITSYNCPROC clientWaitSync                                   = nullptr;
>-    PFNGLDELETESYNCPROC deleteSync                                           = nullptr;
>-    PFNGLDRAWELEMENTSBASEVERTEXPROC drawElementsBaseVertex                   = nullptr;
>+    PFNGLCLIENTWAITSYNCPROC clientWaitSync = nullptr;
>+    PFNGLDELETESYNCPROC deleteSync = nullptr;
>+    PFNGLDRAWELEMENTSBASEVERTEXPROC drawElementsBaseVertex = nullptr;
>     PFNGLDRAWELEMENTSINSTANCEDBASEVERTEXPROC drawElementsInstancedBaseVertex = nullptr;
>-    PFNGLDRAWRANGEELEMENTSBASEVERTEXPROC drawRangeElementsBaseVertex         = nullptr;
>-    PFNGLFENCESYNCPROC fenceSync                                             = nullptr;
>-    PFNGLFRAMEBUFFERTEXTUREPROC framebufferTexture                           = nullptr;
>-    PFNGLGETBUFFERPARAMETERI64VPROC getBufferParameteri64v                   = nullptr;
>-    PFNGLGETINTEGER64I_VPROC getInteger64i_v                                 = nullptr;
>-    PFNGLGETINTEGER64VPROC getInteger64v                                     = nullptr;
>-    PFNGLGETMULTISAMPLEFVPROC getMultisamplefv                               = nullptr;
>-    PFNGLGETSYNCIVPROC getSynciv                                             = nullptr;
>-    PFNGLISSYNCPROC isSync                                                   = nullptr;
>-    PFNGLMULTIDRAWELEMENTSBASEVERTEXPROC multiDrawElementsBaseVertex         = nullptr;
>-    PFNGLPROVOKINGVERTEXPROC provokingVertex                                 = nullptr;
>-    PFNGLSAMPLEMASKIPROC sampleMaski                                         = nullptr;
>-    PFNGLTEXIMAGE2DMULTISAMPLEPROC texImage2DMultisample                     = nullptr;
>-    PFNGLTEXIMAGE3DMULTISAMPLEPROC texImage3DMultisample                     = nullptr;
>-    PFNGLWAITSYNCPROC waitSync                                               = nullptr;
>+    PFNGLDRAWRANGEELEMENTSBASEVERTEXPROC drawRangeElementsBaseVertex = nullptr;
>+    PFNGLFENCESYNCPROC fenceSync = nullptr;
>+    PFNGLFRAMEBUFFERTEXTUREPROC framebufferTexture = nullptr;
>+    PFNGLGETBUFFERPARAMETERI64VPROC getBufferParameteri64v = nullptr;
>+    PFNGLGETINTEGER64I_VPROC getInteger64i_v = nullptr;
>+    PFNGLGETINTEGER64VPROC getInteger64v = nullptr;
>+    PFNGLGETMULTISAMPLEFVPROC getMultisamplefv = nullptr;
>+    PFNGLGETSYNCIVPROC getSynciv = nullptr;
>+    PFNGLISSYNCPROC isSync = nullptr;
>+    PFNGLMULTIDRAWELEMENTSBASEVERTEXPROC multiDrawElementsBaseVertex = nullptr;
>+    PFNGLPROVOKINGVERTEXPROC provokingVertex = nullptr;
>+    PFNGLSAMPLEMASKIPROC sampleMaski = nullptr;
>+    PFNGLTEXIMAGE2DMULTISAMPLEPROC texImage2DMultisample = nullptr;
>+    PFNGLTEXIMAGE3DMULTISAMPLEPROC texImage3DMultisample = nullptr;
>+    PFNGLWAITSYNCPROC waitSync = nullptr;
> 
>     // 3.3
>     PFNGLBINDFRAGDATALOCATIONINDEXEDPROC bindFragDataLocationIndexed = nullptr;
>-    PFNGLBINDSAMPLERPROC bindSampler                                 = nullptr;
>-    PFNGLDELETESAMPLERSPROC deleteSamplers                           = nullptr;
>-    PFNGLGENSAMPLERSPROC genSamplers                                 = nullptr;
>-    PFNGLGETFRAGDATAINDEXPROC getFragDataIndex                       = nullptr;
>-    PFNGLGETQUERYOBJECTI64VPROC getQueryObjecti64v                   = nullptr;
>-    PFNGLGETQUERYOBJECTUI64VPROC getQueryObjectui64v                 = nullptr;
>-    PFNGLGETSAMPLERPARAMETERIIVPROC getSamplerParameterIiv           = nullptr;
>-    PFNGLGETSAMPLERPARAMETERIUIVPROC getSamplerParameterIuiv         = nullptr;
>-    PFNGLGETSAMPLERPARAMETERFVPROC getSamplerParameterfv             = nullptr;
>-    PFNGLGETSAMPLERPARAMETERIVPROC getSamplerParameteriv             = nullptr;
>-    PFNGLISSAMPLERPROC isSampler                                     = nullptr;
>-    PFNGLQUERYCOUNTERPROC queryCounter                               = nullptr;
>-    PFNGLSAMPLERPARAMETERIIVPROC samplerParameterIiv                 = nullptr;
>-    PFNGLSAMPLERPARAMETERIUIVPROC samplerParameterIuiv               = nullptr;
>-    PFNGLSAMPLERPARAMETERFPROC samplerParameterf                     = nullptr;
>-    PFNGLSAMPLERPARAMETERFVPROC samplerParameterfv                   = nullptr;
>-    PFNGLSAMPLERPARAMETERIPROC samplerParameteri                     = nullptr;
>-    PFNGLSAMPLERPARAMETERIVPROC samplerParameteriv                   = nullptr;
>-    PFNGLVERTEXATTRIBDIVISORPROC vertexAttribDivisor                 = nullptr;
>-    PFNGLVERTEXATTRIBP1UIPROC vertexAttribP1ui                       = nullptr;
>-    PFNGLVERTEXATTRIBP1UIVPROC vertexAttribP1uiv                     = nullptr;
>-    PFNGLVERTEXATTRIBP2UIPROC vertexAttribP2ui                       = nullptr;
>-    PFNGLVERTEXATTRIBP2UIVPROC vertexAttribP2uiv                     = nullptr;
>-    PFNGLVERTEXATTRIBP3UIPROC vertexAttribP3ui                       = nullptr;
>-    PFNGLVERTEXATTRIBP3UIVPROC vertexAttribP3uiv                     = nullptr;
>-    PFNGLVERTEXATTRIBP4UIPROC vertexAttribP4ui                       = nullptr;
>-    PFNGLVERTEXATTRIBP4UIVPROC vertexAttribP4uiv                     = nullptr;
>+    PFNGLBINDSAMPLERPROC bindSampler = nullptr;
>+    PFNGLDELETESAMPLERSPROC deleteSamplers = nullptr;
>+    PFNGLGENSAMPLERSPROC genSamplers = nullptr;
>+    PFNGLGETFRAGDATAINDEXPROC getFragDataIndex = nullptr;
>+    PFNGLGETQUERYOBJECTI64VPROC getQueryObjecti64v = nullptr;
>+    PFNGLGETQUERYOBJECTUI64VPROC getQueryObjectui64v = nullptr;
>+    PFNGLGETSAMPLERPARAMETERIIVPROC getSamplerParameterIiv = nullptr;
>+    PFNGLGETSAMPLERPARAMETERIUIVPROC getSamplerParameterIuiv = nullptr;
>+    PFNGLGETSAMPLERPARAMETERFVPROC getSamplerParameterfv = nullptr;
>+    PFNGLGETSAMPLERPARAMETERIVPROC getSamplerParameteriv = nullptr;
>+    PFNGLISSAMPLERPROC isSampler = nullptr;
>+    PFNGLQUERYCOUNTERPROC queryCounter = nullptr;
>+    PFNGLSAMPLERPARAMETERIIVPROC samplerParameterIiv = nullptr;
>+    PFNGLSAMPLERPARAMETERIUIVPROC samplerParameterIuiv = nullptr;
>+    PFNGLSAMPLERPARAMETERFPROC samplerParameterf = nullptr;
>+    PFNGLSAMPLERPARAMETERFVPROC samplerParameterfv = nullptr;
>+    PFNGLSAMPLERPARAMETERIPROC samplerParameteri = nullptr;
>+    PFNGLSAMPLERPARAMETERIVPROC samplerParameteriv = nullptr;
>+    PFNGLVERTEXATTRIBDIVISORPROC vertexAttribDivisor = nullptr;
>+    PFNGLVERTEXATTRIBP1UIPROC vertexAttribP1ui = nullptr;
>+    PFNGLVERTEXATTRIBP1UIVPROC vertexAttribP1uiv = nullptr;
>+    PFNGLVERTEXATTRIBP2UIPROC vertexAttribP2ui = nullptr;
>+    PFNGLVERTEXATTRIBP2UIVPROC vertexAttribP2uiv = nullptr;
>+    PFNGLVERTEXATTRIBP3UIPROC vertexAttribP3ui = nullptr;
>+    PFNGLVERTEXATTRIBP3UIVPROC vertexAttribP3uiv = nullptr;
>+    PFNGLVERTEXATTRIBP4UIPROC vertexAttribP4ui = nullptr;
>+    PFNGLVERTEXATTRIBP4UIVPROC vertexAttribP4uiv = nullptr;
> 
>     // 4.0
>-    PFNGLBEGINQUERYINDEXEDPROC beginQueryIndexed                           = nullptr;
>-    PFNGLBINDTRANSFORMFEEDBACKPROC bindTransformFeedback                   = nullptr;
>-    PFNGLBLENDEQUATIONSEPARATEIPROC blendEquationSeparatei                 = nullptr;
>-    PFNGLBLENDEQUATIONIPROC blendEquationi                                 = nullptr;
>-    PFNGLBLENDFUNCSEPARATEIPROC blendFuncSeparatei                         = nullptr;
>-    PFNGLBLENDFUNCIPROC blendFunci                                         = nullptr;
>-    PFNGLDELETETRANSFORMFEEDBACKSPROC deleteTransformFeedbacks             = nullptr;
>-    PFNGLDRAWARRAYSINDIRECTPROC drawArraysIndirect                         = nullptr;
>-    PFNGLDRAWELEMENTSINDIRECTPROC drawElementsIndirect                     = nullptr;
>-    PFNGLDRAWTRANSFORMFEEDBACKPROC drawTransformFeedback                   = nullptr;
>-    PFNGLDRAWTRANSFORMFEEDBACKSTREAMPROC drawTransformFeedbackStream       = nullptr;
>-    PFNGLENDQUERYINDEXEDPROC endQueryIndexed                               = nullptr;
>-    PFNGLGENTRANSFORMFEEDBACKSPROC genTransformFeedbacks                   = nullptr;
>-    PFNGLGETACTIVESUBROUTINENAMEPROC getActiveSubroutineName               = nullptr;
>+    PFNGLBEGINQUERYINDEXEDPROC beginQueryIndexed = nullptr;
>+    PFNGLBINDTRANSFORMFEEDBACKPROC bindTransformFeedback = nullptr;
>+    PFNGLBLENDEQUATIONSEPARATEIPROC blendEquationSeparatei = nullptr;
>+    PFNGLBLENDEQUATIONIPROC blendEquationi = nullptr;
>+    PFNGLBLENDFUNCSEPARATEIPROC blendFuncSeparatei = nullptr;
>+    PFNGLBLENDFUNCIPROC blendFunci = nullptr;
>+    PFNGLDELETETRANSFORMFEEDBACKSPROC deleteTransformFeedbacks = nullptr;
>+    PFNGLDRAWARRAYSINDIRECTPROC drawArraysIndirect = nullptr;
>+    PFNGLDRAWELEMENTSINDIRECTPROC drawElementsIndirect = nullptr;
>+    PFNGLDRAWTRANSFORMFEEDBACKPROC drawTransformFeedback = nullptr;
>+    PFNGLDRAWTRANSFORMFEEDBACKSTREAMPROC drawTransformFeedbackStream = nullptr;
>+    PFNGLENDQUERYINDEXEDPROC endQueryIndexed = nullptr;
>+    PFNGLGENTRANSFORMFEEDBACKSPROC genTransformFeedbacks = nullptr;
>+    PFNGLGETACTIVESUBROUTINENAMEPROC getActiveSubroutineName = nullptr;
>     PFNGLGETACTIVESUBROUTINEUNIFORMNAMEPROC getActiveSubroutineUniformName = nullptr;
>-    PFNGLGETACTIVESUBROUTINEUNIFORMIVPROC getActiveSubroutineUniformiv     = nullptr;
>-    PFNGLGETPROGRAMSTAGEIVPROC getProgramStageiv                           = nullptr;
>-    PFNGLGETQUERYINDEXEDIVPROC getQueryIndexediv                           = nullptr;
>-    PFNGLGETSUBROUTINEINDEXPROC getSubroutineIndex                         = nullptr;
>-    PFNGLGETSUBROUTINEUNIFORMLOCATIONPROC getSubroutineUniformLocation     = nullptr;
>-    PFNGLGETUNIFORMSUBROUTINEUIVPROC getUniformSubroutineuiv               = nullptr;
>-    PFNGLGETUNIFORMDVPROC getUniformdv                                     = nullptr;
>-    PFNGLISTRANSFORMFEEDBACKPROC isTransformFeedback                       = nullptr;
>-    PFNGLMINSAMPLESHADINGPROC minSampleShading                             = nullptr;
>-    PFNGLPATCHPARAMETERFVPROC patchParameterfv                             = nullptr;
>-    PFNGLPATCHPARAMETERIPROC patchParameteri                               = nullptr;
>-    PFNGLPAUSETRANSFORMFEEDBACKPROC pauseTransformFeedback                 = nullptr;
>-    PFNGLRESUMETRANSFORMFEEDBACKPROC resumeTransformFeedback               = nullptr;
>-    PFNGLUNIFORM1DPROC uniform1d                                           = nullptr;
>-    PFNGLUNIFORM1DVPROC uniform1dv                                         = nullptr;
>-    PFNGLUNIFORM2DPROC uniform2d                                           = nullptr;
>-    PFNGLUNIFORM2DVPROC uniform2dv                                         = nullptr;
>-    PFNGLUNIFORM3DPROC uniform3d                                           = nullptr;
>-    PFNGLUNIFORM3DVPROC uniform3dv                                         = nullptr;
>-    PFNGLUNIFORM4DPROC uniform4d                                           = nullptr;
>-    PFNGLUNIFORM4DVPROC uniform4dv                                         = nullptr;
>-    PFNGLUNIFORMMATRIX2DVPROC uniformMatrix2dv                             = nullptr;
>-    PFNGLUNIFORMMATRIX2X3DVPROC uniformMatrix2x3dv                         = nullptr;
>-    PFNGLUNIFORMMATRIX2X4DVPROC uniformMatrix2x4dv                         = nullptr;
>-    PFNGLUNIFORMMATRIX3DVPROC uniformMatrix3dv                             = nullptr;
>-    PFNGLUNIFORMMATRIX3X2DVPROC uniformMatrix3x2dv                         = nullptr;
>-    PFNGLUNIFORMMATRIX3X4DVPROC uniformMatrix3x4dv                         = nullptr;
>-    PFNGLUNIFORMMATRIX4DVPROC uniformMatrix4dv                             = nullptr;
>-    PFNGLUNIFORMMATRIX4X2DVPROC uniformMatrix4x2dv                         = nullptr;
>-    PFNGLUNIFORMMATRIX4X3DVPROC uniformMatrix4x3dv                         = nullptr;
>-    PFNGLUNIFORMSUBROUTINESUIVPROC uniformSubroutinesuiv                   = nullptr;
>+    PFNGLGETACTIVESUBROUTINEUNIFORMIVPROC getActiveSubroutineUniformiv = nullptr;
>+    PFNGLGETPROGRAMSTAGEIVPROC getProgramStageiv = nullptr;
>+    PFNGLGETQUERYINDEXEDIVPROC getQueryIndexediv = nullptr;
>+    PFNGLGETSUBROUTINEINDEXPROC getSubroutineIndex = nullptr;
>+    PFNGLGETSUBROUTINEUNIFORMLOCATIONPROC getSubroutineUniformLocation = nullptr;
>+    PFNGLGETUNIFORMSUBROUTINEUIVPROC getUniformSubroutineuiv = nullptr;
>+    PFNGLGETUNIFORMDVPROC getUniformdv = nullptr;
>+    PFNGLISTRANSFORMFEEDBACKPROC isTransformFeedback = nullptr;
>+    PFNGLMINSAMPLESHADINGPROC minSampleShading = nullptr;
>+    PFNGLPATCHPARAMETERFVPROC patchParameterfv = nullptr;
>+    PFNGLPATCHPARAMETERIPROC patchParameteri = nullptr;
>+    PFNGLPAUSETRANSFORMFEEDBACKPROC pauseTransformFeedback = nullptr;
>+    PFNGLRESUMETRANSFORMFEEDBACKPROC resumeTransformFeedback = nullptr;
>+    PFNGLUNIFORM1DPROC uniform1d = nullptr;
>+    PFNGLUNIFORM1DVPROC uniform1dv = nullptr;
>+    PFNGLUNIFORM2DPROC uniform2d = nullptr;
>+    PFNGLUNIFORM2DVPROC uniform2dv = nullptr;
>+    PFNGLUNIFORM3DPROC uniform3d = nullptr;
>+    PFNGLUNIFORM3DVPROC uniform3dv = nullptr;
>+    PFNGLUNIFORM4DPROC uniform4d = nullptr;
>+    PFNGLUNIFORM4DVPROC uniform4dv = nullptr;
>+    PFNGLUNIFORMMATRIX2DVPROC uniformMatrix2dv = nullptr;
>+    PFNGLUNIFORMMATRIX2X3DVPROC uniformMatrix2x3dv = nullptr;
>+    PFNGLUNIFORMMATRIX2X4DVPROC uniformMatrix2x4dv = nullptr;
>+    PFNGLUNIFORMMATRIX3DVPROC uniformMatrix3dv = nullptr;
>+    PFNGLUNIFORMMATRIX3X2DVPROC uniformMatrix3x2dv = nullptr;
>+    PFNGLUNIFORMMATRIX3X4DVPROC uniformMatrix3x4dv = nullptr;
>+    PFNGLUNIFORMMATRIX4DVPROC uniformMatrix4dv = nullptr;
>+    PFNGLUNIFORMMATRIX4X2DVPROC uniformMatrix4x2dv = nullptr;
>+    PFNGLUNIFORMMATRIX4X3DVPROC uniformMatrix4x3dv = nullptr;
>+    PFNGLUNIFORMSUBROUTINESUIVPROC uniformSubroutinesuiv = nullptr;
> 
>     // 4.1
>-    PFNGLACTIVESHADERPROGRAMPROC activeShaderProgram             = nullptr;
>-    PFNGLBINDPROGRAMPIPELINEPROC bindProgramPipeline             = nullptr;
>-    PFNGLCLEARDEPTHFPROC clearDepthf                             = nullptr;
>-    PFNGLCREATESHADERPROGRAMVPROC createShaderProgramv           = nullptr;
>-    PFNGLDELETEPROGRAMPIPELINESPROC deleteProgramPipelines       = nullptr;
>-    PFNGLDEPTHRANGEARRAYVPROC depthRangeArrayv                   = nullptr;
>-    PFNGLDEPTHRANGEINDEXEDPROC depthRangeIndexed                 = nullptr;
>-    PFNGLDEPTHRANGEFPROC depthRangef                             = nullptr;
>-    PFNGLGENPROGRAMPIPELINESPROC genProgramPipelines             = nullptr;
>-    PFNGLGETDOUBLEI_VPROC getDoublei_v                           = nullptr;
>-    PFNGLGETFLOATI_VPROC getFloati_v                             = nullptr;
>-    PFNGLGETPROGRAMBINARYPROC getProgramBinary                   = nullptr;
>+    PFNGLACTIVESHADERPROGRAMPROC activeShaderProgram = nullptr;
>+    PFNGLBINDPROGRAMPIPELINEPROC bindProgramPipeline = nullptr;
>+    PFNGLCLEARDEPTHFPROC clearDepthf = nullptr;
>+    PFNGLCREATESHADERPROGRAMVPROC createShaderProgramv = nullptr;
>+    PFNGLDELETEPROGRAMPIPELINESPROC deleteProgramPipelines = nullptr;
>+    PFNGLDEPTHRANGEARRAYVPROC depthRangeArrayv = nullptr;
>+    PFNGLDEPTHRANGEINDEXEDPROC depthRangeIndexed = nullptr;
>+    PFNGLDEPTHRANGEFPROC depthRangef = nullptr;
>+    PFNGLGENPROGRAMPIPELINESPROC genProgramPipelines = nullptr;
>+    PFNGLGETDOUBLEI_VPROC getDoublei_v = nullptr;
>+    PFNGLGETFLOATI_VPROC getFloati_v = nullptr;
>+    PFNGLGETPROGRAMBINARYPROC getProgramBinary = nullptr;
>     PFNGLGETPROGRAMPIPELINEINFOLOGPROC getProgramPipelineInfoLog = nullptr;
>-    PFNGLGETPROGRAMPIPELINEIVPROC getProgramPipelineiv           = nullptr;
>-    PFNGLGETSHADERPRECISIONFORMATPROC getShaderPrecisionFormat   = nullptr;
>-    PFNGLGETVERTEXATTRIBLDVPROC getVertexAttribLdv               = nullptr;
>-    PFNGLISPROGRAMPIPELINEPROC isProgramPipeline                 = nullptr;
>-    PFNGLPROGRAMBINARYPROC programBinary                         = nullptr;
>-    PFNGLPROGRAMPARAMETERIPROC programParameteri                 = nullptr;
>-    PFNGLPROGRAMUNIFORM1DPROC programUniform1d                   = nullptr;
>-    PFNGLPROGRAMUNIFORM1DVPROC programUniform1dv                 = nullptr;
>-    PFNGLPROGRAMUNIFORM1FPROC programUniform1f                   = nullptr;
>-    PFNGLPROGRAMUNIFORM1FVPROC programUniform1fv                 = nullptr;
>-    PFNGLPROGRAMUNIFORM1IPROC programUniform1i                   = nullptr;
>-    PFNGLPROGRAMUNIFORM1IVPROC programUniform1iv                 = nullptr;
>-    PFNGLPROGRAMUNIFORM1UIPROC programUniform1ui                 = nullptr;
>-    PFNGLPROGRAMUNIFORM1UIVPROC programUniform1uiv               = nullptr;
>-    PFNGLPROGRAMUNIFORM2DPROC programUniform2d                   = nullptr;
>-    PFNGLPROGRAMUNIFORM2DVPROC programUniform2dv                 = nullptr;
>-    PFNGLPROGRAMUNIFORM2FPROC programUniform2f                   = nullptr;
>-    PFNGLPROGRAMUNIFORM2FVPROC programUniform2fv                 = nullptr;
>-    PFNGLPROGRAMUNIFORM2IPROC programUniform2i                   = nullptr;
>-    PFNGLPROGRAMUNIFORM2IVPROC programUniform2iv                 = nullptr;
>-    PFNGLPROGRAMUNIFORM2UIPROC programUniform2ui                 = nullptr;
>-    PFNGLPROGRAMUNIFORM2UIVPROC programUniform2uiv               = nullptr;
>-    PFNGLPROGRAMUNIFORM3DPROC programUniform3d                   = nullptr;
>-    PFNGLPROGRAMUNIFORM3DVPROC programUniform3dv                 = nullptr;
>-    PFNGLPROGRAMUNIFORM3FPROC programUniform3f                   = nullptr;
>-    PFNGLPROGRAMUNIFORM3FVPROC programUniform3fv                 = nullptr;
>-    PFNGLPROGRAMUNIFORM3IPROC programUniform3i                   = nullptr;
>-    PFNGLPROGRAMUNIFORM3IVPROC programUniform3iv                 = nullptr;
>-    PFNGLPROGRAMUNIFORM3UIPROC programUniform3ui                 = nullptr;
>-    PFNGLPROGRAMUNIFORM3UIVPROC programUniform3uiv               = nullptr;
>-    PFNGLPROGRAMUNIFORM4DPROC programUniform4d                   = nullptr;
>-    PFNGLPROGRAMUNIFORM4DVPROC programUniform4dv                 = nullptr;
>-    PFNGLPROGRAMUNIFORM4FPROC programUniform4f                   = nullptr;
>-    PFNGLPROGRAMUNIFORM4FVPROC programUniform4fv                 = nullptr;
>-    PFNGLPROGRAMUNIFORM4IPROC programUniform4i                   = nullptr;
>-    PFNGLPROGRAMUNIFORM4IVPROC programUniform4iv                 = nullptr;
>-    PFNGLPROGRAMUNIFORM4UIPROC programUniform4ui                 = nullptr;
>-    PFNGLPROGRAMUNIFORM4UIVPROC programUniform4uiv               = nullptr;
>-    PFNGLPROGRAMUNIFORMMATRIX2DVPROC programUniformMatrix2dv     = nullptr;
>-    PFNGLPROGRAMUNIFORMMATRIX2FVPROC programUniformMatrix2fv     = nullptr;
>+    PFNGLGETPROGRAMPIPELINEIVPROC getProgramPipelineiv = nullptr;
>+    PFNGLGETSHADERPRECISIONFORMATPROC getShaderPrecisionFormat = nullptr;
>+    PFNGLGETVERTEXATTRIBLDVPROC getVertexAttribLdv = nullptr;
>+    PFNGLISPROGRAMPIPELINEPROC isProgramPipeline = nullptr;
>+    PFNGLPROGRAMBINARYPROC programBinary = nullptr;
>+    PFNGLPROGRAMPARAMETERIPROC programParameteri = nullptr;
>+    PFNGLPROGRAMUNIFORM1DPROC programUniform1d = nullptr;
>+    PFNGLPROGRAMUNIFORM1DVPROC programUniform1dv = nullptr;
>+    PFNGLPROGRAMUNIFORM1FPROC programUniform1f = nullptr;
>+    PFNGLPROGRAMUNIFORM1FVPROC programUniform1fv = nullptr;
>+    PFNGLPROGRAMUNIFORM1IPROC programUniform1i = nullptr;
>+    PFNGLPROGRAMUNIFORM1IVPROC programUniform1iv = nullptr;
>+    PFNGLPROGRAMUNIFORM1UIPROC programUniform1ui = nullptr;
>+    PFNGLPROGRAMUNIFORM1UIVPROC programUniform1uiv = nullptr;
>+    PFNGLPROGRAMUNIFORM2DPROC programUniform2d = nullptr;
>+    PFNGLPROGRAMUNIFORM2DVPROC programUniform2dv = nullptr;
>+    PFNGLPROGRAMUNIFORM2FPROC programUniform2f = nullptr;
>+    PFNGLPROGRAMUNIFORM2FVPROC programUniform2fv = nullptr;
>+    PFNGLPROGRAMUNIFORM2IPROC programUniform2i = nullptr;
>+    PFNGLPROGRAMUNIFORM2IVPROC programUniform2iv = nullptr;
>+    PFNGLPROGRAMUNIFORM2UIPROC programUniform2ui = nullptr;
>+    PFNGLPROGRAMUNIFORM2UIVPROC programUniform2uiv = nullptr;
>+    PFNGLPROGRAMUNIFORM3DPROC programUniform3d = nullptr;
>+    PFNGLPROGRAMUNIFORM3DVPROC programUniform3dv = nullptr;
>+    PFNGLPROGRAMUNIFORM3FPROC programUniform3f = nullptr;
>+    PFNGLPROGRAMUNIFORM3FVPROC programUniform3fv = nullptr;
>+    PFNGLPROGRAMUNIFORM3IPROC programUniform3i = nullptr;
>+    PFNGLPROGRAMUNIFORM3IVPROC programUniform3iv = nullptr;
>+    PFNGLPROGRAMUNIFORM3UIPROC programUniform3ui = nullptr;
>+    PFNGLPROGRAMUNIFORM3UIVPROC programUniform3uiv = nullptr;
>+    PFNGLPROGRAMUNIFORM4DPROC programUniform4d = nullptr;
>+    PFNGLPROGRAMUNIFORM4DVPROC programUniform4dv = nullptr;
>+    PFNGLPROGRAMUNIFORM4FPROC programUniform4f = nullptr;
>+    PFNGLPROGRAMUNIFORM4FVPROC programUniform4fv = nullptr;
>+    PFNGLPROGRAMUNIFORM4IPROC programUniform4i = nullptr;
>+    PFNGLPROGRAMUNIFORM4IVPROC programUniform4iv = nullptr;
>+    PFNGLPROGRAMUNIFORM4UIPROC programUniform4ui = nullptr;
>+    PFNGLPROGRAMUNIFORM4UIVPROC programUniform4uiv = nullptr;
>+    PFNGLPROGRAMUNIFORMMATRIX2DVPROC programUniformMatrix2dv = nullptr;
>+    PFNGLPROGRAMUNIFORMMATRIX2FVPROC programUniformMatrix2fv = nullptr;
>     PFNGLPROGRAMUNIFORMMATRIX2X3DVPROC programUniformMatrix2x3dv = nullptr;
>     PFNGLPROGRAMUNIFORMMATRIX2X3FVPROC programUniformMatrix2x3fv = nullptr;
>     PFNGLPROGRAMUNIFORMMATRIX2X4DVPROC programUniformMatrix2x4dv = nullptr;
>     PFNGLPROGRAMUNIFORMMATRIX2X4FVPROC programUniformMatrix2x4fv = nullptr;
>-    PFNGLPROGRAMUNIFORMMATRIX3DVPROC programUniformMatrix3dv     = nullptr;
>-    PFNGLPROGRAMUNIFORMMATRIX3FVPROC programUniformMatrix3fv     = nullptr;
>+    PFNGLPROGRAMUNIFORMMATRIX3DVPROC programUniformMatrix3dv = nullptr;
>+    PFNGLPROGRAMUNIFORMMATRIX3FVPROC programUniformMatrix3fv = nullptr;
>     PFNGLPROGRAMUNIFORMMATRIX3X2DVPROC programUniformMatrix3x2dv = nullptr;
>     PFNGLPROGRAMUNIFORMMATRIX3X2FVPROC programUniformMatrix3x2fv = nullptr;
>     PFNGLPROGRAMUNIFORMMATRIX3X4DVPROC programUniformMatrix3x4dv = nullptr;
>     PFNGLPROGRAMUNIFORMMATRIX3X4FVPROC programUniformMatrix3x4fv = nullptr;
>-    PFNGLPROGRAMUNIFORMMATRIX4DVPROC programUniformMatrix4dv     = nullptr;
>-    PFNGLPROGRAMUNIFORMMATRIX4FVPROC programUniformMatrix4fv     = nullptr;
>+    PFNGLPROGRAMUNIFORMMATRIX4DVPROC programUniformMatrix4dv = nullptr;
>+    PFNGLPROGRAMUNIFORMMATRIX4FVPROC programUniformMatrix4fv = nullptr;
>     PFNGLPROGRAMUNIFORMMATRIX4X2DVPROC programUniformMatrix4x2dv = nullptr;
>     PFNGLPROGRAMUNIFORMMATRIX4X2FVPROC programUniformMatrix4x2fv = nullptr;
>     PFNGLPROGRAMUNIFORMMATRIX4X3DVPROC programUniformMatrix4x3dv = nullptr;
>     PFNGLPROGRAMUNIFORMMATRIX4X3FVPROC programUniformMatrix4x3fv = nullptr;
>-    PFNGLRELEASESHADERCOMPILERPROC releaseShaderCompiler         = nullptr;
>-    PFNGLSCISSORARRAYVPROC scissorArrayv                         = nullptr;
>-    PFNGLSCISSORINDEXEDPROC scissorIndexed                       = nullptr;
>-    PFNGLSCISSORINDEXEDVPROC scissorIndexedv                     = nullptr;
>-    PFNGLSHADERBINARYPROC shaderBinary                           = nullptr;
>-    PFNGLUSEPROGRAMSTAGESPROC useProgramStages                   = nullptr;
>-    PFNGLVALIDATEPROGRAMPIPELINEPROC validateProgramPipeline     = nullptr;
>-    PFNGLVERTEXATTRIBL1DPROC vertexAttribL1d                     = nullptr;
>-    PFNGLVERTEXATTRIBL1DVPROC vertexAttribL1dv                   = nullptr;
>-    PFNGLVERTEXATTRIBL2DPROC vertexAttribL2d                     = nullptr;
>-    PFNGLVERTEXATTRIBL2DVPROC vertexAttribL2dv                   = nullptr;
>-    PFNGLVERTEXATTRIBL3DPROC vertexAttribL3d                     = nullptr;
>-    PFNGLVERTEXATTRIBL3DVPROC vertexAttribL3dv                   = nullptr;
>-    PFNGLVERTEXATTRIBL4DPROC vertexAttribL4d                     = nullptr;
>-    PFNGLVERTEXATTRIBL4DVPROC vertexAttribL4dv                   = nullptr;
>-    PFNGLVERTEXATTRIBLPOINTERPROC vertexAttribLPointer           = nullptr;
>-    PFNGLVIEWPORTARRAYVPROC viewportArrayv                       = nullptr;
>-    PFNGLVIEWPORTINDEXEDFPROC viewportIndexedf                   = nullptr;
>-    PFNGLVIEWPORTINDEXEDFVPROC viewportIndexedfv                 = nullptr;
>+    PFNGLRELEASESHADERCOMPILERPROC releaseShaderCompiler = nullptr;
>+    PFNGLSCISSORARRAYVPROC scissorArrayv = nullptr;
>+    PFNGLSCISSORINDEXEDPROC scissorIndexed = nullptr;
>+    PFNGLSCISSORINDEXEDVPROC scissorIndexedv = nullptr;
>+    PFNGLSHADERBINARYPROC shaderBinary = nullptr;
>+    PFNGLUSEPROGRAMSTAGESPROC useProgramStages = nullptr;
>+    PFNGLVALIDATEPROGRAMPIPELINEPROC validateProgramPipeline = nullptr;
>+    PFNGLVERTEXATTRIBL1DPROC vertexAttribL1d = nullptr;
>+    PFNGLVERTEXATTRIBL1DVPROC vertexAttribL1dv = nullptr;
>+    PFNGLVERTEXATTRIBL2DPROC vertexAttribL2d = nullptr;
>+    PFNGLVERTEXATTRIBL2DVPROC vertexAttribL2dv = nullptr;
>+    PFNGLVERTEXATTRIBL3DPROC vertexAttribL3d = nullptr;
>+    PFNGLVERTEXATTRIBL3DVPROC vertexAttribL3dv = nullptr;
>+    PFNGLVERTEXATTRIBL4DPROC vertexAttribL4d = nullptr;
>+    PFNGLVERTEXATTRIBL4DVPROC vertexAttribL4dv = nullptr;
>+    PFNGLVERTEXATTRIBLPOINTERPROC vertexAttribLPointer = nullptr;
>+    PFNGLVIEWPORTARRAYVPROC viewportArrayv = nullptr;
>+    PFNGLVIEWPORTINDEXEDFPROC viewportIndexedf = nullptr;
>+    PFNGLVIEWPORTINDEXEDFVPROC viewportIndexedfv = nullptr;
> 
>     // 4.2
>-    PFNGLBINDIMAGETEXTUREPROC bindImageTexture                                   = nullptr;
>-    PFNGLDRAWARRAYSINSTANCEDBASEINSTANCEPROC drawArraysInstancedBaseInstance     = nullptr;
>+    PFNGLBINDIMAGETEXTUREPROC bindImageTexture = nullptr;
>+    PFNGLDRAWARRAYSINSTANCEDBASEINSTANCEPROC drawArraysInstancedBaseInstance = nullptr;
>     PFNGLDRAWELEMENTSINSTANCEDBASEINSTANCEPROC drawElementsInstancedBaseInstance = nullptr;
>-    PFNGLDRAWELEMENTSINSTANCEDBASEVERTEXBASEINSTANCEPROC
>-        drawElementsInstancedBaseVertexBaseInstance                                    = nullptr;
>-    PFNGLDRAWTRANSFORMFEEDBACKINSTANCEDPROC drawTransformFeedbackInstanced             = nullptr;
>+    PFNGLDRAWELEMENTSINSTANCEDBASEVERTEXBASEINSTANCEPROC drawElementsInstancedBaseVertexBaseInstance = nullptr;
>+    PFNGLDRAWTRANSFORMFEEDBACKINSTANCEDPROC drawTransformFeedbackInstanced = nullptr;
>     PFNGLDRAWTRANSFORMFEEDBACKSTREAMINSTANCEDPROC drawTransformFeedbackStreamInstanced = nullptr;
>-    PFNGLGETACTIVEATOMICCOUNTERBUFFERIVPROC getActiveAtomicCounterBufferiv             = nullptr;
>-    PFNGLGETINTERNALFORMATIVPROC getInternalformativ                                   = nullptr;
>-    PFNGLMEMORYBARRIERPROC memoryBarrier                                               = nullptr;
>-    PFNGLTEXSTORAGE1DPROC texStorage1D                                                 = nullptr;
>-    PFNGLTEXSTORAGE2DPROC texStorage2D                                                 = nullptr;
>-    PFNGLTEXSTORAGE3DPROC texStorage3D                                                 = nullptr;
>+    PFNGLGETACTIVEATOMICCOUNTERBUFFERIVPROC getActiveAtomicCounterBufferiv = nullptr;
>+    PFNGLGETINTERNALFORMATIVPROC getInternalformativ = nullptr;
>+    PFNGLMEMORYBARRIERPROC memoryBarrier = nullptr;
>+    PFNGLTEXSTORAGE1DPROC texStorage1D = nullptr;
>+    PFNGLTEXSTORAGE2DPROC texStorage2D = nullptr;
>+    PFNGLTEXSTORAGE3DPROC texStorage3D = nullptr;
> 
>     // 4.3
>-    PFNGLBINDVERTEXBUFFERPROC bindVertexBuffer                               = nullptr;
>-    PFNGLCLEARBUFFERDATAPROC clearBufferData                                 = nullptr;
>-    PFNGLCLEARBUFFERSUBDATAPROC clearBufferSubData                           = nullptr;
>-    PFNGLCOPYIMAGESUBDATAPROC copyImageSubData                               = nullptr;
>-    PFNGLCOVERAGEMODULATIONNVPROC coverageModulationNV                       = nullptr;
>-    PFNGLDEBUGMESSAGECALLBACKPROC debugMessageCallback                       = nullptr;
>-    PFNGLDEBUGMESSAGECONTROLPROC debugMessageControl                         = nullptr;
>-    PFNGLDEBUGMESSAGEINSERTPROC debugMessageInsert                           = nullptr;
>-    PFNGLDISPATCHCOMPUTEPROC dispatchCompute                                 = nullptr;
>-    PFNGLDISPATCHCOMPUTEINDIRECTPROC dispatchComputeIndirect                 = nullptr;
>-    PFNGLFRAMEBUFFERPARAMETERIPROC framebufferParameteri                     = nullptr;
>-    PFNGLGETDEBUGMESSAGELOGPROC getDebugMessageLog                           = nullptr;
>-    PFNGLGETFRAMEBUFFERPARAMETERIVPROC getFramebufferParameteriv             = nullptr;
>-    PFNGLGETINTERNALFORMATI64VPROC getInternalformati64v                     = nullptr;
>-    PFNGLGETOBJECTLABELPROC getObjectLabel                                   = nullptr;
>-    PFNGLGETOBJECTPTRLABELPROC getObjectPtrLabel                             = nullptr;
>-    PFNGLGETPOINTERVPROC getPointerv                                         = nullptr;
>-    PFNGLGETPROGRAMINTERFACEIVPROC getProgramInterfaceiv                     = nullptr;
>-    PFNGLGETPROGRAMRESOURCEINDEXPROC getProgramResourceIndex                 = nullptr;
>-    PFNGLGETPROGRAMRESOURCELOCATIONPROC getProgramResourceLocation           = nullptr;
>+    PFNGLBINDVERTEXBUFFERPROC bindVertexBuffer = nullptr;
>+    PFNGLCLEARBUFFERDATAPROC clearBufferData = nullptr;
>+    PFNGLCLEARBUFFERSUBDATAPROC clearBufferSubData = nullptr;
>+    PFNGLCOPYIMAGESUBDATAPROC copyImageSubData = nullptr;
>+    PFNGLCOVERAGEMODULATIONNVPROC coverageModulationNV = nullptr;
>+    PFNGLDEBUGMESSAGECALLBACKPROC debugMessageCallback = nullptr;
>+    PFNGLDEBUGMESSAGECONTROLPROC debugMessageControl = nullptr;
>+    PFNGLDEBUGMESSAGEINSERTPROC debugMessageInsert = nullptr;
>+    PFNGLDISPATCHCOMPUTEPROC dispatchCompute = nullptr;
>+    PFNGLDISPATCHCOMPUTEINDIRECTPROC dispatchComputeIndirect = nullptr;
>+    PFNGLFRAMEBUFFERPARAMETERIPROC framebufferParameteri = nullptr;
>+    PFNGLGETDEBUGMESSAGELOGPROC getDebugMessageLog = nullptr;
>+    PFNGLGETFRAMEBUFFERPARAMETERIVPROC getFramebufferParameteriv = nullptr;
>+    PFNGLGETINTERNALFORMATI64VPROC getInternalformati64v = nullptr;
>+    PFNGLGETOBJECTLABELPROC getObjectLabel = nullptr;
>+    PFNGLGETOBJECTPTRLABELPROC getObjectPtrLabel = nullptr;
>+    PFNGLGETPOINTERVPROC getPointerv = nullptr;
>+    PFNGLGETPROGRAMINTERFACEIVPROC getProgramInterfaceiv = nullptr;
>+    PFNGLGETPROGRAMRESOURCEINDEXPROC getProgramResourceIndex = nullptr;
>+    PFNGLGETPROGRAMRESOURCELOCATIONPROC getProgramResourceLocation = nullptr;
>     PFNGLGETPROGRAMRESOURCELOCATIONINDEXPROC getProgramResourceLocationIndex = nullptr;
>-    PFNGLGETPROGRAMRESOURCENAMEPROC getProgramResourceName                   = nullptr;
>-    PFNGLGETPROGRAMRESOURCEIVPROC getProgramResourceiv                       = nullptr;
>-    PFNGLINVALIDATEBUFFERDATAPROC invalidateBufferData                       = nullptr;
>-    PFNGLINVALIDATEBUFFERSUBDATAPROC invalidateBufferSubData                 = nullptr;
>-    PFNGLINVALIDATEFRAMEBUFFERPROC invalidateFramebuffer                     = nullptr;
>-    PFNGLINVALIDATESUBFRAMEBUFFERPROC invalidateSubFramebuffer               = nullptr;
>-    PFNGLINVALIDATETEXIMAGEPROC invalidateTexImage                           = nullptr;
>-    PFNGLINVALIDATETEXSUBIMAGEPROC invalidateTexSubImage                     = nullptr;
>-    PFNGLMULTIDRAWARRAYSINDIRECTPROC multiDrawArraysIndirect                 = nullptr;
>-    PFNGLMULTIDRAWELEMENTSINDIRECTPROC multiDrawElementsIndirect             = nullptr;
>-    PFNGLOBJECTLABELPROC objectLabel                                         = nullptr;
>-    PFNGLOBJECTPTRLABELPROC objectPtrLabel                                   = nullptr;
>-    PFNGLPOPDEBUGGROUPPROC popDebugGroup                                     = nullptr;
>-    PFNGLPUSHDEBUGGROUPPROC pushDebugGroup                                   = nullptr;
>-    PFNGLSHADERSTORAGEBLOCKBINDINGPROC shaderStorageBlockBinding             = nullptr;
>-    PFNGLTEXBUFFERRANGEPROC texBufferRange                                   = nullptr;
>-    PFNGLTEXSTORAGE2DMULTISAMPLEPROC texStorage2DMultisample                 = nullptr;
>-    PFNGLTEXSTORAGE3DMULTISAMPLEPROC texStorage3DMultisample                 = nullptr;
>-    PFNGLTEXTUREVIEWPROC textureView                                         = nullptr;
>-    PFNGLVERTEXATTRIBBINDINGPROC vertexAttribBinding                         = nullptr;
>-    PFNGLVERTEXATTRIBFORMATPROC vertexAttribFormat                           = nullptr;
>-    PFNGLVERTEXATTRIBIFORMATPROC vertexAttribIFormat                         = nullptr;
>-    PFNGLVERTEXATTRIBLFORMATPROC vertexAttribLFormat                         = nullptr;
>-    PFNGLVERTEXBINDINGDIVISORPROC vertexBindingDivisor                       = nullptr;
>+    PFNGLGETPROGRAMRESOURCENAMEPROC getProgramResourceName = nullptr;
>+    PFNGLGETPROGRAMRESOURCEIVPROC getProgramResourceiv = nullptr;
>+    PFNGLINVALIDATEBUFFERDATAPROC invalidateBufferData = nullptr;
>+    PFNGLINVALIDATEBUFFERSUBDATAPROC invalidateBufferSubData = nullptr;
>+    PFNGLINVALIDATEFRAMEBUFFERPROC invalidateFramebuffer = nullptr;
>+    PFNGLINVALIDATESUBFRAMEBUFFERPROC invalidateSubFramebuffer = nullptr;
>+    PFNGLINVALIDATETEXIMAGEPROC invalidateTexImage = nullptr;
>+    PFNGLINVALIDATETEXSUBIMAGEPROC invalidateTexSubImage = nullptr;
>+    PFNGLMULTIDRAWARRAYSINDIRECTPROC multiDrawArraysIndirect = nullptr;
>+    PFNGLMULTIDRAWELEMENTSINDIRECTPROC multiDrawElementsIndirect = nullptr;
>+    PFNGLOBJECTLABELPROC objectLabel = nullptr;
>+    PFNGLOBJECTPTRLABELPROC objectPtrLabel = nullptr;
>+    PFNGLPOPDEBUGGROUPPROC popDebugGroup = nullptr;
>+    PFNGLPUSHDEBUGGROUPPROC pushDebugGroup = nullptr;
>+    PFNGLSHADERSTORAGEBLOCKBINDINGPROC shaderStorageBlockBinding = nullptr;
>+    PFNGLTEXBUFFERRANGEPROC texBufferRange = nullptr;
>+    PFNGLTEXSTORAGE2DMULTISAMPLEPROC texStorage2DMultisample = nullptr;
>+    PFNGLTEXSTORAGE3DMULTISAMPLEPROC texStorage3DMultisample = nullptr;
>+    PFNGLTEXTUREVIEWPROC textureView = nullptr;
>+    PFNGLVERTEXATTRIBBINDINGPROC vertexAttribBinding = nullptr;
>+    PFNGLVERTEXATTRIBFORMATPROC vertexAttribFormat = nullptr;
>+    PFNGLVERTEXATTRIBIFORMATPROC vertexAttribIFormat = nullptr;
>+    PFNGLVERTEXATTRIBLFORMATPROC vertexAttribLFormat = nullptr;
>+    PFNGLVERTEXBINDINGDIVISORPROC vertexBindingDivisor = nullptr;
> 
>     // 4.4
>-    PFNGLBINDBUFFERSBASEPROC bindBuffersBase     = nullptr;
>-    PFNGLBINDBUFFERSRANGEPROC bindBuffersRange   = nullptr;
>+    PFNGLBINDBUFFERSBASEPROC bindBuffersBase = nullptr;
>+    PFNGLBINDBUFFERSRANGEPROC bindBuffersRange = nullptr;
>     PFNGLBINDIMAGETEXTURESPROC bindImageTextures = nullptr;
>-    PFNGLBINDSAMPLERSPROC bindSamplers           = nullptr;
>-    PFNGLBINDTEXTURESPROC bindTextures           = nullptr;
>+    PFNGLBINDSAMPLERSPROC bindSamplers = nullptr;
>+    PFNGLBINDTEXTURESPROC bindTextures = nullptr;
>     PFNGLBINDVERTEXBUFFERSPROC bindVertexBuffers = nullptr;
>-    PFNGLBUFFERSTORAGEPROC bufferStorage         = nullptr;
>-    PFNGLCLEARTEXIMAGEPROC clearTexImage         = nullptr;
>-    PFNGLCLEARTEXSUBIMAGEPROC clearTexSubImage   = nullptr;
>+    PFNGLBUFFERSTORAGEPROC bufferStorage = nullptr;
>+    PFNGLCLEARTEXIMAGEPROC clearTexImage = nullptr;
>+    PFNGLCLEARTEXSUBIMAGEPROC clearTexSubImage = nullptr;
> 
>     // 4.5
>-    PFNGLBINDTEXTUREUNITPROC bindTextureUnit                           = nullptr;
>-    PFNGLBLITNAMEDFRAMEBUFFERPROC blitNamedFramebuffer                 = nullptr;
>-    PFNGLCHECKNAMEDFRAMEBUFFERSTATUSPROC checkNamedFramebufferStatus   = nullptr;
>-    PFNGLCLEARNAMEDBUFFERDATAPROC clearNamedBufferData                 = nullptr;
>-    PFNGLCLEARNAMEDBUFFERSUBDATAPROC clearNamedBufferSubData           = nullptr;
>-    PFNGLCLEARNAMEDFRAMEBUFFERFIPROC clearNamedFramebufferfi           = nullptr;
>-    PFNGLCLEARNAMEDFRAMEBUFFERFVPROC clearNamedFramebufferfv           = nullptr;
>-    PFNGLCLEARNAMEDFRAMEBUFFERIVPROC clearNamedFramebufferiv           = nullptr;
>-    PFNGLCLEARNAMEDFRAMEBUFFERUIVPROC clearNamedFramebufferuiv         = nullptr;
>-    PFNGLCLIPCONTROLPROC clipControl                                   = nullptr;
>-    PFNGLCOMPRESSEDTEXTURESUBIMAGE1DPROC compressedTextureSubImage1D   = nullptr;
>-    PFNGLCOMPRESSEDTEXTURESUBIMAGE2DPROC compressedTextureSubImage2D   = nullptr;
>-    PFNGLCOMPRESSEDTEXTURESUBIMAGE3DPROC compressedTextureSubImage3D   = nullptr;
>-    PFNGLCOPYNAMEDBUFFERSUBDATAPROC copyNamedBufferSubData             = nullptr;
>-    PFNGLCOPYTEXTURESUBIMAGE1DPROC copyTextureSubImage1D               = nullptr;
>-    PFNGLCOPYTEXTURESUBIMAGE2DPROC copyTextureSubImage2D               = nullptr;
>-    PFNGLCOPYTEXTURESUBIMAGE3DPROC copyTextureSubImage3D               = nullptr;
>-    PFNGLCREATEBUFFERSPROC createBuffers                               = nullptr;
>-    PFNGLCREATEFRAMEBUFFERSPROC createFramebuffers                     = nullptr;
>-    PFNGLCREATEPROGRAMPIPELINESPROC createProgramPipelines             = nullptr;
>-    PFNGLCREATEQUERIESPROC createQueries                               = nullptr;
>-    PFNGLCREATERENDERBUFFERSPROC createRenderbuffers                   = nullptr;
>-    PFNGLCREATESAMPLERSPROC createSamplers                             = nullptr;
>-    PFNGLCREATETEXTURESPROC createTextures                             = nullptr;
>-    PFNGLCREATETRANSFORMFEEDBACKSPROC createTransformFeedbacks         = nullptr;
>-    PFNGLCREATEVERTEXARRAYSPROC createVertexArrays                     = nullptr;
>-    PFNGLDISABLEVERTEXARRAYATTRIBPROC disableVertexArrayAttrib         = nullptr;
>-    PFNGLENABLEVERTEXARRAYATTRIBPROC enableVertexArrayAttrib           = nullptr;
>-    PFNGLFLUSHMAPPEDNAMEDBUFFERRANGEPROC flushMappedNamedBufferRange   = nullptr;
>-    PFNGLGENERATETEXTUREMIPMAPPROC generateTextureMipmap               = nullptr;
>-    PFNGLGETCOMPRESSEDTEXTUREIMAGEPROC getCompressedTextureImage       = nullptr;
>+    PFNGLBINDTEXTUREUNITPROC bindTextureUnit = nullptr;
>+    PFNGLBLITNAMEDFRAMEBUFFERPROC blitNamedFramebuffer = nullptr;
>+    PFNGLCHECKNAMEDFRAMEBUFFERSTATUSPROC checkNamedFramebufferStatus = nullptr;
>+    PFNGLCLEARNAMEDBUFFERDATAPROC clearNamedBufferData = nullptr;
>+    PFNGLCLEARNAMEDBUFFERSUBDATAPROC clearNamedBufferSubData = nullptr;
>+    PFNGLCLEARNAMEDFRAMEBUFFERFIPROC clearNamedFramebufferfi = nullptr;
>+    PFNGLCLEARNAMEDFRAMEBUFFERFVPROC clearNamedFramebufferfv = nullptr;
>+    PFNGLCLEARNAMEDFRAMEBUFFERIVPROC clearNamedFramebufferiv = nullptr;
>+    PFNGLCLEARNAMEDFRAMEBUFFERUIVPROC clearNamedFramebufferuiv = nullptr;
>+    PFNGLCLIPCONTROLPROC clipControl = nullptr;
>+    PFNGLCOMPRESSEDTEXTURESUBIMAGE1DPROC compressedTextureSubImage1D = nullptr;
>+    PFNGLCOMPRESSEDTEXTURESUBIMAGE2DPROC compressedTextureSubImage2D = nullptr;
>+    PFNGLCOMPRESSEDTEXTURESUBIMAGE3DPROC compressedTextureSubImage3D = nullptr;
>+    PFNGLCOPYNAMEDBUFFERSUBDATAPROC copyNamedBufferSubData = nullptr;
>+    PFNGLCOPYTEXTURESUBIMAGE1DPROC copyTextureSubImage1D = nullptr;
>+    PFNGLCOPYTEXTURESUBIMAGE2DPROC copyTextureSubImage2D = nullptr;
>+    PFNGLCOPYTEXTURESUBIMAGE3DPROC copyTextureSubImage3D = nullptr;
>+    PFNGLCREATEBUFFERSPROC createBuffers = nullptr;
>+    PFNGLCREATEFRAMEBUFFERSPROC createFramebuffers = nullptr;
>+    PFNGLCREATEPROGRAMPIPELINESPROC createProgramPipelines = nullptr;
>+    PFNGLCREATEQUERIESPROC createQueries = nullptr;
>+    PFNGLCREATERENDERBUFFERSPROC createRenderbuffers = nullptr;
>+    PFNGLCREATESAMPLERSPROC createSamplers = nullptr;
>+    PFNGLCREATETEXTURESPROC createTextures = nullptr;
>+    PFNGLCREATETRANSFORMFEEDBACKSPROC createTransformFeedbacks = nullptr;
>+    PFNGLCREATEVERTEXARRAYSPROC createVertexArrays = nullptr;
>+    PFNGLDISABLEVERTEXARRAYATTRIBPROC disableVertexArrayAttrib = nullptr;
>+    PFNGLENABLEVERTEXARRAYATTRIBPROC enableVertexArrayAttrib = nullptr;
>+    PFNGLFLUSHMAPPEDNAMEDBUFFERRANGEPROC flushMappedNamedBufferRange = nullptr;
>+    PFNGLGENERATETEXTUREMIPMAPPROC generateTextureMipmap = nullptr;
>+    PFNGLGETCOMPRESSEDTEXTUREIMAGEPROC getCompressedTextureImage = nullptr;
>     PFNGLGETCOMPRESSEDTEXTURESUBIMAGEPROC getCompressedTextureSubImage = nullptr;
>-    PFNGLGETGRAPHICSRESETSTATUSPROC getGraphicsResetStatus             = nullptr;
>-    PFNGLGETNAMEDBUFFERPARAMETERI64VPROC getNamedBufferParameteri64v   = nullptr;
>-    PFNGLGETNAMEDBUFFERPARAMETERIVPROC getNamedBufferParameteriv       = nullptr;
>-    PFNGLGETNAMEDBUFFERPOINTERVPROC getNamedBufferPointerv             = nullptr;
>-    PFNGLGETNAMEDBUFFERSUBDATAPROC getNamedBufferSubData               = nullptr;
>-    PFNGLGETNAMEDFRAMEBUFFERATTACHMENTPARAMETERIVPROC getNamedFramebufferAttachmentParameteriv =
>-        nullptr;
>-    PFNGLGETNAMEDFRAMEBUFFERPARAMETERIVPROC getNamedFramebufferParameteriv           = nullptr;
>-    PFNGLGETNAMEDRENDERBUFFERPARAMETERIVPROC getNamedRenderbufferParameteriv         = nullptr;
>-    PFNGLGETQUERYBUFFEROBJECTI64VPROC getQueryBufferObjecti64v                       = nullptr;
>-    PFNGLGETQUERYBUFFEROBJECTIVPROC getQueryBufferObjectiv                           = nullptr;
>-    PFNGLGETQUERYBUFFEROBJECTUI64VPROC getQueryBufferObjectui64v                     = nullptr;
>-    PFNGLGETQUERYBUFFEROBJECTUIVPROC getQueryBufferObjectuiv                         = nullptr;
>-    PFNGLGETTEXTUREIMAGEPROC getTextureImage                                         = nullptr;
>-    PFNGLGETTEXTURELEVELPARAMETERFVPROC getTextureLevelParameterfv                   = nullptr;
>-    PFNGLGETTEXTURELEVELPARAMETERIVPROC getTextureLevelParameteriv                   = nullptr;
>-    PFNGLGETTEXTUREPARAMETERIIVPROC getTextureParameterIiv                           = nullptr;
>-    PFNGLGETTEXTUREPARAMETERIUIVPROC getTextureParameterIuiv                         = nullptr;
>-    PFNGLGETTEXTUREPARAMETERFVPROC getTextureParameterfv                             = nullptr;
>-    PFNGLGETTEXTUREPARAMETERIVPROC getTextureParameteriv                             = nullptr;
>-    PFNGLGETTEXTURESUBIMAGEPROC getTextureSubImage                                   = nullptr;
>-    PFNGLGETTRANSFORMFEEDBACKI64_VPROC getTransformFeedbacki64_v                     = nullptr;
>-    PFNGLGETTRANSFORMFEEDBACKI_VPROC getTransformFeedbacki_v                         = nullptr;
>-    PFNGLGETTRANSFORMFEEDBACKIVPROC getTransformFeedbackiv                           = nullptr;
>-    PFNGLGETVERTEXARRAYINDEXED64IVPROC getVertexArrayIndexed64iv                     = nullptr;
>-    PFNGLGETVERTEXARRAYINDEXEDIVPROC getVertexArrayIndexediv                         = nullptr;
>-    PFNGLGETVERTEXARRAYIVPROC getVertexArrayiv                                       = nullptr;
>-    PFNGLGETNCOMPRESSEDTEXIMAGEPROC getnCompressedTexImage                           = nullptr;
>-    PFNGLGETNTEXIMAGEPROC getnTexImage                                               = nullptr;
>-    PFNGLGETNUNIFORMDVPROC getnUniformdv                                             = nullptr;
>-    PFNGLGETNUNIFORMFVPROC getnUniformfv                                             = nullptr;
>-    PFNGLGETNUNIFORMIVPROC getnUniformiv                                             = nullptr;
>-    PFNGLGETNUNIFORMUIVPROC getnUniformuiv                                           = nullptr;
>-    PFNGLINVALIDATENAMEDFRAMEBUFFERDATAPROC invalidateNamedFramebufferData           = nullptr;
>-    PFNGLINVALIDATENAMEDFRAMEBUFFERSUBDATAPROC invalidateNamedFramebufferSubData     = nullptr;
>-    PFNGLMAPNAMEDBUFFERPROC mapNamedBuffer                                           = nullptr;
>-    PFNGLMAPNAMEDBUFFERRANGEPROC mapNamedBufferRange                                 = nullptr;
>-    PFNGLMEMORYBARRIERBYREGIONPROC memoryBarrierByRegion                             = nullptr;
>-    PFNGLNAMEDBUFFERDATAPROC namedBufferData                                         = nullptr;
>-    PFNGLNAMEDBUFFERSTORAGEPROC namedBufferStorage                                   = nullptr;
>-    PFNGLNAMEDBUFFERSUBDATAPROC namedBufferSubData                                   = nullptr;
>-    PFNGLNAMEDFRAMEBUFFERDRAWBUFFERPROC namedFramebufferDrawBuffer                   = nullptr;
>-    PFNGLNAMEDFRAMEBUFFERDRAWBUFFERSPROC namedFramebufferDrawBuffers                 = nullptr;
>-    PFNGLNAMEDFRAMEBUFFERPARAMETERIPROC namedFramebufferParameteri                   = nullptr;
>-    PFNGLNAMEDFRAMEBUFFERREADBUFFERPROC namedFramebufferReadBuffer                   = nullptr;
>-    PFNGLNAMEDFRAMEBUFFERRENDERBUFFERPROC namedFramebufferRenderbuffer               = nullptr;
>-    PFNGLNAMEDFRAMEBUFFERTEXTUREPROC namedFramebufferTexture                         = nullptr;
>-    PFNGLNAMEDFRAMEBUFFERTEXTURELAYERPROC namedFramebufferTextureLayer               = nullptr;
>-    PFNGLNAMEDRENDERBUFFERSTORAGEPROC namedRenderbufferStorage                       = nullptr;
>+    PFNGLGETGRAPHICSRESETSTATUSPROC getGraphicsResetStatus = nullptr;
>+    PFNGLGETNAMEDBUFFERPARAMETERI64VPROC getNamedBufferParameteri64v = nullptr;
>+    PFNGLGETNAMEDBUFFERPARAMETERIVPROC getNamedBufferParameteriv = nullptr;
>+    PFNGLGETNAMEDBUFFERPOINTERVPROC getNamedBufferPointerv = nullptr;
>+    PFNGLGETNAMEDBUFFERSUBDATAPROC getNamedBufferSubData = nullptr;
>+    PFNGLGETNAMEDFRAMEBUFFERATTACHMENTPARAMETERIVPROC getNamedFramebufferAttachmentParameteriv = nullptr;
>+    PFNGLGETNAMEDFRAMEBUFFERPARAMETERIVPROC getNamedFramebufferParameteriv = nullptr;
>+    PFNGLGETNAMEDRENDERBUFFERPARAMETERIVPROC getNamedRenderbufferParameteriv = nullptr;
>+    PFNGLGETQUERYBUFFEROBJECTI64VPROC getQueryBufferObjecti64v = nullptr;
>+    PFNGLGETQUERYBUFFEROBJECTIVPROC getQueryBufferObjectiv = nullptr;
>+    PFNGLGETQUERYBUFFEROBJECTUI64VPROC getQueryBufferObjectui64v = nullptr;
>+    PFNGLGETQUERYBUFFEROBJECTUIVPROC getQueryBufferObjectuiv = nullptr;
>+    PFNGLGETTEXTUREIMAGEPROC getTextureImage = nullptr;
>+    PFNGLGETTEXTURELEVELPARAMETERFVPROC getTextureLevelParameterfv = nullptr;
>+    PFNGLGETTEXTURELEVELPARAMETERIVPROC getTextureLevelParameteriv = nullptr;
>+    PFNGLGETTEXTUREPARAMETERIIVPROC getTextureParameterIiv = nullptr;
>+    PFNGLGETTEXTUREPARAMETERIUIVPROC getTextureParameterIuiv = nullptr;
>+    PFNGLGETTEXTUREPARAMETERFVPROC getTextureParameterfv = nullptr;
>+    PFNGLGETTEXTUREPARAMETERIVPROC getTextureParameteriv = nullptr;
>+    PFNGLGETTEXTURESUBIMAGEPROC getTextureSubImage = nullptr;
>+    PFNGLGETTRANSFORMFEEDBACKI64_VPROC getTransformFeedbacki64_v = nullptr;
>+    PFNGLGETTRANSFORMFEEDBACKI_VPROC getTransformFeedbacki_v = nullptr;
>+    PFNGLGETTRANSFORMFEEDBACKIVPROC getTransformFeedbackiv = nullptr;
>+    PFNGLGETVERTEXARRAYINDEXED64IVPROC getVertexArrayIndexed64iv = nullptr;
>+    PFNGLGETVERTEXARRAYINDEXEDIVPROC getVertexArrayIndexediv = nullptr;
>+    PFNGLGETVERTEXARRAYIVPROC getVertexArrayiv = nullptr;
>+    PFNGLGETNCOMPRESSEDTEXIMAGEPROC getnCompressedTexImage = nullptr;
>+    PFNGLGETNTEXIMAGEPROC getnTexImage = nullptr;
>+    PFNGLGETNUNIFORMDVPROC getnUniformdv = nullptr;
>+    PFNGLGETNUNIFORMFVPROC getnUniformfv = nullptr;
>+    PFNGLGETNUNIFORMIVPROC getnUniformiv = nullptr;
>+    PFNGLGETNUNIFORMUIVPROC getnUniformuiv = nullptr;
>+    PFNGLINVALIDATENAMEDFRAMEBUFFERDATAPROC invalidateNamedFramebufferData = nullptr;
>+    PFNGLINVALIDATENAMEDFRAMEBUFFERSUBDATAPROC invalidateNamedFramebufferSubData = nullptr;
>+    PFNGLMAPNAMEDBUFFERPROC mapNamedBuffer = nullptr;
>+    PFNGLMAPNAMEDBUFFERRANGEPROC mapNamedBufferRange = nullptr;
>+    PFNGLMEMORYBARRIERBYREGIONPROC memoryBarrierByRegion = nullptr;
>+    PFNGLNAMEDBUFFERDATAPROC namedBufferData = nullptr;
>+    PFNGLNAMEDBUFFERSTORAGEPROC namedBufferStorage = nullptr;
>+    PFNGLNAMEDBUFFERSUBDATAPROC namedBufferSubData = nullptr;
>+    PFNGLNAMEDFRAMEBUFFERDRAWBUFFERPROC namedFramebufferDrawBuffer = nullptr;
>+    PFNGLNAMEDFRAMEBUFFERDRAWBUFFERSPROC namedFramebufferDrawBuffers = nullptr;
>+    PFNGLNAMEDFRAMEBUFFERPARAMETERIPROC namedFramebufferParameteri = nullptr;
>+    PFNGLNAMEDFRAMEBUFFERREADBUFFERPROC namedFramebufferReadBuffer = nullptr;
>+    PFNGLNAMEDFRAMEBUFFERRENDERBUFFERPROC namedFramebufferRenderbuffer = nullptr;
>+    PFNGLNAMEDFRAMEBUFFERTEXTUREPROC namedFramebufferTexture = nullptr;
>+    PFNGLNAMEDFRAMEBUFFERTEXTURELAYERPROC namedFramebufferTextureLayer = nullptr;
>+    PFNGLNAMEDRENDERBUFFERSTORAGEPROC namedRenderbufferStorage = nullptr;
>     PFNGLNAMEDRENDERBUFFERSTORAGEMULTISAMPLEPROC namedRenderbufferStorageMultisample = nullptr;
>-    PFNGLREADNPIXELSPROC readnPixels                                                 = nullptr;
>-    PFNGLTEXTUREBARRIERPROC textureBarrier                                           = nullptr;
>-    PFNGLTEXTUREBUFFERPROC textureBuffer                                             = nullptr;
>-    PFNGLTEXTUREBUFFERRANGEPROC textureBufferRange                                   = nullptr;
>-    PFNGLTEXTUREPARAMETERIIVPROC textureParameterIiv                                 = nullptr;
>-    PFNGLTEXTUREPARAMETERIUIVPROC textureParameterIuiv                               = nullptr;
>-    PFNGLTEXTUREPARAMETERFPROC textureParameterf                                     = nullptr;
>-    PFNGLTEXTUREPARAMETERFVPROC textureParameterfv                                   = nullptr;
>-    PFNGLTEXTUREPARAMETERIPROC textureParameteri                                     = nullptr;
>-    PFNGLTEXTUREPARAMETERIVPROC textureParameteriv                                   = nullptr;
>-    PFNGLTEXTURESTORAGE1DPROC textureStorage1D                                       = nullptr;
>-    PFNGLTEXTURESTORAGE2DPROC textureStorage2D                                       = nullptr;
>-    PFNGLTEXTURESTORAGE2DMULTISAMPLEPROC textureStorage2DMultisample                 = nullptr;
>-    PFNGLTEXTURESTORAGE3DPROC textureStorage3D                                       = nullptr;
>-    PFNGLTEXTURESTORAGE3DMULTISAMPLEPROC textureStorage3DMultisample                 = nullptr;
>-    PFNGLTEXTURESUBIMAGE1DPROC textureSubImage1D                                     = nullptr;
>-    PFNGLTEXTURESUBIMAGE2DPROC textureSubImage2D                                     = nullptr;
>-    PFNGLTEXTURESUBIMAGE3DPROC textureSubImage3D                                     = nullptr;
>-    PFNGLTRANSFORMFEEDBACKBUFFERBASEPROC transformFeedbackBufferBase                 = nullptr;
>-    PFNGLTRANSFORMFEEDBACKBUFFERRANGEPROC transformFeedbackBufferRange               = nullptr;
>-    PFNGLUNMAPNAMEDBUFFERPROC unmapNamedBuffer                                       = nullptr;
>-    PFNGLVERTEXARRAYATTRIBBINDINGPROC vertexArrayAttribBinding                       = nullptr;
>-    PFNGLVERTEXARRAYATTRIBFORMATPROC vertexArrayAttribFormat                         = nullptr;
>-    PFNGLVERTEXARRAYATTRIBIFORMATPROC vertexArrayAttribIFormat                       = nullptr;
>-    PFNGLVERTEXARRAYATTRIBLFORMATPROC vertexArrayAttribLFormat                       = nullptr;
>-    PFNGLVERTEXARRAYBINDINGDIVISORPROC vertexArrayBindingDivisor                     = nullptr;
>-    PFNGLVERTEXARRAYELEMENTBUFFERPROC vertexArrayElementBuffer                       = nullptr;
>-    PFNGLVERTEXARRAYVERTEXBUFFERPROC vertexArrayVertexBuffer                         = nullptr;
>-    PFNGLVERTEXARRAYVERTEXBUFFERSPROC vertexArrayVertexBuffers                       = nullptr;
>+    PFNGLREADNPIXELSPROC readnPixels = nullptr;
>+    PFNGLTEXTUREBARRIERPROC textureBarrier = nullptr;
>+    PFNGLTEXTUREBUFFERPROC textureBuffer = nullptr;
>+    PFNGLTEXTUREBUFFERRANGEPROC textureBufferRange = nullptr;
>+    PFNGLTEXTUREPARAMETERIIVPROC textureParameterIiv = nullptr;
>+    PFNGLTEXTUREPARAMETERIUIVPROC textureParameterIuiv = nullptr;
>+    PFNGLTEXTUREPARAMETERFPROC textureParameterf = nullptr;
>+    PFNGLTEXTUREPARAMETERFVPROC textureParameterfv = nullptr;
>+    PFNGLTEXTUREPARAMETERIPROC textureParameteri = nullptr;
>+    PFNGLTEXTUREPARAMETERIVPROC textureParameteriv = nullptr;
>+    PFNGLTEXTURESTORAGE1DPROC textureStorage1D = nullptr;
>+    PFNGLTEXTURESTORAGE2DPROC textureStorage2D = nullptr;
>+    PFNGLTEXTURESTORAGE2DMULTISAMPLEPROC textureStorage2DMultisample = nullptr;
>+    PFNGLTEXTURESTORAGE3DPROC textureStorage3D = nullptr;
>+    PFNGLTEXTURESTORAGE3DMULTISAMPLEPROC textureStorage3DMultisample = nullptr;
>+    PFNGLTEXTURESUBIMAGE1DPROC textureSubImage1D = nullptr;
>+    PFNGLTEXTURESUBIMAGE2DPROC textureSubImage2D = nullptr;
>+    PFNGLTEXTURESUBIMAGE3DPROC textureSubImage3D = nullptr;
>+    PFNGLTRANSFORMFEEDBACKBUFFERBASEPROC transformFeedbackBufferBase = nullptr;
>+    PFNGLTRANSFORMFEEDBACKBUFFERRANGEPROC transformFeedbackBufferRange = nullptr;
>+    PFNGLUNMAPNAMEDBUFFERPROC unmapNamedBuffer = nullptr;
>+    PFNGLVERTEXARRAYATTRIBBINDINGPROC vertexArrayAttribBinding = nullptr;
>+    PFNGLVERTEXARRAYATTRIBFORMATPROC vertexArrayAttribFormat = nullptr;
>+    PFNGLVERTEXARRAYATTRIBIFORMATPROC vertexArrayAttribIFormat = nullptr;
>+    PFNGLVERTEXARRAYATTRIBLFORMATPROC vertexArrayAttribLFormat = nullptr;
>+    PFNGLVERTEXARRAYBINDINGDIVISORPROC vertexArrayBindingDivisor = nullptr;
>+    PFNGLVERTEXARRAYELEMENTBUFFERPROC vertexArrayElementBuffer = nullptr;
>+    PFNGLVERTEXARRAYVERTEXBUFFERPROC vertexArrayVertexBuffer = nullptr;
>+    PFNGLVERTEXARRAYVERTEXBUFFERSPROC vertexArrayVertexBuffers = nullptr;
> 
>     // ES 3.2
>-    PFNGLBLENDBARRIERPROC blendBarrier                 = nullptr;
>+    PFNGLBLENDBARRIERPROC blendBarrier = nullptr;
>     PFNGLPRIMITIVEBOUNDINGBOXPROC primitiveBoundingBox = nullptr;
> 
>-    // EXT_debug_marker
>+    // GL_ARB_parallel_shader_compile
>+    PFNGLMAXSHADERCOMPILERTHREADSARBPROC maxShaderCompilerThreadsARB = nullptr;
>+
>+    // GL_EXT_debug_marker
>     PFNGLINSERTEVENTMARKEREXTPROC insertEventMarkerEXT = nullptr;
>-    PFNGLPOPGROUPMARKEREXTPROC popGroupMarkerEXT       = nullptr;
>-    PFNGLPUSHGROUPMARKEREXTPROC pushGroupMarkerEXT     = nullptr;
>+    PFNGLPOPGROUPMARKEREXTPROC popGroupMarkerEXT = nullptr;
>+    PFNGLPUSHGROUPMARKEREXTPROC pushGroupMarkerEXT = nullptr;
> 
>     // GL_EXT_discard_framebuffer
>     PFNGLDISCARDFRAMEBUFFEREXTPROC discardFramebufferEXT = nullptr;
> 
>+    // GL_KHR_parallel_shader_compile
>+    PFNGLMAXSHADERCOMPILERTHREADSKHRPROC maxShaderCompilerThreadsKHR = nullptr;
>+
>     // GL_NV_internalformat_sample_query
>     PFNGLGETINTERNALFORMATSAMPLEIVNVPROC getInternalformatSampleivNV = nullptr;
> 
>     // GL_OES_EGL_image
>     PFNGLEGLIMAGETARGETRENDERBUFFERSTORAGEOESPROC eGLImageTargetRenderbufferStorageOES = nullptr;
>-    PFNGLEGLIMAGETARGETTEXTURE2DOESPROC eGLImageTargetTexture2DOES                     = nullptr;
>+    PFNGLEGLIMAGETARGETTEXTURE2DOESPROC eGLImageTargetTexture2DOES = nullptr;
>+
>+    // GL_OVR_multiview2
>+    PFNGLFRAMEBUFFERTEXTUREMULTIVIEWOVRPROC framebufferTextureMultiviewOVR = nullptr;
> 
>     // NV_path_rendering (originally written against 3.2 compatibility profile)
>-    PFNGLCOVERFILLPATHINSTANCEDNVPROC coverFillPathInstancedNV                           = nullptr;
>-    PFNGLCOVERFILLPATHNVPROC coverFillPathNV                                             = nullptr;
>-    PFNGLCOVERSTROKEPATHINSTANCEDNVPROC coverStrokePathInstancedNV                       = nullptr;
>-    PFNGLCOVERSTROKEPATHNVPROC coverStrokePathNV                                         = nullptr;
>-    PFNGLDELETEPATHSNVPROC deletePathsNV                                                 = nullptr;
>-    PFNGLGENPATHSNVPROC genPathsNV                                                       = nullptr;
>-    PFNGLGETPATHPARAMETERFVNVPROC getPathParameterfvNV                                   = nullptr;
>-    PFNGLGETPATHPARAMETERIVNVPROC getPathParameterivNV                                   = nullptr;
>-    PFNGLISPATHNVPROC isPathNV                                                           = nullptr;
>-    PFNGLMATRIXLOADFEXTPROC matrixLoadfEXT                                               = nullptr;
>-    PFNGLPATHCOMMANDSNVPROC pathCommandsNV                                               = nullptr;
>-    PFNGLPATHPARAMETERFNVPROC pathParameterfNV                                           = nullptr;
>-    PFNGLPATHPARAMETERINVPROC pathParameteriNV                                           = nullptr;
>-    PFNGLPATHSTENCILFUNCNVPROC pathStencilFuncNV                                         = nullptr;
>-    PFNGLPROGRAMPATHFRAGMENTINPUTGENNVPROC programPathFragmentInputGenNV                 = nullptr;
>-    PFNGLSTENCILFILLPATHINSTANCEDNVPROC stencilFillPathInstancedNV                       = nullptr;
>-    PFNGLSTENCILFILLPATHNVPROC stencilFillPathNV                                         = nullptr;
>-    PFNGLSTENCILSTROKEPATHINSTANCEDNVPROC stencilStrokePathInstancedNV                   = nullptr;
>-    PFNGLSTENCILSTROKEPATHNVPROC stencilStrokePathNV                                     = nullptr;
>-    PFNGLSTENCILTHENCOVERFILLPATHINSTANCEDNVPROC stencilThenCoverFillPathInstancedNV     = nullptr;
>-    PFNGLSTENCILTHENCOVERFILLPATHNVPROC stencilThenCoverFillPathNV                       = nullptr;
>+    PFNGLCOVERFILLPATHINSTANCEDNVPROC coverFillPathInstancedNV = nullptr;
>+    PFNGLCOVERFILLPATHNVPROC coverFillPathNV = nullptr;
>+    PFNGLCOVERSTROKEPATHINSTANCEDNVPROC coverStrokePathInstancedNV = nullptr;
>+    PFNGLCOVERSTROKEPATHNVPROC coverStrokePathNV = nullptr;
>+    PFNGLDELETEPATHSNVPROC deletePathsNV = nullptr;
>+    PFNGLGENPATHSNVPROC genPathsNV = nullptr;
>+    PFNGLGETPATHPARAMETERFVNVPROC getPathParameterfvNV = nullptr;
>+    PFNGLGETPATHPARAMETERIVNVPROC getPathParameterivNV = nullptr;
>+    PFNGLISPATHNVPROC isPathNV = nullptr;
>+    PFNGLMATRIXLOADFEXTPROC matrixLoadfEXT = nullptr;
>+    PFNGLPATHCOMMANDSNVPROC pathCommandsNV = nullptr;
>+    PFNGLPATHPARAMETERFNVPROC pathParameterfNV = nullptr;
>+    PFNGLPATHPARAMETERINVPROC pathParameteriNV = nullptr;
>+    PFNGLPATHSTENCILFUNCNVPROC pathStencilFuncNV = nullptr;
>+    PFNGLPROGRAMPATHFRAGMENTINPUTGENNVPROC programPathFragmentInputGenNV = nullptr;
>+    PFNGLSTENCILFILLPATHINSTANCEDNVPROC stencilFillPathInstancedNV = nullptr;
>+    PFNGLSTENCILFILLPATHNVPROC stencilFillPathNV = nullptr;
>+    PFNGLSTENCILSTROKEPATHINSTANCEDNVPROC stencilStrokePathInstancedNV = nullptr;
>+    PFNGLSTENCILSTROKEPATHNVPROC stencilStrokePathNV = nullptr;
>+    PFNGLSTENCILTHENCOVERFILLPATHINSTANCEDNVPROC stencilThenCoverFillPathInstancedNV = nullptr;
>+    PFNGLSTENCILTHENCOVERFILLPATHNVPROC stencilThenCoverFillPathNV = nullptr;
>     PFNGLSTENCILTHENCOVERSTROKEPATHINSTANCEDNVPROC stencilThenCoverStrokePathInstancedNV = nullptr;
>-    PFNGLSTENCILTHENCOVERSTROKEPATHNVPROC stencilThenCoverStrokePathNV                   = nullptr;
>+    PFNGLSTENCILTHENCOVERSTROKEPATHNVPROC stencilThenCoverStrokePathNV = nullptr;
>+    // clang-format on
> 
>+    DispatchTableGL();
>     virtual ~DispatchTableGL() = default;
> 
>   protected:
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/DisplayGL.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/DisplayGL.cpp
>index 780dca3dde1..a89e136543a 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/DisplayGL.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/DisplayGL.cpp
>@@ -23,33 +23,20 @@ namespace rx
> {
> 
> DisplayGL::DisplayGL(const egl::DisplayState &state)
>-    : DisplayImpl(state), mRenderer(nullptr), mCurrentDrawSurface(nullptr)
>-{
>-}
>+    : DisplayImpl(state), mCurrentDrawSurface(nullptr)
>+{}
> 
>-DisplayGL::~DisplayGL()
>-{
>-}
>+DisplayGL::~DisplayGL() {}
> 
> egl::Error DisplayGL::initialize(egl::Display *display)
> {
>-    mRenderer = new RendererGL(getFunctionsGL(), display->getAttributeMap());
>-
>-    const gl::Version &maxVersion = mRenderer->getMaxSupportedESVersion();
>-    if (maxVersion < gl::Version(2, 0))
>-    {
>-        return egl::EglNotInitialized() << "OpenGL ES 2.0 is not supportable.";
>-    }
>-
>     return egl::NoError();
> }
> 
>-void DisplayGL::terminate()
>-{
>-    SafeDelete(mRenderer);
>-}
>+void DisplayGL::terminate() {}
> 
> ImageImpl *DisplayGL::createImage(const egl::ImageState &state,
>+                                  const gl::Context *context,
>                                   EGLenum target,
>                                   const egl::AttributeMap &attribs)
> {
>@@ -57,13 +44,7 @@ ImageImpl *DisplayGL::createImage(const egl::ImageState &state,
>     return nullptr;
> }
> 
>-ContextImpl *DisplayGL::createContext(const gl::ContextState &state)
>-{
>-    ASSERT(mRenderer != nullptr);
>-    return new ContextGL(state, mRenderer);
>-}
>-
>-StreamProducerImpl *DisplayGL::createStreamProducerD3DTextureNV12(
>+StreamProducerImpl *DisplayGL::createStreamProducerD3DTexture(
>     egl::Stream::ConsumerType consumerType,
>     const egl::AttributeMap &attribs)
> {
>@@ -71,7 +52,9 @@ StreamProducerImpl *DisplayGL::createStreamProducerD3DTextureNV12(
>     return nullptr;
> }
> 
>-egl::Error DisplayGL::makeCurrent(egl::Surface *drawSurface, egl::Surface *readSurface, gl::Context *context)
>+egl::Error DisplayGL::makeCurrent(egl::Surface *drawSurface,
>+                                  egl::Surface *readSurface,
>+                                  gl::Context *context)
> {
>     // Notify the previous surface (if it still exists) that it is no longer current
>     if (mCurrentDrawSurface &&
>@@ -93,7 +76,7 @@ egl::Error DisplayGL::makeCurrent(egl::Surface *drawSurface, egl::Surface *readS
>     if (drawSurface != nullptr)
>     {
>         SurfaceGL *glDrawSurface = GetImplAs<SurfaceGL>(drawSurface);
>-        ANGLE_TRY(glDrawSurface->makeCurrent());
>+        ANGLE_TRY(glDrawSurface->makeCurrent(context));
>         mCurrentDrawSurface = drawSurface;
>         return egl::NoError();
>     }
>@@ -103,12 +86,6 @@ egl::Error DisplayGL::makeCurrent(egl::Surface *drawSurface, egl::Surface *readS
>     }
> }
> 
>-gl::Version DisplayGL::getMaxSupportedESVersion() const
>-{
>-    ASSERT(mRenderer != nullptr);
>-    return mRenderer->getMaxSupportedESVersion();
>-}
>-
> void DisplayGL::generateExtensions(egl::DisplayExtensions *outExtensions) const
> {
>     // Advertise robust resource initialization on all OpenGL backends for testing even though it is
>@@ -121,4 +98,4 @@ egl::Error DisplayGL::makeCurrentSurfaceless(gl::Context *context)
>     UNIMPLEMENTED();
>     return egl::NoError();
> }
>-}
>+}  // namespace rx
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/DisplayGL.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/DisplayGL.h
>index e2f862b5fe6..45676d2712e 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/DisplayGL.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/DisplayGL.h
>@@ -32,33 +32,26 @@ class DisplayGL : public DisplayImpl
>     void terminate() override;
> 
>     ImageImpl *createImage(const egl::ImageState &state,
>+                           const gl::Context *context,
>                            EGLenum target,
>                            const egl::AttributeMap &attribs) override;
> 
>-    ContextImpl *createContext(const gl::ContextState &state) override;
>+    StreamProducerImpl *createStreamProducerD3DTexture(egl::Stream::ConsumerType consumerType,
>+                                                       const egl::AttributeMap &attribs) override;
> 
>-    StreamProducerImpl *createStreamProducerD3DTextureNV12(
>-        egl::Stream::ConsumerType consumerType,
>-        const egl::AttributeMap &attribs) override;
>-
>-    egl::Error makeCurrent(egl::Surface *drawSurface, egl::Surface *readSurface, gl::Context *context) override;
>-
>-    gl::Version getMaxSupportedESVersion() const override;
>+    egl::Error makeCurrent(egl::Surface *drawSurface,
>+                           egl::Surface *readSurface,
>+                           gl::Context *context) override;
> 
>   protected:
>-    RendererGL *getRenderer() const { return mRenderer; };
>-
>     void generateExtensions(egl::DisplayExtensions *outExtensions) const override;
> 
>   private:
>-    virtual const FunctionsGL *getFunctionsGL() const = 0;
>     virtual egl::Error makeCurrentSurfaceless(gl::Context *context);
> 
>-    RendererGL *mRenderer;
>-
>     egl::Surface *mCurrentDrawSurface;
> };
> 
>-}
>+}  // namespace rx
> 
>-#endif // LIBANGLE_RENDERER_GL_DISPLAYGL_H_
>+#endif  // LIBANGLE_RENDERER_GL_DISPLAYGL_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/FenceNVGL.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/FenceNVGL.cpp
>index f4c37785a7b..e58e48006c3 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/FenceNVGL.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/FenceNVGL.cpp
>@@ -9,15 +9,14 @@
> #include "libANGLE/renderer/gl/FenceNVGL.h"
> 
> #include "common/debug.h"
>+#include "libANGLE/Context.h"
>+#include "libANGLE/renderer/gl/ContextGL.h"
> #include "libANGLE/renderer/gl/FunctionsGL.h"
> 
>-
> namespace rx
> {
> 
>-FenceNVGL::FenceNVGL(const FunctionsGL *functions)
>-    : FenceNVImpl(),
>-      mFunctions(functions)
>+FenceNVGL::FenceNVGL(const FunctionsGL *functions) : FenceNVImpl(), mFunctions(functions)
> {
>     mFunctions->genFencesNV(1, &mFence);
> }
>@@ -28,24 +27,80 @@ FenceNVGL::~FenceNVGL()
>     mFence = 0;
> }
> 
>-gl::Error FenceNVGL::set(GLenum condition)
>+angle::Result FenceNVGL::set(const gl::Context *context, GLenum condition)
> {
>     ASSERT(condition == GL_ALL_COMPLETED_NV);
>     mFunctions->setFenceNV(mFence, condition);
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error FenceNVGL::test(GLboolean *outFinished)
>+angle::Result FenceNVGL::test(const gl::Context *context, GLboolean *outFinished)
> {
>     ASSERT(outFinished);
>     *outFinished = mFunctions->testFenceNV(mFence);
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error FenceNVGL::finish()
>+angle::Result FenceNVGL::finish(const gl::Context *context)
> {
>     mFunctions->finishFenceNV(mFence);
>-    return gl::NoError();
>+    return angle::Result::Continue;
>+}
>+
>+// static
>+bool FenceNVGL::Supported(const FunctionsGL *functions)
>+{
>+    return functions->hasGLESExtension("GL_NV_fence") || functions->hasGLExtension("GL_NV_fence");
>+}
>+
>+FenceNVSyncGL::FenceNVSyncGL(const FunctionsGL *functions)
>+    : FenceNVImpl(), mSyncObject(0), mFunctions(functions)
>+{}
>+
>+FenceNVSyncGL::~FenceNVSyncGL()
>+{
>+    if (mSyncObject != 0)
>+    {
>+        mFunctions->deleteSync(mSyncObject);
>+        mSyncObject = 0;
>+    }
>+}
>+
>+angle::Result FenceNVSyncGL::set(const gl::Context *context, GLenum condition)
>+{
>+    ASSERT(condition == GL_ALL_COMPLETED_NV);
>+    mSyncObject = mFunctions->fenceSync(GL_SYNC_GPU_COMMANDS_COMPLETE, 0);
>+    ANGLE_CHECK(GetImplAs<ContextGL>(context), mSyncObject != 0,
>+                "glFenceSync failed to create a GLsync object.", GL_OUT_OF_MEMORY);
>+    return angle::Result::Continue;
>+}
>+
>+angle::Result FenceNVSyncGL::test(const gl::Context *context, GLboolean *outFinished)
>+{
>+    ASSERT(mFunctions->isSync(mSyncObject));
>+    GLint result = 0;
>+    mFunctions->getSynciv(mSyncObject, GL_SYNC_STATUS, 1, nullptr, &result);
>+    *outFinished = (result == GL_SIGNALED);
>+    return angle::Result::Continue;
> }
> 
>+angle::Result FenceNVSyncGL::finish(const gl::Context *context)
>+{
>+    ASSERT(mFunctions->isSync(mSyncObject));
>+    GLenum result =
>+        mFunctions->clientWaitSync(mSyncObject, GL_SYNC_FLUSH_COMMANDS_BIT, GL_TIMEOUT_IGNORED);
>+    ANGLE_CHECK(GetImplAs<ContextGL>(context),
>+                result == GL_ALREADY_SIGNALED || result == GL_CONDITION_SATISFIED,
>+                "glClientWaitSync did not return GL_ALREADY_SIGNALED or GL_CONDITION_SATISFIED.",
>+                GL_OUT_OF_MEMORY);
>+    return angle::Result::Continue;
> }
>+
>+// static
>+bool FenceNVSyncGL::Supported(const FunctionsGL *functions)
>+{
>+    return functions->isAtLeastGL(gl::Version(3, 2)) ||
>+           functions->isAtLeastGLES(gl::Version(3, 0)) || functions->hasGLExtension("GL_ARB_sync");
>+}
>+
>+}  // namespace rx
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/FenceNVGL.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/FenceNVGL.h
>index ffeca8515aa..6f6a888928e 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/FenceNVGL.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/FenceNVGL.h
>@@ -15,15 +15,18 @@ namespace rx
> {
> class FunctionsGL;
> 
>+// FenceNV implemented with the native GL_NV_fence extension
> class FenceNVGL : public FenceNVImpl
> {
>   public:
>     explicit FenceNVGL(const FunctionsGL *functions);
>     ~FenceNVGL() override;
> 
>-    gl::Error set(GLenum condition) override;
>-    gl::Error test(GLboolean *outFinished) override;
>-    gl::Error finish() override;
>+    angle::Result set(const gl::Context *context, GLenum condition) override;
>+    angle::Result test(const gl::Context *context, GLboolean *outFinished) override;
>+    angle::Result finish(const gl::Context *context) override;
>+
>+    static bool Supported(const FunctionsGL *functions);
> 
>   private:
>     GLuint mFence;
>@@ -31,6 +34,24 @@ class FenceNVGL : public FenceNVImpl
>     const FunctionsGL *mFunctions;
> };
> 
>-}
>+// FenceNV implemented with the GLsync API
>+class FenceNVSyncGL : public FenceNVImpl
>+{
>+  public:
>+    explicit FenceNVSyncGL(const FunctionsGL *functions);
>+    ~FenceNVSyncGL() override;
>+
>+    angle::Result set(const gl::Context *context, GLenum condition) override;
>+    angle::Result test(const gl::Context *context, GLboolean *outFinished) override;
>+    angle::Result finish(const gl::Context *context) override;
>+
>+    static bool Supported(const FunctionsGL *functions);
>+
>+  private:
>+    GLsync mSyncObject;
>+
>+    const FunctionsGL *mFunctions;
>+};
>+}  // namespace rx
> 
>-#endif // LIBANGLE_RENDERER_GL_FENCENVGL_H_
>+#endif  // LIBANGLE_RENDERER_GL_FENCENVGL_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/FramebufferGL.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/FramebufferGL.cpp
>index 5690e247266..0185f21a6e2 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/FramebufferGL.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/FramebufferGL.cpp
>@@ -10,7 +10,6 @@
> 
> #include "common/bitset_utils.h"
> #include "common/debug.h"
>-#include "libANGLE/Context.h"
> #include "libANGLE/FramebufferAttachment.h"
> #include "libANGLE/State.h"
> #include "libANGLE/angletypes.h"
>@@ -49,24 +48,34 @@ void BindFramebufferAttachment(const FunctionsGL *functions,
>             const Texture *texture     = attachment->getTexture();
>             const TextureGL *textureGL = GetImplAs<TextureGL>(texture);
> 
>-            if (texture->getTarget() == GL_TEXTURE_2D ||
>-                texture->getTarget() == GL_TEXTURE_2D_MULTISAMPLE ||
>-                texture->getTarget() == GL_TEXTURE_RECTANGLE_ANGLE)
>+            if (texture->getType() == TextureType::_2D ||
>+                texture->getType() == TextureType::_2DMultisample ||
>+                texture->getType() == TextureType::Rectangle)
>             {
>                 functions->framebufferTexture2D(GL_FRAMEBUFFER, attachmentPoint,
>-                                                texture->getTarget(), textureGL->getTextureID(),
>-                                                attachment->mipLevel());
>+                                                ToGLenum(texture->getType()),
>+                                                textureGL->getTextureID(), attachment->mipLevel());
>+            }
>+            else if (attachment->isLayered())
>+            {
>+                TextureType textureType = texture->getType();
>+                ASSERT(textureType == TextureType::_2DArray || textureType == TextureType::_3D ||
>+                       textureType == TextureType::CubeMap ||
>+                       textureType == TextureType::_2DMultisampleArray);
>+                functions->framebufferTexture(GL_FRAMEBUFFER, attachmentPoint,
>+                                              textureGL->getTextureID(), attachment->mipLevel());
>             }
>-            else if (texture->getTarget() == GL_TEXTURE_CUBE_MAP)
>+            else if (texture->getType() == TextureType::CubeMap)
>             {
>                 functions->framebufferTexture2D(GL_FRAMEBUFFER, attachmentPoint,
>-                                                attachment->cubeMapFace(),
>+                                                ToGLenum(attachment->cubeMapFace()),
>                                                 textureGL->getTextureID(), attachment->mipLevel());
>             }
>-            else if (texture->getTarget() == GL_TEXTURE_2D_ARRAY ||
>-                     texture->getTarget() == GL_TEXTURE_3D)
>+            else if (texture->getType() == TextureType::_2DArray ||
>+                     texture->getType() == TextureType::_3D ||
>+                     texture->getType() == TextureType::_2DMultisampleArray)
>             {
>-                if (attachment->getMultiviewLayout() == GL_FRAMEBUFFER_MULTIVIEW_LAYERED_ANGLE)
>+                if (attachment->isMultiview())
>                 {
>                     ASSERT(functions->framebufferTexture);
>                     functions->framebufferTexture(GL_FRAMEBUFFER, attachmentPoint,
>@@ -113,8 +122,8 @@ bool AreAllLayersActive(const FramebufferAttachment &attachment)
>         return false;
>     }
>     const ImageIndex &imageIndex = attachment.getTextureImageIndex();
>-    int numLayers =
>-        static_cast<int>(attachment.getTexture()->getDepth(imageIndex.type, imageIndex.mipIndex));
>+    int numLayers                = static_cast<int>(
>+        attachment.getTexture()->getDepth(imageIndex.getTarget(), imageIndex.getLevelIndex()));
>     return (attachment.getNumViews() == numLayers);
> }
> 
>@@ -127,7 +136,7 @@ bool RequiresMultiviewClear(const FramebufferState &state, bool scissorTestEnabl
>     {
>         if (colorAttachment.isAttached())
>         {
>-            if (colorAttachment.getMultiviewLayout() == GL_NONE)
>+            if (!colorAttachment.isMultiview())
>             {
>                 return false;
>             }
>@@ -140,7 +149,7 @@ bool RequiresMultiviewClear(const FramebufferState &state, bool scissorTestEnabl
>     const FramebufferAttachment *depthAttachment = state.getDepthAttachment();
>     if (depthAttachment)
>     {
>-        if (depthAttachment->getMultiviewLayout() == GL_NONE)
>+        if (!depthAttachment->isMultiview())
>         {
>             return false;
>         }
>@@ -151,7 +160,7 @@ bool RequiresMultiviewClear(const FramebufferState &state, bool scissorTestEnabl
>     const FramebufferAttachment *stencilAttachment = state.getStencilAttachment();
>     if (stencilAttachment)
>     {
>-        if (stencilAttachment->getMultiviewLayout() == GL_NONE)
>+        if (!stencilAttachment->isMultiview())
>         {
>             return false;
>         }
>@@ -164,77 +173,47 @@ bool RequiresMultiviewClear(const FramebufferState &state, bool scissorTestEnabl
>     {
>         return false;
>     }
>-    switch (attachment->getMultiviewLayout())
>+    if (attachment->isMultiview())
>     {
>-        case GL_FRAMEBUFFER_MULTIVIEW_LAYERED_ANGLE:
>-            // If all layers of each texture array are active, then there is no need to issue a
>-            // special multiview clear.
>-            return !allTextureArraysAreFullyAttached;
>-        case GL_FRAMEBUFFER_MULTIVIEW_SIDE_BY_SIDE_ANGLE:
>-            return (scissorTestEnabled == true);
>-        default:
>-            UNREACHABLE();
>+        // If all layers of each texture array are active, then there is no need to issue a
>+        // special multiview clear.
>+        return !allTextureArraysAreFullyAttached;
>     }
>     return false;
> }
> 
> }  // namespace
> 
>-FramebufferGL::FramebufferGL(const FramebufferState &state,
>-                             const FunctionsGL *functions,
>-                             StateManagerGL *stateManager,
>-                             const WorkaroundsGL &workarounds,
>-                             BlitGL *blitter,
>-                             ClearMultiviewGL *multiviewClearer,
>-                             bool isDefault)
>-    : FramebufferImpl(state),
>-      mFunctions(functions),
>-      mStateManager(stateManager),
>-      mWorkarounds(workarounds),
>-      mBlitter(blitter),
>-      mMultiviewClearer(multiviewClearer),
>-      mFramebufferID(0),
>+FramebufferGL::FramebufferGL(const gl::FramebufferState &data, GLuint id, bool isDefault)
>+    : FramebufferImpl(data),
>+      mFramebufferID(id),
>       mIsDefault(isDefault),
>       mAppliedEnabledDrawBuffers(1)
>-{
>-    if (!mIsDefault)
>-    {
>-        mFunctions->genFramebuffers(1, &mFramebufferID);
>-    }
>-}
>+{}
> 
>-FramebufferGL::FramebufferGL(GLuint id,
>-                             const FramebufferState &state,
>-                             const FunctionsGL *functions,
>-                             const WorkaroundsGL &workarounds,
>-                             BlitGL *blitter,
>-                             ClearMultiviewGL *multiviewClearer,
>-                             StateManagerGL *stateManager)
>-    : FramebufferImpl(state),
>-      mFunctions(functions),
>-      mStateManager(stateManager),
>-      mWorkarounds(workarounds),
>-      mBlitter(blitter),
>-      mMultiviewClearer(multiviewClearer),
>-      mFramebufferID(id),
>-      mIsDefault(true),
>-      mAppliedEnabledDrawBuffers(1)
>+FramebufferGL::~FramebufferGL()
> {
>+    ASSERT(mFramebufferID == 0);
> }
> 
>-FramebufferGL::~FramebufferGL()
>+void FramebufferGL::destroy(const gl::Context *context)
> {
>-    mStateManager->deleteFramebuffer(mFramebufferID);
>+    StateManagerGL *stateManager = GetStateManagerGL(context);
>+    stateManager->deleteFramebuffer(mFramebufferID);
>     mFramebufferID = 0;
> }
> 
>-Error FramebufferGL::discard(const gl::Context *context, size_t count, const GLenum *attachments)
>+angle::Result FramebufferGL::discard(const gl::Context *context,
>+                                     size_t count,
>+                                     const GLenum *attachments)
> {
>     // glInvalidateFramebuffer accepts the same enums as glDiscardFramebufferEXT
>     return invalidate(context, count, attachments);
> }
> 
>-Error FramebufferGL::invalidate(const gl::Context *context, size_t count, const GLenum *attachments)
>+angle::Result FramebufferGL::invalidate(const gl::Context *context,
>+                                        size_t count,
>+                                        const GLenum *attachments)
> {
>     const GLenum *finalAttachmentsPtr = attachments;
> 
>@@ -244,27 +223,30 @@ Error FramebufferGL::invalidate(const gl::Context *context, size_t count, const
>         finalAttachmentsPtr = modifiedAttachments.data();
>     }
> 
>+    const FunctionsGL *functions = GetFunctionsGL(context);
>+    StateManagerGL *stateManager = GetStateManagerGL(context);
>+
>     // Since this function is just a hint, only call a native function if it exists.
>-    if (mFunctions->invalidateFramebuffer)
>+    if (functions->invalidateFramebuffer)
>     {
>-        mStateManager->bindFramebuffer(GL_FRAMEBUFFER, mFramebufferID);
>-        mFunctions->invalidateFramebuffer(GL_FRAMEBUFFER, static_cast<GLsizei>(count),
>-                                          finalAttachmentsPtr);
>+        stateManager->bindFramebuffer(GL_FRAMEBUFFER, mFramebufferID);
>+        functions->invalidateFramebuffer(GL_FRAMEBUFFER, static_cast<GLsizei>(count),
>+                                         finalAttachmentsPtr);
>     }
>-    else if (mFunctions->discardFramebufferEXT)
>+    else if (functions->discardFramebufferEXT)
>     {
>-        mStateManager->bindFramebuffer(GL_FRAMEBUFFER, mFramebufferID);
>-        mFunctions->discardFramebufferEXT(GL_FRAMEBUFFER, static_cast<GLsizei>(count),
>-                                          finalAttachmentsPtr);
>+        stateManager->bindFramebuffer(GL_FRAMEBUFFER, mFramebufferID);
>+        functions->discardFramebufferEXT(GL_FRAMEBUFFER, static_cast<GLsizei>(count),
>+                                         finalAttachmentsPtr);
>     }
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-Error FramebufferGL::invalidateSub(const gl::Context *context,
>-                                   size_t count,
>-                                   const GLenum *attachments,
>-                                   const gl::Rectangle &area)
>+angle::Result FramebufferGL::invalidateSub(const gl::Context *context,
>+                                           size_t count,
>+                                           const GLenum *attachments,
>+                                           const gl::Rectangle &area)
> {
> 
>     const GLenum *finalAttachmentsPtr = attachments;
>@@ -275,129 +257,152 @@ Error FramebufferGL::invalidateSub(const gl::Context *context,
>         finalAttachmentsPtr = modifiedAttachments.data();
>     }
> 
>+    const FunctionsGL *functions = GetFunctionsGL(context);
>+    StateManagerGL *stateManager = GetStateManagerGL(context);
>+
>     // Since this function is just a hint and not available until OpenGL 4.3, only call it if it is
>     // available.
>-    if (mFunctions->invalidateSubFramebuffer)
>+    if (functions->invalidateSubFramebuffer)
>     {
>-        mStateManager->bindFramebuffer(GL_FRAMEBUFFER, mFramebufferID);
>-        mFunctions->invalidateSubFramebuffer(GL_FRAMEBUFFER, static_cast<GLsizei>(count),
>-                                             finalAttachmentsPtr, area.x, area.y, area.width,
>-                                             area.height);
>+        stateManager->bindFramebuffer(GL_FRAMEBUFFER, mFramebufferID);
>+        functions->invalidateSubFramebuffer(GL_FRAMEBUFFER, static_cast<GLsizei>(count),
>+                                            finalAttachmentsPtr, area.x, area.y, area.width,
>+                                            area.height);
>     }
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-Error FramebufferGL::clear(const gl::Context *context, GLbitfield mask)
>+angle::Result FramebufferGL::clear(const gl::Context *context, GLbitfield mask)
> {
>+    const FunctionsGL *functions = GetFunctionsGL(context);
>+    StateManagerGL *stateManager = GetStateManagerGL(context);
>+
>     syncClearState(context, mask);
>-    mStateManager->bindFramebuffer(GL_FRAMEBUFFER, mFramebufferID);
>+    stateManager->bindFramebuffer(GL_FRAMEBUFFER, mFramebufferID);
> 
>-    if (!RequiresMultiviewClear(mState, context->getGLState().isScissorTestEnabled()))
>+    if (!RequiresMultiviewClear(mState, context->getState().isScissorTestEnabled()))
>     {
>-        mFunctions->clear(mask);
>+        functions->clear(mask);
>     }
>     else
>     {
>-        mMultiviewClearer->clearMultiviewFBO(mState, context->getGLState().getScissor(),
>-                                             ClearMultiviewGL::ClearCommandType::Clear, mask,
>-                                             GL_NONE, 0, nullptr, 0.0f, 0);
>+        ClearMultiviewGL *multiviewClearer = GetMultiviewClearer(context);
>+        multiviewClearer->clearMultiviewFBO(mState, context->getState().getScissor(),
>+                                            ClearMultiviewGL::ClearCommandType::Clear, mask,
>+                                            GL_NONE, 0, nullptr, 0.0f, 0);
>     }
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-Error FramebufferGL::clearBufferfv(const gl::Context *context,
>-                                   GLenum buffer,
>-                                   GLint drawbuffer,
>-                                   const GLfloat *values)
>+angle::Result FramebufferGL::clearBufferfv(const gl::Context *context,
>+                                           GLenum buffer,
>+                                           GLint drawbuffer,
>+                                           const GLfloat *values)
> {
>+    const FunctionsGL *functions = GetFunctionsGL(context);
>+    StateManagerGL *stateManager = GetStateManagerGL(context);
>+
>     syncClearBufferState(context, buffer, drawbuffer);
>-    mStateManager->bindFramebuffer(GL_FRAMEBUFFER, mFramebufferID);
>+    stateManager->bindFramebuffer(GL_FRAMEBUFFER, mFramebufferID);
> 
>-    if (!RequiresMultiviewClear(mState, context->getGLState().isScissorTestEnabled()))
>+    if (!RequiresMultiviewClear(mState, context->getState().isScissorTestEnabled()))
>     {
>-        mFunctions->clearBufferfv(buffer, drawbuffer, values);
>+        functions->clearBufferfv(buffer, drawbuffer, values);
>     }
>     else
>     {
>-        mMultiviewClearer->clearMultiviewFBO(mState, context->getGLState().getScissor(),
>-                                             ClearMultiviewGL::ClearCommandType::ClearBufferfv,
>-                                             static_cast<GLbitfield>(0u), buffer, drawbuffer,
>-                                             reinterpret_cast<const uint8_t *>(values), 0.0f, 0);
>+        ClearMultiviewGL *multiviewClearer = GetMultiviewClearer(context);
>+        multiviewClearer->clearMultiviewFBO(mState, context->getState().getScissor(),
>+                                            ClearMultiviewGL::ClearCommandType::ClearBufferfv,
>+                                            static_cast<GLbitfield>(0u), buffer, drawbuffer,
>+                                            reinterpret_cast<const uint8_t *>(values), 0.0f, 0);
>     }
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-Error FramebufferGL::clearBufferuiv(const gl::Context *context,
>-                                    GLenum buffer,
>-                                    GLint drawbuffer,
>-                                    const GLuint *values)
>+angle::Result FramebufferGL::clearBufferuiv(const gl::Context *context,
>+                                            GLenum buffer,
>+                                            GLint drawbuffer,
>+                                            const GLuint *values)
> {
>+    const FunctionsGL *functions = GetFunctionsGL(context);
>+    StateManagerGL *stateManager = GetStateManagerGL(context);
>+
>     syncClearBufferState(context, buffer, drawbuffer);
>-    mStateManager->bindFramebuffer(GL_FRAMEBUFFER, mFramebufferID);
>+    stateManager->bindFramebuffer(GL_FRAMEBUFFER, mFramebufferID);
> 
>-    if (!RequiresMultiviewClear(mState, context->getGLState().isScissorTestEnabled()))
>+    if (!RequiresMultiviewClear(mState, context->getState().isScissorTestEnabled()))
>     {
>-        mFunctions->clearBufferuiv(buffer, drawbuffer, values);
>+        functions->clearBufferuiv(buffer, drawbuffer, values);
>     }
>     else
>     {
>-        mMultiviewClearer->clearMultiviewFBO(mState, context->getGLState().getScissor(),
>-                                             ClearMultiviewGL::ClearCommandType::ClearBufferuiv,
>-                                             static_cast<GLbitfield>(0u), buffer, drawbuffer,
>-                                             reinterpret_cast<const uint8_t *>(values), 0.0f, 0);
>+        ClearMultiviewGL *multiviewClearer = GetMultiviewClearer(context);
>+        multiviewClearer->clearMultiviewFBO(mState, context->getState().getScissor(),
>+                                            ClearMultiviewGL::ClearCommandType::ClearBufferuiv,
>+                                            static_cast<GLbitfield>(0u), buffer, drawbuffer,
>+                                            reinterpret_cast<const uint8_t *>(values), 0.0f, 0);
>     }
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-Error FramebufferGL::clearBufferiv(const gl::Context *context,
>-                                   GLenum buffer,
>-                                   GLint drawbuffer,
>-                                   const GLint *values)
>+angle::Result FramebufferGL::clearBufferiv(const gl::Context *context,
>+                                           GLenum buffer,
>+                                           GLint drawbuffer,
>+                                           const GLint *values)
> {
>+    const FunctionsGL *functions = GetFunctionsGL(context);
>+    StateManagerGL *stateManager = GetStateManagerGL(context);
>+
>     syncClearBufferState(context, buffer, drawbuffer);
>-    mStateManager->bindFramebuffer(GL_FRAMEBUFFER, mFramebufferID);
>+    stateManager->bindFramebuffer(GL_FRAMEBUFFER, mFramebufferID);
> 
>-    if (!RequiresMultiviewClear(mState, context->getGLState().isScissorTestEnabled()))
>+    if (!RequiresMultiviewClear(mState, context->getState().isScissorTestEnabled()))
>     {
>-        mFunctions->clearBufferiv(buffer, drawbuffer, values);
>+        functions->clearBufferiv(buffer, drawbuffer, values);
>     }
>     else
>     {
>-        mMultiviewClearer->clearMultiviewFBO(mState, context->getGLState().getScissor(),
>-                                             ClearMultiviewGL::ClearCommandType::ClearBufferiv,
>-                                             static_cast<GLbitfield>(0u), buffer, drawbuffer,
>-                                             reinterpret_cast<const uint8_t *>(values), 0.0f, 0);
>+        ClearMultiviewGL *multiviewClearer = GetMultiviewClearer(context);
>+        multiviewClearer->clearMultiviewFBO(mState, context->getState().getScissor(),
>+                                            ClearMultiviewGL::ClearCommandType::ClearBufferiv,
>+                                            static_cast<GLbitfield>(0u), buffer, drawbuffer,
>+                                            reinterpret_cast<const uint8_t *>(values), 0.0f, 0);
>     }
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-Error FramebufferGL::clearBufferfi(const gl::Context *context,
>-                                   GLenum buffer,
>-                                   GLint drawbuffer,
>-                                   GLfloat depth,
>-                                   GLint stencil)
>+angle::Result FramebufferGL::clearBufferfi(const gl::Context *context,
>+                                           GLenum buffer,
>+                                           GLint drawbuffer,
>+                                           GLfloat depth,
>+                                           GLint stencil)
> {
>+    const FunctionsGL *functions = GetFunctionsGL(context);
>+    StateManagerGL *stateManager = GetStateManagerGL(context);
>+
>     syncClearBufferState(context, buffer, drawbuffer);
>-    mStateManager->bindFramebuffer(GL_FRAMEBUFFER, mFramebufferID);
>+    stateManager->bindFramebuffer(GL_FRAMEBUFFER, mFramebufferID);
> 
>-    if (!RequiresMultiviewClear(mState, context->getGLState().isScissorTestEnabled()))
>+    if (!RequiresMultiviewClear(mState, context->getState().isScissorTestEnabled()))
>     {
>-        mFunctions->clearBufferfi(buffer, drawbuffer, depth, stencil);
>+        functions->clearBufferfi(buffer, drawbuffer, depth, stencil);
>     }
>     else
>     {
>-        mMultiviewClearer->clearMultiviewFBO(mState, context->getGLState().getScissor(),
>-                                             ClearMultiviewGL::ClearCommandType::ClearBufferfi,
>-                                             static_cast<GLbitfield>(0u), buffer, drawbuffer,
>-                                             nullptr, depth, stencil);
>+        ClearMultiviewGL *multiviewClearer = GetMultiviewClearer(context);
>+        multiviewClearer->clearMultiviewFBO(mState, context->getState().getScissor(),
>+                                            ClearMultiviewGL::ClearCommandType::ClearBufferfi,
>+                                            static_cast<GLbitfield>(0u), buffer, drawbuffer,
>+                                            nullptr, depth, stencil);
>     }
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
> GLenum FramebufferGL::getImplementationColorReadFormat(const gl::Context *context) const
>@@ -414,100 +419,96 @@ GLenum FramebufferGL::getImplementationColorReadType(const gl::Context *context)
>     return format.info->getReadPixelsType(context->getClientVersion());
> }
> 
>-Error FramebufferGL::readPixels(const gl::Context *context,
>-                                const gl::Rectangle &origArea,
>-                                GLenum format,
>-                                GLenum type,
>-                                void *ptrOrOffset)
>+angle::Result FramebufferGL::readPixels(const gl::Context *context,
>+                                        const gl::Rectangle &area,
>+                                        GLenum format,
>+                                        GLenum type,
>+                                        void *pixels)
> {
>+    ContextGL *contextGL             = GetImplAs<ContextGL>(context);
>+    const FunctionsGL *functions     = GetFunctionsGL(context);
>+    StateManagerGL *stateManager     = GetStateManagerGL(context);
>+    const WorkaroundsGL &workarounds = GetWorkaroundsGL(context);
>+
>     // Clip read area to framebuffer.
>     const gl::Extents fbSize = getState().getReadAttachment()->getSize();
>     const gl::Rectangle fbRect(0, 0, fbSize.width, fbSize.height);
>-    gl::Rectangle area;
>-    if (!ClipRectangle(origArea, fbRect, &area))
>+    gl::Rectangle clippedArea;
>+    if (!ClipRectangle(area, fbRect, &clippedArea))
>     {
>         // nothing to read
>-        return gl::NoError();
>+        return angle::Result::Continue;
>     }
> 
>-    PixelPackState packState     = context->getGLState().getPackState();
>+    PixelPackState packState = context->getState().getPackState();
>     const gl::Buffer *packBuffer =
>-        context->getGLState().getTargetBuffer(gl::BufferBinding::PixelPack);
>+        context->getState().getTargetBuffer(gl::BufferBinding::PixelPack);
> 
>     nativegl::ReadPixelsFormat readPixelsFormat =
>-        nativegl::GetReadPixelsFormat(mFunctions, mWorkarounds, format, type);
>+        nativegl::GetReadPixelsFormat(functions, workarounds, format, type);
>     GLenum readFormat = readPixelsFormat.format;
>     GLenum readType   = readPixelsFormat.type;
> 
>-    mStateManager->bindFramebuffer(GL_READ_FRAMEBUFFER, mFramebufferID);
>+    stateManager->bindFramebuffer(GL_READ_FRAMEBUFFER, mFramebufferID);
> 
>-    bool useOverlappingRowsWorkaround = mWorkarounds.packOverlappingRowsSeparatelyPackBuffer &&
>+    bool useOverlappingRowsWorkaround = workarounds.packOverlappingRowsSeparatelyPackBuffer &&
>                                         packBuffer && packState.rowLength != 0 &&
>-                                        packState.rowLength < area.width;
>+                                        packState.rowLength < clippedArea.width;
> 
>-    GLubyte *pixels = reinterpret_cast<GLubyte *>(ptrOrOffset);
>-    int leftClip    = area.x - origArea.x;
>-    int topClip     = area.y - origArea.y;
>+    GLubyte *outPtr = static_cast<GLubyte *>(pixels);
>+    int leftClip    = clippedArea.x - area.x;
>+    int topClip     = clippedArea.y - area.y;
>     if (leftClip || topClip)
>     {
>         // Adjust destination to match portion clipped off left and/or top.
>         const gl::InternalFormat &glFormat = gl::GetInternalFormatInfo(readFormat, readType);
> 
>         GLuint rowBytes = 0;
>-        ANGLE_TRY_RESULT(glFormat.computeRowPitch(readType, origArea.width, packState.alignment,
>-                                                  packState.rowLength),
>-                         rowBytes);
>-        pixels += leftClip * glFormat.pixelBytes + topClip * rowBytes;
>+        ANGLE_CHECK_GL_MATH(contextGL,
>+                            glFormat.computeRowPitch(readType, area.width, packState.alignment,
>+                                                     packState.rowLength, &rowBytes));
>+        outPtr += leftClip * glFormat.pixelBytes + topClip * rowBytes;
>     }
> 
>-    if (packState.rowLength == 0 && area.width != origArea.width)
>+    if (packState.rowLength == 0 && clippedArea.width != area.width)
>     {
>         // No rowLength was specified so it will derive from read width, but clipping changed the
>         // read width.  Use the original width so we fill the user's buffer as they intended.
>-        packState.rowLength = origArea.width;
>+        packState.rowLength = area.width;
>     }
> 
>     // We want to use rowLength, but that might not be supported.
>     bool cannotSetDesiredRowLength =
>         packState.rowLength && !GetImplAs<ContextGL>(context)->getNativeExtensions().packSubimage;
> 
>-    gl::Error retVal = gl::NoError();
>     if (cannotSetDesiredRowLength || useOverlappingRowsWorkaround)
>     {
>-        retVal = readPixelsRowByRow(context, area, readFormat, readType, packState, pixels);
>+        return readPixelsRowByRow(context, clippedArea, readFormat, readType, packState, outPtr);
>     }
>-    else
>-    {
>-        gl::ErrorOrResult<bool> useLastRowPaddingWorkaround = false;
>-        if (mWorkarounds.packLastRowSeparatelyForPaddingInclusion)
>-        {
>-            useLastRowPaddingWorkaround = ShouldApplyLastRowPaddingWorkaround(
>-                gl::Extents(area.width, area.height, 1), packState, packBuffer, readFormat,
>-                readType, false, pixels);
>-        }
> 
>-        if (useLastRowPaddingWorkaround.isError())
>-        {
>-            retVal = useLastRowPaddingWorkaround.getError();
>-        }
>-        else
>-        {
>-            retVal = readPixelsAllAtOnce(context, area, readFormat, readType, packState, pixels,
>-                                         useLastRowPaddingWorkaround.getResult());
>-        }
>+    bool useLastRowPaddingWorkaround = false;
>+    if (workarounds.packLastRowSeparatelyForPaddingInclusion)
>+    {
>+        ANGLE_TRY(ShouldApplyLastRowPaddingWorkaround(
>+            contextGL, gl::Extents(clippedArea.width, clippedArea.height, 1), packState, packBuffer,
>+            readFormat, readType, false, outPtr, &useLastRowPaddingWorkaround));
>     }
> 
>-    return retVal;
>+    return readPixelsAllAtOnce(context, clippedArea, readFormat, readType, packState, outPtr,
>+                               useLastRowPaddingWorkaround);
> }
> 
>-Error FramebufferGL::blit(const gl::Context *context,
>-                          const gl::Rectangle &sourceArea,
>-                          const gl::Rectangle &destArea,
>-                          GLbitfield mask,
>-                          GLenum filter)
>+angle::Result FramebufferGL::blit(const gl::Context *context,
>+                                  const gl::Rectangle &sourceArea,
>+                                  const gl::Rectangle &destArea,
>+                                  GLbitfield mask,
>+                                  GLenum filter)
> {
>-    const Framebuffer *sourceFramebuffer = context->getGLState().getReadFramebuffer();
>-    const Framebuffer *destFramebuffer   = context->getGLState().getDrawFramebuffer();
>+    const FunctionsGL *functions = GetFunctionsGL(context);
>+    StateManagerGL *stateManager = GetStateManagerGL(context);
>+
>+    const Framebuffer *sourceFramebuffer = context->getState().getReadFramebuffer();
>+    const Framebuffer *destFramebuffer   = context->getState().getDrawFramebuffer();
> 
>     const FramebufferAttachment *colorReadAttachment = sourceFramebuffer->getReadColorbuffer();
> 
>@@ -534,7 +535,7 @@ Error FramebufferGL::blit(const gl::Context *context,
>         bool sourceSRGB =
>             colorReadAttachment != nullptr && colorReadAttachment->getColorEncoding() == GL_SRGB;
>         needManualColorBlit =
>-            needManualColorBlit || (sourceSRGB && mFunctions->isAtMostGL(gl::Version(4, 3)));
>+            needManualColorBlit || (sourceSRGB && functions->isAtMostGL(gl::Version(4, 3)));
>     }
> 
>     // Prior to OpenGL 4.2 BlitFramebuffer (section 4.3.2 of GL 4.1 core profile) reads:
>@@ -558,47 +559,56 @@ Error FramebufferGL::blit(const gl::Context *context,
>         }
> 
>         needManualColorBlit =
>-            needManualColorBlit || (destSRGB && mFunctions->isAtMostGL(gl::Version(4, 1)));
>+            needManualColorBlit || (destSRGB && functions->isAtMostGL(gl::Version(4, 1)));
>     }
> 
>     // Enable FRAMEBUFFER_SRGB if needed
>-    mStateManager->setFramebufferSRGBEnabledForFramebuffer(context, true, this);
>+    stateManager->setFramebufferSRGBEnabledForFramebuffer(context, true, this);
> 
>     GLenum blitMask = mask;
>     if (needManualColorBlit && (mask & GL_COLOR_BUFFER_BIT) && readAttachmentSamples <= 1)
>     {
>-        ANGLE_TRY(mBlitter->blitColorBufferWithShader(sourceFramebuffer, destFramebuffer,
>-                                                      sourceArea, destArea, filter));
>+        BlitGL *blitter = GetBlitGL(context);
>+        ANGLE_TRY(blitter->blitColorBufferWithShader(context, sourceFramebuffer, destFramebuffer,
>+                                                     sourceArea, destArea, filter));
>         blitMask &= ~GL_COLOR_BUFFER_BIT;
>     }
> 
>     if (blitMask == 0)
>     {
>-        return gl::NoError();
>+        return angle::Result::Continue;
>     }
> 
>     const FramebufferGL *sourceFramebufferGL = GetImplAs<FramebufferGL>(sourceFramebuffer);
>-    mStateManager->bindFramebuffer(GL_READ_FRAMEBUFFER, sourceFramebufferGL->getFramebufferID());
>-    mStateManager->bindFramebuffer(GL_DRAW_FRAMEBUFFER, mFramebufferID);
>+    stateManager->bindFramebuffer(GL_READ_FRAMEBUFFER, sourceFramebufferGL->getFramebufferID());
>+    stateManager->bindFramebuffer(GL_DRAW_FRAMEBUFFER, mFramebufferID);
> 
>-    mFunctions->blitFramebuffer(sourceArea.x, sourceArea.y, sourceArea.x1(), sourceArea.y1(),
>-                                destArea.x, destArea.y, destArea.x1(), destArea.y1(), blitMask,
>-                                filter);
>+    functions->blitFramebuffer(sourceArea.x, sourceArea.y, sourceArea.x1(), sourceArea.y1(),
>+                               destArea.x, destArea.y, destArea.x1(), destArea.y1(), blitMask,
>+                               filter);
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error FramebufferGL::getSamplePosition(size_t index, GLfloat *xy) const
>+angle::Result FramebufferGL::getSamplePosition(const gl::Context *context,
>+                                               size_t index,
>+                                               GLfloat *xy) const
> {
>-    mStateManager->bindFramebuffer(GL_FRAMEBUFFER, mFramebufferID);
>-    mFunctions->getMultisamplefv(GL_SAMPLE_POSITION, static_cast<GLuint>(index), xy);
>-    return gl::NoError();
>+    const FunctionsGL *functions = GetFunctionsGL(context);
>+    StateManagerGL *stateManager = GetStateManagerGL(context);
>+
>+    stateManager->bindFramebuffer(GL_FRAMEBUFFER, mFramebufferID);
>+    functions->getMultisamplefv(GL_SAMPLE_POSITION, static_cast<GLuint>(index), xy);
>+    return angle::Result::Continue;
> }
> 
> bool FramebufferGL::checkStatus(const gl::Context *context) const
> {
>-    mStateManager->bindFramebuffer(GL_FRAMEBUFFER, mFramebufferID);
>-    GLenum status = mFunctions->checkFramebufferStatus(GL_FRAMEBUFFER);
>+    const FunctionsGL *functions = GetFunctionsGL(context);
>+    StateManagerGL *stateManager = GetStateManagerGL(context);
>+
>+    stateManager->bindFramebuffer(GL_FRAMEBUFFER, mFramebufferID);
>+    GLenum status = functions->checkFramebufferStatus(GL_FRAMEBUFFER);
>     if (status != GL_FRAMEBUFFER_COMPLETE)
>     {
>         WARN() << "GL framebuffer returned incomplete.";
>@@ -606,15 +616,19 @@ bool FramebufferGL::checkStatus(const gl::Context *context) const
>     return (status == GL_FRAMEBUFFER_COMPLETE);
> }
> 
>-void FramebufferGL::syncState(const gl::Context *context, const Framebuffer::DirtyBits &dirtyBits)
>+angle::Result FramebufferGL::syncState(const gl::Context *context,
>+                                       const gl::Framebuffer::DirtyBits &dirtyBits)
> {
>     // Don't need to sync state for the default FBO.
>     if (mIsDefault)
>     {
>-        return;
>+        return angle::Result::Continue;
>     }
> 
>-    mStateManager->bindFramebuffer(GL_FRAMEBUFFER, mFramebufferID);
>+    const FunctionsGL *functions = GetFunctionsGL(context);
>+    StateManagerGL *stateManager = GetStateManagerGL(context);
>+
>+    stateManager->bindFramebuffer(GL_FRAMEBUFFER, mFramebufferID);
> 
>     // A pointer to one of the attachments for which the texture or the render buffer is not zero.
>     const FramebufferAttachment *attachment = nullptr;
>@@ -626,7 +640,7 @@ void FramebufferGL::syncState(const gl::Context *context, const Framebuffer::Dir
>             case Framebuffer::DIRTY_BIT_DEPTH_ATTACHMENT:
>             {
>                 const FramebufferAttachment *newAttachment = mState.getDepthAttachment();
>-                BindFramebufferAttachment(mFunctions, GL_DEPTH_ATTACHMENT, newAttachment);
>+                BindFramebufferAttachment(functions, GL_DEPTH_ATTACHMENT, newAttachment);
>                 if (newAttachment)
>                 {
>                     attachment = newAttachment;
>@@ -636,7 +650,7 @@ void FramebufferGL::syncState(const gl::Context *context, const Framebuffer::Dir
>             case Framebuffer::DIRTY_BIT_STENCIL_ATTACHMENT:
>             {
>                 const FramebufferAttachment *newAttachment = mState.getStencilAttachment();
>-                BindFramebufferAttachment(mFunctions, GL_STENCIL_ATTACHMENT, newAttachment);
>+                BindFramebufferAttachment(functions, GL_STENCIL_ATTACHMENT, newAttachment);
>                 if (newAttachment)
>                 {
>                     attachment = newAttachment;
>@@ -646,31 +660,35 @@ void FramebufferGL::syncState(const gl::Context *context, const Framebuffer::Dir
>             case Framebuffer::DIRTY_BIT_DRAW_BUFFERS:
>             {
>                 const auto &drawBuffers = mState.getDrawBufferStates();
>-                mFunctions->drawBuffers(static_cast<GLsizei>(drawBuffers.size()),
>-                                        drawBuffers.data());
>+                functions->drawBuffers(static_cast<GLsizei>(drawBuffers.size()),
>+                                       drawBuffers.data());
>                 mAppliedEnabledDrawBuffers = mState.getEnabledDrawBuffers();
>                 break;
>             }
>             case Framebuffer::DIRTY_BIT_READ_BUFFER:
>-                mFunctions->readBuffer(mState.getReadBufferState());
>+                functions->readBuffer(mState.getReadBufferState());
>                 break;
>             case Framebuffer::DIRTY_BIT_DEFAULT_WIDTH:
>-                mFunctions->framebufferParameteri(GL_FRAMEBUFFER, GL_FRAMEBUFFER_DEFAULT_WIDTH,
>-                                                  mState.getDefaultWidth());
>+                functions->framebufferParameteri(GL_FRAMEBUFFER, GL_FRAMEBUFFER_DEFAULT_WIDTH,
>+                                                 mState.getDefaultWidth());
>                 break;
>             case Framebuffer::DIRTY_BIT_DEFAULT_HEIGHT:
>-                mFunctions->framebufferParameteri(GL_FRAMEBUFFER, GL_FRAMEBUFFER_DEFAULT_HEIGHT,
>-                                                  mState.getDefaultHeight());
>+                functions->framebufferParameteri(GL_FRAMEBUFFER, GL_FRAMEBUFFER_DEFAULT_HEIGHT,
>+                                                 mState.getDefaultHeight());
>                 break;
>             case Framebuffer::DIRTY_BIT_DEFAULT_SAMPLES:
>-                mFunctions->framebufferParameteri(GL_FRAMEBUFFER, GL_FRAMEBUFFER_DEFAULT_SAMPLES,
>-                                                  mState.getDefaultSamples());
>+                functions->framebufferParameteri(GL_FRAMEBUFFER, GL_FRAMEBUFFER_DEFAULT_SAMPLES,
>+                                                 mState.getDefaultSamples());
>                 break;
>             case Framebuffer::DIRTY_BIT_DEFAULT_FIXED_SAMPLE_LOCATIONS:
>-                mFunctions->framebufferParameteri(
>+                functions->framebufferParameteri(
>                     GL_FRAMEBUFFER, GL_FRAMEBUFFER_DEFAULT_FIXED_SAMPLE_LOCATIONS,
>                     gl::ConvertToGLBoolean(mState.getDefaultFixedSampleLocations()));
>                 break;
>+            case Framebuffer::DIRTY_BIT_DEFAULT_LAYERS:
>+                functions->framebufferParameteri(GL_FRAMEBUFFER, GL_FRAMEBUFFER_DEFAULT_LAYERS_EXT,
>+                                                 mState.getDefaultLayers());
>+                break;
>             default:
>             {
>                 ASSERT(Framebuffer::DIRTY_BIT_COLOR_ATTACHMENT_0 == 0 &&
>@@ -679,7 +697,7 @@ void FramebufferGL::syncState(const gl::Context *context, const Framebuffer::Dir
>                     static_cast<size_t>(dirtyBit - Framebuffer::DIRTY_BIT_COLOR_ATTACHMENT_0);
>                 const FramebufferAttachment *newAttachment = mState.getColorAttachment(index);
>                 BindFramebufferAttachment(
>-                    mFunctions, static_cast<GLenum>(GL_COLOR_ATTACHMENT0 + index), newAttachment);
>+                    functions, static_cast<GLenum>(GL_COLOR_ATTACHMENT0 + index), newAttachment);
>                 if (newAttachment)
>                 {
>                     attachment = newAttachment;
>@@ -689,15 +707,13 @@ void FramebufferGL::syncState(const gl::Context *context, const Framebuffer::Dir
>         }
>     }
> 
>-    if (attachment)
>+    if (attachment && mState.id() == context->getState().getDrawFramebuffer()->id())
>     {
>-        const bool isSideBySide =
>-            (attachment->getMultiviewLayout() == GL_FRAMEBUFFER_MULTIVIEW_SIDE_BY_SIDE_ANGLE);
>-        mStateManager->setSideBySide(isSideBySide);
>-        mStateManager->setViewportOffsets(attachment->getMultiviewViewportOffsets());
>-        mStateManager->updateMultiviewBaseViewLayerIndexUniform(context->getGLState().getProgram(),
>-                                                                getState());
>+        stateManager->updateMultiviewBaseViewLayerIndexUniform(context->getState().getProgram(),
>+                                                               getState());
>     }
>+
>+    return angle::Result::Continue;
> }
> 
> GLuint FramebufferGL::getFramebufferID() const
>@@ -710,33 +726,16 @@ bool FramebufferGL::isDefault() const
>     return mIsDefault;
> }
> 
>-void FramebufferGL::maskOutInactiveOutputDrawBuffers(DrawBufferMask maxSet)
>-{
>-    auto targetAppliedDrawBuffers = mState.getEnabledDrawBuffers() & maxSet;
>-    if (mAppliedEnabledDrawBuffers != targetAppliedDrawBuffers)
>-    {
>-        mAppliedEnabledDrawBuffers = targetAppliedDrawBuffers;
>-
>-        const auto &stateDrawBuffers = mState.getDrawBufferStates();
>-        GLsizei drawBufferCount      = static_cast<GLsizei>(stateDrawBuffers.size());
>-        ASSERT(drawBufferCount <= IMPLEMENTATION_MAX_DRAW_BUFFERS);
>-
>-        GLenum drawBuffers[IMPLEMENTATION_MAX_DRAW_BUFFERS];
>-        for (GLenum i = 0; static_cast<int>(i) < drawBufferCount; ++i)
>-        {
>-            drawBuffers[i] = targetAppliedDrawBuffers[i] ? stateDrawBuffers[i] : GL_NONE;
>-        }
>-
>-        mStateManager->bindFramebuffer(GL_FRAMEBUFFER, mFramebufferID);
>-        mFunctions->drawBuffers(drawBufferCount, drawBuffers);
>-    }
>-}
>-
> void FramebufferGL::syncClearState(const gl::Context *context, GLbitfield mask)
> {
>-    if (mFunctions->standard == STANDARD_GL_DESKTOP)
>+    const FunctionsGL *functions = GetFunctionsGL(context);
>+
>+    if (functions->standard == STANDARD_GL_DESKTOP)
>     {
>-        if (mWorkarounds.doesSRGBClearsOnLinearFramebufferAttachments &&
>+        StateManagerGL *stateManager     = GetStateManagerGL(context);
>+        const WorkaroundsGL &workarounds = GetWorkaroundsGL(context);
>+
>+        if (workarounds.doesSRGBClearsOnLinearFramebufferAttachments &&
>             (mask & GL_COLOR_BUFFER_BIT) != 0 && !mIsDefault)
>         {
>             bool hasSRGBAttachment = false;
>@@ -749,11 +748,11 @@ void FramebufferGL::syncClearState(const gl::Context *context, GLbitfield mask)
>                 }
>             }
> 
>-            mStateManager->setFramebufferSRGBEnabled(context, hasSRGBAttachment);
>+            stateManager->setFramebufferSRGBEnabled(context, hasSRGBAttachment);
>         }
>         else
>         {
>-            mStateManager->setFramebufferSRGBEnabled(context, !mIsDefault);
>+            stateManager->setFramebufferSRGBEnabled(context, !mIsDefault);
>         }
>     }
> }
>@@ -762,9 +761,14 @@ void FramebufferGL::syncClearBufferState(const gl::Context *context,
>                                          GLenum buffer,
>                                          GLint drawBuffer)
> {
>-    if (mFunctions->standard == STANDARD_GL_DESKTOP)
>+    const FunctionsGL *functions = GetFunctionsGL(context);
>+
>+    if (functions->standard == STANDARD_GL_DESKTOP)
>     {
>-        if (mWorkarounds.doesSRGBClearsOnLinearFramebufferAttachments && buffer == GL_COLOR &&
>+        StateManagerGL *stateManager     = GetStateManagerGL(context);
>+        const WorkaroundsGL &workarounds = GetWorkaroundsGL(context);
>+
>+        if (workarounds.doesSRGBClearsOnLinearFramebufferAttachments && buffer == GL_COLOR &&
>             !mIsDefault)
>         {
>             // If doing a clear on a color buffer, set SRGB blend enabled only if the color buffer
>@@ -783,13 +787,13 @@ void FramebufferGL::syncClearBufferState(const gl::Context *context,
> 
>             if (attachment != nullptr)
>             {
>-                mStateManager->setFramebufferSRGBEnabled(context,
>-                                                         attachment->getColorEncoding() == GL_SRGB);
>+                stateManager->setFramebufferSRGBEnabled(context,
>+                                                        attachment->getColorEncoding() == GL_SRGB);
>             }
>         }
>         else
>         {
>-            mStateManager->setFramebufferSRGBEnabled(context, !mIsDefault);
>+            stateManager->setFramebufferSRGBEnabled(context, !mIsDefault);
>         }
>     }
> }
>@@ -831,48 +835,57 @@ bool FramebufferGL::modifyInvalidateAttachmentsForEmulatedDefaultFBO(
>     return true;
> }
> 
>-gl::Error FramebufferGL::readPixelsRowByRow(const gl::Context *context,
>-                                            const gl::Rectangle &area,
>-                                            GLenum format,
>-                                            GLenum type,
>-                                            const gl::PixelPackState &pack,
>-                                            GLubyte *pixels) const
>+angle::Result FramebufferGL::readPixelsRowByRow(const gl::Context *context,
>+                                                const gl::Rectangle &area,
>+                                                GLenum format,
>+                                                GLenum type,
>+                                                const gl::PixelPackState &pack,
>+                                                GLubyte *pixels) const
> {
>+    ContextGL *contextGL         = GetImplAs<ContextGL>(context);
>+    const FunctionsGL *functions = GetFunctionsGL(context);
>+    StateManagerGL *stateManager = GetStateManagerGL(context);
>+
>     const gl::InternalFormat &glFormat = gl::GetInternalFormatInfo(format, type);
> 
>     GLuint rowBytes = 0;
>-    ANGLE_TRY_RESULT(glFormat.computeRowPitch(type, area.width, pack.alignment, pack.rowLength),
>-                     rowBytes);
>+    ANGLE_CHECK_GL_MATH(contextGL, glFormat.computeRowPitch(type, area.width, pack.alignment,
>+                                                            pack.rowLength, &rowBytes));
>     GLuint skipBytes = 0;
>-    ANGLE_TRY_RESULT(glFormat.computeSkipBytes(rowBytes, 0, pack, false), skipBytes);
>+    ANGLE_CHECK_GL_MATH(contextGL,
>+                        glFormat.computeSkipBytes(type, rowBytes, 0, pack, false, &skipBytes));
> 
>     gl::PixelPackState directPack;
>-    directPack.alignment   = 1;
>-    mStateManager->setPixelPackState(directPack);
>+    directPack.alignment = 1;
>+    stateManager->setPixelPackState(directPack);
> 
>     pixels += skipBytes;
>     for (GLint y = area.y; y < area.y + area.height; ++y)
>     {
>-        mFunctions->readPixels(area.x, y, area.width, 1, format, type, pixels);
>+        functions->readPixels(area.x, y, area.width, 1, format, type, pixels);
>         pixels += rowBytes;
>     }
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error FramebufferGL::readPixelsAllAtOnce(const gl::Context *context,
>-                                             const gl::Rectangle &area,
>-                                             GLenum format,
>-                                             GLenum type,
>-                                             const gl::PixelPackState &pack,
>-                                             GLubyte *pixels,
>-                                             bool readLastRowSeparately) const
>+angle::Result FramebufferGL::readPixelsAllAtOnce(const gl::Context *context,
>+                                                 const gl::Rectangle &area,
>+                                                 GLenum format,
>+                                                 GLenum type,
>+                                                 const gl::PixelPackState &pack,
>+                                                 GLubyte *pixels,
>+                                                 bool readLastRowSeparately) const
> {
>+    ContextGL *contextGL         = GetImplAs<ContextGL>(context);
>+    const FunctionsGL *functions = GetFunctionsGL(context);
>+    StateManagerGL *stateManager = GetStateManagerGL(context);
>+
>     GLint height = area.height - readLastRowSeparately;
>     if (height > 0)
>     {
>-        mStateManager->setPixelPackState(pack);
>-        mFunctions->readPixels(area.x, area.y, area.width, height, format, type, pixels);
>+        stateManager->setPixelPackState(pack);
>+        functions->readPixels(area.x, area.y, area.width, height, format, type, pixels);
>     }
> 
>     if (readLastRowSeparately)
>@@ -880,20 +893,21 @@ gl::Error FramebufferGL::readPixelsAllAtOnce(const gl::Context *context,
>         const gl::InternalFormat &glFormat = gl::GetInternalFormatInfo(format, type);
> 
>         GLuint rowBytes = 0;
>-        ANGLE_TRY_RESULT(glFormat.computeRowPitch(type, area.width, pack.alignment, pack.rowLength),
>-                         rowBytes);
>+        ANGLE_CHECK_GL_MATH(contextGL, glFormat.computeRowPitch(type, area.width, pack.alignment,
>+                                                                pack.rowLength, &rowBytes));
>         GLuint skipBytes = 0;
>-        ANGLE_TRY_RESULT(glFormat.computeSkipBytes(rowBytes, 0, pack, false), skipBytes);
>+        ANGLE_CHECK_GL_MATH(contextGL,
>+                            glFormat.computeSkipBytes(type, rowBytes, 0, pack, false, &skipBytes));
> 
>         gl::PixelPackState directPack;
>         directPack.alignment = 1;
>-        mStateManager->setPixelPackState(directPack);
>+        stateManager->setPixelPackState(directPack);
> 
>         pixels += skipBytes + (area.height - 1) * rowBytes;
>-        mFunctions->readPixels(area.x, area.y + area.height - 1, area.width, 1, format, type,
>-                               pixels);
>+        functions->readPixels(area.x, area.y + area.height - 1, area.width, 1, format, type,
>+                              pixels);
>     }
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> }  // namespace rx
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/FramebufferGL.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/FramebufferGL.h
>index 94cbcd861ed..1ae988557f5 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/FramebufferGL.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/FramebufferGL.h
>@@ -9,6 +9,7 @@
> #ifndef LIBANGLE_RENDERER_GL_FRAMEBUFFERGL_H_
> #define LIBANGLE_RENDERER_GL_FRAMEBUFFERGL_H_
> 
>+#include "libANGLE/Context.h"
> #include "libANGLE/renderer/FramebufferImpl.h"
> 
> namespace rx
>@@ -23,80 +24,68 @@ struct WorkaroundsGL;
> class FramebufferGL : public FramebufferImpl
> {
>   public:
>-    FramebufferGL(const gl::FramebufferState &data,
>-                  const FunctionsGL *functions,
>-                  StateManagerGL *stateManager,
>-                  const WorkaroundsGL &workarounds,
>-                  BlitGL *blitter,
>-                  ClearMultiviewGL *multiviewClearer,
>-                  bool isDefault);
>-    // Constructor called when we need to create a FramebufferGL from an
>-    // existing framebuffer name, for example for the default framebuffer
>-    // on the Mac EGL CGL backend.
>-    FramebufferGL(GLuint id,
>-                  const gl::FramebufferState &data,
>-                  const FunctionsGL *functions,
>-                  const WorkaroundsGL &workarounds,
>-                  BlitGL *blitter,
>-                  ClearMultiviewGL *multiviewClearer,
>-                  StateManagerGL *stateManager);
>+    FramebufferGL(const gl::FramebufferState &data, GLuint id, bool isDefault);
>     ~FramebufferGL() override;
> 
>-    gl::Error discard(const gl::Context *context, size_t count, const GLenum *attachments) override;
>-    gl::Error invalidate(const gl::Context *context,
>-                         size_t count,
>-                         const GLenum *attachments) override;
>-    gl::Error invalidateSub(const gl::Context *context,
>-                            size_t count,
>-                            const GLenum *attachments,
>-                            const gl::Rectangle &area) override;
>-
>-    gl::Error clear(const gl::Context *context, GLbitfield mask) override;
>-    gl::Error clearBufferfv(const gl::Context *context,
>-                            GLenum buffer,
>-                            GLint drawbuffer,
>-                            const GLfloat *values) override;
>-    gl::Error clearBufferuiv(const gl::Context *context,
>-                             GLenum buffer,
>-                             GLint drawbuffer,
>-                             const GLuint *values) override;
>-    gl::Error clearBufferiv(const gl::Context *context,
>-                            GLenum buffer,
>-                            GLint drawbuffer,
>-                            const GLint *values) override;
>-    gl::Error clearBufferfi(const gl::Context *context,
>-                            GLenum buffer,
>-                            GLint drawbuffer,
>-                            GLfloat depth,
>-                            GLint stencil) override;
>+    void destroy(const gl::Context *context) override;
>+
>+    angle::Result discard(const gl::Context *context,
>+                          size_t count,
>+                          const GLenum *attachments) override;
>+    angle::Result invalidate(const gl::Context *context,
>+                             size_t count,
>+                             const GLenum *attachments) override;
>+    angle::Result invalidateSub(const gl::Context *context,
>+                                size_t count,
>+                                const GLenum *attachments,
>+                                const gl::Rectangle &area) override;
>+
>+    angle::Result clear(const gl::Context *context, GLbitfield mask) override;
>+    angle::Result clearBufferfv(const gl::Context *context,
>+                                GLenum buffer,
>+                                GLint drawbuffer,
>+                                const GLfloat *values) override;
>+    angle::Result clearBufferuiv(const gl::Context *context,
>+                                 GLenum buffer,
>+                                 GLint drawbuffer,
>+                                 const GLuint *values) override;
>+    angle::Result clearBufferiv(const gl::Context *context,
>+                                GLenum buffer,
>+                                GLint drawbuffer,
>+                                const GLint *values) override;
>+    angle::Result clearBufferfi(const gl::Context *context,
>+                                GLenum buffer,
>+                                GLint drawbuffer,
>+                                GLfloat depth,
>+                                GLint stencil) override;
> 
>     GLenum getImplementationColorReadFormat(const gl::Context *context) const override;
>     GLenum getImplementationColorReadType(const gl::Context *context) const override;
> 
>-    gl::Error readPixels(const gl::Context *context,
>-                         const gl::Rectangle &area,
>-                         GLenum format,
>-                         GLenum type,
>-                         void *pixels) override;
>+    angle::Result readPixels(const gl::Context *context,
>+                             const gl::Rectangle &area,
>+                             GLenum format,
>+                             GLenum type,
>+                             void *pixels) override;
> 
>-    gl::Error blit(const gl::Context *context,
>-                   const gl::Rectangle &sourceArea,
>-                   const gl::Rectangle &destArea,
>-                   GLbitfield mask,
>-                   GLenum filter) override;
>+    angle::Result blit(const gl::Context *context,
>+                       const gl::Rectangle &sourceArea,
>+                       const gl::Rectangle &destArea,
>+                       GLbitfield mask,
>+                       GLenum filter) override;
> 
>-    gl::Error getSamplePosition(size_t index, GLfloat *xy) const override;
>+    angle::Result getSamplePosition(const gl::Context *context,
>+                                    size_t index,
>+                                    GLfloat *xy) const override;
> 
>     bool checkStatus(const gl::Context *context) const override;
> 
>-    void syncState(const gl::Context *context,
>-                   const gl::Framebuffer::DirtyBits &dirtyBits) override;
>+    angle::Result syncState(const gl::Context *context,
>+                            const gl::Framebuffer::DirtyBits &dirtyBits) override;
> 
>     GLuint getFramebufferID() const;
>     bool isDefault() const;
> 
>-    void maskOutInactiveOutputDrawBuffers(gl::DrawBufferMask maxSet);
>-
>   private:
>     void syncClearState(const gl::Context *context, GLbitfield mask);
>     void syncClearBufferState(const gl::Context *context, GLenum buffer, GLint drawBuffer);
>@@ -106,32 +95,29 @@ class FramebufferGL : public FramebufferImpl
>         const GLenum *attachments,
>         std::vector<GLenum> *modifiedAttachments) const;
> 
>-    gl::Error readPixelsRowByRow(const gl::Context *context,
>-                                 const gl::Rectangle &area,
>-                                 GLenum format,
>-                                 GLenum type,
>-                                 const gl::PixelPackState &pack,
>-                                 GLubyte *pixels) const;
>-
>-    gl::Error readPixelsAllAtOnce(const gl::Context *context,
>-                                  const gl::Rectangle &area,
>-                                  GLenum format,
>-                                  GLenum type,
>-                                  const gl::PixelPackState &pack,
>-                                  GLubyte *pixels,
>-                                  bool readLastRowSeparately) const;
>-
>-    const FunctionsGL *mFunctions;
>-    StateManagerGL *mStateManager;
>-    const WorkaroundsGL &mWorkarounds;
>-    BlitGL *mBlitter;
>-    ClearMultiviewGL *mMultiviewClearer;
>+    angle::Result readPixelsRowByRow(const gl::Context *context,
>+                                     const gl::Rectangle &area,
>+                                     GLenum format,
>+                                     GLenum type,
>+                                     const gl::PixelPackState &pack,
>+                                     GLubyte *pixels) const;
>+
>+    angle::Result readPixelsAllAtOnce(const gl::Context *context,
>+                                      const gl::Rectangle &area,
>+                                      GLenum format,
>+                                      GLenum type,
>+                                      const gl::PixelPackState &pack,
>+                                      GLubyte *pixels,
>+                                      bool readLastRowSeparately) const;
>+
>+    void maskOutInactiveOutputDrawBuffersImpl(const gl::Context *context,
>+                                              gl::DrawBufferMask targetAppliedDrawBuffers);
> 
>     GLuint mFramebufferID;
>     bool mIsDefault;
> 
>     gl::DrawBufferMask mAppliedEnabledDrawBuffers;
> };
>-}
>+}  // namespace rx
> 
> #endif  // LIBANGLE_RENDERER_GL_FRAMEBUFFERGL_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/FunctionsGL.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/FunctionsGL.cpp
>index 5f84f483cc2..7102811e5da 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/FunctionsGL.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/FunctionsGL.cpp
>@@ -17,9 +17,11 @@
> namespace rx
> {
> 
>-static void GetGLVersion(PFNGLGETSTRINGPROC getStringFunction, gl::Version *outVersion, StandardGL *outStandard)
>+static void GetGLVersion(PFNGLGETSTRINGPROC getStringFunction,
>+                         gl::Version *outVersion,
>+                         StandardGL *outStandard)
> {
>-    const std::string version = reinterpret_cast<const char*>(getStringFunction(GL_VERSION));
>+    const std::string version = reinterpret_cast<const char *>(getStringFunction(GL_VERSION));
>     if (version.find("OpenGL ES") == std::string::npos)
>     {
>         // OpenGL spec states the GL_VERSION string will be in the following format:
>@@ -28,18 +30,19 @@ static void GetGLVersion(PFNGLGETSTRINGPROC getStringFunction, gl::Version *outV
>         // number.minor number.release number, where the numbers all have one or more
>         // digits
>         *outStandard = STANDARD_GL_DESKTOP;
>-        *outVersion = gl::Version(version[0] - '0', version[2] - '0');
>+        *outVersion  = gl::Version(version[0] - '0', version[2] - '0');
>     }
>     else
>     {
>         // ES spec states that the GL_VERSION string will be in the following format:
>         // "OpenGL ES N.M vendor-specific information"
>         *outStandard = STANDARD_GL_ES;
>-        *outVersion = gl::Version(version[10] - '0', version[12] - '0');
>+        *outVersion  = gl::Version(version[10] - '0', version[12] - '0');
>     }
> }
> 
>-static std::vector<std::string> GetIndexedExtensions(PFNGLGETINTEGERVPROC getIntegerFunction, PFNGLGETSTRINGIPROC getStringIFunction)
>+static std::vector<std::string> GetIndexedExtensions(PFNGLGETINTEGERVPROC getIntegerFunction,
>+                                                     PFNGLGETSTRINGIPROC getStringIFunction)
> {
>     std::vector<std::string> result;
> 
>@@ -50,7 +53,7 @@ static std::vector<std::string> GetIndexedExtensions(PFNGLGETINTEGERVPROC getInt
> 
>     for (GLint i = 0; i < numExtensions; i++)
>     {
>-        result.push_back(reinterpret_cast<const char*>(getStringIFunction(GL_EXTENSIONS, i)));
>+        result.push_back(reinterpret_cast<const char *>(getStringIFunction(GL_EXTENSIONS, i)));
>     }
> 
>     return result;
>@@ -92,13 +95,9 @@ static void INTERNAL_GL_APIENTRY DummyGetShaderiv(GLuint program, GLenum pname,
> 
> #define ASSIGN(NAME, FP) *reinterpret_cast<void **>(&FP) = loadProcAddress(NAME)
> 
>-FunctionsGL::FunctionsGL() : version(), standard(), extensions()
>-{
>-}
>+FunctionsGL::FunctionsGL() : version(), standard(), extensions() {}
> 
>-FunctionsGL::~FunctionsGL()
>-{
>-}
>+FunctionsGL::~FunctionsGL() {}
> 
> void FunctionsGL::initialize(const egl::AttributeMap &displayAttributes)
> {
>@@ -125,12 +124,12 @@ void FunctionsGL::initialize(const egl::AttributeMap &displayAttributes)
>         extensionSet.insert(extension);
>     }
> 
>-// Note:
>-// Even though extensions are written against specific versions of GL, many drivers expose the
>-// extensions in even older versions.  Always try loading the extensions regardless of GL
>-// version.
>+    // Note:
>+    // Even though extensions are written against specific versions of GL, many drivers expose the
>+    // extensions in even older versions.  Always try loading the extensions regardless of GL
>+    // version.
> 
>-// Load the entry points
>+    // Load the entry points
> 
> #if defined(ANGLE_ENABLE_OPENGL_NULL)
>     EGLint deviceType =
>@@ -244,6 +243,7 @@ void FunctionsGL::initializeDummyFunctionsForNULLDriver(const std::set<std::stri
>     ASSIGN("glGetString", getString);
>     ASSIGN("glGetStringi", getStringi);
>     ASSIGN("glGetIntegerv", getIntegerv);
>+    ASSIGN("glGetIntegeri_v", getIntegeri_v);
> 
>     getProgramiv           = &DummyGetProgramiv;
>     getShaderiv            = &DummyGetShaderiv;
>@@ -267,4 +267,4 @@ void FunctionsGL::initializeDummyFunctionsForNULLDriver(const std::set<std::stri
> }
> #endif  // defined(ANGLE_ENABLE_OPENGL_NULL)
> 
>-}  // namespace gl
>+}  // namespace rx
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/FunctionsGL.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/FunctionsGL.h
>index 77047c428e1..66d1d9f472d 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/FunctionsGL.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/FunctionsGL.h
>@@ -59,4 +59,4 @@ class FunctionsGL : public DispatchTableGL
> 
> }  // namespace rx
> 
>-#endif // LIBANGLE_RENDERER_GL_FUNCTIONSGL_H_
>+#endif  // LIBANGLE_RENDERER_GL_FUNCTIONSGL_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/ImageGL.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/ImageGL.cpp
>new file mode 100644
>index 00000000000..189d4ac5697
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/ImageGL.cpp
>@@ -0,0 +1,18 @@
>+//
>+// Copyright 2018 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+
>+// ImageGL.cpp: Implements rx::ImageGL class
>+
>+#include "libANGLE/renderer/gl/ImageGL.h"
>+
>+namespace rx
>+{
>+
>+ImageGL::ImageGL(const egl::ImageState &state) : ImageImpl(state) {}
>+
>+ImageGL::~ImageGL() {}
>+
>+}  // namespace rx
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/ImageGL.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/ImageGL.h
>new file mode 100644
>index 00000000000..6b785e086bb
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/ImageGL.h
>@@ -0,0 +1,40 @@
>+//
>+// Copyright 2018 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+
>+// ImageGL.h: Defines the rx::ImageGL class, the GL implementation of EGL images
>+
>+#ifndef LIBANGLE_RENDERER_GL_IMAGEGL_H_
>+#define LIBANGLE_RENDERER_GL_IMAGEGL_H_
>+
>+#include "common/PackedEnums.h"
>+#include "libANGLE/renderer/ImageImpl.h"
>+
>+namespace rx
>+{
>+class TextureGL;
>+class RenderbufferGL;
>+
>+class ImageGL : public ImageImpl
>+{
>+  public:
>+    ImageGL(const egl::ImageState &state);
>+    ~ImageGL() override;
>+
>+    // TextureGL does not have access to all the parameters needed to implement
>+    // glEGLImageTargetTexture2DOES or glEGLImageTargetRenderbufferStorageOES. This allows the Image
>+    // to implement these functions because it holds the native EGLimage or emulated object.
>+    virtual angle::Result setTexture2D(const gl::Context *context,
>+                                       gl::TextureType type,
>+                                       TextureGL *texture,
>+                                       GLenum *outInternalFormat)           = 0;
>+    virtual angle::Result setRenderbufferStorage(const gl::Context *context,
>+                                                 RenderbufferGL *renderbuffer,
>+                                                 GLenum *outInternalFormat) = 0;
>+};
>+
>+}  // namespace rx
>+
>+#endif  // LIBANGLE_RENDERER_GL_IMAGEGL_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/PathGL.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/PathGL.cpp
>index 0891d1bd2fe..0db0f757f23 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/PathGL.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/PathGL.cpp
>@@ -11,28 +11,22 @@
> 
> namespace rx
> {
>+PathGL::PathGL(const FunctionsGL *functions, GLuint path) : mFunctions(functions), mPathID(path) {}
> 
>-PathGL::PathGL(const FunctionsGL *functions, GLuint path) : mFunctions(functions), mPathID(path)
>-{
>-}
>-
>-PathGL::~PathGL()
>-{
>-}
>+PathGL::~PathGL() {}
> 
>-gl::Error PathGL::setCommands(GLsizei numCommands,
>-                              const GLubyte *commands,
>-                              GLsizei numCoords,
>-                              GLenum coordType,
>-                              const void *coords)
>+angle::Result PathGL::setCommands(GLsizei numCommands,
>+                                  const GLubyte *commands,
>+                                  GLsizei numCoords,
>+                                  GLenum coordType,
>+                                  const void *coords)
> {
>     mFunctions->pathCommandsNV(mPathID, numCommands, commands, numCoords, coordType, coords);
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
> void PathGL::setPathParameter(GLenum pname, GLfloat value)
> {
>     mFunctions->pathParameterfNV(mPathID, pname, value);
> }
>-
>-}  // rx
>+}  // namespace rx
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/PathGL.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/PathGL.h
>index 74939d40848..df3f662dacd 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/PathGL.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/PathGL.h
>@@ -23,11 +23,11 @@ class PathGL : public PathImpl
>     PathGL(const FunctionsGL *functions, GLuint path);
>     ~PathGL() override;
> 
>-    gl::Error setCommands(GLsizei numCommands,
>-                          const GLubyte *commands,
>-                          GLsizei numCoords,
>-                          GLenum coordType,
>-                          const void *coords) override;
>+    angle::Result setCommands(GLsizei numCommands,
>+                              const GLubyte *commands,
>+                              GLsizei numCoords,
>+                              GLenum coordType,
>+                              const void *coords) override;
> 
>     void setPathParameter(GLenum pname, GLfloat value) override;
> 
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/ProgramGL.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/ProgramGL.cpp
>index 16455de18e3..e819ba8df91 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/ProgramGL.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/ProgramGL.cpp
>@@ -16,9 +16,11 @@
> #include "libANGLE/Context.h"
> #include "libANGLE/ProgramLinkedResources.h"
> #include "libANGLE/Uniform.h"
>+#include "libANGLE/WorkerThread.h"
> #include "libANGLE/queryconversions.h"
> #include "libANGLE/renderer/gl/ContextGL.h"
> #include "libANGLE/renderer/gl/FunctionsGL.h"
>+#include "libANGLE/renderer/gl/RendererGL.h"
> #include "libANGLE/renderer/gl/ShaderGL.h"
> #include "libANGLE/renderer/gl/StateManagerGL.h"
> #include "libANGLE/renderer/gl/WorkaroundsGL.h"
>@@ -31,14 +33,17 @@ ProgramGL::ProgramGL(const gl::ProgramState &data,
>                      const FunctionsGL *functions,
>                      const WorkaroundsGL &workarounds,
>                      StateManagerGL *stateManager,
>-                     bool enablePathRendering)
>+                     bool enablePathRendering,
>+                     const std::shared_ptr<RendererGL> &renderer)
>     : ProgramImpl(data),
>       mFunctions(functions),
>       mWorkarounds(workarounds),
>       mStateManager(stateManager),
>       mEnablePathRendering(enablePathRendering),
>       mMultiviewBaseViewLayerIndexUniformLocation(-1),
>-      mProgramID(0)
>+      mProgramID(0),
>+      mRenderer(renderer),
>+      mLinkedInParallel(false)
> {
>     ASSERT(mFunctions);
>     ASSERT(mStateManager);
>@@ -52,9 +57,9 @@ ProgramGL::~ProgramGL()
>     mProgramID = 0;
> }
> 
>-gl::LinkResult ProgramGL::load(const gl::Context *context,
>-                               gl::InfoLog &infoLog,
>-                               gl::BinaryInputStream *stream)
>+std::unique_ptr<LinkEvent> ProgramGL::load(const gl::Context *context,
>+                                           gl::BinaryInputStream *stream,
>+                                           gl::InfoLog &infoLog)
> {
>     preLink();
> 
>@@ -70,13 +75,13 @@ gl::LinkResult ProgramGL::load(const gl::Context *context,
>     // Verify that the program linked
>     if (!checkLinkStatus(infoLog))
>     {
>-        return false;
>+        return std::make_unique<LinkEventDone>(angle::Result::Incomplete);
>     }
> 
>     postLink();
>     reapplyUBOBindingsIfNeeded(context);
> 
>-    return true;
>+    return std::make_unique<LinkEventDone>(angle::Result::Continue);
> }
> 
> void ProgramGL::save(const gl::Context *context, gl::BinaryOutputStream *stream)
>@@ -125,23 +130,98 @@ void ProgramGL::setSeparable(bool separable)
>     mFunctions->programParameteri(mProgramID, GL_PROGRAM_SEPARABLE, separable ? GL_TRUE : GL_FALSE);
> }
> 
>-gl::LinkResult ProgramGL::link(const gl::Context *context,
>-                               const gl::ProgramLinkedResources &resources,
>-                               gl::InfoLog &infoLog)
>+using LinkImplFunctor = std::function<bool(std::string &)>;
>+class ProgramGL::LinkTask final : public angle::Closure
> {
>-    preLink();
>+  public:
>+    LinkTask(LinkImplFunctor &&functor) : mLinkImplFunctor(functor), mFallbackToMainContext(false)
>+    {}
>+
>+    void operator()() override { mFallbackToMainContext = mLinkImplFunctor(mInfoLog); }
>+    bool fallbackToMainContext() { return mFallbackToMainContext; }
>+    const std::string &getInfoLog() { return mInfoLog; }
>+
>+  private:
>+    LinkImplFunctor mLinkImplFunctor;
>+    bool mFallbackToMainContext;
>+    std::string mInfoLog;
>+};
>+
>+using PostLinkImplFunctor = std::function<angle::Result(bool, const std::string &)>;
> 
>-    if (mState.getAttachedComputeShader())
>+// The event for a parallelized linking using the native driver extension.
>+class ProgramGL::LinkEventNativeParallel final : public LinkEvent
>+{
>+  public:
>+    LinkEventNativeParallel(PostLinkImplFunctor &&functor,
>+                            const FunctionsGL *functions,
>+                            GLuint programID)
>+        : mPostLinkImplFunctor(functor), mFunctions(functions), mProgramID(programID)
>+    {}
>+
>+    angle::Result wait(const gl::Context *context) override
>     {
>-        const ShaderGL *computeShaderGL = GetImplAs<ShaderGL>(mState.getAttachedComputeShader());
>+        GLint linkStatus = GL_FALSE;
>+        mFunctions->getProgramiv(mProgramID, GL_LINK_STATUS, &linkStatus);
>+        if (linkStatus == GL_TRUE)
>+        {
>+            return mPostLinkImplFunctor(false, std::string());
>+        }
>+        return angle::Result::Incomplete;
>+    }
> 
>-        mFunctions->attachShader(mProgramID, computeShaderGL->getShaderID());
>+    bool isLinking() override
>+    {
>+        GLint completionStatus = GL_FALSE;
>+        mFunctions->getProgramiv(mProgramID, GL_COMPLETION_STATUS, &completionStatus);
>+        return completionStatus == GL_FALSE;
>+    }
> 
>-        // Link and verify
>-        mFunctions->linkProgram(mProgramID);
>+  private:
>+    PostLinkImplFunctor mPostLinkImplFunctor;
>+    const FunctionsGL *mFunctions;
>+    GLuint mProgramID;
>+};
> 
>-        // Detach the shaders
>-        mFunctions->detachShader(mProgramID, computeShaderGL->getShaderID());
>+// The event for a parallelized linking using the worker thread pool.
>+class ProgramGL::LinkEventGL final : public LinkEvent
>+{
>+  public:
>+    LinkEventGL(std::shared_ptr<angle::WorkerThreadPool> workerPool,
>+                std::shared_ptr<ProgramGL::LinkTask> linkTask,
>+                PostLinkImplFunctor &&functor)
>+        : mLinkTask(linkTask),
>+          mWaitableEvent(std::shared_ptr<angle::WaitableEvent>(
>+              angle::WorkerThreadPool::PostWorkerTask(workerPool, mLinkTask))),
>+          mPostLinkImplFunctor(functor)
>+    {}
>+
>+    angle::Result wait(const gl::Context *context) override
>+    {
>+        mWaitableEvent->wait();
>+        return mPostLinkImplFunctor(mLinkTask->fallbackToMainContext(), mLinkTask->getInfoLog());
>+    }
>+
>+    bool isLinking() override { return !mWaitableEvent->isReady(); }
>+
>+  private:
>+    std::shared_ptr<ProgramGL::LinkTask> mLinkTask;
>+    std::shared_ptr<angle::WaitableEvent> mWaitableEvent;
>+    PostLinkImplFunctor mPostLinkImplFunctor;
>+};
>+
>+std::unique_ptr<LinkEvent> ProgramGL::link(const gl::Context *context,
>+                                           const gl::ProgramLinkedResources &resources,
>+                                           gl::InfoLog &infoLog)
>+{
>+    preLink();
>+
>+    if (mState.getAttachedShader(gl::ShaderType::Compute))
>+    {
>+        const ShaderGL *computeShaderGL =
>+            GetImplAs<ShaderGL>(mState.getAttachedShader(gl::ShaderType::Compute));
>+
>+        mFunctions->attachShader(mProgramID, computeShaderGL->getShaderID());
>     }
>     else
>     {
>@@ -150,8 +230,8 @@ gl::LinkResult ProgramGL::link(const gl::Context *context,
>         for (const auto &tfVarying : mState.getTransformFeedbackVaryingNames())
>         {
>             std::string tfVaryingMappedName =
>-                mState.getAttachedVertexShader()->getTransformFeedbackVaryingMappedName(tfVarying,
>-                                                                                        context);
>+                mState.getAttachedShader(gl::ShaderType::Vertex)
>+                    ->getTransformFeedbackVaryingMappedName(tfVarying);
>             transformFeedbackVaryingMappedNames.push_back(tfVaryingMappedName);
>         }
> 
>@@ -176,17 +256,25 @@ gl::LinkResult ProgramGL::link(const gl::Context *context,
>                 &transformFeedbackVaryings[0], mState.getTransformFeedbackBufferMode());
>         }
> 
>-        const ShaderGL *vertexShaderGL   = GetImplAs<ShaderGL>(mState.getAttachedVertexShader());
>-        const ShaderGL *fragmentShaderGL = GetImplAs<ShaderGL>(mState.getAttachedFragmentShader());
>+        const ShaderGL *vertexShaderGL =
>+            GetImplAs<ShaderGL>(mState.getAttachedShader(gl::ShaderType::Vertex));
>+        const ShaderGL *fragmentShaderGL =
>+            GetImplAs<ShaderGL>(mState.getAttachedShader(gl::ShaderType::Fragment));
>+        const ShaderGL *geometryShaderGL = rx::SafeGetImplAs<ShaderGL, gl::Shader>(
>+            mState.getAttachedShader(gl::ShaderType::Geometry));
> 
>         // Attach the shaders
>         mFunctions->attachShader(mProgramID, vertexShaderGL->getShaderID());
>         mFunctions->attachShader(mProgramID, fragmentShaderGL->getShaderID());
>+        if (geometryShaderGL)
>+        {
>+            mFunctions->attachShader(mProgramID, geometryShaderGL->getShaderID());
>+        }
> 
>         // Bind attribute locations to match the GL layer.
>         for (const sh::Attribute &attribute : mState.getAttributes())
>         {
>-            if (!attribute.staticUse || attribute.isBuiltIn())
>+            if (!attribute.active || attribute.isBuiltIn())
>             {
>                 continue;
>             }
>@@ -195,29 +283,202 @@ gl::LinkResult ProgramGL::link(const gl::Context *context,
>                                            attribute.mappedName.c_str());
>         }
> 
>-        // Link and verify
>+        // Bind the secondary fragment color outputs defined in EXT_blend_func_extended. We only use
>+        // the API to bind fragment output locations in case EXT_blend_func_extended is enabled.
>+        // Otherwise shader-assigned locations will work.
>+        if (context->getExtensions().blendFuncExtended)
>+        {
>+            if (mState.getAttachedShader(gl::ShaderType::Fragment)->getShaderVersion() == 100)
>+            {
>+                // TODO(http://anglebug.com/2833): The bind done below is only valid in case the
>+                // compiler transforms the shader outputs to the angle/webgl prefixed ones. If we
>+                // added support for running EXT_blend_func_extended on top of GLES, some changes
>+                // would be required:
>+                //  - If we're backed by GLES 2.0, we shouldn't do the bind because it's not needed.
>+                //  - If we're backed by GLES 3.0+, it's a bit unclear what should happen. Currently
>+                //    the compiler doesn't support transforming GLSL ES 1.00 shaders to GLSL ES 3.00
>+                //    shaders in general, but support for that might be required. Or we might be
>+                //    able to skip the bind in case the compiler outputs GLSL ES 1.00.
>+                const auto &shaderOutputs =
>+                    mState.getAttachedShader(gl::ShaderType::Fragment)->getActiveOutputVariables();
>+                for (const auto &output : shaderOutputs)
>+                {
>+                    // TODO(http://anglebug.com/1085) This could be cleaner if the transformed names
>+                    // would be set correctly in ShaderVariable::mappedName. This would require some
>+                    // refactoring in the translator. Adding a mapped name dictionary for builtins
>+                    // into the symbol table would be one fairly clean way to do it.
>+                    if (output.name == "gl_SecondaryFragColorEXT")
>+                    {
>+                        mFunctions->bindFragDataLocationIndexed(mProgramID, 0, 0,
>+                                                                "webgl_FragColor");
>+                        mFunctions->bindFragDataLocationIndexed(mProgramID, 0, 1,
>+                                                                "angle_SecondaryFragColor");
>+                    }
>+                    else if (output.name == "gl_SecondaryFragDataEXT")
>+                    {
>+                        // Basically we should have a loop here going over the output
>+                        // array binding "webgl_FragData[i]" and "angle_SecondaryFragData[i]" array
>+                        // indices to the correct color buffers and color indices.
>+                        // However I'm not sure if this construct is legal or not, neither ARB or
>+                        // EXT version of the spec mention this. They only mention that
>+                        // automatically assigned array locations for ESSL 3.00 output arrays need
>+                        // to have contiguous locations.
>+                        //
>+                        // In practice it seems that binding array members works on some drivers and
>+                        // fails on others. One option could be to modify the shader translator to
>+                        // expand the arrays into individual output variables instead of using an
>+                        // array.
>+                        //
>+                        // For now we're going to have a limitation of assuming that
>+                        // GL_MAX_DUAL_SOURCE_DRAW_BUFFERS is *always* 1 and then only bind the
>+                        // basename of the variable ignoring any indices. This appears to work
>+                        // uniformly.
>+                        ASSERT(output.isArray() && output.getOutermostArraySize() == 1);
>+
>+                        mFunctions->bindFragDataLocationIndexed(mProgramID, 0, 0, "webgl_FragData");
>+                        mFunctions->bindFragDataLocationIndexed(mProgramID, 0, 1,
>+                                                                "angle_SecondaryFragData");
>+                    }
>+                }
>+            }
>+            else
>+            {
>+                // ESSL 3.00 and up.
>+                const auto &outputLocations          = mState.getOutputLocations();
>+                const auto &secondaryOutputLocations = mState.getSecondaryOutputLocations();
>+                for (size_t outputLocationIndex = 0u; outputLocationIndex < outputLocations.size();
>+                     ++outputLocationIndex)
>+                {
>+                    const gl::VariableLocation &outputLocation =
>+                        outputLocations[outputLocationIndex];
>+                    if (outputLocation.arrayIndex == 0 && outputLocation.used() &&
>+                        !outputLocation.ignored)
>+                    {
>+                        const sh::OutputVariable &outputVar =
>+                            mState.getOutputVariables()[outputLocation.index];
>+                        if (outputVar.location == -1)
>+                        {
>+                            // We only need to assign the location and index via the API in case the
>+                            // variable doesn't have its location set in the shader. If a variable
>+                            // doesn't have its location set in the shader it doesn't have the index
>+                            // set either.
>+                            ASSERT(outputVar.index == -1);
>+                            mFunctions->bindFragDataLocationIndexed(
>+                                mProgramID, outputLocationIndex, 0, outputVar.mappedName.c_str());
>+                        }
>+                    }
>+                }
>+                for (size_t outputLocationIndex = 0u;
>+                     outputLocationIndex < secondaryOutputLocations.size(); ++outputLocationIndex)
>+                {
>+                    const gl::VariableLocation &outputLocation =
>+                        secondaryOutputLocations[outputLocationIndex];
>+                    if (outputLocation.arrayIndex == 0 && outputLocation.used() &&
>+                        !outputLocation.ignored)
>+                    {
>+                        const sh::OutputVariable &outputVar =
>+                            mState.getOutputVariables()[outputLocation.index];
>+                        if (outputVar.location == -1 || outputVar.index == -1)
>+                        {
>+                            // We only need to assign the location and index via the API in case the
>+                            // variable doesn't have a shader-assigned location and index.  If a
>+                            // variable doesn't have its location set in the shader it doesn't have
>+                            // the index set either.
>+                            ASSERT(outputVar.index == -1);
>+                            mFunctions->bindFragDataLocationIndexed(
>+                                mProgramID, outputLocationIndex, 1, outputVar.mappedName.c_str());
>+                        }
>+                    }
>+                }
>+            }
>+        }
>+    }
>+    auto workerPool = context->getWorkerThreadPool();
>+    auto linkTask   = std::make_shared<LinkTask>([this](std::string &infoLog) {
>+        std::string workerInfoLog;
>+        ScopedWorkerContextGL worker(mRenderer.get(), &workerInfoLog);
>+        if (!worker())
>+        {
>+#if !defined(NDEBUG)
>+            infoLog += "bindWorkerContext failed.\n" + workerInfoLog;
>+#endif
>+            // Fallback to the main context.
>+            return true;
>+        }
>+
>         mFunctions->linkProgram(mProgramID);
> 
>-        // Detach the shaders
>-        mFunctions->detachShader(mProgramID, vertexShaderGL->getShaderID());
>-        mFunctions->detachShader(mProgramID, fragmentShaderGL->getShaderID());
>-    }
>+        // Make sure the driver actually does the link job.
>+        GLint linkStatus = GL_FALSE;
>+        mFunctions->getProgramiv(mProgramID, GL_LINK_STATUS, &linkStatus);
> 
>-    // Verify the link
>-    if (!checkLinkStatus(infoLog))
>-    {
>         return false;
>-    }
>+    });
> 
>-    if (mWorkarounds.alwaysCallUseProgramAfterLink)
>-    {
>-        mStateManager->forceUseProgram(mProgramID);
>-    }
>+    auto postLinkImplTask = [this, &infoLog, &resources](bool fallbackToMainContext,
>+                                                         const std::string &workerInfoLog) {
>+        infoLog << workerInfoLog;
>+        if (fallbackToMainContext)
>+        {
>+            mFunctions->linkProgram(mProgramID);
>+        }
> 
>-    linkResources(resources);
>-    postLink();
>+        if (mState.getAttachedShader(gl::ShaderType::Compute))
>+        {
>+            const ShaderGL *computeShaderGL =
>+                GetImplAs<ShaderGL>(mState.getAttachedShader(gl::ShaderType::Compute));
> 
>-    return true;
>+            mFunctions->detachShader(mProgramID, computeShaderGL->getShaderID());
>+        }
>+        else
>+        {
>+            const ShaderGL *vertexShaderGL =
>+                GetImplAs<ShaderGL>(mState.getAttachedShader(gl::ShaderType::Vertex));
>+            const ShaderGL *fragmentShaderGL =
>+                GetImplAs<ShaderGL>(mState.getAttachedShader(gl::ShaderType::Fragment));
>+            const ShaderGL *geometryShaderGL = rx::SafeGetImplAs<ShaderGL, gl::Shader>(
>+                mState.getAttachedShader(gl::ShaderType::Geometry));
>+
>+            // Detach the shaders
>+            mFunctions->detachShader(mProgramID, vertexShaderGL->getShaderID());
>+            mFunctions->detachShader(mProgramID, fragmentShaderGL->getShaderID());
>+            if (geometryShaderGL)
>+            {
>+                mFunctions->detachShader(mProgramID, geometryShaderGL->getShaderID());
>+            }
>+        }
>+        // Verify the link
>+        if (!checkLinkStatus(infoLog))
>+        {
>+            return angle::Result::Incomplete;
>+        }
>+
>+        if (mWorkarounds.alwaysCallUseProgramAfterLink)
>+        {
>+            mStateManager->forceUseProgram(mProgramID);
>+        }
>+
>+        linkResources(resources);
>+        postLink();
>+
>+        return angle::Result::Continue;
>+    };
>+
>+    if (mRenderer->hasNativeParallelCompile())
>+    {
>+        mFunctions->linkProgram(mProgramID);
>+        return std::make_unique<LinkEventNativeParallel>(postLinkImplTask, mFunctions, mProgramID);
>+    }
>+    else if (workerPool->isAsync() &&
>+             (!mWorkarounds.dontRelinkProgramsInParallel || !mLinkedInParallel))
>+    {
>+        mLinkedInParallel = true;
>+        return std::make_unique<LinkEventGL>(workerPool, linkTask, postLinkImplTask);
>+    }
>+    else
>+    {
>+        return std::make_unique<LinkEventDone>(postLinkImplTask(true, std::string()));
>+    }
> }
> 
> GLboolean ProgramGL::validate(const gl::Caps & /*caps*/, gl::InfoLog * /*infoLog*/)
>@@ -382,7 +643,10 @@ void ProgramGL::setUniform4uiv(GLint location, GLsizei count, const GLuint *v)
>     }
> }
> 
>-void ProgramGL::setUniformMatrix2fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
>+void ProgramGL::setUniformMatrix2fv(GLint location,
>+                                    GLsizei count,
>+                                    GLboolean transpose,
>+                                    const GLfloat *value)
> {
>     if (mFunctions->programUniformMatrix2fv != nullptr)
>     {
>@@ -395,7 +659,10 @@ void ProgramGL::setUniformMatrix2fv(GLint location, GLsizei count, GLboolean tra
>     }
> }
> 
>-void ProgramGL::setUniformMatrix3fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
>+void ProgramGL::setUniformMatrix3fv(GLint location,
>+                                    GLsizei count,
>+                                    GLboolean transpose,
>+                                    const GLfloat *value)
> {
>     if (mFunctions->programUniformMatrix3fv != nullptr)
>     {
>@@ -408,7 +675,10 @@ void ProgramGL::setUniformMatrix3fv(GLint location, GLsizei count, GLboolean tra
>     }
> }
> 
>-void ProgramGL::setUniformMatrix4fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
>+void ProgramGL::setUniformMatrix4fv(GLint location,
>+                                    GLsizei count,
>+                                    GLboolean transpose,
>+                                    const GLfloat *value)
> {
>     if (mFunctions->programUniformMatrix4fv != nullptr)
>     {
>@@ -421,7 +691,10 @@ void ProgramGL::setUniformMatrix4fv(GLint location, GLsizei count, GLboolean tra
>     }
> }
> 
>-void ProgramGL::setUniformMatrix2x3fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
>+void ProgramGL::setUniformMatrix2x3fv(GLint location,
>+                                      GLsizei count,
>+                                      GLboolean transpose,
>+                                      const GLfloat *value)
> {
>     if (mFunctions->programUniformMatrix2x3fv != nullptr)
>     {
>@@ -435,7 +708,10 @@ void ProgramGL::setUniformMatrix2x3fv(GLint location, GLsizei count, GLboolean t
>     }
> }
> 
>-void ProgramGL::setUniformMatrix3x2fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
>+void ProgramGL::setUniformMatrix3x2fv(GLint location,
>+                                      GLsizei count,
>+                                      GLboolean transpose,
>+                                      const GLfloat *value)
> {
>     if (mFunctions->programUniformMatrix3x2fv != nullptr)
>     {
>@@ -449,7 +725,10 @@ void ProgramGL::setUniformMatrix3x2fv(GLint location, GLsizei count, GLboolean t
>     }
> }
> 
>-void ProgramGL::setUniformMatrix2x4fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
>+void ProgramGL::setUniformMatrix2x4fv(GLint location,
>+                                      GLsizei count,
>+                                      GLboolean transpose,
>+                                      const GLfloat *value)
> {
>     if (mFunctions->programUniformMatrix2x4fv != nullptr)
>     {
>@@ -463,7 +742,10 @@ void ProgramGL::setUniformMatrix2x4fv(GLint location, GLsizei count, GLboolean t
>     }
> }
> 
>-void ProgramGL::setUniformMatrix4x2fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
>+void ProgramGL::setUniformMatrix4x2fv(GLint location,
>+                                      GLsizei count,
>+                                      GLboolean transpose,
>+                                      const GLfloat *value)
> {
>     if (mFunctions->programUniformMatrix4x2fv != nullptr)
>     {
>@@ -477,7 +759,10 @@ void ProgramGL::setUniformMatrix4x2fv(GLint location, GLsizei count, GLboolean t
>     }
> }
> 
>-void ProgramGL::setUniformMatrix3x4fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
>+void ProgramGL::setUniformMatrix3x4fv(GLint location,
>+                                      GLsizei count,
>+                                      GLboolean transpose,
>+                                      const GLfloat *value)
> {
>     if (mFunctions->programUniformMatrix3x4fv != nullptr)
>     {
>@@ -491,7 +776,10 @@ void ProgramGL::setUniformMatrix3x4fv(GLint location, GLsizei count, GLboolean t
>     }
> }
> 
>-void ProgramGL::setUniformMatrix4x3fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
>+void ProgramGL::setUniformMatrix4x3fv(GLint location,
>+                                      GLsizei count,
>+                                      GLboolean transpose,
>+                                      const GLfloat *value)
> {
>     if (mFunctions->programUniformMatrix4x3fv != nullptr)
>     {
>@@ -527,11 +815,6 @@ void ProgramGL::setUniformBlockBinding(GLuint uniformBlockIndex, GLuint uniformB
>     }
> }
> 
>-GLuint ProgramGL::getProgramID() const
>-{
>-    return mProgramID;
>-}
>-
> bool ProgramGL::getUniformBlockSize(const std::string & /* blockName */,
>                                     const std::string &blockMappedName,
>                                     size_t *sizeOut) const
>@@ -562,7 +845,7 @@ bool ProgramGL::getUniformBlockMemberInfo(const std::string & /* memberUniformNa
> 
>     if (uniformIndex == GL_INVALID_INDEX)
>     {
>-        *memberInfoOut = sh::BlockMemberInfo::getDefaultBlockInfo();
>+        *memberInfoOut = sh::kDefaultBlockMemberInfo;
>         return false;
>     }
> 
>@@ -591,7 +874,7 @@ bool ProgramGL::getShaderStorageBlockMemberInfo(const std::string & /* memberNam
> 
>     if (index == GL_INVALID_INDEX)
>     {
>-        *memberInfoOut = sh::BlockMemberInfo::getDefaultBlockInfo();
>+        *memberInfoOut = sh::kDefaultBlockMemberInfo;
>         return false;
>     }
> 
>@@ -635,6 +918,32 @@ bool ProgramGL::getShaderStorageBlockSize(const std::string &name,
>     return true;
> }
> 
>+void ProgramGL::getAtomicCounterBufferSizeMap(std::map<int, unsigned int> *sizeMapOut) const
>+{
>+    if (mFunctions->getProgramInterfaceiv == nullptr)
>+    {
>+        return;
>+    }
>+
>+    int resourceCount = 0;
>+    mFunctions->getProgramInterfaceiv(mProgramID, GL_ATOMIC_COUNTER_BUFFER, GL_ACTIVE_RESOURCES,
>+                                      &resourceCount);
>+
>+    for (int index = 0; index < resourceCount; index++)
>+    {
>+        constexpr int kPropCount             = 2;
>+        std::array<GLenum, kPropCount> props = {{GL_BUFFER_BINDING, GL_BUFFER_DATA_SIZE}};
>+        std::array<GLint, kPropCount> params;
>+        GLsizei length;
>+        mFunctions->getProgramResourceiv(mProgramID, GL_ATOMIC_COUNTER_BUFFER, index, kPropCount,
>+                                         props.data(), kPropCount, &length, params.data());
>+        ASSERT(kPropCount == length);
>+        int bufferBinding           = params[0];
>+        unsigned int bufferDataSize = params[1];
>+        sizeMapOut->insert(std::pair<int, unsigned int>(bufferBinding, bufferDataSize));
>+    }
>+}
>+
> void ProgramGL::setPathFragmentInputGen(const std::string &inputName,
>                                         GLenum genMode,
>                                         GLint components,
>@@ -652,7 +961,6 @@ void ProgramGL::setPathFragmentInputGen(const std::string &inputName,
>             return;
>         }
>     }
>-
> }
> 
> void ProgramGL::preLink()
>@@ -671,7 +979,7 @@ bool ProgramGL::checkLinkStatus(gl::InfoLog &infoLog)
>     mFunctions->getProgramiv(mProgramID, GL_LINK_STATUS, &linkStatus);
>     if (linkStatus == GL_FALSE)
>     {
>-        // Linking failed, put the error into the info log
>+        // Linking or program binary loading failed, put the error into the info log.
>         GLint infoLogLength = 0;
>         mFunctions->getProgramiv(mProgramID, GL_INFO_LOG_LENGTH, &infoLogLength);
> 
>@@ -682,19 +990,18 @@ bool ProgramGL::checkLinkStatus(gl::InfoLog &infoLog)
>             std::vector<char> buf(infoLogLength);
>             mFunctions->getProgramInfoLog(mProgramID, infoLogLength, nullptr, &buf[0]);
> 
>-            mFunctions->deleteProgram(mProgramID);
>-            mProgramID = 0;
>-
>             infoLog << buf.data();
> 
>-            WARN() << "Program link failed unexpectedly: " << buf.data();
>+            WARN() << "Program link or binary loading failed: " << buf.data();
>         }
>         else
>         {
>-            WARN() << "Program link failed unexpectedly with no info log.";
>+            WARN() << "Program link or binary loading failed with no info log.";
>         }
> 
>-        // TODO, return GL_OUT_OF_MEMORY or just fail the link? This is an unexpected case
>+        // This may happen under normal circumstances if we're loading program binaries and the
>+        // driver or hardware has changed.
>+        ASSERT(mProgramID != 0);
>         return false;
>     }
> 
>@@ -706,7 +1013,7 @@ void ProgramGL::postLink()
>     // Query the uniform information
>     ASSERT(mUniformRealLocationMap.empty());
>     const auto &uniformLocations = mState.getUniformLocations();
>-    const auto &uniforms = mState.getUniforms();
>+    const auto &uniforms         = mState.getUniforms();
>     mUniformRealLocationMap.resize(uniformLocations.size(), GL_INVALID_INDEX);
>     for (size_t uniformLocation = 0; uniformLocation < uniformLocations.size(); uniformLocation++)
>     {
>@@ -785,7 +1092,7 @@ void ProgramGL::postLink()
> 
>         PathRenderingFragmentInput baseElementInput;
>         baseElementInput.mappedName = mappedName;
>-        baseElementInput.location = queryResults[0];
>+        baseElementInput.location   = queryResults[0];
>         mPathRenderingFragmentInputs.push_back(std::move(baseElementInput));
> 
>         // If the input is an array it's denoted by [0] suffix on the variable
>@@ -802,7 +1109,7 @@ void ProgramGL::postLink()
>             {
>                 PathRenderingFragmentInput arrayElementInput;
>                 arrayElementInput.mappedName = mappedName + "[" + ToString(arrayIndex) + "]";
>-                arrayElementInput.location = baseLocation + arrayIndex;
>+                arrayElementInput.location   = baseLocation + arrayIndex;
>                 mPathRenderingFragmentInputs.push_back(std::move(arrayElementInput));
>             }
>         }
>@@ -844,7 +1151,8 @@ void ProgramGL::getUniformuiv(const gl::Context *context, GLint location, GLuint
> }
> 
> void ProgramGL::markUnusedUniformLocations(std::vector<gl::VariableLocation> *uniformLocations,
>-                                           std::vector<gl::SamplerBinding> *samplerBindings)
>+                                           std::vector<gl::SamplerBinding> *samplerBindings,
>+                                           std::vector<gl::ImageBinding> *imageBindings)
> {
>     GLint maxLocation = static_cast<GLint>(uniformLocations->size());
>     for (GLint location = 0; location < maxLocation; ++location)
>@@ -857,6 +1165,11 @@ void ProgramGL::markUnusedUniformLocations(std::vector<gl::VariableLocation> *un
>                 GLuint samplerIndex = mState.getSamplerIndexFromUniformIndex(locationRef.index);
>                 (*samplerBindings)[samplerIndex].unreferenced = true;
>             }
>+            else if (mState.isImageUniformIndex(locationRef.index))
>+            {
>+                GLuint imageIndex = mState.getImageIndexFromUniformIndex(locationRef.index);
>+                (*imageBindings)[imageIndex].unreferenced = true;
>+            }
>             locationRef.markUnused();
>         }
>     }
>@@ -889,6 +1202,22 @@ void ProgramGL::linkResources(const gl::ProgramLinkedResources &resources)
>     };
>     resources.shaderStorageBlockLinker.linkBlocks(getShaderStorageBlockSize,
>                                                   getShaderStorageBlockMemberInfo);
>+
>+    // Gather atomic counter buffer info.
>+    std::map<int, unsigned int> sizeMap;
>+    getAtomicCounterBufferSizeMap(&sizeMap);
>+    resources.atomicCounterBufferLinker.link(sizeMap);
> }
> 
>+angle::Result ProgramGL::syncState(const gl::Context *context,
>+                                   const gl::Program::DirtyBits &dirtyBits)
>+{
>+    for (size_t dirtyBit : dirtyBits)
>+    {
>+        ASSERT(dirtyBit <= gl::Program::DIRTY_BIT_UNIFORM_BLOCK_BINDING_MAX);
>+        GLuint binding = static_cast<GLuint>(dirtyBit);
>+        setUniformBlockBinding(binding, mState.getUniformBlockBinding(binding));
>+    }
>+    return angle::Result::Continue;
>+}
> }  // namespace rx
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/ProgramGL.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/ProgramGL.h
>index ccff28b5b7e..a7b29203267 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/ProgramGL.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/ProgramGL.h
>@@ -12,13 +12,14 @@
> #include <string>
> #include <vector>
> 
>-#include "libANGLE/renderer/gl/WorkaroundsGL.h"
> #include "libANGLE/renderer/ProgramImpl.h"
>+#include "libANGLE/renderer/gl/WorkaroundsGL.h"
> 
> namespace rx
> {
> 
> class FunctionsGL;
>+class RendererGL;
> class StateManagerGL;
> 
> class ProgramGL : public ProgramImpl
>@@ -28,19 +29,20 @@ class ProgramGL : public ProgramImpl
>               const FunctionsGL *functions,
>               const WorkaroundsGL &workarounds,
>               StateManagerGL *stateManager,
>-              bool enablePathRendering);
>+              bool enablePathRendering,
>+              const std::shared_ptr<RendererGL> &renderer);
>     ~ProgramGL() override;
> 
>-    gl::LinkResult load(const gl::Context *contextImpl,
>-                        gl::InfoLog &infoLog,
>-                        gl::BinaryInputStream *stream) override;
>+    std::unique_ptr<LinkEvent> load(const gl::Context *context,
>+                                    gl::BinaryInputStream *stream,
>+                                    gl::InfoLog &infoLog) override;
>     void save(const gl::Context *context, gl::BinaryOutputStream *stream) override;
>     void setBinaryRetrievableHint(bool retrievable) override;
>     void setSeparable(bool separable) override;
> 
>-    gl::LinkResult link(const gl::Context *contextImpl,
>-                        const gl::ProgramLinkedResources &resources,
>-                        gl::InfoLog &infoLog) override;
>+    std::unique_ptr<LinkEvent> link(const gl::Context *contextImpl,
>+                                    const gl::ProgramLinkedResources &resources,
>+                                    gl::InfoLog &infoLog) override;
>     GLboolean validate(const gl::Caps &caps, gl::InfoLog *infoLog) override;
> 
>     void setUniform1fv(GLint location, GLsizei count, const GLfloat *v) override;
>@@ -55,39 +57,73 @@ class ProgramGL : public ProgramImpl
>     void setUniform2uiv(GLint location, GLsizei count, const GLuint *v) override;
>     void setUniform3uiv(GLint location, GLsizei count, const GLuint *v) override;
>     void setUniform4uiv(GLint location, GLsizei count, const GLuint *v) override;
>-    void setUniformMatrix2fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value) override;
>-    void setUniformMatrix3fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value) override;
>-    void setUniformMatrix4fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value) override;
>-    void setUniformMatrix2x3fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value) override;
>-    void setUniformMatrix3x2fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value) override;
>-    void setUniformMatrix2x4fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value) override;
>-    void setUniformMatrix4x2fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value) override;
>-    void setUniformMatrix3x4fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value) override;
>-    void setUniformMatrix4x3fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value) override;
>+    void setUniformMatrix2fv(GLint location,
>+                             GLsizei count,
>+                             GLboolean transpose,
>+                             const GLfloat *value) override;
>+    void setUniformMatrix3fv(GLint location,
>+                             GLsizei count,
>+                             GLboolean transpose,
>+                             const GLfloat *value) override;
>+    void setUniformMatrix4fv(GLint location,
>+                             GLsizei count,
>+                             GLboolean transpose,
>+                             const GLfloat *value) override;
>+    void setUniformMatrix2x3fv(GLint location,
>+                               GLsizei count,
>+                               GLboolean transpose,
>+                               const GLfloat *value) override;
>+    void setUniformMatrix3x2fv(GLint location,
>+                               GLsizei count,
>+                               GLboolean transpose,
>+                               const GLfloat *value) override;
>+    void setUniformMatrix2x4fv(GLint location,
>+                               GLsizei count,
>+                               GLboolean transpose,
>+                               const GLfloat *value) override;
>+    void setUniformMatrix4x2fv(GLint location,
>+                               GLsizei count,
>+                               GLboolean transpose,
>+                               const GLfloat *value) override;
>+    void setUniformMatrix3x4fv(GLint location,
>+                               GLsizei count,
>+                               GLboolean transpose,
>+                               const GLfloat *value) override;
>+    void setUniformMatrix4x3fv(GLint location,
>+                               GLsizei count,
>+                               GLboolean transpose,
>+                               const GLfloat *value) override;
> 
>     void getUniformfv(const gl::Context *context, GLint location, GLfloat *params) const override;
>     void getUniformiv(const gl::Context *context, GLint location, GLint *params) const override;
>     void getUniformuiv(const gl::Context *context, GLint location, GLuint *params) const override;
> 
>-    void setUniformBlockBinding(GLuint uniformBlockIndex, GLuint uniformBlockBinding) override;
>-
>     void setPathFragmentInputGen(const std::string &inputName,
>                                  GLenum genMode,
>                                  GLint components,
>                                  const GLfloat *coeffs) override;
> 
>     void markUnusedUniformLocations(std::vector<gl::VariableLocation> *uniformLocations,
>-                                    std::vector<gl::SamplerBinding> *samplerBindings) override;
>+                                    std::vector<gl::SamplerBinding> *samplerBindings,
>+                                    std::vector<gl::ImageBinding> *imageBindings) override;
> 
>-    GLuint getProgramID() const;
>+    ANGLE_INLINE GLuint getProgramID() const { return mProgramID; }
> 
>     void enableSideBySideRenderingPath() const;
>     void enableLayeredRenderingPath(int baseViewIndex) const;
> 
>+    angle::Result syncState(const gl::Context *context,
>+                            const gl::Program::DirtyBits &dirtyBits) override;
>+
>   private:
>+    class LinkTask;
>+    class LinkEventNativeParallel;
>+    class LinkEventGL;
>+
>     void preLink();
>     bool checkLinkStatus(gl::InfoLog &infoLog);
>     void postLink();
>+
>     void reapplyUBOBindingsIfNeeded(const gl::Context *context);
> 
>     bool getUniformBlockSize(const std::string &blockName,
>@@ -102,7 +138,10 @@ class ProgramGL : public ProgramImpl
>     bool getShaderStorageBlockSize(const std::string &blockName,
>                                    const std::string &blockMappedName,
>                                    size_t *sizeOut) const;
>+    void getAtomicCounterBufferSizeMap(std::map<int, unsigned int> *sizeMapOut) const;
>+
>     void linkResources(const gl::ProgramLinkedResources &resources);
>+    void setUniformBlockBinding(GLuint uniformBlockIndex, GLuint uniformBlockBinding);
> 
>     // Helper function, makes it simpler to type.
>     GLint uniLoc(GLint glLocation) const { return mUniformRealLocationMap[glLocation]; }
>@@ -125,8 +164,12 @@ class ProgramGL : public ProgramImpl
>     GLint mMultiviewBaseViewLayerIndexUniformLocation;
> 
>     GLuint mProgramID;
>+
>+    std::shared_ptr<RendererGL> mRenderer;
>+
>+    bool mLinkedInParallel;
> };
> 
>-}
>+}  // namespace rx
> 
>-#endif // LIBANGLE_RENDERER_GL_PROGRAMGL_H_
>+#endif  // LIBANGLE_RENDERER_GL_PROGRAMGL_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/QueryGL.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/QueryGL.cpp
>index ddbf2f847a7..459e555dd25 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/QueryGL.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/QueryGL.cpp
>@@ -9,6 +9,8 @@
> #include "libANGLE/renderer/gl/QueryGL.h"
> 
> #include "common/debug.h"
>+#include "libANGLE/Context.h"
>+#include "libANGLE/renderer/gl/ContextGL.h"
> #include "libANGLE/renderer/gl/FunctionsGL.h"
> #include "libANGLE/renderer/gl/StateManagerGL.h"
> #include "libANGLE/renderer/gl/renderergl_utils.h"
>@@ -16,23 +18,26 @@
> namespace
> {
> 
>-GLuint64 MergeQueryResults(GLenum type, GLuint64 currentResult, GLuint64 newResult)
>+GLuint64 MergeQueryResults(gl::QueryType type, GLuint64 currentResult, GLuint64 newResult)
> {
>     switch (type)
>     {
>-        case GL_ANY_SAMPLES_PASSED:
>-        case GL_ANY_SAMPLES_PASSED_CONSERVATIVE:
>+        case gl::QueryType::AnySamples:
>+        case gl::QueryType::AnySamplesConservative:
>             return (currentResult == GL_TRUE || newResult == GL_TRUE) ? GL_TRUE : GL_FALSE;
> 
>-        case GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN:
>+        case gl::QueryType::TransformFeedbackPrimitivesWritten:
>             return currentResult + newResult;
> 
>-        case GL_TIME_ELAPSED:
>+        case gl::QueryType::TimeElapsed:
>             return currentResult + newResult;
> 
>-        case GL_TIMESTAMP:
>+        case gl::QueryType::Timestamp:
>             return newResult;
> 
>+        case gl::QueryType::PrimitivesGenerated:
>+            return currentResult + newResult;
>+
>         default:
>             UNREACHABLE();
>             return 0;
>@@ -44,15 +49,11 @@ GLuint64 MergeQueryResults(GLenum type, GLuint64 currentResult, GLuint64 newResu
> namespace rx
> {
> 
>-QueryGL::QueryGL(GLenum type) : QueryImpl(type)
>-{
>-}
>+QueryGL::QueryGL(gl::QueryType type) : QueryImpl(type) {}
> 
>-QueryGL::~QueryGL()
>-{
>-}
>+QueryGL::~QueryGL() {}
> 
>-StandardQueryGL::StandardQueryGL(GLenum type,
>+StandardQueryGL::StandardQueryGL(gl::QueryType type,
>                                  const FunctionsGL *functions,
>                                  StateManagerGL *stateManager)
>     : QueryGL(type),
>@@ -62,35 +63,39 @@ StandardQueryGL::StandardQueryGL(GLenum type,
>       mActiveQuery(0),
>       mPendingQueries(),
>       mResultSum(0)
>-{
>-}
>+{}
> 
> StandardQueryGL::~StandardQueryGL()
> {
>-    mStateManager->deleteQuery(mActiveQuery);
>-    mStateManager->onDeleteQueryObject(this);
>+    if (mActiveQuery != 0)
>+    {
>+        mStateManager->endQuery(mType, this, mActiveQuery);
>+        mFunctions->deleteQueries(1, &mActiveQuery);
>+        mActiveQuery = 0;
>+    }
>+
>     while (!mPendingQueries.empty())
>     {
>-        mStateManager->deleteQuery(mPendingQueries.front());
>+        GLuint id = mPendingQueries.front();
>+        mFunctions->deleteQueries(1, &id);
>         mPendingQueries.pop_front();
>     }
> }
> 
>-gl::Error StandardQueryGL::begin()
>+angle::Result StandardQueryGL::begin(const gl::Context *context)
> {
>     mResultSum = 0;
>-    mStateManager->onBeginQuery(this);
>-    return resume();
>+    return resume(context);
> }
> 
>-gl::Error StandardQueryGL::end()
>+angle::Result StandardQueryGL::end(const gl::Context *context)
> {
>-    return pause();
>+    return pause(context);
> }
> 
>-gl::Error StandardQueryGL::queryCounter()
>+angle::Result StandardQueryGL::queryCounter(const gl::Context *context)
> {
>-    ASSERT(mType == GL_TIMESTAMP);
>+    ASSERT(mType == gl::QueryType::Timestamp);
> 
>     // Directly create a query for the timestamp and add it to the pending query queue, as timestamp
>     // queries do not have the traditional begin/end block and never need to be paused/resumed
>@@ -99,99 +104,78 @@ gl::Error StandardQueryGL::queryCounter()
>     mFunctions->queryCounter(query, GL_TIMESTAMP);
>     mPendingQueries.push_back(query);
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
> template <typename T>
>-gl::Error StandardQueryGL::getResultBase(T *params)
>+angle::Result StandardQueryGL::getResultBase(const gl::Context *context, T *params)
> {
>     ASSERT(mActiveQuery == 0);
> 
>-    gl::Error error = flush(true);
>-    if (error.isError())
>-    {
>-        return error;
>-    }
>-
>+    ANGLE_TRY(flush(context, true));
>     ASSERT(mPendingQueries.empty());
>     *params = static_cast<T>(mResultSum);
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error StandardQueryGL::getResult(GLint *params)
>+angle::Result StandardQueryGL::getResult(const gl::Context *context, GLint *params)
> {
>-    return getResultBase(params);
>+    return getResultBase(context, params);
> }
> 
>-gl::Error StandardQueryGL::getResult(GLuint *params)
>+angle::Result StandardQueryGL::getResult(const gl::Context *context, GLuint *params)
> {
>-    return getResultBase(params);
>+    return getResultBase(context, params);
> }
> 
>-gl::Error StandardQueryGL::getResult(GLint64 *params)
>+angle::Result StandardQueryGL::getResult(const gl::Context *context, GLint64 *params)
> {
>-    return getResultBase(params);
>+    return getResultBase(context, params);
> }
> 
>-gl::Error StandardQueryGL::getResult(GLuint64 *params)
>+angle::Result StandardQueryGL::getResult(const gl::Context *context, GLuint64 *params)
> {
>-    return getResultBase(params);
>+    return getResultBase(context, params);
> }
> 
>-gl::Error StandardQueryGL::isResultAvailable(bool *available)
>+angle::Result StandardQueryGL::isResultAvailable(const gl::Context *context, bool *available)
> {
>     ASSERT(mActiveQuery == 0);
> 
>-    gl::Error error = flush(false);
>-    if (error.isError())
>-    {
>-        return error;
>-    }
>-
>+    ANGLE_TRY(flush(context, false));
>     *available = mPendingQueries.empty();
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error StandardQueryGL::pause()
>+angle::Result StandardQueryGL::pause(const gl::Context *context)
> {
>     if (mActiveQuery != 0)
>     {
>-        mStateManager->endQuery(mType, mActiveQuery);
>+        mStateManager->endQuery(mType, this, mActiveQuery);
> 
>         mPendingQueries.push_back(mActiveQuery);
>         mActiveQuery = 0;
>     }
> 
>     // Flush to make sure the pending queries don't add up too much.
>-    gl::Error error = flush(false);
>-    if (error.isError())
>-    {
>-        return error;
>-    }
>-
>-    return gl::NoError();
>+    return flush(context, false);
> }
> 
>-gl::Error StandardQueryGL::resume()
>+angle::Result StandardQueryGL::resume(const gl::Context *context)
> {
>     if (mActiveQuery == 0)
>     {
>         // Flush to make sure the pending queries don't add up too much.
>-        gl::Error error = flush(false);
>-        if (error.isError())
>-        {
>-            return error;
>-        }
>-
>+        ANGLE_TRY(flush(context, false));
>         mFunctions->genQueries(1, &mActiveQuery);
>-        mStateManager->beginQuery(mType, mActiveQuery);
>+        mStateManager->beginQuery(mType, this, mActiveQuery);
>     }
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error StandardQueryGL::flush(bool force)
>+angle::Result StandardQueryGL::flush(const gl::Context *context, bool force)
> {
>     while (!mPendingQueries.empty())
>     {
>@@ -202,7 +186,7 @@ gl::Error StandardQueryGL::flush(bool force)
>             mFunctions->getQueryObjectuiv(id, GL_QUERY_RESULT_AVAILABLE, &resultAvailable);
>             if (resultAvailable == GL_FALSE)
>             {
>-                return gl::NoError();
>+                return angle::Result::Continue;
>             }
>         }
> 
>@@ -222,19 +206,23 @@ gl::Error StandardQueryGL::flush(bool force)
>             mResultSum = MergeQueryResults(mType, mResultSum, static_cast<GLuint64>(result));
>         }
> 
>-        mStateManager->deleteQuery(id);
>+        mFunctions->deleteQueries(1, &id);
> 
>         mPendingQueries.pop_front();
>     }
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
> class SyncProviderGL
> {
>   public:
>     virtual ~SyncProviderGL() {}
>-    virtual gl::Error flush(bool force, bool *finished) = 0;
>+    virtual angle::Result init(const gl::Context *context, gl::QueryType queryType)
>+    {
>+        return angle::Result::Continue;
>+    }
>+    virtual angle::Result flush(const gl::Context *context, bool force, bool *finished) = 0;
> };
> 
> class SyncProviderGLSync : public SyncProviderGL
>@@ -247,7 +235,7 @@ class SyncProviderGLSync : public SyncProviderGL
> 
>     ~SyncProviderGLSync() override { mFunctions->deleteSync(mSync); }
> 
>-    gl::Error flush(bool force, bool *finished) override
>+    angle::Result flush(const gl::Context *context, bool force, bool *finished) override
>     {
>         if (force)
>         {
>@@ -261,7 +249,7 @@ class SyncProviderGLSync : public SyncProviderGL
>             *finished = (value == GL_SIGNALED);
>         }
> 
>-        return gl::NoError();
>+        return angle::Result::Continue;
>     }
> 
>   private:
>@@ -272,21 +260,22 @@ class SyncProviderGLSync : public SyncProviderGL
> class SyncProviderGLQuery : public SyncProviderGL
> {
>   public:
>-    SyncProviderGLQuery(const FunctionsGL *functions,
>-                        StateManagerGL *stateManager,
>-                        GLenum queryType)
>-        : mFunctions(functions), mQuery(0)
>+    SyncProviderGLQuery(const FunctionsGL *functions) : mFunctions(functions), mQuery(0) {}
>+
>+    angle::Result init(const gl::Context *context, gl::QueryType type) override
>     {
>+        StateManagerGL *stateManager = GetStateManagerGL(context);
>+
>         mFunctions->genQueries(1, &mQuery);
>-        ANGLE_SWALLOW_ERR(stateManager->pauseQuery(queryType));
>-        mFunctions->beginQuery(queryType, mQuery);
>-        mFunctions->endQuery(queryType);
>-        ANGLE_SWALLOW_ERR(stateManager->resumeQuery(queryType));
>+        ANGLE_TRY(stateManager->pauseQuery(context, type));
>+        mFunctions->beginQuery(ToGLenum(type), mQuery);
>+        mFunctions->endQuery(ToGLenum(type));
>+        return stateManager->resumeQuery(context, type);
>     }
> 
>     ~SyncProviderGLQuery() override { mFunctions->deleteQueries(1, &mQuery); }
> 
>-    gl::Error flush(bool force, bool *finished) override
>+    angle::Result flush(const gl::Context *context, bool force, bool *finished) override
>     {
>         if (force)
>         {
>@@ -301,7 +290,7 @@ class SyncProviderGLQuery : public SyncProviderGL
>             *finished = (available == GL_TRUE);
>         }
> 
>-        return gl::NoError();
>+        return angle::Result::Continue;
>     }
> 
>   private:
>@@ -309,32 +298,26 @@ class SyncProviderGLQuery : public SyncProviderGL
>     GLuint mQuery;
> };
> 
>-SyncQueryGL::SyncQueryGL(GLenum type, const FunctionsGL *functions, StateManagerGL *stateManager)
>-    : QueryGL(type),
>-      mFunctions(functions),
>-      mStateManager(stateManager),
>-      mSyncProvider(nullptr),
>-      mFinished(false)
>+SyncQueryGL::SyncQueryGL(gl::QueryType type, const FunctionsGL *functions)
>+    : QueryGL(type), mFunctions(functions), mSyncProvider(nullptr), mFinished(false)
> {
>     ASSERT(IsSupported(mFunctions));
>-    ASSERT(type == GL_COMMANDS_COMPLETED_CHROMIUM);
>+    ASSERT(type == gl::QueryType::CommandsCompleted);
> }
> 
>-SyncQueryGL::~SyncQueryGL()
>-{
>-}
>+SyncQueryGL::~SyncQueryGL() {}
> 
> bool SyncQueryGL::IsSupported(const FunctionsGL *functions)
> {
>     return nativegl::SupportsFenceSync(functions) || nativegl::SupportsOcclusionQueries(functions);
> }
> 
>-gl::Error SyncQueryGL::begin()
>+angle::Result SyncQueryGL::begin(const gl::Context *context)
> {
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error SyncQueryGL::end()
>+angle::Result SyncQueryGL::end(const gl::Context *context)
> {
>     if (nativegl::SupportsFenceSync(mFunctions))
>     {
>@@ -342,82 +325,81 @@ gl::Error SyncQueryGL::end()
>     }
>     else if (nativegl::SupportsOcclusionQueries(mFunctions))
>     {
>-        mSyncProvider.reset(
>-            new SyncProviderGLQuery(mFunctions, mStateManager, GL_ANY_SAMPLES_PASSED));
>+        mSyncProvider.reset(new SyncProviderGLQuery(mFunctions));
>+        ANGLE_TRY(mSyncProvider->init(context, gl::QueryType::AnySamples));
>     }
>     else
>     {
>-        ASSERT(false);
>-        return gl::InternalError() << "No native support for sync queries.";
>+        ANGLE_GL_UNREACHABLE(GetImplAs<ContextGL>(context));
>     }
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error SyncQueryGL::queryCounter()
>+angle::Result SyncQueryGL::queryCounter(const gl::Context *context)
> {
>     UNREACHABLE();
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error SyncQueryGL::getResult(GLint *params)
>+angle::Result SyncQueryGL::getResult(const gl::Context *context, GLint *params)
> {
>-    return getResultBase(params);
>+    return getResultBase(context, params);
> }
> 
>-gl::Error SyncQueryGL::getResult(GLuint *params)
>+angle::Result SyncQueryGL::getResult(const gl::Context *context, GLuint *params)
> {
>-    return getResultBase(params);
>+    return getResultBase(context, params);
> }
> 
>-gl::Error SyncQueryGL::getResult(GLint64 *params)
>+angle::Result SyncQueryGL::getResult(const gl::Context *context, GLint64 *params)
> {
>-    return getResultBase(params);
>+    return getResultBase(context, params);
> }
> 
>-gl::Error SyncQueryGL::getResult(GLuint64 *params)
>+angle::Result SyncQueryGL::getResult(const gl::Context *context, GLuint64 *params)
> {
>-    return getResultBase(params);
>+    return getResultBase(context, params);
> }
> 
>-gl::Error SyncQueryGL::isResultAvailable(bool *available)
>+angle::Result SyncQueryGL::isResultAvailable(const gl::Context *context, bool *available)
> {
>-    ANGLE_TRY(flush(false));
>+    ANGLE_TRY(flush(context, false));
>     *available = mFinished;
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error SyncQueryGL::pause()
>+angle::Result SyncQueryGL::pause(const gl::Context *context)
> {
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error SyncQueryGL::resume()
>+angle::Result SyncQueryGL::resume(const gl::Context *context)
> {
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error SyncQueryGL::flush(bool force)
>+angle::Result SyncQueryGL::flush(const gl::Context *context, bool force)
> {
>     if (mSyncProvider == nullptr)
>     {
>         ASSERT(mFinished);
>-        return gl::NoError();
>+        return angle::Result::Continue;
>     }
> 
>-    ANGLE_TRY(mSyncProvider->flush(force, &mFinished));
>+    ANGLE_TRY(mSyncProvider->flush(context, force, &mFinished));
>     if (mFinished)
>     {
>         mSyncProvider.reset();
>     }
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
> template <typename T>
>-gl::Error SyncQueryGL::getResultBase(T *params)
>+angle::Result SyncQueryGL::getResultBase(const gl::Context *context, T *params)
> {
>-    ANGLE_TRY(flush(true));
>+    ANGLE_TRY(flush(context, true));
>     *params = static_cast<T>(mFinished ? GL_TRUE : GL_FALSE);
>-    return gl::NoError();
>-}
>+    return angle::Result::Continue;
> }
>+}  // namespace rx
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/QueryGL.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/QueryGL.h
>index 887665a2ca0..a11ffd7b335 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/QueryGL.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/QueryGL.h
>@@ -22,7 +22,7 @@ class StateManagerGL;
> class QueryGL : public QueryImpl
> {
>   public:
>-    QueryGL(GLenum type);
>+    QueryGL(gl::QueryType type);
>     ~QueryGL() override;
> 
>     // OpenGL is only allowed to have one query of each type active at any given time. Since ANGLE
>@@ -31,35 +31,35 @@ class QueryGL : public QueryImpl
>     // When it is "resumed", a new query is generated and started.
>     // When a result is required, the queries are "flushed" by iterating over the list of pending
>     // queries and merging their results.
>-    virtual gl::Error pause()  = 0;
>-    virtual gl::Error resume() = 0;
>+    virtual angle::Result pause(const gl::Context *context)  = 0;
>+    virtual angle::Result resume(const gl::Context *context) = 0;
> };
> 
> class StandardQueryGL : public QueryGL
> {
>   public:
>-    StandardQueryGL(GLenum type, const FunctionsGL *functions, StateManagerGL *stateManager);
>+    StandardQueryGL(gl::QueryType type, const FunctionsGL *functions, StateManagerGL *stateManager);
>     ~StandardQueryGL() override;
> 
>-    gl::Error begin() override;
>-    gl::Error end() override;
>-    gl::Error queryCounter() override;
>-    gl::Error getResult(GLint *params) override;
>-    gl::Error getResult(GLuint *params) override;
>-    gl::Error getResult(GLint64 *params) override;
>-    gl::Error getResult(GLuint64 *params) override;
>-    gl::Error isResultAvailable(bool *available) override;
>+    angle::Result begin(const gl::Context *context) override;
>+    angle::Result end(const gl::Context *context) override;
>+    angle::Result queryCounter(const gl::Context *context) override;
>+    angle::Result getResult(const gl::Context *context, GLint *params) override;
>+    angle::Result getResult(const gl::Context *context, GLuint *params) override;
>+    angle::Result getResult(const gl::Context *context, GLint64 *params) override;
>+    angle::Result getResult(const gl::Context *context, GLuint64 *params) override;
>+    angle::Result isResultAvailable(const gl::Context *context, bool *available) override;
> 
>-    gl::Error pause() override;
>-    gl::Error resume() override;
>+    angle::Result pause(const gl::Context *context) override;
>+    angle::Result resume(const gl::Context *context) override;
> 
>   private:
>-    gl::Error flush(bool force);
>+    angle::Result flush(const gl::Context *context, bool force);
> 
>     template <typename T>
>-    gl::Error getResultBase(T *params);
>+    angle::Result getResultBase(const gl::Context *context, T *params);
> 
>-    GLenum mType;
>+    gl::QueryType mType;
> 
>     const FunctionsGL *mFunctions;
>     StateManagerGL *mStateManager;
>@@ -73,35 +73,34 @@ class SyncProviderGL;
> class SyncQueryGL : public QueryGL
> {
>   public:
>-    SyncQueryGL(GLenum type, const FunctionsGL *functions, StateManagerGL *stateManager);
>+    SyncQueryGL(gl::QueryType type, const FunctionsGL *functions);
>     ~SyncQueryGL() override;
> 
>     static bool IsSupported(const FunctionsGL *functions);
> 
>-    gl::Error begin() override;
>-    gl::Error end() override;
>-    gl::Error queryCounter() override;
>-    gl::Error getResult(GLint *params) override;
>-    gl::Error getResult(GLuint *params) override;
>-    gl::Error getResult(GLint64 *params) override;
>-    gl::Error getResult(GLuint64 *params) override;
>-    gl::Error isResultAvailable(bool *available) override;
>+    angle::Result begin(const gl::Context *context) override;
>+    angle::Result end(const gl::Context *context) override;
>+    angle::Result queryCounter(const gl::Context *context) override;
>+    angle::Result getResult(const gl::Context *context, GLint *params) override;
>+    angle::Result getResult(const gl::Context *context, GLuint *params) override;
>+    angle::Result getResult(const gl::Context *context, GLint64 *params) override;
>+    angle::Result getResult(const gl::Context *context, GLuint64 *params) override;
>+    angle::Result isResultAvailable(const gl::Context *context, bool *available) override;
> 
>-    gl::Error pause() override;
>-    gl::Error resume() override;
>+    angle::Result pause(const gl::Context *context) override;
>+    angle::Result resume(const gl::Context *context) override;
> 
>   private:
>-    gl::Error flush(bool force);
>+    angle::Result flush(const gl::Context *context, bool force);
> 
>     template <typename T>
>-    gl::Error getResultBase(T *params);
>+    angle::Result getResultBase(const gl::Context *context, T *params);
> 
>     const FunctionsGL *mFunctions;
>-    StateManagerGL *mStateManager;
> 
>     std::unique_ptr<SyncProviderGL> mSyncProvider;
>     bool mFinished;
> };
>-}
>+}  // namespace rx
> 
>-#endif // LIBANGLE_RENDERER_GL_QUERYGL_H_
>+#endif  // LIBANGLE_RENDERER_GL_QUERYGL_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/RenderbufferGL.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/RenderbufferGL.cpp
>index dfc0a842011..b272e7b51fc 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/RenderbufferGL.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/RenderbufferGL.cpp
>@@ -10,22 +10,29 @@
> 
> #include "common/debug.h"
> #include "libANGLE/Caps.h"
>+#include "libANGLE/Context.h"
> #include "libANGLE/angletypes.h"
>+#include "libANGLE/renderer/gl/BlitGL.h"
>+#include "libANGLE/renderer/gl/ContextGL.h"
> #include "libANGLE/renderer/gl/FunctionsGL.h"
>+#include "libANGLE/renderer/gl/ImageGL.h"
> #include "libANGLE/renderer/gl/StateManagerGL.h"
> #include "libANGLE/renderer/gl/formatutilsgl.h"
> #include "libANGLE/renderer/gl/renderergl_utils.h"
> 
> namespace rx
> {
>-RenderbufferGL::RenderbufferGL(const FunctionsGL *functions,
>+RenderbufferGL::RenderbufferGL(const gl::RenderbufferState &state,
>+                               const FunctionsGL *functions,
>                                const WorkaroundsGL &workarounds,
>                                StateManagerGL *stateManager,
>+                               BlitGL *blitter,
>                                const gl::TextureCapsMap &textureCaps)
>-    : RenderbufferImpl(),
>+    : RenderbufferImpl(state),
>       mFunctions(functions),
>       mWorkarounds(workarounds),
>       mStateManager(stateManager),
>+      mBlitter(blitter),
>       mTextureCaps(textureCaps),
>       mRenderbufferID(0)
> {
>@@ -39,10 +46,10 @@ RenderbufferGL::~RenderbufferGL()
>     mRenderbufferID = 0;
> }
> 
>-gl::Error RenderbufferGL::setStorage(const gl::Context *context,
>-                                     GLenum internalformat,
>-                                     size_t width,
>-                                     size_t height)
>+angle::Result RenderbufferGL::setStorage(const gl::Context *context,
>+                                         GLenum internalformat,
>+                                         size_t width,
>+                                         size_t height)
> {
>     mStateManager->bindRenderbuffer(GL_RENDERBUFFER, mRenderbufferID);
> 
>@@ -51,14 +58,16 @@ gl::Error RenderbufferGL::setStorage(const gl::Context *context,
>     mFunctions->renderbufferStorage(GL_RENDERBUFFER, renderbufferFormat.internalFormat,
>                                     static_cast<GLsizei>(width), static_cast<GLsizei>(height));
> 
>-    return gl::NoError();
>+    mNativeInternalFormat = renderbufferFormat.internalFormat;
>+
>+    return angle::Result::Continue;
> }
> 
>-gl::Error RenderbufferGL::setStorageMultisample(const gl::Context *context,
>-                                                size_t samples,
>-                                                GLenum internalformat,
>-                                                size_t width,
>-                                                size_t height)
>+angle::Result RenderbufferGL::setStorageMultisample(const gl::Context *context,
>+                                                    size_t samples,
>+                                                    GLenum internalformat,
>+                                                    size_t width,
>+                                                    size_t height)
> {
>     mStateManager->bindRenderbuffer(GL_RENDERBUFFER, mRenderbufferID);
> 
>@@ -71,28 +80,28 @@ gl::Error RenderbufferGL::setStorageMultisample(const gl::Context *context,
>     const gl::TextureCaps &formatCaps = mTextureCaps.get(internalformat);
>     if (samples > formatCaps.getMaxSamples())
>     {
>-        // Before version 4.2, it is unknown if the specific internal format can support the requested number
>-        // of samples.  It is expected that GL_OUT_OF_MEMORY is returned if the renderbuffer cannot be created.
>+        // Before version 4.2, it is unknown if the specific internal format can support the
>+        // requested number of samples.  It is expected that GL_OUT_OF_MEMORY is returned if the
>+        // renderbuffer cannot be created.
>         GLenum error = GL_NO_ERROR;
>         do
>         {
>             error = mFunctions->getError();
>-            if (error == GL_OUT_OF_MEMORY)
>-            {
>-                return gl::OutOfMemory();
>-            }
>-
>+            ANGLE_CHECK_GL_ALLOC(GetImplAs<ContextGL>(context), error != GL_OUT_OF_MEMORY);
>             ASSERT(error == GL_NO_ERROR);
>         } while (error != GL_NO_ERROR);
>     }
> 
>-    return gl::NoError();
>+    mNativeInternalFormat = renderbufferFormat.internalFormat;
>+
>+    return angle::Result::Continue;
> }
> 
>-gl::Error RenderbufferGL::setStorageEGLImageTarget(const gl::Context *context, egl::Image *image)
>+angle::Result RenderbufferGL::setStorageEGLImageTarget(const gl::Context *context,
>+                                                       egl::Image *image)
> {
>-    UNIMPLEMENTED();
>-    return gl::InternalError();
>+    ImageGL *imageGL = GetImplAs<ImageGL>(image);
>+    return imageGL->setRenderbufferStorage(context, this, &mNativeInternalFormat);
> }
> 
> GLuint RenderbufferGL::getRenderbufferID() const
>@@ -100,11 +109,15 @@ GLuint RenderbufferGL::getRenderbufferID() const
>     return mRenderbufferID;
> }
> 
>-gl::Error RenderbufferGL::initializeContents(const gl::Context *context,
>-                                             const gl::ImageIndex &imageIndex)
>+angle::Result RenderbufferGL::initializeContents(const gl::Context *context,
>+                                                 const gl::ImageIndex &imageIndex)
>+{
>+    return mBlitter->clearRenderbuffer(this, mNativeInternalFormat);
>+}
>+
>+GLenum RenderbufferGL::getNativeInternalFormat() const
> {
>-    // TODO(jmadill):
>-    return gl::NoError();
>+    return mNativeInternalFormat;
> }
> 
> }  // namespace rx
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/RenderbufferGL.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/RenderbufferGL.h
>index 7aafec66c08..3f8e13479fa 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/RenderbufferGL.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/RenderbufferGL.h
>@@ -19,6 +19,7 @@ class TextureCapsMap;
> namespace rx
> {
> 
>+class BlitGL;
> class FunctionsGL;
> class StateManagerGL;
> struct WorkaroundsGL;
>@@ -26,37 +27,43 @@ struct WorkaroundsGL;
> class RenderbufferGL : public RenderbufferImpl
> {
>   public:
>-    RenderbufferGL(const FunctionsGL *functions,
>+    RenderbufferGL(const gl::RenderbufferState &state,
>+                   const FunctionsGL *functions,
>                    const WorkaroundsGL &workarounds,
>                    StateManagerGL *stateManager,
>+                   BlitGL *blitter,
>                    const gl::TextureCapsMap &textureCaps);
>     ~RenderbufferGL() override;
> 
>-    gl::Error setStorage(const gl::Context *context,
>-                         GLenum internalformat,
>-                         size_t width,
>-                         size_t height) override;
>-    gl::Error setStorageMultisample(const gl::Context *context,
>-                                    size_t samples,
>-                                    GLenum internalformat,
>-                                    size_t width,
>-                                    size_t height) override;
>-    gl::Error setStorageEGLImageTarget(const gl::Context *context, egl::Image *image) override;
>+    angle::Result setStorage(const gl::Context *context,
>+                             GLenum internalformat,
>+                             size_t width,
>+                             size_t height) override;
>+    angle::Result setStorageMultisample(const gl::Context *context,
>+                                        size_t samples,
>+                                        GLenum internalformat,
>+                                        size_t width,
>+                                        size_t height) override;
>+    angle::Result setStorageEGLImageTarget(const gl::Context *context, egl::Image *image) override;
> 
>-    gl::Error initializeContents(const gl::Context *context,
>-                                 const gl::ImageIndex &imageIndex) override;
>+    angle::Result initializeContents(const gl::Context *context,
>+                                     const gl::ImageIndex &imageIndex) override;
> 
>     GLuint getRenderbufferID() const;
>+    GLenum getNativeInternalFormat() const;
> 
>   private:
>     const FunctionsGL *mFunctions;
>     const WorkaroundsGL &mWorkarounds;
>     StateManagerGL *mStateManager;
>+    BlitGL *mBlitter;
>     const gl::TextureCapsMap &mTextureCaps;
> 
>     GLuint mRenderbufferID;
>+
>+    GLenum mNativeInternalFormat;
> };
> 
>-}
>+}  // namespace rx
> 
>-#endif // LIBANGLE_RENDERER_GL_RENDERBUFFERGL_H_
>+#endif  // LIBANGLE_RENDERER_GL_RENDERBUFFERGL_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/RendererGL.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/RendererGL.cpp
>index 00a4172c14a..10b15594ab0 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/RendererGL.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/RendererGL.cpp
>@@ -13,8 +13,8 @@
> #include "common/debug.h"
> #include "libANGLE/AttributeMap.h"
> #include "libANGLE/Context.h"
>-#include "libANGLE/ContextState.h"
> #include "libANGLE/Path.h"
>+#include "libANGLE/State.h"
> #include "libANGLE/Surface.h"
> #include "libANGLE/renderer/gl/BlitGL.h"
> #include "libANGLE/renderer/gl/BufferGL.h"
>@@ -55,6 +55,19 @@ std::vector<GLuint> GatherPaths(const std::vector<gl::Path *> &paths)
>     return ret;
> }
> 
>+void SetMaxShaderCompilerThreads(const rx::FunctionsGL *functions, GLuint count)
>+{
>+    if (functions->maxShaderCompilerThreadsKHR != nullptr)
>+    {
>+        functions->maxShaderCompilerThreadsKHR(count);
>+    }
>+    else
>+    {
>+        ASSERT(functions->maxShaderCompilerThreadsARB != nullptr);
>+        functions->maxShaderCompilerThreadsARB(count);
>+    }
>+}
>+
> }  // namespace
> 
> static void INTERNAL_GL_APIENTRY LogGLDebugMessage(GLenum source,
>@@ -145,17 +158,20 @@ static void INTERNAL_GL_APIENTRY LogGLDebugMessage(GLenum source,
>         ERR() << std::endl
>               << "\tSource: " << sourceText << std::endl
>               << "\tType: " << typeText << std::endl
>-              << "\tID: " << gl::Error(id) << std::endl
>+              << "\tID: " << gl::FmtHex(id) << std::endl
>               << "\tSeverity: " << severityText << std::endl
>               << "\tMessage: " << message;
>     }
>-    else
>+    else if (type != GL_DEBUG_TYPE_PERFORMANCE)
>     {
>+        // Don't print performance warnings. They tend to be very spammy in the dEQP test suite and
>+        // there is very little we can do about them.
>+
>         // TODO(ynovikov): filter into WARN and INFO if INFO is ever implemented
>         WARN() << std::endl
>                << "\tSource: " << sourceText << std::endl
>                << "\tType: " << typeText << std::endl
>-               << "\tID: " << gl::Error(id) << std::endl
>+               << "\tID: " << gl::FmtHex(id) << std::endl
>                << "\tSeverity: " << severityText << std::endl
>                << "\tMessage: " << message;
>     }
>@@ -164,21 +180,22 @@ static void INTERNAL_GL_APIENTRY LogGLDebugMessage(GLenum source,
> namespace rx
> {
> 
>-RendererGL::RendererGL(const FunctionsGL *functions, const egl::AttributeMap &attribMap)
>+RendererGL::RendererGL(std::unique_ptr<FunctionsGL> functions, const egl::AttributeMap &attribMap)
>     : mMaxSupportedESVersion(0, 0),
>-      mFunctions(functions),
>+      mFunctions(std::move(functions)),
>       mStateManager(nullptr),
>       mBlitter(nullptr),
>       mMultiviewClearer(nullptr),
>       mUseDebugOutput(false),
>       mCapsInitialized(false),
>-      mMultiviewImplementationType(MultiviewImplementationTypeGL::UNSPECIFIED)
>+      mMultiviewImplementationType(MultiviewImplementationTypeGL::UNSPECIFIED),
>+      mNativeParallelCompileEnabled(false)
> {
>     ASSERT(mFunctions);
>-    nativegl_gl::GenerateWorkarounds(mFunctions, &mWorkarounds);
>-    mStateManager = new StateManagerGL(mFunctions, getNativeCaps(), getNativeExtensions());
>-    mBlitter      = new BlitGL(functions, mWorkarounds, mStateManager);
>-    mMultiviewClearer = new ClearMultiviewGL(functions, mStateManager);
>+    nativegl_gl::GenerateWorkarounds(mFunctions.get(), &mWorkarounds);
>+    mStateManager = new StateManagerGL(mFunctions.get(), getNativeCaps(), getNativeExtensions());
>+    mBlitter      = new BlitGL(mFunctions.get(), mWorkarounds, mStateManager);
>+    mMultiviewClearer = new ClearMultiviewGL(mFunctions.get(), mStateManager);
> 
>     bool hasDebugOutput = mFunctions->isAtLeastGL(gl::Version(4, 3)) ||
>                           mFunctions->hasGLExtension("GL_KHR_debug") ||
>@@ -212,6 +229,12 @@ RendererGL::RendererGL(const FunctionsGL *functions, const egl::AttributeMap &at
>             mFunctions->vertexAttrib4f(i, 0.0f, 0.0f, 0.0f, 1.0f);
>         }
>     }
>+
>+    if (hasNativeParallelCompile() && !mNativeParallelCompileEnabled)
>+    {
>+        SetMaxShaderCompilerThreads(mFunctions.get(), 0xffffffff);
>+        mNativeParallelCompileEnabled = true;
>+    }
> }
> 
> RendererGL::~RendererGL()
>@@ -219,15 +242,20 @@ RendererGL::~RendererGL()
>     SafeDelete(mBlitter);
>     SafeDelete(mMultiviewClearer);
>     SafeDelete(mStateManager);
>+
>+    std::lock_guard<std::mutex> lock(mWorkerMutex);
>+
>+    ASSERT(mCurrentWorkerContexts.empty());
>+    mWorkerContextPool.clear();
> }
> 
>-gl::Error RendererGL::flush()
>+angle::Result RendererGL::flush()
> {
>     mFunctions->flush();
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error RendererGL::finish()
>+angle::Result RendererGL::finish()
> {
>     if (mWorkarounds.finishDoesNotCauseQueriesToBeAvailable && mUseDebugOutput)
>     {
>@@ -241,139 +269,10 @@ gl::Error RendererGL::finish()
>         mFunctions->disable(GL_DEBUG_OUTPUT_SYNCHRONOUS);
>     }
> 
>-    return gl::NoError();
>-}
>-
>-gl::Error RendererGL::drawArrays(const gl::Context *context,
>-                                 GLenum mode,
>-                                 GLint first,
>-                                 GLsizei count)
>-{
>-    const gl::Program *program  = context->getGLState().getProgram();
>-    const bool usesMultiview    = program->usesMultiview();
>-    const GLsizei instanceCount = usesMultiview ? program->getNumViews() : 0;
>-
>-    ANGLE_TRY(mStateManager->setDrawArraysState(context, first, count, instanceCount));
>-    if (!usesMultiview)
>-    {
>-        mFunctions->drawArrays(mode, first, count);
>-    }
>-    else
>-    {
>-        mFunctions->drawArraysInstanced(mode, first, count, instanceCount);
>-    }
>-    return gl::NoError();
>-}
>-
>-gl::Error RendererGL::drawArraysInstanced(const gl::Context *context,
>-                                          GLenum mode,
>-                                          GLint first,
>-                                          GLsizei count,
>-                                          GLsizei instanceCount)
>-{
>-    GLsizei adjustedInstanceCount = instanceCount;
>-    const gl::Program *program    = context->getGLState().getProgram();
>-    if (program->usesMultiview())
>-    {
>-        adjustedInstanceCount *= program->getNumViews();
>-    }
>-
>-    ANGLE_TRY(mStateManager->setDrawArraysState(context, first, count, adjustedInstanceCount));
>-    mFunctions->drawArraysInstanced(mode, first, count, adjustedInstanceCount);
>-    return gl::NoError();
>-}
>-
>-gl::Error RendererGL::drawElements(const gl::Context *context,
>-                                   GLenum mode,
>-                                   GLsizei count,
>-                                   GLenum type,
>-                                   const void *indices)
>-{
>-    const gl::Program *program  = context->getGLState().getProgram();
>-    const bool usesMultiview    = program->usesMultiview();
>-    const GLsizei instanceCount = usesMultiview ? program->getNumViews() : 0;
>-    const void *drawIndexPtr = nullptr;
>-
>-    ANGLE_TRY(mStateManager->setDrawElementsState(context, count, type, indices, instanceCount,
>-                                                  &drawIndexPtr));
>-    if (!usesMultiview)
>-    {
>-        mFunctions->drawElements(mode, count, type, drawIndexPtr);
>-    }
>-    else
>-    {
>-        mFunctions->drawElementsInstanced(mode, count, type, drawIndexPtr, instanceCount);
>-    }
>-    return gl::NoError();
>-}
>-
>-gl::Error RendererGL::drawElementsInstanced(const gl::Context *context,
>-                                            GLenum mode,
>-                                            GLsizei count,
>-                                            GLenum type,
>-                                            const void *indices,
>-                                            GLsizei instances)
>-{
>-    GLsizei adjustedInstanceCount = instances;
>-    const gl::Program *program    = context->getGLState().getProgram();
>-    if (program->usesMultiview())
>-    {
>-        adjustedInstanceCount *= program->getNumViews();
>-    }
>-    const void *drawIndexPointer = nullptr;
>-
>-    ANGLE_TRY(mStateManager->setDrawElementsState(context, count, type, indices,
>-                                                  adjustedInstanceCount, &drawIndexPointer));
>-    mFunctions->drawElementsInstanced(mode, count, type, drawIndexPointer, adjustedInstanceCount);
>-    return gl::NoError();
>-}
>-
>-gl::Error RendererGL::drawRangeElements(const gl::Context *context,
>-                                        GLenum mode,
>-                                        GLuint start,
>-                                        GLuint end,
>-                                        GLsizei count,
>-                                        GLenum type,
>-                                        const void *indices)
>-{
>-    const gl::Program *program   = context->getGLState().getProgram();
>-    const bool usesMultiview     = program->usesMultiview();
>-    const GLsizei instanceCount  = usesMultiview ? program->getNumViews() : 0;
>-    const void *drawIndexPointer = nullptr;
>-
>-    ANGLE_TRY(mStateManager->setDrawElementsState(context, count, type, indices, instanceCount,
>-                                                  &drawIndexPointer));
>-    if (!usesMultiview)
>-    {
>-        mFunctions->drawRangeElements(mode, start, end, count, type, drawIndexPointer);
>-    }
>-    else
>-    {
>-        mFunctions->drawElementsInstanced(mode, count, type, drawIndexPointer, instanceCount);
>-    }
>-    return gl::NoError();
>-}
>-
>-gl::Error RendererGL::drawArraysIndirect(const gl::Context *context,
>-                                         GLenum mode,
>-                                         const void *indirect)
>-{
>-    ANGLE_TRY(mStateManager->setDrawIndirectState(context, GL_NONE));
>-    mFunctions->drawArraysIndirect(mode, indirect);
>-    return gl::NoError();
>-}
>-
>-gl::Error RendererGL::drawElementsIndirect(const gl::Context *context,
>-                                           GLenum mode,
>-                                           GLenum type,
>-                                           const void *indirect)
>-{
>-    ANGLE_TRY(mStateManager->setDrawIndirectState(context, type));
>-    mFunctions->drawElementsIndirect(mode, type, indirect);
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-void RendererGL::stencilFillPath(const gl::ContextState &state,
>+void RendererGL::stencilFillPath(const gl::State &state,
>                                  const gl::Path *path,
>                                  GLenum fillMode,
>                                  GLuint mask)
>@@ -385,7 +284,7 @@ void RendererGL::stencilFillPath(const gl::ContextState &state,
>     ASSERT(mFunctions->getError() == GL_NO_ERROR);
> }
> 
>-void RendererGL::stencilStrokePath(const gl::ContextState &state,
>+void RendererGL::stencilStrokePath(const gl::State &state,
>                                    const gl::Path *path,
>                                    GLint reference,
>                                    GLuint mask)
>@@ -397,9 +296,7 @@ void RendererGL::stencilStrokePath(const gl::ContextState &state,
>     ASSERT(mFunctions->getError() == GL_NO_ERROR);
> }
> 
>-void RendererGL::coverFillPath(const gl::ContextState &state,
>-                               const gl::Path *path,
>-                               GLenum coverMode)
>+void RendererGL::coverFillPath(const gl::State &state, const gl::Path *path, GLenum coverMode)
> {
> 
>     const auto *pathObj = GetImplAs<PathGL>(path);
>@@ -408,9 +305,7 @@ void RendererGL::coverFillPath(const gl::ContextState &state,
>     ASSERT(mFunctions->getError() == GL_NO_ERROR);
> }
> 
>-void RendererGL::coverStrokePath(const gl::ContextState &state,
>-                                 const gl::Path *path,
>-                                 GLenum coverMode)
>+void RendererGL::coverStrokePath(const gl::State &state, const gl::Path *path, GLenum coverMode)
> {
>     const auto *pathObj = GetImplAs<PathGL>(path);
>     mFunctions->coverStrokePathNV(pathObj->getPathID(), coverMode);
>@@ -418,7 +313,7 @@ void RendererGL::coverStrokePath(const gl::ContextState &state,
>     ASSERT(mFunctions->getError() == GL_NO_ERROR);
> }
> 
>-void RendererGL::stencilThenCoverFillPath(const gl::ContextState &state,
>+void RendererGL::stencilThenCoverFillPath(const gl::State &state,
>                                           const gl::Path *path,
>                                           GLenum fillMode,
>                                           GLuint mask,
>@@ -431,7 +326,7 @@ void RendererGL::stencilThenCoverFillPath(const gl::ContextState &state,
>     ASSERT(mFunctions->getError() == GL_NO_ERROR);
> }
> 
>-void RendererGL::stencilThenCoverStrokePath(const gl::ContextState &state,
>+void RendererGL::stencilThenCoverStrokePath(const gl::State &state,
>                                             const gl::Path *path,
>                                             GLint reference,
>                                             GLuint mask,
>@@ -444,7 +339,7 @@ void RendererGL::stencilThenCoverStrokePath(const gl::ContextState &state,
>     ASSERT(mFunctions->getError() == GL_NO_ERROR);
> }
> 
>-void RendererGL::coverFillPathInstanced(const gl::ContextState &state,
>+void RendererGL::coverFillPathInstanced(const gl::State &state,
>                                         const std::vector<gl::Path *> &paths,
>                                         GLenum coverMode,
>                                         GLenum transformType,
>@@ -458,7 +353,7 @@ void RendererGL::coverFillPathInstanced(const gl::ContextState &state,
> 
>     ASSERT(mFunctions->getError() == GL_NO_ERROR);
> }
>-void RendererGL::coverStrokePathInstanced(const gl::ContextState &state,
>+void RendererGL::coverStrokePathInstanced(const gl::State &state,
>                                           const std::vector<gl::Path *> &paths,
>                                           GLenum coverMode,
>                                           GLenum transformType,
>@@ -472,7 +367,7 @@ void RendererGL::coverStrokePathInstanced(const gl::ContextState &state,
> 
>     ASSERT(mFunctions->getError() == GL_NO_ERROR);
> }
>-void RendererGL::stencilFillPathInstanced(const gl::ContextState &state,
>+void RendererGL::stencilFillPathInstanced(const gl::State &state,
>                                           const std::vector<gl::Path *> &paths,
>                                           GLenum fillMode,
>                                           GLuint mask,
>@@ -487,7 +382,7 @@ void RendererGL::stencilFillPathInstanced(const gl::ContextState &state,
> 
>     ASSERT(mFunctions->getError() == GL_NO_ERROR);
> }
>-void RendererGL::stencilStrokePathInstanced(const gl::ContextState &state,
>+void RendererGL::stencilStrokePathInstanced(const gl::State &state,
>                                             const std::vector<gl::Path *> &paths,
>                                             GLint reference,
>                                             GLuint mask,
>@@ -503,7 +398,7 @@ void RendererGL::stencilStrokePathInstanced(const gl::ContextState &state,
>     ASSERT(mFunctions->getError() == GL_NO_ERROR);
> }
> 
>-void RendererGL::stencilThenCoverFillPathInstanced(const gl::ContextState &state,
>+void RendererGL::stencilThenCoverFillPathInstanced(const gl::State &state,
>                                                    const std::vector<gl::Path *> &paths,
>                                                    GLenum coverMode,
>                                                    GLenum fillMode,
>@@ -519,7 +414,7 @@ void RendererGL::stencilThenCoverFillPathInstanced(const gl::ContextState &state
> 
>     ASSERT(mFunctions->getError() == GL_NO_ERROR);
> }
>-void RendererGL::stencilThenCoverStrokePathInstanced(const gl::ContextState &state,
>+void RendererGL::stencilThenCoverStrokePathInstanced(const gl::State &state,
>                                                      const std::vector<gl::Path *> &paths,
>                                                      GLenum coverMode,
>                                                      GLint reference,
>@@ -536,82 +431,20 @@ void RendererGL::stencilThenCoverStrokePathInstanced(const gl::ContextState &sta
>     ASSERT(mFunctions->getError() == GL_NO_ERROR);
> }
> 
>-GLenum RendererGL::getResetStatus()
>-{
>-    return mFunctions->getGraphicsResetStatus();
>-}
>-
>-ContextImpl *RendererGL::createContext(const gl::ContextState &state)
>+gl::GraphicsResetStatus RendererGL::getResetStatus()
> {
>-    return new ContextGL(state, this);
>+    return gl::FromGLenum<gl::GraphicsResetStatus>(mFunctions->getGraphicsResetStatus());
> }
> 
>-void RendererGL::insertEventMarker(GLsizei length, const char *marker)
>-{
>-    if (mFunctions->insertEventMarkerEXT)
>-    {
>-        mFunctions->insertEventMarkerEXT(length, marker);
>-    }
>-    else if (mFunctions->debugMessageInsert)
>-    {
>-        mFunctions->debugMessageInsert(GL_DEBUG_SOURCE_APPLICATION, GL_DEBUG_TYPE_MARKER, 0,
>-                                       GL_DEBUG_SEVERITY_NOTIFICATION, length, marker);
>-    }
>-    else
>-    {
>-        UNREACHABLE();
>-    }
>-}
>+void RendererGL::insertEventMarker(GLsizei length, const char *marker) {}
> 
>-void RendererGL::pushGroupMarker(GLsizei length, const char *marker)
>-{
>-    if (mFunctions->pushGroupMarkerEXT)
>-    {
>-        mFunctions->pushGroupMarkerEXT(length, marker);
>-    }
>-    else if (mFunctions->pushDebugGroup)
>-    {
>-        // Fall back to KHR_debug to implement EXT_debug_marker
>-        mFunctions->pushDebugGroup(GL_DEBUG_SOURCE_APPLICATION, 0, length, marker);
>-    }
>-    else
>-    {
>-        UNREACHABLE();
>-    }
>-}
>+void RendererGL::pushGroupMarker(GLsizei length, const char *marker) {}
> 
>-void RendererGL::popGroupMarker()
>-{
>-    if (mFunctions->popGroupMarkerEXT)
>-    {
>-        mFunctions->popGroupMarkerEXT();
>-    }
>-    else if (mFunctions->popDebugGroup)
>-    {
>-        // Fall back to KHR_debug to implement EXT_debug_marker
>-        mFunctions->popDebugGroup();
>-    }
>-    else
>-    {
>-        UNREACHABLE();
>-    }
>-}
>+void RendererGL::popGroupMarker() {}
> 
>-void RendererGL::pushDebugGroup(GLenum source, GLuint id, GLsizei length, const char *message)
>-{
>-    if (mFunctions->pushDebugGroup)
>-    {
>-        mFunctions->pushDebugGroup(source, id, length, message);
>-    }
>-}
>+void RendererGL::pushDebugGroup(GLenum source, GLuint id, const std::string &message) {}
> 
>-void RendererGL::popDebugGroup()
>-{
>-    if (mFunctions->popDebugGroup)
>-    {
>-        mFunctions->popDebugGroup();
>-    }
>-}
>+void RendererGL::popDebugGroup() {}
> 
> std::string RendererGL::getVendorString() const
> {
>@@ -626,7 +459,7 @@ std::string RendererGL::getRendererDescription() const
>         reinterpret_cast<const char *>(mFunctions->getString(GL_RENDERER)));
> 
>     std::ostringstream rendererString;
>-    rendererString << nativeVendorString << " " << nativeRendererString << " OpenGL";
>+    rendererString << nativeVendorString << ", " << nativeRendererString << ", OpenGL";
>     if (mFunctions->standard == STANDARD_GL_ES)
>     {
>         rendererString << " ES";
>@@ -662,8 +495,9 @@ void RendererGL::generateCaps(gl::Caps *outCaps,
>                               gl::Extensions *outExtensions,
>                               gl::Limitations * /* outLimitations */) const
> {
>-    nativegl_gl::GenerateCaps(mFunctions, mWorkarounds, outCaps, outTextureCaps, outExtensions,
>-                              &mMaxSupportedESVersion, &mMultiviewImplementationType);
>+    nativegl_gl::GenerateCaps(mFunctions.get(), mWorkarounds, outCaps, outTextureCaps,
>+                              outExtensions, &mMaxSupportedESVersion,
>+                              &mMultiviewImplementationType);
> }
> 
> GLint RendererGL::getGPUDisjoint()
>@@ -721,17 +555,119 @@ MultiviewImplementationTypeGL RendererGL::getMultiviewImplementationType() const
> void RendererGL::applyNativeWorkarounds(gl::Workarounds *workarounds) const
> {
>     ensureCapsInitialized();
>-    nativegl_gl::ApplyWorkarounds(mFunctions, workarounds);
>+    nativegl_gl::ApplyWorkarounds(mFunctions.get(), workarounds);
> }
> 
>-gl::Error RendererGL::dispatchCompute(const gl::Context *context,
>-                                      GLuint numGroupsX,
>-                                      GLuint numGroupsY,
>-                                      GLuint numGroupsZ)
>+angle::Result RendererGL::dispatchCompute(const gl::Context *context,
>+                                          GLuint numGroupsX,
>+                                          GLuint numGroupsY,
>+                                          GLuint numGroupsZ)
> {
>-    ANGLE_TRY(mStateManager->setDispatchComputeState(context));
>     mFunctions->dispatchCompute(numGroupsX, numGroupsY, numGroupsZ);
>-    return gl::NoError();
>+    return angle::Result::Continue;
>+}
>+
>+angle::Result RendererGL::dispatchComputeIndirect(const gl::Context *context, GLintptr indirect)
>+{
>+    mFunctions->dispatchComputeIndirect(indirect);
>+    return angle::Result::Continue;
>+}
>+
>+angle::Result RendererGL::memoryBarrier(GLbitfield barriers)
>+{
>+    mFunctions->memoryBarrier(barriers);
>+    return angle::Result::Continue;
>+}
>+angle::Result RendererGL::memoryBarrierByRegion(GLbitfield barriers)
>+{
>+    mFunctions->memoryBarrierByRegion(barriers);
>+    return angle::Result::Continue;
>+}
>+
>+bool RendererGL::bindWorkerContext(std::string *infoLog)
>+{
>+    if (mWorkarounds.disableWorkerContexts)
>+    {
>+        return false;
>+    }
>+
>+    std::thread::id threadID = std::this_thread::get_id();
>+    std::lock_guard<std::mutex> lock(mWorkerMutex);
>+    std::unique_ptr<WorkerContext> workerContext;
>+    if (!mWorkerContextPool.empty())
>+    {
>+        auto it       = mWorkerContextPool.begin();
>+        workerContext = std::move(*it);
>+        mWorkerContextPool.erase(it);
>+    }
>+    else
>+    {
>+        WorkerContext *newContext = createWorkerContext(infoLog);
>+        if (newContext == nullptr)
>+        {
>+            return false;
>+        }
>+        workerContext.reset(newContext);
>+    }
>+
>+    if (!workerContext->makeCurrent())
>+    {
>+        mWorkerContextPool.push_back(std::move(workerContext));
>+        return false;
>+    }
>+    mCurrentWorkerContexts[threadID] = std::move(workerContext);
>+    return true;
>+}
>+
>+void RendererGL::unbindWorkerContext()
>+{
>+    std::thread::id threadID = std::this_thread::get_id();
>+    std::lock_guard<std::mutex> lock(mWorkerMutex);
>+
>+    auto it = mCurrentWorkerContexts.find(threadID);
>+    ASSERT(it != mCurrentWorkerContexts.end());
>+    (*it).second->unmakeCurrent();
>+    mWorkerContextPool.push_back(std::move((*it).second));
>+    mCurrentWorkerContexts.erase(it);
>+}
>+
>+unsigned int RendererGL::getMaxWorkerContexts()
>+{
>+    // No more than 16 worker contexts.
>+    return std::min(16u, std::thread::hardware_concurrency());
>+}
>+
>+bool RendererGL::hasNativeParallelCompile()
>+{
>+    return mFunctions->maxShaderCompilerThreadsKHR != nullptr ||
>+           mFunctions->maxShaderCompilerThreadsARB != nullptr;
>+}
>+
>+void RendererGL::setMaxShaderCompilerThreads(GLuint count)
>+{
>+    if (hasNativeParallelCompile())
>+    {
>+        SetMaxShaderCompilerThreads(mFunctions.get(), count);
>+    }
>+}
>+
>+ScopedWorkerContextGL::ScopedWorkerContextGL(RendererGL *renderer, std::string *infoLog)
>+    : mRenderer(renderer)
>+{
>+    mValid = mRenderer->bindWorkerContext(infoLog);
>+}
>+
>+ScopedWorkerContextGL::~ScopedWorkerContextGL()
>+{
>+    if (mValid)
>+    {
>+        mRenderer->unbindWorkerContext();
>+    }
>+}
>+
>+bool ScopedWorkerContextGL::operator()() const
>+{
>+    return mValid;
> }
> 
> }  // namespace rx
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/RendererGL.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/RendererGL.h
>index e83e17dd360..4a9be3d7218 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/RendererGL.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/RendererGL.h
>@@ -9,6 +9,10 @@
> #ifndef LIBANGLE_RENDERER_GL_RENDERERGL_H_
> #define LIBANGLE_RENDERER_GL_RENDERERGL_H_
> 
>+#include <list>
>+#include <mutex>
>+#include <thread>
>+
> #include "libANGLE/Caps.h"
> #include "libANGLE/Error.h"
> #include "libANGLE/Version.h"
>@@ -17,11 +21,11 @@
> 
> namespace gl
> {
>-class ContextState;
> struct IndexRange;
> class Path;
>+class State;
> struct Workarounds;
>-}
>+}  // namespace gl
> 
> namespace egl
> {
>@@ -39,102 +43,94 @@ class BlitGL;
> class ClearMultiviewGL;
> class ContextImpl;
> class FunctionsGL;
>+class RendererGL;
> class StateManagerGL;
> 
>+// WorkerContext wraps a native GL context shared from the main context. It is used by the workers
>+// for khr_parallel_shader_compile.
>+class WorkerContext : angle::NonCopyable
>+{
>+  public:
>+    virtual ~WorkerContext() {}
>+
>+    virtual bool makeCurrent()   = 0;
>+    virtual void unmakeCurrent() = 0;
>+};
>+
>+class ScopedWorkerContextGL
>+{
>+  public:
>+    ScopedWorkerContextGL(RendererGL *renderer, std::string *infoLog);
>+    ~ScopedWorkerContextGL();
>+
>+    bool operator()() const;
>+
>+  private:
>+    RendererGL *mRenderer = nullptr;
>+    bool mValid           = false;
>+};
>+
> class RendererGL : angle::NonCopyable
> {
>   public:
>-    RendererGL(const FunctionsGL *functions, const egl::AttributeMap &attribMap);
>-    ~RendererGL();
>-
>-    ContextImpl *createContext(const gl::ContextState &state);
>-
>-    gl::Error flush();
>-    gl::Error finish();
>-
>-    gl::Error drawArrays(const gl::Context *context, GLenum mode, GLint first, GLsizei count);
>-    gl::Error drawArraysInstanced(const gl::Context *context,
>-                                  GLenum mode,
>-                                  GLint first,
>-                                  GLsizei count,
>-                                  GLsizei instanceCount);
>-
>-    gl::Error drawElements(const gl::Context *context,
>-                           GLenum mode,
>-                           GLsizei count,
>-                           GLenum type,
>-                           const void *indices);
>-    gl::Error drawElementsInstanced(const gl::Context *context,
>-                                    GLenum mode,
>-                                    GLsizei count,
>-                                    GLenum type,
>-                                    const void *indices,
>-                                    GLsizei instances);
>-    gl::Error drawRangeElements(const gl::Context *context,
>-                                GLenum mode,
>-                                GLuint start,
>-                                GLuint end,
>-                                GLsizei count,
>-                                GLenum type,
>-                                const void *indices);
>-    gl::Error drawArraysIndirect(const gl::Context *context, GLenum mode, const void *indirect);
>-    gl::Error drawElementsIndirect(const gl::Context *context,
>-                                   GLenum mode,
>-                                   GLenum type,
>-                                   const void *indirect);
>+    RendererGL(std::unique_ptr<FunctionsGL> functions, const egl::AttributeMap &attribMap);
>+    virtual ~RendererGL();
>+
>+    angle::Result flush();
>+    angle::Result finish();
> 
>     // CHROMIUM_path_rendering implementation
>-    void stencilFillPath(const gl::ContextState &state,
>+    void stencilFillPath(const gl::State &state,
>                          const gl::Path *path,
>                          GLenum fillMode,
>                          GLuint mask);
>-    void stencilStrokePath(const gl::ContextState &state,
>+    void stencilStrokePath(const gl::State &state,
>                            const gl::Path *path,
>                            GLint reference,
>                            GLuint mask);
>-    void coverFillPath(const gl::ContextState &state, const gl::Path *path, GLenum coverMode);
>-    void coverStrokePath(const gl::ContextState &state, const gl::Path *path, GLenum coverMode);
>-    void stencilThenCoverFillPath(const gl::ContextState &state,
>+    void coverFillPath(const gl::State &state, const gl::Path *path, GLenum coverMode);
>+    void coverStrokePath(const gl::State &state, const gl::Path *path, GLenum coverMode);
>+    void stencilThenCoverFillPath(const gl::State &state,
>                                   const gl::Path *path,
>                                   GLenum fillMode,
>                                   GLuint mask,
>                                   GLenum coverMode);
>-    void stencilThenCoverStrokePath(const gl::ContextState &state,
>+    void stencilThenCoverStrokePath(const gl::State &state,
>                                     const gl::Path *path,
>                                     GLint reference,
>                                     GLuint mask,
>                                     GLenum coverMode);
>-    void coverFillPathInstanced(const gl::ContextState &state,
>+    void coverFillPathInstanced(const gl::State &state,
>                                 const std::vector<gl::Path *> &paths,
>                                 GLenum coverMode,
>                                 GLenum transformType,
>                                 const GLfloat *transformValues);
>-    void coverStrokePathInstanced(const gl::ContextState &state,
>+    void coverStrokePathInstanced(const gl::State &state,
>                                   const std::vector<gl::Path *> &paths,
>                                   GLenum coverMode,
>                                   GLenum transformType,
>                                   const GLfloat *transformValues);
>-    void stencilFillPathInstanced(const gl::ContextState &state,
>+    void stencilFillPathInstanced(const gl::State &state,
>                                   const std::vector<gl::Path *> &paths,
>                                   GLenum fillMode,
>                                   GLuint mask,
>                                   GLenum transformType,
>                                   const GLfloat *transformValues);
>-    void stencilStrokePathInstanced(const gl::ContextState &state,
>+    void stencilStrokePathInstanced(const gl::State &state,
>                                     const std::vector<gl::Path *> &paths,
>                                     GLint reference,
>                                     GLuint mask,
>                                     GLenum transformType,
>                                     const GLfloat *transformValues);
> 
>-    void stencilThenCoverFillPathInstanced(const gl::ContextState &state,
>+    void stencilThenCoverFillPathInstanced(const gl::State &state,
>                                            const std::vector<gl::Path *> &paths,
>                                            GLenum coverMode,
>                                            GLenum fillMode,
>                                            GLuint mask,
>                                            GLenum transformType,
>                                            const GLfloat *transformValues);
>-    void stencilThenCoverStrokePathInstanced(const gl::ContextState &state,
>+    void stencilThenCoverStrokePathInstanced(const gl::State &state,
>                                              const std::vector<gl::Path *> &paths,
>                                              GLenum coverMode,
>                                              GLint reference,
>@@ -142,7 +138,7 @@ class RendererGL : angle::NonCopyable
>                                              GLenum transformType,
>                                              const GLfloat *transformValues);
> 
>-    GLenum getResetStatus();
>+    gl::GraphicsResetStatus getResetStatus();
> 
>     // EXT_debug_marker
>     void insertEventMarker(GLsizei length, const char *marker);
>@@ -150,7 +146,7 @@ class RendererGL : angle::NonCopyable
>     void popGroupMarker();
> 
>     // KHR_debug
>-    void pushDebugGroup(GLenum source, GLuint id, GLsizei length, const char *message);
>+    void pushDebugGroup(GLenum source, GLuint id, const std::string &message);
>     void popDebugGroup();
> 
>     std::string getVendorString() const;
>@@ -160,7 +156,7 @@ class RendererGL : angle::NonCopyable
>     GLint64 getTimestamp();
> 
>     const gl::Version &getMaxSupportedESVersion() const;
>-    const FunctionsGL *getFunctions() const { return mFunctions; }
>+    const FunctionsGL *getFunctions() const { return mFunctions.get(); }
>     StateManagerGL *getStateManager() const { return mStateManager; }
>     const WorkaroundsGL &getWorkarounds() const { return mWorkarounds; }
>     BlitGL *getBlitter() const { return mBlitter; }
>@@ -173,10 +169,26 @@ class RendererGL : angle::NonCopyable
>     const gl::Limitations &getNativeLimitations() const;
>     void applyNativeWorkarounds(gl::Workarounds *workarounds) const;
> 
>-    gl::Error dispatchCompute(const gl::Context *context,
>-                              GLuint numGroupsX,
>-                              GLuint numGroupsY,
>-                              GLuint numGroupsZ);
>+    angle::Result dispatchCompute(const gl::Context *context,
>+                                  GLuint numGroupsX,
>+                                  GLuint numGroupsY,
>+                                  GLuint numGroupsZ);
>+    angle::Result dispatchComputeIndirect(const gl::Context *context, GLintptr indirect);
>+
>+    angle::Result memoryBarrier(GLbitfield barriers);
>+    angle::Result memoryBarrierByRegion(GLbitfield barriers);
>+
>+    bool bindWorkerContext(std::string *infoLog);
>+    void unbindWorkerContext();
>+    // Checks if the driver has the KHR_parallel_shader_compile or ARB_parallel_shader_compile
>+    // extension.
>+    bool hasNativeParallelCompile();
>+    void setMaxShaderCompilerThreads(GLuint count);
>+
>+    static unsigned int getMaxWorkerContexts();
>+
>+  protected:
>+    virtual WorkerContext *createWorkerContext(std::string *infoLog) = 0;
> 
>   private:
>     void ensureCapsInitialized() const;
>@@ -187,7 +199,7 @@ class RendererGL : angle::NonCopyable
> 
>     mutable gl::Version mMaxSupportedESVersion;
> 
>-    const FunctionsGL *mFunctions;
>+    std::unique_ptr<FunctionsGL> mFunctions;
>     StateManagerGL *mStateManager;
> 
>     BlitGL *mBlitter;
>@@ -203,6 +215,15 @@ class RendererGL : angle::NonCopyable
>     mutable gl::Extensions mNativeExtensions;
>     mutable gl::Limitations mNativeLimitations;
>     mutable MultiviewImplementationTypeGL mMultiviewImplementationType;
>+
>+    // The thread-to-context mapping for the currently active worker threads.
>+    std::unordered_map<std::thread::id, std::unique_ptr<WorkerContext>> mCurrentWorkerContexts;
>+    // The worker contexts available to use.
>+    std::list<std::unique_ptr<WorkerContext>> mWorkerContextPool;
>+    // Protect the concurrent accesses to worker contexts.
>+    std::mutex mWorkerMutex;
>+
>+    bool mNativeParallelCompileEnabled;
> };
> 
> }  // namespace rx
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/SamplerGL.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/SamplerGL.cpp
>index 19c7ff95c18..2cd61c5c4d3 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/SamplerGL.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/SamplerGL.cpp
>@@ -15,20 +15,52 @@ namespace
> {
> 
> template <typename T>
>+inline void SetSamplerParameter(const rx::FunctionsGL *functions,
>+                                GLuint sampler,
>+                                GLenum name,
>+                                const T &value)
>+{
>+    functions->samplerParameterf(sampler, name, static_cast<GLfloat>(value));
>+}
>+
>+inline void SetSamplerParameter(const rx::FunctionsGL *functions,
>+                                GLuint sampler,
>+                                GLenum name,
>+                                const angle::ColorGeneric &value)
>+{
>+    switch (value.type)
>+    {
>+        case angle::ColorGeneric::Type::Float:
>+            functions->samplerParameterfv(sampler, name, &value.colorF.red);
>+            break;
>+        case angle::ColorGeneric::Type::Int:
>+            functions->samplerParameterIiv(sampler, name, &value.colorI.red);
>+            break;
>+        case angle::ColorGeneric::Type::UInt:
>+            functions->samplerParameterIuiv(sampler, name, &value.colorUI.red);
>+            break;
>+        default:
>+            UNREACHABLE();
>+            break;
>+    }
>+}
>+
>+template <typename Getter, typename Setter>
> static inline void SyncSamplerStateMember(const rx::FunctionsGL *functions,
>                                           GLuint sampler,
>                                           const gl::SamplerState &newState,
>                                           gl::SamplerState &curState,
>                                           GLenum name,
>-                                          T(gl::SamplerState::*samplerMember))
>+                                          Getter getter,
>+                                          Setter setter)
> {
>-    if (curState.*samplerMember != newState.*samplerMember)
>+    if ((curState.*getter)() != (newState.*getter)())
>     {
>-        curState.*samplerMember = newState.*samplerMember;
>-        functions->samplerParameterf(sampler, name, static_cast<GLfloat>(curState.*samplerMember));
>+        (curState.*setter)((newState.*getter)());
>+        SetSamplerParameter(functions, sampler, name, (newState.*getter)());
>     }
> }
>-}
>+}  // namespace
> 
> namespace rx
> {
>@@ -54,17 +86,18 @@ SamplerGL::~SamplerGL()
> void SamplerGL::syncState(const gl::Context *context)
> {
>     // clang-format off
>-    SyncSamplerStateMember(mFunctions, mSamplerID, mState, mAppliedSamplerState, GL_TEXTURE_MIN_FILTER, &gl::SamplerState::minFilter);
>-    SyncSamplerStateMember(mFunctions, mSamplerID, mState, mAppliedSamplerState, GL_TEXTURE_MAG_FILTER, &gl::SamplerState::magFilter);
>-    SyncSamplerStateMember(mFunctions, mSamplerID, mState, mAppliedSamplerState, GL_TEXTURE_WRAP_S, &gl::SamplerState::wrapS);
>-    SyncSamplerStateMember(mFunctions, mSamplerID, mState, mAppliedSamplerState, GL_TEXTURE_WRAP_T, &gl::SamplerState::wrapT);
>-    SyncSamplerStateMember(mFunctions, mSamplerID, mState, mAppliedSamplerState, GL_TEXTURE_WRAP_R, &gl::SamplerState::wrapR);
>-    SyncSamplerStateMember(mFunctions, mSamplerID, mState, mAppliedSamplerState, GL_TEXTURE_MAX_ANISOTROPY_EXT, &gl::SamplerState::maxAnisotropy);
>-    SyncSamplerStateMember(mFunctions, mSamplerID, mState, mAppliedSamplerState, GL_TEXTURE_MIN_LOD, &gl::SamplerState::minLod);
>-    SyncSamplerStateMember(mFunctions, mSamplerID, mState, mAppliedSamplerState, GL_TEXTURE_MAX_LOD, &gl::SamplerState::maxLod);
>-    SyncSamplerStateMember(mFunctions, mSamplerID, mState, mAppliedSamplerState, GL_TEXTURE_COMPARE_MODE, &gl::SamplerState::compareMode);
>-    SyncSamplerStateMember(mFunctions, mSamplerID, mState, mAppliedSamplerState, GL_TEXTURE_COMPARE_FUNC, &gl::SamplerState::compareFunc);
>-    SyncSamplerStateMember(mFunctions, mSamplerID, mState, mAppliedSamplerState, GL_TEXTURE_SRGB_DECODE_EXT, &gl::SamplerState::sRGBDecode);
>+    SyncSamplerStateMember(mFunctions, mSamplerID, mState, mAppliedSamplerState, GL_TEXTURE_MIN_FILTER, &gl::SamplerState::getMinFilter, &gl::SamplerState::setMinFilter);
>+    SyncSamplerStateMember(mFunctions, mSamplerID, mState, mAppliedSamplerState, GL_TEXTURE_MAG_FILTER, &gl::SamplerState::getMagFilter, &gl::SamplerState::setMagFilter);
>+    SyncSamplerStateMember(mFunctions, mSamplerID, mState, mAppliedSamplerState, GL_TEXTURE_WRAP_S, &gl::SamplerState::getWrapS, &gl::SamplerState::setWrapS);
>+    SyncSamplerStateMember(mFunctions, mSamplerID, mState, mAppliedSamplerState, GL_TEXTURE_WRAP_T, &gl::SamplerState::getWrapT, &gl::SamplerState::setWrapT);
>+    SyncSamplerStateMember(mFunctions, mSamplerID, mState, mAppliedSamplerState, GL_TEXTURE_WRAP_R, &gl::SamplerState::getWrapR, &gl::SamplerState::setWrapR);
>+    SyncSamplerStateMember(mFunctions, mSamplerID, mState, mAppliedSamplerState, GL_TEXTURE_MAX_ANISOTROPY_EXT, &gl::SamplerState::getMaxAnisotropy, &gl::SamplerState::setMaxAnisotropy);
>+    SyncSamplerStateMember(mFunctions, mSamplerID, mState, mAppliedSamplerState, GL_TEXTURE_MIN_LOD, &gl::SamplerState::getMinLod, &gl::SamplerState::setMinLod);
>+    SyncSamplerStateMember(mFunctions, mSamplerID, mState, mAppliedSamplerState, GL_TEXTURE_MAX_LOD, &gl::SamplerState::getMaxLod, &gl::SamplerState::setMaxLod);
>+    SyncSamplerStateMember(mFunctions, mSamplerID, mState, mAppliedSamplerState, GL_TEXTURE_COMPARE_MODE, &gl::SamplerState::getCompareMode, &gl::SamplerState::setCompareMode);
>+    SyncSamplerStateMember(mFunctions, mSamplerID, mState, mAppliedSamplerState, GL_TEXTURE_COMPARE_FUNC, &gl::SamplerState::getCompareFunc, &gl::SamplerState::setCompareFunc);
>+    SyncSamplerStateMember(mFunctions, mSamplerID, mState, mAppliedSamplerState, GL_TEXTURE_SRGB_DECODE_EXT, &gl::SamplerState::getSRGBDecode, &gl::SamplerState::setSRGBDecode);
>+    SyncSamplerStateMember(mFunctions, mSamplerID, mState, mAppliedSamplerState, GL_TEXTURE_BORDER_COLOR, &gl::SamplerState::getBorderColor, &gl::SamplerState::setBorderColor);
>     // clang-format on
> }
> 
>@@ -72,4 +105,4 @@ GLuint SamplerGL::getSamplerID() const
> {
>     return mSamplerID;
> }
>-}
>+}  // namespace rx
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/SamplerGL.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/SamplerGL.h
>index 1c095cfd197..e876af9b70d 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/SamplerGL.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/SamplerGL.h
>@@ -37,6 +37,6 @@ class SamplerGL : public SamplerImpl
>     mutable gl::SamplerState mAppliedSamplerState;
>     GLuint mSamplerID;
> };
>-}
>+}  // namespace rx
> 
> #endif  // LIBANGLE_RENDERER_GL_SAMPLERGL_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/ShaderGL.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/ShaderGL.cpp
>index cc94f379828..19d40cc020d 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/ShaderGL.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/ShaderGL.cpp
>@@ -10,6 +10,7 @@
> 
> #include "common/debug.h"
> #include "libANGLE/Compiler.h"
>+#include "libANGLE/Context.h"
> #include "libANGLE/renderer/gl/FunctionsGL.h"
> #include "libANGLE/renderer/gl/RendererGL.h"
> #include "libANGLE/renderer/gl/WorkaroundsGL.h"
>@@ -19,163 +20,382 @@
> namespace rx
> {
> 
>+using CompileAndCheckShaderInWorkerFunctor = std::function<bool(const char *source)>;
>+class TranslateTaskGL : public angle::Closure
>+{
>+  public:
>+    TranslateTaskGL(ShHandle handle,
>+                    ShCompileOptions options,
>+                    const std::string &source,
>+                    CompileAndCheckShaderInWorkerFunctor &&compileAndCheckShaderInWorkerFunctor)
>+        : mHandle(handle),
>+          mOptions(options),
>+          mSource(source),
>+          mCompileAndCheckShaderInWorkerFunctor(std::move(compileAndCheckShaderInWorkerFunctor)),
>+          mResult(false),
>+          mWorkerAvailable(true)
>+    {}
>+
>+    void operator()() override
>+    {
>+        const char *source = mSource.c_str();
>+        mResult            = sh::Compile(mHandle, &source, 1, mOptions);
>+        if (mResult)
>+        {
>+            mWorkerAvailable =
>+                mCompileAndCheckShaderInWorkerFunctor(sh::GetObjectCode(mHandle).c_str());
>+        }
>+    }
>+
>+    bool getResult() { return mResult; }
>+
>+    bool workerAvailable() { return mWorkerAvailable; }
>+
>+    ShHandle getHandle() { return mHandle; }
>+
>+  private:
>+    ShHandle mHandle;
>+    ShCompileOptions mOptions;
>+    std::string mSource;
>+    CompileAndCheckShaderInWorkerFunctor mCompileAndCheckShaderInWorkerFunctor;
>+    bool mResult;
>+    bool mWorkerAvailable;
>+};
>+
>+using PostTranslateFunctor         = std::function<bool(std::string *infoLog)>;
>+using CompileAndCheckShaderFunctor = std::function<void(const char *source)>;
>+class WaitableCompileEventWorkerContext final : public WaitableCompileEvent
>+{
>+  public:
>+    WaitableCompileEventWorkerContext(std::shared_ptr<angle::WaitableEvent> waitableEvent,
>+                                      CompileAndCheckShaderFunctor &&compileAndCheckShaderFunctor,
>+                                      PostTranslateFunctor &&postTranslateFunctor,
>+                                      std::shared_ptr<TranslateTaskGL> translateTask)
>+        : WaitableCompileEvent(waitableEvent),
>+          mCompileAndCheckShaderFunctor(std::move(compileAndCheckShaderFunctor)),
>+          mPostTranslateFunctor(std::move(postTranslateFunctor)),
>+          mTranslateTask(translateTask)
>+    {}
>+
>+    bool getResult() override { return mTranslateTask->getResult(); }
>+
>+    bool postTranslate(std::string *infoLog) override
>+    {
>+        if (!mTranslateTask->workerAvailable())
>+        {
>+            ShHandle handle = mTranslateTask->getHandle();
>+            mCompileAndCheckShaderFunctor(sh::GetObjectCode(handle).c_str());
>+        }
>+        return mPostTranslateFunctor(infoLog);
>+    }
>+
>+  private:
>+    CompileAndCheckShaderFunctor mCompileAndCheckShaderFunctor;
>+    PostTranslateFunctor mPostTranslateFunctor;
>+    std::shared_ptr<TranslateTaskGL> mTranslateTask;
>+};
>+
>+using PeekCompletionFunctor = std::function<bool()>;
>+using CheckShaderFunctor    = std::function<void()>;
>+
>+class WaitableCompileEventNativeParallel final : public WaitableCompileEvent
>+{
>+  public:
>+    WaitableCompileEventNativeParallel(PostTranslateFunctor &&postTranslateFunctor,
>+                                       bool result,
>+                                       CheckShaderFunctor &&checkShaderFunctor,
>+                                       PeekCompletionFunctor &&peekCompletionFunctor)
>+        : WaitableCompileEvent(std::shared_ptr<angle::WaitableEventDone>()),
>+          mPostTranslateFunctor(std::move(postTranslateFunctor)),
>+          mResult(result),
>+          mCheckShaderFunctor(std::move(checkShaderFunctor)),
>+          mPeekCompletionFunctor(std::move(peekCompletionFunctor))
>+    {}
>+
>+    void wait() override { mCheckShaderFunctor(); }
>+
>+    bool isReady() override { return mPeekCompletionFunctor(); }
>+
>+    bool getResult() override { return mResult; }
>+
>+    bool postTranslate(std::string *infoLog) override { return mPostTranslateFunctor(infoLog); }
>+
>+  private:
>+    PostTranslateFunctor mPostTranslateFunctor;
>+    bool mResult;
>+    CheckShaderFunctor mCheckShaderFunctor;
>+    PeekCompletionFunctor mPeekCompletionFunctor;
>+};
>+
>+class WaitableCompileEventDone final : public WaitableCompileEvent
>+{
>+  public:
>+    WaitableCompileEventDone(PostTranslateFunctor &&postTranslateFunctor, bool result)
>+        : WaitableCompileEvent(std::make_shared<angle::WaitableEventDone>()),
>+          mPostTranslateFunctor(std::move(postTranslateFunctor)),
>+          mResult(result)
>+    {}
>+
>+    bool getResult() override { return mResult; }
>+
>+    bool postTranslate(std::string *infoLog) override { return mPostTranslateFunctor(infoLog); }
>+
>+  private:
>+    PostTranslateFunctor mPostTranslateFunctor;
>+    bool mResult;
>+};
>+
> ShaderGL::ShaderGL(const gl::ShaderState &data,
>-                   const FunctionsGL *functions,
>-                   const WorkaroundsGL &workarounds,
>-                   bool isWebGL,
>-                   MultiviewImplementationTypeGL multiviewImplementationType)
>+                   GLuint shaderID,
>+                   MultiviewImplementationTypeGL multiviewImplementationType,
>+                   const std::shared_ptr<RendererGL> &renderer)
>     : ShaderImpl(data),
>-      mFunctions(functions),
>-      mWorkarounds(workarounds),
>-      mShaderID(0),
>-      mIsWebGL(isWebGL),
>-      mMultiviewImplementationType(multiviewImplementationType)
>+      mShaderID(shaderID),
>+      mMultiviewImplementationType(multiviewImplementationType),
>+      mRenderer(renderer),
>+      mCompileStatus(GL_FALSE)
>+{}
>+
>+ShaderGL::~ShaderGL()
> {
>-    ASSERT(mFunctions);
>+    ASSERT(mShaderID == 0);
> }
> 
>-ShaderGL::~ShaderGL()
>+void ShaderGL::destroy()
>+{
>+    mRenderer->getFunctions()->deleteShader(mShaderID);
>+    mShaderID = 0;
>+}
>+
>+void ShaderGL::compileAndCheckShader(const char *source)
>+{
>+    compileShader(source);
>+    checkShader();
>+}
>+
>+void ShaderGL::compileShader(const char *source)
>+{
>+    const FunctionsGL *functions = mRenderer->getFunctions();
>+    functions->shaderSource(mShaderID, 1, &source, nullptr);
>+    functions->compileShader(mShaderID);
>+}
>+
>+void ShaderGL::checkShader()
>+{
>+    const FunctionsGL *functions = mRenderer->getFunctions();
>+
>+    // Check for compile errors from the native driver
>+    mCompileStatus = GL_FALSE;
>+    functions->getShaderiv(mShaderID, GL_COMPILE_STATUS, &mCompileStatus);
>+    if (mCompileStatus == GL_FALSE)
>+    {
>+        // Compilation failed, put the error into the info log
>+        GLint infoLogLength = 0;
>+        functions->getShaderiv(mShaderID, GL_INFO_LOG_LENGTH, &infoLogLength);
>+
>+        // Info log length includes the null terminator, so 1 means that the info log is an empty
>+        // string.
>+        if (infoLogLength > 1)
>+        {
>+            std::vector<char> buf(infoLogLength);
>+            functions->getShaderInfoLog(mShaderID, infoLogLength, nullptr, &buf[0]);
>+
>+            mInfoLog += &buf[0];
>+            WARN() << std::endl << mInfoLog;
>+        }
>+        else
>+        {
>+            WARN() << std::endl << "Shader compilation failed with no info log.";
>+        }
>+    }
>+}
>+
>+bool ShaderGL::peekCompletion()
> {
>-    if (mShaderID != 0)
>+    const FunctionsGL *functions = mRenderer->getFunctions();
>+    GLint status                 = GL_FALSE;
>+    functions->getShaderiv(mShaderID, GL_COMPLETION_STATUS, &status);
>+    return status == GL_TRUE;
>+}
>+
>+bool ShaderGL::compileAndCheckShaderInWorker(const char *source)
>+{
>+    std::string workerInfoLog;
>+    ScopedWorkerContextGL worker(mRenderer.get(), &workerInfoLog);
>+    if (worker())
>+    {
>+        compileAndCheckShader(source);
>+        return true;
>+    }
>+    else
>     {
>-        mFunctions->deleteShader(mShaderID);
>-        mShaderID = 0;
>+#if !defined(NDEBUG)
>+        mInfoLog += "bindWorkerContext failed.\n" + workerInfoLog;
>+#endif
>+        return false;
>     }
> }
> 
>-ShCompileOptions ShaderGL::prepareSourceAndReturnOptions(std::stringstream *sourceStream,
>-                                                         std::string * /*sourcePath*/)
>+std::shared_ptr<WaitableCompileEvent> ShaderGL::compile(const gl::Context *context,
>+                                                        gl::ShCompilerInstance *compilerInstance,
>+                                                        ShCompileOptions options)
> {
>-    // Reset the previous state
>-    if (mShaderID != 0)
>+    mInfoLog.clear();
>+
>+    ShCompileOptions additionalOptions = SH_INIT_GL_POSITION;
>+
>+    bool isWebGL = context->getExtensions().webglCompatibility;
>+    if (isWebGL && (mData.getShaderType() != gl::ShaderType::Compute))
>     {
>-        mFunctions->deleteShader(mShaderID);
>-        mShaderID = 0;
>+        additionalOptions |= SH_INIT_OUTPUT_VARIABLES;
>     }
> 
>-    *sourceStream << mData.getSource();
>+    const WorkaroundsGL &workarounds = GetWorkaroundsGL(context);
> 
>-    ShCompileOptions options = SH_INIT_GL_POSITION;
>+    if (workarounds.doWhileGLSLCausesGPUHang)
>+    {
>+        additionalOptions |= SH_REWRITE_DO_WHILE_LOOPS;
>+    }
> 
>-    if (mIsWebGL)
>+    if (workarounds.emulateAbsIntFunction)
>     {
>-        options |= SH_INIT_OUTPUT_VARIABLES;
>+        additionalOptions |= SH_EMULATE_ABS_INT_FUNCTION;
>     }
> 
>-    if (mWorkarounds.doWhileGLSLCausesGPUHang)
>+    if (workarounds.addAndTrueToLoopCondition)
>     {
>-        options |= SH_REWRITE_DO_WHILE_LOOPS;
>+        additionalOptions |= SH_ADD_AND_TRUE_TO_LOOP_CONDITION;
>     }
> 
>-    if (mWorkarounds.emulateAbsIntFunction)
>+    if (workarounds.emulateIsnanFloat)
>     {
>-        options |= SH_EMULATE_ABS_INT_FUNCTION;
>+        additionalOptions |= SH_EMULATE_ISNAN_FLOAT_FUNCTION;
>     }
> 
>-    if (mWorkarounds.addAndTrueToLoopCondition)
>+    if (workarounds.emulateAtan2Float)
>     {
>-        options |= SH_ADD_AND_TRUE_TO_LOOP_CONDITION;
>+        additionalOptions |= SH_EMULATE_ATAN2_FLOAT_FUNCTION;
>     }
> 
>-    if (mWorkarounds.emulateIsnanFloat)
>+    if (workarounds.useUnusedBlocksWithStandardOrSharedLayout)
>     {
>-        options |= SH_EMULATE_ISNAN_FLOAT_FUNCTION;
>+        additionalOptions |= SH_USE_UNUSED_STANDARD_SHARED_BLOCKS;
>     }
> 
>-    if (mWorkarounds.emulateAtan2Float)
>+    if (workarounds.dontRemoveInvariantForFragmentInput)
>     {
>-        options |= SH_EMULATE_ATAN2_FLOAT_FUNCTION;
>+        additionalOptions |= SH_DONT_REMOVE_INVARIANT_FOR_FRAGMENT_INPUT;
>     }
> 
>-    if (mWorkarounds.useUnusedBlocksWithStandardOrSharedLayout)
>+    if (workarounds.removeInvariantAndCentroidForESSL3)
>     {
>-        options |= SH_USE_UNUSED_STANDARD_SHARED_BLOCKS;
>+        additionalOptions |= SH_REMOVE_INVARIANT_AND_CENTROID_FOR_ESSL3;
>     }
> 
>-    if (mWorkarounds.dontRemoveInvariantForFragmentInput)
>+    if (workarounds.rewriteFloatUnaryMinusOperator)
>     {
>-        options |= SH_DONT_REMOVE_INVARIANT_FOR_FRAGMENT_INPUT;
>+        additionalOptions |= SH_REWRITE_FLOAT_UNARY_MINUS_OPERATOR;
>     }
> 
>-    if (mWorkarounds.removeInvariantAndCentroidForESSL3)
>+    if (!workarounds.dontInitializeUninitializedLocals)
>     {
>-        options |= SH_REMOVE_INVARIANT_AND_CENTROID_FOR_ESSL3;
>+        additionalOptions |= SH_INITIALIZE_UNINITIALIZED_LOCALS;
>     }
> 
>-    if (mWorkarounds.rewriteFloatUnaryMinusOperator)
>+    if (workarounds.clampPointSize)
>     {
>-        options |= SH_REWRITE_FLOAT_UNARY_MINUS_OPERATOR;
>+        additionalOptions |= SH_CLAMP_POINT_SIZE;
>     }
> 
>-    if (!mWorkarounds.dontInitializeUninitializedLocals)
>+    if (workarounds.rewriteVectorScalarArithmetic)
>     {
>-        options |= SH_INITIALIZE_UNINITIALIZED_LOCALS;
>+        additionalOptions |= SH_REWRITE_VECTOR_SCALAR_ARITHMETIC;
>     }
> 
>-    if (mWorkarounds.clampPointSize)
>+    if (workarounds.dontUseLoopsToInitializeVariables)
>     {
>-        options |= SH_CLAMP_POINT_SIZE;
>+        additionalOptions |= SH_DONT_USE_LOOPS_TO_INITIALIZE_VARIABLES;
>     }
> 
>-    if (mWorkarounds.rewriteVectorScalarArithmetic)
>+    if (workarounds.clampFragDepth)
>     {
>-        options |= SH_REWRITE_VECTOR_SCALAR_ARITHMETIC;
>+        additionalOptions |= SH_CLAMP_FRAG_DEPTH;
>     }
> 
>-    if (mWorkarounds.dontUseLoopsToInitializeVariables)
>+    if (workarounds.rewriteRepeatedAssignToSwizzled)
>     {
>-        options |= SH_DONT_USE_LOOPS_TO_INITIALIZE_VARIABLES;
>+        additionalOptions |= SH_REWRITE_REPEATED_ASSIGN_TO_SWIZZLED;
>     }
> 
>     if (mMultiviewImplementationType == MultiviewImplementationTypeGL::NV_VIEWPORT_ARRAY2)
>     {
>-        options |= SH_INITIALIZE_BUILTINS_FOR_INSTANCED_MULTIVIEW;
>-        options |= SH_SELECT_VIEW_IN_NV_GLSL_VERTEX_SHADER;
>+        additionalOptions |= SH_INITIALIZE_BUILTINS_FOR_INSTANCED_MULTIVIEW;
>+        additionalOptions |= SH_SELECT_VIEW_IN_NV_GLSL_VERTEX_SHADER;
>     }
> 
>-    return options;
>-}
>-
>-bool ShaderGL::postTranslateCompile(gl::Compiler *compiler, std::string *infoLog)
>-{
>-    // Translate the ESSL into GLSL
>-    const char *translatedSourceCString = mData.getTranslatedSource().c_str();
>+    options |= additionalOptions;
> 
>-    // Generate a shader object and set the source
>-    mShaderID = mFunctions->createShader(mData.getShaderType());
>-    mFunctions->shaderSource(mShaderID, 1, &translatedSourceCString, nullptr);
>-    mFunctions->compileShader(mShaderID);
>+    auto workerThreadPool = context->getWorkerThreadPool();
> 
>-    // Check for compile errors from the native driver
>-    GLint compileStatus = GL_FALSE;
>-    mFunctions->getShaderiv(mShaderID, GL_COMPILE_STATUS, &compileStatus);
>-    if (compileStatus == GL_FALSE)
>-    {
>-        // Compilation failed, put the error into the info log
>-        GLint infoLogLength = 0;
>-        mFunctions->getShaderiv(mShaderID, GL_INFO_LOG_LENGTH, &infoLogLength);
>+    const std::string &source = mData.getSource();
> 
>-        // Info log length includes the null terminator, so 1 means that the info log is an empty
>-        // string.
>-        if (infoLogLength > 1)
>+    auto postTranslateFunctor = [this](std::string *infoLog) {
>+        if (mCompileStatus == GL_FALSE)
>         {
>-            std::vector<char> buf(infoLogLength);
>-            mFunctions->getShaderInfoLog(mShaderID, infoLogLength, nullptr, &buf[0]);
>-
>-            mFunctions->deleteShader(mShaderID);
>-            mShaderID = 0;
>+            *infoLog = mInfoLog;
>+            return false;
>+        }
>+        return true;
>+    };
> 
>-            *infoLog = &buf[0];
>-            WARN() << std::endl << *infoLog;
>+    if (mRenderer->hasNativeParallelCompile())
>+    {
>+        ShHandle handle = compilerInstance->getHandle();
>+        const char *str = source.c_str();
>+        bool result     = sh::Compile(handle, &str, 1, options);
>+        if (result)
>+        {
>+            compileShader(sh::GetObjectCode(handle).c_str());
>+            auto checkShaderFunctor    = [this]() { checkShader(); };
>+            auto peekCompletionFunctor = [this]() { return peekCompletion(); };
>+            return std::make_shared<WaitableCompileEventNativeParallel>(
>+                std::move(postTranslateFunctor), result, std::move(checkShaderFunctor),
>+                std::move(peekCompletionFunctor));
>         }
>         else
>         {
>-            WARN() << std::endl << "Shader compilation failed with no info log.";
>+            return std::make_shared<WaitableCompileEventDone>([](std::string *) { return true; },
>+                                                              result);
>         }
>-        return false;
>     }
>-
>-    return true;
>+    else if (workerThreadPool->isAsync())
>+    {
>+        auto compileAndCheckShaderInWorkerFunctor = [this](const char *source) {
>+            return compileAndCheckShaderInWorker(source);
>+        };
>+        auto translateTask =
>+            std::make_shared<TranslateTaskGL>(compilerInstance->getHandle(), options, source,
>+                                              std::move(compileAndCheckShaderInWorkerFunctor));
>+
>+        auto compileAndCheckShaderFunctor = [this](const char *source) {
>+            compileAndCheckShader(source);
>+        };
>+        return std::make_shared<WaitableCompileEventWorkerContext>(
>+            angle::WorkerThreadPool::PostWorkerTask(workerThreadPool, translateTask),
>+            std::move(compileAndCheckShaderFunctor), std::move(postTranslateFunctor),
>+            translateTask);
>+    }
>+    else
>+    {
>+        ShHandle handle = compilerInstance->getHandle();
>+        const char *str = source.c_str();
>+        bool result     = sh::Compile(handle, &str, 1, options);
>+        if (result)
>+        {
>+            compileAndCheckShader(sh::GetObjectCode(handle).c_str());
>+        }
>+        return std::make_shared<WaitableCompileEventDone>(std::move(postTranslateFunctor), result);
>+    }
> }
> 
> std::string ShaderGL::getDebugInfo() const
>@@ -188,4 +408,4 @@ GLuint ShaderGL::getShaderID() const
>     return mShaderID;
> }
> 
>-}
>+}  // namespace rx
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/ShaderGL.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/ShaderGL.h
>index bfe01f24f49..b767103abd5 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/ShaderGL.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/ShaderGL.h
>@@ -13,7 +13,7 @@
> 
> namespace rx
> {
>-class FunctionsGL;
>+class RendererGL;
> struct WorkaroundsGL;
> enum class MultiviewImplementationTypeGL;
> 
>@@ -21,29 +21,35 @@ class ShaderGL : public ShaderImpl
> {
>   public:
>     ShaderGL(const gl::ShaderState &data,
>-             const FunctionsGL *functions,
>-             const WorkaroundsGL &workarounds,
>-             bool isWebGL,
>-             MultiviewImplementationTypeGL multiviewImplementationType);
>+             GLuint shaderID,
>+             MultiviewImplementationTypeGL multiviewImplementationType,
>+             const std::shared_ptr<RendererGL> &renderer);
>     ~ShaderGL() override;
> 
>-    // ShaderImpl implementation
>-    ShCompileOptions prepareSourceAndReturnOptions(std::stringstream *sourceStream,
>-                                                   std::string *sourcePath) override;
>-    bool postTranslateCompile(gl::Compiler *compiler, std::string *infoLog) override;
>+    void destroy() override;
>+
>+    std::shared_ptr<WaitableCompileEvent> compile(const gl::Context *context,
>+                                                  gl::ShCompilerInstance *compilerInstance,
>+                                                  ShCompileOptions options) override;
>+
>     std::string getDebugInfo() const override;
> 
>     GLuint getShaderID() const;
> 
>   private:
>-    const FunctionsGL *mFunctions;
>-    const WorkaroundsGL &mWorkarounds;
>+    void compileAndCheckShader(const char *source);
>+    void compileShader(const char *source);
>+    void checkShader();
>+    bool peekCompletion();
>+    bool compileAndCheckShaderInWorker(const char *source);
> 
>     GLuint mShaderID;
>-    bool mIsWebGL;
>     MultiviewImplementationTypeGL mMultiviewImplementationType;
>+    std::shared_ptr<RendererGL> mRenderer;
>+    GLint mCompileStatus;
>+    std::string mInfoLog;
> };
> 
>-}
>+}  // namespace rx
> 
>-#endif // LIBANGLE_RENDERER_GL_SHADERGL_H_
>+#endif  // LIBANGLE_RENDERER_GL_SHADERGL_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/StateManagerGL.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/StateManagerGL.cpp
>index acfb78de7fc..c5b7487f1e6 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/StateManagerGL.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/StateManagerGL.cpp
>@@ -12,6 +12,7 @@
> #include <algorithm>
> #include <limits>
> 
>+#include "anglebase/numerics/safe_conversions.h"
> #include "common/bitset_utils.h"
> #include "common/mathutil.h"
> #include "common/matrix_utils.h"
>@@ -33,43 +34,7 @@
> namespace rx
> {
> 
>-static const GLenum QueryTypes[] = {GL_ANY_SAMPLES_PASSED, GL_ANY_SAMPLES_PASSED_CONSERVATIVE,
>-                                    GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN, GL_TIME_ELAPSED,
>-                                    GL_COMMANDS_COMPLETED_CHROMIUM};
>-
>-StateManagerGL::IndexedBufferBinding::IndexedBufferBinding() : offset(0), size(0), buffer(0)
>-{
>-}
>-
>-namespace
>-{
>-bool AllRectanglesMatch(const gl::Rectangle &matchingRectangle,
>-                        const std::vector<gl::Rectangle> &rectangles)
>-{
>-    for (const auto &rect : rectangles)
>-    {
>-        if (matchingRectangle != rect)
>-        {
>-            return false;
>-        }
>-    }
>-    return true;
>-}
>-
>-std::vector<gl::Rectangle> ApplyOffsets(const gl::Rectangle &modifiableRectangle,
>-                                        const std::vector<gl::Offset> &offsets)
>-{
>-    std::vector<gl::Rectangle> result;
>-    result.reserve(offsets.size());
>-    for (size_t i = 0u; i < offsets.size(); ++i)
>-    {
>-        result.emplace_back(gl::Rectangle(modifiableRectangle.x + offsets[i].x,
>-                                          modifiableRectangle.y + offsets[i].y,
>-                                          modifiableRectangle.width, modifiableRectangle.height));
>-    }
>-    return result;
>-}
>-}  // namespace
>+StateManagerGL::IndexedBufferBinding::IndexedBufferBinding() : offset(0), size(0), buffer(0) {}
> 
> StateManagerGL::StateManagerGL(const FunctionsGL *functions,
>                                const gl::Caps &rendererCaps,
>@@ -81,13 +46,12 @@ StateManagerGL::StateManagerGL(const FunctionsGL *functions,
>       mBuffers(),
>       mIndexedBuffers(),
>       mTextureUnitIndex(0),
>-      mTextures(),
>-      mSamplers(rendererCaps.maxCombinedTextureImageUnits, 0),
>+      mTextures{},
>+      mSamplers{},
>       mImages(rendererCaps.maxImageUnits, ImageUnitBinding()),
>       mTransformFeedback(0),
>+      mCurrentTransformFeedback(nullptr),
>       mQueries(),
>-      mPrevDrawTransformFeedback(nullptr),
>-      mCurrentQueries(),
>       mPrevDrawContext(0),
>       mUnpackAlignment(4),
>       mUnpackRowLength(0),
>@@ -102,9 +66,8 @@ StateManagerGL::StateManagerGL(const FunctionsGL *functions,
>       mFramebuffers(angle::FramebufferBindingSingletonMax, 0),
>       mRenderbuffer(0),
>       mScissorTestEnabled(false),
>-      mScissors(extensions.maxViews),
>-      mViewports(extensions.maxViews),
>-      mViewportOffsets(extensions.maxViews),
>+      mScissor(0, 0, 0, 0),
>+      mViewport(0, 0, 0, 0),
>       mNear(0.0f),
>       mFar(1.0f),
>       mBlendEnabled(false),
>@@ -163,22 +126,13 @@ StateManagerGL::StateManagerGL(const FunctionsGL *functions,
>       mPathStencilFunc(GL_ALWAYS),
>       mPathStencilRef(0),
>       mPathStencilMask(std::numeric_limits<GLuint>::max()),
>-      mIsSideBySideDrawFramebuffer(false),
>-      mIsMultiviewEnabled(extensions.multiview),
>-      mLocalDirtyBits(),
>-      mMultiviewDirtyBits(),
>-      mProgramTexturesAndSamplersDirty(true)
>+      mIsMultiviewEnabled(extensions.multiview2),
>+      mProvokingVertex(GL_LAST_VERTEX_CONVENTION),
>+      mLocalDirtyBits()
> {
>     ASSERT(mFunctions);
>     ASSERT(extensions.maxViews >= 1u);
> 
>-    mTextures[GL_TEXTURE_2D].resize(rendererCaps.maxCombinedTextureImageUnits);
>-    mTextures[GL_TEXTURE_RECTANGLE_ANGLE].resize(rendererCaps.maxCombinedTextureImageUnits);
>-    mTextures[GL_TEXTURE_CUBE_MAP].resize(rendererCaps.maxCombinedTextureImageUnits);
>-    mTextures[GL_TEXTURE_2D_ARRAY].resize(rendererCaps.maxCombinedTextureImageUnits);
>-    mTextures[GL_TEXTURE_3D].resize(rendererCaps.maxCombinedTextureImageUnits);
>-    mTextures[GL_TEXTURE_2D_MULTISAMPLE].resize(rendererCaps.maxCombinedTextureImageUnits);
>-
>     mIndexedBuffers[gl::BufferBinding::Uniform].resize(rendererCaps.maxUniformBufferBindings);
>     mIndexedBuffers[gl::BufferBinding::AtomicCounter].resize(
>         rendererCaps.maxAtomicCounterBufferBindings);
>@@ -187,10 +141,8 @@ StateManagerGL::StateManagerGL(const FunctionsGL *functions,
> 
>     mSampleMaskValues.fill(~GLbitfield(0));
> 
>-    for (GLenum queryType : QueryTypes)
>-    {
>-        mQueries[queryType] = 0;
>-    }
>+    mQueries.fill(nullptr);
>+    mTemporaryPausedQueries.fill(nullptr);
> 
>     // Initialize point sprite state for desktop GL
>     if (mFunctions->standard == STANDARD_GL_DESKTOP)
>@@ -210,9 +162,7 @@ StateManagerGL::StateManagerGL(const FunctionsGL *functions,
>     angle::Matrix<GLfloat>::setToIdentity(mPathMatrixMV);
> }
> 
>-StateManagerGL::~StateManagerGL()
>-{
>-}
>+StateManagerGL::~StateManagerGL() {}
> 
> void StateManagerGL::deleteProgram(GLuint program)
> {
>@@ -244,16 +194,16 @@ void StateManagerGL::deleteTexture(GLuint texture)
> {
>     if (texture != 0)
>     {
>-        for (const auto &textureTypeIter : mTextures)
>+        for (gl::TextureType type : angle::AllEnums<gl::TextureType>())
>         {
>-            const std::vector<GLuint> &textureVector = textureTypeIter.second;
>+            const auto &textureVector = mTextures[type];
>             for (size_t textureUnitIndex = 0; textureUnitIndex < textureVector.size();
>                  textureUnitIndex++)
>             {
>                 if (textureVector[textureUnitIndex] == texture)
>                 {
>                     activeTexture(textureUnitIndex);
>-                    bindTexture(textureTypeIter.first, 0);
>+                    bindTexture(type, 0);
>                 }
>             }
>         }
>@@ -262,8 +212,7 @@ void StateManagerGL::deleteTexture(GLuint texture)
>         {
>             if (mImages[imageUnitIndex].texture == texture)
>             {
>-                bindImageTexture(static_cast<GLuint>(imageUnitIndex), 0, 0, false, 0, GL_READ_ONLY,
>-                                 GL_R32UI);
>+                bindImageTexture(imageUnitIndex, 0, 0, false, 0, GL_READ_ONLY, GL_R32UI);
>             }
>         }
> 
>@@ -353,32 +302,16 @@ void StateManagerGL::deleteTransformFeedback(GLuint transformFeedback)
>             bindTransformFeedback(GL_TRANSFORM_FEEDBACK, 0);
>         }
> 
>-        if (mPrevDrawTransformFeedback != nullptr &&
>-            mPrevDrawTransformFeedback->getTransformFeedbackID() == transformFeedback)
>+        if (mCurrentTransformFeedback != nullptr &&
>+            mCurrentTransformFeedback->getTransformFeedbackID() == transformFeedback)
>         {
>-            mPrevDrawTransformFeedback = nullptr;
>+            mCurrentTransformFeedback = nullptr;
>         }
> 
>         mFunctions->deleteTransformFeedbacks(1, &transformFeedback);
>     }
> }
> 
>-void StateManagerGL::deleteQuery(GLuint query)
>-{
>-    if (query != 0)
>-    {
>-        for (auto &activeQuery : mQueries)
>-        {
>-            GLuint activeQueryID = activeQuery.second;
>-            if (activeQueryID == query)
>-            {
>-                GLenum type = activeQuery.first;
>-                endQuery(type, query);
>-            }
>-        }
>-    }
>-}
>-
> void StateManagerGL::useProgram(GLuint program)
> {
>     if (mProgram != program)
>@@ -408,6 +341,10 @@ void StateManagerGL::bindVertexArray(GLuint vao, GLuint elementArrayBuffer)
> 
> void StateManagerGL::bindBuffer(gl::BufferBinding target, GLuint buffer)
> {
>+    // GL drivers differ in whether the transform feedback bind point is modified when
>+    // glBindTransformFeedback is called. To avoid these behavior differences we shouldn't try to
>+    // use it.
>+    ASSERT(target != gl::BufferBinding::TransformFeedback);
>     if (mBuffers[target] != buffer)
>     {
>         mBuffers[target] = buffer;
>@@ -455,12 +392,12 @@ void StateManagerGL::activeTexture(size_t unit)
>     }
> }
> 
>-void StateManagerGL::bindTexture(GLenum type, GLuint texture)
>+void StateManagerGL::bindTexture(gl::TextureType type, GLuint texture)
> {
>     if (mTextures[type][mTextureUnitIndex] != texture)
>     {
>         mTextures[type][mTextureUnitIndex] = texture;
>-        mFunctions->bindTexture(type, texture);
>+        mFunctions->bindTexture(ToGLenum(type), texture);
>         mLocalDirtyBits.set(gl::State::DIRTY_BIT_TEXTURE_BINDINGS);
>     }
> }
>@@ -475,7 +412,7 @@ void StateManagerGL::bindSampler(size_t unit, GLuint sampler)
>     }
> }
> 
>-void StateManagerGL::bindImageTexture(GLuint unit,
>+void StateManagerGL::bindImageTexture(size_t unit,
>                                       GLuint texture,
>                                       GLint level,
>                                       GLboolean layered,
>@@ -493,7 +430,8 @@ void StateManagerGL::bindImageTexture(GLuint unit,
>         binding.layer   = layer;
>         binding.access  = access;
>         binding.format  = format;
>-        mFunctions->bindImageTexture(unit, texture, level, layered, layer, access, format);
>+        mFunctions->bindImageTexture(angle::base::checked_cast<GLuint>(unit), texture, level,
>+                                     layered, layer, access, format);
>     }
> }
> 
>@@ -605,25 +543,44 @@ void StateManagerGL::setPixelPackBuffer(const gl::Buffer *pixelBuffer)
> 
> void StateManagerGL::bindFramebuffer(GLenum type, GLuint framebuffer)
> {
>-    if (type == GL_FRAMEBUFFER)
>+    switch (type)
>     {
>-        if (mFramebuffers[angle::FramebufferBindingRead] != framebuffer ||
>-            mFramebuffers[angle::FramebufferBindingDraw] != framebuffer)
>-        {
>-            mFramebuffers[angle::FramebufferBindingRead] = framebuffer;
>-            mFramebuffers[angle::FramebufferBindingDraw] = framebuffer;
>-            mFunctions->bindFramebuffer(GL_FRAMEBUFFER, framebuffer);
>-        }
>-    }
>-    else
>-    {
>-        angle::FramebufferBinding binding = angle::EnumToFramebufferBinding(type);
>+        case GL_FRAMEBUFFER:
>+            if (mFramebuffers[angle::FramebufferBindingRead] != framebuffer ||
>+                mFramebuffers[angle::FramebufferBindingDraw] != framebuffer)
>+            {
>+                mFramebuffers[angle::FramebufferBindingRead] = framebuffer;
>+                mFramebuffers[angle::FramebufferBindingDraw] = framebuffer;
>+                mFunctions->bindFramebuffer(GL_FRAMEBUFFER, framebuffer);
> 
>-        if (mFramebuffers[binding] != framebuffer)
>-        {
>-            mFramebuffers[binding] = framebuffer;
>-            mFunctions->bindFramebuffer(type, framebuffer);
>-        }
>+                mLocalDirtyBits.set(gl::State::DIRTY_BIT_READ_FRAMEBUFFER_BINDING);
>+                mLocalDirtyBits.set(gl::State::DIRTY_BIT_DRAW_FRAMEBUFFER_BINDING);
>+            }
>+            break;
>+
>+        case GL_READ_FRAMEBUFFER:
>+            if (mFramebuffers[angle::FramebufferBindingRead] != framebuffer)
>+            {
>+                mFramebuffers[angle::FramebufferBindingRead] = framebuffer;
>+                mFunctions->bindFramebuffer(GL_READ_FRAMEBUFFER, framebuffer);
>+
>+                mLocalDirtyBits.set(gl::State::DIRTY_BIT_READ_FRAMEBUFFER_BINDING);
>+            }
>+            break;
>+
>+        case GL_DRAW_FRAMEBUFFER:
>+            if (mFramebuffers[angle::FramebufferBindingDraw] != framebuffer)
>+            {
>+                mFramebuffers[angle::FramebufferBindingDraw] = framebuffer;
>+                mFunctions->bindFramebuffer(GL_DRAW_FRAMEBUFFER, framebuffer);
>+
>+                mLocalDirtyBits.set(gl::State::DIRTY_BIT_DRAW_FRAMEBUFFER_BINDING);
>+            }
>+            break;
>+
>+        default:
>+            UNREACHABLE();
>+            break;
>     }
> }
> 
>@@ -645,212 +602,256 @@ void StateManagerGL::bindTransformFeedback(GLenum type, GLuint transformFeedback
>         // Pause the current transform feedback if one is active.
>         // To handle virtualized contexts, StateManagerGL needs to be able to bind a new transform
>         // feedback at any time, even if there is one active.
>-        if (mPrevDrawTransformFeedback != nullptr &&
>-            mPrevDrawTransformFeedback->getTransformFeedbackID() != transformFeedback)
>+        if (mCurrentTransformFeedback != nullptr &&
>+            mCurrentTransformFeedback->getTransformFeedbackID() != transformFeedback)
>         {
>-            mPrevDrawTransformFeedback->syncPausedState(true);
>-            mPrevDrawTransformFeedback = nullptr;
>+            mCurrentTransformFeedback->syncPausedState(true);
>+            mCurrentTransformFeedback = nullptr;
>         }
> 
>         mTransformFeedback = transformFeedback;
>         mFunctions->bindTransformFeedback(type, mTransformFeedback);
>+        onTransformFeedbackStateChange();
>     }
> }
> 
>-void StateManagerGL::beginQuery(GLenum type, GLuint query)
>+void StateManagerGL::onTransformFeedbackStateChange()
>+{
>+    mLocalDirtyBits.set(gl::State::DIRTY_BIT_TRANSFORM_FEEDBACK_BINDING);
>+}
>+
>+void StateManagerGL::beginQuery(gl::QueryType type, QueryGL *queryObject, GLuint queryId)
> {
>     // Make sure this is a valid query type and there is no current active query of this type
>-    ASSERT(mQueries.find(type) != mQueries.end());
>-    ASSERT(mQueries[type] == 0);
>-    ASSERT(query != 0);
>+    ASSERT(mQueries[type] == nullptr);
>+    ASSERT(queryId != 0);
> 
>-    mQueries[type] = query;
>-    mFunctions->beginQuery(type, query);
>+    mQueries[type] = queryObject;
>+    mFunctions->beginQuery(ToGLenum(type), queryId);
> }
> 
>-void StateManagerGL::endQuery(GLenum type, GLuint query)
>+void StateManagerGL::endQuery(gl::QueryType type, QueryGL *queryObject, GLuint queryId)
> {
>-    ASSERT(mQueries[type] == query);
>-    mQueries[type] = 0;
>-    mFunctions->endQuery(type);
>+    ASSERT(queryObject != nullptr);
>+    ASSERT(mQueries[type] == queryObject);
>+    mQueries[type] = nullptr;
>+    mFunctions->endQuery(ToGLenum(type));
> }
> 
>-void StateManagerGL::onBeginQuery(QueryGL *query)
>+void StateManagerGL::updateDrawIndirectBufferBinding(const gl::Context *context)
> {
>-    mCurrentQueries.insert(query);
>+    gl::Buffer *drawIndirectBuffer =
>+        context->getState().getTargetBuffer(gl::BufferBinding::DrawIndirect);
>+    if (drawIndirectBuffer != nullptr)
>+    {
>+        const BufferGL *bufferGL = GetImplAs<BufferGL>(drawIndirectBuffer);
>+        bindBuffer(gl::BufferBinding::DrawIndirect, bufferGL->getBufferID());
>+    }
> }
> 
>-void StateManagerGL::onDeleteQueryObject(QueryGL *query)
>+void StateManagerGL::updateDispatchIndirectBufferBinding(const gl::Context *context)
> {
>-    mCurrentQueries.erase(query);
>+    gl::Buffer *dispatchIndirectBuffer =
>+        context->getState().getTargetBuffer(gl::BufferBinding::DispatchIndirect);
>+    if (dispatchIndirectBuffer != nullptr)
>+    {
>+        const BufferGL *bufferGL = GetImplAs<BufferGL>(dispatchIndirectBuffer);
>+        bindBuffer(gl::BufferBinding::DispatchIndirect, bufferGL->getBufferID());
>+    }
> }
> 
>-gl::Error StateManagerGL::setDrawArraysState(const gl::Context *context,
>-                                             GLint first,
>-                                             GLsizei count,
>-                                             GLsizei instanceCount)
>+void StateManagerGL::pauseTransformFeedback()
> {
>-    const gl::State &glState = context->getGLState();
>-
>-    const gl::Program *program = glState.getProgram();
>-
>-    const gl::VertexArray *vao = glState.getVertexArray();
>-    const VertexArrayGL *vaoGL = GetImplAs<VertexArrayGL>(vao);
>+    if (mCurrentTransformFeedback != nullptr)
>+    {
>+        mCurrentTransformFeedback->syncPausedState(true);
>+        onTransformFeedbackStateChange();
>+    }
>+}
> 
>-    ANGLE_TRY(vaoGL->syncDrawArraysState(context, program->getActiveAttribLocationsMask(), first,
>-                                         count, instanceCount));
>+angle::Result StateManagerGL::pauseAllQueries(const gl::Context *context)
>+{
>+    for (gl::QueryType type : angle::AllEnums<gl::QueryType>())
>+    {
>+        QueryGL *previousQuery = mQueries[type];
> 
>-    bindVertexArray(vaoGL->getVertexArrayID(), vaoGL->getAppliedElementArrayBufferID());
>+        if (previousQuery != nullptr)
>+        {
>+            ANGLE_TRY(previousQuery->pause(context));
>+            mTemporaryPausedQueries[type] = previousQuery;
>+            mQueries[type]                = nullptr;
>+        }
>+    }
> 
>-    return setGenericDrawState(context);
>+    return angle::Result::Continue;
> }
> 
>-gl::Error StateManagerGL::setDrawElementsState(const gl::Context *context,
>-                                               GLsizei count,
>-                                               GLenum type,
>-                                               const void *indices,
>-                                               GLsizei instanceCount,
>-                                               const void **outIndices)
>+angle::Result StateManagerGL::pauseQuery(const gl::Context *context, gl::QueryType type)
> {
>-    const gl::State &glState = context->getGLState();
>-
>-    const gl::Program *program = glState.getProgram();
>+    QueryGL *previousQuery = mQueries[type];
> 
>-    const gl::VertexArray *vao = glState.getVertexArray();
>-    const VertexArrayGL *vaoGL = GetImplAs<VertexArrayGL>(vao);
>-
>-    gl::Error error = vaoGL->syncDrawElementsState(context, program->getActiveAttribLocationsMask(),
>-                                                   count, type, indices, instanceCount,
>-                                                   glState.isPrimitiveRestartEnabled(), outIndices);
>-    if (error.isError())
>+    if (previousQuery)
>     {
>-        return error;
>+        ANGLE_TRY(previousQuery->pause(context));
>+        mTemporaryPausedQueries[type] = previousQuery;
>+        mQueries[type]                = nullptr;
>     }
> 
>-    bindVertexArray(vaoGL->getVertexArrayID(), vaoGL->getAppliedElementArrayBufferID());
>-
>-    return setGenericDrawState(context);
>+    return angle::Result::Continue;
> }
> 
>-gl::Error StateManagerGL::setDrawIndirectState(const gl::Context *context, GLenum type)
>+angle::Result StateManagerGL::resumeAllQueries(const gl::Context *context)
> {
>-    const gl::State &glState = context->getGLState();
>-
>-    const gl::VertexArray *vao = glState.getVertexArray();
>-    const VertexArrayGL *vaoGL = GetImplAs<VertexArrayGL>(vao);
>-
>-    if (type != GL_NONE)
>+    for (gl::QueryType type : angle::AllEnums<gl::QueryType>())
>     {
>-        ANGLE_TRY(vaoGL->syncElementArrayState(context));
>-    }
>-    bindVertexArray(vaoGL->getVertexArrayID(), vaoGL->getAppliedElementArrayBufferID());
>+        QueryGL *pausedQuery = mTemporaryPausedQueries[type];
> 
>-    gl::Buffer *drawIndirectBuffer = glState.getTargetBuffer(gl::BufferBinding::DrawIndirect);
>-    ASSERT(drawIndirectBuffer);
>-    const BufferGL *bufferGL = GetImplAs<BufferGL>(drawIndirectBuffer);
>-    bindBuffer(gl::BufferBinding::DrawIndirect, bufferGL->getBufferID());
>+        if (pausedQuery != nullptr)
>+        {
>+            ASSERT(mQueries[type] == nullptr);
>+            ANGLE_TRY(pausedQuery->resume(context));
>+            mTemporaryPausedQueries[type] = nullptr;
>+        }
>+    }
> 
>-    return setGenericDrawState(context);
>+    return angle::Result::Continue;
> }
> 
>-gl::Error StateManagerGL::setDispatchComputeState(const gl::Context *context)
>+angle::Result StateManagerGL::resumeQuery(const gl::Context *context, gl::QueryType type)
> {
>-    setGenericShaderState(context);
>-    return gl::NoError();
>-}
>+    QueryGL *pausedQuery = mTemporaryPausedQueries[type];
> 
>-void StateManagerGL::pauseTransformFeedback()
>-{
>-    if (mPrevDrawTransformFeedback != nullptr)
>+    if (pausedQuery != nullptr)
>     {
>-        mPrevDrawTransformFeedback->syncPausedState(true);
>+        ANGLE_TRY(pausedQuery->resume(context));
>+        mTemporaryPausedQueries[type] = nullptr;
>     }
>+
>+    return angle::Result::Continue;
> }
> 
>-gl::Error StateManagerGL::pauseAllQueries()
>+angle::Result StateManagerGL::onMakeCurrent(const gl::Context *context)
> {
>-    for (QueryGL *prevQuery : mCurrentQueries)
>+    const gl::State &glState = context->getState();
>+
>+#if defined(ANGLE_ENABLE_ASSERTS)
>+    // Temporarily pausing queries during context switch is not supported
>+    for (QueryGL *pausedQuery : mTemporaryPausedQueries)
>     {
>-        ANGLE_TRY(prevQuery->pause());
>+        ASSERT(pausedQuery == nullptr);
>     }
>-    return gl::NoError();
>-}
>+#endif
> 
>-gl::Error StateManagerGL::pauseQuery(GLenum type)
>-{
>-    for (QueryGL *prevQuery : mCurrentQueries)
>+    // If the context has changed, pause the previous context's queries
>+    auto contextID = context->getState().getContextID();
>+    if (contextID != mPrevDrawContext)
>     {
>-        if (prevQuery->getType() == type)
>+        for (gl::QueryType type : angle::AllEnums<gl::QueryType>())
>         {
>-            ANGLE_TRY(prevQuery->pause());
>+            QueryGL *currentQuery = mQueries[type];
>+            // Pause any old query object
>+            if (currentQuery != nullptr)
>+            {
>+                ANGLE_TRY(currentQuery->pause(context));
>+                mQueries[type] = nullptr;
>+            }
>+
>+            // Check if this new context needs to resume a query
>+            gl::Query *newQuery = glState.getActiveQuery(type);
>+            if (newQuery != nullptr)
>+            {
>+                QueryGL *queryGL = GetImplAs<QueryGL>(newQuery);
>+                ANGLE_TRY(queryGL->resume(context));
>+            }
>         }
>     }
>-    return gl::NoError();
>-}
>+    onTransformFeedbackStateChange();
>+    mPrevDrawContext = contextID;
> 
>-gl::Error StateManagerGL::resumeAllQueries()
>-{
>-    for (QueryGL *prevQuery : mCurrentQueries)
>-    {
>-        ANGLE_TRY(prevQuery->resume());
>-    }
>-    return gl::NoError();
>+    // Seamless cubemaps are required for ES3 and higher contexts. It should be the cheapest to set
>+    // this state here since MakeCurrent is expected to be called less frequently than draw calls.
>+    setTextureCubemapSeamlessEnabled(context->getClientMajorVersion() >= 3);
>+
>+    return angle::Result::Continue;
> }
> 
>-gl::Error StateManagerGL::resumeQuery(GLenum type)
>+void StateManagerGL::updateProgramTextureBindings(const gl::Context *context)
> {
>-    for (QueryGL *prevQuery : mCurrentQueries)
>+    const gl::State &glState   = context->getState();
>+    const gl::Program *program = glState.getProgram();
>+
>+    // It is possible there is no active program during a path operation.
>+    if (!program)
>+        return;
>+
>+    const gl::ActiveTexturePointerArray &textures  = glState.getActiveTexturesCache();
>+    const gl::ActiveTextureMask &activeTextures    = program->getActiveSamplersMask();
>+    const gl::ActiveTextureTypeArray &textureTypes = program->getActiveSamplerTypes();
>+
>+    for (size_t textureUnitIndex : activeTextures)
>     {
>-        if (prevQuery->getType() == type)
>+        gl::TextureType textureType = textureTypes[textureUnitIndex];
>+        gl::Texture *texture        = textures[textureUnitIndex];
>+
>+        // A nullptr texture indicates incomplete.
>+        if (texture != nullptr)
>+        {
>+            const TextureGL *textureGL = GetImplAs<TextureGL>(texture);
>+            ASSERT(!texture->hasAnyDirtyBit());
>+            ASSERT(!textureGL->hasAnyDirtyBit());
>+
>+            activeTexture(textureUnitIndex);
>+            bindTexture(textureType, textureGL->getTextureID());
>+        }
>+        else
>         {
>-            ANGLE_TRY(prevQuery->resume());
>+            activeTexture(textureUnitIndex);
>+            bindTexture(textureType, 0);
>         }
>     }
>-    return gl::NoError();
> }
> 
>-gl::Error StateManagerGL::onMakeCurrent(const gl::Context *context)
>+void StateManagerGL::updateProgramStorageBufferBindings(const gl::Context *context)
> {
>-    const gl::State &glState = context->getGLState();
>+    const gl::State &glState   = context->getState();
>+    const gl::Program *program = glState.getProgram();
> 
>-    // If the context has changed, pause the previous context's queries
>-    auto contextID = context->getContextState().getContextID();
>-    if (contextID != mPrevDrawContext)
>-    {
>-        ANGLE_TRY(pauseAllQueries());
>-    }
>-    mCurrentQueries.clear();
>-    mPrevDrawTransformFeedback = nullptr;
>-    mPrevDrawContext           = contextID;
>+    // It is possible there is no active program during a path operation.
>+    if (!program)
>+        return;
> 
>-    // Set the current query state
>-    for (GLenum queryType : QueryTypes)
>+    for (size_t blockIndex = 0; blockIndex < program->getActiveShaderStorageBlockCount();
>+         blockIndex++)
>     {
>-        gl::Query *query = glState.getActiveQuery(queryType);
>-        if (query != nullptr)
>+        GLuint binding = program->getShaderStorageBlockBinding(static_cast<GLuint>(blockIndex));
>+        const auto &shaderStorageBuffer = glState.getIndexedShaderStorageBuffer(binding);
>+
>+        if (shaderStorageBuffer.get() != nullptr)
>         {
>-            QueryGL *queryGL = GetImplAs<QueryGL>(query);
>-            ANGLE_TRY(queryGL->resume());
>+            BufferGL *bufferGL = GetImplAs<BufferGL>(shaderStorageBuffer.get());
> 
>-            mCurrentQueries.insert(queryGL);
>+            if (shaderStorageBuffer.getSize() == 0)
>+            {
>+                bindBufferBase(gl::BufferBinding::ShaderStorage, binding, bufferGL->getBufferID());
>+            }
>+            else
>+            {
>+                bindBufferRange(gl::BufferBinding::ShaderStorage, binding, bufferGL->getBufferID(),
>+                                shaderStorageBuffer.getOffset(), shaderStorageBuffer.getSize());
>+            }
>         }
>     }
>-
>-    // Seamless cubemaps are required for ES3 and higher contexts. It should be the cheapest to set
>-    // this state here since MakeCurrent is expected to be called less frequently than draw calls.
>-    setTextureCubemapSeamlessEnabled(context->getClientMajorVersion() >= 3);
>-
>-    return gl::NoError();
> }
> 
>-void StateManagerGL::setGenericShaderState(const gl::Context *context)
>+void StateManagerGL::updateProgramUniformBufferBindings(const gl::Context *context)
> {
>-    const gl::State &glState = context->getGLState();
>-
>     // Sync the current program state
>+    const gl::State &glState   = context->getState();
>     const gl::Program *program = glState.getProgram();
>-    const ProgramGL *programGL = GetImplAs<ProgramGL>(program);
>-    useProgram(programGL->getProgramID());
>+
>+    // It is possible there is no active program during a path operation.
>+    if (!program)
>+        return;
> 
>     for (size_t uniformBlockIndex = 0; uniformBlockIndex < program->getActiveUniformBlockCount();
>          uniformBlockIndex++)
>@@ -873,35 +874,16 @@ void StateManagerGL::setGenericShaderState(const gl::Context *context)
>             }
>         }
>     }
>+}
> 
>-    if (mProgramTexturesAndSamplersDirty)
>-    {
>-        updateProgramTextureAndSamplerBindings(context);
>-        mProgramTexturesAndSamplersDirty = false;
>-    }
>+void StateManagerGL::updateProgramAtomicCounterBufferBindings(const gl::Context *context)
>+{
>+    const gl::State &glState   = context->getState();
>+    const gl::Program *program = glState.getProgram();
> 
>-    // TODO(xinghua.cao@intel.com): Track image units state with dirty bits to
>-    // avoid update every draw call.
>-    ASSERT(context->getClientVersion() >= gl::ES_3_1 || program->getImageBindings().size() == 0);
>-    for (const gl::ImageBinding &imageUniform : program->getImageBindings())
>-    {
>-        for (GLuint imageUnitIndex : imageUniform.boundImageUnits)
>-        {
>-            const gl::ImageUnit &imageUnit = glState.getImageUnit(imageUnitIndex);
>-            const TextureGL *textureGL = SafeGetImplAs<TextureGL>(imageUnit.texture.get());
>-            if (textureGL)
>-            {
>-                bindImageTexture(imageUnitIndex, textureGL->getTextureID(), imageUnit.level,
>-                                 imageUnit.layered, imageUnit.layer, imageUnit.access,
>-                                 imageUnit.format);
>-            }
>-            else
>-            {
>-                bindImageTexture(imageUnitIndex, 0, imageUnit.level, imageUnit.layered,
>-                                 imageUnit.layer, imageUnit.access, imageUnit.format);
>-            }
>-        }
>-    }
>+    // It is possible there is no active program during a path operation.
>+    if (!program)
>+        return;
> 
>     for (const auto &atomicCounterBuffer : program->getState().getAtomicCounterBuffers())
>     {
>@@ -925,117 +907,34 @@ void StateManagerGL::setGenericShaderState(const gl::Context *context)
>     }
> }
> 
>-void StateManagerGL::updateProgramTextureAndSamplerBindings(const gl::Context *context)
>+void StateManagerGL::updateProgramImageBindings(const gl::Context *context)
> {
>-    const gl::State &glState   = context->getGLState();
>+    const gl::State &glState   = context->getState();
>     const gl::Program *program = glState.getProgram();
> 
>-    const auto &completeTextures = glState.getCompleteTextureCache();
>-    for (const gl::SamplerBinding &samplerBinding : program->getSamplerBindings())
>-    {
>-        if (samplerBinding.unreferenced)
>-            continue;
>+    // It is possible there is no active program during a path operation.
>+    if (!program)
>+        return;
> 
>-        GLenum textureType = samplerBinding.textureType;
>-        for (GLuint textureUnitIndex : samplerBinding.boundTextureUnits)
>+    ASSERT(context->getClientVersion() >= gl::ES_3_1 || program->getImageBindings().size() == 0);
>+    for (size_t imageUnitIndex : program->getActiveImagesMask())
>+    {
>+        const gl::ImageUnit &imageUnit = glState.getImageUnit(imageUnitIndex);
>+        const TextureGL *textureGL     = SafeGetImplAs<TextureGL>(imageUnit.texture.get());
>+        if (textureGL)
>         {
>-            gl::Texture *texture = completeTextures[textureUnitIndex];
>-
>-            // A nullptr texture indicates incomplete.
>-            if (texture != nullptr)
>-            {
>-                const TextureGL *textureGL = GetImplAs<TextureGL>(texture);
>-                ASSERT(!texture->hasAnyDirtyBit());
>-                ASSERT(!textureGL->hasAnyDirtyBit());
>-
>-                if (mTextures.at(textureType)[textureUnitIndex] != textureGL->getTextureID())
>-                {
>-                    activeTexture(textureUnitIndex);
>-                    bindTexture(textureType, textureGL->getTextureID());
>-                }
>-            }
>-            else
>-            {
>-                if (mTextures.at(textureType)[textureUnitIndex] != 0)
>-                {
>-                    activeTexture(textureUnitIndex);
>-                    bindTexture(textureType, 0);
>-                }
>-            }
>-
>-            const gl::Sampler *sampler = glState.getSampler(textureUnitIndex);
>-            if (sampler != nullptr)
>-            {
>-                SamplerGL *samplerGL = GetImplAs<SamplerGL>(sampler);
>-                bindSampler(textureUnitIndex, samplerGL->getSamplerID());
>-            }
>-            else
>-            {
>-                bindSampler(textureUnitIndex, 0);
>-            }
>+            bindImageTexture(imageUnitIndex, textureGL->getTextureID(), imageUnit.level,
>+                             imageUnit.layered, imageUnit.layer, imageUnit.access,
>+                             imageUnit.format);
>         }
>-    }
>-
>-    for (size_t blockIndex = 0; blockIndex < program->getActiveShaderStorageBlockCount();
>-         blockIndex++)
>-    {
>-        GLuint binding = program->getShaderStorageBlockBinding(static_cast<GLuint>(blockIndex));
>-        const auto &shaderStorageBuffer = glState.getIndexedShaderStorageBuffer(binding);
>-
>-        if (shaderStorageBuffer.get() != nullptr)
>+        else
>         {
>-            BufferGL *bufferGL = GetImplAs<BufferGL>(shaderStorageBuffer.get());
>-
>-            if (shaderStorageBuffer.getSize() == 0)
>-            {
>-                bindBufferBase(gl::BufferBinding::ShaderStorage, binding, bufferGL->getBufferID());
>-            }
>-            else
>-            {
>-                bindBufferRange(gl::BufferBinding::ShaderStorage, binding, bufferGL->getBufferID(),
>-                                shaderStorageBuffer.getOffset(), shaderStorageBuffer.getSize());
>-            }
>+            bindImageTexture(imageUnitIndex, 0, imageUnit.level, imageUnit.layered, imageUnit.layer,
>+                             imageUnit.access, imageUnit.format);
>         }
>     }
> }
> 
>-gl::Error StateManagerGL::setGenericDrawState(const gl::Context *context)
>-{
>-    setGenericShaderState(context);
>-
>-    const gl::State &glState = context->getGLState();
>-
>-    gl::Framebuffer *framebuffer = glState.getDrawFramebuffer();
>-    FramebufferGL *framebufferGL = GetImplAs<FramebufferGL>(framebuffer);
>-    bindFramebuffer(GL_DRAW_FRAMEBUFFER, framebufferGL->getFramebufferID());
>-
>-    // Set the current transform feedback state
>-    gl::TransformFeedback *transformFeedback = glState.getCurrentTransformFeedback();
>-    if (transformFeedback)
>-    {
>-        TransformFeedbackGL *transformFeedbackGL =
>-            GetImplAs<TransformFeedbackGL>(transformFeedback);
>-        bindTransformFeedback(GL_TRANSFORM_FEEDBACK, transformFeedbackGL->getTransformFeedbackID());
>-        transformFeedbackGL->syncActiveState(transformFeedback->isActive(),
>-                                             transformFeedback->getPrimitiveMode());
>-        transformFeedbackGL->syncPausedState(transformFeedback->isPaused());
>-        mPrevDrawTransformFeedback = transformFeedbackGL;
>-    }
>-    else
>-    {
>-        bindTransformFeedback(GL_TRANSFORM_FEEDBACK, 0);
>-        mPrevDrawTransformFeedback = nullptr;
>-    }
>-
>-    if (context->getExtensions().webglCompatibility)
>-    {
>-        auto activeOutputs = glState.getProgram()->getState().getActiveOutputVariables();
>-        framebufferGL->maskOutInactiveOutputDrawBuffers(activeOutputs);
>-    }
>-
>-    return gl::NoError();
>-}
>-
> void StateManagerGL::setAttributeCurrentData(size_t index,
>                                              const gl::VertexAttribCurrentValueData &data)
> {
>@@ -1044,15 +943,15 @@ void StateManagerGL::setAttributeCurrentData(size_t index,
>         mVertexAttribCurrentValues[index] = data;
>         switch (mVertexAttribCurrentValues[index].Type)
>         {
>-            case GL_FLOAT:
>+            case gl::VertexAttribType::Float:
>                 mFunctions->vertexAttrib4fv(static_cast<GLuint>(index),
>                                             mVertexAttribCurrentValues[index].FloatValues);
>                 break;
>-            case GL_INT:
>+            case gl::VertexAttribType::Int:
>                 mFunctions->vertexAttribI4iv(static_cast<GLuint>(index),
>                                              mVertexAttribCurrentValues[index].IntValues);
>                 break;
>-            case GL_UNSIGNED_INT:
>+            case gl::VertexAttribType::UnsignedInt:
>                 mFunctions->vertexAttribI4uiv(static_cast<GLuint>(index),
>                                               mVertexAttribCurrentValues[index].UnsignedIntValues);
>                 break;
>@@ -1085,100 +984,26 @@ void StateManagerGL::setScissorTestEnabled(bool enabled)
> 
> void StateManagerGL::setScissor(const gl::Rectangle &scissor)
> {
>-    if (!AllRectanglesMatch(scissor, mScissors))
>+    if (scissor != mScissor)
>     {
>-        mScissors.assign(mScissors.size(), scissor);
>-        mFunctions->scissor(scissor.x, scissor.y, scissor.width, scissor.height);
>+        mScissor = scissor;
>+        mFunctions->scissor(mScissor.x, mScissor.y, mScissor.width, mScissor.height);
> 
>         mLocalDirtyBits.set(gl::State::DIRTY_BIT_SCISSOR);
>     }
> }
> 
>-void StateManagerGL::setScissorArrayv(GLuint first, const std::vector<gl::Rectangle> &scissors)
>-{
>-    ASSERT(mFunctions->scissorArrayv != nullptr);
>-    size_t offset = static_cast<size_t>(first);
>-    ASSERT(offset + scissors.size() <= mScissors.size());
>-    if (!std::equal(scissors.cbegin(), scissors.cend(), mScissors.cbegin() + offset))
>-    {
>-        std::copy(scissors.begin(), scissors.end(), mScissors.begin() + offset);
>-        mFunctions->scissorArrayv(first, static_cast<GLsizei>(scissors.size()), &scissors[0].x);
>-        mLocalDirtyBits.set(gl::State::DIRTY_BIT_SCISSOR);
>-    }
>-}
>-
>-void StateManagerGL::setScissorIndexed(GLuint index, const gl::Rectangle &scissor)
>-{
>-    ASSERT(mFunctions->scissorIndexed != nullptr);
>-    ASSERT(static_cast<size_t>(index) < mScissors.size());
>-    if (mScissors[index] != scissor)
>-    {
>-        mScissors[index] = scissor;
>-        mFunctions->scissorIndexed(index, scissor.x, scissor.y, scissor.width, scissor.height);
>-        mLocalDirtyBits.set(gl::State::DIRTY_BIT_SCISSOR);
>-    }
>-}
>-
> void StateManagerGL::setViewport(const gl::Rectangle &viewport)
> {
>-    if (!AllRectanglesMatch(viewport, mViewports))
>+    if (viewport != mViewport)
>     {
>-        mViewports.assign(mViewports.size(), viewport);
>-        mFunctions->viewport(viewport.x, viewport.y, viewport.width, viewport.height);
>+        mViewport = viewport;
>+        mFunctions->viewport(mViewport.x, mViewport.y, mViewport.width, mViewport.height);
> 
>         mLocalDirtyBits.set(gl::State::DIRTY_BIT_VIEWPORT);
>     }
> }
> 
>-void StateManagerGL::setViewportArrayv(GLuint first, const std::vector<gl::Rectangle> &viewports)
>-{
>-    ASSERT(mFunctions->viewportArrayv != nullptr);
>-    size_t offset = static_cast<size_t>(first);
>-    ASSERT(offset + viewports.size() <= mViewports.size());
>-    if (!std::equal(viewports.cbegin(), viewports.cend(), mViewports.cbegin() + offset))
>-    {
>-        std::copy(viewports.begin(), viewports.end(), mViewports.begin() + offset);
>-        std::vector<float> viewportsAsFloats(4u * viewports.size());
>-        for (size_t i = 0u; i < viewports.size(); ++i)
>-        {
>-            viewportsAsFloats[i * 4u]      = static_cast<float>(viewports[i].x);
>-            viewportsAsFloats[i * 4u + 1u] = static_cast<float>(viewports[i].y);
>-            viewportsAsFloats[i * 4u + 2u] = static_cast<float>(viewports[i].width);
>-            viewportsAsFloats[i * 4u + 3u] = static_cast<float>(viewports[i].height);
>-        }
>-        mFunctions->viewportArrayv(first, static_cast<GLsizei>(viewports.size()),
>-                                   viewportsAsFloats.data());
>-        mLocalDirtyBits.set(gl::State::DIRTY_BIT_VIEWPORT);
>-    }
>-}
>-
>-void StateManagerGL::setViewportOffsets(const std::vector<gl::Offset> &viewportOffsets)
>-{
>-    if (!std::equal(viewportOffsets.cbegin(), viewportOffsets.cend(), mViewportOffsets.cbegin()))
>-    {
>-        std::copy(viewportOffsets.begin(), viewportOffsets.end(), mViewportOffsets.begin());
>-
>-        const std::vector<gl::Rectangle> &viewportArray =
>-            ApplyOffsets(mViewports[0], viewportOffsets);
>-        setViewportArrayv(0u, viewportArray);
>-
>-        const std::vector<gl::Rectangle> &scissorArray =
>-            ApplyOffsets(mScissors[0], viewportOffsets);
>-        setScissorArrayv(0u, scissorArray);
>-
>-        mMultiviewDirtyBits.set(MULTIVIEW_DIRTY_BIT_VIEWPORT_OFFSETS);
>-    }
>-}
>-
>-void StateManagerGL::setSideBySide(bool isSideBySide)
>-{
>-    if (mIsSideBySideDrawFramebuffer != isSideBySide)
>-    {
>-        mIsSideBySideDrawFramebuffer = isSideBySide;
>-        mMultiviewDirtyBits.set(MULTIVIEW_DIRTY_BIT_SIDE_BY_SIDE_LAYOUT);
>-    }
>-}
>-
> void StateManagerGL::setDepthRange(float near, float far)
> {
>     if (mNear != near || mFar != far)
>@@ -1661,9 +1486,11 @@ void StateManagerGL::setClearStencil(GLint clearStencil)
>     }
> }
> 
>-void StateManagerGL::syncState(const gl::Context *context, const gl::State::DirtyBits &glDirtyBits)
>+void StateManagerGL::syncState(const gl::Context *context,
>+                               const gl::State::DirtyBits &glDirtyBits,
>+                               const gl::State::DirtyBits &bitMask)
> {
>-    const gl::State &state = context->getGLState();
>+    const gl::State &state = context->getState();
> 
>     // Changing the draw framebuffer binding sometimes requires resetting srgb blending.
>     if (glDirtyBits[gl::State::DIRTY_BIT_DRAW_FRAMEBUFFER_BINDING])
>@@ -1672,66 +1499,19 @@ void StateManagerGL::syncState(const gl::Context *context, const gl::State::Dirt
>         {
>             mLocalDirtyBits.set(gl::State::DIRTY_BIT_FRAMEBUFFER_SRGB);
>         }
>-
>-        if (mIsMultiviewEnabled)
>-        {
>-            // When a new draw framebuffer is bound, we have to mark the layout, viewport offsets,
>-            // scissor test, scissor and viewport rectangle bits as dirty because it could be a
>-            // transition from or to a side-by-side draw framebuffer.
>-            mMultiviewDirtyBits.set(MULTIVIEW_DIRTY_BIT_SIDE_BY_SIDE_LAYOUT);
>-            mMultiviewDirtyBits.set(MULTIVIEW_DIRTY_BIT_VIEWPORT_OFFSETS);
>-            mLocalDirtyBits.set(gl::State::DIRTY_BIT_SCISSOR_TEST_ENABLED);
>-            mLocalDirtyBits.set(gl::State::DIRTY_BIT_SCISSOR);
>-            mLocalDirtyBits.set(gl::State::DIRTY_BIT_VIEWPORT);
>-        }
>     }
> 
>-    // Iterate over and resolve multi-view dirty bits.
>-    if (mMultiviewDirtyBits.any())
>-    {
>-        for (auto dirtyBit : mMultiviewDirtyBits)
>-        {
>-            switch (dirtyBit)
>-            {
>-                case MULTIVIEW_DIRTY_BIT_SIDE_BY_SIDE_LAYOUT:
>-                {
>-                    const gl::Framebuffer *drawFramebuffer = state.getDrawFramebuffer();
>-                    ASSERT(drawFramebuffer != nullptr);
>-                    setSideBySide(drawFramebuffer->getMultiviewLayout() ==
>-                                  GL_FRAMEBUFFER_MULTIVIEW_SIDE_BY_SIDE_ANGLE);
>-                }
>-                break;
>-                case MULTIVIEW_DIRTY_BIT_VIEWPORT_OFFSETS:
>-                {
>-                    const gl::Framebuffer *drawFramebuffer = state.getDrawFramebuffer();
>-                    ASSERT(drawFramebuffer != nullptr);
>-                    const std::vector<gl::Offset> *attachmentViewportOffsets =
>-                        drawFramebuffer->getViewportOffsets();
>-                    const std::vector<gl::Offset> &viewportOffsets =
>-                        attachmentViewportOffsets != nullptr
>-                            ? *attachmentViewportOffsets
>-                            : gl::FramebufferAttachment::GetDefaultViewportOffsetVector();
>-                    setViewportOffsets(viewportOffsets);
>-                }
>-                break;
>-                default:
>-                    UNREACHABLE();
>-            }
>-        }
>-        mMultiviewDirtyBits.reset();
>-    }
>-
>-    const gl::State::DirtyBits &glAndLocalDirtyBits = (glDirtyBits | mLocalDirtyBits);
>-
>+    const gl::State::DirtyBits glAndLocalDirtyBits = (glDirtyBits | mLocalDirtyBits) & bitMask;
>     if (!glAndLocalDirtyBits.any())
>     {
>         return;
>     }
> 
>     // TODO(jmadill): Investigate only syncing vertex state for active attributes
>-    for (auto dirtyBit : glAndLocalDirtyBits)
>+    for (auto iter = glAndLocalDirtyBits.begin(), endIter = glAndLocalDirtyBits.end();
>+         iter != endIter; ++iter)
>     {
>-        switch (dirtyBit)
>+        switch (*iter)
>         {
>             case gl::State::DIRTY_BIT_SCISSOR_TEST_ENABLED:
>                 setScissorTestEnabled(state.isScissorTestEnabled());
>@@ -1739,31 +1519,13 @@ void StateManagerGL::syncState(const gl::Context *context, const gl::State::Dirt
>             case gl::State::DIRTY_BIT_SCISSOR:
>             {
>                 const gl::Rectangle &scissor = state.getScissor();
>-                if (!mIsSideBySideDrawFramebuffer)
>-                {
>-                    setScissor(scissor);
>-                }
>-                else
>-                {
>-                    const gl::Framebuffer *drawFramebuffer = state.getDrawFramebuffer();
>-                    ASSERT(drawFramebuffer != nullptr);
>-                    applyViewportOffsetsAndSetScissors(scissor, *drawFramebuffer);
>-                }
>+                setScissor(scissor);
>             }
>             break;
>             case gl::State::DIRTY_BIT_VIEWPORT:
>             {
>                 const gl::Rectangle &viewport = state.getViewport();
>-                if (!mIsSideBySideDrawFramebuffer)
>-                {
>-                    setViewport(viewport);
>-                }
>-                else
>-                {
>-                    const gl::Framebuffer *drawFramebuffer = state.getDrawFramebuffer();
>-                    ASSERT(drawFramebuffer != nullptr);
>-                    applyViewportOffsetsAndSetViewports(viewport, *drawFramebuffer);
>-                }
>+                setViewport(viewport);
>             }
>             break;
>             case gl::State::DIRTY_BIT_DEPTH_RANGE:
>@@ -1911,43 +1673,123 @@ void StateManagerGL::syncState(const gl::Context *context, const gl::State::Dirt
>                 // TODO(jmadill): implement this
>                 break;
>             case gl::State::DIRTY_BIT_READ_FRAMEBUFFER_BINDING:
>-                // TODO(jmadill): implement this
>+            {
>+                gl::Framebuffer *framebuffer = state.getReadFramebuffer();
>+
>+                // Necessary for an Intel TexImage workaround.
>+                if (!framebuffer)
>+                    continue;
>+
>+                FramebufferGL *framebufferGL = GetImplAs<FramebufferGL>(framebuffer);
>+                bindFramebuffer(GL_READ_FRAMEBUFFER, framebufferGL->getFramebufferID());
>                 break;
>+            }
>             case gl::State::DIRTY_BIT_DRAW_FRAMEBUFFER_BINDING:
>             {
>-                // TODO(jmadill): implement this
>-                updateMultiviewBaseViewLayerIndexUniform(
>-                    state.getProgram(),
>-                    state.getDrawFramebuffer()->getImplementation()->getState());
>+                gl::Framebuffer *framebuffer = state.getDrawFramebuffer();
>+
>+                // Necessary for an Intel TexImage workaround.
>+                if (!framebuffer)
>+                    continue;
>+
>+                FramebufferGL *framebufferGL = GetImplAs<FramebufferGL>(framebuffer);
>+                bindFramebuffer(GL_DRAW_FRAMEBUFFER, framebufferGL->getFramebufferID());
>+
>+                const gl::Program *program = state.getProgram();
>+                if (program)
>+                {
>+                    updateMultiviewBaseViewLayerIndexUniform(program, framebufferGL->getState());
>+                }
>                 break;
>             }
>             case gl::State::DIRTY_BIT_RENDERBUFFER_BINDING:
>                 // TODO(jmadill): implement this
>                 break;
>             case gl::State::DIRTY_BIT_VERTEX_ARRAY_BINDING:
>-                // TODO(jmadill): implement this
>-                propagateNumViewsToVAO(state.getProgram(),
>-                                       GetImplAs<VertexArrayGL>(state.getVertexArray()));
>+            {
>+                const VertexArrayGL *vaoGL = GetImplAs<VertexArrayGL>(state.getVertexArray());
>+                bindVertexArray(vaoGL->getVertexArrayID(), vaoGL->getAppliedElementArrayBufferID());
>+
>+                propagateProgramToVAO(state.getProgram(),
>+                                      GetImplAs<VertexArrayGL>(state.getVertexArray()));
>                 break;
>+            }
>             case gl::State::DIRTY_BIT_DRAW_INDIRECT_BUFFER_BINDING:
>-                // TODO: implement this
>+                updateDrawIndirectBufferBinding(context);
>+                break;
>+            case gl::State::DIRTY_BIT_DISPATCH_INDIRECT_BUFFER_BINDING:
>+                updateDispatchIndirectBufferBinding(context);
>                 break;
>             case gl::State::DIRTY_BIT_PROGRAM_BINDING:
>-                mProgramTexturesAndSamplersDirty = true;
>+            {
>+                gl::Program *program = state.getProgram();
>+                if (program != nullptr)
>+                {
>+                    useProgram(GetImplAs<ProgramGL>(program)->getProgramID());
>+                }
>+                break;
>+            }
>+            case gl::State::DIRTY_BIT_PROGRAM_EXECUTABLE:
>+            {
>+                const gl::Program *program = state.getProgram();
>+                if (program)
>+                {
>+                    iter.setLaterBit(gl::State::DIRTY_BIT_TEXTURE_BINDINGS);
>+
>+                    if (program->getActiveImagesMask().any())
>+                    {
>+                        iter.setLaterBit(gl::State::DIRTY_BIT_IMAGE_BINDINGS);
>+                    }
>+
>+                    if (program->getActiveShaderStorageBlockCount() > 0)
>+                    {
>+                        iter.setLaterBit(gl::State::DIRTY_BIT_SHADER_STORAGE_BUFFER_BINDING);
>+                    }
>+
>+                    if (program->getActiveUniformBlockCount() > 0)
>+                    {
>+                        iter.setLaterBit(gl::State::DIRTY_BIT_UNIFORM_BUFFER_BINDINGS);
>+                    }
>+
>+                    if (program->getActiveAtomicCounterBufferCount() > 0)
>+                    {
>+                        iter.setLaterBit(gl::State::DIRTY_BIT_ATOMIC_COUNTER_BUFFER_BINDING);
>+                    }
>+
>+                    if (mIsMultiviewEnabled && program->usesMultiview())
>+                    {
>+                        updateMultiviewBaseViewLayerIndexUniform(
>+                            program, state.getDrawFramebuffer()->getImplementation()->getState());
>+                    }
>+                }
>+
>+                if (!program || !program->hasLinkedShaderStage(gl::ShaderType::Compute))
>+                {
>+                    propagateProgramToVAO(program,
>+                                          GetImplAs<VertexArrayGL>(state.getVertexArray()));
>+                }
>                 break;
>+            }
>             case gl::State::DIRTY_BIT_TEXTURE_BINDINGS:
>-                mProgramTexturesAndSamplersDirty = true;
>+                updateProgramTextureBindings(context);
>                 break;
>             case gl::State::DIRTY_BIT_SAMPLER_BINDINGS:
>-                mProgramTexturesAndSamplersDirty = true;
>+                syncSamplersState(context);
>                 break;
>-            case gl::State::DIRTY_BIT_PROGRAM_EXECUTABLE:
>-                mProgramTexturesAndSamplersDirty = true;
>-                propagateNumViewsToVAO(state.getProgram(),
>-                                       GetImplAs<VertexArrayGL>(state.getVertexArray()));
>-                updateMultiviewBaseViewLayerIndexUniform(
>-                    state.getProgram(),
>-                    state.getDrawFramebuffer()->getImplementation()->getState());
>+            case gl::State::DIRTY_BIT_IMAGE_BINDINGS:
>+                updateProgramImageBindings(context);
>+                break;
>+            case gl::State::DIRTY_BIT_TRANSFORM_FEEDBACK_BINDING:
>+                syncTransformFeedbackState(context);
>+                break;
>+            case gl::State::DIRTY_BIT_SHADER_STORAGE_BUFFER_BINDING:
>+                updateProgramStorageBufferBindings(context);
>+                break;
>+            case gl::State::DIRTY_BIT_UNIFORM_BUFFER_BINDINGS:
>+                updateProgramUniformBufferBindings(context);
>+                break;
>+            case gl::State::DIRTY_BIT_ATOMIC_COUNTER_BUFFER_BINDING:
>+                updateProgramAtomicCounterBufferBindings(context);
>                 break;
>             case gl::State::DIRTY_BIT_MULTISAMPLING:
>                 setMultisamplingStateEnabled(state.isMultisamplingEnabled());
>@@ -1958,15 +1800,11 @@ void StateManagerGL::syncState(const gl::Context *context, const gl::State::Dirt
>             case gl::State::DIRTY_BIT_COVERAGE_MODULATION:
>                 setCoverageModulation(state.getCoverageModulation());
>                 break;
>-            case gl::State::DIRTY_BIT_PATH_RENDERING_MATRIX_MV:
>+            case gl::State::DIRTY_BIT_PATH_RENDERING:
>                 setPathRenderingModelViewMatrix(
>                     state.getPathRenderingMatrix(GL_PATH_MODELVIEW_MATRIX_CHROMIUM));
>-                break;
>-            case gl::State::DIRTY_BIT_PATH_RENDERING_MATRIX_PROJ:
>                 setPathRenderingProjectionMatrix(
>                     state.getPathRenderingMatrix(GL_PATH_PROJECTION_MATRIX_CHROMIUM));
>-                break;
>-            case gl::State::DIRTY_BIT_PATH_RENDERING_STENCIL_STATE:
>                 setPathRenderingStencilState(state.getPathStencilFunc(), state.getPathStencilRef(),
>                                              state.getPathStencilMask());
>                 break;
>@@ -2000,13 +1838,16 @@ void StateManagerGL::syncState(const gl::Context *context, const gl::State::Dirt
>                 }
>                 break;
>             }
>+            case gl::State::DIRTY_BIT_PROVOKING_VERTEX:
>+                setProvokingVertex(ToGLenum(state.getProvokingVertex()));
>+                break;
>             default:
>                 UNREACHABLE();
>                 break;
>         }
>-
>-        mLocalDirtyBits.reset();
>     }
>+
>+    mLocalDirtyBits &= ~(bitMask);
> }
> 
> void StateManagerGL::setFramebufferSRGBEnabled(const gl::Context *context, bool enabled)
>@@ -2118,7 +1959,7 @@ void StateManagerGL::setPathRenderingModelViewMatrix(const GLfloat *m)
>         memcpy(mPathMatrixMV, m, sizeof(mPathMatrixMV));
>         mFunctions->matrixLoadfEXT(GL_PATH_MODELVIEW_CHROMIUM, m);
> 
>-        mLocalDirtyBits.set(gl::State::DIRTY_BIT_PATH_RENDERING_MATRIX_MV);
>+        mLocalDirtyBits.set(gl::State::DIRTY_BIT_PATH_RENDERING);
>     }
> }
> 
>@@ -2129,7 +1970,7 @@ void StateManagerGL::setPathRenderingProjectionMatrix(const GLfloat *m)
>         memcpy(mPathMatrixProj, m, sizeof(mPathMatrixProj));
>         mFunctions->matrixLoadfEXT(GL_PATH_PROJECTION_CHROMIUM, m);
> 
>-        mLocalDirtyBits.set(gl::State::DIRTY_BIT_PATH_RENDERING_MATRIX_PROJ);
>+        mLocalDirtyBits.set(gl::State::DIRTY_BIT_PATH_RENDERING);
>     }
> }
> 
>@@ -2142,7 +1983,18 @@ void StateManagerGL::setPathRenderingStencilState(GLenum func, GLint ref, GLuint
>         mPathStencilMask = mask;
>         mFunctions->pathStencilFuncNV(func, ref, mask);
> 
>-        mLocalDirtyBits.set(gl::State::DIRTY_BIT_PATH_RENDERING_STENCIL_STATE);
>+        mLocalDirtyBits.set(gl::State::DIRTY_BIT_PATH_RENDERING);
>+    }
>+}
>+
>+void StateManagerGL::setProvokingVertex(GLenum mode)
>+{
>+    if (mode != mProvokingVertex)
>+    {
>+        mFunctions->provokingVertex(mode);
>+        mProvokingVertex = mode;
>+
>+        mLocalDirtyBits.set(gl::State::DIRTY_BIT_PROVOKING_VERTEX);
>     }
> }
> 
>@@ -2168,38 +2020,15 @@ void StateManagerGL::setTextureCubemapSeamlessEnabled(bool enabled)
>     }
> }
> 
>-// According to the ANGLE_multiview spec, the behavior of glScissor and glViewport is different
>-// if the active draw framebuffer has a side-by-side layout. In such situations glScissor and
>-// glViewport specify the static offset and dimensions for each view to which the viewport
>-// offsets have to be applied to compute the view's final scissor and viewport rectangles.
>-void StateManagerGL::applyViewportOffsetsAndSetScissors(const gl::Rectangle &scissor,
>-                                                        const gl::Framebuffer &drawFramebuffer)
>-{
>-
>-    const std::vector<gl::Offset> *attachmentViewportOffsets = drawFramebuffer.getViewportOffsets();
>-    const std::vector<gl::Offset> &viewportOffsets =
>-        attachmentViewportOffsets != nullptr
>-            ? *attachmentViewportOffsets
>-            : gl::FramebufferAttachment::GetDefaultViewportOffsetVector();
>-    const std::vector<gl::Rectangle> &scissorArray = ApplyOffsets(scissor, viewportOffsets);
>-    setScissorArrayv(0u, scissorArray);
>-}
>-
>-void StateManagerGL::applyViewportOffsetsAndSetViewports(const gl::Rectangle &viewport,
>-                                                         const gl::Framebuffer &drawFramebuffer)
>+void StateManagerGL::propagateProgramToVAO(const gl::Program *program, VertexArrayGL *vao)
> {
>-    const std::vector<gl::Offset> *attachmentViewportOffsets = drawFramebuffer.getViewportOffsets();
>-    const std::vector<gl::Offset> &viewportOffsets =
>-        attachmentViewportOffsets != nullptr
>-            ? *attachmentViewportOffsets
>-            : gl::FramebufferAttachment::GetDefaultViewportOffsetVector();
>-    const std::vector<gl::Rectangle> &viewportArray = ApplyOffsets(viewport, viewportOffsets);
>-    setViewportArrayv(0u, viewportArray);
>-}
>+    if (vao == nullptr)
>+    {
>+        return;
>+    }
> 
>-void StateManagerGL::propagateNumViewsToVAO(const gl::Program *program, VertexArrayGL *vao)
>-{
>-    if (mIsMultiviewEnabled && vao != nullptr)
>+    // Number of views:
>+    if (mIsMultiviewEnabled)
>     {
>         int programNumViews = 1;
>         if (program && program->usesMultiview())
>@@ -2208,26 +2037,64 @@ void StateManagerGL::propagateNumViewsToVAO(const gl::Program *program, VertexAr
>         }
>         vao->applyNumViewsToDivisor(programNumViews);
>     }
>+
>+    // Attribute enabled mask:
>+    if (program)
>+    {
>+        vao->applyActiveAttribLocationsMask(program->getActiveAttribLocationsMask());
>+    }
> }
> 
>-void StateManagerGL::updateMultiviewBaseViewLayerIndexUniform(
>+void StateManagerGL::updateMultiviewBaseViewLayerIndexUniformImpl(
>     const gl::Program *program,
>     const gl::FramebufferState &drawFramebufferState) const
> {
>-    if (mIsMultiviewEnabled && program != nullptr && program->usesMultiview())
>+    ASSERT(mIsMultiviewEnabled && program && program->usesMultiview());
>+    const ProgramGL *programGL = GetImplAs<ProgramGL>(program);
>+    if (drawFramebufferState.isMultiview())
>+    {
>+        programGL->enableLayeredRenderingPath(drawFramebufferState.getBaseViewIndex());
>+    }
>+}
>+
>+void StateManagerGL::syncSamplersState(const gl::Context *context)
>+{
>+    const gl::State::SamplerBindingVector &samplers = context->getState().getSamplers();
>+
>+    // This could be optimized by using a separate binding dirty bit per sampler.
>+    for (size_t samplerIndex = 0; samplerIndex < samplers.size(); ++samplerIndex)
>     {
>-        const ProgramGL *programGL = GetImplAs<ProgramGL>(program);
>-        switch (drawFramebufferState.getMultiviewLayout())
>+        const gl::Sampler *sampler = samplers[samplerIndex].get();
>+        if (sampler != nullptr)
>         {
>-            case GL_FRAMEBUFFER_MULTIVIEW_SIDE_BY_SIDE_ANGLE:
>-                programGL->enableSideBySideRenderingPath();
>-                break;
>-            case GL_FRAMEBUFFER_MULTIVIEW_LAYERED_ANGLE:
>-                programGL->enableLayeredRenderingPath(drawFramebufferState.getBaseViewIndex());
>-                break;
>-            default:
>-                break;
>+            SamplerGL *samplerGL = GetImplAs<SamplerGL>(sampler);
>+            bindSampler(samplerIndex, samplerGL->getSamplerID());
>+        }
>+        else
>+        {
>+            bindSampler(samplerIndex, 0);
>         }
>     }
> }
>+
>+void StateManagerGL::syncTransformFeedbackState(const gl::Context *context)
>+{
>+    // Set the current transform feedback state
>+    gl::TransformFeedback *transformFeedback = context->getState().getCurrentTransformFeedback();
>+    if (transformFeedback)
>+    {
>+        TransformFeedbackGL *transformFeedbackGL =
>+            GetImplAs<TransformFeedbackGL>(transformFeedback);
>+        bindTransformFeedback(GL_TRANSFORM_FEEDBACK, transformFeedbackGL->getTransformFeedbackID());
>+        transformFeedbackGL->syncActiveState(context, transformFeedback->isActive(),
>+                                             transformFeedback->getPrimitiveMode());
>+        transformFeedbackGL->syncPausedState(transformFeedback->isPaused());
>+        mCurrentTransformFeedback = transformFeedbackGL;
>+    }
>+    else
>+    {
>+        bindTransformFeedback(GL_TRANSFORM_FEEDBACK, 0);
>+        mCurrentTransformFeedback = nullptr;
>+    }
> }
>+}  // namespace rx
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/StateManagerGL.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/StateManagerGL.h
>index 91530674b8f..67193b3d773 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/StateManagerGL.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/StateManagerGL.h
>@@ -20,10 +20,9 @@
> namespace gl
> {
> struct Caps;
>-class ContextState;
>-class State;
> class FramebufferState;
>-}
>+class State;
>+}  // namespace gl
> 
> namespace rx
> {
>@@ -50,7 +49,6 @@ class StateManagerGL final : angle::NonCopyable
>     void deleteFramebuffer(GLuint fbo);
>     void deleteRenderbuffer(GLuint rbo);
>     void deleteTransformFeedback(GLuint transformFeedback);
>-    void deleteQuery(GLuint query);
> 
>     void useProgram(GLuint program);
>     void forceUseProgram(GLuint program);
>@@ -63,9 +61,9 @@ class StateManagerGL final : angle::NonCopyable
>                          size_t offset,
>                          size_t size);
>     void activeTexture(size_t unit);
>-    void bindTexture(GLenum type, GLuint texture);
>+    void bindTexture(gl::TextureType type, GLuint texture);
>     void bindSampler(size_t unit, GLuint sampler);
>-    void bindImageTexture(GLuint unit,
>+    void bindImageTexture(size_t unit,
>                           GLuint texture,
>                           GLint level,
>                           GLboolean layered,
>@@ -75,24 +73,18 @@ class StateManagerGL final : angle::NonCopyable
>     void bindFramebuffer(GLenum type, GLuint framebuffer);
>     void bindRenderbuffer(GLenum type, GLuint renderbuffer);
>     void bindTransformFeedback(GLenum type, GLuint transformFeedback);
>-    void beginQuery(GLenum type, GLuint query);
>-    void endQuery(GLenum type, GLuint query);
>-    void onBeginQuery(QueryGL *query);
>+    void onTransformFeedbackStateChange();
>+    void beginQuery(gl::QueryType type, QueryGL *queryObject, GLuint queryId);
>+    void endQuery(gl::QueryType type, QueryGL *queryObject, GLuint queryId);
> 
>     void setAttributeCurrentData(size_t index, const gl::VertexAttribCurrentValueData &data);
> 
>     void setScissorTestEnabled(bool enabled);
>     void setScissor(const gl::Rectangle &scissor);
>-    void setScissorIndexed(GLuint index, const gl::Rectangle &scissor);
>-    void setScissorArrayv(GLuint first, const std::vector<gl::Rectangle> &viewports);
> 
>     void setViewport(const gl::Rectangle &viewport);
>-    void setViewportArrayv(GLuint first, const std::vector<gl::Rectangle> &viewports);
>     void setDepthRange(float near, float far);
> 
>-    void setViewportOffsets(const std::vector<gl::Offset> &kviewportOffsets);
>-    void setSideBySide(bool isSideBySide);
>-
>     void setBlendEnabled(bool enabled);
>     void setBlendColor(const gl::ColorF &blendColor);
>     void setBlendFuncs(GLenum sourceBlendRGB,
>@@ -153,58 +145,56 @@ class StateManagerGL final : angle::NonCopyable
>     void setPathRenderingProjectionMatrix(const GLfloat *m);
>     void setPathRenderingStencilState(GLenum func, GLint ref, GLuint mask);
> 
>-    void onDeleteQueryObject(QueryGL *query);
>-
>-    gl::Error setDrawArraysState(const gl::Context *context,
>-                                 GLint first,
>-                                 GLsizei count,
>-                                 GLsizei instanceCount);
>-    gl::Error setDrawElementsState(const gl::Context *context,
>-                                   GLsizei count,
>-                                   GLenum type,
>-                                   const void *indices,
>-                                   GLsizei instanceCount,
>-                                   const void **outIndices);
>-    gl::Error setDrawIndirectState(const gl::Context *context, GLenum type);
>-
>-    gl::Error setDispatchComputeState(const gl::Context *context);
>+    void setProvokingVertex(GLenum mode);
> 
>     void pauseTransformFeedback();
>-    gl::Error pauseAllQueries();
>-    gl::Error pauseQuery(GLenum type);
>-    gl::Error resumeAllQueries();
>-    gl::Error resumeQuery(GLenum type);
>-    gl::Error onMakeCurrent(const gl::Context *context);
>+    angle::Result pauseAllQueries(const gl::Context *context);
>+    angle::Result pauseQuery(const gl::Context *context, gl::QueryType type);
>+    angle::Result resumeAllQueries(const gl::Context *context);
>+    angle::Result resumeQuery(const gl::Context *context, gl::QueryType type);
>+    angle::Result onMakeCurrent(const gl::Context *context);
> 
>-    void syncState(const gl::Context *context, const gl::State::DirtyBits &glDirtyBits);
>+    void syncState(const gl::Context *context,
>+                   const gl::State::DirtyBits &glDirtyBits,
>+                   const gl::State::DirtyBits &bitMask);
> 
>-    void updateMultiviewBaseViewLayerIndexUniform(
>+    ANGLE_INLINE void updateMultiviewBaseViewLayerIndexUniform(
>         const gl::Program *program,
>-        const gl::FramebufferState &drawFramebufferState) const;
>+        const gl::FramebufferState &drawFramebufferState) const
>+    {
>+        if (mIsMultiviewEnabled && program && program->usesMultiview())
>+        {
>+            updateMultiviewBaseViewLayerIndexUniformImpl(program, drawFramebufferState);
>+        }
>+    }
>+
>+    GLuint getProgramID() const { return mProgram; }
>+    GLuint getVertexArrayID() const { return mVAO; }
>+    GLuint getFramebufferID(angle::FramebufferBinding binding) const
>+    {
>+        return mFramebuffers[binding];
>+    }
> 
>   private:
>-    // Set state that's common among draw commands and compute invocations.
>-    void setGenericShaderState(const gl::Context *context);
>+    void setTextureCubemapSeamlessEnabled(bool enabled);
> 
>-    // Set state that's common among draw commands.
>-    gl::Error setGenericDrawState(const gl::Context *context);
>+    void propagateProgramToVAO(const gl::Program *program, VertexArrayGL *vao);
> 
>-    void setTextureCubemapSeamlessEnabled(bool enabled);
>+    void updateProgramTextureBindings(const gl::Context *context);
>+    void updateProgramStorageBufferBindings(const gl::Context *context);
>+    void updateProgramUniformBufferBindings(const gl::Context *context);
>+    void updateProgramAtomicCounterBufferBindings(const gl::Context *context);
>+    void updateProgramImageBindings(const gl::Context *context);
> 
>-    void applyViewportOffsetsAndSetScissors(const gl::Rectangle &scissor,
>-                                            const gl::Framebuffer &drawFramebuffer);
>-    void applyViewportOffsetsAndSetViewports(const gl::Rectangle &viewport,
>-                                             const gl::Framebuffer &drawFramebuffer);
>-    void propagateNumViewsToVAO(const gl::Program *program, VertexArrayGL *vao);
>+    void updateDispatchIndirectBufferBinding(const gl::Context *context);
>+    void updateDrawIndirectBufferBinding(const gl::Context *context);
> 
>-    void updateProgramTextureAndSamplerBindings(const gl::Context *context);
>+    void syncSamplersState(const gl::Context *context);
>+    void syncTransformFeedbackState(const gl::Context *context);
> 
>-    enum MultiviewDirtyBitType
>-    {
>-        MULTIVIEW_DIRTY_BIT_SIDE_BY_SIDE_LAYOUT,
>-        MULTIVIEW_DIRTY_BIT_VIEWPORT_OFFSETS,
>-        MULTIVIEW_DIRTY_BIT_MAX
>-    };
>+    void updateMultiviewBaseViewLayerIndexUniformImpl(
>+        const gl::Program *program,
>+        const gl::FramebufferState &drawFramebufferState) const;
> 
>     const FunctionsGL *mFunctions;
> 
>@@ -226,15 +216,14 @@ class StateManagerGL final : angle::NonCopyable
>     angle::PackedEnumMap<gl::BufferBinding, std::vector<IndexedBufferBinding>> mIndexedBuffers;
> 
>     size_t mTextureUnitIndex;
>-    std::map<GLenum, std::vector<GLuint>> mTextures;
>-    std::vector<GLuint> mSamplers;
>+    angle::PackedEnumMap<gl::TextureType, gl::ActiveTextureArray<GLuint>> mTextures;
>+    gl::ActiveTextureArray<GLuint> mSamplers;
> 
>     struct ImageUnitBinding
>     {
>         ImageUnitBinding()
>             : texture(0), level(0), layered(false), layer(0), access(GL_READ_ONLY), format(GL_R32UI)
>-        {
>-        }
>+        {}
> 
>         GLuint texture;
>         GLint level;
>@@ -246,11 +235,15 @@ class StateManagerGL final : angle::NonCopyable
>     std::vector<ImageUnitBinding> mImages;
> 
>     GLuint mTransformFeedback;
>+    TransformFeedbackGL *mCurrentTransformFeedback;
>+
>+    // Queries that are currently running on the driver
>+    angle::PackedEnumMap<gl::QueryType, QueryGL *> mQueries;
> 
>-    std::map<GLenum, GLuint> mQueries;
>+    // Queries that are temporarily in the paused state so that their results will not be affected
>+    // by other operations
>+    angle::PackedEnumMap<gl::QueryType, QueryGL *> mTemporaryPausedQueries;
> 
>-    TransformFeedbackGL *mPrevDrawTransformFeedback;
>-    std::set<QueryGL *> mCurrentQueries;
>     gl::ContextID mPrevDrawContext;
> 
>     GLint mUnpackAlignment;
>@@ -270,9 +263,8 @@ class StateManagerGL final : angle::NonCopyable
>     GLuint mRenderbuffer;
> 
>     bool mScissorTestEnabled;
>-    std::vector<gl::Rectangle> mScissors;
>-    std::vector<gl::Rectangle> mViewports;
>-    std::vector<gl::Offset> mViewportOffsets;
>+    gl::Rectangle mScissor;
>+    gl::Rectangle mViewport;
>     float mNear;
>     float mFar;
> 
>@@ -344,17 +336,13 @@ class StateManagerGL final : angle::NonCopyable
>     GLint mPathStencilRef;
>     GLuint mPathStencilMask;
> 
>-    bool mIsSideBySideDrawFramebuffer;
>     const bool mIsMultiviewEnabled;
> 
>+    GLenum mProvokingVertex;
>+
>     gl::State::DirtyBits mLocalDirtyBits;
>     gl::AttributesMask mLocalDirtyCurrentValues;
>-
>-    // ANGLE_multiview dirty bits.
>-    angle::BitSet<MULTIVIEW_DIRTY_BIT_MAX> mMultiviewDirtyBits;
>-
>-    bool mProgramTexturesAndSamplersDirty;
> };
>-}
>+}  // namespace rx
> 
> #endif  // LIBANGLE_RENDERER_GL_STATEMANAGERGL_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/SurfaceGL.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/SurfaceGL.cpp
>index 19190bf8a8e..6959bb6715d 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/SurfaceGL.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/SurfaceGL.cpp
>@@ -8,26 +8,24 @@
> 
> #include "libANGLE/renderer/gl/SurfaceGL.h"
> 
>+#include "libANGLE/Context.h"
>+#include "libANGLE/Surface.h"
>+#include "libANGLE/renderer/gl/BlitGL.h"
>+#include "libANGLE/renderer/gl/ContextGL.h"
> #include "libANGLE/renderer/gl/FramebufferGL.h"
> #include "libANGLE/renderer/gl/RendererGL.h"
> 
> namespace rx
> {
> 
>-SurfaceGL::SurfaceGL(const egl::SurfaceState &state, RendererGL *renderer)
>-    : SurfaceImpl(state), mRenderer(renderer)
>-{
>-}
>+SurfaceGL::SurfaceGL(const egl::SurfaceState &state) : SurfaceImpl(state) {}
> 
>-SurfaceGL::~SurfaceGL()
>-{
>-}
>+SurfaceGL::~SurfaceGL() {}
> 
>-FramebufferImpl *SurfaceGL::createDefaultFramebuffer(const gl::FramebufferState &data)
>+FramebufferImpl *SurfaceGL::createDefaultFramebuffer(const gl::Context *context,
>+                                                     const gl::FramebufferState &data)
> {
>-    return new FramebufferGL(data, mRenderer->getFunctions(), mRenderer->getStateManager(),
>-                             mRenderer->getWorkarounds(), mRenderer->getBlitter(),
>-                             mRenderer->getMultiviewClearer(), true);
>+    return new FramebufferGL(data, 0, true);
> }
> 
> egl::Error SurfaceGL::getSyncValues(EGLuint64KHR *ust, EGLuint64KHR *msc, EGLuint64KHR *sbc)
>@@ -41,11 +39,16 @@ egl::Error SurfaceGL::unMakeCurrent()
>     return egl::NoError();
> }
> 
>-gl::Error SurfaceGL::initializeContents(const gl::Context *context,
>-                                        const gl::ImageIndex &imageIndex)
>+angle::Result SurfaceGL::initializeContents(const gl::Context *context,
>+                                            const gl::ImageIndex &imageIndex)
> {
>-    // UNIMPLEMENTED();
>-    return gl::NoError();
>+    FramebufferGL *framebufferGL = GetImplAs<FramebufferGL>(context->getFramebuffer(0));
>+    ASSERT(framebufferGL->isDefault());
>+
>+    BlitGL *blitter = GetBlitGL(context);
>+    ANGLE_TRY(blitter->clearFramebuffer(framebufferGL));
>+
>+    return angle::Result::Continue;
> }
> 
> }  // namespace rx
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/SurfaceGL.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/SurfaceGL.h
>index 6b3e1368b8e..d0e05ff1ae4 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/SurfaceGL.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/SurfaceGL.h
>@@ -14,27 +14,23 @@
> namespace rx
> {
> 
>-class RendererGL;
>-
> class SurfaceGL : public SurfaceImpl
> {
>   public:
>-    SurfaceGL(const egl::SurfaceState &state, RendererGL *renderer);
>+    SurfaceGL(const egl::SurfaceState &state);
>     ~SurfaceGL() override;
> 
>-    FramebufferImpl *createDefaultFramebuffer(const gl::FramebufferState &data) override;
>+    FramebufferImpl *createDefaultFramebuffer(const gl::Context *context,
>+                                              const gl::FramebufferState &data) override;
>     egl::Error getSyncValues(EGLuint64KHR *ust, EGLuint64KHR *msc, EGLuint64KHR *sbc) override;
> 
>-    gl::Error initializeContents(const gl::Context *context,
>-                                 const gl::ImageIndex &imageIndex) override;
>+    angle::Result initializeContents(const gl::Context *context,
>+                                     const gl::ImageIndex &imageIndex) override;
> 
>-    virtual egl::Error makeCurrent() = 0;
>+    virtual egl::Error makeCurrent(const gl::Context *context) = 0;
>     virtual egl::Error unMakeCurrent();
>-
>-  private:
>-    RendererGL *mRenderer;
> };
> 
>-}
>+}  // namespace rx
> 
>-#endif // LIBANGLE_RENDERER_GL_SURFACEGL_H_
>+#endif  // LIBANGLE_RENDERER_GL_SURFACEGL_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/SyncGL.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/SyncGL.cpp
>index 15759cf2247..6479e0132f0 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/SyncGL.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/SyncGL.cpp
>@@ -9,6 +9,8 @@
> #include "libANGLE/renderer/gl/SyncGL.h"
> 
> #include "common/debug.h"
>+#include "libANGLE/Context.h"
>+#include "libANGLE/renderer/gl/ContextGL.h"
> #include "libANGLE/renderer/gl/FunctionsGL.h"
> 
> namespace rx
>@@ -21,43 +23,46 @@ SyncGL::SyncGL(const FunctionsGL *functions) : SyncImpl(), mFunctions(functions)
> 
> SyncGL::~SyncGL()
> {
>-    if (mSyncObject != 0)
>-    {
>-        mFunctions->deleteSync(mSyncObject);
>-    }
>+    ASSERT(mSyncObject == 0);
> }
> 
>-gl::Error SyncGL::set(GLenum condition, GLbitfield flags)
>+void SyncGL::onDestroy(const gl::Context *context)
>+{
>+    ASSERT(mSyncObject != 0);
>+    mFunctions->deleteSync(mSyncObject);
>+    mSyncObject = 0;
>+}
>+
>+angle::Result SyncGL::set(const gl::Context *context, GLenum condition, GLbitfield flags)
> {
>     ASSERT(condition == GL_SYNC_GPU_COMMANDS_COMPLETE && flags == 0);
>     mSyncObject = mFunctions->fenceSync(condition, flags);
>-    if (mSyncObject == 0)
>-    {
>-        // if glFenceSync fails, it returns 0.
>-        return gl::OutOfMemory() << "glFenceSync failed to create a GLsync object.";
>-    }
>-
>-    return gl::NoError();
>+    ANGLE_CHECK(GetImplAs<ContextGL>(context), mSyncObject != 0,
>+                "glFenceSync failed to create a GLsync object.", GL_OUT_OF_MEMORY);
>+    return angle::Result::Continue;
> }
> 
>-gl::Error SyncGL::clientWait(GLbitfield flags, GLuint64 timeout, GLenum *outResult)
>+angle::Result SyncGL::clientWait(const gl::Context *context,
>+                                 GLbitfield flags,
>+                                 GLuint64 timeout,
>+                                 GLenum *outResult)
> {
>     ASSERT(mSyncObject != 0);
>     *outResult = mFunctions->clientWaitSync(mSyncObject, flags, timeout);
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error SyncGL::serverWait(GLbitfield flags, GLuint64 timeout)
>+angle::Result SyncGL::serverWait(const gl::Context *context, GLbitfield flags, GLuint64 timeout)
> {
>     ASSERT(mSyncObject != 0);
>     mFunctions->waitSync(mSyncObject, flags, timeout);
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error SyncGL::getStatus(GLint *outResult)
>+angle::Result SyncGL::getStatus(const gl::Context *context, GLint *outResult)
> {
>     ASSERT(mSyncObject != 0);
>     mFunctions->getSynciv(mSyncObject, GL_SYNC_STATUS, 1, nullptr, outResult);
>-    return gl::NoError();
>-}
>+    return angle::Result::Continue;
> }
>+}  // namespace rx
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/SyncGL.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/SyncGL.h
>index 8e36604ae8d..de3424db728 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/SyncGL.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/SyncGL.h
>@@ -21,15 +21,22 @@ class SyncGL : public SyncImpl
>     explicit SyncGL(const FunctionsGL *functions);
>     ~SyncGL() override;
> 
>-    gl::Error set(GLenum condition, GLbitfield flags) override;
>-    gl::Error clientWait(GLbitfield flags, GLuint64 timeout, GLenum *outResult) override;
>-    gl::Error serverWait(GLbitfield flags, GLuint64 timeout) override;
>-    gl::Error getStatus(GLint *outResult) override;
>+    void onDestroy(const gl::Context *context) override;
>+
>+    angle::Result set(const gl::Context *context, GLenum condition, GLbitfield flags) override;
>+    angle::Result clientWait(const gl::Context *context,
>+                             GLbitfield flags,
>+                             GLuint64 timeout,
>+                             GLenum *outResult) override;
>+    angle::Result serverWait(const gl::Context *context,
>+                             GLbitfield flags,
>+                             GLuint64 timeout) override;
>+    angle::Result getStatus(const gl::Context *context, GLint *outResult) override;
> 
>   private:
>     const FunctionsGL *mFunctions;
>     GLsync mSyncObject;
> };
>-}
>+}  // namespace rx
> 
> #endif  // LIBANGLE_RENDERER_GL_FENCESYNCGL_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/TextureGL.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/TextureGL.cpp
>index 2ff6fbc42ae..da3890160b3 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/TextureGL.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/TextureGL.cpp
>@@ -18,8 +18,10 @@
> #include "libANGLE/queryconversions.h"
> #include "libANGLE/renderer/gl/BlitGL.h"
> #include "libANGLE/renderer/gl/BufferGL.h"
>+#include "libANGLE/renderer/gl/ContextGL.h"
> #include "libANGLE/renderer/gl/FramebufferGL.h"
> #include "libANGLE/renderer/gl/FunctionsGL.h"
>+#include "libANGLE/renderer/gl/ImageGL.h"
> #include "libANGLE/renderer/gl/StateManagerGL.h"
> #include "libANGLE/renderer/gl/WorkaroundsGL.h"
> #include "libANGLE/renderer/gl/formatutilsgl.h"
>@@ -33,36 +35,13 @@ namespace rx
> namespace
> {
> 
>-size_t GetLevelInfoIndex(GLenum target, size_t level)
>+size_t GetLevelInfoIndex(gl::TextureTarget target, size_t level)
> {
>-    return gl::IsCubeMapTextureTarget(target)
>-               ? ((level * 6) + gl::CubeMapTextureTargetToLayerIndex(target))
>+    return gl::IsCubeMapFaceTarget(target)
>+               ? ((level * gl::kCubeFaceCount) + gl::CubeMapTextureTargetToFaceIndex(target))
>                : level;
> }
> 
>-bool UseTexImage2D(GLenum textureType)
>-{
>-    return textureType == GL_TEXTURE_2D || textureType == GL_TEXTURE_CUBE_MAP ||
>-           textureType == GL_TEXTURE_RECTANGLE_ANGLE;
>-}
>-
>-bool UseTexImage3D(GLenum textureType)
>-{
>-    return textureType == GL_TEXTURE_2D_ARRAY || textureType == GL_TEXTURE_3D;
>-}
>-
>-bool CompatibleTextureTarget(GLenum textureType, GLenum textureTarget)
>-{
>-    if (textureType != GL_TEXTURE_CUBE_MAP)
>-    {
>-        return textureType == textureTarget;
>-    }
>-    else
>-    {
>-        return gl::IsCubeMapTextureTarget(textureTarget);
>-    }
>-}
>-
> bool IsLUMAFormat(GLenum format)
> {
>     return format == GL_LUMINANCE || format == GL_ALPHA || format == GL_LUMINANCE_ALPHA;
>@@ -104,20 +83,30 @@ gl::Texture::DirtyBits GetLevelWorkaroundDirtyBits()
>     return bits;
> }
> 
>-}  // anonymous namespace
>-
>-LUMAWorkaroundGL::LUMAWorkaroundGL() : LUMAWorkaroundGL(false, GL_NONE)
>+size_t GetMaxLevelInfoCountForTextureType(gl::TextureType type)
> {
>+    switch (type)
>+    {
>+        case gl::TextureType::CubeMap:
>+            return (gl::IMPLEMENTATION_MAX_TEXTURE_LEVELS + 1) * gl::kCubeFaceCount;
>+
>+        case gl::TextureType::External:
>+            return 1;
>+
>+        default:
>+            return gl::IMPLEMENTATION_MAX_TEXTURE_LEVELS + 1;
>+    }
> }
> 
>+}  // anonymous namespace
>+
>+LUMAWorkaroundGL::LUMAWorkaroundGL() : LUMAWorkaroundGL(false, GL_NONE) {}
>+
> LUMAWorkaroundGL::LUMAWorkaroundGL(bool enabled_, GLenum workaroundFormat_)
>     : enabled(enabled_), workaroundFormat(workaroundFormat_)
>-{
>-}
>+{}
> 
>-LevelInfoGL::LevelInfoGL() : LevelInfoGL(GL_NONE, GL_NONE, false, LUMAWorkaroundGL())
>-{
>-}
>+LevelInfoGL::LevelInfoGL() : LevelInfoGL(GL_NONE, GL_NONE, false, LUMAWorkaroundGL()) {}
> 
> LevelInfoGL::LevelInfoGL(GLenum sourceFormat_,
>                          GLenum nativeInternalFormat_,
>@@ -127,65 +116,58 @@ LevelInfoGL::LevelInfoGL(GLenum sourceFormat_,
>       nativeInternalFormat(nativeInternalFormat_),
>       depthStencilWorkaround(depthStencilWorkaround_),
>       lumaWorkaround(lumaWorkaround_)
>-{
>-}
>+{}
> 
>-TextureGL::TextureGL(const gl::TextureState &state,
>-                     const FunctionsGL *functions,
>-                     const WorkaroundsGL &workarounds,
>-                     StateManagerGL *stateManager,
>-                     BlitGL *blitter)
>+TextureGL::TextureGL(const gl::TextureState &state, GLuint id)
>     : TextureImpl(state),
>-      mFunctions(functions),
>-      mWorkarounds(workarounds),
>-      mStateManager(stateManager),
>-      mBlitter(blitter),
>-      mLevelInfo(),
>       mAppliedSwizzle(state.getSwizzleState()),
>       mAppliedSampler(state.getSamplerState()),
>       mAppliedBaseLevel(state.getEffectiveBaseLevel()),
>       mAppliedMaxLevel(state.getEffectiveMaxLevel()),
>-      mTextureID(0)
>+      mTextureID(id)
> {
>-    ASSERT(mFunctions);
>-    ASSERT(mStateManager);
>-    ASSERT(mBlitter);
>-
>-    mFunctions->genTextures(1, &mTextureID);
>-    mStateManager->bindTexture(getTarget(), mTextureID);
>-    mLevelInfo.resize((gl::IMPLEMENTATION_MAX_TEXTURE_LEVELS + 1) *
>-                      (getTarget() == GL_TEXTURE_CUBE_MAP ? 6 : 1));
>+    mLevelInfo.resize(GetMaxLevelInfoCountForTextureType(getType()));
> }
> 
> TextureGL::~TextureGL()
> {
>-    mStateManager->deleteTexture(mTextureID);
>+    ASSERT(mTextureID == 0);
>+}
>+
>+void TextureGL::onDestroy(const gl::Context *context)
>+{
>+    StateManagerGL *stateManager = GetStateManagerGL(context);
>+    stateManager->deleteTexture(mTextureID);
>     mTextureID = 0;
> }
> 
>-gl::Error TextureGL::setImage(const gl::Context *context,
>-                              GLenum target,
>-                              size_t level,
>-                              GLenum internalFormat,
>-                              const gl::Extents &size,
>-                              GLenum format,
>-                              GLenum type,
>-                              const gl::PixelUnpackState &unpack,
>-                              const uint8_t *pixels)
>+angle::Result TextureGL::setImage(const gl::Context *context,
>+                                  const gl::ImageIndex &index,
>+                                  GLenum internalFormat,
>+                                  const gl::Extents &size,
>+                                  GLenum format,
>+                                  GLenum type,
>+                                  const gl::PixelUnpackState &unpack,
>+                                  const uint8_t *pixels)
> {
>+    const WorkaroundsGL &workarounds = GetWorkaroundsGL(context);
>+
>     const gl::Buffer *unpackBuffer =
>-        context->getGLState().getTargetBuffer(gl::BufferBinding::PixelUnpack);
>+        context->getState().getTargetBuffer(gl::BufferBinding::PixelUnpack);
>+
>+    gl::TextureTarget target = index.getTarget();
>+    size_t level             = static_cast<size_t>(index.getLevelIndex());
> 
>-    if (mWorkarounds.unpackOverlappingRowsSeparatelyUnpackBuffer && unpackBuffer &&
>+    if (workarounds.unpackOverlappingRowsSeparatelyUnpackBuffer && unpackBuffer &&
>         unpack.rowLength != 0 && unpack.rowLength < size.width)
>     {
>         // The rows overlap in unpack memory. Upload the texture row by row to work around
>         // driver bug.
>-        reserveTexImageToBeFilled(target, level, internalFormat, size, format, type);
>+        reserveTexImageToBeFilled(context, target, level, internalFormat, size, format, type);
> 
>         if (size.width == 0 || size.height == 0 || size.depth == 0)
>         {
>-            return gl::NoError();
>+            return angle::Result::Continue;
>         }
> 
>         gl::Box area(0, 0, 0, size.width, size.height, size.depth);
>@@ -193,23 +175,22 @@ gl::Error TextureGL::setImage(const gl::Context *context,
>                                              unpackBuffer, pixels);
>     }
> 
>-    if (mWorkarounds.unpackLastRowSeparatelyForPaddingInclusion)
>+    if (workarounds.unpackLastRowSeparatelyForPaddingInclusion)
>     {
>-        bool apply;
>-        ANGLE_TRY_RESULT(
>-            ShouldApplyLastRowPaddingWorkaround(size, unpack, unpackBuffer, format, type,
>-                                                UseTexImage3D(getTarget()), pixels),
>-            apply);
>+        bool apply = false;
>+        ANGLE_TRY(ShouldApplyLastRowPaddingWorkaround(
>+            GetImplAs<ContextGL>(context), size, unpack, unpackBuffer, format, type,
>+            nativegl::UseTexImage3D(getType()), pixels, &apply));
> 
>         // The driver will think the pixel buffer doesn't have enough data, work around this bug
>         // by uploading the last row (and last level if 3D) separately.
>         if (apply)
>         {
>-            reserveTexImageToBeFilled(target, level, internalFormat, size, format, type);
>+            reserveTexImageToBeFilled(context, target, level, internalFormat, size, format, type);
> 
>             if (size.width == 0 || size.height == 0 || size.depth == 0)
>             {
>-                return gl::NoError();
>+                return angle::Result::Continue;
>             }
> 
>             gl::Box area(0, 0, 0, size.width, size.height, size.depth);
>@@ -218,12 +199,13 @@ gl::Error TextureGL::setImage(const gl::Context *context,
>         }
>     }
> 
>-    setImageHelper(target, level, internalFormat, size, format, type, pixels);
>+    setImageHelper(context, target, level, internalFormat, size, format, type, pixels);
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-void TextureGL::setImageHelper(GLenum target,
>+void TextureGL::setImageHelper(const gl::Context *context,
>+                               gl::TextureTarget target,
>                                size_t level,
>                                GLenum internalFormat,
>                                const gl::Extents &size,
>@@ -231,81 +213,89 @@ void TextureGL::setImageHelper(GLenum target,
>                                GLenum type,
>                                const uint8_t *pixels)
> {
>-    ASSERT(CompatibleTextureTarget(getTarget(), target));
>+    ASSERT(TextureTargetToType(target) == getType());
>+
>+    const FunctionsGL *functions     = GetFunctionsGL(context);
>+    StateManagerGL *stateManager     = GetStateManagerGL(context);
>+    const WorkaroundsGL &workarounds = GetWorkaroundsGL(context);
> 
>     nativegl::TexImageFormat texImageFormat =
>-        nativegl::GetTexImageFormat(mFunctions, mWorkarounds, internalFormat, format, type);
>+        nativegl::GetTexImageFormat(functions, workarounds, internalFormat, format, type);
> 
>-    mStateManager->bindTexture(getTarget(), mTextureID);
>+    stateManager->bindTexture(getType(), mTextureID);
> 
>-    if (UseTexImage2D(getTarget()))
>+    if (nativegl::UseTexImage2D(getType()))
>     {
>         ASSERT(size.depth == 1);
>-        mFunctions->texImage2D(target, static_cast<GLint>(level), texImageFormat.internalFormat,
>-                               size.width, size.height, 0, texImageFormat.format,
>-                               texImageFormat.type, pixels);
>-    }
>-    else if (UseTexImage3D(getTarget()))
>-    {
>-        mFunctions->texImage3D(target, static_cast<GLint>(level), texImageFormat.internalFormat,
>-                               size.width, size.height, size.depth, 0, texImageFormat.format,
>-                               texImageFormat.type, pixels);
>+        functions->texImage2D(ToGLenum(target), static_cast<GLint>(level),
>+                              texImageFormat.internalFormat, size.width, size.height, 0,
>+                              texImageFormat.format, texImageFormat.type, pixels);
>     }
>     else
>     {
>-        UNREACHABLE();
>+        ASSERT(nativegl::UseTexImage3D(getType()));
>+        functions->texImage3D(ToGLenum(target), static_cast<GLint>(level),
>+                              texImageFormat.internalFormat, size.width, size.height, size.depth, 0,
>+                              texImageFormat.format, texImageFormat.type, pixels);
>     }
> 
>-    setLevelInfo(target, level, 1, GetLevelInfo(internalFormat, texImageFormat.internalFormat));
>+    setLevelInfo(context, target, level, 1,
>+                 GetLevelInfo(internalFormat, texImageFormat.internalFormat));
> }
> 
>-void TextureGL::reserveTexImageToBeFilled(GLenum target,
>+void TextureGL::reserveTexImageToBeFilled(const gl::Context *context,
>+                                          gl::TextureTarget target,
>                                           size_t level,
>                                           GLenum internalFormat,
>                                           const gl::Extents &size,
>                                           GLenum format,
>                                           GLenum type)
> {
>-    mStateManager->setPixelUnpackBuffer(nullptr);
>-    setImageHelper(target, level, internalFormat, size, format, type, nullptr);
>+    StateManagerGL *stateManager = GetStateManagerGL(context);
>+    stateManager->setPixelUnpackBuffer(nullptr);
>+    setImageHelper(context, target, level, internalFormat, size, format, type, nullptr);
> }
> 
>-gl::Error TextureGL::setSubImage(const gl::Context *context,
>-                                 GLenum target,
>-                                 size_t level,
>-                                 const gl::Box &area,
>-                                 GLenum format,
>-                                 GLenum type,
>-                                 const gl::PixelUnpackState &unpack,
>-                                 const uint8_t *pixels)
>+angle::Result TextureGL::setSubImage(const gl::Context *context,
>+                                     const gl::ImageIndex &index,
>+                                     const gl::Box &area,
>+                                     GLenum format,
>+                                     GLenum type,
>+                                     const gl::PixelUnpackState &unpack,
>+                                     gl::Buffer *unpackBuffer,
>+                                     const uint8_t *pixels)
> {
>-    ASSERT(CompatibleTextureTarget(getTarget(), target));
>-    const gl::Buffer *unpackBuffer =
>-        context->getGLState().getTargetBuffer(gl::BufferBinding::PixelUnpack);
>+    ASSERT(TextureTargetToType(index.getTarget()) == getType());
>+
>+    const FunctionsGL *functions     = GetFunctionsGL(context);
>+    StateManagerGL *stateManager     = GetStateManagerGL(context);
>+    const WorkaroundsGL &workarounds = GetWorkaroundsGL(context);
> 
>     nativegl::TexSubImageFormat texSubImageFormat =
>-        nativegl::GetTexSubImageFormat(mFunctions, mWorkarounds, format, type);
>+        nativegl::GetTexSubImageFormat(functions, workarounds, format, type);
>+
>+    gl::TextureTarget target = index.getTarget();
>+    size_t level             = static_cast<size_t>(index.getLevelIndex());
> 
>     ASSERT(getLevelInfo(target, level).lumaWorkaround.enabled ==
>            GetLevelInfo(format, texSubImageFormat.format).lumaWorkaround.enabled);
> 
>-    mStateManager->bindTexture(getTarget(), mTextureID);
>-    if (mWorkarounds.unpackOverlappingRowsSeparatelyUnpackBuffer && unpackBuffer &&
>+    stateManager->bindTexture(getType(), mTextureID);
>+    if (workarounds.unpackOverlappingRowsSeparatelyUnpackBuffer && unpackBuffer &&
>         unpack.rowLength != 0 && unpack.rowLength < area.width)
>     {
>         return setSubImageRowByRowWorkaround(context, target, level, area, format, type, unpack,
>                                              unpackBuffer, pixels);
>     }
> 
>-    if (mWorkarounds.unpackLastRowSeparatelyForPaddingInclusion)
>+    if (workarounds.unpackLastRowSeparatelyForPaddingInclusion)
>     {
>         gl::Extents size(area.width, area.height, area.depth);
> 
>-        bool apply;
>-        ANGLE_TRY_RESULT(
>-            ShouldApplyLastRowPaddingWorkaround(size, unpack, unpackBuffer, format, type,
>-                                                UseTexImage3D(getTarget()), pixels),
>-            apply);
>+        bool apply = false;
>+        ANGLE_TRY(ShouldApplyLastRowPaddingWorkaround(
>+            GetImplAs<ContextGL>(context), size, unpack, unpackBuffer, format, type,
>+            nativegl::UseTexImage3D(getType()), pixels, &apply));
> 
>         // The driver will think the pixel buffer doesn't have enough data, work around this bug
>         // by uploading the last row (and last level if 3D) separately.
>@@ -316,50 +306,55 @@ gl::Error TextureGL::setSubImage(const gl::Context *context,
>         }
>     }
> 
>-    if (UseTexImage2D(getTarget()))
>+    if (nativegl::UseTexImage2D(getType()))
>     {
>         ASSERT(area.z == 0 && area.depth == 1);
>-        mFunctions->texSubImage2D(target, static_cast<GLint>(level), area.x, area.y, area.width,
>-                                  area.height, texSubImageFormat.format, texSubImageFormat.type,
>-                                  pixels);
>+        functions->texSubImage2D(ToGLenum(target), static_cast<GLint>(level), area.x, area.y,
>+                                 area.width, area.height, texSubImageFormat.format,
>+                                 texSubImageFormat.type, pixels);
>     }
>     else
>     {
>-        ASSERT(UseTexImage3D(getTarget()));
>-        mFunctions->texSubImage3D(target, static_cast<GLint>(level), area.x, area.y, area.z,
>-                                  area.width, area.height, area.depth, texSubImageFormat.format,
>-                                  texSubImageFormat.type, pixels);
>+        ASSERT(nativegl::UseTexImage3D(getType()));
>+        functions->texSubImage3D(ToGLenum(target), static_cast<GLint>(level), area.x, area.y,
>+                                 area.z, area.width, area.height, area.depth,
>+                                 texSubImageFormat.format, texSubImageFormat.type, pixels);
>     }
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error TextureGL::setSubImageRowByRowWorkaround(const gl::Context *context,
>-                                                   GLenum target,
>-                                                   size_t level,
>-                                                   const gl::Box &area,
>-                                                   GLenum format,
>-                                                   GLenum type,
>-                                                   const gl::PixelUnpackState &unpack,
>-                                                   const gl::Buffer *unpackBuffer,
>-                                                   const uint8_t *pixels)
>+angle::Result TextureGL::setSubImageRowByRowWorkaround(const gl::Context *context,
>+                                                       gl::TextureTarget target,
>+                                                       size_t level,
>+                                                       const gl::Box &area,
>+                                                       GLenum format,
>+                                                       GLenum type,
>+                                                       const gl::PixelUnpackState &unpack,
>+                                                       const gl::Buffer *unpackBuffer,
>+                                                       const uint8_t *pixels)
> {
>+    ContextGL *contextGL         = GetImplAs<ContextGL>(context);
>+    const FunctionsGL *functions = GetFunctionsGL(context);
>+    StateManagerGL *stateManager = GetStateManagerGL(context);
>+
>     gl::PixelUnpackState directUnpack;
>-    directUnpack.alignment   = 1;
>-    mStateManager->setPixelUnpackState(directUnpack);
>-    mStateManager->setPixelUnpackBuffer(unpackBuffer);
>-
>-    const gl::InternalFormat &glFormat   = gl::GetInternalFormatInfo(format, type);
>-    GLuint rowBytes                      = 0;
>-    ANGLE_TRY_RESULT(glFormat.computeRowPitch(type, area.width, unpack.alignment, unpack.rowLength),
>-                     rowBytes);
>+    directUnpack.alignment = 1;
>+    stateManager->setPixelUnpackState(directUnpack);
>+    stateManager->setPixelUnpackBuffer(unpackBuffer);
>+
>+    const gl::InternalFormat &glFormat = gl::GetInternalFormatInfo(format, type);
>+    GLuint rowBytes                    = 0;
>+    ANGLE_CHECK_GL_MATH(contextGL, glFormat.computeRowPitch(type, area.width, unpack.alignment,
>+                                                            unpack.rowLength, &rowBytes));
>     GLuint imageBytes = 0;
>-    ANGLE_TRY_RESULT(glFormat.computeDepthPitch(area.height, unpack.imageHeight, rowBytes),
>-                     imageBytes);
>-    bool useTexImage3D = UseTexImage3D(getTarget());
>+    ANGLE_CHECK_GL_MATH(contextGL, glFormat.computeDepthPitch(area.height, unpack.imageHeight,
>+                                                              rowBytes, &imageBytes));
>+
>+    bool useTexImage3D = nativegl::UseTexImage3D(getType());
>     GLuint skipBytes   = 0;
>-    ANGLE_TRY_RESULT(glFormat.computeSkipBytes(rowBytes, imageBytes, unpack, useTexImage3D),
>-                     skipBytes);
>+    ANGLE_CHECK_GL_MATH(contextGL, glFormat.computeSkipBytes(type, rowBytes, imageBytes, unpack,
>+                                                             useTexImage3D, &skipBytes));
> 
>     const uint8_t *pixelsWithSkip = pixels + skipBytes;
>     if (useTexImage3D)
>@@ -371,62 +366,66 @@ gl::Error TextureGL::setSubImageRowByRowWorkaround(const gl::Context *context,
>             {
>                 GLint byteOffset         = imageByteOffset + row * rowBytes;
>                 const GLubyte *rowPixels = pixelsWithSkip + byteOffset;
>-                mFunctions->texSubImage3D(target, static_cast<GLint>(level), area.x, row + area.y,
>-                                          image + area.z, area.width, 1, 1, format, type,
>-                                          rowPixels);
>+                functions->texSubImage3D(ToGLenum(target), static_cast<GLint>(level), area.x,
>+                                         row + area.y, image + area.z, area.width, 1, 1, format,
>+                                         type, rowPixels);
>             }
>         }
>     }
>     else
>     {
>-        ASSERT(UseTexImage2D(getTarget()));
>+        ASSERT(nativegl::UseTexImage2D(getType()));
>         for (GLint row = 0; row < area.height; ++row)
>         {
>             GLint byteOffset         = row * rowBytes;
>             const GLubyte *rowPixels = pixelsWithSkip + byteOffset;
>-            mFunctions->texSubImage2D(target, static_cast<GLint>(level), area.x, row + area.y,
>-                                      area.width, 1, format, type, rowPixels);
>+            functions->texSubImage2D(ToGLenum(target), static_cast<GLint>(level), area.x,
>+                                     row + area.y, area.width, 1, format, type, rowPixels);
>         }
>     }
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error TextureGL::setSubImagePaddingWorkaround(const gl::Context *context,
>-                                                  GLenum target,
>-                                                  size_t level,
>-                                                  const gl::Box &area,
>-                                                  GLenum format,
>-                                                  GLenum type,
>-                                                  const gl::PixelUnpackState &unpack,
>-                                                  const gl::Buffer *unpackBuffer,
>-                                                  const uint8_t *pixels)
>+angle::Result TextureGL::setSubImagePaddingWorkaround(const gl::Context *context,
>+                                                      gl::TextureTarget target,
>+                                                      size_t level,
>+                                                      const gl::Box &area,
>+                                                      GLenum format,
>+                                                      GLenum type,
>+                                                      const gl::PixelUnpackState &unpack,
>+                                                      const gl::Buffer *unpackBuffer,
>+                                                      const uint8_t *pixels)
> {
>+    ContextGL *contextGL         = GetImplAs<ContextGL>(context);
>+    const FunctionsGL *functions = GetFunctionsGL(context);
>+    StateManagerGL *stateManager = GetStateManagerGL(context);
>+
>     const gl::InternalFormat &glFormat = gl::GetInternalFormatInfo(format, type);
>-    GLuint rowBytes = 0;
>-    ANGLE_TRY_RESULT(glFormat.computeRowPitch(type, area.width, unpack.alignment, unpack.rowLength),
>-                     rowBytes);
>+    GLuint rowBytes                    = 0;
>+    ANGLE_CHECK_GL_MATH(contextGL, glFormat.computeRowPitch(type, area.width, unpack.alignment,
>+                                                            unpack.rowLength, &rowBytes));
>     GLuint imageBytes = 0;
>-    ANGLE_TRY_RESULT(glFormat.computeDepthPitch(area.height, unpack.imageHeight, rowBytes),
>-                     imageBytes);
>-    bool useTexImage3D = UseTexImage3D(getTarget());
>+    ANGLE_CHECK_GL_MATH(contextGL, glFormat.computeDepthPitch(area.height, unpack.imageHeight,
>+                                                              rowBytes, &imageBytes));
>+    bool useTexImage3D = nativegl::UseTexImage3D(getType());
>     GLuint skipBytes   = 0;
>-    ANGLE_TRY_RESULT(glFormat.computeSkipBytes(rowBytes, imageBytes, unpack, useTexImage3D),
>-                     skipBytes);
>+    ANGLE_CHECK_GL_MATH(contextGL, glFormat.computeSkipBytes(type, rowBytes, imageBytes, unpack,
>+                                                             useTexImage3D, &skipBytes));
> 
>-    mStateManager->setPixelUnpackState(unpack);
>-    mStateManager->setPixelUnpackBuffer(unpackBuffer);
>+    stateManager->setPixelUnpackState(unpack);
>+    stateManager->setPixelUnpackBuffer(unpackBuffer);
> 
>     gl::PixelUnpackState directUnpack;
>-    directUnpack.alignment   = 1;
>+    directUnpack.alignment = 1;
> 
>     if (useTexImage3D)
>     {
>         // Upload all but the last slice
>         if (area.depth > 1)
>         {
>-            mFunctions->texSubImage3D(target, static_cast<GLint>(level), area.x, area.y, area.z,
>-                                      area.width, area.height, area.depth - 1, format, type,
>-                                      pixels);
>+            functions->texSubImage3D(ToGLenum(target), static_cast<GLint>(level), area.x, area.y,
>+                                     area.z, area.width, area.height, area.depth - 1, format, type,
>+                                     pixels);
>         }
> 
>         // Upload the last slice but its last row
>@@ -436,401 +435,433 @@ gl::Error TextureGL::setSubImagePaddingWorkaround(const gl::Context *context,
>             // the driver
>             GLint lastImageOffset          = (area.depth - 1) * imageBytes;
>             const GLubyte *lastImagePixels = pixels + lastImageOffset;
>-            mFunctions->texSubImage3D(target, static_cast<GLint>(level), area.x, area.y,
>-                                      area.z + area.depth - 1, area.width, area.height - 1, 1,
>-                                      format, type, lastImagePixels);
>+            functions->texSubImage3D(ToGLenum(target), static_cast<GLint>(level), area.x, area.y,
>+                                     area.z + area.depth - 1, area.width, area.height - 1, 1,
>+                                     format, type, lastImagePixels);
>         }
> 
>         // Upload the last row of the last slice "manually"
>-        mStateManager->setPixelUnpackState(directUnpack);
>+        stateManager->setPixelUnpackState(directUnpack);
> 
>         GLint lastRowOffset =
>             skipBytes + (area.depth - 1) * imageBytes + (area.height - 1) * rowBytes;
>         const GLubyte *lastRowPixels = pixels + lastRowOffset;
>-        mFunctions->texSubImage3D(target, static_cast<GLint>(level), area.x,
>-                                  area.y + area.height - 1, area.z + area.depth - 1, area.width, 1,
>-                                  1, format, type, lastRowPixels);
>+        functions->texSubImage3D(ToGLenum(target), static_cast<GLint>(level), area.x,
>+                                 area.y + area.height - 1, area.z + area.depth - 1, area.width, 1,
>+                                 1, format, type, lastRowPixels);
>     }
>     else
>     {
>-        ASSERT(UseTexImage2D(getTarget()));
>+        ASSERT(nativegl::UseTexImage2D(getType()));
> 
>         // Upload all but the last row
>         if (area.height > 1)
>         {
>-            mFunctions->texSubImage2D(target, static_cast<GLint>(level), area.x, area.y, area.width,
>-                                      area.height - 1, format, type, pixels);
>+            functions->texSubImage2D(ToGLenum(target), static_cast<GLint>(level), area.x, area.y,
>+                                     area.width, area.height - 1, format, type, pixels);
>         }
> 
>         // Upload the last row "manually"
>-        mStateManager->setPixelUnpackState(directUnpack);
>+        stateManager->setPixelUnpackState(directUnpack);
> 
>         GLint lastRowOffset          = skipBytes + (area.height - 1) * rowBytes;
>         const GLubyte *lastRowPixels = pixels + lastRowOffset;
>-        mFunctions->texSubImage2D(target, static_cast<GLint>(level), area.x,
>-                                  area.y + area.height - 1, area.width, 1, format, type,
>-                                  lastRowPixels);
>+        functions->texSubImage2D(ToGLenum(target), static_cast<GLint>(level), area.x,
>+                                 area.y + area.height - 1, area.width, 1, format, type,
>+                                 lastRowPixels);
>     }
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error TextureGL::setCompressedImage(const gl::Context *context,
>-                                        GLenum target,
>-                                        size_t level,
>-                                        GLenum internalFormat,
>-                                        const gl::Extents &size,
>-                                        const gl::PixelUnpackState &unpack,
>-                                        size_t imageSize,
>-                                        const uint8_t *pixels)
>+angle::Result TextureGL::setCompressedImage(const gl::Context *context,
>+                                            const gl::ImageIndex &index,
>+                                            GLenum internalFormat,
>+                                            const gl::Extents &size,
>+                                            const gl::PixelUnpackState &unpack,
>+                                            size_t imageSize,
>+                                            const uint8_t *pixels)
> {
>-    ASSERT(CompatibleTextureTarget(getTarget(), target));
>+    const FunctionsGL *functions     = GetFunctionsGL(context);
>+    StateManagerGL *stateManager     = GetStateManagerGL(context);
>+    const WorkaroundsGL &workarounds = GetWorkaroundsGL(context);
>+
>+    gl::TextureTarget target = index.getTarget();
>+    size_t level             = static_cast<size_t>(index.getLevelIndex());
>+    ASSERT(TextureTargetToType(target) == getType());
> 
>     nativegl::CompressedTexImageFormat compressedTexImageFormat =
>-        nativegl::GetCompressedTexImageFormat(mFunctions, mWorkarounds, internalFormat);
>+        nativegl::GetCompressedTexImageFormat(functions, workarounds, internalFormat);
> 
>-    mStateManager->bindTexture(getTarget(), mTextureID);
>-    if (UseTexImage2D(getTarget()))
>+    stateManager->bindTexture(getType(), mTextureID);
>+    if (nativegl::UseTexImage2D(getType()))
>     {
>         ASSERT(size.depth == 1);
>-        mFunctions->compressedTexImage2D(target, static_cast<GLint>(level),
>-                                         compressedTexImageFormat.internalFormat, size.width,
>-                                         size.height, 0, static_cast<GLsizei>(imageSize), pixels);
>-    }
>-    else if (UseTexImage3D(getTarget()))
>-    {
>-        mFunctions->compressedTexImage3D(
>-            target, static_cast<GLint>(level), compressedTexImageFormat.internalFormat, size.width,
>-            size.height, size.depth, 0, static_cast<GLsizei>(imageSize), pixels);
>+        functions->compressedTexImage2D(ToGLenum(target), static_cast<GLint>(level),
>+                                        compressedTexImageFormat.internalFormat, size.width,
>+                                        size.height, 0, static_cast<GLsizei>(imageSize), pixels);
>     }
>     else
>     {
>-        UNREACHABLE();
>+        ASSERT(nativegl::UseTexImage3D(getType()));
>+        functions->compressedTexImage3D(
>+            ToGLenum(target), static_cast<GLint>(level), compressedTexImageFormat.internalFormat,
>+            size.width, size.height, size.depth, 0, static_cast<GLsizei>(imageSize), pixels);
>     }
> 
>     LevelInfoGL levelInfo = GetLevelInfo(internalFormat, compressedTexImageFormat.internalFormat);
>     ASSERT(!levelInfo.lumaWorkaround.enabled);
>-    setLevelInfo(target, level, 1, levelInfo);
>+    setLevelInfo(context, target, level, 1, levelInfo);
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error TextureGL::setCompressedSubImage(const gl::Context *context,
>-                                           GLenum target,
>-                                           size_t level,
>-                                           const gl::Box &area,
>-                                           GLenum format,
>-                                           const gl::PixelUnpackState &unpack,
>-                                           size_t imageSize,
>-                                           const uint8_t *pixels)
>+angle::Result TextureGL::setCompressedSubImage(const gl::Context *context,
>+                                               const gl::ImageIndex &index,
>+                                               const gl::Box &area,
>+                                               GLenum format,
>+                                               const gl::PixelUnpackState &unpack,
>+                                               size_t imageSize,
>+                                               const uint8_t *pixels)
> {
>-    ASSERT(CompatibleTextureTarget(getTarget(), target));
>+    const FunctionsGL *functions     = GetFunctionsGL(context);
>+    StateManagerGL *stateManager     = GetStateManagerGL(context);
>+    const WorkaroundsGL &workarounds = GetWorkaroundsGL(context);
>+
>+    gl::TextureTarget target = index.getTarget();
>+    size_t level             = static_cast<size_t>(index.getLevelIndex());
>+    ASSERT(TextureTargetToType(target) == getType());
> 
>     nativegl::CompressedTexSubImageFormat compressedTexSubImageFormat =
>-        nativegl::GetCompressedSubTexImageFormat(mFunctions, mWorkarounds, format);
>+        nativegl::GetCompressedSubTexImageFormat(functions, workarounds, format);
> 
>-    mStateManager->bindTexture(getTarget(), mTextureID);
>-    if (UseTexImage2D(getTarget()))
>+    stateManager->bindTexture(getType(), mTextureID);
>+    if (nativegl::UseTexImage2D(getType()))
>     {
>         ASSERT(area.z == 0 && area.depth == 1);
>-        mFunctions->compressedTexSubImage2D(
>-            target, static_cast<GLint>(level), area.x, area.y, area.width, area.height,
>+        functions->compressedTexSubImage2D(
>+            ToGLenum(target), static_cast<GLint>(level), area.x, area.y, area.width, area.height,
>             compressedTexSubImageFormat.format, static_cast<GLsizei>(imageSize), pixels);
>     }
>-    else if (UseTexImage3D(getTarget()))
>-    {
>-        mFunctions->compressedTexSubImage3D(target, static_cast<GLint>(level), area.x, area.y,
>-                                            area.z, area.width, area.height, area.depth,
>-                                            compressedTexSubImageFormat.format,
>-                                            static_cast<GLsizei>(imageSize), pixels);
>-    }
>     else
>     {
>-        UNREACHABLE();
>+        ASSERT(nativegl::UseTexImage3D(getType()));
>+        functions->compressedTexSubImage3D(ToGLenum(target), static_cast<GLint>(level), area.x,
>+                                           area.y, area.z, area.width, area.height, area.depth,
>+                                           compressedTexSubImageFormat.format,
>+                                           static_cast<GLsizei>(imageSize), pixels);
>     }
> 
>     ASSERT(!getLevelInfo(target, level).lumaWorkaround.enabled &&
>            !GetLevelInfo(format, compressedTexSubImageFormat.format).lumaWorkaround.enabled);
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error TextureGL::copyImage(const gl::Context *context,
>-                               GLenum target,
>-                               size_t level,
>-                               const gl::Rectangle &origSourceArea,
>-                               GLenum internalFormat,
>-                               const gl::Framebuffer *source)
>+angle::Result TextureGL::copyImage(const gl::Context *context,
>+                                   const gl::ImageIndex &index,
>+                                   const gl::Rectangle &sourceArea,
>+                                   GLenum internalFormat,
>+                                   gl::Framebuffer *source)
> {
>-    GLenum type = source->getImplementationColorReadType(context);
>+    ContextGL *contextGL             = GetImplAs<ContextGL>(context);
>+    const FunctionsGL *functions     = GetFunctionsGL(context);
>+    StateManagerGL *stateManager     = GetStateManagerGL(context);
>+    const WorkaroundsGL &workarounds = GetWorkaroundsGL(context);
>+
>+    gl::TextureTarget target = index.getTarget();
>+    size_t level             = static_cast<size_t>(index.getLevelIndex());
>+    GLenum type              = GL_NONE;
>+    ANGLE_TRY(source->getImplementationColorReadType(context, &type));
>     nativegl::CopyTexImageImageFormat copyTexImageFormat =
>-        nativegl::GetCopyTexImageImageFormat(mFunctions, mWorkarounds, internalFormat, type);
>+        nativegl::GetCopyTexImageImageFormat(functions, workarounds, internalFormat, type);
> 
>-    mStateManager->bindTexture(getTarget(), mTextureID);
>+    stateManager->bindTexture(getType(), mTextureID);
> 
>     const FramebufferGL *sourceFramebufferGL = GetImplAs<FramebufferGL>(source);
>     gl::Extents fbSize = sourceFramebufferGL->getState().getReadAttachment()->getSize();
> 
>     // Did the read area go outside the framebuffer?
>-    bool outside = origSourceArea.x < 0 || origSourceArea.y < 0 ||
>-                   origSourceArea.x + origSourceArea.width > fbSize.width ||
>-                   origSourceArea.y + origSourceArea.height > fbSize.height;
>-
>-    // In WebGL mode the area outside the framebuffer must be zeroed.
>-    // We just zero the whole thing before copying into the area that overlaps the framebuffer.
>-    if (outside && context->getExtensions().webglCompatibility)
>+    bool outside = sourceArea.x < 0 || sourceArea.y < 0 ||
>+                   sourceArea.x + sourceArea.width > fbSize.width ||
>+                   sourceArea.y + sourceArea.height > fbSize.height;
>+
>+    // TODO: Find a way to initialize the texture entirely in the gl level with ensureInitialized.
>+    // Right now there is no easy way to pre-fill the texture when it is being redefined with
>+    // partially uninitialized data.
>+    bool requiresInitialization =
>+        outside && (context->isRobustResourceInitEnabled() || context->isWebGL());
>+
>+    // When robust resource initialization is enabled, the area outside the framebuffer must be
>+    // zeroed. We just zero the whole thing before copying into the area that overlaps the
>+    // framebuffer.
>+    if (requiresInitialization)
>     {
>-        // TODO(fjhenigman): When robust resource initialization is implemented, avoid redundant
>-        // clearing of the texture.
>         GLuint pixelBytes =
>             gl::GetInternalFormatInfo(copyTexImageFormat.internalFormat, type).pixelBytes;
>         angle::MemoryBuffer *zero;
>-        ANGLE_TRY(context->getZeroFilledBuffer(
>-            origSourceArea.width * origSourceArea.height * pixelBytes, &zero));
>+        ANGLE_CHECK_GL_ALLOC(
>+            contextGL,
>+            context->getZeroFilledBuffer(sourceArea.width * sourceArea.height * pixelBytes, &zero));
> 
>         gl::PixelUnpackState unpack;
>         unpack.alignment = 1;
>-        mStateManager->setPixelUnpackState(unpack);
>-        mStateManager->setPixelUnpackBuffer(nullptr);
>+        stateManager->setPixelUnpackState(unpack);
>+        stateManager->setPixelUnpackBuffer(nullptr);
> 
>-        mFunctions->texImage2D(target, static_cast<GLint>(level), copyTexImageFormat.internalFormat,
>-                               origSourceArea.width, origSourceArea.height, 0,
>-                               gl::GetUnsizedFormat(copyTexImageFormat.internalFormat), type,
>-                               zero->data());
>+        functions->texImage2D(
>+            ToGLenum(target), static_cast<GLint>(level), copyTexImageFormat.internalFormat,
>+            sourceArea.width, sourceArea.height, 0,
>+            gl::GetUnsizedFormat(copyTexImageFormat.internalFormat), type, zero->data());
>     }
> 
>     // Clip source area to framebuffer and copy if remaining area is not empty.
>-    gl::Rectangle sourceArea;
>-    if (ClipRectangle(origSourceArea, gl::Rectangle(0, 0, fbSize.width, fbSize.height),
>-                      &sourceArea))
>+    gl::Rectangle clippedArea;
>+    if (ClipRectangle(sourceArea, gl::Rectangle(0, 0, fbSize.width, fbSize.height), &clippedArea))
>     {
>         LevelInfoGL levelInfo = GetLevelInfo(internalFormat, copyTexImageFormat.internalFormat);
>-        gl::Offset destOffset(sourceArea.x - origSourceArea.x, sourceArea.y - origSourceArea.y, 0);
>+        gl::Offset destOffset(clippedArea.x - sourceArea.x, clippedArea.y - sourceArea.y, 0);
> 
>         if (levelInfo.lumaWorkaround.enabled)
>         {
>-            if (outside)
>+            BlitGL *blitter = GetBlitGL(context);
>+
>+            if (requiresInitialization)
>             {
>-                ANGLE_TRY(mBlitter->copySubImageToLUMAWorkaroundTexture(
>-                    context, mTextureID, getTarget(), target, levelInfo.sourceFormat, level,
>-                    destOffset, sourceArea, source));
>+                ANGLE_TRY(blitter->copySubImageToLUMAWorkaroundTexture(
>+                    context, mTextureID, getType(), target, levelInfo.sourceFormat, level,
>+                    destOffset, clippedArea, source));
>             }
>             else
>             {
>-                ANGLE_TRY(mBlitter->copyImageToLUMAWorkaroundTexture(
>-                    context, mTextureID, getTarget(), target, levelInfo.sourceFormat, level,
>-                    sourceArea, copyTexImageFormat.internalFormat, source));
>+                ANGLE_TRY(blitter->copyImageToLUMAWorkaroundTexture(
>+                    context, mTextureID, getType(), target, levelInfo.sourceFormat, level,
>+                    clippedArea, copyTexImageFormat.internalFormat, source));
>             }
>         }
>-        else if (UseTexImage2D(getTarget()))
>+        else
>         {
>-            mStateManager->bindFramebuffer(GL_READ_FRAMEBUFFER,
>-                                           sourceFramebufferGL->getFramebufferID());
>-            if (outside)
>+            ASSERT(nativegl::UseTexImage2D(getType()));
>+            stateManager->bindFramebuffer(GL_READ_FRAMEBUFFER,
>+                                          sourceFramebufferGL->getFramebufferID());
>+            if (requiresInitialization)
>             {
>-                mFunctions->copyTexSubImage2D(target, static_cast<GLint>(level), destOffset.x,
>-                                              destOffset.y, sourceArea.x, sourceArea.y,
>-                                              sourceArea.width, sourceArea.height);
>+                functions->copyTexSubImage2D(ToGLenum(target), static_cast<GLint>(level),
>+                                             destOffset.x, destOffset.y, clippedArea.x,
>+                                             clippedArea.y, clippedArea.width, clippedArea.height);
>             }
>             else
>             {
>-                mFunctions->copyTexImage2D(target, static_cast<GLint>(level),
>-                                           copyTexImageFormat.internalFormat, sourceArea.x,
>-                                           sourceArea.y, sourceArea.width, sourceArea.height, 0);
>+                functions->copyTexImage2D(ToGLenum(target), static_cast<GLint>(level),
>+                                          copyTexImageFormat.internalFormat, clippedArea.x,
>+                                          clippedArea.y, clippedArea.width, clippedArea.height, 0);
>             }
>         }
>-        else
>-        {
>-            UNREACHABLE();
>-        }
> 
>-        setLevelInfo(target, level, 1, levelInfo);
>+        setLevelInfo(context, target, level, 1, levelInfo);
>     }
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error TextureGL::copySubImage(const gl::Context *context,
>-                                  GLenum target,
>-                                  size_t level,
>-                                  const gl::Offset &origDestOffset,
>-                                  const gl::Rectangle &origSourceArea,
>-                                  const gl::Framebuffer *source)
>+angle::Result TextureGL::copySubImage(const gl::Context *context,
>+                                      const gl::ImageIndex &index,
>+                                      const gl::Offset &destOffset,
>+                                      const gl::Rectangle &sourceArea,
>+                                      gl::Framebuffer *source)
> {
>+    const FunctionsGL *functions = GetFunctionsGL(context);
>+    StateManagerGL *stateManager = GetStateManagerGL(context);
>+
>+    gl::TextureTarget target                 = index.getTarget();
>+    size_t level                             = static_cast<size_t>(index.getLevelIndex());
>     const FramebufferGL *sourceFramebufferGL = GetImplAs<FramebufferGL>(source);
> 
>     // Clip source area to framebuffer.
>     const gl::Extents fbSize = sourceFramebufferGL->getState().getReadAttachment()->getSize();
>-    gl::Rectangle sourceArea;
>-    if (!ClipRectangle(origSourceArea, gl::Rectangle(0, 0, fbSize.width, fbSize.height),
>-                       &sourceArea))
>+    gl::Rectangle clippedArea;
>+    if (!ClipRectangle(sourceArea, gl::Rectangle(0, 0, fbSize.width, fbSize.height), &clippedArea))
>     {
>         // nothing to do
>-        return gl::NoError();
>+        return angle::Result::Continue;
>     }
>-    gl::Offset destOffset(origDestOffset.x + sourceArea.x - origSourceArea.x,
>-                          origDestOffset.y + sourceArea.y - origSourceArea.y, origDestOffset.z);
>+    gl::Offset clippedOffset(destOffset.x + clippedArea.x - sourceArea.x,
>+                             destOffset.y + clippedArea.y - sourceArea.y, destOffset.z);
> 
>-    mStateManager->bindTexture(getTarget(), mTextureID);
>-    mStateManager->bindFramebuffer(GL_READ_FRAMEBUFFER, sourceFramebufferGL->getFramebufferID());
>+    stateManager->bindTexture(getType(), mTextureID);
>+    stateManager->bindFramebuffer(GL_READ_FRAMEBUFFER, sourceFramebufferGL->getFramebufferID());
> 
>     const LevelInfoGL &levelInfo = getLevelInfo(target, level);
>     if (levelInfo.lumaWorkaround.enabled)
>     {
>-        gl::Error error = mBlitter->copySubImageToLUMAWorkaroundTexture(
>-            context, mTextureID, getTarget(), target, levelInfo.sourceFormat, level, destOffset,
>-            sourceArea, source);
>-        if (error.isError())
>-        {
>-            return error;
>-        }
>+        BlitGL *blitter = GetBlitGL(context);
>+        ANGLE_TRY(blitter->copySubImageToLUMAWorkaroundTexture(
>+            context, mTextureID, getType(), target, levelInfo.sourceFormat, level, clippedOffset,
>+            clippedArea, source));
>     }
>     else
>     {
>-        if (UseTexImage2D(getTarget()))
>-        {
>-            ASSERT(destOffset.z == 0);
>-            mFunctions->copyTexSubImage2D(target, static_cast<GLint>(level), destOffset.x,
>-                                          destOffset.y, sourceArea.x, sourceArea.y,
>-                                          sourceArea.width, sourceArea.height);
>-        }
>-        else if (UseTexImage3D(getTarget()))
>+        if (nativegl::UseTexImage2D(getType()))
>         {
>-            mFunctions->copyTexSubImage3D(target, static_cast<GLint>(level), destOffset.x,
>-                                          destOffset.y, destOffset.z, sourceArea.x, sourceArea.y,
>-                                          sourceArea.width, sourceArea.height);
>+            ASSERT(clippedOffset.z == 0);
>+            functions->copyTexSubImage2D(ToGLenum(target), static_cast<GLint>(level),
>+                                         clippedOffset.x, clippedOffset.y, clippedArea.x,
>+                                         clippedArea.y, clippedArea.width, clippedArea.height);
>         }
>         else
>         {
>-            UNREACHABLE();
>+            ASSERT(nativegl::UseTexImage3D(getType()));
>+            functions->copyTexSubImage3D(ToGLenum(target), static_cast<GLint>(level),
>+                                         clippedOffset.x, clippedOffset.y, clippedOffset.z,
>+                                         clippedArea.x, clippedArea.y, clippedArea.width,
>+                                         clippedArea.height);
>         }
>     }
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error TextureGL::copyTexture(const gl::Context *context,
>-                                 GLenum target,
>-                                 size_t level,
>-                                 GLenum internalFormat,
>-                                 GLenum type,
>-                                 size_t sourceLevel,
>-                                 bool unpackFlipY,
>-                                 bool unpackPremultiplyAlpha,
>-                                 bool unpackUnmultiplyAlpha,
>-                                 const gl::Texture *source)
>+angle::Result TextureGL::copyTexture(const gl::Context *context,
>+                                     const gl::ImageIndex &index,
>+                                     GLenum internalFormat,
>+                                     GLenum type,
>+                                     size_t sourceLevel,
>+                                     bool unpackFlipY,
>+                                     bool unpackPremultiplyAlpha,
>+                                     bool unpackUnmultiplyAlpha,
>+                                     const gl::Texture *source)
> {
>-    const TextureGL *sourceGL            = GetImplAs<TextureGL>(source);
>+    gl::TextureTarget target  = index.getTarget();
>+    size_t level              = static_cast<size_t>(index.getLevelIndex());
>+    const TextureGL *sourceGL = GetImplAs<TextureGL>(source);
>     const gl::ImageDesc &sourceImageDesc =
>-        sourceGL->mState.getImageDesc(source->getTarget(), sourceLevel);
>+        sourceGL->mState.getImageDesc(NonCubeTextureTypeToTarget(source->getType()), sourceLevel);
>     gl::Rectangle sourceArea(0, 0, sourceImageDesc.size.width, sourceImageDesc.size.height);
> 
>-    reserveTexImageToBeFilled(target, level, internalFormat, sourceImageDesc.size,
>+    reserveTexImageToBeFilled(context, target, level, internalFormat, sourceImageDesc.size,
>                               gl::GetUnsizedFormat(internalFormat), type);
> 
>+    const gl::InternalFormat &destFormatInfo = gl::GetInternalFormatInfo(internalFormat, type);
>     return copySubTextureHelper(context, target, level, gl::Offset(0, 0, 0), sourceLevel,
>-                                sourceArea, gl::GetUnsizedFormat(internalFormat), type, unpackFlipY,
>-                                unpackPremultiplyAlpha, unpackUnmultiplyAlpha, source);
>+                                sourceArea, destFormatInfo, unpackFlipY, unpackPremultiplyAlpha,
>+                                unpackUnmultiplyAlpha, source);
> }
> 
>-gl::Error TextureGL::copySubTexture(const gl::Context *context,
>-                                    GLenum target,
>-                                    size_t level,
>-                                    const gl::Offset &destOffset,
>-                                    size_t sourceLevel,
>-                                    const gl::Rectangle &sourceArea,
>-                                    bool unpackFlipY,
>-                                    bool unpackPremultiplyAlpha,
>-                                    bool unpackUnmultiplyAlpha,
>-                                    const gl::Texture *source)
>+angle::Result TextureGL::copySubTexture(const gl::Context *context,
>+                                        const gl::ImageIndex &index,
>+                                        const gl::Offset &destOffset,
>+                                        size_t sourceLevel,
>+                                        const gl::Box &sourceBox,
>+                                        bool unpackFlipY,
>+                                        bool unpackPremultiplyAlpha,
>+                                        bool unpackUnmultiplyAlpha,
>+                                        const gl::Texture *source)
> {
>+    gl::TextureTarget target                 = index.getTarget();
>+    size_t level                             = static_cast<size_t>(index.getLevelIndex());
>     const gl::InternalFormat &destFormatInfo = *mState.getImageDesc(target, level).format.info;
>-    return copySubTextureHelper(context, target, level, destOffset, sourceLevel, sourceArea,
>-                                destFormatInfo.format, destFormatInfo.type, unpackFlipY,
>-                                unpackPremultiplyAlpha, unpackUnmultiplyAlpha, source);
>+    return copySubTextureHelper(context, target, level, destOffset, sourceLevel, sourceBox.toRect(),
>+                                destFormatInfo, unpackFlipY, unpackPremultiplyAlpha,
>+                                unpackUnmultiplyAlpha, source);
> }
> 
>-gl::Error TextureGL::copySubTextureHelper(const gl::Context *context,
>-                                          GLenum target,
>-                                          size_t level,
>-                                          const gl::Offset &destOffset,
>-                                          size_t sourceLevel,
>-                                          const gl::Rectangle &sourceArea,
>-                                          GLenum destFormat,
>-                                          GLenum destType,
>-                                          bool unpackFlipY,
>-                                          bool unpackPremultiplyAlpha,
>-                                          bool unpackUnmultiplyAlpha,
>-                                          const gl::Texture *source)
>+angle::Result TextureGL::copySubTextureHelper(const gl::Context *context,
>+                                              gl::TextureTarget target,
>+                                              size_t level,
>+                                              const gl::Offset &destOffset,
>+                                              size_t sourceLevel,
>+                                              const gl::Rectangle &sourceArea,
>+                                              const gl::InternalFormat &destFormat,
>+                                              bool unpackFlipY,
>+                                              bool unpackPremultiplyAlpha,
>+                                              bool unpackUnmultiplyAlpha,
>+                                              const gl::Texture *source)
> {
>-    TextureGL *sourceGL                  = GetImplAs<TextureGL>(source);
>+    const FunctionsGL *functions = GetFunctionsGL(context);
>+    BlitGL *blitter              = GetBlitGL(context);
>+
>+    TextureGL *sourceGL = GetImplAs<TextureGL>(source);
>     const gl::ImageDesc &sourceImageDesc =
>-        sourceGL->mState.getImageDesc(source->getTarget(), sourceLevel);
>+        sourceGL->mState.getImageDesc(NonCubeTextureTypeToTarget(source->getType()), sourceLevel);
> 
>     // Check is this is a simple copySubTexture that can be done with a copyTexSubImage
>-    ASSERT(sourceGL->getTarget() == GL_TEXTURE_2D);
>-    const LevelInfoGL &sourceLevelInfo = sourceGL->getLevelInfo(source->getTarget(), sourceLevel);
>-    bool needsLumaWorkaround           = sourceLevelInfo.lumaWorkaround.enabled;
>+    ASSERT(sourceGL->getType() == gl::TextureType::_2D);
>+    const LevelInfoGL &sourceLevelInfo =
>+        sourceGL->getLevelInfo(NonCubeTextureTypeToTarget(source->getType()), sourceLevel);
>+    bool needsLumaWorkaround = sourceLevelInfo.lumaWorkaround.enabled;
> 
>     GLenum sourceFormat = sourceImageDesc.format.info->format;
>     bool sourceFormatContainSupersetOfDestFormat =
>-        (sourceFormat == destFormat && sourceFormat != GL_BGRA_EXT) ||
>-        (sourceFormat == GL_RGBA && destFormat == GL_RGB);
>+        (sourceFormat == destFormat.format && sourceFormat != GL_BGRA_EXT) ||
>+        (sourceFormat == GL_RGBA && destFormat.format == GL_RGB);
> 
>     GLenum sourceComponentType = sourceImageDesc.format.info->componentType;
>-    const auto &destInternalFormatInfo = gl::GetInternalFormatInfo(destFormat, destType);
>-    GLenum destComponentType           = destInternalFormatInfo.componentType;
>-    bool destSRGB                      = destInternalFormatInfo.colorEncoding == GL_SRGB;
>-    if (source->getTarget() == GL_TEXTURE_2D && !unpackFlipY &&
>-        unpackPremultiplyAlpha == unpackUnmultiplyAlpha && !needsLumaWorkaround &&
>+    GLenum destComponentType   = destFormat.componentType;
>+    bool destSRGB              = destFormat.colorEncoding == GL_SRGB;
>+    if (!unpackFlipY && unpackPremultiplyAlpha == unpackUnmultiplyAlpha && !needsLumaWorkaround &&
>         sourceFormatContainSupersetOfDestFormat && sourceComponentType == destComponentType &&
>         !destSRGB)
>     {
>-        return mBlitter->copyTexSubImage(sourceGL, sourceLevel, this, target, level, sourceArea,
>-                                         destOffset);
>+        bool copySucceeded = false;
>+        ANGLE_TRY(blitter->copyTexSubImage(sourceGL, sourceLevel, this, target, level, sourceArea,
>+                                           destOffset, &copySucceeded));
>+        if (copySucceeded)
>+        {
>+            return angle::Result::Continue;
>+        }
>     }
> 
>     // Check if the destination is renderable and copy on the GPU
>     const LevelInfoGL &destLevelInfo = getLevelInfo(target, level);
>     if (!destSRGB &&
>-        nativegl::SupportsNativeRendering(mFunctions, target, destLevelInfo.nativeInternalFormat))
>+        nativegl::SupportsNativeRendering(functions, getType(), destLevelInfo.nativeInternalFormat))
>     {
>-        return mBlitter->copySubTexture(context, sourceGL, sourceLevel, sourceComponentType, this,
>-                                        target, level, destComponentType, sourceImageDesc.size,
>-                                        sourceArea, destOffset, needsLumaWorkaround,
>-                                        sourceLevelInfo.sourceFormat, unpackFlipY,
>-                                        unpackPremultiplyAlpha, unpackUnmultiplyAlpha);
>+        bool copySucceeded = false;
>+        ANGLE_TRY(blitter->copySubTexture(
>+            context, sourceGL, sourceLevel, sourceComponentType, this, target, level,
>+            destComponentType, sourceImageDesc.size, sourceArea, destOffset, needsLumaWorkaround,
>+            sourceLevelInfo.sourceFormat, unpackFlipY, unpackPremultiplyAlpha,
>+            unpackUnmultiplyAlpha, &copySucceeded));
>+        if (copySucceeded)
>+        {
>+            return angle::Result::Continue;
>+        }
>     }
> 
>     // Fall back to CPU-readback
>-    return mBlitter->copySubTextureCPUReadback(context, sourceGL, sourceLevel, sourceComponentType,
>-                                               this, target, level, destFormat, destType,
>-                                               sourceArea, destOffset, unpackFlipY,
>-                                               unpackPremultiplyAlpha, unpackUnmultiplyAlpha);
>+    return blitter->copySubTextureCPUReadback(context, sourceGL, sourceLevel, sourceComponentType,
>+                                              this, target, level, destFormat.format,
>+                                              destFormat.type, sourceArea, destOffset, unpackFlipY,
>+                                              unpackPremultiplyAlpha, unpackUnmultiplyAlpha);
> }
> 
>-gl::Error TextureGL::setStorage(const gl::Context *context,
>-                                GLenum target,
>-                                size_t levels,
>-                                GLenum internalFormat,
>-                                const gl::Extents &size)
>+angle::Result TextureGL::setStorage(const gl::Context *context,
>+                                    gl::TextureType type,
>+                                    size_t levels,
>+                                    GLenum internalFormat,
>+                                    const gl::Extents &size)
> {
>+    ContextGL *contextGL             = GetImplAs<ContextGL>(context);
>+    const FunctionsGL *functions     = GetFunctionsGL(context);
>+    StateManagerGL *stateManager     = GetStateManagerGL(context);
>+    const WorkaroundsGL &workarounds = GetWorkaroundsGL(context);
>+
>     nativegl::TexStorageFormat texStorageFormat =
>-        nativegl::GetTexStorageFormat(mFunctions, mWorkarounds, internalFormat);
>+        nativegl::GetTexStorageFormat(functions, workarounds, internalFormat);
> 
>-    mStateManager->bindTexture(getTarget(), mTextureID);
>-    if (UseTexImage2D(getTarget()))
>+    stateManager->bindTexture(getType(), mTextureID);
>+    if (nativegl::UseTexImage2D(getType()))
>     {
>         ASSERT(size.depth == 1);
>-        if (mFunctions->texStorage2D)
>+        if (functions->texStorage2D)
>         {
>-            mFunctions->texStorage2D(target, static_cast<GLsizei>(levels),
>-                                     texStorageFormat.internalFormat, size.width, size.height);
>+            functions->texStorage2D(ToGLenum(type), static_cast<GLsizei>(levels),
>+                                    texStorageFormat.internalFormat, size.width, size.height);
>         }
>         else
>         {
>             // Make sure no pixel unpack buffer is bound
>-            mStateManager->bindBuffer(gl::BufferBinding::PixelUnpack, 0);
>+            stateManager->bindBuffer(gl::BufferBinding::PixelUnpack, 0);
> 
>             const gl::InternalFormat &internalFormatInfo =
>                 gl::GetSizedInternalFormatInfo(internalFormat);
>@@ -841,87 +872,86 @@ gl::Error TextureGL::setStorage(const gl::Context *context,
>             for (size_t level = 0; level < levels; level++)
>             {
>                 gl::Extents levelSize(std::max(size.width >> level, 1),
>-                                      std::max(size.height >> level, 1),
>-                                      1);
>+                                      std::max(size.height >> level, 1), 1);
> 
>-                if (getTarget() == GL_TEXTURE_2D || getTarget() == GL_TEXTURE_RECTANGLE_ANGLE)
>+                if (getType() == gl::TextureType::_2D || getType() == gl::TextureType::Rectangle)
>                 {
>                     if (internalFormatInfo.compressed)
>                     {
>                         nativegl::CompressedTexSubImageFormat compressedTexImageFormat =
>-                            nativegl::GetCompressedSubTexImageFormat(mFunctions, mWorkarounds,
>+                            nativegl::GetCompressedSubTexImageFormat(functions, workarounds,
>                                                                      internalFormat);
> 
>                         GLuint dataSize = 0;
>-                        ANGLE_TRY_RESULT(internalFormatInfo.computeCompressedImageSize(levelSize),
>-                                         dataSize);
>-                        mFunctions->compressedTexImage2D(target, static_cast<GLint>(level),
>-                                                         compressedTexImageFormat.format,
>-                                                         levelSize.width, levelSize.height, 0,
>-                                                         static_cast<GLsizei>(dataSize), nullptr);
>+                        ANGLE_CHECK_GL_MATH(
>+                            contextGL,
>+                            internalFormatInfo.computeCompressedImageSize(levelSize, &dataSize));
>+                        functions->compressedTexImage2D(ToGLenum(type), static_cast<GLint>(level),
>+                                                        compressedTexImageFormat.format,
>+                                                        levelSize.width, levelSize.height, 0,
>+                                                        static_cast<GLsizei>(dataSize), nullptr);
>                     }
>                     else
>                     {
>                         nativegl::TexImageFormat texImageFormat = nativegl::GetTexImageFormat(
>-                            mFunctions, mWorkarounds, internalFormat, internalFormatInfo.format,
>+                            functions, workarounds, internalFormat, internalFormatInfo.format,
>                             internalFormatInfo.type);
> 
>-                        mFunctions->texImage2D(target, static_cast<GLint>(level),
>-                                               texImageFormat.internalFormat, levelSize.width,
>-                                               levelSize.height, 0, texImageFormat.format,
>-                                               texImageFormat.type, nullptr);
>+                        functions->texImage2D(ToGLenum(type), static_cast<GLint>(level),
>+                                              texImageFormat.internalFormat, levelSize.width,
>+                                              levelSize.height, 0, texImageFormat.format,
>+                                              texImageFormat.type, nullptr);
>                     }
>                 }
>-                else if (getTarget() == GL_TEXTURE_CUBE_MAP)
>+                else
>                 {
>-                    for (GLenum face = gl::FirstCubeMapTextureTarget; face <= gl::LastCubeMapTextureTarget; face++)
>+                    ASSERT(getType() == gl::TextureType::CubeMap);
>+                    for (gl::TextureTarget face : gl::AllCubeFaceTextureTargets())
>                     {
>                         if (internalFormatInfo.compressed)
>                         {
>                             nativegl::CompressedTexSubImageFormat compressedTexImageFormat =
>-                                nativegl::GetCompressedSubTexImageFormat(mFunctions, mWorkarounds,
>+                                nativegl::GetCompressedSubTexImageFormat(functions, workarounds,
>                                                                          internalFormat);
> 
>                             GLuint dataSize = 0;
>-                            ANGLE_TRY_RESULT(internalFormatInfo.computeCompressedImageSize(levelSize),
>-                                             dataSize);
>-                            mFunctions->compressedTexImage2D(
>-                                face, static_cast<GLint>(level), compressedTexImageFormat.format,
>-                                levelSize.width, levelSize.height, 0,
>-                                static_cast<GLsizei>(dataSize), nullptr);
>+                            ANGLE_CHECK_GL_MATH(contextGL,
>+                                                internalFormatInfo.computeCompressedImageSize(
>+                                                    levelSize, &dataSize));
>+                            functions->compressedTexImage2D(
>+                                ToGLenum(face), static_cast<GLint>(level),
>+                                compressedTexImageFormat.format, levelSize.width, levelSize.height,
>+                                0, static_cast<GLsizei>(dataSize), nullptr);
>                         }
>                         else
>                         {
>                             nativegl::TexImageFormat texImageFormat = nativegl::GetTexImageFormat(
>-                                mFunctions, mWorkarounds, internalFormat, internalFormatInfo.format,
>+                                functions, workarounds, internalFormat, internalFormatInfo.format,
>                                 internalFormatInfo.type);
> 
>-                            mFunctions->texImage2D(face, static_cast<GLint>(level),
>-                                                   texImageFormat.internalFormat, levelSize.width,
>-                                                   levelSize.height, 0, texImageFormat.format,
>-                                                   texImageFormat.type, nullptr);
>+                            functions->texImage2D(ToGLenum(face), static_cast<GLint>(level),
>+                                                  texImageFormat.internalFormat, levelSize.width,
>+                                                  levelSize.height, 0, texImageFormat.format,
>+                                                  texImageFormat.type, nullptr);
>                         }
>                     }
>                 }
>-                else
>-                {
>-                    UNREACHABLE();
>-                }
>             }
>         }
>     }
>-    else if (UseTexImage3D(getTarget()))
>+    else
>     {
>-        if (mFunctions->texStorage3D)
>+        ASSERT(nativegl::UseTexImage3D(getType()));
>+        if (functions->texStorage3D)
>         {
>-            mFunctions->texStorage3D(target, static_cast<GLsizei>(levels),
>-                                     texStorageFormat.internalFormat, size.width, size.height,
>-                                     size.depth);
>+            functions->texStorage3D(ToGLenum(type), static_cast<GLsizei>(levels),
>+                                    texStorageFormat.internalFormat, size.width, size.height,
>+                                    size.depth);
>         }
>         else
>         {
>             // Make sure no pixel unpack buffer is bound
>-            mStateManager->bindBuffer(gl::BufferBinding::PixelUnpack, 0);
>+            stateManager->bindBuffer(gl::BufferBinding::PixelUnpack, 0);
> 
>             const gl::InternalFormat &internalFormatInfo =
>                 gl::GetSizedInternalFormatInfo(internalFormat);
>@@ -933,135 +963,184 @@ gl::Error TextureGL::setStorage(const gl::Context *context,
>             {
>                 gl::Extents levelSize(
>                     std::max(size.width >> i, 1), std::max(size.height >> i, 1),
>-                    getTarget() == GL_TEXTURE_3D ? std::max(size.depth >> i, 1) : size.depth);
>+                    getType() == gl::TextureType::_3D ? std::max(size.depth >> i, 1) : size.depth);
> 
>                 if (internalFormatInfo.compressed)
>                 {
>                     nativegl::CompressedTexSubImageFormat compressedTexImageFormat =
>-                        nativegl::GetCompressedSubTexImageFormat(mFunctions, mWorkarounds,
>+                        nativegl::GetCompressedSubTexImageFormat(functions, workarounds,
>                                                                  internalFormat);
> 
>                     GLuint dataSize = 0;
>-                    ANGLE_TRY_RESULT(
>-                        internalFormatInfo.computeCompressedImageSize(levelSize),
>-                        dataSize);
>-                    mFunctions->compressedTexImage3D(target, i, compressedTexImageFormat.format,
>-                                                     levelSize.width, levelSize.height,
>-                                                     levelSize.depth, 0,
>-                                                     static_cast<GLsizei>(dataSize), nullptr);
>+                    ANGLE_CHECK_GL_MATH(contextGL, internalFormatInfo.computeCompressedImageSize(
>+                                                       levelSize, &dataSize));
>+                    functions->compressedTexImage3D(
>+                        ToGLenum(type), i, compressedTexImageFormat.format, levelSize.width,
>+                        levelSize.height, levelSize.depth, 0, static_cast<GLsizei>(dataSize),
>+                        nullptr);
>                 }
>                 else
>                 {
>                     nativegl::TexImageFormat texImageFormat = nativegl::GetTexImageFormat(
>-                        mFunctions, mWorkarounds, internalFormat, internalFormatInfo.format,
>+                        functions, workarounds, internalFormat, internalFormatInfo.format,
>                         internalFormatInfo.type);
> 
>-                    mFunctions->texImage3D(target, i, texImageFormat.internalFormat,
>-                                           levelSize.width, levelSize.height, levelSize.depth, 0,
>-                                           texImageFormat.format, texImageFormat.type, nullptr);
>+                    functions->texImage3D(ToGLenum(type), i, texImageFormat.internalFormat,
>+                                          levelSize.width, levelSize.height, levelSize.depth, 0,
>+                                          texImageFormat.format, texImageFormat.type, nullptr);
>                 }
>             }
>         }
>     }
>-    else
>-    {
>-        UNREACHABLE();
>-    }
> 
>-    setLevelInfo(target, 0, levels, GetLevelInfo(internalFormat, texStorageFormat.internalFormat));
>+    setLevelInfo(context, type, 0, levels,
>+                 GetLevelInfo(internalFormat, texStorageFormat.internalFormat));
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error TextureGL::setStorageMultisample(const gl::Context *context,
>-                                           GLenum target,
>-                                           GLsizei samples,
>-                                           GLint internalFormat,
>-                                           const gl::Extents &size,
>-                                           bool fixedSampleLocations)
>+angle::Result TextureGL::setStorageMultisample(const gl::Context *context,
>+                                               gl::TextureType type,
>+                                               GLsizei samples,
>+                                               GLint internalformat,
>+                                               const gl::Extents &size,
>+                                               bool fixedSampleLocations)
> {
>+    const FunctionsGL *functions     = GetFunctionsGL(context);
>+    StateManagerGL *stateManager     = GetStateManagerGL(context);
>+    const WorkaroundsGL &workarounds = GetWorkaroundsGL(context);
>+
>     nativegl::TexStorageFormat texStorageFormat =
>-        nativegl::GetTexStorageFormat(mFunctions, mWorkarounds, internalFormat);
>+        nativegl::GetTexStorageFormat(functions, workarounds, internalformat);
> 
>-    mStateManager->bindTexture(mState.mTarget, mTextureID);
>+    stateManager->bindTexture(getType(), mTextureID);
> 
>-    ASSERT(size.depth == 1);
>+    if (nativegl::UseTexImage2D(getType()))
>+    {
>+        ASSERT(size.depth == 1);
>+        if (functions->texStorage2DMultisample)
>+        {
>+            functions->texStorage2DMultisample(
>+                ToGLenum(type), samples, texStorageFormat.internalFormat, size.width, size.height,
>+                gl::ConvertToGLBoolean(fixedSampleLocations));
>+        }
>+        else
>+        {
>+            // texImage2DMultisample is similar to texStorage2DMultisample of es 3.1 core feature,
>+            // On macos and some old drivers which doesn't support OpenGL ES 3.1, the function can
>+            // be supported by ARB_texture_multisample or OpenGL 3.2 core feature.
>+            functions->texImage2DMultisample(
>+                ToGLenum(type), samples, texStorageFormat.internalFormat, size.width, size.height,
>+                gl::ConvertToGLBoolean(fixedSampleLocations));
>+        }
>+    }
>+    else
>+    {
>+        ASSERT(nativegl::UseTexImage3D(getType()));
>+        functions->texStorage3DMultisample(ToGLenum(type), samples, texStorageFormat.internalFormat,
>+                                           size.width, size.height, size.depth,
>+                                           gl::ConvertToGLBoolean(fixedSampleLocations));
>+    }
> 
>-    mFunctions->texStorage2DMultisample(target, samples, texStorageFormat.internalFormat,
>-                                        size.width, size.height,
>-                                        gl::ConvertToGLBoolean(fixedSampleLocations));
>+    setLevelInfo(context, type, 0, 1,
>+                 GetLevelInfo(internalformat, texStorageFormat.internalFormat));
> 
>-    setLevelInfo(target, 0, 1, GetLevelInfo(internalFormat, texStorageFormat.internalFormat));
>+    return angle::Result::Continue;
>+}
> 
>-    return gl::NoError();
>+angle::Result TextureGL::setStorageExternalMemory(const gl::Context *context,
>+                                                  gl::TextureType type,
>+                                                  size_t levels,
>+                                                  GLenum internalFormat,
>+                                                  const gl::Extents &size,
>+                                                  gl::MemoryObject *memoryObject,
>+                                                  GLuint64 offset)
>+{
>+    ANGLE_GL_UNREACHABLE(GetImplAs<ContextGL>(context));
>+    return angle::Result::Stop;
> }
> 
>-gl::Error TextureGL::setImageExternal(const gl::Context *context,
>-                                      GLenum target,
>-                                      egl::Stream *stream,
>-                                      const egl::Stream::GLTextureDescription &desc)
>+angle::Result TextureGL::setImageExternal(const gl::Context *context,
>+                                          gl::TextureType type,
>+                                          egl::Stream *stream,
>+                                          const egl::Stream::GLTextureDescription &desc)
> {
>-    UNIMPLEMENTED();
>-    return gl::InternalError();
>+    ANGLE_GL_UNREACHABLE(GetImplAs<ContextGL>(context));
>+    return angle::Result::Stop;
> }
> 
>-gl::Error TextureGL::generateMipmap(const gl::Context *context)
>+angle::Result TextureGL::generateMipmap(const gl::Context *context)
> {
>-    mStateManager->bindTexture(getTarget(), mTextureID);
>-    mFunctions->generateMipmap(getTarget());
>+    const FunctionsGL *functions = GetFunctionsGL(context);
>+    StateManagerGL *stateManager = GetStateManagerGL(context);
>+
>+    stateManager->bindTexture(getType(), mTextureID);
>+    functions->generateMipmap(ToGLenum(getType()));
> 
>     const GLuint effectiveBaseLevel = mState.getEffectiveBaseLevel();
>     const GLuint maxLevel           = mState.getMipmapMaxLevel();
> 
>-    setLevelInfo(getTarget(), effectiveBaseLevel, maxLevel - effectiveBaseLevel,
>+    setLevelInfo(context, getType(), effectiveBaseLevel, maxLevel - effectiveBaseLevel,
>                  getBaseLevelInfo());
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error TextureGL::bindTexImage(const gl::Context *context, egl::Surface *surface)
>+angle::Result TextureGL::bindTexImage(const gl::Context *context, egl::Surface *surface)
> {
>-    ASSERT(getTarget() == GL_TEXTURE_2D || getTarget() == GL_TEXTURE_RECTANGLE_ANGLE);
>+    ASSERT(getType() == gl::TextureType::_2D || getType() == gl::TextureType::Rectangle);
>+
>+    StateManagerGL *stateManager = GetStateManagerGL(context);
> 
>     // Make sure this texture is bound
>-    mStateManager->bindTexture(getTarget(), mTextureID);
>+    stateManager->bindTexture(getType(), mTextureID);
> 
>-    setLevelInfo(getTarget(), 0, 1, LevelInfoGL());
>-    return gl::NoError();
>+    setLevelInfo(context, getType(), 0, 1, LevelInfoGL());
>+    return angle::Result::Continue;
> }
> 
>-gl::Error TextureGL::releaseTexImage(const gl::Context *context)
>+angle::Result TextureGL::releaseTexImage(const gl::Context *context)
> {
>     // Not all Surface implementations reset the size of mip 0 when releasing, do it manually
>-    ASSERT(getTarget() == GL_TEXTURE_2D || getTarget() == GL_TEXTURE_RECTANGLE_ANGLE);
>+    ASSERT(getType() == gl::TextureType::_2D || getType() == gl::TextureType::Rectangle);
> 
>-    mStateManager->bindTexture(getTarget(), mTextureID);
>-    if (UseTexImage2D(getTarget()))
>-    {
>-        mFunctions->texImage2D(getTarget(), 0, GL_RGBA, 0, 0, 0, GL_RGBA, GL_UNSIGNED_BYTE,
>-                               nullptr);
>-    }
>-    else
>-    {
>-        UNREACHABLE();
>-    }
>-    return gl::NoError();
>+    const FunctionsGL *functions = GetFunctionsGL(context);
>+    StateManagerGL *stateManager = GetStateManagerGL(context);
>+
>+    stateManager->bindTexture(getType(), mTextureID);
>+    ASSERT(nativegl::UseTexImage2D(getType()));
>+    functions->texImage2D(ToGLenum(getType()), 0, GL_RGBA, 0, 0, 0, GL_RGBA, GL_UNSIGNED_BYTE,
>+                          nullptr);
>+    return angle::Result::Continue;
> }
> 
>-gl::Error TextureGL::setEGLImageTarget(const gl::Context *context, GLenum target, egl::Image *image)
>+angle::Result TextureGL::setEGLImageTarget(const gl::Context *context,
>+                                           gl::TextureType type,
>+                                           egl::Image *image)
> {
>-    UNIMPLEMENTED();
>-    return gl::InternalError();
>+    ImageGL *imageGL = GetImplAs<ImageGL>(image);
>+
>+    GLenum imageNativeInternalFormat = GL_NONE;
>+    ANGLE_TRY(imageGL->setTexture2D(context, type, this, &imageNativeInternalFormat));
>+
>+    setLevelInfo(context, type, 0, 1,
>+                 GetLevelInfo(image->getFormat().info->internalFormat, imageNativeInternalFormat));
>+
>+    return angle::Result::Continue;
> }
> 
>-void TextureGL::syncState(const gl::Texture::DirtyBits &dirtyBits)
>+angle::Result TextureGL::syncState(const gl::Context *context,
>+                                   const gl::Texture::DirtyBits &dirtyBits)
> {
>     if (dirtyBits.none() && mLocalDirtyBits.none())
>     {
>-        return;
>+        return angle::Result::Continue;
>     }
> 
>-    mStateManager->bindTexture(getTarget(), mTextureID);
>+    const FunctionsGL *functions = GetFunctionsGL(context);
>+    StateManagerGL *stateManager = GetStateManagerGL(context);
>+
>+    stateManager->bindTexture(getType(), mTextureID);
> 
>     if (dirtyBits[gl::Texture::DIRTY_BIT_BASE_LEVEL] || dirtyBits[gl::Texture::DIRTY_BIT_MAX_LEVEL])
>     {
>@@ -1075,96 +1154,140 @@ void TextureGL::syncState(const gl::Texture::DirtyBits &dirtyBits)
>         switch (dirtyBit)
>         {
>             case gl::Texture::DIRTY_BIT_MIN_FILTER:
>-                mAppliedSampler.minFilter = mState.getSamplerState().minFilter;
>-                mFunctions->texParameteri(getTarget(), GL_TEXTURE_MIN_FILTER,
>-                                          mAppliedSampler.minFilter);
>+                mAppliedSampler.setMinFilter(mState.getSamplerState().getMinFilter());
>+                functions->texParameteri(ToGLenum(getType()), GL_TEXTURE_MIN_FILTER,
>+                                         mAppliedSampler.getMinFilter());
>                 break;
>             case gl::Texture::DIRTY_BIT_MAG_FILTER:
>-                mAppliedSampler.magFilter = mState.getSamplerState().magFilter;
>-                mFunctions->texParameteri(getTarget(), GL_TEXTURE_MAG_FILTER,
>-                                          mAppliedSampler.magFilter);
>+                mAppliedSampler.setMagFilter(mState.getSamplerState().getMagFilter());
>+                functions->texParameteri(ToGLenum(getType()), GL_TEXTURE_MAG_FILTER,
>+                                         mAppliedSampler.getMagFilter());
>                 break;
>             case gl::Texture::DIRTY_BIT_WRAP_S:
>-                mAppliedSampler.wrapS = mState.getSamplerState().wrapS;
>-                mFunctions->texParameteri(getTarget(), GL_TEXTURE_WRAP_S, mAppliedSampler.wrapS);
>+                mAppliedSampler.setWrapS(mState.getSamplerState().getWrapS());
>+                functions->texParameteri(ToGLenum(getType()), GL_TEXTURE_WRAP_S,
>+                                         mAppliedSampler.getWrapS());
>                 break;
>             case gl::Texture::DIRTY_BIT_WRAP_T:
>-                mAppliedSampler.wrapT = mState.getSamplerState().wrapT;
>-                mFunctions->texParameteri(getTarget(), GL_TEXTURE_WRAP_T, mAppliedSampler.wrapT);
>+                mAppliedSampler.setWrapT(mState.getSamplerState().getWrapT());
>+                functions->texParameteri(ToGLenum(getType()), GL_TEXTURE_WRAP_T,
>+                                         mAppliedSampler.getWrapT());
>                 break;
>             case gl::Texture::DIRTY_BIT_WRAP_R:
>-                mAppliedSampler.wrapR = mState.getSamplerState().wrapR;
>-                mFunctions->texParameteri(getTarget(), GL_TEXTURE_WRAP_R, mAppliedSampler.wrapR);
>+                mAppliedSampler.setWrapR(mState.getSamplerState().getWrapR());
>+                functions->texParameteri(ToGLenum(getType()), GL_TEXTURE_WRAP_R,
>+                                         mAppliedSampler.getWrapR());
>                 break;
>             case gl::Texture::DIRTY_BIT_MAX_ANISOTROPY:
>-                mAppliedSampler.maxAnisotropy = mState.getSamplerState().maxAnisotropy;
>-                mFunctions->texParameterf(getTarget(), GL_TEXTURE_MAX_ANISOTROPY_EXT,
>-                                          mAppliedSampler.maxAnisotropy);
>+                mAppliedSampler.setMaxAnisotropy(mState.getSamplerState().getMaxAnisotropy());
>+                functions->texParameterf(ToGLenum(getType()), GL_TEXTURE_MAX_ANISOTROPY_EXT,
>+                                         mAppliedSampler.getMaxAnisotropy());
>                 break;
>             case gl::Texture::DIRTY_BIT_MIN_LOD:
>-                mAppliedSampler.minLod = mState.getSamplerState().minLod;
>-                mFunctions->texParameterf(getTarget(), GL_TEXTURE_MIN_LOD, mAppliedSampler.minLod);
>+                mAppliedSampler.setMinLod(mState.getSamplerState().getMinLod());
>+                functions->texParameterf(ToGLenum(getType()), GL_TEXTURE_MIN_LOD,
>+                                         mAppliedSampler.getMinLod());
>                 break;
>             case gl::Texture::DIRTY_BIT_MAX_LOD:
>-                mAppliedSampler.maxLod = mState.getSamplerState().maxLod;
>-                mFunctions->texParameterf(getTarget(), GL_TEXTURE_MAX_LOD, mAppliedSampler.maxLod);
>+                mAppliedSampler.setMaxLod(mState.getSamplerState().getMaxLod());
>+                functions->texParameterf(ToGLenum(getType()), GL_TEXTURE_MAX_LOD,
>+                                         mAppliedSampler.getMaxLod());
>                 break;
>             case gl::Texture::DIRTY_BIT_COMPARE_MODE:
>-                mAppliedSampler.compareMode = mState.getSamplerState().compareMode;
>-                mFunctions->texParameteri(getTarget(), GL_TEXTURE_COMPARE_MODE,
>-                                          mAppliedSampler.compareMode);
>+                mAppliedSampler.setCompareMode(mState.getSamplerState().getCompareMode());
>+                functions->texParameteri(ToGLenum(getType()), GL_TEXTURE_COMPARE_MODE,
>+                                         mAppliedSampler.getCompareMode());
>                 break;
>             case gl::Texture::DIRTY_BIT_COMPARE_FUNC:
>-                mAppliedSampler.compareFunc = mState.getSamplerState().compareFunc;
>-                mFunctions->texParameteri(getTarget(), GL_TEXTURE_COMPARE_FUNC,
>-                                          mAppliedSampler.compareFunc);
>+                mAppliedSampler.setCompareFunc(mState.getSamplerState().getCompareFunc());
>+                functions->texParameteri(ToGLenum(getType()), GL_TEXTURE_COMPARE_FUNC,
>+                                         mAppliedSampler.getCompareFunc());
>                 break;
>             case gl::Texture::DIRTY_BIT_SRGB_DECODE:
>-                mAppliedSampler.sRGBDecode = mState.getSamplerState().sRGBDecode;
>-                mFunctions->texParameteri(getTarget(), GL_TEXTURE_SRGB_DECODE_EXT,
>-                                          mAppliedSampler.sRGBDecode);
>+                mAppliedSampler.setSRGBDecode(mState.getSamplerState().getSRGBDecode());
>+                functions->texParameteri(ToGLenum(getType()), GL_TEXTURE_SRGB_DECODE_EXT,
>+                                         mAppliedSampler.getSRGBDecode());
>+                break;
>+            case gl::Texture::DIRTY_BIT_BORDER_COLOR:
>+            {
>+                const angle::ColorGeneric &borderColor(mState.getSamplerState().getBorderColor());
>+                mAppliedSampler.setBorderColor(borderColor);
>+                switch (borderColor.type)
>+                {
>+                    case angle::ColorGeneric::Type::Float:
>+                        functions->texParameterfv(ToGLenum(getType()), GL_TEXTURE_BORDER_COLOR,
>+                                                  &borderColor.colorF.red);
>+                        break;
>+                    case angle::ColorGeneric::Type::Int:
>+                        functions->texParameterIiv(ToGLenum(getType()), GL_TEXTURE_BORDER_COLOR,
>+                                                   &borderColor.colorI.red);
>+                        break;
>+                    case angle::ColorGeneric::Type::UInt:
>+                        functions->texParameterIuiv(ToGLenum(getType()), GL_TEXTURE_BORDER_COLOR,
>+                                                    &borderColor.colorUI.red);
>+                        break;
>+                    default:
>+                        UNREACHABLE();
>+                        break;
>+                }
>                 break;
>+            }
> 
>             // Texture state
>             case gl::Texture::DIRTY_BIT_SWIZZLE_RED:
>-                syncTextureStateSwizzle(mFunctions, GL_TEXTURE_SWIZZLE_R,
>+                syncTextureStateSwizzle(functions, GL_TEXTURE_SWIZZLE_R,
>                                         mState.getSwizzleState().swizzleRed,
>                                         &mAppliedSwizzle.swizzleRed);
>                 break;
>             case gl::Texture::DIRTY_BIT_SWIZZLE_GREEN:
>-                syncTextureStateSwizzle(mFunctions, GL_TEXTURE_SWIZZLE_G,
>+                syncTextureStateSwizzle(functions, GL_TEXTURE_SWIZZLE_G,
>                                         mState.getSwizzleState().swizzleGreen,
>                                         &mAppliedSwizzle.swizzleGreen);
>                 break;
>             case gl::Texture::DIRTY_BIT_SWIZZLE_BLUE:
>-                syncTextureStateSwizzle(mFunctions, GL_TEXTURE_SWIZZLE_B,
>+                syncTextureStateSwizzle(functions, GL_TEXTURE_SWIZZLE_B,
>                                         mState.getSwizzleState().swizzleBlue,
>                                         &mAppliedSwizzle.swizzleBlue);
>                 break;
>             case gl::Texture::DIRTY_BIT_SWIZZLE_ALPHA:
>-                syncTextureStateSwizzle(mFunctions, GL_TEXTURE_SWIZZLE_A,
>+                syncTextureStateSwizzle(functions, GL_TEXTURE_SWIZZLE_A,
>                                         mState.getSwizzleState().swizzleAlpha,
>                                         &mAppliedSwizzle.swizzleAlpha);
>                 break;
>             case gl::Texture::DIRTY_BIT_BASE_LEVEL:
>                 mAppliedBaseLevel = mState.getEffectiveBaseLevel();
>-                mFunctions->texParameteri(getTarget(), GL_TEXTURE_BASE_LEVEL, mAppliedBaseLevel);
>+                functions->texParameteri(ToGLenum(getType()), GL_TEXTURE_BASE_LEVEL,
>+                                         mAppliedBaseLevel);
>                 break;
>             case gl::Texture::DIRTY_BIT_MAX_LEVEL:
>                 mAppliedMaxLevel = mState.getEffectiveMaxLevel();
>-                mFunctions->texParameteri(getTarget(), GL_TEXTURE_MAX_LEVEL, mAppliedMaxLevel);
>+                functions->texParameteri(ToGLenum(getType()), GL_TEXTURE_MAX_LEVEL,
>+                                         mAppliedMaxLevel);
>+                break;
>+            case gl::Texture::DIRTY_BIT_DEPTH_STENCIL_TEXTURE_MODE:
>+            {
>+                GLenum mDepthStencilTextureMode = mState.getDepthStencilTextureMode();
>+                functions->texParameteri(ToGLenum(getType()), GL_DEPTH_STENCIL_TEXTURE_MODE,
>+                                         mDepthStencilTextureMode);
>                 break;
>+            }
>             case gl::Texture::DIRTY_BIT_USAGE:
>                 break;
>             case gl::Texture::DIRTY_BIT_LABEL:
>                 break;
> 
>+            case gl::Texture::DIRTY_BIT_IMPLEMENTATION:
>+                // This special dirty bit is used to signal the front-end that the implementation
>+                // has local dirty bits. The real dirty bits are in mLocalDirty bits.
>+                break;
>+
>             default:
>                 UNREACHABLE();
>         }
>     }
> 
>     mLocalDirtyBits.reset();
>+    return angle::Result::Continue;
> }
> 
> bool TextureGL::hasAnyDirtyBit() const
>@@ -1172,60 +1295,89 @@ bool TextureGL::hasAnyDirtyBit() const
>     return mLocalDirtyBits.any();
> }
> 
>-gl::Error TextureGL::setBaseLevel(const gl::Context *context, GLuint baseLevel)
>+angle::Result TextureGL::setBaseLevel(const gl::Context *context, GLuint baseLevel)
> {
>     if (baseLevel != mAppliedBaseLevel)
>     {
>+        const FunctionsGL *functions = GetFunctionsGL(context);
>+        StateManagerGL *stateManager = GetStateManagerGL(context);
>+
>         mAppliedBaseLevel = baseLevel;
>         mLocalDirtyBits.set(gl::Texture::DIRTY_BIT_BASE_LEVEL);
> 
>-        mStateManager->bindTexture(getTarget(), mTextureID);
>-        mFunctions->texParameteri(getTarget(), GL_TEXTURE_BASE_LEVEL, baseLevel);
>+        // Signal to the GL layer that the Impl has dirty bits.
>+        onStateChange(context, angle::SubjectMessage::DEPENDENT_DIRTY_BITS);
>+
>+        stateManager->bindTexture(getType(), mTextureID);
>+        functions->texParameteri(ToGLenum(getType()), GL_TEXTURE_BASE_LEVEL, baseLevel);
>     }
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-void TextureGL::setMinFilter(GLenum filter)
>+void TextureGL::setMinFilter(const gl::Context *context, GLenum filter)
> {
>-    if (filter != mAppliedSampler.minFilter)
>+    if (filter != mAppliedSampler.getMinFilter())
>     {
>-        mAppliedSampler.minFilter = filter;
>+        const FunctionsGL *functions = GetFunctionsGL(context);
>+        StateManagerGL *stateManager = GetStateManagerGL(context);
>+
>+        mAppliedSampler.setMinFilter(filter);
>         mLocalDirtyBits.set(gl::Texture::DIRTY_BIT_MIN_FILTER);
> 
>-        mStateManager->bindTexture(getTarget(), mTextureID);
>-        mFunctions->texParameteri(getTarget(), GL_TEXTURE_MIN_FILTER, filter);
>+        // Signal to the GL layer that the Impl has dirty bits.
>+        onStateChange(context, angle::SubjectMessage::DEPENDENT_DIRTY_BITS);
>+
>+        stateManager->bindTexture(getType(), mTextureID);
>+        functions->texParameteri(ToGLenum(getType()), GL_TEXTURE_MIN_FILTER, filter);
>     }
> }
>-void TextureGL::setMagFilter(GLenum filter)
>+void TextureGL::setMagFilter(const gl::Context *context, GLenum filter)
> {
>-    if (filter != mAppliedSampler.magFilter)
>+    if (filter != mAppliedSampler.getMagFilter())
>     {
>-        mAppliedSampler.magFilter = filter;
>+        const FunctionsGL *functions = GetFunctionsGL(context);
>+        StateManagerGL *stateManager = GetStateManagerGL(context);
>+
>+        mAppliedSampler.setMagFilter(filter);
>         mLocalDirtyBits.set(gl::Texture::DIRTY_BIT_MAG_FILTER);
> 
>-        mStateManager->bindTexture(getTarget(), mTextureID);
>-        mFunctions->texParameteri(getTarget(), GL_TEXTURE_MAG_FILTER, filter);
>+        // Signal to the GL layer that the Impl has dirty bits.
>+        onStateChange(context, angle::SubjectMessage::DEPENDENT_DIRTY_BITS);
>+
>+        stateManager->bindTexture(getType(), mTextureID);
>+        functions->texParameteri(ToGLenum(getType()), GL_TEXTURE_MAG_FILTER, filter);
>     }
> }
> 
>-void TextureGL::setSwizzle(GLint swizzle[4])
>+void TextureGL::setSwizzle(const gl::Context *context, GLint swizzle[4])
> {
>     gl::SwizzleState resultingSwizzle =
>         gl::SwizzleState(swizzle[0], swizzle[1], swizzle[2], swizzle[3]);
> 
>     if (resultingSwizzle != mAppliedSwizzle)
>     {
>+        const FunctionsGL *functions = GetFunctionsGL(context);
>+        StateManagerGL *stateManager = GetStateManagerGL(context);
>+
>         mAppliedSwizzle = resultingSwizzle;
>         mLocalDirtyBits.set(gl::Texture::DIRTY_BIT_SWIZZLE_RED);
>         mLocalDirtyBits.set(gl::Texture::DIRTY_BIT_SWIZZLE_GREEN);
>         mLocalDirtyBits.set(gl::Texture::DIRTY_BIT_SWIZZLE_BLUE);
>         mLocalDirtyBits.set(gl::Texture::DIRTY_BIT_SWIZZLE_ALPHA);
> 
>-        mStateManager->bindTexture(getTarget(), mTextureID);
>-        mFunctions->texParameteriv(getTarget(), GL_TEXTURE_SWIZZLE_RGBA, swizzle);
>+        // Signal to the GL layer that the Impl has dirty bits.
>+        onStateChange(context, angle::SubjectMessage::DEPENDENT_DIRTY_BITS);
>+
>+        stateManager->bindTexture(getType(), mTextureID);
>+        functions->texParameteriv(ToGLenum(getType()), GL_TEXTURE_SWIZZLE_RGBA, swizzle);
>     }
> }
> 
>+GLenum TextureGL::getNativeInternalFormat(const gl::ImageIndex &index) const
>+{
>+    return getLevelInfo(index.getTarget(), index.getLevelIndex()).nativeInternalFormat;
>+}
>+
> void TextureGL::syncTextureStateSwizzle(const FunctionsGL *functions,
>                                         GLenum name,
>                                         GLenum value,
>@@ -1239,68 +1391,63 @@ void TextureGL::syncTextureStateSwizzle(const FunctionsGL *functions,
>         {
>             switch (value)
>             {
>-            case GL_RED:
>-            case GL_GREEN:
>-            case GL_BLUE:
>-                if (levelInfo.sourceFormat == GL_LUMINANCE ||
>-                    levelInfo.sourceFormat == GL_LUMINANCE_ALPHA)
>-                {
>-                    // Texture is backed by a RED or RG texture, point all color channels at the red
>-                    // channel.
>-                    ASSERT(levelInfo.lumaWorkaround.workaroundFormat == GL_RED ||
>-                           levelInfo.lumaWorkaround.workaroundFormat == GL_RG);
>-                    resultSwizzle = GL_RED;
>-                }
>-                else if (levelInfo.sourceFormat == GL_ALPHA)
>-                {
>-                    // Color channels are not supposed to exist, make them always sample 0.
>-                    resultSwizzle = GL_ZERO;
>-                }
>-                else
>-                {
>-                    UNREACHABLE();
>-                }
>-                break;
>+                case GL_RED:
>+                case GL_GREEN:
>+                case GL_BLUE:
>+                    if (levelInfo.sourceFormat == GL_LUMINANCE ||
>+                        levelInfo.sourceFormat == GL_LUMINANCE_ALPHA)
>+                    {
>+                        // Texture is backed by a RED or RG texture, point all color channels at the
>+                        // red channel.
>+                        ASSERT(levelInfo.lumaWorkaround.workaroundFormat == GL_RED ||
>+                               levelInfo.lumaWorkaround.workaroundFormat == GL_RG);
>+                        resultSwizzle = GL_RED;
>+                    }
>+                    else
>+                    {
>+                        ASSERT(levelInfo.sourceFormat == GL_ALPHA);
>+                        // Color channels are not supposed to exist, make them always sample 0.
>+                        resultSwizzle = GL_ZERO;
>+                    }
>+                    break;
> 
>-            case GL_ALPHA:
>-                if (levelInfo.sourceFormat == GL_LUMINANCE)
>-                {
>-                    // Alpha channel is not supposed to exist, make it always sample 1.
>-                    resultSwizzle = GL_ONE;
>-                }
>-                else if (levelInfo.sourceFormat == GL_ALPHA)
>-                {
>-                    // Texture is backed by a RED texture, point the alpha channel at the red
>-                    // channel.
>-                    ASSERT(levelInfo.lumaWorkaround.workaroundFormat == GL_RED);
>-                    resultSwizzle = GL_RED;
>-                }
>-                else if (levelInfo.sourceFormat == GL_LUMINANCE_ALPHA)
>-                {
>-                    // Texture is backed by an RG texture, point the alpha channel at the green
>-                    // channel.
>-                    ASSERT(levelInfo.lumaWorkaround.workaroundFormat == GL_RG);
>-                    resultSwizzle = GL_GREEN;
>-                }
>-                else
>-                {
>-                    UNREACHABLE();
>-                }
>-                break;
>+                case GL_ALPHA:
>+                    if (levelInfo.sourceFormat == GL_LUMINANCE)
>+                    {
>+                        // Alpha channel is not supposed to exist, make it always sample 1.
>+                        resultSwizzle = GL_ONE;
>+                    }
>+                    else if (levelInfo.sourceFormat == GL_ALPHA)
>+                    {
>+                        // Texture is backed by a RED texture, point the alpha channel at the red
>+                        // channel.
>+                        ASSERT(levelInfo.lumaWorkaround.workaroundFormat == GL_RED);
>+                        resultSwizzle = GL_RED;
>+                    }
>+                    else
>+                    {
>+                        ASSERT(levelInfo.sourceFormat == GL_LUMINANCE_ALPHA);
>+                        // Texture is backed by an RG texture, point the alpha channel at the green
>+                        // channel.
>+                        ASSERT(levelInfo.lumaWorkaround.workaroundFormat == GL_RG);
>+                        resultSwizzle = GL_GREEN;
>+                    }
>+                    break;
> 
>-            case GL_ZERO:
>-            case GL_ONE:
>-                // Don't modify the swizzle state when requesting ZERO or ONE.
>-                resultSwizzle = value;
>-                break;
>+                case GL_ZERO:
>+                case GL_ONE:
>+                    // Don't modify the swizzle state when requesting ZERO or ONE.
>+                    resultSwizzle = value;
>+                    break;
> 
>-            default:
>-                UNREACHABLE();
>-                break;
>+                default:
>+                    UNREACHABLE();
>+                    break;
>             }
>         }
>-        else if (levelInfo.depthStencilWorkaround)
>+        else
>         {
>+            ASSERT(levelInfo.depthStencilWorkaround);
>             switch (value)
>             {
>                 case GL_RED:
>@@ -1330,18 +1477,14 @@ void TextureGL::syncTextureStateSwizzle(const FunctionsGL *functions,
>                     break;
>             }
>         }
>-        else
>-        {
>-            UNREACHABLE();
>-        }
>-
>     }
> 
>     *outValue = resultSwizzle;
>-    functions->texParameteri(getTarget(), name, resultSwizzle);
>+    functions->texParameteri(ToGLenum(getType()), name, resultSwizzle);
> }
> 
>-void TextureGL::setLevelInfo(GLenum target,
>+void TextureGL::setLevelInfo(const gl::Context *context,
>+                             gl::TextureTarget target,
>                              size_t level,
>                              size_t levelCount,
>                              const LevelInfoGL &levelInfo)
>@@ -1352,69 +1495,156 @@ void TextureGL::setLevelInfo(GLenum target,
> 
>     for (size_t i = level; i < level + levelCount; i++)
>     {
>-        if (target == GL_TEXTURE_CUBE_MAP)
>-        {
>-            for (GLenum face = gl::FirstCubeMapTextureTarget; face <= gl::LastCubeMapTextureTarget;
>-                 face++)
>-            {
>-                size_t index = GetLevelInfoIndex(face, level);
>-                ASSERT(index < mLevelInfo.size());
>-                auto &curLevelInfo = mLevelInfo[index];
>+        size_t index = GetLevelInfoIndex(target, i);
>+        ASSERT(index < mLevelInfo.size());
>+        auto &curLevelInfo = mLevelInfo[index];
> 
>-                updateWorkarounds |= curLevelInfo.depthStencilWorkaround;
>-                updateWorkarounds |= curLevelInfo.lumaWorkaround.enabled;
>+        updateWorkarounds |= curLevelInfo.depthStencilWorkaround;
>+        updateWorkarounds |= curLevelInfo.lumaWorkaround.enabled;
> 
>-                curLevelInfo = levelInfo;
>-            }
>-        }
>-        else
>-        {
>-            size_t index = GetLevelInfoIndex(target, level);
>-            ASSERT(index < mLevelInfo.size());
>-            auto &curLevelInfo = mLevelInfo[index];
>-
>-            updateWorkarounds |= curLevelInfo.depthStencilWorkaround;
>-            updateWorkarounds |= curLevelInfo.lumaWorkaround.enabled;
>-
>-            curLevelInfo = levelInfo;
>-        }
>+        curLevelInfo = levelInfo;
>     }
> 
>     if (updateWorkarounds)
>     {
>         mLocalDirtyBits |= GetLevelWorkaroundDirtyBits();
>+        onStateChange(context, angle::SubjectMessage::DEPENDENT_DIRTY_BITS);
>+    }
>+}
>+
>+void TextureGL::setLevelInfo(const gl::Context *context,
>+                             gl::TextureType type,
>+                             size_t level,
>+                             size_t levelCount,
>+                             const LevelInfoGL &levelInfo)
>+{
>+    if (type == gl::TextureType::CubeMap)
>+    {
>+        for (gl::TextureTarget target : gl::AllCubeFaceTextureTargets())
>+        {
>+            setLevelInfo(context, target, level, levelCount, levelInfo);
>+        }
>+    }
>+    else
>+    {
>+        setLevelInfo(context, NonCubeTextureTypeToTarget(type), level, levelCount, levelInfo);
>     }
> }
> 
>-const LevelInfoGL &TextureGL::getLevelInfo(GLenum target, size_t level) const
>+const LevelInfoGL &TextureGL::getLevelInfo(gl::TextureTarget target, size_t level) const
> {
>-    ASSERT(target != GL_TEXTURE_CUBE_MAP);
>     return mLevelInfo[GetLevelInfoIndex(target, level)];
> }
> 
> const LevelInfoGL &TextureGL::getBaseLevelInfo() const
> {
>     GLint effectiveBaseLevel = mState.getEffectiveBaseLevel();
>-    GLenum target =
>-        getTarget() == GL_TEXTURE_CUBE_MAP ? gl::FirstCubeMapTextureTarget : getTarget();
>+    gl::TextureTarget target = getType() == gl::TextureType::CubeMap
>+                                   ? gl::kCubeMapTextureTargetMin
>+                                   : gl::NonCubeTextureTypeToTarget(getType());
>     return getLevelInfo(target, effectiveBaseLevel);
> }
> 
>-GLuint TextureGL::getTextureID() const
>+gl::TextureType TextureGL::getType() const
> {
>-    return mTextureID;
>+    return mState.mType;
> }
> 
>-GLenum TextureGL::getTarget() const
>+angle::Result TextureGL::initializeContents(const gl::Context *context,
>+                                            const gl::ImageIndex &imageIndex)
> {
>-    return mState.mTarget;
>-}
>+    ContextGL *contextGL             = GetImplAs<ContextGL>(context);
>+    const FunctionsGL *functions     = GetFunctionsGL(context);
>+    StateManagerGL *stateManager     = GetStateManagerGL(context);
>+    const WorkaroundsGL &workarounds = GetWorkaroundsGL(context);
>+
>+    GLenum nativeInternalFormat =
>+        getLevelInfo(imageIndex.getTarget(), imageIndex.getLevelIndex()).nativeInternalFormat;
>+    if (nativegl::SupportsNativeRendering(functions, mState.getType(), nativeInternalFormat))
>+    {
>+        BlitGL *blitter = GetBlitGL(context);
> 
>-gl::Error TextureGL::initializeContents(const gl::Context *context,
>-                                        const gl::ImageIndex &imageIndex)
>-{
>-    // UNIMPLEMENTED();
>-    return gl::NoError();
>+        int levelDepth = mState.getImageDesc(imageIndex).size.depth;
>+
>+        bool clearSucceeded = false;
>+        ANGLE_TRY(blitter->clearRenderableTexture(this, nativeInternalFormat, levelDepth,
>+                                                  imageIndex, &clearSucceeded));
>+        if (clearSucceeded)
>+        {
>+            return angle::Result::Continue;
>+        }
>+    }
>+
>+    // Either the texture is not renderable or was incomplete when clearing, fall back to a data
>+    // upload
>+    const gl::ImageDesc &desc                    = mState.getImageDesc(imageIndex);
>+    const gl::InternalFormat &internalFormatInfo = *desc.format.info;
>+
>+    gl::PixelUnpackState unpackState;
>+    unpackState.alignment = 1;
>+    stateManager->setPixelUnpackState(unpackState);
>+
>+    if (internalFormatInfo.compressed)
>+    {
>+        nativegl::CompressedTexSubImageFormat nativeSubImageFormat =
>+            nativegl::GetCompressedSubTexImageFormat(functions, workarounds,
>+                                                     internalFormatInfo.internalFormat);
>+
>+        GLuint imageSize = 0;
>+        ANGLE_CHECK_GL_MATH(contextGL,
>+                            internalFormatInfo.computeCompressedImageSize(desc.size, &imageSize));
>+
>+        angle::MemoryBuffer *zero;
>+        ANGLE_CHECK_GL_ALLOC(contextGL, context->getZeroFilledBuffer(imageSize, &zero));
>+
>+        // WebGL spec requires that zero data is uploaded to compressed textures even if it might
>+        // not result in zero color data.
>+        if (nativegl::UseTexImage2D(getType()))
>+        {
>+            functions->compressedTexSubImage2D(
>+                ToGLenum(imageIndex.getTarget()), imageIndex.getLevelIndex(), 0, 0, desc.size.width,
>+                desc.size.height, nativeSubImageFormat.format, imageSize, zero->data());
>+        }
>+        else
>+        {
>+            ASSERT(nativegl::UseTexImage3D(getType()));
>+            functions->compressedTexSubImage3D(
>+                ToGLenum(imageIndex.getTarget()), imageIndex.getLevelIndex(), 0, 0, 0,
>+                desc.size.width, desc.size.height, desc.size.depth, nativeSubImageFormat.format,
>+                imageSize, zero->data());
>+        }
>+    }
>+    else
>+    {
>+        nativegl::TexSubImageFormat nativeSubImageFormat = nativegl::GetTexSubImageFormat(
>+            functions, workarounds, internalFormatInfo.format, internalFormatInfo.type);
>+
>+        GLuint imageSize = 0;
>+        ANGLE_CHECK_GL_MATH(contextGL, internalFormatInfo.computePackUnpackEndByte(
>+                                           nativeSubImageFormat.type, desc.size, unpackState,
>+                                           nativegl::UseTexImage3D(getType()), &imageSize));
>+
>+        angle::MemoryBuffer *zero;
>+        ANGLE_CHECK_GL_ALLOC(contextGL, context->getZeroFilledBuffer(imageSize, &zero));
>+
>+        if (nativegl::UseTexImage2D(getType()))
>+        {
>+            functions->texSubImage2D(ToGLenum(imageIndex.getTarget()), imageIndex.getLevelIndex(),
>+                                     0, 0, desc.size.width, desc.size.height,
>+                                     nativeSubImageFormat.format, nativeSubImageFormat.type,
>+                                     zero->data());
>+        }
>+        else
>+        {
>+            ASSERT(nativegl::UseTexImage3D(getType()));
>+            functions->texSubImage3D(ToGLenum(imageIndex.getTarget()), imageIndex.getLevelIndex(),
>+                                     0, 0, 0, desc.size.width, desc.size.height, desc.size.depth,
>+                                     nativeSubImageFormat.format, nativeSubImageFormat.type,
>+                                     zero->data());
>+        }
>+    }
>+
>+    return angle::Result::Continue;
> }
> 
> }  // namespace rx
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/TextureGL.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/TextureGL.h
>index 4a48acb1720..d5e7caaaeb3 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/TextureGL.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/TextureGL.h
>@@ -9,9 +9,9 @@
> #ifndef LIBANGLE_RENDERER_GL_TEXTUREGL_H_
> #define LIBANGLE_RENDERER_GL_TEXTUREGL_H_
> 
>+#include "libANGLE/Texture.h"
> #include "libANGLE/angletypes.h"
> #include "libANGLE/renderer/TextureImpl.h"
>-#include "libANGLE/Texture.h"
> 
> namespace rx
> {
>@@ -56,139 +56,142 @@ struct LevelInfoGL
> class TextureGL : public TextureImpl
> {
>   public:
>-    TextureGL(const gl::TextureState &state,
>-              const FunctionsGL *functions,
>-              const WorkaroundsGL &workarounds,
>-              StateManagerGL *stateManager,
>-              BlitGL *blitter);
>+    TextureGL(const gl::TextureState &state, GLuint id);
>     ~TextureGL() override;
> 
>-    gl::Error setImage(const gl::Context *context,
>-                       GLenum target,
>-                       size_t level,
>-                       GLenum internalFormat,
>-                       const gl::Extents &size,
>-                       GLenum format,
>-                       GLenum type,
>-                       const gl::PixelUnpackState &unpack,
>-                       const uint8_t *pixels) override;
>-    gl::Error setSubImage(const gl::Context *context,
>-                          GLenum target,
>-                          size_t level,
>-                          const gl::Box &area,
>-                          GLenum format,
>-                          GLenum type,
>-                          const gl::PixelUnpackState &unpack,
>-                          const uint8_t *pixels) override;
>-
>-    gl::Error setCompressedImage(const gl::Context *context,
>-                                 GLenum target,
>-                                 size_t level,
>-                                 GLenum internalFormat,
>-                                 const gl::Extents &size,
>-                                 const gl::PixelUnpackState &unpack,
>-                                 size_t imageSize,
>-                                 const uint8_t *pixels) override;
>-    gl::Error setCompressedSubImage(const gl::Context *context,
>-                                    GLenum target,
>-                                    size_t level,
>-                                    const gl::Box &area,
>-                                    GLenum format,
>-                                    const gl::PixelUnpackState &unpack,
>-                                    size_t imageSize,
>-                                    const uint8_t *pixels) override;
>-
>-    gl::Error copyImage(const gl::Context *context,
>-                        GLenum target,
>-                        size_t level,
>-                        const gl::Rectangle &sourceArea,
>-                        GLenum internalFormat,
>-                        const gl::Framebuffer *source) override;
>-    gl::Error copySubImage(const gl::Context *context,
>-                           GLenum target,
>-                           size_t level,
>-                           const gl::Offset &destOffset,
>-                           const gl::Rectangle &sourceArea,
>-                           const gl::Framebuffer *source) override;
>-
>-    gl::Error copyTexture(const gl::Context *context,
>-                          GLenum target,
>-                          size_t level,
>-                          GLenum internalFormat,
>-                          GLenum type,
>-                          size_t sourceLevel,
>-                          bool unpackFlipY,
>-                          bool unpackPremultiplyAlpha,
>-                          bool unpackUnmultiplyAlpha,
>-                          const gl::Texture *source) override;
>-    gl::Error copySubTexture(const gl::Context *context,
>-                             GLenum target,
>-                             size_t level,
>-                             const gl::Offset &destOffset,
>-                             size_t sourceLevel,
>-                             const gl::Rectangle &sourceArea,
>-                             bool unpackFlipY,
>-                             bool unpackPremultiplyAlpha,
>-                             bool unpackUnmultiplyAlpha,
>-                             const gl::Texture *source) override;
>-    gl::Error copySubTextureHelper(const gl::Context *context,
>-                                   GLenum target,
>-                                   size_t level,
>-                                   const gl::Offset &destOffset,
>-                                   size_t sourceLevel,
>-                                   const gl::Rectangle &sourceArea,
>-                                   GLenum destFormat,
>-                                   GLenum destType,
>-                                   bool unpackFlipY,
>-                                   bool unpackPremultiplyAlpha,
>-                                   bool unpackUnmultiplyAlpha,
>-                                   const gl::Texture *source);
>-
>-    gl::Error setStorage(const gl::Context *context,
>-                         GLenum target,
>-                         size_t levels,
>-                         GLenum internalFormat,
>-                         const gl::Extents &size) override;
>-
>-    gl::Error setStorageMultisample(const gl::Context *context,
>-                                    GLenum target,
>-                                    GLsizei samples,
>-                                    GLint internalFormat,
>-                                    const gl::Extents &size,
>-                                    bool fixedSampleLocations) override;
>-
>-    gl::Error setImageExternal(const gl::Context *context,
>-                               GLenum target,
>-                               egl::Stream *stream,
>-                               const egl::Stream::GLTextureDescription &desc) override;
>-
>-    gl::Error generateMipmap(const gl::Context *context) override;
>-
>-    gl::Error bindTexImage(const gl::Context *context, egl::Surface *surface) override;
>-    gl::Error releaseTexImage(const gl::Context *context) override;
>-
>-    gl::Error setEGLImageTarget(const gl::Context *context,
>-                                GLenum target,
>-                                egl::Image *image) override;
>-
>-    GLuint getTextureID() const;
>-    GLenum getTarget() const;
>-
>-    void syncState(const gl::Texture::DirtyBits &dirtyBits) override;
>+    void onDestroy(const gl::Context *context) override;
>+
>+    angle::Result setImage(const gl::Context *context,
>+                           const gl::ImageIndex &index,
>+                           GLenum internalFormat,
>+                           const gl::Extents &size,
>+                           GLenum format,
>+                           GLenum type,
>+                           const gl::PixelUnpackState &unpack,
>+                           const uint8_t *pixels) override;
>+    angle::Result setSubImage(const gl::Context *context,
>+                              const gl::ImageIndex &index,
>+                              const gl::Box &area,
>+                              GLenum format,
>+                              GLenum type,
>+                              const gl::PixelUnpackState &unpack,
>+                              gl::Buffer *unpackBuffer,
>+                              const uint8_t *pixels) override;
>+
>+    angle::Result setCompressedImage(const gl::Context *context,
>+                                     const gl::ImageIndex &index,
>+                                     GLenum internalFormat,
>+                                     const gl::Extents &size,
>+                                     const gl::PixelUnpackState &unpack,
>+                                     size_t imageSize,
>+                                     const uint8_t *pixels) override;
>+    angle::Result setCompressedSubImage(const gl::Context *context,
>+                                        const gl::ImageIndex &index,
>+                                        const gl::Box &area,
>+                                        GLenum format,
>+                                        const gl::PixelUnpackState &unpack,
>+                                        size_t imageSize,
>+                                        const uint8_t *pixels) override;
>+
>+    angle::Result copyImage(const gl::Context *context,
>+                            const gl::ImageIndex &index,
>+                            const gl::Rectangle &sourceArea,
>+                            GLenum internalFormat,
>+                            gl::Framebuffer *source) override;
>+    angle::Result copySubImage(const gl::Context *context,
>+                               const gl::ImageIndex &index,
>+                               const gl::Offset &destOffset,
>+                               const gl::Rectangle &sourceArea,
>+                               gl::Framebuffer *source) override;
>+
>+    angle::Result copyTexture(const gl::Context *context,
>+                              const gl::ImageIndex &index,
>+                              GLenum internalFormat,
>+                              GLenum type,
>+                              size_t sourceLevel,
>+                              bool unpackFlipY,
>+                              bool unpackPremultiplyAlpha,
>+                              bool unpackUnmultiplyAlpha,
>+                              const gl::Texture *source) override;
>+    angle::Result copySubTexture(const gl::Context *context,
>+                                 const gl::ImageIndex &index,
>+                                 const gl::Offset &destOffset,
>+                                 size_t sourceLevel,
>+                                 const gl::Box &sourceBox,
>+                                 bool unpackFlipY,
>+                                 bool unpackPremultiplyAlpha,
>+                                 bool unpackUnmultiplyAlpha,
>+                                 const gl::Texture *source) override;
>+    angle::Result copySubTextureHelper(const gl::Context *context,
>+                                       gl::TextureTarget target,
>+                                       size_t level,
>+                                       const gl::Offset &destOffset,
>+                                       size_t sourceLevel,
>+                                       const gl::Rectangle &sourceArea,
>+                                       const gl::InternalFormat &destFormat,
>+                                       bool unpackFlipY,
>+                                       bool unpackPremultiplyAlpha,
>+                                       bool unpackUnmultiplyAlpha,
>+                                       const gl::Texture *source);
>+
>+    angle::Result setStorage(const gl::Context *context,
>+                             gl::TextureType type,
>+                             size_t levels,
>+                             GLenum internalFormat,
>+                             const gl::Extents &size) override;
>+
>+    angle::Result setStorageMultisample(const gl::Context *context,
>+                                        gl::TextureType type,
>+                                        GLsizei samples,
>+                                        GLint internalformat,
>+                                        const gl::Extents &size,
>+                                        bool fixedSampleLocations) override;
>+
>+    angle::Result setStorageExternalMemory(const gl::Context *context,
>+                                           gl::TextureType type,
>+                                           size_t levels,
>+                                           GLenum internalFormat,
>+                                           const gl::Extents &size,
>+                                           gl::MemoryObject *memoryObject,
>+                                           GLuint64 offset) override;
>+
>+    angle::Result setImageExternal(const gl::Context *context,
>+                                   gl::TextureType type,
>+                                   egl::Stream *stream,
>+                                   const egl::Stream::GLTextureDescription &desc) override;
>+
>+    angle::Result generateMipmap(const gl::Context *context) override;
>+
>+    angle::Result bindTexImage(const gl::Context *context, egl::Surface *surface) override;
>+    angle::Result releaseTexImage(const gl::Context *context) override;
>+
>+    angle::Result setEGLImageTarget(const gl::Context *context,
>+                                    gl::TextureType type,
>+                                    egl::Image *image) override;
>+
>+    GLuint getTextureID() const { return mTextureID; }
>+
>+    gl::TextureType getType() const;
>+
>+    angle::Result syncState(const gl::Context *context,
>+                            const gl::Texture::DirtyBits &dirtyBits) override;
>     bool hasAnyDirtyBit() const;
> 
>-    gl::Error setBaseLevel(const gl::Context *context, GLuint baseLevel) override;
>+    angle::Result setBaseLevel(const gl::Context *context, GLuint baseLevel) override;
>+
>+    angle::Result initializeContents(const gl::Context *context,
>+                                     const gl::ImageIndex &imageIndex) override;
> 
>-    gl::Error initializeContents(const gl::Context *context,
>-                                 const gl::ImageIndex &imageIndex) override;
>+    void setMinFilter(const gl::Context *context, GLenum filter);
>+    void setMagFilter(const gl::Context *context, GLenum filter);
> 
>-    void setMinFilter(GLenum filter);
>-    void setMagFilter(GLenum filter);
>+    void setSwizzle(const gl::Context *context, GLint swizzle[4]);
> 
>-    void setSwizzle(GLint swizzle[4]);
>+    GLenum getNativeInternalFormat(const gl::ImageIndex &index) const;
> 
>   private:
>-    void setImageHelper(GLenum target,
>+    void setImageHelper(const gl::Context *context,
>+                        gl::TextureTarget target,
>                         size_t level,
>                         GLenum internalFormat,
>                         const gl::Extents &size,
>@@ -196,46 +199,51 @@ class TextureGL : public TextureImpl
>                         GLenum type,
>                         const uint8_t *pixels);
>     // This changes the current pixel unpack state that will have to be reapplied.
>-    void reserveTexImageToBeFilled(GLenum target,
>+    void reserveTexImageToBeFilled(const gl::Context *context,
>+                                   gl::TextureTarget target,
>                                    size_t level,
>                                    GLenum internalFormat,
>                                    const gl::Extents &size,
>                                    GLenum format,
>                                    GLenum type);
>-    gl::Error setSubImageRowByRowWorkaround(const gl::Context *context,
>-                                            GLenum target,
>-                                            size_t level,
>-                                            const gl::Box &area,
>-                                            GLenum format,
>-                                            GLenum type,
>-                                            const gl::PixelUnpackState &unpack,
>-                                            const gl::Buffer *unpackBuffer,
>-                                            const uint8_t *pixels);
>-
>-    gl::Error setSubImagePaddingWorkaround(const gl::Context *context,
>-                                           GLenum target,
>-                                           size_t level,
>-                                           const gl::Box &area,
>-                                           GLenum format,
>-                                           GLenum type,
>-                                           const gl::PixelUnpackState &unpack,
>-                                           const gl::Buffer *unpackBuffer,
>-                                           const uint8_t *pixels);
>+    angle::Result setSubImageRowByRowWorkaround(const gl::Context *context,
>+                                                gl::TextureTarget target,
>+                                                size_t level,
>+                                                const gl::Box &area,
>+                                                GLenum format,
>+                                                GLenum type,
>+                                                const gl::PixelUnpackState &unpack,
>+                                                const gl::Buffer *unpackBuffer,
>+                                                const uint8_t *pixels);
>+
>+    angle::Result setSubImagePaddingWorkaround(const gl::Context *context,
>+                                               gl::TextureTarget target,
>+                                               size_t level,
>+                                               const gl::Box &area,
>+                                               GLenum format,
>+                                               GLenum type,
>+                                               const gl::PixelUnpackState &unpack,
>+                                               const gl::Buffer *unpackBuffer,
>+                                               const uint8_t *pixels);
> 
>     void syncTextureStateSwizzle(const FunctionsGL *functions,
>                                  GLenum name,
>                                  GLenum value,
>                                  GLenum *outValue);
> 
>-    void setLevelInfo(GLenum target, size_t level, size_t levelCount, const LevelInfoGL &levelInfo);
>-    const LevelInfoGL &getLevelInfo(GLenum target, size_t level) const;
>+    void setLevelInfo(const gl::Context *context,
>+                      gl::TextureTarget target,
>+                      size_t level,
>+                      size_t levelCount,
>+                      const LevelInfoGL &levelInfo);
>+    void setLevelInfo(const gl::Context *context,
>+                      gl::TextureType type,
>+                      size_t level,
>+                      size_t levelCount,
>+                      const LevelInfoGL &levelInfo);
>+    const LevelInfoGL &getLevelInfo(gl::TextureTarget target, size_t level) const;
>     const LevelInfoGL &getBaseLevelInfo() const;
> 
>-    const FunctionsGL *mFunctions;
>-    const WorkaroundsGL &mWorkarounds;
>-    StateManagerGL *mStateManager;
>-    BlitGL *mBlitter;
>-
>     std::vector<LevelInfoGL> mLevelInfo;
>     gl::Texture::DirtyBits mLocalDirtyBits;
> 
>@@ -246,7 +254,6 @@ class TextureGL : public TextureImpl
> 
>     GLuint mTextureID;
> };
>+}  // namespace rx
> 
>-}
>-
>-#endif // LIBANGLE_RENDERER_GL_TEXTUREGL_H_
>+#endif  // LIBANGLE_RENDERER_GL_TEXTUREGL_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/TransformFeedbackGL.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/TransformFeedbackGL.cpp
>index 33354f882eb..8255ffb3396 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/TransformFeedbackGL.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/TransformFeedbackGL.cpp
>@@ -9,10 +9,14 @@
> #include "libANGLE/renderer/gl/TransformFeedbackGL.h"
> 
> #include "common/debug.h"
>-#include "libANGLE/ContextState.h"
>+#include "libANGLE/Context.h"
>+#include "libANGLE/State.h"
> #include "libANGLE/renderer/gl/BufferGL.h"
> #include "libANGLE/renderer/gl/FunctionsGL.h"
>+#include "libANGLE/renderer/gl/ProgramGL.h"
> #include "libANGLE/renderer/gl/StateManagerGL.h"
>+#include "libANGLE/renderer/gl/WorkaroundsGL.h"
>+#include "libANGLE/renderer/gl/renderergl_utils.h"
> 
> namespace rx
> {
>@@ -25,7 +29,8 @@ TransformFeedbackGL::TransformFeedbackGL(const gl::TransformFeedbackState &state
>       mStateManager(stateManager),
>       mTransformFeedbackID(0),
>       mIsActive(false),
>-      mIsPaused(false)
>+      mIsPaused(false),
>+      mActiveProgram(0)
> {
>     mFunctions->genTransformFeedbacks(1, &mTransformFeedbackID);
> }
>@@ -36,32 +41,46 @@ TransformFeedbackGL::~TransformFeedbackGL()
>     mTransformFeedbackID = 0;
> }
> 
>-void TransformFeedbackGL::begin(GLenum primitiveMode)
>+angle::Result TransformFeedbackGL::begin(const gl::Context *context,
>+                                         gl::PrimitiveMode primitiveMode)
> {
>-    // Do not begin directly, StateManagerGL will handle beginning and resuming transform feedback.
>+    mStateManager->onTransformFeedbackStateChange();
>+    return angle::Result::Continue;
> }
> 
>-void TransformFeedbackGL::end()
>+angle::Result TransformFeedbackGL::end(const gl::Context *context)
> {
>-    syncActiveState(false, GL_NONE);
>+    mStateManager->onTransformFeedbackStateChange();
>+
>+    // Immediately end the transform feedback so that the results are visible.
>+    syncActiveState(context, false, gl::PrimitiveMode::InvalidEnum);
>+    return angle::Result::Continue;
> }
> 
>-void TransformFeedbackGL::pause()
>+angle::Result TransformFeedbackGL::pause(const gl::Context *context)
> {
>+    mStateManager->onTransformFeedbackStateChange();
>+
>     syncPausedState(true);
>+    return angle::Result::Continue;
> }
> 
>-void TransformFeedbackGL::resume()
>+angle::Result TransformFeedbackGL::resume(const gl::Context *context)
> {
>-    // Do not resume directly, StateManagerGL will handle beginning and resuming transform feedback.
>+    mStateManager->onTransformFeedbackStateChange();
>+    return angle::Result::Continue;
> }
> 
>-void TransformFeedbackGL::bindGenericBuffer(const gl::BindingPointer<gl::Buffer> &binding)
>+angle::Result TransformFeedbackGL::bindGenericBuffer(const gl::Context *context,
>+                                                     const gl::BindingPointer<gl::Buffer> &binding)
> {
>+    return angle::Result::Continue;
> }
> 
>-void TransformFeedbackGL::bindIndexedBuffer(size_t index,
>-                                            const gl::OffsetBindingPointer<gl::Buffer> &binding)
>+angle::Result TransformFeedbackGL::bindIndexedBuffer(
>+    const gl::Context *context,
>+    size_t index,
>+    const gl::OffsetBindingPointer<gl::Buffer> &binding)
> {
>     // Directly bind buffer (not through the StateManager methods) because the buffer bindings are
>     // tracked per transform feedback object
>@@ -85,6 +104,7 @@ void TransformFeedbackGL::bindIndexedBuffer(size_t index,
>     {
>         mFunctions->bindBufferBase(GL_TRANSFORM_FEEDBACK_BUFFER, static_cast<GLuint>(index), 0);
>     }
>+    return angle::Result::Continue;
> }
> 
> GLuint TransformFeedbackGL::getTransformFeedbackID() const
>@@ -92,7 +112,9 @@ GLuint TransformFeedbackGL::getTransformFeedbackID() const
>     return mTransformFeedbackID;
> }
> 
>-void TransformFeedbackGL::syncActiveState(bool active, GLenum primitiveMode) const
>+void TransformFeedbackGL::syncActiveState(const gl::Context *context,
>+                                          bool active,
>+                                          gl::PrimitiveMode primitiveMode) const
> {
>     if (mIsActive != active)
>     {
>@@ -102,11 +124,21 @@ void TransformFeedbackGL::syncActiveState(bool active, GLenum primitiveMode) con
>         mStateManager->bindTransformFeedback(GL_TRANSFORM_FEEDBACK, mTransformFeedbackID);
>         if (mIsActive)
>         {
>-            mFunctions->beginTransformFeedback(primitiveMode);
>+            ASSERT(primitiveMode != gl::PrimitiveMode::InvalidEnum);
>+            mActiveProgram = GetImplAs<ProgramGL>(mState.getBoundProgram())->getProgramID();
>+            mStateManager->useProgram(mActiveProgram);
>+            mFunctions->beginTransformFeedback(gl::ToGLenum(primitiveMode));
>         }
>         else
>         {
>+            // Implementations disagree about what should happen if a different program is bound
>+            // when calling EndTransformFeedback. We avoid the ambiguity by always re-binding the
>+            // program associated with this transform feedback.
>+            GLuint previousProgram = mStateManager->getProgramID();
>+            mStateManager->useProgram(mActiveProgram);
>             mFunctions->endTransformFeedback();
>+            // Restore the current program if we changed it.
>+            mStateManager->useProgram(previousProgram);
>         }
>     }
> }
>@@ -128,5 +160,4 @@ void TransformFeedbackGL::syncPausedState(bool paused) const
>         }
>     }
> }
>-
>-}
>+}  // namespace rx
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/TransformFeedbackGL.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/TransformFeedbackGL.h
>index 1a6375d42e3..421fd3fac26 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/TransformFeedbackGL.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/TransformFeedbackGL.h
>@@ -25,18 +25,22 @@ class TransformFeedbackGL : public TransformFeedbackImpl
>                         StateManagerGL *stateManager);
>     ~TransformFeedbackGL() override;
> 
>-    void begin(GLenum primitiveMode) override;
>-    void end() override;
>-    void pause() override;
>-    void resume() override;
>+    angle::Result begin(const gl::Context *context, gl::PrimitiveMode primitiveMode) override;
>+    angle::Result end(const gl::Context *context) override;
>+    angle::Result pause(const gl::Context *context) override;
>+    angle::Result resume(const gl::Context *context) override;
> 
>-    void bindGenericBuffer(const gl::BindingPointer<gl::Buffer> &binding) override;
>-    void bindIndexedBuffer(size_t index,
>-                           const gl::OffsetBindingPointer<gl::Buffer> &binding) override;
>+    angle::Result bindGenericBuffer(const gl::Context *context,
>+                                    const gl::BindingPointer<gl::Buffer> &binding) override;
>+    angle::Result bindIndexedBuffer(const gl::Context *context,
>+                                    size_t index,
>+                                    const gl::OffsetBindingPointer<gl::Buffer> &binding) override;
> 
>     GLuint getTransformFeedbackID() const;
> 
>-    void syncActiveState(bool active, GLenum primitiveMode) const;
>+    void syncActiveState(const gl::Context *context,
>+                         bool active,
>+                         gl::PrimitiveMode primitiveMode) const;
>     void syncPausedState(bool paused) const;
> 
>   private:
>@@ -47,8 +51,8 @@ class TransformFeedbackGL : public TransformFeedbackImpl
> 
>     mutable bool mIsActive;
>     mutable bool mIsPaused;
>+    mutable GLuint mActiveProgram;
> };
>+}  // namespace rx
> 
>-}
>-
>-#endif // LIBANGLE_RENDERER_GL_TRANSFORMFEEDBACKGL_H_
>+#endif  // LIBANGLE_RENDERER_GL_TRANSFORMFEEDBACKGL_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/VertexArrayGL.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/VertexArrayGL.cpp
>index 512baa5633f..dc8264fab94 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/VertexArrayGL.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/VertexArrayGL.cpp
>@@ -13,9 +13,11 @@
> #include "common/mathutil.h"
> #include "common/utilities.h"
> #include "libANGLE/Buffer.h"
>+#include "libANGLE/Context.h"
> #include "libANGLE/angletypes.h"
> #include "libANGLE/formatutils.h"
> #include "libANGLE/renderer/gl/BufferGL.h"
>+#include "libANGLE/renderer/gl/ContextGL.h"
> #include "libANGLE/renderer/gl/FunctionsGL.h"
> #include "libANGLE/renderer/gl/StateManagerGL.h"
> #include "libANGLE/renderer/gl/renderergl_utils.h"
>@@ -26,12 +28,6 @@ namespace rx
> {
> namespace
> {
>-// Warning: you should ensure binding really matches attrib.bindingIndex before using this function.
>-bool AttributeNeedsStreaming(const VertexAttribute &attrib, const VertexBinding &binding)
>-{
>-    return (attrib.enabled && binding.getBuffer().get() == nullptr);
>-}
>-
> bool SameVertexAttribFormat(const VertexAttribute &a, const VertexAttribute &b)
> {
>     return a.size == b.size && a.type == b.type && a.normalized == b.normalized &&
>@@ -83,14 +79,12 @@ VertexArrayGL::VertexArrayGL(const VertexArrayState &state,
>     }
> }
> 
>-VertexArrayGL::~VertexArrayGL()
>-{
>-}
>+VertexArrayGL::~VertexArrayGL() {}
> 
> void VertexArrayGL::destroy(const gl::Context *context)
> {
>     mStateManager->deleteVertexArray(mVertexArrayID);
>-    mVertexArrayID = 0;
>+    mVertexArrayID   = 0;
>     mAppliedNumViews = 1;
> 
>     mStateManager->deleteBuffer(mStreamingElementArrayBuffer);
>@@ -108,66 +102,49 @@ void VertexArrayGL::destroy(const gl::Context *context)
>     }
> }
> 
>-gl::Error VertexArrayGL::syncDrawArraysState(const gl::Context *context,
>-                                             const gl::AttributesMask &activeAttributesMask,
>-                                             GLint first,
>-                                             GLsizei count,
>-                                             GLsizei instanceCount) const
>+angle::Result VertexArrayGL::syncClientSideData(const gl::Context *context,
>+                                                const gl::AttributesMask &activeAttributesMask,
>+                                                GLint first,
>+                                                GLsizei count,
>+                                                GLsizei instanceCount) const
> {
>-    return syncDrawState(context, activeAttributesMask, first, count, GL_NONE, nullptr,
>-                         instanceCount, false, nullptr);
>+    return syncDrawState(context, activeAttributesMask, first, count,
>+                         gl::DrawElementsType::InvalidEnum, nullptr, instanceCount, false, nullptr);
> }
> 
>-gl::Error VertexArrayGL::syncDrawElementsState(const gl::Context *context,
>-                                               const gl::AttributesMask &activeAttributesMask,
>-                                               GLsizei count,
>-                                               GLenum type,
>-                                               const void *indices,
>-                                               GLsizei instanceCount,
>-                                               bool primitiveRestartEnabled,
>-                                               const void **outIndices) const
>+void VertexArrayGL::updateElementArrayBufferBinding(const gl::Context *context) const
> {
>-    return syncDrawState(context, activeAttributesMask, 0, count, type, indices, instanceCount,
>-                         primitiveRestartEnabled, outIndices);
>-}
>-
>-gl::Error VertexArrayGL::syncElementArrayState(const gl::Context *context) const
>-{
>-    gl::Buffer *elementArrayBuffer = mState.getElementArrayBuffer().get();
>-    ASSERT(elementArrayBuffer);
>-    if (elementArrayBuffer != mAppliedElementArrayBuffer.get())
>+    gl::Buffer *elementArrayBuffer = mState.getElementArrayBuffer();
>+    if (elementArrayBuffer != nullptr && elementArrayBuffer != mAppliedElementArrayBuffer.get())
>     {
>         const BufferGL *bufferGL = GetImplAs<BufferGL>(elementArrayBuffer);
>         mStateManager->bindBuffer(gl::BufferBinding::ElementArray, bufferGL->getBufferID());
>         mAppliedElementArrayBuffer.set(context, elementArrayBuffer);
>     }
>-
>-    return gl::NoError();
> }
> 
>-gl::Error VertexArrayGL::syncDrawState(const gl::Context *context,
>-                                       const gl::AttributesMask &activeAttributesMask,
>-                                       GLint first,
>-                                       GLsizei count,
>-                                       GLenum type,
>-                                       const void *indices,
>-                                       GLsizei instanceCount,
>-                                       bool primitiveRestartEnabled,
>-                                       const void **outIndices) const
>+angle::Result VertexArrayGL::syncDrawState(const gl::Context *context,
>+                                           const gl::AttributesMask &activeAttributesMask,
>+                                           GLint first,
>+                                           GLsizei count,
>+                                           gl::DrawElementsType type,
>+                                           const void *indices,
>+                                           GLsizei instanceCount,
>+                                           bool primitiveRestartEnabled,
>+                                           const void **outIndices) const
> {
>-    mStateManager->bindVertexArray(mVertexArrayID, getAppliedElementArrayBufferID());
>-
>     // Check if any attributes need to be streamed, determines if the index range needs to be
>     // computed
>-    bool attributesNeedStreaming = mAttributesNeedStreaming.any();
>+    const gl::AttributesMask &needsStreamingAttribs =
>+        context->getStateCache().getActiveClientAttribsMask();
> 
>     // Determine if an index buffer needs to be streamed and the range of vertices that need to be
>     // copied
>     IndexRange indexRange;
>-    if (type != GL_NONE)
>+    if (type != gl::DrawElementsType::InvalidEnum)
>     {
>         ANGLE_TRY(syncIndexData(context, count, type, indices, primitiveRestartEnabled,
>-                                attributesNeedStreaming, &indexRange, outIndices));
>+                                needsStreamingAttribs.any(), &indexRange, outIndices));
>     }
>     else
>     {
>@@ -176,48 +153,38 @@ gl::Error VertexArrayGL::syncDrawState(const gl::Context *context,
>         indexRange.end   = first + count - 1;
>     }
> 
>-    if (attributesNeedStreaming)
>+    if (needsStreamingAttribs.any())
>     {
>-        ANGLE_TRY(streamAttributes(activeAttributesMask, instanceCount, indexRange));
>+        ANGLE_TRY(streamAttributes(context, needsStreamingAttribs, instanceCount, indexRange));
>     }
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error VertexArrayGL::syncIndexData(const gl::Context *context,
>-                                       GLsizei count,
>-                                       GLenum type,
>-                                       const void *indices,
>-                                       bool primitiveRestartEnabled,
>-                                       bool attributesNeedStreaming,
>-                                       IndexRange *outIndexRange,
>-                                       const void **outIndices) const
>+angle::Result VertexArrayGL::syncIndexData(const gl::Context *context,
>+                                           GLsizei count,
>+                                           gl::DrawElementsType type,
>+                                           const void *indices,
>+                                           bool primitiveRestartEnabled,
>+                                           bool attributesNeedStreaming,
>+                                           IndexRange *outIndexRange,
>+                                           const void **outIndices) const
> {
>     ASSERT(outIndices);
> 
>-    gl::Buffer *elementArrayBuffer = mState.getElementArrayBuffer().get();
>+    gl::Buffer *elementArrayBuffer = mState.getElementArrayBuffer();
> 
>     // Need to check the range of indices if attributes need to be streamed
>     if (elementArrayBuffer != nullptr)
>     {
>-        if (elementArrayBuffer != mAppliedElementArrayBuffer.get())
>-        {
>-            const BufferGL *bufferGL = GetImplAs<BufferGL>(elementArrayBuffer);
>-            mStateManager->bindBuffer(gl::BufferBinding::ElementArray, bufferGL->getBufferID());
>-            mAppliedElementArrayBuffer.set(context, elementArrayBuffer);
>-        }
>-
>+        ASSERT(elementArrayBuffer == mAppliedElementArrayBuffer.get());
>         // Only compute the index range if the attributes also need to be streamed
>         if (attributesNeedStreaming)
>         {
>             ptrdiff_t elementArrayBufferOffset = reinterpret_cast<ptrdiff_t>(indices);
>-            Error error                        = mState.getElementArrayBuffer()->getIndexRange(
>+            ANGLE_TRY(mState.getElementArrayBuffer()->getIndexRange(
>                 context, type, elementArrayBufferOffset, count, primitiveRestartEnabled,
>-                outIndexRange);
>-            if (error.isError())
>-            {
>-                return error;
>-            }
>+                outIndexRange));
>         }
> 
>         // Indices serves as an offset into the index buffer in this case, use the same value for
>@@ -242,12 +209,14 @@ gl::Error VertexArrayGL::syncIndexData(const gl::Context *context,
>             mStreamingElementArrayBufferSize = 0;
>         }
> 
>+        mStateManager->bindVertexArray(mVertexArrayID, getAppliedElementArrayBufferID());
>+
>         mStateManager->bindBuffer(gl::BufferBinding::ElementArray, mStreamingElementArrayBuffer);
>         mAppliedElementArrayBuffer.set(context, nullptr);
> 
>         // Make sure the element array buffer is large enough
>-        const Type &indexTypeInfo          = GetTypeInfo(type);
>-        size_t requiredStreamingBufferSize = indexTypeInfo.bytes * count;
>+        const GLuint indexTypeBytes        = gl::GetDrawElementsTypeSize(type);
>+        size_t requiredStreamingBufferSize = indexTypeBytes * count;
>         if (requiredStreamingBufferSize > mStreamingElementArrayBufferSize)
>         {
>             // Copy the indices in while resizing the buffer
>@@ -267,10 +236,10 @@ gl::Error VertexArrayGL::syncIndexData(const gl::Context *context,
>         *outIndices = nullptr;
>     }
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-void VertexArrayGL::computeStreamingAttributeSizes(const gl::AttributesMask &activeAttributesMask,
>+void VertexArrayGL::computeStreamingAttributeSizes(const gl::AttributesMask &attribsToStream,
>                                                    GLsizei instanceCount,
>                                                    const gl::IndexRange &indexRange,
>                                                    size_t *outStreamingDataSize,
>@@ -279,23 +248,20 @@ void VertexArrayGL::computeStreamingAttributeSizes(const gl::AttributesMask &act
>     *outStreamingDataSize    = 0;
>     *outMaxAttributeDataSize = 0;
> 
>-    ASSERT(mAttributesNeedStreaming.any());
>+    ASSERT(attribsToStream.any());
> 
>     const auto &attribs  = mState.getVertexAttributes();
>     const auto &bindings = mState.getVertexBindings();
> 
>-    gl::AttributesMask attribsToStream = (mAttributesNeedStreaming & activeAttributesMask);
>-
>     for (auto idx : attribsToStream)
>     {
>         const auto &attrib  = attribs[idx];
>         const auto &binding = bindings[attrib.bindingIndex];
>-        ASSERT(AttributeNeedsStreaming(attrib, binding));
> 
>         // If streaming is going to be required, compute the size of the required buffer
>         // and how much slack space at the beginning of the buffer will be required by determining
>         // the attribute with the largest data size.
>-        size_t typeSize = ComputeVertexAttributeTypeSize(attrib);
>+        size_t typeSize        = ComputeVertexAttributeTypeSize(attrib);
>         GLuint adjustedDivisor = GetAdjustedDivisor(mAppliedNumViews, binding.getDivisor());
>         *outStreamingDataSize +=
>             typeSize * ComputeVertexBindingElementCount(adjustedDivisor, indexRange.vertexCount(),
>@@ -304,20 +270,21 @@ void VertexArrayGL::computeStreamingAttributeSizes(const gl::AttributesMask &act
>     }
> }
> 
>-gl::Error VertexArrayGL::streamAttributes(const gl::AttributesMask &activeAttributesMask,
>-                                          GLsizei instanceCount,
>-                                          const gl::IndexRange &indexRange) const
>+angle::Result VertexArrayGL::streamAttributes(const gl::Context *context,
>+                                              const gl::AttributesMask &attribsToStream,
>+                                              GLsizei instanceCount,
>+                                              const gl::IndexRange &indexRange) const
> {
>     // Sync the vertex attribute state and track what data needs to be streamed
>     size_t streamingDataSize    = 0;
>     size_t maxAttributeDataSize = 0;
> 
>-    computeStreamingAttributeSizes(activeAttributesMask, instanceCount, indexRange,
>-                                   &streamingDataSize, &maxAttributeDataSize);
>+    computeStreamingAttributeSizes(attribsToStream, instanceCount, indexRange, &streamingDataSize,
>+                                   &maxAttributeDataSize);
> 
>     if (streamingDataSize == 0)
>     {
>-        return gl::NoError();
>+        return angle::Result::Continue;
>     }
> 
>     if (mStreamingArrayBuffer == 0)
>@@ -338,6 +305,8 @@ gl::Error VertexArrayGL::streamAttributes(const gl::AttributesMask &activeAttrib
>         mStreamingArrayBufferSize = requiredBufferSize;
>     }
> 
>+    mStateManager->bindVertexArray(mVertexArrayID, getAppliedElementArrayBufferID());
>+
>     // Unmapping a buffer can return GL_FALSE to indicate that the system has corrupted the data
>     // somehow (such as by a screen change), retry writing the data a few times and return
>     // OUT_OF_MEMORY if that fails.
>@@ -352,15 +321,12 @@ gl::Error VertexArrayGL::streamAttributes(const gl::AttributesMask &activeAttrib
>         const auto &attribs  = mState.getVertexAttributes();
>         const auto &bindings = mState.getVertexBindings();
> 
>-        gl::AttributesMask attribsToStream = (mAttributesNeedStreaming & activeAttributesMask);
>-
>         for (auto idx : attribsToStream)
>         {
>-            const auto &attrib  = attribs[idx];
>+            const auto &attrib = attribs[idx];
>             ASSERT(IsVertexAttribPointerSupported(idx, attrib));
> 
>             const auto &binding = bindings[attrib.bindingIndex];
>-            ASSERT(AttributeNeedsStreaming(attrib, binding));
> 
>             GLuint adjustedDivisor = GetAdjustedDivisor(mAppliedNumViews, binding.getDivisor());
>             const size_t streamedVertexCount = ComputeVertexBindingElementCount(
>@@ -375,7 +341,7 @@ gl::Error VertexArrayGL::streamAttributes(const gl::AttributesMask &activeAttrib
> 
>             // Attributes using client memory ignore the VERTEX_ATTRIB_BINDING state.
>             // https://www.opengl.org/registry/specs/ARB/vertex_attrib_binding.txt
>-            const uint8_t *inputPointer = reinterpret_cast<const uint8_t *>(attrib.pointer);
>+            const uint8_t *inputPointer = static_cast<const uint8_t *>(attrib.pointer);
> 
>             // Pack the data when copying it, user could have supplied a very large stride that
>             // would cause the buffer to be much larger than needed.
>@@ -409,12 +375,9 @@ gl::Error VertexArrayGL::streamAttributes(const gl::AttributesMask &activeAttrib
>         unmapResult = mFunctions->unmapBuffer(GL_ARRAY_BUFFER);
>     }
> 
>-    if (unmapResult != GL_TRUE)
>-    {
>-        return gl::OutOfMemory() << "Failed to unmap the client data streaming buffer.";
>-    }
>-
>-    return gl::NoError();
>+    ANGLE_CHECK(GetImplAs<ContextGL>(context), unmapResult == GL_TRUE,
>+                "Failed to unmap the client data streaming buffer.", GL_OUT_OF_MEMORY);
>+    return angle::Result::Continue;
> }
> 
> GLuint VertexArrayGL::getVertexArrayID() const
>@@ -432,23 +395,15 @@ GLuint VertexArrayGL::getAppliedElementArrayBufferID() const
>     return GetImplAs<BufferGL>(mAppliedElementArrayBuffer.get())->getBufferID();
> }
> 
>-void VertexArrayGL::updateNeedsStreaming(size_t attribIndex)
>-{
>-    const auto &attrib  = mState.getVertexAttribute(attribIndex);
>-    const auto &binding = mState.getBindingFromAttribIndex(attribIndex);
>-    mAttributesNeedStreaming.set(attribIndex, AttributeNeedsStreaming(attrib, binding));
>-}
>-
> void VertexArrayGL::updateAttribEnabled(size_t attribIndex)
> {
>-    const bool enabled = mState.getVertexAttribute(attribIndex).enabled;
>+    const bool enabled = mState.getVertexAttribute(attribIndex).enabled &
>+                         mProgramActiveAttribLocationsMask.test(attribIndex);
>     if (mAppliedAttributes[attribIndex].enabled == enabled)
>     {
>         return;
>     }
> 
>-    updateNeedsStreaming(attribIndex);
>-
>     if (enabled)
>     {
>         mFunctions->enableVertexAttribArray(static_cast<GLuint>(attribIndex));
>@@ -469,21 +424,12 @@ void VertexArrayGL::updateAttribPointer(const gl::Context *context, size_t attri
>     // of the binding indexed attrib.bindingIndex (unless attribIndex == attrib.bindingIndex).
>     const VertexBinding &binding = mState.getVertexBinding(attribIndex);
> 
>-    // Since mAttributesNeedStreaming[attribIndex] keeps the value set in the last draw, here we
>-    // only need to update it when the buffer has been changed. e.g. When we set an attribute to be
>-    // streamed in the last draw, and only change its format in this draw without calling
>-    // updateNeedsStreaming, it will still be streamed because the flag is already on.
>-    const auto &bindingBuffer = binding.getBuffer();
>-    if (bindingBuffer != mAppliedBindings[attribIndex].getBuffer())
>-    {
>-        updateNeedsStreaming(attribIndex);
>-    }
>-
>     // Early return when the vertex attribute isn't using a buffer object:
>     // - If we need to stream, defer the attribPointer to the draw call.
>     // - Skip the attribute that is disabled and uses a client memory pointer.
>     // - Skip the attribute whose buffer is detached by BindVertexBuffer. Since it cannot have a
>     //   client memory pointer either, it must be disabled and shouldn't affect the draw.
>+    const auto &bindingBuffer = binding.getBuffer();
>     const Buffer *arrayBuffer = bindingBuffer.get();
>     if (arrayBuffer == nullptr)
>     {
>@@ -540,12 +486,13 @@ void VertexArrayGL::callVertexAttribPointer(GLuint attribIndex,
>     if (attrib.pureInteger)
>     {
>         ASSERT(!attrib.normalized);
>-        mFunctions->vertexAttribIPointer(attribIndex, attrib.size, attrib.type, stride, pointer);
>+        mFunctions->vertexAttribIPointer(attribIndex, attrib.size, gl::ToGLenum(attrib.type),
>+                                         stride, pointer);
>     }
>     else
>     {
>-        mFunctions->vertexAttribPointer(attribIndex, attrib.size, attrib.type, attrib.normalized,
>-                                        stride, pointer);
>+        mFunctions->vertexAttribPointer(attribIndex, attrib.size, gl::ToGLenum(attrib.type),
>+                                        attrib.normalized, stride, pointer);
>     }
> }
> 
>@@ -568,13 +515,14 @@ void VertexArrayGL::updateAttribFormat(size_t attribIndex)
>     if (attrib.pureInteger)
>     {
>         ASSERT(!attrib.normalized);
>-        mFunctions->vertexAttribIFormat(static_cast<GLuint>(attribIndex), attrib.size, attrib.type,
>-                                        attrib.relativeOffset);
>+        mFunctions->vertexAttribIFormat(static_cast<GLuint>(attribIndex), attrib.size,
>+                                        gl::ToGLenum(attrib.type), attrib.relativeOffset);
>     }
>     else
>     {
>-        mFunctions->vertexAttribFormat(static_cast<GLuint>(attribIndex), attrib.size, attrib.type,
>-                                       attrib.normalized, attrib.relativeOffset);
>+        mFunctions->vertexAttribFormat(static_cast<GLuint>(attribIndex), attrib.size,
>+                                       gl::ToGLenum(attrib.type), attrib.normalized,
>+                                       attrib.relativeOffset);
>     }
> 
>     mAppliedAttributes[attribIndex].size           = attrib.size;
>@@ -647,57 +595,112 @@ void VertexArrayGL::updateBindingDivisor(size_t bindingIndex)
>     mAppliedBindings[bindingIndex].setDivisor(adjustedDivisor);
> }
> 
>-void VertexArrayGL::syncState(const gl::Context *context, const VertexArray::DirtyBits &dirtyBits)
>+void VertexArrayGL::syncDirtyAttrib(const gl::Context *context,
>+                                    size_t attribIndex,
>+                                    const gl::VertexArray::DirtyAttribBits &dirtyAttribBits)
> {
>-    mStateManager->bindVertexArray(mVertexArrayID, getAppliedElementArrayBufferID());
>+    ASSERT(dirtyAttribBits.any());
> 
>-    for (size_t dirtyBit : dirtyBits)
>+    for (size_t dirtyBit : dirtyAttribBits)
>     {
>-        if (dirtyBit == VertexArray::DIRTY_BIT_ELEMENT_ARRAY_BUFFER)
>+        switch (dirtyBit)
>         {
>-            // TODO(jmadill): Element array buffer bindings
>-            continue;
>+            case VertexArray::DIRTY_ATTRIB_ENABLED:
>+                updateAttribEnabled(attribIndex);
>+                break;
>+
>+            case VertexArray::DIRTY_ATTRIB_POINTER:
>+                updateAttribPointer(context, attribIndex);
>+                break;
>+
>+            case VertexArray::DIRTY_ATTRIB_FORMAT:
>+                ASSERT(supportVertexAttribBinding());
>+                updateAttribFormat(attribIndex);
>+                break;
>+
>+            case VertexArray::DIRTY_ATTRIB_BINDING:
>+                ASSERT(supportVertexAttribBinding());
>+                updateAttribBinding(attribIndex);
>+                break;
>+
>+            default:
>+                UNREACHABLE();
>+                break;
>         }
>+    }
>+}
> 
>-        size_t index = VertexArray::GetVertexIndexFromDirtyBit(dirtyBit);
>-        if (dirtyBit >= VertexArray::DIRTY_BIT_ATTRIB_0_ENABLED &&
>-            dirtyBit < VertexArray::DIRTY_BIT_ATTRIB_MAX_ENABLED)
>-        {
>-            updateAttribEnabled(index);
>-        }
>-        else if (dirtyBit >= VertexArray::DIRTY_BIT_ATTRIB_0_POINTER &&
>-                 dirtyBit < VertexArray::DIRTY_BIT_ATTRIB_MAX_POINTER)
>-        {
>-            updateAttribPointer(context, index);
>-        }
>+void VertexArrayGL::syncDirtyBinding(const gl::Context *context,
>+                                     size_t bindingIndex,
>+                                     const gl::VertexArray::DirtyBindingBits &dirtyBindingBits)
>+{
>+    // Dependent state changes in buffers can trigger updates with no dirty bits set.
> 
>-        else if (dirtyBit >= VertexArray::DIRTY_BIT_ATTRIB_0_FORMAT &&
>-                 dirtyBit < VertexArray::DIRTY_BIT_ATTRIB_MAX_FORMAT)
>-        {
>-            ASSERT(supportVertexAttribBinding());
>-            updateAttribFormat(index);
>-        }
>-        else if (dirtyBit >= VertexArray::DIRTY_BIT_ATTRIB_0_BINDING &&
>-                 dirtyBit < VertexArray::DIRTY_BIT_ATTRIB_MAX_BINDING)
>-        {
>-            ASSERT(supportVertexAttribBinding());
>-            updateAttribBinding(index);
>-        }
>-        else if (dirtyBit >= VertexArray::DIRTY_BIT_BINDING_0_BUFFER &&
>-                 dirtyBit < VertexArray::DIRTY_BIT_BINDING_MAX_BUFFER)
>+    for (size_t dirtyBit : dirtyBindingBits)
>+    {
>+        switch (dirtyBit)
>         {
>-            ASSERT(supportVertexAttribBinding());
>-            updateBindingBuffer(context, index);
>+            case VertexArray::DIRTY_BINDING_BUFFER:
>+                ASSERT(supportVertexAttribBinding());
>+                updateBindingBuffer(context, bindingIndex);
>+                break;
>+
>+            case VertexArray::DIRTY_BINDING_DIVISOR:
>+                updateBindingDivisor(bindingIndex);
>+                break;
>+
>+            default:
>+                UNREACHABLE();
>+                break;
>         }
>+    }
>+}
>+
>+#define ANGLE_DIRTY_ATTRIB_FUNC(INDEX)                         \
>+    case VertexArray::DIRTY_BIT_ATTRIB_0 + INDEX:              \
>+        syncDirtyAttrib(context, INDEX, (*attribBits)[INDEX]); \
>+        (*attribBits)[INDEX].reset();                          \
>+        break;
>+
>+#define ANGLE_DIRTY_BINDING_FUNC(INDEX)                          \
>+    case VertexArray::DIRTY_BIT_BINDING_0 + INDEX:               \
>+        syncDirtyBinding(context, INDEX, (*bindingBits)[INDEX]); \
>+        (*bindingBits)[INDEX].reset();                           \
>+        break;
>+
>+#define ANGLE_DIRTY_BUFFER_DATA_FUNC(INDEX)            \
>+    case VertexArray::DIRTY_BIT_BUFFER_DATA_0 + INDEX: \
>+        break;
>+
>+angle::Result VertexArrayGL::syncState(const gl::Context *context,
>+                                       const gl::VertexArray::DirtyBits &dirtyBits,
>+                                       gl::VertexArray::DirtyAttribBitsArray *attribBits,
>+                                       gl::VertexArray::DirtyBindingBitsArray *bindingBits)
>+{
>+    mStateManager->bindVertexArray(mVertexArrayID, getAppliedElementArrayBufferID());
> 
>-        else if (dirtyBit >= VertexArray::DIRTY_BIT_BINDING_0_DIVISOR &&
>-                 dirtyBit < VertexArray::DIRTY_BIT_BINDING_MAX_DIVISOR)
>+    for (size_t dirtyBit : dirtyBits)
>+    {
>+        switch (dirtyBit)
>         {
>-            updateBindingDivisor(index);
>+            case VertexArray::DIRTY_BIT_ELEMENT_ARRAY_BUFFER:
>+                updateElementArrayBufferBinding(context);
>+                break;
>+
>+            case VertexArray::DIRTY_BIT_ELEMENT_ARRAY_BUFFER_DATA:
>+                break;
>+
>+                ANGLE_VERTEX_INDEX_CASES(ANGLE_DIRTY_ATTRIB_FUNC)
>+                ANGLE_VERTEX_INDEX_CASES(ANGLE_DIRTY_BINDING_FUNC)
>+                ANGLE_VERTEX_INDEX_CASES(ANGLE_DIRTY_BUFFER_DATA_FUNC)
>+
>+            default:
>+                UNREACHABLE();
>+                break;
>         }
>-        else
>-            UNREACHABLE();
>     }
>+
>+    return angle::Result::Continue;
> }
> 
> void VertexArrayGL::applyNumViewsToDivisor(int numViews)
>@@ -713,4 +716,20 @@ void VertexArrayGL::applyNumViewsToDivisor(int numViews)
>     }
> }
> 
>-}  // rx
>+void VertexArrayGL::applyActiveAttribLocationsMask(const gl::AttributesMask &activeMask)
>+{
>+    gl::AttributesMask updateMask = mProgramActiveAttribLocationsMask ^ activeMask;
>+    if (!updateMask.any())
>+    {
>+        return;
>+    }
>+    ASSERT(mVertexArrayID == mStateManager->getVertexArrayID());
>+    mProgramActiveAttribLocationsMask = activeMask;
>+
>+    for (size_t attribIndex : updateMask)
>+    {
>+        updateAttribEnabled(attribIndex);
>+    }
>+}
>+
>+}  // namespace rx
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/VertexArrayGL.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/VertexArrayGL.h
>index 7010d69c312..708a3fc9d57 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/VertexArrayGL.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/VertexArrayGL.h
>@@ -11,6 +11,10 @@
> 
> #include "libANGLE/renderer/VertexArrayImpl.h"
> 
>+#include "common/mathutil.h"
>+#include "libANGLE/Context.h"
>+#include "libANGLE/renderer/gl/ContextGL.h"
>+
> namespace rx
> {
> 
>@@ -27,63 +31,72 @@ class VertexArrayGL : public VertexArrayImpl
> 
>     void destroy(const gl::Context *context) override;
> 
>-    gl::Error syncDrawArraysState(const gl::Context *context,
>-                                  const gl::AttributesMask &activeAttributesMask,
>-                                  GLint first,
>-                                  GLsizei count,
>-                                  GLsizei instanceCount) const;
>-    gl::Error syncDrawElementsState(const gl::Context *context,
>-                                    const gl::AttributesMask &activeAttributesMask,
>-                                    GLsizei count,
>-                                    GLenum type,
>-                                    const void *indices,
>-                                    GLsizei instanceCount,
>-                                    bool primitiveRestartEnabled,
>-                                    const void **outIndices) const;
>-    gl::Error syncElementArrayState(const gl::Context *context) const;
>+    angle::Result syncClientSideData(const gl::Context *context,
>+                                     const gl::AttributesMask &activeAttributesMask,
>+                                     GLint first,
>+                                     GLsizei count,
>+                                     GLsizei instanceCount) const;
>+    angle::Result syncDrawElementsState(const gl::Context *context,
>+                                        const gl::AttributesMask &activeAttributesMask,
>+                                        GLsizei count,
>+                                        gl::DrawElementsType type,
>+                                        const void *indices,
>+                                        GLsizei instanceCount,
>+                                        bool primitiveRestartEnabled,
>+                                        const void **outIndices) const;
> 
>     GLuint getVertexArrayID() const;
>     GLuint getAppliedElementArrayBufferID() const;
> 
>-    void syncState(const gl::Context *context,
>-                   const gl::VertexArray::DirtyBits &dirtyBits) override;
>+    angle::Result syncState(const gl::Context *context,
>+                            const gl::VertexArray::DirtyBits &dirtyBits,
>+                            gl::VertexArray::DirtyAttribBitsArray *attribBits,
>+                            gl::VertexArray::DirtyBindingBitsArray *bindingBits) override;
>+
>     void applyNumViewsToDivisor(int numViews);
>+    void applyActiveAttribLocationsMask(const gl::AttributesMask &activeMask);
> 
>   private:
>-    gl::Error syncDrawState(const gl::Context *context,
>-                            const gl::AttributesMask &activeAttributesMask,
>-                            GLint first,
>-                            GLsizei count,
>-                            GLenum type,
>-                            const void *indices,
>-                            GLsizei instanceCount,
>-                            bool primitiveRestartEnabled,
>-                            const void **outIndices) const;
>+    angle::Result syncDrawState(const gl::Context *context,
>+                                const gl::AttributesMask &activeAttributesMask,
>+                                GLint first,
>+                                GLsizei count,
>+                                gl::DrawElementsType type,
>+                                const void *indices,
>+                                GLsizei instanceCount,
>+                                bool primitiveRestartEnabled,
>+                                const void **outIndices) const;
> 
>     // Apply index data, only sets outIndexRange if attributesNeedStreaming is true
>-    gl::Error syncIndexData(const gl::Context *context,
>-                            GLsizei count,
>-                            GLenum type,
>-                            const void *indices,
>-                            bool primitiveRestartEnabled,
>-                            bool attributesNeedStreaming,
>-                            gl::IndexRange *outIndexRange,
>-                            const void **outIndices) const;
>+    angle::Result syncIndexData(const gl::Context *context,
>+                                GLsizei count,
>+                                gl::DrawElementsType type,
>+                                const void *indices,
>+                                bool primitiveRestartEnabled,
>+                                bool attributesNeedStreaming,
>+                                gl::IndexRange *outIndexRange,
>+                                const void **outIndices) const;
> 
>     // Returns the amount of space needed to stream all attributes that need streaming
>     // and the data size of the largest attribute
>-    void computeStreamingAttributeSizes(const gl::AttributesMask &activeAttributesMask,
>+    void computeStreamingAttributeSizes(const gl::AttributesMask &attribsToStream,
>                                         GLsizei instanceCount,
>                                         const gl::IndexRange &indexRange,
>                                         size_t *outStreamingDataSize,
>                                         size_t *outMaxAttributeDataSize) const;
> 
>     // Stream attributes that have client data
>-    gl::Error streamAttributes(const gl::AttributesMask &activeAttributesMask,
>-                               GLsizei instanceCount,
>-                               const gl::IndexRange &indexRange) const;
>+    angle::Result streamAttributes(const gl::Context *context,
>+                                   const gl::AttributesMask &attribsToStream,
>+                                   GLsizei instanceCount,
>+                                   const gl::IndexRange &indexRange) const;
>+    void syncDirtyAttrib(const gl::Context *context,
>+                         size_t attribIndex,
>+                         const gl::VertexArray::DirtyAttribBits &dirtyAttribBits);
>+    void syncDirtyBinding(const gl::Context *context,
>+                          size_t bindingIndex,
>+                          const gl::VertexArray::DirtyBindingBits &dirtyBindingBits);
> 
>-    void updateNeedsStreaming(size_t attribIndex);
>     void updateAttribEnabled(size_t attribIndex);
>     void updateAttribPointer(const gl::Context *context, size_t attribIndex);
> 
>@@ -94,6 +107,8 @@ class VertexArrayGL : public VertexArrayImpl
>     void updateBindingBuffer(const gl::Context *context, size_t bindingIndex);
>     void updateBindingDivisor(size_t bindingIndex);
> 
>+    void updateElementArrayBufferBinding(const gl::Context *context) const;
>+
>     void callVertexAttribPointer(GLuint attribIndex,
>                                  const gl::VertexAttribute &attrib,
>                                  GLsizei stride,
>@@ -105,6 +120,10 @@ class VertexArrayGL : public VertexArrayImpl
>     GLuint mVertexArrayID;
>     int mAppliedNumViews;
> 
>+    // Remember the program's active attrib location mask so that attributes can be enabled/disabled
>+    // based on whether they are active in the program
>+    gl::AttributesMask mProgramActiveAttribLocationsMask;
>+
>     mutable gl::BindingPointer<gl::Buffer> mAppliedElementArrayBuffer;
> 
>     mutable std::vector<gl::VertexAttribute> mAppliedAttributes;
>@@ -115,9 +134,22 @@ class VertexArrayGL : public VertexArrayImpl
> 
>     mutable size_t mStreamingArrayBufferSize;
>     mutable GLuint mStreamingArrayBuffer;
>-
>-    gl::AttributesMask mAttributesNeedStreaming;
> };
>+
>+ANGLE_INLINE angle::Result VertexArrayGL::syncDrawElementsState(
>+    const gl::Context *context,
>+    const gl::AttributesMask &activeAttributesMask,
>+    GLsizei count,
>+    gl::DrawElementsType type,
>+    const void *indices,
>+    GLsizei instanceCount,
>+    bool primitiveRestartEnabled,
>+    const void **outIndices) const
>+{
>+    return syncDrawState(context, activeAttributesMask, 0, count, type, indices, instanceCount,
>+                         primitiveRestartEnabled, outIndices);
> }
> 
>+}  // namespace rx
>+
> #endif  // LIBANGLE_RENDERER_GL_VERTEXARRAYGL_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/WorkaroundsGL.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/WorkaroundsGL.h
>index ab50022fa52..18fa3e730b2 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/WorkaroundsGL.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/WorkaroundsGL.h
>@@ -143,6 +143,39 @@ struct WorkaroundsGL
> 
>     // On some Android devices for loops used to initialize variables hit native GLSL compiler bugs.
>     bool dontUseLoopsToInitializeVariables = false;
>+
>+    // On some NVIDIA drivers gl_FragDepth is not clamped correctly when rendering to a floating
>+    // point depth buffer. Clamp it in the translated shader to fix this.
>+    bool clampFragDepth = false;
>+
>+    // On some NVIDIA drivers before version 397.31 repeated assignment to swizzled values inside a
>+    // GLSL user-defined function have incorrect results. Rewrite this type of statements to fix
>+    // this.
>+    bool rewriteRepeatedAssignToSwizzled = false;
>+
>+    // On some AMD and Intel GL drivers ARB_blend_func_extended does not pass the tests.
>+    // It might be possible to work around the Intel bug by rewriting *FragData to *FragColor
>+    // instead of disabling the functionality entirely. The AMD bug looked like incorrect blending,
>+    // not sure if a workaround is feasible. http://anglebug.com/1085
>+    bool disableBlendFuncExtended = false;
>+
>+    // Qualcomm drivers returns raw sRGB values instead of linearized values when calling
>+    // glReadPixels on unsized sRGB texture formats. http://crbug.com/550292 and
>+    // http://crbug.com/565179
>+    bool unsizedsRGBReadPixelsDoesntTransform = false;
>+
>+    // Older Qualcomm drivers generate errors when querying the number of bits in timer queries, ex:
>+    // GetQueryivEXT(GL_TIME_ELAPSED, GL_QUERY_COUNTER_BITS).  http://anglebug.com/3027
>+    bool queryCounterBitsGeneratesErrors = false;
>+
>+    // Re-linking a program in parallel is buggy on some Intel Windows OpenGL drivers and Android
>+    // platforms.
>+    // http://anglebug.com/3045
>+    bool dontRelinkProgramsInParallel = false;
>+
>+    // Some tests have been seen to fail using worker contexts, this switch allows worker contexts
>+    // to be disabled for some platforms. http://crbug.com/849576
>+    bool disableWorkerContexts = false;
> };
> 
> inline WorkaroundsGL::WorkaroundsGL() = default;
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/cgl/ContextCGL.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/cgl/ContextCGL.cpp
>new file mode 100644
>index 00000000000..6b6f7be6138
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/cgl/ContextCGL.cpp
>@@ -0,0 +1,41 @@
>+//
>+// Copyright 2019 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// ContextCGL:
>+//   Mac-specific subclass of ContextGL.
>+//
>+
>+#include "libANGLE/renderer/gl/cgl/ContextCGL.h"
>+
>+#include "libANGLE/Context.h"
>+#include "libANGLE/Display.h"
>+#include "libANGLE/renderer/gl/cgl/DisplayCGL.h"
>+
>+namespace rx
>+{
>+
>+ContextCGL::ContextCGL(const gl::State &state,
>+                       gl::ErrorSet *errorSet,
>+                       const std::shared_ptr<RendererGL> &renderer,
>+                       bool usesDiscreteGPU)
>+    : ContextGL(state, errorSet, renderer), mUsesDiscreteGpu(usesDiscreteGPU)
>+{}
>+
>+void ContextCGL::onDestroy(const gl::Context *context)
>+{
>+    if (mUsesDiscreteGpu)
>+    {
>+        egl::Display *display = context->getDisplay();
>+        // TODO(kbr): if the context is created and destroyed without ever
>+        // making it current, it is possible to leak retentions of the
>+        // discrete GPU.
>+        if (display)
>+        {
>+            GetImplAs<DisplayCGL>(display)->unreferenceDiscreteGPU();
>+        }
>+    }
>+}
>+
>+}  // namespace rx
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/cgl/ContextCGL.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/cgl/ContextCGL.h
>new file mode 100644
>index 00000000000..6a2d2652344
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/cgl/ContextCGL.h
>@@ -0,0 +1,35 @@
>+//
>+// Copyright 2019 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// ContextCGL:
>+//   Mac-specific subclass of ContextGL.
>+//
>+
>+#ifndef LIBANGLE_RENDERER_GL_CGL_CONTEXTCGL_H_
>+#define LIBANGLE_RENDERER_GL_CGL_CONTEXTCGL_H_
>+
>+#include "libANGLE/renderer/gl/ContextGL.h"
>+#include "libANGLE/renderer/gl/RendererGL.h"
>+
>+namespace rx
>+{
>+
>+class ContextCGL : public ContextGL
>+{
>+  public:
>+    ContextCGL(const gl::State &state,
>+               gl::ErrorSet *errorSet,
>+               const std::shared_ptr<RendererGL> &renderer,
>+               bool usesDiscreteGPU);
>+
>+    void onDestroy(const gl::Context *context) override;
>+
>+  private:
>+    bool mUsesDiscreteGpu;
>+};
>+
>+}  // namespace rx
>+
>+#endif  // LIBANGLE_RENDERER_GL_CGL_CONTEXTCGL_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/cgl/DisplayCGL.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/cgl/DisplayCGL.h
>index 0989360fcb7..b2b92ed4600 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/cgl/DisplayCGL.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/cgl/DisplayCGL.h
>@@ -14,9 +14,14 @@
> struct _CGLContextObject;
> typedef _CGLContextObject *CGLContextObj;
> 
>+struct _CGLPixelFormatObject;
>+typedef _CGLPixelFormatObject *CGLPixelFormatObj;
>+
> namespace rx
> {
> 
>+class WorkerContext;
>+
> class DisplayCGL : public DisplayGL
> {
>   public:
>@@ -39,32 +44,57 @@ class DisplayCGL : public DisplayGL
>                                      NativePixmapType nativePixmap,
>                                      const egl::AttributeMap &attribs) override;
> 
>+    ContextImpl *createContext(const gl::State &state,
>+                               gl::ErrorSet *errorSet,
>+                               const egl::Config *configuration,
>+                               const gl::Context *shareContext,
>+                               const egl::AttributeMap &attribs) override;
>+
>     egl::ConfigSet generateConfigs() override;
> 
>     bool testDeviceLost() override;
>     egl::Error restoreLostDevice(const egl::Display *display) override;
> 
>     bool isValidNativeWindow(EGLNativeWindowType window) const override;
>+    egl::Error validateClientBuffer(const egl::Config *configuration,
>+                                    EGLenum buftype,
>+                                    EGLClientBuffer clientBuffer,
>+                                    const egl::AttributeMap &attribs) const override;
> 
>-    egl::Error getDevice(DeviceImpl **device) override;
>+    DeviceImpl *createDevice() override;
> 
>     std::string getVendorString() const override;
> 
>-    egl::Error waitClient(const gl::Context *context) const override;
>-    egl::Error waitNative(const gl::Context *context, EGLint engine) const override;
>+    egl::Error waitClient(const gl::Context *context) override;
>+    egl::Error waitNative(const gl::Context *context, EGLint engine) override;
>+
>+    gl::Version getMaxSupportedESVersion() const override;
>+
>+    CGLContextObj getCGLContext() const;
>+
>+    WorkerContext *createWorkerContext(std::string *infoLog);
>+
>+    // Support for dual-GPU MacBook Pros. If the context was created
>+    // preferring the high-power GPU, unreference that GPU during
>+    // context destruction.
>+    void unreferenceDiscreteGPU();
> 
>   private:
>-    const FunctionsGL *getFunctionsGL() const override;
>     egl::Error makeCurrentSurfaceless(gl::Context *context) override;
> 
>     void generateExtensions(egl::DisplayExtensions *outExtensions) const override;
>     void generateCaps(egl::Caps *outCaps) const override;
> 
>+    std::shared_ptr<RendererGL> mRenderer;
>+
>     egl::Display *mEGLDisplay;
>-    FunctionsGL *mFunctions;
>     CGLContextObj mContext;
>+    CGLPixelFormatObj mPixelFormat;
>+    bool mSupportsGPUSwitching;
>+    CGLPixelFormatObj mDiscreteGPUPixelFormat;
>+    int mDiscreteGPURefs;
> };
> 
>-}
>+}  // namespace rx
> 
>-#endif // LIBANGLE_RENDERER_GL_CGL_DISPLAYCGL_H_
>+#endif  // LIBANGLE_RENDERER_GL_CGL_DISPLAYCGL_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/cgl/DisplayCGL.mm b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/cgl/DisplayCGL.mm
>index 6c54c218630..d2d37b6f5f0 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/cgl/DisplayCGL.mm
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/cgl/DisplayCGL.mm
>@@ -9,12 +9,16 @@
> #include "libANGLE/renderer/gl/cgl/DisplayCGL.h"
> 
> #import <Cocoa/Cocoa.h>
>-#include <dlfcn.h>
> #include <EGL/eglext.h>
>+#include <dlfcn.h>
> 
> #include "common/debug.h"
>+#include "gpu_info_util/SystemInfo.h"
> #include "libANGLE/Display.h"
>+#include "libANGLE/renderer/gl/cgl/ContextCGL.h"
>+#include "libANGLE/renderer/gl/cgl/IOSurfaceSurfaceCGL.h"
> #include "libANGLE/renderer/gl/cgl/PbufferSurfaceCGL.h"
>+#include "libANGLE/renderer/gl/cgl/RendererCGL.h"
> #include "libANGLE/renderer/gl/cgl/WindowSurfaceCGL.h"
> 
> namespace
>@@ -46,34 +50,48 @@ class FunctionsGLCGL : public FunctionsGL
> };
> 
> DisplayCGL::DisplayCGL(const egl::DisplayState &state)
>-    : DisplayGL(state), mEGLDisplay(nullptr), mFunctions(nullptr), mContext(nullptr)
>-{
>-}
>+    : DisplayGL(state),
>+      mEGLDisplay(nullptr),
>+      mContext(nullptr),
>+      mPixelFormat(nullptr),
>+      mSupportsGPUSwitching(false),
>+      mDiscreteGPUPixelFormat(nullptr),
>+      mDiscreteGPURefs(0)
>+{}
> 
>-DisplayCGL::~DisplayCGL()
>-{
>-}
>+DisplayCGL::~DisplayCGL() {}
> 
> egl::Error DisplayCGL::initialize(egl::Display *display)
> {
>     mEGLDisplay = display;
> 
>-    CGLPixelFormatObj pixelFormat;
>+    angle::SystemInfo info;
>+    if (!angle::GetSystemInfo(&info))
>+    {
>+        return egl::EglNotInitialized() << "Unable to query ANGLE's SystemInfo.";
>+    }
>+    mSupportsGPUSwitching = info.isMacSwitchable;
>+
>     {
>         // TODO(cwallez) investigate which pixel format we want
>-        CGLPixelFormatAttribute attribs[] = {
>-            kCGLPFAOpenGLProfile, static_cast<CGLPixelFormatAttribute>(kCGLOGLPVersion_3_2_Core),
>-            static_cast<CGLPixelFormatAttribute>(0)};
>+        std::vector<CGLPixelFormatAttribute> attribs;
>+        attribs.push_back(kCGLPFAOpenGLProfile);
>+        attribs.push_back(static_cast<CGLPixelFormatAttribute>(kCGLOGLPVersion_3_2_Core));
>+        if (mSupportsGPUSwitching)
>+        {
>+            attribs.push_back(kCGLPFAAllowOfflineRenderers);
>+        }
>+        attribs.push_back(static_cast<CGLPixelFormatAttribute>(0));
>         GLint nVirtualScreens = 0;
>-        CGLChoosePixelFormat(attribs, &pixelFormat, &nVirtualScreens);
>+        CGLChoosePixelFormat(attribs.data(), &mPixelFormat, &nVirtualScreens);
> 
>-        if (pixelFormat == nullptr)
>+        if (mPixelFormat == nullptr)
>         {
>             return egl::EglNotInitialized() << "Could not create the context's pixel format.";
>         }
>     }
> 
>-    CGLCreateContext(pixelFormat, nullptr, &mContext);
>+    CGLCreateContext(mPixelFormat, nullptr, &mContext);
>     if (mContext == nullptr)
>     {
>         return egl::EglNotInitialized() << "Could not create the CGL context.";
>@@ -91,8 +109,16 @@ egl::Error DisplayCGL::initialize(egl::Display *display)
>         return egl::EglNotInitialized() << "Could not open the OpenGL Framework.";
>     }
> 
>-    mFunctions = new FunctionsGLCGL(handle);
>-    mFunctions->initialize(display->getAttributeMap());
>+    std::unique_ptr<FunctionsGL> functionsGL(new FunctionsGLCGL(handle));
>+    functionsGL->initialize(display->getAttributeMap());
>+
>+    mRenderer.reset(new RendererCGL(std::move(functionsGL), display->getAttributeMap(), this));
>+
>+    const gl::Version &maxVersion = mRenderer->getMaxSupportedESVersion();
>+    if (maxVersion < gl::Version(2, 0))
>+    {
>+        return egl::EglNotInitialized() << "OpenGL ES 2.0 is not supportable.";
>+    }
> 
>     return DisplayGL::initialize(display);
> }
>@@ -101,21 +127,25 @@ void DisplayCGL::terminate()
> {
>     DisplayGL::terminate();
> 
>+    mRenderer.reset();
>+    if (mPixelFormat != nullptr)
>+    {
>+        CGLDestroyPixelFormat(mPixelFormat);
>+        mPixelFormat = nullptr;
>+    }
>     if (mContext != nullptr)
>     {
>         CGLSetCurrentContext(nullptr);
>         CGLReleaseContext(mContext);
>         mContext = nullptr;
>     }
>-
>-    SafeDelete(mFunctions);
> }
> 
> SurfaceImpl *DisplayCGL::createWindowSurface(const egl::SurfaceState &state,
>                                              EGLNativeWindowType window,
>                                              const egl::AttributeMap &attribs)
> {
>-    return new WindowSurfaceCGL(state, this->getRenderer(), window, mFunctions, mContext);
>+    return new WindowSurfaceCGL(state, mRenderer.get(), window, mContext);
> }
> 
> SurfaceImpl *DisplayCGL::createPbufferSurface(const egl::SurfaceState &state,
>@@ -123,7 +153,7 @@ SurfaceImpl *DisplayCGL::createPbufferSurface(const egl::SurfaceState &state,
> {
>     EGLint width  = static_cast<EGLint>(attribs.get(EGL_WIDTH, 0));
>     EGLint height = static_cast<EGLint>(attribs.get(EGL_HEIGHT, 0));
>-    return new PbufferSurfaceCGL(state, this->getRenderer(), width, height, mFunctions);
>+    return new PbufferSurfaceCGL(state, mRenderer.get(), width, height);
> }
> 
> SurfaceImpl *DisplayCGL::createPbufferFromClientBuffer(const egl::SurfaceState &state,
>@@ -131,8 +161,9 @@ SurfaceImpl *DisplayCGL::createPbufferFromClientBuffer(const egl::SurfaceState &
>                                                        EGLClientBuffer clientBuffer,
>                                                        const egl::AttributeMap &attribs)
> {
>-    UNIMPLEMENTED();
>-    return nullptr;
>+    ASSERT(buftype == EGL_IOSURFACE_ANGLE);
>+
>+    return new IOSurfaceSurfaceCGL(state, mContext, clientBuffer, attribs);
> }
> 
> SurfaceImpl *DisplayCGL::createPixmapSurface(const egl::SurfaceState &state,
>@@ -143,10 +174,41 @@ SurfaceImpl *DisplayCGL::createPixmapSurface(const egl::SurfaceState &state,
>     return nullptr;
> }
> 
>-egl::Error DisplayCGL::getDevice(DeviceImpl **device)
>+ContextImpl *DisplayCGL::createContext(const gl::State &state,
>+                                       gl::ErrorSet *errorSet,
>+                                       const egl::Config *configuration,
>+                                       const gl::Context *shareContext,
>+                                       const egl::AttributeMap &attribs)
>+{
>+    bool usesDiscreteGPU = false;
>+
>+    if (attribs.get(EGL_POWER_PREFERENCE_ANGLE, EGL_LOW_POWER_ANGLE) == EGL_HIGH_POWER_ANGLE)
>+    {
>+        // Should have been rejected by validation if not supported.
>+        ASSERT(mSupportsGPUSwitching);
>+        // Create discrete pixel format if necessary.
>+        if (!mDiscreteGPUPixelFormat)
>+        {
>+            CGLPixelFormatAttribute discreteAttribs[] = {static_cast<CGLPixelFormatAttribute>(0)};
>+            GLint numPixelFormats                     = 0;
>+            if (CGLChoosePixelFormat(discreteAttribs, &mDiscreteGPUPixelFormat, &numPixelFormats) !=
>+                kCGLNoError)
>+            {
>+                ERR() << "Error choosing discrete pixel format.";
>+                return nullptr;
>+            }
>+        }
>+        ++mDiscreteGPURefs;
>+        usesDiscreteGPU = true;
>+    }
>+
>+    return new ContextCGL(state, errorSet, mRenderer, usesDiscreteGPU);
>+}
>+
>+DeviceImpl *DisplayCGL::createDevice()
> {
>     UNIMPLEMENTED();
>-    return egl::EglBadDisplay();
>+    return nullptr;
> }
> 
> egl::ConfigSet DisplayCGL::generateConfigs()
>@@ -233,24 +295,45 @@ bool DisplayCGL::isValidNativeWindow(EGLNativeWindowType window) const
>     return [layer isKindOfClass:[CALayer class]];
> }
> 
>+egl::Error DisplayCGL::validateClientBuffer(const egl::Config *configuration,
>+                                            EGLenum buftype,
>+                                            EGLClientBuffer clientBuffer,
>+                                            const egl::AttributeMap &attribs) const
>+{
>+    ASSERT(buftype == EGL_IOSURFACE_ANGLE);
>+
>+    if (!IOSurfaceSurfaceCGL::validateAttributes(clientBuffer, attribs))
>+    {
>+        return egl::EglBadAttribute();
>+    }
>+
>+    return egl::NoError();
>+}
>+
> std::string DisplayCGL::getVendorString() const
> {
>     // TODO(cwallez) find a useful vendor string
>     return "";
> }
> 
>-const FunctionsGL *DisplayCGL::getFunctionsGL() const
>+CGLContextObj DisplayCGL::getCGLContext() const
> {
>-    return mFunctions;
>+    return mContext;
> }
> 
> void DisplayCGL::generateExtensions(egl::DisplayExtensions *outExtensions) const
> {
>-    outExtensions->surfacelessContext = true;
>+    outExtensions->iosurfaceClientBuffer = true;
>+    outExtensions->surfacelessContext    = true;
> 
>     // Contexts are virtualized so textures can be shared globally
>     outExtensions->displayTextureShareGroup = true;
> 
>+    if (mSupportsGPUSwitching)
>+    {
>+        outExtensions->powerPreference = true;
>+    }
>+
>     DisplayGL::generateExtensions(outExtensions);
> }
> 
>@@ -259,22 +342,88 @@ void DisplayCGL::generateCaps(egl::Caps *outCaps) const
>     outCaps->textureNPOT = true;
> }
> 
>-egl::Error DisplayCGL::waitClient(const gl::Context *context) const
>+egl::Error DisplayCGL::waitClient(const gl::Context *context)
> {
>     // TODO(cwallez) UNIMPLEMENTED()
>     return egl::NoError();
> }
> 
>-egl::Error DisplayCGL::waitNative(const gl::Context *context, EGLint engine) const
>+egl::Error DisplayCGL::waitNative(const gl::Context *context, EGLint engine)
> {
>     // TODO(cwallez) UNIMPLEMENTED()
>     return egl::NoError();
> }
> 
>+gl::Version DisplayCGL::getMaxSupportedESVersion() const
>+{
>+    return mRenderer->getMaxSupportedESVersion();
>+}
>+
> egl::Error DisplayCGL::makeCurrentSurfaceless(gl::Context *context)
> {
>     // We have nothing to do as mContext is always current, and that CGL is surfaceless by
>     // default.
>     return egl::NoError();
> }
>+
>+class WorkerContextCGL final : public WorkerContext
>+{
>+  public:
>+    WorkerContextCGL(CGLContextObj context);
>+    ~WorkerContextCGL() override;
>+
>+    bool makeCurrent() override;
>+    void unmakeCurrent() override;
>+
>+  private:
>+    CGLContextObj mContext;
>+};
>+
>+WorkerContextCGL::WorkerContextCGL(CGLContextObj context) : mContext(context) {}
>+
>+WorkerContextCGL::~WorkerContextCGL()
>+{
>+    CGLSetCurrentContext(nullptr);
>+    CGLReleaseContext(mContext);
>+    mContext = nullptr;
>+}
>+
>+bool WorkerContextCGL::makeCurrent()
>+{
>+    CGLError error = CGLSetCurrentContext(mContext);
>+    if (error != kCGLNoError)
>+    {
>+        ERR() << "Unable to make gl context current.";
>+        return false;
>+    }
>+    return true;
>+}
>+
>+void WorkerContextCGL::unmakeCurrent()
>+{
>+    CGLSetCurrentContext(nullptr);
>+}
>+
>+WorkerContext *DisplayCGL::createWorkerContext(std::string *infoLog)
>+{
>+    CGLContextObj context = nullptr;
>+    CGLCreateContext(mPixelFormat, mContext, &context);
>+    if (context == nullptr)
>+    {
>+        *infoLog += "Could not create the CGL context.";
>+        return nullptr;
>+    }
>+
>+    return new WorkerContextCGL(context);
>+}
>+
>+void DisplayCGL::unreferenceDiscreteGPU()
>+{
>+    ASSERT(mDiscreteGPURefs > 0);
>+    if (--mDiscreteGPURefs == 0)
>+    {
>+        CGLDestroyPixelFormat(mDiscreteGPUPixelFormat);
>+        mDiscreteGPUPixelFormat = nullptr;
>+    }
>+}
> }
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/cgl/IOSurfaceSurfaceCGL.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/cgl/IOSurfaceSurfaceCGL.h
>new file mode 100644
>index 00000000000..ed26a59498f
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/cgl/IOSurfaceSurfaceCGL.h
>@@ -0,0 +1,79 @@
>+//
>+// Copyright (c) 2017 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+
>+// PBufferSurfaceCGL.h: an implementation of PBuffers created from IOSurfaces using
>+//                      EGL_ANGLE_iosurface_client_buffer
>+
>+#ifndef LIBANGLE_RENDERER_GL_CGL_IOSURFACESURFACECGL_H_
>+#define LIBANGLE_RENDERER_GL_CGL_IOSURFACESURFACECGL_H_
>+
>+#include "libANGLE/renderer/gl/SurfaceGL.h"
>+#include "libANGLE/renderer/gl/cgl/DisplayCGL.h"
>+
>+struct __IOSurface;
>+typedef __IOSurface *IOSurfaceRef;
>+
>+namespace egl
>+{
>+class AttributeMap;
>+}  // namespace egl
>+
>+namespace rx
>+{
>+
>+class DisplayCGL;
>+class FunctionsGL;
>+class StateManagerGL;
>+
>+class IOSurfaceSurfaceCGL : public SurfaceGL
>+{
>+  public:
>+    IOSurfaceSurfaceCGL(const egl::SurfaceState &state,
>+                        CGLContextObj cglContext,
>+                        EGLClientBuffer buffer,
>+                        const egl::AttributeMap &attribs);
>+    ~IOSurfaceSurfaceCGL() override;
>+
>+    egl::Error initialize(const egl::Display *display) override;
>+    egl::Error makeCurrent(const gl::Context *context) override;
>+    egl::Error unMakeCurrent() override;
>+
>+    egl::Error swap(const gl::Context *context) override;
>+    egl::Error postSubBuffer(const gl::Context *context,
>+                             EGLint x,
>+                             EGLint y,
>+                             EGLint width,
>+                             EGLint height) override;
>+    egl::Error querySurfacePointerANGLE(EGLint attribute, void **value) override;
>+    egl::Error bindTexImage(const gl::Context *context,
>+                            gl::Texture *texture,
>+                            EGLint buffer) override;
>+    egl::Error releaseTexImage(const gl::Context *context, EGLint buffer) override;
>+    void setSwapInterval(EGLint interval) override;
>+
>+    EGLint getWidth() const override;
>+    EGLint getHeight() const override;
>+
>+    EGLint isPostSubBufferSupported() const override;
>+    EGLint getSwapBehavior() const override;
>+
>+    static bool validateAttributes(EGLClientBuffer buffer, const egl::AttributeMap &attribs);
>+    FramebufferImpl *createDefaultFramebuffer(const gl::Context *context,
>+                                              const gl::FramebufferState &state) override;
>+
>+  private:
>+    CGLContextObj mCGLContext;
>+    IOSurfaceRef mIOSurface;
>+    const gl::Context *mCurrentContext;
>+    int mWidth;
>+    int mHeight;
>+    int mPlane;
>+    int mFormatIndex;
>+};
>+
>+}  // namespace rx
>+
>+#endif  // LIBANGLE_RENDERER_GL_CGL_IOSURFACESURFACECGL_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/cgl/IOSurfaceSurfaceCGL.mm b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/cgl/IOSurfaceSurfaceCGL.mm
>new file mode 100644
>index 00000000000..261c1db7568
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/cgl/IOSurfaceSurfaceCGL.mm
>@@ -0,0 +1,293 @@
>+//
>+// Copyright (c) 2015 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+
>+// PBufferSurfaceCGL.cpp: an implementation of PBuffers created from IOSurfaces using
>+//                        EGL_ANGLE_iosurface_client_buffer
>+
>+#include "libANGLE/renderer/gl/cgl/IOSurfaceSurfaceCGL.h"
>+
>+#include <IOSurface/IOSurface.h>
>+#include <OpenGL/CGLIOSurface.h>
>+
>+#include "common/debug.h"
>+#include "libANGLE/AttributeMap.h"
>+#include "libANGLE/renderer/gl/FramebufferGL.h"
>+#include "libANGLE/renderer/gl/FunctionsGL.h"
>+#include "libANGLE/renderer/gl/RendererGL.h"
>+#include "libANGLE/renderer/gl/StateManagerGL.h"
>+#include "libANGLE/renderer/gl/TextureGL.h"
>+#include "libANGLE/renderer/gl/cgl/DisplayCGL.h"
>+
>+namespace rx
>+{
>+
>+namespace
>+{
>+
>+struct IOSurfaceFormatInfo
>+{
>+    GLenum internalFormat;
>+    GLenum type;
>+
>+    size_t componentBytes;
>+
>+    GLenum nativeInternalFormat;
>+    GLenum nativeFormat;
>+    GLenum nativeType;
>+};
>+
>+// clang-format off
>+static const IOSurfaceFormatInfo kIOSurfaceFormats[] = {
>+    {GL_RED,      GL_UNSIGNED_BYTE,  1, GL_RED,  GL_RED,  GL_UNSIGNED_BYTE           },
>+    {GL_R16UI,    GL_UNSIGNED_SHORT, 2, GL_RED,  GL_RED,  GL_UNSIGNED_SHORT          },
>+    {GL_RG,       GL_UNSIGNED_BYTE,  2, GL_RG,   GL_RG,   GL_UNSIGNED_BYTE           },
>+    {GL_BGRA_EXT, GL_UNSIGNED_BYTE,  4, GL_BGRA, GL_RGBA, GL_UNSIGNED_INT_8_8_8_8_REV},
>+    {GL_RGBA,     GL_HALF_FLOAT,     8, GL_RGBA, GL_RGBA, GL_HALF_FLOAT              },
>+};
>+// clang-format on
>+
>+int FindIOSurfaceFormatIndex(GLenum internalFormat, GLenum type)
>+{
>+    for (int i = 0; i < static_cast<int>(ArraySize(kIOSurfaceFormats)); ++i)
>+    {
>+        const auto &formatInfo = kIOSurfaceFormats[i];
>+        if (formatInfo.internalFormat == internalFormat && formatInfo.type == type)
>+        {
>+            return i;
>+        }
>+    }
>+    return -1;
>+}
>+
>+}  // anonymous namespace
>+
>+IOSurfaceSurfaceCGL::IOSurfaceSurfaceCGL(const egl::SurfaceState &state,
>+                                         CGLContextObj cglContext,
>+                                         EGLClientBuffer buffer,
>+                                         const egl::AttributeMap &attribs)
>+    : SurfaceGL(state),
>+      mCGLContext(cglContext),
>+      mIOSurface(nullptr),
>+      mCurrentContext(nullptr),
>+      mWidth(0),
>+      mHeight(0),
>+      mPlane(0),
>+      mFormatIndex(-1)
>+{
>+    // Keep reference to the IOSurface so it doesn't get deleted while the pbuffer exists.
>+    mIOSurface = reinterpret_cast<IOSurfaceRef>(buffer);
>+    CFRetain(mIOSurface);
>+
>+    // Extract attribs useful for the call to CGLTexImageIOSurface2D
>+    mWidth  = attribs.get(EGL_WIDTH);
>+    mHeight = attribs.get(EGL_HEIGHT);
>+    mPlane  = attribs.get(EGL_IOSURFACE_PLANE_ANGLE);
>+
>+    EGLAttrib internalFormat = attribs.get(EGL_TEXTURE_INTERNAL_FORMAT_ANGLE);
>+    EGLAttrib type           = attribs.get(EGL_TEXTURE_TYPE_ANGLE);
>+    mFormatIndex             = FindIOSurfaceFormatIndex(internalFormat, type);
>+    ASSERT(mFormatIndex >= 0);
>+}
>+
>+IOSurfaceSurfaceCGL::~IOSurfaceSurfaceCGL()
>+{
>+    if (mIOSurface != nullptr)
>+    {
>+        CFRelease(mIOSurface);
>+        mIOSurface = nullptr;
>+    }
>+}
>+
>+egl::Error IOSurfaceSurfaceCGL::initialize(const egl::Display *display)
>+{
>+    return egl::NoError();
>+}
>+
>+egl::Error IOSurfaceSurfaceCGL::makeCurrent(const gl::Context *context)
>+{
>+    ASSERT(!mCurrentContext);
>+    mCurrentContext = context;
>+    return egl::NoError();
>+}
>+
>+egl::Error IOSurfaceSurfaceCGL::unMakeCurrent()
>+{
>+    ASSERT(mCurrentContext);
>+    GetFunctionsGL(mCurrentContext)->flush();
>+    mCurrentContext = nullptr;
>+    return egl::NoError();
>+}
>+
>+egl::Error IOSurfaceSurfaceCGL::swap(const gl::Context *context)
>+{
>+    return egl::NoError();
>+}
>+
>+egl::Error IOSurfaceSurfaceCGL::postSubBuffer(const gl::Context *context,
>+                                              EGLint x,
>+                                              EGLint y,
>+                                              EGLint width,
>+                                              EGLint height)
>+{
>+    UNREACHABLE();
>+    return egl::NoError();
>+}
>+
>+egl::Error IOSurfaceSurfaceCGL::querySurfacePointerANGLE(EGLint attribute, void **value)
>+{
>+    UNREACHABLE();
>+    return egl::NoError();
>+}
>+
>+egl::Error IOSurfaceSurfaceCGL::bindTexImage(const gl::Context *context,
>+                                             gl::Texture *texture,
>+                                             EGLint buffer)
>+{
>+    StateManagerGL *stateManager = GetStateManagerGL(context);
>+
>+    const TextureGL *textureGL = GetImplAs<TextureGL>(texture);
>+    GLuint textureID           = textureGL->getTextureID();
>+    stateManager->bindTexture(gl::TextureType::Rectangle, textureID);
>+
>+    const auto &format = kIOSurfaceFormats[mFormatIndex];
>+    auto error = CGLTexImageIOSurface2D(mCGLContext, GL_TEXTURE_RECTANGLE, format.nativeFormat,
>+                                        mWidth, mHeight, format.nativeInternalFormat,
>+                                        format.nativeType, mIOSurface, mPlane);
>+
>+    if (error != kCGLNoError)
>+    {
>+        return egl::EglContextLost();
>+    }
>+
>+    return egl::NoError();
>+}
>+
>+egl::Error IOSurfaceSurfaceCGL::releaseTexImage(const gl::Context *context, EGLint buffer)
>+{
>+    const FunctionsGL *functions = GetFunctionsGL(context);
>+    functions->flush();
>+    return egl::NoError();
>+}
>+
>+void IOSurfaceSurfaceCGL::setSwapInterval(EGLint interval)
>+{
>+    UNREACHABLE();
>+}
>+
>+EGLint IOSurfaceSurfaceCGL::getWidth() const
>+{
>+    return mWidth;
>+}
>+
>+EGLint IOSurfaceSurfaceCGL::getHeight() const
>+{
>+    return mHeight;
>+}
>+
>+EGLint IOSurfaceSurfaceCGL::isPostSubBufferSupported() const
>+{
>+    UNREACHABLE();
>+    return EGL_FALSE;
>+}
>+
>+EGLint IOSurfaceSurfaceCGL::getSwapBehavior() const
>+{
>+    // N/A because you can't MakeCurrent an IOSurface, return any valid value.
>+    return EGL_BUFFER_PRESERVED;
>+}
>+
>+// static
>+bool IOSurfaceSurfaceCGL::validateAttributes(EGLClientBuffer buffer,
>+                                             const egl::AttributeMap &attribs)
>+{
>+    IOSurfaceRef ioSurface = reinterpret_cast<IOSurfaceRef>(buffer);
>+
>+    // The plane must exist for this IOSurface. IOSurfaceGetPlaneCount can return 0 for non-planar
>+    // ioSurfaces but we will treat non-planar like it is a single plane.
>+    size_t surfacePlaneCount = std::max(size_t(1), IOSurfaceGetPlaneCount(ioSurface));
>+    EGLAttrib plane          = attribs.get(EGL_IOSURFACE_PLANE_ANGLE);
>+    if (plane < 0 || static_cast<size_t>(plane) >= surfacePlaneCount)
>+    {
>+        return false;
>+    }
>+
>+    // The width height specified must be at least (1, 1) and at most the plane size
>+    EGLAttrib width  = attribs.get(EGL_WIDTH);
>+    EGLAttrib height = attribs.get(EGL_HEIGHT);
>+    if (width <= 0 || static_cast<size_t>(width) > IOSurfaceGetWidthOfPlane(ioSurface, plane) ||
>+        height <= 0 || static_cast<size_t>(height) > IOSurfaceGetHeightOfPlane(ioSurface, plane))
>+    {
>+        return false;
>+    }
>+
>+    // Find this IOSurface format
>+    EGLAttrib internalFormat = attribs.get(EGL_TEXTURE_INTERNAL_FORMAT_ANGLE);
>+    EGLAttrib type           = attribs.get(EGL_TEXTURE_TYPE_ANGLE);
>+
>+    int formatIndex = FindIOSurfaceFormatIndex(internalFormat, type);
>+
>+    if (formatIndex < 0)
>+    {
>+        return false;
>+    }
>+
>+    // Check that the format matches this IOSurface plane
>+    if (IOSurfaceGetBytesPerElementOfPlane(ioSurface, plane) !=
>+        kIOSurfaceFormats[formatIndex].componentBytes)
>+    {
>+        return false;
>+    }
>+
>+    return true;
>+}
>+
>+// Wraps a FramebufferGL to hook the destroy function to delete the texture associated with the
>+// framebuffer.
>+class IOSurfaceFramebuffer : public FramebufferGL
>+{
>+  public:
>+    IOSurfaceFramebuffer(const gl::FramebufferState &data,
>+                         GLuint id,
>+                         GLuint textureId,
>+                         bool isDefault)
>+        : FramebufferGL(data, id, isDefault), mTextureId(textureId)
>+    {}
>+    void destroy(const gl::Context *context) override
>+    {
>+        GetFunctionsGL(context)->deleteTextures(1, &mTextureId);
>+        FramebufferGL::destroy(context);
>+    }
>+
>+  private:
>+    GLuint mTextureId;
>+};
>+
>+FramebufferImpl *IOSurfaceSurfaceCGL::createDefaultFramebuffer(const gl::Context *context,
>+                                                               const gl::FramebufferState &state)
>+{
>+    const FunctionsGL *functions = GetFunctionsGL(context);
>+    StateManagerGL *stateManager = GetStateManagerGL(context);
>+
>+    GLuint texture = 0;
>+    functions->genTextures(1, &texture);
>+    const auto &format = kIOSurfaceFormats[mFormatIndex];
>+    stateManager->bindTexture(gl::TextureType::Rectangle, texture);
>+    CGLError error = CGLTexImageIOSurface2D(mCGLContext, GL_TEXTURE_RECTANGLE, format.nativeFormat,
>+                                            mWidth, mHeight, format.nativeInternalFormat,
>+                                            format.nativeType, mIOSurface, mPlane);
>+    ASSERT(error == kCGLNoError);
>+
>+    GLuint framebuffer = 0;
>+    functions->genFramebuffers(1, &framebuffer);
>+    stateManager->bindFramebuffer(GL_FRAMEBUFFER, framebuffer);
>+    stateManager->bindTexture(gl::TextureType::Rectangle, texture);
>+    functions->framebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_RECTANGLE,
>+                                    texture, 0);
>+
>+    return new IOSurfaceFramebuffer(state, framebuffer, texture, true);
>+}
>+
>+}  // namespace rx
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/cgl/PbufferSurfaceCGL.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/cgl/PbufferSurfaceCGL.h
>index 743b10ef79e..24e47d2e072 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/cgl/PbufferSurfaceCGL.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/cgl/PbufferSurfaceCGL.h
>@@ -16,6 +16,7 @@ namespace rx
> {
> 
> class FunctionsGL;
>+class RendererGL;
> class StateManagerGL;
> struct WorkaroundsGL;
> 
>@@ -25,12 +26,11 @@ class PbufferSurfaceCGL : public SurfaceGL
>     PbufferSurfaceCGL(const egl::SurfaceState &state,
>                       RendererGL *renderer,
>                       EGLint width,
>-                      EGLint height,
>-                      const FunctionsGL *functions);
>+                      EGLint height);
>     ~PbufferSurfaceCGL() override;
> 
>     egl::Error initialize(const egl::Display *display) override;
>-    egl::Error makeCurrent() override;
>+    egl::Error makeCurrent(const gl::Context *context) override;
> 
>     egl::Error swap(const gl::Context *context) override;
>     egl::Error postSubBuffer(const gl::Context *context,
>@@ -39,8 +39,10 @@ class PbufferSurfaceCGL : public SurfaceGL
>                              EGLint width,
>                              EGLint height) override;
>     egl::Error querySurfacePointerANGLE(EGLint attribute, void **value) override;
>-    egl::Error bindTexImage(gl::Texture *texture, EGLint buffer) override;
>-    egl::Error releaseTexImage(EGLint buffer) override;
>+    egl::Error bindTexImage(const gl::Context *context,
>+                            gl::Texture *texture,
>+                            EGLint buffer) override;
>+    egl::Error releaseTexImage(const gl::Context *context, EGLint buffer) override;
>     void setSwapInterval(EGLint interval) override;
> 
>     EGLint getWidth() const override;
>@@ -49,21 +51,22 @@ class PbufferSurfaceCGL : public SurfaceGL
>     EGLint isPostSubBufferSupported() const override;
>     EGLint getSwapBehavior() const override;
> 
>-    FramebufferImpl *createDefaultFramebuffer(const gl::FramebufferState &state) override;
>+    FramebufferImpl *createDefaultFramebuffer(const gl::Context *context,
>+                                              const gl::FramebufferState &state) override;
> 
>   private:
>     unsigned mWidth;
>     unsigned mHeight;
> 
>+    // TODO(geofflang): Don't store these, they are potentially specific to a single GL context.
>+    // http://anglebug.com/2464
>     const FunctionsGL *mFunctions;
>     StateManagerGL *mStateManager;
>-    RendererGL *mRenderer;
> 
>-    GLuint mFramebuffer;
>     GLuint mColorRenderbuffer;
>     GLuint mDSRenderbuffer;
> };
> 
> }  // namespace rx
> 
>-#endif // LIBANGLE_RENDERER_GL_CGL_PBUFFERSURFACECGL_H_
>+#endif  // LIBANGLE_RENDERER_GL_CGL_PBUFFERSURFACECGL_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/cgl/PbufferSurfaceCGL.mm b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/cgl/PbufferSurfaceCGL.mm
>index 14a19a3bbd4..00e793a462f 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/cgl/PbufferSurfaceCGL.mm
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/cgl/PbufferSurfaceCGL.mm
>@@ -21,15 +21,12 @@ namespace rx
> PbufferSurfaceCGL::PbufferSurfaceCGL(const egl::SurfaceState &state,
>                                      RendererGL *renderer,
>                                      EGLint width,
>-                                     EGLint height,
>-                                     const FunctionsGL *functions)
>-    : SurfaceGL(state, renderer),
>+                                     EGLint height)
>+    : SurfaceGL(state),
>       mWidth(width),
>       mHeight(height),
>-      mFunctions(functions),
>+      mFunctions(renderer->getFunctions()),
>       mStateManager(renderer->getStateManager()),
>-      mRenderer(renderer),
>-      mFramebuffer(0),
>       mColorRenderbuffer(0),
>       mDSRenderbuffer(0)
> {
>@@ -37,12 +34,6 @@ PbufferSurfaceCGL::PbufferSurfaceCGL(const egl::SurfaceState &state,
> 
> PbufferSurfaceCGL::~PbufferSurfaceCGL()
> {
>-    if (mFramebuffer != 0)
>-    {
>-        mFunctions->deleteFramebuffers(1, &mFramebuffer);
>-        mFramebuffer = 0;
>-    }
>-
>     if (mColorRenderbuffer != 0)
>     {
>         mFunctions->deleteRenderbuffers(1, &mColorRenderbuffer);
>@@ -65,17 +56,10 @@ egl::Error PbufferSurfaceCGL::initialize(const egl::Display *display)
>     mStateManager->bindRenderbuffer(GL_RENDERBUFFER, mDSRenderbuffer);
>     mFunctions->renderbufferStorage(GL_RENDERBUFFER, GL_DEPTH24_STENCIL8, mWidth, mHeight);
> 
>-    mFunctions->genFramebuffers(1, &mFramebuffer);
>-    mStateManager->bindFramebuffer(GL_FRAMEBUFFER, mFramebuffer);
>-    mFunctions->framebufferRenderbuffer(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_RENDERBUFFER,
>-                                        mColorRenderbuffer);
>-    mFunctions->framebufferRenderbuffer(GL_FRAMEBUFFER, GL_DEPTH_STENCIL_ATTACHMENT,
>-                                        GL_RENDERBUFFER, mDSRenderbuffer);
>-
>     return egl::NoError();
> }
> 
>-egl::Error PbufferSurfaceCGL::makeCurrent()
>+egl::Error PbufferSurfaceCGL::makeCurrent(const gl::Context *context)
> {
>     return egl::NoError();
> }
>@@ -100,13 +84,15 @@ egl::Error PbufferSurfaceCGL::querySurfacePointerANGLE(EGLint attribute, void **
>     return egl::NoError();
> }
> 
>-egl::Error PbufferSurfaceCGL::bindTexImage(gl::Texture *texture, EGLint buffer)
>+egl::Error PbufferSurfaceCGL::bindTexImage(const gl::Context *context,
>+                                           gl::Texture *texture,
>+                                           EGLint buffer)
> {
>     UNIMPLEMENTED();
>     return egl::NoError();
> }
> 
>-egl::Error PbufferSurfaceCGL::releaseTexImage(EGLint buffer)
>+egl::Error PbufferSurfaceCGL::releaseTexImage(const gl::Context *context, EGLint buffer)
> {
>     UNIMPLEMENTED();
>     return egl::NoError();
>@@ -137,12 +123,21 @@ EGLint PbufferSurfaceCGL::getSwapBehavior() const
>     return EGL_BUFFER_PRESERVED;
> }
> 
>-FramebufferImpl *PbufferSurfaceCGL::createDefaultFramebuffer(const gl::FramebufferState &state)
>+FramebufferImpl *PbufferSurfaceCGL::createDefaultFramebuffer(const gl::Context *context,
>+                                                             const gl::FramebufferState &state)
> {
>-    // TODO(cwallez) assert it happens only once?
>-    return new FramebufferGL(mFramebuffer, state, mFunctions, mRenderer->getWorkarounds(),
>-                             mRenderer->getBlitter(), mRenderer->getMultiviewClearer(),
>-                             mStateManager);
>+    const FunctionsGL *functions = GetFunctionsGL(context);
>+    StateManagerGL *stateManager = GetStateManagerGL(context);
>+
>+    GLuint framebuffer = 0;
>+    functions->genFramebuffers(1, &framebuffer);
>+    stateManager->bindFramebuffer(GL_FRAMEBUFFER, framebuffer);
>+    functions->framebufferRenderbuffer(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_RENDERBUFFER,
>+                                       mColorRenderbuffer);
>+    functions->framebufferRenderbuffer(GL_FRAMEBUFFER, GL_DEPTH_STENCIL_ATTACHMENT, GL_RENDERBUFFER,
>+                                       mDSRenderbuffer);
>+
>+    return new FramebufferGL(state, framebuffer, true);
> }
> 
> }  // namespace rx
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/cgl/RendererCGL.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/cgl/RendererCGL.h
>new file mode 100644
>index 00000000000..1267d8deb07
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/cgl/RendererCGL.h
>@@ -0,0 +1,35 @@
>+//
>+// Copyright 2019 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+
>+// RendererCGL.h: implements createWorkerContext for RendererGL.
>+
>+#ifndef LIBANGLE_RENDERER_GL_CGL_RENDERERCGL_H_
>+#define LIBANGLE_RENDERER_GL_CGL_RENDERERCGL_H_
>+
>+#include "libANGLE/renderer/gl/RendererGL.h"
>+
>+namespace rx
>+{
>+
>+class DisplayCGL;
>+
>+class RendererCGL : public RendererGL
>+{
>+  public:
>+    RendererCGL(std::unique_ptr<FunctionsGL> functions,
>+                const egl::AttributeMap &attribMap,
>+                DisplayCGL *display);
>+    ~RendererCGL() override;
>+
>+  private:
>+    WorkerContext *createWorkerContext(std::string *infoLog) override;
>+
>+    DisplayCGL *mDisplay;
>+};
>+
>+}  // namespace rx
>+
>+#endif  // LIBANGLE_RENDERER_GL_GLX_RENDERERGLX_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/cgl/RendererCGL.mm b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/cgl/RendererCGL.mm
>new file mode 100644
>index 00000000000..33c8fe3eb62
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/cgl/RendererCGL.mm
>@@ -0,0 +1,29 @@
>+//
>+// Copyright 2019 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+
>+// RendererCGL.mm: Implements the class methods for RendererCGL.
>+
>+#include "libANGLE/renderer/gl/cgl/RendererCGL.h"
>+
>+#include "libANGLE/renderer/gl/cgl/DisplayCGL.h"
>+
>+namespace rx
>+{
>+
>+RendererCGL::RendererCGL(std::unique_ptr<FunctionsGL> functions,
>+                         const egl::AttributeMap &attribMap,
>+                         DisplayCGL *display)
>+    : RendererGL(std::move(functions), attribMap), mDisplay(display)
>+{}
>+
>+RendererCGL::~RendererCGL() {}
>+
>+WorkerContext *RendererCGL::createWorkerContext(std::string *infoLog)
>+{
>+    return mDisplay->createWorkerContext(infoLog);
>+}
>+
>+}  // namespace rx
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/cgl/WindowSurfaceCGL.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/cgl/WindowSurfaceCGL.h
>index b134ac862c6..abaa1149061 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/cgl/WindowSurfaceCGL.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/cgl/WindowSurfaceCGL.h
>@@ -25,6 +25,7 @@ namespace rx
> class DisplayCGL;
> class FramebufferGL;
> class FunctionsGL;
>+class RendererGL;
> class StateManagerGL;
> struct WorkaroundsGL;
> 
>@@ -57,12 +58,11 @@ class WindowSurfaceCGL : public SurfaceGL
>     WindowSurfaceCGL(const egl::SurfaceState &state,
>                      RendererGL *renderer,
>                      EGLNativeWindowType layer,
>-                     const FunctionsGL *functions,
>                      CGLContextObj context);
>     ~WindowSurfaceCGL() override;
> 
>     egl::Error initialize(const egl::Display *display) override;
>-    egl::Error makeCurrent() override;
>+    egl::Error makeCurrent(const gl::Context *context) override;
> 
>     egl::Error swap(const gl::Context *context) override;
>     egl::Error postSubBuffer(const gl::Context *context,
>@@ -71,8 +71,10 @@ class WindowSurfaceCGL : public SurfaceGL
>                              EGLint width,
>                              EGLint height) override;
>     egl::Error querySurfacePointerANGLE(EGLint attribute, void **value) override;
>-    egl::Error bindTexImage(gl::Texture *texture, EGLint buffer) override;
>-    egl::Error releaseTexImage(EGLint buffer) override;
>+    egl::Error bindTexImage(const gl::Context *context,
>+                            gl::Texture *texture,
>+                            EGLint buffer) override;
>+    egl::Error releaseTexImage(const gl::Context *context, EGLint buffer) override;
>     void setSwapInterval(EGLint interval) override;
> 
>     EGLint getWidth() const override;
>@@ -81,7 +83,8 @@ class WindowSurfaceCGL : public SurfaceGL
>     EGLint isPostSubBufferSupported() const override;
>     EGLint getSwapBehavior() const override;
> 
>-    FramebufferImpl *createDefaultFramebuffer(const gl::FramebufferState &state) override;
>+    FramebufferImpl *createDefaultFramebuffer(const gl::Context *context,
>+                                              const gl::FramebufferState &state) override;
> 
>   private:
>     SwapLayer *mSwapLayer;
>@@ -92,13 +95,10 @@ class WindowSurfaceCGL : public SurfaceGL
>     CGLContextObj mContext;
>     const FunctionsGL *mFunctions;
>     StateManagerGL *mStateManager;
>-    RendererGL *mRenderer;
>-    const WorkaroundsGL &mWorkarounds;
> 
>-    GLuint mFramebuffer;
>     GLuint mDSRenderbuffer;
> };
> 
> }  // namespace rx
> 
>-#endif // LIBANGLE_RENDERER_GL_CGL_WINDOWSURFACECGL_H_
>+#endif  // LIBANGLE_RENDERER_GL_CGL_WINDOWSURFACECGL_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/cgl/WindowSurfaceCGL.mm b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/cgl/WindowSurfaceCGL.mm
>index aa9ba1fe27c..ac5e3998096 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/cgl/WindowSurfaceCGL.mm
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/cgl/WindowSurfaceCGL.mm
>@@ -13,10 +13,11 @@
> #import <QuartzCore/QuartzCore.h>
> 
> #include "common/debug.h"
>-#include "libANGLE/renderer/gl/cgl/DisplayCGL.h"
>+#include "libANGLE/Context.h"
> #include "libANGLE/renderer/gl/FramebufferGL.h"
> #include "libANGLE/renderer/gl/RendererGL.h"
> #include "libANGLE/renderer/gl/StateManagerGL.h"
>+#include "libANGLE/renderer/gl/cgl/DisplayCGL.h"
> 
> @interface SwapLayer : CAOpenGLLayer
> {
>@@ -145,18 +146,14 @@
>     WindowSurfaceCGL::WindowSurfaceCGL(const egl::SurfaceState &state,
>                                        RendererGL *renderer,
>                                        EGLNativeWindowType layer,
>-                                       const FunctionsGL *functions,
>                                        CGLContextObj context)
>-        : SurfaceGL(state, renderer),
>+        : SurfaceGL(state),
>           mSwapLayer(nil),
>           mCurrentSwapId(0),
>           mLayer(reinterpret_cast<CALayer *>(layer)),
>           mContext(context),
>-          mFunctions(functions),
>+          mFunctions(renderer->getFunctions()),
>           mStateManager(renderer->getStateManager()),
>-          mRenderer(renderer),
>-          mWorkarounds(renderer->getWorkarounds()),
>-          mFramebuffer(0),
>           mDSRenderbuffer(0)
>     {
>         pthread_mutex_init(&mSwapState.mutex, nullptr);
>@@ -165,11 +162,6 @@
> WindowSurfaceCGL::~WindowSurfaceCGL()
> {
>     pthread_mutex_destroy(&mSwapState.mutex);
>-    if (mFramebuffer != 0)
>-    {
>-        mFunctions->deleteFramebuffers(1, &mFramebuffer);
>-        mFramebuffer = 0;
>-    }
> 
>     if (mDSRenderbuffer != 0)
>     {
>@@ -202,7 +194,7 @@ egl::Error WindowSurfaceCGL::initialize(const egl::Display *display)
>     for (size_t i = 0; i < ArraySize(mSwapState.textures); ++i)
>     {
>         mFunctions->genTextures(1, &mSwapState.textures[i].texture);
>-        mStateManager->bindTexture(GL_TEXTURE_2D, mSwapState.textures[i].texture);
>+        mStateManager->bindTexture(gl::TextureType::_2D, mSwapState.textures[i].texture);
>         mFunctions->texImage2D(GL_TEXTURE_2D, 0, GL_RGBA, width, height, 0, GL_RGBA,
>                                GL_UNSIGNED_BYTE, nullptr);
>         mSwapState.textures[i].width  = width;
>@@ -222,24 +214,20 @@ egl::Error WindowSurfaceCGL::initialize(const egl::Display *display)
>     mStateManager->bindRenderbuffer(GL_RENDERBUFFER, mDSRenderbuffer);
>     mFunctions->renderbufferStorage(GL_RENDERBUFFER, GL_DEPTH24_STENCIL8, width, height);
> 
>-    mFunctions->genFramebuffers(1, &mFramebuffer);
>-    mStateManager->bindFramebuffer(GL_FRAMEBUFFER, mFramebuffer);
>-    mFunctions->framebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D,
>-                                     mSwapState.beingRendered->texture, 0);
>-    mFunctions->framebufferRenderbuffer(GL_FRAMEBUFFER, GL_DEPTH_STENCIL_ATTACHMENT, GL_RENDERBUFFER,
>-                                        mDSRenderbuffer);
>-
>     return egl::Error(EGL_SUCCESS);
> }
> 
>-egl::Error WindowSurfaceCGL::makeCurrent()
>+egl::Error WindowSurfaceCGL::makeCurrent(const gl::Context *context)
> {
>     return egl::Error(EGL_SUCCESS);
> }
> 
> egl::Error WindowSurfaceCGL::swap(const gl::Context *context)
> {
>-    mFunctions->flush();
>+    const FunctionsGL *functions = GetFunctionsGL(context);
>+    StateManagerGL *stateManager = GetStateManagerGL(context);
>+
>+    functions->flush();
>     mSwapState.beingRendered->swapId = ++mCurrentSwapId;
> 
>     pthread_mutex_lock(&mSwapState.mutex);
>@@ -254,20 +242,21 @@ egl::Error WindowSurfaceCGL::swap(const gl::Context *context)
> 
>     if (texture.width != width || texture.height != height)
>     {
>-        mStateManager->bindTexture(GL_TEXTURE_2D, texture.texture);
>-        mFunctions->texImage2D(GL_TEXTURE_2D, 0, GL_RGBA, width, height, 0, GL_RGBA,
>-                               GL_UNSIGNED_BYTE, nullptr);
>+        stateManager->bindTexture(gl::TextureType::_2D, texture.texture);
>+        functions->texImage2D(GL_TEXTURE_2D, 0, GL_RGBA, width, height, 0, GL_RGBA,
>+                              GL_UNSIGNED_BYTE, nullptr);
> 
>-        mStateManager->bindRenderbuffer(GL_RENDERBUFFER, mDSRenderbuffer);
>-        mFunctions->renderbufferStorage(GL_RENDERBUFFER, GL_DEPTH24_STENCIL8, width, height);
>+        stateManager->bindRenderbuffer(GL_RENDERBUFFER, mDSRenderbuffer);
>+        functions->renderbufferStorage(GL_RENDERBUFFER, GL_DEPTH24_STENCIL8, width, height);
> 
>         texture.width  = width;
>         texture.height = height;
>     }
> 
>-    mStateManager->bindFramebuffer(GL_FRAMEBUFFER, mFramebuffer);
>-    mFunctions->framebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D,
>-                                     mSwapState.beingRendered->texture, 0);
>+    FramebufferGL *framebufferGL = GetImplAs<FramebufferGL>(context->getFramebuffer(0));
>+    stateManager->bindFramebuffer(GL_FRAMEBUFFER, framebufferGL->getFramebufferID());
>+    functions->framebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D,
>+                                    mSwapState.beingRendered->texture, 0);
> 
>     return egl::Error(EGL_SUCCESS);
> }
>@@ -288,13 +277,15 @@ egl::Error WindowSurfaceCGL::querySurfacePointerANGLE(EGLint attribute, void **v
>     return egl::Error(EGL_SUCCESS);
> }
> 
>-egl::Error WindowSurfaceCGL::bindTexImage(gl::Texture *texture, EGLint buffer)
>+egl::Error WindowSurfaceCGL::bindTexImage(const gl::Context *context,
>+                                          gl::Texture *texture,
>+                                          EGLint buffer)
> {
>     UNIMPLEMENTED();
>     return egl::Error(EGL_SUCCESS);
> }
> 
>-egl::Error WindowSurfaceCGL::releaseTexImage(EGLint buffer)
>+egl::Error WindowSurfaceCGL::releaseTexImage(const gl::Context *context, EGLint buffer)
> {
>     UNIMPLEMENTED();
>     return egl::Error(EGL_SUCCESS);
>@@ -326,11 +317,21 @@ EGLint WindowSurfaceCGL::getSwapBehavior() const
>     return EGL_BUFFER_DESTROYED;
> }
> 
>-FramebufferImpl *WindowSurfaceCGL::createDefaultFramebuffer(const gl::FramebufferState &state)
>+FramebufferImpl *WindowSurfaceCGL::createDefaultFramebuffer(const gl::Context *context,
>+                                                            const gl::FramebufferState &state)
> {
>-    // TODO(cwallez) assert it happens only once?
>-    return new FramebufferGL(mFramebuffer, state, mFunctions, mWorkarounds, mRenderer->getBlitter(),
>-                             mRenderer->getMultiviewClearer(), mStateManager);
>+    const FunctionsGL *functions = GetFunctionsGL(context);
>+    StateManagerGL *stateManager = GetStateManagerGL(context);
>+
>+    GLuint framebuffer = 0;
>+    functions->genFramebuffers(1, &framebuffer);
>+    stateManager->bindFramebuffer(GL_FRAMEBUFFER, framebuffer);
>+    functions->framebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D,
>+                                    mSwapState.beingRendered->texture, 0);
>+    functions->framebufferRenderbuffer(GL_FRAMEBUFFER, GL_DEPTH_STENCIL_ATTACHMENT, GL_RENDERBUFFER,
>+                                       mDSRenderbuffer);
>+
>+    return new FramebufferGL(state, framebuffer, true);
> }
> 
> }  // namespace rx
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/egl/ContextEGL.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/egl/ContextEGL.cpp
>new file mode 100644
>index 00000000000..aea6e181503
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/egl/ContextEGL.cpp
>@@ -0,0 +1,23 @@
>+//
>+// Copyright 2018 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+
>+#include "libANGLE/renderer/gl/egl/ContextEGL.h"
>+
>+namespace rx
>+{
>+ContextEGL::ContextEGL(const gl::State &state,
>+                       gl::ErrorSet *errorSet,
>+                       const std::shared_ptr<RendererEGL> &renderer)
>+    : ContextGL(state, errorSet, renderer), mRenderer(renderer)
>+{}
>+
>+ContextEGL::~ContextEGL() {}
>+
>+EGLContext ContextEGL::getContext() const
>+{
>+    return mRenderer->getContext();
>+}
>+}  // namespace rx
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/egl/ContextEGL.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/egl/ContextEGL.h
>new file mode 100644
>index 00000000000..43cbfbdaedc
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/egl/ContextEGL.h
>@@ -0,0 +1,32 @@
>+//
>+// Copyright 2018 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+
>+// ContextEGL.h: Context class for GL on Android/ChromeOS.  Wraps a RendererEGL.
>+
>+#ifndef LIBANGLE_RENDERER_GL_EGL_CONTEXTEGL_H_
>+#define LIBANGLE_RENDERER_GL_EGL_CONTEXTEGL_H_
>+
>+#include "libANGLE/renderer/gl/ContextGL.h"
>+#include "libANGLE/renderer/gl/egl/RendererEGL.h"
>+
>+namespace rx
>+{
>+class ContextEGL : public ContextGL
>+{
>+  public:
>+    ContextEGL(const gl::State &state,
>+               gl::ErrorSet *errorSet,
>+               const std::shared_ptr<RendererEGL> &renderer);
>+    ~ContextEGL() override;
>+
>+    EGLContext getContext() const;
>+
>+  private:
>+    std::shared_ptr<RendererEGL> mRenderer;
>+};
>+}  // namespace rx
>+
>+#endif  // LIBANGLE_RENDERER_GL_EGL_RENDEREREGL_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/egl/DisplayEGL.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/egl/DisplayEGL.cpp
>index 7057edcc138..22c87162f7a 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/egl/DisplayEGL.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/egl/DisplayEGL.cpp
>@@ -8,7 +8,8 @@
> 
> #include "libANGLE/renderer/gl/egl/DisplayEGL.h"
> 
>-#include "libANGLE/renderer/gl/egl/egl_utils.h"
>+#include "libANGLE/renderer/gl/egl/ImageEGL.h"
>+#include "libANGLE/renderer/gl/egl/SyncEGL.h"
> 
> namespace rx
> {
>@@ -16,16 +17,22 @@ namespace rx
> #define EGL_NO_CONFIG ((EGLConfig)0)
> 
> DisplayEGL::DisplayEGL(const egl::DisplayState &state)
>-    : DisplayGL(state),
>-      mEGL(nullptr),
>-      mConfig(EGL_NO_CONFIG),
>-      mContext(EGL_NO_CONTEXT),
>-      mFunctionsGL(nullptr)
>+    : DisplayGL(state), mEGL(nullptr), mConfig(EGL_NO_CONFIG)
>+{}
>+
>+DisplayEGL::~DisplayEGL() {}
>+
>+ImageImpl *DisplayEGL::createImage(const egl::ImageState &state,
>+                                   const gl::Context *context,
>+                                   EGLenum target,
>+                                   const egl::AttributeMap &attribs)
> {
>+    return new ImageEGL(state, context, target, attribs, mEGL);
> }
> 
>-DisplayEGL::~DisplayEGL()
>+EGLSyncImpl *DisplayEGL::createSync(const egl::AttributeMap &attribs)
> {
>+    return new SyncEGL(attribs, mEGL);
> }
> 
> std::string DisplayEGL::getVendorString() const
>@@ -35,7 +42,10 @@ std::string DisplayEGL::getVendorString() const
>     return vendor;
> }
> 
>-egl::Error DisplayEGL::initializeContext(const egl::AttributeMap &eglAttributes)
>+egl::Error DisplayEGL::initializeContext(EGLContext shareContext,
>+                                         const egl::AttributeMap &eglAttributes,
>+                                         EGLContext *outContext,
>+                                         native_egl::AttributeVector *outAttribs) const
> {
>     gl::Version eglVersion(mEGL->majorVersion, mEGL->minorVersion);
> 
>@@ -86,11 +96,14 @@ egl::Error DisplayEGL::initializeContext(const egl::AttributeMap &eglAttributes)
>         contextAttribLists.push_back({EGL_CONTEXT_CLIENT_VERSION, 2, EGL_NONE});
>     }
> 
>+    EGLContext context = EGL_NO_CONTEXT;
>     for (const auto &attribList : contextAttribLists)
>     {
>-        mContext = mEGL->createContext(mConfig, EGL_NO_CONTEXT, attribList.data());
>-        if (mContext != EGL_NO_CONTEXT)
>+        context = mEGL->createContext(mConfig, shareContext, attribList.data());
>+        if (context != EGL_NO_CONTEXT)
>         {
>+            *outContext = context;
>+            *outAttribs = attribList;
>             return egl::NoError();
>         }
>     }
>@@ -100,16 +113,38 @@ egl::Error DisplayEGL::initializeContext(const egl::AttributeMap &eglAttributes)
> 
> void DisplayEGL::generateExtensions(egl::DisplayExtensions *outExtensions) const
> {
>+    gl::Version eglVersion(mEGL->majorVersion, mEGL->minorVersion);
>+
>     outExtensions->createContextRobustness =
>         mEGL->hasExtension("EGL_EXT_create_context_robustness");
> 
>-    outExtensions->postSubBuffer = false;  // Since SurfaceEGL::postSubBuffer is not implemented
>+    outExtensions->postSubBuffer    = false;  // Since SurfaceEGL::postSubBuffer is not implemented
>+    outExtensions->presentationTime = mEGL->hasExtension("EGL_ANDROID_presentation_time");
> 
>     // Contexts are virtualized so textures can be shared globally
>     outExtensions->displayTextureShareGroup = true;
> 
>-    // Surfaceless contexts are emulated even if there is no native support.
>-    outExtensions->surfacelessContext = true;
>+    // We will fallback to regular swap if swapBuffersWithDamage isn't
>+    // supported, so indicate support here to keep validation happy.
>+    outExtensions->swapBuffersWithDamage = true;
>+
>+    outExtensions->image     = mEGL->hasExtension("EGL_KHR_image");
>+    outExtensions->imageBase = mEGL->hasExtension("EGL_KHR_image_base");
>+    // Pixmaps are not supported in ANGLE's EGL implementation.
>+    // outExtensions->imagePixmap = mEGL->hasExtension("EGL_KHR_image_pixmap");
>+    outExtensions->glTexture2DImage      = mEGL->hasExtension("EGL_KHR_gl_texture_2D_image");
>+    outExtensions->glTextureCubemapImage = mEGL->hasExtension("EGL_KHR_gl_texture_cubemap_image");
>+    outExtensions->glTexture3DImage      = mEGL->hasExtension("EGL_KHR_gl_texture_3D_image");
>+    outExtensions->glRenderbufferImage   = mEGL->hasExtension("EGL_KHR_gl_renderbuffer_image");
>+
>+    outExtensions->imageNativeBuffer = mEGL->hasExtension("EGL_ANDROID_image_native_buffer");
>+
>+    outExtensions->getFrameTimestamps = mEGL->hasExtension("EGL_ANDROID_get_frame_timestamps");
>+
>+    outExtensions->fenceSync =
>+        eglVersion >= gl::Version(1, 5) || mEGL->hasExtension("EGL_KHR_fence_sync");
>+    outExtensions->waitSync =
>+        eglVersion >= gl::Version(1, 5) || mEGL->hasExtension("EGL_KHR_wait_sync");
> 
>     DisplayGL::generateExtensions(outExtensions);
> }
>@@ -119,8 +154,12 @@ void DisplayEGL::generateCaps(egl::Caps *outCaps) const
>     outCaps->textureNPOT = true;  // Since we request GLES >= 2
> }
> 
>-const FunctionsGL *DisplayEGL::getFunctionsGL() const
>+void DisplayEGL::setBlobCacheFuncs(EGLSetBlobFuncANDROID set, EGLGetBlobFuncANDROID get)
> {
>-    return mFunctionsGL;
>+    if (mEGL->hasExtension("EGL_ANDROID_blob_cache"))
>+    {
>+        mEGL->setBlobCacheFuncsANDROID(set, get);
>+    }
> }
>+
> }  // namespace rx
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/egl/DisplayEGL.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/egl/DisplayEGL.h
>index 54f8a5a9c81..45a76811371 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/egl/DisplayEGL.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/egl/DisplayEGL.h
>@@ -11,31 +11,49 @@
> 
> #include "libANGLE/renderer/gl/DisplayGL.h"
> #include "libANGLE/renderer/gl/egl/FunctionsEGL.h"
>+#include "libANGLE/renderer/gl/egl/egl_utils.h"
> 
> namespace rx
> {
> 
>+class WorkerContext;
>+
> class DisplayEGL : public DisplayGL
> {
>   public:
>     DisplayEGL(const egl::DisplayState &state);
>     ~DisplayEGL() override;
> 
>+    ImageImpl *createImage(const egl::ImageState &state,
>+                           const gl::Context *context,
>+                           EGLenum target,
>+                           const egl::AttributeMap &attribs) override;
>+
>+    EGLSyncImpl *createSync(const egl::AttributeMap &attribs) override;
>+
>     std::string getVendorString() const override;
> 
>+    void setBlobCacheFuncs(EGLSetBlobFuncANDROID set, EGLGetBlobFuncANDROID get) override;
>+
>+    virtual void destroyNativeContext(EGLContext context) = 0;
>+
>+    virtual WorkerContext *createWorkerContext(std::string *infoLog,
>+                                               EGLContext sharedContext,
>+                                               const native_egl::AttributeVector workerAttribs) = 0;
>+
>   protected:
>-    egl::Error initializeContext(const egl::AttributeMap &eglAttributes);
>+    egl::Error initializeContext(EGLContext shareContext,
>+                                 const egl::AttributeMap &eglAttributes,
>+                                 EGLContext *outContext,
>+                                 native_egl::AttributeVector *outAttribs) const;
>+
>+    void generateExtensions(egl::DisplayExtensions *outExtensions) const override;
> 
>     FunctionsEGL *mEGL;
>     EGLConfig mConfig;
>-    EGLContext mContext;
>-    FunctionsGL *mFunctionsGL;
> 
>   private:
>-    void generateExtensions(egl::DisplayExtensions *outExtensions) const override;
>     void generateCaps(egl::Caps *outCaps) const override;
>-
>-    const FunctionsGL *getFunctionsGL() const override;
> };
> 
> }  // namespace rx
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/egl/ExternalImageSiblingEGL.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/egl/ExternalImageSiblingEGL.h
>new file mode 100644
>index 00000000000..17c8631581b
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/egl/ExternalImageSiblingEGL.h
>@@ -0,0 +1,29 @@
>+//
>+// Copyright 2018 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+
>+// ExternalImageSiblingEGL.h: Defines the ExternalImageSiblingEGL interface to abstract all external
>+// image siblings in the EGL backend
>+
>+#ifndef LIBANGLE_RENDERER_GL_EGL_EXTERNALIMAGESIBLINGEGL_H_
>+#define LIBANGLE_RENDERER_GL_EGL_EXTERNALIMAGESIBLINGEGL_H_
>+
>+#include "libANGLE/renderer/ImageImpl.h"
>+
>+namespace rx
>+{
>+
>+class ExternalImageSiblingEGL : public ExternalImageSiblingImpl
>+{
>+  public:
>+    ExternalImageSiblingEGL() {}
>+    virtual ~ExternalImageSiblingEGL() {}
>+
>+    virtual EGLClientBuffer getBuffer() const = 0;
>+};
>+
>+}  // namespace rx
>+
>+#endif  // LIBANGLE_RENDERER_GL_EGL_EXTERNALIMAGESIBLINGEGL_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/egl/FunctionsEGL.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/egl/FunctionsEGL.cpp
>index ec301fa5c6d..ac03341c9b9 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/egl/FunctionsEGL.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/egl/FunctionsEGL.cpp
>@@ -10,9 +10,9 @@
> 
> #include <algorithm>
> 
>+#include "common/string_utils.h"
> #include "libANGLE/renderer/gl/FunctionsGL.h"
> #include "libANGLE/renderer/gl/egl/functionsegl_typedefs.h"
>-#include "common/string_utils.h"
> 
> namespace
> {
>@@ -54,17 +54,31 @@ struct FunctionsEGL::EGLDispatchTable
> 
>           bindTexImagePtr(nullptr),
>           releaseTexImagePtr(nullptr),
>+          surfaceAttribPtr(nullptr),
>           swapIntervalPtr(nullptr),
> 
>           createImageKHRPtr(nullptr),
>           destroyImageKHRPtr(nullptr),
> 
>-          clientWaitSyncKHRPtr(nullptr),
>           createSyncKHRPtr(nullptr),
>           destroySyncKHRPtr(nullptr),
>-          getSyncAttribKHRPtr(nullptr)
>-    {
>-    }
>+          clientWaitSyncKHRPtr(nullptr),
>+          getSyncAttribKHRPtr(nullptr),
>+
>+          waitSyncKHRPtr(nullptr),
>+
>+          swapBuffersWithDamageKHRPtr(nullptr),
>+
>+          presentationTimeANDROIDPtr(nullptr),
>+
>+          setBlobCacheFuncsANDROIDPtr(nullptr),
>+
>+          getCompositorTimingSupportedANDROIDPtr(nullptr),
>+          getCompositorTimingANDROIDPtr(nullptr),
>+          getNextFrameIdANDROIDPtr(nullptr),
>+          getFrameTimestampSupportedANDROIDPtr(nullptr),
>+          getFrameTimestampsANDROIDPtr(nullptr)
>+    {}
> 
>     // 1.0
>     PFNEGLBINDAPIPROC bindAPIPtr;
>@@ -87,6 +101,7 @@ struct FunctionsEGL::EGLDispatchTable
>     // 1.1
>     PFNEGLBINDTEXIMAGEPROC bindTexImagePtr;
>     PFNEGLRELEASETEXIMAGEPROC releaseTexImagePtr;
>+    PFNEGLSURFACEATTRIBPROC surfaceAttribPtr;
>     PFNEGLSWAPINTERVALPROC swapIntervalPtr;
> 
>     // EGL_KHR_image
>@@ -94,16 +109,34 @@ struct FunctionsEGL::EGLDispatchTable
>     PFNEGLDESTROYIMAGEKHRPROC destroyImageKHRPtr;
> 
>     // EGL_KHR_fence_sync
>-    PFNEGLCLIENTWAITSYNCKHRPROC clientWaitSyncKHRPtr;
>     PFNEGLCREATESYNCKHRPROC createSyncKHRPtr;
>     PFNEGLDESTROYSYNCKHRPROC destroySyncKHRPtr;
>+    PFNEGLCLIENTWAITSYNCKHRPROC clientWaitSyncKHRPtr;
>     PFNEGLGETSYNCATTRIBKHRPROC getSyncAttribKHRPtr;
>+
>+    // EGL_KHR_wait_sync
>+    PFNEGLWAITSYNCKHRPROC waitSyncKHRPtr;
>+
>+    // EGL_KHR_swap_buffers_with_damage
>+    PFNEGLSWAPBUFFERSWITHDAMAGEKHRPROC swapBuffersWithDamageKHRPtr;
>+
>+    // EGL_ANDROID_presentation_time
>+    PFNEGLPRESENTATIONTIMEANDROIDPROC presentationTimeANDROIDPtr;
>+
>+    // EGL_ANDROID_blob_cache
>+    PFNEGLSETBLOBCACHEFUNCSANDROIDPROC setBlobCacheFuncsANDROIDPtr;
>+
>+    // EGL_ANDROID_get_frame_timestamps
>+    PFNEGLGETCOMPOSITORTIMINGSUPPORTEDANDROIDPROC getCompositorTimingSupportedANDROIDPtr;
>+    PFNEGLGETCOMPOSITORTIMINGANDROIDPROC getCompositorTimingANDROIDPtr;
>+    PFNEGLGETNEXTFRAMEIDANDROIDPROC getNextFrameIdANDROIDPtr;
>+    PFNEGLGETFRAMETIMESTAMPSUPPORTEDANDROIDPROC getFrameTimestampSupportedANDROIDPtr;
>+    PFNEGLGETFRAMETIMESTAMPSANDROIDPROC getFrameTimestampsANDROIDPtr;
> };
> 
> FunctionsEGL::FunctionsEGL()
>     : majorVersion(0), minorVersion(0), mFnPtrs(new EGLDispatchTable()), mEGLDisplay(EGL_NO_DISPLAY)
>-{
>-}
>+{}
> 
> FunctionsEGL::~FunctionsEGL()
> {
>@@ -112,11 +145,14 @@ FunctionsEGL::~FunctionsEGL()
> 
> egl::Error FunctionsEGL::initialize(EGLNativeDisplayType nativeDisplay)
> {
>-#define ANGLE_GET_PROC_OR_ERROR(MEMBER, NAME)                                       \
>-    if (!SetPtr(MEMBER, getProcAddress(#NAME)))                                     \
>-    {                                                                               \
>-        return egl::EglNotInitialized() << "Could not load EGL entry point " #NAME; \
>-    }
>+#define ANGLE_GET_PROC_OR_ERROR(MEMBER, NAME)                                           \
>+    do                                                                                  \
>+    {                                                                                   \
>+        if (!SetPtr(MEMBER, getProcAddress(#NAME)))                                     \
>+        {                                                                               \
>+            return egl::EglNotInitialized() << "Could not load EGL entry point " #NAME; \
>+        }                                                                               \
>+    } while (0)
> 
>     ANGLE_GET_PROC_OR_ERROR(&mFnPtrs->bindAPIPtr, eglBindAPI);
>     ANGLE_GET_PROC_OR_ERROR(&mFnPtrs->chooseConfigPtr, eglChooseConfig);
>@@ -137,6 +173,7 @@ egl::Error FunctionsEGL::initialize(EGLNativeDisplayType nativeDisplay)
> 
>     ANGLE_GET_PROC_OR_ERROR(&mFnPtrs->bindTexImagePtr, eglBindTexImage);
>     ANGLE_GET_PROC_OR_ERROR(&mFnPtrs->releaseTexImagePtr, eglReleaseTexImage);
>+    ANGLE_GET_PROC_OR_ERROR(&mFnPtrs->surfaceAttribPtr, eglSurfaceAttrib);
>     ANGLE_GET_PROC_OR_ERROR(&mFnPtrs->swapIntervalPtr, eglSwapInterval);
> 
>     mEGLDisplay = mFnPtrs->getDisplayPtr(nativeDisplay);
>@@ -171,11 +208,43 @@ egl::Error FunctionsEGL::initialize(EGLNativeDisplayType nativeDisplay)
>     }
>     if (hasExtension("EGL_KHR_fence_sync"))
>     {
>-        ANGLE_GET_PROC_OR_ERROR(&mFnPtrs->clientWaitSyncKHRPtr, eglClientWaitSyncKHR);
>         ANGLE_GET_PROC_OR_ERROR(&mFnPtrs->createSyncKHRPtr, eglCreateSyncKHR);
>         ANGLE_GET_PROC_OR_ERROR(&mFnPtrs->destroySyncKHRPtr, eglDestroySyncKHR);
>+        ANGLE_GET_PROC_OR_ERROR(&mFnPtrs->clientWaitSyncKHRPtr, eglClientWaitSyncKHR);
>         ANGLE_GET_PROC_OR_ERROR(&mFnPtrs->getSyncAttribKHRPtr, eglGetSyncAttribKHR);
>     }
>+    if (hasExtension("EGL_KHR_wait_sync"))
>+    {
>+        ANGLE_GET_PROC_OR_ERROR(&mFnPtrs->waitSyncKHRPtr, eglWaitSyncKHR);
>+    }
>+
>+    if (hasExtension("EGL_KHR_swap_buffers_with_damage"))
>+    {
>+        ANGLE_GET_PROC_OR_ERROR(&mFnPtrs->swapBuffersWithDamageKHRPtr, eglSwapBuffersWithDamageKHR);
>+    }
>+
>+    if (hasExtension("EGL_ANDROID_presentation_time"))
>+    {
>+        ANGLE_GET_PROC_OR_ERROR(&mFnPtrs->presentationTimeANDROIDPtr, eglPresentationTimeANDROID);
>+    }
>+
>+    if (hasExtension("EGL_ANDROID_blob_cache"))
>+    {
>+        ANGLE_GET_PROC_OR_ERROR(&mFnPtrs->setBlobCacheFuncsANDROIDPtr, eglSetBlobCacheFuncsANDROID);
>+    }
>+
>+    if (hasExtension("EGL_ANDROID_get_frame_timestamps"))
>+    {
>+        ANGLE_GET_PROC_OR_ERROR(&mFnPtrs->getCompositorTimingSupportedANDROIDPtr,
>+                                eglGetCompositorTimingSupportedANDROID);
>+        ANGLE_GET_PROC_OR_ERROR(&mFnPtrs->getCompositorTimingANDROIDPtr,
>+                                eglGetCompositorTimingANDROID);
>+        ANGLE_GET_PROC_OR_ERROR(&mFnPtrs->getNextFrameIdANDROIDPtr, eglGetNextFrameIdANDROID);
>+        ANGLE_GET_PROC_OR_ERROR(&mFnPtrs->getFrameTimestampSupportedANDROIDPtr,
>+                                eglGetFrameTimestampSupportedANDROID);
>+        ANGLE_GET_PROC_OR_ERROR(&mFnPtrs->getFrameTimestampsANDROIDPtr,
>+                                eglGetFrameTimestampsANDROID);
>+    }
> 
> #undef ANGLE_GET_PROC_OR_ERROR
> 
>@@ -300,6 +369,11 @@ EGLBoolean FunctionsEGL::releaseTexImage(EGLSurface surface, EGLint buffer) cons
>     return mFnPtrs->releaseTexImagePtr(mEGLDisplay, surface, buffer);
> }
> 
>+EGLBoolean FunctionsEGL::surfaceAttrib(EGLSurface surface, EGLint attribute, EGLint value) const
>+{
>+    return mFnPtrs->surfaceAttribPtr(mEGLDisplay, surface, attribute, value);
>+}
>+
> EGLBoolean FunctionsEGL::swapInterval(EGLint interval) const
> {
>     return mFnPtrs->swapIntervalPtr(mEGLDisplay, interval);
>@@ -318,23 +392,82 @@ EGLBoolean FunctionsEGL::destroyImageKHR(EGLImageKHR image) const
>     return mFnPtrs->destroyImageKHRPtr(mEGLDisplay, image);
> }
> 
>-EGLSyncKHR FunctionsEGL::createSyncKHR(EGLenum type, const EGLint *attrib_list)
>+EGLSyncKHR FunctionsEGL::createSyncKHR(EGLenum type, const EGLint *attrib_list) const
> {
>     return mFnPtrs->createSyncKHRPtr(mEGLDisplay, type, attrib_list);
> }
> 
>-EGLBoolean FunctionsEGL::destroySyncKHR(EGLSyncKHR sync)
>+EGLBoolean FunctionsEGL::destroySyncKHR(EGLSyncKHR sync) const
> {
>     return mFnPtrs->destroySyncKHRPtr(mEGLDisplay, sync);
> }
> 
>-EGLint FunctionsEGL::clientWaitSyncKHR(EGLSyncKHR sync, EGLint flags, EGLTimeKHR timeout)
>+EGLint FunctionsEGL::clientWaitSyncKHR(EGLSyncKHR sync, EGLint flags, EGLTimeKHR timeout) const
> {
>     return mFnPtrs->clientWaitSyncKHRPtr(mEGLDisplay, sync, flags, timeout);
> }
> 
>-EGLBoolean FunctionsEGL::getSyncAttribKHR(EGLSyncKHR sync, EGLint attribute, EGLint *value)
>+EGLBoolean FunctionsEGL::getSyncAttribKHR(EGLSyncKHR sync, EGLint attribute, EGLint *value) const
> {
>     return mFnPtrs->getSyncAttribKHRPtr(mEGLDisplay, sync, attribute, value);
> }
>+
>+EGLint FunctionsEGL::waitSyncKHR(EGLSyncKHR sync, EGLint flags) const
>+{
>+    return mFnPtrs->waitSyncKHRPtr(mEGLDisplay, sync, flags);
>+}
>+
>+EGLBoolean FunctionsEGL::swapBuffersWithDamageKHR(EGLSurface surface,
>+                                                  EGLint *rects,
>+                                                  EGLint n_rects) const
>+{
>+    return mFnPtrs->swapBuffersWithDamageKHRPtr(mEGLDisplay, surface, rects, n_rects);
>+}
>+
>+EGLBoolean FunctionsEGL::presentationTimeANDROID(EGLSurface surface, EGLnsecsANDROID time) const
>+{
>+    return mFnPtrs->presentationTimeANDROIDPtr(mEGLDisplay, surface, time);
>+}
>+
>+void FunctionsEGL::setBlobCacheFuncsANDROID(EGLSetBlobFuncANDROID set,
>+                                            EGLGetBlobFuncANDROID get) const
>+{
>+    return mFnPtrs->setBlobCacheFuncsANDROIDPtr(mEGLDisplay, set, get);
>+}
>+
>+EGLBoolean FunctionsEGL::getCompositorTimingSupportedANDROID(EGLSurface surface, EGLint name) const
>+{
>+    return mFnPtrs->getCompositorTimingSupportedANDROIDPtr(mEGLDisplay, surface, name);
>+}
>+
>+EGLBoolean FunctionsEGL::getCompositorTimingANDROID(EGLSurface surface,
>+                                                    EGLint numTimestamps,
>+                                                    const EGLint *names,
>+                                                    EGLnsecsANDROID *values) const
>+{
>+    return mFnPtrs->getCompositorTimingANDROIDPtr(mEGLDisplay, surface, numTimestamps, names,
>+                                                  values);
>+}
>+
>+EGLBoolean FunctionsEGL::getNextFrameIdANDROID(EGLSurface surface, EGLuint64KHR *frameId) const
>+{
>+    return mFnPtrs->getNextFrameIdANDROIDPtr(mEGLDisplay, surface, frameId);
>+}
>+
>+EGLBoolean FunctionsEGL::getFrameTimestampSupportedANDROID(EGLSurface surface,
>+                                                           EGLint timestamp) const
>+{
>+    return mFnPtrs->getFrameTimestampSupportedANDROIDPtr(mEGLDisplay, surface, timestamp);
>+}
>+
>+EGLBoolean FunctionsEGL::getFrameTimestampsANDROID(EGLSurface surface,
>+                                                   EGLuint64KHR frameId,
>+                                                   EGLint numTimestamps,
>+                                                   const EGLint *timestamps,
>+                                                   EGLnsecsANDROID *values) const
>+{
>+    return mFnPtrs->getFrameTimestampsANDROIDPtr(mEGLDisplay, surface, frameId, numTimestamps,
>+                                                 timestamps, values);
>+}
>+
> }  // namespace rx
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/egl/FunctionsEGL.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/egl/FunctionsEGL.h
>index 43d5622e672..115a7afbce0 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/egl/FunctionsEGL.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/egl/FunctionsEGL.h
>@@ -62,6 +62,7 @@ class FunctionsEGL
> 
>     EGLBoolean bindTexImage(EGLSurface surface, EGLint buffer) const;
>     EGLBoolean releaseTexImage(EGLSurface surface, EGLint buffer) const;
>+    EGLBoolean surfaceAttrib(EGLSurface surface, EGLint attribute, EGLint value) const;
>     EGLBoolean swapInterval(EGLint interval) const;
> 
>     EGLImageKHR createImageKHR(EGLContext context,
>@@ -70,10 +71,31 @@ class FunctionsEGL
>                                const EGLint *attrib_list) const;
>     EGLBoolean destroyImageKHR(EGLImageKHR image) const;
> 
>-    EGLSyncKHR createSyncKHR(EGLenum type, const EGLint *attrib_list);
>-    EGLBoolean destroySyncKHR(EGLSyncKHR sync);
>-    EGLint clientWaitSyncKHR(EGLSyncKHR sync, EGLint flags, EGLTimeKHR timeout);
>-    EGLBoolean getSyncAttribKHR(EGLSyncKHR sync, EGLint attribute, EGLint *value);
>+    EGLSyncKHR createSyncKHR(EGLenum type, const EGLint *attrib_list) const;
>+    EGLBoolean destroySyncKHR(EGLSyncKHR sync) const;
>+    EGLint clientWaitSyncKHR(EGLSyncKHR sync, EGLint flags, EGLTimeKHR timeout) const;
>+    EGLBoolean getSyncAttribKHR(EGLSyncKHR sync, EGLint attribute, EGLint *value) const;
>+
>+    EGLint waitSyncKHR(EGLSyncKHR sync, EGLint flags) const;
>+
>+    EGLBoolean swapBuffersWithDamageKHR(EGLSurface surface, EGLint *rects, EGLint n_rects) const;
>+
>+    EGLBoolean presentationTimeANDROID(EGLSurface surface, EGLnsecsANDROID time) const;
>+
>+    void setBlobCacheFuncsANDROID(EGLSetBlobFuncANDROID set, EGLGetBlobFuncANDROID get) const;
>+
>+    EGLBoolean getCompositorTimingSupportedANDROID(EGLSurface surface, EGLint name) const;
>+    EGLBoolean getCompositorTimingANDROID(EGLSurface surface,
>+                                          EGLint numTimestamps,
>+                                          const EGLint *names,
>+                                          EGLnsecsANDROID *values) const;
>+    EGLBoolean getNextFrameIdANDROID(EGLSurface surface, EGLuint64KHR *frameId) const;
>+    EGLBoolean getFrameTimestampSupportedANDROID(EGLSurface surface, EGLint timestamp) const;
>+    EGLBoolean getFrameTimestampsANDROID(EGLSurface surface,
>+                                         EGLuint64KHR frameId,
>+                                         EGLint numTimestamps,
>+                                         const EGLint *timestamps,
>+                                         EGLnsecsANDROID *values) const;
> 
>   private:
>     // So as to isolate from angle we do not include angleutils.h and cannot
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/egl/FunctionsEGLDL.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/egl/FunctionsEGLDL.cpp
>index 8698a96bbfe..da3e293d615 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/egl/FunctionsEGLDL.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/egl/FunctionsEGLDL.cpp
>@@ -24,16 +24,22 @@ namespace
> void *nativeEGLHandle;
> }  // anonymous namespace
> 
>-FunctionsEGLDL::FunctionsEGLDL() : mGetProcAddressPtr(nullptr)
>-{
>-}
>+FunctionsEGLDL::FunctionsEGLDL() : mGetProcAddressPtr(nullptr) {}
> 
>-FunctionsEGLDL::~FunctionsEGLDL()
>-{
>-}
>+FunctionsEGLDL::~FunctionsEGLDL() {}
> 
>-egl::Error FunctionsEGLDL::initialize(EGLNativeDisplayType nativeDisplay, const char *libName)
>+egl::Error FunctionsEGLDL::initialize(EGLNativeDisplayType nativeDisplay,
>+                                      const char *libName,
>+                                      void *eglHandle)
> {
>+
>+    if (eglHandle)
>+    {
>+        // If the handle is provided, use it.
>+        // Caller has already dlopened the vendor library.
>+        nativeEGLHandle = eglHandle;
>+    }
>+
>     if (!nativeEGLHandle)
>     {
>         nativeEGLHandle = dlopen(libName, RTLD_NOW);
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/egl/FunctionsEGLDL.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/egl/FunctionsEGLDL.h
>index e8ee24655d4..e959aaa2c6f 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/egl/FunctionsEGLDL.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/egl/FunctionsEGLDL.h
>@@ -20,7 +20,7 @@ class FunctionsEGLDL : public FunctionsEGL
>     FunctionsEGLDL();
>     ~FunctionsEGLDL() override;
> 
>-    egl::Error initialize(EGLNativeDisplayType nativeDisplay, const char *libName);
>+    egl::Error initialize(EGLNativeDisplayType nativeDisplay, const char *libName, void *eglHandle);
>     void *getProcAddress(const char *name) const override;
> 
>   private:
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/egl/ImageEGL.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/egl/ImageEGL.cpp
>new file mode 100644
>index 00000000000..a7589e522db
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/egl/ImageEGL.cpp
>@@ -0,0 +1,142 @@
>+//
>+// Copyright 2018 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+
>+// ImageEGL.cpp: Implements the rx::ImageEGL class.
>+
>+#include "libANGLE/renderer/gl/egl/ImageEGL.h"
>+
>+#include "common/utilities.h"
>+#include "libANGLE/Context.h"
>+#include "libANGLE/renderer/gl/FunctionsGL.h"
>+#include "libANGLE/renderer/gl/RenderbufferGL.h"
>+#include "libANGLE/renderer/gl/StateManagerGL.h"
>+#include "libANGLE/renderer/gl/TextureGL.h"
>+#include "libANGLE/renderer/gl/egl/ContextEGL.h"
>+#include "libANGLE/renderer/gl/egl/ExternalImageSiblingEGL.h"
>+#include "libANGLE/renderer/gl/egl/FunctionsEGL.h"
>+
>+namespace rx
>+{
>+
>+ImageEGL::ImageEGL(const egl::ImageState &state,
>+                   const gl::Context *context,
>+                   EGLenum target,
>+                   const egl::AttributeMap &attribs,
>+                   const FunctionsEGL *egl)
>+    : ImageGL(state),
>+      mEGL(egl),
>+      mContext(EGL_NO_CONTEXT),
>+      mTarget(target),
>+      mPreserveImage(false),
>+      mImage(EGL_NO_IMAGE)
>+{
>+    if (context)
>+    {
>+        mContext = GetImplAs<ContextEGL>(context)->getContext();
>+    }
>+    mPreserveImage = attribs.get(EGL_IMAGE_PRESERVED, EGL_FALSE) == EGL_TRUE;
>+}
>+
>+ImageEGL::~ImageEGL()
>+{
>+    mEGL->destroyImageKHR(mImage);
>+}
>+
>+egl::Error ImageEGL::initialize(const egl::Display *display)
>+{
>+    EGLClientBuffer buffer = nullptr;
>+    std::vector<EGLint> attributes;
>+
>+    if (egl::IsTextureTarget(mTarget))
>+    {
>+        attributes.push_back(EGL_GL_TEXTURE_LEVEL);
>+        attributes.push_back(mState.imageIndex.getLevelIndex());
>+
>+        if (mState.imageIndex.has3DLayer())
>+        {
>+            attributes.push_back(EGL_GL_TEXTURE_ZOFFSET);
>+            attributes.push_back(mState.imageIndex.getLayerIndex());
>+        }
>+
>+        const TextureGL *textureGL = GetImplAs<TextureGL>(GetAs<gl::Texture>(mState.source));
>+        buffer                = gl_egl::GLObjectHandleToEGLClientBuffer(textureGL->getTextureID());
>+        mNativeInternalFormat = textureGL->getNativeInternalFormat(mState.imageIndex);
>+    }
>+    else if (egl::IsRenderbufferTarget(mTarget))
>+    {
>+        const RenderbufferGL *renderbufferGL =
>+            GetImplAs<RenderbufferGL>(GetAs<gl::Renderbuffer>(mState.source));
>+        buffer = gl_egl::GLObjectHandleToEGLClientBuffer(renderbufferGL->getRenderbufferID());
>+        mNativeInternalFormat = renderbufferGL->getNativeInternalFormat();
>+    }
>+    else if (egl::IsExternalImageTarget(mTarget))
>+    {
>+        const ExternalImageSiblingEGL *externalImageSibling =
>+            GetImplAs<ExternalImageSiblingEGL>(GetAs<egl::ExternalImageSibling>(mState.source));
>+        buffer                = externalImageSibling->getBuffer();
>+        mNativeInternalFormat = externalImageSibling->getFormat().info->sizedInternalFormat;
>+    }
>+    else
>+    {
>+        UNREACHABLE();
>+    }
>+
>+    attributes.push_back(EGL_IMAGE_PRESERVED);
>+    attributes.push_back(mPreserveImage ? EGL_TRUE : EGL_FALSE);
>+
>+    attributes.push_back(EGL_NONE);
>+
>+    mImage = mEGL->createImageKHR(mContext, mTarget, buffer, attributes.data());
>+    if (mImage == EGL_NO_IMAGE)
>+    {
>+        return egl::EglBadAlloc() << "eglCreateImage failed with " << egl::Error(mEGL->getError());
>+    }
>+
>+    return egl::NoError();
>+}
>+
>+angle::Result ImageEGL::orphan(const gl::Context *context, egl::ImageSibling *sibling)
>+{
>+    // Nothing to do, the native EGLImage will orphan automatically.
>+    return angle::Result::Continue;
>+}
>+
>+angle::Result ImageEGL::setTexture2D(const gl::Context *context,
>+                                     gl::TextureType type,
>+                                     TextureGL *texture,
>+                                     GLenum *outInternalFormat)
>+{
>+    const FunctionsGL *functionsGL = GetFunctionsGL(context);
>+    StateManagerGL *stateManager   = GetStateManagerGL(context);
>+
>+    // Make sure this texture is bound
>+    stateManager->bindTexture(type, texture->getTextureID());
>+
>+    // Bind the image to the texture
>+    functionsGL->eGLImageTargetTexture2DOES(ToGLenum(type), mImage);
>+    *outInternalFormat = mNativeInternalFormat;
>+
>+    return angle::Result::Continue;
>+}
>+
>+angle::Result ImageEGL::setRenderbufferStorage(const gl::Context *context,
>+                                               RenderbufferGL *renderbuffer,
>+                                               GLenum *outInternalFormat)
>+{
>+    const FunctionsGL *functionsGL = GetFunctionsGL(context);
>+    StateManagerGL *stateManager   = GetStateManagerGL(context);
>+
>+    // Make sure this renderbuffer is bound
>+    stateManager->bindRenderbuffer(GL_RENDERBUFFER, renderbuffer->getRenderbufferID());
>+
>+    // Bind the image to the renderbuffer
>+    functionsGL->eGLImageTargetRenderbufferStorageOES(GL_RENDERBUFFER, mImage);
>+    *outInternalFormat = mNativeInternalFormat;
>+
>+    return angle::Result::Continue;
>+}
>+
>+}  // namespace rx
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/egl/ImageEGL.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/egl/ImageEGL.h
>new file mode 100644
>index 00000000000..ef90603e149
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/egl/ImageEGL.h
>@@ -0,0 +1,61 @@
>+//
>+// Copyright 2018 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+
>+// ImageEGL.h: Defines the rx::ImageEGL class, the EGL implementation of EGL images
>+
>+#ifndef LIBANGLE_RENDERER_GL_EGL_IMAGEEGL_H_
>+#define LIBANGLE_RENDERER_GL_EGL_IMAGEEGL_H_
>+
>+#include "libANGLE/renderer/gl/ImageGL.h"
>+
>+namespace egl
>+{
>+class AttributeMap;
>+}
>+
>+namespace rx
>+{
>+
>+class FunctionsEGL;
>+
>+class ImageEGL final : public ImageGL
>+{
>+  public:
>+    ImageEGL(const egl::ImageState &state,
>+             const gl::Context *context,
>+             EGLenum target,
>+             const egl::AttributeMap &attribs,
>+             const FunctionsEGL *egl);
>+    ~ImageEGL() override;
>+
>+    egl::Error initialize(const egl::Display *display) override;
>+
>+    angle::Result orphan(const gl::Context *context, egl::ImageSibling *sibling) override;
>+
>+    angle::Result setTexture2D(const gl::Context *context,
>+                               gl::TextureType type,
>+                               TextureGL *texture,
>+                               GLenum *outInternalFormat) override;
>+    angle::Result setRenderbufferStorage(const gl::Context *context,
>+                                         RenderbufferGL *renderbuffer,
>+                                         GLenum *outInternalFormat) override;
>+
>+  private:
>+    const FunctionsEGL *mEGL;
>+
>+    // State needed for initialization
>+    EGLContext mContext;
>+    EGLenum mTarget;
>+    bool mPreserveImage;
>+
>+    GLenum mNativeInternalFormat;
>+
>+    EGLImage mImage;
>+};
>+
>+}  // namespace rx
>+
>+#endif  // LIBANGLE_RENDERER_GL_EGL_IMAGEEGL_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/egl/PbufferSurfaceEGL.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/egl/PbufferSurfaceEGL.cpp
>index 39d7d9ae484..704fd2e275c 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/egl/PbufferSurfaceEGL.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/egl/PbufferSurfaceEGL.cpp
>@@ -16,15 +16,11 @@ namespace rx
> 
> PbufferSurfaceEGL::PbufferSurfaceEGL(const egl::SurfaceState &state,
>                                      const FunctionsEGL *egl,
>-                                     EGLConfig config,
>-                                     RendererGL *renderer)
>-    : SurfaceEGL(state, egl, config, renderer)
>-{
>-}
>+                                     EGLConfig config)
>+    : SurfaceEGL(state, egl, config)
>+{}
> 
>-PbufferSurfaceEGL::~PbufferSurfaceEGL()
>-{
>-}
>+PbufferSurfaceEGL::~PbufferSurfaceEGL() {}
> 
> egl::Error PbufferSurfaceEGL::initialize(const egl::Display *display)
> {
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/egl/PbufferSurfaceEGL.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/egl/PbufferSurfaceEGL.h
>index c5b11c98308..fdff5c58b05 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/egl/PbufferSurfaceEGL.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/egl/PbufferSurfaceEGL.h
>@@ -9,8 +9,8 @@
> #ifndef LIBANGLE_RENDERER_GL_EGL_PBUFFERSURFACEEGL_H_
> #define LIBANGLE_RENDERER_GL_EGL_PBUFFERSURFACEEGL_H_
> 
>-#include <vector>
> #include <EGL/egl.h>
>+#include <vector>
> 
> #include "libANGLE/renderer/gl/egl/SurfaceEGL.h"
> 
>@@ -20,10 +20,7 @@ namespace rx
> class PbufferSurfaceEGL : public SurfaceEGL
> {
>   public:
>-    PbufferSurfaceEGL(const egl::SurfaceState &state,
>-                      const FunctionsEGL *egl,
>-                      EGLConfig config,
>-                      RendererGL *renderer);
>+    PbufferSurfaceEGL(const egl::SurfaceState &state, const FunctionsEGL *egl, EGLConfig config);
>     ~PbufferSurfaceEGL() override;
> 
>     egl::Error initialize(const egl::Display *display) override;
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/egl/RendererEGL.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/egl/RendererEGL.cpp
>new file mode 100644
>index 00000000000..11cc0214e79
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/egl/RendererEGL.cpp
>@@ -0,0 +1,41 @@
>+//
>+// Copyright 2018 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+
>+#include "libANGLE/renderer/gl/egl/RendererEGL.h"
>+
>+#include "libANGLE/renderer/gl/egl/DisplayEGL.h"
>+
>+namespace rx
>+{
>+
>+RendererEGL::RendererEGL(std::unique_ptr<FunctionsGL> functionsGL,
>+                         const egl::AttributeMap &attribMap,
>+                         DisplayEGL *display,
>+                         EGLContext context,
>+                         const native_egl::AttributeVector attribs)
>+    : RendererGL(std::move(functionsGL), attribMap),
>+      mDisplay(display),
>+      mContext(context),
>+      mAttribs(attribs)
>+{}
>+
>+RendererEGL::~RendererEGL()
>+{
>+    mDisplay->destroyNativeContext(mContext);
>+    mContext = nullptr;
>+}
>+
>+EGLContext RendererEGL::getContext() const
>+{
>+    return mContext;
>+}
>+
>+WorkerContext *RendererEGL::createWorkerContext(std::string *infoLog)
>+{
>+    return mDisplay->createWorkerContext(infoLog, mContext, mAttribs);
>+}
>+
>+}  // namespace rx
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/egl/RendererEGL.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/egl/RendererEGL.h
>new file mode 100644
>index 00000000000..e1af5e03878
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/egl/RendererEGL.h
>@@ -0,0 +1,40 @@
>+//
>+// Copyright 2018 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+
>+// RendererEGL.h: Renderer class for GL on Android/ChromeOS.  Owns an EGL context object.
>+
>+#ifndef LIBANGLE_RENDERER_GL_EGL_RENDEREREGL_H_
>+#define LIBANGLE_RENDERER_GL_EGL_RENDEREREGL_H_
>+
>+#include "libANGLE/renderer/gl/RendererGL.h"
>+#include "libANGLE/renderer/gl/egl/egl_utils.h"
>+
>+namespace rx
>+{
>+class DisplayEGL;
>+
>+class RendererEGL : public RendererGL
>+{
>+  public:
>+    RendererEGL(std::unique_ptr<FunctionsGL> functionsGL,
>+                const egl::AttributeMap &attribMap,
>+                DisplayEGL *display,
>+                EGLContext context,
>+                const native_egl::AttributeVector attribs);
>+    ~RendererEGL() override;
>+
>+    EGLContext getContext() const;
>+
>+    WorkerContext *createWorkerContext(std::string *infoLog) override;
>+
>+  private:
>+    DisplayEGL *mDisplay;
>+    EGLContext mContext;
>+    const native_egl::AttributeVector mAttribs;
>+};
>+}  // namespace rx
>+
>+#endif  // LIBANGLE_RENDERER_GL_EGL_RENDEREREGL_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/egl/SurfaceEGL.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/egl/SurfaceEGL.cpp
>index c6a7ab4c224..954b6836339 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/egl/SurfaceEGL.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/egl/SurfaceEGL.cpp
>@@ -13,16 +13,13 @@
> namespace rx
> {
> 
>-SurfaceEGL::SurfaceEGL(const egl::SurfaceState &state,
>-                       const FunctionsEGL *egl,
>-                       EGLConfig config,
>-                       RendererGL *renderer)
>-    : SurfaceGL(state, renderer),
>+SurfaceEGL::SurfaceEGL(const egl::SurfaceState &state, const FunctionsEGL *egl, EGLConfig config)
>+    : SurfaceGL(state),
>       mEGL(egl),
>       mConfig(config),
>-      mSurface(EGL_NO_SURFACE)
>-{
>-}
>+      mSurface(EGL_NO_SURFACE),
>+      mHasSwapBuffersWithDamage(mEGL->hasExtension("EGL_KHR_swap_buffers_with_damage"))
>+{}
> 
> SurfaceEGL::~SurfaceEGL()
> {
>@@ -33,7 +30,7 @@ SurfaceEGL::~SurfaceEGL()
>     }
> }
> 
>-egl::Error SurfaceEGL::makeCurrent()
>+egl::Error SurfaceEGL::makeCurrent(const gl::Context *context)
> {
>     // Handling of makeCurrent is done in DisplayEGL
>     return egl::NoError();
>@@ -49,6 +46,24 @@ egl::Error SurfaceEGL::swap(const gl::Context *context)
>     return egl::NoError();
> }
> 
>+egl::Error SurfaceEGL::swapWithDamage(const gl::Context *context, EGLint *rects, EGLint n_rects)
>+{
>+    EGLBoolean success;
>+    if (mHasSwapBuffersWithDamage)
>+    {
>+        success = mEGL->swapBuffersWithDamageKHR(mSurface, rects, n_rects);
>+    }
>+    else
>+    {
>+        success = mEGL->swapBuffers(mSurface);
>+    }
>+    if (success == EGL_FALSE)
>+    {
>+        return egl::Error(mEGL->getError(), "eglSwapBuffersWithDamageKHR failed");
>+    }
>+    return egl::NoError();
>+}
>+
> egl::Error SurfaceEGL::postSubBuffer(const gl::Context *context,
>                                      EGLint x,
>                                      EGLint y,
>@@ -59,13 +74,23 @@ egl::Error SurfaceEGL::postSubBuffer(const gl::Context *context,
>     return egl::EglBadSurface();
> }
> 
>+egl::Error SurfaceEGL::setPresentationTime(EGLnsecsANDROID time)
>+{
>+    EGLBoolean success = mEGL->presentationTimeANDROID(mSurface, time);
>+    if (success == EGL_FALSE)
>+    {
>+        return egl::Error(mEGL->getError(), "eglPresentationTimeANDROID failed");
>+    }
>+    return egl::NoError();
>+}
>+
> egl::Error SurfaceEGL::querySurfacePointerANGLE(EGLint attribute, void **value)
> {
>     UNIMPLEMENTED();
>     return egl::EglBadSurface();
> }
> 
>-egl::Error SurfaceEGL::bindTexImage(gl::Texture *texture, EGLint buffer)
>+egl::Error SurfaceEGL::bindTexImage(const gl::Context *context, gl::Texture *texture, EGLint buffer)
> {
>     EGLBoolean success = mEGL->bindTexImage(mSurface, buffer);
>     if (success == EGL_FALSE)
>@@ -75,7 +100,7 @@ egl::Error SurfaceEGL::bindTexImage(gl::Texture *texture, EGLint buffer)
>     return egl::NoError();
> }
> 
>-egl::Error SurfaceEGL::releaseTexImage(EGLint buffer)
>+egl::Error SurfaceEGL::releaseTexImage(const gl::Context *context, EGLint buffer)
> {
>     EGLBoolean success = mEGL->releaseTexImage(mSurface, buffer);
>     if (success == EGL_FALSE)
>@@ -130,4 +155,84 @@ EGLSurface SurfaceEGL::getSurface() const
>     return mSurface;
> }
> 
>+void SurfaceEGL::setTimestampsEnabled(bool enabled)
>+{
>+    ASSERT(mEGL->hasExtension("EGL_ANDROID_get_frame_timestamps"));
>+
>+    EGLBoolean success =
>+        mEGL->surfaceAttrib(mSurface, EGL_TIMESTAMPS_ANDROID, enabled ? EGL_TRUE : EGL_FALSE);
>+    if (success == EGL_FALSE)
>+    {
>+        ERR() << "eglSurfaceAttribute failed: " << egl::Error(mEGL->getError());
>+    }
>+}
>+
>+egl::SupportedCompositorTimings SurfaceEGL::getSupportedCompositorTimings() const
>+{
>+    ASSERT(mEGL->hasExtension("EGL_ANDROID_get_frame_timestamps"));
>+
>+    egl::SupportedCompositorTimings result;
>+    for (egl::CompositorTiming name : angle::AllEnums<egl::CompositorTiming>())
>+    {
>+        result[name] = mEGL->getCompositorTimingSupportedANDROID(mSurface, egl::ToEGLenum(name));
>+    }
>+    return result;
>+}
>+
>+egl::Error SurfaceEGL::getCompositorTiming(EGLint numTimestamps,
>+                                           const EGLint *names,
>+                                           EGLnsecsANDROID *values) const
>+{
>+    ASSERT(mEGL->hasExtension("EGL_ANDROID_get_frame_timestamps"));
>+
>+    EGLBoolean success = mEGL->getCompositorTimingANDROID(mSurface, numTimestamps, names, values);
>+    if (success == EGL_FALSE)
>+    {
>+        return egl::Error(mEGL->getError(), "eglGetCompositorTimingANDROID failed");
>+    }
>+    return egl::NoError();
>+}
>+
>+egl::Error SurfaceEGL::getNextFrameId(EGLuint64KHR *frameId) const
>+{
>+    ASSERT(mEGL->hasExtension("EGL_ANDROID_get_frame_timestamps"));
>+
>+    EGLBoolean success = mEGL->getNextFrameIdANDROID(mSurface, frameId);
>+    if (success == EGL_FALSE)
>+    {
>+        return egl::Error(mEGL->getError(), "eglGetNextFrameId failed");
>+    }
>+    return egl::NoError();
>+}
>+
>+egl::SupportedTimestamps SurfaceEGL::getSupportedTimestamps() const
>+{
>+    ASSERT(mEGL->hasExtension("EGL_ANDROID_get_frame_timestamps"));
>+
>+    egl::SupportedTimestamps result;
>+    for (egl::Timestamp timestamp : angle::AllEnums<egl::Timestamp>())
>+    {
>+        result[timestamp] =
>+            mEGL->getFrameTimestampSupportedANDROID(mSurface, egl::ToEGLenum(timestamp));
>+    }
>+    return result;
>+}
>+
>+egl::Error SurfaceEGL::getFrameTimestamps(EGLuint64KHR frameId,
>+                                          EGLint numTimestamps,
>+                                          const EGLint *timestamps,
>+                                          EGLnsecsANDROID *values) const
>+{
>+    ASSERT(mEGL->hasExtension("EGL_ANDROID_get_frame_timestamps"));
>+
>+    // The driver may return EGL_BAD_ACCESS at any time if the requested frame is no longer stored.
>+    EGLBoolean success =
>+        mEGL->getFrameTimestampsANDROID(mSurface, frameId, numTimestamps, timestamps, values);
>+    if (success == EGL_FALSE)
>+    {
>+        return egl::Error(mEGL->getError(), "eglGetFrameTimestampsANDROID failed");
>+    }
>+    return egl::NoError();
>+}
>+
> }  // namespace rx
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/egl/SurfaceEGL.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/egl/SurfaceEGL.h
>index 19c1ad65b28..94a252138aa 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/egl/SurfaceEGL.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/egl/SurfaceEGL.h
>@@ -20,34 +20,50 @@ namespace rx
> class SurfaceEGL : public SurfaceGL
> {
>   public:
>-    SurfaceEGL(const egl::SurfaceState &state,
>-               const FunctionsEGL *egl,
>-               EGLConfig config,
>-               RendererGL *renderer);
>+    SurfaceEGL(const egl::SurfaceState &state, const FunctionsEGL *egl, EGLConfig config);
>     ~SurfaceEGL() override;
> 
>-    egl::Error makeCurrent() override;
>+    egl::Error makeCurrent(const gl::Context *context) override;
>     egl::Error swap(const gl::Context *context) override;
>+    egl::Error swapWithDamage(const gl::Context *context, EGLint *rects, EGLint n_rects) override;
>     egl::Error postSubBuffer(const gl::Context *context,
>                              EGLint x,
>                              EGLint y,
>                              EGLint width,
>                              EGLint height) override;
>+    egl::Error setPresentationTime(EGLnsecsANDROID time) override;
>     egl::Error querySurfacePointerANGLE(EGLint attribute, void **value) override;
>-    egl::Error bindTexImage(gl::Texture *texture, EGLint buffer) override;
>-    egl::Error releaseTexImage(EGLint buffer) override;
>+    egl::Error bindTexImage(const gl::Context *context,
>+                            gl::Texture *texture,
>+                            EGLint buffer) override;
>+    egl::Error releaseTexImage(const gl::Context *context, EGLint buffer) override;
>     void setSwapInterval(EGLint interval) override;
>     EGLint getWidth() const override;
>     EGLint getHeight() const override;
>     EGLint isPostSubBufferSupported() const override;
>     EGLint getSwapBehavior() const override;
> 
>+    void setTimestampsEnabled(bool enabled) override;
>+    egl::SupportedCompositorTimings getSupportedCompositorTimings() const override;
>+    egl::Error getCompositorTiming(EGLint numTimestamps,
>+                                   const EGLint *names,
>+                                   EGLnsecsANDROID *values) const override;
>+    egl::Error getNextFrameId(EGLuint64KHR *frameId) const override;
>+    egl::SupportedTimestamps getSupportedTimestamps() const override;
>+    egl::Error getFrameTimestamps(EGLuint64KHR frameId,
>+                                  EGLint numTimestamps,
>+                                  const EGLint *timestamps,
>+                                  EGLnsecsANDROID *values) const override;
>+
>     EGLSurface getSurface() const;
> 
>   protected:
>     const FunctionsEGL *mEGL;
>     EGLConfig mConfig;
>     EGLSurface mSurface;
>+
>+  private:
>+    bool mHasSwapBuffersWithDamage;
> };
> 
> }  // namespace rx
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/egl/SyncEGL.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/egl/SyncEGL.cpp
>new file mode 100644
>index 00000000000..ed8dbbfaeac
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/egl/SyncEGL.cpp
>@@ -0,0 +1,93 @@
>+//
>+// Copyright 2019 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+
>+// SyncEGL.cpp: Implements the rx::SyncEGL class.
>+
>+#include "libANGLE/renderer/gl/egl/SyncEGL.h"
>+
>+#include "libANGLE/AttributeMap.h"
>+#include "libANGLE/Display.h"
>+#include "libANGLE/renderer/gl/egl/FunctionsEGL.h"
>+
>+namespace rx
>+{
>+
>+SyncEGL::SyncEGL(const egl::AttributeMap &attribs, const FunctionsEGL *egl)
>+    : mEGL(egl), mSync(EGL_NO_SYNC_KHR)
>+{}
>+
>+SyncEGL::~SyncEGL()
>+{
>+    ASSERT(mSync == EGL_NO_SYNC_KHR);
>+}
>+
>+void SyncEGL::onDestroy(const egl::Display *display)
>+{
>+    ASSERT(mSync != EGL_NO_SYNC_KHR);
>+    mEGL->destroySyncKHR(mSync);
>+    mSync = EGL_NO_SYNC_KHR;
>+}
>+
>+egl::Error SyncEGL::initialize(const egl::Display *display,
>+                               const gl::Context *context,
>+                               EGLenum type)
>+{
>+    ASSERT(type == EGL_SYNC_FENCE_KHR);
>+    mSync = mEGL->createSyncKHR(type, nullptr);
>+    if (mSync == EGL_NO_SYNC_KHR)
>+    {
>+        return egl::Error(mEGL->getError(), "eglCreateSync failed to create sync object");
>+    }
>+    return egl::NoError();
>+}
>+
>+egl::Error SyncEGL::clientWait(const egl::Display *display,
>+                               const gl::Context *context,
>+                               EGLint flags,
>+                               EGLTime timeout,
>+                               EGLint *outResult)
>+{
>+    ASSERT(mSync != EGL_NO_SYNC_KHR);
>+    EGLint result = mEGL->clientWaitSyncKHR(mSync, flags, timeout);
>+
>+    if (result == EGL_FALSE)
>+    {
>+        return egl::Error(mEGL->getError(), "eglClientWaitSync failed");
>+    }
>+
>+    *outResult = result;
>+    return egl::NoError();
>+}
>+
>+egl::Error SyncEGL::serverWait(const egl::Display *display,
>+                               const gl::Context *context,
>+                               EGLint flags)
>+{
>+    ASSERT(mSync != EGL_NO_SYNC_KHR);
>+    EGLint result = mEGL->waitSyncKHR(mSync, flags);
>+
>+    if (result == EGL_FALSE)
>+    {
>+        return egl::Error(mEGL->getError(), "eglWaitSync failed");
>+    }
>+
>+    return egl::NoError();
>+}
>+
>+egl::Error SyncEGL::getStatus(const egl::Display *display, EGLint *outStatus)
>+{
>+    ASSERT(mSync != EGL_NO_SYNC_KHR);
>+    EGLBoolean result = mEGL->getSyncAttribKHR(mSync, EGL_SYNC_STATUS_KHR, outStatus);
>+
>+    if (result == EGL_FALSE)
>+    {
>+        return egl::Error(mEGL->getError(), "eglGetSyncAttribKHR with EGL_SYNC_STATUS_KHR failed");
>+    }
>+
>+    return egl::NoError();
>+}
>+
>+}  // namespace rx
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/egl/SyncEGL.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/egl/SyncEGL.h
>new file mode 100644
>index 00000000000..824c5b572b2
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/egl/SyncEGL.h
>@@ -0,0 +1,53 @@
>+//
>+// Copyright 2019 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+
>+// SyncEGL.h: Defines the rx::SyncEGL class, the EGL implementation of EGL sync objects.
>+
>+#ifndef LIBANGLE_RENDERER_GL_EGL_SYNCEGL_H_
>+#define LIBANGLE_RENDERER_GL_EGL_SYNCEGL_H_
>+
>+#include "libANGLE/renderer/EGLSyncImpl.h"
>+
>+namespace egl
>+{
>+class AttributeMap;
>+}
>+
>+namespace rx
>+{
>+
>+class FunctionsEGL;
>+
>+class SyncEGL final : public EGLSyncImpl
>+{
>+  public:
>+    SyncEGL(const egl::AttributeMap &attribs, const FunctionsEGL *egl);
>+    ~SyncEGL() override;
>+
>+    void onDestroy(const egl::Display *display) override;
>+
>+    egl::Error initialize(const egl::Display *display,
>+                          const gl::Context *context,
>+                          EGLenum type) override;
>+    egl::Error clientWait(const egl::Display *display,
>+                          const gl::Context *context,
>+                          EGLint flags,
>+                          EGLTime timeout,
>+                          EGLint *outResult) override;
>+    egl::Error serverWait(const egl::Display *display,
>+                          const gl::Context *context,
>+                          EGLint flags) override;
>+    egl::Error getStatus(const egl::Display *display, EGLint *outStatus) override;
>+
>+  private:
>+    const FunctionsEGL *mEGL;
>+
>+    EGLSync mSync;
>+};
>+
>+}  // namespace rx
>+
>+#endif  // LIBANGLE_RENDERER_GL_EGL_IMAGEEGL_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/egl/WindowSurfaceEGL.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/egl/WindowSurfaceEGL.cpp
>index 21f2b3556cd..637abc77205 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/egl/WindowSurfaceEGL.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/egl/WindowSurfaceEGL.cpp
>@@ -17,20 +17,17 @@ namespace rx
> WindowSurfaceEGL::WindowSurfaceEGL(const egl::SurfaceState &state,
>                                    const FunctionsEGL *egl,
>                                    EGLConfig config,
>-                                   EGLNativeWindowType window,
>-                                   RendererGL *renderer)
>-    : SurfaceEGL(state, egl, config, renderer), mWindow(window)
>-{
>-}
>+                                   EGLNativeWindowType window)
>+    : SurfaceEGL(state, egl, config), mWindow(window)
>+{}
> 
>-WindowSurfaceEGL::~WindowSurfaceEGL()
>-{
>-}
>+WindowSurfaceEGL::~WindowSurfaceEGL() {}
> 
> egl::Error WindowSurfaceEGL::initialize(const egl::Display *display)
> {
>     constexpr EGLint kForwardedWindowSurfaceAttributes[] = {
>-        EGL_RENDER_BUFFER, EGL_POST_SUB_BUFFER_SUPPORTED_NV,
>+        EGL_RENDER_BUFFER,
>+        EGL_POST_SUB_BUFFER_SUPPORTED_NV,
>     };
> 
>     native_egl::AttributeVector nativeAttribs =
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/egl/WindowSurfaceEGL.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/egl/WindowSurfaceEGL.h
>index 969b62f8643..3abfb76976a 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/egl/WindowSurfaceEGL.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/egl/WindowSurfaceEGL.h
>@@ -20,8 +20,7 @@ class WindowSurfaceEGL : public SurfaceEGL
>     WindowSurfaceEGL(const egl::SurfaceState &state,
>                      const FunctionsEGL *egl,
>                      EGLConfig config,
>-                     EGLNativeWindowType window,
>-                     RendererGL *renderer);
>+                     EGLNativeWindowType window);
>     ~WindowSurfaceEGL() override;
> 
>     egl::Error initialize(const egl::Display *display) override;
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/egl/android/DisplayAndroid.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/egl/android/DisplayAndroid.cpp
>index 87e614b6963..4271386fb4a 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/egl/android/DisplayAndroid.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/egl/android/DisplayAndroid.cpp
>@@ -6,16 +6,24 @@
> 
> // DisplayAndroid.cpp: Android implementation of egl::Display
> 
>+#include "libANGLE/renderer/gl/egl/android/DisplayAndroid.h"
>+
>+#include <android/log.h>
> #include <android/native_window.h>
> 
> #include "common/debug.h"
>+#include "libANGLE/Context.h"
> #include "libANGLE/Display.h"
> #include "libANGLE/Surface.h"
>-#include "libANGLE/renderer/gl/renderergl_utils.h"
>-#include "libANGLE/renderer/gl/egl/android/DisplayAndroid.h"
>+#include "libANGLE/renderer/gl/ContextGL.h"
>+#include "libANGLE/renderer/gl/RendererGL.h"
>+#include "libANGLE/renderer/gl/egl/ContextEGL.h"
> #include "libANGLE/renderer/gl/egl/FunctionsEGLDL.h"
> #include "libANGLE/renderer/gl/egl/PbufferSurfaceEGL.h"
>+#include "libANGLE/renderer/gl/egl/RendererEGL.h"
> #include "libANGLE/renderer/gl/egl/WindowSurfaceEGL.h"
>+#include "libANGLE/renderer/gl/egl/android/NativeBufferImageSiblingAndroid.h"
>+#include "libANGLE/renderer/gl/renderergl_utils.h"
> 
> namespace
> {
>@@ -32,20 +40,28 @@ const char *GetEGLPath()
> namespace rx
> {
> 
>+static constexpr bool kDefaultEGLVirtualizedContexts = true;
>+
> DisplayAndroid::DisplayAndroid(const egl::DisplayState &state)
>-    : DisplayEGL(state), mDummyPbuffer(EGL_NO_SURFACE), mCurrentSurface(EGL_NO_SURFACE)
>-{
>-}
>+    : DisplayEGL(state),
>+      mVirtualizedContexts(kDefaultEGLVirtualizedContexts),
>+      mSupportsSurfaceless(false),
>+      mDummyPbuffer(EGL_NO_SURFACE)
>+{}
> 
>-DisplayAndroid::~DisplayAndroid()
>-{
>-}
>+DisplayAndroid::~DisplayAndroid() {}
> 
> egl::Error DisplayAndroid::initialize(egl::Display *display)
> {
>+    mDisplayAttributes = display->getAttributeMap();
>+    mVirtualizedContexts =
>+        ShouldUseVirtualizedContexts(mDisplayAttributes, kDefaultEGLVirtualizedContexts);
>+
>     FunctionsEGLDL *egl = new FunctionsEGLDL();
>-    mEGL = egl;
>-    ANGLE_TRY(egl->initialize(display->getNativeDisplayId(), GetEGLPath()));
>+    mEGL                = egl;
>+    void *eglHandle =
>+        reinterpret_cast<void *>(mDisplayAttributes.get(EGL_PLATFORM_ANGLE_EGL_HANDLE_ANGLE, 0));
>+    ANGLE_TRY(egl->initialize(display->getNativeDisplayId(), GetEGLPath(), eglHandle));
> 
>     gl::Version eglVersion(mEGL->majorVersion, mEGL->minorVersion);
>     ASSERT(eglVersion >= gl::Version(1, 4));
>@@ -56,70 +72,100 @@ egl::Error DisplayAndroid::initialize(egl::Display *display)
>                        : EGL_OPENGL_ES2_BIT;
> 
>     // clang-format off
>-    mConfigAttribList =
>+    std::vector<EGLint> configAttribListBase =
>     {
>-        // Choose RGBA8888
>         EGL_COLOR_BUFFER_TYPE, EGL_RGB_BUFFER,
>-        EGL_RED_SIZE, 8,
>-        EGL_GREEN_SIZE, 8,
>-        EGL_BLUE_SIZE, 8,
>-        EGL_ALPHA_SIZE, 8,
>-        // EGL1.5 spec Section 2.2 says that depth, multisample and stencil buffer depths
>-        // must match for contexts to be compatible.
>-        EGL_DEPTH_SIZE, 24,
>-        EGL_STENCIL_SIZE, 8,
>-        EGL_SAMPLE_BUFFERS, 0,
>         // Android doesn't support pixmaps
>         EGL_SURFACE_TYPE, EGL_WINDOW_BIT | EGL_PBUFFER_BIT,
>         EGL_CONFIG_CAVEAT, EGL_NONE,
>         EGL_CONFORMANT, esBit,
>         EGL_RENDERABLE_TYPE, esBit,
>     };
>+    // clang-format on
> 
>     if (mEGL->hasExtension("EGL_EXT_pixel_format_float"))
>     {
>         // Don't request floating point configs
>-        mConfigAttribList.push_back(EGL_COLOR_COMPONENT_TYPE_EXT);
>-        mConfigAttribList.push_back(EGL_COLOR_COMPONENT_TYPE_FIXED_EXT);
>+        configAttribListBase.push_back(EGL_COLOR_COMPONENT_TYPE_EXT);
>+        configAttribListBase.push_back(EGL_COLOR_COMPONENT_TYPE_FIXED_EXT);
>     }
> 
>-    // Complete the attrib list
>-    mConfigAttribList.push_back(EGL_NONE);
>+    std::vector<EGLint> configAttribListWithFormat = configAttribListBase;
>+    // EGL1.5 spec Section 2.2 says that depth, multisample and stencil buffer depths
>+    // must match for contexts to be compatible.
>+    // Choose RGBA8888
>+    configAttribListWithFormat.push_back(EGL_RED_SIZE);
>+    configAttribListWithFormat.push_back(8);
>+    configAttribListWithFormat.push_back(EGL_GREEN_SIZE);
>+    configAttribListWithFormat.push_back(8);
>+    configAttribListWithFormat.push_back(EGL_BLUE_SIZE);
>+    configAttribListWithFormat.push_back(8);
>+    configAttribListWithFormat.push_back(EGL_ALPHA_SIZE);
>+    configAttribListWithFormat.push_back(8);
>+    // Choose DEPTH24_STENCIL8
>+    configAttribListWithFormat.push_back(EGL_DEPTH_SIZE);
>+    configAttribListWithFormat.push_back(24);
>+    configAttribListWithFormat.push_back(EGL_STENCIL_SIZE);
>+    configAttribListWithFormat.push_back(8);
>+    // Choose no multisampling
>+    configAttribListWithFormat.push_back(EGL_SAMPLE_BUFFERS);
>+    configAttribListWithFormat.push_back(0);
>+
>+    // Complete the attrib lists
>+    configAttribListBase.push_back(EGL_NONE);
>+    configAttribListWithFormat.push_back(EGL_NONE);
> 
>-    // clang-format on
>     EGLint numConfig;
>+    EGLConfig configWithFormat;
> 
>-    EGLBoolean success = mEGL->chooseConfig(mConfigAttribList.data(), &mConfig, 1, &numConfig);
>+    EGLBoolean success =
>+        mEGL->chooseConfig(configAttribListWithFormat.data(), &configWithFormat, 1, &numConfig);
>     if (success == EGL_FALSE)
>     {
>         return egl::EglNotInitialized()
>                << "eglChooseConfig failed with " << egl::Error(mEGL->getError());
>     }
> 
>-    ANGLE_TRY(initializeContext(display->getAttributeMap()));
>+    // A dummy pbuffer is only needed if surfaceless contexts are not supported.
>+    mSupportsSurfaceless = mEGL->hasExtension("EGL_KHR_surfaceless_context");
>+    if (!mSupportsSurfaceless)
>+    {
>+        int dummyPbufferAttribs[] = {
>+            EGL_WIDTH, 1, EGL_HEIGHT, 1, EGL_NONE,
>+        };
>+        mDummyPbuffer = mEGL->createPbufferSurface(configWithFormat, dummyPbufferAttribs);
>+        if (mDummyPbuffer == EGL_NO_SURFACE)
>+        {
>+            return egl::EglNotInitialized()
>+                   << "eglCreatePbufferSurface failed with " << egl::Error(mEGL->getError());
>+        }
>+    }
> 
>-    int dummyPbufferAttribs[] = {
>-        EGL_WIDTH, 1, EGL_HEIGHT, 1, EGL_NONE,
>-    };
>-    mDummyPbuffer = mEGL->createPbufferSurface(mConfig, dummyPbufferAttribs);
>-    if (mDummyPbuffer == EGL_NO_SURFACE)
>+    // Create mDummyPbuffer with a normal config, but create a no_config mContext, if possible
>+    if (mEGL->hasExtension("EGL_KHR_no_config_context"))
>     {
>-        return egl::EglNotInitialized()
>-               << "eglCreatePbufferSurface failed with " << egl::Error(mEGL->getError());
>+        mConfigAttribList = configAttribListBase;
>+        mConfig           = EGL_NO_CONFIG_KHR;
>+    }
>+    else
>+    {
>+        mConfigAttribList = configAttribListWithFormat;
>+        mConfig           = configWithFormat;
>     }
> 
>-    success = mEGL->makeCurrent(mDummyPbuffer, mContext);
>-    if (success == EGL_FALSE)
>+    ANGLE_TRY(createRenderer(EGL_NO_CONTEXT, true, &mRenderer));
>+
>+    const gl::Version &maxVersion = mRenderer->getMaxSupportedESVersion();
>+    if (maxVersion < gl::Version(2, 0))
>     {
>-        return egl::EglNotInitialized()
>-               << "eglMakeCurrent failed with " << egl::Error(mEGL->getError());
>+        return egl::EglNotInitialized() << "OpenGL ES 2.0 is not supportable.";
>     }
>-    mCurrentSurface = mDummyPbuffer;
> 
>-    mFunctionsGL = mEGL->makeFunctionsGL();
>-    mFunctionsGL->initialize(display->getAttributeMap());
>+    ANGLE_TRY(DisplayGL::initialize(display));
> 
>-    return DisplayGL::initialize(display);
>+    std::string rendererDescription = mRenderer->getRendererDescription();
>+    __android_log_print(ANDROID_LOG_INFO, "ANGLE", "%s", rendererDescription.c_str());
>+    return egl::NoError();
> }
> 
> void DisplayAndroid::terminate()
>@@ -131,11 +177,10 @@ void DisplayAndroid::terminate()
>     {
>         ERR() << "eglMakeCurrent error " << egl::Error(mEGL->getError());
>     }
>-    mCurrentSurface = EGL_NO_SURFACE;
> 
>     if (mDummyPbuffer != EGL_NO_SURFACE)
>     {
>-        success = mEGL->destroySurface(mDummyPbuffer);
>+        success       = mEGL->destroySurface(mDummyPbuffer);
>         mDummyPbuffer = EGL_NO_SURFACE;
>         if (success == EGL_FALSE)
>         {
>@@ -143,15 +188,8 @@ void DisplayAndroid::terminate()
>         }
>     }
> 
>-    if (mContext != EGL_NO_CONTEXT)
>-    {
>-        success = mEGL->destroyContext(mContext);
>-        mContext = EGL_NO_CONTEXT;
>-        if (success == EGL_FALSE)
>-        {
>-            ERR() << "eglDestroyContext error " << egl::Error(mEGL->getError());
>-        }
>-    }
>+    mRenderer.reset();
>+    mCurrentNativeContext.clear();
> 
>     egl::Error result = mEGL->terminate();
>     if (result.isError())
>@@ -160,7 +198,6 @@ void DisplayAndroid::terminate()
>     }
> 
>     SafeDelete(mEGL);
>-    SafeDelete(mFunctionsGL);
> }
> 
> SurfaceImpl *DisplayAndroid::createWindowSurface(const egl::SurfaceState &state,
>@@ -172,10 +209,10 @@ SurfaceImpl *DisplayAndroid::createWindowSurface(const egl::SurfaceState &state,
>     EGLBoolean success;
> 
>     const EGLint configAttribList[] = {EGL_CONFIG_ID, mConfigIds[state.config->configID], EGL_NONE};
>-    success = mEGL->chooseConfig(configAttribList, &config, 1, &numConfig);
>+    success                         = mEGL->chooseConfig(configAttribList, &config, 1, &numConfig);
>     ASSERT(success && numConfig == 1);
> 
>-    return new WindowSurfaceEGL(state, mEGL, config, window, getRenderer());
>+    return new WindowSurfaceEGL(state, mEGL, config, window);
> }
> 
> SurfaceImpl *DisplayAndroid::createPbufferSurface(const egl::SurfaceState &state,
>@@ -186,10 +223,10 @@ SurfaceImpl *DisplayAndroid::createPbufferSurface(const egl::SurfaceState &state
>     EGLBoolean success;
> 
>     const EGLint configAttribList[] = {EGL_CONFIG_ID, mConfigIds[state.config->configID], EGL_NONE};
>-    success = mEGL->chooseConfig(configAttribList, &config, 1, &numConfig);
>+    success                         = mEGL->chooseConfig(configAttribList, &config, 1, &numConfig);
>     ASSERT(success && numConfig == 1);
> 
>-    return new PbufferSurfaceEGL(state, mEGL, config, getRenderer());
>+    return new PbufferSurfaceEGL(state, mEGL, config);
> }
> 
> SurfaceImpl *DisplayAndroid::createPbufferFromClientBuffer(const egl::SurfaceState &state,
>@@ -209,12 +246,38 @@ SurfaceImpl *DisplayAndroid::createPixmapSurface(const egl::SurfaceState &state,
>     return nullptr;
> }
> 
>-ImageImpl *DisplayAndroid::createImage(const egl::ImageState &state,
>-                                       EGLenum target,
>-                                       const egl::AttributeMap &attribs)
>+ContextImpl *DisplayAndroid::createContext(const gl::State &state,
>+                                           gl::ErrorSet *errorSet,
>+                                           const egl::Config *configuration,
>+                                           const gl::Context *shareContext,
>+                                           const egl::AttributeMap &attribs)
> {
>-    UNIMPLEMENTED();
>-    return DisplayGL::createImage(state, target, attribs);
>+    std::shared_ptr<RendererEGL> renderer;
>+    if (mVirtualizedContexts)
>+    {
>+        renderer = mRenderer;
>+    }
>+    else
>+    {
>+        EGLContext nativeShareContext = EGL_NO_CONTEXT;
>+        if (shareContext)
>+        {
>+            ContextEGL *shareContextEGL = GetImplAs<ContextEGL>(shareContext);
>+            nativeShareContext          = shareContextEGL->getContext();
>+        }
>+
>+        // Create a new renderer for this context.  It only needs to share with the user's requested
>+        // share context because there are no internal resources in DisplayAndroid that are shared
>+        // at the GL level.
>+        egl::Error error = createRenderer(nativeShareContext, false, &renderer);
>+        if (error.isError())
>+        {
>+            ERR() << "Failed to create a shared renderer: " << error.getMessage();
>+            return nullptr;
>+        }
>+    }
>+
>+    return new ContextEGL(state, errorSet, renderer);
> }
> 
> template <typename T>
>@@ -316,8 +379,20 @@ egl::ConfigSet DisplayAndroid::generateConfigs()
>             {
>                 config.renderTargetFormat = GL_RGB565;
>             }
>+            else if (config.redSize == 5 && config.greenSize == 5 && config.blueSize == 5 &&
>+                     config.alphaSize == 1)
>+            {
>+                config.renderTargetFormat = GL_RGB5_A1;
>+            }
>+            else if (config.redSize == 4 && config.greenSize == 4 && config.blueSize == 4 &&
>+                     config.alphaSize == 4)
>+            {
>+                config.renderTargetFormat = GL_RGBA4;
>+            }
>             else
>             {
>+                ERR() << "RGBA(" << config.redSize << "," << config.greenSize << ","
>+                      << config.blueSize << "," << config.alphaSize << ") not handled";
>                 UNREACHABLE();
>             }
>         }
>@@ -351,10 +426,10 @@ egl::ConfigSet DisplayAndroid::generateConfigs()
>             UNREACHABLE();
>         }
> 
>-        config.matchNativePixmap = EGL_NONE;
>+        config.matchNativePixmap  = EGL_NONE;
>         config.optimalOrientation = 0;
> 
>-        int internalId = configSet.add(config);
>+        int internalId         = configSet.add(config);
>         mConfigIds[internalId] = config.configID;
>     }
> 
>@@ -377,44 +452,144 @@ bool DisplayAndroid::isValidNativeWindow(EGLNativeWindowType window) const
>     return ANativeWindow_getFormat(window) >= 0;
> }
> 
>-egl::Error DisplayAndroid::getDevice(DeviceImpl **device)
>+egl::Error DisplayAndroid::validateImageClientBuffer(const gl::Context *context,
>+                                                     EGLenum target,
>+                                                     EGLClientBuffer clientBuffer,
>+                                                     const egl::AttributeMap &attribs) const
>+{
>+    switch (target)
>+    {
>+        case EGL_NATIVE_BUFFER_ANDROID:
>+            return egl::NoError();
>+
>+        default:
>+            return DisplayEGL::validateImageClientBuffer(context, target, clientBuffer, attribs);
>+    }
>+}
>+
>+ExternalImageSiblingImpl *DisplayAndroid::createExternalImageSibling(
>+    const gl::Context *context,
>+    EGLenum target,
>+    EGLClientBuffer buffer,
>+    const egl::AttributeMap &attribs)
>+{
>+    switch (target)
>+    {
>+        case EGL_NATIVE_BUFFER_ANDROID:
>+            return new NativeBufferImageSiblingAndroid(buffer);
>+
>+        default:
>+            return DisplayEGL::createExternalImageSibling(context, target, buffer, attribs);
>+    }
>+}
>+
>+DeviceImpl *DisplayAndroid::createDevice()
> {
>     UNIMPLEMENTED();
>-    return egl::NoError();
>+    return nullptr;
> }
> 
>-egl::Error DisplayAndroid::waitClient(const gl::Context *context) const
>+egl::Error DisplayAndroid::waitClient(const gl::Context *context)
> {
>     UNIMPLEMENTED();
>     return egl::NoError();
> }
> 
>-egl::Error DisplayAndroid::waitNative(const gl::Context *context, EGLint engine) const
>+egl::Error DisplayAndroid::waitNative(const gl::Context *context, EGLint engine)
> {
>     UNIMPLEMENTED();
>     return egl::NoError();
> }
>+
> egl::Error DisplayAndroid::makeCurrent(egl::Surface *drawSurface,
>                                        egl::Surface *readSurface,
>                                        gl::Context *context)
> {
>+    CurrentNativeContext &currentContext = mCurrentNativeContext[std::this_thread::get_id()];
>+
>+    EGLSurface newSurface = EGL_NO_SURFACE;
>     if (drawSurface)
>     {
>         SurfaceEGL *drawSurfaceEGL = GetImplAs<SurfaceEGL>(drawSurface);
>-        EGLSurface surface         = drawSurfaceEGL->getSurface();
>-        if (surface != mCurrentSurface)
>+        newSurface                 = drawSurfaceEGL->getSurface();
>+    }
>+
>+    EGLContext newContext = EGL_NO_CONTEXT;
>+    if (context)
>+    {
>+        ContextEGL *contextEGL = GetImplAs<ContextEGL>(context);
>+        newContext             = contextEGL->getContext();
>+    }
>+
>+    // The context should never change when context virtualization is being used, even when a null
>+    // context is being bound.
>+    if (mVirtualizedContexts)
>+    {
>+        ASSERT(newContext == EGL_NO_CONTEXT || currentContext.context == EGL_NO_CONTEXT ||
>+               newContext == currentContext.context);
>+
>+        newContext = mRenderer->getContext();
>+
>+        // If we know that we're only running on one thread (mVirtualizedContexts == true) and
>+        // EGL_NO_SURFACE is going to be bound, we can optimize this case by not changing the
>+        // surface binding and emulate the surfaceless extension in the frontend.
>+        if (newSurface == EGL_NO_SURFACE)
>         {
>-            if (mEGL->makeCurrent(surface, mContext) == EGL_FALSE)
>-            {
>-                return egl::Error(mEGL->getError(), "eglMakeCurrent failed");
>-            }
>-            mCurrentSurface = surface;
>+            newSurface = currentContext.surface;
>         }
>+
>+        // It's possible that no surface has been created yet and the driver doesn't support
>+        // surfaceless, bind the dummy pbuffer.
>+        if (newSurface == EGL_NO_SURFACE && !mSupportsSurfaceless)
>+        {
>+            newSurface = mDummyPbuffer;
>+            ASSERT(newSurface != EGL_NO_SURFACE);
>+        }
>+    }
>+
>+    if (newSurface != currentContext.surface || newContext != currentContext.context)
>+    {
>+        if (mEGL->makeCurrent(newSurface, newContext) == EGL_FALSE)
>+        {
>+            return egl::Error(mEGL->getError(), "eglMakeCurrent failed");
>+        }
>+        currentContext.surface = newSurface;
>+        currentContext.context = newContext;
>     }
> 
>     return DisplayGL::makeCurrent(drawSurface, readSurface, context);
> }
> 
>+gl::Version DisplayAndroid::getMaxSupportedESVersion() const
>+{
>+    return mRenderer->getMaxSupportedESVersion();
>+}
>+
>+void DisplayAndroid::destroyNativeContext(EGLContext context)
>+{
>+    mEGL->destroyContext(context);
>+
>+    // If this context is current, remove it from the tracking of current contexts to make sure we
>+    // don't try to make it current again.
>+    for (auto &currentContext : mCurrentNativeContext)
>+    {
>+        if (currentContext.second.context == context)
>+        {
>+            currentContext.second.surface = EGL_NO_SURFACE;
>+            currentContext.second.context = EGL_NO_CONTEXT;
>+        }
>+    }
>+}
>+
>+void DisplayAndroid::generateExtensions(egl::DisplayExtensions *outExtensions) const
>+{
>+    // Surfaceless can be support if the native driver supports it or we know that we are running on
>+    // a single thread (mVirtualizedContexts == true)
>+    outExtensions->surfacelessContext = mSupportsSurfaceless || mVirtualizedContexts;
>+
>+    DisplayEGL::generateExtensions(outExtensions);
>+}
>+
> egl::Error DisplayAndroid::makeCurrentSurfaceless(gl::Context *context)
> {
>     // Nothing to do because EGL always uses the same context and the previous surface can be left
>@@ -422,4 +597,97 @@ egl::Error DisplayAndroid::makeCurrentSurfaceless(gl::Context *context)
>     return egl::NoError();
> }
> 
>+egl::Error DisplayAndroid::createRenderer(EGLContext shareContext,
>+                                          bool makeNewContextCurrent,
>+                                          std::shared_ptr<RendererEGL> *outRenderer)
>+{
>+    EGLContext context = EGL_NO_CONTEXT;
>+    native_egl::AttributeVector attribs;
>+    ANGLE_TRY(initializeContext(shareContext, mDisplayAttributes, &context, &attribs));
>+
>+    if (mEGL->makeCurrent(mDummyPbuffer, context) == EGL_FALSE)
>+    {
>+        return egl::EglNotInitialized()
>+               << "eglMakeCurrent failed with " << egl::Error(mEGL->getError());
>+    }
>+
>+    std::unique_ptr<FunctionsGL> functionsGL(mEGL->makeFunctionsGL());
>+    functionsGL->initialize(mDisplayAttributes);
>+
>+    outRenderer->reset(
>+        new RendererEGL(std::move(functionsGL), mDisplayAttributes, this, context, attribs));
>+
>+    CurrentNativeContext &currentContext = mCurrentNativeContext[std::this_thread::get_id()];
>+    if (makeNewContextCurrent)
>+    {
>+        currentContext.surface = mDummyPbuffer;
>+        currentContext.context = context;
>+    }
>+    else
>+    {
>+        // Reset the current context back to the previous state
>+        if (mEGL->makeCurrent(currentContext.surface, currentContext.context) == EGL_FALSE)
>+        {
>+            return egl::EglNotInitialized()
>+                   << "eglMakeCurrent failed with " << egl::Error(mEGL->getError());
>+        }
>+    }
>+
>+    return egl::NoError();
>+}
>+
>+class WorkerContextAndroid final : public WorkerContext
>+{
>+  public:
>+    WorkerContextAndroid(EGLContext context, FunctionsEGL *functions, EGLSurface pbuffer);
>+    ~WorkerContextAndroid() override;
>+
>+    bool makeCurrent() override;
>+    void unmakeCurrent() override;
>+
>+  private:
>+    EGLContext mContext;
>+    FunctionsEGL *mFunctions;
>+    EGLSurface mPbuffer;
>+};
>+
>+WorkerContextAndroid::WorkerContextAndroid(EGLContext context,
>+                                           FunctionsEGL *functions,
>+                                           EGLSurface pbuffer)
>+    : mContext(context), mFunctions(functions), mPbuffer(pbuffer)
>+{}
>+
>+WorkerContextAndroid::~WorkerContextAndroid()
>+{
>+    mFunctions->destroyContext(mContext);
>+}
>+
>+bool WorkerContextAndroid::makeCurrent()
>+{
>+    if (mFunctions->makeCurrent(mPbuffer, mContext) == EGL_FALSE)
>+    {
>+        ERR() << "Unable to make the EGL context current.";
>+        return false;
>+    }
>+    return true;
>+}
>+
>+void WorkerContextAndroid::unmakeCurrent()
>+{
>+    mFunctions->makeCurrent(EGL_NO_SURFACE, EGL_NO_CONTEXT);
>+}
>+
>+WorkerContext *DisplayAndroid::createWorkerContext(std::string *infoLog,
>+                                                   EGLContext sharedContext,
>+                                                   const native_egl::AttributeVector workerAttribs)
>+{
>+    EGLContext context = mEGL->createContext(mConfig, sharedContext, workerAttribs.data());
>+    if (context == EGL_NO_CONTEXT)
>+    {
>+        *infoLog += "Unable to create the EGL context.";
>+        return nullptr;
>+    }
>+    return new WorkerContextAndroid(context, mEGL, mDummyPbuffer);
>+}
>+
> }  // namespace rx
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/egl/android/DisplayAndroid.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/egl/android/DisplayAndroid.h
>index c55e4e801fc..028327d1b6b 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/egl/android/DisplayAndroid.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/egl/android/DisplayAndroid.h
>@@ -11,6 +11,7 @@
> 
> #include <map>
> #include <string>
>+#include <thread>
> #include <vector>
> 
> #include "libANGLE/renderer/gl/egl/DisplayEGL.h"
>@@ -18,6 +19,8 @@
> namespace rx
> {
> 
>+class RendererEGL;
>+
> class DisplayAndroid : public DisplayEGL
> {
>   public:
>@@ -40,9 +43,11 @@ class DisplayAndroid : public DisplayEGL
>                                      NativePixmapType nativePixmap,
>                                      const egl::AttributeMap &attribs) override;
> 
>-    ImageImpl *createImage(const egl::ImageState &state,
>-                           EGLenum target,
>-                           const egl::AttributeMap &attribs) override;
>+    ContextImpl *createContext(const gl::State &state,
>+                               gl::ErrorSet *errorSet,
>+                               const egl::Config *configuration,
>+                               const gl::Context *shareContext,
>+                               const egl::AttributeMap &attribs) override;
> 
>     egl::ConfigSet generateConfigs() override;
> 
>@@ -50,17 +55,40 @@ class DisplayAndroid : public DisplayEGL
>     egl::Error restoreLostDevice(const egl::Display *display) override;
> 
>     bool isValidNativeWindow(EGLNativeWindowType window) const override;
>+    egl::Error validateImageClientBuffer(const gl::Context *context,
>+                                         EGLenum target,
>+                                         EGLClientBuffer clientBuffer,
>+                                         const egl::AttributeMap &attribs) const override;
>+
>+    ExternalImageSiblingImpl *createExternalImageSibling(const gl::Context *context,
>+                                                         EGLenum target,
>+                                                         EGLClientBuffer buffer,
>+                                                         const egl::AttributeMap &attribs) override;
> 
>-    egl::Error getDevice(DeviceImpl **device) override;
>+    DeviceImpl *createDevice() override;
> 
>-    egl::Error waitClient(const gl::Context *context) const override;
>-    egl::Error waitNative(const gl::Context *context, EGLint engine) const override;
>+    egl::Error waitClient(const gl::Context *context) override;
>+    egl::Error waitNative(const gl::Context *context, EGLint engine) override;
> 
>     egl::Error makeCurrent(egl::Surface *drawSurface,
>                            egl::Surface *readSurface,
>                            gl::Context *context) override;
> 
>+    gl::Version getMaxSupportedESVersion() const override;
>+
>+    void destroyNativeContext(EGLContext context) override;
>+
>+    WorkerContext *createWorkerContext(std::string *infoLog,
>+                                       EGLContext sharedContext,
>+                                       const native_egl::AttributeVector workerAttribs) override;
>+
>   private:
>+    void generateExtensions(egl::DisplayExtensions *outExtensions) const override;
>+
>+    egl::Error createRenderer(EGLContext shareContext,
>+                              bool makeNewContextCurrent,
>+                              std::shared_ptr<RendererEGL> *outRenderer);
>+
>     egl::Error makeCurrentSurfaceless(gl::Context *context) override;
> 
>     template <typename T>
>@@ -73,10 +101,23 @@ class DisplayAndroid : public DisplayEGL
>                                     const char *extension,
>                                     const U &defaultValue) const;
> 
>+    bool mVirtualizedContexts;
>+    std::shared_ptr<RendererEGL> mRenderer;
>+
>+    egl::AttributeMap mDisplayAttributes;
>+
>+    bool mSupportsSurfaceless;
>+
>     std::vector<EGLint> mConfigAttribList;
>     std::map<EGLint, EGLint> mConfigIds;
>     EGLSurface mDummyPbuffer;
>-    EGLSurface mCurrentSurface;
>+
>+    struct CurrentNativeContext
>+    {
>+        EGLSurface surface = EGL_NO_SURFACE;
>+        EGLContext context = EGL_NO_CONTEXT;
>+    };
>+    std::unordered_map<std::thread::id, CurrentNativeContext> mCurrentNativeContext;
> };
> 
> }  // namespace rx
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/egl/android/NativeBufferImageSiblingAndroid.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/egl/android/NativeBufferImageSiblingAndroid.cpp
>new file mode 100644
>index 00000000000..a42b5eef33a
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/egl/android/NativeBufferImageSiblingAndroid.cpp
>@@ -0,0 +1,62 @@
>+//
>+// Copyright 2018 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+
>+// NativeBufferImageSiblingAndroid.cpp: Implements the NativeBufferImageSiblingAndroid class
>+
>+#include "libANGLE/renderer/gl/egl/android/NativeBufferImageSiblingAndroid.h"
>+
>+#include "common/android_util.h"
>+
>+namespace rx
>+{
>+NativeBufferImageSiblingAndroid::NativeBufferImageSiblingAndroid(EGLClientBuffer buffer)
>+    : mBuffer(buffer), mFormat(GL_NONE)
>+{}
>+
>+NativeBufferImageSiblingAndroid::~NativeBufferImageSiblingAndroid() {}
>+
>+egl::Error NativeBufferImageSiblingAndroid::initialize(const egl::Display *display)
>+{
>+    int pixelFormat = 0;
>+    angle::android::GetANativeWindowBufferProperties(
>+        angle::android::ClientBufferToANativeWindowBuffer(mBuffer), &mSize.width, &mSize.height,
>+        &mSize.depth, &pixelFormat);
>+    mFormat = gl::Format(angle::android::NativePixelFormatToGLInternalFormat(pixelFormat));
>+
>+    return egl::NoError();
>+}
>+
>+gl::Format NativeBufferImageSiblingAndroid::getFormat() const
>+{
>+    return mFormat;
>+}
>+
>+bool NativeBufferImageSiblingAndroid::isRenderable(const gl::Context *context) const
>+{
>+    return true;
>+}
>+
>+bool NativeBufferImageSiblingAndroid::isTexturable(const gl::Context *context) const
>+{
>+    return true;
>+}
>+
>+gl::Extents NativeBufferImageSiblingAndroid::getSize() const
>+{
>+    return mSize;
>+}
>+
>+size_t NativeBufferImageSiblingAndroid::getSamples() const
>+{
>+    return 0;
>+}
>+
>+EGLClientBuffer NativeBufferImageSiblingAndroid::getBuffer() const
>+{
>+    return mBuffer;
>+}
>+
>+}  // namespace rx
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/egl/android/NativeBufferImageSiblingAndroid.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/egl/android/NativeBufferImageSiblingAndroid.h
>new file mode 100644
>index 00000000000..764a4886659
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/egl/android/NativeBufferImageSiblingAndroid.h
>@@ -0,0 +1,44 @@
>+//
>+// Copyright 2018 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+
>+// NativeBufferImageSiblingAndroid.h: Defines the NativeBufferImageSiblingAndroid to wrap EGL images
>+// created from ANativeWindowBuffer objects
>+
>+#ifndef LIBANGLE_RENDERER_GL_EGL_ANDROID_NATIVEBUFFERIMAGESIBLINGANDROID_H_
>+#define LIBANGLE_RENDERER_GL_EGL_ANDROID_NATIVEBUFFERIMAGESIBLINGANDROID_H_
>+
>+#include "libANGLE/renderer/gl/egl/ExternalImageSiblingEGL.h"
>+
>+namespace rx
>+{
>+
>+class NativeBufferImageSiblingAndroid : public ExternalImageSiblingEGL
>+{
>+  public:
>+    NativeBufferImageSiblingAndroid(EGLClientBuffer buffer);
>+    virtual ~NativeBufferImageSiblingAndroid();
>+
>+    egl::Error initialize(const egl::Display *display) override;
>+
>+    // ExternalImageSiblingImpl interface
>+    gl::Format getFormat() const override;
>+    bool isRenderable(const gl::Context *context) const override;
>+    bool isTexturable(const gl::Context *context) const override;
>+    gl::Extents getSize() const override;
>+    size_t getSamples() const override;
>+
>+    // ExternalImageSiblingEGL interface
>+    EGLClientBuffer getBuffer() const override;
>+
>+  private:
>+    EGLClientBuffer mBuffer;
>+    gl::Extents mSize;
>+    gl::Format mFormat;
>+};
>+
>+}  // namespace rx
>+
>+#endif  // LIBANGLE_RENDERER_GL_EGL_ANDROID_NATIVEBUFFERIMAGESIBLINGANDROID_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/egl/egl_utils.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/egl/egl_utils.cpp
>index abf4734b404..f979ba8007b 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/egl/egl_utils.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/egl/egl_utils.cpp
>@@ -40,6 +40,6 @@ void FinalizeAttributeVector(AttributeVector *attributeVector)
>     attributeVector->push_back(EGL_NONE);
> }
> 
>-}  // namespace egl
>+}  // namespace native_egl
> 
> }  // namespace rx
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/egl/egl_utils.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/egl/egl_utils.h
>index 63086a4ce2a..67ed5d38c3f 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/egl/egl_utils.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/egl/egl_utils.h
>@@ -38,7 +38,7 @@ AttributeVector TrimAttributeMap(const egl::AttributeMap &attributes,
> // Append EGL_NONE to the attribute vector so that it can be passed to a native driver.
> void FinalizeAttributeVector(AttributeVector *attributeVector);
> 
>-}  // namespace egl
>+}  // namespace native_egl
> 
> }  // namespace rx
> 
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/egl/ozone/DisplayOzone.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/egl/ozone/DisplayOzone.cpp
>index b6c0ac988e5..47ed6ce02d0 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/egl/ozone/DisplayOzone.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/egl/ozone/DisplayOzone.cpp
>@@ -10,21 +10,24 @@
> 
> #include <fcntl.h>
> #include <poll.h>
>-#include <unistd.h>
> #include <sys/time.h>
>+#include <unistd.h>
> 
> #include <EGL/eglext.h>
> 
>-#include <gbm.h>
> #include <drm_fourcc.h>
>+#include <gbm.h>
> 
> #include "common/debug.h"
> #include "libANGLE/Config.h"
> #include "libANGLE/Display.h"
> #include "libANGLE/Surface.h"
>+#include "libANGLE/renderer/gl/ContextGL.h"
> #include "libANGLE/renderer/gl/FramebufferGL.h"
> #include "libANGLE/renderer/gl/RendererGL.h"
> #include "libANGLE/renderer/gl/StateManagerGL.h"
>+#include "libANGLE/renderer/gl/egl/ContextEGL.h"
>+#include "libANGLE/renderer/gl/egl/DisplayEGL.h"
> #include "libANGLE/renderer/gl/egl/FunctionsEGLDL.h"
> #include "libANGLE/renderer/gl/egl/ozone/SurfaceOzone.h"
> #include "platform/Platform.h"
>@@ -32,11 +35,11 @@
> // ARM-specific extension needed to make Mali GPU behave - not in any
> // published header file.
> #ifndef EGL_SYNC_PRIOR_COMMANDS_IMPLICIT_EXTERNAL_ARM
>-#define EGL_SYNC_PRIOR_COMMANDS_IMPLICIT_EXTERNAL_ARM 0x328A
>+#    define EGL_SYNC_PRIOR_COMMANDS_IMPLICIT_EXTERNAL_ARM 0x328A
> #endif
> 
> #ifndef EGL_NO_CONFIG_MESA
>-#define EGL_NO_CONFIG_MESA ((EGLConfig)0)
>+#    define EGL_NO_CONFIG_MESA ((EGLConfig)0)
> #endif
> 
> namespace
>@@ -69,7 +72,7 @@ int ChooseCRTC(int fd, drmModeConnectorPtr conn)
>     for (int i = 0; i < conn->count_encoders; ++i)
>     {
>         drmModeEncoderPtr enc = drmModeGetEncoder(fd, conn->encoders[i]);
>-        unsigned long crtcs = enc->possible_crtcs;
>+        unsigned long crtcs   = enc->possible_crtcs;
>         drmModeFreeEncoder(enc);
>         if (crtcs)
>         {
>@@ -86,8 +89,7 @@ namespace rx
> // TODO(fjhenigman) Implement swap control.  Until then this is unused.
> SwapControlData::SwapControlData()
>     : targetSwapInterval(0), maxSwapInterval(-1), currentSwapInterval(-1)
>-{
>-}
>+{}
> 
> DisplayOzone::Buffer::Buffer(DisplayOzone *display,
>                              uint32_t useFlags,
>@@ -113,15 +115,18 @@ DisplayOzone::Buffer::Buffer(DisplayOzone *display,
>       mImage(EGL_NO_IMAGE_KHR),
>       mColorBuffer(0),
>       mDSBuffer(0),
>-      mGLFB(0),
>       mTexture(0)
>-{
>-}
>+{}
> 
> DisplayOzone::Buffer::~Buffer()
> {
>-    mDisplay->mFunctionsGL->deleteFramebuffers(1, &mGLFB);
>     reset();
>+
>+    const FunctionsGL *gl = mDisplay->mRenderer->getFunctions();
>+    gl->deleteRenderbuffers(1, &mColorBuffer);
>+    mColorBuffer = 0;
>+    gl->deleteRenderbuffers(1, &mDSBuffer);
>+    mDSBuffer = 0;
> }
> 
> void DisplayOzone::Buffer::reset()
>@@ -133,15 +138,8 @@ void DisplayOzone::Buffer::reset()
>         mHasDRMFB = false;
>     }
> 
>-    FunctionsGL *gl = mDisplay->mFunctionsGL;
>-    gl->deleteRenderbuffers(1, &mColorBuffer);
>-    mColorBuffer = 0;
>-    gl->deleteRenderbuffers(1, &mDSBuffer);
>-    mDSBuffer = 0;
>-
>-    // Here we might destroy the GL framebuffer (mGLFB) but unlike every other resource in Buffer,
>-    // it does not get destroyed (and recreated) because when it is the default framebuffer for
>-    // an ANGLE surface then ANGLE expects it to have the same lifetime as that surface.
>+    // Make sure to keep the color and depth stencil buffers alive so they maintain the same GL IDs
>+    // if they are bound to any emulated default framebuffer.
> 
>     if (mImage != EGL_NO_IMAGE_KHR)
>     {
>@@ -151,6 +149,7 @@ void DisplayOzone::Buffer::reset()
> 
>     if (mTexture)
>     {
>+        const FunctionsGL *gl = mDisplay->mRenderer->getFunctions();
>         gl->deleteTextures(1, &mTexture);
>         mTexture = 0;
>     }
>@@ -213,36 +212,20 @@ bool DisplayOzone::Buffer::resize(int32_t width, int32_t height)
>         return false;
>     }
> 
>-    FunctionsGL *gl    = mDisplay->mFunctionsGL;
>-    StateManagerGL *sm = mDisplay->getRenderer()->getStateManager();
>+    const FunctionsGL *gl = mDisplay->mRenderer->getFunctions();
>+    StateManagerGL *sm    = mDisplay->mRenderer->getStateManager();
> 
>-    gl->genRenderbuffers(1, &mColorBuffer);
>+    // Update the storage of the renderbuffers but don't generate new IDs. This will update all
>+    // framebuffers they are bound to.
>     sm->bindRenderbuffer(GL_RENDERBUFFER, mColorBuffer);
>     gl->eGLImageTargetRenderbufferStorageOES(GL_RENDERBUFFER, mImage);
> 
>-    sm->bindFramebuffer(GL_FRAMEBUFFER, mGLFB);
>-    gl->framebufferRenderbuffer(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0_EXT, GL_RENDERBUFFER,
>-                                mColorBuffer);
>-
>     if (mDepthBits || mStencilBits)
>     {
>-        gl->genRenderbuffers(1, &mDSBuffer);
>         sm->bindRenderbuffer(GL_RENDERBUFFER, mDSBuffer);
>         gl->renderbufferStorage(GL_RENDERBUFFER, GL_DEPTH24_STENCIL8_OES, width, height);
>     }
> 
>-    if (mDepthBits)
>-    {
>-        gl->framebufferRenderbuffer(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, GL_RENDERBUFFER,
>-                                    mDSBuffer);
>-    }
>-
>-    if (mStencilBits)
>-    {
>-        gl->framebufferRenderbuffer(GL_FRAMEBUFFER, GL_STENCIL_ATTACHMENT, GL_RENDERBUFFER,
>-                                    mDSBuffer);
>-    }
>-
>     mWidth  = width;
>     mHeight = height;
>     return true;
>@@ -251,30 +234,29 @@ bool DisplayOzone::Buffer::resize(int32_t width, int32_t height)
> bool DisplayOzone::Buffer::initialize(const NativeWindow *native)
> {
>     mNative = native;
>-    mDisplay->mFunctionsGL->genFramebuffers(1, &mGLFB);
>-    return resize(native->width, native->height);
>+    return createRenderbuffers() && resize(native->width, native->height);
> }
> 
> bool DisplayOzone::Buffer::initialize(int width, int height)
> {
>-    mDisplay->mFunctionsGL->genFramebuffers(1, &mGLFB);
>-    return resize(width, height);
>+    return createRenderbuffers() && resize(width, height);
> }
> 
> void DisplayOzone::Buffer::bindTexImage()
> {
>-    mDisplay->mFunctionsGL->eGLImageTargetTexture2DOES(GL_TEXTURE_2D, mImage);
>+    const FunctionsGL *gl = mDisplay->mRenderer->getFunctions();
>+    gl->eGLImageTargetTexture2DOES(GL_TEXTURE_2D, mImage);
> }
> 
> GLuint DisplayOzone::Buffer::getTexture()
> {
>     // TODO(fjhenigman) Try not to create a new texture every time.  That already works on Intel
>     // and should work on Mali with proper fences.
>-    FunctionsGL *gl    = mDisplay->mFunctionsGL;
>-    StateManagerGL *sm = mDisplay->getRenderer()->getStateManager();
>+    const FunctionsGL *gl = mDisplay->mRenderer->getFunctions();
>+    StateManagerGL *sm    = mDisplay->mRenderer->getStateManager();
> 
>     gl->genTextures(1, &mTexture);
>-    sm->bindTexture(GL_TEXTURE_2D, mTexture);
>+    sm->bindTexture(gl::TextureType::_2D, mTexture);
>     gl->texParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
>     gl->texParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
>     gl->texParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
>@@ -305,32 +287,71 @@ uint32_t DisplayOzone::Buffer::getDRMFB()
>     return mDRMFB;
> }
> 
>-FramebufferGL *DisplayOzone::Buffer::framebufferGL(const gl::FramebufferState &state)
>+GLuint DisplayOzone::Buffer::createGLFB(const gl::Context *context)
>+{
>+    const FunctionsGL *functions = GetFunctionsGL(context);
>+    StateManagerGL *stateManager = GetStateManagerGL(context);
>+
>+    GLuint framebuffer = 0;
>+    functions->genFramebuffers(1, &framebuffer);
>+    stateManager->bindFramebuffer(GL_FRAMEBUFFER, framebuffer);
>+
>+    functions->framebufferRenderbuffer(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0_EXT, GL_RENDERBUFFER,
>+                                       mColorBuffer);
>+
>+    if (mDepthBits)
>+    {
>+        functions->framebufferRenderbuffer(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, GL_RENDERBUFFER,
>+                                           mDSBuffer);
>+    }
>+
>+    if (mStencilBits)
>+    {
>+        functions->framebufferRenderbuffer(GL_FRAMEBUFFER, GL_STENCIL_ATTACHMENT, GL_RENDERBUFFER,
>+                                           mDSBuffer);
>+    }
>+
>+    return framebuffer;
>+}
>+
>+FramebufferGL *DisplayOzone::Buffer::framebufferGL(const gl::Context *context,
>+                                                   const gl::FramebufferState &state)
> {
>-    return new FramebufferGL(
>-        mGLFB, state, mDisplay->mFunctionsGL, mDisplay->getRenderer()->getWorkarounds(),
>-        mDisplay->getRenderer()->getBlitter(), mDisplay->getRenderer()->getMultiviewClearer(),
>-        mDisplay->getRenderer()->getStateManager());
>+    return new FramebufferGL(state, createGLFB(context), true);
> }
> 
>-void DisplayOzone::Buffer::present()
>+void DisplayOzone::Buffer::present(const gl::Context *context)
> {
>     if (mNative)
>     {
>         if (mNative->visible)
>         {
>-            mDisplay->drawBuffer(this);
>+            mDisplay->drawBuffer(context, this);
>         }
>         resize(mNative->width, mNative->height);
>     }
> }
> 
>+bool DisplayOzone::Buffer::createRenderbuffers()
>+{
>+    const FunctionsGL *gl = mDisplay->mRenderer->getFunctions();
>+    StateManagerGL *sm    = mDisplay->mRenderer->getStateManager();
>+
>+    gl->genRenderbuffers(1, &mColorBuffer);
>+    sm->bindRenderbuffer(GL_RENDERBUFFER, mColorBuffer);
>+
>+    if (mDepthBits || mStencilBits)
>+    {
>+        gl->genRenderbuffers(1, &mDSBuffer);
>+        sm->bindRenderbuffer(GL_RENDERBUFFER, mDSBuffer);
>+    }
>+
>+    return true;
>+}
>+
> DisplayOzone::DisplayOzone(const egl::DisplayState &state)
>     : DisplayEGL(state),
>-      mSwapControl(SwapControl::ABSENT),
>-      mMinSwapInterval(0),
>-      mMaxSwapInterval(0),
>-      mCurrentSwapInterval(-1),
>+      mRenderer(nullptr),
>       mGBM(nullptr),
>       mConnector(nullptr),
>       mMode(nullptr),
>@@ -351,12 +372,9 @@ DisplayOzone::DisplayOzone(const egl::DisplayState &state)
>       mWindowSizeUniform(0),
>       mBorderSizeUniform(0),
>       mDepthUniform(0)
>-{
>-}
>+{}
> 
>-DisplayOzone::~DisplayOzone()
>-{
>-}
>+DisplayOzone::~DisplayOzone() {}
> 
> bool DisplayOzone::hasUsableScreen(int fd)
> {
>@@ -461,11 +479,13 @@ egl::Error DisplayOzone::initialize(egl::Display *display)
>     // advantage of the fact that the system lib is available under multiple names (for example
>     // with a .1 suffix) while Angle only installs libEGL.so.
>     FunctionsEGLDL *egl = new FunctionsEGLDL();
>-    mEGL = egl;
>-    ANGLE_TRY(egl->initialize(display->getNativeDisplayId(), "libEGL.so.1"));
>+    mEGL                = egl;
>+    ANGLE_TRY(egl->initialize(display->getNativeDisplayId(), "libEGL.so.1", nullptr));
> 
>     const char *necessaryExtensions[] = {
>-        "EGL_KHR_image_base", "EGL_EXT_image_dma_buf_import", "EGL_KHR_surfaceless_context",
>+        "EGL_KHR_image_base",
>+        "EGL_EXT_image_dma_buf_import",
>+        "EGL_KHR_surfaceless_context",
>     };
>     for (auto &ext : necessaryExtensions)
>     {
>@@ -503,15 +523,25 @@ egl::Error DisplayOzone::initialize(egl::Display *display)
>         mConfig = config[0];
>     }
> 
>-    ANGLE_TRY(initializeContext(display->getAttributeMap()));
>+    EGLContext context = EGL_NO_CONTEXT;
>+    native_egl::AttributeVector attribs;
>+    ANGLE_TRY(initializeContext(EGL_NO_CONTEXT, display->getAttributeMap(), &context, &attribs));
> 
>-    if (!mEGL->makeCurrent(EGL_NO_SURFACE, mContext))
>+    if (!mEGL->makeCurrent(EGL_NO_SURFACE, context))
>     {
>         return egl::EglNotInitialized() << "Could not make context current.";
>     }
> 
>-    mFunctionsGL = mEGL->makeFunctionsGL();
>-    mFunctionsGL->initialize(display->getAttributeMap());
>+    std::unique_ptr<FunctionsGL> functionsGL(mEGL->makeFunctionsGL());
>+    functionsGL->initialize(display->getAttributeMap());
>+
>+    mRenderer.reset(new RendererEGL(std::move(functionsGL), display->getAttributeMap(), this,
>+                                    context, attribs));
>+    const gl::Version &maxVersion = mRenderer->getMaxSupportedESVersion();
>+    if (maxVersion < gl::Version(2, 0))
>+    {
>+        return egl::EglNotInitialized() << "OpenGL ES 2.0 is not supportable.";
>+    }
> 
>     return DisplayGL::initialize(display);
> }
>@@ -523,7 +553,7 @@ void DisplayOzone::pageFlipHandler(int fd,
>                                    void *data)
> {
>     DisplayOzone *display = reinterpret_cast<DisplayOzone *>(data);
>-    uint64_t tv = tv_sec;
>+    uint64_t tv           = tv_sec;
>     display->pageFlipHandler(sequence, tv * 1000000 + tv_usec);
> }
> 
>@@ -588,8 +618,8 @@ void DisplayOzone::presentScreen()
> 
> GLuint DisplayOzone::makeShader(GLuint type, const char *src)
> {
>-    FunctionsGL *gl = mFunctionsGL;
>-    GLuint shader = gl->createShader(type);
>+    const FunctionsGL *gl = mRenderer->getFunctions();
>+    GLuint shader         = gl->createShader(type);
>     gl->shaderSource(shader, 1, &src, nullptr);
>     gl->compileShader(shader);
> 
>@@ -606,10 +636,10 @@ GLuint DisplayOzone::makeShader(GLuint type, const char *src)
>     return shader;
> }
> 
>-void DisplayOzone::drawWithTexture(Buffer *buffer)
>+void DisplayOzone::drawWithTexture(const gl::Context *context, Buffer *buffer)
> {
>-    FunctionsGL *gl    = mFunctionsGL;
>-    StateManagerGL *sm = getRenderer()->getStateManager();
>+    const FunctionsGL *gl = mRenderer->getFunctions();
>+    StateManagerGL *sm    = mRenderer->getStateManager();
> 
>     if (!mProgram)
>     {
>@@ -648,7 +678,7 @@ void DisplayOzone::drawWithTexture(Buffer *buffer)
> 
>         mVertexShader   = makeShader(GL_VERTEX_SHADER, vertexSource);
>         mFragmentShader = makeShader(GL_FRAGMENT_SHADER, fragmentSource);
>-        mProgram = gl->createProgram();
>+        mProgram        = gl->createProgram();
>         gl->attachShader(mProgram, mVertexShader);
>         gl->attachShader(mProgram, mFragmentShader);
>         gl->bindAttribLocation(mProgram, 0, "vertex");
>@@ -664,7 +694,7 @@ void DisplayOzone::drawWithTexture(Buffer *buffer)
>         mWindowSizeUniform = gl->getUniformLocation(mProgram, "windowSize");
>         mBorderSizeUniform = gl->getUniformLocation(mProgram, "borderSize");
>         mDepthUniform      = gl->getUniformLocation(mProgram, "depth");
>-        GLint texUniform = gl->getUniformLocation(mProgram, "tex");
>+        GLint texUniform   = gl->getUniformLocation(mProgram, "tex");
>         sm->useProgram(mProgram);
>         gl->uniform1i(texUniform, 0);
> 
>@@ -727,16 +757,18 @@ void DisplayOzone::drawWithTexture(Buffer *buffer)
>     sm->setViewport(gl::Rectangle(0, 0, mWidth, mHeight));
>     sm->activeTexture(0);
>     GLuint tex = buffer->getTexture();
>-    sm->bindTexture(GL_TEXTURE_2D, tex);
>+    sm->bindTexture(gl::TextureType::_2D, tex);
>     gl->vertexAttribPointer(0, 3, GL_FLOAT, GL_FALSE, 0, 0);
>     gl->enableVertexAttribArray(0);
>-    sm->bindFramebuffer(GL_DRAW_FRAMEBUFFER, mDrawing->getGLFB());
>+    GLuint fbo = mDrawing->createGLFB(context);
>+    sm->bindFramebuffer(GL_DRAW_FRAMEBUFFER, fbo);
>     gl->drawArrays(GL_TRIANGLE_STRIP, 0, 4);
>     gl->drawElements(GL_TRIANGLE_STRIP, 10, GL_UNSIGNED_INT, 0);
>     sm->deleteTexture(tex);
>+    sm->deleteFramebuffer(fbo);
> }
> 
>-void DisplayOzone::drawBuffer(Buffer *buffer)
>+void DisplayOzone::drawBuffer(const gl::Context *context, Buffer *buffer)
> {
>     if (!mDrawing)
>     {
>@@ -757,28 +789,33 @@ void DisplayOzone::drawBuffer(Buffer *buffer)
>             }
>         }
> 
>-        StateManagerGL *sm = getRenderer()->getStateManager();
>-        sm->bindFramebuffer(GL_DRAW_FRAMEBUFFER, mDrawing->getGLFB());
>+        const FunctionsGL *gl = mRenderer->getFunctions();
>+        StateManagerGL *sm    = mRenderer->getStateManager();
>+
>+        GLuint fbo = mDrawing->createGLFB(context);
>+        sm->bindFramebuffer(GL_DRAW_FRAMEBUFFER, fbo);
>         sm->setClearColor(gl::ColorF(0, 0, 0, 1));
>         sm->setClearDepth(1);
>         sm->setScissorTestEnabled(false);
>         sm->setColorMask(true, true, true, true);
>         sm->setDepthMask(true);
>-        mFunctionsGL->clear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
>+        gl->clear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
>+        sm->deleteFramebuffer(fbo);
>     }
> 
>-    drawWithTexture(buffer);
>+    drawWithTexture(context, buffer);
>     presentScreen();
> }
> 
> void DisplayOzone::flushGL()
> {
>-    mFunctionsGL->flush();
>+    const FunctionsGL *gl = mRenderer->getFunctions();
>+    gl->flush();
>     if (mEGL->hasExtension("EGL_KHR_fence_sync"))
>     {
>         const EGLint attrib[] = {EGL_SYNC_CONDITION_KHR,
>                                  EGL_SYNC_PRIOR_COMMANDS_IMPLICIT_EXTERNAL_ARM, EGL_NONE};
>-        EGLSyncKHR fence = mEGL->createSyncKHR(EGL_SYNC_FENCE_KHR, attrib);
>+        EGLSyncKHR fence      = mEGL->createSyncKHR(EGL_SYNC_FENCE_KHR, attrib);
>         if (fence)
>         {
>             // TODO(fjhenigman) Figure out the right way to use fences on Mali GPU
>@@ -809,29 +846,25 @@ void DisplayOzone::terminate()
> 
>     if (mProgram)
>     {
>-        mFunctionsGL->deleteProgram(mProgram);
>-        mFunctionsGL->deleteShader(mVertexShader);
>-        mFunctionsGL->deleteShader(mFragmentShader);
>-        mFunctionsGL->deleteBuffers(1, &mVertexBuffer);
>-        mFunctionsGL->deleteBuffers(1, &mIndexBuffer);
>+        const FunctionsGL *gl = mRenderer->getFunctions();
>+        gl->deleteProgram(mProgram);
>+        gl->deleteShader(mVertexShader);
>+        gl->deleteShader(mFragmentShader);
>+        gl->deleteBuffers(1, &mVertexBuffer);
>+        gl->deleteBuffers(1, &mIndexBuffer);
>         mProgram = 0;
>     }
> 
>     DisplayGL::terminate();
> 
>-    if (mContext)
>-    {
>-        // Mesa might crash if you terminate EGL with a context current
>-        // then re-initialize EGL, so make our context not current.
>-        mEGL->makeCurrent(EGL_NO_SURFACE, EGL_NO_CONTEXT);
>-        mEGL->destroyContext(mContext);
>-        mContext = nullptr;
>-    }
>-
>-    SafeDelete(mFunctionsGL);
>+    mRenderer.reset();
> 
>     if (mEGL)
>     {
>+        // Mesa might crash if you terminate EGL with a context current then re-initialize EGL, so
>+        // make our context not current.
>+        mEGL->makeCurrent(EGL_NO_SURFACE, EGL_NO_CONTEXT);
>+
>         ANGLE_SWALLOW_ERR(mEGL->terminate());
>         SafeDelete(mEGL);
>     }
>@@ -861,7 +894,7 @@ SurfaceImpl *DisplayOzone::createWindowSurface(const egl::SurfaceState &state,
>     {
>         return nullptr;
>     }
>-    return new SurfaceOzone(state, getRenderer(), buffer);
>+    return new SurfaceOzone(state, buffer);
> }
> 
> SurfaceImpl *DisplayOzone::createPbufferSurface(const egl::SurfaceState &state,
>@@ -869,13 +902,13 @@ SurfaceImpl *DisplayOzone::createPbufferSurface(const egl::SurfaceState &state,
> {
>     EGLAttrib width  = attribs.get(EGL_WIDTH, 0);
>     EGLAttrib height = attribs.get(EGL_HEIGHT, 0);
>-    Buffer *buffer = new Buffer(this, GBM_BO_USE_RENDERING, GBM_FORMAT_ARGB8888,
>+    Buffer *buffer   = new Buffer(this, GBM_BO_USE_RENDERING, GBM_FORMAT_ARGB8888,
>                                 DRM_FORMAT_ARGB8888, DRM_FORMAT_XRGB8888, true, true);
>     if (!buffer || !buffer->initialize(width, height))
>     {
>         return nullptr;
>     }
>-    return new SurfaceOzone(state, getRenderer(), buffer);
>+    return new SurfaceOzone(state, buffer);
> }
> 
> SurfaceImpl *DisplayOzone::createPbufferFromClientBuffer(const egl::SurfaceState &state,
>@@ -895,10 +928,20 @@ SurfaceImpl *DisplayOzone::createPixmapSurface(const egl::SurfaceState &state,
>     return nullptr;
> }
> 
>-egl::Error DisplayOzone::getDevice(DeviceImpl **device)
>+ContextImpl *DisplayOzone::createContext(const gl::State &state,
>+                                         gl::ErrorSet *errorSet,
>+                                         const egl::Config *configuration,
>+                                         const gl::Context *shareContext,
>+                                         const egl::AttributeMap &attribs)
>+{
>+    // All contexts on Ozone are virtualized and share the same renderer.
>+    return new ContextEGL(state, errorSet, mRenderer);
>+}
>+
>+DeviceImpl *DisplayOzone::createDevice()
> {
>     UNIMPLEMENTED();
>-    return egl::EglBadDisplay();
>+    return nullptr;
> }
> 
> egl::ConfigSet DisplayOzone::generateConfigs()
>@@ -906,15 +949,15 @@ egl::ConfigSet DisplayOzone::generateConfigs()
>     egl::ConfigSet configs;
> 
>     egl::Config config;
>-    config.redSize           = 8;
>-    config.greenSize         = 8;
>-    config.blueSize          = 8;
>-    config.alphaSize         = 8;
>-    config.depthSize         = 24;
>-    config.stencilSize       = 8;
>-    config.bindToTextureRGBA = EGL_TRUE;
>-    config.renderableType    = EGL_OPENGL_ES2_BIT;
>-    config.surfaceType       = EGL_WINDOW_BIT | EGL_PBUFFER_BIT;
>+    config.redSize            = 8;
>+    config.greenSize          = 8;
>+    config.blueSize           = 8;
>+    config.alphaSize          = 8;
>+    config.depthSize          = 24;
>+    config.stencilSize        = 8;
>+    config.bindToTextureRGBA  = EGL_TRUE;
>+    config.renderableType     = EGL_OPENGL_ES2_BIT;
>+    config.surfaceType        = EGL_WINDOW_BIT | EGL_PBUFFER_BIT;
>     config.renderTargetFormat = GL_RGBA8;
>     config.depthStencilFormat = GL_DEPTH24_STENCIL8;
> 
>@@ -938,27 +981,96 @@ bool DisplayOzone::isValidNativeWindow(EGLNativeWindowType window) const
>     return true;
> }
> 
>-egl::Error DisplayOzone::waitClient(const gl::Context *context) const
>+egl::Error DisplayOzone::waitClient(const gl::Context *context)
> {
>     // TODO(fjhenigman) Implement this.
>     return egl::NoError();
> }
> 
>-egl::Error DisplayOzone::waitNative(const gl::Context *context, EGLint engine) const
>+egl::Error DisplayOzone::waitNative(const gl::Context *context, EGLint engine)
> {
>     // TODO(fjhenigman) Implement this.
>     return egl::NoError();
> }
> 
>+gl::Version DisplayOzone::getMaxSupportedESVersion() const
>+{
>+    return mRenderer->getMaxSupportedESVersion();
>+}
>+
>+void DisplayOzone::destroyNativeContext(EGLContext context)
>+{
>+    mEGL->destroyContext(context);
>+}
>+
> void DisplayOzone::setSwapInterval(EGLSurface drawable, SwapControlData *data)
> {
>     ASSERT(data != nullptr);
> }
> 
>+void DisplayOzone::generateExtensions(egl::DisplayExtensions *outExtensions) const
>+{
>+    // Surfaceless contexts are emulated even if there is no native support.
>+    outExtensions->surfacelessContext = true;
>+
>+    DisplayEGL::generateExtensions(outExtensions);
>+}
>+
> egl::Error DisplayOzone::makeCurrentSurfaceless(gl::Context *context)
> {
>     // Nothing to do, handled in the GL layers
>     return egl::NoError();
> }
> 
>+class WorkerContextOzone final : public WorkerContext
>+{
>+  public:
>+    WorkerContextOzone(EGLContext context, FunctionsEGL *functions);
>+    ~WorkerContextOzone() override;
>+
>+    bool makeCurrent() override;
>+    void unmakeCurrent() override;
>+
>+  private:
>+    EGLContext mContext;
>+    FunctionsEGL *mFunctions;
>+};
>+
>+WorkerContextOzone::WorkerContextOzone(EGLContext context, FunctionsEGL *functions)
>+    : mContext(context), mFunctions(functions)
>+{}
>+
>+WorkerContextOzone::~WorkerContextOzone()
>+{
>+    mFunctions->destroyContext(mContext);
>+}
>+
>+bool WorkerContextOzone::makeCurrent()
>+{
>+    if (mFunctions->makeCurrent(EGL_NO_SURFACE, mContext) == EGL_FALSE)
>+    {
>+        ERR() << "Unable to make the EGL context current.";
>+        return false;
>+    }
>+    return true;
>+}
>+
>+void WorkerContextOzone::unmakeCurrent()
>+{
>+    mFunctions->makeCurrent(EGL_NO_SURFACE, EGL_NO_CONTEXT);
>+}
>+
>+WorkerContext *DisplayOzone::createWorkerContext(std::string *infoLog,
>+                                                 EGLContext sharedContext,
>+                                                 const native_egl::AttributeVector workerAttribs)
>+{
>+    EGLContext context = mEGL->createContext(mConfig, sharedContext, workerAttribs.data());
>+    if (context == EGL_NO_CONTEXT)
>+    {
>+        *infoLog += "Unable to create the EGL context.";
>+        return nullptr;
>+    }
>+    return new WorkerContextOzone(context, mEGL);
>+}
>+
> }  // namespace rx
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/egl/ozone/DisplayOzone.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/egl/ozone/DisplayOzone.h
>index 2db16be0268..6f96294f56e 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/egl/ozone/DisplayOzone.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/egl/ozone/DisplayOzone.h
>@@ -28,6 +28,7 @@ namespace rx
> {
> 
> class FramebufferGL;
>+class RendererEGL;
> 
> // TODO(fjhenigman) Implement swap control.  The following struct will be used for that.
> // State-tracking data for the swap control to allow DisplayOzone to remember per
>@@ -75,17 +76,19 @@ class DisplayOzone final : public DisplayEGL
>         bool initialize(int32_t width, int32_t height);
>         void reset();
>         bool resize(int32_t width, int32_t height);
>-        FramebufferGL *framebufferGL(const gl::FramebufferState &state);
>-        void present();
>+        GLuint createGLFB(const gl::Context *context);
>+        FramebufferGL *framebufferGL(const gl::Context *context, const gl::FramebufferState &state);
>+        void present(const gl::Context *context);
>         uint32_t getDRMFB();
>         void bindTexImage();
>         GLuint getTexture();
>         int32_t getWidth() const { return mWidth; }
>         int32_t getHeight() const { return mHeight; }
>-        GLuint getGLFB() const { return mGLFB; }
>         const NativeWindow *getNative() const { return mNative; }
> 
>       private:
>+        bool createRenderbuffers();
>+
>         DisplayOzone *mDisplay;
>         const NativeWindow *mNative;
>         int mWidth;
>@@ -103,7 +106,6 @@ class DisplayOzone final : public DisplayEGL
>         EGLImageKHR mImage;
>         GLuint mColorBuffer;
>         GLuint mDSBuffer;
>-        GLuint mGLFB;
>         GLuint mTexture;
>     };
> 
>@@ -126,6 +128,12 @@ class DisplayOzone final : public DisplayEGL
>                                      NativePixmapType nativePixmap,
>                                      const egl::AttributeMap &attribs) override;
> 
>+    ContextImpl *createContext(const gl::State &state,
>+                               gl::ErrorSet *errorSet,
>+                               const egl::Config *configuration,
>+                               const gl::Context *shareContext,
>+                               const egl::AttributeMap &attribs) override;
>+
>     egl::ConfigSet generateConfigs() override;
> 
>     bool testDeviceLost() override;
>@@ -133,10 +141,14 @@ class DisplayOzone final : public DisplayEGL
> 
>     bool isValidNativeWindow(EGLNativeWindowType window) const override;
> 
>-    egl::Error getDevice(DeviceImpl **device) override;
>+    DeviceImpl *createDevice() override;
>+
>+    egl::Error waitClient(const gl::Context *context) override;
>+    egl::Error waitNative(const gl::Context *context, EGLint engine) override;
>+
>+    gl::Version getMaxSupportedESVersion() const override;
> 
>-    egl::Error waitClient(const gl::Context *context) const override;
>-    egl::Error waitNative(const gl::Context *context, EGLint engine) const override;
>+    void destroyNativeContext(EGLContext context) override;
> 
>     // TODO(fjhenigman) Implement this.
>     // Swap interval can be set globally or per drawable.
>@@ -144,13 +156,18 @@ class DisplayOzone final : public DisplayEGL
>     // one required so that the subsequent swapBuffers acts as expected.
>     void setSwapInterval(EGLSurface drawable, SwapControlData *data);
> 
>+    WorkerContext *createWorkerContext(std::string *infoLog,
>+                                       EGLContext sharedContext,
>+                                       const native_egl::AttributeVector workerAttribs) override;
>+
>   private:
>+    void generateExtensions(egl::DisplayExtensions *outExtensions) const override;
>+
>     egl::Error makeCurrentSurfaceless(gl::Context *context) override;
> 
>     GLuint makeShader(GLuint type, const char *src);
>-    void drawBuffer(Buffer *buffer);
>-    void drawWithBlit(Buffer *buffer);
>-    void drawWithTexture(Buffer *buffer);
>+    void drawBuffer(const gl::Context *context, Buffer *buffer);
>+    void drawWithTexture(const gl::Context *context, Buffer *buffer);
>     void flushGL();
>     bool hasUsableScreen(int fd);
>     void presentScreen();
>@@ -161,18 +178,7 @@ class DisplayOzone final : public DisplayEGL
>                                 void *data);
>     void pageFlipHandler(unsigned int sequence, uint64_t tv);
> 
>-    // TODO(fjhenigman) Implement swap control.  The following stuff will be used for that.
>-    enum class SwapControl
>-    {
>-        ABSENT,
>-        EXT,
>-        MESA,
>-        SGI,
>-    };
>-    SwapControl mSwapControl;
>-    int mMinSwapInterval;
>-    int mMaxSwapInterval;
>-    int mCurrentSwapInterval;
>+    std::shared_ptr<RendererEGL> mRenderer;
> 
>     gbm_device *mGBM;
>     drmModeConnectorPtr mConnector;
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/egl/ozone/SurfaceOzone.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/egl/ozone/SurfaceOzone.cpp
>index 29678c9a56b..2cd10a289fc 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/egl/ozone/SurfaceOzone.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/egl/ozone/SurfaceOzone.cpp
>@@ -14,12 +14,9 @@
> namespace rx
> {
> 
>-SurfaceOzone::SurfaceOzone(const egl::SurfaceState &state,
>-                           RendererGL *renderer,
>-                           DisplayOzone::Buffer *buffer)
>-    : SurfaceGL(state, renderer), mBuffer(buffer)
>-{
>-}
>+SurfaceOzone::SurfaceOzone(const egl::SurfaceState &state, DisplayOzone::Buffer *buffer)
>+    : SurfaceGL(state), mBuffer(buffer)
>+{}
> 
> SurfaceOzone::~SurfaceOzone()
> {
>@@ -31,19 +28,20 @@ egl::Error SurfaceOzone::initialize(const egl::Display *display)
>     return egl::NoError();
> }
> 
>-FramebufferImpl *SurfaceOzone::createDefaultFramebuffer(const gl::FramebufferState &state)
>+FramebufferImpl *SurfaceOzone::createDefaultFramebuffer(const gl::Context *context,
>+                                                        const gl::FramebufferState &state)
> {
>-    return mBuffer->framebufferGL(state);
>+    return mBuffer->framebufferGL(context, state);
> }
> 
>-egl::Error SurfaceOzone::makeCurrent()
>+egl::Error SurfaceOzone::makeCurrent(const gl::Context *context)
> {
>     return egl::NoError();
> }
> 
> egl::Error SurfaceOzone::swap(const gl::Context *context)
> {
>-    mBuffer->present();
>+    mBuffer->present(context);
>     return egl::NoError();
> }
> 
>@@ -63,13 +61,15 @@ egl::Error SurfaceOzone::querySurfacePointerANGLE(EGLint attribute, void **value
>     return egl::NoError();
> }
> 
>-egl::Error SurfaceOzone::bindTexImage(gl::Texture *texture, EGLint buffer)
>+egl::Error SurfaceOzone::bindTexImage(const gl::Context *context,
>+                                      gl::Texture *texture,
>+                                      EGLint buffer)
> {
>     mBuffer->bindTexImage();
>     return egl::NoError();
> }
> 
>-egl::Error SurfaceOzone::releaseTexImage(EGLint buffer)
>+egl::Error SurfaceOzone::releaseTexImage(const gl::Context *context, EGLint buffer)
> {
>     return egl::NoError();
> }
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/egl/ozone/SurfaceOzone.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/egl/ozone/SurfaceOzone.h
>index 10a32af459d..d23f09a37f1 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/egl/ozone/SurfaceOzone.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/egl/ozone/SurfaceOzone.h
>@@ -18,15 +18,14 @@ namespace rx
> class SurfaceOzone : public SurfaceGL
> {
>   public:
>-    SurfaceOzone(const egl::SurfaceState &state,
>-                 RendererGL *renderer,
>-                 DisplayOzone::Buffer *buffer);
>+    SurfaceOzone(const egl::SurfaceState &state, DisplayOzone::Buffer *buffer);
>     ~SurfaceOzone() override;
> 
>-    FramebufferImpl *createDefaultFramebuffer(const gl::FramebufferState &state) override;
>+    FramebufferImpl *createDefaultFramebuffer(const gl::Context *context,
>+                                              const gl::FramebufferState &state) override;
> 
>     egl::Error initialize(const egl::Display *display) override;
>-    egl::Error makeCurrent() override;
>+    egl::Error makeCurrent(const gl::Context *context) override;
> 
>     egl::Error swap(const gl::Context *context) override;
>     egl::Error postSubBuffer(const gl::Context *context,
>@@ -35,8 +34,10 @@ class SurfaceOzone : public SurfaceGL
>                              EGLint width,
>                              EGLint height) override;
>     egl::Error querySurfacePointerANGLE(EGLint attribute, void **value) override;
>-    egl::Error bindTexImage(gl::Texture *texture, EGLint buffer) override;
>-    egl::Error releaseTexImage(EGLint buffer) override;
>+    egl::Error bindTexImage(const gl::Context *context,
>+                            gl::Texture *texture,
>+                            EGLint buffer) override;
>+    egl::Error releaseTexImage(const gl::Context *context, EGLint buffer) override;
>     void setSwapInterval(EGLint interval) override;
> 
>     EGLint getWidth() const override;
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/formatutilsgl.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/formatutilsgl.cpp
>index 1829d465005..f19c5c24a8a 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/formatutilsgl.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/formatutilsgl.cpp
>@@ -24,31 +24,22 @@ SupportRequirement::SupportRequirement()
>     : version(std::numeric_limits<GLuint>::max(), std::numeric_limits<GLuint>::max()),
>       versionExtensions(),
>       requiredExtensions()
>-{
>-}
>+{}
> 
> SupportRequirement::SupportRequirement(const SupportRequirement &other) = default;
> 
>-SupportRequirement::~SupportRequirement()
>-{
>-}
>+SupportRequirement::~SupportRequirement() {}
> 
>-InternalFormat::InternalFormat()
>-    : texture(),
>-      filter(),
>-      renderbuffer(),
>-      framebufferAttachment()
>-{
>-}
>+InternalFormat::InternalFormat() : texture(), filter(), textureAttachment(), renderbuffer() {}
> 
> InternalFormat::InternalFormat(const InternalFormat &other) = default;
> 
>-InternalFormat::~InternalFormat()
>-{
>-}
>+InternalFormat::~InternalFormat() {}
> 
> // supported = version || vertexExt
>-static inline SupportRequirement VersionOrExts(GLuint major, GLuint minor, const std::string &versionExt)
>+static inline SupportRequirement VersionOrExts(GLuint major,
>+                                               GLuint minor,
>+                                               const std::string &versionExt)
> {
>     SupportRequirement requirement;
>     requirement.version.major = major;
>@@ -57,37 +48,39 @@ static inline SupportRequirement VersionOrExts(GLuint major, GLuint minor, const
>     return requirement;
> }
> 
>-// supported = (version || vertexExt) && requiredExt
>-static inline SupportRequirement VersionOrExtsAndExts(GLuint major,
>-                                                      GLuint minor,
>-                                                      const std::string &versionExt,
>-                                                      const std::string &requiredExt)
>+// supported = version
>+static inline SupportRequirement VersionOnly(GLuint major, GLuint minor)
> {
>     SupportRequirement requirement;
>     requirement.version.major = major;
>     requirement.version.minor = minor;
>-    angle::SplitStringAlongWhitespace(versionExt, &requirement.versionExtensions);
>-    angle::SplitStringAlongWhitespace(requiredExt, &requirement.requiredExtensions);
>     return requirement;
> }
> 
>-// supported = version
>-static inline SupportRequirement VersionOnly(GLuint major, GLuint minor)
>+// supported = any one of sets in exts
>+static inline SupportRequirement ExtsOnly(const std::vector<std::string> &exts)
> {
>     SupportRequirement requirement;
>-    requirement.version.major = major;
>-    requirement.version.minor = minor;
>+    requirement.version.major = 0;
>+    requirement.version.minor = 0;
>+    requirement.requiredExtensions.resize(exts.size());
>+    for (size_t i = 0; i < exts.size(); i++)
>+    {
>+        angle::SplitStringAlongWhitespace(exts[i], &requirement.requiredExtensions[i]);
>+    }
>     return requirement;
> }
> 
> // supported = ext
> static inline SupportRequirement ExtsOnly(const std::string &ext)
> {
>-    SupportRequirement requirement;
>-    requirement.version.major = 0;
>-    requirement.version.minor = 0;
>-    angle::SplitStringAlongWhitespace(ext, &requirement.requiredExtensions);
>-    return requirement;
>+    return ExtsOnly(std::vector<std::string>({ext}));
>+}
>+
>+// supported = ext1 || ext2
>+static inline SupportRequirement ExtsOnly(const std::string &ext1, const std::string &ext2)
>+{
>+    return ExtsOnly(std::vector<std::string>({ext1, ext2}));
> }
> 
> // supported = true
>@@ -118,153 +111,202 @@ typedef std::pair<GLenum, InternalFormatInfo> InternalFormatInfoPair;
> typedef std::map<GLenum, InternalFormatInfo> InternalFormatInfoMap;
> 
> // A helper function to insert data into the format map with fewer characters.
>-static inline void InsertFormatMapping(InternalFormatInfoMap *map, GLenum internalFormat,
>-                                       const SupportRequirement &desktopTexture, const SupportRequirement &desktopFilter, const SupportRequirement &desktopRender,
>-                                       const SupportRequirement &esTexture, const SupportRequirement &esFilter, const SupportRequirement &esRender)
>+static inline void InsertFormatMapping(InternalFormatInfoMap *map,
>+                                       GLenum internalFormat,
>+                                       const SupportRequirement &desktopTexture,
>+                                       const SupportRequirement &desktopFilter,
>+                                       const SupportRequirement &desktopRender,
>+                                       const SupportRequirement &esTexture,
>+                                       const SupportRequirement &esFilter,
>+                                       const SupportRequirement &esTextureAttachment,
>+                                       const SupportRequirement &esRenderbufferAttachment)
> {
>     InternalFormatInfo formatInfo;
>     formatInfo.glInfo.texture = desktopTexture;
>-    formatInfo.glInfo.filter = desktopFilter;
>-    formatInfo.glInfo.renderbuffer = desktopRender;
>-    formatInfo.glInfo.framebufferAttachment = desktopRender;
>-    formatInfo.glesInfo.texture = esTexture;
>-    formatInfo.glesInfo.filter = esTexture;
>-    formatInfo.glesInfo.renderbuffer = esFilter;
>-    formatInfo.glesInfo.framebufferAttachment = esRender;
>+    formatInfo.glInfo.filter  = desktopFilter;
>+    // No difference spotted yet in Desktop GL texture attachment and renderbuffer capabilities
>+    formatInfo.glInfo.textureAttachment   = desktopRender;
>+    formatInfo.glInfo.renderbuffer        = desktopRender;
>+    formatInfo.glesInfo.texture           = esTexture;
>+    formatInfo.glesInfo.filter            = esFilter;
>+    formatInfo.glesInfo.textureAttachment = esTextureAttachment;
>+    formatInfo.glesInfo.renderbuffer      = esRenderbufferAttachment;
>     map->insert(std::make_pair(internalFormat, formatInfo));
> }
> 
>+// Note 1: This map is used to determine extensions support, which is based on checking support for
>+// sized formats (this is ANGLE implementation limitation - D3D backend supports only sized formats)
>+// In order to determine support for extensions which introduce unsized formats, this map would say
>+// that a corresponding sized format is supported, instead. Thus, if this map says that a sized
>+// format is supported, this means that either the actual sized format or a corresponding unsized
>+// format is supported by the native driver.
>+// For example, GL_EXT_texture_rg provides support for RED_EXT format with UNSIGNED_BYTE type.
>+// Therefore, DetermineRGTextureSupport checks for GL_R8 support. Therefore this map says that
>+// GL_R8 (and not RED_EXT) is supported if GL_EXT_texture_rg is available. GL_R8 itself
>+// is supported in ES3, thus the combined condition is VersionOrExts(3, 0, "GL_EXT_texture_rg").
>+//
>+// Note 2: Texture Attachment support is checked also by SupportsNativeRendering().
>+// Unsized formats appear in this map for this reason. The assumption is
>+// that SupportsNativeRendering() will not check sized formats in the ES2 frontend
>+// and the information in unsized formats is correct, and not merged like for sized formats.
>+// In the ES3 frontend, it could happen that SupportsNativeRendering() would be wrong,
>+// but this will be mitigated by fall back to CPU-readback in TextureGL::copySubTextureHelper().
>+//
>+// Note 3: Because creating renderbuffers with unsized formats is impossible,
>+// the value of renderbuffer support is actually correct for the sized formats.
>+//
>+// Note 4: To determine whether a format is filterable, one must check both "Filter" and "Texture"
>+// support, like it is done in GenerateTextureFormatCaps().
>+// On the other hand, "Texture Attachment" support formula is self-contained.
>+//
>+// TODO(ynovikov): http://anglebug.com/2846 Verify support fields of BGRA, depth, stencil and
>+// compressed formats, and all formats for Desktop GL.
> static InternalFormatInfoMap BuildInternalFormatInfoMap()
> {
>     InternalFormatInfoMap map;
> 
>     // clang-format off
>-    //                       | Format              | OpenGL texture support                          | Filter           | OpenGL render support                        | OpenGL ES texture support                 | Filter           | OpenGL ES render support                 |
>-    InsertFormatMapping(&map, GL_R8,                VersionOrExts(3, 0, "GL_ARB_texture_rg"),         AlwaysSupported(), VersionOrExts(3, 0, "GL_ARB_texture_rg"),      VersionOrExts(3, 0, "GL_EXT_texture_rg"),   AlwaysSupported(), VersionOrExts(3, 0, "GL_EXT_texture_rg")  );
>-    InsertFormatMapping(&map, GL_R8_SNORM,          VersionOnly(3, 1),                                AlwaysSupported(), NeverSupported(),                              VersionOnly(3, 0),                          AlwaysSupported(), NeverSupported()                          );
>-    InsertFormatMapping(&map, GL_RG8,               VersionOrExts(3, 0, "GL_ARB_texture_rg"),         AlwaysSupported(), VersionOrExts(3, 0, "GL_ARB_texture_rg"),      VersionOrExts(3, 0, "GL_EXT_texture_rg"),   AlwaysSupported(), VersionOrExts(3, 0, "GL_ARB_texture_rg")  );
>-    InsertFormatMapping(&map, GL_RG8_SNORM,         VersionOnly(3, 1),                                AlwaysSupported(), NeverSupported(),                              VersionOnly(3, 0),                          AlwaysSupported(), NeverSupported()                          );
>-    InsertFormatMapping(&map, GL_RGB8,              AlwaysSupported(),                                AlwaysSupported(), AlwaysSupported(),                             VersionOrExts(3, 0, "GL_OES_rgb8_rgba8"),   AlwaysSupported(), AlwaysSupported()                         );
>-    InsertFormatMapping(&map, GL_RGB8_SNORM,        VersionOnly(3, 1),                                AlwaysSupported(), NeverSupported(),                              VersionOnly(3, 0),                          AlwaysSupported(), NeverSupported()                          );
>-    InsertFormatMapping(&map, GL_RGB565,            AlwaysSupported(),                                AlwaysSupported(), AlwaysSupported(),                             AlwaysSupported(),                          AlwaysSupported(), AlwaysSupported()                         );
>-    InsertFormatMapping(&map, GL_RGBA4,             AlwaysSupported(),                                AlwaysSupported(), AlwaysSupported(),                             AlwaysSupported(),                          AlwaysSupported(), AlwaysSupported()                         );
>-    InsertFormatMapping(&map, GL_RGB5_A1,           AlwaysSupported(),                                AlwaysSupported(), AlwaysSupported(),                             AlwaysSupported(),                          AlwaysSupported(), AlwaysSupported()                         );
>-    InsertFormatMapping(&map, GL_RGBA8,             AlwaysSupported(),                                AlwaysSupported(), AlwaysSupported(),                             VersionOrExts(3, 0, "GL_OES_rgb8_rgba8"),   AlwaysSupported(), VersionOrExts(3, 0, "GL_OES_rgb8_rgba8")  );
>-    InsertFormatMapping(&map, GL_RGBA8_SNORM,       VersionOnly(3, 1),                                AlwaysSupported(), NeverSupported(),                              VersionOnly(3, 0),                          AlwaysSupported(), NeverSupported()                          );
>-    InsertFormatMapping(&map, GL_RGB10_A2,          AlwaysSupported(),                                AlwaysSupported(), AlwaysSupported(),                             VersionOnly(3, 0),                          AlwaysSupported(), VersionOnly(3, 0)                         );
>-    InsertFormatMapping(&map, GL_RGB10_A2UI,        VersionOrExts(3, 3, "GL_ARB_texture_rgb10_a2ui"), NeverSupported(),  AlwaysSupported(),                             VersionOnly(3, 0),                          NeverSupported(),  AlwaysSupported()                         );
>-    InsertFormatMapping(&map, GL_SRGB8,             VersionOrExts(2, 1, "GL_EXT_texture_sRGB"),       AlwaysSupported(), VersionOrExts(2, 1, "GL_EXT_texture_sRGB"),    VersionOnly(3, 0),                          AlwaysSupported(), NeverSupported()                          );
>-    InsertFormatMapping(&map, GL_SRGB8_ALPHA8,      VersionOrExts(2, 1, "GL_EXT_texture_sRGB"),       AlwaysSupported(), VersionOrExts(2, 1, "GL_EXT_texture_sRGB"),    VersionOnly(3, 0),                          AlwaysSupported(), VersionOrExts(3, 0, "GL_EXT_sRGB")        );
>-    InsertFormatMapping(&map, GL_R8I,               VersionOrExts(3, 0, "GL_ARB_texture_rg"),         NeverSupported(),  VersionOrExts(3, 0, "GL_ARB_texture_rg"),      VersionOnly(3, 0),                          NeverSupported(),  VersionOnly(3, 0)                         );
>-    InsertFormatMapping(&map, GL_R8UI,              VersionOrExts(3, 0, "GL_ARB_texture_rg"),         NeverSupported(),  VersionOrExts(3, 0, "GL_ARB_texture_rg"),      VersionOnly(3, 0),                          NeverSupported(),  VersionOnly(3, 0)                         );
>-    InsertFormatMapping(&map, GL_R16I,              VersionOrExts(3, 0, "GL_ARB_texture_rg"),         NeverSupported(),  VersionOrExts(3, 0, "GL_ARB_texture_rg"),      VersionOnly(3, 0),                          NeverSupported(),  VersionOnly(3, 0)                         );
>-    InsertFormatMapping(&map, GL_R16UI,             VersionOrExts(3, 0, "GL_ARB_texture_rg"),         NeverSupported(),  VersionOrExts(3, 0, "GL_ARB_texture_rg"),      VersionOnly(3, 0),                          NeverSupported(),  VersionOnly(3, 0)                         );
>-    InsertFormatMapping(&map, GL_R32I,              VersionOrExts(3, 0, "GL_ARB_texture_rg"),         NeverSupported(),  VersionOrExts(3, 0, "GL_ARB_texture_rg"),      VersionOnly(3, 0),                          NeverSupported(),  VersionOnly(3, 0)                         );
>-    InsertFormatMapping(&map, GL_R32UI,             VersionOrExts(3, 0, "GL_ARB_texture_rg"),         NeverSupported(),  VersionOrExts(3, 0, "GL_ARB_texture_rg"),      VersionOnly(3, 0),                          NeverSupported(),  VersionOnly(3, 0)                         );
>-    InsertFormatMapping(&map, GL_RG8I,              VersionOrExts(3, 0, "GL_ARB_texture_rg"),         NeverSupported(),  VersionOrExts(3, 0, "GL_ARB_texture_rg"),      VersionOnly(3, 0),                          NeverSupported(),  VersionOnly(3, 0)                         );
>-    InsertFormatMapping(&map, GL_RG8UI,             VersionOrExts(3, 0, "GL_ARB_texture_rg"),         NeverSupported(),  VersionOrExts(3, 0, "GL_ARB_texture_rg"),      VersionOnly(3, 0),                          NeverSupported(),  VersionOnly(3, 0)                         );
>-    InsertFormatMapping(&map, GL_RG16I,             VersionOrExts(3, 0, "GL_ARB_texture_rg"),         NeverSupported(),  VersionOrExts(3, 0, "GL_ARB_texture_rg"),      VersionOnly(3, 0),                          NeverSupported(),  VersionOnly(3, 0)                         );
>-    InsertFormatMapping(&map, GL_RG16UI,            VersionOrExts(3, 0, "GL_ARB_texture_rg"),         NeverSupported(),  VersionOrExts(3, 0, "GL_ARB_texture_rg"),      VersionOnly(3, 0),                          NeverSupported(),  VersionOnly(3, 0)                         );
>-    InsertFormatMapping(&map, GL_RG32I,             VersionOrExts(3, 0, "GL_ARB_texture_rg"),         NeverSupported(),  VersionOrExts(3, 0, "GL_ARB_texture_rg"),      VersionOnly(3, 0),                          NeverSupported(),  VersionOnly(3, 0)                         );
>-    InsertFormatMapping(&map, GL_RG32UI,            VersionOrExts(3, 0, "GL_ARB_texture_rg"),         NeverSupported(),  VersionOrExts(3, 0, "GL_ARB_texture_rg"),      VersionOnly(3, 0),                          NeverSupported(),  VersionOnly(3, 0)                         );
>-    InsertFormatMapping(&map, GL_RGB8I,             VersionOrExts(3, 0, "GL_EXT_texture_integer"),    NeverSupported(),  NeverSupported(),                              VersionOnly(3, 0),                          NeverSupported(),  NeverSupported()                          );
>-    InsertFormatMapping(&map, GL_RGB8UI,            VersionOrExts(3, 0, "GL_EXT_texture_integer"),    NeverSupported(),  NeverSupported(),                              VersionOnly(3, 0),                          NeverSupported(),  NeverSupported()                          );
>-    InsertFormatMapping(&map, GL_RGB16I,            VersionOrExts(3, 0, "GL_EXT_texture_integer"),    NeverSupported(),  NeverSupported(),                              VersionOnly(3, 0),                          NeverSupported(),  NeverSupported()                          );
>-    InsertFormatMapping(&map, GL_RGB16UI,           VersionOrExts(3, 0, "GL_EXT_texture_integer"),    NeverSupported(),  NeverSupported(),                              VersionOnly(3, 0),                          NeverSupported(),  NeverSupported()                          );
>-    InsertFormatMapping(&map, GL_RGB32I,            VersionOrExts(3, 0, "GL_EXT_texture_integer"),    NeverSupported(),  NeverSupported(),                              VersionOnly(3, 0),                          NeverSupported(),  NeverSupported()                          );
>-    InsertFormatMapping(&map, GL_RGB32UI,           VersionOrExts(3, 0, "GL_EXT_texture_integer"),    NeverSupported(),  NeverSupported(),                              VersionOnly(3, 0),                          NeverSupported(),  NeverSupported()                          );
>-    InsertFormatMapping(&map, GL_RGBA8I,            VersionOrExts(3, 0, "GL_EXT_texture_integer"),    NeverSupported(),  VersionOrExts(3, 0, "GL_EXT_texture_integer"), VersionOnly(3, 0),                          NeverSupported(),  VersionOnly(3, 0)                         );
>-    InsertFormatMapping(&map, GL_RGBA8UI,           VersionOrExts(3, 0, "GL_EXT_texture_integer"),    NeverSupported(),  VersionOrExts(3, 0, "GL_EXT_texture_integer"), VersionOnly(3, 0),                          NeverSupported(),  VersionOnly(3, 0)                         );
>-    InsertFormatMapping(&map, GL_RGBA16I,           VersionOrExts(3, 0, "GL_EXT_texture_integer"),    NeverSupported(),  VersionOrExts(3, 0, "GL_EXT_texture_integer"), VersionOnly(3, 0),                          NeverSupported(),  VersionOnly(3, 0)                         );
>-    InsertFormatMapping(&map, GL_RGBA16UI,          VersionOrExts(3, 0, "GL_EXT_texture_integer"),    NeverSupported(),  VersionOrExts(3, 0, "GL_EXT_texture_integer"), VersionOnly(3, 0),                          NeverSupported(),  VersionOnly(3, 0)                         );
>-    InsertFormatMapping(&map, GL_RGBA32I,           VersionOrExts(3, 0, "GL_EXT_texture_integer"),    NeverSupported(),  VersionOrExts(3, 0, "GL_EXT_texture_integer"), VersionOnly(3, 0),                          NeverSupported(),  VersionOnly(3, 0)                         );
>-    InsertFormatMapping(&map, GL_RGBA32UI,          VersionOrExts(3, 0, "GL_EXT_texture_integer"),    NeverSupported(),  VersionOrExts(3, 0, "GL_EXT_texture_integer"), VersionOnly(3, 0),                          NeverSupported(),  VersionOnly(3, 0)                         );
>+    //                       | Format              | OpenGL texture support                          | Filter           | OpenGL render support                        | OpenGL ES texture support                 | Filter           | OpenGL ES texture attachment support    | OpenGL ES renderbuffer support           |
>+    InsertFormatMapping(&map, GL_R8,                VersionOrExts(3, 0, "GL_ARB_texture_rg"),         AlwaysSupported(), VersionOrExts(3, 0, "GL_ARB_texture_rg"),      VersionOrExts(3, 0, "GL_EXT_texture_rg"),   AlwaysSupported(), VersionOrExts(3, 0, "GL_EXT_texture_rg"), VersionOrExts(3, 0, "GL_EXT_texture_rg")  );
>+    InsertFormatMapping(&map, GL_R8_SNORM,          VersionOnly(3, 1),                                AlwaysSupported(), NeverSupported(),                              VersionOnly(3, 0),                          AlwaysSupported(), NeverSupported(),                         NeverSupported()                          );
>+    InsertFormatMapping(&map, GL_RG8,               VersionOrExts(3, 0, "GL_ARB_texture_rg"),         AlwaysSupported(), VersionOrExts(3, 0, "GL_ARB_texture_rg"),      VersionOrExts(3, 0, "GL_EXT_texture_rg"),   AlwaysSupported(), VersionOrExts(3, 0, "GL_EXT_texture_rg"), VersionOrExts(3, 0, "GL_EXT_texture_rg")  );
>+    InsertFormatMapping(&map, GL_RG8_SNORM,         VersionOnly(3, 1),                                AlwaysSupported(), NeverSupported(),                              VersionOnly(3, 0),                          AlwaysSupported(), NeverSupported(),                         NeverSupported()                          );
>+    InsertFormatMapping(&map, GL_RGB8,              AlwaysSupported(),                                AlwaysSupported(), AlwaysSupported(),                             AlwaysSupported(),                          AlwaysSupported(), VersionOnly(2, 0),                        VersionOrExts(3, 0, "GL_OES_rgb8_rgba8")  );
>+    InsertFormatMapping(&map, GL_RGB8_SNORM,        VersionOnly(3, 1),                                AlwaysSupported(), NeverSupported(),                              VersionOnly(3, 0),                          AlwaysSupported(), NeverSupported(),                         NeverSupported()                          );
>+    InsertFormatMapping(&map, GL_RGB565,            AlwaysSupported(),                                AlwaysSupported(), AlwaysSupported(),                             AlwaysSupported(),                          AlwaysSupported(), AlwaysSupported(),                        AlwaysSupported()                         );
>+    InsertFormatMapping(&map, GL_RGBA4,             AlwaysSupported(),                                AlwaysSupported(), AlwaysSupported(),                             AlwaysSupported(),                          AlwaysSupported(), AlwaysSupported(),                        AlwaysSupported()                         );
>+    InsertFormatMapping(&map, GL_RGB5_A1,           AlwaysSupported(),                                AlwaysSupported(), AlwaysSupported(),                             AlwaysSupported(),                          AlwaysSupported(), AlwaysSupported(),                        AlwaysSupported()                         );
>+    InsertFormatMapping(&map, GL_RGBA8,             AlwaysSupported(),                                AlwaysSupported(), AlwaysSupported(),                             AlwaysSupported(),                          AlwaysSupported(), VersionOnly(2, 0),                        VersionOrExts(3, 0, "GL_OES_rgb8_rgba8")  );
>+    InsertFormatMapping(&map, GL_RGBA8_SNORM,       VersionOnly(3, 1),                                AlwaysSupported(), NeverSupported(),                              VersionOnly(3, 0),                          AlwaysSupported(), NeverSupported(),                         NeverSupported()                          );
>+    InsertFormatMapping(&map, GL_RGB10_A2,          AlwaysSupported(),                                AlwaysSupported(), AlwaysSupported(),                             VersionOnly(3, 0),                          AlwaysSupported(), VersionOnly(3, 0),                        VersionOnly(3, 0)                         );
>+    InsertFormatMapping(&map, GL_RGB10_A2UI,        VersionOrExts(3, 3, "GL_ARB_texture_rgb10_a2ui"), NeverSupported(),  AlwaysSupported(),                             VersionOnly(3, 0),                          NeverSupported(),  AlwaysSupported(),                        AlwaysSupported()                         );
>+    InsertFormatMapping(&map, GL_SRGB8,             VersionOrExts(2, 1, "GL_EXT_texture_sRGB"),       AlwaysSupported(), VersionOrExts(2, 1, "GL_EXT_texture_sRGB"),    VersionOrExts(3, 0, "GL_EXT_sRGB"),         AlwaysSupported(), NeverSupported(),                         NeverSupported()                          );
>+    InsertFormatMapping(&map, GL_SRGB8_ALPHA8,      VersionOrExts(2, 1, "GL_EXT_texture_sRGB"),       AlwaysSupported(), VersionOrExts(2, 1, "GL_EXT_texture_sRGB"),    VersionOrExts(3, 0, "GL_EXT_sRGB"),         AlwaysSupported(), VersionOrExts(3, 0, "GL_EXT_sRGB"),       VersionOrExts(3, 0, "GL_EXT_sRGB")        );
>+    InsertFormatMapping(&map, GL_R8I,               VersionOrExts(3, 0, "GL_ARB_texture_rg"),         NeverSupported(),  VersionOrExts(3, 0, "GL_ARB_texture_rg"),      VersionOnly(3, 0),                          NeverSupported(),  VersionOnly(3, 0),                        VersionOnly(3, 0)                         );
>+    InsertFormatMapping(&map, GL_R8UI,              VersionOrExts(3, 0, "GL_ARB_texture_rg"),         NeverSupported(),  VersionOrExts(3, 0, "GL_ARB_texture_rg"),      VersionOnly(3, 0),                          NeverSupported(),  VersionOnly(3, 0),                        VersionOnly(3, 0)                         );
>+    InsertFormatMapping(&map, GL_R16I,              VersionOrExts(3, 0, "GL_ARB_texture_rg"),         NeverSupported(),  VersionOrExts(3, 0, "GL_ARB_texture_rg"),      VersionOnly(3, 0),                          NeverSupported(),  VersionOnly(3, 0),                        VersionOnly(3, 0)                         );
>+    InsertFormatMapping(&map, GL_R16UI,             VersionOrExts(3, 0, "GL_ARB_texture_rg"),         NeverSupported(),  VersionOrExts(3, 0, "GL_ARB_texture_rg"),      VersionOnly(3, 0),                          NeverSupported(),  VersionOnly(3, 0),                        VersionOnly(3, 0)                         );
>+    InsertFormatMapping(&map, GL_R32I,              VersionOrExts(3, 0, "GL_ARB_texture_rg"),         NeverSupported(),  VersionOrExts(3, 0, "GL_ARB_texture_rg"),      VersionOnly(3, 0),                          NeverSupported(),  VersionOnly(3, 0),                        VersionOnly(3, 0)                         );
>+    InsertFormatMapping(&map, GL_R32UI,             VersionOrExts(3, 0, "GL_ARB_texture_rg"),         NeverSupported(),  VersionOrExts(3, 0, "GL_ARB_texture_rg"),      VersionOnly(3, 0),                          NeverSupported(),  VersionOnly(3, 0),                        VersionOnly(3, 0)                         );
>+    InsertFormatMapping(&map, GL_RG8I,              VersionOrExts(3, 0, "GL_ARB_texture_rg"),         NeverSupported(),  VersionOrExts(3, 0, "GL_ARB_texture_rg"),      VersionOnly(3, 0),                          NeverSupported(),  VersionOnly(3, 0),                        VersionOnly(3, 0)                         );
>+    InsertFormatMapping(&map, GL_RG8UI,             VersionOrExts(3, 0, "GL_ARB_texture_rg"),         NeverSupported(),  VersionOrExts(3, 0, "GL_ARB_texture_rg"),      VersionOnly(3, 0),                          NeverSupported(),  VersionOnly(3, 0),                        VersionOnly(3, 0)                         );
>+    InsertFormatMapping(&map, GL_RG16I,             VersionOrExts(3, 0, "GL_ARB_texture_rg"),         NeverSupported(),  VersionOrExts(3, 0, "GL_ARB_texture_rg"),      VersionOnly(3, 0),                          NeverSupported(),  VersionOnly(3, 0),                        VersionOnly(3, 0)                         );
>+    InsertFormatMapping(&map, GL_RG16UI,            VersionOrExts(3, 0, "GL_ARB_texture_rg"),         NeverSupported(),  VersionOrExts(3, 0, "GL_ARB_texture_rg"),      VersionOnly(3, 0),                          NeverSupported(),  VersionOnly(3, 0),                        VersionOnly(3, 0)                         );
>+    InsertFormatMapping(&map, GL_RG32I,             VersionOrExts(3, 0, "GL_ARB_texture_rg"),         NeverSupported(),  VersionOrExts(3, 0, "GL_ARB_texture_rg"),      VersionOnly(3, 0),                          NeverSupported(),  VersionOnly(3, 0),                        VersionOnly(3, 0)                         );
>+    InsertFormatMapping(&map, GL_RG32UI,            VersionOrExts(3, 0, "GL_ARB_texture_rg"),         NeverSupported(),  VersionOrExts(3, 0, "GL_ARB_texture_rg"),      VersionOnly(3, 0),                          NeverSupported(),  VersionOnly(3, 0),                        VersionOnly(3, 0)                         );
>+    InsertFormatMapping(&map, GL_RGB8I,             VersionOrExts(3, 0, "GL_EXT_texture_integer"),    NeverSupported(),  NeverSupported(),                              VersionOnly(3, 0),                          NeverSupported(),  NeverSupported(),                         NeverSupported()                          );
>+    InsertFormatMapping(&map, GL_RGB8UI,            VersionOrExts(3, 0, "GL_EXT_texture_integer"),    NeverSupported(),  NeverSupported(),                              VersionOnly(3, 0),                          NeverSupported(),  NeverSupported(),                         NeverSupported()                          );
>+    InsertFormatMapping(&map, GL_RGB16I,            VersionOrExts(3, 0, "GL_EXT_texture_integer"),    NeverSupported(),  NeverSupported(),                              VersionOnly(3, 0),                          NeverSupported(),  NeverSupported(),                         NeverSupported()                          );
>+    InsertFormatMapping(&map, GL_RGB16UI,           VersionOrExts(3, 0, "GL_EXT_texture_integer"),    NeverSupported(),  NeverSupported(),                              VersionOnly(3, 0),                          NeverSupported(),  NeverSupported(),                         NeverSupported()                          );
>+    InsertFormatMapping(&map, GL_RGB32I,            VersionOrExts(3, 0, "GL_EXT_texture_integer"),    NeverSupported(),  NeverSupported(),                              VersionOnly(3, 0),                          NeverSupported(),  NeverSupported(),                         NeverSupported()                          );
>+    InsertFormatMapping(&map, GL_RGB32UI,           VersionOrExts(3, 0, "GL_EXT_texture_integer"),    NeverSupported(),  NeverSupported(),                              VersionOnly(3, 0),                          NeverSupported(),  NeverSupported(),                         NeverSupported()                          );
>+    InsertFormatMapping(&map, GL_RGBA8I,            VersionOrExts(3, 0, "GL_EXT_texture_integer"),    NeverSupported(),  VersionOrExts(3, 0, "GL_EXT_texture_integer"), VersionOnly(3, 0),                          NeverSupported(),  VersionOnly(3, 0),                        VersionOnly(3, 0)                         );
>+    InsertFormatMapping(&map, GL_RGBA8UI,           VersionOrExts(3, 0, "GL_EXT_texture_integer"),    NeverSupported(),  VersionOrExts(3, 0, "GL_EXT_texture_integer"), VersionOnly(3, 0),                          NeverSupported(),  VersionOnly(3, 0),                        VersionOnly(3, 0)                         );
>+    InsertFormatMapping(&map, GL_RGBA16I,           VersionOrExts(3, 0, "GL_EXT_texture_integer"),    NeverSupported(),  VersionOrExts(3, 0, "GL_EXT_texture_integer"), VersionOnly(3, 0),                          NeverSupported(),  VersionOnly(3, 0),                        VersionOnly(3, 0)                         );
>+    InsertFormatMapping(&map, GL_RGBA16UI,          VersionOrExts(3, 0, "GL_EXT_texture_integer"),    NeverSupported(),  VersionOrExts(3, 0, "GL_EXT_texture_integer"), VersionOnly(3, 0),                          NeverSupported(),  VersionOnly(3, 0),                        VersionOnly(3, 0)                         );
>+    InsertFormatMapping(&map, GL_RGBA32I,           VersionOrExts(3, 0, "GL_EXT_texture_integer"),    NeverSupported(),  VersionOrExts(3, 0, "GL_EXT_texture_integer"), VersionOnly(3, 0),                          NeverSupported(),  VersionOnly(3, 0),                        VersionOnly(3, 0)                         );
>+    InsertFormatMapping(&map, GL_RGBA32UI,          VersionOrExts(3, 0, "GL_EXT_texture_integer"),    NeverSupported(),  VersionOrExts(3, 0, "GL_EXT_texture_integer"), VersionOnly(3, 0),                          NeverSupported(),  VersionOnly(3, 0),                        VersionOnly(3, 0)                         );
> 
>     // Unsized formats
>-    InsertFormatMapping(&map, GL_ALPHA,             NeverSupported(),                                 NeverSupported(),  NeverSupported(),                              NeverSupported(),                           NeverSupported(),  NeverSupported()                          );
>-    InsertFormatMapping(&map, GL_LUMINANCE,         NeverSupported(),                                 NeverSupported(),  NeverSupported(),                              NeverSupported(),                           NeverSupported(),  NeverSupported()                          );
>-    InsertFormatMapping(&map, GL_LUMINANCE_ALPHA,   NeverSupported(),                                 NeverSupported(),  NeverSupported(),                              NeverSupported(),                           NeverSupported(),  NeverSupported()                          );
>-    InsertFormatMapping(&map, GL_RED,               VersionOrExts(3, 0, "GL_ARB_texture_rg"),         AlwaysSupported(), VersionOrExts(3, 0, "GL_ARB_texture_rg"),      VersionOrExts(3, 0, "GL_EXT_texture_rg"),   AlwaysSupported(), VersionOrExts(3, 0, "GL_ARB_texture_rg")  );
>-    InsertFormatMapping(&map, GL_RG,                VersionOrExts(3, 0, "GL_ARB_texture_rg"),         AlwaysSupported(), VersionOrExts(3, 0, "GL_ARB_texture_rg"),      VersionOrExts(3, 0, "GL_EXT_texture_rg"),   AlwaysSupported(), VersionOrExts(3, 0, "GL_ARB_texture_rg")  );
>-    InsertFormatMapping(&map, GL_RGB,               AlwaysSupported(),                                AlwaysSupported(), AlwaysSupported(),                             AlwaysSupported(),                          AlwaysSupported(), AlwaysSupported()                         );
>-    InsertFormatMapping(&map, GL_RGBA,              AlwaysSupported(),                                AlwaysSupported(), AlwaysSupported(),                             AlwaysSupported(),                          AlwaysSupported(), AlwaysSupported()                         );
>-    InsertFormatMapping(&map, GL_RED_INTEGER,       VersionOrExts(3, 0, "GL_ARB_texture_rg"),         NeverSupported(),  VersionOrExts(3, 0, "GL_ARB_texture_rg"),      VersionOnly(3, 0),                          NeverSupported(),  VersionOnly(3, 0)                         );
>-    InsertFormatMapping(&map, GL_RG_INTEGER,        VersionOrExts(3, 0, "GL_ARB_texture_rg"),         NeverSupported(),  VersionOrExts(3, 0, "GL_ARB_texture_rg"),      VersionOnly(3, 0),                          NeverSupported(),  VersionOnly(3, 0)                         );
>-    InsertFormatMapping(&map, GL_RGB_INTEGER,       VersionOrExts(3, 0, "GL_EXT_texture_integer"),    NeverSupported(),  NeverSupported(),                              VersionOnly(3, 0),                          NeverSupported(),  NeverSupported()                          );
>-    InsertFormatMapping(&map, GL_RGBA_INTEGER,      VersionOrExts(3, 0, "GL_EXT_texture_integer"),    NeverSupported(),  VersionOrExts(3, 0, "GL_EXT_texture_integer"), VersionOnly(3, 0),                          NeverSupported(),  VersionOnly(3, 0)                         );
>-    InsertFormatMapping(&map, GL_SRGB,              VersionOrExts(2, 1, "GL_EXT_texture_sRGB"),       AlwaysSupported(), VersionOrExts(2, 1, "GL_EXT_texture_sRGB"),    ExtsOnly("GL_EXT_sRGB"),                    AlwaysSupported(), NeverSupported()                          );
>-    InsertFormatMapping(&map, GL_SRGB_ALPHA,        VersionOrExts(2, 1, "GL_EXT_texture_sRGB"),       AlwaysSupported(), VersionOrExts(2, 1, "GL_EXT_texture_sRGB"),    ExtsOnly("GL_EXT_sRGB"),                    AlwaysSupported(), NeverSupported()                          );
>+    InsertFormatMapping(&map, GL_ALPHA,             NeverSupported(),                                 NeverSupported(),  NeverSupported(),                              AlwaysSupported(),                          AlwaysSupported(), NeverSupported(),                         NeverSupported()                          );
>+    InsertFormatMapping(&map, GL_LUMINANCE,         NeverSupported(),                                 NeverSupported(),  NeverSupported(),                              AlwaysSupported(),                          AlwaysSupported(), NeverSupported(),                         NeverSupported()                          );
>+    InsertFormatMapping(&map, GL_LUMINANCE_ALPHA,   NeverSupported(),                                 NeverSupported(),  NeverSupported(),                              AlwaysSupported(),                          AlwaysSupported(), NeverSupported(),                         NeverSupported()                          );
>+    InsertFormatMapping(&map, GL_RED,               VersionOrExts(3, 0, "GL_ARB_texture_rg"),         AlwaysSupported(), VersionOrExts(3, 0, "GL_ARB_texture_rg"),      ExtsOnly("GL_EXT_texture_rg"),              AlwaysSupported(), ExtsOnly("GL_EXT_texture_rg"),            NeverSupported()                          );
>+    InsertFormatMapping(&map, GL_RG,                VersionOrExts(3, 0, "GL_ARB_texture_rg"),         AlwaysSupported(), VersionOrExts(3, 0, "GL_ARB_texture_rg"),      ExtsOnly("GL_EXT_texture_rg"),              AlwaysSupported(), ExtsOnly("GL_EXT_texture_rg"),            NeverSupported()                          );
>+    InsertFormatMapping(&map, GL_RGB,               AlwaysSupported(),                                AlwaysSupported(), AlwaysSupported(),                             AlwaysSupported(),                          AlwaysSupported(), VersionOnly(2, 0),                        NeverSupported()                          );
>+    InsertFormatMapping(&map, GL_RGBA,              AlwaysSupported(),                                AlwaysSupported(), AlwaysSupported(),                             AlwaysSupported(),                          AlwaysSupported(), VersionOnly(2, 0),                        NeverSupported()                          );
>+    InsertFormatMapping(&map, GL_RED_INTEGER,       VersionOrExts(3, 0, "GL_ARB_texture_rg"),         NeverSupported(),  VersionOrExts(3, 0, "GL_ARB_texture_rg"),      VersionOnly(3, 0),                          NeverSupported(),  VersionOnly(3, 0),                        NeverSupported()                          );
>+    InsertFormatMapping(&map, GL_RG_INTEGER,        VersionOrExts(3, 0, "GL_ARB_texture_rg"),         NeverSupported(),  VersionOrExts(3, 0, "GL_ARB_texture_rg"),      VersionOnly(3, 0),                          NeverSupported(),  VersionOnly(3, 0),                        NeverSupported()                          );
>+    InsertFormatMapping(&map, GL_RGB_INTEGER,       VersionOrExts(3, 0, "GL_EXT_texture_integer"),    NeverSupported(),  NeverSupported(),                              VersionOnly(3, 0),                          NeverSupported(),  NeverSupported(),                         NeverSupported()                          );
>+    InsertFormatMapping(&map, GL_RGBA_INTEGER,      VersionOrExts(3, 0, "GL_EXT_texture_integer"),    NeverSupported(),  VersionOrExts(3, 0, "GL_EXT_texture_integer"), VersionOnly(3, 0),                          NeverSupported(),  VersionOnly(3, 0),                        NeverSupported()                          );
>+    InsertFormatMapping(&map, GL_SRGB,              VersionOrExts(2, 1, "GL_EXT_texture_sRGB"),       AlwaysSupported(), VersionOrExts(2, 1, "GL_EXT_texture_sRGB"),    ExtsOnly("GL_EXT_sRGB"),                    AlwaysSupported(), NeverSupported(),                         NeverSupported()                          );
>+    InsertFormatMapping(&map, GL_SRGB_ALPHA,        VersionOrExts(2, 1, "GL_EXT_texture_sRGB"),       AlwaysSupported(), VersionOrExts(2, 1, "GL_EXT_texture_sRGB"),    ExtsOnly("GL_EXT_sRGB"),                    AlwaysSupported(), ExtsOnly("GL_EXT_sRGB"),                  NeverSupported()                          );
> 
>     // From GL_EXT_texture_format_BGRA8888
>-    InsertFormatMapping(&map, GL_BGRA8_EXT,         VersionOrExts(1, 2, "GL_EXT_bgra"),               AlwaysSupported(), VersionOrExts(1, 2, "GL_EXT_bgra"),            ExtsOnly("GL_EXT_texture_format_BGRA8888"), AlwaysSupported(), NeverSupported()                          );
>-    InsertFormatMapping(&map, GL_BGRA_EXT,          VersionOrExts(1, 2, "GL_EXT_bgra"),               AlwaysSupported(), VersionOrExts(1, 2, "GL_EXT_bgra"),            ExtsOnly("GL_EXT_texture_format_BGRA8888"), AlwaysSupported(), NeverSupported()                          );
>+    InsertFormatMapping(&map, GL_BGRA8_EXT,         VersionOrExts(1, 2, "GL_EXT_bgra"),               AlwaysSupported(), VersionOrExts(1, 2, "GL_EXT_bgra"),            ExtsOnly("GL_EXT_texture_format_BGRA8888"), AlwaysSupported(), NeverSupported(),                         NeverSupported()                          );
>+    InsertFormatMapping(&map, GL_BGRA_EXT,          VersionOrExts(1, 2, "GL_EXT_bgra"),               AlwaysSupported(), VersionOrExts(1, 2, "GL_EXT_bgra"),            ExtsOnly("GL_EXT_texture_format_BGRA8888"), AlwaysSupported(), NeverSupported(),                         NeverSupported()                          );
> 
>     // Floating point formats
>-    // Note that GL_EXT_texture_shared_exponent and GL_ARB_color_buffer_float suggest that RGB9_E5
>+    // Note 1: GL_EXT_texture_shared_exponent and GL_ARB_color_buffer_float suggest that RGB9_E5
>     // would be renderable, but once support for renderable float textures got rolled into core GL
>     // spec it wasn't intended to be renderable. In practice it's not reliably renderable even
>     // with the extensions, there's a known bug in at least NVIDIA driver version 370.
>-    //                       | Format              | OpenGL texture support                                       | Filter           | OpenGL render support                                                                  | OpenGL ES texture support                                         | Filter                                                 | OpenGL ES render support                                                        |
>-    InsertFormatMapping(&map, GL_R11F_G11F_B10F,    VersionOrExts(3, 0, "GL_EXT_packed_float"),                    AlwaysSupported(), VersionOrExts(3, 0, "GL_EXT_packed_float GL_ARB_color_buffer_float"),                    VersionOnly(3, 0),                                                  AlwaysSupported(),                                       ExtsOnly("GL_EXT_color_buffer_float")                                            );
>-    InsertFormatMapping(&map, GL_RGB9_E5,           VersionOrExts(3, 0, "GL_EXT_texture_shared_exponent"),         AlwaysSupported(), NeverSupported(),                                                                        VersionOnly(3, 0),                                                  AlwaysSupported(),                                       NeverSupported()                                                                 );
>-    InsertFormatMapping(&map, GL_R16F,              VersionOrExts(3, 0, "GL_ARB_texture_rg ARB_texture_float"),    AlwaysSupported(), VersionOrExts(3, 0, "GL_ARB_texture_rg GL_ARB_texture_float GL_ARB_color_buffer_float"), VersionOrExts(3, 0, "GL_OES_texture_half_float GL_EXT_texture_rg"), VersionOrExts(3, 0, "GL_OES_texture_half_float_linear"), VersionOrExtsAndExts(3, 0, "GL_EXT_texture_rg", "GL_EXT_color_buffer_half_float"));
>-    InsertFormatMapping(&map, GL_RG16F,             VersionOrExts(3, 0, "GL_ARB_texture_rg ARB_texture_float"),    AlwaysSupported(), VersionOrExts(3, 0, "GL_ARB_texture_rg GL_ARB_texture_float GL_ARB_color_buffer_float"), VersionOrExts(3, 0, "GL_OES_texture_half_float GL_EXT_texture_rg"), VersionOrExts(3, 0, "GL_OES_texture_half_float_linear"), VersionOrExtsAndExts(3, 0, "GL_EXT_texture_rg", "GL_EXT_color_buffer_half_float"));
>-    InsertFormatMapping(&map, GL_RGB16F,            VersionOrExts(3, 0, "GL_ARB_texture_float"),                   AlwaysSupported(), VersionOrExts(3, 0, "GL_ARB_texture_float GL_ARB_color_buffer_float"),                   VersionOrExts(3, 0, "GL_OES_texture_half_float"),                   VersionOrExts(3, 0, "GL_OES_texture_half_float_linear"), ExtsOnly("GL_EXT_color_buffer_half_float")                                       );
>-    InsertFormatMapping(&map, GL_RGBA16F,           VersionOrExts(3, 0, "GL_ARB_texture_float"),                   AlwaysSupported(), VersionOrExts(3, 0, "GL_ARB_texture_float GL_ARB_color_buffer_float"),                   VersionOrExts(3, 0, "GL_OES_texture_half_float"),                   VersionOrExts(3, 0, "GL_OES_texture_half_float_linear"), ExtsOnly("GL_EXT_color_buffer_half_float")                                       );
>-    InsertFormatMapping(&map, GL_R32F,              VersionOrExts(3, 0, "GL_ARB_texture_rg GL_ARB_texture_float"), AlwaysSupported(), VersionOrExts(3, 0, "GL_ARB_texture_rg GL_ARB_texture_float GL_ARB_color_buffer_float"), VersionOrExts(3, 0, "GL_OES_texture_float GL_EXT_texture_rg"),      ExtsOnly("GL_OES_texture_float_linear"),                 ExtsOnly("GL_EXT_color_buffer_float")                                            );
>-    InsertFormatMapping(&map, GL_RG32F,             VersionOrExts(3, 0, "GL_ARB_texture_rg GL_ARB_texture_float"), AlwaysSupported(), VersionOrExts(3, 0, "GL_ARB_texture_rg GL_ARB_texture_float GL_ARB_color_buffer_float"), VersionOrExts(3, 0, "GL_OES_texture_float GL_EXT_texture_rg"),      ExtsOnly("GL_OES_texture_float_linear"),                 ExtsOnly("GL_EXT_color_buffer_float")                                            );
>-    InsertFormatMapping(&map, GL_RGB32F,            VersionOrExts(3, 0, "GL_ARB_texture_float"),                   AlwaysSupported(), VersionOrExts(3, 0, "GL_ARB_texture_float GL_ARB_color_buffer_float"),                   VersionOrExts(3, 0, "GL_OES_texture_float"),                        ExtsOnly("GL_OES_texture_float_linear"),                 NeverSupported()                                                                 );
>-    InsertFormatMapping(&map, GL_RGBA32F,           VersionOrExts(3, 0, "GL_ARB_texture_float"),                   AlwaysSupported(), VersionOrExts(3, 0, "GL_ARB_texture_float GL_ARB_color_buffer_float"),                   VersionOrExts(3, 0, "GL_OES_texture_float"),                        ExtsOnly("GL_OES_texture_float_linear"),                 ExtsOnly("GL_EXT_color_buffer_float")                                            );
>+    //
>+    // Note 2: It's a bit unclear whether texture attachments with GL_RGB16F should be supported
>+    // in ES3 with GL_EXT_color_buffer_half_float. Probably not, since in ES3 type is HALF_FLOAT,
>+    // but GL_EXT_color_buffer_half_float is applicable only to type HALF_FLOAT_OES.
>+    //
>+    // Note 3: GL_EXT_color_buffer_float implies that ES3.0 is supported, this simplifies the check.
>+    //
>+    //                       | Format              | OpenGL texture support                                       | Filter           | OpenGL render support                                                                  | OpenGL ES texture support                                         | Filter                                                 | OpenGL ES texture attachment support                                                                                                      | OpenGL ES renderbuffer support                                                                                    |
>+    InsertFormatMapping(&map, GL_R11F_G11F_B10F,    VersionOrExts(3, 0, "GL_EXT_packed_float"),                    AlwaysSupported(), VersionOrExts(3, 0, "GL_EXT_packed_float GL_ARB_color_buffer_float"),                    VersionOnly(3, 0),                                                  AlwaysSupported(),                                       ExtsOnly("GL_EXT_color_buffer_float"),                                                                                                      ExtsOnly("GL_EXT_color_buffer_float")                                                                              );
>+    InsertFormatMapping(&map, GL_RGB9_E5,           VersionOrExts(3, 0, "GL_EXT_texture_shared_exponent"),         AlwaysSupported(), NeverSupported(),                                                                        VersionOnly(3, 0),                                                  AlwaysSupported(),                                       NeverSupported(),                                                                                                                           NeverSupported()                                                                                                   );
>+    InsertFormatMapping(&map, GL_R16F,              VersionOrExts(3, 0, "GL_ARB_texture_rg ARB_texture_float"),    AlwaysSupported(), VersionOrExts(3, 0, "GL_ARB_texture_rg GL_ARB_texture_float GL_ARB_color_buffer_float"), VersionOrExts(3, 0, "GL_OES_texture_half_float GL_EXT_texture_rg"), VersionOrExts(3, 0, "GL_OES_texture_half_float_linear"), ExtsOnly("GL_EXT_texture_storage GL_OES_texture_half_float GL_EXT_texture_rg GL_EXT_color_buffer_half_float", "GL_EXT_color_buffer_float"), ExtsOnly("GL_EXT_texture_rg GL_OES_texture_half_float GL_EXT_color_buffer_half_float", "GL_EXT_color_buffer_float"));
>+    InsertFormatMapping(&map, GL_RG16F,             VersionOrExts(3, 0, "GL_ARB_texture_rg ARB_texture_float"),    AlwaysSupported(), VersionOrExts(3, 0, "GL_ARB_texture_rg GL_ARB_texture_float GL_ARB_color_buffer_float"), VersionOrExts(3, 0, "GL_OES_texture_half_float GL_EXT_texture_rg"), VersionOrExts(3, 0, "GL_OES_texture_half_float_linear"), ExtsOnly("GL_EXT_texture_storage GL_OES_texture_half_float GL_EXT_texture_rg GL_EXT_color_buffer_half_float", "GL_EXT_color_buffer_float"), ExtsOnly("GL_EXT_texture_rg GL_OES_texture_half_float GL_EXT_color_buffer_half_float", "GL_EXT_color_buffer_float"));
>+    InsertFormatMapping(&map, GL_RGB16F,            VersionOrExts(3, 0, "GL_ARB_texture_float"),                   AlwaysSupported(), VersionOrExts(3, 0, "GL_ARB_texture_float GL_ARB_color_buffer_float"),                   VersionOrExts(3, 0, "GL_OES_texture_half_float"),                   VersionOrExts(3, 0, "GL_OES_texture_half_float_linear"), ExtsOnly("GL_EXT_texture_storage GL_OES_texture_half_float GL_EXT_color_buffer_half_float"),                                                ExtsOnly("GL_OES_texture_half_float GL_EXT_color_buffer_half_float")                                               );
>+    InsertFormatMapping(&map, GL_RGBA16F,           VersionOrExts(3, 0, "GL_ARB_texture_float"),                   AlwaysSupported(), VersionOrExts(3, 0, "GL_ARB_texture_float GL_ARB_color_buffer_float"),                   VersionOrExts(3, 0, "GL_OES_texture_half_float"),                   VersionOrExts(3, 0, "GL_OES_texture_half_float_linear"), ExtsOnly("GL_OES_texture_half_float GL_EXT_color_buffer_half_float", "GL_EXT_color_buffer_float"),                                          ExtsOnly("GL_OES_texture_half_float GL_EXT_color_buffer_half_float", "GL_EXT_color_buffer_float")                  );
>+    InsertFormatMapping(&map, GL_R32F,              VersionOrExts(3, 0, "GL_ARB_texture_rg GL_ARB_texture_float"), AlwaysSupported(), VersionOrExts(3, 0, "GL_ARB_texture_rg GL_ARB_texture_float GL_ARB_color_buffer_float"), VersionOrExts(3, 0, "GL_OES_texture_float GL_EXT_texture_rg"),      ExtsOnly("GL_OES_texture_float_linear"),                 ExtsOnly("GL_EXT_color_buffer_float"),                                                                                                      ExtsOnly("GL_EXT_color_buffer_float")                                                                              );
>+    InsertFormatMapping(&map, GL_RG32F,             VersionOrExts(3, 0, "GL_ARB_texture_rg GL_ARB_texture_float"), AlwaysSupported(), VersionOrExts(3, 0, "GL_ARB_texture_rg GL_ARB_texture_float GL_ARB_color_buffer_float"), VersionOrExts(3, 0, "GL_OES_texture_float GL_EXT_texture_rg"),      ExtsOnly("GL_OES_texture_float_linear"),                 ExtsOnly("GL_EXT_color_buffer_float"),                                                                                                      ExtsOnly("GL_EXT_color_buffer_float")                                                                              );
>+    InsertFormatMapping(&map, GL_RGB32F,            VersionOrExts(3, 0, "GL_ARB_texture_float"),                   AlwaysSupported(), VersionOrExts(3, 0, "GL_ARB_texture_float GL_ARB_color_buffer_float"),                   VersionOrExts(3, 0, "GL_OES_texture_float"),                        ExtsOnly("GL_OES_texture_float_linear"),                 NeverSupported(),                                                                                                                           NeverSupported()                                                                                                   );
>+    InsertFormatMapping(&map, GL_RGBA32F,           VersionOrExts(3, 0, "GL_ARB_texture_float"),                   AlwaysSupported(), VersionOrExts(3, 0, "GL_ARB_texture_float GL_ARB_color_buffer_float"),                   VersionOrExts(3, 0, "GL_OES_texture_float"),                        ExtsOnly("GL_OES_texture_float_linear"),                 ExtsOnly("GL_EXT_color_buffer_float"),                                                                                                      ExtsOnly("GL_EXT_color_buffer_float")                                                                              );
> 
>     // Depth stencil formats
>-    //                       | Format                  | OpenGL texture support                            | Filter                                     | OpenGL render support                             | OpenGL ES texture support                  | Filter                                     | OpenGL ES render support                                              |
>-    InsertFormatMapping(&map, GL_DEPTH_COMPONENT16,     VersionOnly(1, 5),                                  VersionOrExts(1, 5, "GL_ARB_depth_texture"), VersionOnly(1, 5),                                  VersionOnly(2, 0),                           VersionOrExts(3, 0, "GL_OES_depth_texture"), VersionOnly(2, 0)                                                      );
>-    InsertFormatMapping(&map, GL_DEPTH_COMPONENT24,     VersionOnly(1, 5),                                  VersionOrExts(1, 5, "GL_ARB_depth_texture"), VersionOnly(1, 5),                                  VersionOnly(2, 0),                           VersionOrExts(3, 0, "GL_OES_depth_texture"), VersionOnly(2, 0)                                                      );
>-    InsertFormatMapping(&map, GL_DEPTH_COMPONENT32_OES, VersionOnly(1, 5),                                  VersionOrExts(1, 5, "GL_ARB_depth_texture"), VersionOnly(1, 5),                                  ExtsOnly("GL_OES_depth_texture"),            AlwaysSupported(),                           ExtsOnly("GL_OES_depth32")                                             );
>-    InsertFormatMapping(&map, GL_DEPTH_COMPONENT32F,    VersionOrExts(3, 0, "GL_ARB_depth_buffer_float"),   AlwaysSupported(),                           VersionOrExts(3, 0, "GL_ARB_depth_buffer_float"),   VersionOnly(3, 0),                           VersionOrExts(3, 0, "GL_OES_depth_texture"), VersionOnly(3, 0)                                                      );
>-    InsertFormatMapping(&map, GL_STENCIL_INDEX8,        VersionOrExts(3, 0, "GL_EXT_packed_depth_stencil"), NeverSupported(),                            VersionOrExts(3, 0, "GL_EXT_packed_depth_stencil"), VersionOnly(2, 0),                           NeverSupported(),                            VersionOnly(2, 0)                                                      );
>-    InsertFormatMapping(&map, GL_DEPTH24_STENCIL8,      VersionOrExts(3, 0, "GL_ARB_framebuffer_object"),   VersionOrExts(3, 0, "GL_ARB_depth_texture"), VersionOrExts(3, 0, "GL_ARB_framebuffer_object"),   VersionOrExts(3, 0, "GL_OES_depth_texture"), AlwaysSupported(),                           VersionOrExts(3, 0, "GL_OES_depth_texture GL_OES_packed_depth_stencil"));
>-    InsertFormatMapping(&map, GL_DEPTH32F_STENCIL8,     VersionOrExts(3, 0, "GL_ARB_depth_buffer_float"),   AlwaysSupported(),                           VersionOrExts(3, 0, "GL_ARB_depth_buffer_float"),   VersionOnly(3, 0),                           AlwaysSupported(),                           VersionOnly(3, 0)                                                      );
>-    InsertFormatMapping(&map, GL_DEPTH_COMPONENT,       VersionOnly(1, 5),                                  VersionOrExts(1, 5, "GL_ARB_depth_texture"), VersionOnly(1, 5),                                  VersionOnly(2, 0),                           VersionOrExts(3, 0, "GL_OES_depth_texture"), VersionOnly(2, 0)                                                      );
>-    InsertFormatMapping(&map, GL_DEPTH_STENCIL,         VersionOnly(1, 5),                                  VersionOrExts(1, 5, "GL_ARB_depth_texture"), VersionOnly(1, 5),                                  VersionOnly(2, 0),                           VersionOrExts(3, 0, "GL_OES_depth_texture"), VersionOnly(2, 0)                                                      );
>+    //                       | Format                  | OpenGL texture support                            | Filter                                     | OpenGL render support                             | OpenGL ES texture support                  | Filter                                     | OpenGL ES texture attachment support                                   | OpenGL ES renderbuffer support                                        |
>+    InsertFormatMapping(&map, GL_DEPTH_COMPONENT16,     VersionOnly(1, 5),                                  VersionOrExts(1, 5, "GL_ARB_depth_texture"), VersionOnly(1, 5),                                  VersionOnly(2, 0),                           VersionOrExts(3, 0, "GL_OES_depth_texture"), VersionOnly(2, 0),                                                       VersionOnly(2, 0)                                                      );
>+    InsertFormatMapping(&map, GL_DEPTH_COMPONENT24,     VersionOnly(1, 5),                                  VersionOrExts(1, 5, "GL_ARB_depth_texture"), VersionOnly(1, 5),                                  VersionOnly(2, 0),                           VersionOrExts(3, 0, "GL_OES_depth_texture"), VersionOnly(2, 0),                                                       VersionOnly(2, 0)                                                      );
>+    InsertFormatMapping(&map, GL_DEPTH_COMPONENT32_OES, VersionOnly(1, 5),                                  VersionOrExts(1, 5, "GL_ARB_depth_texture"), VersionOnly(1, 5),                                  ExtsOnly("GL_OES_depth_texture"),            AlwaysSupported(),                           ExtsOnly("GL_OES_depth32"),                                              ExtsOnly("GL_OES_depth32")                                             );
>+    InsertFormatMapping(&map, GL_DEPTH_COMPONENT32F,    VersionOrExts(3, 0, "GL_ARB_depth_buffer_float"),   AlwaysSupported(),                           VersionOrExts(3, 0, "GL_ARB_depth_buffer_float"),   VersionOnly(3, 0),                           VersionOrExts(3, 0, "GL_OES_depth_texture"), VersionOnly(3, 0),                                                       VersionOnly(3, 0)                                                      );
>+    InsertFormatMapping(&map, GL_STENCIL_INDEX8,        VersionOrExts(3, 0, "GL_EXT_packed_depth_stencil"), NeverSupported(),                            VersionOrExts(3, 0, "GL_EXT_packed_depth_stencil"), VersionOnly(2, 0),                           NeverSupported(),                            VersionOnly(2, 0),                                                       VersionOnly(2, 0)                                                      );
>+    InsertFormatMapping(&map, GL_DEPTH24_STENCIL8,      VersionOrExts(3, 0, "GL_ARB_framebuffer_object"),   VersionOrExts(3, 0, "GL_ARB_depth_texture"), VersionOrExts(3, 0, "GL_ARB_framebuffer_object"),   VersionOrExts(3, 0, "GL_OES_depth_texture"), AlwaysSupported(),                           VersionOrExts(3, 0, "GL_OES_depth_texture GL_OES_packed_depth_stencil"), VersionOrExts(3, 0, "GL_OES_depth_texture GL_OES_packed_depth_stencil"));
>+    InsertFormatMapping(&map, GL_DEPTH32F_STENCIL8,     VersionOrExts(3, 0, "GL_ARB_depth_buffer_float"),   AlwaysSupported(),                           VersionOrExts(3, 0, "GL_ARB_depth_buffer_float"),   VersionOnly(3, 0),                           AlwaysSupported(),                           VersionOnly(3, 0),                                                       VersionOnly(3, 0)                                                      );
>+    InsertFormatMapping(&map, GL_DEPTH_COMPONENT,       VersionOnly(1, 5),                                  VersionOrExts(1, 5, "GL_ARB_depth_texture"), VersionOnly(1, 5),                                  VersionOnly(2, 0),                           VersionOrExts(3, 0, "GL_OES_depth_texture"), VersionOnly(2, 0),                                                       VersionOnly(2, 0)                                                      );
>+    InsertFormatMapping(&map, GL_DEPTH_STENCIL,         VersionOnly(1, 5),                                  VersionOrExts(1, 5, "GL_ARB_depth_texture"), VersionOnly(1, 5),                                  VersionOnly(2, 0),                           VersionOrExts(3, 0, "GL_OES_depth_texture"), VersionOnly(2, 0),                                                       VersionOnly(2, 0)                                                      );
> 
>     // Luminance alpha formats
>-    //                       | Format                  | OpenGL texture support                      | Filter           | Render          | OpenGL ES texture support                                | Filter                                                 | Render          |
>-    InsertFormatMapping(&map, GL_ALPHA8_EXT,             AlwaysSupported(),                           AlwaysSupported(), NeverSupported(), ExtsOnly("GL_EXT_texture_storage"),                        AlwaysSupported(),                                       NeverSupported());
>-    InsertFormatMapping(&map, GL_LUMINANCE8_EXT,         AlwaysSupported(),                           AlwaysSupported(), NeverSupported(), ExtsOnly("GL_EXT_texture_storage"),                        AlwaysSupported(),                                       NeverSupported());
>-    InsertFormatMapping(&map, GL_LUMINANCE8_ALPHA8_EXT,  AlwaysSupported(),                           AlwaysSupported(), NeverSupported(), ExtsOnly("GL_EXT_texture_storage"),                        AlwaysSupported(),                                       NeverSupported());
>-    InsertFormatMapping(&map, GL_ALPHA16F_EXT,           VersionOrExts(3, 0, "GL_ARB_texture_float"), AlwaysSupported(), NeverSupported(), ExtsOnly("GL_EXT_texture_storage OES_texture_half_float"), VersionOrExts(3, 0, "GL_OES_texture_half_float_linear"), NeverSupported());
>-    InsertFormatMapping(&map, GL_LUMINANCE16F_EXT,       VersionOrExts(3, 0, "GL_ARB_texture_float"), AlwaysSupported(), NeverSupported(), ExtsOnly("GL_EXT_texture_storage OES_texture_half_float"), VersionOrExts(3, 0, "GL_OES_texture_half_float_linear"), NeverSupported());
>-    InsertFormatMapping(&map, GL_LUMINANCE_ALPHA16F_EXT, VersionOrExts(3, 0, "GL_ARB_texture_float"), AlwaysSupported(), NeverSupported(), ExtsOnly("GL_EXT_texture_storage OES_texture_half_float"), VersionOrExts(3, 0, "GL_OES_texture_half_float_linear"), NeverSupported());
>-    InsertFormatMapping(&map, GL_ALPHA32F_EXT,           VersionOrExts(3, 0, "GL_ARB_texture_float"), AlwaysSupported(), NeverSupported(), ExtsOnly("GL_EXT_texture_storage OES_texture_float"),      ExtsOnly("GL_OES_texture_float_linear"),                 NeverSupported());
>-    InsertFormatMapping(&map, GL_LUMINANCE32F_EXT,       VersionOrExts(3, 0, "GL_ARB_texture_float"), AlwaysSupported(), NeverSupported(), ExtsOnly("GL_EXT_texture_storage OES_texture_float"),      ExtsOnly("GL_OES_texture_float_linear"),                 NeverSupported());
>-    InsertFormatMapping(&map, GL_LUMINANCE_ALPHA32F_EXT, VersionOrExts(3, 0, "GL_ARB_texture_float"), AlwaysSupported(), NeverSupported(), ExtsOnly("GL_EXT_texture_storage OES_texture_float"),      ExtsOnly("GL_OES_texture_float_linear"),                 NeverSupported());
>+    //                       | Format                  | OpenGL texture support                      | Filter           | Render          | OpenGL ES texture support            | Filter                                      | OpenGL ES texture attachment support | OpenGL ES renderbuffer support |
>+    InsertFormatMapping(&map, GL_ALPHA8_EXT,             AlwaysSupported(),                           AlwaysSupported(), NeverSupported(), AlwaysSupported(),                     AlwaysSupported(),                            NeverSupported(),                      NeverSupported()                );
>+    InsertFormatMapping(&map, GL_LUMINANCE8_EXT,         AlwaysSupported(),                           AlwaysSupported(), NeverSupported(), AlwaysSupported(),                     AlwaysSupported(),                            NeverSupported(),                      NeverSupported()                );
>+    InsertFormatMapping(&map, GL_LUMINANCE8_ALPHA8_EXT,  AlwaysSupported(),                           AlwaysSupported(), NeverSupported(), AlwaysSupported(),                     AlwaysSupported(),                            NeverSupported(),                      NeverSupported()                );
>+    InsertFormatMapping(&map, GL_ALPHA16F_EXT,           VersionOrExts(3, 0, "GL_ARB_texture_float"), AlwaysSupported(), NeverSupported(), ExtsOnly("GL_OES_texture_half_float"), ExtsOnly("GL_OES_texture_half_float_linear"), NeverSupported(),                      NeverSupported()                );
>+    InsertFormatMapping(&map, GL_LUMINANCE16F_EXT,       VersionOrExts(3, 0, "GL_ARB_texture_float"), AlwaysSupported(), NeverSupported(), ExtsOnly("GL_OES_texture_half_float"), ExtsOnly("GL_OES_texture_half_float_linear"), NeverSupported(),                      NeverSupported()                );
>+    InsertFormatMapping(&map, GL_LUMINANCE_ALPHA16F_EXT, VersionOrExts(3, 0, "GL_ARB_texture_float"), AlwaysSupported(), NeverSupported(), ExtsOnly("GL_OES_texture_half_float"), ExtsOnly("GL_OES_texture_half_float_linear"), NeverSupported(),                      NeverSupported()                );
>+    InsertFormatMapping(&map, GL_ALPHA32F_EXT,           VersionOrExts(3, 0, "GL_ARB_texture_float"), AlwaysSupported(), NeverSupported(), ExtsOnly("GL_OES_texture_float"),      ExtsOnly("GL_OES_texture_float_linear"),      NeverSupported(),                      NeverSupported()                );
>+    InsertFormatMapping(&map, GL_LUMINANCE32F_EXT,       VersionOrExts(3, 0, "GL_ARB_texture_float"), AlwaysSupported(), NeverSupported(), ExtsOnly("GL_OES_texture_float"),      ExtsOnly("GL_OES_texture_float_linear"),      NeverSupported(),                      NeverSupported()                );
>+    InsertFormatMapping(&map, GL_LUMINANCE_ALPHA32F_EXT, VersionOrExts(3, 0, "GL_ARB_texture_float"), AlwaysSupported(), NeverSupported(), ExtsOnly("GL_OES_texture_float"),      ExtsOnly("GL_OES_texture_float_linear"),      NeverSupported(),                      NeverSupported()                );
>+
>+    // EXT_texture_compression_bptc formats
>+    //                       | Format                                   | OpenGL texture support                                | Filter           | Render          | OpenGL ES texture support                  | Filter           | OpenGL ES texture attachment support | OpenGL ES renderbuffer support |
>+    InsertFormatMapping(&map, GL_COMPRESSED_RGBA_BPTC_UNORM_EXT,         VersionOrExts(4, 2, "GL_ARB_texture_compression_bptc"), AlwaysSupported(), NeverSupported(), ExtsOnly("GL_EXT_texture_compression_bptc"), AlwaysSupported(), NeverSupported(),                      NeverSupported()                );
>+    InsertFormatMapping(&map, GL_COMPRESSED_SRGB_ALPHA_BPTC_UNORM_EXT,   VersionOrExts(4, 2, "GL_ARB_texture_compression_bptc"), AlwaysSupported(), NeverSupported(), ExtsOnly("GL_EXT_texture_compression_bptc"), AlwaysSupported(), NeverSupported(),                      NeverSupported()                );
>+    InsertFormatMapping(&map, GL_COMPRESSED_RGB_BPTC_SIGNED_FLOAT_EXT,   VersionOrExts(4, 2, "GL_ARB_texture_compression_bptc"), AlwaysSupported(), NeverSupported(), ExtsOnly("GL_EXT_texture_compression_bptc"), AlwaysSupported(), NeverSupported(),                      NeverSupported()                );
>+    InsertFormatMapping(&map, GL_COMPRESSED_RGB_BPTC_UNSIGNED_FLOAT_EXT, VersionOrExts(4, 2, "GL_ARB_texture_compression_bptc"), AlwaysSupported(), NeverSupported(), ExtsOnly("GL_EXT_texture_compression_bptc"), AlwaysSupported(), NeverSupported(),                      NeverSupported()                 );
> 
>     // Compressed formats, From ES 3.0.1 spec, table 3.16
>-    InsertFormatMapping(&map, GL_COMPRESSED_R11_EAC,                        VersionOrExts(4, 3, "GL_ARB_ES3_compatibility"), AlwaysSupported(), NeverSupported(), VersionOnly(3, 0), AlwaysSupported(), NeverSupported());
>-    InsertFormatMapping(&map, GL_COMPRESSED_SIGNED_R11_EAC,                 VersionOrExts(4, 3, "GL_ARB_ES3_compatibility"), AlwaysSupported(), NeverSupported(), VersionOnly(3, 0), AlwaysSupported(), NeverSupported());
>-    InsertFormatMapping(&map, GL_COMPRESSED_RG11_EAC,                       VersionOrExts(4, 3, "GL_ARB_ES3_compatibility"), AlwaysSupported(), NeverSupported(), VersionOnly(3, 0), AlwaysSupported(), NeverSupported());
>-    InsertFormatMapping(&map, GL_COMPRESSED_SIGNED_RG11_EAC,                VersionOrExts(4, 3, "GL_ARB_ES3_compatibility"), AlwaysSupported(), NeverSupported(), VersionOnly(3, 0), AlwaysSupported(), NeverSupported());
>-    InsertFormatMapping(&map, GL_COMPRESSED_RGB8_ETC2,                      VersionOrExts(4, 3, "GL_ARB_ES3_compatibility"), AlwaysSupported(), NeverSupported(), VersionOnly(3, 0), AlwaysSupported(), NeverSupported());
>-    InsertFormatMapping(&map, GL_COMPRESSED_SRGB8_ETC2,                     VersionOrExts(4, 3, "GL_ARB_ES3_compatibility"), AlwaysSupported(), NeverSupported(), VersionOnly(3, 0), AlwaysSupported(), NeverSupported());
>-    InsertFormatMapping(&map, GL_COMPRESSED_RGB8_PUNCHTHROUGH_ALPHA1_ETC2,  VersionOrExts(4, 3, "GL_ARB_ES3_compatibility"), AlwaysSupported(), NeverSupported(), VersionOnly(3, 0), AlwaysSupported(), NeverSupported());
>-    InsertFormatMapping(&map, GL_COMPRESSED_SRGB8_PUNCHTHROUGH_ALPHA1_ETC2, VersionOrExts(4, 3, "GL_ARB_ES3_compatibility"), AlwaysSupported(), NeverSupported(), VersionOnly(3, 0), AlwaysSupported(), NeverSupported());
>-    InsertFormatMapping(&map, GL_COMPRESSED_RGBA8_ETC2_EAC,                 VersionOrExts(4, 3, "GL_ARB_ES3_compatibility"), AlwaysSupported(), NeverSupported(), VersionOnly(3, 0), AlwaysSupported(), NeverSupported());
>-    InsertFormatMapping(&map, GL_COMPRESSED_SRGB8_ALPHA8_ETC2_EAC,          VersionOrExts(4, 3, "GL_ARB_ES3_compatibility"), AlwaysSupported(), NeverSupported(), VersionOnly(3, 0), AlwaysSupported(), NeverSupported());
>+    //                       | Format                                      | OpenGL texture support                         | Filter           | Render          | OpenGL ES texture support                                                   | Filter           | OpenGL ES texture attachment support | OpenGL ES renderbuffer support |
>+    InsertFormatMapping(&map, GL_COMPRESSED_R11_EAC,                        VersionOrExts(4, 3, "GL_ARB_ES3_compatibility"), AlwaysSupported(), NeverSupported(), VersionOrExts(3, 0, "OES_compressed_EAC_R11_unsigned_texture"),               AlwaysSupported(), NeverSupported(),                      NeverSupported()                );
>+    InsertFormatMapping(&map, GL_COMPRESSED_SIGNED_R11_EAC,                 VersionOrExts(4, 3, "GL_ARB_ES3_compatibility"), AlwaysSupported(), NeverSupported(), VersionOrExts(3, 0, "OES_compressed_EAC_R11_signed_texture"),                 AlwaysSupported(), NeverSupported(),                      NeverSupported()                );
>+    InsertFormatMapping(&map, GL_COMPRESSED_RG11_EAC,                       VersionOrExts(4, 3, "GL_ARB_ES3_compatibility"), AlwaysSupported(), NeverSupported(), VersionOrExts(3, 0, "OES_compressed_EAC_RG11_unsigned_texture"),              AlwaysSupported(), NeverSupported(),                      NeverSupported()                );
>+    InsertFormatMapping(&map, GL_COMPRESSED_SIGNED_RG11_EAC,                VersionOrExts(4, 3, "GL_ARB_ES3_compatibility"), AlwaysSupported(), NeverSupported(), VersionOrExts(3, 0, "OES_compressed_EAC_RG11_signed_texture"),                AlwaysSupported(), NeverSupported(),                      NeverSupported()                );
>+    InsertFormatMapping(&map, GL_COMPRESSED_RGB8_ETC2,                      VersionOrExts(4, 3, "GL_ARB_ES3_compatibility"), AlwaysSupported(), NeverSupported(), VersionOrExts(3, 0, "OES_compressed_ETC2_RGB8_texture"),                      AlwaysSupported(), NeverSupported(),                      NeverSupported()                );
>+    InsertFormatMapping(&map, GL_COMPRESSED_SRGB8_ETC2,                     VersionOrExts(4, 3, "GL_ARB_ES3_compatibility"), AlwaysSupported(), NeverSupported(), VersionOrExts(3, 0, "OES_compressed_ETC2_sRGB8_texture"),                     AlwaysSupported(), NeverSupported(),                      NeverSupported()                );
>+    InsertFormatMapping(&map, GL_COMPRESSED_RGB8_PUNCHTHROUGH_ALPHA1_ETC2,  VersionOrExts(4, 3, "GL_ARB_ES3_compatibility"), AlwaysSupported(), NeverSupported(), VersionOrExts(3, 0, "OES_compressed_ETC2_punchthroughA_RGBA8_texture"),       AlwaysSupported(), NeverSupported(),                      NeverSupported()                );
>+    InsertFormatMapping(&map, GL_COMPRESSED_SRGB8_PUNCHTHROUGH_ALPHA1_ETC2, VersionOrExts(4, 3, "GL_ARB_ES3_compatibility"), AlwaysSupported(), NeverSupported(), VersionOrExts(3, 0, "OES_compressed_ETC2_punchthroughA_sRGB8_alpha_texture"), AlwaysSupported(), NeverSupported(),                      NeverSupported()                );
>+    InsertFormatMapping(&map, GL_COMPRESSED_RGBA8_ETC2_EAC,                 VersionOrExts(4, 3, "GL_ARB_ES3_compatibility"), AlwaysSupported(), NeverSupported(), VersionOrExts(3, 0, "OES_compressed_ETC2_RGBA8_texture"),                     AlwaysSupported(), NeverSupported(),                      NeverSupported()                );
>+    InsertFormatMapping(&map, GL_COMPRESSED_SRGB8_ALPHA8_ETC2_EAC,          VersionOrExts(4, 3, "GL_ARB_ES3_compatibility"), AlwaysSupported(), NeverSupported(), VersionOrExts(3, 0, "OES_compressed_ETC2_sRGB8_alpha8_texture"),              AlwaysSupported(), NeverSupported(),                      NeverSupported()                );
> 
>     // From GL_EXT_texture_compression_dxt1
>-    //                       | Format                            | OpenGL texture support                         | Filter           | Render          | OpenGL ES texture support                    | Filter           | Render           |
>-    InsertFormatMapping(&map, GL_COMPRESSED_RGB_S3TC_DXT1_EXT,    ExtsOnly("GL_EXT_texture_compression_s3tc"),     AlwaysSupported(), NeverSupported(), ExtsOnly("GL_EXT_texture_compression_dxt1"),   AlwaysSupported(), NeverSupported());
>-    InsertFormatMapping(&map, GL_COMPRESSED_RGBA_S3TC_DXT1_EXT,   ExtsOnly("GL_EXT_texture_compression_s3tc"),     AlwaysSupported(), NeverSupported(), ExtsOnly("GL_EXT_texture_compression_dxt1"),   AlwaysSupported(), NeverSupported());
>+    //                       | Format                            | OpenGL texture support                         | Filter           | Render          | OpenGL ES texture support                    | Filter           | OpenGL ES texture attachment support | OpenGL ES renderbuffer support |
>+    InsertFormatMapping(&map, GL_COMPRESSED_RGB_S3TC_DXT1_EXT,    ExtsOnly("GL_EXT_texture_compression_s3tc"),     AlwaysSupported(), NeverSupported(), ExtsOnly("GL_EXT_texture_compression_dxt1"),   AlwaysSupported(), NeverSupported(),                      NeverSupported()                );
>+    InsertFormatMapping(&map, GL_COMPRESSED_RGBA_S3TC_DXT1_EXT,   ExtsOnly("GL_EXT_texture_compression_s3tc"),     AlwaysSupported(), NeverSupported(), ExtsOnly("GL_EXT_texture_compression_dxt1"),   AlwaysSupported(), NeverSupported(),                      NeverSupported()                );
> 
>     // From GL_ANGLE_texture_compression_dxt3
>-    InsertFormatMapping(&map, GL_COMPRESSED_RGBA_S3TC_DXT3_ANGLE, ExtsOnly("GL_EXT_texture_compression_s3tc"),     AlwaysSupported(), NeverSupported(), ExtsOnly("GL_ANGLE_texture_compression_dxt3"), AlwaysSupported(), NeverSupported());
>+    InsertFormatMapping(&map, GL_COMPRESSED_RGBA_S3TC_DXT3_ANGLE, ExtsOnly("GL_EXT_texture_compression_s3tc"),     AlwaysSupported(), NeverSupported(), ExtsOnly("GL_ANGLE_texture_compression_dxt3"), AlwaysSupported(), NeverSupported(),                      NeverSupported()                );
> 
>     // From GL_ANGLE_texture_compression_dxt5
>-    InsertFormatMapping(&map, GL_COMPRESSED_RGBA_S3TC_DXT5_ANGLE, ExtsOnly("GL_EXT_texture_compression_s3tc"),     AlwaysSupported(), NeverSupported(), ExtsOnly("GL_ANGLE_texture_compression_dxt5"), AlwaysSupported(), NeverSupported());
>+    InsertFormatMapping(&map, GL_COMPRESSED_RGBA_S3TC_DXT5_ANGLE, ExtsOnly("GL_EXT_texture_compression_s3tc"),     AlwaysSupported(), NeverSupported(), ExtsOnly("GL_ANGLE_texture_compression_dxt5"), AlwaysSupported(), NeverSupported(),                      NeverSupported()                );
> 
>     // From GL_ETC1_RGB8_OES
>-    InsertFormatMapping(&map, GL_ETC1_RGB8_OES,                   VersionOrExts(4, 3, "GL_ARB_ES3_compatibility"), AlwaysSupported(), NeverSupported(), VersionOrExts(3, 0, "GL_ETC1_RGB8_OES"),       AlwaysSupported(), NeverSupported());
>+    InsertFormatMapping(&map, GL_ETC1_RGB8_OES,                   VersionOrExts(4, 3, "GL_ARB_ES3_compatibility"), AlwaysSupported(), NeverSupported(), VersionOrExts(3, 0, "GL_ETC1_RGB8_OES"),       AlwaysSupported(), NeverSupported(),                      NeverSupported()                );
> 
>     // clang-format on
> 
>@@ -279,16 +321,20 @@ static const InternalFormatInfoMap &GetInternalFormatMap()
> 
> const InternalFormat &GetInternalFormatInfo(GLenum internalFormat, StandardGL standard)
> {
>-    const InternalFormatInfoMap &formatMap = GetInternalFormatMap();
>+    const InternalFormatInfoMap &formatMap     = GetInternalFormatMap();
>     InternalFormatInfoMap::const_iterator iter = formatMap.find(internalFormat);
>     if (iter != formatMap.end())
>     {
>         const InternalFormatInfo &info = iter->second;
>         switch (standard)
>         {
>-          case STANDARD_GL_ES:      return info.glesInfo;
>-          case STANDARD_GL_DESKTOP: return info.glInfo;
>-          default: UNREACHABLE();   break;
>+            case STANDARD_GL_ES:
>+                return info.glesInfo;
>+            case STANDARD_GL_DESKTOP:
>+                return info.glInfo;
>+            default:
>+                UNREACHABLE();
>+                break;
>         }
>     }
> 
>@@ -362,6 +408,18 @@ static GLenum GetNativeInternalFormat(const FunctionsGL *functions,
>             // EXT_color_buffer_float require the sized formats to be renderable.
>             result = internalFormat.sizedInternalFormat;
>         }
>+        else if (internalFormat.format == GL_RED_EXT || internalFormat.format == GL_RG_EXT)
>+        {
>+            // Workaround Adreno driver not supporting unsized EXT_texture_rg formats
>+            result = internalFormat.sizedInternalFormat;
>+        }
>+        else if (workarounds.unsizedsRGBReadPixelsDoesntTransform &&
>+                 internalFormat.colorEncoding == GL_SRGB)
>+        {
>+            // Work around some Adreno driver bugs that don't read back SRGB data correctly when
>+            // it's in unsized SRGB texture formats.
>+            result = internalFormat.sizedInternalFormat;
>+        }
>     }
> 
>     return result;
>@@ -402,6 +460,21 @@ static GLenum GetNativeFormat(const FunctionsGL *functions,
>             }
>         }
>     }
>+    else if (functions->isAtLeastGLES(gl::Version(3, 0)))
>+    {
>+        if (workarounds.unsizedsRGBReadPixelsDoesntTransform)
>+        {
>+            if (format == GL_SRGB)
>+            {
>+                result = GL_RGB;
>+            }
>+
>+            if (format == GL_SRGB_ALPHA)
>+            {
>+                result = GL_RGBA;
>+            }
>+        }
>+    }
> 
>     return result;
> }
>@@ -470,6 +543,16 @@ static GLenum GetNativeType(const FunctionsGL *functions,
>             }
>         }
>     }
>+    else if (functions->standard == STANDARD_GL_ES && functions->version == gl::Version(2, 0))
>+    {
>+        // On ES2, convert GL_HALF_FLOAT to GL_HALF_FLOAT_OES as a convenience for internal
>+        // functions. It should not be possible to get here by a normal glTexImage2D call.
>+        if (type == GL_HALF_FLOAT)
>+        {
>+            ASSERT(functions->hasGLExtension("GL_OES_texture_half_float"));
>+            result = GL_HALF_FLOAT_OES;
>+        }
>+    }
> 
>     return result;
> }
>@@ -583,6 +666,6 @@ ReadPixelsFormat GetReadPixelsFormat(const FunctionsGL *functions,
>     result.type   = GetNativeReadType(functions, workarounds, type);
>     return result;
> }
>-}
>+}  // namespace nativegl
> 
>-}
>+}  // namespace rx
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/formatutilsgl.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/formatutilsgl.h
>index b83e9bb7f1a..f18e967336e 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/formatutilsgl.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/formatutilsgl.h
>@@ -37,8 +37,9 @@ struct SupportRequirement
>     // Extensions that are required if the minimum version is not met
>     std::vector<std::string> versionExtensions;
> 
>-    // Extensions that are always required to support this format
>-    std::vector<std::string> requiredExtensions;
>+    // Sets of extensions that are required to support this format
>+    // All the extensions in one of the sets have to be available for a format to be supported
>+    std::vector<std::vector<std::string>> requiredExtensions;
> };
> 
> struct InternalFormat
>@@ -49,8 +50,10 @@ struct InternalFormat
> 
>     SupportRequirement texture;
>     SupportRequirement filter;
>+    // Texture created with InternalFormat can be used in glFramebufferTexture2D
>+    SupportRequirement textureAttachment;
>+    // Renderbuffer created with InternalFormat can be used in glFramebufferRenderbuffer
>     SupportRequirement renderbuffer;
>-    SupportRequirement framebufferAttachment;
> };
> const InternalFormat &GetInternalFormatInfo(GLenum internalFormat, StandardGL standard);
> 
>@@ -126,8 +129,8 @@ ReadPixelsFormat GetReadPixelsFormat(const FunctionsGL *functions,
>                                      const WorkaroundsGL &workarounds,
>                                      GLenum format,
>                                      GLenum type);
>-}
>+}  // namespace nativegl
> 
>-}
>+}  // namespace rx
> 
>-#endif // LIBANGLE_RENDERER_GL_FORMATUTILSGL_H_
>+#endif  // LIBANGLE_RENDERER_GL_FORMATUTILSGL_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/functionsgl_enums.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/functionsgl_enums.h
>index 918a7a1e65c..6bab4bb3ad4 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/functionsgl_enums.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/functionsgl_enums.h
>@@ -1371,5 +1371,6 @@
> #define GL_TEXTURE_TARGET 0x1006
> #define GL_UNKNOWN_CONTEXT_RESET 0x8255
> #define GL_ZERO_TO_ONE 0x935F
>+#define GL_COMPLETION_STATUS 0x91B1
> 
>-#endif // LIBANGLE_RENDERER_GL_FUNCTIONSGLENUMS_H_
>+#endif  // LIBANGLE_RENDERER_GL_FUNCTIONSGLENUMS_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/functionsgl_typedefs.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/functionsgl_typedefs.h
>index d590d489292..b609468fdc6 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/functionsgl_typedefs.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/functionsgl_typedefs.h
>@@ -15,34 +15,34 @@
> #include <stdint.h>
> 
> #ifndef INTERNAL_GL_APIENTRY
>-#   ifdef ANGLE_PLATFORM_WINDOWS
>-#       define INTERNAL_GL_APIENTRY __stdcall
>-#   else
>-#       define INTERNAL_GL_APIENTRY
>-#   endif
>+#    ifdef ANGLE_PLATFORM_WINDOWS
>+#        define INTERNAL_GL_APIENTRY __stdcall
>+#    else
>+#        define INTERNAL_GL_APIENTRY
>+#    endif
> #endif
> 
>-typedef void             GLvoid;
>-typedef char             GLchar;
>-typedef unsigned int     GLenum;
>-typedef unsigned char    GLboolean;
>-typedef unsigned int     GLbitfield;
>-typedef khronos_int8_t   GLbyte;
>-typedef short            GLshort;
>-typedef int              GLint;
>-typedef int              GLsizei;
>-typedef khronos_uint8_t  GLubyte;
>-typedef unsigned short   GLushort;
>-typedef unsigned int     GLuint;
>-typedef khronos_float_t  GLfloat;
>-typedef khronos_float_t  GLclampf;
>-typedef double           GLdouble;
>-typedef double           GLclampd;
>-typedef khronos_int32_t  GLfixed;
>+typedef void GLvoid;
>+typedef char GLchar;
>+typedef unsigned int GLenum;
>+typedef unsigned char GLboolean;
>+typedef unsigned int GLbitfield;
>+typedef khronos_int8_t GLbyte;
>+typedef short GLshort;
>+typedef int GLint;
>+typedef int GLsizei;
>+typedef khronos_uint8_t GLubyte;
>+typedef unsigned short GLushort;
>+typedef unsigned int GLuint;
>+typedef khronos_float_t GLfloat;
>+typedef khronos_float_t GLclampf;
>+typedef double GLdouble;
>+typedef double GLclampd;
>+typedef khronos_int32_t GLfixed;
> typedef khronos_intptr_t GLintptr;
>-typedef khronos_ssize_t  GLsizeiptr;
>-typedef unsigned short   GLhalf;
>-typedef khronos_int64_t  GLint64;
>+typedef khronos_ssize_t GLsizeiptr;
>+typedef unsigned short GLhalf;
>+typedef khronos_int64_t GLint64;
> typedef khronos_uint64_t GLuint64;
> typedef struct __GLsync *GLsync;
> 
>@@ -50,353 +50,658 @@ typedef struct __GLsync *GLsync;
> 
> namespace rx
> {
>-typedef void (INTERNAL_GL_APIENTRY *GLDEBUGPROC)(GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const GLchar *message, const void *userParam);
>-typedef void (INTERNAL_GL_APIENTRY *GLDEBUGPROCARB)(GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const GLchar *message, const void *userParam);
>-typedef void (INTERNAL_GL_APIENTRY *GLDEBUGPROCAMD)(GLuint id, GLenum category, GLenum severity, GLsizei length, const GLchar *message, void *userParam);
>+typedef void(INTERNAL_GL_APIENTRY *GLDEBUGPROC)(GLenum source,
>+                                                GLenum type,
>+                                                GLuint id,
>+                                                GLenum severity,
>+                                                GLsizei length,
>+                                                const GLchar *message,
>+                                                const void *userParam);
>+typedef void(INTERNAL_GL_APIENTRY *GLDEBUGPROCARB)(GLenum source,
>+                                                   GLenum type,
>+                                                   GLuint id,
>+                                                   GLenum severity,
>+                                                   GLsizei length,
>+                                                   const GLchar *message,
>+                                                   const void *userParam);
>+typedef void(INTERNAL_GL_APIENTRY *GLDEBUGPROCAMD)(GLuint id,
>+                                                   GLenum category,
>+                                                   GLenum severity,
>+                                                   GLsizei length,
>+                                                   const GLchar *message,
>+                                                   void *userParam);
> 
> // 1.0
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLBLENDFUNCPROC)(GLenum, GLenum);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLCLEARPROC)(GLbitfield);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLCLEARCOLORPROC)(GLfloat, GLfloat, GLfloat, GLfloat);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLCLEARDEPTHPROC)(GLdouble);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLCLEARSTENCILPROC)(GLint);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLCOLORMASKPROC)(GLboolean, GLboolean, GLboolean, GLboolean);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLCULLFACEPROC)(GLenum);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLDEPTHFUNCPROC)(GLenum);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLDEPTHMASKPROC)(GLboolean);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLDEPTHRANGEPROC)(GLdouble, GLdouble);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLDISABLEPROC)(GLenum);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLDRAWBUFFERPROC)(GLenum);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLENABLEPROC)(GLenum);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLFINISHPROC)();
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLFLUSHPROC)();
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLFRONTFACEPROC)(GLenum);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLGETBOOLEANVPROC)(GLenum, GLboolean *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLGETDOUBLEVPROC)(GLenum, GLdouble *);
>-typedef GLenum (INTERNAL_GL_APIENTRY *PFNGLGETERRORPROC)();
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLGETFLOATVPROC)(GLenum, GLfloat *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLGETINTEGERVPROC)(GLenum, GLint *);
>-typedef const GLubyte * (INTERNAL_GL_APIENTRY *PFNGLGETSTRINGPROC)(GLenum);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLGETTEXIMAGEPROC)(GLenum, GLint, GLenum, GLenum, GLvoid *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLGETTEXLEVELPARAMETERFVPROC)(GLenum, GLint, GLenum, GLfloat *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLGETTEXLEVELPARAMETERIVPROC)(GLenum, GLint, GLenum, GLint *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLGETTEXPARAMETERFVPROC)(GLenum, GLenum, GLfloat *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLGETTEXPARAMETERIVPROC)(GLenum, GLenum, GLint *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLHINTPROC)(GLenum, GLenum);
>-typedef GLboolean (INTERNAL_GL_APIENTRY *PFNGLISENABLEDPROC)(GLenum);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLLINEWIDTHPROC)(GLfloat);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLLOGICOPPROC)(GLenum);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLPIXELSTOREFPROC)(GLenum, GLfloat);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLPIXELSTOREIPROC)(GLenum, GLint);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLPOINTSIZEPROC)(GLfloat);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLPOLYGONMODEPROC)(GLenum, GLenum);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLREADBUFFERPROC)(GLenum);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLREADPIXELSPROC)(GLint, GLint, GLsizei, GLsizei, GLenum, GLenum, GLvoid *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLSCISSORPROC)(GLint, GLint, GLsizei, GLsizei);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLSTENCILFUNCPROC)(GLenum, GLint, GLuint);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLSTENCILMASKPROC)(GLuint);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLSTENCILOPPROC)(GLenum, GLenum, GLenum);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLTEXIMAGE1DPROC)(GLenum, GLint, GLint, GLsizei, GLint, GLenum, GLenum, const GLvoid *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLTEXIMAGE2DPROC)(GLenum, GLint, GLint, GLsizei, GLsizei, GLint, GLenum, GLenum, const GLvoid *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLTEXPARAMETERFPROC)(GLenum, GLenum, GLfloat);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLTEXPARAMETERFVPROC)(GLenum, GLenum, const GLfloat *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLTEXPARAMETERIPROC)(GLenum, GLenum, GLint);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLTEXPARAMETERIVPROC)(GLenum, GLenum, const GLint *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLVIEWPORTPROC)(GLint, GLint, GLsizei, GLsizei);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLBLENDFUNCPROC)(GLenum, GLenum);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLCLEARPROC)(GLbitfield);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLCLEARCOLORPROC)(GLfloat, GLfloat, GLfloat, GLfloat);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLCLEARDEPTHPROC)(GLdouble);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLCLEARSTENCILPROC)(GLint);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLCOLORMASKPROC)(GLboolean, GLboolean, GLboolean, GLboolean);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLCULLFACEPROC)(GLenum);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLDEPTHFUNCPROC)(GLenum);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLDEPTHMASKPROC)(GLboolean);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLDEPTHRANGEPROC)(GLdouble, GLdouble);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLDISABLEPROC)(GLenum);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLDRAWBUFFERPROC)(GLenum);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLENABLEPROC)(GLenum);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLFINISHPROC)();
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLFLUSHPROC)();
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLFRONTFACEPROC)(GLenum);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLGETBOOLEANVPROC)(GLenum, GLboolean *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLGETDOUBLEVPROC)(GLenum, GLdouble *);
>+typedef GLenum(INTERNAL_GL_APIENTRY *PFNGLGETERRORPROC)();
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLGETFLOATVPROC)(GLenum, GLfloat *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLGETINTEGERVPROC)(GLenum, GLint *);
>+typedef const GLubyte *(INTERNAL_GL_APIENTRY *PFNGLGETSTRINGPROC)(GLenum);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLGETTEXIMAGEPROC)(GLenum, GLint, GLenum, GLenum, GLvoid *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLGETTEXLEVELPARAMETERFVPROC)(GLenum,
>+                                                                    GLint,
>+                                                                    GLenum,
>+                                                                    GLfloat *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLGETTEXLEVELPARAMETERIVPROC)(GLenum, GLint, GLenum, GLint *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLGETTEXPARAMETERFVPROC)(GLenum, GLenum, GLfloat *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLGETTEXPARAMETERIVPROC)(GLenum, GLenum, GLint *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLHINTPROC)(GLenum, GLenum);
>+typedef GLboolean(INTERNAL_GL_APIENTRY *PFNGLISENABLEDPROC)(GLenum);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLLINEWIDTHPROC)(GLfloat);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLLOGICOPPROC)(GLenum);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLPIXELSTOREFPROC)(GLenum, GLfloat);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLPIXELSTOREIPROC)(GLenum, GLint);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLPOINTSIZEPROC)(GLfloat);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLPOLYGONMODEPROC)(GLenum, GLenum);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLREADBUFFERPROC)(GLenum);
>+typedef void(INTERNAL_GL_APIENTRY
>+                 *PFNGLREADPIXELSPROC)(GLint, GLint, GLsizei, GLsizei, GLenum, GLenum, GLvoid *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLSCISSORPROC)(GLint, GLint, GLsizei, GLsizei);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLSTENCILFUNCPROC)(GLenum, GLint, GLuint);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLSTENCILMASKPROC)(GLuint);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLSTENCILOPPROC)(GLenum, GLenum, GLenum);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLTEXIMAGE1DPROC)(GLenum,
>+                                                        GLint,
>+                                                        GLint,
>+                                                        GLsizei,
>+                                                        GLint,
>+                                                        GLenum,
>+                                                        GLenum,
>+                                                        const GLvoid *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLTEXIMAGE2DPROC)(GLenum,
>+                                                        GLint,
>+                                                        GLint,
>+                                                        GLsizei,
>+                                                        GLsizei,
>+                                                        GLint,
>+                                                        GLenum,
>+                                                        GLenum,
>+                                                        const GLvoid *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLTEXPARAMETERFPROC)(GLenum, GLenum, GLfloat);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLTEXPARAMETERFVPROC)(GLenum, GLenum, const GLfloat *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLTEXPARAMETERIPROC)(GLenum, GLenum, GLint);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLTEXPARAMETERIVPROC)(GLenum, GLenum, const GLint *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLVIEWPORTPROC)(GLint, GLint, GLsizei, GLsizei);
> 
> // 1.1
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLBINDTEXTUREPROC)(GLenum, GLuint);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLCOPYTEXIMAGE1DPROC)(GLenum, GLint, GLenum, GLint, GLint, GLsizei, GLint);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLCOPYTEXIMAGE2DPROC)(GLenum, GLint, GLenum, GLint, GLint, GLsizei, GLsizei, GLint);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLCOPYTEXSUBIMAGE1DPROC)(GLenum, GLint, GLint, GLint, GLint, GLsizei);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLCOPYTEXSUBIMAGE2DPROC)(GLenum, GLint, GLint, GLint, GLint, GLint, GLsizei, GLsizei);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLDELETETEXTURESPROC)(GLsizei, const GLuint *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLDRAWARRAYSPROC)(GLenum, GLint, GLsizei);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLDRAWELEMENTSPROC)(GLenum, GLsizei, GLenum, const GLvoid *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLGENTEXTURESPROC)(GLsizei, GLuint *);
>-typedef GLboolean (INTERNAL_GL_APIENTRY *PFNGLISTEXTUREPROC)(GLuint);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLPOLYGONOFFSETPROC)(GLfloat, GLfloat);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLTEXSUBIMAGE1DPROC)(GLenum, GLint, GLint, GLsizei, GLenum, GLenum, const GLvoid *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLTEXSUBIMAGE2DPROC)(GLenum, GLint, GLint, GLint, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLBINDTEXTUREPROC)(GLenum, GLuint);
>+typedef void(INTERNAL_GL_APIENTRY
>+                 *PFNGLCOPYTEXIMAGE1DPROC)(GLenum, GLint, GLenum, GLint, GLint, GLsizei, GLint);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLCOPYTEXIMAGE2DPROC)(GLenum,
>+                                                            GLint,
>+                                                            GLenum,
>+                                                            GLint,
>+                                                            GLint,
>+                                                            GLsizei,
>+                                                            GLsizei,
>+                                                            GLint);
>+typedef void(
>+    INTERNAL_GL_APIENTRY *PFNGLCOPYTEXSUBIMAGE1DPROC)(GLenum, GLint, GLint, GLint, GLint, GLsizei);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLCOPYTEXSUBIMAGE2DPROC)(GLenum,
>+                                                               GLint,
>+                                                               GLint,
>+                                                               GLint,
>+                                                               GLint,
>+                                                               GLint,
>+                                                               GLsizei,
>+                                                               GLsizei);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLDELETETEXTURESPROC)(GLsizei, const GLuint *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLDRAWARRAYSPROC)(GLenum, GLint, GLsizei);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLDRAWELEMENTSPROC)(GLenum, GLsizei, GLenum, const GLvoid *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLGENTEXTURESPROC)(GLsizei, GLuint *);
>+typedef GLboolean(INTERNAL_GL_APIENTRY *PFNGLISTEXTUREPROC)(GLuint);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLPOLYGONOFFSETPROC)(GLfloat, GLfloat);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLTEXSUBIMAGE1DPROC)(GLenum,
>+                                                           GLint,
>+                                                           GLint,
>+                                                           GLsizei,
>+                                                           GLenum,
>+                                                           GLenum,
>+                                                           const GLvoid *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLTEXSUBIMAGE2DPROC)(GLenum,
>+                                                           GLint,
>+                                                           GLint,
>+                                                           GLint,
>+                                                           GLsizei,
>+                                                           GLsizei,
>+                                                           GLenum,
>+                                                           GLenum,
>+                                                           const GLvoid *);
> 
> // 1.2
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLBLENDCOLORPROC)(GLfloat, GLfloat, GLfloat, GLfloat);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLBLENDEQUATIONPROC)(GLenum);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLCOPYTEXSUBIMAGE3DPROC)(GLenum, GLint, GLint, GLint, GLint, GLint, GLint, GLsizei, GLsizei);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLDRAWRANGEELEMENTSPROC)(GLenum, GLuint, GLuint, GLsizei, GLenum, const GLvoid *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLTEXIMAGE3DPROC)(GLenum, GLint, GLint, GLsizei, GLsizei, GLsizei, GLint, GLenum, GLenum, const GLvoid *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLTEXSUBIMAGE3DPROC)(GLenum, GLint, GLint, GLint, GLint, GLsizei, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLBLENDCOLORPROC)(GLfloat, GLfloat, GLfloat, GLfloat);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLBLENDEQUATIONPROC)(GLenum);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLCOPYTEXSUBIMAGE3DPROC)(GLenum,
>+                                                               GLint,
>+                                                               GLint,
>+                                                               GLint,
>+                                                               GLint,
>+                                                               GLint,
>+                                                               GLint,
>+                                                               GLsizei,
>+                                                               GLsizei);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLDRAWRANGEELEMENTSPROC)(GLenum,
>+                                                               GLuint,
>+                                                               GLuint,
>+                                                               GLsizei,
>+                                                               GLenum,
>+                                                               const GLvoid *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLTEXIMAGE3DPROC)(GLenum,
>+                                                        GLint,
>+                                                        GLint,
>+                                                        GLsizei,
>+                                                        GLsizei,
>+                                                        GLsizei,
>+                                                        GLint,
>+                                                        GLenum,
>+                                                        GLenum,
>+                                                        const GLvoid *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLTEXSUBIMAGE3DPROC)(GLenum,
>+                                                           GLint,
>+                                                           GLint,
>+                                                           GLint,
>+                                                           GLint,
>+                                                           GLsizei,
>+                                                           GLsizei,
>+                                                           GLsizei,
>+                                                           GLenum,
>+                                                           GLenum,
>+                                                           const GLvoid *);
> 
> // 1.2 Extensions
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLDELETEFENCESNVPROC)(GLsizei, const GLuint *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLGENFENCESNVPROC)(GLsizei, GLuint *);
>-typedef GLboolean (INTERNAL_GL_APIENTRY *PFNGLISFENCENVPROC)(GLuint);
>-typedef GLboolean (INTERNAL_GL_APIENTRY *PFNGLTESTFENCENVPROC)(GLuint);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLGETFENCEIVNVPROC)(GLuint, GLenum, GLint *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLFINISHFENCENVPROC)(GLuint);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLSETFENCENVPROC)(GLuint, GLenum);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLDELETEFENCESNVPROC)(GLsizei, const GLuint *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLGENFENCESNVPROC)(GLsizei, GLuint *);
>+typedef GLboolean(INTERNAL_GL_APIENTRY *PFNGLISFENCENVPROC)(GLuint);
>+typedef GLboolean(INTERNAL_GL_APIENTRY *PFNGLTESTFENCENVPROC)(GLuint);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLGETFENCEIVNVPROC)(GLuint, GLenum, GLint *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLFINISHFENCENVPROC)(GLuint);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLSETFENCENVPROC)(GLuint, GLenum);
> 
> // 1.3
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLACTIVETEXTUREPROC)(GLenum);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLCOMPRESSEDTEXIMAGE1DPROC)(GLenum, GLint, GLenum, GLsizei, GLint, GLsizei, const GLvoid *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLCOMPRESSEDTEXIMAGE2DPROC)(GLenum, GLint, GLenum, GLsizei, GLsizei, GLint, GLsizei, const GLvoid *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLCOMPRESSEDTEXIMAGE3DPROC)(GLenum, GLint, GLenum, GLsizei, GLsizei, GLsizei, GLint, GLsizei, const GLvoid *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLCOMPRESSEDTEXSUBIMAGE1DPROC)(GLenum, GLint, GLint, GLsizei, GLenum, GLsizei, const GLvoid *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLCOMPRESSEDTEXSUBIMAGE2DPROC)(GLenum, GLint, GLint, GLint, GLsizei, GLsizei, GLenum, GLsizei, const GLvoid *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLCOMPRESSEDTEXSUBIMAGE3DPROC)(GLenum, GLint, GLint, GLint, GLint, GLsizei, GLsizei, GLsizei, GLenum, GLsizei, const GLvoid *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLGETCOMPRESSEDTEXIMAGEPROC)(GLenum, GLint, GLvoid *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLSAMPLECOVERAGEPROC)(GLfloat, GLboolean);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLACTIVETEXTUREPROC)(GLenum);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLCOMPRESSEDTEXIMAGE1DPROC)(GLenum,
>+                                                                  GLint,
>+                                                                  GLenum,
>+                                                                  GLsizei,
>+                                                                  GLint,
>+                                                                  GLsizei,
>+                                                                  const GLvoid *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLCOMPRESSEDTEXIMAGE2DPROC)(GLenum,
>+                                                                  GLint,
>+                                                                  GLenum,
>+                                                                  GLsizei,
>+                                                                  GLsizei,
>+                                                                  GLint,
>+                                                                  GLsizei,
>+                                                                  const GLvoid *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLCOMPRESSEDTEXIMAGE3DPROC)(GLenum,
>+                                                                  GLint,
>+                                                                  GLenum,
>+                                                                  GLsizei,
>+                                                                  GLsizei,
>+                                                                  GLsizei,
>+                                                                  GLint,
>+                                                                  GLsizei,
>+                                                                  const GLvoid *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLCOMPRESSEDTEXSUBIMAGE1DPROC)(GLenum,
>+                                                                     GLint,
>+                                                                     GLint,
>+                                                                     GLsizei,
>+                                                                     GLenum,
>+                                                                     GLsizei,
>+                                                                     const GLvoid *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLCOMPRESSEDTEXSUBIMAGE2DPROC)(GLenum,
>+                                                                     GLint,
>+                                                                     GLint,
>+                                                                     GLint,
>+                                                                     GLsizei,
>+                                                                     GLsizei,
>+                                                                     GLenum,
>+                                                                     GLsizei,
>+                                                                     const GLvoid *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLCOMPRESSEDTEXSUBIMAGE3DPROC)(GLenum,
>+                                                                     GLint,
>+                                                                     GLint,
>+                                                                     GLint,
>+                                                                     GLint,
>+                                                                     GLsizei,
>+                                                                     GLsizei,
>+                                                                     GLsizei,
>+                                                                     GLenum,
>+                                                                     GLsizei,
>+                                                                     const GLvoid *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLGETCOMPRESSEDTEXIMAGEPROC)(GLenum, GLint, GLvoid *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLSAMPLECOVERAGEPROC)(GLfloat, GLboolean);
> 
> // 1.4
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLBLENDFUNCSEPARATEPROC)(GLenum, GLenum, GLenum, GLenum);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLMULTIDRAWARRAYSPROC)(GLenum, const GLint *, const GLsizei *, GLsizei);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLMULTIDRAWELEMENTSPROC)(GLenum, const GLsizei *, GLenum, const GLvoid *const*, GLsizei);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLPOINTPARAMETERFPROC)(GLenum, GLfloat);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLPOINTPARAMETERFVPROC)(GLenum, const GLfloat *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLPOINTPARAMETERIPROC)(GLenum, GLint);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLPOINTPARAMETERIVPROC)(GLenum, const GLint *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLBLENDFUNCSEPARATEPROC)(GLenum, GLenum, GLenum, GLenum);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLMULTIDRAWARRAYSPROC)(GLenum,
>+                                                             const GLint *,
>+                                                             const GLsizei *,
>+                                                             GLsizei);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLMULTIDRAWELEMENTSPROC)(GLenum,
>+                                                               const GLsizei *,
>+                                                               GLenum,
>+                                                               const GLvoid *const *,
>+                                                               GLsizei);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLPOINTPARAMETERFPROC)(GLenum, GLfloat);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLPOINTPARAMETERFVPROC)(GLenum, const GLfloat *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLPOINTPARAMETERIPROC)(GLenum, GLint);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLPOINTPARAMETERIVPROC)(GLenum, const GLint *);
> 
> // 1.5
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLBEGINQUERYPROC)(GLenum, GLuint);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLBINDBUFFERPROC)(GLenum, GLuint);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLBUFFERDATAPROC)(GLenum, GLsizeiptr, const GLvoid *, GLenum);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLBUFFERSUBDATAPROC)(GLenum, GLintptr, GLsizeiptr, const GLvoid *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLDELETEBUFFERSPROC)(GLsizei, const GLuint *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLDELETEQUERIESPROC)(GLsizei, const GLuint *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLENDQUERYPROC)(GLenum);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLGENBUFFERSPROC)(GLsizei, GLuint *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLGENQUERIESPROC)(GLsizei, GLuint *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLGETBUFFERPARAMETERIVPROC)(GLenum, GLenum, GLint *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLGETBUFFERPOINTERVPROC)(GLenum, GLenum, GLvoid **);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLGETBUFFERSUBDATAPROC)(GLenum, GLintptr, GLsizeiptr, GLvoid *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLGETQUERYOBJECTIVPROC)(GLuint, GLenum, GLint *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLGETQUERYOBJECTUIVPROC)(GLuint, GLenum, GLuint *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLGETQUERYIVPROC)(GLenum, GLenum, GLint *);
>-typedef GLboolean (INTERNAL_GL_APIENTRY *PFNGLISBUFFERPROC)(GLuint);
>-typedef GLboolean (INTERNAL_GL_APIENTRY *PFNGLISQUERYPROC)(GLuint);
>-typedef void * (INTERNAL_GL_APIENTRY *PFNGLMAPBUFFERPROC)(GLenum, GLenum);
>-typedef GLboolean (INTERNAL_GL_APIENTRY *PFNGLUNMAPBUFFERPROC)(GLenum);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLBEGINQUERYPROC)(GLenum, GLuint);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLBINDBUFFERPROC)(GLenum, GLuint);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLBUFFERDATAPROC)(GLenum, GLsizeiptr, const GLvoid *, GLenum);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLBUFFERSUBDATAPROC)(GLenum,
>+                                                           GLintptr,
>+                                                           GLsizeiptr,
>+                                                           const GLvoid *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLDELETEBUFFERSPROC)(GLsizei, const GLuint *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLDELETEQUERIESPROC)(GLsizei, const GLuint *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLENDQUERYPROC)(GLenum);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLGENBUFFERSPROC)(GLsizei, GLuint *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLGENQUERIESPROC)(GLsizei, GLuint *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLGETBUFFERPARAMETERIVPROC)(GLenum, GLenum, GLint *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLGETBUFFERPOINTERVPROC)(GLenum, GLenum, GLvoid **);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLGETBUFFERSUBDATAPROC)(GLenum,
>+                                                              GLintptr,
>+                                                              GLsizeiptr,
>+                                                              GLvoid *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLGETQUERYOBJECTIVPROC)(GLuint, GLenum, GLint *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLGETQUERYOBJECTUIVPROC)(GLuint, GLenum, GLuint *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLGETQUERYIVPROC)(GLenum, GLenum, GLint *);
>+typedef GLboolean(INTERNAL_GL_APIENTRY *PFNGLISBUFFERPROC)(GLuint);
>+typedef GLboolean(INTERNAL_GL_APIENTRY *PFNGLISQUERYPROC)(GLuint);
>+typedef void *(INTERNAL_GL_APIENTRY *PFNGLMAPBUFFERPROC)(GLenum, GLenum);
>+typedef GLboolean(INTERNAL_GL_APIENTRY *PFNGLUNMAPBUFFERPROC)(GLenum);
> 
> // 2.0
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLATTACHSHADERPROC)(GLuint, GLuint);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLBINDATTRIBLOCATIONPROC)(GLuint, GLuint, const GLchar *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLBLENDEQUATIONSEPARATEPROC)(GLenum, GLenum);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLCOMPILESHADERPROC)(GLuint);
>-typedef GLuint (INTERNAL_GL_APIENTRY *PFNGLCREATEPROGRAMPROC)();
>-typedef GLuint (INTERNAL_GL_APIENTRY *PFNGLCREATESHADERPROC)(GLenum);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLDELETEPROGRAMPROC)(GLuint);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLDELETESHADERPROC)(GLuint);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLDETACHSHADERPROC)(GLuint, GLuint);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLDISABLEVERTEXATTRIBARRAYPROC)(GLuint);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLDRAWBUFFERSPROC)(GLsizei, const GLenum *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLENABLEVERTEXATTRIBARRAYPROC)(GLuint);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLGETACTIVEATTRIBPROC)(GLuint, GLuint, GLsizei, GLsizei *, GLint *, GLenum *, GLchar *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLGETACTIVEUNIFORMPROC)(GLuint, GLuint, GLsizei, GLsizei *, GLint *, GLenum *, GLchar *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLGETATTACHEDSHADERSPROC)(GLuint, GLsizei, GLsizei *, GLuint *);
>-typedef GLint (INTERNAL_GL_APIENTRY *PFNGLGETATTRIBLOCATIONPROC)(GLuint, const GLchar *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLGETPROGRAMINFOLOGPROC)(GLuint, GLsizei, GLsizei *, GLchar *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLGETPROGRAMIVPROC)(GLuint, GLenum, GLint *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLGETSHADERINFOLOGPROC)(GLuint, GLsizei, GLsizei *, GLchar *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLGETSHADERSOURCEPROC)(GLuint, GLsizei, GLsizei *, GLchar *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLGETSHADERIVPROC)(GLuint, GLenum, GLint *);
>-typedef GLint (INTERNAL_GL_APIENTRY *PFNGLGETUNIFORMLOCATIONPROC)(GLuint, const GLchar *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLGETUNIFORMFVPROC)(GLuint, GLint, GLfloat *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLGETUNIFORMIVPROC)(GLuint, GLint, GLint *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLGETVERTEXATTRIBPOINTERVPROC)(GLuint, GLenum, GLvoid **);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLGETVERTEXATTRIBDVPROC)(GLuint, GLenum, GLdouble *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLGETVERTEXATTRIBFVPROC)(GLuint, GLenum, GLfloat *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLGETVERTEXATTRIBIVPROC)(GLuint, GLenum, GLint *);
>-typedef GLboolean (INTERNAL_GL_APIENTRY *PFNGLISPROGRAMPROC)(GLuint);
>-typedef GLboolean (INTERNAL_GL_APIENTRY *PFNGLISSHADERPROC)(GLuint);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLLINKPROGRAMPROC)(GLuint);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLSHADERSOURCEPROC)(GLuint, GLsizei, const GLchar *const*, const GLint *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLSTENCILFUNCSEPARATEPROC)(GLenum, GLenum, GLint, GLuint);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLSTENCILMASKSEPARATEPROC)(GLenum, GLuint);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLSTENCILOPSEPARATEPROC)(GLenum, GLenum, GLenum, GLenum);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLUNIFORM1FPROC)(GLint, GLfloat);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLUNIFORM1FVPROC)(GLint, GLsizei, const GLfloat *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLUNIFORM1IPROC)(GLint, GLint);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLUNIFORM1IVPROC)(GLint, GLsizei, const GLint *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLUNIFORM2FPROC)(GLint, GLfloat, GLfloat);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLUNIFORM2FVPROC)(GLint, GLsizei, const GLfloat *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLUNIFORM2IPROC)(GLint, GLint, GLint);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLUNIFORM2IVPROC)(GLint, GLsizei, const GLint *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLUNIFORM3FPROC)(GLint, GLfloat, GLfloat, GLfloat);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLUNIFORM3FVPROC)(GLint, GLsizei, const GLfloat *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLUNIFORM3IPROC)(GLint, GLint, GLint, GLint);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLUNIFORM3IVPROC)(GLint, GLsizei, const GLint *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLUNIFORM4FPROC)(GLint, GLfloat, GLfloat, GLfloat, GLfloat);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLUNIFORM4FVPROC)(GLint, GLsizei, const GLfloat *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLUNIFORM4IPROC)(GLint, GLint, GLint, GLint, GLint);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLUNIFORM4IVPROC)(GLint, GLsizei, const GLint *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLUNIFORMMATRIX2FVPROC)(GLint, GLsizei, GLboolean, const GLfloat *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLUNIFORMMATRIX3FVPROC)(GLint, GLsizei, GLboolean, const GLfloat *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLUNIFORMMATRIX4FVPROC)(GLint, GLsizei, GLboolean, const GLfloat *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLUSEPROGRAMPROC)(GLuint);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLVALIDATEPROGRAMPROC)(GLuint);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLVERTEXATTRIB1DPROC)(GLuint, GLdouble);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLVERTEXATTRIB1DVPROC)(GLuint, const GLdouble *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLVERTEXATTRIB1FPROC)(GLuint, GLfloat);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLVERTEXATTRIB1FVPROC)(GLuint, const GLfloat *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLVERTEXATTRIB1SPROC)(GLuint, GLshort);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLVERTEXATTRIB1SVPROC)(GLuint, const GLshort *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLVERTEXATTRIB2DPROC)(GLuint, GLdouble, GLdouble);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLVERTEXATTRIB2DVPROC)(GLuint, const GLdouble *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLVERTEXATTRIB2FPROC)(GLuint, GLfloat, GLfloat);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLVERTEXATTRIB2FVPROC)(GLuint, const GLfloat *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLVERTEXATTRIB2SPROC)(GLuint, GLshort, GLshort);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLVERTEXATTRIB2SVPROC)(GLuint, const GLshort *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLVERTEXATTRIB3DPROC)(GLuint, GLdouble, GLdouble, GLdouble);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLVERTEXATTRIB3DVPROC)(GLuint, const GLdouble *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLVERTEXATTRIB3FPROC)(GLuint, GLfloat, GLfloat, GLfloat);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLVERTEXATTRIB3FVPROC)(GLuint, const GLfloat *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLVERTEXATTRIB3SPROC)(GLuint, GLshort, GLshort, GLshort);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLVERTEXATTRIB3SVPROC)(GLuint, const GLshort *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLVERTEXATTRIB4NBVPROC)(GLuint, const GLbyte *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLVERTEXATTRIB4NIVPROC)(GLuint, const GLint *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLVERTEXATTRIB4NSVPROC)(GLuint, const GLshort *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLVERTEXATTRIB4NUBPROC)(GLuint, GLubyte, GLubyte, GLubyte, GLubyte);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLVERTEXATTRIB4NUBVPROC)(GLuint, const GLubyte *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLVERTEXATTRIB4NUIVPROC)(GLuint, const GLuint *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLVERTEXATTRIB4NUSVPROC)(GLuint, const GLushort *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLVERTEXATTRIB4BVPROC)(GLuint, const GLbyte *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLVERTEXATTRIB4DPROC)(GLuint, GLdouble, GLdouble, GLdouble, GLdouble);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLVERTEXATTRIB4DVPROC)(GLuint, const GLdouble *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLVERTEXATTRIB4FPROC)(GLuint, GLfloat, GLfloat, GLfloat, GLfloat);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLVERTEXATTRIB4FVPROC)(GLuint, const GLfloat *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLVERTEXATTRIB4IVPROC)(GLuint, const GLint *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLVERTEXATTRIB4SPROC)(GLuint, GLshort, GLshort, GLshort, GLshort);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLVERTEXATTRIB4SVPROC)(GLuint, const GLshort *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLVERTEXATTRIB4UBVPROC)(GLuint, const GLubyte *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLVERTEXATTRIB4UIVPROC)(GLuint, const GLuint *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLVERTEXATTRIB4USVPROC)(GLuint, const GLushort *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLVERTEXATTRIBPOINTERPROC)(GLuint, GLint, GLenum, GLboolean, GLsizei, const GLvoid *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLATTACHSHADERPROC)(GLuint, GLuint);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLBINDATTRIBLOCATIONPROC)(GLuint, GLuint, const GLchar *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLBLENDEQUATIONSEPARATEPROC)(GLenum, GLenum);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLCOMPILESHADERPROC)(GLuint);
>+typedef GLuint(INTERNAL_GL_APIENTRY *PFNGLCREATEPROGRAMPROC)();
>+typedef GLuint(INTERNAL_GL_APIENTRY *PFNGLCREATESHADERPROC)(GLenum);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLDELETEPROGRAMPROC)(GLuint);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLDELETESHADERPROC)(GLuint);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLDETACHSHADERPROC)(GLuint, GLuint);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLDISABLEVERTEXATTRIBARRAYPROC)(GLuint);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLDRAWBUFFERSPROC)(GLsizei, const GLenum *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLENABLEVERTEXATTRIBARRAYPROC)(GLuint);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLGETACTIVEATTRIBPROC)(GLuint,
>+                                                             GLuint,
>+                                                             GLsizei,
>+                                                             GLsizei *,
>+                                                             GLint *,
>+                                                             GLenum *,
>+                                                             GLchar *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLGETACTIVEUNIFORMPROC)(GLuint,
>+                                                              GLuint,
>+                                                              GLsizei,
>+                                                              GLsizei *,
>+                                                              GLint *,
>+                                                              GLenum *,
>+                                                              GLchar *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLGETATTACHEDSHADERSPROC)(GLuint,
>+                                                                GLsizei,
>+                                                                GLsizei *,
>+                                                                GLuint *);
>+typedef GLint(INTERNAL_GL_APIENTRY *PFNGLGETATTRIBLOCATIONPROC)(GLuint, const GLchar *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLGETPROGRAMINFOLOGPROC)(GLuint,
>+                                                               GLsizei,
>+                                                               GLsizei *,
>+                                                               GLchar *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLGETPROGRAMIVPROC)(GLuint, GLenum, GLint *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLGETSHADERINFOLOGPROC)(GLuint, GLsizei, GLsizei *, GLchar *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLGETSHADERSOURCEPROC)(GLuint, GLsizei, GLsizei *, GLchar *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLGETSHADERIVPROC)(GLuint, GLenum, GLint *);
>+typedef GLint(INTERNAL_GL_APIENTRY *PFNGLGETUNIFORMLOCATIONPROC)(GLuint, const GLchar *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLGETUNIFORMFVPROC)(GLuint, GLint, GLfloat *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLGETUNIFORMIVPROC)(GLuint, GLint, GLint *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLGETVERTEXATTRIBPOINTERVPROC)(GLuint, GLenum, GLvoid **);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLGETVERTEXATTRIBDVPROC)(GLuint, GLenum, GLdouble *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLGETVERTEXATTRIBFVPROC)(GLuint, GLenum, GLfloat *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLGETVERTEXATTRIBIVPROC)(GLuint, GLenum, GLint *);
>+typedef GLboolean(INTERNAL_GL_APIENTRY *PFNGLISPROGRAMPROC)(GLuint);
>+typedef GLboolean(INTERNAL_GL_APIENTRY *PFNGLISSHADERPROC)(GLuint);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLLINKPROGRAMPROC)(GLuint);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLSHADERSOURCEPROC)(GLuint,
>+                                                          GLsizei,
>+                                                          const GLchar *const *,
>+                                                          const GLint *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLSTENCILFUNCSEPARATEPROC)(GLenum, GLenum, GLint, GLuint);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLSTENCILMASKSEPARATEPROC)(GLenum, GLuint);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLSTENCILOPSEPARATEPROC)(GLenum, GLenum, GLenum, GLenum);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLUNIFORM1FPROC)(GLint, GLfloat);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLUNIFORM1FVPROC)(GLint, GLsizei, const GLfloat *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLUNIFORM1IPROC)(GLint, GLint);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLUNIFORM1IVPROC)(GLint, GLsizei, const GLint *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLUNIFORM2FPROC)(GLint, GLfloat, GLfloat);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLUNIFORM2FVPROC)(GLint, GLsizei, const GLfloat *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLUNIFORM2IPROC)(GLint, GLint, GLint);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLUNIFORM2IVPROC)(GLint, GLsizei, const GLint *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLUNIFORM3FPROC)(GLint, GLfloat, GLfloat, GLfloat);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLUNIFORM3FVPROC)(GLint, GLsizei, const GLfloat *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLUNIFORM3IPROC)(GLint, GLint, GLint, GLint);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLUNIFORM3IVPROC)(GLint, GLsizei, const GLint *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLUNIFORM4FPROC)(GLint, GLfloat, GLfloat, GLfloat, GLfloat);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLUNIFORM4FVPROC)(GLint, GLsizei, const GLfloat *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLUNIFORM4IPROC)(GLint, GLint, GLint, GLint, GLint);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLUNIFORM4IVPROC)(GLint, GLsizei, const GLint *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLUNIFORMMATRIX2FVPROC)(GLint,
>+                                                              GLsizei,
>+                                                              GLboolean,
>+                                                              const GLfloat *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLUNIFORMMATRIX3FVPROC)(GLint,
>+                                                              GLsizei,
>+                                                              GLboolean,
>+                                                              const GLfloat *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLUNIFORMMATRIX4FVPROC)(GLint,
>+                                                              GLsizei,
>+                                                              GLboolean,
>+                                                              const GLfloat *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLUSEPROGRAMPROC)(GLuint);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLVALIDATEPROGRAMPROC)(GLuint);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLVERTEXATTRIB1DPROC)(GLuint, GLdouble);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLVERTEXATTRIB1DVPROC)(GLuint, const GLdouble *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLVERTEXATTRIB1FPROC)(GLuint, GLfloat);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLVERTEXATTRIB1FVPROC)(GLuint, const GLfloat *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLVERTEXATTRIB1SPROC)(GLuint, GLshort);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLVERTEXATTRIB1SVPROC)(GLuint, const GLshort *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLVERTEXATTRIB2DPROC)(GLuint, GLdouble, GLdouble);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLVERTEXATTRIB2DVPROC)(GLuint, const GLdouble *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLVERTEXATTRIB2FPROC)(GLuint, GLfloat, GLfloat);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLVERTEXATTRIB2FVPROC)(GLuint, const GLfloat *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLVERTEXATTRIB2SPROC)(GLuint, GLshort, GLshort);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLVERTEXATTRIB2SVPROC)(GLuint, const GLshort *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLVERTEXATTRIB3DPROC)(GLuint, GLdouble, GLdouble, GLdouble);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLVERTEXATTRIB3DVPROC)(GLuint, const GLdouble *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLVERTEXATTRIB3FPROC)(GLuint, GLfloat, GLfloat, GLfloat);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLVERTEXATTRIB3FVPROC)(GLuint, const GLfloat *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLVERTEXATTRIB3SPROC)(GLuint, GLshort, GLshort, GLshort);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLVERTEXATTRIB3SVPROC)(GLuint, const GLshort *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLVERTEXATTRIB4NBVPROC)(GLuint, const GLbyte *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLVERTEXATTRIB4NIVPROC)(GLuint, const GLint *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLVERTEXATTRIB4NSVPROC)(GLuint, const GLshort *);
>+typedef void(
>+    INTERNAL_GL_APIENTRY *PFNGLVERTEXATTRIB4NUBPROC)(GLuint, GLubyte, GLubyte, GLubyte, GLubyte);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLVERTEXATTRIB4NUBVPROC)(GLuint, const GLubyte *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLVERTEXATTRIB4NUIVPROC)(GLuint, const GLuint *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLVERTEXATTRIB4NUSVPROC)(GLuint, const GLushort *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLVERTEXATTRIB4BVPROC)(GLuint, const GLbyte *);
>+typedef void(
>+    INTERNAL_GL_APIENTRY *PFNGLVERTEXATTRIB4DPROC)(GLuint, GLdouble, GLdouble, GLdouble, GLdouble);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLVERTEXATTRIB4DVPROC)(GLuint, const GLdouble *);
>+typedef void(
>+    INTERNAL_GL_APIENTRY *PFNGLVERTEXATTRIB4FPROC)(GLuint, GLfloat, GLfloat, GLfloat, GLfloat);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLVERTEXATTRIB4FVPROC)(GLuint, const GLfloat *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLVERTEXATTRIB4IVPROC)(GLuint, const GLint *);
>+typedef void(
>+    INTERNAL_GL_APIENTRY *PFNGLVERTEXATTRIB4SPROC)(GLuint, GLshort, GLshort, GLshort, GLshort);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLVERTEXATTRIB4SVPROC)(GLuint, const GLshort *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLVERTEXATTRIB4UBVPROC)(GLuint, const GLubyte *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLVERTEXATTRIB4UIVPROC)(GLuint, const GLuint *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLVERTEXATTRIB4USVPROC)(GLuint, const GLushort *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLVERTEXATTRIBPOINTERPROC)(GLuint,
>+                                                                 GLint,
>+                                                                 GLenum,
>+                                                                 GLboolean,
>+                                                                 GLsizei,
>+                                                                 const GLvoid *);
> 
> // 2.1
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLUNIFORMMATRIX2X3FVPROC)(GLint, GLsizei, GLboolean, const GLfloat *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLUNIFORMMATRIX2X4FVPROC)(GLint, GLsizei, GLboolean, const GLfloat *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLUNIFORMMATRIX3X2FVPROC)(GLint, GLsizei, GLboolean, const GLfloat *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLUNIFORMMATRIX3X4FVPROC)(GLint, GLsizei, GLboolean, const GLfloat *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLUNIFORMMATRIX4X2FVPROC)(GLint, GLsizei, GLboolean, const GLfloat *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLUNIFORMMATRIX4X3FVPROC)(GLint, GLsizei, GLboolean, const GLfloat *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLUNIFORMMATRIX2X3FVPROC)(GLint,
>+                                                                GLsizei,
>+                                                                GLboolean,
>+                                                                const GLfloat *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLUNIFORMMATRIX2X4FVPROC)(GLint,
>+                                                                GLsizei,
>+                                                                GLboolean,
>+                                                                const GLfloat *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLUNIFORMMATRIX3X2FVPROC)(GLint,
>+                                                                GLsizei,
>+                                                                GLboolean,
>+                                                                const GLfloat *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLUNIFORMMATRIX3X4FVPROC)(GLint,
>+                                                                GLsizei,
>+                                                                GLboolean,
>+                                                                const GLfloat *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLUNIFORMMATRIX4X2FVPROC)(GLint,
>+                                                                GLsizei,
>+                                                                GLboolean,
>+                                                                const GLfloat *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLUNIFORMMATRIX4X3FVPROC)(GLint,
>+                                                                GLsizei,
>+                                                                GLboolean,
>+                                                                const GLfloat *);
> 
> // 3.0
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLBEGINCONDITIONALRENDERPROC)(GLuint, GLenum);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLBEGINTRANSFORMFEEDBACKPROC)(GLenum);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLBINDBUFFERBASEPROC)(GLenum, GLuint, GLuint);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLBINDBUFFERRANGEPROC)(GLenum, GLuint, GLuint, GLintptr, GLsizeiptr);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLBINDFRAGDATALOCATIONPROC)(GLuint, GLuint, const GLchar *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLBINDFRAMEBUFFERPROC)(GLenum, GLuint);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLBINDRENDERBUFFERPROC)(GLenum, GLuint);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLBINDVERTEXARRAYPROC)(GLuint);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLBLITFRAMEBUFFERPROC)(GLint, GLint, GLint, GLint, GLint, GLint, GLint, GLint, GLbitfield, GLenum);
>-typedef GLenum (INTERNAL_GL_APIENTRY *PFNGLCHECKFRAMEBUFFERSTATUSPROC)(GLenum);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLCLAMPCOLORPROC)(GLenum, GLenum);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLCLEARBUFFERFIPROC)(GLenum, GLint, GLfloat, GLint);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLCLEARBUFFERFVPROC)(GLenum, GLint, const GLfloat *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLCLEARBUFFERIVPROC)(GLenum, GLint, const GLint *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLCLEARBUFFERUIVPROC)(GLenum, GLint, const GLuint *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLCOLORMASKIPROC)(GLuint, GLboolean, GLboolean, GLboolean, GLboolean);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLDELETEFRAMEBUFFERSPROC)(GLsizei, const GLuint *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLDELETERENDERBUFFERSPROC)(GLsizei, const GLuint *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLDELETEVERTEXARRAYSPROC)(GLsizei, const GLuint *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLDISABLEIPROC)(GLenum, GLuint);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLENABLEIPROC)(GLenum, GLuint);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLENDCONDITIONALRENDERPROC)();
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLENDTRANSFORMFEEDBACKPROC)();
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLFLUSHMAPPEDBUFFERRANGEPROC)(GLenum, GLintptr, GLsizeiptr);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLFRAMEBUFFERRENDERBUFFERPROC)(GLenum, GLenum, GLenum, GLuint);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLFRAMEBUFFERTEXTURE1DPROC)(GLenum, GLenum, GLenum, GLuint, GLint);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLFRAMEBUFFERTEXTURE2DPROC)(GLenum, GLenum, GLenum, GLuint, GLint);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLFRAMEBUFFERTEXTURE3DPROC)(GLenum, GLenum, GLenum, GLuint, GLint, GLint);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLFRAMEBUFFERTEXTURELAYERPROC)(GLenum, GLenum, GLuint, GLint, GLint);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLGENFRAMEBUFFERSPROC)(GLsizei, GLuint *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLGENRENDERBUFFERSPROC)(GLsizei, GLuint *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLGENVERTEXARRAYSPROC)(GLsizei, GLuint *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLGENERATEMIPMAPPROC)(GLenum);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLGETBOOLEANI_VPROC)(GLenum, GLuint, GLboolean *);
>-typedef GLint (INTERNAL_GL_APIENTRY *PFNGLGETFRAGDATALOCATIONPROC)(GLuint, const GLchar *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLGETFRAMEBUFFERATTACHMENTPARAMETERIVPROC)(GLenum, GLenum, GLenum, GLint *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLGETINTEGERI_VPROC)(GLenum, GLuint, GLint *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLGETRENDERBUFFERPARAMETERIVPROC)(GLenum, GLenum, GLint *);
>-typedef const GLubyte * (INTERNAL_GL_APIENTRY *PFNGLGETSTRINGIPROC)(GLenum, GLuint);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLGETTEXPARAMETERIIVPROC)(GLenum, GLenum, GLint *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLGETTEXPARAMETERIUIVPROC)(GLenum, GLenum, GLuint *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLGETTRANSFORMFEEDBACKVARYINGPROC)(GLuint, GLuint, GLsizei, GLsizei *, GLsizei *, GLenum *, GLchar *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLGETUNIFORMUIVPROC)(GLuint, GLint, GLuint *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLGETVERTEXATTRIBIIVPROC)(GLuint, GLenum, GLint *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLGETVERTEXATTRIBIUIVPROC)(GLuint, GLenum, GLuint *);
>-typedef GLboolean (INTERNAL_GL_APIENTRY *PFNGLISENABLEDIPROC)(GLenum, GLuint);
>-typedef GLboolean (INTERNAL_GL_APIENTRY *PFNGLISFRAMEBUFFERPROC)(GLuint);
>-typedef GLboolean (INTERNAL_GL_APIENTRY *PFNGLISRENDERBUFFERPROC)(GLuint);
>-typedef GLboolean (INTERNAL_GL_APIENTRY *PFNGLISVERTEXARRAYPROC)(GLuint);
>-typedef void * (INTERNAL_GL_APIENTRY *PFNGLMAPBUFFERRANGEPROC)(GLenum, GLintptr, GLsizeiptr, GLbitfield);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLRENDERBUFFERSTORAGEPROC)(GLenum, GLenum, GLsizei, GLsizei);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLRENDERBUFFERSTORAGEMULTISAMPLEPROC)(GLenum, GLsizei, GLenum, GLsizei, GLsizei);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLTEXPARAMETERIIVPROC)(GLenum, GLenum, const GLint *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLTEXPARAMETERIUIVPROC)(GLenum, GLenum, const GLuint *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLTRANSFORMFEEDBACKVARYINGSPROC)(GLuint, GLsizei, const GLchar *const*, GLenum);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLUNIFORM1UIPROC)(GLint, GLuint);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLUNIFORM1UIVPROC)(GLint, GLsizei, const GLuint *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLUNIFORM2UIPROC)(GLint, GLuint, GLuint);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLUNIFORM2UIVPROC)(GLint, GLsizei, const GLuint *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLUNIFORM3UIPROC)(GLint, GLuint, GLuint, GLuint);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLUNIFORM3UIVPROC)(GLint, GLsizei, const GLuint *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLUNIFORM4UIPROC)(GLint, GLuint, GLuint, GLuint, GLuint);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLUNIFORM4UIVPROC)(GLint, GLsizei, const GLuint *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLVERTEXATTRIBI1IPROC)(GLuint, GLint);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLVERTEXATTRIBI1IVPROC)(GLuint, const GLint *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLVERTEXATTRIBI1UIPROC)(GLuint, GLuint);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLVERTEXATTRIBI1UIVPROC)(GLuint, const GLuint *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLVERTEXATTRIBI2IPROC)(GLuint, GLint, GLint);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLVERTEXATTRIBI2IVPROC)(GLuint, const GLint *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLVERTEXATTRIBI2UIPROC)(GLuint, GLuint, GLuint);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLVERTEXATTRIBI2UIVPROC)(GLuint, const GLuint *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLVERTEXATTRIBI3IPROC)(GLuint, GLint, GLint, GLint);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLVERTEXATTRIBI3IVPROC)(GLuint, const GLint *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLVERTEXATTRIBI3UIPROC)(GLuint, GLuint, GLuint, GLuint);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLVERTEXATTRIBI3UIVPROC)(GLuint, const GLuint *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLVERTEXATTRIBI4BVPROC)(GLuint, const GLbyte *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLVERTEXATTRIBI4IPROC)(GLuint, GLint, GLint, GLint, GLint);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLVERTEXATTRIBI4IVPROC)(GLuint, const GLint *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLVERTEXATTRIBI4SVPROC)(GLuint, const GLshort *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLVERTEXATTRIBI4UBVPROC)(GLuint, const GLubyte *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLVERTEXATTRIBI4UIPROC)(GLuint, GLuint, GLuint, GLuint, GLuint);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLVERTEXATTRIBI4UIVPROC)(GLuint, const GLuint *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLVERTEXATTRIBI4USVPROC)(GLuint, const GLushort *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLVERTEXATTRIBIPOINTERPROC)(GLuint, GLint, GLenum, GLsizei, const GLvoid *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLBEGINCONDITIONALRENDERPROC)(GLuint, GLenum);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLBEGINTRANSFORMFEEDBACKPROC)(GLenum);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLBINDBUFFERBASEPROC)(GLenum, GLuint, GLuint);
>+typedef void(
>+    INTERNAL_GL_APIENTRY *PFNGLBINDBUFFERRANGEPROC)(GLenum, GLuint, GLuint, GLintptr, GLsizeiptr);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLBINDFRAGDATALOCATIONPROC)(GLuint, GLuint, const GLchar *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLBINDFRAMEBUFFERPROC)(GLenum, GLuint);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLBINDRENDERBUFFERPROC)(GLenum, GLuint);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLBINDVERTEXARRAYPROC)(GLuint);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLBLITFRAMEBUFFERPROC)(GLint,
>+                                                             GLint,
>+                                                             GLint,
>+                                                             GLint,
>+                                                             GLint,
>+                                                             GLint,
>+                                                             GLint,
>+                                                             GLint,
>+                                                             GLbitfield,
>+                                                             GLenum);
>+typedef GLenum(INTERNAL_GL_APIENTRY *PFNGLCHECKFRAMEBUFFERSTATUSPROC)(GLenum);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLCLAMPCOLORPROC)(GLenum, GLenum);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLCLEARBUFFERFIPROC)(GLenum, GLint, GLfloat, GLint);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLCLEARBUFFERFVPROC)(GLenum, GLint, const GLfloat *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLCLEARBUFFERIVPROC)(GLenum, GLint, const GLint *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLCLEARBUFFERUIVPROC)(GLenum, GLint, const GLuint *);
>+typedef void(
>+    INTERNAL_GL_APIENTRY *PFNGLCOLORMASKIPROC)(GLuint, GLboolean, GLboolean, GLboolean, GLboolean);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLDELETEFRAMEBUFFERSPROC)(GLsizei, const GLuint *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLDELETERENDERBUFFERSPROC)(GLsizei, const GLuint *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLDELETEVERTEXARRAYSPROC)(GLsizei, const GLuint *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLDISABLEIPROC)(GLenum, GLuint);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLENABLEIPROC)(GLenum, GLuint);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLENDCONDITIONALRENDERPROC)();
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLENDTRANSFORMFEEDBACKPROC)();
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLFLUSHMAPPEDBUFFERRANGEPROC)(GLenum, GLintptr, GLsizeiptr);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLFRAMEBUFFERRENDERBUFFERPROC)(GLenum,
>+                                                                     GLenum,
>+                                                                     GLenum,
>+                                                                     GLuint);
>+typedef void(
>+    INTERNAL_GL_APIENTRY *PFNGLFRAMEBUFFERTEXTURE1DPROC)(GLenum, GLenum, GLenum, GLuint, GLint);
>+typedef void(
>+    INTERNAL_GL_APIENTRY *PFNGLFRAMEBUFFERTEXTURE2DPROC)(GLenum, GLenum, GLenum, GLuint, GLint);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLFRAMEBUFFERTEXTURE3DPROC)(GLenum,
>+                                                                  GLenum,
>+                                                                  GLenum,
>+                                                                  GLuint,
>+                                                                  GLint,
>+                                                                  GLint);
>+typedef void(
>+    INTERNAL_GL_APIENTRY *PFNGLFRAMEBUFFERTEXTURELAYERPROC)(GLenum, GLenum, GLuint, GLint, GLint);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLGENFRAMEBUFFERSPROC)(GLsizei, GLuint *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLGENRENDERBUFFERSPROC)(GLsizei, GLuint *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLGENVERTEXARRAYSPROC)(GLsizei, GLuint *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLGENERATEMIPMAPPROC)(GLenum);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLGETBOOLEANI_VPROC)(GLenum, GLuint, GLboolean *);
>+typedef GLint(INTERNAL_GL_APIENTRY *PFNGLGETFRAGDATALOCATIONPROC)(GLuint, const GLchar *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLGETFRAMEBUFFERATTACHMENTPARAMETERIVPROC)(GLenum,
>+                                                                                 GLenum,
>+                                                                                 GLenum,
>+                                                                                 GLint *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLGETINTEGERI_VPROC)(GLenum, GLuint, GLint *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLGETRENDERBUFFERPARAMETERIVPROC)(GLenum, GLenum, GLint *);
>+typedef const GLubyte *(INTERNAL_GL_APIENTRY *PFNGLGETSTRINGIPROC)(GLenum, GLuint);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLGETTEXPARAMETERIIVPROC)(GLenum, GLenum, GLint *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLGETTEXPARAMETERIUIVPROC)(GLenum, GLenum, GLuint *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLGETTRANSFORMFEEDBACKVARYINGPROC)(GLuint,
>+                                                                         GLuint,
>+                                                                         GLsizei,
>+                                                                         GLsizei *,
>+                                                                         GLsizei *,
>+                                                                         GLenum *,
>+                                                                         GLchar *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLGETUNIFORMUIVPROC)(GLuint, GLint, GLuint *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLGETVERTEXATTRIBIIVPROC)(GLuint, GLenum, GLint *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLGETVERTEXATTRIBIUIVPROC)(GLuint, GLenum, GLuint *);
>+typedef GLboolean(INTERNAL_GL_APIENTRY *PFNGLISENABLEDIPROC)(GLenum, GLuint);
>+typedef GLboolean(INTERNAL_GL_APIENTRY *PFNGLISFRAMEBUFFERPROC)(GLuint);
>+typedef GLboolean(INTERNAL_GL_APIENTRY *PFNGLISRENDERBUFFERPROC)(GLuint);
>+typedef GLboolean(INTERNAL_GL_APIENTRY *PFNGLISVERTEXARRAYPROC)(GLuint);
>+typedef void *(INTERNAL_GL_APIENTRY *PFNGLMAPBUFFERRANGEPROC)(GLenum,
>+                                                              GLintptr,
>+                                                              GLsizeiptr,
>+                                                              GLbitfield);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLRENDERBUFFERSTORAGEPROC)(GLenum, GLenum, GLsizei, GLsizei);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLRENDERBUFFERSTORAGEMULTISAMPLEPROC)(GLenum,
>+                                                                            GLsizei,
>+                                                                            GLenum,
>+                                                                            GLsizei,
>+                                                                            GLsizei);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLTEXPARAMETERIIVPROC)(GLenum, GLenum, const GLint *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLTEXPARAMETERIUIVPROC)(GLenum, GLenum, const GLuint *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLTRANSFORMFEEDBACKVARYINGSPROC)(GLuint,
>+                                                                       GLsizei,
>+                                                                       const GLchar *const *,
>+                                                                       GLenum);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLUNIFORM1UIPROC)(GLint, GLuint);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLUNIFORM1UIVPROC)(GLint, GLsizei, const GLuint *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLUNIFORM2UIPROC)(GLint, GLuint, GLuint);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLUNIFORM2UIVPROC)(GLint, GLsizei, const GLuint *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLUNIFORM3UIPROC)(GLint, GLuint, GLuint, GLuint);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLUNIFORM3UIVPROC)(GLint, GLsizei, const GLuint *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLUNIFORM4UIPROC)(GLint, GLuint, GLuint, GLuint, GLuint);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLUNIFORM4UIVPROC)(GLint, GLsizei, const GLuint *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLVERTEXATTRIBI1IPROC)(GLuint, GLint);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLVERTEXATTRIBI1IVPROC)(GLuint, const GLint *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLVERTEXATTRIBI1UIPROC)(GLuint, GLuint);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLVERTEXATTRIBI1UIVPROC)(GLuint, const GLuint *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLVERTEXATTRIBI2IPROC)(GLuint, GLint, GLint);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLVERTEXATTRIBI2IVPROC)(GLuint, const GLint *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLVERTEXATTRIBI2UIPROC)(GLuint, GLuint, GLuint);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLVERTEXATTRIBI2UIVPROC)(GLuint, const GLuint *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLVERTEXATTRIBI3IPROC)(GLuint, GLint, GLint, GLint);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLVERTEXATTRIBI3IVPROC)(GLuint, const GLint *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLVERTEXATTRIBI3UIPROC)(GLuint, GLuint, GLuint, GLuint);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLVERTEXATTRIBI3UIVPROC)(GLuint, const GLuint *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLVERTEXATTRIBI4BVPROC)(GLuint, const GLbyte *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLVERTEXATTRIBI4IPROC)(GLuint, GLint, GLint, GLint, GLint);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLVERTEXATTRIBI4IVPROC)(GLuint, const GLint *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLVERTEXATTRIBI4SVPROC)(GLuint, const GLshort *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLVERTEXATTRIBI4UBVPROC)(GLuint, const GLubyte *);
>+typedef void(
>+    INTERNAL_GL_APIENTRY *PFNGLVERTEXATTRIBI4UIPROC)(GLuint, GLuint, GLuint, GLuint, GLuint);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLVERTEXATTRIBI4UIVPROC)(GLuint, const GLuint *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLVERTEXATTRIBI4USVPROC)(GLuint, const GLushort *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLVERTEXATTRIBIPOINTERPROC)(GLuint,
>+                                                                  GLint,
>+                                                                  GLenum,
>+                                                                  GLsizei,
>+                                                                  const GLvoid *);
> 
> // 3.1
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLCOPYBUFFERSUBDATAPROC)(GLenum, GLenum, GLintptr, GLintptr, GLsizeiptr);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLDRAWARRAYSINSTANCEDPROC)(GLenum, GLint, GLsizei, GLsizei);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLDRAWELEMENTSINSTANCEDPROC)(GLenum, GLsizei, GLenum, const GLvoid *, GLsizei);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLGETACTIVEUNIFORMBLOCKNAMEPROC)(GLuint, GLuint, GLsizei, GLsizei *, GLchar *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLGETACTIVEUNIFORMBLOCKIVPROC)(GLuint, GLuint, GLenum, GLint *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLGETACTIVEUNIFORMNAMEPROC)(GLuint, GLuint, GLsizei, GLsizei *, GLchar *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLGETACTIVEUNIFORMSIVPROC)(GLuint, GLsizei, const GLuint *, GLenum, GLint *);
>-typedef GLuint (INTERNAL_GL_APIENTRY *PFNGLGETUNIFORMBLOCKINDEXPROC)(GLuint, const GLchar *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLGETUNIFORMINDICESPROC)(GLuint, GLsizei, const GLchar *const*, GLuint *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLPRIMITIVERESTARTINDEXPROC)(GLuint);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLTEXBUFFERPROC)(GLenum, GLenum, GLuint);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLUNIFORMBLOCKBINDINGPROC)(GLuint, GLuint, GLuint);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLCOPYBUFFERSUBDATAPROC)(GLenum,
>+                                                               GLenum,
>+                                                               GLintptr,
>+                                                               GLintptr,
>+                                                               GLsizeiptr);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLDRAWARRAYSINSTANCEDPROC)(GLenum, GLint, GLsizei, GLsizei);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLDRAWELEMENTSINSTANCEDPROC)(GLenum,
>+                                                                   GLsizei,
>+                                                                   GLenum,
>+                                                                   const GLvoid *,
>+                                                                   GLsizei);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLGETACTIVEUNIFORMBLOCKNAMEPROC)(GLuint,
>+                                                                       GLuint,
>+                                                                       GLsizei,
>+                                                                       GLsizei *,
>+                                                                       GLchar *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLGETACTIVEUNIFORMBLOCKIVPROC)(GLuint,
>+                                                                     GLuint,
>+                                                                     GLenum,
>+                                                                     GLint *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLGETACTIVEUNIFORMNAMEPROC)(GLuint,
>+                                                                  GLuint,
>+                                                                  GLsizei,
>+                                                                  GLsizei *,
>+                                                                  GLchar *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLGETACTIVEUNIFORMSIVPROC)(GLuint,
>+                                                                 GLsizei,
>+                                                                 const GLuint *,
>+                                                                 GLenum,
>+                                                                 GLint *);
>+typedef GLuint(INTERNAL_GL_APIENTRY *PFNGLGETUNIFORMBLOCKINDEXPROC)(GLuint, const GLchar *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLGETUNIFORMINDICESPROC)(GLuint,
>+                                                               GLsizei,
>+                                                               const GLchar *const *,
>+                                                               GLuint *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLPRIMITIVERESTARTINDEXPROC)(GLuint);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLTEXBUFFERPROC)(GLenum, GLenum, GLuint);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLUNIFORMBLOCKBINDINGPROC)(GLuint, GLuint, GLuint);
> 
> // 3.2
>-typedef GLenum (INTERNAL_GL_APIENTRY *PFNGLCLIENTWAITSYNCPROC)(GLsync, GLbitfield, GLuint64);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLDELETESYNCPROC)(GLsync);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLDRAWELEMENTSBASEVERTEXPROC)(GLenum, GLsizei, GLenum, const GLvoid *, GLint);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLDRAWELEMENTSINSTANCEDBASEVERTEXPROC)(GLenum, GLsizei, GLenum, const GLvoid *, GLsizei, GLint);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLDRAWRANGEELEMENTSBASEVERTEXPROC)(GLenum, GLuint, GLuint, GLsizei, GLenum, const GLvoid *, GLint);
>-typedef GLsync (INTERNAL_GL_APIENTRY *PFNGLFENCESYNCPROC)(GLenum, GLbitfield);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLFRAMEBUFFERTEXTUREPROC)(GLenum, GLenum, GLuint, GLint);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLGETBUFFERPARAMETERI64VPROC)(GLenum, GLenum, GLint64 *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLGETINTEGER64I_VPROC)(GLenum, GLuint, GLint64 *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLGETINTEGER64VPROC)(GLenum, GLint64 *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLGETMULTISAMPLEFVPROC)(GLenum, GLuint, GLfloat *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLGETSYNCIVPROC)(GLsync, GLenum, GLsizei, GLsizei *, GLint *);
>-typedef GLboolean (INTERNAL_GL_APIENTRY *PFNGLISSYNCPROC)(GLsync);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLMULTIDRAWELEMENTSBASEVERTEXPROC)(GLenum, const GLsizei *, GLenum, const GLvoid *const*, GLsizei, const GLint *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLPROVOKINGVERTEXPROC)(GLenum);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLSAMPLEMASKIPROC)(GLuint, GLbitfield);
>+typedef GLenum(INTERNAL_GL_APIENTRY *PFNGLCLIENTWAITSYNCPROC)(GLsync, GLbitfield, GLuint64);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLDELETESYNCPROC)(GLsync);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLDRAWELEMENTSBASEVERTEXPROC)(GLenum,
>+                                                                    GLsizei,
>+                                                                    GLenum,
>+                                                                    const GLvoid *,
>+                                                                    GLint);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLDRAWELEMENTSINSTANCEDBASEVERTEXPROC)(GLenum,
>+                                                                             GLsizei,
>+                                                                             GLenum,
>+                                                                             const GLvoid *,
>+                                                                             GLsizei,
>+                                                                             GLint);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLDRAWRANGEELEMENTSBASEVERTEXPROC)(GLenum,
>+                                                                         GLuint,
>+                                                                         GLuint,
>+                                                                         GLsizei,
>+                                                                         GLenum,
>+                                                                         const GLvoid *,
>+                                                                         GLint);
>+typedef GLsync(INTERNAL_GL_APIENTRY *PFNGLFENCESYNCPROC)(GLenum, GLbitfield);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLFRAMEBUFFERTEXTUREPROC)(GLenum, GLenum, GLuint, GLint);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLGETBUFFERPARAMETERI64VPROC)(GLenum, GLenum, GLint64 *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLGETINTEGER64I_VPROC)(GLenum, GLuint, GLint64 *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLGETINTEGER64VPROC)(GLenum, GLint64 *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLGETMULTISAMPLEFVPROC)(GLenum, GLuint, GLfloat *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLGETSYNCIVPROC)(GLsync, GLenum, GLsizei, GLsizei *, GLint *);
>+typedef GLboolean(INTERNAL_GL_APIENTRY *PFNGLISSYNCPROC)(GLsync);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLMULTIDRAWELEMENTSBASEVERTEXPROC)(GLenum,
>+                                                                         const GLsizei *,
>+                                                                         GLenum,
>+                                                                         const GLvoid *const *,
>+                                                                         GLsizei,
>+                                                                         const GLint *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLPROVOKINGVERTEXPROC)(GLenum);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLSAMPLEMASKIPROC)(GLuint, GLbitfield);
> typedef void(INTERNAL_GL_APIENTRY *PFNGLTEXIMAGE2DMULTISAMPLEPROC)(GLenum,
>                                                                    GLsizei,
>                                                                    GLenum,
>@@ -410,362 +715,1003 @@ typedef void(INTERNAL_GL_APIENTRY *PFNGLTEXIMAGE3DMULTISAMPLEPROC)(GLenum,
>                                                                    GLsizei,
>                                                                    GLsizei,
>                                                                    GLboolean);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLWAITSYNCPROC)(GLsync, GLbitfield, GLuint64);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLWAITSYNCPROC)(GLsync, GLbitfield, GLuint64);
> 
> // 3.3
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLBINDFRAGDATALOCATIONINDEXEDPROC)(GLuint, GLuint, GLuint, const GLchar *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLBINDSAMPLERPROC)(GLuint, GLuint);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLDELETESAMPLERSPROC)(GLsizei, const GLuint *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLGENSAMPLERSPROC)(GLsizei, GLuint *);
>-typedef GLint (INTERNAL_GL_APIENTRY *PFNGLGETFRAGDATAINDEXPROC)(GLuint, const GLchar *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLGETQUERYOBJECTI64VPROC)(GLuint, GLenum, GLint64 *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLGETQUERYOBJECTUI64VPROC)(GLuint, GLenum, GLuint64 *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLGETSAMPLERPARAMETERIIVPROC)(GLuint, GLenum, GLint *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLGETSAMPLERPARAMETERIUIVPROC)(GLuint, GLenum, GLuint *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLGETSAMPLERPARAMETERFVPROC)(GLuint, GLenum, GLfloat *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLGETSAMPLERPARAMETERIVPROC)(GLuint, GLenum, GLint *);
>-typedef GLboolean (INTERNAL_GL_APIENTRY *PFNGLISSAMPLERPROC)(GLuint);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLQUERYCOUNTERPROC)(GLuint, GLenum);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLSAMPLERPARAMETERIIVPROC)(GLuint, GLenum, const GLint *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLSAMPLERPARAMETERIUIVPROC)(GLuint, GLenum, const GLuint *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLSAMPLERPARAMETERFPROC)(GLuint, GLenum, GLfloat);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLSAMPLERPARAMETERFVPROC)(GLuint, GLenum, const GLfloat *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLSAMPLERPARAMETERIPROC)(GLuint, GLenum, GLint);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLSAMPLERPARAMETERIVPROC)(GLuint, GLenum, const GLint *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLVERTEXATTRIBDIVISORPROC)(GLuint, GLuint);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLVERTEXATTRIBP1UIPROC)(GLuint, GLenum, GLboolean, GLuint);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLVERTEXATTRIBP1UIVPROC)(GLuint, GLenum, GLboolean, const GLuint *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLVERTEXATTRIBP2UIPROC)(GLuint, GLenum, GLboolean, GLuint);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLVERTEXATTRIBP2UIVPROC)(GLuint, GLenum, GLboolean, const GLuint *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLVERTEXATTRIBP3UIPROC)(GLuint, GLenum, GLboolean, GLuint);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLVERTEXATTRIBP3UIVPROC)(GLuint, GLenum, GLboolean, const GLuint *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLVERTEXATTRIBP4UIPROC)(GLuint, GLenum, GLboolean, GLuint);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLVERTEXATTRIBP4UIVPROC)(GLuint, GLenum, GLboolean, const GLuint *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLBINDFRAGDATALOCATIONINDEXEDPROC)(GLuint,
>+                                                                         GLuint,
>+                                                                         GLuint,
>+                                                                         const GLchar *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLBINDSAMPLERPROC)(GLuint, GLuint);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLDELETESAMPLERSPROC)(GLsizei, const GLuint *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLGENSAMPLERSPROC)(GLsizei, GLuint *);
>+typedef GLint(INTERNAL_GL_APIENTRY *PFNGLGETFRAGDATAINDEXPROC)(GLuint, const GLchar *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLGETQUERYOBJECTI64VPROC)(GLuint, GLenum, GLint64 *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLGETQUERYOBJECTUI64VPROC)(GLuint, GLenum, GLuint64 *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLGETSAMPLERPARAMETERIIVPROC)(GLuint, GLenum, GLint *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLGETSAMPLERPARAMETERIUIVPROC)(GLuint, GLenum, GLuint *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLGETSAMPLERPARAMETERFVPROC)(GLuint, GLenum, GLfloat *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLGETSAMPLERPARAMETERIVPROC)(GLuint, GLenum, GLint *);
>+typedef GLboolean(INTERNAL_GL_APIENTRY *PFNGLISSAMPLERPROC)(GLuint);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLQUERYCOUNTERPROC)(GLuint, GLenum);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLSAMPLERPARAMETERIIVPROC)(GLuint, GLenum, const GLint *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLSAMPLERPARAMETERIUIVPROC)(GLuint, GLenum, const GLuint *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLSAMPLERPARAMETERFPROC)(GLuint, GLenum, GLfloat);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLSAMPLERPARAMETERFVPROC)(GLuint, GLenum, const GLfloat *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLSAMPLERPARAMETERIPROC)(GLuint, GLenum, GLint);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLSAMPLERPARAMETERIVPROC)(GLuint, GLenum, const GLint *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLVERTEXATTRIBDIVISORPROC)(GLuint, GLuint);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLVERTEXATTRIBP1UIPROC)(GLuint, GLenum, GLboolean, GLuint);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLVERTEXATTRIBP1UIVPROC)(GLuint,
>+                                                               GLenum,
>+                                                               GLboolean,
>+                                                               const GLuint *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLVERTEXATTRIBP2UIPROC)(GLuint, GLenum, GLboolean, GLuint);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLVERTEXATTRIBP2UIVPROC)(GLuint,
>+                                                               GLenum,
>+                                                               GLboolean,
>+                                                               const GLuint *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLVERTEXATTRIBP3UIPROC)(GLuint, GLenum, GLboolean, GLuint);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLVERTEXATTRIBP3UIVPROC)(GLuint,
>+                                                               GLenum,
>+                                                               GLboolean,
>+                                                               const GLuint *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLVERTEXATTRIBP4UIPROC)(GLuint, GLenum, GLboolean, GLuint);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLVERTEXATTRIBP4UIVPROC)(GLuint,
>+                                                               GLenum,
>+                                                               GLboolean,
>+                                                               const GLuint *);
> 
> // 4.0
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLBEGINQUERYINDEXEDPROC)(GLenum, GLuint, GLuint);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLBINDTRANSFORMFEEDBACKPROC)(GLenum, GLuint);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLBLENDEQUATIONSEPARATEIPROC)(GLuint, GLenum, GLenum);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLBLENDEQUATIONIPROC)(GLuint, GLenum);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLBLENDFUNCSEPARATEIPROC)(GLuint, GLenum, GLenum, GLenum, GLenum);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLBLENDFUNCIPROC)(GLuint, GLenum, GLenum);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLDELETETRANSFORMFEEDBACKSPROC)(GLsizei, const GLuint *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLDRAWARRAYSINDIRECTPROC)(GLenum, const void *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLDRAWELEMENTSINDIRECTPROC)(GLenum, GLenum, const void *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLDRAWTRANSFORMFEEDBACKPROC)(GLenum, GLuint);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLDRAWTRANSFORMFEEDBACKSTREAMPROC)(GLenum, GLuint, GLuint);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLENDQUERYINDEXEDPROC)(GLenum, GLuint);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLGENTRANSFORMFEEDBACKSPROC)(GLsizei, GLuint *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLGETACTIVESUBROUTINENAMEPROC)(GLuint, GLenum, GLuint, GLsizei, GLsizei *, GLchar *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLGETACTIVESUBROUTINEUNIFORMNAMEPROC)(GLuint, GLenum, GLuint, GLsizei, GLsizei *, GLchar *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLGETACTIVESUBROUTINEUNIFORMIVPROC)(GLuint, GLenum, GLuint, GLenum, GLint *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLGETPROGRAMSTAGEIVPROC)(GLuint, GLenum, GLenum, GLint *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLGETQUERYINDEXEDIVPROC)(GLenum, GLuint, GLenum, GLint *);
>-typedef GLuint (INTERNAL_GL_APIENTRY *PFNGLGETSUBROUTINEINDEXPROC)(GLuint, GLenum, const GLchar *);
>-typedef GLint (INTERNAL_GL_APIENTRY *PFNGLGETSUBROUTINEUNIFORMLOCATIONPROC)(GLuint, GLenum, const GLchar *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLGETUNIFORMSUBROUTINEUIVPROC)(GLenum, GLint, GLuint *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLGETUNIFORMDVPROC)(GLuint, GLint, GLdouble *);
>-typedef GLboolean (INTERNAL_GL_APIENTRY *PFNGLISTRANSFORMFEEDBACKPROC)(GLuint);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLMINSAMPLESHADINGPROC)(GLfloat);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLPATCHPARAMETERFVPROC)(GLenum, const GLfloat *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLPATCHPARAMETERIPROC)(GLenum, GLint);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLPAUSETRANSFORMFEEDBACKPROC)();
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLRESUMETRANSFORMFEEDBACKPROC)();
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLUNIFORM1DPROC)(GLint, GLdouble);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLUNIFORM1DVPROC)(GLint, GLsizei, const GLdouble *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLUNIFORM2DPROC)(GLint, GLdouble, GLdouble);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLUNIFORM2DVPROC)(GLint, GLsizei, const GLdouble *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLUNIFORM3DPROC)(GLint, GLdouble, GLdouble, GLdouble);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLUNIFORM3DVPROC)(GLint, GLsizei, const GLdouble *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLUNIFORM4DPROC)(GLint, GLdouble, GLdouble, GLdouble, GLdouble);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLUNIFORM4DVPROC)(GLint, GLsizei, const GLdouble *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLUNIFORMMATRIX2DVPROC)(GLint, GLsizei, GLboolean, const GLdouble *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLUNIFORMMATRIX2X3DVPROC)(GLint, GLsizei, GLboolean, const GLdouble *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLUNIFORMMATRIX2X4DVPROC)(GLint, GLsizei, GLboolean, const GLdouble *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLUNIFORMMATRIX3DVPROC)(GLint, GLsizei, GLboolean, const GLdouble *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLUNIFORMMATRIX3X2DVPROC)(GLint, GLsizei, GLboolean, const GLdouble *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLUNIFORMMATRIX3X4DVPROC)(GLint, GLsizei, GLboolean, const GLdouble *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLUNIFORMMATRIX4DVPROC)(GLint, GLsizei, GLboolean, const GLdouble *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLUNIFORMMATRIX4X2DVPROC)(GLint, GLsizei, GLboolean, const GLdouble *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLUNIFORMMATRIX4X3DVPROC)(GLint, GLsizei, GLboolean, const GLdouble *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLUNIFORMSUBROUTINESUIVPROC)(GLenum, GLsizei, const GLuint *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLBEGINQUERYINDEXEDPROC)(GLenum, GLuint, GLuint);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLBINDTRANSFORMFEEDBACKPROC)(GLenum, GLuint);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLBLENDEQUATIONSEPARATEIPROC)(GLuint, GLenum, GLenum);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLBLENDEQUATIONIPROC)(GLuint, GLenum);
>+typedef void(
>+    INTERNAL_GL_APIENTRY *PFNGLBLENDFUNCSEPARATEIPROC)(GLuint, GLenum, GLenum, GLenum, GLenum);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLBLENDFUNCIPROC)(GLuint, GLenum, GLenum);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLDELETETRANSFORMFEEDBACKSPROC)(GLsizei, const GLuint *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLDRAWARRAYSINDIRECTPROC)(GLenum, const void *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLDRAWELEMENTSINDIRECTPROC)(GLenum, GLenum, const void *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLDRAWTRANSFORMFEEDBACKPROC)(GLenum, GLuint);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLDRAWTRANSFORMFEEDBACKSTREAMPROC)(GLenum, GLuint, GLuint);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLENDQUERYINDEXEDPROC)(GLenum, GLuint);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLGENTRANSFORMFEEDBACKSPROC)(GLsizei, GLuint *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLGETACTIVESUBROUTINENAMEPROC)(GLuint,
>+                                                                     GLenum,
>+                                                                     GLuint,
>+                                                                     GLsizei,
>+                                                                     GLsizei *,
>+                                                                     GLchar *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLGETACTIVESUBROUTINEUNIFORMNAMEPROC)(GLuint,
>+                                                                            GLenum,
>+                                                                            GLuint,
>+                                                                            GLsizei,
>+                                                                            GLsizei *,
>+                                                                            GLchar *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLGETACTIVESUBROUTINEUNIFORMIVPROC)(GLuint,
>+                                                                          GLenum,
>+                                                                          GLuint,
>+                                                                          GLenum,
>+                                                                          GLint *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLGETPROGRAMSTAGEIVPROC)(GLuint, GLenum, GLenum, GLint *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLGETQUERYINDEXEDIVPROC)(GLenum, GLuint, GLenum, GLint *);
>+typedef GLuint(INTERNAL_GL_APIENTRY *PFNGLGETSUBROUTINEINDEXPROC)(GLuint, GLenum, const GLchar *);
>+typedef GLint(INTERNAL_GL_APIENTRY *PFNGLGETSUBROUTINEUNIFORMLOCATIONPROC)(GLuint,
>+                                                                           GLenum,
>+                                                                           const GLchar *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLGETUNIFORMSUBROUTINEUIVPROC)(GLenum, GLint, GLuint *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLGETUNIFORMDVPROC)(GLuint, GLint, GLdouble *);
>+typedef GLboolean(INTERNAL_GL_APIENTRY *PFNGLISTRANSFORMFEEDBACKPROC)(GLuint);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLMINSAMPLESHADINGPROC)(GLfloat);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLPATCHPARAMETERFVPROC)(GLenum, const GLfloat *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLPATCHPARAMETERIPROC)(GLenum, GLint);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLPAUSETRANSFORMFEEDBACKPROC)();
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLRESUMETRANSFORMFEEDBACKPROC)();
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLUNIFORM1DPROC)(GLint, GLdouble);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLUNIFORM1DVPROC)(GLint, GLsizei, const GLdouble *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLUNIFORM2DPROC)(GLint, GLdouble, GLdouble);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLUNIFORM2DVPROC)(GLint, GLsizei, const GLdouble *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLUNIFORM3DPROC)(GLint, GLdouble, GLdouble, GLdouble);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLUNIFORM3DVPROC)(GLint, GLsizei, const GLdouble *);
>+typedef void(
>+    INTERNAL_GL_APIENTRY *PFNGLUNIFORM4DPROC)(GLint, GLdouble, GLdouble, GLdouble, GLdouble);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLUNIFORM4DVPROC)(GLint, GLsizei, const GLdouble *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLUNIFORMMATRIX2DVPROC)(GLint,
>+                                                              GLsizei,
>+                                                              GLboolean,
>+                                                              const GLdouble *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLUNIFORMMATRIX2X3DVPROC)(GLint,
>+                                                                GLsizei,
>+                                                                GLboolean,
>+                                                                const GLdouble *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLUNIFORMMATRIX2X4DVPROC)(GLint,
>+                                                                GLsizei,
>+                                                                GLboolean,
>+                                                                const GLdouble *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLUNIFORMMATRIX3DVPROC)(GLint,
>+                                                              GLsizei,
>+                                                              GLboolean,
>+                                                              const GLdouble *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLUNIFORMMATRIX3X2DVPROC)(GLint,
>+                                                                GLsizei,
>+                                                                GLboolean,
>+                                                                const GLdouble *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLUNIFORMMATRIX3X4DVPROC)(GLint,
>+                                                                GLsizei,
>+                                                                GLboolean,
>+                                                                const GLdouble *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLUNIFORMMATRIX4DVPROC)(GLint,
>+                                                              GLsizei,
>+                                                              GLboolean,
>+                                                              const GLdouble *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLUNIFORMMATRIX4X2DVPROC)(GLint,
>+                                                                GLsizei,
>+                                                                GLboolean,
>+                                                                const GLdouble *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLUNIFORMMATRIX4X3DVPROC)(GLint,
>+                                                                GLsizei,
>+                                                                GLboolean,
>+                                                                const GLdouble *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLUNIFORMSUBROUTINESUIVPROC)(GLenum, GLsizei, const GLuint *);
> 
> // 4.1
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLACTIVESHADERPROGRAMPROC)(GLuint, GLuint);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLBINDPROGRAMPIPELINEPROC)(GLuint);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLCLEARDEPTHFPROC)(GLfloat);
>-typedef GLuint (INTERNAL_GL_APIENTRY *PFNGLCREATESHADERPROGRAMVPROC)(GLenum, GLsizei, const GLchar *const*);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLDELETEPROGRAMPIPELINESPROC)(GLsizei, const GLuint *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLDEPTHRANGEARRAYVPROC)(GLuint, GLsizei, const GLdouble *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLDEPTHRANGEINDEXEDPROC)(GLuint, GLdouble, GLdouble);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLDEPTHRANGEFPROC)(GLfloat, GLfloat);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLGENPROGRAMPIPELINESPROC)(GLsizei, GLuint *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLGETDOUBLEI_VPROC)(GLenum, GLuint, GLdouble *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLGETFLOATI_VPROC)(GLenum, GLuint, GLfloat *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLGETPROGRAMBINARYPROC)(GLuint, GLsizei, GLsizei *, GLenum *, void *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLGETPROGRAMPIPELINEINFOLOGPROC)(GLuint, GLsizei, GLsizei *, GLchar *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLGETPROGRAMPIPELINEIVPROC)(GLuint, GLenum, GLint *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLGETSHADERPRECISIONFORMATPROC)(GLenum, GLenum, GLint *, GLint *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLGETVERTEXATTRIBLDVPROC)(GLuint, GLenum, GLdouble *);
>-typedef GLboolean (INTERNAL_GL_APIENTRY *PFNGLISPROGRAMPIPELINEPROC)(GLuint);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLPROGRAMBINARYPROC)(GLuint, GLenum, const void *, GLsizei);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLPROGRAMPARAMETERIPROC)(GLuint, GLenum, GLint);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLPROGRAMUNIFORM1DPROC)(GLuint, GLint, GLdouble);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLPROGRAMUNIFORM1DVPROC)(GLuint, GLint, GLsizei, const GLdouble *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLPROGRAMUNIFORM1FPROC)(GLuint, GLint, GLfloat);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLPROGRAMUNIFORM1FVPROC)(GLuint, GLint, GLsizei, const GLfloat *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLPROGRAMUNIFORM1IPROC)(GLuint, GLint, GLint);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLPROGRAMUNIFORM1IVPROC)(GLuint, GLint, GLsizei, const GLint *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLPROGRAMUNIFORM1UIPROC)(GLuint, GLint, GLuint);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLPROGRAMUNIFORM1UIVPROC)(GLuint, GLint, GLsizei, const GLuint *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLPROGRAMUNIFORM2DPROC)(GLuint, GLint, GLdouble, GLdouble);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLPROGRAMUNIFORM2DVPROC)(GLuint, GLint, GLsizei, const GLdouble *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLPROGRAMUNIFORM2FPROC)(GLuint, GLint, GLfloat, GLfloat);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLPROGRAMUNIFORM2FVPROC)(GLuint, GLint, GLsizei, const GLfloat *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLPROGRAMUNIFORM2IPROC)(GLuint, GLint, GLint, GLint);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLPROGRAMUNIFORM2IVPROC)(GLuint, GLint, GLsizei, const GLint *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLPROGRAMUNIFORM2UIPROC)(GLuint, GLint, GLuint, GLuint);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLPROGRAMUNIFORM2UIVPROC)(GLuint, GLint, GLsizei, const GLuint *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLPROGRAMUNIFORM3DPROC)(GLuint, GLint, GLdouble, GLdouble, GLdouble);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLPROGRAMUNIFORM3DVPROC)(GLuint, GLint, GLsizei, const GLdouble *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLPROGRAMUNIFORM3FPROC)(GLuint, GLint, GLfloat, GLfloat, GLfloat);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLPROGRAMUNIFORM3FVPROC)(GLuint, GLint, GLsizei, const GLfloat *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLPROGRAMUNIFORM3IPROC)(GLuint, GLint, GLint, GLint, GLint);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLPROGRAMUNIFORM3IVPROC)(GLuint, GLint, GLsizei, const GLint *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLPROGRAMUNIFORM3UIPROC)(GLuint, GLint, GLuint, GLuint, GLuint);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLPROGRAMUNIFORM3UIVPROC)(GLuint, GLint, GLsizei, const GLuint *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLPROGRAMUNIFORM4DPROC)(GLuint, GLint, GLdouble, GLdouble, GLdouble, GLdouble);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLPROGRAMUNIFORM4DVPROC)(GLuint, GLint, GLsizei, const GLdouble *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLPROGRAMUNIFORM4FPROC)(GLuint, GLint, GLfloat, GLfloat, GLfloat, GLfloat);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLPROGRAMUNIFORM4FVPROC)(GLuint, GLint, GLsizei, const GLfloat *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLPROGRAMUNIFORM4IPROC)(GLuint, GLint, GLint, GLint, GLint, GLint);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLPROGRAMUNIFORM4IVPROC)(GLuint, GLint, GLsizei, const GLint *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLPROGRAMUNIFORM4UIPROC)(GLuint, GLint, GLuint, GLuint, GLuint, GLuint);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLPROGRAMUNIFORM4UIVPROC)(GLuint, GLint, GLsizei, const GLuint *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLPROGRAMUNIFORMMATRIX2DVPROC)(GLuint, GLint, GLsizei, GLboolean, const GLdouble *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLPROGRAMUNIFORMMATRIX2FVPROC)(GLuint, GLint, GLsizei, GLboolean, const GLfloat *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLPROGRAMUNIFORMMATRIX2X3DVPROC)(GLuint, GLint, GLsizei, GLboolean, const GLdouble *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLPROGRAMUNIFORMMATRIX2X3FVPROC)(GLuint, GLint, GLsizei, GLboolean, const GLfloat *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLPROGRAMUNIFORMMATRIX2X4DVPROC)(GLuint, GLint, GLsizei, GLboolean, const GLdouble *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLPROGRAMUNIFORMMATRIX2X4FVPROC)(GLuint, GLint, GLsizei, GLboolean, const GLfloat *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLPROGRAMUNIFORMMATRIX3DVPROC)(GLuint, GLint, GLsizei, GLboolean, const GLdouble *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLPROGRAMUNIFORMMATRIX3FVPROC)(GLuint, GLint, GLsizei, GLboolean, const GLfloat *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLPROGRAMUNIFORMMATRIX3X2DVPROC)(GLuint, GLint, GLsizei, GLboolean, const GLdouble *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLPROGRAMUNIFORMMATRIX3X2FVPROC)(GLuint, GLint, GLsizei, GLboolean, const GLfloat *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLPROGRAMUNIFORMMATRIX3X4DVPROC)(GLuint, GLint, GLsizei, GLboolean, const GLdouble *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLPROGRAMUNIFORMMATRIX3X4FVPROC)(GLuint, GLint, GLsizei, GLboolean, const GLfloat *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLPROGRAMUNIFORMMATRIX4DVPROC)(GLuint, GLint, GLsizei, GLboolean, const GLdouble *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLPROGRAMUNIFORMMATRIX4FVPROC)(GLuint, GLint, GLsizei, GLboolean, const GLfloat *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLPROGRAMUNIFORMMATRIX4X2DVPROC)(GLuint, GLint, GLsizei, GLboolean, const GLdouble *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLPROGRAMUNIFORMMATRIX4X2FVPROC)(GLuint, GLint, GLsizei, GLboolean, const GLfloat *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLPROGRAMUNIFORMMATRIX4X3DVPROC)(GLuint, GLint, GLsizei, GLboolean, const GLdouble *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLPROGRAMUNIFORMMATRIX4X3FVPROC)(GLuint, GLint, GLsizei, GLboolean, const GLfloat *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLRELEASESHADERCOMPILERPROC)();
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLSCISSORARRAYVPROC)(GLuint, GLsizei, const GLint *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLSCISSORINDEXEDPROC)(GLuint, GLint, GLint, GLsizei, GLsizei);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLSCISSORINDEXEDVPROC)(GLuint, const GLint *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLSHADERBINARYPROC)(GLsizei, const GLuint *, GLenum, const void *, GLsizei);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLUSEPROGRAMSTAGESPROC)(GLuint, GLbitfield, GLuint);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLVALIDATEPROGRAMPIPELINEPROC)(GLuint);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLVERTEXATTRIBL1DPROC)(GLuint, GLdouble);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLVERTEXATTRIBL1DVPROC)(GLuint, const GLdouble *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLVERTEXATTRIBL2DPROC)(GLuint, GLdouble, GLdouble);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLVERTEXATTRIBL2DVPROC)(GLuint, const GLdouble *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLVERTEXATTRIBL3DPROC)(GLuint, GLdouble, GLdouble, GLdouble);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLVERTEXATTRIBL3DVPROC)(GLuint, const GLdouble *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLVERTEXATTRIBL4DPROC)(GLuint, GLdouble, GLdouble, GLdouble, GLdouble);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLVERTEXATTRIBL4DVPROC)(GLuint, const GLdouble *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLVERTEXATTRIBLPOINTERPROC)(GLuint, GLint, GLenum, GLsizei, const void *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLVIEWPORTARRAYVPROC)(GLuint, GLsizei, const GLfloat *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLVIEWPORTINDEXEDFPROC)(GLuint, GLfloat, GLfloat, GLfloat, GLfloat);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLVIEWPORTINDEXEDFVPROC)(GLuint, const GLfloat *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLACTIVESHADERPROGRAMPROC)(GLuint, GLuint);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLBINDPROGRAMPIPELINEPROC)(GLuint);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLCLEARDEPTHFPROC)(GLfloat);
>+typedef GLuint(INTERNAL_GL_APIENTRY *PFNGLCREATESHADERPROGRAMVPROC)(GLenum,
>+                                                                    GLsizei,
>+                                                                    const GLchar *const *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLDELETEPROGRAMPIPELINESPROC)(GLsizei, const GLuint *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLDEPTHRANGEARRAYVPROC)(GLuint, GLsizei, const GLdouble *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLDEPTHRANGEINDEXEDPROC)(GLuint, GLdouble, GLdouble);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLDEPTHRANGEFPROC)(GLfloat, GLfloat);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLGENPROGRAMPIPELINESPROC)(GLsizei, GLuint *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLGETDOUBLEI_VPROC)(GLenum, GLuint, GLdouble *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLGETFLOATI_VPROC)(GLenum, GLuint, GLfloat *);
>+typedef void(
>+    INTERNAL_GL_APIENTRY *PFNGLGETPROGRAMBINARYPROC)(GLuint, GLsizei, GLsizei *, GLenum *, void *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLGETPROGRAMPIPELINEINFOLOGPROC)(GLuint,
>+                                                                       GLsizei,
>+                                                                       GLsizei *,
>+                                                                       GLchar *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLGETPROGRAMPIPELINEIVPROC)(GLuint, GLenum, GLint *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLGETSHADERPRECISIONFORMATPROC)(GLenum,
>+                                                                      GLenum,
>+                                                                      GLint *,
>+                                                                      GLint *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLGETVERTEXATTRIBLDVPROC)(GLuint, GLenum, GLdouble *);
>+typedef GLboolean(INTERNAL_GL_APIENTRY *PFNGLISPROGRAMPIPELINEPROC)(GLuint);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLPROGRAMBINARYPROC)(GLuint, GLenum, const void *, GLsizei);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLPROGRAMPARAMETERIPROC)(GLuint, GLenum, GLint);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLPROGRAMUNIFORM1DPROC)(GLuint, GLint, GLdouble);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLPROGRAMUNIFORM1DVPROC)(GLuint,
>+                                                               GLint,
>+                                                               GLsizei,
>+                                                               const GLdouble *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLPROGRAMUNIFORM1FPROC)(GLuint, GLint, GLfloat);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLPROGRAMUNIFORM1FVPROC)(GLuint,
>+                                                               GLint,
>+                                                               GLsizei,
>+                                                               const GLfloat *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLPROGRAMUNIFORM1IPROC)(GLuint, GLint, GLint);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLPROGRAMUNIFORM1IVPROC)(GLuint,
>+                                                               GLint,
>+                                                               GLsizei,
>+                                                               const GLint *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLPROGRAMUNIFORM1UIPROC)(GLuint, GLint, GLuint);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLPROGRAMUNIFORM1UIVPROC)(GLuint,
>+                                                                GLint,
>+                                                                GLsizei,
>+                                                                const GLuint *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLPROGRAMUNIFORM2DPROC)(GLuint, GLint, GLdouble, GLdouble);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLPROGRAMUNIFORM2DVPROC)(GLuint,
>+                                                               GLint,
>+                                                               GLsizei,
>+                                                               const GLdouble *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLPROGRAMUNIFORM2FPROC)(GLuint, GLint, GLfloat, GLfloat);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLPROGRAMUNIFORM2FVPROC)(GLuint,
>+                                                               GLint,
>+                                                               GLsizei,
>+                                                               const GLfloat *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLPROGRAMUNIFORM2IPROC)(GLuint, GLint, GLint, GLint);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLPROGRAMUNIFORM2IVPROC)(GLuint,
>+                                                               GLint,
>+                                                               GLsizei,
>+                                                               const GLint *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLPROGRAMUNIFORM2UIPROC)(GLuint, GLint, GLuint, GLuint);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLPROGRAMUNIFORM2UIVPROC)(GLuint,
>+                                                                GLint,
>+                                                                GLsizei,
>+                                                                const GLuint *);
>+typedef void(
>+    INTERNAL_GL_APIENTRY *PFNGLPROGRAMUNIFORM3DPROC)(GLuint, GLint, GLdouble, GLdouble, GLdouble);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLPROGRAMUNIFORM3DVPROC)(GLuint,
>+                                                               GLint,
>+                                                               GLsizei,
>+                                                               const GLdouble *);
>+typedef void(
>+    INTERNAL_GL_APIENTRY *PFNGLPROGRAMUNIFORM3FPROC)(GLuint, GLint, GLfloat, GLfloat, GLfloat);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLPROGRAMUNIFORM3FVPROC)(GLuint,
>+                                                               GLint,
>+                                                               GLsizei,
>+                                                               const GLfloat *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLPROGRAMUNIFORM3IPROC)(GLuint, GLint, GLint, GLint, GLint);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLPROGRAMUNIFORM3IVPROC)(GLuint,
>+                                                               GLint,
>+                                                               GLsizei,
>+                                                               const GLint *);
>+typedef void(
>+    INTERNAL_GL_APIENTRY *PFNGLPROGRAMUNIFORM3UIPROC)(GLuint, GLint, GLuint, GLuint, GLuint);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLPROGRAMUNIFORM3UIVPROC)(GLuint,
>+                                                                GLint,
>+                                                                GLsizei,
>+                                                                const GLuint *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLPROGRAMUNIFORM4DPROC)(GLuint,
>+                                                              GLint,
>+                                                              GLdouble,
>+                                                              GLdouble,
>+                                                              GLdouble,
>+                                                              GLdouble);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLPROGRAMUNIFORM4DVPROC)(GLuint,
>+                                                               GLint,
>+                                                               GLsizei,
>+                                                               const GLdouble *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLPROGRAMUNIFORM4FPROC)(GLuint,
>+                                                              GLint,
>+                                                              GLfloat,
>+                                                              GLfloat,
>+                                                              GLfloat,
>+                                                              GLfloat);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLPROGRAMUNIFORM4FVPROC)(GLuint,
>+                                                               GLint,
>+                                                               GLsizei,
>+                                                               const GLfloat *);
>+typedef void(
>+    INTERNAL_GL_APIENTRY *PFNGLPROGRAMUNIFORM4IPROC)(GLuint, GLint, GLint, GLint, GLint, GLint);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLPROGRAMUNIFORM4IVPROC)(GLuint,
>+                                                               GLint,
>+                                                               GLsizei,
>+                                                               const GLint *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLPROGRAMUNIFORM4UIPROC)(GLuint,
>+                                                               GLint,
>+                                                               GLuint,
>+                                                               GLuint,
>+                                                               GLuint,
>+                                                               GLuint);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLPROGRAMUNIFORM4UIVPROC)(GLuint,
>+                                                                GLint,
>+                                                                GLsizei,
>+                                                                const GLuint *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLPROGRAMUNIFORMMATRIX2DVPROC)(GLuint,
>+                                                                     GLint,
>+                                                                     GLsizei,
>+                                                                     GLboolean,
>+                                                                     const GLdouble *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLPROGRAMUNIFORMMATRIX2FVPROC)(GLuint,
>+                                                                     GLint,
>+                                                                     GLsizei,
>+                                                                     GLboolean,
>+                                                                     const GLfloat *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLPROGRAMUNIFORMMATRIX2X3DVPROC)(GLuint,
>+                                                                       GLint,
>+                                                                       GLsizei,
>+                                                                       GLboolean,
>+                                                                       const GLdouble *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLPROGRAMUNIFORMMATRIX2X3FVPROC)(GLuint,
>+                                                                       GLint,
>+                                                                       GLsizei,
>+                                                                       GLboolean,
>+                                                                       const GLfloat *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLPROGRAMUNIFORMMATRIX2X4DVPROC)(GLuint,
>+                                                                       GLint,
>+                                                                       GLsizei,
>+                                                                       GLboolean,
>+                                                                       const GLdouble *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLPROGRAMUNIFORMMATRIX2X4FVPROC)(GLuint,
>+                                                                       GLint,
>+                                                                       GLsizei,
>+                                                                       GLboolean,
>+                                                                       const GLfloat *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLPROGRAMUNIFORMMATRIX3DVPROC)(GLuint,
>+                                                                     GLint,
>+                                                                     GLsizei,
>+                                                                     GLboolean,
>+                                                                     const GLdouble *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLPROGRAMUNIFORMMATRIX3FVPROC)(GLuint,
>+                                                                     GLint,
>+                                                                     GLsizei,
>+                                                                     GLboolean,
>+                                                                     const GLfloat *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLPROGRAMUNIFORMMATRIX3X2DVPROC)(GLuint,
>+                                                                       GLint,
>+                                                                       GLsizei,
>+                                                                       GLboolean,
>+                                                                       const GLdouble *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLPROGRAMUNIFORMMATRIX3X2FVPROC)(GLuint,
>+                                                                       GLint,
>+                                                                       GLsizei,
>+                                                                       GLboolean,
>+                                                                       const GLfloat *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLPROGRAMUNIFORMMATRIX3X4DVPROC)(GLuint,
>+                                                                       GLint,
>+                                                                       GLsizei,
>+                                                                       GLboolean,
>+                                                                       const GLdouble *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLPROGRAMUNIFORMMATRIX3X4FVPROC)(GLuint,
>+                                                                       GLint,
>+                                                                       GLsizei,
>+                                                                       GLboolean,
>+                                                                       const GLfloat *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLPROGRAMUNIFORMMATRIX4DVPROC)(GLuint,
>+                                                                     GLint,
>+                                                                     GLsizei,
>+                                                                     GLboolean,
>+                                                                     const GLdouble *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLPROGRAMUNIFORMMATRIX4FVPROC)(GLuint,
>+                                                                     GLint,
>+                                                                     GLsizei,
>+                                                                     GLboolean,
>+                                                                     const GLfloat *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLPROGRAMUNIFORMMATRIX4X2DVPROC)(GLuint,
>+                                                                       GLint,
>+                                                                       GLsizei,
>+                                                                       GLboolean,
>+                                                                       const GLdouble *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLPROGRAMUNIFORMMATRIX4X2FVPROC)(GLuint,
>+                                                                       GLint,
>+                                                                       GLsizei,
>+                                                                       GLboolean,
>+                                                                       const GLfloat *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLPROGRAMUNIFORMMATRIX4X3DVPROC)(GLuint,
>+                                                                       GLint,
>+                                                                       GLsizei,
>+                                                                       GLboolean,
>+                                                                       const GLdouble *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLPROGRAMUNIFORMMATRIX4X3FVPROC)(GLuint,
>+                                                                       GLint,
>+                                                                       GLsizei,
>+                                                                       GLboolean,
>+                                                                       const GLfloat *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLRELEASESHADERCOMPILERPROC)();
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLSCISSORARRAYVPROC)(GLuint, GLsizei, const GLint *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLSCISSORINDEXEDPROC)(GLuint, GLint, GLint, GLsizei, GLsizei);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLSCISSORINDEXEDVPROC)(GLuint, const GLint *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLSHADERBINARYPROC)(GLsizei,
>+                                                          const GLuint *,
>+                                                          GLenum,
>+                                                          const void *,
>+                                                          GLsizei);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLUSEPROGRAMSTAGESPROC)(GLuint, GLbitfield, GLuint);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLVALIDATEPROGRAMPIPELINEPROC)(GLuint);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLVERTEXATTRIBL1DPROC)(GLuint, GLdouble);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLVERTEXATTRIBL1DVPROC)(GLuint, const GLdouble *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLVERTEXATTRIBL2DPROC)(GLuint, GLdouble, GLdouble);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLVERTEXATTRIBL2DVPROC)(GLuint, const GLdouble *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLVERTEXATTRIBL3DPROC)(GLuint, GLdouble, GLdouble, GLdouble);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLVERTEXATTRIBL3DVPROC)(GLuint, const GLdouble *);
>+typedef void(
>+    INTERNAL_GL_APIENTRY *PFNGLVERTEXATTRIBL4DPROC)(GLuint, GLdouble, GLdouble, GLdouble, GLdouble);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLVERTEXATTRIBL4DVPROC)(GLuint, const GLdouble *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLVERTEXATTRIBLPOINTERPROC)(GLuint,
>+                                                                  GLint,
>+                                                                  GLenum,
>+                                                                  GLsizei,
>+                                                                  const void *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLVIEWPORTARRAYVPROC)(GLuint, GLsizei, const GLfloat *);
>+typedef void(
>+    INTERNAL_GL_APIENTRY *PFNGLVIEWPORTINDEXEDFPROC)(GLuint, GLfloat, GLfloat, GLfloat, GLfloat);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLVIEWPORTINDEXEDFVPROC)(GLuint, const GLfloat *);
> 
> // 4.2
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLBINDIMAGETEXTUREPROC)(GLuint, GLuint, GLint, GLboolean, GLint, GLenum, GLenum);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLDRAWARRAYSINSTANCEDBASEINSTANCEPROC)(GLenum, GLint, GLsizei, GLsizei, GLuint);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLDRAWELEMENTSINSTANCEDBASEINSTANCEPROC)(GLenum, GLsizei, GLenum, const void *, GLsizei, GLuint);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLDRAWELEMENTSINSTANCEDBASEVERTEXBASEINSTANCEPROC)(GLenum, GLsizei, GLenum, const void *, GLsizei, GLint, GLuint);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLDRAWTRANSFORMFEEDBACKINSTANCEDPROC)(GLenum, GLuint, GLsizei);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLDRAWTRANSFORMFEEDBACKSTREAMINSTANCEDPROC)(GLenum, GLuint, GLuint, GLsizei);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLGETACTIVEATOMICCOUNTERBUFFERIVPROC)(GLuint, GLuint, GLenum, GLint *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLGETINTERNALFORMATIVPROC)(GLenum, GLenum, GLenum, GLsizei, GLint *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLMEMORYBARRIERPROC)(GLbitfield);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLTEXSTORAGE1DPROC)(GLenum, GLsizei, GLenum, GLsizei);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLTEXSTORAGE2DPROC)(GLenum, GLsizei, GLenum, GLsizei, GLsizei);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLTEXSTORAGE3DPROC)(GLenum, GLsizei, GLenum, GLsizei, GLsizei, GLsizei);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLBINDIMAGETEXTUREPROC)(GLuint,
>+                                                              GLuint,
>+                                                              GLint,
>+                                                              GLboolean,
>+                                                              GLint,
>+                                                              GLenum,
>+                                                              GLenum);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLDRAWARRAYSINSTANCEDBASEINSTANCEPROC)(GLenum,
>+                                                                             GLint,
>+                                                                             GLsizei,
>+                                                                             GLsizei,
>+                                                                             GLuint);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLDRAWELEMENTSINSTANCEDBASEINSTANCEPROC)(GLenum,
>+                                                                               GLsizei,
>+                                                                               GLenum,
>+                                                                               const void *,
>+                                                                               GLsizei,
>+                                                                               GLuint);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLDRAWELEMENTSINSTANCEDBASEVERTEXBASEINSTANCEPROC)(
>+    GLenum,
>+    GLsizei,
>+    GLenum,
>+    const void *,
>+    GLsizei,
>+    GLint,
>+    GLuint);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLDRAWTRANSFORMFEEDBACKINSTANCEDPROC)(GLenum,
>+                                                                            GLuint,
>+                                                                            GLsizei);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLDRAWTRANSFORMFEEDBACKSTREAMINSTANCEDPROC)(GLenum,
>+                                                                                  GLuint,
>+                                                                                  GLuint,
>+                                                                                  GLsizei);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLGETACTIVEATOMICCOUNTERBUFFERIVPROC)(GLuint,
>+                                                                            GLuint,
>+                                                                            GLenum,
>+                                                                            GLint *);
>+typedef void(
>+    INTERNAL_GL_APIENTRY *PFNGLGETINTERNALFORMATIVPROC)(GLenum, GLenum, GLenum, GLsizei, GLint *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLMEMORYBARRIERPROC)(GLbitfield);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLTEXSTORAGE1DPROC)(GLenum, GLsizei, GLenum, GLsizei);
>+typedef void(
>+    INTERNAL_GL_APIENTRY *PFNGLTEXSTORAGE2DPROC)(GLenum, GLsizei, GLenum, GLsizei, GLsizei);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLTEXSTORAGE3DPROC)(GLenum,
>+                                                          GLsizei,
>+                                                          GLenum,
>+                                                          GLsizei,
>+                                                          GLsizei,
>+                                                          GLsizei);
> 
> // 4.3
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLBINDVERTEXBUFFERPROC)(GLuint, GLuint, GLintptr, GLsizei);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLCLEARBUFFERDATAPROC)(GLenum, GLenum, GLenum, GLenum, const void *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLCLEARBUFFERSUBDATAPROC)(GLenum, GLenum, GLintptr, GLsizeiptr, GLenum, GLenum, const void *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLCOPYIMAGESUBDATAPROC)(GLuint, GLenum, GLint, GLint, GLint, GLint, GLuint, GLenum, GLint, GLint, GLint, GLint, GLsizei, GLsizei, GLsizei);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLDEBUGMESSAGECALLBACKPROC)(GLDEBUGPROC, const void *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLDEBUGMESSAGECONTROLPROC)(GLenum, GLenum, GLenum, GLsizei, const GLuint *, GLboolean);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLDEBUGMESSAGEINSERTPROC)(GLenum, GLenum, GLuint, GLenum, GLsizei, const GLchar *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLDISPATCHCOMPUTEPROC)(GLuint, GLuint, GLuint);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLDISPATCHCOMPUTEINDIRECTPROC)(GLintptr);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLFRAMEBUFFERPARAMETERIPROC)(GLenum, GLenum, GLint);
>-typedef GLuint (INTERNAL_GL_APIENTRY *PFNGLGETDEBUGMESSAGELOGPROC)(GLuint, GLsizei, GLenum *, GLenum *, GLuint *, GLenum *, GLsizei *, GLchar *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLGETFRAMEBUFFERPARAMETERIVPROC)(GLenum, GLenum, GLint *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLGETINTERNALFORMATI64VPROC)(GLenum, GLenum, GLenum, GLsizei, GLint64 *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLGETPOINTERVPROC)(GLenum, void **);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLGETOBJECTLABELPROC)(GLenum, GLuint, GLsizei, GLsizei *, GLchar *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLGETOBJECTPTRLABELPROC)(const void *, GLsizei, GLsizei *, GLchar *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLGETPROGRAMINTERFACEIVPROC)(GLuint, GLenum, GLenum, GLint *);
>-typedef GLuint (INTERNAL_GL_APIENTRY *PFNGLGETPROGRAMRESOURCEINDEXPROC)(GLuint, GLenum, const GLchar *);
>-typedef GLint (INTERNAL_GL_APIENTRY *PFNGLGETPROGRAMRESOURCELOCATIONPROC)(GLuint, GLenum, const GLchar *);
>-typedef GLint (INTERNAL_GL_APIENTRY *PFNGLGETPROGRAMRESOURCELOCATIONINDEXPROC)(GLuint, GLenum, const GLchar *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLGETPROGRAMRESOURCENAMEPROC)(GLuint, GLenum, GLuint, GLsizei, GLsizei *, GLchar *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLGETPROGRAMRESOURCEIVPROC)(GLuint, GLenum, GLuint, GLsizei, const GLenum *, GLsizei, GLsizei *, GLint *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLINVALIDATEBUFFERDATAPROC)(GLuint);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLINVALIDATEBUFFERSUBDATAPROC)(GLuint, GLintptr, GLsizeiptr);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLINVALIDATEFRAMEBUFFERPROC)(GLenum, GLsizei, const GLenum *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLINVALIDATESUBFRAMEBUFFERPROC)(GLenum, GLsizei, const GLenum *, GLint, GLint, GLsizei, GLsizei);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLINVALIDATETEXIMAGEPROC)(GLuint, GLint);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLINVALIDATETEXSUBIMAGEPROC)(GLuint, GLint, GLint, GLint, GLint, GLsizei, GLsizei, GLsizei);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLMULTIDRAWARRAYSINDIRECTPROC)(GLenum, const void *, GLsizei, GLsizei);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLMULTIDRAWELEMENTSINDIRECTPROC)(GLenum, GLenum, const void *, GLsizei, GLsizei);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLOBJECTLABELPROC)(GLenum, GLuint, GLsizei, const GLchar *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLOBJECTPTRLABELPROC)(const void *, GLsizei, const GLchar *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLPOPDEBUGGROUPPROC)();
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLPUSHDEBUGGROUPPROC)(GLenum, GLuint, GLsizei, const GLchar *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLSHADERSTORAGEBLOCKBINDINGPROC)(GLuint, GLuint, GLuint);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLTEXBUFFERRANGEPROC)(GLenum, GLenum, GLuint, GLintptr, GLsizeiptr);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLTEXSTORAGE2DMULTISAMPLEPROC)(GLenum, GLsizei, GLenum, GLsizei, GLsizei, GLboolean);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLTEXSTORAGE3DMULTISAMPLEPROC)(GLenum, GLsizei, GLenum, GLsizei, GLsizei, GLsizei, GLboolean);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLTEXTUREVIEWPROC)(GLuint, GLenum, GLuint, GLenum, GLuint, GLuint, GLuint, GLuint);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLVERTEXATTRIBBINDINGPROC)(GLuint, GLuint);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLVERTEXATTRIBFORMATPROC)(GLuint, GLint, GLenum, GLboolean, GLuint);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLVERTEXATTRIBIFORMATPROC)(GLuint, GLint, GLenum, GLuint);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLVERTEXATTRIBLFORMATPROC)(GLuint, GLint, GLenum, GLuint);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLVERTEXBINDINGDIVISORPROC)(GLuint, GLuint);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLBINDVERTEXBUFFERPROC)(GLuint, GLuint, GLintptr, GLsizei);
>+typedef void(
>+    INTERNAL_GL_APIENTRY *PFNGLCLEARBUFFERDATAPROC)(GLenum, GLenum, GLenum, GLenum, const void *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLCLEARBUFFERSUBDATAPROC)(GLenum,
>+                                                                GLenum,
>+                                                                GLintptr,
>+                                                                GLsizeiptr,
>+                                                                GLenum,
>+                                                                GLenum,
>+                                                                const void *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLCOPYIMAGESUBDATAPROC)(GLuint,
>+                                                              GLenum,
>+                                                              GLint,
>+                                                              GLint,
>+                                                              GLint,
>+                                                              GLint,
>+                                                              GLuint,
>+                                                              GLenum,
>+                                                              GLint,
>+                                                              GLint,
>+                                                              GLint,
>+                                                              GLint,
>+                                                              GLsizei,
>+                                                              GLsizei,
>+                                                              GLsizei);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLDEBUGMESSAGECALLBACKPROC)(GLDEBUGPROC, const void *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLDEBUGMESSAGECONTROLPROC)(GLenum,
>+                                                                 GLenum,
>+                                                                 GLenum,
>+                                                                 GLsizei,
>+                                                                 const GLuint *,
>+                                                                 GLboolean);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLDEBUGMESSAGEINSERTPROC)(GLenum,
>+                                                                GLenum,
>+                                                                GLuint,
>+                                                                GLenum,
>+                                                                GLsizei,
>+                                                                const GLchar *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLDISPATCHCOMPUTEPROC)(GLuint, GLuint, GLuint);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLDISPATCHCOMPUTEINDIRECTPROC)(GLintptr);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLFRAMEBUFFERPARAMETERIPROC)(GLenum, GLenum, GLint);
>+typedef GLuint(INTERNAL_GL_APIENTRY *PFNGLGETDEBUGMESSAGELOGPROC)(GLuint,
>+                                                                  GLsizei,
>+                                                                  GLenum *,
>+                                                                  GLenum *,
>+                                                                  GLuint *,
>+                                                                  GLenum *,
>+                                                                  GLsizei *,
>+                                                                  GLchar *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLGETFRAMEBUFFERPARAMETERIVPROC)(GLenum, GLenum, GLint *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLGETINTERNALFORMATI64VPROC)(GLenum,
>+                                                                   GLenum,
>+                                                                   GLenum,
>+                                                                   GLsizei,
>+                                                                   GLint64 *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLGETPOINTERVPROC)(GLenum, void **);
>+typedef void(
>+    INTERNAL_GL_APIENTRY *PFNGLGETOBJECTLABELPROC)(GLenum, GLuint, GLsizei, GLsizei *, GLchar *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLGETOBJECTPTRLABELPROC)(const void *,
>+                                                               GLsizei,
>+                                                               GLsizei *,
>+                                                               GLchar *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLGETPROGRAMINTERFACEIVPROC)(GLuint, GLenum, GLenum, GLint *);
>+typedef GLuint(INTERNAL_GL_APIENTRY *PFNGLGETPROGRAMRESOURCEINDEXPROC)(GLuint,
>+                                                                       GLenum,
>+                                                                       const GLchar *);
>+typedef GLint(INTERNAL_GL_APIENTRY *PFNGLGETPROGRAMRESOURCELOCATIONPROC)(GLuint,
>+                                                                         GLenum,
>+                                                                         const GLchar *);
>+typedef GLint(INTERNAL_GL_APIENTRY *PFNGLGETPROGRAMRESOURCELOCATIONINDEXPROC)(GLuint,
>+                                                                              GLenum,
>+                                                                              const GLchar *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLGETPROGRAMRESOURCENAMEPROC)(GLuint,
>+                                                                    GLenum,
>+                                                                    GLuint,
>+                                                                    GLsizei,
>+                                                                    GLsizei *,
>+                                                                    GLchar *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLGETPROGRAMRESOURCEIVPROC)(GLuint,
>+                                                                  GLenum,
>+                                                                  GLuint,
>+                                                                  GLsizei,
>+                                                                  const GLenum *,
>+                                                                  GLsizei,
>+                                                                  GLsizei *,
>+                                                                  GLint *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLINVALIDATEBUFFERDATAPROC)(GLuint);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLINVALIDATEBUFFERSUBDATAPROC)(GLuint, GLintptr, GLsizeiptr);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLINVALIDATEFRAMEBUFFERPROC)(GLenum, GLsizei, const GLenum *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLINVALIDATESUBFRAMEBUFFERPROC)(GLenum,
>+                                                                      GLsizei,
>+                                                                      const GLenum *,
>+                                                                      GLint,
>+                                                                      GLint,
>+                                                                      GLsizei,
>+                                                                      GLsizei);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLINVALIDATETEXIMAGEPROC)(GLuint, GLint);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLINVALIDATETEXSUBIMAGEPROC)(GLuint,
>+                                                                   GLint,
>+                                                                   GLint,
>+                                                                   GLint,
>+                                                                   GLint,
>+                                                                   GLsizei,
>+                                                                   GLsizei,
>+                                                                   GLsizei);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLMULTIDRAWARRAYSINDIRECTPROC)(GLenum,
>+                                                                     const void *,
>+                                                                     GLsizei,
>+                                                                     GLsizei);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLMULTIDRAWELEMENTSINDIRECTPROC)(GLenum,
>+                                                                       GLenum,
>+                                                                       const void *,
>+                                                                       GLsizei,
>+                                                                       GLsizei);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLOBJECTLABELPROC)(GLenum, GLuint, GLsizei, const GLchar *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLOBJECTPTRLABELPROC)(const void *, GLsizei, const GLchar *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLPOPDEBUGGROUPPROC)();
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLPUSHDEBUGGROUPPROC)(GLenum,
>+                                                            GLuint,
>+                                                            GLsizei,
>+                                                            const GLchar *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLSHADERSTORAGEBLOCKBINDINGPROC)(GLuint, GLuint, GLuint);
>+typedef void(
>+    INTERNAL_GL_APIENTRY *PFNGLTEXBUFFERRANGEPROC)(GLenum, GLenum, GLuint, GLintptr, GLsizeiptr);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLTEXSTORAGE2DMULTISAMPLEPROC)(GLenum,
>+                                                                     GLsizei,
>+                                                                     GLenum,
>+                                                                     GLsizei,
>+                                                                     GLsizei,
>+                                                                     GLboolean);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLTEXSTORAGE3DMULTISAMPLEPROC)(GLenum,
>+                                                                     GLsizei,
>+                                                                     GLenum,
>+                                                                     GLsizei,
>+                                                                     GLsizei,
>+                                                                     GLsizei,
>+                                                                     GLboolean);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLTEXTUREVIEWPROC)(GLuint,
>+                                                         GLenum,
>+                                                         GLuint,
>+                                                         GLenum,
>+                                                         GLuint,
>+                                                         GLuint,
>+                                                         GLuint,
>+                                                         GLuint);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLVERTEXATTRIBBINDINGPROC)(GLuint, GLuint);
>+typedef void(
>+    INTERNAL_GL_APIENTRY *PFNGLVERTEXATTRIBFORMATPROC)(GLuint, GLint, GLenum, GLboolean, GLuint);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLVERTEXATTRIBIFORMATPROC)(GLuint, GLint, GLenum, GLuint);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLVERTEXATTRIBLFORMATPROC)(GLuint, GLint, GLenum, GLuint);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLVERTEXBINDINGDIVISORPROC)(GLuint, GLuint);
> 
> // NV_framebuffer_mixed_samples
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLCOVERAGEMODULATIONNVPROC)(GLenum);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLCOVERAGEMODULATIONNVPROC)(GLenum);
> 
> // 4.4
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLBINDBUFFERSBASEPROC)(GLenum, GLuint, GLsizei, const GLuint *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLBINDBUFFERSRANGEPROC)(GLenum, GLuint, GLsizei, const GLuint *, const GLintptr *, const GLsizeiptr *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLBINDIMAGETEXTURESPROC)(GLuint, GLsizei, const GLuint *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLBINDSAMPLERSPROC)(GLuint, GLsizei, const GLuint *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLBINDTEXTURESPROC)(GLuint, GLsizei, const GLuint *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLBINDVERTEXBUFFERSPROC)(GLuint, GLsizei, const GLuint *, const GLintptr *, const GLsizei *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLBUFFERSTORAGEPROC)(GLenum, GLsizeiptr, const void *, GLbitfield);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLCLEARTEXIMAGEPROC)(GLuint, GLint, GLenum, GLenum, const void *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLCLEARTEXSUBIMAGEPROC)(GLuint, GLint, GLint, GLint, GLint, GLsizei, GLsizei, GLsizei, GLenum, GLenum, const void *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLBINDBUFFERSBASEPROC)(GLenum,
>+                                                             GLuint,
>+                                                             GLsizei,
>+                                                             const GLuint *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLBINDBUFFERSRANGEPROC)(GLenum,
>+                                                              GLuint,
>+                                                              GLsizei,
>+                                                              const GLuint *,
>+                                                              const GLintptr *,
>+                                                              const GLsizeiptr *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLBINDIMAGETEXTURESPROC)(GLuint, GLsizei, const GLuint *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLBINDSAMPLERSPROC)(GLuint, GLsizei, const GLuint *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLBINDTEXTURESPROC)(GLuint, GLsizei, const GLuint *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLBINDVERTEXBUFFERSPROC)(GLuint,
>+                                                               GLsizei,
>+                                                               const GLuint *,
>+                                                               const GLintptr *,
>+                                                               const GLsizei *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLBUFFERSTORAGEPROC)(GLenum,
>+                                                           GLsizeiptr,
>+                                                           const void *,
>+                                                           GLbitfield);
>+typedef void(
>+    INTERNAL_GL_APIENTRY *PFNGLCLEARTEXIMAGEPROC)(GLuint, GLint, GLenum, GLenum, const void *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLCLEARTEXSUBIMAGEPROC)(GLuint,
>+                                                              GLint,
>+                                                              GLint,
>+                                                              GLint,
>+                                                              GLint,
>+                                                              GLsizei,
>+                                                              GLsizei,
>+                                                              GLsizei,
>+                                                              GLenum,
>+                                                              GLenum,
>+                                                              const void *);
> 
> // 4.5
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLBINDTEXTUREUNITPROC)(GLuint, GLuint);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLBLITNAMEDFRAMEBUFFERPROC)(GLuint, GLuint, GLint, GLint, GLint, GLint, GLint, GLint, GLint, GLint, GLbitfield, GLenum);
>-typedef GLenum (INTERNAL_GL_APIENTRY *PFNGLCHECKNAMEDFRAMEBUFFERSTATUSPROC)(GLuint, GLenum);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLCLEARNAMEDBUFFERDATAPROC)(GLuint, GLenum, GLenum, GLenum, const void *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLCLEARNAMEDBUFFERSUBDATAPROC)(GLuint, GLenum, GLintptr, GLsizeiptr, GLenum, GLenum, const void *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLBINDTEXTUREUNITPROC)(GLuint, GLuint);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLBLITNAMEDFRAMEBUFFERPROC)(GLuint,
>+                                                                  GLuint,
>+                                                                  GLint,
>+                                                                  GLint,
>+                                                                  GLint,
>+                                                                  GLint,
>+                                                                  GLint,
>+                                                                  GLint,
>+                                                                  GLint,
>+                                                                  GLint,
>+                                                                  GLbitfield,
>+                                                                  GLenum);
>+typedef GLenum(INTERNAL_GL_APIENTRY *PFNGLCHECKNAMEDFRAMEBUFFERSTATUSPROC)(GLuint, GLenum);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLCLEARNAMEDBUFFERDATAPROC)(GLuint,
>+                                                                  GLenum,
>+                                                                  GLenum,
>+                                                                  GLenum,
>+                                                                  const void *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLCLEARNAMEDBUFFERSUBDATAPROC)(GLuint,
>+                                                                     GLenum,
>+                                                                     GLintptr,
>+                                                                     GLsizeiptr,
>+                                                                     GLenum,
>+                                                                     GLenum,
>+                                                                     const void *);
> typedef void(
>     INTERNAL_GL_APIENTRY *PFNGLCLEARNAMEDFRAMEBUFFERFIPROC)(GLuint, GLenum, GLint, GLfloat, GLint);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLCLEARNAMEDFRAMEBUFFERFVPROC)(GLuint, GLenum, GLint, const GLfloat *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLCLEARNAMEDFRAMEBUFFERIVPROC)(GLuint, GLenum, GLint, const GLint *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLCLEARNAMEDFRAMEBUFFERUIVPROC)(GLuint, GLenum, GLint, const GLuint *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLCLIPCONTROLPROC)(GLenum, GLenum);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLCOMPRESSEDTEXTURESUBIMAGE1DPROC)(GLuint, GLint, GLint, GLsizei, GLenum, GLsizei, const void *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLCOMPRESSEDTEXTURESUBIMAGE2DPROC)(GLuint, GLint, GLint, GLint, GLsizei, GLsizei, GLenum, GLsizei, const void *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLCOMPRESSEDTEXTURESUBIMAGE3DPROC)(GLuint, GLint, GLint, GLint, GLint, GLsizei, GLsizei, GLsizei, GLenum, GLsizei, const void *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLCOPYNAMEDBUFFERSUBDATAPROC)(GLuint, GLuint, GLintptr, GLintptr, GLsizeiptr);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLCOPYTEXTURESUBIMAGE1DPROC)(GLuint, GLint, GLint, GLint, GLint, GLsizei);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLCOPYTEXTURESUBIMAGE2DPROC)(GLuint, GLint, GLint, GLint, GLint, GLint, GLsizei, GLsizei);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLCOPYTEXTURESUBIMAGE3DPROC)(GLuint, GLint, GLint, GLint, GLint, GLint, GLint, GLsizei, GLsizei);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLCREATEBUFFERSPROC)(GLsizei, GLuint *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLCREATEFRAMEBUFFERSPROC)(GLsizei, GLuint *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLCREATEPROGRAMPIPELINESPROC)(GLsizei, GLuint *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLCREATEQUERIESPROC)(GLenum, GLsizei, GLuint *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLCREATERENDERBUFFERSPROC)(GLsizei, GLuint *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLCREATESAMPLERSPROC)(GLsizei, GLuint *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLCREATETEXTURESPROC)(GLenum, GLsizei, GLuint *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLCREATETRANSFORMFEEDBACKSPROC)(GLsizei, GLuint *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLCREATEVERTEXARRAYSPROC)(GLsizei, GLuint *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLDISABLEVERTEXARRAYATTRIBPROC)(GLuint, GLuint);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLENABLEVERTEXARRAYATTRIBPROC)(GLuint, GLuint);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLFLUSHMAPPEDNAMEDBUFFERRANGEPROC)(GLuint, GLintptr, GLsizeiptr);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLGENERATETEXTUREMIPMAPPROC)(GLuint);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLGETCOMPRESSEDTEXTUREIMAGEPROC)(GLuint, GLint, GLsizei, void *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLGETCOMPRESSEDTEXTURESUBIMAGEPROC)(GLuint, GLint, GLint, GLint, GLint, GLsizei, GLsizei, GLsizei, GLsizei, void *);
>-typedef GLenum (INTERNAL_GL_APIENTRY *PFNGLGETGRAPHICSRESETSTATUSPROC)();
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLGETNAMEDBUFFERPARAMETERI64VPROC)(GLuint, GLenum, GLint64 *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLGETNAMEDBUFFERPARAMETERIVPROC)(GLuint, GLenum, GLint *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLGETNAMEDBUFFERPOINTERVPROC)(GLuint, GLenum, void **);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLGETNAMEDBUFFERSUBDATAPROC)(GLuint, GLintptr, GLsizeiptr, void *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLGETNAMEDFRAMEBUFFERATTACHMENTPARAMETERIVPROC)(GLuint, GLenum, GLenum, GLint *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLGETNAMEDFRAMEBUFFERPARAMETERIVPROC)(GLuint, GLenum, GLint *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLGETNAMEDRENDERBUFFERPARAMETERIVPROC)(GLuint, GLenum, GLint *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLGETQUERYBUFFEROBJECTI64VPROC)(GLuint, GLuint, GLenum, GLintptr);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLGETQUERYBUFFEROBJECTIVPROC)(GLuint, GLuint, GLenum, GLintptr);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLGETQUERYBUFFEROBJECTUI64VPROC)(GLuint, GLuint, GLenum, GLintptr);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLGETQUERYBUFFEROBJECTUIVPROC)(GLuint, GLuint, GLenum, GLintptr);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLGETTEXTUREIMAGEPROC)(GLuint, GLint, GLenum, GLenum, GLsizei, void *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLGETTEXTURELEVELPARAMETERFVPROC)(GLuint, GLint, GLenum, GLfloat *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLGETTEXTURELEVELPARAMETERIVPROC)(GLuint, GLint, GLenum, GLint *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLGETTEXTUREPARAMETERIIVPROC)(GLuint, GLenum, GLint *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLGETTEXTUREPARAMETERIUIVPROC)(GLuint, GLenum, GLuint *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLGETTEXTUREPARAMETERFVPROC)(GLuint, GLenum, GLfloat *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLGETTEXTUREPARAMETERIVPROC)(GLuint, GLenum, GLint *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLGETTEXTURESUBIMAGEPROC)(GLuint, GLint, GLint, GLint, GLint, GLsizei, GLsizei, GLsizei, GLenum, GLenum, GLsizei, void *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLGETTRANSFORMFEEDBACKI64_VPROC)(GLuint, GLenum, GLuint, GLint64 *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLGETTRANSFORMFEEDBACKI_VPROC)(GLuint, GLenum, GLuint, GLint *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLGETTRANSFORMFEEDBACKIVPROC)(GLuint, GLenum, GLint *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLGETVERTEXARRAYINDEXED64IVPROC)(GLuint, GLuint, GLenum, GLint64 *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLGETVERTEXARRAYINDEXEDIVPROC)(GLuint, GLuint, GLenum, GLint *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLGETVERTEXARRAYIVPROC)(GLuint, GLenum, GLint *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLGETNCOMPRESSEDTEXIMAGEPROC)(GLenum, GLint, GLsizei, void *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLGETNTEXIMAGEPROC)(GLenum, GLint, GLenum, GLenum, GLsizei, void *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLGETNUNIFORMDVPROC)(GLuint, GLint, GLsizei, GLdouble *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLGETNUNIFORMFVPROC)(GLuint, GLint, GLsizei, GLfloat *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLGETNUNIFORMIVPROC)(GLuint, GLint, GLsizei, GLint *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLGETNUNIFORMUIVPROC)(GLuint, GLint, GLsizei, GLuint *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLINVALIDATENAMEDFRAMEBUFFERDATAPROC)(GLuint, GLsizei, const GLenum *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLINVALIDATENAMEDFRAMEBUFFERSUBDATAPROC)(GLuint, GLsizei, const GLenum *, GLint, GLint, GLsizei, GLsizei);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLCLEARNAMEDFRAMEBUFFERFVPROC)(GLuint,
>+                                                                     GLenum,
>+                                                                     GLint,
>+                                                                     const GLfloat *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLCLEARNAMEDFRAMEBUFFERIVPROC)(GLuint,
>+                                                                     GLenum,
>+                                                                     GLint,
>+                                                                     const GLint *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLCLEARNAMEDFRAMEBUFFERUIVPROC)(GLuint,
>+                                                                      GLenum,
>+                                                                      GLint,
>+                                                                      const GLuint *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLCLIPCONTROLPROC)(GLenum, GLenum);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLCOMPRESSEDTEXTURESUBIMAGE1DPROC)(GLuint,
>+                                                                         GLint,
>+                                                                         GLint,
>+                                                                         GLsizei,
>+                                                                         GLenum,
>+                                                                         GLsizei,
>+                                                                         const void *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLCOMPRESSEDTEXTURESUBIMAGE2DPROC)(GLuint,
>+                                                                         GLint,
>+                                                                         GLint,
>+                                                                         GLint,
>+                                                                         GLsizei,
>+                                                                         GLsizei,
>+                                                                         GLenum,
>+                                                                         GLsizei,
>+                                                                         const void *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLCOMPRESSEDTEXTURESUBIMAGE3DPROC)(GLuint,
>+                                                                         GLint,
>+                                                                         GLint,
>+                                                                         GLint,
>+                                                                         GLint,
>+                                                                         GLsizei,
>+                                                                         GLsizei,
>+                                                                         GLsizei,
>+                                                                         GLenum,
>+                                                                         GLsizei,
>+                                                                         const void *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLCOPYNAMEDBUFFERSUBDATAPROC)(GLuint,
>+                                                                    GLuint,
>+                                                                    GLintptr,
>+                                                                    GLintptr,
>+                                                                    GLsizeiptr);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLCOPYTEXTURESUBIMAGE1DPROC)(GLuint,
>+                                                                   GLint,
>+                                                                   GLint,
>+                                                                   GLint,
>+                                                                   GLint,
>+                                                                   GLsizei);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLCOPYTEXTURESUBIMAGE2DPROC)(GLuint,
>+                                                                   GLint,
>+                                                                   GLint,
>+                                                                   GLint,
>+                                                                   GLint,
>+                                                                   GLint,
>+                                                                   GLsizei,
>+                                                                   GLsizei);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLCOPYTEXTURESUBIMAGE3DPROC)(GLuint,
>+                                                                   GLint,
>+                                                                   GLint,
>+                                                                   GLint,
>+                                                                   GLint,
>+                                                                   GLint,
>+                                                                   GLint,
>+                                                                   GLsizei,
>+                                                                   GLsizei);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLCREATEBUFFERSPROC)(GLsizei, GLuint *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLCREATEFRAMEBUFFERSPROC)(GLsizei, GLuint *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLCREATEPROGRAMPIPELINESPROC)(GLsizei, GLuint *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLCREATEQUERIESPROC)(GLenum, GLsizei, GLuint *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLCREATERENDERBUFFERSPROC)(GLsizei, GLuint *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLCREATESAMPLERSPROC)(GLsizei, GLuint *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLCREATETEXTURESPROC)(GLenum, GLsizei, GLuint *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLCREATETRANSFORMFEEDBACKSPROC)(GLsizei, GLuint *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLCREATEVERTEXARRAYSPROC)(GLsizei, GLuint *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLDISABLEVERTEXARRAYATTRIBPROC)(GLuint, GLuint);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLENABLEVERTEXARRAYATTRIBPROC)(GLuint, GLuint);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLFLUSHMAPPEDNAMEDBUFFERRANGEPROC)(GLuint,
>+                                                                         GLintptr,
>+                                                                         GLsizeiptr);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLGENERATETEXTUREMIPMAPPROC)(GLuint);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLGETCOMPRESSEDTEXTUREIMAGEPROC)(GLuint,
>+                                                                       GLint,
>+                                                                       GLsizei,
>+                                                                       void *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLGETCOMPRESSEDTEXTURESUBIMAGEPROC)(GLuint,
>+                                                                          GLint,
>+                                                                          GLint,
>+                                                                          GLint,
>+                                                                          GLint,
>+                                                                          GLsizei,
>+                                                                          GLsizei,
>+                                                                          GLsizei,
>+                                                                          GLsizei,
>+                                                                          void *);
>+typedef GLenum(INTERNAL_GL_APIENTRY *PFNGLGETGRAPHICSRESETSTATUSPROC)();
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLGETNAMEDBUFFERPARAMETERI64VPROC)(GLuint, GLenum, GLint64 *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLGETNAMEDBUFFERPARAMETERIVPROC)(GLuint, GLenum, GLint *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLGETNAMEDBUFFERPOINTERVPROC)(GLuint, GLenum, void **);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLGETNAMEDBUFFERSUBDATAPROC)(GLuint,
>+                                                                   GLintptr,
>+                                                                   GLsizeiptr,
>+                                                                   void *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLGETNAMEDFRAMEBUFFERATTACHMENTPARAMETERIVPROC)(GLuint,
>+                                                                                      GLenum,
>+                                                                                      GLenum,
>+                                                                                      GLint *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLGETNAMEDFRAMEBUFFERPARAMETERIVPROC)(GLuint,
>+                                                                            GLenum,
>+                                                                            GLint *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLGETNAMEDRENDERBUFFERPARAMETERIVPROC)(GLuint,
>+                                                                             GLenum,
>+                                                                             GLint *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLGETQUERYBUFFEROBJECTI64VPROC)(GLuint,
>+                                                                      GLuint,
>+                                                                      GLenum,
>+                                                                      GLintptr);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLGETQUERYBUFFEROBJECTIVPROC)(GLuint,
>+                                                                    GLuint,
>+                                                                    GLenum,
>+                                                                    GLintptr);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLGETQUERYBUFFEROBJECTUI64VPROC)(GLuint,
>+                                                                       GLuint,
>+                                                                       GLenum,
>+                                                                       GLintptr);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLGETQUERYBUFFEROBJECTUIVPROC)(GLuint,
>+                                                                     GLuint,
>+                                                                     GLenum,
>+                                                                     GLintptr);
>+typedef void(
>+    INTERNAL_GL_APIENTRY *PFNGLGETTEXTUREIMAGEPROC)(GLuint, GLint, GLenum, GLenum, GLsizei, void *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLGETTEXTURELEVELPARAMETERFVPROC)(GLuint,
>+                                                                        GLint,
>+                                                                        GLenum,
>+                                                                        GLfloat *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLGETTEXTURELEVELPARAMETERIVPROC)(GLuint,
>+                                                                        GLint,
>+                                                                        GLenum,
>+                                                                        GLint *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLGETTEXTUREPARAMETERIIVPROC)(GLuint, GLenum, GLint *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLGETTEXTUREPARAMETERIUIVPROC)(GLuint, GLenum, GLuint *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLGETTEXTUREPARAMETERFVPROC)(GLuint, GLenum, GLfloat *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLGETTEXTUREPARAMETERIVPROC)(GLuint, GLenum, GLint *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLGETTEXTURESUBIMAGEPROC)(GLuint,
>+                                                                GLint,
>+                                                                GLint,
>+                                                                GLint,
>+                                                                GLint,
>+                                                                GLsizei,
>+                                                                GLsizei,
>+                                                                GLsizei,
>+                                                                GLenum,
>+                                                                GLenum,
>+                                                                GLsizei,
>+                                                                void *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLGETTRANSFORMFEEDBACKI64_VPROC)(GLuint,
>+                                                                       GLenum,
>+                                                                       GLuint,
>+                                                                       GLint64 *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLGETTRANSFORMFEEDBACKI_VPROC)(GLuint,
>+                                                                     GLenum,
>+                                                                     GLuint,
>+                                                                     GLint *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLGETTRANSFORMFEEDBACKIVPROC)(GLuint, GLenum, GLint *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLGETVERTEXARRAYINDEXED64IVPROC)(GLuint,
>+                                                                       GLuint,
>+                                                                       GLenum,
>+                                                                       GLint64 *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLGETVERTEXARRAYINDEXEDIVPROC)(GLuint,
>+                                                                     GLuint,
>+                                                                     GLenum,
>+                                                                     GLint *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLGETVERTEXARRAYIVPROC)(GLuint, GLenum, GLint *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLGETNCOMPRESSEDTEXIMAGEPROC)(GLenum, GLint, GLsizei, void *);
>+typedef void(
>+    INTERNAL_GL_APIENTRY *PFNGLGETNTEXIMAGEPROC)(GLenum, GLint, GLenum, GLenum, GLsizei, void *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLGETNUNIFORMDVPROC)(GLuint, GLint, GLsizei, GLdouble *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLGETNUNIFORMFVPROC)(GLuint, GLint, GLsizei, GLfloat *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLGETNUNIFORMIVPROC)(GLuint, GLint, GLsizei, GLint *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLGETNUNIFORMUIVPROC)(GLuint, GLint, GLsizei, GLuint *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLINVALIDATENAMEDFRAMEBUFFERDATAPROC)(GLuint,
>+                                                                            GLsizei,
>+                                                                            const GLenum *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLINVALIDATENAMEDFRAMEBUFFERSUBDATAPROC)(GLuint,
>+                                                                               GLsizei,
>+                                                                               const GLenum *,
>+                                                                               GLint,
>+                                                                               GLint,
>+                                                                               GLsizei,
>+                                                                               GLsizei);
> typedef void *(INTERNAL_GL_APIENTRY *PFNGLMAPNAMEDBUFFERPROC)(GLuint, GLenum);
>-typedef void *(INTERNAL_GL_APIENTRY *PFNGLMAPNAMEDBUFFERRANGEPROC)(GLuint, GLintptr, GLsizeiptr, GLbitfield);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLMEMORYBARRIERBYREGIONPROC)(GLbitfield);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLNAMEDBUFFERDATAPROC)(GLuint, GLsizeiptr, const void *, GLenum);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLNAMEDBUFFERSTORAGEPROC)(GLuint, GLsizeiptr, const void *, GLbitfield);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLNAMEDBUFFERSUBDATAPROC)(GLuint, GLintptr, GLsizeiptr, const void *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLNAMEDFRAMEBUFFERDRAWBUFFERPROC)(GLuint, GLenum);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLNAMEDFRAMEBUFFERDRAWBUFFERSPROC)(GLuint, GLsizei, const GLenum *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLNAMEDFRAMEBUFFERPARAMETERIPROC)(GLuint, GLenum, GLint);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLNAMEDFRAMEBUFFERREADBUFFERPROC)(GLuint, GLenum);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLNAMEDFRAMEBUFFERRENDERBUFFERPROC)(GLuint, GLenum, GLenum, GLuint);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLNAMEDFRAMEBUFFERTEXTUREPROC)(GLuint, GLenum, GLuint, GLint);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLNAMEDFRAMEBUFFERTEXTURELAYERPROC)(GLuint, GLenum, GLuint, GLint, GLint);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLNAMEDRENDERBUFFERSTORAGEPROC)(GLuint, GLenum, GLsizei, GLsizei);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLNAMEDRENDERBUFFERSTORAGEMULTISAMPLEPROC)(GLuint, GLsizei, GLenum, GLsizei, GLsizei);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLREADNPIXELSPROC)(GLint, GLint, GLsizei, GLsizei, GLenum, GLenum, GLsizei, void *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLTEXTUREBARRIERPROC)();
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLTEXTUREBUFFERPROC)(GLuint, GLenum, GLuint);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLTEXTUREBUFFERRANGEPROC)(GLuint, GLenum, GLuint, GLintptr, GLsizeiptr);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLTEXTUREPARAMETERIIVPROC)(GLuint, GLenum, const GLint *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLTEXTUREPARAMETERIUIVPROC)(GLuint, GLenum, const GLuint *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLTEXTUREPARAMETERFPROC)(GLuint, GLenum, GLfloat);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLTEXTUREPARAMETERFVPROC)(GLuint, GLenum, const GLfloat *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLTEXTUREPARAMETERIPROC)(GLuint, GLenum, GLint);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLTEXTUREPARAMETERIVPROC)(GLuint, GLenum, const GLint *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLTEXTURESTORAGE1DPROC)(GLuint, GLsizei, GLenum, GLsizei);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLTEXTURESTORAGE2DPROC)(GLuint, GLsizei, GLenum, GLsizei, GLsizei);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLTEXTURESTORAGE2DMULTISAMPLEPROC)(GLuint, GLsizei, GLenum, GLsizei, GLsizei, GLboolean);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLTEXTURESTORAGE3DPROC)(GLuint, GLsizei, GLenum, GLsizei, GLsizei, GLsizei);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLTEXTURESTORAGE3DMULTISAMPLEPROC)(GLuint, GLsizei, GLenum, GLsizei, GLsizei, GLsizei, GLboolean);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLTEXTURESUBIMAGE1DPROC)(GLuint, GLint, GLint, GLsizei, GLenum, GLenum, const void *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLTEXTURESUBIMAGE2DPROC)(GLuint, GLint, GLint, GLint, GLsizei, GLsizei, GLenum, GLenum, const void *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLTEXTURESUBIMAGE3DPROC)(GLuint, GLint, GLint, GLint, GLint, GLsizei, GLsizei, GLsizei, GLenum, GLenum, const void *);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLTRANSFORMFEEDBACKBUFFERBASEPROC)(GLuint, GLuint, GLuint);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLTRANSFORMFEEDBACKBUFFERRANGEPROC)(GLuint, GLuint, GLuint, GLintptr, GLsizeiptr);
>-typedef GLboolean (INTERNAL_GL_APIENTRY *PFNGLUNMAPNAMEDBUFFERPROC)(GLuint);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLVERTEXARRAYATTRIBBINDINGPROC)(GLuint, GLuint, GLuint);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLVERTEXARRAYATTRIBFORMATPROC)(GLuint, GLuint, GLint, GLenum, GLboolean, GLuint);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLVERTEXARRAYATTRIBIFORMATPROC)(GLuint, GLuint, GLint, GLenum, GLuint);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLVERTEXARRAYATTRIBLFORMATPROC)(GLuint, GLuint, GLint, GLenum, GLuint);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLVERTEXARRAYBINDINGDIVISORPROC)(GLuint, GLuint, GLuint);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLVERTEXARRAYELEMENTBUFFERPROC)(GLuint, GLuint);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLVERTEXARRAYVERTEXBUFFERPROC)(GLuint, GLuint, GLuint, GLintptr, GLsizei);
>-typedef void (INTERNAL_GL_APIENTRY *PFNGLVERTEXARRAYVERTEXBUFFERSPROC)(GLuint, GLuint, GLsizei, const GLuint *, const GLintptr *, const GLsizei *);
>+typedef void *(INTERNAL_GL_APIENTRY *PFNGLMAPNAMEDBUFFERRANGEPROC)(GLuint,
>+                                                                   GLintptr,
>+                                                                   GLsizeiptr,
>+                                                                   GLbitfield);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLMEMORYBARRIERBYREGIONPROC)(GLbitfield);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLNAMEDBUFFERDATAPROC)(GLuint,
>+                                                             GLsizeiptr,
>+                                                             const void *,
>+                                                             GLenum);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLNAMEDBUFFERSTORAGEPROC)(GLuint,
>+                                                                GLsizeiptr,
>+                                                                const void *,
>+                                                                GLbitfield);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLNAMEDBUFFERSUBDATAPROC)(GLuint,
>+                                                                GLintptr,
>+                                                                GLsizeiptr,
>+                                                                const void *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLNAMEDFRAMEBUFFERDRAWBUFFERPROC)(GLuint, GLenum);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLNAMEDFRAMEBUFFERDRAWBUFFERSPROC)(GLuint,
>+                                                                         GLsizei,
>+                                                                         const GLenum *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLNAMEDFRAMEBUFFERPARAMETERIPROC)(GLuint, GLenum, GLint);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLNAMEDFRAMEBUFFERREADBUFFERPROC)(GLuint, GLenum);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLNAMEDFRAMEBUFFERRENDERBUFFERPROC)(GLuint,
>+                                                                          GLenum,
>+                                                                          GLenum,
>+                                                                          GLuint);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLNAMEDFRAMEBUFFERTEXTUREPROC)(GLuint, GLenum, GLuint, GLint);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLNAMEDFRAMEBUFFERTEXTURELAYERPROC)(GLuint,
>+                                                                          GLenum,
>+                                                                          GLuint,
>+                                                                          GLint,
>+                                                                          GLint);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLNAMEDRENDERBUFFERSTORAGEPROC)(GLuint,
>+                                                                      GLenum,
>+                                                                      GLsizei,
>+                                                                      GLsizei);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLNAMEDRENDERBUFFERSTORAGEMULTISAMPLEPROC)(GLuint,
>+                                                                                 GLsizei,
>+                                                                                 GLenum,
>+                                                                                 GLsizei,
>+                                                                                 GLsizei);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLREADNPIXELSPROC)(GLint,
>+                                                         GLint,
>+                                                         GLsizei,
>+                                                         GLsizei,
>+                                                         GLenum,
>+                                                         GLenum,
>+                                                         GLsizei,
>+                                                         void *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLTEXTUREBARRIERPROC)();
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLTEXTUREBUFFERPROC)(GLuint, GLenum, GLuint);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLTEXTUREBUFFERRANGEPROC)(GLuint,
>+                                                                GLenum,
>+                                                                GLuint,
>+                                                                GLintptr,
>+                                                                GLsizeiptr);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLTEXTUREPARAMETERIIVPROC)(GLuint, GLenum, const GLint *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLTEXTUREPARAMETERIUIVPROC)(GLuint, GLenum, const GLuint *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLTEXTUREPARAMETERFPROC)(GLuint, GLenum, GLfloat);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLTEXTUREPARAMETERFVPROC)(GLuint, GLenum, const GLfloat *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLTEXTUREPARAMETERIPROC)(GLuint, GLenum, GLint);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLTEXTUREPARAMETERIVPROC)(GLuint, GLenum, const GLint *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLTEXTURESTORAGE1DPROC)(GLuint, GLsizei, GLenum, GLsizei);
>+typedef void(
>+    INTERNAL_GL_APIENTRY *PFNGLTEXTURESTORAGE2DPROC)(GLuint, GLsizei, GLenum, GLsizei, GLsizei);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLTEXTURESTORAGE2DMULTISAMPLEPROC)(GLuint,
>+                                                                         GLsizei,
>+                                                                         GLenum,
>+                                                                         GLsizei,
>+                                                                         GLsizei,
>+                                                                         GLboolean);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLTEXTURESTORAGE3DPROC)(GLuint,
>+                                                              GLsizei,
>+                                                              GLenum,
>+                                                              GLsizei,
>+                                                              GLsizei,
>+                                                              GLsizei);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLTEXTURESTORAGE3DMULTISAMPLEPROC)(GLuint,
>+                                                                         GLsizei,
>+                                                                         GLenum,
>+                                                                         GLsizei,
>+                                                                         GLsizei,
>+                                                                         GLsizei,
>+                                                                         GLboolean);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLTEXTURESUBIMAGE1DPROC)(GLuint,
>+                                                               GLint,
>+                                                               GLint,
>+                                                               GLsizei,
>+                                                               GLenum,
>+                                                               GLenum,
>+                                                               const void *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLTEXTURESUBIMAGE2DPROC)(GLuint,
>+                                                               GLint,
>+                                                               GLint,
>+                                                               GLint,
>+                                                               GLsizei,
>+                                                               GLsizei,
>+                                                               GLenum,
>+                                                               GLenum,
>+                                                               const void *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLTEXTURESUBIMAGE3DPROC)(GLuint,
>+                                                               GLint,
>+                                                               GLint,
>+                                                               GLint,
>+                                                               GLint,
>+                                                               GLsizei,
>+                                                               GLsizei,
>+                                                               GLsizei,
>+                                                               GLenum,
>+                                                               GLenum,
>+                                                               const void *);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLTRANSFORMFEEDBACKBUFFERBASEPROC)(GLuint, GLuint, GLuint);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLTRANSFORMFEEDBACKBUFFERRANGEPROC)(GLuint,
>+                                                                          GLuint,
>+                                                                          GLuint,
>+                                                                          GLintptr,
>+                                                                          GLsizeiptr);
>+typedef GLboolean(INTERNAL_GL_APIENTRY *PFNGLUNMAPNAMEDBUFFERPROC)(GLuint);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLVERTEXARRAYATTRIBBINDINGPROC)(GLuint, GLuint, GLuint);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLVERTEXARRAYATTRIBFORMATPROC)(GLuint,
>+                                                                     GLuint,
>+                                                                     GLint,
>+                                                                     GLenum,
>+                                                                     GLboolean,
>+                                                                     GLuint);
>+typedef void(
>+    INTERNAL_GL_APIENTRY *PFNGLVERTEXARRAYATTRIBIFORMATPROC)(GLuint, GLuint, GLint, GLenum, GLuint);
>+typedef void(
>+    INTERNAL_GL_APIENTRY *PFNGLVERTEXARRAYATTRIBLFORMATPROC)(GLuint, GLuint, GLint, GLenum, GLuint);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLVERTEXARRAYBINDINGDIVISORPROC)(GLuint, GLuint, GLuint);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLVERTEXARRAYELEMENTBUFFERPROC)(GLuint, GLuint);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLVERTEXARRAYVERTEXBUFFERPROC)(GLuint,
>+                                                                     GLuint,
>+                                                                     GLuint,
>+                                                                     GLintptr,
>+                                                                     GLsizei);
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLVERTEXARRAYVERTEXBUFFERSPROC)(GLuint,
>+                                                                      GLuint,
>+                                                                      GLsizei,
>+                                                                      const GLuint *,
>+                                                                      const GLintptr *,
>+                                                                      const GLsizei *);
> 
> // GL_EXT_discard_framebuffer
> typedef void(INTERNAL_GL_APIENTRY *PFNGLDISCARDFRAMEBUFFEREXTPROC)(GLenum target,
>@@ -905,12 +1851,26 @@ typedef void(INTERNAL_GL_APIENTRY *PFNGLGETINTERNALFORMATSAMPLEIVNVPROC)(GLenum
>                                                                          GLsizei bufSize,
>                                                                          GLint *params);
> 
>+// GL_OVR_multiview2
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLFRAMEBUFFERTEXTUREMULTIVIEWOVRPROC)(GLenum target,
>+                                                                            GLenum attachment,
>+                                                                            GLuint texture,
>+                                                                            GLint level,
>+                                                                            GLint baseViewIndex,
>+                                                                            GLsizei numViews);
> // EXT_debug_marker
> typedef void(INTERNAL_GL_APIENTRY *PFNGLINSERTEVENTMARKEREXTPROC)(GLsizei length,
>                                                                   const GLchar *marker);
> typedef void(INTERNAL_GL_APIENTRY *PFNGLPUSHGROUPMARKEREXTPROC)(GLsizei length,
>                                                                 const GLchar *marker);
> typedef void(INTERNAL_GL_APIENTRY *PFNGLPOPGROUPMARKEREXTPROC)(void);
>-}
> 
>-#endif // LIBANGLE_RENDERER_GL_FUNCTIONSGLTYPEDEFS_H_
>+// KHR_parallel_shader_compile
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLMAXSHADERCOMPILERTHREADSKHRPROC)(GLuint count);
>+
>+// ARB_parallel_shader_compile
>+typedef void(INTERNAL_GL_APIENTRY *PFNGLMAXSHADERCOMPILERTHREADSARBPROC)(GLuint count);
>+
>+}  // namespace rx
>+
>+#endif  // LIBANGLE_RENDERER_GL_FUNCTIONSGLTYPEDEFS_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/generate_gl_dispatch_table.py b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/generate_gl_dispatch_table.py
>index 090514e1bc1..0d61882da46 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/generate_gl_dispatch_table.py
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/generate_gl_dispatch_table.py
>@@ -5,6 +5,7 @@
> #
> # generate_gl_dispatch_table.py:
> #  Generation script for OpenGL bindings with ANGLE.
>+#  NOTE: don't run this script directly. Run scripts/run_code_generation.py.
> 
> import sys
> import os
>@@ -23,130 +24,6 @@ def safe_append(the_dict, key, element):
>         the_dict[key] = []
>     the_dict[key].append(element)
> 
>-gl_xml_path = os.path.join('..', '..', '..', '..', 'scripts', 'gl.xml')
>-dispatch_header_path = 'DispatchTableGL_autogen.h'
>-dispatch_source_path = 'DispatchTableGL_autogen.cpp'
>-null_functions_header_path = 'null_functions.h'
>-null_functions_source_path = 'null_functions.cpp'
>-
>-# Load the JSON and XML data.
>-data_source_name = 'gl_bindings_data.json'
>-json_data = angle_format.load_json(data_source_name)
>-xml_root = etree.parse(gl_xml_path).getroot()
>-
>-api_feature_info = {}
>-
>-core_removed_eps = []
>-for core_removed_ep in xml_root.findall('feature/remove'):
>-    assert(core_removed_ep.attrib['profile'] == 'core')
>-    for command in core_removed_ep.findall('./command'):
>-        core_removed_eps.append(command.attrib['name'])
>-
>-for feature in xml_root.findall('feature'):
>-    api = feature.attrib['api']
>-    name = feature.attrib['name']
>-    number = feature.attrib['number']
>-
>-    # OpenGL ES 3.x versions are listed as api 'gles2'
>-    if api != 'gl' and api != 'gles2':
>-        continue
>-
>-    for command in feature.findall('./require/command'):
>-        command_name = command.attrib['name']
>-        safe_append(api_feature_info, command_name, (api, name, number))
>-
>-gl_extension_commands = {}
>-gles2_extension_commands = {}
>-both_extension_commands = {}
>-
>-for extension in xml_root.findall('extensions/extension'):
>-    extension_name = extension.attrib['name']
>-    support = extension.attrib['supported'].split('|')
>-    for command in extension.findall('./require/command'):
>-        command_name = command.attrib['name']
>-        if 'gl' in support and 'gles2' in support:
>-            # Special case for KHR extensions, since in GLES they are suffixed.
>-            if '_KHR_' in extension_name:
>-                safe_append(gl_extension_commands, command_name, extension_name)
>-                safe_append(gles2_extension_commands, command_name, extension_name)
>-            else:
>-                safe_append(both_extension_commands, command_name, extension_name)
>-        elif 'gl' in support:
>-            safe_append(gl_extension_commands, command_name, extension_name)
>-        elif 'gles2' in support:
>-            safe_append(gles2_extension_commands, command_name, extension_name)
>-
>-gl_requirements = {}
>-gles2_requirements = {}
>-gl_extension_requirements = {}
>-gles2_extension_requirements = {}
>-both_extension_requirements = {}
>-
>-# Used later in the NULL bindings.
>-all_entry_points = []
>-
>-for comment, entry_points in json_data.iteritems():
>-    for entry_point_no_prefix in entry_points:
>-        entry_point = "gl" + entry_point_no_prefix
>-
>-        all_entry_points.append(entry_point)
>-
>-        gl_required = None
>-        gles2_required = None
>-
>-        if entry_point in api_feature_info:
>-            for api, name, number in api_feature_info[entry_point]:
>-                major, minor = number.split(".")
>-                reqs = (major, minor)
>-                if api == 'gl':
>-                    if not gl_required:
>-                        gl_required = reqs
>-                    elif entry_point in core_removed_eps:
>-                        print('Upgrade ' + entry_point + ' to ' + str(reqs) + ' instead of ' + str(gl_required))
>-                        gl_required = reqs
>-                    else:
>-                        print('Keep ' + entry_point + ' at ' + str(gl_required) + ' instead of ' + str(reqs))
>-                elif api == 'gles2':
>-                    if not gles2_required:
>-                        gles2_required = reqs
>-                    else:
>-                        print("Duplicate for " + entry_point + ": " + str(reqs) + " and " + str(gles2_required))
>-                else:
>-                    raise Exception('Bad api type: ' + api)
>-
>-        if gl_required:
>-            safe_append(gl_requirements, gl_required, entry_point)
>-
>-        if gles2_required:
>-            safe_append(gles2_requirements, gles2_required, entry_point)
>-
>-        # Special case for finding extensions that overlap with core functions.
>-
>-        extension = False
>-
>-        for ep in [entry_point, entry_point + "EXT", entry_point + "ARB", entry_point + "OES"]:
>-            if ep in both_extension_commands:
>-                extension = True
>-                for extension in both_extension_commands[ep]:
>-                    safe_append(both_extension_requirements, extension, (entry_point, ep))
>-
>-            else:
>-                if ep in gl_extension_commands:
>-                    extension = True
>-                    for extension in gl_extension_commands[ep]:
>-                        safe_append(gl_extension_requirements, extension, (entry_point, ep))
>-
>-                if ep in gles2_extension_commands:
>-                    extension = True
>-                    for extension in gles2_extension_commands[ep]:
>-                        full_ep = ep
>-                        if '_KHR_' in extension:
>-                            full_ep += 'KHR'
>-                        safe_append(gles2_extension_requirements, extension, (entry_point, full_ep))
>-
>-        if not (gl_required or gles2_required or extension):
>-            raise Exception('Entry point ' + entry_point + ' not found in the xml.')
>-
> # Template for the header declaration of the dispatch table.
> dispatch_table_header_template = """// GENERATED FILE - DO NOT EDIT.
> // Generated by {script_name} using data from {data_source_name} and gl.xml.
>@@ -176,8 +53,11 @@ namespace rx
> class DispatchTableGL : angle::NonCopyable
> {{
>   public:
>+  // clang-format off
> {table_data}
>+  // clang-format on
> 
>+  DispatchTableGL();
>   virtual ~DispatchTableGL() = default;
> 
>   protected:
>@@ -205,23 +85,6 @@ def first_lower(str):
> def format_ep_decl(entry_point):
>     return "    PFNGL" + entry_point.upper() + "PROC " + first_lower(entry_point) + " = nullptr;"
> 
>-table_data = []
>-for comment, entry_points in sorted(json_data.iteritems()):
>-    formatted = ["    // " + comment]
>-    formatted += [format_ep_decl(entry_point) for entry_point in sorted(entry_points)]
>-
>-    table_data.append("\n".join(formatted))
>-
>-dispatch_table_header = dispatch_table_header_template.format(
>-    script_name = os.path.basename(sys.argv[0]),
>-    data_source_name = data_source_name,
>-    year = date.today().year,
>-    file_name = dispatch_header_path,
>-    table_data = "\n\n".join(table_data))
>-
>-with open(dispatch_header_path, "w") as out:
>-    out.write(dispatch_table_header)
>-
> # Template for the initialization file of the dispatch table.
> dispatch_table_source_template = """// GENERATED FILE - DO NOT EDIT.
> // Generated by {script_name} using data from {data_source_name} and gl.xml.
>@@ -247,6 +110,7 @@ dispatch_table_source_template = """// GENERATED FILE - DO NOT EDIT.
> 
> namespace rx
> {{
>+DispatchTableGL::DispatchTableGL() = default;
> 
> void DispatchTableGL::initProcsDesktopGL(const gl::Version &version, const std::set<std::string> &extensions)
> {{
>@@ -307,26 +171,6 @@ def format_extension_requirements_lines(extension, entry_points, api):
>     lines += ['    }']
>     return '\n'.join(lines)
> 
>-gl_data = []
>-for gl_required, entry_points in sorted(gl_requirements.iteritems()):
>-    gl_data.append(format_requirements_lines(gl_required, entry_points))
>-
>-gl_extensions_data = []
>-for extension, entry_points in sorted(gl_extension_requirements.iteritems()):
>-    gl_extensions_data.append(format_extension_requirements_lines(extension, entry_points, "gl"))
>-
>-gles2_data = []
>-for gles2_required, entry_points in sorted(gles2_requirements.iteritems()):
>-    gles2_data.append(format_requirements_lines(gles2_required, entry_points))
>-
>-gles2_extensions_data = []
>-for extension, entry_points in sorted(gles2_extension_requirements.iteritems()):
>-    gles2_extensions_data.append(format_extension_requirements_lines(extension, entry_points, "gles2"))
>-
>-both_extensions_data = []
>-for extension, entry_points in sorted(both_extension_requirements.iteritems()):
>-    both_extensions_data.append(format_extension_requirements_lines(extension, entry_points, "gles2|gl"))
>-
> def assign_null_line(line):
>     m = re.match(r'        ASSIGN$"gl.*", (.+)$;', line)
>     if m:
>@@ -341,56 +185,9 @@ def assign_null(entry):
> def nullify(data):
>     return [assign_null(entry) for entry in data]
> 
>-dispatch_table_source = dispatch_table_source_template.format(
>-    script_name = os.path.basename(sys.argv[0]),
>-    data_source_name = data_source_name,
>-    year = date.today().year,
>-    file_name = dispatch_source_path,
>-    gl_data = "\n\n".join(gl_data),
>-    gl_extensions_data = "\n\n".join(gl_extensions_data),
>-    gles2_data = "\n\n".join(gles2_data),
>-    gles2_extensions_data = "\n\n".join(gles2_extensions_data),
>-    both_extensions_data = "\n\n".join(both_extensions_data),
>-    gl_null_data = "\n\n".join(nullify(gl_data)),
>-    gl_null_extensions_data = "\n\n".join(nullify(gl_extensions_data)),
>-    gles2_null_data = "\n\n".join(nullify(gles2_data)),
>-    gles2_null_extensions_data = "\n\n".join(nullify(gles2_extensions_data)),
>-    both_null_extensions_data = "\n\n".join(nullify(both_extensions_data)))
>-
>-with open(dispatch_source_path, "w") as out:
>-    out.write(dispatch_table_source)
>-
>-# Generate the NULL/stub entry points.
>-# Process the whole set of commands
>-
> def format_param(param):
>     return "".join(param.itertext())
> 
>-command_defs = {}
>-command_decls = {}
>-
>-for command in xml_root.findall('commands/command'):
>-    proto = command.find('proto')
>-    command_name = proto.find('name').text
>-    entry = ''.join(proto.itertext())
>-    return_type = entry[:-len(command_name)]
>-    entry = return_type + ' INTERNAL_GL_APIENTRY ' + entry[len(return_type):] + 'NULL('
>-
>-    param_text = [format_param(param) for param in command.findall('param')]
>-    entry += ', '.join(param_text) + ')'
>-
>-    command_decls[command_name] = entry + ';'
>-
>-    entry += '\n{\n'
>-    if return_type != 'void ':
>-        entry += '    return static_cast<' + return_type + '>(0);\n'
>-    entry += '}'
>-
>-    command_defs[command_name] = entry
>-
>-null_decls = [command_decls[entry_point] for entry_point in sorted(all_entry_points)]
>-null_stubs = [command_defs[entry_point] for entry_point in sorted(all_entry_points)]
>-
> null_functions_header_template = """// GENERATED FILE - DO NOT EDIT.
> // Generated by {script_name} using data from {data_source_name} and gl.xml.
> //
>@@ -414,16 +211,6 @@ namespace rx
> #endif  // LIBGLESV2_RENDERER_GL_NULL_GL_FUNCTIONS_AUTOGEN_H_
> """
> 
>-null_functions_header = null_functions_header_template.format(
>-    script_name = os.path.basename(sys.argv[0]),
>-    data_source_name = data_source_name,
>-    year = date.today().year,
>-    file_name = null_functions_header_path,
>-    table_data = "\n".join(null_decls))
>-
>-with open(null_functions_header_path, "w") as out:
>-    out.write(null_functions_header)
>-
> null_functions_source_template = """// GENERATED FILE - DO NOT EDIT.
> // Generated by {script_name} using data from {data_source_name} and gl.xml.
> //
>@@ -442,12 +229,260 @@ namespace rx
> }}  // namespace rx
> """
> 
>-null_functions_source = null_functions_source_template.format(
>-    script_name = os.path.basename(sys.argv[0]),
>-    data_source_name = data_source_name,
>-    year = date.today().year,
>-    file_name = null_functions_source_path,
>-    table_data = "\n\n".join(null_stubs))
>+def main():
>+
>+    # auto_script parameters.
>+    if len(sys.argv) > 1:
>+        inputs = [
>+            '../../../../scripts/gl.xml',
>+            '../angle_format.py',
>+            'gl_bindings_data.json',
>+        ]
>+        outputs = [
>+            'DispatchTableGL_autogen.cpp',
>+            'DispatchTableGL_autogen.h',
>+            'null_functions.cpp',
>+            'null_functions.h',
>+        ]
>+
>+        if sys.argv[1] == 'inputs':
>+            print ','.join(inputs)
>+        elif sys.argv[1] == 'outputs':
>+            print ','.join(outputs)
>+        else:
>+            print('Invalid script parameters')
>+            return 1
>+        return 0
>+
>+    gl_xml_path = os.path.join('..', '..', '..', '..', 'scripts', 'gl.xml')
>+    dispatch_header_path = 'DispatchTableGL_autogen.h'
>+    dispatch_source_path = 'DispatchTableGL_autogen.cpp'
>+    null_functions_header_path = 'null_functions.h'
>+    null_functions_source_path = 'null_functions.cpp'
>+
>+    # Load the JSON and XML data.
>+    data_source_name = 'gl_bindings_data.json'
>+    json_data = angle_format.load_json(data_source_name)
>+    xml_root = etree.parse(gl_xml_path).getroot()
>+
>+    api_feature_info = {}
>+
>+    core_removed_eps = []
>+    for core_removed_ep in xml_root.findall('feature/remove'):
>+        assert(core_removed_ep.attrib['profile'] == 'core')
>+        for command in core_removed_ep.findall('./command'):
>+            core_removed_eps.append(command.attrib['name'])
>+
>+    for feature in xml_root.findall('feature'):
>+        api = feature.attrib['api']
>+        name = feature.attrib['name']
>+        number = feature.attrib['number']
>+
>+        # OpenGL ES 3.x versions are listed as api 'gles2'
>+        if api != 'gl' and api != 'gles2':
>+            continue
>+
>+        for command in feature.findall('./require/command'):
>+            command_name = command.attrib['name']
>+            safe_append(api_feature_info, command_name, (api, name, number))
>+
>+    gl_extension_commands = {}
>+    gles2_extension_commands = {}
>+    both_extension_commands = {}
>+
>+    for extension in xml_root.findall('extensions/extension'):
>+        extension_name = extension.attrib['name']
>+        support = extension.attrib['supported'].split('|')
>+        for command in extension.findall('./require/command'):
>+            command_name = command.attrib['name']
>+            if 'gl' in support and 'gles2' in support:
>+                # Special case for KHR extensions, since in GLES they are suffixed.
>+                if '_KHR_' in extension_name and not command_name.endswith('KHR'):
>+                    safe_append(gl_extension_commands, command_name, extension_name)
>+                    safe_append(gles2_extension_commands, command_name, extension_name)
>+                else:
>+                    safe_append(both_extension_commands, command_name, extension_name)
>+            elif 'gl' in support:
>+                safe_append(gl_extension_commands, command_name, extension_name)
>+            elif 'gles2' in support:
>+                safe_append(gles2_extension_commands, command_name, extension_name)
>+
>+    gl_requirements = {}
>+    gles2_requirements = {}
>+    gl_extension_requirements = {}
>+    gles2_extension_requirements = {}
>+    both_extension_requirements = {}
>+
>+    # Used later in the NULL bindings.
>+    all_entry_points = []
>+
>+    for comment, entry_points in json_data.iteritems():
>+        for entry_point_no_prefix in entry_points:
>+            entry_point = "gl" + entry_point_no_prefix
>+
>+            all_entry_points.append(entry_point)
>+
>+            gl_required = None
>+            gles2_required = None
>+
>+            if entry_point in api_feature_info:
>+                for api, name, number in api_feature_info[entry_point]:
>+                    major, minor = number.split(".")
>+                    reqs = (major, minor)
>+                    if api == 'gl':
>+                        if not gl_required:
>+                            gl_required = reqs
>+                        elif entry_point in core_removed_eps:
>+                            print('Upgrade ' + entry_point + ' to ' + str(reqs) + ' instead of ' + str(gl_required))
>+                            gl_required = reqs
>+                        else:
>+                            print('Keep ' + entry_point + ' at ' + str(gl_required) + ' instead of ' + str(reqs))
>+                    elif api == 'gles2':
>+                        if not gles2_required:
>+                            gles2_required = reqs
>+                        else:
>+                            print("Duplicate for " + entry_point + ": " + str(reqs) + " and " + str(gles2_required))
>+                    else:
>+                        raise Exception('Bad api type: ' + api)
>+
>+            if gl_required:
>+                safe_append(gl_requirements, gl_required, entry_point)
>+
>+            if gles2_required:
>+                safe_append(gles2_requirements, gles2_required, entry_point)
> 
>-with open(null_functions_source_path, "w") as out:
>-    out.write(null_functions_source)
>+            # Special case for finding extensions that overlap with core functions.
>+
>+            extension = False
>+
>+            for ep in [entry_point, entry_point + "EXT", entry_point + "ARB", entry_point + "OES"]:
>+                if ep in both_extension_commands:
>+                    extension = True
>+                    for extension in both_extension_commands[ep]:
>+                        safe_append(both_extension_requirements, extension, (entry_point, ep))
>+
>+                else:
>+                    if ep in gl_extension_commands:
>+                        extension = True
>+                        for extension in gl_extension_commands[ep]:
>+                            safe_append(gl_extension_requirements, extension, (entry_point, ep))
>+
>+                    if ep in gles2_extension_commands:
>+                        extension = True
>+                        for extension in gles2_extension_commands[ep]:
>+                            full_ep = ep
>+                            if '_KHR_' in extension:
>+                                full_ep += 'KHR'
>+                            safe_append(gles2_extension_requirements, extension, (entry_point, full_ep))
>+
>+            if not (gl_required or gles2_required or extension):
>+                raise Exception('Entry point ' + entry_point + ' not found in the xml.')
>+
>+    table_data = []
>+    for comment, entry_points in sorted(json_data.iteritems()):
>+        formatted = ["    // " + comment]
>+        formatted += [format_ep_decl(entry_point) for entry_point in sorted(entry_points)]
>+
>+        table_data.append("\n".join(formatted))
>+
>+    dispatch_table_header = dispatch_table_header_template.format(
>+        script_name = os.path.basename(sys.argv[0]),
>+        data_source_name = data_source_name,
>+        year = date.today().year,
>+        file_name = dispatch_header_path,
>+        table_data = "\n\n".join(table_data))
>+
>+    with open(dispatch_header_path, "w") as out:
>+        out.write(dispatch_table_header)
>+
>+    gl_data = []
>+    for gl_required, entry_points in sorted(gl_requirements.iteritems()):
>+        gl_data.append(format_requirements_lines(gl_required, entry_points))
>+
>+    gl_extensions_data = []
>+    for extension, entry_points in sorted(gl_extension_requirements.iteritems()):
>+        gl_extensions_data.append(format_extension_requirements_lines(extension, entry_points, "gl"))
>+
>+    gles2_data = []
>+    for gles2_required, entry_points in sorted(gles2_requirements.iteritems()):
>+        gles2_data.append(format_requirements_lines(gles2_required, entry_points))
>+
>+    gles2_extensions_data = []
>+    for extension, entry_points in sorted(gles2_extension_requirements.iteritems()):
>+        gles2_extensions_data.append(format_extension_requirements_lines(extension, entry_points, "gles2"))
>+
>+    both_extensions_data = []
>+    for extension, entry_points in sorted(both_extension_requirements.iteritems()):
>+        both_extensions_data.append(format_extension_requirements_lines(extension, entry_points, "gles2|gl"))
>+
>+    dispatch_table_source = dispatch_table_source_template.format(
>+        script_name = os.path.basename(sys.argv[0]),
>+        data_source_name = data_source_name,
>+        year = date.today().year,
>+        file_name = dispatch_source_path,
>+        gl_data = "\n\n".join(gl_data),
>+        gl_extensions_data = "\n\n".join(gl_extensions_data),
>+        gles2_data = "\n\n".join(gles2_data),
>+        gles2_extensions_data = "\n\n".join(gles2_extensions_data),
>+        both_extensions_data = "\n\n".join(both_extensions_data),
>+        gl_null_data = "\n\n".join(nullify(gl_data)),
>+        gl_null_extensions_data = "\n\n".join(nullify(gl_extensions_data)),
>+        gles2_null_data = "\n\n".join(nullify(gles2_data)),
>+        gles2_null_extensions_data = "\n\n".join(nullify(gles2_extensions_data)),
>+        both_null_extensions_data = "\n\n".join(nullify(both_extensions_data)))
>+
>+    with open(dispatch_source_path, "w") as out:
>+        out.write(dispatch_table_source)
>+
>+    # Generate the NULL/stub entry points.
>+    # Process the whole set of commands
>+
>+    command_defs = {}
>+    command_decls = {}
>+
>+    for command in xml_root.findall('commands/command'):
>+        proto = command.find('proto')
>+        command_name = proto.find('name').text
>+        entry = ''.join(proto.itertext())
>+        return_type = entry[:-len(command_name)]
>+        entry = return_type + ' INTERNAL_GL_APIENTRY ' + entry[len(return_type):] + 'NULL('
>+
>+        param_text = [format_param(param) for param in command.findall('param')]
>+        entry += ', '.join(param_text) + ')'
>+
>+        command_decls[command_name] = entry + ';'
>+
>+        entry += '\n{\n'
>+        if return_type != 'void ':
>+            entry += '    return static_cast<' + return_type + '>(0);\n'
>+        entry += '}'
>+
>+        command_defs[command_name] = entry
>+
>+    null_decls = [command_decls[entry_point] for entry_point in sorted(all_entry_points)]
>+    null_stubs = [command_defs[entry_point] for entry_point in sorted(all_entry_points)]
>+
>+    null_functions_header = null_functions_header_template.format(
>+        script_name = os.path.basename(sys.argv[0]),
>+        data_source_name = data_source_name,
>+        year = date.today().year,
>+        file_name = null_functions_header_path,
>+        table_data = "\n".join(null_decls))
>+
>+    with open(null_functions_header_path, "w") as out:
>+        out.write(null_functions_header)
>+
>+    null_functions_source = null_functions_source_template.format(
>+        script_name = os.path.basename(sys.argv[0]),
>+        data_source_name = data_source_name,
>+        year = date.today().year,
>+        file_name = null_functions_source_path,
>+        table_data = "\n\n".join(null_stubs))
>+
>+    with open(null_functions_source_path, "w") as out:
>+        out.write(null_functions_source)
>+    return 0
>+
>+
>+if __name__ == '__main__':
>+    sys.exit(main())
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/gl_bindings_data.json b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/gl_bindings_data.json
>index 10aab37ad96..a2a81d40b79 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/gl_bindings_data.json
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/gl_bindings_data.json
>@@ -790,5 +790,20 @@
>         "InsertEventMarkerEXT",
>         "PushGroupMarkerEXT",
>         "PopGroupMarkerEXT"
>-    ]
>+    ],
>+
>+    "GL_ARB_parallel_shader_compile":
>+    [
>+        "MaxShaderCompilerThreadsARB"
>+    ],
>+
>+    "GL_KHR_parallel_shader_compile":
>+    [
>+        "MaxShaderCompilerThreadsKHR"
>+    ],
>+    
>+    "GL_OVR_multiview2":
>+    [
>+        "FramebufferTextureMultiviewOVR"
>+    ] 
> }
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/glx/DisplayGLX.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/glx/DisplayGLX.cpp
>index 7f6f9764e67..23b4a5c5771 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/glx/DisplayGLX.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/glx/DisplayGLX.cpp
>@@ -18,11 +18,23 @@
> #include "libANGLE/Context.h"
> #include "libANGLE/Display.h"
> #include "libANGLE/Surface.h"
>-#include "libANGLE/renderer/gl/RendererGL.h"
>+#include "libANGLE/renderer/gl/ContextGL.h"
> #include "libANGLE/renderer/gl/glx/PbufferSurfaceGLX.h"
>+#include "libANGLE/renderer/gl/glx/RendererGLX.h"
> #include "libANGLE/renderer/gl/glx/WindowSurfaceGLX.h"
> #include "libANGLE/renderer/gl/renderergl_utils.h"
> 
>+namespace
>+{
>+
>+bool HasParallelShaderCompileExtension(const rx::FunctionsGL *functions)
>+{
>+    return functions->maxShaderCompilerThreadsKHR != nullptr ||
>+           functions->maxShaderCompilerThreadsARB != nullptr;
>+}
>+
>+}  // anonymous namespace
>+
> namespace rx
> {
> 
>@@ -32,26 +44,20 @@ static int IgnoreX11Errors(Display *, XErrorEvent *)
> }
> 
> SwapControlData::SwapControlData()
>-  : targetSwapInterval(0),
>-    maxSwapInterval(-1),
>-    currentSwapInterval(-1)
>-{
>-}
>+    : targetSwapInterval(0), maxSwapInterval(-1), currentSwapInterval(-1)
>+{}
> 
> class FunctionsGLGLX : public FunctionsGL
> {
>   public:
>-    FunctionsGLGLX(PFNGETPROCPROC getProc)
>-      : mGetProc(getProc)
>-    {
>-    }
>+    FunctionsGLGLX(PFNGETPROCPROC getProc) : mGetProc(getProc) {}
> 
>     ~FunctionsGLGLX() override {}
> 
>   private:
>     void *loadProcAddress(const std::string &function) const override
>     {
>-        return reinterpret_cast<void*>(mGetProc(function.c_str()));
>+        return reinterpret_cast<void *>(mGetProc(function.c_str()));
>     }
> 
>     PFNGETPROCPROC mGetProc;
>@@ -59,10 +65,11 @@ class FunctionsGLGLX : public FunctionsGL
> 
> DisplayGLX::DisplayGLX(const egl::DisplayState &state)
>     : DisplayGL(state),
>-      mFunctionsGL(nullptr),
>       mRequestedVisual(-1),
>       mContextConfig(nullptr),
>+      mVisuals(nullptr),
>       mContext(nullptr),
>+      mSharedContext(nullptr),
>       mDummyPbuffer(0),
>       mUsesNewXDisplay(false),
>       mIsMesa(false),
>@@ -78,16 +85,13 @@ DisplayGLX::DisplayGLX(const egl::DisplayState &state)
>       mCurrentDrawable(0),
>       mXDisplay(nullptr),
>       mEGLDisplay(nullptr)
>-{
>-}
>+{}
> 
>-DisplayGLX::~DisplayGLX()
>-{
>-}
>+DisplayGLX::~DisplayGLX() {}
> 
> egl::Error DisplayGLX::initialize(egl::Display *display)
> {
>-    mEGLDisplay = display;
>+    mEGLDisplay           = display;
>     mXDisplay             = display->getNativeDisplayId();
>     const auto &attribMap = display->getAttributeMap();
> 
>@@ -110,9 +114,9 @@ egl::Error DisplayGLX::initialize(egl::Display *display)
>         return egl::EglNotInitialized() << glxInitError;
>     }
> 
>-    mHasMultisample      = mGLX.minorVersion > 3 || mGLX.hasExtension("GLX_ARB_multisample");
>-    mHasARBCreateContext = mGLX.hasExtension("GLX_ARB_create_context");
>-    mHasARBCreateContextProfile    = mGLX.hasExtension("GLX_ARB_create_context_profile");
>+    mHasMultisample             = mGLX.minorVersion > 3 || mGLX.hasExtension("GLX_ARB_multisample");
>+    mHasARBCreateContext        = mGLX.hasExtension("GLX_ARB_create_context");
>+    mHasARBCreateContextProfile = mGLX.hasExtension("GLX_ARB_create_context_profile");
>     mHasARBCreateContextRobustness = mGLX.hasExtension("GLX_ARB_create_context_robustness");
>     mHasEXTCreateContextES2Profile = mGLX.hasExtension("GLX_EXT_create_context_es2_profile");
> 
>@@ -136,19 +140,19 @@ egl::Error DisplayGLX::initialize(egl::Display *display)
>     {
>         // If we have the Mesa or SGI extension, assume that you can at least set
>         // a swap interval of 0 or 1.
>-        mSwapControl = SwapControl::Mesa;
>+        mSwapControl     = SwapControl::Mesa;
>         mMinSwapInterval = 0;
>         mMinSwapInterval = 1;
>     }
>     else if (mGLX.hasExtension("GLX_SGI_swap_control"))
>     {
>-        mSwapControl = SwapControl::SGI;
>+        mSwapControl     = SwapControl::SGI;
>         mMinSwapInterval = 0;
>         mMinSwapInterval = 1;
>     }
>     else
>     {
>-        mSwapControl = SwapControl::Absent;
>+        mSwapControl     = SwapControl::Absent;
>         mMinSwapInterval = 1;
>         mMinSwapInterval = 1;
>     }
>@@ -190,28 +194,19 @@ egl::Error DisplayGLX::initialize(egl::Display *display)
>         // context must be compatible with all the GLXFBConfig corresponding to the
>         // EGLconfigs that we will be exposing.
>         int nConfigs;
>-        int attribList[] =
>-        {
>-            // We want RGBA8 and DEPTH24_STENCIL8
>-            GLX_RED_SIZE, 8,
>-            GLX_GREEN_SIZE, 8,
>-            GLX_BLUE_SIZE, 8,
>-            GLX_ALPHA_SIZE, 8,
>-            GLX_DEPTH_SIZE, 24,
>-            GLX_STENCIL_SIZE, 8,
>-            // We want RGBA rendering (vs COLOR_INDEX) and doublebuffer
>-            GLX_RENDER_TYPE, GLX_RGBA_BIT,
>-            // Double buffer is not strictly required as a non-doublebuffer
>-            // context can work with a doublebuffered surface, but it still
>-            // flickers and all applications want doublebuffer anyway.
>-            GLX_DOUBLEBUFFER, True,
>-            // All of these must be supported for full EGL support
>-            GLX_DRAWABLE_TYPE, GLX_WINDOW_BIT | GLX_PBUFFER_BIT | GLX_PIXMAP_BIT,
>-            // This makes sure the config have an associated visual Id
>-            GLX_X_RENDERABLE, True,
>-            GLX_CONFIG_CAVEAT, GLX_NONE,
>-            None
>-        };
>+        int attribList[]          = {// We want RGBA8 and DEPTH24_STENCIL8
>+                            GLX_RED_SIZE, 8, GLX_GREEN_SIZE, 8, GLX_BLUE_SIZE, 8, GLX_ALPHA_SIZE, 8,
>+                            GLX_DEPTH_SIZE, 24, GLX_STENCIL_SIZE, 8,
>+                            // We want RGBA rendering (vs COLOR_INDEX) and doublebuffer
>+                            GLX_RENDER_TYPE, GLX_RGBA_BIT,
>+                            // Double buffer is not strictly required as a non-doublebuffer
>+                            // context can work with a doublebuffered surface, but it still
>+                            // flickers and all applications want doublebuffer anyway.
>+                            GLX_DOUBLEBUFFER, True,
>+                            // All of these must be supported for full EGL support
>+                            GLX_DRAWABLE_TYPE, GLX_WINDOW_BIT | GLX_PBUFFER_BIT | GLX_PIXMAP_BIT,
>+                            // This makes sure the config have an associated visual Id
>+                            GLX_X_RENDERABLE, True, GLX_CONFIG_CAVEAT, GLX_NONE, None};
>         glx::FBConfig *candidates = mGLX.chooseFBConfig(attribList, &nConfigs);
>         if (nConfigs == 0)
>         {
>@@ -245,22 +240,22 @@ egl::Error DisplayGLX::initialize(egl::Display *display)
>         XVisualInfo visualTemplate;
>         visualTemplate.visualid = getGLXFBConfigAttrib(mContextConfig, GLX_VISUAL_ID);
> 
>-        int numVisuals       = 0;
>-        XVisualInfo *visuals =
>-            XGetVisualInfo(mXDisplay, VisualIDMask, &visualTemplate, &numVisuals);
>+        int numVisuals = 0;
>+        mVisuals       = XGetVisualInfo(mXDisplay, VisualIDMask, &visualTemplate, &numVisuals);
>         if (numVisuals <= 0)
>         {
>             return egl::EglNotInitialized() << "Could not get the visual info from the fb config";
>         }
>         ASSERT(numVisuals == 1);
> 
>-        mContext = mGLX.createContext(&visuals[0], nullptr, true);
>-        XFree(visuals);
>+        mContext = mGLX.createContext(&mVisuals[0], nullptr, true);
> 
>         if (!mContext)
>         {
>             return egl::EglNotInitialized() << "Could not create GL context.";
>         }
>+
>+        mSharedContext = mGLX.createContext(&mVisuals[0], mContext, True);
>     }
>     ASSERT(mContext);
> 
>@@ -274,11 +269,8 @@ egl::Error DisplayGLX::initialize(egl::Display *display)
>     // as commented on https://bugs.freedesktop.org/show_bug.cgi?id=38869 so we
>     // use (1, 1) instead.
> 
>-    int dummyPbufferAttribs[] =
>-    {
>-        GLX_PBUFFER_WIDTH, 1,
>-        GLX_PBUFFER_HEIGHT, 1,
>-        None,
>+    int dummyPbufferAttribs[] = {
>+        GLX_PBUFFER_WIDTH, 1, GLX_PBUFFER_HEIGHT, 1, None,
>     };
>     mDummyPbuffer = mGLX.createPbuffer(mContextConfig, dummyPbufferAttribs);
>     if (!mDummyPbuffer)
>@@ -291,13 +283,13 @@ egl::Error DisplayGLX::initialize(egl::Display *display)
>         return egl::EglNotInitialized() << "Could not make the dummy pbuffer current.";
>     }
> 
>-    mFunctionsGL = new FunctionsGLGLX(mGLX.getProc);
>-    mFunctionsGL->initialize(eglAttributes);
>+    std::unique_ptr<FunctionsGL> functionsGL(new FunctionsGLGLX(mGLX.getProc));
>+    functionsGL->initialize(eglAttributes);
> 
>     // TODO(cwallez, angleproject:1303) Disable the OpenGL ES backend on Linux NVIDIA and Intel as
>     // it has problems on our automated testing. An OpenGL ES backend might not trigger this test if
>     // there is no Desktop OpenGL support, but that's not the case in our automated testing.
>-    VendorID vendor = GetVendorID(mFunctionsGL);
>+    VendorID vendor = GetVendorID(functionsGL.get());
>     bool isOpenGLES =
>         eglAttributes.get(EGL_PLATFORM_ANGLE_TYPE_ANGLE, EGL_PLATFORM_ANGLE_TYPE_DEFAULT_ANGLE) ==
>         EGL_PLATFORM_ANGLE_TYPE_OPENGLES_ANGLE;
>@@ -306,8 +298,37 @@ egl::Error DisplayGLX::initialize(egl::Display *display)
>         return egl::EglNotInitialized() << "Intel or NVIDIA OpenGL ES drivers are not supported.";
>     }
> 
>+    if (mSharedContext)
>+    {
>+        if (HasParallelShaderCompileExtension(functionsGL.get()))
>+        {
>+            mGLX.destroyContext(mSharedContext);
>+            mSharedContext = nullptr;
>+        }
>+        else
>+        {
>+            for (unsigned int i = 0; i < RendererGL::getMaxWorkerContexts(); ++i)
>+            {
>+                glx::Pbuffer workerPbuffer =
>+                    mGLX.createPbuffer(mContextConfig, dummyPbufferAttribs);
>+                if (!workerPbuffer)
>+                {
>+                    return egl::EglNotInitialized() << "Could not create the worker pbuffers.";
>+                }
>+                mWorkerPbufferPool.push_back(workerPbuffer);
>+            }
>+        }
>+    }
>+
>     syncXCommands();
> 
>+    mRenderer.reset(new RendererGLX(std::move(functionsGL), eglAttributes, this));
>+    const gl::Version &maxVersion = mRenderer->getMaxSupportedESVersion();
>+    if (maxVersion < gl::Version(2, 0))
>+    {
>+        return egl::EglNotInitialized() << "OpenGL ES 2.0 is not supportable.";
>+    }
>+
>     return DisplayGL::initialize(display);
> }
> 
>@@ -315,21 +336,44 @@ void DisplayGLX::terminate()
> {
>     DisplayGL::terminate();
> 
>+    if (mVisuals)
>+    {
>+        XFree(mVisuals);
>+        mVisuals = 0;
>+    }
>+
>     if (mDummyPbuffer)
>     {
>         mGLX.destroyPbuffer(mDummyPbuffer);
>         mDummyPbuffer = 0;
>     }
> 
>+    for (auto &workerPbuffer : mWorkerPbufferPool)
>+    {
>+        mGLX.destroyPbuffer(workerPbuffer);
>+    }
>+    mWorkerPbufferPool.clear();
>+
>     if (mContext)
>     {
>         mGLX.destroyContext(mContext);
>         mContext = nullptr;
>     }
> 
>+    if (mSharedContext)
>+    {
>+        mGLX.destroyContext(mSharedContext);
>+        mSharedContext = nullptr;
>+    }
>+
>     mGLX.terminate();
> 
>-    SafeDelete(mFunctionsGL);
>+    mRenderer.reset();
>+
>+    if (mUsesNewXDisplay)
>+    {
>+        XCloseDisplay(mXDisplay);
>+    }
> }
> 
> egl::Error DisplayGLX::makeCurrent(egl::Surface *drawSurface,
>@@ -359,8 +403,7 @@ SurfaceImpl *DisplayGLX::createWindowSurface(const egl::SurfaceState &state,
>     ASSERT(configIdToGLXConfig.count(state.config->configID) > 0);
>     glx::FBConfig fbConfig = configIdToGLXConfig[state.config->configID];
> 
>-    return new WindowSurfaceGLX(state, mGLX, this, getRenderer(), window, mGLX.getDisplay(),
>-                                fbConfig);
>+    return new WindowSurfaceGLX(state, mGLX, this, window, mGLX.getDisplay(), fbConfig);
> }
> 
> SurfaceImpl *DisplayGLX::createPbufferSurface(const egl::SurfaceState &state,
>@@ -371,9 +414,9 @@ SurfaceImpl *DisplayGLX::createPbufferSurface(const egl::SurfaceState &state,
> 
>     EGLint width  = static_cast<EGLint>(attribs.get(EGL_WIDTH, 0));
>     EGLint height = static_cast<EGLint>(attribs.get(EGL_HEIGHT, 0));
>-    bool largest = (attribs.get(EGL_LARGEST_PBUFFER, EGL_FALSE) == EGL_TRUE);
>+    bool largest  = (attribs.get(EGL_LARGEST_PBUFFER, EGL_FALSE) == EGL_TRUE);
> 
>-    return new PbufferSurfaceGLX(state, getRenderer(), width, height, largest, mGLX, fbConfig);
>+    return new PbufferSurfaceGLX(state, width, height, largest, mGLX, fbConfig);
> }
> 
> SurfaceImpl *DisplayGLX::createPbufferFromClientBuffer(const egl::SurfaceState &state,
>@@ -393,10 +436,19 @@ SurfaceImpl *DisplayGLX::createPixmapSurface(const egl::SurfaceState &state,
>     return nullptr;
> }
> 
>-egl::Error DisplayGLX::getDevice(DeviceImpl **device)
>+ContextImpl *DisplayGLX::createContext(const gl::State &state,
>+                                       gl::ErrorSet *errorSet,
>+                                       const egl::Config *configuration,
>+                                       const gl::Context *shareContext,
>+                                       const egl::AttributeMap &attribs)
>+{
>+    return new ContextGL(state, errorSet, mRenderer);
>+}
>+
>+DeviceImpl *DisplayGLX::createDevice()
> {
>     UNIMPLEMENTED();
>-    return egl::EglBadDisplay();
>+    return nullptr;
> }
> 
> egl::Error DisplayGLX::initializeContext(glx::FBConfig config,
>@@ -490,17 +542,13 @@ egl::ConfigSet DisplayGLX::generateConfigs()
>     int contextSampleBuffers =
>         mHasMultisample ? getGLXFBConfigAttrib(mContextConfig, GLX_SAMPLE_BUFFERS) : 0;
> 
>-    int contextAccumRedSize = getGLXFBConfigAttrib(mContextConfig, GLX_ACCUM_RED_SIZE);
>+    int contextAccumRedSize   = getGLXFBConfigAttrib(mContextConfig, GLX_ACCUM_RED_SIZE);
>     int contextAccumGreenSize = getGLXFBConfigAttrib(mContextConfig, GLX_ACCUM_GREEN_SIZE);
>-    int contextAccumBlueSize = getGLXFBConfigAttrib(mContextConfig, GLX_ACCUM_BLUE_SIZE);
>+    int contextAccumBlueSize  = getGLXFBConfigAttrib(mContextConfig, GLX_ACCUM_BLUE_SIZE);
>     int contextAccumAlphaSize = getGLXFBConfigAttrib(mContextConfig, GLX_ACCUM_ALPHA_SIZE);
> 
>-    int attribList[] =
>-    {
>-        GLX_RENDER_TYPE, GLX_RGBA_BIT,
>-        GLX_X_RENDERABLE, True,
>-        GLX_DOUBLEBUFFER, True,
>-        None,
>+    int attribList[] = {
>+        GLX_RENDER_TYPE, GLX_RGBA_BIT, GLX_X_RENDERABLE, True, GLX_DOUBLEBUFFER, True, None,
>     };
> 
>     int glxConfigCount;
>@@ -512,7 +560,7 @@ egl::ConfigSet DisplayGLX::generateConfigs()
>         egl::Config config;
> 
>         // Native stuff
>-        config.nativeVisualID = getGLXFBConfigAttrib(glxConfig, GLX_VISUAL_ID);
>+        config.nativeVisualID   = getGLXFBConfigAttrib(glxConfig, GLX_VISUAL_ID);
>         config.nativeVisualType = getGLXFBConfigAttrib(glxConfig, GLX_X_VISUAL_TYPE);
>         config.nativeRenderable = EGL_TRUE;
> 
>@@ -525,11 +573,11 @@ egl::ConfigSet DisplayGLX::generateConfigs()
>         }
> 
>         // Buffer sizes
>-        config.redSize = getGLXFBConfigAttrib(glxConfig, GLX_RED_SIZE);
>-        config.greenSize = getGLXFBConfigAttrib(glxConfig, GLX_GREEN_SIZE);
>-        config.blueSize = getGLXFBConfigAttrib(glxConfig, GLX_BLUE_SIZE);
>-        config.alphaSize = getGLXFBConfigAttrib(glxConfig, GLX_ALPHA_SIZE);
>-        config.depthSize = getGLXFBConfigAttrib(glxConfig, GLX_DEPTH_SIZE);
>+        config.redSize     = getGLXFBConfigAttrib(glxConfig, GLX_RED_SIZE);
>+        config.greenSize   = getGLXFBConfigAttrib(glxConfig, GLX_GREEN_SIZE);
>+        config.blueSize    = getGLXFBConfigAttrib(glxConfig, GLX_BLUE_SIZE);
>+        config.alphaSize   = getGLXFBConfigAttrib(glxConfig, GLX_ALPHA_SIZE);
>+        config.depthSize   = getGLXFBConfigAttrib(glxConfig, GLX_DEPTH_SIZE);
>         config.stencilSize = getGLXFBConfigAttrib(glxConfig, GLX_STENCIL_SIZE);
> 
>         // We require RGBA8 and the D24S8 (or no DS buffer)
>@@ -551,8 +599,8 @@ egl::ConfigSet DisplayGLX::generateConfigs()
>         }
> 
>         config.colorBufferType = EGL_RGB_BUFFER;
>-        config.luminanceSize = 0;
>-        config.alphaMaskSize = 0;
>+        config.luminanceSize   = 0;
>+        config.alphaMaskSize   = 0;
> 
>         config.bufferSize = config.redSize + config.greenSize + config.blueSize + config.alphaSize;
> 
>@@ -561,31 +609,30 @@ egl::ConfigSet DisplayGLX::generateConfigs()
>         int sampleBuffers =
>             mHasMultisample ? getGLXFBConfigAttrib(glxConfig, GLX_SAMPLE_BUFFERS) : 0;
> 
>-        int accumRedSize = getGLXFBConfigAttrib(glxConfig, GLX_ACCUM_RED_SIZE);
>+        int accumRedSize   = getGLXFBConfigAttrib(glxConfig, GLX_ACCUM_RED_SIZE);
>         int accumGreenSize = getGLXFBConfigAttrib(glxConfig, GLX_ACCUM_GREEN_SIZE);
>-        int accumBlueSize = getGLXFBConfigAttrib(glxConfig, GLX_ACCUM_BLUE_SIZE);
>+        int accumBlueSize  = getGLXFBConfigAttrib(glxConfig, GLX_ACCUM_BLUE_SIZE);
>         int accumAlphaSize = getGLXFBConfigAttrib(glxConfig, GLX_ACCUM_ALPHA_SIZE);
> 
>-        if (samples != contextSamples ||
>-            sampleBuffers != contextSampleBuffers ||
>-            accumRedSize != contextAccumRedSize ||
>-            accumGreenSize != contextAccumGreenSize ||
>-            accumBlueSize != contextAccumBlueSize ||
>-            accumAlphaSize != contextAccumAlphaSize)
>+        if (samples != contextSamples || sampleBuffers != contextSampleBuffers ||
>+            accumRedSize != contextAccumRedSize || accumGreenSize != contextAccumGreenSize ||
>+            accumBlueSize != contextAccumBlueSize || accumAlphaSize != contextAccumAlphaSize)
>         {
>             continue;
>         }
> 
>-        config.samples = samples;
>+        config.samples       = samples;
>         config.sampleBuffers = sampleBuffers;
> 
>         // Transparency
>         if (getGLXFBConfigAttrib(glxConfig, GLX_TRANSPARENT_TYPE) == GLX_TRANSPARENT_RGB)
>         {
>-            config.transparentType = EGL_TRANSPARENT_RGB;
>+            config.transparentType     = EGL_TRANSPARENT_RGB;
>             config.transparentRedValue = getGLXFBConfigAttrib(glxConfig, GLX_TRANSPARENT_RED_VALUE);
>-            config.transparentGreenValue = getGLXFBConfigAttrib(glxConfig, GLX_TRANSPARENT_GREEN_VALUE);
>-            config.transparentBlueValue = getGLXFBConfigAttrib(glxConfig, GLX_TRANSPARENT_BLUE_VALUE);
>+            config.transparentGreenValue =
>+                getGLXFBConfigAttrib(glxConfig, GLX_TRANSPARENT_GREEN_VALUE);
>+            config.transparentBlueValue =
>+                getGLXFBConfigAttrib(glxConfig, GLX_TRANSPARENT_BLUE_VALUE);
>         }
>         else
>         {
>@@ -593,7 +640,7 @@ egl::ConfigSet DisplayGLX::generateConfigs()
>         }
> 
>         // Pbuffer
>-        config.maxPBufferWidth = getGLXFBConfigAttrib(glxConfig, GLX_MAX_PBUFFER_WIDTH);
>+        config.maxPBufferWidth  = getGLXFBConfigAttrib(glxConfig, GLX_MAX_PBUFFER_WIDTH);
>         config.maxPBufferHeight = getGLXFBConfigAttrib(glxConfig, GLX_MAX_PBUFFER_HEIGHT);
>         config.maxPBufferPixels = getGLXFBConfigAttrib(glxConfig, GLX_MAX_PBUFFER_PIXELS);
> 
>@@ -613,23 +660,23 @@ egl::ConfigSet DisplayGLX::generateConfigs()
>         // Misc
>         config.level = getGLXFBConfigAttrib(glxConfig, GLX_LEVEL);
> 
>-        config.bindToTextureRGB = EGL_FALSE;
>+        config.bindToTextureRGB  = EGL_FALSE;
>         config.bindToTextureRGBA = EGL_FALSE;
> 
>-        int glxDrawable = getGLXFBConfigAttrib(glxConfig, GLX_DRAWABLE_TYPE);
>-        config.surfaceType = 0 |
>-            (glxDrawable & GLX_WINDOW_BIT ? EGL_WINDOW_BIT : 0) |
>-            (glxDrawable & GLX_PBUFFER_BIT ? EGL_PBUFFER_BIT : 0) |
>-            (glxDrawable & GLX_PIXMAP_BIT ? EGL_PIXMAP_BIT : 0);
>+        int glxDrawable    = getGLXFBConfigAttrib(glxConfig, GLX_DRAWABLE_TYPE);
>+        config.surfaceType = 0 | (glxDrawable & GLX_WINDOW_BIT ? EGL_WINDOW_BIT : 0) |
>+                             (glxDrawable & GLX_PBUFFER_BIT ? EGL_PBUFFER_BIT : 0) |
>+                             (glxDrawable & GLX_PIXMAP_BIT ? EGL_PIXMAP_BIT : 0);
> 
>         config.minSwapInterval = mMinSwapInterval;
>         config.maxSwapInterval = mMaxSwapInterval;
> 
>-        // TODO(cwallez) wildly guessing these formats, another TODO says they should be removed anyway
>+        // TODO(cwallez) wildly guessing these formats, another TODO says they should be removed
>+        // anyway
>         config.renderTargetFormat = GL_RGBA8;
>         config.depthStencilFormat = GL_DEPTH24_STENCIL8;
> 
>-        config.conformant = EGL_OPENGL_ES2_BIT | (supportsES3 ? EGL_OPENGL_ES3_BIT_KHR : 0);
>+        config.conformant     = EGL_OPENGL_ES2_BIT | (supportsES3 ? EGL_OPENGL_ES3_BIT_KHR : 0);
>         config.renderableType = config.conformant;
> 
>         // TODO(cwallez) I have no idea what this is
>@@ -637,7 +684,7 @@ egl::ConfigSet DisplayGLX::generateConfigs()
> 
>         config.colorComponentType = EGL_COLOR_COMPONENT_TYPE_FIXED_EXT;
> 
>-        int id = configs.add(config);
>+        int id                  = configs.add(config);
>         configIdToGLXConfig[id] = glxConfig;
>     }
> 
>@@ -650,7 +697,7 @@ bool DisplayGLX::testDeviceLost()
> {
>     if (mHasARBCreateContextRobustness)
>     {
>-        return getRenderer()->getResetStatus() != GL_NO_ERROR;
>+        return mRenderer->getResetStatus() != gl::GraphicsResetStatus::NoError;
>     }
> 
>     return false;
>@@ -689,13 +736,13 @@ std::string DisplayGLX::getVendorString() const
>     return "";
> }
> 
>-egl::Error DisplayGLX::waitClient(const gl::Context *context) const
>+egl::Error DisplayGLX::waitClient(const gl::Context *context)
> {
>     mGLX.waitGL();
>     return egl::NoError();
> }
> 
>-egl::Error DisplayGLX::waitNative(const gl::Context *context, EGLint engine) const
>+egl::Error DisplayGLX::waitNative(const gl::Context *context, EGLint engine)
> {
>     // eglWaitNative is used to notice the driver of changes in X11 for the current surface, such as
>     // changes of the window size. We use this event to update the child window of WindowSurfaceGLX
>@@ -722,6 +769,11 @@ egl::Error DisplayGLX::waitNative(const gl::Context *context, EGLint engine) con
>     return egl::NoError();
> }
> 
>+gl::Version DisplayGLX::getMaxSupportedESVersion() const
>+{
>+    return mRenderer->getMaxSupportedESVersion();
>+}
>+
> void DisplayGLX::syncXCommands() const
> {
>     if (mUsesNewXDisplay)
>@@ -778,11 +830,6 @@ bool DisplayGLX::isValidWindowVisualId(unsigned long visualId) const
>     return mRequestedVisual == -1 || static_cast<unsigned long>(mRequestedVisual) == visualId;
> }
> 
>-const FunctionsGL *DisplayGLX::getFunctionsGL() const
>-{
>-    return mFunctionsGL;
>-}
>-
> void DisplayGLX::generateExtensions(egl::DisplayExtensions *outExtensions) const
> {
>     outExtensions->createContextRobustness = mHasARBCreateContextRobustness;
>@@ -817,34 +864,34 @@ int DisplayGLX::getGLXFBConfigAttrib(glx::FBConfig config, int attrib) const
> egl::Error DisplayGLX::createContextAttribs(glx::FBConfig,
>                                             const Optional<gl::Version> &version,
>                                             int profileMask,
>-                                            glx::Context *context) const
>+                                            glx::Context *context)
> {
>-    std::vector<int> attribs;
>+    mAttribs.clear();
> 
>     if (mHasARBCreateContextRobustness)
>     {
>-        attribs.push_back(GLX_CONTEXT_FLAGS_ARB);
>-        attribs.push_back(GLX_CONTEXT_ROBUST_ACCESS_BIT_ARB);
>-        attribs.push_back(GLX_CONTEXT_RESET_NOTIFICATION_STRATEGY_ARB);
>-        attribs.push_back(GLX_LOSE_CONTEXT_ON_RESET_ARB);
>+        mAttribs.push_back(GLX_CONTEXT_FLAGS_ARB);
>+        mAttribs.push_back(GLX_CONTEXT_ROBUST_ACCESS_BIT_ARB);
>+        mAttribs.push_back(GLX_CONTEXT_RESET_NOTIFICATION_STRATEGY_ARB);
>+        mAttribs.push_back(GLX_LOSE_CONTEXT_ON_RESET_ARB);
>     }
> 
>     if (version.valid())
>     {
>-        attribs.push_back(GLX_CONTEXT_MAJOR_VERSION_ARB);
>-        attribs.push_back(version.value().major);
>+        mAttribs.push_back(GLX_CONTEXT_MAJOR_VERSION_ARB);
>+        mAttribs.push_back(version.value().major);
> 
>-        attribs.push_back(GLX_CONTEXT_MINOR_VERSION_ARB);
>-        attribs.push_back(version.value().minor);
>+        mAttribs.push_back(GLX_CONTEXT_MINOR_VERSION_ARB);
>+        mAttribs.push_back(version.value().minor);
>     }
> 
>     if (profileMask != 0 && mHasARBCreateContextProfile)
>     {
>-        attribs.push_back(GLX_CONTEXT_PROFILE_MASK_ARB);
>-        attribs.push_back(profileMask);
>+        mAttribs.push_back(GLX_CONTEXT_PROFILE_MASK_ARB);
>+        mAttribs.push_back(profileMask);
>     }
> 
>-    attribs.push_back(None);
>+    mAttribs.push_back(None);
> 
>     // When creating a context with glXCreateContextAttribsARB, a variety of X11 errors can
>     // be generated. To prevent these errors from crashing our process, we simply ignore
>@@ -853,14 +900,95 @@ egl::Error DisplayGLX::createContextAttribs(glx::FBConfig,
>     // (the error handler is NOT per-display).
>     XSync(mXDisplay, False);
>     auto oldErrorHandler = XSetErrorHandler(IgnoreX11Errors);
>-    *context = mGLX.createContextAttribsARB(mContextConfig, nullptr, True, attribs.data());
>+    *context = mGLX.createContextAttribsARB(mContextConfig, nullptr, True, mAttribs.data());
>     XSetErrorHandler(oldErrorHandler);
> 
>     if (!*context)
>     {
>         return egl::EglNotInitialized() << "Could not create GL context.";
>     }
>+
>+    mSharedContext = mGLX.createContextAttribsARB(mContextConfig, mContext, True, mAttribs.data());
>+
>     return egl::NoError();
> }
> 
>+class WorkerContextGLX final : public WorkerContext
>+{
>+  public:
>+    WorkerContextGLX(glx::Context context, FunctionsGLX *functions, glx::Pbuffer buffer);
>+    ~WorkerContextGLX() override;
>+
>+    bool makeCurrent() override;
>+    void unmakeCurrent() override;
>+
>+  private:
>+    glx::Context mContext;
>+    FunctionsGLX *mFunctions;
>+    glx::Pbuffer mBuffer;
>+};
>+
>+WorkerContextGLX::WorkerContextGLX(glx::Context context,
>+                                   FunctionsGLX *functions,
>+                                   glx::Pbuffer buffer)
>+    : mContext(context), mFunctions(functions), mBuffer(buffer)
>+{}
>+
>+WorkerContextGLX::~WorkerContextGLX()
>+{
>+    mFunctions->destroyContext(mContext);
>+    mFunctions->destroyPbuffer(mBuffer);
> }
>+
>+bool WorkerContextGLX::makeCurrent()
>+{
>+    Bool result = mFunctions->makeCurrent(mBuffer, mContext);
>+    if (result != True)
>+    {
>+        ERR() << "Unable to make the GLX context current.";
>+        return false;
>+    }
>+    return true;
>+}
>+
>+void WorkerContextGLX::unmakeCurrent()
>+{
>+    mFunctions->makeCurrent(0, nullptr);
>+}
>+
>+WorkerContext *DisplayGLX::createWorkerContext(std::string *infoLog)
>+{
>+    if (!mSharedContext)
>+    {
>+        *infoLog += "No shared context.";
>+        return nullptr;
>+    }
>+    if (mWorkerPbufferPool.empty())
>+    {
>+        *infoLog += "No worker pbuffers.";
>+        return nullptr;
>+    }
>+    glx::Context context = nullptr;
>+    if (mHasARBCreateContext)
>+    {
>+        context =
>+            mGLX.createContextAttribsARB(mContextConfig, mSharedContext, True, mAttribs.data());
>+    }
>+    else
>+    {
>+        context = mGLX.createContext(&mVisuals[0], mSharedContext, True);
>+    }
>+
>+    if (!context)
>+    {
>+        *infoLog += "Unable to create the glx context.";
>+        return nullptr;
>+    }
>+
>+    glx::Pbuffer workerPbuffer = mWorkerPbufferPool.back();
>+    mWorkerPbufferPool.pop_back();
>+
>+    return new WorkerContextGLX(context, &mGLX, workerPbuffer);
>+}
>+
>+}  // namespace rx
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/glx/DisplayGLX.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/glx/DisplayGLX.h
>index 2be457e8784..32b27f1aeb4 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/glx/DisplayGLX.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/glx/DisplayGLX.h
>@@ -20,6 +20,7 @@ namespace rx
> {
> 
> class FunctionsGLX;
>+class WorkerContext;
> 
> // State-tracking data for the swap control to allow DisplayGLX to remember per
> // drawable information for swap control.
>@@ -61,6 +62,12 @@ class DisplayGLX : public DisplayGL
>                                      NativePixmapType nativePixmap,
>                                      const egl::AttributeMap &attribs) override;
> 
>+    ContextImpl *createContext(const gl::State &state,
>+                               gl::ErrorSet *errorSet,
>+                               const egl::Config *configuration,
>+                               const gl::Context *shareContext,
>+                               const egl::AttributeMap &attribs) override;
>+
>     egl::ConfigSet generateConfigs() override;
> 
>     bool testDeviceLost() override;
>@@ -68,12 +75,14 @@ class DisplayGLX : public DisplayGL
> 
>     bool isValidNativeWindow(EGLNativeWindowType window) const override;
> 
>-    egl::Error getDevice(DeviceImpl **device) override;
>+    DeviceImpl *createDevice() override;
> 
>     std::string getVendorString() const override;
> 
>-    egl::Error waitClient(const gl::Context *context) const override;
>-    egl::Error waitNative(const gl::Context *context, EGLint engine) const override;
>+    egl::Error waitClient(const gl::Context *context) override;
>+    egl::Error waitNative(const gl::Context *context, EGLint engine) override;
>+
>+    gl::Version getMaxSupportedESVersion() const override;
> 
>     // Synchronizes with the X server, if the display has been opened by ANGLE.
>     // Calling this is required at the end of every functions that does buffered
>@@ -89,9 +98,9 @@ class DisplayGLX : public DisplayGL
> 
>     bool isValidWindowVisualId(unsigned long visualId) const;
> 
>-  private:
>-    const FunctionsGL *getFunctionsGL() const override;
>+    WorkerContext *createWorkerContext(std::string *infoLog);
> 
>+  private:
>     egl::Error initializeContext(glx::FBConfig config,
>                                  const egl::AttributeMap &eglAttributes,
>                                  glx::Context *context);
>@@ -105,18 +114,23 @@ class DisplayGLX : public DisplayGL
>     egl::Error createContextAttribs(glx::FBConfig,
>                                     const Optional<gl::Version> &version,
>                                     int profileMask,
>-                                    glx::Context *context) const;
>+                                    glx::Context *context);
> 
>-    FunctionsGL *mFunctionsGL;
>+    std::shared_ptr<RendererGL> mRenderer;
> 
>     std::map<int, glx::FBConfig> configIdToGLXConfig;
> 
>     EGLint mRequestedVisual;
>     glx::FBConfig mContextConfig;
>+    std::vector<int> mAttribs;
>+    XVisualInfo *mVisuals;
>     glx::Context mContext;
>+    glx::Context mSharedContext;
>     // A pbuffer the context is current on during ANGLE initialization
>     glx::Pbuffer mDummyPbuffer;
> 
>+    std::vector<glx::Pbuffer> mWorkerPbufferPool;
>+
>     bool mUsesNewXDisplay;
>     bool mIsMesa;
>     bool mHasMultisample;
>@@ -144,6 +158,6 @@ class DisplayGLX : public DisplayGL
>     egl::Display *mEGLDisplay;
> };
> 
>-}
>+}  // namespace rx
> 
>-#endif // LIBANGLE_RENDERER_GL_GLX_DISPLAYGLX_H_
>+#endif  // LIBANGLE_RENDERER_GL_GLX_DISPLAYGLX_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/glx/FunctionsGLX.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/glx/FunctionsGLX.cpp
>index 4ec38dd813e..1304622e9f0 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/glx/FunctionsGLX.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/glx/FunctionsGLX.cpp
>@@ -23,9 +23,9 @@
> namespace rx
> {
> 
>-void* FunctionsGLX::sLibHandle = nullptr;
>+void *FunctionsGLX::sLibHandle = nullptr;
> 
>-template<typename T>
>+template <typename T>
> static bool GetProc(PFNGETPROCPROC getProc, T *member, const char *name)
> {
>     *member = reinterpret_cast<T>(getProc(name));
>@@ -60,8 +60,7 @@ struct FunctionsGLX::GLXFunctionTable
>           swapIntervalEXTPtr(nullptr),
>           swapIntervalMESAPtr(nullptr),
>           swapIntervalSGIPtr(nullptr)
>-    {
>-    }
>+    {}
> 
>     // GLX 1.0
>     PFNGLXCREATECONTEXTPROC createContextPtr;
>@@ -79,7 +78,7 @@ struct FunctionsGLX::GLXFunctionTable
>     PFNGLXGETCLIENTSTRINGPROC getClientStringPtr;
>     PFNGLXQUERYEXTENSIONSSTRINGPROC queryExtensionsStringPtr;
> 
>-    //GLX 1.3
>+    // GLX 1.3
>     PFNGLXGETFBCONFIGSPROC getFBConfigsPtr;
>     PFNGLXCHOOSEFBCONFIGPROC chooseFBConfigPtr;
>     PFNGLXGETFBCONFIGATTRIBPROC getFBConfigAttribPtr;
>@@ -104,13 +103,12 @@ struct FunctionsGLX::GLXFunctionTable
> };
> 
> FunctionsGLX::FunctionsGLX()
>-  : majorVersion(0),
>-    minorVersion(0),
>-    mXDisplay(nullptr),
>-    mXScreen(-1),
>-    mFnPtrs(new GLXFunctionTable())
>-{
>-}
>+    : majorVersion(0),
>+      minorVersion(0),
>+      mXDisplay(nullptr),
>+      mXScreen(-1),
>+      mFnPtrs(new GLXFunctionTable())
>+{}
> 
> FunctionsGLX::~FunctionsGLX()
> {
>@@ -122,7 +120,7 @@ bool FunctionsGLX::initialize(Display *xDisplay, int screen, std::string *errorS
> {
>     terminate();
>     mXDisplay = xDisplay;
>-    mXScreen = screen;
>+    mXScreen  = screen;
> 
> #if !defined(ANGLE_LINK_GLX)
>     // Some OpenGL implementations can't handle having this library
>@@ -152,16 +150,19 @@ bool FunctionsGLX::initialize(Display *xDisplay, int screen, std::string *errorS
>     getProc = reinterpret_cast<PFNGETPROCPROC>(glXGetProcAddress);
> #endif
> 
>-#define GET_PROC_OR_ERROR(MEMBER, NAME) \
>-    if (!GetProc(getProc, MEMBER, #NAME)) \
>-    { \
>-        *errorString = "Could not load GLX entry point " #NAME; \
>-        return false; \
>-    }
>+#define GET_PROC_OR_ERROR(MEMBER, NAME)                             \
>+    do                                                              \
>+    {                                                               \
>+        if (!GetProc(getProc, MEMBER, #NAME))                       \
>+        {                                                           \
>+            *errorString = "Could not load GLX entry point " #NAME; \
>+            return false;                                           \
>+        }                                                           \
>+    } while (0)
> #if !defined(ANGLE_LINK_GLX)
>-#define GET_FNPTR_OR_ERROR(MEMBER, NAME) GET_PROC_OR_ERROR(MEMBER, NAME)
>+#    define GET_FNPTR_OR_ERROR(MEMBER, NAME) GET_PROC_OR_ERROR(MEMBER, NAME)
> #else
>-#define GET_FNPTR_OR_ERROR(MEMBER, NAME) *MEMBER = NAME;
>+#    define GET_FNPTR_OR_ERROR(MEMBER, NAME) *MEMBER = NAME
> #endif
> 
>     // GLX 1.0
>@@ -247,9 +248,7 @@ bool FunctionsGLX::initialize(Display *xDisplay, int screen, std::string *errorS
>     return true;
> }
> 
>-void FunctionsGLX::terminate()
>-{
>-}
>+void FunctionsGLX::terminate() {}
> 
> bool FunctionsGLX::hasExtension(const char *extension) const
> {
>@@ -272,7 +271,7 @@ int FunctionsGLX::getScreen() const
> glx::Context FunctionsGLX::createContext(XVisualInfo *visual, glx::Context share, bool direct) const
> {
>     GLXContext shareCtx = reinterpret_cast<GLXContext>(share);
>-    GLXContext context = mFnPtrs->createContextPtr(mXDisplay, visual, shareCtx, direct);
>+    GLXContext context  = mFnPtrs->createContextPtr(mXDisplay, visual, shareCtx, direct);
>     return reinterpret_cast<glx::Context>(context);
> }
> void FunctionsGLX::destroyContext(glx::Context context) const
>@@ -331,12 +330,12 @@ const char *FunctionsGLX::queryExtensionsString() const
> glx::FBConfig *FunctionsGLX::getFBConfigs(int *nElements) const
> {
>     GLXFBConfig *configs = mFnPtrs->getFBConfigsPtr(mXDisplay, mXScreen, nElements);
>-    return reinterpret_cast<glx::FBConfig*>(configs);
>+    return reinterpret_cast<glx::FBConfig *>(configs);
> }
> glx::FBConfig *FunctionsGLX::chooseFBConfig(const int *attribList, int *nElements) const
> {
>     GLXFBConfig *configs = mFnPtrs->chooseFBConfigPtr(mXDisplay, mXScreen, attribList, nElements);
>-    return reinterpret_cast<glx::FBConfig*>(configs);
>+    return reinterpret_cast<glx::FBConfig *>(configs);
> }
> int FunctionsGLX::getFBConfigAttrib(glx::FBConfig config, int attribute, int *value) const
> {
>@@ -348,7 +347,9 @@ XVisualInfo *FunctionsGLX::getVisualFromFBConfig(glx::FBConfig config) const
>     GLXFBConfig cfg = reinterpret_cast<GLXFBConfig>(config);
>     return mFnPtrs->getVisualFromFBConfigPtr(mXDisplay, cfg);
> }
>-GLXWindow FunctionsGLX::createWindow(glx::FBConfig config, Window window, const int *attribList) const
>+GLXWindow FunctionsGLX::createWindow(glx::FBConfig config,
>+                                     Window window,
>+                                     const int *attribList) const
> {
>     GLXFBConfig cfg = reinterpret_cast<GLXFBConfig>(config);
>     return mFnPtrs->createWindowPtr(mXDisplay, cfg, window, attribList);
>@@ -372,11 +373,15 @@ void FunctionsGLX::queryDrawable(glx::Drawable drawable, int attribute, unsigned
> }
> 
> // GLX_ARB_create_context
>-glx::Context FunctionsGLX::createContextAttribsARB(glx::FBConfig config, glx::Context shareContext, Bool direct, const int *attribList) const
>+glx::Context FunctionsGLX::createContextAttribsARB(glx::FBConfig config,
>+                                                   glx::Context shareContext,
>+                                                   Bool direct,
>+                                                   const int *attribList) const
> {
>     GLXContext shareCtx = reinterpret_cast<GLXContext>(shareContext);
>-    GLXFBConfig cfg = reinterpret_cast<GLXFBConfig>(config);
>-    GLXContext ctx = mFnPtrs->createContextAttribsARBPtr(mXDisplay, cfg, shareCtx, direct, attribList);
>+    GLXFBConfig cfg     = reinterpret_cast<GLXFBConfig>(config);
>+    GLXContext ctx =
>+        mFnPtrs->createContextAttribsARBPtr(mXDisplay, cfg, shareCtx, direct, attribList);
>     return reinterpret_cast<glx::Context>(ctx);
> }
> 
>@@ -395,4 +400,4 @@ int FunctionsGLX::swapIntervalSGI(int intervals) const
>     return mFnPtrs->swapIntervalSGIPtr(intervals);
> }
> 
>-}
>+}  // namespace rx
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/glx/FunctionsGLX.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/glx/FunctionsGLX.h
>index 98c2fef4650..33a444f5f25 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/glx/FunctionsGLX.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/glx/FunctionsGLX.h
>@@ -64,7 +64,10 @@ class FunctionsGLX
>     void queryDrawable(glx::Drawable drawable, int attribute, unsigned int *value) const;
> 
>     // GLX_ARB_create_context
>-    glx::Context createContextAttribsARB(glx::FBConfig config, glx::Context shareContext, Bool direct, const int *attribList) const;
>+    glx::Context createContextAttribsARB(glx::FBConfig config,
>+                                         glx::Context shareContext,
>+                                         Bool direct,
>+                                         const int *attribList) const;
> 
>     // GLX_EXT_swap_control
>     void swapIntervalEXT(glx::Drawable drawable, int interval) const;
>@@ -78,8 +81,8 @@ class FunctionsGLX
>   private:
>     // So as to isolate GLX from angle we do not include angleutils.h and cannot
>     // use angle::NonCopyable so we replicated it here instead.
>-    FunctionsGLX(const FunctionsGLX&) = delete;
>-    void operator=(const FunctionsGLX&) = delete;
>+    FunctionsGLX(const FunctionsGLX &) = delete;
>+    void operator=(const FunctionsGLX &) = delete;
> 
>     struct GLXFunctionTable;
> 
>@@ -91,6 +94,6 @@ class FunctionsGLX
>     std::vector<std::string> mExtensions;
> };
> 
>-}
>+}  // namespace rx
> 
>-#endif // LIBANGLE_RENDERER_GL_GLX_FUNCTIONSGLX_H_
>+#endif  // LIBANGLE_RENDERER_GL_GLX_FUNCTIONSGLX_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/glx/PbufferSurfaceGLX.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/glx/PbufferSurfaceGLX.cpp
>index 4993f36caac..ace7104b285 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/glx/PbufferSurfaceGLX.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/glx/PbufferSurfaceGLX.cpp
>@@ -16,21 +16,19 @@ namespace rx
> {
> 
> PbufferSurfaceGLX::PbufferSurfaceGLX(const egl::SurfaceState &state,
>-                                     RendererGL *renderer,
>                                      EGLint width,
>                                      EGLint height,
>                                      bool largest,
>                                      const FunctionsGLX &glx,
>                                      glx::FBConfig fbConfig)
>-    : SurfaceGLX(state, renderer),
>+    : SurfaceGLX(state),
>       mWidth(width),
>       mHeight(height),
>       mLargest(largest),
>       mGLX(glx),
>       mFBConfig(fbConfig),
>       mPbuffer(0)
>-{
>-}
>+{}
> 
> PbufferSurfaceGLX::~PbufferSurfaceGLX()
> {
>@@ -45,16 +43,11 @@ egl::Error PbufferSurfaceGLX::initialize(const egl::Display *display)
>     // Avoid creating 0-sized PBuffers as it fails on the Intel Mesa driver
>     // as commented on https://bugs.freedesktop.org/show_bug.cgi?id=38869 so we
>     // use (w, 1) or (1, h) instead.
>-    int width = std::max(1, static_cast<int>(mWidth));
>+    int width  = std::max(1, static_cast<int>(mWidth));
>     int height = std::max(1, static_cast<int>(mHeight));
> 
>-    const int attribs[] =
>-    {
>-        GLX_PBUFFER_WIDTH, width,
>-        GLX_PBUFFER_HEIGHT, height,
>-        GLX_LARGEST_PBUFFER, mLargest,
>-        None
>-    };
>+    const int attribs[] = {
>+        GLX_PBUFFER_WIDTH, width, GLX_PBUFFER_HEIGHT, height, GLX_LARGEST_PBUFFER, mLargest, None};
> 
>     mPbuffer = mGLX.createPbuffer(mFBConfig, attribs);
>     if (!mPbuffer)
>@@ -71,7 +64,7 @@ egl::Error PbufferSurfaceGLX::initialize(const egl::Display *display)
>     return egl::NoError();
> }
> 
>-egl::Error PbufferSurfaceGLX::makeCurrent()
>+egl::Error PbufferSurfaceGLX::makeCurrent(const gl::Context *context)
> {
>     return egl::NoError();
> }
>@@ -96,21 +89,21 @@ egl::Error PbufferSurfaceGLX::querySurfacePointerANGLE(EGLint attribute, void **
>     return egl::NoError();
> }
> 
>-egl::Error PbufferSurfaceGLX::bindTexImage(gl::Texture *texture, EGLint buffer)
>+egl::Error PbufferSurfaceGLX::bindTexImage(const gl::Context *context,
>+                                           gl::Texture *texture,
>+                                           EGLint buffer)
> {
>     UNIMPLEMENTED();
>     return egl::NoError();
> }
> 
>-egl::Error PbufferSurfaceGLX::releaseTexImage(EGLint buffer)
>+egl::Error PbufferSurfaceGLX::releaseTexImage(const gl::Context *context, EGLint buffer)
> {
>     UNIMPLEMENTED();
>     return egl::NoError();
> }
> 
>-void PbufferSurfaceGLX::setSwapInterval(EGLint interval)
>-{
>-}
>+void PbufferSurfaceGLX::setSwapInterval(EGLint interval) {}
> 
> EGLint PbufferSurfaceGLX::getWidth() const
> {
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/glx/PbufferSurfaceGLX.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/glx/PbufferSurfaceGLX.h
>index 797107125ca..bf4bd1ad0e6 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/glx/PbufferSurfaceGLX.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/glx/PbufferSurfaceGLX.h
>@@ -9,8 +9,8 @@
> #ifndef LIBANGLE_RENDERER_GL_GLX_PBUFFERSURFACEGLX_H_
> #define LIBANGLE_RENDERER_GL_GLX_PBUFFERSURFACEGLX_H_
> 
>-#include "libANGLE/renderer/gl/glx/platform_glx.h"
> #include "libANGLE/renderer/gl/glx/SurfaceGLX.h"
>+#include "libANGLE/renderer/gl/glx/platform_glx.h"
> 
> namespace rx
> {
>@@ -21,7 +21,6 @@ class PbufferSurfaceGLX : public SurfaceGLX
> {
>   public:
>     PbufferSurfaceGLX(const egl::SurfaceState &state,
>-                      RendererGL *renderer,
>                       EGLint width,
>                       EGLint height,
>                       bool largest,
>@@ -30,7 +29,7 @@ class PbufferSurfaceGLX : public SurfaceGLX
>     ~PbufferSurfaceGLX() override;
> 
>     egl::Error initialize(const egl::Display *display) override;
>-    egl::Error makeCurrent() override;
>+    egl::Error makeCurrent(const gl::Context *context) override;
> 
>     egl::Error swap(const gl::Context *context) override;
>     egl::Error postSubBuffer(const gl::Context *context,
>@@ -39,8 +38,10 @@ class PbufferSurfaceGLX : public SurfaceGLX
>                              EGLint width,
>                              EGLint height) override;
>     egl::Error querySurfacePointerANGLE(EGLint attribute, void **value) override;
>-    egl::Error bindTexImage(gl::Texture *texture, EGLint buffer) override;
>-    egl::Error releaseTexImage(EGLint buffer) override;
>+    egl::Error bindTexImage(const gl::Context *context,
>+                            gl::Texture *texture,
>+                            EGLint buffer) override;
>+    egl::Error releaseTexImage(const gl::Context *context, EGLint buffer) override;
>     void setSwapInterval(EGLint interval) override;
> 
>     EGLint getWidth() const override;
>@@ -64,4 +65,4 @@ class PbufferSurfaceGLX : public SurfaceGLX
> 
> }  // namespace rx
> 
>-#endif // LIBANGLE_RENDERER_GL_GLX_PBUFFERSURFACEGLX_H_
>+#endif  // LIBANGLE_RENDERER_GL_GLX_PBUFFERSURFACEGLX_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/glx/RendererGLX.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/glx/RendererGLX.cpp
>new file mode 100644
>index 00000000000..fa47ab77098
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/glx/RendererGLX.cpp
>@@ -0,0 +1,29 @@
>+//
>+// Copyright 2019 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+
>+// RendererGLX.cpp: Implements the class methods for RendererGLX.
>+
>+#include "libANGLE/renderer/gl/glx/RendererGLX.h"
>+
>+#include "libANGLE/renderer/gl/glx/DisplayGLX.h"
>+
>+namespace rx
>+{
>+
>+RendererGLX::RendererGLX(std::unique_ptr<FunctionsGL> functions,
>+                         const egl::AttributeMap &attribMap,
>+                         DisplayGLX *display)
>+    : RendererGL(std::move(functions), attribMap), mDisplay(display)
>+{}
>+
>+RendererGLX::~RendererGLX() {}
>+
>+WorkerContext *RendererGLX::createWorkerContext(std::string *infoLog)
>+{
>+    return mDisplay->createWorkerContext(infoLog);
>+}
>+
>+}  // namespace rx
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/glx/RendererGLX.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/glx/RendererGLX.h
>new file mode 100644
>index 00000000000..c337b3d0c76
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/glx/RendererGLX.h
>@@ -0,0 +1,35 @@
>+//
>+// Copyright 2019 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+
>+// RendererGLX.h: implements createWorkerContext for RendererGL.
>+
>+#ifndef LIBANGLE_RENDERER_GL_GLX_RENDERERGLX_H_
>+#define LIBANGLE_RENDERER_GL_GLX_RENDERERGLX_H_
>+
>+#include "libANGLE/renderer/gl/RendererGL.h"
>+
>+namespace rx
>+{
>+
>+class DisplayGLX;
>+
>+class RendererGLX : public RendererGL
>+{
>+  public:
>+    RendererGLX(std::unique_ptr<FunctionsGL> functions,
>+                const egl::AttributeMap &attribMap,
>+                DisplayGLX *display);
>+    ~RendererGLX() override;
>+
>+  private:
>+    WorkerContext *createWorkerContext(std::string *infoLog) override;
>+
>+    DisplayGLX *mDisplay;
>+};
>+
>+}  // namespace rx
>+
>+#endif  // LIBANGLE_RENDERER_GL_GLX_RENDERERGLX_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/glx/SurfaceGLX.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/glx/SurfaceGLX.h
>index 0d2d0bc5700..f10864315fc 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/glx/SurfaceGLX.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/glx/SurfaceGLX.h
>@@ -10,6 +10,7 @@
> #define LIBANGLE_RENDERER_GL_GLX_SURFACEGLX_H_
> 
> #include "libANGLE/renderer/gl/SurfaceGL.h"
>+#include "libANGLE/renderer/gl/glx/platform_glx.h"
> 
> namespace rx
> {
>@@ -17,11 +18,11 @@ namespace rx
> class SurfaceGLX : public SurfaceGL
> {
>   public:
>-    SurfaceGLX(const egl::SurfaceState &state, RendererGL *renderer) : SurfaceGL(state, renderer) {}
>+    SurfaceGLX(const egl::SurfaceState &state) : SurfaceGL(state) {}
> 
>-    virtual egl::Error checkForResize() = 0;
>+    virtual egl::Error checkForResize()       = 0;
>     virtual glx::Drawable getDrawable() const = 0;
> };
>-}
>+}  // namespace rx
> 
> #endif  // LIBANGLE_RENDERER_GL_GLX_SURFACEGLX_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/glx/WindowSurfaceGLX.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/glx/WindowSurfaceGLX.cpp
>index 06e3c45c436..7ac2054b2bd 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/glx/WindowSurfaceGLX.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/glx/WindowSurfaceGLX.cpp
>@@ -24,11 +24,10 @@ static int IgnoreX11Errors(Display *, XErrorEvent *)
> WindowSurfaceGLX::WindowSurfaceGLX(const egl::SurfaceState &state,
>                                    const FunctionsGLX &glx,
>                                    DisplayGLX *glxDisplay,
>-                                   RendererGL *renderer,
>                                    Window window,
>                                    Display *display,
>                                    glx::FBConfig fbConfig)
>-    : SurfaceGLX(state, renderer),
>+    : SurfaceGLX(state),
>       mParent(window),
>       mWindow(0),
>       mDisplay(display),
>@@ -36,8 +35,7 @@ WindowSurfaceGLX::WindowSurfaceGLX(const egl::SurfaceState &state,
>       mGLXDisplay(glxDisplay),
>       mFBConfig(fbConfig),
>       mGLXWindow(0)
>-{
>-}
>+{}
> 
> WindowSurfaceGLX::~WindowSurfaceGLX()
> {
>@@ -87,7 +85,7 @@ egl::Error WindowSurfaceGLX::initialize(const egl::Display *display)
>     {
>         return egl::EglBadNativeWindow() << "Failed to get the XVisualInfo for the child window.";
>     }
>-    Visual* visual = visualInfo->visual;
>+    Visual *visual = visualInfo->visual;
> 
>     if (!getWindowDimensions(mParent, &mParentWidth, &mParentHeight))
>     {
>@@ -105,17 +103,17 @@ egl::Error WindowSurfaceGLX::initialize(const egl::Display *display)
>     unsigned long attributeMask = CWColormap | CWBorderPixel;
> 
>     Colormap colormap = XCreateColormap(mDisplay, mParent, visual, AllocNone);
>-    if(!colormap)
>+    if (!colormap)
>     {
>         XFree(visualInfo);
>         return egl::EglBadNativeWindow() << "Failed to create the Colormap for the child window.";
>     }
>-    attributes.colormap = colormap;
>+    attributes.colormap     = colormap;
>     attributes.border_pixel = 0;
> 
>-    //TODO(cwallez) set up our own error handler to see if the call failed
>-    mWindow = XCreateWindow(mDisplay, mParent, 0, 0, mParentWidth, mParentHeight,
>-                            0, visualInfo->depth, InputOutput, visual, attributeMask, &attributes);
>+    // TODO(cwallez) set up our own error handler to see if the call failed
>+    mWindow    = XCreateWindow(mDisplay, mParent, 0, 0, mParentWidth, mParentHeight, 0,
>+                            visualInfo->depth, InputOutput, visual, attributeMask, &attributes);
>     mGLXWindow = mGLX.createWindow(mFBConfig, mWindow, nullptr);
> 
>     XMapWindow(mDisplay, mWindow);
>@@ -129,7 +127,7 @@ egl::Error WindowSurfaceGLX::initialize(const egl::Display *display)
>     return egl::NoError();
> }
> 
>-egl::Error WindowSurfaceGLX::makeCurrent()
>+egl::Error WindowSurfaceGLX::makeCurrent(const gl::Context *context)
> {
>     return egl::NoError();
> }
>@@ -166,13 +164,15 @@ egl::Error WindowSurfaceGLX::querySurfacePointerANGLE(EGLint attribute, void **v
>     return egl::NoError();
> }
> 
>-egl::Error WindowSurfaceGLX::bindTexImage(gl::Texture *texture, EGLint buffer)
>+egl::Error WindowSurfaceGLX::bindTexImage(const gl::Context *context,
>+                                          gl::Texture *texture,
>+                                          EGLint buffer)
> {
>     UNIMPLEMENTED();
>     return egl::NoError();
> }
> 
>-egl::Error WindowSurfaceGLX::releaseTexImage(EGLint buffer)
>+egl::Error WindowSurfaceGLX::releaseTexImage(const gl::Context *context, EGLint buffer)
> {
>     UNIMPLEMENTED();
>     return egl::NoError();
>@@ -203,7 +203,7 @@ EGLint WindowSurfaceGLX::isPostSubBufferSupported() const
> 
> EGLint WindowSurfaceGLX::getSwapBehavior() const
> {
>-    return EGL_BUFFER_PRESERVED;
>+    return EGL_BUFFER_DESTROYED;
> }
> 
> egl::Error WindowSurfaceGLX::checkForResize()
>@@ -234,7 +234,9 @@ glx::Drawable WindowSurfaceGLX::getDrawable() const
>     return mGLXWindow;
> }
> 
>-bool WindowSurfaceGLX::getWindowDimensions(Window window, unsigned int *width, unsigned int *height) const
>+bool WindowSurfaceGLX::getWindowDimensions(Window window,
>+                                           unsigned int *width,
>+                                           unsigned int *height) const
> {
>     Window root;
>     int x, y;
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/glx/WindowSurfaceGLX.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/glx/WindowSurfaceGLX.h
>index 549afc24563..7935a27b8e7 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/glx/WindowSurfaceGLX.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/glx/WindowSurfaceGLX.h
>@@ -10,8 +10,8 @@
> #define LIBANGLE_RENDERER_GL_GLX_WINDOWSURFACEGLX_H_
> 
> #include "libANGLE/renderer/gl/glx/DisplayGLX.h"
>-#include "libANGLE/renderer/gl/glx/platform_glx.h"
> #include "libANGLE/renderer/gl/glx/SurfaceGLX.h"
>+#include "libANGLE/renderer/gl/glx/platform_glx.h"
> 
> namespace rx
> {
>@@ -25,14 +25,13 @@ class WindowSurfaceGLX : public SurfaceGLX
>     WindowSurfaceGLX(const egl::SurfaceState &state,
>                      const FunctionsGLX &glx,
>                      DisplayGLX *glxDisplay,
>-                     RendererGL *renderer,
>                      Window window,
>                      Display *display,
>                      glx::FBConfig fbConfig);
>     ~WindowSurfaceGLX() override;
> 
>     egl::Error initialize(const egl::Display *display) override;
>-    egl::Error makeCurrent() override;
>+    egl::Error makeCurrent(const gl::Context *context) override;
> 
>     egl::Error swap(const gl::Context *context) override;
>     egl::Error postSubBuffer(const gl::Context *context,
>@@ -41,8 +40,10 @@ class WindowSurfaceGLX : public SurfaceGLX
>                              EGLint width,
>                              EGLint height) override;
>     egl::Error querySurfacePointerANGLE(EGLint attribute, void **value) override;
>-    egl::Error bindTexImage(gl::Texture *texture, EGLint buffer) override;
>-    egl::Error releaseTexImage(EGLint buffer) override;
>+    egl::Error bindTexImage(const gl::Context *context,
>+                            gl::Texture *texture,
>+                            EGLint buffer) override;
>+    egl::Error releaseTexImage(const gl::Context *context, EGLint buffer) override;
>     void setSwapInterval(EGLint interval) override;
> 
>     EGLint getWidth() const override;
>@@ -73,4 +74,4 @@ class WindowSurfaceGLX : public SurfaceGLX
> 
> }  // namespace rx
> 
>-#endif // LIBANGLE_RENDERER_GL_GLX_WINDOWSURFACEGLX_H_
>+#endif  // LIBANGLE_RENDERER_GL_GLX_WINDOWSURFACEGLX_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/glx/functionsglx_typedefs.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/glx/functionsglx_typedefs.h
>index b0ba033c78c..b71a2094cab 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/glx/functionsglx_typedefs.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/glx/functionsglx_typedefs.h
>@@ -18,35 +18,40 @@ namespace rx
> // functions are already typedefed in glx.h
> 
> // GLX 1.0
>-typedef XVisualInfo *(*PFNGLXCHOOSEVISUALPROC) (Display *dpy, int screen, int *attribList);
>-typedef GLXContext (*PFNGLXCREATECONTEXTPROC) (Display *dpy, XVisualInfo *vis, GLXContext shareList, Bool direct);
>-typedef void (*PFNGLXDESTROYCONTEXTPROC) (Display *dpy, GLXContext ctx);
>-typedef Bool (*PFNGLXMAKECURRENTPROC) (Display *dpy, GLXDrawable drawable, GLXContext ctx);
>-typedef void (*PFNGLXCOPYCONTEXTPROC) (Display *dpy, GLXContext src, GLXContext dst, unsigned long mask);
>-typedef void (*PFNGLXSWAPBUFFERSPROC) (Display *dpy, GLXDrawable drawable);
>-typedef GLXPixmap (*PFNGLXCREATEGLXPIXMAPPROC) (Display *dpy, XVisualInfo *visual, Pixmap pixmap);
>-typedef void (*PFNGLXDESTROYGLXPIXMAPPROC) (Display *dpy, GLXPixmap pixmap);
>-typedef Bool (*PFNGLXQUERYEXTENSIONPROC) (Display *dpy, int *errorb, int *event);
>-typedef Bool (*PFNGLXQUERYVERSIONPROC) (Display *dpy, int *maj, int *min);
>-typedef Bool (*PFNGLXISDIRECTPROC) (Display *dpy, GLXContext ctx);
>-typedef int (*PFNGLXGETCONFIGPROC) (Display *dpy, XVisualInfo *visual, int attrib, int *value);
>-typedef GLXContext (*PFNGLXGETCURRENTCONTEXTPROC) ();
>-typedef GLXDrawable (*PFNGLXGETCURRENTDRAWABLEPROC) ();
>-typedef GLXContext (*PFNGLXGETCURRENTCONTEXTPROC) ();
>-typedef GLXDrawable (*PFNGLXGETCURRENTDRAWABLEPROC) ();
>-typedef void (*PFNGLXWAITGLPROC) ();
>-typedef void (*PFNGLXWAITXPROC) ();
>-typedef void (*PFNGLXUSEXFONT) (Font font, int first, int count, int list);
>+typedef XVisualInfo *(*PFNGLXCHOOSEVISUALPROC)(Display *dpy, int screen, int *attribList);
>+typedef GLXContext (*PFNGLXCREATECONTEXTPROC)(Display *dpy,
>+                                              XVisualInfo *vis,
>+                                              GLXContext shareList,
>+                                              Bool direct);
>+typedef void (*PFNGLXDESTROYCONTEXTPROC)(Display *dpy, GLXContext ctx);
>+typedef Bool (*PFNGLXMAKECURRENTPROC)(Display *dpy, GLXDrawable drawable, GLXContext ctx);
>+typedef void (*PFNGLXCOPYCONTEXTPROC)(Display *dpy,
>+                                      GLXContext src,
>+                                      GLXContext dst,
>+                                      unsigned long mask);
>+typedef void (*PFNGLXSWAPBUFFERSPROC)(Display *dpy, GLXDrawable drawable);
>+typedef GLXPixmap (*PFNGLXCREATEGLXPIXMAPPROC)(Display *dpy, XVisualInfo *visual, Pixmap pixmap);
>+typedef void (*PFNGLXDESTROYGLXPIXMAPPROC)(Display *dpy, GLXPixmap pixmap);
>+typedef Bool (*PFNGLXQUERYEXTENSIONPROC)(Display *dpy, int *errorb, int *event);
>+typedef Bool (*PFNGLXQUERYVERSIONPROC)(Display *dpy, int *maj, int *min);
>+typedef Bool (*PFNGLXISDIRECTPROC)(Display *dpy, GLXContext ctx);
>+typedef int (*PFNGLXGETCONFIGPROC)(Display *dpy, XVisualInfo *visual, int attrib, int *value);
>+typedef GLXContext (*PFNGLXGETCURRENTCONTEXTPROC)();
>+typedef GLXDrawable (*PFNGLXGETCURRENTDRAWABLEPROC)();
>+typedef GLXContext (*PFNGLXGETCURRENTCONTEXTPROC)();
>+typedef GLXDrawable (*PFNGLXGETCURRENTDRAWABLEPROC)();
>+typedef void (*PFNGLXWAITGLPROC)();
>+typedef void (*PFNGLXWAITXPROC)();
>+typedef void (*PFNGLXUSEXFONT)(Font font, int first, int count, int list);
> 
> // GLX 1.1
>-typedef const char *(*PFNGLXQUERYEXTENSIONSSTRINGPROC) (Display *dpy, int screen);
>-typedef const char *(*PFNGLXQUERYSERVERSTRINGPROC) (Display *dpy, int screen, int name);
>-typedef const char *(*PFNGLXGETCLIENTSTRINGPROC) (Display *dpy, int name);
>-
>+typedef const char *(*PFNGLXQUERYEXTENSIONSSTRINGPROC)(Display *dpy, int screen);
>+typedef const char *(*PFNGLXQUERYSERVERSTRINGPROC)(Display *dpy, int screen, int name);
>+typedef const char *(*PFNGLXGETCLIENTSTRINGPROC)(Display *dpy, int name);
> 
> // GLX 1.2
>-typedef Display *(*PFNGLXGETCURRENTDISPLAYPROC) ();
>+typedef Display *(*PFNGLXGETCURRENTDISPLAYPROC)();
> 
>-}
>+}  // namespace rx
> 
>-#endif // LIBANGLE_RENDERER_GL_GLX_FUNCTIONSGLXTYPEDEFS_H_
>+#endif  // LIBANGLE_RENDERER_GL_GLX_FUNCTIONSGLXTYPEDEFS_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/glx/platform_glx.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/glx/platform_glx.h
>index 3ffb609d555..2c9721dc758 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/glx/platform_glx.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/glx/platform_glx.h
>@@ -11,159 +11,159 @@
> 
> #if !defined(ANGLE_SKIP_GLX_DEFINES)
> // GLX 1.0
>-#define GLX_USE_GL 1
>-#define GLX_BUFFER_SIZE 2
>-#define GLX_LEVEL 3
>-#define GLX_RGBA 4
>-#define GLX_DOUBLEBUFFER 5
>-#define GLX_STEREO 6
>-#define GLX_AUX_BUFFERS 7
>-#define GLX_RED_SIZE 8
>-#define GLX_GREEN_SIZE 9
>-#define GLX_BLUE_SIZE 10
>-#define GLX_ALPHA_SIZE 11
>-#define GLX_DEPTH_SIZE 12
>-#define GLX_STENCIL_SIZE 13
>-#define GLX_ACCUM_RED_SIZE 14
>-#define GLX_ACCUM_GREEN_SIZE 15
>-#define GLX_ACCUM_BLUE_SIZE 16
>-#define GLX_ACCUM_ALPHA_SIZE 17
>-
>-#define GLX_BAD_SCREEN 1
>-#define GLX_BAD_ATTRIBUTE 2
>-#define GLX_NO_EXTENSION 3
>-#define GLX_BAD_VISUAL 4
>-#define GLX_BAD_CONTEXT 5
>-#define GLX_BAD_VALUE 6
>-#define GLX_BAD_ENUM 7
>+#    define GLX_USE_GL 1
>+#    define GLX_BUFFER_SIZE 2
>+#    define GLX_LEVEL 3
>+#    define GLX_RGBA 4
>+#    define GLX_DOUBLEBUFFER 5
>+#    define GLX_STEREO 6
>+#    define GLX_AUX_BUFFERS 7
>+#    define GLX_RED_SIZE 8
>+#    define GLX_GREEN_SIZE 9
>+#    define GLX_BLUE_SIZE 10
>+#    define GLX_ALPHA_SIZE 11
>+#    define GLX_DEPTH_SIZE 12
>+#    define GLX_STENCIL_SIZE 13
>+#    define GLX_ACCUM_RED_SIZE 14
>+#    define GLX_ACCUM_GREEN_SIZE 15
>+#    define GLX_ACCUM_BLUE_SIZE 16
>+#    define GLX_ACCUM_ALPHA_SIZE 17
>+
>+#    define GLX_BAD_SCREEN 1
>+#    define GLX_BAD_ATTRIBUTE 2
>+#    define GLX_NO_EXTENSION 3
>+#    define GLX_BAD_VISUAL 4
>+#    define GLX_BAD_CONTEXT 5
>+#    define GLX_BAD_VALUE 6
>+#    define GLX_BAD_ENUM 7
> 
> // GLX 1.1
>-#define GLX_VENDOR 1
>-#define GLX_VERSION 2
>-#define GLX_EXTENSIONS 3
>+#    define GLX_VENDOR 1
>+#    define GLX_VERSION 2
>+#    define GLX_EXTENSIONS 3
> 
> // GLX 1.3
>-#define GLX_CONFIG_CAVEAT 0x20
>-#define GLX_DONT_CARE 0xFFFFFFFF
>-#define GLX_X_VISUAL_TYPE 0x22
>-#define GLX_TRANSPARENT_TYPE 0x23
>-#define GLX_TRANSPARENT_INDEX_VALUE 0x24
>-#define GLX_TRANSPARENT_RED_VALUE 0x25
>-#define GLX_TRANSPARENT_GREEN_VALUE 0x26
>-#define GLX_TRANSPARENT_BLUE_VALUE 0x27
>-#define GLX_TRANSPARENT_ALPHA_VALUE 0x28
>-#define GLX_WINDOW_BIT 0x00000001
>-#define GLX_PIXMAP_BIT 0x00000002
>-#define GLX_PBUFFER_BIT 0x00000004
>-#define GLX_AUX_BUFFERS_BIT 0x00000010
>-#define GLX_FRONT_LEFT_BUFFER_BIT 0x00000001
>-#define GLX_FRONT_RIGHT_BUFFER_BIT 0x00000002
>-#define GLX_BACK_LEFT_BUFFER_BIT 0x00000004
>-#define GLX_BACK_RIGHT_BUFFER_BIT 0x00000008
>-#define GLX_DEPTH_BUFFER_BIT 0x00000020
>-#define GLX_STENCIL_BUFFER_BIT 0x00000040
>-#define GLX_ACCUM_BUFFER_BIT 0x00000080
>-#define GLX_NONE 0x8000
>-#define GLX_SLOW_CONFIG 0x8001
>-#define GLX_TRUE_COLOR 0x8002
>-#define GLX_DIRECT_COLOR 0x8003
>-#define GLX_PSEUDO_COLOR 0x8004
>-#define GLX_STATIC_COLOR 0x8005
>-#define GLX_GRAY_SCALE 0x8006
>-#define GLX_STATIC_GRAY 0x8007
>-#define GLX_TRANSPARENT_RGB 0x8008
>-#define GLX_TRANSPARENT_INDEX 0x8009
>-#define GLX_VISUAL_ID 0x800B
>-#define GLX_SCREEN 0x800C
>-#define GLX_NON_CONFORMANT_CONFIG 0x800D
>-#define GLX_DRAWABLE_TYPE 0x8010
>-#define GLX_RENDER_TYPE 0x8011
>-#define GLX_X_RENDERABLE 0x8012
>-#define GLX_FBCONFIG_ID 0x8013
>-#define GLX_RGBA_TYPE 0x8014
>-#define GLX_COLOR_INDEX_TYPE 0x8015
>-#define GLX_MAX_PBUFFER_WIDTH 0x8016
>-#define GLX_MAX_PBUFFER_HEIGHT 0x8017
>-#define GLX_MAX_PBUFFER_PIXELS 0x8018
>-#define GLX_PRESERVED_CONTENTS 0x801B
>-#define GLX_LARGEST_PBUFFER 0x801C
>-#define GLX_WIDTH 0x801D
>-#define GLX_HEIGHT 0x801E
>-#define GLX_EVENT_MASK 0x801F
>-#define GLX_DAMAGED 0x8020
>-#define GLX_SAVED 0x8021
>-#define GLX_WINDOW 0x8022
>-#define GLX_PBUFFER 0x8023
>-#define GLX_PBUFFER_HEIGHT 0x8040
>-#define GLX_PBUFFER_WIDTH 0x8041
>-#define GLX_RGBA_BIT 0x00000001
>-#define GLX_COLOR_INDEX_BIT 0x00000002
>-#define GLX_PBUFFER_CLOBBER_MASK 0x08000000
>+#    define GLX_CONFIG_CAVEAT 0x20
>+#    define GLX_DONT_CARE 0xFFFFFFFF
>+#    define GLX_X_VISUAL_TYPE 0x22
>+#    define GLX_TRANSPARENT_TYPE 0x23
>+#    define GLX_TRANSPARENT_INDEX_VALUE 0x24
>+#    define GLX_TRANSPARENT_RED_VALUE 0x25
>+#    define GLX_TRANSPARENT_GREEN_VALUE 0x26
>+#    define GLX_TRANSPARENT_BLUE_VALUE 0x27
>+#    define GLX_TRANSPARENT_ALPHA_VALUE 0x28
>+#    define GLX_WINDOW_BIT 0x00000001
>+#    define GLX_PIXMAP_BIT 0x00000002
>+#    define GLX_PBUFFER_BIT 0x00000004
>+#    define GLX_AUX_BUFFERS_BIT 0x00000010
>+#    define GLX_FRONT_LEFT_BUFFER_BIT 0x00000001
>+#    define GLX_FRONT_RIGHT_BUFFER_BIT 0x00000002
>+#    define GLX_BACK_LEFT_BUFFER_BIT 0x00000004
>+#    define GLX_BACK_RIGHT_BUFFER_BIT 0x00000008
>+#    define GLX_DEPTH_BUFFER_BIT 0x00000020
>+#    define GLX_STENCIL_BUFFER_BIT 0x00000040
>+#    define GLX_ACCUM_BUFFER_BIT 0x00000080
>+#    define GLX_NONE 0x8000
>+#    define GLX_SLOW_CONFIG 0x8001
>+#    define GLX_TRUE_COLOR 0x8002
>+#    define GLX_DIRECT_COLOR 0x8003
>+#    define GLX_PSEUDO_COLOR 0x8004
>+#    define GLX_STATIC_COLOR 0x8005
>+#    define GLX_GRAY_SCALE 0x8006
>+#    define GLX_STATIC_GRAY 0x8007
>+#    define GLX_TRANSPARENT_RGB 0x8008
>+#    define GLX_TRANSPARENT_INDEX 0x8009
>+#    define GLX_VISUAL_ID 0x800B
>+#    define GLX_SCREEN 0x800C
>+#    define GLX_NON_CONFORMANT_CONFIG 0x800D
>+#    define GLX_DRAWABLE_TYPE 0x8010
>+#    define GLX_RENDER_TYPE 0x8011
>+#    define GLX_X_RENDERABLE 0x8012
>+#    define GLX_FBCONFIG_ID 0x8013
>+#    define GLX_RGBA_TYPE 0x8014
>+#    define GLX_COLOR_INDEX_TYPE 0x8015
>+#    define GLX_MAX_PBUFFER_WIDTH 0x8016
>+#    define GLX_MAX_PBUFFER_HEIGHT 0x8017
>+#    define GLX_MAX_PBUFFER_PIXELS 0x8018
>+#    define GLX_PRESERVED_CONTENTS 0x801B
>+#    define GLX_LARGEST_PBUFFER 0x801C
>+#    define GLX_WIDTH 0x801D
>+#    define GLX_HEIGHT 0x801E
>+#    define GLX_EVENT_MASK 0x801F
>+#    define GLX_DAMAGED 0x8020
>+#    define GLX_SAVED 0x8021
>+#    define GLX_WINDOW 0x8022
>+#    define GLX_PBUFFER 0x8023
>+#    define GLX_PBUFFER_HEIGHT 0x8040
>+#    define GLX_PBUFFER_WIDTH 0x8041
>+#    define GLX_RGBA_BIT 0x00000001
>+#    define GLX_COLOR_INDEX_BIT 0x00000002
>+#    define GLX_PBUFFER_CLOBBER_MASK 0x08000000
> 
> // GLX 1.4
>-#define GLX_SAMPLE_BUFFERS 0x186a0
>-#define GLX_SAMPLES 0x186a1
>+#    define GLX_SAMPLE_BUFFERS 0x186a0
>+#    define GLX_SAMPLES 0x186a1
> 
> // GLX_ARB_create_context
>-#define GLX_CONTEXT_DEBUG_BIT_ARB 0x00000001
>-#define GLX_CONTEXT_FORWARD_COMPATIBLE_BIT_ARB 0x00000002
>-#define GLX_CONTEXT_MAJOR_VERSION_ARB 0x2091
>-#define GLX_CONTEXT_MINOR_VERSION_ARB 0x2092
>-#define GLX_CONTEXT_FLAGS_ARB 0x2094
>+#    define GLX_CONTEXT_DEBUG_BIT_ARB 0x00000001
>+#    define GLX_CONTEXT_FORWARD_COMPATIBLE_BIT_ARB 0x00000002
>+#    define GLX_CONTEXT_MAJOR_VERSION_ARB 0x2091
>+#    define GLX_CONTEXT_MINOR_VERSION_ARB 0x2092
>+#    define GLX_CONTEXT_FLAGS_ARB 0x2094
> 
> // GLX_ARB_create_context_profile
>-#define GLX_CONTEXT_CORE_PROFILE_BIT_ARB 0x00000001
>-#define GLX_CONTEXT_COMPATIBILITY_PROFILE_BIT_ARB 0x00000002
>-#define GLX_CONTEXT_PROFILE_MASK_ARB 0x9126
>+#    define GLX_CONTEXT_CORE_PROFILE_BIT_ARB 0x00000001
>+#    define GLX_CONTEXT_COMPATIBILITY_PROFILE_BIT_ARB 0x00000002
>+#    define GLX_CONTEXT_PROFILE_MASK_ARB 0x9126
> 
> // GLX_ARB_create_context_robustness
>-#define GLX_CONTEXT_ROBUST_ACCESS_BIT_ARB 0x00000004
>-#define GLX_LOSE_CONTEXT_ON_RESET_ARB 0x8252
>-#define GLX_CONTEXT_RESET_NOTIFICATION_STRATEGY_ARB 0x8256
>-#define GLX_NO_RESET_NOTIFICATION_ARB 0x8261
>+#    define GLX_CONTEXT_ROBUST_ACCESS_BIT_ARB 0x00000004
>+#    define GLX_LOSE_CONTEXT_ON_RESET_ARB 0x8252
>+#    define GLX_CONTEXT_RESET_NOTIFICATION_STRATEGY_ARB 0x8256
>+#    define GLX_NO_RESET_NOTIFICATION_ARB 0x8261
> 
> // GLX_EXT_create_context_es2_profile
>-#define GLX_CONTEXT_ES2_PROFILE_BIT_EXT 0x00000004
>+#    define GLX_CONTEXT_ES2_PROFILE_BIT_EXT 0x00000004
> 
> // GLX_EXT_texture_from_pixmap
>-#define GLX_TEXTURE_1D_BIT_EXT 0x00000001
>-#define GLX_TEXTURE_2D_BIT_EXT 0x00000002
>-#define GLX_TEXTURE_RECTANGLE_BIT_EXT 0x00000004
>-#define GLX_BIND_TO_TEXTURE_RGB_EXT 0x20D0
>-#define GLX_BIND_TO_TEXTURE_RGBA_EXT 0x20D1
>-#define GLX_BIND_TO_MIPMAP_TEXTURE_EXT 0x20D2
>-#define GLX_BIND_TO_TEXTURE_TARGETS_EXT 0x20D3
>-#define GLX_Y_INVERTED_EXT 0x20D4
>-#define GLX_TEXTURE_FORMAT_EXT 0x20D5
>-#define GLX_TEXTURE_TARGET_EXT 0x20D6
>-#define GLX_MIPMAP_TEXTURE_EXT 0x20D7
>-#define GLX_TEXTURE_FORMAT_NONE_EXT 0x20D8
>-#define GLX_TEXTURE_FORMAT_RGB_EXT 0x20D9
>-#define GLX_TEXTURE_FORMAT_RGBA_EXT 0x20DA
>-#define GLX_TEXTURE_1D_EXT 0x20DB
>-#define GLX_TEXTURE_2D_EXT 0x20DC
>-#define GLX_TEXTURE_RECTANGLE_EXT 0x20DD
>-#define GLX_FRONT_LEFT_EXT 0x20DE
>-#define GLX_FRONT_RIGHT_EXT 0x20DF
>-#define GLX_BACK_LEFT_EXT 0x20E0
>-#define GLX_BACK_RIGHT_EXT 0x20E1
>-#define GLX_FRONT_EXT 0x20DE
>-#define GLX_BACK_EXT 0x20E0
>-#define GLX_AUX0_EXT 0x20E2
>-#define GLX_AUX1_EXT 0x20E3
>-#define GLX_AUX2_EXT 0x20E4
>-#define GLX_AUX3_EXT 0x20E5
>-#define GLX_AUX4_EXT 0x20E6
>-#define GLX_AUX5_EXT 0x20E7
>-#define GLX_AUX6_EXT 0x20E8
>-#define GLX_AUX7_EXT 0x20E9
>-#define GLX_AUX8_EXT 0x20EA
>-#define GLX_AUX9_EXT 0x20EB
>+#    define GLX_TEXTURE_1D_BIT_EXT 0x00000001
>+#    define GLX_TEXTURE_2D_BIT_EXT 0x00000002
>+#    define GLX_TEXTURE_RECTANGLE_BIT_EXT 0x00000004
>+#    define GLX_BIND_TO_TEXTURE_RGB_EXT 0x20D0
>+#    define GLX_BIND_TO_TEXTURE_RGBA_EXT 0x20D1
>+#    define GLX_BIND_TO_MIPMAP_TEXTURE_EXT 0x20D2
>+#    define GLX_BIND_TO_TEXTURE_TARGETS_EXT 0x20D3
>+#    define GLX_Y_INVERTED_EXT 0x20D4
>+#    define GLX_TEXTURE_FORMAT_EXT 0x20D5
>+#    define GLX_TEXTURE_TARGET_EXT 0x20D6
>+#    define GLX_MIPMAP_TEXTURE_EXT 0x20D7
>+#    define GLX_TEXTURE_FORMAT_NONE_EXT 0x20D8
>+#    define GLX_TEXTURE_FORMAT_RGB_EXT 0x20D9
>+#    define GLX_TEXTURE_FORMAT_RGBA_EXT 0x20DA
>+#    define GLX_TEXTURE_1D_EXT 0x20DB
>+#    define GLX_TEXTURE_2D_EXT 0x20DC
>+#    define GLX_TEXTURE_RECTANGLE_EXT 0x20DD
>+#    define GLX_FRONT_LEFT_EXT 0x20DE
>+#    define GLX_FRONT_RIGHT_EXT 0x20DF
>+#    define GLX_BACK_LEFT_EXT 0x20E0
>+#    define GLX_BACK_RIGHT_EXT 0x20E1
>+#    define GLX_FRONT_EXT 0x20DE
>+#    define GLX_BACK_EXT 0x20E0
>+#    define GLX_AUX0_EXT 0x20E2
>+#    define GLX_AUX1_EXT 0x20E3
>+#    define GLX_AUX2_EXT 0x20E4
>+#    define GLX_AUX3_EXT 0x20E5
>+#    define GLX_AUX4_EXT 0x20E6
>+#    define GLX_AUX5_EXT 0x20E7
>+#    define GLX_AUX6_EXT 0x20E8
>+#    define GLX_AUX7_EXT 0x20E9
>+#    define GLX_AUX8_EXT 0x20EA
>+#    define GLX_AUX9_EXT 0x20EB
> 
> // GLX_EXT_swap_control
>-#define GLX_SWAP_INTERVAL_EXT 0x20F1
>-#define GLX_MAX_SWAP_INTERVAL_EXT 0x20F2
>-#endif // !defined(ANGLE_SKIP_GLX_DEFINES)
>+#    define GLX_SWAP_INTERVAL_EXT 0x20F1
>+#    define GLX_MAX_SWAP_INTERVAL_EXT 0x20F2
>+#endif  // !defined(ANGLE_SKIP_GLX_DEFINES)
> 
> // GLX typedefs depend on the X headers
> #include <X11/Xlib.h>
>@@ -183,8 +183,8 @@ typedef XID Pbuffer;
> typedef XID Pixmap;
> typedef XID Drawable;
> 
>-}
>+}  // namespace glx
> 
>-typedef void* (*PFNGETPROCPROC) (const char *name);
>+typedef void *(*PFNGETPROCPROC)(const char *name);
> 
>-#endif // LIBANGLE_RENDERER_GL_GLX_PLATFORMGLX_H_
>+#endif  // LIBANGLE_RENDERER_GL_GLX_PLATFORMGLX_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/null_functions.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/null_functions.cpp
>index ad67e1a4f1b..f629fe823e0 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/null_functions.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/null_functions.cpp
>@@ -1,7 +1,7 @@
> // GENERATED FILE - DO NOT EDIT.
> // Generated by generate_gl_dispatch_table.py using data from gl_bindings_data.json and gl.xml.
> //
>-// Copyright 2017 The ANGLE Project Authors. All rights reserved.
>+// Copyright 2019 The ANGLE Project Authors. All rights reserved.
> // Use of this source code is governed by a BSD-style license that can be
> // found in the LICENSE file.
> //
>@@ -12,57 +12,36 @@
> 
> namespace rx
> {
>-void INTERNAL_GL_APIENTRY glActiveShaderProgramNULL(GLuint pipeline, GLuint program)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glActiveShaderProgramNULL(GLuint pipeline, GLuint program) {}
> 
>-void INTERNAL_GL_APIENTRY glActiveTextureNULL(GLenum texture)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glActiveTextureNULL(GLenum texture) {}
> 
>-void INTERNAL_GL_APIENTRY glAttachShaderNULL(GLuint program, GLuint shader)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glAttachShaderNULL(GLuint program, GLuint shader) {}
> 
>-void INTERNAL_GL_APIENTRY glBeginConditionalRenderNULL(GLuint id, GLenum mode)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glBeginConditionalRenderNULL(GLuint id, GLenum mode) {}
> 
>-void INTERNAL_GL_APIENTRY glBeginQueryNULL(GLenum target, GLuint id)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glBeginQueryNULL(GLenum target, GLuint id) {}
> 
>-void INTERNAL_GL_APIENTRY glBeginQueryIndexedNULL(GLenum target, GLuint index, GLuint id)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glBeginQueryIndexedNULL(GLenum target, GLuint index, GLuint id) {}
> 
>-void INTERNAL_GL_APIENTRY glBeginTransformFeedbackNULL(GLenum primitiveMode)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glBeginTransformFeedbackNULL(GLenum primitiveMode) {}
> 
> void INTERNAL_GL_APIENTRY glBindAttribLocationNULL(GLuint program, GLuint index, const GLchar *name)
>-{
>-}
>+{}
> 
>-void INTERNAL_GL_APIENTRY glBindBufferNULL(GLenum target, GLuint buffer)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glBindBufferNULL(GLenum target, GLuint buffer) {}
> 
>-void INTERNAL_GL_APIENTRY glBindBufferBaseNULL(GLenum target, GLuint index, GLuint buffer)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glBindBufferBaseNULL(GLenum target, GLuint index, GLuint buffer) {}
> 
> void INTERNAL_GL_APIENTRY
> glBindBufferRangeNULL(GLenum target, GLuint index, GLuint buffer, GLintptr offset, GLsizeiptr size)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glBindBuffersBaseNULL(GLenum target,
>                                                 GLuint first,
>                                                 GLsizei count,
>                                                 const GLuint *buffers)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glBindBuffersRangeNULL(GLenum target,
>                                                  GLuint first,
>@@ -70,25 +49,20 @@ void INTERNAL_GL_APIENTRY glBindBuffersRangeNULL(GLenum target,
>                                                  const GLuint *buffers,
>                                                  const GLintptr *offsets,
>                                                  const GLsizeiptr *sizes)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glBindFragDataLocationNULL(GLuint program,
>                                                      GLuint color,
>                                                      const GLchar *name)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glBindFragDataLocationIndexedNULL(GLuint program,
>                                                             GLuint colorNumber,
>                                                             GLuint index,
>                                                             const GLchar *name)
>-{
>-}
>+{}
> 
>-void INTERNAL_GL_APIENTRY glBindFramebufferNULL(GLenum target, GLuint framebuffer)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glBindFramebufferNULL(GLenum target, GLuint framebuffer) {}
> 
> void INTERNAL_GL_APIENTRY glBindImageTextureNULL(GLuint unit,
>                                                  GLuint texture,
>@@ -97,109 +71,71 @@ void INTERNAL_GL_APIENTRY glBindImageTextureNULL(GLuint unit,
>                                                  GLint layer,
>                                                  GLenum access,
>                                                  GLenum format)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glBindImageTexturesNULL(GLuint first,
>                                                   GLsizei count,
>                                                   const GLuint *textures)
>-{
>-}
>+{}
> 
>-void INTERNAL_GL_APIENTRY glBindProgramPipelineNULL(GLuint pipeline)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glBindProgramPipelineNULL(GLuint pipeline) {}
> 
>-void INTERNAL_GL_APIENTRY glBindRenderbufferNULL(GLenum target, GLuint renderbuffer)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glBindRenderbufferNULL(GLenum target, GLuint renderbuffer) {}
> 
>-void INTERNAL_GL_APIENTRY glBindSamplerNULL(GLuint unit, GLuint sampler)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glBindSamplerNULL(GLuint unit, GLuint sampler) {}
> 
>-void INTERNAL_GL_APIENTRY glBindSamplersNULL(GLuint first, GLsizei count, const GLuint *samplers)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glBindSamplersNULL(GLuint first, GLsizei count, const GLuint *samplers) {}
> 
>-void INTERNAL_GL_APIENTRY glBindTextureNULL(GLenum target, GLuint texture)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glBindTextureNULL(GLenum target, GLuint texture) {}
> 
>-void INTERNAL_GL_APIENTRY glBindTextureUnitNULL(GLuint unit, GLuint texture)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glBindTextureUnitNULL(GLuint unit, GLuint texture) {}
> 
>-void INTERNAL_GL_APIENTRY glBindTexturesNULL(GLuint first, GLsizei count, const GLuint *textures)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glBindTexturesNULL(GLuint first, GLsizei count, const GLuint *textures) {}
> 
>-void INTERNAL_GL_APIENTRY glBindTransformFeedbackNULL(GLenum target, GLuint id)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glBindTransformFeedbackNULL(GLenum target, GLuint id) {}
> 
>-void INTERNAL_GL_APIENTRY glBindVertexArrayNULL(GLuint array)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glBindVertexArrayNULL(GLuint array) {}
> 
> void INTERNAL_GL_APIENTRY glBindVertexBufferNULL(GLuint bindingindex,
>                                                  GLuint buffer,
>                                                  GLintptr offset,
>                                                  GLsizei stride)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glBindVertexBuffersNULL(GLuint first,
>                                                   GLsizei count,
>                                                   const GLuint *buffers,
>                                                   const GLintptr *offsets,
>                                                   const GLsizei *strides)
>-{
>-}
>+{}
> 
>-void INTERNAL_GL_APIENTRY glBlendBarrierNULL()
>-{
>-}
>+void INTERNAL_GL_APIENTRY glBlendBarrierNULL() {}
> 
> void INTERNAL_GL_APIENTRY glBlendColorNULL(GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha)
>-{
>-}
>+{}
> 
>-void INTERNAL_GL_APIENTRY glBlendEquationNULL(GLenum mode)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glBlendEquationNULL(GLenum mode) {}
> 
>-void INTERNAL_GL_APIENTRY glBlendEquationSeparateNULL(GLenum modeRGB, GLenum modeAlpha)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glBlendEquationSeparateNULL(GLenum modeRGB, GLenum modeAlpha) {}
> 
> void INTERNAL_GL_APIENTRY glBlendEquationSeparateiNULL(GLuint buf, GLenum modeRGB, GLenum modeAlpha)
>-{
>-}
>+{}
> 
>-void INTERNAL_GL_APIENTRY glBlendEquationiNULL(GLuint buf, GLenum mode)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glBlendEquationiNULL(GLuint buf, GLenum mode) {}
> 
>-void INTERNAL_GL_APIENTRY glBlendFuncNULL(GLenum sfactor, GLenum dfactor)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glBlendFuncNULL(GLenum sfactor, GLenum dfactor) {}
> 
> void INTERNAL_GL_APIENTRY glBlendFuncSeparateNULL(GLenum sfactorRGB,
>                                                   GLenum dfactorRGB,
>                                                   GLenum sfactorAlpha,
>                                                   GLenum dfactorAlpha)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY
> glBlendFuncSeparateiNULL(GLuint buf, GLenum srcRGB, GLenum dstRGB, GLenum srcAlpha, GLenum dstAlpha)
>-{
>-}
>+{}
> 
>-void INTERNAL_GL_APIENTRY glBlendFunciNULL(GLuint buf, GLenum src, GLenum dst)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glBlendFunciNULL(GLuint buf, GLenum src, GLenum dst) {}
> 
> void INTERNAL_GL_APIENTRY glBlitFramebufferNULL(GLint srcX0,
>                                                 GLint srcY0,
>@@ -211,8 +147,7 @@ void INTERNAL_GL_APIENTRY glBlitFramebufferNULL(GLint srcX0,
>                                                 GLint dstY1,
>                                                 GLbitfield mask,
>                                                 GLenum filter)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glBlitNamedFramebufferNULL(GLuint readFramebuffer,
>                                                      GLuint drawFramebuffer,
>@@ -226,29 +161,25 @@ void INTERNAL_GL_APIENTRY glBlitNamedFramebufferNULL(GLuint readFramebuffer,
>                                                      GLint dstY1,
>                                                      GLbitfield mask,
>                                                      GLenum filter)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glBufferDataNULL(GLenum target,
>                                            GLsizeiptr size,
>                                            const void *data,
>                                            GLenum usage)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glBufferStorageNULL(GLenum target,
>                                               GLsizeiptr size,
>                                               const void *data,
>                                               GLbitfield flags)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glBufferSubDataNULL(GLenum target,
>                                               GLintptr offset,
>                                               GLsizeiptr size,
>                                               const void *data)
>-{
>-}
>+{}
> 
> GLenum INTERNAL_GL_APIENTRY glCheckFramebufferStatusNULL(GLenum target)
> {
>@@ -260,21 +191,16 @@ GLenum INTERNAL_GL_APIENTRY glCheckNamedFramebufferStatusNULL(GLuint framebuffer
>     return static_cast<GLenum>(0);
> }
> 
>-void INTERNAL_GL_APIENTRY glClampColorNULL(GLenum target, GLenum clamp)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glClampColorNULL(GLenum target, GLenum clamp) {}
> 
>-void INTERNAL_GL_APIENTRY glClearNULL(GLbitfield mask)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glClearNULL(GLbitfield mask) {}
> 
> void INTERNAL_GL_APIENTRY glClearBufferDataNULL(GLenum target,
>                                                 GLenum internalformat,
>                                                 GLenum format,
>                                                 GLenum type,
>                                                 const void *data)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glClearBufferSubDataNULL(GLenum target,
>                                                    GLenum internalformat,
>@@ -283,47 +209,36 @@ void INTERNAL_GL_APIENTRY glClearBufferSubDataNULL(GLenum target,
>                                                    GLenum format,
>                                                    GLenum type,
>                                                    const void *data)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glClearBufferfiNULL(GLenum buffer,
>                                               GLint drawbuffer,
>                                               GLfloat depth,
>                                               GLint stencil)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glClearBufferfvNULL(GLenum buffer, GLint drawbuffer, const GLfloat *value)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glClearBufferivNULL(GLenum buffer, GLint drawbuffer, const GLint *value)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glClearBufferuivNULL(GLenum buffer, GLint drawbuffer, const GLuint *value)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glClearColorNULL(GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha)
>-{
>-}
>+{}
> 
>-void INTERNAL_GL_APIENTRY glClearDepthNULL(GLdouble depth)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glClearDepthNULL(GLdouble depth) {}
> 
>-void INTERNAL_GL_APIENTRY glClearDepthfNULL(GLfloat d)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glClearDepthfNULL(GLfloat d) {}
> 
> void INTERNAL_GL_APIENTRY glClearNamedBufferDataNULL(GLuint buffer,
>                                                      GLenum internalformat,
>                                                      GLenum format,
>                                                      GLenum type,
>                                                      const void *data)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glClearNamedBufferSubDataNULL(GLuint buffer,
>                                                         GLenum internalformat,
>@@ -332,46 +247,38 @@ void INTERNAL_GL_APIENTRY glClearNamedBufferSubDataNULL(GLuint buffer,
>                                                         GLenum format,
>                                                         GLenum type,
>                                                         const void *data)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glClearNamedFramebufferfiNULL(GLuint framebuffer,
>                                                         GLenum buffer,
>                                                         GLint drawbuffer,
>                                                         GLfloat depth,
>                                                         GLint stencil)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glClearNamedFramebufferfvNULL(GLuint framebuffer,
>                                                         GLenum buffer,
>                                                         GLint drawbuffer,
>                                                         const GLfloat *value)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glClearNamedFramebufferivNULL(GLuint framebuffer,
>                                                         GLenum buffer,
>                                                         GLint drawbuffer,
>                                                         const GLint *value)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glClearNamedFramebufferuivNULL(GLuint framebuffer,
>                                                          GLenum buffer,
>                                                          GLint drawbuffer,
>                                                          const GLuint *value)
>-{
>-}
>+{}
> 
>-void INTERNAL_GL_APIENTRY glClearStencilNULL(GLint s)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glClearStencilNULL(GLint s) {}
> 
> void INTERNAL_GL_APIENTRY
> glClearTexImageNULL(GLuint texture, GLint level, GLenum format, GLenum type, const void *data)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glClearTexSubImageNULL(GLuint texture,
>                                                  GLint level,
>@@ -384,33 +291,26 @@ void INTERNAL_GL_APIENTRY glClearTexSubImageNULL(GLuint texture,
>                                                  GLenum format,
>                                                  GLenum type,
>                                                  const void *data)
>-{
>-}
>+{}
> 
> GLenum INTERNAL_GL_APIENTRY glClientWaitSyncNULL(GLsync sync, GLbitfield flags, GLuint64 timeout)
> {
>     return static_cast<GLenum>(0);
> }
> 
>-void INTERNAL_GL_APIENTRY glClipControlNULL(GLenum origin, GLenum depth)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glClipControlNULL(GLenum origin, GLenum depth) {}
> 
> void INTERNAL_GL_APIENTRY glColorMaskNULL(GLboolean red,
>                                           GLboolean green,
>                                           GLboolean blue,
>                                           GLboolean alpha)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY
> glColorMaskiNULL(GLuint index, GLboolean r, GLboolean g, GLboolean b, GLboolean a)
>-{
>-}
>+{}
> 
>-void INTERNAL_GL_APIENTRY glCompileShaderNULL(GLuint shader)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glCompileShaderNULL(GLuint shader) {}
> 
> void INTERNAL_GL_APIENTRY glCompressedTexImage1DNULL(GLenum target,
>                                                      GLint level,
>@@ -419,8 +319,7 @@ void INTERNAL_GL_APIENTRY glCompressedTexImage1DNULL(GLenum target,
>                                                      GLint border,
>                                                      GLsizei imageSize,
>                                                      const void *data)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glCompressedTexImage2DNULL(GLenum target,
>                                                      GLint level,
>@@ -430,8 +329,7 @@ void INTERNAL_GL_APIENTRY glCompressedTexImage2DNULL(GLenum target,
>                                                      GLint border,
>                                                      GLsizei imageSize,
>                                                      const void *data)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glCompressedTexImage3DNULL(GLenum target,
>                                                      GLint level,
>@@ -442,8 +340,7 @@ void INTERNAL_GL_APIENTRY glCompressedTexImage3DNULL(GLenum target,
>                                                      GLint border,
>                                                      GLsizei imageSize,
>                                                      const void *data)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glCompressedTexSubImage1DNULL(GLenum target,
>                                                         GLint level,
>@@ -452,8 +349,7 @@ void INTERNAL_GL_APIENTRY glCompressedTexSubImage1DNULL(GLenum target,
>                                                         GLenum format,
>                                                         GLsizei imageSize,
>                                                         const void *data)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glCompressedTexSubImage2DNULL(GLenum target,
>                                                         GLint level,
>@@ -464,8 +360,7 @@ void INTERNAL_GL_APIENTRY glCompressedTexSubImage2DNULL(GLenum target,
>                                                         GLenum format,
>                                                         GLsizei imageSize,
>                                                         const void *data)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glCompressedTexSubImage3DNULL(GLenum target,
>                                                         GLint level,
>@@ -478,8 +373,7 @@ void INTERNAL_GL_APIENTRY glCompressedTexSubImage3DNULL(GLenum target,
>                                                         GLenum format,
>                                                         GLsizei imageSize,
>                                                         const void *data)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glCompressedTextureSubImage1DNULL(GLuint texture,
>                                                             GLint level,
>@@ -488,8 +382,7 @@ void INTERNAL_GL_APIENTRY glCompressedTextureSubImage1DNULL(GLuint texture,
>                                                             GLenum format,
>                                                             GLsizei imageSize,
>                                                             const void *data)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glCompressedTextureSubImage2DNULL(GLuint texture,
>                                                             GLint level,
>@@ -500,8 +393,7 @@ void INTERNAL_GL_APIENTRY glCompressedTextureSubImage2DNULL(GLuint texture,
>                                                             GLenum format,
>                                                             GLsizei imageSize,
>                                                             const void *data)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glCompressedTextureSubImage3DNULL(GLuint texture,
>                                                             GLint level,
>@@ -514,16 +406,14 @@ void INTERNAL_GL_APIENTRY glCompressedTextureSubImage3DNULL(GLuint texture,
>                                                             GLenum format,
>                                                             GLsizei imageSize,
>                                                             const void *data)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glCopyBufferSubDataNULL(GLenum readTarget,
>                                                   GLenum writeTarget,
>                                                   GLintptr readOffset,
>                                                   GLintptr writeOffset,
>                                                   GLsizeiptr size)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glCopyImageSubDataNULL(GLuint srcName,
>                                                  GLenum srcTarget,
>@@ -540,16 +430,14 @@ void INTERNAL_GL_APIENTRY glCopyImageSubDataNULL(GLuint srcName,
>                                                  GLsizei srcWidth,
>                                                  GLsizei srcHeight,
>                                                  GLsizei srcDepth)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glCopyNamedBufferSubDataNULL(GLuint readBuffer,
>                                                        GLuint writeBuffer,
>                                                        GLintptr readOffset,
>                                                        GLintptr writeOffset,
>                                                        GLsizeiptr size)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glCopyTexImage1DNULL(GLenum target,
>                                                GLint level,
>@@ -558,8 +446,7 @@ void INTERNAL_GL_APIENTRY glCopyTexImage1DNULL(GLenum target,
>                                                GLint y,
>                                                GLsizei width,
>                                                GLint border)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glCopyTexImage2DNULL(GLenum target,
>                                                GLint level,
>@@ -569,13 +456,11 @@ void INTERNAL_GL_APIENTRY glCopyTexImage2DNULL(GLenum target,
>                                                GLsizei width,
>                                                GLsizei height,
>                                                GLint border)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY
> glCopyTexSubImage1DNULL(GLenum target, GLint level, GLint xoffset, GLint x, GLint y, GLsizei width)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glCopyTexSubImage2DNULL(GLenum target,
>                                                   GLint level,
>@@ -585,8 +470,7 @@ void INTERNAL_GL_APIENTRY glCopyTexSubImage2DNULL(GLenum target,
>                                                   GLint y,
>                                                   GLsizei width,
>                                                   GLsizei height)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glCopyTexSubImage3DNULL(GLenum target,
>                                                   GLint level,
>@@ -597,8 +481,7 @@ void INTERNAL_GL_APIENTRY glCopyTexSubImage3DNULL(GLenum target,
>                                                   GLint y,
>                                                   GLsizei width,
>                                                   GLsizei height)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glCopyTextureSubImage1DNULL(GLuint texture,
>                                                       GLint level,
>@@ -606,8 +489,7 @@ void INTERNAL_GL_APIENTRY glCopyTextureSubImage1DNULL(GLuint texture,
>                                                       GLint x,
>                                                       GLint y,
>                                                       GLsizei width)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glCopyTextureSubImage2DNULL(GLuint texture,
>                                                       GLint level,
>@@ -617,8 +499,7 @@ void INTERNAL_GL_APIENTRY glCopyTextureSubImage2DNULL(GLuint texture,
>                                                       GLint y,
>                                                       GLsizei width,
>                                                       GLsizei height)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glCopyTextureSubImage3DNULL(GLuint texture,
>                                                       GLint level,
>@@ -629,8 +510,7 @@ void INTERNAL_GL_APIENTRY glCopyTextureSubImage3DNULL(GLuint texture,
>                                                       GLint y,
>                                                       GLsizei width,
>                                                       GLsizei height)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glCoverFillPathInstancedNVNULL(GLsizei numPaths,
>                                                          GLenum pathNameType,
>@@ -639,12 +519,9 @@ void INTERNAL_GL_APIENTRY glCoverFillPathInstancedNVNULL(GLsizei numPaths,
>                                                          GLenum coverMode,
>                                                          GLenum transformType,
>                                                          const GLfloat *transformValues)
>-{
>-}
>+{}
> 
>-void INTERNAL_GL_APIENTRY glCoverFillPathNVNULL(GLuint path, GLenum coverMode)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glCoverFillPathNVNULL(GLuint path, GLenum coverMode) {}
> 
> void INTERNAL_GL_APIENTRY glCoverStrokePathInstancedNVNULL(GLsizei numPaths,
>                                                            GLenum pathNameType,
>@@ -653,45 +530,28 @@ void INTERNAL_GL_APIENTRY glCoverStrokePathInstancedNVNULL(GLsizei numPaths,
>                                                            GLenum coverMode,
>                                                            GLenum transformType,
>                                                            const GLfloat *transformValues)
>-{
>-}
>+{}
> 
>-void INTERNAL_GL_APIENTRY glCoverStrokePathNVNULL(GLuint path, GLenum coverMode)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glCoverStrokePathNVNULL(GLuint path, GLenum coverMode) {}
> 
>-void INTERNAL_GL_APIENTRY glCoverageModulationNVNULL(GLenum components)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glCoverageModulationNVNULL(GLenum components) {}
> 
>-void INTERNAL_GL_APIENTRY glCreateBuffersNULL(GLsizei n, GLuint *buffers)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glCreateBuffersNULL(GLsizei n, GLuint *buffers) {}
> 
>-void INTERNAL_GL_APIENTRY glCreateFramebuffersNULL(GLsizei n, GLuint *framebuffers)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glCreateFramebuffersNULL(GLsizei n, GLuint *framebuffers) {}
> 
> GLuint INTERNAL_GL_APIENTRY glCreateProgramNULL()
> {
>     return static_cast<GLuint>(0);
> }
> 
>-void INTERNAL_GL_APIENTRY glCreateProgramPipelinesNULL(GLsizei n, GLuint *pipelines)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glCreateProgramPipelinesNULL(GLsizei n, GLuint *pipelines) {}
> 
>-void INTERNAL_GL_APIENTRY glCreateQueriesNULL(GLenum target, GLsizei n, GLuint *ids)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glCreateQueriesNULL(GLenum target, GLsizei n, GLuint *ids) {}
> 
>-void INTERNAL_GL_APIENTRY glCreateRenderbuffersNULL(GLsizei n, GLuint *renderbuffers)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glCreateRenderbuffersNULL(GLsizei n, GLuint *renderbuffers) {}
> 
>-void INTERNAL_GL_APIENTRY glCreateSamplersNULL(GLsizei n, GLuint *samplers)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glCreateSamplersNULL(GLsizei n, GLuint *samplers) {}
> 
> GLuint INTERNAL_GL_APIENTRY glCreateShaderNULL(GLenum type)
> {
>@@ -705,25 +565,15 @@ GLuint INTERNAL_GL_APIENTRY glCreateShaderProgramvNULL(GLenum type,
>     return static_cast<GLuint>(0);
> }
> 
>-void INTERNAL_GL_APIENTRY glCreateTexturesNULL(GLenum target, GLsizei n, GLuint *textures)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glCreateTexturesNULL(GLenum target, GLsizei n, GLuint *textures) {}
> 
>-void INTERNAL_GL_APIENTRY glCreateTransformFeedbacksNULL(GLsizei n, GLuint *ids)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glCreateTransformFeedbacksNULL(GLsizei n, GLuint *ids) {}
> 
>-void INTERNAL_GL_APIENTRY glCreateVertexArraysNULL(GLsizei n, GLuint *arrays)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glCreateVertexArraysNULL(GLsizei n, GLuint *arrays) {}
> 
>-void INTERNAL_GL_APIENTRY glCullFaceNULL(GLenum mode)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glCullFaceNULL(GLenum mode) {}
> 
>-void INTERNAL_GL_APIENTRY glDebugMessageCallbackNULL(GLDEBUGPROC callback, const void *userParam)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glDebugMessageCallbackNULL(GLDEBUGPROC callback, const void *userParam) {}
> 
> void INTERNAL_GL_APIENTRY glDebugMessageControlNULL(GLenum source,
>                                                     GLenum type,
>@@ -731,8 +581,7 @@ void INTERNAL_GL_APIENTRY glDebugMessageControlNULL(GLenum source,
>                                                     GLsizei count,
>                                                     const GLuint *ids,
>                                                     GLboolean enabled)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glDebugMessageInsertNULL(GLenum source,
>                                                    GLenum type,
>@@ -740,182 +589,113 @@ void INTERNAL_GL_APIENTRY glDebugMessageInsertNULL(GLenum source,
>                                                    GLenum severity,
>                                                    GLsizei length,
>                                                    const GLchar *buf)
>-{
>-}
>+{}
> 
>-void INTERNAL_GL_APIENTRY glDeleteBuffersNULL(GLsizei n, const GLuint *buffers)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glDeleteBuffersNULL(GLsizei n, const GLuint *buffers) {}
> 
>-void INTERNAL_GL_APIENTRY glDeleteFencesNVNULL(GLsizei n, const GLuint *fences)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glDeleteFencesNVNULL(GLsizei n, const GLuint *fences) {}
> 
>-void INTERNAL_GL_APIENTRY glDeleteFramebuffersNULL(GLsizei n, const GLuint *framebuffers)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glDeleteFramebuffersNULL(GLsizei n, const GLuint *framebuffers) {}
> 
>-void INTERNAL_GL_APIENTRY glDeletePathsNVNULL(GLuint path, GLsizei range)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glDeletePathsNVNULL(GLuint path, GLsizei range) {}
> 
>-void INTERNAL_GL_APIENTRY glDeleteProgramNULL(GLuint program)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glDeleteProgramNULL(GLuint program) {}
> 
>-void INTERNAL_GL_APIENTRY glDeleteProgramPipelinesNULL(GLsizei n, const GLuint *pipelines)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glDeleteProgramPipelinesNULL(GLsizei n, const GLuint *pipelines) {}
> 
>-void INTERNAL_GL_APIENTRY glDeleteQueriesNULL(GLsizei n, const GLuint *ids)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glDeleteQueriesNULL(GLsizei n, const GLuint *ids) {}
> 
>-void INTERNAL_GL_APIENTRY glDeleteRenderbuffersNULL(GLsizei n, const GLuint *renderbuffers)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glDeleteRenderbuffersNULL(GLsizei n, const GLuint *renderbuffers) {}
> 
>-void INTERNAL_GL_APIENTRY glDeleteSamplersNULL(GLsizei count, const GLuint *samplers)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glDeleteSamplersNULL(GLsizei count, const GLuint *samplers) {}
> 
>-void INTERNAL_GL_APIENTRY glDeleteShaderNULL(GLuint shader)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glDeleteShaderNULL(GLuint shader) {}
> 
>-void INTERNAL_GL_APIENTRY glDeleteSyncNULL(GLsync sync)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glDeleteSyncNULL(GLsync sync) {}
> 
>-void INTERNAL_GL_APIENTRY glDeleteTexturesNULL(GLsizei n, const GLuint *textures)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glDeleteTexturesNULL(GLsizei n, const GLuint *textures) {}
> 
>-void INTERNAL_GL_APIENTRY glDeleteTransformFeedbacksNULL(GLsizei n, const GLuint *ids)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glDeleteTransformFeedbacksNULL(GLsizei n, const GLuint *ids) {}
> 
>-void INTERNAL_GL_APIENTRY glDeleteVertexArraysNULL(GLsizei n, const GLuint *arrays)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glDeleteVertexArraysNULL(GLsizei n, const GLuint *arrays) {}
> 
>-void INTERNAL_GL_APIENTRY glDepthFuncNULL(GLenum func)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glDepthFuncNULL(GLenum func) {}
> 
>-void INTERNAL_GL_APIENTRY glDepthMaskNULL(GLboolean flag)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glDepthMaskNULL(GLboolean flag) {}
> 
>-void INTERNAL_GL_APIENTRY glDepthRangeNULL(GLdouble near, GLdouble far)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glDepthRangeNULL(GLdouble n, GLdouble f) {}
> 
>-void INTERNAL_GL_APIENTRY glDepthRangeArrayvNULL(GLuint first, GLsizei count, const GLdouble *v)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glDepthRangeArrayvNULL(GLuint first, GLsizei count, const GLdouble *v) {}
> 
>-void INTERNAL_GL_APIENTRY glDepthRangeIndexedNULL(GLuint index, GLdouble n, GLdouble f)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glDepthRangeIndexedNULL(GLuint index, GLdouble n, GLdouble f) {}
> 
>-void INTERNAL_GL_APIENTRY glDepthRangefNULL(GLfloat n, GLfloat f)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glDepthRangefNULL(GLfloat n, GLfloat f) {}
> 
>-void INTERNAL_GL_APIENTRY glDetachShaderNULL(GLuint program, GLuint shader)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glDetachShaderNULL(GLuint program, GLuint shader) {}
> 
>-void INTERNAL_GL_APIENTRY glDisableNULL(GLenum cap)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glDisableNULL(GLenum cap) {}
> 
>-void INTERNAL_GL_APIENTRY glDisableVertexArrayAttribNULL(GLuint vaobj, GLuint index)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glDisableVertexArrayAttribNULL(GLuint vaobj, GLuint index) {}
> 
>-void INTERNAL_GL_APIENTRY glDisableVertexAttribArrayNULL(GLuint index)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glDisableVertexAttribArrayNULL(GLuint index) {}
> 
>-void INTERNAL_GL_APIENTRY glDisableiNULL(GLenum target, GLuint index)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glDisableiNULL(GLenum target, GLuint index) {}
> 
> void INTERNAL_GL_APIENTRY glDiscardFramebufferEXTNULL(GLenum target,
>                                                       GLsizei numAttachments,
>                                                       const GLenum *attachments)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glDispatchComputeNULL(GLuint num_groups_x,
>                                                 GLuint num_groups_y,
>                                                 GLuint num_groups_z)
>-{
>-}
>+{}
> 
>-void INTERNAL_GL_APIENTRY glDispatchComputeIndirectNULL(GLintptr indirect)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glDispatchComputeIndirectNULL(GLintptr indirect) {}
> 
>-void INTERNAL_GL_APIENTRY glDrawArraysNULL(GLenum mode, GLint first, GLsizei count)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glDrawArraysNULL(GLenum mode, GLint first, GLsizei count) {}
> 
>-void INTERNAL_GL_APIENTRY glDrawArraysIndirectNULL(GLenum mode, const void *indirect)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glDrawArraysIndirectNULL(GLenum mode, const void *indirect) {}
> 
> void INTERNAL_GL_APIENTRY glDrawArraysInstancedNULL(GLenum mode,
>                                                     GLint first,
>                                                     GLsizei count,
>                                                     GLsizei instancecount)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glDrawArraysInstancedBaseInstanceNULL(GLenum mode,
>                                                                 GLint first,
>                                                                 GLsizei count,
>                                                                 GLsizei instancecount,
>                                                                 GLuint baseinstance)
>-{
>-}
>+{}
> 
>-void INTERNAL_GL_APIENTRY glDrawBufferNULL(GLenum buf)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glDrawBufferNULL(GLenum buf) {}
> 
>-void INTERNAL_GL_APIENTRY glDrawBuffersNULL(GLsizei n, const GLenum *bufs)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glDrawBuffersNULL(GLsizei n, const GLenum *bufs) {}
> 
> void INTERNAL_GL_APIENTRY glDrawElementsNULL(GLenum mode,
>                                              GLsizei count,
>                                              GLenum type,
>                                              const void *indices)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glDrawElementsBaseVertexNULL(GLenum mode,
>                                                        GLsizei count,
>                                                        GLenum type,
>                                                        const void *indices,
>                                                        GLint basevertex)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glDrawElementsIndirectNULL(GLenum mode, GLenum type, const void *indirect)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glDrawElementsInstancedNULL(GLenum mode,
>                                                       GLsizei count,
>                                                       GLenum type,
>                                                       const void *indices,
>                                                       GLsizei instancecount)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glDrawElementsInstancedBaseInstanceNULL(GLenum mode,
>                                                                   GLsizei count,
>@@ -923,8 +703,7 @@ void INTERNAL_GL_APIENTRY glDrawElementsInstancedBaseInstanceNULL(GLenum mode,
>                                                                   const void *indices,
>                                                                   GLsizei instancecount,
>                                                                   GLuint baseinstance)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glDrawElementsInstancedBaseVertexNULL(GLenum mode,
>                                                                 GLsizei count,
>@@ -932,8 +711,7 @@ void INTERNAL_GL_APIENTRY glDrawElementsInstancedBaseVertexNULL(GLenum mode,
>                                                                 const void *indices,
>                                                                 GLsizei instancecount,
>                                                                 GLint basevertex)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glDrawElementsInstancedBaseVertexBaseInstanceNULL(GLenum mode,
>                                                                             GLsizei count,
>@@ -942,8 +720,7 @@ void INTERNAL_GL_APIENTRY glDrawElementsInstancedBaseVertexBaseInstanceNULL(GLen
>                                                                             GLsizei instancecount,
>                                                                             GLint basevertex,
>                                                                             GLuint baseinstance)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glDrawRangeElementsNULL(GLenum mode,
>                                                   GLuint start,
>@@ -951,8 +728,7 @@ void INTERNAL_GL_APIENTRY glDrawRangeElementsNULL(GLenum mode,
>                                                   GLsizei count,
>                                                   GLenum type,
>                                                   const void *indices)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glDrawRangeElementsBaseVertexNULL(GLenum mode,
>                                                             GLuint start,
>@@ -961,133 +737,94 @@ void INTERNAL_GL_APIENTRY glDrawRangeElementsBaseVertexNULL(GLenum mode,
>                                                             GLenum type,
>                                                             const void *indices,
>                                                             GLint basevertex)
>-{
>-}
>+{}
> 
>-void INTERNAL_GL_APIENTRY glDrawTransformFeedbackNULL(GLenum mode, GLuint id)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glDrawTransformFeedbackNULL(GLenum mode, GLuint id) {}
> 
> void INTERNAL_GL_APIENTRY glDrawTransformFeedbackInstancedNULL(GLenum mode,
>                                                                GLuint id,
>                                                                GLsizei instancecount)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glDrawTransformFeedbackStreamNULL(GLenum mode, GLuint id, GLuint stream)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glDrawTransformFeedbackStreamInstancedNULL(GLenum mode,
>                                                                      GLuint id,
>                                                                      GLuint stream,
>                                                                      GLsizei instancecount)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glEGLImageTargetRenderbufferStorageOESNULL(GLenum target,
>                                                                      GLeglImageOES image)
>-{
>-}
>+{}
> 
>-void INTERNAL_GL_APIENTRY glEGLImageTargetTexture2DOESNULL(GLenum target, GLeglImageOES image)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glEGLImageTargetTexture2DOESNULL(GLenum target, GLeglImageOES image) {}
> 
>-void INTERNAL_GL_APIENTRY glEnableNULL(GLenum cap)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glEnableNULL(GLenum cap) {}
> 
>-void INTERNAL_GL_APIENTRY glEnableVertexArrayAttribNULL(GLuint vaobj, GLuint index)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glEnableVertexArrayAttribNULL(GLuint vaobj, GLuint index) {}
> 
>-void INTERNAL_GL_APIENTRY glEnableVertexAttribArrayNULL(GLuint index)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glEnableVertexAttribArrayNULL(GLuint index) {}
> 
>-void INTERNAL_GL_APIENTRY glEnableiNULL(GLenum target, GLuint index)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glEnableiNULL(GLenum target, GLuint index) {}
> 
>-void INTERNAL_GL_APIENTRY glEndConditionalRenderNULL()
>-{
>-}
>+void INTERNAL_GL_APIENTRY glEndConditionalRenderNULL() {}
> 
>-void INTERNAL_GL_APIENTRY glEndQueryNULL(GLenum target)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glEndQueryNULL(GLenum target) {}
> 
>-void INTERNAL_GL_APIENTRY glEndQueryIndexedNULL(GLenum target, GLuint index)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glEndQueryIndexedNULL(GLenum target, GLuint index) {}
> 
>-void INTERNAL_GL_APIENTRY glEndTransformFeedbackNULL()
>-{
>-}
>+void INTERNAL_GL_APIENTRY glEndTransformFeedbackNULL() {}
> 
> GLsync INTERNAL_GL_APIENTRY glFenceSyncNULL(GLenum condition, GLbitfield flags)
> {
>     return static_cast<GLsync>(0);
> }
> 
>-void INTERNAL_GL_APIENTRY glFinishNULL()
>-{
>-}
>+void INTERNAL_GL_APIENTRY glFinishNULL() {}
> 
>-void INTERNAL_GL_APIENTRY glFinishFenceNVNULL(GLuint fence)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glFinishFenceNVNULL(GLuint fence) {}
> 
>-void INTERNAL_GL_APIENTRY glFlushNULL()
>-{
>-}
>+void INTERNAL_GL_APIENTRY glFlushNULL() {}
> 
> void INTERNAL_GL_APIENTRY glFlushMappedBufferRangeNULL(GLenum target,
>                                                        GLintptr offset,
>                                                        GLsizeiptr length)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glFlushMappedNamedBufferRangeNULL(GLuint buffer,
>                                                             GLintptr offset,
>                                                             GLsizeiptr length)
>-{
>-}
>+{}
> 
>-void INTERNAL_GL_APIENTRY glFramebufferParameteriNULL(GLenum target, GLenum pname, GLint param)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glFramebufferParameteriNULL(GLenum target, GLenum pname, GLint param) {}
> 
> void INTERNAL_GL_APIENTRY glFramebufferRenderbufferNULL(GLenum target,
>                                                         GLenum attachment,
>                                                         GLenum renderbuffertarget,
>                                                         GLuint renderbuffer)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glFramebufferTextureNULL(GLenum target,
>                                                    GLenum attachment,
>                                                    GLuint texture,
>                                                    GLint level)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glFramebufferTexture1DNULL(GLenum target,
>                                                      GLenum attachment,
>                                                      GLenum textarget,
>                                                      GLuint texture,
>                                                      GLint level)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glFramebufferTexture2DNULL(GLenum target,
>                                                      GLenum attachment,
>                                                      GLenum textarget,
>                                                      GLuint texture,
>                                                      GLint level)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glFramebufferTexture3DNULL(GLenum target,
>                                                      GLenum attachment,
>@@ -1095,80 +832,59 @@ void INTERNAL_GL_APIENTRY glFramebufferTexture3DNULL(GLenum target,
>                                                      GLuint texture,
>                                                      GLint level,
>                                                      GLint zoffset)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glFramebufferTextureLayerNULL(GLenum target,
>                                                         GLenum attachment,
>                                                         GLuint texture,
>                                                         GLint level,
>                                                         GLint layer)
>-{
>-}
>+{}
> 
>-void INTERNAL_GL_APIENTRY glFrontFaceNULL(GLenum mode)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glFramebufferTextureMultiviewOVRNULL(GLenum target,
>+                                                               GLenum attachment,
>+                                                               GLuint texture,
>+                                                               GLint level,
>+                                                               GLint baseViewIndex,
>+                                                               GLsizei numViews)
>+{}
> 
>-void INTERNAL_GL_APIENTRY glGenBuffersNULL(GLsizei n, GLuint *buffers)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glFrontFaceNULL(GLenum mode) {}
> 
>-void INTERNAL_GL_APIENTRY glGenFencesNVNULL(GLsizei n, GLuint *fences)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glGenBuffersNULL(GLsizei n, GLuint *buffers) {}
> 
>-void INTERNAL_GL_APIENTRY glGenFramebuffersNULL(GLsizei n, GLuint *framebuffers)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glGenFencesNVNULL(GLsizei n, GLuint *fences) {}
>+
>+void INTERNAL_GL_APIENTRY glGenFramebuffersNULL(GLsizei n, GLuint *framebuffers) {}
> 
> GLuint INTERNAL_GL_APIENTRY glGenPathsNVNULL(GLsizei range)
> {
>     return static_cast<GLuint>(0);
> }
> 
>-void INTERNAL_GL_APIENTRY glGenProgramPipelinesNULL(GLsizei n, GLuint *pipelines)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glGenProgramPipelinesNULL(GLsizei n, GLuint *pipelines) {}
> 
>-void INTERNAL_GL_APIENTRY glGenQueriesNULL(GLsizei n, GLuint *ids)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glGenQueriesNULL(GLsizei n, GLuint *ids) {}
> 
>-void INTERNAL_GL_APIENTRY glGenRenderbuffersNULL(GLsizei n, GLuint *renderbuffers)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glGenRenderbuffersNULL(GLsizei n, GLuint *renderbuffers) {}
> 
>-void INTERNAL_GL_APIENTRY glGenSamplersNULL(GLsizei count, GLuint *samplers)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glGenSamplersNULL(GLsizei count, GLuint *samplers) {}
> 
>-void INTERNAL_GL_APIENTRY glGenTexturesNULL(GLsizei n, GLuint *textures)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glGenTexturesNULL(GLsizei n, GLuint *textures) {}
> 
>-void INTERNAL_GL_APIENTRY glGenTransformFeedbacksNULL(GLsizei n, GLuint *ids)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glGenTransformFeedbacksNULL(GLsizei n, GLuint *ids) {}
> 
>-void INTERNAL_GL_APIENTRY glGenVertexArraysNULL(GLsizei n, GLuint *arrays)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glGenVertexArraysNULL(GLsizei n, GLuint *arrays) {}
> 
>-void INTERNAL_GL_APIENTRY glGenerateMipmapNULL(GLenum target)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glGenerateMipmapNULL(GLenum target) {}
> 
>-void INTERNAL_GL_APIENTRY glGenerateTextureMipmapNULL(GLuint texture)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glGenerateTextureMipmapNULL(GLuint texture) {}
> 
> void INTERNAL_GL_APIENTRY glGetActiveAtomicCounterBufferivNULL(GLuint program,
>                                                                GLuint bufferIndex,
>                                                                GLenum pname,
>                                                                GLint *params)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glGetActiveAttribNULL(GLuint program,
>                                                 GLuint index,
>@@ -1177,8 +893,7 @@ void INTERNAL_GL_APIENTRY glGetActiveAttribNULL(GLuint program,
>                                                 GLint *size,
>                                                 GLenum *type,
>                                                 GLchar *name)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glGetActiveSubroutineNameNULL(GLuint program,
>                                                         GLenum shadertype,
>@@ -1186,8 +901,7 @@ void INTERNAL_GL_APIENTRY glGetActiveSubroutineNameNULL(GLuint program,
>                                                         GLsizei bufsize,
>                                                         GLsizei *length,
>                                                         GLchar *name)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glGetActiveSubroutineUniformNameNULL(GLuint program,
>                                                                GLenum shadertype,
>@@ -1195,16 +909,14 @@ void INTERNAL_GL_APIENTRY glGetActiveSubroutineUniformNameNULL(GLuint program,
>                                                                GLsizei bufsize,
>                                                                GLsizei *length,
>                                                                GLchar *name)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glGetActiveSubroutineUniformivNULL(GLuint program,
>                                                              GLenum shadertype,
>                                                              GLuint index,
>                                                              GLenum pname,
>                                                              GLint *values)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glGetActiveUniformNULL(GLuint program,
>                                                  GLuint index,
>@@ -1213,89 +925,70 @@ void INTERNAL_GL_APIENTRY glGetActiveUniformNULL(GLuint program,
>                                                  GLint *size,
>                                                  GLenum *type,
>                                                  GLchar *name)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glGetActiveUniformBlockNameNULL(GLuint program,
>                                                           GLuint uniformBlockIndex,
>                                                           GLsizei bufSize,
>                                                           GLsizei *length,
>                                                           GLchar *uniformBlockName)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glGetActiveUniformBlockivNULL(GLuint program,
>                                                         GLuint uniformBlockIndex,
>                                                         GLenum pname,
>                                                         GLint *params)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glGetActiveUniformNameNULL(GLuint program,
>                                                      GLuint uniformIndex,
>                                                      GLsizei bufSize,
>                                                      GLsizei *length,
>                                                      GLchar *uniformName)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glGetActiveUniformsivNULL(GLuint program,
>                                                     GLsizei uniformCount,
>                                                     const GLuint *uniformIndices,
>                                                     GLenum pname,
>                                                     GLint *params)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glGetAttachedShadersNULL(GLuint program,
>                                                    GLsizei maxCount,
>                                                    GLsizei *count,
>                                                    GLuint *shaders)
>-{
>-}
>+{}
> 
> GLint INTERNAL_GL_APIENTRY glGetAttribLocationNULL(GLuint program, const GLchar *name)
> {
>     return static_cast<GLint>(0);
> }
> 
>-void INTERNAL_GL_APIENTRY glGetBooleani_vNULL(GLenum target, GLuint index, GLboolean *data)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glGetBooleani_vNULL(GLenum target, GLuint index, GLboolean *data) {}
> 
>-void INTERNAL_GL_APIENTRY glGetBooleanvNULL(GLenum pname, GLboolean *data)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glGetBooleanvNULL(GLenum pname, GLboolean *data) {}
> 
> void INTERNAL_GL_APIENTRY glGetBufferParameteri64vNULL(GLenum target, GLenum pname, GLint64 *params)
>-{
>-}
>+{}
> 
>-void INTERNAL_GL_APIENTRY glGetBufferParameterivNULL(GLenum target, GLenum pname, GLint *params)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glGetBufferParameterivNULL(GLenum target, GLenum pname, GLint *params) {}
> 
>-void INTERNAL_GL_APIENTRY glGetBufferPointervNULL(GLenum target, GLenum pname, void **params)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glGetBufferPointervNULL(GLenum target, GLenum pname, void **params) {}
> 
> void INTERNAL_GL_APIENTRY glGetBufferSubDataNULL(GLenum target,
>                                                  GLintptr offset,
>                                                  GLsizeiptr size,
>                                                  void *data)
>-{
>-}
>+{}
> 
>-void INTERNAL_GL_APIENTRY glGetCompressedTexImageNULL(GLenum target, GLint level, void *img)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glGetCompressedTexImageNULL(GLenum target, GLint level, void *img) {}
> 
> void INTERNAL_GL_APIENTRY glGetCompressedTextureImageNULL(GLuint texture,
>                                                           GLint level,
>                                                           GLsizei bufSize,
>                                                           void *pixels)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glGetCompressedTextureSubImageNULL(GLuint texture,
>                                                              GLint level,
>@@ -1307,8 +1000,7 @@ void INTERNAL_GL_APIENTRY glGetCompressedTextureSubImageNULL(GLuint texture,
>                                                              GLsizei depth,
>                                                              GLsizei bufSize,
>                                                              void *pixels)
>-{
>-}
>+{}
> 
> GLuint INTERNAL_GL_APIENTRY glGetDebugMessageLogNULL(GLuint count,
>                                                      GLsizei bufSize,
>@@ -1322,30 +1014,20 @@ GLuint INTERNAL_GL_APIENTRY glGetDebugMessageLogNULL(GLuint count,
>     return static_cast<GLuint>(0);
> }
> 
>-void INTERNAL_GL_APIENTRY glGetDoublei_vNULL(GLenum target, GLuint index, GLdouble *data)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glGetDoublei_vNULL(GLenum target, GLuint index, GLdouble *data) {}
> 
>-void INTERNAL_GL_APIENTRY glGetDoublevNULL(GLenum pname, GLdouble *data)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glGetDoublevNULL(GLenum pname, GLdouble *data) {}
> 
> GLenum INTERNAL_GL_APIENTRY glGetErrorNULL()
> {
>     return static_cast<GLenum>(0);
> }
> 
>-void INTERNAL_GL_APIENTRY glGetFenceivNVNULL(GLuint fence, GLenum pname, GLint *params)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glGetFenceivNVNULL(GLuint fence, GLenum pname, GLint *params) {}
> 
>-void INTERNAL_GL_APIENTRY glGetFloati_vNULL(GLenum target, GLuint index, GLfloat *data)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glGetFloati_vNULL(GLenum target, GLuint index, GLfloat *data) {}
> 
>-void INTERNAL_GL_APIENTRY glGetFloatvNULL(GLenum pname, GLfloat *data)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glGetFloatvNULL(GLenum pname, GLfloat *data) {}
> 
> GLint INTERNAL_GL_APIENTRY glGetFragDataIndexNULL(GLuint program, const GLchar *name)
> {
>@@ -1361,35 +1043,25 @@ void INTERNAL_GL_APIENTRY glGetFramebufferAttachmentParameterivNULL(GLenum targe
>                                                                     GLenum attachment,
>                                                                     GLenum pname,
>                                                                     GLint *params)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glGetFramebufferParameterivNULL(GLenum target,
>                                                           GLenum pname,
>                                                           GLint *params)
>-{
>-}
>+{}
> 
> GLenum INTERNAL_GL_APIENTRY glGetGraphicsResetStatusNULL()
> {
>     return static_cast<GLenum>(0);
> }
> 
>-void INTERNAL_GL_APIENTRY glGetInteger64i_vNULL(GLenum target, GLuint index, GLint64 *data)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glGetInteger64i_vNULL(GLenum target, GLuint index, GLint64 *data) {}
> 
>-void INTERNAL_GL_APIENTRY glGetInteger64vNULL(GLenum pname, GLint64 *data)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glGetInteger64vNULL(GLenum pname, GLint64 *data) {}
> 
>-void INTERNAL_GL_APIENTRY glGetIntegeri_vNULL(GLenum target, GLuint index, GLint *data)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glGetIntegeri_vNULL(GLenum target, GLuint index, GLint *data) {}
> 
>-void INTERNAL_GL_APIENTRY glGetIntegervNULL(GLenum pname, GLint *data)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glGetIntegervNULL(GLenum pname, GLint *data) {}
> 
> void INTERNAL_GL_APIENTRY glGetInternalformatSampleivNVNULL(GLenum target,
>                                                             GLenum internalformat,
>@@ -1397,130 +1069,105 @@ void INTERNAL_GL_APIENTRY glGetInternalformatSampleivNVNULL(GLenum target,
>                                                             GLenum pname,
>                                                             GLsizei bufSize,
>                                                             GLint *params)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glGetInternalformati64vNULL(GLenum target,
>                                                       GLenum internalformat,
>                                                       GLenum pname,
>                                                       GLsizei bufSize,
>                                                       GLint64 *params)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glGetInternalformativNULL(GLenum target,
>                                                     GLenum internalformat,
>                                                     GLenum pname,
>                                                     GLsizei bufSize,
>                                                     GLint *params)
>-{
>-}
>+{}
> 
>-void INTERNAL_GL_APIENTRY glGetMultisamplefvNULL(GLenum pname, GLuint index, GLfloat *val)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glGetMultisamplefvNULL(GLenum pname, GLuint index, GLfloat *val) {}
> 
> void INTERNAL_GL_APIENTRY glGetNamedBufferParameteri64vNULL(GLuint buffer,
>                                                             GLenum pname,
>                                                             GLint64 *params)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glGetNamedBufferParameterivNULL(GLuint buffer,
>                                                           GLenum pname,
>                                                           GLint *params)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glGetNamedBufferPointervNULL(GLuint buffer, GLenum pname, void **params)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glGetNamedBufferSubDataNULL(GLuint buffer,
>                                                       GLintptr offset,
>                                                       GLsizeiptr size,
>                                                       void *data)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glGetNamedFramebufferAttachmentParameterivNULL(GLuint framebuffer,
>                                                                          GLenum attachment,
>                                                                          GLenum pname,
>                                                                          GLint *params)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glGetNamedFramebufferParameterivNULL(GLuint framebuffer,
>                                                                GLenum pname,
>                                                                GLint *param)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glGetNamedRenderbufferParameterivNULL(GLuint renderbuffer,
>                                                                 GLenum pname,
>                                                                 GLint *params)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glGetObjectLabelNULL(GLenum identifier,
>                                                GLuint name,
>                                                GLsizei bufSize,
>                                                GLsizei *length,
>                                                GLchar *label)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glGetObjectPtrLabelNULL(const void *ptr,
>                                                   GLsizei bufSize,
>                                                   GLsizei *length,
>                                                   GLchar *label)
>-{
>-}
>+{}
> 
>-void INTERNAL_GL_APIENTRY glGetPathParameterfvNVNULL(GLuint path, GLenum pname, GLfloat *value)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glGetPathParameterfvNVNULL(GLuint path, GLenum pname, GLfloat *value) {}
> 
>-void INTERNAL_GL_APIENTRY glGetPathParameterivNVNULL(GLuint path, GLenum pname, GLint *value)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glGetPathParameterivNVNULL(GLuint path, GLenum pname, GLint *value) {}
> 
>-void INTERNAL_GL_APIENTRY glGetPointervNULL(GLenum pname, void **params)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glGetPointervNULL(GLenum pname, void **params) {}
> 
> void INTERNAL_GL_APIENTRY glGetProgramBinaryNULL(GLuint program,
>                                                  GLsizei bufSize,
>                                                  GLsizei *length,
>                                                  GLenum *binaryFormat,
>                                                  void *binary)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glGetProgramInfoLogNULL(GLuint program,
>                                                   GLsizei bufSize,
>                                                   GLsizei *length,
>                                                   GLchar *infoLog)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glGetProgramInterfaceivNULL(GLuint program,
>                                                       GLenum programInterface,
>                                                       GLenum pname,
>                                                       GLint *params)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glGetProgramPipelineInfoLogNULL(GLuint pipeline,
>                                                           GLsizei bufSize,
>                                                           GLsizei *length,
>                                                           GLchar *infoLog)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glGetProgramPipelineivNULL(GLuint pipeline, GLenum pname, GLint *params)
>-{
>-}
>+{}
> 
> GLuint INTERNAL_GL_APIENTRY glGetProgramResourceIndexNULL(GLuint program,
>                                                           GLenum programInterface,
>@@ -1549,8 +1196,7 @@ void INTERNAL_GL_APIENTRY glGetProgramResourceNameNULL(GLuint program,
>                                                        GLsizei bufSize,
>                                                        GLsizei *length,
>                                                        GLchar *name)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glGetProgramResourceivNULL(GLuint program,
>                                                      GLenum programInterface,
>@@ -1560,123 +1206,94 @@ void INTERNAL_GL_APIENTRY glGetProgramResourceivNULL(GLuint program,
>                                                      GLsizei bufSize,
>                                                      GLsizei *length,
>                                                      GLint *params)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glGetProgramStageivNULL(GLuint program,
>                                                   GLenum shadertype,
>                                                   GLenum pname,
>                                                   GLint *values)
>-{
>-}
>+{}
> 
>-void INTERNAL_GL_APIENTRY glGetProgramivNULL(GLuint program, GLenum pname, GLint *params)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glGetProgramivNULL(GLuint program, GLenum pname, GLint *params) {}
> 
> void INTERNAL_GL_APIENTRY glGetQueryBufferObjecti64vNULL(GLuint id,
>                                                          GLuint buffer,
>                                                          GLenum pname,
>                                                          GLintptr offset)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glGetQueryBufferObjectivNULL(GLuint id,
>                                                        GLuint buffer,
>                                                        GLenum pname,
>                                                        GLintptr offset)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glGetQueryBufferObjectui64vNULL(GLuint id,
>                                                           GLuint buffer,
>                                                           GLenum pname,
>                                                           GLintptr offset)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glGetQueryBufferObjectuivNULL(GLuint id,
>                                                         GLuint buffer,
>                                                         GLenum pname,
>                                                         GLintptr offset)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glGetQueryIndexedivNULL(GLenum target,
>                                                   GLuint index,
>                                                   GLenum pname,
>                                                   GLint *params)
>-{
>-}
>+{}
> 
>-void INTERNAL_GL_APIENTRY glGetQueryObjecti64vNULL(GLuint id, GLenum pname, GLint64 *params)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glGetQueryObjecti64vNULL(GLuint id, GLenum pname, GLint64 *params) {}
> 
>-void INTERNAL_GL_APIENTRY glGetQueryObjectivNULL(GLuint id, GLenum pname, GLint *params)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glGetQueryObjectivNULL(GLuint id, GLenum pname, GLint *params) {}
> 
>-void INTERNAL_GL_APIENTRY glGetQueryObjectui64vNULL(GLuint id, GLenum pname, GLuint64 *params)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glGetQueryObjectui64vNULL(GLuint id, GLenum pname, GLuint64 *params) {}
> 
>-void INTERNAL_GL_APIENTRY glGetQueryObjectuivNULL(GLuint id, GLenum pname, GLuint *params)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glGetQueryObjectuivNULL(GLuint id, GLenum pname, GLuint *params) {}
> 
>-void INTERNAL_GL_APIENTRY glGetQueryivNULL(GLenum target, GLenum pname, GLint *params)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glGetQueryivNULL(GLenum target, GLenum pname, GLint *params) {}
> 
> void INTERNAL_GL_APIENTRY glGetRenderbufferParameterivNULL(GLenum target,
>                                                            GLenum pname,
>                                                            GLint *params)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glGetSamplerParameterIivNULL(GLuint sampler, GLenum pname, GLint *params)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glGetSamplerParameterIuivNULL(GLuint sampler,
>                                                         GLenum pname,
>                                                         GLuint *params)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glGetSamplerParameterfvNULL(GLuint sampler, GLenum pname, GLfloat *params)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glGetSamplerParameterivNULL(GLuint sampler, GLenum pname, GLint *params)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glGetShaderInfoLogNULL(GLuint shader,
>                                                  GLsizei bufSize,
>                                                  GLsizei *length,
>                                                  GLchar *infoLog)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glGetShaderPrecisionFormatNULL(GLenum shadertype,
>                                                          GLenum precisiontype,
>                                                          GLint *range,
>                                                          GLint *precision)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glGetShaderSourceNULL(GLuint shader,
>                                                 GLsizei bufSize,
>                                                 GLsizei *length,
>                                                 GLchar *source)
>-{
>-}
>+{}
> 
>-void INTERNAL_GL_APIENTRY glGetShaderivNULL(GLuint shader, GLenum pname, GLint *params)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glGetShaderivNULL(GLuint shader, GLenum pname, GLint *params) {}
> 
> const GLubyte *INTERNAL_GL_APIENTRY glGetStringNULL(GLenum name)
> {
>@@ -1704,43 +1321,31 @@ GLint INTERNAL_GL_APIENTRY glGetSubroutineUniformLocationNULL(GLuint program,
> 
> void INTERNAL_GL_APIENTRY
> glGetSyncivNULL(GLsync sync, GLenum pname, GLsizei bufSize, GLsizei *length, GLint *values)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY
> glGetTexImageNULL(GLenum target, GLint level, GLenum format, GLenum type, void *pixels)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glGetTexLevelParameterfvNULL(GLenum target,
>                                                        GLint level,
>                                                        GLenum pname,
>                                                        GLfloat *params)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glGetTexLevelParameterivNULL(GLenum target,
>                                                        GLint level,
>                                                        GLenum pname,
>                                                        GLint *params)
>-{
>-}
>+{}
> 
>-void INTERNAL_GL_APIENTRY glGetTexParameterIivNULL(GLenum target, GLenum pname, GLint *params)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glGetTexParameterIivNULL(GLenum target, GLenum pname, GLint *params) {}
> 
>-void INTERNAL_GL_APIENTRY glGetTexParameterIuivNULL(GLenum target, GLenum pname, GLuint *params)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glGetTexParameterIuivNULL(GLenum target, GLenum pname, GLuint *params) {}
> 
>-void INTERNAL_GL_APIENTRY glGetTexParameterfvNULL(GLenum target, GLenum pname, GLfloat *params)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glGetTexParameterfvNULL(GLenum target, GLenum pname, GLfloat *params) {}
> 
>-void INTERNAL_GL_APIENTRY glGetTexParameterivNULL(GLenum target, GLenum pname, GLint *params)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glGetTexParameterivNULL(GLenum target, GLenum pname, GLint *params) {}
> 
> void INTERNAL_GL_APIENTRY glGetTextureImageNULL(GLuint texture,
>                                                 GLint level,
>@@ -1748,40 +1353,33 @@ void INTERNAL_GL_APIENTRY glGetTextureImageNULL(GLuint texture,
>                                                 GLenum type,
>                                                 GLsizei bufSize,
>                                                 void *pixels)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glGetTextureLevelParameterfvNULL(GLuint texture,
>                                                            GLint level,
>                                                            GLenum pname,
>                                                            GLfloat *params)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glGetTextureLevelParameterivNULL(GLuint texture,
>                                                            GLint level,
>                                                            GLenum pname,
>                                                            GLint *params)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glGetTextureParameterIivNULL(GLuint texture, GLenum pname, GLint *params)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glGetTextureParameterIuivNULL(GLuint texture,
>                                                         GLenum pname,
>                                                         GLuint *params)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glGetTextureParameterfvNULL(GLuint texture, GLenum pname, GLfloat *params)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glGetTextureParameterivNULL(GLuint texture, GLenum pname, GLint *params)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glGetTextureSubImageNULL(GLuint texture,
>                                                    GLint level,
>@@ -1795,8 +1393,7 @@ void INTERNAL_GL_APIENTRY glGetTextureSubImageNULL(GLuint texture,
>                                                    GLenum type,
>                                                    GLsizei bufSize,
>                                                    void *pixels)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glGetTransformFeedbackVaryingNULL(GLuint program,
>                                                             GLuint index,
>@@ -1805,26 +1402,21 @@ void INTERNAL_GL_APIENTRY glGetTransformFeedbackVaryingNULL(GLuint program,
>                                                             GLsizei *size,
>                                                             GLenum *type,
>                                                             GLchar *name)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glGetTransformFeedbacki64_vNULL(GLuint xfb,
>                                                           GLenum pname,
>                                                           GLuint index,
>                                                           GLint64 *param)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glGetTransformFeedbacki_vNULL(GLuint xfb,
>                                                         GLenum pname,
>                                                         GLuint index,
>                                                         GLint *param)
>-{
>-}
>+{}
> 
>-void INTERNAL_GL_APIENTRY glGetTransformFeedbackivNULL(GLuint xfb, GLenum pname, GLint *param)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glGetTransformFeedbackivNULL(GLuint xfb, GLenum pname, GLint *param) {}
> 
> GLuint INTERNAL_GL_APIENTRY glGetUniformBlockIndexNULL(GLuint program,
>                                                        const GLchar *uniformBlockName)
>@@ -1836,8 +1428,7 @@ void INTERNAL_GL_APIENTRY glGetUniformIndicesNULL(GLuint program,
>                                                   GLsizei uniformCount,
>                                                   const GLchar *const *uniformNames,
>                                                   GLuint *uniformIndices)
>-{
>-}
>+{}
> 
> GLint INTERNAL_GL_APIENTRY glGetUniformLocationNULL(GLuint program, const GLchar *name)
> {
>@@ -1847,77 +1438,50 @@ GLint INTERNAL_GL_APIENTRY glGetUniformLocationNULL(GLuint program, const GLchar
> void INTERNAL_GL_APIENTRY glGetUniformSubroutineuivNULL(GLenum shadertype,
>                                                         GLint location,
>                                                         GLuint *params)
>-{
>-}
>+{}
> 
>-void INTERNAL_GL_APIENTRY glGetUniformdvNULL(GLuint program, GLint location, GLdouble *params)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glGetUniformdvNULL(GLuint program, GLint location, GLdouble *params) {}
> 
>-void INTERNAL_GL_APIENTRY glGetUniformfvNULL(GLuint program, GLint location, GLfloat *params)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glGetUniformfvNULL(GLuint program, GLint location, GLfloat *params) {}
> 
>-void INTERNAL_GL_APIENTRY glGetUniformivNULL(GLuint program, GLint location, GLint *params)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glGetUniformivNULL(GLuint program, GLint location, GLint *params) {}
> 
>-void INTERNAL_GL_APIENTRY glGetUniformuivNULL(GLuint program, GLint location, GLuint *params)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glGetUniformuivNULL(GLuint program, GLint location, GLuint *params) {}
> 
> void INTERNAL_GL_APIENTRY glGetVertexArrayIndexed64ivNULL(GLuint vaobj,
>                                                           GLuint index,
>                                                           GLenum pname,
>                                                           GLint64 *param)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glGetVertexArrayIndexedivNULL(GLuint vaobj,
>                                                         GLuint index,
>                                                         GLenum pname,
>                                                         GLint *param)
>-{
>-}
>+{}
> 
>-void INTERNAL_GL_APIENTRY glGetVertexArrayivNULL(GLuint vaobj, GLenum pname, GLint *param)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glGetVertexArrayivNULL(GLuint vaobj, GLenum pname, GLint *param) {}
> 
>-void INTERNAL_GL_APIENTRY glGetVertexAttribIivNULL(GLuint index, GLenum pname, GLint *params)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glGetVertexAttribIivNULL(GLuint index, GLenum pname, GLint *params) {}
> 
>-void INTERNAL_GL_APIENTRY glGetVertexAttribIuivNULL(GLuint index, GLenum pname, GLuint *params)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glGetVertexAttribIuivNULL(GLuint index, GLenum pname, GLuint *params) {}
> 
>-void INTERNAL_GL_APIENTRY glGetVertexAttribLdvNULL(GLuint index, GLenum pname, GLdouble *params)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glGetVertexAttribLdvNULL(GLuint index, GLenum pname, GLdouble *params) {}
> 
> void INTERNAL_GL_APIENTRY glGetVertexAttribPointervNULL(GLuint index, GLenum pname, void **pointer)
>-{
>-}
>+{}
> 
>-void INTERNAL_GL_APIENTRY glGetVertexAttribdvNULL(GLuint index, GLenum pname, GLdouble *params)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glGetVertexAttribdvNULL(GLuint index, GLenum pname, GLdouble *params) {}
> 
>-void INTERNAL_GL_APIENTRY glGetVertexAttribfvNULL(GLuint index, GLenum pname, GLfloat *params)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glGetVertexAttribfvNULL(GLuint index, GLenum pname, GLfloat *params) {}
> 
>-void INTERNAL_GL_APIENTRY glGetVertexAttribivNULL(GLuint index, GLenum pname, GLint *params)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glGetVertexAttribivNULL(GLuint index, GLenum pname, GLint *params) {}
> 
> void INTERNAL_GL_APIENTRY glGetnCompressedTexImageNULL(GLenum target,
>                                                        GLint lod,
>                                                        GLsizei bufSize,
>                                                        void *pixels)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glGetnTexImageNULL(GLenum target,
>                                              GLint level,
>@@ -1925,66 +1489,52 @@ void INTERNAL_GL_APIENTRY glGetnTexImageNULL(GLenum target,
>                                              GLenum type,
>                                              GLsizei bufSize,
>                                              void *pixels)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glGetnUniformdvNULL(GLuint program,
>                                               GLint location,
>                                               GLsizei bufSize,
>                                               GLdouble *params)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glGetnUniformfvNULL(GLuint program,
>                                               GLint location,
>                                               GLsizei bufSize,
>                                               GLfloat *params)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glGetnUniformivNULL(GLuint program,
>                                               GLint location,
>                                               GLsizei bufSize,
>                                               GLint *params)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glGetnUniformuivNULL(GLuint program,
>                                                GLint location,
>                                                GLsizei bufSize,
>                                                GLuint *params)
>-{
>-}
>+{}
> 
>-void INTERNAL_GL_APIENTRY glHintNULL(GLenum target, GLenum mode)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glHintNULL(GLenum target, GLenum mode) {}
> 
>-void INTERNAL_GL_APIENTRY glInsertEventMarkerEXTNULL(GLsizei length, const GLchar *marker)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glInsertEventMarkerEXTNULL(GLsizei length, const GLchar *marker) {}
> 
>-void INTERNAL_GL_APIENTRY glInvalidateBufferDataNULL(GLuint buffer)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glInvalidateBufferDataNULL(GLuint buffer) {}
> 
> void INTERNAL_GL_APIENTRY glInvalidateBufferSubDataNULL(GLuint buffer,
>                                                         GLintptr offset,
>                                                         GLsizeiptr length)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glInvalidateFramebufferNULL(GLenum target,
>                                                       GLsizei numAttachments,
>                                                       const GLenum *attachments)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glInvalidateNamedFramebufferDataNULL(GLuint framebuffer,
>                                                                GLsizei numAttachments,
>                                                                const GLenum *attachments)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glInvalidateNamedFramebufferSubDataNULL(GLuint framebuffer,
>                                                                   GLsizei numAttachments,
>@@ -1993,8 +1543,7 @@ void INTERNAL_GL_APIENTRY glInvalidateNamedFramebufferSubDataNULL(GLuint framebu
>                                                                   GLint y,
>                                                                   GLsizei width,
>                                                                   GLsizei height)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glInvalidateSubFramebufferNULL(GLenum target,
>                                                          GLsizei numAttachments,
>@@ -2003,12 +1552,9 @@ void INTERNAL_GL_APIENTRY glInvalidateSubFramebufferNULL(GLenum target,
>                                                          GLint y,
>                                                          GLsizei width,
>                                                          GLsizei height)
>-{
>-}
>+{}
> 
>-void INTERNAL_GL_APIENTRY glInvalidateTexImageNULL(GLuint texture, GLint level)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glInvalidateTexImageNULL(GLuint texture, GLint level) {}
> 
> void INTERNAL_GL_APIENTRY glInvalidateTexSubImageNULL(GLuint texture,
>                                                       GLint level,
>@@ -2018,8 +1564,7 @@ void INTERNAL_GL_APIENTRY glInvalidateTexSubImageNULL(GLuint texture,
>                                                       GLsizei width,
>                                                       GLsizei height,
>                                                       GLsizei depth)
>-{
>-}
>+{}
> 
> GLboolean INTERNAL_GL_APIENTRY glIsBufferNULL(GLuint buffer)
> {
>@@ -2101,17 +1646,11 @@ GLboolean INTERNAL_GL_APIENTRY glIsVertexArrayNULL(GLuint array)
>     return static_cast<GLboolean>(0);
> }
> 
>-void INTERNAL_GL_APIENTRY glLineWidthNULL(GLfloat width)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glLineWidthNULL(GLfloat width) {}
> 
>-void INTERNAL_GL_APIENTRY glLinkProgramNULL(GLuint program)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glLinkProgramNULL(GLuint program) {}
> 
>-void INTERNAL_GL_APIENTRY glLogicOpNULL(GLenum opcode)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glLogicOpNULL(GLenum opcode) {}
> 
> void *INTERNAL_GL_APIENTRY glMapBufferNULL(GLenum target, GLenum access)
> {
>@@ -2139,43 +1678,36 @@ void *INTERNAL_GL_APIENTRY glMapNamedBufferRangeNULL(GLuint buffer,
>     return static_cast<void *>(0);
> }
> 
>-void INTERNAL_GL_APIENTRY glMatrixLoadfEXTNULL(GLenum mode, const GLfloat *m)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glMatrixLoadfEXTNULL(GLenum mode, const GLfloat *m) {}
> 
>-void INTERNAL_GL_APIENTRY glMemoryBarrierNULL(GLbitfield barriers)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glMaxShaderCompilerThreadsARBNULL(GLuint count) {}
> 
>-void INTERNAL_GL_APIENTRY glMemoryBarrierByRegionNULL(GLbitfield barriers)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glMaxShaderCompilerThreadsKHRNULL(GLuint count) {}
> 
>-void INTERNAL_GL_APIENTRY glMinSampleShadingNULL(GLfloat value)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glMemoryBarrierNULL(GLbitfield barriers) {}
>+
>+void INTERNAL_GL_APIENTRY glMemoryBarrierByRegionNULL(GLbitfield barriers) {}
>+
>+void INTERNAL_GL_APIENTRY glMinSampleShadingNULL(GLfloat value) {}
> 
> void INTERNAL_GL_APIENTRY glMultiDrawArraysNULL(GLenum mode,
>                                                 const GLint *first,
>                                                 const GLsizei *count,
>                                                 GLsizei drawcount)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glMultiDrawArraysIndirectNULL(GLenum mode,
>                                                         const void *indirect,
>                                                         GLsizei drawcount,
>                                                         GLsizei stride)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glMultiDrawElementsNULL(GLenum mode,
>                                                   const GLsizei *count,
>                                                   GLenum type,
>                                                   const void *const *indices,
>                                                   GLsizei drawcount)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glMultiDrawElementsBaseVertexNULL(GLenum mode,
>                                                             const GLsizei *count,
>@@ -2183,113 +1715,91 @@ void INTERNAL_GL_APIENTRY glMultiDrawElementsBaseVertexNULL(GLenum mode,
>                                                             const void *const *indices,
>                                                             GLsizei drawcount,
>                                                             const GLint *basevertex)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glMultiDrawElementsIndirectNULL(GLenum mode,
>                                                           GLenum type,
>                                                           const void *indirect,
>                                                           GLsizei drawcount,
>                                                           GLsizei stride)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glNamedBufferDataNULL(GLuint buffer,
>                                                 GLsizeiptr size,
>                                                 const void *data,
>                                                 GLenum usage)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glNamedBufferStorageNULL(GLuint buffer,
>                                                    GLsizeiptr size,
>                                                    const void *data,
>                                                    GLbitfield flags)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glNamedBufferSubDataNULL(GLuint buffer,
>                                                    GLintptr offset,
>                                                    GLsizeiptr size,
>                                                    const void *data)
>-{
>-}
>+{}
> 
>-void INTERNAL_GL_APIENTRY glNamedFramebufferDrawBufferNULL(GLuint framebuffer, GLenum buf)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glNamedFramebufferDrawBufferNULL(GLuint framebuffer, GLenum buf) {}
> 
> void INTERNAL_GL_APIENTRY glNamedFramebufferDrawBuffersNULL(GLuint framebuffer,
>                                                             GLsizei n,
>                                                             const GLenum *bufs)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glNamedFramebufferParameteriNULL(GLuint framebuffer,
>                                                            GLenum pname,
>                                                            GLint param)
>-{
>-}
>+{}
> 
>-void INTERNAL_GL_APIENTRY glNamedFramebufferReadBufferNULL(GLuint framebuffer, GLenum src)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glNamedFramebufferReadBufferNULL(GLuint framebuffer, GLenum src) {}
> 
> void INTERNAL_GL_APIENTRY glNamedFramebufferRenderbufferNULL(GLuint framebuffer,
>                                                              GLenum attachment,
>                                                              GLenum renderbuffertarget,
>                                                              GLuint renderbuffer)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glNamedFramebufferTextureNULL(GLuint framebuffer,
>                                                         GLenum attachment,
>                                                         GLuint texture,
>                                                         GLint level)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glNamedFramebufferTextureLayerNULL(GLuint framebuffer,
>                                                              GLenum attachment,
>                                                              GLuint texture,
>                                                              GLint level,
>                                                              GLint layer)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glNamedRenderbufferStorageNULL(GLuint renderbuffer,
>                                                          GLenum internalformat,
>                                                          GLsizei width,
>                                                          GLsizei height)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glNamedRenderbufferStorageMultisampleNULL(GLuint renderbuffer,
>                                                                     GLsizei samples,
>                                                                     GLenum internalformat,
>                                                                     GLsizei width,
>                                                                     GLsizei height)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glObjectLabelNULL(GLenum identifier,
>                                             GLuint name,
>                                             GLsizei length,
>                                             const GLchar *label)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glObjectPtrLabelNULL(const void *ptr, GLsizei length, const GLchar *label)
>-{
>-}
>+{}
> 
>-void INTERNAL_GL_APIENTRY glPatchParameterfvNULL(GLenum pname, const GLfloat *values)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glPatchParameterfvNULL(GLenum pname, const GLfloat *values) {}
> 
>-void INTERNAL_GL_APIENTRY glPatchParameteriNULL(GLenum pname, GLint value)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glPatchParameteriNULL(GLenum pname, GLint value) {}
> 
> void INTERNAL_GL_APIENTRY glPathCommandsNVNULL(GLuint path,
>                                                GLsizei numCommands,
>@@ -2297,68 +1807,37 @@ void INTERNAL_GL_APIENTRY glPathCommandsNVNULL(GLuint path,
>                                                GLsizei numCoords,
>                                                GLenum coordType,
>                                                const void *coords)
>-{
>-}
>+{}
> 
>-void INTERNAL_GL_APIENTRY glPathParameterfNVNULL(GLuint path, GLenum pname, GLfloat value)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glPathParameterfNVNULL(GLuint path, GLenum pname, GLfloat value) {}
> 
>-void INTERNAL_GL_APIENTRY glPathParameteriNVNULL(GLuint path, GLenum pname, GLint value)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glPathParameteriNVNULL(GLuint path, GLenum pname, GLint value) {}
> 
>-void INTERNAL_GL_APIENTRY glPathStencilFuncNVNULL(GLenum func, GLint ref, GLuint mask)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glPathStencilFuncNVNULL(GLenum func, GLint ref, GLuint mask) {}
> 
>-void INTERNAL_GL_APIENTRY glPauseTransformFeedbackNULL()
>-{
>-}
>+void INTERNAL_GL_APIENTRY glPauseTransformFeedbackNULL() {}
> 
>-void INTERNAL_GL_APIENTRY glPixelStorefNULL(GLenum pname, GLfloat param)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glPixelStorefNULL(GLenum pname, GLfloat param) {}
> 
>-void INTERNAL_GL_APIENTRY glPixelStoreiNULL(GLenum pname, GLint param)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glPixelStoreiNULL(GLenum pname, GLint param) {}
> 
>-void INTERNAL_GL_APIENTRY glPointParameterfNULL(GLenum pname, GLfloat param)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glPointParameterfNULL(GLenum pname, GLfloat param) {}
> 
>-void INTERNAL_GL_APIENTRY glPointParameterfvNULL(GLenum pname, const GLfloat *params)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glPointParameterfvNULL(GLenum pname, const GLfloat *params) {}
> 
>-void INTERNAL_GL_APIENTRY glPointParameteriNULL(GLenum pname, GLint param)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glPointParameteriNULL(GLenum pname, GLint param) {}
> 
>-void INTERNAL_GL_APIENTRY glPointParameterivNULL(GLenum pname, const GLint *params)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glPointParameterivNULL(GLenum pname, const GLint *params) {}
> 
>-void INTERNAL_GL_APIENTRY glPointSizeNULL(GLfloat size)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glPointSizeNULL(GLfloat size) {}
> 
>-void INTERNAL_GL_APIENTRY glPolygonModeNULL(GLenum face, GLenum mode)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glPolygonModeNULL(GLenum face, GLenum mode) {}
> 
>-void INTERNAL_GL_APIENTRY glPolygonOffsetNULL(GLfloat factor, GLfloat units)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glPolygonOffsetNULL(GLfloat factor, GLfloat units) {}
> 
>-void INTERNAL_GL_APIENTRY glPopDebugGroupNULL()
>-{
>-}
>+void INTERNAL_GL_APIENTRY glPopDebugGroupNULL() {}
> 
>-void INTERNAL_GL_APIENTRY glPopGroupMarkerEXTNULL()
>-{
>-}
>+void INTERNAL_GL_APIENTRY glPopGroupMarkerEXTNULL() {}
> 
> void INTERNAL_GL_APIENTRY glPrimitiveBoundingBoxNULL(GLfloat minX,
>                                                      GLfloat minY,
>@@ -2368,176 +1847,141 @@ void INTERNAL_GL_APIENTRY glPrimitiveBoundingBoxNULL(GLfloat minX,
>                                                      GLfloat maxY,
>                                                      GLfloat maxZ,
>                                                      GLfloat maxW)
>-{
>-}
>+{}
> 
>-void INTERNAL_GL_APIENTRY glPrimitiveRestartIndexNULL(GLuint index)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glPrimitiveRestartIndexNULL(GLuint index) {}
> 
> void INTERNAL_GL_APIENTRY glProgramBinaryNULL(GLuint program,
>                                               GLenum binaryFormat,
>                                               const void *binary,
>                                               GLsizei length)
>-{
>-}
>+{}
> 
>-void INTERNAL_GL_APIENTRY glProgramParameteriNULL(GLuint program, GLenum pname, GLint value)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glProgramParameteriNULL(GLuint program, GLenum pname, GLint value) {}
> 
> void INTERNAL_GL_APIENTRY glProgramPathFragmentInputGenNVNULL(GLuint program,
>                                                               GLint location,
>                                                               GLenum genMode,
>                                                               GLint components,
>                                                               const GLfloat *coeffs)
>-{
>-}
>+{}
> 
>-void INTERNAL_GL_APIENTRY glProgramUniform1dNULL(GLuint program, GLint location, GLdouble v0)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glProgramUniform1dNULL(GLuint program, GLint location, GLdouble v0) {}
> 
> void INTERNAL_GL_APIENTRY glProgramUniform1dvNULL(GLuint program,
>                                                   GLint location,
>                                                   GLsizei count,
>                                                   const GLdouble *value)
>-{
>-}
>+{}
> 
>-void INTERNAL_GL_APIENTRY glProgramUniform1fNULL(GLuint program, GLint location, GLfloat v0)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glProgramUniform1fNULL(GLuint program, GLint location, GLfloat v0) {}
> 
> void INTERNAL_GL_APIENTRY glProgramUniform1fvNULL(GLuint program,
>                                                   GLint location,
>                                                   GLsizei count,
>                                                   const GLfloat *value)
>-{
>-}
>+{}
> 
>-void INTERNAL_GL_APIENTRY glProgramUniform1iNULL(GLuint program, GLint location, GLint v0)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glProgramUniform1iNULL(GLuint program, GLint location, GLint v0) {}
> 
> void INTERNAL_GL_APIENTRY glProgramUniform1ivNULL(GLuint program,
>                                                   GLint location,
>                                                   GLsizei count,
>                                                   const GLint *value)
>-{
>-}
>+{}
> 
>-void INTERNAL_GL_APIENTRY glProgramUniform1uiNULL(GLuint program, GLint location, GLuint v0)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glProgramUniform1uiNULL(GLuint program, GLint location, GLuint v0) {}
> 
> void INTERNAL_GL_APIENTRY glProgramUniform1uivNULL(GLuint program,
>                                                    GLint location,
>                                                    GLsizei count,
>                                                    const GLuint *value)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glProgramUniform2dNULL(GLuint program,
>                                                  GLint location,
>                                                  GLdouble v0,
>                                                  GLdouble v1)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glProgramUniform2dvNULL(GLuint program,
>                                                   GLint location,
>                                                   GLsizei count,
>                                                   const GLdouble *value)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glProgramUniform2fNULL(GLuint program,
>                                                  GLint location,
>                                                  GLfloat v0,
>                                                  GLfloat v1)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glProgramUniform2fvNULL(GLuint program,
>                                                   GLint location,
>                                                   GLsizei count,
>                                                   const GLfloat *value)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glProgramUniform2iNULL(GLuint program, GLint location, GLint v0, GLint v1)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glProgramUniform2ivNULL(GLuint program,
>                                                   GLint location,
>                                                   GLsizei count,
>                                                   const GLint *value)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glProgramUniform2uiNULL(GLuint program,
>                                                   GLint location,
>                                                   GLuint v0,
>                                                   GLuint v1)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glProgramUniform2uivNULL(GLuint program,
>                                                    GLint location,
>                                                    GLsizei count,
>                                                    const GLuint *value)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY
> glProgramUniform3dNULL(GLuint program, GLint location, GLdouble v0, GLdouble v1, GLdouble v2)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glProgramUniform3dvNULL(GLuint program,
>                                                   GLint location,
>                                                   GLsizei count,
>                                                   const GLdouble *value)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY
> glProgramUniform3fNULL(GLuint program, GLint location, GLfloat v0, GLfloat v1, GLfloat v2)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glProgramUniform3fvNULL(GLuint program,
>                                                   GLint location,
>                                                   GLsizei count,
>                                                   const GLfloat *value)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY
> glProgramUniform3iNULL(GLuint program, GLint location, GLint v0, GLint v1, GLint v2)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glProgramUniform3ivNULL(GLuint program,
>                                                   GLint location,
>                                                   GLsizei count,
>                                                   const GLint *value)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY
> glProgramUniform3uiNULL(GLuint program, GLint location, GLuint v0, GLuint v1, GLuint v2)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glProgramUniform3uivNULL(GLuint program,
>                                                    GLint location,
>                                                    GLsizei count,
>                                                    const GLuint *value)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glProgramUniform4dNULL(GLuint program,
>                                                  GLint location,
>@@ -2545,15 +1989,13 @@ void INTERNAL_GL_APIENTRY glProgramUniform4dNULL(GLuint program,
>                                                  GLdouble v1,
>                                                  GLdouble v2,
>                                                  GLdouble v3)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glProgramUniform4dvNULL(GLuint program,
>                                                   GLint location,
>                                                   GLsizei count,
>                                                   const GLdouble *value)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glProgramUniform4fNULL(GLuint program,
>                                                  GLint location,
>@@ -2561,206 +2003,173 @@ void INTERNAL_GL_APIENTRY glProgramUniform4fNULL(GLuint program,
>                                                  GLfloat v1,
>                                                  GLfloat v2,
>                                                  GLfloat v3)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glProgramUniform4fvNULL(GLuint program,
>                                                   GLint location,
>                                                   GLsizei count,
>                                                   const GLfloat *value)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY
> glProgramUniform4iNULL(GLuint program, GLint location, GLint v0, GLint v1, GLint v2, GLint v3)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glProgramUniform4ivNULL(GLuint program,
>                                                   GLint location,
>                                                   GLsizei count,
>                                                   const GLint *value)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY
> glProgramUniform4uiNULL(GLuint program, GLint location, GLuint v0, GLuint v1, GLuint v2, GLuint v3)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glProgramUniform4uivNULL(GLuint program,
>                                                    GLint location,
>                                                    GLsizei count,
>                                                    const GLuint *value)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glProgramUniformMatrix2dvNULL(GLuint program,
>                                                         GLint location,
>                                                         GLsizei count,
>                                                         GLboolean transpose,
>                                                         const GLdouble *value)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glProgramUniformMatrix2fvNULL(GLuint program,
>                                                         GLint location,
>                                                         GLsizei count,
>                                                         GLboolean transpose,
>                                                         const GLfloat *value)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glProgramUniformMatrix2x3dvNULL(GLuint program,
>                                                           GLint location,
>                                                           GLsizei count,
>                                                           GLboolean transpose,
>                                                           const GLdouble *value)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glProgramUniformMatrix2x3fvNULL(GLuint program,
>                                                           GLint location,
>                                                           GLsizei count,
>                                                           GLboolean transpose,
>                                                           const GLfloat *value)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glProgramUniformMatrix2x4dvNULL(GLuint program,
>                                                           GLint location,
>                                                           GLsizei count,
>                                                           GLboolean transpose,
>                                                           const GLdouble *value)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glProgramUniformMatrix2x4fvNULL(GLuint program,
>                                                           GLint location,
>                                                           GLsizei count,
>                                                           GLboolean transpose,
>                                                           const GLfloat *value)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glProgramUniformMatrix3dvNULL(GLuint program,
>                                                         GLint location,
>                                                         GLsizei count,
>                                                         GLboolean transpose,
>                                                         const GLdouble *value)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glProgramUniformMatrix3fvNULL(GLuint program,
>                                                         GLint location,
>                                                         GLsizei count,
>                                                         GLboolean transpose,
>                                                         const GLfloat *value)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glProgramUniformMatrix3x2dvNULL(GLuint program,
>                                                           GLint location,
>                                                           GLsizei count,
>                                                           GLboolean transpose,
>                                                           const GLdouble *value)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glProgramUniformMatrix3x2fvNULL(GLuint program,
>                                                           GLint location,
>                                                           GLsizei count,
>                                                           GLboolean transpose,
>                                                           const GLfloat *value)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glProgramUniformMatrix3x4dvNULL(GLuint program,
>                                                           GLint location,
>                                                           GLsizei count,
>                                                           GLboolean transpose,
>                                                           const GLdouble *value)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glProgramUniformMatrix3x4fvNULL(GLuint program,
>                                                           GLint location,
>                                                           GLsizei count,
>                                                           GLboolean transpose,
>                                                           const GLfloat *value)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glProgramUniformMatrix4dvNULL(GLuint program,
>                                                         GLint location,
>                                                         GLsizei count,
>                                                         GLboolean transpose,
>                                                         const GLdouble *value)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glProgramUniformMatrix4fvNULL(GLuint program,
>                                                         GLint location,
>                                                         GLsizei count,
>                                                         GLboolean transpose,
>                                                         const GLfloat *value)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glProgramUniformMatrix4x2dvNULL(GLuint program,
>                                                           GLint location,
>                                                           GLsizei count,
>                                                           GLboolean transpose,
>                                                           const GLdouble *value)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glProgramUniformMatrix4x2fvNULL(GLuint program,
>                                                           GLint location,
>                                                           GLsizei count,
>                                                           GLboolean transpose,
>                                                           const GLfloat *value)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glProgramUniformMatrix4x3dvNULL(GLuint program,
>                                                           GLint location,
>                                                           GLsizei count,
>                                                           GLboolean transpose,
>                                                           const GLdouble *value)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glProgramUniformMatrix4x3fvNULL(GLuint program,
>                                                           GLint location,
>                                                           GLsizei count,
>                                                           GLboolean transpose,
>                                                           const GLfloat *value)
>-{
>-}
>+{}
> 
>-void INTERNAL_GL_APIENTRY glProvokingVertexNULL(GLenum mode)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glProvokingVertexNULL(GLenum mode) {}
> 
> void INTERNAL_GL_APIENTRY glPushDebugGroupNULL(GLenum source,
>                                                GLuint id,
>                                                GLsizei length,
>                                                const GLchar *message)
>-{
>-}
>+{}
> 
>-void INTERNAL_GL_APIENTRY glPushGroupMarkerEXTNULL(GLsizei length, const GLchar *marker)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glPushGroupMarkerEXTNULL(GLsizei length, const GLchar *marker) {}
> 
>-void INTERNAL_GL_APIENTRY glQueryCounterNULL(GLuint id, GLenum target)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glQueryCounterNULL(GLuint id, GLenum target) {}
> 
>-void INTERNAL_GL_APIENTRY glReadBufferNULL(GLenum src)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glReadBufferNULL(GLenum src) {}
> 
> void INTERNAL_GL_APIENTRY glReadPixelsNULL(GLint x,
>                                            GLint y,
>@@ -2769,8 +2178,7 @@ void INTERNAL_GL_APIENTRY glReadPixelsNULL(GLint x,
>                                            GLenum format,
>                                            GLenum type,
>                                            void *pixels)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glReadnPixelsNULL(GLint x,
>                                             GLint y,
>@@ -2780,111 +2188,80 @@ void INTERNAL_GL_APIENTRY glReadnPixelsNULL(GLint x,
>                                             GLenum type,
>                                             GLsizei bufSize,
>                                             void *data)
>-{
>-}
>+{}
> 
>-void INTERNAL_GL_APIENTRY glReleaseShaderCompilerNULL()
>-{
>-}
>+void INTERNAL_GL_APIENTRY glReleaseShaderCompilerNULL() {}
> 
> void INTERNAL_GL_APIENTRY glRenderbufferStorageNULL(GLenum target,
>                                                     GLenum internalformat,
>                                                     GLsizei width,
>                                                     GLsizei height)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glRenderbufferStorageMultisampleNULL(GLenum target,
>                                                                GLsizei samples,
>                                                                GLenum internalformat,
>                                                                GLsizei width,
>                                                                GLsizei height)
>-{
>-}
>+{}
> 
>-void INTERNAL_GL_APIENTRY glResumeTransformFeedbackNULL()
>-{
>-}
>+void INTERNAL_GL_APIENTRY glResumeTransformFeedbackNULL() {}
> 
>-void INTERNAL_GL_APIENTRY glSampleCoverageNULL(GLfloat value, GLboolean invert)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glSampleCoverageNULL(GLfloat value, GLboolean invert) {}
> 
>-void INTERNAL_GL_APIENTRY glSampleMaskiNULL(GLuint maskNumber, GLbitfield mask)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glSampleMaskiNULL(GLuint maskNumber, GLbitfield mask) {}
> 
> void INTERNAL_GL_APIENTRY glSamplerParameterIivNULL(GLuint sampler,
>                                                     GLenum pname,
>                                                     const GLint *param)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glSamplerParameterIuivNULL(GLuint sampler,
>                                                      GLenum pname,
>                                                      const GLuint *param)
>-{
>-}
>+{}
> 
>-void INTERNAL_GL_APIENTRY glSamplerParameterfNULL(GLuint sampler, GLenum pname, GLfloat param)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glSamplerParameterfNULL(GLuint sampler, GLenum pname, GLfloat param) {}
> 
> void INTERNAL_GL_APIENTRY glSamplerParameterfvNULL(GLuint sampler,
>                                                    GLenum pname,
>                                                    const GLfloat *param)
>-{
>-}
>+{}
> 
>-void INTERNAL_GL_APIENTRY glSamplerParameteriNULL(GLuint sampler, GLenum pname, GLint param)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glSamplerParameteriNULL(GLuint sampler, GLenum pname, GLint param) {}
> 
> void INTERNAL_GL_APIENTRY glSamplerParameterivNULL(GLuint sampler, GLenum pname, const GLint *param)
>-{
>-}
>+{}
> 
>-void INTERNAL_GL_APIENTRY glScissorNULL(GLint x, GLint y, GLsizei width, GLsizei height)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glScissorNULL(GLint x, GLint y, GLsizei width, GLsizei height) {}
> 
>-void INTERNAL_GL_APIENTRY glScissorArrayvNULL(GLuint first, GLsizei count, const GLint *v)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glScissorArrayvNULL(GLuint first, GLsizei count, const GLint *v) {}
> 
> void INTERNAL_GL_APIENTRY
> glScissorIndexedNULL(GLuint index, GLint left, GLint bottom, GLsizei width, GLsizei height)
>-{
>-}
>+{}
> 
>-void INTERNAL_GL_APIENTRY glScissorIndexedvNULL(GLuint index, const GLint *v)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glScissorIndexedvNULL(GLuint index, const GLint *v) {}
> 
>-void INTERNAL_GL_APIENTRY glSetFenceNVNULL(GLuint fence, GLenum condition)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glSetFenceNVNULL(GLuint fence, GLenum condition) {}
> 
> void INTERNAL_GL_APIENTRY glShaderBinaryNULL(GLsizei count,
>                                              const GLuint *shaders,
>                                              GLenum binaryformat,
>                                              const void *binary,
>                                              GLsizei length)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glShaderSourceNULL(GLuint shader,
>                                              GLsizei count,
>                                              const GLchar *const *string,
>                                              const GLint *length)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glShaderStorageBlockBindingNULL(GLuint program,
>                                                           GLuint storageBlockIndex,
>                                                           GLuint storageBlockBinding)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glStencilFillPathInstancedNVNULL(GLsizei numPaths,
>                                                            GLenum pathNameType,
>@@ -2894,42 +2271,29 @@ void INTERNAL_GL_APIENTRY glStencilFillPathInstancedNVNULL(GLsizei numPaths,
>                                                            GLuint mask,
>                                                            GLenum transformType,
>                                                            const GLfloat *transformValues)
>-{
>-}
>+{}
> 
>-void INTERNAL_GL_APIENTRY glStencilFillPathNVNULL(GLuint path, GLenum fillMode, GLuint mask)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glStencilFillPathNVNULL(GLuint path, GLenum fillMode, GLuint mask) {}
> 
>-void INTERNAL_GL_APIENTRY glStencilFuncNULL(GLenum func, GLint ref, GLuint mask)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glStencilFuncNULL(GLenum func, GLint ref, GLuint mask) {}
> 
> void INTERNAL_GL_APIENTRY glStencilFuncSeparateNULL(GLenum face,
>                                                     GLenum func,
>                                                     GLint ref,
>                                                     GLuint mask)
>-{
>-}
>+{}
> 
>-void INTERNAL_GL_APIENTRY glStencilMaskNULL(GLuint mask)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glStencilMaskNULL(GLuint mask) {}
> 
>-void INTERNAL_GL_APIENTRY glStencilMaskSeparateNULL(GLenum face, GLuint mask)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glStencilMaskSeparateNULL(GLenum face, GLuint mask) {}
> 
>-void INTERNAL_GL_APIENTRY glStencilOpNULL(GLenum fail, GLenum zfail, GLenum zpass)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glStencilOpNULL(GLenum fail, GLenum zfail, GLenum zpass) {}
> 
> void INTERNAL_GL_APIENTRY glStencilOpSeparateNULL(GLenum face,
>                                                   GLenum sfail,
>                                                   GLenum dpfail,
>                                                   GLenum dppass)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glStencilStrokePathInstancedNVNULL(GLsizei numPaths,
>                                                              GLenum pathNameType,
>@@ -2939,12 +2303,9 @@ void INTERNAL_GL_APIENTRY glStencilStrokePathInstancedNVNULL(GLsizei numPaths,
>                                                              GLuint mask,
>                                                              GLenum transformType,
>                                                              const GLfloat *transformValues)
>-{
>-}
>+{}
> 
>-void INTERNAL_GL_APIENTRY glStencilStrokePathNVNULL(GLuint path, GLint reference, GLuint mask)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glStencilStrokePathNVNULL(GLuint path, GLint reference, GLuint mask) {}
> 
> void INTERNAL_GL_APIENTRY glStencilThenCoverFillPathInstancedNVNULL(GLsizei numPaths,
>                                                                     GLenum pathNameType,
>@@ -2955,15 +2316,13 @@ void INTERNAL_GL_APIENTRY glStencilThenCoverFillPathInstancedNVNULL(GLsizei numP
>                                                                     GLenum coverMode,
>                                                                     GLenum transformType,
>                                                                     const GLfloat *transformValues)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glStencilThenCoverFillPathNVNULL(GLuint path,
>                                                            GLenum fillMode,
>                                                            GLuint mask,
>                                                            GLenum coverMode)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY
> glStencilThenCoverStrokePathInstancedNVNULL(GLsizei numPaths,
>@@ -2975,32 +2334,27 @@ glStencilThenCoverStrokePathInstancedNVNULL(GLsizei numPaths,
>                                             GLenum coverMode,
>                                             GLenum transformType,
>                                             const GLfloat *transformValues)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glStencilThenCoverStrokePathNVNULL(GLuint path,
>                                                              GLint reference,
>                                                              GLuint mask,
>                                                              GLenum coverMode)
>-{
>-}
>+{}
> 
> GLboolean INTERNAL_GL_APIENTRY glTestFenceNVNULL(GLuint fence)
> {
>     return static_cast<GLboolean>(0);
> }
> 
>-void INTERNAL_GL_APIENTRY glTexBufferNULL(GLenum target, GLenum internalformat, GLuint buffer)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glTexBufferNULL(GLenum target, GLenum internalformat, GLuint buffer) {}
> 
> void INTERNAL_GL_APIENTRY glTexBufferRangeNULL(GLenum target,
>                                                GLenum internalformat,
>                                                GLuint buffer,
>                                                GLintptr offset,
>                                                GLsizeiptr size)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glTexImage1DNULL(GLenum target,
>                                            GLint level,
>@@ -3010,8 +2364,7 @@ void INTERNAL_GL_APIENTRY glTexImage1DNULL(GLenum target,
>                                            GLenum format,
>                                            GLenum type,
>                                            const void *pixels)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glTexImage2DNULL(GLenum target,
>                                            GLint level,
>@@ -3022,8 +2375,7 @@ void INTERNAL_GL_APIENTRY glTexImage2DNULL(GLenum target,
>                                            GLenum format,
>                                            GLenum type,
>                                            const void *pixels)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glTexImage2DMultisampleNULL(GLenum target,
>                                                       GLsizei samples,
>@@ -3031,8 +2383,7 @@ void INTERNAL_GL_APIENTRY glTexImage2DMultisampleNULL(GLenum target,
>                                                       GLsizei width,
>                                                       GLsizei height,
>                                                       GLboolean fixedsamplelocations)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glTexImage3DNULL(GLenum target,
>                                            GLint level,
>@@ -3044,8 +2395,7 @@ void INTERNAL_GL_APIENTRY glTexImage3DNULL(GLenum target,
>                                            GLenum format,
>                                            GLenum type,
>                                            const void *pixels)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glTexImage3DMultisampleNULL(GLenum target,
>                                                       GLsizei samples,
>@@ -3054,47 +2404,34 @@ void INTERNAL_GL_APIENTRY glTexImage3DMultisampleNULL(GLenum target,
>                                                       GLsizei height,
>                                                       GLsizei depth,
>                                                       GLboolean fixedsamplelocations)
>-{
>-}
>+{}
> 
>-void INTERNAL_GL_APIENTRY glTexParameterIivNULL(GLenum target, GLenum pname, const GLint *params)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glTexParameterIivNULL(GLenum target, GLenum pname, const GLint *params) {}
> 
> void INTERNAL_GL_APIENTRY glTexParameterIuivNULL(GLenum target, GLenum pname, const GLuint *params)
>-{
>-}
>+{}
> 
>-void INTERNAL_GL_APIENTRY glTexParameterfNULL(GLenum target, GLenum pname, GLfloat param)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glTexParameterfNULL(GLenum target, GLenum pname, GLfloat param) {}
> 
> void INTERNAL_GL_APIENTRY glTexParameterfvNULL(GLenum target, GLenum pname, const GLfloat *params)
>-{
>-}
>+{}
> 
>-void INTERNAL_GL_APIENTRY glTexParameteriNULL(GLenum target, GLenum pname, GLint param)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glTexParameteriNULL(GLenum target, GLenum pname, GLint param) {}
> 
>-void INTERNAL_GL_APIENTRY glTexParameterivNULL(GLenum target, GLenum pname, const GLint *params)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glTexParameterivNULL(GLenum target, GLenum pname, const GLint *params) {}
> 
> void INTERNAL_GL_APIENTRY glTexStorage1DNULL(GLenum target,
>                                              GLsizei levels,
>                                              GLenum internalformat,
>                                              GLsizei width)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glTexStorage2DNULL(GLenum target,
>                                              GLsizei levels,
>                                              GLenum internalformat,
>                                              GLsizei width,
>                                              GLsizei height)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glTexStorage2DMultisampleNULL(GLenum target,
>                                                         GLsizei samples,
>@@ -3102,8 +2439,7 @@ void INTERNAL_GL_APIENTRY glTexStorage2DMultisampleNULL(GLenum target,
>                                                         GLsizei width,
>                                                         GLsizei height,
>                                                         GLboolean fixedsamplelocations)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glTexStorage3DNULL(GLenum target,
>                                              GLsizei levels,
>@@ -3111,8 +2447,7 @@ void INTERNAL_GL_APIENTRY glTexStorage3DNULL(GLenum target,
>                                              GLsizei width,
>                                              GLsizei height,
>                                              GLsizei depth)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glTexStorage3DMultisampleNULL(GLenum target,
>                                                         GLsizei samples,
>@@ -3121,8 +2456,7 @@ void INTERNAL_GL_APIENTRY glTexStorage3DMultisampleNULL(GLenum target,
>                                                         GLsizei height,
>                                                         GLsizei depth,
>                                                         GLboolean fixedsamplelocations)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glTexSubImage1DNULL(GLenum target,
>                                               GLint level,
>@@ -3131,8 +2465,7 @@ void INTERNAL_GL_APIENTRY glTexSubImage1DNULL(GLenum target,
>                                               GLenum format,
>                                               GLenum type,
>                                               const void *pixels)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glTexSubImage2DNULL(GLenum target,
>                                               GLint level,
>@@ -3143,8 +2476,7 @@ void INTERNAL_GL_APIENTRY glTexSubImage2DNULL(GLenum target,
>                                               GLenum format,
>                                               GLenum type,
>                                               const void *pixels)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glTexSubImage3DNULL(GLenum target,
>                                               GLint level,
>@@ -3157,69 +2489,54 @@ void INTERNAL_GL_APIENTRY glTexSubImage3DNULL(GLenum target,
>                                               GLenum format,
>                                               GLenum type,
>                                               const void *pixels)
>-{
>-}
>+{}
> 
>-void INTERNAL_GL_APIENTRY glTextureBarrierNULL()
>-{
>-}
>+void INTERNAL_GL_APIENTRY glTextureBarrierNULL() {}
> 
> void INTERNAL_GL_APIENTRY glTextureBufferNULL(GLuint texture, GLenum internalformat, GLuint buffer)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glTextureBufferRangeNULL(GLuint texture,
>                                                    GLenum internalformat,
>                                                    GLuint buffer,
>                                                    GLintptr offset,
>                                                    GLsizeiptr size)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glTextureParameterIivNULL(GLuint texture,
>                                                     GLenum pname,
>                                                     const GLint *params)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glTextureParameterIuivNULL(GLuint texture,
>                                                      GLenum pname,
>                                                      const GLuint *params)
>-{
>-}
>+{}
> 
>-void INTERNAL_GL_APIENTRY glTextureParameterfNULL(GLuint texture, GLenum pname, GLfloat param)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glTextureParameterfNULL(GLuint texture, GLenum pname, GLfloat param) {}
> 
> void INTERNAL_GL_APIENTRY glTextureParameterfvNULL(GLuint texture,
>                                                    GLenum pname,
>                                                    const GLfloat *param)
>-{
>-}
>+{}
> 
>-void INTERNAL_GL_APIENTRY glTextureParameteriNULL(GLuint texture, GLenum pname, GLint param)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glTextureParameteriNULL(GLuint texture, GLenum pname, GLint param) {}
> 
> void INTERNAL_GL_APIENTRY glTextureParameterivNULL(GLuint texture, GLenum pname, const GLint *param)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glTextureStorage1DNULL(GLuint texture,
>                                                  GLsizei levels,
>                                                  GLenum internalformat,
>                                                  GLsizei width)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glTextureStorage2DNULL(GLuint texture,
>                                                  GLsizei levels,
>                                                  GLenum internalformat,
>                                                  GLsizei width,
>                                                  GLsizei height)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glTextureStorage2DMultisampleNULL(GLuint texture,
>                                                             GLsizei samples,
>@@ -3227,8 +2544,7 @@ void INTERNAL_GL_APIENTRY glTextureStorage2DMultisampleNULL(GLuint texture,
>                                                             GLsizei width,
>                                                             GLsizei height,
>                                                             GLboolean fixedsamplelocations)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glTextureStorage3DNULL(GLuint texture,
>                                                  GLsizei levels,
>@@ -3236,8 +2552,7 @@ void INTERNAL_GL_APIENTRY glTextureStorage3DNULL(GLuint texture,
>                                                  GLsizei width,
>                                                  GLsizei height,
>                                                  GLsizei depth)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glTextureStorage3DMultisampleNULL(GLuint texture,
>                                                             GLsizei samples,
>@@ -3246,8 +2561,7 @@ void INTERNAL_GL_APIENTRY glTextureStorage3DMultisampleNULL(GLuint texture,
>                                                             GLsizei height,
>                                                             GLsizei depth,
>                                                             GLboolean fixedsamplelocations)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glTextureSubImage1DNULL(GLuint texture,
>                                                   GLint level,
>@@ -3256,8 +2570,7 @@ void INTERNAL_GL_APIENTRY glTextureSubImage1DNULL(GLuint texture,
>                                                   GLenum format,
>                                                   GLenum type,
>                                                   const void *pixels)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glTextureSubImage2DNULL(GLuint texture,
>                                                   GLint level,
>@@ -3268,8 +2581,7 @@ void INTERNAL_GL_APIENTRY glTextureSubImage2DNULL(GLuint texture,
>                                                   GLenum format,
>                                                   GLenum type,
>                                                   const void *pixels)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glTextureSubImage3DNULL(GLuint texture,
>                                                   GLint level,
>@@ -3282,8 +2594,7 @@ void INTERNAL_GL_APIENTRY glTextureSubImage3DNULL(GLuint texture,
>                                                   GLenum format,
>                                                   GLenum type,
>                                                   const void *pixels)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glTextureViewNULL(GLuint texture,
>                                             GLenum target,
>@@ -3293,296 +2604,211 @@ void INTERNAL_GL_APIENTRY glTextureViewNULL(GLuint texture,
>                                             GLuint numlevels,
>                                             GLuint minlayer,
>                                             GLuint numlayers)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glTransformFeedbackBufferBaseNULL(GLuint xfb, GLuint index, GLuint buffer)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glTransformFeedbackBufferRangeNULL(GLuint xfb,
>                                                              GLuint index,
>                                                              GLuint buffer,
>                                                              GLintptr offset,
>                                                              GLsizeiptr size)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glTransformFeedbackVaryingsNULL(GLuint program,
>                                                           GLsizei count,
>                                                           const GLchar *const *varyings,
>                                                           GLenum bufferMode)
>-{
>-}
>+{}
> 
>-void INTERNAL_GL_APIENTRY glUniform1dNULL(GLint location, GLdouble x)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glUniform1dNULL(GLint location, GLdouble x) {}
> 
>-void INTERNAL_GL_APIENTRY glUniform1dvNULL(GLint location, GLsizei count, const GLdouble *value)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glUniform1dvNULL(GLint location, GLsizei count, const GLdouble *value) {}
> 
>-void INTERNAL_GL_APIENTRY glUniform1fNULL(GLint location, GLfloat v0)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glUniform1fNULL(GLint location, GLfloat v0) {}
> 
>-void INTERNAL_GL_APIENTRY glUniform1fvNULL(GLint location, GLsizei count, const GLfloat *value)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glUniform1fvNULL(GLint location, GLsizei count, const GLfloat *value) {}
> 
>-void INTERNAL_GL_APIENTRY glUniform1iNULL(GLint location, GLint v0)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glUniform1iNULL(GLint location, GLint v0) {}
> 
>-void INTERNAL_GL_APIENTRY glUniform1ivNULL(GLint location, GLsizei count, const GLint *value)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glUniform1ivNULL(GLint location, GLsizei count, const GLint *value) {}
> 
>-void INTERNAL_GL_APIENTRY glUniform1uiNULL(GLint location, GLuint v0)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glUniform1uiNULL(GLint location, GLuint v0) {}
> 
>-void INTERNAL_GL_APIENTRY glUniform1uivNULL(GLint location, GLsizei count, const GLuint *value)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glUniform1uivNULL(GLint location, GLsizei count, const GLuint *value) {}
> 
>-void INTERNAL_GL_APIENTRY glUniform2dNULL(GLint location, GLdouble x, GLdouble y)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glUniform2dNULL(GLint location, GLdouble x, GLdouble y) {}
> 
>-void INTERNAL_GL_APIENTRY glUniform2dvNULL(GLint location, GLsizei count, const GLdouble *value)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glUniform2dvNULL(GLint location, GLsizei count, const GLdouble *value) {}
> 
>-void INTERNAL_GL_APIENTRY glUniform2fNULL(GLint location, GLfloat v0, GLfloat v1)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glUniform2fNULL(GLint location, GLfloat v0, GLfloat v1) {}
> 
>-void INTERNAL_GL_APIENTRY glUniform2fvNULL(GLint location, GLsizei count, const GLfloat *value)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glUniform2fvNULL(GLint location, GLsizei count, const GLfloat *value) {}
> 
>-void INTERNAL_GL_APIENTRY glUniform2iNULL(GLint location, GLint v0, GLint v1)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glUniform2iNULL(GLint location, GLint v0, GLint v1) {}
> 
>-void INTERNAL_GL_APIENTRY glUniform2ivNULL(GLint location, GLsizei count, const GLint *value)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glUniform2ivNULL(GLint location, GLsizei count, const GLint *value) {}
> 
>-void INTERNAL_GL_APIENTRY glUniform2uiNULL(GLint location, GLuint v0, GLuint v1)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glUniform2uiNULL(GLint location, GLuint v0, GLuint v1) {}
> 
>-void INTERNAL_GL_APIENTRY glUniform2uivNULL(GLint location, GLsizei count, const GLuint *value)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glUniform2uivNULL(GLint location, GLsizei count, const GLuint *value) {}
> 
>-void INTERNAL_GL_APIENTRY glUniform3dNULL(GLint location, GLdouble x, GLdouble y, GLdouble z)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glUniform3dNULL(GLint location, GLdouble x, GLdouble y, GLdouble z) {}
> 
>-void INTERNAL_GL_APIENTRY glUniform3dvNULL(GLint location, GLsizei count, const GLdouble *value)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glUniform3dvNULL(GLint location, GLsizei count, const GLdouble *value) {}
> 
>-void INTERNAL_GL_APIENTRY glUniform3fNULL(GLint location, GLfloat v0, GLfloat v1, GLfloat v2)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glUniform3fNULL(GLint location, GLfloat v0, GLfloat v1, GLfloat v2) {}
> 
>-void INTERNAL_GL_APIENTRY glUniform3fvNULL(GLint location, GLsizei count, const GLfloat *value)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glUniform3fvNULL(GLint location, GLsizei count, const GLfloat *value) {}
> 
>-void INTERNAL_GL_APIENTRY glUniform3iNULL(GLint location, GLint v0, GLint v1, GLint v2)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glUniform3iNULL(GLint location, GLint v0, GLint v1, GLint v2) {}
> 
>-void INTERNAL_GL_APIENTRY glUniform3ivNULL(GLint location, GLsizei count, const GLint *value)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glUniform3ivNULL(GLint location, GLsizei count, const GLint *value) {}
> 
>-void INTERNAL_GL_APIENTRY glUniform3uiNULL(GLint location, GLuint v0, GLuint v1, GLuint v2)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glUniform3uiNULL(GLint location, GLuint v0, GLuint v1, GLuint v2) {}
> 
>-void INTERNAL_GL_APIENTRY glUniform3uivNULL(GLint location, GLsizei count, const GLuint *value)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glUniform3uivNULL(GLint location, GLsizei count, const GLuint *value) {}
> 
> void INTERNAL_GL_APIENTRY
> glUniform4dNULL(GLint location, GLdouble x, GLdouble y, GLdouble z, GLdouble w)
>-{
>-}
>+{}
> 
>-void INTERNAL_GL_APIENTRY glUniform4dvNULL(GLint location, GLsizei count, const GLdouble *value)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glUniform4dvNULL(GLint location, GLsizei count, const GLdouble *value) {}
> 
> void INTERNAL_GL_APIENTRY
> glUniform4fNULL(GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3)
>-{
>-}
>+{}
> 
>-void INTERNAL_GL_APIENTRY glUniform4fvNULL(GLint location, GLsizei count, const GLfloat *value)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glUniform4fvNULL(GLint location, GLsizei count, const GLfloat *value) {}
> 
>-void INTERNAL_GL_APIENTRY glUniform4iNULL(GLint location, GLint v0, GLint v1, GLint v2, GLint v3)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glUniform4iNULL(GLint location, GLint v0, GLint v1, GLint v2, GLint v3) {}
> 
>-void INTERNAL_GL_APIENTRY glUniform4ivNULL(GLint location, GLsizei count, const GLint *value)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glUniform4ivNULL(GLint location, GLsizei count, const GLint *value) {}
> 
> void INTERNAL_GL_APIENTRY
> glUniform4uiNULL(GLint location, GLuint v0, GLuint v1, GLuint v2, GLuint v3)
>-{
>-}
>+{}
> 
>-void INTERNAL_GL_APIENTRY glUniform4uivNULL(GLint location, GLsizei count, const GLuint *value)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glUniform4uivNULL(GLint location, GLsizei count, const GLuint *value) {}
> 
> void INTERNAL_GL_APIENTRY glUniformBlockBindingNULL(GLuint program,
>                                                     GLuint uniformBlockIndex,
>                                                     GLuint uniformBlockBinding)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glUniformMatrix2dvNULL(GLint location,
>                                                  GLsizei count,
>                                                  GLboolean transpose,
>                                                  const GLdouble *value)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glUniformMatrix2fvNULL(GLint location,
>                                                  GLsizei count,
>                                                  GLboolean transpose,
>                                                  const GLfloat *value)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glUniformMatrix2x3dvNULL(GLint location,
>                                                    GLsizei count,
>                                                    GLboolean transpose,
>                                                    const GLdouble *value)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glUniformMatrix2x3fvNULL(GLint location,
>                                                    GLsizei count,
>                                                    GLboolean transpose,
>                                                    const GLfloat *value)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glUniformMatrix2x4dvNULL(GLint location,
>                                                    GLsizei count,
>                                                    GLboolean transpose,
>                                                    const GLdouble *value)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glUniformMatrix2x4fvNULL(GLint location,
>                                                    GLsizei count,
>                                                    GLboolean transpose,
>                                                    const GLfloat *value)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glUniformMatrix3dvNULL(GLint location,
>                                                  GLsizei count,
>                                                  GLboolean transpose,
>                                                  const GLdouble *value)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glUniformMatrix3fvNULL(GLint location,
>                                                  GLsizei count,
>                                                  GLboolean transpose,
>                                                  const GLfloat *value)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glUniformMatrix3x2dvNULL(GLint location,
>                                                    GLsizei count,
>                                                    GLboolean transpose,
>                                                    const GLdouble *value)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glUniformMatrix3x2fvNULL(GLint location,
>                                                    GLsizei count,
>                                                    GLboolean transpose,
>                                                    const GLfloat *value)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glUniformMatrix3x4dvNULL(GLint location,
>                                                    GLsizei count,
>                                                    GLboolean transpose,
>                                                    const GLdouble *value)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glUniformMatrix3x4fvNULL(GLint location,
>                                                    GLsizei count,
>                                                    GLboolean transpose,
>                                                    const GLfloat *value)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glUniformMatrix4dvNULL(GLint location,
>                                                  GLsizei count,
>                                                  GLboolean transpose,
>                                                  const GLdouble *value)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glUniformMatrix4fvNULL(GLint location,
>                                                  GLsizei count,
>                                                  GLboolean transpose,
>                                                  const GLfloat *value)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glUniformMatrix4x2dvNULL(GLint location,
>                                                    GLsizei count,
>                                                    GLboolean transpose,
>                                                    const GLdouble *value)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glUniformMatrix4x2fvNULL(GLint location,
>                                                    GLsizei count,
>                                                    GLboolean transpose,
>                                                    const GLfloat *value)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glUniformMatrix4x3dvNULL(GLint location,
>                                                    GLsizei count,
>                                                    GLboolean transpose,
>                                                    const GLdouble *value)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glUniformMatrix4x3fvNULL(GLint location,
>                                                    GLsizei count,
>                                                    GLboolean transpose,
>                                                    const GLfloat *value)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glUniformSubroutinesuivNULL(GLenum shadertype,
>                                                       GLsizei count,
>                                                       const GLuint *indices)
>-{
>-}
>+{}
> 
> GLboolean INTERNAL_GL_APIENTRY glUnmapBufferNULL(GLenum target)
> {
>@@ -3594,27 +2820,19 @@ GLboolean INTERNAL_GL_APIENTRY glUnmapNamedBufferNULL(GLuint buffer)
>     return static_cast<GLboolean>(0);
> }
> 
>-void INTERNAL_GL_APIENTRY glUseProgramNULL(GLuint program)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glUseProgramNULL(GLuint program) {}
> 
> void INTERNAL_GL_APIENTRY glUseProgramStagesNULL(GLuint pipeline, GLbitfield stages, GLuint program)
>-{
>-}
>+{}
> 
>-void INTERNAL_GL_APIENTRY glValidateProgramNULL(GLuint program)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glValidateProgramNULL(GLuint program) {}
> 
>-void INTERNAL_GL_APIENTRY glValidateProgramPipelineNULL(GLuint pipeline)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glValidateProgramPipelineNULL(GLuint pipeline) {}
> 
> void INTERNAL_GL_APIENTRY glVertexArrayAttribBindingNULL(GLuint vaobj,
>                                                          GLuint attribindex,
>                                                          GLuint bindingindex)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glVertexArrayAttribFormatNULL(GLuint vaobj,
>                                                         GLuint attribindex,
>@@ -3622,42 +2840,35 @@ void INTERNAL_GL_APIENTRY glVertexArrayAttribFormatNULL(GLuint vaobj,
>                                                         GLenum type,
>                                                         GLboolean normalized,
>                                                         GLuint relativeoffset)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glVertexArrayAttribIFormatNULL(GLuint vaobj,
>                                                          GLuint attribindex,
>                                                          GLint size,
>                                                          GLenum type,
>                                                          GLuint relativeoffset)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glVertexArrayAttribLFormatNULL(GLuint vaobj,
>                                                          GLuint attribindex,
>                                                          GLint size,
>                                                          GLenum type,
>                                                          GLuint relativeoffset)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glVertexArrayBindingDivisorNULL(GLuint vaobj,
>                                                           GLuint bindingindex,
>                                                           GLuint divisor)
>-{
>-}
>+{}
> 
>-void INTERNAL_GL_APIENTRY glVertexArrayElementBufferNULL(GLuint vaobj, GLuint buffer)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glVertexArrayElementBufferNULL(GLuint vaobj, GLuint buffer) {}
> 
> void INTERNAL_GL_APIENTRY glVertexArrayVertexBufferNULL(GLuint vaobj,
>                                                         GLuint bindingindex,
>                                                         GLuint buffer,
>                                                         GLintptr offset,
>                                                         GLsizei stride)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glVertexArrayVertexBuffersNULL(GLuint vaobj,
>                                                          GLuint first,
>@@ -3665,372 +2876,232 @@ void INTERNAL_GL_APIENTRY glVertexArrayVertexBuffersNULL(GLuint vaobj,
>                                                          const GLuint *buffers,
>                                                          const GLintptr *offsets,
>                                                          const GLsizei *strides)
>-{
>-}
>+{}
> 
>-void INTERNAL_GL_APIENTRY glVertexAttrib1dNULL(GLuint index, GLdouble x)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glVertexAttrib1dNULL(GLuint index, GLdouble x) {}
> 
>-void INTERNAL_GL_APIENTRY glVertexAttrib1dvNULL(GLuint index, const GLdouble *v)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glVertexAttrib1dvNULL(GLuint index, const GLdouble *v) {}
> 
>-void INTERNAL_GL_APIENTRY glVertexAttrib1fNULL(GLuint index, GLfloat x)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glVertexAttrib1fNULL(GLuint index, GLfloat x) {}
> 
>-void INTERNAL_GL_APIENTRY glVertexAttrib1fvNULL(GLuint index, const GLfloat *v)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glVertexAttrib1fvNULL(GLuint index, const GLfloat *v) {}
> 
>-void INTERNAL_GL_APIENTRY glVertexAttrib1sNULL(GLuint index, GLshort x)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glVertexAttrib1sNULL(GLuint index, GLshort x) {}
> 
>-void INTERNAL_GL_APIENTRY glVertexAttrib1svNULL(GLuint index, const GLshort *v)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glVertexAttrib1svNULL(GLuint index, const GLshort *v) {}
> 
>-void INTERNAL_GL_APIENTRY glVertexAttrib2dNULL(GLuint index, GLdouble x, GLdouble y)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glVertexAttrib2dNULL(GLuint index, GLdouble x, GLdouble y) {}
> 
>-void INTERNAL_GL_APIENTRY glVertexAttrib2dvNULL(GLuint index, const GLdouble *v)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glVertexAttrib2dvNULL(GLuint index, const GLdouble *v) {}
> 
>-void INTERNAL_GL_APIENTRY glVertexAttrib2fNULL(GLuint index, GLfloat x, GLfloat y)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glVertexAttrib2fNULL(GLuint index, GLfloat x, GLfloat y) {}
> 
>-void INTERNAL_GL_APIENTRY glVertexAttrib2fvNULL(GLuint index, const GLfloat *v)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glVertexAttrib2fvNULL(GLuint index, const GLfloat *v) {}
> 
>-void INTERNAL_GL_APIENTRY glVertexAttrib2sNULL(GLuint index, GLshort x, GLshort y)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glVertexAttrib2sNULL(GLuint index, GLshort x, GLshort y) {}
> 
>-void INTERNAL_GL_APIENTRY glVertexAttrib2svNULL(GLuint index, const GLshort *v)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glVertexAttrib2svNULL(GLuint index, const GLshort *v) {}
> 
>-void INTERNAL_GL_APIENTRY glVertexAttrib3dNULL(GLuint index, GLdouble x, GLdouble y, GLdouble z)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glVertexAttrib3dNULL(GLuint index, GLdouble x, GLdouble y, GLdouble z) {}
> 
>-void INTERNAL_GL_APIENTRY glVertexAttrib3dvNULL(GLuint index, const GLdouble *v)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glVertexAttrib3dvNULL(GLuint index, const GLdouble *v) {}
> 
>-void INTERNAL_GL_APIENTRY glVertexAttrib3fNULL(GLuint index, GLfloat x, GLfloat y, GLfloat z)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glVertexAttrib3fNULL(GLuint index, GLfloat x, GLfloat y, GLfloat z) {}
> 
>-void INTERNAL_GL_APIENTRY glVertexAttrib3fvNULL(GLuint index, const GLfloat *v)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glVertexAttrib3fvNULL(GLuint index, const GLfloat *v) {}
> 
>-void INTERNAL_GL_APIENTRY glVertexAttrib3sNULL(GLuint index, GLshort x, GLshort y, GLshort z)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glVertexAttrib3sNULL(GLuint index, GLshort x, GLshort y, GLshort z) {}
> 
>-void INTERNAL_GL_APIENTRY glVertexAttrib3svNULL(GLuint index, const GLshort *v)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glVertexAttrib3svNULL(GLuint index, const GLshort *v) {}
> 
>-void INTERNAL_GL_APIENTRY glVertexAttrib4NbvNULL(GLuint index, const GLbyte *v)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glVertexAttrib4NbvNULL(GLuint index, const GLbyte *v) {}
> 
>-void INTERNAL_GL_APIENTRY glVertexAttrib4NivNULL(GLuint index, const GLint *v)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glVertexAttrib4NivNULL(GLuint index, const GLint *v) {}
> 
>-void INTERNAL_GL_APIENTRY glVertexAttrib4NsvNULL(GLuint index, const GLshort *v)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glVertexAttrib4NsvNULL(GLuint index, const GLshort *v) {}
> 
> void INTERNAL_GL_APIENTRY
> glVertexAttrib4NubNULL(GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w)
>-{
>-}
>+{}
> 
>-void INTERNAL_GL_APIENTRY glVertexAttrib4NubvNULL(GLuint index, const GLubyte *v)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glVertexAttrib4NubvNULL(GLuint index, const GLubyte *v) {}
> 
>-void INTERNAL_GL_APIENTRY glVertexAttrib4NuivNULL(GLuint index, const GLuint *v)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glVertexAttrib4NuivNULL(GLuint index, const GLuint *v) {}
> 
>-void INTERNAL_GL_APIENTRY glVertexAttrib4NusvNULL(GLuint index, const GLushort *v)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glVertexAttrib4NusvNULL(GLuint index, const GLushort *v) {}
> 
>-void INTERNAL_GL_APIENTRY glVertexAttrib4bvNULL(GLuint index, const GLbyte *v)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glVertexAttrib4bvNULL(GLuint index, const GLbyte *v) {}
> 
> void INTERNAL_GL_APIENTRY
> glVertexAttrib4dNULL(GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w)
>-{
>-}
>+{}
> 
>-void INTERNAL_GL_APIENTRY glVertexAttrib4dvNULL(GLuint index, const GLdouble *v)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glVertexAttrib4dvNULL(GLuint index, const GLdouble *v) {}
> 
> void INTERNAL_GL_APIENTRY
> glVertexAttrib4fNULL(GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w)
>-{
>-}
>+{}
> 
>-void INTERNAL_GL_APIENTRY glVertexAttrib4fvNULL(GLuint index, const GLfloat *v)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glVertexAttrib4fvNULL(GLuint index, const GLfloat *v) {}
> 
>-void INTERNAL_GL_APIENTRY glVertexAttrib4ivNULL(GLuint index, const GLint *v)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glVertexAttrib4ivNULL(GLuint index, const GLint *v) {}
> 
> void INTERNAL_GL_APIENTRY
> glVertexAttrib4sNULL(GLuint index, GLshort x, GLshort y, GLshort z, GLshort w)
>-{
>-}
>+{}
> 
>-void INTERNAL_GL_APIENTRY glVertexAttrib4svNULL(GLuint index, const GLshort *v)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glVertexAttrib4svNULL(GLuint index, const GLshort *v) {}
> 
>-void INTERNAL_GL_APIENTRY glVertexAttrib4ubvNULL(GLuint index, const GLubyte *v)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glVertexAttrib4ubvNULL(GLuint index, const GLubyte *v) {}
> 
>-void INTERNAL_GL_APIENTRY glVertexAttrib4uivNULL(GLuint index, const GLuint *v)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glVertexAttrib4uivNULL(GLuint index, const GLuint *v) {}
> 
>-void INTERNAL_GL_APIENTRY glVertexAttrib4usvNULL(GLuint index, const GLushort *v)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glVertexAttrib4usvNULL(GLuint index, const GLushort *v) {}
> 
>-void INTERNAL_GL_APIENTRY glVertexAttribBindingNULL(GLuint attribindex, GLuint bindingindex)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glVertexAttribBindingNULL(GLuint attribindex, GLuint bindingindex) {}
> 
>-void INTERNAL_GL_APIENTRY glVertexAttribDivisorNULL(GLuint index, GLuint divisor)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glVertexAttribDivisorNULL(GLuint index, GLuint divisor) {}
> 
> void INTERNAL_GL_APIENTRY glVertexAttribFormatNULL(GLuint attribindex,
>                                                    GLint size,
>                                                    GLenum type,
>                                                    GLboolean normalized,
>                                                    GLuint relativeoffset)
>-{
>-}
>+{}
> 
>-void INTERNAL_GL_APIENTRY glVertexAttribI1iNULL(GLuint index, GLint x)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glVertexAttribI1iNULL(GLuint index, GLint x) {}
> 
>-void INTERNAL_GL_APIENTRY glVertexAttribI1ivNULL(GLuint index, const GLint *v)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glVertexAttribI1ivNULL(GLuint index, const GLint *v) {}
> 
>-void INTERNAL_GL_APIENTRY glVertexAttribI1uiNULL(GLuint index, GLuint x)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glVertexAttribI1uiNULL(GLuint index, GLuint x) {}
> 
>-void INTERNAL_GL_APIENTRY glVertexAttribI1uivNULL(GLuint index, const GLuint *v)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glVertexAttribI1uivNULL(GLuint index, const GLuint *v) {}
> 
>-void INTERNAL_GL_APIENTRY glVertexAttribI2iNULL(GLuint index, GLint x, GLint y)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glVertexAttribI2iNULL(GLuint index, GLint x, GLint y) {}
> 
>-void INTERNAL_GL_APIENTRY glVertexAttribI2ivNULL(GLuint index, const GLint *v)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glVertexAttribI2ivNULL(GLuint index, const GLint *v) {}
> 
>-void INTERNAL_GL_APIENTRY glVertexAttribI2uiNULL(GLuint index, GLuint x, GLuint y)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glVertexAttribI2uiNULL(GLuint index, GLuint x, GLuint y) {}
> 
>-void INTERNAL_GL_APIENTRY glVertexAttribI2uivNULL(GLuint index, const GLuint *v)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glVertexAttribI2uivNULL(GLuint index, const GLuint *v) {}
> 
>-void INTERNAL_GL_APIENTRY glVertexAttribI3iNULL(GLuint index, GLint x, GLint y, GLint z)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glVertexAttribI3iNULL(GLuint index, GLint x, GLint y, GLint z) {}
> 
>-void INTERNAL_GL_APIENTRY glVertexAttribI3ivNULL(GLuint index, const GLint *v)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glVertexAttribI3ivNULL(GLuint index, const GLint *v) {}
> 
>-void INTERNAL_GL_APIENTRY glVertexAttribI3uiNULL(GLuint index, GLuint x, GLuint y, GLuint z)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glVertexAttribI3uiNULL(GLuint index, GLuint x, GLuint y, GLuint z) {}
> 
>-void INTERNAL_GL_APIENTRY glVertexAttribI3uivNULL(GLuint index, const GLuint *v)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glVertexAttribI3uivNULL(GLuint index, const GLuint *v) {}
> 
>-void INTERNAL_GL_APIENTRY glVertexAttribI4bvNULL(GLuint index, const GLbyte *v)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glVertexAttribI4bvNULL(GLuint index, const GLbyte *v) {}
> 
>-void INTERNAL_GL_APIENTRY glVertexAttribI4iNULL(GLuint index, GLint x, GLint y, GLint z, GLint w)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glVertexAttribI4iNULL(GLuint index, GLint x, GLint y, GLint z, GLint w) {}
> 
>-void INTERNAL_GL_APIENTRY glVertexAttribI4ivNULL(GLuint index, const GLint *v)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glVertexAttribI4ivNULL(GLuint index, const GLint *v) {}
> 
>-void INTERNAL_GL_APIENTRY glVertexAttribI4svNULL(GLuint index, const GLshort *v)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glVertexAttribI4svNULL(GLuint index, const GLshort *v) {}
> 
>-void INTERNAL_GL_APIENTRY glVertexAttribI4ubvNULL(GLuint index, const GLubyte *v)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glVertexAttribI4ubvNULL(GLuint index, const GLubyte *v) {}
> 
> void INTERNAL_GL_APIENTRY
> glVertexAttribI4uiNULL(GLuint index, GLuint x, GLuint y, GLuint z, GLuint w)
>-{
>-}
>+{}
> 
>-void INTERNAL_GL_APIENTRY glVertexAttribI4uivNULL(GLuint index, const GLuint *v)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glVertexAttribI4uivNULL(GLuint index, const GLuint *v) {}
> 
>-void INTERNAL_GL_APIENTRY glVertexAttribI4usvNULL(GLuint index, const GLushort *v)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glVertexAttribI4usvNULL(GLuint index, const GLushort *v) {}
> 
> void INTERNAL_GL_APIENTRY glVertexAttribIFormatNULL(GLuint attribindex,
>                                                     GLint size,
>                                                     GLenum type,
>                                                     GLuint relativeoffset)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glVertexAttribIPointerNULL(GLuint index,
>                                                      GLint size,
>                                                      GLenum type,
>                                                      GLsizei stride,
>                                                      const void *pointer)
>-{
>-}
>+{}
> 
>-void INTERNAL_GL_APIENTRY glVertexAttribL1dNULL(GLuint index, GLdouble x)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glVertexAttribL1dNULL(GLuint index, GLdouble x) {}
> 
>-void INTERNAL_GL_APIENTRY glVertexAttribL1dvNULL(GLuint index, const GLdouble *v)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glVertexAttribL1dvNULL(GLuint index, const GLdouble *v) {}
> 
>-void INTERNAL_GL_APIENTRY glVertexAttribL2dNULL(GLuint index, GLdouble x, GLdouble y)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glVertexAttribL2dNULL(GLuint index, GLdouble x, GLdouble y) {}
> 
>-void INTERNAL_GL_APIENTRY glVertexAttribL2dvNULL(GLuint index, const GLdouble *v)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glVertexAttribL2dvNULL(GLuint index, const GLdouble *v) {}
> 
>-void INTERNAL_GL_APIENTRY glVertexAttribL3dNULL(GLuint index, GLdouble x, GLdouble y, GLdouble z)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glVertexAttribL3dNULL(GLuint index, GLdouble x, GLdouble y, GLdouble z) {}
> 
>-void INTERNAL_GL_APIENTRY glVertexAttribL3dvNULL(GLuint index, const GLdouble *v)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glVertexAttribL3dvNULL(GLuint index, const GLdouble *v) {}
> 
> void INTERNAL_GL_APIENTRY
> glVertexAttribL4dNULL(GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w)
>-{
>-}
>+{}
> 
>-void INTERNAL_GL_APIENTRY glVertexAttribL4dvNULL(GLuint index, const GLdouble *v)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glVertexAttribL4dvNULL(GLuint index, const GLdouble *v) {}
> 
> void INTERNAL_GL_APIENTRY glVertexAttribLFormatNULL(GLuint attribindex,
>                                                     GLint size,
>                                                     GLenum type,
>                                                     GLuint relativeoffset)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glVertexAttribLPointerNULL(GLuint index,
>                                                      GLint size,
>                                                      GLenum type,
>                                                      GLsizei stride,
>                                                      const void *pointer)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glVertexAttribP1uiNULL(GLuint index,
>                                                  GLenum type,
>                                                  GLboolean normalized,
>                                                  GLuint value)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glVertexAttribP1uivNULL(GLuint index,
>                                                   GLenum type,
>                                                   GLboolean normalized,
>                                                   const GLuint *value)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glVertexAttribP2uiNULL(GLuint index,
>                                                  GLenum type,
>                                                  GLboolean normalized,
>                                                  GLuint value)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glVertexAttribP2uivNULL(GLuint index,
>                                                   GLenum type,
>                                                   GLboolean normalized,
>                                                   const GLuint *value)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glVertexAttribP3uiNULL(GLuint index,
>                                                  GLenum type,
>                                                  GLboolean normalized,
>                                                  GLuint value)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glVertexAttribP3uivNULL(GLuint index,
>                                                   GLenum type,
>                                                   GLboolean normalized,
>                                                   const GLuint *value)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glVertexAttribP4uiNULL(GLuint index,
>                                                  GLenum type,
>                                                  GLboolean normalized,
>                                                  GLuint value)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glVertexAttribP4uivNULL(GLuint index,
>                                                   GLenum type,
>                                                   GLboolean normalized,
>                                                   const GLuint *value)
>-{
>-}
>+{}
> 
> void INTERNAL_GL_APIENTRY glVertexAttribPointerNULL(GLuint index,
>                                                     GLint size,
>@@ -4038,31 +3109,19 @@ void INTERNAL_GL_APIENTRY glVertexAttribPointerNULL(GLuint index,
>                                                     GLboolean normalized,
>                                                     GLsizei stride,
>                                                     const void *pointer)
>-{
>-}
>+{}
> 
>-void INTERNAL_GL_APIENTRY glVertexBindingDivisorNULL(GLuint bindingindex, GLuint divisor)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glVertexBindingDivisorNULL(GLuint bindingindex, GLuint divisor) {}
> 
>-void INTERNAL_GL_APIENTRY glViewportNULL(GLint x, GLint y, GLsizei width, GLsizei height)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glViewportNULL(GLint x, GLint y, GLsizei width, GLsizei height) {}
> 
>-void INTERNAL_GL_APIENTRY glViewportArrayvNULL(GLuint first, GLsizei count, const GLfloat *v)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glViewportArrayvNULL(GLuint first, GLsizei count, const GLfloat *v) {}
> 
> void INTERNAL_GL_APIENTRY
> glViewportIndexedfNULL(GLuint index, GLfloat x, GLfloat y, GLfloat w, GLfloat h)
>-{
>-}
>+{}
> 
>-void INTERNAL_GL_APIENTRY glViewportIndexedfvNULL(GLuint index, const GLfloat *v)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glViewportIndexedfvNULL(GLuint index, const GLfloat *v) {}
> 
>-void INTERNAL_GL_APIENTRY glWaitSyncNULL(GLsync sync, GLbitfield flags, GLuint64 timeout)
>-{
>-}
>+void INTERNAL_GL_APIENTRY glWaitSyncNULL(GLsync sync, GLbitfield flags, GLuint64 timeout) {}
> }  // namespace rx
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/null_functions.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/null_functions.h
>index c4dc6de7c71..cc4e0b3b914 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/null_functions.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/null_functions.h
>@@ -1,7 +1,7 @@
> // GENERATED FILE - DO NOT EDIT.
> // Generated by generate_gl_dispatch_table.py using data from gl_bindings_data.json and gl.xml.
> //
>-// Copyright 2017 The ANGLE Project Authors. All rights reserved.
>+// Copyright 2019 The ANGLE Project Authors. All rights reserved.
> // Use of this source code is governed by a BSD-style license that can be
> // found in the LICENSE file.
> //
>@@ -431,7 +431,7 @@ void INTERNAL_GL_APIENTRY glDeleteTransformFeedbacksNULL(GLsizei n, const GLuint
> void INTERNAL_GL_APIENTRY glDeleteVertexArraysNULL(GLsizei n, const GLuint *arrays);
> void INTERNAL_GL_APIENTRY glDepthFuncNULL(GLenum func);
> void INTERNAL_GL_APIENTRY glDepthMaskNULL(GLboolean flag);
>-void INTERNAL_GL_APIENTRY glDepthRangeNULL(GLdouble near, GLdouble far);
>+void INTERNAL_GL_APIENTRY glDepthRangeNULL(GLdouble n, GLdouble f);
> void INTERNAL_GL_APIENTRY glDepthRangeArrayvNULL(GLuint first, GLsizei count, const GLdouble *v);
> void INTERNAL_GL_APIENTRY glDepthRangeIndexedNULL(GLuint index, GLdouble n, GLdouble f);
> void INTERNAL_GL_APIENTRY glDepthRangefNULL(GLfloat n, GLfloat f);
>@@ -569,6 +569,12 @@ void INTERNAL_GL_APIENTRY glFramebufferTextureLayerNULL(GLenum target,
>                                                         GLuint texture,
>                                                         GLint level,
>                                                         GLint layer);
>+void INTERNAL_GL_APIENTRY glFramebufferTextureMultiviewOVRNULL(GLenum target,
>+                                                               GLenum attachment,
>+                                                               GLuint texture,
>+                                                               GLint level,
>+                                                               GLint baseViewIndex,
>+                                                               GLsizei numViews);
> void INTERNAL_GL_APIENTRY glFrontFaceNULL(GLenum mode);
> void INTERNAL_GL_APIENTRY glGenBuffersNULL(GLsizei n, GLuint *buffers);
> void INTERNAL_GL_APIENTRY glGenFencesNVNULL(GLsizei n, GLuint *fences);
>@@ -1036,6 +1042,8 @@ void *INTERNAL_GL_APIENTRY glMapNamedBufferRangeNULL(GLuint buffer,
>                                                      GLsizeiptr length,
>                                                      GLbitfield access);
> void INTERNAL_GL_APIENTRY glMatrixLoadfEXTNULL(GLenum mode, const GLfloat *m);
>+void INTERNAL_GL_APIENTRY glMaxShaderCompilerThreadsARBNULL(GLuint count);
>+void INTERNAL_GL_APIENTRY glMaxShaderCompilerThreadsKHRNULL(GLuint count);
> void INTERNAL_GL_APIENTRY glMemoryBarrierNULL(GLbitfield barriers);
> void INTERNAL_GL_APIENTRY glMemoryBarrierByRegionNULL(GLbitfield barriers);
> void INTERNAL_GL_APIENTRY glMinSampleShadingNULL(GLfloat value);
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/renderergl_utils.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/renderergl_utils.cpp
>index 7b7a6807c8b..698b51e21e7 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/renderergl_utils.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/renderergl_utils.cpp
>@@ -12,19 +12,23 @@
> #include <limits>
> 
> #include "common/mathutil.h"
>+#include "common/platform.h"
> #include "libANGLE/Buffer.h"
> #include "libANGLE/Caps.h"
>+#include "libANGLE/Context.h"
> #include "libANGLE/Workarounds.h"
> #include "libANGLE/formatutils.h"
> #include "libANGLE/queryconversions.h"
>+#include "libANGLE/renderer/gl/ContextGL.h"
>+#include "libANGLE/renderer/gl/FenceNVGL.h"
> #include "libANGLE/renderer/gl/FunctionsGL.h"
> #include "libANGLE/renderer/gl/QueryGL.h"
> #include "libANGLE/renderer/gl/WorkaroundsGL.h"
> #include "libANGLE/renderer/gl/formatutilsgl.h"
> 
>+#include <EGL/eglext.h>
> #include <algorithm>
> #include <sstream>
>-#include <EGL/eglext.h>
> 
> using angle::CheckedNumeric;
> 
>@@ -56,18 +60,55 @@ VendorID GetVendorID(const FunctionsGL *functions)
>     }
> }
> 
>+uint32_t GetDeviceID(const FunctionsGL *functions)
>+{
>+    std::string nativeRendererString(
>+        reinterpret_cast<const char *>(functions->getString(GL_RENDERER)));
>+    constexpr std::pair<const char *, uint32_t> kKnownDeviceIDs[] = {
>+        {"Adreno (TM) 418", ANDROID_DEVICE_ID_NEXUS5X},
>+        {"Adreno (TM) 530", ANDROID_DEVICE_ID_PIXEL1XL},
>+        {"Adreno (TM) 540", ANDROID_DEVICE_ID_PIXEL2},
>+    };
>+
>+    for (const auto &knownDeviceID : kKnownDeviceIDs)
>+    {
>+        if (nativeRendererString.find(knownDeviceID.first) != std::string::npos)
>+        {
>+            return knownDeviceID.second;
>+        }
>+    }
>+
>+    return 0;
>+}
>+
> namespace nativegl_gl
> {
> 
>-static bool MeetsRequirements(const FunctionsGL *functions, const nativegl::SupportRequirement &requirements)
>+static bool MeetsRequirements(const FunctionsGL *functions,
>+                              const nativegl::SupportRequirement &requirements)
> {
>-    for (const std::string &extension : requirements.requiredExtensions)
>+    bool hasRequiredExtensions = false;
>+    for (const std::vector<std::string> &exts : requirements.requiredExtensions)
>     {
>-        if (!functions->hasExtension(extension))
>+        bool hasAllExtensionsInSet = true;
>+        for (const std::string &extension : exts)
>         {
>-            return false;
>+            if (!functions->hasExtension(extension))
>+            {
>+                hasAllExtensionsInSet = false;
>+                break;
>+            }
>+        }
>+        if (hasAllExtensionsInSet)
>+        {
>+            hasRequiredExtensions = true;
>+            break;
>         }
>     }
>+    if (!requirements.requiredExtensions.empty() && !hasRequiredExtensions)
>+    {
>+        return false;
>+    }
> 
>     if (functions->version >= requirements.version)
>     {
>@@ -90,21 +131,137 @@ static bool MeetsRequirements(const FunctionsGL *functions, const nativegl::Supp
>     }
> }
> 
>+static bool CheckSizedInternalFormatTextureRenderability(const FunctionsGL *functions,
>+                                                         const WorkaroundsGL &workarounds,
>+                                                         GLenum internalFormat)
>+{
>+    const gl::InternalFormat &formatInfo = gl::GetSizedInternalFormatInfo(internalFormat);
>+    ASSERT(formatInfo.sized);
>+
>+    // Query the current texture so it can be rebound afterwards
>+    GLint oldTextureBinding = 0;
>+    functions->getIntegerv(GL_TEXTURE_BINDING_2D, &oldTextureBinding);
>+
>+    // Create a small texture with the same format and type that gl::Texture would use
>+    GLuint texture = 0;
>+    functions->genTextures(1, &texture);
>+    functions->bindTexture(GL_TEXTURE_2D, texture);
>+
>+    // Nearest filter needed for framebuffer completeness on some drivers.
>+    functions->texParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
>+
>+    nativegl::TexImageFormat texImageFormat = nativegl::GetTexImageFormat(
>+        functions, workarounds, formatInfo.internalFormat, formatInfo.format, formatInfo.type);
>+    constexpr GLsizei kTextureSize = 16;
>+    functions->texImage2D(GL_TEXTURE_2D, 0, texImageFormat.internalFormat, kTextureSize,
>+                          kTextureSize, 0, texImageFormat.format, texImageFormat.type, nullptr);
>+
>+    // Query the current framebuffer so it can be rebound afterwards
>+    GLint oldFramebufferBinding = 0;
>+    functions->getIntegerv(GL_FRAMEBUFFER_BINDING, &oldFramebufferBinding);
>+
>+    // Bind the texture to the framebuffer and check renderability
>+    GLuint fbo = 0;
>+    functions->genFramebuffers(1, &fbo);
>+    functions->bindFramebuffer(GL_FRAMEBUFFER, fbo);
>+    functions->framebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, texture,
>+                                    0);
>+
>+    bool supported = functions->checkFramebufferStatus(GL_FRAMEBUFFER) == GL_FRAMEBUFFER_COMPLETE;
>+
>+    // Delete the framebuffer and restore the previous binding
>+    functions->deleteFramebuffers(1, &fbo);
>+    functions->bindFramebuffer(GL_FRAMEBUFFER, static_cast<GLuint>(oldFramebufferBinding));
>+
>+    // Delete the texture and restore the previous binding
>+    functions->deleteTextures(1, &texture);
>+    functions->bindTexture(GL_TEXTURE_2D, static_cast<GLuint>(oldTextureBinding));
>+
>+    return supported;
>+}
>+
>+static bool CheckInternalFormatRenderbufferRenderability(const FunctionsGL *functions,
>+                                                         const WorkaroundsGL &workarounds,
>+                                                         GLenum internalFormat)
>+{
>+    const gl::InternalFormat &formatInfo = gl::GetSizedInternalFormatInfo(internalFormat);
>+    ASSERT(formatInfo.sized);
>+
>+    // Query the current renderbuffer so it can be rebound afterwards
>+    GLint oldRenderbufferBinding = 0;
>+    functions->getIntegerv(GL_RENDERBUFFER_BINDING, &oldRenderbufferBinding);
>+
>+    // Create a small renderbuffer with the same format and type that gl::Renderbuffer would use
>+    GLuint renderbuffer = 0;
>+    functions->genRenderbuffers(1, &renderbuffer);
>+    functions->bindRenderbuffer(GL_RENDERBUFFER, renderbuffer);
>+
>+    nativegl::RenderbufferFormat renderbufferFormat =
>+        nativegl::GetRenderbufferFormat(functions, workarounds, formatInfo.internalFormat);
>+    constexpr GLsizei kRenderbufferSize = 16;
>+    functions->renderbufferStorage(GL_RENDERBUFFER, renderbufferFormat.internalFormat,
>+                                   kRenderbufferSize, kRenderbufferSize);
>+
>+    // Query the current framebuffer so it can be rebound afterwards
>+    GLint oldFramebufferBinding = 0;
>+    functions->getIntegerv(GL_FRAMEBUFFER_BINDING, &oldFramebufferBinding);
>+
>+    // Bind the texture to the framebuffer and check renderability
>+    GLuint fbo = 0;
>+    functions->genFramebuffers(1, &fbo);
>+    functions->bindFramebuffer(GL_FRAMEBUFFER, fbo);
>+    functions->framebufferRenderbuffer(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_RENDERBUFFER,
>+                                       renderbuffer);
>+
>+    bool supported = functions->checkFramebufferStatus(GL_FRAMEBUFFER) == GL_FRAMEBUFFER_COMPLETE;
>+
>+    // Delete the framebuffer and restore the previous binding
>+    functions->deleteFramebuffers(1, &fbo);
>+    functions->bindFramebuffer(GL_FRAMEBUFFER, static_cast<GLuint>(oldFramebufferBinding));
>+
>+    // Delete the renderbuffer and restore the previous binding
>+    functions->deleteRenderbuffers(1, &renderbuffer);
>+    functions->bindRenderbuffer(GL_RENDERBUFFER, static_cast<GLuint>(oldRenderbufferBinding));
>+
>+    return supported;
>+}
>+
> static gl::TextureCaps GenerateTextureFormatCaps(const FunctionsGL *functions,
>+                                                 const WorkaroundsGL &workarounds,
>                                                  GLenum internalFormat)
> {
>     ASSERT(functions->getError() == GL_NO_ERROR);
> 
>     gl::TextureCaps textureCaps;
> 
>-    const nativegl::InternalFormat &formatInfo = nativegl::GetInternalFormatInfo(internalFormat, functions->standard);
>+    const nativegl::InternalFormat &formatInfo =
>+        nativegl::GetInternalFormatInfo(internalFormat, functions->standard);
>     textureCaps.texturable = MeetsRequirements(functions, formatInfo.texture);
>-    textureCaps.filterable = textureCaps.texturable && MeetsRequirements(functions, formatInfo.filter);
>-    textureCaps.renderable = MeetsRequirements(functions, formatInfo.framebufferAttachment);
>+    textureCaps.filterable =
>+        textureCaps.texturable && MeetsRequirements(functions, formatInfo.filter);
>+    textureCaps.textureAttachment = MeetsRequirements(functions, formatInfo.textureAttachment);
>+    textureCaps.renderbuffer      = MeetsRequirements(functions, formatInfo.renderbuffer);
>+
>+    // Do extra renderability validation for some formats.
>+    // We require GL_RGBA16F is renderable to expose EXT_color_buffer_half_float but we can't know
>+    // if the format is supported unless we try to create a framebuffer.
>+    if (internalFormat == GL_RGBA16F)
>+    {
>+        if (textureCaps.textureAttachment)
>+        {
>+            textureCaps.textureAttachment = CheckSizedInternalFormatTextureRenderability(
>+                functions, workarounds, internalFormat);
>+        }
>+        if (textureCaps.renderbuffer)
>+        {
>+            textureCaps.renderbuffer = CheckInternalFormatRenderbufferRenderability(
>+                functions, workarounds, internalFormat);
>+        }
>+    }
> 
>     // glGetInternalformativ is not available until version 4.2 but may be available through the 3.0
>     // extension GL_ARB_internalformat_query
>-    if (textureCaps.renderable && functions->getInternalformativ)
>+    if (textureCaps.renderbuffer && functions->getInternalformativ)
>     {
>         GLenum queryInternalFormat = internalFormat;
> 
>@@ -222,7 +379,9 @@ static GLfloat QueryGLFloatRange(const FunctionsGL *functions, GLenum name, size
>     return result[index];
> }
> 
>-static gl::TypePrecision QueryTypePrecision(const FunctionsGL *functions, GLenum shaderType, GLenum precisionType)
>+static gl::TypePrecision QueryTypePrecision(const FunctionsGL *functions,
>+                                            GLenum shaderType,
>+                                            GLenum precisionType)
> {
>     gl::TypePrecision precision;
>     functions->getShaderPrecisionFormat(shaderType, precisionType, precision.range.data(),
>@@ -245,6 +404,17 @@ static void LimitVersion(gl::Version *curVersion, const gl::Version &maxVersion)
>     }
> }
> 
>+void CapCombinedLimitToESShaders(GLuint *combinedLimit, gl::ShaderMap<GLuint> &perShaderLimit)
>+{
>+    GLuint combinedESLimit = 0;
>+    for (gl::ShaderType shaderType : gl::kAllGraphicsShaderTypes)
>+    {
>+        combinedESLimit += perShaderLimit[shaderType];
>+    }
>+
>+    *combinedLimit = std::min(*combinedLimit, combinedESLimit);
>+}
>+
> void GenerateCaps(const FunctionsGL *functions,
>                   const WorkaroundsGL &workarounds,
>                   gl::Caps *caps,
>@@ -257,7 +427,8 @@ void GenerateCaps(const FunctionsGL *functions,
>     const gl::FormatSet &allFormats = gl::GetAllSizedInternalFormats();
>     for (GLenum internalFormat : allFormats)
>     {
>-        gl::TextureCaps textureCaps = GenerateTextureFormatCaps(functions, internalFormat);
>+        gl::TextureCaps textureCaps =
>+            GenerateTextureFormatCaps(functions, workarounds, internalFormat);
>         textureCapsMap->insert(internalFormat, textureCaps);
> 
>         if (gl::GetSizedInternalFormatInfo(internalFormat).compressed)
>@@ -270,10 +441,17 @@ void GenerateCaps(const FunctionsGL *functions,
>     *maxSupportedESVersion = gl::Version(3, 1);
> 
>     // Table 6.28, implementation dependent values
>-    if (functions->isAtLeastGL(gl::Version(4, 3)) || functions->hasGLExtension("GL_ARB_ES3_compatibility") ||
>+    if (functions->isAtLeastGL(gl::Version(4, 3)) ||
>+        functions->hasGLExtension("GL_ARB_ES3_compatibility") ||
>         functions->isAtLeastGLES(gl::Version(3, 0)))
>     {
>         caps->maxElementIndex = QuerySingleGLInt64(functions, GL_MAX_ELEMENT_INDEX);
>+
>+        // Work around the null driver limitations.
>+        if (caps->maxElementIndex == 0)
>+        {
>+            caps->maxElementIndex = 0xFFFF;
>+        }
>     }
>     else
>     {
>@@ -281,8 +459,8 @@ void GenerateCaps(const FunctionsGL *functions,
>         caps->maxElementIndex = static_cast<GLint64>(std::numeric_limits<unsigned int>::max());
>     }
> 
>-    if (functions->isAtLeastGL(gl::Version(1, 2)) ||
>-        functions->isAtLeastGLES(gl::Version(3, 0)) || functions->hasGLESExtension("GL_OES_texture_3D"))
>+    if (functions->isAtLeastGL(gl::Version(1, 2)) || functions->isAtLeastGLES(gl::Version(3, 0)) ||
>+        functions->hasGLESExtension("GL_OES_texture_3D"))
>     {
>         caps->max3DTextureSize = QuerySingleGLInt(functions, GL_MAX_3D_TEXTURE_SIZE);
>     }
>@@ -292,10 +470,12 @@ void GenerateCaps(const FunctionsGL *functions,
>         LimitVersion(maxSupportedESVersion, gl::Version(2, 0));
>     }
> 
>-    caps->max2DTextureSize = QuerySingleGLInt(functions, GL_MAX_TEXTURE_SIZE); // GL 1.0 / ES 2.0
>-    caps->maxCubeMapTextureSize = QuerySingleGLInt(functions, GL_MAX_CUBE_MAP_TEXTURE_SIZE); // GL 1.3 / ES 2.0
>+    caps->max2DTextureSize = QuerySingleGLInt(functions, GL_MAX_TEXTURE_SIZE);  // GL 1.0 / ES 2.0
>+    caps->maxCubeMapTextureSize =
>+        QuerySingleGLInt(functions, GL_MAX_CUBE_MAP_TEXTURE_SIZE);  // GL 1.3 / ES 2.0
> 
>-    if (functions->isAtLeastGL(gl::Version(3, 0)) || functions->hasGLExtension("GL_EXT_texture_array") ||
>+    if (functions->isAtLeastGL(gl::Version(3, 0)) ||
>+        functions->hasGLExtension("GL_EXT_texture_array") ||
>         functions->isAtLeastGLES(gl::Version(3, 0)))
>     {
>         caps->maxArrayTextureLayers = QuerySingleGLInt(functions, GL_MAX_ARRAY_TEXTURE_LAYERS);
>@@ -306,7 +486,8 @@ void GenerateCaps(const FunctionsGL *functions,
>         LimitVersion(maxSupportedESVersion, gl::Version(2, 0));
>     }
> 
>-    if (functions->isAtLeastGL(gl::Version(1, 5)) || functions->hasGLExtension("GL_EXT_texture_lod_bias") ||
>+    if (functions->isAtLeastGL(gl::Version(1, 5)) ||
>+        functions->hasGLExtension("GL_EXT_texture_lod_bias") ||
>         functions->isAtLeastGLES(gl::Version(3, 0)))
>     {
>         caps->maxLODBias = QuerySingleGLFloat(functions, GL_MAX_TEXTURE_LOD_BIAS);
>@@ -316,7 +497,8 @@ void GenerateCaps(const FunctionsGL *functions,
>         LimitVersion(maxSupportedESVersion, gl::Version(2, 0));
>     }
> 
>-    if (functions->isAtLeastGL(gl::Version(3, 0)) || functions->hasGLExtension("GL_EXT_framebuffer_object") ||
>+    if (functions->isAtLeastGL(gl::Version(3, 0)) ||
>+        functions->hasGLExtension("GL_EXT_framebuffer_object") ||
>         functions->isAtLeastGLES(gl::Version(2, 0)))
>     {
>         caps->maxRenderbufferSize = QuerySingleGLInt(functions, GL_MAX_RENDERBUFFER_SIZE);
>@@ -328,8 +510,10 @@ void GenerateCaps(const FunctionsGL *functions,
>         LimitVersion(maxSupportedESVersion, gl::Version(0, 0));
>     }
> 
>-    if (functions->isAtLeastGL(gl::Version(2, 0)) || functions->hasGLExtension("ARB_draw_buffers") ||
>-        functions->isAtLeastGLES(gl::Version(3, 0)) || functions->hasGLESExtension("GL_EXT_draw_buffers"))
>+    if (functions->isAtLeastGL(gl::Version(2, 0)) ||
>+        functions->hasGLExtension("ARB_draw_buffers") ||
>+        functions->isAtLeastGLES(gl::Version(3, 0)) ||
>+        functions->hasGLESExtension("GL_EXT_draw_buffers"))
>     {
>         caps->maxDrawBuffers = QuerySingleGLInt(functions, GL_MAX_DRAW_BUFFERS);
>     }
>@@ -341,31 +525,36 @@ void GenerateCaps(const FunctionsGL *functions,
>         LimitVersion(maxSupportedESVersion, gl::Version(2, 0));
>     }
> 
>-    caps->maxViewportWidth = QueryGLIntRange(functions, GL_MAX_VIEWPORT_DIMS, 0); // GL 1.0 / ES 2.0
>-    caps->maxViewportHeight = QueryGLIntRange(functions, GL_MAX_VIEWPORT_DIMS, 1); // GL 1.0 / ES 2.0
>+    caps->maxViewportWidth =
>+        QueryGLIntRange(functions, GL_MAX_VIEWPORT_DIMS, 0);  // GL 1.0 / ES 2.0
>+    caps->maxViewportHeight =
>+        QueryGLIntRange(functions, GL_MAX_VIEWPORT_DIMS, 1);  // GL 1.0 / ES 2.0
> 
>     if (functions->standard == STANDARD_GL_DESKTOP &&
>         (functions->profile & GL_CONTEXT_CORE_PROFILE_BIT) != 0)
>     {
>         // Desktop GL core profile deprecated the GL_ALIASED_POINT_SIZE_RANGE query.  Use
>         // GL_POINT_SIZE_RANGE instead.
>-        caps->minAliasedPointSize = QueryGLFloatRange(functions, GL_POINT_SIZE_RANGE, 0);
>+        caps->minAliasedPointSize =
>+            std::max(1.0f, QueryGLFloatRange(functions, GL_POINT_SIZE_RANGE, 0));
>         caps->maxAliasedPointSize = QueryGLFloatRange(functions, GL_POINT_SIZE_RANGE, 1);
>     }
>     else
>     {
>-        caps->minAliasedPointSize = QueryGLFloatRange(functions, GL_ALIASED_POINT_SIZE_RANGE, 0);
>+        caps->minAliasedPointSize =
>+            std::max(1.0f, QueryGLFloatRange(functions, GL_ALIASED_POINT_SIZE_RANGE, 0));
>         caps->maxAliasedPointSize = QueryGLFloatRange(functions, GL_ALIASED_POINT_SIZE_RANGE, 1);
>     }
> 
>-    caps->minAliasedLineWidth = QueryGLFloatRange(functions, GL_ALIASED_LINE_WIDTH_RANGE, 0); // GL 1.2 / ES 2.0
>-    caps->maxAliasedLineWidth = QueryGLFloatRange(functions, GL_ALIASED_LINE_WIDTH_RANGE, 1); // GL 1.2 / ES 2.0
>+    caps->minAliasedLineWidth =
>+        QueryGLFloatRange(functions, GL_ALIASED_LINE_WIDTH_RANGE, 0);  // GL 1.2 / ES 2.0
>+    caps->maxAliasedLineWidth =
>+        QueryGLFloatRange(functions, GL_ALIASED_LINE_WIDTH_RANGE, 1);  // GL 1.2 / ES 2.0
> 
>     // Table 6.29, implementation dependent values (cont.)
>-    if (functions->isAtLeastGL(gl::Version(1, 2)) ||
>-        functions->isAtLeastGLES(gl::Version(3, 0)))
>+    if (functions->isAtLeastGL(gl::Version(1, 2)) || functions->isAtLeastGLES(gl::Version(3, 0)))
>     {
>-        caps->maxElementsIndices = QuerySingleGLInt(functions, GL_MAX_ELEMENTS_INDICES);
>+        caps->maxElementsIndices  = QuerySingleGLInt(functions, GL_MAX_ELEMENTS_INDICES);
>         caps->maxElementsVertices = QuerySingleGLInt(functions, GL_MAX_ELEMENTS_VERTICES);
>     }
>     else
>@@ -376,7 +565,7 @@ void GenerateCaps(const FunctionsGL *functions,
>     if (functions->isAtLeastGL(gl::Version(4, 1)) ||
>         functions->hasGLExtension("GL_ARB_get_program_binary") ||
>         functions->isAtLeastGLES(gl::Version(3, 0)) ||
>-        functions->hasGLExtension("GL_OES_get_program_binary"))
>+        functions->hasGLESExtension("GL_OES_get_program_binary"))
>     {
>         // Able to support the GL_PROGRAM_BINARY_ANGLE format as long as another program binary
>         // format is available.
>@@ -391,22 +580,25 @@ void GenerateCaps(const FunctionsGL *functions,
>         // Doesn't impact supported version
>     }
> 
>-    // glGetShaderPrecisionFormat is not available until desktop GL version 4.1 or GL_ARB_ES2_compatibility exists
>-    if (functions->isAtLeastGL(gl::Version(4, 1)) || functions->hasGLExtension("GL_ARB_ES2_compatibility") ||
>+    // glGetShaderPrecisionFormat is not available until desktop GL version 4.1 or
>+    // GL_ARB_ES2_compatibility exists
>+    if (functions->isAtLeastGL(gl::Version(4, 1)) ||
>+        functions->hasGLExtension("GL_ARB_ES2_compatibility") ||
>         functions->isAtLeastGLES(gl::Version(2, 0)))
>     {
>-        caps->vertexHighpFloat = QueryTypePrecision(functions, GL_VERTEX_SHADER, GL_HIGH_FLOAT);
>+        caps->vertexHighpFloat   = QueryTypePrecision(functions, GL_VERTEX_SHADER, GL_HIGH_FLOAT);
>         caps->vertexMediumpFloat = QueryTypePrecision(functions, GL_VERTEX_SHADER, GL_MEDIUM_FLOAT);
>-        caps->vertexLowpFloat = QueryTypePrecision(functions, GL_VERTEX_SHADER, GL_LOW_FLOAT);
>+        caps->vertexLowpFloat    = QueryTypePrecision(functions, GL_VERTEX_SHADER, GL_LOW_FLOAT);
>         caps->fragmentHighpFloat = QueryTypePrecision(functions, GL_FRAGMENT_SHADER, GL_HIGH_FLOAT);
>-        caps->fragmentMediumpFloat = QueryTypePrecision(functions, GL_FRAGMENT_SHADER, GL_MEDIUM_FLOAT);
>-        caps->fragmentLowpFloat = QueryTypePrecision(functions, GL_FRAGMENT_SHADER, GL_LOW_FLOAT);
>-        caps->vertexHighpInt = QueryTypePrecision(functions, GL_VERTEX_SHADER, GL_HIGH_INT);
>-        caps->vertexMediumpInt = QueryTypePrecision(functions, GL_VERTEX_SHADER, GL_MEDIUM_INT);
>-        caps->vertexLowpInt = QueryTypePrecision(functions, GL_VERTEX_SHADER, GL_LOW_INT);
>-        caps->fragmentHighpInt = QueryTypePrecision(functions, GL_FRAGMENT_SHADER, GL_HIGH_INT);
>+        caps->fragmentMediumpFloat =
>+            QueryTypePrecision(functions, GL_FRAGMENT_SHADER, GL_MEDIUM_FLOAT);
>+        caps->fragmentLowpFloat  = QueryTypePrecision(functions, GL_FRAGMENT_SHADER, GL_LOW_FLOAT);
>+        caps->vertexHighpInt     = QueryTypePrecision(functions, GL_VERTEX_SHADER, GL_HIGH_INT);
>+        caps->vertexMediumpInt   = QueryTypePrecision(functions, GL_VERTEX_SHADER, GL_MEDIUM_INT);
>+        caps->vertexLowpInt      = QueryTypePrecision(functions, GL_VERTEX_SHADER, GL_LOW_INT);
>+        caps->fragmentHighpInt   = QueryTypePrecision(functions, GL_FRAGMENT_SHADER, GL_HIGH_INT);
>         caps->fragmentMediumpInt = QueryTypePrecision(functions, GL_FRAGMENT_SHADER, GL_MEDIUM_INT);
>-        caps->fragmentLowpInt = QueryTypePrecision(functions, GL_FRAGMENT_SHADER, GL_LOW_INT);
>+        caps->fragmentLowpInt    = QueryTypePrecision(functions, GL_FRAGMENT_SHADER, GL_LOW_INT);
>     }
>     else
>     {
>@@ -428,7 +620,9 @@ void GenerateCaps(const FunctionsGL *functions,
>     if (functions->isAtLeastGL(gl::Version(3, 2)) || functions->hasGLExtension("GL_ARB_sync") ||
>         functions->isAtLeastGLES(gl::Version(3, 0)))
>     {
>-        caps->maxServerWaitTimeout = QuerySingleGLInt64(functions, GL_MAX_SERVER_WAIT_TIMEOUT);
>+        // Work around Linux NVIDIA driver bug where GL_TIMEOUT_IGNORED is returned.
>+        caps->maxServerWaitTimeout =
>+            std::max<GLint64>(QuerySingleGLInt64(functions, GL_MAX_SERVER_WAIT_TIMEOUT), 0);
>     }
>     else
>     {
>@@ -436,12 +630,13 @@ void GenerateCaps(const FunctionsGL *functions,
>     }
> 
>     // Table 6.31, implementation dependent vertex shader limits
>-    if (functions->isAtLeastGL(gl::Version(2, 0)) ||
>-        functions->isAtLeastGLES(gl::Version(2, 0)))
>+    if (functions->isAtLeastGL(gl::Version(2, 0)) || functions->isAtLeastGLES(gl::Version(2, 0)))
>     {
>         caps->maxVertexAttributes = QuerySingleGLInt(functions, GL_MAX_VERTEX_ATTRIBS);
>-        caps->maxVertexUniformComponents = QuerySingleGLInt(functions, GL_MAX_VERTEX_UNIFORM_COMPONENTS);
>-        caps->maxVertexTextureImageUnits = QuerySingleGLInt(functions, GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS);
>+        caps->maxShaderUniformComponents[gl::ShaderType::Vertex] =
>+            QuerySingleGLInt(functions, GL_MAX_VERTEX_UNIFORM_COMPONENTS);
>+        caps->maxShaderTextureImageUnits[gl::ShaderType::Vertex] =
>+            QuerySingleGLInt(functions, GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS);
>     }
>     else
>     {
>@@ -449,7 +644,8 @@ void GenerateCaps(const FunctionsGL *functions,
>         LimitVersion(maxSupportedESVersion, gl::Version(0, 0));
>     }
> 
>-    if (functions->isAtLeastGL(gl::Version(4, 1)) || functions->hasGLExtension("GL_ARB_ES2_compatibility") ||
>+    if (functions->isAtLeastGL(gl::Version(4, 1)) ||
>+        functions->hasGLExtension("GL_ARB_ES2_compatibility") ||
>         functions->isAtLeastGLES(gl::Version(2, 0)))
>     {
>         caps->maxVertexUniformVectors = QuerySingleGLInt(functions, GL_MAX_VERTEX_UNIFORM_VECTORS);
>@@ -459,29 +655,32 @@ void GenerateCaps(const FunctionsGL *functions,
>     else
>     {
>         // Doesn't limit ES version, GL_MAX_VERTEX_UNIFORM_COMPONENTS / 4 is acceptable.
>-        caps->maxVertexUniformVectors = caps->maxVertexUniformComponents / 4;
>+        caps->maxVertexUniformVectors =
>+            caps->maxShaderUniformComponents[gl::ShaderType::Vertex] / 4;
>         // Doesn't limit ES version, GL_MAX_FRAGMENT_UNIFORM_COMPONENTS / 4 is acceptable.
>-        caps->maxFragmentUniformVectors = caps->maxFragmentUniformComponents / 4;
>+        caps->maxFragmentUniformVectors =
>+            caps->maxShaderUniformComponents[gl::ShaderType::Fragment] / 4;
>     }
> 
>-    if (functions->isAtLeastGL(gl::Version(3, 2)) ||
>-        functions->isAtLeastGLES(gl::Version(3, 0)))
>+    if (functions->isAtLeastGL(gl::Version(3, 2)) || functions->isAtLeastGLES(gl::Version(3, 0)))
>     {
>-        caps->maxVertexOutputComponents = QuerySingleGLInt(functions, GL_MAX_VERTEX_OUTPUT_COMPONENTS);
>+        caps->maxVertexOutputComponents =
>+            QuerySingleGLInt(functions, GL_MAX_VERTEX_OUTPUT_COMPONENTS);
>     }
>     else
>     {
>-        // There doesn't seem, to be a desktop extension to add this cap, maybe it could be given a safe limit
>-        // instead of limiting the supported ES version.
>+        // There doesn't seem, to be a desktop extension to add this cap, maybe it could be given a
>+        // safe limit instead of limiting the supported ES version.
>         LimitVersion(maxSupportedESVersion, gl::Version(2, 0));
>     }
> 
>     // Table 6.32, implementation dependent fragment shader limits
>-    if (functions->isAtLeastGL(gl::Version(2, 0)) ||
>-        functions->isAtLeastGLES(gl::Version(2, 0)))
>+    if (functions->isAtLeastGL(gl::Version(2, 0)) || functions->isAtLeastGLES(gl::Version(2, 0)))
>     {
>-        caps->maxFragmentUniformComponents = QuerySingleGLInt(functions, GL_MAX_FRAGMENT_UNIFORM_COMPONENTS);
>-        caps->maxTextureImageUnits = QuerySingleGLInt(functions, GL_MAX_TEXTURE_IMAGE_UNITS);
>+        caps->maxShaderUniformComponents[gl::ShaderType::Fragment] =
>+            QuerySingleGLInt(functions, GL_MAX_FRAGMENT_UNIFORM_COMPONENTS);
>+        caps->maxShaderTextureImageUnits[gl::ShaderType::Fragment] =
>+            QuerySingleGLInt(functions, GL_MAX_TEXTURE_IMAGE_UNITS);
>     }
>     else
>     {
>@@ -489,20 +688,19 @@ void GenerateCaps(const FunctionsGL *functions,
>         LimitVersion(maxSupportedESVersion, gl::Version(0, 0));
>     }
> 
>-    if (functions->isAtLeastGL(gl::Version(3, 2)) ||
>-        functions->isAtLeastGLES(gl::Version(3, 0)))
>+    if (functions->isAtLeastGL(gl::Version(3, 2)) || functions->isAtLeastGLES(gl::Version(3, 0)))
>     {
>-        caps->maxFragmentInputComponents = QuerySingleGLInt(functions, GL_MAX_FRAGMENT_INPUT_COMPONENTS);
>+        caps->maxFragmentInputComponents =
>+            QuerySingleGLInt(functions, GL_MAX_FRAGMENT_INPUT_COMPONENTS);
>     }
>     else
>     {
>-        // There doesn't seem, to be a desktop extension to add this cap, maybe it could be given a safe limit
>-        // instead of limiting the supported ES version.
>+        // There doesn't seem, to be a desktop extension to add this cap, maybe it could be given a
>+        // safe limit instead of limiting the supported ES version.
>         LimitVersion(maxSupportedESVersion, gl::Version(2, 0));
>     }
> 
>-    if (functions->isAtLeastGL(gl::Version(3, 0)) ||
>-        functions->isAtLeastGLES(gl::Version(3, 0)))
>+    if (functions->isAtLeastGL(gl::Version(3, 0)) || functions->isAtLeastGLES(gl::Version(3, 0)))
>     {
>         caps->minProgramTexelOffset = QuerySingleGLInt(functions, GL_MIN_PROGRAM_TEXEL_OFFSET);
>         caps->maxProgramTexelOffset = QuerySingleGLInt(functions, GL_MAX_PROGRAM_TEXEL_OFFSET);
>@@ -514,26 +712,25 @@ void GenerateCaps(const FunctionsGL *functions,
>     }
> 
>     // Table 6.33, implementation dependent aggregate shader limits
>-    if (functions->isAtLeastGL(gl::Version(3, 1)) || functions->hasGLExtension("GL_ARB_uniform_buffer_object") ||
>+    if (functions->isAtLeastGL(gl::Version(3, 1)) ||
>+        functions->hasGLExtension("GL_ARB_uniform_buffer_object") ||
>         functions->isAtLeastGLES(gl::Version(3, 0)))
>     {
>-        caps->maxVertexUniformBlocks = QuerySingleGLInt(functions, GL_MAX_VERTEX_UNIFORM_BLOCKS);
>-        caps->maxFragmentUniformBlocks =
>+        caps->maxShaderUniformBlocks[gl::ShaderType::Vertex] =
>+            QuerySingleGLInt(functions, GL_MAX_VERTEX_UNIFORM_BLOCKS);
>+        caps->maxShaderUniformBlocks[gl::ShaderType::Fragment] =
>             QuerySingleGLInt(functions, GL_MAX_FRAGMENT_UNIFORM_BLOCKS);
>-        caps->maxUniformBufferBindings = QuerySingleGLInt(functions, GL_MAX_UNIFORM_BUFFER_BINDINGS);
>+        caps->maxUniformBufferBindings =
>+            QuerySingleGLInt(functions, GL_MAX_UNIFORM_BUFFER_BINDINGS);
>         caps->maxUniformBlockSize = QuerySingleGLInt64(functions, GL_MAX_UNIFORM_BLOCK_SIZE);
>-        caps->uniformBufferOffsetAlignment = QuerySingleGLInt(functions, GL_UNIFORM_BUFFER_OFFSET_ALIGNMENT);
>-
>-        GLuint maxCombinedUniformBlocks =
>-            QuerySingleGLInt(functions, GL_MAX_COMBINED_UNIFORM_BLOCKS);
>-        // The real cap contains the limits for shader types that are not available to ES, so limit
>-        // the cap to the sum of vertex+fragment shader caps.
>+        caps->uniformBufferOffsetAlignment =
>+            QuerySingleGLInt(functions, GL_UNIFORM_BUFFER_OFFSET_ALIGNMENT);
>         caps->maxCombinedUniformBlocks =
>-            std::min(maxCombinedUniformBlocks,
>-                     caps->maxVertexUniformBlocks + caps->maxFragmentUniformBlocks);
>-
>-        caps->maxCombinedVertexUniformComponents = QuerySingleGLInt64(functions, GL_MAX_COMBINED_VERTEX_UNIFORM_COMPONENTS);
>-        caps->maxCombinedFragmentUniformComponents = QuerySingleGLInt64(functions, GL_MAX_COMBINED_FRAGMENT_UNIFORM_COMPONENTS);
>+            QuerySingleGLInt(functions, GL_MAX_COMBINED_UNIFORM_BLOCKS);
>+        caps->maxCombinedShaderUniformComponents[gl::ShaderType::Vertex] =
>+            QuerySingleGLInt64(functions, GL_MAX_COMBINED_VERTEX_UNIFORM_COMPONENTS);
>+        caps->maxCombinedShaderUniformComponents[gl::ShaderType::Fragment] =
>+            QuerySingleGLInt64(functions, GL_MAX_COMBINED_FRAGMENT_UNIFORM_COMPONENTS);
>     }
>     else
>     {
>@@ -562,7 +759,8 @@ void GenerateCaps(const FunctionsGL *functions,
>         LimitVersion(maxSupportedESVersion, gl::Version(0, 0));
>     }
> 
>-    if (functions->isAtLeastGL(gl::Version(4, 1)) || functions->hasGLExtension("GL_ARB_ES2_compatibility") ||
>+    if (functions->isAtLeastGL(gl::Version(4, 1)) ||
>+        functions->hasGLExtension("GL_ARB_ES2_compatibility") ||
>         functions->isAtLeastGLES(gl::Version(2, 0)))
>     {
>         caps->maxVaryingVectors = QuerySingleGLInt(functions, GL_MAX_VARYING_VECTORS);
>@@ -574,17 +772,22 @@ void GenerateCaps(const FunctionsGL *functions,
>     }
> 
>     // Determine the max combined texture image units by adding the vertex and fragment limits.  If
>-    // the real cap is queried, it would contain the limits for shader types that are not available to ES.
>-    caps->maxCombinedTextureImageUnits = caps->maxVertexTextureImageUnits + caps->maxTextureImageUnits;
>+    // the real cap is queried, it would contain the limits for shader types that are not available
>+    // to ES.
>+    caps->maxCombinedTextureImageUnits =
>+        QuerySingleGLInt(functions, GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS);
> 
>     // Table 6.34, implementation dependent transform feedback limits
>     if (functions->isAtLeastGL(gl::Version(4, 0)) ||
>         functions->hasGLExtension("GL_ARB_transform_feedback2") ||
>         functions->isAtLeastGLES(gl::Version(3, 0)))
>     {
>-        caps->maxTransformFeedbackInterleavedComponents = QuerySingleGLInt(functions, GL_MAX_TRANSFORM_FEEDBACK_INTERLEAVED_COMPONENTS);
>-        caps->maxTransformFeedbackSeparateAttributes = QuerySingleGLInt(functions, GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_ATTRIBS);
>-        caps->maxTransformFeedbackSeparateComponents = QuerySingleGLInt(functions, GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_COMPONENTS);
>+        caps->maxTransformFeedbackInterleavedComponents =
>+            QuerySingleGLInt(functions, GL_MAX_TRANSFORM_FEEDBACK_INTERLEAVED_COMPONENTS);
>+        caps->maxTransformFeedbackSeparateAttributes =
>+            QuerySingleGLInt(functions, GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_ATTRIBS);
>+        caps->maxTransformFeedbackSeparateComponents =
>+            QuerySingleGLInt(functions, GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_COMPONENTS);
>     }
>     else
>     {
>@@ -593,8 +796,10 @@ void GenerateCaps(const FunctionsGL *functions,
>     }
> 
>     // Table 6.35, Framebuffer Dependent Values
>-    if (functions->isAtLeastGL(gl::Version(3, 0)) || functions->hasGLExtension("GL_EXT_framebuffer_multisample") ||
>-        functions->isAtLeastGLES(gl::Version(3, 0)) || functions->hasGLESExtension("GL_EXT_multisampled_render_to_texture"))
>+    if (functions->isAtLeastGL(gl::Version(3, 0)) ||
>+        functions->hasGLExtension("GL_EXT_framebuffer_multisample") ||
>+        functions->isAtLeastGLES(gl::Version(3, 0)) ||
>+        functions->hasGLESExtension("GL_EXT_multisampled_render_to_texture"))
>     {
>         caps->maxSamples = QuerySingleGLInt(functions, GL_MAX_SAMPLES);
>     }
>@@ -708,9 +913,9 @@ void GenerateCaps(const FunctionsGL *functions,
>     {
>         caps->maxCombinedShaderOutputResources =
>             QuerySingleGLInt(functions, GL_MAX_COMBINED_SHADER_OUTPUT_RESOURCES);
>-        caps->maxFragmentShaderStorageBlocks =
>+        caps->maxShaderStorageBlocks[gl::ShaderType::Fragment] =
>             QuerySingleGLInt(functions, GL_MAX_FRAGMENT_SHADER_STORAGE_BLOCKS);
>-        caps->maxVertexShaderStorageBlocks =
>+        caps->maxShaderStorageBlocks[gl::ShaderType::Vertex] =
>             QuerySingleGLInt(functions, GL_MAX_VERTEX_SHADER_STORAGE_BLOCKS);
>         caps->maxShaderStorageBufferBindings =
>             QuerySingleGLInt(functions, GL_MAX_SHADER_STORAGE_BUFFER_BINDINGS);
>@@ -744,21 +949,23 @@ void GenerateCaps(const FunctionsGL *functions,
>         }
>         caps->maxComputeWorkGroupInvocations =
>             QuerySingleGLInt(functions, GL_MAX_COMPUTE_WORK_GROUP_INVOCATIONS);
>-        caps->maxComputeUniformBlocks = QuerySingleGLInt(functions, GL_MAX_COMPUTE_UNIFORM_BLOCKS);
>-        caps->maxComputeTextureImageUnits =
>+        caps->maxShaderUniformBlocks[gl::ShaderType::Compute] =
>+            QuerySingleGLInt(functions, GL_MAX_COMPUTE_UNIFORM_BLOCKS);
>+        caps->maxShaderTextureImageUnits[gl::ShaderType::Compute] =
>             QuerySingleGLInt(functions, GL_MAX_COMPUTE_TEXTURE_IMAGE_UNITS);
>         caps->maxComputeSharedMemorySize =
>             QuerySingleGLInt(functions, GL_MAX_COMPUTE_SHARED_MEMORY_SIZE);
>-        caps->maxComputeUniformComponents =
>+        caps->maxShaderUniformComponents[gl::ShaderType::Compute] =
>             QuerySingleGLInt(functions, GL_MAX_COMPUTE_UNIFORM_COMPONENTS);
>-        caps->maxComputeAtomicCounterBuffers =
>+        caps->maxShaderAtomicCounterBuffers[gl::ShaderType::Compute] =
>             QuerySingleGLInt(functions, GL_MAX_COMPUTE_ATOMIC_COUNTER_BUFFERS);
>-        caps->maxComputeAtomicCounters =
>+        caps->maxShaderAtomicCounters[gl::ShaderType::Compute] =
>             QuerySingleGLInt(functions, GL_MAX_COMPUTE_ATOMIC_COUNTERS);
>-        caps->maxComputeImageUniforms = QuerySingleGLInt(functions, GL_MAX_COMPUTE_IMAGE_UNIFORMS);
>-        caps->maxCombinedComputeUniformComponents =
>+        caps->maxShaderImageUniforms[gl::ShaderType::Compute] =
>+            QuerySingleGLInt(functions, GL_MAX_COMPUTE_IMAGE_UNIFORMS);
>+        caps->maxCombinedShaderUniformComponents[gl::ShaderType::Compute] =
>             QuerySingleGLInt(functions, GL_MAX_COMBINED_COMPUTE_UNIFORM_COMPONENTS);
>-        caps->maxComputeShaderStorageBlocks =
>+        caps->maxShaderStorageBlocks[gl::ShaderType::Compute] =
>             QuerySingleGLInt(functions, GL_MAX_COMPUTE_SHADER_STORAGE_BLOCKS);
>     }
>     else
>@@ -792,8 +999,9 @@ void GenerateCaps(const FunctionsGL *functions,
>     if (functions->isAtLeastGL(gl::Version(4, 2)) || functions->isAtLeastGLES(gl::Version(3, 1)) ||
>         functions->hasGLExtension("GL_ARB_shader_image_load_store"))
>     {
>-        caps->maxVertexImageUniforms = QuerySingleGLInt(functions, GL_MAX_VERTEX_IMAGE_UNIFORMS);
>-        caps->maxFragmentImageUniforms =
>+        caps->maxShaderImageUniforms[gl::ShaderType::Vertex] =
>+            QuerySingleGLInt(functions, GL_MAX_VERTEX_IMAGE_UNIFORMS);
>+        caps->maxShaderImageUniforms[gl::ShaderType::Fragment] =
>             QuerySingleGLInt(functions, GL_MAX_FRAGMENT_IMAGE_UNIFORMS);
>         caps->maxImageUnits = QuerySingleGLInt(functions, GL_MAX_IMAGE_UNITS);
>         caps->maxCombinedImageUniforms =
>@@ -807,12 +1015,13 @@ void GenerateCaps(const FunctionsGL *functions,
>     if (functions->isAtLeastGL(gl::Version(4, 2)) || functions->isAtLeastGLES(gl::Version(3, 1)) ||
>         functions->hasGLExtension("GL_ARB_shader_atomic_counters"))
>     {
>-        caps->maxVertexAtomicCounterBuffers =
>+        caps->maxShaderAtomicCounterBuffers[gl::ShaderType::Vertex] =
>             QuerySingleGLInt(functions, GL_MAX_VERTEX_ATOMIC_COUNTER_BUFFERS);
>-        caps->maxVertexAtomicCounters = QuerySingleGLInt(functions, GL_MAX_VERTEX_ATOMIC_COUNTERS);
>-        caps->maxFragmentAtomicCounterBuffers =
>+        caps->maxShaderAtomicCounters[gl::ShaderType::Vertex] =
>+            QuerySingleGLInt(functions, GL_MAX_VERTEX_ATOMIC_COUNTERS);
>+        caps->maxShaderAtomicCounterBuffers[gl::ShaderType::Fragment] =
>             QuerySingleGLInt(functions, GL_MAX_FRAGMENT_ATOMIC_COUNTER_BUFFERS);
>-        caps->maxFragmentAtomicCounters =
>+        caps->maxShaderAtomicCounters[gl::ShaderType::Fragment] =
>             QuerySingleGLInt(functions, GL_MAX_FRAGMENT_ATOMIC_COUNTERS);
>         caps->maxAtomicCounterBufferBindings =
>             QuerySingleGLInt(functions, GL_MAX_ATOMIC_COUNTER_BUFFER_BINDINGS);
>@@ -832,11 +1041,13 @@ void GenerateCaps(const FunctionsGL *functions,
>     // if the max uniform vectors is too large.  Artificially limit the maximum until the test is
>     // updated.
>     caps->maxVertexUniformVectors = std::min(1024u, caps->maxVertexUniformVectors);
>-    caps->maxVertexUniformComponents =
>-        std::min(caps->maxVertexUniformVectors * 4, caps->maxVertexUniformComponents);
>+    caps->maxShaderUniformComponents[gl::ShaderType::Vertex] =
>+        std::min(caps->maxVertexUniformVectors * 4,
>+                 caps->maxShaderUniformComponents[gl::ShaderType::Vertex]);
>     caps->maxFragmentUniformVectors = std::min(1024u, caps->maxFragmentUniformVectors);
>-    caps->maxFragmentUniformComponents =
>-        std::min(caps->maxFragmentUniformVectors * 4, caps->maxFragmentUniformComponents);
>+    caps->maxShaderUniformComponents[gl::ShaderType::Fragment] =
>+        std::min(caps->maxFragmentUniformVectors * 4,
>+                 caps->maxShaderUniformComponents[gl::ShaderType::Fragment]);
> 
>     // If it is not possible to support reading buffer data back, a shadow copy of the buffers must
>     // be held. This disallows writing to buffers indirectly through transform feedback, thus
>@@ -849,30 +1060,42 @@ void GenerateCaps(const FunctionsGL *functions,
>     // Extension support
>     extensions->setTextureExtensionSupport(*textureCapsMap);
>     extensions->elementIndexUint = functions->standard == STANDARD_GL_DESKTOP ||
>-                                   functions->isAtLeastGLES(gl::Version(3, 0)) || functions->hasGLESExtension("GL_OES_element_index_uint");
>+                                   functions->isAtLeastGLES(gl::Version(3, 0)) ||
>+                                   functions->hasGLESExtension("GL_OES_element_index_uint");
>     extensions->getProgramBinary = caps->programBinaryFormats.size() > 0;
>-    extensions->readFormatBGRA = functions->isAtLeastGL(gl::Version(1, 2)) || functions->hasGLExtension("GL_EXT_bgra") ||
>+    extensions->readFormatBGRA   = functions->isAtLeastGL(gl::Version(1, 2)) ||
>+                                 functions->hasGLExtension("GL_EXT_bgra") ||
>                                  functions->hasGLESExtension("GL_EXT_read_format_bgra");
>     extensions->mapBuffer = functions->isAtLeastGL(gl::Version(1, 5)) ||
>                             functions->isAtLeastGLES(gl::Version(3, 0)) ||
>                             functions->hasGLESExtension("GL_OES_mapbuffer");
>-    extensions->mapBufferRange = functions->isAtLeastGL(gl::Version(3, 0)) || functions->hasGLExtension("GL_ARB_map_buffer_range") ||
>-                                 functions->isAtLeastGLES(gl::Version(3, 0)) || functions->hasGLESExtension("GL_EXT_map_buffer_range");
>+    extensions->mapBufferRange = functions->isAtLeastGL(gl::Version(3, 0)) ||
>+                                 functions->hasGLExtension("GL_ARB_map_buffer_range") ||
>+                                 functions->isAtLeastGLES(gl::Version(3, 0)) ||
>+                                 functions->hasGLESExtension("GL_EXT_map_buffer_range");
>     extensions->textureNPOT = functions->standard == STANDARD_GL_DESKTOP ||
>-                              functions->isAtLeastGLES(gl::Version(3, 0)) || functions->hasGLESExtension("GL_OES_texture_npot");
>+                              functions->isAtLeastGLES(gl::Version(3, 0)) ||
>+                              functions->hasGLESExtension("GL_OES_texture_npot");
>     // TODO(jmadill): Investigate emulating EXT_draw_buffers on ES 3.0's core functionality.
>     extensions->drawBuffers = functions->isAtLeastGL(gl::Version(2, 0)) ||
>                               functions->hasGLExtension("ARB_draw_buffers") ||
>                               functions->hasGLESExtension("GL_EXT_draw_buffers");
>     extensions->textureStorage = functions->standard == STANDARD_GL_DESKTOP ||
>                                  functions->hasGLESExtension("GL_EXT_texture_storage");
>-    extensions->textureFilterAnisotropic = functions->hasGLExtension("GL_EXT_texture_filter_anisotropic") || functions->hasGLESExtension("GL_EXT_texture_filter_anisotropic");
>-    extensions->occlusionQueryBoolean    = nativegl::SupportsOcclusionQueries(functions);
>-    extensions->maxTextureAnisotropy = extensions->textureFilterAnisotropic ? QuerySingleGLFloat(functions, GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT) : 0.0f;
>-    extensions->fence = functions->hasGLExtension("GL_NV_fence") || functions->hasGLESExtension("GL_NV_fence");
>-    extensions->blendMinMax = functions->isAtLeastGL(gl::Version(1, 5)) || functions->hasGLExtension("GL_EXT_blend_minmax") ||
>-                              functions->isAtLeastGLES(gl::Version(3, 0)) || functions->hasGLESExtension("GL_EXT_blend_minmax");
>-    extensions->framebufferBlit = (functions->blitFramebuffer != nullptr);
>+    extensions->textureFilterAnisotropic =
>+        functions->hasGLExtension("GL_EXT_texture_filter_anisotropic") ||
>+        functions->hasGLESExtension("GL_EXT_texture_filter_anisotropic");
>+    extensions->occlusionQueryBoolean = nativegl::SupportsOcclusionQueries(functions);
>+    extensions->maxTextureAnisotropy =
>+        extensions->textureFilterAnisotropic
>+            ? QuerySingleGLFloat(functions, GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT)
>+            : 0.0f;
>+    extensions->fence = FenceNVGL::Supported(functions) || FenceNVSyncGL::Supported(functions);
>+    extensions->blendMinMax = functions->isAtLeastGL(gl::Version(1, 5)) ||
>+                              functions->hasGLExtension("GL_EXT_blend_minmax") ||
>+                              functions->isAtLeastGLES(gl::Version(3, 0)) ||
>+                              functions->hasGLESExtension("GL_EXT_blend_minmax");
>+    extensions->framebufferBlit        = (functions->blitFramebuffer != nullptr);
>     extensions->framebufferMultisample = caps->maxSamples > 0;
>     extensions->standardDerivatives    = functions->isAtLeastGL(gl::Version(2, 0)) ||
>                                       functions->hasGLExtension("GL_ARB_fragment_shader") ||
>@@ -885,26 +1108,33 @@ void GenerateCaps(const FunctionsGL *functions,
> 
>     if (functions->hasGLExtension("GL_NV_viewport_array2"))
>     {
>-        extensions->multiview = true;
>+        extensions->multiview2 = true;
>         // GL_MAX_ARRAY_TEXTURE_LAYERS is guaranteed to be at least 256.
>         const int maxLayers = QuerySingleGLInt(functions, GL_MAX_ARRAY_TEXTURE_LAYERS);
>         // GL_MAX_VIEWPORTS is guaranteed to be at least 16.
>-        const int maxViewports       = QuerySingleGLInt(functions, GL_MAX_VIEWPORTS);
>-        extensions->maxViews         = static_cast<GLuint>(
>+        const int maxViewports = QuerySingleGLInt(functions, GL_MAX_VIEWPORTS);
>+        extensions->maxViews   = static_cast<GLuint>(
>             std::min(static_cast<int>(gl::IMPLEMENTATION_ANGLE_MULTIVIEW_MAX_VIEWS),
>                      std::min(maxLayers, maxViewports)));
>         *multiviewImplementationType = MultiviewImplementationTypeGL::NV_VIEWPORT_ARRAY2;
>     }
> 
>-    extensions->fboRenderMipmap = functions->isAtLeastGL(gl::Version(3, 0)) || functions->hasGLExtension("GL_EXT_framebuffer_object") ||
>-                                  functions->isAtLeastGLES(gl::Version(3, 0)) || functions->hasGLESExtension("GL_OES_fbo_render_mipmap");
>-    extensions->instancedArrays = functions->isAtLeastGL(gl::Version(3, 1)) ||
>-                                  (functions->hasGLExtension("GL_ARB_instanced_arrays") &&
>-                                   (functions->hasGLExtension("GL_ARB_draw_instanced") ||
>-                                    functions->hasGLExtension("GL_EXT_draw_instanced"))) ||
>+    extensions->fboRenderMipmap = functions->isAtLeastGL(gl::Version(3, 0)) ||
>+                                  functions->hasGLExtension("GL_EXT_framebuffer_object") ||
>                                   functions->isAtLeastGLES(gl::Version(3, 0)) ||
>-                                  functions->hasGLESExtension("GL_EXT_instanced_arrays");
>-    extensions->unpackSubimage = functions->standard == STANDARD_GL_DESKTOP ||
>+                                  functions->hasGLESExtension("GL_OES_fbo_render_mipmap");
>+    extensions->textureBorderClamp = functions->standard == STANDARD_GL_DESKTOP ||
>+                                     functions->hasGLESExtension("GL_OES_texture_border_clamp") ||
>+                                     functions->hasGLESExtension("GL_EXT_texture_border_clamp") ||
>+                                     functions->hasGLESExtension("GL_NV_texture_border_clamp");
>+    extensions->instancedArraysANGLE = functions->isAtLeastGL(gl::Version(3, 1)) ||
>+                                       (functions->hasGLExtension("GL_ARB_instanced_arrays") &&
>+                                        (functions->hasGLExtension("GL_ARB_draw_instanced") ||
>+                                         functions->hasGLExtension("GL_EXT_draw_instanced"))) ||
>+                                       functions->isAtLeastGLES(gl::Version(3, 0)) ||
>+                                       functions->hasGLESExtension("GL_EXT_instanced_arrays");
>+    extensions->instancedArraysEXT = extensions->instancedArraysANGLE;
>+    extensions->unpackSubimage     = functions->standard == STANDARD_GL_DESKTOP ||
>                                  functions->isAtLeastGLES(gl::Version(3, 0)) ||
>                                  functions->hasGLESExtension("GL_EXT_unpack_subimage");
>     extensions->packSubimage = functions->standard == STANDARD_GL_DESKTOP ||
>@@ -920,21 +1150,34 @@ void GenerateCaps(const FunctionsGL *functions,
>                               functions->isAtLeastGLES(gl::Version(3, 2)) ||
>                               functions->hasGLESExtension("GL_KHR_debug") ||
>                               functions->hasGLESExtension("GL_EXT_debug_marker");
>+    extensions->eglImage         = functions->hasGLESExtension("GL_OES_EGL_image");
>+    extensions->eglImageExternal = functions->hasGLESExtension("GL_OES_EGL_image_external");
>+    extensions->eglImageExternalEssl3 =
>+        functions->hasGLESExtension("GL_OES_EGL_image_external_essl3");
>+
>+    extensions->eglSync = functions->hasGLESExtension("GL_OES_EGL_sync");
>+
>     if (functions->isAtLeastGL(gl::Version(3, 3)) ||
>         functions->hasGLExtension("GL_ARB_timer_query") ||
>         functions->hasGLESExtension("GL_EXT_disjoint_timer_query"))
>     {
>         extensions->disjointTimerQuery = true;
>-        extensions->queryCounterBitsTimeElapsed =
>-            QueryQueryValue(functions, GL_TIME_ELAPSED, GL_QUERY_COUNTER_BITS);
>-        extensions->queryCounterBitsTimestamp =
>-            QueryQueryValue(functions, GL_TIMESTAMP, GL_QUERY_COUNTER_BITS);
>+
>+        // If we can't query the counter bits, leave them at 0.
>+        if (!workarounds.queryCounterBitsGeneratesErrors)
>+        {
>+            extensions->queryCounterBitsTimeElapsed =
>+                QueryQueryValue(functions, GL_TIME_ELAPSED, GL_QUERY_COUNTER_BITS);
>+            extensions->queryCounterBitsTimestamp =
>+                QueryQueryValue(functions, GL_TIMESTAMP, GL_QUERY_COUNTER_BITS);
>+        }
>     }
> 
>     // the EXT_multisample_compatibility is written against ES3.1 but can apply
>     // to earlier versions so therefore we're only checking for the extension string
>     // and not the specific GLES version.
>-    extensions->multisampleCompatibility = functions->isAtLeastGL(gl::Version(1, 3)) ||
>+    extensions->multisampleCompatibility =
>+        functions->isAtLeastGL(gl::Version(1, 3)) ||
>         functions->hasGLESExtension("GL_EXT_multisample_compatibility");
> 
>     extensions->framebufferMixedSamples =
>@@ -956,6 +1199,17 @@ void GenerateCaps(const FunctionsGL *functions,
>     extensions->copyTexture = true;
>     extensions->syncQuery   = SyncQueryGL::IsSupported(functions);
> 
>+    // Note that OES_texture_storage_multisample_2d_array support could be extended down to GL 3.2
>+    // if we emulated texStorage* API on top of texImage*.
>+    extensions->textureStorageMultisample2DArray =
>+        functions->isAtLeastGL(gl::Version(4, 2)) || functions->isAtLeastGLES(gl::Version(3, 2));
>+
>+    extensions->multiviewMultisample =
>+        extensions->textureStorageMultisample2DArray && extensions->multiview2;
>+
>+    extensions->textureMultisample = functions->isAtLeastGL(gl::Version(3, 2)) ||
>+                                     functions->hasGLExtension("GL_ARB_texture_multisample");
>+
>     // NV_path_rendering
>     // We also need interface query which is available in
>     // >= 4.3 core or ARB_interface_query or >= GLES 3.1
>@@ -964,9 +1218,8 @@ void GenerateCaps(const FunctionsGL *functions,
>         (functions->hasGLExtension("GL_ARB_program_interface_query") ||
>          functions->isAtLeastGL(gl::Version(4, 3)));
> 
>-    const bool canEnableESPathRendering =
>-        functions->hasGLESExtension("GL_NV_path_rendering") &&
>-        functions->isAtLeastGLES(gl::Version(3, 1));
>+    const bool canEnableESPathRendering = functions->hasGLESExtension("GL_NV_path_rendering") &&
>+                                          functions->isAtLeastGLES(gl::Version(3, 1));
> 
>     extensions->pathRendering = canEnableGLPathRendering || canEnableESPathRendering;
> 
>@@ -1017,33 +1270,132 @@ void GenerateCaps(const FunctionsGL *functions,
>             QuerySingleGLInt(functions, GL_MAX_RECTANGLE_TEXTURE_SIZE_ANGLE);
>     }
> 
>-    // We need at least OpenGL 4.3 to support all features and constants defined in
>+    // OpenGL 4.3 (and above) can support all features and constants defined in
>     // GL_EXT_geometry_shader.
>     if (functions->isAtLeastGL(gl::Version(4, 3)) || functions->isAtLeastGLES(gl::Version(3, 2)) ||
>         functions->hasGLESExtension("GL_OES_geometry_shader") ||
>-        functions->hasGLESExtension("GL_EXT_geometry_shader"))
>+        functions->hasGLESExtension("GL_EXT_geometry_shader") ||
>+        // OpenGL 4.0 adds the support for instanced geometry shader
>+        // GL_ARB_shader_atomic_counters adds atomic counters to geometry shader
>+        // GL_ARB_shader_storage_buffer_object adds shader storage buffers to geometry shader
>+        // GL_ARB_shader_image_load_store adds images to geometry shader
>+        (functions->isAtLeastGL(gl::Version(4, 0)) &&
>+         functions->hasGLExtension("GL_ARB_shader_atomic_counters") &&
>+         functions->hasGLExtension("GL_ARB_shader_storage_buffer_object") &&
>+         functions->hasGLExtension("GL_ARB_shader_image_load_store")))
>     {
>         extensions->geometryShader = true;
> 
>-        // TODO(jiawei.shao@intel.com): initialize all implementation dependent geometry shader
>-        // limits.
>-        extensions->maxGeometryOutputVertices =
>+        caps->maxFramebufferLayers = QuerySingleGLInt(functions, GL_MAX_FRAMEBUFFER_LAYERS_EXT);
>+
>+        // GL_PROVOKING_VERTEX isn't a valid return value of GL_LAYER_PROVOKING_VERTEX_EXT in
>+        // GL_EXT_geometry_shader SPEC, however it is legal in desktop OpenGL, which means the value
>+        // follows the one set by glProvokingVertex.
>+        // [OpenGL 4.3] Chapter 11.3.4.6
>+        // The vertex conventions followed for gl_Layer and gl_ViewportIndex may be determined by
>+        // calling GetIntegerv with the symbolic constants LAYER_PROVOKING_VERTEX and
>+        // VIEWPORT_INDEX_PROVOKING_VERTEX, respectively. For either query, if the value returned is
>+        // PROVOKING_VERTEX, then vertex selection follows the convention specified by
>+        // ProvokingVertex.
>+        caps->layerProvokingVertex = QuerySingleGLInt(functions, GL_LAYER_PROVOKING_VERTEX_EXT);
>+        if (caps->layerProvokingVertex == GL_PROVOKING_VERTEX)
>+        {
>+            // We should use GL_LAST_VERTEX_CONVENTION_EXT instead because desktop OpenGL SPEC
>+            // requires the initial value of provoking vertex mode is LAST_VERTEX_CONVENTION.
>+            // [OpenGL 4.3] Chapter 13.4
>+            // The initial value of the provoking vertex mode is LAST_VERTEX_CONVENTION.
>+            caps->layerProvokingVertex = GL_LAST_VERTEX_CONVENTION_EXT;
>+        }
>+
>+        caps->maxShaderUniformComponents[gl::ShaderType::Geometry] =
>+            QuerySingleGLInt(functions, GL_MAX_GEOMETRY_UNIFORM_COMPONENTS_EXT);
>+        caps->maxShaderUniformBlocks[gl::ShaderType::Geometry] =
>+            QuerySingleGLInt(functions, GL_MAX_GEOMETRY_UNIFORM_BLOCKS_EXT);
>+        caps->maxCombinedShaderUniformComponents[gl::ShaderType::Geometry] =
>+            QuerySingleGLInt(functions, GL_MAX_COMBINED_GEOMETRY_UNIFORM_COMPONENTS_EXT);
>+        caps->maxGeometryInputComponents =
>+            QuerySingleGLInt(functions, GL_MAX_GEOMETRY_INPUT_COMPONENTS_EXT);
>+        caps->maxGeometryOutputComponents =
>+            QuerySingleGLInt(functions, GL_MAX_GEOMETRY_OUTPUT_COMPONENTS_EXT);
>+        caps->maxGeometryOutputVertices =
>             QuerySingleGLInt(functions, GL_MAX_GEOMETRY_OUTPUT_VERTICES_EXT);
>-        extensions->maxGeometryShaderInvocations =
>+        caps->maxGeometryTotalOutputComponents =
>+            QuerySingleGLInt(functions, GL_MAX_GEOMETRY_TOTAL_OUTPUT_COMPONENTS_EXT);
>+        caps->maxGeometryShaderInvocations =
>             QuerySingleGLInt(functions, GL_MAX_GEOMETRY_SHADER_INVOCATIONS_EXT);
>+        caps->maxShaderTextureImageUnits[gl::ShaderType::Geometry] =
>+            QuerySingleGLInt(functions, GL_MAX_GEOMETRY_TEXTURE_IMAGE_UNITS_EXT);
>+        caps->maxShaderAtomicCounterBuffers[gl::ShaderType::Geometry] =
>+            QuerySingleGLInt(functions, GL_MAX_GEOMETRY_ATOMIC_COUNTER_BUFFERS_EXT);
>+        caps->maxShaderAtomicCounters[gl::ShaderType::Geometry] =
>+            QuerySingleGLInt(functions, GL_MAX_GEOMETRY_ATOMIC_COUNTERS_EXT);
>+        caps->maxShaderImageUniforms[gl::ShaderType::Geometry] =
>+            QuerySingleGLInt(functions, GL_MAX_GEOMETRY_IMAGE_UNIFORMS_EXT);
>+        caps->maxShaderStorageBlocks[gl::ShaderType::Geometry] =
>+            QuerySingleGLInt(functions, GL_MAX_GEOMETRY_SHADER_STORAGE_BLOCKS_EXT);
>+    }
>+
>+    // The real combined caps contain limits for shader types that are not available to ES, so limit
>+    // the caps to the sum of vertex+fragment+geometry shader caps.
>+    CapCombinedLimitToESShaders(&caps->maxCombinedUniformBlocks, caps->maxShaderUniformBlocks);
>+    CapCombinedLimitToESShaders(&caps->maxCombinedTextureImageUnits,
>+                                caps->maxShaderTextureImageUnits);
>+    CapCombinedLimitToESShaders(&caps->maxCombinedShaderStorageBlocks,
>+                                caps->maxShaderStorageBlocks);
>+    CapCombinedLimitToESShaders(&caps->maxCombinedImageUniforms, caps->maxShaderImageUniforms);
>+    CapCombinedLimitToESShaders(&caps->maxCombinedAtomicCounterBuffers,
>+                                caps->maxShaderAtomicCounterBuffers);
>+    CapCombinedLimitToESShaders(&caps->maxCombinedAtomicCounters, caps->maxShaderAtomicCounters);
>+
>+    // EXT_blend_func_extended.
>+    // Note that this could be implemented also on top of native EXT_blend_func_extended, but it's
>+    // currently not fully implemented.
>+    extensions->blendFuncExtended = !workarounds.disableBlendFuncExtended &&
>+                                    functions->standard == STANDARD_GL_DESKTOP &&
>+                                    functions->hasGLExtension("GL_ARB_blend_func_extended");
>+    if (extensions->blendFuncExtended)
>+    {
>+        // TODO(http://anglebug.com/1085): Support greater values of
>+        // MAX_DUAL_SOURCE_DRAW_BUFFERS_EXT queried from the driver. See comments in ProgramGL.cpp
>+        // for more information about this limitation.
>+        extensions->maxDualSourceDrawBuffers = 1;
>+    }
>+
>+    // EXT_float_blend
>+    // Assume all desktop driver supports this by default.
>+    extensions->floatBlend = functions->standard == STANDARD_GL_DESKTOP ||
>+                             functions->hasGLESExtension("GL_EXT_float_blend");
>+
>+    // GL_CHROMIUM_compressed_texture_etc
>+    // Expose this extension only when we support the formats or we're running on top of a native
>+    // ES driver.
>+    extensions->compressedTextureETC = functions->standard == STANDARD_GL_ES &&
>+                                       gl::DetermineCompressedTextureETCSupport(*textureCapsMap);
>+
>+    // To work around broken unsized sRGB textures, sized sRGB textures are used. Disable EXT_sRGB
>+    // if those formats are not available.
>+    if (workarounds.unsizedsRGBReadPixelsDoesntTransform &&
>+        !functions->isAtLeastGLES(gl::Version(3, 0)))
>+    {
>+        extensions->sRGB = false;
>     }
>+
>+    extensions->provokingVertex = functions->hasGLExtension("GL_ARB_provoking_vertex") ||
>+                                  functions->hasGLExtension("GL_EXT_provoking_vertex") ||
>+                                  functions->isAtLeastGL(gl::Version(3, 2));
> }
> 
> void GenerateWorkarounds(const FunctionsGL *functions, WorkaroundsGL *workarounds)
> {
>     VendorID vendor = GetVendorID(functions);
>+    uint32_t device = GetDeviceID(functions);
> 
>     workarounds->dontRemoveInvariantForFragmentInput =
>         functions->standard == STANDARD_GL_DESKTOP && IsAMD(vendor);
> 
>     // Don't use 1-bit alpha formats on desktop GL with AMD or Intel drivers.
>     workarounds->avoid1BitAlphaTextureFormats =
>-        functions->standard == STANDARD_GL_DESKTOP && (IsAMD(vendor) || IsIntel(vendor));
>+        functions->standard == STANDARD_GL_DESKTOP && (IsAMD(vendor));
> 
>     workarounds->rgba4IsNotSupportedForColorRendering =
>         functions->standard == STANDARD_GL_DESKTOP && IsIntel(vendor);
>@@ -1057,23 +1409,17 @@ void GenerateWorkarounds(const FunctionsGL *functions, WorkaroundsGL *workaround
>     workarounds->doesSRGBClearsOnLinearFramebufferAttachments =
>         functions->standard == STANDARD_GL_DESKTOP && (IsIntel(vendor) || IsAMD(vendor));
> 
>-#if defined(ANGLE_PLATFORM_LINUX)
>     workarounds->emulateMaxVertexAttribStride =
>-        functions->standard == STANDARD_GL_DESKTOP && IsAMD(vendor);
>-    workarounds->useUnusedBlocksWithStandardOrSharedLayout = IsAMD(vendor);
>-#endif
>+        IsLinux() && functions->standard == STANDARD_GL_DESKTOP && IsAMD(vendor);
>+    workarounds->useUnusedBlocksWithStandardOrSharedLayout = IsLinux() && IsAMD(vendor);
> 
>-#if defined(ANGLE_PLATFORM_APPLE)
>-    workarounds->doWhileGLSLCausesGPUHang = true;
>-    workarounds->useUnusedBlocksWithStandardOrSharedLayout = true;
>-    workarounds->rewriteFloatUnaryMinusOperator            = IsIntel(vendor);
>-#endif
>+    workarounds->doWhileGLSLCausesGPUHang                  = IsApple();
>+    workarounds->useUnusedBlocksWithStandardOrSharedLayout = IsApple();
>+    workarounds->rewriteFloatUnaryMinusOperator            = IsApple() && IsIntel(vendor);
> 
>-#if defined(ANGLE_PLATFORM_ANDROID)
>     // Triggers a bug on Marshmallow Adreno (4xx?) driver.
>     // http://anglebug.com/2046
>-    workarounds->dontInitializeUninitializedLocals = IsQualcomm(vendor);
>-#endif
>+    workarounds->dontInitializeUninitializedLocals = IsAndroid() && IsQualcomm(vendor);
> 
>     workarounds->finishDoesNotCauseQueriesToBeAvailable =
>         functions->standard == STANDARD_GL_DESKTOP && IsNvidia(vendor);
>@@ -1086,13 +1432,8 @@ void GenerateWorkarounds(const FunctionsGL *functions, WorkaroundsGL *workaround
> 
>     workarounds->initializeCurrentVertexAttributes = IsNvidia(vendor);
> 
>-#if defined(ANGLE_PLATFORM_APPLE)
>-    workarounds->unpackLastRowSeparatelyForPaddingInclusion = true;
>-    workarounds->packLastRowSeparatelyForPaddingInclusion   = true;
>-#else
>-    workarounds->unpackLastRowSeparatelyForPaddingInclusion = IsNvidia(vendor);
>-    workarounds->packLastRowSeparatelyForPaddingInclusion   = IsNvidia(vendor);
>-#endif
>+    workarounds->unpackLastRowSeparatelyForPaddingInclusion = IsApple() || IsNvidia(vendor);
>+    workarounds->packLastRowSeparatelyForPaddingInclusion   = IsApple() || IsNvidia(vendor);
> 
>     workarounds->removeInvariantAndCentroidForESSL3 =
>         functions->isAtMostGL(gl::Version(4, 1)) ||
>@@ -1104,30 +1445,44 @@ void GenerateWorkarounds(const FunctionsGL *functions, WorkaroundsGL *workaround
> 
>     workarounds->reapplyUBOBindingsAfterUsingBinaryProgram = IsAMD(vendor);
> 
>-    workarounds->clampPointSize = IsNvidia(vendor);
>-
>     workarounds->rewriteVectorScalarArithmetic = IsNvidia(vendor);
> 
>-#if defined(ANGLE_PLATFORM_ANDROID)
>+    // TODO(oetuaho): Make this specific to the affected driver versions. Versions at least up to
>+    // 390 are known to be affected. Versions after that are expected not to be affected.
>+    workarounds->clampFragDepth = IsNvidia(vendor);
>+
>+    // TODO(oetuaho): Make this specific to the affected driver versions. Versions since 397.31 are
>+    // not affected.
>+    workarounds->rewriteRepeatedAssignToSwizzled = IsNvidia(vendor);
>+
>     // TODO(jmadill): Narrow workaround range for specific devices.
>-    workarounds->reapplyUBOBindingsAfterUsingBinaryProgram = true;
>+    workarounds->reapplyUBOBindingsAfterUsingBinaryProgram = IsAndroid();
> 
>-    workarounds->clampPointSize = true;
>+    workarounds->clampPointSize = IsAndroid() || IsNvidia(vendor);
> 
>-    workarounds->dontUseLoopsToInitializeVariables = !IsNvidia(vendor);
>-#endif
>+    workarounds->dontUseLoopsToInitializeVariables = IsAndroid() && !IsNvidia(vendor);
>+
>+    workarounds->disableBlendFuncExtended = IsAMD(vendor) || IsIntel(vendor);
>+
>+    workarounds->unsizedsRGBReadPixelsDoesntTransform = IsAndroid() && IsQualcomm(vendor);
>+
>+    workarounds->queryCounterBitsGeneratesErrors = IsNexus5X(vendor, device);
>+
>+    workarounds->dontRelinkProgramsInParallel = IsAndroid() || (IsWindows() && IsIntel(vendor));
>+
>+    // TODO(jie.a.chen@intel.com): Clean up the bugs.
>+    // anglebug.com/3031
>+    // crbug.com/922936
>+    workarounds->disableWorkerContexts =
>+        (IsWindows() && (IsIntel(vendor) || IsAMD(vendor))) || (IsLinux() && IsNvidia(vendor));
> }
> 
> void ApplyWorkarounds(const FunctionsGL *functions, gl::Workarounds *workarounds)
> {
>-#if defined(ANGLE_PLATFORM_ANDROID)
>     VendorID vendor = GetVendorID(functions);
> 
>-    if (IsQualcomm(vendor))
>-    {
>-        workarounds->disableProgramCachingForTransformFeedback = true;
>-    }
>-#endif  // defined(ANGLE_PLATFORM_ANDROID)
>+    workarounds->disableProgramCachingForTransformFeedback = IsAndroid() && IsQualcomm(vendor);
>+    workarounds->syncFramebufferBindingsOnTexImage         = IsWindows() && IsIntel(vendor);
> }
> 
> }  // namespace nativegl_gl
>@@ -1148,25 +1503,73 @@ bool SupportsOcclusionQueries(const FunctionsGL *functions)
>            functions->hasGLESExtension("GL_EXT_occlusion_query_boolean");
> }
> 
>-bool SupportsNativeRendering(const FunctionsGL *functions, GLenum target, GLenum internalFormat)
>+bool SupportsNativeRendering(const FunctionsGL *functions,
>+                             gl::TextureType type,
>+                             GLenum internalFormat)
> {
>     // Some desktop drivers allow rendering to formats that are not required by the spec, this is
>     // exposed through the GL_FRAMEBUFFER_RENDERABLE query.
>-    if (functions->isAtLeastGL(gl::Version(4, 3)) ||
>-        functions->hasGLExtension("GL_ARB_internalformat_query2"))
>+    bool hasInternalFormatQuery = functions->isAtLeastGL(gl::Version(4, 3)) ||
>+                                  functions->hasGLExtension("GL_ARB_internalformat_query2");
>+
>+    // Some Intel drivers have a bug that returns GL_FULL_SUPPORT when asked if they support
>+    // rendering to compressed texture formats yet return framebuffer incomplete when attempting to
>+    // render to the format.  Skip any native queries for compressed formats.
>+    const gl::InternalFormat &internalFormatInfo = gl::GetSizedInternalFormatInfo(internalFormat);
>+
>+    if (hasInternalFormatQuery && !internalFormatInfo.compressed)
>     {
>-        GLint framebufferRenderable = GL_FALSE;
>-        functions->getInternalformativ(target, internalFormat, GL_FRAMEBUFFER_RENDERABLE, 1,
>+        GLint framebufferRenderable = GL_NONE;
>+        functions->getInternalformativ(ToGLenum(type), internalFormat, GL_FRAMEBUFFER_RENDERABLE, 1,
>                                        &framebufferRenderable);
>-        return gl::ConvertToBool(framebufferRenderable);
>+        return framebufferRenderable != GL_NONE;
>     }
>     else
>     {
>         const nativegl::InternalFormat &nativeInfo =
>             nativegl::GetInternalFormatInfo(internalFormat, functions->standard);
>-        return nativegl_gl::MeetsRequirements(functions, nativeInfo.framebufferAttachment);
>+        return nativegl_gl::MeetsRequirements(functions, nativeInfo.textureAttachment);
>     }
> }
>+
>+bool UseTexImage2D(gl::TextureType textureType)
>+{
>+    return textureType == gl::TextureType::_2D || textureType == gl::TextureType::CubeMap ||
>+           textureType == gl::TextureType::Rectangle ||
>+           textureType == gl::TextureType::_2DMultisample ||
>+           textureType == gl::TextureType::External;
>+}
>+
>+bool UseTexImage3D(gl::TextureType textureType)
>+{
>+    return textureType == gl::TextureType::_2DArray || textureType == gl::TextureType::_3D ||
>+           textureType == gl::TextureType::_2DMultisampleArray;
>+}
>+}  // namespace nativegl
>+
>+const FunctionsGL *GetFunctionsGL(const gl::Context *context)
>+{
>+    return GetImplAs<ContextGL>(context)->getFunctions();
>+}
>+
>+StateManagerGL *GetStateManagerGL(const gl::Context *context)
>+{
>+    return GetImplAs<ContextGL>(context)->getStateManager();
>+}
>+
>+BlitGL *GetBlitGL(const gl::Context *context)
>+{
>+    return GetImplAs<ContextGL>(context)->getBlitter();
>+}
>+
>+ClearMultiviewGL *GetMultiviewClearer(const gl::Context *context)
>+{
>+    return GetImplAs<ContextGL>(context)->getMultiviewClearer();
>+}
>+
>+const WorkaroundsGL &GetWorkaroundsGL(const gl::Context *context)
>+{
>+    return GetImplAs<ContextGL>(context)->getWorkaroundsGL();
> }
> 
> bool CanMapBufferForRead(const FunctionsGL *functions)
>@@ -1183,8 +1586,7 @@ uint8_t *MapBufferRangeWithFallback(const FunctionsGL *functions,
> {
>     if (functions->mapBufferRange != nullptr)
>     {
>-        return reinterpret_cast<uint8_t *>(
>-            functions->mapBufferRange(target, offset, length, access));
>+        return static_cast<uint8_t *>(functions->mapBufferRange(target, offset, length, access));
>     }
>     else if (functions->mapBuffer != nullptr &&
>              (functions->standard == STANDARD_GL_DESKTOP || access == GL_MAP_WRITE_BIT))
>@@ -1211,7 +1613,7 @@ uint8_t *MapBufferRangeWithFallback(const FunctionsGL *functions,
>             return nullptr;
>         }
> 
>-        return reinterpret_cast<uint8_t *>(functions->mapBuffer(target, accessEnum)) + offset;
>+        return static_cast<uint8_t *>(functions->mapBuffer(target, accessEnum)) + offset;
>     }
>     else
>     {
>@@ -1221,45 +1623,50 @@ uint8_t *MapBufferRangeWithFallback(const FunctionsGL *functions,
>     }
> }
> 
>-gl::ErrorOrResult<bool> ShouldApplyLastRowPaddingWorkaround(const gl::Extents &size,
>-                                                            const gl::PixelStoreStateBase &state,
>-                                                            const gl::Buffer *pixelBuffer,
>-                                                            GLenum format,
>-                                                            GLenum type,
>-                                                            bool is3D,
>-                                                            const void *pixels)
>+angle::Result ShouldApplyLastRowPaddingWorkaround(ContextGL *contextGL,
>+                                                  const gl::Extents &size,
>+                                                  const gl::PixelStoreStateBase &state,
>+                                                  const gl::Buffer *pixelBuffer,
>+                                                  GLenum format,
>+                                                  GLenum type,
>+                                                  bool is3D,
>+                                                  const void *pixels,
>+                                                  bool *shouldApplyOut)
> {
>     if (pixelBuffer == nullptr)
>     {
>-        return false;
>+        *shouldApplyOut = false;
>+        return angle::Result::Continue;
>     }
> 
>     // We are using an pack or unpack buffer, compute what the driver thinks is going to be the
>     // last byte read or written. If it is past the end of the buffer, we will need to use the
>     // workaround otherwise the driver will generate INVALID_OPERATION and not do the operation.
>-    CheckedNumeric<size_t> checkedEndByte;
>-    CheckedNumeric<size_t> pixelBytes;
>-    size_t rowPitch;
> 
>     const gl::InternalFormat &glFormat = gl::GetInternalFormatInfo(format, type);
>-    ANGLE_TRY_RESULT(glFormat.computePackUnpackEndByte(type, size, state, is3D), checkedEndByte);
>-    ANGLE_TRY_RESULT(glFormat.computeRowPitch(type, size.width, state.alignment, state.rowLength),
>-                     rowPitch);
>-    pixelBytes = glFormat.computePixelBytes(type);
>+    GLuint endByte                     = 0;
>+    ANGLE_CHECK_GL_MATH(contextGL,
>+                        glFormat.computePackUnpackEndByte(type, size, state, is3D, &endByte));
>+    GLuint rowPitch = 0;
>+    ANGLE_CHECK_GL_MATH(contextGL, glFormat.computeRowPitch(type, size.width, state.alignment,
>+                                                            state.rowLength, &rowPitch));
> 
>-    checkedEndByte += reinterpret_cast<intptr_t>(pixels);
>+    CheckedNumeric<size_t> checkedPixelBytes = glFormat.computePixelBytes(type);
>+    CheckedNumeric<size_t> checkedEndByte =
>+        angle::CheckedNumeric<size_t>(endByte) + reinterpret_cast<intptr_t>(pixels);
> 
>     // At this point checkedEndByte is the actual last byte read.
>     // The driver adds an extra row padding (if any), mimic it.
>-    ANGLE_TRY_CHECKED_MATH(pixelBytes);
>-    if (pixelBytes.ValueOrDie() * size.width < rowPitch)
>+    ANGLE_CHECK_GL_MATH(contextGL, checkedPixelBytes.IsValid());
>+    if (checkedPixelBytes.ValueOrDie() * size.width < rowPitch)
>     {
>-        checkedEndByte += rowPitch - pixelBytes * size.width;
>+        checkedEndByte += rowPitch - checkedPixelBytes * size.width;
>     }
> 
>-    ANGLE_TRY_CHECKED_MATH(checkedEndByte);
>+    ANGLE_CHECK_GL_MATH(contextGL, checkedEndByte.IsValid());
> 
>-    return checkedEndByte.ValueOrDie() > static_cast<size_t>(pixelBuffer->getSize());
>+    *shouldApplyOut = checkedEndByte.ValueOrDie() > static_cast<size_t>(pixelBuffer->getSize());
>+    return angle::Result::Continue;
> }
> 
> std::vector<ContextCreationTry> GenerateContextCreationToTry(EGLint requestedType, bool isMesaGLX)
>@@ -1312,4 +1719,4 @@ std::vector<ContextCreationTry> GenerateContextCreationToTry(EGLint requestedTyp
> 
>     return contextsToTry;
> }
>-}
>+}  // namespace rx
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/renderergl_utils.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/renderergl_utils.h
>index b8ab398f124..c52b530b93c 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/renderergl_utils.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/renderergl_utils.h
>@@ -10,9 +10,9 @@
> #ifndef LIBANGLE_RENDERER_GL_RENDERERGLUTILS_H_
> #define LIBANGLE_RENDERER_GL_RENDERERGLUTILS_H_
> 
>-#include "libANGLE/angletypes.h"
> #include "libANGLE/Error.h"
> #include "libANGLE/Version.h"
>+#include "libANGLE/angletypes.h"
> #include "libANGLE/renderer/driver_utils.h"
> #include "libANGLE/renderer/gl/functionsgl_typedefs.h"
> 
>@@ -26,11 +26,15 @@ class TextureCapsMap;
> struct Extensions;
> struct Version;
> struct Workarounds;
>-}
>+}  // namespace gl
> 
> namespace rx
> {
>+class BlitGL;
>+class ClearMultiviewGL;
>+class ContextGL;
> class FunctionsGL;
>+class StateManagerGL;
> struct WorkaroundsGL;
> enum class MultiviewImplementationTypeGL
> {
>@@ -39,7 +43,13 @@ enum class MultiviewImplementationTypeGL
> };
> 
> VendorID GetVendorID(const FunctionsGL *functions);
>-std::string GetDriverVersion(const FunctionsGL *functions);
>+
>+// Helpers for extracting the GL helper objects out of a context
>+const FunctionsGL *GetFunctionsGL(const gl::Context *context);
>+StateManagerGL *GetStateManagerGL(const gl::Context *context);
>+BlitGL *GetBlitGL(const gl::Context *context);
>+ClearMultiviewGL *GetMultiviewClearer(const gl::Context *context);
>+const WorkaroundsGL &GetWorkaroundsGL(const gl::Context *context);
> 
> namespace nativegl_gl
> {
>@@ -54,14 +64,18 @@ void GenerateCaps(const FunctionsGL *functions,
> 
> void GenerateWorkarounds(const FunctionsGL *functions, WorkaroundsGL *workarounds);
> void ApplyWorkarounds(const FunctionsGL *functions, gl::Workarounds *workarounds);
>-}
>+}  // namespace nativegl_gl
> 
> namespace nativegl
> {
> bool SupportsFenceSync(const FunctionsGL *functions);
> bool SupportsOcclusionQueries(const FunctionsGL *functions);
>-bool SupportsNativeRendering(const FunctionsGL *functions, GLenum target, GLenum internalFormat);
>-}
>+bool SupportsNativeRendering(const FunctionsGL *functions,
>+                             gl::TextureType type,
>+                             GLenum internalFormat);
>+bool UseTexImage2D(gl::TextureType textureType);
>+bool UseTexImage3D(gl::TextureType textureType);
>+}  // namespace nativegl
> 
> bool CanMapBufferForRead(const FunctionsGL *functions);
> uint8_t *MapBufferRangeWithFallback(const FunctionsGL *functions,
>@@ -70,13 +84,15 @@ uint8_t *MapBufferRangeWithFallback(const FunctionsGL *functions,
>                                     size_t length,
>                                     GLbitfield access);
> 
>-gl::ErrorOrResult<bool> ShouldApplyLastRowPaddingWorkaround(const gl::Extents &size,
>-                                                            const gl::PixelStoreStateBase &state,
>-                                                            const gl::Buffer *pixelBuffer,
>-                                                            GLenum format,
>-                                                            GLenum type,
>-                                                            bool is3D,
>-                                                            const void *pixels);
>+angle::Result ShouldApplyLastRowPaddingWorkaround(ContextGL *contextGL,
>+                                                  const gl::Extents &size,
>+                                                  const gl::PixelStoreStateBase &state,
>+                                                  const gl::Buffer *pixelBuffer,
>+                                                  GLenum format,
>+                                                  GLenum type,
>+                                                  bool is3D,
>+                                                  const void *pixels,
>+                                                  bool *shouldApplyOut);
> 
> struct ContextCreationTry
> {
>@@ -89,8 +105,7 @@ struct ContextCreationTry
> 
>     ContextCreationTry(EGLint displayType, Type type, gl::Version version)
>         : displayType(displayType), type(type), version(version)
>-    {
>-    }
>+    {}
> 
>     EGLint displayType;
>     Type type;
>@@ -98,6 +113,6 @@ struct ContextCreationTry
> };
> 
> std::vector<ContextCreationTry> GenerateContextCreationToTry(EGLint requestedType, bool isMesaGLX);
>-}
>+}  // namespace rx
> 
>-#endif // LIBANGLE_RENDERER_GL_RENDERERGLUTILS_H_
>+#endif  // LIBANGLE_RENDERER_GL_RENDERERGLUTILS_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/wgl/ContextWGL.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/wgl/ContextWGL.cpp
>new file mode 100644
>index 00000000000..0be3f32e70a
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/wgl/ContextWGL.cpp
>@@ -0,0 +1,23 @@
>+//
>+// Copyright (c) 2018 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+
>+#include "libANGLE/renderer/gl/wgl/ContextWGL.h"
>+
>+namespace rx
>+{
>+ContextWGL::ContextWGL(const gl::State &state,
>+                       gl::ErrorSet *errorSet,
>+                       const std::shared_ptr<RendererWGL> &renderer)
>+    : ContextGL(state, errorSet, renderer), mRenderer(renderer)
>+{}
>+
>+ContextWGL::~ContextWGL() {}
>+
>+HGLRC ContextWGL::getContext() const
>+{
>+    return mRenderer->getContext();
>+}
>+}  // namespace rx
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/wgl/ContextWGL.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/wgl/ContextWGL.h
>new file mode 100644
>index 00000000000..771e3e75109
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/wgl/ContextWGL.h
>@@ -0,0 +1,32 @@
>+//
>+// Copyright (c) 2018 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+
>+// ContextWGL.h: Context class for GL on Windows.  Wraps a RendererWGL.
>+
>+#ifndef LIBANGLE_RENDERER_GL_WGL_CONTEXTWGL_H_
>+#define LIBANGLE_RENDERER_GL_WGL_CONTEXTWGL_H_
>+
>+#include "libANGLE/renderer/gl/ContextGL.h"
>+#include "libANGLE/renderer/gl/wgl/RendererWGL.h"
>+
>+namespace rx
>+{
>+class ContextWGL : public ContextGL
>+{
>+  public:
>+    ContextWGL(const gl::State &state,
>+               gl::ErrorSet *errorSet,
>+               const std::shared_ptr<RendererWGL> &renderer);
>+    ~ContextWGL() override;
>+
>+    HGLRC getContext() const;
>+
>+  private:
>+    std::shared_ptr<RendererWGL> mRenderer;
>+};
>+}  // namespace rx
>+
>+#endif  // LIBANGLE_RENDERER_GL_WGL_RENDERERWGL_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/wgl/D3DTextureSurfaceWGL.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/wgl/D3DTextureSurfaceWGL.cpp
>index 86af23c8513..627bd8b6789 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/wgl/D3DTextureSurfaceWGL.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/wgl/D3DTextureSurfaceWGL.cpp
>@@ -9,10 +9,12 @@
> #include "libANGLE/renderer/gl/wgl/D3DTextureSurfaceWGL.h"
> 
> #include "libANGLE/Surface.h"
>+#include "libANGLE/renderer/d3d/d3d11/formatutils11.h"
>+#include "libANGLE/renderer/d3d/d3d9/formatutils9.h"
> #include "libANGLE/renderer/gl/FramebufferGL.h"
>-#include "libANGLE/renderer/gl/TextureGL.h"
> #include "libANGLE/renderer/gl/RendererGL.h"
> #include "libANGLE/renderer/gl/StateManagerGL.h"
>+#include "libANGLE/renderer/gl/TextureGL.h"
> #include "libANGLE/renderer/gl/wgl/DisplayWGL.h"
> #include "libANGLE/renderer/gl/wgl/FunctionsWGL.h"
> 
>@@ -26,6 +28,7 @@ egl::Error GetD3D11TextureInfo(EGLenum buftype,
>                                ID3D11Texture2D *texture11,
>                                size_t *width,
>                                size_t *height,
>+                               const angle::Format **angleFormat,
>                                IUnknown **object,
>                                IUnknown **device)
> {
>@@ -60,6 +63,11 @@ egl::Error GetD3D11TextureInfo(EGLenum buftype,
>         return egl::EglBadParameter() << "Could not query the D3D11 device from the client buffer.";
>     }
> 
>+    if (angleFormat)
>+    {
>+        *angleFormat = &d3d11_angle::GetFormat(textureDesc.Format);
>+    }
>+
>     if (width)
>     {
>         *width = textureDesc.Width;
>@@ -94,6 +102,7 @@ egl::Error GetD3D9TextureInfo(EGLenum buftype,
>                               IDirect3DTexture9 *texture9,
>                               size_t *width,
>                               size_t *height,
>+                              const angle::Format **angleFormat,
>                               IUnknown **object,
>                               IUnknown **device)
> {
>@@ -122,6 +131,13 @@ egl::Error GetD3D9TextureInfo(EGLenum buftype,
>         }
>     }
> 
>+    if (angleFormat)
>+    {
>+        const auto &d3dFormatInfo = d3d9::GetD3DFormatInfo(surfaceDesc.Format);
>+        ASSERT(d3dFormatInfo.info().id != angle::FormatID::NONE);
>+        *angleFormat = &d3dFormatInfo.info();
>+    }
>+
>     if (width)
>     {
>         *width = surfaceDesc.Width;
>@@ -165,6 +181,7 @@ egl::Error GetD3DTextureInfo(EGLenum buftype,
>                              ID3D11Device *d3d11Device,
>                              size_t *width,
>                              size_t *height,
>+                             const angle::Format **angleFormat,
>                              IUnknown **object,
>                              IUnknown **device)
> {
>@@ -175,11 +192,13 @@ egl::Error GetD3DTextureInfo(EGLenum buftype,
>         IDirect3DTexture9 *texture9 = nullptr;
>         if (SUCCEEDED(buffer->QueryInterface<ID3D11Texture2D>(&texture11)))
>         {
>-            return GetD3D11TextureInfo(buftype, texture11, width, height, object, device);
>+            return GetD3D11TextureInfo(buftype, texture11, width, height, angleFormat, object,
>+                                       device);
>         }
>         else if (SUCCEEDED(buffer->QueryInterface<IDirect3DTexture9>(&texture9)))
>         {
>-            return GetD3D9TextureInfo(buftype, texture9, width, height, object, device);
>+            return GetD3D9TextureInfo(buftype, texture9, width, height, angleFormat, object,
>+                                      device);
>         }
>         else
>         {
>@@ -199,7 +218,7 @@ egl::Error GetD3DTextureInfo(EGLenum buftype,
>             return egl::EglBadParameter() << "Failed to open share handle, " << gl::FmtHR(result);
>         }
> 
>-        return GetD3D11TextureInfo(buftype, texture11, width, height, object, device);
>+        return GetD3D11TextureInfo(buftype, texture11, width, height, angleFormat, object, device);
>     }
>     else
>     {
>@@ -211,7 +230,7 @@ egl::Error GetD3DTextureInfo(EGLenum buftype,
> }  // anonymous namespace
> 
> D3DTextureSurfaceWGL::D3DTextureSurfaceWGL(const egl::SurfaceState &state,
>-                                           RendererGL *renderer,
>+                                           StateManagerGL *stateManager,
>                                            EGLenum buftype,
>                                            EGLClientBuffer clientBuffer,
>                                            DisplayWGL *display,
>@@ -219,29 +238,26 @@ D3DTextureSurfaceWGL::D3DTextureSurfaceWGL(const egl::SurfaceState &state,
>                                            ID3D11Device *displayD3D11Device,
>                                            const FunctionsGL *functionsGL,
>                                            const FunctionsWGL *functionsWGL)
>-    : SurfaceWGL(state, renderer),
>+    : SurfaceWGL(state),
>       mBuftype(buftype),
>       mClientBuffer(clientBuffer),
>-      mRenderer(renderer),
>       mDisplayD3D11Device(displayD3D11Device),
>       mDisplay(display),
>-      mStateManager(renderer->getStateManager()),
>-      mWorkarounds(renderer->getWorkarounds()),
>+      mStateManager(stateManager),
>       mFunctionsGL(functionsGL),
>       mFunctionsWGL(functionsWGL),
>       mDeviceContext(deviceContext),
>       mWidth(0),
>       mHeight(0),
>+      mColorFormat(nullptr),
>       mDeviceHandle(nullptr),
>       mObject(nullptr),
>       mKeyedMutex(nullptr),
>       mBoundObjectTextureHandle(nullptr),
>       mBoundObjectRenderbufferHandle(nullptr),
>       mColorRenderbufferID(0),
>-      mDepthStencilRenderbufferID(0),
>-      mFramebufferID(0)
>-{
>-}
>+      mDepthStencilRenderbufferID(0)
>+{}
> 
> D3DTextureSurfaceWGL::~D3DTextureSurfaceWGL()
> {
>@@ -266,9 +282,6 @@ D3DTextureSurfaceWGL::~D3DTextureSurfaceWGL()
>             mBoundObjectTextureHandle = nullptr;
>         }
> 
>-        // GL framebuffer is deleted by the default framebuffer object
>-        mFramebufferID = 0;
>-
>         mDisplay->releaseD3DDevice(mDeviceHandle);
>         mDeviceHandle = nullptr;
>     }
>@@ -278,7 +291,7 @@ egl::Error D3DTextureSurfaceWGL::ValidateD3DTextureClientBuffer(EGLenum buftype,
>                                                                 EGLClientBuffer clientBuffer,
>                                                                 ID3D11Device *d3d11Device)
> {
>-    return GetD3DTextureInfo(buftype, clientBuffer, d3d11Device, nullptr, nullptr, nullptr,
>+    return GetD3DTextureInfo(buftype, clientBuffer, d3d11Device, nullptr, nullptr, nullptr, nullptr,
>                              nullptr);
> }
> 
>@@ -286,7 +299,20 @@ egl::Error D3DTextureSurfaceWGL::initialize(const egl::Display *display)
> {
>     IUnknown *device = nullptr;
>     ANGLE_TRY(GetD3DTextureInfo(mBuftype, mClientBuffer, mDisplayD3D11Device, &mWidth, &mHeight,
>-                                &mObject, &device));
>+                                &mColorFormat, &mObject, &device));
>+
>+    if (mColorFormat)
>+    {
>+        if (mState.attributes.contains(EGL_GL_COLORSPACE))
>+        {
>+            if (mColorFormat->id != angle::FormatID::R8G8B8A8_TYPELESS &&
>+                mColorFormat->id != angle::FormatID::B8G8R8A8_TYPELESS)
>+            {
>+                return egl::EglBadMatch()
>+                       << "EGL_GL_COLORSPACE may only be specified for TYPELESS textures";
>+            }
>+        }
>+    }
> 
>     // Grab the keyed mutex, if one exists
>     mObject->QueryInterface(&mKeyedMutex);
>@@ -319,25 +345,10 @@ egl::Error D3DTextureSurfaceWGL::initialize(const egl::Display *display)
>                                           static_cast<GLsizei>(mHeight));
>     }
> 
>-    mFunctionsGL->genFramebuffers(1, &mFramebufferID);
>-    mStateManager->bindFramebuffer(GL_FRAMEBUFFER, mFramebufferID);
>-    mFunctionsGL->framebufferRenderbuffer(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_RENDERBUFFER,
>-                                          mColorRenderbufferID);
>-    if (config->depthSize > 0)
>-    {
>-        mFunctionsGL->framebufferRenderbuffer(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, GL_RENDERBUFFER,
>-                                              mDepthStencilRenderbufferID);
>-    }
>-    if (config->stencilSize > 0)
>-    {
>-        mFunctionsGL->framebufferRenderbuffer(GL_FRAMEBUFFER, GL_STENCIL_ATTACHMENT,
>-                                              GL_RENDERBUFFER, mDepthStencilRenderbufferID);
>-    }
>-
>     return egl::NoError();
> }
> 
>-egl::Error D3DTextureSurfaceWGL::makeCurrent()
>+egl::Error D3DTextureSurfaceWGL::makeCurrent(const gl::Context *context)
> {
>     if (!mFunctionsWGL->dxLockObjectsNV(mDeviceHandle, 1, &mBoundObjectRenderbufferHandle))
>     {
>@@ -393,7 +404,9 @@ egl::Error D3DTextureSurfaceWGL::querySurfacePointerANGLE(EGLint attribute, void
>     return egl::NoError();
> }
> 
>-egl::Error D3DTextureSurfaceWGL::bindTexImage(gl::Texture *texture, EGLint buffer)
>+egl::Error D3DTextureSurfaceWGL::bindTexImage(const gl::Context *context,
>+                                              gl::Texture *texture,
>+                                              EGLint buffer)
> {
>     ASSERT(mBoundObjectTextureHandle == nullptr);
> 
>@@ -418,7 +431,7 @@ egl::Error D3DTextureSurfaceWGL::bindTexImage(gl::Texture *texture, EGLint buffe
>     return egl::NoError();
> }
> 
>-egl::Error D3DTextureSurfaceWGL::releaseTexImage(EGLint buffer)
>+egl::Error D3DTextureSurfaceWGL::releaseTexImage(const gl::Context *context, EGLint buffer)
> {
>     ASSERT(mBoundObjectTextureHandle != nullptr);
>     if (!mFunctionsWGL->dxUnlockObjectsNV(mDeviceHandle, 1, &mBoundObjectTextureHandle))
>@@ -463,11 +476,29 @@ EGLint D3DTextureSurfaceWGL::getSwapBehavior() const
>     return EGL_BUFFER_PRESERVED;
> }
> 
>-FramebufferImpl *D3DTextureSurfaceWGL::createDefaultFramebuffer(const gl::FramebufferState &data)
>+FramebufferImpl *D3DTextureSurfaceWGL::createDefaultFramebuffer(const gl::Context *context,
>+                                                                const gl::FramebufferState &data)
> {
>-    return new FramebufferGL(mFramebufferID, data, mFunctionsGL, mWorkarounds,
>-                             mRenderer->getBlitter(), mRenderer->getMultiviewClearer(),
>-                             mStateManager);
>+    const FunctionsGL *functions = GetFunctionsGL(context);
>+    StateManagerGL *stateManager = GetStateManagerGL(context);
>+
>+    GLuint framebufferID = 0;
>+    functions->genFramebuffers(1, &framebufferID);
>+    stateManager->bindFramebuffer(GL_FRAMEBUFFER, framebufferID);
>+    functions->framebufferRenderbuffer(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_RENDERBUFFER,
>+                                       mColorRenderbufferID);
>+    if (mState.config->depthSize > 0)
>+    {
>+        functions->framebufferRenderbuffer(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, GL_RENDERBUFFER,
>+                                           mDepthStencilRenderbufferID);
>+    }
>+    if (mState.config->stencilSize > 0)
>+    {
>+        functions->framebufferRenderbuffer(GL_FRAMEBUFFER, GL_STENCIL_ATTACHMENT, GL_RENDERBUFFER,
>+                                           mDepthStencilRenderbufferID);
>+    }
>+
>+    return new FramebufferGL(data, framebufferID, true);
> }
> 
> HDC D3DTextureSurfaceWGL::getDC() const
>@@ -475,4 +506,9 @@ HDC D3DTextureSurfaceWGL::getDC() const
>     return mDeviceContext;
> }
> 
>+const angle::Format *D3DTextureSurfaceWGL::getD3DTextureColorFormat() const
>+{
>+    return mColorFormat;
>+}
>+
> }  // namespace rx
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/wgl/D3DTextureSurfaceWGL.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/wgl/D3DTextureSurfaceWGL.h
>index fe359254d28..88fe3561fb4 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/wgl/D3DTextureSurfaceWGL.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/wgl/D3DTextureSurfaceWGL.h
>@@ -26,7 +26,7 @@ class D3DTextureSurfaceWGL : public SurfaceWGL
> {
>   public:
>     D3DTextureSurfaceWGL(const egl::SurfaceState &state,
>-                         RendererGL *renderer,
>+                         StateManagerGL *stateManager,
>                          EGLenum buftype,
>                          EGLClientBuffer clientBuffer,
>                          DisplayWGL *display,
>@@ -41,7 +41,7 @@ class D3DTextureSurfaceWGL : public SurfaceWGL
>                                                      ID3D11Device *d3d11Device);
> 
>     egl::Error initialize(const egl::Display *display) override;
>-    egl::Error makeCurrent() override;
>+    egl::Error makeCurrent(const gl::Context *context) override;
>     egl::Error unMakeCurrent() override;
> 
>     egl::Error swap(const gl::Context *context) override;
>@@ -51,8 +51,10 @@ class D3DTextureSurfaceWGL : public SurfaceWGL
>                              EGLint width,
>                              EGLint height) override;
>     egl::Error querySurfacePointerANGLE(EGLint attribute, void **value) override;
>-    egl::Error bindTexImage(gl::Texture *texture, EGLint buffer) override;
>-    egl::Error releaseTexImage(EGLint buffer) override;
>+    egl::Error bindTexImage(const gl::Context *context,
>+                            gl::Texture *texture,
>+                            EGLint buffer) override;
>+    egl::Error releaseTexImage(const gl::Context *context, EGLint buffer) override;
>     void setSwapInterval(EGLint interval) override;
> 
>     EGLint getWidth() const override;
>@@ -61,21 +63,21 @@ class D3DTextureSurfaceWGL : public SurfaceWGL
>     EGLint isPostSubBufferSupported() const override;
>     EGLint getSwapBehavior() const override;
> 
>-    FramebufferImpl *createDefaultFramebuffer(const gl::FramebufferState &data) override;
>+    FramebufferImpl *createDefaultFramebuffer(const gl::Context *context,
>+                                              const gl::FramebufferState &data) override;
> 
>     HDC getDC() const override;
> 
>+    const angle::Format *getD3DTextureColorFormat() const override;
>+
>   private:
>     EGLenum mBuftype;
>     EGLClientBuffer mClientBuffer;
> 
>-    RendererGL *mRenderer;
>-
>     ID3D11Device *mDisplayD3D11Device;
> 
>     DisplayWGL *mDisplay;
>     StateManagerGL *mStateManager;
>-    const WorkaroundsGL &mWorkarounds;
>     const FunctionsGL *mFunctionsGL;
>     const FunctionsWGL *mFunctionsWGL;
> 
>@@ -84,6 +86,8 @@ class D3DTextureSurfaceWGL : public SurfaceWGL
>     size_t mWidth;
>     size_t mHeight;
> 
>+    const angle::Format *mColorFormat;
>+
>     HANDLE mDeviceHandle;
>     IUnknown *mObject;
>     IDXGIKeyedMutex *mKeyedMutex;
>@@ -92,7 +96,6 @@ class D3DTextureSurfaceWGL : public SurfaceWGL
> 
>     GLuint mColorRenderbufferID;
>     GLuint mDepthStencilRenderbufferID;
>-    GLuint mFramebufferID;
> };
> }  // namespace rx
> 
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/wgl/DXGISwapChainWindowSurfaceWGL.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/wgl/DXGISwapChainWindowSurfaceWGL.cpp
>index 4798aa66fca..5b686321a6d 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/wgl/DXGISwapChainWindowSurfaceWGL.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/wgl/DXGISwapChainWindowSurfaceWGL.cpp
>@@ -11,9 +11,9 @@
> 
> #include "libANGLE/formatutils.h"
> #include "libANGLE/renderer/gl/FramebufferGL.h"
>-#include "libANGLE/renderer/gl/TextureGL.h"
> #include "libANGLE/renderer/gl/RendererGL.h"
> #include "libANGLE/renderer/gl/StateManagerGL.h"
>+#include "libANGLE/renderer/gl/TextureGL.h"
> #include "libANGLE/renderer/gl/wgl/DisplayWGL.h"
> #include "libANGLE/renderer/gl/wgl/FunctionsWGL.h"
> 
>@@ -23,7 +23,7 @@ namespace rx
> {
> 
> DXGISwapChainWindowSurfaceWGL::DXGISwapChainWindowSurfaceWGL(const egl::SurfaceState &state,
>-                                                             RendererGL *renderer,
>+                                                             StateManagerGL *stateManager,
>                                                              EGLNativeWindowType window,
>                                                              ID3D11Device *device,
>                                                              HANDLE deviceHandle,
>@@ -31,11 +31,9 @@ DXGISwapChainWindowSurfaceWGL::DXGISwapChainWindowSurfaceWGL(const egl::SurfaceS
>                                                              const FunctionsGL *functionsGL,
>                                                              const FunctionsWGL *functionsWGL,
>                                                              EGLint orientation)
>-    : SurfaceWGL(state, renderer),
>+    : SurfaceWGL(state),
>       mWindow(window),
>-      mStateManager(renderer->getStateManager()),
>-      mWorkarounds(renderer->getWorkarounds()),
>-      mRenderer(renderer),
>+      mStateManager(stateManager),
>       mFunctionsGL(functionsGL),
>       mFunctionsWGL(functionsWGL),
>       mDevice(device),
>@@ -50,15 +48,13 @@ DXGISwapChainWindowSurfaceWGL::DXGISwapChainWindowSurfaceWGL(const egl::SurfaceS
>       mColorRenderbufferID(0),
>       mRenderbufferBufferHandle(nullptr),
>       mDepthRenderbufferID(0),
>-      mFramebufferID(0),
>       mTextureID(0),
>       mTextureHandle(nullptr),
>       mWidth(0),
>       mHeight(0),
>       mSwapInterval(1),
>       mOrientation(orientation)
>-{
>-}
>+{}
> 
> DXGISwapChainWindowSurfaceWGL::~DXGISwapChainWindowSurfaceWGL()
> {
>@@ -107,14 +103,16 @@ egl::Error DXGISwapChainWindowSurfaceWGL::initialize(const egl::Display *display
>     mSwapChainFlags    = 0;
>     mDepthBufferFormat = GL_DEPTH24_STENCIL8;
> 
>-    mFunctionsGL->genFramebuffers(1, &mFramebufferID);
>     mFunctionsGL->genRenderbuffers(1, &mColorRenderbufferID);
>+    mStateManager->bindRenderbuffer(GL_RENDERBUFFER, mColorRenderbufferID);
>+
>     mFunctionsGL->genRenderbuffers(1, &mDepthRenderbufferID);
>+    mStateManager->bindRenderbuffer(GL_RENDERBUFFER, mDepthRenderbufferID);
> 
>     return createSwapChain();
> }
> 
>-egl::Error DXGISwapChainWindowSurfaceWGL::makeCurrent()
>+egl::Error DXGISwapChainWindowSurfaceWGL::makeCurrent(const gl::Context *context)
> {
>     return egl::NoError();
> }
>@@ -144,6 +142,7 @@ egl::Error DXGISwapChainWindowSurfaceWGL::postSubBuffer(const gl::Context *conte
>                                                         EGLint width,
>                                                         EGLint height)
> {
>+    ASSERT(width > 0 && height > 0);
>     ASSERT(mSwapChain1 != nullptr);
> 
>     mFunctionsGL->flush();
>@@ -180,7 +179,9 @@ egl::Error DXGISwapChainWindowSurfaceWGL::querySurfacePointerANGLE(EGLint attrib
>     return egl::NoError();
> }
> 
>-egl::Error DXGISwapChainWindowSurfaceWGL::bindTexImage(gl::Texture *texture, EGLint buffer)
>+egl::Error DXGISwapChainWindowSurfaceWGL::bindTexImage(const gl::Context *context,
>+                                                       gl::Texture *texture,
>+                                                       EGLint buffer)
> {
>     ASSERT(mTextureHandle == nullptr);
> 
>@@ -188,7 +189,7 @@ egl::Error DXGISwapChainWindowSurfaceWGL::bindTexImage(gl::Texture *texture, EGL
>     GLuint textureID           = textureGL->getTextureID();
> 
>     ID3D11Texture2D *colorBuffer = nullptr;
>-    HRESULT result = mSwapChain->GetBuffer(0, __uuidof(ID3D11Texture2D),
>+    HRESULT result               = mSwapChain->GetBuffer(0, __uuidof(ID3D11Texture2D),
>                                            reinterpret_cast<void **>(&colorBuffer));
>     if (FAILED(result))
>     {
>@@ -219,7 +220,7 @@ egl::Error DXGISwapChainWindowSurfaceWGL::bindTexImage(gl::Texture *texture, EGL
>     return egl::NoError();
> }
> 
>-egl::Error DXGISwapChainWindowSurfaceWGL::releaseTexImage(EGLint buffer)
>+egl::Error DXGISwapChainWindowSurfaceWGL::releaseTexImage(const gl::Context *context, EGLint buffer)
> {
>     ASSERT(mTextureHandle != nullptr);
> 
>@@ -267,11 +268,35 @@ EGLint DXGISwapChainWindowSurfaceWGL::getSwapBehavior() const
> }
> 
> FramebufferImpl *DXGISwapChainWindowSurfaceWGL::createDefaultFramebuffer(
>+    const gl::Context *context,
>     const gl::FramebufferState &data)
> {
>-    return new FramebufferGL(mFramebufferID, data, mFunctionsGL, mWorkarounds,
>-                             mRenderer->getBlitter(), mRenderer->getMultiviewClearer(),
>-                             mStateManager);
>+    const FunctionsGL *functions = GetFunctionsGL(context);
>+    StateManagerGL *stateManager = GetStateManagerGL(context);
>+
>+    GLuint framebufferID = 0;
>+    functions->genFramebuffers(1, &framebufferID);
>+    stateManager->bindFramebuffer(GL_FRAMEBUFFER, framebufferID);
>+    functions->framebufferRenderbuffer(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_RENDERBUFFER,
>+                                       mColorRenderbufferID);
>+
>+    if (mDepthBufferFormat != GL_NONE)
>+    {
>+        const gl::InternalFormat &depthStencilFormatInfo =
>+            gl::GetSizedInternalFormatInfo(mDepthBufferFormat);
>+        if (depthStencilFormatInfo.depthBits > 0)
>+        {
>+            functions->framebufferRenderbuffer(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, GL_RENDERBUFFER,
>+                                               mDepthRenderbufferID);
>+        }
>+        if (depthStencilFormatInfo.stencilBits > 0)
>+        {
>+            functions->framebufferRenderbuffer(GL_FRAMEBUFFER, GL_STENCIL_ATTACHMENT,
>+                                               GL_RENDERBUFFER, mDepthRenderbufferID);
>+        }
>+    }
>+
>+    return new FramebufferGL(data, framebufferID, true);
> }
> 
> HDC DXGISwapChainWindowSurfaceWGL::getDC() const
>@@ -288,7 +313,8 @@ egl::Error DXGISwapChainWindowSurfaceWGL::setObjectsLocked(bool locked)
>     }
> 
>     HANDLE resources[] = {
>-        mRenderbufferBufferHandle, mTextureHandle,
>+        mRenderbufferBufferHandle,
>+        mTextureHandle,
>     };
>     GLint count = (mTextureHandle != nullptr) ? 2 : 1;
> 
>@@ -397,7 +423,7 @@ egl::Error DXGISwapChainWindowSurfaceWGL::createSwapChain()
>     }
> 
>     IDXGIFactory2 *dxgiFactory2 = nullptr;
>-    HRESULT result = dxgiFactory->QueryInterface(__uuidof(IDXGIFactory2),
>+    HRESULT result              = dxgiFactory->QueryInterface(__uuidof(IDXGIFactory2),
>                                                  reinterpret_cast<void **>(&dxgiFactory2));
>     if (SUCCEEDED(result))
>     {
>@@ -411,7 +437,7 @@ egl::Error DXGISwapChainWindowSurfaceWGL::createSwapChain()
>         swapChainDesc.Format                = mSwapChainFormat;
>         swapChainDesc.Stereo                = FALSE;
>         swapChainDesc.SampleDesc.Count      = 1;
>-        swapChainDesc.SampleDesc.Quality = 0;
>+        swapChainDesc.SampleDesc.Quality    = 0;
>         swapChainDesc.BufferUsage =
>             DXGI_USAGE_RENDER_TARGET_OUTPUT | DXGI_USAGE_SHADER_INPUT | DXGI_USAGE_BACK_BUFFER;
>         swapChainDesc.BufferCount = 1;
>@@ -463,7 +489,7 @@ egl::Error DXGISwapChainWindowSurfaceWGL::createSwapChain()
>     }
> 
>     ID3D11Texture2D *colorBuffer = nullptr;
>-    result = mSwapChain->GetBuffer(0, __uuidof(ID3D11Texture2D),
>+    result                       = mSwapChain->GetBuffer(0, __uuidof(ID3D11Texture2D),
>                                    reinterpret_cast<void **>(&colorBuffer));
>     if (FAILED(result))
>     {
>@@ -471,7 +497,6 @@ egl::Error DXGISwapChainWindowSurfaceWGL::createSwapChain()
>                                   << gl::FmtHR(result);
>     }
> 
>-    mFunctionsGL->genRenderbuffers(1, &mColorRenderbufferID);
>     mStateManager->bindRenderbuffer(GL_RENDERBUFFER, mColorRenderbufferID);
>     mRenderbufferBufferHandle =
>         mFunctionsWGL->dxRegisterObjectNV(mDeviceHandle, colorBuffer, mColorRenderbufferID,
>@@ -501,11 +526,6 @@ egl::Error DXGISwapChainWindowSurfaceWGL::createSwapChain()
>         return error;
>     }
> 
>-    ASSERT(mFramebufferID != 0);
>-    mStateManager->bindFramebuffer(GL_FRAMEBUFFER, mFramebufferID);
>-    mFunctionsGL->framebufferRenderbuffer(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_RENDERBUFFER,
>-                                          mColorRenderbufferID);
>-
>     if (mDepthBufferFormat != GL_NONE)
>     {
>         ASSERT(mDepthRenderbufferID != 0);
>@@ -513,19 +533,6 @@ egl::Error DXGISwapChainWindowSurfaceWGL::createSwapChain()
>         mFunctionsGL->renderbufferStorage(GL_RENDERBUFFER, mDepthBufferFormat,
>                                           static_cast<GLsizei>(mWidth),
>                                           static_cast<GLsizei>(mHeight));
>-
>-        const gl::InternalFormat &depthStencilFormatInfo =
>-            gl::GetSizedInternalFormatInfo(mDepthBufferFormat);
>-        if (depthStencilFormatInfo.depthBits > 0)
>-        {
>-            mFunctionsGL->framebufferRenderbuffer(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT,
>-                                                  GL_RENDERBUFFER, mDepthRenderbufferID);
>-        }
>-        if (depthStencilFormatInfo.stencilBits > 0)
>-        {
>-            mFunctionsGL->framebufferRenderbuffer(GL_FRAMEBUFFER, GL_STENCIL_ATTACHMENT,
>-                                                  GL_RENDERBUFFER, mDepthRenderbufferID);
>-        }
>     }
> 
>     mFirstSwap = true;
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/wgl/DXGISwapChainWindowSurfaceWGL.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/wgl/DXGISwapChainWindowSurfaceWGL.h
>index 31a56b9fd3a..ff7f152d0fb 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/wgl/DXGISwapChainWindowSurfaceWGL.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/wgl/DXGISwapChainWindowSurfaceWGL.h
>@@ -27,7 +27,7 @@ class DXGISwapChainWindowSurfaceWGL : public SurfaceWGL
> {
>   public:
>     DXGISwapChainWindowSurfaceWGL(const egl::SurfaceState &state,
>-                                  RendererGL *renderer,
>+                                  StateManagerGL *stateManager,
>                                   EGLNativeWindowType window,
>                                   ID3D11Device *device,
>                                   HANDLE deviceHandle,
>@@ -38,7 +38,7 @@ class DXGISwapChainWindowSurfaceWGL : public SurfaceWGL
>     ~DXGISwapChainWindowSurfaceWGL() override;
> 
>     egl::Error initialize(const egl::Display *display) override;
>-    egl::Error makeCurrent() override;
>+    egl::Error makeCurrent(const gl::Context *context) override;
> 
>     egl::Error swap(const gl::Context *context) override;
>     egl::Error postSubBuffer(const gl::Context *context,
>@@ -47,8 +47,10 @@ class DXGISwapChainWindowSurfaceWGL : public SurfaceWGL
>                              EGLint width,
>                              EGLint height) override;
>     egl::Error querySurfacePointerANGLE(EGLint attribute, void **value) override;
>-    egl::Error bindTexImage(gl::Texture *texture, EGLint buffer) override;
>-    egl::Error releaseTexImage(EGLint buffer) override;
>+    egl::Error bindTexImage(const gl::Context *context,
>+                            gl::Texture *texture,
>+                            EGLint buffer) override;
>+    egl::Error releaseTexImage(const gl::Context *context, EGLint buffer) override;
>     void setSwapInterval(EGLint interval) override;
> 
>     EGLint getWidth() const override;
>@@ -57,7 +59,8 @@ class DXGISwapChainWindowSurfaceWGL : public SurfaceWGL
>     EGLint isPostSubBufferSupported() const override;
>     EGLint getSwapBehavior() const override;
> 
>-    FramebufferImpl *createDefaultFramebuffer(const gl::FramebufferState &data) override;
>+    FramebufferImpl *createDefaultFramebuffer(const gl::Context *context,
>+                                              const gl::FramebufferState &data) override;
> 
>     HDC getDC() const override;
> 
>@@ -70,8 +73,6 @@ class DXGISwapChainWindowSurfaceWGL : public SurfaceWGL
>     EGLNativeWindowType mWindow;
> 
>     StateManagerGL *mStateManager;
>-    const WorkaroundsGL &mWorkarounds;
>-    RendererGL *mRenderer;
>     const FunctionsGL *mFunctionsGL;
>     const FunctionsWGL *mFunctionsWGL;
> 
>@@ -93,8 +94,6 @@ class DXGISwapChainWindowSurfaceWGL : public SurfaceWGL
> 
>     GLuint mDepthRenderbufferID;
> 
>-    GLuint mFramebufferID;
>-
>     GLuint mTextureID;
>     HANDLE mTextureHandle;
> 
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/wgl/DisplayWGL.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/wgl/DisplayWGL.cpp
>index a970d3f9ade..12679ba7876 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/wgl/DisplayWGL.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/wgl/DisplayWGL.cpp
>@@ -10,32 +10,62 @@
> 
> #include "common/debug.h"
> #include "libANGLE/Config.h"
>+#include "libANGLE/Context.h"
> #include "libANGLE/Display.h"
> #include "libANGLE/Surface.h"
>+#include "libANGLE/renderer/gl/ContextGL.h"
> #include "libANGLE/renderer/gl/RendererGL.h"
> #include "libANGLE/renderer/gl/renderergl_utils.h"
>+#include "libANGLE/renderer/gl/wgl/ContextWGL.h"
> #include "libANGLE/renderer/gl/wgl/D3DTextureSurfaceWGL.h"
> #include "libANGLE/renderer/gl/wgl/DXGISwapChainWindowSurfaceWGL.h"
> #include "libANGLE/renderer/gl/wgl/FunctionsWGL.h"
> #include "libANGLE/renderer/gl/wgl/PbufferSurfaceWGL.h"
>+#include "libANGLE/renderer/gl/wgl/RendererWGL.h"
> #include "libANGLE/renderer/gl/wgl/WindowSurfaceWGL.h"
> #include "libANGLE/renderer/gl/wgl/wgl_utils.h"
> 
> #include "platform/Platform.h"
> 
> #include <EGL/eglext.h>
>-#include <string>
> #include <sstream>
>+#include <string>
> 
> namespace rx
> {
> 
>+namespace
>+{
>+
>+std::string GetErrorMessage()
>+{
>+    DWORD errorCode     = GetLastError();
>+    LPSTR messageBuffer = nullptr;
>+    size_t size         = FormatMessageA(
>+        FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS,
>+        NULL, errorCode, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), (LPSTR)&messageBuffer, 0, NULL);
>+    std::string message(messageBuffer, size);
>+    if (size == 0)
>+    {
>+        std::ostringstream stream;
>+        stream << "Failed to get the error message for '" << errorCode << "' due to the error '"
>+               << GetLastError() << "'";
>+        message = stream.str();
>+    }
>+    if (messageBuffer != nullptr)
>+    {
>+        LocalFree(messageBuffer);
>+    }
>+    return message;
>+}
>+
>+}  // anonymous namespace
>+
> class FunctionsGLWindows : public FunctionsGL
> {
>   public:
>     FunctionsGLWindows(HMODULE openGLModule, PFNWGLGETPROCADDRESSPROC getProcAddressWGL)
>-        : mOpenGLModule(openGLModule),
>-          mGetProcAddressWGL(getProcAddressWGL)
>+        : mOpenGLModule(openGLModule), mGetProcAddressWGL(getProcAddressWGL)
>     {
>         ASSERT(mOpenGLModule);
>         ASSERT(mGetProcAddressWGL);
>@@ -46,10 +76,10 @@ class FunctionsGLWindows : public FunctionsGL
>   private:
>     void *loadProcAddress(const std::string &function) const override
>     {
>-        void *proc = reinterpret_cast<void*>(mGetProcAddressWGL(function.c_str()));
>+        void *proc = reinterpret_cast<void *>(mGetProcAddressWGL(function.c_str()));
>         if (!proc)
>         {
>-            proc = reinterpret_cast<void*>(GetProcAddress(mOpenGLModule, function.c_str()));
>+            proc = reinterpret_cast<void *>(GetProcAddress(mOpenGLModule, function.c_str()));
>         }
>         return proc;
>     }
>@@ -60,34 +90,42 @@ class FunctionsGLWindows : public FunctionsGL
> 
> DisplayWGL::DisplayWGL(const egl::DisplayState &state)
>     : DisplayGL(state),
>-      mCurrentDC(nullptr),
>+      mRenderer(nullptr),
>+      mCurrentData(),
>       mOpenGLModule(nullptr),
>       mFunctionsWGL(nullptr),
>-      mFunctionsGL(nullptr),
>       mHasWGLCreateContextRobustness(false),
>       mHasRobustness(false),
>       mWindowClass(0),
>       mWindow(nullptr),
>       mDeviceContext(nullptr),
>       mPixelFormat(0),
>-      mWGLContext(nullptr),
>       mUseDXGISwapChains(false),
>       mHasDXInterop(false),
>       mDxgiModule(nullptr),
>       mD3d11Module(nullptr),
>       mD3D11DeviceHandle(nullptr),
>       mD3D11Device(nullptr),
>-      mDisplay(nullptr)
>-{
>-}
>+      mUseARBShare(true)
>+{}
>+
>+DisplayWGL::~DisplayWGL() {}
> 
>-DisplayWGL::~DisplayWGL()
>+egl::Error DisplayWGL::initialize(egl::Display *display)
> {
>+    egl::Error error = initializeImpl(display);
>+    if (error.isError())
>+    {
>+        destroy();
>+        return error;
>+    }
>+
>+    return DisplayGL::initialize(display);
> }
> 
>-egl::Error DisplayWGL::initialize(egl::Display *display)
>+egl::Error DisplayWGL::initializeImpl(egl::Display *display)
> {
>-    mDisplay = display;
>+    mDisplayAttributes = display->getAttributeMap();
> 
>     mOpenGLModule = LoadLibraryA("opengl32.dll");
>     if (!mOpenGLModule)
>@@ -98,46 +136,40 @@ egl::Error DisplayWGL::initialize(egl::Display *display)
>     mFunctionsWGL = new FunctionsWGL();
>     mFunctionsWGL->initialize(mOpenGLModule, nullptr);
> 
>-    // WGL can't grab extensions until it creates a context because it needs to load the driver's DLLs first.
>-    // Create a dummy context to load the driver and determine which GL versions are available.
>+    // WGL can't grab extensions until it creates a context because it needs to load the driver's
>+    // DLLs first. Create a dummy context to load the driver and determine which GL versions are
>+    // available.
> 
>     // Work around compile error from not defining "UNICODE" while Chromium does
>     const LPSTR idcArrow = MAKEINTRESOURCEA(32512);
> 
>     std::ostringstream stream;
>-    stream << "ANGLE DisplayWGL " << std::internal << std::setw(10) << std::setfill('0') << mDisplay
>-           << " Intermediate Window Class";
>+    stream << "ANGLE DisplayWGL " << gl::FmtHex(display) << " Intermediate Window Class";
>     std::string className = stream.str();
> 
>-    WNDCLASSA intermediateClassDesc = { 0 };
>-    intermediateClassDesc.style = CS_OWNDC;
>-    intermediateClassDesc.lpfnWndProc = DefWindowProc;
>-    intermediateClassDesc.cbClsExtra = 0;
>-    intermediateClassDesc.cbWndExtra = 0;
>-    intermediateClassDesc.hInstance = GetModuleHandle(nullptr);
>-    intermediateClassDesc.hIcon = nullptr;
>-    intermediateClassDesc.hCursor = LoadCursorA(nullptr, idcArrow);
>+    WNDCLASSA intermediateClassDesc     = {0};
>+    intermediateClassDesc.style         = CS_OWNDC;
>+    intermediateClassDesc.lpfnWndProc   = DefWindowProcA;
>+    intermediateClassDesc.cbClsExtra    = 0;
>+    intermediateClassDesc.cbWndExtra    = 0;
>+    intermediateClassDesc.hInstance     = GetModuleHandle(nullptr);
>+    intermediateClassDesc.hIcon         = nullptr;
>+    intermediateClassDesc.hCursor       = LoadCursorA(nullptr, idcArrow);
>     intermediateClassDesc.hbrBackground = 0;
>-    intermediateClassDesc.lpszMenuName = nullptr;
>+    intermediateClassDesc.lpszMenuName  = nullptr;
>     intermediateClassDesc.lpszClassName = className.c_str();
>-    mWindowClass = RegisterClassA(&intermediateClassDesc);
>+    mWindowClass                        = RegisterClassA(&intermediateClassDesc);
>     if (!mWindowClass)
>     {
>-        return egl::EglNotInitialized() << "Failed to register intermediate OpenGL window class.";
>-    }
>-
>-    HWND dummyWindow = CreateWindowExA(0,
>-                                       reinterpret_cast<const char *>(mWindowClass),
>-                                       "ANGLE Dummy Window",
>-                                       WS_OVERLAPPEDWINDOW,
>-                                       CW_USEDEFAULT,
>-                                       CW_USEDEFAULT,
>-                                       CW_USEDEFAULT,
>-                                       CW_USEDEFAULT,
>-                                       nullptr,
>-                                       nullptr,
>-                                       nullptr,
>-                                       nullptr);
>+        return egl::EglNotInitialized()
>+               << "Failed to register intermediate OpenGL window class \"" << className.c_str()
>+               << "\":" << gl::FmtErr(HRESULT_CODE(GetLastError()));
>+    }
>+
>+    HWND dummyWindow =
>+        CreateWindowExA(0, reinterpret_cast<const char *>(mWindowClass), "ANGLE Dummy Window",
>+                        WS_OVERLAPPEDWINDOW, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT,
>+                        CW_USEDEFAULT, nullptr, nullptr, nullptr, nullptr);
>     if (!dummyWindow)
>     {
>         return egl::EglNotInitialized() << "Failed to create dummy OpenGL window.";
>@@ -190,7 +222,7 @@ egl::Error DisplayWGL::initialize(egl::Display *display)
>     DestroyWindow(dummyWindow);
> 
>     const egl::AttributeMap &displayAttributes = display->getAttributeMap();
>-    EGLint requestedDisplayType = static_cast<EGLint>(displayAttributes.get(
>+    EGLint requestedDisplayType                = static_cast<EGLint>(displayAttributes.get(
>         EGL_PLATFORM_ANGLE_TYPE_ANGLE, EGL_PLATFORM_ANGLE_TYPE_DEFAULT_ANGLE));
>     if (requestedDisplayType == EGL_PLATFORM_ANGLE_TYPE_OPENGLES_ANGLE &&
>         !mFunctionsWGL->hasExtension("WGL_EXT_create_context_es2_profile") &&
>@@ -201,18 +233,10 @@ egl::Error DisplayWGL::initialize(egl::Display *display)
>     }
> 
>     // Create the real intermediate context and windows
>-    mWindow = CreateWindowExA(0,
>-                              reinterpret_cast<const char *>(mWindowClass),
>-                              "ANGLE Intermediate Window",
>-                              WS_OVERLAPPEDWINDOW,
>-                              CW_USEDEFAULT,
>-                              CW_USEDEFAULT,
>-                              CW_USEDEFAULT,
>-                              CW_USEDEFAULT,
>-                              nullptr,
>-                              nullptr,
>-                              nullptr,
>-                              nullptr);
>+    mWindow = CreateWindowExA(0, reinterpret_cast<const char *>(mWindowClass),
>+                              "ANGLE Intermediate Window", WS_OVERLAPPEDWINDOW, CW_USEDEFAULT,
>+                              CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, nullptr, nullptr,
>+                              nullptr, nullptr);
>     if (!mWindow)
>     {
>         return egl::EglNotInitialized() << "Failed to create intermediate OpenGL window.";
>@@ -251,43 +275,18 @@ egl::Error DisplayWGL::initialize(egl::Display *display)
>                << "Failed to set the pixel format on the intermediate OpenGL window.";
>     }
> 
>-    if (mFunctionsWGL->createContextAttribsARB)
>-    {
>-
>-        mWGLContext = initializeContextAttribs(displayAttributes);
>-    }
>-
>-    // If wglCreateContextAttribsARB is unavailable or failed, try the standard wglCreateContext
>-    if (!mWGLContext)
>-    {
>-        // Don't have control over GL versions
>-        mWGLContext = mFunctionsWGL->createContext(mDeviceContext);
>-    }
>+    ANGLE_TRY(createRenderer(&mRenderer));
>+    const FunctionsGL *functionsGL = mRenderer->getFunctions();
> 
>-    if (!mWGLContext)
>-    {
>-        return egl::EglNotInitialized()
>-               << "Failed to create a WGL context for the intermediate OpenGL window.";
>-    }
>-
>-    if (!mFunctionsWGL->makeCurrent(mDeviceContext, mWGLContext))
>-    {
>-        return egl::EglNotInitialized() << "Failed to make the intermediate WGL context current.";
>-    }
>-    mCurrentDC = mDeviceContext;
>-
>-    mFunctionsGL = new FunctionsGLWindows(mOpenGLModule, mFunctionsWGL->getProcAddress);
>-    mFunctionsGL->initialize(displayAttributes);
>-
>-    mHasRobustness = mFunctionsGL->getGraphicsResetStatus != nullptr;
>+    mHasRobustness = functionsGL->getGraphicsResetStatus != nullptr;
>     if (mHasWGLCreateContextRobustness != mHasRobustness)
>     {
>-        WARN() << "WGL_ARB_create_context_robustness exists but unable to OpenGL context with "
>+        WARN() << "WGL_ARB_create_context_robustness exists but unable to create a context with "
>                   "robustness.";
>     }
> 
>     // Intel OpenGL ES drivers are not currently supported due to bugs in the driver and ANGLE
>-    VendorID vendor = GetVendorID(mFunctionsGL);
>+    VendorID vendor = GetVendorID(functionsGL);
>     if (requestedDisplayType == EGL_PLATFORM_ANGLE_TYPE_OPENGLES_ANGLE && IsIntel(vendor))
>     {
>         return egl::EglNotInitialized() << "Intel OpenGL ES drivers are not supported.";
>@@ -321,39 +320,71 @@ egl::Error DisplayWGL::initialize(egl::Display *display)
>         }
>         else
>         {
>-            // Want to use DXGI swap chains but WGL_NV_DX_interop2 is not present, fail initialization
>+            // Want to use DXGI swap chains but WGL_NV_DX_interop2 is not present, fail
>+            // initialization
>             return egl::EglNotInitialized() << "WGL_NV_DX_interop2 is required but not present.";
>         }
>     }
> 
>-    return DisplayGL::initialize(display);
>+    const gl::Version &maxVersion = mRenderer->getMaxSupportedESVersion();
>+    if (maxVersion < gl::Version(2, 0))
>+    {
>+        return egl::EglNotInitialized() << "OpenGL ES 2.0 is not supportable.";
>+    }
>+
>+    return egl::NoError();
> }
> 
> void DisplayWGL::terminate()
> {
>     DisplayGL::terminate();
>+    destroy();
>+}
> 
>+void DisplayWGL::destroy()
>+{
>     releaseD3DDevice(mD3D11DeviceHandle);
> 
>-    mFunctionsWGL->makeCurrent(mDeviceContext, nullptr);
>-    mCurrentDC = nullptr;
>-    mFunctionsWGL->deleteContext(mWGLContext);
>-    mWGLContext = nullptr;
>+    mRenderer.reset();
> 
>-    ReleaseDC(mWindow, mDeviceContext);
>-    mDeviceContext = nullptr;
>+    if (mFunctionsWGL)
>+    {
>+        if (mDeviceContext)
>+        {
>+            mFunctionsWGL->makeCurrent(mDeviceContext, nullptr);
>+        }
>+    }
>+    mCurrentData.clear();
> 
>-    DestroyWindow(mWindow);
>-    mWindow = nullptr;
>+    SafeDelete(mFunctionsWGL);
> 
>-    UnregisterClassA(reinterpret_cast<const char *>(mWindowClass), nullptr);
>-    mWindowClass = NULL;
>+    if (mDeviceContext)
>+    {
>+        ReleaseDC(mWindow, mDeviceContext);
>+        mDeviceContext = nullptr;
>+    }
> 
>-    SafeDelete(mFunctionsWGL);
>-    SafeDelete(mFunctionsGL);
>+    if (mWindow)
>+    {
>+        DestroyWindow(mWindow);
>+        mWindow = nullptr;
>+    }
> 
>-    FreeLibrary(mOpenGLModule);
>-    mOpenGLModule = nullptr;
>+    if (mWindowClass)
>+    {
>+        if (!UnregisterClassA(reinterpret_cast<const char *>(mWindowClass),
>+                              GetModuleHandle(nullptr)))
>+        {
>+            WARN() << "Failed to unregister OpenGL window class: " << gl::FmtHex(mWindowClass);
>+        }
>+        mWindowClass = NULL;
>+    }
>+
>+    if (mOpenGLModule)
>+    {
>+        FreeLibrary(mOpenGLModule);
>+        mOpenGLModule = nullptr;
>+    }
> 
>     SafeRelease(mD3D11Device);
> 
>@@ -385,14 +416,13 @@ SurfaceImpl *DisplayWGL::createWindowSurface(const egl::SurfaceState &state,
>             return nullptr;
>         }
> 
>-        return new DXGISwapChainWindowSurfaceWGL(state, getRenderer(), window, mD3D11Device,
>-                                                 mD3D11DeviceHandle, mDeviceContext, mFunctionsGL,
>-                                                 mFunctionsWGL, orientation);
>+        return new DXGISwapChainWindowSurfaceWGL(
>+            state, mRenderer->getStateManager(), window, mD3D11Device, mD3D11DeviceHandle,
>+            mDeviceContext, mRenderer->getFunctions(), mFunctionsWGL, orientation);
>     }
>     else
>     {
>-        return new WindowSurfaceWGL(state, getRenderer(), window, mPixelFormat, mFunctionsWGL,
>-                                    orientation);
>+        return new WindowSurfaceWGL(state, window, mPixelFormat, mFunctionsWGL, orientation);
>     }
> }
> 
>@@ -401,12 +431,12 @@ SurfaceImpl *DisplayWGL::createPbufferSurface(const egl::SurfaceState &state,
> {
>     EGLint width          = static_cast<EGLint>(attribs.get(EGL_WIDTH, 0));
>     EGLint height         = static_cast<EGLint>(attribs.get(EGL_HEIGHT, 0));
>-    bool largest = (attribs.get(EGL_LARGEST_PBUFFER, EGL_FALSE) == EGL_TRUE);
>+    bool largest          = (attribs.get(EGL_LARGEST_PBUFFER, EGL_FALSE) == EGL_TRUE);
>     EGLenum textureFormat = static_cast<EGLenum>(attribs.get(EGL_TEXTURE_FORMAT, EGL_NO_TEXTURE));
>     EGLenum textureTarget = static_cast<EGLenum>(attribs.get(EGL_TEXTURE_TARGET, EGL_NO_TEXTURE));
> 
>-    return new PbufferSurfaceWGL(state, getRenderer(), width, height, textureFormat, textureTarget,
>-                                 largest, mPixelFormat, mDeviceContext, mFunctionsWGL);
>+    return new PbufferSurfaceWGL(state, width, height, textureFormat, textureTarget, largest,
>+                                 mPixelFormat, mDeviceContext, mFunctionsWGL);
> }
> 
> SurfaceImpl *DisplayWGL::createPbufferFromClientBuffer(const egl::SurfaceState &state,
>@@ -420,8 +450,9 @@ SurfaceImpl *DisplayWGL::createPbufferFromClientBuffer(const egl::SurfaceState &
>         return nullptr;
>     }
> 
>-    return new D3DTextureSurfaceWGL(state, getRenderer(), buftype, clientBuffer, this,
>-                                    mDeviceContext, mD3D11Device, mFunctionsGL, mFunctionsWGL);
>+    return new D3DTextureSurfaceWGL(state, mRenderer->getStateManager(), buftype, clientBuffer,
>+                                    this, mDeviceContext, mD3D11Device, mRenderer->getFunctions(),
>+                                    mFunctionsWGL);
> }
> 
> SurfaceImpl *DisplayWGL::createPixmapSurface(const egl::SurfaceState &state,
>@@ -432,10 +463,19 @@ SurfaceImpl *DisplayWGL::createPixmapSurface(const egl::SurfaceState &state,
>     return nullptr;
> }
> 
>-egl::Error DisplayWGL::getDevice(DeviceImpl **device)
>+rx::ContextImpl *DisplayWGL::createContext(const gl::State &state,
>+                                           gl::ErrorSet *errorSet,
>+                                           const egl::Config *configuration,
>+                                           const gl::Context *shareContext,
>+                                           const egl::AttributeMap &attribs)
> {
>-    UNIMPLEMENTED();
>-    return egl::EglBadDisplay();
>+    return new ContextWGL(state, errorSet, mRenderer);
>+}
>+
>+DeviceImpl *DisplayWGL::createDevice()
>+{
>+    UNREACHABLE();
>+    return nullptr;
> }
> 
> egl::ConfigSet DisplayWGL::generateConfigs()
>@@ -456,10 +496,10 @@ egl::ConfigSet DisplayWGL::generateConfigs()
>     bool supportsES3 = maxVersion >= gl::Version(3, 0);
> 
>     PIXELFORMATDESCRIPTOR pixelFormatDescriptor;
>-    DescribePixelFormat(mDeviceContext, mPixelFormat, sizeof(pixelFormatDescriptor), &pixelFormatDescriptor);
>+    DescribePixelFormat(mDeviceContext, mPixelFormat, sizeof(pixelFormatDescriptor),
>+                        &pixelFormatDescriptor);
> 
>-    auto getAttrib = [this](int attrib)
>-    {
>+    auto getAttrib = [this](int attrib) {
>         return wgl::QueryWGLFormatAttrib(mDeviceContext, mPixelFormat, attrib, mFunctionsWGL);
>     };
> 
>@@ -467,35 +507,36 @@ egl::ConfigSet DisplayWGL::generateConfigs()
>         mUseDXGISwapChains ? EGL_SURFACE_ORIENTATION_INVERT_Y_ANGLE : 0;
> 
>     egl::Config config;
>-    config.renderTargetFormat = GL_RGBA8; // TODO: use the bit counts to determine the format
>-    config.depthStencilFormat = GL_DEPTH24_STENCIL8; // TODO: use the bit counts to determine the format
>-    config.bufferSize = pixelFormatDescriptor.cColorBits;
>-    config.redSize = pixelFormatDescriptor.cRedBits;
>-    config.greenSize = pixelFormatDescriptor.cGreenBits;
>-    config.blueSize = pixelFormatDescriptor.cBlueBits;
>-    config.luminanceSize = 0;
>-    config.alphaSize = pixelFormatDescriptor.cAlphaBits;
>-    config.alphaMaskSize = 0;
>-    config.bindToTextureRGB   = (getAttrib(WGL_BIND_TO_TEXTURE_RGB_ARB) == TRUE);
>-    config.bindToTextureRGBA  = (getAttrib(WGL_BIND_TO_TEXTURE_RGBA_ARB) == TRUE);
>-    config.colorBufferType = EGL_RGB_BUFFER;
>-    config.configCaveat = EGL_NONE;
>-    config.conformant = EGL_OPENGL_ES2_BIT | (supportsES3 ? EGL_OPENGL_ES3_BIT_KHR : 0);
>-    config.depthSize = pixelFormatDescriptor.cDepthBits;
>-    config.level = 0;
>+    config.renderTargetFormat = GL_RGBA8;  // TODO: use the bit counts to determine the format
>+    config.depthStencilFormat =
>+        GL_DEPTH24_STENCIL8;  // TODO: use the bit counts to determine the format
>+    config.bufferSize        = pixelFormatDescriptor.cColorBits;
>+    config.redSize           = pixelFormatDescriptor.cRedBits;
>+    config.greenSize         = pixelFormatDescriptor.cGreenBits;
>+    config.blueSize          = pixelFormatDescriptor.cBlueBits;
>+    config.luminanceSize     = 0;
>+    config.alphaSize         = pixelFormatDescriptor.cAlphaBits;
>+    config.alphaMaskSize     = 0;
>+    config.bindToTextureRGB  = (getAttrib(WGL_BIND_TO_TEXTURE_RGB_ARB) == TRUE);
>+    config.bindToTextureRGBA = (getAttrib(WGL_BIND_TO_TEXTURE_RGBA_ARB) == TRUE);
>+    config.colorBufferType   = EGL_RGB_BUFFER;
>+    config.configCaveat      = EGL_NONE;
>+    config.conformant        = EGL_OPENGL_ES2_BIT | (supportsES3 ? EGL_OPENGL_ES3_BIT_KHR : 0);
>+    config.depthSize         = pixelFormatDescriptor.cDepthBits;
>+    config.level             = 0;
>     config.matchNativePixmap = EGL_NONE;
>-    config.maxPBufferWidth    = getAttrib(WGL_MAX_PBUFFER_WIDTH_ARB);
>-    config.maxPBufferHeight   = getAttrib(WGL_MAX_PBUFFER_HEIGHT_ARB);
>-    config.maxPBufferPixels   = getAttrib(WGL_MAX_PBUFFER_PIXELS_ARB);
>-    config.maxSwapInterval = maxSwapInterval;
>-    config.minSwapInterval = minSwapInterval;
>-    config.nativeRenderable = EGL_TRUE; // Direct rendering
>-    config.nativeVisualID = 0;
>-    config.nativeVisualType = EGL_NONE;
>-    config.renderableType = EGL_OPENGL_ES2_BIT | (supportsES3 ? EGL_OPENGL_ES3_BIT_KHR : 0);
>-    config.sampleBuffers = 0; // FIXME: enumerate multi-sampling
>-    config.samples = 0;
>-    config.stencilSize = pixelFormatDescriptor.cStencilBits;
>+    config.maxPBufferWidth   = getAttrib(WGL_MAX_PBUFFER_WIDTH_ARB);
>+    config.maxPBufferHeight  = getAttrib(WGL_MAX_PBUFFER_HEIGHT_ARB);
>+    config.maxPBufferPixels  = getAttrib(WGL_MAX_PBUFFER_PIXELS_ARB);
>+    config.maxSwapInterval   = maxSwapInterval;
>+    config.minSwapInterval   = minSwapInterval;
>+    config.nativeRenderable  = EGL_TRUE;  // Direct rendering
>+    config.nativeVisualID    = 0;
>+    config.nativeVisualType  = EGL_NONE;
>+    config.renderableType    = EGL_OPENGL_ES2_BIT | (supportsES3 ? EGL_OPENGL_ES3_BIT_KHR : 0);
>+    config.sampleBuffers     = 0;  // FIXME: enumerate multi-sampling
>+    config.samples           = 0;
>+    config.stencilSize       = pixelFormatDescriptor.cStencilBits;
>     config.surfaceType =
>         ((pixelFormatDescriptor.dwFlags & PFD_DRAW_TO_WINDOW) ? EGL_WINDOW_BIT : 0) |
>         ((getAttrib(WGL_DRAW_TO_PBUFFER_ARB) == TRUE) ? EGL_PBUFFER_BIT : 0) |
>@@ -504,10 +545,10 @@ egl::ConfigSet DisplayWGL::generateConfigs()
>     config.optimalOrientation = optimalSurfaceOrientation;
>     config.colorComponentType = EGL_COLOR_COMPONENT_TYPE_FIXED_EXT;
> 
>-    config.transparentType = EGL_NONE;
>-    config.transparentRedValue = 0;
>+    config.transparentType       = EGL_NONE;
>+    config.transparentRedValue   = 0;
>     config.transparentGreenValue = 0;
>-    config.transparentBlueValue = 0;
>+    config.transparentBlueValue  = 0;
> 
>     configs.add(config);
> 
>@@ -518,7 +559,7 @@ bool DisplayWGL::testDeviceLost()
> {
>     if (mHasRobustness)
>     {
>-        return getRenderer()->getResetStatus() != GL_NO_ERROR;
>+        return mRenderer->getResetStatus() != gl::GraphicsResetStatus::NoError;
>     }
> 
>     return false;
>@@ -543,7 +584,7 @@ egl::Error DisplayWGL::validateClientBuffer(const egl::Config *configuration,
>     {
>         case EGL_D3D_TEXTURE_ANGLE:
>         case EGL_D3D_TEXTURE_2D_SHARE_HANDLE_ANGLE:
>-            ANGLE_TRY(const_cast<DisplayWGL*>(this)->initializeD3DDevice());
>+            ANGLE_TRY(const_cast<DisplayWGL *>(this)->initializeD3DDevice());
>             return D3DTextureSurfaceWGL::ValidateD3DTextureClientBuffer(buftype, clientBuffer,
>                                                                         mD3D11Device);
> 
>@@ -554,15 +595,10 @@ egl::Error DisplayWGL::validateClientBuffer(const egl::Config *configuration,
> 
> std::string DisplayWGL::getVendorString() const
> {
>-    //UNIMPLEMENTED();
>+    // UNIMPLEMENTED();
>     return "";
> }
> 
>-const FunctionsGL *DisplayWGL::getFunctionsGL() const
>-{
>-    return mFunctionsGL;
>-}
>-
> egl::Error DisplayWGL::initializeD3DDevice()
> {
>     if (mD3D11Device != nullptr)
>@@ -583,7 +619,7 @@ egl::Error DisplayWGL::initializeD3DDevice()
>     }
> 
>     PFN_D3D11_CREATE_DEVICE d3d11CreateDevice = nullptr;
>-    d3d11CreateDevice = reinterpret_cast<PFN_D3D11_CREATE_DEVICE>(
>+    d3d11CreateDevice                         = reinterpret_cast<PFN_D3D11_CREATE_DEVICE>(
>         GetProcAddress(mD3d11Module, "D3D11CreateDevice"));
>     if (d3d11CreateDevice == nullptr)
>     {
>@@ -597,13 +633,7 @@ egl::Error DisplayWGL::initializeD3DDevice()
>         return egl::EglNotInitialized() << "Could not create D3D11 device, " << gl::FmtHR(result);
>     }
> 
>-    egl::Error error = registerD3DDevice(mD3D11Device, &mD3D11DeviceHandle);
>-    if (error.isError())
>-    {
>-        return error;
>-    }
>-
>-    return egl::NoError();
>+    return registerD3DDevice(mD3D11Device, &mD3D11DeviceHandle);
> }
> 
> void DisplayWGL::generateExtensions(egl::DisplayExtensions *outExtensions) const
>@@ -641,13 +671,13 @@ egl::Error DisplayWGL::makeCurrentSurfaceless(gl::Context *context)
>     return egl::NoError();
> }
> 
>-egl::Error DisplayWGL::waitClient(const gl::Context *context) const
>+egl::Error DisplayWGL::waitClient(const gl::Context *context)
> {
>     // Unimplemented as this is not needed for WGL
>     return egl::NoError();
> }
> 
>-egl::Error DisplayWGL::waitNative(const gl::Context *context, EGLint engine) const
>+egl::Error DisplayWGL::waitNative(const gl::Context *context, EGLint engine)
> {
>     // Unimplemented as this is not needed for WGL
>     return egl::NoError();
>@@ -657,19 +687,41 @@ egl::Error DisplayWGL::makeCurrent(egl::Surface *drawSurface,
>                                    egl::Surface *readSurface,
>                                    gl::Context *context)
> {
>+    CurrentNativeContext &currentContext = mCurrentData[std::this_thread::get_id()];
>+
>+    HDC newDC = currentContext.dc;
>     if (drawSurface)
>     {
>         SurfaceWGL *drawSurfaceWGL = GetImplAs<SurfaceWGL>(drawSurface);
>-        HDC dc                     = drawSurfaceWGL->getDC();
>-        if (dc != mCurrentDC)
>+        newDC                      = drawSurfaceWGL->getDC();
>+    }
>+    else
>+    {
>+        newDC = mDeviceContext;
>+    }
>+
>+    HGLRC newContext = currentContext.glrc;
>+    if (context)
>+    {
>+        ContextWGL *contextWGL = GetImplAs<ContextWGL>(context);
>+        newContext             = contextWGL->getContext();
>+    }
>+    else
>+    {
>+        newContext = 0;
>+    }
>+
>+    if (newDC != currentContext.dc || newContext != currentContext.glrc)
>+    {
>+        ASSERT(newDC != 0);
>+
>+        if (!mFunctionsWGL->makeCurrent(newDC, newContext))
>         {
>-            if (!mFunctionsWGL->makeCurrent(dc, mWGLContext))
>-            {
>-                // TODO(geofflang): What error type here?
>-                return egl::EglContextLost() << "Failed to make the WGL context current.";
>-            }
>-            mCurrentDC = dc;
>+            // TODO(geofflang): What error type here?
>+            return egl::EglContextLost() << "Failed to make the WGL context current.";
>         }
>+        currentContext.dc   = newDC;
>+        currentContext.glrc = newContext;
>     }
> 
>     return DisplayGL::makeCurrent(drawSurface, readSurface, context);
>@@ -723,7 +775,20 @@ void DisplayWGL::releaseD3DDevice(HANDLE deviceHandle)
>     }
> }
> 
>-HGLRC DisplayWGL::initializeContextAttribs(const egl::AttributeMap &eglAttributes) const
>+gl::Version DisplayWGL::getMaxSupportedESVersion() const
>+{
>+    return mRenderer->getMaxSupportedESVersion();
>+}
>+
>+void DisplayWGL::destroyNativeContext(HGLRC context)
>+{
>+    mFunctionsWGL->deleteContext(context);
>+}
>+
>+HGLRC DisplayWGL::initializeContextAttribs(const egl::AttributeMap &eglAttributes,
>+                                           HGLRC &sharedContext,
>+                                           bool &useARBShare,
>+                                           std::vector<int> &workerContextAttribs) const
> {
>     EGLint requestedDisplayType = static_cast<EGLint>(
>         eglAttributes.get(EGL_PLATFORM_ANGLE_TYPE_ANGLE, EGL_PLATFORM_ANGLE_TYPE_DEFAULT_ANGLE));
>@@ -742,7 +807,8 @@ HGLRC DisplayWGL::initializeContextAttribs(const egl::AttributeMap &eglAttribute
>         {
>             profileMask |= WGL_CONTEXT_CORE_PROFILE_BIT_ARB;
>         }
>-        return createContextAttribs(requestedVersion, profileMask);
>+        return createContextAttribs(requestedVersion, profileMask, sharedContext, useARBShare,
>+                                    workerContextAttribs);
>     }
> 
>     // Try all the GL version in order as a workaround for Mesa context creation where the driver
>@@ -759,7 +825,8 @@ HGLRC DisplayWGL::initializeContextAttribs(const egl::AttributeMap &eglAttribute
>             profileFlag |= WGL_CONTEXT_ES_PROFILE_BIT_EXT;
>         }
> 
>-        HGLRC context = createContextAttribs(info.version, profileFlag);
>+        HGLRC context = createContextAttribs(info.version, profileFlag, sharedContext, useARBShare,
>+                                             workerContextAttribs);
>         if (context != nullptr)
>         {
>             return context;
>@@ -769,7 +836,11 @@ HGLRC DisplayWGL::initializeContextAttribs(const egl::AttributeMap &eglAttribute
>     return nullptr;
> }
> 
>-HGLRC DisplayWGL::createContextAttribs(const gl::Version &version, int profileMask) const
>+HGLRC DisplayWGL::createContextAttribs(const gl::Version &version,
>+                                       int profileMask,
>+                                       HGLRC &sharedContext,
>+                                       bool &useARBShare,
>+                                       std::vector<int> &workerContextAttribs) const
> {
>     std::vector<int> attribs;
> 
>@@ -795,7 +866,196 @@ HGLRC DisplayWGL::createContextAttribs(const gl::Version &version, int profileMa
> 
>     attribs.push_back(0);
>     attribs.push_back(0);
>+    HGLRC context = mFunctionsWGL->createContextAttribsARB(mDeviceContext, nullptr, &attribs[0]);
>+
>+    // This shared context is never made current. It is safer than the main context to be used as
>+    // a seed to create worker contexts from.
>+    // It seems a WGL restriction not mentioned in MSDN, but some posts revealed it.
>+    // https://www.opengl.org/discussion_boards/showthread.php/152648-wglShareLists-failing
>+    // https://github.com/glfw/glfw/issues/402
>+    sharedContext = mFunctionsWGL->createContextAttribsARB(mDeviceContext, context, &attribs[0]);
>+    workerContextAttribs = attribs;
>+    useARBShare          = true;
>+    return context;
>+}
>+
>+egl::Error DisplayWGL::createRenderer(std::shared_ptr<RendererWGL> *outRenderer)
>+{
>+    HGLRC context       = nullptr;
>+    HGLRC sharedContext = nullptr;
>+    std::vector<int> workerContextAttribs;
>+
>+    if (mFunctionsWGL->createContextAttribsARB)
>+    {
>+        context = initializeContextAttribs(mDisplayAttributes, sharedContext, mUseARBShare,
>+                                           workerContextAttribs);
>+    }
>+
>+    // If wglCreateContextAttribsARB is unavailable or failed, try the standard wglCreateContext
>+    if (!context)
>+    {
>+        // Don't have control over GL versions
>+        context = mFunctionsWGL->createContext(mDeviceContext);
>+    }
>+
>+    if (!context)
>+    {
>+        return egl::EglNotInitialized()
>+               << "Failed to create a WGL context for the intermediate OpenGL window."
>+               << GetErrorMessage();
>+    }
>+
>+    if (!sharedContext)
>+    {
>+        sharedContext = mFunctionsWGL->createContext(mDeviceContext);
>+        if (!mFunctionsWGL->shareLists(context, sharedContext))
>+        {
>+            mFunctionsWGL->deleteContext(sharedContext);
>+            sharedContext = nullptr;
>+        }
>+        mUseARBShare = false;
>+    }
>+
>+    if (!mFunctionsWGL->makeCurrent(mDeviceContext, context))
>+    {
>+        return egl::EglNotInitialized() << "Failed to make the intermediate WGL context current.";
>+    }
>+    CurrentNativeContext &currentContext = mCurrentData[std::this_thread::get_id()];
>+    currentContext.dc                    = mDeviceContext;
>+    currentContext.glrc                  = context;
>+
>+    std::unique_ptr<FunctionsGL> functionsGL(
>+        new FunctionsGLWindows(mOpenGLModule, mFunctionsWGL->getProcAddress));
>+    functionsGL->initialize(mDisplayAttributes);
>+
>+    outRenderer->reset(new RendererWGL(std::move(functionsGL), mDisplayAttributes, this, context,
>+                                       sharedContext, workerContextAttribs));
>+
>+    return egl::NoError();
>+}
>+
>+class WorkerContextWGL final : public WorkerContext
>+{
>+  public:
>+    WorkerContextWGL(FunctionsWGL *functions,
>+                     HPBUFFERARB pbuffer,
>+                     HDC deviceContext,
>+                     HGLRC context);
>+    ~WorkerContextWGL() override;
>+
>+    bool makeCurrent() override;
>+    void unmakeCurrent() override;
>+
>+  private:
>+    FunctionsWGL *mFunctionsWGL;
>+    HPBUFFERARB mPbuffer;
>+    HDC mDeviceContext;
>+    HGLRC mContext;
>+};
>+
>+WorkerContextWGL::WorkerContextWGL(FunctionsWGL *functions,
>+                                   HPBUFFERARB pbuffer,
>+                                   HDC deviceContext,
>+                                   HGLRC context)
>+    : mFunctionsWGL(functions), mPbuffer(pbuffer), mDeviceContext(deviceContext), mContext(context)
>+{}
> 
>-    return mFunctionsWGL->createContextAttribsARB(mDeviceContext, nullptr, &attribs[0]);
>+WorkerContextWGL::~WorkerContextWGL()
>+{
>+    mFunctionsWGL->makeCurrent(mDeviceContext, nullptr);
>+    mFunctionsWGL->deleteContext(mContext);
>+    mFunctionsWGL->releasePbufferDCARB(mPbuffer, mDeviceContext);
>+    mFunctionsWGL->destroyPbufferARB(mPbuffer);
> }
>+
>+bool WorkerContextWGL::makeCurrent()
>+{
>+    bool result = mFunctionsWGL->makeCurrent(mDeviceContext, mContext);
>+    if (!result)
>+    {
>+        ERR() << GetErrorMessage();
>+    }
>+    return result;
>+}
>+
>+void WorkerContextWGL::unmakeCurrent()
>+{
>+    mFunctionsWGL->makeCurrent(mDeviceContext, nullptr);
>+}
>+
>+WorkerContext *DisplayWGL::createWorkerContext(std::string *infoLog,
>+                                               HGLRC sharedContext,
>+                                               const std::vector<int> &workerContextAttribs)
>+{
>+    if (!sharedContext)
>+    {
>+        *infoLog += "Unable to create the shared context.";
>+        return nullptr;
>+    }
>+
>+    HPBUFFERARB workerPbuffer = nullptr;
>+    HDC workerDeviceContext   = nullptr;
>+    HGLRC workerContext       = nullptr;
>+
>+#define CLEANUP_ON_ERROR()                                                          \
>+    do                                                                              \
>+    {                                                                               \
>+        if (workerContext)                                                          \
>+        {                                                                           \
>+            mFunctionsWGL->deleteContext(workerContext);                            \
>+        }                                                                           \
>+        if (workerDeviceContext)                                                    \
>+        {                                                                           \
>+            mFunctionsWGL->releasePbufferDCARB(workerPbuffer, workerDeviceContext); \
>+        }                                                                           \
>+        if (workerPbuffer)                                                          \
>+        {                                                                           \
>+            mFunctionsWGL->destroyPbufferARB(workerPbuffer);                        \
>+        }                                                                           \
>+    } while (0)
>+
>+    const int attribs[] = {0, 0};
>+    workerPbuffer = mFunctionsWGL->createPbufferARB(mDeviceContext, mPixelFormat, 1, 1, attribs);
>+    if (!workerPbuffer)
>+    {
>+        *infoLog += GetErrorMessage();
>+        return nullptr;
>+    }
>+
>+    workerDeviceContext = mFunctionsWGL->getPbufferDCARB(workerPbuffer);
>+    if (!workerDeviceContext)
>+    {
>+        *infoLog += GetErrorMessage();
>+        CLEANUP_ON_ERROR();
>+        return nullptr;
>+    }
>+
>+    if (mUseARBShare)
>+    {
>+        workerContext = mFunctionsWGL->createContextAttribsARB(mDeviceContext, sharedContext,
>+                                                               &workerContextAttribs[0]);
>+    }
>+    else
>+    {
>+        workerContext = mFunctionsWGL->createContext(workerDeviceContext);
>+    }
>+    if (!workerContext)
>+    {
>+        GetErrorMessage();
>+        CLEANUP_ON_ERROR();
>+        return nullptr;
>+    }
>+
>+    if (!mUseARBShare && !mFunctionsWGL->shareLists(sharedContext, workerContext))
>+    {
>+        GetErrorMessage();
>+        CLEANUP_ON_ERROR();
>+        return nullptr;
>+    }
>+
>+#undef CLEANUP_ON_ERROR
>+
>+    return new WorkerContextWGL(mFunctionsWGL, workerPbuffer, workerDeviceContext, workerContext);
> }
>+
>+}  // namespace rx
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/wgl/DisplayWGL.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/wgl/DisplayWGL.h
>index baf5a6ab5bc..81925c3d1fd 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/wgl/DisplayWGL.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/wgl/DisplayWGL.h
>@@ -9,6 +9,9 @@
> #ifndef LIBANGLE_RENDERER_GL_WGL_DISPLAYWGL_H_
> #define LIBANGLE_RENDERER_GL_WGL_DISPLAYWGL_H_
> 
>+#include <thread>
>+#include <unordered_map>
>+
> #include "libANGLE/renderer/gl/DisplayGL.h"
> 
> #include <GL/wglext.h>
>@@ -17,6 +20,8 @@ namespace rx
> {
> 
> class FunctionsWGL;
>+class RendererWGL;
>+class WorkerContext;
> 
> class DisplayWGL : public DisplayGL
> {
>@@ -41,6 +46,12 @@ class DisplayWGL : public DisplayGL
>                                      NativePixmapType nativePixmap,
>                                      const egl::AttributeMap &attribs) override;
> 
>+    ContextImpl *createContext(const gl::State &state,
>+                               gl::ErrorSet *errorSet,
>+                               const egl::Config *configuration,
>+                               const gl::Context *shareContext,
>+                               const egl::AttributeMap &attribs) override;
>+
>     egl::ConfigSet generateConfigs() override;
> 
>     bool testDeviceLost() override;
>@@ -52,12 +63,12 @@ class DisplayWGL : public DisplayGL
>                                     EGLClientBuffer clientBuffer,
>                                     const egl::AttributeMap &attribs) const override;
> 
>-    egl::Error getDevice(DeviceImpl **device) override;
>+    DeviceImpl *createDevice() override;
> 
>     std::string getVendorString() const override;
> 
>-    egl::Error waitClient(const gl::Context *context) const override;
>-    egl::Error waitNative(const gl::Context *context, EGLint engine) const override;
>+    egl::Error waitClient(const gl::Context *context) override;
>+    egl::Error waitNative(const gl::Context *context, EGLint engine) override;
> 
>     egl::Error makeCurrent(egl::Surface *drawSurface,
>                            egl::Surface *readSurface,
>@@ -66,8 +77,17 @@ class DisplayWGL : public DisplayGL
>     egl::Error registerD3DDevice(IUnknown *device, HANDLE *outHandle);
>     void releaseD3DDevice(HANDLE handle);
> 
>+    gl::Version getMaxSupportedESVersion() const override;
>+
>+    void destroyNativeContext(HGLRC context);
>+
>+    WorkerContext *createWorkerContext(std::string *infoLog,
>+                                       HGLRC sharedContext,
>+                                       const std::vector<int> &workerContextAttribs);
>+
>   private:
>-    const FunctionsGL *getFunctionsGL() const override;
>+    egl::Error initializeImpl(egl::Display *display);
>+    void destroy();
> 
>     egl::Error initializeD3DDevice();
> 
>@@ -76,24 +96,40 @@ class DisplayWGL : public DisplayGL
> 
>     egl::Error makeCurrentSurfaceless(gl::Context *context) override;
> 
>-    HGLRC initializeContextAttribs(const egl::AttributeMap &eglAttributes) const;
>-    HGLRC createContextAttribs(const gl::Version &version, int profileMask) const;
>+    HGLRC initializeContextAttribs(const egl::AttributeMap &eglAttributes,
>+                                   HGLRC &sharedContext,
>+                                   bool &useARBShare,
>+                                   std::vector<int> &workerContextAttribs) const;
>+    HGLRC createContextAttribs(const gl::Version &version,
>+                               int profileMask,
>+                               HGLRC &sharedContext,
>+                               bool &useARBShare,
>+                               std::vector<int> &workerContextAttribs) const;
> 
>-    HDC mCurrentDC;
>+    egl::Error createRenderer(std::shared_ptr<RendererWGL> *outRenderer);
>+
>+    std::shared_ptr<RendererWGL> mRenderer;
>+
>+    struct CurrentNativeContext
>+    {
>+        HDC dc     = nullptr;
>+        HGLRC glrc = nullptr;
>+    };
>+    std::unordered_map<std::thread::id, CurrentNativeContext> mCurrentData;
> 
>     HMODULE mOpenGLModule;
> 
>     FunctionsWGL *mFunctionsWGL;
>-    FunctionsGL *mFunctionsGL;
> 
>     bool mHasWGLCreateContextRobustness;
>     bool mHasRobustness;
> 
>+    egl::AttributeMap mDisplayAttributes;
>+
>     ATOM mWindowClass;
>     HWND mWindow;
>     HDC mDeviceContext;
>     int mPixelFormat;
>-    HGLRC mWGLContext;
> 
>     bool mUseDXGISwapChains;
>     bool mHasDXInterop;
>@@ -109,9 +145,9 @@ class DisplayWGL : public DisplayGL
>     };
>     std::map<IUnknown *, D3DObjectHandle> mRegisteredD3DDevices;
> 
>-    egl::Display *mDisplay;
>+    bool mUseARBShare;
> };
> 
>-}
>+}  // namespace rx
> 
>-#endif // LIBANGLE_RENDERER_GL_WGL_DISPLAYWGL_H_
>+#endif  // LIBANGLE_RENDERER_GL_WGL_DISPLAYWGL_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/wgl/FunctionsWGL.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/wgl/FunctionsWGL.cpp
>index b3a947398a0..0db7a08ef27 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/wgl/FunctionsWGL.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/wgl/FunctionsWGL.cpp
>@@ -16,8 +16,10 @@ namespace rx
> {
> 
> template <typename T>
>-static void GetWGLProcAddress(HMODULE glModule, PFNWGLGETPROCADDRESSPROC getProcAddressWGL,
>-                              const std::string &procName, T *outProcAddress)
>+static void GetWGLProcAddress(HMODULE glModule,
>+                              PFNWGLGETPROCADDRESSPROC getProcAddressWGL,
>+                              const std::string &procName,
>+                              T *outProcAddress)
> {
>     T proc = nullptr;
>     if (getProcAddressWGL)
>@@ -94,12 +96,9 @@ FunctionsWGL::FunctionsWGL()
>       dxObjectAccessNV(nullptr),
>       dxLockObjectsNV(nullptr),
>       dxUnlockObjectsNV(nullptr)
>-{
>-}
>+{}
> 
>-FunctionsWGL::~FunctionsWGL()
>-{
>-}
>+FunctionsWGL::~FunctionsWGL() {}
> 
> void FunctionsWGL::initialize(HMODULE glModule, HDC context)
> {
>@@ -117,19 +116,23 @@ void FunctionsWGL::initialize(HMODULE glModule, HDC context)
>     GetWGLProcAddress(glModule, getProcAddress, "wglShareLists", &shareLists);
>     GetWGLProcAddress(glModule, getProcAddress, "wglUseFontBitmapsA", &useFontBitmapsA);
>     GetWGLProcAddress(glModule, getProcAddress, "wglUseFontBitmapsW", &useFontBitmapsW);
>-    swapBuffers = SwapBuffers; // SwapBuffers is statically linked from GDI
>+    swapBuffers = SwapBuffers;  // SwapBuffers is statically linked from GDI
>     GetWGLProcAddress(glModule, getProcAddress, "wglUseFontOutlinesA", &useFontOutlinesA);
>     GetWGLProcAddress(glModule, getProcAddress, "wglUseFontOutlinesW", &useFontOutlinesW);
>     GetWGLProcAddress(glModule, getProcAddress, "wglDescribeLayerPlane", &describeLayerPlane);
>-    GetWGLProcAddress(glModule, getProcAddress, "wglSetLayerPaletteEntries", &setLayerPaletteEntries);
>-    GetWGLProcAddress(glModule, getProcAddress, "wglGetLayerPaletteEntries", &getLayerPaletteEntries);
>+    GetWGLProcAddress(glModule, getProcAddress, "wglSetLayerPaletteEntries",
>+                      &setLayerPaletteEntries);
>+    GetWGLProcAddress(glModule, getProcAddress, "wglGetLayerPaletteEntries",
>+                      &getLayerPaletteEntries);
>     GetWGLProcAddress(glModule, getProcAddress, "wglRealizeLayerPalette", &realizeLayerPalette);
>     GetWGLProcAddress(glModule, getProcAddress, "wglSwapLayerBuffers", &swapLayerBuffers);
>     GetWGLProcAddress(glModule, getProcAddress, "wglSwapMultipleBuffers", &swapMultipleBuffers);
> 
>     // Load extension string getter functions
>-    GetWGLProcAddress(glModule, getProcAddress, "wglGetExtensionsStringEXT", &getExtensionStringEXT);
>-    GetWGLProcAddress(glModule, getProcAddress, "wglGetExtensionsStringARB", &getExtensionStringARB);
>+    GetWGLProcAddress(glModule, getProcAddress, "wglGetExtensionsStringEXT",
>+                      &getExtensionStringEXT);
>+    GetWGLProcAddress(glModule, getProcAddress, "wglGetExtensionsStringARB",
>+                      &getExtensionStringARB);
> 
>     std::string extensionString = "";
>     if (getExtensionStringEXT)
>@@ -145,41 +148,62 @@ void FunctionsWGL::initialize(HMODULE glModule, HDC context)
>     // Load the wgl extension functions by checking if the context supports the extension first
> 
>     // WGL_ARB_create_context
>-    GetWGLExtensionProcAddress(glModule, getProcAddress, extensions, "WGL_ARB_create_context", "wglCreateContextAttribsARB", &createContextAttribsARB);
>+    GetWGLExtensionProcAddress(glModule, getProcAddress, extensions, "WGL_ARB_create_context",
>+                               "wglCreateContextAttribsARB", &createContextAttribsARB);
> 
>     // WGL_ARB_pixel_format
>-    GetWGLExtensionProcAddress(glModule, getProcAddress, extensions, "WGL_ARB_pixel_format", "wglGetPixelFormatAttribivARB", &getPixelFormatAttribivARB);
>-    GetWGLExtensionProcAddress(glModule, getProcAddress, extensions, "WGL_ARB_pixel_format", "wglGetPixelFormatAttribfvARB", &getPixelFormatAttribfvARB);
>-    GetWGLExtensionProcAddress(glModule, getProcAddress, extensions, "WGL_ARB_pixel_format", "wglChoosePixelFormatARB", &choosePixelFormatARB);
>+    GetWGLExtensionProcAddress(glModule, getProcAddress, extensions, "WGL_ARB_pixel_format",
>+                               "wglGetPixelFormatAttribivARB", &getPixelFormatAttribivARB);
>+    GetWGLExtensionProcAddress(glModule, getProcAddress, extensions, "WGL_ARB_pixel_format",
>+                               "wglGetPixelFormatAttribfvARB", &getPixelFormatAttribfvARB);
>+    GetWGLExtensionProcAddress(glModule, getProcAddress, extensions, "WGL_ARB_pixel_format",
>+                               "wglChoosePixelFormatARB", &choosePixelFormatARB);
> 
>     // WGL_EXT_swap_control
>-    GetWGLExtensionProcAddress(glModule, getProcAddress, extensions, "WGL_EXT_swap_control", "wglSwapIntervalEXT", &swapIntervalEXT);
>+    GetWGLExtensionProcAddress(glModule, getProcAddress, extensions, "WGL_EXT_swap_control",
>+                               "wglSwapIntervalEXT", &swapIntervalEXT);
> 
>     // WGL_ARB_pbuffer
>-    GetWGLExtensionProcAddress(glModule, getProcAddress, extensions, "WGL_ARB_pbuffer", "wglCreatePbufferARB", &createPbufferARB);
>-    GetWGLExtensionProcAddress(glModule, getProcAddress, extensions, "WGL_ARB_pbuffer", "wglGetPbufferDCARB", &getPbufferDCARB);
>-    GetWGLExtensionProcAddress(glModule, getProcAddress, extensions, "WGL_ARB_pbuffer", "wglReleasePbufferDCARB", &releasePbufferDCARB);
>-    GetWGLExtensionProcAddress(glModule, getProcAddress, extensions, "WGL_ARB_pbuffer", "wglDestroyPbufferARB", &destroyPbufferARB);
>-    GetWGLExtensionProcAddress(glModule, getProcAddress, extensions, "WGL_ARB_pbuffer", "wglQueryPbufferARB", &queryPbufferARB);
>+    GetWGLExtensionProcAddress(glModule, getProcAddress, extensions, "WGL_ARB_pbuffer",
>+                               "wglCreatePbufferARB", &createPbufferARB);
>+    GetWGLExtensionProcAddress(glModule, getProcAddress, extensions, "WGL_ARB_pbuffer",
>+                               "wglGetPbufferDCARB", &getPbufferDCARB);
>+    GetWGLExtensionProcAddress(glModule, getProcAddress, extensions, "WGL_ARB_pbuffer",
>+                               "wglReleasePbufferDCARB", &releasePbufferDCARB);
>+    GetWGLExtensionProcAddress(glModule, getProcAddress, extensions, "WGL_ARB_pbuffer",
>+                               "wglDestroyPbufferARB", &destroyPbufferARB);
>+    GetWGLExtensionProcAddress(glModule, getProcAddress, extensions, "WGL_ARB_pbuffer",
>+                               "wglQueryPbufferARB", &queryPbufferARB);
> 
>     // WGL_ARB_render_texture
>-    GetWGLExtensionProcAddress(glModule, getProcAddress, extensions, "WGL_ARB_render_texture", "wglBindTexImageARB", &bindTexImageARB);
>-    GetWGLExtensionProcAddress(glModule, getProcAddress, extensions, "WGL_ARB_render_texture", "wglReleaseTexImageARB", &releaseTexImageARB);
>-    GetWGLExtensionProcAddress(glModule, getProcAddress, extensions, "WGL_ARB_render_texture", "wglSetPbufferAttribARB", &setPbufferAttribARB);
>+    GetWGLExtensionProcAddress(glModule, getProcAddress, extensions, "WGL_ARB_render_texture",
>+                               "wglBindTexImageARB", &bindTexImageARB);
>+    GetWGLExtensionProcAddress(glModule, getProcAddress, extensions, "WGL_ARB_render_texture",
>+                               "wglReleaseTexImageARB", &releaseTexImageARB);
>+    GetWGLExtensionProcAddress(glModule, getProcAddress, extensions, "WGL_ARB_render_texture",
>+                               "wglSetPbufferAttribARB", &setPbufferAttribARB);
> 
>     // WGL_NV_DX_interop
>-    GetWGLExtensionProcAddress(glModule, getProcAddress, extensions, "WGL_NV_DX_interop", "wglDXSetResourceShareHandleNV", &dxSetResourceShareHandleNV);
>-    GetWGLExtensionProcAddress(glModule, getProcAddress, extensions, "WGL_NV_DX_interop", "wglDXOpenDeviceNV", &dxOpenDeviceNV);
>-    GetWGLExtensionProcAddress(glModule, getProcAddress, extensions, "WGL_NV_DX_interop", "wglDXCloseDeviceNV", &dxCloseDeviceNV);
>-    GetWGLExtensionProcAddress(glModule, getProcAddress, extensions, "WGL_NV_DX_interop", "wglDXRegisterObjectNV", &dxRegisterObjectNV);
>-    GetWGLExtensionProcAddress(glModule, getProcAddress, extensions, "WGL_NV_DX_interop", "wglDXUnregisterObjectNV", &dxUnregisterObjectNV);
>-    GetWGLExtensionProcAddress(glModule, getProcAddress, extensions, "WGL_NV_DX_interop", "wglDXObjectAccessNV", &dxObjectAccessNV);
>-    GetWGLExtensionProcAddress(glModule, getProcAddress, extensions, "WGL_NV_DX_interop", "wglDXLockObjectsNV", &dxLockObjectsNV);
>-    GetWGLExtensionProcAddress(glModule, getProcAddress, extensions, "WGL_NV_DX_interop", "wglDXUnlockObjectsNV", &dxUnlockObjectsNV);
>+    GetWGLExtensionProcAddress(glModule, getProcAddress, extensions, "WGL_NV_DX_interop",
>+                               "wglDXSetResourceShareHandleNV", &dxSetResourceShareHandleNV);
>+    GetWGLExtensionProcAddress(glModule, getProcAddress, extensions, "WGL_NV_DX_interop",
>+                               "wglDXOpenDeviceNV", &dxOpenDeviceNV);
>+    GetWGLExtensionProcAddress(glModule, getProcAddress, extensions, "WGL_NV_DX_interop",
>+                               "wglDXCloseDeviceNV", &dxCloseDeviceNV);
>+    GetWGLExtensionProcAddress(glModule, getProcAddress, extensions, "WGL_NV_DX_interop",
>+                               "wglDXRegisterObjectNV", &dxRegisterObjectNV);
>+    GetWGLExtensionProcAddress(glModule, getProcAddress, extensions, "WGL_NV_DX_interop",
>+                               "wglDXUnregisterObjectNV", &dxUnregisterObjectNV);
>+    GetWGLExtensionProcAddress(glModule, getProcAddress, extensions, "WGL_NV_DX_interop",
>+                               "wglDXObjectAccessNV", &dxObjectAccessNV);
>+    GetWGLExtensionProcAddress(glModule, getProcAddress, extensions, "WGL_NV_DX_interop",
>+                               "wglDXLockObjectsNV", &dxLockObjectsNV);
>+    GetWGLExtensionProcAddress(glModule, getProcAddress, extensions, "WGL_NV_DX_interop",
>+                               "wglDXUnlockObjectsNV", &dxUnlockObjectsNV);
> }
> 
> bool FunctionsWGL::hasExtension(const std::string &ext) const
> {
>     return std::find(extensions.begin(), extensions.end(), ext) != extensions.end();
> }
>-}
>+}  // namespace rx
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/wgl/FunctionsWGL.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/wgl/FunctionsWGL.h
>index 9f09f621590..d3b1611c172 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/wgl/FunctionsWGL.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/wgl/FunctionsWGL.h
>@@ -90,6 +90,6 @@ class FunctionsWGL : angle::NonCopyable
>     PFNWGLDXUNLOCKOBJECTSNVPROC dxUnlockObjectsNV;
> };
> 
>-}
>+}  // namespace rx
> 
>-#endif // LIBANGLE_RENDERER_GL_WGL_FUNCTIONS_WGL
>+#endif  // LIBANGLE_RENDERER_GL_WGL_FUNCTIONS_WGL
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/wgl/PbufferSurfaceWGL.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/wgl/PbufferSurfaceWGL.cpp
>index 61b6228389a..2b9ecdf1881 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/wgl/PbufferSurfaceWGL.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/wgl/PbufferSurfaceWGL.cpp
>@@ -17,7 +17,6 @@ namespace rx
> {
> 
> PbufferSurfaceWGL::PbufferSurfaceWGL(const egl::SurfaceState &state,
>-                                     RendererGL *renderer,
>                                      EGLint width,
>                                      EGLint height,
>                                      EGLenum textureFormat,
>@@ -26,7 +25,7 @@ PbufferSurfaceWGL::PbufferSurfaceWGL(const egl::SurfaceState &state,
>                                      int pixelFormat,
>                                      HDC deviceContext,
>                                      const FunctionsWGL *functions)
>-    : SurfaceWGL(state, renderer),
>+    : SurfaceWGL(state),
>       mWidth(width),
>       mHeight(height),
>       mLargest(largest),
>@@ -37,8 +36,7 @@ PbufferSurfaceWGL::PbufferSurfaceWGL(const egl::SurfaceState &state,
>       mPbuffer(nullptr),
>       mPbufferDeviceContext(nullptr),
>       mFunctionsWGL(functions)
>-{
>-}
>+{}
> 
> PbufferSurfaceWGL::~PbufferSurfaceWGL()
> {
>@@ -53,10 +51,15 @@ static int GetWGLTextureType(EGLenum eglTextureType)
> {
>     switch (eglTextureType)
>     {
>-      case EGL_NO_TEXTURE:    return WGL_NO_TEXTURE_ARB;
>-      case EGL_TEXTURE_RGB:   return WGL_TEXTURE_RGB_ARB;
>-      case EGL_TEXTURE_RGBA:  return WGL_TEXTURE_RGBA_ARB;
>-      default: UNREACHABLE(); return 0;
>+        case EGL_NO_TEXTURE:
>+            return WGL_NO_TEXTURE_ARB;
>+        case EGL_TEXTURE_RGB:
>+            return WGL_TEXTURE_RGB_ARB;
>+        case EGL_TEXTURE_RGBA:
>+            return WGL_TEXTURE_RGBA_ARB;
>+        default:
>+            UNREACHABLE();
>+            return 0;
>     }
> }
> 
>@@ -64,20 +67,27 @@ static int GetWGLTextureTarget(EGLenum eglTextureTarget)
> {
>     switch (eglTextureTarget)
>     {
>-      case EGL_NO_TEXTURE:    return WGL_NO_TEXTURE_ARB;
>-      case EGL_TEXTURE_2D:    return WGL_TEXTURE_2D_ARB;
>-      default: UNREACHABLE(); return 0;
>+        case EGL_NO_TEXTURE:
>+            return WGL_NO_TEXTURE_ARB;
>+        case EGL_TEXTURE_2D:
>+            return WGL_TEXTURE_2D_ARB;
>+        default:
>+            UNREACHABLE();
>+            return 0;
>     }
> }
> 
> egl::Error PbufferSurfaceWGL::initialize(const egl::Display *display)
> {
>-    const int pbufferCreationAttributes[] =
>-    {
>-        WGL_PBUFFER_LARGEST_ARB, mLargest ? 1 : 0,
>-        WGL_TEXTURE_FORMAT_ARB, GetWGLTextureType(mTextureFormat),
>-        WGL_TEXTURE_TARGET_ARB, GetWGLTextureTarget(mTextureTarget),
>-        0, 0,
>+    const int pbufferCreationAttributes[] = {
>+        WGL_PBUFFER_LARGEST_ARB,
>+        mLargest ? 1 : 0,
>+        WGL_TEXTURE_FORMAT_ARB,
>+        GetWGLTextureType(mTextureFormat),
>+        WGL_TEXTURE_TARGET_ARB,
>+        GetWGLTextureTarget(mTextureTarget),
>+        0,
>+        0,
>     };
> 
>     mPbuffer = mFunctionsWGL->createPbufferARB(mParentDeviceContext, mPixelFormat, mWidth, mHeight,
>@@ -112,7 +122,7 @@ egl::Error PbufferSurfaceWGL::initialize(const egl::Display *display)
>     return egl::NoError();
> }
> 
>-egl::Error PbufferSurfaceWGL::makeCurrent()
>+egl::Error PbufferSurfaceWGL::makeCurrent(const gl::Context *context)
> {
>     return egl::NoError();
> }
>@@ -141,12 +151,17 @@ static int GetWGLBufferBindTarget(EGLint buffer)
> {
>     switch (buffer)
>     {
>-      case EGL_BACK_BUFFER:   return WGL_BACK_LEFT_ARB;
>-      default: UNREACHABLE(); return 0;
>+        case EGL_BACK_BUFFER:
>+            return WGL_BACK_LEFT_ARB;
>+        default:
>+            UNREACHABLE();
>+            return 0;
>     }
> }
> 
>-egl::Error PbufferSurfaceWGL::bindTexImage(gl::Texture *texture, EGLint buffer)
>+egl::Error PbufferSurfaceWGL::bindTexImage(const gl::Context *context,
>+                                           gl::Texture *texture,
>+                                           EGLint buffer)
> {
>     if (!mFunctionsWGL->bindTexImageARB(mPbuffer, GetWGLBufferBindTarget(buffer)))
>     {
>@@ -158,7 +173,7 @@ egl::Error PbufferSurfaceWGL::bindTexImage(gl::Texture *texture, EGLint buffer)
>     return egl::NoError();
> }
> 
>-egl::Error PbufferSurfaceWGL::releaseTexImage(EGLint buffer)
>+egl::Error PbufferSurfaceWGL::releaseTexImage(const gl::Context *context, EGLint buffer)
> {
>     if (!mFunctionsWGL->releaseTexImageARB(mPbuffer, GetWGLBufferBindTarget(buffer)))
>     {
>@@ -170,9 +185,7 @@ egl::Error PbufferSurfaceWGL::releaseTexImage(EGLint buffer)
>     return egl::NoError();
> }
> 
>-void PbufferSurfaceWGL::setSwapInterval(EGLint interval)
>-{
>-}
>+void PbufferSurfaceWGL::setSwapInterval(EGLint interval) {}
> 
> EGLint PbufferSurfaceWGL::getWidth() const
> {
>@@ -198,4 +211,4 @@ HDC PbufferSurfaceWGL::getDC() const
> {
>     return mPbufferDeviceContext;
> }
>-}
>+}  // namespace rx
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/wgl/PbufferSurfaceWGL.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/wgl/PbufferSurfaceWGL.h
>index a60f14d9886..06b0251c764 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/wgl/PbufferSurfaceWGL.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/wgl/PbufferSurfaceWGL.h
>@@ -22,7 +22,6 @@ class PbufferSurfaceWGL : public SurfaceWGL
> {
>   public:
>     PbufferSurfaceWGL(const egl::SurfaceState &state,
>-                      RendererGL *renderer,
>                       EGLint width,
>                       EGLint height,
>                       EGLenum textureFormat,
>@@ -34,7 +33,7 @@ class PbufferSurfaceWGL : public SurfaceWGL
>     ~PbufferSurfaceWGL() override;
> 
>     egl::Error initialize(const egl::Display *display) override;
>-    egl::Error makeCurrent() override;
>+    egl::Error makeCurrent(const gl::Context *context) override;
> 
>     egl::Error swap(const gl::Context *context) override;
>     egl::Error postSubBuffer(const gl::Context *context,
>@@ -43,8 +42,10 @@ class PbufferSurfaceWGL : public SurfaceWGL
>                              EGLint width,
>                              EGLint height) override;
>     egl::Error querySurfacePointerANGLE(EGLint attribute, void **value) override;
>-    egl::Error bindTexImage(gl::Texture *texture, EGLint buffer) override;
>-    egl::Error releaseTexImage(EGLint buffer) override;
>+    egl::Error bindTexImage(const gl::Context *context,
>+                            gl::Texture *texture,
>+                            EGLint buffer) override;
>+    egl::Error releaseTexImage(const gl::Context *context, EGLint buffer) override;
>     void setSwapInterval(EGLint interval) override;
> 
>     EGLint getWidth() const override;
>@@ -72,6 +73,6 @@ class PbufferSurfaceWGL : public SurfaceWGL
>     const FunctionsWGL *mFunctionsWGL;
> };
> 
>-}
>+}  // namespace rx
> 
>-#endif // LIBANGLE_RENDERER_GL_WGL_PBUFFERSURFACEWGL_H_
>+#endif  // LIBANGLE_RENDERER_GL_WGL_PBUFFERSURFACEWGL_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/wgl/RendererWGL.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/wgl/RendererWGL.cpp
>new file mode 100644
>index 00000000000..ce15031d919
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/wgl/RendererWGL.cpp
>@@ -0,0 +1,47 @@
>+//
>+// Copyright (c) 2018 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+
>+#include "libANGLE/renderer/gl/wgl/RendererWGL.h"
>+
>+#include "libANGLE/renderer/gl/wgl/DisplayWGL.h"
>+
>+namespace rx
>+{
>+
>+RendererWGL::RendererWGL(std::unique_ptr<FunctionsGL> functionsGL,
>+                         const egl::AttributeMap &attribMap,
>+                         DisplayWGL *display,
>+                         HGLRC context,
>+                         HGLRC sharedContext,
>+                         const std::vector<int> workerContextAttribs)
>+    : RendererGL(std::move(functionsGL), attribMap),
>+      mDisplay(display),
>+      mContext(context),
>+      mSharedContext(sharedContext),
>+      mWorkerContextAttribs(workerContextAttribs)
>+{}
>+
>+RendererWGL::~RendererWGL()
>+{
>+    if (mSharedContext != nullptr)
>+    {
>+        mDisplay->destroyNativeContext(mSharedContext);
>+    }
>+    mDisplay->destroyNativeContext(mContext);
>+    mContext = nullptr;
>+}
>+
>+HGLRC RendererWGL::getContext() const
>+{
>+    return mContext;
>+}
>+
>+WorkerContext *RendererWGL::createWorkerContext(std::string *infoLog)
>+{
>+    return mDisplay->createWorkerContext(infoLog, mSharedContext, mWorkerContextAttribs);
>+}
>+
>+}  // namespace rx
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/wgl/RendererWGL.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/wgl/RendererWGL.h
>new file mode 100644
>index 00000000000..25aa4dce272
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/wgl/RendererWGL.h
>@@ -0,0 +1,41 @@
>+//
>+// Copyright (c) 2018 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+
>+// RendererWGL.h: Renderer class for GL on Windows.  Owns a WGL context object.
>+
>+#ifndef LIBANGLE_RENDERER_GL_WGL_RENDERERWGL_H_
>+#define LIBANGLE_RENDERER_GL_WGL_RENDERERWGL_H_
>+
>+#include "libANGLE/renderer/gl/RendererGL.h"
>+#include "libANGLE/renderer/gl/wgl/FunctionsWGL.h"
>+
>+namespace rx
>+{
>+class DisplayWGL;
>+
>+class RendererWGL : public RendererGL
>+{
>+  public:
>+    RendererWGL(std::unique_ptr<FunctionsGL> functionsGL,
>+                const egl::AttributeMap &attribMap,
>+                DisplayWGL *display,
>+                HGLRC context,
>+                HGLRC sharedContext,
>+                const std::vector<int> workerContextAttribs);
>+    ~RendererWGL() override;
>+
>+    HGLRC getContext() const;
>+
>+  private:
>+    WorkerContext *createWorkerContext(std::string *infoLog) override;
>+    DisplayWGL *mDisplay;
>+    HGLRC mContext;
>+    HGLRC mSharedContext;
>+    const std::vector<int> mWorkerContextAttribs;
>+};
>+}  // namespace rx
>+
>+#endif  // LIBANGLE_RENDERER_GL_WGL_RENDERERWGL_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/wgl/SurfaceWGL.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/wgl/SurfaceWGL.h
>index 98623ffe3fe..d731ff7bb23 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/wgl/SurfaceWGL.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/wgl/SurfaceWGL.h
>@@ -16,7 +16,7 @@ namespace rx
> class SurfaceWGL : public SurfaceGL
> {
>   public:
>-    SurfaceWGL(const egl::SurfaceState &state, RendererGL *renderer) : SurfaceGL(state, renderer) {}
>+    SurfaceWGL(const egl::SurfaceState &state) : SurfaceGL(state) {}
> 
>     ~SurfaceWGL() override {}
> 
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/wgl/WindowSurfaceWGL.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/wgl/WindowSurfaceWGL.cpp
>index 2d43e692e77..4f3108bad1c 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/wgl/WindowSurfaceWGL.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/wgl/WindowSurfaceWGL.cpp
>@@ -17,12 +17,11 @@ namespace rx
> {
> 
> WindowSurfaceWGL::WindowSurfaceWGL(const egl::SurfaceState &state,
>-                                   RendererGL *renderer,
>                                    EGLNativeWindowType window,
>                                    int pixelFormat,
>                                    const FunctionsWGL *functions,
>                                    EGLint orientation)
>-    : SurfaceWGL(state, renderer),
>+    : SurfaceWGL(state),
>       mPixelFormat(pixelFormat),
>       mWindow(window),
>       mDeviceContext(nullptr),
>@@ -49,12 +48,14 @@ egl::Error WindowSurfaceWGL::initialize(const egl::Display *display)
>                << gl::FmtErr(GetLastError());
>     }
> 
>-    // Require that the pixel format for this window has not been set yet or is equal to the Display's pixel format.
>+    // Require that the pixel format for this window has not been set yet or is equal to the
>+    // Display's pixel format.
>     int windowPixelFormat = GetPixelFormat(mDeviceContext);
>     if (windowPixelFormat == 0)
>     {
>-        PIXELFORMATDESCRIPTOR pixelFormatDescriptor = { 0 };
>-        if (!DescribePixelFormat(mDeviceContext, mPixelFormat, sizeof(pixelFormatDescriptor), &pixelFormatDescriptor))
>+        PIXELFORMATDESCRIPTOR pixelFormatDescriptor = {0};
>+        if (!DescribePixelFormat(mDeviceContext, mPixelFormat, sizeof(pixelFormatDescriptor),
>+                                 &pixelFormatDescriptor))
>         {
>             return egl::EglBadNativeWindow()
>                    << "Failed to DescribePixelFormat, " << gl::FmtErr(GetLastError());
>@@ -91,7 +92,7 @@ egl::Error WindowSurfaceWGL::initialize(const egl::Display *display)
>     return egl::NoError();
> }
> 
>-egl::Error WindowSurfaceWGL::makeCurrent()
>+egl::Error WindowSurfaceWGL::makeCurrent(const gl::Context *context)
> {
>     return egl::NoError();
> }
>@@ -123,13 +124,15 @@ egl::Error WindowSurfaceWGL::querySurfacePointerANGLE(EGLint attribute, void **v
>     return egl::NoError();
> }
> 
>-egl::Error WindowSurfaceWGL::bindTexImage(gl::Texture *texture, EGLint buffer)
>+egl::Error WindowSurfaceWGL::bindTexImage(const gl::Context *context,
>+                                          gl::Texture *texture,
>+                                          EGLint buffer)
> {
>     UNIMPLEMENTED();
>     return egl::NoError();
> }
> 
>-egl::Error WindowSurfaceWGL::releaseTexImage(EGLint buffer)
>+egl::Error WindowSurfaceWGL::releaseTexImage(const gl::Context *context, EGLint buffer)
> {
>     UNIMPLEMENTED();
>     return egl::NoError();
>@@ -179,4 +182,4 @@ HDC WindowSurfaceWGL::getDC() const
> {
>     return mDeviceContext;
> }
>-}
>+}  // namespace rx
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/wgl/WindowSurfaceWGL.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/wgl/WindowSurfaceWGL.h
>index cda22257a74..26b003ce06e 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/wgl/WindowSurfaceWGL.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/wgl/WindowSurfaceWGL.h
>@@ -22,7 +22,6 @@ class WindowSurfaceWGL : public SurfaceWGL
> {
>   public:
>     WindowSurfaceWGL(const egl::SurfaceState &state,
>-                     RendererGL *renderer,
>                      EGLNativeWindowType window,
>                      int pixelFormat,
>                      const FunctionsWGL *functions,
>@@ -30,7 +29,7 @@ class WindowSurfaceWGL : public SurfaceWGL
>     ~WindowSurfaceWGL() override;
> 
>     egl::Error initialize(const egl::Display *display) override;
>-    egl::Error makeCurrent() override;
>+    egl::Error makeCurrent(const gl::Context *context) override;
> 
>     egl::Error swap(const gl::Context *context) override;
>     egl::Error postSubBuffer(const gl::Context *context,
>@@ -39,8 +38,10 @@ class WindowSurfaceWGL : public SurfaceWGL
>                              EGLint width,
>                              EGLint height) override;
>     egl::Error querySurfacePointerANGLE(EGLint attribute, void **value) override;
>-    egl::Error bindTexImage(gl::Texture *texture, EGLint buffer) override;
>-    egl::Error releaseTexImage(EGLint buffer) override;
>+    egl::Error bindTexImage(const gl::Context *context,
>+                            gl::Texture *texture,
>+                            EGLint buffer) override;
>+    egl::Error releaseTexImage(const gl::Context *context, EGLint buffer) override;
>     void setSwapInterval(EGLint interval) override;
> 
>     EGLint getWidth() const override;
>@@ -62,6 +63,6 @@ class WindowSurfaceWGL : public SurfaceWGL
>     EGLint mSwapBehavior;
> };
> 
>-}
>+}  // namespace rx
> 
>-#endif // LIBANGLE_RENDERER_GL_WGL_WINDOWSURFACEWGL_H_
>+#endif  // LIBANGLE_RENDERER_GL_WGL_WINDOWSURFACEWGL_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/wgl/functionswgl_typedefs.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/wgl/functionswgl_typedefs.h
>index c4b79ee0250..a411dcb62d6 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/wgl/functionswgl_typedefs.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/wgl/functionswgl_typedefs.h
>@@ -11,7 +11,9 @@
> 
> #include "common/platform.h"
> 
>+// This header must be included before wglext.h.
> #include <angle_gl.h>
>+
> #include <GL/wglext.h>
> 
> namespace rx
>@@ -29,8 +31,22 @@ typedef BOOL(WINAPI *PFNWGLSHARELISTSPROC)(HGLRC, HGLRC);
> typedef BOOL(WINAPI *PFNWGLUSEFONTBITMAPSAPROC)(HDC, DWORD, DWORD, DWORD);
> typedef BOOL(WINAPI *PFNWGLUSEFONTBITMAPSWPROC)(HDC, DWORD, DWORD, DWORD);
> typedef BOOL(WINAPI *PFNSWAPBUFFERSPROC)(HDC);
>-typedef BOOL(WINAPI *PFNWGLUSEFONTOUTLINESAPROC)(HDC, DWORD, DWORD, DWORD, FLOAT, FLOAT, int, LPGLYPHMETRICSFLOAT);
>-typedef BOOL(WINAPI *PFNWGLUSEFONTOUTLINESWPROC)(HDC, DWORD, DWORD, DWORD, FLOAT, FLOAT, int, LPGLYPHMETRICSFLOAT);
>+typedef BOOL(WINAPI *PFNWGLUSEFONTOUTLINESAPROC)(HDC,
>+                                                 DWORD,
>+                                                 DWORD,
>+                                                 DWORD,
>+                                                 FLOAT,
>+                                                 FLOAT,
>+                                                 int,
>+                                                 LPGLYPHMETRICSFLOAT);
>+typedef BOOL(WINAPI *PFNWGLUSEFONTOUTLINESWPROC)(HDC,
>+                                                 DWORD,
>+                                                 DWORD,
>+                                                 DWORD,
>+                                                 FLOAT,
>+                                                 FLOAT,
>+                                                 int,
>+                                                 LPGLYPHMETRICSFLOAT);
> typedef BOOL(WINAPI *PFNWGLDESCRIBELAYERPLANEPROC)(HDC, int, int, UINT, LPLAYERPLANEDESCRIPTOR);
> typedef int(WINAPI *PFNWGLSETLAYERPALETTEENTRIESPROC)(HDC, int, int, int, CONST COLORREF *);
> typedef int(WINAPI *PFNWGLGETLAYERPALETTEENTRIESPROC)(HDC, int, int, int, COLORREF *);
>@@ -38,6 +54,6 @@ typedef BOOL(WINAPI *PFNWGLREALIZELAYERPALETTEPROC)(HDC, int, BOOL);
> typedef BOOL(WINAPI *PFNWGLSWAPLAYERBUFFERSPROC)(HDC, UINT);
> typedef DWORD(WINAPI *PFNWGLSWAPMULTIPLEBUFFERSPROC)(UINT, CONST WGLSWAP *);
> 
>-}
>+}  // namespace rx
> 
>-#endif // LIBANGLE_RENDERER_GL_WGL_FUNCTIONSWGLTYPEDEFS_H_
>+#endif  // LIBANGLE_RENDERER_GL_WGL_FUNCTIONSWGLTYPEDEFS_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/wgl/wgl_utils.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/wgl/wgl_utils.cpp
>index 641c3fbc429..f5df1954d94 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/wgl/wgl_utils.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/wgl/wgl_utils.cpp
>@@ -18,16 +18,17 @@ namespace wgl
> 
> PIXELFORMATDESCRIPTOR GetDefaultPixelFormatDescriptor()
> {
>-    PIXELFORMATDESCRIPTOR pixelFormatDescriptor = { 0 };
>-    pixelFormatDescriptor.nSize = sizeof(pixelFormatDescriptor);
>-    pixelFormatDescriptor.nVersion = 1;
>-    pixelFormatDescriptor.dwFlags = PFD_DRAW_TO_WINDOW | PFD_GENERIC_ACCELERATED | PFD_SUPPORT_OPENGL | PFD_DOUBLEBUFFER;
>-    pixelFormatDescriptor.iPixelType = PFD_TYPE_RGBA;
>-    pixelFormatDescriptor.cColorBits = 24;
>-    pixelFormatDescriptor.cAlphaBits = 8;
>-    pixelFormatDescriptor.cDepthBits = 24;
>+    PIXELFORMATDESCRIPTOR pixelFormatDescriptor = {0};
>+    pixelFormatDescriptor.nSize                 = sizeof(pixelFormatDescriptor);
>+    pixelFormatDescriptor.nVersion              = 1;
>+    pixelFormatDescriptor.dwFlags =
>+        PFD_DRAW_TO_WINDOW | PFD_GENERIC_ACCELERATED | PFD_SUPPORT_OPENGL | PFD_DOUBLEBUFFER;
>+    pixelFormatDescriptor.iPixelType   = PFD_TYPE_RGBA;
>+    pixelFormatDescriptor.cColorBits   = 24;
>+    pixelFormatDescriptor.cAlphaBits   = 8;
>+    pixelFormatDescriptor.cDepthBits   = 24;
>     pixelFormatDescriptor.cStencilBits = 8;
>-    pixelFormatDescriptor.iLayerType = PFD_MAIN_PLANE;
>+    pixelFormatDescriptor.iLayerType   = PFD_MAIN_PLANE;
> 
>     return pixelFormatDescriptor;
> }
>@@ -80,6 +81,6 @@ int QueryWGLFormatAttrib(HDC dc, int format, int attribName, const FunctionsWGL
>     }
>     return result;
> }
>-}
>+}  // namespace wgl
> 
>-}
>+}  // namespace rx
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/wgl/wgl_utils.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/wgl/wgl_utils.h
>index d4914b5d399..058b21cc107 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/wgl/wgl_utils.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/wgl/wgl_utils.h
>@@ -25,8 +25,8 @@ PIXELFORMATDESCRIPTOR GetDefaultPixelFormatDescriptor();
> std::vector<int> GetDefaultPixelFormatAttributes(bool preservedSwap);
> 
> int QueryWGLFormatAttrib(HDC dc, int format, int attribName, const FunctionsWGL *functions);
>-}
>+}  // namespace wgl
> 
>-}
>+}  // namespace rx
> 
>-#endif // LIBANGLE_RENDERER_GL_WGL_WGLUTILS_H_
>+#endif  // LIBANGLE_RENDERER_GL_WGL_WGLUTILS_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/load_functions_data.json b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/load_functions_data.json
>index 198274998cf..94dba5dcb70 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/load_functions_data.json
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/load_functions_data.json
>@@ -32,16 +32,25 @@
>   "GL_COMPRESSED_SRGB8_ALPHA8_ETC2_EAC": {
>     "R8G8B8A8_UNORM_SRGB": {
>       "GL_UNSIGNED_BYTE": "LoadETC2SRGBA8ToSRGBA8"
>+    },
>+    "ETC2_R8G8B8A8_SRGB_BLOCK": {
>+      "GL_UNSIGNED_BYTE": "LoadCompressedToNative<4, 4, 16>"
>     }
>   },
>   "GL_COMPRESSED_RGB8_PUNCHTHROUGH_ALPHA1_ETC2": {
>     "R8G8B8A8_UNORM": {
>       "GL_UNSIGNED_BYTE": "LoadETC2RGB8A1ToRGBA8"
>+    },
>+    "ETC2_R8G8B8A1_UNORM_BLOCK": {
>+      "GL_UNSIGNED_BYTE": "LoadCompressedToNative<4, 4, 8>"
>     }
>   },
>   "GL_RGB32UI": {
>     "R32G32B32A32_UINT": {
>       "GL_UNSIGNED_INT": "LoadToNative3To4<GLuint, 0x00000001>"
>+    },
>+    "R32G32B32_UINT": {
>+      "GL_UNSIGNED_INT": "LoadToNative<GLuint, 3>"
>     }
>   },
>   "GL_ALPHA32F_EXT": {
>@@ -63,8 +72,11 @@
>     }
>   },
>   "GL_COMPRESSED_R11_EAC": {
>-    "R8_UNORM": {
>-      "GL_UNSIGNED_BYTE": "LoadEACR11ToR8"
>+    "R16_UNORM": {
>+      "GL_UNSIGNED_BYTE": "LoadEACR11ToR16"
>+    },
>+    "EAC_R11_UNORM_BLOCK": {
>+      "GL_UNSIGNED_BYTE": "LoadCompressedToNative<4, 4, 8>"
>     }
>   },
>   "GL_RGBA32UI": {
>@@ -85,6 +97,9 @@
>   "GL_COMPRESSED_SRGB8_PUNCHTHROUGH_ALPHA1_ETC2": {
>     "R8G8B8A8_UNORM_SRGB": {
>       "GL_UNSIGNED_BYTE": "LoadETC2SRGB8A1ToRGBA8"
>+    },
>+    "ETC2_R8G8B8A1_SRGB_BLOCK": {
>+      "GL_UNSIGNED_BYTE": "LoadCompressedToNative<4, 4, 8>"
>     }
>   },
>   "GL_R16F": {
>@@ -99,12 +114,6 @@
>       "GL_UNSIGNED_BYTE": "LoadToNative<GLubyte, 4>"
>     }
>   },
>-  "GL_BGRA4_ANGLEX": {
>-    "NONE": {
>-      "GL_UNSIGNED_SHORT_4_4_4_4_REV_EXT": "LoadRGBA4ToRGBA8",
>-      "GL_UNSIGNED_BYTE": "LoadToNative<GLubyte, 4>"
>-    }
>-  },
>   "GL_RGBA16F": {
>     "R16G16B16A16_FLOAT": {
>       "GL_HALF_FLOAT": "LoadToNative<GLhalf, 4>",
>@@ -113,7 +122,10 @@
>     }
>   },
>   "GL_LUMINANCE8_EXT": {
>-    "NONE": {
>+    "R8_UNORM": {
>+      "GL_UNSIGNED_BYTE": "LoadToNative<GLubyte, 1>"
>+    },
>+    "R8G8B8A8_UNORM": {
>       "GL_UNSIGNED_BYTE": "LoadL8ToRGBA8"
>     }
>   },
>@@ -129,6 +141,9 @@
>     }
>   },
>   "GL_RGB5_A1": {
>+    "A1R5G5B5_UNORM": {
>+      "GL_UNSIGNED_SHORT_5_5_5_1": "LoadRGB5A1ToA1RGB5"
>+    },
>     "R8G8B8A8_UNORM": {
>       "GL_UNSIGNED_INT_2_10_10_10_REV": "LoadRGB10A2ToRGBA8",
>       "GL_UNSIGNED_BYTE": "LoadToNative<GLubyte, 4>",
>@@ -143,6 +158,9 @@
>   "GL_RGB16UI": {
>     "R16G16B16A16_UINT": {
>       "GL_UNSIGNED_SHORT": "LoadToNative3To4<GLushort, 0x0001>"
>+    },
>+    "R16G16B16_UINT": {
>+      "GL_UNSIGNED_SHORT": "LoadToNative<GLushort, 3>"
>     }
>   },
>   "GL_BGRA_EXT": {
>@@ -153,6 +171,9 @@
>   "GL_COMPRESSED_RGB8_ETC2": {
>     "R8G8B8A8_UNORM": {
>       "GL_UNSIGNED_BYTE": "LoadETC2RGB8ToRGBA8"
>+    },
>+    "ETC2_R8G8B8_UNORM_BLOCK": {
>+      "GL_UNSIGNED_BYTE": "LoadCompressedToNative<4, 4, 8>"
>     }
>   },
>   "GL_RGBA32F": {
>@@ -166,7 +187,10 @@
>     }
>   },
>   "GL_LUMINANCE8_ALPHA8_EXT": {
>-    "NONE": {
>+    "R8G8_UNORM": {
>+      "GL_UNSIGNED_BYTE": "LoadToNative<GLubyte, 2>"
>+    },
>+    "R8G8B8A8_UNORM": {
>       "GL_UNSIGNED_BYTE": "LoadLA8ToRGBA8"
>     }
>   },
>@@ -181,8 +205,11 @@
>     }
>   },
>   "GL_COMPRESSED_SIGNED_RG11_EAC": {
>-    "R8G8_SNORM": {
>-      "GL_UNSIGNED_BYTE": "LoadEACRG11SToRG8"
>+    "R16G16_SNORM": {
>+      "GL_UNSIGNED_BYTE": "LoadEACRG11SToRG16"
>+    },
>+    "EAC_R11G11_SNORM_BLOCK": {
>+      "GL_UNSIGNED_BYTE": "LoadCompressedToNative<4, 4, 16>"
>     }
>   },
>   "GL_DEPTH_COMPONENT16": {
>@@ -194,6 +221,9 @@
>   "GL_RGB32I": {
>     "R32G32B32A32_SINT": {
>       "GL_INT": "LoadToNative3To4<GLint, 0x00000001>"
>+    },
>+    "R32G32B32_SINT": {
>+      "GL_INT": "LoadToNative<GLint, 3>"
>     }
>   },
>   "GL_R8": {
>@@ -204,6 +234,9 @@
>   "GL_RGB32F": {
>     "R32G32B32A32_FLOAT": {
>       "GL_FLOAT": "LoadToNative3To4<GLfloat, gl::Float32One>"
>+    },
>+    "R32G32B32_FLOAT": {
>+      "GL_FLOAT": "LoadToNative<GLfloat, 3>"
>     }
>   },
>   "GL_R11F_G11F_B10F": {
>@@ -244,6 +277,9 @@
>   "GL_RGB8_SNORM": {
>     "R8G8B8A8_SNORM": {
>       "GL_BYTE": "LoadToNative3To4<GLbyte, 0x7F>"
>+    },
>+    "R8G8B8_SNORM": {
>+      "GL_BYTE": "LoadToNative<GLbyte, 3>"
>     }
>   },
>   "GL_RG32F": {
>@@ -262,6 +298,9 @@
>     }
>   },
>   "GL_ALPHA8_EXT": {
>+    "R8_UNORM": {
>+      "GL_UNSIGNED_BYTE": "LoadToNative<GLubyte, 1>"
>+    },
>     "A8_UNORM": {
>       "GL_UNSIGNED_BYTE": "LoadToNative<GLubyte, 1>"
>     },
>@@ -282,21 +321,33 @@
>   "GL_COMPRESSED_RGBA8_ETC2_EAC": {
>     "R8G8B8A8_UNORM": {
>       "GL_UNSIGNED_BYTE": "LoadETC2RGBA8ToRGBA8"
>+    },
>+    "ETC2_R8G8B8A8_UNORM_BLOCK": {
>+      "GL_UNSIGNED_BYTE": "LoadCompressedToNative<4, 4, 16>"
>     }
>   },
>   "GL_RGB8I": {
>     "R8G8B8A8_SINT": {
>       "GL_BYTE": "LoadToNative3To4<GLbyte, 0x01>"
>+    },
>+    "R8G8B8_SINT": {
>+      "GL_BYTE": "LoadToNative<GLbyte, 3>"
>     }
>   },
>   "GL_COMPRESSED_SRGB8_ETC2": {
>     "R8G8B8A8_UNORM_SRGB": {
>       "GL_UNSIGNED_BYTE": "LoadETC2SRGB8ToRGBA8"
>+    },
>+    "ETC2_R8G8B8_SRGB_BLOCK": {
>+      "GL_UNSIGNED_BYTE": "LoadCompressedToNative<4, 4, 8>"
>     }
>   },
>   "GL_DEPTH32F_STENCIL8": {
>     "D32_FLOAT_S8X24_UINT": {
>       "GL_FLOAT_32_UNSIGNED_INT_24_8_REV": "LoadD32FS8X24ToD32FS8X24"
>+    },
>+    "D24_UNORM_S8_UINT": {
>+      "GL_FLOAT_32_UNSIGNED_INT_24_8_REV": "LoadD32FS8X24ToD24S8"
>     }
>   },
>   "GL_RG8I": {
>@@ -309,21 +360,151 @@
>       "GL_UNSIGNED_INT": "LoadToNative<GLuint, 1>"
>     }
>   },
>-  "GL_BGR5_A1_ANGLEX": {
>-    "NONE": {
>-      "GL_UNSIGNED_BYTE": "LoadToNative<GLubyte, 4>",
>-      "GL_UNSIGNED_SHORT_1_5_5_5_REV_EXT": "LoadRGB5A1ToRGBA8"
>+  "GL_BGRX8_ANGLEX" : {
>+    "B8G8R8X8_UNORM": {
>+      "GL_UNSIGNED_BYTE": "LoadToNative<GLubyte, 4>"
>+    },
>+    "B8G8R8A8_UNORM": {
>+      "GL_UNSIGNED_BYTE": "LoadToNative<GLubyte, 4>"
>     }
>   },
>   "GL_BGR565_ANGLEX": {
>     "B5G6R5_UNORM": {
>       "GL_UNSIGNED_SHORT_5_6_5": "LoadRGB565ToBGR565",
>-      "GL_UNSIGNED_BYTE": "LoadToNative<GLushort, 1>"
>+      "GL_UNSIGNED_BYTE": "LoadRGB8ToBGR565"
>+    }
>+  },
>+  "GL_BGRA4_ANGLEX": {
>+    "NONE": {
>+      "GL_UNSIGNED_SHORT_4_4_4_4_REV_EXT": "LoadRGBA4ToRGBA8",
>+      "GL_UNSIGNED_BYTE": "LoadToNative<GLubyte, 4>"
>+    }
>+  },
>+  "GL_BGR5_A1_ANGLEX": {
>+    "NONE": {
>+      "GL_UNSIGNED_BYTE": "LoadRGB5A1ToRGBA8",
>+      "GL_UNSIGNED_SHORT_1_5_5_5_REV_EXT": "LoadToNative<GLushort, 1>"
>+    }
>+  },
>+  "GL_BGRA8_SRGB_ANGLEX" : {
>+     "B8G8R8A8_UNORM_SRGB": {
>+      "GL_UNSIGNED_BYTE": "LoadToNative<GLubyte, 4>"
>+     }
>+  },
>+  "GL_A1RGB5_ANGLEX" : {
>+    "A1R5G5B5_UNORM": {
>+      "GL_UNSIGNED_BYTE": "LoadRGB5A1ToRGBA8",
>+      "GL_UNSIGNED_SHORT_1_5_5_5_REV_EXT": "LoadToNative<GLushort, 1>"
>+    }
>+  },
>+  "GL_R8_SSCALED_ANGLEX" : {
>+    "NONE": {
>+      "GL_UNSIGNED_BYTE": "UnreachableLoadFunction"
>+    }
>+  },
>+  "GL_RG8_SSCALED_ANGLEX" : {
>+    "NONE": {
>+      "GL_UNSIGNED_BYTE": "UnreachableLoadFunction"
>+    }
>+  },
>+  "GL_RGB8_SSCALED_ANGLEX" : {
>+    "NONE": {
>+      "GL_UNSIGNED_BYTE": "UnreachableLoadFunction"
>+    }
>+  },
>+  "GL_RGBA8_SSCALED_ANGLEX" : {
>+    "NONE": {
>+      "GL_UNSIGNED_BYTE": "UnreachableLoadFunction"
>+    }
>+  },
>+  "GL_R8_USCALED_ANGLEX" : {
>+    "NONE": {
>+      "GL_UNSIGNED_BYTE": "UnreachableLoadFunction"
>+    }
>+  },
>+  "GL_RG8_USCALED_ANGLEX" : {
>+    "NONE": {
>+      "GL_UNSIGNED_BYTE": "UnreachableLoadFunction"
>+    }
>+  },
>+  "GL_RGB8_USCALED_ANGLEX" : {
>+    "NONE": {
>+      "GL_UNSIGNED_BYTE": "UnreachableLoadFunction"
>+    }
>+  },
>+  "GL_RGBA8_USCALED_ANGLEX" : {
>+    "NONE": {
>+      "GL_UNSIGNED_BYTE": "UnreachableLoadFunction"
>+    }
>+  },
>+  "GL_R16_SSCALED_ANGLEX" : {
>+    "NONE": {
>+      "GL_UNSIGNED_BYTE": "UnreachableLoadFunction"
>+    }
>+  },
>+  "GL_RG16_SSCALED_ANGLEX" : {
>+    "NONE": {
>+      "GL_UNSIGNED_BYTE": "UnreachableLoadFunction"
>+    }
>+  },
>+  "GL_RGB16_SSCALED_ANGLEX" : {
>+    "NONE": {
>+      "GL_UNSIGNED_BYTE": "UnreachableLoadFunction"
>+    }
>+  },
>+  "GL_RGBA16_SSCALED_ANGLEX" : {
>+    "NONE": {
>+      "GL_UNSIGNED_BYTE": "UnreachableLoadFunction"
>+    }
>+  },
>+  "GL_R16_USCALED_ANGLEX" : {
>+    "NONE": {
>+      "GL_UNSIGNED_BYTE": "UnreachableLoadFunction"
>+    }
>+  },
>+  "GL_RG16_USCALED_ANGLEX" : {
>+    "NONE": {
>+      "GL_UNSIGNED_BYTE": "UnreachableLoadFunction"
>+    }
>+  },
>+  "GL_RGB16_USCALED_ANGLEX" : {
>+    "NONE": {
>+      "GL_UNSIGNED_BYTE": "UnreachableLoadFunction"
>+    }
>+  },
>+  "GL_RGBA16_USCALED_ANGLEX" : {
>+    "NONE": {
>+      "GL_UNSIGNED_BYTE": "UnreachableLoadFunction"
>+    }
>+  },
>+  "GL_RGB10_A2_SINT_ANGLEX" : {
>+    "R10G10B10A2_SINT": {
>+      "GL_UNSIGNED_BYTE": "LoadRGB10A2ToRGBA8",
>+      "GL_UNSIGNED_INT_2_10_10_10_REV": "LoadToNative<GLuint, 1>"
>+    }
>+  },
>+  "GL_RGB10_A2_SNORM_ANGLEX" : {
>+    "R10G10B10A2_SNORM": {
>+      "GL_UNSIGNED_BYTE": "LoadRGB10A2ToRGBA8",
>+      "GL_UNSIGNED_INT_2_10_10_10_REV": "LoadToNative<GLuint, 1>"
>+    }
>+  },
>+  "GL_RGB10_A2_SSCALED_ANGLEX" : {
>+    "NONE": {
>+      "GL_UNSIGNED_BYTE": "UnreachableLoadFunction"
>+    }
>+  },
>+  "GL_RGB10_A2_USCALED_ANGLEX" : {
>+    "NONE": {
>+      "GL_UNSIGNED_BYTE": "UnreachableLoadFunction"
>     }
>   },
>   "GL_COMPRESSED_RG11_EAC": {
>-    "R8G8_UNORM": {
>-      "GL_UNSIGNED_BYTE": "LoadEACRG11ToRG8"
>+    "R16G16_UNORM": {
>+      "GL_UNSIGNED_BYTE": "LoadEACRG11ToRG16"
>+    },
>+    "EAC_R11G11_UNORM_BLOCK": {
>+      "GL_UNSIGNED_BYTE": "LoadCompressedToNative<4, 4, 16>"
>     }
>   },
>   "GL_SRGB8_ALPHA8": {
>@@ -347,11 +528,17 @@
>   "GL_DEPTH24_STENCIL8": {
>     "D24_UNORM_S8_UINT": {
>       "GL_UNSIGNED_INT_24_8": "LoadR32ToR24G8"
>+    },
>+    "D32_FLOAT_S8X24_UINT": {
>+      "GL_UNSIGNED_INT_24_8": "LoadD24S8ToD32FS8X24"
>     }
>   },
>   "GL_RGB16I": {
>     "R16G16B16A16_SINT": {
>       "GL_SHORT": "LoadToNative3To4<GLshort, 0x0001>"
>+    },
>+    "R16G16B16_SINT": {
>+      "GL_SHORT": "LoadToNative<GLshort, 3>"
>     }
>   },
>   "GL_R8UI": {
>@@ -376,11 +563,19 @@
>       "GL_HALF_FLOAT": "LoadToNative3To4<GLhalf, gl::Float16One>",
>       "GL_FLOAT": "LoadRGB32FToRGBA16F",
>       "GL_HALF_FLOAT_OES": "LoadToNative3To4<GLhalf, gl::Float16One>"
>+    },
>+    "R16G16B16_FLOAT": {
>+      "GL_HALF_FLOAT": "LoadToNative<GLhalf, 3>",
>+      "GL_FLOAT": "LoadRGB32FToRGB16F",
>+      "GL_HALF_FLOAT_OES": "LoadToNative<GLhalf, 3>"
>     }
>   },
>   "GL_COMPRESSED_SIGNED_R11_EAC": {
>-    "R8_SNORM": {
>-      "GL_UNSIGNED_BYTE": "LoadEACR11SToR8"
>+    "R16_SNORM": {
>+      "GL_UNSIGNED_BYTE": "LoadEACR11SToR16"
>+    },
>+    "EAC_R11_SNORM_BLOCK": {
>+      "GL_UNSIGNED_BYTE": "LoadCompressedToNative<4, 4, 8>"
>     }
>   },
>   "GL_COMPRESSED_RGB_S3TC_DXT1_EXT": {
>@@ -406,11 +601,17 @@
>   "GL_RGB8UI": {
>     "R8G8B8A8_UINT": {
>       "GL_UNSIGNED_BYTE": "LoadToNative3To4<GLubyte, 0x01>"
>+    },
>+    "R8G8B8_UINT": {
>+      "GL_UNSIGNED_BYTE": "LoadToNative<GLubyte, 3>"
>     }
>   },
>   "GL_DEPTH_COMPONENT24": {
>     "D24_UNORM_S8_UINT": {
>       "GL_UNSIGNED_INT": "LoadR32ToR24G8"
>+    },
>+    "D32_FLOAT_S8X24_UINT": {
>+      "GL_UNSIGNED_INT_24_8": "LoadD24S8ToD32FS8X24"
>     }
>   },
>   "GL_R32I": {
>@@ -436,6 +637,10 @@
>     }
>   },
>   "GL_RGB565": {
>+    "R5G6B5_UNORM" : {
>+      "GL_UNSIGNED_BYTE": "LoadRGB8ToBGR565",
>+      "GL_UNSIGNED_SHORT_5_6_5": "LoadToNative<GLushort, 1>"
>+    },
>     "R8G8B8A8_UNORM": {
>       "GL_UNSIGNED_BYTE": "LoadToNative3To4<GLubyte, 0xFF>",
>       "GL_UNSIGNED_SHORT_5_6_5": "LoadR5G6B5ToRGBA8"
>@@ -512,6 +717,12 @@
>   "GL_ETC1_RGB8_OES": {
>     "R8G8B8A8_UNORM": {
>       "GL_UNSIGNED_BYTE": "LoadETC1RGB8ToRGBA8"
>+    },
>+    "ETC1_R8G8B8_UNORM_BLOCK": {
>+      "GL_UNSIGNED_BYTE": "LoadCompressedToNative<4, 4, 8>"
>+    },
>+    "ETC2_R8G8B8_UNORM_BLOCK": {
>+      "GL_UNSIGNED_BYTE": "LoadCompressedToNative<4, 4, 8>"
>     }
>   },
>   "GL_ETC1_RGB8_LOSSY_DECODE_ANGLE": {
>@@ -552,6 +763,9 @@
>   "GL_RGB16_EXT": {
>     "R16G16B16A16_UNORM": {
>       "GL_UNSIGNED_SHORT": "LoadToNative3To4<GLushort, 0xFFFF>"
>+    },
>+    "R16G16B16_UNORM": {
>+      "GL_UNSIGNED_SHORT": "LoadToNative<GLushort, 3>"
>     }
>   },
>   "GL_RGBA16_EXT": {
>@@ -572,6 +786,9 @@
>   "GL_RGB16_SNORM_EXT": {
>     "R16G16B16A16_SNORM": {
>       "GL_SHORT": "LoadToNative3To4<GLushort, 0x7FFF>"
>+    },
>+    "R16G16B16_SNORM": {
>+      "GL_SHORT": "LoadToNative<GLushort, 3>"
>     }
>   },
>   "GL_RGBA16_SNORM_EXT": {
>@@ -598,5 +815,165 @@
>     "NONE": {
>       "GL_UNSIGNED_BYTE": "LoadCompressedToNative<4, 4, 16>"
>     }
>+  },
>+  "GL_COMPRESSED_RGBA_BPTC_UNORM_EXT": {
>+    "NONE": {
>+      "GL_UNSIGNED_BYTE": "LoadCompressedToNative<4, 4, 16>"
>+    }
>+  },
>+  "GL_COMPRESSED_SRGB_ALPHA_BPTC_UNORM_EXT": {
>+    "NONE": {
>+      "GL_UNSIGNED_BYTE": "LoadCompressedToNative<4, 4, 16>"
>+    }
>+  },
>+  "GL_COMPRESSED_RGB_BPTC_SIGNED_FLOAT_EXT": {
>+    "NONE": {
>+      "GL_UNSIGNED_BYTE": "LoadCompressedToNative<4, 4, 16>"
>+    }
>+  },
>+  "GL_COMPRESSED_RGB_BPTC_UNSIGNED_FLOAT_EXT": {
>+    "NONE": {
>+      "GL_UNSIGNED_BYTE": "LoadCompressedToNative<4, 4, 16>"
>+    }
>+  },
>+  "GL_COMPRESSED_RGBA_ASTC_4x4_KHR": {
>+    "NONE": {
>+      "GL_UNSIGNED_BYTE": "LoadCompressedToNative<4, 4, 16>"
>+    }
>+  },
>+  "GL_COMPRESSED_RGBA_ASTC_5x4_KHR": {
>+    "NONE": {
>+      "GL_UNSIGNED_BYTE": "LoadCompressedToNative<5, 4, 16>"
>+    }
>+  },
>+  "GL_COMPRESSED_RGBA_ASTC_5x5_KHR": {
>+    "NONE": {
>+      "GL_UNSIGNED_BYTE": "LoadCompressedToNative<5, 5, 16>"
>+    }
>+  },
>+  "GL_COMPRESSED_RGBA_ASTC_6x5_KHR": {
>+    "NONE": {
>+      "GL_UNSIGNED_BYTE": "LoadCompressedToNative<6, 5, 16>"
>+    }
>+  },
>+  "GL_COMPRESSED_RGBA_ASTC_6x6_KHR": {
>+    "NONE": {
>+      "GL_UNSIGNED_BYTE": "LoadCompressedToNative<6, 6, 16>"
>+    }
>+  },
>+  "GL_COMPRESSED_RGBA_ASTC_8x5_KHR": {
>+    "NONE": {
>+      "GL_UNSIGNED_BYTE": "LoadCompressedToNative<8, 5, 16>"
>+    }
>+  },
>+  "GL_COMPRESSED_RGBA_ASTC_8x6_KHR": {
>+    "NONE": {
>+      "GL_UNSIGNED_BYTE": "LoadCompressedToNative<8, 6, 16>"
>+    }
>+  },
>+  "GL_COMPRESSED_RGBA_ASTC_8x8_KHR": {
>+    "NONE": {
>+      "GL_UNSIGNED_BYTE": "LoadCompressedToNative<8, 8, 16>"
>+    }
>+  },
>+  "GL_COMPRESSED_RGBA_ASTC_10x5_KHR": {
>+    "NONE": {
>+      "GL_UNSIGNED_BYTE": "LoadCompressedToNative<10, 5, 16>"
>+    }
>+  },
>+  "GL_COMPRESSED_RGBA_ASTC_10x6_KHR": {
>+    "NONE": {
>+      "GL_UNSIGNED_BYTE": "LoadCompressedToNative<10, 6, 16>"
>+    }
>+  },
>+  "GL_COMPRESSED_RGBA_ASTC_10x8_KHR": {
>+    "NONE": {
>+      "GL_UNSIGNED_BYTE": "LoadCompressedToNative<10, 8, 16>"
>+    }
>+  },
>+  "GL_COMPRESSED_RGBA_ASTC_10x10_KHR": {
>+    "NONE": {
>+      "GL_UNSIGNED_BYTE": "LoadCompressedToNative<10, 10, 16>"
>+    }
>+  },
>+  "GL_COMPRESSED_RGBA_ASTC_12x10_KHR": {
>+    "NONE": {
>+      "GL_UNSIGNED_BYTE": "LoadCompressedToNative<12, 10, 16>"
>+    }
>+  },
>+  "GL_COMPRESSED_RGBA_ASTC_12x12_KHR": {
>+    "NONE": {
>+      "GL_UNSIGNED_BYTE": "LoadCompressedToNative<12, 12, 16>"
>+    }
>+  },
>+  "GL_COMPRESSED_SRGB8_ALPHA8_ASTC_4x4_KHR": {
>+    "NONE": {
>+      "GL_UNSIGNED_BYTE": "LoadCompressedToNative<4, 4, 16>"
>+    }
>+  },
>+  "GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x4_KHR": {
>+    "NONE": {
>+      "GL_UNSIGNED_BYTE": "LoadCompressedToNative<5, 4, 16>"
>+    }
>+  },
>+  "GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x5_KHR": {
>+    "NONE": {
>+      "GL_UNSIGNED_BYTE": "LoadCompressedToNative<5, 5, 16>"
>+    }
>+  },
>+  "GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x5_KHR": {
>+    "NONE": {
>+      "GL_UNSIGNED_BYTE": "LoadCompressedToNative<6, 5, 16>"
>+    }
>+  },
>+  "GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x6_KHR": {
>+    "NONE": {
>+      "GL_UNSIGNED_BYTE": "LoadCompressedToNative<6, 6, 16>"
>+    }
>+  },
>+  "GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x5_KHR": {
>+    "NONE": {
>+      "GL_UNSIGNED_BYTE": "LoadCompressedToNative<8, 5, 16>"
>+    }
>+  },
>+  "GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x6_KHR": {
>+    "NONE": {
>+      "GL_UNSIGNED_BYTE": "LoadCompressedToNative<8, 6, 16>"
>+    }
>+  },
>+  "GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x8_KHR": {
>+    "NONE": {
>+      "GL_UNSIGNED_BYTE": "LoadCompressedToNative<8, 8, 16>"
>+    }
>+  },
>+  "GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x5_KHR": {
>+    "NONE": {
>+      "GL_UNSIGNED_BYTE": "LoadCompressedToNative<10, 5, 16>"
>+    }
>+  },
>+  "GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x6_KHR": {
>+    "NONE": {
>+      "GL_UNSIGNED_BYTE": "LoadCompressedToNative<10, 6, 16>"
>+    }
>+  },
>+  "GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x8_KHR": {
>+    "NONE": {
>+      "GL_UNSIGNED_BYTE": "LoadCompressedToNative<10, 8, 16>"
>+    }
>+  },
>+  "GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x10_KHR": {
>+    "NONE": {
>+      "GL_UNSIGNED_BYTE": "LoadCompressedToNative<10, 10, 16>"
>+    }
>+  },
>+  "GL_COMPRESSED_SRGB8_ALPHA8_ASTC_12x10_KHR": {
>+    "NONE": {
>+      "GL_UNSIGNED_BYTE": "LoadCompressedToNative<12, 10, 16>"
>+    }
>+  },
>+  "GL_COMPRESSED_SRGB8_ALPHA8_ASTC_12x12_KHR": {
>+    "NONE": {
>+      "GL_UNSIGNED_BYTE": "LoadCompressedToNative<12, 12, 16>"
>+    }
>   }
> }
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/load_functions_table.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/load_functions_table.h
>index f3da31c1000..27eaebc8e7d 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/load_functions_table.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/load_functions_table.h
>@@ -14,9 +14,7 @@
> 
> namespace angle
> {
>-
>-rx::LoadFunctionMap GetLoadFunctionsMap(GLenum internalFormat, Format::ID angleFormat);
>-
>+rx::LoadFunctionMap GetLoadFunctionsMap(GLenum internalFormat, FormatID angleFormat);
> }  // namespace angle
> 
> #endif  // LIBANGLE_RENDERER_LOADFUNCTIONSTABLE_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/load_functions_table_autogen.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/load_functions_table_autogen.cpp
>index ed9fe2864c9..30d30cedb31 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/load_functions_table_autogen.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/load_functions_table_autogen.cpp
>@@ -1,7 +1,7 @@
> // GENERATED FILE - DO NOT EDIT.
> // Generated by gen_load_functions_table.py using data from load_functions_data.json
> //
>-// Copyright 2016 The ANGLE Project Authors. All rights reserved.
>+// Copyright 2019 The ANGLE Project Authors. All rights reserved.
> // Use of this source code is governed by a BSD-style license that can be
> // found in the LICENSE file.
> //
>@@ -56,6 +56,20 @@ void UnreachableLoadFunction(size_t width,
>     UNREACHABLE();
> }
> 
>+LoadImageFunctionInfo A1RGB5_ANGLEX_to_A1R5G5B5_UNORM(GLenum type)
>+{
>+    switch (type)
>+    {
>+        case GL_UNSIGNED_BYTE:
>+            return LoadImageFunctionInfo(LoadRGB5A1ToRGBA8, true);
>+        case GL_UNSIGNED_SHORT_1_5_5_5_REV_EXT:
>+            return LoadImageFunctionInfo(LoadToNative<GLushort, 1>, false);
>+        default:
>+            UNREACHABLE();
>+            return LoadImageFunctionInfo(UnreachableLoadFunction, true);
>+    }
>+}
>+
> LoadImageFunctionInfo ALPHA_to_R16G16B16A16_FLOAT(GLenum type)
> {
>     switch (type)
>@@ -148,12 +162,24 @@ LoadImageFunctionInfo ALPHA8_EXT_to_R8G8B8A8_UNORM(GLenum type)
>     }
> }
> 
>+LoadImageFunctionInfo ALPHA8_EXT_to_R8_UNORM(GLenum type)
>+{
>+    switch (type)
>+    {
>+        case GL_UNSIGNED_BYTE:
>+            return LoadImageFunctionInfo(LoadToNative<GLubyte, 1>, false);
>+        default:
>+            UNREACHABLE();
>+            return LoadImageFunctionInfo(UnreachableLoadFunction, true);
>+    }
>+}
>+
> LoadImageFunctionInfo BGR565_ANGLEX_to_B5G6R5_UNORM(GLenum type)
> {
>     switch (type)
>     {
>         case GL_UNSIGNED_BYTE:
>-            return LoadImageFunctionInfo(LoadToNative<GLushort, 1>, false);
>+            return LoadImageFunctionInfo(LoadRGB8ToBGR565, true);
>         case GL_UNSIGNED_SHORT_5_6_5:
>             return LoadImageFunctionInfo(LoadRGB565ToBGR565, true);
>         default:
>@@ -167,9 +193,9 @@ LoadImageFunctionInfo BGR5_A1_ANGLEX_to_default(GLenum type)
>     switch (type)
>     {
>         case GL_UNSIGNED_BYTE:
>-            return LoadImageFunctionInfo(LoadToNative<GLubyte, 4>, false);
>-        case GL_UNSIGNED_SHORT_1_5_5_5_REV_EXT:
>             return LoadImageFunctionInfo(LoadRGB5A1ToRGBA8, true);
>+        case GL_UNSIGNED_SHORT_1_5_5_5_REV_EXT:
>+            return LoadImageFunctionInfo(LoadToNative<GLushort, 1>, false);
>         default:
>             UNREACHABLE();
>             return LoadImageFunctionInfo(UnreachableLoadFunction, true);
>@@ -202,104 +228,103 @@ LoadImageFunctionInfo BGRA8_EXT_to_default(GLenum type)
>     }
> }
> 
>-LoadImageFunctionInfo BGRA_EXT_to_default(GLenum type)
>+LoadImageFunctionInfo BGRA8_SRGB_ANGLEX_to_B8G8R8A8_UNORM_SRGB(GLenum type)
> {
>     switch (type)
>     {
>         case GL_UNSIGNED_BYTE:
>-            return LoadImageFunctionInfo(UnreachableLoadFunction, true);
>+            return LoadImageFunctionInfo(LoadToNative<GLubyte, 4>, false);
>         default:
>             UNREACHABLE();
>             return LoadImageFunctionInfo(UnreachableLoadFunction, true);
>     }
> }
> 
>-LoadImageFunctionInfo COMPRESSED_R11_EAC_to_R8_UNORM(GLenum type)
>+LoadImageFunctionInfo BGRA_EXT_to_default(GLenum type)
> {
>     switch (type)
>     {
>         case GL_UNSIGNED_BYTE:
>-            return LoadImageFunctionInfo(LoadEACR11ToR8, true);
>+            return LoadImageFunctionInfo(UnreachableLoadFunction, true);
>         default:
>             UNREACHABLE();
>             return LoadImageFunctionInfo(UnreachableLoadFunction, true);
>     }
> }
> 
>-LoadImageFunctionInfo COMPRESSED_RG11_EAC_to_R8G8_UNORM(GLenum type)
>+LoadImageFunctionInfo BGRX8_ANGLEX_to_B8G8R8A8_UNORM(GLenum type)
> {
>     switch (type)
>     {
>         case GL_UNSIGNED_BYTE:
>-            return LoadImageFunctionInfo(LoadEACRG11ToRG8, true);
>+            return LoadImageFunctionInfo(LoadToNative<GLubyte, 4>, false);
>         default:
>             UNREACHABLE();
>             return LoadImageFunctionInfo(UnreachableLoadFunction, true);
>     }
> }
> 
>-LoadImageFunctionInfo COMPRESSED_RGB8_ETC2_to_R8G8B8A8_UNORM(GLenum type)
>+LoadImageFunctionInfo BGRX8_ANGLEX_to_B8G8R8X8_UNORM(GLenum type)
> {
>     switch (type)
>     {
>         case GL_UNSIGNED_BYTE:
>-            return LoadImageFunctionInfo(LoadETC2RGB8ToRGBA8, true);
>+            return LoadImageFunctionInfo(LoadToNative<GLubyte, 4>, false);
>         default:
>             UNREACHABLE();
>             return LoadImageFunctionInfo(UnreachableLoadFunction, true);
>     }
> }
> 
>-LoadImageFunctionInfo COMPRESSED_RGB8_LOSSY_DECODE_ETC2_ANGLE_to_BC1_RGB_UNORM_BLOCK(GLenum type)
>+LoadImageFunctionInfo COMPRESSED_R11_EAC_to_EAC_R11_UNORM_BLOCK(GLenum type)
> {
>     switch (type)
>     {
>         case GL_UNSIGNED_BYTE:
>-            return LoadImageFunctionInfo(LoadETC2RGB8ToBC1, true);
>+            return LoadImageFunctionInfo(LoadCompressedToNative<4, 4, 8>, true);
>         default:
>             UNREACHABLE();
>             return LoadImageFunctionInfo(UnreachableLoadFunction, true);
>     }
> }
> 
>-LoadImageFunctionInfo COMPRESSED_RGB8_PUNCHTHROUGH_ALPHA1_ETC2_to_R8G8B8A8_UNORM(GLenum type)
>+LoadImageFunctionInfo COMPRESSED_R11_EAC_to_R16_UNORM(GLenum type)
> {
>     switch (type)
>     {
>         case GL_UNSIGNED_BYTE:
>-            return LoadImageFunctionInfo(LoadETC2RGB8A1ToRGBA8, true);
>+            return LoadImageFunctionInfo(LoadEACR11ToR16, true);
>         default:
>             UNREACHABLE();
>             return LoadImageFunctionInfo(UnreachableLoadFunction, true);
>     }
> }
> 
>-LoadImageFunctionInfo
>-COMPRESSED_RGB8_PUNCHTHROUGH_ALPHA1_LOSSY_DECODE_ETC2_ANGLE_to_BC1_RGBA_UNORM_BLOCK(GLenum type)
>+LoadImageFunctionInfo COMPRESSED_RG11_EAC_to_EAC_R11G11_UNORM_BLOCK(GLenum type)
> {
>     switch (type)
>     {
>         case GL_UNSIGNED_BYTE:
>-            return LoadImageFunctionInfo(LoadETC2RGB8A1ToBC1, true);
>+            return LoadImageFunctionInfo(LoadCompressedToNative<4, 4, 16>, true);
>         default:
>             UNREACHABLE();
>             return LoadImageFunctionInfo(UnreachableLoadFunction, true);
>     }
> }
> 
>-LoadImageFunctionInfo COMPRESSED_RGBA8_ETC2_EAC_to_R8G8B8A8_UNORM(GLenum type)
>+LoadImageFunctionInfo COMPRESSED_RG11_EAC_to_R16G16_UNORM(GLenum type)
> {
>     switch (type)
>     {
>         case GL_UNSIGNED_BYTE:
>-            return LoadImageFunctionInfo(LoadETC2RGBA8ToRGBA8, true);
>+            return LoadImageFunctionInfo(LoadEACRG11ToRG16, true);
>         default:
>             UNREACHABLE();
>             return LoadImageFunctionInfo(UnreachableLoadFunction, true);
>     }
> }
> 
>-LoadImageFunctionInfo COMPRESSED_RGBA_S3TC_DXT1_EXT_to_default(GLenum type)
>+LoadImageFunctionInfo COMPRESSED_RGB8_ETC2_to_ETC2_R8G8B8_UNORM_BLOCK(GLenum type)
> {
>     switch (type)
>     {
>@@ -311,31 +336,32 @@ LoadImageFunctionInfo COMPRESSED_RGBA_S3TC_DXT1_EXT_to_default(GLenum type)
>     }
> }
> 
>-LoadImageFunctionInfo COMPRESSED_RGBA_S3TC_DXT3_ANGLE_to_default(GLenum type)
>+LoadImageFunctionInfo COMPRESSED_RGB8_ETC2_to_R8G8B8A8_UNORM(GLenum type)
> {
>     switch (type)
>     {
>         case GL_UNSIGNED_BYTE:
>-            return LoadImageFunctionInfo(LoadCompressedToNative<4, 4, 16>, true);
>+            return LoadImageFunctionInfo(LoadETC2RGB8ToRGBA8, true);
>         default:
>             UNREACHABLE();
>             return LoadImageFunctionInfo(UnreachableLoadFunction, true);
>     }
> }
> 
>-LoadImageFunctionInfo COMPRESSED_RGBA_S3TC_DXT5_ANGLE_to_default(GLenum type)
>+LoadImageFunctionInfo COMPRESSED_RGB8_LOSSY_DECODE_ETC2_ANGLE_to_BC1_RGB_UNORM_BLOCK(GLenum type)
> {
>     switch (type)
>     {
>         case GL_UNSIGNED_BYTE:
>-            return LoadImageFunctionInfo(LoadCompressedToNative<4, 4, 16>, true);
>+            return LoadImageFunctionInfo(LoadETC2RGB8ToBC1, true);
>         default:
>             UNREACHABLE();
>             return LoadImageFunctionInfo(UnreachableLoadFunction, true);
>     }
> }
> 
>-LoadImageFunctionInfo COMPRESSED_RGB_S3TC_DXT1_EXT_to_default(GLenum type)
>+LoadImageFunctionInfo COMPRESSED_RGB8_PUNCHTHROUGH_ALPHA1_ETC2_to_ETC2_R8G8B8A1_UNORM_BLOCK(
>+    GLenum type)
> {
>     switch (type)
>     {
>@@ -347,594 +373,1268 @@ LoadImageFunctionInfo COMPRESSED_RGB_S3TC_DXT1_EXT_to_default(GLenum type)
>     }
> }
> 
>-LoadImageFunctionInfo COMPRESSED_SIGNED_R11_EAC_to_R8_SNORM(GLenum type)
>+LoadImageFunctionInfo COMPRESSED_RGB8_PUNCHTHROUGH_ALPHA1_ETC2_to_R8G8B8A8_UNORM(GLenum type)
> {
>     switch (type)
>     {
>         case GL_UNSIGNED_BYTE:
>-            return LoadImageFunctionInfo(LoadEACR11SToR8, true);
>+            return LoadImageFunctionInfo(LoadETC2RGB8A1ToRGBA8, true);
>         default:
>             UNREACHABLE();
>             return LoadImageFunctionInfo(UnreachableLoadFunction, true);
>     }
> }
> 
>-LoadImageFunctionInfo COMPRESSED_SIGNED_RG11_EAC_to_R8G8_SNORM(GLenum type)
>+LoadImageFunctionInfo
>+COMPRESSED_RGB8_PUNCHTHROUGH_ALPHA1_LOSSY_DECODE_ETC2_ANGLE_to_BC1_RGBA_UNORM_BLOCK(GLenum type)
> {
>     switch (type)
>     {
>         case GL_UNSIGNED_BYTE:
>-            return LoadImageFunctionInfo(LoadEACRG11SToRG8, true);
>+            return LoadImageFunctionInfo(LoadETC2RGB8A1ToBC1, true);
>         default:
>             UNREACHABLE();
>             return LoadImageFunctionInfo(UnreachableLoadFunction, true);
>     }
> }
> 
>-LoadImageFunctionInfo COMPRESSED_SRGB8_ALPHA8_ETC2_EAC_to_R8G8B8A8_UNORM_SRGB(GLenum type)
>+LoadImageFunctionInfo COMPRESSED_RGBA8_ETC2_EAC_to_ETC2_R8G8B8A8_UNORM_BLOCK(GLenum type)
> {
>     switch (type)
>     {
>         case GL_UNSIGNED_BYTE:
>-            return LoadImageFunctionInfo(LoadETC2SRGBA8ToSRGBA8, true);
>+            return LoadImageFunctionInfo(LoadCompressedToNative<4, 4, 16>, true);
>         default:
>             UNREACHABLE();
>             return LoadImageFunctionInfo(UnreachableLoadFunction, true);
>     }
> }
> 
>-LoadImageFunctionInfo COMPRESSED_SRGB8_ETC2_to_R8G8B8A8_UNORM_SRGB(GLenum type)
>+LoadImageFunctionInfo COMPRESSED_RGBA8_ETC2_EAC_to_R8G8B8A8_UNORM(GLenum type)
> {
>     switch (type)
>     {
>         case GL_UNSIGNED_BYTE:
>-            return LoadImageFunctionInfo(LoadETC2SRGB8ToRGBA8, true);
>+            return LoadImageFunctionInfo(LoadETC2RGBA8ToRGBA8, true);
>         default:
>             UNREACHABLE();
>             return LoadImageFunctionInfo(UnreachableLoadFunction, true);
>     }
> }
> 
>-LoadImageFunctionInfo COMPRESSED_SRGB8_LOSSY_DECODE_ETC2_ANGLE_to_BC1_RGB_UNORM_SRGB_BLOCK(
>-    GLenum type)
>+LoadImageFunctionInfo COMPRESSED_RGBA_ASTC_10x10_KHR_to_default(GLenum type)
> {
>     switch (type)
>     {
>         case GL_UNSIGNED_BYTE:
>-            return LoadImageFunctionInfo(LoadETC2SRGB8ToBC1, true);
>+            return LoadImageFunctionInfo(LoadCompressedToNative<10, 10, 16>, true);
>         default:
>             UNREACHABLE();
>             return LoadImageFunctionInfo(UnreachableLoadFunction, true);
>     }
> }
> 
>-LoadImageFunctionInfo COMPRESSED_SRGB8_PUNCHTHROUGH_ALPHA1_ETC2_to_R8G8B8A8_UNORM_SRGB(GLenum type)
>+LoadImageFunctionInfo COMPRESSED_RGBA_ASTC_10x5_KHR_to_default(GLenum type)
> {
>     switch (type)
>     {
>         case GL_UNSIGNED_BYTE:
>-            return LoadImageFunctionInfo(LoadETC2SRGB8A1ToRGBA8, true);
>+            return LoadImageFunctionInfo(LoadCompressedToNative<10, 5, 16>, true);
>         default:
>             UNREACHABLE();
>             return LoadImageFunctionInfo(UnreachableLoadFunction, true);
>     }
> }
> 
>-LoadImageFunctionInfo
>-COMPRESSED_SRGB8_PUNCHTHROUGH_ALPHA1_LOSSY_DECODE_ETC2_ANGLE_to_BC1_RGBA_UNORM_SRGB_BLOCK(
>-    GLenum type)
>+LoadImageFunctionInfo COMPRESSED_RGBA_ASTC_10x6_KHR_to_default(GLenum type)
> {
>     switch (type)
>     {
>         case GL_UNSIGNED_BYTE:
>-            return LoadImageFunctionInfo(LoadETC2SRGB8A1ToBC1, true);
>+            return LoadImageFunctionInfo(LoadCompressedToNative<10, 6, 16>, true);
>         default:
>             UNREACHABLE();
>             return LoadImageFunctionInfo(UnreachableLoadFunction, true);
>     }
> }
> 
>-LoadImageFunctionInfo COMPRESSED_SRGB_ALPHA_S3TC_DXT1_EXT_to_default(GLenum type)
>+LoadImageFunctionInfo COMPRESSED_RGBA_ASTC_10x8_KHR_to_default(GLenum type)
> {
>     switch (type)
>     {
>         case GL_UNSIGNED_BYTE:
>-            return LoadImageFunctionInfo(LoadCompressedToNative<4, 4, 8>, true);
>+            return LoadImageFunctionInfo(LoadCompressedToNative<10, 8, 16>, true);
>         default:
>             UNREACHABLE();
>             return LoadImageFunctionInfo(UnreachableLoadFunction, true);
>     }
> }
> 
>-LoadImageFunctionInfo COMPRESSED_SRGB_ALPHA_S3TC_DXT3_EXT_to_default(GLenum type)
>+LoadImageFunctionInfo COMPRESSED_RGBA_ASTC_12x10_KHR_to_default(GLenum type)
> {
>     switch (type)
>     {
>         case GL_UNSIGNED_BYTE:
>-            return LoadImageFunctionInfo(LoadCompressedToNative<4, 4, 16>, true);
>+            return LoadImageFunctionInfo(LoadCompressedToNative<12, 10, 16>, true);
>         default:
>             UNREACHABLE();
>             return LoadImageFunctionInfo(UnreachableLoadFunction, true);
>     }
> }
> 
>-LoadImageFunctionInfo COMPRESSED_SRGB_ALPHA_S3TC_DXT5_EXT_to_default(GLenum type)
>+LoadImageFunctionInfo COMPRESSED_RGBA_ASTC_12x12_KHR_to_default(GLenum type)
> {
>     switch (type)
>     {
>         case GL_UNSIGNED_BYTE:
>-            return LoadImageFunctionInfo(LoadCompressedToNative<4, 4, 16>, true);
>+            return LoadImageFunctionInfo(LoadCompressedToNative<12, 12, 16>, true);
>         default:
>             UNREACHABLE();
>             return LoadImageFunctionInfo(UnreachableLoadFunction, true);
>     }
> }
> 
>-LoadImageFunctionInfo COMPRESSED_SRGB_S3TC_DXT1_EXT_to_default(GLenum type)
>+LoadImageFunctionInfo COMPRESSED_RGBA_ASTC_4x4_KHR_to_default(GLenum type)
> {
>     switch (type)
>     {
>         case GL_UNSIGNED_BYTE:
>-            return LoadImageFunctionInfo(LoadCompressedToNative<4, 4, 8>, true);
>+            return LoadImageFunctionInfo(LoadCompressedToNative<4, 4, 16>, true);
>         default:
>             UNREACHABLE();
>             return LoadImageFunctionInfo(UnreachableLoadFunction, true);
>     }
> }
> 
>-LoadImageFunctionInfo DEPTH24_STENCIL8_to_D24_UNORM_S8_UINT(GLenum type)
>+LoadImageFunctionInfo COMPRESSED_RGBA_ASTC_5x4_KHR_to_default(GLenum type)
> {
>     switch (type)
>     {
>-        case GL_UNSIGNED_INT_24_8:
>-            return LoadImageFunctionInfo(LoadR32ToR24G8, true);
>+        case GL_UNSIGNED_BYTE:
>+            return LoadImageFunctionInfo(LoadCompressedToNative<5, 4, 16>, true);
>         default:
>             UNREACHABLE();
>             return LoadImageFunctionInfo(UnreachableLoadFunction, true);
>     }
> }
> 
>-LoadImageFunctionInfo DEPTH32F_STENCIL8_to_D32_FLOAT_S8X24_UINT(GLenum type)
>+LoadImageFunctionInfo COMPRESSED_RGBA_ASTC_5x5_KHR_to_default(GLenum type)
> {
>     switch (type)
>     {
>-        case GL_FLOAT_32_UNSIGNED_INT_24_8_REV:
>-            return LoadImageFunctionInfo(LoadD32FS8X24ToD32FS8X24, true);
>+        case GL_UNSIGNED_BYTE:
>+            return LoadImageFunctionInfo(LoadCompressedToNative<5, 5, 16>, true);
>         default:
>             UNREACHABLE();
>             return LoadImageFunctionInfo(UnreachableLoadFunction, true);
>     }
> }
> 
>-LoadImageFunctionInfo DEPTH_COMPONENT16_to_D16_UNORM(GLenum type)
>+LoadImageFunctionInfo COMPRESSED_RGBA_ASTC_6x5_KHR_to_default(GLenum type)
> {
>     switch (type)
>     {
>-        case GL_UNSIGNED_INT:
>-            return LoadImageFunctionInfo(LoadR32ToR16, true);
>-        case GL_UNSIGNED_SHORT:
>-            return LoadImageFunctionInfo(LoadToNative<GLushort, 1>, false);
>+        case GL_UNSIGNED_BYTE:
>+            return LoadImageFunctionInfo(LoadCompressedToNative<6, 5, 16>, true);
>         default:
>             UNREACHABLE();
>             return LoadImageFunctionInfo(UnreachableLoadFunction, true);
>     }
> }
> 
>-LoadImageFunctionInfo DEPTH_COMPONENT24_to_D24_UNORM_S8_UINT(GLenum type)
>+LoadImageFunctionInfo COMPRESSED_RGBA_ASTC_6x6_KHR_to_default(GLenum type)
> {
>     switch (type)
>     {
>-        case GL_UNSIGNED_INT:
>-            return LoadImageFunctionInfo(LoadR32ToR24G8, true);
>+        case GL_UNSIGNED_BYTE:
>+            return LoadImageFunctionInfo(LoadCompressedToNative<6, 6, 16>, true);
>         default:
>             UNREACHABLE();
>             return LoadImageFunctionInfo(UnreachableLoadFunction, true);
>     }
> }
> 
>-LoadImageFunctionInfo DEPTH_COMPONENT32F_to_D32_FLOAT(GLenum type)
>+LoadImageFunctionInfo COMPRESSED_RGBA_ASTC_8x5_KHR_to_default(GLenum type)
> {
>     switch (type)
>     {
>-        case GL_FLOAT:
>-            return LoadImageFunctionInfo(LoadD32FToD32F, true);
>+        case GL_UNSIGNED_BYTE:
>+            return LoadImageFunctionInfo(LoadCompressedToNative<8, 5, 16>, true);
>         default:
>             UNREACHABLE();
>             return LoadImageFunctionInfo(UnreachableLoadFunction, true);
>     }
> }
> 
>-LoadImageFunctionInfo DEPTH_COMPONENT32_OES_to_default(GLenum type)
>+LoadImageFunctionInfo COMPRESSED_RGBA_ASTC_8x6_KHR_to_default(GLenum type)
> {
>     switch (type)
>     {
>-        case GL_UNSIGNED_INT:
>-            return LoadImageFunctionInfo(LoadR32ToR24G8, true);
>+        case GL_UNSIGNED_BYTE:
>+            return LoadImageFunctionInfo(LoadCompressedToNative<8, 6, 16>, true);
>         default:
>             UNREACHABLE();
>             return LoadImageFunctionInfo(UnreachableLoadFunction, true);
>     }
> }
> 
>-LoadImageFunctionInfo ETC1_RGB8_LOSSY_DECODE_ANGLE_to_BC1_RGB_UNORM_BLOCK(GLenum type)
>+LoadImageFunctionInfo COMPRESSED_RGBA_ASTC_8x8_KHR_to_default(GLenum type)
> {
>     switch (type)
>     {
>         case GL_UNSIGNED_BYTE:
>-            return LoadImageFunctionInfo(LoadETC1RGB8ToBC1, true);
>+            return LoadImageFunctionInfo(LoadCompressedToNative<8, 8, 16>, true);
>         default:
>             UNREACHABLE();
>             return LoadImageFunctionInfo(UnreachableLoadFunction, true);
>     }
> }
> 
>-LoadImageFunctionInfo ETC1_RGB8_OES_to_R8G8B8A8_UNORM(GLenum type)
>+LoadImageFunctionInfo COMPRESSED_RGBA_BPTC_UNORM_EXT_to_default(GLenum type)
> {
>     switch (type)
>     {
>         case GL_UNSIGNED_BYTE:
>-            return LoadImageFunctionInfo(LoadETC1RGB8ToRGBA8, true);
>+            return LoadImageFunctionInfo(LoadCompressedToNative<4, 4, 16>, true);
>         default:
>             UNREACHABLE();
>             return LoadImageFunctionInfo(UnreachableLoadFunction, true);
>     }
> }
> 
>-LoadImageFunctionInfo LUMINANCE_to_R16G16B16A16_FLOAT(GLenum type)
>+LoadImageFunctionInfo COMPRESSED_RGBA_S3TC_DXT1_EXT_to_default(GLenum type)
> {
>     switch (type)
>     {
>-        case GL_HALF_FLOAT:
>-            return LoadImageFunctionInfo(LoadL16FToRGBA16F, true);
>-        case GL_HALF_FLOAT_OES:
>-            return LoadImageFunctionInfo(LoadL16FToRGBA16F, true);
>         case GL_UNSIGNED_BYTE:
>-            return LoadImageFunctionInfo(UnreachableLoadFunction, true);
>+            return LoadImageFunctionInfo(LoadCompressedToNative<4, 4, 8>, true);
>         default:
>             UNREACHABLE();
>             return LoadImageFunctionInfo(UnreachableLoadFunction, true);
>     }
> }
> 
>-LoadImageFunctionInfo LUMINANCE_to_R32G32B32A32_FLOAT(GLenum type)
>+LoadImageFunctionInfo COMPRESSED_RGBA_S3TC_DXT3_ANGLE_to_default(GLenum type)
> {
>     switch (type)
>     {
>-        case GL_FLOAT:
>-            return LoadImageFunctionInfo(LoadL32FToRGBA32F, true);
>         case GL_UNSIGNED_BYTE:
>-            return LoadImageFunctionInfo(UnreachableLoadFunction, true);
>+            return LoadImageFunctionInfo(LoadCompressedToNative<4, 4, 16>, true);
>         default:
>             UNREACHABLE();
>             return LoadImageFunctionInfo(UnreachableLoadFunction, true);
>     }
> }
> 
>-LoadImageFunctionInfo LUMINANCE_to_default(GLenum type)
>+LoadImageFunctionInfo COMPRESSED_RGBA_S3TC_DXT5_ANGLE_to_default(GLenum type)
> {
>     switch (type)
>     {
>         case GL_UNSIGNED_BYTE:
>-            return LoadImageFunctionInfo(UnreachableLoadFunction, true);
>+            return LoadImageFunctionInfo(LoadCompressedToNative<4, 4, 16>, true);
>         default:
>             UNREACHABLE();
>             return LoadImageFunctionInfo(UnreachableLoadFunction, true);
>     }
> }
> 
>-LoadImageFunctionInfo LUMINANCE16F_EXT_to_default(GLenum type)
>+LoadImageFunctionInfo COMPRESSED_RGB_BPTC_SIGNED_FLOAT_EXT_to_default(GLenum type)
> {
>     switch (type)
>     {
>-        case GL_HALF_FLOAT:
>-            return LoadImageFunctionInfo(LoadL16FToRGBA16F, true);
>-        case GL_HALF_FLOAT_OES:
>-            return LoadImageFunctionInfo(LoadL16FToRGBA16F, true);
>+        case GL_UNSIGNED_BYTE:
>+            return LoadImageFunctionInfo(LoadCompressedToNative<4, 4, 16>, true);
>         default:
>             UNREACHABLE();
>             return LoadImageFunctionInfo(UnreachableLoadFunction, true);
>     }
> }
> 
>-LoadImageFunctionInfo LUMINANCE32F_EXT_to_default(GLenum type)
>+LoadImageFunctionInfo COMPRESSED_RGB_BPTC_UNSIGNED_FLOAT_EXT_to_default(GLenum type)
> {
>     switch (type)
>     {
>-        case GL_FLOAT:
>-            return LoadImageFunctionInfo(LoadL32FToRGBA32F, true);
>+        case GL_UNSIGNED_BYTE:
>+            return LoadImageFunctionInfo(LoadCompressedToNative<4, 4, 16>, true);
>         default:
>             UNREACHABLE();
>             return LoadImageFunctionInfo(UnreachableLoadFunction, true);
>     }
> }
> 
>-LoadImageFunctionInfo LUMINANCE8_ALPHA8_EXT_to_default(GLenum type)
>+LoadImageFunctionInfo COMPRESSED_RGB_S3TC_DXT1_EXT_to_default(GLenum type)
> {
>     switch (type)
>     {
>         case GL_UNSIGNED_BYTE:
>-            return LoadImageFunctionInfo(LoadLA8ToRGBA8, true);
>+            return LoadImageFunctionInfo(LoadCompressedToNative<4, 4, 8>, true);
>         default:
>             UNREACHABLE();
>             return LoadImageFunctionInfo(UnreachableLoadFunction, true);
>     }
> }
> 
>-LoadImageFunctionInfo LUMINANCE8_EXT_to_default(GLenum type)
>+LoadImageFunctionInfo COMPRESSED_SIGNED_R11_EAC_to_EAC_R11_SNORM_BLOCK(GLenum type)
> {
>     switch (type)
>     {
>         case GL_UNSIGNED_BYTE:
>-            return LoadImageFunctionInfo(LoadL8ToRGBA8, true);
>+            return LoadImageFunctionInfo(LoadCompressedToNative<4, 4, 8>, true);
>         default:
>             UNREACHABLE();
>             return LoadImageFunctionInfo(UnreachableLoadFunction, true);
>     }
> }
> 
>-LoadImageFunctionInfo LUMINANCE_ALPHA_to_R16G16B16A16_FLOAT(GLenum type)
>+LoadImageFunctionInfo COMPRESSED_SIGNED_R11_EAC_to_R16_SNORM(GLenum type)
> {
>     switch (type)
>     {
>-        case GL_HALF_FLOAT:
>-            return LoadImageFunctionInfo(LoadLA16FToRGBA16F, true);
>-        case GL_HALF_FLOAT_OES:
>-            return LoadImageFunctionInfo(LoadLA16FToRGBA16F, true);
>         case GL_UNSIGNED_BYTE:
>-            return LoadImageFunctionInfo(UnreachableLoadFunction, true);
>+            return LoadImageFunctionInfo(LoadEACR11SToR16, true);
>         default:
>             UNREACHABLE();
>             return LoadImageFunctionInfo(UnreachableLoadFunction, true);
>     }
> }
> 
>-LoadImageFunctionInfo LUMINANCE_ALPHA_to_R32G32B32A32_FLOAT(GLenum type)
>+LoadImageFunctionInfo COMPRESSED_SIGNED_RG11_EAC_to_EAC_R11G11_SNORM_BLOCK(GLenum type)
> {
>     switch (type)
>     {
>-        case GL_FLOAT:
>-            return LoadImageFunctionInfo(LoadLA32FToRGBA32F, true);
>         case GL_UNSIGNED_BYTE:
>-            return LoadImageFunctionInfo(UnreachableLoadFunction, true);
>+            return LoadImageFunctionInfo(LoadCompressedToNative<4, 4, 16>, true);
>         default:
>             UNREACHABLE();
>             return LoadImageFunctionInfo(UnreachableLoadFunction, true);
>     }
> }
> 
>-LoadImageFunctionInfo LUMINANCE_ALPHA_to_default(GLenum type)
>+LoadImageFunctionInfo COMPRESSED_SIGNED_RG11_EAC_to_R16G16_SNORM(GLenum type)
> {
>     switch (type)
>     {
>         case GL_UNSIGNED_BYTE:
>-            return LoadImageFunctionInfo(UnreachableLoadFunction, true);
>+            return LoadImageFunctionInfo(LoadEACRG11SToRG16, true);
>         default:
>             UNREACHABLE();
>             return LoadImageFunctionInfo(UnreachableLoadFunction, true);
>     }
> }
> 
>-LoadImageFunctionInfo LUMINANCE_ALPHA16F_EXT_to_default(GLenum type)
>+LoadImageFunctionInfo COMPRESSED_SRGB8_ALPHA8_ASTC_10x10_KHR_to_default(GLenum type)
> {
>     switch (type)
>     {
>-        case GL_HALF_FLOAT:
>-            return LoadImageFunctionInfo(LoadLA16FToRGBA16F, true);
>-        case GL_HALF_FLOAT_OES:
>-            return LoadImageFunctionInfo(LoadLA16FToRGBA16F, true);
>+        case GL_UNSIGNED_BYTE:
>+            return LoadImageFunctionInfo(LoadCompressedToNative<10, 10, 16>, true);
>         default:
>             UNREACHABLE();
>             return LoadImageFunctionInfo(UnreachableLoadFunction, true);
>     }
> }
> 
>-LoadImageFunctionInfo LUMINANCE_ALPHA32F_EXT_to_default(GLenum type)
>+LoadImageFunctionInfo COMPRESSED_SRGB8_ALPHA8_ASTC_10x5_KHR_to_default(GLenum type)
> {
>     switch (type)
>     {
>-        case GL_FLOAT:
>-            return LoadImageFunctionInfo(LoadLA32FToRGBA32F, true);
>+        case GL_UNSIGNED_BYTE:
>+            return LoadImageFunctionInfo(LoadCompressedToNative<10, 5, 16>, true);
>         default:
>             UNREACHABLE();
>             return LoadImageFunctionInfo(UnreachableLoadFunction, true);
>     }
> }
> 
>-LoadImageFunctionInfo R11F_G11F_B10F_to_R11G11B10_FLOAT(GLenum type)
>+LoadImageFunctionInfo COMPRESSED_SRGB8_ALPHA8_ASTC_10x6_KHR_to_default(GLenum type)
> {
>     switch (type)
>     {
>-        case GL_FLOAT:
>-            return LoadImageFunctionInfo(LoadRGB32FToRG11B10F, true);
>-        case GL_HALF_FLOAT:
>-            return LoadImageFunctionInfo(LoadRGB16FToRG11B10F, true);
>-        case GL_HALF_FLOAT_OES:
>-            return LoadImageFunctionInfo(LoadRGB16FToRG11B10F, true);
>-        case GL_UNSIGNED_INT_10F_11F_11F_REV:
>-            return LoadImageFunctionInfo(LoadToNative<GLuint, 1>, false);
>+        case GL_UNSIGNED_BYTE:
>+            return LoadImageFunctionInfo(LoadCompressedToNative<10, 6, 16>, true);
>         default:
>             UNREACHABLE();
>             return LoadImageFunctionInfo(UnreachableLoadFunction, true);
>     }
> }
> 
>-LoadImageFunctionInfo R16F_to_R16_FLOAT(GLenum type)
>+LoadImageFunctionInfo COMPRESSED_SRGB8_ALPHA8_ASTC_10x8_KHR_to_default(GLenum type)
> {
>     switch (type)
>     {
>-        case GL_FLOAT:
>-            return LoadImageFunctionInfo(Load32FTo16F<1>, true);
>-        case GL_HALF_FLOAT:
>-            return LoadImageFunctionInfo(LoadToNative<GLhalf, 1>, false);
>-        case GL_HALF_FLOAT_OES:
>-            return LoadImageFunctionInfo(LoadToNative<GLhalf, 1>, false);
>+        case GL_UNSIGNED_BYTE:
>+            return LoadImageFunctionInfo(LoadCompressedToNative<10, 8, 16>, true);
>         default:
>             UNREACHABLE();
>             return LoadImageFunctionInfo(UnreachableLoadFunction, true);
>     }
> }
> 
>-LoadImageFunctionInfo R16I_to_R16_SINT(GLenum type)
>+LoadImageFunctionInfo COMPRESSED_SRGB8_ALPHA8_ASTC_12x10_KHR_to_default(GLenum type)
> {
>     switch (type)
>     {
>-        case GL_SHORT:
>-            return LoadImageFunctionInfo(LoadToNative<GLshort, 1>, false);
>+        case GL_UNSIGNED_BYTE:
>+            return LoadImageFunctionInfo(LoadCompressedToNative<12, 10, 16>, true);
>         default:
>             UNREACHABLE();
>             return LoadImageFunctionInfo(UnreachableLoadFunction, true);
>     }
> }
> 
>-LoadImageFunctionInfo R16UI_to_R16_UINT(GLenum type)
>+LoadImageFunctionInfo COMPRESSED_SRGB8_ALPHA8_ASTC_12x12_KHR_to_default(GLenum type)
> {
>     switch (type)
>     {
>-        case GL_UNSIGNED_SHORT:
>-            return LoadImageFunctionInfo(LoadToNative<GLushort, 1>, false);
>+        case GL_UNSIGNED_BYTE:
>+            return LoadImageFunctionInfo(LoadCompressedToNative<12, 12, 16>, true);
>         default:
>             UNREACHABLE();
>             return LoadImageFunctionInfo(UnreachableLoadFunction, true);
>     }
> }
> 
>-LoadImageFunctionInfo R16_EXT_to_R16_UNORM(GLenum type)
>+LoadImageFunctionInfo COMPRESSED_SRGB8_ALPHA8_ASTC_4x4_KHR_to_default(GLenum type)
> {
>     switch (type)
>     {
>-        case GL_UNSIGNED_SHORT:
>-            return LoadImageFunctionInfo(LoadToNative<GLushort, 1>, false);
>+        case GL_UNSIGNED_BYTE:
>+            return LoadImageFunctionInfo(LoadCompressedToNative<4, 4, 16>, true);
>         default:
>             UNREACHABLE();
>             return LoadImageFunctionInfo(UnreachableLoadFunction, true);
>     }
> }
> 
>-LoadImageFunctionInfo R16_SNORM_EXT_to_R16_SNORM(GLenum type)
>+LoadImageFunctionInfo COMPRESSED_SRGB8_ALPHA8_ASTC_5x4_KHR_to_default(GLenum type)
> {
>     switch (type)
>     {
>-        case GL_SHORT:
>-            return LoadImageFunctionInfo(LoadToNative<GLushort, 1>, false);
>+        case GL_UNSIGNED_BYTE:
>+            return LoadImageFunctionInfo(LoadCompressedToNative<5, 4, 16>, true);
>         default:
>             UNREACHABLE();
>             return LoadImageFunctionInfo(UnreachableLoadFunction, true);
>     }
> }
> 
>-LoadImageFunctionInfo R32F_to_R32_FLOAT(GLenum type)
>+LoadImageFunctionInfo COMPRESSED_SRGB8_ALPHA8_ASTC_5x5_KHR_to_default(GLenum type)
> {
>     switch (type)
>     {
>-        case GL_FLOAT:
>-            return LoadImageFunctionInfo(LoadToNative<GLfloat, 1>, false);
>+        case GL_UNSIGNED_BYTE:
>+            return LoadImageFunctionInfo(LoadCompressedToNative<5, 5, 16>, true);
>         default:
>             UNREACHABLE();
>             return LoadImageFunctionInfo(UnreachableLoadFunction, true);
>     }
> }
> 
>-LoadImageFunctionInfo R32I_to_R32_SINT(GLenum type)
>+LoadImageFunctionInfo COMPRESSED_SRGB8_ALPHA8_ASTC_6x5_KHR_to_default(GLenum type)
> {
>     switch (type)
>     {
>-        case GL_INT:
>-            return LoadImageFunctionInfo(LoadToNative<GLint, 1>, false);
>+        case GL_UNSIGNED_BYTE:
>+            return LoadImageFunctionInfo(LoadCompressedToNative<6, 5, 16>, true);
>         default:
>             UNREACHABLE();
>             return LoadImageFunctionInfo(UnreachableLoadFunction, true);
>     }
> }
> 
>-LoadImageFunctionInfo R32UI_to_R32_UINT(GLenum type)
>+LoadImageFunctionInfo COMPRESSED_SRGB8_ALPHA8_ASTC_6x6_KHR_to_default(GLenum type)
> {
>     switch (type)
>     {
>-        case GL_UNSIGNED_INT:
>-            return LoadImageFunctionInfo(LoadToNative<GLuint, 1>, false);
>+        case GL_UNSIGNED_BYTE:
>+            return LoadImageFunctionInfo(LoadCompressedToNative<6, 6, 16>, true);
>         default:
>             UNREACHABLE();
>             return LoadImageFunctionInfo(UnreachableLoadFunction, true);
>     }
> }
> 
>-LoadImageFunctionInfo R8_to_R8_UNORM(GLenum type)
>+LoadImageFunctionInfo COMPRESSED_SRGB8_ALPHA8_ASTC_8x5_KHR_to_default(GLenum type)
> {
>     switch (type)
>     {
>         case GL_UNSIGNED_BYTE:
>-            return LoadImageFunctionInfo(LoadToNative<GLubyte, 1>, false);
>+            return LoadImageFunctionInfo(LoadCompressedToNative<8, 5, 16>, true);
>         default:
>             UNREACHABLE();
>             return LoadImageFunctionInfo(UnreachableLoadFunction, true);
>     }
> }
> 
>-LoadImageFunctionInfo R8I_to_R8_SINT(GLenum type)
>+LoadImageFunctionInfo COMPRESSED_SRGB8_ALPHA8_ASTC_8x6_KHR_to_default(GLenum type)
> {
>     switch (type)
>     {
>-        case GL_BYTE:
>-            return LoadImageFunctionInfo(LoadToNative<GLbyte, 1>, false);
>+        case GL_UNSIGNED_BYTE:
>+            return LoadImageFunctionInfo(LoadCompressedToNative<8, 6, 16>, true);
>         default:
>             UNREACHABLE();
>             return LoadImageFunctionInfo(UnreachableLoadFunction, true);
>     }
> }
> 
>-LoadImageFunctionInfo R8UI_to_R8_UINT(GLenum type)
>+LoadImageFunctionInfo COMPRESSED_SRGB8_ALPHA8_ASTC_8x8_KHR_to_default(GLenum type)
> {
>     switch (type)
>     {
>         case GL_UNSIGNED_BYTE:
>-            return LoadImageFunctionInfo(LoadToNative<GLubyte, 1>, false);
>+            return LoadImageFunctionInfo(LoadCompressedToNative<8, 8, 16>, true);
>         default:
>             UNREACHABLE();
>             return LoadImageFunctionInfo(UnreachableLoadFunction, true);
>     }
> }
> 
>-LoadImageFunctionInfo R8_SNORM_to_R8_SNORM(GLenum type)
>+LoadImageFunctionInfo COMPRESSED_SRGB8_ALPHA8_ETC2_EAC_to_ETC2_R8G8B8A8_SRGB_BLOCK(GLenum type)
> {
>     switch (type)
>     {
>-        case GL_BYTE:
>-            return LoadImageFunctionInfo(LoadToNative<GLbyte, 1>, false);
>+        case GL_UNSIGNED_BYTE:
>+            return LoadImageFunctionInfo(LoadCompressedToNative<4, 4, 16>, true);
>         default:
>             UNREACHABLE();
>             return LoadImageFunctionInfo(UnreachableLoadFunction, true);
>     }
> }
> 
>-LoadImageFunctionInfo RG16F_to_R16G16_FLOAT(GLenum type)
>+LoadImageFunctionInfo COMPRESSED_SRGB8_ALPHA8_ETC2_EAC_to_R8G8B8A8_UNORM_SRGB(GLenum type)
> {
>     switch (type)
>     {
>-        case GL_FLOAT:
>-            return LoadImageFunctionInfo(Load32FTo16F<2>, true);
>-        case GL_HALF_FLOAT:
>-            return LoadImageFunctionInfo(LoadToNative<GLhalf, 2>, false);
>-        case GL_HALF_FLOAT_OES:
>-            return LoadImageFunctionInfo(LoadToNative<GLhalf, 2>, false);
>+        case GL_UNSIGNED_BYTE:
>+            return LoadImageFunctionInfo(LoadETC2SRGBA8ToSRGBA8, true);
>         default:
>             UNREACHABLE();
>             return LoadImageFunctionInfo(UnreachableLoadFunction, true);
>     }
> }
> 
>-LoadImageFunctionInfo RG16I_to_R16G16_SINT(GLenum type)
>+LoadImageFunctionInfo COMPRESSED_SRGB8_ETC2_to_ETC2_R8G8B8_SRGB_BLOCK(GLenum type)
> {
>     switch (type)
>     {
>-        case GL_SHORT:
>-            return LoadImageFunctionInfo(LoadToNative<GLshort, 2>, false);
>+        case GL_UNSIGNED_BYTE:
>+            return LoadImageFunctionInfo(LoadCompressedToNative<4, 4, 8>, true);
>         default:
>             UNREACHABLE();
>             return LoadImageFunctionInfo(UnreachableLoadFunction, true);
>     }
> }
> 
>-LoadImageFunctionInfo RG16UI_to_R16G16_UINT(GLenum type)
>+LoadImageFunctionInfo COMPRESSED_SRGB8_ETC2_to_R8G8B8A8_UNORM_SRGB(GLenum type)
>+{
>+    switch (type)
>+    {
>+        case GL_UNSIGNED_BYTE:
>+            return LoadImageFunctionInfo(LoadETC2SRGB8ToRGBA8, true);
>+        default:
>+            UNREACHABLE();
>+            return LoadImageFunctionInfo(UnreachableLoadFunction, true);
>+    }
>+}
>+
>+LoadImageFunctionInfo COMPRESSED_SRGB8_LOSSY_DECODE_ETC2_ANGLE_to_BC1_RGB_UNORM_SRGB_BLOCK(
>+    GLenum type)
>+{
>+    switch (type)
>+    {
>+        case GL_UNSIGNED_BYTE:
>+            return LoadImageFunctionInfo(LoadETC2SRGB8ToBC1, true);
>+        default:
>+            UNREACHABLE();
>+            return LoadImageFunctionInfo(UnreachableLoadFunction, true);
>+    }
>+}
>+
>+LoadImageFunctionInfo COMPRESSED_SRGB8_PUNCHTHROUGH_ALPHA1_ETC2_to_ETC2_R8G8B8A1_SRGB_BLOCK(
>+    GLenum type)
>+{
>+    switch (type)
>+    {
>+        case GL_UNSIGNED_BYTE:
>+            return LoadImageFunctionInfo(LoadCompressedToNative<4, 4, 8>, true);
>+        default:
>+            UNREACHABLE();
>+            return LoadImageFunctionInfo(UnreachableLoadFunction, true);
>+    }
>+}
>+
>+LoadImageFunctionInfo COMPRESSED_SRGB8_PUNCHTHROUGH_ALPHA1_ETC2_to_R8G8B8A8_UNORM_SRGB(GLenum type)
>+{
>+    switch (type)
>+    {
>+        case GL_UNSIGNED_BYTE:
>+            return LoadImageFunctionInfo(LoadETC2SRGB8A1ToRGBA8, true);
>+        default:
>+            UNREACHABLE();
>+            return LoadImageFunctionInfo(UnreachableLoadFunction, true);
>+    }
>+}
>+
>+LoadImageFunctionInfo
>+COMPRESSED_SRGB8_PUNCHTHROUGH_ALPHA1_LOSSY_DECODE_ETC2_ANGLE_to_BC1_RGBA_UNORM_SRGB_BLOCK(
>+    GLenum type)
>+{
>+    switch (type)
>+    {
>+        case GL_UNSIGNED_BYTE:
>+            return LoadImageFunctionInfo(LoadETC2SRGB8A1ToBC1, true);
>+        default:
>+            UNREACHABLE();
>+            return LoadImageFunctionInfo(UnreachableLoadFunction, true);
>+    }
>+}
>+
>+LoadImageFunctionInfo COMPRESSED_SRGB_ALPHA_BPTC_UNORM_EXT_to_default(GLenum type)
>+{
>+    switch (type)
>+    {
>+        case GL_UNSIGNED_BYTE:
>+            return LoadImageFunctionInfo(LoadCompressedToNative<4, 4, 16>, true);
>+        default:
>+            UNREACHABLE();
>+            return LoadImageFunctionInfo(UnreachableLoadFunction, true);
>+    }
>+}
>+
>+LoadImageFunctionInfo COMPRESSED_SRGB_ALPHA_S3TC_DXT1_EXT_to_default(GLenum type)
>+{
>+    switch (type)
>+    {
>+        case GL_UNSIGNED_BYTE:
>+            return LoadImageFunctionInfo(LoadCompressedToNative<4, 4, 8>, true);
>+        default:
>+            UNREACHABLE();
>+            return LoadImageFunctionInfo(UnreachableLoadFunction, true);
>+    }
>+}
>+
>+LoadImageFunctionInfo COMPRESSED_SRGB_ALPHA_S3TC_DXT3_EXT_to_default(GLenum type)
>+{
>+    switch (type)
>+    {
>+        case GL_UNSIGNED_BYTE:
>+            return LoadImageFunctionInfo(LoadCompressedToNative<4, 4, 16>, true);
>+        default:
>+            UNREACHABLE();
>+            return LoadImageFunctionInfo(UnreachableLoadFunction, true);
>+    }
>+}
>+
>+LoadImageFunctionInfo COMPRESSED_SRGB_ALPHA_S3TC_DXT5_EXT_to_default(GLenum type)
>+{
>+    switch (type)
>+    {
>+        case GL_UNSIGNED_BYTE:
>+            return LoadImageFunctionInfo(LoadCompressedToNative<4, 4, 16>, true);
>+        default:
>+            UNREACHABLE();
>+            return LoadImageFunctionInfo(UnreachableLoadFunction, true);
>+    }
>+}
>+
>+LoadImageFunctionInfo COMPRESSED_SRGB_S3TC_DXT1_EXT_to_default(GLenum type)
>+{
>+    switch (type)
>+    {
>+        case GL_UNSIGNED_BYTE:
>+            return LoadImageFunctionInfo(LoadCompressedToNative<4, 4, 8>, true);
>+        default:
>+            UNREACHABLE();
>+            return LoadImageFunctionInfo(UnreachableLoadFunction, true);
>+    }
>+}
>+
>+LoadImageFunctionInfo DEPTH24_STENCIL8_to_D24_UNORM_S8_UINT(GLenum type)
>+{
>+    switch (type)
>+    {
>+        case GL_UNSIGNED_INT_24_8:
>+            return LoadImageFunctionInfo(LoadR32ToR24G8, true);
>+        default:
>+            UNREACHABLE();
>+            return LoadImageFunctionInfo(UnreachableLoadFunction, true);
>+    }
>+}
>+
>+LoadImageFunctionInfo DEPTH24_STENCIL8_to_D32_FLOAT_S8X24_UINT(GLenum type)
>+{
>+    switch (type)
>+    {
>+        case GL_UNSIGNED_INT_24_8:
>+            return LoadImageFunctionInfo(LoadD24S8ToD32FS8X24, true);
>+        default:
>+            UNREACHABLE();
>+            return LoadImageFunctionInfo(UnreachableLoadFunction, true);
>+    }
>+}
>+
>+LoadImageFunctionInfo DEPTH32F_STENCIL8_to_D24_UNORM_S8_UINT(GLenum type)
>+{
>+    switch (type)
>+    {
>+        case GL_FLOAT_32_UNSIGNED_INT_24_8_REV:
>+            return LoadImageFunctionInfo(LoadD32FS8X24ToD24S8, true);
>+        default:
>+            UNREACHABLE();
>+            return LoadImageFunctionInfo(UnreachableLoadFunction, true);
>+    }
>+}
>+
>+LoadImageFunctionInfo DEPTH32F_STENCIL8_to_D32_FLOAT_S8X24_UINT(GLenum type)
>+{
>+    switch (type)
>+    {
>+        case GL_FLOAT_32_UNSIGNED_INT_24_8_REV:
>+            return LoadImageFunctionInfo(LoadD32FS8X24ToD32FS8X24, true);
>+        default:
>+            UNREACHABLE();
>+            return LoadImageFunctionInfo(UnreachableLoadFunction, true);
>+    }
>+}
>+
>+LoadImageFunctionInfo DEPTH_COMPONENT16_to_D16_UNORM(GLenum type)
>+{
>+    switch (type)
>+    {
>+        case GL_UNSIGNED_INT:
>+            return LoadImageFunctionInfo(LoadR32ToR16, true);
>+        case GL_UNSIGNED_SHORT:
>+            return LoadImageFunctionInfo(LoadToNative<GLushort, 1>, false);
>+        default:
>+            UNREACHABLE();
>+            return LoadImageFunctionInfo(UnreachableLoadFunction, true);
>+    }
>+}
>+
>+LoadImageFunctionInfo DEPTH_COMPONENT24_to_D24_UNORM_S8_UINT(GLenum type)
>+{
>+    switch (type)
>+    {
>+        case GL_UNSIGNED_INT:
>+            return LoadImageFunctionInfo(LoadR32ToR24G8, true);
>+        default:
>+            UNREACHABLE();
>+            return LoadImageFunctionInfo(UnreachableLoadFunction, true);
>+    }
>+}
>+
>+LoadImageFunctionInfo DEPTH_COMPONENT24_to_D32_FLOAT_S8X24_UINT(GLenum type)
>+{
>+    switch (type)
>+    {
>+        case GL_UNSIGNED_INT_24_8:
>+            return LoadImageFunctionInfo(LoadD24S8ToD32FS8X24, true);
>+        default:
>+            UNREACHABLE();
>+            return LoadImageFunctionInfo(UnreachableLoadFunction, true);
>+    }
>+}
>+
>+LoadImageFunctionInfo DEPTH_COMPONENT32F_to_D32_FLOAT(GLenum type)
>+{
>+    switch (type)
>+    {
>+        case GL_FLOAT:
>+            return LoadImageFunctionInfo(LoadD32FToD32F, true);
>+        default:
>+            UNREACHABLE();
>+            return LoadImageFunctionInfo(UnreachableLoadFunction, true);
>+    }
>+}
>+
>+LoadImageFunctionInfo DEPTH_COMPONENT32_OES_to_default(GLenum type)
>+{
>+    switch (type)
>+    {
>+        case GL_UNSIGNED_INT:
>+            return LoadImageFunctionInfo(LoadR32ToR24G8, true);
>+        default:
>+            UNREACHABLE();
>+            return LoadImageFunctionInfo(UnreachableLoadFunction, true);
>+    }
>+}
>+
>+LoadImageFunctionInfo ETC1_RGB8_LOSSY_DECODE_ANGLE_to_BC1_RGB_UNORM_BLOCK(GLenum type)
>+{
>+    switch (type)
>+    {
>+        case GL_UNSIGNED_BYTE:
>+            return LoadImageFunctionInfo(LoadETC1RGB8ToBC1, true);
>+        default:
>+            UNREACHABLE();
>+            return LoadImageFunctionInfo(UnreachableLoadFunction, true);
>+    }
>+}
>+
>+LoadImageFunctionInfo ETC1_RGB8_OES_to_ETC1_R8G8B8_UNORM_BLOCK(GLenum type)
>+{
>+    switch (type)
>+    {
>+        case GL_UNSIGNED_BYTE:
>+            return LoadImageFunctionInfo(LoadCompressedToNative<4, 4, 8>, true);
>+        default:
>+            UNREACHABLE();
>+            return LoadImageFunctionInfo(UnreachableLoadFunction, true);
>+    }
>+}
>+
>+LoadImageFunctionInfo ETC1_RGB8_OES_to_ETC2_R8G8B8_UNORM_BLOCK(GLenum type)
>+{
>+    switch (type)
>+    {
>+        case GL_UNSIGNED_BYTE:
>+            return LoadImageFunctionInfo(LoadCompressedToNative<4, 4, 8>, true);
>+        default:
>+            UNREACHABLE();
>+            return LoadImageFunctionInfo(UnreachableLoadFunction, true);
>+    }
>+}
>+
>+LoadImageFunctionInfo ETC1_RGB8_OES_to_R8G8B8A8_UNORM(GLenum type)
>+{
>+    switch (type)
>+    {
>+        case GL_UNSIGNED_BYTE:
>+            return LoadImageFunctionInfo(LoadETC1RGB8ToRGBA8, true);
>+        default:
>+            UNREACHABLE();
>+            return LoadImageFunctionInfo(UnreachableLoadFunction, true);
>+    }
>+}
>+
>+LoadImageFunctionInfo LUMINANCE_to_R16G16B16A16_FLOAT(GLenum type)
>+{
>+    switch (type)
>+    {
>+        case GL_HALF_FLOAT:
>+            return LoadImageFunctionInfo(LoadL16FToRGBA16F, true);
>+        case GL_HALF_FLOAT_OES:
>+            return LoadImageFunctionInfo(LoadL16FToRGBA16F, true);
>+        case GL_UNSIGNED_BYTE:
>+            return LoadImageFunctionInfo(UnreachableLoadFunction, true);
>+        default:
>+            UNREACHABLE();
>+            return LoadImageFunctionInfo(UnreachableLoadFunction, true);
>+    }
>+}
>+
>+LoadImageFunctionInfo LUMINANCE_to_R32G32B32A32_FLOAT(GLenum type)
>+{
>+    switch (type)
>+    {
>+        case GL_FLOAT:
>+            return LoadImageFunctionInfo(LoadL32FToRGBA32F, true);
>+        case GL_UNSIGNED_BYTE:
>+            return LoadImageFunctionInfo(UnreachableLoadFunction, true);
>+        default:
>+            UNREACHABLE();
>+            return LoadImageFunctionInfo(UnreachableLoadFunction, true);
>+    }
>+}
>+
>+LoadImageFunctionInfo LUMINANCE_to_default(GLenum type)
>+{
>+    switch (type)
>+    {
>+        case GL_UNSIGNED_BYTE:
>+            return LoadImageFunctionInfo(UnreachableLoadFunction, true);
>+        default:
>+            UNREACHABLE();
>+            return LoadImageFunctionInfo(UnreachableLoadFunction, true);
>+    }
>+}
>+
>+LoadImageFunctionInfo LUMINANCE16F_EXT_to_default(GLenum type)
>+{
>+    switch (type)
>+    {
>+        case GL_HALF_FLOAT:
>+            return LoadImageFunctionInfo(LoadL16FToRGBA16F, true);
>+        case GL_HALF_FLOAT_OES:
>+            return LoadImageFunctionInfo(LoadL16FToRGBA16F, true);
>+        default:
>+            UNREACHABLE();
>+            return LoadImageFunctionInfo(UnreachableLoadFunction, true);
>+    }
>+}
>+
>+LoadImageFunctionInfo LUMINANCE32F_EXT_to_default(GLenum type)
>+{
>+    switch (type)
>+    {
>+        case GL_FLOAT:
>+            return LoadImageFunctionInfo(LoadL32FToRGBA32F, true);
>+        default:
>+            UNREACHABLE();
>+            return LoadImageFunctionInfo(UnreachableLoadFunction, true);
>+    }
>+}
>+
>+LoadImageFunctionInfo LUMINANCE8_ALPHA8_EXT_to_R8G8B8A8_UNORM(GLenum type)
>+{
>+    switch (type)
>+    {
>+        case GL_UNSIGNED_BYTE:
>+            return LoadImageFunctionInfo(LoadLA8ToRGBA8, true);
>+        default:
>+            UNREACHABLE();
>+            return LoadImageFunctionInfo(UnreachableLoadFunction, true);
>+    }
>+}
>+
>+LoadImageFunctionInfo LUMINANCE8_ALPHA8_EXT_to_R8G8_UNORM(GLenum type)
>+{
>+    switch (type)
>+    {
>+        case GL_UNSIGNED_BYTE:
>+            return LoadImageFunctionInfo(LoadToNative<GLubyte, 2>, false);
>+        default:
>+            UNREACHABLE();
>+            return LoadImageFunctionInfo(UnreachableLoadFunction, true);
>+    }
>+}
>+
>+LoadImageFunctionInfo LUMINANCE8_EXT_to_R8G8B8A8_UNORM(GLenum type)
>+{
>+    switch (type)
>+    {
>+        case GL_UNSIGNED_BYTE:
>+            return LoadImageFunctionInfo(LoadL8ToRGBA8, true);
>+        default:
>+            UNREACHABLE();
>+            return LoadImageFunctionInfo(UnreachableLoadFunction, true);
>+    }
>+}
>+
>+LoadImageFunctionInfo LUMINANCE8_EXT_to_R8_UNORM(GLenum type)
>+{
>+    switch (type)
>+    {
>+        case GL_UNSIGNED_BYTE:
>+            return LoadImageFunctionInfo(LoadToNative<GLubyte, 1>, false);
>+        default:
>+            UNREACHABLE();
>+            return LoadImageFunctionInfo(UnreachableLoadFunction, true);
>+    }
>+}
>+
>+LoadImageFunctionInfo LUMINANCE_ALPHA_to_R16G16B16A16_FLOAT(GLenum type)
>+{
>+    switch (type)
>+    {
>+        case GL_HALF_FLOAT:
>+            return LoadImageFunctionInfo(LoadLA16FToRGBA16F, true);
>+        case GL_HALF_FLOAT_OES:
>+            return LoadImageFunctionInfo(LoadLA16FToRGBA16F, true);
>+        case GL_UNSIGNED_BYTE:
>+            return LoadImageFunctionInfo(UnreachableLoadFunction, true);
>+        default:
>+            UNREACHABLE();
>+            return LoadImageFunctionInfo(UnreachableLoadFunction, true);
>+    }
>+}
>+
>+LoadImageFunctionInfo LUMINANCE_ALPHA_to_R32G32B32A32_FLOAT(GLenum type)
>+{
>+    switch (type)
>+    {
>+        case GL_FLOAT:
>+            return LoadImageFunctionInfo(LoadLA32FToRGBA32F, true);
>+        case GL_UNSIGNED_BYTE:
>+            return LoadImageFunctionInfo(UnreachableLoadFunction, true);
>+        default:
>+            UNREACHABLE();
>+            return LoadImageFunctionInfo(UnreachableLoadFunction, true);
>+    }
>+}
>+
>+LoadImageFunctionInfo LUMINANCE_ALPHA_to_default(GLenum type)
>+{
>+    switch (type)
>+    {
>+        case GL_UNSIGNED_BYTE:
>+            return LoadImageFunctionInfo(UnreachableLoadFunction, true);
>+        default:
>+            UNREACHABLE();
>+            return LoadImageFunctionInfo(UnreachableLoadFunction, true);
>+    }
>+}
>+
>+LoadImageFunctionInfo LUMINANCE_ALPHA16F_EXT_to_default(GLenum type)
>+{
>+    switch (type)
>+    {
>+        case GL_HALF_FLOAT:
>+            return LoadImageFunctionInfo(LoadLA16FToRGBA16F, true);
>+        case GL_HALF_FLOAT_OES:
>+            return LoadImageFunctionInfo(LoadLA16FToRGBA16F, true);
>+        default:
>+            UNREACHABLE();
>+            return LoadImageFunctionInfo(UnreachableLoadFunction, true);
>+    }
>+}
>+
>+LoadImageFunctionInfo LUMINANCE_ALPHA32F_EXT_to_default(GLenum type)
>+{
>+    switch (type)
>+    {
>+        case GL_FLOAT:
>+            return LoadImageFunctionInfo(LoadLA32FToRGBA32F, true);
>+        default:
>+            UNREACHABLE();
>+            return LoadImageFunctionInfo(UnreachableLoadFunction, true);
>+    }
>+}
>+
>+LoadImageFunctionInfo R11F_G11F_B10F_to_R11G11B10_FLOAT(GLenum type)
>+{
>+    switch (type)
>+    {
>+        case GL_FLOAT:
>+            return LoadImageFunctionInfo(LoadRGB32FToRG11B10F, true);
>+        case GL_HALF_FLOAT:
>+            return LoadImageFunctionInfo(LoadRGB16FToRG11B10F, true);
>+        case GL_HALF_FLOAT_OES:
>+            return LoadImageFunctionInfo(LoadRGB16FToRG11B10F, true);
>+        case GL_UNSIGNED_INT_10F_11F_11F_REV:
>+            return LoadImageFunctionInfo(LoadToNative<GLuint, 1>, false);
>+        default:
>+            UNREACHABLE();
>+            return LoadImageFunctionInfo(UnreachableLoadFunction, true);
>+    }
>+}
>+
>+LoadImageFunctionInfo R16F_to_R16_FLOAT(GLenum type)
>+{
>+    switch (type)
>+    {
>+        case GL_FLOAT:
>+            return LoadImageFunctionInfo(Load32FTo16F<1>, true);
>+        case GL_HALF_FLOAT:
>+            return LoadImageFunctionInfo(LoadToNative<GLhalf, 1>, false);
>+        case GL_HALF_FLOAT_OES:
>+            return LoadImageFunctionInfo(LoadToNative<GLhalf, 1>, false);
>+        default:
>+            UNREACHABLE();
>+            return LoadImageFunctionInfo(UnreachableLoadFunction, true);
>+    }
>+}
>+
>+LoadImageFunctionInfo R16I_to_R16_SINT(GLenum type)
>+{
>+    switch (type)
>+    {
>+        case GL_SHORT:
>+            return LoadImageFunctionInfo(LoadToNative<GLshort, 1>, false);
>+        default:
>+            UNREACHABLE();
>+            return LoadImageFunctionInfo(UnreachableLoadFunction, true);
>+    }
>+}
>+
>+LoadImageFunctionInfo R16UI_to_R16_UINT(GLenum type)
>+{
>+    switch (type)
>+    {
>+        case GL_UNSIGNED_SHORT:
>+            return LoadImageFunctionInfo(LoadToNative<GLushort, 1>, false);
>+        default:
>+            UNREACHABLE();
>+            return LoadImageFunctionInfo(UnreachableLoadFunction, true);
>+    }
>+}
>+
>+LoadImageFunctionInfo R16_EXT_to_R16_UNORM(GLenum type)
>+{
>+    switch (type)
>+    {
>+        case GL_UNSIGNED_SHORT:
>+            return LoadImageFunctionInfo(LoadToNative<GLushort, 1>, false);
>+        default:
>+            UNREACHABLE();
>+            return LoadImageFunctionInfo(UnreachableLoadFunction, true);
>+    }
>+}
>+
>+LoadImageFunctionInfo R16_SNORM_EXT_to_R16_SNORM(GLenum type)
>+{
>+    switch (type)
>+    {
>+        case GL_SHORT:
>+            return LoadImageFunctionInfo(LoadToNative<GLushort, 1>, false);
>+        default:
>+            UNREACHABLE();
>+            return LoadImageFunctionInfo(UnreachableLoadFunction, true);
>+    }
>+}
>+
>+LoadImageFunctionInfo R16_SSCALED_ANGLEX_to_default(GLenum type)
>+{
>+    switch (type)
>+    {
>+        case GL_UNSIGNED_BYTE:
>+            return LoadImageFunctionInfo(UnreachableLoadFunction, true);
>+        default:
>+            UNREACHABLE();
>+            return LoadImageFunctionInfo(UnreachableLoadFunction, true);
>+    }
>+}
>+
>+LoadImageFunctionInfo R16_USCALED_ANGLEX_to_default(GLenum type)
>+{
>+    switch (type)
>+    {
>+        case GL_UNSIGNED_BYTE:
>+            return LoadImageFunctionInfo(UnreachableLoadFunction, true);
>+        default:
>+            UNREACHABLE();
>+            return LoadImageFunctionInfo(UnreachableLoadFunction, true);
>+    }
>+}
>+
>+LoadImageFunctionInfo R32F_to_R32_FLOAT(GLenum type)
>+{
>+    switch (type)
>+    {
>+        case GL_FLOAT:
>+            return LoadImageFunctionInfo(LoadToNative<GLfloat, 1>, false);
>+        default:
>+            UNREACHABLE();
>+            return LoadImageFunctionInfo(UnreachableLoadFunction, true);
>+    }
>+}
>+
>+LoadImageFunctionInfo R32I_to_R32_SINT(GLenum type)
>+{
>+    switch (type)
>+    {
>+        case GL_INT:
>+            return LoadImageFunctionInfo(LoadToNative<GLint, 1>, false);
>+        default:
>+            UNREACHABLE();
>+            return LoadImageFunctionInfo(UnreachableLoadFunction, true);
>+    }
>+}
>+
>+LoadImageFunctionInfo R32UI_to_R32_UINT(GLenum type)
>+{
>+    switch (type)
>+    {
>+        case GL_UNSIGNED_INT:
>+            return LoadImageFunctionInfo(LoadToNative<GLuint, 1>, false);
>+        default:
>+            UNREACHABLE();
>+            return LoadImageFunctionInfo(UnreachableLoadFunction, true);
>+    }
>+}
>+
>+LoadImageFunctionInfo R8_to_R8_UNORM(GLenum type)
>+{
>+    switch (type)
>+    {
>+        case GL_UNSIGNED_BYTE:
>+            return LoadImageFunctionInfo(LoadToNative<GLubyte, 1>, false);
>+        default:
>+            UNREACHABLE();
>+            return LoadImageFunctionInfo(UnreachableLoadFunction, true);
>+    }
>+}
>+
>+LoadImageFunctionInfo R8I_to_R8_SINT(GLenum type)
>+{
>+    switch (type)
>+    {
>+        case GL_BYTE:
>+            return LoadImageFunctionInfo(LoadToNative<GLbyte, 1>, false);
>+        default:
>+            UNREACHABLE();
>+            return LoadImageFunctionInfo(UnreachableLoadFunction, true);
>+    }
>+}
>+
>+LoadImageFunctionInfo R8UI_to_R8_UINT(GLenum type)
>+{
>+    switch (type)
>+    {
>+        case GL_UNSIGNED_BYTE:
>+            return LoadImageFunctionInfo(LoadToNative<GLubyte, 1>, false);
>+        default:
>+            UNREACHABLE();
>+            return LoadImageFunctionInfo(UnreachableLoadFunction, true);
>+    }
>+}
>+
>+LoadImageFunctionInfo R8_SNORM_to_R8_SNORM(GLenum type)
>+{
>+    switch (type)
>+    {
>+        case GL_BYTE:
>+            return LoadImageFunctionInfo(LoadToNative<GLbyte, 1>, false);
>+        default:
>+            UNREACHABLE();
>+            return LoadImageFunctionInfo(UnreachableLoadFunction, true);
>+    }
>+}
>+
>+LoadImageFunctionInfo R8_SSCALED_ANGLEX_to_default(GLenum type)
>+{
>+    switch (type)
>+    {
>+        case GL_UNSIGNED_BYTE:
>+            return LoadImageFunctionInfo(UnreachableLoadFunction, true);
>+        default:
>+            UNREACHABLE();
>+            return LoadImageFunctionInfo(UnreachableLoadFunction, true);
>+    }
>+}
>+
>+LoadImageFunctionInfo R8_USCALED_ANGLEX_to_default(GLenum type)
>+{
>+    switch (type)
>+    {
>+        case GL_UNSIGNED_BYTE:
>+            return LoadImageFunctionInfo(UnreachableLoadFunction, true);
>+        default:
>+            UNREACHABLE();
>+            return LoadImageFunctionInfo(UnreachableLoadFunction, true);
>+    }
>+}
>+
>+LoadImageFunctionInfo RG16F_to_R16G16_FLOAT(GLenum type)
>+{
>+    switch (type)
>+    {
>+        case GL_FLOAT:
>+            return LoadImageFunctionInfo(Load32FTo16F<2>, true);
>+        case GL_HALF_FLOAT:
>+            return LoadImageFunctionInfo(LoadToNative<GLhalf, 2>, false);
>+        case GL_HALF_FLOAT_OES:
>+            return LoadImageFunctionInfo(LoadToNative<GLhalf, 2>, false);
>+        default:
>+            UNREACHABLE();
>+            return LoadImageFunctionInfo(UnreachableLoadFunction, true);
>+    }
>+}
>+
>+LoadImageFunctionInfo RG16I_to_R16G16_SINT(GLenum type)
>+{
>+    switch (type)
>+    {
>+        case GL_SHORT:
>+            return LoadImageFunctionInfo(LoadToNative<GLshort, 2>, false);
>+        default:
>+            UNREACHABLE();
>+            return LoadImageFunctionInfo(UnreachableLoadFunction, true);
>+    }
>+}
>+
>+LoadImageFunctionInfo RG16UI_to_R16G16_UINT(GLenum type)
> {
>     switch (type)
>     {
>@@ -970,6 +1670,30 @@ LoadImageFunctionInfo RG16_SNORM_EXT_to_R16G16_SNORM(GLenum type)
>     }
> }
> 
>+LoadImageFunctionInfo RG16_SSCALED_ANGLEX_to_default(GLenum type)
>+{
>+    switch (type)
>+    {
>+        case GL_UNSIGNED_BYTE:
>+            return LoadImageFunctionInfo(UnreachableLoadFunction, true);
>+        default:
>+            UNREACHABLE();
>+            return LoadImageFunctionInfo(UnreachableLoadFunction, true);
>+    }
>+}
>+
>+LoadImageFunctionInfo RG16_USCALED_ANGLEX_to_default(GLenum type)
>+{
>+    switch (type)
>+    {
>+        case GL_UNSIGNED_BYTE:
>+            return LoadImageFunctionInfo(UnreachableLoadFunction, true);
>+        default:
>+            UNREACHABLE();
>+            return LoadImageFunctionInfo(UnreachableLoadFunction, true);
>+    }
>+}
>+
> LoadImageFunctionInfo RG32F_to_R32G32_FLOAT(GLenum type)
> {
>     switch (type)
>@@ -986,213 +1710,427 @@ LoadImageFunctionInfo RG32I_to_R32G32_SINT(GLenum type)
> {
>     switch (type)
>     {
>-        case GL_INT:
>-            return LoadImageFunctionInfo(LoadToNative<GLint, 2>, false);
>+        case GL_INT:
>+            return LoadImageFunctionInfo(LoadToNative<GLint, 2>, false);
>+        default:
>+            UNREACHABLE();
>+            return LoadImageFunctionInfo(UnreachableLoadFunction, true);
>+    }
>+}
>+
>+LoadImageFunctionInfo RG32UI_to_R32G32_UINT(GLenum type)
>+{
>+    switch (type)
>+    {
>+        case GL_UNSIGNED_INT:
>+            return LoadImageFunctionInfo(LoadToNative<GLuint, 2>, false);
>+        default:
>+            UNREACHABLE();
>+            return LoadImageFunctionInfo(UnreachableLoadFunction, true);
>+    }
>+}
>+
>+LoadImageFunctionInfo RG8_to_R8G8_UNORM(GLenum type)
>+{
>+    switch (type)
>+    {
>+        case GL_UNSIGNED_BYTE:
>+            return LoadImageFunctionInfo(LoadToNative<GLubyte, 2>, false);
>+        default:
>+            UNREACHABLE();
>+            return LoadImageFunctionInfo(UnreachableLoadFunction, true);
>+    }
>+}
>+
>+LoadImageFunctionInfo RG8I_to_R8G8_SINT(GLenum type)
>+{
>+    switch (type)
>+    {
>+        case GL_BYTE:
>+            return LoadImageFunctionInfo(LoadToNative<GLbyte, 2>, false);
>+        default:
>+            UNREACHABLE();
>+            return LoadImageFunctionInfo(UnreachableLoadFunction, true);
>+    }
>+}
>+
>+LoadImageFunctionInfo RG8UI_to_R8G8_UINT(GLenum type)
>+{
>+    switch (type)
>+    {
>+        case GL_UNSIGNED_BYTE:
>+            return LoadImageFunctionInfo(LoadToNative<GLubyte, 2>, false);
>+        default:
>+            UNREACHABLE();
>+            return LoadImageFunctionInfo(UnreachableLoadFunction, true);
>+    }
>+}
>+
>+LoadImageFunctionInfo RG8_SNORM_to_R8G8_SNORM(GLenum type)
>+{
>+    switch (type)
>+    {
>+        case GL_BYTE:
>+            return LoadImageFunctionInfo(LoadToNative<GLbyte, 2>, false);
>+        default:
>+            UNREACHABLE();
>+            return LoadImageFunctionInfo(UnreachableLoadFunction, true);
>+    }
>+}
>+
>+LoadImageFunctionInfo RG8_SSCALED_ANGLEX_to_default(GLenum type)
>+{
>+    switch (type)
>+    {
>+        case GL_UNSIGNED_BYTE:
>+            return LoadImageFunctionInfo(UnreachableLoadFunction, true);
>+        default:
>+            UNREACHABLE();
>+            return LoadImageFunctionInfo(UnreachableLoadFunction, true);
>+    }
>+}
>+
>+LoadImageFunctionInfo RG8_USCALED_ANGLEX_to_default(GLenum type)
>+{
>+    switch (type)
>+    {
>+        case GL_UNSIGNED_BYTE:
>+            return LoadImageFunctionInfo(UnreachableLoadFunction, true);
>+        default:
>+            UNREACHABLE();
>+            return LoadImageFunctionInfo(UnreachableLoadFunction, true);
>+    }
>+}
>+
>+LoadImageFunctionInfo RGB_to_default(GLenum type)
>+{
>+    switch (type)
>+    {
>+        case GL_UNSIGNED_BYTE:
>+            return LoadImageFunctionInfo(UnreachableLoadFunction, true);
>+        case GL_UNSIGNED_SHORT_5_6_5:
>+            return LoadImageFunctionInfo(UnreachableLoadFunction, true);
>+        default:
>+            UNREACHABLE();
>+            return LoadImageFunctionInfo(UnreachableLoadFunction, true);
>+    }
>+}
>+
>+LoadImageFunctionInfo RGB10_A2_to_R10G10B10A2_UNORM(GLenum type)
>+{
>+    switch (type)
>+    {
>+        case GL_UNSIGNED_INT_2_10_10_10_REV:
>+            return LoadImageFunctionInfo(LoadToNative<GLuint, 1>, false);
>+        default:
>+            UNREACHABLE();
>+            return LoadImageFunctionInfo(UnreachableLoadFunction, true);
>+    }
>+}
>+
>+LoadImageFunctionInfo RGB10_A2UI_to_R10G10B10A2_UINT(GLenum type)
>+{
>+    switch (type)
>+    {
>+        case GL_UNSIGNED_INT_2_10_10_10_REV:
>+            return LoadImageFunctionInfo(LoadToNative<GLuint, 1>, false);
>+        default:
>+            UNREACHABLE();
>+            return LoadImageFunctionInfo(UnreachableLoadFunction, true);
>+    }
>+}
>+
>+LoadImageFunctionInfo RGB10_A2_SINT_ANGLEX_to_R10G10B10A2_SINT(GLenum type)
>+{
>+    switch (type)
>+    {
>+        case GL_UNSIGNED_BYTE:
>+            return LoadImageFunctionInfo(LoadRGB10A2ToRGBA8, true);
>+        case GL_UNSIGNED_INT_2_10_10_10_REV:
>+            return LoadImageFunctionInfo(LoadToNative<GLuint, 1>, false);
>+        default:
>+            UNREACHABLE();
>+            return LoadImageFunctionInfo(UnreachableLoadFunction, true);
>+    }
>+}
>+
>+LoadImageFunctionInfo RGB10_A2_SNORM_ANGLEX_to_R10G10B10A2_SNORM(GLenum type)
>+{
>+    switch (type)
>+    {
>+        case GL_UNSIGNED_BYTE:
>+            return LoadImageFunctionInfo(LoadRGB10A2ToRGBA8, true);
>+        case GL_UNSIGNED_INT_2_10_10_10_REV:
>+            return LoadImageFunctionInfo(LoadToNative<GLuint, 1>, false);
>+        default:
>+            UNREACHABLE();
>+            return LoadImageFunctionInfo(UnreachableLoadFunction, true);
>+    }
>+}
>+
>+LoadImageFunctionInfo RGB10_A2_SSCALED_ANGLEX_to_default(GLenum type)
>+{
>+    switch (type)
>+    {
>+        case GL_UNSIGNED_BYTE:
>+            return LoadImageFunctionInfo(UnreachableLoadFunction, true);
>+        default:
>+            UNREACHABLE();
>+            return LoadImageFunctionInfo(UnreachableLoadFunction, true);
>+    }
>+}
>+
>+LoadImageFunctionInfo RGB10_A2_USCALED_ANGLEX_to_default(GLenum type)
>+{
>+    switch (type)
>+    {
>+        case GL_UNSIGNED_BYTE:
>+            return LoadImageFunctionInfo(UnreachableLoadFunction, true);
>+        default:
>+            UNREACHABLE();
>+            return LoadImageFunctionInfo(UnreachableLoadFunction, true);
>+    }
>+}
>+
>+LoadImageFunctionInfo RGB16F_to_R16G16B16A16_FLOAT(GLenum type)
>+{
>+    switch (type)
>+    {
>+        case GL_FLOAT:
>+            return LoadImageFunctionInfo(LoadRGB32FToRGBA16F, true);
>+        case GL_HALF_FLOAT:
>+            return LoadImageFunctionInfo(LoadToNative3To4<GLhalf, gl::Float16One>, true);
>+        case GL_HALF_FLOAT_OES:
>+            return LoadImageFunctionInfo(LoadToNative3To4<GLhalf, gl::Float16One>, true);
>+        default:
>+            UNREACHABLE();
>+            return LoadImageFunctionInfo(UnreachableLoadFunction, true);
>+    }
>+}
>+
>+LoadImageFunctionInfo RGB16F_to_R16G16B16_FLOAT(GLenum type)
>+{
>+    switch (type)
>+    {
>+        case GL_FLOAT:
>+            return LoadImageFunctionInfo(LoadRGB32FToRGB16F, true);
>+        case GL_HALF_FLOAT:
>+            return LoadImageFunctionInfo(LoadToNative<GLhalf, 3>, false);
>+        case GL_HALF_FLOAT_OES:
>+            return LoadImageFunctionInfo(LoadToNative<GLhalf, 3>, false);
>+        default:
>+            UNREACHABLE();
>+            return LoadImageFunctionInfo(UnreachableLoadFunction, true);
>+    }
>+}
>+
>+LoadImageFunctionInfo RGB16I_to_R16G16B16A16_SINT(GLenum type)
>+{
>+    switch (type)
>+    {
>+        case GL_SHORT:
>+            return LoadImageFunctionInfo(LoadToNative3To4<GLshort, 0x0001>, true);
>         default:
>             UNREACHABLE();
>             return LoadImageFunctionInfo(UnreachableLoadFunction, true);
>     }
> }
> 
>-LoadImageFunctionInfo RG32UI_to_R32G32_UINT(GLenum type)
>+LoadImageFunctionInfo RGB16I_to_R16G16B16_SINT(GLenum type)
> {
>     switch (type)
>     {
>-        case GL_UNSIGNED_INT:
>-            return LoadImageFunctionInfo(LoadToNative<GLuint, 2>, false);
>+        case GL_SHORT:
>+            return LoadImageFunctionInfo(LoadToNative<GLshort, 3>, false);
>         default:
>             UNREACHABLE();
>             return LoadImageFunctionInfo(UnreachableLoadFunction, true);
>     }
> }
> 
>-LoadImageFunctionInfo RG8_to_R8G8_UNORM(GLenum type)
>+LoadImageFunctionInfo RGB16UI_to_R16G16B16A16_UINT(GLenum type)
> {
>     switch (type)
>     {
>-        case GL_UNSIGNED_BYTE:
>-            return LoadImageFunctionInfo(LoadToNative<GLubyte, 2>, false);
>+        case GL_UNSIGNED_SHORT:
>+            return LoadImageFunctionInfo(LoadToNative3To4<GLushort, 0x0001>, true);
>         default:
>             UNREACHABLE();
>             return LoadImageFunctionInfo(UnreachableLoadFunction, true);
>     }
> }
> 
>-LoadImageFunctionInfo RG8I_to_R8G8_SINT(GLenum type)
>+LoadImageFunctionInfo RGB16UI_to_R16G16B16_UINT(GLenum type)
> {
>     switch (type)
>     {
>-        case GL_BYTE:
>-            return LoadImageFunctionInfo(LoadToNative<GLbyte, 2>, false);
>+        case GL_UNSIGNED_SHORT:
>+            return LoadImageFunctionInfo(LoadToNative<GLushort, 3>, false);
>         default:
>             UNREACHABLE();
>             return LoadImageFunctionInfo(UnreachableLoadFunction, true);
>     }
> }
> 
>-LoadImageFunctionInfo RG8UI_to_R8G8_UINT(GLenum type)
>+LoadImageFunctionInfo RGB16_EXT_to_R16G16B16A16_UNORM(GLenum type)
> {
>     switch (type)
>     {
>-        case GL_UNSIGNED_BYTE:
>-            return LoadImageFunctionInfo(LoadToNative<GLubyte, 2>, false);
>+        case GL_UNSIGNED_SHORT:
>+            return LoadImageFunctionInfo(LoadToNative3To4<GLushort, 0xFFFF>, true);
>         default:
>             UNREACHABLE();
>             return LoadImageFunctionInfo(UnreachableLoadFunction, true);
>     }
> }
> 
>-LoadImageFunctionInfo RG8_SNORM_to_R8G8_SNORM(GLenum type)
>+LoadImageFunctionInfo RGB16_EXT_to_R16G16B16_UNORM(GLenum type)
> {
>     switch (type)
>     {
>-        case GL_BYTE:
>-            return LoadImageFunctionInfo(LoadToNative<GLbyte, 2>, false);
>+        case GL_UNSIGNED_SHORT:
>+            return LoadImageFunctionInfo(LoadToNative<GLushort, 3>, false);
>         default:
>             UNREACHABLE();
>             return LoadImageFunctionInfo(UnreachableLoadFunction, true);
>     }
> }
> 
>-LoadImageFunctionInfo RGB_to_default(GLenum type)
>+LoadImageFunctionInfo RGB16_SNORM_EXT_to_R16G16B16A16_SNORM(GLenum type)
> {
>     switch (type)
>     {
>-        case GL_UNSIGNED_BYTE:
>-            return LoadImageFunctionInfo(UnreachableLoadFunction, true);
>-        case GL_UNSIGNED_SHORT_5_6_5:
>-            return LoadImageFunctionInfo(UnreachableLoadFunction, true);
>+        case GL_SHORT:
>+            return LoadImageFunctionInfo(LoadToNative3To4<GLushort, 0x7FFF>, true);
>         default:
>             UNREACHABLE();
>             return LoadImageFunctionInfo(UnreachableLoadFunction, true);
>     }
> }
> 
>-LoadImageFunctionInfo RGB10_A2_to_R10G10B10A2_UNORM(GLenum type)
>+LoadImageFunctionInfo RGB16_SNORM_EXT_to_R16G16B16_SNORM(GLenum type)
> {
>     switch (type)
>     {
>-        case GL_UNSIGNED_INT_2_10_10_10_REV:
>-            return LoadImageFunctionInfo(LoadToNative<GLuint, 1>, false);
>+        case GL_SHORT:
>+            return LoadImageFunctionInfo(LoadToNative<GLushort, 3>, false);
>         default:
>             UNREACHABLE();
>             return LoadImageFunctionInfo(UnreachableLoadFunction, true);
>     }
> }
> 
>-LoadImageFunctionInfo RGB10_A2UI_to_R10G10B10A2_UINT(GLenum type)
>+LoadImageFunctionInfo RGB16_SSCALED_ANGLEX_to_default(GLenum type)
> {
>     switch (type)
>     {
>-        case GL_UNSIGNED_INT_2_10_10_10_REV:
>-            return LoadImageFunctionInfo(LoadToNative<GLuint, 1>, false);
>+        case GL_UNSIGNED_BYTE:
>+            return LoadImageFunctionInfo(UnreachableLoadFunction, true);
>         default:
>             UNREACHABLE();
>             return LoadImageFunctionInfo(UnreachableLoadFunction, true);
>     }
> }
> 
>-LoadImageFunctionInfo RGB16F_to_R16G16B16A16_FLOAT(GLenum type)
>+LoadImageFunctionInfo RGB16_USCALED_ANGLEX_to_default(GLenum type)
> {
>     switch (type)
>     {
>-        case GL_FLOAT:
>-            return LoadImageFunctionInfo(LoadRGB32FToRGBA16F, true);
>-        case GL_HALF_FLOAT:
>-            return LoadImageFunctionInfo(LoadToNative3To4<GLhalf, gl::Float16One>, true);
>-        case GL_HALF_FLOAT_OES:
>-            return LoadImageFunctionInfo(LoadToNative3To4<GLhalf, gl::Float16One>, true);
>+        case GL_UNSIGNED_BYTE:
>+            return LoadImageFunctionInfo(UnreachableLoadFunction, true);
>         default:
>             UNREACHABLE();
>             return LoadImageFunctionInfo(UnreachableLoadFunction, true);
>     }
> }
> 
>-LoadImageFunctionInfo RGB16I_to_R16G16B16A16_SINT(GLenum type)
>+LoadImageFunctionInfo RGB32F_to_R32G32B32A32_FLOAT(GLenum type)
> {
>     switch (type)
>     {
>-        case GL_SHORT:
>-            return LoadImageFunctionInfo(LoadToNative3To4<GLshort, 0x0001>, true);
>+        case GL_FLOAT:
>+            return LoadImageFunctionInfo(LoadToNative3To4<GLfloat, gl::Float32One>, true);
>         default:
>             UNREACHABLE();
>             return LoadImageFunctionInfo(UnreachableLoadFunction, true);
>     }
> }
> 
>-LoadImageFunctionInfo RGB16UI_to_R16G16B16A16_UINT(GLenum type)
>+LoadImageFunctionInfo RGB32F_to_R32G32B32_FLOAT(GLenum type)
> {
>     switch (type)
>     {
>-        case GL_UNSIGNED_SHORT:
>-            return LoadImageFunctionInfo(LoadToNative3To4<GLushort, 0x0001>, true);
>+        case GL_FLOAT:
>+            return LoadImageFunctionInfo(LoadToNative<GLfloat, 3>, false);
>         default:
>             UNREACHABLE();
>             return LoadImageFunctionInfo(UnreachableLoadFunction, true);
>     }
> }
> 
>-LoadImageFunctionInfo RGB16_EXT_to_R16G16B16A16_UNORM(GLenum type)
>+LoadImageFunctionInfo RGB32I_to_R32G32B32A32_SINT(GLenum type)
> {
>     switch (type)
>     {
>-        case GL_UNSIGNED_SHORT:
>-            return LoadImageFunctionInfo(LoadToNative3To4<GLushort, 0xFFFF>, true);
>+        case GL_INT:
>+            return LoadImageFunctionInfo(LoadToNative3To4<GLint, 0x00000001>, true);
>         default:
>             UNREACHABLE();
>             return LoadImageFunctionInfo(UnreachableLoadFunction, true);
>     }
> }
> 
>-LoadImageFunctionInfo RGB16_SNORM_EXT_to_R16G16B16A16_SNORM(GLenum type)
>+LoadImageFunctionInfo RGB32I_to_R32G32B32_SINT(GLenum type)
> {
>     switch (type)
>     {
>-        case GL_SHORT:
>-            return LoadImageFunctionInfo(LoadToNative3To4<GLushort, 0x7FFF>, true);
>+        case GL_INT:
>+            return LoadImageFunctionInfo(LoadToNative<GLint, 3>, false);
>         default:
>             UNREACHABLE();
>             return LoadImageFunctionInfo(UnreachableLoadFunction, true);
>     }
> }
> 
>-LoadImageFunctionInfo RGB32F_to_R32G32B32A32_FLOAT(GLenum type)
>+LoadImageFunctionInfo RGB32UI_to_R32G32B32A32_UINT(GLenum type)
> {
>     switch (type)
>     {
>-        case GL_FLOAT:
>-            return LoadImageFunctionInfo(LoadToNative3To4<GLfloat, gl::Float32One>, true);
>+        case GL_UNSIGNED_INT:
>+            return LoadImageFunctionInfo(LoadToNative3To4<GLuint, 0x00000001>, true);
>         default:
>             UNREACHABLE();
>             return LoadImageFunctionInfo(UnreachableLoadFunction, true);
>     }
> }
> 
>-LoadImageFunctionInfo RGB32I_to_R32G32B32A32_SINT(GLenum type)
>+LoadImageFunctionInfo RGB32UI_to_R32G32B32_UINT(GLenum type)
> {
>     switch (type)
>     {
>-        case GL_INT:
>-            return LoadImageFunctionInfo(LoadToNative3To4<GLint, 0x00000001>, true);
>+        case GL_UNSIGNED_INT:
>+            return LoadImageFunctionInfo(LoadToNative<GLuint, 3>, false);
>         default:
>             UNREACHABLE();
>             return LoadImageFunctionInfo(UnreachableLoadFunction, true);
>     }
> }
> 
>-LoadImageFunctionInfo RGB32UI_to_R32G32B32A32_UINT(GLenum type)
>+LoadImageFunctionInfo RGB565_to_B5G6R5_UNORM(GLenum type)
> {
>     switch (type)
>     {
>-        case GL_UNSIGNED_INT:
>-            return LoadImageFunctionInfo(LoadToNative3To4<GLuint, 0x00000001>, true);
>+        case GL_UNSIGNED_BYTE:
>+            return LoadImageFunctionInfo(LoadRGB8ToBGR565, true);
>+        case GL_UNSIGNED_SHORT_5_6_5:
>+            return LoadImageFunctionInfo(LoadToNative<GLushort, 1>, false);
>         default:
>             UNREACHABLE();
>             return LoadImageFunctionInfo(UnreachableLoadFunction, true);
>     }
> }
> 
>-LoadImageFunctionInfo RGB565_to_B5G6R5_UNORM(GLenum type)
>+LoadImageFunctionInfo RGB565_to_R5G6B5_UNORM(GLenum type)
> {
>     switch (type)
>     {
>@@ -1220,6 +2158,18 @@ LoadImageFunctionInfo RGB565_to_R8G8B8A8_UNORM(GLenum type)
>     }
> }
> 
>+LoadImageFunctionInfo RGB5_A1_to_A1R5G5B5_UNORM(GLenum type)
>+{
>+    switch (type)
>+    {
>+        case GL_UNSIGNED_SHORT_5_5_5_1:
>+            return LoadImageFunctionInfo(LoadRGB5A1ToA1RGB5, true);
>+        default:
>+            UNREACHABLE();
>+            return LoadImageFunctionInfo(UnreachableLoadFunction, true);
>+    }
>+}
>+
> LoadImageFunctionInfo RGB5_A1_to_B5G5R5A1_UNORM(GLenum type)
> {
>     switch (type)
>@@ -1276,6 +2226,18 @@ LoadImageFunctionInfo RGB8I_to_R8G8B8A8_SINT(GLenum type)
>     }
> }
> 
>+LoadImageFunctionInfo RGB8I_to_R8G8B8_SINT(GLenum type)
>+{
>+    switch (type)
>+    {
>+        case GL_BYTE:
>+            return LoadImageFunctionInfo(LoadToNative<GLbyte, 3>, false);
>+        default:
>+            UNREACHABLE();
>+            return LoadImageFunctionInfo(UnreachableLoadFunction, true);
>+    }
>+}
>+
> LoadImageFunctionInfo RGB8UI_to_R8G8B8A8_UINT(GLenum type)
> {
>     switch (type)
>@@ -1288,6 +2250,18 @@ LoadImageFunctionInfo RGB8UI_to_R8G8B8A8_UINT(GLenum type)
>     }
> }
> 
>+LoadImageFunctionInfo RGB8UI_to_R8G8B8_UINT(GLenum type)
>+{
>+    switch (type)
>+    {
>+        case GL_UNSIGNED_BYTE:
>+            return LoadImageFunctionInfo(LoadToNative<GLubyte, 3>, false);
>+        default:
>+            UNREACHABLE();
>+            return LoadImageFunctionInfo(UnreachableLoadFunction, true);
>+    }
>+}
>+
> LoadImageFunctionInfo RGB8_SNORM_to_R8G8B8A8_SNORM(GLenum type)
> {
>     switch (type)
>@@ -1300,6 +2274,42 @@ LoadImageFunctionInfo RGB8_SNORM_to_R8G8B8A8_SNORM(GLenum type)
>     }
> }
> 
>+LoadImageFunctionInfo RGB8_SNORM_to_R8G8B8_SNORM(GLenum type)
>+{
>+    switch (type)
>+    {
>+        case GL_BYTE:
>+            return LoadImageFunctionInfo(LoadToNative<GLbyte, 3>, false);
>+        default:
>+            UNREACHABLE();
>+            return LoadImageFunctionInfo(UnreachableLoadFunction, true);
>+    }
>+}
>+
>+LoadImageFunctionInfo RGB8_SSCALED_ANGLEX_to_default(GLenum type)
>+{
>+    switch (type)
>+    {
>+        case GL_UNSIGNED_BYTE:
>+            return LoadImageFunctionInfo(UnreachableLoadFunction, true);
>+        default:
>+            UNREACHABLE();
>+            return LoadImageFunctionInfo(UnreachableLoadFunction, true);
>+    }
>+}
>+
>+LoadImageFunctionInfo RGB8_USCALED_ANGLEX_to_default(GLenum type)
>+{
>+    switch (type)
>+    {
>+        case GL_UNSIGNED_BYTE:
>+            return LoadImageFunctionInfo(UnreachableLoadFunction, true);
>+        default:
>+            UNREACHABLE();
>+            return LoadImageFunctionInfo(UnreachableLoadFunction, true);
>+    }
>+}
>+
> LoadImageFunctionInfo RGB9_E5_to_R9G9B9E5_SHAREDEXP(GLenum type)
> {
>     switch (type)
>@@ -1398,6 +2408,30 @@ LoadImageFunctionInfo RGBA16_SNORM_EXT_to_R16G16B16A16_SNORM(GLenum type)
>     }
> }
> 
>+LoadImageFunctionInfo RGBA16_SSCALED_ANGLEX_to_default(GLenum type)
>+{
>+    switch (type)
>+    {
>+        case GL_UNSIGNED_BYTE:
>+            return LoadImageFunctionInfo(UnreachableLoadFunction, true);
>+        default:
>+            UNREACHABLE();
>+            return LoadImageFunctionInfo(UnreachableLoadFunction, true);
>+    }
>+}
>+
>+LoadImageFunctionInfo RGBA16_USCALED_ANGLEX_to_default(GLenum type)
>+{
>+    switch (type)
>+    {
>+        case GL_UNSIGNED_BYTE:
>+            return LoadImageFunctionInfo(UnreachableLoadFunction, true);
>+        default:
>+            UNREACHABLE();
>+            return LoadImageFunctionInfo(UnreachableLoadFunction, true);
>+    }
>+}
>+
> LoadImageFunctionInfo RGBA32F_to_R32G32B32A32_FLOAT(GLenum type)
> {
>     switch (type)
>@@ -1510,6 +2544,30 @@ LoadImageFunctionInfo RGBA8_SNORM_to_R8G8B8A8_SNORM(GLenum type)
>     }
> }
> 
>+LoadImageFunctionInfo RGBA8_SSCALED_ANGLEX_to_default(GLenum type)
>+{
>+    switch (type)
>+    {
>+        case GL_UNSIGNED_BYTE:
>+            return LoadImageFunctionInfo(UnreachableLoadFunction, true);
>+        default:
>+            UNREACHABLE();
>+            return LoadImageFunctionInfo(UnreachableLoadFunction, true);
>+    }
>+}
>+
>+LoadImageFunctionInfo RGBA8_USCALED_ANGLEX_to_default(GLenum type)
>+{
>+    switch (type)
>+    {
>+        case GL_UNSIGNED_BYTE:
>+            return LoadImageFunctionInfo(UnreachableLoadFunction, true);
>+        default:
>+            UNREACHABLE();
>+            return LoadImageFunctionInfo(UnreachableLoadFunction, true);
>+    }
>+}
>+
> LoadImageFunctionInfo SRGB8_to_R8G8B8A8_UNORM_SRGB(GLenum type)
> {
>     switch (type)
>@@ -1548,18 +2606,29 @@ LoadImageFunctionInfo STENCIL_INDEX8_to_default(GLenum type)
> 
> }  // namespace
> 
>-LoadFunctionMap GetLoadFunctionsMap(GLenum internalFormat, Format::ID angleFormat)
>+LoadFunctionMap GetLoadFunctionsMap(GLenum internalFormat, FormatID angleFormat)
> {
>     // clang-format off
>     switch (internalFormat)
>     {
>+        case GL_A1RGB5_ANGLEX:
>+        {
>+            switch (angleFormat)
>+            {
>+                case FormatID::A1R5G5B5_UNORM:
>+                    return A1RGB5_ANGLEX_to_A1R5G5B5_UNORM;
>+                default:
>+                    break;
>+            }
>+            break;
>+        }
>         case GL_ALPHA:
>         {
>             switch (angleFormat)
>             {
>-                case Format::ID::R16G16B16A16_FLOAT:
>+                case FormatID::R16G16B16A16_FLOAT:
>                     return ALPHA_to_R16G16B16A16_FLOAT;
>-                case Format::ID::R32G32B32A32_FLOAT:
>+                case FormatID::R32G32B32A32_FLOAT:
>                     return ALPHA_to_R32G32B32A32_FLOAT;
>                 default:
>                     return ALPHA_to_default;
>@@ -1573,23 +2642,27 @@ LoadFunctionMap GetLoadFunctionsMap(GLenum internalFormat, Format::ID angleForma
>         {
>             switch (angleFormat)
>             {
>-                case Format::ID::A8_UNORM:
>+                case FormatID::A8_UNORM:
>                     return ALPHA8_EXT_to_A8_UNORM;
>-                case Format::ID::R8G8B8A8_UNORM:
>+                case FormatID::R8G8B8A8_UNORM:
>                     return ALPHA8_EXT_to_R8G8B8A8_UNORM;
>+                case FormatID::R8_UNORM:
>+                    return ALPHA8_EXT_to_R8_UNORM;
>                 default:
>                     break;
>             }
>+            break;
>         }
>         case GL_BGR565_ANGLEX:
>         {
>             switch (angleFormat)
>             {
>-                case Format::ID::B5G6R5_UNORM:
>+                case FormatID::B5G6R5_UNORM:
>                     return BGR565_ANGLEX_to_B5G6R5_UNORM;
>                 default:
>                     break;
>             }
>+            break;
>         }
>         case GL_BGR5_A1_ANGLEX:
>             return BGR5_A1_ANGLEX_to_default;
>@@ -1597,156 +2670,278 @@ LoadFunctionMap GetLoadFunctionsMap(GLenum internalFormat, Format::ID angleForma
>             return BGRA4_ANGLEX_to_default;
>         case GL_BGRA8_EXT:
>             return BGRA8_EXT_to_default;
>+        case GL_BGRA8_SRGB_ANGLEX:
>+        {
>+            switch (angleFormat)
>+            {
>+                case FormatID::B8G8R8A8_UNORM_SRGB:
>+                    return BGRA8_SRGB_ANGLEX_to_B8G8R8A8_UNORM_SRGB;
>+                default:
>+                    break;
>+            }
>+            break;
>+        }
>         case GL_BGRA_EXT:
>             return BGRA_EXT_to_default;
>+        case GL_BGRX8_ANGLEX:
>+        {
>+            switch (angleFormat)
>+            {
>+                case FormatID::B8G8R8A8_UNORM:
>+                    return BGRX8_ANGLEX_to_B8G8R8A8_UNORM;
>+                case FormatID::B8G8R8X8_UNORM:
>+                    return BGRX8_ANGLEX_to_B8G8R8X8_UNORM;
>+                default:
>+                    break;
>+            }
>+            break;
>+        }
>         case GL_COMPRESSED_R11_EAC:
>         {
>             switch (angleFormat)
>             {
>-                case Format::ID::R8_UNORM:
>-                    return COMPRESSED_R11_EAC_to_R8_UNORM;
>+                case FormatID::EAC_R11_UNORM_BLOCK:
>+                    return COMPRESSED_R11_EAC_to_EAC_R11_UNORM_BLOCK;
>+                case FormatID::R16_UNORM:
>+                    return COMPRESSED_R11_EAC_to_R16_UNORM;
>                 default:
>                     break;
>             }
>+            break;
>         }
>         case GL_COMPRESSED_RG11_EAC:
>         {
>             switch (angleFormat)
>             {
>-                case Format::ID::R8G8_UNORM:
>-                    return COMPRESSED_RG11_EAC_to_R8G8_UNORM;
>+                case FormatID::EAC_R11G11_UNORM_BLOCK:
>+                    return COMPRESSED_RG11_EAC_to_EAC_R11G11_UNORM_BLOCK;
>+                case FormatID::R16G16_UNORM:
>+                    return COMPRESSED_RG11_EAC_to_R16G16_UNORM;
>                 default:
>                     break;
>             }
>+            break;
>         }
>         case GL_COMPRESSED_RGB8_ETC2:
>         {
>             switch (angleFormat)
>             {
>-                case Format::ID::R8G8B8A8_UNORM:
>+                case FormatID::ETC2_R8G8B8_UNORM_BLOCK:
>+                    return COMPRESSED_RGB8_ETC2_to_ETC2_R8G8B8_UNORM_BLOCK;
>+                case FormatID::R8G8B8A8_UNORM:
>                     return COMPRESSED_RGB8_ETC2_to_R8G8B8A8_UNORM;
>                 default:
>                     break;
>             }
>+            break;
>         }
>         case GL_COMPRESSED_RGB8_LOSSY_DECODE_ETC2_ANGLE:
>         {
>             switch (angleFormat)
>             {
>-                case Format::ID::BC1_RGB_UNORM_BLOCK:
>+                case FormatID::BC1_RGB_UNORM_BLOCK:
>                     return COMPRESSED_RGB8_LOSSY_DECODE_ETC2_ANGLE_to_BC1_RGB_UNORM_BLOCK;
>                 default:
>                     break;
>             }
>+            break;
>         }
>         case GL_COMPRESSED_RGB8_PUNCHTHROUGH_ALPHA1_ETC2:
>         {
>             switch (angleFormat)
>             {
>-                case Format::ID::R8G8B8A8_UNORM:
>+                case FormatID::ETC2_R8G8B8A1_UNORM_BLOCK:
>+                    return COMPRESSED_RGB8_PUNCHTHROUGH_ALPHA1_ETC2_to_ETC2_R8G8B8A1_UNORM_BLOCK;
>+                case FormatID::R8G8B8A8_UNORM:
>                     return COMPRESSED_RGB8_PUNCHTHROUGH_ALPHA1_ETC2_to_R8G8B8A8_UNORM;
>                 default:
>                     break;
>             }
>+            break;
>         }
>         case GL_COMPRESSED_RGB8_PUNCHTHROUGH_ALPHA1_LOSSY_DECODE_ETC2_ANGLE:
>         {
>             switch (angleFormat)
>             {
>-                case Format::ID::BC1_RGBA_UNORM_BLOCK:
>+                case FormatID::BC1_RGBA_UNORM_BLOCK:
>                     return COMPRESSED_RGB8_PUNCHTHROUGH_ALPHA1_LOSSY_DECODE_ETC2_ANGLE_to_BC1_RGBA_UNORM_BLOCK;
>                 default:
>                     break;
>             }
>+            break;
>         }
>         case GL_COMPRESSED_RGBA8_ETC2_EAC:
>         {
>             switch (angleFormat)
>             {
>-                case Format::ID::R8G8B8A8_UNORM:
>+                case FormatID::ETC2_R8G8B8A8_UNORM_BLOCK:
>+                    return COMPRESSED_RGBA8_ETC2_EAC_to_ETC2_R8G8B8A8_UNORM_BLOCK;
>+                case FormatID::R8G8B8A8_UNORM:
>                     return COMPRESSED_RGBA8_ETC2_EAC_to_R8G8B8A8_UNORM;
>                 default:
>                     break;
>             }
>-        }
>+            break;
>+        }
>+        case GL_COMPRESSED_RGBA_ASTC_10x10_KHR:
>+            return COMPRESSED_RGBA_ASTC_10x10_KHR_to_default;
>+        case GL_COMPRESSED_RGBA_ASTC_10x5_KHR:
>+            return COMPRESSED_RGBA_ASTC_10x5_KHR_to_default;
>+        case GL_COMPRESSED_RGBA_ASTC_10x6_KHR:
>+            return COMPRESSED_RGBA_ASTC_10x6_KHR_to_default;
>+        case GL_COMPRESSED_RGBA_ASTC_10x8_KHR:
>+            return COMPRESSED_RGBA_ASTC_10x8_KHR_to_default;
>+        case GL_COMPRESSED_RGBA_ASTC_12x10_KHR:
>+            return COMPRESSED_RGBA_ASTC_12x10_KHR_to_default;
>+        case GL_COMPRESSED_RGBA_ASTC_12x12_KHR:
>+            return COMPRESSED_RGBA_ASTC_12x12_KHR_to_default;
>+        case GL_COMPRESSED_RGBA_ASTC_4x4_KHR:
>+            return COMPRESSED_RGBA_ASTC_4x4_KHR_to_default;
>+        case GL_COMPRESSED_RGBA_ASTC_5x4_KHR:
>+            return COMPRESSED_RGBA_ASTC_5x4_KHR_to_default;
>+        case GL_COMPRESSED_RGBA_ASTC_5x5_KHR:
>+            return COMPRESSED_RGBA_ASTC_5x5_KHR_to_default;
>+        case GL_COMPRESSED_RGBA_ASTC_6x5_KHR:
>+            return COMPRESSED_RGBA_ASTC_6x5_KHR_to_default;
>+        case GL_COMPRESSED_RGBA_ASTC_6x6_KHR:
>+            return COMPRESSED_RGBA_ASTC_6x6_KHR_to_default;
>+        case GL_COMPRESSED_RGBA_ASTC_8x5_KHR:
>+            return COMPRESSED_RGBA_ASTC_8x5_KHR_to_default;
>+        case GL_COMPRESSED_RGBA_ASTC_8x6_KHR:
>+            return COMPRESSED_RGBA_ASTC_8x6_KHR_to_default;
>+        case GL_COMPRESSED_RGBA_ASTC_8x8_KHR:
>+            return COMPRESSED_RGBA_ASTC_8x8_KHR_to_default;
>+        case GL_COMPRESSED_RGBA_BPTC_UNORM_EXT:
>+            return COMPRESSED_RGBA_BPTC_UNORM_EXT_to_default;
>         case GL_COMPRESSED_RGBA_S3TC_DXT1_EXT:
>             return COMPRESSED_RGBA_S3TC_DXT1_EXT_to_default;
>         case GL_COMPRESSED_RGBA_S3TC_DXT3_ANGLE:
>             return COMPRESSED_RGBA_S3TC_DXT3_ANGLE_to_default;
>         case GL_COMPRESSED_RGBA_S3TC_DXT5_ANGLE:
>             return COMPRESSED_RGBA_S3TC_DXT5_ANGLE_to_default;
>+        case GL_COMPRESSED_RGB_BPTC_SIGNED_FLOAT_EXT:
>+            return COMPRESSED_RGB_BPTC_SIGNED_FLOAT_EXT_to_default;
>+        case GL_COMPRESSED_RGB_BPTC_UNSIGNED_FLOAT_EXT:
>+            return COMPRESSED_RGB_BPTC_UNSIGNED_FLOAT_EXT_to_default;
>         case GL_COMPRESSED_RGB_S3TC_DXT1_EXT:
>             return COMPRESSED_RGB_S3TC_DXT1_EXT_to_default;
>         case GL_COMPRESSED_SIGNED_R11_EAC:
>         {
>             switch (angleFormat)
>             {
>-                case Format::ID::R8_SNORM:
>-                    return COMPRESSED_SIGNED_R11_EAC_to_R8_SNORM;
>+                case FormatID::EAC_R11_SNORM_BLOCK:
>+                    return COMPRESSED_SIGNED_R11_EAC_to_EAC_R11_SNORM_BLOCK;
>+                case FormatID::R16_SNORM:
>+                    return COMPRESSED_SIGNED_R11_EAC_to_R16_SNORM;
>                 default:
>                     break;
>             }
>+            break;
>         }
>         case GL_COMPRESSED_SIGNED_RG11_EAC:
>         {
>             switch (angleFormat)
>             {
>-                case Format::ID::R8G8_SNORM:
>-                    return COMPRESSED_SIGNED_RG11_EAC_to_R8G8_SNORM;
>-                default:
>-                    break;
>-            }
>-        }
>+                case FormatID::EAC_R11G11_SNORM_BLOCK:
>+                    return COMPRESSED_SIGNED_RG11_EAC_to_EAC_R11G11_SNORM_BLOCK;
>+                case FormatID::R16G16_SNORM:
>+                    return COMPRESSED_SIGNED_RG11_EAC_to_R16G16_SNORM;
>+                default:
>+                    break;
>+            }
>+            break;
>+        }
>+        case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x10_KHR:
>+            return COMPRESSED_SRGB8_ALPHA8_ASTC_10x10_KHR_to_default;
>+        case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x5_KHR:
>+            return COMPRESSED_SRGB8_ALPHA8_ASTC_10x5_KHR_to_default;
>+        case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x6_KHR:
>+            return COMPRESSED_SRGB8_ALPHA8_ASTC_10x6_KHR_to_default;
>+        case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x8_KHR:
>+            return COMPRESSED_SRGB8_ALPHA8_ASTC_10x8_KHR_to_default;
>+        case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_12x10_KHR:
>+            return COMPRESSED_SRGB8_ALPHA8_ASTC_12x10_KHR_to_default;
>+        case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_12x12_KHR:
>+            return COMPRESSED_SRGB8_ALPHA8_ASTC_12x12_KHR_to_default;
>+        case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_4x4_KHR:
>+            return COMPRESSED_SRGB8_ALPHA8_ASTC_4x4_KHR_to_default;
>+        case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x4_KHR:
>+            return COMPRESSED_SRGB8_ALPHA8_ASTC_5x4_KHR_to_default;
>+        case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x5_KHR:
>+            return COMPRESSED_SRGB8_ALPHA8_ASTC_5x5_KHR_to_default;
>+        case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x5_KHR:
>+            return COMPRESSED_SRGB8_ALPHA8_ASTC_6x5_KHR_to_default;
>+        case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x6_KHR:
>+            return COMPRESSED_SRGB8_ALPHA8_ASTC_6x6_KHR_to_default;
>+        case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x5_KHR:
>+            return COMPRESSED_SRGB8_ALPHA8_ASTC_8x5_KHR_to_default;
>+        case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x6_KHR:
>+            return COMPRESSED_SRGB8_ALPHA8_ASTC_8x6_KHR_to_default;
>+        case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x8_KHR:
>+            return COMPRESSED_SRGB8_ALPHA8_ASTC_8x8_KHR_to_default;
>         case GL_COMPRESSED_SRGB8_ALPHA8_ETC2_EAC:
>         {
>             switch (angleFormat)
>             {
>-                case Format::ID::R8G8B8A8_UNORM_SRGB:
>+                case FormatID::ETC2_R8G8B8A8_SRGB_BLOCK:
>+                    return COMPRESSED_SRGB8_ALPHA8_ETC2_EAC_to_ETC2_R8G8B8A8_SRGB_BLOCK;
>+                case FormatID::R8G8B8A8_UNORM_SRGB:
>                     return COMPRESSED_SRGB8_ALPHA8_ETC2_EAC_to_R8G8B8A8_UNORM_SRGB;
>                 default:
>                     break;
>             }
>+            break;
>         }
>         case GL_COMPRESSED_SRGB8_ETC2:
>         {
>             switch (angleFormat)
>             {
>-                case Format::ID::R8G8B8A8_UNORM_SRGB:
>+                case FormatID::ETC2_R8G8B8_SRGB_BLOCK:
>+                    return COMPRESSED_SRGB8_ETC2_to_ETC2_R8G8B8_SRGB_BLOCK;
>+                case FormatID::R8G8B8A8_UNORM_SRGB:
>                     return COMPRESSED_SRGB8_ETC2_to_R8G8B8A8_UNORM_SRGB;
>                 default:
>                     break;
>             }
>+            break;
>         }
>         case GL_COMPRESSED_SRGB8_LOSSY_DECODE_ETC2_ANGLE:
>         {
>             switch (angleFormat)
>             {
>-                case Format::ID::BC1_RGB_UNORM_SRGB_BLOCK:
>+                case FormatID::BC1_RGB_UNORM_SRGB_BLOCK:
>                     return COMPRESSED_SRGB8_LOSSY_DECODE_ETC2_ANGLE_to_BC1_RGB_UNORM_SRGB_BLOCK;
>                 default:
>                     break;
>             }
>+            break;
>         }
>         case GL_COMPRESSED_SRGB8_PUNCHTHROUGH_ALPHA1_ETC2:
>         {
>             switch (angleFormat)
>             {
>-                case Format::ID::R8G8B8A8_UNORM_SRGB:
>+                case FormatID::ETC2_R8G8B8A1_SRGB_BLOCK:
>+                    return COMPRESSED_SRGB8_PUNCHTHROUGH_ALPHA1_ETC2_to_ETC2_R8G8B8A1_SRGB_BLOCK;
>+                case FormatID::R8G8B8A8_UNORM_SRGB:
>                     return COMPRESSED_SRGB8_PUNCHTHROUGH_ALPHA1_ETC2_to_R8G8B8A8_UNORM_SRGB;
>                 default:
>                     break;
>             }
>+            break;
>         }
>         case GL_COMPRESSED_SRGB8_PUNCHTHROUGH_ALPHA1_LOSSY_DECODE_ETC2_ANGLE:
>         {
>             switch (angleFormat)
>             {
>-                case Format::ID::BC1_RGBA_UNORM_SRGB_BLOCK:
>+                case FormatID::BC1_RGBA_UNORM_SRGB_BLOCK:
>                     return COMPRESSED_SRGB8_PUNCHTHROUGH_ALPHA1_LOSSY_DECODE_ETC2_ANGLE_to_BC1_RGBA_UNORM_SRGB_BLOCK;
>                 default:
>                     break;
>             }
>+            break;
>         }
>+        case GL_COMPRESSED_SRGB_ALPHA_BPTC_UNORM_EXT:
>+            return COMPRESSED_SRGB_ALPHA_BPTC_UNORM_EXT_to_default;
>         case GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT1_EXT:
>             return COMPRESSED_SRGB_ALPHA_S3TC_DXT1_EXT_to_default;
>         case GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT3_EXT:
>@@ -1759,51 +2954,62 @@ LoadFunctionMap GetLoadFunctionsMap(GLenum internalFormat, Format::ID angleForma
>         {
>             switch (angleFormat)
>             {
>-                case Format::ID::D24_UNORM_S8_UINT:
>+                case FormatID::D24_UNORM_S8_UINT:
>                     return DEPTH24_STENCIL8_to_D24_UNORM_S8_UINT;
>+                case FormatID::D32_FLOAT_S8X24_UINT:
>+                    return DEPTH24_STENCIL8_to_D32_FLOAT_S8X24_UINT;
>                 default:
>                     break;
>             }
>+            break;
>         }
>         case GL_DEPTH32F_STENCIL8:
>         {
>             switch (angleFormat)
>             {
>-                case Format::ID::D32_FLOAT_S8X24_UINT:
>+                case FormatID::D24_UNORM_S8_UINT:
>+                    return DEPTH32F_STENCIL8_to_D24_UNORM_S8_UINT;
>+                case FormatID::D32_FLOAT_S8X24_UINT:
>                     return DEPTH32F_STENCIL8_to_D32_FLOAT_S8X24_UINT;
>                 default:
>                     break;
>             }
>+            break;
>         }
>         case GL_DEPTH_COMPONENT16:
>         {
>             switch (angleFormat)
>             {
>-                case Format::ID::D16_UNORM:
>+                case FormatID::D16_UNORM:
>                     return DEPTH_COMPONENT16_to_D16_UNORM;
>                 default:
>                     break;
>             }
>+            break;
>         }
>         case GL_DEPTH_COMPONENT24:
>         {
>             switch (angleFormat)
>             {
>-                case Format::ID::D24_UNORM_S8_UINT:
>+                case FormatID::D24_UNORM_S8_UINT:
>                     return DEPTH_COMPONENT24_to_D24_UNORM_S8_UINT;
>+                case FormatID::D32_FLOAT_S8X24_UINT:
>+                    return DEPTH_COMPONENT24_to_D32_FLOAT_S8X24_UINT;
>                 default:
>                     break;
>             }
>+            break;
>         }
>         case GL_DEPTH_COMPONENT32F:
>         {
>             switch (angleFormat)
>             {
>-                case Format::ID::D32_FLOAT:
>+                case FormatID::D32_FLOAT:
>                     return DEPTH_COMPONENT32F_to_D32_FLOAT;
>                 default:
>                     break;
>             }
>+            break;
>         }
>         case GL_DEPTH_COMPONENT32_OES:
>             return DEPTH_COMPONENT32_OES_to_default;
>@@ -1811,29 +3017,35 @@ LoadFunctionMap GetLoadFunctionsMap(GLenum internalFormat, Format::ID angleForma
>         {
>             switch (angleFormat)
>             {
>-                case Format::ID::BC1_RGB_UNORM_BLOCK:
>+                case FormatID::BC1_RGB_UNORM_BLOCK:
>                     return ETC1_RGB8_LOSSY_DECODE_ANGLE_to_BC1_RGB_UNORM_BLOCK;
>                 default:
>                     break;
>             }
>+            break;
>         }
>         case GL_ETC1_RGB8_OES:
>         {
>             switch (angleFormat)
>             {
>-                case Format::ID::R8G8B8A8_UNORM:
>+                case FormatID::ETC1_R8G8B8_UNORM_BLOCK:
>+                    return ETC1_RGB8_OES_to_ETC1_R8G8B8_UNORM_BLOCK;
>+                case FormatID::ETC2_R8G8B8_UNORM_BLOCK:
>+                    return ETC1_RGB8_OES_to_ETC2_R8G8B8_UNORM_BLOCK;
>+                case FormatID::R8G8B8A8_UNORM:
>                     return ETC1_RGB8_OES_to_R8G8B8A8_UNORM;
>                 default:
>                     break;
>             }
>+            break;
>         }
>         case GL_LUMINANCE:
>         {
>             switch (angleFormat)
>             {
>-                case Format::ID::R16G16B16A16_FLOAT:
>+                case FormatID::R16G16B16A16_FLOAT:
>                     return LUMINANCE_to_R16G16B16A16_FLOAT;
>-                case Format::ID::R32G32B32A32_FLOAT:
>+                case FormatID::R32G32B32A32_FLOAT:
>                     return LUMINANCE_to_R32G32B32A32_FLOAT;
>                 default:
>                     return LUMINANCE_to_default;
>@@ -1844,16 +3056,38 @@ LoadFunctionMap GetLoadFunctionsMap(GLenum internalFormat, Format::ID angleForma
>         case GL_LUMINANCE32F_EXT:
>             return LUMINANCE32F_EXT_to_default;
>         case GL_LUMINANCE8_ALPHA8_EXT:
>-            return LUMINANCE8_ALPHA8_EXT_to_default;
>+        {
>+            switch (angleFormat)
>+            {
>+                case FormatID::R8G8B8A8_UNORM:
>+                    return LUMINANCE8_ALPHA8_EXT_to_R8G8B8A8_UNORM;
>+                case FormatID::R8G8_UNORM:
>+                    return LUMINANCE8_ALPHA8_EXT_to_R8G8_UNORM;
>+                default:
>+                    break;
>+            }
>+            break;
>+        }
>         case GL_LUMINANCE8_EXT:
>-            return LUMINANCE8_EXT_to_default;
>+        {
>+            switch (angleFormat)
>+            {
>+                case FormatID::R8G8B8A8_UNORM:
>+                    return LUMINANCE8_EXT_to_R8G8B8A8_UNORM;
>+                case FormatID::R8_UNORM:
>+                    return LUMINANCE8_EXT_to_R8_UNORM;
>+                default:
>+                    break;
>+            }
>+            break;
>+        }
>         case GL_LUMINANCE_ALPHA:
>         {
>             switch (angleFormat)
>             {
>-                case Format::ID::R16G16B16A16_FLOAT:
>+                case FormatID::R16G16B16A16_FLOAT:
>                     return LUMINANCE_ALPHA_to_R16G16B16A16_FLOAT;
>-                case Format::ID::R32G32B32A32_FLOAT:
>+                case FormatID::R32G32B32A32_FLOAT:
>                     return LUMINANCE_ALPHA_to_R32G32B32A32_FLOAT;
>                 default:
>                     return LUMINANCE_ALPHA_to_default;
>@@ -1867,427 +3101,545 @@ LoadFunctionMap GetLoadFunctionsMap(GLenum internalFormat, Format::ID angleForma
>         {
>             switch (angleFormat)
>             {
>-                case Format::ID::R11G11B10_FLOAT:
>+                case FormatID::R11G11B10_FLOAT:
>                     return R11F_G11F_B10F_to_R11G11B10_FLOAT;
>                 default:
>                     break;
>             }
>+            break;
>         }
>         case GL_R16F:
>         {
>             switch (angleFormat)
>             {
>-                case Format::ID::R16_FLOAT:
>+                case FormatID::R16_FLOAT:
>                     return R16F_to_R16_FLOAT;
>                 default:
>                     break;
>             }
>+            break;
>         }
>         case GL_R16I:
>         {
>             switch (angleFormat)
>             {
>-                case Format::ID::R16_SINT:
>+                case FormatID::R16_SINT:
>                     return R16I_to_R16_SINT;
>                 default:
>                     break;
>             }
>+            break;
>         }
>         case GL_R16UI:
>         {
>             switch (angleFormat)
>             {
>-                case Format::ID::R16_UINT:
>+                case FormatID::R16_UINT:
>                     return R16UI_to_R16_UINT;
>                 default:
>                     break;
>             }
>+            break;
>         }
>         case GL_R16_EXT:
>         {
>             switch (angleFormat)
>             {
>-                case Format::ID::R16_UNORM:
>+                case FormatID::R16_UNORM:
>                     return R16_EXT_to_R16_UNORM;
>                 default:
>                     break;
>             }
>+            break;
>         }
>         case GL_R16_SNORM_EXT:
>         {
>             switch (angleFormat)
>             {
>-                case Format::ID::R16_SNORM:
>+                case FormatID::R16_SNORM:
>                     return R16_SNORM_EXT_to_R16_SNORM;
>                 default:
>                     break;
>             }
>+            break;
>         }
>+        case GL_R16_SSCALED_ANGLEX:
>+            return R16_SSCALED_ANGLEX_to_default;
>+        case GL_R16_USCALED_ANGLEX:
>+            return R16_USCALED_ANGLEX_to_default;
>         case GL_R32F:
>         {
>             switch (angleFormat)
>             {
>-                case Format::ID::R32_FLOAT:
>+                case FormatID::R32_FLOAT:
>                     return R32F_to_R32_FLOAT;
>                 default:
>                     break;
>             }
>+            break;
>         }
>         case GL_R32I:
>         {
>             switch (angleFormat)
>             {
>-                case Format::ID::R32_SINT:
>+                case FormatID::R32_SINT:
>                     return R32I_to_R32_SINT;
>                 default:
>                     break;
>             }
>+            break;
>         }
>         case GL_R32UI:
>         {
>             switch (angleFormat)
>             {
>-                case Format::ID::R32_UINT:
>+                case FormatID::R32_UINT:
>                     return R32UI_to_R32_UINT;
>                 default:
>                     break;
>             }
>+            break;
>         }
>         case GL_R8:
>         {
>             switch (angleFormat)
>             {
>-                case Format::ID::R8_UNORM:
>+                case FormatID::R8_UNORM:
>                     return R8_to_R8_UNORM;
>                 default:
>                     break;
>             }
>+            break;
>         }
>         case GL_R8I:
>         {
>             switch (angleFormat)
>             {
>-                case Format::ID::R8_SINT:
>+                case FormatID::R8_SINT:
>                     return R8I_to_R8_SINT;
>                 default:
>                     break;
>             }
>+            break;
>         }
>         case GL_R8UI:
>         {
>             switch (angleFormat)
>             {
>-                case Format::ID::R8_UINT:
>+                case FormatID::R8_UINT:
>                     return R8UI_to_R8_UINT;
>                 default:
>                     break;
>             }
>+            break;
>         }
>         case GL_R8_SNORM:
>         {
>             switch (angleFormat)
>             {
>-                case Format::ID::R8_SNORM:
>+                case FormatID::R8_SNORM:
>                     return R8_SNORM_to_R8_SNORM;
>                 default:
>                     break;
>             }
>+            break;
>         }
>+        case GL_R8_SSCALED_ANGLEX:
>+            return R8_SSCALED_ANGLEX_to_default;
>+        case GL_R8_USCALED_ANGLEX:
>+            return R8_USCALED_ANGLEX_to_default;
>         case GL_RG16F:
>         {
>             switch (angleFormat)
>             {
>-                case Format::ID::R16G16_FLOAT:
>+                case FormatID::R16G16_FLOAT:
>                     return RG16F_to_R16G16_FLOAT;
>                 default:
>                     break;
>             }
>+            break;
>         }
>         case GL_RG16I:
>         {
>             switch (angleFormat)
>             {
>-                case Format::ID::R16G16_SINT:
>+                case FormatID::R16G16_SINT:
>                     return RG16I_to_R16G16_SINT;
>                 default:
>                     break;
>             }
>+            break;
>         }
>         case GL_RG16UI:
>         {
>             switch (angleFormat)
>             {
>-                case Format::ID::R16G16_UINT:
>+                case FormatID::R16G16_UINT:
>                     return RG16UI_to_R16G16_UINT;
>                 default:
>                     break;
>             }
>+            break;
>         }
>         case GL_RG16_EXT:
>         {
>             switch (angleFormat)
>             {
>-                case Format::ID::R16G16_UNORM:
>+                case FormatID::R16G16_UNORM:
>                     return RG16_EXT_to_R16G16_UNORM;
>                 default:
>                     break;
>             }
>+            break;
>         }
>         case GL_RG16_SNORM_EXT:
>         {
>             switch (angleFormat)
>             {
>-                case Format::ID::R16G16_SNORM:
>+                case FormatID::R16G16_SNORM:
>                     return RG16_SNORM_EXT_to_R16G16_SNORM;
>                 default:
>                     break;
>             }
>+            break;
>         }
>+        case GL_RG16_SSCALED_ANGLEX:
>+            return RG16_SSCALED_ANGLEX_to_default;
>+        case GL_RG16_USCALED_ANGLEX:
>+            return RG16_USCALED_ANGLEX_to_default;
>         case GL_RG32F:
>         {
>             switch (angleFormat)
>             {
>-                case Format::ID::R32G32_FLOAT:
>+                case FormatID::R32G32_FLOAT:
>                     return RG32F_to_R32G32_FLOAT;
>                 default:
>                     break;
>             }
>+            break;
>         }
>         case GL_RG32I:
>         {
>             switch (angleFormat)
>             {
>-                case Format::ID::R32G32_SINT:
>+                case FormatID::R32G32_SINT:
>                     return RG32I_to_R32G32_SINT;
>                 default:
>                     break;
>             }
>+            break;
>         }
>         case GL_RG32UI:
>         {
>             switch (angleFormat)
>             {
>-                case Format::ID::R32G32_UINT:
>+                case FormatID::R32G32_UINT:
>                     return RG32UI_to_R32G32_UINT;
>                 default:
>                     break;
>             }
>+            break;
>         }
>         case GL_RG8:
>         {
>             switch (angleFormat)
>             {
>-                case Format::ID::R8G8_UNORM:
>+                case FormatID::R8G8_UNORM:
>                     return RG8_to_R8G8_UNORM;
>                 default:
>                     break;
>             }
>+            break;
>         }
>         case GL_RG8I:
>         {
>             switch (angleFormat)
>             {
>-                case Format::ID::R8G8_SINT:
>+                case FormatID::R8G8_SINT:
>                     return RG8I_to_R8G8_SINT;
>                 default:
>                     break;
>             }
>+            break;
>         }
>         case GL_RG8UI:
>         {
>             switch (angleFormat)
>             {
>-                case Format::ID::R8G8_UINT:
>+                case FormatID::R8G8_UINT:
>                     return RG8UI_to_R8G8_UINT;
>                 default:
>                     break;
>             }
>+            break;
>         }
>         case GL_RG8_SNORM:
>         {
>             switch (angleFormat)
>             {
>-                case Format::ID::R8G8_SNORM:
>+                case FormatID::R8G8_SNORM:
>                     return RG8_SNORM_to_R8G8_SNORM;
>                 default:
>                     break;
>             }
>+            break;
>         }
>+        case GL_RG8_SSCALED_ANGLEX:
>+            return RG8_SSCALED_ANGLEX_to_default;
>+        case GL_RG8_USCALED_ANGLEX:
>+            return RG8_USCALED_ANGLEX_to_default;
>         case GL_RGB:
>             return RGB_to_default;
>         case GL_RGB10_A2:
>         {
>             switch (angleFormat)
>             {
>-                case Format::ID::R10G10B10A2_UNORM:
>+                case FormatID::R10G10B10A2_UNORM:
>                     return RGB10_A2_to_R10G10B10A2_UNORM;
>                 default:
>                     break;
>             }
>+            break;
>         }
>         case GL_RGB10_A2UI:
>         {
>             switch (angleFormat)
>             {
>-                case Format::ID::R10G10B10A2_UINT:
>+                case FormatID::R10G10B10A2_UINT:
>                     return RGB10_A2UI_to_R10G10B10A2_UINT;
>                 default:
>                     break;
>             }
>+            break;
>         }
>+        case GL_RGB10_A2_SINT_ANGLEX:
>+        {
>+            switch (angleFormat)
>+            {
>+                case FormatID::R10G10B10A2_SINT:
>+                    return RGB10_A2_SINT_ANGLEX_to_R10G10B10A2_SINT;
>+                default:
>+                    break;
>+            }
>+            break;
>+        }
>+        case GL_RGB10_A2_SNORM_ANGLEX:
>+        {
>+            switch (angleFormat)
>+            {
>+                case FormatID::R10G10B10A2_SNORM:
>+                    return RGB10_A2_SNORM_ANGLEX_to_R10G10B10A2_SNORM;
>+                default:
>+                    break;
>+            }
>+            break;
>+        }
>+        case GL_RGB10_A2_SSCALED_ANGLEX:
>+            return RGB10_A2_SSCALED_ANGLEX_to_default;
>+        case GL_RGB10_A2_USCALED_ANGLEX:
>+            return RGB10_A2_USCALED_ANGLEX_to_default;
>         case GL_RGB16F:
>         {
>             switch (angleFormat)
>             {
>-                case Format::ID::R16G16B16A16_FLOAT:
>+                case FormatID::R16G16B16A16_FLOAT:
>                     return RGB16F_to_R16G16B16A16_FLOAT;
>+                case FormatID::R16G16B16_FLOAT:
>+                    return RGB16F_to_R16G16B16_FLOAT;
>                 default:
>                     break;
>             }
>+            break;
>         }
>         case GL_RGB16I:
>         {
>             switch (angleFormat)
>             {
>-                case Format::ID::R16G16B16A16_SINT:
>+                case FormatID::R16G16B16A16_SINT:
>                     return RGB16I_to_R16G16B16A16_SINT;
>+                case FormatID::R16G16B16_SINT:
>+                    return RGB16I_to_R16G16B16_SINT;
>                 default:
>                     break;
>             }
>+            break;
>         }
>         case GL_RGB16UI:
>         {
>             switch (angleFormat)
>             {
>-                case Format::ID::R16G16B16A16_UINT:
>+                case FormatID::R16G16B16A16_UINT:
>                     return RGB16UI_to_R16G16B16A16_UINT;
>+                case FormatID::R16G16B16_UINT:
>+                    return RGB16UI_to_R16G16B16_UINT;
>                 default:
>                     break;
>             }
>+            break;
>         }
>         case GL_RGB16_EXT:
>         {
>             switch (angleFormat)
>             {
>-                case Format::ID::R16G16B16A16_UNORM:
>+                case FormatID::R16G16B16A16_UNORM:
>                     return RGB16_EXT_to_R16G16B16A16_UNORM;
>+                case FormatID::R16G16B16_UNORM:
>+                    return RGB16_EXT_to_R16G16B16_UNORM;
>                 default:
>                     break;
>             }
>+            break;
>         }
>         case GL_RGB16_SNORM_EXT:
>         {
>             switch (angleFormat)
>             {
>-                case Format::ID::R16G16B16A16_SNORM:
>+                case FormatID::R16G16B16A16_SNORM:
>                     return RGB16_SNORM_EXT_to_R16G16B16A16_SNORM;
>+                case FormatID::R16G16B16_SNORM:
>+                    return RGB16_SNORM_EXT_to_R16G16B16_SNORM;
>                 default:
>                     break;
>             }
>+            break;
>         }
>+        case GL_RGB16_SSCALED_ANGLEX:
>+            return RGB16_SSCALED_ANGLEX_to_default;
>+        case GL_RGB16_USCALED_ANGLEX:
>+            return RGB16_USCALED_ANGLEX_to_default;
>         case GL_RGB32F:
>         {
>             switch (angleFormat)
>             {
>-                case Format::ID::R32G32B32A32_FLOAT:
>+                case FormatID::R32G32B32A32_FLOAT:
>                     return RGB32F_to_R32G32B32A32_FLOAT;
>+                case FormatID::R32G32B32_FLOAT:
>+                    return RGB32F_to_R32G32B32_FLOAT;
>                 default:
>                     break;
>             }
>+            break;
>         }
>         case GL_RGB32I:
>         {
>             switch (angleFormat)
>             {
>-                case Format::ID::R32G32B32A32_SINT:
>+                case FormatID::R32G32B32A32_SINT:
>                     return RGB32I_to_R32G32B32A32_SINT;
>+                case FormatID::R32G32B32_SINT:
>+                    return RGB32I_to_R32G32B32_SINT;
>                 default:
>                     break;
>             }
>+            break;
>         }
>         case GL_RGB32UI:
>         {
>             switch (angleFormat)
>             {
>-                case Format::ID::R32G32B32A32_UINT:
>+                case FormatID::R32G32B32A32_UINT:
>                     return RGB32UI_to_R32G32B32A32_UINT;
>+                case FormatID::R32G32B32_UINT:
>+                    return RGB32UI_to_R32G32B32_UINT;
>                 default:
>                     break;
>             }
>+            break;
>         }
>         case GL_RGB565:
>         {
>             switch (angleFormat)
>             {
>-                case Format::ID::B5G6R5_UNORM:
>+                case FormatID::B5G6R5_UNORM:
>                     return RGB565_to_B5G6R5_UNORM;
>-                case Format::ID::R8G8B8A8_UNORM:
>+                case FormatID::R5G6B5_UNORM:
>+                    return RGB565_to_R5G6B5_UNORM;
>+                case FormatID::R8G8B8A8_UNORM:
>                     return RGB565_to_R8G8B8A8_UNORM;
>                 default:
>                     break;
>             }
>+            break;
>         }
>         case GL_RGB5_A1:
>         {
>             switch (angleFormat)
>             {
>-                case Format::ID::B5G5R5A1_UNORM:
>+                case FormatID::A1R5G5B5_UNORM:
>+                    return RGB5_A1_to_A1R5G5B5_UNORM;
>+                case FormatID::B5G5R5A1_UNORM:
>                     return RGB5_A1_to_B5G5R5A1_UNORM;
>-                case Format::ID::R8G8B8A8_UNORM:
>+                case FormatID::R8G8B8A8_UNORM:
>                     return RGB5_A1_to_R8G8B8A8_UNORM;
>                 default:
>                     break;
>             }
>+            break;
>         }
>         case GL_RGB8:
>         {
>             switch (angleFormat)
>             {
>-                case Format::ID::R8G8B8A8_UNORM:
>+                case FormatID::R8G8B8A8_UNORM:
>                     return RGB8_to_R8G8B8A8_UNORM;
>                 default:
>                     break;
>             }
>+            break;
>         }
>         case GL_RGB8I:
>         {
>             switch (angleFormat)
>             {
>-                case Format::ID::R8G8B8A8_SINT:
>+                case FormatID::R8G8B8A8_SINT:
>                     return RGB8I_to_R8G8B8A8_SINT;
>+                case FormatID::R8G8B8_SINT:
>+                    return RGB8I_to_R8G8B8_SINT;
>                 default:
>                     break;
>             }
>+            break;
>         }
>         case GL_RGB8UI:
>         {
>             switch (angleFormat)
>             {
>-                case Format::ID::R8G8B8A8_UINT:
>+                case FormatID::R8G8B8A8_UINT:
>                     return RGB8UI_to_R8G8B8A8_UINT;
>+                case FormatID::R8G8B8_UINT:
>+                    return RGB8UI_to_R8G8B8_UINT;
>                 default:
>                     break;
>             }
>+            break;
>         }
>         case GL_RGB8_SNORM:
>         {
>             switch (angleFormat)
>             {
>-                case Format::ID::R8G8B8A8_SNORM:
>+                case FormatID::R8G8B8A8_SNORM:
>                     return RGB8_SNORM_to_R8G8B8A8_SNORM;
>+                case FormatID::R8G8B8_SNORM:
>+                    return RGB8_SNORM_to_R8G8B8_SNORM;
>                 default:
>                     break;
>             }
>+            break;
>         }
>+        case GL_RGB8_SSCALED_ANGLEX:
>+            return RGB8_SSCALED_ANGLEX_to_default;
>+        case GL_RGB8_USCALED_ANGLEX:
>+            return RGB8_USCALED_ANGLEX_to_default;
>         case GL_RGB9_E5:
>         {
>             switch (angleFormat)
>             {
>-                case Format::ID::R9G9B9E5_SHAREDEXP:
>+                case FormatID::R9G9B9E5_SHAREDEXP:
>                     return RGB9_E5_to_R9G9B9E5_SHAREDEXP;
>                 default:
>                     break;
>             }
>+            break;
>         }
>         case GL_RGBA:
>             return RGBA_to_default;
>@@ -2295,164 +3647,187 @@ LoadFunctionMap GetLoadFunctionsMap(GLenum internalFormat, Format::ID angleForma
>         {
>             switch (angleFormat)
>             {
>-                case Format::ID::R16G16B16A16_FLOAT:
>+                case FormatID::R16G16B16A16_FLOAT:
>                     return RGBA16F_to_R16G16B16A16_FLOAT;
>                 default:
>                     break;
>             }
>+            break;
>         }
>         case GL_RGBA16I:
>         {
>             switch (angleFormat)
>             {
>-                case Format::ID::R16G16B16A16_SINT:
>+                case FormatID::R16G16B16A16_SINT:
>                     return RGBA16I_to_R16G16B16A16_SINT;
>                 default:
>                     break;
>             }
>+            break;
>         }
>         case GL_RGBA16UI:
>         {
>             switch (angleFormat)
>             {
>-                case Format::ID::R16G16B16A16_UINT:
>+                case FormatID::R16G16B16A16_UINT:
>                     return RGBA16UI_to_R16G16B16A16_UINT;
>                 default:
>                     break;
>             }
>+            break;
>         }
>         case GL_RGBA16_EXT:
>         {
>             switch (angleFormat)
>             {
>-                case Format::ID::R16G16B16A16_UNORM:
>+                case FormatID::R16G16B16A16_UNORM:
>                     return RGBA16_EXT_to_R16G16B16A16_UNORM;
>                 default:
>                     break;
>             }
>+            break;
>         }
>         case GL_RGBA16_SNORM_EXT:
>         {
>             switch (angleFormat)
>             {
>-                case Format::ID::R16G16B16A16_SNORM:
>+                case FormatID::R16G16B16A16_SNORM:
>                     return RGBA16_SNORM_EXT_to_R16G16B16A16_SNORM;
>                 default:
>                     break;
>             }
>+            break;
>         }
>+        case GL_RGBA16_SSCALED_ANGLEX:
>+            return RGBA16_SSCALED_ANGLEX_to_default;
>+        case GL_RGBA16_USCALED_ANGLEX:
>+            return RGBA16_USCALED_ANGLEX_to_default;
>         case GL_RGBA32F:
>         {
>             switch (angleFormat)
>             {
>-                case Format::ID::R32G32B32A32_FLOAT:
>+                case FormatID::R32G32B32A32_FLOAT:
>                     return RGBA32F_to_R32G32B32A32_FLOAT;
>                 default:
>                     break;
>             }
>+            break;
>         }
>         case GL_RGBA32I:
>         {
>             switch (angleFormat)
>             {
>-                case Format::ID::R32G32B32A32_SINT:
>+                case FormatID::R32G32B32A32_SINT:
>                     return RGBA32I_to_R32G32B32A32_SINT;
>                 default:
>                     break;
>             }
>+            break;
>         }
>         case GL_RGBA32UI:
>         {
>             switch (angleFormat)
>             {
>-                case Format::ID::R32G32B32A32_UINT:
>+                case FormatID::R32G32B32A32_UINT:
>                     return RGBA32UI_to_R32G32B32A32_UINT;
>                 default:
>                     break;
>             }
>+            break;
>         }
>         case GL_RGBA4:
>         {
>             switch (angleFormat)
>             {
>-                case Format::ID::B4G4R4A4_UNORM:
>+                case FormatID::B4G4R4A4_UNORM:
>                     return RGBA4_to_B4G4R4A4_UNORM;
>-                case Format::ID::R8G8B8A8_UNORM:
>+                case FormatID::R8G8B8A8_UNORM:
>                     return RGBA4_to_R8G8B8A8_UNORM;
>                 default:
>                     break;
>             }
>+            break;
>         }
>         case GL_RGBA8:
>         {
>             switch (angleFormat)
>             {
>-                case Format::ID::R8G8B8A8_UNORM:
>+                case FormatID::R8G8B8A8_UNORM:
>                     return RGBA8_to_R8G8B8A8_UNORM;
>                 default:
>                     break;
>             }
>+            break;
>         }
>         case GL_RGBA8I:
>         {
>             switch (angleFormat)
>             {
>-                case Format::ID::R8G8B8A8_SINT:
>+                case FormatID::R8G8B8A8_SINT:
>                     return RGBA8I_to_R8G8B8A8_SINT;
>                 default:
>                     break;
>             }
>+            break;
>         }
>         case GL_RGBA8UI:
>         {
>             switch (angleFormat)
>             {
>-                case Format::ID::R8G8B8A8_UINT:
>+                case FormatID::R8G8B8A8_UINT:
>                     return RGBA8UI_to_R8G8B8A8_UINT;
>                 default:
>                     break;
>             }
>+            break;
>         }
>         case GL_RGBA8_SNORM:
>         {
>             switch (angleFormat)
>             {
>-                case Format::ID::R8G8B8A8_SNORM:
>+                case FormatID::R8G8B8A8_SNORM:
>                     return RGBA8_SNORM_to_R8G8B8A8_SNORM;
>                 default:
>                     break;
>             }
>+            break;
>         }
>+        case GL_RGBA8_SSCALED_ANGLEX:
>+            return RGBA8_SSCALED_ANGLEX_to_default;
>+        case GL_RGBA8_USCALED_ANGLEX:
>+            return RGBA8_USCALED_ANGLEX_to_default;
>         case GL_SRGB8:
>         {
>             switch (angleFormat)
>             {
>-                case Format::ID::R8G8B8A8_UNORM_SRGB:
>+                case FormatID::R8G8B8A8_UNORM_SRGB:
>                     return SRGB8_to_R8G8B8A8_UNORM_SRGB;
>                 default:
>                     break;
>             }
>+            break;
>         }
>         case GL_SRGB8_ALPHA8:
>         {
>             switch (angleFormat)
>             {
>-                case Format::ID::R8G8B8A8_UNORM_SRGB:
>+                case FormatID::R8G8B8A8_UNORM_SRGB:
>                     return SRGB8_ALPHA8_to_R8G8B8A8_UNORM_SRGB;
>                 default:
>                     break;
>             }
>+            break;
>         }
>         case GL_STENCIL_INDEX8:
>             return STENCIL_INDEX8_to_default;
> 
>         default:
>-        {
>-            static LoadFunctionMap emptyLoadFunctionsMap;
>-            return emptyLoadFunctionsMap;
>-        }
>+            break;
>     }
>     // clang-format on
>+    ASSERT(internalFormat == GL_NONE || angleFormat == angle::FormatID::NONE);
>+    static LoadFunctionMap emptyLoadFunctionsMap;
>+    return emptyLoadFunctionsMap;
> 
> }  // GetLoadFunctionsMap
> 
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/null/BufferNULL.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/null/BufferNULL.cpp
>index 08a67d6c1b8..b5dd02cca8f 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/null/BufferNULL.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/null/BufferNULL.cpp
>@@ -11,6 +11,7 @@
> 
> #include "common/debug.h"
> #include "common/utilities.h"
>+#include "libANGLE/Context.h"
> #include "libANGLE/angletypes.h"
> #include "libANGLE/renderer/null/ContextNULL.h"
> 
>@@ -29,83 +30,81 @@ BufferNULL::~BufferNULL()
>     ASSERT(memoryReleaseResult);
> }
> 
>-gl::Error BufferNULL::setData(const gl::Context *context,
>-                              gl::BufferBinding target,
>-                              const void *data,
>-                              size_t size,
>-                              gl::BufferUsage usage)
>+angle::Result BufferNULL::setData(const gl::Context *context,
>+                                  gl::BufferBinding target,
>+                                  const void *data,
>+                                  size_t size,
>+                                  gl::BufferUsage usage)
> {
>-    if (!mAllocationTracker->updateMemoryAllocation(mData.size(), size))
>-    {
>-        return gl::OutOfMemory() << "Unable to allocate internal buffer storage.";
>-    }
>+    ANGLE_CHECK_GL_ALLOC(GetImplAs<ContextNULL>(context),
>+                         mAllocationTracker->updateMemoryAllocation(mData.size(), size));
> 
>     mData.resize(size, 0);
>     if (size > 0 && data != nullptr)
>     {
>         memcpy(mData.data(), data, size);
>     }
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error BufferNULL::setSubData(const gl::Context *context,
>-                                 gl::BufferBinding target,
>-                                 const void *data,
>-                                 size_t size,
>-                                 size_t offset)
>+angle::Result BufferNULL::setSubData(const gl::Context *context,
>+                                     gl::BufferBinding target,
>+                                     const void *data,
>+                                     size_t size,
>+                                     size_t offset)
> {
>     if (size > 0)
>     {
>         memcpy(mData.data() + offset, data, size);
>     }
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error BufferNULL::copySubData(const gl::Context *context,
>-                                  BufferImpl *source,
>-                                  GLintptr sourceOffset,
>-                                  GLintptr destOffset,
>-                                  GLsizeiptr size)
>+angle::Result BufferNULL::copySubData(const gl::Context *context,
>+                                      BufferImpl *source,
>+                                      GLintptr sourceOffset,
>+                                      GLintptr destOffset,
>+                                      GLsizeiptr size)
> {
>     BufferNULL *sourceNULL = GetAs<BufferNULL>(source);
>     if (size > 0)
>     {
>         memcpy(mData.data() + destOffset, sourceNULL->mData.data() + sourceOffset, size);
>     }
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error BufferNULL::map(const gl::Context *context, GLenum access, void **mapPtr)
>+angle::Result BufferNULL::map(const gl::Context *context, GLenum access, void **mapPtr)
> {
>     *mapPtr = mData.data();
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error BufferNULL::mapRange(const gl::Context *context,
>-                               size_t offset,
>-                               size_t length,
>-                               GLbitfield access,
>-                               void **mapPtr)
>+angle::Result BufferNULL::mapRange(const gl::Context *context,
>+                                   size_t offset,
>+                                   size_t length,
>+                                   GLbitfield access,
>+                                   void **mapPtr)
> {
>     *mapPtr = mData.data() + offset;
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error BufferNULL::unmap(const gl::Context *context, GLboolean *result)
>+angle::Result BufferNULL::unmap(const gl::Context *context, GLboolean *result)
> {
>     *result = GL_TRUE;
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error BufferNULL::getIndexRange(const gl::Context *context,
>-                                    GLenum type,
>-                                    size_t offset,
>-                                    size_t count,
>-                                    bool primitiveRestartEnabled,
>-                                    gl::IndexRange *outRange)
>+angle::Result BufferNULL::getIndexRange(const gl::Context *context,
>+                                        gl::DrawElementsType type,
>+                                        size_t offset,
>+                                        size_t count,
>+                                        bool primitiveRestartEnabled,
>+                                        gl::IndexRange *outRange)
> {
>     *outRange = gl::ComputeIndexRange(type, mData.data() + offset, count, primitiveRestartEnabled);
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
> uint8_t *BufferNULL::getDataPtr()
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/null/BufferNULL.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/null/BufferNULL.h
>index 1fa40e1e1c9..e8e1b77b8db 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/null/BufferNULL.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/null/BufferNULL.h
>@@ -23,35 +23,35 @@ class BufferNULL : public BufferImpl
>     BufferNULL(const gl::BufferState &state, AllocationTrackerNULL *allocationTracker);
>     ~BufferNULL() override;
> 
>-    gl::Error setData(const gl::Context *context,
>-                      gl::BufferBinding target,
>-                      const void *data,
>-                      size_t size,
>-                      gl::BufferUsage usage) override;
>-    gl::Error setSubData(const gl::Context *context,
>-                         gl::BufferBinding target,
>-                         const void *data,
>-                         size_t size,
>-                         size_t offset) override;
>-    gl::Error copySubData(const gl::Context *context,
>-                          BufferImpl *source,
>-                          GLintptr sourceOffset,
>-                          GLintptr destOffset,
>-                          GLsizeiptr size) override;
>-    gl::Error map(const gl::Context *context, GLenum access, void **mapPtr) override;
>-    gl::Error mapRange(const gl::Context *context,
>-                       size_t offset,
>-                       size_t length,
>-                       GLbitfield access,
>-                       void **mapPtr) override;
>-    gl::Error unmap(const gl::Context *context, GLboolean *result) override;
>+    angle::Result setData(const gl::Context *context,
>+                          gl::BufferBinding target,
>+                          const void *data,
>+                          size_t size,
>+                          gl::BufferUsage usage) override;
>+    angle::Result setSubData(const gl::Context *context,
>+                             gl::BufferBinding target,
>+                             const void *data,
>+                             size_t size,
>+                             size_t offset) override;
>+    angle::Result copySubData(const gl::Context *context,
>+                              BufferImpl *source,
>+                              GLintptr sourceOffset,
>+                              GLintptr destOffset,
>+                              GLsizeiptr size) override;
>+    angle::Result map(const gl::Context *context, GLenum access, void **mapPtr) override;
>+    angle::Result mapRange(const gl::Context *context,
>+                           size_t offset,
>+                           size_t length,
>+                           GLbitfield access,
>+                           void **mapPtr) override;
>+    angle::Result unmap(const gl::Context *context, GLboolean *result) override;
> 
>-    gl::Error getIndexRange(const gl::Context *context,
>-                            GLenum type,
>-                            size_t offset,
>-                            size_t count,
>-                            bool primitiveRestartEnabled,
>-                            gl::IndexRange *outRange) override;
>+    angle::Result getIndexRange(const gl::Context *context,
>+                                gl::DrawElementsType type,
>+                                size_t offset,
>+                                size_t count,
>+                                bool primitiveRestartEnabled,
>+                                gl::IndexRange *outRange) override;
> 
>     uint8_t *getDataPtr();
>     const uint8_t *getDataPtr() const;
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/null/CompilerNULL.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/null/CompilerNULL.cpp
>index 802c5cd18b6..737dc49a633 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/null/CompilerNULL.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/null/CompilerNULL.cpp
>@@ -14,18 +14,9 @@
> namespace rx
> {
> 
>-CompilerNULL::CompilerNULL() : CompilerImpl()
>-{
>-}
>+CompilerNULL::CompilerNULL() : CompilerImpl() {}
> 
>-CompilerNULL::~CompilerNULL()
>-{
>-}
>-
>-gl::Error CompilerNULL::release()
>-{
>-    return gl::NoError();
>-}
>+CompilerNULL::~CompilerNULL() {}
> 
> ShShaderOutput CompilerNULL::getTranslatorOutputType() const
> {
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/null/CompilerNULL.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/null/CompilerNULL.h
>index 5cd85e8bf57..94ba3ca2468 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/null/CompilerNULL.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/null/CompilerNULL.h
>@@ -21,8 +21,6 @@ class CompilerNULL : public CompilerImpl
>     CompilerNULL();
>     ~CompilerNULL() override;
> 
>-    gl::Error release() override;
>-
>     // TODO(jmadill): Expose translator built-in resources init method.
>     ShShaderOutput getTranslatorOutputType() const override;
> };
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/null/ContextNULL.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/null/ContextNULL.cpp
>index a8da191dd38..2c1ad1ab88e 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/null/ContextNULL.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/null/ContextNULL.cpp
>@@ -11,6 +11,7 @@
> 
> #include "common/debug.h"
> 
>+#include "libANGLE/Context.h"
> #include "libANGLE/renderer/null/BufferNULL.h"
> #include "libANGLE/renderer/null/CompilerNULL.h"
> #include "libANGLE/renderer/null/DisplayNULL.h"
>@@ -34,8 +35,7 @@ namespace rx
> 
> AllocationTrackerNULL::AllocationTrackerNULL(size_t maxTotalAllocationSize)
>     : mAllocatedBytes(0), mMaxBytes(maxTotalAllocationSize)
>-{
>-}
>+{}
> 
> AllocationTrackerNULL::~AllocationTrackerNULL()
> {
>@@ -59,26 +59,30 @@ bool AllocationTrackerNULL::updateMemoryAllocation(size_t oldSize, size_t newSiz
>     return true;
> }
> 
>-ContextNULL::ContextNULL(const gl::ContextState &state, AllocationTrackerNULL *allocationTracker)
>-    : ContextImpl(state), mAllocationTracker(allocationTracker)
>+ContextNULL::ContextNULL(const gl::State &state,
>+                         gl::ErrorSet *errorSet,
>+                         AllocationTrackerNULL *allocationTracker)
>+    : ContextImpl(state, errorSet), mAllocationTracker(allocationTracker)
> {
>     ASSERT(mAllocationTracker != nullptr);
> 
>-    mExtensions                       = gl::Extensions();
>-    mExtensions.fence                 = true;
>-    mExtensions.instancedArrays       = true;
>-    mExtensions.pixelBufferObject     = true;
>-    mExtensions.mapBuffer             = true;
>-    mExtensions.mapBufferRange        = true;
>-    mExtensions.copyTexture           = true;
>-    mExtensions.copyCompressedTexture = true;
>-    mExtensions.textureRectangle      = true;
>+    mExtensions                        = gl::Extensions();
>+    mExtensions.fence                  = true;
>+    mExtensions.instancedArraysANGLE   = true;
>+    mExtensions.instancedArraysEXT     = true;
>+    mExtensions.pixelBufferObject      = true;
>+    mExtensions.mapBuffer              = true;
>+    mExtensions.mapBufferRange         = true;
>+    mExtensions.copyTexture            = true;
>+    mExtensions.copyCompressedTexture  = true;
>+    mExtensions.textureRectangle       = true;
>     mExtensions.textureUsage           = true;
>     mExtensions.vertexArrayObject      = true;
>     mExtensions.debugMarker            = true;
>     mExtensions.translatedShaderSource = true;
> 
>-    mExtensions.rgb8rgba8 = true;
>+    mExtensions.textureStorage             = true;
>+    mExtensions.rgb8rgba8                  = true;
>     mExtensions.textureCompressionDXT1     = true;
>     mExtensions.textureCompressionDXT3     = true;
>     mExtensions.textureCompressionDXT5     = true;
>@@ -87,6 +91,12 @@ ContextNULL::ContextNULL(const gl::ContextState &state, AllocationTrackerNULL *a
>     mExtensions.textureCompressionASTCLDR  = true;
>     mExtensions.compressedETC1RGB8Texture  = true;
>     mExtensions.lossyETCDecode             = true;
>+    mExtensions.geometryShader             = true;
>+
>+    mExtensions.eglImage                  = true;
>+    mExtensions.eglImageExternal          = true;
>+    mExtensions.eglImageExternalEssl3     = true;
>+    mExtensions.eglStreamConsumerExternal = true;
> 
>     const gl::Version maxClientVersion(3, 1);
>     mCaps = GenerateMinimumCaps(maxClientVersion, mExtensions);
>@@ -94,146 +104,130 @@ ContextNULL::ContextNULL(const gl::ContextState &state, AllocationTrackerNULL *a
>     InitMinimumTextureCapsMap(maxClientVersion, mExtensions, &mTextureCaps);
> }
> 
>-ContextNULL::~ContextNULL()
>-{
>-}
>+ContextNULL::~ContextNULL() {}
> 
>-gl::Error ContextNULL::initialize()
>+angle::Result ContextNULL::initialize()
> {
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error ContextNULL::flush(const gl::Context *context)
>+angle::Result ContextNULL::flush(const gl::Context *context)
> {
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error ContextNULL::finish(const gl::Context *context)
>+angle::Result ContextNULL::finish(const gl::Context *context)
> {
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error ContextNULL::drawArrays(const gl::Context *context,
>-                                  GLenum mode,
>-                                  GLint first,
>-                                  GLsizei count)
>+angle::Result ContextNULL::drawArrays(const gl::Context *context,
>+                                      gl::PrimitiveMode mode,
>+                                      GLint first,
>+                                      GLsizei count)
> {
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error ContextNULL::drawArraysInstanced(const gl::Context *context,
>-                                           GLenum mode,
>-                                           GLint first,
>-                                           GLsizei count,
>-                                           GLsizei instanceCount)
>+angle::Result ContextNULL::drawArraysInstanced(const gl::Context *context,
>+                                               gl::PrimitiveMode mode,
>+                                               GLint first,
>+                                               GLsizei count,
>+                                               GLsizei instanceCount)
> {
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error ContextNULL::drawElements(const gl::Context *context,
>-                                    GLenum mode,
>-                                    GLsizei count,
>-                                    GLenum type,
>-                                    const void *indices)
>+angle::Result ContextNULL::drawElements(const gl::Context *context,
>+                                        gl::PrimitiveMode mode,
>+                                        GLsizei count,
>+                                        gl::DrawElementsType type,
>+                                        const void *indices)
> {
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error ContextNULL::drawElementsInstanced(const gl::Context *context,
>-                                             GLenum mode,
>-                                             GLsizei count,
>-                                             GLenum type,
>-                                             const void *indices,
>-                                             GLsizei instances)
>+angle::Result ContextNULL::drawElementsInstanced(const gl::Context *context,
>+                                                 gl::PrimitiveMode mode,
>+                                                 GLsizei count,
>+                                                 gl::DrawElementsType type,
>+                                                 const void *indices,
>+                                                 GLsizei instances)
> {
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error ContextNULL::drawRangeElements(const gl::Context *context,
>-                                         GLenum mode,
>-                                         GLuint start,
>-                                         GLuint end,
>-                                         GLsizei count,
>-                                         GLenum type,
>-                                         const void *indices)
>+angle::Result ContextNULL::drawRangeElements(const gl::Context *context,
>+                                             gl::PrimitiveMode mode,
>+                                             GLuint start,
>+                                             GLuint end,
>+                                             GLsizei count,
>+                                             gl::DrawElementsType type,
>+                                             const void *indices)
> {
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error ContextNULL::drawArraysIndirect(const gl::Context *context,
>-                                          GLenum mode,
>-                                          const void *indirect)
>+angle::Result ContextNULL::drawArraysIndirect(const gl::Context *context,
>+                                              gl::PrimitiveMode mode,
>+                                              const void *indirect)
> {
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error ContextNULL::drawElementsIndirect(const gl::Context *context,
>-                                            GLenum mode,
>-                                            GLenum type,
>-                                            const void *indirect)
>+angle::Result ContextNULL::drawElementsIndirect(const gl::Context *context,
>+                                                gl::PrimitiveMode mode,
>+                                                gl::DrawElementsType type,
>+                                                const void *indirect)
> {
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-void ContextNULL::stencilFillPath(const gl::Path *path, GLenum fillMode, GLuint mask)
>-{
>-}
>+void ContextNULL::stencilFillPath(const gl::Path *path, GLenum fillMode, GLuint mask) {}
> 
>-void ContextNULL::stencilStrokePath(const gl::Path *path, GLint reference, GLuint mask)
>-{
>-}
>+void ContextNULL::stencilStrokePath(const gl::Path *path, GLint reference, GLuint mask) {}
> 
>-void ContextNULL::coverFillPath(const gl::Path *path, GLenum coverMode)
>-{
>-}
>+void ContextNULL::coverFillPath(const gl::Path *path, GLenum coverMode) {}
> 
>-void ContextNULL::coverStrokePath(const gl::Path *path, GLenum coverMode)
>-{
>-}
>+void ContextNULL::coverStrokePath(const gl::Path *path, GLenum coverMode) {}
> 
> void ContextNULL::stencilThenCoverFillPath(const gl::Path *path,
>                                            GLenum fillMode,
>                                            GLuint mask,
>                                            GLenum coverMode)
>-{
>-}
>+{}
> 
> void ContextNULL::stencilThenCoverStrokePath(const gl::Path *path,
>                                              GLint reference,
>                                              GLuint mask,
>                                              GLenum coverMode)
>-{
>-}
>+{}
> 
> void ContextNULL::coverFillPathInstanced(const std::vector<gl::Path *> &paths,
>                                          GLenum coverMode,
>                                          GLenum transformType,
>                                          const GLfloat *transformValues)
>-{
>-}
>+{}
> 
> void ContextNULL::coverStrokePathInstanced(const std::vector<gl::Path *> &paths,
>                                            GLenum coverMode,
>                                            GLenum transformType,
>                                            const GLfloat *transformValues)
>-{
>-}
>+{}
> 
> void ContextNULL::stencilFillPathInstanced(const std::vector<gl::Path *> &paths,
>                                            GLenum fillMode,
>                                            GLuint mask,
>                                            GLenum transformType,
>                                            const GLfloat *transformValues)
>-{
>-}
>+{}
> 
> void ContextNULL::stencilStrokePathInstanced(const std::vector<gl::Path *> &paths,
>                                              GLint reference,
>                                              GLuint mask,
>                                              GLenum transformType,
>                                              const GLfloat *transformValues)
>-{
>-}
>+{}
> 
> void ContextNULL::stencilThenCoverFillPathInstanced(const std::vector<gl::Path *> &paths,
>                                                     GLenum coverMode,
>@@ -241,8 +235,7 @@ void ContextNULL::stencilThenCoverFillPathInstanced(const std::vector<gl::Path *
>                                                     GLuint mask,
>                                                     GLenum transformType,
>                                                     const GLfloat *transformValues)
>-{
>-}
>+{}
> 
> void ContextNULL::stencilThenCoverStrokePathInstanced(const std::vector<gl::Path *> &paths,
>                                                       GLenum coverMode,
>@@ -250,12 +243,11 @@ void ContextNULL::stencilThenCoverStrokePathInstanced(const std::vector<gl::Path
>                                                       GLuint mask,
>                                                       GLenum transformType,
>                                                       const GLfloat *transformValues)
>-{
>-}
>+{}
> 
>-GLenum ContextNULL::getResetStatus()
>+gl::GraphicsResetStatus ContextNULL::getResetStatus()
> {
>-    return GL_NO_ERROR;
>+    return gl::GraphicsResetStatus::NoError;
> }
> 
> std::string ContextNULL::getVendorString() const
>@@ -268,28 +260,21 @@ std::string ContextNULL::getRendererDescription() const
>     return "NULL";
> }
> 
>-void ContextNULL::insertEventMarker(GLsizei length, const char *marker)
>-{
>-}
>+void ContextNULL::insertEventMarker(GLsizei length, const char *marker) {}
> 
>-void ContextNULL::pushGroupMarker(GLsizei length, const char *marker)
>-{
>-}
>+void ContextNULL::pushGroupMarker(GLsizei length, const char *marker) {}
> 
>-void ContextNULL::popGroupMarker()
>-{
>-}
>+void ContextNULL::popGroupMarker() {}
> 
>-void ContextNULL::pushDebugGroup(GLenum source, GLuint id, GLsizei length, const char *message)
>-{
>-}
>+void ContextNULL::pushDebugGroup(GLenum source, GLuint id, const std::string &message) {}
> 
>-void ContextNULL::popDebugGroup()
>-{
>-}
>+void ContextNULL::popDebugGroup() {}
> 
>-void ContextNULL::syncState(const gl::Context *context, const gl::State::DirtyBits &dirtyBits)
>+angle::Result ContextNULL::syncState(const gl::Context *context,
>+                                     const gl::State::DirtyBits &dirtyBits,
>+                                     const gl::State::DirtyBits &bitMask)
> {
>+    return angle::Result::Continue;
> }
> 
> GLint ContextNULL::getGPUDisjoint()
>@@ -302,11 +287,12 @@ GLint64 ContextNULL::getTimestamp()
>     return 0;
> }
> 
>-void ContextNULL::onMakeCurrent(const gl::Context *context)
>+angle::Result ContextNULL::onMakeCurrent(const gl::Context *context)
> {
>+    return angle::Result::Continue;
> }
> 
>-const gl::Caps &ContextNULL::getNativeCaps() const
>+gl::Caps ContextNULL::getNativeCaps() const
> {
>     return mCaps;
> }
>@@ -351,9 +337,9 @@ TextureImpl *ContextNULL::createTexture(const gl::TextureState &state)
>     return new TextureNULL(state);
> }
> 
>-RenderbufferImpl *ContextNULL::createRenderbuffer()
>+RenderbufferImpl *ContextNULL::createRenderbuffer(const gl::RenderbufferState &state)
> {
>-    return new RenderbufferNULL();
>+    return new RenderbufferNULL(state);
> }
> 
> BufferImpl *ContextNULL::createBuffer(const gl::BufferState &state)
>@@ -366,7 +352,7 @@ VertexArrayImpl *ContextNULL::createVertexArray(const gl::VertexArrayState &data
>     return new VertexArrayNULL(data);
> }
> 
>-QueryImpl *ContextNULL::createQuery(GLenum type)
>+QueryImpl *ContextNULL::createQuery(gl::QueryType type)
> {
>     return new QueryNULL(type);
> }
>@@ -406,12 +392,43 @@ std::vector<PathImpl *> ContextNULL::createPaths(GLsizei range)
>     return result;
> }
> 
>-gl::Error ContextNULL::dispatchCompute(const gl::Context *context,
>-                                       GLuint numGroupsX,
>-                                       GLuint numGroupsY,
>-                                       GLuint numGroupsZ)
>+MemoryObjectImpl *ContextNULL::createMemoryObject()
> {
>-    return gl::NoError();
>+    UNREACHABLE();
>+    return nullptr;
> }
> 
>+angle::Result ContextNULL::dispatchCompute(const gl::Context *context,
>+                                           GLuint numGroupsX,
>+                                           GLuint numGroupsY,
>+                                           GLuint numGroupsZ)
>+{
>+    return angle::Result::Continue;
>+}
>+
>+angle::Result ContextNULL::dispatchComputeIndirect(const gl::Context *context, GLintptr indirect)
>+{
>+    return angle::Result::Continue;
>+}
>+
>+angle::Result ContextNULL::memoryBarrier(const gl::Context *context, GLbitfield barriers)
>+{
>+    return angle::Result::Continue;
>+}
>+
>+angle::Result ContextNULL::memoryBarrierByRegion(const gl::Context *context, GLbitfield barriers)
>+{
>+    return angle::Result::Continue;
>+}
>+
>+void ContextNULL::handleError(GLenum errorCode,
>+                              const char *message,
>+                              const char *file,
>+                              const char *function,
>+                              unsigned int line)
>+{
>+    std::stringstream errorStream;
>+    errorStream << "Internal NULL back-end error: " << message << ".";
>+    mErrors->handleError(errorCode, errorStream.str().c_str(), file, function, line);
>+}
> }  // namespace rx
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/null/ContextNULL.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/null/ContextNULL.h
>index e8261687cba..80dcae78e03 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/null/ContextNULL.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/null/ContextNULL.h
>@@ -33,51 +33,53 @@ class AllocationTrackerNULL : angle::NonCopyable
> class ContextNULL : public ContextImpl
> {
>   public:
>-    ContextNULL(const gl::ContextState &state, AllocationTrackerNULL *allocationTracker);
>+    ContextNULL(const gl::State &state,
>+                gl::ErrorSet *errorSet,
>+                AllocationTrackerNULL *allocationTracker);
>     ~ContextNULL() override;
> 
>-    gl::Error initialize() override;
>+    angle::Result initialize() override;
> 
>     // Flush and finish.
>-    gl::Error flush(const gl::Context *context) override;
>-    gl::Error finish(const gl::Context *context) override;
>+    angle::Result flush(const gl::Context *context) override;
>+    angle::Result finish(const gl::Context *context) override;
> 
>     // Drawing methods.
>-    gl::Error drawArrays(const gl::Context *context,
>-                         GLenum mode,
>-                         GLint first,
>-                         GLsizei count) override;
>-    gl::Error drawArraysInstanced(const gl::Context *context,
>-                                  GLenum mode,
>-                                  GLint first,
>-                                  GLsizei count,
>-                                  GLsizei instanceCount) override;
>-
>-    gl::Error drawElements(const gl::Context *context,
>-                           GLenum mode,
>-                           GLsizei count,
>-                           GLenum type,
>-                           const void *indices) override;
>-    gl::Error drawElementsInstanced(const gl::Context *context,
>-                                    GLenum mode,
>+    angle::Result drawArrays(const gl::Context *context,
>+                             gl::PrimitiveMode mode,
>+                             GLint first,
>+                             GLsizei count) override;
>+    angle::Result drawArraysInstanced(const gl::Context *context,
>+                                      gl::PrimitiveMode mode,
>+                                      GLint first,
>+                                      GLsizei count,
>+                                      GLsizei instanceCount) override;
>+
>+    angle::Result drawElements(const gl::Context *context,
>+                               gl::PrimitiveMode mode,
>+                               GLsizei count,
>+                               gl::DrawElementsType type,
>+                               const void *indices) override;
>+    angle::Result drawElementsInstanced(const gl::Context *context,
>+                                        gl::PrimitiveMode mode,
>+                                        GLsizei count,
>+                                        gl::DrawElementsType type,
>+                                        const void *indices,
>+                                        GLsizei instances) override;
>+    angle::Result drawRangeElements(const gl::Context *context,
>+                                    gl::PrimitiveMode mode,
>+                                    GLuint start,
>+                                    GLuint end,
>                                     GLsizei count,
>-                                    GLenum type,
>-                                    const void *indices,
>-                                    GLsizei instances) override;
>-    gl::Error drawRangeElements(const gl::Context *context,
>-                                GLenum mode,
>-                                GLuint start,
>-                                GLuint end,
>-                                GLsizei count,
>-                                GLenum type,
>-                                const void *indices) override;
>-    gl::Error drawArraysIndirect(const gl::Context *context,
>-                                 GLenum mode,
>-                                 const void *indirect) override;
>-    gl::Error drawElementsIndirect(const gl::Context *context,
>-                                   GLenum mode,
>-                                   GLenum type,
>-                                   const void *indirect) override;
>+                                    gl::DrawElementsType type,
>+                                    const void *indices) override;
>+    angle::Result drawArraysIndirect(const gl::Context *context,
>+                                     gl::PrimitiveMode mode,
>+                                     const void *indirect) override;
>+    angle::Result drawElementsIndirect(const gl::Context *context,
>+                                       gl::PrimitiveMode mode,
>+                                       gl::DrawElementsType type,
>+                                       const void *indirect) override;
> 
>     // CHROMIUM_path_rendering path drawing methods.
>     void stencilFillPath(const gl::Path *path, GLenum fillMode, GLuint mask) override;
>@@ -126,7 +128,7 @@ class ContextNULL : public ContextImpl
>                                              const GLfloat *transformValues) override;
> 
>     // Device loss
>-    GLenum getResetStatus() override;
>+    gl::GraphicsResetStatus getResetStatus() override;
> 
>     // Vendor and description strings.
>     std::string getVendorString() const override;
>@@ -138,21 +140,23 @@ class ContextNULL : public ContextImpl
>     void popGroupMarker() override;
> 
>     // KHR_debug
>-    void pushDebugGroup(GLenum source, GLuint id, GLsizei length, const char *message) override;
>+    void pushDebugGroup(GLenum source, GLuint id, const std::string &message) override;
>     void popDebugGroup() override;
> 
>     // State sync with dirty bits.
>-    void syncState(const gl::Context *context, const gl::State::DirtyBits &dirtyBits) override;
>+    angle::Result syncState(const gl::Context *context,
>+                            const gl::State::DirtyBits &dirtyBits,
>+                            const gl::State::DirtyBits &bitMask) override;
> 
>     // Disjoint timer queries
>     GLint getGPUDisjoint() override;
>     GLint64 getTimestamp() override;
> 
>     // Context switching
>-    void onMakeCurrent(const gl::Context *context) override;
>+    angle::Result onMakeCurrent(const gl::Context *context) override;
> 
>     // Native capabilities, unmodified by gl::Context.
>-    const gl::Caps &getNativeCaps() const override;
>+    gl::Caps getNativeCaps() const override;
>     const gl::TextureCapsMap &getNativeTextureCaps() const override;
>     const gl::Extensions &getNativeExtensions() const override;
>     const gl::Limitations &getNativeLimitations() const override;
>@@ -169,7 +173,7 @@ class ContextNULL : public ContextImpl
>     TextureImpl *createTexture(const gl::TextureState &state) override;
> 
>     // Renderbuffer creation
>-    RenderbufferImpl *createRenderbuffer() override;
>+    RenderbufferImpl *createRenderbuffer(const gl::RenderbufferState &state) override;
> 
>     // Buffer creation
>     BufferImpl *createBuffer(const gl::BufferState &state) override;
>@@ -178,7 +182,7 @@ class ContextNULL : public ContextImpl
>     VertexArrayImpl *createVertexArray(const gl::VertexArrayState &data) override;
> 
>     // Query and Fence creation
>-    QueryImpl *createQuery(GLenum type) override;
>+    QueryImpl *createQuery(gl::QueryType type) override;
>     FenceNVImpl *createFenceNV() override;
>     SyncImpl *createSync() override;
> 
>@@ -194,10 +198,23 @@ class ContextNULL : public ContextImpl
> 
>     std::vector<PathImpl *> createPaths(GLsizei range) override;
> 
>-    gl::Error dispatchCompute(const gl::Context *context,
>-                              GLuint numGroupsX,
>-                              GLuint numGroupsY,
>-                              GLuint numGroupsZ) override;
>+    // Memory object creation.
>+    MemoryObjectImpl *createMemoryObject() override;
>+
>+    angle::Result dispatchCompute(const gl::Context *context,
>+                                  GLuint numGroupsX,
>+                                  GLuint numGroupsY,
>+                                  GLuint numGroupsZ) override;
>+    angle::Result dispatchComputeIndirect(const gl::Context *context, GLintptr indirect) override;
>+
>+    angle::Result memoryBarrier(const gl::Context *context, GLbitfield barriers) override;
>+    angle::Result memoryBarrierByRegion(const gl::Context *context, GLbitfield barriers) override;
>+
>+    void handleError(GLenum errorCode,
>+                     const char *message,
>+                     const char *file,
>+                     const char *function,
>+                     unsigned int line);
> 
>   private:
>     gl::Caps mCaps;
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/null/DeviceNULL.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/null/DeviceNULL.cpp
>index 80023b6c0da..7903e4a0a70 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/null/DeviceNULL.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/null/DeviceNULL.cpp
>@@ -14,12 +14,13 @@
> namespace rx
> {
> 
>-DeviceNULL::DeviceNULL() : DeviceImpl()
>-{
>-}
>+DeviceNULL::DeviceNULL() : DeviceImpl() {}
> 
>-DeviceNULL::~DeviceNULL()
>+DeviceNULL::~DeviceNULL() {}
>+
>+egl::Error DeviceNULL::initialize()
> {
>+    return egl::NoError();
> }
> 
> egl::Error DeviceNULL::getDevice(void **outValue)
>@@ -33,13 +34,6 @@ EGLint DeviceNULL::getType()
>     return 0;
> }
> 
>-void DeviceNULL::generateExtensions(egl::DeviceExtensions *outExtensions) const
>-{
>-}
>-
>-bool DeviceNULL::deviceExternallySourced()
>-{
>-    return false;
>-}
>+void DeviceNULL::generateExtensions(egl::DeviceExtensions *outExtensions) const {}
> 
> }  // namespace rx
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/null/DeviceNULL.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/null/DeviceNULL.h
>index ed921039e7a..b26b4c90a10 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/null/DeviceNULL.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/null/DeviceNULL.h
>@@ -21,10 +21,10 @@ class DeviceNULL : public DeviceImpl
>     DeviceNULL();
>     ~DeviceNULL() override;
> 
>+    egl::Error initialize() override;
>     egl::Error getDevice(void **outValue) override;
>     EGLint getType() override;
>     void generateExtensions(egl::DeviceExtensions *outExtensions) const override;
>-    bool deviceExternallySourced() override;
> };
> 
> }  // namespace rx
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/null/DisplayNULL.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/null/DisplayNULL.cpp
>index d04cd092961..3c78195ee35 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/null/DisplayNULL.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/null/DisplayNULL.cpp
>@@ -19,18 +19,12 @@
> namespace rx
> {
> 
>-DisplayNULL::DisplayNULL(const egl::DisplayState &state) : DisplayImpl(state), mDevice(nullptr)
>-{
>-}
>+DisplayNULL::DisplayNULL(const egl::DisplayState &state) : DisplayImpl(state) {}
> 
>-DisplayNULL::~DisplayNULL()
>-{
>-}
>+DisplayNULL::~DisplayNULL() {}
> 
> egl::Error DisplayNULL::initialize(egl::Display *display)
> {
>-    mDevice = new DeviceNULL();
>-
>     constexpr size_t kMaxTotalAllocationSize = 1 << 28;  // 256MB
>     mAllocationTracker.reset(new AllocationTrackerNULL(kMaxTotalAllocationSize));
> 
>@@ -40,7 +34,6 @@ egl::Error DisplayNULL::initialize(egl::Display *display)
> void DisplayNULL::terminate()
> {
>     mAllocationTracker.reset();
>-    SafeDelete(mDevice);
> }
> 
> egl::Error DisplayNULL::makeCurrent(egl::Surface *drawSurface,
>@@ -113,18 +106,17 @@ std::string DisplayNULL::getVendorString() const
>     return "NULL";
> }
> 
>-egl::Error DisplayNULL::getDevice(DeviceImpl **device)
>+DeviceImpl *DisplayNULL::createDevice()
> {
>-    *device = mDevice;
>-    return egl::NoError();
>+    return new DeviceNULL();
> }
> 
>-egl::Error DisplayNULL::waitClient(const gl::Context *context) const
>+egl::Error DisplayNULL::waitClient(const gl::Context *context)
> {
>     return egl::NoError();
> }
> 
>-egl::Error DisplayNULL::waitNative(const gl::Context *context, EGLint engine) const
>+egl::Error DisplayNULL::waitNative(const gl::Context *context, EGLint engine)
> {
>     return egl::NoError();
> }
>@@ -163,18 +155,23 @@ SurfaceImpl *DisplayNULL::createPixmapSurface(const egl::SurfaceState &state,
> }
> 
> ImageImpl *DisplayNULL::createImage(const egl::ImageState &state,
>+                                    const gl::Context *context,
>                                     EGLenum target,
>                                     const egl::AttributeMap &attribs)
> {
>     return new ImageNULL(state);
> }
> 
>-ContextImpl *DisplayNULL::createContext(const gl::ContextState &state)
>+rx::ContextImpl *DisplayNULL::createContext(const gl::State &state,
>+                                            gl::ErrorSet *errorSet,
>+                                            const egl::Config *configuration,
>+                                            const gl::Context *shareContext,
>+                                            const egl::AttributeMap &attribs)
> {
>-    return new ContextNULL(state, mAllocationTracker.get());
>+    return new ContextNULL(state, errorSet, mAllocationTracker.get());
> }
> 
>-StreamProducerImpl *DisplayNULL::createStreamProducerD3DTextureNV12(
>+StreamProducerImpl *DisplayNULL::createStreamProducerD3DTexture(
>     egl::Stream::ConsumerType consumerType,
>     const egl::AttributeMap &attribs)
> {
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/null/DisplayNULL.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/null/DisplayNULL.h
>index 572724cc735..3e7e4133b07 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/null/DisplayNULL.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/null/DisplayNULL.h
>@@ -39,10 +39,10 @@ class DisplayNULL : public DisplayImpl
> 
>     std::string getVendorString() const override;
> 
>-    egl::Error getDevice(DeviceImpl **device) override;
>+    DeviceImpl *createDevice() override;
> 
>-    egl::Error waitClient(const gl::Context *context) const override;
>-    egl::Error waitNative(const gl::Context *context, EGLint engine) const override;
>+    egl::Error waitClient(const gl::Context *context) override;
>+    egl::Error waitNative(const gl::Context *context, EGLint engine) override;
>     gl::Version getMaxSupportedESVersion() const override;
> 
>     SurfaceImpl *createWindowSurface(const egl::SurfaceState &state,
>@@ -59,21 +59,23 @@ class DisplayNULL : public DisplayImpl
>                                      const egl::AttributeMap &attribs) override;
> 
>     ImageImpl *createImage(const egl::ImageState &state,
>+                           const gl::Context *context,
>                            EGLenum target,
>                            const egl::AttributeMap &attribs) override;
> 
>-    ContextImpl *createContext(const gl::ContextState &state) override;
>+    ContextImpl *createContext(const gl::State &state,
>+                               gl::ErrorSet *errorSet,
>+                               const egl::Config *configuration,
>+                               const gl::Context *shareContext,
>+                               const egl::AttributeMap &attribs) override;
> 
>-    StreamProducerImpl *createStreamProducerD3DTextureNV12(
>-        egl::Stream::ConsumerType consumerType,
>-        const egl::AttributeMap &attribs) override;
>+    StreamProducerImpl *createStreamProducerD3DTexture(egl::Stream::ConsumerType consumerType,
>+                                                       const egl::AttributeMap &attribs) override;
> 
>   private:
>     void generateExtensions(egl::DisplayExtensions *outExtensions) const override;
>     void generateCaps(egl::Caps *outCaps) const override;
> 
>-    DeviceImpl *mDevice;
>-
>     std::unique_ptr<AllocationTrackerNULL> mAllocationTracker;
> };
> 
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/null/FenceNVNULL.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/null/FenceNVNULL.cpp
>index 56843797390..3640e2ae563 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/null/FenceNVNULL.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/null/FenceNVNULL.cpp
>@@ -14,28 +14,24 @@
> namespace rx
> {
> 
>-FenceNVNULL::FenceNVNULL() : FenceNVImpl()
>-{
>-}
>+FenceNVNULL::FenceNVNULL() : FenceNVImpl() {}
> 
>-FenceNVNULL::~FenceNVNULL()
>-{
>-}
>+FenceNVNULL::~FenceNVNULL() {}
> 
>-gl::Error FenceNVNULL::set(GLenum condition)
>+angle::Result FenceNVNULL::set(const gl::Context *context, GLenum condition)
> {
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error FenceNVNULL::test(GLboolean *outFinished)
>+angle::Result FenceNVNULL::test(const gl::Context *context, GLboolean *outFinished)
> {
>     *outFinished = GL_TRUE;
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error FenceNVNULL::finish()
>+angle::Result FenceNVNULL::finish(const gl::Context *context)
> {
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
> }  // namespace rx
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/null/FenceNVNULL.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/null/FenceNVNULL.h
>index 10cf5c2cbdd..280e97a1f6e 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/null/FenceNVNULL.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/null/FenceNVNULL.h
>@@ -14,18 +14,16 @@
> 
> namespace rx
> {
>-
> class FenceNVNULL : public FenceNVImpl
> {
>   public:
>     FenceNVNULL();
>     ~FenceNVNULL() override;
> 
>-    gl::Error set(GLenum condition) override;
>-    gl::Error test(GLboolean *outFinished) override;
>-    gl::Error finish() override;
>+    angle::Result set(const gl::Context *context, GLenum condition) override;
>+    angle::Result test(const gl::Context *context, GLboolean *outFinished) override;
>+    angle::Result finish(const gl::Context *context) override;
> };
>-
> }  // namespace rx
> 
> #endif  // LIBANGLE_RENDERER_NULL_FENCENVNULL_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/null/FramebufferNULL.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/null/FramebufferNULL.cpp
>index 71d3cdc668f..696d0cc32f3 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/null/FramebufferNULL.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/null/FramebufferNULL.cpp
>@@ -9,81 +9,77 @@
> 
> #include "libANGLE/renderer/null/FramebufferNULL.h"
> 
>+#include "common/debug.h"
> #include "libANGLE/Context.h"
> #include "libANGLE/formatutils.h"
> #include "libANGLE/renderer/null/BufferNULL.h"
>-
>-#include "common/debug.h"
>+#include "libANGLE/renderer/null/ContextNULL.h"
> 
> namespace rx
> {
> 
>-FramebufferNULL::FramebufferNULL(const gl::FramebufferState &state) : FramebufferImpl(state)
>-{
>-}
>+FramebufferNULL::FramebufferNULL(const gl::FramebufferState &state) : FramebufferImpl(state) {}
> 
>-FramebufferNULL::~FramebufferNULL()
>-{
>-}
>+FramebufferNULL::~FramebufferNULL() {}
> 
>-gl::Error FramebufferNULL::discard(const gl::Context *context,
>-                                   size_t count,
>-                                   const GLenum *attachments)
>+angle::Result FramebufferNULL::discard(const gl::Context *context,
>+                                       size_t count,
>+                                       const GLenum *attachments)
> {
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error FramebufferNULL::invalidate(const gl::Context *context,
>-                                      size_t count,
>-                                      const GLenum *attachments)
>+angle::Result FramebufferNULL::invalidate(const gl::Context *context,
>+                                          size_t count,
>+                                          const GLenum *attachments)
> {
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error FramebufferNULL::invalidateSub(const gl::Context *context,
>-                                         size_t count,
>-                                         const GLenum *attachments,
>-                                         const gl::Rectangle &area)
>+angle::Result FramebufferNULL::invalidateSub(const gl::Context *context,
>+                                             size_t count,
>+                                             const GLenum *attachments,
>+                                             const gl::Rectangle &area)
> {
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error FramebufferNULL::clear(const gl::Context *context, GLbitfield mask)
>+angle::Result FramebufferNULL::clear(const gl::Context *context, GLbitfield mask)
> {
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error FramebufferNULL::clearBufferfv(const gl::Context *context,
>-                                         GLenum buffer,
>-                                         GLint drawbuffer,
>-                                         const GLfloat *values)
>+angle::Result FramebufferNULL::clearBufferfv(const gl::Context *context,
>+                                             GLenum buffer,
>+                                             GLint drawbuffer,
>+                                             const GLfloat *values)
> {
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error FramebufferNULL::clearBufferuiv(const gl::Context *context,
>-                                          GLenum buffer,
>-                                          GLint drawbuffer,
>-                                          const GLuint *values)
>+angle::Result FramebufferNULL::clearBufferuiv(const gl::Context *context,
>+                                              GLenum buffer,
>+                                              GLint drawbuffer,
>+                                              const GLuint *values)
> {
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error FramebufferNULL::clearBufferiv(const gl::Context *context,
>-                                         GLenum buffer,
>-                                         GLint drawbuffer,
>-                                         const GLint *values)
>+angle::Result FramebufferNULL::clearBufferiv(const gl::Context *context,
>+                                             GLenum buffer,
>+                                             GLint drawbuffer,
>+                                             const GLint *values)
> {
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error FramebufferNULL::clearBufferfi(const gl::Context *context,
>-                                         GLenum buffer,
>-                                         GLint drawbuffer,
>-                                         GLfloat depth,
>-                                         GLint stencil)
>+angle::Result FramebufferNULL::clearBufferfi(const gl::Context *context,
>+                                             GLenum buffer,
>+                                             GLint drawbuffer,
>+                                             GLfloat depth,
>+                                             GLint stencil)
> {
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
> GLenum FramebufferNULL::getImplementationColorReadFormat(const gl::Context *context) const
>@@ -112,21 +108,21 @@ GLenum FramebufferNULL::getImplementationColorReadType(const gl::Context *contex
>     return format.info->getReadPixelsType(context->getClientVersion());
> }
> 
>-gl::Error FramebufferNULL::readPixels(const gl::Context *context,
>-                                      const gl::Rectangle &origArea,
>-                                      GLenum format,
>-                                      GLenum type,
>-                                      void *ptrOrOffset)
>+angle::Result FramebufferNULL::readPixels(const gl::Context *context,
>+                                          const gl::Rectangle &origArea,
>+                                          GLenum format,
>+                                          GLenum type,
>+                                          void *ptrOrOffset)
> {
>-    const gl::PixelPackState &packState = context->getGLState().getPackState();
>-    gl::Buffer *packBuffer = context->getGLState().getTargetBuffer(gl::BufferBinding::PixelPack);
>+    const gl::PixelPackState &packState = context->getState().getPackState();
>+    gl::Buffer *packBuffer = context->getState().getTargetBuffer(gl::BufferBinding::PixelPack);
> 
>     // Get the pointer to write to from the argument or the pack buffer
>     GLubyte *pixels = nullptr;
>     if (packBuffer != nullptr)
>     {
>         BufferNULL *packBufferGL = GetImplAs<BufferNULL>(packBuffer);
>-        pixels                     = reinterpret_cast<GLubyte *>(packBufferGL->getDataPtr());
>+        pixels                   = reinterpret_cast<GLubyte *>(packBufferGL->getDataPtr());
>         pixels += reinterpret_cast<intptr_t>(ptrOrOffset);
>     }
>     else
>@@ -141,19 +137,22 @@ gl::Error FramebufferNULL::readPixels(const gl::Context *context,
>     if (!ClipRectangle(origArea, fbRect, &area))
>     {
>         // nothing to read
>-        return gl::NoError();
>+        return angle::Result::Continue;
>     }
> 
>     // Compute size of unclipped rows and initial skip
>     const gl::InternalFormat &glFormat = gl::GetInternalFormatInfo(format, type);
> 
>+    ContextNULL *contextNull = GetImplAs<ContextNULL>(context);
>+
>     GLuint rowBytes = 0;
>-    ANGLE_TRY_RESULT(
>-        glFormat.computeRowPitch(type, origArea.width, packState.alignment, packState.rowLength),
>-        rowBytes);
>+    ANGLE_CHECK_GL_MATH(contextNull,
>+                        glFormat.computeRowPitch(type, origArea.width, packState.alignment,
>+                                                 packState.rowLength, &rowBytes));
> 
>     GLuint skipBytes = 0;
>-    ANGLE_TRY_RESULT(glFormat.computeSkipBytes(rowBytes, 0, packState, false), skipBytes);
>+    ANGLE_CHECK_GL_MATH(contextNull,
>+                        glFormat.computeSkipBytes(type, rowBytes, 0, packState, false, &skipBytes));
>     pixels += skipBytes;
> 
>     // Skip OOB region up to first in bounds pixel
>@@ -168,16 +167,16 @@ gl::Error FramebufferNULL::readPixels(const gl::Context *context,
>         pixels += rowBytes;
>     }
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error FramebufferNULL::blit(const gl::Context *context,
>-                                const gl::Rectangle &sourceArea,
>-                                const gl::Rectangle &destArea,
>-                                GLbitfield mask,
>-                                GLenum filter)
>+angle::Result FramebufferNULL::blit(const gl::Context *context,
>+                                    const gl::Rectangle &sourceArea,
>+                                    const gl::Rectangle &destArea,
>+                                    GLbitfield mask,
>+                                    GLenum filter)
> {
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
> bool FramebufferNULL::checkStatus(const gl::Context *context) const
>@@ -185,14 +184,17 @@ bool FramebufferNULL::checkStatus(const gl::Context *context) const
>     return true;
> }
> 
>-void FramebufferNULL::syncState(const gl::Context *context,
>-                                const gl::Framebuffer::DirtyBits &dirtyBits)
>+angle::Result FramebufferNULL::syncState(const gl::Context *context,
>+                                         const gl::Framebuffer::DirtyBits &dirtyBits)
> {
>+    return angle::Result::Continue;
> }
> 
>-gl::Error FramebufferNULL::getSamplePosition(size_t index, GLfloat *xy) const
>+angle::Result FramebufferNULL::getSamplePosition(const gl::Context *context,
>+                                                 size_t index,
>+                                                 GLfloat *xy) const
> {
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
> }  // namespace rx
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/null/FramebufferNULL.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/null/FramebufferNULL.h
>index 7aeefa43609..41f1650e499 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/null/FramebufferNULL.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/null/FramebufferNULL.h
>@@ -21,54 +21,58 @@ class FramebufferNULL : public FramebufferImpl
>     FramebufferNULL(const gl::FramebufferState &state);
>     ~FramebufferNULL() override;
> 
>-    gl::Error discard(const gl::Context *context, size_t count, const GLenum *attachments) override;
>-    gl::Error invalidate(const gl::Context *context,
>-                         size_t count,
>-                         const GLenum *attachments) override;
>-    gl::Error invalidateSub(const gl::Context *context,
>-                            size_t count,
>-                            const GLenum *attachments,
>-                            const gl::Rectangle &area) override;
>+    angle::Result discard(const gl::Context *context,
>+                          size_t count,
>+                          const GLenum *attachments) override;
>+    angle::Result invalidate(const gl::Context *context,
>+                             size_t count,
>+                             const GLenum *attachments) override;
>+    angle::Result invalidateSub(const gl::Context *context,
>+                                size_t count,
>+                                const GLenum *attachments,
>+                                const gl::Rectangle &area) override;
> 
>-    gl::Error clear(const gl::Context *context, GLbitfield mask) override;
>-    gl::Error clearBufferfv(const gl::Context *context,
>-                            GLenum buffer,
>-                            GLint drawbuffer,
>-                            const GLfloat *values) override;
>-    gl::Error clearBufferuiv(const gl::Context *context,
>-                             GLenum buffer,
>-                             GLint drawbuffer,
>-                             const GLuint *values) override;
>-    gl::Error clearBufferiv(const gl::Context *context,
>-                            GLenum buffer,
>-                            GLint drawbuffer,
>-                            const GLint *values) override;
>-    gl::Error clearBufferfi(const gl::Context *context,
>-                            GLenum buffer,
>-                            GLint drawbuffer,
>-                            GLfloat depth,
>-                            GLint stencil) override;
>+    angle::Result clear(const gl::Context *context, GLbitfield mask) override;
>+    angle::Result clearBufferfv(const gl::Context *context,
>+                                GLenum buffer,
>+                                GLint drawbuffer,
>+                                const GLfloat *values) override;
>+    angle::Result clearBufferuiv(const gl::Context *context,
>+                                 GLenum buffer,
>+                                 GLint drawbuffer,
>+                                 const GLuint *values) override;
>+    angle::Result clearBufferiv(const gl::Context *context,
>+                                GLenum buffer,
>+                                GLint drawbuffer,
>+                                const GLint *values) override;
>+    angle::Result clearBufferfi(const gl::Context *context,
>+                                GLenum buffer,
>+                                GLint drawbuffer,
>+                                GLfloat depth,
>+                                GLint stencil) override;
> 
>     GLenum getImplementationColorReadFormat(const gl::Context *context) const override;
>     GLenum getImplementationColorReadType(const gl::Context *context) const override;
>-    gl::Error readPixels(const gl::Context *context,
>-                         const gl::Rectangle &area,
>-                         GLenum format,
>-                         GLenum type,
>-                         void *pixels) override;
>+    angle::Result readPixels(const gl::Context *context,
>+                             const gl::Rectangle &area,
>+                             GLenum format,
>+                             GLenum type,
>+                             void *pixels) override;
> 
>-    gl::Error blit(const gl::Context *context,
>-                   const gl::Rectangle &sourceArea,
>-                   const gl::Rectangle &destArea,
>-                   GLbitfield mask,
>-                   GLenum filter) override;
>+    angle::Result blit(const gl::Context *context,
>+                       const gl::Rectangle &sourceArea,
>+                       const gl::Rectangle &destArea,
>+                       GLbitfield mask,
>+                       GLenum filter) override;
> 
>     bool checkStatus(const gl::Context *context) const override;
> 
>-    void syncState(const gl::Context *context,
>-                   const gl::Framebuffer::DirtyBits &dirtyBits) override;
>+    angle::Result syncState(const gl::Context *context,
>+                            const gl::Framebuffer::DirtyBits &dirtyBits) override;
> 
>-    gl::Error getSamplePosition(size_t index, GLfloat *xy) const override;
>+    angle::Result getSamplePosition(const gl::Context *context,
>+                                    size_t index,
>+                                    GLfloat *xy) const override;
> };
> 
> }  // namespace rx
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/null/ImageNULL.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/null/ImageNULL.cpp
>index d106bf64869..a38a4bde2ac 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/null/ImageNULL.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/null/ImageNULL.cpp
>@@ -14,24 +14,18 @@
> namespace rx
> {
> 
>-ImageNULL::ImageNULL(const egl::ImageState &state) : ImageImpl(state)
>-{
>-}
>+ImageNULL::ImageNULL(const egl::ImageState &state) : ImageImpl(state) {}
> 
>-ImageNULL::~ImageNULL()
>-{
>-}
>+ImageNULL::~ImageNULL() {}
> 
>-egl::Error ImageNULL::initialize()
>+egl::Error ImageNULL::initialize(const egl::Display *display)
> {
>-    UNIMPLEMENTED();
>-    return egl::EglBadAccess();
>+    return egl::NoError();
> }
> 
>-gl::Error ImageNULL::orphan(const gl::Context *context, egl::ImageSibling *sibling)
>+angle::Result ImageNULL::orphan(const gl::Context *context, egl::ImageSibling *sibling)
> {
>-    UNIMPLEMENTED();
>-    return gl::InternalError();
>+    return angle::Result::Continue;
> }
> 
> }  // namespace rx
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/null/ImageNULL.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/null/ImageNULL.h
>index 012f840cc67..a32b8207e41 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/null/ImageNULL.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/null/ImageNULL.h
>@@ -20,9 +20,9 @@ class ImageNULL : public ImageImpl
>   public:
>     ImageNULL(const egl::ImageState &state);
>     ~ImageNULL() override;
>-    egl::Error initialize() override;
>+    egl::Error initialize(const egl::Display *display) override;
> 
>-    gl::Error orphan(const gl::Context *context, egl::ImageSibling *sibling) override;
>+    angle::Result orphan(const gl::Context *context, egl::ImageSibling *sibling) override;
> };
> 
> }  // namespace rx
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/null/PathNULL.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/null/PathNULL.cpp
>index ad0c8d59655..a408e4f9cf2 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/null/PathNULL.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/null/PathNULL.cpp
>@@ -13,28 +13,18 @@
> 
> namespace rx
> {
>+PathNULL::PathNULL() : PathImpl() {}
> 
>-PathNULL::PathNULL() : PathImpl()
>-{
>-}
>-
>-PathNULL::~PathNULL()
>-{
>-}
>-
>-gl::Error PathNULL::setCommands(GLsizei numCommands,
>-                                const GLubyte *commands,
>-                                GLsizei numCoords,
>-                                GLenum coordType,
>-                                const void *coords)
>-{
>-    UNIMPLEMENTED();
>-    return gl::InternalError();
>-}
>+PathNULL::~PathNULL() {}
> 
>-void PathNULL::setPathParameter(GLenum pname, GLfloat value)
>+angle::Result PathNULL::setCommands(GLsizei numCommands,
>+                                    const GLubyte *commands,
>+                                    GLsizei numCoords,
>+                                    GLenum coordType,
>+                                    const void *coords)
> {
>-    UNIMPLEMENTED();
>+    return angle::Result::Continue;
> }
> 
>+void PathNULL::setPathParameter(GLenum pname, GLfloat value) {}
> }  // namespace rx
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/null/PathNULL.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/null/PathNULL.h
>index 4c80c1c9135..b07a80bcc63 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/null/PathNULL.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/null/PathNULL.h
>@@ -21,11 +21,11 @@ class PathNULL : public PathImpl
>     PathNULL();
>     ~PathNULL() override;
> 
>-    gl::Error setCommands(GLsizei numCommands,
>-                          const GLubyte *commands,
>-                          GLsizei numCoords,
>-                          GLenum coordType,
>-                          const void *coords) override;
>+    angle::Result setCommands(GLsizei numCommands,
>+                              const GLubyte *commands,
>+                              GLsizei numCoords,
>+                              GLenum coordType,
>+                              const void *coords) override;
> 
>     void setPathParameter(GLenum pname, GLfloat value) override;
> };
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/null/ProgramNULL.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/null/ProgramNULL.cpp
>index f7aeb18d9d4..77b2e1e8427 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/null/ProgramNULL.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/null/ProgramNULL.cpp
>@@ -14,38 +14,28 @@
> namespace rx
> {
> 
>-ProgramNULL::ProgramNULL(const gl::ProgramState &state) : ProgramImpl(state)
>-{
>-}
>+ProgramNULL::ProgramNULL(const gl::ProgramState &state) : ProgramImpl(state) {}
> 
>-ProgramNULL::~ProgramNULL()
>-{
>-}
>+ProgramNULL::~ProgramNULL() {}
> 
>-gl::LinkResult ProgramNULL::load(const gl::Context *contextImpl,
>-                                 gl::InfoLog &infoLog,
>-                                 gl::BinaryInputStream *stream)
>+std::unique_ptr<LinkEvent> ProgramNULL::load(const gl::Context *context,
>+                                             gl::BinaryInputStream *stream,
>+                                             gl::InfoLog &infoLog)
> {
>-    return true;
>+    return std::make_unique<LinkEventDone>(angle::Result::Continue);
> }
> 
>-void ProgramNULL::save(const gl::Context *context, gl::BinaryOutputStream *stream)
>-{
>-}
>+void ProgramNULL::save(const gl::Context *context, gl::BinaryOutputStream *stream) {}
> 
>-void ProgramNULL::setBinaryRetrievableHint(bool retrievable)
>-{
>-}
>+void ProgramNULL::setBinaryRetrievableHint(bool retrievable) {}
> 
>-void ProgramNULL::setSeparable(bool separable)
>-{
>-}
>+void ProgramNULL::setSeparable(bool separable) {}
> 
>-gl::LinkResult ProgramNULL::link(const gl::Context *contextImpl,
>-                                 const gl::ProgramLinkedResources &resources,
>-                                 gl::InfoLog &infoLog)
>+std::unique_ptr<LinkEvent> ProgramNULL::link(const gl::Context *contextImpl,
>+                                             const gl::ProgramLinkedResources &resources,
>+                                             gl::InfoLog &infoLog)
> {
>-    return true;
>+    return std::make_unique<LinkEventDone>(angle::Result::Continue);
> }
> 
> GLboolean ProgramNULL::validate(const gl::Caps &caps, gl::InfoLog *infoLog)
>@@ -53,116 +43,83 @@ GLboolean ProgramNULL::validate(const gl::Caps &caps, gl::InfoLog *infoLog)
>     return GL_TRUE;
> }
> 
>-void ProgramNULL::setUniform1fv(GLint location, GLsizei count, const GLfloat *v)
>-{
>-}
>+void ProgramNULL::setUniform1fv(GLint location, GLsizei count, const GLfloat *v) {}
> 
>-void ProgramNULL::setUniform2fv(GLint location, GLsizei count, const GLfloat *v)
>-{
>-}
>+void ProgramNULL::setUniform2fv(GLint location, GLsizei count, const GLfloat *v) {}
> 
>-void ProgramNULL::setUniform3fv(GLint location, GLsizei count, const GLfloat *v)
>-{
>-}
>+void ProgramNULL::setUniform3fv(GLint location, GLsizei count, const GLfloat *v) {}
> 
>-void ProgramNULL::setUniform4fv(GLint location, GLsizei count, const GLfloat *v)
>-{
>-}
>+void ProgramNULL::setUniform4fv(GLint location, GLsizei count, const GLfloat *v) {}
> 
>-void ProgramNULL::setUniform1iv(GLint location, GLsizei count, const GLint *v)
>-{
>-}
>+void ProgramNULL::setUniform1iv(GLint location, GLsizei count, const GLint *v) {}
> 
>-void ProgramNULL::setUniform2iv(GLint location, GLsizei count, const GLint *v)
>-{
>-}
>+void ProgramNULL::setUniform2iv(GLint location, GLsizei count, const GLint *v) {}
> 
>-void ProgramNULL::setUniform3iv(GLint location, GLsizei count, const GLint *v)
>-{
>-}
>+void ProgramNULL::setUniform3iv(GLint location, GLsizei count, const GLint *v) {}
> 
>-void ProgramNULL::setUniform4iv(GLint location, GLsizei count, const GLint *v)
>-{
>-}
>+void ProgramNULL::setUniform4iv(GLint location, GLsizei count, const GLint *v) {}
> 
>-void ProgramNULL::setUniform1uiv(GLint location, GLsizei count, const GLuint *v)
>-{
>-}
>+void ProgramNULL::setUniform1uiv(GLint location, GLsizei count, const GLuint *v) {}
> 
>-void ProgramNULL::setUniform2uiv(GLint location, GLsizei count, const GLuint *v)
>-{
>-}
>+void ProgramNULL::setUniform2uiv(GLint location, GLsizei count, const GLuint *v) {}
> 
>-void ProgramNULL::setUniform3uiv(GLint location, GLsizei count, const GLuint *v)
>-{
>-}
>+void ProgramNULL::setUniform3uiv(GLint location, GLsizei count, const GLuint *v) {}
> 
>-void ProgramNULL::setUniform4uiv(GLint location, GLsizei count, const GLuint *v)
>-{
>-}
>+void ProgramNULL::setUniform4uiv(GLint location, GLsizei count, const GLuint *v) {}
> 
> void ProgramNULL::setUniformMatrix2fv(GLint location,
>                                       GLsizei count,
>                                       GLboolean transpose,
>                                       const GLfloat *value)
>-{
>-}
>+{}
> 
> void ProgramNULL::setUniformMatrix3fv(GLint location,
>                                       GLsizei count,
>                                       GLboolean transpose,
>                                       const GLfloat *value)
>-{
>-}
>+{}
> 
> void ProgramNULL::setUniformMatrix4fv(GLint location,
>                                       GLsizei count,
>                                       GLboolean transpose,
>                                       const GLfloat *value)
>-{
>-}
>+{}
> 
> void ProgramNULL::setUniformMatrix2x3fv(GLint location,
>                                         GLsizei count,
>                                         GLboolean transpose,
>                                         const GLfloat *value)
>-{
>-}
>+{}
> 
> void ProgramNULL::setUniformMatrix3x2fv(GLint location,
>                                         GLsizei count,
>                                         GLboolean transpose,
>                                         const GLfloat *value)
>-{
>-}
>+{}
> 
> void ProgramNULL::setUniformMatrix2x4fv(GLint location,
>                                         GLsizei count,
>                                         GLboolean transpose,
>                                         const GLfloat *value)
>-{
>-}
>+{}
> 
> void ProgramNULL::setUniformMatrix4x2fv(GLint location,
>                                         GLsizei count,
>                                         GLboolean transpose,
>                                         const GLfloat *value)
>-{
>-}
>+{}
> 
> void ProgramNULL::setUniformMatrix3x4fv(GLint location,
>                                         GLsizei count,
>                                         GLboolean transpose,
>                                         const GLfloat *value)
>-{
>-}
>+{}
> 
> void ProgramNULL::setUniformMatrix4x3fv(GLint location,
>                                         GLsizei count,
>                                         GLboolean transpose,
>                                         const GLfloat *value)
>-{
>-}
>+{}
> 
> void ProgramNULL::getUniformfv(const gl::Context *context, GLint location, GLfloat *params) const
> {
>@@ -179,15 +136,10 @@ void ProgramNULL::getUniformuiv(const gl::Context *context, GLint location, GLui
>     // TODO(jmadill): Write some values.
> }
> 
>-void ProgramNULL::setUniformBlockBinding(GLuint uniformBlockIndex, GLuint uniformBlockBinding)
>-{
>-}
>-
> void ProgramNULL::setPathFragmentInputGen(const std::string &inputName,
>                                           GLenum genMode,
>                                           GLint components,
>                                           const GLfloat *coeffs)
>-{
>-}
>+{}
> 
> }  // namespace rx
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/null/ProgramNULL.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/null/ProgramNULL.h
>index 4dc8097bbb3..8260577dfbc 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/null/ProgramNULL.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/null/ProgramNULL.h
>@@ -21,16 +21,16 @@ class ProgramNULL : public ProgramImpl
>     ProgramNULL(const gl::ProgramState &state);
>     ~ProgramNULL() override;
> 
>-    gl::LinkResult load(const gl::Context *context,
>-                        gl::InfoLog &infoLog,
>-                        gl::BinaryInputStream *stream) override;
>+    std::unique_ptr<LinkEvent> load(const gl::Context *context,
>+                                    gl::BinaryInputStream *stream,
>+                                    gl::InfoLog &infoLog) override;
>     void save(const gl::Context *context, gl::BinaryOutputStream *stream) override;
>     void setBinaryRetrievableHint(bool retrievable) override;
>     void setSeparable(bool separable) override;
> 
>-    gl::LinkResult link(const gl::Context *context,
>-                        const gl::ProgramLinkedResources &resources,
>-                        gl::InfoLog &infoLog) override;
>+    std::unique_ptr<LinkEvent> link(const gl::Context *context,
>+                                    const gl::ProgramLinkedResources &resources,
>+                                    gl::InfoLog &infoLog) override;
>     GLboolean validate(const gl::Caps &caps, gl::InfoLog *infoLog) override;
> 
>     void setUniform1fv(GLint location, GLsizei count, const GLfloat *v) override;
>@@ -86,9 +86,6 @@ class ProgramNULL : public ProgramImpl
>     void getUniformiv(const gl::Context *context, GLint location, GLint *params) const override;
>     void getUniformuiv(const gl::Context *context, GLint location, GLuint *params) const override;
> 
>-    // TODO: synchronize in syncState when dirty bits exist.
>-    void setUniformBlockBinding(GLuint uniformBlockIndex, GLuint uniformBlockBinding) override;
>-
>     // CHROMIUM_path_rendering
>     // Set parameters to control fragment shader input variable interpolation
>     void setPathFragmentInputGen(const std::string &inputName,
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/null/ProgramPipelineNULL.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/null/ProgramPipelineNULL.cpp
>index 0552c1a1f13..ac413cc28ea 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/null/ProgramPipelineNULL.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/null/ProgramPipelineNULL.cpp
>@@ -14,11 +14,8 @@ namespace rx
> 
> ProgramPipelineNULL::ProgramPipelineNULL(const gl::ProgramPipelineState &state)
>     : ProgramPipelineImpl(state)
>-{
>-}
>+{}
> 
>-ProgramPipelineNULL::~ProgramPipelineNULL()
>-{
>-}
>+ProgramPipelineNULL::~ProgramPipelineNULL() {}
> 
> }  // namespace rx
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/null/QueryNULL.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/null/QueryNULL.cpp
>index 8888028c6ad..813864fb241 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/null/QueryNULL.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/null/QueryNULL.cpp
>@@ -14,57 +14,53 @@
> namespace rx
> {
> 
>-QueryNULL::QueryNULL(GLenum type) : QueryImpl(type)
>-{
>-}
>+QueryNULL::QueryNULL(gl::QueryType type) : QueryImpl(type) {}
> 
>-QueryNULL::~QueryNULL()
>-{
>-}
>+QueryNULL::~QueryNULL() {}
> 
>-gl::Error QueryNULL::begin()
>+angle::Result QueryNULL::begin(const gl::Context *context)
> {
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error QueryNULL::end()
>+angle::Result QueryNULL::end(const gl::Context *context)
> {
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error QueryNULL::queryCounter()
>+angle::Result QueryNULL::queryCounter(const gl::Context *context)
> {
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error QueryNULL::getResult(GLint *params)
>+angle::Result QueryNULL::getResult(const gl::Context *context, GLint *params)
> {
>     *params = 0;
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error QueryNULL::getResult(GLuint *params)
>+angle::Result QueryNULL::getResult(const gl::Context *context, GLuint *params)
> {
>     *params = 0;
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error QueryNULL::getResult(GLint64 *params)
>+angle::Result QueryNULL::getResult(const gl::Context *context, GLint64 *params)
> {
>     *params = 0;
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error QueryNULL::getResult(GLuint64 *params)
>+angle::Result QueryNULL::getResult(const gl::Context *context, GLuint64 *params)
> {
>     *params = 0;
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error QueryNULL::isResultAvailable(bool *available)
>+angle::Result QueryNULL::isResultAvailable(const gl::Context *context, bool *available)
> {
>     *available = true;
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
> }  // namespace rx
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/null/QueryNULL.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/null/QueryNULL.h
>index 40082a9b858..20b3179115d 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/null/QueryNULL.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/null/QueryNULL.h
>@@ -18,17 +18,17 @@ namespace rx
> class QueryNULL : public QueryImpl
> {
>   public:
>-    QueryNULL(GLenum type);
>+    QueryNULL(gl::QueryType type);
>     ~QueryNULL() override;
> 
>-    gl::Error begin() override;
>-    gl::Error end() override;
>-    gl::Error queryCounter() override;
>-    gl::Error getResult(GLint *params) override;
>-    gl::Error getResult(GLuint *params) override;
>-    gl::Error getResult(GLint64 *params) override;
>-    gl::Error getResult(GLuint64 *params) override;
>-    gl::Error isResultAvailable(bool *available) override;
>+    angle::Result begin(const gl::Context *context) override;
>+    angle::Result end(const gl::Context *context) override;
>+    angle::Result queryCounter(const gl::Context *context) override;
>+    angle::Result getResult(const gl::Context *context, GLint *params) override;
>+    angle::Result getResult(const gl::Context *context, GLuint *params) override;
>+    angle::Result getResult(const gl::Context *context, GLint64 *params) override;
>+    angle::Result getResult(const gl::Context *context, GLuint64 *params) override;
>+    angle::Result isResultAvailable(const gl::Context *context, bool *available) override;
> };
> 
> }  // namespace rx
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/null/RenderbufferNULL.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/null/RenderbufferNULL.cpp
>index 0dbab35fda0..5a0379a09d1 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/null/RenderbufferNULL.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/null/RenderbufferNULL.cpp
>@@ -14,40 +14,37 @@
> namespace rx
> {
> 
>-RenderbufferNULL::RenderbufferNULL() : RenderbufferImpl()
>-{
>-}
>+RenderbufferNULL::RenderbufferNULL(const gl::RenderbufferState &state) : RenderbufferImpl(state) {}
> 
>-RenderbufferNULL::~RenderbufferNULL()
>-{
>-}
>+RenderbufferNULL::~RenderbufferNULL() {}
> 
>-gl::Error RenderbufferNULL::setStorage(const gl::Context *context,
>-                                       GLenum internalformat,
>-                                       size_t width,
>-                                       size_t height)
>+angle::Result RenderbufferNULL::setStorage(const gl::Context *context,
>+                                           GLenum internalformat,
>+                                           size_t width,
>+                                           size_t height)
> {
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error RenderbufferNULL::setStorageMultisample(const gl::Context *context,
>-                                                  size_t samples,
>-                                                  GLenum internalformat,
>-                                                  size_t width,
>-                                                  size_t height)
>+angle::Result RenderbufferNULL::setStorageMultisample(const gl::Context *context,
>+                                                      size_t samples,
>+                                                      GLenum internalformat,
>+                                                      size_t width,
>+                                                      size_t height)
> {
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error RenderbufferNULL::setStorageEGLImageTarget(const gl::Context *context, egl::Image *image)
>+angle::Result RenderbufferNULL::setStorageEGLImageTarget(const gl::Context *context,
>+                                                         egl::Image *image)
> {
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error RenderbufferNULL::initializeContents(const gl::Context *context,
>-                                               const gl::ImageIndex &imageIndex)
>+angle::Result RenderbufferNULL::initializeContents(const gl::Context *context,
>+                                                   const gl::ImageIndex &imageIndex)
> {
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
> }  // namespace rx
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/null/RenderbufferNULL.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/null/RenderbufferNULL.h
>index 5d441bb67b3..79f9932fc14 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/null/RenderbufferNULL.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/null/RenderbufferNULL.h
>@@ -18,23 +18,23 @@ namespace rx
> class RenderbufferNULL : public RenderbufferImpl
> {
>   public:
>-    RenderbufferNULL();
>+    RenderbufferNULL(const gl::RenderbufferState &state);
>     ~RenderbufferNULL() override;
> 
>-    gl::Error setStorage(const gl::Context *context,
>-                         GLenum internalformat,
>-                         size_t width,
>-                         size_t height) override;
>-    gl::Error setStorageMultisample(const gl::Context *context,
>-                                    size_t samples,
>-                                    GLenum internalformat,
>-                                    size_t width,
>-                                    size_t height) override;
>+    angle::Result setStorage(const gl::Context *context,
>+                             GLenum internalformat,
>+                             size_t width,
>+                             size_t height) override;
>+    angle::Result setStorageMultisample(const gl::Context *context,
>+                                        size_t samples,
>+                                        GLenum internalformat,
>+                                        size_t width,
>+                                        size_t height) override;
> 
>-    gl::Error setStorageEGLImageTarget(const gl::Context *context, egl::Image *image) override;
>+    angle::Result setStorageEGLImageTarget(const gl::Context *context, egl::Image *image) override;
> 
>-    gl::Error initializeContents(const gl::Context *context,
>-                                 const gl::ImageIndex &imageIndex) override;
>+    angle::Result initializeContents(const gl::Context *context,
>+                                     const gl::ImageIndex &imageIndex) override;
> };
> 
> }  // namespace rx
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/null/SamplerNULL.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/null/SamplerNULL.cpp
>index 53870190a99..f95fb8edbb8 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/null/SamplerNULL.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/null/SamplerNULL.cpp
>@@ -14,12 +14,8 @@
> namespace rx
> {
> 
>-SamplerNULL::SamplerNULL(const gl::SamplerState &state) : SamplerImpl(state)
>-{
>-}
>+SamplerNULL::SamplerNULL(const gl::SamplerState &state) : SamplerImpl(state) {}
> 
>-SamplerNULL::~SamplerNULL()
>-{
>-}
>+SamplerNULL::~SamplerNULL() {}
> 
> }  // namespace rx
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/null/ShaderNULL.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/null/ShaderNULL.cpp
>index e7d83833aeb..eec466fe869 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/null/ShaderNULL.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/null/ShaderNULL.cpp
>@@ -10,28 +10,20 @@
> #include "libANGLE/renderer/null/ShaderNULL.h"
> 
> #include "common/debug.h"
>+#include "libANGLE/Context.h"
> 
> namespace rx
> {
> 
>-ShaderNULL::ShaderNULL(const gl::ShaderState &data) : ShaderImpl(data)
>-{
>-}
>+ShaderNULL::ShaderNULL(const gl::ShaderState &data) : ShaderImpl(data) {}
> 
>-ShaderNULL::~ShaderNULL()
>-{
>-}
>-
>-ShCompileOptions ShaderNULL::prepareSourceAndReturnOptions(std::stringstream *sourceStream,
>-                                                           std::string *sourcePath)
>-{
>-    *sourceStream << mData.getSource();
>-    return 0;
>-}
>+ShaderNULL::~ShaderNULL() {}
> 
>-bool ShaderNULL::postTranslateCompile(gl::Compiler *compiler, std::string *infoLog)
>+std::shared_ptr<WaitableCompileEvent> ShaderNULL::compile(const gl::Context *context,
>+                                                          gl::ShCompilerInstance *compilerInstance,
>+                                                          ShCompileOptions options)
> {
>-    return true;
>+    return compileImpl(context, compilerInstance, mData.getSource(), options);
> }
> 
> std::string ShaderNULL::getDebugInfo() const
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/null/ShaderNULL.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/null/ShaderNULL.h
>index d29b4cfb76f..8efab1a1630 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/null/ShaderNULL.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/null/ShaderNULL.h
>@@ -21,11 +21,9 @@ class ShaderNULL : public ShaderImpl
>     ShaderNULL(const gl::ShaderState &data);
>     ~ShaderNULL() override;
> 
>-    // Returns additional sh::Compile options.
>-    ShCompileOptions prepareSourceAndReturnOptions(std::stringstream *sourceStream,
>-                                                   std::string *sourcePath) override;
>-    // Returns success for compiling on the driver. Returns success.
>-    bool postTranslateCompile(gl::Compiler *compiler, std::string *infoLog) override;
>+    std::shared_ptr<WaitableCompileEvent> compile(const gl::Context *context,
>+                                                  gl::ShCompilerInstance *compilerInstance,
>+                                                  ShCompileOptions options) override;
> 
>     std::string getDebugInfo() const override;
> };
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/null/SurfaceNULL.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/null/SurfaceNULL.cpp
>index 49822ff65a7..eff541abed6 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/null/SurfaceNULL.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/null/SurfaceNULL.cpp
>@@ -16,20 +16,17 @@
> namespace rx
> {
> 
>-SurfaceNULL::SurfaceNULL(const egl::SurfaceState &surfaceState) : SurfaceImpl(surfaceState)
>-{
>-}
>+SurfaceNULL::SurfaceNULL(const egl::SurfaceState &surfaceState) : SurfaceImpl(surfaceState) {}
> 
>-SurfaceNULL::~SurfaceNULL()
>-{
>-}
>+SurfaceNULL::~SurfaceNULL() {}
> 
> egl::Error SurfaceNULL::initialize(const egl::Display *display)
> {
>     return egl::NoError();
> }
> 
>-FramebufferImpl *SurfaceNULL::createDefaultFramebuffer(const gl::FramebufferState &state)
>+FramebufferImpl *SurfaceNULL::createDefaultFramebuffer(const gl::Context *context,
>+                                                       const gl::FramebufferState &state)
> {
>     return new FramebufferNULL(state);
> }
>@@ -54,12 +51,14 @@ egl::Error SurfaceNULL::querySurfacePointerANGLE(EGLint attribute, void **value)
>     return egl::NoError();
> }
> 
>-egl::Error SurfaceNULL::bindTexImage(gl::Texture *texture, EGLint buffer)
>+egl::Error SurfaceNULL::bindTexImage(const gl::Context *context,
>+                                     gl::Texture *texture,
>+                                     EGLint buffer)
> {
>     return egl::NoError();
> }
> 
>-egl::Error SurfaceNULL::releaseTexImage(EGLint buffer)
>+egl::Error SurfaceNULL::releaseTexImage(const gl::Context *context, EGLint buffer)
> {
>     return egl::NoError();
> }
>@@ -70,9 +69,7 @@ egl::Error SurfaceNULL::getSyncValues(EGLuint64KHR *ust, EGLuint64KHR *msc, EGLu
>     return egl::EglBadAccess();
> }
> 
>-void SurfaceNULL::setSwapInterval(EGLint interval)
>-{
>-}
>+void SurfaceNULL::setSwapInterval(EGLint interval) {}
> 
> EGLint SurfaceNULL::getWidth() const
> {
>@@ -96,10 +93,10 @@ EGLint SurfaceNULL::getSwapBehavior() const
>     return EGL_BUFFER_PRESERVED;
> }
> 
>-gl::Error SurfaceNULL::initializeContents(const gl::Context *context,
>-                                          const gl::ImageIndex &imageIndex)
>+angle::Result SurfaceNULL::initializeContents(const gl::Context *context,
>+                                              const gl::ImageIndex &imageIndex)
> {
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
> }  // namespace rx
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/null/SurfaceNULL.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/null/SurfaceNULL.h
>index ee8533db9bf..c6a48fb7b37 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/null/SurfaceNULL.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/null/SurfaceNULL.h
>@@ -22,7 +22,8 @@ class SurfaceNULL : public SurfaceImpl
>     ~SurfaceNULL() override;
> 
>     egl::Error initialize(const egl::Display *display) override;
>-    FramebufferImpl *createDefaultFramebuffer(const gl::FramebufferState &state) override;
>+    FramebufferImpl *createDefaultFramebuffer(const gl::Context *context,
>+                                              const gl::FramebufferState &state) override;
>     egl::Error swap(const gl::Context *context) override;
>     egl::Error postSubBuffer(const gl::Context *context,
>                              EGLint x,
>@@ -30,8 +31,10 @@ class SurfaceNULL : public SurfaceImpl
>                              EGLint width,
>                              EGLint height) override;
>     egl::Error querySurfacePointerANGLE(EGLint attribute, void **value) override;
>-    egl::Error bindTexImage(gl::Texture *texture, EGLint buffer) override;
>-    egl::Error releaseTexImage(EGLint buffer) override;
>+    egl::Error bindTexImage(const gl::Context *context,
>+                            gl::Texture *texture,
>+                            EGLint buffer) override;
>+    egl::Error releaseTexImage(const gl::Context *context, EGLint buffer) override;
>     egl::Error getSyncValues(EGLuint64KHR *ust, EGLuint64KHR *msc, EGLuint64KHR *sbc) override;
>     void setSwapInterval(EGLint interval) override;
> 
>@@ -42,8 +45,8 @@ class SurfaceNULL : public SurfaceImpl
>     EGLint isPostSubBufferSupported() const override;
>     EGLint getSwapBehavior() const override;
> 
>-    gl::Error initializeContents(const gl::Context *context,
>-                                 const gl::ImageIndex &imageIndex) override;
>+    angle::Result initializeContents(const gl::Context *context,
>+                                     const gl::ImageIndex &imageIndex) override;
> };
> 
> }  // namespace rx
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/null/SyncNULL.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/null/SyncNULL.cpp
>index e75deb3b6c8..5865697b1b3 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/null/SyncNULL.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/null/SyncNULL.cpp
>@@ -14,34 +14,33 @@
> namespace rx
> {
> 
>-SyncNULL::SyncNULL() : SyncImpl()
>-{
>-}
>+SyncNULL::SyncNULL() : SyncImpl() {}
> 
>-SyncNULL::~SyncNULL()
>-{
>-}
>+SyncNULL::~SyncNULL() {}
> 
>-gl::Error SyncNULL::set(GLenum condition, GLbitfield flags)
>+angle::Result SyncNULL::set(const gl::Context *context, GLenum condition, GLbitfield flags)
> {
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error SyncNULL::clientWait(GLbitfield flags, GLuint64 timeout, GLenum *outResult)
>+angle::Result SyncNULL::clientWait(const gl::Context *context,
>+                                   GLbitfield flags,
>+                                   GLuint64 timeout,
>+                                   GLenum *outResult)
> {
>     *outResult = GL_ALREADY_SIGNALED;
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error SyncNULL::serverWait(GLbitfield flags, GLuint64 timeout)
>+angle::Result SyncNULL::serverWait(const gl::Context *context, GLbitfield flags, GLuint64 timeout)
> {
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error SyncNULL::getStatus(GLint *outResult)
>+angle::Result SyncNULL::getStatus(const gl::Context *context, GLint *outResult)
> {
>     *outResult = GL_SIGNALED;
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
> }  // namespace rx
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/null/SyncNULL.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/null/SyncNULL.h
>index 10096a2438d..d9a1b0d2c34 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/null/SyncNULL.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/null/SyncNULL.h
>@@ -14,19 +14,22 @@
> 
> namespace rx
> {
>-
> class SyncNULL : public SyncImpl
> {
>   public:
>     SyncNULL();
>     ~SyncNULL() override;
> 
>-    gl::Error set(GLenum condition, GLbitfield flags) override;
>-    gl::Error clientWait(GLbitfield flags, GLuint64 timeout, GLenum *outResult) override;
>-    gl::Error serverWait(GLbitfield flags, GLuint64 timeout) override;
>-    gl::Error getStatus(GLint *outResult) override;
>+    angle::Result set(const gl::Context *context, GLenum condition, GLbitfield flags) override;
>+    angle::Result clientWait(const gl::Context *context,
>+                             GLbitfield flags,
>+                             GLuint64 timeout,
>+                             GLenum *outResult) override;
>+    angle::Result serverWait(const gl::Context *context,
>+                             GLbitfield flags,
>+                             GLuint64 timeout) override;
>+    angle::Result getStatus(const gl::Context *context, GLint *outResult) override;
> };
>-
> }  // namespace rx
> 
> #endif  // LIBANGLE_RENDERER_NULL_FENCESYNCNULL_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/null/TextureNULL.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/null/TextureNULL.cpp
>index 67b533aac47..a7b6f047c6b 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/null/TextureNULL.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/null/TextureNULL.cpp
>@@ -14,147 +14,183 @@
> namespace rx
> {
> 
>-TextureNULL::TextureNULL(const gl::TextureState &state) : TextureImpl(state)
>+TextureNULL::TextureNULL(const gl::TextureState &state) : TextureImpl(state) {}
>+
>+TextureNULL::~TextureNULL() {}
>+
>+angle::Result TextureNULL::setImage(const gl::Context *context,
>+                                    const gl::ImageIndex &index,
>+                                    GLenum internalFormat,
>+                                    const gl::Extents &size,
>+                                    GLenum format,
>+                                    GLenum type,
>+                                    const gl::PixelUnpackState &unpack,
>+                                    const uint8_t *pixels)
> {
>+    // TODO(geofflang): Read all incoming pixel data (maybe hash it?) to make sure we don't read out
>+    // of bounds due to validation bugs.
>+    return angle::Result::Continue;
> }
> 
>-TextureNULL::~TextureNULL()
>+angle::Result TextureNULL::setSubImage(const gl::Context *context,
>+                                       const gl::ImageIndex &index,
>+                                       const gl::Box &area,
>+                                       GLenum format,
>+                                       GLenum type,
>+                                       const gl::PixelUnpackState &unpack,
>+                                       gl::Buffer *unpackBuffer,
>+                                       const uint8_t *pixels)
> {
>+    return angle::Result::Continue;
> }
> 
>-gl::Error TextureNULL::setImage(const gl::Context *context,
>-                                GLenum target,
>-                                size_t level,
>-                                GLenum internalFormat,
>-                                const gl::Extents &size,
>-                                GLenum format,
>-                                GLenum type,
>-                                const gl::PixelUnpackState &unpack,
>-                                const uint8_t *pixels)
>+angle::Result TextureNULL::setCompressedImage(const gl::Context *context,
>+                                              const gl::ImageIndex &index,
>+                                              GLenum internalFormat,
>+                                              const gl::Extents &size,
>+                                              const gl::PixelUnpackState &unpack,
>+                                              size_t imageSize,
>+                                              const uint8_t *pixels)
> {
>-    // TODO(geofflang): Read all incoming pixel data (maybe hash it?) to make sure we don't read out
>-    // of bounds due to validation bugs.
>-    return gl::NoError();
>+    return angle::Result::Continue;
>+}
>+
>+angle::Result TextureNULL::setCompressedSubImage(const gl::Context *context,
>+                                                 const gl::ImageIndex &index,
>+                                                 const gl::Box &area,
>+                                                 GLenum format,
>+                                                 const gl::PixelUnpackState &unpack,
>+                                                 size_t imageSize,
>+                                                 const uint8_t *pixels)
>+{
>+    return angle::Result::Continue;
>+}
>+
>+angle::Result TextureNULL::copyImage(const gl::Context *context,
>+                                     const gl::ImageIndex &index,
>+                                     const gl::Rectangle &sourceArea,
>+                                     GLenum internalFormat,
>+                                     gl::Framebuffer *source)
>+{
>+    return angle::Result::Continue;
> }
> 
>-gl::Error TextureNULL::setSubImage(const gl::Context *context,
>-                                   GLenum target,
>-                                   size_t level,
>-                                   const gl::Box &area,
>-                                   GLenum format,
>-                                   GLenum type,
>-                                   const gl::PixelUnpackState &unpack,
>-                                   const uint8_t *pixels)
>+angle::Result TextureNULL::copySubImage(const gl::Context *context,
>+                                        const gl::ImageIndex &index,
>+                                        const gl::Offset &destOffset,
>+                                        const gl::Rectangle &sourceArea,
>+                                        gl::Framebuffer *source)
> {
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error TextureNULL::setCompressedImage(const gl::Context *context,
>-                                          GLenum target,
>-                                          size_t level,
>-                                          GLenum internalFormat,
>-                                          const gl::Extents &size,
>-                                          const gl::PixelUnpackState &unpack,
>-                                          size_t imageSize,
>-                                          const uint8_t *pixels)
>+angle::Result TextureNULL::copyTexture(const gl::Context *context,
>+                                       const gl::ImageIndex &index,
>+                                       GLenum internalFormat,
>+                                       GLenum type,
>+                                       size_t sourceLevel,
>+                                       bool unpackFlipY,
>+                                       bool unpackPremultiplyAlpha,
>+                                       bool unpackUnmultiplyAlpha,
>+                                       const gl::Texture *source)
> {
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error TextureNULL::setCompressedSubImage(const gl::Context *context,
>-                                             GLenum target,
>-                                             size_t level,
>-                                             const gl::Box &area,
>-                                             GLenum format,
>-                                             const gl::PixelUnpackState &unpack,
>-                                             size_t imageSize,
>-                                             const uint8_t *pixels)
>+angle::Result TextureNULL::copySubTexture(const gl::Context *context,
>+                                          const gl::ImageIndex &index,
>+                                          const gl::Offset &destOffset,
>+                                          size_t sourceLevel,
>+                                          const gl::Box &sourceBox,
>+                                          bool unpackFlipY,
>+                                          bool unpackPremultiplyAlpha,
>+                                          bool unpackUnmultiplyAlpha,
>+                                          const gl::Texture *source)
> {
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error TextureNULL::copyImage(const gl::Context *context,
>-                                 GLenum target,
>-                                 size_t level,
>-                                 const gl::Rectangle &sourceArea,
>-                                 GLenum internalFormat,
>-                                 const gl::Framebuffer *source)
>+angle::Result TextureNULL::copyCompressedTexture(const gl::Context *context,
>+                                                 const gl::Texture *source)
> {
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error TextureNULL::copySubImage(const gl::Context *context,
>-                                    GLenum target,
>-                                    size_t level,
>-                                    const gl::Offset &destOffset,
>-                                    const gl::Rectangle &sourceArea,
>-                                    const gl::Framebuffer *source)
>+angle::Result TextureNULL::setStorage(const gl::Context *context,
>+                                      gl::TextureType type,
>+                                      size_t levels,
>+                                      GLenum internalFormat,
>+                                      const gl::Extents &size)
> {
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error TextureNULL::setStorage(const gl::Context *context,
>-                                  GLenum target,
>-                                  size_t levels,
>-                                  GLenum internalFormat,
>-                                  const gl::Extents &size)
>+angle::Result TextureNULL::setStorageExternalMemory(const gl::Context *context,
>+                                                    gl::TextureType type,
>+                                                    size_t levels,
>+                                                    GLenum internalFormat,
>+                                                    const gl::Extents &size,
>+                                                    gl::MemoryObject *memoryObject,
>+                                                    GLuint64 offset)
> {
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error TextureNULL::setEGLImageTarget(const gl::Context *context,
>-                                         GLenum target,
>-                                         egl::Image *image)
>+angle::Result TextureNULL::setEGLImageTarget(const gl::Context *context,
>+                                             gl::TextureType type,
>+                                             egl::Image *image)
> {
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error TextureNULL::setImageExternal(const gl::Context *context,
>-                                        GLenum target,
>-                                        egl::Stream *stream,
>-                                        const egl::Stream::GLTextureDescription &desc)
>+angle::Result TextureNULL::setImageExternal(const gl::Context *context,
>+                                            gl::TextureType type,
>+                                            egl::Stream *stream,
>+                                            const egl::Stream::GLTextureDescription &desc)
> {
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error TextureNULL::generateMipmap(const gl::Context *context)
>+angle::Result TextureNULL::generateMipmap(const gl::Context *context)
> {
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error TextureNULL::setBaseLevel(const gl::Context *context, GLuint baseLevel)
>+angle::Result TextureNULL::setBaseLevel(const gl::Context *context, GLuint baseLevel)
> {
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error TextureNULL::bindTexImage(const gl::Context *context, egl::Surface *surface)
>+angle::Result TextureNULL::bindTexImage(const gl::Context *context, egl::Surface *surface)
> {
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error TextureNULL::releaseTexImage(const gl::Context *context)
>+angle::Result TextureNULL::releaseTexImage(const gl::Context *context)
> {
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-void TextureNULL::syncState(const gl::Texture::DirtyBits &dirtyBits)
>+angle::Result TextureNULL::syncState(const gl::Context *context,
>+                                     const gl::Texture::DirtyBits &dirtyBits)
> {
>+    return angle::Result::Continue;
> }
> 
>-gl::Error TextureNULL::setStorageMultisample(const gl::Context *context,
>-                                             GLenum target,
>-                                             GLsizei samples,
>-                                             GLint internalformat,
>-                                             const gl::Extents &size,
>-                                             bool fixedSampleLocations)
>+angle::Result TextureNULL::setStorageMultisample(const gl::Context *context,
>+                                                 gl::TextureType type,
>+                                                 GLsizei samples,
>+                                                 GLint internalformat,
>+                                                 const gl::Extents &size,
>+                                                 bool fixedSampleLocations)
> {
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error TextureNULL::initializeContents(const gl::Context *context,
>-                                          const gl::ImageIndex &imageIndex)
>+angle::Result TextureNULL::initializeContents(const gl::Context *context,
>+                                              const gl::ImageIndex &imageIndex)
> {
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
> }  // namespace rx
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/null/TextureNULL.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/null/TextureNULL.h
>index 92dec3d416c..4b2ddb9dd84 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/null/TextureNULL.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/null/TextureNULL.h
>@@ -21,87 +21,113 @@ class TextureNULL : public TextureImpl
>     TextureNULL(const gl::TextureState &state);
>     ~TextureNULL() override;
> 
>-    gl::Error setImage(const gl::Context *context,
>-                       GLenum target,
>-                       size_t level,
>-                       GLenum internalFormat,
>-                       const gl::Extents &size,
>-                       GLenum format,
>-                       GLenum type,
>-                       const gl::PixelUnpackState &unpack,
>-                       const uint8_t *pixels) override;
>-    gl::Error setSubImage(const gl::Context *context,
>-                          GLenum target,
>-                          size_t level,
>-                          const gl::Box &area,
>-                          GLenum format,
>-                          GLenum type,
>-                          const gl::PixelUnpackState &unpack,
>-                          const uint8_t *pixels) override;
>-
>-    gl::Error setCompressedImage(const gl::Context *context,
>-                                 GLenum target,
>-                                 size_t level,
>-                                 GLenum internalFormat,
>-                                 const gl::Extents &size,
>-                                 const gl::PixelUnpackState &unpack,
>-                                 size_t imageSize,
>-                                 const uint8_t *pixels) override;
>-    gl::Error setCompressedSubImage(const gl::Context *context,
>-                                    GLenum target,
>-                                    size_t level,
>-                                    const gl::Box &area,
>-                                    GLenum format,
>-                                    const gl::PixelUnpackState &unpack,
>-                                    size_t imageSize,
>-                                    const uint8_t *pixels) override;
>-
>-    gl::Error copyImage(const gl::Context *context,
>-                        GLenum target,
>-                        size_t level,
>-                        const gl::Rectangle &sourceArea,
>-                        GLenum internalFormat,
>-                        const gl::Framebuffer *source) override;
>-    gl::Error copySubImage(const gl::Context *context,
>-                           GLenum target,
>-                           size_t level,
>-                           const gl::Offset &destOffset,
>-                           const gl::Rectangle &sourceArea,
>-                           const gl::Framebuffer *source) override;
>-
>-    gl::Error setStorage(const gl::Context *context,
>-                         GLenum target,
>-                         size_t levels,
>-                         GLenum internalFormat,
>-                         const gl::Extents &size) override;
>-
>-    gl::Error setEGLImageTarget(const gl::Context *context,
>-                                GLenum target,
>-                                egl::Image *image) override;
>-
>-    gl::Error setImageExternal(const gl::Context *context,
>-                               GLenum target,
>-                               egl::Stream *stream,
>-                               const egl::Stream::GLTextureDescription &desc) override;
>-
>-    gl::Error generateMipmap(const gl::Context *context) override;
>-
>-    gl::Error setBaseLevel(const gl::Context *context, GLuint baseLevel) override;
>-
>-    gl::Error bindTexImage(const gl::Context *context, egl::Surface *surface) override;
>-    gl::Error releaseTexImage(const gl::Context *context) override;
>-
>-    void syncState(const gl::Texture::DirtyBits &dirtyBits) override;
>-
>-    gl::Error setStorageMultisample(const gl::Context *context,
>-                                    GLenum target,
>-                                    GLsizei samples,
>-                                    GLint internalformat,
>-                                    const gl::Extents &size,
>-                                    bool fixedSampleLocations) override;
>-
>-    gl::Error initializeContents(const gl::Context *context,
>-                                 const gl::ImageIndex &imageIndex) override;
>+    angle::Result setImage(const gl::Context *context,
>+                           const gl::ImageIndex &index,
>+                           GLenum internalFormat,
>+                           const gl::Extents &size,
>+                           GLenum format,
>+                           GLenum type,
>+                           const gl::PixelUnpackState &unpack,
>+                           const uint8_t *pixels) override;
>+    angle::Result setSubImage(const gl::Context *context,
>+                              const gl::ImageIndex &index,
>+                              const gl::Box &area,
>+                              GLenum format,
>+                              GLenum type,
>+                              const gl::PixelUnpackState &unpack,
>+                              gl::Buffer *unpackBuffer,
>+                              const uint8_t *pixels) override;
>+
>+    angle::Result setCompressedImage(const gl::Context *context,
>+                                     const gl::ImageIndex &index,
>+                                     GLenum internalFormat,
>+                                     const gl::Extents &size,
>+                                     const gl::PixelUnpackState &unpack,
>+                                     size_t imageSize,
>+                                     const uint8_t *pixels) override;
>+    angle::Result setCompressedSubImage(const gl::Context *context,
>+                                        const gl::ImageIndex &index,
>+                                        const gl::Box &area,
>+                                        GLenum format,
>+                                        const gl::PixelUnpackState &unpack,
>+                                        size_t imageSize,
>+                                        const uint8_t *pixels) override;
>+
>+    angle::Result copyImage(const gl::Context *context,
>+                            const gl::ImageIndex &index,
>+                            const gl::Rectangle &sourceArea,
>+                            GLenum internalFormat,
>+                            gl::Framebuffer *source) override;
>+    angle::Result copySubImage(const gl::Context *context,
>+                               const gl::ImageIndex &index,
>+                               const gl::Offset &destOffset,
>+                               const gl::Rectangle &sourceArea,
>+                               gl::Framebuffer *source) override;
>+
>+    angle::Result copyTexture(const gl::Context *context,
>+                              const gl::ImageIndex &index,
>+                              GLenum internalFormat,
>+                              GLenum type,
>+                              size_t sourceLevel,
>+                              bool unpackFlipY,
>+                              bool unpackPremultiplyAlpha,
>+                              bool unpackUnmultiplyAlpha,
>+                              const gl::Texture *source) override;
>+    angle::Result copySubTexture(const gl::Context *context,
>+                                 const gl::ImageIndex &index,
>+                                 const gl::Offset &destOffset,
>+                                 size_t sourceLevel,
>+                                 const gl::Box &sourceBox,
>+                                 bool unpackFlipY,
>+                                 bool unpackPremultiplyAlpha,
>+                                 bool unpackUnmultiplyAlpha,
>+                                 const gl::Texture *source) override;
>+
>+    angle::Result copyCompressedTexture(const gl::Context *context,
>+                                        const gl::Texture *source) override;
>+
>+    angle::Result setStorage(const gl::Context *context,
>+                             gl::TextureType type,
>+                             size_t levels,
>+                             GLenum internalFormat,
>+                             const gl::Extents &size) override;
>+
>+    angle::Result setStorageExternalMemory(const gl::Context *context,
>+                                           gl::TextureType type,
>+                                           size_t levels,
>+                                           GLenum internalFormat,
>+                                           const gl::Extents &size,
>+                                           gl::MemoryObject *memoryObject,
>+                                           GLuint64 offset) override;
>+
>+    angle::Result setEGLImageTarget(const gl::Context *context,
>+                                    gl::TextureType type,
>+                                    egl::Image *image) override;
>+
>+    angle::Result setImageExternal(const gl::Context *context,
>+                                   gl::TextureType type,
>+                                   egl::Stream *stream,
>+                                   const egl::Stream::GLTextureDescription &desc) override;
>+
>+    angle::Result generateMipmap(const gl::Context *context) override;
>+
>+    angle::Result setBaseLevel(const gl::Context *context, GLuint baseLevel) override;
>+
>+    angle::Result bindTexImage(const gl::Context *context, egl::Surface *surface) override;
>+    angle::Result releaseTexImage(const gl::Context *context) override;
>+
>+    angle::Result syncState(const gl::Context *context,
>+                            const gl::Texture::DirtyBits &dirtyBits) override;
>+
>+    angle::Result setStorageMultisample(const gl::Context *context,
>+                                        gl::TextureType type,
>+                                        GLsizei samples,
>+                                        GLint internalformat,
>+                                        const gl::Extents &size,
>+                                        bool fixedSampleLocations) override;
>+
>+    angle::Result initializeContents(const gl::Context *context,
>+                                     const gl::ImageIndex &imageIndex) override;
> };
> 
> }  // namespace rx
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/null/TransformFeedbackNULL.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/null/TransformFeedbackNULL.cpp
>index 177fda3e763..df0bc0ad573 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/null/TransformFeedbackNULL.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/null/TransformFeedbackNULL.cpp
>@@ -16,36 +16,44 @@ namespace rx
> 
> TransformFeedbackNULL::TransformFeedbackNULL(const gl::TransformFeedbackState &state)
>     : TransformFeedbackImpl(state)
>-{
>-}
>+{}
> 
>-TransformFeedbackNULL::~TransformFeedbackNULL()
>-{
>-}
>+TransformFeedbackNULL::~TransformFeedbackNULL() {}
> 
>-void TransformFeedbackNULL::begin(GLenum primitiveMode)
>+angle::Result TransformFeedbackNULL::begin(const gl::Context *context,
>+                                           gl::PrimitiveMode primitiveMode)
> {
>+    return angle::Result::Continue;
> }
> 
>-void TransformFeedbackNULL::end()
>+angle::Result TransformFeedbackNULL::end(const gl::Context *context)
> {
>+    return angle::Result::Continue;
> }
> 
>-void TransformFeedbackNULL::pause()
>+angle::Result TransformFeedbackNULL::pause(const gl::Context *context)
> {
>+    return angle::Result::Continue;
> }
> 
>-void TransformFeedbackNULL::resume()
>+angle::Result TransformFeedbackNULL::resume(const gl::Context *context)
> {
>+    return angle::Result::Continue;
> }
> 
>-void TransformFeedbackNULL::bindGenericBuffer(const gl::BindingPointer<gl::Buffer> &binding)
>+angle::Result TransformFeedbackNULL::bindGenericBuffer(
>+    const gl::Context *context,
>+    const gl::BindingPointer<gl::Buffer> &binding)
> {
>+    return angle::Result::Continue;
> }
> 
>-void TransformFeedbackNULL::bindIndexedBuffer(size_t index,
>-                                              const gl::OffsetBindingPointer<gl::Buffer> &binding)
>+angle::Result TransformFeedbackNULL::bindIndexedBuffer(
>+    const gl::Context *context,
>+    size_t index,
>+    const gl::OffsetBindingPointer<gl::Buffer> &binding)
> {
>+    return angle::Result::Continue;
> }
> 
> }  // namespace rx
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/null/TransformFeedbackNULL.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/null/TransformFeedbackNULL.h
>index e7f3dc549f2..c61879c9cfe 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/null/TransformFeedbackNULL.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/null/TransformFeedbackNULL.h
>@@ -21,14 +21,16 @@ class TransformFeedbackNULL : public TransformFeedbackImpl
>     TransformFeedbackNULL(const gl::TransformFeedbackState &state);
>     ~TransformFeedbackNULL() override;
> 
>-    void begin(GLenum primitiveMode) override;
>-    void end() override;
>-    void pause() override;
>-    void resume() override;
>-
>-    void bindGenericBuffer(const gl::BindingPointer<gl::Buffer> &binding) override;
>-    void bindIndexedBuffer(size_t index,
>-                           const gl::OffsetBindingPointer<gl::Buffer> &binding) override;
>+    angle::Result begin(const gl::Context *context, gl::PrimitiveMode primitiveMode) override;
>+    angle::Result end(const gl::Context *context) override;
>+    angle::Result pause(const gl::Context *context) override;
>+    angle::Result resume(const gl::Context *context) override;
>+
>+    angle::Result bindGenericBuffer(const gl::Context *context,
>+                                    const gl::BindingPointer<gl::Buffer> &binding) override;
>+    angle::Result bindIndexedBuffer(const gl::Context *context,
>+                                    size_t index,
>+                                    const gl::OffsetBindingPointer<gl::Buffer> &binding) override;
> };
> 
> }  // namespace rx
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/null/VertexArrayNULL.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/null/VertexArrayNULL.cpp
>index c2b68933811..187ca798d71 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/null/VertexArrayNULL.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/null/VertexArrayNULL.cpp
>@@ -14,8 +14,18 @@
> namespace rx
> {
> 
>-VertexArrayNULL::VertexArrayNULL(const gl::VertexArrayState &data) : VertexArrayImpl(data)
>+VertexArrayNULL::VertexArrayNULL(const gl::VertexArrayState &data) : VertexArrayImpl(data) {}
>+
>+angle::Result VertexArrayNULL::syncState(const gl::Context *context,
>+                                         const gl::VertexArray::DirtyBits &dirtyBits,
>+                                         gl::VertexArray::DirtyAttribBitsArray *attribBits,
>+                                         gl::VertexArray::DirtyBindingBitsArray *bindingBits)
> {
>+    // Clear the dirty bits in the back-end here.
>+    memset(attribBits, 0, sizeof(gl::VertexArray::DirtyAttribBitsArray));
>+    memset(bindingBits, 0, sizeof(gl::VertexArray::DirtyBindingBitsArray));
>+
>+    return angle::Result::Continue;
> }
> 
> }  // namespace rx
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/null/VertexArrayNULL.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/null/VertexArrayNULL.h
>index 11b8e305c98..9e786eab0e8 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/null/VertexArrayNULL.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/null/VertexArrayNULL.h
>@@ -19,6 +19,11 @@ class VertexArrayNULL : public VertexArrayImpl
> {
>   public:
>     VertexArrayNULL(const gl::VertexArrayState &data);
>+
>+    angle::Result syncState(const gl::Context *context,
>+                            const gl::VertexArray::DirtyBits &dirtyBits,
>+                            gl::VertexArray::DirtyAttribBitsArray *attribBits,
>+                            gl::VertexArray::DirtyBindingBitsArray *bindingBits) override;
> };
> 
> }  // namespace rx
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/renderer_utils.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/renderer_utils.cpp
>index 55471c1d20e..7ca97537fa7 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/renderer_utils.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/renderer_utils.cpp
>@@ -19,138 +19,13 @@
> #include "libANGLE/renderer/Format.h"
> 
> #include <string.h>
>+#include "common/utilities.h"
> 
> namespace rx
> {
> 
> namespace
> {
>-typedef std::pair<gl::FormatType, ColorWriteFunction> FormatWriteFunctionPair;
>-typedef std::map<gl::FormatType, ColorWriteFunction> FormatWriteFunctionMap;
>-
>-static inline void InsertFormatWriteFunctionMapping(FormatWriteFunctionMap *map,
>-                                                    GLenum format,
>-                                                    GLenum type,
>-                                                    ColorWriteFunction writeFunc)
>-{
>-    map->insert(FormatWriteFunctionPair(gl::FormatType(format, type), writeFunc));
>-}
>-
>-static FormatWriteFunctionMap BuildFormatWriteFunctionMap()
>-{
>-    using namespace angle;  //  For image writing functions
>-
>-    FormatWriteFunctionMap map;
>-
>-    // clang-format off
>-    //                                    | Format               | Type                             | Color write function             |
>-    InsertFormatWriteFunctionMapping(&map, GL_RGBA,               GL_UNSIGNED_BYTE,                  WriteColor<R8G8B8A8, GLfloat>     );
>-    InsertFormatWriteFunctionMapping(&map, GL_RGBA,               GL_BYTE,                           WriteColor<R8G8B8A8S, GLfloat>    );
>-    InsertFormatWriteFunctionMapping(&map, GL_RGBA,               GL_UNSIGNED_SHORT_4_4_4_4,         WriteColor<R4G4B4A4, GLfloat>     );
>-    InsertFormatWriteFunctionMapping(&map, GL_RGBA,               GL_UNSIGNED_SHORT_5_5_5_1,         WriteColor<R5G5B5A1, GLfloat>     );
>-    InsertFormatWriteFunctionMapping(&map, GL_RGBA,               GL_UNSIGNED_INT_2_10_10_10_REV,    WriteColor<R10G10B10A2, GLfloat>  );
>-    InsertFormatWriteFunctionMapping(&map, GL_RGBA,               GL_FLOAT,                          WriteColor<R32G32B32A32F, GLfloat>);
>-    InsertFormatWriteFunctionMapping(&map, GL_RGBA,               GL_HALF_FLOAT,                     WriteColor<R16G16B16A16F, GLfloat>);
>-    InsertFormatWriteFunctionMapping(&map, GL_RGBA,               GL_HALF_FLOAT_OES,                 WriteColor<R16G16B16A16F, GLfloat>);
>-    InsertFormatWriteFunctionMapping(&map, GL_RGBA, GL_UNSIGNED_SHORT,
>-                                     WriteColor<R16G16B16A16, GLfloat>);
>-    InsertFormatWriteFunctionMapping(&map, GL_RGBA, GL_SHORT, WriteColor<R16G16B16A16S, GLfloat>);
>-
>-    InsertFormatWriteFunctionMapping(&map, GL_RGBA_INTEGER,       GL_UNSIGNED_BYTE,                  WriteColor<R8G8B8A8, GLuint>      );
>-    InsertFormatWriteFunctionMapping(&map, GL_RGBA_INTEGER,       GL_BYTE,                           WriteColor<R8G8B8A8S, GLint>      );
>-    InsertFormatWriteFunctionMapping(&map, GL_RGBA_INTEGER,       GL_UNSIGNED_SHORT,                 WriteColor<R16G16B16A16, GLuint>  );
>-    InsertFormatWriteFunctionMapping(&map, GL_RGBA_INTEGER,       GL_SHORT,                          WriteColor<R16G16B16A16S, GLint>  );
>-    InsertFormatWriteFunctionMapping(&map, GL_RGBA_INTEGER,       GL_UNSIGNED_INT,                   WriteColor<R32G32B32A32, GLuint>  );
>-    InsertFormatWriteFunctionMapping(&map, GL_RGBA_INTEGER,       GL_INT,                            WriteColor<R32G32B32A32S, GLint>  );
>-    InsertFormatWriteFunctionMapping(&map, GL_RGBA_INTEGER,       GL_UNSIGNED_INT_2_10_10_10_REV,    WriteColor<R10G10B10A2, GLuint>   );
>-
>-    InsertFormatWriteFunctionMapping(&map, GL_RGB,                GL_UNSIGNED_BYTE,                  WriteColor<R8G8B8, GLfloat>       );
>-    InsertFormatWriteFunctionMapping(&map, GL_RGB,                GL_BYTE,                           WriteColor<R8G8B8S, GLfloat>      );
>-    InsertFormatWriteFunctionMapping(&map, GL_RGB,                GL_UNSIGNED_SHORT_5_6_5,           WriteColor<R5G6B5, GLfloat>       );
>-    InsertFormatWriteFunctionMapping(&map, GL_RGB,                GL_UNSIGNED_INT_10F_11F_11F_REV,   WriteColor<R11G11B10F, GLfloat>   );
>-    InsertFormatWriteFunctionMapping(&map, GL_RGB,                GL_UNSIGNED_INT_5_9_9_9_REV,       WriteColor<R9G9B9E5, GLfloat>     );
>-    InsertFormatWriteFunctionMapping(&map, GL_RGB,                GL_FLOAT,                          WriteColor<R32G32B32F, GLfloat>   );
>-    InsertFormatWriteFunctionMapping(&map, GL_RGB,                GL_HALF_FLOAT,                     WriteColor<R16G16B16F, GLfloat>   );
>-    InsertFormatWriteFunctionMapping(&map, GL_RGB,                GL_HALF_FLOAT_OES,                 WriteColor<R16G16B16F, GLfloat>   );
>-    InsertFormatWriteFunctionMapping(&map, GL_RGB, GL_UNSIGNED_SHORT,
>-                                     WriteColor<R16G16B16, GLfloat>);
>-    InsertFormatWriteFunctionMapping(&map, GL_RGB, GL_SHORT, WriteColor<R16G16B16S, GLfloat>);
>-
>-    InsertFormatWriteFunctionMapping(&map, GL_RGB_INTEGER,        GL_UNSIGNED_BYTE,                  WriteColor<R8G8B8, GLuint>        );
>-    InsertFormatWriteFunctionMapping(&map, GL_RGB_INTEGER,        GL_BYTE,                           WriteColor<R8G8B8S, GLint>        );
>-    InsertFormatWriteFunctionMapping(&map, GL_RGB_INTEGER,        GL_UNSIGNED_SHORT,                 WriteColor<R16G16B16, GLuint>     );
>-    InsertFormatWriteFunctionMapping(&map, GL_RGB_INTEGER,        GL_SHORT,                          WriteColor<R16G16B16S, GLint>     );
>-    InsertFormatWriteFunctionMapping(&map, GL_RGB_INTEGER,        GL_UNSIGNED_INT,                   WriteColor<R32G32B32, GLuint>     );
>-    InsertFormatWriteFunctionMapping(&map, GL_RGB_INTEGER,        GL_INT,                            WriteColor<R32G32B32S, GLint>     );
>-
>-    InsertFormatWriteFunctionMapping(&map, GL_RG,                 GL_UNSIGNED_BYTE,                  WriteColor<R8G8, GLfloat>         );
>-    InsertFormatWriteFunctionMapping(&map, GL_RG,                 GL_BYTE,                           WriteColor<R8G8S, GLfloat>        );
>-    InsertFormatWriteFunctionMapping(&map, GL_RG,                 GL_FLOAT,                          WriteColor<R32G32F, GLfloat>      );
>-    InsertFormatWriteFunctionMapping(&map, GL_RG,                 GL_HALF_FLOAT,                     WriteColor<R16G16F, GLfloat>      );
>-    InsertFormatWriteFunctionMapping(&map, GL_RG,                 GL_HALF_FLOAT_OES,                 WriteColor<R16G16F, GLfloat>      );
>-    InsertFormatWriteFunctionMapping(&map, GL_RG, GL_UNSIGNED_SHORT, WriteColor<R16G16, GLfloat>);
>-    InsertFormatWriteFunctionMapping(&map, GL_RG, GL_SHORT, WriteColor<R16G16S, GLfloat>);
>-
>-    InsertFormatWriteFunctionMapping(&map, GL_RG_INTEGER,         GL_UNSIGNED_BYTE,                  WriteColor<R8G8, GLuint>          );
>-    InsertFormatWriteFunctionMapping(&map, GL_RG_INTEGER,         GL_BYTE,                           WriteColor<R8G8S, GLint>          );
>-    InsertFormatWriteFunctionMapping(&map, GL_RG_INTEGER,         GL_UNSIGNED_SHORT,                 WriteColor<R16G16, GLuint>        );
>-    InsertFormatWriteFunctionMapping(&map, GL_RG_INTEGER,         GL_SHORT,                          WriteColor<R16G16S, GLint>        );
>-    InsertFormatWriteFunctionMapping(&map, GL_RG_INTEGER,         GL_UNSIGNED_INT,                   WriteColor<R32G32, GLuint>        );
>-    InsertFormatWriteFunctionMapping(&map, GL_RG_INTEGER,         GL_INT,                            WriteColor<R32G32S, GLint>        );
>-
>-    InsertFormatWriteFunctionMapping(&map, GL_RED,                GL_UNSIGNED_BYTE,                  WriteColor<R8, GLfloat>           );
>-    InsertFormatWriteFunctionMapping(&map, GL_RED,                GL_BYTE,                           WriteColor<R8S, GLfloat>          );
>-    InsertFormatWriteFunctionMapping(&map, GL_RED,                GL_FLOAT,                          WriteColor<R32F, GLfloat>         );
>-    InsertFormatWriteFunctionMapping(&map, GL_RED,                GL_HALF_FLOAT,                     WriteColor<R16F, GLfloat>         );
>-    InsertFormatWriteFunctionMapping(&map, GL_RED,                GL_HALF_FLOAT_OES,                 WriteColor<R16F, GLfloat>         );
>-    InsertFormatWriteFunctionMapping(&map, GL_RED, GL_UNSIGNED_SHORT, WriteColor<R16, GLfloat>);
>-    InsertFormatWriteFunctionMapping(&map, GL_RED, GL_SHORT, WriteColor<R16S, GLfloat>);
>-
>-    InsertFormatWriteFunctionMapping(&map, GL_RED_INTEGER,        GL_UNSIGNED_BYTE,                  WriteColor<R8, GLuint>            );
>-    InsertFormatWriteFunctionMapping(&map, GL_RED_INTEGER,        GL_BYTE,                           WriteColor<R8S, GLint>            );
>-    InsertFormatWriteFunctionMapping(&map, GL_RED_INTEGER,        GL_UNSIGNED_SHORT,                 WriteColor<R16, GLuint>           );
>-    InsertFormatWriteFunctionMapping(&map, GL_RED_INTEGER,        GL_SHORT,                          WriteColor<R16S, GLint>           );
>-    InsertFormatWriteFunctionMapping(&map, GL_RED_INTEGER,        GL_UNSIGNED_INT,                   WriteColor<R32, GLuint>           );
>-    InsertFormatWriteFunctionMapping(&map, GL_RED_INTEGER,        GL_INT,                            WriteColor<R32S, GLint>           );
>-
>-    InsertFormatWriteFunctionMapping(&map, GL_LUMINANCE_ALPHA,    GL_UNSIGNED_BYTE,                  WriteColor<L8A8, GLfloat>         );
>-    InsertFormatWriteFunctionMapping(&map, GL_LUMINANCE,          GL_UNSIGNED_BYTE,                  WriteColor<L8, GLfloat>           );
>-    InsertFormatWriteFunctionMapping(&map, GL_ALPHA,              GL_UNSIGNED_BYTE,                  WriteColor<A8, GLfloat>           );
>-    InsertFormatWriteFunctionMapping(&map, GL_LUMINANCE_ALPHA,    GL_FLOAT,                          WriteColor<L32A32F, GLfloat>      );
>-    InsertFormatWriteFunctionMapping(&map, GL_LUMINANCE,          GL_FLOAT,                          WriteColor<L32F, GLfloat>         );
>-    InsertFormatWriteFunctionMapping(&map, GL_ALPHA,              GL_FLOAT,                          WriteColor<A32F, GLfloat>         );
>-    InsertFormatWriteFunctionMapping(&map, GL_LUMINANCE_ALPHA,    GL_HALF_FLOAT,                     WriteColor<L16A16F, GLfloat>      );
>-    InsertFormatWriteFunctionMapping(&map, GL_LUMINANCE_ALPHA,    GL_HALF_FLOAT_OES,                 WriteColor<L16A16F, GLfloat>      );
>-    InsertFormatWriteFunctionMapping(&map, GL_LUMINANCE,          GL_HALF_FLOAT,                     WriteColor<L16F, GLfloat>         );
>-    InsertFormatWriteFunctionMapping(&map, GL_LUMINANCE,          GL_HALF_FLOAT_OES,                 WriteColor<L16F, GLfloat>         );
>-    InsertFormatWriteFunctionMapping(&map, GL_ALPHA,              GL_HALF_FLOAT,                     WriteColor<A16F, GLfloat>         );
>-    InsertFormatWriteFunctionMapping(&map, GL_ALPHA,              GL_HALF_FLOAT_OES,                 WriteColor<A16F, GLfloat>         );
>-
>-    InsertFormatWriteFunctionMapping(&map, GL_BGRA_EXT,           GL_UNSIGNED_BYTE,                  WriteColor<B8G8R8A8, GLfloat>     );
>-    InsertFormatWriteFunctionMapping(&map, GL_BGRA_EXT,           GL_UNSIGNED_SHORT_4_4_4_4_REV_EXT, WriteColor<A4R4G4B4, GLfloat>     );
>-    InsertFormatWriteFunctionMapping(&map, GL_BGRA_EXT,           GL_UNSIGNED_SHORT_1_5_5_5_REV_EXT, WriteColor<A1R5G5B5, GLfloat>     );
>-
>-    InsertFormatWriteFunctionMapping(&map, GL_SRGB_EXT,           GL_UNSIGNED_BYTE,                  WriteColor<R8G8B8, GLfloat>       );
>-    InsertFormatWriteFunctionMapping(&map, GL_SRGB_ALPHA_EXT,     GL_UNSIGNED_BYTE,                  WriteColor<R8G8B8A8, GLfloat>     );
>-
>-    InsertFormatWriteFunctionMapping(&map, GL_COMPRESSED_RGB_S3TC_DXT1_EXT,    GL_UNSIGNED_BYTE,     nullptr                              );
>-    InsertFormatWriteFunctionMapping(&map, GL_COMPRESSED_RGBA_S3TC_DXT1_EXT,   GL_UNSIGNED_BYTE,     nullptr                              );
>-    InsertFormatWriteFunctionMapping(&map, GL_COMPRESSED_RGBA_S3TC_DXT3_ANGLE, GL_UNSIGNED_BYTE,     nullptr                              );
>-    InsertFormatWriteFunctionMapping(&map, GL_COMPRESSED_RGBA_S3TC_DXT5_ANGLE, GL_UNSIGNED_BYTE,     nullptr                              );
>-
>-    InsertFormatWriteFunctionMapping(&map, GL_DEPTH_COMPONENT,    GL_UNSIGNED_SHORT,                 nullptr                              );
>-    InsertFormatWriteFunctionMapping(&map, GL_DEPTH_COMPONENT,    GL_UNSIGNED_INT,                   nullptr                              );
>-    InsertFormatWriteFunctionMapping(&map, GL_DEPTH_COMPONENT,    GL_FLOAT,                          nullptr                              );
>-
>-    InsertFormatWriteFunctionMapping(&map, GL_STENCIL,            GL_UNSIGNED_BYTE,                  nullptr                              );
>-
>-    InsertFormatWriteFunctionMapping(&map, GL_DEPTH_STENCIL,      GL_UNSIGNED_INT_24_8,              nullptr                              );
>-    InsertFormatWriteFunctionMapping(&map, GL_DEPTH_STENCIL,      GL_FLOAT_32_UNSIGNED_INT_24_8_REV, nullptr                              );
>-    // clang-format on
>-
>-    return map;
>-}
>-
> void CopyColor(gl::ColorF *color)
> {
>     // No-op
>@@ -204,12 +79,10 @@ void ClipChannelsAlpha(gl::ColorF *color)
>     color->blue  = 0.0f;
> }
> 
>-void ClipChannelsNoOp(gl::ColorF *color)
>-{
>-}
>+void ClipChannelsNoOp(gl::ColorF *color) {}
> 
> void WriteUintColor(const gl::ColorF &color,
>-                    ColorWriteFunction colorWriteFunction,
>+                    PixelWriteFunction colorWriteFunction,
>                     uint8_t *destPixelData)
> {
>     gl::ColorUI destColor(
>@@ -219,37 +92,90 @@ void WriteUintColor(const gl::ColorF &color,
> }
> 
> void WriteFloatColor(const gl::ColorF &color,
>-                     ColorWriteFunction colorWriteFunction,
>+                     PixelWriteFunction colorWriteFunction,
>                      uint8_t *destPixelData)
> {
>     colorWriteFunction(reinterpret_cast<const uint8_t *>(&color), destPixelData);
> }
> 
>-}  // anonymous namespace
>+template <typename T, int cols, int rows>
>+bool TransposeExpandMatrix(T *target, const GLfloat *value)
>+{
>+    constexpr int targetWidth  = 4;
>+    constexpr int targetHeight = rows;
>+    constexpr int srcWidth     = rows;
>+    constexpr int srcHeight    = cols;
> 
>-PackPixelsParams::PackPixelsParams()
>-    : format(GL_NONE), type(GL_NONE), outputPitch(0), packBuffer(nullptr), offset(0)
>+    constexpr int copyWidth  = std::min(targetHeight, srcWidth);
>+    constexpr int copyHeight = std::min(targetWidth, srcHeight);
>+
>+    T staging[targetWidth * targetHeight] = {0};
>+
>+    for (int x = 0; x < copyWidth; x++)
>+    {
>+        for (int y = 0; y < copyHeight; y++)
>+        {
>+            staging[x * targetWidth + y] = static_cast<T>(value[y * srcWidth + x]);
>+        }
>+    }
>+
>+    if (memcmp(target, staging, targetWidth * targetHeight * sizeof(T)) == 0)
>+    {
>+        return false;
>+    }
>+
>+    memcpy(target, staging, targetWidth * targetHeight * sizeof(T));
>+    return true;
>+}
>+
>+template <typename T, int cols, int rows>
>+bool ExpandMatrix(T *target, const GLfloat *value)
> {
>+    constexpr int kTargetWidth  = 4;
>+    constexpr int kTargetHeight = rows;
>+    constexpr int kSrcWidth     = cols;
>+    constexpr int kSrcHeight    = rows;
>+
>+    constexpr int kCopyWidth  = std::min(kTargetWidth, kSrcWidth);
>+    constexpr int kCopyHeight = std::min(kTargetHeight, kSrcHeight);
>+
>+    T staging[kTargetWidth * kTargetHeight] = {0};
>+
>+    for (int y = 0; y < kCopyHeight; y++)
>+    {
>+        for (int x = 0; x < kCopyWidth; x++)
>+        {
>+            staging[y * kTargetWidth + x] = static_cast<T>(value[y * kSrcWidth + x]);
>+        }
>+    }
>+
>+    if (memcmp(target, staging, kTargetWidth * kTargetHeight * sizeof(T)) == 0)
>+    {
>+        return false;
>+    }
>+
>+    memcpy(target, staging, kTargetWidth * kTargetHeight * sizeof(T));
>+    return true;
> }
>+}  // anonymous namespace
>+
>+PackPixelsParams::PackPixelsParams()
>+    : destFormat(nullptr), outputPitch(0), packBuffer(nullptr), offset(0)
>+{}
> 
> PackPixelsParams::PackPixelsParams(const gl::Rectangle &areaIn,
>-                                   GLenum formatIn,
>-                                   GLenum typeIn,
>+                                   const angle::Format &destFormat,
>                                    GLuint outputPitchIn,
>-                                   const gl::PixelPackState &packIn,
>+                                   bool reverseRowOrderIn,
>                                    gl::Buffer *packBufferIn,
>                                    ptrdiff_t offsetIn)
>     : area(areaIn),
>-      format(formatIn),
>-      type(typeIn),
>+      destFormat(&destFormat),
>       outputPitch(outputPitchIn),
>       packBuffer(packBufferIn),
>-      pack(),
>+      reverseRowOrder(reverseRowOrderIn),
>       offset(offsetIn)
>-{
>-    pack.alignment       = packIn.alignment;
>-    pack.reverseRowOrder = packIn.reverseRowOrder;
>-}
>+{}
> 
> void PackPixels(const PackPixelsParams &params,
>                 const angle::Format &sourceFormat,
>@@ -262,31 +188,24 @@ void PackPixels(const PackPixelsParams &params,
>     const uint8_t *source = sourceIn;
>     int inputPitch        = inputPitchIn;
> 
>-    if (params.pack.reverseRowOrder)
>+    if (params.reverseRowOrder)
>     {
>         source += inputPitch * (params.area.height - 1);
>         inputPitch = -inputPitch;
>     }
> 
>-    const auto &sourceGLInfo = gl::GetSizedInternalFormatInfo(sourceFormat.glInternalFormat);
>-
>-    if (sourceGLInfo.format == params.format && sourceGLInfo.type == params.type)
>+    if (sourceFormat == *params.destFormat)
>     {
>         // Direct copy possible
>         for (int y = 0; y < params.area.height; ++y)
>         {
>             memcpy(destWithOffset + y * params.outputPitch, source + y * inputPitch,
>-                   params.area.width * sourceGLInfo.pixelBytes);
>+                   params.area.width * sourceFormat.pixelBytes);
>         }
>         return;
>     }
> 
>-    ASSERT(sourceGLInfo.sized);
>-
>-    gl::FormatType formatType(params.format, params.type);
>-    ColorCopyFunction fastCopyFunc =
>-        GetFastCopyFunction(sourceFormat.fastCopyFunctions, formatType);
>-    const auto &destFormatInfo = gl::GetInternalFormatInfo(formatType.format, formatType.type);
>+    PixelCopyFunction fastCopyFunc = sourceFormat.fastCopyFunctions.get(params.destFormat->id);
> 
>     if (fastCopyFunc)
>     {
>@@ -296,8 +215,8 @@ void PackPixels(const PackPixelsParams &params,
>             for (int x = 0; x < params.area.width; ++x)
>             {
>                 uint8_t *dest =
>-                    destWithOffset + y * params.outputPitch + x * destFormatInfo.pixelBytes;
>-                const uint8_t *src = source + y * inputPitch + x * sourceGLInfo.pixelBytes;
>+                    destWithOffset + y * params.outputPitch + x * params.destFormat->pixelBytes;
>+                const uint8_t *src = source + y * inputPitch + x * sourceFormat.pixelBytes;
> 
>                 fastCopyFunc(src, dest);
>             }
>@@ -305,62 +224,45 @@ void PackPixels(const PackPixelsParams &params,
>         return;
>     }
> 
>-    ColorWriteFunction colorWriteFunction = GetColorWriteFunction(formatType);
>+    PixelWriteFunction pixelWriteFunction = params.destFormat->pixelWriteFunction;
>+    ASSERT(pixelWriteFunction != nullptr);
> 
>     // Maximum size of any Color<T> type used.
>     uint8_t temp[16];
>     static_assert(sizeof(temp) >= sizeof(gl::ColorF) && sizeof(temp) >= sizeof(gl::ColorUI) &&
>-                      sizeof(temp) >= sizeof(gl::ColorI),
>-                  "Unexpected size of gl::Color struct.");
>+                      sizeof(temp) >= sizeof(gl::ColorI) &&
>+                      sizeof(temp) >= sizeof(angle::DepthStencil),
>+                  "Unexpected size of pixel struct.");
> 
>-    const auto &colorReadFunction = sourceFormat.colorReadFunction;
>+    PixelReadFunction pixelReadFunction = sourceFormat.pixelReadFunction;
>+    ASSERT(pixelReadFunction != nullptr);
> 
>     for (int y = 0; y < params.area.height; ++y)
>     {
>         for (int x = 0; x < params.area.width; ++x)
>         {
>-            uint8_t *dest      = destWithOffset + y * params.outputPitch + x * destFormatInfo.pixelBytes;
>-            const uint8_t *src = source + y * inputPitch + x * sourceGLInfo.pixelBytes;
>+            uint8_t *dest =
>+                destWithOffset + y * params.outputPitch + x * params.destFormat->pixelBytes;
>+            const uint8_t *src = source + y * inputPitch + x * sourceFormat.pixelBytes;
> 
>             // readFunc and writeFunc will be using the same type of color, CopyTexImage
>             // will not allow the copy otherwise.
>-            colorReadFunction(src, temp);
>-            colorWriteFunction(temp, dest);
>+            pixelReadFunction(src, temp);
>+            pixelWriteFunction(temp, dest);
>         }
>     }
> }
> 
>-ColorWriteFunction GetColorWriteFunction(const gl::FormatType &formatType)
>-{
>-    static const FormatWriteFunctionMap formatTypeMap = BuildFormatWriteFunctionMap();
>-    auto iter = formatTypeMap.find(formatType);
>-    ASSERT(iter != formatTypeMap.end());
>-    if (iter != formatTypeMap.end())
>-    {
>-        return iter->second;
>-    }
>-    else
>-    {
>-        return nullptr;
>-    }
>-}
>-
>-ColorCopyFunction GetFastCopyFunction(const FastCopyFunctionMap &fastCopyFunctions,
>-                                      const gl::FormatType &formatType)
>-{
>-    return fastCopyFunctions.get(formatType);
>-}
>-
>-bool FastCopyFunctionMap::has(const gl::FormatType &formatType) const
>+bool FastCopyFunctionMap::has(angle::FormatID formatID) const
> {
>-    return (get(formatType) != nullptr);
>+    return (get(formatID) != nullptr);
> }
> 
>-ColorCopyFunction FastCopyFunctionMap::get(const gl::FormatType &formatType) const
>+PixelCopyFunction FastCopyFunctionMap::get(angle::FormatID formatID) const
> {
>     for (size_t index = 0; index < mSize; ++index)
>     {
>-        if (mData[index].format == formatType.format && mData[index].type == formatType.type)
>+        if (mData[index].formatID == formatID)
>         {
>             return mData[index].func;
>         }
>@@ -375,25 +277,42 @@ bool ShouldUseDebugLayers(const egl::AttributeMap &attribs)
>         attribs.get(EGL_PLATFORM_ANGLE_DEBUG_LAYERS_ENABLED_ANGLE, EGL_DONT_CARE);
> 
> // Prefer to enable debug layers if compiling in Debug, and disabled in Release.
>-#if !defined(NDEBUG)
>+#if defined(ANGLE_ENABLE_ASSERTS)
>     return (debugSetting != EGL_FALSE);
> #else
>     return (debugSetting == EGL_TRUE);
>-#endif  // !defined(NDEBUG)
>+#endif  // defined(ANGLE_ENABLE_ASSERTS)
>+}
>+
>+bool ShouldUseVirtualizedContexts(const egl::AttributeMap &attribs, bool defaultValue)
>+{
>+    EGLAttrib virtualizedContextRequest =
>+        attribs.get(EGL_PLATFORM_ANGLE_CONTEXT_VIRTUALIZATION_ANGLE, EGL_DONT_CARE);
>+    if (defaultValue)
>+    {
>+        return (virtualizedContextRequest != EGL_FALSE);
>+    }
>+    else
>+    {
>+        return (virtualizedContextRequest == EGL_TRUE);
>+    }
> }
> 
> void CopyImageCHROMIUM(const uint8_t *sourceData,
>                        size_t sourceRowPitch,
>                        size_t sourcePixelBytes,
>-                       ColorReadFunction colorReadFunction,
>+                       size_t sourceDepthPitch,
>+                       PixelReadFunction pixelReadFunction,
>                        uint8_t *destData,
>                        size_t destRowPitch,
>                        size_t destPixelBytes,
>-                       ColorWriteFunction colorWriteFunction,
>+                       size_t destDepthPitch,
>+                       PixelWriteFunction pixelWriteFunction,
>                        GLenum destUnsizedFormat,
>                        GLenum destComponentType,
>                        size_t width,
>                        size_t height,
>+                       size_t depth,
>                        bool unpackFlipY,
>                        bool unpackPremultiplyAlpha,
>                        bool unpackUnmultiplyAlpha)
>@@ -434,66 +353,68 @@ void CopyImageCHROMIUM(const uint8_t *sourceData,
> 
>     auto writeFunction = (destComponentType == GL_UNSIGNED_INT) ? WriteUintColor : WriteFloatColor;
> 
>-    for (size_t y = 0; y < height; y++)
>+    for (size_t z = 0; z < depth; z++)
>     {
>-        for (size_t x = 0; x < width; x++)
>+        for (size_t y = 0; y < height; y++)
>         {
>-            const uint8_t *sourcePixelData = sourceData + y * sourceRowPitch + x * sourcePixelBytes;
>-
>-            gl::ColorF sourceColor;
>-            colorReadFunction(sourcePixelData, reinterpret_cast<uint8_t *>(&sourceColor));
>-
>-            conversionFunction(&sourceColor);
>-            clipChannelsFunction(&sourceColor);
>-
>-            size_t destY = 0;
>-            if (unpackFlipY)
>+            for (size_t x = 0; x < width; x++)
>             {
>-                destY += (height - 1);
>-                destY -= y;
>+                const uint8_t *sourcePixelData =
>+                    sourceData + y * sourceRowPitch + x * sourcePixelBytes + z * sourceDepthPitch;
>+
>+                gl::ColorF sourceColor;
>+                pixelReadFunction(sourcePixelData, reinterpret_cast<uint8_t *>(&sourceColor));
>+
>+                conversionFunction(&sourceColor);
>+                clipChannelsFunction(&sourceColor);
>+
>+                size_t destY = 0;
>+                if (unpackFlipY)
>+                {
>+                    destY += (height - 1);
>+                    destY -= y;
>+                }
>+                else
>+                {
>+                    destY += y;
>+                }
>+
>+                uint8_t *destPixelData =
>+                    destData + destY * destRowPitch + x * destPixelBytes + z * destDepthPitch;
>+                writeFunction(sourceColor, pixelWriteFunction, destPixelData);
>             }
>-            else
>-            {
>-                destY += y;
>-            }
>-
>-            uint8_t *destPixelData = destData + destY * destRowPitch + x * destPixelBytes;
>-            writeFunction(sourceColor, colorWriteFunction, destPixelData);
>         }
>     }
> }
> 
> // IncompleteTextureSet implementation.
>-IncompleteTextureSet::IncompleteTextureSet()
>-{
>-}
>+IncompleteTextureSet::IncompleteTextureSet() {}
> 
>-IncompleteTextureSet::~IncompleteTextureSet()
>-{
>-}
>+IncompleteTextureSet::~IncompleteTextureSet() {}
> 
> void IncompleteTextureSet::onDestroy(const gl::Context *context)
> {
>     // Clear incomplete textures.
>     for (auto &incompleteTexture : mIncompleteTextures)
>     {
>-        ANGLE_SWALLOW_ERR(incompleteTexture.second->onDestroy(context));
>-        incompleteTexture.second.set(context, nullptr);
>+        if (incompleteTexture.get() != nullptr)
>+        {
>+            incompleteTexture->onDestroy(context);
>+            incompleteTexture.set(context, nullptr);
>+        }
>     }
>-    mIncompleteTextures.clear();
> }
> 
>-gl::Error IncompleteTextureSet::getIncompleteTexture(
>+angle::Result IncompleteTextureSet::getIncompleteTexture(
>     const gl::Context *context,
>-    GLenum type,
>+    gl::TextureType type,
>     MultisampleTextureInitializer *multisampleInitializer,
>     gl::Texture **textureOut)
> {
>-    auto iter = mIncompleteTextures.find(type);
>-    if (iter != mIncompleteTextures.end())
>+    *textureOut = mIncompleteTextures[type].get();
>+    if (*textureOut != nullptr)
>     {
>-        *textureOut = iter->second.get();
>-        return gl::NoError();
>+        return angle::Result::Continue;
>     }
> 
>     ContextImpl *implFactory = context->getImplementation();
>@@ -505,45 +426,214 @@ gl::Error IncompleteTextureSet::getIncompleteTexture(
>     const gl::Box area(0, 0, 0, 1, 1, 1);
> 
>     // If a texture is external use a 2D texture for the incomplete texture
>-    GLenum createType = (type == GL_TEXTURE_EXTERNAL_OES) ? GL_TEXTURE_2D : type;
>+    gl::TextureType createType = (type == gl::TextureType::External) ? gl::TextureType::_2D : type;
> 
>     gl::Texture *tex = new gl::Texture(implFactory, std::numeric_limits<GLuint>::max(), createType);
>     angle::UniqueObjectPointer<gl::Texture, gl::Context> t(tex, context);
> 
>-    if (createType == GL_TEXTURE_2D_MULTISAMPLE)
>+    // This is a bit of a kludge but is necessary to consume the error.
>+    gl::Context *mutableContext = const_cast<gl::Context *>(context);
>+
>+    if (createType == gl::TextureType::_2DMultisample)
>     {
>-        ANGLE_TRY(t->setStorageMultisample(context, createType, 1, GL_RGBA8, colorSize, true));
>+        ANGLE_TRY(
>+            t->setStorageMultisample(mutableContext, createType, 1, GL_RGBA8, colorSize, true));
>     }
>     else
>     {
>-        ANGLE_TRY(t->setStorage(context, createType, 1, GL_RGBA8, colorSize));
>+        ANGLE_TRY(t->setStorage(mutableContext, createType, 1, GL_RGBA8, colorSize));
>     }
> 
>-    if (type == GL_TEXTURE_CUBE_MAP)
>+    if (type == gl::TextureType::CubeMap)
>     {
>-        for (GLenum face = GL_TEXTURE_CUBE_MAP_POSITIVE_X; face <= GL_TEXTURE_CUBE_MAP_NEGATIVE_Z;
>-             face++)
>+        for (gl::TextureTarget face : gl::AllCubeFaceTextureTargets())
>         {
>-            ANGLE_TRY(
>-                t->setSubImage(context, unpack, face, 0, area, GL_RGBA, GL_UNSIGNED_BYTE, color));
>+            ANGLE_TRY(t->setSubImage(mutableContext, unpack, nullptr, face, 0, area, GL_RGBA,
>+                                     GL_UNSIGNED_BYTE, color));
>         }
>     }
>-    else if (type == GL_TEXTURE_2D_MULTISAMPLE)
>+    else if (type == gl::TextureType::_2DMultisample)
>     {
>         // Call a specialized clear function to init a multisample texture.
>         ANGLE_TRY(multisampleInitializer->initializeMultisampleTextureToBlack(context, t.get()));
>     }
>     else
>     {
>-        ANGLE_TRY(
>-            t->setSubImage(context, unpack, createType, 0, area, GL_RGBA, GL_UNSIGNED_BYTE, color));
>+        ANGLE_TRY(t->setSubImage(mutableContext, unpack, nullptr,
>+                                 gl::NonCubeTextureTypeToTarget(createType), 0, area, GL_RGBA,
>+                                 GL_UNSIGNED_BYTE, color));
>     }
> 
>-    t->syncState();
>+    ANGLE_TRY(t->syncState(context));
> 
>     mIncompleteTextures[type].set(context, t.release());
>     *textureOut = mIncompleteTextures[type].get();
>-    return gl::NoError();
>+    return angle::Result::Continue;
>+}
>+
>+#define ANGLE_INSTANTIATE_SET_UNIFORM_MATRIX_FUNC(cols, rows)                            \
>+    template bool SetFloatUniformMatrix<cols, rows>(unsigned int, unsigned int, GLsizei, \
>+                                                    GLboolean, const GLfloat *, uint8_t *)
>+
>+ANGLE_INSTANTIATE_SET_UNIFORM_MATRIX_FUNC(2, 2);
>+ANGLE_INSTANTIATE_SET_UNIFORM_MATRIX_FUNC(3, 3);
>+ANGLE_INSTANTIATE_SET_UNIFORM_MATRIX_FUNC(4, 4);
>+ANGLE_INSTANTIATE_SET_UNIFORM_MATRIX_FUNC(2, 3);
>+ANGLE_INSTANTIATE_SET_UNIFORM_MATRIX_FUNC(3, 2);
>+ANGLE_INSTANTIATE_SET_UNIFORM_MATRIX_FUNC(2, 4);
>+ANGLE_INSTANTIATE_SET_UNIFORM_MATRIX_FUNC(4, 2);
>+ANGLE_INSTANTIATE_SET_UNIFORM_MATRIX_FUNC(3, 4);
>+ANGLE_INSTANTIATE_SET_UNIFORM_MATRIX_FUNC(4, 3);
>+
>+#undef ANGLE_INSTANTIATE_SET_UNIFORM_MATRIX_FUNC
>+
>+template <int cols, int rows>
>+bool SetFloatUniformMatrix(unsigned int arrayElementOffset,
>+                           unsigned int elementCount,
>+                           GLsizei countIn,
>+                           GLboolean transpose,
>+                           const GLfloat *value,
>+                           uint8_t *targetData)
>+{
>+    unsigned int count =
>+        std::min(elementCount - arrayElementOffset, static_cast<unsigned int>(countIn));
>+
>+    const unsigned int targetMatrixStride = (4 * rows);
>+    GLfloat *target                       = reinterpret_cast<GLfloat *>(
>+        targetData + arrayElementOffset * sizeof(GLfloat) * targetMatrixStride);
>+
>+    bool dirty = false;
>+
>+    for (unsigned int i = 0; i < count; i++)
>+    {
>+        if (transpose == GL_FALSE)
>+        {
>+            dirty = ExpandMatrix<GLfloat, cols, rows>(target, value) || dirty;
>+        }
>+        else
>+        {
>+            dirty = TransposeExpandMatrix<GLfloat, cols, rows>(target, value) || dirty;
>+        }
>+        target += targetMatrixStride;
>+        value += cols * rows;
>+    }
>+
>+    return dirty;
> }
> 
>+template void GetMatrixUniform<GLint>(GLenum, GLint *, const GLint *, bool);
>+template void GetMatrixUniform<GLuint>(GLenum, GLuint *, const GLuint *, bool);
>+
>+void GetMatrixUniform(GLenum type, GLfloat *dataOut, const GLfloat *source, bool transpose)
>+{
>+    int columns = gl::VariableColumnCount(type);
>+    int rows    = gl::VariableRowCount(type);
>+    for (GLint col = 0; col < columns; ++col)
>+    {
>+        for (GLint row = 0; row < rows; ++row)
>+        {
>+            GLfloat *outptr = dataOut + ((col * rows) + row);
>+            const GLfloat *inptr =
>+                transpose ? source + ((row * 4) + col) : source + ((col * 4) + row);
>+            *outptr = *inptr;
>+        }
>+    }
>+}
>+
>+template <typename NonFloatT>
>+void GetMatrixUniform(GLenum type, NonFloatT *dataOut, const NonFloatT *source, bool transpose)
>+{
>+    UNREACHABLE();
>+}
>+
>+const angle::Format &GetFormatFromFormatType(GLenum format, GLenum type)
>+{
>+    GLenum sizedInternalFormat    = gl::GetInternalFormatInfo(format, type).sizedInternalFormat;
>+    angle::FormatID angleFormatID = angle::Format::InternalFormatToID(sizedInternalFormat);
>+    return angle::Format::Get(angleFormatID);
>+}
>+
>+angle::Result ComputeStartVertex(ContextImpl *contextImpl,
>+                                 const gl::IndexRange &indexRange,
>+                                 GLint baseVertex,
>+                                 GLint *firstVertexOut)
>+{
>+    // The entire index range should be within the limits of a 32-bit uint because the largest
>+    // GL index type is GL_UNSIGNED_INT.
>+    ASSERT(indexRange.start <= std::numeric_limits<uint32_t>::max() &&
>+           indexRange.end <= std::numeric_limits<uint32_t>::max());
>+
>+    // The base vertex is only used in DrawElementsIndirect. Given the assertion above and the
>+    // type of mBaseVertex (GLint), adding them both as 64-bit ints is safe.
>+    int64_t startVertexInt64 =
>+        static_cast<int64_t>(baseVertex) + static_cast<int64_t>(indexRange.start);
>+
>+    // OpenGL ES 3.2 spec section 10.5: "Behavior of DrawElementsOneInstance is undefined if the
>+    // vertex ID is negative for any element"
>+    ANGLE_CHECK_GL_MATH(contextImpl, startVertexInt64 >= 0);
>+
>+    // OpenGL ES 3.2 spec section 10.5: "If the vertex ID is larger than the maximum value
>+    // representable by type, it should behave as if the calculation were upconverted to 32-bit
>+    // unsigned integers(with wrapping on overflow conditions)." ANGLE does not fully handle
>+    // these rules, an overflow error is returned if the start vertex cannot be stored in a
>+    // 32-bit signed integer.
>+    ANGLE_CHECK_GL_MATH(contextImpl, startVertexInt64 <= std::numeric_limits<GLint>::max());
>+
>+    *firstVertexOut = static_cast<GLint>(startVertexInt64);
>+    return angle::Result::Continue;
>+}
>+
>+angle::Result GetVertexRangeInfo(const gl::Context *context,
>+                                 GLint firstVertex,
>+                                 GLsizei vertexOrIndexCount,
>+                                 gl::DrawElementsType indexTypeOrInvalid,
>+                                 const void *indices,
>+                                 GLint baseVertex,
>+                                 GLint *startVertexOut,
>+                                 size_t *vertexCountOut)
>+{
>+    if (indexTypeOrInvalid != gl::DrawElementsType::InvalidEnum)
>+    {
>+        gl::IndexRange indexRange;
>+        ANGLE_TRY(context->getState().getVertexArray()->getIndexRange(
>+            context, indexTypeOrInvalid, vertexOrIndexCount, indices, &indexRange));
>+        ANGLE_TRY(ComputeStartVertex(context->getImplementation(), indexRange, baseVertex,
>+                                     startVertexOut));
>+        *vertexCountOut = indexRange.vertexCount();
>+    }
>+    else
>+    {
>+        *startVertexOut = firstVertex;
>+        *vertexCountOut = vertexOrIndexCount;
>+    }
>+    return angle::Result::Continue;
>+}
>+
>+gl::Rectangle ClipRectToScissor(const gl::State &glState, const gl::Rectangle &rect, bool invertY)
>+{
>+    if (glState.isScissorTestEnabled())
>+    {
>+        gl::Rectangle clippedRect;
>+        if (!gl::ClipRectangle(glState.getScissor(), rect, &clippedRect))
>+        {
>+            return gl::Rectangle();
>+        }
>+
>+        if (invertY)
>+        {
>+            clippedRect.y = rect.height - clippedRect.y - clippedRect.height;
>+        }
>+
>+        return clippedRect;
>+    }
>+
>+    // If the scissor test isn't enabled, assume it has infinite size.  Its intersection with the
>+    // rect would be the rect itself.
>+    //
>+    // Note that on Vulkan, returning this (as opposed to a fixed max-int-sized rect) could lead to
>+    // unnecessary pipeline creations if two otherwise identical pipelines are used on framebuffers
>+    // with different sizes.  If such usage is observed in an application, we should investigate
>+    // possible optimizations.
>+    return rect;
>+}
> }  // namespace rx
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/renderer_utils.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/renderer_utils.h
>index 5a1cb38a6a5..1025005b42d 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/renderer_utils.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/renderer_utils.h
>@@ -21,12 +21,14 @@
> namespace angle
> {
> struct Format;
>+enum class FormatID;
> }  // namespace angle
> 
> namespace gl
> {
> struct FormatType;
> struct InternalFormat;
>+class State;
> }  // namespace gl
> 
> namespace egl
>@@ -36,6 +38,7 @@ class AttributeMap;
> 
> namespace rx
> {
>+class ContextImpl;
> 
> class ResourceSerial
> {
>@@ -71,6 +74,10 @@ class Serial final
>     {
>         return mValue != kInvalid && mValue == other.mValue;
>     }
>+    constexpr bool operator==(uint32_t value) const
>+    {
>+        return mValue != kInvalid && mValue == static_cast<uint64_t>(value);
>+    }
>     constexpr bool operator!=(const Serial &other) const
>     {
>         return mValue == kInvalid || mValue != other.mValue;
>@@ -80,6 +87,11 @@ class Serial final
>     constexpr bool operator<(const Serial &other) const { return mValue < other.mValue; }
>     constexpr bool operator<=(const Serial &other) const { return mValue <= other.mValue; }
> 
>+    constexpr bool operator<(uint32_t value) const { return mValue < static_cast<uint64_t>(value); }
>+
>+    // Useful for serialization.
>+    constexpr uint64_t getValue() const { return mValue; }
>+
>   private:
>     friend class SerialFactory;
>     constexpr explicit Serial(uint64_t value) : mValue(value) {}
>@@ -112,26 +124,25 @@ using MipGenerationFunction = void (*)(size_t sourceWidth,
>                                        size_t destRowPitch,
>                                        size_t destDepthPitch);
> 
>-typedef void (*ColorReadFunction)(const uint8_t *source, uint8_t *dest);
>-typedef void (*ColorWriteFunction)(const uint8_t *source, uint8_t *dest);
>-typedef void (*ColorCopyFunction)(const uint8_t *source, uint8_t *dest);
>+typedef void (*PixelReadFunction)(const uint8_t *source, uint8_t *dest);
>+typedef void (*PixelWriteFunction)(const uint8_t *source, uint8_t *dest);
>+typedef void (*PixelCopyFunction)(const uint8_t *source, uint8_t *dest);
> 
> class FastCopyFunctionMap
> {
>   public:
>     struct Entry
>     {
>-        GLenum format;
>-        GLenum type;
>-        ColorCopyFunction func;
>+        angle::FormatID formatID;
>+        PixelCopyFunction func;
>     };
> 
>     constexpr FastCopyFunctionMap() : FastCopyFunctionMap(nullptr, 0) {}
> 
>     constexpr FastCopyFunctionMap(const Entry *data, size_t size) : mSize(size), mData(data) {}
> 
>-    bool has(const gl::FormatType &formatType) const;
>-    ColorCopyFunction get(const gl::FormatType &formatType) const;
>+    bool has(angle::FormatID formatID) const;
>+    PixelCopyFunction get(angle::FormatID formatID) const;
> 
>   private:
>     size_t mSize;
>@@ -142,19 +153,17 @@ struct PackPixelsParams
> {
>     PackPixelsParams();
>     PackPixelsParams(const gl::Rectangle &area,
>-                     GLenum format,
>-                     GLenum type,
>+                     const angle::Format &destFormat,
>                      GLuint outputPitch,
>-                     const gl::PixelPackState &pack,
>+                     bool reverseRowOrderIn,
>                      gl::Buffer *packBufferIn,
>                      ptrdiff_t offset);
> 
>     gl::Rectangle area;
>-    GLenum format;
>-    GLenum type;
>+    const angle::Format *destFormat;
>     GLuint outputPitch;
>     gl::Buffer *packBuffer;
>-    gl::PixelPackState pack;
>+    bool reverseRowOrder;
>     ptrdiff_t offset;
> };
> 
>@@ -164,10 +173,6 @@ void PackPixels(const PackPixelsParams &params,
>                 const uint8_t *source,
>                 uint8_t *destination);
> 
>-ColorWriteFunction GetColorWriteFunction(const gl::FormatType &formatType);
>-ColorCopyFunction GetFastCopyFunction(const FastCopyFunctionMap &fastCopyFunctions,
>-                                      const gl::FormatType &formatType);
>-
> using InitializeTextureDataFunction = void (*)(size_t width,
>                                                size_t height,
>                                                size_t depth,
>@@ -190,8 +195,7 @@ struct LoadImageFunctionInfo
>     LoadImageFunctionInfo() : loadFunction(nullptr), requiresConversion(false) {}
>     LoadImageFunctionInfo(LoadImageFunction loadFunction, bool requiresConversion)
>         : loadFunction(loadFunction), requiresConversion(requiresConversion)
>-    {
>-    }
>+    {}
> 
>     LoadImageFunction loadFunction;
>     bool requiresConversion;
>@@ -200,19 +204,23 @@ struct LoadImageFunctionInfo
> using LoadFunctionMap = LoadImageFunctionInfo (*)(GLenum);
> 
> bool ShouldUseDebugLayers(const egl::AttributeMap &attribs);
>+bool ShouldUseVirtualizedContexts(const egl::AttributeMap &attribs, bool defaultValue);
> 
> void CopyImageCHROMIUM(const uint8_t *sourceData,
>                        size_t sourceRowPitch,
>                        size_t sourcePixelBytes,
>-                       ColorReadFunction readFunction,
>+                       size_t sourceDepthPitch,
>+                       PixelReadFunction pixelReadFunction,
>                        uint8_t *destData,
>                        size_t destRowPitch,
>                        size_t destPixelBytes,
>-                       ColorWriteFunction colorWriteFunction,
>+                       size_t destDepthPitch,
>+                       PixelWriteFunction pixelWriteFunction,
>                        GLenum destUnsizedFormat,
>                        GLenum destComponentType,
>                        size_t width,
>                        size_t height,
>+                       size_t depth,
>                        bool unpackFlipY,
>                        bool unpackPremultiplyAlpha,
>                        bool unpackUnmultiplyAlpha);
>@@ -228,8 +236,8 @@ class MultisampleTextureInitializer
> {
>   public:
>     virtual ~MultisampleTextureInitializer() {}
>-    virtual gl::Error initializeMultisampleTextureToBlack(const gl::Context *context,
>-                                                          gl::Texture *glTexture) = 0;
>+    virtual angle::Result initializeMultisampleTextureToBlack(const gl::Context *context,
>+                                                              gl::Texture *glTexture) = 0;
> };
> 
> class IncompleteTextureSet final : angle::NonCopyable
>@@ -240,15 +248,47 @@ class IncompleteTextureSet final : angle::NonCopyable
> 
>     void onDestroy(const gl::Context *context);
> 
>-    gl::Error getIncompleteTexture(const gl::Context *context,
>-                                   GLenum type,
>-                                   MultisampleTextureInitializer *multisampleInitializer,
>-                                   gl::Texture **textureOut);
>+    angle::Result getIncompleteTexture(const gl::Context *context,
>+                                       gl::TextureType type,
>+                                       MultisampleTextureInitializer *multisampleInitializer,
>+                                       gl::Texture **textureOut);
> 
>   private:
>     gl::TextureMap mIncompleteTextures;
> };
> 
>+// The return value indicate if the data was updated or not.
>+template <int cols, int rows>
>+bool SetFloatUniformMatrix(unsigned int arrayElementOffset,
>+                           unsigned int elementCount,
>+                           GLsizei countIn,
>+                           GLboolean transpose,
>+                           const GLfloat *value,
>+                           uint8_t *targetData);
>+
>+// Helper method to de-tranpose a matrix uniform for an API query.
>+void GetMatrixUniform(GLenum type, GLfloat *dataOut, const GLfloat *source, bool transpose);
>+
>+template <typename NonFloatT>
>+void GetMatrixUniform(GLenum type, NonFloatT *dataOut, const NonFloatT *source, bool transpose);
>+
>+const angle::Format &GetFormatFromFormatType(GLenum format, GLenum type);
>+
>+angle::Result ComputeStartVertex(ContextImpl *contextImpl,
>+                                 const gl::IndexRange &indexRange,
>+                                 GLint baseVertex,
>+                                 GLint *firstVertexOut);
>+
>+angle::Result GetVertexRangeInfo(const gl::Context *context,
>+                                 GLint firstVertex,
>+                                 GLsizei vertexOrIndexCount,
>+                                 gl::DrawElementsType indexTypeOrInvalid,
>+                                 const void *indices,
>+                                 GLint baseVertex,
>+                                 GLint *startVertexOut,
>+                                 size_t *vertexCountOut);
>+
>+gl::Rectangle ClipRectToScissor(const gl::State &glState, const gl::Rectangle &rect, bool invertY);
> }  // namespace rx
> 
> #endif  // LIBANGLE_RENDERER_RENDERER_UTILS_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/BufferVk.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/BufferVk.cpp
>index 4b35e0f10f7..bd0385ef86d 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/BufferVk.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/BufferVk.cpp
>@@ -14,17 +14,23 @@
> #include "libANGLE/Context.h"
> #include "libANGLE/renderer/vulkan/ContextVk.h"
> #include "libANGLE/renderer/vulkan/RendererVk.h"
>+#include "third_party/trace_event/trace_event.h"
> 
> namespace rx
> {
> 
>-BufferVk::BufferVk(const gl::BufferState &state) : BufferImpl(state), mCurrentRequiredSize(0)
>+namespace
> {
>-}
>+// Vertex attribute buffers are used as storage buffers for conversion in compute, where access to
>+// the buffer is made in 4-byte chunks.  Assume the size of the buffer is 4k+n where n is in [0, 3).
>+// On some hardware, reading 4 bytes from address 4k returns 0, making it impossible to read the
>+// last n bytes.  By rounding up the buffer sizes to a multiple of 4, the problem is alleviated.
>+constexpr size_t kBufferSizeGranularity = 4;
>+}  // namespace
> 
>-BufferVk::~BufferVk()
>-{
>-}
>+BufferVk::BufferVk(const gl::BufferState &state) : BufferImpl(state) {}
>+
>+BufferVk::~BufferVk() {}
> 
> void BufferVk::destroy(const gl::Context *context)
> {
>@@ -36,206 +42,218 @@ void BufferVk::destroy(const gl::Context *context)
> 
> void BufferVk::release(RendererVk *renderer)
> {
>-    renderer->releaseResource(*this, &mBuffer);
>-    renderer->releaseResource(*this, &mBufferMemory);
>+    mBuffer.release(renderer);
> }
> 
>-gl::Error BufferVk::setData(const gl::Context *context,
>-                            gl::BufferBinding target,
>-                            const void *data,
>-                            size_t size,
>-                            gl::BufferUsage usage)
>+angle::Result BufferVk::setData(const gl::Context *context,
>+                                gl::BufferBinding target,
>+                                const void *data,
>+                                size_t size,
>+                                gl::BufferUsage usage)
> {
>     ContextVk *contextVk = vk::GetImpl(context);
>-    VkDevice device      = contextVk->getDevice();
> 
>-    if (size > mCurrentRequiredSize)
>+    if (size > static_cast<size_t>(mState.getSize()))
>     {
>         // Release and re-create the memory and buffer.
>         release(contextVk->getRenderer());
> 
>-        // TODO(jmadill): Proper usage bit implementation. Likely will involve multiple backing
>-        // buffers like in D3D11.
>-        VkBufferCreateInfo createInfo;
>+        // We could potentially use multiple backing buffers for different usages.
>+        // For now keep a single buffer with all relevant usage flags.
>+        const VkImageUsageFlags usageFlags =
>+            VK_BUFFER_USAGE_VERTEX_BUFFER_BIT | VK_BUFFER_USAGE_TRANSFER_DST_BIT |
>+            VK_BUFFER_USAGE_INDEX_BUFFER_BIT | VK_BUFFER_USAGE_TRANSFER_SRC_BIT |
>+            VK_BUFFER_USAGE_STORAGE_BUFFER_BIT | VK_BUFFER_USAGE_UNIFORM_TEXEL_BUFFER_BIT;
>+
>+        VkBufferCreateInfo createInfo    = {};
>         createInfo.sType                 = VK_STRUCTURE_TYPE_BUFFER_CREATE_INFO;
>-        createInfo.pNext                 = nullptr;
>         createInfo.flags                 = 0;
>-        createInfo.size                  = size;
>-        createInfo.usage = (VK_BUFFER_USAGE_VERTEX_BUFFER_BIT | VK_BUFFER_USAGE_TRANSFER_DST_BIT |
>-                            VK_BUFFER_USAGE_INDEX_BUFFER_BIT);
>+        createInfo.size                  = roundUp(size, kBufferSizeGranularity);
>+        createInfo.usage                 = usageFlags;
>         createInfo.sharingMode           = VK_SHARING_MODE_EXCLUSIVE;
>         createInfo.queueFamilyIndexCount = 0;
>         createInfo.pQueueFamilyIndices   = nullptr;
> 
>-        ANGLE_TRY(mBuffer.init(device, createInfo));
>-        ANGLE_TRY(vk::AllocateBufferMemory(contextVk, size, &mBuffer, &mBufferMemory,
>-                                           &mCurrentRequiredSize));
>+        // Assume host visible/coherent memory available.
>+        const VkMemoryPropertyFlags memoryPropertyFlags =
>+            (VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT | VK_MEMORY_PROPERTY_HOST_COHERENT_BIT);
>+
>+        ANGLE_TRY(mBuffer.init(contextVk, createInfo, memoryPropertyFlags));
>     }
> 
>-    if (data)
>+    if (data && size > 0)
>     {
>         ANGLE_TRY(setDataImpl(contextVk, static_cast<const uint8_t *>(data), size, 0));
>     }
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error BufferVk::setSubData(const gl::Context *context,
>-                               gl::BufferBinding target,
>-                               const void *data,
>-                               size_t size,
>-                               size_t offset)
>+angle::Result BufferVk::setSubData(const gl::Context *context,
>+                                   gl::BufferBinding target,
>+                                   const void *data,
>+                                   size_t size,
>+                                   size_t offset)
> {
>-    ASSERT(mBuffer.getHandle() != VK_NULL_HANDLE);
>-    ASSERT(mBufferMemory.getHandle() != VK_NULL_HANDLE);
>+    ASSERT(mBuffer.valid());
> 
>     ContextVk *contextVk = vk::GetImpl(context);
>     ANGLE_TRY(setDataImpl(contextVk, static_cast<const uint8_t *>(data), size, offset));
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error BufferVk::copySubData(const gl::Context *context,
>-                                BufferImpl *source,
>-                                GLintptr sourceOffset,
>-                                GLintptr destOffset,
>-                                GLsizeiptr size)
>+angle::Result BufferVk::copySubData(const gl::Context *context,
>+                                    BufferImpl *source,
>+                                    GLintptr sourceOffset,
>+                                    GLintptr destOffset,
>+                                    GLsizeiptr size)
> {
>-    UNIMPLEMENTED();
>-    return gl::InternalError();
>+    ANGLE_VK_UNREACHABLE(vk::GetImpl(context));
>+    return angle::Result::Stop;
> }
> 
>-gl::Error BufferVk::map(const gl::Context *context, GLenum access, void **mapPtr)
>+angle::Result BufferVk::map(const gl::Context *context, GLenum access, void **mapPtr)
> {
>-    ASSERT(mBuffer.getHandle() != VK_NULL_HANDLE);
>-    ASSERT(mBufferMemory.getHandle() != VK_NULL_HANDLE);
>-
>-    VkDevice device = vk::GetImpl(context)->getDevice();
>-
>-    ANGLE_TRY(
>-        mBufferMemory.map(device, 0, mState.getSize(), 0, reinterpret_cast<uint8_t **>(mapPtr)));
>+    ASSERT(mBuffer.valid());
> 
>-    return gl::NoError();
>+    ContextVk *contextVk = vk::GetImpl(context);
>+    return mapImpl(contextVk, mapPtr);
> }
> 
>-gl::Error BufferVk::mapRange(const gl::Context *context,
>-                             size_t offset,
>-                             size_t length,
>-                             GLbitfield access,
>-                             void **mapPtr)
>+angle::Result BufferVk::mapImpl(ContextVk *contextVk, void **mapPtr)
> {
>-    ASSERT(mBuffer.getHandle() != VK_NULL_HANDLE);
>-    ASSERT(mBufferMemory.getHandle() != VK_NULL_HANDLE);
>+    ANGLE_VK_TRY(contextVk,
>+                 mBuffer.getDeviceMemory().map(contextVk->getDevice(), 0, mState.getSize(), 0,
>+                                               reinterpret_cast<uint8_t **>(mapPtr)));
>+    return angle::Result::Continue;
>+}
> 
>-    VkDevice device = vk::GetImpl(context)->getDevice();
>+angle::Result BufferVk::mapRange(const gl::Context *context,
>+                                 size_t offset,
>+                                 size_t length,
>+                                 GLbitfield access,
>+                                 void **mapPtr)
>+{
>+    ASSERT(mBuffer.valid());
> 
>-    ANGLE_TRY(mBufferMemory.map(device, offset, length, 0, reinterpret_cast<uint8_t **>(mapPtr)));
>+    ContextVk *contextVk = vk::GetImpl(context);
> 
>-    return gl::NoError();
>+    ANGLE_VK_TRY(contextVk, mBuffer.getDeviceMemory().map(contextVk->getDevice(), offset, length, 0,
>+                                                          reinterpret_cast<uint8_t **>(mapPtr)));
>+    return angle::Result::Continue;
> }
> 
>-gl::Error BufferVk::unmap(const gl::Context *context, GLboolean *result)
>+angle::Result BufferVk::unmap(const gl::Context *context, GLboolean *result)
> {
>-    ASSERT(mBuffer.getHandle() != VK_NULL_HANDLE);
>-    ASSERT(mBufferMemory.getHandle() != VK_NULL_HANDLE);
>+    return unmapImpl(vk::GetImpl(context));
>+}
> 
>-    VkDevice device = vk::GetImpl(context)->getDevice();
>+angle::Result BufferVk::unmapImpl(ContextVk *contextVk)
>+{
>+    ASSERT(mBuffer.valid());
> 
>-    mBufferMemory.unmap(device);
>+    mBuffer.getDeviceMemory().unmap(contextVk->getDevice());
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error BufferVk::getIndexRange(const gl::Context *context,
>-                                  GLenum type,
>-                                  size_t offset,
>-                                  size_t count,
>-                                  bool primitiveRestartEnabled,
>-                                  gl::IndexRange *outRange)
>+angle::Result BufferVk::getIndexRange(const gl::Context *context,
>+                                      gl::DrawElementsType type,
>+                                      size_t offset,
>+                                      size_t count,
>+                                      bool primitiveRestartEnabled,
>+                                      gl::IndexRange *outRange)
> {
>-    VkDevice device = vk::GetImpl(context)->getDevice();
>+    ContextVk *contextVk = vk::GetImpl(context);
>+    RendererVk *renderer = contextVk->getRenderer();
>+
>+    // This is a workaround for the mock ICD not implementing buffer memory state.
>+    // Could be removed if https://github.com/KhronosGroup/Vulkan-Tools/issues/84 is fixed.
>+    if (renderer->isMockICDEnabled())
>+    {
>+        outRange->start = 0;
>+        outRange->end   = 0;
>+        return angle::Result::Continue;
>+    }
>+
>+    TRACE_EVENT0("gpu.angle", "BufferVk::getIndexRange");
>+    // Needed before reading buffer or we could get stale data.
>+    ANGLE_TRY(contextVk->finishImpl());
> 
>     // TODO(jmadill): Consider keeping a shadow system memory copy in some cases.
>     ASSERT(mBuffer.valid());
> 
>-    const gl::Type &typeInfo = gl::GetTypeInfo(type);
>+    const GLuint &typeBytes = gl::GetDrawElementsTypeSize(type);
> 
>     uint8_t *mapPointer = nullptr;
>-    ANGLE_TRY(mBufferMemory.map(device, offset, typeInfo.bytes * count, 0, &mapPointer));
>+    ANGLE_VK_TRY(contextVk, mBuffer.getDeviceMemory().map(contextVk->getDevice(), offset,
>+                                                          typeBytes * count, 0, &mapPointer));
> 
>     *outRange = gl::ComputeIndexRange(type, mapPointer, count, primitiveRestartEnabled);
> 
>-    return gl::NoError();
>+    mBuffer.getDeviceMemory().unmap(contextVk->getDevice());
>+    return angle::Result::Continue;
> }
> 
>-vk::Error BufferVk::setDataImpl(ContextVk *contextVk,
>-                                const uint8_t *data,
>-                                size_t size,
>-                                size_t offset)
>+angle::Result BufferVk::setDataImpl(ContextVk *contextVk,
>+                                    const uint8_t *data,
>+                                    size_t size,
>+                                    size_t offset)
> {
>     RendererVk *renderer = contextVk->getRenderer();
>     VkDevice device      = contextVk->getDevice();
> 
>     // Use map when available.
>-    if (renderer->isSerialInUse(getQueueSerial()))
>+    if (mBuffer.isResourceInUse(renderer))
>     {
>         vk::StagingBuffer stagingBuffer;
>         ANGLE_TRY(stagingBuffer.init(contextVk, static_cast<VkDeviceSize>(size),
>                                      vk::StagingUsage::Write));
> 
>         uint8_t *mapPointer = nullptr;
>-        ANGLE_TRY(stagingBuffer.getDeviceMemory().map(device, 0, size, 0, &mapPointer));
>+        ANGLE_VK_TRY(contextVk,
>+                     stagingBuffer.getDeviceMemory().map(device, 0, size, 0, &mapPointer));
>         ASSERT(mapPointer);
> 
>         memcpy(mapPointer, data, size);
>         stagingBuffer.getDeviceMemory().unmap(device);
> 
>         // Enqueue a copy command on the GPU.
>-        // TODO(jmadill): Command re-ordering for render passes.
>-        renderer->endRenderPass();
>-
>-        vk::CommandBufferAndState *commandBuffer = nullptr;
>-        ANGLE_TRY(renderer->getStartedCommandBuffer(&commandBuffer));
>-
>-        // Insert a barrier to ensure reads from the buffer are complete.
>-        // TODO(jmadill): Insert minimal barriers.
>-        VkBufferMemoryBarrier bufferBarrier;
>-        bufferBarrier.sType               = VK_STRUCTURE_TYPE_BUFFER_MEMORY_BARRIER;
>-        bufferBarrier.pNext               = nullptr;
>-        bufferBarrier.srcAccessMask       = VK_ACCESS_MEMORY_READ_BIT;
>-        bufferBarrier.dstAccessMask       = VK_ACCESS_TRANSFER_WRITE_BIT;
>-        bufferBarrier.srcQueueFamilyIndex = 0;
>-        bufferBarrier.dstQueueFamilyIndex = 0;
>-        bufferBarrier.buffer              = mBuffer.getHandle();
>-        bufferBarrier.offset              = offset;
>-        bufferBarrier.size                = static_cast<VkDeviceSize>(size);
>-
>-        commandBuffer->singleBufferBarrier(VK_PIPELINE_STAGE_ALL_COMMANDS_BIT,
>-                                           VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT, 0, bufferBarrier);
>-
>-        VkBufferCopy copyRegion = {offset, 0, size};
>-        commandBuffer->copyBuffer(stagingBuffer.getBuffer(), mBuffer, 1, &copyRegion);
>-
>-        setQueueSerial(renderer->getCurrentQueueSerial());
>-        renderer->releaseObject(getQueueSerial(), &stagingBuffer);
>+        VkBufferCopy copyRegion = {0, offset, size};
>+        ANGLE_TRY(mBuffer.copyFromBuffer(contextVk, stagingBuffer.getBuffer(), copyRegion));
>+
>+        // Immediately release staging buffer. We should probably be using a DynamicBuffer here.
>+        renderer->releaseObject(renderer->getCurrentQueueSerial(), &stagingBuffer);
>     }
>     else
>     {
>         uint8_t *mapPointer = nullptr;
>-        ANGLE_TRY(mBufferMemory.map(device, offset, size, 0, &mapPointer));
>+        ANGLE_VK_TRY(contextVk,
>+                     mBuffer.getDeviceMemory().map(device, offset, size, 0, &mapPointer));
>         ASSERT(mapPointer);
> 
>         memcpy(mapPointer, data, size);
> 
>-        mBufferMemory.unmap(device);
>+        mBuffer.getDeviceMemory().unmap(device);
>     }
> 
>-    return vk::NoError();
>+    return angle::Result::Continue;
> }
> 
>-const vk::Buffer &BufferVk::getVkBuffer() const
>+angle::Result BufferVk::copyToBuffer(ContextVk *contextVk,
>+                                     vk::BufferHelper *destBuffer,
>+                                     uint32_t copyCount,
>+                                     const VkBufferCopy *copies)
> {
>-    return mBuffer;
>+    vk::CommandBuffer *commandBuffer;
>+    ANGLE_TRY(mBuffer.recordCommands(contextVk, &commandBuffer));
>+    commandBuffer->copyBuffer(mBuffer.getBuffer(), destBuffer->getBuffer(), copyCount, copies);
>+
>+    destBuffer->onRead(&mBuffer, VK_ACCESS_TRANSFER_READ_BIT);
>+    mBuffer.onWrite(VK_ACCESS_TRANSFER_WRITE_BIT);
>+
>+    return angle::Result::Continue;
> }
> 
> }  // namespace rx
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/BufferVk.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/BufferVk.h
>index d07a6ac368b..0484698f67c 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/BufferVk.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/BufferVk.h
>@@ -10,59 +10,83 @@
> #ifndef LIBANGLE_RENDERER_VULKAN_BUFFERVK_H_
> #define LIBANGLE_RENDERER_VULKAN_BUFFERVK_H_
> 
>+#include "libANGLE/Buffer.h"
>+#include "libANGLE/Observer.h"
> #include "libANGLE/renderer/BufferImpl.h"
>-#include "libANGLE/renderer/vulkan/renderervk_utils.h"
>+#include "libANGLE/renderer/vulkan/vk_helpers.h"
> 
> namespace rx
> {
> class RendererVk;
> 
>-class BufferVk : public BufferImpl, public ResourceVk
>+class BufferVk : public BufferImpl
> {
>   public:
>     BufferVk(const gl::BufferState &state);
>     ~BufferVk() override;
>     void destroy(const gl::Context *context) override;
> 
>-    gl::Error setData(const gl::Context *context,
>-                      gl::BufferBinding target,
>-                      const void *data,
>-                      size_t size,
>-                      gl::BufferUsage usage) override;
>-    gl::Error setSubData(const gl::Context *context,
>-                         gl::BufferBinding target,
>-                         const void *data,
>-                         size_t size,
>-                         size_t offset) override;
>-    gl::Error copySubData(const gl::Context *context,
>-                          BufferImpl *source,
>-                          GLintptr sourceOffset,
>-                          GLintptr destOffset,
>-                          GLsizeiptr size) override;
>-    gl::Error map(const gl::Context *context, GLenum access, void **mapPtr) override;
>-    gl::Error mapRange(const gl::Context *context,
>-                       size_t offset,
>-                       size_t length,
>-                       GLbitfield access,
>-                       void **mapPtr) override;
>-    gl::Error unmap(const gl::Context *context, GLboolean *result) override;
>+    angle::Result setData(const gl::Context *context,
>+                          gl::BufferBinding target,
>+                          const void *data,
>+                          size_t size,
>+                          gl::BufferUsage usage) override;
>+    angle::Result setSubData(const gl::Context *context,
>+                             gl::BufferBinding target,
>+                             const void *data,
>+                             size_t size,
>+                             size_t offset) override;
>+    angle::Result copySubData(const gl::Context *context,
>+                              BufferImpl *source,
>+                              GLintptr sourceOffset,
>+                              GLintptr destOffset,
>+                              GLsizeiptr size) override;
>+    angle::Result map(const gl::Context *context, GLenum access, void **mapPtr) override;
>+    angle::Result mapRange(const gl::Context *context,
>+                           size_t offset,
>+                           size_t length,
>+                           GLbitfield access,
>+                           void **mapPtr) override;
>+    angle::Result unmap(const gl::Context *context, GLboolean *result) override;
> 
>-    gl::Error getIndexRange(const gl::Context *context,
>-                            GLenum type,
>-                            size_t offset,
>-                            size_t count,
>-                            bool primitiveRestartEnabled,
>-                            gl::IndexRange *outRange) override;
>+    angle::Result getIndexRange(const gl::Context *context,
>+                                gl::DrawElementsType type,
>+                                size_t offset,
>+                                size_t count,
>+                                bool primitiveRestartEnabled,
>+                                gl::IndexRange *outRange) override;
> 
>-    const vk::Buffer &getVkBuffer() const;
>+    GLint64 getSize() const { return mState.getSize(); }
>+
>+    const vk::BufferHelper &getBuffer() const
>+    {
>+        ASSERT(mBuffer.valid());
>+        return mBuffer;
>+    }
>+
>+    vk::BufferHelper &getBuffer()
>+    {
>+        ASSERT(mBuffer.valid());
>+        return mBuffer;
>+    }
>+
>+    angle::Result mapImpl(ContextVk *contextVk, void **mapPtr);
>+    angle::Result unmapImpl(ContextVk *contextVk);
>+
>+    // Calls copyBuffer internally.
>+    angle::Result copyToBuffer(ContextVk *contextVk,
>+                               vk::BufferHelper *destBuffer,
>+                               uint32_t copyCount,
>+                               const VkBufferCopy *copies);
> 
>   private:
>-    vk::Error setDataImpl(ContextVk *contextVk, const uint8_t *data, size_t size, size_t offset);
>+    angle::Result setDataImpl(ContextVk *contextVk,
>+                              const uint8_t *data,
>+                              size_t size,
>+                              size_t offset);
>     void release(RendererVk *renderer);
> 
>-    vk::Buffer mBuffer;
>-    vk::DeviceMemory mBufferMemory;
>-    size_t mCurrentRequiredSize;
>+    vk::BufferHelper mBuffer;
> };
> 
> }  // namespace rx
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/CommandGraph.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/CommandGraph.cpp
>new file mode 100644
>index 00000000000..b9685b852e0
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/CommandGraph.cpp
>@@ -0,0 +1,1015 @@
>+//
>+// Copyright 2017 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// CommandGraph:
>+//    Deferred work constructed by GL calls, that will later be flushed to Vulkan.
>+//
>+
>+#include "libANGLE/renderer/vulkan/CommandGraph.h"
>+
>+#include <iostream>
>+
>+#include "libANGLE/renderer/vulkan/ContextVk.h"
>+#include "libANGLE/renderer/vulkan/RenderTargetVk.h"
>+#include "libANGLE/renderer/vulkan/RendererVk.h"
>+#include "libANGLE/renderer/vulkan/vk_format_utils.h"
>+#include "libANGLE/renderer/vulkan/vk_helpers.h"
>+
>+#include "third_party/trace_event/trace_event.h"
>+
>+namespace rx
>+{
>+namespace vk
>+{
>+namespace
>+{
>+ANGLE_MAYBE_UNUSED
>+angle::Result InitAndBeginCommandBuffer(vk::Context *context,
>+                                        const CommandPool &commandPool,
>+                                        const VkCommandBufferInheritanceInfo &inheritanceInfo,
>+                                        VkCommandBufferUsageFlags flags,
>+                                        angle::PoolAllocator *poolAllocator,
>+                                        priv::SecondaryCommandBuffer *commandBuffer)
>+{
>+    ASSERT(!commandBuffer->valid());
>+    commandBuffer->initialize(poolAllocator);
>+    return angle::Result::Continue;
>+}
>+
>+ANGLE_MAYBE_UNUSED
>+angle::Result InitAndBeginCommandBuffer(vk::Context *context,
>+                                        const CommandPool &commandPool,
>+                                        const VkCommandBufferInheritanceInfo &inheritanceInfo,
>+                                        VkCommandBufferUsageFlags flags,
>+                                        angle::PoolAllocator *poolAllocator,
>+                                        PrimaryCommandBuffer *commandBuffer)
>+{
>+    ASSERT(!commandBuffer->valid());
>+    VkCommandBufferAllocateInfo createInfo = {};
>+    createInfo.sType                       = VK_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOCATE_INFO;
>+    createInfo.commandPool                 = commandPool.getHandle();
>+    createInfo.level                       = VK_COMMAND_BUFFER_LEVEL_SECONDARY;
>+    createInfo.commandBufferCount          = 1;
>+
>+    ANGLE_VK_TRY(context, commandBuffer->init(context->getDevice(), createInfo));
>+
>+    VkCommandBufferBeginInfo beginInfo = {};
>+    beginInfo.sType                    = VK_STRUCTURE_TYPE_COMMAND_BUFFER_BEGIN_INFO;
>+    beginInfo.flags                    = flags | VK_COMMAND_BUFFER_USAGE_ONE_TIME_SUBMIT_BIT;
>+    beginInfo.pInheritanceInfo         = &inheritanceInfo;
>+
>+    ANGLE_VK_TRY(context, commandBuffer->begin(beginInfo));
>+    return angle::Result::Continue;
>+}
>+
>+const char *GetResourceTypeName(CommandGraphResourceType resourceType,
>+                                CommandGraphNodeFunction function)
>+{
>+    switch (resourceType)
>+    {
>+        case CommandGraphResourceType::Buffer:
>+            return "Buffer";
>+        case CommandGraphResourceType::Framebuffer:
>+            return "Framebuffer";
>+        case CommandGraphResourceType::Image:
>+            return "Image";
>+        case CommandGraphResourceType::Query:
>+            switch (function)
>+            {
>+                case CommandGraphNodeFunction::BeginQuery:
>+                    return "BeginQuery";
>+                case CommandGraphNodeFunction::EndQuery:
>+                    return "EndQuery";
>+                case CommandGraphNodeFunction::WriteTimestamp:
>+                    return "WriteTimestamp";
>+                default:
>+                    UNREACHABLE();
>+                    return "Query";
>+            }
>+        case CommandGraphResourceType::FenceSync:
>+            switch (function)
>+            {
>+                case CommandGraphNodeFunction::SetFenceSync:
>+                    return "SetFenceSync";
>+                case CommandGraphNodeFunction::WaitFenceSync:
>+                    return "WaitFenceSync";
>+                default:
>+                    UNREACHABLE();
>+                    return "FenceSync";
>+            }
>+        case CommandGraphResourceType::DebugMarker:
>+            switch (function)
>+            {
>+                case CommandGraphNodeFunction::InsertDebugMarker:
>+                    return "InsertDebugMarker";
>+                case CommandGraphNodeFunction::PushDebugMarker:
>+                    return "PushDebugMarker";
>+                case CommandGraphNodeFunction::PopDebugMarker:
>+                    return "PopDebugMarker";
>+                default:
>+                    UNREACHABLE();
>+                    return "DebugMarker";
>+            }
>+        default:
>+            UNREACHABLE();
>+            return "";
>+    }
>+}
>+
>+void MakeDebugUtilsLabel(GLenum source, const char *marker, VkDebugUtilsLabelEXT *label)
>+{
>+    static constexpr angle::ColorF kLabelColors[6] = {
>+        angle::ColorF(1.0f, 0.5f, 0.5f, 1.0f),  // DEBUG_SOURCE_API
>+        angle::ColorF(0.5f, 1.0f, 0.5f, 1.0f),  // DEBUG_SOURCE_WINDOW_SYSTEM
>+        angle::ColorF(0.5f, 0.5f, 1.0f, 1.0f),  // DEBUG_SOURCE_SHADER_COMPILER
>+        angle::ColorF(0.7f, 0.7f, 0.7f, 1.0f),  // DEBUG_SOURCE_THIRD_PARTY
>+        angle::ColorF(0.5f, 0.8f, 0.9f, 1.0f),  // DEBUG_SOURCE_APPLICATION
>+        angle::ColorF(0.9f, 0.8f, 0.5f, 1.0f),  // DEBUG_SOURCE_OTHER
>+    };
>+
>+    int colorIndex = source - GL_DEBUG_SOURCE_API;
>+    ASSERT(colorIndex >= 0 && static_cast<size_t>(colorIndex) < ArraySize(kLabelColors));
>+
>+    label->sType      = VK_STRUCTURE_TYPE_DEBUG_UTILS_LABEL_EXT;
>+    label->pNext      = nullptr;
>+    label->pLabelName = marker;
>+    kLabelColors[colorIndex].writeData(label->color);
>+}
>+
>+constexpr VkSubpassContents kRenderPassContents =
>+    CommandBuffer::ExecutesInline() ? VK_SUBPASS_CONTENTS_INLINE
>+                                    : VK_SUBPASS_CONTENTS_SECONDARY_COMMAND_BUFFERS;
>+
>+// Helpers to unify executeCommands call based on underlying cmd buffer type
>+ANGLE_MAYBE_UNUSED
>+void ExecuteCommands(PrimaryCommandBuffer *primCmdBuffer,
>+                     priv::SecondaryCommandBuffer *secCmdBuffer)
>+{
>+    secCmdBuffer->executeCommands(primCmdBuffer->getHandle());
>+}
>+
>+ANGLE_MAYBE_UNUSED
>+void ExecuteCommands(PrimaryCommandBuffer *primCmdBuffer, priv::CommandBuffer *secCmdBuffer)
>+{
>+    primCmdBuffer->executeCommands(1, secCmdBuffer);
>+}
>+
>+ANGLE_MAYBE_UNUSED
>+std::string DumpCommands(const priv::SecondaryCommandBuffer &commandBuffer, const char *separator)
>+{
>+    return commandBuffer.dumpCommands(separator);
>+}
>+
>+ANGLE_MAYBE_UNUSED
>+std::string DumpCommands(const priv::CommandBuffer &commandBuffer, const char *separator)
>+{
>+    return "--blob--";
>+}
>+
>+}  // anonymous namespace
>+
>+// CommandGraphResource implementation.
>+CommandGraphResource::CommandGraphResource(CommandGraphResourceType resourceType)
>+    : mCurrentWritingNode(nullptr), mResourceType(resourceType)
>+{}
>+
>+CommandGraphResource::~CommandGraphResource() = default;
>+
>+bool CommandGraphResource::isResourceInUse(RendererVk *renderer) const
>+{
>+    return renderer->isSerialInUse(mStoredQueueSerial);
>+}
>+
>+angle::Result CommandGraphResource::recordCommands(Context *context,
>+                                                   CommandBuffer **commandBufferOut)
>+{
>+    updateQueueSerial(context->getRenderer()->getCurrentQueueSerial());
>+
>+    if (!hasChildlessWritingNode() || hasStartedRenderPass())
>+    {
>+        startNewCommands(context->getRenderer());
>+        return mCurrentWritingNode->beginOutsideRenderPassRecording(
>+            context, context->getRenderer()->getCommandPool(), commandBufferOut);
>+    }
>+
>+    CommandBuffer *outsideRenderPassCommands = mCurrentWritingNode->getOutsideRenderPassCommands();
>+    if (!outsideRenderPassCommands->valid())
>+    {
>+        ANGLE_TRY(mCurrentWritingNode->beginOutsideRenderPassRecording(
>+            context, context->getRenderer()->getCommandPool(), commandBufferOut));
>+    }
>+    else
>+    {
>+        *commandBufferOut = outsideRenderPassCommands;
>+    }
>+
>+    return angle::Result::Continue;
>+}
>+
>+angle::Result CommandGraphResource::beginRenderPass(
>+    ContextVk *contextVk,
>+    const Framebuffer &framebuffer,
>+    const gl::Rectangle &renderArea,
>+    const RenderPassDesc &renderPassDesc,
>+    const AttachmentOpsArray &renderPassAttachmentOps,
>+    const std::vector<VkClearValue> &clearValues,
>+    CommandBuffer **commandBufferOut)
>+{
>+    // If a barrier has been inserted in the meantime, stop the command buffer.
>+    if (!hasChildlessWritingNode())
>+    {
>+        startNewCommands(contextVk->getRenderer());
>+    }
>+
>+    mCurrentWritingNode->storeRenderPassInfo(framebuffer, renderArea, renderPassDesc,
>+                                             renderPassAttachmentOps, clearValues);
>+
>+    mCurrentWritingNode->setCommandBufferOwner(contextVk);
>+
>+    return mCurrentWritingNode->beginInsideRenderPassRecording(contextVk, commandBufferOut);
>+}
>+
>+void CommandGraphResource::addWriteDependency(CommandGraphResource *writingResource)
>+{
>+    CommandGraphNode *writingNode = writingResource->mCurrentWritingNode;
>+    ASSERT(writingNode);
>+
>+    onWriteImpl(writingNode, writingResource->getStoredQueueSerial());
>+}
>+
>+void CommandGraphResource::addReadDependency(CommandGraphResource *readingResource)
>+{
>+    updateQueueSerial(readingResource->getStoredQueueSerial());
>+
>+    CommandGraphNode *readingNode = readingResource->mCurrentWritingNode;
>+    ASSERT(readingNode);
>+
>+    if (mCurrentWritingNode)
>+    {
>+        // Ensure 'readingNode' happens after the current writing node.
>+        CommandGraphNode::SetHappensBeforeDependency(mCurrentWritingNode, readingNode);
>+    }
>+
>+    // Add the read node to the list of nodes currently reading this resource.
>+    mCurrentReadingNodes.push_back(readingNode);
>+}
>+
>+void CommandGraphResource::finishCurrentCommands(RendererVk *renderer)
>+{
>+    startNewCommands(renderer);
>+}
>+
>+void CommandGraphResource::startNewCommands(RendererVk *renderer)
>+{
>+    CommandGraphNode *newCommands =
>+        renderer->getCommandGraph()->allocateNode(CommandGraphNodeFunction::Generic);
>+    newCommands->setDiagnosticInfo(mResourceType, reinterpret_cast<uintptr_t>(this));
>+    onWriteImpl(newCommands, renderer->getCurrentQueueSerial());
>+}
>+
>+void CommandGraphResource::onWriteImpl(CommandGraphNode *writingNode, Serial currentSerial)
>+{
>+    updateQueueSerial(currentSerial);
>+
>+    // Make sure any open reads and writes finish before we execute 'writingNode'.
>+    if (!mCurrentReadingNodes.empty())
>+    {
>+        CommandGraphNode::SetHappensBeforeDependencies(mCurrentReadingNodes.data(),
>+                                                       mCurrentReadingNodes.size(), writingNode);
>+        mCurrentReadingNodes.clear();
>+    }
>+
>+    if (mCurrentWritingNode && mCurrentWritingNode != writingNode)
>+    {
>+        CommandGraphNode::SetHappensBeforeDependency(mCurrentWritingNode, writingNode);
>+    }
>+
>+    mCurrentWritingNode = writingNode;
>+}
>+
>+// CommandGraphNode implementation.
>+CommandGraphNode::CommandGraphNode(CommandGraphNodeFunction function,
>+                                   angle::PoolAllocator *poolAllocator)
>+    : mRenderPassClearValues{},
>+      mFunction(function),
>+      mPoolAllocator(poolAllocator),
>+      mQueryPool(VK_NULL_HANDLE),
>+      mQueryIndex(0),
>+      mFenceSyncEvent(VK_NULL_HANDLE),
>+      mHasChildren(false),
>+      mVisitedState(VisitedState::Unvisited),
>+      mGlobalMemoryBarrierSrcAccess(0),
>+      mGlobalMemoryBarrierDstAccess(0),
>+      mCommandBufferOwner(nullptr)
>+{}
>+
>+CommandGraphNode::~CommandGraphNode()
>+{
>+    mRenderPassFramebuffer.setHandle(VK_NULL_HANDLE);
>+    // Command buffers are managed by the command pool, so don't need to be freed.
>+    mOutsideRenderPassCommands.releaseHandle();
>+    mInsideRenderPassCommands.releaseHandle();
>+}
>+
>+angle::Result CommandGraphNode::beginOutsideRenderPassRecording(Context *context,
>+                                                                const CommandPool &commandPool,
>+                                                                CommandBuffer **commandsOut)
>+{
>+    ASSERT(!mHasChildren);
>+
>+    VkCommandBufferInheritanceInfo inheritanceInfo = {};
>+    inheritanceInfo.sType       = VK_STRUCTURE_TYPE_COMMAND_BUFFER_INHERITANCE_INFO;
>+    inheritanceInfo.renderPass  = VK_NULL_HANDLE;
>+    inheritanceInfo.subpass     = 0;
>+    inheritanceInfo.framebuffer = VK_NULL_HANDLE;
>+    inheritanceInfo.occlusionQueryEnable =
>+        CommandBuffer::SupportsQueries(context->getRenderer()->getPhysicalDeviceFeatures());
>+    inheritanceInfo.queryFlags         = 0;
>+    inheritanceInfo.pipelineStatistics = 0;
>+
>+    ANGLE_TRY(InitAndBeginCommandBuffer(context, commandPool, inheritanceInfo, 0, mPoolAllocator,
>+                                        &mOutsideRenderPassCommands));
>+
>+    *commandsOut = &mOutsideRenderPassCommands;
>+    return angle::Result::Continue;
>+}
>+
>+angle::Result CommandGraphNode::beginInsideRenderPassRecording(Context *context,
>+                                                               CommandBuffer **commandsOut)
>+{
>+    ASSERT(!mHasChildren);
>+
>+    // Get a compatible RenderPass from the cache so we can initialize the inheritance info.
>+    // TODO(jmadill): Support query for compatible/conformant render pass. http://anglebug.com/2361
>+    RenderPass *compatibleRenderPass;
>+    ANGLE_TRY(context->getRenderer()->getCompatibleRenderPass(context, mRenderPassDesc,
>+                                                              &compatibleRenderPass));
>+
>+    VkCommandBufferInheritanceInfo inheritanceInfo = {};
>+    inheritanceInfo.sType       = VK_STRUCTURE_TYPE_COMMAND_BUFFER_INHERITANCE_INFO;
>+    inheritanceInfo.renderPass  = compatibleRenderPass->getHandle();
>+    inheritanceInfo.subpass     = 0;
>+    inheritanceInfo.framebuffer = mRenderPassFramebuffer.getHandle();
>+    inheritanceInfo.occlusionQueryEnable =
>+        CommandBuffer::SupportsQueries(context->getRenderer()->getPhysicalDeviceFeatures());
>+    inheritanceInfo.queryFlags         = 0;
>+    inheritanceInfo.pipelineStatistics = 0;
>+
>+    ANGLE_TRY(InitAndBeginCommandBuffer(context, context->getRenderer()->getCommandPool(),
>+                                        inheritanceInfo,
>+                                        VK_COMMAND_BUFFER_USAGE_RENDER_PASS_CONTINUE_BIT,
>+                                        mPoolAllocator, &mInsideRenderPassCommands));
>+
>+    *commandsOut = &mInsideRenderPassCommands;
>+    return angle::Result::Continue;
>+}
>+
>+void CommandGraphNode::storeRenderPassInfo(const Framebuffer &framebuffer,
>+                                           const gl::Rectangle renderArea,
>+                                           const vk::RenderPassDesc &renderPassDesc,
>+                                           const AttachmentOpsArray &renderPassAttachmentOps,
>+                                           const std::vector<VkClearValue> &clearValues)
>+{
>+    mRenderPassDesc          = renderPassDesc;
>+    mRenderPassAttachmentOps = renderPassAttachmentOps;
>+    mRenderPassFramebuffer.setHandle(framebuffer.getHandle());
>+    mRenderPassRenderArea = renderArea;
>+    std::copy(clearValues.begin(), clearValues.end(), mRenderPassClearValues.begin());
>+}
>+
>+// static
>+void CommandGraphNode::SetHappensBeforeDependencies(CommandGraphNode **beforeNodes,
>+                                                    size_t beforeNodesCount,
>+                                                    CommandGraphNode *afterNode)
>+{
>+    afterNode->mParents.insert(afterNode->mParents.end(), beforeNodes,
>+                               beforeNodes + beforeNodesCount);
>+
>+    // TODO(jmadill): is there a faster way to do this?
>+    for (size_t i = 0; i < beforeNodesCount; ++i)
>+    {
>+        beforeNodes[i]->setHasChildren();
>+
>+        ASSERT(beforeNodes[i] != afterNode && !beforeNodes[i]->isChildOf(afterNode));
>+    }
>+}
>+
>+void CommandGraphNode::SetHappensBeforeDependencies(CommandGraphNode *beforeNode,
>+                                                    CommandGraphNode **afterNodes,
>+                                                    size_t afterNodesCount)
>+{
>+    for (size_t i = 0; i < afterNodesCount; ++i)
>+    {
>+        SetHappensBeforeDependency(beforeNode, afterNodes[i]);
>+    }
>+}
>+
>+bool CommandGraphNode::hasParents() const
>+{
>+    return !mParents.empty();
>+}
>+
>+void CommandGraphNode::setQueryPool(const QueryPool *queryPool, uint32_t queryIndex)
>+{
>+    ASSERT(mFunction == CommandGraphNodeFunction::BeginQuery ||
>+           mFunction == CommandGraphNodeFunction::EndQuery ||
>+           mFunction == CommandGraphNodeFunction::WriteTimestamp);
>+    mQueryPool  = queryPool->getHandle();
>+    mQueryIndex = queryIndex;
>+}
>+
>+void CommandGraphNode::setFenceSync(const vk::Event &event)
>+{
>+    ASSERT(mFunction == CommandGraphNodeFunction::SetFenceSync ||
>+           mFunction == CommandGraphNodeFunction::WaitFenceSync);
>+    mFenceSyncEvent = event.getHandle();
>+}
>+
>+void CommandGraphNode::setDebugMarker(GLenum source, std::string &&marker)
>+{
>+    ASSERT(mFunction == CommandGraphNodeFunction::InsertDebugMarker ||
>+           mFunction == CommandGraphNodeFunction::PushDebugMarker);
>+    mDebugMarkerSource = source;
>+    mDebugMarker       = std::move(marker);
>+}
>+
>+// Do not call this in anything but testing code, since it's slow.
>+bool CommandGraphNode::isChildOf(CommandGraphNode *parent)
>+{
>+    std::set<CommandGraphNode *> visitedList;
>+    std::vector<CommandGraphNode *> openList;
>+    openList.insert(openList.begin(), mParents.begin(), mParents.end());
>+    while (!openList.empty())
>+    {
>+        CommandGraphNode *current = openList.back();
>+        openList.pop_back();
>+        if (visitedList.count(current) == 0)
>+        {
>+            if (current == parent)
>+            {
>+                return true;
>+            }
>+            visitedList.insert(current);
>+            openList.insert(openList.end(), current->mParents.begin(), current->mParents.end());
>+        }
>+    }
>+
>+    return false;
>+}
>+
>+VisitedState CommandGraphNode::visitedState() const
>+{
>+    return mVisitedState;
>+}
>+
>+void CommandGraphNode::visitParents(std::vector<CommandGraphNode *> *stack)
>+{
>+    ASSERT(mVisitedState == VisitedState::Unvisited);
>+    stack->insert(stack->end(), mParents.begin(), mParents.end());
>+    mVisitedState = VisitedState::Ready;
>+}
>+
>+angle::Result CommandGraphNode::visitAndExecute(vk::Context *context,
>+                                                Serial serial,
>+                                                RenderPassCache *renderPassCache,
>+                                                PrimaryCommandBuffer *primaryCommandBuffer)
>+{
>+    switch (mFunction)
>+    {
>+        case CommandGraphNodeFunction::Generic:
>+            ASSERT(mQueryPool == VK_NULL_HANDLE && mFenceSyncEvent == VK_NULL_HANDLE);
>+
>+            // Record the deferred pipeline barrier if necessary.
>+            ASSERT((mGlobalMemoryBarrierDstAccess == 0) == (mGlobalMemoryBarrierSrcAccess == 0));
>+            if (mGlobalMemoryBarrierSrcAccess)
>+            {
>+                VkMemoryBarrier memoryBarrier = {};
>+                memoryBarrier.sType           = VK_STRUCTURE_TYPE_MEMORY_BARRIER;
>+                memoryBarrier.srcAccessMask   = mGlobalMemoryBarrierSrcAccess;
>+                memoryBarrier.dstAccessMask   = mGlobalMemoryBarrierDstAccess;
>+
>+                // Use the all pipe stage to keep the state management simple.
>+                primaryCommandBuffer->pipelineBarrier(VK_PIPELINE_STAGE_ALL_COMMANDS_BIT,
>+                                                      VK_PIPELINE_STAGE_ALL_COMMANDS_BIT, 0, 1,
>+                                                      &memoryBarrier, 0, nullptr, 0, nullptr);
>+            }
>+
>+            if (mOutsideRenderPassCommands.valid())
>+            {
>+                ANGLE_VK_TRY(context, mOutsideRenderPassCommands.end());
>+                ExecuteCommands(primaryCommandBuffer, &mOutsideRenderPassCommands);
>+            }
>+
>+            if (mInsideRenderPassCommands.valid())
>+            {
>+                // Pull a RenderPass from the cache.
>+                // TODO(jmadill): Insert layout transitions.
>+                RenderPass *renderPass = nullptr;
>+                ANGLE_TRY(renderPassCache->getRenderPassWithOps(
>+                    context, serial, mRenderPassDesc, mRenderPassAttachmentOps, &renderPass));
>+
>+                ANGLE_VK_TRY(context, mInsideRenderPassCommands.end());
>+
>+                VkRenderPassBeginInfo beginInfo = {};
>+                beginInfo.sType                 = VK_STRUCTURE_TYPE_RENDER_PASS_BEGIN_INFO;
>+                beginInfo.renderPass            = renderPass->getHandle();
>+                beginInfo.framebuffer           = mRenderPassFramebuffer.getHandle();
>+                beginInfo.renderArea.offset.x   = static_cast<uint32_t>(mRenderPassRenderArea.x);
>+                beginInfo.renderArea.offset.y   = static_cast<uint32_t>(mRenderPassRenderArea.y);
>+                beginInfo.renderArea.extent.width =
>+                    static_cast<uint32_t>(mRenderPassRenderArea.width);
>+                beginInfo.renderArea.extent.height =
>+                    static_cast<uint32_t>(mRenderPassRenderArea.height);
>+                beginInfo.clearValueCount = mRenderPassDesc.attachmentCount();
>+                beginInfo.pClearValues    = mRenderPassClearValues.data();
>+
>+                primaryCommandBuffer->beginRenderPass(beginInfo, kRenderPassContents);
>+                ExecuteCommands(primaryCommandBuffer, &mInsideRenderPassCommands);
>+                primaryCommandBuffer->endRenderPass();
>+            }
>+            break;
>+
>+        case CommandGraphNodeFunction::BeginQuery:
>+            ASSERT(!mOutsideRenderPassCommands.valid() && !mInsideRenderPassCommands.valid());
>+            ASSERT(mQueryPool != VK_NULL_HANDLE);
>+
>+            primaryCommandBuffer->resetQueryPool(mQueryPool, mQueryIndex, 1);
>+            primaryCommandBuffer->beginQuery(mQueryPool, mQueryIndex, 0);
>+
>+            break;
>+
>+        case CommandGraphNodeFunction::EndQuery:
>+            ASSERT(!mOutsideRenderPassCommands.valid() && !mInsideRenderPassCommands.valid());
>+            ASSERT(mQueryPool != VK_NULL_HANDLE);
>+
>+            primaryCommandBuffer->endQuery(mQueryPool, mQueryIndex);
>+
>+            break;
>+
>+        case CommandGraphNodeFunction::WriteTimestamp:
>+            ASSERT(!mOutsideRenderPassCommands.valid() && !mInsideRenderPassCommands.valid());
>+            ASSERT(mQueryPool != VK_NULL_HANDLE);
>+
>+            primaryCommandBuffer->resetQueryPool(mQueryPool, mQueryIndex, 1);
>+            primaryCommandBuffer->writeTimestamp(VK_PIPELINE_STAGE_BOTTOM_OF_PIPE_BIT, mQueryPool,
>+                                                 mQueryIndex);
>+
>+            break;
>+
>+        case CommandGraphNodeFunction::SetFenceSync:
>+            ASSERT(!mOutsideRenderPassCommands.valid() && !mInsideRenderPassCommands.valid());
>+            ASSERT(mFenceSyncEvent != VK_NULL_HANDLE);
>+
>+            primaryCommandBuffer->setEvent(mFenceSyncEvent, VK_PIPELINE_STAGE_BOTTOM_OF_PIPE_BIT);
>+
>+            break;
>+
>+        case CommandGraphNodeFunction::WaitFenceSync:
>+            ASSERT(!mOutsideRenderPassCommands.valid() && !mInsideRenderPassCommands.valid());
>+            ASSERT(mFenceSyncEvent != VK_NULL_HANDLE);
>+
>+            // Fence Syncs are purely execution barriers, so there are no memory barriers attached.
>+            primaryCommandBuffer->waitEvents(
>+                1, &mFenceSyncEvent, VK_PIPELINE_STAGE_BOTTOM_OF_PIPE_BIT,
>+                VK_PIPELINE_STAGE_BOTTOM_OF_PIPE_BIT, 0, nullptr, 0, nullptr, 0, nullptr);
>+
>+            break;
>+
>+        case CommandGraphNodeFunction::InsertDebugMarker:
>+            ASSERT(!mOutsideRenderPassCommands.valid() && !mInsideRenderPassCommands.valid());
>+
>+            if (vkCmdInsertDebugUtilsLabelEXT)
>+            {
>+                VkDebugUtilsLabelEXT label;
>+                MakeDebugUtilsLabel(mDebugMarkerSource, mDebugMarker.c_str(), &label);
>+
>+                vkCmdInsertDebugUtilsLabelEXT(primaryCommandBuffer->getHandle(), &label);
>+            }
>+            break;
>+
>+        case CommandGraphNodeFunction::PushDebugMarker:
>+            ASSERT(!mOutsideRenderPassCommands.valid() && !mInsideRenderPassCommands.valid());
>+
>+            if (vkCmdBeginDebugUtilsLabelEXT)
>+            {
>+                VkDebugUtilsLabelEXT label;
>+                MakeDebugUtilsLabel(mDebugMarkerSource, mDebugMarker.c_str(), &label);
>+
>+                vkCmdBeginDebugUtilsLabelEXT(primaryCommandBuffer->getHandle(), &label);
>+            }
>+            break;
>+
>+        case CommandGraphNodeFunction::PopDebugMarker:
>+            ASSERT(!mOutsideRenderPassCommands.valid() && !mInsideRenderPassCommands.valid());
>+
>+            if (vkCmdEndDebugUtilsLabelEXT)
>+            {
>+                vkCmdEndDebugUtilsLabelEXT(primaryCommandBuffer->getHandle());
>+            }
>+            break;
>+
>+        default:
>+            UNREACHABLE();
>+    }
>+
>+    mVisitedState = VisitedState::Visited;
>+    return angle::Result::Continue;
>+}
>+
>+const std::vector<CommandGraphNode *> &CommandGraphNode::getParentsForDiagnostics() const
>+{
>+    return mParents;
>+}
>+
>+void CommandGraphNode::setDiagnosticInfo(CommandGraphResourceType resourceType,
>+                                         uintptr_t resourceID)
>+{
>+    mResourceType = resourceType;
>+    mResourceID   = resourceID;
>+}
>+
>+std::string CommandGraphNode::dumpCommandsForDiagnostics(const char *separator) const
>+{
>+    std::string result;
>+    if (mOutsideRenderPassCommands.valid())
>+    {
>+        result += separator;
>+        result += "Outside RP:";
>+        result += DumpCommands(mOutsideRenderPassCommands, separator);
>+    }
>+    if (mInsideRenderPassCommands.valid())
>+    {
>+        result += separator;
>+        result += "Inside RP:";
>+        result += DumpCommands(mInsideRenderPassCommands, separator);
>+    }
>+    return result;
>+}
>+
>+// CommandGraph implementation.
>+CommandGraph::CommandGraph(bool enableGraphDiagnostics, angle::PoolAllocator *poolAllocator)
>+    : mEnableGraphDiagnostics(enableGraphDiagnostics),
>+      mPoolAllocator(poolAllocator),
>+      mLastBarrierIndex(kInvalidNodeIndex)
>+{
>+    // Push so that allocations made from here will be recycled in clear() below.
>+    mPoolAllocator->push();
>+}
>+
>+CommandGraph::~CommandGraph()
>+{
>+    ASSERT(empty());
>+}
>+
>+CommandGraphNode *CommandGraph::allocateNode(CommandGraphNodeFunction function)
>+{
>+    // TODO(jmadill): Use a pool allocator for the CPU node allocations.
>+    CommandGraphNode *newCommands = new CommandGraphNode(function, mPoolAllocator);
>+    mNodes.emplace_back(newCommands);
>+    return newCommands;
>+}
>+
>+CommandGraphNode *CommandGraph::allocateBarrierNode(CommandGraphNodeFunction function,
>+                                                    CommandGraphResourceType resourceType,
>+                                                    uintptr_t resourceID)
>+{
>+    CommandGraphNode *newNode = allocateNode(function);
>+    newNode->setDiagnosticInfo(resourceType, resourceID);
>+    setNewBarrier(newNode);
>+
>+    return newNode;
>+}
>+
>+void CommandGraph::setNewBarrier(CommandGraphNode *newBarrier)
>+{
>+    size_t previousBarrierIndex       = 0;
>+    CommandGraphNode *previousBarrier = getLastBarrierNode(&previousBarrierIndex);
>+
>+    // Add a dependency from previousBarrier to all nodes in (previousBarrier, newBarrier).
>+    if (previousBarrier && previousBarrierIndex + 1 < mNodes.size())
>+    {
>+        size_t afterNodesCount = mNodes.size() - (previousBarrierIndex + 2);
>+        CommandGraphNode::SetHappensBeforeDependencies(
>+            previousBarrier, &mNodes[previousBarrierIndex + 1], afterNodesCount);
>+    }
>+
>+    // Add a dependency from all nodes in [previousBarrier, newBarrier) to newBarrier.
>+    addDependenciesToNextBarrier(previousBarrierIndex, mNodes.size() - 1, newBarrier);
>+
>+    mLastBarrierIndex = mNodes.size() - 1;
>+}
>+
>+angle::Result CommandGraph::submitCommands(Context *context,
>+                                           Serial serial,
>+                                           RenderPassCache *renderPassCache,
>+                                           CommandPool *commandPool,
>+                                           PrimaryCommandBuffer *primaryCommandBufferOut)
>+{
>+    // There is no point in submitting an empty command buffer, so make sure not to call this
>+    // function if there's nothing to do.
>+    ASSERT(!mNodes.empty());
>+
>+    size_t previousBarrierIndex       = 0;
>+    CommandGraphNode *previousBarrier = getLastBarrierNode(&previousBarrierIndex);
>+
>+    // Add a dependency from previousBarrier to all nodes in (previousBarrier, end].
>+    if (previousBarrier && previousBarrierIndex + 1 < mNodes.size())
>+    {
>+        size_t afterNodesCount = mNodes.size() - (previousBarrierIndex + 1);
>+        CommandGraphNode::SetHappensBeforeDependencies(
>+            previousBarrier, &mNodes[previousBarrierIndex + 1], afterNodesCount);
>+    }
>+
>+    VkCommandBufferAllocateInfo primaryInfo = {};
>+    primaryInfo.sType                       = VK_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOCATE_INFO;
>+    primaryInfo.commandPool                 = commandPool->getHandle();
>+    primaryInfo.level                       = VK_COMMAND_BUFFER_LEVEL_PRIMARY;
>+    primaryInfo.commandBufferCount          = 1;
>+
>+    ANGLE_VK_TRY(context, primaryCommandBufferOut->init(context->getDevice(), primaryInfo));
>+
>+    if (mEnableGraphDiagnostics)
>+    {
>+        dumpGraphDotFile(std::cout);
>+    }
>+
>+    std::vector<CommandGraphNode *> nodeStack;
>+
>+    VkCommandBufferBeginInfo beginInfo = {};
>+    beginInfo.sType                    = VK_STRUCTURE_TYPE_COMMAND_BUFFER_BEGIN_INFO;
>+    beginInfo.flags                    = VK_COMMAND_BUFFER_USAGE_ONE_TIME_SUBMIT_BIT;
>+    beginInfo.pInheritanceInfo         = nullptr;
>+
>+    ANGLE_VK_TRY(context, primaryCommandBufferOut->begin(beginInfo));
>+
>+    ANGLE_TRY(context->getRenderer()->traceGpuEvent(
>+        context, primaryCommandBufferOut, TRACE_EVENT_PHASE_BEGIN, "Primary Command Buffer"));
>+
>+    for (CommandGraphNode *topLevelNode : mNodes)
>+    {
>+        // Only process commands that don't have child commands. The others will be pulled in
>+        // automatically. Also skip commands that have already been visited.
>+        if (topLevelNode->hasChildren() || topLevelNode->visitedState() != VisitedState::Unvisited)
>+            continue;
>+
>+        nodeStack.push_back(topLevelNode);
>+
>+        while (!nodeStack.empty())
>+        {
>+            CommandGraphNode *node = nodeStack.back();
>+
>+            switch (node->visitedState())
>+            {
>+                case VisitedState::Unvisited:
>+                    node->visitParents(&nodeStack);
>+                    break;
>+                case VisitedState::Ready:
>+                    ANGLE_TRY(node->visitAndExecute(context, serial, renderPassCache,
>+                                                    primaryCommandBufferOut));
>+                    nodeStack.pop_back();
>+                    break;
>+                case VisitedState::Visited:
>+                    nodeStack.pop_back();
>+                    break;
>+                default:
>+                    UNREACHABLE();
>+                    break;
>+            }
>+        }
>+    }
>+
>+    ANGLE_TRY(context->getRenderer()->traceGpuEvent(
>+        context, primaryCommandBufferOut, TRACE_EVENT_PHASE_END, "Primary Command Buffer"));
>+
>+    ANGLE_VK_TRY(context, primaryCommandBufferOut->end());
>+
>+    clear();
>+
>+    return angle::Result::Continue;
>+}
>+
>+bool CommandGraph::empty() const
>+{
>+    return mNodes.empty();
>+}
>+
>+void CommandGraph::clear()
>+{
>+    mLastBarrierIndex = kInvalidNodeIndex;
>+    // Release cmd graph pool memory now that cmds are submitted
>+    // NOTE: This frees all memory since last push. Right now only the CommandGraph
>+    //  will push the allocator (at creation and below). If other people start
>+    //  pushing the allocator this (and/or the allocator) will need to be updated.
>+    mPoolAllocator->pop();
>+    mPoolAllocator->push();
>+
>+    // TODO(jmadill): Use pool allocator for performance. http://anglebug.com/2951
>+    for (CommandGraphNode *node : mNodes)
>+    {
>+        delete node;
>+    }
>+    mNodes.clear();
>+}
>+
>+void CommandGraph::beginQuery(const QueryPool *queryPool, uint32_t queryIndex)
>+{
>+    CommandGraphNode *newNode = allocateBarrierNode(CommandGraphNodeFunction::BeginQuery,
>+                                                    CommandGraphResourceType::Query, 0);
>+    newNode->setQueryPool(queryPool, queryIndex);
>+}
>+
>+void CommandGraph::endQuery(const QueryPool *queryPool, uint32_t queryIndex)
>+{
>+    CommandGraphNode *newNode =
>+        allocateBarrierNode(CommandGraphNodeFunction::EndQuery, CommandGraphResourceType::Query, 0);
>+    newNode->setQueryPool(queryPool, queryIndex);
>+}
>+
>+void CommandGraph::writeTimestamp(const QueryPool *queryPool, uint32_t queryIndex)
>+{
>+    CommandGraphNode *newNode = allocateBarrierNode(CommandGraphNodeFunction::WriteTimestamp,
>+                                                    CommandGraphResourceType::Query, 0);
>+    newNode->setQueryPool(queryPool, queryIndex);
>+}
>+
>+void CommandGraph::setFenceSync(const vk::Event &event)
>+{
>+    CommandGraphNode *newNode = allocateBarrierNode(CommandGraphNodeFunction::SetFenceSync,
>+                                                    CommandGraphResourceType::FenceSync,
>+                                                    reinterpret_cast<uintptr_t>(&event));
>+    newNode->setFenceSync(event);
>+}
>+
>+void CommandGraph::waitFenceSync(const vk::Event &event)
>+{
>+    CommandGraphNode *newNode = allocateBarrierNode(CommandGraphNodeFunction::WaitFenceSync,
>+                                                    CommandGraphResourceType::FenceSync,
>+                                                    reinterpret_cast<uintptr_t>(&event));
>+    newNode->setFenceSync(event);
>+}
>+
>+void CommandGraph::insertDebugMarker(GLenum source, std::string &&marker)
>+{
>+    CommandGraphNode *newNode = allocateBarrierNode(CommandGraphNodeFunction::InsertDebugMarker,
>+                                                    CommandGraphResourceType::DebugMarker, 0);
>+    newNode->setDebugMarker(source, std::move(marker));
>+}
>+
>+void CommandGraph::pushDebugMarker(GLenum source, std::string &&marker)
>+{
>+    CommandGraphNode *newNode = allocateBarrierNode(CommandGraphNodeFunction::PushDebugMarker,
>+                                                    CommandGraphResourceType::DebugMarker, 0);
>+    newNode->setDebugMarker(source, std::move(marker));
>+}
>+
>+void CommandGraph::popDebugMarker()
>+{
>+    allocateBarrierNode(CommandGraphNodeFunction::PopDebugMarker,
>+                        CommandGraphResourceType::DebugMarker, 0);
>+}
>+
>+// Dumps the command graph into a dot file that works with graphviz.
>+void CommandGraph::dumpGraphDotFile(std::ostream &out) const
>+{
>+    // This ID maps a node pointer to a monotonic ID. It allows us to look up parent node IDs.
>+    std::map<const CommandGraphNode *, int> nodeIDMap;
>+    std::map<uintptr_t, int> objectIDMap;
>+    std::map<std::pair<VkQueryPool, uint32_t>, int> queryIDMap;
>+
>+    // Map nodes to ids.
>+    for (size_t nodeIndex = 0; nodeIndex < mNodes.size(); ++nodeIndex)
>+    {
>+        const CommandGraphNode *node = mNodes[nodeIndex];
>+        nodeIDMap[node]              = static_cast<int>(nodeIndex) + 1;
>+    }
>+
>+    int bufferIDCounter      = 1;
>+    int framebufferIDCounter = 1;
>+    int imageIDCounter       = 1;
>+    int queryIDCounter       = 1;
>+    int fenceIDCounter       = 1;
>+
>+    out << "digraph {" << std::endl;
>+
>+    for (const CommandGraphNode *node : mNodes)
>+    {
>+        int nodeID = nodeIDMap[node];
>+
>+        std::stringstream strstr;
>+        strstr << GetResourceTypeName(node->getResourceTypeForDiagnostics(), node->getFunction());
>+
>+        if (node->getResourceTypeForDiagnostics() == CommandGraphResourceType::DebugMarker)
>+        {
>+            // For debug markers, use the string from the debug marker itself.
>+            if (node->getFunction() != CommandGraphNodeFunction::PopDebugMarker)
>+            {
>+                strstr << " " << node->getDebugMarker();
>+            }
>+        }
>+        else if (node->getResourceTypeForDiagnostics() == CommandGraphResourceType::Query)
>+        {
>+            // Special case for queries as they cannot generate a resource ID at creation time that
>+            // would reliably fit in a uintptr_t.
>+            strstr << " ";
>+
>+            ASSERT(node->getResourceIDForDiagnostics() == 0);
>+
>+            auto queryID = std::make_pair(node->getQueryPool(), node->getQueryIndex());
>+
>+            auto it = queryIDMap.find(queryID);
>+            if (it != queryIDMap.end())
>+            {
>+                strstr << it->second;
>+            }
>+            else
>+            {
>+                int id = queryIDCounter++;
>+
>+                queryIDMap[queryID] = id;
>+                strstr << id;
>+            }
>+        }
>+        else
>+        {
>+            strstr << " ";
>+
>+            // Otherwise assign each object an ID, so all the nodes of the same object have the same
>+            // label.
>+            ASSERT(node->getResourceIDForDiagnostics() != 0);
>+            auto it = objectIDMap.find(node->getResourceIDForDiagnostics());
>+            if (it != objectIDMap.end())
>+            {
>+                strstr << it->second;
>+            }
>+            else
>+            {
>+                int id = 0;
>+
>+                switch (node->getResourceTypeForDiagnostics())
>+                {
>+                    case CommandGraphResourceType::Buffer:
>+                        id = bufferIDCounter++;
>+                        break;
>+                    case CommandGraphResourceType::Framebuffer:
>+                        id = framebufferIDCounter++;
>+                        break;
>+                    case CommandGraphResourceType::Image:
>+                        id = imageIDCounter++;
>+                        break;
>+                    case CommandGraphResourceType::FenceSync:
>+                        id = fenceIDCounter++;
>+                        break;
>+                    default:
>+                        UNREACHABLE();
>+                        break;
>+                }
>+
>+                objectIDMap[node->getResourceIDForDiagnostics()] = id;
>+                strstr << id;
>+            }
>+        }
>+
>+        const std::string &label = strstr.str();
>+        out << "  " << nodeID << "[label =<" << label << "<BR/><FONT POINT-SIZE=\"10\">Node ID "
>+            << nodeID << node->dumpCommandsForDiagnostics("<BR/>") << "</FONT>>];" << std::endl;
>+    }
>+
>+    for (const CommandGraphNode *node : mNodes)
>+    {
>+        int nodeID = nodeIDMap[node];
>+
>+        for (const CommandGraphNode *parent : node->getParentsForDiagnostics())
>+        {
>+            int parentID = nodeIDMap[parent];
>+            out << "  " << parentID << " -> " << nodeID << ";" << std::endl;
>+        }
>+    }
>+
>+    out << "}" << std::endl;
>+}
>+
>+CommandGraphNode *CommandGraph::getLastBarrierNode(size_t *indexOut)
>+{
>+    *indexOut = mLastBarrierIndex == kInvalidNodeIndex ? 0 : mLastBarrierIndex;
>+    return mLastBarrierIndex == kInvalidNodeIndex ? nullptr : mNodes[mLastBarrierIndex];
>+}
>+
>+void CommandGraph::addDependenciesToNextBarrier(size_t begin,
>+                                                size_t end,
>+                                                CommandGraphNode *nextBarrier)
>+{
>+    for (size_t i = begin; i < end; ++i)
>+    {
>+        // As a small optimization, only add edges to childless nodes.  The others have an
>+        // indirect dependency.
>+        if (!mNodes[i]->hasChildren())
>+        {
>+            CommandGraphNode::SetHappensBeforeDependency(mNodes[i], nextBarrier);
>+        }
>+    }
>+}
>+
>+}  // namespace vk
>+}  // namespace rx
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/CommandGraph.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/CommandGraph.h
>new file mode 100644
>index 00000000000..811c9c3f09e
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/CommandGraph.h
>@@ -0,0 +1,516 @@
>+//
>+// Copyright 2017 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// CommandGraph:
>+//    Deferred work constructed by GL calls, that will later be flushed to Vulkan.
>+//
>+
>+#ifndef LIBANGLE_RENDERER_VULKAN_COMMAND_GRAPH_H_
>+#define LIBANGLE_RENDERER_VULKAN_COMMAND_GRAPH_H_
>+
>+#include "libANGLE/renderer/vulkan/SecondaryCommandBuffer.h"
>+#include "libANGLE/renderer/vulkan/vk_cache_utils.h"
>+
>+namespace rx
>+{
>+
>+namespace vk
>+{
>+
>+enum class VisitedState
>+{
>+    Unvisited,
>+    Ready,
>+    Visited,
>+};
>+
>+enum class CommandGraphResourceType
>+{
>+    Buffer,
>+    Framebuffer,
>+    Image,
>+    Query,
>+    FenceSync,
>+    DebugMarker,
>+};
>+
>+// Certain functionality cannot be put in secondary command buffers, so they are special-cased in
>+// the node.
>+enum class CommandGraphNodeFunction
>+{
>+    Generic,
>+    BeginQuery,
>+    EndQuery,
>+    WriteTimestamp,
>+    SetFenceSync,
>+    WaitFenceSync,
>+    InsertDebugMarker,
>+    PushDebugMarker,
>+    PopDebugMarker,
>+};
>+
>+// Receives notifications when a command buffer is no longer able to record. Can be used with
>+// inheritance. Faster than using an interface class since it has inlined methods. Could be used
>+// with composition by adding a getCommandBuffer method.
>+class CommandBufferOwner
>+{
>+  public:
>+    CommandBufferOwner() = default;
>+    virtual ~CommandBufferOwner() {}
>+
>+    ANGLE_INLINE void onCommandBufferFinished() { mCommandBuffer = nullptr; }
>+
>+  protected:
>+    CommandBuffer *mCommandBuffer = nullptr;
>+};
>+
>+// Only used internally in the command graph. Kept in the header for better inlining performance.
>+class CommandGraphNode final : angle::NonCopyable
>+{
>+  public:
>+    CommandGraphNode(CommandGraphNodeFunction function, angle::PoolAllocator *poolAllocator);
>+    ~CommandGraphNode();
>+
>+    // Immutable queries for when we're walking the commands tree.
>+    CommandBuffer *getOutsideRenderPassCommands()
>+    {
>+        ASSERT(!mHasChildren);
>+        return &mOutsideRenderPassCommands;
>+    }
>+
>+    CommandBuffer *getInsideRenderPassCommands()
>+    {
>+        ASSERT(!mHasChildren);
>+        return &mInsideRenderPassCommands;
>+    }
>+
>+    // For outside the render pass (copies, transitions, etc).
>+    angle::Result beginOutsideRenderPassRecording(Context *context,
>+                                                  const CommandPool &commandPool,
>+                                                  CommandBuffer **commandsOut);
>+
>+    // For rendering commands (draws).
>+    angle::Result beginInsideRenderPassRecording(Context *context, CommandBuffer **commandsOut);
>+
>+    // storeRenderPassInfo and append*RenderTarget store info relevant to the RenderPass.
>+    void storeRenderPassInfo(const Framebuffer &framebuffer,
>+                             const gl::Rectangle renderArea,
>+                             const vk::RenderPassDesc &renderPassDesc,
>+                             const AttachmentOpsArray &renderPassAttachmentOps,
>+                             const std::vector<VkClearValue> &clearValues);
>+
>+    void clearRenderPassColorAttachment(size_t attachmentIndex, const VkClearColorValue &clearValue)
>+    {
>+        mRenderPassAttachmentOps[attachmentIndex].loadOp = VK_ATTACHMENT_LOAD_OP_CLEAR;
>+        mRenderPassClearValues[attachmentIndex].color    = clearValue;
>+    }
>+
>+    void clearRenderPassDepthAttachment(size_t attachmentIndex, float depth)
>+    {
>+        mRenderPassAttachmentOps[attachmentIndex].loadOp           = VK_ATTACHMENT_LOAD_OP_CLEAR;
>+        mRenderPassClearValues[attachmentIndex].depthStencil.depth = depth;
>+    }
>+
>+    void clearRenderPassStencilAttachment(size_t attachmentIndex, uint32_t stencil)
>+    {
>+        mRenderPassAttachmentOps[attachmentIndex].stencilLoadOp      = VK_ATTACHMENT_LOAD_OP_CLEAR;
>+        mRenderPassClearValues[attachmentIndex].depthStencil.stencil = stencil;
>+    }
>+
>+    // Dependency commands order node execution in the command graph.
>+    // Once a node has commands that must happen after it, recording is stopped and the node is
>+    // frozen forever.
>+    static void SetHappensBeforeDependency(CommandGraphNode *beforeNode,
>+                                           CommandGraphNode *afterNode)
>+    {
>+        ASSERT(beforeNode != afterNode && !beforeNode->isChildOf(afterNode));
>+        afterNode->mParents.emplace_back(beforeNode);
>+        beforeNode->setHasChildren();
>+    }
>+
>+    static void SetHappensBeforeDependencies(CommandGraphNode **beforeNodes,
>+                                             size_t beforeNodesCount,
>+                                             CommandGraphNode *afterNode);
>+
>+    static void SetHappensBeforeDependencies(CommandGraphNode *beforeNode,
>+                                             CommandGraphNode **afterNodes,
>+                                             size_t afterNodesCount);
>+
>+    bool hasParents() const;
>+    bool hasChildren() const { return mHasChildren; }
>+
>+    // Commands for traversing the node on a flush operation.
>+    VisitedState visitedState() const;
>+    void visitParents(std::vector<CommandGraphNode *> *stack);
>+    angle::Result visitAndExecute(Context *context,
>+                                  Serial serial,
>+                                  RenderPassCache *renderPassCache,
>+                                  PrimaryCommandBuffer *primaryCommandBuffer);
>+
>+    // Only used in the command graph diagnostics.
>+    const std::vector<CommandGraphNode *> &getParentsForDiagnostics() const;
>+    void setDiagnosticInfo(CommandGraphResourceType resourceType, uintptr_t resourceID);
>+
>+    CommandGraphResourceType getResourceTypeForDiagnostics() const { return mResourceType; }
>+    uintptr_t getResourceIDForDiagnostics() const { return mResourceID; }
>+    std::string dumpCommandsForDiagnostics(const char *separator) const;
>+
>+    const gl::Rectangle &getRenderPassRenderArea() const { return mRenderPassRenderArea; }
>+
>+    CommandGraphNodeFunction getFunction() const { return mFunction; }
>+
>+    void setQueryPool(const QueryPool *queryPool, uint32_t queryIndex);
>+    VkQueryPool getQueryPool() const { return mQueryPool; }
>+    uint32_t getQueryIndex() const { return mQueryIndex; }
>+    void setFenceSync(const vk::Event &event);
>+    void setDebugMarker(GLenum source, std::string &&marker);
>+    const std::string &getDebugMarker() const { return mDebugMarker; }
>+
>+    ANGLE_INLINE void addGlobalMemoryBarrier(VkFlags srcAccess, VkFlags dstAccess)
>+    {
>+        mGlobalMemoryBarrierSrcAccess |= srcAccess;
>+        mGlobalMemoryBarrierDstAccess |= dstAccess;
>+    }
>+
>+    // This can only be set for RenderPass nodes. Each RenderPass node can have at most one owner.
>+    void setCommandBufferOwner(CommandBufferOwner *owner)
>+    {
>+        ASSERT(mCommandBufferOwner == nullptr);
>+        mCommandBufferOwner = owner;
>+    }
>+
>+  private:
>+    ANGLE_INLINE void setHasChildren()
>+    {
>+        mHasChildren = true;
>+        if (mCommandBufferOwner)
>+        {
>+            mCommandBufferOwner->onCommandBufferFinished();
>+        }
>+    }
>+
>+    // Used for testing only.
>+    bool isChildOf(CommandGraphNode *parent);
>+
>+    // Only used if we need a RenderPass for these commands.
>+    RenderPassDesc mRenderPassDesc;
>+    AttachmentOpsArray mRenderPassAttachmentOps;
>+    Framebuffer mRenderPassFramebuffer;
>+    gl::Rectangle mRenderPassRenderArea;
>+    gl::AttachmentArray<VkClearValue> mRenderPassClearValues;
>+
>+    CommandGraphNodeFunction mFunction;
>+    angle::PoolAllocator *mPoolAllocator;
>+    // Keep separate buffers for commands inside and outside a RenderPass.
>+    // TODO(jmadill): We might not need inside and outside RenderPass commands separate.
>+    CommandBuffer mOutsideRenderPassCommands;
>+    CommandBuffer mInsideRenderPassCommands;
>+
>+    // Special-function additional data:
>+    // Queries:
>+    VkQueryPool mQueryPool;
>+    uint32_t mQueryIndex;
>+    // GLsync and EGLSync:
>+    VkEvent mFenceSyncEvent;
>+    // Debug markers:
>+    GLenum mDebugMarkerSource;
>+    std::string mDebugMarker;
>+
>+    // Parents are commands that must be submitted before 'this' CommandNode can be submitted.
>+    std::vector<CommandGraphNode *> mParents;
>+
>+    // If this is true, other commands exist that must be submitted after 'this' command.
>+    bool mHasChildren;
>+
>+    // Used when traversing the dependency graph.
>+    VisitedState mVisitedState;
>+
>+    // Additional diagnostic information.
>+    CommandGraphResourceType mResourceType;
>+    uintptr_t mResourceID;
>+
>+    // For global memory barriers.
>+    VkFlags mGlobalMemoryBarrierSrcAccess;
>+    VkFlags mGlobalMemoryBarrierDstAccess;
>+
>+    // Command buffer notifications.
>+    CommandBufferOwner *mCommandBufferOwner;
>+};
>+
>+// This is a helper class for back-end objects used in Vk command buffers. It records a serial
>+// at command recording times indicating an order in the queue. We use Fences to detect when
>+// commands finish, and then release any unreferenced and deleted resources based on the stored
>+// queue serial in a special 'garbage' queue. Resources also track current read and write
>+// dependencies. Only one command buffer node can be writing to the Resource at a time, but many
>+// can be reading from it. Together the dependencies will form a command graph at submission time.
>+class CommandGraphResource : angle::NonCopyable
>+{
>+  public:
>+    virtual ~CommandGraphResource();
>+
>+    // Returns true if the resource is in use by the renderer.
>+    bool isResourceInUse(RendererVk *renderer) const;
>+
>+    // Get the current queue serial for this resource. Used to release resources, and for
>+    // queries, to know if the queue they are submitted on has finished execution.
>+    Serial getStoredQueueSerial() const { return mStoredQueueSerial; }
>+
>+    // Sets up dependency relations. 'this' resource is the resource being written to.
>+    void addWriteDependency(CommandGraphResource *writingResource);
>+
>+    // Sets up dependency relations. 'this' resource is the resource being read.
>+    void addReadDependency(CommandGraphResource *readingResource);
>+
>+    // Updates the in-use serial tracked for this resource. Will clear dependencies if the resource
>+    // was not used in this set of command nodes.
>+    ANGLE_INLINE void updateQueueSerial(Serial queueSerial)
>+    {
>+        ASSERT(queueSerial >= mStoredQueueSerial);
>+
>+        if (queueSerial > mStoredQueueSerial)
>+        {
>+            mCurrentWritingNode = nullptr;
>+            mCurrentReadingNodes.clear();
>+            mStoredQueueSerial = queueSerial;
>+        }
>+    }
>+
>+    // Allocates a write node via getNewWriteNode and returns a started command buffer.
>+    // The started command buffer will render outside of a RenderPass.
>+    // Will append to an existing command buffer/graph node if possible.
>+    angle::Result recordCommands(Context *context, CommandBuffer **commandBufferOut);
>+
>+    // Begins a command buffer on the current graph node for in-RenderPass rendering.
>+    // Called from FramebufferVk::startNewRenderPass and UtilsVk functions.
>+    angle::Result beginRenderPass(ContextVk *contextVk,
>+                                  const Framebuffer &framebuffer,
>+                                  const gl::Rectangle &renderArea,
>+                                  const RenderPassDesc &renderPassDesc,
>+                                  const AttachmentOpsArray &renderPassAttachmentOps,
>+                                  const std::vector<VkClearValue> &clearValues,
>+                                  CommandBuffer **commandBufferOut);
>+
>+    // Checks if we're in a RenderPass without children.
>+    bool hasStartedRenderPass() const
>+    {
>+        return hasChildlessWritingNode() &&
>+               mCurrentWritingNode->getInsideRenderPassCommands()->valid();
>+    }
>+
>+    // Checks if we're in a RenderPass that encompasses renderArea, returning true if so. Updates
>+    // serial internally. Returns the started command buffer in commandBufferOut.
>+    ANGLE_INLINE bool appendToStartedRenderPass(Serial currentQueueSerial,
>+                                                const gl::Rectangle &renderArea,
>+                                                CommandBuffer **commandBufferOut)
>+    {
>+        updateQueueSerial(currentQueueSerial);
>+        if (hasStartedRenderPass())
>+        {
>+            if (mCurrentWritingNode->getRenderPassRenderArea().encloses(renderArea))
>+            {
>+                *commandBufferOut = mCurrentWritingNode->getInsideRenderPassCommands();
>+                return true;
>+            }
>+        }
>+
>+        return false;
>+    }
>+
>+    // Returns true if the render pass is started, but there are no commands yet recorded in it.
>+    // This is useful to know if the render pass ops can be modified.
>+    bool renderPassStartedButEmpty() const
>+    {
>+        return hasStartedRenderPass() &&
>+               mCurrentWritingNode->getInsideRenderPassCommands()->empty();
>+    }
>+
>+    void clearRenderPassColorAttachment(size_t attachmentIndex, const VkClearColorValue &clearValue)
>+    {
>+        ASSERT(renderPassStartedButEmpty());
>+        mCurrentWritingNode->clearRenderPassColorAttachment(attachmentIndex, clearValue);
>+    }
>+
>+    void clearRenderPassDepthAttachment(size_t attachmentIndex, float depth)
>+    {
>+        ASSERT(renderPassStartedButEmpty());
>+        mCurrentWritingNode->clearRenderPassDepthAttachment(attachmentIndex, depth);
>+    }
>+
>+    void clearRenderPassStencilAttachment(size_t attachmentIndex, uint32_t stencil)
>+    {
>+        ASSERT(renderPassStartedButEmpty());
>+        mCurrentWritingNode->clearRenderPassStencilAttachment(attachmentIndex, stencil);
>+    }
>+
>+    // Accessor for RenderPass RenderArea.
>+    const gl::Rectangle &getRenderPassRenderArea() const
>+    {
>+        ASSERT(hasStartedRenderPass());
>+        return mCurrentWritingNode->getRenderPassRenderArea();
>+    }
>+
>+    // Called when 'this' object changes, but we'd like to start a new command buffer later.
>+    void finishCurrentCommands(RendererVk *renderer);
>+
>+    // Store a deferred memory barrier. Will be recorded into a primary command buffer at submit.
>+    void addGlobalMemoryBarrier(VkFlags srcAccess, VkFlags dstAccess)
>+    {
>+        ASSERT(mCurrentWritingNode);
>+        mCurrentWritingNode->addGlobalMemoryBarrier(srcAccess, dstAccess);
>+    }
>+
>+  protected:
>+    explicit CommandGraphResource(CommandGraphResourceType resourceType);
>+
>+  private:
>+    // Returns true if this node has a current writing node with no children.
>+    ANGLE_INLINE bool hasChildlessWritingNode() const
>+    {
>+        // Note: currently, we don't have a resource that can issue both generic and special
>+        // commands.  We don't create read/write dependencies between mixed generic/special
>+        // resources either.  As such, we expect the function to always be generic here.  If such a
>+        // resource is added in the future, this can add a check for function == generic and fail if
>+        // false.
>+        ASSERT(mCurrentWritingNode == nullptr ||
>+               mCurrentWritingNode->getFunction() == CommandGraphNodeFunction::Generic);
>+        return (mCurrentWritingNode != nullptr && !mCurrentWritingNode->hasChildren());
>+    }
>+
>+    void startNewCommands(RendererVk *renderer);
>+
>+    void onWriteImpl(CommandGraphNode *writingNode, Serial currentSerial);
>+
>+    Serial mStoredQueueSerial;
>+
>+    std::vector<CommandGraphNode *> mCurrentReadingNodes;
>+
>+    // Current command graph writing node.
>+    CommandGraphNode *mCurrentWritingNode;
>+
>+    // Additional diagnostic information.
>+    CommandGraphResourceType mResourceType;
>+};
>+
>+// Translating OpenGL commands into Vulkan and submitting them immediately loses out on some
>+// of the powerful flexiblity Vulkan offers in RenderPasses. Load/Store ops can automatically
>+// clear RenderPass attachments, or preserve the contents. RenderPass automatic layout transitions
>+// can improve certain performance cases. Also, we can remove redundant RenderPass Begin and Ends
>+// when processing interleaved draw operations on independent Framebuffers.
>+//
>+// ANGLE's CommandGraph (and CommandGraphNode) attempt to solve these problems using deferred
>+// command submission. We also sometimes call this command re-ordering. A brief summary:
>+//
>+// During GL command processing, we record Vulkan commands into SecondaryCommandBuffers, which
>+// are stored in CommandGraphNodes, and these nodes are chained together via dependencies to
>+// form a directed acyclic CommandGraph. When we need to submit the CommandGraph, say during a
>+// SwapBuffers or ReadPixels call, we begin a primary Vulkan CommandBuffer, and walk the
>+// CommandGraph, starting at the most senior nodes, recording SecondaryCommandBuffers inside
>+// and outside RenderPasses as necessary, filled with the right load/store operations. Once
>+// the primary CommandBuffer has recorded all of the SecondaryCommandBuffers from all the open
>+// CommandGraphNodes, we submit the primary CommandBuffer to the VkQueue on the device.
>+//
>+// The Command Graph consists of an array of open Command Graph Nodes. It supports allocating new
>+// nodes for the graph, which are linked via dependency relation calls in CommandGraphNode, and
>+// also submitting the whole command graph via submitCommands.
>+class CommandGraph final : angle::NonCopyable
>+{
>+  public:
>+    explicit CommandGraph(bool enableGraphDiagnostics, angle::PoolAllocator *poolAllocator);
>+    ~CommandGraph();
>+
>+    // Allocates a new CommandGraphNode and adds it to the list of current open nodes. No ordering
>+    // relations exist in the node by default. Call CommandGraphNode::SetHappensBeforeDependency
>+    // to set up dependency relations. If the node is a barrier, it will automatically add
>+    // dependencies between the previous barrier, the new barrier and all nodes in between.
>+    CommandGraphNode *allocateNode(CommandGraphNodeFunction function);
>+
>+    angle::Result submitCommands(Context *context,
>+                                 Serial serial,
>+                                 RenderPassCache *renderPassCache,
>+                                 CommandPool *commandPool,
>+                                 PrimaryCommandBuffer *primaryCommandBufferOut);
>+    bool empty() const;
>+    void clear();
>+
>+    // The following create special-function nodes that don't require a graph resource.
>+    // Queries:
>+    void beginQuery(const QueryPool *queryPool, uint32_t queryIndex);
>+    void endQuery(const QueryPool *queryPool, uint32_t queryIndex);
>+    void writeTimestamp(const QueryPool *queryPool, uint32_t queryIndex);
>+    // GLsync and EGLSync:
>+    void setFenceSync(const vk::Event &event);
>+    void waitFenceSync(const vk::Event &event);
>+    // Debug markers:
>+    void insertDebugMarker(GLenum source, std::string &&marker);
>+    void pushDebugMarker(GLenum source, std::string &&marker);
>+    void popDebugMarker();
>+
>+  private:
>+    CommandGraphNode *allocateBarrierNode(CommandGraphNodeFunction function,
>+                                          CommandGraphResourceType resourceType,
>+                                          uintptr_t resourceID);
>+    void setNewBarrier(CommandGraphNode *newBarrier);
>+    CommandGraphNode *getLastBarrierNode(size_t *indexOut);
>+    void addDependenciesToNextBarrier(size_t begin, size_t end, CommandGraphNode *nextBarrier);
>+
>+    void dumpGraphDotFile(std::ostream &out) const;
>+
>+    std::vector<CommandGraphNode *> mNodes;
>+    bool mEnableGraphDiagnostics;
>+    angle::PoolAllocator *mPoolAllocator;
>+
>+    // A set of nodes (eventually) exist that act as barriers to guarantee submission order.  For
>+    // example, a glMemoryBarrier() calls would lead to such a barrier or beginning and ending a
>+    // query. This is because the graph can reorder operations if it sees fit.  Let's call a barrier
>+    // node Bi, and the other nodes Ni. The edges between Ni don't interest us.  Before a barrier is
>+    // inserted, we have:
>+    //
>+    // N0 N1 ... Na
>+    // \___\__/_/     (dependency egdes, which we don't care about so I'll stop drawing them.
>+    //      \/
>+    //
>+    // When the first barrier is inserted, we will have:
>+    //
>+    //     ______
>+    //    /  ____\
>+    //   /  /     \
>+    //  /  /      /\
>+    // N0 N1 ... Na B0
>+    //
>+    // This makes sure all N0..Na are called before B0.  From then on, B0 will be the current
>+    // "barrier point" which extends an edge to every next node:
>+    //
>+    //     ______
>+    //    /  ____\
>+    //   /  /     \
>+    //  /  /      /\
>+    // N0 N1 ... Na B0 Na+1 ... Nb
>+    //                \/       /
>+    //                 \______/
>+    //
>+    //
>+    // When the next barrier B1 is met, all nodes between B0 and B1 will add a depenency on B1 as
>+    // well, and the "barrier point" is updated.
>+    //
>+    //     ______
>+    //    /  ____\         ______         ______
>+    //   /  /     \       /      \       /      \
>+    //  /  /      /\     /       /\     /       /\
>+    // N0 N1 ... Na B0 Na+1 ... Nb B1 Nb+1 ... Nc B2 ...
>+    //                \/       /  /  \/       /  /
>+    //                 \______/  /    \______/  /
>+    //                  \_______/      \_______/
>+    //
>+    //
>+    // When barrier Bi is introduced, all nodes added since Bi-1 need to add a dependency to Bi
>+    // (including Bi-1). We therefore keep track of the node index of the last barrier that was
>+    // issued.
>+    static constexpr size_t kInvalidNodeIndex = std::numeric_limits<std::size_t>::max();
>+    size_t mLastBarrierIndex;
>+};
>+}  // namespace vk
>+}  // namespace rx
>+
>+#endif  // LIBANGLE_RENDERER_VULKAN_COMMAND_GRAPH_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/CompilerVk.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/CompilerVk.cpp
>index f781c070b09..632e309ef17 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/CompilerVk.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/CompilerVk.cpp
>@@ -14,18 +14,9 @@
> namespace rx
> {
> 
>-CompilerVk::CompilerVk() : CompilerImpl()
>-{
>-}
>+CompilerVk::CompilerVk() : CompilerImpl() {}
> 
>-CompilerVk::~CompilerVk()
>-{
>-}
>-
>-gl::Error CompilerVk::release()
>-{
>-    return gl::NoError();
>-}
>+CompilerVk::~CompilerVk() {}
> 
> ShShaderOutput CompilerVk::getTranslatorOutputType() const
> {
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/CompilerVk.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/CompilerVk.h
>index 2246a2711fc..8f8eabb2b00 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/CompilerVk.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/CompilerVk.h
>@@ -21,8 +21,6 @@ class CompilerVk : public CompilerImpl
>     CompilerVk();
>     ~CompilerVk() override;
> 
>-    gl::Error release() override;
>-
>     // TODO(jmadill): Expose translator built-in resources init method.
>     ShShaderOutput getTranslatorOutputType() const override;
> };
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/ContextVk.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/ContextVk.cpp
>index 8836ee7b0d1..a973c2b91f5 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/ContextVk.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/ContextVk.cpp
>@@ -11,15 +11,16 @@
> 
> #include "common/bitset_utils.h"
> #include "common/debug.h"
>+#include "common/utilities.h"
> #include "libANGLE/Context.h"
> #include "libANGLE/Program.h"
>+#include "libANGLE/Surface.h"
> #include "libANGLE/renderer/vulkan/BufferVk.h"
>+#include "libANGLE/renderer/vulkan/CommandGraph.h"
> #include "libANGLE/renderer/vulkan/CompilerVk.h"
>-#include "libANGLE/renderer/vulkan/ContextVk.h"
>-#include "libANGLE/renderer/vulkan/DeviceVk.h"
> #include "libANGLE/renderer/vulkan/FenceNVVk.h"
> #include "libANGLE/renderer/vulkan/FramebufferVk.h"
>-#include "libANGLE/renderer/vulkan/ImageVk.h"
>+#include "libANGLE/renderer/vulkan/MemoryObjectVk.h"
> #include "libANGLE/renderer/vulkan/ProgramPipelineVk.h"
> #include "libANGLE/renderer/vulkan/ProgramVk.h"
> #include "libANGLE/renderer/vulkan/QueryVk.h"
>@@ -27,454 +28,582 @@
> #include "libANGLE/renderer/vulkan/RendererVk.h"
> #include "libANGLE/renderer/vulkan/SamplerVk.h"
> #include "libANGLE/renderer/vulkan/ShaderVk.h"
>+#include "libANGLE/renderer/vulkan/SurfaceVk.h"
> #include "libANGLE/renderer/vulkan/SyncVk.h"
> #include "libANGLE/renderer/vulkan/TextureVk.h"
> #include "libANGLE/renderer/vulkan/TransformFeedbackVk.h"
> #include "libANGLE/renderer/vulkan/VertexArrayVk.h"
>-#include "libANGLE/renderer/vulkan/formatutilsvk.h"
>+
>+#include "third_party/trace_event/trace_event.h"
> 
> namespace rx
> {
> 
> namespace
> {
>-
>-VkIndexType GetVkIndexType(GLenum glIndexType)
>+GLenum DefaultGLErrorCode(VkResult result)
> {
>-    switch (glIndexType)
>+    switch (result)
>     {
>-        case GL_UNSIGNED_SHORT:
>-            return VK_INDEX_TYPE_UINT16;
>-        case GL_UNSIGNED_INT:
>-            return VK_INDEX_TYPE_UINT32;
>+        case VK_ERROR_OUT_OF_HOST_MEMORY:
>+        case VK_ERROR_OUT_OF_DEVICE_MEMORY:
>+        case VK_ERROR_TOO_MANY_OBJECTS:
>+            return GL_OUT_OF_MEMORY;
>         default:
>-            UNREACHABLE();
>-            return VK_INDEX_TYPE_MAX_ENUM;
>+            return GL_INVALID_OPERATION;
>     }
> }
> 
>-enum DescriptorPoolIndex : uint8_t
>-{
>-    UniformBufferPool = 0,
>-    TexturePool       = 1,
>-};
>+constexpr VkColorComponentFlags kAllColorChannelsMask =
>+    (VK_COLOR_COMPONENT_R_BIT | VK_COLOR_COMPONENT_G_BIT | VK_COLOR_COMPONENT_B_BIT |
>+     VK_COLOR_COMPONENT_A_BIT);
> 
>+constexpr VkBufferUsageFlags kVertexBufferUsage = VK_BUFFER_USAGE_VERTEX_BUFFER_BIT;
>+constexpr size_t kDefaultValueSize              = sizeof(float) * 4;
>+constexpr size_t kDefaultBufferSize             = kDefaultValueSize * 16;
> }  // anonymous namespace
> 
>-ContextVk::ContextVk(const gl::ContextState &state, RendererVk *renderer)
>-    : ContextImpl(state), mRenderer(renderer), mCurrentDrawMode(GL_NONE)
>-{
>-    // The module handle is filled out at draw time.
>-    mCurrentShaderStages[0].sType  = VK_STRUCTURE_TYPE_PIPELINE_SHADER_STAGE_CREATE_INFO;
>-    mCurrentShaderStages[0].pNext  = nullptr;
>-    mCurrentShaderStages[0].flags  = 0;
>-    mCurrentShaderStages[0].stage  = VK_SHADER_STAGE_VERTEX_BIT;
>-    mCurrentShaderStages[0].module = VK_NULL_HANDLE;
>-    mCurrentShaderStages[0].pName  = "main";
>-    mCurrentShaderStages[0].pSpecializationInfo = nullptr;
>-
>-    mCurrentShaderStages[1].sType  = VK_STRUCTURE_TYPE_PIPELINE_SHADER_STAGE_CREATE_INFO;
>-    mCurrentShaderStages[1].pNext  = nullptr;
>-    mCurrentShaderStages[1].flags  = 0;
>-    mCurrentShaderStages[1].stage  = VK_SHADER_STAGE_FRAGMENT_BIT;
>-    mCurrentShaderStages[1].module = VK_NULL_HANDLE;
>-    mCurrentShaderStages[1].pName  = "main";
>-    mCurrentShaderStages[1].pSpecializationInfo = nullptr;
>-
>-    // The binding descriptions are filled in at draw time.
>-    mCurrentVertexInputState.sType = VK_STRUCTURE_TYPE_PIPELINE_VERTEX_INPUT_STATE_CREATE_INFO;
>-    mCurrentVertexInputState.pNext = nullptr;
>-    mCurrentVertexInputState.flags = 0;
>-    mCurrentVertexInputState.vertexBindingDescriptionCount   = 0;
>-    mCurrentVertexInputState.pVertexBindingDescriptions      = nullptr;
>-    mCurrentVertexInputState.vertexAttributeDescriptionCount = 0;
>-    mCurrentVertexInputState.pVertexAttributeDescriptions    = nullptr;
>-
>-    // Primitive topology is filled in at draw time.
>-    mCurrentInputAssemblyState.sType = VK_STRUCTURE_TYPE_PIPELINE_INPUT_ASSEMBLY_STATE_CREATE_INFO;
>-    mCurrentInputAssemblyState.pNext = nullptr;
>-    mCurrentInputAssemblyState.flags = 0;
>-    mCurrentInputAssemblyState.topology = gl_vk::GetPrimitiveTopology(mCurrentDrawMode);
>-    mCurrentInputAssemblyState.primitiveRestartEnable = VK_FALSE;
>-
>-    // Set initial viewport and scissor state.
>-    mCurrentViewportVk.x        = 0.0f;
>-    mCurrentViewportVk.y        = 0.0f;
>-    mCurrentViewportVk.width    = 0.0f;
>-    mCurrentViewportVk.height   = 0.0f;
>-    mCurrentViewportVk.minDepth = 0.0f;
>-    mCurrentViewportVk.maxDepth = 1.0f;
>-
>-    mCurrentScissorVk.offset.x      = 0;
>-    mCurrentScissorVk.offset.y      = 0;
>-    mCurrentScissorVk.extent.width  = 0u;
>-    mCurrentScissorVk.extent.height = 0u;
>-
>-    mCurrentViewportState.sType         = VK_STRUCTURE_TYPE_PIPELINE_VIEWPORT_STATE_CREATE_INFO;
>-    mCurrentViewportState.pNext         = nullptr;
>-    mCurrentViewportState.flags         = 0;
>-    mCurrentViewportState.viewportCount = 1;
>-    mCurrentViewportState.pViewports    = &mCurrentViewportVk;
>-    mCurrentViewportState.scissorCount  = 1;
>-    mCurrentViewportState.pScissors     = &mCurrentScissorVk;
>-
>-    // Set initial rasterizer state.
>-    // TODO(jmadill): Extra rasterizer state features.
>-    mCurrentRasterState.sType = VK_STRUCTURE_TYPE_PIPELINE_RASTERIZATION_STATE_CREATE_INFO;
>-    mCurrentRasterState.pNext = nullptr;
>-    mCurrentRasterState.flags = 0;
>-    mCurrentRasterState.depthClampEnable        = VK_FALSE;
>-    mCurrentRasterState.rasterizerDiscardEnable = VK_FALSE;
>-    mCurrentRasterState.polygonMode             = VK_POLYGON_MODE_FILL;
>-    mCurrentRasterState.cullMode                = VK_CULL_MODE_NONE;
>-    mCurrentRasterState.frontFace               = VK_FRONT_FACE_COUNTER_CLOCKWISE;
>-    mCurrentRasterState.depthBiasEnable         = VK_FALSE;
>-    mCurrentRasterState.depthBiasConstantFactor = 0.0f;
>-    mCurrentRasterState.depthBiasClamp          = 0.0f;
>-    mCurrentRasterState.depthBiasSlopeFactor    = 0.0f;
>-    mCurrentRasterState.lineWidth               = 1.0f;
>-
>-    // Initialize a dummy multisample state.
>-    // TODO(jmadill): Multisample state.
>-    mCurrentMultisampleState.sType = VK_STRUCTURE_TYPE_PIPELINE_MULTISAMPLE_STATE_CREATE_INFO;
>-    mCurrentMultisampleState.pNext = nullptr;
>-    mCurrentMultisampleState.flags = 0;
>-    mCurrentMultisampleState.rasterizationSamples  = VK_SAMPLE_COUNT_1_BIT;
>-    mCurrentMultisampleState.sampleShadingEnable   = VK_FALSE;
>-    mCurrentMultisampleState.minSampleShading      = 0.0f;
>-    mCurrentMultisampleState.pSampleMask           = nullptr;
>-    mCurrentMultisampleState.alphaToCoverageEnable = VK_FALSE;
>-    mCurrentMultisampleState.alphaToOneEnable      = VK_FALSE;
>-
>-    // TODO(jmadill): Depth/stencil state.
>-
>-    // Initialize a dummy MRT blend state.
>-    // TODO(jmadill): Blend state/MRT.
>-    mCurrentBlendAttachmentState.blendEnable         = VK_FALSE;
>-    mCurrentBlendAttachmentState.srcColorBlendFactor = VK_BLEND_FACTOR_ONE;
>-    mCurrentBlendAttachmentState.dstColorBlendFactor = VK_BLEND_FACTOR_ONE;
>-    mCurrentBlendAttachmentState.colorBlendOp        = VK_BLEND_OP_ADD;
>-    mCurrentBlendAttachmentState.srcAlphaBlendFactor = VK_BLEND_FACTOR_ONE;
>-    mCurrentBlendAttachmentState.dstAlphaBlendFactor = VK_BLEND_FACTOR_ONE;
>-    mCurrentBlendAttachmentState.alphaBlendOp        = VK_BLEND_OP_ADD;
>-    mCurrentBlendAttachmentState.colorWriteMask =
>-        (VK_COLOR_COMPONENT_R_BIT | VK_COLOR_COMPONENT_G_BIT | VK_COLOR_COMPONENT_B_BIT |
>-         VK_COLOR_COMPONENT_A_BIT);
>-
>-    mCurrentBlendState.sType             = VK_STRUCTURE_TYPE_PIPELINE_COLOR_BLEND_STATE_CREATE_INFO;
>-    mCurrentBlendState.pNext             = 0;
>-    mCurrentBlendState.flags             = 0;
>-    mCurrentBlendState.logicOpEnable     = VK_FALSE;
>-    mCurrentBlendState.logicOp           = VK_LOGIC_OP_CLEAR;
>-    mCurrentBlendState.attachmentCount   = 1;
>-    mCurrentBlendState.pAttachments      = &mCurrentBlendAttachmentState;
>-    mCurrentBlendState.blendConstants[0] = 0.0f;
>-    mCurrentBlendState.blendConstants[1] = 0.0f;
>-    mCurrentBlendState.blendConstants[2] = 0.0f;
>-    mCurrentBlendState.blendConstants[3] = 0.0f;
>-
>-    // TODO(jmadill): Dynamic state.
>-
>-    // The layout and renderpass are filled out at draw time.
>-    mCurrentPipelineInfo.sType               = VK_STRUCTURE_TYPE_GRAPHICS_PIPELINE_CREATE_INFO;
>-    mCurrentPipelineInfo.pNext               = nullptr;
>-    mCurrentPipelineInfo.flags               = 0;
>-    mCurrentPipelineInfo.stageCount          = 2;
>-    mCurrentPipelineInfo.pStages             = mCurrentShaderStages;
>-    mCurrentPipelineInfo.pVertexInputState   = &mCurrentVertexInputState;
>-    mCurrentPipelineInfo.pInputAssemblyState = &mCurrentInputAssemblyState;
>-    mCurrentPipelineInfo.pTessellationState  = nullptr;
>-    mCurrentPipelineInfo.pViewportState      = &mCurrentViewportState;
>-    mCurrentPipelineInfo.pRasterizationState = &mCurrentRasterState;
>-    mCurrentPipelineInfo.pMultisampleState   = &mCurrentMultisampleState;
>-    mCurrentPipelineInfo.pDepthStencilState  = nullptr;
>-    mCurrentPipelineInfo.pColorBlendState    = &mCurrentBlendState;
>-    mCurrentPipelineInfo.pDynamicState       = nullptr;
>-    mCurrentPipelineInfo.layout              = VK_NULL_HANDLE;
>-    mCurrentPipelineInfo.renderPass          = VK_NULL_HANDLE;
>-    mCurrentPipelineInfo.subpass             = 0;
>-    mCurrentPipelineInfo.basePipelineHandle  = VK_NULL_HANDLE;
>-    mCurrentPipelineInfo.basePipelineIndex   = 0;
>-}
>-
>-ContextVk::~ContextVk()
>+// std::array only uses aggregate init. Thus we make a helper macro to reduce on code duplication.
>+#define INIT                                         \
>+    {                                                \
>+        kVertexBufferUsage, kDefaultBufferSize, true \
>+    }
>+
>+ContextVk::ContextVk(const gl::State &state, gl::ErrorSet *errorSet, RendererVk *renderer)
>+    : ContextImpl(state, errorSet),
>+      vk::Context(renderer),
>+      mCurrentPipeline(nullptr),
>+      mCurrentDrawMode(gl::PrimitiveMode::InvalidEnum),
>+      mCurrentWindowSurface(nullptr),
>+      mVertexArray(nullptr),
>+      mDrawFramebuffer(nullptr),
>+      mProgram(nullptr),
>+      mLastIndexBufferOffset(0),
>+      mCurrentDrawElementsType(gl::DrawElementsType::InvalidEnum),
>+      mClearColorMask(kAllColorChannelsMask),
>+      mFlipYForCurrentSurface(false),
>+      mDriverUniformsBuffer(VK_BUFFER_USAGE_UNIFORM_BUFFER_BIT, sizeof(DriverUniforms) * 16, true),
>+      mDriverUniformsDescriptorSet(VK_NULL_HANDLE),
>+      mDefaultAttribBuffers{{INIT, INIT, INIT, INIT, INIT, INIT, INIT, INIT, INIT, INIT, INIT, INIT,
>+                             INIT, INIT, INIT, INIT}}
> {
>-    invalidateCurrentPipeline();
>+    TRACE_EVENT0("gpu.angle", "ContextVk::ContextVk");
>+    memset(&mClearColorValue, 0, sizeof(mClearColorValue));
>+    memset(&mClearDepthStencilValue, 0, sizeof(mClearDepthStencilValue));
>+
>+    mNonIndexedDirtyBitsMask.set();
>+    mNonIndexedDirtyBitsMask.reset(DIRTY_BIT_INDEX_BUFFER);
>+
>+    mIndexedDirtyBitsMask.set();
>+
>+    mNewCommandBufferDirtyBits.set(DIRTY_BIT_PIPELINE);
>+    mNewCommandBufferDirtyBits.set(DIRTY_BIT_TEXTURES);
>+    mNewCommandBufferDirtyBits.set(DIRTY_BIT_VERTEX_BUFFERS);
>+    mNewCommandBufferDirtyBits.set(DIRTY_BIT_INDEX_BUFFER);
>+    mNewCommandBufferDirtyBits.set(DIRTY_BIT_DESCRIPTOR_SETS);
>+
>+    mDirtyBitHandlers[DIRTY_BIT_DEFAULT_ATTRIBS] = &ContextVk::handleDirtyDefaultAttribs;
>+    mDirtyBitHandlers[DIRTY_BIT_PIPELINE]        = &ContextVk::handleDirtyPipeline;
>+    mDirtyBitHandlers[DIRTY_BIT_TEXTURES]        = &ContextVk::handleDirtyTextures;
>+    mDirtyBitHandlers[DIRTY_BIT_VERTEX_BUFFERS]  = &ContextVk::handleDirtyVertexBuffers;
>+    mDirtyBitHandlers[DIRTY_BIT_INDEX_BUFFER]    = &ContextVk::handleDirtyIndexBuffer;
>+    mDirtyBitHandlers[DIRTY_BIT_DRIVER_UNIFORMS] = &ContextVk::handleDirtyDriverUniforms;
>+    mDirtyBitHandlers[DIRTY_BIT_DESCRIPTOR_SETS] = &ContextVk::handleDirtyDescriptorSets;
>+
>+    mDirtyBits = mNewCommandBufferDirtyBits;
> }
> 
>+#undef INIT
>+
>+ContextVk::~ContextVk() = default;
>+
> void ContextVk::onDestroy(const gl::Context *context)
> {
>-    VkDevice device = mRenderer->getDevice();
>+    // Force a flush on destroy.
>+    (void)finishImpl();
> 
>-    mDescriptorPool.destroy(device);
>+    mDriverUniformsSetLayout.reset();
>+    mIncompleteTextures.onDestroy(context);
>+    mDriverUniformsBuffer.destroy(getDevice());
>+    mDriverUniformsDescriptorPoolBinding.reset();
>+
>+    for (vk::DynamicDescriptorPool &descriptorPool : mDynamicDescriptorPools)
>+    {
>+        descriptorPool.destroy(getDevice());
>+    }
>+
>+    for (vk::DynamicBuffer &defaultBuffer : mDefaultAttribBuffers)
>+    {
>+        defaultBuffer.destroy(getDevice());
>+    }
>+
>+    for (vk::DynamicQueryPool &queryPool : mQueryPools)
>+    {
>+        queryPool.destroy(getDevice());
>+    }
> }
> 
>-gl::Error ContextVk::initialize()
>+angle::Result ContextVk::getIncompleteTexture(const gl::Context *context,
>+                                              gl::TextureType type,
>+                                              gl::Texture **textureOut)
> {
>-    VkDevice device = mRenderer->getDevice();
>-
>-    VkDescriptorPoolSize poolSizes[2];
>-    poolSizes[UniformBufferPool].type            = VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER;
>-    poolSizes[UniformBufferPool].descriptorCount = 1024;
>-    poolSizes[TexturePool].type                  = VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER;
>-    poolSizes[TexturePool].descriptorCount       = 1024;
>+    // At some point, we'll need to support multisample and we'll pass "this" instead of nullptr
>+    // and implement the necessary interface.
>+    return mIncompleteTextures.getIncompleteTexture(context, type, nullptr, textureOut);
>+}
> 
>-    VkDescriptorPoolCreateInfo descriptorPoolInfo;
>-    descriptorPoolInfo.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_POOL_CREATE_INFO;
>-    descriptorPoolInfo.pNext = nullptr;
>-    descriptorPoolInfo.flags = 0;
>+angle::Result ContextVk::initialize()
>+{
>+    TRACE_EVENT0("gpu.angle", "ContextVk::initialize");
>+    // Note that this may reserve more sets than strictly necessary for a particular layout.
>+    VkDescriptorPoolSize uniformSetSize = {VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER_DYNAMIC,
>+                                           GetUniformBufferDescriptorCount()};
>+    VkDescriptorPoolSize textureSetSize = {VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER,
>+                                           mRenderer->getMaxActiveTextures()};
>+    VkDescriptorPoolSize driverSetSize  = {VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER, 1};
>+    ANGLE_TRY(mDynamicDescriptorPools[kUniformsDescriptorSetIndex].init(this, &uniformSetSize, 1));
>+    ANGLE_TRY(mDynamicDescriptorPools[kTextureDescriptorSetIndex].init(this, &textureSetSize, 1));
>+    ANGLE_TRY(
>+        mDynamicDescriptorPools[kDriverUniformsDescriptorSetIndex].init(this, &driverSetSize, 1));
>+
>+    ANGLE_TRY(mQueryPools[gl::QueryType::AnySamples].init(this, VK_QUERY_TYPE_OCCLUSION,
>+                                                          vk::kDefaultOcclusionQueryPoolSize));
>+    ANGLE_TRY(mQueryPools[gl::QueryType::AnySamplesConservative].init(
>+        this, VK_QUERY_TYPE_OCCLUSION, vk::kDefaultOcclusionQueryPoolSize));
>+    ANGLE_TRY(mQueryPools[gl::QueryType::Timestamp].init(this, VK_QUERY_TYPE_TIMESTAMP,
>+                                                         vk::kDefaultTimestampQueryPoolSize));
>+    ANGLE_TRY(mQueryPools[gl::QueryType::TimeElapsed].init(this, VK_QUERY_TYPE_TIMESTAMP,
>+                                                           vk::kDefaultTimestampQueryPoolSize));
>+
>+    size_t minAlignment = static_cast<size_t>(
>+        mRenderer->getPhysicalDeviceProperties().limits.minUniformBufferOffsetAlignment);
>+    mDriverUniformsBuffer.init(minAlignment, mRenderer);
>+
>+    mGraphicsPipelineDesc.reset(new vk::GraphicsPipelineDesc());
>+    mGraphicsPipelineDesc->initDefaults();
>+
>+    // Initialize current value/default attribute buffers.
>+    for (vk::DynamicBuffer &buffer : mDefaultAttribBuffers)
>+    {
>+        buffer.init(1, mRenderer);
>+    }
> 
>-    // TODO(jmadill): Pick non-arbitrary max.
>-    descriptorPoolInfo.maxSets = 2048;
>+    return angle::Result::Continue;
>+}
> 
>-    // Reserve pools for uniform blocks and textures.
>-    descriptorPoolInfo.poolSizeCount = 2;
>-    descriptorPoolInfo.pPoolSizes    = poolSizes;
>+angle::Result ContextVk::flush(const gl::Context *context)
>+{
>+    return flushImpl();
>+}
> 
>-    ANGLE_TRY(mDescriptorPool.init(device, descriptorPoolInfo));
>+angle::Result ContextVk::flushImpl()
>+{
>+    const vk::Semaphore *waitSemaphore   = nullptr;
>+    const vk::Semaphore *signalSemaphore = nullptr;
>+    if (mCurrentWindowSurface && !mRenderer->getCommandGraph()->empty())
>+    {
>+        ANGLE_TRY(mCurrentWindowSurface->generateSemaphoresForFlush(this, &waitSemaphore,
>+                                                                    &signalSemaphore));
>+    }
> 
>-    return gl::NoError();
>+    return mRenderer->flush(this, waitSemaphore, signalSemaphore);
> }
> 
>-gl::Error ContextVk::flush(const gl::Context *context)
>+angle::Result ContextVk::finish(const gl::Context *context)
> {
>-    UNIMPLEMENTED();
>-    return gl::InternalError();
>+    return finishImpl();
> }
> 
>-gl::Error ContextVk::finish(const gl::Context *context)
>+angle::Result ContextVk::finishImpl()
> {
>-    // TODO(jmadill): Implement finish.
>-    // UNIMPLEMENTED();
>-    return gl::NoError();
>+    const vk::Semaphore *waitSemaphore   = nullptr;
>+    const vk::Semaphore *signalSemaphore = nullptr;
>+    if (mCurrentWindowSurface && !mRenderer->getCommandGraph()->empty())
>+    {
>+        ANGLE_TRY(mCurrentWindowSurface->generateSemaphoresForFlush(this, &waitSemaphore,
>+                                                                    &signalSemaphore));
>+    }
>+
>+    return mRenderer->finish(this, waitSemaphore, signalSemaphore);
> }
> 
>-gl::Error ContextVk::initPipeline(const gl::Context *context)
>+angle::Result ContextVk::setupDraw(const gl::Context *context,
>+                                   gl::PrimitiveMode mode,
>+                                   GLint firstVertex,
>+                                   GLsizei vertexOrIndexCount,
>+                                   GLsizei instanceCount,
>+                                   gl::DrawElementsType indexTypeOrNone,
>+                                   const void *indices,
>+                                   DirtyBits dirtyBitMask,
>+                                   vk::CommandBuffer **commandBufferOut)
> {
>-    ASSERT(!mCurrentPipeline.valid());
>+    // Set any dirty bits that depend on draw call parameters or other objects.
>+    if (mode != mCurrentDrawMode)
>+    {
>+        invalidateCurrentPipeline();
>+        mCurrentDrawMode = mode;
>+        mGraphicsPipelineDesc->updateTopology(&mGraphicsPipelineTransition, mCurrentDrawMode);
>+    }
> 
>-    VkDevice device       = mRenderer->getDevice();
>-    const auto &state     = mState.getState();
>-    const gl::Program *programGL   = state.getProgram();
>-    const gl::VertexArray *vao     = state.getVertexArray();
>-    const gl::Framebuffer *drawFBO = state.getDrawFramebuffer();
>-    ProgramVk *programVk  = vk::GetImpl(programGL);
>-    FramebufferVk *vkFBO  = vk::GetImpl(drawFBO);
>-    VertexArrayVk *vkVAO  = vk::GetImpl(vao);
>+    // Must be called before the command buffer is started. Can call finish.
>+    if (context->getStateCache().hasAnyActiveClientAttrib())
>+    {
>+        ANGLE_TRY(mVertexArray->updateClientAttribs(context, firstVertex, vertexOrIndexCount,
>+                                                    instanceCount, indexTypeOrNone, indices));
>+        mDirtyBits.set(DIRTY_BIT_VERTEX_BUFFERS);
>+    }
> 
>-    // Ensure the attribs and bindings are updated.
>-    vkVAO->updateVertexDescriptions(context);
>+    // This could be improved using a dirty bit. But currently it's slower to use a handler
>+    // function than an inlined if. We should probably replace the dirty bit dispatch table
>+    // with a switch with inlined handler functions.
>+    // TODO(jmadill): Use dirty bit. http://anglebug.com/3014
>+    if (!mCommandBuffer)
>+    {
>+        mDirtyBits |= mNewCommandBufferDirtyBits;
> 
>-    const auto &vertexBindings = vkVAO->getVertexBindingDescs();
>-    const auto &vertexAttribs  = vkVAO->getVertexAttribDescs();
>+        gl::Rectangle scissoredRenderArea = mDrawFramebuffer->getScissoredRenderArea(this);
>+        if (!mDrawFramebuffer->appendToStartedRenderPass(mRenderer->getCurrentQueueSerial(),
>+                                                         scissoredRenderArea, &mCommandBuffer))
>+        {
>+            ANGLE_TRY(
>+                mDrawFramebuffer->startNewRenderPass(this, scissoredRenderArea, &mCommandBuffer));
>+        }
>+    }
> 
>-    // TODO(jmadill): Validate with ASSERT against physical device limits/caps?
>-    mCurrentVertexInputState.vertexBindingDescriptionCount =
>-        static_cast<uint32_t>(vertexBindings.size());
>-    mCurrentVertexInputState.pVertexBindingDescriptions = vertexBindings.data();
>-    mCurrentVertexInputState.vertexAttributeDescriptionCount =
>-        static_cast<uint32_t>(vertexAttribs.size());
>-    mCurrentVertexInputState.pVertexAttributeDescriptions = vertexAttribs.data();
>+    // We keep a local copy of the command buffer. It's possible that some state changes could
>+    // trigger a command buffer invalidation. The local copy ensures we retain the reference.
>+    // Command buffers are pool allocated and only deleted after submit. Thus we know the
>+    // command buffer will still be valid for the duration of this API call.
>+    *commandBufferOut = mCommandBuffer;
>+    ASSERT(*commandBufferOut);
> 
>-    mCurrentInputAssemblyState.topology = gl_vk::GetPrimitiveTopology(mCurrentDrawMode);
>+    if (mProgram->dirtyUniforms())
>+    {
>+        ANGLE_TRY(mProgram->updateUniforms(this));
>+        mDirtyBits.set(DIRTY_BIT_DESCRIPTOR_SETS);
>+    }
> 
>-    vk::RenderPass *renderPass = nullptr;
>-    ANGLE_TRY_RESULT(vkFBO->getRenderPass(context, device), renderPass);
>-    ASSERT(renderPass && renderPass->valid());
>+    DirtyBits dirtyBits = mDirtyBits & dirtyBitMask;
> 
>-    const vk::PipelineLayout &pipelineLayout = programVk->getPipelineLayout();
>-    ASSERT(pipelineLayout.valid());
>+    if (dirtyBits.none())
>+        return angle::Result::Continue;
> 
>-    mCurrentPipelineInfo.layout     = pipelineLayout.getHandle();
>-    mCurrentPipelineInfo.renderPass = renderPass->getHandle();
>+    // Flush any relevant dirty bits.
>+    for (size_t dirtyBit : dirtyBits)
>+    {
>+        ANGLE_TRY((this->*mDirtyBitHandlers[dirtyBit])(context, *commandBufferOut));
>+    }
> 
>-    ANGLE_TRY(mCurrentPipeline.initGraphics(device, mCurrentPipelineInfo));
>+    mDirtyBits &= ~dirtyBitMask;
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error ContextVk::setupDraw(const gl::Context *context, GLenum mode)
>+angle::Result ContextVk::setupIndexedDraw(const gl::Context *context,
>+                                          gl::PrimitiveMode mode,
>+                                          GLsizei indexCount,
>+                                          GLsizei instanceCount,
>+                                          gl::DrawElementsType indexType,
>+                                          const void *indices,
>+                                          vk::CommandBuffer **commandBufferOut)
> {
>-    if (mode != mCurrentDrawMode)
>+    if (indexType != mCurrentDrawElementsType)
>     {
>-        invalidateCurrentPipeline();
>-        mCurrentDrawMode = mode;
>+        mDirtyBits.set(DIRTY_BIT_INDEX_BUFFER);
>+        mCurrentDrawElementsType = indexType;
>     }
> 
>-    if (!mCurrentPipeline.valid())
>+    const gl::Buffer *elementArrayBuffer = mVertexArray->getState().getElementArrayBuffer();
>+    if (!elementArrayBuffer)
>     {
>-        ANGLE_TRY(initPipeline(context));
>-        ASSERT(mCurrentPipeline.valid());
>+        mDirtyBits.set(DIRTY_BIT_INDEX_BUFFER);
>+        ANGLE_TRY(mVertexArray->updateIndexTranslation(this, indexCount, indexType, indices));
>     }
>+    else
>+    {
>+        if (indices != mLastIndexBufferOffset)
>+        {
>+            mDirtyBits.set(DIRTY_BIT_INDEX_BUFFER);
>+            mLastIndexBufferOffset = indices;
>+            mVertexArray->updateCurrentElementArrayBufferOffset(mLastIndexBufferOffset);
>+        }
> 
>-    const auto &state     = mState.getState();
>-    const gl::Program *programGL = state.getProgram();
>-    ProgramVk *programVk  = vk::GetImpl(programGL);
>-    const gl::VertexArray *vao   = state.getVertexArray();
>-    VertexArrayVk *vkVAO  = vk::GetImpl(vao);
>-    const auto *drawFBO   = state.getDrawFramebuffer();
>-    FramebufferVk *vkFBO  = vk::GetImpl(drawFBO);
>-    Serial queueSerial    = mRenderer->getCurrentQueueSerial();
>-    uint32_t maxAttrib    = programGL->getState().getMaxActiveAttribLocation();
>-
>-    // Process vertex attributes. Assume zero offsets for now.
>-    // TODO(jmadill): Offset handling.
>-    const std::vector<VkBuffer> &vertexHandles = vkVAO->getCurrentVertexBufferHandlesCache();
>-    angle::MemoryBuffer *zeroBuf               = nullptr;
>-    ANGLE_TRY(context->getZeroFilledBuffer(maxAttrib * sizeof(VkDeviceSize), &zeroBuf));
>-
>-    vk::CommandBufferAndState *commandBuffer = nullptr;
>-    ANGLE_TRY(mRenderer->getStartedCommandBuffer(&commandBuffer));
>-    ANGLE_TRY(mRenderer->ensureInRenderPass(context, vkFBO));
>+        if (indexType == gl::DrawElementsType::UnsignedByte && mDirtyBits[DIRTY_BIT_INDEX_BUFFER])
>+        {
>+            ANGLE_TRY(mVertexArray->updateIndexTranslation(this, indexCount, indexType, indices));
>+        }
>+    }
> 
>-    commandBuffer->bindPipeline(VK_PIPELINE_BIND_POINT_GRAPHICS, mCurrentPipeline);
>-    commandBuffer->bindVertexBuffers(0, maxAttrib, vertexHandles.data(),
>-                                     reinterpret_cast<const VkDeviceSize *>(zeroBuf->data()));
>+    return setupDraw(context, mode, 0, indexCount, instanceCount, indexType, indices,
>+                     mIndexedDirtyBitsMask, commandBufferOut);
>+}
> 
>-    // TODO(jmadill): the queue serial should be bound to the pipeline.
>-    setQueueSerial(queueSerial);
>-    vkVAO->updateCurrentBufferSerials(programGL->getActiveAttribLocationsMask(), queueSerial);
>+angle::Result ContextVk::setupLineLoopDraw(const gl::Context *context,
>+                                           gl::PrimitiveMode mode,
>+                                           GLint firstVertex,
>+                                           GLsizei vertexOrIndexCount,
>+                                           gl::DrawElementsType indexTypeOrInvalid,
>+                                           const void *indices,
>+                                           vk::CommandBuffer **commandBufferOut)
>+{
>+    ANGLE_TRY(mVertexArray->handleLineLoop(this, firstVertex, vertexOrIndexCount,
>+                                           indexTypeOrInvalid, indices));
>+    mDirtyBits.set(DIRTY_BIT_INDEX_BUFFER);
>+    mCurrentDrawElementsType = indexTypeOrInvalid != gl::DrawElementsType::InvalidEnum
>+                                   ? indexTypeOrInvalid
>+                                   : gl::DrawElementsType::UnsignedInt;
>+    return setupDraw(context, mode, firstVertex, vertexOrIndexCount, 1, indexTypeOrInvalid, indices,
>+                     mIndexedDirtyBitsMask, commandBufferOut);
>+}
> 
>-    // TODO(jmadill): Can probably use more dirty bits here.
>-    ContextVk *contextVk = vk::GetImpl(context);
>-    ANGLE_TRY(programVk->updateUniforms(contextVk));
>-    programVk->updateTexturesDescriptorSet(contextVk);
>+angle::Result ContextVk::handleDirtyDefaultAttribs(const gl::Context *context,
>+                                                   vk::CommandBuffer *commandBuffer)
>+{
>+    ASSERT(mDirtyDefaultAttribsMask.any());
> 
>-    // Bind the graphics descriptor sets.
>-    // TODO(jmadill): Handle multiple command buffers.
>-    const auto &descriptorSets = programVk->getDescriptorSets();
>-    uint32_t firstSet          = programVk->getDescriptorSetOffset();
>-    uint32_t setCount          = static_cast<uint32_t>(descriptorSets.size());
>-    if (!descriptorSets.empty() && ((setCount - firstSet) > 0))
>+    for (size_t attribIndex : mDirtyDefaultAttribsMask)
>     {
>-        const vk::PipelineLayout &pipelineLayout = programVk->getPipelineLayout();
>-        commandBuffer->bindDescriptorSets(VK_PIPELINE_BIND_POINT_GRAPHICS, pipelineLayout, firstSet,
>-                                          setCount - firstSet, &descriptorSets[firstSet], 0,
>-                                          nullptr);
>+        ANGLE_TRY(updateDefaultAttribute(attribIndex));
>     }
> 
>-    return gl::NoError();
>+    mDirtyDefaultAttribsMask.reset();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error ContextVk::drawArrays(const gl::Context *context, GLenum mode, GLint first, GLsizei count)
>+angle::Result ContextVk::handleDirtyPipeline(const gl::Context *context,
>+                                             vk::CommandBuffer *commandBuffer)
> {
>-    ANGLE_TRY(setupDraw(context, mode));
>+    if (!mCurrentPipeline)
>+    {
>+        const vk::GraphicsPipelineDesc *descPtr;
> 
>-    vk::CommandBufferAndState *commandBuffer = nullptr;
>-    ANGLE_TRY(mRenderer->getStartedCommandBuffer(&commandBuffer));
>+        // Draw call shader patching, shader compilation, and pipeline cache query.
>+        ANGLE_TRY(mProgram->getGraphicsPipeline(this, mCurrentDrawMode, *mGraphicsPipelineDesc,
>+                                                mProgram->getState().getActiveAttribLocationsMask(),
>+                                                &descPtr, &mCurrentPipeline));
>+        mGraphicsPipelineTransition.reset();
>+    }
>+    else if (mGraphicsPipelineTransition.any())
>+    {
>+        if (!mCurrentPipeline->findTransition(mGraphicsPipelineTransition, *mGraphicsPipelineDesc,
>+                                              &mCurrentPipeline))
>+        {
>+            vk::PipelineHelper *oldPipeline = mCurrentPipeline;
> 
>-    commandBuffer->draw(count, 1, first, 0);
>-    return gl::NoError();
>-}
>+            const vk::GraphicsPipelineDesc *descPtr;
> 
>-gl::Error ContextVk::drawArraysInstanced(const gl::Context *context,
>-                                         GLenum mode,
>-                                         GLint first,
>-                                         GLsizei count,
>-                                         GLsizei instanceCount)
>-{
>-    UNIMPLEMENTED();
>-    return gl::InternalError();
>+            ANGLE_TRY(mProgram->getGraphicsPipeline(
>+                this, mCurrentDrawMode, *mGraphicsPipelineDesc,
>+                mProgram->getState().getActiveAttribLocationsMask(), &descPtr, &mCurrentPipeline));
>+
>+            oldPipeline->addTransition(mGraphicsPipelineTransition, descPtr, mCurrentPipeline);
>+        }
>+
>+        mGraphicsPipelineTransition.reset();
>+    }
>+    commandBuffer->bindGraphicsPipeline(mCurrentPipeline->getPipeline());
>+    // Update the queue serial for the pipeline object.
>+    ASSERT(mCurrentPipeline && mCurrentPipeline->valid());
>+    mCurrentPipeline->updateSerial(mRenderer->getCurrentQueueSerial());
>+    return angle::Result::Continue;
> }
> 
>-gl::Error ContextVk::drawElements(const gl::Context *context,
>-                                  GLenum mode,
>-                                  GLsizei count,
>-                                  GLenum type,
>-                                  const void *indices)
>+angle::Result ContextVk::handleDirtyTextures(const gl::Context *context,
>+                                             vk::CommandBuffer *commandBuffer)
> {
>-    ANGLE_TRY(setupDraw(context, mode));
>+    ANGLE_TRY(updateActiveTextures(context));
> 
>-    if (indices)
>+    if (mProgram->hasTextures())
>     {
>-        // TODO(jmadill): Buffer offsets and immediate data.
>-        UNIMPLEMENTED();
>-        return gl::InternalError() << "Only zero-offset index buffers are currently implemented.";
>+        ANGLE_TRY(mProgram->updateTexturesDescriptorSet(this, mDrawFramebuffer->getFramebuffer()));
>     }
>+    return angle::Result::Continue;
>+}
> 
>-    if (type == GL_UNSIGNED_BYTE)
>+angle::Result ContextVk::handleDirtyVertexBuffers(const gl::Context *context,
>+                                                  vk::CommandBuffer *commandBuffer)
>+{
>+    uint32_t maxAttrib = mProgram->getState().getMaxActiveAttribLocation();
>+    const gl::AttribArray<VkBuffer> &bufferHandles = mVertexArray->getCurrentArrayBufferHandles();
>+    const gl::AttribArray<VkDeviceSize> &bufferOffsets =
>+        mVertexArray->getCurrentArrayBufferOffsets();
>+
>+    commandBuffer->bindVertexBuffers(0, maxAttrib, bufferHandles.data(), bufferOffsets.data());
>+
>+    const gl::AttribArray<vk::BufferHelper *> &arrayBufferResources =
>+        mVertexArray->getCurrentArrayBuffers();
>+    vk::FramebufferHelper *framebuffer = mDrawFramebuffer->getFramebuffer();
>+
>+    for (size_t attribIndex : context->getStateCache().getActiveBufferedAttribsMask())
>     {
>-        // TODO(jmadill): Index translation.
>-        UNIMPLEMENTED();
>-        return gl::InternalError() << "Unsigned byte translation is not yet implemented.";
>+        vk::BufferHelper *arrayBuffer = arrayBufferResources[attribIndex];
>+        if (arrayBuffer)
>+        {
>+            arrayBuffer->onRead(framebuffer, VK_ACCESS_VERTEX_ATTRIBUTE_READ_BIT);
>+        }
>     }
> 
>-    vk::CommandBufferAndState *commandBuffer = nullptr;
>-    ANGLE_TRY(mRenderer->getStartedCommandBuffer(&commandBuffer));
>+    return angle::Result::Continue;
>+}
> 
>-    const gl::Buffer *elementArrayBuffer =
>-        mState.getState().getVertexArray()->getElementArrayBuffer().get();
>-    ASSERT(elementArrayBuffer);
>+angle::Result ContextVk::handleDirtyIndexBuffer(const gl::Context *context,
>+                                                vk::CommandBuffer *commandBuffer)
>+{
>+    vk::BufferHelper *elementArrayBuffer = mVertexArray->getCurrentElementArrayBuffer();
>+    ASSERT(elementArrayBuffer != nullptr);
> 
>-    BufferVk *elementArrayBufferVk = vk::GetImpl(elementArrayBuffer);
>+    commandBuffer->bindIndexBuffer(elementArrayBuffer->getBuffer(),
>+                                   mVertexArray->getCurrentElementArrayBufferOffset(),
>+                                   gl_vk::kIndexTypeMap[mCurrentDrawElementsType]);
> 
>-    commandBuffer->bindIndexBuffer(elementArrayBufferVk->getVkBuffer(), 0, GetVkIndexType(type));
>-    commandBuffer->drawIndexed(count, 1, 0, 0, 0);
>+    vk::FramebufferHelper *framebuffer = mDrawFramebuffer->getFramebuffer();
>+    elementArrayBuffer->onRead(framebuffer, VK_ACCESS_INDEX_READ_BIT);
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error ContextVk::drawElementsInstanced(const gl::Context *context,
>-                                           GLenum mode,
>-                                           GLsizei count,
>-                                           GLenum type,
>-                                           const void *indices,
>-                                           GLsizei instances)
>+angle::Result ContextVk::handleDirtyDescriptorSets(const gl::Context *context,
>+                                                   vk::CommandBuffer *commandBuffer)
> {
>-    UNIMPLEMENTED();
>-    return gl::InternalError();
>+    ANGLE_TRY(mProgram->updateDescriptorSets(this, commandBuffer));
>+
>+    // Bind the graphics descriptor sets.
>+    commandBuffer->bindGraphicsDescriptorSets(mProgram->getPipelineLayout(),
>+                                              kDriverUniformsDescriptorSetIndex, 1,
>+                                              &mDriverUniformsDescriptorSet, 0, nullptr);
>+    return angle::Result::Continue;
> }
> 
>-gl::Error ContextVk::drawRangeElements(const gl::Context *context,
>-                                       GLenum mode,
>-                                       GLuint start,
>-                                       GLuint end,
>-                                       GLsizei count,
>-                                       GLenum type,
>-                                       const void *indices)
>+angle::Result ContextVk::drawArrays(const gl::Context *context,
>+                                    gl::PrimitiveMode mode,
>+                                    GLint first,
>+                                    GLsizei count)
> {
>-    return gl::NoError();
>+    vk::CommandBuffer *commandBuffer = nullptr;
>+    uint32_t clampedVertexCount      = gl::GetClampedVertexCount<uint32_t>(count);
>+
>+    if (mode == gl::PrimitiveMode::LineLoop)
>+    {
>+        ANGLE_TRY(setupLineLoopDraw(context, mode, first, count, gl::DrawElementsType::InvalidEnum,
>+                                    nullptr, &commandBuffer));
>+        vk::LineLoopHelper::Draw(clampedVertexCount, commandBuffer);
>+    }
>+    else
>+    {
>+        ANGLE_TRY(setupDraw(context, mode, first, count, 1, gl::DrawElementsType::InvalidEnum,
>+                            nullptr, mNonIndexedDirtyBitsMask, &commandBuffer));
>+        commandBuffer->draw(clampedVertexCount, first);
>+    }
>+
>+    return angle::Result::Continue;
> }
> 
>-VkDevice ContextVk::getDevice() const
>+angle::Result ContextVk::drawArraysInstanced(const gl::Context *context,
>+                                             gl::PrimitiveMode mode,
>+                                             GLint first,
>+                                             GLsizei count,
>+                                             GLsizei instances)
> {
>-    return mRenderer->getDevice();
>+    if (mode == gl::PrimitiveMode::LineLoop)
>+    {
>+        // TODO - http://anglebug.com/2672
>+        ANGLE_VK_UNREACHABLE(this);
>+        return angle::Result::Stop;
>+    }
>+
>+    vk::CommandBuffer *commandBuffer = nullptr;
>+    ANGLE_TRY(setupDraw(context, mode, first, count, instances, gl::DrawElementsType::InvalidEnum,
>+                        nullptr, mNonIndexedDirtyBitsMask, &commandBuffer));
>+    commandBuffer->drawInstanced(gl::GetClampedVertexCount<uint32_t>(count), instances, first);
>+    return angle::Result::Continue;
>+}
>+
>+angle::Result ContextVk::drawElements(const gl::Context *context,
>+                                      gl::PrimitiveMode mode,
>+                                      GLsizei count,
>+                                      gl::DrawElementsType type,
>+                                      const void *indices)
>+{
>+    vk::CommandBuffer *commandBuffer = nullptr;
>+    if (mode == gl::PrimitiveMode::LineLoop)
>+    {
>+        ANGLE_TRY(setupLineLoopDraw(context, mode, 0, count, type, indices, &commandBuffer));
>+        vk::LineLoopHelper::Draw(count, commandBuffer);
>+    }
>+    else
>+    {
>+        ANGLE_TRY(setupIndexedDraw(context, mode, count, 1, type, indices, &commandBuffer));
>+        commandBuffer->drawIndexed(count);
>+    }
>+
>+    return angle::Result::Continue;
> }
> 
>-vk::Error ContextVk::getStartedCommandBuffer(vk::CommandBufferAndState **commandBufferOut)
>+angle::Result ContextVk::drawElementsInstanced(const gl::Context *context,
>+                                               gl::PrimitiveMode mode,
>+                                               GLsizei count,
>+                                               gl::DrawElementsType type,
>+                                               const void *indices,
>+                                               GLsizei instances)
> {
>-    return mRenderer->getStartedCommandBuffer(commandBufferOut);
>+    if (mode == gl::PrimitiveMode::LineLoop)
>+    {
>+        // TODO - http://anglebug.com/2672
>+        ANGLE_VK_UNREACHABLE(this);
>+        return angle::Result::Stop;
>+    }
>+
>+    vk::CommandBuffer *commandBuffer = nullptr;
>+    ANGLE_TRY(setupIndexedDraw(context, mode, count, instances, type, indices, &commandBuffer));
>+    commandBuffer->drawIndexedInstanced(count, instances);
>+    return angle::Result::Continue;
> }
> 
>-vk::Error ContextVk::submitCommands(vk::CommandBufferAndState *commandBuffer)
>+angle::Result ContextVk::drawRangeElements(const gl::Context *context,
>+                                           gl::PrimitiveMode mode,
>+                                           GLuint start,
>+                                           GLuint end,
>+                                           GLsizei count,
>+                                           gl::DrawElementsType type,
>+                                           const void *indices)
> {
>-    setQueueSerial(mRenderer->getCurrentQueueSerial());
>-    ANGLE_TRY(mRenderer->submitCommandBuffer(commandBuffer));
>-    return vk::NoError();
>+    ANGLE_VK_UNREACHABLE(this);
>+    return angle::Result::Stop;
> }
> 
>-gl::Error ContextVk::drawArraysIndirect(const gl::Context *context,
>-                                        GLenum mode,
>-                                        const void *indirect)
>+VkDevice ContextVk::getDevice() const
> {
>-    UNIMPLEMENTED();
>-    return gl::InternalError() << "DrawArraysIndirect hasn't been implemented for vulkan backend.";
>+    return mRenderer->getDevice();
> }
> 
>-gl::Error ContextVk::drawElementsIndirect(const gl::Context *context,
>-                                          GLenum mode,
>-                                          GLenum type,
>-                                          const void *indirect)
>+angle::Result ContextVk::drawArraysIndirect(const gl::Context *context,
>+                                            gl::PrimitiveMode mode,
>+                                            const void *indirect)
> {
>-    UNIMPLEMENTED();
>-    return gl::InternalError()
>-           << "DrawElementsIndirect hasn't been implemented for vulkan backend.";
>+    ANGLE_VK_UNREACHABLE(this);
>+    return angle::Result::Stop;
> }
> 
>-GLenum ContextVk::getResetStatus()
>+angle::Result ContextVk::drawElementsIndirect(const gl::Context *context,
>+                                              gl::PrimitiveMode mode,
>+                                              gl::DrawElementsType type,
>+                                              const void *indirect)
> {
>-    UNIMPLEMENTED();
>-    return GL_NO_ERROR;
>+    ANGLE_VK_UNREACHABLE(this);
>+    return angle::Result::Stop;
>+}
>+
>+gl::GraphicsResetStatus ContextVk::getResetStatus()
>+{
>+    if (mRenderer->isDeviceLost())
>+    {
>+        // TODO(geofflang): It may be possible to track which context caused the device lost and
>+        // return either GL_GUILTY_CONTEXT_RESET or GL_INNOCENT_CONTEXT_RESET.
>+        // http://anglebug.com/2787
>+        return gl::GraphicsResetStatus::UnknownContextReset;
>+    }
>+
>+    return gl::GraphicsResetStatus::NoError;
> }
> 
> std::string ContextVk::getVendorString() const
>@@ -490,245 +619,343 @@ std::string ContextVk::getRendererDescription() const
> 
> void ContextVk::insertEventMarker(GLsizei length, const char *marker)
> {
>-    UNIMPLEMENTED();
>+    std::string markerStr(marker, length <= 0 ? strlen(marker) : length);
>+    mRenderer->insertDebugMarker(GL_DEBUG_SOURCE_APPLICATION, static_cast<GLuint>(-1),
>+                                 std::move(markerStr));
> }
> 
> void ContextVk::pushGroupMarker(GLsizei length, const char *marker)
> {
>-    UNIMPLEMENTED();
>+    std::string markerStr(marker, length <= 0 ? strlen(marker) : length);
>+    mRenderer->pushDebugMarker(GL_DEBUG_SOURCE_APPLICATION, static_cast<GLuint>(-1),
>+                               std::move(markerStr));
> }
> 
> void ContextVk::popGroupMarker()
> {
>-    UNIMPLEMENTED();
>+    mRenderer->popDebugMarker();
> }
> 
>-void ContextVk::pushDebugGroup(GLenum source, GLuint id, GLsizei length, const char *message)
>+void ContextVk::pushDebugGroup(GLenum source, GLuint id, const std::string &message)
> {
>-    UNIMPLEMENTED();
>+    mRenderer->pushDebugMarker(source, id, std::string(message));
> }
> 
> void ContextVk::popDebugGroup()
> {
>-    UNIMPLEMENTED();
>+    mRenderer->popDebugMarker();
>+}
>+
>+bool ContextVk::isViewportFlipEnabledForDrawFBO() const
>+{
>+    return mFlipViewportForDrawFramebuffer && mFlipYForCurrentSurface;
>+}
>+
>+bool ContextVk::isViewportFlipEnabledForReadFBO() const
>+{
>+    return mFlipViewportForReadFramebuffer;
>+}
>+
>+void ContextVk::updateColorMask(const gl::BlendState &blendState)
>+{
>+    mClearColorMask =
>+        gl_vk::GetColorComponentFlags(blendState.colorMaskRed, blendState.colorMaskGreen,
>+                                      blendState.colorMaskBlue, blendState.colorMaskAlpha);
>+
>+    FramebufferVk *framebufferVk = vk::GetImpl(mState.getDrawFramebuffer());
>+    mGraphicsPipelineDesc->updateColorWriteMask(&mGraphicsPipelineTransition, mClearColorMask,
>+                                                framebufferVk->getEmulatedAlphaAttachmentMask());
>+}
>+
>+void ContextVk::updateViewport(FramebufferVk *framebufferVk,
>+                               const gl::Rectangle &viewport,
>+                               float nearPlane,
>+                               float farPlane,
>+                               bool invertViewport)
>+{
>+    VkViewport vkViewport;
>+    gl_vk::GetViewport(viewport, nearPlane, farPlane, invertViewport,
>+                       framebufferVk->getState().getDimensions().height, &vkViewport);
>+    mGraphicsPipelineDesc->updateViewport(&mGraphicsPipelineTransition, vkViewport);
>+    invalidateDriverUniforms();
>+}
>+
>+void ContextVk::updateDepthRange(float nearPlane, float farPlane)
>+{
>+    invalidateDriverUniforms();
>+    mGraphicsPipelineDesc->updateDepthRange(&mGraphicsPipelineTransition, nearPlane, farPlane);
>+}
>+
>+void ContextVk::updateScissor(const gl::State &glState)
>+{
>+    FramebufferVk *framebufferVk      = vk::GetImpl(glState.getDrawFramebuffer());
>+    gl::Rectangle scissoredRenderArea = framebufferVk->getScissoredRenderArea(this);
>+    VkRect2D scissor                  = gl_vk::GetRect(scissoredRenderArea);
>+    mGraphicsPipelineDesc->updateScissor(&mGraphicsPipelineTransition, scissor);
>+
>+    framebufferVk->onScissorChange(this);
> }
> 
>-void ContextVk::syncState(const gl::Context *context, const gl::State::DirtyBits &dirtyBits)
>+angle::Result ContextVk::syncState(const gl::Context *context,
>+                                   const gl::State::DirtyBits &dirtyBits,
>+                                   const gl::State::DirtyBits &bitMask)
> {
>     if (dirtyBits.any())
>     {
>-        invalidateCurrentPipeline();
>+        invalidateVertexAndIndexBuffers();
>     }
> 
>-    const auto &glState = context->getGLState();
>-
>-    // TODO(jmadill): Full dirty bits implementation.
>-    bool dirtyTextures = false;
>+    const gl::State &glState = context->getState();
> 
>-    for (auto dirtyBit : dirtyBits)
>+    for (size_t dirtyBit : dirtyBits)
>     {
>         switch (dirtyBit)
>         {
>             case gl::State::DIRTY_BIT_SCISSOR_TEST_ENABLED:
>-                WARN() << "DIRTY_BIT_SCISSOR_TEST_ENABLED unimplemented";
>-                break;
>             case gl::State::DIRTY_BIT_SCISSOR:
>-                WARN() << "DIRTY_BIT_SCISSOR unimplemented";
>+                updateScissor(glState);
>                 break;
>             case gl::State::DIRTY_BIT_VIEWPORT:
>             {
>-                const gl::Rectangle &viewportGL = glState.getViewport();
>-                mCurrentViewportVk.x            = static_cast<float>(viewportGL.x);
>-                mCurrentViewportVk.y            = static_cast<float>(viewportGL.y);
>-                mCurrentViewportVk.width        = static_cast<float>(viewportGL.width);
>-                mCurrentViewportVk.height       = static_cast<float>(viewportGL.height);
>-                mCurrentViewportVk.minDepth     = glState.getNearPlane();
>-                mCurrentViewportVk.maxDepth     = glState.getFarPlane();
>-
>-                // TODO(jmadill): Scissor.
>-                mCurrentScissorVk.offset.x      = viewportGL.x;
>-                mCurrentScissorVk.offset.y      = viewportGL.y;
>-                mCurrentScissorVk.extent.width  = viewportGL.width;
>-                mCurrentScissorVk.extent.height = viewportGL.height;
>+                FramebufferVk *framebufferVk = vk::GetImpl(glState.getDrawFramebuffer());
>+                updateViewport(framebufferVk, glState.getViewport(), glState.getNearPlane(),
>+                               glState.getFarPlane(), isViewportFlipEnabledForDrawFBO());
>                 break;
>             }
>             case gl::State::DIRTY_BIT_DEPTH_RANGE:
>-                WARN() << "DIRTY_BIT_DEPTH_RANGE unimplemented";
>+                updateDepthRange(glState.getNearPlane(), glState.getFarPlane());
>                 break;
>             case gl::State::DIRTY_BIT_BLEND_ENABLED:
>-                WARN() << "DIRTY_BIT_BLEND_ENABLED unimplemented";
>+                mGraphicsPipelineDesc->updateBlendEnabled(&mGraphicsPipelineTransition,
>+                                                          glState.isBlendEnabled());
>                 break;
>             case gl::State::DIRTY_BIT_BLEND_COLOR:
>-                WARN() << "DIRTY_BIT_BLEND_COLOR unimplemented";
>+                mGraphicsPipelineDesc->updateBlendColor(&mGraphicsPipelineTransition,
>+                                                        glState.getBlendColor());
>                 break;
>             case gl::State::DIRTY_BIT_BLEND_FUNCS:
>-                WARN() << "DIRTY_BIT_BLEND_FUNCS unimplemented";
>+                mGraphicsPipelineDesc->updateBlendFuncs(&mGraphicsPipelineTransition,
>+                                                        glState.getBlendState());
>                 break;
>             case gl::State::DIRTY_BIT_BLEND_EQUATIONS:
>-                WARN() << "DIRTY_BIT_BLEND_EQUATIONS unimplemented";
>+                mGraphicsPipelineDesc->updateBlendEquations(&mGraphicsPipelineTransition,
>+                                                            glState.getBlendState());
>                 break;
>             case gl::State::DIRTY_BIT_COLOR_MASK:
>-                WARN() << "DIRTY_BIT_COLOR_MASK unimplemented";
>+                updateColorMask(glState.getBlendState());
>                 break;
>             case gl::State::DIRTY_BIT_SAMPLE_ALPHA_TO_COVERAGE_ENABLED:
>-                WARN() << "DIRTY_BIT_SAMPLE_ALPHA_TO_COVERAGE_ENABLED unimplemented";
>                 break;
>             case gl::State::DIRTY_BIT_SAMPLE_COVERAGE_ENABLED:
>-                WARN() << "DIRTY_BIT_SAMPLE_COVERAGE_ENABLED unimplemented";
>                 break;
>             case gl::State::DIRTY_BIT_SAMPLE_COVERAGE:
>-                WARN() << "DIRTY_BIT_SAMPLE_COVERAGE unimplemented";
>                 break;
>             case gl::State::DIRTY_BIT_SAMPLE_MASK_ENABLED:
>-                WARN() << "DIRTY_BIT_SAMPLE_MASK_ENABLED unimplemented";
>                 break;
>             case gl::State::DIRTY_BIT_SAMPLE_MASK:
>-                WARN() << "DIRTY_BIT_SAMPLE_MASK unimplemented";
>                 break;
>             case gl::State::DIRTY_BIT_DEPTH_TEST_ENABLED:
>-                WARN() << "DIRTY_BIT_DEPTH_TEST_ENABLED unimplemented";
>+                mGraphicsPipelineDesc->updateDepthTestEnabled(&mGraphicsPipelineTransition,
>+                                                              glState.getDepthStencilState(),
>+                                                              glState.getDrawFramebuffer());
>                 break;
>             case gl::State::DIRTY_BIT_DEPTH_FUNC:
>-                WARN() << "DIRTY_BIT_DEPTH_FUNC unimplemented";
>+                mGraphicsPipelineDesc->updateDepthFunc(&mGraphicsPipelineTransition,
>+                                                       glState.getDepthStencilState());
>                 break;
>             case gl::State::DIRTY_BIT_DEPTH_MASK:
>-                WARN() << "DIRTY_BIT_DEPTH_MASK unimplemented";
>+                mGraphicsPipelineDesc->updateDepthWriteEnabled(&mGraphicsPipelineTransition,
>+                                                               glState.getDepthStencilState(),
>+                                                               glState.getDrawFramebuffer());
>                 break;
>             case gl::State::DIRTY_BIT_STENCIL_TEST_ENABLED:
>-                WARN() << "DIRTY_BIT_STENCIL_TEST_ENABLED unimplemented";
>+                mGraphicsPipelineDesc->updateStencilTestEnabled(&mGraphicsPipelineTransition,
>+                                                                glState.getDepthStencilState(),
>+                                                                glState.getDrawFramebuffer());
>                 break;
>             case gl::State::DIRTY_BIT_STENCIL_FUNCS_FRONT:
>-                WARN() << "DIRTY_BIT_STENCIL_FUNCS_FRONT unimplemented";
>+                mGraphicsPipelineDesc->updateStencilFrontFuncs(&mGraphicsPipelineTransition,
>+                                                               glState.getStencilRef(),
>+                                                               glState.getDepthStencilState());
>                 break;
>             case gl::State::DIRTY_BIT_STENCIL_FUNCS_BACK:
>-                WARN() << "DIRTY_BIT_STENCIL_FUNCS_BACK unimplemented";
>+                mGraphicsPipelineDesc->updateStencilBackFuncs(&mGraphicsPipelineTransition,
>+                                                              glState.getStencilBackRef(),
>+                                                              glState.getDepthStencilState());
>                 break;
>             case gl::State::DIRTY_BIT_STENCIL_OPS_FRONT:
>-                WARN() << "DIRTY_BIT_STENCIL_OPS_FRONT unimplemented";
>+                mGraphicsPipelineDesc->updateStencilFrontOps(&mGraphicsPipelineTransition,
>+                                                             glState.getDepthStencilState());
>                 break;
>             case gl::State::DIRTY_BIT_STENCIL_OPS_BACK:
>-                WARN() << "DIRTY_BIT_STENCIL_OPS_BACK unimplemented";
>+                mGraphicsPipelineDesc->updateStencilBackOps(&mGraphicsPipelineTransition,
>+                                                            glState.getDepthStencilState());
>                 break;
>             case gl::State::DIRTY_BIT_STENCIL_WRITEMASK_FRONT:
>-                WARN() << "DIRTY_BIT_STENCIL_WRITEMASK_FRONT unimplemented";
>+                mGraphicsPipelineDesc->updateStencilFrontWriteMask(&mGraphicsPipelineTransition,
>+                                                                   glState.getDepthStencilState(),
>+                                                                   glState.getDrawFramebuffer());
>                 break;
>             case gl::State::DIRTY_BIT_STENCIL_WRITEMASK_BACK:
>-                WARN() << "DIRTY_BIT_STENCIL_WRITEMASK_BACK unimplemented";
>+                mGraphicsPipelineDesc->updateStencilBackWriteMask(&mGraphicsPipelineTransition,
>+                                                                  glState.getDepthStencilState(),
>+                                                                  glState.getDrawFramebuffer());
>                 break;
>             case gl::State::DIRTY_BIT_CULL_FACE_ENABLED:
>             case gl::State::DIRTY_BIT_CULL_FACE:
>-                mCurrentRasterState.cullMode = gl_vk::GetCullMode(glState.getRasterizerState());
>+                mGraphicsPipelineDesc->updateCullMode(&mGraphicsPipelineTransition,
>+                                                      glState.getRasterizerState());
>                 break;
>             case gl::State::DIRTY_BIT_FRONT_FACE:
>-                mCurrentRasterState.frontFace =
>-                    gl_vk::GetFrontFace(glState.getRasterizerState().frontFace);
>+                mGraphicsPipelineDesc->updateFrontFace(&mGraphicsPipelineTransition,
>+                                                       glState.getRasterizerState(),
>+                                                       isViewportFlipEnabledForDrawFBO());
>                 break;
>             case gl::State::DIRTY_BIT_POLYGON_OFFSET_FILL_ENABLED:
>-                WARN() << "DIRTY_BIT_POLYGON_OFFSET_FILL_ENABLED unimplemented";
>+                mGraphicsPipelineDesc->updatePolygonOffsetFillEnabled(
>+                    &mGraphicsPipelineTransition, glState.isPolygonOffsetFillEnabled());
>                 break;
>             case gl::State::DIRTY_BIT_POLYGON_OFFSET:
>-                WARN() << "DIRTY_BIT_POLYGON_OFFSET unimplemented";
>+                mGraphicsPipelineDesc->updatePolygonOffset(&mGraphicsPipelineTransition,
>+                                                           glState.getRasterizerState());
>                 break;
>             case gl::State::DIRTY_BIT_RASTERIZER_DISCARD_ENABLED:
>-                WARN() << "DIRTY_BIT_RASTERIZER_DISCARD_ENABLED unimplemented";
>                 break;
>             case gl::State::DIRTY_BIT_LINE_WIDTH:
>-                mCurrentRasterState.lineWidth = glState.getLineWidth();
>+                mGraphicsPipelineDesc->updateLineWidth(&mGraphicsPipelineTransition,
>+                                                       glState.getLineWidth());
>                 break;
>             case gl::State::DIRTY_BIT_PRIMITIVE_RESTART_ENABLED:
>-                WARN() << "DIRTY_BIT_PRIMITIVE_RESTART_ENABLED unimplemented";
>                 break;
>             case gl::State::DIRTY_BIT_CLEAR_COLOR:
>-                WARN() << "DIRTY_BIT_CLEAR_COLOR unimplemented";
>+                mClearColorValue.color.float32[0] = glState.getColorClearValue().red;
>+                mClearColorValue.color.float32[1] = glState.getColorClearValue().green;
>+                mClearColorValue.color.float32[2] = glState.getColorClearValue().blue;
>+                mClearColorValue.color.float32[3] = glState.getColorClearValue().alpha;
>                 break;
>             case gl::State::DIRTY_BIT_CLEAR_DEPTH:
>-                WARN() << "DIRTY_BIT_CLEAR_DEPTH unimplemented";
>+                mClearDepthStencilValue.depthStencil.depth = glState.getDepthClearValue();
>                 break;
>             case gl::State::DIRTY_BIT_CLEAR_STENCIL:
>-                WARN() << "DIRTY_BIT_CLEAR_STENCIL unimplemented";
>+                mClearDepthStencilValue.depthStencil.stencil =
>+                    static_cast<uint32_t>(glState.getStencilClearValue());
>                 break;
>             case gl::State::DIRTY_BIT_UNPACK_STATE:
>-                WARN() << "DIRTY_BIT_UNPACK_STATE unimplemented";
>+                // This is a no-op, its only important to use the right unpack state when we do
>+                // setImage or setSubImage in TextureVk, which is plumbed through the frontend call
>                 break;
>             case gl::State::DIRTY_BIT_UNPACK_BUFFER_BINDING:
>-                WARN() << "DIRTY_BIT_UNPACK_BUFFER_BINDING unimplemented";
>                 break;
>             case gl::State::DIRTY_BIT_PACK_STATE:
>-                WARN() << "DIRTY_BIT_PACK_STATE unimplemented";
>+                // This is a no-op, its only important to use the right pack state when we do
>+                // call readPixels later on.
>                 break;
>             case gl::State::DIRTY_BIT_PACK_BUFFER_BINDING:
>-                WARN() << "DIRTY_BIT_PACK_BUFFER_BINDING unimplemented";
>                 break;
>             case gl::State::DIRTY_BIT_DITHER_ENABLED:
>-                WARN() << "DIRTY_BIT_DITHER_ENABLED unimplemented";
>                 break;
>             case gl::State::DIRTY_BIT_GENERATE_MIPMAP_HINT:
>-                WARN() << "DIRTY_BIT_GENERATE_MIPMAP_HINT unimplemented";
>                 break;
>             case gl::State::DIRTY_BIT_SHADER_DERIVATIVE_HINT:
>-                WARN() << "DIRTY_BIT_SHADER_DERIVATIVE_HINT unimplemented";
>                 break;
>             case gl::State::DIRTY_BIT_READ_FRAMEBUFFER_BINDING:
>-                WARN() << "DIRTY_BIT_READ_FRAMEBUFFER_BINDING unimplemented";
>+                updateFlipViewportReadFramebuffer(context->getState());
>                 break;
>             case gl::State::DIRTY_BIT_DRAW_FRAMEBUFFER_BINDING:
>-                WARN() << "DIRTY_BIT_DRAW_FRAMEBUFFER_BINDING unimplemented";
>+            {
>+                // FramebufferVk::syncState signals that we should start a new command buffer. But
>+                // changing the binding can skip FramebufferVk::syncState if the Framebuffer has no
>+                // dirty bits. Thus we need to explicitly clear the current command buffer to
>+                // ensure we start a new one. Note that we need a new command buffer because a
>+                // command graph node can only support one RenderPass configuration at a time.
>+                onCommandBufferFinished();
>+
>+                mDrawFramebuffer = vk::GetImpl(glState.getDrawFramebuffer());
>+                updateFlipViewportDrawFramebuffer(glState);
>+                updateViewport(mDrawFramebuffer, glState.getViewport(), glState.getNearPlane(),
>+                               glState.getFarPlane(), isViewportFlipEnabledForDrawFBO());
>+                updateColorMask(glState.getBlendState());
>+                mGraphicsPipelineDesc->updateCullMode(&mGraphicsPipelineTransition,
>+                                                      glState.getRasterizerState());
>+                updateScissor(glState);
>+                mGraphicsPipelineDesc->updateDepthTestEnabled(&mGraphicsPipelineTransition,
>+                                                              glState.getDepthStencilState(),
>+                                                              glState.getDrawFramebuffer());
>+                mGraphicsPipelineDesc->updateDepthWriteEnabled(&mGraphicsPipelineTransition,
>+                                                               glState.getDepthStencilState(),
>+                                                               glState.getDrawFramebuffer());
>+                mGraphicsPipelineDesc->updateStencilTestEnabled(&mGraphicsPipelineTransition,
>+                                                                glState.getDepthStencilState(),
>+                                                                glState.getDrawFramebuffer());
>+                mGraphicsPipelineDesc->updateStencilFrontWriteMask(&mGraphicsPipelineTransition,
>+                                                                   glState.getDepthStencilState(),
>+                                                                   glState.getDrawFramebuffer());
>+                mGraphicsPipelineDesc->updateStencilBackWriteMask(&mGraphicsPipelineTransition,
>+                                                                  glState.getDepthStencilState(),
>+                                                                  glState.getDrawFramebuffer());
>+                mGraphicsPipelineDesc->updateRenderPassDesc(&mGraphicsPipelineTransition,
>+                                                            mDrawFramebuffer->getRenderPassDesc());
>                 break;
>+            }
>             case gl::State::DIRTY_BIT_RENDERBUFFER_BINDING:
>-                WARN() << "DIRTY_BIT_RENDERBUFFER_BINDING unimplemented";
>                 break;
>             case gl::State::DIRTY_BIT_VERTEX_ARRAY_BINDING:
>-                WARN() << "DIRTY_BIT_VERTEX_ARRAY_BINDING unimplemented";
>+            {
>+                mVertexArray = vk::GetImpl(glState.getVertexArray());
>+                invalidateDefaultAttributes(context->getStateCache().getActiveDefaultAttribsMask());
>                 break;
>+            }
>             case gl::State::DIRTY_BIT_DRAW_INDIRECT_BUFFER_BINDING:
>-                WARN() << "DIRTY_BIT_DRAW_INDIRECT_BUFFER_BINDING unimplemented";
>+                break;
>+            case gl::State::DIRTY_BIT_DISPATCH_INDIRECT_BUFFER_BINDING:
>                 break;
>             case gl::State::DIRTY_BIT_PROGRAM_BINDING:
>-                WARN() << "DIRTY_BIT_PROGRAM_BINDING unimplemented";
>+                mProgram = vk::GetImpl(glState.getProgram());
>                 break;
>             case gl::State::DIRTY_BIT_PROGRAM_EXECUTABLE:
>             {
>-                // { vertex, fragment }
>-                ProgramVk *programVk           = vk::GetImpl(glState.getProgram());
>-                mCurrentShaderStages[0].module = programVk->getLinkedVertexModule().getHandle();
>-                mCurrentShaderStages[1].module = programVk->getLinkedFragmentModule().getHandle();
>-
>-                // Also invalidate the vertex descriptions cache in the Vertex Array.
>-                VertexArrayVk *vaoVk = vk::GetImpl(glState.getVertexArray());
>-                vaoVk->invalidateVertexDescriptions();
>-
>-                dirtyTextures = true;
>+                invalidateCurrentTextures();
>+                // No additional work is needed here. We will update the pipeline desc later.
>+                invalidateDefaultAttributes(context->getStateCache().getActiveDefaultAttribsMask());
>+                bool useVertexBuffer = (mProgram->getState().getMaxActiveAttribLocation());
>+                mNonIndexedDirtyBitsMask.set(DIRTY_BIT_VERTEX_BUFFERS, useVertexBuffer);
>+                mIndexedDirtyBitsMask.set(DIRTY_BIT_VERTEX_BUFFERS, useVertexBuffer);
>+                mCurrentPipeline = nullptr;
>+                mGraphicsPipelineTransition.reset();
>                 break;
>             }
>             case gl::State::DIRTY_BIT_TEXTURE_BINDINGS:
>-                dirtyTextures = true;
>+                invalidateCurrentTextures();
>                 break;
>             case gl::State::DIRTY_BIT_SAMPLER_BINDINGS:
>-                dirtyTextures = true;
>+                invalidateCurrentTextures();
>+                break;
>+            case gl::State::DIRTY_BIT_TRANSFORM_FEEDBACK_BINDING:
>+                break;
>+            case gl::State::DIRTY_BIT_SHADER_STORAGE_BUFFER_BINDING:
>+                break;
>+            case gl::State::DIRTY_BIT_UNIFORM_BUFFER_BINDINGS:
>+                break;
>+            case gl::State::DIRTY_BIT_ATOMIC_COUNTER_BUFFER_BINDING:
>+                break;
>+            case gl::State::DIRTY_BIT_IMAGE_BINDINGS:
>                 break;
>             case gl::State::DIRTY_BIT_MULTISAMPLING:
>-                WARN() << "DIRTY_BIT_MULTISAMPLING unimplemented";
>                 break;
>             case gl::State::DIRTY_BIT_SAMPLE_ALPHA_TO_ONE:
>-                WARN() << "DIRTY_BIT_SAMPLE_ALPHA_TO_ONE unimplemented";
>                 break;
>             case gl::State::DIRTY_BIT_COVERAGE_MODULATION:
>-                WARN() << "DIRTY_BIT_COVERAGE_MODULATION unimplemented";
>                 break;
>-            case gl::State::DIRTY_BIT_PATH_RENDERING_MATRIX_MV:
>-                WARN() << "DIRTY_BIT_PATH_RENDERING_MATRIX_MV unimplemented";
>-                break;
>-            case gl::State::DIRTY_BIT_PATH_RENDERING_MATRIX_PROJ:
>-                WARN() << "DIRTY_BIT_PATH_RENDERING_MATRIX_PROJ unimplemented";
>-                break;
>-            case gl::State::DIRTY_BIT_PATH_RENDERING_STENCIL_STATE:
>-                WARN() << "DIRTY_BIT_PATH_RENDERING_STENCIL_STATE unimplemented";
>+            case gl::State::DIRTY_BIT_PATH_RENDERING:
>                 break;
>             case gl::State::DIRTY_BIT_FRAMEBUFFER_SRGB:
>-                WARN() << "DIRTY_BIT_FRAMEBUFFER_SRGB unimplemented";
>                 break;
>             case gl::State::DIRTY_BIT_CURRENT_VALUES:
>-                WARN() << "DIRTY_BIT_CURRENT_VALUES unimplemented";
>+            {
>+                invalidateDefaultAttributes(glState.getAndResetDirtyCurrentValues());
>+                break;
>+            }
>+            case gl::State::DIRTY_BIT_PROVOKING_VERTEX:
>                 break;
>             default:
>                 UNREACHABLE();
>@@ -736,30 +963,72 @@ void ContextVk::syncState(const gl::Context *context, const gl::State::DirtyBits
>         }
>     }
> 
>-    if (dirtyTextures)
>-    {
>-        ProgramVk *programVk = vk::GetImpl(glState.getProgram());
>-        programVk->invalidateTextures();
>-    }
>+    return angle::Result::Continue;
> }
> 
> GLint ContextVk::getGPUDisjoint()
> {
>-    UNIMPLEMENTED();
>-    return GLint();
>+    // No extension seems to be available to query this information.
>+    return 0;
> }
> 
> GLint64 ContextVk::getTimestamp()
> {
>-    UNIMPLEMENTED();
>-    return GLint64();
>+    uint64_t timestamp = 0;
>+
>+    (void)mRenderer->getTimestamp(this, &timestamp);
>+
>+    return static_cast<GLint64>(timestamp);
>+}
>+
>+angle::Result ContextVk::onMakeCurrent(const gl::Context *context)
>+{
>+    // Flip viewports if FeaturesVk::flipViewportY is enabled and the user did not request that the
>+    // surface is flipped.
>+    egl::Surface *drawSurface = context->getCurrentDrawSurface();
>+    mFlipYForCurrentSurface =
>+        drawSurface != nullptr && mRenderer->getFeatures().flipViewportY &&
>+        !IsMaskFlagSet(drawSurface->getOrientation(), EGL_SURFACE_ORIENTATION_INVERT_Y_ANGLE);
>+
>+    if (drawSurface && drawSurface->getType() == EGL_WINDOW_BIT)
>+    {
>+        mCurrentWindowSurface = GetImplAs<WindowSurfaceVk>(drawSurface);
>+    }
>+    else
>+    {
>+        mCurrentWindowSurface = nullptr;
>+    }
>+
>+    const gl::State &glState = context->getState();
>+    updateFlipViewportDrawFramebuffer(glState);
>+    updateFlipViewportReadFramebuffer(glState);
>+    invalidateDriverUniforms();
>+
>+    return angle::Result::Continue;
>+}
>+
>+angle::Result ContextVk::onUnMakeCurrent(const gl::Context *context)
>+{
>+    ANGLE_TRY(flushImpl());
>+    mCurrentWindowSurface = nullptr;
>+    return angle::Result::Continue;
>+}
>+
>+void ContextVk::updateFlipViewportDrawFramebuffer(const gl::State &glState)
>+{
>+    gl::Framebuffer *drawFramebuffer = glState.getDrawFramebuffer();
>+    mFlipViewportForDrawFramebuffer =
>+        drawFramebuffer->isDefault() && mRenderer->getFeatures().flipViewportY;
> }
> 
>-void ContextVk::onMakeCurrent(const gl::Context * /*context*/)
>+void ContextVk::updateFlipViewportReadFramebuffer(const gl::State &glState)
> {
>+    gl::Framebuffer *readFramebuffer = glState.getReadFramebuffer();
>+    mFlipViewportForReadFramebuffer =
>+        readFramebuffer->isDefault() && mRenderer->getFeatures().flipViewportY;
> }
> 
>-const gl::Caps &ContextVk::getNativeCaps() const
>+gl::Caps ContextVk::getNativeCaps() const
> {
>     return mRenderer->getNativeCaps();
> }
>@@ -796,17 +1065,17 @@ ProgramImpl *ContextVk::createProgram(const gl::ProgramState &state)
> 
> FramebufferImpl *ContextVk::createFramebuffer(const gl::FramebufferState &state)
> {
>-    return FramebufferVk::CreateUserFBO(state);
>+    return FramebufferVk::CreateUserFBO(mRenderer, state);
> }
> 
> TextureImpl *ContextVk::createTexture(const gl::TextureState &state)
> {
>-    return new TextureVk(state);
>+    return new TextureVk(state, mRenderer);
> }
> 
>-RenderbufferImpl *ContextVk::createRenderbuffer()
>+RenderbufferImpl *ContextVk::createRenderbuffer(const gl::RenderbufferState &state)
> {
>-    return new RenderbufferVk();
>+    return new RenderbufferVk(state);
> }
> 
> BufferImpl *ContextVk::createBuffer(const gl::BufferState &state)
>@@ -816,10 +1085,10 @@ BufferImpl *ContextVk::createBuffer(const gl::BufferState &state)
> 
> VertexArrayImpl *ContextVk::createVertexArray(const gl::VertexArrayState &state)
> {
>-    return new VertexArrayVk(state);
>+    return new VertexArrayVk(this, state);
> }
> 
>-QueryImpl *ContextVk::createQuery(GLenum type)
>+QueryImpl *ContextVk::createQuery(gl::QueryType type)
> {
>     return new QueryVk(type);
> }
>@@ -854,24 +1123,255 @@ std::vector<PathImpl *> ContextVk::createPaths(GLsizei)
>     return std::vector<PathImpl *>();
> }
> 
>-// TODO(jmadill): Use pipeline cache.
>-void ContextVk::invalidateCurrentPipeline()
>+MemoryObjectImpl *ContextVk::createMemoryObject()
> {
>-    mRenderer->releaseResource(*this, &mCurrentPipeline);
>+    return new MemoryObjectVk();
> }
> 
>-gl::Error ContextVk::dispatchCompute(const gl::Context *context,
>-                                     GLuint numGroupsX,
>-                                     GLuint numGroupsY,
>-                                     GLuint numGroupsZ)
>+void ContextVk::invalidateCurrentTextures()
> {
>-    UNIMPLEMENTED();
>-    return gl::InternalError();
>+    ASSERT(mProgram);
>+    if (mProgram->hasTextures())
>+    {
>+        mDirtyBits.set(DIRTY_BIT_TEXTURES);
>+        mDirtyBits.set(DIRTY_BIT_DESCRIPTOR_SETS);
>+    }
>+}
>+
>+void ContextVk::invalidateDriverUniforms()
>+{
>+    mDirtyBits.set(DIRTY_BIT_DRIVER_UNIFORMS);
>+    mDirtyBits.set(DIRTY_BIT_DESCRIPTOR_SETS);
>+}
>+
>+void ContextVk::onFramebufferChange(const vk::RenderPassDesc &renderPassDesc)
>+{
>+    // Ensure that the RenderPass description is updated.
>+    invalidateCurrentPipeline();
>+    mGraphicsPipelineDesc->updateRenderPassDesc(&mGraphicsPipelineTransition, renderPassDesc);
>+}
>+
>+angle::Result ContextVk::dispatchCompute(const gl::Context *context,
>+                                         GLuint numGroupsX,
>+                                         GLuint numGroupsY,
>+                                         GLuint numGroupsZ)
>+{
>+    ANGLE_VK_UNREACHABLE(this);
>+    return angle::Result::Stop;
>+}
>+
>+angle::Result ContextVk::dispatchComputeIndirect(const gl::Context *context, GLintptr indirect)
>+{
>+    ANGLE_VK_UNREACHABLE(this);
>+    return angle::Result::Stop;
> }
> 
>-vk::DescriptorPool *ContextVk::getDescriptorPool()
>+angle::Result ContextVk::memoryBarrier(const gl::Context *context, GLbitfield barriers)
> {
>-    return &mDescriptorPool;
>+    ANGLE_VK_UNREACHABLE(this);
>+    return angle::Result::Stop;
>+}
>+
>+angle::Result ContextVk::memoryBarrierByRegion(const gl::Context *context, GLbitfield barriers)
>+{
>+    ANGLE_VK_UNREACHABLE(this);
>+    return angle::Result::Stop;
>+}
>+
>+vk::DynamicDescriptorPool *ContextVk::getDynamicDescriptorPool(uint32_t descriptorSetIndex)
>+{
>+    return &mDynamicDescriptorPools[descriptorSetIndex];
>+}
>+
>+vk::DynamicQueryPool *ContextVk::getQueryPool(gl::QueryType queryType)
>+{
>+    ASSERT(queryType == gl::QueryType::AnySamples ||
>+           queryType == gl::QueryType::AnySamplesConservative ||
>+           queryType == gl::QueryType::Timestamp || queryType == gl::QueryType::TimeElapsed);
>+    ASSERT(mQueryPools[queryType].isValid());
>+    return &mQueryPools[queryType];
>+}
>+
>+const VkClearValue &ContextVk::getClearColorValue() const
>+{
>+    return mClearColorValue;
>+}
>+
>+const VkClearValue &ContextVk::getClearDepthStencilValue() const
>+{
>+    return mClearDepthStencilValue;
>+}
>+
>+VkColorComponentFlags ContextVk::getClearColorMask() const
>+{
>+    return mClearColorMask;
>+}
>+
>+angle::Result ContextVk::handleDirtyDriverUniforms(const gl::Context *context,
>+                                                   vk::CommandBuffer *commandBuffer)
>+{
>+    // Release any previously retained buffers.
>+    mDriverUniformsBuffer.releaseRetainedBuffers(mRenderer);
>+
>+    const gl::Rectangle &glViewport = mState.getViewport();
>+    float halfRenderAreaHeight =
>+        static_cast<float>(mDrawFramebuffer->getState().getDimensions().height) * 0.5f;
>+
>+    // Allocate a new region in the dynamic buffer.
>+    uint8_t *ptr        = nullptr;
>+    VkBuffer buffer     = VK_NULL_HANDLE;
>+    VkDeviceSize offset = 0;
>+    ANGLE_TRY(mDriverUniformsBuffer.allocate(this, sizeof(DriverUniforms), &ptr, &buffer, &offset,
>+                                             nullptr));
>+    float scaleY = isViewportFlipEnabledForDrawFBO() ? -1.0f : 1.0f;
>+
>+    float depthRangeNear = mState.getNearPlane();
>+    float depthRangeFar  = mState.getFarPlane();
>+    float depthRangeDiff = depthRangeFar - depthRangeNear;
>+
>+    // Copy and flush to the device.
>+    DriverUniforms *driverUniforms = reinterpret_cast<DriverUniforms *>(ptr);
>+    *driverUniforms                = {
>+        {static_cast<float>(glViewport.x), static_cast<float>(glViewport.y),
>+         static_cast<float>(glViewport.width), static_cast<float>(glViewport.height)},
>+        halfRenderAreaHeight,
>+        scaleY,
>+        -scaleY,
>+        0.0f,
>+        {depthRangeNear, depthRangeFar, depthRangeDiff, 0.0f}};
>+
>+    ANGLE_TRY(mDriverUniformsBuffer.flush(this));
>+
>+    // Get the descriptor set layout.
>+    if (!mDriverUniformsSetLayout.valid())
>+    {
>+        vk::DescriptorSetLayoutDesc desc;
>+        desc.update(0, VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER, 1);
>+
>+        ANGLE_TRY(mRenderer->getDescriptorSetLayout(this, desc, &mDriverUniformsSetLayout));
>+    }
>+
>+    // Allocate a new descriptor set.
>+    ANGLE_TRY(mDynamicDescriptorPools[kDriverUniformsDescriptorSetIndex].allocateSets(
>+        this, mDriverUniformsSetLayout.get().ptr(), 1, &mDriverUniformsDescriptorPoolBinding,
>+        &mDriverUniformsDescriptorSet));
>+
>+    // Update the driver uniform descriptor set.
>+    VkDescriptorBufferInfo bufferInfo = {};
>+    bufferInfo.buffer                 = buffer;
>+    bufferInfo.offset                 = offset;
>+    bufferInfo.range                  = sizeof(DriverUniforms);
>+
>+    VkWriteDescriptorSet writeInfo = {};
>+    writeInfo.sType                = VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET;
>+    writeInfo.dstSet               = mDriverUniformsDescriptorSet;
>+    writeInfo.dstBinding           = 0;
>+    writeInfo.dstArrayElement      = 0;
>+    writeInfo.descriptorCount      = 1;
>+    writeInfo.descriptorType       = VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER;
>+    writeInfo.pImageInfo           = nullptr;
>+    writeInfo.pTexelBufferView     = nullptr;
>+    writeInfo.pBufferInfo          = &bufferInfo;
>+
>+    vkUpdateDescriptorSets(getDevice(), 1, &writeInfo, 0, nullptr);
>+
>+    return angle::Result::Continue;
>+}
>+
>+void ContextVk::handleError(VkResult errorCode,
>+                            const char *file,
>+                            const char *function,
>+                            unsigned int line)
>+{
>+    ASSERT(errorCode != VK_SUCCESS);
>+
>+    GLenum glErrorCode = DefaultGLErrorCode(errorCode);
>+
>+    std::stringstream errorStream;
>+    errorStream << "Internal Vulkan error: " << VulkanResultString(errorCode) << ".";
>+
>+    if (errorCode == VK_ERROR_DEVICE_LOST)
>+    {
>+        WARN() << errorStream.str();
>+        mRenderer->notifyDeviceLost();
>+    }
>+
>+    mErrors->handleError(glErrorCode, errorStream.str().c_str(), file, function, line);
>+}
>+
>+angle::Result ContextVk::updateActiveTextures(const gl::Context *context)
>+{
>+    const gl::State &glState   = mState;
>+    const gl::Program *program = glState.getProgram();
>+
>+    mActiveTextures.fill(nullptr);
>+
>+    const gl::ActiveTexturePointerArray &textures  = glState.getActiveTexturesCache();
>+    const gl::ActiveTextureMask &activeTextures    = program->getActiveSamplersMask();
>+    const gl::ActiveTextureTypeArray &textureTypes = program->getActiveSamplerTypes();
>+
>+    for (size_t textureUnit : activeTextures)
>+    {
>+        gl::Texture *texture        = textures[textureUnit];
>+        gl::TextureType textureType = textureTypes[textureUnit];
>+
>+        // Null textures represent incomplete textures.
>+        if (texture == nullptr)
>+        {
>+            ANGLE_TRY(getIncompleteTexture(context, textureType, &texture));
>+        }
>+
>+        mActiveTextures[textureUnit] = vk::GetImpl(texture);
>+    }
>+
>+    return angle::Result::Continue;
>+}
>+
>+const gl::ActiveTextureArray<TextureVk *> &ContextVk::getActiveTextures() const
>+{
>+    return mActiveTextures;
>+}
>+
>+void ContextVk::invalidateDefaultAttribute(size_t attribIndex)
>+{
>+    mDirtyDefaultAttribsMask.set(attribIndex);
>+    mDirtyBits.set(DIRTY_BIT_DEFAULT_ATTRIBS);
>+}
>+
>+void ContextVk::invalidateDefaultAttributes(const gl::AttributesMask &dirtyMask)
>+{
>+    if (dirtyMask.any())
>+    {
>+        mDirtyDefaultAttribsMask |= dirtyMask;
>+        mDirtyBits.set(DIRTY_BIT_DEFAULT_ATTRIBS);
>+    }
>+}
>+
>+angle::Result ContextVk::updateDefaultAttribute(size_t attribIndex)
>+{
>+    vk::DynamicBuffer &defaultBuffer = mDefaultAttribBuffers[attribIndex];
>+
>+    defaultBuffer.releaseRetainedBuffers(mRenderer);
>+
>+    uint8_t *ptr;
>+    VkBuffer bufferHandle = VK_NULL_HANDLE;
>+    VkDeviceSize offset   = 0;
>+    ANGLE_TRY(
>+        defaultBuffer.allocate(this, kDefaultValueSize, &ptr, &bufferHandle, &offset, nullptr));
>+
>+    const gl::State &glState = mState;
>+    const gl::VertexAttribCurrentValueData &defaultValue =
>+        glState.getVertexAttribCurrentValues()[attribIndex];
>+
>+    ASSERT(defaultValue.Type == gl::VertexAttribType::Float);
>+
>+    memcpy(ptr, defaultValue.FloatValues, kDefaultValueSize);
>+
>+    ANGLE_TRY(defaultBuffer.flush(this));
>+
>+    mVertexArray->updateDefaultAttrib(this, attribIndex, bufferHandle,
>+                                      static_cast<uint32_t>(offset));
>+    return angle::Result::Continue;
> }
> 
> }  // namespace rx
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/ContextVk.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/ContextVk.h
>index a89695acc2c..84c5d5ec36a 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/ContextVk.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/ContextVk.h
>@@ -12,66 +12,76 @@
> 
> #include <vulkan/vulkan.h>
> 
>+#include "common/PackedEnums.h"
> #include "libANGLE/renderer/ContextImpl.h"
>-#include "libANGLE/renderer/vulkan/renderervk_utils.h"
>+#include "libANGLE/renderer/vulkan/RendererVk.h"
>+#include "libANGLE/renderer/vulkan/vk_helpers.h"
>+
>+namespace angle
>+{
>+struct FeaturesVk;
>+}
> 
> namespace rx
> {
> class RendererVk;
>+class WindowSurfaceVk;
> 
>-class ContextVk : public ContextImpl, public ResourceVk
>+class ContextVk : public ContextImpl, public vk::Context, public vk::CommandBufferOwner
> {
>   public:
>-    ContextVk(const gl::ContextState &state, RendererVk *renderer);
>+    ContextVk(const gl::State &state, gl::ErrorSet *errorSet, RendererVk *renderer);
>     ~ContextVk() override;
> 
>-    gl::Error initialize() override;
>+    angle::Result initialize() override;
> 
>     void onDestroy(const gl::Context *context) override;
> 
>     // Flush and finish.
>-    gl::Error flush(const gl::Context *context) override;
>-    gl::Error finish(const gl::Context *context) override;
>+    angle::Result flush(const gl::Context *context) override;
>+    angle::Result flushImpl();
>+    angle::Result finish(const gl::Context *context) override;
>+    angle::Result finishImpl();
> 
>     // Drawing methods.
>-    gl::Error drawArrays(const gl::Context *context,
>-                         GLenum mode,
>-                         GLint first,
>-                         GLsizei count) override;
>-    gl::Error drawArraysInstanced(const gl::Context *context,
>-                                  GLenum mode,
>-                                  GLint first,
>-                                  GLsizei count,
>-                                  GLsizei instanceCount) override;
>-
>-    gl::Error drawElements(const gl::Context *context,
>-                           GLenum mode,
>-                           GLsizei count,
>-                           GLenum type,
>-                           const void *indices) override;
>-    gl::Error drawElementsInstanced(const gl::Context *context,
>-                                    GLenum mode,
>+    angle::Result drawArrays(const gl::Context *context,
>+                             gl::PrimitiveMode mode,
>+                             GLint first,
>+                             GLsizei count) override;
>+    angle::Result drawArraysInstanced(const gl::Context *context,
>+                                      gl::PrimitiveMode mode,
>+                                      GLint first,
>+                                      GLsizei count,
>+                                      GLsizei instanceCount) override;
>+
>+    angle::Result drawElements(const gl::Context *context,
>+                               gl::PrimitiveMode mode,
>+                               GLsizei count,
>+                               gl::DrawElementsType type,
>+                               const void *indices) override;
>+    angle::Result drawElementsInstanced(const gl::Context *context,
>+                                        gl::PrimitiveMode mode,
>+                                        GLsizei count,
>+                                        gl::DrawElementsType type,
>+                                        const void *indices,
>+                                        GLsizei instanceCount) override;
>+    angle::Result drawRangeElements(const gl::Context *context,
>+                                    gl::PrimitiveMode mode,
>+                                    GLuint start,
>+                                    GLuint end,
>                                     GLsizei count,
>-                                    GLenum type,
>-                                    const void *indices,
>-                                    GLsizei instances) override;
>-    gl::Error drawRangeElements(const gl::Context *context,
>-                                GLenum mode,
>-                                GLuint start,
>-                                GLuint end,
>-                                GLsizei count,
>-                                GLenum type,
>-                                const void *indices) override;
>-    gl::Error drawArraysIndirect(const gl::Context *context,
>-                                 GLenum mode,
>-                                 const void *indirect) override;
>-    gl::Error drawElementsIndirect(const gl::Context *context,
>-                                   GLenum mode,
>-                                   GLenum type,
>-                                   const void *indirect) override;
>+                                    gl::DrawElementsType type,
>+                                    const void *indices) override;
>+    angle::Result drawArraysIndirect(const gl::Context *context,
>+                                     gl::PrimitiveMode mode,
>+                                     const void *indirect) override;
>+    angle::Result drawElementsIndirect(const gl::Context *context,
>+                                       gl::PrimitiveMode mode,
>+                                       gl::DrawElementsType type,
>+                                       const void *indirect) override;
> 
>     // Device loss
>-    GLenum getResetStatus() override;
>+    gl::GraphicsResetStatus getResetStatus() override;
> 
>     // Vendor and description strings.
>     std::string getVendorString() const override;
>@@ -83,21 +93,27 @@ class ContextVk : public ContextImpl, public ResourceVk
>     void popGroupMarker() override;
> 
>     // KHR_debug
>-    void pushDebugGroup(GLenum source, GLuint id, GLsizei length, const char *message) override;
>+    void pushDebugGroup(GLenum source, GLuint id, const std::string &message) override;
>     void popDebugGroup() override;
> 
>+    bool isViewportFlipEnabledForDrawFBO() const;
>+    bool isViewportFlipEnabledForReadFBO() const;
>+
>     // State sync with dirty bits.
>-    void syncState(const gl::Context *context, const gl::State::DirtyBits &dirtyBits) override;
>+    angle::Result syncState(const gl::Context *context,
>+                            const gl::State::DirtyBits &dirtyBits,
>+                            const gl::State::DirtyBits &bitMask) override;
> 
>     // Disjoint timer queries
>     GLint getGPUDisjoint() override;
>     GLint64 getTimestamp() override;
> 
>     // Context switching
>-    void onMakeCurrent(const gl::Context *context) override;
>+    angle::Result onMakeCurrent(const gl::Context *context) override;
>+    angle::Result onUnMakeCurrent(const gl::Context *context) override;
> 
>     // Native capabilities, unmodified by gl::Context.
>-    const gl::Caps &getNativeCaps() const override;
>+    gl::Caps getNativeCaps() const override;
>     const gl::TextureCapsMap &getNativeTextureCaps() const override;
>     const gl::Extensions &getNativeExtensions() const override;
>     const gl::Limitations &getNativeLimitations() const override;
>@@ -114,7 +130,7 @@ class ContextVk : public ContextImpl, public ResourceVk
>     TextureImpl *createTexture(const gl::TextureState &state) override;
> 
>     // Renderbuffer creation
>-    RenderbufferImpl *createRenderbuffer() override;
>+    RenderbufferImpl *createRenderbuffer(const gl::RenderbufferState &state) override;
> 
>     // Buffer creation
>     BufferImpl *createBuffer(const gl::BufferState &state) override;
>@@ -123,7 +139,7 @@ class ContextVk : public ContextImpl, public ResourceVk
>     VertexArrayImpl *createVertexArray(const gl::VertexArrayState &state) override;
> 
>     // Query and Fence creation
>-    QueryImpl *createQuery(GLenum type) override;
>+    QueryImpl *createQuery(gl::QueryType type) override;
>     FenceNVImpl *createFenceNV() override;
>     SyncImpl *createSync() override;
> 
>@@ -140,51 +156,215 @@ class ContextVk : public ContextImpl, public ResourceVk
>     // Path object creation
>     std::vector<PathImpl *> createPaths(GLsizei) override;
> 
>-    VkDevice getDevice() const;
>-    vk::Error getStartedCommandBuffer(vk::CommandBufferAndState **commandBufferOut);
>-    vk::Error submitCommands(vk::CommandBufferAndState *commandBuffer);
>+    // Memory object creation.
>+    MemoryObjectImpl *createMemoryObject() override;
> 
>-    RendererVk *getRenderer() { return mRenderer; }
>+    angle::Result dispatchCompute(const gl::Context *context,
>+                                  GLuint numGroupsX,
>+                                  GLuint numGroupsY,
>+                                  GLuint numGroupsZ) override;
>+    angle::Result dispatchComputeIndirect(const gl::Context *context, GLintptr indirect) override;
> 
>-    // TODO(jmadill): Use pipeline cache.
>-    void invalidateCurrentPipeline();
>+    angle::Result memoryBarrier(const gl::Context *context, GLbitfield barriers) override;
>+    angle::Result memoryBarrierByRegion(const gl::Context *context, GLbitfield barriers) override;
> 
>-    gl::Error dispatchCompute(const gl::Context *context,
>-                              GLuint numGroupsX,
>-                              GLuint numGroupsY,
>-                              GLuint numGroupsZ) override;
>+    VkDevice getDevice() const;
> 
>-    vk::DescriptorPool *getDescriptorPool();
>+    ANGLE_INLINE const angle::FeaturesVk &getFeatures() const { return mRenderer->getFeatures(); }
>+
>+    ANGLE_INLINE void invalidateVertexAndIndexBuffers()
>+    {
>+        // TODO: Make the pipeline invalidate more fine-grained. Only need to dirty here if PSO
>+        //  VtxInput state (stride, fmt, inputRate...) has changed. http://anglebug.com/3256
>+        invalidateCurrentPipeline();
>+        mDirtyBits.set(DIRTY_BIT_VERTEX_BUFFERS);
>+        mDirtyBits.set(DIRTY_BIT_INDEX_BUFFER);
>+    }
>+
>+    ANGLE_INLINE void onVertexAttributeChange(size_t attribIndex,
>+                                              GLuint stride,
>+                                              GLuint divisor,
>+                                              VkFormat format,
>+                                              GLuint relativeOffset)
>+    {
>+        invalidateVertexAndIndexBuffers();
>+        mGraphicsPipelineDesc->updateVertexInput(&mGraphicsPipelineTransition,
>+                                                 static_cast<uint32_t>(attribIndex), stride,
>+                                                 divisor, format, relativeOffset);
>+    }
>+
>+    void invalidateDefaultAttribute(size_t attribIndex);
>+    void invalidateDefaultAttributes(const gl::AttributesMask &dirtyMask);
>+    void onFramebufferChange(const vk::RenderPassDesc &renderPassDesc);
>+
>+    vk::DynamicDescriptorPool *getDynamicDescriptorPool(uint32_t descriptorSetIndex);
>+    vk::DynamicQueryPool *getQueryPool(gl::QueryType queryType);
>+
>+    const VkClearValue &getClearColorValue() const;
>+    const VkClearValue &getClearDepthStencilValue() const;
>+    VkColorComponentFlags getClearColorMask() const;
>+    angle::Result getIncompleteTexture(const gl::Context *context,
>+                                       gl::TextureType type,
>+                                       gl::Texture **textureOut);
>+    void updateColorMask(const gl::BlendState &blendState);
>+
>+    void handleError(VkResult errorCode,
>+                     const char *file,
>+                     const char *function,
>+                     unsigned int line) override;
>+    const gl::ActiveTextureArray<TextureVk *> &getActiveTextures() const;
>+
>+    void setIndexBufferDirty() { mDirtyBits.set(DIRTY_BIT_INDEX_BUFFER); }
> 
>   private:
>-    gl::Error initPipeline(const gl::Context *context);
>-    gl::Error setupDraw(const gl::Context *context, GLenum mode);
>-
>-    RendererVk *mRenderer;
>-    vk::Pipeline mCurrentPipeline;
>-    GLenum mCurrentDrawMode;
>-
>-    // Keep CreateInfo structures cached so that we can quickly update them when creating
>-    // updated pipelines. When we move to a pipeline cache, we will want to use a more compact
>-    // structure that we can use to query the pipeline cache in the Renderer.
>-    // TODO(jmadill): Update this when we move to a pipeline cache.
>-    VkPipelineShaderStageCreateInfo mCurrentShaderStages[2];
>-    VkPipelineVertexInputStateCreateInfo mCurrentVertexInputState;
>-    VkPipelineInputAssemblyStateCreateInfo mCurrentInputAssemblyState;
>-    VkViewport mCurrentViewportVk;
>-    VkRect2D mCurrentScissorVk;
>-    VkPipelineViewportStateCreateInfo mCurrentViewportState;
>-    VkPipelineRasterizationStateCreateInfo mCurrentRasterState;
>-    VkPipelineMultisampleStateCreateInfo mCurrentMultisampleState;
>-    VkPipelineColorBlendAttachmentState mCurrentBlendAttachmentState;
>-    VkPipelineColorBlendStateCreateInfo mCurrentBlendState;
>-    VkGraphicsPipelineCreateInfo mCurrentPipelineInfo;
>-
>-    // The descriptor pool is externally sychronized, so cannot be accessed from different threads
>-    // simulataneously. Hence, we keep it in the ContextVk instead of the RendererVk.
>-    vk::DescriptorPool mDescriptorPool;
>+    // Dirty bits.
>+    enum DirtyBitType : size_t
>+    {
>+        DIRTY_BIT_DEFAULT_ATTRIBS,
>+        DIRTY_BIT_PIPELINE,
>+        DIRTY_BIT_TEXTURES,
>+        DIRTY_BIT_VERTEX_BUFFERS,
>+        DIRTY_BIT_INDEX_BUFFER,
>+        DIRTY_BIT_DRIVER_UNIFORMS,
>+        DIRTY_BIT_DESCRIPTOR_SETS,
>+        DIRTY_BIT_MAX,
>+    };
>+
>+    using DirtyBits = angle::BitSet<DIRTY_BIT_MAX>;
>+
>+    using DirtyBitHandler = angle::Result (ContextVk::*)(const gl::Context *,
>+                                                         vk::CommandBuffer *commandBuffer);
>+
>+    std::array<DirtyBitHandler, DIRTY_BIT_MAX> mDirtyBitHandlers;
>+
>+    angle::Result setupDraw(const gl::Context *context,
>+                            gl::PrimitiveMode mode,
>+                            GLint firstVertex,
>+                            GLsizei vertexOrIndexCount,
>+                            GLsizei instanceCount,
>+                            gl::DrawElementsType indexTypeOrInvalid,
>+                            const void *indices,
>+                            DirtyBits dirtyBitMask,
>+                            vk::CommandBuffer **commandBufferOut);
>+    angle::Result setupIndexedDraw(const gl::Context *context,
>+                                   gl::PrimitiveMode mode,
>+                                   GLsizei indexCount,
>+                                   GLsizei instanceCount,
>+                                   gl::DrawElementsType indexType,
>+                                   const void *indices,
>+                                   vk::CommandBuffer **commandBufferOut);
>+    angle::Result setupLineLoopDraw(const gl::Context *context,
>+                                    gl::PrimitiveMode mode,
>+                                    GLint firstVertex,
>+                                    GLsizei vertexOrIndexCount,
>+                                    gl::DrawElementsType indexTypeOrInvalid,
>+                                    const void *indices,
>+                                    vk::CommandBuffer **commandBufferOut);
>+
>+    void updateViewport(FramebufferVk *framebufferVk,
>+                        const gl::Rectangle &viewport,
>+                        float nearPlane,
>+                        float farPlane,
>+                        bool invertViewport);
>+    void updateDepthRange(float nearPlane, float farPlane);
>+    void updateScissor(const gl::State &glState);
>+    void updateFlipViewportDrawFramebuffer(const gl::State &glState);
>+    void updateFlipViewportReadFramebuffer(const gl::State &glState);
>+
>+    angle::Result updateActiveTextures(const gl::Context *context);
>+    angle::Result updateDefaultAttribute(size_t attribIndex);
>+
>+    ANGLE_INLINE void invalidateCurrentPipeline() { mDirtyBits.set(DIRTY_BIT_PIPELINE); }
>+
>+    void invalidateCurrentTextures();
>+    void invalidateDriverUniforms();
>+
>+    angle::Result handleDirtyDefaultAttribs(const gl::Context *context,
>+                                            vk::CommandBuffer *commandBuffer);
>+    angle::Result handleDirtyPipeline(const gl::Context *context, vk::CommandBuffer *commandBuffer);
>+    angle::Result handleDirtyTextures(const gl::Context *context, vk::CommandBuffer *commandBuffer);
>+    angle::Result handleDirtyVertexBuffers(const gl::Context *context,
>+                                           vk::CommandBuffer *commandBuffer);
>+    angle::Result handleDirtyIndexBuffer(const gl::Context *context,
>+                                         vk::CommandBuffer *commandBuffer);
>+    angle::Result handleDirtyDriverUniforms(const gl::Context *context,
>+                                            vk::CommandBuffer *commandBuffer);
>+    angle::Result handleDirtyDescriptorSets(const gl::Context *context,
>+                                            vk::CommandBuffer *commandBuffer);
>+
>+    vk::PipelineHelper *mCurrentPipeline;
>+    gl::PrimitiveMode mCurrentDrawMode;
>+
>+    WindowSurfaceVk *mCurrentWindowSurface;
>+
>+    // Keep a cached pipeline description structure that can be used to query the pipeline cache.
>+    // Kept in a pointer so allocations can be aligned, and structs can be portably packed.
>+    std::unique_ptr<vk::GraphicsPipelineDesc> mGraphicsPipelineDesc;
>+    vk::GraphicsPipelineTransitionBits mGraphicsPipelineTransition;
>+
>+    // The descriptor pools are externally sychronized, so cannot be accessed from different
>+    // threads simultaneously. Hence, we keep them in the ContextVk instead of the RendererVk.
>+    // Note that this implementation would need to change in shared resource scenarios. Likely
>+    // we'd instead share a single set of dynamic descriptor pools between the share groups.
>+    // Same with query pools.
>+    vk::DescriptorSetLayoutArray<vk::DynamicDescriptorPool> mDynamicDescriptorPools;
>+    angle::PackedEnumMap<gl::QueryType, vk::DynamicQueryPool> mQueryPools;
>+
>+    // Dirty bits.
>+    DirtyBits mDirtyBits;
>+    DirtyBits mNonIndexedDirtyBitsMask;
>+    DirtyBits mIndexedDirtyBitsMask;
>+    DirtyBits mNewCommandBufferDirtyBits;
>+
>+    // Cached back-end objects.
>+    VertexArrayVk *mVertexArray;
>+    FramebufferVk *mDrawFramebuffer;
>+    ProgramVk *mProgram;
>+
>+    // The offset we had the last time we bound the index buffer.
>+    const GLvoid *mLastIndexBufferOffset;
>+    gl::DrawElementsType mCurrentDrawElementsType;
>+
>+    // Cached clear value/mask for color and depth/stencil.
>+    VkClearValue mClearColorValue;
>+    VkClearValue mClearDepthStencilValue;
>+    VkColorComponentFlags mClearColorMask;
>+
>+    IncompleteTextureSet mIncompleteTextures;
>+
>+    // If the current surface bound to this context wants to have all rendering flipped vertically.
>+    // Updated on calls to onMakeCurrent.
>+    bool mFlipYForCurrentSurface;
>+    bool mFlipViewportForDrawFramebuffer;
>+    bool mFlipViewportForReadFramebuffer;
>+
>+    // For shader uniforms such as gl_DepthRange and the viewport size.
>+    struct DriverUniforms
>+    {
>+        std::array<float, 4> viewport;
>+
>+        float halfRenderAreaHeight;
>+        float viewportYScale;
>+        float negViewportYScale;
>+        float padding;
>+
>+        // We'll use x, y, z for near / far / diff respectively.
>+        std::array<float, 4> depthRange;
>+    };
>+
>+    vk::DynamicBuffer mDriverUniformsBuffer;
>+    VkDescriptorSet mDriverUniformsDescriptorSet;
>+    vk::BindingPointer<vk::DescriptorSetLayout> mDriverUniformsSetLayout;
>+    vk::RefCountedDescriptorPoolBinding mDriverUniformsDescriptorPoolBinding;
>+
>+    // This cache should also probably include the texture index (shader location) and array
>+    // index (also in the shader). This info is used in the descriptor update step.
>+    gl::ActiveTextureArray<TextureVk *> mActiveTextures;
>+
>+    // "Current Value" aka default vertex attribute state.
>+    gl::AttributesMask mDirtyDefaultAttribsMask;
>+    gl::AttribArray<vk::DynamicBuffer> mDefaultAttribBuffers;
> };
>-
> }  // namespace rx
> 
> #endif  // LIBANGLE_RENDERER_VULKAN_CONTEXTVK_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/DeviceVk.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/DeviceVk.cpp
>index 2c9c1b350da..900f0ea3321 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/DeviceVk.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/DeviceVk.cpp
>@@ -14,12 +14,14 @@
> namespace rx
> {
> 
>-DeviceVk::DeviceVk() : DeviceImpl()
>-{
>-}
>+DeviceVk::DeviceVk() : DeviceImpl() {}
> 
>-DeviceVk::~DeviceVk()
>+DeviceVk::~DeviceVk() {}
>+
>+egl::Error DeviceVk::initialize()
> {
>+    UNIMPLEMENTED();
>+    return egl::NoError();
> }
> 
> egl::Error DeviceVk::getDevice(void **outValue)
>@@ -39,10 +41,4 @@ void DeviceVk::generateExtensions(egl::DeviceExtensions *outExtensions) const
>     UNIMPLEMENTED();
> }
> 
>-bool DeviceVk::deviceExternallySourced()
>-{
>-    UNIMPLEMENTED();
>-    return bool();
>-}
>-
> }  // namespace rx
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/DeviceVk.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/DeviceVk.h
>index 4613c17516d..8a6e52c9793 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/DeviceVk.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/DeviceVk.h
>@@ -21,10 +21,10 @@ class DeviceVk : public DeviceImpl
>     DeviceVk();
>     ~DeviceVk() override;
> 
>+    egl::Error initialize() override;
>     egl::Error getDevice(void **outValue) override;
>     EGLint getType() override;
>     void generateExtensions(egl::DeviceExtensions *outExtensions) const override;
>-    bool deviceExternallySourced() override;
> };
> 
> }  // namespace rx
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/DisplayVk.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/DisplayVk.cpp
>index a009830889e..f8e85301ede 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/DisplayVk.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/DisplayVk.cpp
>@@ -13,31 +13,36 @@
> #include "libANGLE/Context.h"
> #include "libANGLE/Display.h"
> #include "libANGLE/renderer/vulkan/ContextVk.h"
>+#include "libANGLE/renderer/vulkan/ImageVk.h"
> #include "libANGLE/renderer/vulkan/RendererVk.h"
> #include "libANGLE/renderer/vulkan/SurfaceVk.h"
>+#include "libANGLE/renderer/vulkan/SyncVk.h"
>+#include "third_party/trace_event/trace_event.h"
> 
> namespace rx
> {
> 
>-DisplayVk::DisplayVk(const egl::DisplayState &state) : DisplayImpl(state), mRenderer(nullptr)
>-{
>-}
>+DisplayVk::DisplayVk(const egl::DisplayState &state)
>+    : DisplayImpl(state), vk::Context(new RendererVk()), mScratchBuffer(1000u)
>+{}
> 
> DisplayVk::~DisplayVk()
> {
>+    delete mRenderer;
> }
> 
> egl::Error DisplayVk::initialize(egl::Display *display)
> {
>-    ASSERT(!mRenderer && display != nullptr);
>-    mRenderer.reset(new RendererVk());
>-    return mRenderer->initialize(display->getAttributeMap(), getWSIName())
>-        .toEGL(EGL_NOT_INITIALIZED);
>+    ASSERT(mRenderer != nullptr && display != nullptr);
>+    angle::Result result = mRenderer->initialize(this, display, getWSIExtension(), getWSILayer());
>+    ANGLE_TRY(angle::ToEGL(result, this, EGL_NOT_INITIALIZED));
>+    return egl::NoError();
> }
> 
> void DisplayVk::terminate()
> {
>-    mRenderer.reset(nullptr);
>+    ASSERT(mRenderer);
>+    mRenderer->onDestroy(this);
> }
> 
> egl::Error DisplayVk::makeCurrent(egl::Surface * /*drawSurface*/,
>@@ -47,61 +52,16 @@ egl::Error DisplayVk::makeCurrent(egl::Surface * /*drawSurface*/,
>     return egl::NoError();
> }
> 
>-egl::ConfigSet DisplayVk::generateConfigs()
>-{
>-    // TODO(jmadill): Multiple configs, pbuffers, and proper checking of config attribs.
>-    egl::Config singleton;
>-    singleton.renderTargetFormat    = GL_RGBA8;
>-    singleton.depthStencilFormat    = GL_NONE;
>-    singleton.bufferSize            = 32;
>-    singleton.redSize               = 8;
>-    singleton.greenSize             = 8;
>-    singleton.blueSize              = 8;
>-    singleton.alphaSize             = 8;
>-    singleton.alphaMaskSize         = 0;
>-    singleton.bindToTextureRGB      = EGL_FALSE;
>-    singleton.bindToTextureRGBA     = EGL_FALSE;
>-    singleton.colorBufferType       = EGL_RGB_BUFFER;
>-    singleton.configCaveat          = EGL_NONE;
>-    singleton.conformant            = 0;
>-    singleton.depthSize             = 0;
>-    singleton.stencilSize           = 0;
>-    singleton.level                 = 0;
>-    singleton.matchNativePixmap     = EGL_NONE;
>-    singleton.maxPBufferWidth       = 0;
>-    singleton.maxPBufferHeight      = 0;
>-    singleton.maxPBufferPixels      = 0;
>-    singleton.maxSwapInterval       = 1;
>-    singleton.minSwapInterval       = 1;
>-    singleton.nativeRenderable      = EGL_TRUE;
>-    singleton.nativeVisualID        = 0;
>-    singleton.nativeVisualType      = EGL_NONE;
>-    singleton.renderableType        = EGL_OPENGL_ES2_BIT;
>-    singleton.sampleBuffers         = 0;
>-    singleton.samples               = 0;
>-    singleton.surfaceType           = EGL_WINDOW_BIT;
>-    singleton.optimalOrientation    = 0;
>-    singleton.transparentType       = EGL_NONE;
>-    singleton.transparentRedValue   = 0;
>-    singleton.transparentGreenValue = 0;
>-    singleton.transparentBlueValue  = 0;
>-    singleton.colorComponentType    = EGL_COLOR_COMPONENT_TYPE_FIXED_EXT;
>-
>-    egl::ConfigSet configSet;
>-    configSet.add(singleton);
>-    return configSet;
>-}
>-
> bool DisplayVk::testDeviceLost()
> {
>-    // TODO(jmadill): Figure out how to do device lost in Vulkan.
>-    return false;
>+    return mRenderer->isDeviceLost();
> }
> 
> egl::Error DisplayVk::restoreLostDevice(const egl::Display *display)
> {
>-    UNIMPLEMENTED();
>-    return egl::EglBadAccess();
>+    // A vulkan device cannot be restored, the entire renderer would have to be re-created along
>+    // with any other EGL objects that reference it.
>+    return egl::EglBadDisplay();
> }
> 
> std::string DisplayVk::getVendorString() const
>@@ -115,18 +75,20 @@ std::string DisplayVk::getVendorString() const
>     return vendorString;
> }
> 
>-egl::Error DisplayVk::getDevice(DeviceImpl **device)
>+DeviceImpl *DisplayVk::createDevice()
> {
>-    return egl::NoError();
>+    UNIMPLEMENTED();
>+    return nullptr;
> }
> 
>-egl::Error DisplayVk::waitClient(const gl::Context *context) const
>+egl::Error DisplayVk::waitClient(const gl::Context *context)
> {
>-    UNIMPLEMENTED();
>-    return egl::EglBadAccess();
>+    TRACE_EVENT0("gpu.angle", "DisplayVk::waitClient");
>+    ContextVk *contextVk = vk::GetImpl(context);
>+    return angle::ToEGL(contextVk->finishImpl(), this, EGL_BAD_ACCESS);
> }
> 
>-egl::Error DisplayVk::waitNative(const gl::Context *context, EGLint engine) const
>+egl::Error DisplayVk::waitNative(const gl::Context *context, EGLint engine)
> {
>     UNIMPLEMENTED();
>     return egl::EglBadAccess();
>@@ -171,19 +133,23 @@ SurfaceImpl *DisplayVk::createPixmapSurface(const egl::SurfaceState &state,
> }
> 
> ImageImpl *DisplayVk::createImage(const egl::ImageState &state,
>+                                  const gl::Context *context,
>                                   EGLenum target,
>                                   const egl::AttributeMap &attribs)
> {
>-    UNIMPLEMENTED();
>-    return static_cast<ImageImpl *>(0);
>+    return new ImageVk(state, context);
> }
> 
>-ContextImpl *DisplayVk::createContext(const gl::ContextState &state)
>+rx::ContextImpl *DisplayVk::createContext(const gl::State &state,
>+                                          gl::ErrorSet *errorSet,
>+                                          const egl::Config *configuration,
>+                                          const gl::Context *shareContext,
>+                                          const egl::AttributeMap &attribs)
> {
>-    return new ContextVk(state, mRenderer.get());
>+    return new ContextVk(state, errorSet, mRenderer);
> }
> 
>-StreamProducerImpl *DisplayVk::createStreamProducerD3DTextureNV12(
>+StreamProducerImpl *DisplayVk::createStreamProducerD3DTexture(
>     egl::Stream::ConsumerType consumerType,
>     const egl::AttributeMap &attribs)
> {
>@@ -191,14 +157,39 @@ StreamProducerImpl *DisplayVk::createStreamProducerD3DTextureNV12(
>     return static_cast<StreamProducerImpl *>(0);
> }
> 
>+EGLSyncImpl *DisplayVk::createSync(const egl::AttributeMap &attribs)
>+{
>+    return new EGLSyncVk(attribs);
>+}
>+
> gl::Version DisplayVk::getMaxSupportedESVersion() const
> {
>-    UNIMPLEMENTED();
>-    return gl::Version(0, 0);
>+    return mRenderer->getMaxSupportedESVersion();
> }
> 
> void DisplayVk::generateExtensions(egl::DisplayExtensions *outExtensions) const
> {
>+    outExtensions->createContextRobustness  = true;
>+    outExtensions->surfaceOrientation       = true;
>+    outExtensions->displayTextureShareGroup = true;
>+    outExtensions->robustResourceInitialization = true;
>+
>+    // The Vulkan implementation will always say that EGL_KHR_swap_buffers_with_damage is supported.
>+    // When the Vulkan driver supports VK_KHR_incremental_present, it will use it.  Otherwise, it
>+    // will ignore the hint and do a regular swap.
>+    outExtensions->swapBuffersWithDamage = true;
>+
>+    outExtensions->fenceSync = true;
>+    outExtensions->waitSync  = true;
>+
>+    outExtensions->image                 = true;
>+    outExtensions->imageBase             = true;
>+    outExtensions->imagePixmap           = false;  // ANGLE does not support pixmaps
>+    outExtensions->glTexture2DImage      = true;
>+    outExtensions->glTextureCubemapImage = true;
>+    outExtensions->glTexture3DImage      = false;
>+    outExtensions->glRenderbufferImage   = true;
>+    outExtensions->imageNativeBuffer = getRenderer()->getFeatures().supportsAndroidHardwareBuffer;
> }
> 
> void DisplayVk::generateCaps(egl::Caps *outCaps) const
>@@ -206,4 +197,39 @@ void DisplayVk::generateCaps(egl::Caps *outCaps) const
>     outCaps->textureNPOT = true;
> }
> 
>+const char *DisplayVk::getWSILayer() const
>+{
>+    return nullptr;
>+}
>+
>+bool DisplayVk::getScratchBuffer(size_t requstedSizeBytes,
>+                                 angle::MemoryBuffer **scratchBufferOut) const
>+{
>+    return mScratchBuffer.get(requstedSizeBytes, scratchBufferOut);
>+}
>+
>+void DisplayVk::handleError(VkResult result,
>+                            const char *file,
>+                            const char *function,
>+                            unsigned int line)
>+{
>+    ASSERT(result != VK_SUCCESS);
>+
>+    std::stringstream errorStream;
>+    errorStream << "Internal Vulkan error: " << VulkanResultString(result) << ", in " << file
>+                << ", " << function << ":" << line << ".";
>+    mStoredErrorString = errorStream.str();
>+
>+    if (result == VK_ERROR_DEVICE_LOST)
>+    {
>+        WARN() << mStoredErrorString;
>+        mRenderer->notifyDeviceLost();
>+    }
>+}
>+
>+// TODO(jmadill): Remove this. http://anglebug.com/3041
>+egl::Error DisplayVk::getEGLError(EGLint errorCode)
>+{
>+    return egl::Error(errorCode, 0, std::move(mStoredErrorString));
>+}
> }  // namespace rx
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/DisplayVk.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/DisplayVk.h
>index 2cc6059ec55..fbdb7d78930 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/DisplayVk.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/DisplayVk.h
>@@ -10,13 +10,15 @@
> #ifndef LIBANGLE_RENDERER_VULKAN_DISPLAYVK_H_
> #define LIBANGLE_RENDERER_VULKAN_DISPLAYVK_H_
> 
>+#include "common/MemoryBuffer.h"
> #include "libANGLE/renderer/DisplayImpl.h"
>+#include "libANGLE/renderer/vulkan/vk_utils.h"
> 
> namespace rx
> {
> class RendererVk;
> 
>-class DisplayVk : public DisplayImpl
>+class DisplayVk : public DisplayImpl, public vk::Context
> {
>   public:
>     DisplayVk(const egl::DisplayState &state);
>@@ -29,17 +31,15 @@ class DisplayVk : public DisplayImpl
>                            egl::Surface *readSurface,
>                            gl::Context *context) override;
> 
>-    egl::ConfigSet generateConfigs() override;
>-
>     bool testDeviceLost() override;
>     egl::Error restoreLostDevice(const egl::Display *display) override;
> 
>     std::string getVendorString() const override;
> 
>-    egl::Error getDevice(DeviceImpl **device) override;
>+    DeviceImpl *createDevice() override;
> 
>-    egl::Error waitClient(const gl::Context *context) const override;
>-    egl::Error waitNative(const gl::Context *context, EGLint engine) const override;
>+    egl::Error waitClient(const gl::Context *context) override;
>+    egl::Error waitNative(const gl::Context *context, EGLint engine) override;
> 
>     SurfaceImpl *createWindowSurface(const egl::SurfaceState &state,
>                                      EGLNativeWindowType window,
>@@ -55,19 +55,42 @@ class DisplayVk : public DisplayImpl
>                                      const egl::AttributeMap &attribs) override;
> 
>     ImageImpl *createImage(const egl::ImageState &state,
>+                           const gl::Context *context,
>                            EGLenum target,
>                            const egl::AttributeMap &attribs) override;
> 
>-    ContextImpl *createContext(const gl::ContextState &state) override;
>+    ContextImpl *createContext(const gl::State &state,
>+                               gl::ErrorSet *errorSet,
>+                               const egl::Config *configuration,
>+                               const gl::Context *shareContext,
>+                               const egl::AttributeMap &attribs) override;
>+
>+    StreamProducerImpl *createStreamProducerD3DTexture(egl::Stream::ConsumerType consumerType,
>+                                                       const egl::AttributeMap &attribs) override;
>+
>+    EGLSyncImpl *createSync(const egl::AttributeMap &attribs) override;
> 
>-    StreamProducerImpl *createStreamProducerD3DTextureNV12(
>-        egl::Stream::ConsumerType consumerType,
>-        const egl::AttributeMap &attribs) override;
>     gl::Version getMaxSupportedESVersion() const override;
> 
>-    RendererVk *getRenderer() const { return mRenderer.get(); }
>+    virtual const char *getWSIExtension() const = 0;
>+    virtual const char *getWSILayer() const;
>+
>+    // Determine if a config with given formats and sample counts is supported.  This callback may
>+    // modify the config to add or remove platform specific attributes such as nativeVisualID before
>+    // returning a bool to indicate if the config should be supported.
>+    virtual bool checkConfigSupport(egl::Config *config) = 0;
> 
>-    virtual const char *getWSIName() const = 0;
>+    ANGLE_NO_DISCARD bool getScratchBuffer(size_t requestedSizeBytes,
>+                                           angle::MemoryBuffer **scratchBufferOut) const;
>+    angle::ScratchBuffer *getScratchBuffer() const { return &mScratchBuffer; }
>+
>+    void handleError(VkResult result,
>+                     const char *file,
>+                     const char *function,
>+                     unsigned int line) override;
>+
>+    // TODO(jmadill): Remove this once refactor is done. http://anglebug.com/3041
>+    egl::Error getEGLError(EGLint errorCode);
> 
>   private:
>     virtual SurfaceImpl *createWindowSurfaceVk(const egl::SurfaceState &state,
>@@ -77,7 +100,9 @@ class DisplayVk : public DisplayImpl
>     void generateExtensions(egl::DisplayExtensions *outExtensions) const override;
>     void generateCaps(egl::Caps *outCaps) const override;
> 
>-    std::unique_ptr<RendererVk> mRenderer;
>+    mutable angle::ScratchBuffer mScratchBuffer;
>+
>+    std::string mStoredErrorString;
> };
> 
> }  // namespace rx
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/FenceNVVk.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/FenceNVVk.cpp
>index 805fc8c697a..c1fa4b339e4 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/FenceNVVk.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/FenceNVVk.cpp
>@@ -10,34 +10,33 @@
> #include "libANGLE/renderer/vulkan/FenceNVVk.h"
> 
> #include "common/debug.h"
>+#include "libANGLE/Context.h"
>+#include "libANGLE/renderer/vulkan/ContextVk.h"
>+#include "libANGLE/renderer/vulkan/vk_utils.h"
> 
> namespace rx
> {
> 
>-FenceNVVk::FenceNVVk() : FenceNVImpl()
>-{
>-}
>+FenceNVVk::FenceNVVk() : FenceNVImpl() {}
> 
>-FenceNVVk::~FenceNVVk()
>-{
>-}
>+FenceNVVk::~FenceNVVk() {}
> 
>-gl::Error FenceNVVk::set(GLenum condition)
>+angle::Result FenceNVVk::set(const gl::Context *context, GLenum condition)
> {
>-    UNIMPLEMENTED();
>-    return gl::InternalError();
>+    ANGLE_VK_UNREACHABLE(vk::GetImpl(context));
>+    return angle::Result::Stop;
> }
> 
>-gl::Error FenceNVVk::test(GLboolean *outFinished)
>+angle::Result FenceNVVk::test(const gl::Context *context, GLboolean *outFinished)
> {
>-    UNIMPLEMENTED();
>-    return gl::InternalError();
>+    ANGLE_VK_UNREACHABLE(vk::GetImpl(context));
>+    return angle::Result::Stop;
> }
> 
>-gl::Error FenceNVVk::finish()
>+angle::Result FenceNVVk::finish(const gl::Context *context)
> {
>-    UNIMPLEMENTED();
>-    return gl::InternalError();
>+    ANGLE_VK_UNREACHABLE(vk::GetImpl(context));
>+    return angle::Result::Stop;
> }
> 
> }  // namespace rx
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/FenceNVVk.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/FenceNVVk.h
>index be054715c9b..b297fc61d9d 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/FenceNVVk.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/FenceNVVk.h
>@@ -14,18 +14,16 @@
> 
> namespace rx
> {
>-
> class FenceNVVk : public FenceNVImpl
> {
>   public:
>     FenceNVVk();
>     ~FenceNVVk() override;
> 
>-    gl::Error set(GLenum condition) override;
>-    gl::Error test(GLboolean *outFinished) override;
>-    gl::Error finish() override;
>+    angle::Result set(const gl::Context *context, GLenum condition) override;
>+    angle::Result test(const gl::Context *context, GLboolean *outFinished) override;
>+    angle::Result finish(const gl::Context *context) override;
> };
>-
> }  // namespace rx
> 
> #endif  // LIBANGLE_RENDERER_VULKAN_FENCENVVK_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/FramebufferVk.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/FramebufferVk.cpp
>index b69f99f8d8b..566629eca54 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/FramebufferVk.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/FramebufferVk.cpp
>@@ -13,562 +13,1278 @@
> #include <array>
> 
> #include "common/debug.h"
>-#include "image_util/imageformats.h"
> #include "libANGLE/Context.h"
> #include "libANGLE/Display.h"
> #include "libANGLE/formatutils.h"
> #include "libANGLE/renderer/renderer_utils.h"
>+#include "libANGLE/renderer/vulkan/CommandGraph.h"
> #include "libANGLE/renderer/vulkan/ContextVk.h"
> #include "libANGLE/renderer/vulkan/DisplayVk.h"
> #include "libANGLE/renderer/vulkan/RenderTargetVk.h"
> #include "libANGLE/renderer/vulkan/RendererVk.h"
> #include "libANGLE/renderer/vulkan/SurfaceVk.h"
>-#include "libANGLE/renderer/vulkan/formatutilsvk.h"
>+#include "libANGLE/renderer/vulkan/vk_format_utils.h"
>+#include "third_party/trace_event/trace_event.h"
> 
> namespace rx
> {
> 
> namespace
> {
>+// The value to assign an alpha channel that's emulated.  The type is unsigned int, though it will
>+// automatically convert to the actual data type.
>+constexpr unsigned int kEmulatedAlphaValue = 1;
>+
>+constexpr size_t kMinReadPixelsBufferSize = 128000;
>+// Clear values are only used when loadOp=Clear is set in clearWithRenderPassOp.  When starting a
>+// new render pass, the clear value is set to an unlikely value (bright pink) to stand out better
>+// in case of a bug.
>+constexpr VkClearValue kUninitializedClearValue = {{{0.95, 0.05, 0.95, 0.95}}};
>+
>+const gl::InternalFormat &GetReadAttachmentInfo(const gl::Context *context,
>+                                                RenderTargetVk *renderTarget)
>+{
>+    GLenum implFormat =
>+        renderTarget->getImageFormat().imageFormat().fboImplementationInternalFormat;
>+    return gl::GetSizedInternalFormatInfo(implFormat);
>+}
>+
>+bool ClipToRenderTarget(const gl::Rectangle &area,
>+                        RenderTargetVk *renderTarget,
>+                        gl::Rectangle *rectOut)
>+{
>+    const gl::Extents renderTargetExtents = renderTarget->getExtents();
>+    gl::Rectangle renderTargetRect(0, 0, renderTargetExtents.width, renderTargetExtents.height);
>+    return ClipRectangle(area, renderTargetRect, rectOut);
>+}
> 
>-gl::ErrorOrResult<const gl::InternalFormat *> GetReadAttachmentInfo(
>-    const gl::Context *context,
>-    const gl::FramebufferAttachment *readAttachment)
>+bool HasSrcAndDstBlitProperties(RendererVk *renderer,
>+                                RenderTargetVk *srcRenderTarget,
>+                                RenderTargetVk *dstRenderTarget)
> {
>-    RenderTargetVk *renderTarget = nullptr;
>-    ANGLE_TRY(readAttachment->getRenderTarget(context, &renderTarget));
>+    const VkFormat srcFormat = srcRenderTarget->getImageFormat().vkImageFormat;
>+    const VkFormat dstFormat = dstRenderTarget->getImageFormat().vkImageFormat;
> 
>-    GLenum implFormat = renderTarget->format->textureFormat().fboImplementationInternalFormat;
>-    return &gl::GetSizedInternalFormatInfo(implFormat);
>+    // Verifies if the draw and read images have the necessary prerequisites for blitting.
>+    return renderer->hasImageFormatFeatureBits(srcFormat, VK_FORMAT_FEATURE_BLIT_SRC_BIT) &&
>+           renderer->hasImageFormatFeatureBits(dstFormat, VK_FORMAT_FEATURE_BLIT_DST_BIT);
> }
> 
>-VkSampleCountFlagBits ConvertSamples(GLint sampleCount)
>+// Special rules apply to VkBufferImageCopy with depth/stencil. The components are tightly packed
>+// into a depth or stencil section of the destination buffer. See the spec:
>+// https://www.khronos.org/registry/vulkan/specs/1.1-extensions/man/html/VkBufferImageCopy.html
>+const angle::Format &GetDepthStencilImageToBufferFormat(const angle::Format &imageFormat,
>+                                                        VkImageAspectFlagBits copyAspect)
> {
>-    switch (sampleCount)
>+    if (copyAspect == VK_IMAGE_ASPECT_STENCIL_BIT)
>+    {
>+        ASSERT(imageFormat.id == angle::FormatID::D24_UNORM_S8_UINT ||
>+               imageFormat.id == angle::FormatID::D32_FLOAT_S8X24_UINT ||
>+               imageFormat.id == angle::FormatID::S8_UINT);
>+        return angle::Format::Get(angle::FormatID::S8_UINT);
>+    }
>+
>+    ASSERT(copyAspect == VK_IMAGE_ASPECT_DEPTH_BIT);
>+
>+    switch (imageFormat.id)
>     {
>-        case 0:
>-        case 1:
>-            return VK_SAMPLE_COUNT_1_BIT;
>-        case 2:
>-            return VK_SAMPLE_COUNT_2_BIT;
>-        case 4:
>-            return VK_SAMPLE_COUNT_4_BIT;
>-        case 8:
>-            return VK_SAMPLE_COUNT_8_BIT;
>-        case 16:
>-            return VK_SAMPLE_COUNT_16_BIT;
>-        case 32:
>-            return VK_SAMPLE_COUNT_32_BIT;
>+        case angle::FormatID::D16_UNORM:
>+            return imageFormat;
>+        case angle::FormatID::D24_UNORM_X8_UINT:
>+            return imageFormat;
>+        case angle::FormatID::D24_UNORM_S8_UINT:
>+            return angle::Format::Get(angle::FormatID::D24_UNORM_X8_UINT);
>+        case angle::FormatID::D32_FLOAT:
>+            return imageFormat;
>+        case angle::FormatID::D32_FLOAT_S8X24_UINT:
>+            return angle::Format::Get(angle::FormatID::D32_FLOAT);
>         default:
>             UNREACHABLE();
>-            return VK_SAMPLE_COUNT_FLAG_BITS_MAX_ENUM;
>+            return imageFormat;
>     }
> }
> 
>+void SetEmulatedAlphaValue(const vk::Format &format, VkClearColorValue *value)
>+{
>+    if (format.vkFormatIsInt)
>+    {
>+        if (format.vkFormatIsUnsigned)
>+        {
>+            value->uint32[3] = kEmulatedAlphaValue;
>+        }
>+        else
>+        {
>+            value->int32[3] = kEmulatedAlphaValue;
>+        }
>+    }
>+    else
>+    {
>+        value->float32[3] = kEmulatedAlphaValue;
>+    }
>+}
> }  // anonymous namespace
> 
> // static
>-FramebufferVk *FramebufferVk::CreateUserFBO(const gl::FramebufferState &state)
>+FramebufferVk *FramebufferVk::CreateUserFBO(RendererVk *renderer, const gl::FramebufferState &state)
> {
>-    return new FramebufferVk(state);
>+    return new FramebufferVk(renderer, state, nullptr);
> }
> 
> // static
>-FramebufferVk *FramebufferVk::CreateDefaultFBO(const gl::FramebufferState &state,
>+FramebufferVk *FramebufferVk::CreateDefaultFBO(RendererVk *renderer,
>+                                               const gl::FramebufferState &state,
>                                                WindowSurfaceVk *backbuffer)
> {
>-    return new FramebufferVk(state, backbuffer);
>-}
>-
>-FramebufferVk::FramebufferVk(const gl::FramebufferState &state)
>-    : FramebufferImpl(state), mBackbuffer(nullptr), mRenderPass(), mFramebuffer()
>-{
>+    return new FramebufferVk(renderer, state, backbuffer);
> }
> 
>-FramebufferVk::FramebufferVk(const gl::FramebufferState &state, WindowSurfaceVk *backbuffer)
>-    : FramebufferImpl(state), mBackbuffer(backbuffer), mRenderPass(), mFramebuffer()
>+FramebufferVk::FramebufferVk(RendererVk *renderer,
>+                             const gl::FramebufferState &state,
>+                             WindowSurfaceVk *backbuffer)
>+    : FramebufferImpl(state),
>+      mBackbuffer(backbuffer),
>+      mActiveColorComponents(0),
>+      mReadPixelBuffer(VK_BUFFER_USAGE_TRANSFER_DST_BIT, kMinReadPixelsBufferSize, true),
>+      mBlitPixelBuffer(VK_BUFFER_USAGE_TRANSFER_SRC_BIT, kMinReadPixelsBufferSize, true)
> {
>+    mBlitPixelBuffer.init(1, renderer);
>+    mReadPixelBuffer.init(4, renderer);
> }
> 
>-FramebufferVk::~FramebufferVk()
>-{
>-}
>+FramebufferVk::~FramebufferVk() = default;
> 
> void FramebufferVk::destroy(const gl::Context *context)
> {
>-    RendererVk *renderer = vk::GetImpl(context)->getRenderer();
>+    ContextVk *contextVk = vk::GetImpl(context);
>+    RendererVk *renderer = contextVk->getRenderer();
>+    mFramebuffer.release(renderer);
> 
>-    renderer->releaseResource(*this, &mRenderPass);
>-    renderer->releaseResource(*this, &mFramebuffer);
>+    mReadPixelBuffer.release(renderer);
>+    mBlitPixelBuffer.release(renderer);
> }
> 
>-void FramebufferVk::destroyDefault(const egl::Display *display)
>+angle::Result FramebufferVk::discard(const gl::Context *context,
>+                                     size_t count,
>+                                     const GLenum *attachments)
> {
>-    VkDevice device = vk::GetImpl(display)->getRenderer()->getDevice();
>-
>-    mRenderPass.destroy(device);
>-    mFramebuffer.destroy(device);
>+    ANGLE_VK_UNREACHABLE(vk::GetImpl(context));
>+    return angle::Result::Stop;
> }
> 
>-gl::Error FramebufferVk::discard(const gl::Context *context,
>-                                 size_t count,
>-                                 const GLenum *attachments)
>+angle::Result FramebufferVk::invalidate(const gl::Context *context,
>+                                        size_t count,
>+                                        const GLenum *attachments)
> {
>-    UNIMPLEMENTED();
>-    return gl::InternalError();
>+    ANGLE_VK_UNREACHABLE(vk::GetImpl(context));
>+    return angle::Result::Stop;
> }
> 
>-gl::Error FramebufferVk::invalidate(const gl::Context *context,
>-                                    size_t count,
>-                                    const GLenum *attachments)
>+angle::Result FramebufferVk::invalidateSub(const gl::Context *context,
>+                                           size_t count,
>+                                           const GLenum *attachments,
>+                                           const gl::Rectangle &area)
> {
>-    UNIMPLEMENTED();
>-    return gl::InternalError();
>+    ANGLE_VK_UNREACHABLE(vk::GetImpl(context));
>+    return angle::Result::Stop;
> }
> 
>-gl::Error FramebufferVk::invalidateSub(const gl::Context *context,
>-                                       size_t count,
>-                                       const GLenum *attachments,
>-                                       const gl::Rectangle &area)
>+angle::Result FramebufferVk::clear(const gl::Context *context, GLbitfield mask)
> {
>-    UNIMPLEMENTED();
>-    return gl::InternalError();
>+    ContextVk *contextVk = vk::GetImpl(context);
>+
>+    bool clearColor   = IsMaskFlagSet(mask, static_cast<GLbitfield>(GL_COLOR_BUFFER_BIT));
>+    bool clearDepth   = IsMaskFlagSet(mask, static_cast<GLbitfield>(GL_DEPTH_BUFFER_BIT));
>+    bool clearStencil = IsMaskFlagSet(mask, static_cast<GLbitfield>(GL_STENCIL_BUFFER_BIT));
>+    gl::DrawBufferMask clearColorBuffers;
>+    if (clearColor)
>+    {
>+        clearColorBuffers = mState.getEnabledDrawBuffers();
>+    }
>+
>+    const VkClearColorValue &clearColorValue = contextVk->getClearColorValue().color;
>+    const VkClearDepthStencilValue &clearDepthStencilValue =
>+        contextVk->getClearDepthStencilValue().depthStencil;
>+
>+    return clearImpl(context, clearColorBuffers, clearDepth, clearStencil, clearColorValue,
>+                     clearDepthStencilValue);
> }
> 
>-gl::Error FramebufferVk::clear(const gl::Context *context, GLbitfield mask)
>+angle::Result FramebufferVk::clearImpl(const gl::Context *context,
>+                                       gl::DrawBufferMask clearColorBuffers,
>+                                       bool clearDepth,
>+                                       bool clearStencil,
>+                                       const VkClearColorValue &clearColorValue,
>+                                       const VkClearDepthStencilValue &clearDepthStencilValue)
> {
>     ContextVk *contextVk = vk::GetImpl(context);
> 
>-    if (mState.getDepthAttachment() && (mask & GL_DEPTH_BUFFER_BIT) != 0)
>-    {
>-        // TODO(jmadill): Depth clear
>-        UNIMPLEMENTED();
>-    }
>+    const gl::Rectangle scissoredRenderArea = getScissoredRenderArea(contextVk);
> 
>-    if (mState.getStencilAttachment() && (mask & GL_STENCIL_BUFFER_BIT) != 0)
>+    // Discard clear altogether if scissor has 0 width or height.
>+    if (scissoredRenderArea.width == 0 || scissoredRenderArea.height == 0)
>     {
>-        // TODO(jmadill): Stencil clear
>-        UNIMPLEMENTED();
>+        return angle::Result::Continue;
>     }
> 
>-    if ((mask & GL_COLOR_BUFFER_BIT) == 0)
>+    mFramebuffer.updateQueueSerial(contextVk->getRenderer()->getCurrentQueueSerial());
>+
>+    // This function assumes that only enabled attachments are asked to be cleared.
>+    ASSERT((clearColorBuffers & mState.getEnabledDrawBuffers()) == clearColorBuffers);
>+
>+    // Adjust clear behavior based on whether the respective attachments are present; if asked to
>+    // clear a non-existent attachment, don't attempt to clear it.
>+
>+    VkColorComponentFlags colorMaskFlags = contextVk->getClearColorMask();
>+    bool clearColor                      = clearColorBuffers.any();
>+
>+    const gl::FramebufferAttachment *depthAttachment = mState.getDepthAttachment();
>+    clearDepth                                       = clearDepth && depthAttachment;
>+    ASSERT(!clearDepth || depthAttachment->isAttached());
>+
>+    const gl::FramebufferAttachment *stencilAttachment = mState.getStencilAttachment();
>+    clearStencil                                       = clearStencil && stencilAttachment;
>+    ASSERT(!clearStencil || stencilAttachment->isAttached());
>+
>+    uint8_t stencilMask =
>+        static_cast<uint8_t>(contextVk->getState().getDepthStencilState().stencilWritemask);
>+
>+    // The front-end should ensure we don't attempt to clear color if all channels are masked.
>+    ASSERT(!clearColor || colorMaskFlags != 0);
>+    // The front-end should ensure we don't attempt to clear depth if depth write is disabled.
>+    ASSERT(!clearDepth || contextVk->getState().getDepthStencilState().depthMask);
>+    // The front-end should ensure we don't attempt to clear stencil if all bits are masked.
>+    ASSERT(!clearStencil || stencilMask != 0);
>+
>+    // If there is nothing to clear, return right away (for example, if asked to clear depth, but
>+    // there is no depth attachment).
>+    if (!clearColor && !clearDepth && !clearStencil)
>     {
>-        return gl::NoError();
>+        return angle::Result::Continue;
>     }
> 
>-    const auto &glState    = context->getGLState();
>-    const auto &clearColor = glState.getColorClearValue();
>-    VkClearColorValue clearColorValue;
>-    clearColorValue.float32[0] = clearColor.red;
>-    clearColorValue.float32[1] = clearColor.green;
>-    clearColorValue.float32[2] = clearColor.blue;
>-    clearColorValue.float32[3] = clearColor.alpha;
>+    VkClearDepthStencilValue modifiedDepthStencilValue = clearDepthStencilValue;
> 
>-    // TODO(jmadill): Scissored clears.
>-    const auto *attachment = mState.getFirstNonNullAttachment();
>-    ASSERT(attachment && attachment->isAttached());
>-    const auto &size = attachment->getSize();
>-    const gl::Rectangle renderArea(0, 0, size.width, size.height);
>+    // We can use render pass load ops if clearing depth, unmasked color or unmasked stencil.  If
>+    // there's a depth mask, depth clearing is already disabled.
>+    bool maskedClearColor =
>+        clearColor && (mActiveColorComponents & colorMaskFlags) != mActiveColorComponents;
>+    bool maskedClearStencil = stencilMask != 0xFF;
> 
>-    vk::CommandBufferAndState *commandBuffer = nullptr;
>-    ANGLE_TRY(contextVk->getStartedCommandBuffer(&commandBuffer));
>+    bool clearColorWithRenderPassLoadOp   = clearColor && !maskedClearColor;
>+    bool clearStencilWithRenderPassLoadOp = clearStencil && !maskedClearStencil;
> 
>-    for (const auto &colorAttachment : mState.getColorAttachments())
>+    // At least one of color, depth or stencil should be clearable with render pass loadOp for us
>+    // to use this clear path.
>+    bool clearAnyWithRenderPassLoadOp =
>+        clearColorWithRenderPassLoadOp || clearDepth || clearStencilWithRenderPassLoadOp;
>+
>+    if (clearAnyWithRenderPassLoadOp)
>     {
>-        if (colorAttachment.isAttached())
>+        // Clearing color is indicated by the set bits in this mask.  If not clearing colors with
>+        // render pass loadOp, the default value of all-zeros means the clear is not done in
>+        // clearWithRenderPassOp below.  In that case, only clear depth/stencil with render pass
>+        // loadOp.
>+        gl::DrawBufferMask clearBuffersWithRenderPassLoadOp;
>+        if (clearColorWithRenderPassLoadOp)
>+        {
>+            clearBuffersWithRenderPassLoadOp = clearColorBuffers;
>+        }
>+        ANGLE_TRY(clearWithRenderPassOp(
>+            contextVk, scissoredRenderArea, clearBuffersWithRenderPassLoadOp, clearDepth,
>+            clearStencilWithRenderPassLoadOp, clearColorValue, modifiedDepthStencilValue));
>+
>+        // On some hardware, having inline commands at this point results in corrupted output.  In
>+        // that case, end the render pass immediately.  http://anglebug.com/2361
>+        if (contextVk->getRenderer()->getFeatures().restartRenderPassAfterLoadOpClear)
>+        {
>+            mFramebuffer.finishCurrentCommands(contextVk->getRenderer());
>+        }
>+
>+        // Fallback to other methods for whatever isn't cleared here.
>+        clearDepth = false;
>+        if (clearColorWithRenderPassLoadOp)
>+        {
>+            clearColorBuffers.reset();
>+            clearColor = false;
>+        }
>+        if (clearStencilWithRenderPassLoadOp)
>+        {
>+            clearStencil = false;
>+        }
>+
>+        // If nothing left to clear, early out.
>+        if (!clearColor && !clearStencil)
>         {
>-            RenderTargetVk *renderTarget = nullptr;
>-            ANGLE_TRY(colorAttachment.getRenderTarget(context, &renderTarget));
>-            renderTarget->image->changeLayoutTop(
>-                VK_IMAGE_ASPECT_COLOR_BIT, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, commandBuffer);
>-            commandBuffer->clearSingleColorImage(*renderTarget->image, clearColorValue);
>+            return angle::Result::Continue;
>         }
>     }
> 
>-    return gl::NoError();
>+    // Note: depth clear is always done through render pass loadOp.
>+    ASSERT(clearDepth == false);
>+
>+    // The most costly clear mode is when we need to mask out specific color channels or stencil
>+    // bits. This can only be done with a draw call.
>+    return clearWithDraw(contextVk, scissoredRenderArea, clearColorBuffers, clearStencil,
>+                         colorMaskFlags, stencilMask, clearColorValue,
>+                         static_cast<uint8_t>(modifiedDepthStencilValue.stencil));
> }
> 
>-gl::Error FramebufferVk::clearBufferfv(const gl::Context *context,
>-                                       GLenum buffer,
>-                                       GLint drawbuffer,
>-                                       const GLfloat *values)
>+angle::Result FramebufferVk::clearBufferfv(const gl::Context *context,
>+                                           GLenum buffer,
>+                                           GLint drawbuffer,
>+                                           const GLfloat *values)
> {
>-    UNIMPLEMENTED();
>-    return gl::InternalError();
>+    VkClearValue clearValue = {};
>+
>+    bool clearDepth = false;
>+    gl::DrawBufferMask clearColorBuffers;
>+
>+    if (buffer == GL_DEPTH)
>+    {
>+        clearDepth                    = true;
>+        clearValue.depthStencil.depth = values[0];
>+    }
>+    else
>+    {
>+        clearColorBuffers.set(drawbuffer);
>+        clearValue.color.float32[0] = values[0];
>+        clearValue.color.float32[1] = values[1];
>+        clearValue.color.float32[2] = values[2];
>+        clearValue.color.float32[3] = values[3];
>+    }
>+
>+    return clearImpl(context, clearColorBuffers, clearDepth, false, clearValue.color,
>+                     clearValue.depthStencil);
> }
> 
>-gl::Error FramebufferVk::clearBufferuiv(const gl::Context *context,
>-                                        GLenum buffer,
>-                                        GLint drawbuffer,
>-                                        const GLuint *values)
>+angle::Result FramebufferVk::clearBufferuiv(const gl::Context *context,
>+                                            GLenum buffer,
>+                                            GLint drawbuffer,
>+                                            const GLuint *values)
> {
>-    UNIMPLEMENTED();
>-    return gl::InternalError();
>+    VkClearValue clearValue = {};
>+
>+    gl::DrawBufferMask clearColorBuffers;
>+    clearColorBuffers.set(drawbuffer);
>+
>+    clearValue.color.uint32[0] = values[0];
>+    clearValue.color.uint32[1] = values[1];
>+    clearValue.color.uint32[2] = values[2];
>+    clearValue.color.uint32[3] = values[3];
>+
>+    return clearImpl(context, clearColorBuffers, false, false, clearValue.color,
>+                     clearValue.depthStencil);
> }
> 
>-gl::Error FramebufferVk::clearBufferiv(const gl::Context *context,
>-                                       GLenum buffer,
>-                                       GLint drawbuffer,
>-                                       const GLint *values)
>+angle::Result FramebufferVk::clearBufferiv(const gl::Context *context,
>+                                           GLenum buffer,
>+                                           GLint drawbuffer,
>+                                           const GLint *values)
> {
>-    UNIMPLEMENTED();
>-    return gl::InternalError();
>+    VkClearValue clearValue = {};
>+
>+    bool clearStencil = false;
>+    gl::DrawBufferMask clearColorBuffers;
>+
>+    if (buffer == GL_STENCIL)
>+    {
>+        clearStencil = true;
>+        clearValue.depthStencil.stencil =
>+            gl::clamp(values[0], 0, std::numeric_limits<uint8_t>::max());
>+    }
>+    else
>+    {
>+        clearColorBuffers.set(drawbuffer);
>+        clearValue.color.int32[0] = values[0];
>+        clearValue.color.int32[1] = values[1];
>+        clearValue.color.int32[2] = values[2];
>+        clearValue.color.int32[3] = values[3];
>+    }
>+
>+    return clearImpl(context, clearColorBuffers, false, clearStencil, clearValue.color,
>+                     clearValue.depthStencil);
> }
> 
>-gl::Error FramebufferVk::clearBufferfi(const gl::Context *context,
>-                                       GLenum buffer,
>-                                       GLint drawbuffer,
>-                                       GLfloat depth,
>-                                       GLint stencil)
>+angle::Result FramebufferVk::clearBufferfi(const gl::Context *context,
>+                                           GLenum buffer,
>+                                           GLint drawbuffer,
>+                                           GLfloat depth,
>+                                           GLint stencil)
> {
>-    UNIMPLEMENTED();
>-    return gl::InternalError();
>+    VkClearValue clearValue = {};
>+
>+    clearValue.depthStencil.depth   = depth;
>+    clearValue.depthStencil.stencil = gl::clamp(stencil, 0, std::numeric_limits<uint8_t>::max());
>+
>+    return clearImpl(context, gl::DrawBufferMask(), true, true, clearValue.color,
>+                     clearValue.depthStencil);
> }
> 
> GLenum FramebufferVk::getImplementationColorReadFormat(const gl::Context *context) const
> {
>-    auto errOrResult = GetReadAttachmentInfo(context, mState.getReadAttachment());
>+    return GetReadAttachmentInfo(context, mRenderTargetCache.getColorRead(mState)).format;
>+}
>+
>+GLenum FramebufferVk::getImplementationColorReadType(const gl::Context *context) const
>+{
>+    return GetReadAttachmentInfo(context, mRenderTargetCache.getColorRead(mState)).type;
>+}
> 
>-    // TODO(jmadill): Handle getRenderTarget error.
>-    if (errOrResult.isError())
>+angle::Result FramebufferVk::readPixels(const gl::Context *context,
>+                                        const gl::Rectangle &area,
>+                                        GLenum format,
>+                                        GLenum type,
>+                                        void *pixels)
>+{
>+    // Clip read area to framebuffer.
>+    const gl::Extents &fbSize = getState().getReadAttachment()->getSize();
>+    const gl::Rectangle fbRect(0, 0, fbSize.width, fbSize.height);
>+    ContextVk *contextVk = vk::GetImpl(context);
>+    RendererVk *renderer = contextVk->getRenderer();
>+
>+    gl::Rectangle clippedArea;
>+    if (!ClipRectangle(area, fbRect, &clippedArea))
>+    {
>+        // nothing to read
>+        return angle::Result::Continue;
>+    }
>+    gl::Rectangle flippedArea = clippedArea;
>+    if (contextVk->isViewportFlipEnabledForReadFBO())
>     {
>-        ERR() << "Internal error in FramebufferVk::getImplementationColorReadFormat.";
>-        return GL_NONE;
>+        flippedArea.y = fbRect.height - flippedArea.y - flippedArea.height;
>     }
> 
>-    return errOrResult.getResult()->format;
>-}
>+    const gl::State &glState            = context->getState();
>+    const gl::PixelPackState &packState = glState.getPackState();
> 
>-GLenum FramebufferVk::getImplementationColorReadType(const gl::Context *context) const
>-{
>-    auto errOrResult = GetReadAttachmentInfo(context, mState.getReadAttachment());
>+    const gl::InternalFormat &sizedFormatInfo = gl::GetInternalFormatInfo(format, type);
>+
>+    GLuint outputPitch = 0;
>+    ANGLE_VK_CHECK_MATH(contextVk,
>+                        sizedFormatInfo.computeRowPitch(type, area.width, packState.alignment,
>+                                                        packState.rowLength, &outputPitch));
>+    GLuint outputSkipBytes = 0;
>+    ANGLE_VK_CHECK_MATH(contextVk, sizedFormatInfo.computeSkipBytes(type, outputPitch, 0, packState,
>+                                                                    false, &outputSkipBytes));
> 
>-    // TODO(jmadill): Handle getRenderTarget error.
>-    if (errOrResult.isError())
>+    outputSkipBytes += (clippedArea.x - area.x) * sizedFormatInfo.pixelBytes +
>+                       (clippedArea.y - area.y) * outputPitch;
>+
>+    const angle::Format &angleFormat = GetFormatFromFormatType(format, type);
>+
>+    PackPixelsParams params(flippedArea, angleFormat, outputPitch, packState.reverseRowOrder,
>+                            glState.getTargetBuffer(gl::BufferBinding::PixelPack), 0);
>+    if (contextVk->isViewportFlipEnabledForReadFBO())
>     {
>-        ERR() << "Internal error in FramebufferVk::getImplementationColorReadFormat.";
>-        return GL_NONE;
>+        params.reverseRowOrder = !params.reverseRowOrder;
>     }
> 
>-    return errOrResult.getResult()->type;
>+    ANGLE_TRY(readPixelsImpl(contextVk, flippedArea, params, VK_IMAGE_ASPECT_COLOR_BIT,
>+                             getColorReadRenderTarget(),
>+                             static_cast<uint8_t *>(pixels) + outputSkipBytes));
>+    mReadPixelBuffer.releaseRetainedBuffers(renderer);
>+    return angle::Result::Continue;
> }
> 
>-gl::Error FramebufferVk::readPixels(const gl::Context *context,
>-                                    const gl::Rectangle &area,
>-                                    GLenum format,
>-                                    GLenum type,
>-                                    void *pixels)
>+RenderTargetVk *FramebufferVk::getDepthStencilRenderTarget() const
> {
>-    const auto &glState         = context->getGLState();
>-    const auto *readFramebuffer = glState.getReadFramebuffer();
>-    const auto *readAttachment  = readFramebuffer->getReadColorbuffer();
>-
>-    RenderTargetVk *renderTarget = nullptr;
>-    ANGLE_TRY(readAttachment->getRenderTarget(context, &renderTarget));
>+    return mRenderTargetCache.getDepthStencil();
>+}
> 
>-    ContextVk *contextVk = vk::GetImpl(context);
>-    RendererVk *renderer = contextVk->getRenderer();
>-    VkDevice device      = renderer->getDevice();
>-
>-    vk::Image *readImage = renderTarget->image;
>-    vk::StagingImage stagingImage;
>-    ANGLE_TRY(renderer->createStagingImage(TextureDimension::TEX_2D, *renderTarget->format,
>-                                           renderTarget->extents, vk::StagingUsage::Read,
>-                                           &stagingImage));
>-
>-    vk::CommandBufferAndState *commandBuffer = nullptr;
>-    ANGLE_TRY(contextVk->getStartedCommandBuffer(&commandBuffer));
>-
>-    // End render pass if we're in one.
>-    renderer->endRenderPass();
>-
>-    stagingImage.getImage().changeLayoutTop(VK_IMAGE_ASPECT_COLOR_BIT, VK_IMAGE_LAYOUT_GENERAL,
>-                                            commandBuffer);
>-
>-    readImage->changeLayoutWithStages(
>-        VK_IMAGE_ASPECT_COLOR_BIT, VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL,
>-        VK_PIPELINE_STAGE_ALL_COMMANDS_BIT, VK_PIPELINE_STAGE_TRANSFER_BIT, commandBuffer);
>-
>-    VkImageCopy region;
>-    region.srcSubresource.aspectMask     = VK_IMAGE_ASPECT_COLOR_BIT;
>-    region.srcSubresource.mipLevel       = 0;
>-    region.srcSubresource.baseArrayLayer = 0;
>-    region.srcSubresource.layerCount     = 1;
>-    region.srcOffset.x                   = area.x;
>-    region.srcOffset.y                   = area.y;
>-    region.srcOffset.z                   = 0;
>-    region.dstSubresource.aspectMask     = VK_IMAGE_ASPECT_COLOR_BIT;
>-    region.dstSubresource.mipLevel       = 0;
>-    region.dstSubresource.baseArrayLayer = 0;
>-    region.dstSubresource.layerCount     = 1;
>-    region.dstOffset.x                   = 0;
>-    region.dstOffset.y                   = 0;
>-    region.dstOffset.z                   = 0;
>-    region.extent.width                  = area.width;
>-    region.extent.height                 = area.height;
>-    region.extent.depth                  = 1;
>-
>-    commandBuffer->copyImage(*readImage, stagingImage.getImage(), 1, &region);
>-
>-    ANGLE_TRY(renderer->submitAndFinishCommandBuffer(commandBuffer));
>-
>-    // TODO(jmadill): parameters
>-    uint8_t *mapPointer = nullptr;
>-    ANGLE_TRY(
>-        stagingImage.getDeviceMemory().map(device, 0, stagingImage.getSize(), 0, &mapPointer));
>+angle::Result FramebufferVk::blitWithCopy(ContextVk *contextVk,
>+                                          const gl::Rectangle &copyArea,
>+                                          RenderTargetVk *readRenderTarget,
>+                                          RenderTargetVk *drawRenderTarget,
>+                                          bool blitDepthBuffer,
>+                                          bool blitStencilBuffer)
>+{
>+    VkImageAspectFlags aspectMask =
>+        vk::GetDepthStencilAspectFlagsForCopy(blitDepthBuffer, blitStencilBuffer);
> 
>-    const auto &angleFormat = renderTarget->format->textureFormat();
>+    vk::CommandBuffer *commandBuffer = nullptr;
>+    ANGLE_TRY(mFramebuffer.recordCommands(contextVk, &commandBuffer));
> 
>-    // TODO(jmadill): Use pixel bytes from the ANGLE format directly.
>-    const auto &glFormat = gl::GetSizedInternalFormatInfo(angleFormat.glInternalFormat);
>-    int inputPitch       = glFormat.pixelBytes * area.width;
>+    vk::ImageHelper *writeImage = drawRenderTarget->getImageForWrite(&mFramebuffer);
>+    writeImage->changeLayout(writeImage->getAspectFlags(), vk::ImageLayout::TransferDst,
>+                             commandBuffer);
> 
>-    PackPixelsParams params;
>-    params.area        = area;
>-    params.format      = format;
>-    params.type        = type;
>-    params.outputPitch = inputPitch;
>-    params.packBuffer  = glState.getTargetBuffer(gl::BufferBinding::PixelPack);
>-    params.pack        = glState.getPackState();
>+    vk::ImageHelper *readImage = readRenderTarget->getImageForRead(
>+        &mFramebuffer, vk::ImageLayout::TransferSrc, commandBuffer);
> 
>-    PackPixels(params, angleFormat, inputPitch, mapPointer, reinterpret_cast<uint8_t *>(pixels));
>+    VkImageSubresourceLayers readSubresource = {};
>+    readSubresource.aspectMask               = aspectMask;
>+    readSubresource.mipLevel                 = 0;
>+    readSubresource.baseArrayLayer           = 0;
>+    readSubresource.layerCount               = 1;
> 
>-    stagingImage.getDeviceMemory().unmap(device);
>-    renderer->releaseObject(renderer->getCurrentQueueSerial(), &stagingImage);
>+    VkImageSubresourceLayers writeSubresource = readSubresource;
> 
>-    return vk::NoError();
>+    vk::ImageHelper::Copy(readImage, writeImage, gl::Offset(), gl::Offset(),
>+                          gl::Extents(copyArea.width, copyArea.height, 1), readSubresource,
>+                          writeSubresource, commandBuffer);
>+    return angle::Result::Continue;
> }
> 
>-gl::Error FramebufferVk::blit(const gl::Context *context,
>-                              const gl::Rectangle &sourceArea,
>-                              const gl::Rectangle &destArea,
>-                              GLbitfield mask,
>-                              GLenum filter)
>+RenderTargetVk *FramebufferVk::getColorReadRenderTarget() const
> {
>-    UNIMPLEMENTED();
>-    return gl::InternalError();
>+    RenderTargetVk *renderTarget = mRenderTargetCache.getColorRead(mState);
>+    ASSERT(renderTarget && renderTarget->getImage().valid());
>+    return renderTarget;
> }
> 
>-bool FramebufferVk::checkStatus(const gl::Context *context) const
>+angle::Result FramebufferVk::blitWithReadback(ContextVk *contextVk,
>+                                              const gl::Rectangle &copyArea,
>+                                              VkImageAspectFlagBits aspect,
>+                                              RenderTargetVk *readRenderTarget,
>+                                              RenderTargetVk *drawRenderTarget)
> {
>-    return true;
>+    RendererVk *renderer            = contextVk->getRenderer();
>+    const angle::Format &readFormat = readRenderTarget->getImageFormat().imageFormat();
>+
>+    ASSERT(aspect == VK_IMAGE_ASPECT_DEPTH_BIT || aspect == VK_IMAGE_ASPECT_STENCIL_BIT);
>+
>+    // This path is only currently used for y-flipping depth/stencil blits.
>+    PackPixelsParams packPixelsParams;
>+    packPixelsParams.reverseRowOrder = true;
>+    packPixelsParams.area.width      = copyArea.width;
>+    packPixelsParams.area.height     = copyArea.height;
>+    packPixelsParams.area.x          = copyArea.x;
>+    packPixelsParams.area.y          = copyArea.y;
>+
>+    // Read back depth values into the destination buffer.
>+    const angle::Format &copyFormat = GetDepthStencilImageToBufferFormat(readFormat, aspect);
>+    packPixelsParams.destFormat     = &copyFormat;
>+    packPixelsParams.outputPitch    = copyFormat.pixelBytes * copyArea.width;
>+
>+    // Allocate a space in the destination buffer to write to.
>+    size_t blitAllocationSize = copyFormat.pixelBytes * copyArea.width * copyArea.height;
>+    uint8_t *destPtr          = nullptr;
>+    VkBuffer destBufferHandle = VK_NULL_HANDLE;
>+    VkDeviceSize destOffset   = 0;
>+    ANGLE_TRY(mBlitPixelBuffer.allocate(contextVk, blitAllocationSize, &destPtr, &destBufferHandle,
>+                                        &destOffset, nullptr));
>+
>+    ANGLE_TRY(
>+        readPixelsImpl(contextVk, copyArea, packPixelsParams, aspect, readRenderTarget, destPtr));
>+
>+    VkBufferImageCopy copyRegion               = {};
>+    copyRegion.bufferOffset                    = destOffset;
>+    copyRegion.bufferImageHeight               = copyArea.height;
>+    copyRegion.bufferRowLength                 = copyArea.width;
>+    copyRegion.imageExtent.width               = copyArea.width;
>+    copyRegion.imageExtent.height              = copyArea.height;
>+    copyRegion.imageExtent.depth               = 1;
>+    copyRegion.imageSubresource.mipLevel       = 0;
>+    copyRegion.imageSubresource.aspectMask     = aspect;
>+    copyRegion.imageSubresource.baseArrayLayer = 0;
>+    copyRegion.imageSubresource.layerCount     = 1;
>+    copyRegion.imageOffset.x                   = copyArea.x;
>+    copyRegion.imageOffset.y                   = copyArea.y;
>+    copyRegion.imageOffset.z                   = 0;
>+
>+    ANGLE_TRY(mBlitPixelBuffer.flush(contextVk));
>+
>+    // Reinitialize the commandBuffer after a read pixels because it calls
>+    // renderer->finish which makes command buffers obsolete.
>+    vk::CommandBuffer *commandBuffer = nullptr;
>+    ANGLE_TRY(mFramebuffer.recordCommands(contextVk, &commandBuffer));
>+
>+    // We read the bytes of the image in a buffer, now we have to copy them into the
>+    // destination target.
>+    vk::ImageHelper *imageForWrite = drawRenderTarget->getImageForWrite(&mFramebuffer);
>+
>+    imageForWrite->changeLayout(imageForWrite->getAspectFlags(), vk::ImageLayout::TransferDst,
>+                                commandBuffer);
>+
>+    commandBuffer->copyBufferToImage(destBufferHandle, imageForWrite->getImage(),
>+                                     VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, 1, &copyRegion);
>+
>+    mBlitPixelBuffer.releaseRetainedBuffers(renderer);
>+
>+    return angle::Result::Continue;
> }
> 
>-void FramebufferVk::syncState(const gl::Context *context,
>-                              const gl::Framebuffer::DirtyBits &dirtyBits)
>+angle::Result FramebufferVk::blit(const gl::Context *context,
>+                                  const gl::Rectangle &sourceArea,
>+                                  const gl::Rectangle &destArea,
>+                                  GLbitfield mask,
>+                                  GLenum filter)
> {
>     ContextVk *contextVk = vk::GetImpl(context);
>     RendererVk *renderer = contextVk->getRenderer();
> 
>-    ASSERT(dirtyBits.any());
>+    const gl::State &glState                 = context->getState();
>+    const gl::Framebuffer *sourceFramebuffer = glState.getReadFramebuffer();
>+    bool blitColorBuffer                     = (mask & GL_COLOR_BUFFER_BIT) != 0;
>+    bool blitDepthBuffer                     = (mask & GL_DEPTH_BUFFER_BIT) != 0;
>+    bool blitStencilBuffer                   = (mask & GL_STENCIL_BUFFER_BIT) != 0;
> 
>-    // TODO(jmadill): Smarter update.
>-    renderer->releaseResource(*this, &mRenderPass);
>-    renderer->releaseResource(*this, &mFramebuffer);
>-    renderer->onReleaseRenderPass(this);
>+    FramebufferVk *sourceFramebufferVk = vk::GetImpl(sourceFramebuffer);
>+    bool flipSource                    = contextVk->isViewportFlipEnabledForReadFBO();
>+    bool flipDest                      = contextVk->isViewportFlipEnabledForDrawFBO();
> 
>-    // TODO(jmadill): Use pipeline cache.
>-    contextVk->invalidateCurrentPipeline();
>-}
>+    gl::Rectangle readRect = sourceArea;
>+    gl::Rectangle drawRect = destArea;
> 
>-gl::ErrorOrResult<vk::RenderPass *> FramebufferVk::getRenderPass(const gl::Context *context,
>-                                                                 VkDevice device)
>-{
>-    if (mRenderPass.valid())
>+    if (glState.isScissorTestEnabled())
>     {
>-        return &mRenderPass;
>+        const gl::Rectangle scissorRect = glState.getScissor();
>+        if (!ClipRectangle(sourceArea, scissorRect, &readRect))
>+        {
>+            return angle::Result::Continue;
>+        }
>+
>+        if (!ClipRectangle(destArea, scissorRect, &drawRect))
>+        {
>+            return angle::Result::Continue;
>+        }
>     }
> 
>-    vk::RenderPassDesc desc;
>+    // After cropping for the scissor, we also want to crop for the size of the buffers.
> 
>-    const auto &colorAttachments = mState.getColorAttachments();
>-    for (size_t attachmentIndex = 0; attachmentIndex < colorAttachments.size(); ++attachmentIndex)
>+    if (blitColorBuffer)
>     {
>-        const auto &colorAttachment = colorAttachments[attachmentIndex];
>-        if (colorAttachment.isAttached())
>+        RenderTargetVk *readRenderTarget = sourceFramebufferVk->getColorReadRenderTarget();
>+
>+        gl::Rectangle readRenderTargetRect;
>+        if (!ClipToRenderTarget(readRect, readRenderTarget, &readRenderTargetRect))
>+        {
>+            return angle::Result::Continue;
>+        }
>+
>+        for (size_t colorAttachment : mState.getEnabledDrawBuffers())
>         {
>-            RenderTargetVk *renderTarget = nullptr;
>-            ANGLE_TRY(colorAttachment.getRenderTarget(context, &renderTarget));
>-
>-            VkAttachmentDescription *colorDesc = desc.nextColorAttachment();
>-
>-            // TODO(jmadill): We would only need this flag for duplicated attachments.
>-            colorDesc->flags   = VK_ATTACHMENT_DESCRIPTION_MAY_ALIAS_BIT;
>-            colorDesc->format  = renderTarget->format->vkTextureFormat;
>-            colorDesc->samples = ConvertSamples(colorAttachment.getSamples());
>-
>-            // The load op controls the prior existing depth/color attachment data.
>-            // TODO(jmadill): Proper load ops. Should not be hard coded to clear.
>-            colorDesc->loadOp         = VK_ATTACHMENT_LOAD_OP_CLEAR;
>-            colorDesc->storeOp        = VK_ATTACHMENT_STORE_OP_STORE;
>-            colorDesc->stencilLoadOp  = VK_ATTACHMENT_LOAD_OP_DONT_CARE;
>-            colorDesc->stencilStoreOp = VK_ATTACHMENT_STORE_OP_DONT_CARE;
>-            colorDesc->initialLayout  = VK_IMAGE_LAYOUT_UNDEFINED;
>-
>-            // We might want to transition directly to PRESENT_SRC for Surface attachments.
>-            colorDesc->finalLayout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL;
>+            RenderTargetVk *drawRenderTarget = mRenderTargetCache.getColors()[colorAttachment];
>+            ASSERT(drawRenderTarget);
>+            ASSERT(HasSrcAndDstBlitProperties(renderer, readRenderTarget, drawRenderTarget));
>+
>+            gl::Rectangle drawRenderTargetRect;
>+            if (!ClipToRenderTarget(drawRect, drawRenderTarget, &drawRenderTargetRect))
>+            {
>+                return angle::Result::Continue;
>+            }
>+
>+            ANGLE_TRY(blitWithCommand(contextVk, readRenderTargetRect, drawRenderTargetRect,
>+                                      readRenderTarget, drawRenderTarget, filter, true, false,
>+                                      false, flipSource, flipDest));
>         }
>     }
> 
>-    const auto *depthStencilAttachment = mState.getDepthStencilAttachment();
>+    if (blitDepthBuffer || blitStencilBuffer)
>+    {
>+        RenderTargetVk *readRenderTarget = sourceFramebufferVk->getDepthStencilRenderTarget();
>+        ASSERT(readRenderTarget);
>+
>+        gl::Rectangle readRenderTargetRect;
>+        if (!ClipToRenderTarget(readRect, readRenderTarget, &readRenderTargetRect))
>+        {
>+            return angle::Result::Continue;
>+        }
>+
>+        RenderTargetVk *drawRenderTarget = mRenderTargetCache.getDepthStencil();
>+        ASSERT(drawRenderTarget);
>+
>+        gl::Rectangle drawRenderTargetRect;
>+        if (!ClipToRenderTarget(drawRect, drawRenderTarget, &drawRenderTargetRect))
>+        {
>+            return angle::Result::Continue;
>+        }
> 
>-    if (depthStencilAttachment && depthStencilAttachment->isAttached())
>+        ASSERT(readRenderTargetRect == drawRenderTargetRect);
>+        ASSERT(filter == GL_NEAREST);
>+
>+        if (HasSrcAndDstBlitProperties(renderer, readRenderTarget, drawRenderTarget))
>+        {
>+            ANGLE_TRY(blitWithCommand(contextVk, readRenderTargetRect, drawRenderTargetRect,
>+                                      readRenderTarget, drawRenderTarget, filter, false,
>+                                      blitDepthBuffer, blitStencilBuffer, flipSource, flipDest));
>+        }
>+        else
>+        {
>+            if (flipSource || flipDest)
>+            {
>+                if (blitDepthBuffer)
>+                {
>+                    ANGLE_TRY(blitWithReadback(contextVk, readRenderTargetRect,
>+                                               VK_IMAGE_ASPECT_DEPTH_BIT, readRenderTarget,
>+                                               drawRenderTarget));
>+                }
>+                if (blitStencilBuffer)
>+                {
>+                    ANGLE_TRY(blitWithReadback(contextVk, readRenderTargetRect,
>+                                               VK_IMAGE_ASPECT_STENCIL_BIT, readRenderTarget,
>+                                               drawRenderTarget));
>+                }
>+            }
>+            else
>+            {
>+                ANGLE_TRY(blitWithCopy(contextVk, readRenderTargetRect, readRenderTarget,
>+                                       drawRenderTarget, blitDepthBuffer, blitStencilBuffer));
>+            }
>+        }
>+    }
>+
>+    return angle::Result::Continue;
>+}
>+
>+angle::Result FramebufferVk::blitWithCommand(ContextVk *contextVk,
>+                                             const gl::Rectangle &readRectIn,
>+                                             const gl::Rectangle &drawRectIn,
>+                                             RenderTargetVk *readRenderTarget,
>+                                             RenderTargetVk *drawRenderTarget,
>+                                             GLenum filter,
>+                                             bool colorBlit,
>+                                             bool depthBlit,
>+                                             bool stencilBlit,
>+                                             bool flipSource,
>+                                             bool flipDest)
>+{
>+    // Since blitRenderbufferRect is called for each render buffer that needs to be blitted,
>+    // it should never be the case that both color and depth/stencil need to be blitted at
>+    // at the same time.
>+    ASSERT(colorBlit != (depthBlit || stencilBlit));
>+
>+    vk::ImageHelper *dstImage = drawRenderTarget->getImageForWrite(&mFramebuffer);
>+
>+    vk::CommandBuffer *commandBuffer = nullptr;
>+    ANGLE_TRY(mFramebuffer.recordCommands(contextVk, &commandBuffer));
>+
>+    const vk::Format &readImageFormat = readRenderTarget->getImageFormat();
>+    VkImageAspectFlags aspectMask =
>+        colorBlit ? VK_IMAGE_ASPECT_COLOR_BIT
>+                  : vk::GetDepthStencilAspectFlags(readImageFormat.imageFormat());
>+    vk::ImageHelper *srcImage = readRenderTarget->getImageForRead(
>+        &mFramebuffer, vk::ImageLayout::TransferSrc, commandBuffer);
>+
>+    const gl::Extents sourceFrameBufferExtents = readRenderTarget->getExtents();
>+    gl::Rectangle readRect                     = readRectIn;
>+
>+    if (flipSource)
>     {
>-        RenderTargetVk *renderTarget = nullptr;
>-        ANGLE_TRY(depthStencilAttachment->getRenderTarget(context, &renderTarget));
>+        readRect.y = sourceFrameBufferExtents.height - readRect.y - readRect.height;
>+    }
> 
>-        VkAttachmentDescription *depthStencilDesc = desc.nextDepthStencilAttachment();
>+    VkImageBlit blit               = {};
>+    blit.srcOffsets[0]             = {readRect.x0(), flipSource ? readRect.y1() : readRect.y0(), 0};
>+    blit.srcOffsets[1]             = {readRect.x1(), flipSource ? readRect.y0() : readRect.y1(), 1};
>+    blit.srcSubresource.aspectMask = aspectMask;
>+    blit.srcSubresource.mipLevel   = 0;
>+    blit.srcSubresource.baseArrayLayer = 0;
>+    blit.srcSubresource.layerCount     = 1;
>+    blit.dstSubresource.aspectMask     = aspectMask;
>+    blit.dstSubresource.mipLevel       = 0;
>+    blit.dstSubresource.baseArrayLayer = 0;
>+    blit.dstSubresource.layerCount     = 1;
>+
>+    const gl::Extents drawFrameBufferExtents = drawRenderTarget->getExtents();
>+    gl::Rectangle drawRect                   = drawRectIn;
>+
>+    if (flipDest)
>+    {
>+        drawRect.y = drawFrameBufferExtents.height - drawRect.y - drawRect.height;
>+    }
>+
>+    blit.dstOffsets[0] = {drawRect.x0(), flipDest ? drawRect.y1() : drawRect.y0(), 0};
>+    blit.dstOffsets[1] = {drawRect.x1(), flipDest ? drawRect.y0() : drawRect.y1(), 1};
>+
>+    // Requirement of the copyImageToBuffer, the dst image must be in
>+    // VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL layout.
>+    dstImage->changeLayout(aspectMask, vk::ImageLayout::TransferDst, commandBuffer);
>+
>+    commandBuffer->blitImage(srcImage->getImage(), VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL,
>+                             dstImage->getImage(), VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, 1, &blit,
>+                             gl_vk::GetFilter(filter));
> 
>-        depthStencilDesc->flags          = 0;
>-        depthStencilDesc->format         = renderTarget->format->vkTextureFormat;
>-        depthStencilDesc->samples        = ConvertSamples(depthStencilAttachment->getSamples());
>-        depthStencilDesc->loadOp         = VK_ATTACHMENT_LOAD_OP_CLEAR;
>-        depthStencilDesc->storeOp        = VK_ATTACHMENT_STORE_OP_STORE;
>-        depthStencilDesc->stencilLoadOp  = VK_ATTACHMENT_LOAD_OP_DONT_CARE;
>-        depthStencilDesc->stencilStoreOp = VK_ATTACHMENT_STORE_OP_DONT_CARE;
>-        depthStencilDesc->initialLayout  = VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL;
>-        depthStencilDesc->finalLayout    = VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL;
>+    return angle::Result::Continue;
>+}
>+
>+bool FramebufferVk::checkStatus(const gl::Context *context) const
>+{
>+    // if we have both a depth and stencil buffer, they must refer to the same object
>+    // since we only support packed_depth_stencil and not separate depth and stencil
>+    if (mState.hasSeparateDepthAndStencilAttachments())
>+    {
>+        return false;
>+    }
>+
>+    return true;
>+}
>+
>+angle::Result FramebufferVk::syncState(const gl::Context *context,
>+                                       const gl::Framebuffer::DirtyBits &dirtyBits)
>+{
>+    ContextVk *contextVk = vk::GetImpl(context);
>+    RendererVk *renderer = contextVk->getRenderer();
>+
>+    ASSERT(dirtyBits.any());
>+    for (size_t dirtyBit : dirtyBits)
>+    {
>+        switch (dirtyBit)
>+        {
>+            case gl::Framebuffer::DIRTY_BIT_DEPTH_ATTACHMENT:
>+            case gl::Framebuffer::DIRTY_BIT_STENCIL_ATTACHMENT:
>+                ANGLE_TRY(mRenderTargetCache.updateDepthStencilRenderTarget(context, mState));
>+                break;
>+            case gl::Framebuffer::DIRTY_BIT_DRAW_BUFFERS:
>+            case gl::Framebuffer::DIRTY_BIT_READ_BUFFER:
>+            case gl::Framebuffer::DIRTY_BIT_DEFAULT_WIDTH:
>+            case gl::Framebuffer::DIRTY_BIT_DEFAULT_HEIGHT:
>+            case gl::Framebuffer::DIRTY_BIT_DEFAULT_SAMPLES:
>+            case gl::Framebuffer::DIRTY_BIT_DEFAULT_FIXED_SAMPLE_LOCATIONS:
>+                break;
>+            default:
>+            {
>+                ASSERT(gl::Framebuffer::DIRTY_BIT_COLOR_ATTACHMENT_0 == 0 &&
>+                       dirtyBit < gl::Framebuffer::DIRTY_BIT_COLOR_ATTACHMENT_MAX);
>+                size_t colorIndex =
>+                    static_cast<size_t>(dirtyBit - gl::Framebuffer::DIRTY_BIT_COLOR_ATTACHMENT_0);
>+                ANGLE_TRY(mRenderTargetCache.updateColorRenderTarget(context, mState, colorIndex));
>+
>+                // Update cached masks for masked clears.
>+                RenderTargetVk *renderTarget = mRenderTargetCache.getColors()[colorIndex];
>+                if (renderTarget)
>+                {
>+                    const angle::Format &emulatedFormat =
>+                        renderTarget->getImageFormat().imageFormat();
>+                    updateActiveColorMasks(
>+                        colorIndex, emulatedFormat.redBits > 0, emulatedFormat.greenBits > 0,
>+                        emulatedFormat.blueBits > 0, emulatedFormat.alphaBits > 0);
>+
>+                    const angle::Format &sourceFormat =
>+                        renderTarget->getImageFormat().angleFormat();
>+                    mEmulatedAlphaAttachmentMask.set(
>+                        colorIndex, sourceFormat.alphaBits == 0 && emulatedFormat.alphaBits > 0);
>+
>+                    contextVk->updateColorMask(context->getState().getBlendState());
>+                }
>+                else
>+                {
>+                    updateActiveColorMasks(colorIndex, false, false, false, false);
>+                }
>+                break;
>+            }
>+        }
>     }
> 
>-    ANGLE_TRY(vk::InitializeRenderPassFromDesc(device, desc, &mRenderPass));
>+    mActiveColorComponents = gl_vk::GetColorComponentFlags(
>+        mActiveColorComponentMasksForClear[0].any(), mActiveColorComponentMasksForClear[1].any(),
>+        mActiveColorComponentMasksForClear[2].any(), mActiveColorComponentMasksForClear[3].any());
>+
>+    mFramebuffer.release(renderer);
>+
>+    // Will freeze the current set of dependencies on this FBO. The next time we render we will
>+    // create a new entry in the command graph.
>+    mFramebuffer.finishCurrentCommands(renderer);
> 
>-    return &mRenderPass;
>+    // Notify the ContextVk to update the pipeline desc.
>+    updateRenderPassDesc();
>+    contextVk->onFramebufferChange(mRenderPassDesc);
>+
>+    return angle::Result::Continue;
>+}
>+
>+void FramebufferVk::updateRenderPassDesc()
>+{
>+    mRenderPassDesc = {};
>+    mRenderPassDesc.setSamples(getSamples());
>+
>+    // TODO(jmadill): Support gaps in RenderTargets. http://anglebug.com/2394
>+    const auto &colorRenderTargets = mRenderTargetCache.getColors();
>+    for (size_t colorIndex : mState.getEnabledDrawBuffers())
>+    {
>+        RenderTargetVk *colorRenderTarget = colorRenderTargets[colorIndex];
>+        ASSERT(colorRenderTarget);
>+        mRenderPassDesc.packAttachment(colorRenderTarget->getImage().getFormat());
>+    }
>+
>+    RenderTargetVk *depthStencilRenderTarget = mRenderTargetCache.getDepthStencil();
>+    if (depthStencilRenderTarget)
>+    {
>+        mRenderPassDesc.packAttachment(depthStencilRenderTarget->getImage().getFormat());
>+    }
> }
> 
>-gl::ErrorOrResult<vk::Framebuffer *> FramebufferVk::getFramebuffer(const gl::Context *context,
>-                                                                   VkDevice device)
>+angle::Result FramebufferVk::getFramebuffer(ContextVk *contextVk, vk::Framebuffer **framebufferOut)
> {
>     // If we've already created our cached Framebuffer, return it.
>     if (mFramebuffer.valid())
>     {
>-        return &mFramebuffer;
>+        *framebufferOut = &mFramebuffer.getFramebuffer();
>+        return angle::Result::Continue;
>     }
> 
>-    vk::RenderPass *renderPass = nullptr;
>-    ANGLE_TRY_RESULT(getRenderPass(context, device), renderPass);
>+    vk::RenderPass *compatibleRenderPass = nullptr;
>+    ANGLE_TRY(contextVk->getRenderer()->getCompatibleRenderPass(contextVk, mRenderPassDesc,
>+                                                                &compatibleRenderPass));
> 
>     // If we've a Framebuffer provided by a Surface (default FBO/backbuffer), query it.
>     if (mBackbuffer)
>     {
>-        return mBackbuffer->getCurrentFramebuffer(device, *renderPass);
>+        return mBackbuffer->getCurrentFramebuffer(contextVk, *compatibleRenderPass, framebufferOut);
>     }
> 
>     // Gather VkImageViews over all FBO attachments, also size of attached region.
>     std::vector<VkImageView> attachments;
>     gl::Extents attachmentsSize;
> 
>-    const auto &colorAttachments = mState.getColorAttachments();
>-    for (size_t attachmentIndex = 0; attachmentIndex < colorAttachments.size(); ++attachmentIndex)
>+    // TODO(jmadill): Support gaps in RenderTargets. http://anglebug.com/2394
>+    const auto &colorRenderTargets = mRenderTargetCache.getColors();
>+    for (size_t colorIndex : mState.getEnabledDrawBuffers())
>     {
>-        const auto &colorAttachment = colorAttachments[attachmentIndex];
>-        if (colorAttachment.isAttached())
>-        {
>-            RenderTargetVk *renderTarget = nullptr;
>-            ANGLE_TRY(colorAttachment.getRenderTarget<RenderTargetVk>(context, &renderTarget));
>-            attachments.push_back(renderTarget->imageView->getHandle());
>+        RenderTargetVk *colorRenderTarget = colorRenderTargets[colorIndex];
>+        ASSERT(colorRenderTarget);
>+        attachments.push_back(colorRenderTarget->getDrawImageView()->getHandle());
> 
>-            ASSERT(attachmentsSize.empty() || attachmentsSize == colorAttachment.getSize());
>-            attachmentsSize = colorAttachment.getSize();
>-        }
>+        ASSERT(attachmentsSize.empty() || attachmentsSize == colorRenderTarget->getExtents());
>+        attachmentsSize = colorRenderTarget->getExtents();
>     }
> 
>-    const auto *depthStencilAttachment = mState.getDepthStencilAttachment();
>-    if (depthStencilAttachment && depthStencilAttachment->isAttached())
>+    RenderTargetVk *depthStencilRenderTarget = mRenderTargetCache.getDepthStencil();
>+    if (depthStencilRenderTarget)
>     {
>-        RenderTargetVk *renderTarget = nullptr;
>-        ANGLE_TRY(depthStencilAttachment->getRenderTarget<RenderTargetVk>(context, &renderTarget));
>-        attachments.push_back(renderTarget->imageView->getHandle());
>+        attachments.push_back(depthStencilRenderTarget->getDrawImageView()->getHandle());
> 
>-        ASSERT(attachmentsSize.empty() || attachmentsSize == depthStencilAttachment->getSize());
>-        attachmentsSize = depthStencilAttachment->getSize();
>+        ASSERT(attachmentsSize.empty() ||
>+               attachmentsSize == depthStencilRenderTarget->getExtents());
>+        attachmentsSize = depthStencilRenderTarget->getExtents();
>     }
> 
>     ASSERT(!attachments.empty());
> 
>-    VkFramebufferCreateInfo framebufferInfo;
>+    VkFramebufferCreateInfo framebufferInfo = {};
> 
>     framebufferInfo.sType           = VK_STRUCTURE_TYPE_FRAMEBUFFER_CREATE_INFO;
>-    framebufferInfo.pNext           = nullptr;
>     framebufferInfo.flags           = 0;
>-    framebufferInfo.renderPass      = mRenderPass.getHandle();
>+    framebufferInfo.renderPass      = compatibleRenderPass->getHandle();
>     framebufferInfo.attachmentCount = static_cast<uint32_t>(attachments.size());
>     framebufferInfo.pAttachments    = attachments.data();
>     framebufferInfo.width           = static_cast<uint32_t>(attachmentsSize.width);
>     framebufferInfo.height          = static_cast<uint32_t>(attachmentsSize.height);
>     framebufferInfo.layers          = 1;
> 
>-    ANGLE_TRY(mFramebuffer.init(device, framebufferInfo));
>+    ANGLE_TRY(mFramebuffer.init(contextVk, framebufferInfo));
> 
>-    return &mFramebuffer;
>+    *framebufferOut = &mFramebuffer.getFramebuffer();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error FramebufferVk::getSamplePosition(size_t index, GLfloat *xy) const
>+angle::Result FramebufferVk::clearWithRenderPassOp(
>+    ContextVk *contextVk,
>+    const gl::Rectangle &clearArea,
>+    gl::DrawBufferMask clearColorBuffers,
>+    bool clearDepth,
>+    bool clearStencil,
>+    const VkClearColorValue &clearColorValue,
>+    const VkClearDepthStencilValue &clearDepthStencilValue)
> {
>-    UNIMPLEMENTED();
>-    return gl::InternalError() << "getSamplePosition is unimplemented.";
>+    // Start a new render pass if:
>+    //
>+    // - no render pass has started,
>+    // - there is a render pass started but it contains commands; we cannot modify its ops, so new
>+    // render pass is needed,
>+    // - the current render area doesn't match the clear area.  We need the render area to be
>+    // exactly as specified by the scissor for the loadOp to clear only that area.  See
>+    // onScissorChange for more information.
>+
>+    if (!mFramebuffer.valid() || !mFramebuffer.renderPassStartedButEmpty() ||
>+        mFramebuffer.getRenderPassRenderArea() != clearArea)
>+    {
>+        vk::CommandBuffer *commandBuffer;
>+        ANGLE_TRY(startNewRenderPass(contextVk, clearArea, &commandBuffer));
>+    }
>+
>+    size_t attachmentIndex = 0;
>+
>+    // Go through clearColorBuffers and set the appropriate loadOp and clear values.
>+    // TODO: Support gaps in RenderTargets. http://anglebug.com/2394
>+    for (size_t colorIndex : mState.getEnabledDrawBuffers())
>+    {
>+        if (clearColorBuffers.test(colorIndex))
>+        {
>+            RenderTargetVk *renderTarget = getColorReadRenderTarget();
>+
>+            // If the render target doesn't have alpha, but its emulated format has it, clear the
>+            // alpha to 1.
>+            VkClearColorValue value = clearColorValue;
>+            if (mEmulatedAlphaAttachmentMask[colorIndex])
>+            {
>+                SetEmulatedAlphaValue(renderTarget->getImageFormat(), &value);
>+            }
>+
>+            mFramebuffer.clearRenderPassColorAttachment(attachmentIndex, value);
>+        }
>+        ++attachmentIndex;
>+    }
>+
>+    // Set the appropriate loadOp and clear values for depth and stencil.
>+    RenderTargetVk *depthStencilRenderTarget = mRenderTargetCache.getDepthStencil();
>+    if (depthStencilRenderTarget)
>+    {
>+        if (clearDepth)
>+        {
>+            mFramebuffer.clearRenderPassDepthAttachment(attachmentIndex,
>+                                                        clearDepthStencilValue.depth);
>+        }
>+
>+        if (clearStencil)
>+        {
>+            mFramebuffer.clearRenderPassStencilAttachment(attachmentIndex,
>+                                                          clearDepthStencilValue.stencil);
>+        }
>+    }
>+
>+    return angle::Result::Continue;
> }
> 
>-gl::Error FramebufferVk::beginRenderPass(const gl::Context *context,
>-                                         VkDevice device,
>-                                         vk::CommandBuffer *commandBuffer,
>-                                         Serial queueSerial)
>+angle::Result FramebufferVk::clearWithDraw(ContextVk *contextVk,
>+                                           const gl::Rectangle &clearArea,
>+                                           gl::DrawBufferMask clearColorBuffers,
>+                                           bool clearStencil,
>+                                           VkColorComponentFlags colorMaskFlags,
>+                                           uint8_t stencilMask,
>+                                           const VkClearColorValue &clearColorValue,
>+                                           uint8_t clearStencilValue)
> {
>-    // TODO(jmadill): Cache render targets.
>-    for (const auto &colorAttachment : mState.getColorAttachments())
>+    RendererVk *renderer = contextVk->getRenderer();
>+
>+    UtilsVk::ClearFramebufferParameters params = {};
>+    params.renderPassDesc                      = &getRenderPassDesc();
>+    params.renderAreaHeight                    = mState.getDimensions().height;
>+    params.clearArea                           = clearArea;
>+    params.colorClearValue                     = clearColorValue;
>+    params.stencilClearValue                   = clearStencilValue;
>+    params.stencilMask                         = stencilMask;
>+
>+    params.clearColor   = true;
>+    params.clearStencil = clearStencil;
>+
>+    const auto &colorRenderTargets = mRenderTargetCache.getColors();
>+    for (size_t colorIndex : clearColorBuffers)
>     {
>-        if (colorAttachment.isAttached())
>+        const RenderTargetVk *colorRenderTarget = colorRenderTargets[colorIndex];
>+        ASSERT(colorRenderTarget);
>+
>+        params.colorFormat          = &colorRenderTarget->getImage().getFormat().imageFormat();
>+        params.colorAttachmentIndex = colorIndex;
>+        params.colorMaskFlags       = colorMaskFlags;
>+        if (mEmulatedAlphaAttachmentMask[colorIndex])
>         {
>-            RenderTargetVk *renderTarget = nullptr;
>-            ANGLE_TRY(colorAttachment.getRenderTarget<RenderTargetVk>(context, &renderTarget));
>-            renderTarget->resource->setQueueSerial(queueSerial);
>+            params.colorMaskFlags &= ~VK_COLOR_COMPONENT_A_BIT;
>         }
>+
>+        ANGLE_TRY(renderer->getUtils().clearFramebuffer(contextVk, this, params));
>+
>+        // Clear stencil only once!
>+        params.clearStencil = false;
>     }
> 
>-    const auto *depthStencilAttachment = mState.getDepthStencilAttachment();
>-    if (depthStencilAttachment && depthStencilAttachment->isAttached())
>+    // If there was no color clear, clear stencil alone.
>+    if (params.clearStencil)
>     {
>-        RenderTargetVk *renderTarget = nullptr;
>-        ANGLE_TRY(depthStencilAttachment->getRenderTarget<RenderTargetVk>(context, &renderTarget));
>-        renderTarget->resource->setQueueSerial(queueSerial);
>+        params.clearColor = false;
>+        ANGLE_TRY(renderer->getUtils().clearFramebuffer(contextVk, this, params));
>     }
> 
>+    return angle::Result::Continue;
>+}
>+
>+angle::Result FramebufferVk::getSamplePosition(const gl::Context *context,
>+                                               size_t index,
>+                                               GLfloat *xy) const
>+{
>+    ANGLE_VK_UNREACHABLE(vk::GetImpl(context));
>+    return angle::Result::Stop;
>+}
>+
>+angle::Result FramebufferVk::startNewRenderPass(ContextVk *contextVk,
>+                                                const gl::Rectangle &renderArea,
>+                                                vk::CommandBuffer **commandBufferOut)
>+{
>     vk::Framebuffer *framebuffer = nullptr;
>-    ANGLE_TRY_RESULT(getFramebuffer(context, device), framebuffer);
>-    ASSERT(framebuffer && framebuffer->valid());
>-
>-    vk::RenderPass *renderPass = nullptr;
>-    ANGLE_TRY_RESULT(getRenderPass(context, device), renderPass);
>-    ASSERT(renderPass && renderPass->valid());
>-
>-    // TODO(jmadill): Proper clear value implementation.
>-    const gl::State &glState = context->getGLState();
>-    VkClearColorValue colorClear;
>-    memset(&colorClear, 0, sizeof(VkClearColorValue));
>-    colorClear.float32[0] = glState.getColorClearValue().red;
>-    colorClear.float32[1] = glState.getColorClearValue().green;
>-    colorClear.float32[2] = glState.getColorClearValue().blue;
>-    colorClear.float32[3] = glState.getColorClearValue().alpha;
>+    ANGLE_TRY(getFramebuffer(contextVk, &framebuffer));
> 
>+    vk::AttachmentOpsArray renderPassAttachmentOps;
>     std::vector<VkClearValue> attachmentClearValues;
>-    attachmentClearValues.push_back({colorClear});
> 
>-    // Updated the cached image layout of the attachments in this FBO.
>-    // For a default FBO, we need to call through to the WindowSurfaceVk
>-    // TODO(jmadill): Iterate over all attachments.
>-    RenderTargetVk *renderTarget = nullptr;
>-    ANGLE_TRY(mState.getFirstColorAttachment()->getRenderTarget(context, &renderTarget));
>-    renderTarget->image->updateLayout(VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL);
>+    vk::CommandBuffer *writeCommands = nullptr;
>+    ANGLE_TRY(mFramebuffer.recordCommands(contextVk, &writeCommands));
> 
>-    commandBuffer->beginRenderPass(*renderPass, *framebuffer, glState.getViewport(),
>-                                   attachmentClearValues);
>+    vk::RenderPassDesc renderPassDesc;
> 
>-    setQueueSerial(queueSerial);
>-    if (mBackbuffer)
>+    // Initialize RenderPass info.
>+    // TODO(jmadill): Support gaps in RenderTargets. http://anglebug.com/2394
>+    const auto &colorRenderTargets = mRenderTargetCache.getColors();
>+    for (size_t colorIndex : mState.getEnabledDrawBuffers())
>+    {
>+        RenderTargetVk *colorRenderTarget = colorRenderTargets[colorIndex];
>+        ASSERT(colorRenderTarget);
>+
>+        ANGLE_TRY(colorRenderTarget->onColorDraw(contextVk, &mFramebuffer, writeCommands,
>+                                                 &renderPassDesc));
>+
>+        renderPassAttachmentOps.initWithLoadStore(attachmentClearValues.size(),
>+                                                  VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL,
>+                                                  VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL);
>+        attachmentClearValues.emplace_back(kUninitializedClearValue);
>+    }
>+
>+    RenderTargetVk *depthStencilRenderTarget = mRenderTargetCache.getDepthStencil();
>+    if (depthStencilRenderTarget)
>+    {
>+        ANGLE_TRY(depthStencilRenderTarget->onDepthStencilDraw(contextVk, &mFramebuffer,
>+                                                               writeCommands, &renderPassDesc));
>+
>+        renderPassAttachmentOps.initWithLoadStore(attachmentClearValues.size(),
>+                                                  VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL,
>+                                                  VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL);
>+        attachmentClearValues.emplace_back(kUninitializedClearValue);
>+    }
>+
>+    return mFramebuffer.beginRenderPass(contextVk, *framebuffer, renderArea, mRenderPassDesc,
>+                                        renderPassAttachmentOps, attachmentClearValues,
>+                                        commandBufferOut);
>+}
>+
>+void FramebufferVk::updateActiveColorMasks(size_t colorIndex, bool r, bool g, bool b, bool a)
>+{
>+    mActiveColorComponentMasksForClear[0].set(colorIndex, r);
>+    mActiveColorComponentMasksForClear[1].set(colorIndex, g);
>+    mActiveColorComponentMasksForClear[2].set(colorIndex, b);
>+    mActiveColorComponentMasksForClear[3].set(colorIndex, a);
>+}
>+
>+const gl::DrawBufferMask &FramebufferVk::getEmulatedAlphaAttachmentMask() const
>+{
>+    return mEmulatedAlphaAttachmentMask;
>+}
>+
>+angle::Result FramebufferVk::readPixelsImpl(ContextVk *contextVk,
>+                                            const gl::Rectangle &area,
>+                                            const PackPixelsParams &packPixelsParams,
>+                                            VkImageAspectFlagBits copyAspectFlags,
>+                                            RenderTargetVk *renderTarget,
>+                                            void *pixels)
>+{
>+    TRACE_EVENT0("gpu.angle", "FramebufferVk::readPixelsImpl");
>+
>+    ANGLE_TRY(renderTarget->ensureImageInitialized(contextVk));
>+
>+    vk::CommandBuffer *commandBuffer = nullptr;
>+    ANGLE_TRY(mFramebuffer.recordCommands(contextVk, &commandBuffer));
>+
>+    // Note that although we're reading from the image, we need to update the layout below.
>+
>+    vk::ImageHelper *srcImage =
>+        renderTarget->getImageForRead(&mFramebuffer, vk::ImageLayout::TransferSrc, commandBuffer);
>+
>+    const angle::Format *readFormat = &srcImage->getFormat().imageFormat();
>+
>+    if (copyAspectFlags != VK_IMAGE_ASPECT_COLOR_BIT)
>+    {
>+        readFormat = &GetDepthStencilImageToBufferFormat(*readFormat, copyAspectFlags);
>+    }
>+
>+    VkBuffer bufferHandle      = VK_NULL_HANDLE;
>+    uint8_t *readPixelBuffer   = nullptr;
>+    VkDeviceSize stagingOffset = 0;
>+    size_t allocationSize      = readFormat->pixelBytes * area.width * area.height;
>+
>+    ANGLE_TRY(mReadPixelBuffer.allocate(contextVk, allocationSize, &readPixelBuffer, &bufferHandle,
>+                                        &stagingOffset, nullptr));
>+
>+    VkBufferImageCopy region               = {};
>+    region.bufferImageHeight               = area.height;
>+    region.bufferOffset                    = stagingOffset;
>+    region.bufferRowLength                 = area.width;
>+    region.imageExtent.width               = area.width;
>+    region.imageExtent.height              = area.height;
>+    region.imageExtent.depth               = 1;
>+    region.imageOffset.x                   = area.x;
>+    region.imageOffset.y                   = area.y;
>+    region.imageOffset.z                   = 0;
>+    region.imageSubresource.aspectMask     = copyAspectFlags;
>+    region.imageSubresource.baseArrayLayer = renderTarget->getLayerIndex();
>+    region.imageSubresource.layerCount     = 1;
>+    region.imageSubresource.mipLevel       = renderTarget->getLevelIndex();
>+
>+    commandBuffer->copyImageToBuffer(srcImage->getImage(), srcImage->getCurrentLayout(),
>+                                     bufferHandle, 1, &region);
>+
>+    // Triggers a full finish.
>+    // TODO(jmadill): Don't block on asynchronous readback.
>+    ANGLE_TRY(contextVk->finishImpl());
>+
>+    // The buffer we copied to needs to be invalidated before we read from it because its not been
>+    // created with the host coherent bit.
>+    ANGLE_TRY(mReadPixelBuffer.invalidate(contextVk));
>+
>+    PackPixels(packPixelsParams, *readFormat, area.width * readFormat->pixelBytes, readPixelBuffer,
>+               static_cast<uint8_t *>(pixels));
>+
>+    return angle::Result::Continue;
>+}
>+
>+gl::Extents FramebufferVk::getReadImageExtents() const
>+{
>+    ASSERT(getColorReadRenderTarget()->getExtents().width == mState.getDimensions().width);
>+    ASSERT(getColorReadRenderTarget()->getExtents().height == mState.getDimensions().height);
>+
>+    return getColorReadRenderTarget()->getExtents();
>+}
>+
>+gl::Rectangle FramebufferVk::getCompleteRenderArea() const
>+{
>+    return gl::Rectangle(0, 0, mState.getDimensions().width, mState.getDimensions().height);
>+}
>+
>+gl::Rectangle FramebufferVk::getScissoredRenderArea(ContextVk *contextVk) const
>+{
>+    const gl::Rectangle renderArea(0, 0, mState.getDimensions().width,
>+                                   mState.getDimensions().height);
>+    bool invertViewport = contextVk->isViewportFlipEnabledForDrawFBO();
>+
>+    return ClipRectToScissor(contextVk->getState(), renderArea, invertViewport);
>+}
>+
>+void FramebufferVk::onScissorChange(ContextVk *contextVk)
>+{
>+    gl::Rectangle scissoredRenderArea = getScissoredRenderArea(contextVk);
>+
>+    // If the scissor has grown beyond the previous scissoredRenderArea, make sure the render pass
>+    // is restarted.  Otherwise, we can continue using the same renderpass area.
>+    //
>+    // Without a scissor, the render pass area covers the whole of the framebuffer.  With a
>+    // scissored clear, the render pass area could be smaller than the framebuffer size.  When the
>+    // scissor changes, if the scissor area is completely encompassed by the render pass area, it's
>+    // possible to continue using the same render pass.  However, if the current render pass area
>+    // is too small, we need to start a new one.  The latter can happen if a scissored clear starts
>+    // a render pass, the scissor is disabled and a draw call is issued to affect the whole
>+    // framebuffer.
>+    mFramebuffer.updateQueueSerial(contextVk->getRenderer()->getCurrentQueueSerial());
>+    if (mFramebuffer.hasStartedRenderPass() &&
>+        !mFramebuffer.getRenderPassRenderArea().encloses(scissoredRenderArea))
>+    {
>+        mFramebuffer.finishCurrentCommands(contextVk->getRenderer());
>+    }
>+}
>+
>+RenderTargetVk *FramebufferVk::getFirstRenderTarget() const
>+{
>+    for (auto *renderTarget : mRenderTargetCache.getColors())
>     {
>-        mBackbuffer->setQueueSerial(queueSerial);
>+        if (renderTarget)
>+        {
>+            return renderTarget;
>+        }
>     }
> 
>-    return gl::NoError();
>+    return mRenderTargetCache.getDepthStencil();
>+}
>+
>+GLint FramebufferVk::getSamples() const
>+{
>+    RenderTargetVk *firstRT = getFirstRenderTarget();
>+    return firstRT ? firstRT->getImage().getSamples() : 0;
> }
> 
> }  // namespace rx
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/FramebufferVk.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/FramebufferVk.h
>index 64395218959..1677f82fce7 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/FramebufferVk.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/FramebufferVk.h
>@@ -11,98 +11,201 @@
> #define LIBANGLE_RENDERER_VULKAN_FRAMEBUFFERVK_H_
> 
> #include "libANGLE/renderer/FramebufferImpl.h"
>-#include "libANGLE/renderer/vulkan/renderervk_utils.h"
>+#include "libANGLE/renderer/RenderTargetCache.h"
>+#include "libANGLE/renderer/vulkan/BufferVk.h"
>+#include "libANGLE/renderer/vulkan/CommandGraph.h"
>+#include "libANGLE/renderer/vulkan/vk_cache_utils.h"
> 
> namespace rx
> {
>+class RendererVk;
> class RenderTargetVk;
> class WindowSurfaceVk;
> 
>-class FramebufferVk : public FramebufferImpl, public ResourceVk
>+class FramebufferVk : public FramebufferImpl
> {
>   public:
>     // Factory methods so we don't have to use constructors with overloads.
>-    static FramebufferVk *CreateUserFBO(const gl::FramebufferState &state);
>+    static FramebufferVk *CreateUserFBO(RendererVk *renderer, const gl::FramebufferState &state);
> 
>     // The passed-in SurfaceVK must be destroyed after this FBO is destroyed. Our Surface code is
>     // ref-counted on the number of 'current' contexts, so we shouldn't get any dangling surface
>     // references. See Surface::setIsCurrent(bool).
>-    static FramebufferVk *CreateDefaultFBO(const gl::FramebufferState &state,
>+    static FramebufferVk *CreateDefaultFBO(RendererVk *renderer,
>+                                           const gl::FramebufferState &state,
>                                            WindowSurfaceVk *backbuffer);
> 
>     ~FramebufferVk() override;
>     void destroy(const gl::Context *context) override;
>-    void destroyDefault(const egl::Display *display) override;
>-
>-    gl::Error discard(const gl::Context *context, size_t count, const GLenum *attachments) override;
>-    gl::Error invalidate(const gl::Context *context,
>-                         size_t count,
>-                         const GLenum *attachments) override;
>-    gl::Error invalidateSub(const gl::Context *context,
>-                            size_t count,
>-                            const GLenum *attachments,
>-                            const gl::Rectangle &area) override;
>-
>-    gl::Error clear(const gl::Context *context, GLbitfield mask) override;
>-    gl::Error clearBufferfv(const gl::Context *context,
>-                            GLenum buffer,
>-                            GLint drawbuffer,
>-                            const GLfloat *values) override;
>-    gl::Error clearBufferuiv(const gl::Context *context,
>-                             GLenum buffer,
>-                             GLint drawbuffer,
>-                             const GLuint *values) override;
>-    gl::Error clearBufferiv(const gl::Context *context,
>-                            GLenum buffer,
>-                            GLint drawbuffer,
>-                            const GLint *values) override;
>-    gl::Error clearBufferfi(const gl::Context *context,
>-                            GLenum buffer,
>-                            GLint drawbuffer,
>-                            GLfloat depth,
>-                            GLint stencil) override;
>+
>+    angle::Result discard(const gl::Context *context,
>+                          size_t count,
>+                          const GLenum *attachments) override;
>+    angle::Result invalidate(const gl::Context *context,
>+                             size_t count,
>+                             const GLenum *attachments) override;
>+    angle::Result invalidateSub(const gl::Context *context,
>+                                size_t count,
>+                                const GLenum *attachments,
>+                                const gl::Rectangle &area) override;
>+
>+    angle::Result clear(const gl::Context *context, GLbitfield mask) override;
>+    angle::Result clearBufferfv(const gl::Context *context,
>+                                GLenum buffer,
>+                                GLint drawbuffer,
>+                                const GLfloat *values) override;
>+    angle::Result clearBufferuiv(const gl::Context *context,
>+                                 GLenum buffer,
>+                                 GLint drawbuffer,
>+                                 const GLuint *values) override;
>+    angle::Result clearBufferiv(const gl::Context *context,
>+                                GLenum buffer,
>+                                GLint drawbuffer,
>+                                const GLint *values) override;
>+    angle::Result clearBufferfi(const gl::Context *context,
>+                                GLenum buffer,
>+                                GLint drawbuffer,
>+                                GLfloat depth,
>+                                GLint stencil) override;
> 
>     GLenum getImplementationColorReadFormat(const gl::Context *context) const override;
>     GLenum getImplementationColorReadType(const gl::Context *context) const override;
>-    gl::Error readPixels(const gl::Context *context,
>-                         const gl::Rectangle &area,
>-                         GLenum format,
>-                         GLenum type,
>-                         void *pixels) override;
>-
>-    gl::Error blit(const gl::Context *context,
>-                   const gl::Rectangle &sourceArea,
>-                   const gl::Rectangle &destArea,
>-                   GLbitfield mask,
>-                   GLenum filter) override;
>+    angle::Result readPixels(const gl::Context *context,
>+                             const gl::Rectangle &area,
>+                             GLenum format,
>+                             GLenum type,
>+                             void *pixels) override;
>+
>+    angle::Result blit(const gl::Context *context,
>+                       const gl::Rectangle &sourceArea,
>+                       const gl::Rectangle &destArea,
>+                       GLbitfield mask,
>+                       GLenum filter) override;
> 
>     bool checkStatus(const gl::Context *context) const override;
> 
>-    void syncState(const gl::Context *context,
>-                   const gl::Framebuffer::DirtyBits &dirtyBits) override;
>+    angle::Result syncState(const gl::Context *context,
>+                            const gl::Framebuffer::DirtyBits &dirtyBits) override;
> 
>-    gl::Error getSamplePosition(size_t index, GLfloat *xy) const override;
>+    angle::Result getSamplePosition(const gl::Context *context,
>+                                    size_t index,
>+                                    GLfloat *xy) const override;
>+    RenderTargetVk *getDepthStencilRenderTarget() const;
> 
>-    gl::Error beginRenderPass(const gl::Context *context,
>-                              VkDevice device,
>-                              vk::CommandBuffer *commandBuffer,
>-                              Serial queueSerial);
>+    // Internal helper function for readPixels operations.
>+    angle::Result readPixelsImpl(ContextVk *contextVk,
>+                                 const gl::Rectangle &area,
>+                                 const PackPixelsParams &packPixelsParams,
>+                                 VkImageAspectFlagBits copyAspectFlags,
>+                                 RenderTargetVk *renderTarget,
>+                                 void *pixels);
> 
>-    gl::ErrorOrResult<vk::RenderPass *> getRenderPass(const gl::Context *context, VkDevice device);
>+    gl::Extents getReadImageExtents() const;
>+    gl::Rectangle getCompleteRenderArea() const;
>+    gl::Rectangle getScissoredRenderArea(ContextVk *contextVk) const;
> 
>-  private:
>-    FramebufferVk(const gl::FramebufferState &state);
>-    FramebufferVk(const gl::FramebufferState &state, WindowSurfaceVk *backbuffer);
>+    void onScissorChange(ContextVk *contextVk);
>+
>+    const gl::DrawBufferMask &getEmulatedAlphaAttachmentMask() const;
>+    RenderTargetVk *getColorReadRenderTarget() const;
>+
>+    // This will clear the current write operation if it is complete.
>+    bool appendToStartedRenderPass(Serial currentQueueSerial,
>+                                   const gl::Rectangle &renderArea,
>+                                   vk::CommandBuffer **commandBufferOut)
>+    {
>+        return mFramebuffer.appendToStartedRenderPass(currentQueueSerial, renderArea,
>+                                                      commandBufferOut);
>+    }
>+
>+    vk::FramebufferHelper *getFramebuffer() { return &mFramebuffer; }
> 
>-    gl::ErrorOrResult<vk::Framebuffer *> getFramebuffer(const gl::Context *context,
>-                                                        VkDevice device);
>+    angle::Result startNewRenderPass(ContextVk *context,
>+                                     const gl::Rectangle &renderArea,
>+                                     vk::CommandBuffer **commandBufferOut);
>+
>+    RenderTargetVk *getFirstRenderTarget() const;
>+    GLint getSamples() const;
>+
>+    const vk::RenderPassDesc &getRenderPassDesc() const { return mRenderPassDesc; }
>+
>+  private:
>+    FramebufferVk(RendererVk *renderer,
>+                  const gl::FramebufferState &state,
>+                  WindowSurfaceVk *backbuffer);
>+
>+    // The 'in' rectangles must be clipped to the scissor and FBO. The clipping is done in 'blit'.
>+    angle::Result blitWithCommand(ContextVk *contextVk,
>+                                  const gl::Rectangle &readRectIn,
>+                                  const gl::Rectangle &drawRectIn,
>+                                  RenderTargetVk *readRenderTarget,
>+                                  RenderTargetVk *drawRenderTarget,
>+                                  GLenum filter,
>+                                  bool colorBlit,
>+                                  bool depthBlit,
>+                                  bool stencilBlit,
>+                                  bool flipSource,
>+                                  bool flipDest);
>+
>+    // Note that 'copyArea' must be clipped to the scissor and FBO. The clipping is done in 'blit'.
>+    angle::Result blitWithCopy(ContextVk *contextVk,
>+                               const gl::Rectangle &copyArea,
>+                               RenderTargetVk *readRenderTarget,
>+                               RenderTargetVk *drawRenderTarget,
>+                               bool blitDepthBuffer,
>+                               bool blitStencilBuffer);
>+
>+    angle::Result blitWithReadback(ContextVk *contextVk,
>+                                   const gl::Rectangle &copyArea,
>+                                   VkImageAspectFlagBits aspect,
>+                                   RenderTargetVk *readRenderTarget,
>+                                   RenderTargetVk *drawRenderTarget);
>+
>+    angle::Result getFramebuffer(ContextVk *contextVk, vk::Framebuffer **framebufferOut);
>+
>+    angle::Result clearImpl(const gl::Context *context,
>+                            gl::DrawBufferMask clearColorBuffers,
>+                            bool clearDepth,
>+                            bool clearStencil,
>+                            const VkClearColorValue &clearColorValue,
>+                            const VkClearDepthStencilValue &clearDepthStencilValue);
>+    angle::Result clearWithRenderPassOp(ContextVk *contextVk,
>+                                        const gl::Rectangle &clearArea,
>+                                        gl::DrawBufferMask clearColorBuffers,
>+                                        bool clearDepth,
>+                                        bool clearStencil,
>+                                        const VkClearColorValue &clearColorValue,
>+                                        const VkClearDepthStencilValue &clearDepthStencilValue);
>+    angle::Result clearWithDraw(ContextVk *contextVk,
>+                                const gl::Rectangle &clearArea,
>+                                gl::DrawBufferMask clearColorBuffers,
>+                                bool clearStencil,
>+                                VkColorComponentFlags colorMaskFlags,
>+                                uint8_t stencilMask,
>+                                const VkClearColorValue &clearColorValue,
>+                                uint8_t clearStencilValue);
>+    void updateActiveColorMasks(size_t colorIndex, bool r, bool g, bool b, bool a);
>+    void updateRenderPassDesc();
> 
>     WindowSurfaceVk *mBackbuffer;
> 
>-    vk::RenderPass mRenderPass;
>-    vk::Framebuffer mFramebuffer;
>+    vk::RenderPassDesc mRenderPassDesc;
>+    vk::FramebufferHelper mFramebuffer;
>+    RenderTargetCache<RenderTargetVk> mRenderTargetCache;
>+
>+    // These two variables are used to quickly compute if we need to do a masked clear. If a color
>+    // channel is masked out, we check against the Framebuffer Attachments (RenderTargets) to see
>+    // if the masked out channel is present in any of the attachments.
>+    VkColorComponentFlags mActiveColorComponents;
>+    gl::DrawBufferMask mActiveColorComponentMasksForClear[4];
>+    vk::DynamicBuffer mReadPixelBuffer;
>+    vk::DynamicBuffer mBlitPixelBuffer;
>+
>+    // When we draw to the framebuffer, and the real format has an alpha channel but the format of
>+    // the framebuffer does not, we need to mask out the alpha channel. This DrawBufferMask will
>+    // contain the mask to apply to the alpha channel when drawing.
>+    gl::DrawBufferMask mEmulatedAlphaAttachmentMask;
> };
>-
> }  // namespace rx
> 
> #endif  // LIBANGLE_RENDERER_VULKAN_FRAMEBUFFERVK_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/GlslangWrapper.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/GlslangWrapper.cpp
>index 913a6454a6a..2233e840600 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/GlslangWrapper.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/GlslangWrapper.cpp
>@@ -8,126 +8,243 @@
> 
> #include "libANGLE/renderer/vulkan/GlslangWrapper.h"
> 
>+// glslang has issues with some specific warnings.
>+ANGLE_DISABLE_EXTRA_SEMI_WARNING
>+
> // glslang's version of ShaderLang.h, not to be confused with ANGLE's.
>-// Our function defs conflict with theirs, but we carefully manage our includes to prevent this.
>-#include <ShaderLang.h>
>+#include <glslang/Public/ShaderLang.h>
> 
> // Other glslang includes.
>-#include <StandAlone/ResourceLimits.h>
> #include <SPIRV/GlslangToSpv.h>
>+#include <StandAlone/ResourceLimits.h>
>+
>+ANGLE_REENABLE_EXTRA_SEMI_WARNING
> 
> #include <array>
> 
>+#include "common/FixedVector.h"
> #include "common/string_utils.h"
> #include "common/utilities.h"
>+#include "libANGLE/Caps.h"
> #include "libANGLE/ProgramLinkedResources.h"
> 
> namespace rx
> {
>-
> namespace
> {
>+constexpr char kQualifierMarkerBegin[] = "@@ QUALIFIER-";
>+constexpr char kLayoutMarkerBegin[]    = "@@ LAYOUT-";
>+constexpr char kMarkerEnd[]            = " @@";
>+constexpr char kUniformQualifier[]     = "uniform";
>+constexpr char kVersionDefine[]        = "#version 450 core\n";
>+constexpr char kLineRasterDefine[]     = R"(#version 450 core
>+
>+#define ANGLE_ENABLE_LINE_SEGMENT_RASTERIZATION
>+)";
>+
>+void GetBuiltInResourcesFromCaps(const gl::Caps &caps, TBuiltInResource *outBuiltInResources)
>+{
>+    outBuiltInResources->maxDrawBuffers                   = caps.maxDrawBuffers;
>+    outBuiltInResources->maxAtomicCounterBindings         = caps.maxAtomicCounterBufferBindings;
>+    outBuiltInResources->maxAtomicCounterBufferSize       = caps.maxAtomicCounterBufferSize;
>+    outBuiltInResources->maxClipPlanes                    = caps.maxClipPlanes;
>+    outBuiltInResources->maxCombinedAtomicCounterBuffers  = caps.maxCombinedAtomicCounterBuffers;
>+    outBuiltInResources->maxCombinedAtomicCounters        = caps.maxCombinedAtomicCounters;
>+    outBuiltInResources->maxCombinedImageUniforms         = caps.maxCombinedImageUniforms;
>+    outBuiltInResources->maxCombinedTextureImageUnits     = caps.maxCombinedTextureImageUnits;
>+    outBuiltInResources->maxCombinedShaderOutputResources = caps.maxCombinedShaderOutputResources;
>+    outBuiltInResources->maxComputeWorkGroupCountX        = caps.maxComputeWorkGroupCount[0];
>+    outBuiltInResources->maxComputeWorkGroupCountY        = caps.maxComputeWorkGroupCount[1];
>+    outBuiltInResources->maxComputeWorkGroupCountZ        = caps.maxComputeWorkGroupCount[2];
>+    outBuiltInResources->maxComputeWorkGroupSizeX         = caps.maxComputeWorkGroupSize[0];
>+    outBuiltInResources->maxComputeWorkGroupSizeY         = caps.maxComputeWorkGroupSize[1];
>+    outBuiltInResources->maxComputeWorkGroupSizeZ         = caps.maxComputeWorkGroupSize[2];
>+    outBuiltInResources->minProgramTexelOffset            = caps.minProgramTexelOffset;
>+    outBuiltInResources->maxFragmentUniformVectors        = caps.maxFragmentUniformVectors;
>+    outBuiltInResources->maxFragmentInputComponents       = caps.maxFragmentInputComponents;
>+    outBuiltInResources->maxGeometryInputComponents       = caps.maxGeometryInputComponents;
>+    outBuiltInResources->maxGeometryOutputComponents      = caps.maxGeometryOutputComponents;
>+    outBuiltInResources->maxGeometryOutputVertices        = caps.maxGeometryOutputVertices;
>+    outBuiltInResources->maxGeometryTotalOutputComponents = caps.maxGeometryTotalOutputComponents;
>+    outBuiltInResources->maxLights                        = caps.maxLights;
>+    outBuiltInResources->maxProgramTexelOffset            = caps.maxProgramTexelOffset;
>+    outBuiltInResources->maxVaryingComponents             = caps.maxVaryingComponents;
>+    outBuiltInResources->maxVaryingVectors                = caps.maxVaryingVectors;
>+    outBuiltInResources->maxVertexAttribs                 = caps.maxVertexAttributes;
>+    outBuiltInResources->maxVertexOutputComponents        = caps.maxVertexOutputComponents;
>+    outBuiltInResources->maxVertexUniformVectors          = caps.maxVertexUniformVectors;
>+}
> 
> void InsertLayoutSpecifierString(std::string *shaderString,
>                                  const std::string &variableName,
>                                  const std::string &layoutString)
> {
>     std::stringstream searchStringBuilder;
>-    searchStringBuilder << "@@ LAYOUT-" << variableName << " @@";
>+    searchStringBuilder << kLayoutMarkerBegin << variableName << kMarkerEnd;
>     std::string searchString = searchStringBuilder.str();
> 
>-    angle::ReplaceSubstring(shaderString, searchString, layoutString);
>+    if (!layoutString.empty())
>+    {
>+        angle::ReplaceSubstring(shaderString, searchString, "layout(" + layoutString + ")");
>+    }
>+    else
>+    {
>+        angle::ReplaceSubstring(shaderString, searchString, layoutString);
>+    }
> }
> 
>-}  // anonymous namespace
>-
>-// static
>-GlslangWrapper *GlslangWrapper::mInstance = nullptr;
>-
>-// static
>-GlslangWrapper *GlslangWrapper::GetReference()
>+void InsertQualifierSpecifierString(std::string *shaderString,
>+                                    const std::string &variableName,
>+                                    const std::string &replacementString)
> {
>-    if (!mInstance)
>-    {
>-        mInstance = new GlslangWrapper();
>-    }
>+    std::stringstream searchStringBuilder;
>+    searchStringBuilder << kQualifierMarkerBegin << variableName << kMarkerEnd;
>+    std::string searchString = searchStringBuilder.str();
>+    angle::ReplaceSubstring(shaderString, searchString, replacementString);
>+}
> 
>-    mInstance->addRef();
>+void EraseLayoutAndQualifierStrings(std::string *vertexSource,
>+                                    std::string *fragmentSource,
>+                                    const std::string &uniformName)
>+{
>+    InsertLayoutSpecifierString(vertexSource, uniformName, "");
>+    InsertLayoutSpecifierString(fragmentSource, uniformName, "");
> 
>-    return mInstance;
>+    InsertQualifierSpecifierString(vertexSource, uniformName, "");
>+    InsertQualifierSpecifierString(fragmentSource, uniformName, "");
> }
> 
>-// static
>-void GlslangWrapper::ReleaseReference()
>+std::string GetMappedSamplerName(const std::string &originalName)
> {
>-    if (mInstance->getRefCount() == 1)
>-    {
>-        mInstance->release();
>-        mInstance = nullptr;
>-    }
>-    else
>-    {
>-        mInstance->release();
>-    }
>+    std::string samplerName = gl::ParseResourceName(originalName, nullptr);
>+
>+    // Samplers in structs are extracted.
>+    std::replace(samplerName.begin(), samplerName.end(), '.', '_');
>+
>+    // Samplers in arrays of structs are also extracted.
>+    std::replace(samplerName.begin(), samplerName.end(), '[', '_');
>+    samplerName.erase(std::remove(samplerName.begin(), samplerName.end(), ']'), samplerName.end());
>+    return samplerName;
> }
>+}  // anonymous namespace
> 
>-GlslangWrapper::GlslangWrapper()
>+// static
>+void GlslangWrapper::Initialize()
> {
>     int result = ShInitialize();
>     ASSERT(result != 0);
> }
> 
>-GlslangWrapper::~GlslangWrapper()
>+// static
>+void GlslangWrapper::Release()
> {
>     int result = ShFinalize();
>     ASSERT(result != 0);
> }
> 
>-gl::LinkResult GlslangWrapper::linkProgram(const gl::Context *glContext,
>-                                           const gl::ProgramState &programState,
>-                                           const gl::ProgramLinkedResources &resources,
>-                                           std::vector<uint32_t> *vertexCodeOut,
>-                                           std::vector<uint32_t> *fragmentCodeOut)
>+// static
>+void GlslangWrapper::GetShaderSource(const gl::ProgramState &programState,
>+                                     const gl::ProgramLinkedResources &resources,
>+                                     std::string *vertexSourceOut,
>+                                     std::string *fragmentSourceOut)
> {
>-    gl::Shader *glVertexShader   = programState.getAttachedVertexShader();
>-    gl::Shader *glFragmentShader = programState.getAttachedFragmentShader();
>+    gl::Shader *glVertexShader   = programState.getAttachedShader(gl::ShaderType::Vertex);
>+    gl::Shader *glFragmentShader = programState.getAttachedShader(gl::ShaderType::Fragment);
> 
>-    std::string vertexSource   = glVertexShader->getTranslatedSource(glContext);
>-    std::string fragmentSource = glFragmentShader->getTranslatedSource(glContext);
>+    std::string vertexSource   = glVertexShader->getTranslatedSource();
>+    std::string fragmentSource = glFragmentShader->getTranslatedSource();
> 
>     // Parse attribute locations and replace them in the vertex shader.
>     // See corresponding code in OutputVulkanGLSL.cpp.
>-    // TODO(jmadill): Also do the same for ESSL 3 fragment outputs.
>-    for (const auto &attribute : programState.getAttributes())
>+    for (const sh::Attribute &attribute : programState.getAttributes())
>     {
>-        if (!attribute.staticUse)
>-            continue;
>+        // Warning: If we endup supporting ES 3.0 shaders and up, Program::linkAttributes is going
>+        // to bring us all attributes in this list instead of only the active ones.
>+        ASSERT(attribute.active);
> 
>         std::string locationString = "location = " + Str(attribute.location);
>         InsertLayoutSpecifierString(&vertexSource, attribute.name, locationString);
>+        InsertQualifierSpecifierString(&vertexSource, attribute.name, "in");
>+    }
>+
>+    // The attributes in the programState could have been filled with active attributes only
>+    // depending on the shader version. If there is inactive attributes left, we have to remove
>+    // their @@ QUALIFIER and @@ LAYOUT markers.
>+    for (const sh::Attribute &attribute : glVertexShader->getAllAttributes())
>+    {
>+        if (attribute.active)
>+        {
>+            continue;
>+        }
>+
>+        InsertLayoutSpecifierString(&vertexSource, attribute.name, "");
>+        InsertQualifierSpecifierString(&vertexSource, attribute.name, "");
>+    }
>+
>+    // Parse output locations and replace them in the fragment shader.
>+    // See corresponding code in OutputVulkanGLSL.cpp.
>+    // TODO(syoussefi): Add support for EXT_blend_func_extended.  http://anglebug.com/3385
>+    const auto &outputLocations = programState.getOutputLocations();
>+    const auto &outputVariables = programState.getOutputVariables();
>+    for (const gl::VariableLocation &outputLocation : outputLocations)
>+    {
>+        if (outputLocation.arrayIndex == 0 && outputLocation.used() && !outputLocation.ignored)
>+        {
>+            const sh::OutputVariable &outputVar = outputVariables[outputLocation.index];
>+
>+            std::string locationString;
>+            if (outputVar.location != -1)
>+            {
>+                locationString = "location = " + Str(outputVar.location);
>+            }
>+            else
>+            {
>+                // If there is only one output, it is allowed not to have a location qualifier, in
>+                // which case it defaults to 0.  GLSL ES 3.00 spec, section 4.3.8.2.
>+                ASSERT(outputVariables.size() == 1);
>+                locationString = "location = 0";
>+            }
>+
>+            InsertLayoutSpecifierString(&fragmentSource, outputVar.name, locationString);
>+        }
>     }
> 
>     // Assign varying locations.
>-    // TODO(jmadill): This might need to be redone.
>-    for (const auto &varyingReg : resources.varyingPacking.getRegisterList())
>+    for (const gl::PackedVaryingRegister &varyingReg : resources.varyingPacking.getRegisterList())
>     {
>-        const auto &varying        = *varyingReg.packedVarying;
>+        const auto &varying = *varyingReg.packedVarying;
>+
>         std::string locationString = "location = " + Str(varyingReg.registerRow);
>+        if (varyingReg.registerColumn > 0)
>+        {
>+            ASSERT(!varying.varying->isStruct());
>+            ASSERT(!gl::IsMatrixType(varying.varying->type));
>+            locationString += ", component = " + Str(varyingReg.registerColumn);
>+        }
>+
>         InsertLayoutSpecifierString(&vertexSource, varying.varying->name, locationString);
>         InsertLayoutSpecifierString(&fragmentSource, varying.varying->name, locationString);
>+
>+        ASSERT(varying.interpolation == sh::INTERPOLATION_SMOOTH);
>+        InsertQualifierSpecifierString(&vertexSource, varying.varying->name, "out");
>+        InsertQualifierSpecifierString(&fragmentSource, varying.varying->name, "in");
>+    }
>+
>+    // Remove all the markers for unused varyings.
>+    for (const std::string &varyingName : resources.varyingPacking.getInactiveVaryingNames())
>+    {
>+        EraseLayoutAndQualifierStrings(&vertexSource, &fragmentSource, varyingName);
>     }
> 
>     // Bind the default uniforms for vertex and fragment shaders.
>     // See corresponding code in OutputVulkanGLSL.cpp.
>-    std::stringstream searchStringBuilder;
>-    searchStringBuilder << "@@ DEFAULT-UNIFORMS-SET-BINDING @@";
>-    std::string searchString = searchStringBuilder.str();
>+    std::string uniformsSearchString("@@ DEFAULT-UNIFORMS-SET-BINDING @@");
> 
>     std::string vertexDefaultUniformsBinding   = "set = 0, binding = 0";
>     std::string fragmentDefaultUniformsBinding = "set = 0, binding = 1";
> 
>-    angle::ReplaceSubstring(&vertexSource, searchString, vertexDefaultUniformsBinding);
>-    angle::ReplaceSubstring(&fragmentSource, searchString, fragmentDefaultUniformsBinding);
>+    angle::ReplaceSubstring(&vertexSource, uniformsSearchString, vertexDefaultUniformsBinding);
>+    angle::ReplaceSubstring(&fragmentSource, uniformsSearchString, fragmentDefaultUniformsBinding);
> 
>     // Assign textures to a descriptor set and binding.
>     int textureCount     = 0;
>@@ -135,26 +252,126 @@ gl::LinkResult GlslangWrapper::linkProgram(const gl::Context *glContext,
>     for (unsigned int uniformIndex : programState.getSamplerUniformRange())
>     {
>         const gl::LinkedUniform &samplerUniform = uniforms[uniformIndex];
>+        std::string setBindingString            = "set = 1, binding = " + Str(textureCount);
> 
>-        std::string setBindingString = "set = 1, binding = " + Str(textureCount);
>+        // Samplers in structs are extracted and renamed.
>+        const std::string samplerName = GetMappedSamplerName(samplerUniform.name);
> 
>-        ASSERT(samplerUniform.vertexStaticUse || samplerUniform.fragmentStaticUse);
>-        if (samplerUniform.vertexStaticUse)
>+        ASSERT(samplerUniform.isActive(gl::ShaderType::Vertex) ||
>+               samplerUniform.isActive(gl::ShaderType::Fragment));
>+        if (samplerUniform.isActive(gl::ShaderType::Vertex))
>         {
>-            InsertLayoutSpecifierString(&vertexSource, samplerUniform.name, setBindingString);
>+            InsertLayoutSpecifierString(&vertexSource, samplerName, setBindingString);
>         }
>+        InsertQualifierSpecifierString(&vertexSource, samplerName, kUniformQualifier);
> 
>-        if (samplerUniform.fragmentStaticUse)
>+        if (samplerUniform.isActive(gl::ShaderType::Fragment))
>         {
>-            InsertLayoutSpecifierString(&fragmentSource, samplerUniform.name, setBindingString);
>+            InsertLayoutSpecifierString(&fragmentSource, samplerName, setBindingString);
>         }
>+        InsertQualifierSpecifierString(&fragmentSource, samplerName, kUniformQualifier);
> 
>-        textureCount += samplerUniform.getBasicTypeElementCount();
>+        textureCount++;
>     }
> 
>-    std::array<const char *, 2> strings = {{vertexSource.c_str(), fragmentSource.c_str()}};
>+    // Start the unused sampler bindings at something ridiculously high.
>+    constexpr int kBaseUnusedSamplerBinding = 100;
>+    int unusedSamplerBinding                = kBaseUnusedSamplerBinding;
>+
>+    for (const gl::UnusedUniform &unusedUniform : resources.unusedUniforms)
>+    {
>+        if (unusedUniform.isSampler)
>+        {
>+            // Samplers in structs are extracted and renamed.
>+            std::string uniformName = GetMappedSamplerName(unusedUniform.name);
>+
>+            std::stringstream layoutStringStream;
>+
>+            layoutStringStream << "set = 0, binding = " << unusedSamplerBinding++;
>+
>+            std::string layoutString = layoutStringStream.str();
>+
>+            InsertLayoutSpecifierString(&vertexSource, uniformName, layoutString);
>+            InsertLayoutSpecifierString(&fragmentSource, uniformName, layoutString);
> 
>-    std::array<int, 2> lengths = {
>+            InsertQualifierSpecifierString(&vertexSource, uniformName, kUniformQualifier);
>+            InsertQualifierSpecifierString(&fragmentSource, uniformName, kUniformQualifier);
>+        }
>+        else
>+        {
>+            EraseLayoutAndQualifierStrings(&vertexSource, &fragmentSource, unusedUniform.name);
>+        }
>+    }
>+
>+    // Substitute layout and qualifier strings for the driver uniforms block.
>+    constexpr char kDriverBlockLayoutString[] = "set = 2, binding = 0";
>+    constexpr char kDriverBlockName[]         = "ANGLEUniforms";
>+    InsertLayoutSpecifierString(&vertexSource, kDriverBlockName, kDriverBlockLayoutString);
>+    InsertLayoutSpecifierString(&fragmentSource, kDriverBlockName, kDriverBlockLayoutString);
>+
>+    InsertQualifierSpecifierString(&vertexSource, kDriverBlockName, kUniformQualifier);
>+    InsertQualifierSpecifierString(&fragmentSource, kDriverBlockName, kUniformQualifier);
>+
>+    // Substitute layout and qualifier strings for the position varying. Use the first free
>+    // varying register after the packed varyings.
>+    constexpr char kVaryingName[] = "ANGLEPosition";
>+    std::stringstream layoutStream;
>+    layoutStream << "location = " << (resources.varyingPacking.getMaxSemanticIndex() + 1);
>+    const std::string layout = layoutStream.str();
>+    InsertLayoutSpecifierString(&vertexSource, kVaryingName, layout);
>+    InsertLayoutSpecifierString(&fragmentSource, kVaryingName, layout);
>+
>+    InsertQualifierSpecifierString(&vertexSource, kVaryingName, "out");
>+    InsertQualifierSpecifierString(&fragmentSource, kVaryingName, "in");
>+
>+    *vertexSourceOut   = vertexSource;
>+    *fragmentSourceOut = fragmentSource;
>+}
>+
>+// static
>+angle::Result GlslangWrapper::GetShaderCode(vk::Context *context,
>+                                            const gl::Caps &glCaps,
>+                                            bool enableLineRasterEmulation,
>+                                            const std::string &vertexSource,
>+                                            const std::string &fragmentSource,
>+                                            std::vector<uint32_t> *vertexCodeOut,
>+                                            std::vector<uint32_t> *fragmentCodeOut)
>+{
>+    if (enableLineRasterEmulation)
>+    {
>+        std::string patchedVertexSource   = vertexSource;
>+        std::string patchedFragmentSource = fragmentSource;
>+
>+        // #defines must come after the #version directive.
>+        ANGLE_VK_CHECK(
>+            context,
>+            angle::ReplaceSubstring(&patchedVertexSource, kVersionDefine, kLineRasterDefine),
>+            VK_ERROR_INVALID_SHADER_NV);
>+        ANGLE_VK_CHECK(
>+            context,
>+            angle::ReplaceSubstring(&patchedFragmentSource, kVersionDefine, kLineRasterDefine),
>+            VK_ERROR_INVALID_SHADER_NV);
>+
>+        return GetShaderCodeImpl(context, glCaps, patchedVertexSource, patchedFragmentSource,
>+                                 vertexCodeOut, fragmentCodeOut);
>+    }
>+    else
>+    {
>+        return GetShaderCodeImpl(context, glCaps, vertexSource, fragmentSource, vertexCodeOut,
>+                                 fragmentCodeOut);
>+    }
>+}
>+
>+// static
>+angle::Result GlslangWrapper::GetShaderCodeImpl(vk::Context *context,
>+                                                const gl::Caps &glCaps,
>+                                                const std::string &vertexSource,
>+                                                const std::string &fragmentSource,
>+                                                std::vector<uint32_t> *vertexCodeOut,
>+                                                std::vector<uint32_t> *fragmentCodeOut)
>+{
>+    std::array<const char *, 2> strings = {{vertexSource.c_str(), fragmentSource.c_str()}};
>+    std::array<int, 2> lengths          = {
>         {static_cast<int>(vertexSource.length()), static_cast<int>(fragmentSource.length())}};
> 
>     // Enable SPIR-V and Vulkan rules when parsing GLSL
>@@ -163,25 +380,31 @@ gl::LinkResult GlslangWrapper::linkProgram(const gl::Context *glContext,
>     glslang::TShader vertexShader(EShLangVertex);
>     vertexShader.setStringsWithLengths(&strings[0], &lengths[0], 1);
>     vertexShader.setEntryPoint("main");
>-    bool vertexResult = vertexShader.parse(&glslang::DefaultTBuiltInResource, 450, ECoreProfile,
>-                                           false, false, messages);
>+
>+    TBuiltInResource builtInResources(glslang::DefaultTBuiltInResource);
>+    GetBuiltInResourcesFromCaps(glCaps, &builtInResources);
>+
>+    bool vertexResult =
>+        vertexShader.parse(&builtInResources, 450, ECoreProfile, false, false, messages);
>     if (!vertexResult)
>     {
>-        return gl::InternalError() << "Internal error parsing Vulkan vertex shader:\n"
>-                                   << vertexShader.getInfoLog() << "\n"
>-                                   << vertexShader.getInfoDebugLog() << "\n";
>+        ERR() << "Internal error parsing Vulkan vertex shader:\n"
>+              << vertexShader.getInfoLog() << "\n"
>+              << vertexShader.getInfoDebugLog() << "\n";
>+        ANGLE_VK_CHECK(context, false, VK_ERROR_INVALID_SHADER_NV);
>     }
> 
>     glslang::TShader fragmentShader(EShLangFragment);
>     fragmentShader.setStringsWithLengths(&strings[1], &lengths[1], 1);
>     fragmentShader.setEntryPoint("main");
>-    bool fragmentResult = fragmentShader.parse(&glslang::DefaultTBuiltInResource, 450, ECoreProfile,
>-                                               false, false, messages);
>+    bool fragmentResult =
>+        fragmentShader.parse(&builtInResources, 450, ECoreProfile, false, false, messages);
>     if (!fragmentResult)
>     {
>-        return gl::InternalError() << "Internal error parsing Vulkan fragment shader:\n"
>-                                   << fragmentShader.getInfoLog() << "\n"
>-                                   << fragmentShader.getInfoDebugLog() << "\n";
>+        ERR() << "Internal error parsing Vulkan fragment shader:\n"
>+              << fragmentShader.getInfoLog() << "\n"
>+              << fragmentShader.getInfoDebugLog() << "\n";
>+        ANGLE_VK_CHECK(context, false, VK_ERROR_INVALID_SHADER_NV);
>     }
> 
>     glslang::TProgram program;
>@@ -190,8 +413,8 @@ gl::LinkResult GlslangWrapper::linkProgram(const gl::Context *glContext,
>     bool linkResult = program.link(messages);
>     if (!linkResult)
>     {
>-        return gl::InternalError() << "Internal error linking Vulkan shaders:\n"
>-                                   << program.getInfoLog() << "\n";
>+        ERR() << "Internal error linking Vulkan shaders:\n" << program.getInfoLog() << "\n";
>+        ANGLE_VK_CHECK(context, false, VK_ERROR_INVALID_SHADER_NV);
>     }
> 
>     glslang::TIntermediate *vertexStage   = program.getIntermediate(EShLangVertex);
>@@ -199,7 +422,6 @@ gl::LinkResult GlslangWrapper::linkProgram(const gl::Context *glContext,
>     glslang::GlslangToSpv(*vertexStage, *vertexCodeOut);
>     glslang::GlslangToSpv(*fragmentStage, *fragmentCodeOut);
> 
>-    return true;
>+    return angle::Result::Continue;
> }
>-
> }  // namespace rx
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/GlslangWrapper.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/GlslangWrapper.h
>index 220e1d308aa..6adccd4aa71 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/GlslangWrapper.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/GlslangWrapper.h
>@@ -9,33 +9,40 @@
> #ifndef LIBANGLE_RENDERER_VULKAN_GLSLANG_WRAPPER_H_
> #define LIBANGLE_RENDERER_VULKAN_GLSLANG_WRAPPER_H_
> 
>-#include "libANGLE/RefCountObject.h"
> #include "libANGLE/renderer/ProgramImpl.h"
>+#include "libANGLE/renderer/vulkan/vk_utils.h"
> 
> namespace rx
> {
>-
>-class GlslangWrapper : public gl::RefCountObjectNoID
>+// This class currently holds no state. If we want to hold state we would need to solve the
>+// potential race conditions with multiple threads.
>+class GlslangWrapper
> {
>   public:
>-    // Increases the reference count.
>-    // TODO(jmadill): Determine how to handle this atomically.
>-    static GlslangWrapper *GetReference();
>-    static void ReleaseReference();
>-
>-    gl::LinkResult linkProgram(const gl::Context *glContext,
>-                               const gl::ProgramState &programState,
>-                               const gl::ProgramLinkedResources &resources,
>-                               std::vector<uint32_t> *vertexCodeOut,
>-                               std::vector<uint32_t> *fragmentCodeOut);
>+    static void Initialize();
>+    static void Release();
>+
>+    static void GetShaderSource(const gl::ProgramState &programState,
>+                                const gl::ProgramLinkedResources &resources,
>+                                std::string *vertexSourceOut,
>+                                std::string *fragmentSourceOut);
>+
>+    static angle::Result GetShaderCode(vk::Context *context,
>+                                       const gl::Caps &glCaps,
>+                                       bool enableLineRasterEmulation,
>+                                       const std::string &vertexSource,
>+                                       const std::string &fragmentSource,
>+                                       std::vector<uint32_t> *vertexCodeOut,
>+                                       std::vector<uint32_t> *fragmentCodeOut);
> 
>   private:
>-    GlslangWrapper();
>-    ~GlslangWrapper() override;
>-
>-    static GlslangWrapper *mInstance;
>+    static angle::Result GetShaderCodeImpl(vk::Context *context,
>+                                           const gl::Caps &glCaps,
>+                                           const std::string &vertexSource,
>+                                           const std::string &fragmentSource,
>+                                           std::vector<uint32_t> *vertexCodeOut,
>+                                           std::vector<uint32_t> *fragmentCodeOut);
> };
>-
> }  // namespace rx
> 
> #endif  // LIBANGLE_RENDERER_VULKAN_GLSLANG_WRAPPER_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/ImageVk.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/ImageVk.cpp
>index 3709da1465c..3e9db933849 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/ImageVk.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/ImageVk.cpp
>@@ -10,28 +10,126 @@
> #include "libANGLE/renderer/vulkan/ImageVk.h"
> 
> #include "common/debug.h"
>+#include "libANGLE/Context.h"
>+#include "libANGLE/Display.h"
>+#include "libANGLE/renderer/vulkan/ContextVk.h"
>+#include "libANGLE/renderer/vulkan/DisplayVk.h"
>+#include "libANGLE/renderer/vulkan/RenderbufferVk.h"
>+#include "libANGLE/renderer/vulkan/TextureVk.h"
>+#include "libANGLE/renderer/vulkan/vk_utils.h"
> 
> namespace rx
> {
> 
>-ImageVk::ImageVk(const egl::ImageState &state) : ImageImpl(state)
>-{
>-}
>+ImageVk::ImageVk(const egl::ImageState &state, const gl::Context *context)
>+    : ImageImpl(state), mImageLevel(0), mOwnsImage(false), mImage(nullptr), mContext(context)
>+{}
> 
>-ImageVk::~ImageVk()
>+ImageVk::~ImageVk() {}
>+
>+void ImageVk::onDestroy(const egl::Display *display)
> {
>+    DisplayVk *displayVk = vk::GetImpl(display);
>+    RendererVk *renderer = displayVk->getRenderer();
>+
>+    if (mImage != nullptr && mOwnsImage)
>+    {
>+        mImage->releaseImage(renderer);
>+        mImage->releaseStagingBuffer(renderer);
>+        delete mImage;
>+    }
>+    mImage = nullptr;
> }
> 
>-egl::Error ImageVk::initialize()
>+egl::Error ImageVk::initialize(const egl::Display *display)
> {
>-    UNIMPLEMENTED();
>-    return egl::EglBadAccess();
>+    if (egl::IsTextureTarget(mState.target))
>+    {
>+        TextureVk *textureVk = GetImplAs<TextureVk>(GetAs<gl::Texture>(mState.source));
>+
>+        // Make sure the texture has created its backing storage
>+        ASSERT(mContext != nullptr);
>+        ContextVk *contextVk = vk::GetImpl(mContext);
>+        ANGLE_TRY(ResultToEGL(textureVk->ensureImageInitialized(contextVk)));
>+
>+        mImage = &textureVk->getImage();
>+
>+        // The staging buffer for a texture source should already be initialized
>+
>+        mOwnsImage = false;
>+
>+        mImageTextureType = mState.imageIndex.getType();
>+        mImageLevel       = mState.imageIndex.getLevelIndex();
>+        mImageLayer       = mState.imageIndex.hasLayer() ? mState.imageIndex.getLayerIndex() : 0;
>+    }
>+    else
>+    {
>+        RendererVk *renderer = nullptr;
>+        if (egl::IsRenderbufferTarget(mState.target))
>+        {
>+            RenderbufferVk *renderbufferVk =
>+                GetImplAs<RenderbufferVk>(GetAs<gl::Renderbuffer>(mState.source));
>+            mImage = renderbufferVk->getImage();
>+
>+            ASSERT(mContext != nullptr);
>+            renderer = vk::GetImpl(mContext)->getRenderer();
>+            ;
>+        }
>+        else if (egl::IsExternalImageTarget(mState.target))
>+        {
>+            const ExternalImageSiblingVk *externalImageSibling =
>+                GetImplAs<ExternalImageSiblingVk>(GetAs<egl::ExternalImageSibling>(mState.source));
>+            mImage = externalImageSibling->getImage();
>+
>+            ASSERT(mContext == nullptr);
>+            renderer = vk::GetImpl(display)->getRenderer();
>+        }
>+        else
>+        {
>+            UNREACHABLE();
>+            return egl::EglBadAccess();
>+        }
>+
>+        // Make sure a staging buffer is ready to use to upload data
>+        mImage->initStagingBuffer(renderer, mImage->getFormat());
>+
>+        mOwnsImage = false;
>+
>+        mImageTextureType = gl::TextureType::_2D;
>+        mImageLevel       = 0;
>+        mImageLayer       = 0;
>+    }
>+
>+    return egl::NoError();
> }
> 
>-gl::Error ImageVk::orphan(const gl::Context *context, egl::ImageSibling *sibling)
>+angle::Result ImageVk::orphan(const gl::Context *context, egl::ImageSibling *sibling)
> {
>-    UNIMPLEMENTED();
>-    return gl::InternalError();
>+    if (sibling == mState.source)
>+    {
>+        if (egl::IsTextureTarget(mState.target))
>+        {
>+            TextureVk *textureVk = GetImplAs<TextureVk>(GetAs<gl::Texture>(mState.source));
>+            ASSERT(mImage == &textureVk->getImage());
>+            textureVk->releaseOwnershipOfImage(context);
>+            mOwnsImage = true;
>+        }
>+        else if (egl::IsRenderbufferTarget(mState.target))
>+        {
>+            RenderbufferVk *renderbufferVk =
>+                GetImplAs<RenderbufferVk>(GetAs<gl::Renderbuffer>(mState.source));
>+            ASSERT(mImage == renderbufferVk->getImage());
>+            renderbufferVk->releaseOwnershipOfImage(context);
>+            mOwnsImage = true;
>+        }
>+        else
>+        {
>+            ANGLE_VK_UNREACHABLE(vk::GetImpl(context));
>+            return angle::Result::Stop;
>+        }
>+    }
>+
>+    return angle::Result::Continue;
> }
> 
> }  // namespace rx
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/ImageVk.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/ImageVk.h
>index 5781c806c91..b91d322a78a 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/ImageVk.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/ImageVk.h
>@@ -11,18 +11,45 @@
> #define LIBANGLE_RENDERER_VULKAN_IMAGEVK_H_
> 
> #include "libANGLE/renderer/ImageImpl.h"
>+#include "libANGLE/renderer/vulkan/vk_helpers.h"
> 
> namespace rx
> {
> 
>+class ExternalImageSiblingVk : public ExternalImageSiblingImpl
>+{
>+  public:
>+    ExternalImageSiblingVk() {}
>+    ~ExternalImageSiblingVk() override {}
>+
>+    virtual vk::ImageHelper *getImage() const = 0;
>+};
>+
> class ImageVk : public ImageImpl
> {
>   public:
>-    ImageVk(const egl::ImageState &state);
>+    ImageVk(const egl::ImageState &state, const gl::Context *context);
>     ~ImageVk() override;
>-    egl::Error initialize() override;
>+    void onDestroy(const egl::Display *display) override;
>+
>+    egl::Error initialize(const egl::Display *display) override;
>+
>+    angle::Result orphan(const gl::Context *context, egl::ImageSibling *sibling) override;
>+
>+    vk::ImageHelper *getImage() const { return mImage; }
>+    gl::TextureType getImageTextureType() const { return mImageTextureType; }
>+    uint32_t getImageLevel() const { return mImageLevel; }
>+    uint32_t getImageLayer() const { return mImageLayer; }
>+
>+  private:
>+    gl::TextureType mImageTextureType;
>+    uint32_t mImageLevel;
>+    uint32_t mImageLayer;
>+
>+    bool mOwnsImage;
>+    vk::ImageHelper *mImage;
> 
>-    gl::Error orphan(const gl::Context *context, egl::ImageSibling *sibling) override;
>+    const gl::Context *mContext;
> };
> 
> }  // namespace rx
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/MemoryObjectVk.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/MemoryObjectVk.cpp
>new file mode 100644
>index 00000000000..d320d826369
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/MemoryObjectVk.cpp
>@@ -0,0 +1,124 @@
>+// Copyright 2019 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// MemoryObjectVk.cpp: Defines the class interface for MemoryObjectVk, implementing
>+// MemoryObjectImpl.
>+
>+#include "libANGLE/renderer/vulkan/MemoryObjectVk.h"
>+
>+#include <vulkan/vulkan.h>
>+
>+#include "common/debug.h"
>+#include "libANGLE/Context.h"
>+#include "libANGLE/renderer/vulkan/ContextVk.h"
>+#include "libANGLE/renderer/vulkan/RendererVk.h"
>+
>+#if !defined(ANGLE_PLATFORM_WINDOWS)
>+#    include <unistd.h>
>+#else
>+#    include <io.h>
>+#endif
>+
>+namespace rx
>+{
>+
>+namespace
>+{
>+
>+constexpr int kInvalidFd = -1;
>+
>+#if defined(ANGLE_PLATFORM_WINDOWS)
>+int close(int fd)
>+{
>+    return _close(fd);
>+}
>+#endif
>+
>+}  // namespace
>+
>+MemoryObjectVk::MemoryObjectVk() : mSize(0), mFd(kInvalidFd) {}
>+
>+MemoryObjectVk::~MemoryObjectVk() = default;
>+
>+void MemoryObjectVk::onDestroy(const gl::Context *context)
>+{
>+    if (mFd != kInvalidFd)
>+    {
>+        close(mFd);
>+        mFd = kInvalidFd;
>+    }
>+}
>+
>+angle::Result MemoryObjectVk::importFd(gl::Context *context,
>+                                       GLuint64 size,
>+                                       gl::HandleType handleType,
>+                                       GLint fd)
>+{
>+    switch (handleType)
>+    {
>+        case gl::HandleType::OpaqueFd:
>+            return importOpaqueFd(context, size, fd);
>+
>+        default:
>+            UNREACHABLE();
>+            return angle::Result::Stop;
>+    }
>+}
>+
>+angle::Result MemoryObjectVk::importOpaqueFd(gl::Context *context, GLuint64 size, GLint fd)
>+{
>+    ASSERT(mFd == kInvalidFd);
>+    mFd   = fd;
>+    mSize = size;
>+    return angle::Result::Continue;
>+}
>+
>+angle::Result MemoryObjectVk::createImage(const gl::Context *context,
>+                                          gl::TextureType type,
>+                                          size_t levels,
>+                                          GLenum internalFormat,
>+                                          const gl::Extents &size,
>+                                          GLuint64 offset,
>+                                          vk::ImageHelper *image)
>+{
>+    ContextVk *contextVk = vk::GetImpl(context);
>+    RendererVk *renderer = contextVk->getRenderer();
>+
>+    const vk::Format &vkFormat = renderer->getFormat(internalFormat);
>+
>+    // All supported usage flags must be specified.
>+    // See EXT_external_objects issue 13.
>+    VkImageUsageFlags imageUsageFlags =
>+        vk::GetMaximalImageUsageFlags(renderer, vkFormat.vkImageFormat);
>+
>+    VkExternalMemoryImageCreateInfo externalMemoryImageCreateInfo = {};
>+    externalMemoryImageCreateInfo.sType       = VK_STRUCTURE_TYPE_EXTERNAL_MEMORY_IMAGE_CREATE_INFO;
>+    externalMemoryImageCreateInfo.handleTypes = VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_FD_BIT;
>+
>+    ANGLE_TRY(image->initExternal(contextVk, type, size, vkFormat, 1, imageUsageFlags,
>+                                  vk::ImageLayout::ExternalPreInitialized,
>+                                  &externalMemoryImageCreateInfo, levels, 1));
>+
>+    VkMemoryRequirements externalMemoryRequirements;
>+    image->getImage().getMemoryRequirements(renderer->getDevice(), &externalMemoryRequirements);
>+
>+    ASSERT(mFd != -1);
>+    VkImportMemoryFdInfoKHR importMemoryFdInfo = {};
>+    importMemoryFdInfo.sType                   = VK_STRUCTURE_TYPE_IMPORT_MEMORY_FD_INFO_KHR;
>+    importMemoryFdInfo.handleType              = VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_FD_BIT;
>+    importMemoryFdInfo.fd                      = dup(mFd);
>+
>+    // TODO(jmadill, spang): Memory sub-allocation. http://anglebug.com/2162
>+    ASSERT(offset == 0);
>+    ASSERT(externalMemoryRequirements.size == mSize);
>+
>+    VkMemoryPropertyFlags flags = 0;
>+    ANGLE_TRY(image->initExternalMemory(contextVk, renderer->getMemoryProperties(),
>+                                        externalMemoryRequirements, &importMemoryFdInfo,
>+                                        VK_QUEUE_FAMILY_EXTERNAL, flags));
>+
>+    return angle::Result::Continue;
>+}
>+
>+}  // namespace rx
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/MemoryObjectVk.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/MemoryObjectVk.h
>new file mode 100644
>index 00000000000..9963f3d7820
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/MemoryObjectVk.h
>@@ -0,0 +1,48 @@
>+// Copyright 2019 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// MemoryObjectVk.h: Defines the class interface for MemoryObjectVk,
>+// implementing MemoryObjectImpl.
>+
>+#ifndef LIBANGLE_RENDERER_VULKAN_MEMORYOBJECTVK_H_
>+#define LIBANGLE_RENDERER_VULKAN_MEMORYOBJECTVK_H_
>+
>+#include "libANGLE/renderer/MemoryObjectImpl.h"
>+#include "libANGLE/renderer/vulkan/vk_helpers.h"
>+#include "libANGLE/renderer/vulkan/vk_wrapper.h"
>+
>+namespace rx
>+{
>+
>+class MemoryObjectVk : public MemoryObjectImpl
>+{
>+  public:
>+    MemoryObjectVk();
>+    ~MemoryObjectVk() override;
>+
>+    void onDestroy(const gl::Context *context) override;
>+
>+    angle::Result importFd(gl::Context *context,
>+                           GLuint64 size,
>+                           gl::HandleType handleType,
>+                           GLint fd) override;
>+
>+    angle::Result createImage(const gl::Context *context,
>+                              gl::TextureType type,
>+                              size_t levels,
>+                              GLenum internalFormat,
>+                              const gl::Extents &size,
>+                              GLuint64 offset,
>+                              vk::ImageHelper *image);
>+
>+  private:
>+    angle::Result importOpaqueFd(gl::Context *context, GLuint64 size, GLint fd);
>+
>+    GLuint64 mSize;
>+    int mFd;
>+};
>+
>+}  // namespace rx
>+
>+#endif  // LIBANGLE_RENDERER_VULKAN_MEMORYOBJECTVK_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/ProgramPipelineVk.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/ProgramPipelineVk.cpp
>index 6d9c17bd9d8..df63878125a 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/ProgramPipelineVk.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/ProgramPipelineVk.cpp
>@@ -14,11 +14,8 @@ namespace rx
> 
> ProgramPipelineVk::ProgramPipelineVk(const gl::ProgramPipelineState &state)
>     : ProgramPipelineImpl(state)
>-{
>-}
>+{}
> 
>-ProgramPipelineVk::~ProgramPipelineVk()
>-{
>-}
>+ProgramPipelineVk::~ProgramPipelineVk() {}
> 
> }  // namespace rx
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/ProgramVk.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/ProgramVk.cpp
>index 9afaca484f5..f9b6e9b072e 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/ProgramVk.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/ProgramVk.cpp
>@@ -10,8 +10,8 @@
> #include "libANGLE/renderer/vulkan/ProgramVk.h"
> 
> #include "common/debug.h"
>-#include "common/utilities.h"
> #include "libANGLE/Context.h"
>+#include "libANGLE/renderer/renderer_utils.h"
> #include "libANGLE/renderer/vulkan/ContextVk.h"
> #include "libANGLE/renderer/vulkan/GlslangWrapper.h"
> #include "libANGLE/renderer/vulkan/RendererVk.h"
>@@ -23,168 +23,210 @@ namespace rx
> namespace
> {
> 
>-gl::Error InitDefaultUniformBlock(const gl::Context *context,
>-                                  VkDevice device,
>-                                  gl::Shader *shader,
>-                                  vk::BufferAndMemory *storageOut,
>-                                  sh::BlockLayoutMap *blockLayoutMapOut,
>-                                  size_t *requiredSizeOut)
>-{
>-    const auto &uniforms = shader->getUniforms(context);
>+constexpr size_t kUniformBlockDynamicBufferMinSize = 256 * 128;
> 
>+void InitDefaultUniformBlock(const std::vector<sh::Uniform> &uniforms,
>+                             gl::Shader *shader,
>+                             sh::BlockLayoutMap *blockLayoutMapOut,
>+                             size_t *blockSizeOut)
>+{
>     if (uniforms.empty())
>     {
>-        *requiredSizeOut = 0;
>-        return gl::NoError();
>+        *blockSizeOut = 0;
>+        return;
>     }
> 
>     sh::Std140BlockEncoder blockEncoder;
>-    sh::GetUniformBlockInfo(uniforms, "", &blockEncoder, false, blockLayoutMapOut);
>+    sh::GetUniformBlockInfo(uniforms, "", &blockEncoder, blockLayoutMapOut);
> 
>-    size_t blockSize = blockEncoder.getBlockSize();
>+    size_t blockSize = blockEncoder.getCurrentOffset();
> 
>     // TODO(jmadill): I think we still need a valid block for the pipeline even if zero sized.
>     if (blockSize == 0)
>     {
>-        *requiredSizeOut = 0;
>-        return gl::NoError();
>+        *blockSizeOut = 0;
>+        return;
>     }
> 
>-    VkBufferCreateInfo uniformBufferInfo;
>-    uniformBufferInfo.sType                 = VK_STRUCTURE_TYPE_BUFFER_CREATE_INFO;
>-    uniformBufferInfo.pNext                 = nullptr;
>-    uniformBufferInfo.flags                 = 0;
>-    uniformBufferInfo.size                  = blockSize;
>-    uniformBufferInfo.usage                 = VK_BUFFER_USAGE_UNIFORM_BUFFER_BIT;
>-    uniformBufferInfo.sharingMode           = VK_SHARING_MODE_EXCLUSIVE;
>-    uniformBufferInfo.queueFamilyIndexCount = 0;
>-    uniformBufferInfo.pQueueFamilyIndices   = nullptr;
>-
>-    ANGLE_TRY(storageOut->buffer.init(device, uniformBufferInfo));
>-
>-    ANGLE_TRY(AllocateBufferMemory(vk::GetImpl(context), blockSize, &storageOut->buffer,
>-                                   &storageOut->memory, requiredSizeOut));
>-
>-    return gl::NoError();
>+    *blockSizeOut = blockSize;
>+    return;
> }
> 
> template <typename T>
> void UpdateDefaultUniformBlock(GLsizei count,
>+                               uint32_t arrayIndex,
>                                int componentCount,
>                                const T *v,
>                                const sh::BlockMemberInfo &layoutInfo,
>                                angle::MemoryBuffer *uniformData)
> {
>-    // Assume an offset of -1 means the block is unused.
>-    if (layoutInfo.offset == -1)
>-    {
>-        return;
>-    }
>+    const int elementSize = sizeof(T) * componentCount;
> 
>-    int elementSize = sizeof(T) * componentCount;
>+    uint8_t *dst = uniformData->data() + layoutInfo.offset;
>     if (layoutInfo.arrayStride == 0 || layoutInfo.arrayStride == elementSize)
>     {
>-        uint8_t *writePtr = uniformData->data() + layoutInfo.offset;
>+        uint32_t arrayOffset = arrayIndex * layoutInfo.arrayStride;
>+        uint8_t *writePtr    = dst + arrayOffset;
>+        ASSERT(writePtr + (elementSize * count) <= uniformData->data() + uniformData->size());
>         memcpy(writePtr, v, elementSize * count);
>     }
>     else
>     {
>-        UNIMPLEMENTED();
>+        // Have to respect the arrayStride between each element of the array.
>+        int maxIndex = arrayIndex + count;
>+        for (int writeIndex = arrayIndex, readIndex = 0; writeIndex < maxIndex;
>+             writeIndex++, readIndex++)
>+        {
>+            const int arrayOffset = writeIndex * layoutInfo.arrayStride;
>+            uint8_t *writePtr     = dst + arrayOffset;
>+            const T *readPtr      = v + (readIndex * componentCount);
>+            ASSERT(writePtr + elementSize <= uniformData->data() + uniformData->size());
>+            memcpy(writePtr, readPtr, elementSize);
>+        }
>     }
> }
> 
>-vk::Error SyncDefaultUniformBlock(VkDevice device,
>-                                  vk::DeviceMemory *bufferMemory,
>-                                  const angle::MemoryBuffer &bufferData)
>+template <typename T>
>+void ReadFromDefaultUniformBlock(int componentCount,
>+                                 uint32_t arrayIndex,
>+                                 T *dst,
>+                                 const sh::BlockMemberInfo &layoutInfo,
>+                                 const angle::MemoryBuffer *uniformData)
> {
>-    ASSERT(bufferMemory->valid() && !bufferData.empty());
>-    uint8_t *mapPointer = nullptr;
>-    ANGLE_TRY(bufferMemory->map(device, 0, bufferData.size(), 0, &mapPointer));
>-    memcpy(mapPointer, bufferData.data(), bufferData.size());
>-    bufferMemory->unmap(device);
>-    return vk::NoError();
>-}
>+    ASSERT(layoutInfo.offset != -1);
> 
>-enum ShaderIndex : uint32_t
>-{
>-    MinShaderIndex = 0,
>-    VertexShader   = MinShaderIndex,
>-    FragmentShader = 1,
>-    MaxShaderIndex = 2,
>-};
>+    const int elementSize = sizeof(T) * componentCount;
>+    const uint8_t *source = uniformData->data() + layoutInfo.offset;
> 
>-gl::Shader *GetShader(const gl::ProgramState &programState, uint32_t shaderIndex)
>-{
>-    switch (shaderIndex)
>+    if (layoutInfo.arrayStride == 0 || layoutInfo.arrayStride == elementSize)
>     {
>-        case VertexShader:
>-            return programState.getAttachedVertexShader();
>-        case FragmentShader:
>-            return programState.getAttachedFragmentShader();
>-        default:
>-            UNREACHABLE();
>-            return nullptr;
>+        const uint8_t *readPtr = source + arrayIndex * layoutInfo.arrayStride;
>+        memcpy(dst, readPtr, elementSize);
>+    }
>+    else
>+    {
>+        // Have to respect the arrayStride between each element of the array.
>+        const int arrayOffset  = arrayIndex * layoutInfo.arrayStride;
>+        const uint8_t *readPtr = source + arrayOffset;
>+        memcpy(dst, readPtr, elementSize);
>     }
> }
> 
>-}  // anonymous namespace
>-
>-ProgramVk::DefaultUniformBlock::DefaultUniformBlock()
>-    : storage(), uniformData(), uniformsDirty(false), uniformLayout()
>+angle::Result SyncDefaultUniformBlock(ContextVk *contextVk,
>+                                      vk::DynamicBuffer *dynamicBuffer,
>+                                      const angle::MemoryBuffer &bufferData,
>+                                      uint32_t *outOffset,
>+                                      bool *outBufferModified)
> {
>+    dynamicBuffer->releaseRetainedBuffers(contextVk->getRenderer());
>+
>+    ASSERT(!bufferData.empty());
>+    uint8_t *data       = nullptr;
>+    VkBuffer *outBuffer = nullptr;
>+    VkDeviceSize offset = 0;
>+    ANGLE_TRY(dynamicBuffer->allocate(contextVk, bufferData.size(), &data, outBuffer, &offset,
>+                                      outBufferModified));
>+    *outOffset = static_cast<uint32_t>(offset);
>+    memcpy(data, bufferData.data(), bufferData.size());
>+    ANGLE_TRY(dynamicBuffer->flush(contextVk));
>+    return angle::Result::Continue;
> }
>+}  // anonymous namespace
>+
>+// ProgramVk::ShaderInfo implementation.
>+ProgramVk::ShaderInfo::ShaderInfo() {}
>+
>+ProgramVk::ShaderInfo::~ShaderInfo() = default;
> 
>-ProgramVk::DefaultUniformBlock::~DefaultUniformBlock()
>+angle::Result ProgramVk::ShaderInfo::initShaders(ContextVk *contextVk,
>+                                                 const std::string &vertexSource,
>+                                                 const std::string &fragmentSource,
>+                                                 bool enableLineRasterEmulation)
> {
>+    ASSERT(!valid());
>+
>+    std::vector<uint32_t> vertexCode;
>+    std::vector<uint32_t> fragmentCode;
>+    ANGLE_TRY(GlslangWrapper::GetShaderCode(contextVk, contextVk->getCaps(),
>+                                            enableLineRasterEmulation, vertexSource, fragmentSource,
>+                                            &vertexCode, &fragmentCode));
>+
>+    ANGLE_TRY(vk::InitShaderAndSerial(contextVk, &mShaders[gl::ShaderType::Vertex].get(),
>+                                      vertexCode.data(), vertexCode.size() * sizeof(uint32_t)));
>+    ANGLE_TRY(vk::InitShaderAndSerial(contextVk, &mShaders[gl::ShaderType::Fragment].get(),
>+                                      fragmentCode.data(), fragmentCode.size() * sizeof(uint32_t)));
>+
>+    mProgramHelper.setShader(gl::ShaderType::Vertex, &mShaders[gl::ShaderType::Vertex]);
>+    mProgramHelper.setShader(gl::ShaderType::Fragment, &mShaders[gl::ShaderType::Fragment]);
>+
>+    return angle::Result::Continue;
> }
> 
>-ProgramVk::ProgramVk(const gl::ProgramState &state)
>-    : ProgramImpl(state), mDefaultUniformBlocks(), mDescriptorSetOffset(0), mDirtyTextures(true)
>+void ProgramVk::ShaderInfo::release(RendererVk *renderer)
> {
>+    mProgramHelper.release(renderer);
>+
>+    for (vk::RefCounted<vk::ShaderAndSerial> &shader : mShaders)
>+    {
>+        shader.get().destroy(renderer->getDevice());
>+    }
> }
> 
>-ProgramVk::~ProgramVk()
>+// ProgramVk implementation.
>+ProgramVk::DefaultUniformBlock::DefaultUniformBlock()
>+    : storage(VK_BUFFER_USAGE_UNIFORM_BUFFER_BIT | VK_BUFFER_USAGE_TRANSFER_SRC_BIT,
>+              kUniformBlockDynamicBufferMinSize,
>+              true)
>+{}
>+
>+ProgramVk::DefaultUniformBlock::~DefaultUniformBlock() = default;
>+
>+ProgramVk::ProgramVk(const gl::ProgramState &state) : ProgramImpl(state), mUniformBlocksOffsets{}
> {
>+    mUsedDescriptorSetRange.invalidate();
> }
> 
>-void ProgramVk::destroy(const gl::Context *contextImpl)
>+ProgramVk::~ProgramVk() = default;
>+
>+void ProgramVk::destroy(const gl::Context *context)
> {
>-    VkDevice device = vk::GetImpl(contextImpl)->getDevice();
>-    reset(device);
>+    ContextVk *contextVk = vk::GetImpl(context);
>+    reset(contextVk->getRenderer());
> }
> 
>-void ProgramVk::reset(VkDevice device)
>+void ProgramVk::reset(RendererVk *renderer)
> {
>-    for (auto &uniformBlock : mDefaultUniformBlocks)
>+    for (auto &descriptorSetLayout : mDescriptorSetLayouts)
>     {
>-        uniformBlock.storage.memory.destroy(device);
>-        uniformBlock.storage.buffer.destroy(device);
>+        descriptorSetLayout.reset();
>     }
>+    mPipelineLayout.reset();
> 
>-    mEmptyUniformBlockStorage.memory.destroy(device);
>-    mEmptyUniformBlockStorage.buffer.destroy(device);
>-
>-    for (auto &descriptorSetLayout : mDescriptorSetLayouts)
>+    for (auto &uniformBlock : mDefaultUniformBlocks)
>     {
>-        descriptorSetLayout.destroy(device);
>+        uniformBlock.storage.release(renderer);
>     }
> 
>-    mLinkedFragmentModule.destroy(device);
>-    mLinkedVertexModule.destroy(device);
>-    mPipelineLayout.destroy(device);
>+    mDefaultShaderInfo.release(renderer);
>+    mLineRasterShaderInfo.release(renderer);
>+
>+    mEmptyUniformBlockStorage.release(renderer);
> 
>-    // Descriptor Sets are pool allocated, so do not need to be explicitly freed.
>     mDescriptorSets.clear();
>-    mDescriptorSetOffset = 0;
>-    mDirtyTextures       = false;
>+    mUsedDescriptorSetRange.invalidate();
>+
>+    for (vk::RefCountedDescriptorPoolBinding &binding : mDescriptorPoolBindings)
>+    {
>+        binding.reset();
>+    }
> }
> 
>-gl::LinkResult ProgramVk::load(const gl::Context *contextImpl,
>-                               gl::InfoLog &infoLog,
>-                               gl::BinaryInputStream *stream)
>+std::unique_ptr<rx::LinkEvent> ProgramVk::load(const gl::Context *context,
>+                                               gl::BinaryInputStream *stream,
>+                                               gl::InfoLog &infoLog)
> {
>     UNIMPLEMENTED();
>-    return gl::InternalError();
>+    return std::make_unique<LinkEventDone>(angle::Result::Stop);
> }
> 
> void ProgramVk::save(const gl::Context *context, gl::BinaryOutputStream *stream)
>@@ -202,147 +244,180 @@ void ProgramVk::setSeparable(bool separable)
>     UNIMPLEMENTED();
> }
> 
>-gl::LinkResult ProgramVk::link(const gl::Context *glContext,
>-                               const gl::ProgramLinkedResources &resources,
>-                               gl::InfoLog &infoLog)
>+std::unique_ptr<LinkEvent> ProgramVk::link(const gl::Context *context,
>+                                           const gl::ProgramLinkedResources &resources,
>+                                           gl::InfoLog &infoLog)
>+{
>+    // TODO(jie.a.chen@intel.com): Parallelize linking.
>+    // http://crbug.com/849576
>+    return std::make_unique<LinkEventDone>(linkImpl(context, resources, infoLog));
>+}
>+
>+angle::Result ProgramVk::linkImpl(const gl::Context *glContext,
>+                                  const gl::ProgramLinkedResources &resources,
>+                                  gl::InfoLog &infoLog)
> {
>-    ContextVk *contextVk           = vk::GetImpl(glContext);
>-    RendererVk *renderer           = contextVk->getRenderer();
>-    GlslangWrapper *glslangWrapper = renderer->getGlslangWrapper();
>-    VkDevice device                = renderer->getDevice();
>+    ContextVk *contextVk = vk::GetImpl(glContext);
>+    RendererVk *renderer = contextVk->getRenderer();
> 
>-    reset(device);
>+    reset(renderer);
> 
>-    std::vector<uint32_t> vertexCode;
>-    std::vector<uint32_t> fragmentCode;
>-    bool linkSuccess = false;
>-    ANGLE_TRY_RESULT(
>-        glslangWrapper->linkProgram(glContext, mState, resources, &vertexCode, &fragmentCode),
>-        linkSuccess);
>-    if (!linkSuccess)
>+    GlslangWrapper::GetShaderSource(mState, resources, &mVertexSource, &mFragmentSource);
>+
>+    ANGLE_TRY(initDefaultUniformBlocks(glContext));
>+
>+    if (!mState.getSamplerUniformRange().empty())
>     {
>-        return false;
>+        // Ensure the descriptor set range includes the textures at position 1.
>+        mUsedDescriptorSetRange.extend(kTextureDescriptorSetIndex);
>     }
> 
>+    // Store a reference to the pipeline and descriptor set layouts. This will create them if they
>+    // don't already exist in the cache.
>+    vk::DescriptorSetLayoutDesc uniformsSetDesc;
>+    uniformsSetDesc.update(kVertexUniformsBindingIndex, VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER_DYNAMIC,
>+                           1);
>+    uniformsSetDesc.update(kFragmentUniformsBindingIndex, VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER_DYNAMIC,
>+                           1);
>+
>+    ANGLE_TRY(renderer->getDescriptorSetLayout(
>+        contextVk, uniformsSetDesc, &mDescriptorSetLayouts[kUniformsDescriptorSetIndex]));
>+
>+    vk::DescriptorSetLayoutDesc texturesSetDesc;
>+
>+    for (uint32_t textureIndex = 0; textureIndex < mState.getSamplerBindings().size();
>+         ++textureIndex)
>     {
>-        VkShaderModuleCreateInfo vertexShaderInfo;
>-        vertexShaderInfo.sType    = VK_STRUCTURE_TYPE_SHADER_MODULE_CREATE_INFO;
>-        vertexShaderInfo.pNext    = nullptr;
>-        vertexShaderInfo.flags    = 0;
>-        vertexShaderInfo.codeSize = vertexCode.size() * sizeof(uint32_t);
>-        vertexShaderInfo.pCode    = vertexCode.data();
>-
>-        ANGLE_TRY(mLinkedVertexModule.init(device, vertexShaderInfo));
>+        const gl::SamplerBinding &samplerBinding = mState.getSamplerBindings()[textureIndex];
>+
>+        // The front-end always binds array sampler units sequentially.
>+        const uint32_t count = static_cast<uint32_t>(samplerBinding.boundTextureUnits.size());
>+        texturesSetDesc.update(textureIndex, VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER, count);
>     }
> 
>+    ANGLE_TRY(renderer->getDescriptorSetLayout(contextVk, texturesSetDesc,
>+                                               &mDescriptorSetLayouts[kTextureDescriptorSetIndex]));
>+
>+    vk::DescriptorSetLayoutDesc driverUniformsSetDesc;
>+    driverUniformsSetDesc.update(0, VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER, 1);
>+    ANGLE_TRY(renderer->getDescriptorSetLayout(
>+        contextVk, driverUniformsSetDesc,
>+        &mDescriptorSetLayouts[kDriverUniformsDescriptorSetIndex]));
>+
>+    vk::PipelineLayoutDesc pipelineLayoutDesc;
>+    pipelineLayoutDesc.updateDescriptorSetLayout(kUniformsDescriptorSetIndex, uniformsSetDesc);
>+    pipelineLayoutDesc.updateDescriptorSetLayout(kTextureDescriptorSetIndex, texturesSetDesc);
>+    pipelineLayoutDesc.updateDescriptorSetLayout(kDriverUniformsDescriptorSetIndex,
>+                                                 driverUniformsSetDesc);
>+
>+    ANGLE_TRY(renderer->getPipelineLayout(contextVk, pipelineLayoutDesc, mDescriptorSetLayouts,
>+                                          &mPipelineLayout));
>+
>+    if (!mState.getUniforms().empty())
>     {
>-        VkShaderModuleCreateInfo fragmentShaderInfo;
>-        fragmentShaderInfo.sType    = VK_STRUCTURE_TYPE_SHADER_MODULE_CREATE_INFO;
>-        fragmentShaderInfo.pNext    = nullptr;
>-        fragmentShaderInfo.flags    = 0;
>-        fragmentShaderInfo.codeSize = fragmentCode.size() * sizeof(uint32_t);
>-        fragmentShaderInfo.pCode    = fragmentCode.data();
>-
>-        ANGLE_TRY(mLinkedFragmentModule.init(device, fragmentShaderInfo));
>-    }
>+        const gl::RangeUI &samplerRange = mState.getSamplerUniformRange();
> 
>-    ANGLE_TRY(initPipelineLayout(contextVk));
>-    ANGLE_TRY(initDescriptorSets(contextVk));
>-    ANGLE_TRY(initDefaultUniformBlocks(glContext));
>+        if (mState.getUniforms().size() > samplerRange.length())
>+        {
>+            // Ensure the descriptor set range includes the uniform buffers at position 0.
>+            mUsedDescriptorSetRange.extend(kUniformsDescriptorSetIndex);
>+        }
>+
>+        if (!samplerRange.empty())
>+        {
>+            // Ensure the descriptor set range includes the textures at position 1.
>+            mUsedDescriptorSetRange.extend(kTextureDescriptorSetIndex);
>+        }
>+    }
> 
>-    return true;
>+    return angle::Result::Continue;
> }
> 
>-gl::Error ProgramVk::initDefaultUniformBlocks(const gl::Context *glContext)
>+angle::Result ProgramVk::initDefaultUniformBlocks(const gl::Context *glContext)
> {
>     ContextVk *contextVk = vk::GetImpl(glContext);
>-    VkDevice device      = contextVk->getDevice();
>+    RendererVk *renderer = contextVk->getRenderer();
> 
>     // Process vertex and fragment uniforms into std140 packing.
>-    std::array<sh::BlockLayoutMap, 2> layoutMap;
>-    std::array<size_t, 2> requiredBufferSize = {{0, 0}};
>+    gl::ShaderMap<sh::BlockLayoutMap> layoutMap;
>+    gl::ShaderMap<size_t> requiredBufferSize;
>+    requiredBufferSize.fill(0);
> 
>-    for (uint32_t shaderIndex = MinShaderIndex; shaderIndex < MaxShaderIndex; ++shaderIndex)
>+    for (gl::ShaderType shaderType : gl::AllGLES2ShaderTypes())
>     {
>-        ANGLE_TRY(InitDefaultUniformBlock(glContext, device, GetShader(mState, shaderIndex),
>-                                          &mDefaultUniformBlocks[shaderIndex].storage,
>-                                          &layoutMap[shaderIndex],
>-                                          &requiredBufferSize[shaderIndex]));
>+        gl::Shader *shader                       = mState.getAttachedShader(shaderType);
>+        const std::vector<sh::Uniform> &uniforms = shader->getUniforms();
>+        InitDefaultUniformBlock(uniforms, shader, &layoutMap[shaderType],
>+                                &requiredBufferSize[shaderType]);
>     }
> 
>     // Init the default block layout info.
>-    const auto &locations = mState.getUniformLocations();
>-    const auto &uniforms  = mState.getUniforms();
>-    for (size_t locationIndex = 0; locationIndex < locations.size(); ++locationIndex)
>+    const auto &uniforms = mState.getUniforms();
>+    for (const gl::VariableLocation &location : mState.getUniformLocations())
>     {
>-        std::array<sh::BlockMemberInfo, 2> layoutInfo;
>+        gl::ShaderMap<sh::BlockMemberInfo> layoutInfo;
> 
>-        const auto &location = locations[locationIndex];
>         if (location.used() && !location.ignored)
>         {
>             const auto &uniform = uniforms[location.index];
>-
>-            if (uniform.isSampler())
>-                continue;
>-
>-            std::string uniformName = uniform.name;
>-            if (uniform.isArray())
>+            if (!uniform.isSampler())
>             {
>-                uniformName += ArrayString(location.arrayIndex);
>-            }
>+                std::string uniformName = uniform.name;
>+                if (uniform.isArray())
>+                {
>+                    // Gets the uniform name without the [0] at the end.
>+                    uniformName = gl::ParseResourceName(uniformName, nullptr);
>+                }
> 
>-            bool found = false;
>+                bool found = false;
> 
>-            for (uint32_t shaderIndex = MinShaderIndex; shaderIndex < MaxShaderIndex; ++shaderIndex)
>-            {
>-                auto it = layoutMap[shaderIndex].find(uniformName);
>-                if (it != layoutMap[shaderIndex].end())
>+                for (gl::ShaderType shaderType : gl::AllGLES2ShaderTypes())
>                 {
>-                    found                   = true;
>-                    layoutInfo[shaderIndex] = it->second;
>+                    auto it = layoutMap[shaderType].find(uniformName);
>+                    if (it != layoutMap[shaderType].end())
>+                    {
>+                        found                  = true;
>+                        layoutInfo[shaderType] = it->second;
>+                    }
>                 }
>-            }
> 
>-            ASSERT(found);
>+                ASSERT(found);
>+            }
>         }
> 
>-        for (uint32_t shaderIndex = MinShaderIndex; shaderIndex < MaxShaderIndex; ++shaderIndex)
>+        for (gl::ShaderType shaderType : gl::AllGLES2ShaderTypes())
>         {
>-            mDefaultUniformBlocks[shaderIndex].uniformLayout.push_back(layoutInfo[shaderIndex]);
>+            mDefaultUniformBlocks[shaderType].uniformLayout.push_back(layoutInfo[shaderType]);
>         }
>     }
> 
>-    bool anyDirty = false;
>-    bool allDirty = true;
>-
>-    for (uint32_t shaderIndex = MinShaderIndex; shaderIndex < MaxShaderIndex; ++shaderIndex)
>+    for (gl::ShaderType shaderType : gl::AllGLES2ShaderTypes())
>     {
>-        if (requiredBufferSize[shaderIndex] > 0)
>+        if (requiredBufferSize[shaderType] > 0)
>         {
>-            if (!mDefaultUniformBlocks[shaderIndex].uniformData.resize(
>-                    requiredBufferSize[shaderIndex]))
>+            if (!mDefaultUniformBlocks[shaderType].uniformData.resize(
>+                    requiredBufferSize[shaderType]))
>             {
>-                return gl::OutOfMemory() << "Memory allocation failure.";
>+                ANGLE_VK_CHECK(contextVk, false, VK_ERROR_OUT_OF_HOST_MEMORY);
>             }
>-            mDefaultUniformBlocks[shaderIndex].uniformData.fill(0);
>-            mDefaultUniformBlocks[shaderIndex].uniformsDirty = true;
>+            size_t minAlignment = static_cast<size_t>(
>+                renderer->getPhysicalDeviceProperties().limits.minUniformBufferOffsetAlignment);
> 
>-            anyDirty = true;
>-        }
>-        else
>-        {
>-            allDirty = false;
>+            mDefaultUniformBlocks[shaderType].storage.init(minAlignment, renderer);
>+
>+            // Initialize uniform buffer memory to zero by default.
>+            mDefaultUniformBlocks[shaderType].uniformData.fill(0);
>+            mDefaultUniformBlocksDirty.set(shaderType);
>         }
>     }
> 
>-    if (anyDirty)
>+    if (mDefaultUniformBlocksDirty.any())
>     {
>         // Initialize the "empty" uniform block if necessary.
>-        if (!allDirty)
>+        if (!mDefaultUniformBlocksDirty.all())
>         {
>-            VkBufferCreateInfo uniformBufferInfo;
>+            VkBufferCreateInfo uniformBufferInfo    = {};
>             uniformBufferInfo.sType                 = VK_STRUCTURE_TYPE_BUFFER_CREATE_INFO;
>-            uniformBufferInfo.pNext                 = nullptr;
>             uniformBufferInfo.flags                 = 0;
>             uniformBufferInfo.size                  = 1;
>             uniformBufferInfo.usage                 = VK_BUFFER_USAGE_UNIFORM_BUFFER_BIT;
>@@ -350,28 +425,20 @@ gl::Error ProgramVk::initDefaultUniformBlocks(const gl::Context *glContext)
>             uniformBufferInfo.queueFamilyIndexCount = 0;
>             uniformBufferInfo.pQueueFamilyIndices   = nullptr;
> 
>-            ANGLE_TRY(mEmptyUniformBlockStorage.buffer.init(device, uniformBufferInfo));
>-
>-            size_t requiredSize = 0;
>-            ANGLE_TRY(AllocateBufferMemory(contextVk, 1, &mEmptyUniformBlockStorage.buffer,
>-                                           &mEmptyUniformBlockStorage.memory, &requiredSize));
>+            // Assume host visible/coherent memory available.
>+            VkMemoryPropertyFlags flags =
>+                (VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT | VK_MEMORY_PROPERTY_HOST_COHERENT_BIT);
>+            ANGLE_TRY(mEmptyUniformBlockStorage.init(contextVk, uniformBufferInfo, flags));
>         }
>-
>-        ANGLE_TRY(updateDefaultUniformsDescriptorSet(contextVk));
>-    }
>-    else
>-    {
>-        // If the program has no uniforms, note this in the offset.
>-        mDescriptorSetOffset = 1;
>     }
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
> GLboolean ProgramVk::validate(const gl::Caps &caps, gl::InfoLog *infoLog)
> {
>-    UNIMPLEMENTED();
>-    return GLboolean();
>+    // No-op. The spec is very vague about the behavior of validation.
>+    return GL_TRUE;
> }
> 
> template <typename T>
>@@ -380,19 +447,96 @@ void ProgramVk::setUniformImpl(GLint location, GLsizei count, const T *v, GLenum
>     const gl::VariableLocation &locationInfo = mState.getUniformLocations()[location];
>     const gl::LinkedUniform &linkedUniform   = mState.getUniforms()[locationInfo.index];
> 
>-    if (linkedUniform.type == entryPointType)
>+    if (linkedUniform.isSampler())
>     {
>-        for (auto &uniformBlock : mDefaultUniformBlocks)
>+        // We could potentially cache some indexing here. For now this is a no-op since the mapping
>+        // is handled entirely in ContextVk.
>+        return;
>+    }
>+
>+    if (linkedUniform.typeInfo->type == entryPointType)
>+    {
>+        for (gl::ShaderType shaderType : gl::AllGLES2ShaderTypes())
>         {
>+            DefaultUniformBlock &uniformBlock     = mDefaultUniformBlocks[shaderType];
>             const sh::BlockMemberInfo &layoutInfo = uniformBlock.uniformLayout[location];
>-            UpdateDefaultUniformBlock(count, linkedUniform.typeInfo->componentCount, v, layoutInfo,
>+
>+            // Assume an offset of -1 means the block is unused.
>+            if (layoutInfo.offset == -1)
>+            {
>+                continue;
>+            }
>+
>+            const GLint componentCount = linkedUniform.typeInfo->componentCount;
>+            UpdateDefaultUniformBlock(count, locationInfo.arrayIndex, componentCount, v, layoutInfo,
>                                       &uniformBlock.uniformData);
>+            mDefaultUniformBlocksDirty.set(shaderType);
>         }
>     }
>     else
>     {
>-        ASSERT(linkedUniform.type == gl::VariableBoolVectorType(entryPointType));
>-        UNIMPLEMENTED();
>+        for (gl::ShaderType shaderType : gl::AllGLES2ShaderTypes())
>+        {
>+            DefaultUniformBlock &uniformBlock     = mDefaultUniformBlocks[shaderType];
>+            const sh::BlockMemberInfo &layoutInfo = uniformBlock.uniformLayout[location];
>+
>+            // Assume an offset of -1 means the block is unused.
>+            if (layoutInfo.offset == -1)
>+            {
>+                continue;
>+            }
>+
>+            const GLint componentCount = linkedUniform.typeInfo->componentCount;
>+
>+            ASSERT(linkedUniform.typeInfo->type == gl::VariableBoolVectorType(entryPointType));
>+
>+            GLint initialArrayOffset =
>+                locationInfo.arrayIndex * layoutInfo.arrayStride + layoutInfo.offset;
>+            for (GLint i = 0; i < count; i++)
>+            {
>+                GLint elementOffset = i * layoutInfo.arrayStride + initialArrayOffset;
>+                GLint *dest =
>+                    reinterpret_cast<GLint *>(uniformBlock.uniformData.data() + elementOffset);
>+                const T *source = v + i * componentCount;
>+
>+                for (int c = 0; c < componentCount; c++)
>+                {
>+                    dest[c] = (source[c] == static_cast<T>(0)) ? GL_FALSE : GL_TRUE;
>+                }
>+            }
>+
>+            mDefaultUniformBlocksDirty.set(shaderType);
>+        }
>+    }
>+}
>+
>+template <typename T>
>+void ProgramVk::getUniformImpl(GLint location, T *v, GLenum entryPointType) const
>+{
>+    const gl::VariableLocation &locationInfo = mState.getUniformLocations()[location];
>+    const gl::LinkedUniform &linkedUniform   = mState.getUniforms()[locationInfo.index];
>+
>+    ASSERT(!linkedUniform.isSampler());
>+
>+    const gl::ShaderType shaderType = linkedUniform.getFirstShaderTypeWhereActive();
>+    ASSERT(shaderType != gl::ShaderType::InvalidEnum);
>+
>+    const DefaultUniformBlock &uniformBlock = mDefaultUniformBlocks[shaderType];
>+    const sh::BlockMemberInfo &layoutInfo   = uniformBlock.uniformLayout[location];
>+
>+    ASSERT(linkedUniform.typeInfo->componentType == entryPointType ||
>+           linkedUniform.typeInfo->componentType == gl::VariableBoolVectorType(entryPointType));
>+
>+    if (gl::IsMatrixType(linkedUniform.type))
>+    {
>+        const uint8_t *ptrToElement = uniformBlock.uniformData.data() + layoutInfo.offset +
>+                                      (locationInfo.arrayIndex * layoutInfo.arrayStride);
>+        GetMatrixUniform(linkedUniform.type, v, reinterpret_cast<const T *>(ptrToElement), false);
>+    }
>+    else
>+    {
>+        ReadFromDefaultUniformBlock(linkedUniform.typeInfo->componentCount, locationInfo.arrayIndex,
>+                                    v, layoutInfo, &uniformBlock.uniformData);
>     }
> }
> 
>@@ -418,22 +562,22 @@ void ProgramVk::setUniform4fv(GLint location, GLsizei count, const GLfloat *v)
> 
> void ProgramVk::setUniform1iv(GLint location, GLsizei count, const GLint *v)
> {
>-    UNIMPLEMENTED();
>+    setUniformImpl(location, count, v, GL_INT);
> }
> 
> void ProgramVk::setUniform2iv(GLint location, GLsizei count, const GLint *v)
> {
>-    UNIMPLEMENTED();
>+    setUniformImpl(location, count, v, GL_INT_VEC2);
> }
> 
> void ProgramVk::setUniform3iv(GLint location, GLsizei count, const GLint *v)
> {
>-    UNIMPLEMENTED();
>+    setUniformImpl(location, count, v, GL_INT_VEC3);
> }
> 
> void ProgramVk::setUniform4iv(GLint location, GLsizei count, const GLint *v)
> {
>-    UNIMPLEMENTED();
>+    setUniformImpl(location, count, v, GL_INT_VEC4);
> }
> 
> void ProgramVk::setUniform1uiv(GLint location, GLsizei count, const GLuint *v)
>@@ -456,12 +600,46 @@ void ProgramVk::setUniform4uiv(GLint location, GLsizei count, const GLuint *v)
>     UNIMPLEMENTED();
> }
> 
>+template <int cols, int rows>
>+void ProgramVk::setUniformMatrixfv(GLint location,
>+                                   GLsizei count,
>+                                   GLboolean transpose,
>+                                   const GLfloat *value)
>+{
>+    const gl::VariableLocation &locationInfo = mState.getUniformLocations()[location];
>+    const gl::LinkedUniform &linkedUniform   = mState.getUniforms()[locationInfo.index];
>+
>+    for (gl::ShaderType shaderType : gl::AllGLES2ShaderTypes())
>+    {
>+        DefaultUniformBlock &uniformBlock     = mDefaultUniformBlocks[shaderType];
>+        const sh::BlockMemberInfo &layoutInfo = uniformBlock.uniformLayout[location];
>+
>+        // Assume an offset of -1 means the block is unused.
>+        if (layoutInfo.offset == -1)
>+        {
>+            continue;
>+        }
>+
>+        bool updated = SetFloatUniformMatrix<cols, rows>(
>+            locationInfo.arrayIndex, linkedUniform.getArraySizeProduct(), count, transpose, value,
>+            uniformBlock.uniformData.data() + layoutInfo.offset);
>+
>+        // If the uniformsDirty flag was true, we don't want to flip it to false here if the
>+        // setter did not update any data. We still want the uniform to be included when we'll
>+        // update the descriptor sets.
>+        if (updated)
>+        {
>+            mDefaultUniformBlocksDirty.set(shaderType);
>+        }
>+    }
>+}
>+
> void ProgramVk::setUniformMatrix2fv(GLint location,
>                                     GLsizei count,
>                                     GLboolean transpose,
>                                     const GLfloat *value)
> {
>-    UNIMPLEMENTED();
>+    setUniformMatrixfv<2, 2>(location, count, transpose, value);
> }
> 
> void ProgramVk::setUniformMatrix3fv(GLint location,
>@@ -469,7 +647,7 @@ void ProgramVk::setUniformMatrix3fv(GLint location,
>                                     GLboolean transpose,
>                                     const GLfloat *value)
> {
>-    UNIMPLEMENTED();
>+    setUniformMatrixfv<3, 3>(location, count, transpose, value);
> }
> 
> void ProgramVk::setUniformMatrix4fv(GLint location,
>@@ -477,7 +655,7 @@ void ProgramVk::setUniformMatrix4fv(GLint location,
>                                     GLboolean transpose,
>                                     const GLfloat *value)
> {
>-    UNIMPLEMENTED();
>+    setUniformMatrixfv<4, 4>(location, count, transpose, value);
> }
> 
> void ProgramVk::setUniformMatrix2x3fv(GLint location,
>@@ -485,7 +663,7 @@ void ProgramVk::setUniformMatrix2x3fv(GLint location,
>                                       GLboolean transpose,
>                                       const GLfloat *value)
> {
>-    UNIMPLEMENTED();
>+    setUniformMatrixfv<2, 3>(location, count, transpose, value);
> }
> 
> void ProgramVk::setUniformMatrix3x2fv(GLint location,
>@@ -493,7 +671,7 @@ void ProgramVk::setUniformMatrix3x2fv(GLint location,
>                                       GLboolean transpose,
>                                       const GLfloat *value)
> {
>-    UNIMPLEMENTED();
>+    setUniformMatrixfv<3, 2>(location, count, transpose, value);
> }
> 
> void ProgramVk::setUniformMatrix2x4fv(GLint location,
>@@ -501,7 +679,7 @@ void ProgramVk::setUniformMatrix2x4fv(GLint location,
>                                       GLboolean transpose,
>                                       const GLfloat *value)
> {
>-    UNIMPLEMENTED();
>+    setUniformMatrixfv<2, 4>(location, count, transpose, value);
> }
> 
> void ProgramVk::setUniformMatrix4x2fv(GLint location,
>@@ -509,7 +687,7 @@ void ProgramVk::setUniformMatrix4x2fv(GLint location,
>                                       GLboolean transpose,
>                                       const GLfloat *value)
> {
>-    UNIMPLEMENTED();
>+    setUniformMatrixfv<4, 2>(location, count, transpose, value);
> }
> 
> void ProgramVk::setUniformMatrix3x4fv(GLint location,
>@@ -517,7 +695,7 @@ void ProgramVk::setUniformMatrix3x4fv(GLint location,
>                                       GLboolean transpose,
>                                       const GLfloat *value)
> {
>-    UNIMPLEMENTED();
>+    setUniformMatrixfv<3, 4>(location, count, transpose, value);
> }
> 
> void ProgramVk::setUniformMatrix4x3fv(GLint location,
>@@ -525,12 +703,7 @@ void ProgramVk::setUniformMatrix4x3fv(GLint location,
>                                       GLboolean transpose,
>                                       const GLfloat *value)
> {
>-    UNIMPLEMENTED();
>-}
>-
>-void ProgramVk::setUniformBlockBinding(GLuint uniformBlockIndex, GLuint uniformBlockBinding)
>-{
>-    UNIMPLEMENTED();
>+    setUniformMatrixfv<4, 3>(location, count, transpose, value);
> }
> 
> void ProgramVk::setPathFragmentInputGen(const std::string &inputName,
>@@ -541,171 +714,34 @@ void ProgramVk::setPathFragmentInputGen(const std::string &inputName,
>     UNIMPLEMENTED();
> }
> 
>-const vk::ShaderModule &ProgramVk::getLinkedVertexModule() const
>-{
>-    ASSERT(mLinkedVertexModule.getHandle() != VK_NULL_HANDLE);
>-    return mLinkedVertexModule;
>-}
>-
>-const vk::ShaderModule &ProgramVk::getLinkedFragmentModule() const
>+angle::Result ProgramVk::allocateDescriptorSet(ContextVk *contextVk, uint32_t descriptorSetIndex)
> {
>-    ASSERT(mLinkedFragmentModule.getHandle() != VK_NULL_HANDLE);
>-    return mLinkedFragmentModule;
>-}
>-
>-const vk::PipelineLayout &ProgramVk::getPipelineLayout() const
>-{
>-    return mPipelineLayout;
>-}
>-
>-vk::Error ProgramVk::initPipelineLayout(ContextVk *context)
>-{
>-    ASSERT(!mPipelineLayout.valid());
>-
>-    VkDevice device = context->getDevice();
>-
>-    // Create two descriptor set layouts: one for default uniform info, and one for textures.
>-    // Skip one or both if there are no uniforms.
>-    VkDescriptorSetLayoutBinding uniformBindings[2];
>-    uint32_t blockCount = 0;
>-
>-    {
>-        auto &layoutBinding = uniformBindings[blockCount];
>-
>-        layoutBinding.binding            = blockCount;
>-        layoutBinding.descriptorType     = VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER;
>-        layoutBinding.descriptorCount    = 1;
>-        layoutBinding.stageFlags         = VK_SHADER_STAGE_VERTEX_BIT;
>-        layoutBinding.pImmutableSamplers = nullptr;
>-
>-        blockCount++;
>-    }
>-
>-    {
>-        auto &layoutBinding = uniformBindings[blockCount];
>-
>-        layoutBinding.binding            = blockCount;
>-        layoutBinding.descriptorType     = VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER;
>-        layoutBinding.descriptorCount    = 1;
>-        layoutBinding.stageFlags         = VK_SHADER_STAGE_FRAGMENT_BIT;
>-        layoutBinding.pImmutableSamplers = nullptr;
>-
>-        blockCount++;
>-    }
>-
>-    {
>-        VkDescriptorSetLayoutCreateInfo uniformInfo;
>-        uniformInfo.sType        = VK_STRUCTURE_TYPE_DESCRIPTOR_SET_LAYOUT_CREATE_INFO;
>-        uniformInfo.pNext        = nullptr;
>-        uniformInfo.flags        = 0;
>-        uniformInfo.bindingCount = blockCount;
>-        uniformInfo.pBindings    = uniformBindings;
>-
>-        vk::DescriptorSetLayout uniformLayout;
>-        ANGLE_TRY(uniformLayout.init(device, uniformInfo));
>-        mDescriptorSetLayouts.push_back(std::move(uniformLayout));
>-    }
>-
>-    const auto &samplerBindings = mState.getSamplerBindings();
>+    // Write out to a new a descriptor set.
>+    vk::DynamicDescriptorPool *dynamicDescriptorPool =
>+        contextVk->getDynamicDescriptorPool(descriptorSetIndex);
> 
>-    if (!samplerBindings.empty())
>+    uint32_t potentialNewCount = descriptorSetIndex + 1;
>+    if (potentialNewCount > mDescriptorSets.size())
>     {
>-        std::vector<VkDescriptorSetLayoutBinding> textureBindings;
>-        uint32_t textureCount = 0;
>-        const auto &uniforms  = mState.getUniforms();
>-        for (unsigned int uniformIndex : mState.getSamplerUniformRange())
>-        {
>-            const gl::LinkedUniform &samplerUniform = uniforms[uniformIndex];
>-            unsigned int samplerIndex = mState.getSamplerIndexFromUniformIndex(uniformIndex);
>-            const gl::SamplerBinding &samplerBinding = samplerBindings[samplerIndex];
>-
>-            ASSERT(!samplerBinding.unreferenced);
>-
>-            VkDescriptorSetLayoutBinding layoutBinding;
>-
>-            uint32_t elementCount = samplerUniform.getBasicTypeElementCount();
>-
>-            layoutBinding.binding         = textureCount;
>-            layoutBinding.descriptorType  = VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER;
>-            layoutBinding.descriptorCount = elementCount;
>-
>-            layoutBinding.stageFlags = 0;
>-            if (samplerUniform.vertexStaticUse)
>-            {
>-                layoutBinding.stageFlags |= VK_SHADER_STAGE_VERTEX_BIT;
>-            }
>-            if (samplerUniform.fragmentStaticUse)
>-            {
>-                layoutBinding.stageFlags |= VK_SHADER_STAGE_FRAGMENT_BIT;
>-            }
>-
>-            layoutBinding.pImmutableSamplers = nullptr;
>-
>-            textureCount += elementCount;
>-
>-            textureBindings.push_back(layoutBinding);
>-        }
>-
>-        VkDescriptorSetLayoutCreateInfo textureInfo;
>-        textureInfo.sType        = VK_STRUCTURE_TYPE_DESCRIPTOR_SET_LAYOUT_CREATE_INFO;
>-        textureInfo.pNext        = nullptr;
>-        textureInfo.flags        = 0;
>-        textureInfo.bindingCount = static_cast<uint32_t>(textureBindings.size());
>-        textureInfo.pBindings    = textureBindings.data();
>-
>-        vk::DescriptorSetLayout textureLayout;
>-        ANGLE_TRY(textureLayout.init(device, textureInfo));
>-        mDescriptorSetLayouts.push_back(std::move(textureLayout));
>-
>-        mDirtyTextures = true;
>+        mDescriptorSets.resize(potentialNewCount, VK_NULL_HANDLE);
>     }
> 
>-    VkPipelineLayoutCreateInfo createInfo;
>-    createInfo.sType                  = VK_STRUCTURE_TYPE_PIPELINE_LAYOUT_CREATE_INFO;
>-    createInfo.pNext                  = nullptr;
>-    createInfo.flags                  = 0;
>-    createInfo.setLayoutCount         = static_cast<uint32_t>(mDescriptorSetLayouts.size());
>-    createInfo.pSetLayouts            = mDescriptorSetLayouts[0].ptr();
>-    createInfo.pushConstantRangeCount = 0;
>-    createInfo.pPushConstantRanges    = nullptr;
>-
>-    ANGLE_TRY(mPipelineLayout.init(device, createInfo));
>-
>-    return vk::NoError();
>-}
>-
>-vk::Error ProgramVk::initDescriptorSets(ContextVk *contextVk)
>-{
>-    ASSERT(mDescriptorSets.empty());
>-
>-    VkDevice device = contextVk->getDevice();
>-
>-    // Write out to a new a descriptor set.
>-    // TODO(jmadill): Handle descriptor set lifetime.
>-    vk::DescriptorPool *descriptorPool = contextVk->getDescriptorPool();
>-
>-    uint32_t descriptorSetCount = static_cast<uint32_t>(mDescriptorSetLayouts.size());
>-
>-    VkDescriptorSetAllocateInfo allocInfo;
>-    allocInfo.sType              = VK_STRUCTURE_TYPE_DESCRIPTOR_SET_ALLOCATE_INFO;
>-    allocInfo.pNext              = nullptr;
>-    allocInfo.descriptorPool     = descriptorPool->getHandle();
>-    allocInfo.descriptorSetCount = descriptorSetCount;
>-    allocInfo.pSetLayouts        = mDescriptorSetLayouts[0].ptr();
>-
>-    mDescriptorSets.resize(descriptorSetCount, VK_NULL_HANDLE);
>-    ANGLE_TRY(descriptorPool->allocateDescriptorSets(device, allocInfo, &mDescriptorSets[0]));
>-    return vk::NoError();
>+    const vk::DescriptorSetLayout &descriptorSetLayout =
>+        mDescriptorSetLayouts[descriptorSetIndex].get();
>+    ANGLE_TRY(dynamicDescriptorPool->allocateSets(contextVk, descriptorSetLayout.ptr(), 1,
>+                                                  &mDescriptorPoolBindings[descriptorSetIndex],
>+                                                  &mDescriptorSets[descriptorSetIndex]));
>+    return angle::Result::Continue;
> }
> 
> void ProgramVk::getUniformfv(const gl::Context *context, GLint location, GLfloat *params) const
> {
>-    UNIMPLEMENTED();
>+    getUniformImpl(location, params, GL_FLOAT);
> }
> 
> void ProgramVk::getUniformiv(const gl::Context *context, GLint location, GLint *params) const
> {
>-    UNIMPLEMENTED();
>+    getUniformImpl(location, params, GL_INT);
> }
> 
> void ProgramVk::getUniformuiv(const gl::Context *context, GLint location, GLuint *params) const
>@@ -713,154 +749,195 @@ void ProgramVk::getUniformuiv(const gl::Context *context, GLint location, GLuint
>     UNIMPLEMENTED();
> }
> 
>-vk::Error ProgramVk::updateUniforms(ContextVk *contextVk)
>+angle::Result ProgramVk::updateUniforms(ContextVk *contextVk)
> {
>-    if (!mDefaultUniformBlocks[VertexShader].uniformsDirty &&
>-        !mDefaultUniformBlocks[FragmentShader].uniformsDirty)
>-    {
>-        return vk::NoError();
>-    }
>-
>-    ASSERT(mDescriptorSetOffset == 0);
>-
>-    VkDevice device = contextVk->getDevice();
>+    ASSERT(dirtyUniforms());
> 
>     // Update buffer memory by immediate mapping. This immediate update only works once.
>-    // TODO(jmadill): Handle inserting updates into the command stream, or use dynamic buffers.
>-    for (auto &uniformBlock : mDefaultUniformBlocks)
>+    bool anyNewBufferAllocated = false;
>+    for (gl::ShaderType shaderType : gl::AllGLES2ShaderTypes())
>     {
>-        if (uniformBlock.uniformsDirty)
>+        DefaultUniformBlock &uniformBlock = mDefaultUniformBlocks[shaderType];
>+
>+        if (mDefaultUniformBlocksDirty[shaderType])
>         {
>-            ANGLE_TRY(SyncDefaultUniformBlock(device, &uniformBlock.storage.memory,
>-                                              uniformBlock.uniformData));
>-            uniformBlock.uniformsDirty = false;
>+            bool bufferModified = false;
>+            ANGLE_TRY(SyncDefaultUniformBlock(contextVk, &uniformBlock.storage,
>+                                              uniformBlock.uniformData,
>+                                              &mUniformBlocksOffsets[shaderType], &bufferModified));
>+            mDefaultUniformBlocksDirty.reset(shaderType);
>+
>+            if (bufferModified)
>+            {
>+                anyNewBufferAllocated = true;
>+            }
>         }
>     }
> 
>-    return vk::NoError();
>+    if (anyNewBufferAllocated)
>+    {
>+        // We need to reinitialize the descriptor sets if we newly allocated buffers since we can't
>+        // modify the descriptor sets once initialized.
>+        ANGLE_TRY(allocateDescriptorSet(contextVk, kUniformsDescriptorSetIndex));
>+        ANGLE_TRY(updateDefaultUniformsDescriptorSet(contextVk));
>+    }
>+
>+    return angle::Result::Continue;
> }
> 
>-vk::Error ProgramVk::updateDefaultUniformsDescriptorSet(ContextVk *contextVk)
>+angle::Result ProgramVk::updateDefaultUniformsDescriptorSet(ContextVk *contextVk)
> {
>-    std::array<VkDescriptorBufferInfo, 2> descriptorBufferInfo;
>-    std::array<VkWriteDescriptorSet, 2> writeDescriptorInfo;
>-    uint32_t bufferCount = 0;
>+    gl::ShaderMap<VkDescriptorBufferInfo> descriptorBufferInfo;
>+    gl::ShaderMap<VkWriteDescriptorSet> writeDescriptorInfo;
> 
>-    for (auto &uniformBlock : mDefaultUniformBlocks)
>+    for (gl::ShaderType shaderType : gl::AllGLES2ShaderTypes())
>     {
>-        auto &bufferInfo = descriptorBufferInfo[bufferCount];
>+        DefaultUniformBlock &uniformBlock  = mDefaultUniformBlocks[shaderType];
>+        VkDescriptorBufferInfo &bufferInfo = descriptorBufferInfo[shaderType];
>+        VkWriteDescriptorSet &writeInfo    = writeDescriptorInfo[shaderType];
> 
>         if (!uniformBlock.uniformData.empty())
>         {
>-            bufferInfo.buffer = uniformBlock.storage.buffer.getHandle();
>+            bufferInfo.buffer = uniformBlock.storage.getCurrentBuffer()->getBuffer().getHandle();
>         }
>         else
>         {
>-            bufferInfo.buffer = mEmptyUniformBlockStorage.buffer.getHandle();
>+            bufferInfo.buffer = mEmptyUniformBlockStorage.getBuffer().getHandle();
>         }
> 
>         bufferInfo.offset = 0;
>         bufferInfo.range  = VK_WHOLE_SIZE;
> 
>-        auto &writeInfo = writeDescriptorInfo[bufferCount];
>-
>         writeInfo.sType            = VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET;
>         writeInfo.pNext            = nullptr;
>         writeInfo.dstSet           = mDescriptorSets[0];
>-        writeInfo.dstBinding       = bufferCount;
>+        writeInfo.dstBinding       = static_cast<uint32_t>(shaderType);
>         writeInfo.dstArrayElement  = 0;
>         writeInfo.descriptorCount  = 1;
>-        writeInfo.descriptorType   = VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER;
>+        writeInfo.descriptorType   = VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER_DYNAMIC;
>         writeInfo.pImageInfo       = nullptr;
>         writeInfo.pBufferInfo      = &bufferInfo;
>         writeInfo.pTexelBufferView = nullptr;
>-
>-        bufferCount++;
>     }
> 
>     VkDevice device = contextVk->getDevice();
> 
>-    vkUpdateDescriptorSets(device, bufferCount, writeDescriptorInfo.data(), 0, nullptr);
>+    vkUpdateDescriptorSets(device, 2, writeDescriptorInfo.data(), 0, nullptr);
> 
>-    return vk::NoError();
>+    return angle::Result::Continue;
> }
> 
>-const std::vector<VkDescriptorSet> &ProgramVk::getDescriptorSets() const
>+angle::Result ProgramVk::updateTexturesDescriptorSet(ContextVk *contextVk,
>+                                                     vk::FramebufferHelper *framebuffer)
> {
>-    return mDescriptorSets;
>-}
>-
>-uint32_t ProgramVk::getDescriptorSetOffset() const
>-{
>-    return mDescriptorSetOffset;
>-}
>-
>-void ProgramVk::updateTexturesDescriptorSet(ContextVk *contextVk)
>-{
>-    if (mState.getSamplerBindings().empty() || !mDirtyTextures)
>-    {
>-        return;
>-    }
>+    ASSERT(hasTextures());
>+    ANGLE_TRY(allocateDescriptorSet(contextVk, kTextureDescriptorSetIndex));
> 
>-    VkDescriptorSet descriptorSet = mDescriptorSets.back();
>+    ASSERT(mUsedDescriptorSetRange.contains(1));
>+    VkDescriptorSet descriptorSet = mDescriptorSets[kTextureDescriptorSetIndex];
> 
>-    // TODO(jmadill): Don't hard-code the texture limit.
>-    ShaderTextureArray<VkDescriptorImageInfo> descriptorImageInfo;
>-    ShaderTextureArray<VkWriteDescriptorSet> writeDescriptorInfo;
>-    uint32_t imageCount = 0;
>+    gl::ActiveTextureArray<VkDescriptorImageInfo> descriptorImageInfo;
>+    gl::ActiveTextureArray<VkWriteDescriptorSet> writeDescriptorInfo;
>+    uint32_t writeCount = 0;
> 
>-    const gl::State &glState     = contextVk->getGLState();
>-    const auto &completeTextures = glState.getCompleteTextureCache();
>+    const gl::ActiveTextureArray<TextureVk *> &activeTextures = contextVk->getActiveTextures();
> 
>-    for (const auto &samplerBinding : mState.getSamplerBindings())
>+    for (uint32_t textureIndex = 0; textureIndex < mState.getSamplerBindings().size();
>+         ++textureIndex)
>     {
>+        const gl::SamplerBinding &samplerBinding = mState.getSamplerBindings()[textureIndex];
>+
>         ASSERT(!samplerBinding.unreferenced);
> 
>-        // TODO(jmadill): Sampler arrays
>-        ASSERT(samplerBinding.boundTextureUnits.size() == 1);
>+        for (uint32_t arrayElement = 0; arrayElement < samplerBinding.boundTextureUnits.size();
>+             ++arrayElement)
>+        {
>+            GLuint textureUnit   = samplerBinding.boundTextureUnits[arrayElement];
>+            TextureVk *textureVk = activeTextures[textureUnit];
> 
>-        GLuint textureUnit         = samplerBinding.boundTextureUnits[0];
>-        const gl::Texture *texture = completeTextures[textureUnit];
>+            // Ensure any writes to the textures are flushed before we read from them.
>+            ANGLE_TRY(textureVk->ensureImageInitialized(contextVk));
>+            vk::ImageHelper &image = textureVk->getImage();
> 
>-        // TODO(jmadill): Incomplete textures handling.
>-        ASSERT(texture);
>+            // Ensure the image is in read-only layout
>+            if (image.isLayoutChangeNecessary(vk::ImageLayout::FragmentShaderReadOnly))
>+            {
>+                vk::CommandBuffer *srcLayoutChange;
>+                ANGLE_TRY(image.recordCommands(contextVk, &srcLayoutChange));
> 
>-        TextureVk *textureVk   = vk::GetImpl(texture);
>-        const vk::Image &image = textureVk->getImage();
>+                image.changeLayout(VK_IMAGE_ASPECT_COLOR_BIT,
>+                                   vk::ImageLayout::FragmentShaderReadOnly, srcLayoutChange);
>+            }
> 
>-        VkDescriptorImageInfo &imageInfo = descriptorImageInfo[imageCount];
>+            image.addReadDependency(framebuffer);
> 
>-        imageInfo.sampler     = textureVk->getSampler().getHandle();
>-        imageInfo.imageView   = textureVk->getImageView().getHandle();
>-        imageInfo.imageLayout = image.getCurrentLayout();
>+            VkDescriptorImageInfo &imageInfo = descriptorImageInfo[writeCount];
> 
>-        auto &writeInfo = writeDescriptorInfo[imageCount];
>+            imageInfo.sampler     = textureVk->getSampler().getHandle();
>+            imageInfo.imageView   = textureVk->getReadImageView().getHandle();
>+            imageInfo.imageLayout = image.getCurrentLayout();
> 
>-        writeInfo.sType            = VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET;
>-        writeInfo.pNext            = nullptr;
>-        writeInfo.dstSet           = descriptorSet;
>-        writeInfo.dstBinding       = imageCount;
>-        writeInfo.dstArrayElement  = 0;
>-        writeInfo.descriptorCount  = 1;
>-        writeInfo.descriptorType   = VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER;
>-        writeInfo.pImageInfo       = &imageInfo;
>-        writeInfo.pBufferInfo      = nullptr;
>-        writeInfo.pTexelBufferView = nullptr;
>+            VkWriteDescriptorSet &writeInfo = writeDescriptorInfo[writeCount];
>+
>+            writeInfo.sType            = VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET;
>+            writeInfo.pNext            = nullptr;
>+            writeInfo.dstSet           = descriptorSet;
>+            writeInfo.dstBinding       = textureIndex;
>+            writeInfo.dstArrayElement  = arrayElement;
>+            writeInfo.descriptorCount  = 1;
>+            writeInfo.descriptorType   = VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER;
>+            writeInfo.pImageInfo       = &imageInfo;
>+            writeInfo.pBufferInfo      = nullptr;
>+            writeInfo.pTexelBufferView = nullptr;
> 
>-        imageCount++;
>+            writeCount++;
>+        }
>     }
> 
>     VkDevice device = contextVk->getDevice();
> 
>-    ASSERT(imageCount > 0);
>-    vkUpdateDescriptorSets(device, imageCount, writeDescriptorInfo.data(), 0, nullptr);
>+    ASSERT(writeCount > 0);
>+    vkUpdateDescriptorSets(device, writeCount, writeDescriptorInfo.data(), 0, nullptr);
> 
>-    mDirtyTextures = false;
>+    return angle::Result::Continue;
> }
> 
>-void ProgramVk::invalidateTextures()
>+void ProgramVk::setDefaultUniformBlocksMinSizeForTesting(size_t minSize)
> {
>-    mDirtyTextures = true;
>+    for (DefaultUniformBlock &block : mDefaultUniformBlocks)
>+    {
>+        block.storage.setMinimumSizeForTesting(minSize);
>+    }
> }
> 
>+angle::Result ProgramVk::updateDescriptorSets(ContextVk *contextVk,
>+                                              vk::CommandBuffer *commandBuffer)
>+{
>+    // Can probably use better dirty bits here.
>+
>+    if (mUsedDescriptorSetRange.empty())
>+        return angle::Result::Continue;
>+
>+    ASSERT(!mDescriptorSets.empty());
>+
>+    unsigned int low = mUsedDescriptorSetRange.low();
>+
>+    // No uniforms descriptor set means no need to specify dynamic buffer offsets.
>+    if (mUsedDescriptorSetRange.contains(kUniformsDescriptorSetIndex))
>+    {
>+        constexpr uint32_t kShaderTypeMin = static_cast<uint32_t>(gl::kGLES2ShaderTypeMin);
>+        constexpr uint32_t kShaderTypeMax = static_cast<uint32_t>(gl::kGLES2ShaderTypeMax);
>+        commandBuffer->bindGraphicsDescriptorSets(
>+            mPipelineLayout.get(), low, mUsedDescriptorSetRange.length(), &mDescriptorSets[low],
>+            kShaderTypeMax - kShaderTypeMin + 1, mUniformBlocksOffsets.data() + kShaderTypeMin);
>+    }
>+    else
>+    {
>+        commandBuffer->bindGraphicsDescriptorSets(mPipelineLayout.get(), low,
>+                                                  mUsedDescriptorSetRange.length(),
>+                                                  &mDescriptorSets[low], 0, nullptr);
>+    }
>+
>+    return angle::Result::Continue;
>+}
> }  // namespace rx
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/ProgramVk.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/ProgramVk.h
>index 4da6d380660..e59feefe10f 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/ProgramVk.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/ProgramVk.h
>@@ -10,14 +10,20 @@
> #ifndef LIBANGLE_RENDERER_VULKAN_PROGRAMVK_H_
> #define LIBANGLE_RENDERER_VULKAN_PROGRAMVK_H_
> 
>-#include "libANGLE/Constants.h"
>-#include "libANGLE/renderer/ProgramImpl.h"
>-#include "libANGLE/renderer/vulkan/renderervk_utils.h"
>-
> #include <array>
> 
>+#include "common/utilities.h"
>+#include "libANGLE/renderer/ProgramImpl.h"
>+#include "libANGLE/renderer/vulkan/ContextVk.h"
>+#include "libANGLE/renderer/vulkan/RendererVk.h"
>+#include "libANGLE/renderer/vulkan/vk_helpers.h"
>+
> namespace rx
> {
>+ANGLE_INLINE bool UseLineRaster(const ContextVk *contextVk, gl::PrimitiveMode mode)
>+{
>+    return contextVk->getFeatures().basicGLLineRasterization && gl::IsLineMode(mode);
>+}
> 
> class ProgramVk : public ProgramImpl
> {
>@@ -26,16 +32,16 @@ class ProgramVk : public ProgramImpl
>     ~ProgramVk() override;
>     void destroy(const gl::Context *context) override;
> 
>-    gl::LinkResult load(const gl::Context *context,
>-                        gl::InfoLog &infoLog,
>-                        gl::BinaryInputStream *stream) override;
>+    std::unique_ptr<LinkEvent> load(const gl::Context *context,
>+                                    gl::BinaryInputStream *stream,
>+                                    gl::InfoLog &infoLog) override;
>     void save(const gl::Context *context, gl::BinaryOutputStream *stream) override;
>     void setBinaryRetrievableHint(bool retrievable) override;
>     void setSeparable(bool separable) override;
> 
>-    gl::LinkResult link(const gl::Context *context,
>-                        const gl::ProgramLinkedResources &resources,
>-                        gl::InfoLog &infoLog) override;
>+    std::unique_ptr<LinkEvent> link(const gl::Context *context,
>+                                    const gl::ProgramLinkedResources &resources,
>+                                    gl::InfoLog &infoLog) override;
>     GLboolean validate(const gl::Caps &caps, gl::InfoLog *infoLog) override;
> 
>     void setUniform1fv(GLint location, GLsizei count, const GLfloat *v) override;
>@@ -91,45 +97,96 @@ class ProgramVk : public ProgramImpl
>     void getUniformiv(const gl::Context *context, GLint location, GLint *params) const override;
>     void getUniformuiv(const gl::Context *context, GLint location, GLuint *params) const override;
> 
>-    // TODO: synchronize in syncState when dirty bits exist.
>-    void setUniformBlockBinding(GLuint uniformBlockIndex, GLuint uniformBlockBinding) override;
>-
>     void setPathFragmentInputGen(const std::string &inputName,
>                                  GLenum genMode,
>                                  GLint components,
>                                  const GLfloat *coeffs) override;
> 
>-    const vk::ShaderModule &getLinkedVertexModule() const;
>-    const vk::ShaderModule &getLinkedFragmentModule() const;
>-    const vk::PipelineLayout &getPipelineLayout() const;
>+    // Also initializes the pipeline layout, descriptor set layouts, and used descriptor ranges.
>+
>+    angle::Result updateUniforms(ContextVk *contextVk);
>+    angle::Result updateTexturesDescriptorSet(ContextVk *contextVk,
>+                                              vk::FramebufferHelper *framebuffer);
> 
>-    vk::Error updateUniforms(ContextVk *contextVk);
>+    angle::Result updateDescriptorSets(ContextVk *contextVk, vk::CommandBuffer *commandBuffer);
> 
>-    const std::vector<VkDescriptorSet> &getDescriptorSets() const;
>+    // For testing only.
>+    void setDefaultUniformBlocksMinSizeForTesting(size_t minSize);
> 
>-    // In Vulkan, it is invalid to pass in a NULL descriptor set to vkCmdBindDescriptorSets.
>-    // However, it's valid to leave them in an undefined, unbound state, if they are never used.
>-    // This means when we want to ignore a descriptor set index, we need to pass in an offset
>-    // parameter to BindDescriptorSets, which is an offset into the getDescriptorSets array.
>-    uint32_t getDescriptorSetOffset() const;
>+    const vk::PipelineLayout &getPipelineLayout() const { return mPipelineLayout.get(); }
> 
>-    void updateTexturesDescriptorSet(ContextVk *contextVk);
>-    void invalidateTextures();
>+    bool hasTextures() const { return !mState.getSamplerBindings().empty(); }
>+
>+    bool dirtyUniforms() const { return mDefaultUniformBlocksDirty.any(); }
>+
>+    angle::Result getGraphicsPipeline(ContextVk *contextVk,
>+                                      gl::PrimitiveMode mode,
>+                                      const vk::GraphicsPipelineDesc &desc,
>+                                      const gl::AttributesMask &activeAttribLocations,
>+                                      const vk::GraphicsPipelineDesc **descPtrOut,
>+                                      vk::PipelineHelper **pipelineOut)
>+    {
>+        vk::ShaderProgramHelper *shaderProgram;
>+        ANGLE_TRY(initShaders(contextVk, mode, &shaderProgram));
>+        ASSERT(shaderProgram->isGraphicsProgram());
>+        RendererVk *renderer = contextVk->getRenderer();
>+        return shaderProgram->getGraphicsPipeline(
>+            contextVk, &renderer->getRenderPassCache(), renderer->getPipelineCache(),
>+            renderer->getCurrentQueueSerial(), mPipelineLayout.get(), desc, activeAttribLocations,
>+            descPtrOut, pipelineOut);
>+    }
> 
>   private:
>-    void reset(VkDevice device);
>-    vk::Error initPipelineLayout(ContextVk *context);
>-    vk::Error initDescriptorSets(ContextVk *contextVk);
>-    gl::Error initDefaultUniformBlocks(const gl::Context *glContext);
>-    vk::Error updateDefaultUniformsDescriptorSet(ContextVk *contextVk);
>+    template <int cols, int rows>
>+    void setUniformMatrixfv(GLint location,
>+                            GLsizei count,
>+                            GLboolean transpose,
>+                            const GLfloat *value);
>+
>+    void reset(RendererVk *renderer);
>+    angle::Result allocateDescriptorSet(ContextVk *contextVk, uint32_t descriptorSetIndex);
>+    angle::Result initDefaultUniformBlocks(const gl::Context *glContext);
>+
>+    angle::Result updateDefaultUniformsDescriptorSet(ContextVk *contextVk);
>+
>+    template <class T>
>+    void getUniformImpl(GLint location, T *v, GLenum entryPointType) const;
> 
>     template <typename T>
>     void setUniformImpl(GLint location, GLsizei count, const T *v, GLenum entryPointType);
>+    angle::Result linkImpl(const gl::Context *glContext,
>+                           const gl::ProgramLinkedResources &resources,
>+                           gl::InfoLog &infoLog);
>+
>+    ANGLE_INLINE angle::Result initShaders(ContextVk *contextVk,
>+                                           gl::PrimitiveMode mode,
>+                                           vk::ShaderProgramHelper **shaderProgramOut)
>+    {
>+        if (UseLineRaster(contextVk, mode))
>+        {
>+            if (!mLineRasterShaderInfo.valid())
>+            {
>+                ANGLE_TRY(mLineRasterShaderInfo.initShaders(contextVk, mVertexSource,
>+                                                            mFragmentSource, true));
>+            }
>+
>+            ASSERT(mLineRasterShaderInfo.valid());
>+            *shaderProgramOut = &mLineRasterShaderInfo.getShaderProgram();
>+        }
>+        else
>+        {
>+            if (!mDefaultShaderInfo.valid())
>+            {
>+                ANGLE_TRY(mDefaultShaderInfo.initShaders(contextVk, mVertexSource, mFragmentSource,
>+                                                         false));
>+            }
> 
>-    vk::ShaderModule mLinkedVertexModule;
>-    vk::ShaderModule mLinkedFragmentModule;
>-    vk::PipelineLayout mPipelineLayout;
>-    std::vector<vk::DescriptorSetLayout> mDescriptorSetLayouts;
>+            ASSERT(mDefaultShaderInfo.valid());
>+            *shaderProgramOut = &mDefaultShaderInfo.getShaderProgram();
>+        }
>+
>+        return angle::Result::Continue;
>+    }
> 
>     // State for the default uniform blocks.
>     struct DefaultUniformBlock final : private angle::NonCopyable
>@@ -137,31 +194,65 @@ class ProgramVk : public ProgramImpl
>         DefaultUniformBlock();
>         ~DefaultUniformBlock();
> 
>-        vk::BufferAndMemory storage;
>+        vk::DynamicBuffer storage;
> 
>         // Shadow copies of the shader uniform data.
>         angle::MemoryBuffer uniformData;
>-        bool uniformsDirty;
> 
>         // Since the default blocks are laid out in std140, this tells us where to write on a call
>         // to a setUniform method. They are arranged in uniform location order.
>         std::vector<sh::BlockMemberInfo> uniformLayout;
>     };
> 
>-    std::array<DefaultUniformBlock, 2> mDefaultUniformBlocks;
>+    gl::ShaderMap<DefaultUniformBlock> mDefaultUniformBlocks;
>+    gl::ShaderBitSet mDefaultUniformBlocksDirty;
>+    gl::ShaderMap<uint32_t> mUniformBlocksOffsets;
> 
>     // This is a special "empty" placeholder buffer for when a shader has no uniforms.
>     // It is necessary because we want to keep a compatible pipeline layout in all cases,
>     // and Vulkan does not tolerate having null handles in a descriptor set.
>-    vk::BufferAndMemory mEmptyUniformBlockStorage;
>+    vk::BufferHelper mEmptyUniformBlockStorage;
> 
>     // Descriptor sets for uniform blocks and textures for this program.
>     std::vector<VkDescriptorSet> mDescriptorSets;
>-    uint32_t mDescriptorSetOffset;
>-    bool mDirtyTextures;
>+    gl::RangeUI mUsedDescriptorSetRange;
> 
>-    template <typename T>
>-    using ShaderTextureArray = std::array<T, gl::IMPLEMENTATION_MAX_SHADER_TEXTURES>;
>+    // We keep a reference to the pipeline and descriptor set layouts. This ensures they don't get
>+    // deleted while this program is in use.
>+    vk::BindingPointer<vk::PipelineLayout> mPipelineLayout;
>+    vk::DescriptorSetLayoutPointerArray mDescriptorSetLayouts;
>+
>+    // Keep bindings to the descriptor pools. This ensures the pools stay valid while the Program
>+    // is in use.
>+    vk::DescriptorSetLayoutArray<vk::RefCountedDescriptorPoolBinding> mDescriptorPoolBindings;
>+
>+    class ShaderInfo final : angle::NonCopyable
>+    {
>+      public:
>+        ShaderInfo();
>+        ~ShaderInfo();
>+
>+        angle::Result initShaders(ContextVk *contextVk,
>+                                  const std::string &vertexSource,
>+                                  const std::string &fragmentSource,
>+                                  bool enableLineRasterEmulation);
>+        void release(RendererVk *renderer);
>+
>+        ANGLE_INLINE bool valid() const { return mShaders[gl::ShaderType::Vertex].get().valid(); }
>+
>+        vk::ShaderProgramHelper &getShaderProgram() { return mProgramHelper; }
>+
>+      private:
>+        vk::ShaderProgramHelper mProgramHelper;
>+        gl::ShaderMap<vk::RefCounted<vk::ShaderAndSerial>> mShaders;
>+    };
>+
>+    ShaderInfo mDefaultShaderInfo;
>+    ShaderInfo mLineRasterShaderInfo;
>+
>+    // We keep the translated linked shader sources to use with shader draw call patching.
>+    std::string mVertexSource;
>+    std::string mFragmentSource;
> };
> 
> }  // namespace rx
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/QueryVk.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/QueryVk.cpp
>index c3eb2c46d76..9aa1febdca9 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/QueryVk.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/QueryVk.cpp
>@@ -1,5 +1,5 @@
> //
>-// Copyright 2016 The ANGLE Project Authors. All rights reserved.
>+// Copyright 2016-2018 The ANGLE Project Authors. All rights reserved.
> // Use of this source code is governed by a BSD-style license that can be
> // found in the LICENSE file.
> //
>@@ -8,66 +8,213 @@
> //
> 
> #include "libANGLE/renderer/vulkan/QueryVk.h"
>+#include "libANGLE/Context.h"
>+#include "libANGLE/renderer/vulkan/ContextVk.h"
>+#include "libANGLE/renderer/vulkan/RendererVk.h"
> 
> #include "common/debug.h"
> 
> namespace rx
> {
> 
>-QueryVk::QueryVk(GLenum type) : QueryImpl(type)
>+QueryVk::QueryVk(gl::QueryType type) : QueryImpl(type), mCachedResult(0), mCachedResultValid(false)
>+{}
>+
>+QueryVk::~QueryVk() = default;
>+
>+void QueryVk::onDestroy(const gl::Context *context)
> {
>+    ContextVk *contextVk            = vk::GetImpl(context);
>+    vk::DynamicQueryPool *queryPool = contextVk->getQueryPool(getType());
>+    queryPool->freeQuery(contextVk, &mQueryHelper);
>+    queryPool->freeQuery(contextVk, &mQueryHelperTimeElapsedBegin);
> }
> 
>-QueryVk::~QueryVk()
>+angle::Result QueryVk::begin(const gl::Context *context)
> {
>+    ContextVk *contextVk = vk::GetImpl(context);
>+
>+    mCachedResultValid = false;
>+
>+    if (!mQueryHelper.getQueryPool())
>+    {
>+        ANGLE_TRY(contextVk->getQueryPool(getType())->allocateQuery(contextVk, &mQueryHelper));
>+    }
>+
>+    // Note: TimeElapsed is implemented by using two Timestamp queries and taking the diff.
>+    if (getType() == gl::QueryType::TimeElapsed)
>+    {
>+        if (!mQueryHelperTimeElapsedBegin.getQueryPool())
>+        {
>+            ANGLE_TRY(contextVk->getQueryPool(getType())->allocateQuery(
>+                contextVk, &mQueryHelperTimeElapsedBegin));
>+        }
>+
>+        mQueryHelperTimeElapsedBegin.writeTimestamp(contextVk);
>+    }
>+    else
>+    {
>+        mQueryHelper.beginQuery(contextVk);
>+    }
>+
>+    return angle::Result::Continue;
> }
> 
>-gl::Error QueryVk::begin()
>+angle::Result QueryVk::end(const gl::Context *context)
> {
>-    UNIMPLEMENTED();
>-    return gl::InternalError();
>+    ContextVk *contextVk = vk::GetImpl(context);
>+
>+    if (getType() == gl::QueryType::TimeElapsed)
>+    {
>+        mQueryHelper.writeTimestamp(contextVk);
>+    }
>+    else
>+    {
>+        mQueryHelper.endQuery(contextVk);
>+    }
>+
>+    return angle::Result::Continue;
> }
> 
>-gl::Error QueryVk::end()
>+angle::Result QueryVk::queryCounter(const gl::Context *context)
> {
>-    UNIMPLEMENTED();
>-    return gl::InternalError();
>+    ContextVk *contextVk = vk::GetImpl(context);
>+
>+    mCachedResultValid = false;
>+
>+    if (!mQueryHelper.getQueryPool())
>+    {
>+        ANGLE_TRY(contextVk->getQueryPool(getType())->allocateQuery(contextVk, &mQueryHelper));
>+    }
>+
>+    ASSERT(getType() == gl::QueryType::Timestamp);
>+
>+    mQueryHelper.writeTimestamp(contextVk);
>+
>+    return angle::Result::Continue;
> }
> 
>-gl::Error QueryVk::queryCounter()
>+angle::Result QueryVk::getResult(const gl::Context *context, bool wait)
> {
>-    UNIMPLEMENTED();
>-    return gl::InternalError();
>-}
>+    if (mCachedResultValid)
>+    {
>+        return angle::Result::Continue;
>+    }
>+
>+    ContextVk *contextVk = vk::GetImpl(context);
>+    RendererVk *renderer = contextVk->getRenderer();
>+
>+    // glGetQueryObject* requires an implicit flush of the command buffers to guarantee execution in
>+    // finite time.
>+    // Note regarding time-elapsed: end should have been called after begin, so flushing when end
>+    // has pending work should flush begin too.
>+    if (mQueryHelper.hasPendingWork(renderer))
>+    {
>+        ANGLE_TRY(contextVk->flushImpl());
>+
>+        ASSERT(!mQueryHelperTimeElapsedBegin.hasPendingWork(renderer));
>+        ASSERT(!mQueryHelper.hasPendingWork(renderer));
>+    }
>+
>+    // If the command buffer this query is being written to is still in flight, its reset command
>+    // may not have been performed by the GPU yet.  To avoid a race condition in this case, wait
>+    // for the batch to finish first before querying (or return not-ready if not waiting).
>+    ANGLE_TRY(renderer->checkCompletedCommands(contextVk));
>+    if (renderer->isSerialInUse(mQueryHelper.getStoredQueueSerial()))
>+    {
>+        if (!wait)
>+        {
>+            return angle::Result::Continue;
>+        }
>+        ANGLE_TRY(renderer->finishToSerial(contextVk, mQueryHelper.getStoredQueueSerial()));
>+    }
>+
>+    VkQueryResultFlags flags = (wait ? VK_QUERY_RESULT_WAIT_BIT : 0) | VK_QUERY_RESULT_64_BIT;
>+
>+    VkResult result = mQueryHelper.getQueryPool()->getResults(
>+        contextVk->getDevice(), mQueryHelper.getQuery(), 1, sizeof(mCachedResult), &mCachedResult,
>+        sizeof(mCachedResult), flags);
>+    // If the results are not ready, do nothing.  mCachedResultValid remains false.
>+    if (result == VK_NOT_READY)
>+    {
>+        // If VK_QUERY_RESULT_WAIT_BIT was given, VK_NOT_READY cannot have been returned.
>+        ASSERT(!wait);
>+        return angle::Result::Continue;
>+    }
>+    ANGLE_VK_TRY(contextVk, result);
> 
>-gl::Error QueryVk::getResult(GLint *params)
>+    double timestampPeriod = renderer->getPhysicalDeviceProperties().limits.timestampPeriod;
>+
>+    // Fix up the results to what OpenGL expects.
>+    switch (getType())
>+    {
>+        case gl::QueryType::AnySamples:
>+        case gl::QueryType::AnySamplesConservative:
>+            // OpenGL query result in these cases is binary
>+            mCachedResult = !!mCachedResult;
>+            break;
>+        case gl::QueryType::Timestamp:
>+            mCachedResult = static_cast<uint64_t>(mCachedResult * timestampPeriod);
>+            break;
>+        case gl::QueryType::TimeElapsed:
>+        {
>+            uint64_t timeElapsedEnd = mCachedResult;
>+
>+            result = mQueryHelperTimeElapsedBegin.getQueryPool()->getResults(
>+                contextVk->getDevice(), mQueryHelperTimeElapsedBegin.getQuery(), 1,
>+                sizeof(mCachedResult), &mCachedResult, sizeof(mCachedResult), flags);
>+            // Since the result of the end query of time-elapsed is already available, the
>+            // result of begin query must be available too.
>+            ASSERT(result != VK_NOT_READY);
>+            ANGLE_VK_TRY(contextVk, result);
>+
>+            mCachedResult = timeElapsedEnd - mCachedResult;
>+            mCachedResult = static_cast<uint64_t>(mCachedResult * timestampPeriod);
>+
>+            break;
>+        }
>+        default:
>+            UNREACHABLE();
>+            break;
>+    }
>+
>+    mCachedResultValid = true;
>+    return angle::Result::Continue;
>+}
>+angle::Result QueryVk::getResult(const gl::Context *context, GLint *params)
> {
>-    UNIMPLEMENTED();
>-    return gl::InternalError();
>+    ANGLE_TRY(getResult(context, true));
>+    *params = static_cast<GLint>(mCachedResult);
>+    return angle::Result::Continue;
> }
> 
>-gl::Error QueryVk::getResult(GLuint *params)
>+angle::Result QueryVk::getResult(const gl::Context *context, GLuint *params)
> {
>-    UNIMPLEMENTED();
>-    return gl::InternalError();
>+    ANGLE_TRY(getResult(context, true));
>+    *params = static_cast<GLuint>(mCachedResult);
>+    return angle::Result::Continue;
> }
> 
>-gl::Error QueryVk::getResult(GLint64 *params)
>+angle::Result QueryVk::getResult(const gl::Context *context, GLint64 *params)
> {
>-    UNIMPLEMENTED();
>-    return gl::InternalError();
>+    ANGLE_TRY(getResult(context, true));
>+    *params = static_cast<GLint64>(mCachedResult);
>+    return angle::Result::Continue;
> }
> 
>-gl::Error QueryVk::getResult(GLuint64 *params)
>+angle::Result QueryVk::getResult(const gl::Context *context, GLuint64 *params)
> {
>-    UNIMPLEMENTED();
>-    return gl::InternalError();
>+    ANGLE_TRY(getResult(context, true));
>+    *params = mCachedResult;
>+    return angle::Result::Continue;
> }
> 
>-gl::Error QueryVk::isResultAvailable(bool *available)
>+angle::Result QueryVk::isResultAvailable(const gl::Context *context, bool *available)
> {
>-    UNIMPLEMENTED();
>-    return gl::InternalError();
>+    ANGLE_TRY(getResult(context, false));
>+    *available = mCachedResultValid;
>+
>+    return angle::Result::Continue;
> }
> 
> }  // namespace rx
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/QueryVk.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/QueryVk.h
>index 7c9273400a4..e52d5afd505 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/QueryVk.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/QueryVk.h
>@@ -11,6 +11,7 @@
> #define LIBANGLE_RENDERER_VULKAN_QUERYVK_H_
> 
> #include "libANGLE/renderer/QueryImpl.h"
>+#include "libANGLE/renderer/vulkan/vk_helpers.h"
> 
> namespace rx
> {
>@@ -18,17 +19,29 @@ namespace rx
> class QueryVk : public QueryImpl
> {
>   public:
>-    QueryVk(GLenum type);
>+    QueryVk(gl::QueryType type);
>     ~QueryVk() override;
> 
>-    gl::Error begin() override;
>-    gl::Error end() override;
>-    gl::Error queryCounter() override;
>-    gl::Error getResult(GLint *params) override;
>-    gl::Error getResult(GLuint *params) override;
>-    gl::Error getResult(GLint64 *params) override;
>-    gl::Error getResult(GLuint64 *params) override;
>-    gl::Error isResultAvailable(bool *available) override;
>+    void onDestroy(const gl::Context *context) override;
>+
>+    angle::Result begin(const gl::Context *context) override;
>+    angle::Result end(const gl::Context *context) override;
>+    angle::Result queryCounter(const gl::Context *context) override;
>+    angle::Result getResult(const gl::Context *context, GLint *params) override;
>+    angle::Result getResult(const gl::Context *context, GLuint *params) override;
>+    angle::Result getResult(const gl::Context *context, GLint64 *params) override;
>+    angle::Result getResult(const gl::Context *context, GLuint64 *params) override;
>+    angle::Result isResultAvailable(const gl::Context *context, bool *available) override;
>+
>+  private:
>+    angle::Result getResult(const gl::Context *context, bool wait);
>+
>+    // Used for AnySamples, AnySamplesConservative, Timestamp and TimeElapsed (end)
>+    vk::QueryHelper mQueryHelper;
>+    // An additional query used for TimeElapsed (begin), as it is implemented using Timestamp
>+    vk::QueryHelper mQueryHelperTimeElapsedBegin;
>+    uint64_t mCachedResult;
>+    bool mCachedResultValid;
> };
> 
> }  // namespace rx
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/README.md b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/README.md
>new file mode 100644
>index 00000000000..f615a611d8e
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/README.md
>@@ -0,0 +1,245 @@
>+# ANGLE: Vulkan Back-end
>+
>+ANGLE's Vulkan back-end implementation lives in this folder.
>+
>+[Vulkan](https://www.khronos.org/vulkan/) is an explicit graphics API. It has a lot in common with
>+other explicit APIs such as Microsoft's [D3D12][D3D12 Guide] and Apple's
>+[Metal](https://developer.apple.com/metal/). Compared to APIs like OpenGL or D3D11 explicit APIs can
>+offer a number of significant benefits:
>+
>+ * Lower API call CPU overhead.
>+ * A smaller API surface with more direct hardware control.
>+ * Better support for multi-core programming.
>+ * Vulkan in particular has open-source tooling and tests.
>+
>+[D3D12 Guide]: https://docs.microsoft.com/en-us/windows/desktop/direct3d12/directx-12-programming-guide
>+
>+[TOC]
>+
>+## Back-end Design
>+
>+The [RendererVk](RendererVk.cpp) is a singleton. RendererVk owns shared global resources like the
>+[VkDevice][VkDevice], [VkQueue][VkQueue], the [Vulkan format tables](vk_format_utils.h) and
>+[internal Vulkan shaders](shaders). The back-end creates a new [ContextVk](ContextVk.cpp) instance
>+to manage each allocated OpenGL Context. ContextVk processes state changes and handles action
>+commands like `glDrawArrays` and `glDrawElements`.
>+
>+### Fast OpenGL State Transitions
>+
>+Typical OpenGL programs issue a few small state change commands between draw call commands. We want
>+the typical app's use case to be as fast as possible so this leads to unique performance challenges.
>+
>+Vulkan in quite different from OpenGL because it requires a separate compiled
>+[VkPipeline][VkPipeline] for each state vector. Compiling VkPipelines is multiple orders of
>+magnitude slower than enabling or disabling an OpenGL render state. To speed this up we use three
>+levels of caching when transitioning states in the Vulkan back-end.
>+
>+The first level is the driver's [VkPipelineCache][VkPipelineCache]. The driver
>+cache reduces pipeline recompilation time significantly. But even cached
>+pipeline recompilations are orders of manitude slower than OpenGL state changes.
>+
>+The second level cache is an ANGLE-owned hash map from OpenGL state vectors to compiled pipelines.
>+See [GraphicsPipelineCache][GraphicsPipelineCache] in [vk_cache_utils.h](vk_cache_utils.h). ANGLE's
>+[GraphicsPipelineDesc][GraphicsPipelineDesc] class is a tightly packed 256-byte description of the
>+current OpenGL rendering state. We also use a [xxHash](https://github.com/Cyan4973/xxHash) for the
>+fastest possible hash computation. The hash map speeds up state changes considerably. But it is
>+still significantly slower than OpenGL implementations.
>+
>+To get best performance we use a transition table from each OpenGL state vector to neighbouring
>+state vectors. The transition table points from GraphicsPipelineCache entries directly to
>+neighbouring VkPipeline objects. When the application changes state the state change bits are
>+recorded into a compact bit mask that covers the GraphicsPipelineDesc state vector. Then on the next
>+draw call we scan the transition bit mask and compare the GraphicsPipelineDesc of the current state
>+vector and the state vector of the cached transition. With the hash map we compute a hash over the
>+entire state vector and then do a 256-byte `memcmp` to guard against hash collisions. With the
>+transition table we will only compare as many bytes as were changed in the transition bit mask. By
>+skipping the expensive hashing and `memcmp` we can get as good or faster performance than native
>+OpenGL drivers.
>+
>+Note that the current design of the transition table stores transitions in an unsorted list. If
>+applications map from one state to many this will slow down the transition time. This could be
>+improved in the future using a faster look up. For instance we could keep a sorted transition table
>+or use a small hash map for transitions.
>+
>+[VkDevice]: https://www.khronos.org/registry/vulkan/specs/1.1-extensions/man/html/VkDevice.html
>+[VkQueue]: https://www.khronos.org/registry/vulkan/specs/1.1-extensions/man/html/VkQueue.html
>+[VkPipeline]: https://www.khronos.org/registry/vulkan/specs/1.1-extensions/man/html/VkPipeline.html
>+[VkPipelineCache]: https://www.khronos.org/registry/vulkan/specs/1.1-extensions/man/html/VkPipelineCache.html
>+[GraphicsPipelineCache]: https://chromium.googlesource.com/angle/angle/+/225f08bf85a368f905362cdd1366e4795680452c/src/libANGLE/renderer/vulkan/vk_cache_utils.h#498
>+[GraphicsPipelineDesc]: https://chromium.googlesource.com/angle/angle/+/225f08bf85a368f905362cdd1366e4795680452c/src/libANGLE/renderer/vulkan/vk_cache_utils.h#244
>+
>+### Shader Module Compilation
>+
>+ANGLE converts application shaders into Vulkan [VkShaderModules][VkShaderModule] through a series
>+of steps:
>+
>+1. **ANGLE Internal Translation**: The initial calls to `glCompileShader` are passed to the [ANGLE
>+shader translator][translator]. The translator compiles application shaders into Vulkan-compatible
>+GLSL. Vulkan-compatible GLSL matches the [GL_KHR_vulkan_glsl][GL_KHR_vulkan_glsl] extension spec
>+with some additional workarounds and emulation. We emulate OpenGL's different depth range, viewport
>+y flipping, default uniforms, and OpenGL [line segment
>+rasterization](#opengl-line-segment-rasterization). For more info see
>+[TranslatorVulkan.cpp][TranslatorVulkan.cpp]. After initial compilation the shaders are not
>+complete. They are templated with markers that are filled in later at link time.
>+
>+1. **Link-Time Translation**: During a call to `glLinkProgram` the Vulkan back-end can know the
>+necessary locations and properties to write to connect the shader stage interfaces. We get the
>+completed shader source using ANGLE's [GlslangWrapper][GlslangWrapper.cpp] helper class. We still
>+cannot generate `VkShaderModules` since some ANGLE features like [OpenGL line
>+rasterization](#opengl-line-segment-rasterization) emulation depend on draw-time information.
>+
>+1. **Draw-time SPIR-V Generation**: Once the application records a draw call we use Khronos'
>+[glslang][glslang] to convert the Vulkan-compatible GLSL into SPIR-V with the correct draw-time
>+defines. The SPIR-V is then compiled into `VkShaderModules`. For details please see
>+[GlslangWrapper.cpp][GlslangWrapper.cpp]. The `VkShaderModules` are then used by `VkPipelines`. Note
>+that we currently don't use [SPIRV-Tools][SPIRV-Tools] to perform any SPIR-V optimization. This
>+could be something to improve on in the future.
>+
>+See the below diagram for a high-level view of the shader translation flow:
>+
>+
>+
>+![Vulkan Shader Translation Flow](https://raw.githubusercontent.com/google/angle/master/src/libANGLE/renderer/vulkan/doc/img/VulkanShaderTranslation.svg?sanitize=true)
>+
>+[VkShaderModule]: https://www.khronos.org/registry/vulkan/specs/1.1-extensions/man/html/VkShaderModule.html
>+[translator]: https://chromium.googlesource.com/angle/angle/+/refs/heads/master/src/compiler/translator/
>+[GL_KHR_vulkan_glsl]: https://github.com/KhronosGroup/GLSL/blob/master/extensions/khr/GL_KHR_vulkan_glsl.txt
>+[TranslatorVulkan.cpp]: https://chromium.googlesource.com/angle/angle/+/refs/heads/master/src/compiler/translator/TranslatorVulkan.cpp
>+[glslang]: https://github.com/KhronosGroup/glslang
>+[GlslangWrapper.cpp]: https://chromium.googlesource.com/angle/angle/+/refs/heads/master/src/libANGLE/renderer/vulkan/GlslangWrapper.cpp
>+[SPIRV-Tools]: https://github.com/KhronosGroup/SPIRV-Tools
>+
>+### OpenGL Line Segment Rasterization
>+
>+OpenGL and Vulkan both render line segments as a series of pixels between two points. They differ in
>+which pixels cover the line.
>+
>+For single sample rendering Vulkan uses an algorithm based on quad coverage. A small shape is
>+extruded around the line segment. Samples covered by the shape then represent the line segment. See
>+[the Vulkan spec][VulkanLineRaster] for more details.
>+
>+OpenGL's algorithm is based on [Bresenham's line algorithm][Bresenham]. Bresenham's algorithm
>+selects pixels on the line between the two segment points. Note Bresenham's does not support
>+multisampling. When compared visually you can see the Vulkan line segment rasterization algorithm
>+always selects a superset of the line segment pixels rasterized in OpenGL. See this example:
>+
>+![Vulkan vs OpenGL Line Rasterization][VulkanVsGLLineRaster]
>+
>+The OpenGL spec defines a "diamond-exit" rule to select fragments on a line. Please refer to the 2.0
>+spec section 3.4.1 "Basic Line Segment Rasterization" spec for more details. To implement this rule
>+we inject a small computation to test if a pixel falls within the diamond in the start of the pixel
>+shader. If the pixel fails the diamond test we discard the fragment. Note that we only perform this
>+test when drawing lines. See the section on [Shader Compilation](#shader-module-compilation) for
>+more info. See the below diagram for an illustration of the diamond rule:
>+
>+![OpenGL Diamond Rule Example][DiamondRule]
>+
>+We can implement the OpenGL test by checking the intersection of the line and the medial axes of the
>+pixel `p`. If the length of the line segment between intersections `p` and the point center is
>+greater than a half-pixel for all possible `p` then the pixel is not on the segment. To solve for
>+`p` we use the pixel center `a` given by `gl_FragCoord` and the projection of `a` onto the line
>+segment `b` given by the interpolated `gl_Position`. Since `gl_Position` is not available in the
>+fragment shader we must add an internal position varying when drawing lines.
>+
>+The full code derivation is omitted for brevity. It reduces to the following shader snippet:
>+
>+```vec2 position = PositionVarying.xy / PositionVarying.w;
>+vec2 b = ((position * 0.5) + 0.5) * gl_Viewport.zw + gl_Viewport.xy;
>+vec2 ba = abs(b - gl_FragCoord.xy);
>+vec2 ba2 = 2.0 * (ba * ba);
>+vec2 bp = ba2 + ba2.yx - ba;
>+if (bp.x > epsilon && bp.y > epsilon)
>+    discard;
>+```
>+
>+Note that we must also pass the viewport size as an internal uniform. We use a small epsilon value
>+to correct for cases when the line segment is perfectly parallel or perpendicular to the window. For
>+code please see [TranslatorVulkan.cpp][TranslatorVulkan.cpp] under
>+`AddLineSegmentRasterizationEmulation`.
>+
>+[VulkanLineRaster]: https://www.khronos.org/registry/vulkan/specs/1.1/html/chap24.html#primsrast-lines-basic
>+[Bresenham]: https://en.wikipedia.org/wiki/Bresenham%27s_line_algorithm
>+[VulkanVsGLLineRaster]: doc/img/LineRasterComparison.gif
>+[DiamondRule]: doc/img/LineRasterPixelExample.png
>+
>+### Format Tables and Format Emulation
>+
>+#### Overrides and Fallbacks
>+
>+The [required Vulkan format support][VulkanRequiredSupport] tables do not implement the full set of
>+formats needed for OpenGL conformance with extensions. ANGLE emulates missing formats using *format
>+overrides* and *format fallbacks*.
>+
>+An *override* implements a missing GL format with a required format in all cases. For example, the
>+luminance texture format `L8_UNORM` does not exist in Vulkan. We override `L8_UNORM` with the
>+required image format `R8_UNORM`.
>+
>+A *fallback* is one or more non-required formats ANGLE checks for support at runtime. For example,
>+`R8_UNORM` is not a required vertex buffer format. Some drivers do support `R8_UNORM` for vertex
>+buffers. So at runtime we check for sampled image support and fall back to `R32_FLOAT` if `R8_UNORM`
>+is not supported.
>+
>+#### The Vulkan Format Table
>+
>+Overrides and fallbacks are implemented in ANGLE's [Vulkan format
>+table][vk_format_table_autogen.cpp]. The table is auto-generated by
>+[`gen_vk_format_table.py`](gen_vk_format_table.py). We store the mapping from
>+[`angle::Format::ID`](../FormatID_autogen.h) to [VkFormat][VkFormat] in
>+[`vk_format_map.json`](vk_format_map.json). The format map also lists the overrides and fallbacks.
>+To update the tables please modify the format map JSON and then run
>+[`scripts/run_code_generation.py`][RunCodeGeneration].
>+
>+The [`vk::Format`](vk_format_utils.h) class describes the information ANGLE needs for a particular
>+`VkFormat`. The 'ANGLE' format ID is a reference to the front-end format. The 'Image' or 'Buffer'
>+format are the native Vulkan formats that implement a particular front-end format for `VkImages` and
>+`VkBuffers`. For the above example of `R8_UNORM` overriding `L8_UNORM`, `L8_UNORM` is the ANGLE
>+format and `R8_UNORM` is the Image format.
>+
>+For more information please see the source files.
>+
>+[VulkanRequiredSupport]: https://renderdoc.org/vkspec_chunked/chap37.html#features-required-format-support
>+[VkFormat]: https://renderdoc.org/vkspec_chunked/chap37.html#VkFormat
>+[RunCodeGeneration]: ../../../../scripts/run_code_generation.py
>\ No newline at end of file
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/RenderTargetVk.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/RenderTargetVk.cpp
>index b559320ab71..854130d75bb 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/RenderTargetVk.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/RenderTargetVk.cpp
>@@ -9,17 +9,185 @@
> 
> #include "libANGLE/renderer/vulkan/RenderTargetVk.h"
> 
>+#include "libANGLE/renderer/vulkan/CommandGraph.h"
>+#include "libANGLE/renderer/vulkan/TextureVk.h"
>+#include "libANGLE/renderer/vulkan/vk_format_utils.h"
>+#include "libANGLE/renderer/vulkan/vk_helpers.h"
>+
> namespace rx
> {
>-
> RenderTargetVk::RenderTargetVk()
>-    : format(nullptr),
>-      image(nullptr),
>-      imageView(nullptr),
>-      extents(),
>-      samples(VK_SAMPLE_COUNT_1_BIT),
>-      resource(nullptr)
>+    : mImage(nullptr), mImageView(nullptr), mLevelIndex(0), mLayerIndex(0), mOwner(nullptr)
>+{}
>+
>+RenderTargetVk::~RenderTargetVk() {}
>+
>+RenderTargetVk::RenderTargetVk(RenderTargetVk &&other)
>+    : mImage(other.mImage),
>+      mImageView(other.mImageView),
>+      mLevelIndex(other.mLevelIndex),
>+      mLayerIndex(other.mLayerIndex),
>+      mOwner(other.mOwner)
>+{}
>+
>+void RenderTargetVk::init(vk::ImageHelper *image,
>+                          vk::ImageView *imageView,
>+                          size_t levelIndex,
>+                          size_t layerIndex,
>+                          TextureVk *owner)
>+{
>+    mImage      = image;
>+    mImageView  = imageView;
>+    mLevelIndex = levelIndex;
>+    mLayerIndex = layerIndex;
>+    mOwner      = owner;
>+}
>+
>+void RenderTargetVk::reset()
>+{
>+    mImage      = nullptr;
>+    mImageView  = nullptr;
>+    mLevelIndex = 0;
>+    mLayerIndex = 0;
>+    mOwner      = nullptr;
>+}
>+
>+angle::Result RenderTargetVk::onColorDraw(ContextVk *contextVk,
>+                                          vk::FramebufferHelper *framebufferVk,
>+                                          vk::CommandBuffer *commandBuffer,
>+                                          vk::RenderPassDesc *renderPassDesc)
>+{
>+    ASSERT(commandBuffer->valid());
>+    ASSERT(!mImage->getFormat().imageFormat().hasDepthOrStencilBits());
>+
>+    // Store the attachment info in the renderPassDesc.
>+    renderPassDesc->packAttachment(mImage->getFormat());
>+
>+    ANGLE_TRY(ensureImageInitialized(contextVk));
>+
>+    // TODO(jmadill): Use automatic layout transition. http://anglebug.com/2361
>+    mImage->changeLayout(VK_IMAGE_ASPECT_COLOR_BIT, vk::ImageLayout::ColorAttachment,
>+                         commandBuffer);
>+
>+    // Set up dependencies between the RT resource and the Framebuffer.
>+    mImage->addWriteDependency(framebufferVk);
>+
>+    return angle::Result::Continue;
>+}
>+
>+angle::Result RenderTargetVk::onDepthStencilDraw(ContextVk *contextVk,
>+                                                 vk::FramebufferHelper *framebufferVk,
>+                                                 vk::CommandBuffer *commandBuffer,
>+                                                 vk::RenderPassDesc *renderPassDesc)
> {
>+    ASSERT(commandBuffer->valid());
>+    ASSERT(mImage->getFormat().imageFormat().hasDepthOrStencilBits());
>+
>+    // Store the attachment info in the renderPassDesc.
>+    renderPassDesc->packAttachment(mImage->getFormat());
>+
>+    // TODO(jmadill): Use automatic layout transition. http://anglebug.com/2361
>+    const angle::Format &format    = mImage->getFormat().imageFormat();
>+    VkImageAspectFlags aspectFlags = vk::GetDepthStencilAspectFlags(format);
>+
>+    ANGLE_TRY(ensureImageInitialized(contextVk));
>+
>+    mImage->changeLayout(aspectFlags, vk::ImageLayout::DepthStencilAttachment, commandBuffer);
>+
>+    // Set up dependencies between the RT resource and the Framebuffer.
>+    mImage->addWriteDependency(framebufferVk);
>+
>+    return angle::Result::Continue;
>+}
>+
>+vk::ImageHelper &RenderTargetVk::getImage()
>+{
>+    ASSERT(mImage && mImage->valid());
>+    return *mImage;
>+}
>+
>+const vk::ImageHelper &RenderTargetVk::getImage() const
>+{
>+    ASSERT(mImage && mImage->valid());
>+    return *mImage;
>+}
>+
>+vk::ImageView *RenderTargetVk::getDrawImageView() const
>+{
>+    ASSERT(mImageView && mImageView->valid());
>+    return mImageView;
>+}
>+
>+vk::ImageView *RenderTargetVk::getReadImageView() const
>+{
>+    return getDrawImageView();
>+}
>+
>+const vk::Format &RenderTargetVk::getImageFormat() const
>+{
>+    ASSERT(mImage && mImage->valid());
>+    return mImage->getFormat();
>+}
>+
>+gl::Extents RenderTargetVk::getExtents() const
>+{
>+    ASSERT(mImage && mImage->valid());
>+    return mImage->getLevelExtents2D(mLevelIndex);
>+}
>+
>+void RenderTargetVk::updateSwapchainImage(vk::ImageHelper *image, vk::ImageView *imageView)
>+{
>+    ASSERT(image && image->valid() && imageView && imageView->valid());
>+    mImage     = image;
>+    mImageView = imageView;
>+    mOwner     = nullptr;
>+}
>+
>+vk::ImageHelper *RenderTargetVk::getImageForRead(vk::CommandGraphResource *readingResource,
>+                                                 vk::ImageLayout layout,
>+                                                 vk::CommandBuffer *commandBuffer)
>+{
>+    ASSERT(mImage && mImage->valid());
>+
>+    // TODO(jmadill): Better simultaneous resource access. http://anglebug.com/2679
>+    //
>+    // A better alternative would be:
>+    //
>+    // if (mImage->isLayoutChangeNecessary(layout)
>+    // {
>+    //     vk::CommandBuffer *srcLayoutChange;
>+    //     ANGLE_TRY(mImage->recordCommands(contextVk, &srcLayoutChange));
>+    //     mImage->changeLayout(mImage->getAspectFlags(), layout, srcLayoutChange);
>+    // }
>+    // mImage->addReadDependency(readingResource);
>+    //
>+    // I.e. the transition should happen on a node generated from mImage itself.
>+    // However, this needs context to be available here, or all call sites changed
>+    // to perform the layout transition and set the dependency.
>+    mImage->addWriteDependency(readingResource);
>+
>+    mImage->changeLayout(mImage->getAspectFlags(), layout, commandBuffer);
>+
>+    return mImage;
>+}
>+
>+vk::ImageHelper *RenderTargetVk::getImageForWrite(vk::CommandGraphResource *writingResource) const
>+{
>+    ASSERT(mImage && mImage->valid());
>+    mImage->addWriteDependency(writingResource);
>+    return mImage;
>+}
>+
>+angle::Result RenderTargetVk::ensureImageInitialized(ContextVk *contextVk)
>+{
>+    if (mOwner)
>+    {
>+        // If the render target source is a texture, make sure the image is initialized and its
>+        // staged updates flushed.
>+        return mOwner->ensureImageInitialized(contextVk);
>+    }
>+
>+    return angle::Result::Continue;
> }
> 
> }  // namespace rx
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/RenderTargetVk.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/RenderTargetVk.h
>index 6de9e07bad7..de816e2fa58 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/RenderTargetVk.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/RenderTargetVk.h
>@@ -13,32 +13,87 @@
> #include <vulkan/vulkan.h>
> 
> #include "libANGLE/FramebufferAttachment.h"
>+#include "libANGLE/renderer/renderer_utils.h"
>+#include "libANGLE/renderer/vulkan/vk_helpers.h"
> 
> namespace rx
> {
>-class ResourceVk;
>-
> namespace vk
> {
> struct Format;
>-class Image;
>+class FramebufferHelper;
>+class ImageHelper;
> class ImageView;
>-}
>+class CommandGraphResource;
>+class RenderPassDesc;
>+}  // namespace vk
>+
>+class ContextVk;
>+class TextureVk;
> 
> // This is a very light-weight class that does not own to the resources it points to.
> // It's meant only to copy across some information from a FramebufferAttachment to the
>-// business rendering logic.
>+// business rendering logic. It stores Images and ImageViews by pointer for performance.
> class RenderTargetVk final : public FramebufferAttachmentRenderTarget
> {
>   public:
>     RenderTargetVk();
>+    ~RenderTargetVk() override;
>+
>+    // Used in std::vector initialization.
>+    RenderTargetVk(RenderTargetVk &&other);
>+
>+    void init(vk::ImageHelper *image,
>+              vk::ImageView *imageView,
>+              size_t levelIndex,
>+              size_t layerIndex,
>+              TextureVk *owner);
>+    void reset();
>+
>+    // Note: RenderTargets should be called in order, with the depth/stencil onRender last.
>+    angle::Result onColorDraw(ContextVk *contextVk,
>+                              vk::FramebufferHelper *framebufferVk,
>+                              vk::CommandBuffer *commandBuffer,
>+                              vk::RenderPassDesc *renderPassDesc);
>+    angle::Result onDepthStencilDraw(ContextVk *contextVk,
>+                                     vk::FramebufferHelper *framebufferVk,
>+                                     vk::CommandBuffer *commandBuffer,
>+                                     vk::RenderPassDesc *renderPassDesc);
>+
>+    vk::ImageHelper &getImage();
>+    const vk::ImageHelper &getImage() const;
>+
>+    // getImageForRead will also transition the resource to the given layout.
>+    vk::ImageHelper *getImageForRead(vk::CommandGraphResource *readingResource,
>+                                     vk::ImageLayout layout,
>+                                     vk::CommandBuffer *commandBuffer);
>+    vk::ImageHelper *getImageForWrite(vk::CommandGraphResource *writingResource) const;
>+
>+    vk::ImageView *getDrawImageView() const;
>+    vk::ImageView *getReadImageView() const;
>+
>+    const vk::Format &getImageFormat() const;
>+    gl::Extents getExtents() const;
>+    size_t getLevelIndex() const { return mLevelIndex; }
>+    size_t getLayerIndex() const { return mLayerIndex; }
>+
>+    // Special mutator for Surface RenderTargets. Allows the Framebuffer to keep a single
>+    // RenderTargetVk pointer.
>+    void updateSwapchainImage(vk::ImageHelper *image, vk::ImageView *imageView);
>+
>+    angle::Result ensureImageInitialized(ContextVk *contextVk);
>+
>+  private:
>+    vk::ImageHelper *mImage;
>+    // Note that the draw and read image views are the same, given the requirements of a render
>+    // target.
>+    vk::ImageView *mImageView;
>+    size_t mLevelIndex;
>+    size_t mLayerIndex;
> 
>-    const vk::Format *format;
>-    vk::Image *image;
>-    vk::ImageView *imageView;
>-    gl::Extents extents;
>-    VkSampleCountFlagBits samples;
>-    ResourceVk *resource;
>+    // If owned by the texture, this will be non-nullptr, and is used to ensure texture changes
>+    // are flushed.
>+    TextureVk *mOwner;
> };
> 
> }  // namespace rx
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/RenderbufferVk.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/RenderbufferVk.cpp
>index af79eada857..3e911b8cf61 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/RenderbufferVk.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/RenderbufferVk.cpp
>@@ -9,58 +9,183 @@
> 
> #include "libANGLE/renderer/vulkan/RenderbufferVk.h"
> 
>-#include "common/debug.h"
>+#include "libANGLE/Context.h"
>+#include "libANGLE/Image.h"
>+#include "libANGLE/renderer/vulkan/ContextVk.h"
>+#include "libANGLE/renderer/vulkan/ImageVk.h"
>+#include "libANGLE/renderer/vulkan/RendererVk.h"
> 
> namespace rx
> {
>+RenderbufferVk::RenderbufferVk(const gl::RenderbufferState &state)
>+    : RenderbufferImpl(state), mOwnsImage(false), mImage(nullptr)
>+{}
> 
>-RenderbufferVk::RenderbufferVk() : RenderbufferImpl()
>+RenderbufferVk::~RenderbufferVk() {}
>+
>+void RenderbufferVk::onDestroy(const gl::Context *context)
>+{
>+    ContextVk *contextVk = vk::GetImpl(context);
>+    RendererVk *renderer = contextVk->getRenderer();
>+    releaseAndDeleteImage(context, renderer);
>+}
>+
>+angle::Result RenderbufferVk::setStorage(const gl::Context *context,
>+                                         GLenum internalformat,
>+                                         size_t width,
>+                                         size_t height)
>+{
>+    ContextVk *contextVk       = vk::GetImpl(context);
>+    RendererVk *renderer       = contextVk->getRenderer();
>+    const vk::Format &vkFormat = renderer->getFormat(internalformat);
>+
>+    if (!mOwnsImage)
>+    {
>+        releaseAndDeleteImage(context, renderer);
>+    }
>+
>+    if (mImage != nullptr && mImage->valid())
>+    {
>+        // Check against the state if we need to recreate the storage.
>+        if (internalformat != mState.getFormat().info->internalFormat ||
>+            static_cast<GLsizei>(width) != mState.getWidth() ||
>+            static_cast<GLsizei>(height) != mState.getHeight())
>+        {
>+            releaseImage(context, renderer);
>+        }
>+    }
>+
>+    if ((mImage == nullptr || !mImage->valid()) && (width != 0 && height != 0))
>+    {
>+        if (mImage == nullptr)
>+        {
>+            mImage     = new vk::ImageHelper();
>+            mOwnsImage = true;
>+        }
>+
>+        const angle::Format &textureFormat = vkFormat.imageFormat();
>+        bool isDepthOrStencilFormat = textureFormat.depthBits > 0 || textureFormat.stencilBits > 0;
>+        const VkImageUsageFlags usage =
>+            VK_IMAGE_USAGE_TRANSFER_DST_BIT | VK_IMAGE_USAGE_TRANSFER_SRC_BIT |
>+            VK_IMAGE_USAGE_SAMPLED_BIT |
>+            (textureFormat.redBits > 0 ? VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT : 0) |
>+            (isDepthOrStencilFormat ? VK_IMAGE_USAGE_DEPTH_STENCIL_ATTACHMENT_BIT : 0);
>+
>+        gl::Extents extents(static_cast<int>(width), static_cast<int>(height), 1);
>+        ANGLE_TRY(mImage->init(contextVk, gl::TextureType::_2D, extents, vkFormat, 1, usage, 1, 1));
>+
>+        VkMemoryPropertyFlags flags = VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT;
>+        ANGLE_TRY(mImage->initMemory(contextVk, renderer->getMemoryProperties(), flags));
>+
>+        VkImageAspectFlags aspect = vk::GetFormatAspectFlags(textureFormat);
>+
>+        // Note that LUMA textures are not color-renderable, so a read-view with swizzle is not
>+        // needed.
>+        ANGLE_TRY(mImage->initImageView(contextVk, gl::TextureType::_2D, aspect, gl::SwizzleState(),
>+                                        &mImageView, 0, 1));
>+
>+        // Clear the renderbuffer if it has emulated channels.
>+        ANGLE_TRY(mImage->clearIfEmulatedFormat(vk::GetImpl(context), gl::ImageIndex::Make2D(0),
>+                                                vkFormat));
>+
>+        mRenderTarget.init(mImage, &mImageView, 0, 0, nullptr);
>+    }
>+
>+    return angle::Result::Continue;
>+}
>+
>+angle::Result RenderbufferVk::setStorageMultisample(const gl::Context *context,
>+                                                    size_t samples,
>+                                                    GLenum internalformat,
>+                                                    size_t width,
>+                                                    size_t height)
> {
>+    ANGLE_VK_UNREACHABLE(vk::GetImpl(context));
>+    return angle::Result::Stop;
> }
> 
>-RenderbufferVk::~RenderbufferVk()
>+angle::Result RenderbufferVk::setStorageEGLImageTarget(const gl::Context *context,
>+                                                       egl::Image *image)
> {
>+    ContextVk *contextVk = vk::GetImpl(context);
>+    RendererVk *renderer = contextVk->getRenderer();
>+
>+    releaseAndDeleteImage(context, renderer);
>+
>+    ImageVk *imageVk = vk::GetImpl(image);
>+    mImage           = imageVk->getImage();
>+    mOwnsImage       = false;
>+
>+    const vk::Format &vkFormat = renderer->getFormat(image->getFormat().info->sizedInternalFormat);
>+    const angle::Format &textureFormat = vkFormat.imageFormat();
>+
>+    VkImageAspectFlags aspect = vk::GetFormatAspectFlags(textureFormat);
>+
>+    // Transfer the image to this queue if needed
>+    uint32_t rendererQueueFamilyIndex = contextVk->getRenderer()->getQueueFamilyIndex();
>+    if (mImage->isQueueChangeNeccesary(rendererQueueFamilyIndex))
>+    {
>+        vk::CommandBuffer *commandBuffer = nullptr;
>+        ANGLE_TRY(mImage->recordCommands(contextVk, &commandBuffer));
>+        mImage->changeLayoutAndQueue(aspect, vk::ImageLayout::ColorAttachment,
>+                                     rendererQueueFamilyIndex, commandBuffer);
>+    }
>+
>+    ANGLE_TRY(mImage->initLayerImageView(contextVk, imageVk->getImageTextureType(), aspect,
>+                                         gl::SwizzleState(), &mImageView, imageVk->getImageLevel(),
>+                                         1, imageVk->getImageLayer(), 1));
>+
>+    mRenderTarget.init(mImage, &mImageView, imageVk->getImageLevel(), imageVk->getImageLayer(),
>+                       nullptr);
>+
>+    return angle::Result::Continue;
> }
> 
>-gl::Error RenderbufferVk::setStorage(const gl::Context *context,
>-                                     GLenum internalformat,
>-                                     size_t width,
>-                                     size_t height)
>+angle::Result RenderbufferVk::getAttachmentRenderTarget(const gl::Context *context,
>+                                                        GLenum binding,
>+                                                        const gl::ImageIndex &imageIndex,
>+                                                        FramebufferAttachmentRenderTarget **rtOut)
> {
>-    UNIMPLEMENTED();
>-    return gl::InternalError();
>+    ASSERT(mImage && mImage->valid());
>+    *rtOut = &mRenderTarget;
>+    return angle::Result::Continue;
> }
> 
>-gl::Error RenderbufferVk::setStorageMultisample(const gl::Context *context,
>-                                                size_t samples,
>-                                                GLenum internalformat,
>-                                                size_t width,
>-                                                size_t height)
>+angle::Result RenderbufferVk::initializeContents(const gl::Context *context,
>+                                                 const gl::ImageIndex &imageIndex)
> {
>-    UNIMPLEMENTED();
>-    return gl::InternalError();
>+    mImage->stageSubresourceRobustClear(imageIndex, mImage->getFormat().angleFormat());
>+    return mImage->flushAllStagedUpdates(vk::GetImpl(context));
> }
> 
>-gl::Error RenderbufferVk::setStorageEGLImageTarget(const gl::Context *context, egl::Image *image)
>+void RenderbufferVk::releaseOwnershipOfImage(const gl::Context *context)
> {
>-    UNIMPLEMENTED();
>-    return gl::InternalError();
>+    ContextVk *contextVk = vk::GetImpl(context);
>+    RendererVk *renderer = contextVk->getRenderer();
>+
>+    mOwnsImage = false;
>+    releaseAndDeleteImage(context, renderer);
> }
> 
>-gl::Error RenderbufferVk::getAttachmentRenderTarget(const gl::Context *context,
>-                                                    GLenum binding,
>-                                                    const gl::ImageIndex &imageIndex,
>-                                                    FramebufferAttachmentRenderTarget **rtOut)
>+void RenderbufferVk::releaseAndDeleteImage(const gl::Context *context, RendererVk *renderer)
> {
>-    UNIMPLEMENTED();
>-    return gl::InternalError();
>+    releaseImage(context, renderer);
>+    SafeDelete(mImage);
> }
> 
>-gl::Error RenderbufferVk::initializeContents(const gl::Context *context,
>-                                             const gl::ImageIndex &imageIndex)
>+void RenderbufferVk::releaseImage(const gl::Context *context, RendererVk *renderer)
> {
>-    UNIMPLEMENTED();
>-    return gl::NoError();
>+    if (mImage && mOwnsImage)
>+    {
>+        mImage->releaseImage(renderer);
>+        mImage->releaseStagingBuffer(renderer);
>+    }
>+    else
>+    {
>+        mImage = nullptr;
>+    }
>+
>+    renderer->releaseObject(renderer->getCurrentQueueSerial(), &mImageView);
> }
> 
> }  // namespace rx
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/RenderbufferVk.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/RenderbufferVk.h
>index 2034453bf85..57c6ccc7bd7 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/RenderbufferVk.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/RenderbufferVk.h
>@@ -11,6 +11,8 @@
> #define LIBANGLE_RENDERER_VULKAN_RENDERBUFFERVK_H_
> 
> #include "libANGLE/renderer/RenderbufferImpl.h"
>+#include "libANGLE/renderer/vulkan/RenderTargetVk.h"
>+#include "libANGLE/renderer/vulkan/vk_helpers.h"
> 
> namespace rx
> {
>@@ -18,27 +20,41 @@ namespace rx
> class RenderbufferVk : public RenderbufferImpl
> {
>   public:
>-    RenderbufferVk();
>+    RenderbufferVk(const gl::RenderbufferState &state);
>     ~RenderbufferVk() override;
> 
>-    gl::Error setStorage(const gl::Context *context,
>-                         GLenum internalformat,
>-                         size_t width,
>-                         size_t height) override;
>-    gl::Error setStorageMultisample(const gl::Context *context,
>-                                    size_t samples,
>-                                    GLenum internalformat,
>-                                    size_t width,
>-                                    size_t height) override;
>-    gl::Error setStorageEGLImageTarget(const gl::Context *context, egl::Image *image) override;
>-
>-    gl::Error getAttachmentRenderTarget(const gl::Context *context,
>-                                        GLenum binding,
>-                                        const gl::ImageIndex &imageIndex,
>-                                        FramebufferAttachmentRenderTarget **rtOut) override;
>-
>-    gl::Error initializeContents(const gl::Context *context,
>-                                 const gl::ImageIndex &imageIndex) override;
>+    void onDestroy(const gl::Context *context) override;
>+
>+    angle::Result setStorage(const gl::Context *context,
>+                             GLenum internalformat,
>+                             size_t width,
>+                             size_t height) override;
>+    angle::Result setStorageMultisample(const gl::Context *context,
>+                                        size_t samples,
>+                                        GLenum internalformat,
>+                                        size_t width,
>+                                        size_t height) override;
>+    angle::Result setStorageEGLImageTarget(const gl::Context *context, egl::Image *image) override;
>+
>+    angle::Result getAttachmentRenderTarget(const gl::Context *context,
>+                                            GLenum binding,
>+                                            const gl::ImageIndex &imageIndex,
>+                                            FramebufferAttachmentRenderTarget **rtOut) override;
>+
>+    angle::Result initializeContents(const gl::Context *context,
>+                                     const gl::ImageIndex &imageIndex) override;
>+
>+    vk::ImageHelper *getImage() const { return mImage; }
>+    void releaseOwnershipOfImage(const gl::Context *context);
>+
>+  private:
>+    void releaseAndDeleteImage(const gl::Context *context, RendererVk *renderer);
>+    void releaseImage(const gl::Context *context, RendererVk *renderer);
>+
>+    bool mOwnsImage;
>+    vk::ImageHelper *mImage;
>+    vk::ImageView mImageView;
>+    RenderTargetVk mRenderTarget;
> };
> 
> }  // namespace rx
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/RendererVk.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/RendererVk.cpp
>index f98f24216e4..df900f4da93 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/RendererVk.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/RendererVk.cpp
>@@ -10,57 +10,307 @@
> #include "libANGLE/renderer/vulkan/RendererVk.h"
> 
> // Placing this first seems to solve an intellisense bug.
>-#include "libANGLE/renderer/vulkan/renderervk_utils.h"
>+#include "libANGLE/renderer/vulkan/vk_utils.h"
> 
> #include <EGL/eglext.h>
> 
> #include "common/debug.h"
>+#include "common/platform.h"
> #include "common/system_utils.h"
>+#include "libANGLE/Context.h"
>+#include "libANGLE/Display.h"
> #include "libANGLE/renderer/driver_utils.h"
>+#include "libANGLE/renderer/vulkan/CommandGraph.h"
> #include "libANGLE/renderer/vulkan/CompilerVk.h"
>+#include "libANGLE/renderer/vulkan/ContextVk.h"
>+#include "libANGLE/renderer/vulkan/DisplayVk.h"
> #include "libANGLE/renderer/vulkan/FramebufferVk.h"
> #include "libANGLE/renderer/vulkan/GlslangWrapper.h"
>-#include "libANGLE/renderer/vulkan/TextureVk.h"
>+#include "libANGLE/renderer/vulkan/ProgramVk.h"
> #include "libANGLE/renderer/vulkan/VertexArrayVk.h"
>-#include "libANGLE/renderer/vulkan/formatutilsvk.h"
>+#include "libANGLE/renderer/vulkan/vk_caps_utils.h"
>+#include "libANGLE/renderer/vulkan/vk_format_utils.h"
> #include "platform/Platform.h"
>+#include "third_party/trace_event/trace_event.h"
>+
>+// Consts
>+namespace
>+{
>+const uint32_t kMockVendorID                              = 0xba5eba11;
>+const uint32_t kMockDeviceID                              = 0xf005ba11;
>+constexpr char kMockDeviceName[]                          = "Vulkan Mock Device";
>+constexpr size_t kInFlightCommandsLimit                   = 100u;
>+constexpr VkFormatFeatureFlags kInvalidFormatFeatureFlags = static_cast<VkFormatFeatureFlags>(-1);
>+constexpr size_t kDefaultPoolAllocatorPageSize            = 16 * 1024;
>+}  // anonymous namespace
> 
> namespace rx
> {
> 
> namespace
> {
>+// We currently only allocate 2 uniform buffer per descriptor set, one for the fragment shader and
>+// one for the vertex shader.
>+constexpr size_t kUniformBufferDescriptorsPerDescriptorSet = 2;
>+// Update the pipeline cache every this many swaps (if 60fps, this means every 10 minutes)
>+constexpr uint32_t kPipelineCacheVkUpdatePeriod = 10 * 60 * 60;
>+// Wait a maximum of 10s.  If that times out, we declare it a failure.
>+constexpr uint64_t kMaxFenceWaitTimeNs = 10'000'000'000llu;
>+// Per the Vulkan specification, as long as Vulkan 1.1+ is returned by vkEnumerateInstanceVersion,
>+// ANGLE must indicate the highest version of Vulkan functionality that it uses.  The Vulkan
>+// validation layers will issue messages for any core functionality that requires a higher version.
>+// This value must be increased whenever ANGLE starts using functionality from a newer core
>+// version of Vulkan.
>+constexpr uint32_t kPreferredVulkanAPIVersion = VK_API_VERSION_1_1;
>+
>+bool ShouldEnableMockICD(const egl::AttributeMap &attribs)
>+{
>+#if !defined(ANGLE_PLATFORM_ANDROID)
>+    // Mock ICD does not currently run on Android
>+    return (attribs.get(EGL_PLATFORM_ANGLE_DEVICE_TYPE_ANGLE,
>+                        EGL_PLATFORM_ANGLE_DEVICE_TYPE_HARDWARE_ANGLE) ==
>+            EGL_PLATFORM_ANGLE_DEVICE_TYPE_NULL_ANGLE);
>+#else
>+    return false;
>+#endif  // !defined(ANGLE_PLATFORM_ANDROID)
>+}
>+
>+bool StrLess(const char *a, const char *b)
>+{
>+    return strcmp(a, b) < 0;
>+}
>+
>+bool ExtensionFound(const char *needle, const RendererVk::ExtensionNameList &haystack)
>+{
>+    // NOTE: The list must be sorted.
>+    return std::binary_search(haystack.begin(), haystack.end(), needle, StrLess);
>+}
>+
>+VkResult VerifyExtensionsPresent(const RendererVk::ExtensionNameList &haystack,
>+                                 const RendererVk::ExtensionNameList &needles)
>+{
>+    // NOTE: The lists must be sorted.
>+    if (std::includes(haystack.begin(), haystack.end(), needles.begin(), needles.end(), StrLess))
>+    {
>+        return VK_SUCCESS;
>+    }
>+    for (const char *needle : needles)
>+    {
>+        if (!ExtensionFound(needle, haystack))
>+        {
>+            ERR() << "Extension not supported: " << needle;
>+        }
>+    }
>+    return VK_ERROR_EXTENSION_NOT_PRESENT;
>+}
>+
>+// Array of Validation error/warning messages that will be ignored, should include bugID
>+constexpr const char *kSkippedMessages[] = {
>+    // http://anglebug.com/2866
>+    "UNASSIGNED-CoreValidation-Shader-OutputNotConsumed",
>+    // http://anglebug.com/2796
>+    "UNASSIGNED-CoreValidation-Shader-PointSizeMissing",
>+};
>+
>+// Suppress validation errors that are known
>+//  return "true" if given code/prefix/message is known, else return "false"
>+bool IsIgnoredDebugMessage(const char *message)
>+{
>+    if (!message)
>+    {
>+        return false;
>+    }
>+    for (const char *msg : kSkippedMessages)
>+    {
>+        if (strstr(message, msg) != nullptr)
>+        {
>+            return true;
>+        }
>+    }
>+    return false;
>+}
>+
>+const char *GetVkObjectTypeName(VkObjectType type)
>+{
>+    switch (type)
>+    {
>+        case VK_OBJECT_TYPE_UNKNOWN:
>+            return "Unknown";
>+        case VK_OBJECT_TYPE_INSTANCE:
>+            return "Instance";
>+        case VK_OBJECT_TYPE_PHYSICAL_DEVICE:
>+            return "Physical Device";
>+        case VK_OBJECT_TYPE_DEVICE:
>+            return "Device";
>+        case VK_OBJECT_TYPE_QUEUE:
>+            return "Queue";
>+        case VK_OBJECT_TYPE_SEMAPHORE:
>+            return "Semaphore";
>+        case VK_OBJECT_TYPE_COMMAND_BUFFER:
>+            return "Command Buffer";
>+        case VK_OBJECT_TYPE_FENCE:
>+            return "Fence";
>+        case VK_OBJECT_TYPE_DEVICE_MEMORY:
>+            return "Device Memory";
>+        case VK_OBJECT_TYPE_BUFFER:
>+            return "Buffer";
>+        case VK_OBJECT_TYPE_IMAGE:
>+            return "Image";
>+        case VK_OBJECT_TYPE_EVENT:
>+            return "Event";
>+        case VK_OBJECT_TYPE_QUERY_POOL:
>+            return "Query Pool";
>+        case VK_OBJECT_TYPE_BUFFER_VIEW:
>+            return "Buffer View";
>+        case VK_OBJECT_TYPE_IMAGE_VIEW:
>+            return "Image View";
>+        case VK_OBJECT_TYPE_SHADER_MODULE:
>+            return "Shader Module";
>+        case VK_OBJECT_TYPE_PIPELINE_CACHE:
>+            return "Pipeline Cache";
>+        case VK_OBJECT_TYPE_PIPELINE_LAYOUT:
>+            return "Pipeline Layout";
>+        case VK_OBJECT_TYPE_RENDER_PASS:
>+            return "Render Pass";
>+        case VK_OBJECT_TYPE_PIPELINE:
>+            return "Pipeline";
>+        case VK_OBJECT_TYPE_DESCRIPTOR_SET_LAYOUT:
>+            return "Descriptor Set Layout";
>+        case VK_OBJECT_TYPE_SAMPLER:
>+            return "Sampler";
>+        case VK_OBJECT_TYPE_DESCRIPTOR_POOL:
>+            return "Descriptor Pool";
>+        case VK_OBJECT_TYPE_DESCRIPTOR_SET:
>+            return "Descriptor Set";
>+        case VK_OBJECT_TYPE_FRAMEBUFFER:
>+            return "Framebuffer";
>+        case VK_OBJECT_TYPE_COMMAND_POOL:
>+            return "Command Pool";
>+        case VK_OBJECT_TYPE_SAMPLER_YCBCR_CONVERSION:
>+            return "Sampler YCbCr Conversion";
>+        case VK_OBJECT_TYPE_DESCRIPTOR_UPDATE_TEMPLATE:
>+            return "Descriptor Update Template";
>+        case VK_OBJECT_TYPE_SURFACE_KHR:
>+            return "Surface";
>+        case VK_OBJECT_TYPE_SWAPCHAIN_KHR:
>+            return "Swapchain";
>+        case VK_OBJECT_TYPE_DISPLAY_KHR:
>+            return "Display";
>+        case VK_OBJECT_TYPE_DISPLAY_MODE_KHR:
>+            return "Display Mode";
>+        case VK_OBJECT_TYPE_DEBUG_REPORT_CALLBACK_EXT:
>+            return "Debug Report Callback";
>+        case VK_OBJECT_TYPE_OBJECT_TABLE_NVX:
>+            return "Object Table";
>+        case VK_OBJECT_TYPE_INDIRECT_COMMANDS_LAYOUT_NVX:
>+            return "Indirect Commands Layout";
>+        case VK_OBJECT_TYPE_DEBUG_UTILS_MESSENGER_EXT:
>+            return "Debug Utils Messenger";
>+        case VK_OBJECT_TYPE_VALIDATION_CACHE_EXT:
>+            return "Validation Cache";
>+        case VK_OBJECT_TYPE_ACCELERATION_STRUCTURE_NV:
>+            return "Acceleration Structure";
>+        default:
>+            return "<Unrecognized>";
>+    }
>+}
> 
>-VkResult VerifyExtensionsPresent(const std::vector<VkExtensionProperties> &extensionProps,
>-                                 const std::vector<const char *> &enabledExtensionNames)
>+VKAPI_ATTR VkBool32 VKAPI_CALL
>+DebugUtilsMessenger(VkDebugUtilsMessageSeverityFlagBitsEXT messageSeverity,
>+                    VkDebugUtilsMessageTypeFlagsEXT messageTypes,
>+                    const VkDebugUtilsMessengerCallbackDataEXT *callbackData,
>+                    void *userData)
> {
>-    // Compile the extensions names into a set.
>-    std::set<std::string> extensionNames;
>-    for (const auto &extensionProp : extensionProps)
>+    // See if it's an issue we are aware of and don't want to be spammed about.
>+    if (IsIgnoredDebugMessage(callbackData->pMessageIdName))
>     {
>-        extensionNames.insert(extensionProp.extensionName);
>+        return VK_FALSE;
>     }
> 
>-    for (const char *extensionName : enabledExtensionNames)
>+    std::ostringstream log;
>+    if (callbackData->pMessageIdName)
>+    {
>+        log << "[ " << callbackData->pMessageIdName << " ] ";
>+    }
>+    log << callbackData->pMessage << std::endl;
>+
>+    // Aesthetic value based on length of the function name, line number, etc.
>+    constexpr size_t kStartIndent = 28;
>+
>+    // Output the debug marker hierarchy under which this error has occured.
>+    size_t indent = kStartIndent;
>+    if (callbackData->queueLabelCount > 0)
>+    {
>+        log << std::string(indent++, ' ') << "<Queue Label Hierarchy:>" << std::endl;
>+        for (uint32_t i = 0; i < callbackData->queueLabelCount; ++i)
>+        {
>+            log << std::string(indent++, ' ') << callbackData->pQueueLabels[i].pLabelName
>+                << std::endl;
>+        }
>+    }
>+    if (callbackData->cmdBufLabelCount > 0)
>+    {
>+        log << std::string(indent++, ' ') << "<Command Buffer Label Hierarchy:>" << std::endl;
>+        for (uint32_t i = 0; i < callbackData->cmdBufLabelCount; ++i)
>+        {
>+            log << std::string(indent++, ' ') << callbackData->pCmdBufLabels[i].pLabelName
>+                << std::endl;
>+        }
>+    }
>+    // Output the objects involved in this error message.
>+    if (callbackData->objectCount > 0)
>     {
>-        if (extensionNames.count(extensionName) == 0)
>+        for (uint32_t i = 0; i < callbackData->objectCount; ++i)
>         {
>-            return VK_ERROR_EXTENSION_NOT_PRESENT;
>+            const char *objectName = callbackData->pObjects[i].pObjectName;
>+            const char *objectType = GetVkObjectTypeName(callbackData->pObjects[i].objectType);
>+            uint64_t objectHandle  = callbackData->pObjects[i].objectHandle;
>+            log << std::string(indent, ' ') << "Object: ";
>+            if (objectHandle == 0)
>+            {
>+                log << "VK_NULL_HANDLE";
>+            }
>+            else
>+            {
>+                log << "0x" << std::hex << objectHandle << std::dec;
>+            }
>+            log << " (type = " << objectType << "(" << callbackData->pObjects[i].objectType << "))";
>+            if (objectName)
>+            {
>+                log << " [" << objectName << "]";
>+            }
>+            log << std::endl;
>         }
>     }
> 
>-    return VK_SUCCESS;
>+    bool isError    = (messageSeverity & VK_DEBUG_UTILS_MESSAGE_SEVERITY_ERROR_BIT_EXT) != 0;
>+    std::string msg = log.str();
>+
>+    if (isError)
>+    {
>+        ERR() << msg;
>+    }
>+    else
>+    {
>+        WARN() << msg;
>+    }
>+
>+    return VK_FALSE;
> }
> 
>-VkBool32 VKAPI_CALL DebugReportCallback(VkDebugReportFlagsEXT flags,
>-                                        VkDebugReportObjectTypeEXT objectType,
>-                                        uint64_t object,
>-                                        size_t location,
>-                                        int32_t messageCode,
>-                                        const char *layerPrefix,
>-                                        const char *message,
>-                                        void *userData)
>+VKAPI_ATTR VkBool32 VKAPI_CALL DebugReportCallback(VkDebugReportFlagsEXT flags,
>+                                                   VkDebugReportObjectTypeEXT objectType,
>+                                                   uint64_t object,
>+                                                   size_t location,
>+                                                   int32_t messageCode,
>+                                                   const char *layerPrefix,
>+                                                   const char *message,
>+                                                   void *userData)
> {
>+    if (IsIgnoredDebugMessage(message))
>+    {
>+        return VK_FALSE;
>+    }
>     if ((flags & VK_DEBUG_REPORT_ERROR_BIT_EXT) != 0)
>     {
>         ERR() << message;
>@@ -82,46 +332,239 @@ VkBool32 VKAPI_CALL DebugReportCallback(VkDebugReportFlagsEXT flags,
>     return VK_FALSE;
> }
> 
>+// If we're loading the validation layers, we could be running from any random directory.
>+// Change to the executable directory so we can find the layers, then change back to the
>+// previous directory to be safe we don't disrupt the application.
>+class ScopedVkLoaderEnvironment : angle::NonCopyable
>+{
>+  public:
>+    ScopedVkLoaderEnvironment(bool enableValidationLayers, bool enableMockICD)
>+        : mEnableValidationLayers(enableValidationLayers),
>+          mEnableMockICD(enableMockICD),
>+          mChangedCWD(false),
>+          mChangedICDPath(false)
>+    {
>+// Changing CWD and setting environment variables makes no sense on Android,
>+// since this code is a part of Java application there.
>+// Android Vulkan loader doesn't need this either.
>+#if !defined(ANGLE_PLATFORM_ANDROID) && !defined(ANGLE_PLATFORM_FUCHSIA)
>+        if (enableMockICD)
>+        {
>+            // Override environment variable to use built Mock ICD
>+            // ANGLE_VK_ICD_JSON gets set to the built mock ICD in BUILD.gn
>+            mPreviousICDPath = angle::GetEnvironmentVar(g_VkICDPathEnv);
>+            mChangedICDPath  = angle::SetEnvironmentVar(g_VkICDPathEnv, ANGLE_VK_ICD_JSON);
>+            if (!mChangedICDPath)
>+            {
>+                ERR() << "Error setting Path for Mock/Null Driver.";
>+                mEnableMockICD = false;
>+            }
>+        }
>+        if (mEnableValidationLayers || mEnableMockICD)
>+        {
>+            const auto &cwd = angle::GetCWD();
>+            if (!cwd.valid())
>+            {
>+                ERR() << "Error getting CWD for Vulkan layers init.";
>+                mEnableValidationLayers = false;
>+                mEnableMockICD          = false;
>+            }
>+            else
>+            {
>+                mPreviousCWD       = cwd.value();
>+                std::string exeDir = angle::GetExecutableDirectory();
>+                mChangedCWD        = angle::SetCWD(exeDir.c_str());
>+                if (!mChangedCWD)
>+                {
>+                    ERR() << "Error setting CWD for Vulkan layers init.";
>+                    mEnableValidationLayers = false;
>+                    mEnableMockICD          = false;
>+                }
>+            }
>+        }
>+
>+        // Override environment variable to use the ANGLE layers.
>+        if (mEnableValidationLayers)
>+        {
>+            if (!angle::PrependPathToEnvironmentVar(g_VkLoaderLayersPathEnv, ANGLE_VK_DATA_DIR))
>+            {
>+                ERR() << "Error setting environment for Vulkan layers init.";
>+                mEnableValidationLayers = false;
>+            }
>+        }
>+#endif  // !defined(ANGLE_PLATFORM_ANDROID)
>+    }
>+
>+    ~ScopedVkLoaderEnvironment()
>+    {
>+        if (mChangedCWD)
>+        {
>+#if !defined(ANGLE_PLATFORM_ANDROID)
>+            ASSERT(mPreviousCWD.valid());
>+            angle::SetCWD(mPreviousCWD.value().c_str());
>+#endif  // !defined(ANGLE_PLATFORM_ANDROID)
>+        }
>+        if (mChangedICDPath)
>+        {
>+            if (mPreviousICDPath.value().empty())
>+            {
>+                angle::UnsetEnvironmentVar(g_VkICDPathEnv);
>+            }
>+            else
>+            {
>+                angle::SetEnvironmentVar(g_VkICDPathEnv, mPreviousICDPath.value().c_str());
>+            }
>+        }
>+    }
>+
>+    bool canEnableValidationLayers() const { return mEnableValidationLayers; }
>+
>+    bool canEnableMockICD() const { return mEnableMockICD; }
>+
>+  private:
>+    bool mEnableValidationLayers;
>+    bool mEnableMockICD;
>+    bool mChangedCWD;
>+    Optional<std::string> mPreviousCWD;
>+    bool mChangedICDPath;
>+    Optional<std::string> mPreviousICDPath;
>+};
>+
>+void ChoosePhysicalDevice(const std::vector<VkPhysicalDevice> &physicalDevices,
>+                          bool preferMockICD,
>+                          VkPhysicalDevice *physicalDeviceOut,
>+                          VkPhysicalDeviceProperties *physicalDevicePropertiesOut)
>+{
>+    ASSERT(!physicalDevices.empty());
>+    if (preferMockICD)
>+    {
>+        for (const VkPhysicalDevice &physicalDevice : physicalDevices)
>+        {
>+            vkGetPhysicalDeviceProperties(physicalDevice, physicalDevicePropertiesOut);
>+            if ((kMockVendorID == physicalDevicePropertiesOut->vendorID) &&
>+                (kMockDeviceID == physicalDevicePropertiesOut->deviceID) &&
>+                (strcmp(kMockDeviceName, physicalDevicePropertiesOut->deviceName) == 0))
>+            {
>+                *physicalDeviceOut = physicalDevice;
>+                return;
>+            }
>+        }
>+        WARN() << "Vulkan Mock Driver was requested but Mock Device was not found. Using default "
>+                  "physicalDevice instead.";
>+    }
>+
>+    // Fall back to first device.
>+    *physicalDeviceOut = physicalDevices[0];
>+    vkGetPhysicalDeviceProperties(*physicalDeviceOut, physicalDevicePropertiesOut);
>+}
>+
>+void InitializeSubmitInfo(VkSubmitInfo *submitInfo,
>+                          const vk::PrimaryCommandBuffer &commandBuffer,
>+                          const vk::Semaphore *waitSemaphore,
>+                          VkPipelineStageFlags *waitStageMask,
>+                          const vk::Semaphore *signalSemaphore)
>+{
>+    // Verify that the submitInfo has been zero'd out.
>+    ASSERT(submitInfo->waitSemaphoreCount == 0);
>+    ASSERT(submitInfo->signalSemaphoreCount == 0);
>+
>+    submitInfo->sType              = VK_STRUCTURE_TYPE_SUBMIT_INFO;
>+    submitInfo->commandBufferCount = 1;
>+    submitInfo->pCommandBuffers    = commandBuffer.ptr();
>+
>+    if (waitSemaphore)
>+    {
>+        submitInfo->waitSemaphoreCount = 1;
>+        submitInfo->pWaitSemaphores    = waitSemaphore->ptr();
>+        submitInfo->pWaitDstStageMask  = waitStageMask;
>+    }
>+
>+    if (signalSemaphore)
>+    {
>+        submitInfo->signalSemaphoreCount = 1;
>+        submitInfo->pSignalSemaphores    = signalSemaphore->ptr();
>+    }
>+}
>+
>+// Initially dumping the command graphs is disabled.
>+constexpr bool kEnableCommandGraphDiagnostics = false;
>+
> }  // anonymous namespace
> 
>+// CommandBatch implementation.
>+RendererVk::CommandBatch::CommandBatch() = default;
>+
>+RendererVk::CommandBatch::~CommandBatch() = default;
>+
>+RendererVk::CommandBatch::CommandBatch(CommandBatch &&other)
>+{
>+    *this = std::move(other);
>+}
>+
>+RendererVk::CommandBatch &RendererVk::CommandBatch::operator=(CommandBatch &&other)
>+{
>+    std::swap(commandPool, other.commandPool);
>+    std::swap(fence, other.fence);
>+    std::swap(serial, other.serial);
>+    return *this;
>+}
>+
>+void RendererVk::CommandBatch::destroy(VkDevice device)
>+{
>+    commandPool.destroy(device);
>+    fence.reset(device);
>+}
>+
>+// RendererVk implementation.
> RendererVk::RendererVk()
>-    : mCapsInitialized(false),
>+    : mDisplay(nullptr),
>+      mCapsInitialized(false),
>+      mFeaturesInitialized(false),
>       mInstance(VK_NULL_HANDLE),
>       mEnableValidationLayers(false),
>+      mEnableMockICD(false),
>+      mDebugUtilsMessenger(VK_NULL_HANDLE),
>       mDebugReportCallback(VK_NULL_HANDLE),
>       mPhysicalDevice(VK_NULL_HANDLE),
>       mQueue(VK_NULL_HANDLE),
>       mCurrentQueueFamilyIndex(std::numeric_limits<uint32_t>::max()),
>+      mMaxVertexAttribDivisor(1),
>       mDevice(VK_NULL_HANDLE),
>-      mGlslangWrapper(nullptr),
>       mLastCompletedQueueSerial(mQueueSerialFactory.generate()),
>       mCurrentQueueSerial(mQueueSerialFactory.generate()),
>-      mInFlightCommands(),
>-      mCurrentRenderPassFramebuffer(nullptr)
>+      mDeviceLost(false),
>+      mPipelineCacheVkUpdateTimeout(kPipelineCacheVkUpdatePeriod),
>+      mPoolAllocator(kDefaultPoolAllocatorPageSize, 1),
>+      mCommandGraph(kEnableCommandGraphDiagnostics, &mPoolAllocator),
>+      mGpuEventsEnabled(false),
>+      mGpuClockSync{std::numeric_limits<double>::max(), std::numeric_limits<double>::max()},
>+      mGpuEventTimestampOrigin(0)
> {
>+    VkFormatProperties invalid = {0, 0, kInvalidFormatFeatureFlags};
>+    mFormatProperties.fill(invalid);
> }
> 
>-RendererVk::~RendererVk()
>+RendererVk::~RendererVk() {}
>+
>+void RendererVk::onDestroy(vk::Context *context)
> {
>-    if (!mInFlightCommands.empty() || !mInFlightFences.empty() || !mGarbage.empty())
>+    if (!mInFlightCommands.empty() || !mGarbage.empty())
>     {
>-        vk::Error error = finish();
>-        if (error.isError())
>-        {
>-            ERR() << "Error during VK shutdown: " << error;
>-        }
>+        // TODO(jmadill): Not nice to pass nullptr here, but shouldn't be a problem.
>+        (void)finish(context, nullptr, nullptr);
>     }
> 
>-    if (mGlslangWrapper)
>-    {
>-        GlslangWrapper::ReleaseReference();
>-        mGlslangWrapper = nullptr;
>-    }
>+    mUtils.destroy(mDevice);
> 
>-    if (mCommandBuffer.valid())
>-    {
>-        mCommandBuffer.destroy(mDevice, mCommandPool);
>-    }
>+    mPipelineLayoutCache.destroy(mDevice);
>+    mDescriptorSetLayoutCache.destroy(mDevice);
>+
>+    mRenderPassCache.destroy(mDevice);
>+    mPipelineCache.destroy(mDevice);
>+    mShaderLibrary.destroy(mDevice);
>+    mGpuEventQueryPool.destroy(mDevice);
>+
>+    GlslangWrapper::Release();
> 
>     if (mCommandPool.valid())
>     {
>@@ -134,13 +577,17 @@ RendererVk::~RendererVk()
>         mDevice = VK_NULL_HANDLE;
>     }
> 
>-    if (mDebugReportCallback)
>+    if (mDebugUtilsMessenger)
>+    {
>+        ASSERT(mInstance && vkDestroyDebugUtilsMessengerEXT);
>+        vkDestroyDebugUtilsMessengerEXT(mInstance, mDebugUtilsMessenger, nullptr);
>+
>+        ASSERT(mDebugReportCallback == VK_NULL_HANDLE);
>+    }
>+    else if (mDebugReportCallback)
>     {
>-        ASSERT(mInstance);
>-        auto destroyDebugReportCallback = reinterpret_cast<PFN_vkDestroyDebugReportCallbackEXT>(
>-            vkGetInstanceProcAddr(mInstance, "vkDestroyDebugReportCallbackEXT"));
>-        ASSERT(destroyDebugReportCallback);
>-        destroyDebugReportCallback(mInstance, mDebugReportCallback, nullptr);
>+        ASSERT(mInstance && vkDestroyDebugReportCallbackEXT);
>+        vkDestroyDebugReportCallbackEXT(mInstance, mDebugReportCallback, nullptr);
>     }
> 
>     if (mInstance)
>@@ -149,175 +596,255 @@ RendererVk::~RendererVk()
>         mInstance = VK_NULL_HANDLE;
>     }
> 
>+    mMemoryProperties.destroy();
>     mPhysicalDevice = VK_NULL_HANDLE;
> }
> 
>-vk::Error RendererVk::initialize(const egl::AttributeMap &attribs, const char *wsiName)
>+void RendererVk::notifyDeviceLost()
> {
>-    mEnableValidationLayers = ShouldUseDebugLayers(attribs);
>+    mDeviceLost = true;
> 
>-    // If we're loading the validation layers, we could be running from any random directory.
>-    // Change to the executable directory so we can find the layers, then change back to the
>-    // previous directory to be safe we don't disrupt the application.
>-    std::string previousCWD;
>+    mCommandGraph.clear();
>+    nextSerial();
>+    freeAllInFlightResources();
> 
>-    if (mEnableValidationLayers)
>-    {
>-        const auto &cwd = angle::GetCWD();
>-        if (!cwd.valid())
>-        {
>-            ERR() << "Error getting CWD for Vulkan layers init.";
>-            mEnableValidationLayers = false;
>-        }
>-        else
>-        {
>-            previousCWD = cwd.value();
>-            const char *exeDir = angle::GetExecutableDirectory();
>-            if (!angle::SetCWD(exeDir))
>-            {
>-                ERR() << "Error setting CWD for Vulkan layers init.";
>-                mEnableValidationLayers = false;
>-            }
>-        }
>-    }
>+    mDisplay->notifyDeviceLost();
>+}
> 
>-    // Override environment variable to use the ANGLE layers.
>-    if (mEnableValidationLayers)
>-    {
>-        if (!angle::SetEnvironmentVar(g_VkLoaderLayersPathEnv, ANGLE_VK_LAYERS_DIR))
>-        {
>-            ERR() << "Error setting environment for Vulkan layers init.";
>-            mEnableValidationLayers = false;
>-        }
>-    }
>+bool RendererVk::isDeviceLost() const
>+{
>+    return mDeviceLost;
>+}
>+
>+angle::Result RendererVk::initialize(DisplayVk *displayVk,
>+                                     egl::Display *display,
>+                                     const char *wsiExtension,
>+                                     const char *wsiLayer)
>+{
>+    mDisplay                         = display;
>+    const egl::AttributeMap &attribs = mDisplay->getAttributeMap();
>+    ScopedVkLoaderEnvironment scopedEnvironment(ShouldUseDebugLayers(attribs),
>+                                                ShouldEnableMockICD(attribs));
>+    mEnableValidationLayers = scopedEnvironment.canEnableValidationLayers();
>+    mEnableMockICD          = scopedEnvironment.canEnableMockICD();
> 
>     // Gather global layer properties.
>     uint32_t instanceLayerCount = 0;
>-    ANGLE_VK_TRY(vkEnumerateInstanceLayerProperties(&instanceLayerCount, nullptr));
>+    ANGLE_VK_TRY(displayVk, vkEnumerateInstanceLayerProperties(&instanceLayerCount, nullptr));
> 
>     std::vector<VkLayerProperties> instanceLayerProps(instanceLayerCount);
>     if (instanceLayerCount > 0)
>     {
>-        ANGLE_VK_TRY(
>-            vkEnumerateInstanceLayerProperties(&instanceLayerCount, instanceLayerProps.data()));
>+        ANGLE_VK_TRY(displayVk, vkEnumerateInstanceLayerProperties(&instanceLayerCount,
>+                                                                   instanceLayerProps.data()));
>     }
> 
>+    VulkanLayerVector enabledInstanceLayerNames;
>+    if (mEnableValidationLayers)
>+    {
>+        bool layersRequested =
>+            (attribs.get(EGL_PLATFORM_ANGLE_DEBUG_LAYERS_ENABLED_ANGLE, EGL_DONT_CARE) == EGL_TRUE);
>+        mEnableValidationLayers = GetAvailableValidationLayers(instanceLayerProps, layersRequested,
>+                                                               &enabledInstanceLayerNames);
>+    }
>+
>+    if (wsiLayer)
>+    {
>+        enabledInstanceLayerNames.push_back(wsiLayer);
>+    }
>+
>+    // Enumerate instance extensions that are provided by the vulkan
>+    // implementation and implicit layers.
>     uint32_t instanceExtensionCount = 0;
>-    ANGLE_VK_TRY(vkEnumerateInstanceExtensionProperties(nullptr, &instanceExtensionCount, nullptr));
>+    ANGLE_VK_TRY(displayVk,
>+                 vkEnumerateInstanceExtensionProperties(nullptr, &instanceExtensionCount, nullptr));
> 
>     std::vector<VkExtensionProperties> instanceExtensionProps(instanceExtensionCount);
>     if (instanceExtensionCount > 0)
>     {
>-        ANGLE_VK_TRY(vkEnumerateInstanceExtensionProperties(nullptr, &instanceExtensionCount,
>+        ANGLE_VK_TRY(displayVk,
>+                     vkEnumerateInstanceExtensionProperties(nullptr, &instanceExtensionCount,
>                                                             instanceExtensionProps.data()));
>     }
> 
>-    if (mEnableValidationLayers)
>+    // Enumerate instance extensions that are provided by explicit layers.
>+    for (const char *layerName : enabledInstanceLayerNames)
>     {
>-        // Verify the standard validation layers are available.
>-        if (!HasStandardValidationLayer(instanceLayerProps))
>+        uint32_t previousExtensionCount      = instanceExtensionProps.size();
>+        uint32_t instanceLayerExtensionCount = 0;
>+        ANGLE_VK_TRY(displayVk, vkEnumerateInstanceExtensionProperties(
>+                                    layerName, &instanceLayerExtensionCount, nullptr));
>+        instanceExtensionProps.resize(previousExtensionCount + instanceLayerExtensionCount);
>+        ANGLE_VK_TRY(displayVk, vkEnumerateInstanceExtensionProperties(
>+                                    layerName, &instanceLayerExtensionCount,
>+                                    instanceExtensionProps.data() + previousExtensionCount));
>+    }
>+
>+    ExtensionNameList instanceExtensionNames;
>+    if (!instanceExtensionProps.empty())
>+    {
>+        for (const VkExtensionProperties &i : instanceExtensionProps)
>         {
>-            // Generate an error if the attribute was requested, warning otherwise.
>-            if (attribs.get(EGL_PLATFORM_ANGLE_DEBUG_LAYERS_ENABLED_ANGLE, EGL_DONT_CARE) ==
>-                EGL_TRUE)
>-            {
>-                ERR() << "Vulkan standard validation layers are missing.";
>-            }
>-            else
>-            {
>-                WARN() << "Vulkan standard validation layers are missing.";
>-            }
>-            mEnableValidationLayers = false;
>+            instanceExtensionNames.push_back(i.extensionName);
>         }
>+        std::sort(instanceExtensionNames.begin(), instanceExtensionNames.end(), StrLess);
>     }
> 
>-    std::vector<const char *> enabledInstanceExtensions;
>+    ExtensionNameList enabledInstanceExtensions;
>     enabledInstanceExtensions.push_back(VK_KHR_SURFACE_EXTENSION_NAME);
>-    enabledInstanceExtensions.push_back(wsiName);
>+    enabledInstanceExtensions.push_back(wsiExtension);
> 
>-    // TODO(jmadill): Should be able to continue initialization if debug report ext missing.
>-    if (mEnableValidationLayers)
>+    bool enableDebugUtils =
>+        mEnableValidationLayers &&
>+        ExtensionFound(VK_EXT_DEBUG_UTILS_EXTENSION_NAME, instanceExtensionNames);
>+    bool enableDebugReport =
>+        mEnableValidationLayers && !enableDebugUtils &&
>+        ExtensionFound(VK_EXT_DEBUG_REPORT_EXTENSION_NAME, instanceExtensionNames);
>+
>+    if (enableDebugUtils)
>+    {
>+        enabledInstanceExtensions.push_back(VK_EXT_DEBUG_UTILS_EXTENSION_NAME);
>+    }
>+    else if (enableDebugReport)
>     {
>         enabledInstanceExtensions.push_back(VK_EXT_DEBUG_REPORT_EXTENSION_NAME);
>     }
> 
>     // Verify the required extensions are in the extension names set. Fail if not.
>-    ANGLE_VK_TRY(VerifyExtensionsPresent(instanceExtensionProps, enabledInstanceExtensions));
>+    std::sort(enabledInstanceExtensions.begin(), enabledInstanceExtensions.end(), StrLess);
>+    ANGLE_VK_TRY(displayVk,
>+                 VerifyExtensionsPresent(instanceExtensionNames, enabledInstanceExtensions));
> 
>-    VkApplicationInfo applicationInfo;
>+    // Enable VK_KHR_GET_PHYSICAL_DEVICE_PROPERTIES_2_EXTENSION_NAME if available.
>+    if (ExtensionFound(VK_KHR_GET_PHYSICAL_DEVICE_PROPERTIES_2_EXTENSION_NAME,
>+                       instanceExtensionNames))
>+    {
>+        enabledInstanceExtensions.push_back(VK_KHR_GET_PHYSICAL_DEVICE_PROPERTIES_2_EXTENSION_NAME);
>+    }
>+
>+    VkApplicationInfo applicationInfo  = {};
>     applicationInfo.sType              = VK_STRUCTURE_TYPE_APPLICATION_INFO;
>-    applicationInfo.pNext              = nullptr;
>     applicationInfo.pApplicationName   = "ANGLE";
>     applicationInfo.applicationVersion = 1;
>     applicationInfo.pEngineName        = "ANGLE";
>     applicationInfo.engineVersion      = 1;
>-    applicationInfo.apiVersion         = VK_API_VERSION_1_0;
> 
>-    VkInstanceCreateInfo instanceInfo;
>-    instanceInfo.sType            = VK_STRUCTURE_TYPE_INSTANCE_CREATE_INFO;
>-    instanceInfo.pNext            = nullptr;
>-    instanceInfo.flags            = 0;
>-    instanceInfo.pApplicationInfo = &applicationInfo;
>+    auto enumerateInstanceVersion = reinterpret_cast<PFN_vkEnumerateInstanceVersion>(
>+        vkGetInstanceProcAddr(mInstance, "vkEnumerateInstanceVersion"));
>+    if (!enumerateInstanceVersion)
>+    {
>+        applicationInfo.apiVersion = VK_API_VERSION_1_0;
>+    }
>+    else
>+    {
>+        uint32_t apiVersion = VK_API_VERSION_1_0;
>+        ANGLE_VK_TRY(displayVk, enumerateInstanceVersion(&apiVersion));
>+        if ((VK_VERSION_MAJOR(apiVersion) > 1) || (VK_VERSION_MINOR(apiVersion) >= 1))
>+        {
>+            // This is the highest version of core Vulkan functionality that ANGLE uses.
>+            applicationInfo.apiVersion = kPreferredVulkanAPIVersion;
>+        }
>+        else
>+        {
>+            // Since only 1.0 instance-level functionality is available, this must set to 1.0.
>+            applicationInfo.apiVersion = VK_API_VERSION_1_0;
>+        }
>+    }
>+
>+    VkInstanceCreateInfo instanceInfo = {};
>+    instanceInfo.sType                = VK_STRUCTURE_TYPE_INSTANCE_CREATE_INFO;
>+    instanceInfo.flags                = 0;
>+    instanceInfo.pApplicationInfo     = &applicationInfo;
> 
>     // Enable requested layers and extensions.
>     instanceInfo.enabledExtensionCount = static_cast<uint32_t>(enabledInstanceExtensions.size());
>     instanceInfo.ppEnabledExtensionNames =
>         enabledInstanceExtensions.empty() ? nullptr : enabledInstanceExtensions.data();
>-    instanceInfo.enabledLayerCount = mEnableValidationLayers ? 1u : 0u;
>-    instanceInfo.ppEnabledLayerNames =
>-        mEnableValidationLayers ? &g_VkStdValidationLayerName : nullptr;
>+    instanceInfo.enabledLayerCount   = enabledInstanceLayerNames.size();
>+    instanceInfo.ppEnabledLayerNames = enabledInstanceLayerNames.data();
> 
>-    ANGLE_VK_TRY(vkCreateInstance(&instanceInfo, nullptr, &mInstance));
>+    ANGLE_VK_TRY(displayVk, vkCreateInstance(&instanceInfo, nullptr, &mInstance));
> 
>-    if (mEnableValidationLayers)
>+    if (enableDebugUtils)
>+    {
>+        // Try to use the newer EXT_debug_utils if it exists.
>+        InitDebugUtilsEXTFunctions(mInstance);
>+
>+        // Create the messenger callback.
>+        VkDebugUtilsMessengerCreateInfoEXT messengerInfo = {};
>+
>+        constexpr VkDebugUtilsMessageSeverityFlagsEXT kSeveritiesToLog =
>+            VK_DEBUG_UTILS_MESSAGE_SEVERITY_ERROR_BIT_EXT |
>+            VK_DEBUG_UTILS_MESSAGE_SEVERITY_WARNING_BIT_EXT;
>+
>+        constexpr VkDebugUtilsMessageTypeFlagsEXT kMessagesToLog =
>+            VK_DEBUG_UTILS_MESSAGE_TYPE_GENERAL_BIT_EXT |
>+            VK_DEBUG_UTILS_MESSAGE_TYPE_VALIDATION_BIT_EXT |
>+            VK_DEBUG_UTILS_MESSAGE_TYPE_PERFORMANCE_BIT_EXT;
>+
>+        messengerInfo.sType           = VK_STRUCTURE_TYPE_DEBUG_UTILS_MESSENGER_CREATE_INFO_EXT;
>+        messengerInfo.messageSeverity = kSeveritiesToLog;
>+        messengerInfo.messageType     = kMessagesToLog;
>+        messengerInfo.pfnUserCallback = &DebugUtilsMessenger;
>+        messengerInfo.pUserData       = this;
>+
>+        ANGLE_VK_TRY(displayVk, vkCreateDebugUtilsMessengerEXT(mInstance, &messengerInfo, nullptr,
>+                                                               &mDebugUtilsMessenger));
>+    }
>+    else if (enableDebugReport)
>     {
>-        // Change back to the previous working directory now that we've loaded the instance -
>-        // the validation layers should be loaded at this point.
>-        angle::SetCWD(previousCWD.c_str());
>+        // Fallback to EXT_debug_report.
>+        InitDebugReportEXTFunctions(mInstance);
> 
>-        VkDebugReportCallbackCreateInfoEXT debugReportInfo;
>+        VkDebugReportCallbackCreateInfoEXT debugReportInfo = {};
> 
>         debugReportInfo.sType = VK_STRUCTURE_TYPE_DEBUG_REPORT_CREATE_INFO_EXT;
>-        debugReportInfo.pNext = nullptr;
>-        debugReportInfo.flags = VK_DEBUG_REPORT_ERROR_BIT_EXT | VK_DEBUG_REPORT_WARNING_BIT_EXT |
>-                                VK_DEBUG_REPORT_PERFORMANCE_WARNING_BIT_EXT |
>-                                VK_DEBUG_REPORT_INFORMATION_BIT_EXT | VK_DEBUG_REPORT_DEBUG_BIT_EXT;
>+        debugReportInfo.flags = VK_DEBUG_REPORT_ERROR_BIT_EXT | VK_DEBUG_REPORT_WARNING_BIT_EXT;
>         debugReportInfo.pfnCallback = &DebugReportCallback;
>         debugReportInfo.pUserData   = this;
> 
>-        auto createDebugReportCallback = reinterpret_cast<PFN_vkCreateDebugReportCallbackEXT>(
>-            vkGetInstanceProcAddr(mInstance, "vkCreateDebugReportCallbackEXT"));
>-        ASSERT(createDebugReportCallback);
>-        ANGLE_VK_TRY(
>-            createDebugReportCallback(mInstance, &debugReportInfo, nullptr, &mDebugReportCallback));
>+        ANGLE_VK_TRY(displayVk, vkCreateDebugReportCallbackEXT(mInstance, &debugReportInfo, nullptr,
>+                                                               &mDebugReportCallback));
>+    }
>+
>+    if (std::find(enabledInstanceExtensions.begin(), enabledInstanceExtensions.end(),
>+                  VK_KHR_GET_PHYSICAL_DEVICE_PROPERTIES_2_EXTENSION_NAME) !=
>+        enabledInstanceExtensions.end())
>+    {
>+        InitGetPhysicalDeviceProperties2KHRFunctions(mInstance);
>+        ASSERT(vkGetPhysicalDeviceProperties2KHR);
>     }
> 
>     uint32_t physicalDeviceCount = 0;
>-    ANGLE_VK_TRY(vkEnumeratePhysicalDevices(mInstance, &physicalDeviceCount, nullptr));
>-    ANGLE_VK_CHECK(physicalDeviceCount > 0, VK_ERROR_INITIALIZATION_FAILED);
>+    ANGLE_VK_TRY(displayVk, vkEnumeratePhysicalDevices(mInstance, &physicalDeviceCount, nullptr));
>+    ANGLE_VK_CHECK(displayVk, physicalDeviceCount > 0, VK_ERROR_INITIALIZATION_FAILED);
> 
>     // TODO(jmadill): Handle multiple physical devices. For now, use the first device.
>-    physicalDeviceCount = 1;
>-    ANGLE_VK_TRY(vkEnumeratePhysicalDevices(mInstance, &physicalDeviceCount, &mPhysicalDevice));
>+    std::vector<VkPhysicalDevice> physicalDevices(physicalDeviceCount);
>+    ANGLE_VK_TRY(displayVk, vkEnumeratePhysicalDevices(mInstance, &physicalDeviceCount,
>+                                                       physicalDevices.data()));
>+    ChoosePhysicalDevice(physicalDevices, mEnableMockICD, &mPhysicalDevice,
>+                         &mPhysicalDeviceProperties);
> 
>-    vkGetPhysicalDeviceProperties(mPhysicalDevice, &mPhysicalDeviceProperties);
>+    vkGetPhysicalDeviceFeatures(mPhysicalDevice, &mPhysicalDeviceFeatures);
> 
>     // Ensure we can find a graphics queue family.
>     uint32_t queueCount = 0;
>     vkGetPhysicalDeviceQueueFamilyProperties(mPhysicalDevice, &queueCount, nullptr);
> 
>-    ANGLE_VK_CHECK(queueCount > 0, VK_ERROR_INITIALIZATION_FAILED);
>+    ANGLE_VK_CHECK(displayVk, queueCount > 0, VK_ERROR_INITIALIZATION_FAILED);
> 
>     mQueueFamilyProperties.resize(queueCount);
>     vkGetPhysicalDeviceQueueFamilyProperties(mPhysicalDevice, &queueCount,
>                                              mQueueFamilyProperties.data());
> 
>-    size_t graphicsQueueFamilyCount   = false;
>-    uint32_t firstGraphicsQueueFamily = 0;
>+    size_t graphicsQueueFamilyCount            = false;
>+    uint32_t firstGraphicsQueueFamily          = 0;
>+    constexpr VkQueueFlags kGraphicsAndCompute = VK_QUEUE_GRAPHICS_BIT | VK_QUEUE_COMPUTE_BIT;
>     for (uint32_t familyIndex = 0; familyIndex < queueCount; ++familyIndex)
>     {
>         const auto &queueInfo = mQueueFamilyProperties[familyIndex];
>-        if ((queueInfo.queueFlags & VK_QUEUE_GRAPHICS_BIT) != 0)
>+        if ((queueInfo.queueFlags & kGraphicsAndCompute) == kGraphicsAndCompute)
>         {
>             ASSERT(queueInfo.queueCount > 0);
>             graphicsQueueFamilyCount++;
>@@ -329,110 +856,246 @@ vk::Error RendererVk::initialize(const egl::AttributeMap &attribs, const char *w
>         }
>     }
> 
>-    ANGLE_VK_CHECK(graphicsQueueFamilyCount > 0, VK_ERROR_INITIALIZATION_FAILED);
>+    ANGLE_VK_CHECK(displayVk, graphicsQueueFamilyCount > 0, VK_ERROR_INITIALIZATION_FAILED);
> 
>     // If only one queue family, go ahead and initialize the device. If there is more than one
>     // queue, we'll have to wait until we see a WindowSurface to know which supports present.
>     if (graphicsQueueFamilyCount == 1)
>     {
>-        ANGLE_TRY(initializeDevice(firstGraphicsQueueFamily));
>+        ANGLE_TRY(initializeDevice(displayVk, firstGraphicsQueueFamily));
>     }
> 
>     // Store the physical device memory properties so we can find the right memory pools.
>     mMemoryProperties.init(mPhysicalDevice);
> 
>-    mGlslangWrapper = GlslangWrapper::GetReference();
>+    GlslangWrapper::Initialize();
> 
>     // Initialize the format table.
>-    mFormatTable.initialize(mPhysicalDevice, &mNativeTextureCaps);
>+    mFormatTable.initialize(this, &mNativeTextureCaps, &mNativeCaps.compressedTextureFormats);
> 
>-    return vk::NoError();
>+    return angle::Result::Continue;
> }
> 
>-vk::Error RendererVk::initializeDevice(uint32_t queueFamilyIndex)
>+angle::Result RendererVk::initializeDevice(DisplayVk *displayVk, uint32_t queueFamilyIndex)
> {
>     uint32_t deviceLayerCount = 0;
>-    ANGLE_VK_TRY(vkEnumerateDeviceLayerProperties(mPhysicalDevice, &deviceLayerCount, nullptr));
>+    ANGLE_VK_TRY(displayVk,
>+                 vkEnumerateDeviceLayerProperties(mPhysicalDevice, &deviceLayerCount, nullptr));
> 
>     std::vector<VkLayerProperties> deviceLayerProps(deviceLayerCount);
>     if (deviceLayerCount > 0)
>     {
>-        ANGLE_VK_TRY(vkEnumerateDeviceLayerProperties(mPhysicalDevice, &deviceLayerCount,
>-                                                      deviceLayerProps.data()));
>+        ANGLE_VK_TRY(displayVk, vkEnumerateDeviceLayerProperties(mPhysicalDevice, &deviceLayerCount,
>+                                                                 deviceLayerProps.data()));
>+    }
>+
>+    VulkanLayerVector enabledDeviceLayerNames;
>+    if (mEnableValidationLayers)
>+    {
>+        mEnableValidationLayers =
>+            GetAvailableValidationLayers(deviceLayerProps, false, &enabledDeviceLayerNames);
>+    }
>+
>+    const char *wsiLayer = displayVk->getWSILayer();
>+    if (wsiLayer)
>+    {
>+        enabledDeviceLayerNames.push_back(wsiLayer);
>     }
> 
>+    // Enumerate device extensions that are provided by the vulkan
>+    // implementation and implicit layers.
>     uint32_t deviceExtensionCount = 0;
>-    ANGLE_VK_TRY(vkEnumerateDeviceExtensionProperties(mPhysicalDevice, nullptr,
>-                                                      &deviceExtensionCount, nullptr));
>+    ANGLE_VK_TRY(displayVk, vkEnumerateDeviceExtensionProperties(mPhysicalDevice, nullptr,
>+                                                                 &deviceExtensionCount, nullptr));
> 
>     std::vector<VkExtensionProperties> deviceExtensionProps(deviceExtensionCount);
>     if (deviceExtensionCount > 0)
>     {
>-        ANGLE_VK_TRY(vkEnumerateDeviceExtensionProperties(
>-            mPhysicalDevice, nullptr, &deviceExtensionCount, deviceExtensionProps.data()));
>+        ANGLE_VK_TRY(displayVk, vkEnumerateDeviceExtensionProperties(mPhysicalDevice, nullptr,
>+                                                                     &deviceExtensionCount,
>+                                                                     deviceExtensionProps.data()));
>     }
> 
>-    if (mEnableValidationLayers)
>+    // Enumerate device extensions that are provided by explicit layers.
>+    for (const char *layerName : enabledDeviceLayerNames)
>+    {
>+        uint32_t previousExtensionCount    = deviceExtensionProps.size();
>+        uint32_t deviceLayerExtensionCount = 0;
>+        ANGLE_VK_TRY(displayVk,
>+                     vkEnumerateDeviceExtensionProperties(mPhysicalDevice, layerName,
>+                                                          &deviceLayerExtensionCount, nullptr));
>+        deviceExtensionProps.resize(previousExtensionCount + deviceLayerExtensionCount);
>+        ANGLE_VK_TRY(displayVk, vkEnumerateDeviceExtensionProperties(
>+                                    mPhysicalDevice, layerName, &deviceLayerExtensionCount,
>+                                    deviceExtensionProps.data() + previousExtensionCount));
>+    }
>+
>+    ExtensionNameList deviceExtensionNames;
>+    if (!deviceExtensionProps.empty())
>     {
>-        if (!HasStandardValidationLayer(deviceLayerProps))
>+        ASSERT(deviceExtensionNames.size() <= deviceExtensionProps.size());
>+        for (const VkExtensionProperties &prop : deviceExtensionProps)
>         {
>-            WARN() << "Vulkan standard validation layer is missing.";
>-            mEnableValidationLayers = false;
>+            deviceExtensionNames.push_back(prop.extensionName);
>         }
>+        std::sort(deviceExtensionNames.begin(), deviceExtensionNames.end(), StrLess);
>     }
> 
>-    std::vector<const char *> enabledDeviceExtensions;
>+    ExtensionNameList enabledDeviceExtensions;
>     enabledDeviceExtensions.push_back(VK_KHR_SWAPCHAIN_EXTENSION_NAME);
> 
>-    ANGLE_VK_TRY(VerifyExtensionsPresent(deviceExtensionProps, enabledDeviceExtensions));
>+    initFeatures(deviceExtensionNames);
>+    mFeaturesInitialized = true;
> 
>-    VkDeviceQueueCreateInfo queueCreateInfo;
>+    // Selectively enable KHR_MAINTENANCE1 to support viewport flipping.
>+    if ((getFeatures().flipViewportY) &&
>+        (mPhysicalDeviceProperties.apiVersion < VK_MAKE_VERSION(1, 1, 0)))
>+    {
>+        enabledDeviceExtensions.push_back(VK_KHR_MAINTENANCE1_EXTENSION_NAME);
>+    }
>+    if (getFeatures().supportsIncrementalPresent)
>+    {
>+        enabledDeviceExtensions.push_back(VK_KHR_INCREMENTAL_PRESENT_EXTENSION_NAME);
>+    }
>+
>+    if (getFeatures().supportsAndroidHardwareBuffer || getFeatures().supportsExternalMemoryFd)
>+    {
>+        enabledDeviceExtensions.push_back(VK_KHR_EXTERNAL_MEMORY_EXTENSION_NAME);
>+    }
>+
>+#if defined(ANGLE_PLATFORM_ANDROID)
>+    if (getFeatures().supportsAndroidHardwareBuffer)
>+    {
>+        enabledDeviceExtensions.push_back(VK_EXT_QUEUE_FAMILY_FOREIGN_EXTENSION_NAME);
>+        enabledDeviceExtensions.push_back(
>+            VK_ANDROID_EXTERNAL_MEMORY_ANDROID_HARDWARE_BUFFER_EXTENSION_NAME);
>+        InitExternalMemoryHardwareBufferANDROIDFunctions(mInstance);
>+    }
>+#else
>+    ASSERT(!getFeatures().supportsAndroidHardwareBuffer);
>+#endif
>+
>+    if (getFeatures().supportsExternalMemoryFd)
>+    {
>+        enabledDeviceExtensions.push_back(VK_KHR_EXTERNAL_MEMORY_FD_EXTENSION_NAME);
>+    }
>+
>+    if (getFeatures().supportsExternalSemaphoreFd)
>+    {
>+        enabledDeviceExtensions.push_back(VK_KHR_EXTERNAL_SEMAPHORE_EXTENSION_NAME);
>+    }
>+
>+    if (getFeatures().supportsExternalSemaphoreFd)
>+    {
>+        enabledDeviceExtensions.push_back(VK_KHR_EXTERNAL_SEMAPHORE_FD_EXTENSION_NAME);
>+    }
>+
>+    std::sort(enabledDeviceExtensions.begin(), enabledDeviceExtensions.end(), StrLess);
>+    ANGLE_VK_TRY(displayVk, VerifyExtensionsPresent(deviceExtensionNames, enabledDeviceExtensions));
>+
>+    // Select additional features to be enabled
>+    VkPhysicalDeviceFeatures2KHR enabledFeatures = {};
>+    enabledFeatures.sType                        = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FEATURES_2;
>+    enabledFeatures.features.independentBlend    = mPhysicalDeviceFeatures.independentBlend;
>+    enabledFeatures.features.robustBufferAccess  = mPhysicalDeviceFeatures.robustBufferAccess;
>+    enabledFeatures.features.samplerAnisotropy   = mPhysicalDeviceFeatures.samplerAnisotropy;
>+    if (!vk::CommandBuffer::ExecutesInline())
>+    {
>+        enabledFeatures.features.inheritedQueries = mPhysicalDeviceFeatures.inheritedQueries;
>+    }
> 
>-    float zeroPriority = 0.0f;
>+    VkPhysicalDeviceVertexAttributeDivisorFeaturesEXT divisorFeatures = {};
>+    divisorFeatures.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VERTEX_ATTRIBUTE_DIVISOR_FEATURES_EXT;
>+    divisorFeatures.vertexAttributeInstanceRateDivisor = true;
> 
>-    queueCreateInfo.sType            = VK_STRUCTURE_TYPE_DEVICE_QUEUE_CREATE_INFO;
>-    queueCreateInfo.pNext            = nullptr;
>-    queueCreateInfo.flags            = 0;
>-    queueCreateInfo.queueFamilyIndex = queueFamilyIndex;
>-    queueCreateInfo.queueCount       = 1;
>-    queueCreateInfo.pQueuePriorities = &zeroPriority;
>+    float zeroPriority                      = 0.0f;
>+    VkDeviceQueueCreateInfo queueCreateInfo = {};
>+    queueCreateInfo.sType                   = VK_STRUCTURE_TYPE_DEVICE_QUEUE_CREATE_INFO;
>+    queueCreateInfo.flags                   = 0;
>+    queueCreateInfo.queueFamilyIndex        = queueFamilyIndex;
>+    queueCreateInfo.queueCount              = 1;
>+    queueCreateInfo.pQueuePriorities        = &zeroPriority;
> 
>     // Initialize the device
>-    VkDeviceCreateInfo createInfo;
>+    VkDeviceCreateInfo createInfo = {};
> 
>     createInfo.sType                = VK_STRUCTURE_TYPE_DEVICE_CREATE_INFO;
>-    createInfo.pNext                = nullptr;
>     createInfo.flags                = 0;
>     createInfo.queueCreateInfoCount = 1;
>     createInfo.pQueueCreateInfos    = &queueCreateInfo;
>-    createInfo.enabledLayerCount    = mEnableValidationLayers ? 1u : 0u;
>-    createInfo.ppEnabledLayerNames =
>-        mEnableValidationLayers ? &g_VkStdValidationLayerName : nullptr;
>-    createInfo.enabledExtensionCount = static_cast<uint32_t>(enabledDeviceExtensions.size());
>-    createInfo.ppEnabledExtensionNames =
>-        enabledDeviceExtensions.empty() ? nullptr : enabledDeviceExtensions.data();
>-    createInfo.pEnabledFeatures = nullptr;  // TODO(jmadill): features
>-
>-    ANGLE_VK_TRY(vkCreateDevice(mPhysicalDevice, &createInfo, nullptr, &mDevice));
>+    createInfo.enabledLayerCount    = enabledDeviceLayerNames.size();
>+    createInfo.ppEnabledLayerNames  = enabledDeviceLayerNames.data();
> 
>-    mCurrentQueueFamilyIndex = queueFamilyIndex;
>+    if (vkGetPhysicalDeviceProperties2KHR &&
>+        ExtensionFound(VK_EXT_VERTEX_ATTRIBUTE_DIVISOR_EXTENSION_NAME, deviceExtensionNames))
>+    {
>+        enabledDeviceExtensions.push_back(VK_EXT_VERTEX_ATTRIBUTE_DIVISOR_EXTENSION_NAME);
>+        enabledFeatures.pNext = &divisorFeatures;
> 
>-    vkGetDeviceQueue(mDevice, mCurrentQueueFamilyIndex, 0, &mQueue);
>+        VkPhysicalDeviceVertexAttributeDivisorPropertiesEXT divisorProperties = {};
>+        divisorProperties.sType =
>+            VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VERTEX_ATTRIBUTE_DIVISOR_PROPERTIES_EXT;
> 
>-    // Initialize the command pool now that we know the queue family index.
>-    VkCommandPoolCreateInfo commandPoolInfo;
>-    commandPoolInfo.sType = VK_STRUCTURE_TYPE_COMMAND_POOL_CREATE_INFO;
>-    commandPoolInfo.pNext = nullptr;
>-    // TODO(jmadill): Investigate transient command buffers.
>-    commandPoolInfo.flags            = VK_COMMAND_POOL_CREATE_RESET_COMMAND_BUFFER_BIT;
>-    commandPoolInfo.queueFamilyIndex = mCurrentQueueFamilyIndex;
>+        VkPhysicalDeviceProperties2 deviceProperties = {};
>+        deviceProperties.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PROPERTIES_2;
>+        deviceProperties.pNext = &divisorProperties;
> 
>-    ANGLE_TRY(mCommandPool.init(mDevice, commandPoolInfo));
>+        vkGetPhysicalDeviceProperties2KHR(mPhysicalDevice, &deviceProperties);
>+        mMaxVertexAttribDivisor = divisorProperties.maxVertexAttribDivisor;
> 
>-    return vk::NoError();
>+        createInfo.pNext = &enabledFeatures;
>+    }
>+    else
>+    {
>+        createInfo.pEnabledFeatures = &enabledFeatures.features;
>+    }
>+
>+    createInfo.enabledExtensionCount = static_cast<uint32_t>(enabledDeviceExtensions.size());
>+    createInfo.ppEnabledExtensionNames =
>+        enabledDeviceExtensions.empty() ? nullptr : enabledDeviceExtensions.data();
>+
>+    ANGLE_VK_TRY(displayVk, vkCreateDevice(mPhysicalDevice, &createInfo, nullptr, &mDevice));
>+
>+    mCurrentQueueFamilyIndex = queueFamilyIndex;
>+
>+    vkGetDeviceQueue(mDevice, mCurrentQueueFamilyIndex, 0, &mQueue);
>+
>+    // Initialize the command pool now that we know the queue family index.
>+    VkCommandPoolCreateInfo commandPoolInfo = {};
>+    commandPoolInfo.sType                   = VK_STRUCTURE_TYPE_COMMAND_POOL_CREATE_INFO;
>+    commandPoolInfo.flags                   = VK_COMMAND_POOL_CREATE_TRANSIENT_BIT;
>+    commandPoolInfo.queueFamilyIndex        = mCurrentQueueFamilyIndex;
>+
>+    ANGLE_VK_TRY(displayVk, mCommandPool.init(mDevice, commandPoolInfo));
>+
>+    // Initialize the vulkan pipeline cache.
>+    ANGLE_TRY(initPipelineCache(displayVk));
>+
>+#if ANGLE_ENABLE_VULKAN_GPU_TRACE_EVENTS
>+    angle::PlatformMethods *platform = ANGLEPlatformCurrent();
>+    ASSERT(platform);
>+
>+    // GPU tracing workaround for anglebug.com/2927.  The renderer should not emit gpu events during
>+    // platform discovery.
>+    const unsigned char *gpuEventsEnabled =
>+        platform->getTraceCategoryEnabledFlag(platform, "gpu.angle.gpu");
>+    mGpuEventsEnabled = gpuEventsEnabled && *gpuEventsEnabled;
>+#endif
>+
>+    if (mGpuEventsEnabled)
>+    {
>+        // Calculate the difference between CPU and GPU clocks for GPU event reporting.
>+        ANGLE_TRY(mGpuEventQueryPool.init(displayVk, VK_QUERY_TYPE_TIMESTAMP,
>+                                          vk::kDefaultTimestampQueryPoolSize));
>+        ANGLE_TRY(synchronizeCpuGpuTime(displayVk, nullptr, nullptr));
>+    }
>+
>+    return angle::Result::Continue;
> }
> 
>-vk::ErrorOrResult<uint32_t> RendererVk::selectPresentQueueForSurface(VkSurfaceKHR surface)
>+angle::Result RendererVk::selectPresentQueueForSurface(DisplayVk *displayVk,
>+                                                       VkSurfaceKHR surface,
>+                                                       uint32_t *presentQueueOut)
> {
>     // We've already initialized a device, and can't re-create it unless it's never been used.
>     // TODO(jmadill): Handle the re-creation case if necessary.
>@@ -442,23 +1105,29 @@ vk::ErrorOrResult<uint32_t> RendererVk::selectPresentQueueForSurface(VkSurfaceKH
> 
>         // Check if the current device supports present on this surface.
>         VkBool32 supportsPresent = VK_FALSE;
>-        ANGLE_VK_TRY(vkGetPhysicalDeviceSurfaceSupportKHR(mPhysicalDevice, mCurrentQueueFamilyIndex,
>+        ANGLE_VK_TRY(displayVk,
>+                     vkGetPhysicalDeviceSurfaceSupportKHR(mPhysicalDevice, mCurrentQueueFamilyIndex,
>                                                           surface, &supportsPresent));
> 
>-        return (supportsPresent == VK_TRUE);
>+        if (supportsPresent == VK_TRUE)
>+        {
>+            *presentQueueOut = mCurrentQueueFamilyIndex;
>+            return angle::Result::Continue;
>+        }
>     }
> 
>     // Find a graphics and present queue.
>     Optional<uint32_t> newPresentQueue;
>     uint32_t queueCount = static_cast<uint32_t>(mQueueFamilyProperties.size());
>+    constexpr VkQueueFlags kGraphicsAndCompute = VK_QUEUE_GRAPHICS_BIT | VK_QUEUE_COMPUTE_BIT;
>     for (uint32_t queueIndex = 0; queueIndex < queueCount; ++queueIndex)
>     {
>         const auto &queueInfo = mQueueFamilyProperties[queueIndex];
>-        if ((queueInfo.queueFlags & VK_QUEUE_GRAPHICS_BIT) != 0)
>+        if ((queueInfo.queueFlags & kGraphicsAndCompute) == kGraphicsAndCompute)
>         {
>             VkBool32 supportsPresent = VK_FALSE;
>-            ANGLE_VK_TRY(vkGetPhysicalDeviceSurfaceSupportKHR(mPhysicalDevice, queueIndex, surface,
>-                                                              &supportsPresent));
>+            ANGLE_VK_TRY(displayVk, vkGetPhysicalDeviceSurfaceSupportKHR(
>+                                        mPhysicalDevice, queueIndex, surface, &supportsPresent));
> 
>             if (supportsPresent == VK_TRUE)
>             {
>@@ -468,30 +1137,16 @@ vk::ErrorOrResult<uint32_t> RendererVk::selectPresentQueueForSurface(VkSurfaceKH
>         }
>     }
> 
>-    ANGLE_VK_CHECK(newPresentQueue.valid(), VK_ERROR_INITIALIZATION_FAILED);
>-    ANGLE_TRY(initializeDevice(newPresentQueue.value()));
>+    ANGLE_VK_CHECK(displayVk, newPresentQueue.valid(), VK_ERROR_INITIALIZATION_FAILED);
>+    ANGLE_TRY(initializeDevice(displayVk, newPresentQueue.value()));
> 
>-    return newPresentQueue.value();
>+    *presentQueueOut = newPresentQueue.value();
>+    return angle::Result::Continue;
> }
> 
> std::string RendererVk::getVendorString() const
> {
>-    switch (mPhysicalDeviceProperties.vendorID)
>-    {
>-        case VENDOR_ID_AMD:
>-            return "Advanced Micro Devices";
>-        case VENDOR_ID_NVIDIA:
>-            return "NVIDIA";
>-        case VENDOR_ID_INTEL:
>-            return "Intel";
>-        default:
>-        {
>-            // TODO(jmadill): More vendor IDs.
>-            std::stringstream strstr;
>-            strstr << "Vendor ID: " << mPhysicalDeviceProperties.vendorID;
>-            return strstr.str();
>-        }
>-    }
>+    return GetVendorString(mPhysicalDeviceProperties.vendorID);
> }
> 
> std::string RendererVk::getRendererDescription() const
>@@ -505,42 +1160,168 @@ std::string RendererVk::getRendererDescription() const
>     strstr << VK_VERSION_MINOR(apiVersion) << ".";
>     strstr << VK_VERSION_PATCH(apiVersion);
> 
>-    strstr << "(" << mPhysicalDeviceProperties.deviceName << ")";
>+    strstr << "(";
>+
>+    // In the case of NVIDIA, deviceName does not necessarily contain "NVIDIA". Add "NVIDIA" so that
>+    // Vulkan end2end tests can be selectively disabled on NVIDIA. TODO(jmadill): should not be
>+    // needed after http://anglebug.com/1874 is fixed and end2end_tests use more sophisticated
>+    // driver detection.
>+    if (mPhysicalDeviceProperties.vendorID == VENDOR_ID_NVIDIA)
>+    {
>+        strstr << GetVendorString(mPhysicalDeviceProperties.vendorID) << " ";
>+    }
>+
>+    strstr << mPhysicalDeviceProperties.deviceName;
>+    strstr << " (" << gl::FmtHex(mPhysicalDeviceProperties.deviceID) << ")";
>+
>+    strstr << ")";
> 
>     return strstr.str();
> }
> 
>-void RendererVk::ensureCapsInitialized() const
>+gl::Version RendererVk::getMaxSupportedESVersion() const
>+{
>+    // Current highest supported version
>+    gl::Version maxVersion = gl::Version(3, 0);
>+
>+#if ANGLE_VULKAN_CONFORMANT_CONFIGS_ONLY
>+    // TODO: Disallow ES 3.0 until supported. http://crbug.com/angleproject/2950
>+    maxVersion = gl::Version(2, 0);
>+#endif
>+
>+    // If the command buffer doesn't support queries, we can't support ES3.
>+    if (!vk::CommandBuffer::SupportsQueries(mPhysicalDeviceFeatures))
>+    {
>+        maxVersion = std::max(maxVersion, gl::Version(2, 0));
>+    }
>+
>+    // If independentBlend is not supported, we can't have a mix of has-alpha and emulated-alpha
>+    // render targets in a framebuffer.  We also cannot perform masked clears of multiple render
>+    // targets.
>+    if (!mPhysicalDeviceFeatures.independentBlend)
>+    {
>+        maxVersion = std::max(maxVersion, gl::Version(2, 0));
>+    }
>+
>+    return maxVersion;
>+}
>+
>+void RendererVk::initFeatures(const ExtensionNameList &deviceExtensionNames)
>+{
>+// Use OpenGL line rasterization rules by default.
>+// TODO(jmadill): Fix Android support. http://anglebug.com/2830
>+#if defined(ANGLE_PLATFORM_ANDROID)
>+    mFeatures.basicGLLineRasterization = false;
>+#else
>+    mFeatures.basicGLLineRasterization = true;
>+#endif  // defined(ANGLE_PLATFORM_ANDROID)
>+
>+    if ((mPhysicalDeviceProperties.apiVersion >= VK_MAKE_VERSION(1, 1, 0)) ||
>+        ExtensionFound(VK_KHR_MAINTENANCE1_EXTENSION_NAME, deviceExtensionNames))
>+    {
>+        // TODO(lucferron): Currently disabled on Intel only since many tests are failing and need
>+        // investigation. http://anglebug.com/2728
>+        mFeatures.flipViewportY = !IsIntel(mPhysicalDeviceProperties.vendorID);
>+    }
>+
>+#ifdef ANGLE_PLATFORM_WINDOWS
>+    // http://anglebug.com/2838
>+    mFeatures.extraCopyBufferRegion = IsIntel(mPhysicalDeviceProperties.vendorID);
>+
>+    // http://anglebug.com/3055
>+    mFeatures.forceCpuPathForCubeMapCopy = IsIntel(mPhysicalDeviceProperties.vendorID);
>+#endif
>+
>+    angle::PlatformMethods *platform = ANGLEPlatformCurrent();
>+    platform->overrideFeaturesVk(platform, &mFeatures);
>+
>+    // Work around incorrect NVIDIA point size range clamping.
>+    // TODO(jmadill): Narrow driver range once fixed. http://anglebug.com/2970
>+    if (IsNvidia(mPhysicalDeviceProperties.vendorID))
>+    {
>+        mFeatures.clampPointSize = true;
>+    }
>+
>+#if defined(ANGLE_PLATFORM_ANDROID)
>+    // Work around ineffective compute-graphics barriers on Nexus 5X.
>+    // TODO(syoussefi): Figure out which other vendors and driver versions are affected.
>+    // http://anglebug.com/3019
>+    mFeatures.flushAfterVertexConversion =
>+        IsNexus5X(mPhysicalDeviceProperties.vendorID, mPhysicalDeviceProperties.deviceID);
>+#endif
>+
>+    if (ExtensionFound(VK_KHR_INCREMENTAL_PRESENT_EXTENSION_NAME, deviceExtensionNames))
>+    {
>+        mFeatures.supportsIncrementalPresent = true;
>+    }
>+
>+#if defined(ANGLE_PLATFORM_ANDROID)
>+    mFeatures.supportsAndroidHardwareBuffer =
>+        ExtensionFound(VK_ANDROID_EXTERNAL_MEMORY_ANDROID_HARDWARE_BUFFER_EXTENSION_NAME,
>+                       deviceExtensionNames) &&
>+        ExtensionFound(VK_EXT_QUEUE_FAMILY_FOREIGN_EXTENSION_NAME, deviceExtensionNames);
>+#endif
>+
>+    if (ExtensionFound(VK_KHR_EXTERNAL_MEMORY_FD_EXTENSION_NAME, deviceExtensionNames))
>+    {
>+        mFeatures.supportsExternalMemoryFd = true;
>+    }
>+
>+    if (ExtensionFound(VK_KHR_EXTERNAL_SEMAPHORE_FD_EXTENSION_NAME, deviceExtensionNames))
>+    {
>+        mFeatures.supportsExternalSemaphoreFd = true;
>+    }
>+
>+    if (IsLinux() && IsIntel(mPhysicalDeviceProperties.vendorID))
>+    {
>+        mFeatures.disableFifoPresentMode = true;
>+    }
>+
>+    if (vk::CommandBuffer::ExecutesInline())
>+    {
>+        if (IsAndroid() && IsQualcomm(mPhysicalDeviceProperties.vendorID))
>+        {
>+            mFeatures.restartRenderPassAfterLoadOpClear = true;
>+        }
>+    }
>+}
>+
>+void RendererVk::initPipelineCacheVkKey()
> {
>-    if (!mCapsInitialized)
>+    std::ostringstream hashStream("ANGLE Pipeline Cache: ", std::ios_base::ate);
>+    // Add the pipeline cache UUID to make sure the blob cache always gives a compatible pipeline
>+    // cache.  It's not particularly necessary to write it as a hex number as done here, so long as
>+    // there is no '\0' in the result.
>+    for (const uint32_t c : mPhysicalDeviceProperties.pipelineCacheUUID)
>     {
>-        generateCaps(&mNativeCaps, &mNativeTextureCaps, &mNativeExtensions, &mNativeLimitations);
>-        mCapsInitialized = true;
>+        hashStream << std::hex << c;
>     }
>+    // Add the vendor and device id too for good measure.
>+    hashStream << std::hex << mPhysicalDeviceProperties.vendorID;
>+    hashStream << std::hex << mPhysicalDeviceProperties.deviceID;
>+
>+    const std::string &hashString = hashStream.str();
>+    angle::base::SHA1HashBytes(reinterpret_cast<const unsigned char *>(hashString.c_str()),
>+                               hashString.length(), mPipelineCacheVkBlobKey.data());
> }
> 
>-void RendererVk::generateCaps(gl::Caps *outCaps,
>-                              gl::TextureCapsMap * /*outTextureCaps*/,
>-                              gl::Extensions *outExtensions,
>-                              gl::Limitations * /* outLimitations */) const
>+angle::Result RendererVk::initPipelineCache(DisplayVk *display)
> {
>-    // TODO(jmadill): Caps.
>-    outCaps->maxDrawBuffers      = 1;
>-    outCaps->maxVertexAttributes     = gl::MAX_VERTEX_ATTRIBS;
>-    outCaps->maxVertexAttribBindings = gl::MAX_VERTEX_ATTRIB_BINDINGS;
>-    outCaps->maxVaryingVectors            = 16;
>-    outCaps->maxTextureImageUnits         = 1;
>-    outCaps->maxCombinedTextureImageUnits = 1;
>-    outCaps->max2DTextureSize             = 1024;
>-    outCaps->maxElementIndex              = std::numeric_limits<GLuint>::max() - 1;
>-    outCaps->maxFragmentUniformVectors    = 8;
>-    outCaps->maxVertexUniformVectors      = 8;
>-    outCaps->maxColorAttachments          = 1;
>+    initPipelineCacheVkKey();
>+
>+    egl::BlobCache::Value initialData;
>+    bool success = display->getBlobCache()->get(display->getScratchBuffer(),
>+                                                mPipelineCacheVkBlobKey, &initialData);
>+
>+    VkPipelineCacheCreateInfo pipelineCacheCreateInfo = {};
>+
>+    pipelineCacheCreateInfo.sType           = VK_STRUCTURE_TYPE_PIPELINE_CACHE_CREATE_INFO;
>+    pipelineCacheCreateInfo.flags           = 0;
>+    pipelineCacheCreateInfo.initialDataSize = success ? initialData.size() : 0;
>+    pipelineCacheCreateInfo.pInitialData    = success ? initialData.data() : nullptr;
> 
>-    // Enable this for simple buffer readback testing, but some functionality is missing.
>-    // TODO(jmadill): Support full mapBufferRange extension.
>-    outExtensions->mapBuffer      = true;
>-    outExtensions->mapBufferRange = true;
>+    ANGLE_VK_TRY(display, mPipelineCache.init(mDevice, pipelineCacheCreateInfo));
>+    return angle::Result::Continue;
> }
> 
> const gl::Caps &RendererVk::getNativeCaps() const
>@@ -567,91 +1348,82 @@ const gl::Limitations &RendererVk::getNativeLimitations() const
>     return mNativeLimitations;
> }
> 
>-vk::Error RendererVk::getStartedCommandBuffer(vk::CommandBufferAndState **commandBufferOut)
>+uint32_t RendererVk::getMaxActiveTextures()
> {
>-    ANGLE_TRY(mCommandBuffer.ensureStarted(mDevice, mCommandPool, VK_COMMAND_BUFFER_LEVEL_PRIMARY));
>-    *commandBufferOut = &mCommandBuffer;
>-    return vk::NoError();
>+    // TODO(lucferron): expose this limitation to GL in Context Caps
>+    return std::min<uint32_t>(mPhysicalDeviceProperties.limits.maxPerStageDescriptorSamplers,
>+                              gl::IMPLEMENTATION_MAX_ACTIVE_TEXTURES);
> }
> 
>-vk::Error RendererVk::submitCommandBuffer(vk::CommandBufferAndState *commandBuffer)
>+const vk::CommandPool &RendererVk::getCommandPool() const
> {
>-    ANGLE_TRY(commandBuffer->ensureFinished());
>-
>-    VkFenceCreateInfo fenceInfo;
>-    fenceInfo.sType = VK_STRUCTURE_TYPE_FENCE_CREATE_INFO;
>-    fenceInfo.pNext = nullptr;
>-    fenceInfo.flags = 0;
>-
>-    VkSubmitInfo submitInfo;
>-    submitInfo.sType                = VK_STRUCTURE_TYPE_SUBMIT_INFO;
>-    submitInfo.pNext                = nullptr;
>-    submitInfo.waitSemaphoreCount   = 0;
>-    submitInfo.pWaitSemaphores      = nullptr;
>-    submitInfo.pWaitDstStageMask    = nullptr;
>-    submitInfo.commandBufferCount   = 1;
>-    submitInfo.pCommandBuffers      = commandBuffer->ptr();
>-    submitInfo.signalSemaphoreCount = 0;
>-    submitInfo.pSignalSemaphores    = nullptr;
>-
>-    // TODO(jmadill): Investigate how to properly submit command buffers.
>-    ANGLE_TRY(submit(submitInfo));
>-
>-    return vk::NoError();
>+    return mCommandPool;
> }
> 
>-vk::Error RendererVk::submitAndFinishCommandBuffer(vk::CommandBufferAndState *commandBuffer)
>+angle::Result RendererVk::finish(vk::Context *context,
>+                                 const vk::Semaphore *waitSemaphore,
>+                                 const vk::Semaphore *signalSemaphore)
> {
>-    ANGLE_TRY(submitCommandBuffer(commandBuffer));
>-    ANGLE_TRY(finish());
>-
>-    return vk::NoError();
>-}
>-
>-vk::Error RendererVk::submitCommandsWithSync(vk::CommandBufferAndState *commandBuffer,
>-                                             const vk::Semaphore &waitSemaphore,
>-                                             const vk::Semaphore &signalSemaphore)
>-{
>-    ANGLE_TRY(commandBuffer->end());
>-
>-    VkPipelineStageFlags waitStageMask  = VK_PIPELINE_STAGE_BOTTOM_OF_PIPE_BIT;
>+    if (!mCommandGraph.empty())
>+    {
>+        TRACE_EVENT0("gpu.angle", "RendererVk::finish");
> 
>-    VkSubmitInfo submitInfo;
>-    submitInfo.sType                = VK_STRUCTURE_TYPE_SUBMIT_INFO;
>-    submitInfo.pNext                = nullptr;
>-    submitInfo.waitSemaphoreCount   = 1;
>-    submitInfo.pWaitSemaphores      = waitSemaphore.ptr();
>-    submitInfo.pWaitDstStageMask    = &waitStageMask;
>-    submitInfo.commandBufferCount   = 1;
>-    submitInfo.pCommandBuffers      = commandBuffer->ptr();
>-    submitInfo.signalSemaphoreCount = 1;
>-    submitInfo.pSignalSemaphores    = signalSemaphore.ptr();
>+        vk::Scoped<vk::PrimaryCommandBuffer> commandBatch(mDevice);
>+        ANGLE_TRY(flushCommandGraph(context, &commandBatch.get()));
> 
>-    // TODO(jmadill): Investigate how to properly queue command buffer work.
>-    ANGLE_TRY(submitFrame(submitInfo));
>+        VkSubmitInfo submitInfo       = {};
>+        VkPipelineStageFlags waitMask = VK_PIPELINE_STAGE_BOTTOM_OF_PIPE_BIT;
>+        InitializeSubmitInfo(&submitInfo, commandBatch.get(), waitSemaphore, &waitMask,
>+                             signalSemaphore);
> 
>-    return vk::NoError();
>-}
>+        ANGLE_TRY(submitFrame(context, submitInfo, std::move(commandBatch.get())));
>+    }
>+    else
>+    {
>+        // If the sempahores were non-null, there will be breaks in the semaphore chain by not
>+        // submitting them.
>+        // TODO(geofflang): We can request the semaphores from the surface just before submission
>+        // once contexts hold the command graph.  http://anglebug.com/2464
>+        ASSERT(waitSemaphore == nullptr);
>+        ASSERT(signalSemaphore == nullptr);
>+    }
> 
>-vk::Error RendererVk::finish()
>-{
>     ASSERT(mQueue != VK_NULL_HANDLE);
>-    ANGLE_VK_TRY(vkQueueWaitIdle(mQueue));
>+    ANGLE_VK_TRY(context, vkQueueWaitIdle(mQueue));
>     freeAllInFlightResources();
>-    return vk::NoError();
>-}
> 
>-void RendererVk::freeAllInFlightResources()
>-{
>-    for (auto &fence : mInFlightFences)
>+    if (mGpuEventsEnabled)
>     {
>-        fence.get().destroy(mDevice);
>+        // This loop should in practice execute once since the queue is already idle.
>+        while (mInFlightGpuEventQueries.size() > 0)
>+        {
>+            ANGLE_TRY(checkCompletedGpuEvents(context));
>+        }
>+        // Recalculate the CPU/GPU time difference to account for clock drifting.  Avoid unnecessary
>+        // synchronization if there is no event to be adjusted (happens when finish() gets called
>+        // multiple times towards the end of the application).
>+        if (mGpuEvents.size() > 0)
>+        {
>+            ANGLE_TRY(synchronizeCpuGpuTime(context, nullptr, nullptr));
>+        }
>     }
>-    mInFlightFences.clear();
> 
>-    for (auto &command : mInFlightCommands)
>+    return angle::Result::Continue;
>+}
>+
>+void RendererVk::freeAllInFlightResources()
>+{
>+    for (CommandBatch &batch : mInFlightCommands)
>     {
>-        command.get().destroy(mDevice, mCommandPool);
>+        // On device loss we need to wait for fence to be signaled before destroying it
>+        if (mDeviceLost)
>+        {
>+            VkResult status = batch.fence.get().wait(mDevice, kMaxFenceWaitTimeNs);
>+            // If wait times out, it is probably not possible to recover from lost device
>+            ASSERT(status == VK_SUCCESS || status == VK_ERROR_DEVICE_LOST);
>+        }
>+        batch.commandPool.destroy(mDevice);
>+        batch.fence.reset(mDevice);
>     }
>     mInFlightCommands.clear();
> 
>@@ -660,55 +1432,38 @@ void RendererVk::freeAllInFlightResources()
>         garbage.destroy(mDevice);
>     }
>     mGarbage.clear();
>+
>+    mLastCompletedQueueSerial = mLastSubmittedQueueSerial;
> }
> 
>-vk::Error RendererVk::checkInFlightCommands()
>+angle::Result RendererVk::checkCompletedCommands(vk::Context *context)
> {
>-    size_t finishedIndex = 0;
>+    int finishedCount = 0;
> 
>-    // Check if any in-flight command buffers are finished.
>-    for (size_t index = 0; index < mInFlightFences.size(); index++)
>+    for (CommandBatch &batch : mInFlightCommands)
>     {
>-        auto *inFlightFence = &mInFlightFences[index];
>-
>-        VkResult result = inFlightFence->get().getStatus(mDevice);
>+        VkResult result = batch.fence.get().getStatus(mDevice);
>         if (result == VK_NOT_READY)
>+        {
>             break;
>-        ANGLE_VK_TRY(result);
>-        finishedIndex = index + 1;
>-
>-        // Release the fence handle.
>-        // TODO(jmadill): Re-use fences.
>-        inFlightFence->get().destroy(mDevice);
>-    }
>-
>-    if (finishedIndex == 0)
>-        return vk::NoError();
>+        }
>+        ANGLE_VK_TRY(context, result);
> 
>-    Serial finishedSerial = mInFlightFences[finishedIndex - 1].queueSerial();
>-    mInFlightFences.erase(mInFlightFences.begin(), mInFlightFences.begin() + finishedIndex);
>+        ASSERT(batch.serial > mLastCompletedQueueSerial);
>+        mLastCompletedQueueSerial = batch.serial;
> 
>-    size_t completedCBIndex = 0;
>-    for (size_t cbIndex = 0; cbIndex < mInFlightCommands.size(); ++cbIndex)
>-    {
>-        auto *inFlightCB = &mInFlightCommands[cbIndex];
>-        if (inFlightCB->queueSerial() > finishedSerial)
>-            break;
>-
>-        completedCBIndex = cbIndex + 1;
>-        inFlightCB->get().destroy(mDevice, mCommandPool);
>+        batch.fence.reset(mDevice);
>+        TRACE_EVENT0("gpu.angle", "commandPool.destroy");
>+        batch.commandPool.destroy(mDevice);
>+        ++finishedCount;
>     }
> 
>-    if (completedCBIndex == 0)
>-        return vk::NoError();
>-
>-    mInFlightCommands.erase(mInFlightCommands.begin(),
>-                            mInFlightCommands.begin() + completedCBIndex);
>+    mInFlightCommands.erase(mInFlightCommands.begin(), mInFlightCommands.begin() + finishedCount);
> 
>     size_t freeIndex = 0;
>     for (; freeIndex < mGarbage.size(); ++freeIndex)
>     {
>-        if (!mGarbage[freeIndex].destroyIfComplete(mDevice, finishedSerial))
>+        if (!mGarbage[freeIndex].destroyIfComplete(mDevice, mLastCompletedQueueSerial))
>             break;
>     }
> 
>@@ -718,118 +1473,759 @@ vk::Error RendererVk::checkInFlightCommands()
>         mGarbage.erase(mGarbage.begin(), mGarbage.begin() + freeIndex);
>     }
> 
>-    return vk::NoError();
>+    return angle::Result::Continue;
> }
> 
>-vk::Error RendererVk::submit(const VkSubmitInfo &submitInfo)
>+angle::Result RendererVk::submitFrame(vk::Context *context,
>+                                      const VkSubmitInfo &submitInfo,
>+                                      vk::PrimaryCommandBuffer &&commandBuffer)
> {
>-    ANGLE_VK_TRY(vkQueueSubmit(mQueue, 1, &submitInfo, VK_NULL_HANDLE));
>+    TRACE_EVENT0("gpu.angle", "RendererVk::submitFrame");
>+
>+    vk::Scoped<CommandBatch> scopedBatch(mDevice);
>+    CommandBatch &batch = scopedBatch.get();
>+    ANGLE_TRY(getSubmitFence(context, &batch.fence));
>+
>+    ANGLE_VK_TRY(context, vkQueueSubmit(mQueue, 1, &submitInfo, batch.fence.get().getHandle()));
> 
>     // Store this command buffer in the in-flight list.
>-    mInFlightCommands.emplace_back(std::move(mCommandBuffer), mCurrentQueueSerial);
>+    batch.commandPool = std::move(mCommandPool);
>+    batch.serial      = mCurrentQueueSerial;
>+
>+    mInFlightCommands.emplace_back(scopedBatch.release());
> 
>-    // Sanity check.
>-    ASSERT(mInFlightCommands.size() < 1000u);
>+    // Make sure a new fence is created for the next submission.
>+    mSubmitFence.reset(mDevice);
> 
>+    // CPU should be throttled to avoid mInFlightCommands from growing too fast.  That is done on
>+    // swap() though, and there could be multiple submissions in between (through glFlush() calls),
>+    // so the limit is larger than the expected number of images.
>+    ASSERT(mInFlightCommands.size() <= kInFlightCommandsLimit);
>+
>+    nextSerial();
>+
>+    ANGLE_TRY(checkCompletedCommands(context));
>+
>+    if (mGpuEventsEnabled)
>+    {
>+        ANGLE_TRY(checkCompletedGpuEvents(context));
>+    }
>+
>+    // Simply null out the command buffer here - it was allocated using the command pool.
>+    commandBuffer.releaseHandle();
>+
>+    // Reallocate the command pool for next frame.
>+    // TODO(jmadill): Consider reusing command pools.
>+    VkCommandPoolCreateInfo poolInfo = {};
>+    poolInfo.sType                   = VK_STRUCTURE_TYPE_COMMAND_POOL_CREATE_INFO;
>+    poolInfo.flags                   = VK_COMMAND_POOL_CREATE_TRANSIENT_BIT;
>+    poolInfo.queueFamilyIndex        = mCurrentQueueFamilyIndex;
>+
>+    ANGLE_VK_TRY(context, mCommandPool.init(mDevice, poolInfo));
>+    return angle::Result::Continue;
>+}
>+
>+void RendererVk::nextSerial()
>+{
>     // Increment the queue serial. If this fails, we should restart ANGLE.
>-    // TODO(jmadill): Overflow check.
>-    mCurrentQueueSerial = mQueueSerialFactory.generate();
>+    mLastSubmittedQueueSerial = mCurrentQueueSerial;
>+    mCurrentQueueSerial       = mQueueSerialFactory.generate();
>+
>+    // Notify the Contexts that they should be starting new command buffers.
>+    // We use one command pool per serial/submit associated with this VkQueue. We can also
>+    // have multiple Contexts sharing one VkQueue. In ContextVk::setupDraw we don't explicitly
>+    // check for a new serial when starting a new command buffer. We just check that the current
>+    // recording command buffer is valid. Thus we need to explicitly notify every other Context
>+    // using this VkQueue that they their current command buffer is no longer valid.
>+    for (gl::Context *context : mDisplay->getContextSet())
>+    {
>+        ContextVk *contextVk = vk::GetImpl(context);
>+        contextVk->onCommandBufferFinished();
>+    }
>+}
> 
>-    return vk::NoError();
>+bool RendererVk::isSerialInUse(Serial serial) const
>+{
>+    return serial > mLastCompletedQueueSerial;
> }
> 
>-vk::Error RendererVk::submitFrame(const VkSubmitInfo &submitInfo)
>+angle::Result RendererVk::finishToSerial(vk::Context *context, Serial serial)
> {
>-    VkFenceCreateInfo createInfo;
>-    createInfo.sType = VK_STRUCTURE_TYPE_FENCE_CREATE_INFO;
>-    createInfo.pNext = nullptr;
>-    createInfo.flags = 0;
>+    if (!isSerialInUse(serial) || mInFlightCommands.empty())
>+    {
>+        return angle::Result::Continue;
>+    }
> 
>-    vk::Fence fence;
>-    ANGLE_TRY(fence.init(mDevice, createInfo));
>+    // Find the first batch with serial equal to or bigger than given serial (note that
>+    // the batch serials are unique, otherwise upper-bound would have been necessary).
>+    size_t batchIndex = mInFlightCommands.size() - 1;
>+    for (size_t i = 0; i < mInFlightCommands.size(); ++i)
>+    {
>+        if (mInFlightCommands[i].serial >= serial)
>+        {
>+            batchIndex = i;
>+            break;
>+        }
>+    }
>+    const CommandBatch &batch = mInFlightCommands[batchIndex];
> 
>-    ANGLE_VK_TRY(vkQueueSubmit(mQueue, 1, &submitInfo, fence.getHandle()));
>+    // Wait for it finish
>+    VkResult status = batch.fence.get().wait(mDevice, kMaxFenceWaitTimeNs);
> 
>-    // Store this command buffer in the in-flight list.
>-    mInFlightFences.emplace_back(std::move(fence), mCurrentQueueSerial);
>-    mInFlightCommands.emplace_back(std::move(mCommandBuffer), mCurrentQueueSerial);
>+    // Don't tolerate timeout.  If such a large wait time results in timeout, something's wrong.
>+    ANGLE_VK_TRY(context, status);
> 
>-    // Sanity check.
>-    ASSERT(mInFlightCommands.size() < 1000u);
>+    // Clean up finished batches.
>+    return checkCompletedCommands(context);
>+}
> 
>-    // Increment the queue serial. If this fails, we should restart ANGLE.
>-    // TODO(jmadill): Overflow check.
>-    mCurrentQueueSerial = mQueueSerialFactory.generate();
>+angle::Result RendererVk::getCompatibleRenderPass(vk::Context *context,
>+                                                  const vk::RenderPassDesc &desc,
>+                                                  vk::RenderPass **renderPassOut)
>+{
>+    return mRenderPassCache.getCompatibleRenderPass(context, mCurrentQueueSerial, desc,
>+                                                    renderPassOut);
>+}
>+
>+angle::Result RendererVk::getRenderPassWithOps(vk::Context *context,
>+                                               const vk::RenderPassDesc &desc,
>+                                               const vk::AttachmentOpsArray &ops,
>+                                               vk::RenderPass **renderPassOut)
>+{
>+    return mRenderPassCache.getRenderPassWithOps(context, mCurrentQueueSerial, desc, ops,
>+                                                 renderPassOut);
>+}
>+
>+vk::CommandGraph *RendererVk::getCommandGraph()
>+{
>+    return &mCommandGraph;
>+}
>+
>+angle::Result RendererVk::flushCommandGraph(vk::Context *context,
>+                                            vk::PrimaryCommandBuffer *commandBatch)
>+{
>+    return mCommandGraph.submitCommands(context, mCurrentQueueSerial, &mRenderPassCache,
>+                                        &mCommandPool, commandBatch);
>+}
>+
>+angle::Result RendererVk::flush(vk::Context *context,
>+                                const vk::Semaphore *waitSemaphore,
>+                                const vk::Semaphore *signalSemaphore)
>+{
>+    if (mCommandGraph.empty())
>+    {
>+        // If the sempahores were non-null, there will be breaks in the semaphore chain by not
>+        // submitting them.
>+        // TODO(geofflang): We can request the semaphores from the surface just before submission
>+        // once contexts hold the command graph.  http://anglebug.com/2464
>+        ASSERT(waitSemaphore == nullptr);
>+        ASSERT(signalSemaphore == nullptr);
>+        return angle::Result::Continue;
>+    }
> 
>-    ANGLE_TRY(checkInFlightCommands());
>+    TRACE_EVENT0("gpu.angle", "RendererVk::flush");
> 
>-    return vk::NoError();
>+    vk::Scoped<vk::PrimaryCommandBuffer> commandBatch(mDevice);
>+    ANGLE_TRY(flushCommandGraph(context, &commandBatch.get()));
>+
>+    VkSubmitInfo submitInfo       = {};
>+    VkPipelineStageFlags waitMask = VK_PIPELINE_STAGE_BOTTOM_OF_PIPE_BIT;
>+    InitializeSubmitInfo(&submitInfo, commandBatch.get(), waitSemaphore, &waitMask,
>+                         signalSemaphore);
>+
>+    ANGLE_TRY(submitFrame(context, submitInfo, commandBatch.release()));
>+
>+    return angle::Result::Continue;
> }
> 
>-vk::Error RendererVk::createStagingImage(TextureDimension dimension,
>-                                         const vk::Format &format,
>-                                         const gl::Extents &extent,
>-                                         vk::StagingUsage usage,
>-                                         vk::StagingImage *imageOut)
>+Serial RendererVk::issueShaderSerial()
> {
>-    ANGLE_TRY(imageOut->init(mDevice, mCurrentQueueFamilyIndex, mMemoryProperties, dimension,
>-                             format.vkTextureFormat, extent, usage));
>-    return vk::NoError();
>+    return mShaderSerialFactory.generate();
> }
> 
>-GlslangWrapper *RendererVk::getGlslangWrapper()
>+angle::Result RendererVk::getDescriptorSetLayout(
>+    vk::Context *context,
>+    const vk::DescriptorSetLayoutDesc &desc,
>+    vk::BindingPointer<vk::DescriptorSetLayout> *descriptorSetLayoutOut)
> {
>-    return mGlslangWrapper;
>+    return mDescriptorSetLayoutCache.getDescriptorSetLayout(context, desc, descriptorSetLayoutOut);
> }
> 
>-Serial RendererVk::getCurrentQueueSerial() const
>+angle::Result RendererVk::getPipelineLayout(
>+    vk::Context *context,
>+    const vk::PipelineLayoutDesc &desc,
>+    const vk::DescriptorSetLayoutPointerArray &descriptorSetLayouts,
>+    vk::BindingPointer<vk::PipelineLayout> *pipelineLayoutOut)
> {
>-    return mCurrentQueueSerial;
>+    return mPipelineLayoutCache.getPipelineLayout(context, desc, descriptorSetLayouts,
>+                                                  pipelineLayoutOut);
> }
> 
>-gl::Error RendererVk::ensureInRenderPass(const gl::Context *context, FramebufferVk *framebufferVk)
>+angle::Result RendererVk::syncPipelineCacheVk(DisplayVk *displayVk)
> {
>-    if (mCurrentRenderPassFramebuffer == framebufferVk)
>+    ASSERT(mPipelineCache.valid());
>+
>+    if (--mPipelineCacheVkUpdateTimeout > 0)
>+    {
>+        return angle::Result::Continue;
>+    }
>+
>+    mPipelineCacheVkUpdateTimeout = kPipelineCacheVkUpdatePeriod;
>+
>+    // Get the size of the cache.
>+    size_t pipelineCacheSize = 0;
>+    VkResult result          = mPipelineCache.getCacheData(mDevice, &pipelineCacheSize, nullptr);
>+    if (result != VK_INCOMPLETE)
>     {
>-        return gl::NoError();
>+        ANGLE_VK_TRY(displayVk, result);
>     }
> 
>-    if (mCurrentRenderPassFramebuffer)
>+    angle::MemoryBuffer *pipelineCacheData = nullptr;
>+    ANGLE_VK_CHECK_ALLOC(displayVk,
>+                         displayVk->getScratchBuffer(pipelineCacheSize, &pipelineCacheData));
>+
>+    size_t originalPipelineCacheSize = pipelineCacheSize;
>+    result = mPipelineCache.getCacheData(mDevice, &pipelineCacheSize, pipelineCacheData->data());
>+    // Note: currently we don't accept incomplete as we don't expect it (the full size of cache
>+    // was determined just above), so receiving it hints at an implementation bug we would want
>+    // to know about early.
>+    ASSERT(result != VK_INCOMPLETE);
>+    ANGLE_VK_TRY(displayVk, result);
>+
>+    // If vkGetPipelineCacheData ends up writing fewer bytes than requested, zero out the rest of
>+    // the buffer to avoid leaking garbage memory.
>+    ASSERT(pipelineCacheSize <= originalPipelineCacheSize);
>+    if (pipelineCacheSize < originalPipelineCacheSize)
>     {
>-        endRenderPass();
>+        memset(pipelineCacheData->data() + pipelineCacheSize, 0,
>+               originalPipelineCacheSize - pipelineCacheSize);
>     }
>-    ANGLE_TRY(
>-        framebufferVk->beginRenderPass(context, mDevice, &mCommandBuffer, mCurrentQueueSerial));
>-    mCurrentRenderPassFramebuffer = framebufferVk;
>-    return gl::NoError();
>+
>+    displayVk->getBlobCache()->putApplication(mPipelineCacheVkBlobKey, *pipelineCacheData);
>+
>+    return angle::Result::Continue;
> }
> 
>-void RendererVk::endRenderPass()
>+angle::Result RendererVk::getSubmitFence(vk::Context *context,
>+                                         vk::Shared<vk::Fence> *sharedFenceOut)
> {
>-    if (mCurrentRenderPassFramebuffer)
>+    if (!mSubmitFence.isReferenced())
>     {
>-        ASSERT(mCommandBuffer.started());
>-        mCommandBuffer.endRenderPass();
>-        mCurrentRenderPassFramebuffer = nullptr;
>+        vk::Fence fence;
>+
>+        VkFenceCreateInfo fenceCreateInfo = {};
>+        fenceCreateInfo.sType             = VK_STRUCTURE_TYPE_FENCE_CREATE_INFO;
>+        fenceCreateInfo.flags             = 0;
>+
>+        ANGLE_VK_TRY(context, fence.init(mDevice, fenceCreateInfo));
>+
>+        mSubmitFence.assign(mDevice, std::move(fence));
>     }
>+
>+    sharedFenceOut->copy(mDevice, mSubmitFence);
>+    return angle::Result::Continue;
> }
> 
>-void RendererVk::onReleaseRenderPass(const FramebufferVk *framebufferVk)
>+angle::Result RendererVk::getTimestamp(vk::Context *context, uint64_t *timestampOut)
> {
>-    if (mCurrentRenderPassFramebuffer == framebufferVk)
>+    // The intent of this function is to query the timestamp without stalling the GPU.  Currently,
>+    // that seems impossible, so instead, we are going to make a small submission with just a
>+    // timestamp query.  First, the disjoint timer query extension says:
>+    //
>+    // > This will return the GL time after all previous commands have reached the GL server but
>+    // have not yet necessarily executed.
>+    //
>+    // The previous commands are stored in the command graph at the moment and are not yet flushed.
>+    // The wording allows us to make a submission to get the timestamp without performing a flush.
>+    //
>+    // Second:
>+    //
>+    // > By using a combination of this synchronous get command and the asynchronous timestamp query
>+    // object target, applications can measure the latency between when commands reach the GL server
>+    // and when they are realized in the framebuffer.
>+    //
>+    // This fits with the above strategy as well, although inevitably we are possibly introducing a
>+    // GPU bubble.  This function directly generates a command buffer and submits it instead of
>+    // using the other member functions.  This is to avoid changing any state, such as the queue
>+    // serial.
>+
>+    // Create a query used to receive the GPU timestamp
>+    vk::Scoped<vk::DynamicQueryPool> timestampQueryPool(mDevice);
>+    vk::QueryHelper timestampQuery;
>+    ANGLE_TRY(timestampQueryPool.get().init(context, VK_QUERY_TYPE_TIMESTAMP, 1));
>+    ANGLE_TRY(timestampQueryPool.get().allocateQuery(context, &timestampQuery));
>+
>+    // Record the command buffer
>+    vk::Scoped<vk::PrimaryCommandBuffer> commandBatch(mDevice);
>+    vk::PrimaryCommandBuffer &commandBuffer = commandBatch.get();
>+
>+    VkCommandBufferAllocateInfo commandBufferInfo = {};
>+    commandBufferInfo.sType                       = VK_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOCATE_INFO;
>+    commandBufferInfo.commandPool                 = mCommandPool.getHandle();
>+    commandBufferInfo.level                       = VK_COMMAND_BUFFER_LEVEL_PRIMARY;
>+    commandBufferInfo.commandBufferCount          = 1;
>+
>+    ANGLE_VK_TRY(context, commandBuffer.init(mDevice, commandBufferInfo));
>+
>+    VkCommandBufferBeginInfo beginInfo = {};
>+    beginInfo.sType                    = VK_STRUCTURE_TYPE_COMMAND_BUFFER_BEGIN_INFO;
>+    beginInfo.flags                    = 0;
>+    beginInfo.pInheritanceInfo         = nullptr;
>+
>+    ANGLE_VK_TRY(context, commandBuffer.begin(beginInfo));
>+
>+    commandBuffer.resetQueryPool(timestampQuery.getQueryPool()->getHandle(),
>+                                 timestampQuery.getQuery(), 1);
>+    commandBuffer.writeTimestamp(VK_PIPELINE_STAGE_BOTTOM_OF_PIPE_BIT,
>+                                 timestampQuery.getQueryPool()->getHandle(),
>+                                 timestampQuery.getQuery());
>+
>+    ANGLE_VK_TRY(context, commandBuffer.end());
>+
>+    // Create fence for the submission
>+    VkFenceCreateInfo fenceInfo = {};
>+    fenceInfo.sType             = VK_STRUCTURE_TYPE_FENCE_CREATE_INFO;
>+    fenceInfo.flags             = 0;
>+
>+    vk::Scoped<vk::Fence> fence(mDevice);
>+    ANGLE_VK_TRY(context, fence.get().init(mDevice, fenceInfo));
>+
>+    // Submit the command buffer
>+    VkSubmitInfo submitInfo = {};
>+    InitializeSubmitInfo(&submitInfo, commandBatch.get(), nullptr, nullptr, nullptr);
>+
>+    ANGLE_VK_TRY(context, vkQueueSubmit(mQueue, 1, &submitInfo, fence.get().getHandle()));
>+
>+    // Wait for the submission to finish.  Given no semaphores, there is hope that it would execute
>+    // in parallel with what's already running on the GPU.
>+    ANGLE_VK_TRY(context, fence.get().wait(mDevice, kMaxFenceWaitTimeNs));
>+
>+    // Get the query results
>+    constexpr VkQueryResultFlags queryFlags = VK_QUERY_RESULT_WAIT_BIT | VK_QUERY_RESULT_64_BIT;
>+
>+    ANGLE_VK_TRY(context, timestampQuery.getQueryPool()->getResults(
>+                              mDevice, timestampQuery.getQuery(), 1, sizeof(*timestampOut),
>+                              timestampOut, sizeof(*timestampOut), queryFlags));
>+
>+    timestampQueryPool.get().freeQuery(context, &timestampQuery);
>+
>+    // Convert results to nanoseconds.
>+    *timestampOut = static_cast<uint64_t>(
>+        *timestampOut * static_cast<double>(mPhysicalDeviceProperties.limits.timestampPeriod));
>+
>+    return angle::Result::Continue;
>+}
>+
>+// These functions look at the mandatory format for support, and fallback to querying the device (if
>+// necessary) to test the availability of the bits.
>+bool RendererVk::hasLinearImageFormatFeatureBits(VkFormat format,
>+                                                 const VkFormatFeatureFlags featureBits)
>+{
>+    return hasFormatFeatureBits<&VkFormatProperties::linearTilingFeatures>(format, featureBits);
>+}
>+
>+VkFormatFeatureFlags RendererVk::getImageFormatFeatureBits(VkFormat format,
>+                                                           const VkFormatFeatureFlags featureBits)
>+{
>+    return getFormatFeatureBits<&VkFormatProperties::optimalTilingFeatures>(format, featureBits);
>+}
>+
>+bool RendererVk::hasImageFormatFeatureBits(VkFormat format, const VkFormatFeatureFlags featureBits)
>+{
>+    return hasFormatFeatureBits<&VkFormatProperties::optimalTilingFeatures>(format, featureBits);
>+}
>+
>+bool RendererVk::hasBufferFormatFeatureBits(VkFormat format, const VkFormatFeatureFlags featureBits)
>+{
>+    return hasFormatFeatureBits<&VkFormatProperties::bufferFeatures>(format, featureBits);
>+}
>+
>+void RendererVk::insertDebugMarker(GLenum source, GLuint id, std::string &&marker)
>+{
>+    mCommandGraph.insertDebugMarker(source, std::move(marker));
>+}
>+
>+void RendererVk::pushDebugMarker(GLenum source, GLuint id, std::string &&marker)
>+{
>+    mCommandGraph.pushDebugMarker(source, std::move(marker));
>+}
>+
>+void RendererVk::popDebugMarker()
>+{
>+    mCommandGraph.popDebugMarker();
>+}
>+
>+angle::Result RendererVk::synchronizeCpuGpuTime(vk::Context *context,
>+                                                const vk::Semaphore *waitSemaphore,
>+                                                const vk::Semaphore *signalSemaphore)
>+{
>+    ASSERT(mGpuEventsEnabled);
>+
>+    angle::PlatformMethods *platform = ANGLEPlatformCurrent();
>+    ASSERT(platform);
>+
>+    // To synchronize CPU and GPU times, we need to get the CPU timestamp as close as possible to
>+    // the GPU timestamp.  The process of getting the GPU timestamp is as follows:
>+    //
>+    //             CPU                            GPU
>+    //
>+    //     Record command buffer
>+    //     with timestamp query
>+    //
>+    //     Submit command buffer
>+    //
>+    //     Post-submission work             Begin execution
>+    //
>+    //            ????                    Write timestamp Tgpu
>+    //
>+    //            ????                       End execution
>+    //
>+    //            ????                    Return query results
>+    //
>+    //            ????
>+    //
>+    //       Get query results
>+    //
>+    // The areas of unknown work (????) on the CPU indicate that the CPU may or may not have
>+    // finished post-submission work while the GPU is executing in parallel. With no further work,
>+    // querying CPU timestamps before submission and after getting query results give the bounds to
>+    // Tgpu, which could be quite large.
>+    //
>+    // Using VkEvents, the GPU can be made to wait for the CPU and vice versa, in an effort to
>+    // reduce this range. This function implements the following procedure:
>+    //
>+    //             CPU                            GPU
>+    //
>+    //     Record command buffer
>+    //     with timestamp query
>+    //
>+    //     Submit command buffer
>+    //
>+    //     Post-submission work             Begin execution
>+    //
>+    //            ????                    Set Event GPUReady
>+    //
>+    //    Wait on Event GPUReady         Wait on Event CPUReady
>+    //
>+    //       Get CPU Time Ts             Wait on Event CPUReady
>+    //
>+    //      Set Event CPUReady           Wait on Event CPUReady
>+    //
>+    //      Get CPU Time Tcpu              Get GPU Time Tgpu
>+    //
>+    //    Wait on Event GPUDone            Set Event GPUDone
>+    //
>+    //       Get CPU Time Te                 End Execution
>+    //
>+    //            Idle                    Return query results
>+    //
>+    //      Get query results
>+    //
>+    // If Te-Ts > epsilon, a GPU or CPU interruption can be assumed and the operation can be
>+    // retried.  Once Te-Ts < epsilon, Tcpu can be taken to presumably match Tgpu.  Finding an
>+    // epsilon that's valid for all devices may be difficult, so the loop can be performed only a
>+    // limited number of times and the Tcpu,Tgpu pair corresponding to smallest Te-Ts used for
>+    // calibration.
>+    //
>+    // Note: Once VK_EXT_calibrated_timestamps is ubiquitous, this should be redone.
>+
>+    // Make sure nothing is running
>+    ASSERT(mCommandGraph.empty());
>+
>+    TRACE_EVENT0("gpu.angle", "RendererVk::synchronizeCpuGpuTime");
>+
>+    // Create a query used to receive the GPU timestamp
>+    vk::QueryHelper timestampQuery;
>+    ANGLE_TRY(mGpuEventQueryPool.allocateQuery(context, &timestampQuery));
>+
>+    // Create the three events
>+    VkEventCreateInfo eventCreateInfo = {};
>+    eventCreateInfo.sType             = VK_STRUCTURE_TYPE_EVENT_CREATE_INFO;
>+    eventCreateInfo.flags             = 0;
>+
>+    vk::Scoped<vk::Event> cpuReady(mDevice), gpuReady(mDevice), gpuDone(mDevice);
>+    ANGLE_VK_TRY(context, cpuReady.get().init(mDevice, eventCreateInfo));
>+    ANGLE_VK_TRY(context, gpuReady.get().init(mDevice, eventCreateInfo));
>+    ANGLE_VK_TRY(context, gpuDone.get().init(mDevice, eventCreateInfo));
>+
>+    constexpr uint32_t kRetries = 10;
>+
>+    // Time suffixes used are S for seconds and Cycles for cycles
>+    double tightestRangeS = 1e6f;
>+    double TcpuS          = 0;
>+    uint64_t TgpuCycles   = 0;
>+    for (uint32_t i = 0; i < kRetries; ++i)
>     {
>-        endRenderPass();
>+        // Reset the events
>+        ANGLE_VK_TRY(context, cpuReady.get().reset(mDevice));
>+        ANGLE_VK_TRY(context, gpuReady.get().reset(mDevice));
>+        ANGLE_VK_TRY(context, gpuDone.get().reset(mDevice));
>+
>+        // Record the command buffer
>+        vk::Scoped<vk::PrimaryCommandBuffer> commandBatch(mDevice);
>+        vk::PrimaryCommandBuffer &commandBuffer = commandBatch.get();
>+
>+        VkCommandBufferAllocateInfo commandBufferInfo = {};
>+        commandBufferInfo.sType              = VK_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOCATE_INFO;
>+        commandBufferInfo.commandPool        = mCommandPool.getHandle();
>+        commandBufferInfo.level              = VK_COMMAND_BUFFER_LEVEL_PRIMARY;
>+        commandBufferInfo.commandBufferCount = 1;
>+
>+        ANGLE_VK_TRY(context, commandBuffer.init(mDevice, commandBufferInfo));
>+
>+        VkCommandBufferBeginInfo beginInfo = {};
>+        beginInfo.sType                    = VK_STRUCTURE_TYPE_COMMAND_BUFFER_BEGIN_INFO;
>+        beginInfo.flags                    = 0;
>+        beginInfo.pInheritanceInfo         = nullptr;
>+
>+        ANGLE_VK_TRY(context, commandBuffer.begin(beginInfo));
>+
>+        commandBuffer.setEvent(gpuReady.get().getHandle(), VK_PIPELINE_STAGE_ALL_GRAPHICS_BIT);
>+        commandBuffer.waitEvents(1, cpuReady.get().ptr(), VK_PIPELINE_STAGE_HOST_BIT,
>+                                 VK_PIPELINE_STAGE_ALL_GRAPHICS_BIT, 0, nullptr, 0, nullptr, 0,
>+                                 nullptr);
>+
>+        commandBuffer.resetQueryPool(timestampQuery.getQueryPool()->getHandle(),
>+                                     timestampQuery.getQuery(), 1);
>+        commandBuffer.writeTimestamp(VK_PIPELINE_STAGE_BOTTOM_OF_PIPE_BIT,
>+                                     timestampQuery.getQueryPool()->getHandle(),
>+                                     timestampQuery.getQuery());
>+
>+        commandBuffer.setEvent(gpuDone.get().getHandle(), VK_PIPELINE_STAGE_ALL_GRAPHICS_BIT);
>+
>+        ANGLE_VK_TRY(context, commandBuffer.end());
>+
>+        // Submit the command buffer
>+        VkSubmitInfo submitInfo       = {};
>+        VkPipelineStageFlags waitMask = VK_PIPELINE_STAGE_BOTTOM_OF_PIPE_BIT;
>+        InitializeSubmitInfo(&submitInfo, commandBatch.get(), waitSemaphore, &waitMask,
>+                             signalSemaphore);
>+
>+        ANGLE_TRY(submitFrame(context, submitInfo, std::move(commandBuffer)));
>+
>+        // Wait for GPU to be ready.  This is a short busy wait.
>+        VkResult result = VK_EVENT_RESET;
>+        do
>+        {
>+            result = gpuReady.get().getStatus(mDevice);
>+            if (result != VK_EVENT_SET && result != VK_EVENT_RESET)
>+            {
>+                ANGLE_VK_TRY(context, result);
>+            }
>+        } while (result == VK_EVENT_RESET);
>+
>+        double TsS = platform->monotonicallyIncreasingTime(platform);
>+
>+        // Tell the GPU to go ahead with the timestamp query.
>+        ANGLE_VK_TRY(context, cpuReady.get().set(mDevice));
>+        double cpuTimestampS = platform->monotonicallyIncreasingTime(platform);
>+
>+        // Wait for GPU to be done.  Another short busy wait.
>+        do
>+        {
>+            result = gpuDone.get().getStatus(mDevice);
>+            if (result != VK_EVENT_SET && result != VK_EVENT_RESET)
>+            {
>+                ANGLE_VK_TRY(context, result);
>+            }
>+        } while (result == VK_EVENT_RESET);
>+
>+        double TeS = platform->monotonicallyIncreasingTime(platform);
>+
>+        // Get the query results
>+        ANGLE_TRY(finishToSerial(context, getLastSubmittedQueueSerial()));
>+
>+        constexpr VkQueryResultFlags queryFlags = VK_QUERY_RESULT_WAIT_BIT | VK_QUERY_RESULT_64_BIT;
>+
>+        uint64_t gpuTimestampCycles = 0;
>+        ANGLE_VK_TRY(context, timestampQuery.getQueryPool()->getResults(
>+                                  mDevice, timestampQuery.getQuery(), 1, sizeof(gpuTimestampCycles),
>+                                  &gpuTimestampCycles, sizeof(gpuTimestampCycles), queryFlags));
>+
>+        // Use the first timestamp queried as origin.
>+        if (mGpuEventTimestampOrigin == 0)
>+        {
>+            mGpuEventTimestampOrigin = gpuTimestampCycles;
>+        }
>+
>+        // Take these CPU and GPU timestamps if there is better confidence.
>+        double confidenceRangeS = TeS - TsS;
>+        if (confidenceRangeS < tightestRangeS)
>+        {
>+            tightestRangeS = confidenceRangeS;
>+            TcpuS          = cpuTimestampS;
>+            TgpuCycles     = gpuTimestampCycles;
>+        }
>     }
>+
>+    mGpuEventQueryPool.freeQuery(context, &timestampQuery);
>+
>+    // timestampPeriod gives nanoseconds/cycle.
>+    double TgpuS = (TgpuCycles - mGpuEventTimestampOrigin) *
>+                   static_cast<double>(mPhysicalDeviceProperties.limits.timestampPeriod) /
>+                   1'000'000'000.0;
>+
>+    flushGpuEvents(TgpuS, TcpuS);
>+
>+    mGpuClockSync.gpuTimestampS = TgpuS;
>+    mGpuClockSync.cpuTimestampS = TcpuS;
>+
>+    return angle::Result::Continue;
> }
> 
>-bool RendererVk::isResourceInUse(const ResourceVk &resource)
>+angle::Result RendererVk::traceGpuEventImpl(vk::Context *context,
>+                                            vk::PrimaryCommandBuffer *commandBuffer,
>+                                            char phase,
>+                                            const char *name)
> {
>-    return isSerialInUse(resource.getQueueSerial());
>+    ASSERT(mGpuEventsEnabled);
>+
>+    GpuEventQuery event;
>+
>+    event.name   = name;
>+    event.phase  = phase;
>+    event.serial = mCurrentQueueSerial;
>+
>+    ANGLE_TRY(mGpuEventQueryPool.allocateQuery(context, &event.queryPoolIndex, &event.queryIndex));
>+
>+    commandBuffer->resetQueryPool(
>+        mGpuEventQueryPool.getQueryPool(event.queryPoolIndex)->getHandle(), event.queryIndex, 1);
>+    commandBuffer->writeTimestamp(
>+        VK_PIPELINE_STAGE_BOTTOM_OF_PIPE_BIT,
>+        mGpuEventQueryPool.getQueryPool(event.queryPoolIndex)->getHandle(), event.queryIndex);
>+
>+    mInFlightGpuEventQueries.push_back(std::move(event));
>+
>+    return angle::Result::Continue;
> }
> 
>-bool RendererVk::isSerialInUse(Serial serial)
>+angle::Result RendererVk::checkCompletedGpuEvents(vk::Context *context)
> {
>-    return serial > mLastCompletedQueueSerial;
>+    ASSERT(mGpuEventsEnabled);
>+
>+    angle::PlatformMethods *platform = ANGLEPlatformCurrent();
>+    ASSERT(platform);
>+
>+    int finishedCount = 0;
>+
>+    for (GpuEventQuery &eventQuery : mInFlightGpuEventQueries)
>+    {
>+        // Only check the timestamp query if the submission has finished.
>+        if (eventQuery.serial > mLastCompletedQueueSerial)
>+        {
>+            break;
>+        }
>+
>+        // See if the results are available.
>+        uint64_t gpuTimestampCycles = 0;
>+        VkResult result             = mGpuEventQueryPool.getQueryPool(eventQuery.queryPoolIndex)
>+                              ->getResults(mDevice, eventQuery.queryIndex, 1,
>+                                           sizeof(gpuTimestampCycles), &gpuTimestampCycles,
>+                                           sizeof(gpuTimestampCycles), VK_QUERY_RESULT_64_BIT);
>+        if (result == VK_NOT_READY)
>+        {
>+            break;
>+        }
>+        ANGLE_VK_TRY(context, result);
>+
>+        mGpuEventQueryPool.freeQuery(context, eventQuery.queryPoolIndex, eventQuery.queryIndex);
>+
>+        GpuEvent event;
>+        event.gpuTimestampCycles = gpuTimestampCycles;
>+        event.name               = eventQuery.name;
>+        event.phase              = eventQuery.phase;
>+
>+        mGpuEvents.emplace_back(event);
>+
>+        ++finishedCount;
>+    }
>+
>+    mInFlightGpuEventQueries.erase(mInFlightGpuEventQueries.begin(),
>+                                   mInFlightGpuEventQueries.begin() + finishedCount);
>+
>+    return angle::Result::Continue;
>+}
>+
>+void RendererVk::flushGpuEvents(double nextSyncGpuTimestampS, double nextSyncCpuTimestampS)
>+{
>+    if (mGpuEvents.size() == 0)
>+    {
>+        return;
>+    }
>+
>+    angle::PlatformMethods *platform = ANGLEPlatformCurrent();
>+    ASSERT(platform);
>+
>+    // Find the slope of the clock drift for adjustment
>+    double lastGpuSyncTimeS  = mGpuClockSync.gpuTimestampS;
>+    double lastGpuSyncDiffS  = mGpuClockSync.cpuTimestampS - mGpuClockSync.gpuTimestampS;
>+    double gpuSyncDriftSlope = 0;
>+
>+    double nextGpuSyncTimeS = nextSyncGpuTimestampS;
>+    double nextGpuSyncDiffS = nextSyncCpuTimestampS - nextSyncGpuTimestampS;
>+
>+    // No gpu trace events should have been generated before the clock sync, so if there is no
>+    // "previous" clock sync, there should be no gpu events (i.e. the function early-outs above).
>+    ASSERT(mGpuClockSync.gpuTimestampS != std::numeric_limits<double>::max() &&
>+           mGpuClockSync.cpuTimestampS != std::numeric_limits<double>::max());
>+
>+    gpuSyncDriftSlope =
>+        (nextGpuSyncDiffS - lastGpuSyncDiffS) / (nextGpuSyncTimeS - lastGpuSyncTimeS);
>+
>+    for (const GpuEvent &event : mGpuEvents)
>+    {
>+        double gpuTimestampS =
>+            (event.gpuTimestampCycles - mGpuEventTimestampOrigin) *
>+            static_cast<double>(mPhysicalDeviceProperties.limits.timestampPeriod) * 1e-9;
>+
>+        // Account for clock drift.
>+        gpuTimestampS += lastGpuSyncDiffS + gpuSyncDriftSlope * (gpuTimestampS - lastGpuSyncTimeS);
>+
>+        // Generate the trace now that the GPU timestamp is available and clock drifts are accounted
>+        // for.
>+        static long long eventId = 1;
>+        static const unsigned char *categoryEnabled =
>+            TRACE_EVENT_API_GET_CATEGORY_ENABLED("gpu.angle.gpu");
>+        platform->addTraceEvent(platform, event.phase, categoryEnabled, event.name, eventId++,
>+                                gpuTimestampS, 0, nullptr, nullptr, nullptr, TRACE_EVENT_FLAG_NONE);
>+    }
>+
>+    mGpuEvents.clear();
>+}
>+
>+template <VkFormatFeatureFlags VkFormatProperties::*features>
>+VkFormatFeatureFlags RendererVk::getFormatFeatureBits(VkFormat format,
>+                                                      const VkFormatFeatureFlags featureBits)
>+{
>+    ASSERT(static_cast<uint32_t>(format) < vk::kNumVkFormats);
>+    VkFormatProperties &deviceProperties = mFormatProperties[format];
>+
>+    if (deviceProperties.bufferFeatures == kInvalidFormatFeatureFlags)
>+    {
>+        // If we don't have the actual device features, see if the requested features are mandatory.
>+        // If so, there's no need to query the device.
>+        const VkFormatProperties &mandatoryProperties = vk::GetMandatoryFormatSupport(format);
>+        if (IsMaskFlagSet(mandatoryProperties.*features, featureBits))
>+        {
>+            return featureBits;
>+        }
>+
>+        // Otherwise query the format features and cache it.
>+        vkGetPhysicalDeviceFormatProperties(mPhysicalDevice, format, &deviceProperties);
>+    }
>+
>+    return deviceProperties.*features & featureBits;
>+}
>+
>+template <VkFormatFeatureFlags VkFormatProperties::*features>
>+bool RendererVk::hasFormatFeatureBits(VkFormat format, const VkFormatFeatureFlags featureBits)
>+{
>+    return IsMaskFlagSet(getFormatFeatureBits<features>(format, featureBits), featureBits);
>+}
>+
>+uint32_t GetUniformBufferDescriptorCount()
>+{
>+    return kUniformBufferDescriptorsPerDescriptorSet;
> }
> 
> }  // namespace rx
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/RendererVk.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/RendererVk.h
>index 3f69a755495..7262adb37e3 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/RendererVk.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/RendererVk.h
>@@ -10,23 +10,30 @@
> #ifndef LIBANGLE_RENDERER_VULKAN_RENDERERVK_H_
> #define LIBANGLE_RENDERER_VULKAN_RENDERERVK_H_
> 
>-#include <memory>
> #include <vulkan/vulkan.h>
>+#include <memory>
> 
>+#include "common/PoolAlloc.h"
> #include "common/angleutils.h"
>+#include "libANGLE/BlobCache.h"
> #include "libANGLE/Caps.h"
>-#include "libANGLE/renderer/vulkan/formatutilsvk.h"
>-#include "libANGLE/renderer/vulkan/renderervk_utils.h"
>+#include "libANGLE/renderer/vulkan/CommandGraph.h"
>+#include "libANGLE/renderer/vulkan/QueryVk.h"
>+#include "libANGLE/renderer/vulkan/UtilsVk.h"
>+#include "libANGLE/renderer/vulkan/vk_format_utils.h"
>+#include "libANGLE/renderer/vulkan/vk_helpers.h"
>+#include "libANGLE/renderer/vulkan/vk_internal_shaders_autogen.h"
> 
> namespace egl
> {
>-class AttributeMap;
>-}
>+class Display;
>+class BlobCache;
>+}  // namespace egl
> 
> namespace rx
> {
>+class DisplayVk;
> class FramebufferVk;
>-class GlslangWrapper;
> 
> namespace vk
> {
>@@ -39,51 +46,57 @@ class RendererVk : angle::NonCopyable
>     RendererVk();
>     ~RendererVk();
> 
>-    vk::Error initialize(const egl::AttributeMap &attribs, const char *wsiName);
>+    angle::Result initialize(DisplayVk *displayVk,
>+                             egl::Display *display,
>+                             const char *wsiExtension,
>+                             const char *wsiLayer);
>+    void onDestroy(vk::Context *context);
>+
>+    void notifyDeviceLost();
>+    bool isDeviceLost() const;
> 
>     std::string getVendorString() const;
>     std::string getRendererDescription() const;
> 
>+    gl::Version getMaxSupportedESVersion() const;
>+
>     VkInstance getInstance() const { return mInstance; }
>     VkPhysicalDevice getPhysicalDevice() const { return mPhysicalDevice; }
>+    const VkPhysicalDeviceProperties &getPhysicalDeviceProperties() const
>+    {
>+        return mPhysicalDeviceProperties;
>+    }
>+    const VkPhysicalDeviceFeatures &getPhysicalDeviceFeatures() const
>+    {
>+        return mPhysicalDeviceFeatures;
>+    }
>     VkQueue getQueue() const { return mQueue; }
>     VkDevice getDevice() const { return mDevice; }
> 
>-    vk::ErrorOrResult<uint32_t> selectPresentQueueForSurface(VkSurfaceKHR surface);
>+    angle::Result selectPresentQueueForSurface(DisplayVk *displayVk,
>+                                               VkSurfaceKHR surface,
>+                                               uint32_t *presentQueueOut);
>+
>+    angle::Result finish(vk::Context *context,
>+                         const vk::Semaphore *waitSemaphore,
>+                         const vk::Semaphore *signalSemaphore);
>+    angle::Result flush(vk::Context *context,
>+                        const vk::Semaphore *waitSemaphore,
>+                        const vk::Semaphore *signalSemaphore);
> 
>-    // TODO(jmadill): Use ContextImpl for command buffers to enable threaded contexts.
>-    vk::Error getStartedCommandBuffer(vk::CommandBufferAndState **commandBufferOut);
>-    vk::Error submitCommandBuffer(vk::CommandBufferAndState *commandBuffer);
>-    vk::Error submitAndFinishCommandBuffer(vk::CommandBufferAndState *commandBuffer);
>-    vk::Error submitCommandsWithSync(vk::CommandBufferAndState *commandBuffer,
>-                                     const vk::Semaphore &waitSemaphore,
>-                                     const vk::Semaphore &signalSemaphore);
>-    vk::Error finish();
>+    const vk::CommandPool &getCommandPool() const;
> 
>     const gl::Caps &getNativeCaps() const;
>     const gl::TextureCapsMap &getNativeTextureCaps() const;
>     const gl::Extensions &getNativeExtensions() const;
>     const gl::Limitations &getNativeLimitations() const;
>+    uint32_t getMaxActiveTextures();
> 
>-    vk::Error createStagingImage(TextureDimension dimension,
>-                                 const vk::Format &format,
>-                                 const gl::Extents &extent,
>-                                 vk::StagingUsage usage,
>-                                 vk::StagingImage *imageOut);
>+    Serial getCurrentQueueSerial() const { return mCurrentQueueSerial; }
>+    Serial getLastSubmittedQueueSerial() const { return mLastSubmittedQueueSerial; }
>+    Serial getLastCompletedQueueSerial() const { return mLastCompletedQueueSerial; }
> 
>-    GlslangWrapper *getGlslangWrapper();
>-
>-    Serial getCurrentQueueSerial() const;
>-
>-    bool isResourceInUse(const ResourceVk &resource);
>-    bool isSerialInUse(Serial serial);
>-
>-    template <typename T>
>-    void releaseResource(const ResourceVk &resource, T *object)
>-    {
>-        Serial resourceSerial = resource.getQueueSerial();
>-        releaseObject(resourceSerial, object);
>-    }
>+    bool isSerialInUse(Serial serial) const;
> 
>     template <typename T>
>     void releaseObject(Serial resourceSerial, T *object)
>@@ -98,67 +111,287 @@ class RendererVk : angle::NonCopyable
>         }
>     }
> 
>-    uint32_t getQueueFamilyIndex() const { return mCurrentQueueFamilyIndex; }
>+    // Check to see which batches have finished completion (forward progress for
>+    // mLastCompletedQueueSerial, for example for when the application busy waits on a query
>+    // result).
>+    angle::Result checkCompletedCommands(vk::Context *context);
> 
>-    const vk::MemoryProperties &getMemoryProperties() const { return mMemoryProperties; }
>+    // Wait for completion of batches until (at least) batch with given serial is finished.
>+    angle::Result finishToSerial(vk::Context *context, Serial serial);
> 
>-    // TODO(jmadill): Don't keep a single renderpass in the Renderer.
>-    gl::Error ensureInRenderPass(const gl::Context *context, FramebufferVk *framebufferVk);
>-    void endRenderPass();
>+    uint32_t getQueueFamilyIndex() const { return mCurrentQueueFamilyIndex; }
> 
>-    // This is necessary to update the cached current RenderPass Framebuffer.
>-    void onReleaseRenderPass(const FramebufferVk *framebufferVk);
>+    const vk::MemoryProperties &getMemoryProperties() const { return mMemoryProperties; }
> 
>-    // TODO(jmadill): We could pass angle::Format::ID here.
>+    // TODO(jmadill): We could pass angle::FormatID here.
>     const vk::Format &getFormat(GLenum internalFormat) const
>     {
>         return mFormatTable[internalFormat];
>     }
> 
>+    const vk::Format &getFormat(angle::FormatID formatID) const { return mFormatTable[formatID]; }
>+
>+    angle::Result getCompatibleRenderPass(vk::Context *context,
>+                                          const vk::RenderPassDesc &desc,
>+                                          vk::RenderPass **renderPassOut);
>+    angle::Result getRenderPassWithOps(vk::Context *context,
>+                                       const vk::RenderPassDesc &desc,
>+                                       const vk::AttachmentOpsArray &ops,
>+                                       vk::RenderPass **renderPassOut);
>+
>+    // Queries the descriptor set layout cache. Creates the layout if not present.
>+    angle::Result getDescriptorSetLayout(
>+        vk::Context *context,
>+        const vk::DescriptorSetLayoutDesc &desc,
>+        vk::BindingPointer<vk::DescriptorSetLayout> *descriptorSetLayoutOut);
>+
>+    // Queries the pipeline layout cache. Creates the layout if not present.
>+    angle::Result getPipelineLayout(vk::Context *context,
>+                                    const vk::PipelineLayoutDesc &desc,
>+                                    const vk::DescriptorSetLayoutPointerArray &descriptorSetLayouts,
>+                                    vk::BindingPointer<vk::PipelineLayout> *pipelineLayoutOut);
>+
>+    angle::Result syncPipelineCacheVk(DisplayVk *displayVk);
>+
>+    // Request a semaphore, that is expected to be signaled externally.  The next submission will
>+    // wait on it.
>+    angle::Result allocateSubmitWaitSemaphore(vk::Context *context,
>+                                              const vk::Semaphore **outSemaphore);
>+    // Get the last signaled semaphore to wait on externally.  The semaphore will not be waited on
>+    // by next submission.
>+    const vk::Semaphore *getSubmitLastSignaledSemaphore(vk::Context *context);
>+
>+    // Get (or allocate) the fence that will be signaled on next submission.
>+    angle::Result getSubmitFence(vk::Context *context, vk::Shared<vk::Fence> *sharedFenceOut);
>+
>+    // This should only be called from ResourceVk.
>+    // TODO(jmadill): Keep in ContextVk to enable threaded rendering.
>+    vk::CommandGraph *getCommandGraph();
>+
>+    // Issues a new serial for linked shader modules. Used in the pipeline cache.
>+    Serial issueShaderSerial();
>+
>+    vk::ShaderLibrary &getShaderLibrary() { return mShaderLibrary; }
>+    UtilsVk &getUtils() { return mUtils; }
>+    const angle::FeaturesVk &getFeatures() const
>+    {
>+        ASSERT(mFeaturesInitialized);
>+        return mFeatures;
>+    }
>+
>+    angle::Result getTimestamp(vk::Context *context, uint64_t *timestampOut);
>+
>+    // Create Begin/End/Instant GPU trace events, which take their timestamps from GPU queries.
>+    // The events are queued until the query results are available.  Possible values for `phase`
>+    // are TRACE_EVENT_PHASE_*
>+    ANGLE_INLINE angle::Result traceGpuEvent(vk::Context *context,
>+                                             vk::PrimaryCommandBuffer *commandBuffer,
>+                                             char phase,
>+                                             const char *name)
>+    {
>+        if (mGpuEventsEnabled)
>+            return traceGpuEventImpl(context, commandBuffer, phase, name);
>+        return angle::Result::Continue;
>+    }
>+
>+    bool isMockICDEnabled() const { return mEnableMockICD; }
>+
>+    RenderPassCache &getRenderPassCache() { return mRenderPassCache; }
>+    const vk::PipelineCache &getPipelineCache() const { return mPipelineCache; }
>+
>+    // Query the format properties for select bits (linearTilingFeatures, optimalTilingFeatures and
>+    // bufferFeatures).  Looks through mandatory features first, and falls back to querying the
>+    // device (first time only).
>+    bool hasLinearImageFormatFeatureBits(VkFormat format, const VkFormatFeatureFlags featureBits);
>+    VkFormatFeatureFlags getImageFormatFeatureBits(VkFormat format,
>+                                                   const VkFormatFeatureFlags featureBits);
>+    bool hasImageFormatFeatureBits(VkFormat format, const VkFormatFeatureFlags featureBits);
>+    bool hasBufferFormatFeatureBits(VkFormat format, const VkFormatFeatureFlags featureBits);
>+
>+    void insertDebugMarker(GLenum source, GLuint id, std::string &&marker);
>+    void pushDebugMarker(GLenum source, GLuint id, std::string &&marker);
>+    void popDebugMarker();
>+
>+    static constexpr size_t kMaxExtensionNames = 200;
>+    using ExtensionNameList = angle::FixedVector<const char *, kMaxExtensionNames>;
>+
>   private:
>+    // Number of semaphores for external entities to renderer to issue a wait, such as surface's
>+    // image acquire.
>+    static constexpr size_t kMaxExternalSemaphores = 64;
>+    // Total possible number of semaphores a submission can wait on.  +1 is for the semaphore
>+    // signaled in the last submission.
>+    static constexpr size_t kMaxWaitSemaphores = kMaxExternalSemaphores + 1;
>+
>+    angle::Result initializeDevice(DisplayVk *displayVk, uint32_t queueFamilyIndex);
>     void ensureCapsInitialized() const;
>-    void generateCaps(gl::Caps *outCaps,
>-                      gl::TextureCapsMap *outTextureCaps,
>-                      gl::Extensions *outExtensions,
>-                      gl::Limitations *outLimitations) const;
>-    vk::Error submit(const VkSubmitInfo &submitInfo);
>-    vk::Error submitFrame(const VkSubmitInfo &submitInfo);
>-    vk::Error checkInFlightCommands();
>+    angle::Result submitFrame(vk::Context *context,
>+                              const VkSubmitInfo &submitInfo,
>+                              vk::PrimaryCommandBuffer &&commandBuffer);
>     void freeAllInFlightResources();
>+    angle::Result flushCommandGraph(vk::Context *context, vk::PrimaryCommandBuffer *commandBatch);
>+    void initFeatures(const ExtensionNameList &extensions);
>+    void initPipelineCacheVkKey();
>+    angle::Result initPipelineCache(DisplayVk *display);
>+
>+    angle::Result synchronizeCpuGpuTime(vk::Context *context,
>+                                        const vk::Semaphore *waitSemaphore,
>+                                        const vk::Semaphore *signalSemaphore);
>+    angle::Result traceGpuEventImpl(vk::Context *context,
>+                                    vk::PrimaryCommandBuffer *commandBuffer,
>+                                    char phase,
>+                                    const char *name);
>+    angle::Result checkCompletedGpuEvents(vk::Context *context);
>+    void flushGpuEvents(double nextSyncGpuTimestampS, double nextSyncCpuTimestampS);
>+
>+    template <VkFormatFeatureFlags VkFormatProperties::*features>
>+    VkFormatFeatureFlags getFormatFeatureBits(VkFormat format,
>+                                              const VkFormatFeatureFlags featureBits);
>+
>+    template <VkFormatFeatureFlags VkFormatProperties::*features>
>+    bool hasFormatFeatureBits(VkFormat format, const VkFormatFeatureFlags featureBits);
>+
>+    void nextSerial();
>+
>+    egl::Display *mDisplay;
> 
>     mutable bool mCapsInitialized;
>     mutable gl::Caps mNativeCaps;
>     mutable gl::TextureCapsMap mNativeTextureCaps;
>     mutable gl::Extensions mNativeExtensions;
>     mutable gl::Limitations mNativeLimitations;
>-
>-    vk::Error initializeDevice(uint32_t queueFamilyIndex);
>+    mutable bool mFeaturesInitialized;
>+    mutable angle::FeaturesVk mFeatures;
> 
>     VkInstance mInstance;
>     bool mEnableValidationLayers;
>+    bool mEnableMockICD;
>+    VkDebugUtilsMessengerEXT mDebugUtilsMessenger;
>     VkDebugReportCallbackEXT mDebugReportCallback;
>     VkPhysicalDevice mPhysicalDevice;
>     VkPhysicalDeviceProperties mPhysicalDeviceProperties;
>+    VkPhysicalDeviceFeatures mPhysicalDeviceFeatures;
>     std::vector<VkQueueFamilyProperties> mQueueFamilyProperties;
>     VkQueue mQueue;
>     uint32_t mCurrentQueueFamilyIndex;
>+    uint32_t mMaxVertexAttribDivisor;
>     VkDevice mDevice;
>     vk::CommandPool mCommandPool;
>-    vk::CommandBufferAndState mCommandBuffer;
>-    GlslangWrapper *mGlslangWrapper;
>     SerialFactory mQueueSerialFactory;
>+    SerialFactory mShaderSerialFactory;
>     Serial mLastCompletedQueueSerial;
>+    Serial mLastSubmittedQueueSerial;
>     Serial mCurrentQueueSerial;
>-    std::vector<vk::CommandBufferAndSerial> mInFlightCommands;
>-    std::vector<vk::FenceAndSerial> mInFlightFences;
>+
>+    bool mDeviceLost;
>+
>+    struct CommandBatch final : angle::NonCopyable
>+    {
>+        CommandBatch();
>+        ~CommandBatch();
>+        CommandBatch(CommandBatch &&other);
>+        CommandBatch &operator=(CommandBatch &&other);
>+
>+        void destroy(VkDevice device);
>+
>+        vk::CommandPool commandPool;
>+        vk::Shared<vk::Fence> fence;
>+        Serial serial;
>+    };
>+
>+    std::vector<CommandBatch> mInFlightCommands;
>     std::vector<vk::GarbageObject> mGarbage;
>     vk::MemoryProperties mMemoryProperties;
>     vk::FormatTable mFormatTable;
> 
>-    // TODO(jmadill): Don't keep a single renderpass in the Renderer.
>-    FramebufferVk *mCurrentRenderPassFramebuffer;
>+    RenderPassCache mRenderPassCache;
>+
>+    vk::PipelineCache mPipelineCache;
>+    egl::BlobCache::Key mPipelineCacheVkBlobKey;
>+    uint32_t mPipelineCacheVkUpdateTimeout;
>+
>+    // A cache of VkFormatProperties as queried from the device over time.
>+    std::array<VkFormatProperties, vk::kNumVkFormats> mFormatProperties;
>+
>+    // mSubmitFence is the fence that's going to be signaled at the next submission.  This is used
>+    // to support SyncVk objects, which may outlive the context (as EGLSync objects).
>+    //
>+    // TODO(geofflang): this is in preparation for moving RendererVk functionality to ContextVk, and
>+    // is otherwise unnecessary as the SyncVk objects don't actually outlive the renderer currently.
>+    // http://anglebug.com/2701
>+    vk::Shared<vk::Fence> mSubmitFence;
>+
>+    // Pool allocator used for command graph but may be expanded to other allocations
>+    angle::PoolAllocator mPoolAllocator;
>+
>+    // See CommandGraph.h for a desription of the Command Graph.
>+    vk::CommandGraph mCommandGraph;
>+
>+    // ANGLE uses a PipelineLayout cache to store compatible pipeline layouts.
>+    PipelineLayoutCache mPipelineLayoutCache;
>+
>+    // DescriptorSetLayouts are also managed in a cache.
>+    DescriptorSetLayoutCache mDescriptorSetLayoutCache;
>+
>+    // Internal shader library.
>+    vk::ShaderLibrary mShaderLibrary;
>+    UtilsVk mUtils;
>+
>+    // The GpuEventQuery struct holds together a timestamp query and enough data to create a
>+    // trace event based on that. Use traceGpuEvent to insert such queries.  They will be readback
>+    // when the results are available, without inserting a GPU bubble.
>+    //
>+    // - eventName will be the reported name of the event
>+    // - phase is either 'B' (duration begin), 'E' (duration end) or 'i' (instant // event).
>+    //   See Google's "Trace Event Format":
>+    //   https://docs.google.com/document/d/1CvAClvFfyA5R-PhYUmn5OOQtYMH4h6I0nSsKchNAySU
>+    // - serial is the serial of the batch the query was submitted on.  Until the batch is
>+    //   submitted, the query is not checked to avoid incuring a flush.
>+    struct GpuEventQuery final
>+    {
>+        const char *name;
>+        char phase;
>+
>+        uint32_t queryIndex;
>+        size_t queryPoolIndex;
>+
>+        Serial serial;
>+    };
>+
>+    // Once a query result is available, the timestamp is read and a GpuEvent object is kept until
>+    // the next clock sync, at which point the clock drift is compensated in the results before
>+    // handing them off to the application.
>+    struct GpuEvent final
>+    {
>+        uint64_t gpuTimestampCycles;
>+        const char *name;
>+        char phase;
>+    };
>+
>+    bool mGpuEventsEnabled;
>+    vk::DynamicQueryPool mGpuEventQueryPool;
>+    // A list of queries that have yet to be turned into an event (their result is not yet
>+    // available).
>+    std::vector<GpuEventQuery> mInFlightGpuEventQueries;
>+    // A list of gpu events since the last clock sync.
>+    std::vector<GpuEvent> mGpuEvents;
>+
>+    // Hold information from the last gpu clock sync for future gpu-to-cpu timestamp conversions.
>+    struct GpuClockSyncInfo
>+    {
>+        double gpuTimestampS;
>+        double cpuTimestampS;
>+    };
>+    GpuClockSyncInfo mGpuClockSync;
>+
>+    // The very first timestamp queried for a GPU event is used as origin, so event timestamps would
>+    // have a value close to zero, to avoid losing 12 bits when converting these 64 bit values to
>+    // double.
>+    uint64_t mGpuEventTimestampOrigin;
> };
> 
>+uint32_t GetUniformBufferDescriptorCount();
>+
> }  // namespace rx
> 
> #endif  // LIBANGLE_RENDERER_VULKAN_RENDERERVK_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/SamplerVk.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/SamplerVk.cpp
>index 00ec517828d..86cce0deb14 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/SamplerVk.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/SamplerVk.cpp
>@@ -14,12 +14,8 @@
> namespace rx
> {
> 
>-SamplerVk::SamplerVk(const gl::SamplerState &state) : SamplerImpl(state)
>-{
>-}
>+SamplerVk::SamplerVk(const gl::SamplerState &state) : SamplerImpl(state) {}
> 
>-SamplerVk::~SamplerVk()
>-{
>-}
>+SamplerVk::~SamplerVk() {}
> 
> }  // namespace rx
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/SecondaryCommandBuffer.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/SecondaryCommandBuffer.cpp
>new file mode 100644
>index 00000000000..a6e6be52287
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/SecondaryCommandBuffer.cpp
>@@ -0,0 +1,423 @@
>+//
>+// Copyright 2019 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// SecondaryCommandBuffer:
>+//    CPU-side storage of commands to delay GPU-side allocation until commands are submitted.
>+//
>+
>+#include "libANGLE/renderer/vulkan/SecondaryCommandBuffer.h"
>+#include "common/debug.h"
>+
>+namespace rx
>+{
>+namespace vk
>+{
>+namespace priv
>+{
>+
>+ANGLE_INLINE const CommandHeader *NextCommand(const CommandHeader *command)
>+{
>+    return reinterpret_cast<const CommandHeader *>(reinterpret_cast<const uint8_t *>(command) +
>+                                                   command->size);
>+}
>+
>+// Parse the cmds in this cmd buffer into given primary cmd buffer
>+void SecondaryCommandBuffer::executeCommands(VkCommandBuffer cmdBuffer)
>+{
>+    for (const CommandHeader *command : mCommands)
>+    {
>+        for (const CommandHeader *currentCommand                      = command;
>+             currentCommand->id != CommandID::Invalid; currentCommand = NextCommand(currentCommand))
>+        {
>+            switch (currentCommand->id)
>+            {
>+                case CommandID::BeginQuery:
>+                {
>+                    const BeginQueryParams *params = getParamPtr<BeginQueryParams>(currentCommand);
>+                    vkCmdBeginQuery(cmdBuffer, params->queryPool, params->query, params->flags);
>+                    break;
>+                }
>+                case CommandID::BindComputeDescriptorSets:
>+                {
>+                    const BindComputeDescriptorSetParams *params =
>+                        getParamPtr<BindComputeDescriptorSetParams>(currentCommand);
>+                    const VkDescriptorSet *descriptorSets =
>+                        Offset<VkDescriptorSet>(params, sizeof(BindComputeDescriptorSetParams));
>+                    vkCmdBindDescriptorSets(cmdBuffer, VK_PIPELINE_BIND_POINT_COMPUTE,
>+                                            params->layout, 0, 1, descriptorSets, 0, nullptr);
>+                    break;
>+                }
>+                case CommandID::BindComputePipeline:
>+                {
>+                    const BindPipelineParams *params =
>+                        getParamPtr<BindPipelineParams>(currentCommand);
>+                    vkCmdBindPipeline(cmdBuffer, VK_PIPELINE_BIND_POINT_COMPUTE, params->pipeline);
>+                    break;
>+                }
>+                case CommandID::BindGraphicsDescriptorSets:
>+                {
>+                    const BindGraphicsDescriptorSetParams *params =
>+                        getParamPtr<BindGraphicsDescriptorSetParams>(currentCommand);
>+                    const VkDescriptorSet *descriptorSets =
>+                        Offset<VkDescriptorSet>(params, sizeof(BindGraphicsDescriptorSetParams));
>+                    const uint32_t *dynamicOffsets = Offset<uint32_t>(
>+                        descriptorSets, sizeof(VkDescriptorSet) * params->descriptorSetCount);
>+                    vkCmdBindDescriptorSets(cmdBuffer, VK_PIPELINE_BIND_POINT_GRAPHICS,
>+                                            params->layout, params->firstSet,
>+                                            params->descriptorSetCount, descriptorSets,
>+                                            params->dynamicOffsetCount, dynamicOffsets);
>+                    break;
>+                }
>+                case CommandID::BindGraphicsPipeline:
>+                {
>+                    const BindPipelineParams *params =
>+                        getParamPtr<BindPipelineParams>(currentCommand);
>+                    vkCmdBindPipeline(cmdBuffer, VK_PIPELINE_BIND_POINT_GRAPHICS, params->pipeline);
>+                    break;
>+                }
>+                case CommandID::BindIndexBuffer:
>+                {
>+                    const BindIndexBufferParams *params =
>+                        getParamPtr<BindIndexBufferParams>(currentCommand);
>+                    vkCmdBindIndexBuffer(cmdBuffer, params->buffer, params->offset,
>+                                         params->indexType);
>+                    break;
>+                }
>+                case CommandID::BindVertexBuffers:
>+                {
>+                    const BindVertexBuffersParams *params =
>+                        getParamPtr<BindVertexBuffersParams>(currentCommand);
>+                    const VkBuffer *buffers =
>+                        Offset<VkBuffer>(params, sizeof(BindVertexBuffersParams));
>+                    const VkDeviceSize *offsets =
>+                        Offset<VkDeviceSize>(buffers, sizeof(VkBuffer) * params->bindingCount);
>+                    vkCmdBindVertexBuffers(cmdBuffer, 0, params->bindingCount, buffers, offsets);
>+                    break;
>+                }
>+                case CommandID::BlitImage:
>+                {
>+                    const BlitImageParams *params = getParamPtr<BlitImageParams>(currentCommand);
>+                    vkCmdBlitImage(cmdBuffer, params->srcImage,
>+                                   VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL, params->dstImage,
>+                                   VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, 1, &params->region,
>+                                   params->filter);
>+                    break;
>+                }
>+                case CommandID::ClearAttachments:
>+                {
>+                    const ClearAttachmentsParams *params =
>+                        getParamPtr<ClearAttachmentsParams>(currentCommand);
>+                    const VkClearAttachment *attachments =
>+                        Offset<VkClearAttachment>(params, sizeof(ClearAttachmentsParams));
>+                    vkCmdClearAttachments(cmdBuffer, params->attachmentCount, attachments, 1,
>+                                          &params->rect);
>+                    break;
>+                }
>+                case CommandID::ClearColorImage:
>+                {
>+                    const ClearColorImageParams *params =
>+                        getParamPtr<ClearColorImageParams>(currentCommand);
>+                    vkCmdClearColorImage(cmdBuffer, params->image, params->imageLayout,
>+                                         &params->color, 1, &params->range);
>+                    break;
>+                }
>+                case CommandID::ClearDepthStencilImage:
>+                {
>+                    const ClearDepthStencilImageParams *params =
>+                        getParamPtr<ClearDepthStencilImageParams>(currentCommand);
>+                    vkCmdClearDepthStencilImage(cmdBuffer, params->image, params->imageLayout,
>+                                                &params->depthStencil, 1, &params->range);
>+                    break;
>+                }
>+                case CommandID::CopyBuffer:
>+                {
>+                    const CopyBufferParams *params = getParamPtr<CopyBufferParams>(currentCommand);
>+                    const VkBufferCopy *regions =
>+                        Offset<VkBufferCopy>(params, sizeof(CopyBufferParams));
>+                    vkCmdCopyBuffer(cmdBuffer, params->srcBuffer, params->destBuffer,
>+                                    params->regionCount, regions);
>+                    break;
>+                }
>+                case CommandID::CopyBufferToImage:
>+                {
>+                    const CopyBufferToImageParams *params =
>+                        getParamPtr<CopyBufferToImageParams>(currentCommand);
>+                    vkCmdCopyBufferToImage(cmdBuffer, params->srcBuffer, params->dstImage,
>+                                           params->dstImageLayout, 1, &params->region);
>+                    break;
>+                }
>+                case CommandID::CopyImage:
>+                {
>+                    const CopyImageParams *params = getParamPtr<CopyImageParams>(currentCommand);
>+                    vkCmdCopyImage(cmdBuffer, params->srcImage, params->srcImageLayout,
>+                                   params->dstImage, params->dstImageLayout, 1, &params->region);
>+                    break;
>+                }
>+                case CommandID::CopyImageToBuffer:
>+                {
>+                    const CopyImageToBufferParams *params =
>+                        getParamPtr<CopyImageToBufferParams>(currentCommand);
>+                    vkCmdCopyImageToBuffer(cmdBuffer, params->srcImage, params->srcImageLayout,
>+                                           params->dstBuffer, 1, &params->region);
>+                    break;
>+                }
>+                case CommandID::Dispatch:
>+                {
>+                    const DispatchParams *params = getParamPtr<DispatchParams>(currentCommand);
>+                    vkCmdDispatch(cmdBuffer, params->groupCountX, params->groupCountY,
>+                                  params->groupCountZ);
>+                    break;
>+                }
>+                case CommandID::Draw:
>+                {
>+                    const DrawParams *params = getParamPtr<DrawParams>(currentCommand);
>+                    vkCmdDraw(cmdBuffer, params->vertexCount, 1, params->firstVertex, 0);
>+                    break;
>+                }
>+                case CommandID::DrawIndexed:
>+                {
>+                    const DrawIndexedParams *params =
>+                        getParamPtr<DrawIndexedParams>(currentCommand);
>+                    vkCmdDrawIndexed(cmdBuffer, params->indexCount, 1, 0, 0, 0);
>+                    break;
>+                }
>+                case CommandID::DrawIndexedInstanced:
>+                {
>+                    const DrawIndexedInstancedParams *params =
>+                        getParamPtr<DrawIndexedInstancedParams>(currentCommand);
>+                    vkCmdDrawIndexed(cmdBuffer, params->indexCount, params->instanceCount, 0, 0, 0);
>+                    break;
>+                }
>+                case CommandID::DrawInstanced:
>+                {
>+                    const DrawInstancedParams *params =
>+                        getParamPtr<DrawInstancedParams>(currentCommand);
>+                    vkCmdDraw(cmdBuffer, params->vertexCount, params->instanceCount,
>+                              params->firstVertex, 0);
>+                    break;
>+                }
>+                case CommandID::EndQuery:
>+                {
>+                    const EndQueryParams *params = getParamPtr<EndQueryParams>(currentCommand);
>+                    vkCmdEndQuery(cmdBuffer, params->queryPool, params->query);
>+                    break;
>+                }
>+                case CommandID::ImageBarrier:
>+                {
>+                    const ImageBarrierParams *params =
>+                        getParamPtr<ImageBarrierParams>(currentCommand);
>+                    vkCmdPipelineBarrier(cmdBuffer, params->srcStageMask, params->dstStageMask, 0,
>+                                         0, nullptr, 0, nullptr, 1, &params->imageMemoryBarrier);
>+                    break;
>+                }
>+                case CommandID::MemoryBarrier:
>+                {
>+                    const MemoryBarrierParams *params =
>+                        getParamPtr<MemoryBarrierParams>(currentCommand);
>+                    vkCmdPipelineBarrier(cmdBuffer, params->srcStageMask, params->dstStageMask, 0,
>+                                         1, &params->memoryBarrier, 0, nullptr, 0, nullptr);
>+                    break;
>+                }
>+                case CommandID::PipelineBarrier:
>+                {
>+                    const PipelineBarrierParams *params =
>+                        getParamPtr<PipelineBarrierParams>(currentCommand);
>+                    const VkMemoryBarrier *memoryBarriers =
>+                        Offset<VkMemoryBarrier>(params, sizeof(PipelineBarrierParams));
>+                    const VkBufferMemoryBarrier *bufferMemoryBarriers =
>+                        Offset<VkBufferMemoryBarrier>(
>+                            memoryBarriers, params->memoryBarrierCount * sizeof(VkMemoryBarrier));
>+                    const VkImageMemoryBarrier *imageMemoryBarriers = Offset<VkImageMemoryBarrier>(
>+                        bufferMemoryBarriers,
>+                        params->bufferMemoryBarrierCount * sizeof(VkBufferMemoryBarrier));
>+                    vkCmdPipelineBarrier(cmdBuffer, params->srcStageMask, params->dstStageMask,
>+                                         params->dependencyFlags, params->memoryBarrierCount,
>+                                         memoryBarriers, params->bufferMemoryBarrierCount,
>+                                         bufferMemoryBarriers, params->imageMemoryBarrierCount,
>+                                         imageMemoryBarriers);
>+                    break;
>+                }
>+                case CommandID::PushConstants:
>+                {
>+                    const PushConstantsParams *params =
>+                        getParamPtr<PushConstantsParams>(currentCommand);
>+                    const void *data = Offset<void>(params, sizeof(PushConstantsParams));
>+                    vkCmdPushConstants(cmdBuffer, params->layout, params->flag, params->offset,
>+                                       params->size, data);
>+                    break;
>+                }
>+                case CommandID::ResetEvent:
>+                {
>+                    const ResetEventParams *params = getParamPtr<ResetEventParams>(currentCommand);
>+                    vkCmdResetEvent(cmdBuffer, params->event, params->stageMask);
>+                    break;
>+                }
>+                case CommandID::ResetQueryPool:
>+                {
>+                    const ResetQueryPoolParams *params =
>+                        getParamPtr<ResetQueryPoolParams>(currentCommand);
>+                    vkCmdResetQueryPool(cmdBuffer, params->queryPool, params->firstQuery,
>+                                        params->queryCount);
>+                    break;
>+                }
>+                case CommandID::SetEvent:
>+                {
>+                    const SetEventParams *params = getParamPtr<SetEventParams>(currentCommand);
>+                    vkCmdSetEvent(cmdBuffer, params->event, params->stageMask);
>+                    break;
>+                }
>+                case CommandID::WaitEvents:
>+                {
>+                    const WaitEventsParams *params = getParamPtr<WaitEventsParams>(currentCommand);
>+                    const VkEvent *events = Offset<VkEvent>(params, sizeof(WaitEventsParams));
>+                    const VkMemoryBarrier *memoryBarriers =
>+                        Offset<VkMemoryBarrier>(events, params->eventCount * sizeof(VkEvent));
>+                    const VkBufferMemoryBarrier *bufferMemoryBarriers =
>+                        Offset<VkBufferMemoryBarrier>(
>+                            memoryBarriers, params->memoryBarrierCount * sizeof(VkMemoryBarrier));
>+                    const VkImageMemoryBarrier *imageMemoryBarriers = Offset<VkImageMemoryBarrier>(
>+                        bufferMemoryBarriers,
>+                        params->bufferMemoryBarrierCount * sizeof(VkBufferMemoryBarrier));
>+                    vkCmdWaitEvents(cmdBuffer, params->eventCount, events, params->srcStageMask,
>+                                    params->dstStageMask, params->memoryBarrierCount,
>+                                    memoryBarriers, params->bufferMemoryBarrierCount,
>+                                    bufferMemoryBarriers, params->imageMemoryBarrierCount,
>+                                    imageMemoryBarriers);
>+                    break;
>+                }
>+                case CommandID::WriteTimestamp:
>+                {
>+                    const WriteTimestampParams *params =
>+                        getParamPtr<WriteTimestampParams>(currentCommand);
>+                    vkCmdWriteTimestamp(cmdBuffer, params->pipelineStage, params->queryPool,
>+                                        params->query);
>+                    break;
>+                }
>+                default:
>+                {
>+                    UNREACHABLE();
>+                    break;
>+                }
>+            }
>+        }
>+    }
>+}
>+
>+std::string SecondaryCommandBuffer::dumpCommands(const char *separator) const
>+{
>+    std::string result;
>+    for (const CommandHeader *command : mCommands)
>+    {
>+        for (const CommandHeader *currentCommand                      = command;
>+             currentCommand->id != CommandID::Invalid; currentCommand = NextCommand(currentCommand))
>+        {
>+            result += separator;
>+            switch (currentCommand->id)
>+            {
>+                case CommandID::BeginQuery:
>+                    result += "BeginQuery";
>+                    break;
>+                case CommandID::BindComputeDescriptorSets:
>+                    result += "BindComputeDescriptorSets";
>+                    break;
>+                case CommandID::BindComputePipeline:
>+                    result += "BindComputePipeline";
>+                    break;
>+                case CommandID::BindGraphicsDescriptorSets:
>+                    result += "BindGraphicsDescriptorSets";
>+                    break;
>+                case CommandID::BindGraphicsPipeline:
>+                    result += "BindGraphicsPipeline";
>+                    break;
>+                case CommandID::BindIndexBuffer:
>+                    result += "BindIndexBuffer";
>+                    break;
>+                case CommandID::BindVertexBuffers:
>+                    result += "BindVertexBuffers";
>+                    break;
>+                case CommandID::BlitImage:
>+                    result += "BlitImage";
>+                    break;
>+                case CommandID::ClearAttachments:
>+                    result += "ClearAttachments";
>+                    break;
>+                case CommandID::ClearColorImage:
>+                    result += "ClearColorImage";
>+                    break;
>+                case CommandID::ClearDepthStencilImage:
>+                    result += "ClearDepthStencilImage";
>+                    break;
>+                case CommandID::CopyBuffer:
>+                    result += "CopyBuffer";
>+                    break;
>+                case CommandID::CopyBufferToImage:
>+                    result += "CopyBufferToImage";
>+                    break;
>+                case CommandID::CopyImage:
>+                    result += "CopyImage";
>+                    break;
>+                case CommandID::CopyImageToBuffer:
>+                    result += "CopyImageToBuffer";
>+                    break;
>+                case CommandID::Dispatch:
>+                    result += "Dispatch";
>+                    break;
>+                case CommandID::Draw:
>+                    result += "Draw";
>+                    break;
>+                case CommandID::DrawIndexed:
>+                    result += "DrawIndexed";
>+                    break;
>+                case CommandID::DrawIndexedInstanced:
>+                    result += "DrawIndexedInstanced";
>+                    break;
>+                case CommandID::DrawInstanced:
>+                    result += "DrawInstanced";
>+                    break;
>+                case CommandID::EndQuery:
>+                    result += "EndQuery";
>+                    break;
>+                case CommandID::ImageBarrier:
>+                    result += "ImageBarrier";
>+                    break;
>+                case CommandID::MemoryBarrier:
>+                    result += "MemoryBarrier";
>+                    break;
>+                case CommandID::PipelineBarrier:
>+                    result += "PipelineBarrier";
>+                    break;
>+                case CommandID::PushConstants:
>+                    result += "PushConstants";
>+                    break;
>+                case CommandID::ResetEvent:
>+                    result += "ResetEvent";
>+                    break;
>+                case CommandID::ResetQueryPool:
>+                    result += "ResetQueryPool";
>+                    break;
>+                case CommandID::SetEvent:
>+                    result += "SetEvent";
>+                    break;
>+                case CommandID::WaitEvents:
>+                    result += "WaitEvents";
>+                    break;
>+                case CommandID::WriteTimestamp:
>+                    result += "WriteTimestamp";
>+                    break;
>+                default:
>+                {
>+                    UNREACHABLE();
>+                    result += "--invalid--";
>+                    break;
>+                }
>+            }
>+        }
>+    }
>+    return result;
>+}
>+
>+}  // namespace priv
>+}  // namespace vk
>+}  // namespace rx
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/SecondaryCommandBuffer.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/SecondaryCommandBuffer.h
>new file mode 100644
>index 00000000000..912a4c981fb
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/SecondaryCommandBuffer.h
>@@ -0,0 +1,991 @@
>+//
>+// Copyright 2019 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// SecondaryCommandBuffer:
>+//    Lightweight, CPU-Side command buffers used to hold command state until
>+//    it has to be submitted to GPU.
>+//
>+
>+#ifndef LIBANGLE_RENDERER_VULKAN_SECONDARYCOMMANDBUFFERVK_H_
>+#define LIBANGLE_RENDERER_VULKAN_SECONDARYCOMMANDBUFFERVK_H_
>+
>+#include <vulkan/vulkan.h>
>+
>+#include "common/PoolAlloc.h"
>+#include "libANGLE/renderer/vulkan/vk_wrapper.h"
>+
>+namespace rx
>+{
>+
>+namespace vk
>+{
>+
>+namespace priv
>+{
>+
>+enum class CommandID : uint16_t
>+{
>+    // Invalid cmd used to mark end of sequence of commands
>+    Invalid = 0,
>+    BeginQuery,
>+    BindComputeDescriptorSets,
>+    BindComputePipeline,
>+    BindGraphicsDescriptorSets,
>+    BindGraphicsPipeline,
>+    BindIndexBuffer,
>+    BindVertexBuffers,
>+    BlitImage,
>+    ClearAttachments,
>+    ClearColorImage,
>+    ClearDepthStencilImage,
>+    CopyBuffer,
>+    CopyBufferToImage,
>+    CopyImage,
>+    CopyImageToBuffer,
>+    Dispatch,
>+    Draw,
>+    DrawIndexed,
>+    DrawIndexedInstanced,
>+    DrawInstanced,
>+    EndQuery,
>+    ImageBarrier,
>+    MemoryBarrier,
>+    PipelineBarrier,
>+    PushConstants,
>+    ResetEvent,
>+    ResetQueryPool,
>+    SetEvent,
>+    WaitEvents,
>+    WriteTimestamp,
>+};
>+
>+#define VERIFY_4_BYTE_ALIGNMENT(StructName) \
>+    static_assert((sizeof(StructName) % 4) == 0, "Check StructName alignment");
>+
>+// Structs to encapsulate parameters for different commands
>+// This makes it easy to know the size of params & to copy params
>+// TODO: Could optimize the size of some of these structs through bit-packing
>+//  and customizing sizing based on limited parameter sets used by ANGLE
>+struct BindPipelineParams
>+{
>+    VkPipeline pipeline;
>+};
>+VERIFY_4_BYTE_ALIGNMENT(BindPipelineParams)
>+
>+struct BindGraphicsDescriptorSetParams
>+{
>+    VkPipelineLayout layout;
>+    uint32_t firstSet;
>+    uint32_t descriptorSetCount;
>+    uint32_t dynamicOffsetCount;
>+};
>+VERIFY_4_BYTE_ALIGNMENT(BindGraphicsDescriptorSetParams)
>+
>+struct BindComputeDescriptorSetParams
>+{
>+    VkPipelineLayout layout;
>+};
>+VERIFY_4_BYTE_ALIGNMENT(BindComputeDescriptorSetParams)
>+
>+struct BindIndexBufferParams
>+{
>+    VkBuffer buffer;
>+    VkDeviceSize offset;
>+    VkIndexType indexType;
>+};
>+VERIFY_4_BYTE_ALIGNMENT(BindIndexBufferParams)
>+
>+struct BindVertexBuffersParams
>+{
>+    // ANGLE always has firstBinding of 0 so not storing that currently
>+    uint32_t bindingCount;
>+};
>+VERIFY_4_BYTE_ALIGNMENT(BindVertexBuffersParams)
>+
>+struct BlitImageParams
>+{
>+    VkImage srcImage;
>+    VkImage dstImage;
>+    VkFilter filter;
>+    VkImageBlit region;
>+};
>+VERIFY_4_BYTE_ALIGNMENT(BlitImageParams)
>+
>+struct CopyBufferParams
>+{
>+    VkBuffer srcBuffer;
>+    VkBuffer destBuffer;
>+    uint32_t regionCount;
>+};
>+VERIFY_4_BYTE_ALIGNMENT(CopyBufferParams)
>+
>+struct CopyBufferToImageParams
>+{
>+    VkBuffer srcBuffer;
>+    VkImage dstImage;
>+    VkImageLayout dstImageLayout;
>+    VkBufferImageCopy region;
>+};
>+VERIFY_4_BYTE_ALIGNMENT(CopyBufferToImageParams)
>+
>+struct CopyImageParams
>+{
>+    VkImage srcImage;
>+    VkImageLayout srcImageLayout;
>+    VkImage dstImage;
>+    VkImageLayout dstImageLayout;
>+    VkImageCopy region;
>+};
>+VERIFY_4_BYTE_ALIGNMENT(CopyImageParams)
>+
>+struct CopyImageToBufferParams
>+{
>+    VkImage srcImage;
>+    VkImageLayout srcImageLayout;
>+    VkBuffer dstBuffer;
>+    VkBufferImageCopy region;
>+};
>+VERIFY_4_BYTE_ALIGNMENT(CopyImageToBufferParams)
>+
>+struct ClearAttachmentsParams
>+{
>+    uint32_t attachmentCount;
>+    VkClearRect rect;
>+};
>+VERIFY_4_BYTE_ALIGNMENT(ClearAttachmentsParams)
>+
>+struct ClearColorImageParams
>+{
>+    VkImage image;
>+    VkImageLayout imageLayout;
>+    VkClearColorValue color;
>+    VkImageSubresourceRange range;
>+};
>+VERIFY_4_BYTE_ALIGNMENT(ClearColorImageParams)
>+
>+struct ClearDepthStencilImageParams
>+{
>+    VkImage image;
>+    VkImageLayout imageLayout;
>+    VkClearDepthStencilValue depthStencil;
>+    VkImageSubresourceRange range;
>+};
>+VERIFY_4_BYTE_ALIGNMENT(ClearDepthStencilImageParams)
>+
>+struct PushConstantsParams
>+{
>+    VkPipelineLayout layout;
>+    VkShaderStageFlags flag;
>+    uint32_t offset;
>+    uint32_t size;
>+};
>+VERIFY_4_BYTE_ALIGNMENT(PushConstantsParams)
>+
>+struct DrawParams
>+{
>+    uint32_t vertexCount;
>+    uint32_t firstVertex;
>+};
>+VERIFY_4_BYTE_ALIGNMENT(DrawParams)
>+
>+struct DrawInstancedParams
>+{
>+    uint32_t vertexCount;
>+    uint32_t instanceCount;
>+    uint32_t firstVertex;
>+};
>+VERIFY_4_BYTE_ALIGNMENT(DrawInstancedParams)
>+
>+struct DrawIndexedParams
>+{
>+    uint32_t indexCount;
>+};
>+VERIFY_4_BYTE_ALIGNMENT(DrawIndexedParams)
>+
>+struct DrawIndexedInstancedParams
>+{
>+    uint32_t indexCount;
>+    uint32_t instanceCount;
>+};
>+VERIFY_4_BYTE_ALIGNMENT(DrawIndexedInstancedParams)
>+
>+struct DispatchParams
>+{
>+    uint32_t groupCountX;
>+    uint32_t groupCountY;
>+    uint32_t groupCountZ;
>+};
>+VERIFY_4_BYTE_ALIGNMENT(DispatchParams)
>+
>+struct MemoryBarrierParams
>+{
>+    VkPipelineStageFlags srcStageMask;
>+    VkPipelineStageFlags dstStageMask;
>+    VkMemoryBarrier memoryBarrier;
>+};
>+VERIFY_4_BYTE_ALIGNMENT(MemoryBarrierParams)
>+
>+struct PipelineBarrierParams
>+{
>+    VkPipelineStageFlags srcStageMask;
>+    VkPipelineStageFlags dstStageMask;
>+    VkDependencyFlags dependencyFlags;
>+    uint32_t memoryBarrierCount;
>+    uint32_t bufferMemoryBarrierCount;
>+    uint32_t imageMemoryBarrierCount;
>+};
>+VERIFY_4_BYTE_ALIGNMENT(PipelineBarrierParams)
>+
>+struct ImageBarrierParams
>+{
>+    VkPipelineStageFlags srcStageMask;
>+    VkPipelineStageFlags dstStageMask;
>+    VkImageMemoryBarrier imageMemoryBarrier;
>+};
>+VERIFY_4_BYTE_ALIGNMENT(ImageBarrierParams)
>+
>+struct SetEventParams
>+{
>+    VkEvent event;
>+    VkPipelineStageFlags stageMask;
>+};
>+VERIFY_4_BYTE_ALIGNMENT(SetEventParams)
>+
>+struct ResetEventParams
>+{
>+    VkEvent event;
>+    VkPipelineStageFlags stageMask;
>+};
>+VERIFY_4_BYTE_ALIGNMENT(ResetEventParams)
>+
>+struct WaitEventsParams
>+{
>+    uint32_t eventCount;
>+    VkPipelineStageFlags srcStageMask;
>+    VkPipelineStageFlags dstStageMask;
>+    uint32_t memoryBarrierCount;
>+    uint32_t bufferMemoryBarrierCount;
>+    uint32_t imageMemoryBarrierCount;
>+};
>+VERIFY_4_BYTE_ALIGNMENT(WaitEventsParams)
>+
>+struct ResetQueryPoolParams
>+{
>+    VkQueryPool queryPool;
>+    uint32_t firstQuery;
>+    uint32_t queryCount;
>+};
>+VERIFY_4_BYTE_ALIGNMENT(ResetQueryPoolParams)
>+
>+struct BeginQueryParams
>+{
>+    VkQueryPool queryPool;
>+    uint32_t query;
>+    VkQueryControlFlags flags;
>+};
>+VERIFY_4_BYTE_ALIGNMENT(BeginQueryParams)
>+
>+struct EndQueryParams
>+{
>+    VkQueryPool queryPool;
>+    uint32_t query;
>+};
>+VERIFY_4_BYTE_ALIGNMENT(EndQueryParams)
>+
>+struct WriteTimestampParams
>+{
>+    VkPipelineStageFlagBits pipelineStage;
>+    VkQueryPool queryPool;
>+    uint32_t query;
>+};
>+VERIFY_4_BYTE_ALIGNMENT(WriteTimestampParams)
>+
>+// Header for every cmd in custom cmd buffer
>+struct CommandHeader
>+{
>+    CommandID id;
>+    uint16_t size;
>+};
>+
>+static_assert(sizeof(CommandHeader) == 4, "Check CommandHeader size");
>+
>+template <typename DestT, typename T>
>+ANGLE_INLINE DestT *Offset(T *ptr, size_t bytes)
>+{
>+    return reinterpret_cast<DestT *>((reinterpret_cast<uint8_t *>(ptr) + bytes));
>+}
>+
>+template <typename DestT, typename T>
>+ANGLE_INLINE const DestT *Offset(const T *ptr, size_t bytes)
>+{
>+    return reinterpret_cast<const DestT *>((reinterpret_cast<const uint8_t *>(ptr) + bytes));
>+}
>+
>+class SecondaryCommandBuffer final : angle::NonCopyable
>+{
>+  public:
>+    SecondaryCommandBuffer();
>+    ~SecondaryCommandBuffer();
>+
>+    static bool SupportsQueries(const VkPhysicalDeviceFeatures &features) { return true; }
>+
>+    // SecondaryCommandBuffer replays its commands inline when executed on the primary command
>+    // buffer.
>+    static constexpr bool ExecutesInline() { return true; }
>+
>+    // Add commands
>+    void beginQuery(VkQueryPool queryPool, uint32_t query, VkQueryControlFlags flags);
>+
>+    void bindComputeDescriptorSets(const PipelineLayout &layout,
>+                                   const VkDescriptorSet *descriptorSets);
>+
>+    void bindComputePipeline(const Pipeline &pipeline);
>+
>+    void bindGraphicsDescriptorSets(const PipelineLayout &layout,
>+                                    uint32_t firstSet,
>+                                    uint32_t descriptorSetCount,
>+                                    const VkDescriptorSet *descriptorSets,
>+                                    uint32_t dynamicOffsetCount,
>+                                    const uint32_t *dynamicOffsets);
>+
>+    void bindGraphicsPipeline(const Pipeline &pipeline);
>+
>+    void bindIndexBuffer(const Buffer &buffer, VkDeviceSize offset, VkIndexType indexType);
>+
>+    void bindVertexBuffers(uint32_t firstBinding,
>+                           uint32_t bindingCount,
>+                           const VkBuffer *buffers,
>+                           const VkDeviceSize *offsets);
>+
>+    void blitImage(const Image &srcImage,
>+                   VkImageLayout srcImageLayout,
>+                   const Image &dstImage,
>+                   VkImageLayout dstImageLayout,
>+                   uint32_t regionCount,
>+                   const VkImageBlit *pRegions,
>+                   VkFilter filter);
>+
>+    void clearAttachments(uint32_t attachmentCount,
>+                          const VkClearAttachment *attachments,
>+                          uint32_t rectCount,
>+                          const VkClearRect *rects);
>+
>+    void clearColorImage(const Image &image,
>+                         VkImageLayout imageLayout,
>+                         const VkClearColorValue &color,
>+                         uint32_t rangeCount,
>+                         const VkImageSubresourceRange *ranges);
>+
>+    void clearDepthStencilImage(const Image &image,
>+                                VkImageLayout imageLayout,
>+                                const VkClearDepthStencilValue &depthStencil,
>+                                uint32_t rangeCount,
>+                                const VkImageSubresourceRange *ranges);
>+
>+    void copyBuffer(const Buffer &srcBuffer,
>+                    const Buffer &destBuffer,
>+                    uint32_t regionCount,
>+                    const VkBufferCopy *regions);
>+
>+    void copyBufferToImage(VkBuffer srcBuffer,
>+                           const Image &dstImage,
>+                           VkImageLayout dstImageLayout,
>+                           uint32_t regionCount,
>+                           const VkBufferImageCopy *regions);
>+
>+    void copyImage(const Image &srcImage,
>+                   VkImageLayout srcImageLayout,
>+                   const Image &dstImage,
>+                   VkImageLayout dstImageLayout,
>+                   uint32_t regionCount,
>+                   const VkImageCopy *regions);
>+
>+    void copyImageToBuffer(const Image &srcImage,
>+                           VkImageLayout srcImageLayout,
>+                           VkBuffer dstBuffer,
>+                           uint32_t regionCount,
>+                           const VkBufferImageCopy *regions);
>+
>+    void dispatch(uint32_t groupCountX, uint32_t groupCountY, uint32_t groupCountZ);
>+
>+    void draw(uint32_t vertexCount, uint32_t firstVertex);
>+
>+    void drawIndexed(uint32_t indexCount);
>+
>+    void drawIndexedInstanced(uint32_t indexCount, uint32_t instanceCount);
>+
>+    void drawInstanced(uint32_t vertexCount, uint32_t instanceCount, uint32_t firstVertex);
>+
>+    void endQuery(VkQueryPool queryPool, uint32_t query);
>+
>+    void imageBarrier(VkPipelineStageFlags srcStageMask,
>+                      VkPipelineStageFlags dstStageMask,
>+                      const VkImageMemoryBarrier *imageMemoryBarrier);
>+
>+    void memoryBarrier(VkPipelineStageFlags srcStageMask,
>+                       VkPipelineStageFlags dstStageMask,
>+                       const VkMemoryBarrier *memoryBarrier);
>+
>+    void pipelineBarrier(VkPipelineStageFlags srcStageMask,
>+                         VkPipelineStageFlags dstStageMask,
>+                         VkDependencyFlags dependencyFlags,
>+                         uint32_t memoryBarrierCount,
>+                         const VkMemoryBarrier *memoryBarriers,
>+                         uint32_t bufferMemoryBarrierCount,
>+                         const VkBufferMemoryBarrier *bufferMemoryBarriers,
>+                         uint32_t imageMemoryBarrierCount,
>+                         const VkImageMemoryBarrier *imageMemoryBarriers);
>+
>+    void pushConstants(const PipelineLayout &layout,
>+                       VkShaderStageFlags flag,
>+                       uint32_t offset,
>+                       uint32_t size,
>+                       const void *data);
>+
>+    void resetEvent(VkEvent event, VkPipelineStageFlags stageMask);
>+
>+    void resetQueryPool(VkQueryPool queryPool, uint32_t firstQuery, uint32_t queryCount);
>+
>+    void setEvent(VkEvent event, VkPipelineStageFlags stageMask);
>+
>+    void waitEvents(uint32_t eventCount,
>+                    const VkEvent *events,
>+                    VkPipelineStageFlags srcStageMask,
>+                    VkPipelineStageFlags dstStageMask,
>+                    uint32_t memoryBarrierCount,
>+                    const VkMemoryBarrier *memoryBarriers,
>+                    uint32_t bufferMemoryBarrierCount,
>+                    const VkBufferMemoryBarrier *bufferMemoryBarriers,
>+                    uint32_t imageMemoryBarrierCount,
>+                    const VkImageMemoryBarrier *imageMemoryBarriers);
>+
>+    void writeTimestamp(VkPipelineStageFlagBits pipelineStage,
>+                        VkQueryPool queryPool,
>+                        uint32_t query);
>+    // No-op for compatibility
>+    VkResult end() { return VK_SUCCESS; }
>+
>+    // Parse the cmds in this cmd buffer into given primary cmd buffer for execution
>+    void executeCommands(VkCommandBuffer cmdBuffer);
>+
>+    // Traverse the list of commands and build a summary for diagnostics.
>+    std::string dumpCommands(const char *separator) const;
>+
>+    // Pool Alloc uses 16kB pages w/ 16byte header = 16368bytes. To minimize waste
>+    //  using a 16368/12 = 1364. Also better perf than 1024 due to fewer block allocations
>+    static constexpr size_t kBlockSize = 1364;
>+    // Make sure block size is 4-byte aligned to avoid Android errors
>+    static_assert((kBlockSize % 4) == 0, "Check kBlockSize alignment");
>+
>+    // Initialize the SecondaryCommandBuffer by setting the allocator it will use
>+    void initialize(angle::PoolAllocator *allocator)
>+    {
>+        ASSERT(allocator);
>+        mAllocator = allocator;
>+        allocateNewBlock();
>+        // Set first command to Invalid to start
>+        reinterpret_cast<CommandHeader *>(mCurrentWritePointer)->id = CommandID::Invalid;
>+    }
>+
>+    // This will cause the SecondaryCommandBuffer to become invalid by clearing its allocator
>+    void releaseHandle() { mAllocator = nullptr; }
>+    // The SecondaryCommandBuffer is valid if it's been initialized
>+    bool valid() const { return mAllocator != nullptr; }
>+
>+    bool empty() const { return mCommands.size() == 0 || mCommands[0]->id == CommandID::Invalid; }
>+
>+  private:
>+    template <class StructType>
>+    ANGLE_INLINE StructType *commonInit(CommandID cmdID, size_t allocationSize)
>+    {
>+        mCurrentBytesRemaining -= allocationSize;
>+
>+        CommandHeader *header = reinterpret_cast<CommandHeader *>(mCurrentWritePointer);
>+        header->id            = cmdID;
>+        header->size          = static_cast<uint16_t>(allocationSize);
>+        ASSERT(allocationSize <= std::numeric_limits<uint16_t>::max());
>+
>+        mCurrentWritePointer += allocationSize;
>+        // Set next cmd header to Invalid (0) so cmd sequence will be terminated
>+        reinterpret_cast<CommandHeader *>(mCurrentWritePointer)->id = CommandID::Invalid;
>+        return Offset<StructType>(header, sizeof(CommandHeader));
>+    }
>+    ANGLE_INLINE void allocateNewBlock()
>+    {
>+        ASSERT(mAllocator);
>+        mCurrentWritePointer   = mAllocator->fastAllocate(kBlockSize);
>+        mCurrentBytesRemaining = kBlockSize;
>+        mCommands.push_back(reinterpret_cast<CommandHeader *>(mCurrentWritePointer));
>+    }
>+
>+    // Allocate and initialize memory for given commandID & variable param size, setting
>+    // variableDataPtr to the byte following fixed cmd data where variable-sized ptr data will
>+    // be written and returning a pointer to the start of the command's parameter data
>+    template <class StructType>
>+    ANGLE_INLINE StructType *initCommand(CommandID cmdID,
>+                                         size_t variableSize,
>+                                         uint8_t **variableDataPtr)
>+    {
>+        constexpr size_t fixedAllocationSize = sizeof(StructType) + sizeof(CommandHeader);
>+        const size_t allocationSize          = fixedAllocationSize + variableSize;
>+        // Make sure we have enough room to mark follow-on header "Invalid"
>+        if (mCurrentBytesRemaining <= (allocationSize + sizeof(CommandHeader)))
>+        {
>+            allocateNewBlock();
>+        }
>+        *variableDataPtr = Offset<uint8_t>(mCurrentWritePointer, fixedAllocationSize);
>+        return commonInit<StructType>(cmdID, allocationSize);
>+    }
>+
>+    // Initialize a command that doesn't have variable-sized ptr data
>+    template <class StructType>
>+    ANGLE_INLINE StructType *initCommand(CommandID cmdID)
>+    {
>+        constexpr size_t allocationSize = sizeof(StructType) + sizeof(CommandHeader);
>+        // Make sure we have enough room to mark follow-on header "Invalid"
>+        if (mCurrentBytesRemaining <= (allocationSize + sizeof(CommandHeader)))
>+        {
>+            allocateNewBlock();
>+        }
>+        return commonInit<StructType>(cmdID, allocationSize);
>+    }
>+
>+    // Return a ptr to the parameter type
>+    template <class StructType>
>+    const StructType *getParamPtr(const CommandHeader *header) const
>+    {
>+        return reinterpret_cast<const StructType *>(reinterpret_cast<const uint8_t *>(header) +
>+                                                    sizeof(CommandHeader));
>+    }
>+    // Copy sizeInBytes data from paramData to writePointer & return writePointer plus sizeInBytes.
>+    template <class PtrType>
>+    ANGLE_INLINE uint8_t *storePointerParameter(uint8_t *writePointer,
>+                                                const PtrType *paramData,
>+                                                size_t sizeInBytes)
>+    {
>+        memcpy(writePointer, paramData, sizeInBytes);
>+        return writePointer + sizeInBytes;
>+    }
>+
>+    std::vector<CommandHeader *> mCommands;
>+
>+    // Allocator used by this class. If non-null then the class is valid.
>+    angle::PoolAllocator *mAllocator;
>+
>+    uint8_t *mCurrentWritePointer;
>+    size_t mCurrentBytesRemaining;
>+};
>+
>+ANGLE_INLINE SecondaryCommandBuffer::SecondaryCommandBuffer()
>+    : mAllocator(nullptr), mCurrentWritePointer(nullptr), mCurrentBytesRemaining(0)
>+{}
>+ANGLE_INLINE SecondaryCommandBuffer::~SecondaryCommandBuffer() {}
>+
>+ANGLE_INLINE void SecondaryCommandBuffer::beginQuery(VkQueryPool queryPool,
>+                                                     uint32_t query,
>+                                                     VkQueryControlFlags flags)
>+{
>+    BeginQueryParams *paramStruct = initCommand<BeginQueryParams>(CommandID::BeginQuery);
>+    paramStruct->queryPool        = queryPool;
>+    paramStruct->query            = query;
>+    paramStruct->flags            = flags;
>+}
>+
>+ANGLE_INLINE void SecondaryCommandBuffer::bindComputePipeline(const Pipeline &pipeline)
>+{
>+    BindPipelineParams *paramStruct =
>+        initCommand<BindPipelineParams>(CommandID::BindComputePipeline);
>+    paramStruct->pipeline = pipeline.getHandle();
>+}
>+
>+ANGLE_INLINE void SecondaryCommandBuffer::bindGraphicsDescriptorSets(
>+    const PipelineLayout &layout,
>+    uint32_t firstSet,
>+    uint32_t descriptorSetCount,
>+    const VkDescriptorSet *descriptorSets,
>+    uint32_t dynamicOffsetCount,
>+    const uint32_t *dynamicOffsets)
>+{
>+    size_t descSize   = descriptorSetCount * sizeof(VkDescriptorSet);
>+    size_t offsetSize = dynamicOffsetCount * sizeof(uint32_t);
>+    uint8_t *writePtr;
>+    BindGraphicsDescriptorSetParams *paramStruct = initCommand<BindGraphicsDescriptorSetParams>(
>+        CommandID::BindGraphicsDescriptorSets, descSize + offsetSize, &writePtr);
>+    // Copy params into memory
>+    paramStruct->layout             = layout.getHandle();
>+    paramStruct->firstSet           = firstSet;
>+    paramStruct->descriptorSetCount = descriptorSetCount;
>+    paramStruct->dynamicOffsetCount = dynamicOffsetCount;
>+    // Copy variable sized data
>+    writePtr = storePointerParameter(writePtr, descriptorSets, descSize);
>+    storePointerParameter(writePtr, dynamicOffsets, offsetSize);
>+}
>+
>+ANGLE_INLINE void SecondaryCommandBuffer::bindComputeDescriptorSets(
>+    const PipelineLayout &layout,
>+    const VkDescriptorSet *descriptorSets)
>+{
>+    uint8_t *writePtr;
>+    BindComputeDescriptorSetParams *paramStruct = initCommand<BindComputeDescriptorSetParams>(
>+        CommandID::BindComputeDescriptorSets, sizeof(VkDescriptorSet), &writePtr);
>+    // Copy params into memory
>+    paramStruct->layout = layout.getHandle();
>+    // Copy variable sized data
>+    storePointerParameter(writePtr, descriptorSets, sizeof(VkDescriptorSet));
>+}
>+
>+ANGLE_INLINE void SecondaryCommandBuffer::bindGraphicsPipeline(const Pipeline &pipeline)
>+{
>+    BindPipelineParams *paramStruct =
>+        initCommand<BindPipelineParams>(CommandID::BindGraphicsPipeline);
>+    paramStruct->pipeline = pipeline.getHandle();
>+}
>+
>+ANGLE_INLINE void SecondaryCommandBuffer::bindIndexBuffer(const Buffer &buffer,
>+                                                          VkDeviceSize offset,
>+                                                          VkIndexType indexType)
>+{
>+    BindIndexBufferParams *paramStruct =
>+        initCommand<BindIndexBufferParams>(CommandID::BindIndexBuffer);
>+    paramStruct->buffer    = buffer.getHandle();
>+    paramStruct->offset    = offset;
>+    paramStruct->indexType = indexType;
>+}
>+
>+ANGLE_INLINE void SecondaryCommandBuffer::bindVertexBuffers(uint32_t firstBinding,
>+                                                            uint32_t bindingCount,
>+                                                            const VkBuffer *buffers,
>+                                                            const VkDeviceSize *offsets)
>+{
>+    ASSERT(firstBinding == 0);
>+    uint8_t *writePtr;
>+    size_t buffersSize                   = bindingCount * sizeof(VkBuffer);
>+    size_t offsetsSize                   = bindingCount * sizeof(VkDeviceSize);
>+    BindVertexBuffersParams *paramStruct = initCommand<BindVertexBuffersParams>(
>+        CommandID::BindVertexBuffers, buffersSize + offsetsSize, &writePtr);
>+    // Copy params
>+    paramStruct->bindingCount = bindingCount;
>+    writePtr                  = storePointerParameter(writePtr, buffers, buffersSize);
>+    storePointerParameter(writePtr, offsets, offsetsSize);
>+}
>+
>+ANGLE_INLINE void SecondaryCommandBuffer::blitImage(const Image &srcImage,
>+                                                    VkImageLayout srcImageLayout,
>+                                                    const Image &dstImage,
>+                                                    VkImageLayout dstImageLayout,
>+                                                    uint32_t regionCount,
>+                                                    const VkImageBlit *pRegions,
>+                                                    VkFilter filter)
>+{
>+    // Currently ANGLE uses limited params so verify those assumptions and update if they change
>+    ASSERT(srcImageLayout == VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL);
>+    ASSERT(dstImageLayout == VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL);
>+    ASSERT(regionCount == 1);
>+    BlitImageParams *paramStruct = initCommand<BlitImageParams>(CommandID::BlitImage);
>+    paramStruct->srcImage        = srcImage.getHandle();
>+    paramStruct->dstImage        = dstImage.getHandle();
>+    paramStruct->filter          = filter;
>+    paramStruct->region          = pRegions[0];
>+}
>+
>+ANGLE_INLINE void SecondaryCommandBuffer::clearAttachments(uint32_t attachmentCount,
>+                                                           const VkClearAttachment *attachments,
>+                                                           uint32_t rectCount,
>+                                                           const VkClearRect *rects)
>+{
>+    ASSERT(rectCount == 1);
>+    uint8_t *writePtr;
>+    size_t attachSize = attachmentCount * sizeof(VkClearAttachment);
>+    ClearAttachmentsParams *paramStruct =
>+        initCommand<ClearAttachmentsParams>(CommandID::ClearAttachments, attachSize, &writePtr);
>+    paramStruct->attachmentCount = attachmentCount;
>+    paramStruct->rect            = rects[0];
>+    // Copy variable sized data
>+    storePointerParameter(writePtr, attachments, attachSize);
>+}
>+
>+ANGLE_INLINE void SecondaryCommandBuffer::clearColorImage(const Image &image,
>+                                                          VkImageLayout imageLayout,
>+                                                          const VkClearColorValue &color,
>+                                                          uint32_t rangeCount,
>+                                                          const VkImageSubresourceRange *ranges)
>+{
>+    ASSERT(rangeCount == 1);
>+    ClearColorImageParams *paramStruct =
>+        initCommand<ClearColorImageParams>(CommandID::ClearColorImage);
>+    paramStruct->image       = image.getHandle();
>+    paramStruct->imageLayout = imageLayout;
>+    paramStruct->color       = color;
>+    paramStruct->range       = ranges[0];
>+}
>+
>+ANGLE_INLINE void SecondaryCommandBuffer::clearDepthStencilImage(
>+    const Image &image,
>+    VkImageLayout imageLayout,
>+    const VkClearDepthStencilValue &depthStencil,
>+    uint32_t rangeCount,
>+    const VkImageSubresourceRange *ranges)
>+{
>+    ASSERT(rangeCount == 1);
>+    ClearDepthStencilImageParams *paramStruct =
>+        initCommand<ClearDepthStencilImageParams>(CommandID::ClearDepthStencilImage);
>+    paramStruct->image        = image.getHandle();
>+    paramStruct->imageLayout  = imageLayout;
>+    paramStruct->depthStencil = depthStencil;
>+    paramStruct->range        = ranges[0];
>+}
>+
>+ANGLE_INLINE void SecondaryCommandBuffer::copyBuffer(const Buffer &srcBuffer,
>+                                                     const Buffer &destBuffer,
>+                                                     uint32_t regionCount,
>+                                                     const VkBufferCopy *regions)
>+{
>+    uint8_t *writePtr;
>+    size_t regionSize = regionCount * sizeof(VkBufferCopy);
>+    CopyBufferParams *paramStruct =
>+        initCommand<CopyBufferParams>(CommandID::CopyBuffer, regionSize, &writePtr);
>+    paramStruct->srcBuffer   = srcBuffer.getHandle();
>+    paramStruct->destBuffer  = destBuffer.getHandle();
>+    paramStruct->regionCount = regionCount;
>+    // Copy variable sized data
>+    storePointerParameter(writePtr, regions, regionSize);
>+}
>+
>+ANGLE_INLINE void SecondaryCommandBuffer::copyBufferToImage(VkBuffer srcBuffer,
>+                                                            const Image &dstImage,
>+                                                            VkImageLayout dstImageLayout,
>+                                                            uint32_t regionCount,
>+                                                            const VkBufferImageCopy *regions)
>+{
>+    ASSERT(regionCount == 1);
>+    CopyBufferToImageParams *paramStruct =
>+        initCommand<CopyBufferToImageParams>(CommandID::CopyBufferToImage);
>+    paramStruct->srcBuffer      = srcBuffer;
>+    paramStruct->dstImage       = dstImage.getHandle();
>+    paramStruct->dstImageLayout = dstImageLayout;
>+    paramStruct->region         = regions[0];
>+}
>+
>+ANGLE_INLINE void SecondaryCommandBuffer::copyImage(const Image &srcImage,
>+                                                    VkImageLayout srcImageLayout,
>+                                                    const Image &dstImage,
>+                                                    VkImageLayout dstImageLayout,
>+                                                    uint32_t regionCount,
>+                                                    const VkImageCopy *regions)
>+{
>+    ASSERT(regionCount == 1);
>+    CopyImageParams *paramStruct = initCommand<CopyImageParams>(CommandID::CopyImage);
>+    paramStruct->srcImage        = srcImage.getHandle();
>+    paramStruct->srcImageLayout  = srcImageLayout;
>+    paramStruct->dstImage        = dstImage.getHandle();
>+    paramStruct->dstImageLayout  = dstImageLayout;
>+    paramStruct->region          = regions[0];
>+}
>+
>+ANGLE_INLINE void SecondaryCommandBuffer::copyImageToBuffer(const Image &srcImage,
>+                                                            VkImageLayout srcImageLayout,
>+                                                            VkBuffer dstBuffer,
>+                                                            uint32_t regionCount,
>+                                                            const VkBufferImageCopy *regions)
>+{
>+    ASSERT(regionCount == 1);
>+    CopyImageToBufferParams *paramStruct =
>+        initCommand<CopyImageToBufferParams>(CommandID::CopyImageToBuffer);
>+    paramStruct->srcImage       = srcImage.getHandle();
>+    paramStruct->srcImageLayout = srcImageLayout;
>+    paramStruct->dstBuffer      = dstBuffer;
>+    paramStruct->region         = regions[0];
>+}
>+
>+ANGLE_INLINE void SecondaryCommandBuffer::dispatch(uint32_t groupCountX,
>+                                                   uint32_t groupCountY,
>+                                                   uint32_t groupCountZ)
>+{
>+    DispatchParams *paramStruct = initCommand<DispatchParams>(CommandID::Dispatch);
>+    paramStruct->groupCountX    = groupCountX;
>+    paramStruct->groupCountY    = groupCountY;
>+    paramStruct->groupCountZ    = groupCountZ;
>+}
>+
>+ANGLE_INLINE void SecondaryCommandBuffer::draw(uint32_t vertexCount, uint32_t firstVertex)
>+{
>+    DrawParams *paramStruct  = initCommand<DrawParams>(CommandID::Draw);
>+    paramStruct->vertexCount = vertexCount;
>+    paramStruct->firstVertex = firstVertex;
>+}
>+
>+ANGLE_INLINE void SecondaryCommandBuffer::drawIndexed(uint32_t indexCount)
>+{
>+    DrawIndexedParams *paramStruct = initCommand<DrawIndexedParams>(CommandID::DrawIndexed);
>+    paramStruct->indexCount        = indexCount;
>+}
>+
>+ANGLE_INLINE void SecondaryCommandBuffer::drawIndexedInstanced(uint32_t indexCount,
>+                                                               uint32_t instanceCount)
>+{
>+    DrawIndexedInstancedParams *paramStruct =
>+        initCommand<DrawIndexedInstancedParams>(CommandID::DrawIndexedInstanced);
>+    paramStruct->indexCount    = indexCount;
>+    paramStruct->instanceCount = instanceCount;
>+}
>+
>+ANGLE_INLINE void SecondaryCommandBuffer::drawInstanced(uint32_t vertexCount,
>+                                                        uint32_t instanceCount,
>+                                                        uint32_t firstVertex)
>+{
>+    DrawInstancedParams *paramStruct = initCommand<DrawInstancedParams>(CommandID::DrawInstanced);
>+    paramStruct->vertexCount         = vertexCount;
>+    paramStruct->instanceCount       = instanceCount;
>+    paramStruct->firstVertex         = firstVertex;
>+}
>+
>+ANGLE_INLINE void SecondaryCommandBuffer::endQuery(VkQueryPool queryPool, uint32_t query)
>+{
>+    EndQueryParams *paramStruct = initCommand<EndQueryParams>(CommandID::EndQuery);
>+    paramStruct->queryPool      = queryPool;
>+    paramStruct->query          = query;
>+}
>+
>+ANGLE_INLINE void SecondaryCommandBuffer::imageBarrier(
>+    VkPipelineStageFlags srcStageMask,
>+    VkPipelineStageFlags dstStageMask,
>+    const VkImageMemoryBarrier *imageMemoryBarrier)
>+{
>+    ImageBarrierParams *paramStruct = initCommand<ImageBarrierParams>(CommandID::ImageBarrier);
>+    paramStruct->srcStageMask       = srcStageMask;
>+    paramStruct->dstStageMask       = dstStageMask;
>+    paramStruct->imageMemoryBarrier = *imageMemoryBarrier;
>+}
>+
>+ANGLE_INLINE void SecondaryCommandBuffer::memoryBarrier(VkPipelineStageFlags srcStageMask,
>+                                                        VkPipelineStageFlags dstStageMask,
>+                                                        const VkMemoryBarrier *memoryBarrier)
>+{
>+    MemoryBarrierParams *paramStruct = initCommand<MemoryBarrierParams>(CommandID::MemoryBarrier);
>+    paramStruct->srcStageMask        = srcStageMask;
>+    paramStruct->dstStageMask        = dstStageMask;
>+    paramStruct->memoryBarrier       = *memoryBarrier;
>+}
>+
>+ANGLE_INLINE void SecondaryCommandBuffer::pipelineBarrier(
>+    VkPipelineStageFlags srcStageMask,
>+    VkPipelineStageFlags dstStageMask,
>+    VkDependencyFlags dependencyFlags,
>+    uint32_t memoryBarrierCount,
>+    const VkMemoryBarrier *memoryBarriers,
>+    uint32_t bufferMemoryBarrierCount,
>+    const VkBufferMemoryBarrier *bufferMemoryBarriers,
>+    uint32_t imageMemoryBarrierCount,
>+    const VkImageMemoryBarrier *imageMemoryBarriers)
>+{
>+    uint8_t *writePtr;
>+    size_t memBarrierSize              = memoryBarrierCount * sizeof(VkMemoryBarrier);
>+    size_t buffBarrierSize             = bufferMemoryBarrierCount * sizeof(VkBufferMemoryBarrier);
>+    size_t imgBarrierSize              = imageMemoryBarrierCount * sizeof(VkImageMemoryBarrier);
>+    PipelineBarrierParams *paramStruct = initCommand<PipelineBarrierParams>(
>+        CommandID::PipelineBarrier, memBarrierSize + buffBarrierSize + imgBarrierSize, &writePtr);
>+    paramStruct->srcStageMask             = srcStageMask;
>+    paramStruct->dstStageMask             = dstStageMask;
>+    paramStruct->dependencyFlags          = dependencyFlags;
>+    paramStruct->memoryBarrierCount       = memoryBarrierCount;
>+    paramStruct->bufferMemoryBarrierCount = bufferMemoryBarrierCount;
>+    paramStruct->imageMemoryBarrierCount  = imageMemoryBarrierCount;
>+    // Copy variable sized data
>+    writePtr = storePointerParameter(writePtr, memoryBarriers, memBarrierSize);
>+    writePtr = storePointerParameter(writePtr, bufferMemoryBarriers, buffBarrierSize);
>+    storePointerParameter(writePtr, imageMemoryBarriers, imgBarrierSize);
>+}
>+
>+ANGLE_INLINE void SecondaryCommandBuffer::pushConstants(const PipelineLayout &layout,
>+                                                        VkShaderStageFlags flag,
>+                                                        uint32_t offset,
>+                                                        uint32_t size,
>+                                                        const void *data)
>+{
>+    ASSERT(size == static_cast<size_t>(size));
>+    uint8_t *writePtr;
>+    PushConstantsParams *paramStruct = initCommand<PushConstantsParams>(
>+        CommandID::PushConstants, static_cast<size_t>(size), &writePtr);
>+    paramStruct->layout = layout.getHandle();
>+    paramStruct->flag   = flag;
>+    paramStruct->offset = offset;
>+    paramStruct->size   = size;
>+    // Copy variable sized data
>+    storePointerParameter(writePtr, data, static_cast<size_t>(size));
>+}
>+
>+ANGLE_INLINE void SecondaryCommandBuffer::resetEvent(VkEvent event, VkPipelineStageFlags stageMask)
>+{
>+    ResetEventParams *paramStruct = initCommand<ResetEventParams>(CommandID::ResetEvent);
>+    paramStruct->event            = event;
>+    paramStruct->stageMask        = stageMask;
>+}
>+
>+ANGLE_INLINE void SecondaryCommandBuffer::resetQueryPool(VkQueryPool queryPool,
>+                                                         uint32_t firstQuery,
>+                                                         uint32_t queryCount)
>+{
>+    ResetQueryPoolParams *paramStruct =
>+        initCommand<ResetQueryPoolParams>(CommandID::ResetQueryPool);
>+    paramStruct->queryPool  = queryPool;
>+    paramStruct->firstQuery = firstQuery;
>+    paramStruct->queryCount = queryCount;
>+}
>+
>+ANGLE_INLINE void SecondaryCommandBuffer::setEvent(VkEvent event, VkPipelineStageFlags stageMask)
>+{
>+    SetEventParams *paramStruct = initCommand<SetEventParams>(CommandID::SetEvent);
>+    paramStruct->event          = event;
>+    paramStruct->stageMask      = stageMask;
>+}
>+
>+ANGLE_INLINE void SecondaryCommandBuffer::waitEvents(
>+    uint32_t eventCount,
>+    const VkEvent *events,
>+    VkPipelineStageFlags srcStageMask,
>+    VkPipelineStageFlags dstStageMask,
>+    uint32_t memoryBarrierCount,
>+    const VkMemoryBarrier *memoryBarriers,
>+    uint32_t bufferMemoryBarrierCount,
>+    const VkBufferMemoryBarrier *bufferMemoryBarriers,
>+    uint32_t imageMemoryBarrierCount,
>+    const VkImageMemoryBarrier *imageMemoryBarriers)
>+{
>+    uint8_t *writePtr;
>+    size_t eventSize              = eventCount * sizeof(VkEvent);
>+    size_t memBarrierSize         = memoryBarrierCount * sizeof(VkMemoryBarrier);
>+    size_t buffBarrierSize        = bufferMemoryBarrierCount * sizeof(VkBufferMemoryBarrier);
>+    size_t imgBarrierSize         = imageMemoryBarrierCount * sizeof(VkImageMemoryBarrier);
>+    WaitEventsParams *paramStruct = initCommand<WaitEventsParams>(
>+        CommandID::WaitEvents, eventSize + memBarrierSize + buffBarrierSize + imgBarrierSize,
>+        &writePtr);
>+    paramStruct->eventCount               = eventCount;
>+    paramStruct->srcStageMask             = srcStageMask;
>+    paramStruct->dstStageMask             = dstStageMask;
>+    paramStruct->memoryBarrierCount       = memoryBarrierCount;
>+    paramStruct->bufferMemoryBarrierCount = bufferMemoryBarrierCount;
>+    paramStruct->imageMemoryBarrierCount  = imageMemoryBarrierCount;
>+    // Copy variable sized data
>+    writePtr = storePointerParameter(writePtr, events, eventSize);
>+    writePtr = storePointerParameter(writePtr, memoryBarriers, memBarrierSize);
>+    writePtr = storePointerParameter(writePtr, bufferMemoryBarriers, buffBarrierSize);
>+    storePointerParameter(writePtr, imageMemoryBarriers, imgBarrierSize);
>+}
>+
>+ANGLE_INLINE void SecondaryCommandBuffer::writeTimestamp(VkPipelineStageFlagBits pipelineStage,
>+                                                         VkQueryPool queryPool,
>+                                                         uint32_t query)
>+{
>+    WriteTimestampParams *paramStruct =
>+        initCommand<WriteTimestampParams>(CommandID::WriteTimestamp);
>+    paramStruct->pipelineStage = pipelineStage;
>+    paramStruct->queryPool     = queryPool;
>+    paramStruct->query         = query;
>+}
>+}  // namespace priv
>+}  // namespace vk
>+}  // namespace rx
>+
>+#endif  // LIBANGLE_RENDERER_VULKAN_SECONDARYCOMMANDBUFFERVK_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/ShaderVk.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/ShaderVk.cpp
>index 78024a635a4..479571ce7bd 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/ShaderVk.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/ShaderVk.cpp
>@@ -10,34 +10,36 @@
> #include "libANGLE/renderer/vulkan/ShaderVk.h"
> 
> #include "common/debug.h"
>+#include "libANGLE/Context.h"
>+#include "libANGLE/renderer/vulkan/ContextVk.h"
>+#include "platform/FeaturesVk.h"
> 
> namespace rx
> {
> 
>-ShaderVk::ShaderVk(const gl::ShaderState &data) : ShaderImpl(data)
>-{
>-}
>+ShaderVk::ShaderVk(const gl::ShaderState &data) : ShaderImpl(data) {}
> 
>-ShaderVk::~ShaderVk()
>-{
>-}
>+ShaderVk::~ShaderVk() {}
> 
>-ShCompileOptions ShaderVk::prepareSourceAndReturnOptions(std::stringstream *sourceStream,
>-                                                         std::string *sourcePath)
>+std::shared_ptr<WaitableCompileEvent> ShaderVk::compile(const gl::Context *context,
>+                                                        gl::ShCompilerInstance *compilerInstance,
>+                                                        ShCompileOptions options)
> {
>-    *sourceStream << mData.getSource();
>-    return 0;
>-}
>+    ShCompileOptions compileOptions = SH_INITIALIZE_UNINITIALIZED_LOCALS;
> 
>-bool ShaderVk::postTranslateCompile(gl::Compiler *compiler, std::string *infoLog)
>-{
>-    // No work to do here.
>-    return true;
>+    ContextVk *contextVk = vk::GetImpl(context);
>+
>+    if (contextVk->getFeatures().clampPointSize)
>+    {
>+        compileOptions |= SH_CLAMP_POINT_SIZE;
>+    }
>+
>+    return compileImpl(context, compilerInstance, mData.getSource(), compileOptions | options);
> }
> 
> std::string ShaderVk::getDebugInfo() const
> {
>-    return std::string();
>+    return mData.getTranslatedSource();
> }
> 
> }  // namespace rx
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/ShaderVk.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/ShaderVk.h
>index 10f8fe42364..d489143d24e 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/ShaderVk.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/ShaderVk.h
>@@ -21,11 +21,9 @@ class ShaderVk : public ShaderImpl
>     ShaderVk(const gl::ShaderState &data);
>     ~ShaderVk() override;
> 
>-    // Returns additional sh::Compile options.
>-    ShCompileOptions prepareSourceAndReturnOptions(std::stringstream *sourceStream,
>-                                                   std::string *sourcePath) override;
>-    // Returns success for compiling on the driver. Returns success.
>-    bool postTranslateCompile(gl::Compiler *compiler, std::string *infoLog) override;
>+    std::shared_ptr<WaitableCompileEvent> compile(const gl::Context *context,
>+                                                  gl::ShCompilerInstance *compilerInstance,
>+                                                  ShCompileOptions options) override;
> 
>     std::string getDebugInfo() const override;
> };
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/SurfaceVk.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/SurfaceVk.cpp
>index ed2ed9508cb..99aa5807ba4 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/SurfaceVk.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/SurfaceVk.cpp
>@@ -13,10 +13,12 @@
> #include "libANGLE/Context.h"
> #include "libANGLE/Display.h"
> #include "libANGLE/Surface.h"
>+#include "libANGLE/renderer/vulkan/ContextVk.h"
> #include "libANGLE/renderer/vulkan/DisplayVk.h"
> #include "libANGLE/renderer/vulkan/FramebufferVk.h"
> #include "libANGLE/renderer/vulkan/RendererVk.h"
>-#include "libANGLE/renderer/vulkan/formatutilsvk.h"
>+#include "libANGLE/renderer/vulkan/vk_format_utils.h"
>+#include "third_party/trace_event/trace_event.h"
> 
> namespace rx
> {
>@@ -24,58 +26,153 @@ namespace rx
> namespace
> {
> 
>-const vk::Format &GetVkFormatFromConfig(RendererVk *renderer, const egl::Config &config)
>-{
>-    // TODO(jmadill): Properly handle format interpretation.
>-    return renderer->getFormat(GL_BGRA8_EXT);
>-}
>-
> VkPresentModeKHR GetDesiredPresentMode(const std::vector<VkPresentModeKHR> &presentModes,
>-                                       EGLint minSwapInterval,
>-                                       EGLint maxSwapInterval)
>+                                       EGLint interval)
> {
>     ASSERT(!presentModes.empty());
> 
>-    // Use FIFO mode for v-sync, since it throttles you to the display rate. Mailbox is more
>-    // similar to triple-buffering. For now we hard-code Mailbox for perf testing.
>-    // TODO(jmadill): Properly select present mode and re-create display if changed.
>-    VkPresentModeKHR bestChoice = VK_PRESENT_MODE_MAILBOX_KHR;
>+    // If v-sync is enabled, use FIFO, which throttles you to the display rate and is guaranteed to
>+    // always be supported.
>+    if (interval > 0)
>+    {
>+        return VK_PRESENT_MODE_FIFO_KHR;
>+    }
>+
>+    // Otherwise, choose either of the following, if available, in order specified here:
>+    //
>+    // - Mailbox is similar to triple-buffering.
>+    // - Immediate is similar to single-buffering.
>+    //
>+    // If neither is supported, we fallback to FIFO.
>+
>+    bool mailboxAvailable   = false;
>+    bool immediateAvailable = false;
> 
>-    for (auto presentMode : presentModes)
>+    for (VkPresentModeKHR presentMode : presentModes)
>     {
>-        if (presentMode == bestChoice)
>+        switch (presentMode)
>         {
>-            return bestChoice;
>+            case VK_PRESENT_MODE_MAILBOX_KHR:
>+                mailboxAvailable = true;
>+                break;
>+            case VK_PRESENT_MODE_IMMEDIATE_KHR:
>+                immediateAvailable = true;
>+                break;
>+            default:
>+                break;
>         }
>     }
> 
>-    WARN() << "Present mode " << bestChoice << " not available. Falling back to "
>-           << presentModes[0];
>-    return presentModes[0];
>+    // Note again that VK_PRESENT_MODE_FIFO_KHR is guaranteed to be available.
>+    return mailboxAvailable
>+               ? VK_PRESENT_MODE_MAILBOX_KHR
>+               : immediateAvailable ? VK_PRESENT_MODE_IMMEDIATE_KHR : VK_PRESENT_MODE_FIFO_KHR;
> }
> 
>+constexpr VkImageUsageFlags kSurfaceVKImageUsageFlags =
>+    VK_IMAGE_USAGE_TRANSFER_DST_BIT | VK_IMAGE_USAGE_TRANSFER_SRC_BIT;
>+constexpr VkImageUsageFlags kSurfaceVKColorImageUsageFlags =
>+    kSurfaceVKImageUsageFlags | VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT | VK_IMAGE_USAGE_SAMPLED_BIT;
>+constexpr VkImageUsageFlags kSurfaceVKDepthStencilImageUsageFlags =
>+    kSurfaceVKImageUsageFlags | VK_IMAGE_USAGE_DEPTH_STENCIL_ATTACHMENT_BIT;
>+
> }  // namespace
> 
>+OffscreenSurfaceVk::AttachmentImage::AttachmentImage()
>+{
>+    renderTarget.init(&image, &imageView, 0, 0, nullptr);
>+}
>+
>+OffscreenSurfaceVk::AttachmentImage::~AttachmentImage() = default;
>+
>+angle::Result OffscreenSurfaceVk::AttachmentImage::initialize(DisplayVk *displayVk,
>+                                                              EGLint width,
>+                                                              EGLint height,
>+                                                              const vk::Format &vkFormat)
>+{
>+    RendererVk *renderer = displayVk->getRenderer();
>+
>+    const angle::Format &textureFormat = vkFormat.imageFormat();
>+    bool isDepthOrStencilFormat   = textureFormat.depthBits > 0 || textureFormat.stencilBits > 0;
>+    const VkImageUsageFlags usage = isDepthOrStencilFormat ? kSurfaceVKDepthStencilImageUsageFlags
>+                                                           : kSurfaceVKColorImageUsageFlags;
>+
>+    gl::Extents extents(std::max(static_cast<int>(width), 1), std::max(static_cast<int>(height), 1),
>+                        1);
>+    ANGLE_TRY(image.init(displayVk, gl::TextureType::_2D, extents, vkFormat, 1, usage, 1, 1));
>+
>+    VkMemoryPropertyFlags flags = VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT;
>+    ANGLE_TRY(image.initMemory(displayVk, renderer->getMemoryProperties(), flags));
>+
>+    VkImageAspectFlags aspect = vk::GetFormatAspectFlags(textureFormat);
>+
>+    ANGLE_TRY(image.initImageView(displayVk, gl::TextureType::_2D, aspect, gl::SwizzleState(),
>+                                  &imageView, 0, 1));
>+
>+    // Clear the image if it has emulated channels.
>+    ANGLE_TRY(image.clearIfEmulatedFormat(displayVk, gl::ImageIndex::Make2D(0), vkFormat));
>+
>+    return angle::Result::Continue;
>+}
>+
>+void OffscreenSurfaceVk::AttachmentImage::destroy(const egl::Display *display)
>+{
>+    const DisplayVk *displayVk = vk::GetImpl(display);
>+    RendererVk *renderer       = displayVk->getRenderer();
>+
>+    image.releaseImage(renderer);
>+    image.releaseStagingBuffer(renderer);
>+    renderer->releaseObject(renderer->getCurrentQueueSerial(), &imageView);
>+}
>+
> OffscreenSurfaceVk::OffscreenSurfaceVk(const egl::SurfaceState &surfaceState,
>                                        EGLint width,
>                                        EGLint height)
>     : SurfaceImpl(surfaceState), mWidth(width), mHeight(height)
>+{}
>+
>+OffscreenSurfaceVk::~OffscreenSurfaceVk() {}
>+
>+egl::Error OffscreenSurfaceVk::initialize(const egl::Display *display)
> {
>+    DisplayVk *displayVk = vk::GetImpl(display);
>+    angle::Result result = initializeImpl(displayVk);
>+    return angle::ToEGL(result, displayVk, EGL_BAD_SURFACE);
> }
> 
>-OffscreenSurfaceVk::~OffscreenSurfaceVk()
>+angle::Result OffscreenSurfaceVk::initializeImpl(DisplayVk *displayVk)
> {
>+    RendererVk *renderer      = displayVk->getRenderer();
>+    const egl::Config *config = mState.config;
>+
>+    if (config->renderTargetFormat != GL_NONE)
>+    {
>+        ANGLE_TRY(mColorAttachment.initialize(displayVk, mWidth, mHeight,
>+                                              renderer->getFormat(config->renderTargetFormat)));
>+    }
>+
>+    if (config->depthStencilFormat != GL_NONE)
>+    {
>+        ANGLE_TRY(mDepthStencilAttachment.initialize(
>+            displayVk, mWidth, mHeight, renderer->getFormat(config->depthStencilFormat)));
>+    }
>+
>+    return angle::Result::Continue;
> }
> 
>-egl::Error OffscreenSurfaceVk::initialize(const egl::Display *display)
>+void OffscreenSurfaceVk::destroy(const egl::Display *display)
> {
>-    return egl::NoError();
>+    mColorAttachment.destroy(display);
>+    mDepthStencilAttachment.destroy(display);
> }
> 
>-FramebufferImpl *OffscreenSurfaceVk::createDefaultFramebuffer(const gl::FramebufferState &state)
>+FramebufferImpl *OffscreenSurfaceVk::createDefaultFramebuffer(const gl::Context *context,
>+                                                              const gl::FramebufferState &state)
> {
>+    RendererVk *renderer = vk::GetImpl(context)->getRenderer();
>+
>     // Use a user FBO for an offscreen RT.
>-    return FramebufferVk::CreateUserFBO(state);
>+    return FramebufferVk::CreateUserFBO(renderer, state);
> }
> 
> egl::Error OffscreenSurfaceVk::swap(const gl::Context *context)
>@@ -98,12 +195,14 @@ egl::Error OffscreenSurfaceVk::querySurfacePointerANGLE(EGLint /*attribute*/, vo
>     return egl::EglBadCurrentSurface();
> }
> 
>-egl::Error OffscreenSurfaceVk::bindTexImage(gl::Texture * /*texture*/, EGLint /*buffer*/)
>+egl::Error OffscreenSurfaceVk::bindTexImage(const gl::Context * /*context*/,
>+                                            gl::Texture * /*texture*/,
>+                                            EGLint /*buffer*/)
> {
>     return egl::NoError();
> }
> 
>-egl::Error OffscreenSurfaceVk::releaseTexImage(EGLint /*buffer*/)
>+egl::Error OffscreenSurfaceVk::releaseTexImage(const gl::Context * /*context*/, EGLint /*buffer*/)
> {
>     return egl::NoError();
> }
>@@ -116,9 +215,7 @@ egl::Error OffscreenSurfaceVk::getSyncValues(EGLuint64KHR * /*ust*/,
>     return egl::EglBadAccess();
> }
> 
>-void OffscreenSurfaceVk::setSwapInterval(EGLint /*interval*/)
>-{
>-}
>+void OffscreenSurfaceVk::setSwapInterval(EGLint /*interval*/) {}
> 
> EGLint OffscreenSurfaceVk::getWidth() const
> {
>@@ -137,29 +234,93 @@ EGLint OffscreenSurfaceVk::isPostSubBufferSupported() const
> 
> EGLint OffscreenSurfaceVk::getSwapBehavior() const
> {
>-    return EGL_BUFFER_PRESERVED;
>+    return EGL_BUFFER_DESTROYED;
> }
> 
>-gl::Error OffscreenSurfaceVk::getAttachmentRenderTarget(
>-    const gl::Context * /*context*/,
>-    GLenum /*binding*/,
>-    const gl::ImageIndex & /*imageIndex*/,
>-    FramebufferAttachmentRenderTarget ** /*rtOut*/)
>+angle::Result OffscreenSurfaceVk::getAttachmentRenderTarget(
>+    const gl::Context *context,
>+    GLenum binding,
>+    const gl::ImageIndex &imageIndex,
>+    FramebufferAttachmentRenderTarget **rtOut)
> {
>-    UNREACHABLE();
>-    return gl::InternalError();
>+    if (binding == GL_BACK)
>+    {
>+        *rtOut = &mColorAttachment.renderTarget;
>+    }
>+    else
>+    {
>+        ASSERT(binding == GL_DEPTH || binding == GL_STENCIL || binding == GL_DEPTH_STENCIL);
>+        *rtOut = &mDepthStencilAttachment.renderTarget;
>+    }
>+
>+    return angle::Result::Continue;
> }
> 
>-gl::Error OffscreenSurfaceVk::initializeContents(const gl::Context *context,
>-                                                 const gl::ImageIndex &imageIndex)
>+angle::Result OffscreenSurfaceVk::initializeContents(const gl::Context *context,
>+                                                     const gl::ImageIndex &imageIndex)
> {
>-    UNIMPLEMENTED();
>-    return gl::NoError();
>+    ContextVk *contextVk = vk::GetImpl(context);
>+
>+    if (mColorAttachment.image.valid())
>+    {
>+        mColorAttachment.image.stageSubresourceRobustClear(
>+            imageIndex, mColorAttachment.image.getFormat().angleFormat());
>+        ANGLE_TRY(mColorAttachment.image.flushAllStagedUpdates(contextVk));
>+    }
>+
>+    if (mDepthStencilAttachment.image.valid())
>+    {
>+        mDepthStencilAttachment.image.stageSubresourceRobustClear(
>+            imageIndex, mDepthStencilAttachment.image.getFormat().angleFormat());
>+        ANGLE_TRY(mDepthStencilAttachment.image.flushAllStagedUpdates(contextVk));
>+    }
>+    return angle::Result::Continue;
>+}
>+
>+vk::ImageHelper *OffscreenSurfaceVk::getColorAttachmentImage()
>+{
>+    return &mColorAttachment.image;
>+}
>+
>+WindowSurfaceVk::SwapchainImage::SwapchainImage()  = default;
>+WindowSurfaceVk::SwapchainImage::~SwapchainImage() = default;
>+
>+WindowSurfaceVk::SwapchainImage::SwapchainImage(SwapchainImage &&other)
>+    : image(std::move(other.image)),
>+      imageView(std::move(other.imageView)),
>+      framebuffer(std::move(other.framebuffer))
>+{}
>+
>+WindowSurfaceVk::SwapHistory::SwapHistory() = default;
>+WindowSurfaceVk::SwapHistory::SwapHistory(SwapHistory &&other)
>+{
>+    *this = std::move(other);
>+}
>+
>+WindowSurfaceVk::SwapHistory &WindowSurfaceVk::SwapHistory::operator=(SwapHistory &&other)
>+{
>+    std::swap(serial, other.serial);
>+    std::swap(semaphores, other.semaphores);
>+    std::swap(swapchain, other.swapchain);
>+    return *this;
> }
> 
>-WindowSurfaceVk::SwapchainImage::SwapchainImage()                                        = default;
>-WindowSurfaceVk::SwapchainImage::SwapchainImage(WindowSurfaceVk::SwapchainImage &&other) = default;
>-WindowSurfaceVk::SwapchainImage::~SwapchainImage()                                       = default;
>+WindowSurfaceVk::SwapHistory::~SwapHistory() = default;
>+
>+void WindowSurfaceVk::SwapHistory::destroy(VkDevice device)
>+{
>+    if (swapchain != VK_NULL_HANDLE)
>+    {
>+        vkDestroySwapchainKHR(device, swapchain, nullptr);
>+        swapchain = VK_NULL_HANDLE;
>+    }
>+
>+    for (vk::Semaphore &semaphore : semaphores)
>+    {
>+        semaphore.destroy(device);
>+    }
>+    semaphores.clear();
>+}
> 
> WindowSurfaceVk::WindowSurfaceVk(const egl::SurfaceState &surfaceState,
>                                  EGLNativeWindowType window,
>@@ -170,13 +331,15 @@ WindowSurfaceVk::WindowSurfaceVk(const egl::SurfaceState &surfaceState,
>       mSurface(VK_NULL_HANDLE),
>       mInstance(VK_NULL_HANDLE),
>       mSwapchain(VK_NULL_HANDLE),
>-      mRenderTarget(),
>-      mCurrentSwapchainImageIndex(0)
>+      mSwapchainPresentMode(VK_PRESENT_MODE_FIFO_KHR),
>+      mDesiredSwapchainPresentMode(VK_PRESENT_MODE_FIFO_KHR),
>+      mMinImageCount(0),
>+      mPreTransform(VK_SURFACE_TRANSFORM_IDENTITY_BIT_KHR),
>+      mCompositeAlpha(VK_COMPOSITE_ALPHA_OPAQUE_BIT_KHR),
>+      mCurrentSwapchainImageIndex(0),
>+      mCurrentSwapHistoryIndex(0)
> {
>-    mRenderTarget.extents.width  = static_cast<GLint>(width);
>-    mRenderTarget.extents.height = static_cast<GLint>(height);
>-    mRenderTarget.extents.depth  = 1;
>-    mRenderTarget.resource       = this;
>+    mDepthStencilRenderTarget.init(&mDepthStencilImage, &mDepthStencilImageView, 0, 0, nullptr);
> }
> 
> WindowSurfaceVk::~WindowSurfaceVk()
>@@ -187,24 +350,19 @@ WindowSurfaceVk::~WindowSurfaceVk()
> 
> void WindowSurfaceVk::destroy(const egl::Display *display)
> {
>-    const DisplayVk *displayVk = vk::GetImpl(display);
>-    RendererVk *rendererVk     = displayVk->getRenderer();
>-    VkDevice device            = rendererVk->getDevice();
>-    VkInstance instance        = rendererVk->getInstance();
>+    DisplayVk *displayVk = vk::GetImpl(display);
>+    RendererVk *renderer = displayVk->getRenderer();
>+    VkDevice device      = renderer->getDevice();
>+    VkInstance instance  = renderer->getInstance();
> 
>-    rendererVk->finish();
>+    // We might not need to flush the pipe here.
>+    (void)renderer->finish(displayVk, nullptr, nullptr);
> 
>-    mAcquireNextImageSemaphore.destroy(device);
>+    releaseSwapchainImages(renderer);
> 
>-    for (auto &swapchainImage : mSwapchainImages)
>+    for (SwapHistory &swap : mSwapHistory)
>     {
>-        // Although we don't own the swapchain image handles, we need to keep our shutdown clean.
>-        swapchainImage.image.reset();
>-
>-        swapchainImage.imageView.destroy(device);
>-        swapchainImage.framebuffer.destroy(device);
>-        swapchainImage.imageAcquiredSemaphore.destroy(device);
>-        swapchainImage.commandsCompleteSemaphore.destroy(device);
>+        swap.destroy(device);
>     }
> 
>     if (mSwapchain)
>@@ -218,95 +376,91 @@ void WindowSurfaceVk::destroy(const egl::Display *display)
>         vkDestroySurfaceKHR(instance, mSurface, nullptr);
>         mSurface = VK_NULL_HANDLE;
>     }
>+
>+    for (vk::Semaphore &flushSemaphore : mFlushSemaphoreChain)
>+    {
>+        flushSemaphore.destroy(device);
>+    }
>+    mFlushSemaphoreChain.clear();
> }
> 
> egl::Error WindowSurfaceVk::initialize(const egl::Display *display)
> {
>-    const DisplayVk *displayVk = vk::GetImpl(display);
>-    return initializeImpl(displayVk->getRenderer()).toEGL(EGL_BAD_SURFACE);
>+    DisplayVk *displayVk = vk::GetImpl(display);
>+    angle::Result result = initializeImpl(displayVk);
>+    return angle::ToEGL(result, displayVk, EGL_BAD_SURFACE);
> }
> 
>-vk::Error WindowSurfaceVk::initializeImpl(RendererVk *renderer)
>+angle::Result WindowSurfaceVk::initializeImpl(DisplayVk *displayVk)
> {
>+    RendererVk *renderer = displayVk->getRenderer();
>+
>     gl::Extents windowSize;
>-    ANGLE_TRY_RESULT(createSurfaceVk(renderer), windowSize);
>+    ANGLE_TRY(createSurfaceVk(displayVk, &windowSize));
> 
>     uint32_t presentQueue = 0;
>-    ANGLE_TRY_RESULT(renderer->selectPresentQueueForSurface(mSurface), presentQueue);
>+    ANGLE_TRY(renderer->selectPresentQueueForSurface(displayVk, mSurface, &presentQueue));
>+    ANGLE_UNUSED_VARIABLE(presentQueue);
> 
>     const VkPhysicalDevice &physicalDevice = renderer->getPhysicalDevice();
> 
>-    VkSurfaceCapabilitiesKHR surfaceCaps;
>-    ANGLE_VK_TRY(vkGetPhysicalDeviceSurfaceCapabilitiesKHR(physicalDevice, mSurface, &surfaceCaps));
>+    ANGLE_VK_TRY(displayVk, vkGetPhysicalDeviceSurfaceCapabilitiesKHR(physicalDevice, mSurface,
>+                                                                      &mSurfaceCaps));
> 
>     // Adjust width and height to the swapchain if necessary.
>-    uint32_t width  = surfaceCaps.currentExtent.width;
>-    uint32_t height = surfaceCaps.currentExtent.height;
>+    uint32_t width  = mSurfaceCaps.currentExtent.width;
>+    uint32_t height = mSurfaceCaps.currentExtent.height;
> 
>     // TODO(jmadill): Support devices which don't support copy. We use this for ReadPixels.
>-    ANGLE_VK_CHECK((surfaceCaps.supportedUsageFlags & VK_IMAGE_USAGE_TRANSFER_SRC_BIT) != 0,
>+    ANGLE_VK_CHECK(displayVk,
>+                   (mSurfaceCaps.supportedUsageFlags & kSurfaceVKColorImageUsageFlags) ==
>+                       kSurfaceVKColorImageUsageFlags,
>                    VK_ERROR_INITIALIZATION_FAILED);
> 
>-    if (surfaceCaps.currentExtent.width == 0xFFFFFFFFu)
>+    EGLAttrib attribWidth  = mState.attributes.get(EGL_WIDTH, 0);
>+    EGLAttrib attribHeight = mState.attributes.get(EGL_HEIGHT, 0);
>+
>+    if (mSurfaceCaps.currentExtent.width == 0xFFFFFFFFu)
>     {
>-        ASSERT(surfaceCaps.currentExtent.height == 0xFFFFFFFFu);
>+        ASSERT(mSurfaceCaps.currentExtent.height == 0xFFFFFFFFu);
> 
>-        if (mRenderTarget.extents.width == 0)
>-        {
>-            width = windowSize.width;
>-        }
>-        if (mRenderTarget.extents.height == 0)
>-        {
>-            height = windowSize.height;
>-        }
>+        width  = (attribWidth != 0) ? static_cast<uint32_t>(attribWidth) : windowSize.width;
>+        height = (attribHeight != 0) ? static_cast<uint32_t>(attribHeight) : windowSize.height;
>     }
> 
>-    mRenderTarget.extents.width  = static_cast<int>(width);
>-    mRenderTarget.extents.height = static_cast<int>(height);
>+    gl::Extents extents(static_cast<int>(width), static_cast<int>(height), 1);
> 
>     uint32_t presentModeCount = 0;
>-    ANGLE_VK_TRY(vkGetPhysicalDeviceSurfacePresentModesKHR(physicalDevice, mSurface,
>-                                                           &presentModeCount, nullptr));
>+    ANGLE_VK_TRY(displayVk, vkGetPhysicalDeviceSurfacePresentModesKHR(physicalDevice, mSurface,
>+                                                                      &presentModeCount, nullptr));
>     ASSERT(presentModeCount > 0);
> 
>-    std::vector<VkPresentModeKHR> presentModes(presentModeCount);
>-    ANGLE_VK_TRY(vkGetPhysicalDeviceSurfacePresentModesKHR(physicalDevice, mSurface,
>-                                                           &presentModeCount, presentModes.data()));
>-
>-    // Select appropriate present mode based on vsync parameter.
>-    // TODO(jmadill): More complete implementation, which allows for changing and more values.
>-    const EGLint minSwapInterval = mState.config->minSwapInterval;
>-    const EGLint maxSwapInterval = mState.config->maxSwapInterval;
>-    ASSERT(minSwapInterval == 0 || minSwapInterval == 1);
>-    ASSERT(maxSwapInterval == 0 || maxSwapInterval == 1);
>-
>-    VkPresentModeKHR swapchainPresentMode =
>-        GetDesiredPresentMode(presentModes, minSwapInterval, maxSwapInterval);
>+    mPresentModes.resize(presentModeCount);
>+    ANGLE_VK_TRY(displayVk, vkGetPhysicalDeviceSurfacePresentModesKHR(
>+                                physicalDevice, mSurface, &presentModeCount, mPresentModes.data()));
> 
>-    // Determine number of swapchain images. Aim for one more than the minimum.
>-    uint32_t minImageCount = surfaceCaps.minImageCount + 1;
>-    if (surfaceCaps.maxImageCount > 0 && minImageCount > surfaceCaps.maxImageCount)
>-    {
>-        minImageCount = surfaceCaps.maxImageCount;
>-    }
>+    // Select appropriate present mode based on vsync parameter.  Default to 1 (FIFO), though it
>+    // will get clamped to the min/max values specified at display creation time.
>+    setSwapInterval(renderer->getFeatures().disableFifoPresentMode ? 0 : 1);
> 
>     // Default to identity transform.
>-    VkSurfaceTransformFlagBitsKHR preTransform = VK_SURFACE_TRANSFORM_IDENTITY_BIT_KHR;
>-    if ((surfaceCaps.supportedTransforms & preTransform) == 0)
>+    mPreTransform = VK_SURFACE_TRANSFORM_IDENTITY_BIT_KHR;
>+    if ((mSurfaceCaps.supportedTransforms & mPreTransform) == 0)
>     {
>-        preTransform = surfaceCaps.currentTransform;
>+        mPreTransform = mSurfaceCaps.currentTransform;
>     }
> 
>     uint32_t surfaceFormatCount = 0;
>-    ANGLE_VK_TRY(vkGetPhysicalDeviceSurfaceFormatsKHR(physicalDevice, mSurface, &surfaceFormatCount,
>-                                                      nullptr));
>+    ANGLE_VK_TRY(displayVk, vkGetPhysicalDeviceSurfaceFormatsKHR(physicalDevice, mSurface,
>+                                                                 &surfaceFormatCount, nullptr));
> 
>     std::vector<VkSurfaceFormatKHR> surfaceFormats(surfaceFormatCount);
>-    ANGLE_VK_TRY(vkGetPhysicalDeviceSurfaceFormatsKHR(physicalDevice, mSurface, &surfaceFormatCount,
>+    ANGLE_VK_TRY(displayVk,
>+                 vkGetPhysicalDeviceSurfaceFormatsKHR(physicalDevice, mSurface, &surfaceFormatCount,
>                                                       surfaceFormats.data()));
> 
>-    mRenderTarget.format  = &GetVkFormatFromConfig(renderer, *mState.config);
>-    VkFormat nativeFormat = mRenderTarget.format->vkTextureFormat;
>+    const vk::Format &format = renderer->getFormat(mState.config->renderTargetFormat);
>+    VkFormat nativeFormat    = format.vkImageFormat;
> 
>     if (surfaceFormatCount == 1u && surfaceFormats[0].format == VK_FORMAT_UNDEFINED)
>     {
>@@ -315,7 +469,7 @@ vk::Error WindowSurfaceVk::initializeImpl(RendererVk *renderer)
>     else
>     {
>         bool foundFormat = false;
>-        for (const auto &surfaceFormat : surfaceFormats)
>+        for (const VkSurfaceFormatKHR &surfaceFormat : surfaceFormats)
>         {
>             if (surfaceFormat.format == nativeFormat)
>             {
>@@ -324,162 +478,369 @@ vk::Error WindowSurfaceVk::initializeImpl(RendererVk *renderer)
>             }
>         }
> 
>-        ANGLE_VK_CHECK(foundFormat, VK_ERROR_INITIALIZATION_FAILED);
>-    }
>-
>-    VkSwapchainCreateInfoKHR swapchainInfo;
>-    swapchainInfo.sType              = VK_STRUCTURE_TYPE_SWAPCHAIN_CREATE_INFO_KHR;
>-    swapchainInfo.pNext              = nullptr;
>-    swapchainInfo.flags              = 0;
>-    swapchainInfo.surface            = mSurface;
>-    swapchainInfo.minImageCount      = minImageCount;
>-    swapchainInfo.imageFormat        = nativeFormat;
>-    swapchainInfo.imageColorSpace    = VK_COLORSPACE_SRGB_NONLINEAR_KHR;
>-    swapchainInfo.imageExtent.width  = width;
>-    swapchainInfo.imageExtent.height = height;
>-    swapchainInfo.imageArrayLayers   = 1;
>-    swapchainInfo.imageUsage         = (VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT |
>-                                VK_IMAGE_USAGE_TRANSFER_SRC_BIT | VK_IMAGE_USAGE_TRANSFER_DST_BIT);
>+        ANGLE_VK_CHECK(displayVk, foundFormat, VK_ERROR_INITIALIZATION_FAILED);
>+    }
>+
>+    mCompositeAlpha = VK_COMPOSITE_ALPHA_OPAQUE_BIT_KHR;
>+    if ((mSurfaceCaps.supportedCompositeAlpha & mCompositeAlpha) == 0)
>+    {
>+        mCompositeAlpha = VK_COMPOSITE_ALPHA_INHERIT_BIT_KHR;
>+    }
>+    ANGLE_VK_CHECK(displayVk, (mSurfaceCaps.supportedCompositeAlpha & mCompositeAlpha) != 0,
>+                   VK_ERROR_INITIALIZATION_FAILED);
>+
>+    ANGLE_TRY(recreateSwapchain(displayVk, extents, mCurrentSwapHistoryIndex));
>+
>+    // Get the first available swapchain iamge.
>+    return nextSwapchainImage(displayVk);
>+}
>+
>+angle::Result WindowSurfaceVk::recreateSwapchain(DisplayVk *displayVk,
>+                                                 const gl::Extents &extents,
>+                                                 uint32_t swapHistoryIndex)
>+{
>+    RendererVk *renderer = displayVk->getRenderer();
>+    VkDevice device      = renderer->getDevice();
>+
>+    VkSwapchainKHR oldSwapchain = mSwapchain;
>+    mSwapchain                  = VK_NULL_HANDLE;
>+
>+    if (oldSwapchain)
>+    {
>+        // Note: the old swapchain must be destroyed regardless of whether creating the new
>+        // swapchain succeeds.  We can only destroy the swapchain once rendering to all its images
>+        // have finished.  We therefore store the handle to the swapchain being destroyed in the
>+        // swap history (alongside the serial of the last submission) so it can be destroyed once we
>+        // wait on that serial as part of the CPU throttling.
>+        mSwapHistory[swapHistoryIndex].swapchain = oldSwapchain;
>+    }
>+
>+    releaseSwapchainImages(renderer);
>+
>+    const vk::Format &format = renderer->getFormat(mState.config->renderTargetFormat);
>+    VkFormat nativeFormat    = format.vkImageFormat;
>+
>+    // We need transfer src for reading back from the backbuffer.
>+    constexpr VkImageUsageFlags kImageUsageFlags = kSurfaceVKColorImageUsageFlags;
>+
>+    VkSwapchainCreateInfoKHR swapchainInfo = {};
>+    swapchainInfo.sType                    = VK_STRUCTURE_TYPE_SWAPCHAIN_CREATE_INFO_KHR;
>+    swapchainInfo.flags                    = 0;
>+    swapchainInfo.surface                  = mSurface;
>+    swapchainInfo.minImageCount            = mMinImageCount;
>+    swapchainInfo.imageFormat              = nativeFormat;
>+    swapchainInfo.imageColorSpace          = VK_COLORSPACE_SRGB_NONLINEAR_KHR;
>+    // Note: Vulkan doesn't allow 0-width/height swapchains.
>+    swapchainInfo.imageExtent.width     = std::max(extents.width, 1);
>+    swapchainInfo.imageExtent.height    = std::max(extents.height, 1);
>+    swapchainInfo.imageArrayLayers      = 1;
>+    swapchainInfo.imageUsage            = kImageUsageFlags;
>     swapchainInfo.imageSharingMode      = VK_SHARING_MODE_EXCLUSIVE;
>     swapchainInfo.queueFamilyIndexCount = 0;
>     swapchainInfo.pQueueFamilyIndices   = nullptr;
>-    swapchainInfo.preTransform          = preTransform;
>-    swapchainInfo.compositeAlpha        = VK_COMPOSITE_ALPHA_OPAQUE_BIT_KHR;
>-    swapchainInfo.presentMode           = swapchainPresentMode;
>+    swapchainInfo.preTransform          = mPreTransform;
>+    swapchainInfo.compositeAlpha        = mCompositeAlpha;
>+    swapchainInfo.presentMode           = mDesiredSwapchainPresentMode;
>     swapchainInfo.clipped               = VK_TRUE;
>-    swapchainInfo.oldSwapchain          = VK_NULL_HANDLE;
>+    swapchainInfo.oldSwapchain          = oldSwapchain;
> 
>-    VkDevice device = renderer->getDevice();
>-    ANGLE_VK_TRY(vkCreateSwapchainKHR(device, &swapchainInfo, nullptr, &mSwapchain));
>+    // TODO(syoussefi): Once EGL_SWAP_BEHAVIOR_PRESERVED_BIT is supported, the contents of the old
>+    // swapchain need to carry over to the new one.  http://anglebug.com/2942
>+    ANGLE_VK_TRY(displayVk, vkCreateSwapchainKHR(device, &swapchainInfo, nullptr, &mSwapchain));
>+    mSwapchainPresentMode = mDesiredSwapchainPresentMode;
> 
>     // Intialize the swapchain image views.
>     uint32_t imageCount = 0;
>-    ANGLE_VK_TRY(vkGetSwapchainImagesKHR(device, mSwapchain, &imageCount, nullptr));
>+    ANGLE_VK_TRY(displayVk, vkGetSwapchainImagesKHR(device, mSwapchain, &imageCount, nullptr));
> 
>     std::vector<VkImage> swapchainImages(imageCount);
>-    ANGLE_VK_TRY(vkGetSwapchainImagesKHR(device, mSwapchain, &imageCount, swapchainImages.data()));
>+    ANGLE_VK_TRY(displayVk,
>+                 vkGetSwapchainImagesKHR(device, mSwapchain, &imageCount, swapchainImages.data()));
> 
>-    // CommandBuffer is a singleton in the Renderer.
>-    vk::CommandBufferAndState *commandBuffer = nullptr;
>-    ANGLE_TRY(renderer->getStartedCommandBuffer(&commandBuffer));
>+    mSwapchainImages.resize(imageCount);
> 
>-    VkClearColorValue transparentBlack;
>-    transparentBlack.float32[0] = 0.0f;
>-    transparentBlack.float32[1] = 0.0f;
>-    transparentBlack.float32[2] = 0.0f;
>-    transparentBlack.float32[3] = 0.0f;
>+    for (uint32_t imageIndex = 0; imageIndex < imageCount; ++imageIndex)
>+    {
>+        SwapchainImage &member = mSwapchainImages[imageIndex];
>+        member.image.init2DWeakReference(swapchainImages[imageIndex], extents, format, 1);
> 
>-    mSwapchainImages.resize(imageCount);
>+        ANGLE_TRY(member.image.initImageView(displayVk, gl::TextureType::_2D,
>+                                             VK_IMAGE_ASPECT_COLOR_BIT, gl::SwizzleState(),
>+                                             &member.imageView, 0, 1));
> 
>-    ANGLE_TRY(mAcquireNextImageSemaphore.init(device));
>+        // Clear the image if it has emulated channels.
>+        ANGLE_TRY(member.image.clearIfEmulatedFormat(displayVk, gl::ImageIndex::Make2D(0), format));
>+    }
> 
>-    for (uint32_t imageIndex = 0; imageIndex < imageCount; ++imageIndex)
>+    // Initialize depth/stencil if requested.
>+    if (mState.config->depthStencilFormat != GL_NONE)
>     {
>-        VkImage swapchainImage = swapchainImages[imageIndex];
>+        const vk::Format &dsFormat = renderer->getFormat(mState.config->depthStencilFormat);
> 
>-        VkImageViewCreateInfo imageViewInfo;
>-        imageViewInfo.sType                           = VK_STRUCTURE_TYPE_IMAGE_VIEW_CREATE_INFO;
>-        imageViewInfo.pNext                           = nullptr;
>-        imageViewInfo.flags                           = 0;
>-        imageViewInfo.image                           = swapchainImage;
>-        imageViewInfo.viewType                        = VK_IMAGE_VIEW_TYPE_2D;
>-        imageViewInfo.format                          = nativeFormat;
>-        imageViewInfo.components.r                    = VK_COMPONENT_SWIZZLE_R;
>-        imageViewInfo.components.g                    = VK_COMPONENT_SWIZZLE_G;
>-        imageViewInfo.components.b                    = VK_COMPONENT_SWIZZLE_B;
>-        imageViewInfo.components.a                    = VK_COMPONENT_SWIZZLE_A;
>-        imageViewInfo.subresourceRange.aspectMask     = VK_IMAGE_ASPECT_COLOR_BIT;
>-        imageViewInfo.subresourceRange.baseMipLevel   = 0;
>-        imageViewInfo.subresourceRange.levelCount     = 1;
>-        imageViewInfo.subresourceRange.baseArrayLayer = 0;
>-        imageViewInfo.subresourceRange.layerCount     = 1;
>+        const VkImageUsageFlags dsUsage = kSurfaceVKDepthStencilImageUsageFlags;
> 
>-        auto &member = mSwapchainImages[imageIndex];
>+        ANGLE_TRY(mDepthStencilImage.init(displayVk, gl::TextureType::_2D, extents, dsFormat, 1,
>+                                          dsUsage, 1, 1));
>+        ANGLE_TRY(mDepthStencilImage.initMemory(displayVk, renderer->getMemoryProperties(),
>+                                                VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT));
> 
>-        member.image.setHandle(swapchainImage);
>-        ANGLE_TRY(member.imageView.init(device, imageViewInfo));
>+        const VkImageAspectFlags aspect = vk::GetDepthStencilAspectFlags(dsFormat.imageFormat());
>+        ANGLE_TRY(mDepthStencilImage.initImageView(displayVk, gl::TextureType::_2D, aspect,
>+                                                   gl::SwizzleState(), &mDepthStencilImageView, 0,
>+                                                   1));
> 
>-        // Set transfer dest layout, and clear the image to black.
>-        member.image.changeLayoutWithStages(
>-            VK_IMAGE_ASPECT_COLOR_BIT, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL,
>-            VK_PIPELINE_STAGE_ALL_GRAPHICS_BIT, VK_PIPELINE_STAGE_TRANSFER_BIT, commandBuffer);
>-        commandBuffer->clearSingleColorImage(member.image, transparentBlack);
>+        // We will need to pass depth/stencil image views to the RenderTargetVk in the future.
> 
>-        ANGLE_TRY(member.imageAcquiredSemaphore.init(device));
>-        ANGLE_TRY(member.commandsCompleteSemaphore.init(device));
>+        // Clear the image if it has emulated channels.
>+        ANGLE_TRY(mDepthStencilImage.clearIfEmulatedFormat(displayVk, gl::ImageIndex::Make2D(0),
>+                                                           dsFormat));
>     }
> 
>-    ANGLE_TRY(renderer->submitAndFinishCommandBuffer(commandBuffer));
>+    return angle::Result::Continue;
>+}
> 
>-    // Get the first available swapchain iamge.
>-    ANGLE_TRY(nextSwapchainImage(renderer));
>+angle::Result WindowSurfaceVk::checkForOutOfDateSwapchain(DisplayVk *displayVk,
>+                                                          uint32_t swapHistoryIndex,
>+                                                          bool presentOutOfDate)
>+{
>+    bool swapIntervalChanged = mSwapchainPresentMode != mDesiredSwapchainPresentMode;
>+
>+    // Check for window resize and recreate swapchain if necessary.
>+    gl::Extents currentExtents;
>+    ANGLE_TRY(getCurrentWindowSize(displayVk, &currentExtents));
>+
>+    gl::Extents swapchainExtents(getWidth(), getHeight(), 0);
>+
>+    // If window size has changed, check with surface capabilities.  It has been observed on
>+    // Android that `getCurrentWindowSize()` returns 1920x1080 for example, while surface
>+    // capabilities returns the size the surface was created with.
>+    if (currentExtents != swapchainExtents)
>+    {
>+        const VkPhysicalDevice &physicalDevice = displayVk->getRenderer()->getPhysicalDevice();
>+        ANGLE_VK_TRY(displayVk, vkGetPhysicalDeviceSurfaceCapabilitiesKHR(physicalDevice, mSurface,
>+                                                                          &mSurfaceCaps));
>+
>+        uint32_t width  = mSurfaceCaps.currentExtent.width;
>+        uint32_t height = mSurfaceCaps.currentExtent.height;
>+
>+        if (width != 0xFFFFFFFFu)
>+        {
>+            ASSERT(height != 0xFFFFFFFFu);
>+            currentExtents.width  = width;
>+            currentExtents.height = height;
>+        }
>+    }
>+
>+    // If anything has changed, recreate the swapchain.
>+    if (presentOutOfDate || swapIntervalChanged || currentExtents != swapchainExtents)
>+    {
>+        ANGLE_TRY(recreateSwapchain(displayVk, currentExtents, swapHistoryIndex));
>+    }
>+
>+    return angle::Result::Continue;
>+}
>+
>+void WindowSurfaceVk::releaseSwapchainImages(RendererVk *renderer)
>+{
>+    if (mDepthStencilImage.valid())
>+    {
>+        Serial depthStencilSerial = mDepthStencilImage.getStoredQueueSerial();
>+        mDepthStencilImage.releaseImage(renderer);
>+        mDepthStencilImage.releaseStagingBuffer(renderer);
>+
>+        if (mDepthStencilImageView.valid())
>+        {
>+            renderer->releaseObject(depthStencilSerial, &mDepthStencilImageView);
>+        }
>+    }
>+
>+    for (SwapchainImage &swapchainImage : mSwapchainImages)
>+    {
>+        Serial imageSerial = swapchainImage.image.getStoredQueueSerial();
>+
>+        // We don't own the swapchain image handles, so we just remove our reference to it.
>+        swapchainImage.image.resetImageWeakReference();
>+        swapchainImage.image.destroy(renderer->getDevice());
>+
>+        if (swapchainImage.imageView.valid())
>+        {
>+            renderer->releaseObject(imageSerial, &swapchainImage.imageView);
>+        }
>+
>+        if (swapchainImage.framebuffer.valid())
>+        {
>+            renderer->releaseObject(imageSerial, &swapchainImage.framebuffer);
>+        }
>+    }
> 
>-    return vk::NoError();
>+    mSwapchainImages.clear();
> }
> 
>-FramebufferImpl *WindowSurfaceVk::createDefaultFramebuffer(const gl::FramebufferState &state)
>+FramebufferImpl *WindowSurfaceVk::createDefaultFramebuffer(const gl::Context *context,
>+                                                           const gl::FramebufferState &state)
> {
>-    return FramebufferVk::CreateDefaultFBO(state, this);
>+    RendererVk *renderer = vk::GetImpl(context)->getRenderer();
>+    return FramebufferVk::CreateDefaultFBO(renderer, state, this);
>+}
>+
>+egl::Error WindowSurfaceVk::swapWithDamage(const gl::Context *context,
>+                                           EGLint *rects,
>+                                           EGLint n_rects)
>+{
>+    DisplayVk *displayVk = vk::GetImpl(context->getDisplay());
>+    angle::Result result = swapImpl(displayVk, rects, n_rects);
>+    return angle::ToEGL(result, displayVk, EGL_BAD_SURFACE);
> }
> 
> egl::Error WindowSurfaceVk::swap(const gl::Context *context)
> {
>-    const DisplayVk *displayVk = vk::GetImpl(context->getCurrentDisplay());
>-    RendererVk *renderer       = displayVk->getRenderer();
>+    DisplayVk *displayVk = vk::GetImpl(context->getDisplay());
>+    angle::Result result = swapImpl(displayVk, nullptr, 0);
>+    return angle::ToEGL(result, displayVk, EGL_BAD_SURFACE);
>+}
> 
>-    vk::CommandBufferAndState *currentCB = nullptr;
>-    ANGLE_TRY(renderer->getStartedCommandBuffer(&currentCB));
>+angle::Result WindowSurfaceVk::present(DisplayVk *displayVk,
>+                                       EGLint *rects,
>+                                       EGLint n_rects,
>+                                       bool &swapchainOutOfDate)
>+{
>+    RendererVk *renderer = displayVk->getRenderer();
>+
>+    // Throttle the submissions to avoid getting too far ahead of the GPU.
>+    SwapHistory &swap = mSwapHistory[mCurrentSwapHistoryIndex];
>+    {
>+        TRACE_EVENT0("gpu.angle", "WindowSurfaceVk::present: Throttle CPU");
>+        ANGLE_TRY(renderer->finishToSerial(displayVk, swap.serial));
>+        swap.destroy(renderer->getDevice());
>+    }
> 
>-    // End render pass
>-    renderer->endRenderPass();
>+    SwapchainImage &image = mSwapchainImages[mCurrentSwapchainImageIndex];
> 
>-    auto &image = mSwapchainImages[mCurrentSwapchainImageIndex];
>+    vk::CommandBuffer *swapCommands = nullptr;
>+    ANGLE_TRY(image.image.recordCommands(displayVk, &swapCommands));
>+
>+    image.image.changeLayout(VK_IMAGE_ASPECT_COLOR_BIT, vk::ImageLayout::Present, swapCommands);
>+
>+    const vk::Semaphore *waitSemaphore   = nullptr;
>+    const vk::Semaphore *signalSemaphore = nullptr;
>+    if (!renderer->getCommandGraph()->empty())
>+    {
>+        ANGLE_TRY(generateSemaphoresForFlush(displayVk, &waitSemaphore, &signalSemaphore));
>+    }
> 
>-    image.image.changeLayoutWithStages(VK_IMAGE_ASPECT_COLOR_BIT, VK_IMAGE_LAYOUT_PRESENT_SRC_KHR,
>-                                       VK_PIPELINE_STAGE_ALL_COMMANDS_BIT,
>-                                       VK_PIPELINE_STAGE_BOTTOM_OF_PIPE_BIT, currentCB);
>+    ANGLE_TRY(renderer->flush(displayVk, waitSemaphore, signalSemaphore));
> 
>-    ANGLE_TRY(renderer->submitCommandsWithSync(currentCB, image.imageAcquiredSemaphore,
>-                                               image.commandsCompleteSemaphore));
>+    // The semaphore chain must at least have the semaphore returned by vkAquireImage in it. It will
>+    // likely have more based on how much work was flushed this frame.
>+    ASSERT(!mFlushSemaphoreChain.empty());
> 
>-    VkPresentInfoKHR presentInfo;
>+    VkPresentInfoKHR presentInfo   = {};
>     presentInfo.sType              = VK_STRUCTURE_TYPE_PRESENT_INFO_KHR;
>-    presentInfo.pNext              = nullptr;
>     presentInfo.waitSemaphoreCount = 1;
>-    presentInfo.pWaitSemaphores    = image.commandsCompleteSemaphore.ptr();
>+    presentInfo.pWaitSemaphores    = mFlushSemaphoreChain.back().ptr();
>     presentInfo.swapchainCount     = 1;
>     presentInfo.pSwapchains        = &mSwapchain;
>     presentInfo.pImageIndices      = &mCurrentSwapchainImageIndex;
>     presentInfo.pResults           = nullptr;
> 
>-    ANGLE_VK_TRY(vkQueuePresentKHR(renderer->getQueue(), &presentInfo));
>+    VkPresentRegionKHR presentRegion   = {};
>+    VkPresentRegionsKHR presentRegions = {};
>+    std::vector<VkRectLayerKHR> vkRects;
>+    if (renderer->getFeatures().supportsIncrementalPresent && (n_rects > 0))
>+    {
>+        EGLint width  = getWidth();
>+        EGLint height = getHeight();
>+
>+        EGLint *eglRects             = rects;
>+        presentRegion.rectangleCount = n_rects;
>+        vkRects.resize(n_rects);
>+        for (EGLint i = 0; i < n_rects; i++)
>+        {
>+            VkRectLayerKHR &rect = vkRects[i];
>+
>+            // Make sure the damage rects are within swapchain bounds.
>+            rect.offset.x      = gl::clamp(*eglRects++, 0, width);
>+            rect.offset.y      = gl::clamp(*eglRects++, 0, height);
>+            rect.extent.width  = gl::clamp(*eglRects++, 0, width - rect.offset.x);
>+            rect.extent.height = gl::clamp(*eglRects++, 0, height - rect.offset.y);
>+            rect.layer         = 0;
>+        }
>+        presentRegion.pRectangles = vkRects.data();
>+
>+        presentRegions.sType          = VK_STRUCTURE_TYPE_PRESENT_REGIONS_KHR;
>+        presentRegions.pNext          = nullptr;
>+        presentRegions.swapchainCount = 1;
>+        presentRegions.pRegions       = &presentRegion;
>+
>+        presentInfo.pNext = &presentRegions;
>+    }
>+
>+    // Update the swap history for this presentation
>+    swap.serial     = renderer->getLastSubmittedQueueSerial();
>+    swap.semaphores = std::move(mFlushSemaphoreChain);
>+    ++mCurrentSwapHistoryIndex;
>+    mCurrentSwapHistoryIndex =
>+        mCurrentSwapHistoryIndex == mSwapHistory.size() ? 0 : mCurrentSwapHistoryIndex;
>+
>+    VkResult result = vkQueuePresentKHR(renderer->getQueue(), &presentInfo);
>+
>+    // If SUBOPTIMAL/OUT_OF_DATE is returned, it's ok, we just need to recreate the swapchain before
>+    // continuing.
>+    swapchainOutOfDate = result == VK_SUBOPTIMAL_KHR || result == VK_ERROR_OUT_OF_DATE_KHR;
>+    if (!swapchainOutOfDate)
>+    {
>+        ANGLE_VK_TRY(displayVk, result);
>+    }
>+
>+    return angle::Result::Continue;
>+}
>+
>+angle::Result WindowSurfaceVk::swapImpl(DisplayVk *displayVk, EGLint *rects, EGLint n_rects)
>+{
>+    bool swapchainOutOfDate;
>+    // Save this now, since present() will increment the value.
>+    size_t currentSwapHistoryIndex = mCurrentSwapHistoryIndex;
>+
>+    ANGLE_TRY(present(displayVk, rects, n_rects, swapchainOutOfDate));
>+
>+    ANGLE_TRY(checkForOutOfDateSwapchain(displayVk, currentSwapHistoryIndex, swapchainOutOfDate));
>+
>+    {
>+        // Note: TRACE_EVENT0 is put here instead of inside the function to workaround this issue:
>+        // http://anglebug.com/2927
>+        TRACE_EVENT0("gpu.angle", "nextSwapchainImage");
>+        // Get the next available swapchain image.
>+        ANGLE_TRY(nextSwapchainImage(displayVk));
>+    }
> 
>-    // Get the next available swapchain image.
>-    ANGLE_TRY(nextSwapchainImage(renderer));
>+    RendererVk *renderer = displayVk->getRenderer();
>+    ANGLE_TRY(renderer->syncPipelineCacheVk(displayVk));
> 
>-    return vk::NoError();
>+    return angle::Result::Continue;
> }
> 
>-vk::Error WindowSurfaceVk::nextSwapchainImage(RendererVk *renderer)
>+angle::Result WindowSurfaceVk::nextSwapchainImage(DisplayVk *displayVk)
> {
>-    VkDevice device = renderer->getDevice();
>+    VkDevice device = displayVk->getDevice();
>+
>+    vk::Scoped<vk::Semaphore> aquireImageSemaphore(device);
>+    ANGLE_VK_TRY(displayVk, aquireImageSemaphore.get().init(device));
> 
>-    // Use a timeout of zero for AcquireNextImage so we don't actually block.
>-    // TODO(jmadill): We should handle VK_NOT_READY and block until we can acquire the image.
>-    ANGLE_VK_TRY(vkAcquireNextImageKHR(device, mSwapchain, 0,
>-                                       mAcquireNextImageSemaphore.getHandle(), VK_NULL_HANDLE,
>-                                       &mCurrentSwapchainImageIndex));
>+    ANGLE_VK_TRY(displayVk, vkAcquireNextImageKHR(device, mSwapchain, UINT64_MAX,
>+                                                  aquireImageSemaphore.get().getHandle(),
>+                                                  VK_NULL_HANDLE, &mCurrentSwapchainImageIndex));
> 
>-    auto &image = mSwapchainImages[mCurrentSwapchainImageIndex];
>+    // After presenting, the flush semaphore chain is cleared. The semaphore returned by
>+    // vkAcquireNextImage will start a new chain.
>+    ASSERT(mFlushSemaphoreChain.empty());
>+    mFlushSemaphoreChain.push_back(aquireImageSemaphore.release());
> 
>-    // Swap the unused swapchain semaphore and the now active spare semaphore.
>-    std::swap(image.imageAcquiredSemaphore, mAcquireNextImageSemaphore);
>+    SwapchainImage &image = mSwapchainImages[mCurrentSwapchainImageIndex];
> 
>     // Update RenderTarget pointers.
>-    mRenderTarget.image     = &image.image;
>-    mRenderTarget.imageView = &image.imageView;
>+    mColorRenderTarget.updateSwapchainImage(&image.image, &image.imageView);
> 
>-    return vk::NoError();
>+    return angle::Result::Continue;
> }
> 
> egl::Error WindowSurfaceVk::postSubBuffer(const gl::Context *context,
>@@ -498,12 +859,14 @@ egl::Error WindowSurfaceVk::querySurfacePointerANGLE(EGLint attribute, void **va
>     return egl::EglBadCurrentSurface();
> }
> 
>-egl::Error WindowSurfaceVk::bindTexImage(gl::Texture *texture, EGLint buffer)
>+egl::Error WindowSurfaceVk::bindTexImage(const gl::Context *context,
>+                                         gl::Texture *texture,
>+                                         EGLint buffer)
> {
>     return egl::NoError();
> }
> 
>-egl::Error WindowSurfaceVk::releaseTexImage(EGLint buffer)
>+egl::Error WindowSurfaceVk::releaseTexImage(const gl::Context *context, EGLint buffer)
> {
>     return egl::NoError();
> }
>@@ -518,16 +881,52 @@ egl::Error WindowSurfaceVk::getSyncValues(EGLuint64KHR * /*ust*/,
> 
> void WindowSurfaceVk::setSwapInterval(EGLint interval)
> {
>+    const EGLint minSwapInterval = mState.config->minSwapInterval;
>+    const EGLint maxSwapInterval = mState.config->maxSwapInterval;
>+    ASSERT(minSwapInterval == 0 || minSwapInterval == 1);
>+    ASSERT(maxSwapInterval == 0 || maxSwapInterval == 1);
>+
>+    interval = gl::clamp(interval, minSwapInterval, maxSwapInterval);
>+
>+    mDesiredSwapchainPresentMode = GetDesiredPresentMode(mPresentModes, interval);
>+
>+    // Determine the number of swapchain images:
>+    //
>+    // - On mailbox, we use minImageCount.  The drivers may increase the number so that non-blocking
>+    //   mailbox actually makes sense.
>+    // - On immediate, we use max(2, minImageCount).  The vkQueuePresentKHR call immediately frees
>+    //   up the other image, so there is no point in having any more images.
>+    // - On fifo, we use max(3, minImageCount).  Triple-buffering allows us to present an image,
>+    //   have one in the queue and record in another.  Note: on certain configurations (windows +
>+    //   nvidia + windowed mode), we could get away with a smaller number.
>+    mMinImageCount = mSurfaceCaps.minImageCount;
>+    if (mDesiredSwapchainPresentMode == VK_PRESENT_MODE_IMMEDIATE_KHR)
>+    {
>+        mMinImageCount = std::max(2u, mMinImageCount);
>+    }
>+    else if (mDesiredSwapchainPresentMode == VK_PRESENT_MODE_FIFO_KHR)
>+    {
>+        mMinImageCount = std::max(3u, mMinImageCount);
>+    }
>+
>+    // Make sure we don't exceed maxImageCount.
>+    if (mSurfaceCaps.maxImageCount > 0 && mMinImageCount > mSurfaceCaps.maxImageCount)
>+    {
>+        mMinImageCount = mSurfaceCaps.maxImageCount;
>+    }
>+
>+    // On the next swap, if the desired present mode is different from the current one, the
>+    // swapchain will be recreated.
> }
> 
> EGLint WindowSurfaceVk::getWidth() const
> {
>-    return static_cast<EGLint>(mRenderTarget.extents.width);
>+    return static_cast<EGLint>(mColorRenderTarget.getExtents().width);
> }
> 
> EGLint WindowSurfaceVk::getHeight() const
> {
>-    return static_cast<EGLint>(mRenderTarget.extents.height);
>+    return static_cast<EGLint>(mColorRenderTarget.getExtents().height);
> }
> 
> EGLint WindowSurfaceVk::isPostSubBufferSupported() const
>@@ -542,55 +941,102 @@ EGLint WindowSurfaceVk::getSwapBehavior() const
>     return EGL_BUFFER_DESTROYED;
> }
> 
>-gl::Error WindowSurfaceVk::getAttachmentRenderTarget(const gl::Context * /*context*/,
>-                                                     GLenum /*binding*/,
>-                                                     const gl::ImageIndex & /*target*/,
>-                                                     FramebufferAttachmentRenderTarget **rtOut)
>+angle::Result WindowSurfaceVk::getAttachmentRenderTarget(const gl::Context *context,
>+                                                         GLenum binding,
>+                                                         const gl::ImageIndex &imageIndex,
>+                                                         FramebufferAttachmentRenderTarget **rtOut)
> {
>-    *rtOut = &mRenderTarget;
>-    return gl::NoError();
>+    if (binding == GL_BACK)
>+    {
>+        *rtOut = &mColorRenderTarget;
>+    }
>+    else
>+    {
>+        ASSERT(binding == GL_DEPTH || binding == GL_STENCIL || binding == GL_DEPTH_STENCIL);
>+        *rtOut = &mDepthStencilRenderTarget;
>+    }
>+
>+    return angle::Result::Continue;
> }
> 
>-gl::ErrorOrResult<vk::Framebuffer *> WindowSurfaceVk::getCurrentFramebuffer(
>-    VkDevice device,
>-    const vk::RenderPass &compatibleRenderPass)
>+angle::Result WindowSurfaceVk::getCurrentFramebuffer(vk::Context *context,
>+                                                     const vk::RenderPass &compatibleRenderPass,
>+                                                     vk::Framebuffer **framebufferOut)
> {
>-    auto &currentFramebuffer = mSwapchainImages[mCurrentSwapchainImageIndex].framebuffer;
>+    vk::Framebuffer &currentFramebuffer = mSwapchainImages[mCurrentSwapchainImageIndex].framebuffer;
> 
>     if (currentFramebuffer.valid())
>     {
>         // Validation layers should detect if the render pass is really compatible.
>-        return &currentFramebuffer;
>+        *framebufferOut = &currentFramebuffer;
>+        return angle::Result::Continue;
>     }
> 
>-    VkFramebufferCreateInfo framebufferInfo;
>+    VkFramebufferCreateInfo framebufferInfo = {};
>+
>+    const gl::Extents extents             = mColorRenderTarget.getExtents();
>+    std::array<VkImageView, 2> imageViews = {{VK_NULL_HANDLE, mDepthStencilImageView.getHandle()}};
> 
>-    // TODO(jmadill): Depth/Stencil attachments.
>     framebufferInfo.sType           = VK_STRUCTURE_TYPE_FRAMEBUFFER_CREATE_INFO;
>-    framebufferInfo.pNext           = nullptr;
>     framebufferInfo.flags           = 0;
>     framebufferInfo.renderPass      = compatibleRenderPass.getHandle();
>-    framebufferInfo.attachmentCount = 1u;
>-    framebufferInfo.pAttachments    = nullptr;
>-    framebufferInfo.width           = static_cast<uint32_t>(mRenderTarget.extents.width);
>-    framebufferInfo.height          = static_cast<uint32_t>(mRenderTarget.extents.height);
>+    framebufferInfo.attachmentCount = (mDepthStencilImage.valid() ? 2u : 1u);
>+    framebufferInfo.pAttachments    = imageViews.data();
>+    framebufferInfo.width           = static_cast<uint32_t>(extents.width);
>+    framebufferInfo.height          = static_cast<uint32_t>(extents.height);
>     framebufferInfo.layers          = 1;
> 
>-    for (auto &swapchainImage : mSwapchainImages)
>+    for (SwapchainImage &swapchainImage : mSwapchainImages)
>     {
>-        framebufferInfo.pAttachments = swapchainImage.imageView.ptr();
>-        ANGLE_TRY(swapchainImage.framebuffer.init(device, framebufferInfo));
>+        imageViews[0] = swapchainImage.imageView.getHandle();
>+        ANGLE_VK_TRY(context,
>+                     swapchainImage.framebuffer.init(context->getDevice(), framebufferInfo));
>     }
> 
>     ASSERT(currentFramebuffer.valid());
>-    return &currentFramebuffer;
>+    *framebufferOut = &currentFramebuffer;
>+    return angle::Result::Continue;
> }
> 
>-gl::Error WindowSurfaceVk::initializeContents(const gl::Context *context,
>-                                              const gl::ImageIndex &imageIndex)
>+angle::Result WindowSurfaceVk::generateSemaphoresForFlush(vk::Context *context,
>+                                                          const vk::Semaphore **outWaitSemaphore,
>+                                                          const vk::Semaphore **outSignalSempahore)
> {
>-    UNIMPLEMENTED();
>-    return gl::NoError();
>+    // The flush semaphore chain should always start with a semaphore in it, created by the
>+    // vkAquireImage call. This semaphore must be waited on before any rendering to the swap chain
>+    // image can occur.
>+    ASSERT(!mFlushSemaphoreChain.empty());
>+
>+    vk::Semaphore nextSemaphore;
>+    ANGLE_VK_TRY(context, nextSemaphore.init(context->getDevice()));
>+    mFlushSemaphoreChain.push_back(std::move(nextSemaphore));
>+
>+    *outWaitSemaphore   = &mFlushSemaphoreChain[mFlushSemaphoreChain.size() - 2];
>+    *outSignalSempahore = &mFlushSemaphoreChain[mFlushSemaphoreChain.size() - 1];
>+
>+    return angle::Result::Continue;
>+}
>+
>+angle::Result WindowSurfaceVk::initializeContents(const gl::Context *context,
>+                                                  const gl::ImageIndex &imageIndex)
>+{
>+    ContextVk *contextVk = vk::GetImpl(context);
>+
>+    ASSERT(mSwapchainImages.size() > 0);
>+    ASSERT(mCurrentSwapchainImageIndex < mSwapchainImages.size());
>+
>+    vk::ImageHelper *image = &mSwapchainImages[mCurrentSwapchainImageIndex].image;
>+    image->stageSubresourceRobustClear(imageIndex, image->getFormat().angleFormat());
>+    ANGLE_TRY(image->flushAllStagedUpdates(contextVk));
>+
>+    if (mDepthStencilImage.valid())
>+    {
>+        mDepthStencilImage.stageSubresourceRobustClear(
>+            gl::ImageIndex::Make2D(0), mDepthStencilImage.getFormat().angleFormat());
>+        ANGLE_TRY(mDepthStencilImage.flushAllStagedUpdates(contextVk));
>+    }
>+
>+    return angle::Result::Continue;
> }
> 
> }  // namespace rx
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/SurfaceVk.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/SurfaceVk.h
>index 531f5ea7631..886e9024f4f 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/SurfaceVk.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/SurfaceVk.h
>@@ -14,7 +14,7 @@
> 
> #include "libANGLE/renderer/SurfaceImpl.h"
> #include "libANGLE/renderer/vulkan/RenderTargetVk.h"
>-#include "libANGLE/renderer/vulkan/renderervk_utils.h"
>+#include "libANGLE/renderer/vulkan/vk_helpers.h"
> 
> namespace rx
> {
>@@ -27,7 +27,10 @@ class OffscreenSurfaceVk : public SurfaceImpl
>     ~OffscreenSurfaceVk() override;
> 
>     egl::Error initialize(const egl::Display *display) override;
>-    FramebufferImpl *createDefaultFramebuffer(const gl::FramebufferState &state) override;
>+    void destroy(const egl::Display *display) override;
>+
>+    FramebufferImpl *createDefaultFramebuffer(const gl::Context *context,
>+                                              const gl::FramebufferState &state) override;
>     egl::Error swap(const gl::Context *context) override;
>     egl::Error postSubBuffer(const gl::Context *context,
>                              EGLint x,
>@@ -35,8 +38,10 @@ class OffscreenSurfaceVk : public SurfaceImpl
>                              EGLint width,
>                              EGLint height) override;
>     egl::Error querySurfacePointerANGLE(EGLint attribute, void **value) override;
>-    egl::Error bindTexImage(gl::Texture *texture, EGLint buffer) override;
>-    egl::Error releaseTexImage(EGLint buffer) override;
>+    egl::Error bindTexImage(const gl::Context *context,
>+                            gl::Texture *texture,
>+                            EGLint buffer) override;
>+    egl::Error releaseTexImage(const gl::Context *context, EGLint buffer) override;
>     egl::Error getSyncValues(EGLuint64KHR *ust, EGLuint64KHR *msc, EGLuint64KHR *sbc) override;
>     void setSwapInterval(EGLint interval) override;
> 
>@@ -47,20 +52,43 @@ class OffscreenSurfaceVk : public SurfaceImpl
>     EGLint isPostSubBufferSupported() const override;
>     EGLint getSwapBehavior() const override;
> 
>-    gl::Error getAttachmentRenderTarget(const gl::Context *context,
>-                                        GLenum binding,
>-                                        const gl::ImageIndex &imageIndex,
>-                                        FramebufferAttachmentRenderTarget **rtOut) override;
>+    angle::Result getAttachmentRenderTarget(const gl::Context *context,
>+                                            GLenum binding,
>+                                            const gl::ImageIndex &imageIndex,
>+                                            FramebufferAttachmentRenderTarget **rtOut) override;
>+
>+    angle::Result initializeContents(const gl::Context *context,
>+                                     const gl::ImageIndex &imageIndex) override;
> 
>-    gl::Error initializeContents(const gl::Context *context,
>-                                 const gl::ImageIndex &imageIndex) override;
>+    vk::ImageHelper *getColorAttachmentImage();
> 
>   private:
>+    struct AttachmentImage final : angle::NonCopyable
>+    {
>+        AttachmentImage();
>+        ~AttachmentImage();
>+
>+        angle::Result initialize(DisplayVk *displayVk,
>+                                 EGLint width,
>+                                 EGLint height,
>+                                 const vk::Format &vkFormat);
>+        void destroy(const egl::Display *display);
>+
>+        vk::ImageHelper image;
>+        vk::ImageView imageView;
>+        RenderTargetVk renderTarget;
>+    };
>+
>+    angle::Result initializeImpl(DisplayVk *displayVk);
>+
>     EGLint mWidth;
>     EGLint mHeight;
>+
>+    AttachmentImage mColorAttachment;
>+    AttachmentImage mDepthStencilAttachment;
> };
> 
>-class WindowSurfaceVk : public SurfaceImpl, public ResourceVk
>+class WindowSurfaceVk : public SurfaceImpl
> {
>   public:
>     WindowSurfaceVk(const egl::SurfaceState &surfaceState,
>@@ -72,16 +100,20 @@ class WindowSurfaceVk : public SurfaceImpl, public ResourceVk
>     void destroy(const egl::Display *display) override;
> 
>     egl::Error initialize(const egl::Display *display) override;
>-    FramebufferImpl *createDefaultFramebuffer(const gl::FramebufferState &state) override;
>+    FramebufferImpl *createDefaultFramebuffer(const gl::Context *context,
>+                                              const gl::FramebufferState &state) override;
>     egl::Error swap(const gl::Context *context) override;
>+    egl::Error swapWithDamage(const gl::Context *context, EGLint *rects, EGLint n_rects) override;
>     egl::Error postSubBuffer(const gl::Context *context,
>                              EGLint x,
>                              EGLint y,
>                              EGLint width,
>                              EGLint height) override;
>     egl::Error querySurfacePointerANGLE(EGLint attribute, void **value) override;
>-    egl::Error bindTexImage(gl::Texture *texture, EGLint buffer) override;
>-    egl::Error releaseTexImage(EGLint buffer) override;
>+    egl::Error bindTexImage(const gl::Context *context,
>+                            gl::Texture *texture,
>+                            EGLint buffer) override;
>+    egl::Error releaseTexImage(const gl::Context *context, EGLint buffer) override;
>     egl::Error getSyncValues(EGLuint64KHR *ust, EGLuint64KHR *msc, EGLuint64KHR *sbc) override;
>     void setSwapInterval(EGLint interval) override;
> 
>@@ -92,17 +124,21 @@ class WindowSurfaceVk : public SurfaceImpl, public ResourceVk
>     EGLint isPostSubBufferSupported() const override;
>     EGLint getSwapBehavior() const override;
> 
>-    gl::Error getAttachmentRenderTarget(const gl::Context *context,
>-                                        GLenum binding,
>-                                        const gl::ImageIndex &imageIndex,
>-                                        FramebufferAttachmentRenderTarget **rtOut) override;
>+    angle::Result getAttachmentRenderTarget(const gl::Context *context,
>+                                            GLenum binding,
>+                                            const gl::ImageIndex &imageIndex,
>+                                            FramebufferAttachmentRenderTarget **rtOut) override;
>+
>+    angle::Result initializeContents(const gl::Context *context,
>+                                     const gl::ImageIndex &imageIndex) override;
> 
>-    gl::Error initializeContents(const gl::Context *context,
>-                                 const gl::ImageIndex &imageIndex) override;
>+    angle::Result getCurrentFramebuffer(vk::Context *context,
>+                                        const vk::RenderPass &compatibleRenderPass,
>+                                        vk::Framebuffer **framebufferOut);
> 
>-    gl::ErrorOrResult<vk::Framebuffer *> getCurrentFramebuffer(
>-        VkDevice device,
>-        const vk::RenderPass &compatibleRenderPass);
>+    angle::Result generateSemaphoresForFlush(vk::Context *context,
>+                                             const vk::Semaphore **outWaitSemaphore,
>+                                             const vk::Semaphore **outSignalSempahore);
> 
>   protected:
>     EGLNativeWindowType mNativeWindowType;
>@@ -110,37 +146,93 @@ class WindowSurfaceVk : public SurfaceImpl, public ResourceVk
>     VkInstance mInstance;
> 
>   private:
>-    virtual vk::ErrorOrResult<gl::Extents> createSurfaceVk(RendererVk *renderer) = 0;
>-    vk::Error initializeImpl(RendererVk *renderer);
>-    vk::Error nextSwapchainImage(RendererVk *renderer);
>+    virtual angle::Result createSurfaceVk(vk::Context *context, gl::Extents *extentsOut) = 0;
>+    virtual angle::Result getCurrentWindowSize(vk::Context *context, gl::Extents *extentsOut) = 0;
>+
>+    angle::Result initializeImpl(DisplayVk *displayVk);
>+    angle::Result recreateSwapchain(DisplayVk *displayVk,
>+                                    const gl::Extents &extents,
>+                                    uint32_t swapHistoryIndex);
>+    angle::Result checkForOutOfDateSwapchain(DisplayVk *displayVk,
>+                                             uint32_t swapHistoryIndex,
>+                                             bool presentOutOfDate);
>+    void releaseSwapchainImages(RendererVk *renderer);
>+    angle::Result nextSwapchainImage(DisplayVk *displayVk);
>+    angle::Result present(DisplayVk *displayVk,
>+                          EGLint *rects,
>+                          EGLint n_rects,
>+                          bool &swapchainOutOfDate);
>+    angle::Result swapImpl(DisplayVk *displayVk, EGLint *rects, EGLint n_rects);
>+
>+    VkSurfaceCapabilitiesKHR mSurfaceCaps;
>+    std::vector<VkPresentModeKHR> mPresentModes;
> 
>     VkSwapchainKHR mSwapchain;
>+    // Cached information used to recreate swapchains.
>+    VkPresentModeKHR mSwapchainPresentMode;         // Current swapchain mode
>+    VkPresentModeKHR mDesiredSwapchainPresentMode;  // Desired mode set through setSwapInterval()
>+    uint32_t mMinImageCount;
>+    VkSurfaceTransformFlagBitsKHR mPreTransform;
>+    VkCompositeAlphaFlagBitsKHR mCompositeAlpha;
> 
>-    RenderTargetVk mRenderTarget;
>+    RenderTargetVk mColorRenderTarget;
>+    RenderTargetVk mDepthStencilRenderTarget;
> 
>     uint32_t mCurrentSwapchainImageIndex;
> 
>-    // When acquiring a new image for rendering, we keep a 'spare' semaphore. We pass this extra
>-    // semaphore to VkAcquireNextImage, then hand it to the next available SwapchainImage when
>-    // the command completes. We then make the old semaphore in the new SwapchainImage the spare
>-    // semaphore, since we know the image is no longer using it. This avoids the chicken and egg
>-    // problem with needing to know the next available image index before we acquire it.
>-    vk::Semaphore mAcquireNextImageSemaphore;
>-
>-    struct SwapchainImage
>+    struct SwapchainImage : angle::NonCopyable
>     {
>         SwapchainImage();
>         SwapchainImage(SwapchainImage &&other);
>         ~SwapchainImage();
> 
>-        vk::Image image;
>+        vk::ImageHelper image;
>         vk::ImageView imageView;
>         vk::Framebuffer framebuffer;
>-        vk::Semaphore imageAcquiredSemaphore;
>-        vk::Semaphore commandsCompleteSemaphore;
>     };
> 
>     std::vector<SwapchainImage> mSwapchainImages;
>+
>+    // Each time vkPresent is called, a wait semaphore is needed to know when the work to render the
>+    // frame is done. For ANGLE to know when that is, it needs to add a signal semaphore to each
>+    // flush. Conversely, before being able to use a swap chain image, ANGLE needs to wait on the
>+    // semaphore returned by vkAcquireNextImage.
>+    //
>+    // We build a chain of semaphores starting with the semaphore returned by vkAcquireNextImageKHR
>+    // and ending with the semaphore provided to vkPresent. Each time generateSemaphoresForFlush is
>+    // called, a new semaphore is created and appended to mFlushSemaphoreChain. The second last
>+    // semaphore is used as a wait semaphore and the last one is used as a signal semaphore for the
>+    // flush.
>+    //
>+    // The semaphore chain is cleared after every call to present and a new one is started once
>+    // vkAquireImage is called.
>+    //
>+    // We don't need a semaphore chain for offscreen surfaces or surfaceless rendering because the
>+    // results cannot affect the images in a swap chain.
>+    std::vector<vk::Semaphore> mFlushSemaphoreChain;
>+
>+    // A circular buffer that stores the serial of the renderer on every swap.  The CPU is
>+    // throttled by waiting for the 2nd previous serial to finish.  Old swapchains are scheduled to
>+    // be destroyed at the same time.
>+    struct SwapHistory : angle::NonCopyable
>+    {
>+        SwapHistory();
>+        SwapHistory(SwapHistory &&other);
>+        SwapHistory &operator=(SwapHistory &&other);
>+        ~SwapHistory();
>+
>+        void destroy(VkDevice device);
>+
>+        Serial serial;
>+        std::vector<vk::Semaphore> semaphores;
>+        VkSwapchainKHR swapchain = VK_NULL_HANDLE;
>+    };
>+    static constexpr size_t kSwapHistorySize = 2;
>+    std::array<SwapHistory, kSwapHistorySize> mSwapHistory;
>+    size_t mCurrentSwapHistoryIndex;
>+
>+    vk::ImageHelper mDepthStencilImage;
>+    vk::ImageView mDepthStencilImageView;
> };
> 
> }  // namespace rx
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/SyncVk.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/SyncVk.cpp
>index cd2be0af8fa..ae2b3cd1cef 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/SyncVk.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/SyncVk.cpp
>@@ -10,40 +10,268 @@
> #include "libANGLE/renderer/vulkan/SyncVk.h"
> 
> #include "common/debug.h"
>+#include "libANGLE/Context.h"
>+#include "libANGLE/Display.h"
>+#include "libANGLE/renderer/vulkan/ContextVk.h"
>+#include "libANGLE/renderer/vulkan/DisplayVk.h"
> 
> namespace rx
> {
>+FenceSyncVk::FenceSyncVk() {}
> 
>-SyncVk::SyncVk() : SyncImpl()
>+FenceSyncVk::~FenceSyncVk() {}
>+
>+void FenceSyncVk::onDestroy(RendererVk *renderer)
> {
>+    if (mEvent.valid())
>+    {
>+        renderer->releaseObject(renderer->getCurrentQueueSerial(), &mEvent);
>+    }
>+
>+    mFence.reset(renderer->getDevice());
> }
> 
>-SyncVk::~SyncVk()
>+angle::Result FenceSyncVk::initialize(ContextVk *contextVk)
> {
>+    ASSERT(!mEvent.valid());
>+
>+    RendererVk *renderer = contextVk->getRenderer();
>+    VkDevice device      = renderer->getDevice();
>+
>+    VkEventCreateInfo eventCreateInfo = {};
>+    eventCreateInfo.sType             = VK_STRUCTURE_TYPE_EVENT_CREATE_INFO;
>+    eventCreateInfo.flags             = 0;
>+
>+    vk::Scoped<vk::Event> event(device);
>+    ANGLE_VK_TRY(contextVk, event.get().init(device, eventCreateInfo));
>+
>+    ANGLE_TRY(renderer->getSubmitFence(contextVk, &mFence));
>+
>+    mEvent        = event.release();
>+
>+    renderer->getCommandGraph()->setFenceSync(mEvent);
>+    return angle::Result::Continue;
> }
> 
>-gl::Error SyncVk::set(GLenum condition, GLbitfield flags)
>+angle::Result FenceSyncVk::clientWait(vk::Context *context,
>+                                      ContextVk *contextVk,
>+                                      bool flushCommands,
>+                                      uint64_t timeout,
>+                                      VkResult *outResult)
> {
>-    UNIMPLEMENTED();
>-    return gl::InternalError();
>+    RendererVk *renderer = context->getRenderer();
>+
>+    // If the event is already set, don't wait
>+    bool alreadySignaled = false;
>+    ANGLE_TRY(getStatus(context, &alreadySignaled));
>+    if (alreadySignaled)
>+    {
>+        *outResult = VK_EVENT_SET;
>+        return angle::Result::Continue;
>+    }
>+
>+    // If timeout is zero, there's no need to wait, so return timeout already.
>+    if (timeout == 0)
>+    {
>+        *outResult = VK_TIMEOUT;
>+        return angle::Result::Continue;
>+    }
>+
>+    if (flushCommands && contextVk)
>+    {
>+        ANGLE_TRY(contextVk->flushImpl());
>+    }
>+
>+    // Wait on the fence that's expected to be signaled on the first vkQueueSubmit after
>+    // `initialize` was called.
>+    VkResult status = mFence.get().wait(renderer->getDevice(), timeout);
>+
>+    // Check for errors, but don't consider timeout as such.
>+    if (status != VK_TIMEOUT)
>+    {
>+        ANGLE_VK_TRY(context, status);
>+    }
>+
>+    *outResult = status;
>+    return angle::Result::Continue;
> }
> 
>-gl::Error SyncVk::clientWait(GLbitfield flags, GLuint64 timeout, GLenum *outResult)
>+angle::Result FenceSyncVk::serverWait(vk::Context *context, ContextVk *contextVk)
> {
>-    UNIMPLEMENTED();
>-    return gl::InternalError();
>+    context->getRenderer()->getCommandGraph()->waitFenceSync(mEvent);
>+    return angle::Result::Continue;
> }
> 
>-gl::Error SyncVk::serverWait(GLbitfield flags, GLuint64 timeout)
>+angle::Result FenceSyncVk::getStatus(vk::Context *context, bool *signaled)
> {
>-    UNIMPLEMENTED();
>-    return gl::InternalError();
>+    VkResult result = mEvent.getStatus(context->getRenderer()->getDevice());
>+    if (result != VK_EVENT_SET && result != VK_EVENT_RESET)
>+    {
>+        ANGLE_VK_TRY(context, result);
>+    }
>+    *signaled = result == VK_EVENT_SET;
>+    return angle::Result::Continue;
>+}
>+
>+SyncVk::SyncVk() : SyncImpl() {}
>+
>+SyncVk::~SyncVk() {}
>+
>+void SyncVk::onDestroy(const gl::Context *context)
>+{
>+    mFenceSync.onDestroy(vk::GetImpl(context)->getRenderer());
>+}
>+
>+angle::Result SyncVk::set(const gl::Context *context, GLenum condition, GLbitfield flags)
>+{
>+    ASSERT(condition == GL_SYNC_GPU_COMMANDS_COMPLETE);
>+    ASSERT(flags == 0);
>+
>+    return mFenceSync.initialize(vk::GetImpl(context));
>+}
>+
>+angle::Result SyncVk::clientWait(const gl::Context *context,
>+                                 GLbitfield flags,
>+                                 GLuint64 timeout,
>+                                 GLenum *outResult)
>+{
>+    ContextVk *contextVk = vk::GetImpl(context);
>+
>+    ASSERT((flags & ~GL_SYNC_FLUSH_COMMANDS_BIT) == 0);
>+
>+    bool flush = (flags & GL_SYNC_FLUSH_COMMANDS_BIT) != 0;
>+    VkResult result;
>+
>+    ANGLE_TRY(mFenceSync.clientWait(contextVk, contextVk, flush, static_cast<uint64_t>(timeout),
>+                                    &result));
>+
>+    switch (result)
>+    {
>+        case VK_EVENT_SET:
>+            *outResult = GL_ALREADY_SIGNALED;
>+            return angle::Result::Continue;
>+
>+        case VK_SUCCESS:
>+            *outResult = GL_CONDITION_SATISFIED;
>+            return angle::Result::Continue;
>+
>+        case VK_TIMEOUT:
>+            *outResult = GL_TIMEOUT_EXPIRED;
>+            return angle::Result::Incomplete;
>+
>+        default:
>+            UNREACHABLE();
>+            *outResult = GL_WAIT_FAILED;
>+            return angle::Result::Stop;
>+    }
> }
> 
>-gl::Error SyncVk::getStatus(GLint *outResult)
>+angle::Result SyncVk::serverWait(const gl::Context *context, GLbitfield flags, GLuint64 timeout)
> {
>-    UNIMPLEMENTED();
>-    return gl::InternalError();
>+    ASSERT(flags == 0);
>+    ASSERT(timeout == GL_TIMEOUT_IGNORED);
>+
>+    ContextVk *contextVk = vk::GetImpl(context);
>+    return mFenceSync.serverWait(contextVk, contextVk);
>+}
>+
>+angle::Result SyncVk::getStatus(const gl::Context *context, GLint *outResult)
>+{
>+    bool signaled = false;
>+    ANGLE_TRY(mFenceSync.getStatus(vk::GetImpl(context), &signaled));
>+
>+    *outResult = signaled ? GL_SIGNALED : GL_UNSIGNALED;
>+    return angle::Result::Continue;
>+}
>+
>+EGLSyncVk::EGLSyncVk(const egl::AttributeMap &attribs) : EGLSyncImpl()
>+{
>+    ASSERT(attribs.isEmpty());
>+}
>+
>+EGLSyncVk::~EGLSyncVk() {}
>+
>+void EGLSyncVk::onDestroy(const egl::Display *display)
>+{
>+    mFenceSync.onDestroy(vk::GetImpl(display)->getRenderer());
>+}
>+
>+egl::Error EGLSyncVk::initialize(const egl::Display *display,
>+                                 const gl::Context *context,
>+                                 EGLenum type)
>+{
>+    ASSERT(type == EGL_SYNC_FENCE_KHR);
>+    ASSERT(context != nullptr);
>+
>+    if (mFenceSync.initialize(vk::GetImpl(context)) == angle::Result::Stop)
>+    {
>+        return egl::Error(EGL_BAD_ALLOC, "eglCreateSyncKHR failed to create sync object");
>+    }
>+
>+    return egl::NoError();
>+}
>+
>+egl::Error EGLSyncVk::clientWait(const egl::Display *display,
>+                                 const gl::Context *context,
>+                                 EGLint flags,
>+                                 EGLTime timeout,
>+                                 EGLint *outResult)
>+{
>+    ASSERT((flags & ~EGL_SYNC_FLUSH_COMMANDS_BIT_KHR) == 0);
>+
>+    bool flush = (flags & EGL_SYNC_FLUSH_COMMANDS_BIT_KHR) != 0;
>+    VkResult result;
>+
>+    ContextVk *contextVk = context ? vk::GetImpl(context) : nullptr;
>+    if (mFenceSync.clientWait(vk::GetImpl(display), contextVk, flush,
>+                              static_cast<uint64_t>(timeout), &result) == angle::Result::Stop)
>+    {
>+        return egl::Error(EGL_BAD_ALLOC);
>+    }
>+
>+    switch (result)
>+    {
>+        case VK_EVENT_SET:
>+            // fall through.  EGL doesn't differentiate between event being already set, or set
>+            // before timeout.
>+        case VK_SUCCESS:
>+            *outResult = EGL_CONDITION_SATISFIED_KHR;
>+            return egl::NoError();
>+
>+        case VK_TIMEOUT:
>+            *outResult = EGL_TIMEOUT_EXPIRED_KHR;
>+            return egl::NoError();
>+
>+        default:
>+            UNREACHABLE();
>+            *outResult = EGL_FALSE;
>+            return egl::Error(EGL_BAD_ALLOC);
>+    }
>+}
>+
>+egl::Error EGLSyncVk::serverWait(const egl::Display *display,
>+                                 const gl::Context *context,
>+                                 EGLint flags)
>+{
>+    ASSERT(flags == 0);
>+    ContextVk *contextVk = context ? vk::GetImpl(context) : nullptr;
>+    if (mFenceSync.serverWait(vk::GetImpl(display), contextVk) == angle::Result::Stop)
>+    {
>+        return egl::Error(EGL_BAD_ALLOC);
>+    }
>+    return egl::NoError();
>+}
>+
>+egl::Error EGLSyncVk::getStatus(const egl::Display *display, EGLint *outStatus)
>+{
>+    bool signaled = false;
>+    if (mFenceSync.getStatus(vk::GetImpl(display), &signaled) == angle::Result::Stop)
>+    {
>+        return egl::Error(EGL_BAD_ALLOC);
>+    }
>+
>+    *outStatus = signaled ? EGL_SIGNALED_KHR : EGL_UNSIGNALED_KHR;
>+    return egl::NoError();
> }
> 
> }  // namespace rx
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/SyncVk.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/SyncVk.h
>index 316c3ad809e..24f3e13763c 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/SyncVk.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/SyncVk.h
>@@ -10,23 +10,92 @@
> #ifndef LIBANGLE_RENDERER_VULKAN_FENCESYNCVK_H_
> #define LIBANGLE_RENDERER_VULKAN_FENCESYNCVK_H_
> 
>+#include "libANGLE/renderer/EGLSyncImpl.h"
> #include "libANGLE/renderer/SyncImpl.h"
> 
>+#include "libANGLE/renderer/vulkan/vk_utils.h"
>+
>+namespace egl
>+{
>+class AttributeMap;
>+}
>+
> namespace rx
> {
>+// The behaviors of SyncImpl and EGLSyncImpl as fence syncs (only supported type) are currently
>+// identical for the Vulkan backend, and this class implements both interfaces.
>+class FenceSyncVk
>+{
>+  public:
>+    FenceSyncVk();
>+    ~FenceSyncVk();
>+
>+    void onDestroy(RendererVk *renderer);
>+
>+    angle::Result initialize(ContextVk *contextVk);
>+    angle::Result clientWait(vk::Context *context,
>+                             ContextVk *contextVk,
>+                             bool flushCommands,
>+                             uint64_t timeout,
>+                             VkResult *outResult);
>+    angle::Result serverWait(vk::Context *context, ContextVk *contextVk);
>+    angle::Result getStatus(vk::Context *context, bool *signaled);
>+
>+  private:
>+    // The vkEvent that's signaled on `init` and can be waited on in `serverWait`, or queried with
>+    // `getStatus`.
>+    vk::Event mEvent;
>+    // The vkFence that's signaled once the command buffer including the `init` signal is executed.
>+    // `clientWait` waits on this fence.
>+    vk::Shared<vk::Fence> mFence;
>+};
> 
>-class SyncVk : public SyncImpl
>+class SyncVk final : public SyncImpl
> {
>   public:
>     SyncVk();
>     ~SyncVk() override;
> 
>-    gl::Error set(GLenum condition, GLbitfield flags) override;
>-    gl::Error clientWait(GLbitfield flags, GLuint64 timeout, GLenum *outResult) override;
>-    gl::Error serverWait(GLbitfield flags, GLuint64 timeout) override;
>-    gl::Error getStatus(GLint *outResult) override;
>+    void onDestroy(const gl::Context *context) override;
>+
>+    angle::Result set(const gl::Context *context, GLenum condition, GLbitfield flags) override;
>+    angle::Result clientWait(const gl::Context *context,
>+                             GLbitfield flags,
>+                             GLuint64 timeout,
>+                             GLenum *outResult) override;
>+    angle::Result serverWait(const gl::Context *context,
>+                             GLbitfield flags,
>+                             GLuint64 timeout) override;
>+    angle::Result getStatus(const gl::Context *context, GLint *outResult) override;
>+
>+  private:
>+    FenceSyncVk mFenceSync;
> };
> 
>+class EGLSyncVk final : public EGLSyncImpl
>+{
>+  public:
>+    EGLSyncVk(const egl::AttributeMap &attribs);
>+    ~EGLSyncVk() override;
>+
>+    void onDestroy(const egl::Display *display) override;
>+
>+    egl::Error initialize(const egl::Display *display,
>+                          const gl::Context *context,
>+                          EGLenum type) override;
>+    egl::Error clientWait(const egl::Display *display,
>+                          const gl::Context *context,
>+                          EGLint flags,
>+                          EGLTime timeout,
>+                          EGLint *outResult) override;
>+    egl::Error serverWait(const egl::Display *display,
>+                          const gl::Context *context,
>+                          EGLint flags) override;
>+    egl::Error getStatus(const egl::Display *display, EGLint *outStatus) override;
>+
>+  private:
>+    FenceSyncVk mFenceSync;
>+};
> }  // namespace rx
> 
> #endif  // LIBANGLE_RENDERER_VULKAN_FENCESYNCVK_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/TextureVk.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/TextureVk.cpp
>index 1f91da1b42f..7e31a06aa7d 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/TextureVk.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/TextureVk.cpp
>@@ -10,403 +10,1339 @@
> #include "libANGLE/renderer/vulkan/TextureVk.h"
> 
> #include "common/debug.h"
>+#include "image_util/generatemip.inl"
>+#include "libANGLE/Config.h"
> #include "libANGLE/Context.h"
>+#include "libANGLE/Image.h"
>+#include "libANGLE/MemoryObject.h"
>+#include "libANGLE/Surface.h"
> #include "libANGLE/renderer/vulkan/ContextVk.h"
>+#include "libANGLE/renderer/vulkan/FramebufferVk.h"
>+#include "libANGLE/renderer/vulkan/ImageVk.h"
>+#include "libANGLE/renderer/vulkan/MemoryObjectVk.h"
> #include "libANGLE/renderer/vulkan/RendererVk.h"
>-#include "libANGLE/renderer/vulkan/formatutilsvk.h"
>+#include "libANGLE/renderer/vulkan/SurfaceVk.h"
>+#include "libANGLE/renderer/vulkan/vk_format_utils.h"
>+#include "third_party/trace_event/trace_event.h"
> 
> namespace rx
> {
>+namespace
>+{
>+constexpr VkImageUsageFlags kDrawStagingImageFlags =
>+    VK_IMAGE_USAGE_TRANSFER_SRC_BIT | VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT;
>+
>+constexpr VkImageUsageFlags kTransferStagingImageFlags =
>+    VK_IMAGE_USAGE_TRANSFER_SRC_BIT | VK_IMAGE_USAGE_TRANSFER_DST_BIT;
> 
>-TextureVk::TextureVk(const gl::TextureState &state) : TextureImpl(state)
>+constexpr VkFormatFeatureFlags kBlitFeatureFlags =
>+    VK_FORMAT_FEATURE_BLIT_SRC_BIT | VK_FORMAT_FEATURE_BLIT_DST_BIT;
>+
>+bool CanCopyWithTransfer(RendererVk *renderer,
>+                         const vk::Format &srcFormat,
>+                         const vk::Format &destFormat)
> {
>+    // NOTE(syoussefi): technically, you can transfer between formats as long as they have the same
>+    // size and are compatible, but for now, let's just support same-format copies with transfer.
>+    return srcFormat.internalFormat == destFormat.internalFormat &&
>+           renderer->hasImageFormatFeatureBits(srcFormat.vkImageFormat,
>+                                               VK_FORMAT_FEATURE_TRANSFER_SRC_BIT) &&
>+           renderer->hasImageFormatFeatureBits(destFormat.vkImageFormat,
>+                                               VK_FORMAT_FEATURE_TRANSFER_DST_BIT);
> }
> 
>-TextureVk::~TextureVk()
>+bool CanCopyWithDraw(RendererVk *renderer,
>+                     const vk::Format &srcFormat,
>+                     const vk::Format &destFormat)
> {
>+    return renderer->hasImageFormatFeatureBits(srcFormat.vkImageFormat,
>+                                               VK_FORMAT_FEATURE_SAMPLED_IMAGE_BIT) &&
>+           renderer->hasImageFormatFeatureBits(destFormat.vkImageFormat,
>+                                               VK_FORMAT_FEATURE_COLOR_ATTACHMENT_BIT);
> }
> 
>-gl::Error TextureVk::onDestroy(const gl::Context *context)
>+bool ForceCpuPathForCopy(RendererVk *renderer, vk::ImageHelper *image)
>+{
>+    return image->getLayerCount() > 1 && renderer->getFeatures().forceCpuPathForCubeMapCopy;
>+}
>+
>+gl::TextureType Get2DTextureType(uint32_t layerCount, GLint samples)
>+{
>+    if (layerCount > 1)
>+    {
>+        if (samples > 1)
>+        {
>+            return gl::TextureType::_2DMultisampleArray;
>+        }
>+        else
>+        {
>+            return gl::TextureType::_2DArray;
>+        }
>+    }
>+    else
>+    {
>+        if (samples > 1)
>+        {
>+            return gl::TextureType::_2DMultisample;
>+        }
>+        else
>+        {
>+            return gl::TextureType::_2D;
>+        }
>+    }
>+}
>+}  // anonymous namespace
>+
>+angle::Result TextureVk::generateMipmapLevelsWithCPU(ContextVk *contextVk,
>+                                                     const angle::Format &sourceFormat,
>+                                                     GLuint layer,
>+                                                     GLuint firstMipLevel,
>+                                                     GLuint maxMipLevel,
>+                                                     const size_t sourceWidth,
>+                                                     const size_t sourceHeight,
>+                                                     const size_t sourceRowPitch,
>+                                                     uint8_t *sourceData)
>+{
>+    size_t previousLevelWidth    = sourceWidth;
>+    size_t previousLevelHeight   = sourceHeight;
>+    uint8_t *previousLevelData   = sourceData;
>+    size_t previousLevelRowPitch = sourceRowPitch;
>+
>+    for (GLuint currentMipLevel = firstMipLevel; currentMipLevel <= maxMipLevel; currentMipLevel++)
>+    {
>+        // Compute next level width and height.
>+        size_t mipWidth  = std::max<size_t>(1, previousLevelWidth >> 1);
>+        size_t mipHeight = std::max<size_t>(1, previousLevelHeight >> 1);
>+
>+        // With the width and height of the next mip, we can allocate the next buffer we need.
>+        uint8_t *destData   = nullptr;
>+        size_t destRowPitch = mipWidth * sourceFormat.pixelBytes;
>+
>+        size_t mipAllocationSize = destRowPitch * mipHeight;
>+        gl::Extents mipLevelExtents(static_cast<int>(mipWidth), static_cast<int>(mipHeight), 1);
>+
>+        ANGLE_TRY(mImage->stageSubresourceUpdateAndGetData(
>+            contextVk, mipAllocationSize,
>+            gl::ImageIndex::MakeFromType(mState.getType(), currentMipLevel, layer), mipLevelExtents,
>+            gl::Offset(), &destData));
>+
>+        // Generate the mipmap into that new buffer
>+        sourceFormat.mipGenerationFunction(previousLevelWidth, previousLevelHeight, 1,
>+                                           previousLevelData, previousLevelRowPitch, 0, destData,
>+                                           destRowPitch, 0);
>+
>+        // Swap for the next iteration
>+        previousLevelWidth    = mipWidth;
>+        previousLevelHeight   = mipHeight;
>+        previousLevelData     = destData;
>+        previousLevelRowPitch = destRowPitch;
>+    }
>+
>+    return angle::Result::Continue;
>+}
>+
>+// TextureVk implementation.
>+TextureVk::TextureVk(const gl::TextureState &state, RendererVk *renderer)
>+    : TextureImpl(state), mOwnsImage(false), mImage(nullptr)
>+{}
>+
>+TextureVk::~TextureVk() = default;
>+
>+void TextureVk::onDestroy(const gl::Context *context)
> {
>     ContextVk *contextVk = vk::GetImpl(context);
>     RendererVk *renderer = contextVk->getRenderer();
> 
>-    renderer->releaseResource(*this, &mImage);
>-    renderer->releaseResource(*this, &mDeviceMemory);
>-    renderer->releaseResource(*this, &mImageView);
>-    renderer->releaseResource(*this, &mSampler);
>+    releaseAndDeleteImage(context, renderer);
>+    renderer->releaseObject(renderer->getCurrentQueueSerial(), &mSampler);
>+}
>+
>+angle::Result TextureVk::setImage(const gl::Context *context,
>+                                  const gl::ImageIndex &index,
>+                                  GLenum internalFormat,
>+                                  const gl::Extents &size,
>+                                  GLenum format,
>+                                  GLenum type,
>+                                  const gl::PixelUnpackState &unpack,
>+                                  const uint8_t *pixels)
>+{
>+    const gl::InternalFormat &formatInfo = gl::GetInternalFormatInfo(internalFormat, type);
>+
>+    return setImageImpl(context, index, formatInfo, size, type, unpack, pixels);
>+}
>+
>+angle::Result TextureVk::setSubImage(const gl::Context *context,
>+                                     const gl::ImageIndex &index,
>+                                     const gl::Box &area,
>+                                     GLenum format,
>+                                     GLenum type,
>+                                     const gl::PixelUnpackState &unpack,
>+                                     gl::Buffer *unpackBuffer,
>+                                     const uint8_t *pixels)
>+{
>+    const gl::InternalFormat &formatInfo = gl::GetInternalFormatInfo(format, type);
>+    ContextVk *contextVk                 = vk::GetImpl(context);
>+    const gl::ImageDesc &levelDesc       = mState.getImageDesc(index);
>+    const vk::Format &vkFormat =
>+        contextVk->getRenderer()->getFormat(levelDesc.format.info->sizedInternalFormat);
>+
>+    return setSubImageImpl(context, index, area, formatInfo, type, unpack, pixels, vkFormat);
>+}
>+
>+angle::Result TextureVk::setCompressedImage(const gl::Context *context,
>+                                            const gl::ImageIndex &index,
>+                                            GLenum internalFormat,
>+                                            const gl::Extents &size,
>+                                            const gl::PixelUnpackState &unpack,
>+                                            size_t imageSize,
>+                                            const uint8_t *pixels)
>+{
>+    const gl::InternalFormat &formatInfo = gl::GetSizedInternalFormatInfo(internalFormat);
>+
>+    return setImageImpl(context, index, formatInfo, size, GL_UNSIGNED_BYTE, unpack, pixels);
>+}
>+
>+angle::Result TextureVk::setCompressedSubImage(const gl::Context *context,
>+                                               const gl::ImageIndex &index,
>+                                               const gl::Box &area,
>+                                               GLenum format,
>+                                               const gl::PixelUnpackState &unpack,
>+                                               size_t imageSize,
>+                                               const uint8_t *pixels)
>+{
>+
>+    const gl::InternalFormat &formatInfo = gl::GetInternalFormatInfo(format, GL_UNSIGNED_BYTE);
>+    ContextVk *contextVk                 = vk::GetImpl(context);
>+    const gl::ImageDesc &levelDesc       = mState.getImageDesc(index);
>+    const vk::Format &vkFormat =
>+        contextVk->getRenderer()->getFormat(levelDesc.format.info->sizedInternalFormat);
> 
>-    return gl::NoError();
>+    return setSubImageImpl(context, index, area, formatInfo, GL_UNSIGNED_BYTE, unpack, pixels,
>+                           vkFormat);
> }
> 
>-gl::Error TextureVk::setImage(const gl::Context *context,
>-                              GLenum target,
>-                              size_t level,
>-                              GLenum internalFormat,
>-                              const gl::Extents &size,
>-                              GLenum format,
>-                              GLenum type,
>-                              const gl::PixelUnpackState &unpack,
>-                              const uint8_t *pixels)
>+angle::Result TextureVk::setImageImpl(const gl::Context *context,
>+                                      const gl::ImageIndex &index,
>+                                      const gl::InternalFormat &formatInfo,
>+                                      const gl::Extents &size,
>+                                      GLenum type,
>+                                      const gl::PixelUnpackState &unpack,
>+                                      const uint8_t *pixels)
> {
>     ContextVk *contextVk = vk::GetImpl(context);
>     RendererVk *renderer = contextVk->getRenderer();
>-    VkDevice device      = contextVk->getDevice();
> 
>-    // TODO(jmadill): support multi-level textures.
>-    ASSERT(level == 0);
>+    const vk::Format &vkFormat = renderer->getFormat(formatInfo.sizedInternalFormat);
>+
>+    ANGLE_TRY(redefineImage(context, index, vkFormat, size));
>+
>+    // Early-out on empty textures, don't create a zero-sized storage.
>+    if (size.empty())
>+    {
>+        return angle::Result::Continue;
>+    }
>+
>+    return setSubImageImpl(context, index, gl::Box(0, 0, 0, size.width, size.height, size.depth),
>+                           formatInfo, type, unpack, pixels, vkFormat);
>+}
> 
>-    if (mImage.valid())
>+angle::Result TextureVk::setSubImageImpl(const gl::Context *context,
>+                                         const gl::ImageIndex &index,
>+                                         const gl::Box &area,
>+                                         const gl::InternalFormat &formatInfo,
>+                                         GLenum type,
>+                                         const gl::PixelUnpackState &unpack,
>+                                         const uint8_t *pixels,
>+                                         const vk::Format &vkFormat)
>+{
>+    ContextVk *contextVk = vk::GetImpl(context);
>+
>+    if (pixels)
>     {
>-        const gl::ImageDesc &desc = mState.getImageDesc(target, level);
>+        ANGLE_TRY(mImage->stageSubresourceUpdate(
>+            contextVk, getNativeImageIndex(index), gl::Extents(area.width, area.height, area.depth),
>+            gl::Offset(area.x, area.y, area.z), formatInfo, unpack, type, pixels, vkFormat));
>+
>+        // Create a new graph node to store image initialization commands.
>+        mImage->finishCurrentCommands(contextVk->getRenderer());
>+    }
>+
>+    return angle::Result::Continue;
>+}
>+
>+angle::Result TextureVk::copyImage(const gl::Context *context,
>+                                   const gl::ImageIndex &index,
>+                                   const gl::Rectangle &sourceArea,
>+                                   GLenum internalFormat,
>+                                   gl::Framebuffer *source)
>+{
>+    RendererVk *renderer = vk::GetImpl(context)->getRenderer();
> 
>-        // TODO(jmadill): Consider comparing stored vk::Format.
>-        if (desc.size != size ||
>-            !gl::Format::SameSized(desc.format, gl::Format(internalFormat, type)))
>+    gl::Extents newImageSize(sourceArea.width, sourceArea.height, 1);
>+    const gl::InternalFormat &internalFormatInfo =
>+        gl::GetInternalFormatInfo(internalFormat, GL_UNSIGNED_BYTE);
>+    const vk::Format &vkFormat = renderer->getFormat(internalFormatInfo.sizedInternalFormat);
>+
>+    ANGLE_TRY(redefineImage(context, index, vkFormat, newImageSize));
>+    return copySubImageImpl(context, index, gl::Offset(0, 0, 0), sourceArea, internalFormatInfo,
>+                            source);
>+}
>+
>+angle::Result TextureVk::copySubImage(const gl::Context *context,
>+                                      const gl::ImageIndex &index,
>+                                      const gl::Offset &destOffset,
>+                                      const gl::Rectangle &sourceArea,
>+                                      gl::Framebuffer *source)
>+{
>+    const gl::InternalFormat &currentFormat = *mState.getImageDesc(index).format.info;
>+    return copySubImageImpl(context, index, destOffset, sourceArea, currentFormat, source);
>+}
>+
>+angle::Result TextureVk::copyTexture(const gl::Context *context,
>+                                     const gl::ImageIndex &index,
>+                                     GLenum internalFormat,
>+                                     GLenum type,
>+                                     size_t sourceLevel,
>+                                     bool unpackFlipY,
>+                                     bool unpackPremultiplyAlpha,
>+                                     bool unpackUnmultiplyAlpha,
>+                                     const gl::Texture *source)
>+{
>+    RendererVk *renderer = vk::GetImpl(context)->getRenderer();
>+
>+    TextureVk *sourceVk = vk::GetImpl(source);
>+    const gl::ImageDesc &sourceImageDesc =
>+        sourceVk->mState.getImageDesc(NonCubeTextureTypeToTarget(source->getType()), sourceLevel);
>+    gl::Rectangle sourceArea(0, 0, sourceImageDesc.size.width, sourceImageDesc.size.height);
>+
>+    const gl::InternalFormat &destFormatInfo = gl::GetInternalFormatInfo(internalFormat, type);
>+    const vk::Format &destVkFormat = renderer->getFormat(destFormatInfo.sizedInternalFormat);
>+
>+    ANGLE_TRY(redefineImage(context, index, destVkFormat, sourceImageDesc.size));
>+
>+    return copySubTextureImpl(vk::GetImpl(context), index, gl::kOffsetZero, destFormatInfo,
>+                              sourceLevel, sourceArea, unpackFlipY, unpackPremultiplyAlpha,
>+                              unpackUnmultiplyAlpha, sourceVk);
>+}
>+
>+angle::Result TextureVk::copySubTexture(const gl::Context *context,
>+                                        const gl::ImageIndex &index,
>+                                        const gl::Offset &destOffset,
>+                                        size_t sourceLevel,
>+                                        const gl::Box &sourceBox,
>+                                        bool unpackFlipY,
>+                                        bool unpackPremultiplyAlpha,
>+                                        bool unpackUnmultiplyAlpha,
>+                                        const gl::Texture *source)
>+{
>+    gl::TextureTarget target                 = index.getTarget();
>+    size_t level                             = static_cast<size_t>(index.getLevelIndex());
>+    const gl::InternalFormat &destFormatInfo = *mState.getImageDesc(target, level).format.info;
>+    return copySubTextureImpl(vk::GetImpl(context), index, destOffset, destFormatInfo, sourceLevel,
>+                              sourceBox.toRect(), unpackFlipY, unpackPremultiplyAlpha,
>+                              unpackUnmultiplyAlpha, vk::GetImpl(source));
>+}
>+
>+angle::Result TextureVk::copyCompressedTexture(const gl::Context *context,
>+                                               const gl::Texture *source)
>+{
>+    ContextVk *contextVk = vk::GetImpl(context);
>+    TextureVk *sourceVk  = vk::GetImpl(source);
>+
>+    gl::TextureTarget sourceTarget = NonCubeTextureTypeToTarget(source->getType());
>+    constexpr GLint sourceLevel    = 0;
>+    constexpr GLint destLevel      = 0;
>+
>+    const gl::InternalFormat &internalFormat = *source->getFormat(sourceTarget, sourceLevel).info;
>+    const vk::Format &vkFormat =
>+        contextVk->getRenderer()->getFormat(internalFormat.sizedInternalFormat);
>+    const gl::Extents size(static_cast<int>(source->getWidth(sourceTarget, sourceLevel)),
>+                           static_cast<int>(source->getHeight(sourceTarget, sourceLevel)), 1);
>+    const gl::ImageIndex destIndex = gl::ImageIndex::MakeFromTarget(sourceTarget, destLevel);
>+
>+    ANGLE_TRY(redefineImage(context, destIndex, vkFormat, size));
>+
>+    ANGLE_TRY(sourceVk->ensureImageInitialized(contextVk));
>+
>+    return copySubImageImplWithTransfer(contextVk, destIndex, gl::Offset(0, 0, 0), vkFormat,
>+                                        sourceLevel, gl::Rectangle(0, 0, size.width, size.height),
>+                                        &sourceVk->getImage());
>+}
>+
>+angle::Result TextureVk::copySubImageImpl(const gl::Context *context,
>+                                          const gl::ImageIndex &index,
>+                                          const gl::Offset &destOffset,
>+                                          const gl::Rectangle &sourceArea,
>+                                          const gl::InternalFormat &internalFormat,
>+                                          gl::Framebuffer *source)
>+{
>+    gl::Extents fbSize = source->getReadColorbuffer()->getSize();
>+    gl::Rectangle clippedSourceArea;
>+    if (!ClipRectangle(sourceArea, gl::Rectangle(0, 0, fbSize.width, fbSize.height),
>+                       &clippedSourceArea))
>+    {
>+        return angle::Result::Continue;
>+    }
>+
>+    ContextVk *contextVk         = vk::GetImpl(context);
>+    RendererVk *renderer         = contextVk->getRenderer();
>+    FramebufferVk *framebufferVk = vk::GetImpl(source);
>+
>+    const gl::ImageIndex offsetImageIndex = getNativeImageIndex(index);
>+
>+    // If negative offsets are given, clippedSourceArea ensures we don't read from those offsets.
>+    // However, that changes the sourceOffset->destOffset mapping.  Here, destOffset is shifted by
>+    // the same amount as clipped to correct the error.
>+    //
>+    // TODO(syoussefi): a bug here is that we need to clip the extents to make sure the copy
>+    // region does not overflow the image size.  For example, if an FBO of size 16x16 is used as
>+    // source and glCopyTexImage2D(..., -8, -8, 16, 16, ...) is used, then we will be copying to
>+    // the region expanding from (8, 8) through (23, 23), while the image is only 16x16.
>+    // http://anglebug.com/3355
>+    const gl::Offset modifiedDestOffset(destOffset.x + clippedSourceArea.x - sourceArea.x,
>+                                        destOffset.y + clippedSourceArea.y - sourceArea.y, 0);
>+
>+    RenderTargetVk *colorReadRT = framebufferVk->getColorReadRenderTarget();
>+    ANGLE_TRY(colorReadRT->ensureImageInitialized(contextVk));
>+
>+    const vk::Format &srcFormat  = colorReadRT->getImageFormat();
>+    const vk::Format &destFormat = renderer->getFormat(internalFormat.sizedInternalFormat);
>+
>+    bool isViewportFlipY = contextVk->isViewportFlipEnabledForDrawFBO();
>+
>+    // If it's possible to perform the copy with a transfer, that's the best option.
>+    if (!isViewportFlipY && CanCopyWithTransfer(renderer, srcFormat, destFormat))
>+    {
>+        return copySubImageImplWithTransfer(contextVk, offsetImageIndex, modifiedDestOffset,
>+                                            destFormat, 0, clippedSourceArea,
>+                                            &colorReadRT->getImage());
>+    }
>+
>+    bool forceCpuPath = ForceCpuPathForCopy(renderer, mImage);
>+
>+    // If it's possible to perform the copy with a draw call, do that.
>+    if (CanCopyWithDraw(renderer, srcFormat, destFormat) && !forceCpuPath)
>+    {
>+        // Layer count can only be 1 as the source is a framebuffer.
>+        ASSERT(offsetImageIndex.getLayerCount() == 1);
>+
>+        return copySubImageImplWithDraw(contextVk, offsetImageIndex, modifiedDestOffset, destFormat,
>+                                        0, colorReadRT->getLayerIndex(), clippedSourceArea,
>+                                        isViewportFlipY, false, false, false,
>+                                        &colorReadRT->getImage(), colorReadRT->getReadImageView());
>+    }
>+
>+    // Do a CPU readback that does the conversion, and then stage the change to the pixel buffer.
>+    ANGLE_TRY(mImage->stageSubresourceUpdateFromFramebuffer(
>+        context, offsetImageIndex, clippedSourceArea, modifiedDestOffset,
>+        gl::Extents(clippedSourceArea.width, clippedSourceArea.height, 1), internalFormat,
>+        framebufferVk));
>+
>+    mImage->finishCurrentCommands(renderer);
>+    framebufferVk->getFramebuffer()->addReadDependency(mImage);
>+    return angle::Result::Continue;
>+}
>+
>+angle::Result TextureVk::copySubTextureImpl(ContextVk *contextVk,
>+                                            const gl::ImageIndex &index,
>+                                            const gl::Offset &destOffset,
>+                                            const gl::InternalFormat &destFormat,
>+                                            size_t sourceLevel,
>+                                            const gl::Rectangle &sourceArea,
>+                                            bool unpackFlipY,
>+                                            bool unpackPremultiplyAlpha,
>+                                            bool unpackUnmultiplyAlpha,
>+                                            TextureVk *source)
>+{
>+    RendererVk *renderer = contextVk->getRenderer();
>+
>+    ANGLE_TRY(source->ensureImageInitialized(contextVk));
>+
>+    const vk::Format &sourceVkFormat = source->getImage().getFormat();
>+    const vk::Format &destVkFormat   = renderer->getFormat(destFormat.sizedInternalFormat);
>+
>+    const gl::ImageIndex offsetImageIndex = getNativeImageIndex(index);
>+
>+    // If it's possible to perform the copy with a transfer, that's the best option.
>+    if (!unpackFlipY && !unpackPremultiplyAlpha && !unpackUnmultiplyAlpha &&
>+        CanCopyWithTransfer(renderer, sourceVkFormat, destVkFormat))
>+    {
>+        return copySubImageImplWithTransfer(contextVk, offsetImageIndex, destOffset, destVkFormat,
>+                                            sourceLevel, sourceArea, &source->getImage());
>+    }
>+
>+    bool forceCpuPath = ForceCpuPathForCopy(renderer, mImage);
>+
>+    // If it's possible to perform the copy with a draw call, do that.
>+    if (CanCopyWithDraw(renderer, sourceVkFormat, destVkFormat) && !forceCpuPath)
>+    {
>+        return copySubImageImplWithDraw(contextVk, offsetImageIndex, destOffset, destVkFormat,
>+                                        sourceLevel, 0, sourceArea, false, unpackFlipY,
>+                                        unpackPremultiplyAlpha, unpackUnmultiplyAlpha,
>+                                        &source->getImage(), &source->getReadImageView());
>+    }
>+
>+    if (sourceLevel != 0)
>+    {
>+        WARN() << "glCopyTextureCHROMIUM with sourceLevel != 0 not implemented.";
>+        return angle::Result::Stop;
>+    }
>+
>+    // Read back the requested region of the source texture
>+    uint8_t *sourceData = nullptr;
>+    ANGLE_TRY(source->copyImageDataToBuffer(contextVk, sourceLevel, 1, sourceArea, &sourceData));
>+
>+    const angle::Format &sourceTextureFormat = sourceVkFormat.imageFormat();
>+    const angle::Format &destTextureFormat   = destVkFormat.imageFormat();
>+    size_t destinationAllocationSize =
>+        sourceArea.width * sourceArea.height * destTextureFormat.pixelBytes;
>+
>+    // Allocate memory in the destination texture for the copy/conversion
>+    uint8_t *destData = nullptr;
>+    ANGLE_TRY(mImage->stageSubresourceUpdateAndGetData(
>+        contextVk, destinationAllocationSize, offsetImageIndex,
>+        gl::Extents(sourceArea.width, sourceArea.height, 1), destOffset, &destData));
>+
>+    // Source and dest data is tightly packed
>+    GLuint sourceDataRowPitch = sourceArea.width * sourceTextureFormat.pixelBytes;
>+    GLuint destDataRowPitch   = sourceArea.width * destTextureFormat.pixelBytes;
>+
>+    rx::PixelReadFunction pixelReadFunction   = sourceTextureFormat.pixelReadFunction;
>+    rx::PixelWriteFunction pixelWriteFunction = destTextureFormat.pixelWriteFunction;
>+
>+    // Fix up the read/write functions for the sake of luminance/alpha that are emulated with
>+    // formats whose channels don't correspond to the original format (alpha is emulated with red,
>+    // and luminance/alpha is emulated with red/green).
>+    if (sourceVkFormat.angleFormat().isLUMA())
>+    {
>+        pixelReadFunction = sourceVkFormat.angleFormat().pixelReadFunction;
>+    }
>+    if (destVkFormat.angleFormat().isLUMA())
>+    {
>+        pixelWriteFunction = destVkFormat.angleFormat().pixelWriteFunction;
>+    }
>+
>+    CopyImageCHROMIUM(sourceData, sourceDataRowPitch, sourceTextureFormat.pixelBytes, 0,
>+                      pixelReadFunction, destData, destDataRowPitch, destTextureFormat.pixelBytes,
>+                      0, pixelWriteFunction, destFormat.format, destFormat.componentType,
>+                      sourceArea.width, sourceArea.height, 1, unpackFlipY, unpackPremultiplyAlpha,
>+                      unpackUnmultiplyAlpha);
>+
>+    // Create a new graph node to store image initialization commands.
>+    mImage->finishCurrentCommands(contextVk->getRenderer());
>+
>+    return angle::Result::Continue;
>+}
>+
>+angle::Result TextureVk::copySubImageImplWithTransfer(ContextVk *contextVk,
>+                                                      const gl::ImageIndex &index,
>+                                                      const gl::Offset &destOffset,
>+                                                      const vk::Format &destFormat,
>+                                                      size_t sourceLevel,
>+                                                      const gl::Rectangle &sourceArea,
>+                                                      vk::ImageHelper *srcImage)
>+{
>+    RendererVk *renderer = contextVk->getRenderer();
>+
>+    uint32_t level       = index.getLevelIndex();
>+    uint32_t baseLayer   = index.hasLayer() ? index.getLayerIndex() : 0;
>+    uint32_t layerCount  = index.getLayerCount();
>+    gl::Offset srcOffset = {sourceArea.x, sourceArea.y, 0};
>+    gl::Extents extents  = {sourceArea.width, sourceArea.height, 1};
>+
>+    // Change source layout if necessary
>+    if (srcImage->isLayoutChangeNecessary(vk::ImageLayout::TransferSrc))
>+    {
>+        vk::CommandBuffer *srcLayoutChange;
>+        ANGLE_TRY(srcImage->recordCommands(contextVk, &srcLayoutChange));
>+        srcImage->changeLayout(VK_IMAGE_ASPECT_COLOR_BIT, vk::ImageLayout::TransferSrc,
>+                               srcLayoutChange);
>+    }
>+
>+    VkImageSubresourceLayers srcSubresource = {};
>+    srcSubresource.aspectMask               = VK_IMAGE_ASPECT_COLOR_BIT;
>+    srcSubresource.mipLevel                 = sourceLevel;
>+    srcSubresource.baseArrayLayer           = 0;
>+    srcSubresource.layerCount               = layerCount;
>+
>+    // If destination is valid, copy the source directly into it.
>+    if (mImage->valid())
>+    {
>+        // Make sure any updates to the image are already flushed.
>+        ANGLE_TRY(ensureImageInitialized(contextVk));
>+
>+        vk::CommandBuffer *commandBuffer;
>+        ANGLE_TRY(mImage->recordCommands(contextVk, &commandBuffer));
>+
>+        // Change the image layout before the transfer
>+        mImage->changeLayout(VK_IMAGE_ASPECT_COLOR_BIT, vk::ImageLayout::TransferDst,
>+                             commandBuffer);
>+
>+        // Source's layout change should happen before the copy
>+        srcImage->addReadDependency(mImage);
>+
>+        VkImageSubresourceLayers destSubresource = srcSubresource;
>+        destSubresource.mipLevel                 = level;
>+        destSubresource.baseArrayLayer           = baseLayer;
>+
>+        vk::ImageHelper::Copy(srcImage, mImage, srcOffset, destOffset, extents, srcSubresource,
>+                              destSubresource, commandBuffer);
>+    }
>+    else
>+    {
>+        std::unique_ptr<vk::ImageHelper> stagingImage;
>+
>+        // Create a temporary image to stage the copy
>+        stagingImage = std::make_unique<vk::ImageHelper>();
>+
>+        ANGLE_TRY(stagingImage->init2DStaging(contextVk, renderer->getMemoryProperties(),
>+                                              gl::Extents(sourceArea.width, sourceArea.height, 1),
>+                                              destFormat, kTransferStagingImageFlags, layerCount));
>+
>+        vk::CommandBuffer *commandBuffer;
>+        ANGLE_TRY(stagingImage->recordCommands(contextVk, &commandBuffer));
>+
>+        // Change the image layout before the transfer
>+        stagingImage->changeLayout(VK_IMAGE_ASPECT_COLOR_BIT, vk::ImageLayout::TransferDst,
>+                                   commandBuffer);
>+
>+        // Source's layout change should happen before the copy
>+        srcImage->addReadDependency(stagingImage.get());
>+
>+        VkImageSubresourceLayers destSubresource = srcSubresource;
>+        destSubresource.mipLevel                 = 0;
>+
>+        vk::ImageHelper::Copy(srcImage, stagingImage.get(), srcOffset, gl::Offset(), extents,
>+                              srcSubresource, destSubresource, commandBuffer);
>+
>+        // Stage the copy for when the image storage is actually created.
>+        mImage->stageSubresourceUpdateFromImage(stagingImage.release(), index, destOffset, extents);
>+    }
>+
>+    return angle::Result::Continue;
>+}
>+
>+angle::Result TextureVk::copySubImageImplWithDraw(ContextVk *contextVk,
>+                                                  const gl::ImageIndex &index,
>+                                                  const gl::Offset &destOffset,
>+                                                  const vk::Format &destFormat,
>+                                                  size_t sourceLevel,
>+                                                  size_t sourceLayer,
>+                                                  const gl::Rectangle &sourceArea,
>+                                                  bool isSrcFlipY,
>+                                                  bool unpackFlipY,
>+                                                  bool unpackPremultiplyAlpha,
>+                                                  bool unpackUnmultiplyAlpha,
>+                                                  vk::ImageHelper *srcImage,
>+                                                  const vk::ImageView *srcView)
>+{
>+    RendererVk *renderer      = contextVk->getRenderer();
>+    UtilsVk &utilsVk          = renderer->getUtils();
>+    Serial currentQueueSerial = renderer->getCurrentQueueSerial();
>+
>+    UtilsVk::CopyImageParameters params;
>+    params.srcOffset[0]        = sourceArea.x;
>+    params.srcOffset[1]        = sourceArea.y;
>+    params.srcExtents[0]       = sourceArea.width;
>+    params.srcExtents[1]       = sourceArea.height;
>+    params.destOffset[0]       = destOffset.x;
>+    params.destOffset[1]       = destOffset.y;
>+    params.srcMip              = sourceLevel;
>+    params.srcHeight           = srcImage->getExtents().height;
>+    params.srcPremultiplyAlpha = unpackPremultiplyAlpha && !unpackUnmultiplyAlpha;
>+    params.srcUnmultiplyAlpha  = unpackUnmultiplyAlpha && !unpackPremultiplyAlpha;
>+    params.srcFlipY            = isSrcFlipY;
>+    params.destFlipY           = unpackFlipY;
>+
>+    uint32_t level      = index.getLevelIndex();
>+    uint32_t baseLayer  = index.hasLayer() ? index.getLayerIndex() : 0;
>+    uint32_t layerCount = index.getLayerCount();
>+
>+    // If the source image is a cube map, the view is of VK_IMAGE_VIEW_TYPE_CUBE type.  However,
>+    // GLSL's texelFetch cannot take a textureCube.  We need to create a 2D_ARRAY type view to be
>+    // able to perform the copy.
>+    //
>+    // Note(syoussefi): Array textures are not yet supported in Vulkan.  Once they are, the if below
>+    // should be changed to detect cube maps only.
>+    vk::ImageView cubeAs2DArrayView;
>+    if (srcImage->getLayerCount() % 6 == 0)
>+    {
>+        // TODO(syoussefi): If the cube map is LUMA, we need swizzle.  http://anglebug.com/2911
>+        // This can't happen when copying from framebuffers, so only source of concern would be
>+        // copy[Sub]Texture copying from a LUMA cube map.
>+        ASSERT(!srcImage->getFormat().imageFormat().isLUMA());
>+
>+        gl::TextureType arrayTextureType =
>+            Get2DTextureType(srcImage->getLayerCount(), srcImage->getSamples());
>+        ANGLE_TRY(srcImage->initImageView(contextVk, arrayTextureType, VK_IMAGE_ASPECT_COLOR_BIT,
>+                                          gl::SwizzleState(), &cubeAs2DArrayView, 0,
>+                                          srcImage->getLevelCount()));
>+        srcView = &cubeAs2DArrayView;
>+    }
>+    else
>+    {
>+        // Source layer is otherwise baked into the view
>+        sourceLayer = 0;
>+    }
>+
>+    // If destination is valid, copy the source directly into it.
>+    if (mImage->valid())
>+    {
>+        // Make sure any updates to the image are already flushed.
>+        ANGLE_TRY(ensureImageInitialized(contextVk));
>+
>+        for (uint32_t layerIndex = 0; layerIndex < layerCount; ++layerIndex)
>         {
>-            renderer->releaseResource(*this, &mImage);
>-            renderer->releaseResource(*this, &mDeviceMemory);
>-            renderer->releaseResource(*this, &mImageView);
>+            params.srcLayer = sourceLayer + layerIndex;
>+
>+            vk::ImageView *destView;
>+            ANGLE_TRY(
>+                getLayerLevelDrawImageView(contextVk, baseLayer + layerIndex, level, &destView));
>+
>+            ANGLE_TRY(utilsVk.copyImage(contextVk, mImage, destView, srcImage, srcView, params));
>         }
>     }
>+    else
>+    {
>+        std::unique_ptr<vk::ImageHelper> stagingImage;
> 
>-    // TODO(jmadill): support other types of textures.
>-    ASSERT(target == GL_TEXTURE_2D);
>+        GLint samples                      = srcImage->getSamples();
>+        gl::TextureType stagingTextureType = Get2DTextureType(layerCount, samples);
> 
>-    // Convert internalFormat to sized internal format.
>-    const gl::InternalFormat &formatInfo = gl::GetInternalFormatInfo(internalFormat, type);
>-    const vk::Format &vkFormat           = renderer->getFormat(formatInfo.sizedInternalFormat);
>-
>-    if (!mImage.valid())
>-    {
>-        ASSERT(!mDeviceMemory.valid() && !mImageView.valid());
>-
>-        VkImageCreateInfo imageInfo;
>-        imageInfo.sType         = VK_STRUCTURE_TYPE_IMAGE_CREATE_INFO;
>-        imageInfo.pNext         = nullptr;
>-        imageInfo.flags         = 0;
>-        imageInfo.imageType     = VK_IMAGE_TYPE_2D;
>-        imageInfo.format        = vkFormat.vkTextureFormat;
>-        imageInfo.extent.width  = size.width;
>-        imageInfo.extent.height = size.height;
>-        imageInfo.extent.depth  = size.depth;
>-        imageInfo.mipLevels     = 1;
>-        imageInfo.arrayLayers   = 1;
>-        imageInfo.samples       = VK_SAMPLE_COUNT_1_BIT;
>-        imageInfo.tiling        = VK_IMAGE_TILING_OPTIMAL;
>-
>-        // TODO(jmadill): Are all these image transfer bits necessary?
>-        imageInfo.usage = (VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT | VK_IMAGE_USAGE_TRANSFER_DST_BIT |
>-                           VK_IMAGE_USAGE_TRANSFER_SRC_BIT | VK_IMAGE_USAGE_SAMPLED_BIT);
>-        imageInfo.sharingMode           = VK_SHARING_MODE_EXCLUSIVE;
>-        imageInfo.queueFamilyIndexCount = 0;
>-        imageInfo.pQueueFamilyIndices   = nullptr;
>-        imageInfo.initialLayout         = VK_IMAGE_LAYOUT_UNDEFINED;
>-
>-        ANGLE_TRY(mImage.init(device, imageInfo));
>-
>-        // Allocate the device memory for the image.
>-        // TODO(jmadill): Use more intelligent device memory allocation.
>-        VkMemoryRequirements memoryRequirements;
>-        mImage.getMemoryRequirements(device, &memoryRequirements);
>-
>-        uint32_t memoryIndex = renderer->getMemoryProperties().findCompatibleMemoryIndex(
>-            memoryRequirements.memoryTypeBits, VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT);
>-
>-        VkMemoryAllocateInfo allocateInfo;
>-        allocateInfo.sType           = VK_STRUCTURE_TYPE_MEMORY_ALLOCATE_INFO;
>-        allocateInfo.pNext           = nullptr;
>-        allocateInfo.allocationSize  = memoryRequirements.size;
>-        allocateInfo.memoryTypeIndex = memoryIndex;
>-
>-        ANGLE_TRY(mDeviceMemory.allocate(device, allocateInfo));
>-        ANGLE_TRY(mImage.bindMemory(device, mDeviceMemory));
>-
>-        VkImageViewCreateInfo viewInfo;
>-        viewInfo.sType                           = VK_STRUCTURE_TYPE_IMAGE_VIEW_CREATE_INFO;
>-        viewInfo.pNext                           = nullptr;
>-        viewInfo.flags                           = 0;
>-        viewInfo.image                           = mImage.getHandle();
>-        viewInfo.viewType                        = VK_IMAGE_VIEW_TYPE_2D;
>-        viewInfo.format                          = vkFormat.vkTextureFormat;
>-        viewInfo.components.r                    = VK_COMPONENT_SWIZZLE_R;
>-        viewInfo.components.g                    = VK_COMPONENT_SWIZZLE_G;
>-        viewInfo.components.b                    = VK_COMPONENT_SWIZZLE_B;
>-        viewInfo.components.a                    = VK_COMPONENT_SWIZZLE_A;
>-        viewInfo.subresourceRange.aspectMask     = VK_IMAGE_ASPECT_COLOR_BIT;
>-        viewInfo.subresourceRange.baseMipLevel   = 0;
>-        viewInfo.subresourceRange.levelCount     = 1;
>-        viewInfo.subresourceRange.baseArrayLayer = 0;
>-        viewInfo.subresourceRange.layerCount     = 1;
>-
>-        ANGLE_TRY(mImageView.init(device, viewInfo));
>-    }
>-
>-    if (!mSampler.valid())
>-    {
>-        // Create a simple sampler. Force basic parameter settings.
>-        // TODO(jmadill): Sampler parameters.
>-        VkSamplerCreateInfo samplerInfo;
>-        samplerInfo.sType                   = VK_STRUCTURE_TYPE_SAMPLER_CREATE_INFO;
>-        samplerInfo.pNext                   = nullptr;
>-        samplerInfo.flags                   = 0;
>-        samplerInfo.magFilter               = VK_FILTER_NEAREST;
>-        samplerInfo.minFilter               = VK_FILTER_NEAREST;
>-        samplerInfo.mipmapMode              = VK_SAMPLER_MIPMAP_MODE_NEAREST;
>-        samplerInfo.addressModeU            = VK_SAMPLER_ADDRESS_MODE_CLAMP_TO_EDGE;
>-        samplerInfo.addressModeV            = VK_SAMPLER_ADDRESS_MODE_CLAMP_TO_EDGE;
>-        samplerInfo.addressModeW            = VK_SAMPLER_ADDRESS_MODE_CLAMP_TO_EDGE;
>-        samplerInfo.mipLodBias              = 0.0f;
>-        samplerInfo.anisotropyEnable        = VK_FALSE;
>-        samplerInfo.maxAnisotropy           = 1.0f;
>-        samplerInfo.compareEnable           = VK_FALSE;
>-        samplerInfo.compareOp               = VK_COMPARE_OP_ALWAYS;
>-        samplerInfo.minLod                  = 0.0f;
>-        samplerInfo.maxLod                  = 1.0f;
>-        samplerInfo.borderColor             = VK_BORDER_COLOR_INT_TRANSPARENT_BLACK;
>-        samplerInfo.unnormalizedCoordinates = VK_FALSE;
>-
>-        ANGLE_TRY(mSampler.init(device, samplerInfo));
>-    }
>-
>-    mRenderTarget.image     = &mImage;
>-    mRenderTarget.imageView = &mImageView;
>-    mRenderTarget.format    = &vkFormat;
>-    mRenderTarget.extents   = size;
>-    mRenderTarget.samples   = VK_SAMPLE_COUNT_1_BIT;
>-    mRenderTarget.resource  = this;
>-
>-    // Handle initial data.
>-    // TODO(jmadill): Consider re-using staging texture.
>-    if (pixels)
>+        // Create a temporary image to stage the copy
>+        stagingImage = std::make_unique<vk::ImageHelper>();
>+
>+        ANGLE_TRY(stagingImage->init2DStaging(contextVk, renderer->getMemoryProperties(),
>+                                              gl::Extents(sourceArea.width, sourceArea.height, 1),
>+                                              destFormat, kDrawStagingImageFlags, layerCount));
>+
>+        params.destOffset[0] = 0;
>+        params.destOffset[1] = 0;
>+
>+        for (uint32_t layerIndex = 0; layerIndex < layerCount; ++layerIndex)
>+        {
>+            params.srcLayer = sourceLayer + layerIndex;
>+
>+            // Create a temporary view for this layer.
>+            vk::ImageView stagingView;
>+            ANGLE_TRY(stagingImage->initLayerImageView(
>+                contextVk, stagingTextureType, VK_IMAGE_ASPECT_COLOR_BIT, gl::SwizzleState(),
>+                &stagingView, 0, 1, layerIndex, 1));
>+
>+            ANGLE_TRY(utilsVk.copyImage(contextVk, stagingImage.get(), &stagingView, srcImage,
>+                                        srcView, params));
>+
>+            // Queue the resource for cleanup as soon as the copy above is finished.  There's no
>+            // need to keep it around.
>+            renderer->releaseObject(currentQueueSerial, &stagingView);
>+        }
>+
>+        // Stage the copy for when the image storage is actually created.
>+        mImage->stageSubresourceUpdateFromImage(
>+            stagingImage.release(), index, destOffset,
>+            gl::Extents(sourceArea.width, sourceArea.height, 1));
>+    }
>+
>+    if (cubeAs2DArrayView.valid())
>+    {
>+        renderer->releaseObject(currentQueueSerial, &cubeAs2DArrayView);
>+    }
>+
>+    return angle::Result::Continue;
>+}
>+
>+angle::Result TextureVk::setStorage(const gl::Context *context,
>+                                    gl::TextureType type,
>+                                    size_t levels,
>+                                    GLenum internalFormat,
>+                                    const gl::Extents &size)
>+{
>+    ContextVk *contextVk = GetAs<ContextVk>(context->getImplementation());
>+    RendererVk *renderer = contextVk->getRenderer();
>+
>+    if (!mOwnsImage)
>     {
>-        vk::StagingImage stagingImage;
>-        ANGLE_TRY(renderer->createStagingImage(TextureDimension::TEX_2D, vkFormat, size,
>-                                               vk::StagingUsage::Write, &stagingImage));
>+        releaseAndDeleteImage(context, renderer);
>+    }
> 
>-        GLuint inputRowPitch = 0;
>-        ANGLE_TRY_RESULT(
>-            formatInfo.computeRowPitch(type, size.width, unpack.alignment, unpack.rowLength),
>-            inputRowPitch);
>+    const vk::Format &format = renderer->getFormat(internalFormat);
>+    ANGLE_TRY(ensureImageAllocated(renderer, format));
> 
>-        GLuint inputDepthPitch = 0;
>-        ANGLE_TRY_RESULT(
>-            formatInfo.computeDepthPitch(size.height, unpack.imageHeight, inputRowPitch),
>-            inputDepthPitch);
>+    vk::CommandBuffer *commandBuffer = nullptr;
>+    ANGLE_TRY(mImage->recordCommands(contextVk, &commandBuffer));
> 
>-        // TODO(jmadill): skip images for 3D Textures.
>-        bool applySkipImages = false;
>+    if (mImage->valid())
>+    {
>+        releaseImage(renderer);
>+    }
> 
>-        GLuint inputSkipBytes = 0;
>-        ANGLE_TRY_RESULT(
>-            formatInfo.computeSkipBytes(inputRowPitch, inputDepthPitch, unpack, applySkipImages),
>-            inputSkipBytes);
>+    ANGLE_TRY(initImage(contextVk, format, size, static_cast<uint32_t>(levels), commandBuffer));
>+    return angle::Result::Continue;
>+}
> 
>-        auto loadFunction = vkFormat.loadFunctions(type);
>+angle::Result TextureVk::setStorageExternalMemory(const gl::Context *context,
>+                                                  gl::TextureType type,
>+                                                  size_t levels,
>+                                                  GLenum internalFormat,
>+                                                  const gl::Extents &size,
>+                                                  gl::MemoryObject *memoryObject,
>+                                                  GLuint64 offset)
>+{
>+    ContextVk *contextVk           = vk::GetImpl(context);
>+    RendererVk *renderer           = contextVk->getRenderer();
>+    MemoryObjectVk *memoryObjectVk = vk::GetImpl(memoryObject);
> 
>-        uint8_t *mapPointer = nullptr;
>-        ANGLE_TRY(stagingImage.getDeviceMemory().map(device, 0, VK_WHOLE_SIZE, 0, &mapPointer));
>+    releaseAndDeleteImage(context, renderer);
> 
>-        const uint8_t *source = pixels + inputSkipBytes;
>+    const vk::Format &format = renderer->getFormat(internalFormat);
> 
>-        // Get the subresource layout. This has important parameters like row pitch.
>-        // TODO(jmadill): Fill out this structure based on input parameters.
>-        VkImageSubresource subresource;
>-        subresource.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT;
>-        subresource.mipLevel   = 0;
>-        subresource.arrayLayer = 0;
>+    setImageHelper(renderer, new vk::ImageHelper(), mState.getType(), format, 0, 0, true);
> 
>-        VkSubresourceLayout subresourceLayout;
>-        vkGetImageSubresourceLayout(device, stagingImage.getImage().getHandle(), &subresource,
>-                                    &subresourceLayout);
>+    ANGLE_TRY(
>+        memoryObjectVk->createImage(context, type, levels, internalFormat, size, offset, mImage));
> 
>-        loadFunction.loadFunction(size.width, size.height, size.depth, source, inputRowPitch,
>-                                  inputDepthPitch, mapPointer,
>-                                  static_cast<size_t>(subresourceLayout.rowPitch),
>-                                  static_cast<size_t>(subresourceLayout.depthPitch));
>+    ANGLE_TRY(initImageViews(contextVk, format, levels));
> 
>-        stagingImage.getDeviceMemory().unmap(device);
>+    // TODO(spang): This needs to be reworked when semaphores are added.
>+    // http://anglebug.com/3289
>+    uint32_t rendererQueueFamilyIndex = renderer->getQueueFamilyIndex();
>+    if (mImage->isQueueChangeNeccesary(rendererQueueFamilyIndex))
>+    {
>+        vk::CommandBuffer *commandBuffer = nullptr;
>+        ANGLE_TRY(mImage->recordCommands(contextVk, &commandBuffer));
>+        mImage->changeLayoutAndQueue(VK_IMAGE_ASPECT_COLOR_BIT,
>+                                     vk::ImageLayout::FragmentShaderReadOnly,
>+                                     rendererQueueFamilyIndex, commandBuffer);
>+    }
> 
>-        vk::CommandBufferAndState *commandBuffer = nullptr;
>-        ANGLE_TRY(contextVk->getStartedCommandBuffer(&commandBuffer));
>-        setQueueSerial(renderer->getCurrentQueueSerial());
>+    return angle::Result::Continue;
>+}
> 
>-        // Ensure we aren't in a render pass.
>-        // TODO(jmadill): Command reordering.
>-        renderer->endRenderPass();
>+angle::Result TextureVk::setEGLImageTarget(const gl::Context *context,
>+                                           gl::TextureType type,
>+                                           egl::Image *image)
>+{
>+    ContextVk *contextVk = vk::GetImpl(context);
>+    RendererVk *renderer = contextVk->getRenderer();
>+
>+    releaseAndDeleteImage(context, renderer);
>+
>+    const vk::Format &format = renderer->getFormat(image->getFormat().info->sizedInternalFormat);
> 
>-        stagingImage.getImage().changeLayoutWithStages(
>-            VK_IMAGE_ASPECT_COLOR_BIT, VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL,
>-            VK_PIPELINE_STAGE_ALL_COMMANDS_BIT, VK_PIPELINE_STAGE_TRANSFER_BIT, commandBuffer);
>-        mImage.changeLayoutWithStages(
>-            VK_IMAGE_ASPECT_COLOR_BIT, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL,
>-            VK_PIPELINE_STAGE_ALL_COMMANDS_BIT, VK_PIPELINE_STAGE_TRANSFER_BIT, commandBuffer);
>+    ImageVk *imageVk = vk::GetImpl(image);
>+    setImageHelper(renderer, imageVk->getImage(), imageVk->getImageTextureType(), format,
>+                   imageVk->getImageLevel(), imageVk->getImageLayer(), false);
> 
>-        gl::Box wholeRegion(0, 0, 0, size.width, size.height, size.depth);
>-        commandBuffer->copySingleImage(stagingImage.getImage(), mImage, wholeRegion,
>-                                       VK_IMAGE_ASPECT_COLOR_BIT);
>+    ANGLE_TRY(initImageViews(contextVk, format, 1));
> 
>-        // TODO(jmadill): Re-use staging images.
>-        renderer->releaseObject(renderer->getCurrentQueueSerial(), &stagingImage);
>+    // Transfer the image to this queue if needed
>+    uint32_t rendererQueueFamilyIndex = renderer->getQueueFamilyIndex();
>+    if (mImage->isQueueChangeNeccesary(rendererQueueFamilyIndex))
>+    {
>+        vk::CommandBuffer *commandBuffer = nullptr;
>+        ANGLE_TRY(mImage->recordCommands(contextVk, &commandBuffer));
>+        mImage->changeLayoutAndQueue(VK_IMAGE_ASPECT_COLOR_BIT,
>+                                     vk::ImageLayout::FragmentShaderReadOnly,
>+                                     rendererQueueFamilyIndex, commandBuffer);
>     }
> 
>-    return gl::NoError();
>+    return angle::Result::Continue;
> }
> 
>-gl::Error TextureVk::setSubImage(const gl::Context *context,
>-                                 GLenum target,
>-                                 size_t level,
>-                                 const gl::Box &area,
>-                                 GLenum format,
>-                                 GLenum type,
>-                                 const gl::PixelUnpackState &unpack,
>-                                 const uint8_t *pixels)
>+angle::Result TextureVk::setImageExternal(const gl::Context *context,
>+                                          gl::TextureType type,
>+                                          egl::Stream *stream,
>+                                          const egl::Stream::GLTextureDescription &desc)
> {
>-    UNIMPLEMENTED();
>-    return gl::InternalError();
>+    ANGLE_VK_UNREACHABLE(vk::GetImpl(context));
>+    return angle::Result::Stop;
> }
> 
>-gl::Error TextureVk::setCompressedImage(const gl::Context *context,
>-                                        GLenum target,
>-                                        size_t level,
>-                                        GLenum internalFormat,
>-                                        const gl::Extents &size,
>-                                        const gl::PixelUnpackState &unpack,
>-                                        size_t imageSize,
>-                                        const uint8_t *pixels)
>+gl::ImageIndex TextureVk::getNativeImageIndex(const gl::ImageIndex &inputImageIndex) const
> {
>-    UNIMPLEMENTED();
>-    return gl::InternalError();
>+    // The input index can be a specific layer (for cube maps, 2d arrays, etc) or mImageLayerOffset
>+    // can be non-zero but both of these cannot be true at the same time.  EGL images can source
>+    // from a cube map or 3D texture but can only be a 2D destination.
>+    ASSERT(!(inputImageIndex.hasLayer() && mImageLayerOffset > 0));
>+
>+    // handle the special-case where image index can represent a whole level of a texture
>+    GLint resultImageLayer = inputImageIndex.getLayerIndex();
>+    if (inputImageIndex.getType() != mImageNativeType)
>+    {
>+        ASSERT(!inputImageIndex.hasLayer());
>+        resultImageLayer = mImageLayerOffset;
>+    }
>+
>+    return gl::ImageIndex::MakeFromType(mImageNativeType,
>+                                        getNativeImageLevel(inputImageIndex.getLevelIndex()),
>+                                        resultImageLayer, inputImageIndex.getLayerCount());
> }
> 
>-gl::Error TextureVk::setCompressedSubImage(const gl::Context *context,
>-                                           GLenum target,
>-                                           size_t level,
>-                                           const gl::Box &area,
>-                                           GLenum format,
>-                                           const gl::PixelUnpackState &unpack,
>-                                           size_t imageSize,
>-                                           const uint8_t *pixels)
>+uint32_t TextureVk::getNativeImageLevel(uint32_t frontendLevel) const
> {
>-    UNIMPLEMENTED();
>-    return gl::InternalError();
>+    return mImageLevelOffset + frontendLevel;
> }
> 
>-gl::Error TextureVk::copyImage(const gl::Context *context,
>-                               GLenum target,
>-                               size_t level,
>-                               const gl::Rectangle &sourceArea,
>-                               GLenum internalFormat,
>-                               const gl::Framebuffer *source)
>+uint32_t TextureVk::getNativeImageLayer(uint32_t frontendLayer) const
> {
>-    UNIMPLEMENTED();
>-    return gl::InternalError();
>+    return mImageLayerOffset + frontendLayer;
> }
> 
>-gl::Error TextureVk::copySubImage(const gl::Context *context,
>-                                  GLenum target,
>-                                  size_t level,
>-                                  const gl::Offset &destOffset,
>-                                  const gl::Rectangle &sourceArea,
>-                                  const gl::Framebuffer *source)
>+void TextureVk::releaseAndDeleteImage(const gl::Context *context, RendererVk *renderer)
> {
>-    UNIMPLEMENTED();
>-    return gl::InternalError();
>+    if (mImage)
>+    {
>+        releaseImage(renderer);
>+        releaseStagingBuffer(renderer);
>+        SafeDelete(mImage);
>+    }
> }
> 
>-gl::Error TextureVk::setStorage(const gl::Context *context,
>-                                GLenum target,
>-                                size_t levels,
>-                                GLenum internalFormat,
>-                                const gl::Extents &size)
>+angle::Result TextureVk::ensureImageAllocated(RendererVk *renderer, const vk::Format &format)
> {
>-    UNIMPLEMENTED();
>-    return gl::InternalError();
>+    if (mImage == nullptr)
>+    {
>+        setImageHelper(renderer, new vk::ImageHelper(), mState.getType(), format, 0, 0, true);
>+    }
>+    else
>+    {
>+        updateImageHelper(renderer, format);
>+    }
>+
>+    return angle::Result::Continue;
> }
> 
>-gl::Error TextureVk::setEGLImageTarget(const gl::Context *context, GLenum target, egl::Image *image)
>+void TextureVk::setImageHelper(RendererVk *renderer,
>+                               vk::ImageHelper *imageHelper,
>+                               gl::TextureType imageType,
>+                               const vk::Format &format,
>+                               uint32_t imageLevelOffset,
>+                               uint32_t imageLayerOffset,
>+                               bool selfOwned)
> {
>-    UNIMPLEMENTED();
>-    return gl::InternalError();
>+    ASSERT(mImage == nullptr);
>+
>+    mOwnsImage        = selfOwned;
>+    mImageNativeType  = imageType;
>+    mImageLevelOffset = imageLevelOffset;
>+    mImageLayerOffset = imageLayerOffset;
>+    mImage            = imageHelper;
>+    mImage->initStagingBuffer(renderer, format);
>+
>+    mRenderTarget.init(mImage, &mDrawBaseLevelImageView, getNativeImageLevel(0),
>+                       getNativeImageLayer(0), this);
>+
>+    // Force re-creation of cube map render targets next time they are needed
>+    mCubeMapRenderTargets.clear();
> }
> 
>-gl::Error TextureVk::setImageExternal(const gl::Context *context,
>-                                      GLenum target,
>-                                      egl::Stream *stream,
>-                                      const egl::Stream::GLTextureDescription &desc)
>+void TextureVk::updateImageHelper(RendererVk *renderer, const vk::Format &format)
> {
>-    UNIMPLEMENTED();
>-    return gl::InternalError();
>+    ASSERT(mImage != nullptr);
>+    mImage->initStagingBuffer(renderer, format);
> }
> 
>-gl::Error TextureVk::generateMipmap(const gl::Context *context)
>+angle::Result TextureVk::redefineImage(const gl::Context *context,
>+                                       const gl::ImageIndex &index,
>+                                       const vk::Format &format,
>+                                       const gl::Extents &size)
> {
>-    UNIMPLEMENTED();
>-    return gl::InternalError();
>+    ContextVk *contextVk = vk::GetImpl(context);
>+    RendererVk *renderer = contextVk->getRenderer();
>+
>+    if (!mOwnsImage)
>+    {
>+        releaseAndDeleteImage(context, renderer);
>+    }
>+
>+    if (mImage != nullptr)
>+    {
>+        // If there is any staged changes for this index, we can remove them since we're going to
>+        // override them with this call.
>+        mImage->removeStagedUpdates(renderer, index);
>+
>+        if (mImage->valid())
>+        {
>+            // Calculate the expected size for the index we are defining. If the size is different
>+            // from the given size, or the format is different, we are redefining the image so we
>+            // must release it.
>+            if (mImage->getFormat() != format || size != mImage->getSize(index))
>+            {
>+                releaseImage(renderer);
>+            }
>+        }
>+    }
>+
>+    if (!size.empty())
>+    {
>+        ANGLE_TRY(ensureImageAllocated(renderer, format));
>+    }
>+
>+    return angle::Result::Continue;
> }
> 
>-gl::Error TextureVk::setBaseLevel(const gl::Context *context, GLuint baseLevel)
>+angle::Result TextureVk::copyImageDataToBuffer(ContextVk *contextVk,
>+                                               size_t sourceLevel,
>+                                               uint32_t layerCount,
>+                                               const gl::Rectangle &sourceArea,
>+                                               uint8_t **outDataPtr)
> {
>-    UNIMPLEMENTED();
>-    return gl::InternalError();
>+    TRACE_EVENT0("gpu.angle", "TextureVk::copyImageDataToBuffer");
>+    // Make sure the source is initialized and it's images are flushed.
>+    ANGLE_TRY(ensureImageInitialized(contextVk));
>+
>+    const angle::Format &imageFormat = getImage().getFormat().imageFormat();
>+    size_t sourceCopyAllocationSize =
>+        sourceArea.width * sourceArea.height * imageFormat.pixelBytes * layerCount;
>+
>+    vk::CommandBuffer *commandBuffer = nullptr;
>+    ANGLE_TRY(mImage->recordCommands(contextVk, &commandBuffer));
>+
>+    // Requirement of the copyImageToBuffer, the source image must be in SRC_OPTIMAL layout.
>+    mImage->changeLayout(VK_IMAGE_ASPECT_COLOR_BIT, vk::ImageLayout::TransferSrc, commandBuffer);
>+
>+    // Allocate enough memory to copy the sourceArea region of the source texture into its pixel
>+    // buffer.
>+    VkBuffer copyBufferHandle     = VK_NULL_HANDLE;
>+    VkDeviceSize sourceCopyOffset = 0;
>+    ANGLE_TRY(mImage->allocateStagingMemory(contextVk, sourceCopyAllocationSize, outDataPtr,
>+                                            &copyBufferHandle, &sourceCopyOffset, nullptr));
>+
>+    VkBufferImageCopy region               = {};
>+    region.bufferOffset                    = sourceCopyOffset;
>+    region.bufferRowLength                 = 0;
>+    region.bufferImageHeight               = 0;
>+    region.imageExtent.width               = sourceArea.width;
>+    region.imageExtent.height              = sourceArea.height;
>+    region.imageExtent.depth               = 1;
>+    region.imageOffset.x                   = sourceArea.x;
>+    region.imageOffset.y                   = sourceArea.y;
>+    region.imageOffset.z                   = 0;
>+    region.imageSubresource.aspectMask     = VK_IMAGE_ASPECT_COLOR_BIT;
>+    region.imageSubresource.baseArrayLayer = 0;
>+    region.imageSubresource.layerCount     = layerCount;
>+    region.imageSubresource.mipLevel       = static_cast<uint32_t>(sourceLevel);
>+
>+    commandBuffer->copyImageToBuffer(mImage->getImage(), mImage->getCurrentLayout(),
>+                                     copyBufferHandle, 1, &region);
>+
>+    // Explicitly finish. If new use cases arise where we don't want to block we can change this.
>+    ANGLE_TRY(contextVk->finishImpl());
>+
>+    return angle::Result::Continue;
> }
> 
>-gl::Error TextureVk::bindTexImage(const gl::Context *context, egl::Surface *surface)
>+angle::Result TextureVk::generateMipmapsWithCPU(const gl::Context *context)
> {
>-    UNIMPLEMENTED();
>-    return gl::InternalError();
>+    ContextVk *contextVk = vk::GetImpl(context);
>+
>+    const gl::Extents baseLevelExtents = mImage->getExtents();
>+    uint32_t imageLayerCount           = mImage->getLayerCount();
>+
>+    uint8_t *imageData = nullptr;
>+    gl::Rectangle imageArea(0, 0, baseLevelExtents.width, baseLevelExtents.height);
>+    ANGLE_TRY(copyImageDataToBuffer(contextVk, mState.getEffectiveBaseLevel(), imageLayerCount,
>+                                    imageArea, &imageData));
>+
>+    const angle::Format &angleFormat = mImage->getFormat().imageFormat();
>+    GLuint sourceRowPitch            = baseLevelExtents.width * angleFormat.pixelBytes;
>+    size_t baseLevelAllocationSize   = sourceRowPitch * baseLevelExtents.height;
>+
>+    // We now have the base level available to be manipulated in the imageData pointer. Generate all
>+    // the missing mipmaps with the slow path. For each layer, use the copied data to generate all
>+    // the mips.
>+    for (GLuint layer = 0; layer < imageLayerCount; layer++)
>+    {
>+        size_t bufferOffset = layer * baseLevelAllocationSize;
>+
>+        ANGLE_TRY(generateMipmapLevelsWithCPU(
>+            contextVk, angleFormat, layer, mState.getEffectiveBaseLevel() + 1,
>+            mState.getMipmapMaxLevel(), baseLevelExtents.width, baseLevelExtents.height,
>+            sourceRowPitch, imageData + bufferOffset));
>+    }
>+
>+    vk::CommandBuffer *commandBuffer = nullptr;
>+    ANGLE_TRY(mImage->recordCommands(contextVk, &commandBuffer));
>+    return mImage->flushStagedUpdates(contextVk, getNativeImageLevel(0), mImage->getLevelCount(),
>+                                      getNativeImageLayer(0), mImage->getLayerCount(),
>+                                      commandBuffer);
> }
> 
>-gl::Error TextureVk::releaseTexImage(const gl::Context *context)
>+angle::Result TextureVk::generateMipmap(const gl::Context *context)
> {
>-    UNIMPLEMENTED();
>-    return gl::InternalError();
>+    ContextVk *contextVk = vk::GetImpl(context);
>+
>+    // Some data is pending, or the image has not been defined at all yet
>+    if (!mImage->valid())
>+    {
>+        // Let's initialize the image so we can generate the next levels.
>+        if (mImage->hasStagedUpdates())
>+        {
>+            ANGLE_TRY(ensureImageInitialized(contextVk));
>+            ASSERT(mImage->valid());
>+        }
>+        else
>+        {
>+            // There is nothing to generate if there is nothing uploaded so far.
>+            return angle::Result::Continue;
>+        }
>+    }
>+
>+    RendererVk *renderer = contextVk->getRenderer();
>+
>+    // Check if the image supports blit. If it does, we can do the mipmap generation on the gpu
>+    // only.
>+    if (renderer->hasImageFormatFeatureBits(mImage->getFormat().vkImageFormat, kBlitFeatureFlags))
>+    {
>+        ANGLE_TRY(ensureImageInitialized(contextVk));
>+        ANGLE_TRY(mImage->generateMipmapsWithBlit(contextVk, mState.getMipmapMaxLevel()));
>+    }
>+    else
>+    {
>+        ANGLE_TRY(generateMipmapsWithCPU(context));
>+    }
>+
>+    // We're changing this textureVk content, make sure we let the graph know.
>+    mImage->finishCurrentCommands(renderer);
>+
>+    return angle::Result::Continue;
> }
> 
>-gl::Error TextureVk::getAttachmentRenderTarget(const gl::Context *context,
>-                                               GLenum binding,
>-                                               const gl::ImageIndex &imageIndex,
>-                                               FramebufferAttachmentRenderTarget **rtOut)
>+angle::Result TextureVk::setBaseLevel(const gl::Context *context, GLuint baseLevel)
> {
>-    ASSERT(imageIndex.type == GL_TEXTURE_2D);
>-    ASSERT(imageIndex.mipIndex == 0 && imageIndex.layerIndex == gl::ImageIndex::ENTIRE_LEVEL);
>-    *rtOut = &mRenderTarget;
>-    return gl::NoError();
>+    ANGLE_VK_UNREACHABLE(vk::GetImpl(context));
>+    return angle::Result::Stop;
> }
> 
>-void TextureVk::syncState(const gl::Texture::DirtyBits &dirtyBits)
>+angle::Result TextureVk::bindTexImage(const gl::Context *context, egl::Surface *surface)
> {
>-    // TODO(jmadill): Texture sync state.
>+    ContextVk *contextVk = vk::GetImpl(context);
>+    RendererVk *renderer = contextVk->getRenderer();
>+
>+    releaseAndDeleteImage(context, renderer);
>+
>+    const vk::Format &format = renderer->getFormat(surface->getConfig()->renderTargetFormat);
>+
>+    // eglBindTexImage can only be called with pbuffer (offscreen) surfaces
>+    OffscreenSurfaceVk *offscreenSurface = GetImplAs<OffscreenSurfaceVk>(surface);
>+    setImageHelper(renderer, offscreenSurface->getColorAttachmentImage(), mState.getType(), format,
>+                   surface->getMipmapLevel(), 0, false);
>+
>+    return initImageViews(contextVk, format, 1);
> }
> 
>-gl::Error TextureVk::setStorageMultisample(const gl::Context *context,
>-                                           GLenum target,
>-                                           GLsizei samples,
>-                                           GLint internalformat,
>-                                           const gl::Extents &size,
>-                                           bool fixedSampleLocations)
>+angle::Result TextureVk::releaseTexImage(const gl::Context *context)
> {
>-    UNIMPLEMENTED();
>-    return gl::InternalError() << "setStorageMultisample is unimplemented.";
>+    ContextVk *contextVk = vk::GetImpl(context);
>+    RendererVk *renderer = contextVk->getRenderer();
>+
>+    releaseImage(renderer);
>+
>+    return angle::Result::Continue;
> }
> 
>-gl::Error TextureVk::initializeContents(const gl::Context *context,
>-                                        const gl::ImageIndex &imageIndex)
>+angle::Result TextureVk::getAttachmentRenderTarget(const gl::Context *context,
>+                                                   GLenum binding,
>+                                                   const gl::ImageIndex &imageIndex,
>+                                                   FramebufferAttachmentRenderTarget **rtOut)
> {
>-    UNIMPLEMENTED();
>-    return gl::NoError();
>+    // Non-zero mip level attachments are an ES 3.0 feature.
>+    ASSERT(imageIndex.getLevelIndex() == 0);
>+
>+    ContextVk *contextVk = vk::GetImpl(context);
>+    ANGLE_TRY(ensureImageInitialized(contextVk));
>+
>+    switch (imageIndex.getType())
>+    {
>+        case gl::TextureType::_2D:
>+            *rtOut = &mRenderTarget;
>+            break;
>+        case gl::TextureType::CubeMap:
>+            ANGLE_TRY(initCubeMapRenderTargets(contextVk));
>+            *rtOut = &mCubeMapRenderTargets[imageIndex.cubeMapFaceIndex()];
>+            break;
>+        default:
>+            UNREACHABLE();
>+    }
>+
>+    return angle::Result::Continue;
> }
> 
>-const vk::Image &TextureVk::getImage() const
>+angle::Result TextureVk::ensureImageInitialized(ContextVk *contextVk)
> {
>-    ASSERT(mImage.valid());
>-    return mImage;
>+    const gl::ImageDesc &baseLevelDesc  = mState.getBaseLevelDesc();
>+    const gl::Extents &baseLevelExtents = baseLevelDesc.size;
>+    const uint32_t levelCount           = getLevelCount();
>+
>+    const vk::Format &format =
>+        contextVk->getRenderer()->getFormat(baseLevelDesc.format.info->sizedInternalFormat);
>+
>+    return ensureImageInitializedImpl(contextVk, baseLevelExtents, levelCount, format);
> }
> 
>-const vk::ImageView &TextureVk::getImageView() const
>+angle::Result TextureVk::ensureImageInitializedImpl(ContextVk *contextVk,
>+                                                    const gl::Extents &baseLevelExtents,
>+                                                    uint32_t levelCount,
>+                                                    const vk::Format &format)
> {
>-    ASSERT(mImageView.valid());
>-    return mImageView;
>+    if (mImage->valid() && !mImage->hasStagedUpdates())
>+    {
>+        return angle::Result::Continue;
>+    }
>+
>+    vk::CommandBuffer *commandBuffer = nullptr;
>+    ANGLE_TRY(mImage->recordCommands(contextVk, &commandBuffer));
>+
>+    if (!mImage->valid())
>+    {
>+        ANGLE_TRY(initImage(contextVk, format, baseLevelExtents, levelCount, commandBuffer));
>+    }
>+
>+    return mImage->flushStagedUpdates(contextVk, getNativeImageLevel(0), mImage->getLevelCount(),
>+                                      getNativeImageLayer(0), mImage->getLayerCount(),
>+                                      commandBuffer);
>+}
>+
>+angle::Result TextureVk::initCubeMapRenderTargets(ContextVk *contextVk)
>+{
>+    // Lazy init. Check if already initialized.
>+    if (!mCubeMapRenderTargets.empty())
>+        return angle::Result::Continue;
>+
>+    mCubeMapRenderTargets.resize(gl::kCubeFaceCount);
>+    for (size_t cubeMapFaceIndex = 0; cubeMapFaceIndex < gl::kCubeFaceCount; ++cubeMapFaceIndex)
>+    {
>+        vk::ImageView *imageView;
>+        ANGLE_TRY(getLayerLevelDrawImageView(contextVk, cubeMapFaceIndex, 0, &imageView));
>+        mCubeMapRenderTargets[cubeMapFaceIndex].init(mImage, imageView, getNativeImageLevel(0),
>+                                                     getNativeImageLayer(cubeMapFaceIndex), this);
>+    }
>+    return angle::Result::Continue;
>+}
>+
>+angle::Result TextureVk::syncState(const gl::Context *context,
>+                                   const gl::Texture::DirtyBits &dirtyBits)
>+{
>+    if (dirtyBits.none() && mSampler.valid())
>+    {
>+        return angle::Result::Continue;
>+    }
>+
>+    ContextVk *contextVk = vk::GetImpl(context);
>+    RendererVk *renderer = contextVk->getRenderer();
>+    if (mSampler.valid())
>+    {
>+        renderer->releaseObject(renderer->getCurrentQueueSerial(), &mSampler);
>+    }
>+
>+    const gl::Extensions &extensions     = renderer->getNativeExtensions();
>+    const gl::SamplerState &samplerState = mState.getSamplerState();
>+
>+    float maxAnisotropy   = samplerState.getMaxAnisotropy();
>+    bool anisotropyEnable = extensions.textureFilterAnisotropic && maxAnisotropy > 1.0f;
>+
>+    // Create a simple sampler. Force basic parameter settings.
>+    VkSamplerCreateInfo samplerInfo     = {};
>+    samplerInfo.sType                   = VK_STRUCTURE_TYPE_SAMPLER_CREATE_INFO;
>+    samplerInfo.flags                   = 0;
>+    samplerInfo.magFilter               = gl_vk::GetFilter(samplerState.getMagFilter());
>+    samplerInfo.minFilter               = gl_vk::GetFilter(samplerState.getMinFilter());
>+    samplerInfo.mipmapMode              = gl_vk::GetSamplerMipmapMode(samplerState.getMinFilter());
>+    samplerInfo.addressModeU            = gl_vk::GetSamplerAddressMode(samplerState.getWrapS());
>+    samplerInfo.addressModeV            = gl_vk::GetSamplerAddressMode(samplerState.getWrapT());
>+    samplerInfo.addressModeW            = gl_vk::GetSamplerAddressMode(samplerState.getWrapR());
>+    samplerInfo.mipLodBias              = 0.0f;
>+    samplerInfo.anisotropyEnable        = anisotropyEnable;
>+    samplerInfo.maxAnisotropy           = maxAnisotropy;
>+    samplerInfo.compareEnable           = VK_FALSE;
>+    samplerInfo.compareOp               = VK_COMPARE_OP_ALWAYS;
>+    samplerInfo.minLod                  = samplerState.getMinLod();
>+    samplerInfo.maxLod                  = samplerState.getMaxLod();
>+    samplerInfo.borderColor             = VK_BORDER_COLOR_INT_TRANSPARENT_BLACK;
>+    samplerInfo.unnormalizedCoordinates = VK_FALSE;
>+
>+    ANGLE_VK_TRY(contextVk, mSampler.init(contextVk->getDevice(), samplerInfo));
>+    return angle::Result::Continue;
>+}
>+
>+angle::Result TextureVk::setStorageMultisample(const gl::Context *context,
>+                                               gl::TextureType type,
>+                                               GLsizei samples,
>+                                               GLint internalformat,
>+                                               const gl::Extents &size,
>+                                               bool fixedSampleLocations)
>+{
>+    ANGLE_VK_UNREACHABLE(vk::GetImpl(context));
>+    return angle::Result::Stop;
>+}
>+
>+angle::Result TextureVk::initializeContents(const gl::Context *context,
>+                                            const gl::ImageIndex &imageIndex)
>+{
>+    const gl::ImageDesc &desc = mState.getImageDesc(imageIndex);
>+    const vk::Format &format =
>+        vk::GetImpl(context)->getRenderer()->getFormat(desc.format.info->sizedInternalFormat);
>+
>+    mImage->stageSubresourceRobustClear(imageIndex, format.angleFormat());
>+
>+    return angle::Result::Continue;
>+}
>+
>+void TextureVk::releaseOwnershipOfImage(const gl::Context *context)
>+{
>+    ContextVk *contextVk = vk::GetImpl(context);
>+    RendererVk *renderer = contextVk->getRenderer();
>+
>+    mOwnsImage = false;
>+    releaseAndDeleteImage(context, renderer);
>+}
>+
>+const vk::ImageView &TextureVk::getReadImageView() const
>+{
>+    ASSERT(mImage->valid());
>+
>+    const GLenum minFilter = mState.getSamplerState().getMinFilter();
>+    if (minFilter == GL_LINEAR || minFilter == GL_NEAREST)
>+    {
>+        return mReadBaseLevelImageView;
>+    }
>+
>+    return mReadMipmapImageView;
>+}
>+
>+angle::Result TextureVk::getLayerLevelDrawImageView(vk::Context *context,
>+                                                    size_t layer,
>+                                                    size_t level,
>+                                                    vk::ImageView **imageViewOut)
>+{
>+    ASSERT(mImage->valid());
>+    ASSERT(!mImage->getFormat().imageFormat().isBlock);
>+
>+    // Lazily allocate the storage for image views
>+    if (mLayerLevelDrawImageViews.empty())
>+    {
>+        mLayerLevelDrawImageViews.resize(mImage->getLayerCount());
>+    }
>+    ASSERT(mLayerLevelDrawImageViews.size() > layer);
>+
>+    if (mLayerLevelDrawImageViews[layer].empty())
>+    {
>+        mLayerLevelDrawImageViews[layer].resize(mImage->getLevelCount());
>+    }
>+    ASSERT(mLayerLevelDrawImageViews[layer].size() > level);
>+
>+    *imageViewOut = &mLayerLevelDrawImageViews[layer][level];
>+    if ((*imageViewOut)->valid())
>+    {
>+        return angle::Result::Continue;
>+    }
>+
>+    // Lazily allocate the image view itself.
>+    // Note that these views are specifically made to be used as color attachments, and therefore
>+    // don't have swizzle.
>+    return mImage->initLayerImageView(context, mState.getType(), VK_IMAGE_ASPECT_COLOR_BIT,
>+                                      gl::SwizzleState(), *imageViewOut, getNativeImageLevel(level),
>+                                      1, getNativeImageLayer(layer), 1);
> }
> 
> const vk::Sampler &TextureVk::getSampler() const
>@@ -415,4 +1351,129 @@ const vk::Sampler &TextureVk::getSampler() const
>     return mSampler;
> }
> 
>+angle::Result TextureVk::initImage(ContextVk *contextVk,
>+                                   const vk::Format &format,
>+                                   const gl::Extents &extents,
>+                                   const uint32_t levelCount,
>+                                   vk::CommandBuffer *commandBuffer)
>+{
>+    const RendererVk *renderer         = contextVk->getRenderer();
>+    const angle::Format &textureFormat = format.imageFormat();
>+
>+    VkImageUsageFlags imageUsageFlags = VK_IMAGE_USAGE_TRANSFER_DST_BIT |
>+                                        VK_IMAGE_USAGE_TRANSFER_SRC_BIT |
>+                                        VK_IMAGE_USAGE_SAMPLED_BIT;
>+
>+    if (!textureFormat.isBlock)
>+    {
>+        imageUsageFlags |= VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT;
>+    }
>+
>+    ANGLE_TRY(mImage->init(contextVk, mState.getType(), extents, format, 1, imageUsageFlags,
>+                           levelCount,
>+                           mState.getType() == gl::TextureType::CubeMap ? gl::kCubeFaceCount : 1));
>+
>+    const VkMemoryPropertyFlags flags = VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT;
>+
>+    ANGLE_TRY(mImage->initMemory(contextVk, renderer->getMemoryProperties(), flags));
>+
>+    ANGLE_TRY(initImageViews(contextVk, format, levelCount));
>+
>+    // If the image has an emulated channel, always clear it.  These channels will be masked out in
>+    // future writes, and shouldn't contain uninitialized values.
>+    if (format.hasEmulatedImageChannels())
>+    {
>+        uint32_t levelCount = mImage->getLevelCount();
>+        uint32_t layerCount = mImage->getLayerCount();
>+
>+        for (uint32_t level = 0; level < levelCount; ++level)
>+        {
>+            gl::ImageIndex index = gl::ImageIndex::Make2DArrayRange(level, 0, layerCount);
>+            mImage->stageSubresourceEmulatedClear(index, format.angleFormat());
>+        }
>+    }
>+
>+    return angle::Result::Continue;
>+}
>+
>+angle::Result TextureVk::initImageViews(ContextVk *contextVk,
>+                                        const vk::Format &format,
>+                                        uint32_t levelCount)
>+{
>+    ASSERT(mImage != nullptr);
>+
>+    gl::SwizzleState mappedSwizzle;
>+    MapSwizzleState(format, mState.getSwizzleState(), &mappedSwizzle);
>+
>+    // TODO: Support non-zero base level for ES 3.0 by passing it to getNativeImageLevel.
>+    // http://anglebug.com/3148
>+    uint32_t baseLevel  = getNativeImageLevel(0);
>+    uint32_t baseLayer  = getNativeImageLayer(0);
>+    uint32_t layerCount = mState.getType() == gl::TextureType::CubeMap ? gl::kCubeFaceCount : 1;
>+
>+    ANGLE_TRY(mImage->initLayerImageView(contextVk, mState.getType(), VK_IMAGE_ASPECT_COLOR_BIT,
>+                                         mappedSwizzle, &mReadMipmapImageView, baseLevel,
>+                                         levelCount, baseLayer, layerCount));
>+    ANGLE_TRY(mImage->initLayerImageView(contextVk, mState.getType(), VK_IMAGE_ASPECT_COLOR_BIT,
>+                                         mappedSwizzle, &mReadBaseLevelImageView, baseLevel, 1,
>+                                         baseLayer, layerCount));
>+    if (!format.imageFormat().isBlock)
>+    {
>+        ANGLE_TRY(mImage->initLayerImageView(contextVk, mState.getType(), VK_IMAGE_ASPECT_COLOR_BIT,
>+                                             gl::SwizzleState(), &mDrawBaseLevelImageView,
>+                                             baseLevel, 1, baseLayer, layerCount));
>+    }
>+
>+    return angle::Result::Continue;
>+}
>+
>+void TextureVk::releaseImage(RendererVk *renderer)
>+{
>+    if (mImage)
>+    {
>+        if (mOwnsImage)
>+        {
>+            mImage->releaseImage(renderer);
>+        }
>+        else
>+        {
>+            mImage = nullptr;
>+        }
>+    }
>+
>+    Serial currentSerial = renderer->getCurrentQueueSerial();
>+
>+    renderer->releaseObject(currentSerial, &mDrawBaseLevelImageView);
>+    renderer->releaseObject(currentSerial, &mReadBaseLevelImageView);
>+    renderer->releaseObject(currentSerial, &mReadMipmapImageView);
>+
>+    for (auto &layerViews : mLayerLevelDrawImageViews)
>+    {
>+        for (vk::ImageView &imageView : layerViews)
>+        {
>+            if (imageView.valid())
>+            {
>+                renderer->releaseObject(currentSerial, &imageView);
>+            }
>+        }
>+    }
>+    mLayerLevelDrawImageViews.clear();
>+    mCubeMapRenderTargets.clear();
>+}
>+
>+void TextureVk::releaseStagingBuffer(RendererVk *renderer)
>+{
>+    if (mImage)
>+    {
>+        mImage->releaseStagingBuffer(renderer);
>+    }
>+}
>+
>+uint32_t TextureVk::getLevelCount() const
>+{
>+    ASSERT(mState.getEffectiveBaseLevel() == 0);
>+
>+    // getMipmapMaxLevel will be 0 here if mipmaps are not used, so the levelCount is always +1.
>+    return mState.getMipmapMaxLevel() + 1;
>+}
> }  // namespace rx
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/TextureVk.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/TextureVk.h
>index 17c48737123..21b6192ae26 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/TextureVk.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/TextureVk.h
>@@ -11,118 +11,293 @@
> #define LIBANGLE_RENDERER_VULKAN_TEXTUREVK_H_
> 
> #include "libANGLE/renderer/TextureImpl.h"
>+#include "libANGLE/renderer/vulkan/CommandGraph.h"
> #include "libANGLE/renderer/vulkan/RenderTargetVk.h"
>-#include "libANGLE/renderer/vulkan/renderervk_utils.h"
>+#include "libANGLE/renderer/vulkan/vk_helpers.h"
> 
> namespace rx
> {
> 
>-class TextureVk : public TextureImpl, public ResourceVk
>+class TextureVk : public TextureImpl
> {
>   public:
>-    TextureVk(const gl::TextureState &state);
>+    TextureVk(const gl::TextureState &state, RendererVk *renderer);
>     ~TextureVk() override;
>-    gl::Error onDestroy(const gl::Context *context) override;
>-
>-    gl::Error setImage(const gl::Context *context,
>-                       GLenum target,
>-                       size_t level,
>-                       GLenum internalFormat,
>-                       const gl::Extents &size,
>-                       GLenum format,
>-                       GLenum type,
>-                       const gl::PixelUnpackState &unpack,
>-                       const uint8_t *pixels) override;
>-    gl::Error setSubImage(const gl::Context *context,
>-                          GLenum target,
>-                          size_t level,
>-                          const gl::Box &area,
>-                          GLenum format,
>-                          GLenum type,
>-                          const gl::PixelUnpackState &unpack,
>-                          const uint8_t *pixels) override;
>-
>-    gl::Error setCompressedImage(const gl::Context *context,
>-                                 GLenum target,
>-                                 size_t level,
>-                                 GLenum internalFormat,
>-                                 const gl::Extents &size,
>-                                 const gl::PixelUnpackState &unpack,
>-                                 size_t imageSize,
>-                                 const uint8_t *pixels) override;
>-    gl::Error setCompressedSubImage(const gl::Context *context,
>-                                    GLenum target,
>-                                    size_t level,
>-                                    const gl::Box &area,
>-                                    GLenum format,
>-                                    const gl::PixelUnpackState &unpack,
>-                                    size_t imageSize,
>-                                    const uint8_t *pixels) override;
>-
>-    gl::Error copyImage(const gl::Context *context,
>-                        GLenum target,
>-                        size_t level,
>-                        const gl::Rectangle &sourceArea,
>-                        GLenum internalFormat,
>-                        const gl::Framebuffer *source) override;
>-    gl::Error copySubImage(const gl::Context *context,
>-                           GLenum target,
>-                           size_t level,
>-                           const gl::Offset &destOffset,
>-                           const gl::Rectangle &sourceArea,
>-                           const gl::Framebuffer *source) override;
>-
>-    gl::Error setStorage(const gl::Context *context,
>-                         GLenum target,
>-                         size_t levels,
>-                         GLenum internalFormat,
>-                         const gl::Extents &size) override;
>-
>-    gl::Error setEGLImageTarget(const gl::Context *context,
>-                                GLenum target,
>-                                egl::Image *image) override;
>-
>-    gl::Error setImageExternal(const gl::Context *context,
>-                               GLenum target,
>-                               egl::Stream *stream,
>-                               const egl::Stream::GLTextureDescription &desc) override;
>-
>-    gl::Error generateMipmap(const gl::Context *context) override;
>-
>-    gl::Error setBaseLevel(const gl::Context *context, GLuint baseLevel) override;
>-
>-    gl::Error bindTexImage(const gl::Context *context, egl::Surface *surface) override;
>-    gl::Error releaseTexImage(const gl::Context *context) override;
>-
>-    gl::Error getAttachmentRenderTarget(const gl::Context *context,
>-                                        GLenum binding,
>-                                        const gl::ImageIndex &imageIndex,
>-                                        FramebufferAttachmentRenderTarget **rtOut) override;
>-
>-    void syncState(const gl::Texture::DirtyBits &dirtyBits) override;
>-
>-    gl::Error setStorageMultisample(const gl::Context *context,
>-                                    GLenum target,
>-                                    GLsizei samples,
>-                                    GLint internalformat,
>-                                    const gl::Extents &size,
>-                                    bool fixedSampleLocations) override;
>-
>-    gl::Error initializeContents(const gl::Context *context,
>-                                 const gl::ImageIndex &imageIndex) override;
>-
>-    const vk::Image &getImage() const;
>-    const vk::ImageView &getImageView() const;
>+    void onDestroy(const gl::Context *context) override;
>+
>+    angle::Result setImage(const gl::Context *context,
>+                           const gl::ImageIndex &index,
>+                           GLenum internalFormat,
>+                           const gl::Extents &size,
>+                           GLenum format,
>+                           GLenum type,
>+                           const gl::PixelUnpackState &unpack,
>+                           const uint8_t *pixels) override;
>+    angle::Result setSubImage(const gl::Context *context,
>+                              const gl::ImageIndex &index,
>+                              const gl::Box &area,
>+                              GLenum format,
>+                              GLenum type,
>+                              const gl::PixelUnpackState &unpack,
>+                              gl::Buffer *unpackBuffer,
>+                              const uint8_t *pixels) override;
>+
>+    angle::Result setCompressedImage(const gl::Context *context,
>+                                     const gl::ImageIndex &index,
>+                                     GLenum internalFormat,
>+                                     const gl::Extents &size,
>+                                     const gl::PixelUnpackState &unpack,
>+                                     size_t imageSize,
>+                                     const uint8_t *pixels) override;
>+    angle::Result setCompressedSubImage(const gl::Context *context,
>+                                        const gl::ImageIndex &index,
>+                                        const gl::Box &area,
>+                                        GLenum format,
>+                                        const gl::PixelUnpackState &unpack,
>+                                        size_t imageSize,
>+                                        const uint8_t *pixels) override;
>+
>+    angle::Result copyImage(const gl::Context *context,
>+                            const gl::ImageIndex &index,
>+                            const gl::Rectangle &sourceArea,
>+                            GLenum internalFormat,
>+                            gl::Framebuffer *source) override;
>+    angle::Result copySubImage(const gl::Context *context,
>+                               const gl::ImageIndex &index,
>+                               const gl::Offset &destOffset,
>+                               const gl::Rectangle &sourceArea,
>+                               gl::Framebuffer *source) override;
>+
>+    angle::Result copyTexture(const gl::Context *context,
>+                              const gl::ImageIndex &index,
>+                              GLenum internalFormat,
>+                              GLenum type,
>+                              size_t sourceLevel,
>+                              bool unpackFlipY,
>+                              bool unpackPremultiplyAlpha,
>+                              bool unpackUnmultiplyAlpha,
>+                              const gl::Texture *source) override;
>+    angle::Result copySubTexture(const gl::Context *context,
>+                                 const gl::ImageIndex &index,
>+                                 const gl::Offset &destOffset,
>+                                 size_t sourceLevel,
>+                                 const gl::Box &sourceBox,
>+                                 bool unpackFlipY,
>+                                 bool unpackPremultiplyAlpha,
>+                                 bool unpackUnmultiplyAlpha,
>+                                 const gl::Texture *source) override;
>+
>+    angle::Result copyCompressedTexture(const gl::Context *context,
>+                                        const gl::Texture *source) override;
>+
>+    angle::Result setStorage(const gl::Context *context,
>+                             gl::TextureType type,
>+                             size_t levels,
>+                             GLenum internalFormat,
>+                             const gl::Extents &size) override;
>+
>+    angle::Result setStorageExternalMemory(const gl::Context *context,
>+                                           gl::TextureType type,
>+                                           size_t levels,
>+                                           GLenum internalFormat,
>+                                           const gl::Extents &size,
>+                                           gl::MemoryObject *memoryObject,
>+                                           GLuint64 offset) override;
>+
>+    angle::Result setEGLImageTarget(const gl::Context *context,
>+                                    gl::TextureType type,
>+                                    egl::Image *image) override;
>+
>+    angle::Result setImageExternal(const gl::Context *context,
>+                                   gl::TextureType type,
>+                                   egl::Stream *stream,
>+                                   const egl::Stream::GLTextureDescription &desc) override;
>+
>+    angle::Result generateMipmap(const gl::Context *context) override;
>+
>+    angle::Result setBaseLevel(const gl::Context *context, GLuint baseLevel) override;
>+
>+    angle::Result bindTexImage(const gl::Context *context, egl::Surface *surface) override;
>+    angle::Result releaseTexImage(const gl::Context *context) override;
>+
>+    angle::Result getAttachmentRenderTarget(const gl::Context *context,
>+                                            GLenum binding,
>+                                            const gl::ImageIndex &imageIndex,
>+                                            FramebufferAttachmentRenderTarget **rtOut) override;
>+
>+    angle::Result syncState(const gl::Context *context,
>+                            const gl::Texture::DirtyBits &dirtyBits) override;
>+
>+    angle::Result setStorageMultisample(const gl::Context *context,
>+                                        gl::TextureType type,
>+                                        GLsizei samples,
>+                                        GLint internalformat,
>+                                        const gl::Extents &size,
>+                                        bool fixedSampleLocations) override;
>+
>+    angle::Result initializeContents(const gl::Context *context,
>+                                     const gl::ImageIndex &imageIndex) override;
>+
>+    const vk::ImageHelper &getImage() const
>+    {
>+        ASSERT(mImage && mImage->valid());
>+        return *mImage;
>+    }
>+
>+    vk::ImageHelper &getImage()
>+    {
>+        ASSERT(mImage && mImage->valid());
>+        return *mImage;
>+    }
>+
>+    void releaseOwnershipOfImage(const gl::Context *context);
>+
>+    const vk::ImageView &getReadImageView() const;
>+    angle::Result getLayerLevelDrawImageView(vk::Context *context,
>+                                             size_t layer,
>+                                             size_t level,
>+                                             vk::ImageView **imageViewOut);
>     const vk::Sampler &getSampler() const;
> 
>+    angle::Result ensureImageInitialized(ContextVk *contextVk);
>+
>   private:
>-    // TODO(jmadill): support a more flexible storage back-end.
>-    vk::Image mImage;
>-    vk::DeviceMemory mDeviceMemory;
>-    vk::ImageView mImageView;
>+    // Transform an image index from the frontend into one that can be used on the backing
>+    // ImageHelper, taking into account mipmap or cube face offsets
>+    gl::ImageIndex getNativeImageIndex(const gl::ImageIndex &inputImageIndex) const;
>+    uint32_t getNativeImageLevel(uint32_t frontendLevel) const;
>+    uint32_t getNativeImageLayer(uint32_t frontendLayer) const;
>+
>+    void releaseAndDeleteImage(const gl::Context *context, RendererVk *renderer);
>+    angle::Result ensureImageAllocated(RendererVk *renderer, const vk::Format &format);
>+    void setImageHelper(RendererVk *renderer,
>+                        vk::ImageHelper *imageHelper,
>+                        gl::TextureType imageType,
>+                        const vk::Format &format,
>+                        uint32_t imageLevelOffset,
>+                        uint32_t imageLayerOffset,
>+                        bool selfOwned);
>+    void updateImageHelper(RendererVk *renderer, const vk::Format &internalFormat);
>+
>+    angle::Result redefineImage(const gl::Context *context,
>+                                const gl::ImageIndex &index,
>+                                const vk::Format &format,
>+                                const gl::Extents &size);
>+
>+    angle::Result setImageImpl(const gl::Context *context,
>+                               const gl::ImageIndex &index,
>+                               const gl::InternalFormat &formatInfo,
>+                               const gl::Extents &size,
>+                               GLenum type,
>+                               const gl::PixelUnpackState &unpack,
>+                               const uint8_t *pixels);
>+    angle::Result setSubImageImpl(const gl::Context *context,
>+                                  const gl::ImageIndex &index,
>+                                  const gl::Box &area,
>+                                  const gl::InternalFormat &formatInfo,
>+                                  GLenum type,
>+                                  const gl::PixelUnpackState &unpack,
>+                                  const uint8_t *pixels,
>+                                  const vk::Format &vkFormat);
>+
>+    angle::Result copyImageDataToBuffer(ContextVk *contextVk,
>+                                        size_t sourceLevel,
>+                                        uint32_t layerCount,
>+                                        const gl::Rectangle &sourceArea,
>+                                        uint8_t **outDataPtr);
>+
>+    angle::Result generateMipmapsWithCPU(const gl::Context *context);
>+
>+    angle::Result generateMipmapLevelsWithCPU(ContextVk *contextVk,
>+                                              const angle::Format &sourceFormat,
>+                                              GLuint layer,
>+                                              GLuint firstMipLevel,
>+                                              GLuint maxMipLevel,
>+                                              size_t sourceWidth,
>+                                              size_t sourceHeight,
>+                                              size_t sourceRowPitch,
>+                                              uint8_t *sourceData);
>+
>+    angle::Result copySubImageImpl(const gl::Context *context,
>+                                   const gl::ImageIndex &index,
>+                                   const gl::Offset &destOffset,
>+                                   const gl::Rectangle &sourceArea,
>+                                   const gl::InternalFormat &internalFormat,
>+                                   gl::Framebuffer *source);
>+
>+    angle::Result copySubTextureImpl(ContextVk *contextVk,
>+                                     const gl::ImageIndex &index,
>+                                     const gl::Offset &destOffset,
>+                                     const gl::InternalFormat &destFormat,
>+                                     size_t sourceLevel,
>+                                     const gl::Rectangle &sourceArea,
>+                                     bool unpackFlipY,
>+                                     bool unpackPremultiplyAlpha,
>+                                     bool unpackUnmultiplyAlpha,
>+                                     TextureVk *source);
>+
>+    angle::Result copySubImageImplWithTransfer(ContextVk *contextVk,
>+                                               const gl::ImageIndex &index,
>+                                               const gl::Offset &destOffset,
>+                                               const vk::Format &destFormat,
>+                                               size_t sourceLevel,
>+                                               const gl::Rectangle &sourceArea,
>+                                               vk::ImageHelper *srcImage);
>+
>+    angle::Result copySubImageImplWithDraw(ContextVk *contextVk,
>+                                           const gl::ImageIndex &index,
>+                                           const gl::Offset &destOffset,
>+                                           const vk::Format &destFormat,
>+                                           size_t sourceLevel,
>+                                           size_t sourceLayer,
>+                                           const gl::Rectangle &sourceArea,
>+                                           bool isSrcFlipY,
>+                                           bool unpackFlipY,
>+                                           bool unpackPremultiplyAlpha,
>+                                           bool unpackUnmultiplyAlpha,
>+                                           vk::ImageHelper *srcImage,
>+                                           const vk::ImageView *srcView);
>+
>+    angle::Result initImage(ContextVk *contextVk,
>+                            const vk::Format &format,
>+                            const gl::Extents &extents,
>+                            const uint32_t levelCount,
>+                            vk::CommandBuffer *commandBuffer);
>+    void releaseImage(RendererVk *renderer);
>+    void releaseStagingBuffer(RendererVk *renderer);
>+    uint32_t getLevelCount() const;
>+    angle::Result initImageViews(ContextVk *contextVk,
>+                                 const vk::Format &format,
>+                                 uint32_t levelCount);
>+    angle::Result initCubeMapRenderTargets(ContextVk *contextVk);
>+
>+    angle::Result ensureImageInitializedImpl(ContextVk *contextVk,
>+                                             const gl::Extents &baseLevelExtents,
>+                                             uint32_t levelCount,
>+                                             const vk::Format &format);
>+
>+    bool mOwnsImage;
>+
>+    gl::TextureType mImageNativeType;
>+
>+    // The layer offset to apply when converting from a frontend texture layer to a texture layer in
>+    // mImage. Used when this texture sources a cube map face or 3D texture layer from an EGL image.
>+    uint32_t mImageLayerOffset;
>+
>+    // The level offset to apply when converting from a frontend texture level to texture level in
>+    // mImage.
>+    uint32_t mImageLevelOffset;
>+
>+    vk::ImageHelper *mImage;
>+
>+    vk::ImageView mDrawBaseLevelImageView;
>+    vk::ImageView mReadBaseLevelImageView;
>+    vk::ImageView mReadMipmapImageView;
>+    std::vector<std::vector<vk::ImageView>> mLayerLevelDrawImageViews;
>     vk::Sampler mSampler;
> 
>     RenderTargetVk mRenderTarget;
>+    std::vector<RenderTargetVk> mCubeMapRenderTargets;
> };
> 
> }  // namespace rx
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/TransformFeedbackVk.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/TransformFeedbackVk.cpp
>index 5e800788b76..ff268face96 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/TransformFeedbackVk.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/TransformFeedbackVk.cpp
>@@ -16,42 +16,49 @@ namespace rx
> 
> TransformFeedbackVk::TransformFeedbackVk(const gl::TransformFeedbackState &state)
>     : TransformFeedbackImpl(state)
>-{
>-}
>+{}
> 
>-TransformFeedbackVk::~TransformFeedbackVk()
>-{
>-}
>+TransformFeedbackVk::~TransformFeedbackVk() {}
> 
>-void TransformFeedbackVk::begin(GLenum primitiveMode)
>+angle::Result TransformFeedbackVk::begin(const gl::Context *context,
>+                                         gl::PrimitiveMode primitiveMode)
> {
>     UNIMPLEMENTED();
>+    return angle::Result::Stop;
> }
> 
>-void TransformFeedbackVk::end()
>+angle::Result TransformFeedbackVk::end(const gl::Context *context)
> {
>     UNIMPLEMENTED();
>+    return angle::Result::Stop;
> }
> 
>-void TransformFeedbackVk::pause()
>+angle::Result TransformFeedbackVk::pause(const gl::Context *context)
> {
>     UNIMPLEMENTED();
>+    return angle::Result::Stop;
> }
> 
>-void TransformFeedbackVk::resume()
>+angle::Result TransformFeedbackVk::resume(const gl::Context *context)
> {
>     UNIMPLEMENTED();
>+    return angle::Result::Stop;
> }
> 
>-void TransformFeedbackVk::bindGenericBuffer(const gl::BindingPointer<gl::Buffer> &binding)
>+angle::Result TransformFeedbackVk::bindGenericBuffer(const gl::Context *context,
>+                                                     const gl::BindingPointer<gl::Buffer> &binding)
> {
>     UNIMPLEMENTED();
>+    return angle::Result::Stop;
> }
> 
>-void TransformFeedbackVk::bindIndexedBuffer(size_t index,
>-                                            const gl::OffsetBindingPointer<gl::Buffer> &binding)
>+angle::Result TransformFeedbackVk::bindIndexedBuffer(
>+    const gl::Context *context,
>+    size_t index,
>+    const gl::OffsetBindingPointer<gl::Buffer> &binding)
> {
>     UNIMPLEMENTED();
>+    return angle::Result::Stop;
> }
> 
> }  // namespace rx
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/TransformFeedbackVk.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/TransformFeedbackVk.h
>index a379b36ab0b..71553686ed8 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/TransformFeedbackVk.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/TransformFeedbackVk.h
>@@ -21,14 +21,16 @@ class TransformFeedbackVk : public TransformFeedbackImpl
>     TransformFeedbackVk(const gl::TransformFeedbackState &state);
>     ~TransformFeedbackVk() override;
> 
>-    void begin(GLenum primitiveMode) override;
>-    void end() override;
>-    void pause() override;
>-    void resume() override;
>-
>-    void bindGenericBuffer(const gl::BindingPointer<gl::Buffer> &binding) override;
>-    void bindIndexedBuffer(size_t index,
>-                           const gl::OffsetBindingPointer<gl::Buffer> &binding) override;
>+    angle::Result begin(const gl::Context *context, gl::PrimitiveMode primitiveMode) override;
>+    angle::Result end(const gl::Context *context) override;
>+    angle::Result pause(const gl::Context *context) override;
>+    angle::Result resume(const gl::Context *context) override;
>+
>+    angle::Result bindGenericBuffer(const gl::Context *context,
>+                                    const gl::BindingPointer<gl::Buffer> &binding) override;
>+    angle::Result bindIndexedBuffer(const gl::Context *context,
>+                                    size_t index,
>+                                    const gl::OffsetBindingPointer<gl::Buffer> &binding) override;
> };
> 
> }  // namespace rx
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/UtilsVk.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/UtilsVk.cpp
>new file mode 100644
>index 00000000000..18e1754f98b
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/UtilsVk.cpp
>@@ -0,0 +1,858 @@
>+//
>+// Copyright 2018 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// UtilsVk.cpp:
>+//    Implements the UtilsVk class.
>+//
>+
>+#include "libANGLE/renderer/vulkan/UtilsVk.h"
>+
>+#include "libANGLE/renderer/vulkan/ContextVk.h"
>+#include "libANGLE/renderer/vulkan/FramebufferVk.h"
>+#include "libANGLE/renderer/vulkan/RendererVk.h"
>+
>+namespace rx
>+{
>+
>+namespace BufferUtils_comp   = vk::InternalShader::BufferUtils_comp;
>+namespace ConvertVertex_comp = vk::InternalShader::ConvertVertex_comp;
>+namespace ImageClear_frag    = vk::InternalShader::ImageClear_frag;
>+namespace ImageCopy_frag     = vk::InternalShader::ImageCopy_frag;
>+
>+namespace
>+{
>+// All internal shaders assume there is only one descriptor set, indexed at 0
>+constexpr uint32_t kSetIndex = 0;
>+
>+constexpr uint32_t kBufferClearOutputBinding        = 0;
>+constexpr uint32_t kBufferCopyDestinationBinding    = 0;
>+constexpr uint32_t kBufferCopySourceBinding         = 1;
>+constexpr uint32_t kConvertVertexDestinationBinding = 0;
>+constexpr uint32_t kConvertVertexSourceBinding      = 1;
>+constexpr uint32_t kImageCopySourceBinding          = 0;
>+
>+uint32_t GetBufferUtilsFlags(size_t dispatchSize, const vk::Format &format)
>+{
>+    uint32_t flags                    = dispatchSize % 64 == 0 ? BufferUtils_comp::kIsAligned : 0;
>+    const angle::Format &bufferFormat = format.bufferFormat();
>+
>+    flags |= bufferFormat.isInt()
>+                 ? BufferUtils_comp::kIsInt
>+                 : bufferFormat.isUint() ? BufferUtils_comp::kIsUint : BufferUtils_comp::kIsFloat;
>+
>+    return flags;
>+}
>+
>+uint32_t GetConvertVertexFlags(const UtilsVk::ConvertVertexParameters &params)
>+{
>+    bool srcIsInt   = params.srcFormat->isInt();
>+    bool srcIsUint  = params.srcFormat->isUint();
>+    bool srcIsSnorm = params.srcFormat->isSnorm();
>+    bool srcIsUnorm = params.srcFormat->isUnorm();
>+    bool srcIsFixed = params.srcFormat->isFixed;
>+    bool srcIsFloat = params.srcFormat->isFloat();
>+
>+    bool destIsInt   = params.destFormat->isInt();
>+    bool destIsUint  = params.destFormat->isUint();
>+    bool destIsFloat = params.destFormat->isFloat();
>+
>+    // Assert on the types to make sure the shader supports its.  These are based on
>+    // ConvertVertex_comp::Conversion values.
>+    ASSERT(!destIsInt || srcIsInt);      // If destination is int, src must be int too
>+    ASSERT(!destIsUint || srcIsUint);    // If destination is uint, src must be uint too
>+    ASSERT(!srcIsFixed || destIsFloat);  // If source is fixed, dest must be float
>+    // One of each bool set must be true
>+    ASSERT(srcIsInt || srcIsUint || srcIsSnorm || srcIsUnorm || srcIsFixed || srcIsFloat);
>+    ASSERT(destIsInt || destIsUint || destIsFloat);
>+
>+    // We currently don't have any big-endian devices in the list of supported platforms.  The
>+    // shader is capable of supporting big-endian architectures, but the relevant flag (IsBigEndian)
>+    // is not added to the build configuration file (to reduce binary size).  If necessary, add
>+    // IsBigEndian to ConvertVertex.comp.json and select the appropriate flag based on the
>+    // endian-ness test here.
>+    uint32_t endiannessTest                       = 0;
>+    *reinterpret_cast<uint8_t *>(&endiannessTest) = 1;
>+    ASSERT(endiannessTest == 1);
>+
>+    uint32_t flags = 0;
>+
>+    if (srcIsInt && destIsInt)
>+    {
>+        flags |= ConvertVertex_comp::kIntToInt;
>+    }
>+    else if (srcIsUint && destIsUint)
>+    {
>+        flags |= ConvertVertex_comp::kUintToUint;
>+    }
>+    else if (srcIsInt)
>+    {
>+        flags |= ConvertVertex_comp::kIntToFloat;
>+    }
>+    else if (srcIsUint)
>+    {
>+        flags |= ConvertVertex_comp::kUintToFloat;
>+    }
>+    else if (srcIsSnorm)
>+    {
>+        flags |= ConvertVertex_comp::kSnormToFloat;
>+    }
>+    else if (srcIsUnorm)
>+    {
>+        flags |= ConvertVertex_comp::kUnormToFloat;
>+    }
>+    else if (srcIsFixed)
>+    {
>+        flags |= ConvertVertex_comp::kFixedToFloat;
>+    }
>+    else if (srcIsFloat)
>+    {
>+        flags |= ConvertVertex_comp::kFloatToFloat;
>+    }
>+    else
>+    {
>+        UNREACHABLE();
>+    }
>+
>+    return flags;
>+}
>+
>+uint32_t GetImageClearFlags(const angle::Format &format, uint32_t attachmentIndex)
>+{
>+    constexpr uint32_t kAttachmentFlagStep =
>+        ImageClear_frag::kAttachment1 - ImageClear_frag::kAttachment0;
>+
>+    static_assert(gl::IMPLEMENTATION_MAX_DRAW_BUFFERS == 8,
>+                  "ImageClear shader assumes maximum 8 draw buffers");
>+    static_assert(
>+        ImageClear_frag::kAttachment0 + 7 * kAttachmentFlagStep == ImageClear_frag::kAttachment7,
>+        "ImageClear AttachmentN flag calculation needs correction");
>+
>+    uint32_t flags = ImageClear_frag::kAttachment0 + attachmentIndex * kAttachmentFlagStep;
>+
>+    flags |= format.isInt()
>+                 ? ImageClear_frag::kIsInt
>+                 : format.isUint() ? ImageClear_frag::kIsUint : ImageClear_frag::kIsFloat;
>+
>+    return flags;
>+}
>+uint32_t GetImageCopyFlags(const vk::Format &srcFormat, const vk::Format &destFormat)
>+{
>+    const angle::Format &srcAngleFormat  = srcFormat.angleFormat();
>+    const angle::Format &destAngleFormat = destFormat.angleFormat();
>+
>+    uint32_t flags = 0;
>+
>+    flags |= srcAngleFormat.isInt() ? ImageCopy_frag::kSrcIsInt
>+                                    : srcAngleFormat.isUint() ? ImageCopy_frag::kSrcIsUint
>+                                                              : ImageCopy_frag::kSrcIsFloat;
>+    flags |= destAngleFormat.isInt() ? ImageCopy_frag::kDestIsInt
>+                                     : destAngleFormat.isUint() ? ImageCopy_frag::kDestIsUint
>+                                                                : ImageCopy_frag::kDestIsFloat;
>+
>+    return flags;
>+}
>+
>+uint32_t GetFormatDefaultChannelMask(const vk::Format &format)
>+{
>+    uint32_t mask = 0;
>+
>+    const angle::Format &angleFormat   = format.angleFormat();
>+    const angle::Format &textureFormat = format.imageFormat();
>+
>+    // Red can never be introduced due to format emulation (except for luma which is handled
>+    // especially)
>+    ASSERT(((angleFormat.redBits > 0) == (textureFormat.redBits > 0)) || angleFormat.isLUMA());
>+    mask |= angleFormat.greenBits == 0 && textureFormat.greenBits > 0 ? 2 : 0;
>+    mask |= angleFormat.blueBits == 0 && textureFormat.blueBits > 0 ? 4 : 0;
>+    mask |= angleFormat.alphaBits == 0 && textureFormat.alphaBits > 0 ? 8 : 0;
>+
>+    return mask;
>+}
>+}  // namespace
>+
>+UtilsVk::ConvertVertexShaderParams::ConvertVertexShaderParams() = default;
>+
>+UtilsVk::ImageCopyShaderParams::ImageCopyShaderParams() = default;
>+
>+UtilsVk::UtilsVk() = default;
>+
>+UtilsVk::~UtilsVk() = default;
>+
>+void UtilsVk::destroy(VkDevice device)
>+{
>+    for (Function f : angle::AllEnums<Function>())
>+    {
>+        for (auto &descriptorSetLayout : mDescriptorSetLayouts[f])
>+        {
>+            descriptorSetLayout.reset();
>+        }
>+        mPipelineLayouts[f].reset();
>+        mDescriptorPools[f].destroy(device);
>+    }
>+
>+    for (vk::ShaderProgramHelper &program : mBufferUtilsPrograms)
>+    {
>+        program.destroy(device);
>+    }
>+    for (vk::ShaderProgramHelper &program : mConvertVertexPrograms)
>+    {
>+        program.destroy(device);
>+    }
>+    mImageClearProgramVSOnly.destroy(device);
>+    for (vk::ShaderProgramHelper &program : mImageClearProgram)
>+    {
>+        program.destroy(device);
>+    }
>+    for (vk::ShaderProgramHelper &program : mImageCopyPrograms)
>+    {
>+        program.destroy(device);
>+    }
>+}
>+
>+angle::Result UtilsVk::ensureResourcesInitialized(vk::Context *context,
>+                                                  Function function,
>+                                                  VkDescriptorPoolSize *setSizes,
>+                                                  size_t setSizesCount,
>+                                                  size_t pushConstantsSize)
>+{
>+    RendererVk *renderer = context->getRenderer();
>+
>+    vk::DescriptorSetLayoutDesc descriptorSetDesc;
>+
>+    uint32_t currentBinding = 0;
>+    for (size_t i = 0; i < setSizesCount; ++i)
>+    {
>+        descriptorSetDesc.update(currentBinding, setSizes[i].type, setSizes[i].descriptorCount);
>+        currentBinding += setSizes[i].descriptorCount;
>+    }
>+
>+    ANGLE_TRY(renderer->getDescriptorSetLayout(context, descriptorSetDesc,
>+                                               &mDescriptorSetLayouts[function][kSetIndex]));
>+
>+    gl::ShaderType pushConstantsShaderStage = function >= Function::ComputeStartIndex
>+                                                  ? gl::ShaderType::Compute
>+                                                  : gl::ShaderType::Fragment;
>+
>+    // Corresponding pipeline layouts:
>+    vk::PipelineLayoutDesc pipelineLayoutDesc;
>+
>+    pipelineLayoutDesc.updateDescriptorSetLayout(kSetIndex, descriptorSetDesc);
>+    pipelineLayoutDesc.updatePushConstantRange(pushConstantsShaderStage, 0, pushConstantsSize);
>+
>+    ANGLE_TRY(renderer->getPipelineLayout(
>+        context, pipelineLayoutDesc, mDescriptorSetLayouts[function], &mPipelineLayouts[function]));
>+
>+    if (setSizesCount > 0)
>+    {
>+        ANGLE_TRY(mDescriptorPools[function].init(context, setSizes, setSizesCount));
>+    }
>+
>+    return angle::Result::Continue;
>+}
>+
>+angle::Result UtilsVk::ensureBufferClearResourcesInitialized(vk::Context *context)
>+{
>+    if (mPipelineLayouts[Function::BufferClear].valid())
>+    {
>+        return angle::Result::Continue;
>+    }
>+
>+    VkDescriptorPoolSize setSizes[1] = {
>+        {VK_DESCRIPTOR_TYPE_STORAGE_TEXEL_BUFFER, 1},
>+    };
>+
>+    return ensureResourcesInitialized(context, Function::BufferClear, setSizes, ArraySize(setSizes),
>+                                      sizeof(BufferUtilsShaderParams));
>+}
>+
>+angle::Result UtilsVk::ensureBufferCopyResourcesInitialized(vk::Context *context)
>+{
>+    if (mPipelineLayouts[Function::BufferCopy].valid())
>+    {
>+        return angle::Result::Continue;
>+    }
>+
>+    VkDescriptorPoolSize setSizes[2] = {
>+        {VK_DESCRIPTOR_TYPE_STORAGE_TEXEL_BUFFER, 1},
>+        {VK_DESCRIPTOR_TYPE_UNIFORM_TEXEL_BUFFER, 1},
>+    };
>+
>+    return ensureResourcesInitialized(context, Function::BufferCopy, setSizes, ArraySize(setSizes),
>+                                      sizeof(BufferUtilsShaderParams));
>+}
>+
>+angle::Result UtilsVk::ensureConvertVertexResourcesInitialized(vk::Context *context)
>+{
>+    if (mPipelineLayouts[Function::ConvertVertexBuffer].valid())
>+    {
>+        return angle::Result::Continue;
>+    }
>+
>+    VkDescriptorPoolSize setSizes[2] = {
>+        {VK_DESCRIPTOR_TYPE_STORAGE_BUFFER, 1},
>+        {VK_DESCRIPTOR_TYPE_STORAGE_BUFFER, 1},
>+    };
>+
>+    return ensureResourcesInitialized(context, Function::ConvertVertexBuffer, setSizes,
>+                                      ArraySize(setSizes), sizeof(ConvertVertexShaderParams));
>+}
>+
>+angle::Result UtilsVk::ensureImageClearResourcesInitialized(vk::Context *context)
>+{
>+    if (mPipelineLayouts[Function::ImageClear].valid())
>+    {
>+        return angle::Result::Continue;
>+    }
>+
>+    // The shader does not use any descriptor sets.
>+    return ensureResourcesInitialized(context, Function::ImageClear, nullptr, 0,
>+                                      sizeof(ImageClearShaderParams));
>+}
>+
>+angle::Result UtilsVk::ensureImageCopyResourcesInitialized(vk::Context *context)
>+{
>+    if (mPipelineLayouts[Function::ImageCopy].valid())
>+    {
>+        return angle::Result::Continue;
>+    }
>+
>+    VkDescriptorPoolSize setSizes[1] = {
>+        {VK_DESCRIPTOR_TYPE_SAMPLED_IMAGE, 1},
>+    };
>+
>+    return ensureResourcesInitialized(context, Function::ImageCopy, setSizes, ArraySize(setSizes),
>+                                      sizeof(ImageCopyShaderParams));
>+}
>+
>+angle::Result UtilsVk::setupProgram(vk::Context *context,
>+                                    Function function,
>+                                    vk::RefCounted<vk::ShaderAndSerial> *fsCsShader,
>+                                    vk::RefCounted<vk::ShaderAndSerial> *vsShader,
>+                                    vk::ShaderProgramHelper *program,
>+                                    const vk::GraphicsPipelineDesc *pipelineDesc,
>+                                    const VkDescriptorSet descriptorSet,
>+                                    const void *pushConstants,
>+                                    size_t pushConstantsSize,
>+                                    vk::CommandBuffer *commandBuffer)
>+{
>+    RendererVk *renderer = context->getRenderer();
>+
>+    bool isCompute = function >= Function::ComputeStartIndex;
>+    VkShaderStageFlags pushConstantsShaderStage =
>+        isCompute ? VK_SHADER_STAGE_COMPUTE_BIT : VK_SHADER_STAGE_FRAGMENT_BIT;
>+
>+    // If compute, vsShader and pipelineDesc should be nullptr, and if not compute they shouldn't
>+    // be.
>+    ASSERT(isCompute != (vsShader && pipelineDesc));
>+
>+    const vk::BindingPointer<vk::PipelineLayout> &pipelineLayout = mPipelineLayouts[function];
>+
>+    Serial serial = renderer->getCurrentQueueSerial();
>+
>+    if (isCompute)
>+    {
>+        vk::PipelineAndSerial *pipelineAndSerial;
>+        program->setShader(gl::ShaderType::Compute, fsCsShader);
>+        ANGLE_TRY(program->getComputePipeline(context, pipelineLayout.get(), &pipelineAndSerial));
>+        pipelineAndSerial->updateSerial(serial);
>+        commandBuffer->bindComputePipeline(pipelineAndSerial->get());
>+        if (descriptorSet != VK_NULL_HANDLE)
>+        {
>+            commandBuffer->bindComputeDescriptorSets(pipelineLayout.get(), &descriptorSet);
>+        }
>+    }
>+    else
>+    {
>+        program->setShader(gl::ShaderType::Vertex, vsShader);
>+        if (fsCsShader)
>+        {
>+            program->setShader(gl::ShaderType::Fragment, fsCsShader);
>+        }
>+
>+        // This value is not used but is passed to getGraphicsPipeline to avoid a nullptr check.
>+        const vk::GraphicsPipelineDesc *descPtr;
>+        vk::PipelineHelper *helper;
>+
>+        ANGLE_TRY(program->getGraphicsPipeline(
>+            context, &renderer->getRenderPassCache(), renderer->getPipelineCache(), serial,
>+            pipelineLayout.get(), *pipelineDesc, gl::AttributesMask(), &descPtr, &helper));
>+        helper->updateSerial(serial);
>+        commandBuffer->bindGraphicsPipeline(helper->getPipeline());
>+        if (descriptorSet != VK_NULL_HANDLE)
>+        {
>+            commandBuffer->bindGraphicsDescriptorSets(pipelineLayout.get(), 0, 1, &descriptorSet, 0,
>+                                                      nullptr);
>+        }
>+    }
>+
>+    commandBuffer->pushConstants(pipelineLayout.get(), pushConstantsShaderStage, 0,
>+                                 pushConstantsSize, pushConstants);
>+
>+    return angle::Result::Continue;
>+}
>+
>+angle::Result UtilsVk::clearBuffer(vk::Context *context,
>+                                   vk::BufferHelper *dest,
>+                                   const ClearParameters &params)
>+{
>+    RendererVk *renderer = context->getRenderer();
>+
>+    ANGLE_TRY(ensureBufferClearResourcesInitialized(context));
>+
>+    vk::CommandBuffer *commandBuffer;
>+    ANGLE_TRY(dest->recordCommands(context, &commandBuffer));
>+
>+    // Tell dest it's being written to.
>+    dest->onWrite(VK_ACCESS_SHADER_WRITE_BIT);
>+
>+    const vk::Format &destFormat = dest->getViewFormat();
>+
>+    uint32_t flags = BufferUtils_comp::kIsClear | GetBufferUtilsFlags(params.size, destFormat);
>+
>+    BufferUtilsShaderParams shaderParams;
>+    shaderParams.destOffset = params.offset;
>+    shaderParams.size       = params.size;
>+    shaderParams.clearValue = params.clearValue;
>+
>+    VkDescriptorSet descriptorSet;
>+    vk::RefCountedDescriptorPoolBinding descriptorPoolBinding;
>+    ANGLE_TRY(mDescriptorPools[Function::BufferClear].allocateSets(
>+        context, mDescriptorSetLayouts[Function::BufferClear][kSetIndex].get().ptr(), 1,
>+        &descriptorPoolBinding, &descriptorSet));
>+    descriptorPoolBinding.get().updateSerial(context->getRenderer()->getCurrentQueueSerial());
>+
>+    VkWriteDescriptorSet writeInfo = {};
>+
>+    writeInfo.sType            = VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET;
>+    writeInfo.dstSet           = descriptorSet;
>+    writeInfo.dstBinding       = kBufferClearOutputBinding;
>+    writeInfo.descriptorCount  = 1;
>+    writeInfo.descriptorType   = VK_DESCRIPTOR_TYPE_STORAGE_TEXEL_BUFFER;
>+    writeInfo.pTexelBufferView = dest->getBufferView().ptr();
>+
>+    vkUpdateDescriptorSets(context->getDevice(), 1, &writeInfo, 0, nullptr);
>+
>+    vk::RefCounted<vk::ShaderAndSerial> *shader = nullptr;
>+    ANGLE_TRY(renderer->getShaderLibrary().getBufferUtils_comp(context, flags, &shader));
>+
>+    ANGLE_TRY(setupProgram(context, Function::BufferClear, shader, nullptr,
>+                           &mBufferUtilsPrograms[flags], nullptr, descriptorSet, &shaderParams,
>+                           sizeof(shaderParams), commandBuffer));
>+
>+    commandBuffer->dispatch(UnsignedCeilDivide(params.size, 64), 1, 1);
>+
>+    descriptorPoolBinding.reset();
>+
>+    return angle::Result::Continue;
>+}
>+
>+angle::Result UtilsVk::copyBuffer(vk::Context *context,
>+                                  vk::BufferHelper *dest,
>+                                  vk::BufferHelper *src,
>+                                  const CopyParameters &params)
>+{
>+    RendererVk *renderer = context->getRenderer();
>+
>+    ANGLE_TRY(ensureBufferCopyResourcesInitialized(context));
>+
>+    vk::CommandBuffer *commandBuffer;
>+    ANGLE_TRY(dest->recordCommands(context, &commandBuffer));
>+
>+    // Tell src we are going to read from it.
>+    src->onRead(dest, VK_ACCESS_SHADER_READ_BIT);
>+    // Tell dest it's being written to.
>+    dest->onWrite(VK_ACCESS_SHADER_WRITE_BIT);
>+
>+    const vk::Format &destFormat = dest->getViewFormat();
>+    const vk::Format &srcFormat  = src->getViewFormat();
>+
>+    ASSERT(destFormat.vkFormatIsInt == srcFormat.vkFormatIsInt);
>+    ASSERT(destFormat.vkFormatIsUnsigned == srcFormat.vkFormatIsUnsigned);
>+
>+    uint32_t flags = BufferUtils_comp::kIsCopy | GetBufferUtilsFlags(params.size, destFormat);
>+
>+    BufferUtilsShaderParams shaderParams;
>+    shaderParams.destOffset = params.destOffset;
>+    shaderParams.size       = params.size;
>+    shaderParams.srcOffset  = params.srcOffset;
>+
>+    VkDescriptorSet descriptorSet;
>+    vk::RefCountedDescriptorPoolBinding descriptorPoolBinding;
>+    ANGLE_TRY(mDescriptorPools[Function::BufferCopy].allocateSets(
>+        context, mDescriptorSetLayouts[Function::BufferCopy][kSetIndex].get().ptr(), 1,
>+        &descriptorPoolBinding, &descriptorSet));
>+    descriptorPoolBinding.get().updateSerial(context->getRenderer()->getCurrentQueueSerial());
>+
>+    VkWriteDescriptorSet writeInfo[2] = {};
>+
>+    writeInfo[0].sType            = VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET;
>+    writeInfo[0].dstSet           = descriptorSet;
>+    writeInfo[0].dstBinding       = kBufferCopyDestinationBinding;
>+    writeInfo[0].descriptorCount  = 1;
>+    writeInfo[0].descriptorType   = VK_DESCRIPTOR_TYPE_STORAGE_TEXEL_BUFFER;
>+    writeInfo[0].pTexelBufferView = dest->getBufferView().ptr();
>+
>+    writeInfo[1].sType            = VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET;
>+    writeInfo[1].dstSet           = descriptorSet;
>+    writeInfo[1].dstBinding       = kBufferCopySourceBinding;
>+    writeInfo[1].descriptorCount  = 1;
>+    writeInfo[1].descriptorType   = VK_DESCRIPTOR_TYPE_UNIFORM_TEXEL_BUFFER;
>+    writeInfo[1].pTexelBufferView = src->getBufferView().ptr();
>+
>+    vkUpdateDescriptorSets(context->getDevice(), 2, writeInfo, 0, nullptr);
>+
>+    vk::RefCounted<vk::ShaderAndSerial> *shader = nullptr;
>+    ANGLE_TRY(renderer->getShaderLibrary().getBufferUtils_comp(context, flags, &shader));
>+
>+    ANGLE_TRY(setupProgram(context, Function::BufferCopy, shader, nullptr,
>+                           &mBufferUtilsPrograms[flags], nullptr, descriptorSet, &shaderParams,
>+                           sizeof(shaderParams), commandBuffer));
>+
>+    commandBuffer->dispatch(UnsignedCeilDivide(params.size, 64), 1, 1);
>+
>+    descriptorPoolBinding.reset();
>+
>+    return angle::Result::Continue;
>+}
>+
>+angle::Result UtilsVk::convertVertexBuffer(vk::Context *context,
>+                                           vk::BufferHelper *dest,
>+                                           vk::BufferHelper *src,
>+                                           const ConvertVertexParameters &params)
>+{
>+    RendererVk *renderer = context->getRenderer();
>+
>+    ANGLE_TRY(ensureConvertVertexResourcesInitialized(context));
>+
>+    vk::CommandBuffer *commandBuffer;
>+    ANGLE_TRY(dest->recordCommands(context, &commandBuffer));
>+
>+    // Tell src we are going to read from it.
>+    src->onRead(dest, VK_ACCESS_SHADER_READ_BIT);
>+    // Tell dest it's being written to.
>+    dest->onWrite(VK_ACCESS_SHADER_WRITE_BIT);
>+
>+    ConvertVertexShaderParams shaderParams;
>+    shaderParams.Ns = params.srcFormat->channelCount();
>+    shaderParams.Bs = params.srcFormat->pixelBytes / params.srcFormat->channelCount();
>+    shaderParams.Ss = params.srcStride;
>+    shaderParams.Nd = params.destFormat->channelCount();
>+    shaderParams.Bd = params.destFormat->pixelBytes / params.destFormat->channelCount();
>+    shaderParams.Sd = shaderParams.Nd * shaderParams.Bd;
>+    // The component size is expected to either be 1, 2 or 4 bytes.
>+    ASSERT(4 % shaderParams.Bs == 0);
>+    ASSERT(4 % shaderParams.Bd == 0);
>+    shaderParams.Es = 4 / shaderParams.Bs;
>+    shaderParams.Ed = 4 / shaderParams.Bd;
>+    // Total number of output components is simply the number of vertices by number of components in
>+    // each.
>+    shaderParams.componentCount = params.vertexCount * shaderParams.Nd;
>+    // Total number of 4-byte outputs is the number of components divided by how many components can
>+    // fit in a 4-byte value.  Note that this value is also the invocation size of the shader.
>+    shaderParams.outputCount = shaderParams.componentCount / shaderParams.Ed;
>+    shaderParams.srcOffset   = params.srcOffset;
>+    shaderParams.destOffset  = params.destOffset;
>+
>+    uint32_t flags = GetConvertVertexFlags(params);
>+
>+    bool isAligned =
>+        shaderParams.outputCount % 64 == 0 && shaderParams.componentCount % shaderParams.Ed == 0;
>+    flags |= isAligned ? ConvertVertex_comp::kIsAligned : 0;
>+
>+    VkDescriptorSet descriptorSet;
>+    vk::RefCountedDescriptorPoolBinding descriptorPoolBinding;
>+    ANGLE_TRY(mDescriptorPools[Function::ConvertVertexBuffer].allocateSets(
>+        context, mDescriptorSetLayouts[Function::ConvertVertexBuffer][kSetIndex].get().ptr(), 1,
>+        &descriptorPoolBinding, &descriptorSet));
>+    descriptorPoolBinding.get().updateSerial(context->getRenderer()->getCurrentQueueSerial());
>+
>+    VkWriteDescriptorSet writeInfo    = {};
>+    VkDescriptorBufferInfo buffers[2] = {
>+        {dest->getBuffer().getHandle(), 0, VK_WHOLE_SIZE},
>+        {src->getBuffer().getHandle(), 0, VK_WHOLE_SIZE},
>+    };
>+    static_assert(kConvertVertexDestinationBinding + 1 == kConvertVertexSourceBinding,
>+                  "Update write info");
>+
>+    writeInfo.sType           = VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET;
>+    writeInfo.dstSet          = descriptorSet;
>+    writeInfo.dstBinding      = kConvertVertexDestinationBinding;
>+    writeInfo.descriptorCount = 2;
>+    writeInfo.descriptorType  = VK_DESCRIPTOR_TYPE_STORAGE_BUFFER;
>+    writeInfo.pBufferInfo     = buffers;
>+
>+    vkUpdateDescriptorSets(context->getDevice(), 1, &writeInfo, 0, nullptr);
>+
>+    vk::RefCounted<vk::ShaderAndSerial> *shader = nullptr;
>+    ANGLE_TRY(renderer->getShaderLibrary().getConvertVertex_comp(context, flags, &shader));
>+
>+    ANGLE_TRY(setupProgram(context, Function::ConvertVertexBuffer, shader, nullptr,
>+                           &mConvertVertexPrograms[flags], nullptr, descriptorSet, &shaderParams,
>+                           sizeof(shaderParams), commandBuffer));
>+
>+    commandBuffer->dispatch(UnsignedCeilDivide(shaderParams.outputCount, 64), 1, 1);
>+
>+    descriptorPoolBinding.reset();
>+
>+    return angle::Result::Continue;
>+}
>+
>+angle::Result UtilsVk::startRenderPass(ContextVk *contextVk,
>+                                       vk::ImageHelper *image,
>+                                       const vk::ImageView *imageView,
>+                                       const vk::RenderPassDesc &renderPassDesc,
>+                                       const gl::Rectangle &renderArea,
>+                                       vk::CommandBuffer **commandBufferOut)
>+{
>+    RendererVk *renderer = contextVk->getRenderer();
>+
>+    vk::RenderPass *compatibleRenderPass = nullptr;
>+    ANGLE_TRY(renderer->getCompatibleRenderPass(contextVk, renderPassDesc, &compatibleRenderPass));
>+
>+    VkFramebufferCreateInfo framebufferInfo = {};
>+
>+    // Minimize the framebuffer coverage to only cover up to the render area.
>+    framebufferInfo.sType           = VK_STRUCTURE_TYPE_FRAMEBUFFER_CREATE_INFO;
>+    framebufferInfo.flags           = 0;
>+    framebufferInfo.renderPass      = compatibleRenderPass->getHandle();
>+    framebufferInfo.attachmentCount = 1;
>+    framebufferInfo.pAttachments    = imageView->ptr();
>+    framebufferInfo.width           = renderArea.x + renderArea.width;
>+    framebufferInfo.height          = renderArea.y + renderArea.height;
>+    framebufferInfo.layers          = 1;
>+
>+    vk::Framebuffer framebuffer;
>+    ANGLE_VK_TRY(contextVk, framebuffer.init(contextVk->getDevice(), framebufferInfo));
>+
>+    vk::AttachmentOpsArray renderPassAttachmentOps;
>+    std::vector<VkClearValue> clearValues = {{}};
>+    ASSERT(clearValues.size() == 1);
>+
>+    renderPassAttachmentOps.initWithLoadStore(0, VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL,
>+                                              VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL);
>+
>+    ANGLE_TRY(image->beginRenderPass(contextVk, framebuffer, renderArea, renderPassDesc,
>+                                     renderPassAttachmentOps, clearValues, commandBufferOut));
>+
>+    renderer->releaseObject(renderer->getCurrentQueueSerial(), &framebuffer);
>+
>+    return angle::Result::Continue;
>+}
>+
>+angle::Result UtilsVk::clearFramebuffer(ContextVk *contextVk,
>+                                        FramebufferVk *framebuffer,
>+                                        const ClearFramebufferParameters &params)
>+{
>+    RendererVk *renderer = contextVk->getRenderer();
>+
>+    ANGLE_TRY(ensureImageClearResourcesInitialized(contextVk));
>+
>+    const gl::Rectangle &scissoredRenderArea = params.clearArea;
>+
>+    vk::CommandBuffer *commandBuffer;
>+    if (!framebuffer->appendToStartedRenderPass(renderer->getCurrentQueueSerial(),
>+                                                scissoredRenderArea, &commandBuffer))
>+    {
>+        ANGLE_TRY(framebuffer->startNewRenderPass(contextVk, scissoredRenderArea, &commandBuffer));
>+    }
>+
>+    ImageClearShaderParams shaderParams;
>+    shaderParams.clearValue = params.colorClearValue;
>+
>+    vk::GraphicsPipelineDesc pipelineDesc;
>+    pipelineDesc.initDefaults();
>+    pipelineDesc.setColorWriteMask(0, gl::DrawBufferMask());
>+    pipelineDesc.setSingleColorWriteMask(params.colorAttachmentIndex, params.colorMaskFlags);
>+    pipelineDesc.setRenderPassDesc(*params.renderPassDesc);
>+    // Note: depth test is disabled by default so this should be unnecessary, but works around an
>+    // Intel bug on windows.  http://anglebug.com/3348
>+    pipelineDesc.setDepthWriteEnabled(false);
>+
>+    // Clear stencil by enabling stencil write with the right mask.
>+    if (params.clearStencil)
>+    {
>+        const uint8_t compareMask       = 0xFF;
>+        const uint8_t clearStencilValue = params.stencilClearValue;
>+
>+        pipelineDesc.setStencilTestEnabled(true);
>+        pipelineDesc.setStencilFrontFuncs(clearStencilValue, VK_COMPARE_OP_ALWAYS, compareMask);
>+        pipelineDesc.setStencilBackFuncs(clearStencilValue, VK_COMPARE_OP_ALWAYS, compareMask);
>+        pipelineDesc.setStencilFrontOps(VK_STENCIL_OP_REPLACE, VK_STENCIL_OP_REPLACE,
>+                                        VK_STENCIL_OP_REPLACE);
>+        pipelineDesc.setStencilBackOps(VK_STENCIL_OP_REPLACE, VK_STENCIL_OP_REPLACE,
>+                                       VK_STENCIL_OP_REPLACE);
>+        pipelineDesc.setStencilFrontWriteMask(params.stencilMask);
>+        pipelineDesc.setStencilBackWriteMask(params.stencilMask);
>+    }
>+
>+    VkViewport viewport;
>+    gl::Rectangle completeRenderArea = framebuffer->getCompleteRenderArea();
>+    bool invertViewport              = contextVk->isViewportFlipEnabledForDrawFBO();
>+    gl_vk::GetViewport(completeRenderArea, 0.0f, 1.0f, invertViewport, params.renderAreaHeight,
>+                       &viewport);
>+    pipelineDesc.setViewport(viewport);
>+
>+    pipelineDesc.setScissor(gl_vk::GetRect(params.clearArea));
>+
>+    vk::ShaderLibrary &shaderLibrary                    = renderer->getShaderLibrary();
>+    vk::RefCounted<vk::ShaderAndSerial> *vertexShader   = nullptr;
>+    vk::RefCounted<vk::ShaderAndSerial> *fragmentShader = nullptr;
>+    vk::ShaderProgramHelper *imageClearProgram          = &mImageClearProgramVSOnly;
>+
>+    ANGLE_TRY(shaderLibrary.getFullScreenQuad_vert(contextVk, 0, &vertexShader));
>+    if (params.clearColor)
>+    {
>+        uint32_t flags = GetImageClearFlags(*params.colorFormat, params.colorAttachmentIndex);
>+        ANGLE_TRY(shaderLibrary.getImageClear_frag(contextVk, flags, &fragmentShader));
>+        imageClearProgram = &mImageClearProgram[flags];
>+    }
>+
>+    ANGLE_TRY(setupProgram(contextVk, Function::ImageClear, fragmentShader, vertexShader,
>+                           imageClearProgram, &pipelineDesc, VK_NULL_HANDLE, &shaderParams,
>+                           sizeof(shaderParams), commandBuffer));
>+    commandBuffer->draw(6, 0);
>+    return angle::Result::Continue;
>+}
>+
>+angle::Result UtilsVk::copyImage(ContextVk *contextVk,
>+                                 vk::ImageHelper *dest,
>+                                 const vk::ImageView *destView,
>+                                 vk::ImageHelper *src,
>+                                 const vk::ImageView *srcView,
>+                                 const CopyImageParameters &params)
>+{
>+    RendererVk *renderer = contextVk->getRenderer();
>+
>+    ANGLE_TRY(ensureImageCopyResourcesInitialized(contextVk));
>+
>+    const vk::Format &srcFormat  = src->getFormat();
>+    const vk::Format &destFormat = dest->getFormat();
>+
>+    ImageCopyShaderParams shaderParams;
>+    shaderParams.flipY            = params.srcFlipY || params.destFlipY;
>+    shaderParams.premultiplyAlpha = params.srcPremultiplyAlpha;
>+    shaderParams.unmultiplyAlpha  = params.srcUnmultiplyAlpha;
>+    shaderParams.destHasLuminance = destFormat.angleFormat().luminanceBits > 0;
>+    shaderParams.destIsAlpha =
>+        destFormat.angleFormat().isLUMA() && destFormat.angleFormat().alphaBits > 0;
>+    shaderParams.destDefaultChannelsMask = GetFormatDefaultChannelMask(destFormat);
>+    shaderParams.srcMip                  = params.srcMip;
>+    shaderParams.srcLayer                = params.srcLayer;
>+    shaderParams.srcOffset[0]            = params.srcOffset[0];
>+    shaderParams.srcOffset[1]            = params.srcOffset[1];
>+    shaderParams.destOffset[0]           = params.destOffset[0];
>+    shaderParams.destOffset[1]           = params.destOffset[1];
>+
>+    ASSERT(!(params.srcFlipY && params.destFlipY));
>+    if (params.srcFlipY)
>+    {
>+        // If viewport is flipped, the shader expects srcOffset[1] to have the
>+        // last row's index instead of the first's.
>+        shaderParams.srcOffset[1] = params.srcHeight - params.srcOffset[1] - 1;
>+    }
>+    else if (params.destFlipY)
>+    {
>+        // If image is flipped during copy, the shader uses the same code path as above,
>+        // with srcOffset being set to the last row's index instead of the first's.
>+        shaderParams.srcOffset[1] = params.srcOffset[1] + params.srcExtents[1] - 1;
>+    }
>+
>+    uint32_t flags = GetImageCopyFlags(srcFormat, destFormat);
>+    flags |= src->getLayerCount() > 1 ? ImageCopy_frag::kSrcIsArray : 0;
>+
>+    VkDescriptorSet descriptorSet;
>+    vk::RefCountedDescriptorPoolBinding descriptorPoolBinding;
>+    ANGLE_TRY(mDescriptorPools[Function::ImageCopy].allocateSets(
>+        contextVk, mDescriptorSetLayouts[Function::ImageCopy][kSetIndex].get().ptr(), 1,
>+        &descriptorPoolBinding, &descriptorSet));
>+    descriptorPoolBinding.get().updateSerial(contextVk->getRenderer()->getCurrentQueueSerial());
>+
>+    vk::RenderPassDesc renderPassDesc;
>+    renderPassDesc.setSamples(dest->getSamples());
>+    renderPassDesc.packAttachment(destFormat);
>+
>+    vk::GraphicsPipelineDesc pipelineDesc;
>+    pipelineDesc.initDefaults();
>+    pipelineDesc.setRenderPassDesc(renderPassDesc);
>+
>+    gl::Rectangle renderArea;
>+    renderArea.x      = params.destOffset[0];
>+    renderArea.y      = params.destOffset[1];
>+    renderArea.width  = params.srcExtents[0];
>+    renderArea.height = params.srcExtents[1];
>+
>+    VkViewport viewport;
>+    gl_vk::GetViewport(renderArea, 0.0f, 1.0f, false, dest->getExtents().height, &viewport);
>+    pipelineDesc.setViewport(viewport);
>+
>+    VkRect2D scissor = gl_vk::GetRect(renderArea);
>+    pipelineDesc.setScissor(scissor);
>+
>+    // Change source layout outside render pass
>+    if (src->isLayoutChangeNecessary(vk::ImageLayout::FragmentShaderReadOnly))
>+    {
>+        vk::CommandBuffer *srcLayoutChange;
>+        ANGLE_TRY(src->recordCommands(contextVk, &srcLayoutChange));
>+        src->changeLayout(VK_IMAGE_ASPECT_COLOR_BIT, vk::ImageLayout::FragmentShaderReadOnly,
>+                          srcLayoutChange);
>+    }
>+
>+    // Change destination layout outside render pass as well
>+    vk::CommandBuffer *destLayoutChange;
>+    ANGLE_TRY(dest->recordCommands(contextVk, &destLayoutChange));
>+
>+    dest->changeLayout(VK_IMAGE_ASPECT_COLOR_BIT, vk::ImageLayout::ColorAttachment,
>+                       destLayoutChange);
>+
>+    vk::CommandBuffer *commandBuffer;
>+    ANGLE_TRY(
>+        startRenderPass(contextVk, dest, destView, renderPassDesc, renderArea, &commandBuffer));
>+
>+    // Source's layout change should happen before rendering
>+    src->addReadDependency(dest);
>+
>+    VkDescriptorImageInfo imageInfo = {};
>+    imageInfo.imageView             = srcView->getHandle();
>+    imageInfo.imageLayout           = src->getCurrentLayout();
>+
>+    VkWriteDescriptorSet writeInfo = {};
>+    writeInfo.sType                = VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET;
>+    writeInfo.dstSet               = descriptorSet;
>+    writeInfo.dstBinding           = kImageCopySourceBinding;
>+    writeInfo.descriptorCount      = 1;
>+    writeInfo.descriptorType       = VK_DESCRIPTOR_TYPE_SAMPLED_IMAGE;
>+    writeInfo.pImageInfo           = &imageInfo;
>+
>+    vkUpdateDescriptorSets(contextVk->getDevice(), 1, &writeInfo, 0, nullptr);
>+
>+    vk::ShaderLibrary &shaderLibrary                    = renderer->getShaderLibrary();
>+    vk::RefCounted<vk::ShaderAndSerial> *vertexShader   = nullptr;
>+    vk::RefCounted<vk::ShaderAndSerial> *fragmentShader = nullptr;
>+    ANGLE_TRY(shaderLibrary.getFullScreenQuad_vert(contextVk, 0, &vertexShader));
>+    ANGLE_TRY(shaderLibrary.getImageCopy_frag(contextVk, flags, &fragmentShader));
>+
>+    ANGLE_TRY(setupProgram(contextVk, Function::ImageCopy, fragmentShader, vertexShader,
>+                           &mImageCopyPrograms[flags], &pipelineDesc, descriptorSet, &shaderParams,
>+                           sizeof(shaderParams), commandBuffer));
>+    commandBuffer->draw(6, 0);
>+    descriptorPoolBinding.reset();
>+
>+    return angle::Result::Continue;
>+}
>+
>+UtilsVk::ClearFramebufferParameters::ClearFramebufferParameters()
>+    : renderPassDesc(nullptr),
>+      renderAreaHeight(0),
>+      clearColor(false),
>+      clearStencil(false),
>+      stencilMask(0),
>+      colorMaskFlags(0),
>+      colorAttachmentIndex(0),
>+      colorFormat(nullptr),
>+      colorClearValue{},
>+      stencilClearValue(0)
>+{}
>+
>+}  // namespace rx
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/UtilsVk.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/UtilsVk.h
>new file mode 100644
>index 00000000000..9ccf5c14c06
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/UtilsVk.h
>@@ -0,0 +1,256 @@
>+//
>+// Copyright 2018 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// UtilsVk.h:
>+//    Defines the UtilsVk class, a helper for various internal draw/dispatch utilities such as
>+//    buffer clear and copy, image clear and copy, texture mip map generation, etc.
>+//
>+//    - Buffer clear: Implemented, but no current users
>+//    - Buffer copy:
>+//      * Used by VertexArrayVk::updateIndexTranslation() to convert a ubyte index array to ushort
>+//    - Convert vertex attribute:
>+//      * Used by VertexArrayVk::convertVertexBuffer() to convert vertex attributes from unsupported
>+//        formats to their fallbacks.
>+//    - Image clear: Used by FramebufferVk::clearWithDraw().
>+//    - Image copy: Not yet implemented
>+//    - Mipmap generation: Not yet implemented
>+//
>+
>+#ifndef LIBANGLE_RENDERER_VULKAN_UTILSVK_H_
>+#define LIBANGLE_RENDERER_VULKAN_UTILSVK_H_
>+
>+#include "libANGLE/renderer/vulkan/vk_cache_utils.h"
>+#include "libANGLE/renderer/vulkan/vk_helpers.h"
>+#include "libANGLE/renderer/vulkan/vk_internal_shaders_autogen.h"
>+
>+namespace rx
>+{
>+class UtilsVk : angle::NonCopyable
>+{
>+  public:
>+    UtilsVk();
>+    ~UtilsVk();
>+
>+    void destroy(VkDevice device);
>+
>+    struct ClearParameters
>+    {
>+        VkClearColorValue clearValue;
>+        size_t offset;
>+        size_t size;
>+    };
>+
>+    struct CopyParameters
>+    {
>+        size_t destOffset;
>+        size_t srcOffset;
>+        size_t size;
>+    };
>+
>+    struct ConvertVertexParameters
>+    {
>+        size_t vertexCount;
>+        const angle::Format *srcFormat;
>+        const angle::Format *destFormat;
>+        size_t srcStride;
>+        size_t srcOffset;
>+        size_t destOffset;
>+    };
>+
>+    struct ClearFramebufferParameters
>+    {
>+        // Satisfy chromium-style with a constructor that does what = {} was already doing in a
>+        // safer way.
>+        ClearFramebufferParameters();
>+
>+        const vk::RenderPassDesc *renderPassDesc;
>+        GLint renderAreaHeight;
>+        gl::Rectangle clearArea;
>+
>+        // Note that depth clear is never needed to be done with a draw call.
>+        bool clearColor;
>+        bool clearStencil;
>+
>+        uint8_t stencilMask;
>+        VkColorComponentFlags colorMaskFlags;
>+        uint32_t colorAttachmentIndex;
>+        const angle::Format *colorFormat;
>+
>+        VkClearColorValue colorClearValue;
>+        uint8_t stencilClearValue;
>+    };
>+
>+    struct CopyImageParameters
>+    {
>+        int srcOffset[2];
>+        int srcExtents[2];
>+        int destOffset[2];
>+        int srcMip;
>+        int srcLayer;
>+        int srcHeight;
>+        bool srcPremultiplyAlpha;
>+        bool srcUnmultiplyAlpha;
>+        bool srcFlipY;
>+        bool destFlipY;
>+    };
>+
>+    angle::Result clearBuffer(vk::Context *context,
>+                              vk::BufferHelper *dest,
>+                              const ClearParameters &params);
>+    angle::Result copyBuffer(vk::Context *context,
>+                             vk::BufferHelper *dest,
>+                             vk::BufferHelper *src,
>+                             const CopyParameters &params);
>+    angle::Result convertVertexBuffer(vk::Context *context,
>+                                      vk::BufferHelper *dest,
>+                                      vk::BufferHelper *src,
>+                                      const ConvertVertexParameters &params);
>+
>+    angle::Result clearFramebuffer(ContextVk *contextVk,
>+                                   FramebufferVk *framebuffer,
>+                                   const ClearFramebufferParameters &params);
>+
>+    angle::Result copyImage(ContextVk *contextVk,
>+                            vk::ImageHelper *dest,
>+                            const vk::ImageView *destView,
>+                            vk::ImageHelper *src,
>+                            const vk::ImageView *srcView,
>+                            const CopyImageParameters &params);
>+
>+  private:
>+    struct BufferUtilsShaderParams
>+    {
>+        // Structure matching PushConstants in BufferUtils.comp
>+        uint32_t destOffset          = 0;
>+        uint32_t size                = 0;
>+        uint32_t srcOffset           = 0;
>+        uint32_t padding             = 0;
>+        VkClearColorValue clearValue = {};
>+    };
>+
>+    struct ConvertVertexShaderParams
>+    {
>+        ConvertVertexShaderParams();
>+
>+        // Structure matching PushConstants in ConvertVertex.comp
>+        uint32_t outputCount    = 0;
>+        uint32_t componentCount = 0;
>+        uint32_t srcOffset      = 0;
>+        uint32_t destOffset     = 0;
>+        uint32_t Ns             = 0;
>+        uint32_t Bs             = 0;
>+        uint32_t Ss             = 0;
>+        uint32_t Es             = 0;
>+        uint32_t Nd             = 0;
>+        uint32_t Bd             = 0;
>+        uint32_t Sd             = 0;
>+        uint32_t Ed             = 0;
>+    };
>+
>+    struct ImageClearShaderParams
>+    {
>+        // Structure matching PushConstants in ImageClear.frag
>+        VkClearColorValue clearValue = {};
>+    };
>+
>+    struct ImageCopyShaderParams
>+    {
>+        ImageCopyShaderParams();
>+
>+        // Structure matching PushConstants in ImageCopy.frag
>+        int32_t srcOffset[2]             = {};
>+        int32_t destOffset[2]            = {};
>+        int32_t srcMip                   = 0;
>+        int32_t srcLayer                 = 0;
>+        uint32_t flipY                   = 0;
>+        uint32_t premultiplyAlpha        = 0;
>+        uint32_t unmultiplyAlpha         = 0;
>+        uint32_t destHasLuminance        = 0;
>+        uint32_t destIsAlpha             = 0;
>+        uint32_t destDefaultChannelsMask = 0;
>+    };
>+
>+    // Functions implemented by the class:
>+    enum class Function
>+    {
>+        // Functions implemented in graphics
>+        ImageClear = 0,
>+        ImageCopy  = 1,
>+
>+        // Functions implemented in compute
>+        ComputeStartIndex   = 2,  // Special value to separate draw and dispatch functions.
>+        BufferClear         = 2,
>+        BufferCopy          = 3,
>+        ConvertVertexBuffer = 4,
>+
>+        InvalidEnum = 5,
>+        EnumCount   = 5,
>+    };
>+
>+    // Common function that creates the pipeline for the specified function, binds it and prepares
>+    // the draw/dispatch call.  If function >= ComputeStartIndex, fsCsShader is expected to be a
>+    // compute shader, vsShader and pipelineDesc should be nullptr, and this will set up a dispatch
>+    // call. Otherwise fsCsShader is expected to be a fragment shader and this will set up a draw
>+    // call.
>+    angle::Result setupProgram(vk::Context *context,
>+                               Function function,
>+                               vk::RefCounted<vk::ShaderAndSerial> *fsCsShader,
>+                               vk::RefCounted<vk::ShaderAndSerial> *vsShader,
>+                               vk::ShaderProgramHelper *program,
>+                               const vk::GraphicsPipelineDesc *pipelineDesc,
>+                               const VkDescriptorSet descriptorSet,
>+                               const void *pushConstants,
>+                               size_t pushConstantsSize,
>+                               vk::CommandBuffer *commandBuffer);
>+
>+    // Initializes descriptor set layout, pipeline layout and descriptor pool corresponding to given
>+    // function, if not already initialized.  Uses setSizes to create the layout.  For example, if
>+    // this array has two entries {STORAGE_TEXEL_BUFFER, 1} and {UNIFORM_TEXEL_BUFFER, 3}, then the
>+    // created set layout would be binding 0 for storage texel buffer and bindings 1 through 3 for
>+    // uniform texel buffer.  All resources are put in set 0.
>+    angle::Result ensureResourcesInitialized(vk::Context *context,
>+                                             Function function,
>+                                             VkDescriptorPoolSize *setSizes,
>+                                             size_t setSizesCount,
>+                                             size_t pushConstantsSize);
>+
>+    // Initializers corresponding to functions, calling into ensureResourcesInitialized with the
>+    // appropriate parameters.
>+    angle::Result ensureBufferClearResourcesInitialized(vk::Context *context);
>+    angle::Result ensureBufferCopyResourcesInitialized(vk::Context *context);
>+    angle::Result ensureConvertVertexResourcesInitialized(vk::Context *context);
>+    angle::Result ensureImageClearResourcesInitialized(vk::Context *context);
>+    angle::Result ensureImageCopyResourcesInitialized(vk::Context *context);
>+
>+    angle::Result startRenderPass(ContextVk *contextVk,
>+                                  vk::ImageHelper *image,
>+                                  const vk::ImageView *imageView,
>+                                  const vk::RenderPassDesc &renderPassDesc,
>+                                  const gl::Rectangle &renderArea,
>+                                  vk::CommandBuffer **commandBufferOut);
>+
>+    angle::PackedEnumMap<Function, vk::DescriptorSetLayoutPointerArray> mDescriptorSetLayouts;
>+    angle::PackedEnumMap<Function, vk::BindingPointer<vk::PipelineLayout>> mPipelineLayouts;
>+    angle::PackedEnumMap<Function, vk::DynamicDescriptorPool> mDescriptorPools;
>+
>+    vk::ShaderProgramHelper
>+        mBufferUtilsPrograms[vk::InternalShader::BufferUtils_comp::kFlagsMask |
>+                             vk::InternalShader::BufferUtils_comp::kFunctionMask |
>+                             vk::InternalShader::BufferUtils_comp::kFormatMask];
>+    vk::ShaderProgramHelper
>+        mConvertVertexPrograms[vk::InternalShader::ConvertVertex_comp::kFlagsMask |
>+                               vk::InternalShader::ConvertVertex_comp::kConversionMask];
>+    vk::ShaderProgramHelper mImageClearProgramVSOnly;
>+    vk::ShaderProgramHelper
>+        mImageClearProgram[vk::InternalShader::ImageClear_frag::kAttachmentIndexMask |
>+                           vk::InternalShader::ImageClear_frag::kFormatMask];
>+    vk::ShaderProgramHelper mImageCopyPrograms[vk::InternalShader::ImageCopy_frag::kFlagsMask |
>+                                               vk::InternalShader::ImageCopy_frag::kSrcFormatMask |
>+                                               vk::InternalShader::ImageCopy_frag::kDestFormatMask];
>+};
>+
>+}  // namespace rx
>+
>+#endif  // LIBANGLE_RENDERER_VULKAN_UTILSVK_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/VertexArrayVk.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/VertexArrayVk.cpp
>index eab97496ea4..f5acd68efd1 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/VertexArrayVk.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/VertexArrayVk.cpp
>@@ -10,158 +10,709 @@
> #include "libANGLE/renderer/vulkan/VertexArrayVk.h"
> 
> #include "common/debug.h"
>-
>+#include "common/utilities.h"
> #include "libANGLE/Context.h"
> #include "libANGLE/renderer/vulkan/BufferVk.h"
>+#include "libANGLE/renderer/vulkan/CommandGraph.h"
> #include "libANGLE/renderer/vulkan/ContextVk.h"
>-#include "libANGLE/renderer/vulkan/formatutilsvk.h"
>+#include "libANGLE/renderer/vulkan/FramebufferVk.h"
>+#include "libANGLE/renderer/vulkan/RendererVk.h"
>+#include "libANGLE/renderer/vulkan/vk_format_utils.h"
>+#include "third_party/trace_event/trace_event.h"
> 
> namespace rx
> {
>+namespace
>+{
>+constexpr size_t kDynamicVertexDataSize    = 1024 * 1024;
>+constexpr size_t kDynamicIndexDataSize     = 1024 * 8;
>+constexpr size_t kMaxVertexFormatAlignment = 4;
>+constexpr VkBufferUsageFlags kVertexBufferUsageFlags =
>+    VK_BUFFER_USAGE_VERTEX_BUFFER_BIT | VK_BUFFER_USAGE_STORAGE_BUFFER_BIT;
>+constexpr VkBufferUsageFlags kIndexBufferUsageFlags = VK_BUFFER_USAGE_INDEX_BUFFER_BIT |
>+                                                      VK_BUFFER_USAGE_UNIFORM_TEXEL_BUFFER_BIT |
>+                                                      VK_BUFFER_USAGE_STORAGE_TEXEL_BUFFER_BIT;
> 
>-VertexArrayVk::VertexArrayVk(const gl::VertexArrayState &state)
>-    : VertexArrayImpl(state),
>-      mCurrentVertexBufferHandlesCache(state.getMaxAttribs(), VK_NULL_HANDLE),
>-      mCurrentVkBuffersCache(state.getMaxAttribs(), nullptr),
>-      mCurrentVertexDescsValid(false)
>+ANGLE_INLINE bool BindingIsAligned(const gl::VertexBinding &binding,
>+                                   const angle::Format &angleFormat,
>+                                   unsigned int attribSize)
> {
>-    mCurrentVertexBindingDescs.reserve(state.getMaxAttribs());
>-    mCurrentVertexAttribDescs.reserve(state.getMaxAttribs());
>+    GLuint mask = angleFormat.componentAlignmentMask;
>+    if (mask != std::numeric_limits<GLuint>::max())
>+    {
>+        return ((binding.getOffset() & mask) == 0 && (binding.getStride() & mask) == 0);
>+    }
>+    else
>+    {
>+        unsigned int formatSize = angleFormat.pixelBytes;
>+        return ((binding.getOffset() * attribSize) % formatSize == 0) &&
>+               ((binding.getStride() * attribSize) % formatSize == 0);
>+    }
>+}
>+
>+angle::Result StreamVertexData(ContextVk *contextVk,
>+                               vk::DynamicBuffer *dynamicBuffer,
>+                               const uint8_t *sourceData,
>+                               size_t bytesToAllocate,
>+                               size_t destOffset,
>+                               size_t vertexCount,
>+                               size_t stride,
>+                               VertexCopyFunction vertexLoadFunction,
>+                               vk::BufferHelper **bufferOut,
>+                               VkDeviceSize *bufferOffsetOut)
>+{
>+    uint8_t *dst = nullptr;
>+    ANGLE_TRY(dynamicBuffer->allocate(contextVk, bytesToAllocate, &dst, nullptr, bufferOffsetOut,
>+                                      nullptr));
>+    *bufferOut = dynamicBuffer->getCurrentBuffer();
>+    dst += destOffset;
>+    vertexLoadFunction(sourceData, stride, vertexCount, dst);
>+
>+    ANGLE_TRY(dynamicBuffer->flush(contextVk));
>+    return angle::Result::Continue;
> }
> 
>-VertexArrayVk::~VertexArrayVk()
>+size_t GetVertexCount(BufferVk *srcBuffer, const gl::VertexBinding &binding, uint32_t srcFormatSize)
> {
>+    // Bytes usable for vertex data.
>+    GLint64 bytes = srcBuffer->getSize() - binding.getOffset();
>+    if (bytes < srcFormatSize)
>+        return 0;
>+
>+    // Count the last vertex.  It may occupy less than a full stride.
>+    size_t numVertices = 1;
>+    bytes -= srcFormatSize;
>+
>+    // Count how many strides fit remaining space.
>+    if (bytes > 0)
>+        numVertices += static_cast<size_t>(bytes) / binding.getStride();
>+
>+    return numVertices;
>+}
>+}  // anonymous namespace
>+
>+#define INIT                                    \
>+    {                                           \
>+        kVertexBufferUsageFlags, 1024 * 8, true \
>+    }
>+
>+VertexArrayVk::VertexArrayVk(ContextVk *contextVk, const gl::VertexArrayState &state)
>+    : VertexArrayImpl(state),
>+      mCurrentArrayBufferHandles{},
>+      mCurrentArrayBufferOffsets{},
>+      mCurrentArrayBuffers{},
>+      mCurrentArrayBufferConversion{{
>+          INIT,
>+          INIT,
>+          INIT,
>+          INIT,
>+          INIT,
>+          INIT,
>+          INIT,
>+          INIT,
>+          INIT,
>+          INIT,
>+          INIT,
>+          INIT,
>+          INIT,
>+          INIT,
>+          INIT,
>+          INIT,
>+      }},
>+      mCurrentArrayBufferConversionCanRelease{},
>+      mCurrentElementArrayBufferOffset(0),
>+      mCurrentElementArrayBuffer(nullptr),
>+      mDynamicVertexData(kVertexBufferUsageFlags, kDynamicVertexDataSize, true),
>+      mDynamicIndexData(kIndexBufferUsageFlags, kDynamicIndexDataSize, true),
>+      mTranslatedByteIndexData(kIndexBufferUsageFlags, kDynamicIndexDataSize, true),
>+      mLineLoopHelper(contextVk->getRenderer()),
>+      mDirtyLineLoopTranslation(true)
>+{
>+    RendererVk *renderer = contextVk->getRenderer();
>+
>+    VkBufferCreateInfo createInfo = {};
>+    createInfo.sType              = VK_STRUCTURE_TYPE_BUFFER_CREATE_INFO;
>+    createInfo.size               = 16;
>+    createInfo.usage              = VK_BUFFER_USAGE_VERTEX_BUFFER_BIT;
>+    (void)mTheNullBuffer.init(contextVk, createInfo, VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT);
>+
>+    mCurrentArrayBufferHandles.fill(mTheNullBuffer.getBuffer().getHandle());
>+    mCurrentArrayBufferOffsets.fill(0);
>+    mCurrentArrayBuffers.fill(&mTheNullBuffer);
>+
>+    for (vk::DynamicBuffer &buffer : mCurrentArrayBufferConversion)
>+    {
>+        buffer.init(kMaxVertexFormatAlignment, renderer);
>+    }
>+    mDynamicVertexData.init(kMaxVertexFormatAlignment, renderer);
>+    mDynamicIndexData.init(1, renderer);
>+    mTranslatedByteIndexData.init(1, renderer);
> }
> 
>+VertexArrayVk::~VertexArrayVk() {}
>+
> void VertexArrayVk::destroy(const gl::Context *context)
> {
>+    RendererVk *renderer = vk::GetImpl(context)->getRenderer();
>+
>+    mTheNullBuffer.release(renderer);
>+
>+    for (vk::DynamicBuffer &buffer : mCurrentArrayBufferConversion)
>+    {
>+        buffer.release(renderer);
>+    }
>+    mDynamicVertexData.release(renderer);
>+    mDynamicIndexData.release(renderer);
>+    mTranslatedByteIndexData.release(renderer);
>+    mLineLoopHelper.release(renderer);
>+}
>+
>+angle::Result VertexArrayVk::streamIndexData(ContextVk *contextVk,
>+                                             gl::DrawElementsType indexType,
>+                                             size_t indexCount,
>+                                             const void *sourcePointer,
>+                                             vk::DynamicBuffer *dynamicBuffer)
>+{
>+    ASSERT(!mState.getElementArrayBuffer() || indexType == gl::DrawElementsType::UnsignedByte);
>+
>+    dynamicBuffer->releaseRetainedBuffers(contextVk->getRenderer());
>+
>+    const size_t amount = sizeof(GLushort) * indexCount;
>+    GLubyte *dst        = nullptr;
>+
>+    ANGLE_TRY(dynamicBuffer->allocate(contextVk, amount, &dst, nullptr,
>+                                      &mCurrentElementArrayBufferOffset, nullptr));
>+    mCurrentElementArrayBuffer = dynamicBuffer->getCurrentBuffer();
>+    if (indexType == gl::DrawElementsType::UnsignedByte)
>+    {
>+        // Unsigned bytes don't have direct support in Vulkan so we have to expand the
>+        // memory to a GLushort.
>+        const GLubyte *in     = static_cast<const GLubyte *>(sourcePointer);
>+        GLushort *expandedDst = reinterpret_cast<GLushort *>(dst);
>+        for (size_t index = 0; index < indexCount; index++)
>+        {
>+            expandedDst[index] = static_cast<GLushort>(in[index]);
>+        }
>+    }
>+    else
>+    {
>+        memcpy(dst, sourcePointer, amount);
>+    }
>+    ANGLE_TRY(dynamicBuffer->flush(contextVk));
>+    return angle::Result::Continue;
> }
> 
>-void VertexArrayVk::syncState(const gl::Context *context,
>-                              const gl::VertexArray::DirtyBits &dirtyBits)
>+// We assume the buffer is completely full of the same kind of data and convert
>+// and/or align it as we copy it to a DynamicBuffer. The assumption could be wrong
>+// but the alternative of copying it piecemeal on each draw would have a lot more
>+// overhead.
>+angle::Result VertexArrayVk::convertVertexBufferGpu(ContextVk *contextVk,
>+                                                    BufferVk *srcBuffer,
>+                                                    const gl::VertexBinding &binding,
>+                                                    size_t attribIndex,
>+                                                    const vk::Format &vertexFormat)
>+{
>+    RendererVk *renderer = contextVk->getRenderer();
>+
>+    const angle::Format &srcFormat  = vertexFormat.angleFormat();
>+    const angle::Format &destFormat = vertexFormat.bufferFormat();
>+
>+    ASSERT(binding.getStride() % (srcFormat.pixelBytes / srcFormat.channelCount()) == 0);
>+
>+    unsigned srcFormatSize  = srcFormat.pixelBytes;
>+    unsigned destFormatSize = destFormat.pixelBytes;
>+
>+    size_t numVertices = GetVertexCount(srcBuffer, binding, srcFormatSize);
>+    if (numVertices == 0)
>+    {
>+        return angle::Result::Continue;
>+    }
>+
>+    ASSERT(GetVertexInputAlignment(vertexFormat) <= kMaxVertexFormatAlignment);
>+
>+    // Allocate buffer for results
>+    mCurrentArrayBufferConversion[attribIndex].releaseRetainedBuffers(renderer);
>+    ANGLE_TRY(mCurrentArrayBufferConversion[attribIndex].allocate(
>+        contextVk, numVertices * destFormatSize, nullptr, nullptr,
>+        &mCurrentArrayBufferOffsets[attribIndex], nullptr));
>+    mCurrentArrayBuffers[attribIndex] =
>+        mCurrentArrayBufferConversion[attribIndex].getCurrentBuffer();
>+
>+    UtilsVk::ConvertVertexParameters params;
>+    params.vertexCount = numVertices;
>+    params.srcFormat   = &srcFormat;
>+    params.destFormat  = &destFormat;
>+    params.srcStride   = binding.getStride();
>+    params.srcOffset   = binding.getOffset();
>+    params.destOffset  = static_cast<size_t>(mCurrentArrayBufferOffsets[attribIndex]);
>+
>+    ANGLE_TRY(renderer->getUtils().convertVertexBuffer(contextVk, mCurrentArrayBuffers[attribIndex],
>+                                                       &srcBuffer->getBuffer(), params));
>+
>+    mCurrentArrayBufferHandles[attribIndex] =
>+        mCurrentArrayBuffers[attribIndex]->getBuffer().getHandle();
>+    mCurrentArrayBufferConversionCanRelease[attribIndex] = true;
>+
>+    return angle::Result::Continue;
>+}
>+
>+angle::Result VertexArrayVk::convertVertexBufferCpu(ContextVk *contextVk,
>+                                                    BufferVk *srcBuffer,
>+                                                    const gl::VertexBinding &binding,
>+                                                    size_t attribIndex,
>+                                                    const vk::Format &vertexFormat)
>+{
>+    TRACE_EVENT0("gpu.angle", "VertexArrayVk::convertVertexBufferCpu");
>+    // Needed before reading buffer or we could get stale data.
>+    ANGLE_TRY(contextVk->finishImpl());
>+
>+    unsigned srcFormatSize = vertexFormat.angleFormat().pixelBytes;
>+    unsigned dstFormatSize = vertexFormat.bufferFormat().pixelBytes;
>+
>+    mCurrentArrayBufferConversion[attribIndex].releaseRetainedBuffers(contextVk->getRenderer());
>+
>+    size_t numVertices = GetVertexCount(srcBuffer, binding, srcFormatSize);
>+    if (numVertices == 0)
>+    {
>+        return angle::Result::Continue;
>+    }
>+
>+    void *src = nullptr;
>+    ANGLE_TRY(srcBuffer->mapImpl(contextVk, &src));
>+    const uint8_t *srcBytes = reinterpret_cast<const uint8_t *>(src);
>+    srcBytes += binding.getOffset();
>+    ASSERT(GetVertexInputAlignment(vertexFormat) <= kMaxVertexFormatAlignment);
>+    ANGLE_TRY(StreamVertexData(contextVk, &mCurrentArrayBufferConversion[attribIndex], srcBytes,
>+                               numVertices * dstFormatSize, 0, numVertices, binding.getStride(),
>+                               vertexFormat.vertexLoadFunction, &mCurrentArrayBuffers[attribIndex],
>+                               &mCurrentArrayBufferOffsets[attribIndex]));
>+    ANGLE_TRY(srcBuffer->unmapImpl(contextVk));
>+
>+    mCurrentArrayBufferHandles[attribIndex] =
>+        mCurrentArrayBuffers[attribIndex]->getBuffer().getHandle();
>+    mCurrentArrayBufferConversionCanRelease[attribIndex] = true;
>+
>+    return angle::Result::Continue;
>+}
>+
>+ANGLE_INLINE void VertexArrayVk::ensureConversionReleased(RendererVk *renderer, size_t attribIndex)
>+{
>+    if (mCurrentArrayBufferConversionCanRelease[attribIndex])
>+    {
>+        mCurrentArrayBufferConversion[attribIndex].release(renderer);
>+        mCurrentArrayBufferConversionCanRelease[attribIndex] = false;
>+    }
>+}
>+
>+angle::Result VertexArrayVk::syncState(const gl::Context *context,
>+                                       const gl::VertexArray::DirtyBits &dirtyBits,
>+                                       gl::VertexArray::DirtyAttribBitsArray *attribBits,
>+                                       gl::VertexArray::DirtyBindingBitsArray *bindingBits)
> {
>     ASSERT(dirtyBits.any());
> 
>-    // Invalidate current pipeline.
>-    // TODO(jmadill): Use pipeline cache.
>-    ContextVk *contextVk = vk::GetImpl(context);
>-    contextVk->invalidateCurrentPipeline();
>+    bool invalidateContext = false;
> 
>-    // Invalidate the vertex descriptions.
>-    invalidateVertexDescriptions();
>+    ContextVk *contextVk = vk::GetImpl(context);
> 
>     // Rebuild current attribute buffers cache. This will fail horribly if the buffer changes.
>     // TODO(jmadill): Handle buffer storage changes.
>     const auto &attribs  = mState.getVertexAttributes();
>     const auto &bindings = mState.getVertexBindings();
> 
>-    for (auto dirtyBit : dirtyBits)
>+    for (size_t dirtyBit : dirtyBits)
>+    {
>+        switch (dirtyBit)
>+        {
>+            case gl::VertexArray::DIRTY_BIT_ELEMENT_ARRAY_BUFFER:
>+            {
>+                gl::Buffer *bufferGL = mState.getElementArrayBuffer();
>+                if (bufferGL)
>+                {
>+                    BufferVk *bufferVk         = vk::GetImpl(bufferGL);
>+                    mCurrentElementArrayBuffer = &bufferVk->getBuffer();
>+                }
>+                else
>+                {
>+                    mCurrentElementArrayBuffer = nullptr;
>+                }
>+
>+                mCurrentElementArrayBufferOffset = 0;
>+                mLineLoopBufferFirstIndex.reset();
>+                mLineLoopBufferLastIndex.reset();
>+                contextVk->setIndexBufferDirty();
>+                mDirtyLineLoopTranslation = true;
>+                break;
>+            }
>+
>+            case gl::VertexArray::DIRTY_BIT_ELEMENT_ARRAY_BUFFER_DATA:
>+                mLineLoopBufferFirstIndex.reset();
>+                mLineLoopBufferLastIndex.reset();
>+                mDirtyLineLoopTranslation = true;
>+                break;
>+
>+#define ANGLE_VERTEX_DIRTY_ATTRIB_FUNC(INDEX)                                     \
>+    case gl::VertexArray::DIRTY_BIT_ATTRIB_0 + INDEX:                             \
>+        ANGLE_TRY(syncDirtyAttrib(contextVk, attribs[INDEX],                      \
>+                                  bindings[attribs[INDEX].bindingIndex], INDEX)); \
>+        invalidateContext = true;                                                 \
>+        (*attribBits)[INDEX].reset();                                             \
>+        break;
>+
>+                ANGLE_VERTEX_INDEX_CASES(ANGLE_VERTEX_DIRTY_ATTRIB_FUNC)
>+
>+#define ANGLE_VERTEX_DIRTY_BINDING_FUNC(INDEX)                                    \
>+    case gl::VertexArray::DIRTY_BIT_BINDING_0 + INDEX:                            \
>+        ANGLE_TRY(syncDirtyAttrib(contextVk, attribs[INDEX],                      \
>+                                  bindings[attribs[INDEX].bindingIndex], INDEX)); \
>+        invalidateContext = true;                                                 \
>+        (*bindingBits)[INDEX].reset();                                            \
>+        break;
>+
>+                ANGLE_VERTEX_INDEX_CASES(ANGLE_VERTEX_DIRTY_BINDING_FUNC)
>+
>+#define ANGLE_VERTEX_DIRTY_BUFFER_DATA_FUNC(INDEX)                                \
>+    case gl::VertexArray::DIRTY_BIT_BUFFER_DATA_0 + INDEX:                        \
>+        ANGLE_TRY(syncDirtyAttrib(contextVk, attribs[INDEX],                      \
>+                                  bindings[attribs[INDEX].bindingIndex], INDEX)); \
>+        break;
>+
>+                ANGLE_VERTEX_INDEX_CASES(ANGLE_VERTEX_DIRTY_BUFFER_DATA_FUNC)
>+
>+            default:
>+                UNREACHABLE();
>+                break;
>+        }
>+    }
>+
>+    if (invalidateContext)
>     {
>-        if (dirtyBit == gl::VertexArray::DIRTY_BIT_ELEMENT_ARRAY_BUFFER)
>-            continue;
>+        contextVk->invalidateVertexAndIndexBuffers();
>+    }
> 
>-        size_t attribIndex = gl::VertexArray::GetVertexIndexFromDirtyBit(dirtyBit);
>+    return angle::Result::Continue;
>+}
> 
>-        const auto &attrib  = attribs[attribIndex];
>-        const auto &binding = bindings[attrib.bindingIndex];
>+ANGLE_INLINE void VertexArrayVk::setDefaultPackedInput(ContextVk *contextVk, size_t attribIndex)
>+{
>+    contextVk->onVertexAttributeChange(attribIndex, 0, 0, VK_FORMAT_R32G32B32A32_SFLOAT, 0);
>+}
>+
>+angle::Result VertexArrayVk::syncDirtyAttrib(ContextVk *contextVk,
>+                                             const gl::VertexAttribute &attrib,
>+                                             const gl::VertexBinding &binding,
>+                                             size_t attribIndex)
>+{
>+    RendererVk *renderer               = contextVk->getRenderer();
>+    bool anyVertexBufferConvertedOnGpu = false;
>+
>+    if (attrib.enabled)
>+    {
>+        gl::Buffer *bufferGL           = binding.getBuffer().get();
>+        const vk::Format &vertexFormat = renderer->getFormat(GetVertexFormatID(attrib));
>+        GLuint stride;
> 
>-        if (attrib.enabled)
>+        if (bufferGL)
>         {
>-            gl::Buffer *bufferGL = binding.getBuffer().get();
>+            BufferVk *bufferVk               = vk::GetImpl(bufferGL);
>+            const angle::Format &angleFormat = vertexFormat.angleFormat();
>+            bool bindingIsAligned            = BindingIsAligned(binding, angleFormat, attrib.size);
> 
>-            if (bufferGL)
>+            if (vertexFormat.vertexLoadRequiresConversion || !bindingIsAligned)
>             {
>-                BufferVk *bufferVk                            = vk::GetImpl(bufferGL);
>-                mCurrentVkBuffersCache[attribIndex]           = bufferVk;
>-                mCurrentVertexBufferHandlesCache[attribIndex] = bufferVk->getVkBuffer().getHandle();
>+                stride = vertexFormat.bufferFormat().pixelBytes;
>+
>+                if (bindingIsAligned)
>+                {
>+                    ANGLE_TRY(convertVertexBufferGpu(contextVk, bufferVk, binding, attribIndex,
>+                                                     vertexFormat));
>+                    anyVertexBufferConvertedOnGpu = true;
>+                }
>+                else
>+                {
>+                    ANGLE_TRY(convertVertexBufferCpu(contextVk, bufferVk, binding, attribIndex,
>+                                                     vertexFormat));
>+                }
>             }
>             else
>             {
>-                mCurrentVkBuffersCache[attribIndex]           = nullptr;
>-                mCurrentVertexBufferHandlesCache[attribIndex] = VK_NULL_HANDLE;
>+                if (bufferVk->getSize() == 0)
>+                {
>+                    mCurrentArrayBuffers[attribIndex] = &mTheNullBuffer;
>+                    mCurrentArrayBufferHandles[attribIndex] =
>+                        mTheNullBuffer.getBuffer().getHandle();
>+                    mCurrentArrayBufferOffsets[attribIndex] = 0;
>+                    stride                                  = 0;
>+                }
>+                else
>+                {
>+                    mCurrentArrayBuffers[attribIndex] = &bufferVk->getBuffer();
>+                    mCurrentArrayBufferHandles[attribIndex] =
>+                        bufferVk->getBuffer().getBuffer().getHandle();
>+                    mCurrentArrayBufferOffsets[attribIndex] = binding.getOffset();
>+                    stride                                  = binding.getStride();
>+                }
>+
>+                ensureConversionReleased(renderer, attribIndex);
>             }
>         }
>         else
>         {
>-            UNIMPLEMENTED();
>+            mCurrentArrayBuffers[attribIndex]       = &mTheNullBuffer;
>+            mCurrentArrayBufferHandles[attribIndex] = mTheNullBuffer.getBuffer().getHandle();
>+            mCurrentArrayBufferOffsets[attribIndex] = 0;
>+            stride                                  = vertexFormat.bufferFormat().pixelBytes;
>+            ensureConversionReleased(renderer, attribIndex);
>         }
>+
>+        contextVk->onVertexAttributeChange(attribIndex, stride, binding.getDivisor(),
>+                                           vertexFormat.vkBufferFormat, attrib.relativeOffset);
>     }
>-}
>+    else
>+    {
>+        contextVk->invalidateDefaultAttribute(attribIndex);
> 
>-const std::vector<VkBuffer> &VertexArrayVk::getCurrentVertexBufferHandlesCache() const
>-{
>-    return mCurrentVertexBufferHandlesCache;
>-}
>+        // These will be filled out by the ContextVk.
>+        mCurrentArrayBuffers[attribIndex]       = &mTheNullBuffer;
>+        mCurrentArrayBufferHandles[attribIndex] = mTheNullBuffer.getBuffer().getHandle();
>+        mCurrentArrayBufferOffsets[attribIndex] = 0;
> 
>-void VertexArrayVk::updateCurrentBufferSerials(const gl::AttributesMask &activeAttribsMask,
>-                                               Serial serial)
>-{
>-    for (auto attribIndex : activeAttribsMask)
>+        setDefaultPackedInput(contextVk, attribIndex);
>+        ensureConversionReleased(renderer, attribIndex);
>+    }
>+
>+    if (anyVertexBufferConvertedOnGpu && renderer->getFeatures().flushAfterVertexConversion)
>     {
>-        mCurrentVkBuffersCache[attribIndex]->setQueueSerial(serial);
>+        ANGLE_TRY(contextVk->flushImpl());
>     }
>-}
> 
>-void VertexArrayVk::invalidateVertexDescriptions()
>-{
>-    mCurrentVertexDescsValid = false;
>-    mCurrentVertexBindingDescs.clear();
>-    mCurrentVertexAttribDescs.clear();
>+    return angle::Result::Continue;
> }
> 
>-void VertexArrayVk::updateVertexDescriptions(const gl::Context *context)
>+angle::Result VertexArrayVk::updateClientAttribs(const gl::Context *context,
>+                                                 GLint firstVertex,
>+                                                 GLsizei vertexOrIndexCount,
>+                                                 GLsizei instanceCount,
>+                                                 gl::DrawElementsType indexTypeOrInvalid,
>+                                                 const void *indices)
> {
>-    if (mCurrentVertexDescsValid)
>-    {
>-        return;
>-    }
>+    ContextVk *contextVk                    = vk::GetImpl(context);
>+    const gl::AttributesMask &clientAttribs = context->getStateCache().getActiveClientAttribsMask();
>+
>+    ASSERT(clientAttribs.any());
>+
>+    GLint startVertex;
>+    size_t vertexCount;
>+    ANGLE_TRY(GetVertexRangeInfo(context, firstVertex, vertexOrIndexCount, indexTypeOrInvalid,
>+                                 indices, 0, &startVertex, &vertexCount));
>+
>+    RendererVk *renderer = contextVk->getRenderer();
>+    mDynamicVertexData.releaseRetainedBuffers(renderer);
> 
>     const auto &attribs  = mState.getVertexAttributes();
>     const auto &bindings = mState.getVertexBindings();
> 
>-    const gl::Program *programGL = context->getGLState().getProgram();
>-
>-    for (auto attribIndex : programGL->getActiveAttribLocationsMask())
>+    // TODO(fjhenigman): When we have a bunch of interleaved attributes, they end up
>+    // un-interleaved, wasting space and copying time.  Consider improving on that.
>+    for (size_t attribIndex : clientAttribs)
>     {
>-        const auto &attrib  = attribs[attribIndex];
>-        const auto &binding = bindings[attrib.bindingIndex];
>-        if (attrib.enabled)
>+        const gl::VertexAttribute &attrib = attribs[attribIndex];
>+        const gl::VertexBinding &binding  = bindings[attrib.bindingIndex];
>+        ASSERT(attrib.enabled && binding.getBuffer().get() == nullptr);
>+
>+        const vk::Format &vertexFormat = renderer->getFormat(GetVertexFormatID(attrib));
>+        GLuint stride                  = vertexFormat.bufferFormat().pixelBytes;
>+
>+        ASSERT(GetVertexInputAlignment(vertexFormat) <= kMaxVertexFormatAlignment);
>+
>+        const uint8_t *src = static_cast<const uint8_t *>(attrib.pointer);
>+        if (binding.getDivisor() > 0)
>         {
>-            VkVertexInputBindingDescription bindingDesc;
>-            bindingDesc.binding = static_cast<uint32_t>(mCurrentVertexBindingDescs.size());
>-            bindingDesc.stride  = static_cast<uint32_t>(gl::ComputeVertexAttributeTypeSize(attrib));
>-            bindingDesc.inputRate = (binding.getDivisor() > 0 ? VK_VERTEX_INPUT_RATE_INSTANCE
>-                                                              : VK_VERTEX_INPUT_RATE_VERTEX);
>-
>-            gl::VertexFormatType vertexFormatType = gl::GetVertexFormatType(attrib);
>-
>-            VkVertexInputAttributeDescription attribDesc;
>-            attribDesc.binding  = bindingDesc.binding;
>-            attribDesc.format   = vk::GetNativeVertexFormat(vertexFormatType);
>-            attribDesc.location = static_cast<uint32_t>(attribIndex);
>-            attribDesc.offset =
>-                static_cast<uint32_t>(ComputeVertexAttributeOffset(attrib, binding));
>-
>-            mCurrentVertexBindingDescs.push_back(bindingDesc);
>-            mCurrentVertexAttribDescs.push_back(attribDesc);
>+            // instanced attrib
>+            size_t count           = UnsignedCeilDivide(instanceCount, binding.getDivisor());
>+            size_t bytesToAllocate = count * stride;
>+
>+            ANGLE_TRY(StreamVertexData(contextVk, &mDynamicVertexData, src, bytesToAllocate, 0,
>+                                       count, binding.getStride(), vertexFormat.vertexLoadFunction,
>+                                       &mCurrentArrayBuffers[attribIndex],
>+                                       &mCurrentArrayBufferOffsets[attribIndex]));
>         }
>         else
>         {
>-            UNIMPLEMENTED();
>+            // Allocate space for startVertex + vertexCount so indexing will work.  If we don't
>+            // start at zero all the indices will be off.
>+            // Only vertexCount vertices will be used by the upcoming draw so that is all we copy.
>+            size_t bytesToAllocate = (startVertex + vertexCount) * stride;
>+            src += startVertex * binding.getStride();
>+            size_t destOffset = startVertex * stride;
>+
>+            ANGLE_TRY(StreamVertexData(
>+                contextVk, &mDynamicVertexData, src, bytesToAllocate, destOffset, vertexCount,
>+                binding.getStride(), vertexFormat.vertexLoadFunction,
>+                &mCurrentArrayBuffers[attribIndex], &mCurrentArrayBufferOffsets[attribIndex]));
>         }
>+
>+        mCurrentArrayBufferHandles[attribIndex] =
>+            mCurrentArrayBuffers[attribIndex]->getBuffer().getHandle();
>     }
> 
>-    mCurrentVertexDescsValid = true;
>+    return angle::Result::Continue;
> }
> 
>-const std::vector<VkVertexInputBindingDescription> &VertexArrayVk::getVertexBindingDescs() const
>+angle::Result VertexArrayVk::handleLineLoop(ContextVk *contextVk,
>+                                            GLint firstVertex,
>+                                            GLsizei vertexOrIndexCount,
>+                                            gl::DrawElementsType indexTypeOrInvalid,
>+                                            const void *indices)
> {
>-    return mCurrentVertexBindingDescs;
>+    if (indexTypeOrInvalid != gl::DrawElementsType::InvalidEnum)
>+    {
>+        // Handle GL_LINE_LOOP drawElements.
>+        if (mDirtyLineLoopTranslation)
>+        {
>+            gl::Buffer *elementArrayBuffer = mState.getElementArrayBuffer();
>+
>+            if (!elementArrayBuffer)
>+            {
>+                ANGLE_TRY(mLineLoopHelper.streamIndices(
>+                    contextVk, indexTypeOrInvalid, vertexOrIndexCount,
>+                    reinterpret_cast<const uint8_t *>(indices), &mCurrentElementArrayBuffer,
>+                    &mCurrentElementArrayBufferOffset));
>+            }
>+            else
>+            {
>+                // When using an element array buffer, 'indices' is an offset to the first element.
>+                intptr_t offset                = reinterpret_cast<intptr_t>(indices);
>+                BufferVk *elementArrayBufferVk = vk::GetImpl(elementArrayBuffer);
>+                ANGLE_TRY(mLineLoopHelper.getIndexBufferForElementArrayBuffer(
>+                    contextVk, elementArrayBufferVk, indexTypeOrInvalid, vertexOrIndexCount, offset,
>+                    &mCurrentElementArrayBuffer, &mCurrentElementArrayBufferOffset));
>+            }
>+        }
>+
>+        // If we've had a drawArrays call with a line loop before, we want to make sure this is
>+        // invalidated the next time drawArrays is called since we use the same index buffer for
>+        // both calls.
>+        mLineLoopBufferFirstIndex.reset();
>+        mLineLoopBufferLastIndex.reset();
>+        return angle::Result::Continue;
>+    }
>+
>+    // Note: Vertex indexes can be arbitrarily large.
>+    uint32_t clampedVertexCount = gl::clampCast<uint32_t>(vertexOrIndexCount);
>+
>+    // Handle GL_LINE_LOOP drawArrays.
>+    size_t lastVertex = static_cast<size_t>(firstVertex + clampedVertexCount);
>+    if (!mLineLoopBufferFirstIndex.valid() || !mLineLoopBufferLastIndex.valid() ||
>+        mLineLoopBufferFirstIndex != firstVertex || mLineLoopBufferLastIndex != lastVertex)
>+    {
>+        ANGLE_TRY(mLineLoopHelper.getIndexBufferForDrawArrays(
>+            contextVk, clampedVertexCount, firstVertex, &mCurrentElementArrayBuffer,
>+            &mCurrentElementArrayBufferOffset));
>+
>+        mLineLoopBufferFirstIndex = firstVertex;
>+        mLineLoopBufferLastIndex  = lastVertex;
>+    }
>+
>+    return angle::Result::Continue;
> }
> 
>-const std::vector<VkVertexInputAttributeDescription> &VertexArrayVk::getVertexAttribDescs() const
>+angle::Result VertexArrayVk::updateIndexTranslation(ContextVk *contextVk,
>+                                                    GLsizei indexCount,
>+                                                    gl::DrawElementsType type,
>+                                                    const void *indices)
> {
>-    return mCurrentVertexAttribDescs;
>+    ASSERT(type != gl::DrawElementsType::InvalidEnum);
>+
>+    RendererVk *renderer = contextVk->getRenderer();
>+    gl::Buffer *glBuffer = mState.getElementArrayBuffer();
>+
>+    if (!glBuffer)
>+    {
>+        ANGLE_TRY(streamIndexData(contextVk, type, indexCount, indices, &mDynamicIndexData));
>+    }
>+    else if (renderer->getFormat(angle::FormatID::R16_UINT).vkSupportsStorageBuffer)
>+    {
>+        BufferVk *bufferVk = vk::GetImpl(glBuffer);
>+
>+        ASSERT(type == gl::DrawElementsType::UnsignedByte);
>+
>+        intptr_t offsetIntoSrcData = reinterpret_cast<intptr_t>(indices);
>+        size_t srcDataSize         = static_cast<size_t>(bufferVk->getSize()) - offsetIntoSrcData;
>+
>+        mTranslatedByteIndexData.releaseRetainedBuffers(renderer);
>+
>+        ANGLE_TRY(mTranslatedByteIndexData.allocate(contextVk, sizeof(GLushort) * srcDataSize,
>+                                                    nullptr, nullptr,
>+                                                    &mCurrentElementArrayBufferOffset, nullptr));
>+        mCurrentElementArrayBuffer = mTranslatedByteIndexData.getCurrentBuffer();
>+
>+        vk::BufferHelper *dest = mTranslatedByteIndexData.getCurrentBuffer();
>+        vk::BufferHelper *src  = &bufferVk->getBuffer();
>+
>+        ANGLE_TRY(src->initBufferView(contextVk, renderer->getFormat(angle::FormatID::R8_UINT)));
>+        ANGLE_TRY(dest->initBufferView(contextVk, renderer->getFormat(angle::FormatID::R16_UINT)));
>+
>+        // Copy relevant section of the source into destination at allocated offset.  Note that the
>+        // offset returned by allocate() above is in bytes, while our allocated array is of
>+        // GLushorts.
>+        UtilsVk::CopyParameters params = {};
>+        params.destOffset =
>+            static_cast<size_t>(mCurrentElementArrayBufferOffset) / sizeof(GLushort);
>+        params.srcOffset = offsetIntoSrcData;
>+        params.size      = srcDataSize;
>+
>+        // Note: this is a copy, which implicitly converts between formats.  Once support for
>+        // primitive restart is added, a specialized shader is likely needed to special case 0xFF ->
>+        // 0xFFFF.
>+        ANGLE_TRY(renderer->getUtils().copyBuffer(contextVk, dest, src, params));
>+    }
>+    else
>+    {
>+        // If it's not possible to convert the buffer with compute, opt for a CPU read back for now.
>+        // TODO(syoussefi): R8G8B8A8_UINT is required to have storage texel buffer support, so a
>+        // specialized shader code can be made to read two ubyte indices and output them in R and B
>+        // (or A and G based on endianness?) with 0 on the other channels.  If specialized, we might
>+        // as well support the ubyte to ushort case with correct handling of primitive restart.
>+        // http://anglebug.com/3003
>+
>+        TRACE_EVENT0("gpu.angle", "VertexArrayVk::updateIndexTranslation");
>+        // Needed before reading buffer or we could get stale data.
>+        ANGLE_TRY(contextVk->finishImpl());
>+
>+        ASSERT(type == gl::DrawElementsType::UnsignedByte);
>+        // Unsigned bytes don't have direct support in Vulkan so we have to expand the
>+        // memory to a GLushort.
>+        BufferVk *bufferVk   = vk::GetImpl(glBuffer);
>+        void *srcDataMapping = nullptr;
>+        ASSERT(!glBuffer->isMapped());
>+        ANGLE_TRY(bufferVk->mapImpl(contextVk, &srcDataMapping));
>+        uint8_t *srcData           = static_cast<uint8_t *>(srcDataMapping);
>+        intptr_t offsetIntoSrcData = reinterpret_cast<intptr_t>(indices);
>+        srcData += offsetIntoSrcData;
>+
>+        ANGLE_TRY(streamIndexData(contextVk, type,
>+                                  static_cast<size_t>(bufferVk->getSize()) - offsetIntoSrcData,
>+                                  srcData, &mTranslatedByteIndexData));
>+
>+        ANGLE_TRY(bufferVk->unmapImpl(contextVk));
>+    }
>+
>+    return angle::Result::Continue;
> }
> 
>+void VertexArrayVk::updateDefaultAttrib(ContextVk *contextVk,
>+                                        size_t attribIndex,
>+                                        VkBuffer bufferHandle,
>+                                        uint32_t offset)
>+{
>+    if (!mState.getEnabledAttributesMask().test(attribIndex))
>+    {
>+        mCurrentArrayBufferHandles[attribIndex] = bufferHandle;
>+        mCurrentArrayBufferOffsets[attribIndex] = offset;
>+        mCurrentArrayBuffers[attribIndex]       = nullptr;
>+
>+        setDefaultPackedInput(contextVk, attribIndex);
>+    }
>+}
> }  // namespace rx
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/VertexArrayVk.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/VertexArrayVk.h
>index 1c70abec3bc..5f395d2cbfb 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/VertexArrayVk.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/VertexArrayVk.h
>@@ -11,7 +11,8 @@
> #define LIBANGLE_RENDERER_VULKAN_VERTEXARRAYVK_H_
> 
> #include "libANGLE/renderer/VertexArrayImpl.h"
>-#include "libANGLE/renderer/vulkan/renderervk_utils.h"
>+#include "libANGLE/renderer/vulkan/vk_cache_utils.h"
>+#include "libANGLE/renderer/vulkan/vk_helpers.h"
> 
> namespace rx
> {
>@@ -20,35 +21,111 @@ class BufferVk;
> class VertexArrayVk : public VertexArrayImpl
> {
>   public:
>-    VertexArrayVk(const gl::VertexArrayState &state);
>+    VertexArrayVk(ContextVk *contextVk, const gl::VertexArrayState &state);
>     ~VertexArrayVk() override;
> 
>     void destroy(const gl::Context *context) override;
> 
>-    void syncState(const gl::Context *context,
>-                   const gl::VertexArray::DirtyBits &dirtyBits) override;
>+    angle::Result syncState(const gl::Context *context,
>+                            const gl::VertexArray::DirtyBits &dirtyBits,
>+                            gl::VertexArray::DirtyAttribBitsArray *attribBits,
>+                            gl::VertexArray::DirtyBindingBitsArray *bindingBits) override;
> 
>-    const std::vector<VkBuffer> &getCurrentVertexBufferHandlesCache() const;
>+    void updateDefaultAttrib(ContextVk *contextVk,
>+                             size_t attribIndex,
>+                             VkBuffer bufferHandle,
>+                             uint32_t offset);
> 
>-    void updateCurrentBufferSerials(const gl::AttributesMask &activeAttribsMask, Serial serial);
>+    angle::Result updateClientAttribs(const gl::Context *context,
>+                                      GLint firstVertex,
>+                                      GLsizei vertexOrIndexCount,
>+                                      GLsizei instanceCount,
>+                                      gl::DrawElementsType indexTypeOrInvalid,
>+                                      const void *indices);
> 
>-    void invalidateVertexDescriptions();
>-    void updateVertexDescriptions(const gl::Context *context);
>+    angle::Result handleLineLoop(ContextVk *contextVk,
>+                                 GLint firstVertex,
>+                                 GLsizei vertexOrIndexCount,
>+                                 gl::DrawElementsType indexTypeOrInvalid,
>+                                 const void *indices);
> 
>-    const std::vector<VkVertexInputBindingDescription> &getVertexBindingDescs() const;
>-    const std::vector<VkVertexInputAttributeDescription> &getVertexAttribDescs() const;
>+    const gl::AttribArray<VkBuffer> &getCurrentArrayBufferHandles() const
>+    {
>+        return mCurrentArrayBufferHandles;
>+    }
>+
>+    const gl::AttribArray<VkDeviceSize> &getCurrentArrayBufferOffsets() const
>+    {
>+        return mCurrentArrayBufferOffsets;
>+    }
>+
>+    const gl::AttribArray<vk::BufferHelper *> &getCurrentArrayBuffers() const
>+    {
>+        return mCurrentArrayBuffers;
>+    }
>+
>+    VkDeviceSize getCurrentElementArrayBufferOffset() const
>+    {
>+        return mCurrentElementArrayBufferOffset;
>+    }
>+
>+    void updateCurrentElementArrayBufferOffset(const GLvoid *offset)
>+    {
>+        mCurrentElementArrayBufferOffset = reinterpret_cast<VkDeviceSize>(offset);
>+    }
>+
>+    vk::BufferHelper *getCurrentElementArrayBuffer() const { return mCurrentElementArrayBuffer; }
>+
>+    angle::Result updateIndexTranslation(ContextVk *contextVk,
>+                                         GLsizei indexCount,
>+                                         gl::DrawElementsType type,
>+                                         const void *indices);
> 
>   private:
>-    std::vector<VkBuffer> mCurrentVertexBufferHandlesCache;
>-    std::vector<BufferVk *> mCurrentVkBuffersCache;
>-
>-    // Keep a cache of binding and attribute descriptions for easy pipeline updates.
>-    // TODO(jmadill): Update this when we support pipeline caching.
>-    bool mCurrentVertexDescsValid;
>-    std::vector<VkVertexInputBindingDescription> mCurrentVertexBindingDescs;
>-    std::vector<VkVertexInputAttributeDescription> mCurrentVertexAttribDescs;
>-};
>+    void setDefaultPackedInput(ContextVk *contextVk, size_t attribIndex);
> 
>+    angle::Result streamIndexData(ContextVk *contextVk,
>+                                  gl::DrawElementsType indexType,
>+                                  size_t indexCount,
>+                                  const void *sourcePointer,
>+                                  vk::DynamicBuffer *dynamicBuffer);
>+    angle::Result convertVertexBufferGpu(ContextVk *contextVk,
>+                                         BufferVk *srcBuffer,
>+                                         const gl::VertexBinding &binding,
>+                                         size_t attribIndex,
>+                                         const vk::Format &vertexFormat);
>+    angle::Result convertVertexBufferCpu(ContextVk *contextVk,
>+                                         BufferVk *srcBuffer,
>+                                         const gl::VertexBinding &binding,
>+                                         size_t attribIndex,
>+                                         const vk::Format &vertexFormat);
>+    void ensureConversionReleased(RendererVk *renderer, size_t attribIndex);
>+
>+    angle::Result syncDirtyAttrib(ContextVk *contextVk,
>+                                  const gl::VertexAttribute &attrib,
>+                                  const gl::VertexBinding &binding,
>+                                  size_t attribIndex);
>+
>+    gl::AttribArray<VkBuffer> mCurrentArrayBufferHandles;
>+    gl::AttribArray<VkDeviceSize> mCurrentArrayBufferOffsets;
>+    gl::AttribArray<vk::BufferHelper *> mCurrentArrayBuffers;
>+    gl::AttribArray<vk::DynamicBuffer> mCurrentArrayBufferConversion;
>+    gl::AttribArray<bool> mCurrentArrayBufferConversionCanRelease;
>+    VkDeviceSize mCurrentElementArrayBufferOffset;
>+    vk::BufferHelper *mCurrentElementArrayBuffer;
>+
>+    vk::DynamicBuffer mDynamicVertexData;
>+    vk::DynamicBuffer mDynamicIndexData;
>+    vk::DynamicBuffer mTranslatedByteIndexData;
>+
>+    vk::LineLoopHelper mLineLoopHelper;
>+    Optional<GLint> mLineLoopBufferFirstIndex;
>+    Optional<size_t> mLineLoopBufferLastIndex;
>+    bool mDirtyLineLoopTranslation;
>+
>+    // Vulkan does not allow binding a null vertex buffer. We use a dummy as a placeholder.
>+    vk::BufferHelper mTheNullBuffer;
>+};
> }  // namespace rx
> 
> #endif  // LIBANGLE_RENDERER_VULKAN_VERTEXARRAYVK_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/android/DisplayVkAndroid.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/android/DisplayVkAndroid.cpp
>new file mode 100644
>index 00000000000..cdb25ddbad0
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/android/DisplayVkAndroid.cpp
>@@ -0,0 +1,104 @@
>+//
>+// Copyright 2018 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// DisplayVkAndroid.cpp:
>+//    Implements the class methods for DisplayVkAndroid.
>+//
>+
>+#include "libANGLE/renderer/vulkan/android/DisplayVkAndroid.h"
>+
>+#include <android/log.h>
>+#include <android/native_window.h>
>+#include <vulkan/vulkan.h>
>+
>+#include "common/version.h"
>+#include "libANGLE/renderer/vulkan/RendererVk.h"
>+#include "libANGLE/renderer/vulkan/android/HardwareBufferImageSiblingVkAndroid.h"
>+#include "libANGLE/renderer/vulkan/android/WindowSurfaceVkAndroid.h"
>+#include "libANGLE/renderer/vulkan/vk_caps_utils.h"
>+
>+namespace rx
>+{
>+
>+DisplayVkAndroid::DisplayVkAndroid(const egl::DisplayState &state) : DisplayVk(state) {}
>+
>+egl::Error DisplayVkAndroid::initialize(egl::Display *display)
>+{
>+    ANGLE_TRY(DisplayVk::initialize(display));
>+
>+    std::stringstream strstr;
>+    strstr << "Version (" << ANGLE_VERSION_STRING << "), ";
>+    strstr << "Renderer (" << mRenderer->getRendererDescription() << ")";
>+    __android_log_print(ANDROID_LOG_INFO, "ANGLE", "%s", strstr.str().c_str());
>+
>+    return egl::NoError();
>+}
>+
>+bool DisplayVkAndroid::isValidNativeWindow(EGLNativeWindowType window) const
>+{
>+    return (ANativeWindow_getFormat(window) >= 0);
>+}
>+
>+SurfaceImpl *DisplayVkAndroid::createWindowSurfaceVk(const egl::SurfaceState &state,
>+                                                     EGLNativeWindowType window,
>+                                                     EGLint width,
>+                                                     EGLint height)
>+{
>+    return new WindowSurfaceVkAndroid(state, window, width, height);
>+}
>+
>+egl::ConfigSet DisplayVkAndroid::generateConfigs()
>+{
>+    constexpr GLenum kColorFormats[] = {GL_RGBA8, GL_RGB8, GL_RGB565, GL_RGB10_A2, GL_RGBA16F};
>+    constexpr EGLint kSampleCounts[] = {0};
>+    return egl_vk::GenerateConfigs(kColorFormats, egl_vk::kConfigDepthStencilFormats, kSampleCounts,
>+                                   this);
>+}
>+
>+bool DisplayVkAndroid::checkConfigSupport(egl::Config *config)
>+{
>+    // TODO(geofflang): Test for native support and modify the config accordingly.
>+    // anglebug.com/2692
>+    return true;
>+}
>+
>+egl::Error DisplayVkAndroid::validateImageClientBuffer(const gl::Context *context,
>+                                                       EGLenum target,
>+                                                       EGLClientBuffer clientBuffer,
>+                                                       const egl::AttributeMap &attribs) const
>+{
>+    switch (target)
>+    {
>+        case EGL_NATIVE_BUFFER_ANDROID:
>+            return HardwareBufferImageSiblingVkAndroid::ValidateHardwareBuffer(mRenderer,
>+                                                                               clientBuffer);
>+
>+        default:
>+            return DisplayVk::validateImageClientBuffer(context, target, clientBuffer, attribs);
>+    }
>+}
>+
>+ExternalImageSiblingImpl *DisplayVkAndroid::createExternalImageSibling(
>+    const gl::Context *context,
>+    EGLenum target,
>+    EGLClientBuffer buffer,
>+    const egl::AttributeMap &attribs)
>+{
>+    switch (target)
>+    {
>+        case EGL_NATIVE_BUFFER_ANDROID:
>+            return new HardwareBufferImageSiblingVkAndroid(buffer);
>+
>+        default:
>+            return DisplayVk::createExternalImageSibling(context, target, buffer, attribs);
>+    }
>+}
>+
>+const char *DisplayVkAndroid::getWSIExtension() const
>+{
>+    return VK_KHR_ANDROID_SURFACE_EXTENSION_NAME;
>+}
>+
>+}  // namespace rx
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/android/DisplayVkAndroid.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/android/DisplayVkAndroid.h
>new file mode 100644
>index 00000000000..ef9f5ea8013
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/android/DisplayVkAndroid.h
>@@ -0,0 +1,49 @@
>+//
>+// Copyright 2018 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// DisplayVkAndroid.h:
>+//    Defines the class interface for DisplayVkAndroid, implementing DisplayVk for Android.
>+//
>+
>+#ifndef LIBANGLE_RENDERER_VULKAN_ANDROID_DISPLAYVKANDROID_H_
>+#define LIBANGLE_RENDERER_VULKAN_ANDROID_DISPLAYVKANDROID_H_
>+
>+#include "libANGLE/renderer/vulkan/DisplayVk.h"
>+
>+namespace rx
>+{
>+class DisplayVkAndroid : public DisplayVk
>+{
>+  public:
>+    DisplayVkAndroid(const egl::DisplayState &state);
>+
>+    egl::Error initialize(egl::Display *display) override;
>+
>+    bool isValidNativeWindow(EGLNativeWindowType window) const override;
>+
>+    SurfaceImpl *createWindowSurfaceVk(const egl::SurfaceState &state,
>+                                       EGLNativeWindowType window,
>+                                       EGLint width,
>+                                       EGLint height) override;
>+
>+    egl::ConfigSet generateConfigs() override;
>+    bool checkConfigSupport(egl::Config *config) override;
>+
>+    egl::Error validateImageClientBuffer(const gl::Context *context,
>+                                         EGLenum target,
>+                                         EGLClientBuffer clientBuffer,
>+                                         const egl::AttributeMap &attribs) const override;
>+
>+    ExternalImageSiblingImpl *createExternalImageSibling(const gl::Context *context,
>+                                                         EGLenum target,
>+                                                         EGLClientBuffer buffer,
>+                                                         const egl::AttributeMap &attribs) override;
>+
>+    const char *getWSIExtension() const override;
>+};
>+
>+}  // namespace rx
>+
>+#endif  // LIBANGLE_RENDERER_VULKAN_ANDROID_DISPLAYVKANDROID_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/android/HardwareBufferImageSiblingVkAndroid.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/android/HardwareBufferImageSiblingVkAndroid.cpp
>new file mode 100644
>index 00000000000..94bb4b1b4dd
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/android/HardwareBufferImageSiblingVkAndroid.cpp
>@@ -0,0 +1,208 @@
>+//
>+// Copyright 2019 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+
>+// HardwareBufferImageSiblingVkAndroid.cpp: Implements HardwareBufferImageSiblingVkAndroid.
>+
>+#include "libANGLE/renderer/vulkan/android/HardwareBufferImageSiblingVkAndroid.h"
>+
>+#include "common/android_util.h"
>+
>+#include "libANGLE/Display.h"
>+#include "libANGLE/renderer/vulkan/DisplayVk.h"
>+#include "libANGLE/renderer/vulkan/RendererVk.h"
>+
>+namespace rx
>+{
>+
>+HardwareBufferImageSiblingVkAndroid::HardwareBufferImageSiblingVkAndroid(EGLClientBuffer buffer)
>+    : mBuffer(buffer),
>+      mFormat(GL_NONE),
>+      mRenderable(false),
>+      mTextureable(false),
>+      mSamples(0),
>+      mImage(nullptr)
>+{}
>+
>+HardwareBufferImageSiblingVkAndroid::~HardwareBufferImageSiblingVkAndroid() {}
>+
>+// Static
>+egl::Error HardwareBufferImageSiblingVkAndroid::ValidateHardwareBuffer(RendererVk *renderer,
>+                                                                       EGLClientBuffer buffer)
>+{
>+    struct ANativeWindowBuffer *windowBuffer =
>+        angle::android::ClientBufferToANativeWindowBuffer(buffer);
>+    struct AHardwareBuffer *hardwareBuffer =
>+        angle::android::ANativeWindowBufferToAHardwareBuffer(windowBuffer);
>+
>+    VkAndroidHardwareBufferFormatPropertiesANDROID bufferFormatProperties = {};
>+    bufferFormatProperties.sType =
>+        VK_STRUCTURE_TYPE_ANDROID_HARDWARE_BUFFER_FORMAT_PROPERTIES_ANDROID;
>+    bufferFormatProperties.pNext = nullptr;
>+
>+    VkAndroidHardwareBufferPropertiesANDROID bufferProperties = {};
>+    bufferProperties.sType = VK_STRUCTURE_TYPE_ANDROID_HARDWARE_BUFFER_PROPERTIES_ANDROID;
>+    bufferProperties.pNext = &bufferFormatProperties;
>+
>+    VkDevice device = renderer->getDevice();
>+    VkResult result =
>+        vkGetAndroidHardwareBufferPropertiesANDROID(device, hardwareBuffer, &bufferProperties);
>+    if (result != VK_SUCCESS)
>+    {
>+        return egl::EglBadParameter() << "Failed to query AHardwareBuffer properties";
>+    }
>+
>+    if (!HasFullTextureFormatSupport(renderer, bufferFormatProperties.format))
>+    {
>+        return egl::EglBadParameter()
>+               << "AHardwareBuffer format does not support enough features to use as a texture.";
>+    }
>+
>+    return egl::NoError();
>+}
>+
>+egl::Error HardwareBufferImageSiblingVkAndroid::initialize(const egl::Display *display)
>+{
>+    DisplayVk *displayVk = vk::GetImpl(display);
>+    return angle::ToEGL(initImpl(displayVk), displayVk, EGL_BAD_PARAMETER);
>+}
>+
>+angle::Result HardwareBufferImageSiblingVkAndroid::initImpl(DisplayVk *displayVk)
>+{
>+    RendererVk *renderer = displayVk->getRenderer();
>+
>+    struct ANativeWindowBuffer *windowBuffer =
>+        angle::android::ClientBufferToANativeWindowBuffer(mBuffer);
>+
>+    int pixelFormat = 0;
>+    angle::android::GetANativeWindowBufferProperties(windowBuffer, &mSize.width, &mSize.height,
>+                                                     &mSize.depth, &pixelFormat);
>+    GLenum internalFormat = angle::android::NativePixelFormatToGLInternalFormat(pixelFormat);
>+    mFormat               = gl::Format(internalFormat);
>+
>+    struct AHardwareBuffer *hardwareBuffer =
>+        angle::android::ANativeWindowBufferToAHardwareBuffer(windowBuffer);
>+
>+    VkAndroidHardwareBufferFormatPropertiesANDROID bufferFormatProperties;
>+    bufferFormatProperties.sType =
>+        VK_STRUCTURE_TYPE_ANDROID_HARDWARE_BUFFER_FORMAT_PROPERTIES_ANDROID;
>+    bufferFormatProperties.pNext = nullptr;
>+
>+    VkAndroidHardwareBufferPropertiesANDROID bufferProperties = {};
>+    bufferProperties.sType = VK_STRUCTURE_TYPE_ANDROID_HARDWARE_BUFFER_PROPERTIES_ANDROID;
>+    bufferProperties.pNext = &bufferFormatProperties;
>+
>+    VkDevice device = renderer->getDevice();
>+    ANGLE_VK_TRY(displayVk, vkGetAndroidHardwareBufferPropertiesANDROID(device, hardwareBuffer,
>+                                                                        &bufferProperties));
>+
>+    const vk::Format &vkFormat       = renderer->getFormat(internalFormat);
>+    const angle::Format &imageFormat = vkFormat.imageFormat();
>+    bool isDepthOrStencilFormat      = imageFormat.depthBits > 0 || imageFormat.stencilBits > 0;
>+    const VkImageUsageFlags usage =
>+        VK_IMAGE_USAGE_TRANSFER_DST_BIT | VK_IMAGE_USAGE_TRANSFER_SRC_BIT |
>+        VK_IMAGE_USAGE_SAMPLED_BIT |
>+        (imageFormat.redBits > 0 ? VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT : 0) |
>+        (isDepthOrStencilFormat ? VK_IMAGE_USAGE_DEPTH_STENCIL_ATTACHMENT_BIT : 0);
>+
>+    VkExternalFormatANDROID externalFormat = {};
>+    externalFormat.sType                   = VK_STRUCTURE_TYPE_EXTERNAL_FORMAT_ANDROID;
>+    externalFormat.externalFormat          = 0;
>+
>+    if (bufferFormatProperties.format == VK_FORMAT_UNDEFINED)
>+    {
>+        externalFormat.externalFormat = bufferFormatProperties.externalFormat;
>+    }
>+
>+    VkExternalMemoryImageCreateInfo externalMemoryImageCreateInfo = {};
>+    externalMemoryImageCreateInfo.sType = VK_STRUCTURE_TYPE_EXTERNAL_MEMORY_IMAGE_CREATE_INFO;
>+    externalMemoryImageCreateInfo.pNext = &externalFormat;
>+    externalMemoryImageCreateInfo.handleTypes =
>+        VK_EXTERNAL_MEMORY_HANDLE_TYPE_ANDROID_HARDWARE_BUFFER_BIT_ANDROID;
>+
>+    mImage = new vk::ImageHelper();
>+    ANGLE_TRY(mImage->initExternal(displayVk, gl::TextureType::_2D, mSize, vkFormat, 1, usage,
>+                                   vk::ImageLayout::ExternalPreInitialized,
>+                                   &externalMemoryImageCreateInfo, 1, 1));
>+
>+    VkImportAndroidHardwareBufferInfoANDROID importHardwareBufferInfo = {};
>+    importHardwareBufferInfo.sType  = VK_STRUCTURE_TYPE_IMPORT_ANDROID_HARDWARE_BUFFER_INFO_ANDROID;
>+    importHardwareBufferInfo.buffer = hardwareBuffer;
>+
>+    VkMemoryDedicatedAllocateInfo dedicatedAllocInfo = {};
>+    dedicatedAllocInfo.sType  = VK_STRUCTURE_TYPE_MEMORY_DEDICATED_ALLOCATE_INFO;
>+    dedicatedAllocInfo.pNext  = &importHardwareBufferInfo;
>+    dedicatedAllocInfo.image  = mImage->getImage().getHandle();
>+    dedicatedAllocInfo.buffer = VK_NULL_HANDLE;
>+
>+    VkMemoryRequirements externalMemoryRequirements = {};
>+    externalMemoryRequirements.size                 = bufferProperties.allocationSize;
>+    externalMemoryRequirements.alignment            = 0;
>+    externalMemoryRequirements.memoryTypeBits       = bufferProperties.memoryTypeBits;
>+
>+    VkMemoryPropertyFlags flags = VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT;
>+    ANGLE_TRY(mImage->initExternalMemory(displayVk, renderer->getMemoryProperties(),
>+                                         externalMemoryRequirements, &dedicatedAllocInfo,
>+                                         VK_QUEUE_FAMILY_FOREIGN_EXT, flags));
>+
>+    constexpr uint32_t kColorRenderableRequiredBits        = VK_FORMAT_FEATURE_COLOR_ATTACHMENT_BIT;
>+    constexpr uint32_t kDepthStencilRenderableRequiredBits = VK_FORMAT_FEATURE_COLOR_ATTACHMENT_BIT;
>+    mRenderable =
>+        renderer->hasImageFormatFeatureBits(vkFormat.vkImageFormat, kColorRenderableRequiredBits) ||
>+        renderer->hasImageFormatFeatureBits(vkFormat.vkImageFormat,
>+                                            kDepthStencilRenderableRequiredBits);
>+
>+    constexpr uint32_t kTextureableRequiredBits =
>+        VK_FORMAT_FEATURE_SAMPLED_IMAGE_BIT | VK_FORMAT_FEATURE_SAMPLED_IMAGE_FILTER_LINEAR_BIT;
>+    mTextureable =
>+        renderer->hasImageFormatFeatureBits(vkFormat.vkImageFormat, kTextureableRequiredBits);
>+
>+    return angle::Result::Continue;
>+}
>+
>+void HardwareBufferImageSiblingVkAndroid::onDestroy(const egl::Display *display)
>+{
>+    DisplayVk *displayVk = vk::GetImpl(display);
>+    RendererVk *renderer = displayVk->getRenderer();
>+
>+    if (mImage != nullptr)
>+    {
>+        mImage->releaseImage(renderer);
>+        mImage->releaseStagingBuffer(renderer);
>+        SafeDelete(mImage);
>+    }
>+}
>+
>+gl::Format HardwareBufferImageSiblingVkAndroid::getFormat() const
>+{
>+    return mFormat;
>+}
>+
>+bool HardwareBufferImageSiblingVkAndroid::isRenderable(const gl::Context *context) const
>+{
>+    return mRenderable;
>+}
>+
>+bool HardwareBufferImageSiblingVkAndroid::isTexturable(const gl::Context *context) const
>+{
>+    return mTextureable;
>+}
>+
>+gl::Extents HardwareBufferImageSiblingVkAndroid::getSize() const
>+{
>+    return mSize;
>+}
>+
>+size_t HardwareBufferImageSiblingVkAndroid::getSamples() const
>+{
>+    return mSamples;
>+}
>+
>+// ExternalImageSiblingVk interface
>+vk::ImageHelper *HardwareBufferImageSiblingVkAndroid::getImage() const
>+{
>+    return mImage;
>+}
>+}  // namespace rx
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/android/HardwareBufferImageSiblingVkAndroid.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/android/HardwareBufferImageSiblingVkAndroid.h
>new file mode 100644
>index 00000000000..e2648c60f15
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/android/HardwareBufferImageSiblingVkAndroid.h
>@@ -0,0 +1,55 @@
>+//
>+// Copyright 2019 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+
>+// HardwareBufferImageSiblingVkAndroid.h: Defines the HardwareBufferImageSiblingVkAndroid to wrap
>+// EGL images created from AHardwareBuffer objects
>+
>+#ifndef LIBANGLE_RENDERER_VULKAN_ANDROID_HARDWAREBUFFERIMAGESIBLINGVKANDROID_H_
>+#define LIBANGLE_RENDERER_VULKAN_ANDROID_HARDWAREBUFFERIMAGESIBLINGVKANDROID_H_
>+
>+#include "libANGLE/renderer/vulkan/ImageVk.h"
>+
>+namespace rx
>+{
>+
>+class HardwareBufferImageSiblingVkAndroid : public ExternalImageSiblingVk
>+{
>+  public:
>+    HardwareBufferImageSiblingVkAndroid(EGLClientBuffer buffer);
>+    ~HardwareBufferImageSiblingVkAndroid() override;
>+
>+    static egl::Error ValidateHardwareBuffer(RendererVk *renderer, EGLClientBuffer buffer);
>+
>+    egl::Error initialize(const egl::Display *display) override;
>+    void onDestroy(const egl::Display *display) override;
>+
>+    // ExternalImageSiblingImpl interface
>+    gl::Format getFormat() const override;
>+    bool isRenderable(const gl::Context *context) const override;
>+    bool isTexturable(const gl::Context *context) const override;
>+    gl::Extents getSize() const override;
>+    size_t getSamples() const override;
>+
>+    // ExternalImageSiblingVk interface
>+    vk::ImageHelper *getImage() const override;
>+
>+  private:
>+    angle::Result initImpl(DisplayVk *displayVk);
>+
>+    EGLClientBuffer mBuffer;
>+    gl::Extents mSize;
>+    gl::Format mFormat;
>+
>+    bool mRenderable;
>+    bool mTextureable;
>+    size_t mSamples;
>+
>+    vk::ImageHelper *mImage;
>+};
>+
>+}  // namespace rx
>+
>+#endif  // LIBANGLE_RENDERER_VULKAN_ANDROID_HARDWAREBUFFERIMAGESIBLINGVKANDROID_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/android/WindowSurfaceVkAndroid.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/android/WindowSurfaceVkAndroid.cpp
>new file mode 100644
>index 00000000000..13e6799379b
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/android/WindowSurfaceVkAndroid.cpp
>@@ -0,0 +1,50 @@
>+//
>+// Copyright 2018 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// WindowSurfaceVkAndroid.cpp:
>+//    Implements the class methods for WindowSurfaceVkAndroid.
>+//
>+
>+#include "libANGLE/renderer/vulkan/android/WindowSurfaceVkAndroid.h"
>+
>+#include <android/native_window.h>
>+
>+#include "libANGLE/renderer/vulkan/RendererVk.h"
>+
>+namespace rx
>+{
>+
>+WindowSurfaceVkAndroid::WindowSurfaceVkAndroid(const egl::SurfaceState &surfaceState,
>+                                               EGLNativeWindowType window,
>+                                               EGLint width,
>+                                               EGLint height)
>+    : WindowSurfaceVk(surfaceState, window, width, height)
>+{}
>+
>+angle::Result WindowSurfaceVkAndroid::createSurfaceVk(vk::Context *context, gl::Extents *extentsOut)
>+{
>+    VkAndroidSurfaceCreateInfoKHR createInfo = {};
>+
>+    createInfo.sType  = VK_STRUCTURE_TYPE_ANDROID_SURFACE_CREATE_INFO_KHR;
>+    createInfo.flags  = 0;
>+    createInfo.window = mNativeWindowType;
>+    ANGLE_VK_TRY(context, vkCreateAndroidSurfaceKHR(context->getRenderer()->getInstance(),
>+                                                    &createInfo, nullptr, &mSurface));
>+
>+    return getCurrentWindowSize(context, extentsOut);
>+}
>+
>+angle::Result WindowSurfaceVkAndroid::getCurrentWindowSize(vk::Context *context,
>+                                                           gl::Extents *extentsOut)
>+{
>+    int32_t width  = ANativeWindow_getWidth(mNativeWindowType);
>+    int32_t height = ANativeWindow_getHeight(mNativeWindowType);
>+    ANGLE_VK_CHECK(context, width > 0 && height > 0, VK_ERROR_INITIALIZATION_FAILED);
>+
>+    *extentsOut = gl::Extents(width, height, 0);
>+    return angle::Result::Continue;
>+}
>+
>+}  // namespace rx
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/android/WindowSurfaceVkAndroid.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/android/WindowSurfaceVkAndroid.h
>new file mode 100644
>index 00000000000..13bb16fd1b6
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/android/WindowSurfaceVkAndroid.h
>@@ -0,0 +1,33 @@
>+//
>+// Copyright 2018 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// WindowSurfaceVkAndroid.h:
>+//    Defines the class interface for WindowSurfaceVkAndroid, implementing WindowSurfaceVk.
>+//
>+
>+#ifndef LIBANGLE_RENDERER_VULKAN_ANDROID_WINDOWSURFACEVKANDROID_H_
>+#define LIBANGLE_RENDERER_VULKAN_ANDROID_WINDOWSURFACEVKANDROID_H_
>+
>+#include "libANGLE/renderer/vulkan/SurfaceVk.h"
>+
>+namespace rx
>+{
>+
>+class WindowSurfaceVkAndroid : public WindowSurfaceVk
>+{
>+  public:
>+    WindowSurfaceVkAndroid(const egl::SurfaceState &surfaceState,
>+                           EGLNativeWindowType window,
>+                           EGLint width,
>+                           EGLint height);
>+
>+  private:
>+    angle::Result createSurfaceVk(vk::Context *context, gl::Extents *extentsOut) override;
>+    angle::Result getCurrentWindowSize(vk::Context *context, gl::Extents *extentsOut) override;
>+};
>+
>+}  // namespace rx
>+
>+#endif  // LIBANGLE_RENDERER_VULKAN_ANDROID_WINDOWSURFACEVKANDROID_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/doc/img/LineRasterComparison.gif b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/doc/img/LineRasterComparison.gif
>new file mode 100644
>index 00000000000..38b03c89ee0
>Binary files /dev/null and b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/doc/img/LineRasterComparison.gif differ
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/doc/img/LineRasterPixelExample.png b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/doc/img/LineRasterPixelExample.png
>new file mode 100644
>index 00000000000..29923fb0031
>Binary files /dev/null and b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/doc/img/LineRasterPixelExample.png differ
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/doc/img/VulkanShaderTranslation.svg b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/doc/img/VulkanShaderTranslation.svg
>new file mode 100644
>index 00000000000..49658c60b74
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/doc/img/VulkanShaderTranslation.svg
>@@ -0,0 +1,43 @@
>+<?xml version="1.0" encoding="utf-8" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20010904//EN" "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd"><svg xmlns="http://www.w3.org/2000/svg" width="1185" height="1229" xmlns:xlink="http://www.w3.org/1999/xlink"><source><![CDATA[participant App
>+participant "ANGLE Front-end"
>+participant "Vulkan Back-end"
>+participant "ANGLE Translator"
>+participant "GlslangWrapper"
>+participant "Glslang"
>+
>+App->"ANGLE Front-end": glCompileShader (VS)
>+"ANGLE Front-end"->"Vulkan Back-end": ShaderVk::compile
>+"Vulkan Back-end"->"ANGLE Translator": sh::Compile
>+"ANGLE Translator"-->"ANGLE Front-end": return Vulkan-compatible GLSL
>+
>+Note right of "ANGLE Front-end": Source is templated\nwith markers to be\nfilled at link time.
>+
>+Note right of App: Same for FS, GS, etc...
>+
>+App->"ANGLE Front-end": glCreateProgram (...)
>+App->"ANGLE Front-end": glAttachShader (...)
>+App->"ANGLE Front-end": glLinkProgram
>+"ANGLE Front-end"->"Vulkan Back-end": ProgramVk::link
>+
>+Note right of "Vulkan Back-end": ProgramVk inits uniforms,\nlayouts, and descriptors.
>+
>+"Vulkan Back-end"->GlslangWrapper: GlslangWrapper::GetShaderSource
>+GlslangWrapper-->"Vulkan Back-end": return filled-in sources
>+
>+Note right of "Vulkan Back-end": Source is templated with\ndefines to be resolved at\ndraw time.
>+
>+"Vulkan Back-end"-->"ANGLE Front-end": return success
>+
>+Note right of App: App execution continues...
>+
>+App->"ANGLE Front-end": glDrawArrays (any draw)
>+"ANGLE Front-end"->"Vulkan Back-end": ContextVk::drawArrays
>+
>+"Vulkan Back-end"->GlslangWrapper: GlslangWrapper::GetShaderCode (with defines)
>+GlslangWrapper->Glslang: GlslangToSpv
>+Glslang-->"Vulkan Back-end": Return SPIR-V 
>+
>+Note right of "Vulkan Back-end": We init VkShaderModules\nand VkPipeline then\nrecord the draw.
>+
>+"Vulkan Back-end"-->"ANGLE Front-end": return success
>+]]></source><desc></desc><defs><marker viewBox="0 0 5 5" markerWidth="5" markerHeight="5" orient="auto" refX="5" refY="2.5" id="markerArrowBlock"><path d="M 0 0 L 5 2.5 L 0 5 z"></path></marker><marker viewBox="0 0 9.6 16" markerWidth="4" markerHeight="16" orient="auto" refX="9.6" refY="8" id="markerArrowOpen"><path d="M 9.6,8 1.92,16 0,13.7 5.76,8 0,2.286 1.92,0 9.6,8 z"></path></marker></defs><g class="title"></g><g class="actor"><rect x="10" y="20" width="47.59375" height="39" stroke="#000000" fill="#ffffff" style="stroke-width: 2;"></rect><text x="21" y="45" style="font-size: 16px; font-family: &quot;Andale Mono&quot;, monospace;"><tspan x="20">App</tspan></text></g><g class="actor"><rect x="10" y="1170.359375" width="47.59375" height="39" stroke="#000000" fill="#ffffff" style="stroke-width: 2;"></rect><text x="21" y="1195.359375" style="font-size: 16px; font-family: &quot;Andale Mono&quot;, monospace;"><tspan x="20">App</tspan></text></g><line x1="33.796875" x2="33.796875" y1="59" y2="1170.359375" stroke="#000000" fill="none" style="stroke-width: 2;"></line><g class="actor"><rect x="237.0390625" y="20" width="152.953125" height="39" stroke="#000000" fill="#ffffff" style="stroke-width: 2;"></rect><text x="248.0390625" y="45" style="font-size: 16px; font-family: &quot;Andale Mono&quot;, monospace;"><tspan x="247.0390625">ANGLE Front-end</tspan></text></g><g class="actor"><rect x="237.0390625" y="1170.359375" width="152.953125" height="39" stroke="#000000" fill="#ffffff" style="stroke-width: 2;"></rect><text x="248.0390625" y="1195.359375" style="font-size: 16px; font-family: &quot;Andale Mono&quot;, monospace;"><tspan x="247.0390625">ANGLE Front-end</tspan></text></g><line x1="313.515625" x2="313.515625" y1="59" y2="1170.359375" stroke="#000000" fill="none" style="stroke-width: 2;"></line><g class="actor"><rect x="462.9765625" y="20" width="152.953125" height="39" stroke="#000000" fill="#ffffff" style="stroke-width: 2;"></rect><text x="473.9765625" y="45" style="font-size: 16px; font-family: &quot;Andale Mono&quot;, monospace;"><tspan x="472.9765625">Vulkan Back-end</tspan></text></g><g class="actor"><rect x="462.9765625" y="1170.359375" width="152.953125" height="39" stroke="#000000" fill="#ffffff" style="stroke-width: 2;"></rect><text x="473.9765625" y="1195.359375" style="font-size: 16px; font-family: &quot;Andale Mono&quot;, monospace;"><tspan x="472.9765625">Vulkan Back-end</tspan></text></g><line x1="539.453125" x2="539.453125" y1="59" y2="1170.359375" stroke="#000000" fill="none" style="stroke-width: 2;"></line><g class="actor"><rect x="728.3984375" y="20" width="161.953125" height="39" stroke="#000000" fill="#ffffff" style="stroke-width: 2;"></rect><text x="739.3984375" y="45" style="font-size: 16px; font-family: &quot;Andale Mono&quot;, monospace;"><tspan x="738.3984375">ANGLE Translator</tspan></text></g><g class="actor"><rect x="728.3984375" y="1170.359375" width="161.953125" height="39" stroke="#000000" fill="#ffffff" style="stroke-width: 2;"></rect><text x="739.3984375" y="1195.359375" style="font-size: 16px; font-family: &quot;Andale Mono&quot;, monospace;"><tspan x="738.3984375">ANGLE Translator</tspan></text></g><line x1="809.375" x2="809.375" y1="59" y2="1170.359375" stroke="#000000" fill="none" style="stroke-width: 2;"></line><g class="actor"><rect x="910.3515625" y="20" width="143.359375" height="39" stroke="#000000" fill="#ffffff" style="stroke-width: 2;"></rect><text x="920.3515625" y="45" style="font-size: 16px; font-family: &quot;Andale Mono&quot;, monospace;"><tspan x="920.3515625">GlslangWrapper</tspan></text></g><g class="actor"><rect x="910.3515625" y="1170.359375" width="143.359375" height="39" stroke="#000000" fill="#ffffff" style="stroke-width: 2;"></rect><text x="920.3515625" y="1195.359375" style="font-size: 16px; font-family: &quot;Andale Mono&quot;, monospace;"><tspan x="920.3515625">GlslangWrapper</tspan></text></g><line x1="982.03125" x2="982.03125" y1="59" y2="1170.359375" stroke="#000000" fill="none" style="stroke-width: 2;"></line><g class="actor"><rect x="1073.7109375" y="20" width="81.78125" height="39" stroke="#000000" fill="#ffffff" style="stroke-width: 2;"></rect><text x="1083.7109375" y="45" style="font-size: 16px; font-family: &quot;Andale Mono&quot;, monospace;"><tspan x="1083.7109375">Glslang</tspan></text></g><g class="actor"><rect x="1073.7109375" y="1170.359375" width="81.78125" height="39" stroke="#000000" fill="#ffffff" style="stroke-width: 2;"></rect><text x="1083.7109375" y="1195.359375" style="font-size: 16px; font-family: &quot;Andale Mono&quot;, monospace;"><tspan x="1083.7109375">Glslang</tspan></text></g><line x1="1114.6015625" x2="1114.6015625" y1="59" y2="1170.359375" stroke="#000000" fill="none" style="stroke-width: 2;"></line><g class="signal"><text x="85.6875" y="89.5" style="font-size: 16px; font-family: &quot;Andale Mono&quot;, monospace;"><tspan x="85.6875">glCompileShader (VS)</tspan></text><line x1="33.796875" x2="313.515625" y1="98" y2="98" stroke="#000000" fill="none" style="stroke-width: 2; marker-end: url(&quot;#markerArrowBlock&quot;);"></line></g><g class="signal"><text x="351.609375" y="128.5" style="font-size: 16px; font-family: &quot;Andale Mono&quot;, monospace;"><tspan x="351.609375">ShaderVk::compile</tspan></text><line x1="313.515625" x2="539.453125" y1="137" y2="137" stroke="#000000" fill="none" style="stroke-width: 2; marker-end: url(&quot;#markerArrowBlock&quot;);"></line></g><g class="signal"><text x="625.9296875" y="167.5" style="font-size: 16px; font-family: &quot;Andale Mono&quot;, monospace;"><tspan x="625.9296875">sh::Compile</tspan></text><line x1="539.453125" x2="809.375" y1="176" y2="176" stroke="#000000" fill="none" style="stroke-width: 2; marker-end: url(&quot;#markerArrowBlock&quot;);"></line></g><g class="signal"><text x="433.890625" y="206.5" style="font-size: 16px; font-family: &quot;Andale Mono&quot;, monospace;"><tspan x="433.890625">return Vulkan-compatible GLSL</tspan></text><line x1="809.375" x2="313.515625" y1="215" y2="215" stroke="#000000" fill="none" style="stroke-width: 2; stroke-dasharray: 6, 2; marker-end: url(&quot;#markerArrowBlock&quot;);"></line></g><g class="note"><rect x="333.515625" y="235" width="185.9375" height="67.390625" stroke="#000000" fill="#ffffff" style="stroke-width: 2;"></rect><text x="338.515625" y="255" style="font-size: 16px; font-family: &quot;Andale Mono&quot;, monospace;"><tspan x="338.515625">Source is templated</tspan><tspan dy="1.2em" x="338.515625">with markers to be</tspan><tspan dy="1.2em" x="338.515625">filled at link time.</tspan></text></g><g class="note"><rect x="53.796875" y="322.390625" width="212.328125" height="29" stroke="#000000" fill="#ffffff" style="stroke-width: 2;"></rect><text x="58.796875" y="342.390625" style="font-size: 16px; font-family: &quot;Andale Mono&quot;, monospace;"><tspan x="58.796875">Same for FS, GS, etc...</tspan></text></g><g class="signal"><text x="81.2890625" y="381.890625" style="font-size: 16px; font-family: &quot;Andale Mono&quot;, monospace;"><tspan x="81.2890625">glCreateProgram (...)</tspan></text><line x1="33.796875" x2="313.515625" y1="390.390625" y2="390.390625" stroke="#000000" fill="none" style="stroke-width: 2; marker-end: url(&quot;#markerArrowBlock&quot;);"></line></g><g class="signal"><text x="85.6875" y="420.890625" style="font-size: 16px; font-family: &quot;Andale Mono&quot;, monospace;"><tspan x="85.6875">glAttachShader (...)</tspan></text><line x1="33.796875" x2="313.515625" y1="429.390625" y2="429.390625" stroke="#000000" fill="none" style="stroke-width: 2; marker-end: url(&quot;#markerArrowBlock&quot;);"></line></g><g class="signal"><text x="116.375" y="459.890625" style="font-size: 16px; font-family: &quot;Andale Mono&quot;, monospace;"><tspan x="116.375">glLinkProgram</tspan></text><line x1="33.796875" x2="313.515625" y1="468.390625" y2="468.390625" stroke="#000000" fill="none" style="stroke-width: 2; marker-end: url(&quot;#markerArrowBlock&quot;);"></line></g><g class="signal"><text x="360.40625" y="498.890625" style="font-size: 16px; font-family: &quot;Andale Mono&quot;, monospace;"><tspan x="360.40625">ProgramVk::link</tspan></text><line x1="313.515625" x2="539.453125" y1="507.390625" y2="507.390625" stroke="#000000" fill="none" style="stroke-width: 2; marker-end: url(&quot;#markerArrowBlock&quot;);"></line></g><g class="note"><rect x="559.453125" y="527.390625" width="229.921875" height="48.1875" stroke="#000000" fill="#ffffff" style="stroke-width: 2;"></rect><text x="564.453125" y="547.390625" style="font-size: 16px; font-family: &quot;Andale Mono&quot;, monospace;"><tspan x="564.453125">ProgramVk inits uniforms,</tspan><tspan dy="1.2em" x="564.453125">layouts, and descriptors.</tspan></text></g><g class="signal"><text x="624.2890625" y="606.078125" style="font-size: 16px; font-family: &quot;Andale Mono&quot;, monospace;"><tspan x="624.2890625">GlslangWrapper::GetShaderSource</tspan></text><line x1="539.453125" x2="982.03125" y1="614.578125" y2="614.578125" stroke="#000000" fill="none" style="stroke-width: 2; marker-end: url(&quot;#markerArrowBlock&quot;);"></line></g><g class="signal"><text x="655.1796875" y="645.078125" style="font-size: 16px; font-family: &quot;Andale Mono&quot;, monospace;"><tspan x="655.1796875">return filled-in sources</tspan></text><line x1="982.03125" x2="539.453125" y1="653.578125" y2="653.578125" stroke="#000000" fill="none" style="stroke-width: 2; stroke-dasharray: 6, 2; marker-end: url(&quot;#markerArrowBlock&quot;);"></line></g><g class="note"><rect x="559.453125" y="673.578125" width="229.921875" height="67.390625" stroke="#000000" fill="#ffffff" style="stroke-width: 2;"></rect><text x="564.453125" y="693.578125" style="font-size: 16px; font-family: &quot;Andale Mono&quot;, monospace;"><tspan x="564.453125">Source is templated with</tspan><tspan dy="1.2em" x="564.453125">defines to be resolved at</tspan><tspan dy="1.2em" x="564.453125">draw time.</tspan></text></g><g class="signal"><text x="364.90625" y="771.46875" style="font-size: 16px; font-family: &quot;Andale Mono&quot;, monospace;"><tspan x="364.90625">return success</tspan></text><line x1="539.453125" x2="313.515625" y1="779.96875" y2="779.96875" stroke="#000000" fill="none" style="stroke-width: 2; stroke-dasharray: 6, 2; marker-end: url(&quot;#markerArrowBlock&quot;);"></line></g><g class="note"><rect x="53.796875" y="799.96875" width="239.71875" height="29" stroke="#000000" fill="#ffffff" style="stroke-width: 2;"></rect><text x="59.796875" y="819.96875" style="font-size: 16px; font-family: &quot;Andale Mono&quot;, monospace;"><tspan x="58.796875">App execution continues...</tspan></text></g><g class="signal"><text x="72.4921875" y="859.46875" style="font-size: 16px; font-family: &quot;Andale Mono&quot;, monospace;"><tspan x="72.4921875">glDrawArrays (any draw)</tspan></text><line x1="33.796875" x2="313.515625" y1="867.96875" y2="867.96875" stroke="#000000" fill="none" style="stroke-width: 2; marker-end: url(&quot;#markerArrowBlock&quot;);"></line></g><g class="signal"><text x="334.1171875" y="898.46875" style="font-size: 16px; font-family: &quot;Andale Mono&quot;, monospace;"><tspan x="334.1171875">ContextVk::drawArrays</tspan></text><line x1="313.515625" x2="539.453125" y1="906.96875" y2="906.96875" stroke="#000000" fill="none" style="stroke-width: 2; marker-end: url(&quot;#markerArrowBlock&quot;);"></line></g><g class="signal"><text x="567.2109375" y="937.46875" style="font-size: 16px; font-family: &quot;Andale Mono&quot;, monospace;"><tspan x="567.2109375">GlslangWrapper::GetShaderCode (with defines)</tspan></text><line x1="539.453125" x2="982.03125" y1="945.96875" y2="945.96875" stroke="#000000" fill="none" style="stroke-width: 2; marker-end: url(&quot;#markerArrowBlock&quot;);"></line></g><g class="signal"><text x="995.43359375" y="976.46875" style="font-size: 16px; font-family: &quot;Andale Mono&quot;, monospace;"><tspan x="995.43359375">GlslangToSpv</tspan></text><line x1="982.03125" x2="1114.6015625" y1="984.96875" y2="984.96875" stroke="#000000" fill="none" style="stroke-width: 2; marker-end: url(&quot;#markerArrowBlock&quot;);"></line></g><g class="signal"><text x="769.24609375" y="1015.46875" style="font-size: 16px; font-family: &quot;Andale Mono&quot;, monospace;"><tspan x="769.24609375">Return SPIR-V</tspan></text><line x1="1114.6015625" x2="539.453125" y1="1023.96875" y2="1023.96875" stroke="#000000" fill="none" style="stroke-width: 2; stroke-dasharray: 6, 2; marker-end: url(&quot;#markerArrowBlock&quot;);"></line></g><g class="note"><rect x="559.453125" y="1043.96875" width="212.328125" height="67.390625" stroke="#000000" fill="#ffffff" style="stroke-width: 2;"></rect><text x="564.453125" y="1063.96875" style="font-size: 16px; font-family: &quot;Andale Mono&quot;, monospace;"><tspan x="564.453125">We init VkShaderModules</tspan><tspan dy="1.2em" x="564.453125">and VkPipeline then</tspan><tspan dy="1.2em" x="564.453125">record the draw.</tspan></text></g><g class="signal"><text x="364.90625" y="1141.859375" style="font-size: 16px; font-family: &quot;Andale Mono&quot;, monospace;"><tspan x="364.90625">return success</tspan></text><line x1="539.453125" x2="313.515625" y1="1150.359375" y2="1150.359375" stroke="#000000" fill="none" style="stroke-width: 2; stroke-dasharray: 6, 2; marker-end: url(&quot;#markerArrowBlock&quot;);"></line></g></svg>
>\ No newline at end of file
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/formatutilsvk.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/formatutilsvk.cpp
>deleted file mode 100644
>index 2ec825eb32a..00000000000
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/formatutilsvk.cpp
>+++ /dev/null
>@@ -1,334 +0,0 @@
>-//
>-// Copyright 2016 The ANGLE Project Authors. All rights reserved.
>-// Use of this source code is governed by a BSD-style license that can be
>-// found in the LICENSE file.
>-//
>-// formatutilsvk:
>-//   Helper for Vulkan format code.
>-
>-#include "libANGLE/renderer/vulkan/formatutilsvk.h"
>-
>-#include "libANGLE/formatutils.h"
>-#include "libANGLE/renderer/load_functions_table.h"
>-
>-namespace rx
>-{
>-
>-namespace vk
>-{
>-
>-Format::Format()
>-    : internalFormat(GL_NONE),
>-      textureFormatID(angle::Format::ID::NONE),
>-      vkTextureFormat(VK_FORMAT_UNDEFINED),
>-      bufferFormatID(angle::Format::ID::NONE),
>-      vkBufferFormat(VK_FORMAT_UNDEFINED),
>-      dataInitializerFunction(nullptr),
>-      loadFunctions()
>-{
>-}
>-
>-const angle::Format &Format::textureFormat() const
>-{
>-    return angle::Format::Get(textureFormatID);
>-}
>-
>-const angle::Format &Format::bufferFormat() const
>-{
>-    return angle::Format::Get(bufferFormatID);
>-}
>-
>-FormatTable::FormatTable()
>-{
>-}
>-
>-FormatTable::~FormatTable()
>-{
>-}
>-
>-void FormatTable::initialize(VkPhysicalDevice physicalDevice, gl::TextureCapsMap *textureCapsMap)
>-{
>-    for (size_t formatIndex = 0; formatIndex < angle::kNumANGLEFormats; ++formatIndex)
>-    {
>-        angle::Format::ID formatID       = static_cast<angle::Format::ID>(formatIndex);
>-        const angle::Format &angleFormat = angle::Format::Get(formatID);
>-        mFormatData[formatIndex].initialize(physicalDevice, angleFormat);
>-
>-        mFormatData[formatIndex].loadFunctions = GetLoadFunctionsMap(
>-            mFormatData[formatIndex].internalFormat, mFormatData[formatIndex].textureFormatID);
>-    }
>-}
>-
>-const Format &FormatTable::operator[](GLenum internalFormat) const
>-{
>-    angle::Format::ID formatID = angle::Format::InternalFormatToID(internalFormat);
>-    return mFormatData[static_cast<size_t>(formatID)];
>-}
>-
>-// TODO(jmadill): This is temporary. Figure out how to handle format conversions.
>-VkFormat GetNativeVertexFormat(gl::VertexFormatType vertexFormat)
>-{
>-    switch (vertexFormat)
>-    {
>-        case gl::VERTEX_FORMAT_INVALID:
>-            UNREACHABLE();
>-            return VK_FORMAT_UNDEFINED;
>-        case gl::VERTEX_FORMAT_SBYTE1:
>-            return VK_FORMAT_R8_SINT;
>-        case gl::VERTEX_FORMAT_SBYTE1_NORM:
>-            return VK_FORMAT_R8_SNORM;
>-        case gl::VERTEX_FORMAT_SBYTE2:
>-            return VK_FORMAT_R8G8_SINT;
>-        case gl::VERTEX_FORMAT_SBYTE2_NORM:
>-            return VK_FORMAT_R8G8_SNORM;
>-        case gl::VERTEX_FORMAT_SBYTE3:
>-            return VK_FORMAT_R8G8B8_SINT;
>-        case gl::VERTEX_FORMAT_SBYTE3_NORM:
>-            return VK_FORMAT_R8G8B8_SNORM;
>-        case gl::VERTEX_FORMAT_SBYTE4:
>-            return VK_FORMAT_R8G8B8A8_SINT;
>-        case gl::VERTEX_FORMAT_SBYTE4_NORM:
>-            return VK_FORMAT_R8G8B8A8_SNORM;
>-        case gl::VERTEX_FORMAT_UBYTE1:
>-            return VK_FORMAT_R8_UINT;
>-        case gl::VERTEX_FORMAT_UBYTE1_NORM:
>-            return VK_FORMAT_R8_UNORM;
>-        case gl::VERTEX_FORMAT_UBYTE2:
>-            return VK_FORMAT_R8G8_UINT;
>-        case gl::VERTEX_FORMAT_UBYTE2_NORM:
>-            return VK_FORMAT_R8G8_UNORM;
>-        case gl::VERTEX_FORMAT_UBYTE3:
>-            return VK_FORMAT_R8G8B8_UINT;
>-        case gl::VERTEX_FORMAT_UBYTE3_NORM:
>-            return VK_FORMAT_R8G8B8_UNORM;
>-        case gl::VERTEX_FORMAT_UBYTE4:
>-            return VK_FORMAT_R8G8B8A8_UINT;
>-        case gl::VERTEX_FORMAT_UBYTE4_NORM:
>-            return VK_FORMAT_R8G8B8A8_UNORM;
>-        case gl::VERTEX_FORMAT_SSHORT1:
>-            UNIMPLEMENTED();
>-            return VK_FORMAT_UNDEFINED;
>-        case gl::VERTEX_FORMAT_SSHORT1_NORM:
>-            UNIMPLEMENTED();
>-            return VK_FORMAT_UNDEFINED;
>-        case gl::VERTEX_FORMAT_SSHORT2:
>-            UNIMPLEMENTED();
>-            return VK_FORMAT_UNDEFINED;
>-        case gl::VERTEX_FORMAT_SSHORT2_NORM:
>-            UNIMPLEMENTED();
>-            return VK_FORMAT_UNDEFINED;
>-        case gl::VERTEX_FORMAT_SSHORT3:
>-            UNIMPLEMENTED();
>-            return VK_FORMAT_UNDEFINED;
>-        case gl::VERTEX_FORMAT_SSHORT3_NORM:
>-            UNIMPLEMENTED();
>-            return VK_FORMAT_UNDEFINED;
>-        case gl::VERTEX_FORMAT_SSHORT4:
>-            UNIMPLEMENTED();
>-            return VK_FORMAT_UNDEFINED;
>-        case gl::VERTEX_FORMAT_SSHORT4_NORM:
>-            UNIMPLEMENTED();
>-            return VK_FORMAT_UNDEFINED;
>-        case gl::VERTEX_FORMAT_USHORT1:
>-            UNIMPLEMENTED();
>-            return VK_FORMAT_UNDEFINED;
>-        case gl::VERTEX_FORMAT_USHORT1_NORM:
>-            UNIMPLEMENTED();
>-            return VK_FORMAT_UNDEFINED;
>-        case gl::VERTEX_FORMAT_USHORT2:
>-            UNIMPLEMENTED();
>-            return VK_FORMAT_UNDEFINED;
>-        case gl::VERTEX_FORMAT_USHORT2_NORM:
>-            UNIMPLEMENTED();
>-            return VK_FORMAT_UNDEFINED;
>-        case gl::VERTEX_FORMAT_USHORT3:
>-            UNIMPLEMENTED();
>-            return VK_FORMAT_UNDEFINED;
>-        case gl::VERTEX_FORMAT_USHORT3_NORM:
>-            UNIMPLEMENTED();
>-            return VK_FORMAT_UNDEFINED;
>-        case gl::VERTEX_FORMAT_USHORT4:
>-            UNIMPLEMENTED();
>-            return VK_FORMAT_UNDEFINED;
>-        case gl::VERTEX_FORMAT_USHORT4_NORM:
>-            UNIMPLEMENTED();
>-            return VK_FORMAT_UNDEFINED;
>-        case gl::VERTEX_FORMAT_SINT1:
>-            UNIMPLEMENTED();
>-            return VK_FORMAT_UNDEFINED;
>-        case gl::VERTEX_FORMAT_SINT1_NORM:
>-            UNIMPLEMENTED();
>-            return VK_FORMAT_UNDEFINED;
>-        case gl::VERTEX_FORMAT_SINT2:
>-            UNIMPLEMENTED();
>-            return VK_FORMAT_UNDEFINED;
>-        case gl::VERTEX_FORMAT_SINT2_NORM:
>-            UNIMPLEMENTED();
>-            return VK_FORMAT_UNDEFINED;
>-        case gl::VERTEX_FORMAT_SINT3:
>-            UNIMPLEMENTED();
>-            return VK_FORMAT_UNDEFINED;
>-        case gl::VERTEX_FORMAT_SINT3_NORM:
>-            UNIMPLEMENTED();
>-            return VK_FORMAT_UNDEFINED;
>-        case gl::VERTEX_FORMAT_SINT4:
>-            UNIMPLEMENTED();
>-            return VK_FORMAT_UNDEFINED;
>-        case gl::VERTEX_FORMAT_SINT4_NORM:
>-            UNIMPLEMENTED();
>-            return VK_FORMAT_UNDEFINED;
>-        case gl::VERTEX_FORMAT_UINT1:
>-            UNIMPLEMENTED();
>-            return VK_FORMAT_UNDEFINED;
>-        case gl::VERTEX_FORMAT_UINT1_NORM:
>-            UNIMPLEMENTED();
>-            return VK_FORMAT_UNDEFINED;
>-        case gl::VERTEX_FORMAT_UINT2:
>-            UNIMPLEMENTED();
>-            return VK_FORMAT_UNDEFINED;
>-        case gl::VERTEX_FORMAT_UINT2_NORM:
>-            UNIMPLEMENTED();
>-            return VK_FORMAT_UNDEFINED;
>-        case gl::VERTEX_FORMAT_UINT3:
>-            UNIMPLEMENTED();
>-            return VK_FORMAT_UNDEFINED;
>-        case gl::VERTEX_FORMAT_UINT3_NORM:
>-            UNIMPLEMENTED();
>-            return VK_FORMAT_UNDEFINED;
>-        case gl::VERTEX_FORMAT_UINT4:
>-            UNIMPLEMENTED();
>-            return VK_FORMAT_UNDEFINED;
>-        case gl::VERTEX_FORMAT_UINT4_NORM:
>-            UNIMPLEMENTED();
>-            return VK_FORMAT_UNDEFINED;
>-        case gl::VERTEX_FORMAT_SBYTE1_INT:
>-            UNIMPLEMENTED();
>-            return VK_FORMAT_UNDEFINED;
>-        case gl::VERTEX_FORMAT_SBYTE2_INT:
>-            UNIMPLEMENTED();
>-            return VK_FORMAT_UNDEFINED;
>-        case gl::VERTEX_FORMAT_SBYTE3_INT:
>-            UNIMPLEMENTED();
>-            return VK_FORMAT_UNDEFINED;
>-        case gl::VERTEX_FORMAT_SBYTE4_INT:
>-            UNIMPLEMENTED();
>-            return VK_FORMAT_UNDEFINED;
>-        case gl::VERTEX_FORMAT_UBYTE1_INT:
>-            UNIMPLEMENTED();
>-            return VK_FORMAT_UNDEFINED;
>-        case gl::VERTEX_FORMAT_UBYTE2_INT:
>-            UNIMPLEMENTED();
>-            return VK_FORMAT_UNDEFINED;
>-        case gl::VERTEX_FORMAT_UBYTE3_INT:
>-            UNIMPLEMENTED();
>-            return VK_FORMAT_UNDEFINED;
>-        case gl::VERTEX_FORMAT_UBYTE4_INT:
>-            UNIMPLEMENTED();
>-            return VK_FORMAT_UNDEFINED;
>-        case gl::VERTEX_FORMAT_SSHORT1_INT:
>-            UNIMPLEMENTED();
>-            return VK_FORMAT_UNDEFINED;
>-        case gl::VERTEX_FORMAT_SSHORT2_INT:
>-            UNIMPLEMENTED();
>-            return VK_FORMAT_UNDEFINED;
>-        case gl::VERTEX_FORMAT_SSHORT3_INT:
>-            UNIMPLEMENTED();
>-            return VK_FORMAT_UNDEFINED;
>-        case gl::VERTEX_FORMAT_SSHORT4_INT:
>-            UNIMPLEMENTED();
>-            return VK_FORMAT_UNDEFINED;
>-        case gl::VERTEX_FORMAT_USHORT1_INT:
>-            UNIMPLEMENTED();
>-            return VK_FORMAT_UNDEFINED;
>-        case gl::VERTEX_FORMAT_USHORT2_INT:
>-            UNIMPLEMENTED();
>-            return VK_FORMAT_UNDEFINED;
>-        case gl::VERTEX_FORMAT_USHORT3_INT:
>-            UNIMPLEMENTED();
>-            return VK_FORMAT_UNDEFINED;
>-        case gl::VERTEX_FORMAT_USHORT4_INT:
>-            UNIMPLEMENTED();
>-            return VK_FORMAT_UNDEFINED;
>-        case gl::VERTEX_FORMAT_SINT1_INT:
>-            UNIMPLEMENTED();
>-            return VK_FORMAT_UNDEFINED;
>-        case gl::VERTEX_FORMAT_SINT2_INT:
>-            UNIMPLEMENTED();
>-            return VK_FORMAT_UNDEFINED;
>-        case gl::VERTEX_FORMAT_SINT3_INT:
>-            UNIMPLEMENTED();
>-            return VK_FORMAT_UNDEFINED;
>-        case gl::VERTEX_FORMAT_SINT4_INT:
>-            UNIMPLEMENTED();
>-            return VK_FORMAT_UNDEFINED;
>-        case gl::VERTEX_FORMAT_UINT1_INT:
>-            UNIMPLEMENTED();
>-            return VK_FORMAT_UNDEFINED;
>-        case gl::VERTEX_FORMAT_UINT2_INT:
>-            UNIMPLEMENTED();
>-            return VK_FORMAT_UNDEFINED;
>-        case gl::VERTEX_FORMAT_UINT3_INT:
>-            UNIMPLEMENTED();
>-            return VK_FORMAT_UNDEFINED;
>-        case gl::VERTEX_FORMAT_UINT4_INT:
>-            UNIMPLEMENTED();
>-            return VK_FORMAT_UNDEFINED;
>-        case gl::VERTEX_FORMAT_FIXED1:
>-            UNIMPLEMENTED();
>-            return VK_FORMAT_UNDEFINED;
>-        case gl::VERTEX_FORMAT_FIXED2:
>-            UNIMPLEMENTED();
>-            return VK_FORMAT_UNDEFINED;
>-        case gl::VERTEX_FORMAT_FIXED3:
>-            UNIMPLEMENTED();
>-            return VK_FORMAT_UNDEFINED;
>-        case gl::VERTEX_FORMAT_FIXED4:
>-            UNIMPLEMENTED();
>-            return VK_FORMAT_UNDEFINED;
>-        case gl::VERTEX_FORMAT_HALF1:
>-            UNIMPLEMENTED();
>-            return VK_FORMAT_UNDEFINED;
>-        case gl::VERTEX_FORMAT_HALF2:
>-            UNIMPLEMENTED();
>-            return VK_FORMAT_UNDEFINED;
>-        case gl::VERTEX_FORMAT_HALF3:
>-            UNIMPLEMENTED();
>-            return VK_FORMAT_UNDEFINED;
>-        case gl::VERTEX_FORMAT_HALF4:
>-            UNIMPLEMENTED();
>-            return VK_FORMAT_UNDEFINED;
>-        case gl::VERTEX_FORMAT_FLOAT1:
>-            return VK_FORMAT_R32_SFLOAT;
>-        case gl::VERTEX_FORMAT_FLOAT2:
>-            return VK_FORMAT_R32G32_SFLOAT;
>-        case gl::VERTEX_FORMAT_FLOAT3:
>-            return VK_FORMAT_R32G32B32_SFLOAT;
>-        case gl::VERTEX_FORMAT_FLOAT4:
>-            return VK_FORMAT_R32G32B32A32_SFLOAT;
>-        case gl::VERTEX_FORMAT_SINT210:
>-            UNIMPLEMENTED();
>-            return VK_FORMAT_UNDEFINED;
>-        case gl::VERTEX_FORMAT_UINT210:
>-            UNIMPLEMENTED();
>-            return VK_FORMAT_UNDEFINED;
>-        case gl::VERTEX_FORMAT_SINT210_NORM:
>-            UNIMPLEMENTED();
>-            return VK_FORMAT_UNDEFINED;
>-        case gl::VERTEX_FORMAT_UINT210_NORM:
>-            UNIMPLEMENTED();
>-            return VK_FORMAT_UNDEFINED;
>-        case gl::VERTEX_FORMAT_SINT210_INT:
>-            UNIMPLEMENTED();
>-            return VK_FORMAT_UNDEFINED;
>-        case gl::VERTEX_FORMAT_UINT210_INT:
>-            UNIMPLEMENTED();
>-            return VK_FORMAT_UNDEFINED;
>-        default:
>-            UNREACHABLE();
>-            return VK_FORMAT_UNDEFINED;
>-    }
>-}
>-
>-}  // namespace vk
>-
>-}  // namespace rx
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/formatutilsvk.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/formatutilsvk.h
>deleted file mode 100644
>index 077365196c0..00000000000
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/formatutilsvk.h
>+++ /dev/null
>@@ -1,73 +0,0 @@
>-//
>-// Copyright 2016 The ANGLE Project Authors. All rights reserved.
>-// Use of this source code is governed by a BSD-style license that can be
>-// found in the LICENSE file.
>-//
>-// Vk::Format:
>-//   Vulkan implementation of a storage format.
>-
>-#ifndef LIBANGLE_RENDERER_VULKAN_FORMAT_H_
>-#define LIBANGLE_RENDERER_VULKAN_FORMAT_H_
>-
>-#include <vulkan/vulkan.h>
>-
>-#include "libANGLE/formatutils.h"
>-#include "libANGLE/renderer/Format.h"
>-#include "libANGLE/renderer/renderer_utils.h"
>-
>-#include <array>
>-
>-namespace gl
>-{
>-class TextureCapsMap;
>-}  // namespace gl
>-
>-namespace rx
>-{
>-
>-namespace vk
>-{
>-
>-struct Format final : private angle::NonCopyable
>-{
>-    Format();
>-
>-    // This is an auto-generated method in vk_format_table_autogen.cpp.
>-    void initialize(VkPhysicalDevice physicalDevice, const angle::Format &angleFormat);
>-
>-    const angle::Format &textureFormat() const;
>-    const angle::Format &bufferFormat() const;
>-
>-    GLenum internalFormat;
>-    angle::Format::ID textureFormatID;
>-    VkFormat vkTextureFormat;
>-    angle::Format::ID bufferFormatID;
>-    VkFormat vkBufferFormat;
>-    InitializeTextureDataFunction dataInitializerFunction;
>-    LoadFunctionMap loadFunctions;
>-};
>-
>-class FormatTable final : angle::NonCopyable
>-{
>-  public:
>-    FormatTable();
>-    ~FormatTable();
>-
>-    // Also initializes the TextureCapsMap.
>-    void initialize(VkPhysicalDevice physicalDevice, gl::TextureCapsMap *textureCapsMap);
>-
>-    const Format &operator[](GLenum internalFormat) const;
>-
>-  private:
>-    // The table data is indexed by angle::Format::ID.
>-    std::array<Format, angle::kNumANGLEFormats> mFormatData;
>-};
>-
>-// TODO(jmadill): This is temporary. Figure out how to handle format conversions.
>-VkFormat GetNativeVertexFormat(gl::VertexFormatType vertexFormat);
>-
>-}  // namespace vk
>-
>-}  // namespace rx
>-
>-#endif  // LIBANGLE_RENDERER_VULKAN_FORMAT_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/fuchsia/DisplayVkFuchsia.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/fuchsia/DisplayVkFuchsia.cpp
>new file mode 100644
>index 00000000000..19d08e8e7d0
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/fuchsia/DisplayVkFuchsia.cpp
>@@ -0,0 +1,59 @@
>+//
>+// Copyright 2019 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// DisplayVkFuchsia.h:
>+//    Implements methods from DisplayVkFuchsia
>+//
>+
>+#include "libANGLE/renderer/vulkan/fuchsia/DisplayVkFuchsia.h"
>+
>+#include "libANGLE/renderer/vulkan/fuchsia/WindowSurfaceVkFuchsia.h"
>+#include "libANGLE/renderer/vulkan/vk_caps_utils.h"
>+
>+namespace rx
>+{
>+
>+DisplayVkFuchsia::DisplayVkFuchsia(const egl::DisplayState &state) : DisplayVk(state) {}
>+
>+bool DisplayVkFuchsia::isValidNativeWindow(EGLNativeWindowType window) const
>+{
>+    return WindowSurfaceVkFuchsia::isValidNativeWindow(window);
>+}
>+
>+SurfaceImpl *DisplayVkFuchsia::createWindowSurfaceVk(const egl::SurfaceState &state,
>+                                                     EGLNativeWindowType window,
>+                                                     EGLint width,
>+                                                     EGLint height)
>+{
>+    ASSERT(isValidNativeWindow(window));
>+    return new WindowSurfaceVkFuchsia(state, window, width, height);
>+}
>+
>+egl::ConfigSet DisplayVkFuchsia::generateConfigs()
>+{
>+    constexpr GLenum kColorFormats[] = {GL_BGRA8_EXT, GL_BGRX8_ANGLEX};
>+    constexpr EGLint kSampleCounts[] = {0};
>+    return egl_vk::GenerateConfigs(kColorFormats, egl_vk::kConfigDepthStencilFormats, kSampleCounts,
>+                                   this);
>+}
>+
>+bool DisplayVkFuchsia::checkConfigSupport(egl::Config *config)
>+{
>+    // TODO(geofflang): Test for native support and modify the config accordingly.
>+    // anglebug.com/2692
>+    return true;
>+}
>+
>+const char *DisplayVkFuchsia::getWSIExtension() const
>+{
>+    return VK_FUCHSIA_IMAGEPIPE_SURFACE_EXTENSION_NAME;
>+}
>+
>+const char *DisplayVkFuchsia::getWSILayer() const
>+{
>+    return "VK_LAYER_FUCHSIA_imagepipe_swapchain";
>+}
>+
>+}  // namespace rx
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/fuchsia/DisplayVkFuchsia.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/fuchsia/DisplayVkFuchsia.h
>new file mode 100644
>index 00000000000..c6f3c6c73e7
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/fuchsia/DisplayVkFuchsia.h
>@@ -0,0 +1,39 @@
>+//
>+// Copyright 2019 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// DisplayVkFuchsia.h:
>+//    Subclasses DisplayVk for the Fuchsia platform.
>+//
>+
>+#ifndef LIBANGLE_RENDERER_VULKAN_FUCHSIA_DISPLAYVKFUCHSIA_H_
>+#define LIBANGLE_RENDERER_VULKAN_FUCHSIA_DISPLAYVKFUCHSIA_H_
>+
>+#include "libANGLE/renderer/vulkan/DisplayVk.h"
>+
>+namespace rx
>+{
>+
>+class DisplayVkFuchsia : public DisplayVk
>+{
>+  public:
>+    DisplayVkFuchsia(const egl::DisplayState &state);
>+
>+    bool isValidNativeWindow(EGLNativeWindowType window) const override;
>+
>+    SurfaceImpl *createWindowSurfaceVk(const egl::SurfaceState &state,
>+                                       EGLNativeWindowType window,
>+                                       EGLint width,
>+                                       EGLint height) override;
>+
>+    egl::ConfigSet generateConfigs() override;
>+    bool checkConfigSupport(egl::Config *config) override;
>+
>+    const char *getWSIExtension() const override;
>+    const char *getWSILayer() const override;
>+};
>+
>+}  // namespace rx
>+
>+#endif  // LIBANGLE_RENDERER_VULKAN_FUCHSIA_DISPLAYVKFUCHSIA_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/fuchsia/WindowSurfaceVkFuchsia.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/fuchsia/WindowSurfaceVkFuchsia.cpp
>new file mode 100644
>index 00000000000..fa8f4e2ff1d
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/fuchsia/WindowSurfaceVkFuchsia.cpp
>@@ -0,0 +1,66 @@
>+//
>+// Copyright 2019 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// WindowSurfaceVkFuchsia.cpp:
>+//    Implements methods from WindowSurfaceVkFuchsia.
>+//
>+
>+#include "libANGLE/renderer/vulkan/fuchsia/WindowSurfaceVkFuchsia.h"
>+
>+#include <fuchsia_egl.h>
>+#include <fuchsia_egl_backend.h>
>+#include <zircon/syscalls.h>
>+#include <zircon/syscalls/object.h>
>+
>+#include "libANGLE/renderer/vulkan/RendererVk.h"
>+#include "libANGLE/renderer/vulkan/vk_utils.h"
>+
>+namespace rx
>+{
>+
>+WindowSurfaceVkFuchsia::WindowSurfaceVkFuchsia(const egl::SurfaceState &surfaceState,
>+                                               EGLNativeWindowType window,
>+                                               EGLint width,
>+                                               EGLint height)
>+    : WindowSurfaceVk(surfaceState, window, width, height)
>+{}
>+
>+WindowSurfaceVkFuchsia::~WindowSurfaceVkFuchsia() {}
>+
>+// static
>+bool WindowSurfaceVkFuchsia::isValidNativeWindow(EGLNativeWindowType window)
>+{
>+    fuchsia_egl_window *egl_window = reinterpret_cast<fuchsia_egl_window *>(window);
>+    return fuchsia_egl_window_get_width(egl_window) >= 0;
>+}
>+
>+angle::Result WindowSurfaceVkFuchsia::createSurfaceVk(vk::Context *context, gl::Extents *extentsOut)
>+{
>+    InitImagePipeSurfaceFUCHSIAFunctions(context->getRenderer()->getInstance());
>+    fuchsia_egl_window *egl_window = reinterpret_cast<fuchsia_egl_window *>(mNativeWindowType);
>+
>+    VkImagePipeSurfaceCreateInfoFUCHSIA createInfo = {};
>+    createInfo.sType           = VK_STRUCTURE_TYPE_IMAGEPIPE_SURFACE_CREATE_INFO_FUCHSIA;
>+    createInfo.imagePipeHandle = fuchsia_egl_window_release_image_pipe(egl_window);
>+    ANGLE_VK_TRY(context, vkCreateImagePipeSurfaceFUCHSIA(context->getRenderer()->getInstance(),
>+                                                          &createInfo, nullptr, &mSurface));
>+
>+    return getCurrentWindowSize(context, extentsOut);
>+}
>+
>+angle::Result WindowSurfaceVkFuchsia::getCurrentWindowSize(vk::Context *context,
>+                                                           gl::Extents *extentsOut)
>+{
>+    fuchsia_egl_window *egl_window = reinterpret_cast<fuchsia_egl_window *>(mNativeWindowType);
>+
>+    int32_t width  = fuchsia_egl_window_get_width(egl_window);
>+    int32_t height = fuchsia_egl_window_get_height(egl_window);
>+
>+    *extentsOut = gl::Extents(width, height, 0);
>+
>+    return angle::Result::Continue;
>+}
>+
>+}  // namespace rx
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/fuchsia/WindowSurfaceVkFuchsia.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/fuchsia/WindowSurfaceVkFuchsia.h
>new file mode 100644
>index 00000000000..e9ce81803ec
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/fuchsia/WindowSurfaceVkFuchsia.h
>@@ -0,0 +1,36 @@
>+//
>+// Copyright 2019 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// WindowSurfaceVkFuchsia.h:
>+//    Subclasses WindowSurfaceVk for the Fuchsia platform.
>+//
>+
>+#ifndef LIBANGLE_RENDERER_VULKAN_FUCHSIA_WINDOWSURFACEVKFUCHSIA_H_
>+#define LIBANGLE_RENDERER_VULKAN_FUCHSIA_WINDOWSURFACEVKFUCHSIA_H_
>+
>+#include "libANGLE/renderer/vulkan/SurfaceVk.h"
>+
>+namespace rx
>+{
>+
>+class WindowSurfaceVkFuchsia : public WindowSurfaceVk
>+{
>+  public:
>+    WindowSurfaceVkFuchsia(const egl::SurfaceState &surfaceState,
>+                           EGLNativeWindowType window,
>+                           EGLint width,
>+                           EGLint height);
>+    ~WindowSurfaceVkFuchsia() override;
>+
>+    static bool isValidNativeWindow(EGLNativeWindowType window);
>+
>+  private:
>+    angle::Result createSurfaceVk(vk::Context *context, gl::Extents *extentsOut) override;
>+    angle::Result getCurrentWindowSize(vk::Context *context, gl::Extents *extentsOut) override;
>+};
>+
>+}  // namespace rx
>+
>+#endif  // LIBANGLE_RENDERER_VULKAN_FUCHSIA_WINDOWSURFACEVKFUCHSIA_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/gen_vk_format_table.py b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/gen_vk_format_table.py
>index 31304335814..7ddef0ed774 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/gen_vk_format_table.py
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/gen_vk_format_table.py
>@@ -4,7 +4,8 @@
> # found in the LICENSE file.
> #
> # gen_vk_format_table.py:
>-#  Code generation for vk format map
>+#  Code generation for vk format map. See vk_format_map.json for data source.
>+#  NOTE: don't run this script directly. Run scripts/run_code_generation.py.
> 
> from datetime import date
> import json
>@@ -27,7 +28,7 @@ template_table_autogen_cpp = """// GENERATED FILE - DO NOT EDIT.
> // {out_file_name}:
> //   Queries for full Vulkan format information based on GL format.
> 
>-#include "libANGLE/renderer/vulkan/formatutilsvk.h"
>+#include "libANGLE/renderer/vulkan/vk_format_utils.h"
> 
> #include "image_util/copyimage.h"
> #include "image_util/generatemip.h"
>@@ -41,7 +42,8 @@ namespace rx
> namespace vk
> {{
> 
>-void Format::initialize(VkPhysicalDevice physicalDevice, const angle::Format &angleFormat)
>+void Format::initialize(RendererVk *renderer,
>+                        const angle::Format &angleFormat)
> {{
>     switch (angleFormat.id)
>     {{
>@@ -57,82 +59,152 @@ void Format::initialize(VkPhysicalDevice physicalDevice, const angle::Format &an
> }}  // namespace rx
> """
> 
>-empty_format_entry_template = """{space}case angle::Format::ID::{format_id}:
>-{space}    // This format is not implemented in Vulkan.
>-{space}    break;
>+empty_format_entry_template = """case angle::FormatID::{format_id}:
>+// This format is not implemented in Vulkan.
>+break;
> """
> 
>-format_entry_template = """{space}case angle::Format::ID::{format_id}:
>-{space}{{
>-{space}    internalFormat = {internal_format};
>-{space}    textureFormatID = angle::Format::ID::{texture_format_id};
>-{space}    vkTextureFormat = {vk_texture_format};
>-{space}    bufferFormatID = angle::Format::ID::{buffer_format_id};
>-{space}    vkBufferFormat = {vk_buffer_format};
>-{space}    dataInitializerFunction = {initializer};
>-{space}    break;
>-{space}}}
>+format_entry_template = """case angle::FormatID::{format_id}:
>+internalFormat = {internal_format};
>+{image_template}
>+{buffer_template}
>+break;
> """
> 
>-def gen_format_case(angle, internal_format, vk_map):
>-
>-    if angle not in vk_map or angle == 'NONE':
>-        return empty_format_entry_template.format(
>-            space = '        ',
>-            format_id = angle)
>-
>-    texture_format_id = angle
>-    buffer_format_id = angle
>-
>-    vk_format_name = vk_map[angle]
>-    vk_buffer_format = vk_format_name
>-    vk_texture_format = vk_format_name
>-
>-    if isinstance(vk_format_name, dict):
>-        info = vk_format_name
>-        vk_format_name = info["native"]
>-
>-        if "buffer" in info:
>-            buffer_format_id = info["buffer"]
>-            vk_buffer_format = vk_map[buffer_format_id]
>-            assert(not isinstance(vk_buffer_format, dict))
>-        else:
>-            vk_buffer_format = vk_format_name
>-
>-        if "texture" in info:
>-            texture_format_id = info["texture"]
>-            vk_texture_format = vk_map[texture_format_id]
>-            assert(not isinstance(vk_texture_format, dict))
>+image_basic_template = """imageFormatID = {image};
>+vkImageFormat = {vk_image_format};
>+imageInitializerFunction = {image_initializer};"""
>+
>+image_struct_template="{{{image}, {vk_image_format}, {image_initializer}}}"
>+
>+image_fallback_template = """{{
>+static constexpr ImageFormatInitInfo kInfo[] = {{{image_list}}};
>+initImageFallback(renderer, kInfo, ArraySize(kInfo));
>+}}"""
>+
>+buffer_basic_template = """bufferFormatID = {buffer};
>+vkBufferFormat = {vk_buffer_format};
>+vkBufferFormatIsPacked = {vk_buffer_format_is_packed};
>+vertexLoadFunction = {vertex_load_function};
>+vertexLoadRequiresConversion = {vertex_load_converts};"""
>+
>+buffer_struct_template="""{{{buffer}, {vk_buffer_format}, {vk_buffer_format_is_packed}, 
>+{vertex_load_function}, {vertex_load_converts}}}"""
>+
>+buffer_fallback_template = """{{
>+static constexpr BufferFormatInitInfo kInfo[] = {{{buffer_list}}};
>+initBufferFallback(renderer, kInfo, ArraySize(kInfo));
>+}}"""
>+
>+
>+def is_packed(format_id):
>+    return "true" if "_PACK" in format_id else "false"
>+
>+
>+def gen_format_case(angle, internal_format, vk_json_data):
>+    vk_map = vk_json_data["map"]
>+    vk_overrides = vk_json_data["overrides"]
>+    vk_fallbacks = vk_json_data["fallbacks"]
>+    args = dict(
>+        format_id=angle,
>+        internal_format=internal_format,
>+        image_template="",
>+        buffer_template="")
>+
>+    if ((angle not in vk_map) and (angle not in vk_overrides) and
>+          (angle not in vk_fallbacks)) or angle == 'NONE':
>+        return empty_format_entry_template.format(**args)
>+
>+    def get_formats(format, type):
>+        format = vk_overrides.get(format, {}).get(type, format)
>+        if format not in vk_map:
>+            return []
>+        fallbacks = vk_fallbacks.get(format, {}).get(type, [])
>+        if not isinstance(fallbacks, list):
>+            fallbacks = [fallbacks]
>+        return [format] + fallbacks
>+
>+    def image_args(format):
>+        return dict(
>+            image="angle::FormatID::" + format,
>+            vk_image_format=vk_map[format],
>+            image_initializer=angle_format.get_internal_format_initializer(
>+                internal_format, format))
>+
>+    def buffer_args(format):
>+        return dict(
>+            buffer="angle::FormatID::" + format,
>+            vk_buffer_format=vk_map[format],
>+            vk_buffer_format_is_packed=is_packed(vk_map[format]),
>+            vertex_load_function=angle_format.get_vertex_copy_function(
>+                angle, format),
>+            vertex_load_converts='false' if angle == format else 'true',
>+        )
>+
>+    images = get_formats(angle, "image")
>+    if len(images) == 1:
>+        args.update(image_template=image_basic_template)
>+        args.update(image_args(images[0]))
>+    elif len(images) > 1:
>+        args.update(
>+            image_template=image_fallback_template,
>+            image_list=", ".join(
>+                image_struct_template.format(**image_args(i))
>+                for i in images))
>+
>+    buffers = get_formats(angle, "buffer")
>+    if len(buffers) == 1:
>+        args.update(buffer_template=buffer_basic_template)
>+        args.update(buffer_args(buffers[0]))
>+    elif len(buffers) > 1:
>+        args.update(
>+            buffer_template=buffer_fallback_template,
>+            buffer_list=", ".join(
>+                buffer_struct_template.format(**buffer_args(i)) for i in buffers))
>+
>+    return format_entry_template.format(**args).format(**args)
>+
>+
>+def main():
>+
>+    input_file_name = 'vk_format_map.json'
>+    out_file_name = 'vk_format_table_autogen.cpp'
>+
>+    # auto_script parameters.
>+    if len(sys.argv) > 1:
>+        inputs = [
>+            '../angle_format.py',
>+            '../angle_format_map.json',
>+            input_file_name
>+        ]
>+        outputs = [out_file_name]
>+
>+        if sys.argv[1] == 'inputs':
>+            print ','.join(inputs)
>+        elif sys.argv[1] == 'outputs':
>+            print ','.join(outputs)
>         else:
>-            vk_texture_format = vk_format_name
>-
>-    initializer = angle_format.get_internal_format_initializer(
>-        internal_format, texture_format_id)
>-
>-    return format_entry_template.format(
>-        space = '        ',
>-        internal_format = internal_format,
>-        format_id = angle,
>-        texture_format_id = texture_format_id,
>-        buffer_format_id = buffer_format_id,
>-        vk_buffer_format = vk_buffer_format,
>-        vk_texture_format = vk_texture_format,
>-        initializer = initializer)
>-
>-input_file_name = 'vk_format_map.json'
>-out_file_name = 'vk_format_table'
>-
>-angle_to_gl = angle_format.load_inverse_table(os.path.join('..', 'angle_format_map.json'))
>-vk_map = angle_format.load_json(input_file_name)
>-vk_cases = [gen_format_case(angle, gl, vk_map) for angle, gl in sorted(angle_to_gl.iteritems())]
>-
>-output_cpp = template_table_autogen_cpp.format(
>-    copyright_year = date.today().year,
>-    format_case_data = "\n".join(vk_cases),
>-    script_name = __file__,
>-    out_file_name = out_file_name,
>-    input_file_name = input_file_name)
>-
>-with open(out_file_name + '_autogen.cpp', 'wt') as out_file:
>-    out_file.write(output_cpp)
>-    out_file.close()
>+            print('Invalid script parameters')
>+            return 1
>+        return 0
>+
>+    angle_to_gl = angle_format.load_inverse_table(os.path.join('..', 'angle_format_map.json'))
>+    vk_json_data = angle_format.load_json(input_file_name)
>+    vk_cases = [gen_format_case(angle, gl, vk_json_data)
>+               for angle, gl in sorted(angle_to_gl.iteritems())]
>+
>+    output_cpp = template_table_autogen_cpp.format(
>+        copyright_year = date.today().year,
>+        format_case_data = "\n".join(vk_cases),
>+        script_name = __file__,
>+        out_file_name = out_file_name,
>+        input_file_name = input_file_name)
>+
>+    with open(out_file_name, 'wt') as out_file:
>+        out_file.write(output_cpp)
>+        out_file.close()
>+    return 0
>+
>+
>+if __name__ == '__main__':
>+    sys.exit(main())
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/gen_vk_internal_shaders.py b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/gen_vk_internal_shaders.py
>new file mode 100644
>index 00000000000..089395c00ee
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/gen_vk_internal_shaders.py
>@@ -0,0 +1,677 @@
>+#!/usr/bin/python
>+# Copyright 2018 The ANGLE Project Authors. All rights reserved.
>+# Use of this source code is governed by a BSD-style license that can be
>+# found in the LICENSE file.
>+#
>+# gen_vk_internal_shaders.py:
>+#  Code generation for internal Vulkan shaders. Should be run when an internal
>+#  shader program is changed, added or removed.
>+#  Because this script can be slow direct invocation is supported. But before
>+#  code upload please run scripts/run_code_generation.py.
>+
>+from datetime import date
>+import io
>+import json
>+import multiprocessing
>+import os
>+import platform
>+import re
>+import subprocess
>+import sys
>+
>+out_file_cpp = 'vk_internal_shaders_autogen.cpp'
>+out_file_h = 'vk_internal_shaders_autogen.h'
>+out_file_gni = 'vk_internal_shaders_autogen.gni'
>+
>+is_windows = platform.system() == 'Windows'
>+is_linux  = platform.system() == 'Linux'
>+
>+# Templates for the generated files:
>+template_shader_library_cpp = u"""// GENERATED FILE - DO NOT EDIT.
>+// Generated by {script_name} using data from {input_file_name}
>+//
>+// Copyright {copyright_year} The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// {out_file_name}:
>+//   Pre-generated shader library for the ANGLE Vulkan back-end.
>+
>+#include "libANGLE/renderer/vulkan/vk_internal_shaders_autogen.h"
>+
>+namespace rx
>+{{
>+namespace vk
>+{{
>+namespace
>+{{
>+{internal_shader_includes}
>+
>+// This is SPIR-V binary blob and the size.
>+struct ShaderBlob
>+{{
>+    const uint32_t *code;
>+    size_t codeSize;
>+}};
>+
>+{shader_tables_cpp}
>+
>+angle::Result GetShader(Context *context,
>+                        RefCounted<ShaderAndSerial> *shaders,
>+                        const ShaderBlob *shaderBlobs,
>+                        size_t shadersCount,
>+                        uint32_t shaderFlags,
>+                        RefCounted<ShaderAndSerial> **shaderOut)
>+{{
>+    ASSERT(shaderFlags < shadersCount);
>+    RefCounted<ShaderAndSerial> &shader = shaders[shaderFlags];
>+    *shaderOut                          = &shader;
>+
>+    if (shader.get().valid())
>+    {{
>+        return angle::Result::Continue;
>+    }}
>+
>+    // Create shader lazily. Access will need to be locked for multi-threading.
>+    const ShaderBlob &shaderCode = shaderBlobs[shaderFlags];
>+    ASSERT(shaderCode.code != nullptr);
>+
>+    return InitShaderAndSerial(context, &shader.get(), shaderCode.code, shaderCode.codeSize);
>+}}
>+}}  // anonymous namespace
>+
>+
>+ShaderLibrary::ShaderLibrary()
>+{{
>+}}
>+
>+ShaderLibrary::~ShaderLibrary()
>+{{
>+}}
>+
>+void ShaderLibrary::destroy(VkDevice device)
>+{{
>+    {shader_destroy_calls}
>+}}
>+
>+{shader_get_functions_cpp}
>+}}  // namespace vk
>+}}  // namespace rx
>+"""
>+
>+template_shader_library_h = u"""// GENERATED FILE - DO NOT EDIT.
>+// Generated by {script_name} using data from {input_file_name}
>+//
>+// Copyright {copyright_year} The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// {out_file_name}:
>+//   Pre-generated shader library for the ANGLE Vulkan back-end.
>+
>+#ifndef LIBANGLE_RENDERER_VULKAN_VK_INTERNAL_SHADERS_AUTOGEN_H_
>+#define LIBANGLE_RENDERER_VULKAN_VK_INTERNAL_SHADERS_AUTOGEN_H_
>+
>+#include "libANGLE/renderer/vulkan/vk_utils.h"
>+
>+namespace rx
>+{{
>+namespace vk
>+{{
>+namespace InternalShader
>+{{
>+{shader_variation_definitions}
>+}}  // namespace InternalShader
>+
>+class ShaderLibrary final : angle::NonCopyable
>+{{
>+  public:
>+    ShaderLibrary();
>+    ~ShaderLibrary();
>+
>+    void destroy(VkDevice device);
>+
>+    {shader_get_functions_h}
>+
>+  private:
>+    {shader_tables_h}
>+}};
>+}}  // namespace vk
>+}}  // namespace rx
>+
>+#endif  // LIBANGLE_RENDERER_VULKAN_VK_INTERNAL_SHADERS_AUTOGEN_H_
>+"""
>+
>+template_shader_includes_gni = u"""# GENERATED FILE - DO NOT EDIT.
>+# Generated by {script_name} using data from {input_file_name}
>+#
>+# Copyright {copyright_year} The ANGLE Project Authors. All rights reserved.
>+# Use of this source code is governed by a BSD-style license that can be
>+# found in the LICENSE file.
>+#
>+# {out_file_name}:
>+#   List of generated shaders for inclusion in ANGLE's build process.
>+
>+angle_vulkan_internal_shaders = [
>+{shaders_list}
>+]
>+"""
>+
>+# Gets the constant variable name for a generated shader.
>+def get_var_name(output, prefix='k'):
>+    return prefix + output.replace(".", "_")
>+
>+# Gets the namespace name given to constants generated from shader_file
>+def get_namespace_name(shader_file):
>+    return get_var_name(os.path.basename(shader_file), '')
>+
>+# Gets the namespace name given to constants generated from shader_file
>+def get_variation_table_name(shader_file, prefix='k'):
>+    return get_var_name(os.path.basename(shader_file), prefix) + '_shaders'
>+
>+# Gets the internal ID string for a particular shader.
>+def get_shader_id(shader):
>+    file = os.path.splitext(os.path.basename(shader))[0]
>+    return file.replace(".", "_")
>+
>+# Returns the name of the generated SPIR-V file for a shader.
>+def get_output_path(name):
>+    return os.path.join('shaders', 'gen', name + ".inc")
>+
>+# Finds a path to GN's out directory
>+def get_linux_glslang_exe_path():
>+    return '../../../../tools/glslang/glslang_validator'
>+
>+def get_win_glslang_exe_path():
>+    return get_linux_glslang_exe_path() + '.exe'
>+
>+def get_glslang_exe_path():
>+    glslang_exe = get_win_glslang_exe_path() if is_windows else get_linux_glslang_exe_path()
>+    if not os.path.isfile(glslang_exe):
>+        raise Exception('Could not find %s' % glslang_exe)
>+    return glslang_exe
>+
>+
>+# Generates the code for a shader blob array entry.
>+def gen_shader_blob_entry(shader):
>+    var_name = get_var_name(os.path.basename(shader))[0:-4]
>+    return "{%s, %s}" % (var_name, "sizeof(%s)" % var_name)
>+
>+def slash(s):
>+    return s.replace('\\', '/')
>+
>+def gen_shader_include(shader):
>+    return '#include "libANGLE/renderer/vulkan/%s"' % slash(shader)
>+
>+def get_shader_variations(shader):
>+    variation_file = shader + '.json'
>+    if not os.path.exists(variation_file):
>+        # If there is no variation file, assume none.
>+        return ({}, [])
>+
>+    with open(variation_file) as fin:
>+        variations = json.loads(fin.read())
>+        flags = {}
>+        enums = []
>+
>+        for key, value in variations.iteritems():
>+            if key == "Description":
>+                continue
>+            elif key == "Flags":
>+                flags = value
>+            elif len(value) > 0:
>+                enums.append((key, value))
>+
>+        # sort enums so the ones with the most waste ends up last, reducing the table size
>+        enums.sort(key=lambda enum: (1 << (len(enum[1]) - 1).bit_length()) / float(len(enum[1])))
>+
>+        return (flags, enums)
>+
>+def get_variation_bits(flags, enums):
>+    flags_bits = len(flags)
>+    enum_bits = [(len(enum[1]) - 1).bit_length() for enum in enums]
>+    return (flags_bits, enum_bits)
>+
>+def next_enum_variation(enums, enum_indices):
>+    """Loop through indices from [0, 0, ...] to [L0-1, L1-1, ...]
>+    where Li is len(enums[i]).  The list can be thought of as a number with many
>+    digits, where each digit is in [0, Li), and this function effectively implements
>+    the increment operation, with the least-significant digit being the first item."""
>+    for i in range(len(enums)):
>+        current = enum_indices[i]
>+        # if current digit has room, increment it.
>+        if current + 1 < len(enums[i][1]):
>+            enum_indices[i] = current + 1
>+            return True;
>+        # otherwise reset it to 0 and carry to the next digit.
>+        enum_indices[i] = 0
>+
>+    # if this is reached, the number has overflowed and the loop is finished.
>+    return False
>+
>+compact_newlines_regex = re.compile(r"\n\s*\n", re.MULTILINE)
>+def cleanup_preprocessed_shader(shader_text):
>+    return compact_newlines_regex.sub('\n\n', shader_text.strip())
>+
>+class CompileQueue:
>+    class AppendPreprocessorOutput:
>+        def __init__(self, shader_file, preprocessor_args, output_path):
>+            # Asynchronously launch the preprocessor job.
>+            self.process = subprocess.Popen(preprocessor_args,
>+                                            stdout=subprocess.PIPE,
>+                                            stderr=subprocess.PIPE)
>+            # Store the file name for output to be appended to.
>+            self.output_path = output_path
>+            # Store info for error description.
>+            self.shader_file = shader_file
>+
>+        def wait(self, queue):
>+            (out, err) = self.process.communicate()
>+            if self.process.returncode == 0:
>+                # Append preprocessor output to the output file.
>+                with open(self.output_path, 'ab') as incfile:
>+                    incfile.write('\n\n#if 0  // Generated from:\n')
>+                    incfile.write(cleanup_preprocessed_shader(out.replace('\r\n', '\n')))
>+                    incfile.write('\n#endif  // Preprocessed code\n')
>+                out = None
>+            return (out, err, self.process.returncode, None,
>+                    "Error running preprocessor on " + self.shader_file)
>+
>+    class CompileToSPIRV:
>+        def __init__(self, shader_file, shader_basename, variation_string, output_path,
>+                     compile_args, preprocessor_args):
>+            # Asynchronously launch the compile job.
>+            self.process = subprocess.Popen(compile_args,
>+                                            stdout=subprocess.PIPE,
>+                                            stderr=subprocess.PIPE)
>+            # Store info for launching the preprocessor.
>+            self.preprocessor_args = preprocessor_args
>+            self.output_path = output_path
>+            # Store info for job and error description.
>+            self.shader_file = shader_file
>+            self.shader_basename = shader_basename
>+            self.variation_string = variation_string
>+
>+        def wait(self, queue):
>+            (out, err) = self.process.communicate()
>+            if self.process.returncode == 0:
>+                # Insert the preprocessor job in the queue.
>+                queue.append(CompileQueue.AppendPreprocessorOutput(self.shader_file,
>+                                                                   self.preprocessor_args,
>+                                                                   self.output_path))
>+            # If all the output says is the source file name, don't bother printing it.
>+            if out.strip() == self.shader_file:
>+                out = None
>+            description = self.output_path + ': ' + self.shader_basename + self.variation_string
>+            return (out, err, self.process.returncode, description,
>+                    "Error compiling " + self.shader_file)
>+
>+    def __init__(self):
>+        # Compile with as many CPU threads are detected.  Once a shader is compiled, another job is
>+        # automatically added to the queue to append the preprocessor output to the generated file.
>+        self.queue = []
>+        self.thread_count = multiprocessing.cpu_count()
>+
>+    def _wait_first(self, ignore_output=False):
>+        (out, err, returncode, description, exception_description) = self.queue[0].wait(self.queue)
>+        self.queue.pop(0)
>+        if not ignore_output:
>+            if description:
>+                print description
>+            if out and out.strip():
>+                print out.strip()
>+            if err and err.strip():
>+                print err
>+            if returncode != 0:
>+                return exception_description
>+        return None
>+
>+    # Wait for all pending tasks.  If called after error is detected, ignore_output can be used to
>+    # make sure errors in later jobs are suppressed to avoid cluttering the output.  This is
>+    # because the same compile error is likely present in other variations of the same shader and
>+    # outputting the same error multiple times is not useful.
>+    def _wait_all(self, ignore_output=False):
>+        exception_description = None
>+        while len(self.queue) > 0:
>+            this_job_exception = self._wait_first(ignore_output)
>+            # If encountered an error, keep it to be raised, ignoring errors from following jobs.
>+            if this_job_exception and not ignore_output:
>+                exception_description = this_job_exception
>+                ignore_output = True
>+
>+        return exception_description
>+
>+    def add_job(self, shader_file, shader_basename, variation_string, output_path,
>+                compile_args, preprocessor_args):
>+        # If the queue is full, wait until there is at least one slot available.
>+        while len(self.queue) >= self.thread_count:
>+            exception = self._wait_first(False)
>+            # If encountered an exception, cleanup following jobs and raise it.
>+            if exception:
>+                self._wait_all(True)
>+                raise Exception(exception)
>+
>+        # Add a compile job
>+        self.queue.append(CompileQueue.CompileToSPIRV(shader_file, shader_basename,
>+                                                      variation_string, output_path,
>+                                                      compile_args, preprocessor_args))
>+
>+    def finish(self):
>+        exception = self._wait_all(False)
>+        # If encountered an exception, cleanup following jobs and raise it.
>+        if exception is not None:
>+            raise Exception(exception)
>+
>+def compile_variation(glslang_path, compile_queue, shader_file, shader_basename, flags, enums,
>+        flags_active, enum_indices, flags_bits, enum_bits, output_shaders):
>+
>+    glslang_args = [glslang_path]
>+
>+    # generate -D defines and the output file name
>+    #
>+    # The variations are given a bit pattern to be able to OR different flags into a variation. The
>+    # least significant bits are the flags, where there is one bit per flag.  After that, each enum
>+    # takes up as few bits as needed to count that many enum values.
>+    variation_bits = 0
>+    variation_string = ''
>+    for f in range(len(flags)):
>+        if flags_active & (1 << f):
>+            flag_name = flags[f]
>+            glslang_args.append('-D' + flag_name + '=1')
>+
>+            variation_bits |= 1 << f
>+            variation_string += '|' + flag_name
>+
>+    current_bit_start = flags_bits
>+
>+    for e in range(len(enums)):
>+        enum_name = enums[e][1][enum_indices[e]]
>+        glslang_args.append('-D' + enum_name + '=1')
>+
>+        variation_bits |= enum_indices[e] << current_bit_start
>+        current_bit_start += enum_bits[e]
>+        variation_string += '|' + enum_name
>+
>+    output_name = '%s.%08X' % (shader_basename, variation_bits)
>+    output_path = get_output_path(output_name)
>+    output_shaders.append(output_path)
>+
>+    if glslang_path is not None:
>+        glslang_preprocessor_output_args = glslang_args + ['-E']
>+        glslang_preprocessor_output_args.append(shader_file)           # Input GLSL shader
>+
>+        glslang_args += ['-V']                                         # Output mode is Vulkan
>+        glslang_args += ['--variable-name', get_var_name(output_name)] # C-style variable name
>+        glslang_args += ['-o', output_path]                            # Output file
>+        glslang_args.append(shader_file)                               # Input GLSL shader
>+
>+        compile_queue.add_job(shader_file, shader_basename, variation_string, output_path,
>+                              glslang_args, glslang_preprocessor_output_args)
>+
>+class ShaderAndVariations:
>+    def __init__(self, shader_file):
>+        self.shader_file = shader_file
>+        (self.flags, self.enums) = get_shader_variations(shader_file)
>+        get_variation_bits(self.flags, self.enums)
>+        (self.flags_bits, self.enum_bits) = get_variation_bits(self.flags, self.enums)
>+
>+
>+def get_variation_definition(shader_and_variation):
>+    shader_file = shader_and_variation.shader_file
>+    flags = shader_and_variation.flags
>+    enums = shader_and_variation.enums
>+    flags_bits = shader_and_variation.flags_bits
>+    enum_bits = shader_and_variation.enum_bits
>+
>+    namespace_name = get_namespace_name(shader_file)
>+
>+    definition = 'namespace %s\n{\n' % namespace_name
>+    if len(flags) > 0:
>+        definition += 'enum flags\n{\n'
>+        definition += ''.join(['k%s = 0x%08X,\n' % (flags[f], 1 << f) for f in range(len(flags))])
>+        definition += 'kFlagsMask = 0x%08X,\n' % ((1 << flags_bits) - 1)
>+        definition += '};\n'
>+
>+    current_bit_start = flags_bits
>+
>+    for e in range(len(enums)):
>+        enum = enums[e]
>+        enum_name = enum[0]
>+        definition += 'enum %s\n{\n' % enum_name
>+        definition += ''.join(['k%s = 0x%08X,\n' %
>+            (enum[1][v], v << current_bit_start) for v in range(len(enum[1]))])
>+        definition += 'k%sMask = 0x%08X,\n' % (enum_name, ((1 << enum_bits[e]) - 1) << current_bit_start)
>+        definition += '};\n'
>+        current_bit_start += enum_bits[e]
>+
>+    definition += '}  // namespace %s\n' % namespace_name
>+    return definition
>+
>+def get_shader_table_h(shader_and_variation):
>+    shader_file = shader_and_variation.shader_file
>+    flags = shader_and_variation.flags
>+    enums = shader_and_variation.enums
>+
>+    table_name = get_variation_table_name(shader_file, 'm')
>+
>+    table = 'RefCounted<ShaderAndSerial> %s[' % table_name
>+
>+    namespace_name = "InternalShader::" + get_namespace_name(shader_file)
>+
>+    first_or = True
>+    if len(flags) > 0:
>+        table += '%s::kFlagsMask' % namespace_name
>+        first_or = False
>+
>+    for e in range(len(enums)):
>+        enum = enums[e]
>+        enum_name = enums[e][0]
>+        if not first_or:
>+            table += ' | '
>+        table += '%s::k%sMask' % (namespace_name, enum_name)
>+        first_or = False
>+
>+    if first_or:
>+        table += '1'
>+
>+    table += '];'
>+    return table
>+
>+def get_shader_table_cpp(shader_and_variation):
>+    shader_file = shader_and_variation.shader_file
>+    enums = shader_and_variation.enums
>+    flags_bits = shader_and_variation.flags_bits
>+    enum_bits = shader_and_variation.enum_bits
>+
>+    # Cache max and mask value of each enum to quickly know when a possible variation is invalid
>+    enum_maxes = []
>+    enum_masks = []
>+    current_bit_start = flags_bits
>+
>+    for e in range(len(enums)):
>+        enum_values = enums[e][1]
>+        enum_maxes.append((len(enum_values) - 1) << current_bit_start)
>+        enum_masks.append(((1 << enum_bits[e]) - 1) << current_bit_start)
>+        current_bit_start += enum_bits[e]
>+
>+    table_name = get_variation_table_name(shader_file)
>+    var_name = get_var_name(os.path.basename(shader_file))
>+
>+    table = 'constexpr ShaderBlob %s[] = {\n' % table_name
>+
>+    # The last possible variation is every flag enabled and every enum at max
>+    last_variation = ((1 << flags_bits) - 1) | reduce(lambda x, y: x|y, enum_maxes, 0)
>+
>+    for variation in range(last_variation + 1):
>+        # if any variation is invalid, output an empty entry
>+        if any([(variation & enum_masks[e]) > enum_maxes[e] for e in range(len(enums))]):
>+            table += '{nullptr, 0}, // 0x%08X\n' % variation
>+        else:
>+            entry = '%s_%08X' % (var_name, variation)
>+            table += '{%s, sizeof(%s)},\n' % (entry, entry)
>+
>+    table += '};'
>+    return table
>+
>+def get_get_function_h(shader_and_variation):
>+    shader_file = shader_and_variation.shader_file
>+
>+    function_name = get_var_name(os.path.basename(shader_file), 'get')
>+
>+    definition = 'angle::Result %s' % function_name
>+    definition += '(Context *context, uint32_t shaderFlags, RefCounted<ShaderAndSerial> **shaderOut);'
>+
>+    return definition
>+
>+def get_get_function_cpp(shader_and_variation):
>+    shader_file = shader_and_variation.shader_file
>+    enums = shader_and_variation.enums
>+
>+    function_name = get_var_name(os.path.basename(shader_file), 'get')
>+    namespace_name = "InternalShader::" + get_namespace_name(shader_file)
>+    member_table_name = get_variation_table_name(shader_file, 'm')
>+    constant_table_name = get_variation_table_name(shader_file)
>+
>+    definition = 'angle::Result ShaderLibrary::%s' % function_name
>+    definition += '(Context *context, uint32_t shaderFlags, RefCounted<ShaderAndSerial> **shaderOut)\n{\n'
>+    definition += 'return GetShader(context, %s, %s, ArraySize(%s), shaderFlags, shaderOut);\n}\n' % (
>+            member_table_name, constant_table_name, constant_table_name)
>+
>+    return definition
>+
>+def get_destroy_call(shader_and_variation):
>+    shader_file = shader_and_variation.shader_file
>+
>+    table_name = get_variation_table_name(shader_file, 'm')
>+
>+    destroy = 'for (RefCounted<ShaderAndSerial> &shader : %s)\n' % table_name
>+    destroy += '{\nshader.get().destroy(device);\n}'
>+    return destroy
>+
>+
>+def main():
>+    # STEP 0: Handle inputs/outputs for run_code_generation.py's auto_script
>+    shaders_dir = os.path.join('shaders', 'src')
>+    if not os.path.isdir(shaders_dir):
>+        raise Exception("Could not find shaders directory")
>+
>+    print_inputs = len(sys.argv) == 2 and sys.argv[1] == 'inputs'
>+    print_outputs = len(sys.argv) == 2 and sys.argv[1] == 'outputs'
>+    # If an argument X is given that's not inputs or outputs, compile shaders that match *X*.
>+    # This is useful in development to build only the shader of interest.
>+    shader_files_to_compile = os.listdir(shaders_dir)
>+    if not (print_inputs or print_outputs or len(sys.argv) < 2):
>+        shader_files_to_compile = [f for f in shader_files_to_compile if f.find(sys.argv[1]) != -1]
>+
>+    valid_extensions = ['.vert', '.frag', '.comp']
>+    input_shaders = sorted([os.path.join(shaders_dir, shader)
>+        for shader in os.listdir(shaders_dir)
>+        if any([os.path.splitext(shader)[1] == ext for ext in valid_extensions])])
>+    if print_inputs:
>+        glslang_binaries = [get_linux_glslang_exe_path(), get_win_glslang_exe_path()]
>+        glslang_binary_hashes = [path + '.sha1' for path in glslang_binaries]
>+        print(",".join(input_shaders + glslang_binary_hashes))
>+        return 0
>+
>+    # STEP 1: Call glslang to generate the internal shaders into small .inc files.
>+    # Iterates over the shaders and call glslang with the right arguments.
>+
>+    glslang_path = None
>+    if not print_outputs:
>+        glslang_path = get_glslang_exe_path()
>+
>+    output_shaders = []
>+
>+    input_shaders_and_variations = [ShaderAndVariations(shader_file) for shader_file in input_shaders]
>+
>+    compile_queue = CompileQueue()
>+
>+    for shader_and_variation in input_shaders_and_variations:
>+        shader_file = shader_and_variation.shader_file
>+        flags = shader_and_variation.flags
>+        enums = shader_and_variation.enums
>+        flags_bits = shader_and_variation.flags_bits
>+        enum_bits = shader_and_variation.enum_bits
>+
>+        # an array where each element i is in [0, len(enums[i])),
>+        # telling which enum is currently selected
>+        enum_indices = [0] * len(enums)
>+
>+        output_name = os.path.basename(shader_file)
>+
>+        while True:
>+            do_compile = not print_outputs and output_name in shader_files_to_compile
>+            # a number where each bit says whether a flag is active or not,
>+            # with values in [0, 2^len(flags))
>+            for flags_active in range(1 << len(flags)):
>+                compile_variation(glslang_path, compile_queue, shader_file, output_name, flags,
>+                        enums, flags_active, enum_indices, flags_bits, enum_bits, output_shaders)
>+
>+            if not next_enum_variation(enums, enum_indices):
>+                break
>+
>+    output_shaders = sorted(output_shaders)
>+    outputs = output_shaders + [out_file_cpp, out_file_h]
>+
>+    if print_outputs:
>+        print(','.join(outputs))
>+        return 0
>+
>+    compile_queue.finish()
>+
>+    # STEP 2: Consolidate the .inc files into an auto-generated cpp/h library.
>+    with open(out_file_cpp, 'w') as outfile:
>+        includes = "\n".join([gen_shader_include(shader) for shader in output_shaders])
>+        shader_tables_cpp = '\n'.join([get_shader_table_cpp(s)
>+            for s in input_shaders_and_variations])
>+        shader_destroy_calls = '\n'.join([get_destroy_call(s)
>+            for s in input_shaders_and_variations])
>+        shader_get_functions_cpp = '\n'.join([get_get_function_cpp(s)
>+            for s in input_shaders_and_variations])
>+
>+        outcode = template_shader_library_cpp.format(
>+            script_name = __file__,
>+            copyright_year = date.today().year,
>+            out_file_name = out_file_cpp,
>+            input_file_name = 'shaders/src/*',
>+            internal_shader_includes = includes,
>+            shader_tables_cpp = shader_tables_cpp,
>+            shader_destroy_calls = shader_destroy_calls,
>+            shader_get_functions_cpp = shader_get_functions_cpp)
>+        outfile.write(outcode)
>+        outfile.close()
>+
>+    with open(out_file_h, 'w') as outfile:
>+        shader_variation_definitions = '\n'.join([get_variation_definition(s)
>+            for s in input_shaders_and_variations])
>+        shader_get_functions_h = '\n'.join([get_get_function_h(s)
>+            for s in input_shaders_and_variations])
>+        shader_tables_h = '\n'.join([get_shader_table_h(s)
>+            for s in input_shaders_and_variations])
>+        outcode = template_shader_library_h.format(
>+            script_name = __file__,
>+            copyright_year = date.today().year,
>+            out_file_name = out_file_h,
>+            input_file_name = 'shaders/src/*',
>+            shader_variation_definitions = shader_variation_definitions,
>+            shader_get_functions_h = shader_get_functions_h,
>+            shader_tables_h = shader_tables_h)
>+        outfile.write(outcode)
>+        outfile.close()
>+
>+    # STEP 3: Create a gni file with the generated files.
>+    with io.open(out_file_gni, 'w', newline='\n') as outfile:
>+        outcode = template_shader_includes_gni.format(
>+            script_name = __file__,
>+            copyright_year = date.today().year,
>+            out_file_name = out_file_gni,
>+            input_file_name = 'shaders/src/*',
>+            shaders_list = ',\n'.join(['  "' + slash(shader) + '"' for shader in output_shaders]))
>+        outfile.write(outcode)
>+        outfile.close()
>+
>+    return 0
>+
>+
>+if __name__ == '__main__':
>+    sys.exit(main())
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/gen_vk_mandatory_format_support_table.py b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/gen_vk_mandatory_format_support_table.py
>new file mode 100644
>index 00000000000..6a8953bf22a
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/gen_vk_mandatory_format_support_table.py
>@@ -0,0 +1,141 @@
>+#!/usr/bin/python
>+# Copyright 2018 The ANGLE Project Authors. All rights reserved.
>+# Use of this source code is governed by a BSD-style license that can be
>+# found in the LICENSE file.
>+#
>+# gen_vk_mandatory_format_support_table.py:
>+#  Code generation for mandatory formats supported by Vulkan.
>+#  NOTE: don't run this script directly. Run scripts/run_code_generation.py.
>+
>+from datetime import date
>+import sys
>+
>+sys.path.append('..')
>+import angle_format
>+import xml.etree.ElementTree as etree
>+import sys, os
>+
>+
>+template_table_autogen_cpp = """// GENERATED FILE - DO NOT EDIT.
>+// Generated by {script_name} using data from {input_file_name} and
>+// the vk.xml file situated at
>+// /third_party/vulkan-validation-layers/src/scripts/vk.xml
>+//
>+// Copyright {copyright_year} The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// {out_file_name}:
>+//   Queries for full Vulkan mandatory format support information based on VK format.
>+
>+#include "libANGLE/renderer/vulkan/vk_format_utils.h"
>+
>+using namespace angle;
>+
>+namespace rx
>+{{
>+
>+namespace vk
>+{{
>+
>+namespace
>+{{
>+static_assert({num_formats} == kNumVkFormats, "Update kNumVkFormats");
>+constexpr std::array<VkFormatProperties, kNumVkFormats> kFormatProperties = {{{{
>+    {format_case_data}
>+}}}};
>+}}  // anonymous namespace
>+
>+const VkFormatProperties& GetMandatoryFormatSupport(VkFormat vkFormat)
>+{{
>+    ASSERT(static_cast<uint64_t>(vkFormat) < sizeof(kFormatProperties));
>+    return kFormatProperties[vkFormat];
>+}}
>+
>+}}  // namespace vk
>+
>+}}  // namespace rx
>+
>+"""
>+
>+template_format_property = """
>+/* {vk_format} */
>+{{0, {optimal_features}, {buffer_features}}}"""
>+
>+
>+def script_relative(path):
>+    return os.path.join(os.path.dirname(sys.argv[0]), path)
>+
>+
>+def gen_format_case(index, vk_to_index_to_format_map, vk_map):
>+    vk_format = vk_to_index_to_format_map[index]
>+
>+    if vk_format in vk_map and len(vk_map[vk_format]) > 0:
>+        # Check which feature is a buffer feature or not.
>+        buffer_features = [x for x in vk_map[vk_format] if x.find("_BUFFER_") != -1]
>+        optimal_features = [x for x in vk_map[vk_format] if x.find("_BUFFER_") == -1]
>+        optimal_features_str = "|".join(optimal_features) if len(optimal_features) else "0"
>+        buffer_features_str = "|".join(buffer_features) if len(buffer_features) else "0"
>+    else:
>+        optimal_features_str = "0"
>+        buffer_features_str = "0"
>+
>+    return template_format_property.format(
>+        vk_format = vk_format,
>+        optimal_features = optimal_features_str,
>+        buffer_features = buffer_features_str)
>+
>+
>+def main():
>+
>+    input_file_name = 'vk_mandatory_format_support_data.json'
>+    out_file_name = 'vk_mandatory_format_support_table_autogen.cpp'
>+    vk_xml_file = '../../../../third_party/vulkan-headers/src/registry/vk.xml'
>+
>+    # auto_script parameters.
>+    if len(sys.argv) > 1:
>+        inputs = [
>+            '../angle_format.py',
>+            input_file_name,
>+            vk_xml_file,
>+        ]
>+        outputs = [out_file_name]
>+
>+        if sys.argv[1] == 'inputs':
>+            print ','.join(inputs)
>+        elif sys.argv[1] == 'outputs':
>+            print ','.join(outputs)
>+        else:
>+            print('Invalid script parameters')
>+            return 1
>+        return 0
>+
>+    tree = etree.parse(script_relative(vk_xml_file))
>+    root = tree.getroot()
>+    vk_format_enums = root.findall(".//enums[@name='VkFormat']/enum")
>+    vk_format_name_to_index_map = {}
>+    num_formats = len(vk_format_enums)
>+    for format_enum in vk_format_enums:
>+        index = int(format_enum.attrib['value'])
>+        vk_format = format_enum.attrib['name']
>+        vk_format_name_to_index_map[index] = vk_format
>+
>+    vk_map = angle_format.load_json(input_file_name)
>+    vk_cases = [gen_format_case(index, vk_format_name_to_index_map, vk_map) for index in vk_format_name_to_index_map]
>+
>+    output_cpp = template_table_autogen_cpp.format(
>+        copyright_year = date.today().year,
>+        num_formats = num_formats,
>+        format_case_data = "\n,".join(vk_cases),
>+        script_name = __file__,
>+        out_file_name = out_file_name,
>+        input_file_name = input_file_name)
>+
>+    with open(out_file_name, 'wt') as out_file:
>+        out_file.write(output_cpp)
>+        out_file.close()
>+    return 0
>+
>+
>+if __name__ == '__main__':
>+    sys.exit(main())
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/renderervk_utils.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/renderervk_utils.cpp
>deleted file mode 100644
>index bb54e0a37a2..00000000000
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/renderervk_utils.cpp
>+++ /dev/null
>@@ -1,1421 +0,0 @@
>-//
>-// Copyright 2016 The ANGLE Project Authors. All rights reserved.
>-// Use of this source code is governed by a BSD-style license that can be
>-// found in the LICENSE file.
>-//
>-// renderervk_utils:
>-//    Helper functions for the Vulkan Renderer.
>-//
>-
>-#include "renderervk_utils.h"
>-
>-#include "libANGLE/renderer/vulkan/ContextVk.h"
>-#include "libANGLE/renderer/vulkan/RendererVk.h"
>-
>-namespace rx
>-{
>-
>-namespace
>-{
>-GLenum DefaultGLErrorCode(VkResult result)
>-{
>-    switch (result)
>-    {
>-        case VK_ERROR_OUT_OF_HOST_MEMORY:
>-        case VK_ERROR_OUT_OF_DEVICE_MEMORY:
>-        case VK_ERROR_TOO_MANY_OBJECTS:
>-            return GL_OUT_OF_MEMORY;
>-        default:
>-            return GL_INVALID_OPERATION;
>-    }
>-}
>-
>-EGLint DefaultEGLErrorCode(VkResult result)
>-{
>-    switch (result)
>-    {
>-        case VK_ERROR_OUT_OF_HOST_MEMORY:
>-        case VK_ERROR_OUT_OF_DEVICE_MEMORY:
>-        case VK_ERROR_TOO_MANY_OBJECTS:
>-            return EGL_BAD_ALLOC;
>-        case VK_ERROR_INITIALIZATION_FAILED:
>-            return EGL_NOT_INITIALIZED;
>-        case VK_ERROR_SURFACE_LOST_KHR:
>-        case VK_ERROR_DEVICE_LOST:
>-            return EGL_CONTEXT_LOST;
>-        default:
>-            return EGL_BAD_ACCESS;
>-    }
>-}
>-
>-// Gets access flags that are common between source and dest layouts.
>-VkAccessFlags GetBasicLayoutAccessFlags(VkImageLayout layout)
>-{
>-    switch (layout)
>-    {
>-        case VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL:
>-            return VK_ACCESS_COLOR_ATTACHMENT_WRITE_BIT;
>-        case VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL:
>-            return VK_ACCESS_TRANSFER_WRITE_BIT;
>-        case VK_IMAGE_LAYOUT_PRESENT_SRC_KHR:
>-            return VK_ACCESS_MEMORY_READ_BIT;
>-        case VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL:
>-            return VK_ACCESS_TRANSFER_READ_BIT;
>-        case VK_IMAGE_LAYOUT_UNDEFINED:
>-        case VK_IMAGE_LAYOUT_GENERAL:
>-        case VK_IMAGE_LAYOUT_PREINITIALIZED:
>-            return 0;
>-        default:
>-            // TODO(jmadill): Investigate other flags.
>-            UNREACHABLE();
>-            return 0;
>-    }
>-}
>-
>-VkImageUsageFlags GetStagingImageUsageFlags(vk::StagingUsage usage)
>-{
>-    switch (usage)
>-    {
>-        case vk::StagingUsage::Read:
>-            return VK_IMAGE_USAGE_TRANSFER_DST_BIT;
>-        case vk::StagingUsage::Write:
>-            return VK_IMAGE_USAGE_TRANSFER_SRC_BIT;
>-        case vk::StagingUsage::Both:
>-            return (VK_IMAGE_USAGE_TRANSFER_DST_BIT | VK_IMAGE_USAGE_TRANSFER_SRC_BIT);
>-        default:
>-            UNREACHABLE();
>-            return 0;
>-    }
>-}
>-
>-VkImageUsageFlags GetStagingBufferUsageFlags(vk::StagingUsage usage)
>-{
>-    switch (usage)
>-    {
>-        case vk::StagingUsage::Read:
>-            return VK_BUFFER_USAGE_TRANSFER_DST_BIT;
>-        case vk::StagingUsage::Write:
>-            return VK_BUFFER_USAGE_TRANSFER_SRC_BIT;
>-        case vk::StagingUsage::Both:
>-            return (VK_BUFFER_USAGE_TRANSFER_DST_BIT | VK_BUFFER_USAGE_TRANSFER_SRC_BIT);
>-        default:
>-            UNREACHABLE();
>-            return 0;
>-    }
>-}
>-
>-}  // anonymous namespace
>-
>-// Mirrors std_validation_str in loader.h
>-// TODO(jmadill): Possibly wrap the loader into a safe source file. Can't be included trivially.
>-const char *g_VkStdValidationLayerName = "VK_LAYER_LUNARG_standard_validation";
>-const char *g_VkLoaderLayersPathEnv    = "VK_LAYER_PATH";
>-
>-const char *VulkanResultString(VkResult result)
>-{
>-    switch (result)
>-    {
>-        case VK_SUCCESS:
>-            return "Command successfully completed.";
>-        case VK_NOT_READY:
>-            return "A fence or query has not yet completed.";
>-        case VK_TIMEOUT:
>-            return "A wait operation has not completed in the specified time.";
>-        case VK_EVENT_SET:
>-            return "An event is signaled.";
>-        case VK_EVENT_RESET:
>-            return "An event is unsignaled.";
>-        case VK_INCOMPLETE:
>-            return "A return array was too small for the result.";
>-        case VK_SUBOPTIMAL_KHR:
>-            return "A swapchain no longer matches the surface properties exactly, but can still be "
>-                   "used to present to the surface successfully.";
>-        case VK_ERROR_OUT_OF_HOST_MEMORY:
>-            return "A host memory allocation has failed.";
>-        case VK_ERROR_OUT_OF_DEVICE_MEMORY:
>-            return "A device memory allocation has failed.";
>-        case VK_ERROR_INITIALIZATION_FAILED:
>-            return "Initialization of an object could not be completed for implementation-specific "
>-                   "reasons.";
>-        case VK_ERROR_DEVICE_LOST:
>-            return "The logical or physical device has been lost.";
>-        case VK_ERROR_MEMORY_MAP_FAILED:
>-            return "Mapping of a memory object has failed.";
>-        case VK_ERROR_LAYER_NOT_PRESENT:
>-            return "A requested layer is not present or could not be loaded.";
>-        case VK_ERROR_EXTENSION_NOT_PRESENT:
>-            return "A requested extension is not supported.";
>-        case VK_ERROR_FEATURE_NOT_PRESENT:
>-            return "A requested feature is not supported.";
>-        case VK_ERROR_INCOMPATIBLE_DRIVER:
>-            return "The requested version of Vulkan is not supported by the driver or is otherwise "
>-                   "incompatible for implementation-specific reasons.";
>-        case VK_ERROR_TOO_MANY_OBJECTS:
>-            return "Too many objects of the type have already been created.";
>-        case VK_ERROR_FORMAT_NOT_SUPPORTED:
>-            return "A requested format is not supported on this device.";
>-        case VK_ERROR_SURFACE_LOST_KHR:
>-            return "A surface is no longer available.";
>-        case VK_ERROR_NATIVE_WINDOW_IN_USE_KHR:
>-            return "The requested window is already connected to a VkSurfaceKHR, or to some other "
>-                   "non-Vulkan API.";
>-        case VK_ERROR_OUT_OF_DATE_KHR:
>-            return "A surface has changed in such a way that it is no longer compatible with the "
>-                   "swapchain.";
>-        case VK_ERROR_INCOMPATIBLE_DISPLAY_KHR:
>-            return "The display used by a swapchain does not use the same presentable image "
>-                   "layout, or is incompatible in a way that prevents sharing an image.";
>-        case VK_ERROR_VALIDATION_FAILED_EXT:
>-            return "The validation layers detected invalid API usage.";
>-        default:
>-            return "Unknown vulkan error code.";
>-    }
>-}
>-
>-bool HasStandardValidationLayer(const std::vector<VkLayerProperties> &layerProps)
>-{
>-    for (const auto &layerProp : layerProps)
>-    {
>-        if (std::string(layerProp.layerName) == g_VkStdValidationLayerName)
>-        {
>-            return true;
>-        }
>-    }
>-
>-    return false;
>-}
>-
>-namespace vk
>-{
>-
>-Error::Error(VkResult result) : mResult(result), mFile(nullptr), mLine(0)
>-{
>-    ASSERT(result == VK_SUCCESS);
>-}
>-
>-Error::Error(VkResult result, const char *file, unsigned int line)
>-    : mResult(result), mFile(file), mLine(line)
>-{
>-}
>-
>-Error::~Error()
>-{
>-}
>-
>-Error::Error(const Error &other) = default;
>-Error &Error::operator=(const Error &other) = default;
>-
>-gl::Error Error::toGL(GLenum glErrorCode) const
>-{
>-    if (!isError())
>-    {
>-        return gl::NoError();
>-    }
>-
>-    // TODO(jmadill): Set extended error code to 'vulkan internal error'.
>-    return gl::Error(glErrorCode, glErrorCode, toString());
>-}
>-
>-egl::Error Error::toEGL(EGLint eglErrorCode) const
>-{
>-    if (!isError())
>-    {
>-        return egl::NoError();
>-    }
>-
>-    // TODO(jmadill): Set extended error code to 'vulkan internal error'.
>-    return egl::Error(eglErrorCode, eglErrorCode, toString());
>-}
>-
>-std::string Error::toString() const
>-{
>-    std::stringstream errorStream;
>-    errorStream << "Internal Vulkan error: " << VulkanResultString(mResult) << ", in " << mFile
>-                << ", line " << mLine << ".";
>-    return errorStream.str();
>-}
>-
>-Error::operator gl::Error() const
>-{
>-    return toGL(DefaultGLErrorCode(mResult));
>-}
>-
>-Error::operator egl::Error() const
>-{
>-    return toEGL(DefaultEGLErrorCode(mResult));
>-}
>-
>-bool Error::isError() const
>-{
>-    return (mResult != VK_SUCCESS);
>-}
>-
>-// CommandPool implementation.
>-CommandPool::CommandPool()
>-{
>-}
>-
>-void CommandPool::destroy(VkDevice device)
>-{
>-    if (valid())
>-    {
>-        vkDestroyCommandPool(device, mHandle, nullptr);
>-        mHandle = VK_NULL_HANDLE;
>-    }
>-}
>-
>-Error CommandPool::init(VkDevice device, const VkCommandPoolCreateInfo &createInfo)
>-{
>-    ASSERT(!valid());
>-    ANGLE_VK_TRY(vkCreateCommandPool(device, &createInfo, nullptr, &mHandle));
>-    return NoError();
>-}
>-
>-// CommandBuffer implementation.
>-CommandBuffer::CommandBuffer()
>-{
>-}
>-
>-Error CommandBuffer::begin(const VkCommandBufferBeginInfo &info)
>-{
>-    ASSERT(valid());
>-    ANGLE_VK_TRY(vkBeginCommandBuffer(mHandle, &info));
>-    return NoError();
>-}
>-
>-Error CommandBuffer::end()
>-{
>-    ASSERT(valid());
>-    ANGLE_VK_TRY(vkEndCommandBuffer(mHandle));
>-    return NoError();
>-}
>-
>-Error CommandBuffer::reset()
>-{
>-    ASSERT(valid());
>-    ANGLE_VK_TRY(vkResetCommandBuffer(mHandle, 0));
>-    return NoError();
>-}
>-
>-void CommandBuffer::singleImageBarrier(VkPipelineStageFlags srcStageMask,
>-                                       VkPipelineStageFlags dstStageMask,
>-                                       VkDependencyFlags dependencyFlags,
>-                                       const VkImageMemoryBarrier &imageMemoryBarrier)
>-{
>-    ASSERT(valid());
>-    vkCmdPipelineBarrier(mHandle, srcStageMask, dstStageMask, dependencyFlags, 0, nullptr, 0,
>-                         nullptr, 1, &imageMemoryBarrier);
>-}
>-
>-void CommandBuffer::singleBufferBarrier(VkPipelineStageFlags srcStageMask,
>-                                        VkPipelineStageFlags dstStageMask,
>-                                        VkDependencyFlags dependencyFlags,
>-                                        const VkBufferMemoryBarrier &bufferBarrier)
>-{
>-    ASSERT(valid());
>-    vkCmdPipelineBarrier(mHandle, srcStageMask, dstStageMask, dependencyFlags, 0, nullptr, 1,
>-                         &bufferBarrier, 0, nullptr);
>-}
>-
>-void CommandBuffer::destroy(VkDevice device, const vk::CommandPool &commandPool)
>-{
>-    if (valid())
>-    {
>-        ASSERT(commandPool.valid());
>-        vkFreeCommandBuffers(device, commandPool.getHandle(), 1, &mHandle);
>-        mHandle = VK_NULL_HANDLE;
>-    }
>-}
>-
>-Error CommandBuffer::init(VkDevice device, const VkCommandBufferAllocateInfo &createInfo)
>-{
>-    ASSERT(!valid());
>-    ANGLE_VK_TRY(vkAllocateCommandBuffers(device, &createInfo, &mHandle));
>-    return NoError();
>-}
>-
>-void CommandBuffer::copyBuffer(const vk::Buffer &srcBuffer,
>-                               const vk::Buffer &destBuffer,
>-                               uint32_t regionCount,
>-                               const VkBufferCopy *regions)
>-{
>-    ASSERT(valid());
>-    ASSERT(srcBuffer.valid() && destBuffer.valid());
>-    vkCmdCopyBuffer(mHandle, srcBuffer.getHandle(), destBuffer.getHandle(), regionCount, regions);
>-}
>-
>-void CommandBuffer::clearSingleColorImage(const vk::Image &image, const VkClearColorValue &color)
>-{
>-    ASSERT(valid());
>-    ASSERT(image.getCurrentLayout() == VK_IMAGE_LAYOUT_GENERAL ||
>-           image.getCurrentLayout() == VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL);
>-
>-    VkImageSubresourceRange range;
>-    range.aspectMask     = VK_IMAGE_ASPECT_COLOR_BIT;
>-    range.baseMipLevel   = 0;
>-    range.levelCount     = 1;
>-    range.baseArrayLayer = 0;
>-    range.layerCount     = 1;
>-
>-    vkCmdClearColorImage(mHandle, image.getHandle(), image.getCurrentLayout(), &color, 1, &range);
>-}
>-
>-void CommandBuffer::copySingleImage(const vk::Image &srcImage,
>-                                    const vk::Image &destImage,
>-                                    const gl::Box &copyRegion,
>-                                    VkImageAspectFlags aspectMask)
>-{
>-    VkImageCopy region;
>-    region.srcSubresource.aspectMask     = aspectMask;
>-    region.srcSubresource.mipLevel       = 0;
>-    region.srcSubresource.baseArrayLayer = 0;
>-    region.srcSubresource.layerCount     = 1;
>-    region.srcOffset.x                   = copyRegion.x;
>-    region.srcOffset.y                   = copyRegion.y;
>-    region.srcOffset.z                   = copyRegion.z;
>-    region.dstSubresource.aspectMask     = aspectMask;
>-    region.dstSubresource.mipLevel       = 0;
>-    region.dstSubresource.baseArrayLayer = 0;
>-    region.dstSubresource.layerCount     = 1;
>-    region.dstOffset.x                   = copyRegion.x;
>-    region.dstOffset.y                   = copyRegion.y;
>-    region.dstOffset.z                   = copyRegion.z;
>-    region.extent.width                  = copyRegion.width;
>-    region.extent.height                 = copyRegion.height;
>-    region.extent.depth                  = copyRegion.depth;
>-
>-    copyImage(srcImage, destImage, 1, &region);
>-}
>-
>-void CommandBuffer::copyImage(const vk::Image &srcImage,
>-                              const vk::Image &dstImage,
>-                              uint32_t regionCount,
>-                              const VkImageCopy *regions)
>-{
>-    ASSERT(valid() && srcImage.valid() && dstImage.valid());
>-    ASSERT(srcImage.getCurrentLayout() == VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL ||
>-           srcImage.getCurrentLayout() == VK_IMAGE_LAYOUT_GENERAL);
>-    ASSERT(dstImage.getCurrentLayout() == VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL ||
>-           dstImage.getCurrentLayout() == VK_IMAGE_LAYOUT_GENERAL);
>-    vkCmdCopyImage(mHandle, srcImage.getHandle(), srcImage.getCurrentLayout(), dstImage.getHandle(),
>-                   dstImage.getCurrentLayout(), 1, regions);
>-}
>-
>-void CommandBuffer::beginRenderPass(const RenderPass &renderPass,
>-                                    const Framebuffer &framebuffer,
>-                                    const gl::Rectangle &renderArea,
>-                                    const std::vector<VkClearValue> &clearValues)
>-{
>-    ASSERT(!clearValues.empty());
>-    ASSERT(mHandle != VK_NULL_HANDLE);
>-
>-    VkRenderPassBeginInfo beginInfo;
>-    beginInfo.sType                    = VK_STRUCTURE_TYPE_RENDER_PASS_BEGIN_INFO;
>-    beginInfo.pNext                    = nullptr;
>-    beginInfo.renderPass               = renderPass.getHandle();
>-    beginInfo.framebuffer              = framebuffer.getHandle();
>-    beginInfo.renderArea.offset.x      = static_cast<uint32_t>(renderArea.x);
>-    beginInfo.renderArea.offset.y      = static_cast<uint32_t>(renderArea.y);
>-    beginInfo.renderArea.extent.width  = static_cast<uint32_t>(renderArea.width);
>-    beginInfo.renderArea.extent.height = static_cast<uint32_t>(renderArea.height);
>-    beginInfo.clearValueCount          = static_cast<uint32_t>(clearValues.size());
>-    beginInfo.pClearValues             = clearValues.data();
>-
>-    vkCmdBeginRenderPass(mHandle, &beginInfo, VK_SUBPASS_CONTENTS_INLINE);
>-}
>-
>-void CommandBuffer::endRenderPass()
>-{
>-    ASSERT(mHandle != VK_NULL_HANDLE);
>-    vkCmdEndRenderPass(mHandle);
>-}
>-
>-void CommandBuffer::draw(uint32_t vertexCount,
>-                         uint32_t instanceCount,
>-                         uint32_t firstVertex,
>-                         uint32_t firstInstance)
>-{
>-    ASSERT(valid());
>-    vkCmdDraw(mHandle, vertexCount, instanceCount, firstVertex, firstInstance);
>-}
>-
>-void CommandBuffer::drawIndexed(uint32_t indexCount,
>-                                uint32_t instanceCount,
>-                                uint32_t firstIndex,
>-                                int32_t vertexOffset,
>-                                uint32_t firstInstance)
>-{
>-    ASSERT(valid());
>-    vkCmdDrawIndexed(mHandle, indexCount, instanceCount, firstIndex, vertexOffset, firstInstance);
>-}
>-
>-void CommandBuffer::bindPipeline(VkPipelineBindPoint pipelineBindPoint,
>-                                 const vk::Pipeline &pipeline)
>-{
>-    ASSERT(valid() && pipeline.valid());
>-    vkCmdBindPipeline(mHandle, pipelineBindPoint, pipeline.getHandle());
>-}
>-
>-void CommandBuffer::bindVertexBuffers(uint32_t firstBinding,
>-                                      uint32_t bindingCount,
>-                                      const VkBuffer *buffers,
>-                                      const VkDeviceSize *offsets)
>-{
>-    ASSERT(valid());
>-    vkCmdBindVertexBuffers(mHandle, firstBinding, bindingCount, buffers, offsets);
>-}
>-
>-void CommandBuffer::bindIndexBuffer(const vk::Buffer &buffer,
>-                                    VkDeviceSize offset,
>-                                    VkIndexType indexType)
>-{
>-    ASSERT(valid());
>-    vkCmdBindIndexBuffer(mHandle, buffer.getHandle(), offset, indexType);
>-}
>-
>-void CommandBuffer::bindDescriptorSets(VkPipelineBindPoint bindPoint,
>-                                       const vk::PipelineLayout &layout,
>-                                       uint32_t firstSet,
>-                                       uint32_t descriptorSetCount,
>-                                       const VkDescriptorSet *descriptorSets,
>-                                       uint32_t dynamicOffsetCount,
>-                                       const uint32_t *dynamicOffsets)
>-{
>-    ASSERT(valid());
>-    vkCmdBindDescriptorSets(mHandle, bindPoint, layout.getHandle(), firstSet, descriptorSetCount,
>-                            descriptorSets, dynamicOffsetCount, dynamicOffsets);
>-}
>-
>-// Image implementation.
>-Image::Image() : mCurrentLayout(VK_IMAGE_LAYOUT_UNDEFINED)
>-{
>-}
>-
>-void Image::setHandle(VkImage handle)
>-{
>-    mHandle = handle;
>-}
>-
>-void Image::reset()
>-{
>-    mHandle = VK_NULL_HANDLE;
>-}
>-
>-void Image::destroy(VkDevice device)
>-{
>-    if (valid())
>-    {
>-        vkDestroyImage(device, mHandle, nullptr);
>-        mHandle = VK_NULL_HANDLE;
>-    }
>-}
>-
>-Error Image::init(VkDevice device, const VkImageCreateInfo &createInfo)
>-{
>-    ASSERT(!valid());
>-    ANGLE_VK_TRY(vkCreateImage(device, &createInfo, nullptr, &mHandle));
>-    mCurrentLayout = createInfo.initialLayout;
>-    return NoError();
>-}
>-
>-void Image::changeLayoutTop(VkImageAspectFlags aspectMask,
>-                            VkImageLayout newLayout,
>-                            CommandBuffer *commandBuffer)
>-{
>-    if (newLayout == mCurrentLayout)
>-    {
>-        // No-op.
>-        return;
>-    }
>-
>-    changeLayoutWithStages(aspectMask, newLayout, VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT,
>-                           VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT, commandBuffer);
>-}
>-
>-void Image::changeLayoutWithStages(VkImageAspectFlags aspectMask,
>-                                   VkImageLayout newLayout,
>-                                   VkPipelineStageFlags srcStageMask,
>-                                   VkPipelineStageFlags dstStageMask,
>-                                   CommandBuffer *commandBuffer)
>-{
>-    VkImageMemoryBarrier imageMemoryBarrier;
>-    imageMemoryBarrier.sType               = VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER;
>-    imageMemoryBarrier.pNext               = nullptr;
>-    imageMemoryBarrier.srcAccessMask       = 0;
>-    imageMemoryBarrier.dstAccessMask       = 0;
>-    imageMemoryBarrier.oldLayout           = mCurrentLayout;
>-    imageMemoryBarrier.newLayout           = newLayout;
>-    imageMemoryBarrier.srcQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED;
>-    imageMemoryBarrier.dstQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED;
>-    imageMemoryBarrier.image               = mHandle;
>-
>-    // TODO(jmadill): Is this needed for mipped/layer images?
>-    imageMemoryBarrier.subresourceRange.aspectMask     = aspectMask;
>-    imageMemoryBarrier.subresourceRange.baseMipLevel   = 0;
>-    imageMemoryBarrier.subresourceRange.levelCount     = 1;
>-    imageMemoryBarrier.subresourceRange.baseArrayLayer = 0;
>-    imageMemoryBarrier.subresourceRange.layerCount     = 1;
>-
>-    // TODO(jmadill): Test all the permutations of the access flags.
>-    imageMemoryBarrier.srcAccessMask = GetBasicLayoutAccessFlags(mCurrentLayout);
>-
>-    if (mCurrentLayout == VK_IMAGE_LAYOUT_PREINITIALIZED)
>-    {
>-        imageMemoryBarrier.srcAccessMask |= VK_ACCESS_HOST_WRITE_BIT;
>-    }
>-
>-    imageMemoryBarrier.dstAccessMask = GetBasicLayoutAccessFlags(newLayout);
>-
>-    if (newLayout == VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL)
>-    {
>-        imageMemoryBarrier.srcAccessMask |=
>-            (VK_ACCESS_HOST_WRITE_BIT | VK_ACCESS_TRANSFER_WRITE_BIT);
>-        imageMemoryBarrier.dstAccessMask |= VK_ACCESS_SHADER_READ_BIT;
>-    }
>-
>-    if (newLayout == VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL)
>-    {
>-        imageMemoryBarrier.dstAccessMask |= VK_ACCESS_DEPTH_STENCIL_ATTACHMENT_WRITE_BIT;
>-    }
>-
>-    commandBuffer->singleImageBarrier(srcStageMask, dstStageMask, 0, imageMemoryBarrier);
>-
>-    mCurrentLayout = newLayout;
>-}
>-
>-void Image::getMemoryRequirements(VkDevice device, VkMemoryRequirements *requirementsOut) const
>-{
>-    ASSERT(valid());
>-    vkGetImageMemoryRequirements(device, mHandle, requirementsOut);
>-}
>-
>-Error Image::bindMemory(VkDevice device, const vk::DeviceMemory &deviceMemory)
>-{
>-    ASSERT(valid() && deviceMemory.valid());
>-    ANGLE_VK_TRY(vkBindImageMemory(device, mHandle, deviceMemory.getHandle(), 0));
>-    return NoError();
>-}
>-
>-// ImageView implementation.
>-ImageView::ImageView()
>-{
>-}
>-
>-void ImageView::destroy(VkDevice device)
>-{
>-    if (valid())
>-    {
>-        vkDestroyImageView(device, mHandle, nullptr);
>-        mHandle = VK_NULL_HANDLE;
>-    }
>-}
>-
>-Error ImageView::init(VkDevice device, const VkImageViewCreateInfo &createInfo)
>-{
>-    ANGLE_VK_TRY(vkCreateImageView(device, &createInfo, nullptr, &mHandle));
>-    return NoError();
>-}
>-
>-// Semaphore implementation.
>-Semaphore::Semaphore()
>-{
>-}
>-
>-void Semaphore::destroy(VkDevice device)
>-{
>-    if (valid())
>-    {
>-        vkDestroySemaphore(device, mHandle, nullptr);
>-        mHandle = VK_NULL_HANDLE;
>-    }
>-}
>-
>-Error Semaphore::init(VkDevice device)
>-{
>-    ASSERT(!valid());
>-
>-    VkSemaphoreCreateInfo semaphoreInfo;
>-    semaphoreInfo.sType = VK_STRUCTURE_TYPE_SEMAPHORE_CREATE_INFO;
>-    semaphoreInfo.pNext = nullptr;
>-    semaphoreInfo.flags = 0;
>-
>-    ANGLE_VK_TRY(vkCreateSemaphore(device, &semaphoreInfo, nullptr, &mHandle));
>-
>-    return NoError();
>-}
>-
>-// Framebuffer implementation.
>-Framebuffer::Framebuffer()
>-{
>-}
>-
>-void Framebuffer::destroy(VkDevice device)
>-{
>-    if (valid())
>-    {
>-        vkDestroyFramebuffer(device, mHandle, nullptr);
>-        mHandle = VK_NULL_HANDLE;
>-    }
>-}
>-
>-Error Framebuffer::init(VkDevice device, const VkFramebufferCreateInfo &createInfo)
>-{
>-    ASSERT(!valid());
>-    ANGLE_VK_TRY(vkCreateFramebuffer(device, &createInfo, nullptr, &mHandle));
>-    return NoError();
>-}
>-
>-// DeviceMemory implementation.
>-DeviceMemory::DeviceMemory()
>-{
>-}
>-
>-void DeviceMemory::destroy(VkDevice device)
>-{
>-    if (valid())
>-    {
>-        vkFreeMemory(device, mHandle, nullptr);
>-        mHandle = VK_NULL_HANDLE;
>-    }
>-}
>-
>-Error DeviceMemory::allocate(VkDevice device, const VkMemoryAllocateInfo &allocInfo)
>-{
>-    ASSERT(!valid());
>-    ANGLE_VK_TRY(vkAllocateMemory(device, &allocInfo, nullptr, &mHandle));
>-    return NoError();
>-}
>-
>-Error DeviceMemory::map(VkDevice device,
>-                        VkDeviceSize offset,
>-                        VkDeviceSize size,
>-                        VkMemoryMapFlags flags,
>-                        uint8_t **mapPointer)
>-{
>-    ASSERT(valid());
>-    ANGLE_VK_TRY(
>-        vkMapMemory(device, mHandle, offset, size, flags, reinterpret_cast<void **>(mapPointer)));
>-    return NoError();
>-}
>-
>-void DeviceMemory::unmap(VkDevice device)
>-{
>-    ASSERT(valid());
>-    vkUnmapMemory(device, mHandle);
>-}
>-
>-// RenderPass implementation.
>-RenderPass::RenderPass()
>-{
>-}
>-
>-void RenderPass::destroy(VkDevice device)
>-{
>-    if (valid())
>-    {
>-        vkDestroyRenderPass(device, mHandle, nullptr);
>-        mHandle = VK_NULL_HANDLE;
>-    }
>-}
>-
>-Error RenderPass::init(VkDevice device, const VkRenderPassCreateInfo &createInfo)
>-{
>-    ASSERT(!valid());
>-    ANGLE_VK_TRY(vkCreateRenderPass(device, &createInfo, nullptr, &mHandle));
>-    return NoError();
>-}
>-
>-// StagingImage implementation.
>-StagingImage::StagingImage() : mSize(0)
>-{
>-}
>-
>-StagingImage::StagingImage(StagingImage &&other)
>-    : mImage(std::move(other.mImage)),
>-      mDeviceMemory(std::move(other.mDeviceMemory)),
>-      mSize(other.mSize)
>-{
>-    other.mSize = 0;
>-}
>-
>-void StagingImage::destroy(VkDevice device)
>-{
>-    mImage.destroy(device);
>-    mDeviceMemory.destroy(device);
>-}
>-
>-Error StagingImage::init(VkDevice device,
>-                         uint32_t queueFamilyIndex,
>-                         const vk::MemoryProperties &memoryProperties,
>-                         TextureDimension dimension,
>-                         VkFormat format,
>-                         const gl::Extents &extent,
>-                         StagingUsage usage)
>-{
>-    VkImageCreateInfo createInfo;
>-
>-    createInfo.sType         = VK_STRUCTURE_TYPE_IMAGE_CREATE_INFO;
>-    createInfo.pNext         = nullptr;
>-    createInfo.flags         = 0;
>-    createInfo.imageType     = VK_IMAGE_TYPE_2D;
>-    createInfo.format        = format;
>-    createInfo.extent.width  = static_cast<uint32_t>(extent.width);
>-    createInfo.extent.height = static_cast<uint32_t>(extent.height);
>-    createInfo.extent.depth  = static_cast<uint32_t>(extent.depth);
>-    createInfo.mipLevels     = 1;
>-    createInfo.arrayLayers   = 1;
>-    createInfo.samples       = VK_SAMPLE_COUNT_1_BIT;
>-    createInfo.tiling        = VK_IMAGE_TILING_LINEAR;
>-    createInfo.usage                 = GetStagingImageUsageFlags(usage);
>-    createInfo.sharingMode   = VK_SHARING_MODE_EXCLUSIVE;
>-    createInfo.queueFamilyIndexCount = 1;
>-    createInfo.pQueueFamilyIndices   = &queueFamilyIndex;
>-
>-    // Use Preinitialized for writable staging images - in these cases we want to map the memory
>-    // before we do a copy. For readback images, use an undefined layout.
>-    createInfo.initialLayout = usage == vk::StagingUsage::Read ? VK_IMAGE_LAYOUT_UNDEFINED
>-                                                               : VK_IMAGE_LAYOUT_PREINITIALIZED;
>-
>-    ANGLE_TRY(mImage.init(device, createInfo));
>-
>-    VkMemoryRequirements memoryRequirements;
>-    mImage.getMemoryRequirements(device, &memoryRequirements);
>-
>-    // Find the right kind of memory index.
>-    uint32_t memoryIndex = memoryProperties.findCompatibleMemoryIndex(
>-        memoryRequirements.memoryTypeBits, VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT);
>-
>-    VkMemoryAllocateInfo allocateInfo;
>-    allocateInfo.sType           = VK_STRUCTURE_TYPE_MEMORY_ALLOCATE_INFO;
>-    allocateInfo.pNext           = nullptr;
>-    allocateInfo.allocationSize  = memoryRequirements.size;
>-    allocateInfo.memoryTypeIndex = memoryIndex;
>-
>-    ANGLE_TRY(mDeviceMemory.allocate(device, allocateInfo));
>-    ANGLE_TRY(mImage.bindMemory(device, mDeviceMemory));
>-
>-    mSize = memoryRequirements.size;
>-
>-    return NoError();
>-}
>-
>-void StagingImage::dumpResources(Serial serial, std::vector<vk::GarbageObject> *garbageQueue)
>-{
>-    mImage.dumpResources(serial, garbageQueue);
>-    mDeviceMemory.dumpResources(serial, garbageQueue);
>-}
>-
>-// Buffer implementation.
>-Buffer::Buffer()
>-{
>-}
>-
>-void Buffer::destroy(VkDevice device)
>-{
>-    if (valid())
>-    {
>-        vkDestroyBuffer(device, mHandle, nullptr);
>-        mHandle = VK_NULL_HANDLE;
>-    }
>-}
>-
>-Error Buffer::init(VkDevice device, const VkBufferCreateInfo &createInfo)
>-{
>-    ASSERT(!valid());
>-    ANGLE_VK_TRY(vkCreateBuffer(device, &createInfo, nullptr, &mHandle));
>-    return NoError();
>-}
>-
>-Error Buffer::bindMemory(VkDevice device, const DeviceMemory &deviceMemory)
>-{
>-    ASSERT(valid() && deviceMemory.valid());
>-    ANGLE_VK_TRY(vkBindBufferMemory(device, mHandle, deviceMemory.getHandle(), 0));
>-    return NoError();
>-}
>-
>-// ShaderModule implementation.
>-ShaderModule::ShaderModule()
>-{
>-}
>-
>-void ShaderModule::destroy(VkDevice device)
>-{
>-    if (mHandle != VK_NULL_HANDLE)
>-    {
>-        vkDestroyShaderModule(device, mHandle, nullptr);
>-        mHandle = VK_NULL_HANDLE;
>-    }
>-}
>-
>-Error ShaderModule::init(VkDevice device, const VkShaderModuleCreateInfo &createInfo)
>-{
>-    ASSERT(!valid());
>-    ANGLE_VK_TRY(vkCreateShaderModule(device, &createInfo, nullptr, &mHandle));
>-    return NoError();
>-}
>-
>-// Pipeline implementation.
>-Pipeline::Pipeline()
>-{
>-}
>-
>-void Pipeline::destroy(VkDevice device)
>-{
>-    if (valid())
>-    {
>-        vkDestroyPipeline(device, mHandle, nullptr);
>-        mHandle = VK_NULL_HANDLE;
>-    }
>-}
>-
>-Error Pipeline::initGraphics(VkDevice device, const VkGraphicsPipelineCreateInfo &createInfo)
>-{
>-    ASSERT(!valid());
>-    ANGLE_VK_TRY(
>-        vkCreateGraphicsPipelines(device, VK_NULL_HANDLE, 1, &createInfo, nullptr, &mHandle));
>-    return NoError();
>-}
>-
>-// PipelineLayout implementation.
>-PipelineLayout::PipelineLayout()
>-{
>-}
>-
>-void PipelineLayout::destroy(VkDevice device)
>-{
>-    if (valid())
>-    {
>-        vkDestroyPipelineLayout(device, mHandle, nullptr);
>-        mHandle = VK_NULL_HANDLE;
>-    }
>-}
>-
>-Error PipelineLayout::init(VkDevice device, const VkPipelineLayoutCreateInfo &createInfo)
>-{
>-    ASSERT(!valid());
>-    ANGLE_VK_TRY(vkCreatePipelineLayout(device, &createInfo, nullptr, &mHandle));
>-    return NoError();
>-}
>-
>-// DescriptorSetLayout implementation.
>-DescriptorSetLayout::DescriptorSetLayout()
>-{
>-}
>-
>-void DescriptorSetLayout::destroy(VkDevice device)
>-{
>-    if (valid())
>-    {
>-        vkDestroyDescriptorSetLayout(device, mHandle, nullptr);
>-        mHandle = VK_NULL_HANDLE;
>-    }
>-}
>-
>-Error DescriptorSetLayout::init(VkDevice device, const VkDescriptorSetLayoutCreateInfo &createInfo)
>-{
>-    ASSERT(!valid());
>-    ANGLE_VK_TRY(vkCreateDescriptorSetLayout(device, &createInfo, nullptr, &mHandle));
>-    return NoError();
>-}
>-
>-// DescriptorPool implementation.
>-DescriptorPool::DescriptorPool()
>-{
>-}
>-
>-void DescriptorPool::destroy(VkDevice device)
>-{
>-    if (valid())
>-    {
>-        vkDestroyDescriptorPool(device, mHandle, nullptr);
>-        mHandle = VK_NULL_HANDLE;
>-    }
>-}
>-
>-Error DescriptorPool::init(VkDevice device, const VkDescriptorPoolCreateInfo &createInfo)
>-{
>-    ASSERT(!valid());
>-    ANGLE_VK_TRY(vkCreateDescriptorPool(device, &createInfo, nullptr, &mHandle));
>-    return NoError();
>-}
>-
>-Error DescriptorPool::allocateDescriptorSets(VkDevice device,
>-                                             const VkDescriptorSetAllocateInfo &allocInfo,
>-                                             VkDescriptorSet *descriptorSetsOut)
>-{
>-    ASSERT(valid());
>-    ANGLE_VK_TRY(vkAllocateDescriptorSets(device, &allocInfo, descriptorSetsOut));
>-    return NoError();
>-}
>-
>-// Sampler implementation.
>-Sampler::Sampler()
>-{
>-}
>-
>-void Sampler::destroy(VkDevice device)
>-{
>-    if (valid())
>-    {
>-        vkDestroySampler(device, mHandle, nullptr);
>-        mHandle = VK_NULL_HANDLE;
>-    }
>-}
>-
>-Error Sampler::init(VkDevice device, const VkSamplerCreateInfo &createInfo)
>-{
>-    ASSERT(!valid());
>-    ANGLE_VK_TRY(vkCreateSampler(device, &createInfo, nullptr, &mHandle));
>-    return NoError();
>-}
>-
>-// Fence implementation.
>-Fence::Fence()
>-{
>-}
>-
>-void Fence::destroy(VkDevice device)
>-{
>-    if (valid())
>-    {
>-        vkDestroyFence(device, mHandle, nullptr);
>-        mHandle = VK_NULL_HANDLE;
>-    }
>-}
>-
>-Error Fence::init(VkDevice device, const VkFenceCreateInfo &createInfo)
>-{
>-    ASSERT(!valid());
>-    ANGLE_VK_TRY(vkCreateFence(device, &createInfo, nullptr, &mHandle));
>-    return NoError();
>-}
>-
>-VkResult Fence::getStatus(VkDevice device) const
>-{
>-    return vkGetFenceStatus(device, mHandle);
>-}
>-
>-// MemoryProperties implementation.
>-MemoryProperties::MemoryProperties() : mMemoryProperties{0}
>-{
>-}
>-
>-void MemoryProperties::init(VkPhysicalDevice physicalDevice)
>-{
>-    ASSERT(mMemoryProperties.memoryTypeCount == 0);
>-    vkGetPhysicalDeviceMemoryProperties(physicalDevice, &mMemoryProperties);
>-    ASSERT(mMemoryProperties.memoryTypeCount > 0);
>-}
>-
>-uint32_t MemoryProperties::findCompatibleMemoryIndex(uint32_t bitMask, uint32_t propertyFlags) const
>-{
>-    ASSERT(mMemoryProperties.memoryTypeCount > 0);
>-
>-    // TODO(jmadill): Cache compatible memory indexes after finding them once.
>-    for (size_t memoryIndex : angle::BitSet32<32>(bitMask))
>-    {
>-        ASSERT(memoryIndex < mMemoryProperties.memoryTypeCount);
>-
>-        if ((mMemoryProperties.memoryTypes[memoryIndex].propertyFlags & propertyFlags) ==
>-            propertyFlags)
>-        {
>-            return static_cast<uint32_t>(memoryIndex);
>-        }
>-    }
>-
>-    UNREACHABLE();
>-    return std::numeric_limits<uint32_t>::max();
>-}
>-
>-// StagingBuffer implementation.
>-StagingBuffer::StagingBuffer() : mSize(0)
>-{
>-}
>-
>-void StagingBuffer::destroy(VkDevice device)
>-{
>-    mBuffer.destroy(device);
>-    mDeviceMemory.destroy(device);
>-    mSize = 0;
>-}
>-
>-vk::Error StagingBuffer::init(ContextVk *contextVk, VkDeviceSize size, StagingUsage usage)
>-{
>-    VkBufferCreateInfo createInfo;
>-    createInfo.sType                 = VK_STRUCTURE_TYPE_BUFFER_CREATE_INFO;
>-    createInfo.pNext                 = nullptr;
>-    createInfo.flags                 = 0;
>-    createInfo.size                  = size;
>-    createInfo.usage                 = GetStagingBufferUsageFlags(usage);
>-    createInfo.sharingMode           = VK_SHARING_MODE_EXCLUSIVE;
>-    createInfo.queueFamilyIndexCount = 0;
>-    createInfo.pQueueFamilyIndices   = nullptr;
>-
>-    ANGLE_TRY(mBuffer.init(contextVk->getDevice(), createInfo));
>-    ANGLE_TRY(AllocateBufferMemory(contextVk, static_cast<size_t>(size), &mBuffer, &mDeviceMemory,
>-                                   &mSize));
>-
>-    return vk::NoError();
>-}
>-
>-void StagingBuffer::dumpResources(Serial serial, std::vector<vk::GarbageObject> *garbageQueue)
>-{
>-    mBuffer.dumpResources(serial, garbageQueue);
>-    mDeviceMemory.dumpResources(serial, garbageQueue);
>-}
>-
>-Optional<uint32_t> FindMemoryType(const VkPhysicalDeviceMemoryProperties &memoryProps,
>-                                  const VkMemoryRequirements &requirements,
>-                                  uint32_t propertyFlagMask)
>-{
>-    for (uint32_t typeIndex = 0; typeIndex < memoryProps.memoryTypeCount; ++typeIndex)
>-    {
>-        if ((requirements.memoryTypeBits & (1u << typeIndex)) != 0 &&
>-            ((memoryProps.memoryTypes[typeIndex].propertyFlags & propertyFlagMask) ==
>-             propertyFlagMask))
>-        {
>-            return typeIndex;
>-        }
>-    }
>-
>-    return Optional<uint32_t>::Invalid();
>-}
>-
>-Error AllocateBufferMemory(ContextVk *contextVk,
>-                           size_t size,
>-                           Buffer *buffer,
>-                           DeviceMemory *deviceMemoryOut,
>-                           size_t *requiredSizeOut)
>-{
>-    VkDevice device = contextVk->getDevice();
>-
>-    // Find a compatible memory pool index. If the index doesn't change, we could cache it.
>-    // Not finding a valid memory pool means an out-of-spec driver, or internal error.
>-    // TODO(jmadill): More efficient memory allocation.
>-    VkMemoryRequirements memoryRequirements;
>-    vkGetBufferMemoryRequirements(device, buffer->getHandle(), &memoryRequirements);
>-
>-    // The requirements size is not always equal to the specified API size.
>-    ASSERT(memoryRequirements.size >= size);
>-    *requiredSizeOut = static_cast<size_t>(memoryRequirements.size);
>-
>-    VkPhysicalDeviceMemoryProperties memoryProperties;
>-    vkGetPhysicalDeviceMemoryProperties(contextVk->getRenderer()->getPhysicalDevice(),
>-                                        &memoryProperties);
>-
>-    auto memoryTypeIndex =
>-        FindMemoryType(memoryProperties, memoryRequirements,
>-                       VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT | VK_MEMORY_PROPERTY_HOST_COHERENT_BIT);
>-    ANGLE_VK_CHECK(memoryTypeIndex.valid(), VK_ERROR_INCOMPATIBLE_DRIVER);
>-
>-    VkMemoryAllocateInfo allocInfo;
>-    allocInfo.sType           = VK_STRUCTURE_TYPE_MEMORY_ALLOCATE_INFO;
>-    allocInfo.pNext           = nullptr;
>-    allocInfo.memoryTypeIndex = memoryTypeIndex.value();
>-    allocInfo.allocationSize  = memoryRequirements.size;
>-
>-    ANGLE_TRY(deviceMemoryOut->allocate(device, allocInfo));
>-    ANGLE_TRY(buffer->bindMemory(device, *deviceMemoryOut));
>-
>-    return NoError();
>-}
>-
>-// GarbageObject implementation.
>-GarbageObject::GarbageObject()
>-    : mSerial(), mHandleType(HandleType::Invalid), mHandle(VK_NULL_HANDLE)
>-{
>-}
>-
>-GarbageObject::GarbageObject(const GarbageObject &other) = default;
>-
>-GarbageObject &GarbageObject::operator=(const GarbageObject &other) = default;
>-
>-bool GarbageObject::destroyIfComplete(VkDevice device, Serial completedSerial)
>-{
>-    if (completedSerial >= mSerial)
>-    {
>-        destroy(device);
>-        return true;
>-    }
>-
>-    return false;
>-}
>-
>-void GarbageObject::destroy(VkDevice device)
>-{
>-    switch (mHandleType)
>-    {
>-        case HandleType::Semaphore:
>-            vkDestroySemaphore(device, reinterpret_cast<VkSemaphore>(mHandle), nullptr);
>-            break;
>-        case HandleType::CommandBuffer:
>-            // Command buffers are pool allocated.
>-            UNREACHABLE();
>-            break;
>-        case HandleType::Fence:
>-            vkDestroyFence(device, reinterpret_cast<VkFence>(mHandle), nullptr);
>-            break;
>-        case HandleType::DeviceMemory:
>-            vkFreeMemory(device, reinterpret_cast<VkDeviceMemory>(mHandle), nullptr);
>-            break;
>-        case HandleType::Buffer:
>-            vkDestroyBuffer(device, reinterpret_cast<VkBuffer>(mHandle), nullptr);
>-            break;
>-        case HandleType::Image:
>-            vkDestroyImage(device, reinterpret_cast<VkImage>(mHandle), nullptr);
>-            break;
>-        case HandleType::ImageView:
>-            vkDestroyImageView(device, reinterpret_cast<VkImageView>(mHandle), nullptr);
>-            break;
>-        case HandleType::ShaderModule:
>-            vkDestroyShaderModule(device, reinterpret_cast<VkShaderModule>(mHandle), nullptr);
>-            break;
>-        case HandleType::PipelineLayout:
>-            vkDestroyPipelineLayout(device, reinterpret_cast<VkPipelineLayout>(mHandle), nullptr);
>-            break;
>-        case HandleType::RenderPass:
>-            vkDestroyRenderPass(device, reinterpret_cast<VkRenderPass>(mHandle), nullptr);
>-            break;
>-        case HandleType::Pipeline:
>-            vkDestroyPipeline(device, reinterpret_cast<VkPipeline>(mHandle), nullptr);
>-            break;
>-        case HandleType::DescriptorSetLayout:
>-            vkDestroyDescriptorSetLayout(device, reinterpret_cast<VkDescriptorSetLayout>(mHandle),
>-                                         nullptr);
>-            break;
>-        case HandleType::Sampler:
>-            vkDestroySampler(device, reinterpret_cast<VkSampler>(mHandle), nullptr);
>-            break;
>-        case HandleType::DescriptorPool:
>-            vkDestroyDescriptorPool(device, reinterpret_cast<VkDescriptorPool>(mHandle), nullptr);
>-            break;
>-        case HandleType::Framebuffer:
>-            vkDestroyFramebuffer(device, reinterpret_cast<VkFramebuffer>(mHandle), nullptr);
>-            break;
>-        case HandleType::CommandPool:
>-            vkDestroyCommandPool(device, reinterpret_cast<VkCommandPool>(mHandle), nullptr);
>-            break;
>-        default:
>-            UNREACHABLE();
>-            break;
>-    }
>-}
>-
>-// CommandBufferAndState implementation.
>-CommandBufferAndState::CommandBufferAndState() : mStarted(false)
>-{
>-}
>-
>-Error CommandBufferAndState::ensureStarted(VkDevice device,
>-                                           const vk::CommandPool &commandPool,
>-                                           VkCommandBufferLevel level)
>-{
>-    ASSERT(commandPool.valid());
>-
>-    if (valid() && mStarted)
>-    {
>-        return NoError();
>-    }
>-
>-    if (!valid())
>-    {
>-        VkCommandBufferAllocateInfo createInfo;
>-        createInfo.sType              = VK_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOCATE_INFO;
>-        createInfo.pNext              = nullptr;
>-        createInfo.commandPool        = commandPool.getHandle();
>-        createInfo.level              = level;
>-        createInfo.commandBufferCount = 1;
>-
>-        ANGLE_TRY(init(device, createInfo));
>-    }
>-    else
>-    {
>-        reset();
>-    }
>-
>-    VkCommandBufferBeginInfo beginInfo;
>-    beginInfo.sType = VK_STRUCTURE_TYPE_COMMAND_BUFFER_BEGIN_INFO;
>-    beginInfo.pNext = nullptr;
>-    // TODO(jmadill): Use other flags?
>-    beginInfo.flags            = 0;
>-    beginInfo.pInheritanceInfo = nullptr;
>-
>-    ANGLE_TRY(begin(beginInfo));
>-    mStarted = true;
>-
>-    return NoError();
>-}
>-
>-Error CommandBufferAndState::ensureFinished()
>-{
>-    ANGLE_TRY(end());
>-    mStarted = false;
>-    return NoError();
>-}
>-
>-// RenderPassDesc implementation.
>-RenderPassDesc::RenderPassDesc()
>-    : colorAttachmentCount(0), depthStencilAttachmentCount(0), attachmentDescs{}
>-{
>-    memset(attachmentDescs.data(), 0, sizeof(VkAttachmentDescription) * attachmentDescs.size());
>-}
>-
>-RenderPassDesc::~RenderPassDesc()
>-{
>-}
>-
>-RenderPassDesc::RenderPassDesc(const RenderPassDesc &other)
>-{
>-    memcpy(this, &other, sizeof(RenderPassDesc));
>-}
>-
>-RenderPassDesc &RenderPassDesc::operator=(const RenderPassDesc &other)
>-{
>-    memcpy(this, &other, sizeof(RenderPassDesc));
>-    return *this;
>-}
>-
>-VkAttachmentDescription *RenderPassDesc::nextColorAttachment()
>-{
>-    ASSERT(colorAttachmentCount < gl::IMPLEMENTATION_MAX_DRAW_BUFFERS);
>-    return &attachmentDescs[colorAttachmentCount++];
>-}
>-
>-VkAttachmentDescription *RenderPassDesc::nextDepthStencilAttachment()
>-{
>-    ASSERT(depthStencilAttachmentCount == 0);
>-    return &attachmentDescs[depthStencilAttachmentCount++];
>-}
>-
>-uint32_t RenderPassDesc::attachmentCount() const
>-{
>-    return (colorAttachmentCount + depthStencilAttachmentCount);
>-}
>-
>-Error InitializeRenderPassFromDesc(VkDevice device,
>-                                   const RenderPassDesc &desc,
>-                                   RenderPass *renderPass)
>-{
>-    uint32_t attachmentCount = desc.attachmentCount();
>-    ASSERT(attachmentCount > 0);
>-
>-    gl::DrawBuffersArray<VkAttachmentReference> colorAttachmentRefs;
>-
>-    for (uint32_t colorIndex = 0; colorIndex < desc.colorAttachmentCount; ++colorIndex)
>-    {
>-        VkAttachmentReference &colorRef = colorAttachmentRefs[colorIndex];
>-        colorRef.attachment             = colorIndex;
>-        colorRef.layout                 = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL;
>-    }
>-
>-    VkAttachmentReference depthStencilAttachmentRef;
>-    if (desc.depthStencilAttachmentCount > 0)
>-    {
>-        ASSERT(desc.depthStencilAttachmentCount == 1);
>-        depthStencilAttachmentRef.attachment = desc.colorAttachmentCount;
>-        depthStencilAttachmentRef.layout     = VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL;
>-    }
>-
>-    VkSubpassDescription subpassDesc;
>-
>-    subpassDesc.flags                = 0;
>-    subpassDesc.pipelineBindPoint    = VK_PIPELINE_BIND_POINT_GRAPHICS;
>-    subpassDesc.inputAttachmentCount = 0;
>-    subpassDesc.pInputAttachments    = nullptr;
>-    subpassDesc.colorAttachmentCount = desc.colorAttachmentCount;
>-    subpassDesc.pColorAttachments    = colorAttachmentRefs.data();
>-    subpassDesc.pResolveAttachments  = nullptr;
>-    subpassDesc.pDepthStencilAttachment =
>-        (desc.depthStencilAttachmentCount > 0 ? &depthStencilAttachmentRef : nullptr);
>-    subpassDesc.preserveAttachmentCount = 0;
>-    subpassDesc.pPreserveAttachments    = nullptr;
>-
>-    VkRenderPassCreateInfo createInfo;
>-    createInfo.sType           = VK_STRUCTURE_TYPE_RENDER_PASS_CREATE_INFO;
>-    createInfo.pNext           = nullptr;
>-    createInfo.flags           = 0;
>-    createInfo.attachmentCount = attachmentCount;
>-    createInfo.pAttachments    = desc.attachmentDescs.data();
>-    createInfo.subpassCount    = 1;
>-    createInfo.pSubpasses      = &subpassDesc;
>-    createInfo.dependencyCount = 0;
>-    createInfo.pDependencies   = nullptr;
>-
>-    ANGLE_TRY(renderPass->init(device, createInfo));
>-    return vk::NoError();
>-}
>-
>-}  // namespace vk
>-
>-namespace gl_vk
>-{
>-VkPrimitiveTopology GetPrimitiveTopology(GLenum mode)
>-{
>-    switch (mode)
>-    {
>-        case GL_TRIANGLES:
>-            return VK_PRIMITIVE_TOPOLOGY_TRIANGLE_LIST;
>-        case GL_POINTS:
>-            return VK_PRIMITIVE_TOPOLOGY_POINT_LIST;
>-        case GL_LINES:
>-            return VK_PRIMITIVE_TOPOLOGY_LINE_LIST;
>-        case GL_LINE_STRIP:
>-            return VK_PRIMITIVE_TOPOLOGY_LINE_STRIP;
>-        case GL_TRIANGLE_FAN:
>-            return VK_PRIMITIVE_TOPOLOGY_TRIANGLE_FAN;
>-        case GL_TRIANGLE_STRIP:
>-            return VK_PRIMITIVE_TOPOLOGY_TRIANGLE_STRIP;
>-        case GL_LINE_LOOP:
>-            // TODO(jmadill): Implement line loop support.
>-            UNIMPLEMENTED();
>-            return VK_PRIMITIVE_TOPOLOGY_LINE_STRIP;
>-        default:
>-            UNREACHABLE();
>-            return VK_PRIMITIVE_TOPOLOGY_POINT_LIST;
>-    }
>-}
>-
>-VkCullModeFlags GetCullMode(const gl::RasterizerState &rasterState)
>-{
>-    if (!rasterState.cullFace)
>-    {
>-        return VK_CULL_MODE_NONE;
>-    }
>-
>-    switch (rasterState.cullMode)
>-    {
>-        case gl::CullFaceMode::Front:
>-            return VK_CULL_MODE_FRONT_BIT;
>-        case gl::CullFaceMode::Back:
>-            return VK_CULL_MODE_BACK_BIT;
>-        case gl::CullFaceMode::FrontAndBack:
>-            return VK_CULL_MODE_FRONT_AND_BACK;
>-        default:
>-            UNREACHABLE();
>-            return VK_CULL_MODE_NONE;
>-    }
>-}
>-
>-VkFrontFace GetFrontFace(GLenum frontFace)
>-{
>-    switch (frontFace)
>-    {
>-        case GL_CW:
>-            return VK_FRONT_FACE_CLOCKWISE;
>-        case GL_CCW:
>-            return VK_FRONT_FACE_COUNTER_CLOCKWISE;
>-        default:
>-            UNREACHABLE();
>-            return VK_FRONT_FACE_COUNTER_CLOCKWISE;
>-    }
>-}
>-
>-}  // namespace gl_vk
>-
>-}  // namespace rx
>-
>-std::ostream &operator<<(std::ostream &stream, const rx::vk::Error &error)
>-{
>-    stream << error.toString();
>-    return stream;
>-}
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/renderervk_utils.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/renderervk_utils.h
>deleted file mode 100644
>index 72a9080e22e..00000000000
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/renderervk_utils.h
>+++ /dev/null
>@@ -1,719 +0,0 @@
>-//
>-// Copyright 2016 The ANGLE Project Authors. All rights reserved.
>-// Use of this source code is governed by a BSD-style license that can be
>-// found in the LICENSE file.
>-//
>-// renderervk_utils:
>-//    Helper functions for the Vulkan Renderer.
>-//
>-
>-#ifndef LIBANGLE_RENDERER_VULKAN_RENDERERVK_UTILS_H_
>-#define LIBANGLE_RENDERER_VULKAN_RENDERERVK_UTILS_H_
>-
>-#include <limits>
>-
>-#include <vulkan/vulkan.h>
>-
>-#include "common/Optional.h"
>-#include "common/debug.h"
>-#include "libANGLE/Error.h"
>-#include "libANGLE/renderer/renderer_utils.h"
>-
>-#define ANGLE_GL_OBJECTS_X(PROC) \
>-    PROC(Buffer)                 \
>-    PROC(Context)                \
>-    PROC(Framebuffer)            \
>-    PROC(Program)                \
>-    PROC(Texture)                \
>-    PROC(VertexArray)
>-
>-#define ANGLE_PRE_DECLARE_OBJECT(OBJ) class OBJ;
>-
>-namespace egl
>-{
>-class Display;
>-}
>-
>-namespace gl
>-{
>-struct Box;
>-struct Extents;
>-struct RasterizerState;
>-struct Rectangle;
>-
>-ANGLE_GL_OBJECTS_X(ANGLE_PRE_DECLARE_OBJECT);
>-}
>-
>-#define ANGLE_PRE_DECLARE_VK_OBJECT(OBJ) class OBJ##Vk;
>-
>-namespace rx
>-{
>-class DisplayVk;
>-
>-ANGLE_GL_OBJECTS_X(ANGLE_PRE_DECLARE_VK_OBJECT);
>-
>-const char *VulkanResultString(VkResult result);
>-bool HasStandardValidationLayer(const std::vector<VkLayerProperties> &layerProps);
>-
>-extern const char *g_VkStdValidationLayerName;
>-extern const char *g_VkLoaderLayersPathEnv;
>-
>-enum class TextureDimension
>-{
>-    TEX_2D,
>-    TEX_CUBE,
>-    TEX_3D,
>-    TEX_2D_ARRAY,
>-};
>-
>-// This is a small helper mixin for any GL object used in Vk command buffers. It records a serial
>-// at command recording times indicating an order in the queue. We use Fences to detect when
>-// commands finish, and then release any unreferenced and deleted resources based on the stored
>-// queue serial in a special 'garbage' queue.
>-class ResourceVk
>-{
>-  public:
>-    void setQueueSerial(Serial queueSerial)
>-    {
>-        ASSERT(queueSerial >= mStoredQueueSerial);
>-        mStoredQueueSerial = queueSerial;
>-    }
>-
>-    Serial getQueueSerial() const { return mStoredQueueSerial; }
>-
>-  private:
>-    Serial mStoredQueueSerial;
>-};
>-
>-namespace vk
>-{
>-template <typename T>
>-struct ImplTypeHelper;
>-
>-// clang-format off
>-#define ANGLE_IMPL_TYPE_HELPER_GL(OBJ) \
>-template<>                             \
>-struct ImplTypeHelper<gl::OBJ>         \
>-{                                      \
>-    using ImplType = OBJ##Vk;          \
>-};
>-// clang-format on
>-
>-ANGLE_GL_OBJECTS_X(ANGLE_IMPL_TYPE_HELPER_GL)
>-
>-template <>
>-struct ImplTypeHelper<egl::Display>
>-{
>-    using ImplType = DisplayVk;
>-};
>-
>-template <typename T>
>-using GetImplType = typename ImplTypeHelper<T>::ImplType;
>-
>-template <typename T>
>-GetImplType<T> *GetImpl(const T *glObject)
>-{
>-    return GetImplAs<GetImplType<T>>(glObject);
>-}
>-
>-class MemoryProperties final : angle::NonCopyable
>-{
>-  public:
>-    MemoryProperties();
>-
>-    void init(VkPhysicalDevice physicalDevice);
>-    uint32_t findCompatibleMemoryIndex(uint32_t bitMask, uint32_t propertyFlags) const;
>-
>-  private:
>-    VkPhysicalDeviceMemoryProperties mMemoryProperties;
>-};
>-
>-class Error final
>-{
>-  public:
>-    Error(VkResult result);
>-    Error(VkResult result, const char *file, unsigned int line);
>-    ~Error();
>-
>-    Error(const Error &other);
>-    Error &operator=(const Error &other);
>-
>-    gl::Error toGL(GLenum glErrorCode) const;
>-    egl::Error toEGL(EGLint eglErrorCode) const;
>-
>-    operator gl::Error() const;
>-    operator egl::Error() const;
>-
>-    template <typename T>
>-    operator gl::ErrorOrResult<T>() const
>-    {
>-        return operator gl::Error();
>-    }
>-
>-    bool isError() const;
>-
>-    std::string toString() const;
>-
>-  private:
>-    VkResult mResult;
>-    const char *mFile;
>-    unsigned int mLine;
>-};
>-
>-template <typename ResultT>
>-using ErrorOrResult = angle::ErrorOrResultBase<Error, ResultT, VkResult, VK_SUCCESS>;
>-
>-// Avoid conflicting with X headers which define "Success".
>-inline Error NoError()
>-{
>-    return Error(VK_SUCCESS);
>-}
>-
>-// Unimplemented handle types:
>-// Instance
>-// PhysicalDevice
>-// Device
>-// Queue
>-// Event
>-// QueryPool
>-// BufferView
>-// DescriptorSet
>-// PipelineCache
>-
>-#define ANGLE_HANDLE_TYPES_X(FUNC) \
>-    FUNC(Semaphore)                \
>-    FUNC(CommandBuffer)            \
>-    FUNC(Fence)                    \
>-    FUNC(DeviceMemory)             \
>-    FUNC(Buffer)                   \
>-    FUNC(Image)                    \
>-    FUNC(ImageView)                \
>-    FUNC(ShaderModule)             \
>-    FUNC(PipelineLayout)           \
>-    FUNC(RenderPass)               \
>-    FUNC(Pipeline)                 \
>-    FUNC(DescriptorSetLayout)      \
>-    FUNC(Sampler)                  \
>-    FUNC(DescriptorPool)           \
>-    FUNC(Framebuffer)              \
>-    FUNC(CommandPool)
>-
>-#define ANGLE_COMMA_SEP_FUNC(TYPE) TYPE,
>-
>-enum class HandleType
>-{
>-    Invalid,
>-    ANGLE_HANDLE_TYPES_X(ANGLE_COMMA_SEP_FUNC)
>-};
>-
>-#undef ANGLE_COMMA_SEP_FUNC
>-
>-#define ANGLE_PRE_DECLARE_CLASS_FUNC(TYPE) class TYPE;
>-ANGLE_HANDLE_TYPES_X(ANGLE_PRE_DECLARE_CLASS_FUNC)
>-#undef ANGLE_PRE_DECLARE_CLASS_FUNC
>-
>-// Returns the HandleType of a Vk Handle.
>-template <typename T>
>-struct HandleTypeHelper;
>-
>-// clang-format off
>-#define ANGLE_HANDLE_TYPE_HELPER_FUNC(TYPE)                     \
>-template<> struct HandleTypeHelper<TYPE>                        \
>-{                                                               \
>-    constexpr static HandleType kHandleType = HandleType::TYPE; \
>-};
>-// clang-format on
>-
>-ANGLE_HANDLE_TYPES_X(ANGLE_HANDLE_TYPE_HELPER_FUNC)
>-
>-#undef ANGLE_HANDLE_TYPE_HELPER_FUNC
>-
>-class GarbageObject final
>-{
>-  public:
>-    template <typename ObjectT>
>-    GarbageObject(Serial serial, const ObjectT &object)
>-        : mSerial(serial),
>-          mHandleType(HandleTypeHelper<ObjectT>::kHandleType),
>-          mHandle(reinterpret_cast<VkDevice>(object.getHandle()))
>-    {
>-    }
>-
>-    GarbageObject();
>-    GarbageObject(const GarbageObject &other);
>-    GarbageObject &operator=(const GarbageObject &other);
>-
>-    bool destroyIfComplete(VkDevice device, Serial completedSerial);
>-    void destroy(VkDevice device);
>-
>-  private:
>-    // TODO(jmadill): Since many objects will have the same serial, it might be more efficient to
>-    // store the serial outside of the garbage object itself. We could index ranges of garbage
>-    // objects in the Renderer, using a circular buffer.
>-    Serial mSerial;
>-    HandleType mHandleType;
>-    VkDevice mHandle;
>-};
>-
>-template <typename DerivedT, typename HandleT>
>-class WrappedObject : angle::NonCopyable
>-{
>-  public:
>-    HandleT getHandle() const { return mHandle; }
>-    bool valid() const { return (mHandle != VK_NULL_HANDLE); }
>-
>-    const HandleT *ptr() const { return &mHandle; }
>-
>-    void dumpResources(Serial serial, std::vector<vk::GarbageObject> *garbageQueue)
>-    {
>-        if (valid())
>-        {
>-            garbageQueue->emplace_back(serial, *static_cast<DerivedT *>(this));
>-            mHandle = VK_NULL_HANDLE;
>-        }
>-    }
>-
>-  protected:
>-    WrappedObject() : mHandle(VK_NULL_HANDLE) {}
>-    ~WrappedObject() { ASSERT(!valid()); }
>-
>-    WrappedObject(WrappedObject &&other) : mHandle(other.mHandle)
>-    {
>-        other.mHandle = VK_NULL_HANDLE;
>-    }
>-
>-    // Only works to initialize empty objects, since we don't have the device handle.
>-    WrappedObject &operator=(WrappedObject &&other)
>-    {
>-        ASSERT(!valid());
>-        std::swap(mHandle, other.mHandle);
>-        return *this;
>-    }
>-
>-    HandleT mHandle;
>-};
>-
>-class CommandPool final : public WrappedObject<CommandPool, VkCommandPool>
>-{
>-  public:
>-    CommandPool();
>-
>-    void destroy(VkDevice device);
>-
>-    Error init(VkDevice device, const VkCommandPoolCreateInfo &createInfo);
>-};
>-
>-// Helper class that wraps a Vulkan command buffer.
>-class CommandBuffer : public WrappedObject<CommandBuffer, VkCommandBuffer>
>-{
>-  public:
>-    CommandBuffer();
>-
>-    void destroy(VkDevice device, const vk::CommandPool &commandPool);
>-    Error init(VkDevice device, const VkCommandBufferAllocateInfo &createInfo);
>-    using WrappedObject::operator=;
>-
>-    Error begin(const VkCommandBufferBeginInfo &info);
>-
>-    Error end();
>-    Error reset();
>-
>-    void singleImageBarrier(VkPipelineStageFlags srcStageMask,
>-                            VkPipelineStageFlags dstStageMask,
>-                            VkDependencyFlags dependencyFlags,
>-                            const VkImageMemoryBarrier &imageMemoryBarrier);
>-
>-    void singleBufferBarrier(VkPipelineStageFlags srcStageMask,
>-                             VkPipelineStageFlags dstStageMask,
>-                             VkDependencyFlags dependencyFlags,
>-                             const VkBufferMemoryBarrier &bufferBarrier);
>-
>-    void clearSingleColorImage(const vk::Image &image, const VkClearColorValue &color);
>-
>-    void copyBuffer(const vk::Buffer &srcBuffer,
>-                    const vk::Buffer &destBuffer,
>-                    uint32_t regionCount,
>-                    const VkBufferCopy *regions);
>-
>-    void copySingleImage(const vk::Image &srcImage,
>-                         const vk::Image &destImage,
>-                         const gl::Box &copyRegion,
>-                         VkImageAspectFlags aspectMask);
>-
>-    void copyImage(const vk::Image &srcImage,
>-                   const vk::Image &dstImage,
>-                   uint32_t regionCount,
>-                   const VkImageCopy *regions);
>-
>-    void beginRenderPass(const RenderPass &renderPass,
>-                         const Framebuffer &framebuffer,
>-                         const gl::Rectangle &renderArea,
>-                         const std::vector<VkClearValue> &clearValues);
>-    void endRenderPass();
>-
>-    void draw(uint32_t vertexCount,
>-              uint32_t instanceCount,
>-              uint32_t firstVertex,
>-              uint32_t firstInstance);
>-
>-    void drawIndexed(uint32_t indexCount,
>-                     uint32_t instanceCount,
>-                     uint32_t firstIndex,
>-                     int32_t vertexOffset,
>-                     uint32_t firstInstance);
>-
>-    void bindPipeline(VkPipelineBindPoint pipelineBindPoint, const vk::Pipeline &pipeline);
>-    void bindVertexBuffers(uint32_t firstBinding,
>-                           uint32_t bindingCount,
>-                           const VkBuffer *buffers,
>-                           const VkDeviceSize *offsets);
>-    void bindIndexBuffer(const vk::Buffer &buffer, VkDeviceSize offset, VkIndexType indexType);
>-    void bindDescriptorSets(VkPipelineBindPoint bindPoint,
>-                            const vk::PipelineLayout &layout,
>-                            uint32_t firstSet,
>-                            uint32_t descriptorSetCount,
>-                            const VkDescriptorSet *descriptorSets,
>-                            uint32_t dynamicOffsetCount,
>-                            const uint32_t *dynamicOffsets);
>-};
>-
>-class Image final : public WrappedObject<Image, VkImage>
>-{
>-  public:
>-    Image();
>-
>-    // Use this method if the lifetime of the image is not controlled by ANGLE. (SwapChain)
>-    void setHandle(VkImage handle);
>-
>-    // Called on shutdown when the helper class *doesn't* own the handle to the image resource.
>-    void reset();
>-
>-    // Called on shutdown when the helper class *does* own the handle to the image resource.
>-    void destroy(VkDevice device);
>-
>-    Error init(VkDevice device, const VkImageCreateInfo &createInfo);
>-
>-    void changeLayoutTop(VkImageAspectFlags aspectMask,
>-                         VkImageLayout newLayout,
>-                         CommandBuffer *commandBuffer);
>-
>-    void changeLayoutWithStages(VkImageAspectFlags aspectMask,
>-                                VkImageLayout newLayout,
>-                                VkPipelineStageFlags srcStageMask,
>-                                VkPipelineStageFlags dstStageMask,
>-                                CommandBuffer *commandBuffer);
>-
>-    void getMemoryRequirements(VkDevice device, VkMemoryRequirements *requirementsOut) const;
>-    Error bindMemory(VkDevice device, const vk::DeviceMemory &deviceMemory);
>-
>-    VkImageLayout getCurrentLayout() const { return mCurrentLayout; }
>-    void updateLayout(VkImageLayout layout) { mCurrentLayout = layout; }
>-
>-  private:
>-    VkImageLayout mCurrentLayout;
>-};
>-
>-class ImageView final : public WrappedObject<ImageView, VkImageView>
>-{
>-  public:
>-    ImageView();
>-    void destroy(VkDevice device);
>-
>-    Error init(VkDevice device, const VkImageViewCreateInfo &createInfo);
>-};
>-
>-class Semaphore final : public WrappedObject<Semaphore, VkSemaphore>
>-{
>-  public:
>-    Semaphore();
>-    void destroy(VkDevice device);
>-
>-    Error init(VkDevice device);
>-};
>-
>-class Framebuffer final : public WrappedObject<Framebuffer, VkFramebuffer>
>-{
>-  public:
>-    Framebuffer();
>-    void destroy(VkDevice device);
>-
>-    Error init(VkDevice device, const VkFramebufferCreateInfo &createInfo);
>-};
>-
>-class DeviceMemory final : public WrappedObject<DeviceMemory, VkDeviceMemory>
>-{
>-  public:
>-    DeviceMemory();
>-    void destroy(VkDevice device);
>-
>-    Error allocate(VkDevice device, const VkMemoryAllocateInfo &allocInfo);
>-    Error map(VkDevice device,
>-              VkDeviceSize offset,
>-              VkDeviceSize size,
>-              VkMemoryMapFlags flags,
>-              uint8_t **mapPointer);
>-    void unmap(VkDevice device);
>-};
>-
>-class RenderPass final : public WrappedObject<RenderPass, VkRenderPass>
>-{
>-  public:
>-    RenderPass();
>-    void destroy(VkDevice device);
>-
>-    Error init(VkDevice device, const VkRenderPassCreateInfo &createInfo);
>-};
>-
>-enum class StagingUsage
>-{
>-    Read,
>-    Write,
>-    Both,
>-};
>-
>-class Buffer final : public WrappedObject<Buffer, VkBuffer>
>-{
>-  public:
>-    Buffer();
>-    void destroy(VkDevice device);
>-
>-    Error init(VkDevice device, const VkBufferCreateInfo &createInfo);
>-    Error bindMemory(VkDevice device, const DeviceMemory &deviceMemory);
>-};
>-
>-class ShaderModule final : public WrappedObject<ShaderModule, VkShaderModule>
>-{
>-  public:
>-    ShaderModule();
>-    void destroy(VkDevice device);
>-
>-    Error init(VkDevice device, const VkShaderModuleCreateInfo &createInfo);
>-};
>-
>-class Pipeline final : public WrappedObject<Pipeline, VkPipeline>
>-{
>-  public:
>-    Pipeline();
>-    void destroy(VkDevice device);
>-
>-    Error initGraphics(VkDevice device, const VkGraphicsPipelineCreateInfo &createInfo);
>-};
>-
>-class PipelineLayout final : public WrappedObject<PipelineLayout, VkPipelineLayout>
>-{
>-  public:
>-    PipelineLayout();
>-    void destroy(VkDevice device);
>-
>-    Error init(VkDevice device, const VkPipelineLayoutCreateInfo &createInfo);
>-};
>-
>-class DescriptorSetLayout final : public WrappedObject<DescriptorSetLayout, VkDescriptorSetLayout>
>-{
>-  public:
>-    DescriptorSetLayout();
>-    void destroy(VkDevice device);
>-
>-    Error init(VkDevice device, const VkDescriptorSetLayoutCreateInfo &createInfo);
>-};
>-
>-class DescriptorPool final : public WrappedObject<DescriptorPool, VkDescriptorPool>
>-{
>-  public:
>-    DescriptorPool();
>-    void destroy(VkDevice device);
>-
>-    Error init(VkDevice device, const VkDescriptorPoolCreateInfo &createInfo);
>-
>-    Error allocateDescriptorSets(VkDevice device,
>-                                 const VkDescriptorSetAllocateInfo &allocInfo,
>-                                 VkDescriptorSet *descriptorSetsOut);
>-};
>-
>-class Sampler final : public WrappedObject<Sampler, VkSampler>
>-{
>-  public:
>-    Sampler();
>-    void destroy(VkDevice device);
>-    Error init(VkDevice device, const VkSamplerCreateInfo &createInfo);
>-};
>-
>-class Fence final : public WrappedObject<Fence, VkFence>
>-{
>-  public:
>-    Fence();
>-    void destroy(VkDevice fence);
>-    using WrappedObject::operator=;
>-
>-    Error init(VkDevice device, const VkFenceCreateInfo &createInfo);
>-    VkResult getStatus(VkDevice device) const;
>-};
>-
>-// Helper class for managing a CPU/GPU transfer Image.
>-class StagingImage final : angle::NonCopyable
>-{
>-  public:
>-    StagingImage();
>-    StagingImage(StagingImage &&other);
>-    void destroy(VkDevice device);
>-
>-    vk::Error init(VkDevice device,
>-                   uint32_t queueFamilyIndex,
>-                   const MemoryProperties &memoryProperties,
>-                   TextureDimension dimension,
>-                   VkFormat format,
>-                   const gl::Extents &extent,
>-                   StagingUsage usage);
>-
>-    Image &getImage() { return mImage; }
>-    const Image &getImage() const { return mImage; }
>-    DeviceMemory &getDeviceMemory() { return mDeviceMemory; }
>-    const DeviceMemory &getDeviceMemory() const { return mDeviceMemory; }
>-    VkDeviceSize getSize() const { return mSize; }
>-
>-    void dumpResources(Serial serial, std::vector<vk::GarbageObject> *garbageQueue);
>-
>-  private:
>-    Image mImage;
>-    DeviceMemory mDeviceMemory;
>-    VkDeviceSize mSize;
>-};
>-
>-// Similar to StagingImage, for Buffers.
>-class StagingBuffer final : angle::NonCopyable
>-{
>-  public:
>-    StagingBuffer();
>-    void destroy(VkDevice device);
>-
>-    vk::Error init(ContextVk *contextVk, VkDeviceSize size, StagingUsage usage);
>-
>-    Buffer &getBuffer() { return mBuffer; }
>-    const Buffer &getBuffer() const { return mBuffer; }
>-    DeviceMemory &getDeviceMemory() { return mDeviceMemory; }
>-    const DeviceMemory &getDeviceMemory() const { return mDeviceMemory; }
>-    size_t getSize() const { return mSize; }
>-
>-    void dumpResources(Serial serial, std::vector<vk::GarbageObject> *garbageQueue);
>-
>-  private:
>-    Buffer mBuffer;
>-    DeviceMemory mDeviceMemory;
>-    size_t mSize;
>-};
>-
>-template <typename ObjT>
>-class ObjectAndSerial final : angle::NonCopyable
>-{
>-  public:
>-    ObjectAndSerial(ObjT &&object, Serial queueSerial)
>-        : mObject(std::move(object)), mQueueSerial(queueSerial)
>-    {
>-    }
>-
>-    ObjectAndSerial(ObjectAndSerial &&other)
>-        : mObject(std::move(other.mObject)), mQueueSerial(std::move(other.mQueueSerial))
>-    {
>-    }
>-    ObjectAndSerial &operator=(ObjectAndSerial &&other)
>-    {
>-        mObject      = std::move(other.mObject);
>-        mQueueSerial = std::move(other.mQueueSerial);
>-        return *this;
>-    }
>-
>-    Serial queueSerial() const { return mQueueSerial; }
>-
>-    const ObjT &get() const { return mObject; }
>-    ObjT &get() { return mObject; }
>-
>-  private:
>-    ObjT mObject;
>-    Serial mQueueSerial;
>-};
>-
>-Optional<uint32_t> FindMemoryType(const VkPhysicalDeviceMemoryProperties &memoryProps,
>-                                  const VkMemoryRequirements &requirements,
>-                                  uint32_t propertyFlagMask);
>-
>-Error AllocateBufferMemory(ContextVk *contextVk,
>-                           size_t size,
>-                           Buffer *buffer,
>-                           DeviceMemory *deviceMemoryOut,
>-                           size_t *requiredSizeOut);
>-
>-struct BufferAndMemory final : private angle::NonCopyable
>-{
>-    vk::Buffer buffer;
>-    vk::DeviceMemory memory;
>-};
>-
>-class CommandBufferAndState : public vk::CommandBuffer
>-{
>-  public:
>-    CommandBufferAndState();
>-
>-    Error ensureStarted(VkDevice device,
>-                        const vk::CommandPool &commandPool,
>-                        VkCommandBufferLevel level);
>-    Error ensureFinished();
>-
>-    bool started() const { return mStarted; }
>-
>-  private:
>-    bool mStarted;
>-};
>-
>-using CommandBufferAndSerial = ObjectAndSerial<CommandBufferAndState>;
>-using FenceAndSerial         = ObjectAndSerial<Fence>;
>-
>-struct RenderPassDesc final
>-{
>-    RenderPassDesc();
>-    ~RenderPassDesc();
>-    RenderPassDesc(const RenderPassDesc &other);
>-    RenderPassDesc &operator=(const RenderPassDesc &other);
>-
>-    // These also increment the attachment counts. DS attachments are limited to a count of 1.
>-    VkAttachmentDescription *nextColorAttachment();
>-    VkAttachmentDescription *nextDepthStencilAttachment();
>-    uint32_t attachmentCount() const;
>-
>-    // Fully padded out, with no bools, to avoid any undefined behaviour.
>-    uint32_t colorAttachmentCount;
>-    uint32_t depthStencilAttachmentCount;
>-
>-    // The last element in this array is the depth/stencil attachment, if present.
>-    gl::AttachmentArray<VkAttachmentDescription> attachmentDescs;
>-};
>-
>-Error InitializeRenderPassFromDesc(VkDevice device,
>-                                   const RenderPassDesc &desc,
>-                                   RenderPass *renderPass);
>-
>-}  // namespace vk
>-
>-namespace gl_vk
>-{
>-VkPrimitiveTopology GetPrimitiveTopology(GLenum mode);
>-VkCullModeFlags GetCullMode(const gl::RasterizerState &rasterState);
>-VkFrontFace GetFrontFace(GLenum frontFace);
>-}  // namespace gl_vk
>-
>-}  // namespace rx
>-
>-#define ANGLE_VK_TRY(command)                                          \
>-    {                                                                  \
>-        auto ANGLE_LOCAL_VAR = command;                                \
>-        if (ANGLE_LOCAL_VAR != VK_SUCCESS)                             \
>-        {                                                              \
>-            return rx::vk::Error(ANGLE_LOCAL_VAR, __FILE__, __LINE__); \
>-        }                                                              \
>-    }                                                                  \
>-    ANGLE_EMPTY_STATEMENT
>-
>-#define ANGLE_VK_CHECK(test, error) ANGLE_VK_TRY(test ? VK_SUCCESS : error)
>-
>-std::ostream &operator<<(std::ostream &stream, const rx::vk::Error &error);
>-
>-#endif  // LIBANGLE_RENDERER_VULKAN_RENDERERVK_UTILS_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/README.md b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/README.md
>new file mode 100644
>index 00000000000..f33ee189c04
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/README.md
>@@ -0,0 +1,49 @@
>+# Shader Variations
>+
>+To build multiple variations of a shader, add a file named X.json corresponding to shader file X.  A
>+variation is generated by building the shader with different definitions (a la glslang_validator's
>+-DName=1).  These definitions come from flags and enumerations defined in the json file.  Without a
>+.json file, the shader is generated as is (1 variation).
>+
>+There are multiple possible fields in the json file:
>+
>+- "Description": This contains the license and other comments, which will be ignored.
>+- "Flags": this is a list of flags.  Each flag FLAG defines a shader variation with or without the
>+  define FLAG=1.
>+- other: any other field is a similar list to flags, except that each entry in this enumeration is a
>+  variation.  Similar to "flags", every entry ENTRY results in an ENTRY=1 define.
>+
>+Flags are shorthand for 2-entry enumerations.  Given n flags, there are 2^n variations where every
>+flag is either present or not.  For enumerations, only one entry is active in any variation.  Thus,
>+an enumeration with n entries generates n variations.
>+
>+## Example
>+
>+Here is an example json file:
>+
>+{
>+    "Description": [
>+        "Copyright 2018 The ANGLE Project Authors. All rights reserved.",
>+        "Use of this source code is governed by a BSD-style license that can be",
>+        "found in the LICENSE file.",
>+        "",
>+        "RayTrace.comp.json: Build parameters for RayTrace.comp."
>+    ],
>+    "Flags": [
>+        "NanFilter",
>+        "WorkaroundIntelBug"
>+    ],
>+    "RayTraceQuality": [
>+        "IsRTLowRes",
>+        "IsRTHighRes",
>+        "IsRTAwesome"
>+    ],
>+    "ImageType": [
>+        "IsR",
>+        "IsRG",
>+        "IsRGB",
>+        "IsRGBA"
>+    ]
>+}
>+
>+This will generate 2^2 * 3 * 4 shaders.
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/gen/BufferUtils.comp.00000000.inc b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/gen/BufferUtils.comp.00000000.inc
>new file mode 100644
>index 00000000000..339e587cc91
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/gen/BufferUtils.comp.00000000.inc
>@@ -0,0 +1,91 @@
>+	// 7.11.3188
>+	 #pragma once
>+const uint32_t kBufferUtils_comp_00000000[] = {
>+	0x07230203,0x00010000,0x00080007,0x0000003d,0x00000000,0x00020011,0x00000001,0x00020011,
>+	0x0000002f,0x0006000b,0x00000001,0x4c534c47,0x6474732e,0x3035342e,0x00000000,0x0003000e,
>+	0x00000000,0x00000001,0x0006000f,0x00000005,0x00000004,0x6e69616d,0x00000000,0x00000009,
>+	0x00060010,0x00000004,0x00000011,0x00000040,0x00000001,0x00000001,0x00030003,0x00000002,
>+	0x000001c2,0x00040005,0x00000004,0x6e69616d,0x00000000,0x00080005,0x00000009,0x475f6c67,
>+	0x61626f6c,0x766e496c,0x7461636f,0x496e6f69,0x00000044,0x00060005,0x00000010,0x68737550,
>+	0x736e6f43,0x746e6174,0x00000073,0x00060006,0x00000010,0x00000000,0x74736564,0x7366664f,
>+	0x00007465,0x00050006,0x00000010,0x00000001,0x657a6973,0x00000000,0x00060006,0x00000010,
>+	0x00000002,0x4f637273,0x65736666,0x00000074,0x00050006,0x00000010,0x00000003,0x64646170,
>+	0x00676e69,0x00060006,0x00000010,0x00000004,0x61656c63,0x6c615672,0x00006575,0x00040005,
>+	0x00000012,0x61726170,0x0000736d,0x00050005,0x0000001e,0x74736564,0x65646e49,0x00000078,
>+	0x00050005,0x00000026,0x49637273,0x7865646e,0x00000000,0x00050005,0x0000002f,0x56637273,
>+	0x65756c61,0x00000000,0x00040005,0x00000036,0x74736564,0x00000000,0x00040047,0x00000009,
>+	0x0000000b,0x0000001c,0x00050048,0x00000010,0x00000000,0x00000023,0x00000000,0x00050048,
>+	0x00000010,0x00000001,0x00000023,0x00000004,0x00050048,0x00000010,0x00000002,0x00000023,
>+	0x00000008,0x00050048,0x00000010,0x00000003,0x00000023,0x0000000c,0x00050048,0x00000010,
>+	0x00000004,0x00000023,0x00000010,0x00030047,0x00000010,0x00000002,0x00040047,0x00000036,
>+	0x00000022,0x00000000,0x00040047,0x00000036,0x00000021,0x00000000,0x00030047,0x00000036,
>+	0x00000019,0x00040047,0x0000003c,0x0000000b,0x00000019,0x00020013,0x00000002,0x00030021,
>+	0x00000003,0x00000002,0x00040015,0x00000006,0x00000020,0x00000000,0x00040017,0x00000007,
>+	0x00000006,0x00000003,0x00040020,0x00000008,0x00000001,0x00000007,0x0004003b,0x00000008,
>+	0x00000009,0x00000001,0x0004002b,0x00000006,0x0000000a,0x00000000,0x00040020,0x0000000b,
>+	0x00000001,0x00000006,0x00030016,0x0000000e,0x00000020,0x00040017,0x0000000f,0x0000000e,
>+	0x00000004,0x0007001e,0x00000010,0x00000006,0x00000006,0x00000006,0x00000006,0x0000000f,
>+	0x00040020,0x00000011,0x00000009,0x00000010,0x0004003b,0x00000011,0x00000012,0x00000009,
>+	0x00040015,0x00000013,0x00000020,0x00000001,0x0004002b,0x00000013,0x00000014,0x00000001,
>+	0x00040020,0x00000015,0x00000009,0x00000006,0x00020014,0x00000018,0x00040020,0x0000001d,
>+	0x00000007,0x00000013,0x0004002b,0x00000013,0x0000001f,0x00000000,0x0004002b,0x00000013,
>+	0x00000027,0x00000002,0x00040020,0x0000002e,0x00000007,0x0000000f,0x0004002b,0x00000013,
>+	0x00000030,0x00000004,0x00040020,0x00000031,0x00000009,0x0000000f,0x00090019,0x00000034,
>+	0x0000000e,0x00000005,0x00000000,0x00000000,0x00000000,0x00000002,0x00000001,0x00040020,
>+	0x00000035,0x00000000,0x00000034,0x0004003b,0x00000035,0x00000036,0x00000000,0x0004002b,
>+	0x00000006,0x0000003a,0x00000040,0x0004002b,0x00000006,0x0000003b,0x00000001,0x0006002c,
>+	0x00000007,0x0000003c,0x0000003a,0x0000003b,0x0000003b,0x00050036,0x00000002,0x00000004,
>+	0x00000000,0x00000003,0x000200f8,0x00000005,0x0004003b,0x0000001d,0x0000001e,0x00000007,
>+	0x0004003b,0x0000001d,0x00000026,0x00000007,0x0004003b,0x0000002e,0x0000002f,0x00000007,
>+	0x00050041,0x0000000b,0x0000000c,0x00000009,0x0000000a,0x0004003d,0x00000006,0x0000000d,
>+	0x0000000c,0x00050041,0x00000015,0x00000016,0x00000012,0x00000014,0x0004003d,0x00000006,
>+	0x00000017,0x00000016,0x000500ae,0x00000018,0x00000019,0x0000000d,0x00000017,0x000300f7,
>+	0x0000001b,0x00000000,0x000400fa,0x00000019,0x0000001a,0x0000001b,0x000200f8,0x0000001a,
>+	0x000100fd,0x000200f8,0x0000001b,0x00050041,0x00000015,0x00000020,0x00000012,0x0000001f,
>+	0x0004003d,0x00000006,0x00000021,0x00000020,0x00050041,0x0000000b,0x00000022,0x00000009,
>+	0x0000000a,0x0004003d,0x00000006,0x00000023,0x00000022,0x00050080,0x00000006,0x00000024,
>+	0x00000021,0x00000023,0x0004007c,0x00000013,0x00000025,0x00000024,0x0003003e,0x0000001e,
>+	0x00000025,0x00050041,0x00000015,0x00000028,0x00000012,0x00000027,0x0004003d,0x00000006,
>+	0x00000029,0x00000028,0x00050041,0x0000000b,0x0000002a,0x00000009,0x0000000a,0x0004003d,
>+	0x00000006,0x0000002b,0x0000002a,0x00050080,0x00000006,0x0000002c,0x00000029,0x0000002b,
>+	0x0004007c,0x00000013,0x0000002d,0x0000002c,0x0003003e,0x00000026,0x0000002d,0x00050041,
>+	0x00000031,0x00000032,0x00000012,0x00000030,0x0004003d,0x0000000f,0x00000033,0x00000032,
>+	0x0003003e,0x0000002f,0x00000033,0x0004003d,0x00000034,0x00000037,0x00000036,0x0004003d,
>+	0x00000013,0x00000038,0x0000001e,0x0004003d,0x0000000f,0x00000039,0x0000002f,0x00040063,
>+	0x00000037,0x00000038,0x00000039,0x000100fd,0x00010038
>+};
>+
>+#if 0  // Generated from:
>+#version 450 core
>+
>+layout(local_size_x = 64, local_size_y = 1, local_size_z = 1)in;
>+
>+layout(set = 0, binding = 0, rgba32f)uniform writeonly imageBuffer dest;
>+
>+layout(push_constant)uniform PushConstants
>+{
>+
>+    uint destOffset;
>+
>+    uint size;
>+
>+    uint srcOffset;
>+    uint padding;
>+
>+        vec4 clearValue;
>+} params;
>+
>+void main()
>+{
>+
>+    if(gl_GlobalInvocationID . x >= params . size)
>+        return;
>+
>+    int destIndex = int(params . destOffset . x + gl_GlobalInvocationID . x);
>+    int srcIndex = int(params . srcOffset . x + gl_GlobalInvocationID . x);
>+
>+        vec4 srcValue = params . clearValue;
>+
>+    imageStore(dest, destIndex, srcValue);
>+}
>+#endif  // Preprocessed code
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/gen/BufferUtils.comp.00000001.inc b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/gen/BufferUtils.comp.00000001.inc
>new file mode 100644
>index 00000000000..2c8fb027f63
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/gen/BufferUtils.comp.00000001.inc
>@@ -0,0 +1,83 @@
>+	// 7.11.3188
>+	 #pragma once
>+const uint32_t kBufferUtils_comp_00000001[] = {
>+	0x07230203,0x00010000,0x00080007,0x00000033,0x00000000,0x00020011,0x00000001,0x00020011,
>+	0x0000002f,0x0006000b,0x00000001,0x4c534c47,0x6474732e,0x3035342e,0x00000000,0x0003000e,
>+	0x00000000,0x00000001,0x0006000f,0x00000005,0x00000004,0x6e69616d,0x00000000,0x00000015,
>+	0x00060010,0x00000004,0x00000011,0x00000040,0x00000001,0x00000001,0x00030003,0x00000002,
>+	0x000001c2,0x00040005,0x00000004,0x6e69616d,0x00000000,0x00050005,0x00000008,0x74736564,
>+	0x65646e49,0x00000078,0x00060005,0x0000000c,0x68737550,0x736e6f43,0x746e6174,0x00000073,
>+	0x00060006,0x0000000c,0x00000000,0x74736564,0x7366664f,0x00007465,0x00050006,0x0000000c,
>+	0x00000001,0x657a6973,0x00000000,0x00060006,0x0000000c,0x00000002,0x4f637273,0x65736666,
>+	0x00000074,0x00050006,0x0000000c,0x00000003,0x64646170,0x00676e69,0x00060006,0x0000000c,
>+	0x00000004,0x61656c63,0x6c615672,0x00006575,0x00040005,0x0000000e,0x61726170,0x0000736d,
>+	0x00080005,0x00000015,0x475f6c67,0x61626f6c,0x766e496c,0x7461636f,0x496e6f69,0x00000044,
>+	0x00050005,0x0000001c,0x49637273,0x7865646e,0x00000000,0x00050005,0x00000025,0x56637273,
>+	0x65756c61,0x00000000,0x00040005,0x0000002c,0x74736564,0x00000000,0x00050048,0x0000000c,
>+	0x00000000,0x00000023,0x00000000,0x00050048,0x0000000c,0x00000001,0x00000023,0x00000004,
>+	0x00050048,0x0000000c,0x00000002,0x00000023,0x00000008,0x00050048,0x0000000c,0x00000003,
>+	0x00000023,0x0000000c,0x00050048,0x0000000c,0x00000004,0x00000023,0x00000010,0x00030047,
>+	0x0000000c,0x00000002,0x00040047,0x00000015,0x0000000b,0x0000001c,0x00040047,0x0000002c,
>+	0x00000022,0x00000000,0x00040047,0x0000002c,0x00000021,0x00000000,0x00030047,0x0000002c,
>+	0x00000019,0x00040047,0x00000032,0x0000000b,0x00000019,0x00020013,0x00000002,0x00030021,
>+	0x00000003,0x00000002,0x00040015,0x00000006,0x00000020,0x00000001,0x00040020,0x00000007,
>+	0x00000007,0x00000006,0x00040015,0x00000009,0x00000020,0x00000000,0x00030016,0x0000000a,
>+	0x00000020,0x00040017,0x0000000b,0x0000000a,0x00000004,0x0007001e,0x0000000c,0x00000009,
>+	0x00000009,0x00000009,0x00000009,0x0000000b,0x00040020,0x0000000d,0x00000009,0x0000000c,
>+	0x0004003b,0x0000000d,0x0000000e,0x00000009,0x0004002b,0x00000006,0x0000000f,0x00000000,
>+	0x00040020,0x00000010,0x00000009,0x00000009,0x00040017,0x00000013,0x00000009,0x00000003,
>+	0x00040020,0x00000014,0x00000001,0x00000013,0x0004003b,0x00000014,0x00000015,0x00000001,
>+	0x0004002b,0x00000009,0x00000016,0x00000000,0x00040020,0x00000017,0x00000001,0x00000009,
>+	0x0004002b,0x00000006,0x0000001d,0x00000002,0x00040020,0x00000024,0x00000007,0x0000000b,
>+	0x0004002b,0x00000006,0x00000026,0x00000004,0x00040020,0x00000027,0x00000009,0x0000000b,
>+	0x00090019,0x0000002a,0x0000000a,0x00000005,0x00000000,0x00000000,0x00000000,0x00000002,
>+	0x00000001,0x00040020,0x0000002b,0x00000000,0x0000002a,0x0004003b,0x0000002b,0x0000002c,
>+	0x00000000,0x0004002b,0x00000009,0x00000030,0x00000040,0x0004002b,0x00000009,0x00000031,
>+	0x00000001,0x0006002c,0x00000013,0x00000032,0x00000030,0x00000031,0x00000031,0x00050036,
>+	0x00000002,0x00000004,0x00000000,0x00000003,0x000200f8,0x00000005,0x0004003b,0x00000007,
>+	0x00000008,0x00000007,0x0004003b,0x00000007,0x0000001c,0x00000007,0x0004003b,0x00000024,
>+	0x00000025,0x00000007,0x00050041,0x00000010,0x00000011,0x0000000e,0x0000000f,0x0004003d,
>+	0x00000009,0x00000012,0x00000011,0x00050041,0x00000017,0x00000018,0x00000015,0x00000016,
>+	0x0004003d,0x00000009,0x00000019,0x00000018,0x00050080,0x00000009,0x0000001a,0x00000012,
>+	0x00000019,0x0004007c,0x00000006,0x0000001b,0x0000001a,0x0003003e,0x00000008,0x0000001b,
>+	0x00050041,0x00000010,0x0000001e,0x0000000e,0x0000001d,0x0004003d,0x00000009,0x0000001f,
>+	0x0000001e,0x00050041,0x00000017,0x00000020,0x00000015,0x00000016,0x0004003d,0x00000009,
>+	0x00000021,0x00000020,0x00050080,0x00000009,0x00000022,0x0000001f,0x00000021,0x0004007c,
>+	0x00000006,0x00000023,0x00000022,0x0003003e,0x0000001c,0x00000023,0x00050041,0x00000027,
>+	0x00000028,0x0000000e,0x00000026,0x0004003d,0x0000000b,0x00000029,0x00000028,0x0003003e,
>+	0x00000025,0x00000029,0x0004003d,0x0000002a,0x0000002d,0x0000002c,0x0004003d,0x00000006,
>+	0x0000002e,0x00000008,0x0004003d,0x0000000b,0x0000002f,0x00000025,0x00040063,0x0000002d,
>+	0x0000002e,0x0000002f,0x000100fd,0x00010038
>+};
>+
>+#if 0  // Generated from:
>+#version 450 core
>+
>+layout(local_size_x = 64, local_size_y = 1, local_size_z = 1)in;
>+
>+layout(set = 0, binding = 0, rgba32f)uniform writeonly imageBuffer dest;
>+
>+layout(push_constant)uniform PushConstants
>+{
>+
>+    uint destOffset;
>+
>+    uint size;
>+
>+    uint srcOffset;
>+    uint padding;
>+
>+        vec4 clearValue;
>+} params;
>+
>+void main()
>+{
>+
>+    int destIndex = int(params . destOffset . x + gl_GlobalInvocationID . x);
>+    int srcIndex = int(params . srcOffset . x + gl_GlobalInvocationID . x);
>+
>+        vec4 srcValue = params . clearValue;
>+
>+    imageStore(dest, destIndex, srcValue);
>+}
>+#endif  // Preprocessed code
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/gen/BufferUtils.comp.00000002.inc b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/gen/BufferUtils.comp.00000002.inc
>new file mode 100644
>index 00000000000..c43d610ace9
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/gen/BufferUtils.comp.00000002.inc
>@@ -0,0 +1,97 @@
>+	// 7.11.3188
>+	 #pragma once
>+const uint32_t kBufferUtils_comp_00000002[] = {
>+	0x07230203,0x00010000,0x00080007,0x00000041,0x00000000,0x00020011,0x00000001,0x00020011,
>+	0x0000002e,0x00020011,0x0000002f,0x0006000b,0x00000001,0x4c534c47,0x6474732e,0x3035342e,
>+	0x00000000,0x0003000e,0x00000000,0x00000001,0x0006000f,0x00000005,0x00000004,0x6e69616d,
>+	0x00000000,0x00000009,0x00060010,0x00000004,0x00000011,0x00000040,0x00000001,0x00000001,
>+	0x00030003,0x00000002,0x000001c2,0x00040005,0x00000004,0x6e69616d,0x00000000,0x00080005,
>+	0x00000009,0x475f6c67,0x61626f6c,0x766e496c,0x7461636f,0x496e6f69,0x00000044,0x00060005,
>+	0x00000010,0x68737550,0x736e6f43,0x746e6174,0x00000073,0x00060006,0x00000010,0x00000000,
>+	0x74736564,0x7366664f,0x00007465,0x00050006,0x00000010,0x00000001,0x657a6973,0x00000000,
>+	0x00060006,0x00000010,0x00000002,0x4f637273,0x65736666,0x00000074,0x00050006,0x00000010,
>+	0x00000003,0x64646170,0x00676e69,0x00060006,0x00000010,0x00000004,0x61656c63,0x6c615672,
>+	0x00006575,0x00040005,0x00000012,0x61726170,0x0000736d,0x00050005,0x0000001e,0x74736564,
>+	0x65646e49,0x00000078,0x00050005,0x00000026,0x49637273,0x7865646e,0x00000000,0x00050005,
>+	0x0000002f,0x56637273,0x65756c61,0x00000000,0x00030005,0x00000033,0x00637273,0x00040005,
>+	0x0000003a,0x74736564,0x00000000,0x00040047,0x00000009,0x0000000b,0x0000001c,0x00050048,
>+	0x00000010,0x00000000,0x00000023,0x00000000,0x00050048,0x00000010,0x00000001,0x00000023,
>+	0x00000004,0x00050048,0x00000010,0x00000002,0x00000023,0x00000008,0x00050048,0x00000010,
>+	0x00000003,0x00000023,0x0000000c,0x00050048,0x00000010,0x00000004,0x00000023,0x00000010,
>+	0x00030047,0x00000010,0x00000002,0x00040047,0x00000033,0x00000022,0x00000000,0x00040047,
>+	0x00000033,0x00000021,0x00000001,0x00040047,0x0000003a,0x00000022,0x00000000,0x00040047,
>+	0x0000003a,0x00000021,0x00000000,0x00030047,0x0000003a,0x00000019,0x00040047,0x00000040,
>+	0x0000000b,0x00000019,0x00020013,0x00000002,0x00030021,0x00000003,0x00000002,0x00040015,
>+	0x00000006,0x00000020,0x00000000,0x00040017,0x00000007,0x00000006,0x00000003,0x00040020,
>+	0x00000008,0x00000001,0x00000007,0x0004003b,0x00000008,0x00000009,0x00000001,0x0004002b,
>+	0x00000006,0x0000000a,0x00000000,0x00040020,0x0000000b,0x00000001,0x00000006,0x00030016,
>+	0x0000000e,0x00000020,0x00040017,0x0000000f,0x0000000e,0x00000004,0x0007001e,0x00000010,
>+	0x00000006,0x00000006,0x00000006,0x00000006,0x0000000f,0x00040020,0x00000011,0x00000009,
>+	0x00000010,0x0004003b,0x00000011,0x00000012,0x00000009,0x00040015,0x00000013,0x00000020,
>+	0x00000001,0x0004002b,0x00000013,0x00000014,0x00000001,0x00040020,0x00000015,0x00000009,
>+	0x00000006,0x00020014,0x00000018,0x00040020,0x0000001d,0x00000007,0x00000013,0x0004002b,
>+	0x00000013,0x0000001f,0x00000000,0x0004002b,0x00000013,0x00000027,0x00000002,0x00040020,
>+	0x0000002e,0x00000007,0x0000000f,0x00090019,0x00000030,0x0000000e,0x00000005,0x00000000,
>+	0x00000000,0x00000000,0x00000001,0x00000000,0x0003001b,0x00000031,0x00000030,0x00040020,
>+	0x00000032,0x00000000,0x00000031,0x0004003b,0x00000032,0x00000033,0x00000000,0x00090019,
>+	0x00000038,0x0000000e,0x00000005,0x00000000,0x00000000,0x00000000,0x00000002,0x00000001,
>+	0x00040020,0x00000039,0x00000000,0x00000038,0x0004003b,0x00000039,0x0000003a,0x00000000,
>+	0x0004002b,0x00000006,0x0000003e,0x00000040,0x0004002b,0x00000006,0x0000003f,0x00000001,
>+	0x0006002c,0x00000007,0x00000040,0x0000003e,0x0000003f,0x0000003f,0x00050036,0x00000002,
>+	0x00000004,0x00000000,0x00000003,0x000200f8,0x00000005,0x0004003b,0x0000001d,0x0000001e,
>+	0x00000007,0x0004003b,0x0000001d,0x00000026,0x00000007,0x0004003b,0x0000002e,0x0000002f,
>+	0x00000007,0x00050041,0x0000000b,0x0000000c,0x00000009,0x0000000a,0x0004003d,0x00000006,
>+	0x0000000d,0x0000000c,0x00050041,0x00000015,0x00000016,0x00000012,0x00000014,0x0004003d,
>+	0x00000006,0x00000017,0x00000016,0x000500ae,0x00000018,0x00000019,0x0000000d,0x00000017,
>+	0x000300f7,0x0000001b,0x00000000,0x000400fa,0x00000019,0x0000001a,0x0000001b,0x000200f8,
>+	0x0000001a,0x000100fd,0x000200f8,0x0000001b,0x00050041,0x00000015,0x00000020,0x00000012,
>+	0x0000001f,0x0004003d,0x00000006,0x00000021,0x00000020,0x00050041,0x0000000b,0x00000022,
>+	0x00000009,0x0000000a,0x0004003d,0x00000006,0x00000023,0x00000022,0x00050080,0x00000006,
>+	0x00000024,0x00000021,0x00000023,0x0004007c,0x00000013,0x00000025,0x00000024,0x0003003e,
>+	0x0000001e,0x00000025,0x00050041,0x00000015,0x00000028,0x00000012,0x00000027,0x0004003d,
>+	0x00000006,0x00000029,0x00000028,0x00050041,0x0000000b,0x0000002a,0x00000009,0x0000000a,
>+	0x0004003d,0x00000006,0x0000002b,0x0000002a,0x00050080,0x00000006,0x0000002c,0x00000029,
>+	0x0000002b,0x0004007c,0x00000013,0x0000002d,0x0000002c,0x0003003e,0x00000026,0x0000002d,
>+	0x0004003d,0x00000031,0x00000034,0x00000033,0x0004003d,0x00000013,0x00000035,0x00000026,
>+	0x00040064,0x00000030,0x00000036,0x00000034,0x0005005f,0x0000000f,0x00000037,0x00000036,
>+	0x00000035,0x0003003e,0x0000002f,0x00000037,0x0004003d,0x00000038,0x0000003b,0x0000003a,
>+	0x0004003d,0x00000013,0x0000003c,0x0000001e,0x0004003d,0x0000000f,0x0000003d,0x0000002f,
>+	0x00040063,0x0000003b,0x0000003c,0x0000003d,0x000100fd,0x00010038
>+};
>+
>+#if 0  // Generated from:
>+#version 450 core
>+
>+layout(local_size_x = 64, local_size_y = 1, local_size_z = 1)in;
>+
>+layout(set = 0, binding = 0, rgba32f)uniform writeonly imageBuffer dest;
>+
>+layout(set = 0, binding = 1)uniform samplerBuffer src;
>+
>+layout(push_constant)uniform PushConstants
>+{
>+
>+    uint destOffset;
>+
>+    uint size;
>+
>+    uint srcOffset;
>+    uint padding;
>+
>+        vec4 clearValue;
>+} params;
>+
>+void main()
>+{
>+
>+    if(gl_GlobalInvocationID . x >= params . size)
>+        return;
>+
>+    int destIndex = int(params . destOffset . x + gl_GlobalInvocationID . x);
>+    int srcIndex = int(params . srcOffset . x + gl_GlobalInvocationID . x);
>+
>+        vec4 srcValue = texelFetch(src, srcIndex);
>+
>+    imageStore(dest, destIndex, srcValue);
>+}
>+#endif  // Preprocessed code
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/gen/BufferUtils.comp.00000003.inc b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/gen/BufferUtils.comp.00000003.inc
>new file mode 100644
>index 00000000000..d58ee720169
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/gen/BufferUtils.comp.00000003.inc
>@@ -0,0 +1,89 @@
>+	// 7.11.3188
>+	 #pragma once
>+const uint32_t kBufferUtils_comp_00000003[] = {
>+	0x07230203,0x00010000,0x00080007,0x00000037,0x00000000,0x00020011,0x00000001,0x00020011,
>+	0x0000002e,0x00020011,0x0000002f,0x0006000b,0x00000001,0x4c534c47,0x6474732e,0x3035342e,
>+	0x00000000,0x0003000e,0x00000000,0x00000001,0x0006000f,0x00000005,0x00000004,0x6e69616d,
>+	0x00000000,0x00000015,0x00060010,0x00000004,0x00000011,0x00000040,0x00000001,0x00000001,
>+	0x00030003,0x00000002,0x000001c2,0x00040005,0x00000004,0x6e69616d,0x00000000,0x00050005,
>+	0x00000008,0x74736564,0x65646e49,0x00000078,0x00060005,0x0000000c,0x68737550,0x736e6f43,
>+	0x746e6174,0x00000073,0x00060006,0x0000000c,0x00000000,0x74736564,0x7366664f,0x00007465,
>+	0x00050006,0x0000000c,0x00000001,0x657a6973,0x00000000,0x00060006,0x0000000c,0x00000002,
>+	0x4f637273,0x65736666,0x00000074,0x00050006,0x0000000c,0x00000003,0x64646170,0x00676e69,
>+	0x00060006,0x0000000c,0x00000004,0x61656c63,0x6c615672,0x00006575,0x00040005,0x0000000e,
>+	0x61726170,0x0000736d,0x00080005,0x00000015,0x475f6c67,0x61626f6c,0x766e496c,0x7461636f,
>+	0x496e6f69,0x00000044,0x00050005,0x0000001c,0x49637273,0x7865646e,0x00000000,0x00050005,
>+	0x00000025,0x56637273,0x65756c61,0x00000000,0x00030005,0x00000029,0x00637273,0x00040005,
>+	0x00000030,0x74736564,0x00000000,0x00050048,0x0000000c,0x00000000,0x00000023,0x00000000,
>+	0x00050048,0x0000000c,0x00000001,0x00000023,0x00000004,0x00050048,0x0000000c,0x00000002,
>+	0x00000023,0x00000008,0x00050048,0x0000000c,0x00000003,0x00000023,0x0000000c,0x00050048,
>+	0x0000000c,0x00000004,0x00000023,0x00000010,0x00030047,0x0000000c,0x00000002,0x00040047,
>+	0x00000015,0x0000000b,0x0000001c,0x00040047,0x00000029,0x00000022,0x00000000,0x00040047,
>+	0x00000029,0x00000021,0x00000001,0x00040047,0x00000030,0x00000022,0x00000000,0x00040047,
>+	0x00000030,0x00000021,0x00000000,0x00030047,0x00000030,0x00000019,0x00040047,0x00000036,
>+	0x0000000b,0x00000019,0x00020013,0x00000002,0x00030021,0x00000003,0x00000002,0x00040015,
>+	0x00000006,0x00000020,0x00000001,0x00040020,0x00000007,0x00000007,0x00000006,0x00040015,
>+	0x00000009,0x00000020,0x00000000,0x00030016,0x0000000a,0x00000020,0x00040017,0x0000000b,
>+	0x0000000a,0x00000004,0x0007001e,0x0000000c,0x00000009,0x00000009,0x00000009,0x00000009,
>+	0x0000000b,0x00040020,0x0000000d,0x00000009,0x0000000c,0x0004003b,0x0000000d,0x0000000e,
>+	0x00000009,0x0004002b,0x00000006,0x0000000f,0x00000000,0x00040020,0x00000010,0x00000009,
>+	0x00000009,0x00040017,0x00000013,0x00000009,0x00000003,0x00040020,0x00000014,0x00000001,
>+	0x00000013,0x0004003b,0x00000014,0x00000015,0x00000001,0x0004002b,0x00000009,0x00000016,
>+	0x00000000,0x00040020,0x00000017,0x00000001,0x00000009,0x0004002b,0x00000006,0x0000001d,
>+	0x00000002,0x00040020,0x00000024,0x00000007,0x0000000b,0x00090019,0x00000026,0x0000000a,
>+	0x00000005,0x00000000,0x00000000,0x00000000,0x00000001,0x00000000,0x0003001b,0x00000027,
>+	0x00000026,0x00040020,0x00000028,0x00000000,0x00000027,0x0004003b,0x00000028,0x00000029,
>+	0x00000000,0x00090019,0x0000002e,0x0000000a,0x00000005,0x00000000,0x00000000,0x00000000,
>+	0x00000002,0x00000001,0x00040020,0x0000002f,0x00000000,0x0000002e,0x0004003b,0x0000002f,
>+	0x00000030,0x00000000,0x0004002b,0x00000009,0x00000034,0x00000040,0x0004002b,0x00000009,
>+	0x00000035,0x00000001,0x0006002c,0x00000013,0x00000036,0x00000034,0x00000035,0x00000035,
>+	0x00050036,0x00000002,0x00000004,0x00000000,0x00000003,0x000200f8,0x00000005,0x0004003b,
>+	0x00000007,0x00000008,0x00000007,0x0004003b,0x00000007,0x0000001c,0x00000007,0x0004003b,
>+	0x00000024,0x00000025,0x00000007,0x00050041,0x00000010,0x00000011,0x0000000e,0x0000000f,
>+	0x0004003d,0x00000009,0x00000012,0x00000011,0x00050041,0x00000017,0x00000018,0x00000015,
>+	0x00000016,0x0004003d,0x00000009,0x00000019,0x00000018,0x00050080,0x00000009,0x0000001a,
>+	0x00000012,0x00000019,0x0004007c,0x00000006,0x0000001b,0x0000001a,0x0003003e,0x00000008,
>+	0x0000001b,0x00050041,0x00000010,0x0000001e,0x0000000e,0x0000001d,0x0004003d,0x00000009,
>+	0x0000001f,0x0000001e,0x00050041,0x00000017,0x00000020,0x00000015,0x00000016,0x0004003d,
>+	0x00000009,0x00000021,0x00000020,0x00050080,0x00000009,0x00000022,0x0000001f,0x00000021,
>+	0x0004007c,0x00000006,0x00000023,0x00000022,0x0003003e,0x0000001c,0x00000023,0x0004003d,
>+	0x00000027,0x0000002a,0x00000029,0x0004003d,0x00000006,0x0000002b,0x0000001c,0x00040064,
>+	0x00000026,0x0000002c,0x0000002a,0x0005005f,0x0000000b,0x0000002d,0x0000002c,0x0000002b,
>+	0x0003003e,0x00000025,0x0000002d,0x0004003d,0x0000002e,0x00000031,0x00000030,0x0004003d,
>+	0x00000006,0x00000032,0x00000008,0x0004003d,0x0000000b,0x00000033,0x00000025,0x00040063,
>+	0x00000031,0x00000032,0x00000033,0x000100fd,0x00010038
>+};
>+
>+#if 0  // Generated from:
>+#version 450 core
>+
>+layout(local_size_x = 64, local_size_y = 1, local_size_z = 1)in;
>+
>+layout(set = 0, binding = 0, rgba32f)uniform writeonly imageBuffer dest;
>+
>+layout(set = 0, binding = 1)uniform samplerBuffer src;
>+
>+layout(push_constant)uniform PushConstants
>+{
>+
>+    uint destOffset;
>+
>+    uint size;
>+
>+    uint srcOffset;
>+    uint padding;
>+
>+        vec4 clearValue;
>+} params;
>+
>+void main()
>+{
>+
>+    int destIndex = int(params . destOffset . x + gl_GlobalInvocationID . x);
>+    int srcIndex = int(params . srcOffset . x + gl_GlobalInvocationID . x);
>+
>+        vec4 srcValue = texelFetch(src, srcIndex);
>+
>+    imageStore(dest, destIndex, srcValue);
>+}
>+#endif  // Preprocessed code
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/gen/BufferUtils.comp.00000004.inc b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/gen/BufferUtils.comp.00000004.inc
>new file mode 100644
>index 00000000000..ce2723af6ee
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/gen/BufferUtils.comp.00000004.inc
>@@ -0,0 +1,91 @@
>+	// 7.11.3188
>+	 #pragma once
>+const uint32_t kBufferUtils_comp_00000004[] = {
>+	0x07230203,0x00010000,0x00080007,0x0000003c,0x00000000,0x00020011,0x00000001,0x00020011,
>+	0x0000002f,0x0006000b,0x00000001,0x4c534c47,0x6474732e,0x3035342e,0x00000000,0x0003000e,
>+	0x00000000,0x00000001,0x0006000f,0x00000005,0x00000004,0x6e69616d,0x00000000,0x00000009,
>+	0x00060010,0x00000004,0x00000011,0x00000040,0x00000001,0x00000001,0x00030003,0x00000002,
>+	0x000001c2,0x00040005,0x00000004,0x6e69616d,0x00000000,0x00080005,0x00000009,0x475f6c67,
>+	0x61626f6c,0x766e496c,0x7461636f,0x496e6f69,0x00000044,0x00060005,0x00000010,0x68737550,
>+	0x736e6f43,0x746e6174,0x00000073,0x00060006,0x00000010,0x00000000,0x74736564,0x7366664f,
>+	0x00007465,0x00050006,0x00000010,0x00000001,0x657a6973,0x00000000,0x00060006,0x00000010,
>+	0x00000002,0x4f637273,0x65736666,0x00000074,0x00050006,0x00000010,0x00000003,0x64646170,
>+	0x00676e69,0x00060006,0x00000010,0x00000004,0x61656c63,0x6c615672,0x00006575,0x00040005,
>+	0x00000012,0x61726170,0x0000736d,0x00050005,0x0000001d,0x74736564,0x65646e49,0x00000078,
>+	0x00050005,0x00000025,0x49637273,0x7865646e,0x00000000,0x00050005,0x0000002e,0x56637273,
>+	0x65756c61,0x00000000,0x00040005,0x00000035,0x74736564,0x00000000,0x00040047,0x00000009,
>+	0x0000000b,0x0000001c,0x00050048,0x00000010,0x00000000,0x00000023,0x00000000,0x00050048,
>+	0x00000010,0x00000001,0x00000023,0x00000004,0x00050048,0x00000010,0x00000002,0x00000023,
>+	0x00000008,0x00050048,0x00000010,0x00000003,0x00000023,0x0000000c,0x00050048,0x00000010,
>+	0x00000004,0x00000023,0x00000010,0x00030047,0x00000010,0x00000002,0x00040047,0x00000035,
>+	0x00000022,0x00000000,0x00040047,0x00000035,0x00000021,0x00000000,0x00030047,0x00000035,
>+	0x00000019,0x00040047,0x0000003b,0x0000000b,0x00000019,0x00020013,0x00000002,0x00030021,
>+	0x00000003,0x00000002,0x00040015,0x00000006,0x00000020,0x00000000,0x00040017,0x00000007,
>+	0x00000006,0x00000003,0x00040020,0x00000008,0x00000001,0x00000007,0x0004003b,0x00000008,
>+	0x00000009,0x00000001,0x0004002b,0x00000006,0x0000000a,0x00000000,0x00040020,0x0000000b,
>+	0x00000001,0x00000006,0x00040015,0x0000000e,0x00000020,0x00000001,0x00040017,0x0000000f,
>+	0x0000000e,0x00000004,0x0007001e,0x00000010,0x00000006,0x00000006,0x00000006,0x00000006,
>+	0x0000000f,0x00040020,0x00000011,0x00000009,0x00000010,0x0004003b,0x00000011,0x00000012,
>+	0x00000009,0x0004002b,0x0000000e,0x00000013,0x00000001,0x00040020,0x00000014,0x00000009,
>+	0x00000006,0x00020014,0x00000017,0x00040020,0x0000001c,0x00000007,0x0000000e,0x0004002b,
>+	0x0000000e,0x0000001e,0x00000000,0x0004002b,0x0000000e,0x00000026,0x00000002,0x00040020,
>+	0x0000002d,0x00000007,0x0000000f,0x0004002b,0x0000000e,0x0000002f,0x00000004,0x00040020,
>+	0x00000030,0x00000009,0x0000000f,0x00090019,0x00000033,0x0000000e,0x00000005,0x00000000,
>+	0x00000000,0x00000000,0x00000002,0x00000015,0x00040020,0x00000034,0x00000000,0x00000033,
>+	0x0004003b,0x00000034,0x00000035,0x00000000,0x0004002b,0x00000006,0x00000039,0x00000040,
>+	0x0004002b,0x00000006,0x0000003a,0x00000001,0x0006002c,0x00000007,0x0000003b,0x00000039,
>+	0x0000003a,0x0000003a,0x00050036,0x00000002,0x00000004,0x00000000,0x00000003,0x000200f8,
>+	0x00000005,0x0004003b,0x0000001c,0x0000001d,0x00000007,0x0004003b,0x0000001c,0x00000025,
>+	0x00000007,0x0004003b,0x0000002d,0x0000002e,0x00000007,0x00050041,0x0000000b,0x0000000c,
>+	0x00000009,0x0000000a,0x0004003d,0x00000006,0x0000000d,0x0000000c,0x00050041,0x00000014,
>+	0x00000015,0x00000012,0x00000013,0x0004003d,0x00000006,0x00000016,0x00000015,0x000500ae,
>+	0x00000017,0x00000018,0x0000000d,0x00000016,0x000300f7,0x0000001a,0x00000000,0x000400fa,
>+	0x00000018,0x00000019,0x0000001a,0x000200f8,0x00000019,0x000100fd,0x000200f8,0x0000001a,
>+	0x00050041,0x00000014,0x0000001f,0x00000012,0x0000001e,0x0004003d,0x00000006,0x00000020,
>+	0x0000001f,0x00050041,0x0000000b,0x00000021,0x00000009,0x0000000a,0x0004003d,0x00000006,
>+	0x00000022,0x00000021,0x00050080,0x00000006,0x00000023,0x00000020,0x00000022,0x0004007c,
>+	0x0000000e,0x00000024,0x00000023,0x0003003e,0x0000001d,0x00000024,0x00050041,0x00000014,
>+	0x00000027,0x00000012,0x00000026,0x0004003d,0x00000006,0x00000028,0x00000027,0x00050041,
>+	0x0000000b,0x00000029,0x00000009,0x0000000a,0x0004003d,0x00000006,0x0000002a,0x00000029,
>+	0x00050080,0x00000006,0x0000002b,0x00000028,0x0000002a,0x0004007c,0x0000000e,0x0000002c,
>+	0x0000002b,0x0003003e,0x00000025,0x0000002c,0x00050041,0x00000030,0x00000031,0x00000012,
>+	0x0000002f,0x0004003d,0x0000000f,0x00000032,0x00000031,0x0003003e,0x0000002e,0x00000032,
>+	0x0004003d,0x00000033,0x00000036,0x00000035,0x0004003d,0x0000000e,0x00000037,0x0000001d,
>+	0x0004003d,0x0000000f,0x00000038,0x0000002e,0x00040063,0x00000036,0x00000037,0x00000038,
>+	0x000100fd,0x00010038
>+};
>+
>+#if 0  // Generated from:
>+#version 450 core
>+
>+layout(local_size_x = 64, local_size_y = 1, local_size_z = 1)in;
>+
>+layout(set = 0, binding = 0, rgba32i)uniform writeonly iimageBuffer dest;
>+
>+layout(push_constant)uniform PushConstants
>+{
>+
>+    uint destOffset;
>+
>+    uint size;
>+
>+    uint srcOffset;
>+    uint padding;
>+
>+        ivec4 clearValue;
>+} params;
>+
>+void main()
>+{
>+
>+    if(gl_GlobalInvocationID . x >= params . size)
>+        return;
>+
>+    int destIndex = int(params . destOffset . x + gl_GlobalInvocationID . x);
>+    int srcIndex = int(params . srcOffset . x + gl_GlobalInvocationID . x);
>+
>+        ivec4 srcValue = params . clearValue;
>+
>+    imageStore(dest, destIndex, srcValue);
>+}
>+#endif  // Preprocessed code
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/gen/BufferUtils.comp.00000005.inc b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/gen/BufferUtils.comp.00000005.inc
>new file mode 100644
>index 00000000000..3c7603beedd
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/gen/BufferUtils.comp.00000005.inc
>@@ -0,0 +1,83 @@
>+	// 7.11.3188
>+	 #pragma once
>+const uint32_t kBufferUtils_comp_00000005[] = {
>+	0x07230203,0x00010000,0x00080007,0x00000032,0x00000000,0x00020011,0x00000001,0x00020011,
>+	0x0000002f,0x0006000b,0x00000001,0x4c534c47,0x6474732e,0x3035342e,0x00000000,0x0003000e,
>+	0x00000000,0x00000001,0x0006000f,0x00000005,0x00000004,0x6e69616d,0x00000000,0x00000014,
>+	0x00060010,0x00000004,0x00000011,0x00000040,0x00000001,0x00000001,0x00030003,0x00000002,
>+	0x000001c2,0x00040005,0x00000004,0x6e69616d,0x00000000,0x00050005,0x00000008,0x74736564,
>+	0x65646e49,0x00000078,0x00060005,0x0000000b,0x68737550,0x736e6f43,0x746e6174,0x00000073,
>+	0x00060006,0x0000000b,0x00000000,0x74736564,0x7366664f,0x00007465,0x00050006,0x0000000b,
>+	0x00000001,0x657a6973,0x00000000,0x00060006,0x0000000b,0x00000002,0x4f637273,0x65736666,
>+	0x00000074,0x00050006,0x0000000b,0x00000003,0x64646170,0x00676e69,0x00060006,0x0000000b,
>+	0x00000004,0x61656c63,0x6c615672,0x00006575,0x00040005,0x0000000d,0x61726170,0x0000736d,
>+	0x00080005,0x00000014,0x475f6c67,0x61626f6c,0x766e496c,0x7461636f,0x496e6f69,0x00000044,
>+	0x00050005,0x0000001b,0x49637273,0x7865646e,0x00000000,0x00050005,0x00000024,0x56637273,
>+	0x65756c61,0x00000000,0x00040005,0x0000002b,0x74736564,0x00000000,0x00050048,0x0000000b,
>+	0x00000000,0x00000023,0x00000000,0x00050048,0x0000000b,0x00000001,0x00000023,0x00000004,
>+	0x00050048,0x0000000b,0x00000002,0x00000023,0x00000008,0x00050048,0x0000000b,0x00000003,
>+	0x00000023,0x0000000c,0x00050048,0x0000000b,0x00000004,0x00000023,0x00000010,0x00030047,
>+	0x0000000b,0x00000002,0x00040047,0x00000014,0x0000000b,0x0000001c,0x00040047,0x0000002b,
>+	0x00000022,0x00000000,0x00040047,0x0000002b,0x00000021,0x00000000,0x00030047,0x0000002b,
>+	0x00000019,0x00040047,0x00000031,0x0000000b,0x00000019,0x00020013,0x00000002,0x00030021,
>+	0x00000003,0x00000002,0x00040015,0x00000006,0x00000020,0x00000001,0x00040020,0x00000007,
>+	0x00000007,0x00000006,0x00040015,0x00000009,0x00000020,0x00000000,0x00040017,0x0000000a,
>+	0x00000006,0x00000004,0x0007001e,0x0000000b,0x00000009,0x00000009,0x00000009,0x00000009,
>+	0x0000000a,0x00040020,0x0000000c,0x00000009,0x0000000b,0x0004003b,0x0000000c,0x0000000d,
>+	0x00000009,0x0004002b,0x00000006,0x0000000e,0x00000000,0x00040020,0x0000000f,0x00000009,
>+	0x00000009,0x00040017,0x00000012,0x00000009,0x00000003,0x00040020,0x00000013,0x00000001,
>+	0x00000012,0x0004003b,0x00000013,0x00000014,0x00000001,0x0004002b,0x00000009,0x00000015,
>+	0x00000000,0x00040020,0x00000016,0x00000001,0x00000009,0x0004002b,0x00000006,0x0000001c,
>+	0x00000002,0x00040020,0x00000023,0x00000007,0x0000000a,0x0004002b,0x00000006,0x00000025,
>+	0x00000004,0x00040020,0x00000026,0x00000009,0x0000000a,0x00090019,0x00000029,0x00000006,
>+	0x00000005,0x00000000,0x00000000,0x00000000,0x00000002,0x00000015,0x00040020,0x0000002a,
>+	0x00000000,0x00000029,0x0004003b,0x0000002a,0x0000002b,0x00000000,0x0004002b,0x00000009,
>+	0x0000002f,0x00000040,0x0004002b,0x00000009,0x00000030,0x00000001,0x0006002c,0x00000012,
>+	0x00000031,0x0000002f,0x00000030,0x00000030,0x00050036,0x00000002,0x00000004,0x00000000,
>+	0x00000003,0x000200f8,0x00000005,0x0004003b,0x00000007,0x00000008,0x00000007,0x0004003b,
>+	0x00000007,0x0000001b,0x00000007,0x0004003b,0x00000023,0x00000024,0x00000007,0x00050041,
>+	0x0000000f,0x00000010,0x0000000d,0x0000000e,0x0004003d,0x00000009,0x00000011,0x00000010,
>+	0x00050041,0x00000016,0x00000017,0x00000014,0x00000015,0x0004003d,0x00000009,0x00000018,
>+	0x00000017,0x00050080,0x00000009,0x00000019,0x00000011,0x00000018,0x0004007c,0x00000006,
>+	0x0000001a,0x00000019,0x0003003e,0x00000008,0x0000001a,0x00050041,0x0000000f,0x0000001d,
>+	0x0000000d,0x0000001c,0x0004003d,0x00000009,0x0000001e,0x0000001d,0x00050041,0x00000016,
>+	0x0000001f,0x00000014,0x00000015,0x0004003d,0x00000009,0x00000020,0x0000001f,0x00050080,
>+	0x00000009,0x00000021,0x0000001e,0x00000020,0x0004007c,0x00000006,0x00000022,0x00000021,
>+	0x0003003e,0x0000001b,0x00000022,0x00050041,0x00000026,0x00000027,0x0000000d,0x00000025,
>+	0x0004003d,0x0000000a,0x00000028,0x00000027,0x0003003e,0x00000024,0x00000028,0x0004003d,
>+	0x00000029,0x0000002c,0x0000002b,0x0004003d,0x00000006,0x0000002d,0x00000008,0x0004003d,
>+	0x0000000a,0x0000002e,0x00000024,0x00040063,0x0000002c,0x0000002d,0x0000002e,0x000100fd,
>+	0x00010038
>+};
>+
>+#if 0  // Generated from:
>+#version 450 core
>+
>+layout(local_size_x = 64, local_size_y = 1, local_size_z = 1)in;
>+
>+layout(set = 0, binding = 0, rgba32i)uniform writeonly iimageBuffer dest;
>+
>+layout(push_constant)uniform PushConstants
>+{
>+
>+    uint destOffset;
>+
>+    uint size;
>+
>+    uint srcOffset;
>+    uint padding;
>+
>+        ivec4 clearValue;
>+} params;
>+
>+void main()
>+{
>+
>+    int destIndex = int(params . destOffset . x + gl_GlobalInvocationID . x);
>+    int srcIndex = int(params . srcOffset . x + gl_GlobalInvocationID . x);
>+
>+        ivec4 srcValue = params . clearValue;
>+
>+    imageStore(dest, destIndex, srcValue);
>+}
>+#endif  // Preprocessed code
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/gen/BufferUtils.comp.00000006.inc b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/gen/BufferUtils.comp.00000006.inc
>new file mode 100644
>index 00000000000..c5a57e68725
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/gen/BufferUtils.comp.00000006.inc
>@@ -0,0 +1,97 @@
>+	// 7.11.3188
>+	 #pragma once
>+const uint32_t kBufferUtils_comp_00000006[] = {
>+	0x07230203,0x00010000,0x00080007,0x00000040,0x00000000,0x00020011,0x00000001,0x00020011,
>+	0x0000002e,0x00020011,0x0000002f,0x0006000b,0x00000001,0x4c534c47,0x6474732e,0x3035342e,
>+	0x00000000,0x0003000e,0x00000000,0x00000001,0x0006000f,0x00000005,0x00000004,0x6e69616d,
>+	0x00000000,0x00000009,0x00060010,0x00000004,0x00000011,0x00000040,0x00000001,0x00000001,
>+	0x00030003,0x00000002,0x000001c2,0x00040005,0x00000004,0x6e69616d,0x00000000,0x00080005,
>+	0x00000009,0x475f6c67,0x61626f6c,0x766e496c,0x7461636f,0x496e6f69,0x00000044,0x00060005,
>+	0x00000010,0x68737550,0x736e6f43,0x746e6174,0x00000073,0x00060006,0x00000010,0x00000000,
>+	0x74736564,0x7366664f,0x00007465,0x00050006,0x00000010,0x00000001,0x657a6973,0x00000000,
>+	0x00060006,0x00000010,0x00000002,0x4f637273,0x65736666,0x00000074,0x00050006,0x00000010,
>+	0x00000003,0x64646170,0x00676e69,0x00060006,0x00000010,0x00000004,0x61656c63,0x6c615672,
>+	0x00006575,0x00040005,0x00000012,0x61726170,0x0000736d,0x00050005,0x0000001d,0x74736564,
>+	0x65646e49,0x00000078,0x00050005,0x00000025,0x49637273,0x7865646e,0x00000000,0x00050005,
>+	0x0000002e,0x56637273,0x65756c61,0x00000000,0x00030005,0x00000032,0x00637273,0x00040005,
>+	0x00000039,0x74736564,0x00000000,0x00040047,0x00000009,0x0000000b,0x0000001c,0x00050048,
>+	0x00000010,0x00000000,0x00000023,0x00000000,0x00050048,0x00000010,0x00000001,0x00000023,
>+	0x00000004,0x00050048,0x00000010,0x00000002,0x00000023,0x00000008,0x00050048,0x00000010,
>+	0x00000003,0x00000023,0x0000000c,0x00050048,0x00000010,0x00000004,0x00000023,0x00000010,
>+	0x00030047,0x00000010,0x00000002,0x00040047,0x00000032,0x00000022,0x00000000,0x00040047,
>+	0x00000032,0x00000021,0x00000001,0x00040047,0x00000039,0x00000022,0x00000000,0x00040047,
>+	0x00000039,0x00000021,0x00000000,0x00030047,0x00000039,0x00000019,0x00040047,0x0000003f,
>+	0x0000000b,0x00000019,0x00020013,0x00000002,0x00030021,0x00000003,0x00000002,0x00040015,
>+	0x00000006,0x00000020,0x00000000,0x00040017,0x00000007,0x00000006,0x00000003,0x00040020,
>+	0x00000008,0x00000001,0x00000007,0x0004003b,0x00000008,0x00000009,0x00000001,0x0004002b,
>+	0x00000006,0x0000000a,0x00000000,0x00040020,0x0000000b,0x00000001,0x00000006,0x00040015,
>+	0x0000000e,0x00000020,0x00000001,0x00040017,0x0000000f,0x0000000e,0x00000004,0x0007001e,
>+	0x00000010,0x00000006,0x00000006,0x00000006,0x00000006,0x0000000f,0x00040020,0x00000011,
>+	0x00000009,0x00000010,0x0004003b,0x00000011,0x00000012,0x00000009,0x0004002b,0x0000000e,
>+	0x00000013,0x00000001,0x00040020,0x00000014,0x00000009,0x00000006,0x00020014,0x00000017,
>+	0x00040020,0x0000001c,0x00000007,0x0000000e,0x0004002b,0x0000000e,0x0000001e,0x00000000,
>+	0x0004002b,0x0000000e,0x00000026,0x00000002,0x00040020,0x0000002d,0x00000007,0x0000000f,
>+	0x00090019,0x0000002f,0x0000000e,0x00000005,0x00000000,0x00000000,0x00000000,0x00000001,
>+	0x00000000,0x0003001b,0x00000030,0x0000002f,0x00040020,0x00000031,0x00000000,0x00000030,
>+	0x0004003b,0x00000031,0x00000032,0x00000000,0x00090019,0x00000037,0x0000000e,0x00000005,
>+	0x00000000,0x00000000,0x00000000,0x00000002,0x00000015,0x00040020,0x00000038,0x00000000,
>+	0x00000037,0x0004003b,0x00000038,0x00000039,0x00000000,0x0004002b,0x00000006,0x0000003d,
>+	0x00000040,0x0004002b,0x00000006,0x0000003e,0x00000001,0x0006002c,0x00000007,0x0000003f,
>+	0x0000003d,0x0000003e,0x0000003e,0x00050036,0x00000002,0x00000004,0x00000000,0x00000003,
>+	0x000200f8,0x00000005,0x0004003b,0x0000001c,0x0000001d,0x00000007,0x0004003b,0x0000001c,
>+	0x00000025,0x00000007,0x0004003b,0x0000002d,0x0000002e,0x00000007,0x00050041,0x0000000b,
>+	0x0000000c,0x00000009,0x0000000a,0x0004003d,0x00000006,0x0000000d,0x0000000c,0x00050041,
>+	0x00000014,0x00000015,0x00000012,0x00000013,0x0004003d,0x00000006,0x00000016,0x00000015,
>+	0x000500ae,0x00000017,0x00000018,0x0000000d,0x00000016,0x000300f7,0x0000001a,0x00000000,
>+	0x000400fa,0x00000018,0x00000019,0x0000001a,0x000200f8,0x00000019,0x000100fd,0x000200f8,
>+	0x0000001a,0x00050041,0x00000014,0x0000001f,0x00000012,0x0000001e,0x0004003d,0x00000006,
>+	0x00000020,0x0000001f,0x00050041,0x0000000b,0x00000021,0x00000009,0x0000000a,0x0004003d,
>+	0x00000006,0x00000022,0x00000021,0x00050080,0x00000006,0x00000023,0x00000020,0x00000022,
>+	0x0004007c,0x0000000e,0x00000024,0x00000023,0x0003003e,0x0000001d,0x00000024,0x00050041,
>+	0x00000014,0x00000027,0x00000012,0x00000026,0x0004003d,0x00000006,0x00000028,0x00000027,
>+	0x00050041,0x0000000b,0x00000029,0x00000009,0x0000000a,0x0004003d,0x00000006,0x0000002a,
>+	0x00000029,0x00050080,0x00000006,0x0000002b,0x00000028,0x0000002a,0x0004007c,0x0000000e,
>+	0x0000002c,0x0000002b,0x0003003e,0x00000025,0x0000002c,0x0004003d,0x00000030,0x00000033,
>+	0x00000032,0x0004003d,0x0000000e,0x00000034,0x00000025,0x00040064,0x0000002f,0x00000035,
>+	0x00000033,0x0005005f,0x0000000f,0x00000036,0x00000035,0x00000034,0x0003003e,0x0000002e,
>+	0x00000036,0x0004003d,0x00000037,0x0000003a,0x00000039,0x0004003d,0x0000000e,0x0000003b,
>+	0x0000001d,0x0004003d,0x0000000f,0x0000003c,0x0000002e,0x00040063,0x0000003a,0x0000003b,
>+	0x0000003c,0x000100fd,0x00010038
>+};
>+
>+#if 0  // Generated from:
>+#version 450 core
>+
>+layout(local_size_x = 64, local_size_y = 1, local_size_z = 1)in;
>+
>+layout(set = 0, binding = 0, rgba32i)uniform writeonly iimageBuffer dest;
>+
>+layout(set = 0, binding = 1)uniform isamplerBuffer src;
>+
>+layout(push_constant)uniform PushConstants
>+{
>+
>+    uint destOffset;
>+
>+    uint size;
>+
>+    uint srcOffset;
>+    uint padding;
>+
>+        ivec4 clearValue;
>+} params;
>+
>+void main()
>+{
>+
>+    if(gl_GlobalInvocationID . x >= params . size)
>+        return;
>+
>+    int destIndex = int(params . destOffset . x + gl_GlobalInvocationID . x);
>+    int srcIndex = int(params . srcOffset . x + gl_GlobalInvocationID . x);
>+
>+        ivec4 srcValue = texelFetch(src, srcIndex);
>+
>+    imageStore(dest, destIndex, srcValue);
>+}
>+#endif  // Preprocessed code
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/gen/BufferUtils.comp.00000007.inc b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/gen/BufferUtils.comp.00000007.inc
>new file mode 100644
>index 00000000000..233a778c26e
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/gen/BufferUtils.comp.00000007.inc
>@@ -0,0 +1,89 @@
>+	// 7.11.3188
>+	 #pragma once
>+const uint32_t kBufferUtils_comp_00000007[] = {
>+	0x07230203,0x00010000,0x00080007,0x00000036,0x00000000,0x00020011,0x00000001,0x00020011,
>+	0x0000002e,0x00020011,0x0000002f,0x0006000b,0x00000001,0x4c534c47,0x6474732e,0x3035342e,
>+	0x00000000,0x0003000e,0x00000000,0x00000001,0x0006000f,0x00000005,0x00000004,0x6e69616d,
>+	0x00000000,0x00000014,0x00060010,0x00000004,0x00000011,0x00000040,0x00000001,0x00000001,
>+	0x00030003,0x00000002,0x000001c2,0x00040005,0x00000004,0x6e69616d,0x00000000,0x00050005,
>+	0x00000008,0x74736564,0x65646e49,0x00000078,0x00060005,0x0000000b,0x68737550,0x736e6f43,
>+	0x746e6174,0x00000073,0x00060006,0x0000000b,0x00000000,0x74736564,0x7366664f,0x00007465,
>+	0x00050006,0x0000000b,0x00000001,0x657a6973,0x00000000,0x00060006,0x0000000b,0x00000002,
>+	0x4f637273,0x65736666,0x00000074,0x00050006,0x0000000b,0x00000003,0x64646170,0x00676e69,
>+	0x00060006,0x0000000b,0x00000004,0x61656c63,0x6c615672,0x00006575,0x00040005,0x0000000d,
>+	0x61726170,0x0000736d,0x00080005,0x00000014,0x475f6c67,0x61626f6c,0x766e496c,0x7461636f,
>+	0x496e6f69,0x00000044,0x00050005,0x0000001b,0x49637273,0x7865646e,0x00000000,0x00050005,
>+	0x00000024,0x56637273,0x65756c61,0x00000000,0x00030005,0x00000028,0x00637273,0x00040005,
>+	0x0000002f,0x74736564,0x00000000,0x00050048,0x0000000b,0x00000000,0x00000023,0x00000000,
>+	0x00050048,0x0000000b,0x00000001,0x00000023,0x00000004,0x00050048,0x0000000b,0x00000002,
>+	0x00000023,0x00000008,0x00050048,0x0000000b,0x00000003,0x00000023,0x0000000c,0x00050048,
>+	0x0000000b,0x00000004,0x00000023,0x00000010,0x00030047,0x0000000b,0x00000002,0x00040047,
>+	0x00000014,0x0000000b,0x0000001c,0x00040047,0x00000028,0x00000022,0x00000000,0x00040047,
>+	0x00000028,0x00000021,0x00000001,0x00040047,0x0000002f,0x00000022,0x00000000,0x00040047,
>+	0x0000002f,0x00000021,0x00000000,0x00030047,0x0000002f,0x00000019,0x00040047,0x00000035,
>+	0x0000000b,0x00000019,0x00020013,0x00000002,0x00030021,0x00000003,0x00000002,0x00040015,
>+	0x00000006,0x00000020,0x00000001,0x00040020,0x00000007,0x00000007,0x00000006,0x00040015,
>+	0x00000009,0x00000020,0x00000000,0x00040017,0x0000000a,0x00000006,0x00000004,0x0007001e,
>+	0x0000000b,0x00000009,0x00000009,0x00000009,0x00000009,0x0000000a,0x00040020,0x0000000c,
>+	0x00000009,0x0000000b,0x0004003b,0x0000000c,0x0000000d,0x00000009,0x0004002b,0x00000006,
>+	0x0000000e,0x00000000,0x00040020,0x0000000f,0x00000009,0x00000009,0x00040017,0x00000012,
>+	0x00000009,0x00000003,0x00040020,0x00000013,0x00000001,0x00000012,0x0004003b,0x00000013,
>+	0x00000014,0x00000001,0x0004002b,0x00000009,0x00000015,0x00000000,0x00040020,0x00000016,
>+	0x00000001,0x00000009,0x0004002b,0x00000006,0x0000001c,0x00000002,0x00040020,0x00000023,
>+	0x00000007,0x0000000a,0x00090019,0x00000025,0x00000006,0x00000005,0x00000000,0x00000000,
>+	0x00000000,0x00000001,0x00000000,0x0003001b,0x00000026,0x00000025,0x00040020,0x00000027,
>+	0x00000000,0x00000026,0x0004003b,0x00000027,0x00000028,0x00000000,0x00090019,0x0000002d,
>+	0x00000006,0x00000005,0x00000000,0x00000000,0x00000000,0x00000002,0x00000015,0x00040020,
>+	0x0000002e,0x00000000,0x0000002d,0x0004003b,0x0000002e,0x0000002f,0x00000000,0x0004002b,
>+	0x00000009,0x00000033,0x00000040,0x0004002b,0x00000009,0x00000034,0x00000001,0x0006002c,
>+	0x00000012,0x00000035,0x00000033,0x00000034,0x00000034,0x00050036,0x00000002,0x00000004,
>+	0x00000000,0x00000003,0x000200f8,0x00000005,0x0004003b,0x00000007,0x00000008,0x00000007,
>+	0x0004003b,0x00000007,0x0000001b,0x00000007,0x0004003b,0x00000023,0x00000024,0x00000007,
>+	0x00050041,0x0000000f,0x00000010,0x0000000d,0x0000000e,0x0004003d,0x00000009,0x00000011,
>+	0x00000010,0x00050041,0x00000016,0x00000017,0x00000014,0x00000015,0x0004003d,0x00000009,
>+	0x00000018,0x00000017,0x00050080,0x00000009,0x00000019,0x00000011,0x00000018,0x0004007c,
>+	0x00000006,0x0000001a,0x00000019,0x0003003e,0x00000008,0x0000001a,0x00050041,0x0000000f,
>+	0x0000001d,0x0000000d,0x0000001c,0x0004003d,0x00000009,0x0000001e,0x0000001d,0x00050041,
>+	0x00000016,0x0000001f,0x00000014,0x00000015,0x0004003d,0x00000009,0x00000020,0x0000001f,
>+	0x00050080,0x00000009,0x00000021,0x0000001e,0x00000020,0x0004007c,0x00000006,0x00000022,
>+	0x00000021,0x0003003e,0x0000001b,0x00000022,0x0004003d,0x00000026,0x00000029,0x00000028,
>+	0x0004003d,0x00000006,0x0000002a,0x0000001b,0x00040064,0x00000025,0x0000002b,0x00000029,
>+	0x0005005f,0x0000000a,0x0000002c,0x0000002b,0x0000002a,0x0003003e,0x00000024,0x0000002c,
>+	0x0004003d,0x0000002d,0x00000030,0x0000002f,0x0004003d,0x00000006,0x00000031,0x00000008,
>+	0x0004003d,0x0000000a,0x00000032,0x00000024,0x00040063,0x00000030,0x00000031,0x00000032,
>+	0x000100fd,0x00010038
>+};
>+
>+#if 0  // Generated from:
>+#version 450 core
>+
>+layout(local_size_x = 64, local_size_y = 1, local_size_z = 1)in;
>+
>+layout(set = 0, binding = 0, rgba32i)uniform writeonly iimageBuffer dest;
>+
>+layout(set = 0, binding = 1)uniform isamplerBuffer src;
>+
>+layout(push_constant)uniform PushConstants
>+{
>+
>+    uint destOffset;
>+
>+    uint size;
>+
>+    uint srcOffset;
>+    uint padding;
>+
>+        ivec4 clearValue;
>+} params;
>+
>+void main()
>+{
>+
>+    int destIndex = int(params . destOffset . x + gl_GlobalInvocationID . x);
>+    int srcIndex = int(params . srcOffset . x + gl_GlobalInvocationID . x);
>+
>+        ivec4 srcValue = texelFetch(src, srcIndex);
>+
>+    imageStore(dest, destIndex, srcValue);
>+}
>+#endif  // Preprocessed code
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/gen/BufferUtils.comp.00000008.inc b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/gen/BufferUtils.comp.00000008.inc
>new file mode 100644
>index 00000000000..f95764427f0
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/gen/BufferUtils.comp.00000008.inc
>@@ -0,0 +1,91 @@
>+	// 7.11.3188
>+	 #pragma once
>+const uint32_t kBufferUtils_comp_00000008[] = {
>+	0x07230203,0x00010000,0x00080007,0x0000003c,0x00000000,0x00020011,0x00000001,0x00020011,
>+	0x0000002f,0x0006000b,0x00000001,0x4c534c47,0x6474732e,0x3035342e,0x00000000,0x0003000e,
>+	0x00000000,0x00000001,0x0006000f,0x00000005,0x00000004,0x6e69616d,0x00000000,0x00000009,
>+	0x00060010,0x00000004,0x00000011,0x00000040,0x00000001,0x00000001,0x00030003,0x00000002,
>+	0x000001c2,0x00040005,0x00000004,0x6e69616d,0x00000000,0x00080005,0x00000009,0x475f6c67,
>+	0x61626f6c,0x766e496c,0x7461636f,0x496e6f69,0x00000044,0x00060005,0x0000000f,0x68737550,
>+	0x736e6f43,0x746e6174,0x00000073,0x00060006,0x0000000f,0x00000000,0x74736564,0x7366664f,
>+	0x00007465,0x00050006,0x0000000f,0x00000001,0x657a6973,0x00000000,0x00060006,0x0000000f,
>+	0x00000002,0x4f637273,0x65736666,0x00000074,0x00050006,0x0000000f,0x00000003,0x64646170,
>+	0x00676e69,0x00060006,0x0000000f,0x00000004,0x61656c63,0x6c615672,0x00006575,0x00040005,
>+	0x00000011,0x61726170,0x0000736d,0x00050005,0x0000001d,0x74736564,0x65646e49,0x00000078,
>+	0x00050005,0x00000025,0x49637273,0x7865646e,0x00000000,0x00050005,0x0000002e,0x56637273,
>+	0x65756c61,0x00000000,0x00040005,0x00000035,0x74736564,0x00000000,0x00040047,0x00000009,
>+	0x0000000b,0x0000001c,0x00050048,0x0000000f,0x00000000,0x00000023,0x00000000,0x00050048,
>+	0x0000000f,0x00000001,0x00000023,0x00000004,0x00050048,0x0000000f,0x00000002,0x00000023,
>+	0x00000008,0x00050048,0x0000000f,0x00000003,0x00000023,0x0000000c,0x00050048,0x0000000f,
>+	0x00000004,0x00000023,0x00000010,0x00030047,0x0000000f,0x00000002,0x00040047,0x00000035,
>+	0x00000022,0x00000000,0x00040047,0x00000035,0x00000021,0x00000000,0x00030047,0x00000035,
>+	0x00000019,0x00040047,0x0000003b,0x0000000b,0x00000019,0x00020013,0x00000002,0x00030021,
>+	0x00000003,0x00000002,0x00040015,0x00000006,0x00000020,0x00000000,0x00040017,0x00000007,
>+	0x00000006,0x00000003,0x00040020,0x00000008,0x00000001,0x00000007,0x0004003b,0x00000008,
>+	0x00000009,0x00000001,0x0004002b,0x00000006,0x0000000a,0x00000000,0x00040020,0x0000000b,
>+	0x00000001,0x00000006,0x00040017,0x0000000e,0x00000006,0x00000004,0x0007001e,0x0000000f,
>+	0x00000006,0x00000006,0x00000006,0x00000006,0x0000000e,0x00040020,0x00000010,0x00000009,
>+	0x0000000f,0x0004003b,0x00000010,0x00000011,0x00000009,0x00040015,0x00000012,0x00000020,
>+	0x00000001,0x0004002b,0x00000012,0x00000013,0x00000001,0x00040020,0x00000014,0x00000009,
>+	0x00000006,0x00020014,0x00000017,0x00040020,0x0000001c,0x00000007,0x00000012,0x0004002b,
>+	0x00000012,0x0000001e,0x00000000,0x0004002b,0x00000012,0x00000026,0x00000002,0x00040020,
>+	0x0000002d,0x00000007,0x0000000e,0x0004002b,0x00000012,0x0000002f,0x00000004,0x00040020,
>+	0x00000030,0x00000009,0x0000000e,0x00090019,0x00000033,0x00000006,0x00000005,0x00000000,
>+	0x00000000,0x00000000,0x00000002,0x0000001e,0x00040020,0x00000034,0x00000000,0x00000033,
>+	0x0004003b,0x00000034,0x00000035,0x00000000,0x0004002b,0x00000006,0x00000039,0x00000040,
>+	0x0004002b,0x00000006,0x0000003a,0x00000001,0x0006002c,0x00000007,0x0000003b,0x00000039,
>+	0x0000003a,0x0000003a,0x00050036,0x00000002,0x00000004,0x00000000,0x00000003,0x000200f8,
>+	0x00000005,0x0004003b,0x0000001c,0x0000001d,0x00000007,0x0004003b,0x0000001c,0x00000025,
>+	0x00000007,0x0004003b,0x0000002d,0x0000002e,0x00000007,0x00050041,0x0000000b,0x0000000c,
>+	0x00000009,0x0000000a,0x0004003d,0x00000006,0x0000000d,0x0000000c,0x00050041,0x00000014,
>+	0x00000015,0x00000011,0x00000013,0x0004003d,0x00000006,0x00000016,0x00000015,0x000500ae,
>+	0x00000017,0x00000018,0x0000000d,0x00000016,0x000300f7,0x0000001a,0x00000000,0x000400fa,
>+	0x00000018,0x00000019,0x0000001a,0x000200f8,0x00000019,0x000100fd,0x000200f8,0x0000001a,
>+	0x00050041,0x00000014,0x0000001f,0x00000011,0x0000001e,0x0004003d,0x00000006,0x00000020,
>+	0x0000001f,0x00050041,0x0000000b,0x00000021,0x00000009,0x0000000a,0x0004003d,0x00000006,
>+	0x00000022,0x00000021,0x00050080,0x00000006,0x00000023,0x00000020,0x00000022,0x0004007c,
>+	0x00000012,0x00000024,0x00000023,0x0003003e,0x0000001d,0x00000024,0x00050041,0x00000014,
>+	0x00000027,0x00000011,0x00000026,0x0004003d,0x00000006,0x00000028,0x00000027,0x00050041,
>+	0x0000000b,0x00000029,0x00000009,0x0000000a,0x0004003d,0x00000006,0x0000002a,0x00000029,
>+	0x00050080,0x00000006,0x0000002b,0x00000028,0x0000002a,0x0004007c,0x00000012,0x0000002c,
>+	0x0000002b,0x0003003e,0x00000025,0x0000002c,0x00050041,0x00000030,0x00000031,0x00000011,
>+	0x0000002f,0x0004003d,0x0000000e,0x00000032,0x00000031,0x0003003e,0x0000002e,0x00000032,
>+	0x0004003d,0x00000033,0x00000036,0x00000035,0x0004003d,0x00000012,0x00000037,0x0000001d,
>+	0x0004003d,0x0000000e,0x00000038,0x0000002e,0x00040063,0x00000036,0x00000037,0x00000038,
>+	0x000100fd,0x00010038
>+};
>+
>+#if 0  // Generated from:
>+#version 450 core
>+
>+layout(local_size_x = 64, local_size_y = 1, local_size_z = 1)in;
>+
>+layout(set = 0, binding = 0, rgba32ui)uniform writeonly uimageBuffer dest;
>+
>+layout(push_constant)uniform PushConstants
>+{
>+
>+    uint destOffset;
>+
>+    uint size;
>+
>+    uint srcOffset;
>+    uint padding;
>+
>+        uvec4 clearValue;
>+} params;
>+
>+void main()
>+{
>+
>+    if(gl_GlobalInvocationID . x >= params . size)
>+        return;
>+
>+    int destIndex = int(params . destOffset . x + gl_GlobalInvocationID . x);
>+    int srcIndex = int(params . srcOffset . x + gl_GlobalInvocationID . x);
>+
>+        uvec4 srcValue = params . clearValue;
>+
>+    imageStore(dest, destIndex, srcValue);
>+}
>+#endif  // Preprocessed code
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/gen/BufferUtils.comp.00000009.inc b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/gen/BufferUtils.comp.00000009.inc
>new file mode 100644
>index 00000000000..0c4a9339e27
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/gen/BufferUtils.comp.00000009.inc
>@@ -0,0 +1,83 @@
>+	// 7.11.3188
>+	 #pragma once
>+const uint32_t kBufferUtils_comp_00000009[] = {
>+	0x07230203,0x00010000,0x00080007,0x00000032,0x00000000,0x00020011,0x00000001,0x00020011,
>+	0x0000002f,0x0006000b,0x00000001,0x4c534c47,0x6474732e,0x3035342e,0x00000000,0x0003000e,
>+	0x00000000,0x00000001,0x0006000f,0x00000005,0x00000004,0x6e69616d,0x00000000,0x00000014,
>+	0x00060010,0x00000004,0x00000011,0x00000040,0x00000001,0x00000001,0x00030003,0x00000002,
>+	0x000001c2,0x00040005,0x00000004,0x6e69616d,0x00000000,0x00050005,0x00000008,0x74736564,
>+	0x65646e49,0x00000078,0x00060005,0x0000000b,0x68737550,0x736e6f43,0x746e6174,0x00000073,
>+	0x00060006,0x0000000b,0x00000000,0x74736564,0x7366664f,0x00007465,0x00050006,0x0000000b,
>+	0x00000001,0x657a6973,0x00000000,0x00060006,0x0000000b,0x00000002,0x4f637273,0x65736666,
>+	0x00000074,0x00050006,0x0000000b,0x00000003,0x64646170,0x00676e69,0x00060006,0x0000000b,
>+	0x00000004,0x61656c63,0x6c615672,0x00006575,0x00040005,0x0000000d,0x61726170,0x0000736d,
>+	0x00080005,0x00000014,0x475f6c67,0x61626f6c,0x766e496c,0x7461636f,0x496e6f69,0x00000044,
>+	0x00050005,0x0000001b,0x49637273,0x7865646e,0x00000000,0x00050005,0x00000024,0x56637273,
>+	0x65756c61,0x00000000,0x00040005,0x0000002b,0x74736564,0x00000000,0x00050048,0x0000000b,
>+	0x00000000,0x00000023,0x00000000,0x00050048,0x0000000b,0x00000001,0x00000023,0x00000004,
>+	0x00050048,0x0000000b,0x00000002,0x00000023,0x00000008,0x00050048,0x0000000b,0x00000003,
>+	0x00000023,0x0000000c,0x00050048,0x0000000b,0x00000004,0x00000023,0x00000010,0x00030047,
>+	0x0000000b,0x00000002,0x00040047,0x00000014,0x0000000b,0x0000001c,0x00040047,0x0000002b,
>+	0x00000022,0x00000000,0x00040047,0x0000002b,0x00000021,0x00000000,0x00030047,0x0000002b,
>+	0x00000019,0x00040047,0x00000031,0x0000000b,0x00000019,0x00020013,0x00000002,0x00030021,
>+	0x00000003,0x00000002,0x00040015,0x00000006,0x00000020,0x00000001,0x00040020,0x00000007,
>+	0x00000007,0x00000006,0x00040015,0x00000009,0x00000020,0x00000000,0x00040017,0x0000000a,
>+	0x00000009,0x00000004,0x0007001e,0x0000000b,0x00000009,0x00000009,0x00000009,0x00000009,
>+	0x0000000a,0x00040020,0x0000000c,0x00000009,0x0000000b,0x0004003b,0x0000000c,0x0000000d,
>+	0x00000009,0x0004002b,0x00000006,0x0000000e,0x00000000,0x00040020,0x0000000f,0x00000009,
>+	0x00000009,0x00040017,0x00000012,0x00000009,0x00000003,0x00040020,0x00000013,0x00000001,
>+	0x00000012,0x0004003b,0x00000013,0x00000014,0x00000001,0x0004002b,0x00000009,0x00000015,
>+	0x00000000,0x00040020,0x00000016,0x00000001,0x00000009,0x0004002b,0x00000006,0x0000001c,
>+	0x00000002,0x00040020,0x00000023,0x00000007,0x0000000a,0x0004002b,0x00000006,0x00000025,
>+	0x00000004,0x00040020,0x00000026,0x00000009,0x0000000a,0x00090019,0x00000029,0x00000009,
>+	0x00000005,0x00000000,0x00000000,0x00000000,0x00000002,0x0000001e,0x00040020,0x0000002a,
>+	0x00000000,0x00000029,0x0004003b,0x0000002a,0x0000002b,0x00000000,0x0004002b,0x00000009,
>+	0x0000002f,0x00000040,0x0004002b,0x00000009,0x00000030,0x00000001,0x0006002c,0x00000012,
>+	0x00000031,0x0000002f,0x00000030,0x00000030,0x00050036,0x00000002,0x00000004,0x00000000,
>+	0x00000003,0x000200f8,0x00000005,0x0004003b,0x00000007,0x00000008,0x00000007,0x0004003b,
>+	0x00000007,0x0000001b,0x00000007,0x0004003b,0x00000023,0x00000024,0x00000007,0x00050041,
>+	0x0000000f,0x00000010,0x0000000d,0x0000000e,0x0004003d,0x00000009,0x00000011,0x00000010,
>+	0x00050041,0x00000016,0x00000017,0x00000014,0x00000015,0x0004003d,0x00000009,0x00000018,
>+	0x00000017,0x00050080,0x00000009,0x00000019,0x00000011,0x00000018,0x0004007c,0x00000006,
>+	0x0000001a,0x00000019,0x0003003e,0x00000008,0x0000001a,0x00050041,0x0000000f,0x0000001d,
>+	0x0000000d,0x0000001c,0x0004003d,0x00000009,0x0000001e,0x0000001d,0x00050041,0x00000016,
>+	0x0000001f,0x00000014,0x00000015,0x0004003d,0x00000009,0x00000020,0x0000001f,0x00050080,
>+	0x00000009,0x00000021,0x0000001e,0x00000020,0x0004007c,0x00000006,0x00000022,0x00000021,
>+	0x0003003e,0x0000001b,0x00000022,0x00050041,0x00000026,0x00000027,0x0000000d,0x00000025,
>+	0x0004003d,0x0000000a,0x00000028,0x00000027,0x0003003e,0x00000024,0x00000028,0x0004003d,
>+	0x00000029,0x0000002c,0x0000002b,0x0004003d,0x00000006,0x0000002d,0x00000008,0x0004003d,
>+	0x0000000a,0x0000002e,0x00000024,0x00040063,0x0000002c,0x0000002d,0x0000002e,0x000100fd,
>+	0x00010038
>+};
>+
>+#if 0  // Generated from:
>+#version 450 core
>+
>+layout(local_size_x = 64, local_size_y = 1, local_size_z = 1)in;
>+
>+layout(set = 0, binding = 0, rgba32ui)uniform writeonly uimageBuffer dest;
>+
>+layout(push_constant)uniform PushConstants
>+{
>+
>+    uint destOffset;
>+
>+    uint size;
>+
>+    uint srcOffset;
>+    uint padding;
>+
>+        uvec4 clearValue;
>+} params;
>+
>+void main()
>+{
>+
>+    int destIndex = int(params . destOffset . x + gl_GlobalInvocationID . x);
>+    int srcIndex = int(params . srcOffset . x + gl_GlobalInvocationID . x);
>+
>+        uvec4 srcValue = params . clearValue;
>+
>+    imageStore(dest, destIndex, srcValue);
>+}
>+#endif  // Preprocessed code
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/gen/BufferUtils.comp.0000000A.inc b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/gen/BufferUtils.comp.0000000A.inc
>new file mode 100644
>index 00000000000..8188a49e36a
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/gen/BufferUtils.comp.0000000A.inc
>@@ -0,0 +1,97 @@
>+	// 7.11.3188
>+	 #pragma once
>+const uint32_t kBufferUtils_comp_0000000A[] = {
>+	0x07230203,0x00010000,0x00080007,0x00000040,0x00000000,0x00020011,0x00000001,0x00020011,
>+	0x0000002e,0x00020011,0x0000002f,0x0006000b,0x00000001,0x4c534c47,0x6474732e,0x3035342e,
>+	0x00000000,0x0003000e,0x00000000,0x00000001,0x0006000f,0x00000005,0x00000004,0x6e69616d,
>+	0x00000000,0x00000009,0x00060010,0x00000004,0x00000011,0x00000040,0x00000001,0x00000001,
>+	0x00030003,0x00000002,0x000001c2,0x00040005,0x00000004,0x6e69616d,0x00000000,0x00080005,
>+	0x00000009,0x475f6c67,0x61626f6c,0x766e496c,0x7461636f,0x496e6f69,0x00000044,0x00060005,
>+	0x0000000f,0x68737550,0x736e6f43,0x746e6174,0x00000073,0x00060006,0x0000000f,0x00000000,
>+	0x74736564,0x7366664f,0x00007465,0x00050006,0x0000000f,0x00000001,0x657a6973,0x00000000,
>+	0x00060006,0x0000000f,0x00000002,0x4f637273,0x65736666,0x00000074,0x00050006,0x0000000f,
>+	0x00000003,0x64646170,0x00676e69,0x00060006,0x0000000f,0x00000004,0x61656c63,0x6c615672,
>+	0x00006575,0x00040005,0x00000011,0x61726170,0x0000736d,0x00050005,0x0000001d,0x74736564,
>+	0x65646e49,0x00000078,0x00050005,0x00000025,0x49637273,0x7865646e,0x00000000,0x00050005,
>+	0x0000002e,0x56637273,0x65756c61,0x00000000,0x00030005,0x00000032,0x00637273,0x00040005,
>+	0x00000039,0x74736564,0x00000000,0x00040047,0x00000009,0x0000000b,0x0000001c,0x00050048,
>+	0x0000000f,0x00000000,0x00000023,0x00000000,0x00050048,0x0000000f,0x00000001,0x00000023,
>+	0x00000004,0x00050048,0x0000000f,0x00000002,0x00000023,0x00000008,0x00050048,0x0000000f,
>+	0x00000003,0x00000023,0x0000000c,0x00050048,0x0000000f,0x00000004,0x00000023,0x00000010,
>+	0x00030047,0x0000000f,0x00000002,0x00040047,0x00000032,0x00000022,0x00000000,0x00040047,
>+	0x00000032,0x00000021,0x00000001,0x00040047,0x00000039,0x00000022,0x00000000,0x00040047,
>+	0x00000039,0x00000021,0x00000000,0x00030047,0x00000039,0x00000019,0x00040047,0x0000003f,
>+	0x0000000b,0x00000019,0x00020013,0x00000002,0x00030021,0x00000003,0x00000002,0x00040015,
>+	0x00000006,0x00000020,0x00000000,0x00040017,0x00000007,0x00000006,0x00000003,0x00040020,
>+	0x00000008,0x00000001,0x00000007,0x0004003b,0x00000008,0x00000009,0x00000001,0x0004002b,
>+	0x00000006,0x0000000a,0x00000000,0x00040020,0x0000000b,0x00000001,0x00000006,0x00040017,
>+	0x0000000e,0x00000006,0x00000004,0x0007001e,0x0000000f,0x00000006,0x00000006,0x00000006,
>+	0x00000006,0x0000000e,0x00040020,0x00000010,0x00000009,0x0000000f,0x0004003b,0x00000010,
>+	0x00000011,0x00000009,0x00040015,0x00000012,0x00000020,0x00000001,0x0004002b,0x00000012,
>+	0x00000013,0x00000001,0x00040020,0x00000014,0x00000009,0x00000006,0x00020014,0x00000017,
>+	0x00040020,0x0000001c,0x00000007,0x00000012,0x0004002b,0x00000012,0x0000001e,0x00000000,
>+	0x0004002b,0x00000012,0x00000026,0x00000002,0x00040020,0x0000002d,0x00000007,0x0000000e,
>+	0x00090019,0x0000002f,0x00000006,0x00000005,0x00000000,0x00000000,0x00000000,0x00000001,
>+	0x00000000,0x0003001b,0x00000030,0x0000002f,0x00040020,0x00000031,0x00000000,0x00000030,
>+	0x0004003b,0x00000031,0x00000032,0x00000000,0x00090019,0x00000037,0x00000006,0x00000005,
>+	0x00000000,0x00000000,0x00000000,0x00000002,0x0000001e,0x00040020,0x00000038,0x00000000,
>+	0x00000037,0x0004003b,0x00000038,0x00000039,0x00000000,0x0004002b,0x00000006,0x0000003d,
>+	0x00000040,0x0004002b,0x00000006,0x0000003e,0x00000001,0x0006002c,0x00000007,0x0000003f,
>+	0x0000003d,0x0000003e,0x0000003e,0x00050036,0x00000002,0x00000004,0x00000000,0x00000003,
>+	0x000200f8,0x00000005,0x0004003b,0x0000001c,0x0000001d,0x00000007,0x0004003b,0x0000001c,
>+	0x00000025,0x00000007,0x0004003b,0x0000002d,0x0000002e,0x00000007,0x00050041,0x0000000b,
>+	0x0000000c,0x00000009,0x0000000a,0x0004003d,0x00000006,0x0000000d,0x0000000c,0x00050041,
>+	0x00000014,0x00000015,0x00000011,0x00000013,0x0004003d,0x00000006,0x00000016,0x00000015,
>+	0x000500ae,0x00000017,0x00000018,0x0000000d,0x00000016,0x000300f7,0x0000001a,0x00000000,
>+	0x000400fa,0x00000018,0x00000019,0x0000001a,0x000200f8,0x00000019,0x000100fd,0x000200f8,
>+	0x0000001a,0x00050041,0x00000014,0x0000001f,0x00000011,0x0000001e,0x0004003d,0x00000006,
>+	0x00000020,0x0000001f,0x00050041,0x0000000b,0x00000021,0x00000009,0x0000000a,0x0004003d,
>+	0x00000006,0x00000022,0x00000021,0x00050080,0x00000006,0x00000023,0x00000020,0x00000022,
>+	0x0004007c,0x00000012,0x00000024,0x00000023,0x0003003e,0x0000001d,0x00000024,0x00050041,
>+	0x00000014,0x00000027,0x00000011,0x00000026,0x0004003d,0x00000006,0x00000028,0x00000027,
>+	0x00050041,0x0000000b,0x00000029,0x00000009,0x0000000a,0x0004003d,0x00000006,0x0000002a,
>+	0x00000029,0x00050080,0x00000006,0x0000002b,0x00000028,0x0000002a,0x0004007c,0x00000012,
>+	0x0000002c,0x0000002b,0x0003003e,0x00000025,0x0000002c,0x0004003d,0x00000030,0x00000033,
>+	0x00000032,0x0004003d,0x00000012,0x00000034,0x00000025,0x00040064,0x0000002f,0x00000035,
>+	0x00000033,0x0005005f,0x0000000e,0x00000036,0x00000035,0x00000034,0x0003003e,0x0000002e,
>+	0x00000036,0x0004003d,0x00000037,0x0000003a,0x00000039,0x0004003d,0x00000012,0x0000003b,
>+	0x0000001d,0x0004003d,0x0000000e,0x0000003c,0x0000002e,0x00040063,0x0000003a,0x0000003b,
>+	0x0000003c,0x000100fd,0x00010038
>+};
>+
>+#if 0  // Generated from:
>+#version 450 core
>+
>+layout(local_size_x = 64, local_size_y = 1, local_size_z = 1)in;
>+
>+layout(set = 0, binding = 0, rgba32ui)uniform writeonly uimageBuffer dest;
>+
>+layout(set = 0, binding = 1)uniform usamplerBuffer src;
>+
>+layout(push_constant)uniform PushConstants
>+{
>+
>+    uint destOffset;
>+
>+    uint size;
>+
>+    uint srcOffset;
>+    uint padding;
>+
>+        uvec4 clearValue;
>+} params;
>+
>+void main()
>+{
>+
>+    if(gl_GlobalInvocationID . x >= params . size)
>+        return;
>+
>+    int destIndex = int(params . destOffset . x + gl_GlobalInvocationID . x);
>+    int srcIndex = int(params . srcOffset . x + gl_GlobalInvocationID . x);
>+
>+        uvec4 srcValue = texelFetch(src, srcIndex);
>+
>+    imageStore(dest, destIndex, srcValue);
>+}
>+#endif  // Preprocessed code
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/gen/BufferUtils.comp.0000000B.inc b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/gen/BufferUtils.comp.0000000B.inc
>new file mode 100644
>index 00000000000..860360f0833
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/gen/BufferUtils.comp.0000000B.inc
>@@ -0,0 +1,89 @@
>+	// 7.11.3188
>+	 #pragma once
>+const uint32_t kBufferUtils_comp_0000000B[] = {
>+	0x07230203,0x00010000,0x00080007,0x00000036,0x00000000,0x00020011,0x00000001,0x00020011,
>+	0x0000002e,0x00020011,0x0000002f,0x0006000b,0x00000001,0x4c534c47,0x6474732e,0x3035342e,
>+	0x00000000,0x0003000e,0x00000000,0x00000001,0x0006000f,0x00000005,0x00000004,0x6e69616d,
>+	0x00000000,0x00000014,0x00060010,0x00000004,0x00000011,0x00000040,0x00000001,0x00000001,
>+	0x00030003,0x00000002,0x000001c2,0x00040005,0x00000004,0x6e69616d,0x00000000,0x00050005,
>+	0x00000008,0x74736564,0x65646e49,0x00000078,0x00060005,0x0000000b,0x68737550,0x736e6f43,
>+	0x746e6174,0x00000073,0x00060006,0x0000000b,0x00000000,0x74736564,0x7366664f,0x00007465,
>+	0x00050006,0x0000000b,0x00000001,0x657a6973,0x00000000,0x00060006,0x0000000b,0x00000002,
>+	0x4f637273,0x65736666,0x00000074,0x00050006,0x0000000b,0x00000003,0x64646170,0x00676e69,
>+	0x00060006,0x0000000b,0x00000004,0x61656c63,0x6c615672,0x00006575,0x00040005,0x0000000d,
>+	0x61726170,0x0000736d,0x00080005,0x00000014,0x475f6c67,0x61626f6c,0x766e496c,0x7461636f,
>+	0x496e6f69,0x00000044,0x00050005,0x0000001b,0x49637273,0x7865646e,0x00000000,0x00050005,
>+	0x00000024,0x56637273,0x65756c61,0x00000000,0x00030005,0x00000028,0x00637273,0x00040005,
>+	0x0000002f,0x74736564,0x00000000,0x00050048,0x0000000b,0x00000000,0x00000023,0x00000000,
>+	0x00050048,0x0000000b,0x00000001,0x00000023,0x00000004,0x00050048,0x0000000b,0x00000002,
>+	0x00000023,0x00000008,0x00050048,0x0000000b,0x00000003,0x00000023,0x0000000c,0x00050048,
>+	0x0000000b,0x00000004,0x00000023,0x00000010,0x00030047,0x0000000b,0x00000002,0x00040047,
>+	0x00000014,0x0000000b,0x0000001c,0x00040047,0x00000028,0x00000022,0x00000000,0x00040047,
>+	0x00000028,0x00000021,0x00000001,0x00040047,0x0000002f,0x00000022,0x00000000,0x00040047,
>+	0x0000002f,0x00000021,0x00000000,0x00030047,0x0000002f,0x00000019,0x00040047,0x00000035,
>+	0x0000000b,0x00000019,0x00020013,0x00000002,0x00030021,0x00000003,0x00000002,0x00040015,
>+	0x00000006,0x00000020,0x00000001,0x00040020,0x00000007,0x00000007,0x00000006,0x00040015,
>+	0x00000009,0x00000020,0x00000000,0x00040017,0x0000000a,0x00000009,0x00000004,0x0007001e,
>+	0x0000000b,0x00000009,0x00000009,0x00000009,0x00000009,0x0000000a,0x00040020,0x0000000c,
>+	0x00000009,0x0000000b,0x0004003b,0x0000000c,0x0000000d,0x00000009,0x0004002b,0x00000006,
>+	0x0000000e,0x00000000,0x00040020,0x0000000f,0x00000009,0x00000009,0x00040017,0x00000012,
>+	0x00000009,0x00000003,0x00040020,0x00000013,0x00000001,0x00000012,0x0004003b,0x00000013,
>+	0x00000014,0x00000001,0x0004002b,0x00000009,0x00000015,0x00000000,0x00040020,0x00000016,
>+	0x00000001,0x00000009,0x0004002b,0x00000006,0x0000001c,0x00000002,0x00040020,0x00000023,
>+	0x00000007,0x0000000a,0x00090019,0x00000025,0x00000009,0x00000005,0x00000000,0x00000000,
>+	0x00000000,0x00000001,0x00000000,0x0003001b,0x00000026,0x00000025,0x00040020,0x00000027,
>+	0x00000000,0x00000026,0x0004003b,0x00000027,0x00000028,0x00000000,0x00090019,0x0000002d,
>+	0x00000009,0x00000005,0x00000000,0x00000000,0x00000000,0x00000002,0x0000001e,0x00040020,
>+	0x0000002e,0x00000000,0x0000002d,0x0004003b,0x0000002e,0x0000002f,0x00000000,0x0004002b,
>+	0x00000009,0x00000033,0x00000040,0x0004002b,0x00000009,0x00000034,0x00000001,0x0006002c,
>+	0x00000012,0x00000035,0x00000033,0x00000034,0x00000034,0x00050036,0x00000002,0x00000004,
>+	0x00000000,0x00000003,0x000200f8,0x00000005,0x0004003b,0x00000007,0x00000008,0x00000007,
>+	0x0004003b,0x00000007,0x0000001b,0x00000007,0x0004003b,0x00000023,0x00000024,0x00000007,
>+	0x00050041,0x0000000f,0x00000010,0x0000000d,0x0000000e,0x0004003d,0x00000009,0x00000011,
>+	0x00000010,0x00050041,0x00000016,0x00000017,0x00000014,0x00000015,0x0004003d,0x00000009,
>+	0x00000018,0x00000017,0x00050080,0x00000009,0x00000019,0x00000011,0x00000018,0x0004007c,
>+	0x00000006,0x0000001a,0x00000019,0x0003003e,0x00000008,0x0000001a,0x00050041,0x0000000f,
>+	0x0000001d,0x0000000d,0x0000001c,0x0004003d,0x00000009,0x0000001e,0x0000001d,0x00050041,
>+	0x00000016,0x0000001f,0x00000014,0x00000015,0x0004003d,0x00000009,0x00000020,0x0000001f,
>+	0x00050080,0x00000009,0x00000021,0x0000001e,0x00000020,0x0004007c,0x00000006,0x00000022,
>+	0x00000021,0x0003003e,0x0000001b,0x00000022,0x0004003d,0x00000026,0x00000029,0x00000028,
>+	0x0004003d,0x00000006,0x0000002a,0x0000001b,0x00040064,0x00000025,0x0000002b,0x00000029,
>+	0x0005005f,0x0000000a,0x0000002c,0x0000002b,0x0000002a,0x0003003e,0x00000024,0x0000002c,
>+	0x0004003d,0x0000002d,0x00000030,0x0000002f,0x0004003d,0x00000006,0x00000031,0x00000008,
>+	0x0004003d,0x0000000a,0x00000032,0x00000024,0x00040063,0x00000030,0x00000031,0x00000032,
>+	0x000100fd,0x00010038
>+};
>+
>+#if 0  // Generated from:
>+#version 450 core
>+
>+layout(local_size_x = 64, local_size_y = 1, local_size_z = 1)in;
>+
>+layout(set = 0, binding = 0, rgba32ui)uniform writeonly uimageBuffer dest;
>+
>+layout(set = 0, binding = 1)uniform usamplerBuffer src;
>+
>+layout(push_constant)uniform PushConstants
>+{
>+
>+    uint destOffset;
>+
>+    uint size;
>+
>+    uint srcOffset;
>+    uint padding;
>+
>+        uvec4 clearValue;
>+} params;
>+
>+void main()
>+{
>+
>+    int destIndex = int(params . destOffset . x + gl_GlobalInvocationID . x);
>+    int srcIndex = int(params . srcOffset . x + gl_GlobalInvocationID . x);
>+
>+        uvec4 srcValue = texelFetch(src, srcIndex);
>+
>+    imageStore(dest, destIndex, srcValue);
>+}
>+#endif  // Preprocessed code
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.00000000.inc b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.00000000.inc
>new file mode 100644
>index 00000000000..8412d75f19e
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.00000000.inc
>@@ -0,0 +1,379 @@
>+	// 7.11.3188
>+	 #pragma once
>+const uint32_t kConvertVertex_comp_00000000[] = {
>+	0x07230203,0x00010000,0x00080007,0x00000134,0x00000000,0x00020011,0x00000001,0x0006000b,
>+	0x00000001,0x4c534c47,0x6474732e,0x3035342e,0x00000000,0x0003000e,0x00000000,0x00000001,
>+	0x0006000f,0x00000005,0x00000004,0x6e69616d,0x00000000,0x000000f1,0x00060010,0x00000004,
>+	0x00000011,0x00000040,0x00000001,0x00000001,0x00030003,0x00000002,0x000001c2,0x00040005,
>+	0x00000004,0x6e69616d,0x00000000,0x000a0005,0x0000000b,0x53746567,0x6372756f,0x6d6f4365,
>+	0x656e6f70,0x664f746e,0x74657366,0x3b317528,0x003b3175,0x00040005,0x00000009,0x74726576,
>+	0x00007865,0x00050005,0x0000000a,0x706d6f63,0x6e656e6f,0x00000074,0x000c0005,0x0000000f,
>+	0x44746567,0x69747365,0x6974616e,0x6f436e6f,0x6e6f706d,0x4f746e65,0x65736666,0x31752874,
>+	0x3b31753b,0x00000000,0x00040005,0x0000000d,0x74726576,0x00007865,0x00050005,0x0000000e,
>+	0x706d6f63,0x6e656e6f,0x00000074,0x00070005,0x00000013,0x53746567,0x74666968,0x73746942,
>+	0x3b317528,0x003b3175,0x00040005,0x00000011,0x7366666f,0x00007465,0x00030005,0x00000012,
>+	0x00000042,0x00080005,0x00000018,0x64616f6c,0x72756f53,0x6f436563,0x6e6f706d,0x28746e65,
>+	0x003b3175,0x00030005,0x00000017,0x00006463,0x00080005,0x0000001d,0x766e6f63,0x43747265,
>+	0x6f706d6f,0x746e656e,0x3b316928,0x00000000,0x00050005,0x0000001c,0x56637273,0x65756c61,
>+	0x00000000,0x000a0005,0x00000022,0x656b616d,0x74736544,0x74616e69,0x436e6f69,0x6f706d6f,
>+	0x746e656e,0x3b317528,0x003b3169,0x00030005,0x00000020,0x00006463,0x00040005,0x00000021,
>+	0x756c6176,0x00000065,0x000a0005,0x00000026,0x726f7473,0x73654465,0x616e6974,0x6e6f6974,
>+	0x706d6f43,0x6e656e6f,0x75287374,0x00003b31,0x00050005,0x00000025,0x756c6176,0x55734165,
>+	0x00746e69,0x00060005,0x00000029,0x68737550,0x736e6f43,0x746e6174,0x00000073,0x00060006,
>+	0x00000029,0x00000000,0x7074756f,0x6f437475,0x00746e75,0x00070006,0x00000029,0x00000001,
>+	0x706d6f63,0x6e656e6f,0x756f4374,0x0000746e,0x00060006,0x00000029,0x00000002,0x4f637273,
>+	0x65736666,0x00000074,0x00060006,0x00000029,0x00000003,0x74736564,0x7366664f,0x00007465,
>+	0x00040006,0x00000029,0x00000004,0x0000734e,0x00040006,0x00000029,0x00000005,0x00007342,
>+	0x00040006,0x00000029,0x00000006,0x00007353,0x00040006,0x00000029,0x00000007,0x00007345,
>+	0x00040006,0x00000029,0x00000008,0x0000644e,0x00040006,0x00000029,0x00000009,0x00006442,
>+	0x00040006,0x00000029,0x0000000a,0x00006453,0x00040006,0x00000029,0x0000000b,0x00006445,
>+	0x00040005,0x0000002b,0x61726170,0x0000736d,0x00040005,0x0000004e,0x66696873,0x00000074,
>+	0x00040005,0x00000057,0x74726576,0x00007865,0x00050005,0x0000005d,0x706d6f63,0x6e656e6f,
>+	0x00000074,0x00040005,0x0000006c,0x7366666f,0x00007465,0x00040005,0x0000006d,0x61726170,
>+	0x0000006d,0x00040005,0x0000006f,0x61726170,0x0000006d,0x00040005,0x00000072,0x636f6c62,
>+	0x0000006b,0x00030005,0x00000074,0x00637273,0x00050006,0x00000074,0x00000000,0x44637273,
>+	0x00617461,0x00030005,0x00000076,0x00000000,0x00050005,0x0000007c,0x66696873,0x74694274,
>+	0x00000073,0x00040005,0x0000007d,0x61726170,0x0000006d,0x00040005,0x0000007f,0x61726170,
>+	0x0000006d,0x00050005,0x00000083,0x756c6176,0x74694265,0x00000073,0x00050005,0x00000087,
>+	0x756c6176,0x73614d65,0x0000006b,0x00050005,0x00000096,0x756c6176,0x55734165,0x00746e69,
>+	0x00050005,0x0000009d,0x654e7369,0x69746167,0x00006576,0x00040005,0x000000a7,0x756c6176,
>+	0x00000065,0x00040005,0x000000ba,0x74726576,0x00007865,0x00050005,0x000000bf,0x706d6f63,
>+	0x6e656e6f,0x00000074,0x00040005,0x000000c4,0x7366666f,0x00007465,0x00040005,0x000000c5,
>+	0x61726170,0x0000006d,0x00040005,0x000000c7,0x61726170,0x0000006d,0x00050005,0x000000ca,
>+	0x66696873,0x74694274,0x00000073,0x00040005,0x000000cb,0x61726170,0x0000006d,0x00040005,
>+	0x000000cd,0x61726170,0x0000006d,0x00050005,0x000000d1,0x756c6176,0x74694265,0x00000073,
>+	0x00050005,0x000000d5,0x756c6176,0x73614d65,0x0000006b,0x00050005,0x000000e1,0x756c6176,
>+	0x55734165,0x00746e69,0x00040005,0x000000ec,0x74736564,0x00000000,0x00060006,0x000000ec,
>+	0x00000000,0x74736564,0x61746144,0x00000000,0x00030005,0x000000ee,0x00000000,0x00080005,
>+	0x000000f1,0x475f6c67,0x61626f6c,0x766e496c,0x7461636f,0x496e6f69,0x00000044,0x00050005,
>+	0x00000103,0x756c6176,0x74754f65,0x00000000,0x00030005,0x00000104,0x00000069,0x00030005,
>+	0x0000010f,0x00006463,0x00050005,0x0000011e,0x56637273,0x65756c61,0x00000000,0x00040005,
>+	0x0000011f,0x61726170,0x0000006d,0x00050005,0x00000122,0x74736564,0x756c6156,0x00000065,
>+	0x00040005,0x00000123,0x61726170,0x0000006d,0x00040005,0x00000126,0x61726170,0x0000006d,
>+	0x00040005,0x00000128,0x61726170,0x0000006d,0x00040005,0x0000012f,0x61726170,0x0000006d,
>+	0x00050048,0x00000029,0x00000000,0x00000023,0x00000000,0x00050048,0x00000029,0x00000001,
>+	0x00000023,0x00000004,0x00050048,0x00000029,0x00000002,0x00000023,0x00000008,0x00050048,
>+	0x00000029,0x00000003,0x00000023,0x0000000c,0x00050048,0x00000029,0x00000004,0x00000023,
>+	0x00000010,0x00050048,0x00000029,0x00000005,0x00000023,0x00000014,0x00050048,0x00000029,
>+	0x00000006,0x00000023,0x00000018,0x00050048,0x00000029,0x00000007,0x00000023,0x0000001c,
>+	0x00050048,0x00000029,0x00000008,0x00000023,0x00000020,0x00050048,0x00000029,0x00000009,
>+	0x00000023,0x00000024,0x00050048,0x00000029,0x0000000a,0x00000023,0x00000028,0x00050048,
>+	0x00000029,0x0000000b,0x00000023,0x0000002c,0x00030047,0x00000029,0x00000002,0x00040047,
>+	0x00000073,0x00000006,0x00000004,0x00050048,0x00000074,0x00000000,0x00000023,0x00000000,
>+	0x00030047,0x00000074,0x00000003,0x00040047,0x00000076,0x00000022,0x00000000,0x00040047,
>+	0x00000076,0x00000021,0x00000001,0x00040047,0x000000eb,0x00000006,0x00000004,0x00050048,
>+	0x000000ec,0x00000000,0x00000023,0x00000000,0x00030047,0x000000ec,0x00000003,0x00040047,
>+	0x000000ee,0x00000022,0x00000000,0x00040047,0x000000ee,0x00000021,0x00000000,0x00040047,
>+	0x000000f1,0x0000000b,0x0000001c,0x00040047,0x00000133,0x0000000b,0x00000019,0x00020013,
>+	0x00000002,0x00030021,0x00000003,0x00000002,0x00040015,0x00000006,0x00000020,0x00000000,
>+	0x00040020,0x00000007,0x00000007,0x00000006,0x00050021,0x00000008,0x00000006,0x00000007,
>+	0x00000007,0x00040015,0x00000015,0x00000020,0x00000001,0x00040021,0x00000016,0x00000015,
>+	0x00000007,0x00040020,0x0000001a,0x00000007,0x00000015,0x00040021,0x0000001b,0x00000015,
>+	0x0000001a,0x00050021,0x0000001f,0x00000006,0x00000007,0x0000001a,0x00040021,0x00000024,
>+	0x00000002,0x00000007,0x000e001e,0x00000029,0x00000006,0x00000006,0x00000006,0x00000006,
>+	0x00000006,0x00000006,0x00000006,0x00000006,0x00000006,0x00000006,0x00000006,0x00000006,
>+	0x00040020,0x0000002a,0x00000009,0x00000029,0x0004003b,0x0000002a,0x0000002b,0x00000009,
>+	0x0004002b,0x00000015,0x0000002c,0x00000006,0x00040020,0x0000002d,0x00000009,0x00000006,
>+	0x0004002b,0x00000015,0x00000032,0x00000005,0x0004002b,0x00000015,0x00000037,0x00000002,
>+	0x0004002b,0x00000015,0x0000003e,0x0000000a,0x0004002b,0x00000015,0x00000043,0x00000009,
>+	0x0004002b,0x00000015,0x00000048,0x00000003,0x0004002b,0x00000006,0x00000050,0x00000004,
>+	0x0004002b,0x00000006,0x00000052,0x00000008,0x0004002b,0x00000015,0x00000059,0x00000008,
>+	0x0004002b,0x00000015,0x00000063,0x00000004,0x00020014,0x00000066,0x0004002b,0x00000015,
>+	0x0000006a,0x00000000,0x0003001d,0x00000073,0x00000006,0x0003001e,0x00000074,0x00000073,
>+	0x00040020,0x00000075,0x00000002,0x00000074,0x0004003b,0x00000075,0x00000076,0x00000002,
>+	0x00040020,0x00000079,0x00000002,0x00000006,0x0004002b,0x00000006,0x00000089,0x00000020,
>+	0x0004002b,0x00000015,0x0000008e,0xffffffff,0x0004002b,0x00000015,0x00000090,0x00000001,
>+	0x00040020,0x0000009c,0x00000007,0x00000066,0x0004002b,0x00000006,0x000000a0,0x00000001,
>+	0x0004002b,0x00000006,0x000000a5,0x00000000,0x0003001d,0x000000eb,0x00000006,0x0003001e,
>+	0x000000ec,0x000000eb,0x00040020,0x000000ed,0x00000002,0x000000ec,0x0004003b,0x000000ed,
>+	0x000000ee,0x00000002,0x00040017,0x000000ef,0x00000006,0x00000003,0x00040020,0x000000f0,
>+	0x00000001,0x000000ef,0x0004003b,0x000000f0,0x000000f1,0x00000001,0x00040020,0x000000f2,
>+	0x00000001,0x00000006,0x0004002b,0x00000015,0x0000010b,0x0000000b,0x0004002b,0x00000006,
>+	0x00000132,0x00000040,0x0006002c,0x000000ef,0x00000133,0x00000132,0x000000a0,0x000000a0,
>+	0x00050036,0x00000002,0x00000004,0x00000000,0x00000003,0x000200f8,0x00000005,0x0004003b,
>+	0x00000007,0x00000103,0x00000007,0x0004003b,0x00000007,0x00000104,0x00000007,0x0004003b,
>+	0x00000007,0x0000010f,0x00000007,0x0004003b,0x0000001a,0x0000011e,0x00000007,0x0004003b,
>+	0x00000007,0x0000011f,0x00000007,0x0004003b,0x0000001a,0x00000122,0x00000007,0x0004003b,
>+	0x0000001a,0x00000123,0x00000007,0x0004003b,0x00000007,0x00000126,0x00000007,0x0004003b,
>+	0x0000001a,0x00000128,0x00000007,0x0004003b,0x00000007,0x0000012f,0x00000007,0x00050041,
>+	0x000000f2,0x000000fb,0x000000f1,0x000000a5,0x0004003d,0x00000006,0x000000fc,0x000000fb,
>+	0x00050041,0x0000002d,0x000000fd,0x0000002b,0x0000006a,0x0004003d,0x00000006,0x000000fe,
>+	0x000000fd,0x000500ae,0x00000066,0x000000ff,0x000000fc,0x000000fe,0x000300f7,0x00000101,
>+	0x00000000,0x000400fa,0x000000ff,0x00000100,0x00000101,0x000200f8,0x00000100,0x000100fd,
>+	0x000200f8,0x00000101,0x0003003e,0x00000103,0x000000a5,0x0003003e,0x00000104,0x000000a5,
>+	0x000200f9,0x00000105,0x000200f8,0x00000105,0x000400f6,0x00000107,0x00000108,0x00000000,
>+	0x000200f9,0x00000109,0x000200f8,0x00000109,0x0004003d,0x00000006,0x0000010a,0x00000104,
>+	0x00050041,0x0000002d,0x0000010c,0x0000002b,0x0000010b,0x0004003d,0x00000006,0x0000010d,
>+	0x0000010c,0x000500b0,0x00000066,0x0000010e,0x0000010a,0x0000010d,0x000400fa,0x0000010e,
>+	0x00000106,0x00000107,0x000200f8,0x00000106,0x00050041,0x000000f2,0x00000110,0x000000f1,
>+	0x000000a5,0x0004003d,0x00000006,0x00000111,0x00000110,0x00050041,0x0000002d,0x00000112,
>+	0x0000002b,0x0000010b,0x0004003d,0x00000006,0x00000113,0x00000112,0x00050084,0x00000006,
>+	0x00000114,0x00000111,0x00000113,0x0004003d,0x00000006,0x00000115,0x00000104,0x00050080,
>+	0x00000006,0x00000116,0x00000114,0x00000115,0x0003003e,0x0000010f,0x00000116,0x0004003d,
>+	0x00000006,0x00000117,0x0000010f,0x00050041,0x0000002d,0x00000118,0x0000002b,0x00000090,
>+	0x0004003d,0x00000006,0x00000119,0x00000118,0x000500ae,0x00000066,0x0000011a,0x00000117,
>+	0x00000119,0x000300f7,0x0000011c,0x00000000,0x000400fa,0x0000011a,0x0000011b,0x0000011c,
>+	0x000200f8,0x0000011b,0x000200f9,0x00000107,0x000200f8,0x0000011c,0x0004003d,0x00000006,
>+	0x00000120,0x0000010f,0x0003003e,0x0000011f,0x00000120,0x00050039,0x00000015,0x00000121,
>+	0x00000018,0x0000011f,0x0003003e,0x0000011e,0x00000121,0x0004003d,0x00000015,0x00000124,
>+	0x0000011e,0x0003003e,0x00000123,0x00000124,0x00050039,0x00000015,0x00000125,0x0000001d,
>+	0x00000123,0x0003003e,0x00000122,0x00000125,0x0004003d,0x00000006,0x00000127,0x0000010f,
>+	0x0003003e,0x00000126,0x00000127,0x0004003d,0x00000015,0x00000129,0x00000122,0x0003003e,
>+	0x00000128,0x00000129,0x00060039,0x00000006,0x0000012a,0x00000022,0x00000126,0x00000128,
>+	0x0004003d,0x00000006,0x0000012b,0x00000103,0x000500c5,0x00000006,0x0000012c,0x0000012b,
>+	0x0000012a,0x0003003e,0x00000103,0x0000012c,0x000200f9,0x00000108,0x000200f8,0x00000108,
>+	0x0004003d,0x00000006,0x0000012d,0x00000104,0x00050080,0x00000006,0x0000012e,0x0000012d,
>+	0x00000090,0x0003003e,0x00000104,0x0000012e,0x000200f9,0x00000105,0x000200f8,0x00000107,
>+	0x0004003d,0x00000006,0x00000130,0x00000103,0x0003003e,0x0000012f,0x00000130,0x00050039,
>+	0x00000002,0x00000131,0x00000026,0x0000012f,0x000100fd,0x00010038,0x00050036,0x00000006,
>+	0x0000000b,0x00000000,0x00000008,0x00030037,0x00000007,0x00000009,0x00030037,0x00000007,
>+	0x0000000a,0x000200f8,0x0000000c,0x0004003d,0x00000006,0x00000028,0x00000009,0x00050041,
>+	0x0000002d,0x0000002e,0x0000002b,0x0000002c,0x0004003d,0x00000006,0x0000002f,0x0000002e,
>+	0x00050084,0x00000006,0x00000030,0x00000028,0x0000002f,0x0004003d,0x00000006,0x00000031,
>+	0x0000000a,0x00050041,0x0000002d,0x00000033,0x0000002b,0x00000032,0x0004003d,0x00000006,
>+	0x00000034,0x00000033,0x00050084,0x00000006,0x00000035,0x00000031,0x00000034,0x00050080,
>+	0x00000006,0x00000036,0x00000030,0x00000035,0x00050041,0x0000002d,0x00000038,0x0000002b,
>+	0x00000037,0x0004003d,0x00000006,0x00000039,0x00000038,0x00050080,0x00000006,0x0000003a,
>+	0x00000036,0x00000039,0x000200fe,0x0000003a,0x00010038,0x00050036,0x00000006,0x0000000f,
>+	0x00000000,0x00000008,0x00030037,0x00000007,0x0000000d,0x00030037,0x00000007,0x0000000e,
>+	0x000200f8,0x00000010,0x0004003d,0x00000006,0x0000003d,0x0000000d,0x00050041,0x0000002d,
>+	0x0000003f,0x0000002b,0x0000003e,0x0004003d,0x00000006,0x00000040,0x0000003f,0x00050084,
>+	0x00000006,0x00000041,0x0000003d,0x00000040,0x0004003d,0x00000006,0x00000042,0x0000000e,
>+	0x00050041,0x0000002d,0x00000044,0x0000002b,0x00000043,0x0004003d,0x00000006,0x00000045,
>+	0x00000044,0x00050084,0x00000006,0x00000046,0x00000042,0x00000045,0x00050080,0x00000006,
>+	0x00000047,0x00000041,0x00000046,0x00050041,0x0000002d,0x00000049,0x0000002b,0x00000048,
>+	0x0004003d,0x00000006,0x0000004a,0x00000049,0x00050080,0x00000006,0x0000004b,0x00000047,
>+	0x0000004a,0x000200fe,0x0000004b,0x00010038,0x00050036,0x00000006,0x00000013,0x00000000,
>+	0x00000008,0x00030037,0x00000007,0x00000011,0x00030037,0x00000007,0x00000012,0x000200f8,
>+	0x00000014,0x0004003b,0x00000007,0x0000004e,0x00000007,0x0004003d,0x00000006,0x0000004f,
>+	0x00000011,0x00050089,0x00000006,0x00000051,0x0000004f,0x00000050,0x00050084,0x00000006,
>+	0x00000053,0x00000051,0x00000052,0x0003003e,0x0000004e,0x00000053,0x0004003d,0x00000006,
>+	0x00000054,0x0000004e,0x000200fe,0x00000054,0x00010038,0x00050036,0x00000015,0x00000018,
>+	0x00000000,0x00000016,0x00030037,0x00000007,0x00000017,0x000200f8,0x00000019,0x0004003b,
>+	0x00000007,0x00000057,0x00000007,0x0004003b,0x00000007,0x0000005d,0x00000007,0x0004003b,
>+	0x00000007,0x0000006c,0x00000007,0x0004003b,0x00000007,0x0000006d,0x00000007,0x0004003b,
>+	0x00000007,0x0000006f,0x00000007,0x0004003b,0x00000007,0x00000072,0x00000007,0x0004003b,
>+	0x00000007,0x0000007c,0x00000007,0x0004003b,0x00000007,0x0000007d,0x00000007,0x0004003b,
>+	0x00000007,0x0000007f,0x00000007,0x0004003b,0x00000007,0x00000083,0x00000007,0x0004003b,
>+	0x00000007,0x00000087,0x00000007,0x0004003b,0x0000001a,0x0000008b,0x00000007,0x0004003b,
>+	0x00000007,0x00000096,0x00000007,0x0004003b,0x0000009c,0x0000009d,0x00000007,0x0004003b,
>+	0x0000001a,0x000000a7,0x00000007,0x0004003b,0x0000001a,0x000000aa,0x00000007,0x0004003d,
>+	0x00000006,0x00000058,0x00000017,0x00050041,0x0000002d,0x0000005a,0x0000002b,0x00000059,
>+	0x0004003d,0x00000006,0x0000005b,0x0000005a,0x00050086,0x00000006,0x0000005c,0x00000058,
>+	0x0000005b,0x0003003e,0x00000057,0x0000005c,0x0004003d,0x00000006,0x0000005e,0x00000017,
>+	0x00050041,0x0000002d,0x0000005f,0x0000002b,0x00000059,0x0004003d,0x00000006,0x00000060,
>+	0x0000005f,0x00050089,0x00000006,0x00000061,0x0000005e,0x00000060,0x0003003e,0x0000005d,
>+	0x00000061,0x0004003d,0x00000006,0x00000062,0x0000005d,0x00050041,0x0000002d,0x00000064,
>+	0x0000002b,0x00000063,0x0004003d,0x00000006,0x00000065,0x00000064,0x000500ae,0x00000066,
>+	0x00000067,0x00000062,0x00000065,0x000300f7,0x00000069,0x00000000,0x000400fa,0x00000067,
>+	0x00000068,0x00000069,0x000200f8,0x00000068,0x000200fe,0x0000006a,0x000200f8,0x00000069,
>+	0x0004003d,0x00000006,0x0000006e,0x00000057,0x0003003e,0x0000006d,0x0000006e,0x0004003d,
>+	0x00000006,0x00000070,0x0000005d,0x0003003e,0x0000006f,0x00000070,0x00060039,0x00000006,
>+	0x00000071,0x0000000b,0x0000006d,0x0000006f,0x0003003e,0x0000006c,0x00000071,0x0004003d,
>+	0x00000006,0x00000077,0x0000006c,0x00050086,0x00000006,0x00000078,0x00000077,0x00000050,
>+	0x00060041,0x00000079,0x0000007a,0x00000076,0x0000006a,0x00000078,0x0004003d,0x00000006,
>+	0x0000007b,0x0000007a,0x0003003e,0x00000072,0x0000007b,0x0004003d,0x00000006,0x0000007e,
>+	0x0000006c,0x0003003e,0x0000007d,0x0000007e,0x00050041,0x0000002d,0x00000080,0x0000002b,
>+	0x00000032,0x0004003d,0x00000006,0x00000081,0x00000080,0x0003003e,0x0000007f,0x00000081,
>+	0x00060039,0x00000006,0x00000082,0x00000013,0x0000007d,0x0000007f,0x0003003e,0x0000007c,
>+	0x00000082,0x00050041,0x0000002d,0x00000084,0x0000002b,0x00000032,0x0004003d,0x00000006,
>+	0x00000085,0x00000084,0x00050084,0x00000006,0x00000086,0x00000085,0x00000052,0x0003003e,
>+	0x00000083,0x00000086,0x0004003d,0x00000006,0x00000088,0x00000083,0x000500aa,0x00000066,
>+	0x0000008a,0x00000088,0x00000089,0x000300f7,0x0000008d,0x00000000,0x000400fa,0x0000008a,
>+	0x0000008c,0x0000008f,0x000200f8,0x0000008c,0x0003003e,0x0000008b,0x0000008e,0x000200f9,
>+	0x0000008d,0x000200f8,0x0000008f,0x0004003d,0x00000006,0x00000091,0x00000083,0x000500c4,
>+	0x00000015,0x00000092,0x00000090,0x00000091,0x00050082,0x00000015,0x00000093,0x00000092,
>+	0x00000090,0x0003003e,0x0000008b,0x00000093,0x000200f9,0x0000008d,0x000200f8,0x0000008d,
>+	0x0004003d,0x00000015,0x00000094,0x0000008b,0x0004007c,0x00000006,0x00000095,0x00000094,
>+	0x0003003e,0x00000087,0x00000095,0x0004003d,0x00000006,0x00000097,0x00000072,0x0004003d,
>+	0x00000006,0x00000098,0x0000007c,0x000500c2,0x00000006,0x00000099,0x00000097,0x00000098,
>+	0x0004003d,0x00000006,0x0000009a,0x00000087,0x000500c7,0x00000006,0x0000009b,0x00000099,
>+	0x0000009a,0x0003003e,0x00000096,0x0000009b,0x0004003d,0x00000006,0x0000009e,0x00000096,
>+	0x0004003d,0x00000006,0x0000009f,0x00000083,0x00050082,0x00000006,0x000000a1,0x0000009f,
>+	0x000000a0,0x000500c4,0x00000015,0x000000a2,0x00000090,0x000000a1,0x0004007c,0x00000006,
>+	0x000000a3,0x000000a2,0x000500c7,0x00000006,0x000000a4,0x0000009e,0x000000a3,0x000500ab,
>+	0x00000066,0x000000a6,0x000000a4,0x000000a5,0x0003003e,0x0000009d,0x000000a6,0x0004003d,
>+	0x00000006,0x000000a8,0x00000096,0x0004003d,0x00000066,0x000000a9,0x0000009d,0x000300f7,
>+	0x000000ac,0x00000000,0x000400fa,0x000000a9,0x000000ab,0x000000af,0x000200f8,0x000000ab,
>+	0x0004003d,0x00000006,0x000000ad,0x00000083,0x000500c4,0x00000015,0x000000ae,0x0000008e,
>+	0x000000ad,0x0003003e,0x000000aa,0x000000ae,0x000200f9,0x000000ac,0x000200f8,0x000000af,
>+	0x0003003e,0x000000aa,0x0000006a,0x000200f9,0x000000ac,0x000200f8,0x000000ac,0x0004003d,
>+	0x00000015,0x000000b0,0x000000aa,0x0004007c,0x00000006,0x000000b1,0x000000b0,0x000500c5,
>+	0x00000006,0x000000b2,0x000000a8,0x000000b1,0x0004007c,0x00000015,0x000000b3,0x000000b2,
>+	0x0003003e,0x000000a7,0x000000b3,0x0004003d,0x00000015,0x000000b4,0x000000a7,0x000200fe,
>+	0x000000b4,0x00010038,0x00050036,0x00000015,0x0000001d,0x00000000,0x0000001b,0x00030037,
>+	0x0000001a,0x0000001c,0x000200f8,0x0000001e,0x0004003d,0x00000015,0x000000b7,0x0000001c,
>+	0x000200fe,0x000000b7,0x00010038,0x00050036,0x00000006,0x00000022,0x00000000,0x0000001f,
>+	0x00030037,0x00000007,0x00000020,0x00030037,0x0000001a,0x00000021,0x000200f8,0x00000023,
>+	0x0004003b,0x00000007,0x000000ba,0x00000007,0x0004003b,0x00000007,0x000000bf,0x00000007,
>+	0x0004003b,0x00000007,0x000000c4,0x00000007,0x0004003b,0x00000007,0x000000c5,0x00000007,
>+	0x0004003b,0x00000007,0x000000c7,0x00000007,0x0004003b,0x00000007,0x000000ca,0x00000007,
>+	0x0004003b,0x00000007,0x000000cb,0x00000007,0x0004003b,0x00000007,0x000000cd,0x00000007,
>+	0x0004003b,0x00000007,0x000000d1,0x00000007,0x0004003b,0x00000007,0x000000d5,0x00000007,
>+	0x0004003b,0x0000001a,0x000000d8,0x00000007,0x0004003b,0x00000007,0x000000e1,0x00000007,
>+	0x0004003d,0x00000006,0x000000bb,0x00000020,0x00050041,0x0000002d,0x000000bc,0x0000002b,
>+	0x00000059,0x0004003d,0x00000006,0x000000bd,0x000000bc,0x00050086,0x00000006,0x000000be,
>+	0x000000bb,0x000000bd,0x0003003e,0x000000ba,0x000000be,0x0004003d,0x00000006,0x000000c0,
>+	0x00000020,0x00050041,0x0000002d,0x000000c1,0x0000002b,0x00000059,0x0004003d,0x00000006,
>+	0x000000c2,0x000000c1,0x00050089,0x00000006,0x000000c3,0x000000c0,0x000000c2,0x0003003e,
>+	0x000000bf,0x000000c3,0x0004003d,0x00000006,0x000000c6,0x000000ba,0x0003003e,0x000000c5,
>+	0x000000c6,0x0004003d,0x00000006,0x000000c8,0x000000bf,0x0003003e,0x000000c7,0x000000c8,
>+	0x00060039,0x00000006,0x000000c9,0x0000000f,0x000000c5,0x000000c7,0x0003003e,0x000000c4,
>+	0x000000c9,0x0004003d,0x00000006,0x000000cc,0x000000c4,0x0003003e,0x000000cb,0x000000cc,
>+	0x00050041,0x0000002d,0x000000ce,0x0000002b,0x00000043,0x0004003d,0x00000006,0x000000cf,
>+	0x000000ce,0x0003003e,0x000000cd,0x000000cf,0x00060039,0x00000006,0x000000d0,0x00000013,
>+	0x000000cb,0x000000cd,0x0003003e,0x000000ca,0x000000d0,0x00050041,0x0000002d,0x000000d2,
>+	0x0000002b,0x00000043,0x0004003d,0x00000006,0x000000d3,0x000000d2,0x00050084,0x00000006,
>+	0x000000d4,0x000000d3,0x00000052,0x0003003e,0x000000d1,0x000000d4,0x0004003d,0x00000006,
>+	0x000000d6,0x000000d1,0x000500aa,0x00000066,0x000000d7,0x000000d6,0x00000089,0x000300f7,
>+	0x000000da,0x00000000,0x000400fa,0x000000d7,0x000000d9,0x000000db,0x000200f8,0x000000d9,
>+	0x0003003e,0x000000d8,0x0000008e,0x000200f9,0x000000da,0x000200f8,0x000000db,0x0004003d,
>+	0x00000006,0x000000dc,0x000000d1,0x000500c4,0x00000015,0x000000dd,0x00000090,0x000000dc,
>+	0x00050082,0x00000015,0x000000de,0x000000dd,0x00000090,0x0003003e,0x000000d8,0x000000de,
>+	0x000200f9,0x000000da,0x000200f8,0x000000da,0x0004003d,0x00000015,0x000000df,0x000000d8,
>+	0x0004007c,0x00000006,0x000000e0,0x000000df,0x0003003e,0x000000d5,0x000000e0,0x0004003d,
>+	0x00000015,0x000000e2,0x00000021,0x0004007c,0x00000006,0x000000e3,0x000000e2,0x0004003d,
>+	0x00000006,0x000000e4,0x000000d5,0x000500c7,0x00000006,0x000000e5,0x000000e3,0x000000e4,
>+	0x0004003d,0x00000006,0x000000e6,0x000000ca,0x000500c4,0x00000006,0x000000e7,0x000000e5,
>+	0x000000e6,0x0003003e,0x000000e1,0x000000e7,0x0004003d,0x00000006,0x000000e8,0x000000e1,
>+	0x000200fe,0x000000e8,0x00010038,0x00050036,0x00000002,0x00000026,0x00000000,0x00000024,
>+	0x00030037,0x00000007,0x00000025,0x000200f8,0x00000027,0x00050041,0x000000f2,0x000000f3,
>+	0x000000f1,0x000000a5,0x0004003d,0x00000006,0x000000f4,0x000000f3,0x00050041,0x0000002d,
>+	0x000000f5,0x0000002b,0x00000048,0x0004003d,0x00000006,0x000000f6,0x000000f5,0x00050086,
>+	0x00000006,0x000000f7,0x000000f6,0x00000050,0x00050080,0x00000006,0x000000f8,0x000000f4,
>+	0x000000f7,0x0004003d,0x00000006,0x000000f9,0x00000025,0x00060041,0x00000079,0x000000fa,
>+	0x000000ee,0x0000006a,0x000000f8,0x0003003e,0x000000fa,0x000000f9,0x000100fd,0x00010038
>+};
>+
>+#if 0  // Generated from:
>+#version 450 core
>+
>+layout(local_size_x = 64, local_size_y = 1, local_size_z = 1)in;
>+
>+layout(set = 0, binding = 0)buffer dest
>+{
>+    uint destData[];
>+};
>+
>+layout(set = 0, binding = 1)buffer src
>+{
>+    uint srcData[];
>+};
>+
>+layout(push_constant)uniform PushConstants
>+{
>+
>+    uint outputCount;
>+
>+    uint componentCount;
>+
>+    uint srcOffset;
>+    uint destOffset;
>+
>+    uint Ns;
>+    uint Bs;
>+    uint Ss;
>+    uint Es;
>+
>+    uint Nd;
>+    uint Bd;
>+    uint Sd;
>+    uint Ed;
>+} params;
>+
>+uint getSourceComponentOffset(uint vertex, uint component)
>+{
>+    return vertex * params . Ss + component * params . Bs + params . srcOffset;
>+}
>+
>+uint getDestinationComponentOffset(uint vertex, uint component)
>+{
>+    return vertex * params . Sd + component * params . Bd + params . destOffset;
>+}
>+
>+uint getShiftBits(uint offset, uint B)
>+{
>+
>+    uint shift =(offset % 4)* 8;
>+
>+    return shift;
>+}
>+
>+      int loadSourceComponent(uint cd)
>+{
>+
>+    uint vertex = cd / params . Nd;
>+    uint component = cd % params . Nd;
>+
>+    if(component >= params . Ns)
>+    {
>+        return 0;
>+    }
>+
>+    uint offset = getSourceComponentOffset(vertex, component);
>+    uint block = srcData[offset / 4];
>+    uint shiftBits = getShiftBits(offset, params . Bs);
>+
>+    uint valueBits = params . Bs * 8;
>+    uint valueMask = valueBits == 32 ? - 1 :(1 << valueBits)- 1;
>+    uint valueAsUint =(block >> shiftBits)& valueMask;
>+
>+    bool isNegative =(valueAsUint &(1 <<(valueBits - 1)))!= 0;
>+
>+          int value = int(valueAsUint |(isNegative ? 0xFFFFFFFF << valueBits : 0));
>+
>+    return value;
>+}
>+
>+       int convertComponent(int srcValue)
>+{
>+
>+    return srcValue;
>+}
>+
>+uint makeDestinationComponent(uint cd, int value)
>+{
>+
>+    uint vertex = cd / params . Nd;
>+    uint component = cd % params . Nd;
>+
>+    uint offset = getDestinationComponentOffset(vertex, component);
>+    uint shiftBits = getShiftBits(offset, params . Bd);
>+
>+    uint valueBits = params . Bd * 8;
>+    uint valueMask = valueBits == 32 ? - 1 :(1 << valueBits)- 1;
>+    uint valueAsUint =(uint(value)& valueMask)<< shiftBits;
>+
>+    return valueAsUint;
>+}
>+
>+void storeDestinationComponents(uint valueAsUint)
>+{
>+
>+    destData[gl_GlobalInvocationID . x + params . destOffset / 4]= valueAsUint;
>+}
>+
>+void main()
>+{
>+
>+    if(gl_GlobalInvocationID . x >= params . outputCount)
>+        return;
>+
>+    uint valueOut = 0;
>+    for(uint i = 0;i < params . Ed;++ i)
>+    {
>+        uint cd = gl_GlobalInvocationID . x * params . Ed + i;
>+
>+        if(cd >= params . componentCount)
>+        {
>+            break;
>+        }
>+
>+              int srcValue = loadSourceComponent(cd);
>+               int destValue = convertComponent(srcValue);
>+        valueOut |= makeDestinationComponent(cd, destValue);
>+    }
>+
>+    storeDestinationComponents(valueOut);
>+}
>+#endif  // Preprocessed code
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.00000001.inc b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.00000001.inc
>new file mode 100644
>index 00000000000..1d4d83f73ed
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.00000001.inc
>@@ -0,0 +1,363 @@
>+	// 7.11.3188
>+	 #pragma once
>+const uint32_t kConvertVertex_comp_00000001[] = {
>+	0x07230203,0x00010000,0x00080007,0x00000125,0x00000000,0x00020011,0x00000001,0x0006000b,
>+	0x00000001,0x4c534c47,0x6474732e,0x3035342e,0x00000000,0x0003000e,0x00000000,0x00000001,
>+	0x0006000f,0x00000005,0x00000004,0x6e69616d,0x00000000,0x000000f1,0x00060010,0x00000004,
>+	0x00000011,0x00000040,0x00000001,0x00000001,0x00030003,0x00000002,0x000001c2,0x00040005,
>+	0x00000004,0x6e69616d,0x00000000,0x000a0005,0x0000000b,0x53746567,0x6372756f,0x6d6f4365,
>+	0x656e6f70,0x664f746e,0x74657366,0x3b317528,0x003b3175,0x00040005,0x00000009,0x74726576,
>+	0x00007865,0x00050005,0x0000000a,0x706d6f63,0x6e656e6f,0x00000074,0x000c0005,0x0000000f,
>+	0x44746567,0x69747365,0x6974616e,0x6f436e6f,0x6e6f706d,0x4f746e65,0x65736666,0x31752874,
>+	0x3b31753b,0x00000000,0x00040005,0x0000000d,0x74726576,0x00007865,0x00050005,0x0000000e,
>+	0x706d6f63,0x6e656e6f,0x00000074,0x00070005,0x00000013,0x53746567,0x74666968,0x73746942,
>+	0x3b317528,0x003b3175,0x00040005,0x00000011,0x7366666f,0x00007465,0x00030005,0x00000012,
>+	0x00000042,0x00080005,0x00000018,0x64616f6c,0x72756f53,0x6f436563,0x6e6f706d,0x28746e65,
>+	0x003b3175,0x00030005,0x00000017,0x00006463,0x00080005,0x0000001d,0x766e6f63,0x43747265,
>+	0x6f706d6f,0x746e656e,0x3b316928,0x00000000,0x00050005,0x0000001c,0x56637273,0x65756c61,
>+	0x00000000,0x000a0005,0x00000022,0x656b616d,0x74736544,0x74616e69,0x436e6f69,0x6f706d6f,
>+	0x746e656e,0x3b317528,0x003b3169,0x00030005,0x00000020,0x00006463,0x00040005,0x00000021,
>+	0x756c6176,0x00000065,0x000a0005,0x00000026,0x726f7473,0x73654465,0x616e6974,0x6e6f6974,
>+	0x706d6f43,0x6e656e6f,0x75287374,0x00003b31,0x00050005,0x00000025,0x756c6176,0x55734165,
>+	0x00746e69,0x00060005,0x00000029,0x68737550,0x736e6f43,0x746e6174,0x00000073,0x00060006,
>+	0x00000029,0x00000000,0x7074756f,0x6f437475,0x00746e75,0x00070006,0x00000029,0x00000001,
>+	0x706d6f63,0x6e656e6f,0x756f4374,0x0000746e,0x00060006,0x00000029,0x00000002,0x4f637273,
>+	0x65736666,0x00000074,0x00060006,0x00000029,0x00000003,0x74736564,0x7366664f,0x00007465,
>+	0x00040006,0x00000029,0x00000004,0x0000734e,0x00040006,0x00000029,0x00000005,0x00007342,
>+	0x00040006,0x00000029,0x00000006,0x00007353,0x00040006,0x00000029,0x00000007,0x00007345,
>+	0x00040006,0x00000029,0x00000008,0x0000644e,0x00040006,0x00000029,0x00000009,0x00006442,
>+	0x00040006,0x00000029,0x0000000a,0x00006453,0x00040006,0x00000029,0x0000000b,0x00006445,
>+	0x00040005,0x0000002b,0x61726170,0x0000736d,0x00040005,0x0000004e,0x66696873,0x00000074,
>+	0x00040005,0x00000057,0x74726576,0x00007865,0x00050005,0x0000005d,0x706d6f63,0x6e656e6f,
>+	0x00000074,0x00040005,0x0000006c,0x7366666f,0x00007465,0x00040005,0x0000006d,0x61726170,
>+	0x0000006d,0x00040005,0x0000006f,0x61726170,0x0000006d,0x00040005,0x00000072,0x636f6c62,
>+	0x0000006b,0x00030005,0x00000074,0x00637273,0x00050006,0x00000074,0x00000000,0x44637273,
>+	0x00617461,0x00030005,0x00000076,0x00000000,0x00050005,0x0000007c,0x66696873,0x74694274,
>+	0x00000073,0x00040005,0x0000007d,0x61726170,0x0000006d,0x00040005,0x0000007f,0x61726170,
>+	0x0000006d,0x00050005,0x00000083,0x756c6176,0x74694265,0x00000073,0x00050005,0x00000087,
>+	0x756c6176,0x73614d65,0x0000006b,0x00050005,0x00000096,0x756c6176,0x55734165,0x00746e69,
>+	0x00050005,0x0000009d,0x654e7369,0x69746167,0x00006576,0x00040005,0x000000a7,0x756c6176,
>+	0x00000065,0x00040005,0x000000ba,0x74726576,0x00007865,0x00050005,0x000000bf,0x706d6f63,
>+	0x6e656e6f,0x00000074,0x00040005,0x000000c4,0x7366666f,0x00007465,0x00040005,0x000000c5,
>+	0x61726170,0x0000006d,0x00040005,0x000000c7,0x61726170,0x0000006d,0x00050005,0x000000ca,
>+	0x66696873,0x74694274,0x00000073,0x00040005,0x000000cb,0x61726170,0x0000006d,0x00040005,
>+	0x000000cd,0x61726170,0x0000006d,0x00050005,0x000000d1,0x756c6176,0x74694265,0x00000073,
>+	0x00050005,0x000000d5,0x756c6176,0x73614d65,0x0000006b,0x00050005,0x000000e1,0x756c6176,
>+	0x55734165,0x00746e69,0x00040005,0x000000ec,0x74736564,0x00000000,0x00060006,0x000000ec,
>+	0x00000000,0x74736564,0x61746144,0x00000000,0x00030005,0x000000ee,0x00000000,0x00080005,
>+	0x000000f1,0x475f6c67,0x61626f6c,0x766e496c,0x7461636f,0x496e6f69,0x00000044,0x00050005,
>+	0x000000fb,0x756c6176,0x74754f65,0x00000000,0x00030005,0x000000fc,0x00000069,0x00030005,
>+	0x00000107,0x00006463,0x00050005,0x0000010f,0x56637273,0x65756c61,0x00000000,0x00040005,
>+	0x00000110,0x61726170,0x0000006d,0x00050005,0x00000113,0x74736564,0x756c6156,0x00000065,
>+	0x00040005,0x00000114,0x61726170,0x0000006d,0x00040005,0x00000117,0x61726170,0x0000006d,
>+	0x00040005,0x00000119,0x61726170,0x0000006d,0x00040005,0x00000120,0x61726170,0x0000006d,
>+	0x00050048,0x00000029,0x00000000,0x00000023,0x00000000,0x00050048,0x00000029,0x00000001,
>+	0x00000023,0x00000004,0x00050048,0x00000029,0x00000002,0x00000023,0x00000008,0x00050048,
>+	0x00000029,0x00000003,0x00000023,0x0000000c,0x00050048,0x00000029,0x00000004,0x00000023,
>+	0x00000010,0x00050048,0x00000029,0x00000005,0x00000023,0x00000014,0x00050048,0x00000029,
>+	0x00000006,0x00000023,0x00000018,0x00050048,0x00000029,0x00000007,0x00000023,0x0000001c,
>+	0x00050048,0x00000029,0x00000008,0x00000023,0x00000020,0x00050048,0x00000029,0x00000009,
>+	0x00000023,0x00000024,0x00050048,0x00000029,0x0000000a,0x00000023,0x00000028,0x00050048,
>+	0x00000029,0x0000000b,0x00000023,0x0000002c,0x00030047,0x00000029,0x00000002,0x00040047,
>+	0x00000073,0x00000006,0x00000004,0x00050048,0x00000074,0x00000000,0x00000023,0x00000000,
>+	0x00030047,0x00000074,0x00000003,0x00040047,0x00000076,0x00000022,0x00000000,0x00040047,
>+	0x00000076,0x00000021,0x00000001,0x00040047,0x000000eb,0x00000006,0x00000004,0x00050048,
>+	0x000000ec,0x00000000,0x00000023,0x00000000,0x00030047,0x000000ec,0x00000003,0x00040047,
>+	0x000000ee,0x00000022,0x00000000,0x00040047,0x000000ee,0x00000021,0x00000000,0x00040047,
>+	0x000000f1,0x0000000b,0x0000001c,0x00040047,0x00000124,0x0000000b,0x00000019,0x00020013,
>+	0x00000002,0x00030021,0x00000003,0x00000002,0x00040015,0x00000006,0x00000020,0x00000000,
>+	0x00040020,0x00000007,0x00000007,0x00000006,0x00050021,0x00000008,0x00000006,0x00000007,
>+	0x00000007,0x00040015,0x00000015,0x00000020,0x00000001,0x00040021,0x00000016,0x00000015,
>+	0x00000007,0x00040020,0x0000001a,0x00000007,0x00000015,0x00040021,0x0000001b,0x00000015,
>+	0x0000001a,0x00050021,0x0000001f,0x00000006,0x00000007,0x0000001a,0x00040021,0x00000024,
>+	0x00000002,0x00000007,0x000e001e,0x00000029,0x00000006,0x00000006,0x00000006,0x00000006,
>+	0x00000006,0x00000006,0x00000006,0x00000006,0x00000006,0x00000006,0x00000006,0x00000006,
>+	0x00040020,0x0000002a,0x00000009,0x00000029,0x0004003b,0x0000002a,0x0000002b,0x00000009,
>+	0x0004002b,0x00000015,0x0000002c,0x00000006,0x00040020,0x0000002d,0x00000009,0x00000006,
>+	0x0004002b,0x00000015,0x00000032,0x00000005,0x0004002b,0x00000015,0x00000037,0x00000002,
>+	0x0004002b,0x00000015,0x0000003e,0x0000000a,0x0004002b,0x00000015,0x00000043,0x00000009,
>+	0x0004002b,0x00000015,0x00000048,0x00000003,0x0004002b,0x00000006,0x00000050,0x00000004,
>+	0x0004002b,0x00000006,0x00000052,0x00000008,0x0004002b,0x00000015,0x00000059,0x00000008,
>+	0x0004002b,0x00000015,0x00000063,0x00000004,0x00020014,0x00000066,0x0004002b,0x00000015,
>+	0x0000006a,0x00000000,0x0003001d,0x00000073,0x00000006,0x0003001e,0x00000074,0x00000073,
>+	0x00040020,0x00000075,0x00000002,0x00000074,0x0004003b,0x00000075,0x00000076,0x00000002,
>+	0x00040020,0x00000079,0x00000002,0x00000006,0x0004002b,0x00000006,0x00000089,0x00000020,
>+	0x0004002b,0x00000015,0x0000008e,0xffffffff,0x0004002b,0x00000015,0x00000090,0x00000001,
>+	0x00040020,0x0000009c,0x00000007,0x00000066,0x0004002b,0x00000006,0x000000a0,0x00000001,
>+	0x0004002b,0x00000006,0x000000a5,0x00000000,0x0003001d,0x000000eb,0x00000006,0x0003001e,
>+	0x000000ec,0x000000eb,0x00040020,0x000000ed,0x00000002,0x000000ec,0x0004003b,0x000000ed,
>+	0x000000ee,0x00000002,0x00040017,0x000000ef,0x00000006,0x00000003,0x00040020,0x000000f0,
>+	0x00000001,0x000000ef,0x0004003b,0x000000f0,0x000000f1,0x00000001,0x00040020,0x000000f2,
>+	0x00000001,0x00000006,0x0004002b,0x00000015,0x00000103,0x0000000b,0x0004002b,0x00000006,
>+	0x00000123,0x00000040,0x0006002c,0x000000ef,0x00000124,0x00000123,0x000000a0,0x000000a0,
>+	0x00050036,0x00000002,0x00000004,0x00000000,0x00000003,0x000200f8,0x00000005,0x0004003b,
>+	0x00000007,0x000000fb,0x00000007,0x0004003b,0x00000007,0x000000fc,0x00000007,0x0004003b,
>+	0x00000007,0x00000107,0x00000007,0x0004003b,0x0000001a,0x0000010f,0x00000007,0x0004003b,
>+	0x00000007,0x00000110,0x00000007,0x0004003b,0x0000001a,0x00000113,0x00000007,0x0004003b,
>+	0x0000001a,0x00000114,0x00000007,0x0004003b,0x00000007,0x00000117,0x00000007,0x0004003b,
>+	0x0000001a,0x00000119,0x00000007,0x0004003b,0x00000007,0x00000120,0x00000007,0x0003003e,
>+	0x000000fb,0x000000a5,0x0003003e,0x000000fc,0x000000a5,0x000200f9,0x000000fd,0x000200f8,
>+	0x000000fd,0x000400f6,0x000000ff,0x00000100,0x00000000,0x000200f9,0x00000101,0x000200f8,
>+	0x00000101,0x0004003d,0x00000006,0x00000102,0x000000fc,0x00050041,0x0000002d,0x00000104,
>+	0x0000002b,0x00000103,0x0004003d,0x00000006,0x00000105,0x00000104,0x000500b0,0x00000066,
>+	0x00000106,0x00000102,0x00000105,0x000400fa,0x00000106,0x000000fe,0x000000ff,0x000200f8,
>+	0x000000fe,0x00050041,0x000000f2,0x00000108,0x000000f1,0x000000a5,0x0004003d,0x00000006,
>+	0x00000109,0x00000108,0x00050041,0x0000002d,0x0000010a,0x0000002b,0x00000103,0x0004003d,
>+	0x00000006,0x0000010b,0x0000010a,0x00050084,0x00000006,0x0000010c,0x00000109,0x0000010b,
>+	0x0004003d,0x00000006,0x0000010d,0x000000fc,0x00050080,0x00000006,0x0000010e,0x0000010c,
>+	0x0000010d,0x0003003e,0x00000107,0x0000010e,0x0004003d,0x00000006,0x00000111,0x00000107,
>+	0x0003003e,0x00000110,0x00000111,0x00050039,0x00000015,0x00000112,0x00000018,0x00000110,
>+	0x0003003e,0x0000010f,0x00000112,0x0004003d,0x00000015,0x00000115,0x0000010f,0x0003003e,
>+	0x00000114,0x00000115,0x00050039,0x00000015,0x00000116,0x0000001d,0x00000114,0x0003003e,
>+	0x00000113,0x00000116,0x0004003d,0x00000006,0x00000118,0x00000107,0x0003003e,0x00000117,
>+	0x00000118,0x0004003d,0x00000015,0x0000011a,0x00000113,0x0003003e,0x00000119,0x0000011a,
>+	0x00060039,0x00000006,0x0000011b,0x00000022,0x00000117,0x00000119,0x0004003d,0x00000006,
>+	0x0000011c,0x000000fb,0x000500c5,0x00000006,0x0000011d,0x0000011c,0x0000011b,0x0003003e,
>+	0x000000fb,0x0000011d,0x000200f9,0x00000100,0x000200f8,0x00000100,0x0004003d,0x00000006,
>+	0x0000011e,0x000000fc,0x00050080,0x00000006,0x0000011f,0x0000011e,0x00000090,0x0003003e,
>+	0x000000fc,0x0000011f,0x000200f9,0x000000fd,0x000200f8,0x000000ff,0x0004003d,0x00000006,
>+	0x00000121,0x000000fb,0x0003003e,0x00000120,0x00000121,0x00050039,0x00000002,0x00000122,
>+	0x00000026,0x00000120,0x000100fd,0x00010038,0x00050036,0x00000006,0x0000000b,0x00000000,
>+	0x00000008,0x00030037,0x00000007,0x00000009,0x00030037,0x00000007,0x0000000a,0x000200f8,
>+	0x0000000c,0x0004003d,0x00000006,0x00000028,0x00000009,0x00050041,0x0000002d,0x0000002e,
>+	0x0000002b,0x0000002c,0x0004003d,0x00000006,0x0000002f,0x0000002e,0x00050084,0x00000006,
>+	0x00000030,0x00000028,0x0000002f,0x0004003d,0x00000006,0x00000031,0x0000000a,0x00050041,
>+	0x0000002d,0x00000033,0x0000002b,0x00000032,0x0004003d,0x00000006,0x00000034,0x00000033,
>+	0x00050084,0x00000006,0x00000035,0x00000031,0x00000034,0x00050080,0x00000006,0x00000036,
>+	0x00000030,0x00000035,0x00050041,0x0000002d,0x00000038,0x0000002b,0x00000037,0x0004003d,
>+	0x00000006,0x00000039,0x00000038,0x00050080,0x00000006,0x0000003a,0x00000036,0x00000039,
>+	0x000200fe,0x0000003a,0x00010038,0x00050036,0x00000006,0x0000000f,0x00000000,0x00000008,
>+	0x00030037,0x00000007,0x0000000d,0x00030037,0x00000007,0x0000000e,0x000200f8,0x00000010,
>+	0x0004003d,0x00000006,0x0000003d,0x0000000d,0x00050041,0x0000002d,0x0000003f,0x0000002b,
>+	0x0000003e,0x0004003d,0x00000006,0x00000040,0x0000003f,0x00050084,0x00000006,0x00000041,
>+	0x0000003d,0x00000040,0x0004003d,0x00000006,0x00000042,0x0000000e,0x00050041,0x0000002d,
>+	0x00000044,0x0000002b,0x00000043,0x0004003d,0x00000006,0x00000045,0x00000044,0x00050084,
>+	0x00000006,0x00000046,0x00000042,0x00000045,0x00050080,0x00000006,0x00000047,0x00000041,
>+	0x00000046,0x00050041,0x0000002d,0x00000049,0x0000002b,0x00000048,0x0004003d,0x00000006,
>+	0x0000004a,0x00000049,0x00050080,0x00000006,0x0000004b,0x00000047,0x0000004a,0x000200fe,
>+	0x0000004b,0x00010038,0x00050036,0x00000006,0x00000013,0x00000000,0x00000008,0x00030037,
>+	0x00000007,0x00000011,0x00030037,0x00000007,0x00000012,0x000200f8,0x00000014,0x0004003b,
>+	0x00000007,0x0000004e,0x00000007,0x0004003d,0x00000006,0x0000004f,0x00000011,0x00050089,
>+	0x00000006,0x00000051,0x0000004f,0x00000050,0x00050084,0x00000006,0x00000053,0x00000051,
>+	0x00000052,0x0003003e,0x0000004e,0x00000053,0x0004003d,0x00000006,0x00000054,0x0000004e,
>+	0x000200fe,0x00000054,0x00010038,0x00050036,0x00000015,0x00000018,0x00000000,0x00000016,
>+	0x00030037,0x00000007,0x00000017,0x000200f8,0x00000019,0x0004003b,0x00000007,0x00000057,
>+	0x00000007,0x0004003b,0x00000007,0x0000005d,0x00000007,0x0004003b,0x00000007,0x0000006c,
>+	0x00000007,0x0004003b,0x00000007,0x0000006d,0x00000007,0x0004003b,0x00000007,0x0000006f,
>+	0x00000007,0x0004003b,0x00000007,0x00000072,0x00000007,0x0004003b,0x00000007,0x0000007c,
>+	0x00000007,0x0004003b,0x00000007,0x0000007d,0x00000007,0x0004003b,0x00000007,0x0000007f,
>+	0x00000007,0x0004003b,0x00000007,0x00000083,0x00000007,0x0004003b,0x00000007,0x00000087,
>+	0x00000007,0x0004003b,0x0000001a,0x0000008b,0x00000007,0x0004003b,0x00000007,0x00000096,
>+	0x00000007,0x0004003b,0x0000009c,0x0000009d,0x00000007,0x0004003b,0x0000001a,0x000000a7,
>+	0x00000007,0x0004003b,0x0000001a,0x000000aa,0x00000007,0x0004003d,0x00000006,0x00000058,
>+	0x00000017,0x00050041,0x0000002d,0x0000005a,0x0000002b,0x00000059,0x0004003d,0x00000006,
>+	0x0000005b,0x0000005a,0x00050086,0x00000006,0x0000005c,0x00000058,0x0000005b,0x0003003e,
>+	0x00000057,0x0000005c,0x0004003d,0x00000006,0x0000005e,0x00000017,0x00050041,0x0000002d,
>+	0x0000005f,0x0000002b,0x00000059,0x0004003d,0x00000006,0x00000060,0x0000005f,0x00050089,
>+	0x00000006,0x00000061,0x0000005e,0x00000060,0x0003003e,0x0000005d,0x00000061,0x0004003d,
>+	0x00000006,0x00000062,0x0000005d,0x00050041,0x0000002d,0x00000064,0x0000002b,0x00000063,
>+	0x0004003d,0x00000006,0x00000065,0x00000064,0x000500ae,0x00000066,0x00000067,0x00000062,
>+	0x00000065,0x000300f7,0x00000069,0x00000000,0x000400fa,0x00000067,0x00000068,0x00000069,
>+	0x000200f8,0x00000068,0x000200fe,0x0000006a,0x000200f8,0x00000069,0x0004003d,0x00000006,
>+	0x0000006e,0x00000057,0x0003003e,0x0000006d,0x0000006e,0x0004003d,0x00000006,0x00000070,
>+	0x0000005d,0x0003003e,0x0000006f,0x00000070,0x00060039,0x00000006,0x00000071,0x0000000b,
>+	0x0000006d,0x0000006f,0x0003003e,0x0000006c,0x00000071,0x0004003d,0x00000006,0x00000077,
>+	0x0000006c,0x00050086,0x00000006,0x00000078,0x00000077,0x00000050,0x00060041,0x00000079,
>+	0x0000007a,0x00000076,0x0000006a,0x00000078,0x0004003d,0x00000006,0x0000007b,0x0000007a,
>+	0x0003003e,0x00000072,0x0000007b,0x0004003d,0x00000006,0x0000007e,0x0000006c,0x0003003e,
>+	0x0000007d,0x0000007e,0x00050041,0x0000002d,0x00000080,0x0000002b,0x00000032,0x0004003d,
>+	0x00000006,0x00000081,0x00000080,0x0003003e,0x0000007f,0x00000081,0x00060039,0x00000006,
>+	0x00000082,0x00000013,0x0000007d,0x0000007f,0x0003003e,0x0000007c,0x00000082,0x00050041,
>+	0x0000002d,0x00000084,0x0000002b,0x00000032,0x0004003d,0x00000006,0x00000085,0x00000084,
>+	0x00050084,0x00000006,0x00000086,0x00000085,0x00000052,0x0003003e,0x00000083,0x00000086,
>+	0x0004003d,0x00000006,0x00000088,0x00000083,0x000500aa,0x00000066,0x0000008a,0x00000088,
>+	0x00000089,0x000300f7,0x0000008d,0x00000000,0x000400fa,0x0000008a,0x0000008c,0x0000008f,
>+	0x000200f8,0x0000008c,0x0003003e,0x0000008b,0x0000008e,0x000200f9,0x0000008d,0x000200f8,
>+	0x0000008f,0x0004003d,0x00000006,0x00000091,0x00000083,0x000500c4,0x00000015,0x00000092,
>+	0x00000090,0x00000091,0x00050082,0x00000015,0x00000093,0x00000092,0x00000090,0x0003003e,
>+	0x0000008b,0x00000093,0x000200f9,0x0000008d,0x000200f8,0x0000008d,0x0004003d,0x00000015,
>+	0x00000094,0x0000008b,0x0004007c,0x00000006,0x00000095,0x00000094,0x0003003e,0x00000087,
>+	0x00000095,0x0004003d,0x00000006,0x00000097,0x00000072,0x0004003d,0x00000006,0x00000098,
>+	0x0000007c,0x000500c2,0x00000006,0x00000099,0x00000097,0x00000098,0x0004003d,0x00000006,
>+	0x0000009a,0x00000087,0x000500c7,0x00000006,0x0000009b,0x00000099,0x0000009a,0x0003003e,
>+	0x00000096,0x0000009b,0x0004003d,0x00000006,0x0000009e,0x00000096,0x0004003d,0x00000006,
>+	0x0000009f,0x00000083,0x00050082,0x00000006,0x000000a1,0x0000009f,0x000000a0,0x000500c4,
>+	0x00000015,0x000000a2,0x00000090,0x000000a1,0x0004007c,0x00000006,0x000000a3,0x000000a2,
>+	0x000500c7,0x00000006,0x000000a4,0x0000009e,0x000000a3,0x000500ab,0x00000066,0x000000a6,
>+	0x000000a4,0x000000a5,0x0003003e,0x0000009d,0x000000a6,0x0004003d,0x00000006,0x000000a8,
>+	0x00000096,0x0004003d,0x00000066,0x000000a9,0x0000009d,0x000300f7,0x000000ac,0x00000000,
>+	0x000400fa,0x000000a9,0x000000ab,0x000000af,0x000200f8,0x000000ab,0x0004003d,0x00000006,
>+	0x000000ad,0x00000083,0x000500c4,0x00000015,0x000000ae,0x0000008e,0x000000ad,0x0003003e,
>+	0x000000aa,0x000000ae,0x000200f9,0x000000ac,0x000200f8,0x000000af,0x0003003e,0x000000aa,
>+	0x0000006a,0x000200f9,0x000000ac,0x000200f8,0x000000ac,0x0004003d,0x00000015,0x000000b0,
>+	0x000000aa,0x0004007c,0x00000006,0x000000b1,0x000000b0,0x000500c5,0x00000006,0x000000b2,
>+	0x000000a8,0x000000b1,0x0004007c,0x00000015,0x000000b3,0x000000b2,0x0003003e,0x000000a7,
>+	0x000000b3,0x0004003d,0x00000015,0x000000b4,0x000000a7,0x000200fe,0x000000b4,0x00010038,
>+	0x00050036,0x00000015,0x0000001d,0x00000000,0x0000001b,0x00030037,0x0000001a,0x0000001c,
>+	0x000200f8,0x0000001e,0x0004003d,0x00000015,0x000000b7,0x0000001c,0x000200fe,0x000000b7,
>+	0x00010038,0x00050036,0x00000006,0x00000022,0x00000000,0x0000001f,0x00030037,0x00000007,
>+	0x00000020,0x00030037,0x0000001a,0x00000021,0x000200f8,0x00000023,0x0004003b,0x00000007,
>+	0x000000ba,0x00000007,0x0004003b,0x00000007,0x000000bf,0x00000007,0x0004003b,0x00000007,
>+	0x000000c4,0x00000007,0x0004003b,0x00000007,0x000000c5,0x00000007,0x0004003b,0x00000007,
>+	0x000000c7,0x00000007,0x0004003b,0x00000007,0x000000ca,0x00000007,0x0004003b,0x00000007,
>+	0x000000cb,0x00000007,0x0004003b,0x00000007,0x000000cd,0x00000007,0x0004003b,0x00000007,
>+	0x000000d1,0x00000007,0x0004003b,0x00000007,0x000000d5,0x00000007,0x0004003b,0x0000001a,
>+	0x000000d8,0x00000007,0x0004003b,0x00000007,0x000000e1,0x00000007,0x0004003d,0x00000006,
>+	0x000000bb,0x00000020,0x00050041,0x0000002d,0x000000bc,0x0000002b,0x00000059,0x0004003d,
>+	0x00000006,0x000000bd,0x000000bc,0x00050086,0x00000006,0x000000be,0x000000bb,0x000000bd,
>+	0x0003003e,0x000000ba,0x000000be,0x0004003d,0x00000006,0x000000c0,0x00000020,0x00050041,
>+	0x0000002d,0x000000c1,0x0000002b,0x00000059,0x0004003d,0x00000006,0x000000c2,0x000000c1,
>+	0x00050089,0x00000006,0x000000c3,0x000000c0,0x000000c2,0x0003003e,0x000000bf,0x000000c3,
>+	0x0004003d,0x00000006,0x000000c6,0x000000ba,0x0003003e,0x000000c5,0x000000c6,0x0004003d,
>+	0x00000006,0x000000c8,0x000000bf,0x0003003e,0x000000c7,0x000000c8,0x00060039,0x00000006,
>+	0x000000c9,0x0000000f,0x000000c5,0x000000c7,0x0003003e,0x000000c4,0x000000c9,0x0004003d,
>+	0x00000006,0x000000cc,0x000000c4,0x0003003e,0x000000cb,0x000000cc,0x00050041,0x0000002d,
>+	0x000000ce,0x0000002b,0x00000043,0x0004003d,0x00000006,0x000000cf,0x000000ce,0x0003003e,
>+	0x000000cd,0x000000cf,0x00060039,0x00000006,0x000000d0,0x00000013,0x000000cb,0x000000cd,
>+	0x0003003e,0x000000ca,0x000000d0,0x00050041,0x0000002d,0x000000d2,0x0000002b,0x00000043,
>+	0x0004003d,0x00000006,0x000000d3,0x000000d2,0x00050084,0x00000006,0x000000d4,0x000000d3,
>+	0x00000052,0x0003003e,0x000000d1,0x000000d4,0x0004003d,0x00000006,0x000000d6,0x000000d1,
>+	0x000500aa,0x00000066,0x000000d7,0x000000d6,0x00000089,0x000300f7,0x000000da,0x00000000,
>+	0x000400fa,0x000000d7,0x000000d9,0x000000db,0x000200f8,0x000000d9,0x0003003e,0x000000d8,
>+	0x0000008e,0x000200f9,0x000000da,0x000200f8,0x000000db,0x0004003d,0x00000006,0x000000dc,
>+	0x000000d1,0x000500c4,0x00000015,0x000000dd,0x00000090,0x000000dc,0x00050082,0x00000015,
>+	0x000000de,0x000000dd,0x00000090,0x0003003e,0x000000d8,0x000000de,0x000200f9,0x000000da,
>+	0x000200f8,0x000000da,0x0004003d,0x00000015,0x000000df,0x000000d8,0x0004007c,0x00000006,
>+	0x000000e0,0x000000df,0x0003003e,0x000000d5,0x000000e0,0x0004003d,0x00000015,0x000000e2,
>+	0x00000021,0x0004007c,0x00000006,0x000000e3,0x000000e2,0x0004003d,0x00000006,0x000000e4,
>+	0x000000d5,0x000500c7,0x00000006,0x000000e5,0x000000e3,0x000000e4,0x0004003d,0x00000006,
>+	0x000000e6,0x000000ca,0x000500c4,0x00000006,0x000000e7,0x000000e5,0x000000e6,0x0003003e,
>+	0x000000e1,0x000000e7,0x0004003d,0x00000006,0x000000e8,0x000000e1,0x000200fe,0x000000e8,
>+	0x00010038,0x00050036,0x00000002,0x00000026,0x00000000,0x00000024,0x00030037,0x00000007,
>+	0x00000025,0x000200f8,0x00000027,0x00050041,0x000000f2,0x000000f3,0x000000f1,0x000000a5,
>+	0x0004003d,0x00000006,0x000000f4,0x000000f3,0x00050041,0x0000002d,0x000000f5,0x0000002b,
>+	0x00000048,0x0004003d,0x00000006,0x000000f6,0x000000f5,0x00050086,0x00000006,0x000000f7,
>+	0x000000f6,0x00000050,0x00050080,0x00000006,0x000000f8,0x000000f4,0x000000f7,0x0004003d,
>+	0x00000006,0x000000f9,0x00000025,0x00060041,0x00000079,0x000000fa,0x000000ee,0x0000006a,
>+	0x000000f8,0x0003003e,0x000000fa,0x000000f9,0x000100fd,0x00010038
>+};
>+
>+#if 0  // Generated from:
>+#version 450 core
>+
>+layout(local_size_x = 64, local_size_y = 1, local_size_z = 1)in;
>+
>+layout(set = 0, binding = 0)buffer dest
>+{
>+    uint destData[];
>+};
>+
>+layout(set = 0, binding = 1)buffer src
>+{
>+    uint srcData[];
>+};
>+
>+layout(push_constant)uniform PushConstants
>+{
>+
>+    uint outputCount;
>+
>+    uint componentCount;
>+
>+    uint srcOffset;
>+    uint destOffset;
>+
>+    uint Ns;
>+    uint Bs;
>+    uint Ss;
>+    uint Es;
>+
>+    uint Nd;
>+    uint Bd;
>+    uint Sd;
>+    uint Ed;
>+} params;
>+
>+uint getSourceComponentOffset(uint vertex, uint component)
>+{
>+    return vertex * params . Ss + component * params . Bs + params . srcOffset;
>+}
>+
>+uint getDestinationComponentOffset(uint vertex, uint component)
>+{
>+    return vertex * params . Sd + component * params . Bd + params . destOffset;
>+}
>+
>+uint getShiftBits(uint offset, uint B)
>+{
>+
>+    uint shift =(offset % 4)* 8;
>+
>+    return shift;
>+}
>+
>+      int loadSourceComponent(uint cd)
>+{
>+
>+    uint vertex = cd / params . Nd;
>+    uint component = cd % params . Nd;
>+
>+    if(component >= params . Ns)
>+    {
>+        return 0;
>+    }
>+
>+    uint offset = getSourceComponentOffset(vertex, component);
>+    uint block = srcData[offset / 4];
>+    uint shiftBits = getShiftBits(offset, params . Bs);
>+
>+    uint valueBits = params . Bs * 8;
>+    uint valueMask = valueBits == 32 ? - 1 :(1 << valueBits)- 1;
>+    uint valueAsUint =(block >> shiftBits)& valueMask;
>+
>+    bool isNegative =(valueAsUint &(1 <<(valueBits - 1)))!= 0;
>+
>+          int value = int(valueAsUint |(isNegative ? 0xFFFFFFFF << valueBits : 0));
>+
>+    return value;
>+}
>+
>+       int convertComponent(int srcValue)
>+{
>+
>+    return srcValue;
>+}
>+
>+uint makeDestinationComponent(uint cd, int value)
>+{
>+
>+    uint vertex = cd / params . Nd;
>+    uint component = cd % params . Nd;
>+
>+    uint offset = getDestinationComponentOffset(vertex, component);
>+    uint shiftBits = getShiftBits(offset, params . Bd);
>+
>+    uint valueBits = params . Bd * 8;
>+    uint valueMask = valueBits == 32 ? - 1 :(1 << valueBits)- 1;
>+    uint valueAsUint =(uint(value)& valueMask)<< shiftBits;
>+
>+    return valueAsUint;
>+}
>+
>+void storeDestinationComponents(uint valueAsUint)
>+{
>+
>+    destData[gl_GlobalInvocationID . x + params . destOffset / 4]= valueAsUint;
>+}
>+
>+void main()
>+{
>+
>+    uint valueOut = 0;
>+    for(uint i = 0;i < params . Ed;++ i)
>+    {
>+        uint cd = gl_GlobalInvocationID . x * params . Ed + i;
>+
>+              int srcValue = loadSourceComponent(cd);
>+               int destValue = convertComponent(srcValue);
>+        valueOut |= makeDestinationComponent(cd, destValue);
>+    }
>+
>+    storeDestinationComponents(valueOut);
>+}
>+#endif  // Preprocessed code
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.00000002.inc b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.00000002.inc
>new file mode 100644
>index 00000000000..7dcdb1cf9c0
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.00000002.inc
>@@ -0,0 +1,363 @@
>+	// 7.11.3188
>+	 #pragma once
>+const uint32_t kConvertVertex_comp_00000002[] = {
>+	0x07230203,0x00010000,0x00080007,0x0000011d,0x00000000,0x00020011,0x00000001,0x0006000b,
>+	0x00000001,0x4c534c47,0x6474732e,0x3035342e,0x00000000,0x0003000e,0x00000000,0x00000001,
>+	0x0006000f,0x00000005,0x00000004,0x6e69616d,0x00000000,0x000000d9,0x00060010,0x00000004,
>+	0x00000011,0x00000040,0x00000001,0x00000001,0x00030003,0x00000002,0x000001c2,0x00040005,
>+	0x00000004,0x6e69616d,0x00000000,0x000a0005,0x0000000b,0x53746567,0x6372756f,0x6d6f4365,
>+	0x656e6f70,0x664f746e,0x74657366,0x3b317528,0x003b3175,0x00040005,0x00000009,0x74726576,
>+	0x00007865,0x00050005,0x0000000a,0x706d6f63,0x6e656e6f,0x00000074,0x000c0005,0x0000000f,
>+	0x44746567,0x69747365,0x6974616e,0x6f436e6f,0x6e6f706d,0x4f746e65,0x65736666,0x31752874,
>+	0x3b31753b,0x00000000,0x00040005,0x0000000d,0x74726576,0x00007865,0x00050005,0x0000000e,
>+	0x706d6f63,0x6e656e6f,0x00000074,0x00070005,0x00000013,0x53746567,0x74666968,0x73746942,
>+	0x3b317528,0x003b3175,0x00040005,0x00000011,0x7366666f,0x00007465,0x00030005,0x00000012,
>+	0x00000042,0x00080005,0x00000017,0x64616f6c,0x72756f53,0x6f436563,0x6e6f706d,0x28746e65,
>+	0x003b3175,0x00030005,0x00000016,0x00006463,0x00080005,0x0000001a,0x766e6f63,0x43747265,
>+	0x6f706d6f,0x746e656e,0x3b317528,0x00000000,0x00050005,0x00000019,0x56637273,0x65756c61,
>+	0x00000000,0x000a0005,0x0000001e,0x656b616d,0x74736544,0x74616e69,0x436e6f69,0x6f706d6f,
>+	0x746e656e,0x3b317528,0x003b3175,0x00030005,0x0000001c,0x00006463,0x00040005,0x0000001d,
>+	0x756c6176,0x00000065,0x000a0005,0x00000022,0x726f7473,0x73654465,0x616e6974,0x6e6f6974,
>+	0x706d6f43,0x6e656e6f,0x75287374,0x00003b31,0x00050005,0x00000021,0x756c6176,0x55734165,
>+	0x00746e69,0x00060005,0x00000025,0x68737550,0x736e6f43,0x746e6174,0x00000073,0x00060006,
>+	0x00000025,0x00000000,0x7074756f,0x6f437475,0x00746e75,0x00070006,0x00000025,0x00000001,
>+	0x706d6f63,0x6e656e6f,0x756f4374,0x0000746e,0x00060006,0x00000025,0x00000002,0x4f637273,
>+	0x65736666,0x00000074,0x00060006,0x00000025,0x00000003,0x74736564,0x7366664f,0x00007465,
>+	0x00040006,0x00000025,0x00000004,0x0000734e,0x00040006,0x00000025,0x00000005,0x00007342,
>+	0x00040006,0x00000025,0x00000006,0x00007353,0x00040006,0x00000025,0x00000007,0x00007345,
>+	0x00040006,0x00000025,0x00000008,0x0000644e,0x00040006,0x00000025,0x00000009,0x00006442,
>+	0x00040006,0x00000025,0x0000000a,0x00006453,0x00040006,0x00000025,0x0000000b,0x00006445,
>+	0x00040005,0x00000027,0x61726170,0x0000736d,0x00040005,0x0000004b,0x66696873,0x00000074,
>+	0x00040005,0x00000054,0x74726576,0x00007865,0x00050005,0x0000005a,0x706d6f63,0x6e656e6f,
>+	0x00000074,0x00040005,0x00000069,0x7366666f,0x00007465,0x00040005,0x0000006a,0x61726170,
>+	0x0000006d,0x00040005,0x0000006c,0x61726170,0x0000006d,0x00040005,0x0000006f,0x636f6c62,
>+	0x0000006b,0x00030005,0x00000071,0x00637273,0x00050006,0x00000071,0x00000000,0x44637273,
>+	0x00617461,0x00030005,0x00000073,0x00000000,0x00050005,0x0000007a,0x66696873,0x74694274,
>+	0x00000073,0x00040005,0x0000007b,0x61726170,0x0000006d,0x00040005,0x0000007d,0x61726170,
>+	0x0000006d,0x00050005,0x00000081,0x756c6176,0x74694265,0x00000073,0x00050005,0x00000085,
>+	0x756c6176,0x73614d65,0x0000006b,0x00050005,0x00000095,0x756c6176,0x55734165,0x00746e69,
>+	0x00040005,0x0000009b,0x756c6176,0x00000065,0x00040005,0x000000a3,0x74726576,0x00007865,
>+	0x00050005,0x000000a8,0x706d6f63,0x6e656e6f,0x00000074,0x00040005,0x000000ad,0x7366666f,
>+	0x00007465,0x00040005,0x000000ae,0x61726170,0x0000006d,0x00040005,0x000000b0,0x61726170,
>+	0x0000006d,0x00050005,0x000000b3,0x66696873,0x74694274,0x00000073,0x00040005,0x000000b4,
>+	0x61726170,0x0000006d,0x00040005,0x000000b6,0x61726170,0x0000006d,0x00050005,0x000000ba,
>+	0x756c6176,0x74694265,0x00000073,0x00050005,0x000000be,0x756c6176,0x73614d65,0x0000006b,
>+	0x00050005,0x000000ca,0x756c6176,0x55734165,0x00746e69,0x00040005,0x000000d4,0x74736564,
>+	0x00000000,0x00060006,0x000000d4,0x00000000,0x74736564,0x61746144,0x00000000,0x00030005,
>+	0x000000d6,0x00000000,0x00080005,0x000000d9,0x475f6c67,0x61626f6c,0x766e496c,0x7461636f,
>+	0x496e6f69,0x00000044,0x00050005,0x000000eb,0x756c6176,0x74754f65,0x00000000,0x00030005,
>+	0x000000ec,0x00000069,0x00030005,0x000000f7,0x00006463,0x00050005,0x00000106,0x56637273,
>+	0x65756c61,0x00000000,0x00040005,0x00000107,0x61726170,0x0000006d,0x00050005,0x0000010a,
>+	0x74736564,0x756c6156,0x00000065,0x00040005,0x0000010b,0x61726170,0x0000006d,0x00040005,
>+	0x0000010e,0x61726170,0x0000006d,0x00040005,0x00000110,0x61726170,0x0000006d,0x00040005,
>+	0x00000117,0x61726170,0x0000006d,0x00050048,0x00000025,0x00000000,0x00000023,0x00000000,
>+	0x00050048,0x00000025,0x00000001,0x00000023,0x00000004,0x00050048,0x00000025,0x00000002,
>+	0x00000023,0x00000008,0x00050048,0x00000025,0x00000003,0x00000023,0x0000000c,0x00050048,
>+	0x00000025,0x00000004,0x00000023,0x00000010,0x00050048,0x00000025,0x00000005,0x00000023,
>+	0x00000014,0x00050048,0x00000025,0x00000006,0x00000023,0x00000018,0x00050048,0x00000025,
>+	0x00000007,0x00000023,0x0000001c,0x00050048,0x00000025,0x00000008,0x00000023,0x00000020,
>+	0x00050048,0x00000025,0x00000009,0x00000023,0x00000024,0x00050048,0x00000025,0x0000000a,
>+	0x00000023,0x00000028,0x00050048,0x00000025,0x0000000b,0x00000023,0x0000002c,0x00030047,
>+	0x00000025,0x00000002,0x00040047,0x00000070,0x00000006,0x00000004,0x00050048,0x00000071,
>+	0x00000000,0x00000023,0x00000000,0x00030047,0x00000071,0x00000003,0x00040047,0x00000073,
>+	0x00000022,0x00000000,0x00040047,0x00000073,0x00000021,0x00000001,0x00040047,0x000000d3,
>+	0x00000006,0x00000004,0x00050048,0x000000d4,0x00000000,0x00000023,0x00000000,0x00030047,
>+	0x000000d4,0x00000003,0x00040047,0x000000d6,0x00000022,0x00000000,0x00040047,0x000000d6,
>+	0x00000021,0x00000000,0x00040047,0x000000d9,0x0000000b,0x0000001c,0x00040047,0x0000011c,
>+	0x0000000b,0x00000019,0x00020013,0x00000002,0x00030021,0x00000003,0x00000002,0x00040015,
>+	0x00000006,0x00000020,0x00000000,0x00040020,0x00000007,0x00000007,0x00000006,0x00050021,
>+	0x00000008,0x00000006,0x00000007,0x00000007,0x00040021,0x00000015,0x00000006,0x00000007,
>+	0x00040021,0x00000020,0x00000002,0x00000007,0x000e001e,0x00000025,0x00000006,0x00000006,
>+	0x00000006,0x00000006,0x00000006,0x00000006,0x00000006,0x00000006,0x00000006,0x00000006,
>+	0x00000006,0x00000006,0x00040020,0x00000026,0x00000009,0x00000025,0x0004003b,0x00000026,
>+	0x00000027,0x00000009,0x00040015,0x00000028,0x00000020,0x00000001,0x0004002b,0x00000028,
>+	0x00000029,0x00000006,0x00040020,0x0000002a,0x00000009,0x00000006,0x0004002b,0x00000028,
>+	0x0000002f,0x00000005,0x0004002b,0x00000028,0x00000034,0x00000002,0x0004002b,0x00000028,
>+	0x0000003b,0x0000000a,0x0004002b,0x00000028,0x00000040,0x00000009,0x0004002b,0x00000028,
>+	0x00000045,0x00000003,0x0004002b,0x00000006,0x0000004d,0x00000004,0x0004002b,0x00000006,
>+	0x0000004f,0x00000008,0x0004002b,0x00000028,0x00000056,0x00000008,0x0004002b,0x00000028,
>+	0x00000060,0x00000004,0x00020014,0x00000063,0x0004002b,0x00000006,0x00000067,0x00000000,
>+	0x0003001d,0x00000070,0x00000006,0x0003001e,0x00000071,0x00000070,0x00040020,0x00000072,
>+	0x00000002,0x00000071,0x0004003b,0x00000072,0x00000073,0x00000002,0x0004002b,0x00000028,
>+	0x00000074,0x00000000,0x00040020,0x00000077,0x00000002,0x00000006,0x0004002b,0x00000006,
>+	0x00000087,0x00000020,0x00040020,0x00000089,0x00000007,0x00000028,0x0004002b,0x00000028,
>+	0x0000008d,0xffffffff,0x0004002b,0x00000028,0x0000008f,0x00000001,0x0003001d,0x000000d3,
>+	0x00000006,0x0003001e,0x000000d4,0x000000d3,0x00040020,0x000000d5,0x00000002,0x000000d4,
>+	0x0004003b,0x000000d5,0x000000d6,0x00000002,0x00040017,0x000000d7,0x00000006,0x00000003,
>+	0x00040020,0x000000d8,0x00000001,0x000000d7,0x0004003b,0x000000d8,0x000000d9,0x00000001,
>+	0x00040020,0x000000da,0x00000001,0x00000006,0x0004002b,0x00000028,0x000000f3,0x0000000b,
>+	0x0004002b,0x00000006,0x0000011a,0x00000040,0x0004002b,0x00000006,0x0000011b,0x00000001,
>+	0x0006002c,0x000000d7,0x0000011c,0x0000011a,0x0000011b,0x0000011b,0x00050036,0x00000002,
>+	0x00000004,0x00000000,0x00000003,0x000200f8,0x00000005,0x0004003b,0x00000007,0x000000eb,
>+	0x00000007,0x0004003b,0x00000007,0x000000ec,0x00000007,0x0004003b,0x00000007,0x000000f7,
>+	0x00000007,0x0004003b,0x00000007,0x00000106,0x00000007,0x0004003b,0x00000007,0x00000107,
>+	0x00000007,0x0004003b,0x00000007,0x0000010a,0x00000007,0x0004003b,0x00000007,0x0000010b,
>+	0x00000007,0x0004003b,0x00000007,0x0000010e,0x00000007,0x0004003b,0x00000007,0x00000110,
>+	0x00000007,0x0004003b,0x00000007,0x00000117,0x00000007,0x00050041,0x000000da,0x000000e3,
>+	0x000000d9,0x00000067,0x0004003d,0x00000006,0x000000e4,0x000000e3,0x00050041,0x0000002a,
>+	0x000000e5,0x00000027,0x00000074,0x0004003d,0x00000006,0x000000e6,0x000000e5,0x000500ae,
>+	0x00000063,0x000000e7,0x000000e4,0x000000e6,0x000300f7,0x000000e9,0x00000000,0x000400fa,
>+	0x000000e7,0x000000e8,0x000000e9,0x000200f8,0x000000e8,0x000100fd,0x000200f8,0x000000e9,
>+	0x0003003e,0x000000eb,0x00000067,0x0003003e,0x000000ec,0x00000067,0x000200f9,0x000000ed,
>+	0x000200f8,0x000000ed,0x000400f6,0x000000ef,0x000000f0,0x00000000,0x000200f9,0x000000f1,
>+	0x000200f8,0x000000f1,0x0004003d,0x00000006,0x000000f2,0x000000ec,0x00050041,0x0000002a,
>+	0x000000f4,0x00000027,0x000000f3,0x0004003d,0x00000006,0x000000f5,0x000000f4,0x000500b0,
>+	0x00000063,0x000000f6,0x000000f2,0x000000f5,0x000400fa,0x000000f6,0x000000ee,0x000000ef,
>+	0x000200f8,0x000000ee,0x00050041,0x000000da,0x000000f8,0x000000d9,0x00000067,0x0004003d,
>+	0x00000006,0x000000f9,0x000000f8,0x00050041,0x0000002a,0x000000fa,0x00000027,0x000000f3,
>+	0x0004003d,0x00000006,0x000000fb,0x000000fa,0x00050084,0x00000006,0x000000fc,0x000000f9,
>+	0x000000fb,0x0004003d,0x00000006,0x000000fd,0x000000ec,0x00050080,0x00000006,0x000000fe,
>+	0x000000fc,0x000000fd,0x0003003e,0x000000f7,0x000000fe,0x0004003d,0x00000006,0x000000ff,
>+	0x000000f7,0x00050041,0x0000002a,0x00000100,0x00000027,0x0000008f,0x0004003d,0x00000006,
>+	0x00000101,0x00000100,0x000500ae,0x00000063,0x00000102,0x000000ff,0x00000101,0x000300f7,
>+	0x00000104,0x00000000,0x000400fa,0x00000102,0x00000103,0x00000104,0x000200f8,0x00000103,
>+	0x000200f9,0x000000ef,0x000200f8,0x00000104,0x0004003d,0x00000006,0x00000108,0x000000f7,
>+	0x0003003e,0x00000107,0x00000108,0x00050039,0x00000006,0x00000109,0x00000017,0x00000107,
>+	0x0003003e,0x00000106,0x00000109,0x0004003d,0x00000006,0x0000010c,0x00000106,0x0003003e,
>+	0x0000010b,0x0000010c,0x00050039,0x00000006,0x0000010d,0x0000001a,0x0000010b,0x0003003e,
>+	0x0000010a,0x0000010d,0x0004003d,0x00000006,0x0000010f,0x000000f7,0x0003003e,0x0000010e,
>+	0x0000010f,0x0004003d,0x00000006,0x00000111,0x0000010a,0x0003003e,0x00000110,0x00000111,
>+	0x00060039,0x00000006,0x00000112,0x0000001e,0x0000010e,0x00000110,0x0004003d,0x00000006,
>+	0x00000113,0x000000eb,0x000500c5,0x00000006,0x00000114,0x00000113,0x00000112,0x0003003e,
>+	0x000000eb,0x00000114,0x000200f9,0x000000f0,0x000200f8,0x000000f0,0x0004003d,0x00000006,
>+	0x00000115,0x000000ec,0x00050080,0x00000006,0x00000116,0x00000115,0x0000008f,0x0003003e,
>+	0x000000ec,0x00000116,0x000200f9,0x000000ed,0x000200f8,0x000000ef,0x0004003d,0x00000006,
>+	0x00000118,0x000000eb,0x0003003e,0x00000117,0x00000118,0x00050039,0x00000002,0x00000119,
>+	0x00000022,0x00000117,0x000100fd,0x00010038,0x00050036,0x00000006,0x0000000b,0x00000000,
>+	0x00000008,0x00030037,0x00000007,0x00000009,0x00030037,0x00000007,0x0000000a,0x000200f8,
>+	0x0000000c,0x0004003d,0x00000006,0x00000024,0x00000009,0x00050041,0x0000002a,0x0000002b,
>+	0x00000027,0x00000029,0x0004003d,0x00000006,0x0000002c,0x0000002b,0x00050084,0x00000006,
>+	0x0000002d,0x00000024,0x0000002c,0x0004003d,0x00000006,0x0000002e,0x0000000a,0x00050041,
>+	0x0000002a,0x00000030,0x00000027,0x0000002f,0x0004003d,0x00000006,0x00000031,0x00000030,
>+	0x00050084,0x00000006,0x00000032,0x0000002e,0x00000031,0x00050080,0x00000006,0x00000033,
>+	0x0000002d,0x00000032,0x00050041,0x0000002a,0x00000035,0x00000027,0x00000034,0x0004003d,
>+	0x00000006,0x00000036,0x00000035,0x00050080,0x00000006,0x00000037,0x00000033,0x00000036,
>+	0x000200fe,0x00000037,0x00010038,0x00050036,0x00000006,0x0000000f,0x00000000,0x00000008,
>+	0x00030037,0x00000007,0x0000000d,0x00030037,0x00000007,0x0000000e,0x000200f8,0x00000010,
>+	0x0004003d,0x00000006,0x0000003a,0x0000000d,0x00050041,0x0000002a,0x0000003c,0x00000027,
>+	0x0000003b,0x0004003d,0x00000006,0x0000003d,0x0000003c,0x00050084,0x00000006,0x0000003e,
>+	0x0000003a,0x0000003d,0x0004003d,0x00000006,0x0000003f,0x0000000e,0x00050041,0x0000002a,
>+	0x00000041,0x00000027,0x00000040,0x0004003d,0x00000006,0x00000042,0x00000041,0x00050084,
>+	0x00000006,0x00000043,0x0000003f,0x00000042,0x00050080,0x00000006,0x00000044,0x0000003e,
>+	0x00000043,0x00050041,0x0000002a,0x00000046,0x00000027,0x00000045,0x0004003d,0x00000006,
>+	0x00000047,0x00000046,0x00050080,0x00000006,0x00000048,0x00000044,0x00000047,0x000200fe,
>+	0x00000048,0x00010038,0x00050036,0x00000006,0x00000013,0x00000000,0x00000008,0x00030037,
>+	0x00000007,0x00000011,0x00030037,0x00000007,0x00000012,0x000200f8,0x00000014,0x0004003b,
>+	0x00000007,0x0000004b,0x00000007,0x0004003d,0x00000006,0x0000004c,0x00000011,0x00050089,
>+	0x00000006,0x0000004e,0x0000004c,0x0000004d,0x00050084,0x00000006,0x00000050,0x0000004e,
>+	0x0000004f,0x0003003e,0x0000004b,0x00000050,0x0004003d,0x00000006,0x00000051,0x0000004b,
>+	0x000200fe,0x00000051,0x00010038,0x00050036,0x00000006,0x00000017,0x00000000,0x00000015,
>+	0x00030037,0x00000007,0x00000016,0x000200f8,0x00000018,0x0004003b,0x00000007,0x00000054,
>+	0x00000007,0x0004003b,0x00000007,0x0000005a,0x00000007,0x0004003b,0x00000007,0x00000069,
>+	0x00000007,0x0004003b,0x00000007,0x0000006a,0x00000007,0x0004003b,0x00000007,0x0000006c,
>+	0x00000007,0x0004003b,0x00000007,0x0000006f,0x00000007,0x0004003b,0x00000007,0x0000007a,
>+	0x00000007,0x0004003b,0x00000007,0x0000007b,0x00000007,0x0004003b,0x00000007,0x0000007d,
>+	0x00000007,0x0004003b,0x00000007,0x00000081,0x00000007,0x0004003b,0x00000007,0x00000085,
>+	0x00000007,0x0004003b,0x00000089,0x0000008a,0x00000007,0x0004003b,0x00000007,0x00000095,
>+	0x00000007,0x0004003b,0x00000007,0x0000009b,0x00000007,0x0004003d,0x00000006,0x00000055,
>+	0x00000016,0x00050041,0x0000002a,0x00000057,0x00000027,0x00000056,0x0004003d,0x00000006,
>+	0x00000058,0x00000057,0x00050086,0x00000006,0x00000059,0x00000055,0x00000058,0x0003003e,
>+	0x00000054,0x00000059,0x0004003d,0x00000006,0x0000005b,0x00000016,0x00050041,0x0000002a,
>+	0x0000005c,0x00000027,0x00000056,0x0004003d,0x00000006,0x0000005d,0x0000005c,0x00050089,
>+	0x00000006,0x0000005e,0x0000005b,0x0000005d,0x0003003e,0x0000005a,0x0000005e,0x0004003d,
>+	0x00000006,0x0000005f,0x0000005a,0x00050041,0x0000002a,0x00000061,0x00000027,0x00000060,
>+	0x0004003d,0x00000006,0x00000062,0x00000061,0x000500ae,0x00000063,0x00000064,0x0000005f,
>+	0x00000062,0x000300f7,0x00000066,0x00000000,0x000400fa,0x00000064,0x00000065,0x00000066,
>+	0x000200f8,0x00000065,0x000200fe,0x00000067,0x000200f8,0x00000066,0x0004003d,0x00000006,
>+	0x0000006b,0x00000054,0x0003003e,0x0000006a,0x0000006b,0x0004003d,0x00000006,0x0000006d,
>+	0x0000005a,0x0003003e,0x0000006c,0x0000006d,0x00060039,0x00000006,0x0000006e,0x0000000b,
>+	0x0000006a,0x0000006c,0x0003003e,0x00000069,0x0000006e,0x0004003d,0x00000006,0x00000075,
>+	0x00000069,0x00050086,0x00000006,0x00000076,0x00000075,0x0000004d,0x00060041,0x00000077,
>+	0x00000078,0x00000073,0x00000074,0x00000076,0x0004003d,0x00000006,0x00000079,0x00000078,
>+	0x0003003e,0x0000006f,0x00000079,0x0004003d,0x00000006,0x0000007c,0x00000069,0x0003003e,
>+	0x0000007b,0x0000007c,0x00050041,0x0000002a,0x0000007e,0x00000027,0x0000002f,0x0004003d,
>+	0x00000006,0x0000007f,0x0000007e,0x0003003e,0x0000007d,0x0000007f,0x00060039,0x00000006,
>+	0x00000080,0x00000013,0x0000007b,0x0000007d,0x0003003e,0x0000007a,0x00000080,0x00050041,
>+	0x0000002a,0x00000082,0x00000027,0x0000002f,0x0004003d,0x00000006,0x00000083,0x00000082,
>+	0x00050084,0x00000006,0x00000084,0x00000083,0x0000004f,0x0003003e,0x00000081,0x00000084,
>+	0x0004003d,0x00000006,0x00000086,0x00000081,0x000500aa,0x00000063,0x00000088,0x00000086,
>+	0x00000087,0x000300f7,0x0000008c,0x00000000,0x000400fa,0x00000088,0x0000008b,0x0000008e,
>+	0x000200f8,0x0000008b,0x0003003e,0x0000008a,0x0000008d,0x000200f9,0x0000008c,0x000200f8,
>+	0x0000008e,0x0004003d,0x00000006,0x00000090,0x00000081,0x000500c4,0x00000028,0x00000091,
>+	0x0000008f,0x00000090,0x00050082,0x00000028,0x00000092,0x00000091,0x0000008f,0x0003003e,
>+	0x0000008a,0x00000092,0x000200f9,0x0000008c,0x000200f8,0x0000008c,0x0004003d,0x00000028,
>+	0x00000093,0x0000008a,0x0004007c,0x00000006,0x00000094,0x00000093,0x0003003e,0x00000085,
>+	0x00000094,0x0004003d,0x00000006,0x00000096,0x0000006f,0x0004003d,0x00000006,0x00000097,
>+	0x0000007a,0x000500c2,0x00000006,0x00000098,0x00000096,0x00000097,0x0004003d,0x00000006,
>+	0x00000099,0x00000085,0x000500c7,0x00000006,0x0000009a,0x00000098,0x00000099,0x0003003e,
>+	0x00000095,0x0000009a,0x0004003d,0x00000006,0x0000009c,0x00000095,0x0003003e,0x0000009b,
>+	0x0000009c,0x0004003d,0x00000006,0x0000009d,0x0000009b,0x000200fe,0x0000009d,0x00010038,
>+	0x00050036,0x00000006,0x0000001a,0x00000000,0x00000015,0x00030037,0x00000007,0x00000019,
>+	0x000200f8,0x0000001b,0x0004003d,0x00000006,0x000000a0,0x00000019,0x000200fe,0x000000a0,
>+	0x00010038,0x00050036,0x00000006,0x0000001e,0x00000000,0x00000008,0x00030037,0x00000007,
>+	0x0000001c,0x00030037,0x00000007,0x0000001d,0x000200f8,0x0000001f,0x0004003b,0x00000007,
>+	0x000000a3,0x00000007,0x0004003b,0x00000007,0x000000a8,0x00000007,0x0004003b,0x00000007,
>+	0x000000ad,0x00000007,0x0004003b,0x00000007,0x000000ae,0x00000007,0x0004003b,0x00000007,
>+	0x000000b0,0x00000007,0x0004003b,0x00000007,0x000000b3,0x00000007,0x0004003b,0x00000007,
>+	0x000000b4,0x00000007,0x0004003b,0x00000007,0x000000b6,0x00000007,0x0004003b,0x00000007,
>+	0x000000ba,0x00000007,0x0004003b,0x00000007,0x000000be,0x00000007,0x0004003b,0x00000089,
>+	0x000000c1,0x00000007,0x0004003b,0x00000007,0x000000ca,0x00000007,0x0004003d,0x00000006,
>+	0x000000a4,0x0000001c,0x00050041,0x0000002a,0x000000a5,0x00000027,0x00000056,0x0004003d,
>+	0x00000006,0x000000a6,0x000000a5,0x00050086,0x00000006,0x000000a7,0x000000a4,0x000000a6,
>+	0x0003003e,0x000000a3,0x000000a7,0x0004003d,0x00000006,0x000000a9,0x0000001c,0x00050041,
>+	0x0000002a,0x000000aa,0x00000027,0x00000056,0x0004003d,0x00000006,0x000000ab,0x000000aa,
>+	0x00050089,0x00000006,0x000000ac,0x000000a9,0x000000ab,0x0003003e,0x000000a8,0x000000ac,
>+	0x0004003d,0x00000006,0x000000af,0x000000a3,0x0003003e,0x000000ae,0x000000af,0x0004003d,
>+	0x00000006,0x000000b1,0x000000a8,0x0003003e,0x000000b0,0x000000b1,0x00060039,0x00000006,
>+	0x000000b2,0x0000000f,0x000000ae,0x000000b0,0x0003003e,0x000000ad,0x000000b2,0x0004003d,
>+	0x00000006,0x000000b5,0x000000ad,0x0003003e,0x000000b4,0x000000b5,0x00050041,0x0000002a,
>+	0x000000b7,0x00000027,0x00000040,0x0004003d,0x00000006,0x000000b8,0x000000b7,0x0003003e,
>+	0x000000b6,0x000000b8,0x00060039,0x00000006,0x000000b9,0x00000013,0x000000b4,0x000000b6,
>+	0x0003003e,0x000000b3,0x000000b9,0x00050041,0x0000002a,0x000000bb,0x00000027,0x00000040,
>+	0x0004003d,0x00000006,0x000000bc,0x000000bb,0x00050084,0x00000006,0x000000bd,0x000000bc,
>+	0x0000004f,0x0003003e,0x000000ba,0x000000bd,0x0004003d,0x00000006,0x000000bf,0x000000ba,
>+	0x000500aa,0x00000063,0x000000c0,0x000000bf,0x00000087,0x000300f7,0x000000c3,0x00000000,
>+	0x000400fa,0x000000c0,0x000000c2,0x000000c4,0x000200f8,0x000000c2,0x0003003e,0x000000c1,
>+	0x0000008d,0x000200f9,0x000000c3,0x000200f8,0x000000c4,0x0004003d,0x00000006,0x000000c5,
>+	0x000000ba,0x000500c4,0x00000028,0x000000c6,0x0000008f,0x000000c5,0x00050082,0x00000028,
>+	0x000000c7,0x000000c6,0x0000008f,0x0003003e,0x000000c1,0x000000c7,0x000200f9,0x000000c3,
>+	0x000200f8,0x000000c3,0x0004003d,0x00000028,0x000000c8,0x000000c1,0x0004007c,0x00000006,
>+	0x000000c9,0x000000c8,0x0003003e,0x000000be,0x000000c9,0x0004003d,0x00000006,0x000000cb,
>+	0x0000001d,0x0004003d,0x00000006,0x000000cc,0x000000be,0x000500c7,0x00000006,0x000000cd,
>+	0x000000cb,0x000000cc,0x0004003d,0x00000006,0x000000ce,0x000000b3,0x000500c4,0x00000006,
>+	0x000000cf,0x000000cd,0x000000ce,0x0003003e,0x000000ca,0x000000cf,0x0004003d,0x00000006,
>+	0x000000d0,0x000000ca,0x000200fe,0x000000d0,0x00010038,0x00050036,0x00000002,0x00000022,
>+	0x00000000,0x00000020,0x00030037,0x00000007,0x00000021,0x000200f8,0x00000023,0x00050041,
>+	0x000000da,0x000000db,0x000000d9,0x00000067,0x0004003d,0x00000006,0x000000dc,0x000000db,
>+	0x00050041,0x0000002a,0x000000dd,0x00000027,0x00000045,0x0004003d,0x00000006,0x000000de,
>+	0x000000dd,0x00050086,0x00000006,0x000000df,0x000000de,0x0000004d,0x00050080,0x00000006,
>+	0x000000e0,0x000000dc,0x000000df,0x0004003d,0x00000006,0x000000e1,0x00000021,0x00060041,
>+	0x00000077,0x000000e2,0x000000d6,0x00000074,0x000000e0,0x0003003e,0x000000e2,0x000000e1,
>+	0x000100fd,0x00010038
>+};
>+
>+#if 0  // Generated from:
>+#version 450 core
>+
>+layout(local_size_x = 64, local_size_y = 1, local_size_z = 1)in;
>+
>+layout(set = 0, binding = 0)buffer dest
>+{
>+    uint destData[];
>+};
>+
>+layout(set = 0, binding = 1)buffer src
>+{
>+    uint srcData[];
>+};
>+
>+layout(push_constant)uniform PushConstants
>+{
>+
>+    uint outputCount;
>+
>+    uint componentCount;
>+
>+    uint srcOffset;
>+    uint destOffset;
>+
>+    uint Ns;
>+    uint Bs;
>+    uint Ss;
>+    uint Es;
>+
>+    uint Nd;
>+    uint Bd;
>+    uint Sd;
>+    uint Ed;
>+} params;
>+
>+uint getSourceComponentOffset(uint vertex, uint component)
>+{
>+    return vertex * params . Ss + component * params . Bs + params . srcOffset;
>+}
>+
>+uint getDestinationComponentOffset(uint vertex, uint component)
>+{
>+    return vertex * params . Sd + component * params . Bd + params . destOffset;
>+}
>+
>+uint getShiftBits(uint offset, uint B)
>+{
>+
>+    uint shift =(offset % 4)* 8;
>+
>+    return shift;
>+}
>+
>+      uint loadSourceComponent(uint cd)
>+{
>+
>+    uint vertex = cd / params . Nd;
>+    uint component = cd % params . Nd;
>+
>+    if(component >= params . Ns)
>+    {
>+        return 0;
>+    }
>+
>+    uint offset = getSourceComponentOffset(vertex, component);
>+    uint block = srcData[offset / 4];
>+    uint shiftBits = getShiftBits(offset, params . Bs);
>+
>+    uint valueBits = params . Bs * 8;
>+    uint valueMask = valueBits == 32 ? - 1 :(1 << valueBits)- 1;
>+    uint valueAsUint =(block >> shiftBits)& valueMask;
>+
>+          uint value = valueAsUint;
>+
>+    return value;
>+}
>+
>+       uint convertComponent(uint srcValue)
>+{
>+
>+    return srcValue;
>+}
>+
>+uint makeDestinationComponent(uint cd, uint value)
>+{
>+
>+    uint vertex = cd / params . Nd;
>+    uint component = cd % params . Nd;
>+
>+    uint offset = getDestinationComponentOffset(vertex, component);
>+    uint shiftBits = getShiftBits(offset, params . Bd);
>+
>+    uint valueBits = params . Bd * 8;
>+    uint valueMask = valueBits == 32 ? - 1 :(1 << valueBits)- 1;
>+    uint valueAsUint =(uint(value)& valueMask)<< shiftBits;
>+
>+    return valueAsUint;
>+}
>+
>+void storeDestinationComponents(uint valueAsUint)
>+{
>+
>+    destData[gl_GlobalInvocationID . x + params . destOffset / 4]= valueAsUint;
>+}
>+
>+void main()
>+{
>+
>+    if(gl_GlobalInvocationID . x >= params . outputCount)
>+        return;
>+
>+    uint valueOut = 0;
>+    for(uint i = 0;i < params . Ed;++ i)
>+    {
>+        uint cd = gl_GlobalInvocationID . x * params . Ed + i;
>+
>+        if(cd >= params . componentCount)
>+        {
>+            break;
>+        }
>+
>+              uint srcValue = loadSourceComponent(cd);
>+               uint destValue = convertComponent(srcValue);
>+        valueOut |= makeDestinationComponent(cd, destValue);
>+    }
>+
>+    storeDestinationComponents(valueOut);
>+}
>+#endif  // Preprocessed code
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.00000003.inc b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.00000003.inc
>new file mode 100644
>index 00000000000..beefdfa5641
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.00000003.inc
>@@ -0,0 +1,346 @@
>+	// 7.11.3188
>+	 #pragma once
>+const uint32_t kConvertVertex_comp_00000003[] = {
>+	0x07230203,0x00010000,0x00080007,0x0000010e,0x00000000,0x00020011,0x00000001,0x0006000b,
>+	0x00000001,0x4c534c47,0x6474732e,0x3035342e,0x00000000,0x0003000e,0x00000000,0x00000001,
>+	0x0006000f,0x00000005,0x00000004,0x6e69616d,0x00000000,0x000000d9,0x00060010,0x00000004,
>+	0x00000011,0x00000040,0x00000001,0x00000001,0x00030003,0x00000002,0x000001c2,0x00040005,
>+	0x00000004,0x6e69616d,0x00000000,0x000a0005,0x0000000b,0x53746567,0x6372756f,0x6d6f4365,
>+	0x656e6f70,0x664f746e,0x74657366,0x3b317528,0x003b3175,0x00040005,0x00000009,0x74726576,
>+	0x00007865,0x00050005,0x0000000a,0x706d6f63,0x6e656e6f,0x00000074,0x000c0005,0x0000000f,
>+	0x44746567,0x69747365,0x6974616e,0x6f436e6f,0x6e6f706d,0x4f746e65,0x65736666,0x31752874,
>+	0x3b31753b,0x00000000,0x00040005,0x0000000d,0x74726576,0x00007865,0x00050005,0x0000000e,
>+	0x706d6f63,0x6e656e6f,0x00000074,0x00070005,0x00000013,0x53746567,0x74666968,0x73746942,
>+	0x3b317528,0x003b3175,0x00040005,0x00000011,0x7366666f,0x00007465,0x00030005,0x00000012,
>+	0x00000042,0x00080005,0x00000017,0x64616f6c,0x72756f53,0x6f436563,0x6e6f706d,0x28746e65,
>+	0x003b3175,0x00030005,0x00000016,0x00006463,0x00080005,0x0000001a,0x766e6f63,0x43747265,
>+	0x6f706d6f,0x746e656e,0x3b317528,0x00000000,0x00050005,0x00000019,0x56637273,0x65756c61,
>+	0x00000000,0x000a0005,0x0000001e,0x656b616d,0x74736544,0x74616e69,0x436e6f69,0x6f706d6f,
>+	0x746e656e,0x3b317528,0x003b3175,0x00030005,0x0000001c,0x00006463,0x00040005,0x0000001d,
>+	0x756c6176,0x00000065,0x000a0005,0x00000022,0x726f7473,0x73654465,0x616e6974,0x6e6f6974,
>+	0x706d6f43,0x6e656e6f,0x75287374,0x00003b31,0x00050005,0x00000021,0x756c6176,0x55734165,
>+	0x00746e69,0x00060005,0x00000025,0x68737550,0x736e6f43,0x746e6174,0x00000073,0x00060006,
>+	0x00000025,0x00000000,0x7074756f,0x6f437475,0x00746e75,0x00070006,0x00000025,0x00000001,
>+	0x706d6f63,0x6e656e6f,0x756f4374,0x0000746e,0x00060006,0x00000025,0x00000002,0x4f637273,
>+	0x65736666,0x00000074,0x00060006,0x00000025,0x00000003,0x74736564,0x7366664f,0x00007465,
>+	0x00040006,0x00000025,0x00000004,0x0000734e,0x00040006,0x00000025,0x00000005,0x00007342,
>+	0x00040006,0x00000025,0x00000006,0x00007353,0x00040006,0x00000025,0x00000007,0x00007345,
>+	0x00040006,0x00000025,0x00000008,0x0000644e,0x00040006,0x00000025,0x00000009,0x00006442,
>+	0x00040006,0x00000025,0x0000000a,0x00006453,0x00040006,0x00000025,0x0000000b,0x00006445,
>+	0x00040005,0x00000027,0x61726170,0x0000736d,0x00040005,0x0000004b,0x66696873,0x00000074,
>+	0x00040005,0x00000054,0x74726576,0x00007865,0x00050005,0x0000005a,0x706d6f63,0x6e656e6f,
>+	0x00000074,0x00040005,0x00000069,0x7366666f,0x00007465,0x00040005,0x0000006a,0x61726170,
>+	0x0000006d,0x00040005,0x0000006c,0x61726170,0x0000006d,0x00040005,0x0000006f,0x636f6c62,
>+	0x0000006b,0x00030005,0x00000071,0x00637273,0x00050006,0x00000071,0x00000000,0x44637273,
>+	0x00617461,0x00030005,0x00000073,0x00000000,0x00050005,0x0000007a,0x66696873,0x74694274,
>+	0x00000073,0x00040005,0x0000007b,0x61726170,0x0000006d,0x00040005,0x0000007d,0x61726170,
>+	0x0000006d,0x00050005,0x00000081,0x756c6176,0x74694265,0x00000073,0x00050005,0x00000085,
>+	0x756c6176,0x73614d65,0x0000006b,0x00050005,0x00000095,0x756c6176,0x55734165,0x00746e69,
>+	0x00040005,0x0000009b,0x756c6176,0x00000065,0x00040005,0x000000a3,0x74726576,0x00007865,
>+	0x00050005,0x000000a8,0x706d6f63,0x6e656e6f,0x00000074,0x00040005,0x000000ad,0x7366666f,
>+	0x00007465,0x00040005,0x000000ae,0x61726170,0x0000006d,0x00040005,0x000000b0,0x61726170,
>+	0x0000006d,0x00050005,0x000000b3,0x66696873,0x74694274,0x00000073,0x00040005,0x000000b4,
>+	0x61726170,0x0000006d,0x00040005,0x000000b6,0x61726170,0x0000006d,0x00050005,0x000000ba,
>+	0x756c6176,0x74694265,0x00000073,0x00050005,0x000000be,0x756c6176,0x73614d65,0x0000006b,
>+	0x00050005,0x000000ca,0x756c6176,0x55734165,0x00746e69,0x00040005,0x000000d4,0x74736564,
>+	0x00000000,0x00060006,0x000000d4,0x00000000,0x74736564,0x61746144,0x00000000,0x00030005,
>+	0x000000d6,0x00000000,0x00080005,0x000000d9,0x475f6c67,0x61626f6c,0x766e496c,0x7461636f,
>+	0x496e6f69,0x00000044,0x00050005,0x000000e3,0x756c6176,0x74754f65,0x00000000,0x00030005,
>+	0x000000e4,0x00000069,0x00030005,0x000000ef,0x00006463,0x00050005,0x000000f7,0x56637273,
>+	0x65756c61,0x00000000,0x00040005,0x000000f8,0x61726170,0x0000006d,0x00050005,0x000000fb,
>+	0x74736564,0x756c6156,0x00000065,0x00040005,0x000000fc,0x61726170,0x0000006d,0x00040005,
>+	0x000000ff,0x61726170,0x0000006d,0x00040005,0x00000101,0x61726170,0x0000006d,0x00040005,
>+	0x00000108,0x61726170,0x0000006d,0x00050048,0x00000025,0x00000000,0x00000023,0x00000000,
>+	0x00050048,0x00000025,0x00000001,0x00000023,0x00000004,0x00050048,0x00000025,0x00000002,
>+	0x00000023,0x00000008,0x00050048,0x00000025,0x00000003,0x00000023,0x0000000c,0x00050048,
>+	0x00000025,0x00000004,0x00000023,0x00000010,0x00050048,0x00000025,0x00000005,0x00000023,
>+	0x00000014,0x00050048,0x00000025,0x00000006,0x00000023,0x00000018,0x00050048,0x00000025,
>+	0x00000007,0x00000023,0x0000001c,0x00050048,0x00000025,0x00000008,0x00000023,0x00000020,
>+	0x00050048,0x00000025,0x00000009,0x00000023,0x00000024,0x00050048,0x00000025,0x0000000a,
>+	0x00000023,0x00000028,0x00050048,0x00000025,0x0000000b,0x00000023,0x0000002c,0x00030047,
>+	0x00000025,0x00000002,0x00040047,0x00000070,0x00000006,0x00000004,0x00050048,0x00000071,
>+	0x00000000,0x00000023,0x00000000,0x00030047,0x00000071,0x00000003,0x00040047,0x00000073,
>+	0x00000022,0x00000000,0x00040047,0x00000073,0x00000021,0x00000001,0x00040047,0x000000d3,
>+	0x00000006,0x00000004,0x00050048,0x000000d4,0x00000000,0x00000023,0x00000000,0x00030047,
>+	0x000000d4,0x00000003,0x00040047,0x000000d6,0x00000022,0x00000000,0x00040047,0x000000d6,
>+	0x00000021,0x00000000,0x00040047,0x000000d9,0x0000000b,0x0000001c,0x00040047,0x0000010d,
>+	0x0000000b,0x00000019,0x00020013,0x00000002,0x00030021,0x00000003,0x00000002,0x00040015,
>+	0x00000006,0x00000020,0x00000000,0x00040020,0x00000007,0x00000007,0x00000006,0x00050021,
>+	0x00000008,0x00000006,0x00000007,0x00000007,0x00040021,0x00000015,0x00000006,0x00000007,
>+	0x00040021,0x00000020,0x00000002,0x00000007,0x000e001e,0x00000025,0x00000006,0x00000006,
>+	0x00000006,0x00000006,0x00000006,0x00000006,0x00000006,0x00000006,0x00000006,0x00000006,
>+	0x00000006,0x00000006,0x00040020,0x00000026,0x00000009,0x00000025,0x0004003b,0x00000026,
>+	0x00000027,0x00000009,0x00040015,0x00000028,0x00000020,0x00000001,0x0004002b,0x00000028,
>+	0x00000029,0x00000006,0x00040020,0x0000002a,0x00000009,0x00000006,0x0004002b,0x00000028,
>+	0x0000002f,0x00000005,0x0004002b,0x00000028,0x00000034,0x00000002,0x0004002b,0x00000028,
>+	0x0000003b,0x0000000a,0x0004002b,0x00000028,0x00000040,0x00000009,0x0004002b,0x00000028,
>+	0x00000045,0x00000003,0x0004002b,0x00000006,0x0000004d,0x00000004,0x0004002b,0x00000006,
>+	0x0000004f,0x00000008,0x0004002b,0x00000028,0x00000056,0x00000008,0x0004002b,0x00000028,
>+	0x00000060,0x00000004,0x00020014,0x00000063,0x0004002b,0x00000006,0x00000067,0x00000000,
>+	0x0003001d,0x00000070,0x00000006,0x0003001e,0x00000071,0x00000070,0x00040020,0x00000072,
>+	0x00000002,0x00000071,0x0004003b,0x00000072,0x00000073,0x00000002,0x0004002b,0x00000028,
>+	0x00000074,0x00000000,0x00040020,0x00000077,0x00000002,0x00000006,0x0004002b,0x00000006,
>+	0x00000087,0x00000020,0x00040020,0x00000089,0x00000007,0x00000028,0x0004002b,0x00000028,
>+	0x0000008d,0xffffffff,0x0004002b,0x00000028,0x0000008f,0x00000001,0x0003001d,0x000000d3,
>+	0x00000006,0x0003001e,0x000000d4,0x000000d3,0x00040020,0x000000d5,0x00000002,0x000000d4,
>+	0x0004003b,0x000000d5,0x000000d6,0x00000002,0x00040017,0x000000d7,0x00000006,0x00000003,
>+	0x00040020,0x000000d8,0x00000001,0x000000d7,0x0004003b,0x000000d8,0x000000d9,0x00000001,
>+	0x00040020,0x000000da,0x00000001,0x00000006,0x0004002b,0x00000028,0x000000eb,0x0000000b,
>+	0x0004002b,0x00000006,0x0000010b,0x00000040,0x0004002b,0x00000006,0x0000010c,0x00000001,
>+	0x0006002c,0x000000d7,0x0000010d,0x0000010b,0x0000010c,0x0000010c,0x00050036,0x00000002,
>+	0x00000004,0x00000000,0x00000003,0x000200f8,0x00000005,0x0004003b,0x00000007,0x000000e3,
>+	0x00000007,0x0004003b,0x00000007,0x000000e4,0x00000007,0x0004003b,0x00000007,0x000000ef,
>+	0x00000007,0x0004003b,0x00000007,0x000000f7,0x00000007,0x0004003b,0x00000007,0x000000f8,
>+	0x00000007,0x0004003b,0x00000007,0x000000fb,0x00000007,0x0004003b,0x00000007,0x000000fc,
>+	0x00000007,0x0004003b,0x00000007,0x000000ff,0x00000007,0x0004003b,0x00000007,0x00000101,
>+	0x00000007,0x0004003b,0x00000007,0x00000108,0x00000007,0x0003003e,0x000000e3,0x00000067,
>+	0x0003003e,0x000000e4,0x00000067,0x000200f9,0x000000e5,0x000200f8,0x000000e5,0x000400f6,
>+	0x000000e7,0x000000e8,0x00000000,0x000200f9,0x000000e9,0x000200f8,0x000000e9,0x0004003d,
>+	0x00000006,0x000000ea,0x000000e4,0x00050041,0x0000002a,0x000000ec,0x00000027,0x000000eb,
>+	0x0004003d,0x00000006,0x000000ed,0x000000ec,0x000500b0,0x00000063,0x000000ee,0x000000ea,
>+	0x000000ed,0x000400fa,0x000000ee,0x000000e6,0x000000e7,0x000200f8,0x000000e6,0x00050041,
>+	0x000000da,0x000000f0,0x000000d9,0x00000067,0x0004003d,0x00000006,0x000000f1,0x000000f0,
>+	0x00050041,0x0000002a,0x000000f2,0x00000027,0x000000eb,0x0004003d,0x00000006,0x000000f3,
>+	0x000000f2,0x00050084,0x00000006,0x000000f4,0x000000f1,0x000000f3,0x0004003d,0x00000006,
>+	0x000000f5,0x000000e4,0x00050080,0x00000006,0x000000f6,0x000000f4,0x000000f5,0x0003003e,
>+	0x000000ef,0x000000f6,0x0004003d,0x00000006,0x000000f9,0x000000ef,0x0003003e,0x000000f8,
>+	0x000000f9,0x00050039,0x00000006,0x000000fa,0x00000017,0x000000f8,0x0003003e,0x000000f7,
>+	0x000000fa,0x0004003d,0x00000006,0x000000fd,0x000000f7,0x0003003e,0x000000fc,0x000000fd,
>+	0x00050039,0x00000006,0x000000fe,0x0000001a,0x000000fc,0x0003003e,0x000000fb,0x000000fe,
>+	0x0004003d,0x00000006,0x00000100,0x000000ef,0x0003003e,0x000000ff,0x00000100,0x0004003d,
>+	0x00000006,0x00000102,0x000000fb,0x0003003e,0x00000101,0x00000102,0x00060039,0x00000006,
>+	0x00000103,0x0000001e,0x000000ff,0x00000101,0x0004003d,0x00000006,0x00000104,0x000000e3,
>+	0x000500c5,0x00000006,0x00000105,0x00000104,0x00000103,0x0003003e,0x000000e3,0x00000105,
>+	0x000200f9,0x000000e8,0x000200f8,0x000000e8,0x0004003d,0x00000006,0x00000106,0x000000e4,
>+	0x00050080,0x00000006,0x00000107,0x00000106,0x0000008f,0x0003003e,0x000000e4,0x00000107,
>+	0x000200f9,0x000000e5,0x000200f8,0x000000e7,0x0004003d,0x00000006,0x00000109,0x000000e3,
>+	0x0003003e,0x00000108,0x00000109,0x00050039,0x00000002,0x0000010a,0x00000022,0x00000108,
>+	0x000100fd,0x00010038,0x00050036,0x00000006,0x0000000b,0x00000000,0x00000008,0x00030037,
>+	0x00000007,0x00000009,0x00030037,0x00000007,0x0000000a,0x000200f8,0x0000000c,0x0004003d,
>+	0x00000006,0x00000024,0x00000009,0x00050041,0x0000002a,0x0000002b,0x00000027,0x00000029,
>+	0x0004003d,0x00000006,0x0000002c,0x0000002b,0x00050084,0x00000006,0x0000002d,0x00000024,
>+	0x0000002c,0x0004003d,0x00000006,0x0000002e,0x0000000a,0x00050041,0x0000002a,0x00000030,
>+	0x00000027,0x0000002f,0x0004003d,0x00000006,0x00000031,0x00000030,0x00050084,0x00000006,
>+	0x00000032,0x0000002e,0x00000031,0x00050080,0x00000006,0x00000033,0x0000002d,0x00000032,
>+	0x00050041,0x0000002a,0x00000035,0x00000027,0x00000034,0x0004003d,0x00000006,0x00000036,
>+	0x00000035,0x00050080,0x00000006,0x00000037,0x00000033,0x00000036,0x000200fe,0x00000037,
>+	0x00010038,0x00050036,0x00000006,0x0000000f,0x00000000,0x00000008,0x00030037,0x00000007,
>+	0x0000000d,0x00030037,0x00000007,0x0000000e,0x000200f8,0x00000010,0x0004003d,0x00000006,
>+	0x0000003a,0x0000000d,0x00050041,0x0000002a,0x0000003c,0x00000027,0x0000003b,0x0004003d,
>+	0x00000006,0x0000003d,0x0000003c,0x00050084,0x00000006,0x0000003e,0x0000003a,0x0000003d,
>+	0x0004003d,0x00000006,0x0000003f,0x0000000e,0x00050041,0x0000002a,0x00000041,0x00000027,
>+	0x00000040,0x0004003d,0x00000006,0x00000042,0x00000041,0x00050084,0x00000006,0x00000043,
>+	0x0000003f,0x00000042,0x00050080,0x00000006,0x00000044,0x0000003e,0x00000043,0x00050041,
>+	0x0000002a,0x00000046,0x00000027,0x00000045,0x0004003d,0x00000006,0x00000047,0x00000046,
>+	0x00050080,0x00000006,0x00000048,0x00000044,0x00000047,0x000200fe,0x00000048,0x00010038,
>+	0x00050036,0x00000006,0x00000013,0x00000000,0x00000008,0x00030037,0x00000007,0x00000011,
>+	0x00030037,0x00000007,0x00000012,0x000200f8,0x00000014,0x0004003b,0x00000007,0x0000004b,
>+	0x00000007,0x0004003d,0x00000006,0x0000004c,0x00000011,0x00050089,0x00000006,0x0000004e,
>+	0x0000004c,0x0000004d,0x00050084,0x00000006,0x00000050,0x0000004e,0x0000004f,0x0003003e,
>+	0x0000004b,0x00000050,0x0004003d,0x00000006,0x00000051,0x0000004b,0x000200fe,0x00000051,
>+	0x00010038,0x00050036,0x00000006,0x00000017,0x00000000,0x00000015,0x00030037,0x00000007,
>+	0x00000016,0x000200f8,0x00000018,0x0004003b,0x00000007,0x00000054,0x00000007,0x0004003b,
>+	0x00000007,0x0000005a,0x00000007,0x0004003b,0x00000007,0x00000069,0x00000007,0x0004003b,
>+	0x00000007,0x0000006a,0x00000007,0x0004003b,0x00000007,0x0000006c,0x00000007,0x0004003b,
>+	0x00000007,0x0000006f,0x00000007,0x0004003b,0x00000007,0x0000007a,0x00000007,0x0004003b,
>+	0x00000007,0x0000007b,0x00000007,0x0004003b,0x00000007,0x0000007d,0x00000007,0x0004003b,
>+	0x00000007,0x00000081,0x00000007,0x0004003b,0x00000007,0x00000085,0x00000007,0x0004003b,
>+	0x00000089,0x0000008a,0x00000007,0x0004003b,0x00000007,0x00000095,0x00000007,0x0004003b,
>+	0x00000007,0x0000009b,0x00000007,0x0004003d,0x00000006,0x00000055,0x00000016,0x00050041,
>+	0x0000002a,0x00000057,0x00000027,0x00000056,0x0004003d,0x00000006,0x00000058,0x00000057,
>+	0x00050086,0x00000006,0x00000059,0x00000055,0x00000058,0x0003003e,0x00000054,0x00000059,
>+	0x0004003d,0x00000006,0x0000005b,0x00000016,0x00050041,0x0000002a,0x0000005c,0x00000027,
>+	0x00000056,0x0004003d,0x00000006,0x0000005d,0x0000005c,0x00050089,0x00000006,0x0000005e,
>+	0x0000005b,0x0000005d,0x0003003e,0x0000005a,0x0000005e,0x0004003d,0x00000006,0x0000005f,
>+	0x0000005a,0x00050041,0x0000002a,0x00000061,0x00000027,0x00000060,0x0004003d,0x00000006,
>+	0x00000062,0x00000061,0x000500ae,0x00000063,0x00000064,0x0000005f,0x00000062,0x000300f7,
>+	0x00000066,0x00000000,0x000400fa,0x00000064,0x00000065,0x00000066,0x000200f8,0x00000065,
>+	0x000200fe,0x00000067,0x000200f8,0x00000066,0x0004003d,0x00000006,0x0000006b,0x00000054,
>+	0x0003003e,0x0000006a,0x0000006b,0x0004003d,0x00000006,0x0000006d,0x0000005a,0x0003003e,
>+	0x0000006c,0x0000006d,0x00060039,0x00000006,0x0000006e,0x0000000b,0x0000006a,0x0000006c,
>+	0x0003003e,0x00000069,0x0000006e,0x0004003d,0x00000006,0x00000075,0x00000069,0x00050086,
>+	0x00000006,0x00000076,0x00000075,0x0000004d,0x00060041,0x00000077,0x00000078,0x00000073,
>+	0x00000074,0x00000076,0x0004003d,0x00000006,0x00000079,0x00000078,0x0003003e,0x0000006f,
>+	0x00000079,0x0004003d,0x00000006,0x0000007c,0x00000069,0x0003003e,0x0000007b,0x0000007c,
>+	0x00050041,0x0000002a,0x0000007e,0x00000027,0x0000002f,0x0004003d,0x00000006,0x0000007f,
>+	0x0000007e,0x0003003e,0x0000007d,0x0000007f,0x00060039,0x00000006,0x00000080,0x00000013,
>+	0x0000007b,0x0000007d,0x0003003e,0x0000007a,0x00000080,0x00050041,0x0000002a,0x00000082,
>+	0x00000027,0x0000002f,0x0004003d,0x00000006,0x00000083,0x00000082,0x00050084,0x00000006,
>+	0x00000084,0x00000083,0x0000004f,0x0003003e,0x00000081,0x00000084,0x0004003d,0x00000006,
>+	0x00000086,0x00000081,0x000500aa,0x00000063,0x00000088,0x00000086,0x00000087,0x000300f7,
>+	0x0000008c,0x00000000,0x000400fa,0x00000088,0x0000008b,0x0000008e,0x000200f8,0x0000008b,
>+	0x0003003e,0x0000008a,0x0000008d,0x000200f9,0x0000008c,0x000200f8,0x0000008e,0x0004003d,
>+	0x00000006,0x00000090,0x00000081,0x000500c4,0x00000028,0x00000091,0x0000008f,0x00000090,
>+	0x00050082,0x00000028,0x00000092,0x00000091,0x0000008f,0x0003003e,0x0000008a,0x00000092,
>+	0x000200f9,0x0000008c,0x000200f8,0x0000008c,0x0004003d,0x00000028,0x00000093,0x0000008a,
>+	0x0004007c,0x00000006,0x00000094,0x00000093,0x0003003e,0x00000085,0x00000094,0x0004003d,
>+	0x00000006,0x00000096,0x0000006f,0x0004003d,0x00000006,0x00000097,0x0000007a,0x000500c2,
>+	0x00000006,0x00000098,0x00000096,0x00000097,0x0004003d,0x00000006,0x00000099,0x00000085,
>+	0x000500c7,0x00000006,0x0000009a,0x00000098,0x00000099,0x0003003e,0x00000095,0x0000009a,
>+	0x0004003d,0x00000006,0x0000009c,0x00000095,0x0003003e,0x0000009b,0x0000009c,0x0004003d,
>+	0x00000006,0x0000009d,0x0000009b,0x000200fe,0x0000009d,0x00010038,0x00050036,0x00000006,
>+	0x0000001a,0x00000000,0x00000015,0x00030037,0x00000007,0x00000019,0x000200f8,0x0000001b,
>+	0x0004003d,0x00000006,0x000000a0,0x00000019,0x000200fe,0x000000a0,0x00010038,0x00050036,
>+	0x00000006,0x0000001e,0x00000000,0x00000008,0x00030037,0x00000007,0x0000001c,0x00030037,
>+	0x00000007,0x0000001d,0x000200f8,0x0000001f,0x0004003b,0x00000007,0x000000a3,0x00000007,
>+	0x0004003b,0x00000007,0x000000a8,0x00000007,0x0004003b,0x00000007,0x000000ad,0x00000007,
>+	0x0004003b,0x00000007,0x000000ae,0x00000007,0x0004003b,0x00000007,0x000000b0,0x00000007,
>+	0x0004003b,0x00000007,0x000000b3,0x00000007,0x0004003b,0x00000007,0x000000b4,0x00000007,
>+	0x0004003b,0x00000007,0x000000b6,0x00000007,0x0004003b,0x00000007,0x000000ba,0x00000007,
>+	0x0004003b,0x00000007,0x000000be,0x00000007,0x0004003b,0x00000089,0x000000c1,0x00000007,
>+	0x0004003b,0x00000007,0x000000ca,0x00000007,0x0004003d,0x00000006,0x000000a4,0x0000001c,
>+	0x00050041,0x0000002a,0x000000a5,0x00000027,0x00000056,0x0004003d,0x00000006,0x000000a6,
>+	0x000000a5,0x00050086,0x00000006,0x000000a7,0x000000a4,0x000000a6,0x0003003e,0x000000a3,
>+	0x000000a7,0x0004003d,0x00000006,0x000000a9,0x0000001c,0x00050041,0x0000002a,0x000000aa,
>+	0x00000027,0x00000056,0x0004003d,0x00000006,0x000000ab,0x000000aa,0x00050089,0x00000006,
>+	0x000000ac,0x000000a9,0x000000ab,0x0003003e,0x000000a8,0x000000ac,0x0004003d,0x00000006,
>+	0x000000af,0x000000a3,0x0003003e,0x000000ae,0x000000af,0x0004003d,0x00000006,0x000000b1,
>+	0x000000a8,0x0003003e,0x000000b0,0x000000b1,0x00060039,0x00000006,0x000000b2,0x0000000f,
>+	0x000000ae,0x000000b0,0x0003003e,0x000000ad,0x000000b2,0x0004003d,0x00000006,0x000000b5,
>+	0x000000ad,0x0003003e,0x000000b4,0x000000b5,0x00050041,0x0000002a,0x000000b7,0x00000027,
>+	0x00000040,0x0004003d,0x00000006,0x000000b8,0x000000b7,0x0003003e,0x000000b6,0x000000b8,
>+	0x00060039,0x00000006,0x000000b9,0x00000013,0x000000b4,0x000000b6,0x0003003e,0x000000b3,
>+	0x000000b9,0x00050041,0x0000002a,0x000000bb,0x00000027,0x00000040,0x0004003d,0x00000006,
>+	0x000000bc,0x000000bb,0x00050084,0x00000006,0x000000bd,0x000000bc,0x0000004f,0x0003003e,
>+	0x000000ba,0x000000bd,0x0004003d,0x00000006,0x000000bf,0x000000ba,0x000500aa,0x00000063,
>+	0x000000c0,0x000000bf,0x00000087,0x000300f7,0x000000c3,0x00000000,0x000400fa,0x000000c0,
>+	0x000000c2,0x000000c4,0x000200f8,0x000000c2,0x0003003e,0x000000c1,0x0000008d,0x000200f9,
>+	0x000000c3,0x000200f8,0x000000c4,0x0004003d,0x00000006,0x000000c5,0x000000ba,0x000500c4,
>+	0x00000028,0x000000c6,0x0000008f,0x000000c5,0x00050082,0x00000028,0x000000c7,0x000000c6,
>+	0x0000008f,0x0003003e,0x000000c1,0x000000c7,0x000200f9,0x000000c3,0x000200f8,0x000000c3,
>+	0x0004003d,0x00000028,0x000000c8,0x000000c1,0x0004007c,0x00000006,0x000000c9,0x000000c8,
>+	0x0003003e,0x000000be,0x000000c9,0x0004003d,0x00000006,0x000000cb,0x0000001d,0x0004003d,
>+	0x00000006,0x000000cc,0x000000be,0x000500c7,0x00000006,0x000000cd,0x000000cb,0x000000cc,
>+	0x0004003d,0x00000006,0x000000ce,0x000000b3,0x000500c4,0x00000006,0x000000cf,0x000000cd,
>+	0x000000ce,0x0003003e,0x000000ca,0x000000cf,0x0004003d,0x00000006,0x000000d0,0x000000ca,
>+	0x000200fe,0x000000d0,0x00010038,0x00050036,0x00000002,0x00000022,0x00000000,0x00000020,
>+	0x00030037,0x00000007,0x00000021,0x000200f8,0x00000023,0x00050041,0x000000da,0x000000db,
>+	0x000000d9,0x00000067,0x0004003d,0x00000006,0x000000dc,0x000000db,0x00050041,0x0000002a,
>+	0x000000dd,0x00000027,0x00000045,0x0004003d,0x00000006,0x000000de,0x000000dd,0x00050086,
>+	0x00000006,0x000000df,0x000000de,0x0000004d,0x00050080,0x00000006,0x000000e0,0x000000dc,
>+	0x000000df,0x0004003d,0x00000006,0x000000e1,0x00000021,0x00060041,0x00000077,0x000000e2,
>+	0x000000d6,0x00000074,0x000000e0,0x0003003e,0x000000e2,0x000000e1,0x000100fd,0x00010038
>+};
>+
>+#if 0  // Generated from:
>+#version 450 core
>+
>+layout(local_size_x = 64, local_size_y = 1, local_size_z = 1)in;
>+
>+layout(set = 0, binding = 0)buffer dest
>+{
>+    uint destData[];
>+};
>+
>+layout(set = 0, binding = 1)buffer src
>+{
>+    uint srcData[];
>+};
>+
>+layout(push_constant)uniform PushConstants
>+{
>+
>+    uint outputCount;
>+
>+    uint componentCount;
>+
>+    uint srcOffset;
>+    uint destOffset;
>+
>+    uint Ns;
>+    uint Bs;
>+    uint Ss;
>+    uint Es;
>+
>+    uint Nd;
>+    uint Bd;
>+    uint Sd;
>+    uint Ed;
>+} params;
>+
>+uint getSourceComponentOffset(uint vertex, uint component)
>+{
>+    return vertex * params . Ss + component * params . Bs + params . srcOffset;
>+}
>+
>+uint getDestinationComponentOffset(uint vertex, uint component)
>+{
>+    return vertex * params . Sd + component * params . Bd + params . destOffset;
>+}
>+
>+uint getShiftBits(uint offset, uint B)
>+{
>+
>+    uint shift =(offset % 4)* 8;
>+
>+    return shift;
>+}
>+
>+      uint loadSourceComponent(uint cd)
>+{
>+
>+    uint vertex = cd / params . Nd;
>+    uint component = cd % params . Nd;
>+
>+    if(component >= params . Ns)
>+    {
>+        return 0;
>+    }
>+
>+    uint offset = getSourceComponentOffset(vertex, component);
>+    uint block = srcData[offset / 4];
>+    uint shiftBits = getShiftBits(offset, params . Bs);
>+
>+    uint valueBits = params . Bs * 8;
>+    uint valueMask = valueBits == 32 ? - 1 :(1 << valueBits)- 1;
>+    uint valueAsUint =(block >> shiftBits)& valueMask;
>+
>+          uint value = valueAsUint;
>+
>+    return value;
>+}
>+
>+       uint convertComponent(uint srcValue)
>+{
>+
>+    return srcValue;
>+}
>+
>+uint makeDestinationComponent(uint cd, uint value)
>+{
>+
>+    uint vertex = cd / params . Nd;
>+    uint component = cd % params . Nd;
>+
>+    uint offset = getDestinationComponentOffset(vertex, component);
>+    uint shiftBits = getShiftBits(offset, params . Bd);
>+
>+    uint valueBits = params . Bd * 8;
>+    uint valueMask = valueBits == 32 ? - 1 :(1 << valueBits)- 1;
>+    uint valueAsUint =(uint(value)& valueMask)<< shiftBits;
>+
>+    return valueAsUint;
>+}
>+
>+void storeDestinationComponents(uint valueAsUint)
>+{
>+
>+    destData[gl_GlobalInvocationID . x + params . destOffset / 4]= valueAsUint;
>+}
>+
>+void main()
>+{
>+
>+    uint valueOut = 0;
>+    for(uint i = 0;i < params . Ed;++ i)
>+    {
>+        uint cd = gl_GlobalInvocationID . x * params . Ed + i;
>+
>+              uint srcValue = loadSourceComponent(cd);
>+               uint destValue = convertComponent(srcValue);
>+        valueOut |= makeDestinationComponent(cd, destValue);
>+    }
>+
>+    storeDestinationComponents(valueOut);
>+}
>+#endif  // Preprocessed code
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.00000004.inc b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.00000004.inc
>new file mode 100644
>index 00000000000..3528b0e38bf
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.00000004.inc
>@@ -0,0 +1,324 @@
>+	// 7.11.3188
>+	 #pragma once
>+const uint32_t kConvertVertex_comp_00000004[] = {
>+	0x07230203,0x00010000,0x00080007,0x000000f4,0x00000000,0x00020011,0x00000001,0x0006000b,
>+	0x00000001,0x4c534c47,0x6474732e,0x3035342e,0x00000000,0x0003000e,0x00000000,0x00000001,
>+	0x0006000f,0x00000005,0x00000004,0x6e69616d,0x00000000,0x000000b5,0x00060010,0x00000004,
>+	0x00000011,0x00000040,0x00000001,0x00000001,0x00030003,0x00000002,0x000001c2,0x00040005,
>+	0x00000004,0x6e69616d,0x00000000,0x000a0005,0x0000000b,0x53746567,0x6372756f,0x6d6f4365,
>+	0x656e6f70,0x664f746e,0x74657366,0x3b317528,0x003b3175,0x00040005,0x00000009,0x74726576,
>+	0x00007865,0x00050005,0x0000000a,0x706d6f63,0x6e656e6f,0x00000074,0x00070005,0x0000000f,
>+	0x53746567,0x74666968,0x73746942,0x3b317528,0x003b3175,0x00040005,0x0000000d,0x7366666f,
>+	0x00007465,0x00030005,0x0000000e,0x00000042,0x00080005,0x00000014,0x64616f6c,0x72756f53,
>+	0x6f436563,0x6e6f706d,0x28746e65,0x003b3175,0x00030005,0x00000013,0x00006463,0x00080005,
>+	0x0000001a,0x766e6f63,0x43747265,0x6f706d6f,0x746e656e,0x3b316928,0x00000000,0x00050005,
>+	0x00000019,0x56637273,0x65756c61,0x00000000,0x000a0005,0x00000020,0x656b616d,0x74736544,
>+	0x74616e69,0x436e6f69,0x6f706d6f,0x746e656e,0x3b317528,0x003b3166,0x00030005,0x0000001e,
>+	0x00006463,0x00040005,0x0000001f,0x756c6176,0x00000065,0x000a0005,0x00000024,0x726f7473,
>+	0x73654465,0x616e6974,0x6e6f6974,0x706d6f43,0x6e656e6f,0x75287374,0x00003b31,0x00050005,
>+	0x00000023,0x756c6176,0x55734165,0x00746e69,0x00060005,0x00000027,0x68737550,0x736e6f43,
>+	0x746e6174,0x00000073,0x00060006,0x00000027,0x00000000,0x7074756f,0x6f437475,0x00746e75,
>+	0x00070006,0x00000027,0x00000001,0x706d6f63,0x6e656e6f,0x756f4374,0x0000746e,0x00060006,
>+	0x00000027,0x00000002,0x4f637273,0x65736666,0x00000074,0x00060006,0x00000027,0x00000003,
>+	0x74736564,0x7366664f,0x00007465,0x00040006,0x00000027,0x00000004,0x0000734e,0x00040006,
>+	0x00000027,0x00000005,0x00007342,0x00040006,0x00000027,0x00000006,0x00007353,0x00040006,
>+	0x00000027,0x00000007,0x00007345,0x00040006,0x00000027,0x00000008,0x0000644e,0x00040006,
>+	0x00000027,0x00000009,0x00006442,0x00040006,0x00000027,0x0000000a,0x00006453,0x00040006,
>+	0x00000027,0x0000000b,0x00006445,0x00040005,0x00000029,0x61726170,0x0000736d,0x00040005,
>+	0x0000003b,0x66696873,0x00000074,0x00040005,0x00000044,0x74726576,0x00007865,0x00050005,
>+	0x0000004a,0x706d6f63,0x6e656e6f,0x00000074,0x00040005,0x00000059,0x7366666f,0x00007465,
>+	0x00040005,0x0000005a,0x61726170,0x0000006d,0x00040005,0x0000005c,0x61726170,0x0000006d,
>+	0x00040005,0x0000005f,0x636f6c62,0x0000006b,0x00030005,0x00000061,0x00637273,0x00050006,
>+	0x00000061,0x00000000,0x44637273,0x00617461,0x00030005,0x00000063,0x00000000,0x00050005,
>+	0x00000069,0x66696873,0x74694274,0x00000073,0x00040005,0x0000006a,0x61726170,0x0000006d,
>+	0x00040005,0x0000006c,0x61726170,0x0000006d,0x00050005,0x00000070,0x756c6176,0x74694265,
>+	0x00000073,0x00050005,0x00000074,0x756c6176,0x73614d65,0x0000006b,0x00050005,0x00000083,
>+	0x756c6176,0x55734165,0x00746e69,0x00050005,0x0000008a,0x654e7369,0x69746167,0x00006576,
>+	0x00040005,0x00000094,0x756c6176,0x00000065,0x00050005,0x000000a8,0x756c6176,0x55734165,
>+	0x00746e69,0x00040005,0x000000b0,0x74736564,0x00000000,0x00060006,0x000000b0,0x00000000,
>+	0x74736564,0x61746144,0x00000000,0x00030005,0x000000b2,0x00000000,0x00080005,0x000000b5,
>+	0x475f6c67,0x61626f6c,0x766e496c,0x7461636f,0x496e6f69,0x00000044,0x00050005,0x000000c8,
>+	0x756c6176,0x74754f65,0x00000000,0x00030005,0x000000c9,0x00000069,0x00030005,0x000000d1,
>+	0x00006463,0x00050005,0x000000de,0x56637273,0x65756c61,0x00000000,0x00040005,0x000000df,
>+	0x61726170,0x0000006d,0x00050005,0x000000e2,0x74736564,0x756c6156,0x00000065,0x00040005,
>+	0x000000e3,0x61726170,0x0000006d,0x00040005,0x000000e6,0x61726170,0x0000006d,0x00040005,
>+	0x000000e8,0x61726170,0x0000006d,0x00040005,0x000000ef,0x61726170,0x0000006d,0x00050048,
>+	0x00000027,0x00000000,0x00000023,0x00000000,0x00050048,0x00000027,0x00000001,0x00000023,
>+	0x00000004,0x00050048,0x00000027,0x00000002,0x00000023,0x00000008,0x00050048,0x00000027,
>+	0x00000003,0x00000023,0x0000000c,0x00050048,0x00000027,0x00000004,0x00000023,0x00000010,
>+	0x00050048,0x00000027,0x00000005,0x00000023,0x00000014,0x00050048,0x00000027,0x00000006,
>+	0x00000023,0x00000018,0x00050048,0x00000027,0x00000007,0x00000023,0x0000001c,0x00050048,
>+	0x00000027,0x00000008,0x00000023,0x00000020,0x00050048,0x00000027,0x00000009,0x00000023,
>+	0x00000024,0x00050048,0x00000027,0x0000000a,0x00000023,0x00000028,0x00050048,0x00000027,
>+	0x0000000b,0x00000023,0x0000002c,0x00030047,0x00000027,0x00000002,0x00040047,0x00000060,
>+	0x00000006,0x00000004,0x00050048,0x00000061,0x00000000,0x00000023,0x00000000,0x00030047,
>+	0x00000061,0x00000003,0x00040047,0x00000063,0x00000022,0x00000000,0x00040047,0x00000063,
>+	0x00000021,0x00000001,0x00040047,0x000000af,0x00000006,0x00000004,0x00050048,0x000000b0,
>+	0x00000000,0x00000023,0x00000000,0x00030047,0x000000b0,0x00000003,0x00040047,0x000000b2,
>+	0x00000022,0x00000000,0x00040047,0x000000b2,0x00000021,0x00000000,0x00040047,0x000000b5,
>+	0x0000000b,0x0000001c,0x00040047,0x000000f3,0x0000000b,0x00000019,0x00020013,0x00000002,
>+	0x00030021,0x00000003,0x00000002,0x00040015,0x00000006,0x00000020,0x00000000,0x00040020,
>+	0x00000007,0x00000007,0x00000006,0x00050021,0x00000008,0x00000006,0x00000007,0x00000007,
>+	0x00040015,0x00000011,0x00000020,0x00000001,0x00040021,0x00000012,0x00000011,0x00000007,
>+	0x00040020,0x00000016,0x00000007,0x00000011,0x00030016,0x00000017,0x00000020,0x00040021,
>+	0x00000018,0x00000017,0x00000016,0x00040020,0x0000001c,0x00000007,0x00000017,0x00050021,
>+	0x0000001d,0x00000006,0x00000007,0x0000001c,0x00040021,0x00000022,0x00000002,0x00000007,
>+	0x000e001e,0x00000027,0x00000006,0x00000006,0x00000006,0x00000006,0x00000006,0x00000006,
>+	0x00000006,0x00000006,0x00000006,0x00000006,0x00000006,0x00000006,0x00040020,0x00000028,
>+	0x00000009,0x00000027,0x0004003b,0x00000028,0x00000029,0x00000009,0x0004002b,0x00000011,
>+	0x0000002a,0x00000006,0x00040020,0x0000002b,0x00000009,0x00000006,0x0004002b,0x00000011,
>+	0x00000030,0x00000005,0x0004002b,0x00000011,0x00000035,0x00000002,0x0004002b,0x00000006,
>+	0x0000003d,0x00000004,0x0004002b,0x00000006,0x0000003f,0x00000008,0x0004002b,0x00000011,
>+	0x00000046,0x00000008,0x0004002b,0x00000011,0x00000050,0x00000004,0x00020014,0x00000053,
>+	0x0004002b,0x00000011,0x00000057,0x00000000,0x0003001d,0x00000060,0x00000006,0x0003001e,
>+	0x00000061,0x00000060,0x00040020,0x00000062,0x00000002,0x00000061,0x0004003b,0x00000062,
>+	0x00000063,0x00000002,0x00040020,0x00000066,0x00000002,0x00000006,0x0004002b,0x00000006,
>+	0x00000076,0x00000020,0x0004002b,0x00000011,0x0000007b,0xffffffff,0x0004002b,0x00000011,
>+	0x0000007d,0x00000001,0x00040020,0x00000089,0x00000007,0x00000053,0x0004002b,0x00000006,
>+	0x0000008d,0x00000001,0x0004002b,0x00000006,0x00000092,0x00000000,0x0003001d,0x000000af,
>+	0x00000006,0x0003001e,0x000000b0,0x000000af,0x00040020,0x000000b1,0x00000002,0x000000b0,
>+	0x0004003b,0x000000b1,0x000000b2,0x00000002,0x00040017,0x000000b3,0x00000006,0x00000003,
>+	0x00040020,0x000000b4,0x00000001,0x000000b3,0x0004003b,0x000000b4,0x000000b5,0x00000001,
>+	0x00040020,0x000000b6,0x00000001,0x00000006,0x0004002b,0x00000011,0x000000b9,0x00000003,
>+	0x0004002b,0x00000006,0x000000f2,0x00000040,0x0006002c,0x000000b3,0x000000f3,0x000000f2,
>+	0x0000008d,0x0000008d,0x00050036,0x00000002,0x00000004,0x00000000,0x00000003,0x000200f8,
>+	0x00000005,0x0004003b,0x00000007,0x000000c8,0x00000007,0x0004003b,0x00000007,0x000000c9,
>+	0x00000007,0x0004003b,0x00000007,0x000000d1,0x00000007,0x0004003b,0x00000016,0x000000de,
>+	0x00000007,0x0004003b,0x00000007,0x000000df,0x00000007,0x0004003b,0x0000001c,0x000000e2,
>+	0x00000007,0x0004003b,0x00000016,0x000000e3,0x00000007,0x0004003b,0x00000007,0x000000e6,
>+	0x00000007,0x0004003b,0x0000001c,0x000000e8,0x00000007,0x0004003b,0x00000007,0x000000ef,
>+	0x00000007,0x00050041,0x000000b6,0x000000c0,0x000000b5,0x00000092,0x0004003d,0x00000006,
>+	0x000000c1,0x000000c0,0x00050041,0x0000002b,0x000000c2,0x00000029,0x00000057,0x0004003d,
>+	0x00000006,0x000000c3,0x000000c2,0x000500ae,0x00000053,0x000000c4,0x000000c1,0x000000c3,
>+	0x000300f7,0x000000c6,0x00000000,0x000400fa,0x000000c4,0x000000c5,0x000000c6,0x000200f8,
>+	0x000000c5,0x000100fd,0x000200f8,0x000000c6,0x0003003e,0x000000c8,0x00000092,0x0003003e,
>+	0x000000c9,0x00000092,0x000200f9,0x000000ca,0x000200f8,0x000000ca,0x000400f6,0x000000cc,
>+	0x000000cd,0x00000000,0x000200f9,0x000000ce,0x000200f8,0x000000ce,0x0004003d,0x00000006,
>+	0x000000cf,0x000000c9,0x000500b0,0x00000053,0x000000d0,0x000000cf,0x0000008d,0x000400fa,
>+	0x000000d0,0x000000cb,0x000000cc,0x000200f8,0x000000cb,0x00050041,0x000000b6,0x000000d2,
>+	0x000000b5,0x00000092,0x0004003d,0x00000006,0x000000d3,0x000000d2,0x00050084,0x00000006,
>+	0x000000d4,0x000000d3,0x0000008d,0x0004003d,0x00000006,0x000000d5,0x000000c9,0x00050080,
>+	0x00000006,0x000000d6,0x000000d4,0x000000d5,0x0003003e,0x000000d1,0x000000d6,0x0004003d,
>+	0x00000006,0x000000d7,0x000000d1,0x00050041,0x0000002b,0x000000d8,0x00000029,0x0000007d,
>+	0x0004003d,0x00000006,0x000000d9,0x000000d8,0x000500ae,0x00000053,0x000000da,0x000000d7,
>+	0x000000d9,0x000300f7,0x000000dc,0x00000000,0x000400fa,0x000000da,0x000000db,0x000000dc,
>+	0x000200f8,0x000000db,0x000200f9,0x000000cc,0x000200f8,0x000000dc,0x0004003d,0x00000006,
>+	0x000000e0,0x000000d1,0x0003003e,0x000000df,0x000000e0,0x00050039,0x00000011,0x000000e1,
>+	0x00000014,0x000000df,0x0003003e,0x000000de,0x000000e1,0x0004003d,0x00000011,0x000000e4,
>+	0x000000de,0x0003003e,0x000000e3,0x000000e4,0x00050039,0x00000017,0x000000e5,0x0000001a,
>+	0x000000e3,0x0003003e,0x000000e2,0x000000e5,0x0004003d,0x00000006,0x000000e7,0x000000d1,
>+	0x0003003e,0x000000e6,0x000000e7,0x0004003d,0x00000017,0x000000e9,0x000000e2,0x0003003e,
>+	0x000000e8,0x000000e9,0x00060039,0x00000006,0x000000ea,0x00000020,0x000000e6,0x000000e8,
>+	0x0004003d,0x00000006,0x000000eb,0x000000c8,0x000500c5,0x00000006,0x000000ec,0x000000eb,
>+	0x000000ea,0x0003003e,0x000000c8,0x000000ec,0x000200f9,0x000000cd,0x000200f8,0x000000cd,
>+	0x0004003d,0x00000006,0x000000ed,0x000000c9,0x00050080,0x00000006,0x000000ee,0x000000ed,
>+	0x0000007d,0x0003003e,0x000000c9,0x000000ee,0x000200f9,0x000000ca,0x000200f8,0x000000cc,
>+	0x0004003d,0x00000006,0x000000f0,0x000000c8,0x0003003e,0x000000ef,0x000000f0,0x00050039,
>+	0x00000002,0x000000f1,0x00000024,0x000000ef,0x000100fd,0x00010038,0x00050036,0x00000006,
>+	0x0000000b,0x00000000,0x00000008,0x00030037,0x00000007,0x00000009,0x00030037,0x00000007,
>+	0x0000000a,0x000200f8,0x0000000c,0x0004003d,0x00000006,0x00000026,0x00000009,0x00050041,
>+	0x0000002b,0x0000002c,0x00000029,0x0000002a,0x0004003d,0x00000006,0x0000002d,0x0000002c,
>+	0x00050084,0x00000006,0x0000002e,0x00000026,0x0000002d,0x0004003d,0x00000006,0x0000002f,
>+	0x0000000a,0x00050041,0x0000002b,0x00000031,0x00000029,0x00000030,0x0004003d,0x00000006,
>+	0x00000032,0x00000031,0x00050084,0x00000006,0x00000033,0x0000002f,0x00000032,0x00050080,
>+	0x00000006,0x00000034,0x0000002e,0x00000033,0x00050041,0x0000002b,0x00000036,0x00000029,
>+	0x00000035,0x0004003d,0x00000006,0x00000037,0x00000036,0x00050080,0x00000006,0x00000038,
>+	0x00000034,0x00000037,0x000200fe,0x00000038,0x00010038,0x00050036,0x00000006,0x0000000f,
>+	0x00000000,0x00000008,0x00030037,0x00000007,0x0000000d,0x00030037,0x00000007,0x0000000e,
>+	0x000200f8,0x00000010,0x0004003b,0x00000007,0x0000003b,0x00000007,0x0004003d,0x00000006,
>+	0x0000003c,0x0000000d,0x00050089,0x00000006,0x0000003e,0x0000003c,0x0000003d,0x00050084,
>+	0x00000006,0x00000040,0x0000003e,0x0000003f,0x0003003e,0x0000003b,0x00000040,0x0004003d,
>+	0x00000006,0x00000041,0x0000003b,0x000200fe,0x00000041,0x00010038,0x00050036,0x00000011,
>+	0x00000014,0x00000000,0x00000012,0x00030037,0x00000007,0x00000013,0x000200f8,0x00000015,
>+	0x0004003b,0x00000007,0x00000044,0x00000007,0x0004003b,0x00000007,0x0000004a,0x00000007,
>+	0x0004003b,0x00000007,0x00000059,0x00000007,0x0004003b,0x00000007,0x0000005a,0x00000007,
>+	0x0004003b,0x00000007,0x0000005c,0x00000007,0x0004003b,0x00000007,0x0000005f,0x00000007,
>+	0x0004003b,0x00000007,0x00000069,0x00000007,0x0004003b,0x00000007,0x0000006a,0x00000007,
>+	0x0004003b,0x00000007,0x0000006c,0x00000007,0x0004003b,0x00000007,0x00000070,0x00000007,
>+	0x0004003b,0x00000007,0x00000074,0x00000007,0x0004003b,0x00000016,0x00000078,0x00000007,
>+	0x0004003b,0x00000007,0x00000083,0x00000007,0x0004003b,0x00000089,0x0000008a,0x00000007,
>+	0x0004003b,0x00000016,0x00000094,0x00000007,0x0004003b,0x00000016,0x00000097,0x00000007,
>+	0x0004003d,0x00000006,0x00000045,0x00000013,0x00050041,0x0000002b,0x00000047,0x00000029,
>+	0x00000046,0x0004003d,0x00000006,0x00000048,0x00000047,0x00050086,0x00000006,0x00000049,
>+	0x00000045,0x00000048,0x0003003e,0x00000044,0x00000049,0x0004003d,0x00000006,0x0000004b,
>+	0x00000013,0x00050041,0x0000002b,0x0000004c,0x00000029,0x00000046,0x0004003d,0x00000006,
>+	0x0000004d,0x0000004c,0x00050089,0x00000006,0x0000004e,0x0000004b,0x0000004d,0x0003003e,
>+	0x0000004a,0x0000004e,0x0004003d,0x00000006,0x0000004f,0x0000004a,0x00050041,0x0000002b,
>+	0x00000051,0x00000029,0x00000050,0x0004003d,0x00000006,0x00000052,0x00000051,0x000500ae,
>+	0x00000053,0x00000054,0x0000004f,0x00000052,0x000300f7,0x00000056,0x00000000,0x000400fa,
>+	0x00000054,0x00000055,0x00000056,0x000200f8,0x00000055,0x000200fe,0x00000057,0x000200f8,
>+	0x00000056,0x0004003d,0x00000006,0x0000005b,0x00000044,0x0003003e,0x0000005a,0x0000005b,
>+	0x0004003d,0x00000006,0x0000005d,0x0000004a,0x0003003e,0x0000005c,0x0000005d,0x00060039,
>+	0x00000006,0x0000005e,0x0000000b,0x0000005a,0x0000005c,0x0003003e,0x00000059,0x0000005e,
>+	0x0004003d,0x00000006,0x00000064,0x00000059,0x00050086,0x00000006,0x00000065,0x00000064,
>+	0x0000003d,0x00060041,0x00000066,0x00000067,0x00000063,0x00000057,0x00000065,0x0004003d,
>+	0x00000006,0x00000068,0x00000067,0x0003003e,0x0000005f,0x00000068,0x0004003d,0x00000006,
>+	0x0000006b,0x00000059,0x0003003e,0x0000006a,0x0000006b,0x00050041,0x0000002b,0x0000006d,
>+	0x00000029,0x00000030,0x0004003d,0x00000006,0x0000006e,0x0000006d,0x0003003e,0x0000006c,
>+	0x0000006e,0x00060039,0x00000006,0x0000006f,0x0000000f,0x0000006a,0x0000006c,0x0003003e,
>+	0x00000069,0x0000006f,0x00050041,0x0000002b,0x00000071,0x00000029,0x00000030,0x0004003d,
>+	0x00000006,0x00000072,0x00000071,0x00050084,0x00000006,0x00000073,0x00000072,0x0000003f,
>+	0x0003003e,0x00000070,0x00000073,0x0004003d,0x00000006,0x00000075,0x00000070,0x000500aa,
>+	0x00000053,0x00000077,0x00000075,0x00000076,0x000300f7,0x0000007a,0x00000000,0x000400fa,
>+	0x00000077,0x00000079,0x0000007c,0x000200f8,0x00000079,0x0003003e,0x00000078,0x0000007b,
>+	0x000200f9,0x0000007a,0x000200f8,0x0000007c,0x0004003d,0x00000006,0x0000007e,0x00000070,
>+	0x000500c4,0x00000011,0x0000007f,0x0000007d,0x0000007e,0x00050082,0x00000011,0x00000080,
>+	0x0000007f,0x0000007d,0x0003003e,0x00000078,0x00000080,0x000200f9,0x0000007a,0x000200f8,
>+	0x0000007a,0x0004003d,0x00000011,0x00000081,0x00000078,0x0004007c,0x00000006,0x00000082,
>+	0x00000081,0x0003003e,0x00000074,0x00000082,0x0004003d,0x00000006,0x00000084,0x0000005f,
>+	0x0004003d,0x00000006,0x00000085,0x00000069,0x000500c2,0x00000006,0x00000086,0x00000084,
>+	0x00000085,0x0004003d,0x00000006,0x00000087,0x00000074,0x000500c7,0x00000006,0x00000088,
>+	0x00000086,0x00000087,0x0003003e,0x00000083,0x00000088,0x0004003d,0x00000006,0x0000008b,
>+	0x00000083,0x0004003d,0x00000006,0x0000008c,0x00000070,0x00050082,0x00000006,0x0000008e,
>+	0x0000008c,0x0000008d,0x000500c4,0x00000011,0x0000008f,0x0000007d,0x0000008e,0x0004007c,
>+	0x00000006,0x00000090,0x0000008f,0x000500c7,0x00000006,0x00000091,0x0000008b,0x00000090,
>+	0x000500ab,0x00000053,0x00000093,0x00000091,0x00000092,0x0003003e,0x0000008a,0x00000093,
>+	0x0004003d,0x00000006,0x00000095,0x00000083,0x0004003d,0x00000053,0x00000096,0x0000008a,
>+	0x000300f7,0x00000099,0x00000000,0x000400fa,0x00000096,0x00000098,0x0000009c,0x000200f8,
>+	0x00000098,0x0004003d,0x00000006,0x0000009a,0x00000070,0x000500c4,0x00000011,0x0000009b,
>+	0x0000007b,0x0000009a,0x0003003e,0x00000097,0x0000009b,0x000200f9,0x00000099,0x000200f8,
>+	0x0000009c,0x0003003e,0x00000097,0x00000057,0x000200f9,0x00000099,0x000200f8,0x00000099,
>+	0x0004003d,0x00000011,0x0000009d,0x00000097,0x0004007c,0x00000006,0x0000009e,0x0000009d,
>+	0x000500c5,0x00000006,0x0000009f,0x00000095,0x0000009e,0x0004007c,0x00000011,0x000000a0,
>+	0x0000009f,0x0003003e,0x00000094,0x000000a0,0x0004003d,0x00000011,0x000000a1,0x00000094,
>+	0x000200fe,0x000000a1,0x00010038,0x00050036,0x00000017,0x0000001a,0x00000000,0x00000018,
>+	0x00030037,0x00000016,0x00000019,0x000200f8,0x0000001b,0x0004003d,0x00000011,0x000000a4,
>+	0x00000019,0x0004006f,0x00000017,0x000000a5,0x000000a4,0x000200fe,0x000000a5,0x00010038,
>+	0x00050036,0x00000006,0x00000020,0x00000000,0x0000001d,0x00030037,0x00000007,0x0000001e,
>+	0x00030037,0x0000001c,0x0000001f,0x000200f8,0x00000021,0x0004003b,0x00000007,0x000000a8,
>+	0x00000007,0x0004003d,0x00000017,0x000000a9,0x0000001f,0x0004007c,0x00000011,0x000000aa,
>+	0x000000a9,0x0004007c,0x00000006,0x000000ab,0x000000aa,0x0003003e,0x000000a8,0x000000ab,
>+	0x0004003d,0x00000006,0x000000ac,0x000000a8,0x000200fe,0x000000ac,0x00010038,0x00050036,
>+	0x00000002,0x00000024,0x00000000,0x00000022,0x00030037,0x00000007,0x00000023,0x000200f8,
>+	0x00000025,0x00050041,0x000000b6,0x000000b7,0x000000b5,0x00000092,0x0004003d,0x00000006,
>+	0x000000b8,0x000000b7,0x00050041,0x0000002b,0x000000ba,0x00000029,0x000000b9,0x0004003d,
>+	0x00000006,0x000000bb,0x000000ba,0x00050086,0x00000006,0x000000bc,0x000000bb,0x0000003d,
>+	0x00050080,0x00000006,0x000000bd,0x000000b8,0x000000bc,0x0004003d,0x00000006,0x000000be,
>+	0x00000023,0x00060041,0x00000066,0x000000bf,0x000000b2,0x00000057,0x000000bd,0x0003003e,
>+	0x000000bf,0x000000be,0x000100fd,0x00010038
>+};
>+
>+#if 0  // Generated from:
>+#version 450 core
>+
>+layout(local_size_x = 64, local_size_y = 1, local_size_z = 1)in;
>+
>+layout(set = 0, binding = 0)buffer dest
>+{
>+    uint destData[];
>+};
>+
>+layout(set = 0, binding = 1)buffer src
>+{
>+    uint srcData[];
>+};
>+
>+layout(push_constant)uniform PushConstants
>+{
>+
>+    uint outputCount;
>+
>+    uint componentCount;
>+
>+    uint srcOffset;
>+    uint destOffset;
>+
>+    uint Ns;
>+    uint Bs;
>+    uint Ss;
>+    uint Es;
>+
>+    uint Nd;
>+    uint Bd;
>+    uint Sd;
>+    uint Ed;
>+} params;
>+
>+uint getSourceComponentOffset(uint vertex, uint component)
>+{
>+    return vertex * params . Ss + component * params . Bs + params . srcOffset;
>+}
>+
>+uint getDestinationComponentOffset(uint vertex, uint component)
>+{
>+    return vertex * params . Sd + component * 4 + params . destOffset;
>+}
>+
>+uint getShiftBits(uint offset, uint B)
>+{
>+
>+    uint shift =(offset % 4)* 8;
>+
>+    return shift;
>+}
>+
>+      int loadSourceComponent(uint cd)
>+{
>+
>+    uint vertex = cd / params . Nd;
>+    uint component = cd % params . Nd;
>+
>+    if(component >= params . Ns)
>+    {
>+        return 0;
>+    }
>+
>+    uint offset = getSourceComponentOffset(vertex, component);
>+    uint block = srcData[offset / 4];
>+    uint shiftBits = getShiftBits(offset, params . Bs);
>+
>+    uint valueBits = params . Bs * 8;
>+    uint valueMask = valueBits == 32 ? - 1 :(1 << valueBits)- 1;
>+    uint valueAsUint =(block >> shiftBits)& valueMask;
>+
>+    bool isNegative =(valueAsUint &(1 <<(valueBits - 1)))!= 0;
>+
>+          int value = int(valueAsUint |(isNegative ? 0xFFFFFFFF << valueBits : 0));
>+
>+    return value;
>+}
>+
>+       float convertComponent(int srcValue)
>+{
>+
>+    return srcValue;
>+}
>+
>+uint makeDestinationComponent(uint cd, float value)
>+{
>+
>+    uint valueAsUint = floatBitsToInt(value);
>+
>+    return valueAsUint;
>+}
>+
>+void storeDestinationComponents(uint valueAsUint)
>+{
>+
>+    destData[gl_GlobalInvocationID . x + params . destOffset / 4]= valueAsUint;
>+}
>+
>+void main()
>+{
>+
>+    if(gl_GlobalInvocationID . x >= params . outputCount)
>+        return;
>+
>+    uint valueOut = 0;
>+    for(uint i = 0;i < 1;++ i)
>+    {
>+        uint cd = gl_GlobalInvocationID . x * 1 + i;
>+
>+        if(cd >= params . componentCount)
>+        {
>+            break;
>+        }
>+
>+              int srcValue = loadSourceComponent(cd);
>+               float destValue = convertComponent(srcValue);
>+        valueOut |= makeDestinationComponent(cd, destValue);
>+    }
>+
>+    storeDestinationComponents(valueOut);
>+}
>+#endif  // Preprocessed code
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.00000005.inc b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.00000005.inc
>new file mode 100644
>index 00000000000..8eb07456ae7
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.00000005.inc
>@@ -0,0 +1,308 @@
>+	// 7.11.3188
>+	 #pragma once
>+const uint32_t kConvertVertex_comp_00000005[] = {
>+	0x07230203,0x00010000,0x00080007,0x000000e5,0x00000000,0x00020011,0x00000001,0x0006000b,
>+	0x00000001,0x4c534c47,0x6474732e,0x3035342e,0x00000000,0x0003000e,0x00000000,0x00000001,
>+	0x0006000f,0x00000005,0x00000004,0x6e69616d,0x00000000,0x000000b5,0x00060010,0x00000004,
>+	0x00000011,0x00000040,0x00000001,0x00000001,0x00030003,0x00000002,0x000001c2,0x00040005,
>+	0x00000004,0x6e69616d,0x00000000,0x000a0005,0x0000000b,0x53746567,0x6372756f,0x6d6f4365,
>+	0x656e6f70,0x664f746e,0x74657366,0x3b317528,0x003b3175,0x00040005,0x00000009,0x74726576,
>+	0x00007865,0x00050005,0x0000000a,0x706d6f63,0x6e656e6f,0x00000074,0x00070005,0x0000000f,
>+	0x53746567,0x74666968,0x73746942,0x3b317528,0x003b3175,0x00040005,0x0000000d,0x7366666f,
>+	0x00007465,0x00030005,0x0000000e,0x00000042,0x00080005,0x00000014,0x64616f6c,0x72756f53,
>+	0x6f436563,0x6e6f706d,0x28746e65,0x003b3175,0x00030005,0x00000013,0x00006463,0x00080005,
>+	0x0000001a,0x766e6f63,0x43747265,0x6f706d6f,0x746e656e,0x3b316928,0x00000000,0x00050005,
>+	0x00000019,0x56637273,0x65756c61,0x00000000,0x000a0005,0x00000020,0x656b616d,0x74736544,
>+	0x74616e69,0x436e6f69,0x6f706d6f,0x746e656e,0x3b317528,0x003b3166,0x00030005,0x0000001e,
>+	0x00006463,0x00040005,0x0000001f,0x756c6176,0x00000065,0x000a0005,0x00000024,0x726f7473,
>+	0x73654465,0x616e6974,0x6e6f6974,0x706d6f43,0x6e656e6f,0x75287374,0x00003b31,0x00050005,
>+	0x00000023,0x756c6176,0x55734165,0x00746e69,0x00060005,0x00000027,0x68737550,0x736e6f43,
>+	0x746e6174,0x00000073,0x00060006,0x00000027,0x00000000,0x7074756f,0x6f437475,0x00746e75,
>+	0x00070006,0x00000027,0x00000001,0x706d6f63,0x6e656e6f,0x756f4374,0x0000746e,0x00060006,
>+	0x00000027,0x00000002,0x4f637273,0x65736666,0x00000074,0x00060006,0x00000027,0x00000003,
>+	0x74736564,0x7366664f,0x00007465,0x00040006,0x00000027,0x00000004,0x0000734e,0x00040006,
>+	0x00000027,0x00000005,0x00007342,0x00040006,0x00000027,0x00000006,0x00007353,0x00040006,
>+	0x00000027,0x00000007,0x00007345,0x00040006,0x00000027,0x00000008,0x0000644e,0x00040006,
>+	0x00000027,0x00000009,0x00006442,0x00040006,0x00000027,0x0000000a,0x00006453,0x00040006,
>+	0x00000027,0x0000000b,0x00006445,0x00040005,0x00000029,0x61726170,0x0000736d,0x00040005,
>+	0x0000003b,0x66696873,0x00000074,0x00040005,0x00000044,0x74726576,0x00007865,0x00050005,
>+	0x0000004a,0x706d6f63,0x6e656e6f,0x00000074,0x00040005,0x00000059,0x7366666f,0x00007465,
>+	0x00040005,0x0000005a,0x61726170,0x0000006d,0x00040005,0x0000005c,0x61726170,0x0000006d,
>+	0x00040005,0x0000005f,0x636f6c62,0x0000006b,0x00030005,0x00000061,0x00637273,0x00050006,
>+	0x00000061,0x00000000,0x44637273,0x00617461,0x00030005,0x00000063,0x00000000,0x00050005,
>+	0x00000069,0x66696873,0x74694274,0x00000073,0x00040005,0x0000006a,0x61726170,0x0000006d,
>+	0x00040005,0x0000006c,0x61726170,0x0000006d,0x00050005,0x00000070,0x756c6176,0x74694265,
>+	0x00000073,0x00050005,0x00000074,0x756c6176,0x73614d65,0x0000006b,0x00050005,0x00000083,
>+	0x756c6176,0x55734165,0x00746e69,0x00050005,0x0000008a,0x654e7369,0x69746167,0x00006576,
>+	0x00040005,0x00000094,0x756c6176,0x00000065,0x00050005,0x000000a8,0x756c6176,0x55734165,
>+	0x00746e69,0x00040005,0x000000b0,0x74736564,0x00000000,0x00060006,0x000000b0,0x00000000,
>+	0x74736564,0x61746144,0x00000000,0x00030005,0x000000b2,0x00000000,0x00080005,0x000000b5,
>+	0x475f6c67,0x61626f6c,0x766e496c,0x7461636f,0x496e6f69,0x00000044,0x00050005,0x000000c0,
>+	0x756c6176,0x74754f65,0x00000000,0x00030005,0x000000c1,0x00000069,0x00030005,0x000000c9,
>+	0x00006463,0x00050005,0x000000cf,0x56637273,0x65756c61,0x00000000,0x00040005,0x000000d0,
>+	0x61726170,0x0000006d,0x00050005,0x000000d3,0x74736564,0x756c6156,0x00000065,0x00040005,
>+	0x000000d4,0x61726170,0x0000006d,0x00040005,0x000000d7,0x61726170,0x0000006d,0x00040005,
>+	0x000000d9,0x61726170,0x0000006d,0x00040005,0x000000e0,0x61726170,0x0000006d,0x00050048,
>+	0x00000027,0x00000000,0x00000023,0x00000000,0x00050048,0x00000027,0x00000001,0x00000023,
>+	0x00000004,0x00050048,0x00000027,0x00000002,0x00000023,0x00000008,0x00050048,0x00000027,
>+	0x00000003,0x00000023,0x0000000c,0x00050048,0x00000027,0x00000004,0x00000023,0x00000010,
>+	0x00050048,0x00000027,0x00000005,0x00000023,0x00000014,0x00050048,0x00000027,0x00000006,
>+	0x00000023,0x00000018,0x00050048,0x00000027,0x00000007,0x00000023,0x0000001c,0x00050048,
>+	0x00000027,0x00000008,0x00000023,0x00000020,0x00050048,0x00000027,0x00000009,0x00000023,
>+	0x00000024,0x00050048,0x00000027,0x0000000a,0x00000023,0x00000028,0x00050048,0x00000027,
>+	0x0000000b,0x00000023,0x0000002c,0x00030047,0x00000027,0x00000002,0x00040047,0x00000060,
>+	0x00000006,0x00000004,0x00050048,0x00000061,0x00000000,0x00000023,0x00000000,0x00030047,
>+	0x00000061,0x00000003,0x00040047,0x00000063,0x00000022,0x00000000,0x00040047,0x00000063,
>+	0x00000021,0x00000001,0x00040047,0x000000af,0x00000006,0x00000004,0x00050048,0x000000b0,
>+	0x00000000,0x00000023,0x00000000,0x00030047,0x000000b0,0x00000003,0x00040047,0x000000b2,
>+	0x00000022,0x00000000,0x00040047,0x000000b2,0x00000021,0x00000000,0x00040047,0x000000b5,
>+	0x0000000b,0x0000001c,0x00040047,0x000000e4,0x0000000b,0x00000019,0x00020013,0x00000002,
>+	0x00030021,0x00000003,0x00000002,0x00040015,0x00000006,0x00000020,0x00000000,0x00040020,
>+	0x00000007,0x00000007,0x00000006,0x00050021,0x00000008,0x00000006,0x00000007,0x00000007,
>+	0x00040015,0x00000011,0x00000020,0x00000001,0x00040021,0x00000012,0x00000011,0x00000007,
>+	0x00040020,0x00000016,0x00000007,0x00000011,0x00030016,0x00000017,0x00000020,0x00040021,
>+	0x00000018,0x00000017,0x00000016,0x00040020,0x0000001c,0x00000007,0x00000017,0x00050021,
>+	0x0000001d,0x00000006,0x00000007,0x0000001c,0x00040021,0x00000022,0x00000002,0x00000007,
>+	0x000e001e,0x00000027,0x00000006,0x00000006,0x00000006,0x00000006,0x00000006,0x00000006,
>+	0x00000006,0x00000006,0x00000006,0x00000006,0x00000006,0x00000006,0x00040020,0x00000028,
>+	0x00000009,0x00000027,0x0004003b,0x00000028,0x00000029,0x00000009,0x0004002b,0x00000011,
>+	0x0000002a,0x00000006,0x00040020,0x0000002b,0x00000009,0x00000006,0x0004002b,0x00000011,
>+	0x00000030,0x00000005,0x0004002b,0x00000011,0x00000035,0x00000002,0x0004002b,0x00000006,
>+	0x0000003d,0x00000004,0x0004002b,0x00000006,0x0000003f,0x00000008,0x0004002b,0x00000011,
>+	0x00000046,0x00000008,0x0004002b,0x00000011,0x00000050,0x00000004,0x00020014,0x00000053,
>+	0x0004002b,0x00000011,0x00000057,0x00000000,0x0003001d,0x00000060,0x00000006,0x0003001e,
>+	0x00000061,0x00000060,0x00040020,0x00000062,0x00000002,0x00000061,0x0004003b,0x00000062,
>+	0x00000063,0x00000002,0x00040020,0x00000066,0x00000002,0x00000006,0x0004002b,0x00000006,
>+	0x00000076,0x00000020,0x0004002b,0x00000011,0x0000007b,0xffffffff,0x0004002b,0x00000011,
>+	0x0000007d,0x00000001,0x00040020,0x00000089,0x00000007,0x00000053,0x0004002b,0x00000006,
>+	0x0000008d,0x00000001,0x0004002b,0x00000006,0x00000092,0x00000000,0x0003001d,0x000000af,
>+	0x00000006,0x0003001e,0x000000b0,0x000000af,0x00040020,0x000000b1,0x00000002,0x000000b0,
>+	0x0004003b,0x000000b1,0x000000b2,0x00000002,0x00040017,0x000000b3,0x00000006,0x00000003,
>+	0x00040020,0x000000b4,0x00000001,0x000000b3,0x0004003b,0x000000b4,0x000000b5,0x00000001,
>+	0x00040020,0x000000b6,0x00000001,0x00000006,0x0004002b,0x00000011,0x000000b9,0x00000003,
>+	0x0004002b,0x00000006,0x000000e3,0x00000040,0x0006002c,0x000000b3,0x000000e4,0x000000e3,
>+	0x0000008d,0x0000008d,0x00050036,0x00000002,0x00000004,0x00000000,0x00000003,0x000200f8,
>+	0x00000005,0x0004003b,0x00000007,0x000000c0,0x00000007,0x0004003b,0x00000007,0x000000c1,
>+	0x00000007,0x0004003b,0x00000007,0x000000c9,0x00000007,0x0004003b,0x00000016,0x000000cf,
>+	0x00000007,0x0004003b,0x00000007,0x000000d0,0x00000007,0x0004003b,0x0000001c,0x000000d3,
>+	0x00000007,0x0004003b,0x00000016,0x000000d4,0x00000007,0x0004003b,0x00000007,0x000000d7,
>+	0x00000007,0x0004003b,0x0000001c,0x000000d9,0x00000007,0x0004003b,0x00000007,0x000000e0,
>+	0x00000007,0x0003003e,0x000000c0,0x00000092,0x0003003e,0x000000c1,0x00000092,0x000200f9,
>+	0x000000c2,0x000200f8,0x000000c2,0x000400f6,0x000000c4,0x000000c5,0x00000000,0x000200f9,
>+	0x000000c6,0x000200f8,0x000000c6,0x0004003d,0x00000006,0x000000c7,0x000000c1,0x000500b0,
>+	0x00000053,0x000000c8,0x000000c7,0x0000008d,0x000400fa,0x000000c8,0x000000c3,0x000000c4,
>+	0x000200f8,0x000000c3,0x00050041,0x000000b6,0x000000ca,0x000000b5,0x00000092,0x0004003d,
>+	0x00000006,0x000000cb,0x000000ca,0x00050084,0x00000006,0x000000cc,0x000000cb,0x0000008d,
>+	0x0004003d,0x00000006,0x000000cd,0x000000c1,0x00050080,0x00000006,0x000000ce,0x000000cc,
>+	0x000000cd,0x0003003e,0x000000c9,0x000000ce,0x0004003d,0x00000006,0x000000d1,0x000000c9,
>+	0x0003003e,0x000000d0,0x000000d1,0x00050039,0x00000011,0x000000d2,0x00000014,0x000000d0,
>+	0x0003003e,0x000000cf,0x000000d2,0x0004003d,0x00000011,0x000000d5,0x000000cf,0x0003003e,
>+	0x000000d4,0x000000d5,0x00050039,0x00000017,0x000000d6,0x0000001a,0x000000d4,0x0003003e,
>+	0x000000d3,0x000000d6,0x0004003d,0x00000006,0x000000d8,0x000000c9,0x0003003e,0x000000d7,
>+	0x000000d8,0x0004003d,0x00000017,0x000000da,0x000000d3,0x0003003e,0x000000d9,0x000000da,
>+	0x00060039,0x00000006,0x000000db,0x00000020,0x000000d7,0x000000d9,0x0004003d,0x00000006,
>+	0x000000dc,0x000000c0,0x000500c5,0x00000006,0x000000dd,0x000000dc,0x000000db,0x0003003e,
>+	0x000000c0,0x000000dd,0x000200f9,0x000000c5,0x000200f8,0x000000c5,0x0004003d,0x00000006,
>+	0x000000de,0x000000c1,0x00050080,0x00000006,0x000000df,0x000000de,0x0000007d,0x0003003e,
>+	0x000000c1,0x000000df,0x000200f9,0x000000c2,0x000200f8,0x000000c4,0x0004003d,0x00000006,
>+	0x000000e1,0x000000c0,0x0003003e,0x000000e0,0x000000e1,0x00050039,0x00000002,0x000000e2,
>+	0x00000024,0x000000e0,0x000100fd,0x00010038,0x00050036,0x00000006,0x0000000b,0x00000000,
>+	0x00000008,0x00030037,0x00000007,0x00000009,0x00030037,0x00000007,0x0000000a,0x000200f8,
>+	0x0000000c,0x0004003d,0x00000006,0x00000026,0x00000009,0x00050041,0x0000002b,0x0000002c,
>+	0x00000029,0x0000002a,0x0004003d,0x00000006,0x0000002d,0x0000002c,0x00050084,0x00000006,
>+	0x0000002e,0x00000026,0x0000002d,0x0004003d,0x00000006,0x0000002f,0x0000000a,0x00050041,
>+	0x0000002b,0x00000031,0x00000029,0x00000030,0x0004003d,0x00000006,0x00000032,0x00000031,
>+	0x00050084,0x00000006,0x00000033,0x0000002f,0x00000032,0x00050080,0x00000006,0x00000034,
>+	0x0000002e,0x00000033,0x00050041,0x0000002b,0x00000036,0x00000029,0x00000035,0x0004003d,
>+	0x00000006,0x00000037,0x00000036,0x00050080,0x00000006,0x00000038,0x00000034,0x00000037,
>+	0x000200fe,0x00000038,0x00010038,0x00050036,0x00000006,0x0000000f,0x00000000,0x00000008,
>+	0x00030037,0x00000007,0x0000000d,0x00030037,0x00000007,0x0000000e,0x000200f8,0x00000010,
>+	0x0004003b,0x00000007,0x0000003b,0x00000007,0x0004003d,0x00000006,0x0000003c,0x0000000d,
>+	0x00050089,0x00000006,0x0000003e,0x0000003c,0x0000003d,0x00050084,0x00000006,0x00000040,
>+	0x0000003e,0x0000003f,0x0003003e,0x0000003b,0x00000040,0x0004003d,0x00000006,0x00000041,
>+	0x0000003b,0x000200fe,0x00000041,0x00010038,0x00050036,0x00000011,0x00000014,0x00000000,
>+	0x00000012,0x00030037,0x00000007,0x00000013,0x000200f8,0x00000015,0x0004003b,0x00000007,
>+	0x00000044,0x00000007,0x0004003b,0x00000007,0x0000004a,0x00000007,0x0004003b,0x00000007,
>+	0x00000059,0x00000007,0x0004003b,0x00000007,0x0000005a,0x00000007,0x0004003b,0x00000007,
>+	0x0000005c,0x00000007,0x0004003b,0x00000007,0x0000005f,0x00000007,0x0004003b,0x00000007,
>+	0x00000069,0x00000007,0x0004003b,0x00000007,0x0000006a,0x00000007,0x0004003b,0x00000007,
>+	0x0000006c,0x00000007,0x0004003b,0x00000007,0x00000070,0x00000007,0x0004003b,0x00000007,
>+	0x00000074,0x00000007,0x0004003b,0x00000016,0x00000078,0x00000007,0x0004003b,0x00000007,
>+	0x00000083,0x00000007,0x0004003b,0x00000089,0x0000008a,0x00000007,0x0004003b,0x00000016,
>+	0x00000094,0x00000007,0x0004003b,0x00000016,0x00000097,0x00000007,0x0004003d,0x00000006,
>+	0x00000045,0x00000013,0x00050041,0x0000002b,0x00000047,0x00000029,0x00000046,0x0004003d,
>+	0x00000006,0x00000048,0x00000047,0x00050086,0x00000006,0x00000049,0x00000045,0x00000048,
>+	0x0003003e,0x00000044,0x00000049,0x0004003d,0x00000006,0x0000004b,0x00000013,0x00050041,
>+	0x0000002b,0x0000004c,0x00000029,0x00000046,0x0004003d,0x00000006,0x0000004d,0x0000004c,
>+	0x00050089,0x00000006,0x0000004e,0x0000004b,0x0000004d,0x0003003e,0x0000004a,0x0000004e,
>+	0x0004003d,0x00000006,0x0000004f,0x0000004a,0x00050041,0x0000002b,0x00000051,0x00000029,
>+	0x00000050,0x0004003d,0x00000006,0x00000052,0x00000051,0x000500ae,0x00000053,0x00000054,
>+	0x0000004f,0x00000052,0x000300f7,0x00000056,0x00000000,0x000400fa,0x00000054,0x00000055,
>+	0x00000056,0x000200f8,0x00000055,0x000200fe,0x00000057,0x000200f8,0x00000056,0x0004003d,
>+	0x00000006,0x0000005b,0x00000044,0x0003003e,0x0000005a,0x0000005b,0x0004003d,0x00000006,
>+	0x0000005d,0x0000004a,0x0003003e,0x0000005c,0x0000005d,0x00060039,0x00000006,0x0000005e,
>+	0x0000000b,0x0000005a,0x0000005c,0x0003003e,0x00000059,0x0000005e,0x0004003d,0x00000006,
>+	0x00000064,0x00000059,0x00050086,0x00000006,0x00000065,0x00000064,0x0000003d,0x00060041,
>+	0x00000066,0x00000067,0x00000063,0x00000057,0x00000065,0x0004003d,0x00000006,0x00000068,
>+	0x00000067,0x0003003e,0x0000005f,0x00000068,0x0004003d,0x00000006,0x0000006b,0x00000059,
>+	0x0003003e,0x0000006a,0x0000006b,0x00050041,0x0000002b,0x0000006d,0x00000029,0x00000030,
>+	0x0004003d,0x00000006,0x0000006e,0x0000006d,0x0003003e,0x0000006c,0x0000006e,0x00060039,
>+	0x00000006,0x0000006f,0x0000000f,0x0000006a,0x0000006c,0x0003003e,0x00000069,0x0000006f,
>+	0x00050041,0x0000002b,0x00000071,0x00000029,0x00000030,0x0004003d,0x00000006,0x00000072,
>+	0x00000071,0x00050084,0x00000006,0x00000073,0x00000072,0x0000003f,0x0003003e,0x00000070,
>+	0x00000073,0x0004003d,0x00000006,0x00000075,0x00000070,0x000500aa,0x00000053,0x00000077,
>+	0x00000075,0x00000076,0x000300f7,0x0000007a,0x00000000,0x000400fa,0x00000077,0x00000079,
>+	0x0000007c,0x000200f8,0x00000079,0x0003003e,0x00000078,0x0000007b,0x000200f9,0x0000007a,
>+	0x000200f8,0x0000007c,0x0004003d,0x00000006,0x0000007e,0x00000070,0x000500c4,0x00000011,
>+	0x0000007f,0x0000007d,0x0000007e,0x00050082,0x00000011,0x00000080,0x0000007f,0x0000007d,
>+	0x0003003e,0x00000078,0x00000080,0x000200f9,0x0000007a,0x000200f8,0x0000007a,0x0004003d,
>+	0x00000011,0x00000081,0x00000078,0x0004007c,0x00000006,0x00000082,0x00000081,0x0003003e,
>+	0x00000074,0x00000082,0x0004003d,0x00000006,0x00000084,0x0000005f,0x0004003d,0x00000006,
>+	0x00000085,0x00000069,0x000500c2,0x00000006,0x00000086,0x00000084,0x00000085,0x0004003d,
>+	0x00000006,0x00000087,0x00000074,0x000500c7,0x00000006,0x00000088,0x00000086,0x00000087,
>+	0x0003003e,0x00000083,0x00000088,0x0004003d,0x00000006,0x0000008b,0x00000083,0x0004003d,
>+	0x00000006,0x0000008c,0x00000070,0x00050082,0x00000006,0x0000008e,0x0000008c,0x0000008d,
>+	0x000500c4,0x00000011,0x0000008f,0x0000007d,0x0000008e,0x0004007c,0x00000006,0x00000090,
>+	0x0000008f,0x000500c7,0x00000006,0x00000091,0x0000008b,0x00000090,0x000500ab,0x00000053,
>+	0x00000093,0x00000091,0x00000092,0x0003003e,0x0000008a,0x00000093,0x0004003d,0x00000006,
>+	0x00000095,0x00000083,0x0004003d,0x00000053,0x00000096,0x0000008a,0x000300f7,0x00000099,
>+	0x00000000,0x000400fa,0x00000096,0x00000098,0x0000009c,0x000200f8,0x00000098,0x0004003d,
>+	0x00000006,0x0000009a,0x00000070,0x000500c4,0x00000011,0x0000009b,0x0000007b,0x0000009a,
>+	0x0003003e,0x00000097,0x0000009b,0x000200f9,0x00000099,0x000200f8,0x0000009c,0x0003003e,
>+	0x00000097,0x00000057,0x000200f9,0x00000099,0x000200f8,0x00000099,0x0004003d,0x00000011,
>+	0x0000009d,0x00000097,0x0004007c,0x00000006,0x0000009e,0x0000009d,0x000500c5,0x00000006,
>+	0x0000009f,0x00000095,0x0000009e,0x0004007c,0x00000011,0x000000a0,0x0000009f,0x0003003e,
>+	0x00000094,0x000000a0,0x0004003d,0x00000011,0x000000a1,0x00000094,0x000200fe,0x000000a1,
>+	0x00010038,0x00050036,0x00000017,0x0000001a,0x00000000,0x00000018,0x00030037,0x00000016,
>+	0x00000019,0x000200f8,0x0000001b,0x0004003d,0x00000011,0x000000a4,0x00000019,0x0004006f,
>+	0x00000017,0x000000a5,0x000000a4,0x000200fe,0x000000a5,0x00010038,0x00050036,0x00000006,
>+	0x00000020,0x00000000,0x0000001d,0x00030037,0x00000007,0x0000001e,0x00030037,0x0000001c,
>+	0x0000001f,0x000200f8,0x00000021,0x0004003b,0x00000007,0x000000a8,0x00000007,0x0004003d,
>+	0x00000017,0x000000a9,0x0000001f,0x0004007c,0x00000011,0x000000aa,0x000000a9,0x0004007c,
>+	0x00000006,0x000000ab,0x000000aa,0x0003003e,0x000000a8,0x000000ab,0x0004003d,0x00000006,
>+	0x000000ac,0x000000a8,0x000200fe,0x000000ac,0x00010038,0x00050036,0x00000002,0x00000024,
>+	0x00000000,0x00000022,0x00030037,0x00000007,0x00000023,0x000200f8,0x00000025,0x00050041,
>+	0x000000b6,0x000000b7,0x000000b5,0x00000092,0x0004003d,0x00000006,0x000000b8,0x000000b7,
>+	0x00050041,0x0000002b,0x000000ba,0x00000029,0x000000b9,0x0004003d,0x00000006,0x000000bb,
>+	0x000000ba,0x00050086,0x00000006,0x000000bc,0x000000bb,0x0000003d,0x00050080,0x00000006,
>+	0x000000bd,0x000000b8,0x000000bc,0x0004003d,0x00000006,0x000000be,0x00000023,0x00060041,
>+	0x00000066,0x000000bf,0x000000b2,0x00000057,0x000000bd,0x0003003e,0x000000bf,0x000000be,
>+	0x000100fd,0x00010038
>+};
>+
>+#if 0  // Generated from:
>+#version 450 core
>+
>+layout(local_size_x = 64, local_size_y = 1, local_size_z = 1)in;
>+
>+layout(set = 0, binding = 0)buffer dest
>+{
>+    uint destData[];
>+};
>+
>+layout(set = 0, binding = 1)buffer src
>+{
>+    uint srcData[];
>+};
>+
>+layout(push_constant)uniform PushConstants
>+{
>+
>+    uint outputCount;
>+
>+    uint componentCount;
>+
>+    uint srcOffset;
>+    uint destOffset;
>+
>+    uint Ns;
>+    uint Bs;
>+    uint Ss;
>+    uint Es;
>+
>+    uint Nd;
>+    uint Bd;
>+    uint Sd;
>+    uint Ed;
>+} params;
>+
>+uint getSourceComponentOffset(uint vertex, uint component)
>+{
>+    return vertex * params . Ss + component * params . Bs + params . srcOffset;
>+}
>+
>+uint getDestinationComponentOffset(uint vertex, uint component)
>+{
>+    return vertex * params . Sd + component * 4 + params . destOffset;
>+}
>+
>+uint getShiftBits(uint offset, uint B)
>+{
>+
>+    uint shift =(offset % 4)* 8;
>+
>+    return shift;
>+}
>+
>+      int loadSourceComponent(uint cd)
>+{
>+
>+    uint vertex = cd / params . Nd;
>+    uint component = cd % params . Nd;
>+
>+    if(component >= params . Ns)
>+    {
>+        return 0;
>+    }
>+
>+    uint offset = getSourceComponentOffset(vertex, component);
>+    uint block = srcData[offset / 4];
>+    uint shiftBits = getShiftBits(offset, params . Bs);
>+
>+    uint valueBits = params . Bs * 8;
>+    uint valueMask = valueBits == 32 ? - 1 :(1 << valueBits)- 1;
>+    uint valueAsUint =(block >> shiftBits)& valueMask;
>+
>+    bool isNegative =(valueAsUint &(1 <<(valueBits - 1)))!= 0;
>+
>+          int value = int(valueAsUint |(isNegative ? 0xFFFFFFFF << valueBits : 0));
>+
>+    return value;
>+}
>+
>+       float convertComponent(int srcValue)
>+{
>+
>+    return srcValue;
>+}
>+
>+uint makeDestinationComponent(uint cd, float value)
>+{
>+
>+    uint valueAsUint = floatBitsToInt(value);
>+
>+    return valueAsUint;
>+}
>+
>+void storeDestinationComponents(uint valueAsUint)
>+{
>+
>+    destData[gl_GlobalInvocationID . x + params . destOffset / 4]= valueAsUint;
>+}
>+
>+void main()
>+{
>+
>+    uint valueOut = 0;
>+    for(uint i = 0;i < 1;++ i)
>+    {
>+        uint cd = gl_GlobalInvocationID . x * 1 + i;
>+
>+              int srcValue = loadSourceComponent(cd);
>+               float destValue = convertComponent(srcValue);
>+        valueOut |= makeDestinationComponent(cd, destValue);
>+    }
>+
>+    storeDestinationComponents(valueOut);
>+}
>+#endif  // Preprocessed code
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.00000006.inc b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.00000006.inc
>new file mode 100644
>index 00000000000..f0911cf9c4a
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.00000006.inc
>@@ -0,0 +1,309 @@
>+	// 7.11.3188
>+	 #pragma once
>+const uint32_t kConvertVertex_comp_00000006[] = {
>+	0x07230203,0x00010000,0x00080007,0x000000e0,0x00000000,0x00020011,0x00000001,0x0006000b,
>+	0x00000001,0x4c534c47,0x6474732e,0x3035342e,0x00000000,0x0003000e,0x00000000,0x00000001,
>+	0x0006000f,0x00000005,0x00000004,0x6e69616d,0x00000000,0x000000a0,0x00060010,0x00000004,
>+	0x00000011,0x00000040,0x00000001,0x00000001,0x00030003,0x00000002,0x000001c2,0x00040005,
>+	0x00000004,0x6e69616d,0x00000000,0x000a0005,0x0000000b,0x53746567,0x6372756f,0x6d6f4365,
>+	0x656e6f70,0x664f746e,0x74657366,0x3b317528,0x003b3175,0x00040005,0x00000009,0x74726576,
>+	0x00007865,0x00050005,0x0000000a,0x706d6f63,0x6e656e6f,0x00000074,0x00070005,0x0000000f,
>+	0x53746567,0x74666968,0x73746942,0x3b317528,0x003b3175,0x00040005,0x0000000d,0x7366666f,
>+	0x00007465,0x00030005,0x0000000e,0x00000042,0x00080005,0x00000013,0x64616f6c,0x72756f53,
>+	0x6f436563,0x6e6f706d,0x28746e65,0x003b3175,0x00030005,0x00000012,0x00006463,0x00080005,
>+	0x00000018,0x766e6f63,0x43747265,0x6f706d6f,0x746e656e,0x3b317528,0x00000000,0x00050005,
>+	0x00000017,0x56637273,0x65756c61,0x00000000,0x000a0005,0x0000001e,0x656b616d,0x74736544,
>+	0x74616e69,0x436e6f69,0x6f706d6f,0x746e656e,0x3b317528,0x003b3166,0x00030005,0x0000001c,
>+	0x00006463,0x00040005,0x0000001d,0x756c6176,0x00000065,0x000a0005,0x00000022,0x726f7473,
>+	0x73654465,0x616e6974,0x6e6f6974,0x706d6f43,0x6e656e6f,0x75287374,0x00003b31,0x00050005,
>+	0x00000021,0x756c6176,0x55734165,0x00746e69,0x00060005,0x00000025,0x68737550,0x736e6f43,
>+	0x746e6174,0x00000073,0x00060006,0x00000025,0x00000000,0x7074756f,0x6f437475,0x00746e75,
>+	0x00070006,0x00000025,0x00000001,0x706d6f63,0x6e656e6f,0x756f4374,0x0000746e,0x00060006,
>+	0x00000025,0x00000002,0x4f637273,0x65736666,0x00000074,0x00060006,0x00000025,0x00000003,
>+	0x74736564,0x7366664f,0x00007465,0x00040006,0x00000025,0x00000004,0x0000734e,0x00040006,
>+	0x00000025,0x00000005,0x00007342,0x00040006,0x00000025,0x00000006,0x00007353,0x00040006,
>+	0x00000025,0x00000007,0x00007345,0x00040006,0x00000025,0x00000008,0x0000644e,0x00040006,
>+	0x00000025,0x00000009,0x00006442,0x00040006,0x00000025,0x0000000a,0x00006453,0x00040006,
>+	0x00000025,0x0000000b,0x00006445,0x00040005,0x00000027,0x61726170,0x0000736d,0x00040005,
>+	0x0000003a,0x66696873,0x00000074,0x00040005,0x00000043,0x74726576,0x00007865,0x00050005,
>+	0x00000049,0x706d6f63,0x6e656e6f,0x00000074,0x00040005,0x00000058,0x7366666f,0x00007465,
>+	0x00040005,0x00000059,0x61726170,0x0000006d,0x00040005,0x0000005b,0x61726170,0x0000006d,
>+	0x00040005,0x0000005e,0x636f6c62,0x0000006b,0x00030005,0x00000060,0x00637273,0x00050006,
>+	0x00000060,0x00000000,0x44637273,0x00617461,0x00030005,0x00000062,0x00000000,0x00050005,
>+	0x00000069,0x66696873,0x74694274,0x00000073,0x00040005,0x0000006a,0x61726170,0x0000006d,
>+	0x00040005,0x0000006c,0x61726170,0x0000006d,0x00050005,0x00000070,0x756c6176,0x74694265,
>+	0x00000073,0x00050005,0x00000074,0x756c6176,0x73614d65,0x0000006b,0x00050005,0x00000084,
>+	0x756c6176,0x55734165,0x00746e69,0x00040005,0x0000008a,0x756c6176,0x00000065,0x00050005,
>+	0x00000093,0x756c6176,0x55734165,0x00746e69,0x00040005,0x0000009b,0x74736564,0x00000000,
>+	0x00060006,0x0000009b,0x00000000,0x74736564,0x61746144,0x00000000,0x00030005,0x0000009d,
>+	0x00000000,0x00080005,0x000000a0,0x475f6c67,0x61626f6c,0x766e496c,0x7461636f,0x496e6f69,
>+	0x00000044,0x00050005,0x000000b3,0x756c6176,0x74754f65,0x00000000,0x00030005,0x000000b4,
>+	0x00000069,0x00030005,0x000000bd,0x00006463,0x00050005,0x000000ca,0x56637273,0x65756c61,
>+	0x00000000,0x00040005,0x000000cb,0x61726170,0x0000006d,0x00050005,0x000000ce,0x74736564,
>+	0x756c6156,0x00000065,0x00040005,0x000000cf,0x61726170,0x0000006d,0x00040005,0x000000d2,
>+	0x61726170,0x0000006d,0x00040005,0x000000d4,0x61726170,0x0000006d,0x00040005,0x000000db,
>+	0x61726170,0x0000006d,0x00050048,0x00000025,0x00000000,0x00000023,0x00000000,0x00050048,
>+	0x00000025,0x00000001,0x00000023,0x00000004,0x00050048,0x00000025,0x00000002,0x00000023,
>+	0x00000008,0x00050048,0x00000025,0x00000003,0x00000023,0x0000000c,0x00050048,0x00000025,
>+	0x00000004,0x00000023,0x00000010,0x00050048,0x00000025,0x00000005,0x00000023,0x00000014,
>+	0x00050048,0x00000025,0x00000006,0x00000023,0x00000018,0x00050048,0x00000025,0x00000007,
>+	0x00000023,0x0000001c,0x00050048,0x00000025,0x00000008,0x00000023,0x00000020,0x00050048,
>+	0x00000025,0x00000009,0x00000023,0x00000024,0x00050048,0x00000025,0x0000000a,0x00000023,
>+	0x00000028,0x00050048,0x00000025,0x0000000b,0x00000023,0x0000002c,0x00030047,0x00000025,
>+	0x00000002,0x00040047,0x0000005f,0x00000006,0x00000004,0x00050048,0x00000060,0x00000000,
>+	0x00000023,0x00000000,0x00030047,0x00000060,0x00000003,0x00040047,0x00000062,0x00000022,
>+	0x00000000,0x00040047,0x00000062,0x00000021,0x00000001,0x00040047,0x0000009a,0x00000006,
>+	0x00000004,0x00050048,0x0000009b,0x00000000,0x00000023,0x00000000,0x00030047,0x0000009b,
>+	0x00000003,0x00040047,0x0000009d,0x00000022,0x00000000,0x00040047,0x0000009d,0x00000021,
>+	0x00000000,0x00040047,0x000000a0,0x0000000b,0x0000001c,0x00040047,0x000000df,0x0000000b,
>+	0x00000019,0x00020013,0x00000002,0x00030021,0x00000003,0x00000002,0x00040015,0x00000006,
>+	0x00000020,0x00000000,0x00040020,0x00000007,0x00000007,0x00000006,0x00050021,0x00000008,
>+	0x00000006,0x00000007,0x00000007,0x00040021,0x00000011,0x00000006,0x00000007,0x00030016,
>+	0x00000015,0x00000020,0x00040021,0x00000016,0x00000015,0x00000007,0x00040020,0x0000001a,
>+	0x00000007,0x00000015,0x00050021,0x0000001b,0x00000006,0x00000007,0x0000001a,0x00040021,
>+	0x00000020,0x00000002,0x00000007,0x000e001e,0x00000025,0x00000006,0x00000006,0x00000006,
>+	0x00000006,0x00000006,0x00000006,0x00000006,0x00000006,0x00000006,0x00000006,0x00000006,
>+	0x00000006,0x00040020,0x00000026,0x00000009,0x00000025,0x0004003b,0x00000026,0x00000027,
>+	0x00000009,0x00040015,0x00000028,0x00000020,0x00000001,0x0004002b,0x00000028,0x00000029,
>+	0x00000006,0x00040020,0x0000002a,0x00000009,0x00000006,0x0004002b,0x00000028,0x0000002f,
>+	0x00000005,0x0004002b,0x00000028,0x00000034,0x00000002,0x0004002b,0x00000006,0x0000003c,
>+	0x00000004,0x0004002b,0x00000006,0x0000003e,0x00000008,0x0004002b,0x00000028,0x00000045,
>+	0x00000008,0x0004002b,0x00000028,0x0000004f,0x00000004,0x00020014,0x00000052,0x0004002b,
>+	0x00000006,0x00000056,0x00000000,0x0003001d,0x0000005f,0x00000006,0x0003001e,0x00000060,
>+	0x0000005f,0x00040020,0x00000061,0x00000002,0x00000060,0x0004003b,0x00000061,0x00000062,
>+	0x00000002,0x0004002b,0x00000028,0x00000063,0x00000000,0x00040020,0x00000066,0x00000002,
>+	0x00000006,0x0004002b,0x00000006,0x00000076,0x00000020,0x00040020,0x00000078,0x00000007,
>+	0x00000028,0x0004002b,0x00000028,0x0000007c,0xffffffff,0x0004002b,0x00000028,0x0000007e,
>+	0x00000001,0x0003001d,0x0000009a,0x00000006,0x0003001e,0x0000009b,0x0000009a,0x00040020,
>+	0x0000009c,0x00000002,0x0000009b,0x0004003b,0x0000009c,0x0000009d,0x00000002,0x00040017,
>+	0x0000009e,0x00000006,0x00000003,0x00040020,0x0000009f,0x00000001,0x0000009e,0x0004003b,
>+	0x0000009f,0x000000a0,0x00000001,0x00040020,0x000000a1,0x00000001,0x00000006,0x0004002b,
>+	0x00000028,0x000000a4,0x00000003,0x0004002b,0x00000006,0x000000bb,0x00000001,0x0004002b,
>+	0x00000006,0x000000de,0x00000040,0x0006002c,0x0000009e,0x000000df,0x000000de,0x000000bb,
>+	0x000000bb,0x00050036,0x00000002,0x00000004,0x00000000,0x00000003,0x000200f8,0x00000005,
>+	0x0004003b,0x00000007,0x000000b3,0x00000007,0x0004003b,0x00000007,0x000000b4,0x00000007,
>+	0x0004003b,0x00000007,0x000000bd,0x00000007,0x0004003b,0x00000007,0x000000ca,0x00000007,
>+	0x0004003b,0x00000007,0x000000cb,0x00000007,0x0004003b,0x0000001a,0x000000ce,0x00000007,
>+	0x0004003b,0x00000007,0x000000cf,0x00000007,0x0004003b,0x00000007,0x000000d2,0x00000007,
>+	0x0004003b,0x0000001a,0x000000d4,0x00000007,0x0004003b,0x00000007,0x000000db,0x00000007,
>+	0x00050041,0x000000a1,0x000000ab,0x000000a0,0x00000056,0x0004003d,0x00000006,0x000000ac,
>+	0x000000ab,0x00050041,0x0000002a,0x000000ad,0x00000027,0x00000063,0x0004003d,0x00000006,
>+	0x000000ae,0x000000ad,0x000500ae,0x00000052,0x000000af,0x000000ac,0x000000ae,0x000300f7,
>+	0x000000b1,0x00000000,0x000400fa,0x000000af,0x000000b0,0x000000b1,0x000200f8,0x000000b0,
>+	0x000100fd,0x000200f8,0x000000b1,0x0003003e,0x000000b3,0x00000056,0x0003003e,0x000000b4,
>+	0x00000056,0x000200f9,0x000000b5,0x000200f8,0x000000b5,0x000400f6,0x000000b7,0x000000b8,
>+	0x00000000,0x000200f9,0x000000b9,0x000200f8,0x000000b9,0x0004003d,0x00000006,0x000000ba,
>+	0x000000b4,0x000500b0,0x00000052,0x000000bc,0x000000ba,0x000000bb,0x000400fa,0x000000bc,
>+	0x000000b6,0x000000b7,0x000200f8,0x000000b6,0x00050041,0x000000a1,0x000000be,0x000000a0,
>+	0x00000056,0x0004003d,0x00000006,0x000000bf,0x000000be,0x00050084,0x00000006,0x000000c0,
>+	0x000000bf,0x000000bb,0x0004003d,0x00000006,0x000000c1,0x000000b4,0x00050080,0x00000006,
>+	0x000000c2,0x000000c0,0x000000c1,0x0003003e,0x000000bd,0x000000c2,0x0004003d,0x00000006,
>+	0x000000c3,0x000000bd,0x00050041,0x0000002a,0x000000c4,0x00000027,0x0000007e,0x0004003d,
>+	0x00000006,0x000000c5,0x000000c4,0x000500ae,0x00000052,0x000000c6,0x000000c3,0x000000c5,
>+	0x000300f7,0x000000c8,0x00000000,0x000400fa,0x000000c6,0x000000c7,0x000000c8,0x000200f8,
>+	0x000000c7,0x000200f9,0x000000b7,0x000200f8,0x000000c8,0x0004003d,0x00000006,0x000000cc,
>+	0x000000bd,0x0003003e,0x000000cb,0x000000cc,0x00050039,0x00000006,0x000000cd,0x00000013,
>+	0x000000cb,0x0003003e,0x000000ca,0x000000cd,0x0004003d,0x00000006,0x000000d0,0x000000ca,
>+	0x0003003e,0x000000cf,0x000000d0,0x00050039,0x00000015,0x000000d1,0x00000018,0x000000cf,
>+	0x0003003e,0x000000ce,0x000000d1,0x0004003d,0x00000006,0x000000d3,0x000000bd,0x0003003e,
>+	0x000000d2,0x000000d3,0x0004003d,0x00000015,0x000000d5,0x000000ce,0x0003003e,0x000000d4,
>+	0x000000d5,0x00060039,0x00000006,0x000000d6,0x0000001e,0x000000d2,0x000000d4,0x0004003d,
>+	0x00000006,0x000000d7,0x000000b3,0x000500c5,0x00000006,0x000000d8,0x000000d7,0x000000d6,
>+	0x0003003e,0x000000b3,0x000000d8,0x000200f9,0x000000b8,0x000200f8,0x000000b8,0x0004003d,
>+	0x00000006,0x000000d9,0x000000b4,0x00050080,0x00000006,0x000000da,0x000000d9,0x0000007e,
>+	0x0003003e,0x000000b4,0x000000da,0x000200f9,0x000000b5,0x000200f8,0x000000b7,0x0004003d,
>+	0x00000006,0x000000dc,0x000000b3,0x0003003e,0x000000db,0x000000dc,0x00050039,0x00000002,
>+	0x000000dd,0x00000022,0x000000db,0x000100fd,0x00010038,0x00050036,0x00000006,0x0000000b,
>+	0x00000000,0x00000008,0x00030037,0x00000007,0x00000009,0x00030037,0x00000007,0x0000000a,
>+	0x000200f8,0x0000000c,0x0004003d,0x00000006,0x00000024,0x00000009,0x00050041,0x0000002a,
>+	0x0000002b,0x00000027,0x00000029,0x0004003d,0x00000006,0x0000002c,0x0000002b,0x00050084,
>+	0x00000006,0x0000002d,0x00000024,0x0000002c,0x0004003d,0x00000006,0x0000002e,0x0000000a,
>+	0x00050041,0x0000002a,0x00000030,0x00000027,0x0000002f,0x0004003d,0x00000006,0x00000031,
>+	0x00000030,0x00050084,0x00000006,0x00000032,0x0000002e,0x00000031,0x00050080,0x00000006,
>+	0x00000033,0x0000002d,0x00000032,0x00050041,0x0000002a,0x00000035,0x00000027,0x00000034,
>+	0x0004003d,0x00000006,0x00000036,0x00000035,0x00050080,0x00000006,0x00000037,0x00000033,
>+	0x00000036,0x000200fe,0x00000037,0x00010038,0x00050036,0x00000006,0x0000000f,0x00000000,
>+	0x00000008,0x00030037,0x00000007,0x0000000d,0x00030037,0x00000007,0x0000000e,0x000200f8,
>+	0x00000010,0x0004003b,0x00000007,0x0000003a,0x00000007,0x0004003d,0x00000006,0x0000003b,
>+	0x0000000d,0x00050089,0x00000006,0x0000003d,0x0000003b,0x0000003c,0x00050084,0x00000006,
>+	0x0000003f,0x0000003d,0x0000003e,0x0003003e,0x0000003a,0x0000003f,0x0004003d,0x00000006,
>+	0x00000040,0x0000003a,0x000200fe,0x00000040,0x00010038,0x00050036,0x00000006,0x00000013,
>+	0x00000000,0x00000011,0x00030037,0x00000007,0x00000012,0x000200f8,0x00000014,0x0004003b,
>+	0x00000007,0x00000043,0x00000007,0x0004003b,0x00000007,0x00000049,0x00000007,0x0004003b,
>+	0x00000007,0x00000058,0x00000007,0x0004003b,0x00000007,0x00000059,0x00000007,0x0004003b,
>+	0x00000007,0x0000005b,0x00000007,0x0004003b,0x00000007,0x0000005e,0x00000007,0x0004003b,
>+	0x00000007,0x00000069,0x00000007,0x0004003b,0x00000007,0x0000006a,0x00000007,0x0004003b,
>+	0x00000007,0x0000006c,0x00000007,0x0004003b,0x00000007,0x00000070,0x00000007,0x0004003b,
>+	0x00000007,0x00000074,0x00000007,0x0004003b,0x00000078,0x00000079,0x00000007,0x0004003b,
>+	0x00000007,0x00000084,0x00000007,0x0004003b,0x00000007,0x0000008a,0x00000007,0x0004003d,
>+	0x00000006,0x00000044,0x00000012,0x00050041,0x0000002a,0x00000046,0x00000027,0x00000045,
>+	0x0004003d,0x00000006,0x00000047,0x00000046,0x00050086,0x00000006,0x00000048,0x00000044,
>+	0x00000047,0x0003003e,0x00000043,0x00000048,0x0004003d,0x00000006,0x0000004a,0x00000012,
>+	0x00050041,0x0000002a,0x0000004b,0x00000027,0x00000045,0x0004003d,0x00000006,0x0000004c,
>+	0x0000004b,0x00050089,0x00000006,0x0000004d,0x0000004a,0x0000004c,0x0003003e,0x00000049,
>+	0x0000004d,0x0004003d,0x00000006,0x0000004e,0x00000049,0x00050041,0x0000002a,0x00000050,
>+	0x00000027,0x0000004f,0x0004003d,0x00000006,0x00000051,0x00000050,0x000500ae,0x00000052,
>+	0x00000053,0x0000004e,0x00000051,0x000300f7,0x00000055,0x00000000,0x000400fa,0x00000053,
>+	0x00000054,0x00000055,0x000200f8,0x00000054,0x000200fe,0x00000056,0x000200f8,0x00000055,
>+	0x0004003d,0x00000006,0x0000005a,0x00000043,0x0003003e,0x00000059,0x0000005a,0x0004003d,
>+	0x00000006,0x0000005c,0x00000049,0x0003003e,0x0000005b,0x0000005c,0x00060039,0x00000006,
>+	0x0000005d,0x0000000b,0x00000059,0x0000005b,0x0003003e,0x00000058,0x0000005d,0x0004003d,
>+	0x00000006,0x00000064,0x00000058,0x00050086,0x00000006,0x00000065,0x00000064,0x0000003c,
>+	0x00060041,0x00000066,0x00000067,0x00000062,0x00000063,0x00000065,0x0004003d,0x00000006,
>+	0x00000068,0x00000067,0x0003003e,0x0000005e,0x00000068,0x0004003d,0x00000006,0x0000006b,
>+	0x00000058,0x0003003e,0x0000006a,0x0000006b,0x00050041,0x0000002a,0x0000006d,0x00000027,
>+	0x0000002f,0x0004003d,0x00000006,0x0000006e,0x0000006d,0x0003003e,0x0000006c,0x0000006e,
>+	0x00060039,0x00000006,0x0000006f,0x0000000f,0x0000006a,0x0000006c,0x0003003e,0x00000069,
>+	0x0000006f,0x00050041,0x0000002a,0x00000071,0x00000027,0x0000002f,0x0004003d,0x00000006,
>+	0x00000072,0x00000071,0x00050084,0x00000006,0x00000073,0x00000072,0x0000003e,0x0003003e,
>+	0x00000070,0x00000073,0x0004003d,0x00000006,0x00000075,0x00000070,0x000500aa,0x00000052,
>+	0x00000077,0x00000075,0x00000076,0x000300f7,0x0000007b,0x00000000,0x000400fa,0x00000077,
>+	0x0000007a,0x0000007d,0x000200f8,0x0000007a,0x0003003e,0x00000079,0x0000007c,0x000200f9,
>+	0x0000007b,0x000200f8,0x0000007d,0x0004003d,0x00000006,0x0000007f,0x00000070,0x000500c4,
>+	0x00000028,0x00000080,0x0000007e,0x0000007f,0x00050082,0x00000028,0x00000081,0x00000080,
>+	0x0000007e,0x0003003e,0x00000079,0x00000081,0x000200f9,0x0000007b,0x000200f8,0x0000007b,
>+	0x0004003d,0x00000028,0x00000082,0x00000079,0x0004007c,0x00000006,0x00000083,0x00000082,
>+	0x0003003e,0x00000074,0x00000083,0x0004003d,0x00000006,0x00000085,0x0000005e,0x0004003d,
>+	0x00000006,0x00000086,0x00000069,0x000500c2,0x00000006,0x00000087,0x00000085,0x00000086,
>+	0x0004003d,0x00000006,0x00000088,0x00000074,0x000500c7,0x00000006,0x00000089,0x00000087,
>+	0x00000088,0x0003003e,0x00000084,0x00000089,0x0004003d,0x00000006,0x0000008b,0x00000084,
>+	0x0003003e,0x0000008a,0x0000008b,0x0004003d,0x00000006,0x0000008c,0x0000008a,0x000200fe,
>+	0x0000008c,0x00010038,0x00050036,0x00000015,0x00000018,0x00000000,0x00000016,0x00030037,
>+	0x00000007,0x00000017,0x000200f8,0x00000019,0x0004003d,0x00000006,0x0000008f,0x00000017,
>+	0x00040070,0x00000015,0x00000090,0x0000008f,0x000200fe,0x00000090,0x00010038,0x00050036,
>+	0x00000006,0x0000001e,0x00000000,0x0000001b,0x00030037,0x00000007,0x0000001c,0x00030037,
>+	0x0000001a,0x0000001d,0x000200f8,0x0000001f,0x0004003b,0x00000007,0x00000093,0x00000007,
>+	0x0004003d,0x00000015,0x00000094,0x0000001d,0x0004007c,0x00000028,0x00000095,0x00000094,
>+	0x0004007c,0x00000006,0x00000096,0x00000095,0x0003003e,0x00000093,0x00000096,0x0004003d,
>+	0x00000006,0x00000097,0x00000093,0x000200fe,0x00000097,0x00010038,0x00050036,0x00000002,
>+	0x00000022,0x00000000,0x00000020,0x00030037,0x00000007,0x00000021,0x000200f8,0x00000023,
>+	0x00050041,0x000000a1,0x000000a2,0x000000a0,0x00000056,0x0004003d,0x00000006,0x000000a3,
>+	0x000000a2,0x00050041,0x0000002a,0x000000a5,0x00000027,0x000000a4,0x0004003d,0x00000006,
>+	0x000000a6,0x000000a5,0x00050086,0x00000006,0x000000a7,0x000000a6,0x0000003c,0x00050080,
>+	0x00000006,0x000000a8,0x000000a3,0x000000a7,0x0004003d,0x00000006,0x000000a9,0x00000021,
>+	0x00060041,0x00000066,0x000000aa,0x0000009d,0x00000063,0x000000a8,0x0003003e,0x000000aa,
>+	0x000000a9,0x000100fd,0x00010038
>+};
>+
>+#if 0  // Generated from:
>+#version 450 core
>+
>+layout(local_size_x = 64, local_size_y = 1, local_size_z = 1)in;
>+
>+layout(set = 0, binding = 0)buffer dest
>+{
>+    uint destData[];
>+};
>+
>+layout(set = 0, binding = 1)buffer src
>+{
>+    uint srcData[];
>+};
>+
>+layout(push_constant)uniform PushConstants
>+{
>+
>+    uint outputCount;
>+
>+    uint componentCount;
>+
>+    uint srcOffset;
>+    uint destOffset;
>+
>+    uint Ns;
>+    uint Bs;
>+    uint Ss;
>+    uint Es;
>+
>+    uint Nd;
>+    uint Bd;
>+    uint Sd;
>+    uint Ed;
>+} params;
>+
>+uint getSourceComponentOffset(uint vertex, uint component)
>+{
>+    return vertex * params . Ss + component * params . Bs + params . srcOffset;
>+}
>+
>+uint getDestinationComponentOffset(uint vertex, uint component)
>+{
>+    return vertex * params . Sd + component * 4 + params . destOffset;
>+}
>+
>+uint getShiftBits(uint offset, uint B)
>+{
>+
>+    uint shift =(offset % 4)* 8;
>+
>+    return shift;
>+}
>+
>+      uint loadSourceComponent(uint cd)
>+{
>+
>+    uint vertex = cd / params . Nd;
>+    uint component = cd % params . Nd;
>+
>+    if(component >= params . Ns)
>+    {
>+        return 0;
>+    }
>+
>+    uint offset = getSourceComponentOffset(vertex, component);
>+    uint block = srcData[offset / 4];
>+    uint shiftBits = getShiftBits(offset, params . Bs);
>+
>+    uint valueBits = params . Bs * 8;
>+    uint valueMask = valueBits == 32 ? - 1 :(1 << valueBits)- 1;
>+    uint valueAsUint =(block >> shiftBits)& valueMask;
>+
>+          uint value = valueAsUint;
>+
>+    return value;
>+}
>+
>+       float convertComponent(uint srcValue)
>+{
>+
>+    return srcValue;
>+}
>+
>+uint makeDestinationComponent(uint cd, float value)
>+{
>+
>+    uint valueAsUint = floatBitsToInt(value);
>+
>+    return valueAsUint;
>+}
>+
>+void storeDestinationComponents(uint valueAsUint)
>+{
>+
>+    destData[gl_GlobalInvocationID . x + params . destOffset / 4]= valueAsUint;
>+}
>+
>+void main()
>+{
>+
>+    if(gl_GlobalInvocationID . x >= params . outputCount)
>+        return;
>+
>+    uint valueOut = 0;
>+    for(uint i = 0;i < 1;++ i)
>+    {
>+        uint cd = gl_GlobalInvocationID . x * 1 + i;
>+
>+        if(cd >= params . componentCount)
>+        {
>+            break;
>+        }
>+
>+              uint srcValue = loadSourceComponent(cd);
>+               float destValue = convertComponent(srcValue);
>+        valueOut |= makeDestinationComponent(cd, destValue);
>+    }
>+
>+    storeDestinationComponents(valueOut);
>+}
>+#endif  // Preprocessed code
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.00000007.inc b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.00000007.inc
>new file mode 100644
>index 00000000000..ecfa2c9f878
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.00000007.inc
>@@ -0,0 +1,293 @@
>+	// 7.11.3188
>+	 #pragma once
>+const uint32_t kConvertVertex_comp_00000007[] = {
>+	0x07230203,0x00010000,0x00080007,0x000000d1,0x00000000,0x00020011,0x00000001,0x0006000b,
>+	0x00000001,0x4c534c47,0x6474732e,0x3035342e,0x00000000,0x0003000e,0x00000000,0x00000001,
>+	0x0006000f,0x00000005,0x00000004,0x6e69616d,0x00000000,0x000000a0,0x00060010,0x00000004,
>+	0x00000011,0x00000040,0x00000001,0x00000001,0x00030003,0x00000002,0x000001c2,0x00040005,
>+	0x00000004,0x6e69616d,0x00000000,0x000a0005,0x0000000b,0x53746567,0x6372756f,0x6d6f4365,
>+	0x656e6f70,0x664f746e,0x74657366,0x3b317528,0x003b3175,0x00040005,0x00000009,0x74726576,
>+	0x00007865,0x00050005,0x0000000a,0x706d6f63,0x6e656e6f,0x00000074,0x00070005,0x0000000f,
>+	0x53746567,0x74666968,0x73746942,0x3b317528,0x003b3175,0x00040005,0x0000000d,0x7366666f,
>+	0x00007465,0x00030005,0x0000000e,0x00000042,0x00080005,0x00000013,0x64616f6c,0x72756f53,
>+	0x6f436563,0x6e6f706d,0x28746e65,0x003b3175,0x00030005,0x00000012,0x00006463,0x00080005,
>+	0x00000018,0x766e6f63,0x43747265,0x6f706d6f,0x746e656e,0x3b317528,0x00000000,0x00050005,
>+	0x00000017,0x56637273,0x65756c61,0x00000000,0x000a0005,0x0000001e,0x656b616d,0x74736544,
>+	0x74616e69,0x436e6f69,0x6f706d6f,0x746e656e,0x3b317528,0x003b3166,0x00030005,0x0000001c,
>+	0x00006463,0x00040005,0x0000001d,0x756c6176,0x00000065,0x000a0005,0x00000022,0x726f7473,
>+	0x73654465,0x616e6974,0x6e6f6974,0x706d6f43,0x6e656e6f,0x75287374,0x00003b31,0x00050005,
>+	0x00000021,0x756c6176,0x55734165,0x00746e69,0x00060005,0x00000025,0x68737550,0x736e6f43,
>+	0x746e6174,0x00000073,0x00060006,0x00000025,0x00000000,0x7074756f,0x6f437475,0x00746e75,
>+	0x00070006,0x00000025,0x00000001,0x706d6f63,0x6e656e6f,0x756f4374,0x0000746e,0x00060006,
>+	0x00000025,0x00000002,0x4f637273,0x65736666,0x00000074,0x00060006,0x00000025,0x00000003,
>+	0x74736564,0x7366664f,0x00007465,0x00040006,0x00000025,0x00000004,0x0000734e,0x00040006,
>+	0x00000025,0x00000005,0x00007342,0x00040006,0x00000025,0x00000006,0x00007353,0x00040006,
>+	0x00000025,0x00000007,0x00007345,0x00040006,0x00000025,0x00000008,0x0000644e,0x00040006,
>+	0x00000025,0x00000009,0x00006442,0x00040006,0x00000025,0x0000000a,0x00006453,0x00040006,
>+	0x00000025,0x0000000b,0x00006445,0x00040005,0x00000027,0x61726170,0x0000736d,0x00040005,
>+	0x0000003a,0x66696873,0x00000074,0x00040005,0x00000043,0x74726576,0x00007865,0x00050005,
>+	0x00000049,0x706d6f63,0x6e656e6f,0x00000074,0x00040005,0x00000058,0x7366666f,0x00007465,
>+	0x00040005,0x00000059,0x61726170,0x0000006d,0x00040005,0x0000005b,0x61726170,0x0000006d,
>+	0x00040005,0x0000005e,0x636f6c62,0x0000006b,0x00030005,0x00000060,0x00637273,0x00050006,
>+	0x00000060,0x00000000,0x44637273,0x00617461,0x00030005,0x00000062,0x00000000,0x00050005,
>+	0x00000069,0x66696873,0x74694274,0x00000073,0x00040005,0x0000006a,0x61726170,0x0000006d,
>+	0x00040005,0x0000006c,0x61726170,0x0000006d,0x00050005,0x00000070,0x756c6176,0x74694265,
>+	0x00000073,0x00050005,0x00000074,0x756c6176,0x73614d65,0x0000006b,0x00050005,0x00000084,
>+	0x756c6176,0x55734165,0x00746e69,0x00040005,0x0000008a,0x756c6176,0x00000065,0x00050005,
>+	0x00000093,0x756c6176,0x55734165,0x00746e69,0x00040005,0x0000009b,0x74736564,0x00000000,
>+	0x00060006,0x0000009b,0x00000000,0x74736564,0x61746144,0x00000000,0x00030005,0x0000009d,
>+	0x00000000,0x00080005,0x000000a0,0x475f6c67,0x61626f6c,0x766e496c,0x7461636f,0x496e6f69,
>+	0x00000044,0x00050005,0x000000ab,0x756c6176,0x74754f65,0x00000000,0x00030005,0x000000ac,
>+	0x00000069,0x00030005,0x000000b5,0x00006463,0x00050005,0x000000bb,0x56637273,0x65756c61,
>+	0x00000000,0x00040005,0x000000bc,0x61726170,0x0000006d,0x00050005,0x000000bf,0x74736564,
>+	0x756c6156,0x00000065,0x00040005,0x000000c0,0x61726170,0x0000006d,0x00040005,0x000000c3,
>+	0x61726170,0x0000006d,0x00040005,0x000000c5,0x61726170,0x0000006d,0x00040005,0x000000cc,
>+	0x61726170,0x0000006d,0x00050048,0x00000025,0x00000000,0x00000023,0x00000000,0x00050048,
>+	0x00000025,0x00000001,0x00000023,0x00000004,0x00050048,0x00000025,0x00000002,0x00000023,
>+	0x00000008,0x00050048,0x00000025,0x00000003,0x00000023,0x0000000c,0x00050048,0x00000025,
>+	0x00000004,0x00000023,0x00000010,0x00050048,0x00000025,0x00000005,0x00000023,0x00000014,
>+	0x00050048,0x00000025,0x00000006,0x00000023,0x00000018,0x00050048,0x00000025,0x00000007,
>+	0x00000023,0x0000001c,0x00050048,0x00000025,0x00000008,0x00000023,0x00000020,0x00050048,
>+	0x00000025,0x00000009,0x00000023,0x00000024,0x00050048,0x00000025,0x0000000a,0x00000023,
>+	0x00000028,0x00050048,0x00000025,0x0000000b,0x00000023,0x0000002c,0x00030047,0x00000025,
>+	0x00000002,0x00040047,0x0000005f,0x00000006,0x00000004,0x00050048,0x00000060,0x00000000,
>+	0x00000023,0x00000000,0x00030047,0x00000060,0x00000003,0x00040047,0x00000062,0x00000022,
>+	0x00000000,0x00040047,0x00000062,0x00000021,0x00000001,0x00040047,0x0000009a,0x00000006,
>+	0x00000004,0x00050048,0x0000009b,0x00000000,0x00000023,0x00000000,0x00030047,0x0000009b,
>+	0x00000003,0x00040047,0x0000009d,0x00000022,0x00000000,0x00040047,0x0000009d,0x00000021,
>+	0x00000000,0x00040047,0x000000a0,0x0000000b,0x0000001c,0x00040047,0x000000d0,0x0000000b,
>+	0x00000019,0x00020013,0x00000002,0x00030021,0x00000003,0x00000002,0x00040015,0x00000006,
>+	0x00000020,0x00000000,0x00040020,0x00000007,0x00000007,0x00000006,0x00050021,0x00000008,
>+	0x00000006,0x00000007,0x00000007,0x00040021,0x00000011,0x00000006,0x00000007,0x00030016,
>+	0x00000015,0x00000020,0x00040021,0x00000016,0x00000015,0x00000007,0x00040020,0x0000001a,
>+	0x00000007,0x00000015,0x00050021,0x0000001b,0x00000006,0x00000007,0x0000001a,0x00040021,
>+	0x00000020,0x00000002,0x00000007,0x000e001e,0x00000025,0x00000006,0x00000006,0x00000006,
>+	0x00000006,0x00000006,0x00000006,0x00000006,0x00000006,0x00000006,0x00000006,0x00000006,
>+	0x00000006,0x00040020,0x00000026,0x00000009,0x00000025,0x0004003b,0x00000026,0x00000027,
>+	0x00000009,0x00040015,0x00000028,0x00000020,0x00000001,0x0004002b,0x00000028,0x00000029,
>+	0x00000006,0x00040020,0x0000002a,0x00000009,0x00000006,0x0004002b,0x00000028,0x0000002f,
>+	0x00000005,0x0004002b,0x00000028,0x00000034,0x00000002,0x0004002b,0x00000006,0x0000003c,
>+	0x00000004,0x0004002b,0x00000006,0x0000003e,0x00000008,0x0004002b,0x00000028,0x00000045,
>+	0x00000008,0x0004002b,0x00000028,0x0000004f,0x00000004,0x00020014,0x00000052,0x0004002b,
>+	0x00000006,0x00000056,0x00000000,0x0003001d,0x0000005f,0x00000006,0x0003001e,0x00000060,
>+	0x0000005f,0x00040020,0x00000061,0x00000002,0x00000060,0x0004003b,0x00000061,0x00000062,
>+	0x00000002,0x0004002b,0x00000028,0x00000063,0x00000000,0x00040020,0x00000066,0x00000002,
>+	0x00000006,0x0004002b,0x00000006,0x00000076,0x00000020,0x00040020,0x00000078,0x00000007,
>+	0x00000028,0x0004002b,0x00000028,0x0000007c,0xffffffff,0x0004002b,0x00000028,0x0000007e,
>+	0x00000001,0x0003001d,0x0000009a,0x00000006,0x0003001e,0x0000009b,0x0000009a,0x00040020,
>+	0x0000009c,0x00000002,0x0000009b,0x0004003b,0x0000009c,0x0000009d,0x00000002,0x00040017,
>+	0x0000009e,0x00000006,0x00000003,0x00040020,0x0000009f,0x00000001,0x0000009e,0x0004003b,
>+	0x0000009f,0x000000a0,0x00000001,0x00040020,0x000000a1,0x00000001,0x00000006,0x0004002b,
>+	0x00000028,0x000000a4,0x00000003,0x0004002b,0x00000006,0x000000b3,0x00000001,0x0004002b,
>+	0x00000006,0x000000cf,0x00000040,0x0006002c,0x0000009e,0x000000d0,0x000000cf,0x000000b3,
>+	0x000000b3,0x00050036,0x00000002,0x00000004,0x00000000,0x00000003,0x000200f8,0x00000005,
>+	0x0004003b,0x00000007,0x000000ab,0x00000007,0x0004003b,0x00000007,0x000000ac,0x00000007,
>+	0x0004003b,0x00000007,0x000000b5,0x00000007,0x0004003b,0x00000007,0x000000bb,0x00000007,
>+	0x0004003b,0x00000007,0x000000bc,0x00000007,0x0004003b,0x0000001a,0x000000bf,0x00000007,
>+	0x0004003b,0x00000007,0x000000c0,0x00000007,0x0004003b,0x00000007,0x000000c3,0x00000007,
>+	0x0004003b,0x0000001a,0x000000c5,0x00000007,0x0004003b,0x00000007,0x000000cc,0x00000007,
>+	0x0003003e,0x000000ab,0x00000056,0x0003003e,0x000000ac,0x00000056,0x000200f9,0x000000ad,
>+	0x000200f8,0x000000ad,0x000400f6,0x000000af,0x000000b0,0x00000000,0x000200f9,0x000000b1,
>+	0x000200f8,0x000000b1,0x0004003d,0x00000006,0x000000b2,0x000000ac,0x000500b0,0x00000052,
>+	0x000000b4,0x000000b2,0x000000b3,0x000400fa,0x000000b4,0x000000ae,0x000000af,0x000200f8,
>+	0x000000ae,0x00050041,0x000000a1,0x000000b6,0x000000a0,0x00000056,0x0004003d,0x00000006,
>+	0x000000b7,0x000000b6,0x00050084,0x00000006,0x000000b8,0x000000b7,0x000000b3,0x0004003d,
>+	0x00000006,0x000000b9,0x000000ac,0x00050080,0x00000006,0x000000ba,0x000000b8,0x000000b9,
>+	0x0003003e,0x000000b5,0x000000ba,0x0004003d,0x00000006,0x000000bd,0x000000b5,0x0003003e,
>+	0x000000bc,0x000000bd,0x00050039,0x00000006,0x000000be,0x00000013,0x000000bc,0x0003003e,
>+	0x000000bb,0x000000be,0x0004003d,0x00000006,0x000000c1,0x000000bb,0x0003003e,0x000000c0,
>+	0x000000c1,0x00050039,0x00000015,0x000000c2,0x00000018,0x000000c0,0x0003003e,0x000000bf,
>+	0x000000c2,0x0004003d,0x00000006,0x000000c4,0x000000b5,0x0003003e,0x000000c3,0x000000c4,
>+	0x0004003d,0x00000015,0x000000c6,0x000000bf,0x0003003e,0x000000c5,0x000000c6,0x00060039,
>+	0x00000006,0x000000c7,0x0000001e,0x000000c3,0x000000c5,0x0004003d,0x00000006,0x000000c8,
>+	0x000000ab,0x000500c5,0x00000006,0x000000c9,0x000000c8,0x000000c7,0x0003003e,0x000000ab,
>+	0x000000c9,0x000200f9,0x000000b0,0x000200f8,0x000000b0,0x0004003d,0x00000006,0x000000ca,
>+	0x000000ac,0x00050080,0x00000006,0x000000cb,0x000000ca,0x0000007e,0x0003003e,0x000000ac,
>+	0x000000cb,0x000200f9,0x000000ad,0x000200f8,0x000000af,0x0004003d,0x00000006,0x000000cd,
>+	0x000000ab,0x0003003e,0x000000cc,0x000000cd,0x00050039,0x00000002,0x000000ce,0x00000022,
>+	0x000000cc,0x000100fd,0x00010038,0x00050036,0x00000006,0x0000000b,0x00000000,0x00000008,
>+	0x00030037,0x00000007,0x00000009,0x00030037,0x00000007,0x0000000a,0x000200f8,0x0000000c,
>+	0x0004003d,0x00000006,0x00000024,0x00000009,0x00050041,0x0000002a,0x0000002b,0x00000027,
>+	0x00000029,0x0004003d,0x00000006,0x0000002c,0x0000002b,0x00050084,0x00000006,0x0000002d,
>+	0x00000024,0x0000002c,0x0004003d,0x00000006,0x0000002e,0x0000000a,0x00050041,0x0000002a,
>+	0x00000030,0x00000027,0x0000002f,0x0004003d,0x00000006,0x00000031,0x00000030,0x00050084,
>+	0x00000006,0x00000032,0x0000002e,0x00000031,0x00050080,0x00000006,0x00000033,0x0000002d,
>+	0x00000032,0x00050041,0x0000002a,0x00000035,0x00000027,0x00000034,0x0004003d,0x00000006,
>+	0x00000036,0x00000035,0x00050080,0x00000006,0x00000037,0x00000033,0x00000036,0x000200fe,
>+	0x00000037,0x00010038,0x00050036,0x00000006,0x0000000f,0x00000000,0x00000008,0x00030037,
>+	0x00000007,0x0000000d,0x00030037,0x00000007,0x0000000e,0x000200f8,0x00000010,0x0004003b,
>+	0x00000007,0x0000003a,0x00000007,0x0004003d,0x00000006,0x0000003b,0x0000000d,0x00050089,
>+	0x00000006,0x0000003d,0x0000003b,0x0000003c,0x00050084,0x00000006,0x0000003f,0x0000003d,
>+	0x0000003e,0x0003003e,0x0000003a,0x0000003f,0x0004003d,0x00000006,0x00000040,0x0000003a,
>+	0x000200fe,0x00000040,0x00010038,0x00050036,0x00000006,0x00000013,0x00000000,0x00000011,
>+	0x00030037,0x00000007,0x00000012,0x000200f8,0x00000014,0x0004003b,0x00000007,0x00000043,
>+	0x00000007,0x0004003b,0x00000007,0x00000049,0x00000007,0x0004003b,0x00000007,0x00000058,
>+	0x00000007,0x0004003b,0x00000007,0x00000059,0x00000007,0x0004003b,0x00000007,0x0000005b,
>+	0x00000007,0x0004003b,0x00000007,0x0000005e,0x00000007,0x0004003b,0x00000007,0x00000069,
>+	0x00000007,0x0004003b,0x00000007,0x0000006a,0x00000007,0x0004003b,0x00000007,0x0000006c,
>+	0x00000007,0x0004003b,0x00000007,0x00000070,0x00000007,0x0004003b,0x00000007,0x00000074,
>+	0x00000007,0x0004003b,0x00000078,0x00000079,0x00000007,0x0004003b,0x00000007,0x00000084,
>+	0x00000007,0x0004003b,0x00000007,0x0000008a,0x00000007,0x0004003d,0x00000006,0x00000044,
>+	0x00000012,0x00050041,0x0000002a,0x00000046,0x00000027,0x00000045,0x0004003d,0x00000006,
>+	0x00000047,0x00000046,0x00050086,0x00000006,0x00000048,0x00000044,0x00000047,0x0003003e,
>+	0x00000043,0x00000048,0x0004003d,0x00000006,0x0000004a,0x00000012,0x00050041,0x0000002a,
>+	0x0000004b,0x00000027,0x00000045,0x0004003d,0x00000006,0x0000004c,0x0000004b,0x00050089,
>+	0x00000006,0x0000004d,0x0000004a,0x0000004c,0x0003003e,0x00000049,0x0000004d,0x0004003d,
>+	0x00000006,0x0000004e,0x00000049,0x00050041,0x0000002a,0x00000050,0x00000027,0x0000004f,
>+	0x0004003d,0x00000006,0x00000051,0x00000050,0x000500ae,0x00000052,0x00000053,0x0000004e,
>+	0x00000051,0x000300f7,0x00000055,0x00000000,0x000400fa,0x00000053,0x00000054,0x00000055,
>+	0x000200f8,0x00000054,0x000200fe,0x00000056,0x000200f8,0x00000055,0x0004003d,0x00000006,
>+	0x0000005a,0x00000043,0x0003003e,0x00000059,0x0000005a,0x0004003d,0x00000006,0x0000005c,
>+	0x00000049,0x0003003e,0x0000005b,0x0000005c,0x00060039,0x00000006,0x0000005d,0x0000000b,
>+	0x00000059,0x0000005b,0x0003003e,0x00000058,0x0000005d,0x0004003d,0x00000006,0x00000064,
>+	0x00000058,0x00050086,0x00000006,0x00000065,0x00000064,0x0000003c,0x00060041,0x00000066,
>+	0x00000067,0x00000062,0x00000063,0x00000065,0x0004003d,0x00000006,0x00000068,0x00000067,
>+	0x0003003e,0x0000005e,0x00000068,0x0004003d,0x00000006,0x0000006b,0x00000058,0x0003003e,
>+	0x0000006a,0x0000006b,0x00050041,0x0000002a,0x0000006d,0x00000027,0x0000002f,0x0004003d,
>+	0x00000006,0x0000006e,0x0000006d,0x0003003e,0x0000006c,0x0000006e,0x00060039,0x00000006,
>+	0x0000006f,0x0000000f,0x0000006a,0x0000006c,0x0003003e,0x00000069,0x0000006f,0x00050041,
>+	0x0000002a,0x00000071,0x00000027,0x0000002f,0x0004003d,0x00000006,0x00000072,0x00000071,
>+	0x00050084,0x00000006,0x00000073,0x00000072,0x0000003e,0x0003003e,0x00000070,0x00000073,
>+	0x0004003d,0x00000006,0x00000075,0x00000070,0x000500aa,0x00000052,0x00000077,0x00000075,
>+	0x00000076,0x000300f7,0x0000007b,0x00000000,0x000400fa,0x00000077,0x0000007a,0x0000007d,
>+	0x000200f8,0x0000007a,0x0003003e,0x00000079,0x0000007c,0x000200f9,0x0000007b,0x000200f8,
>+	0x0000007d,0x0004003d,0x00000006,0x0000007f,0x00000070,0x000500c4,0x00000028,0x00000080,
>+	0x0000007e,0x0000007f,0x00050082,0x00000028,0x00000081,0x00000080,0x0000007e,0x0003003e,
>+	0x00000079,0x00000081,0x000200f9,0x0000007b,0x000200f8,0x0000007b,0x0004003d,0x00000028,
>+	0x00000082,0x00000079,0x0004007c,0x00000006,0x00000083,0x00000082,0x0003003e,0x00000074,
>+	0x00000083,0x0004003d,0x00000006,0x00000085,0x0000005e,0x0004003d,0x00000006,0x00000086,
>+	0x00000069,0x000500c2,0x00000006,0x00000087,0x00000085,0x00000086,0x0004003d,0x00000006,
>+	0x00000088,0x00000074,0x000500c7,0x00000006,0x00000089,0x00000087,0x00000088,0x0003003e,
>+	0x00000084,0x00000089,0x0004003d,0x00000006,0x0000008b,0x00000084,0x0003003e,0x0000008a,
>+	0x0000008b,0x0004003d,0x00000006,0x0000008c,0x0000008a,0x000200fe,0x0000008c,0x00010038,
>+	0x00050036,0x00000015,0x00000018,0x00000000,0x00000016,0x00030037,0x00000007,0x00000017,
>+	0x000200f8,0x00000019,0x0004003d,0x00000006,0x0000008f,0x00000017,0x00040070,0x00000015,
>+	0x00000090,0x0000008f,0x000200fe,0x00000090,0x00010038,0x00050036,0x00000006,0x0000001e,
>+	0x00000000,0x0000001b,0x00030037,0x00000007,0x0000001c,0x00030037,0x0000001a,0x0000001d,
>+	0x000200f8,0x0000001f,0x0004003b,0x00000007,0x00000093,0x00000007,0x0004003d,0x00000015,
>+	0x00000094,0x0000001d,0x0004007c,0x00000028,0x00000095,0x00000094,0x0004007c,0x00000006,
>+	0x00000096,0x00000095,0x0003003e,0x00000093,0x00000096,0x0004003d,0x00000006,0x00000097,
>+	0x00000093,0x000200fe,0x00000097,0x00010038,0x00050036,0x00000002,0x00000022,0x00000000,
>+	0x00000020,0x00030037,0x00000007,0x00000021,0x000200f8,0x00000023,0x00050041,0x000000a1,
>+	0x000000a2,0x000000a0,0x00000056,0x0004003d,0x00000006,0x000000a3,0x000000a2,0x00050041,
>+	0x0000002a,0x000000a5,0x00000027,0x000000a4,0x0004003d,0x00000006,0x000000a6,0x000000a5,
>+	0x00050086,0x00000006,0x000000a7,0x000000a6,0x0000003c,0x00050080,0x00000006,0x000000a8,
>+	0x000000a3,0x000000a7,0x0004003d,0x00000006,0x000000a9,0x00000021,0x00060041,0x00000066,
>+	0x000000aa,0x0000009d,0x00000063,0x000000a8,0x0003003e,0x000000aa,0x000000a9,0x000100fd,
>+	0x00010038
>+};
>+
>+#if 0  // Generated from:
>+#version 450 core
>+
>+layout(local_size_x = 64, local_size_y = 1, local_size_z = 1)in;
>+
>+layout(set = 0, binding = 0)buffer dest
>+{
>+    uint destData[];
>+};
>+
>+layout(set = 0, binding = 1)buffer src
>+{
>+    uint srcData[];
>+};
>+
>+layout(push_constant)uniform PushConstants
>+{
>+
>+    uint outputCount;
>+
>+    uint componentCount;
>+
>+    uint srcOffset;
>+    uint destOffset;
>+
>+    uint Ns;
>+    uint Bs;
>+    uint Ss;
>+    uint Es;
>+
>+    uint Nd;
>+    uint Bd;
>+    uint Sd;
>+    uint Ed;
>+} params;
>+
>+uint getSourceComponentOffset(uint vertex, uint component)
>+{
>+    return vertex * params . Ss + component * params . Bs + params . srcOffset;
>+}
>+
>+uint getDestinationComponentOffset(uint vertex, uint component)
>+{
>+    return vertex * params . Sd + component * 4 + params . destOffset;
>+}
>+
>+uint getShiftBits(uint offset, uint B)
>+{
>+
>+    uint shift =(offset % 4)* 8;
>+
>+    return shift;
>+}
>+
>+      uint loadSourceComponent(uint cd)
>+{
>+
>+    uint vertex = cd / params . Nd;
>+    uint component = cd % params . Nd;
>+
>+    if(component >= params . Ns)
>+    {
>+        return 0;
>+    }
>+
>+    uint offset = getSourceComponentOffset(vertex, component);
>+    uint block = srcData[offset / 4];
>+    uint shiftBits = getShiftBits(offset, params . Bs);
>+
>+    uint valueBits = params . Bs * 8;
>+    uint valueMask = valueBits == 32 ? - 1 :(1 << valueBits)- 1;
>+    uint valueAsUint =(block >> shiftBits)& valueMask;
>+
>+          uint value = valueAsUint;
>+
>+    return value;
>+}
>+
>+       float convertComponent(uint srcValue)
>+{
>+
>+    return srcValue;
>+}
>+
>+uint makeDestinationComponent(uint cd, float value)
>+{
>+
>+    uint valueAsUint = floatBitsToInt(value);
>+
>+    return valueAsUint;
>+}
>+
>+void storeDestinationComponents(uint valueAsUint)
>+{
>+
>+    destData[gl_GlobalInvocationID . x + params . destOffset / 4]= valueAsUint;
>+}
>+
>+void main()
>+{
>+
>+    uint valueOut = 0;
>+    for(uint i = 0;i < 1;++ i)
>+    {
>+        uint cd = gl_GlobalInvocationID . x * 1 + i;
>+
>+              uint srcValue = loadSourceComponent(cd);
>+               float destValue = convertComponent(srcValue);
>+        valueOut |= makeDestinationComponent(cd, destValue);
>+    }
>+
>+    storeDestinationComponents(valueOut);
>+}
>+#endif  // Preprocessed code
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.00000008.inc b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.00000008.inc
>new file mode 100644
>index 00000000000..95348d36ef9
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.00000008.inc
>@@ -0,0 +1,330 @@
>+	// 7.11.3188
>+	 #pragma once
>+const uint32_t kConvertVertex_comp_00000008[] = {
>+	0x07230203,0x00010000,0x00080007,0x000000fe,0x00000000,0x00020011,0x00000001,0x0006000b,
>+	0x00000001,0x4c534c47,0x6474732e,0x3035342e,0x00000000,0x0003000e,0x00000000,0x00000001,
>+	0x0006000f,0x00000005,0x00000004,0x6e69616d,0x00000000,0x000000bf,0x00060010,0x00000004,
>+	0x00000011,0x00000040,0x00000001,0x00000001,0x00030003,0x00000002,0x000001c2,0x00040005,
>+	0x00000004,0x6e69616d,0x00000000,0x000a0005,0x0000000b,0x53746567,0x6372756f,0x6d6f4365,
>+	0x656e6f70,0x664f746e,0x74657366,0x3b317528,0x003b3175,0x00040005,0x00000009,0x74726576,
>+	0x00007865,0x00050005,0x0000000a,0x706d6f63,0x6e656e6f,0x00000074,0x00070005,0x0000000f,
>+	0x53746567,0x74666968,0x73746942,0x3b317528,0x003b3175,0x00040005,0x0000000d,0x7366666f,
>+	0x00007465,0x00030005,0x0000000e,0x00000042,0x00080005,0x00000014,0x64616f6c,0x72756f53,
>+	0x6f436563,0x6e6f706d,0x28746e65,0x003b3175,0x00030005,0x00000013,0x00006463,0x00080005,
>+	0x00000019,0x766e6f63,0x43747265,0x6f706d6f,0x746e656e,0x3b316628,0x00000000,0x00050005,
>+	0x00000018,0x56637273,0x65756c61,0x00000000,0x000a0005,0x0000001e,0x656b616d,0x74736544,
>+	0x74616e69,0x436e6f69,0x6f706d6f,0x746e656e,0x3b317528,0x003b3166,0x00030005,0x0000001c,
>+	0x00006463,0x00040005,0x0000001d,0x756c6176,0x00000065,0x000a0005,0x00000022,0x726f7473,
>+	0x73654465,0x616e6974,0x6e6f6974,0x706d6f43,0x6e656e6f,0x75287374,0x00003b31,0x00050005,
>+	0x00000021,0x756c6176,0x55734165,0x00746e69,0x00060005,0x00000025,0x68737550,0x736e6f43,
>+	0x746e6174,0x00000073,0x00060006,0x00000025,0x00000000,0x7074756f,0x6f437475,0x00746e75,
>+	0x00070006,0x00000025,0x00000001,0x706d6f63,0x6e656e6f,0x756f4374,0x0000746e,0x00060006,
>+	0x00000025,0x00000002,0x4f637273,0x65736666,0x00000074,0x00060006,0x00000025,0x00000003,
>+	0x74736564,0x7366664f,0x00007465,0x00040006,0x00000025,0x00000004,0x0000734e,0x00040006,
>+	0x00000025,0x00000005,0x00007342,0x00040006,0x00000025,0x00000006,0x00007353,0x00040006,
>+	0x00000025,0x00000007,0x00007345,0x00040006,0x00000025,0x00000008,0x0000644e,0x00040006,
>+	0x00000025,0x00000009,0x00006442,0x00040006,0x00000025,0x0000000a,0x00006453,0x00040006,
>+	0x00000025,0x0000000b,0x00006445,0x00040005,0x00000027,0x61726170,0x0000736d,0x00040005,
>+	0x0000003a,0x66696873,0x00000074,0x00040005,0x00000043,0x74726576,0x00007865,0x00050005,
>+	0x00000049,0x706d6f63,0x6e656e6f,0x00000074,0x00040005,0x00000058,0x7366666f,0x00007465,
>+	0x00040005,0x00000059,0x61726170,0x0000006d,0x00040005,0x0000005b,0x61726170,0x0000006d,
>+	0x00040005,0x0000005e,0x636f6c62,0x0000006b,0x00030005,0x00000060,0x00637273,0x00050006,
>+	0x00000060,0x00000000,0x44637273,0x00617461,0x00030005,0x00000062,0x00000000,0x00050005,
>+	0x00000069,0x66696873,0x74694274,0x00000073,0x00040005,0x0000006a,0x61726170,0x0000006d,
>+	0x00040005,0x0000006c,0x61726170,0x0000006d,0x00050005,0x00000070,0x756c6176,0x74694265,
>+	0x00000073,0x00050005,0x00000074,0x756c6176,0x73614d65,0x0000006b,0x00050005,0x00000084,
>+	0x756c6176,0x55734165,0x00746e69,0x00050005,0x0000008b,0x654e7369,0x69746167,0x00006576,
>+	0x00050005,0x00000095,0x756c6176,0x49734165,0x0000746e,0x00040005,0x000000a2,0x756c6176,
>+	0x00000065,0x00050005,0x000000b2,0x756c6176,0x55734165,0x00746e69,0x00040005,0x000000ba,
>+	0x74736564,0x00000000,0x00060006,0x000000ba,0x00000000,0x74736564,0x61746144,0x00000000,
>+	0x00030005,0x000000bc,0x00000000,0x00080005,0x000000bf,0x475f6c67,0x61626f6c,0x766e496c,
>+	0x7461636f,0x496e6f69,0x00000044,0x00050005,0x000000d2,0x756c6176,0x74754f65,0x00000000,
>+	0x00030005,0x000000d3,0x00000069,0x00030005,0x000000db,0x00006463,0x00050005,0x000000e8,
>+	0x56637273,0x65756c61,0x00000000,0x00040005,0x000000e9,0x61726170,0x0000006d,0x00050005,
>+	0x000000ec,0x74736564,0x756c6156,0x00000065,0x00040005,0x000000ed,0x61726170,0x0000006d,
>+	0x00040005,0x000000f0,0x61726170,0x0000006d,0x00040005,0x000000f2,0x61726170,0x0000006d,
>+	0x00040005,0x000000f9,0x61726170,0x0000006d,0x00050048,0x00000025,0x00000000,0x00000023,
>+	0x00000000,0x00050048,0x00000025,0x00000001,0x00000023,0x00000004,0x00050048,0x00000025,
>+	0x00000002,0x00000023,0x00000008,0x00050048,0x00000025,0x00000003,0x00000023,0x0000000c,
>+	0x00050048,0x00000025,0x00000004,0x00000023,0x00000010,0x00050048,0x00000025,0x00000005,
>+	0x00000023,0x00000014,0x00050048,0x00000025,0x00000006,0x00000023,0x00000018,0x00050048,
>+	0x00000025,0x00000007,0x00000023,0x0000001c,0x00050048,0x00000025,0x00000008,0x00000023,
>+	0x00000020,0x00050048,0x00000025,0x00000009,0x00000023,0x00000024,0x00050048,0x00000025,
>+	0x0000000a,0x00000023,0x00000028,0x00050048,0x00000025,0x0000000b,0x00000023,0x0000002c,
>+	0x00030047,0x00000025,0x00000002,0x00040047,0x0000005f,0x00000006,0x00000004,0x00050048,
>+	0x00000060,0x00000000,0x00000023,0x00000000,0x00030047,0x00000060,0x00000003,0x00040047,
>+	0x00000062,0x00000022,0x00000000,0x00040047,0x00000062,0x00000021,0x00000001,0x00040047,
>+	0x000000b9,0x00000006,0x00000004,0x00050048,0x000000ba,0x00000000,0x00000023,0x00000000,
>+	0x00030047,0x000000ba,0x00000003,0x00040047,0x000000bc,0x00000022,0x00000000,0x00040047,
>+	0x000000bc,0x00000021,0x00000000,0x00040047,0x000000bf,0x0000000b,0x0000001c,0x00040047,
>+	0x000000fd,0x0000000b,0x00000019,0x00020013,0x00000002,0x00030021,0x00000003,0x00000002,
>+	0x00040015,0x00000006,0x00000020,0x00000000,0x00040020,0x00000007,0x00000007,0x00000006,
>+	0x00050021,0x00000008,0x00000006,0x00000007,0x00000007,0x00030016,0x00000011,0x00000020,
>+	0x00040021,0x00000012,0x00000011,0x00000007,0x00040020,0x00000016,0x00000007,0x00000011,
>+	0x00040021,0x00000017,0x00000011,0x00000016,0x00050021,0x0000001b,0x00000006,0x00000007,
>+	0x00000016,0x00040021,0x00000020,0x00000002,0x00000007,0x000e001e,0x00000025,0x00000006,
>+	0x00000006,0x00000006,0x00000006,0x00000006,0x00000006,0x00000006,0x00000006,0x00000006,
>+	0x00000006,0x00000006,0x00000006,0x00040020,0x00000026,0x00000009,0x00000025,0x0004003b,
>+	0x00000026,0x00000027,0x00000009,0x00040015,0x00000028,0x00000020,0x00000001,0x0004002b,
>+	0x00000028,0x00000029,0x00000006,0x00040020,0x0000002a,0x00000009,0x00000006,0x0004002b,
>+	0x00000028,0x0000002f,0x00000005,0x0004002b,0x00000028,0x00000034,0x00000002,0x0004002b,
>+	0x00000006,0x0000003c,0x00000004,0x0004002b,0x00000006,0x0000003e,0x00000008,0x0004002b,
>+	0x00000028,0x00000045,0x00000008,0x0004002b,0x00000028,0x0000004f,0x00000004,0x00020014,
>+	0x00000052,0x0004002b,0x00000011,0x00000056,0x00000000,0x0003001d,0x0000005f,0x00000006,
>+	0x0003001e,0x00000060,0x0000005f,0x00040020,0x00000061,0x00000002,0x00000060,0x0004003b,
>+	0x00000061,0x00000062,0x00000002,0x0004002b,0x00000028,0x00000063,0x00000000,0x00040020,
>+	0x00000066,0x00000002,0x00000006,0x0004002b,0x00000006,0x00000076,0x00000020,0x00040020,
>+	0x00000078,0x00000007,0x00000028,0x0004002b,0x00000028,0x0000007c,0xffffffff,0x0004002b,
>+	0x00000028,0x0000007e,0x00000001,0x00040020,0x0000008a,0x00000007,0x00000052,0x0004002b,
>+	0x00000006,0x0000008e,0x00000001,0x0004002b,0x00000006,0x00000093,0x00000000,0x0004002b,
>+	0x00000011,0x000000a3,0x40000000,0x0004002b,0x00000011,0x000000a7,0x3f800000,0x0003001d,
>+	0x000000b9,0x00000006,0x0003001e,0x000000ba,0x000000b9,0x00040020,0x000000bb,0x00000002,
>+	0x000000ba,0x0004003b,0x000000bb,0x000000bc,0x00000002,0x00040017,0x000000bd,0x00000006,
>+	0x00000003,0x00040020,0x000000be,0x00000001,0x000000bd,0x0004003b,0x000000be,0x000000bf,
>+	0x00000001,0x00040020,0x000000c0,0x00000001,0x00000006,0x0004002b,0x00000028,0x000000c3,
>+	0x00000003,0x0004002b,0x00000006,0x000000fc,0x00000040,0x0006002c,0x000000bd,0x000000fd,
>+	0x000000fc,0x0000008e,0x0000008e,0x00050036,0x00000002,0x00000004,0x00000000,0x00000003,
>+	0x000200f8,0x00000005,0x0004003b,0x00000007,0x000000d2,0x00000007,0x0004003b,0x00000007,
>+	0x000000d3,0x00000007,0x0004003b,0x00000007,0x000000db,0x00000007,0x0004003b,0x00000016,
>+	0x000000e8,0x00000007,0x0004003b,0x00000007,0x000000e9,0x00000007,0x0004003b,0x00000016,
>+	0x000000ec,0x00000007,0x0004003b,0x00000016,0x000000ed,0x00000007,0x0004003b,0x00000007,
>+	0x000000f0,0x00000007,0x0004003b,0x00000016,0x000000f2,0x00000007,0x0004003b,0x00000007,
>+	0x000000f9,0x00000007,0x00050041,0x000000c0,0x000000ca,0x000000bf,0x00000093,0x0004003d,
>+	0x00000006,0x000000cb,0x000000ca,0x00050041,0x0000002a,0x000000cc,0x00000027,0x00000063,
>+	0x0004003d,0x00000006,0x000000cd,0x000000cc,0x000500ae,0x00000052,0x000000ce,0x000000cb,
>+	0x000000cd,0x000300f7,0x000000d0,0x00000000,0x000400fa,0x000000ce,0x000000cf,0x000000d0,
>+	0x000200f8,0x000000cf,0x000100fd,0x000200f8,0x000000d0,0x0003003e,0x000000d2,0x00000093,
>+	0x0003003e,0x000000d3,0x00000093,0x000200f9,0x000000d4,0x000200f8,0x000000d4,0x000400f6,
>+	0x000000d6,0x000000d7,0x00000000,0x000200f9,0x000000d8,0x000200f8,0x000000d8,0x0004003d,
>+	0x00000006,0x000000d9,0x000000d3,0x000500b0,0x00000052,0x000000da,0x000000d9,0x0000008e,
>+	0x000400fa,0x000000da,0x000000d5,0x000000d6,0x000200f8,0x000000d5,0x00050041,0x000000c0,
>+	0x000000dc,0x000000bf,0x00000093,0x0004003d,0x00000006,0x000000dd,0x000000dc,0x00050084,
>+	0x00000006,0x000000de,0x000000dd,0x0000008e,0x0004003d,0x00000006,0x000000df,0x000000d3,
>+	0x00050080,0x00000006,0x000000e0,0x000000de,0x000000df,0x0003003e,0x000000db,0x000000e0,
>+	0x0004003d,0x00000006,0x000000e1,0x000000db,0x00050041,0x0000002a,0x000000e2,0x00000027,
>+	0x0000007e,0x0004003d,0x00000006,0x000000e3,0x000000e2,0x000500ae,0x00000052,0x000000e4,
>+	0x000000e1,0x000000e3,0x000300f7,0x000000e6,0x00000000,0x000400fa,0x000000e4,0x000000e5,
>+	0x000000e6,0x000200f8,0x000000e5,0x000200f9,0x000000d6,0x000200f8,0x000000e6,0x0004003d,
>+	0x00000006,0x000000ea,0x000000db,0x0003003e,0x000000e9,0x000000ea,0x00050039,0x00000011,
>+	0x000000eb,0x00000014,0x000000e9,0x0003003e,0x000000e8,0x000000eb,0x0004003d,0x00000011,
>+	0x000000ee,0x000000e8,0x0003003e,0x000000ed,0x000000ee,0x00050039,0x00000011,0x000000ef,
>+	0x00000019,0x000000ed,0x0003003e,0x000000ec,0x000000ef,0x0004003d,0x00000006,0x000000f1,
>+	0x000000db,0x0003003e,0x000000f0,0x000000f1,0x0004003d,0x00000011,0x000000f3,0x000000ec,
>+	0x0003003e,0x000000f2,0x000000f3,0x00060039,0x00000006,0x000000f4,0x0000001e,0x000000f0,
>+	0x000000f2,0x0004003d,0x00000006,0x000000f5,0x000000d2,0x000500c5,0x00000006,0x000000f6,
>+	0x000000f5,0x000000f4,0x0003003e,0x000000d2,0x000000f6,0x000200f9,0x000000d7,0x000200f8,
>+	0x000000d7,0x0004003d,0x00000006,0x000000f7,0x000000d3,0x00050080,0x00000006,0x000000f8,
>+	0x000000f7,0x0000007e,0x0003003e,0x000000d3,0x000000f8,0x000200f9,0x000000d4,0x000200f8,
>+	0x000000d6,0x0004003d,0x00000006,0x000000fa,0x000000d2,0x0003003e,0x000000f9,0x000000fa,
>+	0x00050039,0x00000002,0x000000fb,0x00000022,0x000000f9,0x000100fd,0x00010038,0x00050036,
>+	0x00000006,0x0000000b,0x00000000,0x00000008,0x00030037,0x00000007,0x00000009,0x00030037,
>+	0x00000007,0x0000000a,0x000200f8,0x0000000c,0x0004003d,0x00000006,0x00000024,0x00000009,
>+	0x00050041,0x0000002a,0x0000002b,0x00000027,0x00000029,0x0004003d,0x00000006,0x0000002c,
>+	0x0000002b,0x00050084,0x00000006,0x0000002d,0x00000024,0x0000002c,0x0004003d,0x00000006,
>+	0x0000002e,0x0000000a,0x00050041,0x0000002a,0x00000030,0x00000027,0x0000002f,0x0004003d,
>+	0x00000006,0x00000031,0x00000030,0x00050084,0x00000006,0x00000032,0x0000002e,0x00000031,
>+	0x00050080,0x00000006,0x00000033,0x0000002d,0x00000032,0x00050041,0x0000002a,0x00000035,
>+	0x00000027,0x00000034,0x0004003d,0x00000006,0x00000036,0x00000035,0x00050080,0x00000006,
>+	0x00000037,0x00000033,0x00000036,0x000200fe,0x00000037,0x00010038,0x00050036,0x00000006,
>+	0x0000000f,0x00000000,0x00000008,0x00030037,0x00000007,0x0000000d,0x00030037,0x00000007,
>+	0x0000000e,0x000200f8,0x00000010,0x0004003b,0x00000007,0x0000003a,0x00000007,0x0004003d,
>+	0x00000006,0x0000003b,0x0000000d,0x00050089,0x00000006,0x0000003d,0x0000003b,0x0000003c,
>+	0x00050084,0x00000006,0x0000003f,0x0000003d,0x0000003e,0x0003003e,0x0000003a,0x0000003f,
>+	0x0004003d,0x00000006,0x00000040,0x0000003a,0x000200fe,0x00000040,0x00010038,0x00050036,
>+	0x00000011,0x00000014,0x00000000,0x00000012,0x00030037,0x00000007,0x00000013,0x000200f8,
>+	0x00000015,0x0004003b,0x00000007,0x00000043,0x00000007,0x0004003b,0x00000007,0x00000049,
>+	0x00000007,0x0004003b,0x00000007,0x00000058,0x00000007,0x0004003b,0x00000007,0x00000059,
>+	0x00000007,0x0004003b,0x00000007,0x0000005b,0x00000007,0x0004003b,0x00000007,0x0000005e,
>+	0x00000007,0x0004003b,0x00000007,0x00000069,0x00000007,0x0004003b,0x00000007,0x0000006a,
>+	0x00000007,0x0004003b,0x00000007,0x0000006c,0x00000007,0x0004003b,0x00000007,0x00000070,
>+	0x00000007,0x0004003b,0x00000007,0x00000074,0x00000007,0x0004003b,0x00000078,0x00000079,
>+	0x00000007,0x0004003b,0x00000007,0x00000084,0x00000007,0x0004003b,0x0000008a,0x0000008b,
>+	0x00000007,0x0004003b,0x00000078,0x00000095,0x00000007,0x0004003b,0x00000078,0x00000098,
>+	0x00000007,0x0004003b,0x00000016,0x000000a2,0x00000007,0x0004003d,0x00000006,0x00000044,
>+	0x00000013,0x00050041,0x0000002a,0x00000046,0x00000027,0x00000045,0x0004003d,0x00000006,
>+	0x00000047,0x00000046,0x00050086,0x00000006,0x00000048,0x00000044,0x00000047,0x0003003e,
>+	0x00000043,0x00000048,0x0004003d,0x00000006,0x0000004a,0x00000013,0x00050041,0x0000002a,
>+	0x0000004b,0x00000027,0x00000045,0x0004003d,0x00000006,0x0000004c,0x0000004b,0x00050089,
>+	0x00000006,0x0000004d,0x0000004a,0x0000004c,0x0003003e,0x00000049,0x0000004d,0x0004003d,
>+	0x00000006,0x0000004e,0x00000049,0x00050041,0x0000002a,0x00000050,0x00000027,0x0000004f,
>+	0x0004003d,0x00000006,0x00000051,0x00000050,0x000500ae,0x00000052,0x00000053,0x0000004e,
>+	0x00000051,0x000300f7,0x00000055,0x00000000,0x000400fa,0x00000053,0x00000054,0x00000055,
>+	0x000200f8,0x00000054,0x000200fe,0x00000056,0x000200f8,0x00000055,0x0004003d,0x00000006,
>+	0x0000005a,0x00000043,0x0003003e,0x00000059,0x0000005a,0x0004003d,0x00000006,0x0000005c,
>+	0x00000049,0x0003003e,0x0000005b,0x0000005c,0x00060039,0x00000006,0x0000005d,0x0000000b,
>+	0x00000059,0x0000005b,0x0003003e,0x00000058,0x0000005d,0x0004003d,0x00000006,0x00000064,
>+	0x00000058,0x00050086,0x00000006,0x00000065,0x00000064,0x0000003c,0x00060041,0x00000066,
>+	0x00000067,0x00000062,0x00000063,0x00000065,0x0004003d,0x00000006,0x00000068,0x00000067,
>+	0x0003003e,0x0000005e,0x00000068,0x0004003d,0x00000006,0x0000006b,0x00000058,0x0003003e,
>+	0x0000006a,0x0000006b,0x00050041,0x0000002a,0x0000006d,0x00000027,0x0000002f,0x0004003d,
>+	0x00000006,0x0000006e,0x0000006d,0x0003003e,0x0000006c,0x0000006e,0x00060039,0x00000006,
>+	0x0000006f,0x0000000f,0x0000006a,0x0000006c,0x0003003e,0x00000069,0x0000006f,0x00050041,
>+	0x0000002a,0x00000071,0x00000027,0x0000002f,0x0004003d,0x00000006,0x00000072,0x00000071,
>+	0x00050084,0x00000006,0x00000073,0x00000072,0x0000003e,0x0003003e,0x00000070,0x00000073,
>+	0x0004003d,0x00000006,0x00000075,0x00000070,0x000500aa,0x00000052,0x00000077,0x00000075,
>+	0x00000076,0x000300f7,0x0000007b,0x00000000,0x000400fa,0x00000077,0x0000007a,0x0000007d,
>+	0x000200f8,0x0000007a,0x0003003e,0x00000079,0x0000007c,0x000200f9,0x0000007b,0x000200f8,
>+	0x0000007d,0x0004003d,0x00000006,0x0000007f,0x00000070,0x000500c4,0x00000028,0x00000080,
>+	0x0000007e,0x0000007f,0x00050082,0x00000028,0x00000081,0x00000080,0x0000007e,0x0003003e,
>+	0x00000079,0x00000081,0x000200f9,0x0000007b,0x000200f8,0x0000007b,0x0004003d,0x00000028,
>+	0x00000082,0x00000079,0x0004007c,0x00000006,0x00000083,0x00000082,0x0003003e,0x00000074,
>+	0x00000083,0x0004003d,0x00000006,0x00000085,0x0000005e,0x0004003d,0x00000006,0x00000086,
>+	0x00000069,0x000500c2,0x00000006,0x00000087,0x00000085,0x00000086,0x0004003d,0x00000006,
>+	0x00000088,0x00000074,0x000500c7,0x00000006,0x00000089,0x00000087,0x00000088,0x0003003e,
>+	0x00000084,0x00000089,0x0004003d,0x00000006,0x0000008c,0x00000084,0x0004003d,0x00000006,
>+	0x0000008d,0x00000070,0x00050082,0x00000006,0x0000008f,0x0000008d,0x0000008e,0x000500c4,
>+	0x00000028,0x00000090,0x0000007e,0x0000008f,0x0004007c,0x00000006,0x00000091,0x00000090,
>+	0x000500c7,0x00000006,0x00000092,0x0000008c,0x00000091,0x000500ab,0x00000052,0x00000094,
>+	0x00000092,0x00000093,0x0003003e,0x0000008b,0x00000094,0x0004003d,0x00000006,0x00000096,
>+	0x00000084,0x0004003d,0x00000052,0x00000097,0x0000008b,0x000300f7,0x0000009a,0x00000000,
>+	0x000400fa,0x00000097,0x00000099,0x0000009d,0x000200f8,0x00000099,0x0004003d,0x00000006,
>+	0x0000009b,0x00000070,0x000500c4,0x00000028,0x0000009c,0x0000007c,0x0000009b,0x0003003e,
>+	0x00000098,0x0000009c,0x000200f9,0x0000009a,0x000200f8,0x0000009d,0x0003003e,0x00000098,
>+	0x00000063,0x000200f9,0x0000009a,0x000200f8,0x0000009a,0x0004003d,0x00000028,0x0000009e,
>+	0x00000098,0x0004007c,0x00000006,0x0000009f,0x0000009e,0x000500c5,0x00000006,0x000000a0,
>+	0x00000096,0x0000009f,0x0004007c,0x00000028,0x000000a1,0x000000a0,0x0003003e,0x00000095,
>+	0x000000a1,0x0004003d,0x00000028,0x000000a4,0x00000095,0x0004006f,0x00000011,0x000000a5,
>+	0x000000a4,0x00050085,0x00000011,0x000000a6,0x000000a3,0x000000a5,0x00050081,0x00000011,
>+	0x000000a8,0x000000a6,0x000000a7,0x0004003d,0x00000006,0x000000a9,0x00000074,0x00040070,
>+	0x00000011,0x000000aa,0x000000a9,0x00050088,0x00000011,0x000000ab,0x000000a8,0x000000aa,
>+	0x0003003e,0x000000a2,0x000000ab,0x0004003d,0x00000011,0x000000ac,0x000000a2,0x000200fe,
>+	0x000000ac,0x00010038,0x00050036,0x00000011,0x00000019,0x00000000,0x00000017,0x00030037,
>+	0x00000016,0x00000018,0x000200f8,0x0000001a,0x0004003d,0x00000011,0x000000af,0x00000018,
>+	0x000200fe,0x000000af,0x00010038,0x00050036,0x00000006,0x0000001e,0x00000000,0x0000001b,
>+	0x00030037,0x00000007,0x0000001c,0x00030037,0x00000016,0x0000001d,0x000200f8,0x0000001f,
>+	0x0004003b,0x00000007,0x000000b2,0x00000007,0x0004003d,0x00000011,0x000000b3,0x0000001d,
>+	0x0004007c,0x00000028,0x000000b4,0x000000b3,0x0004007c,0x00000006,0x000000b5,0x000000b4,
>+	0x0003003e,0x000000b2,0x000000b5,0x0004003d,0x00000006,0x000000b6,0x000000b2,0x000200fe,
>+	0x000000b6,0x00010038,0x00050036,0x00000002,0x00000022,0x00000000,0x00000020,0x00030037,
>+	0x00000007,0x00000021,0x000200f8,0x00000023,0x00050041,0x000000c0,0x000000c1,0x000000bf,
>+	0x00000093,0x0004003d,0x00000006,0x000000c2,0x000000c1,0x00050041,0x0000002a,0x000000c4,
>+	0x00000027,0x000000c3,0x0004003d,0x00000006,0x000000c5,0x000000c4,0x00050086,0x00000006,
>+	0x000000c6,0x000000c5,0x0000003c,0x00050080,0x00000006,0x000000c7,0x000000c2,0x000000c6,
>+	0x0004003d,0x00000006,0x000000c8,0x00000021,0x00060041,0x00000066,0x000000c9,0x000000bc,
>+	0x00000063,0x000000c7,0x0003003e,0x000000c9,0x000000c8,0x000100fd,0x00010038
>+};
>+
>+#if 0  // Generated from:
>+#version 450 core
>+
>+layout(local_size_x = 64, local_size_y = 1, local_size_z = 1)in;
>+
>+layout(set = 0, binding = 0)buffer dest
>+{
>+    uint destData[];
>+};
>+
>+layout(set = 0, binding = 1)buffer src
>+{
>+    uint srcData[];
>+};
>+
>+layout(push_constant)uniform PushConstants
>+{
>+
>+    uint outputCount;
>+
>+    uint componentCount;
>+
>+    uint srcOffset;
>+    uint destOffset;
>+
>+    uint Ns;
>+    uint Bs;
>+    uint Ss;
>+    uint Es;
>+
>+    uint Nd;
>+    uint Bd;
>+    uint Sd;
>+    uint Ed;
>+} params;
>+
>+uint getSourceComponentOffset(uint vertex, uint component)
>+{
>+    return vertex * params . Ss + component * params . Bs + params . srcOffset;
>+}
>+
>+uint getDestinationComponentOffset(uint vertex, uint component)
>+{
>+    return vertex * params . Sd + component * 4 + params . destOffset;
>+}
>+
>+uint getShiftBits(uint offset, uint B)
>+{
>+
>+    uint shift =(offset % 4)* 8;
>+
>+    return shift;
>+}
>+
>+      float loadSourceComponent(uint cd)
>+{
>+
>+    uint vertex = cd / params . Nd;
>+    uint component = cd % params . Nd;
>+
>+    if(component >= params . Ns)
>+    {
>+        return 0;
>+    }
>+
>+    uint offset = getSourceComponentOffset(vertex, component);
>+    uint block = srcData[offset / 4];
>+    uint shiftBits = getShiftBits(offset, params . Bs);
>+
>+    uint valueBits = params . Bs * 8;
>+    uint valueMask = valueBits == 32 ? - 1 :(1 << valueBits)- 1;
>+    uint valueAsUint =(block >> shiftBits)& valueMask;
>+
>+    bool isNegative =(valueAsUint &(1 <<(valueBits - 1)))!= 0;
>+    int valueAsInt = int(valueAsUint |(isNegative ? 0xFFFFFFFF << valueBits : 0));
>+          float value =(2 * float(valueAsInt)+ 1)/ valueMask;
>+
>+    return value;
>+}
>+
>+       float convertComponent(float srcValue)
>+{
>+
>+    return srcValue;
>+}
>+
>+uint makeDestinationComponent(uint cd, float value)
>+{
>+
>+    uint valueAsUint = floatBitsToInt(value);
>+
>+    return valueAsUint;
>+}
>+
>+void storeDestinationComponents(uint valueAsUint)
>+{
>+
>+    destData[gl_GlobalInvocationID . x + params . destOffset / 4]= valueAsUint;
>+}
>+
>+void main()
>+{
>+
>+    if(gl_GlobalInvocationID . x >= params . outputCount)
>+        return;
>+
>+    uint valueOut = 0;
>+    for(uint i = 0;i < 1;++ i)
>+    {
>+        uint cd = gl_GlobalInvocationID . x * 1 + i;
>+
>+        if(cd >= params . componentCount)
>+        {
>+            break;
>+        }
>+
>+              float srcValue = loadSourceComponent(cd);
>+               float destValue = convertComponent(srcValue);
>+        valueOut |= makeDestinationComponent(cd, destValue);
>+    }
>+
>+    storeDestinationComponents(valueOut);
>+}
>+#endif  // Preprocessed code
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.00000009.inc b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.00000009.inc
>new file mode 100644
>index 00000000000..30631b9b38c
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.00000009.inc
>@@ -0,0 +1,314 @@
>+	// 7.11.3188
>+	 #pragma once
>+const uint32_t kConvertVertex_comp_00000009[] = {
>+	0x07230203,0x00010000,0x00080007,0x000000ef,0x00000000,0x00020011,0x00000001,0x0006000b,
>+	0x00000001,0x4c534c47,0x6474732e,0x3035342e,0x00000000,0x0003000e,0x00000000,0x00000001,
>+	0x0006000f,0x00000005,0x00000004,0x6e69616d,0x00000000,0x000000bf,0x00060010,0x00000004,
>+	0x00000011,0x00000040,0x00000001,0x00000001,0x00030003,0x00000002,0x000001c2,0x00040005,
>+	0x00000004,0x6e69616d,0x00000000,0x000a0005,0x0000000b,0x53746567,0x6372756f,0x6d6f4365,
>+	0x656e6f70,0x664f746e,0x74657366,0x3b317528,0x003b3175,0x00040005,0x00000009,0x74726576,
>+	0x00007865,0x00050005,0x0000000a,0x706d6f63,0x6e656e6f,0x00000074,0x00070005,0x0000000f,
>+	0x53746567,0x74666968,0x73746942,0x3b317528,0x003b3175,0x00040005,0x0000000d,0x7366666f,
>+	0x00007465,0x00030005,0x0000000e,0x00000042,0x00080005,0x00000014,0x64616f6c,0x72756f53,
>+	0x6f436563,0x6e6f706d,0x28746e65,0x003b3175,0x00030005,0x00000013,0x00006463,0x00080005,
>+	0x00000019,0x766e6f63,0x43747265,0x6f706d6f,0x746e656e,0x3b316628,0x00000000,0x00050005,
>+	0x00000018,0x56637273,0x65756c61,0x00000000,0x000a0005,0x0000001e,0x656b616d,0x74736544,
>+	0x74616e69,0x436e6f69,0x6f706d6f,0x746e656e,0x3b317528,0x003b3166,0x00030005,0x0000001c,
>+	0x00006463,0x00040005,0x0000001d,0x756c6176,0x00000065,0x000a0005,0x00000022,0x726f7473,
>+	0x73654465,0x616e6974,0x6e6f6974,0x706d6f43,0x6e656e6f,0x75287374,0x00003b31,0x00050005,
>+	0x00000021,0x756c6176,0x55734165,0x00746e69,0x00060005,0x00000025,0x68737550,0x736e6f43,
>+	0x746e6174,0x00000073,0x00060006,0x00000025,0x00000000,0x7074756f,0x6f437475,0x00746e75,
>+	0x00070006,0x00000025,0x00000001,0x706d6f63,0x6e656e6f,0x756f4374,0x0000746e,0x00060006,
>+	0x00000025,0x00000002,0x4f637273,0x65736666,0x00000074,0x00060006,0x00000025,0x00000003,
>+	0x74736564,0x7366664f,0x00007465,0x00040006,0x00000025,0x00000004,0x0000734e,0x00040006,
>+	0x00000025,0x00000005,0x00007342,0x00040006,0x00000025,0x00000006,0x00007353,0x00040006,
>+	0x00000025,0x00000007,0x00007345,0x00040006,0x00000025,0x00000008,0x0000644e,0x00040006,
>+	0x00000025,0x00000009,0x00006442,0x00040006,0x00000025,0x0000000a,0x00006453,0x00040006,
>+	0x00000025,0x0000000b,0x00006445,0x00040005,0x00000027,0x61726170,0x0000736d,0x00040005,
>+	0x0000003a,0x66696873,0x00000074,0x00040005,0x00000043,0x74726576,0x00007865,0x00050005,
>+	0x00000049,0x706d6f63,0x6e656e6f,0x00000074,0x00040005,0x00000058,0x7366666f,0x00007465,
>+	0x00040005,0x00000059,0x61726170,0x0000006d,0x00040005,0x0000005b,0x61726170,0x0000006d,
>+	0x00040005,0x0000005e,0x636f6c62,0x0000006b,0x00030005,0x00000060,0x00637273,0x00050006,
>+	0x00000060,0x00000000,0x44637273,0x00617461,0x00030005,0x00000062,0x00000000,0x00050005,
>+	0x00000069,0x66696873,0x74694274,0x00000073,0x00040005,0x0000006a,0x61726170,0x0000006d,
>+	0x00040005,0x0000006c,0x61726170,0x0000006d,0x00050005,0x00000070,0x756c6176,0x74694265,
>+	0x00000073,0x00050005,0x00000074,0x756c6176,0x73614d65,0x0000006b,0x00050005,0x00000084,
>+	0x756c6176,0x55734165,0x00746e69,0x00050005,0x0000008b,0x654e7369,0x69746167,0x00006576,
>+	0x00050005,0x00000095,0x756c6176,0x49734165,0x0000746e,0x00040005,0x000000a2,0x756c6176,
>+	0x00000065,0x00050005,0x000000b2,0x756c6176,0x55734165,0x00746e69,0x00040005,0x000000ba,
>+	0x74736564,0x00000000,0x00060006,0x000000ba,0x00000000,0x74736564,0x61746144,0x00000000,
>+	0x00030005,0x000000bc,0x00000000,0x00080005,0x000000bf,0x475f6c67,0x61626f6c,0x766e496c,
>+	0x7461636f,0x496e6f69,0x00000044,0x00050005,0x000000ca,0x756c6176,0x74754f65,0x00000000,
>+	0x00030005,0x000000cb,0x00000069,0x00030005,0x000000d3,0x00006463,0x00050005,0x000000d9,
>+	0x56637273,0x65756c61,0x00000000,0x00040005,0x000000da,0x61726170,0x0000006d,0x00050005,
>+	0x000000dd,0x74736564,0x756c6156,0x00000065,0x00040005,0x000000de,0x61726170,0x0000006d,
>+	0x00040005,0x000000e1,0x61726170,0x0000006d,0x00040005,0x000000e3,0x61726170,0x0000006d,
>+	0x00040005,0x000000ea,0x61726170,0x0000006d,0x00050048,0x00000025,0x00000000,0x00000023,
>+	0x00000000,0x00050048,0x00000025,0x00000001,0x00000023,0x00000004,0x00050048,0x00000025,
>+	0x00000002,0x00000023,0x00000008,0x00050048,0x00000025,0x00000003,0x00000023,0x0000000c,
>+	0x00050048,0x00000025,0x00000004,0x00000023,0x00000010,0x00050048,0x00000025,0x00000005,
>+	0x00000023,0x00000014,0x00050048,0x00000025,0x00000006,0x00000023,0x00000018,0x00050048,
>+	0x00000025,0x00000007,0x00000023,0x0000001c,0x00050048,0x00000025,0x00000008,0x00000023,
>+	0x00000020,0x00050048,0x00000025,0x00000009,0x00000023,0x00000024,0x00050048,0x00000025,
>+	0x0000000a,0x00000023,0x00000028,0x00050048,0x00000025,0x0000000b,0x00000023,0x0000002c,
>+	0x00030047,0x00000025,0x00000002,0x00040047,0x0000005f,0x00000006,0x00000004,0x00050048,
>+	0x00000060,0x00000000,0x00000023,0x00000000,0x00030047,0x00000060,0x00000003,0x00040047,
>+	0x00000062,0x00000022,0x00000000,0x00040047,0x00000062,0x00000021,0x00000001,0x00040047,
>+	0x000000b9,0x00000006,0x00000004,0x00050048,0x000000ba,0x00000000,0x00000023,0x00000000,
>+	0x00030047,0x000000ba,0x00000003,0x00040047,0x000000bc,0x00000022,0x00000000,0x00040047,
>+	0x000000bc,0x00000021,0x00000000,0x00040047,0x000000bf,0x0000000b,0x0000001c,0x00040047,
>+	0x000000ee,0x0000000b,0x00000019,0x00020013,0x00000002,0x00030021,0x00000003,0x00000002,
>+	0x00040015,0x00000006,0x00000020,0x00000000,0x00040020,0x00000007,0x00000007,0x00000006,
>+	0x00050021,0x00000008,0x00000006,0x00000007,0x00000007,0x00030016,0x00000011,0x00000020,
>+	0x00040021,0x00000012,0x00000011,0x00000007,0x00040020,0x00000016,0x00000007,0x00000011,
>+	0x00040021,0x00000017,0x00000011,0x00000016,0x00050021,0x0000001b,0x00000006,0x00000007,
>+	0x00000016,0x00040021,0x00000020,0x00000002,0x00000007,0x000e001e,0x00000025,0x00000006,
>+	0x00000006,0x00000006,0x00000006,0x00000006,0x00000006,0x00000006,0x00000006,0x00000006,
>+	0x00000006,0x00000006,0x00000006,0x00040020,0x00000026,0x00000009,0x00000025,0x0004003b,
>+	0x00000026,0x00000027,0x00000009,0x00040015,0x00000028,0x00000020,0x00000001,0x0004002b,
>+	0x00000028,0x00000029,0x00000006,0x00040020,0x0000002a,0x00000009,0x00000006,0x0004002b,
>+	0x00000028,0x0000002f,0x00000005,0x0004002b,0x00000028,0x00000034,0x00000002,0x0004002b,
>+	0x00000006,0x0000003c,0x00000004,0x0004002b,0x00000006,0x0000003e,0x00000008,0x0004002b,
>+	0x00000028,0x00000045,0x00000008,0x0004002b,0x00000028,0x0000004f,0x00000004,0x00020014,
>+	0x00000052,0x0004002b,0x00000011,0x00000056,0x00000000,0x0003001d,0x0000005f,0x00000006,
>+	0x0003001e,0x00000060,0x0000005f,0x00040020,0x00000061,0x00000002,0x00000060,0x0004003b,
>+	0x00000061,0x00000062,0x00000002,0x0004002b,0x00000028,0x00000063,0x00000000,0x00040020,
>+	0x00000066,0x00000002,0x00000006,0x0004002b,0x00000006,0x00000076,0x00000020,0x00040020,
>+	0x00000078,0x00000007,0x00000028,0x0004002b,0x00000028,0x0000007c,0xffffffff,0x0004002b,
>+	0x00000028,0x0000007e,0x00000001,0x00040020,0x0000008a,0x00000007,0x00000052,0x0004002b,
>+	0x00000006,0x0000008e,0x00000001,0x0004002b,0x00000006,0x00000093,0x00000000,0x0004002b,
>+	0x00000011,0x000000a3,0x40000000,0x0004002b,0x00000011,0x000000a7,0x3f800000,0x0003001d,
>+	0x000000b9,0x00000006,0x0003001e,0x000000ba,0x000000b9,0x00040020,0x000000bb,0x00000002,
>+	0x000000ba,0x0004003b,0x000000bb,0x000000bc,0x00000002,0x00040017,0x000000bd,0x00000006,
>+	0x00000003,0x00040020,0x000000be,0x00000001,0x000000bd,0x0004003b,0x000000be,0x000000bf,
>+	0x00000001,0x00040020,0x000000c0,0x00000001,0x00000006,0x0004002b,0x00000028,0x000000c3,
>+	0x00000003,0x0004002b,0x00000006,0x000000ed,0x00000040,0x0006002c,0x000000bd,0x000000ee,
>+	0x000000ed,0x0000008e,0x0000008e,0x00050036,0x00000002,0x00000004,0x00000000,0x00000003,
>+	0x000200f8,0x00000005,0x0004003b,0x00000007,0x000000ca,0x00000007,0x0004003b,0x00000007,
>+	0x000000cb,0x00000007,0x0004003b,0x00000007,0x000000d3,0x00000007,0x0004003b,0x00000016,
>+	0x000000d9,0x00000007,0x0004003b,0x00000007,0x000000da,0x00000007,0x0004003b,0x00000016,
>+	0x000000dd,0x00000007,0x0004003b,0x00000016,0x000000de,0x00000007,0x0004003b,0x00000007,
>+	0x000000e1,0x00000007,0x0004003b,0x00000016,0x000000e3,0x00000007,0x0004003b,0x00000007,
>+	0x000000ea,0x00000007,0x0003003e,0x000000ca,0x00000093,0x0003003e,0x000000cb,0x00000093,
>+	0x000200f9,0x000000cc,0x000200f8,0x000000cc,0x000400f6,0x000000ce,0x000000cf,0x00000000,
>+	0x000200f9,0x000000d0,0x000200f8,0x000000d0,0x0004003d,0x00000006,0x000000d1,0x000000cb,
>+	0x000500b0,0x00000052,0x000000d2,0x000000d1,0x0000008e,0x000400fa,0x000000d2,0x000000cd,
>+	0x000000ce,0x000200f8,0x000000cd,0x00050041,0x000000c0,0x000000d4,0x000000bf,0x00000093,
>+	0x0004003d,0x00000006,0x000000d5,0x000000d4,0x00050084,0x00000006,0x000000d6,0x000000d5,
>+	0x0000008e,0x0004003d,0x00000006,0x000000d7,0x000000cb,0x00050080,0x00000006,0x000000d8,
>+	0x000000d6,0x000000d7,0x0003003e,0x000000d3,0x000000d8,0x0004003d,0x00000006,0x000000db,
>+	0x000000d3,0x0003003e,0x000000da,0x000000db,0x00050039,0x00000011,0x000000dc,0x00000014,
>+	0x000000da,0x0003003e,0x000000d9,0x000000dc,0x0004003d,0x00000011,0x000000df,0x000000d9,
>+	0x0003003e,0x000000de,0x000000df,0x00050039,0x00000011,0x000000e0,0x00000019,0x000000de,
>+	0x0003003e,0x000000dd,0x000000e0,0x0004003d,0x00000006,0x000000e2,0x000000d3,0x0003003e,
>+	0x000000e1,0x000000e2,0x0004003d,0x00000011,0x000000e4,0x000000dd,0x0003003e,0x000000e3,
>+	0x000000e4,0x00060039,0x00000006,0x000000e5,0x0000001e,0x000000e1,0x000000e3,0x0004003d,
>+	0x00000006,0x000000e6,0x000000ca,0x000500c5,0x00000006,0x000000e7,0x000000e6,0x000000e5,
>+	0x0003003e,0x000000ca,0x000000e7,0x000200f9,0x000000cf,0x000200f8,0x000000cf,0x0004003d,
>+	0x00000006,0x000000e8,0x000000cb,0x00050080,0x00000006,0x000000e9,0x000000e8,0x0000007e,
>+	0x0003003e,0x000000cb,0x000000e9,0x000200f9,0x000000cc,0x000200f8,0x000000ce,0x0004003d,
>+	0x00000006,0x000000eb,0x000000ca,0x0003003e,0x000000ea,0x000000eb,0x00050039,0x00000002,
>+	0x000000ec,0x00000022,0x000000ea,0x000100fd,0x00010038,0x00050036,0x00000006,0x0000000b,
>+	0x00000000,0x00000008,0x00030037,0x00000007,0x00000009,0x00030037,0x00000007,0x0000000a,
>+	0x000200f8,0x0000000c,0x0004003d,0x00000006,0x00000024,0x00000009,0x00050041,0x0000002a,
>+	0x0000002b,0x00000027,0x00000029,0x0004003d,0x00000006,0x0000002c,0x0000002b,0x00050084,
>+	0x00000006,0x0000002d,0x00000024,0x0000002c,0x0004003d,0x00000006,0x0000002e,0x0000000a,
>+	0x00050041,0x0000002a,0x00000030,0x00000027,0x0000002f,0x0004003d,0x00000006,0x00000031,
>+	0x00000030,0x00050084,0x00000006,0x00000032,0x0000002e,0x00000031,0x00050080,0x00000006,
>+	0x00000033,0x0000002d,0x00000032,0x00050041,0x0000002a,0x00000035,0x00000027,0x00000034,
>+	0x0004003d,0x00000006,0x00000036,0x00000035,0x00050080,0x00000006,0x00000037,0x00000033,
>+	0x00000036,0x000200fe,0x00000037,0x00010038,0x00050036,0x00000006,0x0000000f,0x00000000,
>+	0x00000008,0x00030037,0x00000007,0x0000000d,0x00030037,0x00000007,0x0000000e,0x000200f8,
>+	0x00000010,0x0004003b,0x00000007,0x0000003a,0x00000007,0x0004003d,0x00000006,0x0000003b,
>+	0x0000000d,0x00050089,0x00000006,0x0000003d,0x0000003b,0x0000003c,0x00050084,0x00000006,
>+	0x0000003f,0x0000003d,0x0000003e,0x0003003e,0x0000003a,0x0000003f,0x0004003d,0x00000006,
>+	0x00000040,0x0000003a,0x000200fe,0x00000040,0x00010038,0x00050036,0x00000011,0x00000014,
>+	0x00000000,0x00000012,0x00030037,0x00000007,0x00000013,0x000200f8,0x00000015,0x0004003b,
>+	0x00000007,0x00000043,0x00000007,0x0004003b,0x00000007,0x00000049,0x00000007,0x0004003b,
>+	0x00000007,0x00000058,0x00000007,0x0004003b,0x00000007,0x00000059,0x00000007,0x0004003b,
>+	0x00000007,0x0000005b,0x00000007,0x0004003b,0x00000007,0x0000005e,0x00000007,0x0004003b,
>+	0x00000007,0x00000069,0x00000007,0x0004003b,0x00000007,0x0000006a,0x00000007,0x0004003b,
>+	0x00000007,0x0000006c,0x00000007,0x0004003b,0x00000007,0x00000070,0x00000007,0x0004003b,
>+	0x00000007,0x00000074,0x00000007,0x0004003b,0x00000078,0x00000079,0x00000007,0x0004003b,
>+	0x00000007,0x00000084,0x00000007,0x0004003b,0x0000008a,0x0000008b,0x00000007,0x0004003b,
>+	0x00000078,0x00000095,0x00000007,0x0004003b,0x00000078,0x00000098,0x00000007,0x0004003b,
>+	0x00000016,0x000000a2,0x00000007,0x0004003d,0x00000006,0x00000044,0x00000013,0x00050041,
>+	0x0000002a,0x00000046,0x00000027,0x00000045,0x0004003d,0x00000006,0x00000047,0x00000046,
>+	0x00050086,0x00000006,0x00000048,0x00000044,0x00000047,0x0003003e,0x00000043,0x00000048,
>+	0x0004003d,0x00000006,0x0000004a,0x00000013,0x00050041,0x0000002a,0x0000004b,0x00000027,
>+	0x00000045,0x0004003d,0x00000006,0x0000004c,0x0000004b,0x00050089,0x00000006,0x0000004d,
>+	0x0000004a,0x0000004c,0x0003003e,0x00000049,0x0000004d,0x0004003d,0x00000006,0x0000004e,
>+	0x00000049,0x00050041,0x0000002a,0x00000050,0x00000027,0x0000004f,0x0004003d,0x00000006,
>+	0x00000051,0x00000050,0x000500ae,0x00000052,0x00000053,0x0000004e,0x00000051,0x000300f7,
>+	0x00000055,0x00000000,0x000400fa,0x00000053,0x00000054,0x00000055,0x000200f8,0x00000054,
>+	0x000200fe,0x00000056,0x000200f8,0x00000055,0x0004003d,0x00000006,0x0000005a,0x00000043,
>+	0x0003003e,0x00000059,0x0000005a,0x0004003d,0x00000006,0x0000005c,0x00000049,0x0003003e,
>+	0x0000005b,0x0000005c,0x00060039,0x00000006,0x0000005d,0x0000000b,0x00000059,0x0000005b,
>+	0x0003003e,0x00000058,0x0000005d,0x0004003d,0x00000006,0x00000064,0x00000058,0x00050086,
>+	0x00000006,0x00000065,0x00000064,0x0000003c,0x00060041,0x00000066,0x00000067,0x00000062,
>+	0x00000063,0x00000065,0x0004003d,0x00000006,0x00000068,0x00000067,0x0003003e,0x0000005e,
>+	0x00000068,0x0004003d,0x00000006,0x0000006b,0x00000058,0x0003003e,0x0000006a,0x0000006b,
>+	0x00050041,0x0000002a,0x0000006d,0x00000027,0x0000002f,0x0004003d,0x00000006,0x0000006e,
>+	0x0000006d,0x0003003e,0x0000006c,0x0000006e,0x00060039,0x00000006,0x0000006f,0x0000000f,
>+	0x0000006a,0x0000006c,0x0003003e,0x00000069,0x0000006f,0x00050041,0x0000002a,0x00000071,
>+	0x00000027,0x0000002f,0x0004003d,0x00000006,0x00000072,0x00000071,0x00050084,0x00000006,
>+	0x00000073,0x00000072,0x0000003e,0x0003003e,0x00000070,0x00000073,0x0004003d,0x00000006,
>+	0x00000075,0x00000070,0x000500aa,0x00000052,0x00000077,0x00000075,0x00000076,0x000300f7,
>+	0x0000007b,0x00000000,0x000400fa,0x00000077,0x0000007a,0x0000007d,0x000200f8,0x0000007a,
>+	0x0003003e,0x00000079,0x0000007c,0x000200f9,0x0000007b,0x000200f8,0x0000007d,0x0004003d,
>+	0x00000006,0x0000007f,0x00000070,0x000500c4,0x00000028,0x00000080,0x0000007e,0x0000007f,
>+	0x00050082,0x00000028,0x00000081,0x00000080,0x0000007e,0x0003003e,0x00000079,0x00000081,
>+	0x000200f9,0x0000007b,0x000200f8,0x0000007b,0x0004003d,0x00000028,0x00000082,0x00000079,
>+	0x0004007c,0x00000006,0x00000083,0x00000082,0x0003003e,0x00000074,0x00000083,0x0004003d,
>+	0x00000006,0x00000085,0x0000005e,0x0004003d,0x00000006,0x00000086,0x00000069,0x000500c2,
>+	0x00000006,0x00000087,0x00000085,0x00000086,0x0004003d,0x00000006,0x00000088,0x00000074,
>+	0x000500c7,0x00000006,0x00000089,0x00000087,0x00000088,0x0003003e,0x00000084,0x00000089,
>+	0x0004003d,0x00000006,0x0000008c,0x00000084,0x0004003d,0x00000006,0x0000008d,0x00000070,
>+	0x00050082,0x00000006,0x0000008f,0x0000008d,0x0000008e,0x000500c4,0x00000028,0x00000090,
>+	0x0000007e,0x0000008f,0x0004007c,0x00000006,0x00000091,0x00000090,0x000500c7,0x00000006,
>+	0x00000092,0x0000008c,0x00000091,0x000500ab,0x00000052,0x00000094,0x00000092,0x00000093,
>+	0x0003003e,0x0000008b,0x00000094,0x0004003d,0x00000006,0x00000096,0x00000084,0x0004003d,
>+	0x00000052,0x00000097,0x0000008b,0x000300f7,0x0000009a,0x00000000,0x000400fa,0x00000097,
>+	0x00000099,0x0000009d,0x000200f8,0x00000099,0x0004003d,0x00000006,0x0000009b,0x00000070,
>+	0x000500c4,0x00000028,0x0000009c,0x0000007c,0x0000009b,0x0003003e,0x00000098,0x0000009c,
>+	0x000200f9,0x0000009a,0x000200f8,0x0000009d,0x0003003e,0x00000098,0x00000063,0x000200f9,
>+	0x0000009a,0x000200f8,0x0000009a,0x0004003d,0x00000028,0x0000009e,0x00000098,0x0004007c,
>+	0x00000006,0x0000009f,0x0000009e,0x000500c5,0x00000006,0x000000a0,0x00000096,0x0000009f,
>+	0x0004007c,0x00000028,0x000000a1,0x000000a0,0x0003003e,0x00000095,0x000000a1,0x0004003d,
>+	0x00000028,0x000000a4,0x00000095,0x0004006f,0x00000011,0x000000a5,0x000000a4,0x00050085,
>+	0x00000011,0x000000a6,0x000000a3,0x000000a5,0x00050081,0x00000011,0x000000a8,0x000000a6,
>+	0x000000a7,0x0004003d,0x00000006,0x000000a9,0x00000074,0x00040070,0x00000011,0x000000aa,
>+	0x000000a9,0x00050088,0x00000011,0x000000ab,0x000000a8,0x000000aa,0x0003003e,0x000000a2,
>+	0x000000ab,0x0004003d,0x00000011,0x000000ac,0x000000a2,0x000200fe,0x000000ac,0x00010038,
>+	0x00050036,0x00000011,0x00000019,0x00000000,0x00000017,0x00030037,0x00000016,0x00000018,
>+	0x000200f8,0x0000001a,0x0004003d,0x00000011,0x000000af,0x00000018,0x000200fe,0x000000af,
>+	0x00010038,0x00050036,0x00000006,0x0000001e,0x00000000,0x0000001b,0x00030037,0x00000007,
>+	0x0000001c,0x00030037,0x00000016,0x0000001d,0x000200f8,0x0000001f,0x0004003b,0x00000007,
>+	0x000000b2,0x00000007,0x0004003d,0x00000011,0x000000b3,0x0000001d,0x0004007c,0x00000028,
>+	0x000000b4,0x000000b3,0x0004007c,0x00000006,0x000000b5,0x000000b4,0x0003003e,0x000000b2,
>+	0x000000b5,0x0004003d,0x00000006,0x000000b6,0x000000b2,0x000200fe,0x000000b6,0x00010038,
>+	0x00050036,0x00000002,0x00000022,0x00000000,0x00000020,0x00030037,0x00000007,0x00000021,
>+	0x000200f8,0x00000023,0x00050041,0x000000c0,0x000000c1,0x000000bf,0x00000093,0x0004003d,
>+	0x00000006,0x000000c2,0x000000c1,0x00050041,0x0000002a,0x000000c4,0x00000027,0x000000c3,
>+	0x0004003d,0x00000006,0x000000c5,0x000000c4,0x00050086,0x00000006,0x000000c6,0x000000c5,
>+	0x0000003c,0x00050080,0x00000006,0x000000c7,0x000000c2,0x000000c6,0x0004003d,0x00000006,
>+	0x000000c8,0x00000021,0x00060041,0x00000066,0x000000c9,0x000000bc,0x00000063,0x000000c7,
>+	0x0003003e,0x000000c9,0x000000c8,0x000100fd,0x00010038
>+};
>+
>+#if 0  // Generated from:
>+#version 450 core
>+
>+layout(local_size_x = 64, local_size_y = 1, local_size_z = 1)in;
>+
>+layout(set = 0, binding = 0)buffer dest
>+{
>+    uint destData[];
>+};
>+
>+layout(set = 0, binding = 1)buffer src
>+{
>+    uint srcData[];
>+};
>+
>+layout(push_constant)uniform PushConstants
>+{
>+
>+    uint outputCount;
>+
>+    uint componentCount;
>+
>+    uint srcOffset;
>+    uint destOffset;
>+
>+    uint Ns;
>+    uint Bs;
>+    uint Ss;
>+    uint Es;
>+
>+    uint Nd;
>+    uint Bd;
>+    uint Sd;
>+    uint Ed;
>+} params;
>+
>+uint getSourceComponentOffset(uint vertex, uint component)
>+{
>+    return vertex * params . Ss + component * params . Bs + params . srcOffset;
>+}
>+
>+uint getDestinationComponentOffset(uint vertex, uint component)
>+{
>+    return vertex * params . Sd + component * 4 + params . destOffset;
>+}
>+
>+uint getShiftBits(uint offset, uint B)
>+{
>+
>+    uint shift =(offset % 4)* 8;
>+
>+    return shift;
>+}
>+
>+      float loadSourceComponent(uint cd)
>+{
>+
>+    uint vertex = cd / params . Nd;
>+    uint component = cd % params . Nd;
>+
>+    if(component >= params . Ns)
>+    {
>+        return 0;
>+    }
>+
>+    uint offset = getSourceComponentOffset(vertex, component);
>+    uint block = srcData[offset / 4];
>+    uint shiftBits = getShiftBits(offset, params . Bs);
>+
>+    uint valueBits = params . Bs * 8;
>+    uint valueMask = valueBits == 32 ? - 1 :(1 << valueBits)- 1;
>+    uint valueAsUint =(block >> shiftBits)& valueMask;
>+
>+    bool isNegative =(valueAsUint &(1 <<(valueBits - 1)))!= 0;
>+    int valueAsInt = int(valueAsUint |(isNegative ? 0xFFFFFFFF << valueBits : 0));
>+          float value =(2 * float(valueAsInt)+ 1)/ valueMask;
>+
>+    return value;
>+}
>+
>+       float convertComponent(float srcValue)
>+{
>+
>+    return srcValue;
>+}
>+
>+uint makeDestinationComponent(uint cd, float value)
>+{
>+
>+    uint valueAsUint = floatBitsToInt(value);
>+
>+    return valueAsUint;
>+}
>+
>+void storeDestinationComponents(uint valueAsUint)
>+{
>+
>+    destData[gl_GlobalInvocationID . x + params . destOffset / 4]= valueAsUint;
>+}
>+
>+void main()
>+{
>+
>+    uint valueOut = 0;
>+    for(uint i = 0;i < 1;++ i)
>+    {
>+        uint cd = gl_GlobalInvocationID . x * 1 + i;
>+
>+              float srcValue = loadSourceComponent(cd);
>+               float destValue = convertComponent(srcValue);
>+        valueOut |= makeDestinationComponent(cd, destValue);
>+    }
>+
>+    storeDestinationComponents(valueOut);
>+}
>+#endif  // Preprocessed code
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.0000000A.inc b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.0000000A.inc
>new file mode 100644
>index 00000000000..b7025792f35
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.0000000A.inc
>@@ -0,0 +1,315 @@
>+	// 7.11.3188
>+	 #pragma once
>+const uint32_t kConvertVertex_comp_0000000A[] = {
>+	0x07230203,0x00010000,0x00080007,0x000000e6,0x00000000,0x00020011,0x00000001,0x0006000b,
>+	0x00000001,0x4c534c47,0x6474732e,0x3035342e,0x00000000,0x0003000e,0x00000000,0x00000001,
>+	0x0006000f,0x00000005,0x00000004,0x6e69616d,0x00000000,0x000000a5,0x00060010,0x00000004,
>+	0x00000011,0x00000040,0x00000001,0x00000001,0x00030003,0x00000002,0x000001c2,0x00040005,
>+	0x00000004,0x6e69616d,0x00000000,0x000a0005,0x0000000b,0x53746567,0x6372756f,0x6d6f4365,
>+	0x656e6f70,0x664f746e,0x74657366,0x3b317528,0x003b3175,0x00040005,0x00000009,0x74726576,
>+	0x00007865,0x00050005,0x0000000a,0x706d6f63,0x6e656e6f,0x00000074,0x00070005,0x0000000f,
>+	0x53746567,0x74666968,0x73746942,0x3b317528,0x003b3175,0x00040005,0x0000000d,0x7366666f,
>+	0x00007465,0x00030005,0x0000000e,0x00000042,0x00080005,0x00000014,0x64616f6c,0x72756f53,
>+	0x6f436563,0x6e6f706d,0x28746e65,0x003b3175,0x00030005,0x00000013,0x00006463,0x00080005,
>+	0x00000019,0x766e6f63,0x43747265,0x6f706d6f,0x746e656e,0x3b316628,0x00000000,0x00050005,
>+	0x00000018,0x56637273,0x65756c61,0x00000000,0x000a0005,0x0000001e,0x656b616d,0x74736544,
>+	0x74616e69,0x436e6f69,0x6f706d6f,0x746e656e,0x3b317528,0x003b3166,0x00030005,0x0000001c,
>+	0x00006463,0x00040005,0x0000001d,0x756c6176,0x00000065,0x000a0005,0x00000022,0x726f7473,
>+	0x73654465,0x616e6974,0x6e6f6974,0x706d6f43,0x6e656e6f,0x75287374,0x00003b31,0x00050005,
>+	0x00000021,0x756c6176,0x55734165,0x00746e69,0x00060005,0x00000025,0x68737550,0x736e6f43,
>+	0x746e6174,0x00000073,0x00060006,0x00000025,0x00000000,0x7074756f,0x6f437475,0x00746e75,
>+	0x00070006,0x00000025,0x00000001,0x706d6f63,0x6e656e6f,0x756f4374,0x0000746e,0x00060006,
>+	0x00000025,0x00000002,0x4f637273,0x65736666,0x00000074,0x00060006,0x00000025,0x00000003,
>+	0x74736564,0x7366664f,0x00007465,0x00040006,0x00000025,0x00000004,0x0000734e,0x00040006,
>+	0x00000025,0x00000005,0x00007342,0x00040006,0x00000025,0x00000006,0x00007353,0x00040006,
>+	0x00000025,0x00000007,0x00007345,0x00040006,0x00000025,0x00000008,0x0000644e,0x00040006,
>+	0x00000025,0x00000009,0x00006442,0x00040006,0x00000025,0x0000000a,0x00006453,0x00040006,
>+	0x00000025,0x0000000b,0x00006445,0x00040005,0x00000027,0x61726170,0x0000736d,0x00040005,
>+	0x0000003a,0x66696873,0x00000074,0x00040005,0x00000043,0x74726576,0x00007865,0x00050005,
>+	0x00000049,0x706d6f63,0x6e656e6f,0x00000074,0x00040005,0x00000058,0x7366666f,0x00007465,
>+	0x00040005,0x00000059,0x61726170,0x0000006d,0x00040005,0x0000005b,0x61726170,0x0000006d,
>+	0x00040005,0x0000005e,0x636f6c62,0x0000006b,0x00030005,0x00000060,0x00637273,0x00050006,
>+	0x00000060,0x00000000,0x44637273,0x00617461,0x00030005,0x00000062,0x00000000,0x00050005,
>+	0x00000069,0x66696873,0x74694274,0x00000073,0x00040005,0x0000006a,0x61726170,0x0000006d,
>+	0x00040005,0x0000006c,0x61726170,0x0000006d,0x00050005,0x00000070,0x756c6176,0x74694265,
>+	0x00000073,0x00050005,0x00000074,0x756c6176,0x73614d65,0x0000006b,0x00050005,0x00000084,
>+	0x756c6176,0x55734165,0x00746e69,0x00050005,0x0000008a,0x69736f70,0x65766974,0x0078614d,
>+	0x00040005,0x0000008d,0x756c6176,0x00000065,0x00050005,0x00000098,0x756c6176,0x55734165,
>+	0x00746e69,0x00040005,0x000000a0,0x74736564,0x00000000,0x00060006,0x000000a0,0x00000000,
>+	0x74736564,0x61746144,0x00000000,0x00030005,0x000000a2,0x00000000,0x00080005,0x000000a5,
>+	0x475f6c67,0x61626f6c,0x766e496c,0x7461636f,0x496e6f69,0x00000044,0x00050005,0x000000b9,
>+	0x756c6176,0x74754f65,0x00000000,0x00030005,0x000000ba,0x00000069,0x00030005,0x000000c3,
>+	0x00006463,0x00050005,0x000000d0,0x56637273,0x65756c61,0x00000000,0x00040005,0x000000d1,
>+	0x61726170,0x0000006d,0x00050005,0x000000d4,0x74736564,0x756c6156,0x00000065,0x00040005,
>+	0x000000d5,0x61726170,0x0000006d,0x00040005,0x000000d8,0x61726170,0x0000006d,0x00040005,
>+	0x000000da,0x61726170,0x0000006d,0x00040005,0x000000e1,0x61726170,0x0000006d,0x00050048,
>+	0x00000025,0x00000000,0x00000023,0x00000000,0x00050048,0x00000025,0x00000001,0x00000023,
>+	0x00000004,0x00050048,0x00000025,0x00000002,0x00000023,0x00000008,0x00050048,0x00000025,
>+	0x00000003,0x00000023,0x0000000c,0x00050048,0x00000025,0x00000004,0x00000023,0x00000010,
>+	0x00050048,0x00000025,0x00000005,0x00000023,0x00000014,0x00050048,0x00000025,0x00000006,
>+	0x00000023,0x00000018,0x00050048,0x00000025,0x00000007,0x00000023,0x0000001c,0x00050048,
>+	0x00000025,0x00000008,0x00000023,0x00000020,0x00050048,0x00000025,0x00000009,0x00000023,
>+	0x00000024,0x00050048,0x00000025,0x0000000a,0x00000023,0x00000028,0x00050048,0x00000025,
>+	0x0000000b,0x00000023,0x0000002c,0x00030047,0x00000025,0x00000002,0x00040047,0x0000005f,
>+	0x00000006,0x00000004,0x00050048,0x00000060,0x00000000,0x00000023,0x00000000,0x00030047,
>+	0x00000060,0x00000003,0x00040047,0x00000062,0x00000022,0x00000000,0x00040047,0x00000062,
>+	0x00000021,0x00000001,0x00040047,0x0000009f,0x00000006,0x00000004,0x00050048,0x000000a0,
>+	0x00000000,0x00000023,0x00000000,0x00030047,0x000000a0,0x00000003,0x00040047,0x000000a2,
>+	0x00000022,0x00000000,0x00040047,0x000000a2,0x00000021,0x00000000,0x00040047,0x000000a5,
>+	0x0000000b,0x0000001c,0x00040047,0x000000e5,0x0000000b,0x00000019,0x00020013,0x00000002,
>+	0x00030021,0x00000003,0x00000002,0x00040015,0x00000006,0x00000020,0x00000000,0x00040020,
>+	0x00000007,0x00000007,0x00000006,0x00050021,0x00000008,0x00000006,0x00000007,0x00000007,
>+	0x00030016,0x00000011,0x00000020,0x00040021,0x00000012,0x00000011,0x00000007,0x00040020,
>+	0x00000016,0x00000007,0x00000011,0x00040021,0x00000017,0x00000011,0x00000016,0x00050021,
>+	0x0000001b,0x00000006,0x00000007,0x00000016,0x00040021,0x00000020,0x00000002,0x00000007,
>+	0x000e001e,0x00000025,0x00000006,0x00000006,0x00000006,0x00000006,0x00000006,0x00000006,
>+	0x00000006,0x00000006,0x00000006,0x00000006,0x00000006,0x00000006,0x00040020,0x00000026,
>+	0x00000009,0x00000025,0x0004003b,0x00000026,0x00000027,0x00000009,0x00040015,0x00000028,
>+	0x00000020,0x00000001,0x0004002b,0x00000028,0x00000029,0x00000006,0x00040020,0x0000002a,
>+	0x00000009,0x00000006,0x0004002b,0x00000028,0x0000002f,0x00000005,0x0004002b,0x00000028,
>+	0x00000034,0x00000002,0x0004002b,0x00000006,0x0000003c,0x00000004,0x0004002b,0x00000006,
>+	0x0000003e,0x00000008,0x0004002b,0x00000028,0x00000045,0x00000008,0x0004002b,0x00000028,
>+	0x0000004f,0x00000004,0x00020014,0x00000052,0x0004002b,0x00000011,0x00000056,0x00000000,
>+	0x0003001d,0x0000005f,0x00000006,0x0003001e,0x00000060,0x0000005f,0x00040020,0x00000061,
>+	0x00000002,0x00000060,0x0004003b,0x00000061,0x00000062,0x00000002,0x0004002b,0x00000028,
>+	0x00000063,0x00000000,0x00040020,0x00000066,0x00000002,0x00000006,0x0004002b,0x00000006,
>+	0x00000076,0x00000020,0x00040020,0x00000078,0x00000007,0x00000028,0x0004002b,0x00000028,
>+	0x0000007c,0xffffffff,0x0004002b,0x00000028,0x0000007e,0x00000001,0x0003001d,0x0000009f,
>+	0x00000006,0x0003001e,0x000000a0,0x0000009f,0x00040020,0x000000a1,0x00000002,0x000000a0,
>+	0x0004003b,0x000000a1,0x000000a2,0x00000002,0x00040017,0x000000a3,0x00000006,0x00000003,
>+	0x00040020,0x000000a4,0x00000001,0x000000a3,0x0004003b,0x000000a4,0x000000a5,0x00000001,
>+	0x0004002b,0x00000006,0x000000a6,0x00000000,0x00040020,0x000000a7,0x00000001,0x00000006,
>+	0x0004002b,0x00000028,0x000000aa,0x00000003,0x0004002b,0x00000006,0x000000c1,0x00000001,
>+	0x0004002b,0x00000006,0x000000e4,0x00000040,0x0006002c,0x000000a3,0x000000e5,0x000000e4,
>+	0x000000c1,0x000000c1,0x00050036,0x00000002,0x00000004,0x00000000,0x00000003,0x000200f8,
>+	0x00000005,0x0004003b,0x00000007,0x000000b9,0x00000007,0x0004003b,0x00000007,0x000000ba,
>+	0x00000007,0x0004003b,0x00000007,0x000000c3,0x00000007,0x0004003b,0x00000016,0x000000d0,
>+	0x00000007,0x0004003b,0x00000007,0x000000d1,0x00000007,0x0004003b,0x00000016,0x000000d4,
>+	0x00000007,0x0004003b,0x00000016,0x000000d5,0x00000007,0x0004003b,0x00000007,0x000000d8,
>+	0x00000007,0x0004003b,0x00000016,0x000000da,0x00000007,0x0004003b,0x00000007,0x000000e1,
>+	0x00000007,0x00050041,0x000000a7,0x000000b1,0x000000a5,0x000000a6,0x0004003d,0x00000006,
>+	0x000000b2,0x000000b1,0x00050041,0x0000002a,0x000000b3,0x00000027,0x00000063,0x0004003d,
>+	0x00000006,0x000000b4,0x000000b3,0x000500ae,0x00000052,0x000000b5,0x000000b2,0x000000b4,
>+	0x000300f7,0x000000b7,0x00000000,0x000400fa,0x000000b5,0x000000b6,0x000000b7,0x000200f8,
>+	0x000000b6,0x000100fd,0x000200f8,0x000000b7,0x0003003e,0x000000b9,0x000000a6,0x0003003e,
>+	0x000000ba,0x000000a6,0x000200f9,0x000000bb,0x000200f8,0x000000bb,0x000400f6,0x000000bd,
>+	0x000000be,0x00000000,0x000200f9,0x000000bf,0x000200f8,0x000000bf,0x0004003d,0x00000006,
>+	0x000000c0,0x000000ba,0x000500b0,0x00000052,0x000000c2,0x000000c0,0x000000c1,0x000400fa,
>+	0x000000c2,0x000000bc,0x000000bd,0x000200f8,0x000000bc,0x00050041,0x000000a7,0x000000c4,
>+	0x000000a5,0x000000a6,0x0004003d,0x00000006,0x000000c5,0x000000c4,0x00050084,0x00000006,
>+	0x000000c6,0x000000c5,0x000000c1,0x0004003d,0x00000006,0x000000c7,0x000000ba,0x00050080,
>+	0x00000006,0x000000c8,0x000000c6,0x000000c7,0x0003003e,0x000000c3,0x000000c8,0x0004003d,
>+	0x00000006,0x000000c9,0x000000c3,0x00050041,0x0000002a,0x000000ca,0x00000027,0x0000007e,
>+	0x0004003d,0x00000006,0x000000cb,0x000000ca,0x000500ae,0x00000052,0x000000cc,0x000000c9,
>+	0x000000cb,0x000300f7,0x000000ce,0x00000000,0x000400fa,0x000000cc,0x000000cd,0x000000ce,
>+	0x000200f8,0x000000cd,0x000200f9,0x000000bd,0x000200f8,0x000000ce,0x0004003d,0x00000006,
>+	0x000000d2,0x000000c3,0x0003003e,0x000000d1,0x000000d2,0x00050039,0x00000011,0x000000d3,
>+	0x00000014,0x000000d1,0x0003003e,0x000000d0,0x000000d3,0x0004003d,0x00000011,0x000000d6,
>+	0x000000d0,0x0003003e,0x000000d5,0x000000d6,0x00050039,0x00000011,0x000000d7,0x00000019,
>+	0x000000d5,0x0003003e,0x000000d4,0x000000d7,0x0004003d,0x00000006,0x000000d9,0x000000c3,
>+	0x0003003e,0x000000d8,0x000000d9,0x0004003d,0x00000011,0x000000db,0x000000d4,0x0003003e,
>+	0x000000da,0x000000db,0x00060039,0x00000006,0x000000dc,0x0000001e,0x000000d8,0x000000da,
>+	0x0004003d,0x00000006,0x000000dd,0x000000b9,0x000500c5,0x00000006,0x000000de,0x000000dd,
>+	0x000000dc,0x0003003e,0x000000b9,0x000000de,0x000200f9,0x000000be,0x000200f8,0x000000be,
>+	0x0004003d,0x00000006,0x000000df,0x000000ba,0x00050080,0x00000006,0x000000e0,0x000000df,
>+	0x0000007e,0x0003003e,0x000000ba,0x000000e0,0x000200f9,0x000000bb,0x000200f8,0x000000bd,
>+	0x0004003d,0x00000006,0x000000e2,0x000000b9,0x0003003e,0x000000e1,0x000000e2,0x00050039,
>+	0x00000002,0x000000e3,0x00000022,0x000000e1,0x000100fd,0x00010038,0x00050036,0x00000006,
>+	0x0000000b,0x00000000,0x00000008,0x00030037,0x00000007,0x00000009,0x00030037,0x00000007,
>+	0x0000000a,0x000200f8,0x0000000c,0x0004003d,0x00000006,0x00000024,0x00000009,0x00050041,
>+	0x0000002a,0x0000002b,0x00000027,0x00000029,0x0004003d,0x00000006,0x0000002c,0x0000002b,
>+	0x00050084,0x00000006,0x0000002d,0x00000024,0x0000002c,0x0004003d,0x00000006,0x0000002e,
>+	0x0000000a,0x00050041,0x0000002a,0x00000030,0x00000027,0x0000002f,0x0004003d,0x00000006,
>+	0x00000031,0x00000030,0x00050084,0x00000006,0x00000032,0x0000002e,0x00000031,0x00050080,
>+	0x00000006,0x00000033,0x0000002d,0x00000032,0x00050041,0x0000002a,0x00000035,0x00000027,
>+	0x00000034,0x0004003d,0x00000006,0x00000036,0x00000035,0x00050080,0x00000006,0x00000037,
>+	0x00000033,0x00000036,0x000200fe,0x00000037,0x00010038,0x00050036,0x00000006,0x0000000f,
>+	0x00000000,0x00000008,0x00030037,0x00000007,0x0000000d,0x00030037,0x00000007,0x0000000e,
>+	0x000200f8,0x00000010,0x0004003b,0x00000007,0x0000003a,0x00000007,0x0004003d,0x00000006,
>+	0x0000003b,0x0000000d,0x00050089,0x00000006,0x0000003d,0x0000003b,0x0000003c,0x00050084,
>+	0x00000006,0x0000003f,0x0000003d,0x0000003e,0x0003003e,0x0000003a,0x0000003f,0x0004003d,
>+	0x00000006,0x00000040,0x0000003a,0x000200fe,0x00000040,0x00010038,0x00050036,0x00000011,
>+	0x00000014,0x00000000,0x00000012,0x00030037,0x00000007,0x00000013,0x000200f8,0x00000015,
>+	0x0004003b,0x00000007,0x00000043,0x00000007,0x0004003b,0x00000007,0x00000049,0x00000007,
>+	0x0004003b,0x00000007,0x00000058,0x00000007,0x0004003b,0x00000007,0x00000059,0x00000007,
>+	0x0004003b,0x00000007,0x0000005b,0x00000007,0x0004003b,0x00000007,0x0000005e,0x00000007,
>+	0x0004003b,0x00000007,0x00000069,0x00000007,0x0004003b,0x00000007,0x0000006a,0x00000007,
>+	0x0004003b,0x00000007,0x0000006c,0x00000007,0x0004003b,0x00000007,0x00000070,0x00000007,
>+	0x0004003b,0x00000007,0x00000074,0x00000007,0x0004003b,0x00000078,0x00000079,0x00000007,
>+	0x0004003b,0x00000007,0x00000084,0x00000007,0x0004003b,0x00000016,0x0000008a,0x00000007,
>+	0x0004003b,0x00000016,0x0000008d,0x00000007,0x0004003d,0x00000006,0x00000044,0x00000013,
>+	0x00050041,0x0000002a,0x00000046,0x00000027,0x00000045,0x0004003d,0x00000006,0x00000047,
>+	0x00000046,0x00050086,0x00000006,0x00000048,0x00000044,0x00000047,0x0003003e,0x00000043,
>+	0x00000048,0x0004003d,0x00000006,0x0000004a,0x00000013,0x00050041,0x0000002a,0x0000004b,
>+	0x00000027,0x00000045,0x0004003d,0x00000006,0x0000004c,0x0000004b,0x00050089,0x00000006,
>+	0x0000004d,0x0000004a,0x0000004c,0x0003003e,0x00000049,0x0000004d,0x0004003d,0x00000006,
>+	0x0000004e,0x00000049,0x00050041,0x0000002a,0x00000050,0x00000027,0x0000004f,0x0004003d,
>+	0x00000006,0x00000051,0x00000050,0x000500ae,0x00000052,0x00000053,0x0000004e,0x00000051,
>+	0x000300f7,0x00000055,0x00000000,0x000400fa,0x00000053,0x00000054,0x00000055,0x000200f8,
>+	0x00000054,0x000200fe,0x00000056,0x000200f8,0x00000055,0x0004003d,0x00000006,0x0000005a,
>+	0x00000043,0x0003003e,0x00000059,0x0000005a,0x0004003d,0x00000006,0x0000005c,0x00000049,
>+	0x0003003e,0x0000005b,0x0000005c,0x00060039,0x00000006,0x0000005d,0x0000000b,0x00000059,
>+	0x0000005b,0x0003003e,0x00000058,0x0000005d,0x0004003d,0x00000006,0x00000064,0x00000058,
>+	0x00050086,0x00000006,0x00000065,0x00000064,0x0000003c,0x00060041,0x00000066,0x00000067,
>+	0x00000062,0x00000063,0x00000065,0x0004003d,0x00000006,0x00000068,0x00000067,0x0003003e,
>+	0x0000005e,0x00000068,0x0004003d,0x00000006,0x0000006b,0x00000058,0x0003003e,0x0000006a,
>+	0x0000006b,0x00050041,0x0000002a,0x0000006d,0x00000027,0x0000002f,0x0004003d,0x00000006,
>+	0x0000006e,0x0000006d,0x0003003e,0x0000006c,0x0000006e,0x00060039,0x00000006,0x0000006f,
>+	0x0000000f,0x0000006a,0x0000006c,0x0003003e,0x00000069,0x0000006f,0x00050041,0x0000002a,
>+	0x00000071,0x00000027,0x0000002f,0x0004003d,0x00000006,0x00000072,0x00000071,0x00050084,
>+	0x00000006,0x00000073,0x00000072,0x0000003e,0x0003003e,0x00000070,0x00000073,0x0004003d,
>+	0x00000006,0x00000075,0x00000070,0x000500aa,0x00000052,0x00000077,0x00000075,0x00000076,
>+	0x000300f7,0x0000007b,0x00000000,0x000400fa,0x00000077,0x0000007a,0x0000007d,0x000200f8,
>+	0x0000007a,0x0003003e,0x00000079,0x0000007c,0x000200f9,0x0000007b,0x000200f8,0x0000007d,
>+	0x0004003d,0x00000006,0x0000007f,0x00000070,0x000500c4,0x00000028,0x00000080,0x0000007e,
>+	0x0000007f,0x00050082,0x00000028,0x00000081,0x00000080,0x0000007e,0x0003003e,0x00000079,
>+	0x00000081,0x000200f9,0x0000007b,0x000200f8,0x0000007b,0x0004003d,0x00000028,0x00000082,
>+	0x00000079,0x0004007c,0x00000006,0x00000083,0x00000082,0x0003003e,0x00000074,0x00000083,
>+	0x0004003d,0x00000006,0x00000085,0x0000005e,0x0004003d,0x00000006,0x00000086,0x00000069,
>+	0x000500c2,0x00000006,0x00000087,0x00000085,0x00000086,0x0004003d,0x00000006,0x00000088,
>+	0x00000074,0x000500c7,0x00000006,0x00000089,0x00000087,0x00000088,0x0003003e,0x00000084,
>+	0x00000089,0x0004003d,0x00000006,0x0000008b,0x00000074,0x00040070,0x00000011,0x0000008c,
>+	0x0000008b,0x0003003e,0x0000008a,0x0000008c,0x0004003d,0x00000006,0x0000008e,0x00000084,
>+	0x00040070,0x00000011,0x0000008f,0x0000008e,0x0004003d,0x00000011,0x00000090,0x0000008a,
>+	0x00050088,0x00000011,0x00000091,0x0000008f,0x00000090,0x0003003e,0x0000008d,0x00000091,
>+	0x0004003d,0x00000011,0x00000092,0x0000008d,0x000200fe,0x00000092,0x00010038,0x00050036,
>+	0x00000011,0x00000019,0x00000000,0x00000017,0x00030037,0x00000016,0x00000018,0x000200f8,
>+	0x0000001a,0x0004003d,0x00000011,0x00000095,0x00000018,0x000200fe,0x00000095,0x00010038,
>+	0x00050036,0x00000006,0x0000001e,0x00000000,0x0000001b,0x00030037,0x00000007,0x0000001c,
>+	0x00030037,0x00000016,0x0000001d,0x000200f8,0x0000001f,0x0004003b,0x00000007,0x00000098,
>+	0x00000007,0x0004003d,0x00000011,0x00000099,0x0000001d,0x0004007c,0x00000028,0x0000009a,
>+	0x00000099,0x0004007c,0x00000006,0x0000009b,0x0000009a,0x0003003e,0x00000098,0x0000009b,
>+	0x0004003d,0x00000006,0x0000009c,0x00000098,0x000200fe,0x0000009c,0x00010038,0x00050036,
>+	0x00000002,0x00000022,0x00000000,0x00000020,0x00030037,0x00000007,0x00000021,0x000200f8,
>+	0x00000023,0x00050041,0x000000a7,0x000000a8,0x000000a5,0x000000a6,0x0004003d,0x00000006,
>+	0x000000a9,0x000000a8,0x00050041,0x0000002a,0x000000ab,0x00000027,0x000000aa,0x0004003d,
>+	0x00000006,0x000000ac,0x000000ab,0x00050086,0x00000006,0x000000ad,0x000000ac,0x0000003c,
>+	0x00050080,0x00000006,0x000000ae,0x000000a9,0x000000ad,0x0004003d,0x00000006,0x000000af,
>+	0x00000021,0x00060041,0x00000066,0x000000b0,0x000000a2,0x00000063,0x000000ae,0x0003003e,
>+	0x000000b0,0x000000af,0x000100fd,0x00010038
>+};
>+
>+#if 0  // Generated from:
>+#version 450 core
>+
>+layout(local_size_x = 64, local_size_y = 1, local_size_z = 1)in;
>+
>+layout(set = 0, binding = 0)buffer dest
>+{
>+    uint destData[];
>+};
>+
>+layout(set = 0, binding = 1)buffer src
>+{
>+    uint srcData[];
>+};
>+
>+layout(push_constant)uniform PushConstants
>+{
>+
>+    uint outputCount;
>+
>+    uint componentCount;
>+
>+    uint srcOffset;
>+    uint destOffset;
>+
>+    uint Ns;
>+    uint Bs;
>+    uint Ss;
>+    uint Es;
>+
>+    uint Nd;
>+    uint Bd;
>+    uint Sd;
>+    uint Ed;
>+} params;
>+
>+uint getSourceComponentOffset(uint vertex, uint component)
>+{
>+    return vertex * params . Ss + component * params . Bs + params . srcOffset;
>+}
>+
>+uint getDestinationComponentOffset(uint vertex, uint component)
>+{
>+    return vertex * params . Sd + component * 4 + params . destOffset;
>+}
>+
>+uint getShiftBits(uint offset, uint B)
>+{
>+
>+    uint shift =(offset % 4)* 8;
>+
>+    return shift;
>+}
>+
>+      float loadSourceComponent(uint cd)
>+{
>+
>+    uint vertex = cd / params . Nd;
>+    uint component = cd % params . Nd;
>+
>+    if(component >= params . Ns)
>+    {
>+        return 0;
>+    }
>+
>+    uint offset = getSourceComponentOffset(vertex, component);
>+    uint block = srcData[offset / 4];
>+    uint shiftBits = getShiftBits(offset, params . Bs);
>+
>+    uint valueBits = params . Bs * 8;
>+    uint valueMask = valueBits == 32 ? - 1 :(1 << valueBits)- 1;
>+    uint valueAsUint =(block >> shiftBits)& valueMask;
>+
>+    float positiveMax = valueMask;
>+
>+          float value = valueAsUint / positiveMax;
>+
>+    return value;
>+}
>+
>+       float convertComponent(float srcValue)
>+{
>+
>+    return srcValue;
>+}
>+
>+uint makeDestinationComponent(uint cd, float value)
>+{
>+
>+    uint valueAsUint = floatBitsToInt(value);
>+
>+    return valueAsUint;
>+}
>+
>+void storeDestinationComponents(uint valueAsUint)
>+{
>+
>+    destData[gl_GlobalInvocationID . x + params . destOffset / 4]= valueAsUint;
>+}
>+
>+void main()
>+{
>+
>+    if(gl_GlobalInvocationID . x >= params . outputCount)
>+        return;
>+
>+    uint valueOut = 0;
>+    for(uint i = 0;i < 1;++ i)
>+    {
>+        uint cd = gl_GlobalInvocationID . x * 1 + i;
>+
>+        if(cd >= params . componentCount)
>+        {
>+            break;
>+        }
>+
>+              float srcValue = loadSourceComponent(cd);
>+               float destValue = convertComponent(srcValue);
>+        valueOut |= makeDestinationComponent(cd, destValue);
>+    }
>+
>+    storeDestinationComponents(valueOut);
>+}
>+#endif  // Preprocessed code
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.0000000B.inc b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.0000000B.inc
>new file mode 100644
>index 00000000000..7ec92b1e428
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.0000000B.inc
>@@ -0,0 +1,299 @@
>+	// 7.11.3188
>+	 #pragma once
>+const uint32_t kConvertVertex_comp_0000000B[] = {
>+	0x07230203,0x00010000,0x00080007,0x000000d7,0x00000000,0x00020011,0x00000001,0x0006000b,
>+	0x00000001,0x4c534c47,0x6474732e,0x3035342e,0x00000000,0x0003000e,0x00000000,0x00000001,
>+	0x0006000f,0x00000005,0x00000004,0x6e69616d,0x00000000,0x000000a5,0x00060010,0x00000004,
>+	0x00000011,0x00000040,0x00000001,0x00000001,0x00030003,0x00000002,0x000001c2,0x00040005,
>+	0x00000004,0x6e69616d,0x00000000,0x000a0005,0x0000000b,0x53746567,0x6372756f,0x6d6f4365,
>+	0x656e6f70,0x664f746e,0x74657366,0x3b317528,0x003b3175,0x00040005,0x00000009,0x74726576,
>+	0x00007865,0x00050005,0x0000000a,0x706d6f63,0x6e656e6f,0x00000074,0x00070005,0x0000000f,
>+	0x53746567,0x74666968,0x73746942,0x3b317528,0x003b3175,0x00040005,0x0000000d,0x7366666f,
>+	0x00007465,0x00030005,0x0000000e,0x00000042,0x00080005,0x00000014,0x64616f6c,0x72756f53,
>+	0x6f436563,0x6e6f706d,0x28746e65,0x003b3175,0x00030005,0x00000013,0x00006463,0x00080005,
>+	0x00000019,0x766e6f63,0x43747265,0x6f706d6f,0x746e656e,0x3b316628,0x00000000,0x00050005,
>+	0x00000018,0x56637273,0x65756c61,0x00000000,0x000a0005,0x0000001e,0x656b616d,0x74736544,
>+	0x74616e69,0x436e6f69,0x6f706d6f,0x746e656e,0x3b317528,0x003b3166,0x00030005,0x0000001c,
>+	0x00006463,0x00040005,0x0000001d,0x756c6176,0x00000065,0x000a0005,0x00000022,0x726f7473,
>+	0x73654465,0x616e6974,0x6e6f6974,0x706d6f43,0x6e656e6f,0x75287374,0x00003b31,0x00050005,
>+	0x00000021,0x756c6176,0x55734165,0x00746e69,0x00060005,0x00000025,0x68737550,0x736e6f43,
>+	0x746e6174,0x00000073,0x00060006,0x00000025,0x00000000,0x7074756f,0x6f437475,0x00746e75,
>+	0x00070006,0x00000025,0x00000001,0x706d6f63,0x6e656e6f,0x756f4374,0x0000746e,0x00060006,
>+	0x00000025,0x00000002,0x4f637273,0x65736666,0x00000074,0x00060006,0x00000025,0x00000003,
>+	0x74736564,0x7366664f,0x00007465,0x00040006,0x00000025,0x00000004,0x0000734e,0x00040006,
>+	0x00000025,0x00000005,0x00007342,0x00040006,0x00000025,0x00000006,0x00007353,0x00040006,
>+	0x00000025,0x00000007,0x00007345,0x00040006,0x00000025,0x00000008,0x0000644e,0x00040006,
>+	0x00000025,0x00000009,0x00006442,0x00040006,0x00000025,0x0000000a,0x00006453,0x00040006,
>+	0x00000025,0x0000000b,0x00006445,0x00040005,0x00000027,0x61726170,0x0000736d,0x00040005,
>+	0x0000003a,0x66696873,0x00000074,0x00040005,0x00000043,0x74726576,0x00007865,0x00050005,
>+	0x00000049,0x706d6f63,0x6e656e6f,0x00000074,0x00040005,0x00000058,0x7366666f,0x00007465,
>+	0x00040005,0x00000059,0x61726170,0x0000006d,0x00040005,0x0000005b,0x61726170,0x0000006d,
>+	0x00040005,0x0000005e,0x636f6c62,0x0000006b,0x00030005,0x00000060,0x00637273,0x00050006,
>+	0x00000060,0x00000000,0x44637273,0x00617461,0x00030005,0x00000062,0x00000000,0x00050005,
>+	0x00000069,0x66696873,0x74694274,0x00000073,0x00040005,0x0000006a,0x61726170,0x0000006d,
>+	0x00040005,0x0000006c,0x61726170,0x0000006d,0x00050005,0x00000070,0x756c6176,0x74694265,
>+	0x00000073,0x00050005,0x00000074,0x756c6176,0x73614d65,0x0000006b,0x00050005,0x00000084,
>+	0x756c6176,0x55734165,0x00746e69,0x00050005,0x0000008a,0x69736f70,0x65766974,0x0078614d,
>+	0x00040005,0x0000008d,0x756c6176,0x00000065,0x00050005,0x00000098,0x756c6176,0x55734165,
>+	0x00746e69,0x00040005,0x000000a0,0x74736564,0x00000000,0x00060006,0x000000a0,0x00000000,
>+	0x74736564,0x61746144,0x00000000,0x00030005,0x000000a2,0x00000000,0x00080005,0x000000a5,
>+	0x475f6c67,0x61626f6c,0x766e496c,0x7461636f,0x496e6f69,0x00000044,0x00050005,0x000000b1,
>+	0x756c6176,0x74754f65,0x00000000,0x00030005,0x000000b2,0x00000069,0x00030005,0x000000bb,
>+	0x00006463,0x00050005,0x000000c1,0x56637273,0x65756c61,0x00000000,0x00040005,0x000000c2,
>+	0x61726170,0x0000006d,0x00050005,0x000000c5,0x74736564,0x756c6156,0x00000065,0x00040005,
>+	0x000000c6,0x61726170,0x0000006d,0x00040005,0x000000c9,0x61726170,0x0000006d,0x00040005,
>+	0x000000cb,0x61726170,0x0000006d,0x00040005,0x000000d2,0x61726170,0x0000006d,0x00050048,
>+	0x00000025,0x00000000,0x00000023,0x00000000,0x00050048,0x00000025,0x00000001,0x00000023,
>+	0x00000004,0x00050048,0x00000025,0x00000002,0x00000023,0x00000008,0x00050048,0x00000025,
>+	0x00000003,0x00000023,0x0000000c,0x00050048,0x00000025,0x00000004,0x00000023,0x00000010,
>+	0x00050048,0x00000025,0x00000005,0x00000023,0x00000014,0x00050048,0x00000025,0x00000006,
>+	0x00000023,0x00000018,0x00050048,0x00000025,0x00000007,0x00000023,0x0000001c,0x00050048,
>+	0x00000025,0x00000008,0x00000023,0x00000020,0x00050048,0x00000025,0x00000009,0x00000023,
>+	0x00000024,0x00050048,0x00000025,0x0000000a,0x00000023,0x00000028,0x00050048,0x00000025,
>+	0x0000000b,0x00000023,0x0000002c,0x00030047,0x00000025,0x00000002,0x00040047,0x0000005f,
>+	0x00000006,0x00000004,0x00050048,0x00000060,0x00000000,0x00000023,0x00000000,0x00030047,
>+	0x00000060,0x00000003,0x00040047,0x00000062,0x00000022,0x00000000,0x00040047,0x00000062,
>+	0x00000021,0x00000001,0x00040047,0x0000009f,0x00000006,0x00000004,0x00050048,0x000000a0,
>+	0x00000000,0x00000023,0x00000000,0x00030047,0x000000a0,0x00000003,0x00040047,0x000000a2,
>+	0x00000022,0x00000000,0x00040047,0x000000a2,0x00000021,0x00000000,0x00040047,0x000000a5,
>+	0x0000000b,0x0000001c,0x00040047,0x000000d6,0x0000000b,0x00000019,0x00020013,0x00000002,
>+	0x00030021,0x00000003,0x00000002,0x00040015,0x00000006,0x00000020,0x00000000,0x00040020,
>+	0x00000007,0x00000007,0x00000006,0x00050021,0x00000008,0x00000006,0x00000007,0x00000007,
>+	0x00030016,0x00000011,0x00000020,0x00040021,0x00000012,0x00000011,0x00000007,0x00040020,
>+	0x00000016,0x00000007,0x00000011,0x00040021,0x00000017,0x00000011,0x00000016,0x00050021,
>+	0x0000001b,0x00000006,0x00000007,0x00000016,0x00040021,0x00000020,0x00000002,0x00000007,
>+	0x000e001e,0x00000025,0x00000006,0x00000006,0x00000006,0x00000006,0x00000006,0x00000006,
>+	0x00000006,0x00000006,0x00000006,0x00000006,0x00000006,0x00000006,0x00040020,0x00000026,
>+	0x00000009,0x00000025,0x0004003b,0x00000026,0x00000027,0x00000009,0x00040015,0x00000028,
>+	0x00000020,0x00000001,0x0004002b,0x00000028,0x00000029,0x00000006,0x00040020,0x0000002a,
>+	0x00000009,0x00000006,0x0004002b,0x00000028,0x0000002f,0x00000005,0x0004002b,0x00000028,
>+	0x00000034,0x00000002,0x0004002b,0x00000006,0x0000003c,0x00000004,0x0004002b,0x00000006,
>+	0x0000003e,0x00000008,0x0004002b,0x00000028,0x00000045,0x00000008,0x0004002b,0x00000028,
>+	0x0000004f,0x00000004,0x00020014,0x00000052,0x0004002b,0x00000011,0x00000056,0x00000000,
>+	0x0003001d,0x0000005f,0x00000006,0x0003001e,0x00000060,0x0000005f,0x00040020,0x00000061,
>+	0x00000002,0x00000060,0x0004003b,0x00000061,0x00000062,0x00000002,0x0004002b,0x00000028,
>+	0x00000063,0x00000000,0x00040020,0x00000066,0x00000002,0x00000006,0x0004002b,0x00000006,
>+	0x00000076,0x00000020,0x00040020,0x00000078,0x00000007,0x00000028,0x0004002b,0x00000028,
>+	0x0000007c,0xffffffff,0x0004002b,0x00000028,0x0000007e,0x00000001,0x0003001d,0x0000009f,
>+	0x00000006,0x0003001e,0x000000a0,0x0000009f,0x00040020,0x000000a1,0x00000002,0x000000a0,
>+	0x0004003b,0x000000a1,0x000000a2,0x00000002,0x00040017,0x000000a3,0x00000006,0x00000003,
>+	0x00040020,0x000000a4,0x00000001,0x000000a3,0x0004003b,0x000000a4,0x000000a5,0x00000001,
>+	0x0004002b,0x00000006,0x000000a6,0x00000000,0x00040020,0x000000a7,0x00000001,0x00000006,
>+	0x0004002b,0x00000028,0x000000aa,0x00000003,0x0004002b,0x00000006,0x000000b9,0x00000001,
>+	0x0004002b,0x00000006,0x000000d5,0x00000040,0x0006002c,0x000000a3,0x000000d6,0x000000d5,
>+	0x000000b9,0x000000b9,0x00050036,0x00000002,0x00000004,0x00000000,0x00000003,0x000200f8,
>+	0x00000005,0x0004003b,0x00000007,0x000000b1,0x00000007,0x0004003b,0x00000007,0x000000b2,
>+	0x00000007,0x0004003b,0x00000007,0x000000bb,0x00000007,0x0004003b,0x00000016,0x000000c1,
>+	0x00000007,0x0004003b,0x00000007,0x000000c2,0x00000007,0x0004003b,0x00000016,0x000000c5,
>+	0x00000007,0x0004003b,0x00000016,0x000000c6,0x00000007,0x0004003b,0x00000007,0x000000c9,
>+	0x00000007,0x0004003b,0x00000016,0x000000cb,0x00000007,0x0004003b,0x00000007,0x000000d2,
>+	0x00000007,0x0003003e,0x000000b1,0x000000a6,0x0003003e,0x000000b2,0x000000a6,0x000200f9,
>+	0x000000b3,0x000200f8,0x000000b3,0x000400f6,0x000000b5,0x000000b6,0x00000000,0x000200f9,
>+	0x000000b7,0x000200f8,0x000000b7,0x0004003d,0x00000006,0x000000b8,0x000000b2,0x000500b0,
>+	0x00000052,0x000000ba,0x000000b8,0x000000b9,0x000400fa,0x000000ba,0x000000b4,0x000000b5,
>+	0x000200f8,0x000000b4,0x00050041,0x000000a7,0x000000bc,0x000000a5,0x000000a6,0x0004003d,
>+	0x00000006,0x000000bd,0x000000bc,0x00050084,0x00000006,0x000000be,0x000000bd,0x000000b9,
>+	0x0004003d,0x00000006,0x000000bf,0x000000b2,0x00050080,0x00000006,0x000000c0,0x000000be,
>+	0x000000bf,0x0003003e,0x000000bb,0x000000c0,0x0004003d,0x00000006,0x000000c3,0x000000bb,
>+	0x0003003e,0x000000c2,0x000000c3,0x00050039,0x00000011,0x000000c4,0x00000014,0x000000c2,
>+	0x0003003e,0x000000c1,0x000000c4,0x0004003d,0x00000011,0x000000c7,0x000000c1,0x0003003e,
>+	0x000000c6,0x000000c7,0x00050039,0x00000011,0x000000c8,0x00000019,0x000000c6,0x0003003e,
>+	0x000000c5,0x000000c8,0x0004003d,0x00000006,0x000000ca,0x000000bb,0x0003003e,0x000000c9,
>+	0x000000ca,0x0004003d,0x00000011,0x000000cc,0x000000c5,0x0003003e,0x000000cb,0x000000cc,
>+	0x00060039,0x00000006,0x000000cd,0x0000001e,0x000000c9,0x000000cb,0x0004003d,0x00000006,
>+	0x000000ce,0x000000b1,0x000500c5,0x00000006,0x000000cf,0x000000ce,0x000000cd,0x0003003e,
>+	0x000000b1,0x000000cf,0x000200f9,0x000000b6,0x000200f8,0x000000b6,0x0004003d,0x00000006,
>+	0x000000d0,0x000000b2,0x00050080,0x00000006,0x000000d1,0x000000d0,0x0000007e,0x0003003e,
>+	0x000000b2,0x000000d1,0x000200f9,0x000000b3,0x000200f8,0x000000b5,0x0004003d,0x00000006,
>+	0x000000d3,0x000000b1,0x0003003e,0x000000d2,0x000000d3,0x00050039,0x00000002,0x000000d4,
>+	0x00000022,0x000000d2,0x000100fd,0x00010038,0x00050036,0x00000006,0x0000000b,0x00000000,
>+	0x00000008,0x00030037,0x00000007,0x00000009,0x00030037,0x00000007,0x0000000a,0x000200f8,
>+	0x0000000c,0x0004003d,0x00000006,0x00000024,0x00000009,0x00050041,0x0000002a,0x0000002b,
>+	0x00000027,0x00000029,0x0004003d,0x00000006,0x0000002c,0x0000002b,0x00050084,0x00000006,
>+	0x0000002d,0x00000024,0x0000002c,0x0004003d,0x00000006,0x0000002e,0x0000000a,0x00050041,
>+	0x0000002a,0x00000030,0x00000027,0x0000002f,0x0004003d,0x00000006,0x00000031,0x00000030,
>+	0x00050084,0x00000006,0x00000032,0x0000002e,0x00000031,0x00050080,0x00000006,0x00000033,
>+	0x0000002d,0x00000032,0x00050041,0x0000002a,0x00000035,0x00000027,0x00000034,0x0004003d,
>+	0x00000006,0x00000036,0x00000035,0x00050080,0x00000006,0x00000037,0x00000033,0x00000036,
>+	0x000200fe,0x00000037,0x00010038,0x00050036,0x00000006,0x0000000f,0x00000000,0x00000008,
>+	0x00030037,0x00000007,0x0000000d,0x00030037,0x00000007,0x0000000e,0x000200f8,0x00000010,
>+	0x0004003b,0x00000007,0x0000003a,0x00000007,0x0004003d,0x00000006,0x0000003b,0x0000000d,
>+	0x00050089,0x00000006,0x0000003d,0x0000003b,0x0000003c,0x00050084,0x00000006,0x0000003f,
>+	0x0000003d,0x0000003e,0x0003003e,0x0000003a,0x0000003f,0x0004003d,0x00000006,0x00000040,
>+	0x0000003a,0x000200fe,0x00000040,0x00010038,0x00050036,0x00000011,0x00000014,0x00000000,
>+	0x00000012,0x00030037,0x00000007,0x00000013,0x000200f8,0x00000015,0x0004003b,0x00000007,
>+	0x00000043,0x00000007,0x0004003b,0x00000007,0x00000049,0x00000007,0x0004003b,0x00000007,
>+	0x00000058,0x00000007,0x0004003b,0x00000007,0x00000059,0x00000007,0x0004003b,0x00000007,
>+	0x0000005b,0x00000007,0x0004003b,0x00000007,0x0000005e,0x00000007,0x0004003b,0x00000007,
>+	0x00000069,0x00000007,0x0004003b,0x00000007,0x0000006a,0x00000007,0x0004003b,0x00000007,
>+	0x0000006c,0x00000007,0x0004003b,0x00000007,0x00000070,0x00000007,0x0004003b,0x00000007,
>+	0x00000074,0x00000007,0x0004003b,0x00000078,0x00000079,0x00000007,0x0004003b,0x00000007,
>+	0x00000084,0x00000007,0x0004003b,0x00000016,0x0000008a,0x00000007,0x0004003b,0x00000016,
>+	0x0000008d,0x00000007,0x0004003d,0x00000006,0x00000044,0x00000013,0x00050041,0x0000002a,
>+	0x00000046,0x00000027,0x00000045,0x0004003d,0x00000006,0x00000047,0x00000046,0x00050086,
>+	0x00000006,0x00000048,0x00000044,0x00000047,0x0003003e,0x00000043,0x00000048,0x0004003d,
>+	0x00000006,0x0000004a,0x00000013,0x00050041,0x0000002a,0x0000004b,0x00000027,0x00000045,
>+	0x0004003d,0x00000006,0x0000004c,0x0000004b,0x00050089,0x00000006,0x0000004d,0x0000004a,
>+	0x0000004c,0x0003003e,0x00000049,0x0000004d,0x0004003d,0x00000006,0x0000004e,0x00000049,
>+	0x00050041,0x0000002a,0x00000050,0x00000027,0x0000004f,0x0004003d,0x00000006,0x00000051,
>+	0x00000050,0x000500ae,0x00000052,0x00000053,0x0000004e,0x00000051,0x000300f7,0x00000055,
>+	0x00000000,0x000400fa,0x00000053,0x00000054,0x00000055,0x000200f8,0x00000054,0x000200fe,
>+	0x00000056,0x000200f8,0x00000055,0x0004003d,0x00000006,0x0000005a,0x00000043,0x0003003e,
>+	0x00000059,0x0000005a,0x0004003d,0x00000006,0x0000005c,0x00000049,0x0003003e,0x0000005b,
>+	0x0000005c,0x00060039,0x00000006,0x0000005d,0x0000000b,0x00000059,0x0000005b,0x0003003e,
>+	0x00000058,0x0000005d,0x0004003d,0x00000006,0x00000064,0x00000058,0x00050086,0x00000006,
>+	0x00000065,0x00000064,0x0000003c,0x00060041,0x00000066,0x00000067,0x00000062,0x00000063,
>+	0x00000065,0x0004003d,0x00000006,0x00000068,0x00000067,0x0003003e,0x0000005e,0x00000068,
>+	0x0004003d,0x00000006,0x0000006b,0x00000058,0x0003003e,0x0000006a,0x0000006b,0x00050041,
>+	0x0000002a,0x0000006d,0x00000027,0x0000002f,0x0004003d,0x00000006,0x0000006e,0x0000006d,
>+	0x0003003e,0x0000006c,0x0000006e,0x00060039,0x00000006,0x0000006f,0x0000000f,0x0000006a,
>+	0x0000006c,0x0003003e,0x00000069,0x0000006f,0x00050041,0x0000002a,0x00000071,0x00000027,
>+	0x0000002f,0x0004003d,0x00000006,0x00000072,0x00000071,0x00050084,0x00000006,0x00000073,
>+	0x00000072,0x0000003e,0x0003003e,0x00000070,0x00000073,0x0004003d,0x00000006,0x00000075,
>+	0x00000070,0x000500aa,0x00000052,0x00000077,0x00000075,0x00000076,0x000300f7,0x0000007b,
>+	0x00000000,0x000400fa,0x00000077,0x0000007a,0x0000007d,0x000200f8,0x0000007a,0x0003003e,
>+	0x00000079,0x0000007c,0x000200f9,0x0000007b,0x000200f8,0x0000007d,0x0004003d,0x00000006,
>+	0x0000007f,0x00000070,0x000500c4,0x00000028,0x00000080,0x0000007e,0x0000007f,0x00050082,
>+	0x00000028,0x00000081,0x00000080,0x0000007e,0x0003003e,0x00000079,0x00000081,0x000200f9,
>+	0x0000007b,0x000200f8,0x0000007b,0x0004003d,0x00000028,0x00000082,0x00000079,0x0004007c,
>+	0x00000006,0x00000083,0x00000082,0x0003003e,0x00000074,0x00000083,0x0004003d,0x00000006,
>+	0x00000085,0x0000005e,0x0004003d,0x00000006,0x00000086,0x00000069,0x000500c2,0x00000006,
>+	0x00000087,0x00000085,0x00000086,0x0004003d,0x00000006,0x00000088,0x00000074,0x000500c7,
>+	0x00000006,0x00000089,0x00000087,0x00000088,0x0003003e,0x00000084,0x00000089,0x0004003d,
>+	0x00000006,0x0000008b,0x00000074,0x00040070,0x00000011,0x0000008c,0x0000008b,0x0003003e,
>+	0x0000008a,0x0000008c,0x0004003d,0x00000006,0x0000008e,0x00000084,0x00040070,0x00000011,
>+	0x0000008f,0x0000008e,0x0004003d,0x00000011,0x00000090,0x0000008a,0x00050088,0x00000011,
>+	0x00000091,0x0000008f,0x00000090,0x0003003e,0x0000008d,0x00000091,0x0004003d,0x00000011,
>+	0x00000092,0x0000008d,0x000200fe,0x00000092,0x00010038,0x00050036,0x00000011,0x00000019,
>+	0x00000000,0x00000017,0x00030037,0x00000016,0x00000018,0x000200f8,0x0000001a,0x0004003d,
>+	0x00000011,0x00000095,0x00000018,0x000200fe,0x00000095,0x00010038,0x00050036,0x00000006,
>+	0x0000001e,0x00000000,0x0000001b,0x00030037,0x00000007,0x0000001c,0x00030037,0x00000016,
>+	0x0000001d,0x000200f8,0x0000001f,0x0004003b,0x00000007,0x00000098,0x00000007,0x0004003d,
>+	0x00000011,0x00000099,0x0000001d,0x0004007c,0x00000028,0x0000009a,0x00000099,0x0004007c,
>+	0x00000006,0x0000009b,0x0000009a,0x0003003e,0x00000098,0x0000009b,0x0004003d,0x00000006,
>+	0x0000009c,0x00000098,0x000200fe,0x0000009c,0x00010038,0x00050036,0x00000002,0x00000022,
>+	0x00000000,0x00000020,0x00030037,0x00000007,0x00000021,0x000200f8,0x00000023,0x00050041,
>+	0x000000a7,0x000000a8,0x000000a5,0x000000a6,0x0004003d,0x00000006,0x000000a9,0x000000a8,
>+	0x00050041,0x0000002a,0x000000ab,0x00000027,0x000000aa,0x0004003d,0x00000006,0x000000ac,
>+	0x000000ab,0x00050086,0x00000006,0x000000ad,0x000000ac,0x0000003c,0x00050080,0x00000006,
>+	0x000000ae,0x000000a9,0x000000ad,0x0004003d,0x00000006,0x000000af,0x00000021,0x00060041,
>+	0x00000066,0x000000b0,0x000000a2,0x00000063,0x000000ae,0x0003003e,0x000000b0,0x000000af,
>+	0x000100fd,0x00010038
>+};
>+
>+#if 0  // Generated from:
>+#version 450 core
>+
>+layout(local_size_x = 64, local_size_y = 1, local_size_z = 1)in;
>+
>+layout(set = 0, binding = 0)buffer dest
>+{
>+    uint destData[];
>+};
>+
>+layout(set = 0, binding = 1)buffer src
>+{
>+    uint srcData[];
>+};
>+
>+layout(push_constant)uniform PushConstants
>+{
>+
>+    uint outputCount;
>+
>+    uint componentCount;
>+
>+    uint srcOffset;
>+    uint destOffset;
>+
>+    uint Ns;
>+    uint Bs;
>+    uint Ss;
>+    uint Es;
>+
>+    uint Nd;
>+    uint Bd;
>+    uint Sd;
>+    uint Ed;
>+} params;
>+
>+uint getSourceComponentOffset(uint vertex, uint component)
>+{
>+    return vertex * params . Ss + component * params . Bs + params . srcOffset;
>+}
>+
>+uint getDestinationComponentOffset(uint vertex, uint component)
>+{
>+    return vertex * params . Sd + component * 4 + params . destOffset;
>+}
>+
>+uint getShiftBits(uint offset, uint B)
>+{
>+
>+    uint shift =(offset % 4)* 8;
>+
>+    return shift;
>+}
>+
>+      float loadSourceComponent(uint cd)
>+{
>+
>+    uint vertex = cd / params . Nd;
>+    uint component = cd % params . Nd;
>+
>+    if(component >= params . Ns)
>+    {
>+        return 0;
>+    }
>+
>+    uint offset = getSourceComponentOffset(vertex, component);
>+    uint block = srcData[offset / 4];
>+    uint shiftBits = getShiftBits(offset, params . Bs);
>+
>+    uint valueBits = params . Bs * 8;
>+    uint valueMask = valueBits == 32 ? - 1 :(1 << valueBits)- 1;
>+    uint valueAsUint =(block >> shiftBits)& valueMask;
>+
>+    float positiveMax = valueMask;
>+
>+          float value = valueAsUint / positiveMax;
>+
>+    return value;
>+}
>+
>+       float convertComponent(float srcValue)
>+{
>+
>+    return srcValue;
>+}
>+
>+uint makeDestinationComponent(uint cd, float value)
>+{
>+
>+    uint valueAsUint = floatBitsToInt(value);
>+
>+    return valueAsUint;
>+}
>+
>+void storeDestinationComponents(uint valueAsUint)
>+{
>+
>+    destData[gl_GlobalInvocationID . x + params . destOffset / 4]= valueAsUint;
>+}
>+
>+void main()
>+{
>+
>+    uint valueOut = 0;
>+    for(uint i = 0;i < 1;++ i)
>+    {
>+        uint cd = gl_GlobalInvocationID . x * 1 + i;
>+
>+              float srcValue = loadSourceComponent(cd);
>+               float destValue = convertComponent(srcValue);
>+        valueOut |= makeDestinationComponent(cd, destValue);
>+    }
>+
>+    storeDestinationComponents(valueOut);
>+}
>+#endif  // Preprocessed code
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.0000000C.inc b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.0000000C.inc
>new file mode 100644
>index 00000000000..2ae28d63954
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.0000000C.inc
>@@ -0,0 +1,309 @@
>+	// 7.11.3188
>+	 #pragma once
>+const uint32_t kConvertVertex_comp_0000000C[] = {
>+	0x07230203,0x00010000,0x00080007,0x000000de,0x00000000,0x00020011,0x00000001,0x0006000b,
>+	0x00000001,0x4c534c47,0x6474732e,0x3035342e,0x00000000,0x0003000e,0x00000000,0x00000001,
>+	0x0006000f,0x00000005,0x00000004,0x6e69616d,0x00000000,0x0000009d,0x00060010,0x00000004,
>+	0x00000011,0x00000040,0x00000001,0x00000001,0x00030003,0x00000002,0x000001c2,0x00040005,
>+	0x00000004,0x6e69616d,0x00000000,0x000a0005,0x0000000b,0x53746567,0x6372756f,0x6d6f4365,
>+	0x656e6f70,0x664f746e,0x74657366,0x3b317528,0x003b3175,0x00040005,0x00000009,0x74726576,
>+	0x00007865,0x00050005,0x0000000a,0x706d6f63,0x6e656e6f,0x00000074,0x00070005,0x0000000f,
>+	0x53746567,0x74666968,0x73746942,0x3b317528,0x003b3175,0x00040005,0x0000000d,0x7366666f,
>+	0x00007465,0x00030005,0x0000000e,0x00000042,0x00080005,0x00000014,0x64616f6c,0x72756f53,
>+	0x6f436563,0x6e6f706d,0x28746e65,0x003b3175,0x00030005,0x00000013,0x00006463,0x00080005,
>+	0x00000019,0x766e6f63,0x43747265,0x6f706d6f,0x746e656e,0x3b316628,0x00000000,0x00050005,
>+	0x00000018,0x56637273,0x65756c61,0x00000000,0x000a0005,0x0000001e,0x656b616d,0x74736544,
>+	0x74616e69,0x436e6f69,0x6f706d6f,0x746e656e,0x3b317528,0x003b3166,0x00030005,0x0000001c,
>+	0x00006463,0x00040005,0x0000001d,0x756c6176,0x00000065,0x000a0005,0x00000022,0x726f7473,
>+	0x73654465,0x616e6974,0x6e6f6974,0x706d6f43,0x6e656e6f,0x75287374,0x00003b31,0x00050005,
>+	0x00000021,0x756c6176,0x55734165,0x00746e69,0x00060005,0x00000025,0x68737550,0x736e6f43,
>+	0x746e6174,0x00000073,0x00060006,0x00000025,0x00000000,0x7074756f,0x6f437475,0x00746e75,
>+	0x00070006,0x00000025,0x00000001,0x706d6f63,0x6e656e6f,0x756f4374,0x0000746e,0x00060006,
>+	0x00000025,0x00000002,0x4f637273,0x65736666,0x00000074,0x00060006,0x00000025,0x00000003,
>+	0x74736564,0x7366664f,0x00007465,0x00040006,0x00000025,0x00000004,0x0000734e,0x00040006,
>+	0x00000025,0x00000005,0x00007342,0x00040006,0x00000025,0x00000006,0x00007353,0x00040006,
>+	0x00000025,0x00000007,0x00007345,0x00040006,0x00000025,0x00000008,0x0000644e,0x00040006,
>+	0x00000025,0x00000009,0x00006442,0x00040006,0x00000025,0x0000000a,0x00006453,0x00040006,
>+	0x00000025,0x0000000b,0x00006445,0x00040005,0x00000027,0x61726170,0x0000736d,0x00040005,
>+	0x00000038,0x66696873,0x00000074,0x00040005,0x00000040,0x74726576,0x00007865,0x00050005,
>+	0x00000046,0x706d6f63,0x6e656e6f,0x00000074,0x00040005,0x00000055,0x7366666f,0x00007465,
>+	0x00040005,0x00000056,0x61726170,0x0000006d,0x00040005,0x00000058,0x61726170,0x0000006d,
>+	0x00040005,0x0000005b,0x636f6c62,0x0000006b,0x00030005,0x0000005d,0x00637273,0x00050006,
>+	0x0000005d,0x00000000,0x44637273,0x00617461,0x00030005,0x0000005f,0x00000000,0x00050005,
>+	0x00000066,0x66696873,0x74694274,0x00000073,0x00040005,0x00000067,0x61726170,0x0000006d,
>+	0x00040005,0x00000069,0x61726170,0x0000006d,0x00050005,0x0000006b,0x756c6176,0x74694265,
>+	0x00000073,0x00050005,0x0000006d,0x756c6176,0x73614d65,0x0000006b,0x00050005,0x0000007c,
>+	0x756c6176,0x55734165,0x00746e69,0x00040005,0x00000082,0x69766964,0x00726f73,0x00040005,
>+	0x00000084,0x756c6176,0x00000065,0x00050005,0x00000090,0x756c6176,0x55734165,0x00746e69,
>+	0x00040005,0x00000098,0x74736564,0x00000000,0x00060006,0x00000098,0x00000000,0x74736564,
>+	0x61746144,0x00000000,0x00030005,0x0000009a,0x00000000,0x00080005,0x0000009d,0x475f6c67,
>+	0x61626f6c,0x766e496c,0x7461636f,0x496e6f69,0x00000044,0x00050005,0x000000b1,0x756c6176,
>+	0x74754f65,0x00000000,0x00030005,0x000000b2,0x00000069,0x00030005,0x000000bb,0x00006463,
>+	0x00050005,0x000000c8,0x56637273,0x65756c61,0x00000000,0x00040005,0x000000c9,0x61726170,
>+	0x0000006d,0x00050005,0x000000cc,0x74736564,0x756c6156,0x00000065,0x00040005,0x000000cd,
>+	0x61726170,0x0000006d,0x00040005,0x000000d0,0x61726170,0x0000006d,0x00040005,0x000000d2,
>+	0x61726170,0x0000006d,0x00040005,0x000000d9,0x61726170,0x0000006d,0x00050048,0x00000025,
>+	0x00000000,0x00000023,0x00000000,0x00050048,0x00000025,0x00000001,0x00000023,0x00000004,
>+	0x00050048,0x00000025,0x00000002,0x00000023,0x00000008,0x00050048,0x00000025,0x00000003,
>+	0x00000023,0x0000000c,0x00050048,0x00000025,0x00000004,0x00000023,0x00000010,0x00050048,
>+	0x00000025,0x00000005,0x00000023,0x00000014,0x00050048,0x00000025,0x00000006,0x00000023,
>+	0x00000018,0x00050048,0x00000025,0x00000007,0x00000023,0x0000001c,0x00050048,0x00000025,
>+	0x00000008,0x00000023,0x00000020,0x00050048,0x00000025,0x00000009,0x00000023,0x00000024,
>+	0x00050048,0x00000025,0x0000000a,0x00000023,0x00000028,0x00050048,0x00000025,0x0000000b,
>+	0x00000023,0x0000002c,0x00030047,0x00000025,0x00000002,0x00040047,0x0000005c,0x00000006,
>+	0x00000004,0x00050048,0x0000005d,0x00000000,0x00000023,0x00000000,0x00030047,0x0000005d,
>+	0x00000003,0x00040047,0x0000005f,0x00000022,0x00000000,0x00040047,0x0000005f,0x00000021,
>+	0x00000001,0x00040047,0x00000097,0x00000006,0x00000004,0x00050048,0x00000098,0x00000000,
>+	0x00000023,0x00000000,0x00030047,0x00000098,0x00000003,0x00040047,0x0000009a,0x00000022,
>+	0x00000000,0x00040047,0x0000009a,0x00000021,0x00000000,0x00040047,0x0000009d,0x0000000b,
>+	0x0000001c,0x00040047,0x000000dd,0x0000000b,0x00000019,0x00020013,0x00000002,0x00030021,
>+	0x00000003,0x00000002,0x00040015,0x00000006,0x00000020,0x00000000,0x00040020,0x00000007,
>+	0x00000007,0x00000006,0x00050021,0x00000008,0x00000006,0x00000007,0x00000007,0x00030016,
>+	0x00000011,0x00000020,0x00040021,0x00000012,0x00000011,0x00000007,0x00040020,0x00000016,
>+	0x00000007,0x00000011,0x00040021,0x00000017,0x00000011,0x00000016,0x00050021,0x0000001b,
>+	0x00000006,0x00000007,0x00000016,0x00040021,0x00000020,0x00000002,0x00000007,0x000e001e,
>+	0x00000025,0x00000006,0x00000006,0x00000006,0x00000006,0x00000006,0x00000006,0x00000006,
>+	0x00000006,0x00000006,0x00000006,0x00000006,0x00000006,0x00040020,0x00000026,0x00000009,
>+	0x00000025,0x0004003b,0x00000026,0x00000027,0x00000009,0x00040015,0x00000028,0x00000020,
>+	0x00000001,0x0004002b,0x00000028,0x00000029,0x00000006,0x00040020,0x0000002a,0x00000009,
>+	0x00000006,0x0004002b,0x00000006,0x0000002f,0x00000004,0x0004002b,0x00000028,0x00000032,
>+	0x00000002,0x0004002b,0x00000006,0x0000003b,0x00000008,0x0004002b,0x00000028,0x00000042,
>+	0x00000008,0x0004002b,0x00000028,0x0000004c,0x00000004,0x00020014,0x0000004f,0x0004002b,
>+	0x00000011,0x00000053,0x00000000,0x0003001d,0x0000005c,0x00000006,0x0003001e,0x0000005d,
>+	0x0000005c,0x00040020,0x0000005e,0x00000002,0x0000005d,0x0004003b,0x0000005e,0x0000005f,
>+	0x00000002,0x0004002b,0x00000028,0x00000060,0x00000000,0x00040020,0x00000063,0x00000002,
>+	0x00000006,0x0004002b,0x00000006,0x0000006c,0x00000020,0x00040020,0x00000070,0x00000007,
>+	0x00000028,0x0004002b,0x00000028,0x00000074,0xffffffff,0x0004002b,0x00000028,0x00000076,
>+	0x00000001,0x0004002b,0x00000011,0x00000083,0x37800000,0x0003001d,0x00000097,0x00000006,
>+	0x0003001e,0x00000098,0x00000097,0x00040020,0x00000099,0x00000002,0x00000098,0x0004003b,
>+	0x00000099,0x0000009a,0x00000002,0x00040017,0x0000009b,0x00000006,0x00000003,0x00040020,
>+	0x0000009c,0x00000001,0x0000009b,0x0004003b,0x0000009c,0x0000009d,0x00000001,0x0004002b,
>+	0x00000006,0x0000009e,0x00000000,0x00040020,0x0000009f,0x00000001,0x00000006,0x0004002b,
>+	0x00000028,0x000000a2,0x00000003,0x0004002b,0x00000006,0x000000b9,0x00000001,0x0004002b,
>+	0x00000006,0x000000dc,0x00000040,0x0006002c,0x0000009b,0x000000dd,0x000000dc,0x000000b9,
>+	0x000000b9,0x00050036,0x00000002,0x00000004,0x00000000,0x00000003,0x000200f8,0x00000005,
>+	0x0004003b,0x00000007,0x000000b1,0x00000007,0x0004003b,0x00000007,0x000000b2,0x00000007,
>+	0x0004003b,0x00000007,0x000000bb,0x00000007,0x0004003b,0x00000016,0x000000c8,0x00000007,
>+	0x0004003b,0x00000007,0x000000c9,0x00000007,0x0004003b,0x00000016,0x000000cc,0x00000007,
>+	0x0004003b,0x00000016,0x000000cd,0x00000007,0x0004003b,0x00000007,0x000000d0,0x00000007,
>+	0x0004003b,0x00000016,0x000000d2,0x00000007,0x0004003b,0x00000007,0x000000d9,0x00000007,
>+	0x00050041,0x0000009f,0x000000a9,0x0000009d,0x0000009e,0x0004003d,0x00000006,0x000000aa,
>+	0x000000a9,0x00050041,0x0000002a,0x000000ab,0x00000027,0x00000060,0x0004003d,0x00000006,
>+	0x000000ac,0x000000ab,0x000500ae,0x0000004f,0x000000ad,0x000000aa,0x000000ac,0x000300f7,
>+	0x000000af,0x00000000,0x000400fa,0x000000ad,0x000000ae,0x000000af,0x000200f8,0x000000ae,
>+	0x000100fd,0x000200f8,0x000000af,0x0003003e,0x000000b1,0x0000009e,0x0003003e,0x000000b2,
>+	0x0000009e,0x000200f9,0x000000b3,0x000200f8,0x000000b3,0x000400f6,0x000000b5,0x000000b6,
>+	0x00000000,0x000200f9,0x000000b7,0x000200f8,0x000000b7,0x0004003d,0x00000006,0x000000b8,
>+	0x000000b2,0x000500b0,0x0000004f,0x000000ba,0x000000b8,0x000000b9,0x000400fa,0x000000ba,
>+	0x000000b4,0x000000b5,0x000200f8,0x000000b4,0x00050041,0x0000009f,0x000000bc,0x0000009d,
>+	0x0000009e,0x0004003d,0x00000006,0x000000bd,0x000000bc,0x00050084,0x00000006,0x000000be,
>+	0x000000bd,0x000000b9,0x0004003d,0x00000006,0x000000bf,0x000000b2,0x00050080,0x00000006,
>+	0x000000c0,0x000000be,0x000000bf,0x0003003e,0x000000bb,0x000000c0,0x0004003d,0x00000006,
>+	0x000000c1,0x000000bb,0x00050041,0x0000002a,0x000000c2,0x00000027,0x00000076,0x0004003d,
>+	0x00000006,0x000000c3,0x000000c2,0x000500ae,0x0000004f,0x000000c4,0x000000c1,0x000000c3,
>+	0x000300f7,0x000000c6,0x00000000,0x000400fa,0x000000c4,0x000000c5,0x000000c6,0x000200f8,
>+	0x000000c5,0x000200f9,0x000000b5,0x000200f8,0x000000c6,0x0004003d,0x00000006,0x000000ca,
>+	0x000000bb,0x0003003e,0x000000c9,0x000000ca,0x00050039,0x00000011,0x000000cb,0x00000014,
>+	0x000000c9,0x0003003e,0x000000c8,0x000000cb,0x0004003d,0x00000011,0x000000ce,0x000000c8,
>+	0x0003003e,0x000000cd,0x000000ce,0x00050039,0x00000011,0x000000cf,0x00000019,0x000000cd,
>+	0x0003003e,0x000000cc,0x000000cf,0x0004003d,0x00000006,0x000000d1,0x000000bb,0x0003003e,
>+	0x000000d0,0x000000d1,0x0004003d,0x00000011,0x000000d3,0x000000cc,0x0003003e,0x000000d2,
>+	0x000000d3,0x00060039,0x00000006,0x000000d4,0x0000001e,0x000000d0,0x000000d2,0x0004003d,
>+	0x00000006,0x000000d5,0x000000b1,0x000500c5,0x00000006,0x000000d6,0x000000d5,0x000000d4,
>+	0x0003003e,0x000000b1,0x000000d6,0x000200f9,0x000000b6,0x000200f8,0x000000b6,0x0004003d,
>+	0x00000006,0x000000d7,0x000000b2,0x00050080,0x00000006,0x000000d8,0x000000d7,0x00000076,
>+	0x0003003e,0x000000b2,0x000000d8,0x000200f9,0x000000b3,0x000200f8,0x000000b5,0x0004003d,
>+	0x00000006,0x000000da,0x000000b1,0x0003003e,0x000000d9,0x000000da,0x00050039,0x00000002,
>+	0x000000db,0x00000022,0x000000d9,0x000100fd,0x00010038,0x00050036,0x00000006,0x0000000b,
>+	0x00000000,0x00000008,0x00030037,0x00000007,0x00000009,0x00030037,0x00000007,0x0000000a,
>+	0x000200f8,0x0000000c,0x0004003d,0x00000006,0x00000024,0x00000009,0x00050041,0x0000002a,
>+	0x0000002b,0x00000027,0x00000029,0x0004003d,0x00000006,0x0000002c,0x0000002b,0x00050084,
>+	0x00000006,0x0000002d,0x00000024,0x0000002c,0x0004003d,0x00000006,0x0000002e,0x0000000a,
>+	0x00050084,0x00000006,0x00000030,0x0000002e,0x0000002f,0x00050080,0x00000006,0x00000031,
>+	0x0000002d,0x00000030,0x00050041,0x0000002a,0x00000033,0x00000027,0x00000032,0x0004003d,
>+	0x00000006,0x00000034,0x00000033,0x00050080,0x00000006,0x00000035,0x00000031,0x00000034,
>+	0x000200fe,0x00000035,0x00010038,0x00050036,0x00000006,0x0000000f,0x00000000,0x00000008,
>+	0x00030037,0x00000007,0x0000000d,0x00030037,0x00000007,0x0000000e,0x000200f8,0x00000010,
>+	0x0004003b,0x00000007,0x00000038,0x00000007,0x0004003d,0x00000006,0x00000039,0x0000000d,
>+	0x00050089,0x00000006,0x0000003a,0x00000039,0x0000002f,0x00050084,0x00000006,0x0000003c,
>+	0x0000003a,0x0000003b,0x0003003e,0x00000038,0x0000003c,0x0004003d,0x00000006,0x0000003d,
>+	0x00000038,0x000200fe,0x0000003d,0x00010038,0x00050036,0x00000011,0x00000014,0x00000000,
>+	0x00000012,0x00030037,0x00000007,0x00000013,0x000200f8,0x00000015,0x0004003b,0x00000007,
>+	0x00000040,0x00000007,0x0004003b,0x00000007,0x00000046,0x00000007,0x0004003b,0x00000007,
>+	0x00000055,0x00000007,0x0004003b,0x00000007,0x00000056,0x00000007,0x0004003b,0x00000007,
>+	0x00000058,0x00000007,0x0004003b,0x00000007,0x0000005b,0x00000007,0x0004003b,0x00000007,
>+	0x00000066,0x00000007,0x0004003b,0x00000007,0x00000067,0x00000007,0x0004003b,0x00000007,
>+	0x00000069,0x00000007,0x0004003b,0x00000007,0x0000006b,0x00000007,0x0004003b,0x00000007,
>+	0x0000006d,0x00000007,0x0004003b,0x00000070,0x00000071,0x00000007,0x0004003b,0x00000007,
>+	0x0000007c,0x00000007,0x0004003b,0x00000016,0x00000082,0x00000007,0x0004003b,0x00000016,
>+	0x00000084,0x00000007,0x0004003d,0x00000006,0x00000041,0x00000013,0x00050041,0x0000002a,
>+	0x00000043,0x00000027,0x00000042,0x0004003d,0x00000006,0x00000044,0x00000043,0x00050086,
>+	0x00000006,0x00000045,0x00000041,0x00000044,0x0003003e,0x00000040,0x00000045,0x0004003d,
>+	0x00000006,0x00000047,0x00000013,0x00050041,0x0000002a,0x00000048,0x00000027,0x00000042,
>+	0x0004003d,0x00000006,0x00000049,0x00000048,0x00050089,0x00000006,0x0000004a,0x00000047,
>+	0x00000049,0x0003003e,0x00000046,0x0000004a,0x0004003d,0x00000006,0x0000004b,0x00000046,
>+	0x00050041,0x0000002a,0x0000004d,0x00000027,0x0000004c,0x0004003d,0x00000006,0x0000004e,
>+	0x0000004d,0x000500ae,0x0000004f,0x00000050,0x0000004b,0x0000004e,0x000300f7,0x00000052,
>+	0x00000000,0x000400fa,0x00000050,0x00000051,0x00000052,0x000200f8,0x00000051,0x000200fe,
>+	0x00000053,0x000200f8,0x00000052,0x0004003d,0x00000006,0x00000057,0x00000040,0x0003003e,
>+	0x00000056,0x00000057,0x0004003d,0x00000006,0x00000059,0x00000046,0x0003003e,0x00000058,
>+	0x00000059,0x00060039,0x00000006,0x0000005a,0x0000000b,0x00000056,0x00000058,0x0003003e,
>+	0x00000055,0x0000005a,0x0004003d,0x00000006,0x00000061,0x00000055,0x00050086,0x00000006,
>+	0x00000062,0x00000061,0x0000002f,0x00060041,0x00000063,0x00000064,0x0000005f,0x00000060,
>+	0x00000062,0x0004003d,0x00000006,0x00000065,0x00000064,0x0003003e,0x0000005b,0x00000065,
>+	0x0004003d,0x00000006,0x00000068,0x00000055,0x0003003e,0x00000067,0x00000068,0x0003003e,
>+	0x00000069,0x0000002f,0x00060039,0x00000006,0x0000006a,0x0000000f,0x00000067,0x00000069,
>+	0x0003003e,0x00000066,0x0000006a,0x0003003e,0x0000006b,0x0000006c,0x0004003d,0x00000006,
>+	0x0000006e,0x0000006b,0x000500aa,0x0000004f,0x0000006f,0x0000006e,0x0000006c,0x000300f7,
>+	0x00000073,0x00000000,0x000400fa,0x0000006f,0x00000072,0x00000075,0x000200f8,0x00000072,
>+	0x0003003e,0x00000071,0x00000074,0x000200f9,0x00000073,0x000200f8,0x00000075,0x0004003d,
>+	0x00000006,0x00000077,0x0000006b,0x000500c4,0x00000028,0x00000078,0x00000076,0x00000077,
>+	0x00050082,0x00000028,0x00000079,0x00000078,0x00000076,0x0003003e,0x00000071,0x00000079,
>+	0x000200f9,0x00000073,0x000200f8,0x00000073,0x0004003d,0x00000028,0x0000007a,0x00000071,
>+	0x0004007c,0x00000006,0x0000007b,0x0000007a,0x0003003e,0x0000006d,0x0000007b,0x0004003d,
>+	0x00000006,0x0000007d,0x0000005b,0x0004003d,0x00000006,0x0000007e,0x00000066,0x000500c2,
>+	0x00000006,0x0000007f,0x0000007d,0x0000007e,0x0004003d,0x00000006,0x00000080,0x0000006d,
>+	0x000500c7,0x00000006,0x00000081,0x0000007f,0x00000080,0x0003003e,0x0000007c,0x00000081,
>+	0x0003003e,0x00000082,0x00000083,0x0004003d,0x00000006,0x00000085,0x0000007c,0x0004007c,
>+	0x00000028,0x00000086,0x00000085,0x0004006f,0x00000011,0x00000087,0x00000086,0x0004003d,
>+	0x00000011,0x00000088,0x00000082,0x00050085,0x00000011,0x00000089,0x00000087,0x00000088,
>+	0x0003003e,0x00000084,0x00000089,0x0004003d,0x00000011,0x0000008a,0x00000084,0x000200fe,
>+	0x0000008a,0x00010038,0x00050036,0x00000011,0x00000019,0x00000000,0x00000017,0x00030037,
>+	0x00000016,0x00000018,0x000200f8,0x0000001a,0x0004003d,0x00000011,0x0000008d,0x00000018,
>+	0x000200fe,0x0000008d,0x00010038,0x00050036,0x00000006,0x0000001e,0x00000000,0x0000001b,
>+	0x00030037,0x00000007,0x0000001c,0x00030037,0x00000016,0x0000001d,0x000200f8,0x0000001f,
>+	0x0004003b,0x00000007,0x00000090,0x00000007,0x0004003d,0x00000011,0x00000091,0x0000001d,
>+	0x0004007c,0x00000028,0x00000092,0x00000091,0x0004007c,0x00000006,0x00000093,0x00000092,
>+	0x0003003e,0x00000090,0x00000093,0x0004003d,0x00000006,0x00000094,0x00000090,0x000200fe,
>+	0x00000094,0x00010038,0x00050036,0x00000002,0x00000022,0x00000000,0x00000020,0x00030037,
>+	0x00000007,0x00000021,0x000200f8,0x00000023,0x00050041,0x0000009f,0x000000a0,0x0000009d,
>+	0x0000009e,0x0004003d,0x00000006,0x000000a1,0x000000a0,0x00050041,0x0000002a,0x000000a3,
>+	0x00000027,0x000000a2,0x0004003d,0x00000006,0x000000a4,0x000000a3,0x00050086,0x00000006,
>+	0x000000a5,0x000000a4,0x0000002f,0x00050080,0x00000006,0x000000a6,0x000000a1,0x000000a5,
>+	0x0004003d,0x00000006,0x000000a7,0x00000021,0x00060041,0x00000063,0x000000a8,0x0000009a,
>+	0x00000060,0x000000a6,0x0003003e,0x000000a8,0x000000a7,0x000100fd,0x00010038
>+};
>+
>+#if 0  // Generated from:
>+#version 450 core
>+
>+layout(local_size_x = 64, local_size_y = 1, local_size_z = 1)in;
>+
>+layout(set = 0, binding = 0)buffer dest
>+{
>+    uint destData[];
>+};
>+
>+layout(set = 0, binding = 1)buffer src
>+{
>+    uint srcData[];
>+};
>+
>+layout(push_constant)uniform PushConstants
>+{
>+
>+    uint outputCount;
>+
>+    uint componentCount;
>+
>+    uint srcOffset;
>+    uint destOffset;
>+
>+    uint Ns;
>+    uint Bs;
>+    uint Ss;
>+    uint Es;
>+
>+    uint Nd;
>+    uint Bd;
>+    uint Sd;
>+    uint Ed;
>+} params;
>+
>+uint getSourceComponentOffset(uint vertex, uint component)
>+{
>+    return vertex * params . Ss + component * 4 + params . srcOffset;
>+}
>+
>+uint getDestinationComponentOffset(uint vertex, uint component)
>+{
>+    return vertex * params . Sd + component * 4 + params . destOffset;
>+}
>+
>+uint getShiftBits(uint offset, uint B)
>+{
>+
>+    uint shift =(offset % 4)* 8;
>+
>+    return shift;
>+}
>+
>+      float loadSourceComponent(uint cd)
>+{
>+
>+    uint vertex = cd / params . Nd;
>+    uint component = cd % params . Nd;
>+
>+    if(component >= params . Ns)
>+    {
>+        return 0;
>+    }
>+
>+    uint offset = getSourceComponentOffset(vertex, component);
>+    uint block = srcData[offset / 4];
>+    uint shiftBits = getShiftBits(offset, 4);
>+
>+    uint valueBits = 4 * 8;
>+    uint valueMask = valueBits == 32 ? - 1 :(1 << valueBits)- 1;
>+    uint valueAsUint =(block >> shiftBits)& valueMask;
>+
>+    float divisor = 1.0f / 65536.0f;
>+          float value = int(valueAsUint)* divisor;
>+
>+    return value;
>+}
>+
>+       float convertComponent(float srcValue)
>+{
>+
>+    return srcValue;
>+}
>+
>+uint makeDestinationComponent(uint cd, float value)
>+{
>+
>+    uint valueAsUint = floatBitsToInt(value);
>+
>+    return valueAsUint;
>+}
>+
>+void storeDestinationComponents(uint valueAsUint)
>+{
>+
>+    destData[gl_GlobalInvocationID . x + params . destOffset / 4]= valueAsUint;
>+}
>+
>+void main()
>+{
>+
>+    if(gl_GlobalInvocationID . x >= params . outputCount)
>+        return;
>+
>+    uint valueOut = 0;
>+    for(uint i = 0;i < 1;++ i)
>+    {
>+        uint cd = gl_GlobalInvocationID . x * 1 + i;
>+
>+        if(cd >= params . componentCount)
>+        {
>+            break;
>+        }
>+
>+              float srcValue = loadSourceComponent(cd);
>+               float destValue = convertComponent(srcValue);
>+        valueOut |= makeDestinationComponent(cd, destValue);
>+    }
>+
>+    storeDestinationComponents(valueOut);
>+}
>+#endif  // Preprocessed code
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.0000000D.inc b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.0000000D.inc
>new file mode 100644
>index 00000000000..9d0ed4e11b5
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.0000000D.inc
>@@ -0,0 +1,293 @@
>+	// 7.11.3188
>+	 #pragma once
>+const uint32_t kConvertVertex_comp_0000000D[] = {
>+	0x07230203,0x00010000,0x00080007,0x000000cf,0x00000000,0x00020011,0x00000001,0x0006000b,
>+	0x00000001,0x4c534c47,0x6474732e,0x3035342e,0x00000000,0x0003000e,0x00000000,0x00000001,
>+	0x0006000f,0x00000005,0x00000004,0x6e69616d,0x00000000,0x0000009d,0x00060010,0x00000004,
>+	0x00000011,0x00000040,0x00000001,0x00000001,0x00030003,0x00000002,0x000001c2,0x00040005,
>+	0x00000004,0x6e69616d,0x00000000,0x000a0005,0x0000000b,0x53746567,0x6372756f,0x6d6f4365,
>+	0x656e6f70,0x664f746e,0x74657366,0x3b317528,0x003b3175,0x00040005,0x00000009,0x74726576,
>+	0x00007865,0x00050005,0x0000000a,0x706d6f63,0x6e656e6f,0x00000074,0x00070005,0x0000000f,
>+	0x53746567,0x74666968,0x73746942,0x3b317528,0x003b3175,0x00040005,0x0000000d,0x7366666f,
>+	0x00007465,0x00030005,0x0000000e,0x00000042,0x00080005,0x00000014,0x64616f6c,0x72756f53,
>+	0x6f436563,0x6e6f706d,0x28746e65,0x003b3175,0x00030005,0x00000013,0x00006463,0x00080005,
>+	0x00000019,0x766e6f63,0x43747265,0x6f706d6f,0x746e656e,0x3b316628,0x00000000,0x00050005,
>+	0x00000018,0x56637273,0x65756c61,0x00000000,0x000a0005,0x0000001e,0x656b616d,0x74736544,
>+	0x74616e69,0x436e6f69,0x6f706d6f,0x746e656e,0x3b317528,0x003b3166,0x00030005,0x0000001c,
>+	0x00006463,0x00040005,0x0000001d,0x756c6176,0x00000065,0x000a0005,0x00000022,0x726f7473,
>+	0x73654465,0x616e6974,0x6e6f6974,0x706d6f43,0x6e656e6f,0x75287374,0x00003b31,0x00050005,
>+	0x00000021,0x756c6176,0x55734165,0x00746e69,0x00060005,0x00000025,0x68737550,0x736e6f43,
>+	0x746e6174,0x00000073,0x00060006,0x00000025,0x00000000,0x7074756f,0x6f437475,0x00746e75,
>+	0x00070006,0x00000025,0x00000001,0x706d6f63,0x6e656e6f,0x756f4374,0x0000746e,0x00060006,
>+	0x00000025,0x00000002,0x4f637273,0x65736666,0x00000074,0x00060006,0x00000025,0x00000003,
>+	0x74736564,0x7366664f,0x00007465,0x00040006,0x00000025,0x00000004,0x0000734e,0x00040006,
>+	0x00000025,0x00000005,0x00007342,0x00040006,0x00000025,0x00000006,0x00007353,0x00040006,
>+	0x00000025,0x00000007,0x00007345,0x00040006,0x00000025,0x00000008,0x0000644e,0x00040006,
>+	0x00000025,0x00000009,0x00006442,0x00040006,0x00000025,0x0000000a,0x00006453,0x00040006,
>+	0x00000025,0x0000000b,0x00006445,0x00040005,0x00000027,0x61726170,0x0000736d,0x00040005,
>+	0x00000038,0x66696873,0x00000074,0x00040005,0x00000040,0x74726576,0x00007865,0x00050005,
>+	0x00000046,0x706d6f63,0x6e656e6f,0x00000074,0x00040005,0x00000055,0x7366666f,0x00007465,
>+	0x00040005,0x00000056,0x61726170,0x0000006d,0x00040005,0x00000058,0x61726170,0x0000006d,
>+	0x00040005,0x0000005b,0x636f6c62,0x0000006b,0x00030005,0x0000005d,0x00637273,0x00050006,
>+	0x0000005d,0x00000000,0x44637273,0x00617461,0x00030005,0x0000005f,0x00000000,0x00050005,
>+	0x00000066,0x66696873,0x74694274,0x00000073,0x00040005,0x00000067,0x61726170,0x0000006d,
>+	0x00040005,0x00000069,0x61726170,0x0000006d,0x00050005,0x0000006b,0x756c6176,0x74694265,
>+	0x00000073,0x00050005,0x0000006d,0x756c6176,0x73614d65,0x0000006b,0x00050005,0x0000007c,
>+	0x756c6176,0x55734165,0x00746e69,0x00040005,0x00000082,0x69766964,0x00726f73,0x00040005,
>+	0x00000084,0x756c6176,0x00000065,0x00050005,0x00000090,0x756c6176,0x55734165,0x00746e69,
>+	0x00040005,0x00000098,0x74736564,0x00000000,0x00060006,0x00000098,0x00000000,0x74736564,
>+	0x61746144,0x00000000,0x00030005,0x0000009a,0x00000000,0x00080005,0x0000009d,0x475f6c67,
>+	0x61626f6c,0x766e496c,0x7461636f,0x496e6f69,0x00000044,0x00050005,0x000000a9,0x756c6176,
>+	0x74754f65,0x00000000,0x00030005,0x000000aa,0x00000069,0x00030005,0x000000b3,0x00006463,
>+	0x00050005,0x000000b9,0x56637273,0x65756c61,0x00000000,0x00040005,0x000000ba,0x61726170,
>+	0x0000006d,0x00050005,0x000000bd,0x74736564,0x756c6156,0x00000065,0x00040005,0x000000be,
>+	0x61726170,0x0000006d,0x00040005,0x000000c1,0x61726170,0x0000006d,0x00040005,0x000000c3,
>+	0x61726170,0x0000006d,0x00040005,0x000000ca,0x61726170,0x0000006d,0x00050048,0x00000025,
>+	0x00000000,0x00000023,0x00000000,0x00050048,0x00000025,0x00000001,0x00000023,0x00000004,
>+	0x00050048,0x00000025,0x00000002,0x00000023,0x00000008,0x00050048,0x00000025,0x00000003,
>+	0x00000023,0x0000000c,0x00050048,0x00000025,0x00000004,0x00000023,0x00000010,0x00050048,
>+	0x00000025,0x00000005,0x00000023,0x00000014,0x00050048,0x00000025,0x00000006,0x00000023,
>+	0x00000018,0x00050048,0x00000025,0x00000007,0x00000023,0x0000001c,0x00050048,0x00000025,
>+	0x00000008,0x00000023,0x00000020,0x00050048,0x00000025,0x00000009,0x00000023,0x00000024,
>+	0x00050048,0x00000025,0x0000000a,0x00000023,0x00000028,0x00050048,0x00000025,0x0000000b,
>+	0x00000023,0x0000002c,0x00030047,0x00000025,0x00000002,0x00040047,0x0000005c,0x00000006,
>+	0x00000004,0x00050048,0x0000005d,0x00000000,0x00000023,0x00000000,0x00030047,0x0000005d,
>+	0x00000003,0x00040047,0x0000005f,0x00000022,0x00000000,0x00040047,0x0000005f,0x00000021,
>+	0x00000001,0x00040047,0x00000097,0x00000006,0x00000004,0x00050048,0x00000098,0x00000000,
>+	0x00000023,0x00000000,0x00030047,0x00000098,0x00000003,0x00040047,0x0000009a,0x00000022,
>+	0x00000000,0x00040047,0x0000009a,0x00000021,0x00000000,0x00040047,0x0000009d,0x0000000b,
>+	0x0000001c,0x00040047,0x000000ce,0x0000000b,0x00000019,0x00020013,0x00000002,0x00030021,
>+	0x00000003,0x00000002,0x00040015,0x00000006,0x00000020,0x00000000,0x00040020,0x00000007,
>+	0x00000007,0x00000006,0x00050021,0x00000008,0x00000006,0x00000007,0x00000007,0x00030016,
>+	0x00000011,0x00000020,0x00040021,0x00000012,0x00000011,0x00000007,0x00040020,0x00000016,
>+	0x00000007,0x00000011,0x00040021,0x00000017,0x00000011,0x00000016,0x00050021,0x0000001b,
>+	0x00000006,0x00000007,0x00000016,0x00040021,0x00000020,0x00000002,0x00000007,0x000e001e,
>+	0x00000025,0x00000006,0x00000006,0x00000006,0x00000006,0x00000006,0x00000006,0x00000006,
>+	0x00000006,0x00000006,0x00000006,0x00000006,0x00000006,0x00040020,0x00000026,0x00000009,
>+	0x00000025,0x0004003b,0x00000026,0x00000027,0x00000009,0x00040015,0x00000028,0x00000020,
>+	0x00000001,0x0004002b,0x00000028,0x00000029,0x00000006,0x00040020,0x0000002a,0x00000009,
>+	0x00000006,0x0004002b,0x00000006,0x0000002f,0x00000004,0x0004002b,0x00000028,0x00000032,
>+	0x00000002,0x0004002b,0x00000006,0x0000003b,0x00000008,0x0004002b,0x00000028,0x00000042,
>+	0x00000008,0x0004002b,0x00000028,0x0000004c,0x00000004,0x00020014,0x0000004f,0x0004002b,
>+	0x00000011,0x00000053,0x00000000,0x0003001d,0x0000005c,0x00000006,0x0003001e,0x0000005d,
>+	0x0000005c,0x00040020,0x0000005e,0x00000002,0x0000005d,0x0004003b,0x0000005e,0x0000005f,
>+	0x00000002,0x0004002b,0x00000028,0x00000060,0x00000000,0x00040020,0x00000063,0x00000002,
>+	0x00000006,0x0004002b,0x00000006,0x0000006c,0x00000020,0x00040020,0x00000070,0x00000007,
>+	0x00000028,0x0004002b,0x00000028,0x00000074,0xffffffff,0x0004002b,0x00000028,0x00000076,
>+	0x00000001,0x0004002b,0x00000011,0x00000083,0x37800000,0x0003001d,0x00000097,0x00000006,
>+	0x0003001e,0x00000098,0x00000097,0x00040020,0x00000099,0x00000002,0x00000098,0x0004003b,
>+	0x00000099,0x0000009a,0x00000002,0x00040017,0x0000009b,0x00000006,0x00000003,0x00040020,
>+	0x0000009c,0x00000001,0x0000009b,0x0004003b,0x0000009c,0x0000009d,0x00000001,0x0004002b,
>+	0x00000006,0x0000009e,0x00000000,0x00040020,0x0000009f,0x00000001,0x00000006,0x0004002b,
>+	0x00000028,0x000000a2,0x00000003,0x0004002b,0x00000006,0x000000b1,0x00000001,0x0004002b,
>+	0x00000006,0x000000cd,0x00000040,0x0006002c,0x0000009b,0x000000ce,0x000000cd,0x000000b1,
>+	0x000000b1,0x00050036,0x00000002,0x00000004,0x00000000,0x00000003,0x000200f8,0x00000005,
>+	0x0004003b,0x00000007,0x000000a9,0x00000007,0x0004003b,0x00000007,0x000000aa,0x00000007,
>+	0x0004003b,0x00000007,0x000000b3,0x00000007,0x0004003b,0x00000016,0x000000b9,0x00000007,
>+	0x0004003b,0x00000007,0x000000ba,0x00000007,0x0004003b,0x00000016,0x000000bd,0x00000007,
>+	0x0004003b,0x00000016,0x000000be,0x00000007,0x0004003b,0x00000007,0x000000c1,0x00000007,
>+	0x0004003b,0x00000016,0x000000c3,0x00000007,0x0004003b,0x00000007,0x000000ca,0x00000007,
>+	0x0003003e,0x000000a9,0x0000009e,0x0003003e,0x000000aa,0x0000009e,0x000200f9,0x000000ab,
>+	0x000200f8,0x000000ab,0x000400f6,0x000000ad,0x000000ae,0x00000000,0x000200f9,0x000000af,
>+	0x000200f8,0x000000af,0x0004003d,0x00000006,0x000000b0,0x000000aa,0x000500b0,0x0000004f,
>+	0x000000b2,0x000000b0,0x000000b1,0x000400fa,0x000000b2,0x000000ac,0x000000ad,0x000200f8,
>+	0x000000ac,0x00050041,0x0000009f,0x000000b4,0x0000009d,0x0000009e,0x0004003d,0x00000006,
>+	0x000000b5,0x000000b4,0x00050084,0x00000006,0x000000b6,0x000000b5,0x000000b1,0x0004003d,
>+	0x00000006,0x000000b7,0x000000aa,0x00050080,0x00000006,0x000000b8,0x000000b6,0x000000b7,
>+	0x0003003e,0x000000b3,0x000000b8,0x0004003d,0x00000006,0x000000bb,0x000000b3,0x0003003e,
>+	0x000000ba,0x000000bb,0x00050039,0x00000011,0x000000bc,0x00000014,0x000000ba,0x0003003e,
>+	0x000000b9,0x000000bc,0x0004003d,0x00000011,0x000000bf,0x000000b9,0x0003003e,0x000000be,
>+	0x000000bf,0x00050039,0x00000011,0x000000c0,0x00000019,0x000000be,0x0003003e,0x000000bd,
>+	0x000000c0,0x0004003d,0x00000006,0x000000c2,0x000000b3,0x0003003e,0x000000c1,0x000000c2,
>+	0x0004003d,0x00000011,0x000000c4,0x000000bd,0x0003003e,0x000000c3,0x000000c4,0x00060039,
>+	0x00000006,0x000000c5,0x0000001e,0x000000c1,0x000000c3,0x0004003d,0x00000006,0x000000c6,
>+	0x000000a9,0x000500c5,0x00000006,0x000000c7,0x000000c6,0x000000c5,0x0003003e,0x000000a9,
>+	0x000000c7,0x000200f9,0x000000ae,0x000200f8,0x000000ae,0x0004003d,0x00000006,0x000000c8,
>+	0x000000aa,0x00050080,0x00000006,0x000000c9,0x000000c8,0x00000076,0x0003003e,0x000000aa,
>+	0x000000c9,0x000200f9,0x000000ab,0x000200f8,0x000000ad,0x0004003d,0x00000006,0x000000cb,
>+	0x000000a9,0x0003003e,0x000000ca,0x000000cb,0x00050039,0x00000002,0x000000cc,0x00000022,
>+	0x000000ca,0x000100fd,0x00010038,0x00050036,0x00000006,0x0000000b,0x00000000,0x00000008,
>+	0x00030037,0x00000007,0x00000009,0x00030037,0x00000007,0x0000000a,0x000200f8,0x0000000c,
>+	0x0004003d,0x00000006,0x00000024,0x00000009,0x00050041,0x0000002a,0x0000002b,0x00000027,
>+	0x00000029,0x0004003d,0x00000006,0x0000002c,0x0000002b,0x00050084,0x00000006,0x0000002d,
>+	0x00000024,0x0000002c,0x0004003d,0x00000006,0x0000002e,0x0000000a,0x00050084,0x00000006,
>+	0x00000030,0x0000002e,0x0000002f,0x00050080,0x00000006,0x00000031,0x0000002d,0x00000030,
>+	0x00050041,0x0000002a,0x00000033,0x00000027,0x00000032,0x0004003d,0x00000006,0x00000034,
>+	0x00000033,0x00050080,0x00000006,0x00000035,0x00000031,0x00000034,0x000200fe,0x00000035,
>+	0x00010038,0x00050036,0x00000006,0x0000000f,0x00000000,0x00000008,0x00030037,0x00000007,
>+	0x0000000d,0x00030037,0x00000007,0x0000000e,0x000200f8,0x00000010,0x0004003b,0x00000007,
>+	0x00000038,0x00000007,0x0004003d,0x00000006,0x00000039,0x0000000d,0x00050089,0x00000006,
>+	0x0000003a,0x00000039,0x0000002f,0x00050084,0x00000006,0x0000003c,0x0000003a,0x0000003b,
>+	0x0003003e,0x00000038,0x0000003c,0x0004003d,0x00000006,0x0000003d,0x00000038,0x000200fe,
>+	0x0000003d,0x00010038,0x00050036,0x00000011,0x00000014,0x00000000,0x00000012,0x00030037,
>+	0x00000007,0x00000013,0x000200f8,0x00000015,0x0004003b,0x00000007,0x00000040,0x00000007,
>+	0x0004003b,0x00000007,0x00000046,0x00000007,0x0004003b,0x00000007,0x00000055,0x00000007,
>+	0x0004003b,0x00000007,0x00000056,0x00000007,0x0004003b,0x00000007,0x00000058,0x00000007,
>+	0x0004003b,0x00000007,0x0000005b,0x00000007,0x0004003b,0x00000007,0x00000066,0x00000007,
>+	0x0004003b,0x00000007,0x00000067,0x00000007,0x0004003b,0x00000007,0x00000069,0x00000007,
>+	0x0004003b,0x00000007,0x0000006b,0x00000007,0x0004003b,0x00000007,0x0000006d,0x00000007,
>+	0x0004003b,0x00000070,0x00000071,0x00000007,0x0004003b,0x00000007,0x0000007c,0x00000007,
>+	0x0004003b,0x00000016,0x00000082,0x00000007,0x0004003b,0x00000016,0x00000084,0x00000007,
>+	0x0004003d,0x00000006,0x00000041,0x00000013,0x00050041,0x0000002a,0x00000043,0x00000027,
>+	0x00000042,0x0004003d,0x00000006,0x00000044,0x00000043,0x00050086,0x00000006,0x00000045,
>+	0x00000041,0x00000044,0x0003003e,0x00000040,0x00000045,0x0004003d,0x00000006,0x00000047,
>+	0x00000013,0x00050041,0x0000002a,0x00000048,0x00000027,0x00000042,0x0004003d,0x00000006,
>+	0x00000049,0x00000048,0x00050089,0x00000006,0x0000004a,0x00000047,0x00000049,0x0003003e,
>+	0x00000046,0x0000004a,0x0004003d,0x00000006,0x0000004b,0x00000046,0x00050041,0x0000002a,
>+	0x0000004d,0x00000027,0x0000004c,0x0004003d,0x00000006,0x0000004e,0x0000004d,0x000500ae,
>+	0x0000004f,0x00000050,0x0000004b,0x0000004e,0x000300f7,0x00000052,0x00000000,0x000400fa,
>+	0x00000050,0x00000051,0x00000052,0x000200f8,0x00000051,0x000200fe,0x00000053,0x000200f8,
>+	0x00000052,0x0004003d,0x00000006,0x00000057,0x00000040,0x0003003e,0x00000056,0x00000057,
>+	0x0004003d,0x00000006,0x00000059,0x00000046,0x0003003e,0x00000058,0x00000059,0x00060039,
>+	0x00000006,0x0000005a,0x0000000b,0x00000056,0x00000058,0x0003003e,0x00000055,0x0000005a,
>+	0x0004003d,0x00000006,0x00000061,0x00000055,0x00050086,0x00000006,0x00000062,0x00000061,
>+	0x0000002f,0x00060041,0x00000063,0x00000064,0x0000005f,0x00000060,0x00000062,0x0004003d,
>+	0x00000006,0x00000065,0x00000064,0x0003003e,0x0000005b,0x00000065,0x0004003d,0x00000006,
>+	0x00000068,0x00000055,0x0003003e,0x00000067,0x00000068,0x0003003e,0x00000069,0x0000002f,
>+	0x00060039,0x00000006,0x0000006a,0x0000000f,0x00000067,0x00000069,0x0003003e,0x00000066,
>+	0x0000006a,0x0003003e,0x0000006b,0x0000006c,0x0004003d,0x00000006,0x0000006e,0x0000006b,
>+	0x000500aa,0x0000004f,0x0000006f,0x0000006e,0x0000006c,0x000300f7,0x00000073,0x00000000,
>+	0x000400fa,0x0000006f,0x00000072,0x00000075,0x000200f8,0x00000072,0x0003003e,0x00000071,
>+	0x00000074,0x000200f9,0x00000073,0x000200f8,0x00000075,0x0004003d,0x00000006,0x00000077,
>+	0x0000006b,0x000500c4,0x00000028,0x00000078,0x00000076,0x00000077,0x00050082,0x00000028,
>+	0x00000079,0x00000078,0x00000076,0x0003003e,0x00000071,0x00000079,0x000200f9,0x00000073,
>+	0x000200f8,0x00000073,0x0004003d,0x00000028,0x0000007a,0x00000071,0x0004007c,0x00000006,
>+	0x0000007b,0x0000007a,0x0003003e,0x0000006d,0x0000007b,0x0004003d,0x00000006,0x0000007d,
>+	0x0000005b,0x0004003d,0x00000006,0x0000007e,0x00000066,0x000500c2,0x00000006,0x0000007f,
>+	0x0000007d,0x0000007e,0x0004003d,0x00000006,0x00000080,0x0000006d,0x000500c7,0x00000006,
>+	0x00000081,0x0000007f,0x00000080,0x0003003e,0x0000007c,0x00000081,0x0003003e,0x00000082,
>+	0x00000083,0x0004003d,0x00000006,0x00000085,0x0000007c,0x0004007c,0x00000028,0x00000086,
>+	0x00000085,0x0004006f,0x00000011,0x00000087,0x00000086,0x0004003d,0x00000011,0x00000088,
>+	0x00000082,0x00050085,0x00000011,0x00000089,0x00000087,0x00000088,0x0003003e,0x00000084,
>+	0x00000089,0x0004003d,0x00000011,0x0000008a,0x00000084,0x000200fe,0x0000008a,0x00010038,
>+	0x00050036,0x00000011,0x00000019,0x00000000,0x00000017,0x00030037,0x00000016,0x00000018,
>+	0x000200f8,0x0000001a,0x0004003d,0x00000011,0x0000008d,0x00000018,0x000200fe,0x0000008d,
>+	0x00010038,0x00050036,0x00000006,0x0000001e,0x00000000,0x0000001b,0x00030037,0x00000007,
>+	0x0000001c,0x00030037,0x00000016,0x0000001d,0x000200f8,0x0000001f,0x0004003b,0x00000007,
>+	0x00000090,0x00000007,0x0004003d,0x00000011,0x00000091,0x0000001d,0x0004007c,0x00000028,
>+	0x00000092,0x00000091,0x0004007c,0x00000006,0x00000093,0x00000092,0x0003003e,0x00000090,
>+	0x00000093,0x0004003d,0x00000006,0x00000094,0x00000090,0x000200fe,0x00000094,0x00010038,
>+	0x00050036,0x00000002,0x00000022,0x00000000,0x00000020,0x00030037,0x00000007,0x00000021,
>+	0x000200f8,0x00000023,0x00050041,0x0000009f,0x000000a0,0x0000009d,0x0000009e,0x0004003d,
>+	0x00000006,0x000000a1,0x000000a0,0x00050041,0x0000002a,0x000000a3,0x00000027,0x000000a2,
>+	0x0004003d,0x00000006,0x000000a4,0x000000a3,0x00050086,0x00000006,0x000000a5,0x000000a4,
>+	0x0000002f,0x00050080,0x00000006,0x000000a6,0x000000a1,0x000000a5,0x0004003d,0x00000006,
>+	0x000000a7,0x00000021,0x00060041,0x00000063,0x000000a8,0x0000009a,0x00000060,0x000000a6,
>+	0x0003003e,0x000000a8,0x000000a7,0x000100fd,0x00010038
>+};
>+
>+#if 0  // Generated from:
>+#version 450 core
>+
>+layout(local_size_x = 64, local_size_y = 1, local_size_z = 1)in;
>+
>+layout(set = 0, binding = 0)buffer dest
>+{
>+    uint destData[];
>+};
>+
>+layout(set = 0, binding = 1)buffer src
>+{
>+    uint srcData[];
>+};
>+
>+layout(push_constant)uniform PushConstants
>+{
>+
>+    uint outputCount;
>+
>+    uint componentCount;
>+
>+    uint srcOffset;
>+    uint destOffset;
>+
>+    uint Ns;
>+    uint Bs;
>+    uint Ss;
>+    uint Es;
>+
>+    uint Nd;
>+    uint Bd;
>+    uint Sd;
>+    uint Ed;
>+} params;
>+
>+uint getSourceComponentOffset(uint vertex, uint component)
>+{
>+    return vertex * params . Ss + component * 4 + params . srcOffset;
>+}
>+
>+uint getDestinationComponentOffset(uint vertex, uint component)
>+{
>+    return vertex * params . Sd + component * 4 + params . destOffset;
>+}
>+
>+uint getShiftBits(uint offset, uint B)
>+{
>+
>+    uint shift =(offset % 4)* 8;
>+
>+    return shift;
>+}
>+
>+      float loadSourceComponent(uint cd)
>+{
>+
>+    uint vertex = cd / params . Nd;
>+    uint component = cd % params . Nd;
>+
>+    if(component >= params . Ns)
>+    {
>+        return 0;
>+    }
>+
>+    uint offset = getSourceComponentOffset(vertex, component);
>+    uint block = srcData[offset / 4];
>+    uint shiftBits = getShiftBits(offset, 4);
>+
>+    uint valueBits = 4 * 8;
>+    uint valueMask = valueBits == 32 ? - 1 :(1 << valueBits)- 1;
>+    uint valueAsUint =(block >> shiftBits)& valueMask;
>+
>+    float divisor = 1.0f / 65536.0f;
>+          float value = int(valueAsUint)* divisor;
>+
>+    return value;
>+}
>+
>+       float convertComponent(float srcValue)
>+{
>+
>+    return srcValue;
>+}
>+
>+uint makeDestinationComponent(uint cd, float value)
>+{
>+
>+    uint valueAsUint = floatBitsToInt(value);
>+
>+    return valueAsUint;
>+}
>+
>+void storeDestinationComponents(uint valueAsUint)
>+{
>+
>+    destData[gl_GlobalInvocationID . x + params . destOffset / 4]= valueAsUint;
>+}
>+
>+void main()
>+{
>+
>+    uint valueOut = 0;
>+    for(uint i = 0;i < 1;++ i)
>+    {
>+        uint cd = gl_GlobalInvocationID . x * 1 + i;
>+
>+              float srcValue = loadSourceComponent(cd);
>+               float destValue = convertComponent(srcValue);
>+        valueOut |= makeDestinationComponent(cd, destValue);
>+    }
>+
>+    storeDestinationComponents(valueOut);
>+}
>+#endif  // Preprocessed code
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.0000000E.inc b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.0000000E.inc
>new file mode 100644
>index 00000000000..20ccfc9d167
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.0000000E.inc
>@@ -0,0 +1,305 @@
>+	// 7.11.3188
>+	 #pragma once
>+const uint32_t kConvertVertex_comp_0000000E[] = {
>+	0x07230203,0x00010000,0x00080007,0x000000d9,0x00000000,0x00020011,0x00000001,0x0006000b,
>+	0x00000001,0x4c534c47,0x6474732e,0x3035342e,0x00000000,0x0003000e,0x00000000,0x00000001,
>+	0x0006000f,0x00000005,0x00000004,0x6e69616d,0x00000000,0x00000098,0x00060010,0x00000004,
>+	0x00000011,0x00000040,0x00000001,0x00000001,0x00030003,0x00000002,0x000001c2,0x00040005,
>+	0x00000004,0x6e69616d,0x00000000,0x000a0005,0x0000000b,0x53746567,0x6372756f,0x6d6f4365,
>+	0x656e6f70,0x664f746e,0x74657366,0x3b317528,0x003b3175,0x00040005,0x00000009,0x74726576,
>+	0x00007865,0x00050005,0x0000000a,0x706d6f63,0x6e656e6f,0x00000074,0x00070005,0x0000000f,
>+	0x53746567,0x74666968,0x73746942,0x3b317528,0x003b3175,0x00040005,0x0000000d,0x7366666f,
>+	0x00007465,0x00030005,0x0000000e,0x00000042,0x00080005,0x00000014,0x64616f6c,0x72756f53,
>+	0x6f436563,0x6e6f706d,0x28746e65,0x003b3175,0x00030005,0x00000013,0x00006463,0x00080005,
>+	0x00000019,0x766e6f63,0x43747265,0x6f706d6f,0x746e656e,0x3b316628,0x00000000,0x00050005,
>+	0x00000018,0x56637273,0x65756c61,0x00000000,0x000a0005,0x0000001e,0x656b616d,0x74736544,
>+	0x74616e69,0x436e6f69,0x6f706d6f,0x746e656e,0x3b317528,0x003b3166,0x00030005,0x0000001c,
>+	0x00006463,0x00040005,0x0000001d,0x756c6176,0x00000065,0x000a0005,0x00000022,0x726f7473,
>+	0x73654465,0x616e6974,0x6e6f6974,0x706d6f43,0x6e656e6f,0x75287374,0x00003b31,0x00050005,
>+	0x00000021,0x756c6176,0x55734165,0x00746e69,0x00060005,0x00000025,0x68737550,0x736e6f43,
>+	0x746e6174,0x00000073,0x00060006,0x00000025,0x00000000,0x7074756f,0x6f437475,0x00746e75,
>+	0x00070006,0x00000025,0x00000001,0x706d6f63,0x6e656e6f,0x756f4374,0x0000746e,0x00060006,
>+	0x00000025,0x00000002,0x4f637273,0x65736666,0x00000074,0x00060006,0x00000025,0x00000003,
>+	0x74736564,0x7366664f,0x00007465,0x00040006,0x00000025,0x00000004,0x0000734e,0x00040006,
>+	0x00000025,0x00000005,0x00007342,0x00040006,0x00000025,0x00000006,0x00007353,0x00040006,
>+	0x00000025,0x00000007,0x00007345,0x00040006,0x00000025,0x00000008,0x0000644e,0x00040006,
>+	0x00000025,0x00000009,0x00006442,0x00040006,0x00000025,0x0000000a,0x00006453,0x00040006,
>+	0x00000025,0x0000000b,0x00006445,0x00040005,0x00000027,0x61726170,0x0000736d,0x00040005,
>+	0x00000038,0x66696873,0x00000074,0x00040005,0x00000040,0x74726576,0x00007865,0x00050005,
>+	0x00000046,0x706d6f63,0x6e656e6f,0x00000074,0x00040005,0x00000055,0x7366666f,0x00007465,
>+	0x00040005,0x00000056,0x61726170,0x0000006d,0x00040005,0x00000058,0x61726170,0x0000006d,
>+	0x00040005,0x0000005b,0x636f6c62,0x0000006b,0x00030005,0x0000005d,0x00637273,0x00050006,
>+	0x0000005d,0x00000000,0x44637273,0x00617461,0x00030005,0x0000005f,0x00000000,0x00050005,
>+	0x00000066,0x66696873,0x74694274,0x00000073,0x00040005,0x00000067,0x61726170,0x0000006d,
>+	0x00040005,0x00000069,0x61726170,0x0000006d,0x00050005,0x0000006b,0x756c6176,0x74694265,
>+	0x00000073,0x00050005,0x0000006d,0x756c6176,0x73614d65,0x0000006b,0x00050005,0x0000007c,
>+	0x756c6176,0x55734165,0x00746e69,0x00040005,0x00000082,0x756c6176,0x00000065,0x00050005,
>+	0x0000008b,0x756c6176,0x55734165,0x00746e69,0x00040005,0x00000093,0x74736564,0x00000000,
>+	0x00060006,0x00000093,0x00000000,0x74736564,0x61746144,0x00000000,0x00030005,0x00000095,
>+	0x00000000,0x00080005,0x00000098,0x475f6c67,0x61626f6c,0x766e496c,0x7461636f,0x496e6f69,
>+	0x00000044,0x00050005,0x000000ac,0x756c6176,0x74754f65,0x00000000,0x00030005,0x000000ad,
>+	0x00000069,0x00030005,0x000000b6,0x00006463,0x00050005,0x000000c3,0x56637273,0x65756c61,
>+	0x00000000,0x00040005,0x000000c4,0x61726170,0x0000006d,0x00050005,0x000000c7,0x74736564,
>+	0x756c6156,0x00000065,0x00040005,0x000000c8,0x61726170,0x0000006d,0x00040005,0x000000cb,
>+	0x61726170,0x0000006d,0x00040005,0x000000cd,0x61726170,0x0000006d,0x00040005,0x000000d4,
>+	0x61726170,0x0000006d,0x00050048,0x00000025,0x00000000,0x00000023,0x00000000,0x00050048,
>+	0x00000025,0x00000001,0x00000023,0x00000004,0x00050048,0x00000025,0x00000002,0x00000023,
>+	0x00000008,0x00050048,0x00000025,0x00000003,0x00000023,0x0000000c,0x00050048,0x00000025,
>+	0x00000004,0x00000023,0x00000010,0x00050048,0x00000025,0x00000005,0x00000023,0x00000014,
>+	0x00050048,0x00000025,0x00000006,0x00000023,0x00000018,0x00050048,0x00000025,0x00000007,
>+	0x00000023,0x0000001c,0x00050048,0x00000025,0x00000008,0x00000023,0x00000020,0x00050048,
>+	0x00000025,0x00000009,0x00000023,0x00000024,0x00050048,0x00000025,0x0000000a,0x00000023,
>+	0x00000028,0x00050048,0x00000025,0x0000000b,0x00000023,0x0000002c,0x00030047,0x00000025,
>+	0x00000002,0x00040047,0x0000005c,0x00000006,0x00000004,0x00050048,0x0000005d,0x00000000,
>+	0x00000023,0x00000000,0x00030047,0x0000005d,0x00000003,0x00040047,0x0000005f,0x00000022,
>+	0x00000000,0x00040047,0x0000005f,0x00000021,0x00000001,0x00040047,0x00000092,0x00000006,
>+	0x00000004,0x00050048,0x00000093,0x00000000,0x00000023,0x00000000,0x00030047,0x00000093,
>+	0x00000003,0x00040047,0x00000095,0x00000022,0x00000000,0x00040047,0x00000095,0x00000021,
>+	0x00000000,0x00040047,0x00000098,0x0000000b,0x0000001c,0x00040047,0x000000d8,0x0000000b,
>+	0x00000019,0x00020013,0x00000002,0x00030021,0x00000003,0x00000002,0x00040015,0x00000006,
>+	0x00000020,0x00000000,0x00040020,0x00000007,0x00000007,0x00000006,0x00050021,0x00000008,
>+	0x00000006,0x00000007,0x00000007,0x00030016,0x00000011,0x00000020,0x00040021,0x00000012,
>+	0x00000011,0x00000007,0x00040020,0x00000016,0x00000007,0x00000011,0x00040021,0x00000017,
>+	0x00000011,0x00000016,0x00050021,0x0000001b,0x00000006,0x00000007,0x00000016,0x00040021,
>+	0x00000020,0x00000002,0x00000007,0x000e001e,0x00000025,0x00000006,0x00000006,0x00000006,
>+	0x00000006,0x00000006,0x00000006,0x00000006,0x00000006,0x00000006,0x00000006,0x00000006,
>+	0x00000006,0x00040020,0x00000026,0x00000009,0x00000025,0x0004003b,0x00000026,0x00000027,
>+	0x00000009,0x00040015,0x00000028,0x00000020,0x00000001,0x0004002b,0x00000028,0x00000029,
>+	0x00000006,0x00040020,0x0000002a,0x00000009,0x00000006,0x0004002b,0x00000006,0x0000002f,
>+	0x00000004,0x0004002b,0x00000028,0x00000032,0x00000002,0x0004002b,0x00000006,0x0000003b,
>+	0x00000008,0x0004002b,0x00000028,0x00000042,0x00000008,0x0004002b,0x00000028,0x0000004c,
>+	0x00000004,0x00020014,0x0000004f,0x0004002b,0x00000011,0x00000053,0x00000000,0x0003001d,
>+	0x0000005c,0x00000006,0x0003001e,0x0000005d,0x0000005c,0x00040020,0x0000005e,0x00000002,
>+	0x0000005d,0x0004003b,0x0000005e,0x0000005f,0x00000002,0x0004002b,0x00000028,0x00000060,
>+	0x00000000,0x00040020,0x00000063,0x00000002,0x00000006,0x0004002b,0x00000006,0x0000006c,
>+	0x00000020,0x00040020,0x00000070,0x00000007,0x00000028,0x0004002b,0x00000028,0x00000074,
>+	0xffffffff,0x0004002b,0x00000028,0x00000076,0x00000001,0x0003001d,0x00000092,0x00000006,
>+	0x0003001e,0x00000093,0x00000092,0x00040020,0x00000094,0x00000002,0x00000093,0x0004003b,
>+	0x00000094,0x00000095,0x00000002,0x00040017,0x00000096,0x00000006,0x00000003,0x00040020,
>+	0x00000097,0x00000001,0x00000096,0x0004003b,0x00000097,0x00000098,0x00000001,0x0004002b,
>+	0x00000006,0x00000099,0x00000000,0x00040020,0x0000009a,0x00000001,0x00000006,0x0004002b,
>+	0x00000028,0x0000009d,0x00000003,0x0004002b,0x00000006,0x000000b4,0x00000001,0x0004002b,
>+	0x00000006,0x000000d7,0x00000040,0x0006002c,0x00000096,0x000000d8,0x000000d7,0x000000b4,
>+	0x000000b4,0x00050036,0x00000002,0x00000004,0x00000000,0x00000003,0x000200f8,0x00000005,
>+	0x0004003b,0x00000007,0x000000ac,0x00000007,0x0004003b,0x00000007,0x000000ad,0x00000007,
>+	0x0004003b,0x00000007,0x000000b6,0x00000007,0x0004003b,0x00000016,0x000000c3,0x00000007,
>+	0x0004003b,0x00000007,0x000000c4,0x00000007,0x0004003b,0x00000016,0x000000c7,0x00000007,
>+	0x0004003b,0x00000016,0x000000c8,0x00000007,0x0004003b,0x00000007,0x000000cb,0x00000007,
>+	0x0004003b,0x00000016,0x000000cd,0x00000007,0x0004003b,0x00000007,0x000000d4,0x00000007,
>+	0x00050041,0x0000009a,0x000000a4,0x00000098,0x00000099,0x0004003d,0x00000006,0x000000a5,
>+	0x000000a4,0x00050041,0x0000002a,0x000000a6,0x00000027,0x00000060,0x0004003d,0x00000006,
>+	0x000000a7,0x000000a6,0x000500ae,0x0000004f,0x000000a8,0x000000a5,0x000000a7,0x000300f7,
>+	0x000000aa,0x00000000,0x000400fa,0x000000a8,0x000000a9,0x000000aa,0x000200f8,0x000000a9,
>+	0x000100fd,0x000200f8,0x000000aa,0x0003003e,0x000000ac,0x00000099,0x0003003e,0x000000ad,
>+	0x00000099,0x000200f9,0x000000ae,0x000200f8,0x000000ae,0x000400f6,0x000000b0,0x000000b1,
>+	0x00000000,0x000200f9,0x000000b2,0x000200f8,0x000000b2,0x0004003d,0x00000006,0x000000b3,
>+	0x000000ad,0x000500b0,0x0000004f,0x000000b5,0x000000b3,0x000000b4,0x000400fa,0x000000b5,
>+	0x000000af,0x000000b0,0x000200f8,0x000000af,0x00050041,0x0000009a,0x000000b7,0x00000098,
>+	0x00000099,0x0004003d,0x00000006,0x000000b8,0x000000b7,0x00050084,0x00000006,0x000000b9,
>+	0x000000b8,0x000000b4,0x0004003d,0x00000006,0x000000ba,0x000000ad,0x00050080,0x00000006,
>+	0x000000bb,0x000000b9,0x000000ba,0x0003003e,0x000000b6,0x000000bb,0x0004003d,0x00000006,
>+	0x000000bc,0x000000b6,0x00050041,0x0000002a,0x000000bd,0x00000027,0x00000076,0x0004003d,
>+	0x00000006,0x000000be,0x000000bd,0x000500ae,0x0000004f,0x000000bf,0x000000bc,0x000000be,
>+	0x000300f7,0x000000c1,0x00000000,0x000400fa,0x000000bf,0x000000c0,0x000000c1,0x000200f8,
>+	0x000000c0,0x000200f9,0x000000b0,0x000200f8,0x000000c1,0x0004003d,0x00000006,0x000000c5,
>+	0x000000b6,0x0003003e,0x000000c4,0x000000c5,0x00050039,0x00000011,0x000000c6,0x00000014,
>+	0x000000c4,0x0003003e,0x000000c3,0x000000c6,0x0004003d,0x00000011,0x000000c9,0x000000c3,
>+	0x0003003e,0x000000c8,0x000000c9,0x00050039,0x00000011,0x000000ca,0x00000019,0x000000c8,
>+	0x0003003e,0x000000c7,0x000000ca,0x0004003d,0x00000006,0x000000cc,0x000000b6,0x0003003e,
>+	0x000000cb,0x000000cc,0x0004003d,0x00000011,0x000000ce,0x000000c7,0x0003003e,0x000000cd,
>+	0x000000ce,0x00060039,0x00000006,0x000000cf,0x0000001e,0x000000cb,0x000000cd,0x0004003d,
>+	0x00000006,0x000000d0,0x000000ac,0x000500c5,0x00000006,0x000000d1,0x000000d0,0x000000cf,
>+	0x0003003e,0x000000ac,0x000000d1,0x000200f9,0x000000b1,0x000200f8,0x000000b1,0x0004003d,
>+	0x00000006,0x000000d2,0x000000ad,0x00050080,0x00000006,0x000000d3,0x000000d2,0x00000076,
>+	0x0003003e,0x000000ad,0x000000d3,0x000200f9,0x000000ae,0x000200f8,0x000000b0,0x0004003d,
>+	0x00000006,0x000000d5,0x000000ac,0x0003003e,0x000000d4,0x000000d5,0x00050039,0x00000002,
>+	0x000000d6,0x00000022,0x000000d4,0x000100fd,0x00010038,0x00050036,0x00000006,0x0000000b,
>+	0x00000000,0x00000008,0x00030037,0x00000007,0x00000009,0x00030037,0x00000007,0x0000000a,
>+	0x000200f8,0x0000000c,0x0004003d,0x00000006,0x00000024,0x00000009,0x00050041,0x0000002a,
>+	0x0000002b,0x00000027,0x00000029,0x0004003d,0x00000006,0x0000002c,0x0000002b,0x00050084,
>+	0x00000006,0x0000002d,0x00000024,0x0000002c,0x0004003d,0x00000006,0x0000002e,0x0000000a,
>+	0x00050084,0x00000006,0x00000030,0x0000002e,0x0000002f,0x00050080,0x00000006,0x00000031,
>+	0x0000002d,0x00000030,0x00050041,0x0000002a,0x00000033,0x00000027,0x00000032,0x0004003d,
>+	0x00000006,0x00000034,0x00000033,0x00050080,0x00000006,0x00000035,0x00000031,0x00000034,
>+	0x000200fe,0x00000035,0x00010038,0x00050036,0x00000006,0x0000000f,0x00000000,0x00000008,
>+	0x00030037,0x00000007,0x0000000d,0x00030037,0x00000007,0x0000000e,0x000200f8,0x00000010,
>+	0x0004003b,0x00000007,0x00000038,0x00000007,0x0004003d,0x00000006,0x00000039,0x0000000d,
>+	0x00050089,0x00000006,0x0000003a,0x00000039,0x0000002f,0x00050084,0x00000006,0x0000003c,
>+	0x0000003a,0x0000003b,0x0003003e,0x00000038,0x0000003c,0x0004003d,0x00000006,0x0000003d,
>+	0x00000038,0x000200fe,0x0000003d,0x00010038,0x00050036,0x00000011,0x00000014,0x00000000,
>+	0x00000012,0x00030037,0x00000007,0x00000013,0x000200f8,0x00000015,0x0004003b,0x00000007,
>+	0x00000040,0x00000007,0x0004003b,0x00000007,0x00000046,0x00000007,0x0004003b,0x00000007,
>+	0x00000055,0x00000007,0x0004003b,0x00000007,0x00000056,0x00000007,0x0004003b,0x00000007,
>+	0x00000058,0x00000007,0x0004003b,0x00000007,0x0000005b,0x00000007,0x0004003b,0x00000007,
>+	0x00000066,0x00000007,0x0004003b,0x00000007,0x00000067,0x00000007,0x0004003b,0x00000007,
>+	0x00000069,0x00000007,0x0004003b,0x00000007,0x0000006b,0x00000007,0x0004003b,0x00000007,
>+	0x0000006d,0x00000007,0x0004003b,0x00000070,0x00000071,0x00000007,0x0004003b,0x00000007,
>+	0x0000007c,0x00000007,0x0004003b,0x00000016,0x00000082,0x00000007,0x0004003d,0x00000006,
>+	0x00000041,0x00000013,0x00050041,0x0000002a,0x00000043,0x00000027,0x00000042,0x0004003d,
>+	0x00000006,0x00000044,0x00000043,0x00050086,0x00000006,0x00000045,0x00000041,0x00000044,
>+	0x0003003e,0x00000040,0x00000045,0x0004003d,0x00000006,0x00000047,0x00000013,0x00050041,
>+	0x0000002a,0x00000048,0x00000027,0x00000042,0x0004003d,0x00000006,0x00000049,0x00000048,
>+	0x00050089,0x00000006,0x0000004a,0x00000047,0x00000049,0x0003003e,0x00000046,0x0000004a,
>+	0x0004003d,0x00000006,0x0000004b,0x00000046,0x00050041,0x0000002a,0x0000004d,0x00000027,
>+	0x0000004c,0x0004003d,0x00000006,0x0000004e,0x0000004d,0x000500ae,0x0000004f,0x00000050,
>+	0x0000004b,0x0000004e,0x000300f7,0x00000052,0x00000000,0x000400fa,0x00000050,0x00000051,
>+	0x00000052,0x000200f8,0x00000051,0x000200fe,0x00000053,0x000200f8,0x00000052,0x0004003d,
>+	0x00000006,0x00000057,0x00000040,0x0003003e,0x00000056,0x00000057,0x0004003d,0x00000006,
>+	0x00000059,0x00000046,0x0003003e,0x00000058,0x00000059,0x00060039,0x00000006,0x0000005a,
>+	0x0000000b,0x00000056,0x00000058,0x0003003e,0x00000055,0x0000005a,0x0004003d,0x00000006,
>+	0x00000061,0x00000055,0x00050086,0x00000006,0x00000062,0x00000061,0x0000002f,0x00060041,
>+	0x00000063,0x00000064,0x0000005f,0x00000060,0x00000062,0x0004003d,0x00000006,0x00000065,
>+	0x00000064,0x0003003e,0x0000005b,0x00000065,0x0004003d,0x00000006,0x00000068,0x00000055,
>+	0x0003003e,0x00000067,0x00000068,0x0003003e,0x00000069,0x0000002f,0x00060039,0x00000006,
>+	0x0000006a,0x0000000f,0x00000067,0x00000069,0x0003003e,0x00000066,0x0000006a,0x0003003e,
>+	0x0000006b,0x0000006c,0x0004003d,0x00000006,0x0000006e,0x0000006b,0x000500aa,0x0000004f,
>+	0x0000006f,0x0000006e,0x0000006c,0x000300f7,0x00000073,0x00000000,0x000400fa,0x0000006f,
>+	0x00000072,0x00000075,0x000200f8,0x00000072,0x0003003e,0x00000071,0x00000074,0x000200f9,
>+	0x00000073,0x000200f8,0x00000075,0x0004003d,0x00000006,0x00000077,0x0000006b,0x000500c4,
>+	0x00000028,0x00000078,0x00000076,0x00000077,0x00050082,0x00000028,0x00000079,0x00000078,
>+	0x00000076,0x0003003e,0x00000071,0x00000079,0x000200f9,0x00000073,0x000200f8,0x00000073,
>+	0x0004003d,0x00000028,0x0000007a,0x00000071,0x0004007c,0x00000006,0x0000007b,0x0000007a,
>+	0x0003003e,0x0000006d,0x0000007b,0x0004003d,0x00000006,0x0000007d,0x0000005b,0x0004003d,
>+	0x00000006,0x0000007e,0x00000066,0x000500c2,0x00000006,0x0000007f,0x0000007d,0x0000007e,
>+	0x0004003d,0x00000006,0x00000080,0x0000006d,0x000500c7,0x00000006,0x00000081,0x0000007f,
>+	0x00000080,0x0003003e,0x0000007c,0x00000081,0x0004003d,0x00000006,0x00000083,0x0000007c,
>+	0x0004007c,0x00000011,0x00000084,0x00000083,0x0003003e,0x00000082,0x00000084,0x0004003d,
>+	0x00000011,0x00000085,0x00000082,0x000200fe,0x00000085,0x00010038,0x00050036,0x00000011,
>+	0x00000019,0x00000000,0x00000017,0x00030037,0x00000016,0x00000018,0x000200f8,0x0000001a,
>+	0x0004003d,0x00000011,0x00000088,0x00000018,0x000200fe,0x00000088,0x00010038,0x00050036,
>+	0x00000006,0x0000001e,0x00000000,0x0000001b,0x00030037,0x00000007,0x0000001c,0x00030037,
>+	0x00000016,0x0000001d,0x000200f8,0x0000001f,0x0004003b,0x00000007,0x0000008b,0x00000007,
>+	0x0004003d,0x00000011,0x0000008c,0x0000001d,0x0004007c,0x00000028,0x0000008d,0x0000008c,
>+	0x0004007c,0x00000006,0x0000008e,0x0000008d,0x0003003e,0x0000008b,0x0000008e,0x0004003d,
>+	0x00000006,0x0000008f,0x0000008b,0x000200fe,0x0000008f,0x00010038,0x00050036,0x00000002,
>+	0x00000022,0x00000000,0x00000020,0x00030037,0x00000007,0x00000021,0x000200f8,0x00000023,
>+	0x00050041,0x0000009a,0x0000009b,0x00000098,0x00000099,0x0004003d,0x00000006,0x0000009c,
>+	0x0000009b,0x00050041,0x0000002a,0x0000009e,0x00000027,0x0000009d,0x0004003d,0x00000006,
>+	0x0000009f,0x0000009e,0x00050086,0x00000006,0x000000a0,0x0000009f,0x0000002f,0x00050080,
>+	0x00000006,0x000000a1,0x0000009c,0x000000a0,0x0004003d,0x00000006,0x000000a2,0x00000021,
>+	0x00060041,0x00000063,0x000000a3,0x00000095,0x00000060,0x000000a1,0x0003003e,0x000000a3,
>+	0x000000a2,0x000100fd,0x00010038
>+};
>+
>+#if 0  // Generated from:
>+#version 450 core
>+
>+layout(local_size_x = 64, local_size_y = 1, local_size_z = 1)in;
>+
>+layout(set = 0, binding = 0)buffer dest
>+{
>+    uint destData[];
>+};
>+
>+layout(set = 0, binding = 1)buffer src
>+{
>+    uint srcData[];
>+};
>+
>+layout(push_constant)uniform PushConstants
>+{
>+
>+    uint outputCount;
>+
>+    uint componentCount;
>+
>+    uint srcOffset;
>+    uint destOffset;
>+
>+    uint Ns;
>+    uint Bs;
>+    uint Ss;
>+    uint Es;
>+
>+    uint Nd;
>+    uint Bd;
>+    uint Sd;
>+    uint Ed;
>+} params;
>+
>+uint getSourceComponentOffset(uint vertex, uint component)
>+{
>+    return vertex * params . Ss + component * 4 + params . srcOffset;
>+}
>+
>+uint getDestinationComponentOffset(uint vertex, uint component)
>+{
>+    return vertex * params . Sd + component * 4 + params . destOffset;
>+}
>+
>+uint getShiftBits(uint offset, uint B)
>+{
>+
>+    uint shift =(offset % 4)* 8;
>+
>+    return shift;
>+}
>+
>+      float loadSourceComponent(uint cd)
>+{
>+
>+    uint vertex = cd / params . Nd;
>+    uint component = cd % params . Nd;
>+
>+    if(component >= params . Ns)
>+    {
>+        return 0;
>+    }
>+
>+    uint offset = getSourceComponentOffset(vertex, component);
>+    uint block = srcData[offset / 4];
>+    uint shiftBits = getShiftBits(offset, 4);
>+
>+    uint valueBits = 4 * 8;
>+    uint valueMask = valueBits == 32 ? - 1 :(1 << valueBits)- 1;
>+    uint valueAsUint =(block >> shiftBits)& valueMask;
>+
>+          float value = uintBitsToFloat(valueAsUint);
>+
>+    return value;
>+}
>+
>+       float convertComponent(float srcValue)
>+{
>+
>+    return srcValue;
>+}
>+
>+uint makeDestinationComponent(uint cd, float value)
>+{
>+
>+    uint valueAsUint = floatBitsToInt(value);
>+
>+    return valueAsUint;
>+}
>+
>+void storeDestinationComponents(uint valueAsUint)
>+{
>+
>+    destData[gl_GlobalInvocationID . x + params . destOffset / 4]= valueAsUint;
>+}
>+
>+void main()
>+{
>+
>+    if(gl_GlobalInvocationID . x >= params . outputCount)
>+        return;
>+
>+    uint valueOut = 0;
>+    for(uint i = 0;i < 1;++ i)
>+    {
>+        uint cd = gl_GlobalInvocationID . x * 1 + i;
>+
>+        if(cd >= params . componentCount)
>+        {
>+            break;
>+        }
>+
>+              float srcValue = loadSourceComponent(cd);
>+               float destValue = convertComponent(srcValue);
>+        valueOut |= makeDestinationComponent(cd, destValue);
>+    }
>+
>+    storeDestinationComponents(valueOut);
>+}
>+#endif  // Preprocessed code
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.0000000F.inc b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.0000000F.inc
>new file mode 100644
>index 00000000000..774bc795d83
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.0000000F.inc
>@@ -0,0 +1,289 @@
>+	// 7.11.3188
>+	 #pragma once
>+const uint32_t kConvertVertex_comp_0000000F[] = {
>+	0x07230203,0x00010000,0x00080007,0x000000ca,0x00000000,0x00020011,0x00000001,0x0006000b,
>+	0x00000001,0x4c534c47,0x6474732e,0x3035342e,0x00000000,0x0003000e,0x00000000,0x00000001,
>+	0x0006000f,0x00000005,0x00000004,0x6e69616d,0x00000000,0x00000098,0x00060010,0x00000004,
>+	0x00000011,0x00000040,0x00000001,0x00000001,0x00030003,0x00000002,0x000001c2,0x00040005,
>+	0x00000004,0x6e69616d,0x00000000,0x000a0005,0x0000000b,0x53746567,0x6372756f,0x6d6f4365,
>+	0x656e6f70,0x664f746e,0x74657366,0x3b317528,0x003b3175,0x00040005,0x00000009,0x74726576,
>+	0x00007865,0x00050005,0x0000000a,0x706d6f63,0x6e656e6f,0x00000074,0x00070005,0x0000000f,
>+	0x53746567,0x74666968,0x73746942,0x3b317528,0x003b3175,0x00040005,0x0000000d,0x7366666f,
>+	0x00007465,0x00030005,0x0000000e,0x00000042,0x00080005,0x00000014,0x64616f6c,0x72756f53,
>+	0x6f436563,0x6e6f706d,0x28746e65,0x003b3175,0x00030005,0x00000013,0x00006463,0x00080005,
>+	0x00000019,0x766e6f63,0x43747265,0x6f706d6f,0x746e656e,0x3b316628,0x00000000,0x00050005,
>+	0x00000018,0x56637273,0x65756c61,0x00000000,0x000a0005,0x0000001e,0x656b616d,0x74736544,
>+	0x74616e69,0x436e6f69,0x6f706d6f,0x746e656e,0x3b317528,0x003b3166,0x00030005,0x0000001c,
>+	0x00006463,0x00040005,0x0000001d,0x756c6176,0x00000065,0x000a0005,0x00000022,0x726f7473,
>+	0x73654465,0x616e6974,0x6e6f6974,0x706d6f43,0x6e656e6f,0x75287374,0x00003b31,0x00050005,
>+	0x00000021,0x756c6176,0x55734165,0x00746e69,0x00060005,0x00000025,0x68737550,0x736e6f43,
>+	0x746e6174,0x00000073,0x00060006,0x00000025,0x00000000,0x7074756f,0x6f437475,0x00746e75,
>+	0x00070006,0x00000025,0x00000001,0x706d6f63,0x6e656e6f,0x756f4374,0x0000746e,0x00060006,
>+	0x00000025,0x00000002,0x4f637273,0x65736666,0x00000074,0x00060006,0x00000025,0x00000003,
>+	0x74736564,0x7366664f,0x00007465,0x00040006,0x00000025,0x00000004,0x0000734e,0x00040006,
>+	0x00000025,0x00000005,0x00007342,0x00040006,0x00000025,0x00000006,0x00007353,0x00040006,
>+	0x00000025,0x00000007,0x00007345,0x00040006,0x00000025,0x00000008,0x0000644e,0x00040006,
>+	0x00000025,0x00000009,0x00006442,0x00040006,0x00000025,0x0000000a,0x00006453,0x00040006,
>+	0x00000025,0x0000000b,0x00006445,0x00040005,0x00000027,0x61726170,0x0000736d,0x00040005,
>+	0x00000038,0x66696873,0x00000074,0x00040005,0x00000040,0x74726576,0x00007865,0x00050005,
>+	0x00000046,0x706d6f63,0x6e656e6f,0x00000074,0x00040005,0x00000055,0x7366666f,0x00007465,
>+	0x00040005,0x00000056,0x61726170,0x0000006d,0x00040005,0x00000058,0x61726170,0x0000006d,
>+	0x00040005,0x0000005b,0x636f6c62,0x0000006b,0x00030005,0x0000005d,0x00637273,0x00050006,
>+	0x0000005d,0x00000000,0x44637273,0x00617461,0x00030005,0x0000005f,0x00000000,0x00050005,
>+	0x00000066,0x66696873,0x74694274,0x00000073,0x00040005,0x00000067,0x61726170,0x0000006d,
>+	0x00040005,0x00000069,0x61726170,0x0000006d,0x00050005,0x0000006b,0x756c6176,0x74694265,
>+	0x00000073,0x00050005,0x0000006d,0x756c6176,0x73614d65,0x0000006b,0x00050005,0x0000007c,
>+	0x756c6176,0x55734165,0x00746e69,0x00040005,0x00000082,0x756c6176,0x00000065,0x00050005,
>+	0x0000008b,0x756c6176,0x55734165,0x00746e69,0x00040005,0x00000093,0x74736564,0x00000000,
>+	0x00060006,0x00000093,0x00000000,0x74736564,0x61746144,0x00000000,0x00030005,0x00000095,
>+	0x00000000,0x00080005,0x00000098,0x475f6c67,0x61626f6c,0x766e496c,0x7461636f,0x496e6f69,
>+	0x00000044,0x00050005,0x000000a4,0x756c6176,0x74754f65,0x00000000,0x00030005,0x000000a5,
>+	0x00000069,0x00030005,0x000000ae,0x00006463,0x00050005,0x000000b4,0x56637273,0x65756c61,
>+	0x00000000,0x00040005,0x000000b5,0x61726170,0x0000006d,0x00050005,0x000000b8,0x74736564,
>+	0x756c6156,0x00000065,0x00040005,0x000000b9,0x61726170,0x0000006d,0x00040005,0x000000bc,
>+	0x61726170,0x0000006d,0x00040005,0x000000be,0x61726170,0x0000006d,0x00040005,0x000000c5,
>+	0x61726170,0x0000006d,0x00050048,0x00000025,0x00000000,0x00000023,0x00000000,0x00050048,
>+	0x00000025,0x00000001,0x00000023,0x00000004,0x00050048,0x00000025,0x00000002,0x00000023,
>+	0x00000008,0x00050048,0x00000025,0x00000003,0x00000023,0x0000000c,0x00050048,0x00000025,
>+	0x00000004,0x00000023,0x00000010,0x00050048,0x00000025,0x00000005,0x00000023,0x00000014,
>+	0x00050048,0x00000025,0x00000006,0x00000023,0x00000018,0x00050048,0x00000025,0x00000007,
>+	0x00000023,0x0000001c,0x00050048,0x00000025,0x00000008,0x00000023,0x00000020,0x00050048,
>+	0x00000025,0x00000009,0x00000023,0x00000024,0x00050048,0x00000025,0x0000000a,0x00000023,
>+	0x00000028,0x00050048,0x00000025,0x0000000b,0x00000023,0x0000002c,0x00030047,0x00000025,
>+	0x00000002,0x00040047,0x0000005c,0x00000006,0x00000004,0x00050048,0x0000005d,0x00000000,
>+	0x00000023,0x00000000,0x00030047,0x0000005d,0x00000003,0x00040047,0x0000005f,0x00000022,
>+	0x00000000,0x00040047,0x0000005f,0x00000021,0x00000001,0x00040047,0x00000092,0x00000006,
>+	0x00000004,0x00050048,0x00000093,0x00000000,0x00000023,0x00000000,0x00030047,0x00000093,
>+	0x00000003,0x00040047,0x00000095,0x00000022,0x00000000,0x00040047,0x00000095,0x00000021,
>+	0x00000000,0x00040047,0x00000098,0x0000000b,0x0000001c,0x00040047,0x000000c9,0x0000000b,
>+	0x00000019,0x00020013,0x00000002,0x00030021,0x00000003,0x00000002,0x00040015,0x00000006,
>+	0x00000020,0x00000000,0x00040020,0x00000007,0x00000007,0x00000006,0x00050021,0x00000008,
>+	0x00000006,0x00000007,0x00000007,0x00030016,0x00000011,0x00000020,0x00040021,0x00000012,
>+	0x00000011,0x00000007,0x00040020,0x00000016,0x00000007,0x00000011,0x00040021,0x00000017,
>+	0x00000011,0x00000016,0x00050021,0x0000001b,0x00000006,0x00000007,0x00000016,0x00040021,
>+	0x00000020,0x00000002,0x00000007,0x000e001e,0x00000025,0x00000006,0x00000006,0x00000006,
>+	0x00000006,0x00000006,0x00000006,0x00000006,0x00000006,0x00000006,0x00000006,0x00000006,
>+	0x00000006,0x00040020,0x00000026,0x00000009,0x00000025,0x0004003b,0x00000026,0x00000027,
>+	0x00000009,0x00040015,0x00000028,0x00000020,0x00000001,0x0004002b,0x00000028,0x00000029,
>+	0x00000006,0x00040020,0x0000002a,0x00000009,0x00000006,0x0004002b,0x00000006,0x0000002f,
>+	0x00000004,0x0004002b,0x00000028,0x00000032,0x00000002,0x0004002b,0x00000006,0x0000003b,
>+	0x00000008,0x0004002b,0x00000028,0x00000042,0x00000008,0x0004002b,0x00000028,0x0000004c,
>+	0x00000004,0x00020014,0x0000004f,0x0004002b,0x00000011,0x00000053,0x00000000,0x0003001d,
>+	0x0000005c,0x00000006,0x0003001e,0x0000005d,0x0000005c,0x00040020,0x0000005e,0x00000002,
>+	0x0000005d,0x0004003b,0x0000005e,0x0000005f,0x00000002,0x0004002b,0x00000028,0x00000060,
>+	0x00000000,0x00040020,0x00000063,0x00000002,0x00000006,0x0004002b,0x00000006,0x0000006c,
>+	0x00000020,0x00040020,0x00000070,0x00000007,0x00000028,0x0004002b,0x00000028,0x00000074,
>+	0xffffffff,0x0004002b,0x00000028,0x00000076,0x00000001,0x0003001d,0x00000092,0x00000006,
>+	0x0003001e,0x00000093,0x00000092,0x00040020,0x00000094,0x00000002,0x00000093,0x0004003b,
>+	0x00000094,0x00000095,0x00000002,0x00040017,0x00000096,0x00000006,0x00000003,0x00040020,
>+	0x00000097,0x00000001,0x00000096,0x0004003b,0x00000097,0x00000098,0x00000001,0x0004002b,
>+	0x00000006,0x00000099,0x00000000,0x00040020,0x0000009a,0x00000001,0x00000006,0x0004002b,
>+	0x00000028,0x0000009d,0x00000003,0x0004002b,0x00000006,0x000000ac,0x00000001,0x0004002b,
>+	0x00000006,0x000000c8,0x00000040,0x0006002c,0x00000096,0x000000c9,0x000000c8,0x000000ac,
>+	0x000000ac,0x00050036,0x00000002,0x00000004,0x00000000,0x00000003,0x000200f8,0x00000005,
>+	0x0004003b,0x00000007,0x000000a4,0x00000007,0x0004003b,0x00000007,0x000000a5,0x00000007,
>+	0x0004003b,0x00000007,0x000000ae,0x00000007,0x0004003b,0x00000016,0x000000b4,0x00000007,
>+	0x0004003b,0x00000007,0x000000b5,0x00000007,0x0004003b,0x00000016,0x000000b8,0x00000007,
>+	0x0004003b,0x00000016,0x000000b9,0x00000007,0x0004003b,0x00000007,0x000000bc,0x00000007,
>+	0x0004003b,0x00000016,0x000000be,0x00000007,0x0004003b,0x00000007,0x000000c5,0x00000007,
>+	0x0003003e,0x000000a4,0x00000099,0x0003003e,0x000000a5,0x00000099,0x000200f9,0x000000a6,
>+	0x000200f8,0x000000a6,0x000400f6,0x000000a8,0x000000a9,0x00000000,0x000200f9,0x000000aa,
>+	0x000200f8,0x000000aa,0x0004003d,0x00000006,0x000000ab,0x000000a5,0x000500b0,0x0000004f,
>+	0x000000ad,0x000000ab,0x000000ac,0x000400fa,0x000000ad,0x000000a7,0x000000a8,0x000200f8,
>+	0x000000a7,0x00050041,0x0000009a,0x000000af,0x00000098,0x00000099,0x0004003d,0x00000006,
>+	0x000000b0,0x000000af,0x00050084,0x00000006,0x000000b1,0x000000b0,0x000000ac,0x0004003d,
>+	0x00000006,0x000000b2,0x000000a5,0x00050080,0x00000006,0x000000b3,0x000000b1,0x000000b2,
>+	0x0003003e,0x000000ae,0x000000b3,0x0004003d,0x00000006,0x000000b6,0x000000ae,0x0003003e,
>+	0x000000b5,0x000000b6,0x00050039,0x00000011,0x000000b7,0x00000014,0x000000b5,0x0003003e,
>+	0x000000b4,0x000000b7,0x0004003d,0x00000011,0x000000ba,0x000000b4,0x0003003e,0x000000b9,
>+	0x000000ba,0x00050039,0x00000011,0x000000bb,0x00000019,0x000000b9,0x0003003e,0x000000b8,
>+	0x000000bb,0x0004003d,0x00000006,0x000000bd,0x000000ae,0x0003003e,0x000000bc,0x000000bd,
>+	0x0004003d,0x00000011,0x000000bf,0x000000b8,0x0003003e,0x000000be,0x000000bf,0x00060039,
>+	0x00000006,0x000000c0,0x0000001e,0x000000bc,0x000000be,0x0004003d,0x00000006,0x000000c1,
>+	0x000000a4,0x000500c5,0x00000006,0x000000c2,0x000000c1,0x000000c0,0x0003003e,0x000000a4,
>+	0x000000c2,0x000200f9,0x000000a9,0x000200f8,0x000000a9,0x0004003d,0x00000006,0x000000c3,
>+	0x000000a5,0x00050080,0x00000006,0x000000c4,0x000000c3,0x00000076,0x0003003e,0x000000a5,
>+	0x000000c4,0x000200f9,0x000000a6,0x000200f8,0x000000a8,0x0004003d,0x00000006,0x000000c6,
>+	0x000000a4,0x0003003e,0x000000c5,0x000000c6,0x00050039,0x00000002,0x000000c7,0x00000022,
>+	0x000000c5,0x000100fd,0x00010038,0x00050036,0x00000006,0x0000000b,0x00000000,0x00000008,
>+	0x00030037,0x00000007,0x00000009,0x00030037,0x00000007,0x0000000a,0x000200f8,0x0000000c,
>+	0x0004003d,0x00000006,0x00000024,0x00000009,0x00050041,0x0000002a,0x0000002b,0x00000027,
>+	0x00000029,0x0004003d,0x00000006,0x0000002c,0x0000002b,0x00050084,0x00000006,0x0000002d,
>+	0x00000024,0x0000002c,0x0004003d,0x00000006,0x0000002e,0x0000000a,0x00050084,0x00000006,
>+	0x00000030,0x0000002e,0x0000002f,0x00050080,0x00000006,0x00000031,0x0000002d,0x00000030,
>+	0x00050041,0x0000002a,0x00000033,0x00000027,0x00000032,0x0004003d,0x00000006,0x00000034,
>+	0x00000033,0x00050080,0x00000006,0x00000035,0x00000031,0x00000034,0x000200fe,0x00000035,
>+	0x00010038,0x00050036,0x00000006,0x0000000f,0x00000000,0x00000008,0x00030037,0x00000007,
>+	0x0000000d,0x00030037,0x00000007,0x0000000e,0x000200f8,0x00000010,0x0004003b,0x00000007,
>+	0x00000038,0x00000007,0x0004003d,0x00000006,0x00000039,0x0000000d,0x00050089,0x00000006,
>+	0x0000003a,0x00000039,0x0000002f,0x00050084,0x00000006,0x0000003c,0x0000003a,0x0000003b,
>+	0x0003003e,0x00000038,0x0000003c,0x0004003d,0x00000006,0x0000003d,0x00000038,0x000200fe,
>+	0x0000003d,0x00010038,0x00050036,0x00000011,0x00000014,0x00000000,0x00000012,0x00030037,
>+	0x00000007,0x00000013,0x000200f8,0x00000015,0x0004003b,0x00000007,0x00000040,0x00000007,
>+	0x0004003b,0x00000007,0x00000046,0x00000007,0x0004003b,0x00000007,0x00000055,0x00000007,
>+	0x0004003b,0x00000007,0x00000056,0x00000007,0x0004003b,0x00000007,0x00000058,0x00000007,
>+	0x0004003b,0x00000007,0x0000005b,0x00000007,0x0004003b,0x00000007,0x00000066,0x00000007,
>+	0x0004003b,0x00000007,0x00000067,0x00000007,0x0004003b,0x00000007,0x00000069,0x00000007,
>+	0x0004003b,0x00000007,0x0000006b,0x00000007,0x0004003b,0x00000007,0x0000006d,0x00000007,
>+	0x0004003b,0x00000070,0x00000071,0x00000007,0x0004003b,0x00000007,0x0000007c,0x00000007,
>+	0x0004003b,0x00000016,0x00000082,0x00000007,0x0004003d,0x00000006,0x00000041,0x00000013,
>+	0x00050041,0x0000002a,0x00000043,0x00000027,0x00000042,0x0004003d,0x00000006,0x00000044,
>+	0x00000043,0x00050086,0x00000006,0x00000045,0x00000041,0x00000044,0x0003003e,0x00000040,
>+	0x00000045,0x0004003d,0x00000006,0x00000047,0x00000013,0x00050041,0x0000002a,0x00000048,
>+	0x00000027,0x00000042,0x0004003d,0x00000006,0x00000049,0x00000048,0x00050089,0x00000006,
>+	0x0000004a,0x00000047,0x00000049,0x0003003e,0x00000046,0x0000004a,0x0004003d,0x00000006,
>+	0x0000004b,0x00000046,0x00050041,0x0000002a,0x0000004d,0x00000027,0x0000004c,0x0004003d,
>+	0x00000006,0x0000004e,0x0000004d,0x000500ae,0x0000004f,0x00000050,0x0000004b,0x0000004e,
>+	0x000300f7,0x00000052,0x00000000,0x000400fa,0x00000050,0x00000051,0x00000052,0x000200f8,
>+	0x00000051,0x000200fe,0x00000053,0x000200f8,0x00000052,0x0004003d,0x00000006,0x00000057,
>+	0x00000040,0x0003003e,0x00000056,0x00000057,0x0004003d,0x00000006,0x00000059,0x00000046,
>+	0x0003003e,0x00000058,0x00000059,0x00060039,0x00000006,0x0000005a,0x0000000b,0x00000056,
>+	0x00000058,0x0003003e,0x00000055,0x0000005a,0x0004003d,0x00000006,0x00000061,0x00000055,
>+	0x00050086,0x00000006,0x00000062,0x00000061,0x0000002f,0x00060041,0x00000063,0x00000064,
>+	0x0000005f,0x00000060,0x00000062,0x0004003d,0x00000006,0x00000065,0x00000064,0x0003003e,
>+	0x0000005b,0x00000065,0x0004003d,0x00000006,0x00000068,0x00000055,0x0003003e,0x00000067,
>+	0x00000068,0x0003003e,0x00000069,0x0000002f,0x00060039,0x00000006,0x0000006a,0x0000000f,
>+	0x00000067,0x00000069,0x0003003e,0x00000066,0x0000006a,0x0003003e,0x0000006b,0x0000006c,
>+	0x0004003d,0x00000006,0x0000006e,0x0000006b,0x000500aa,0x0000004f,0x0000006f,0x0000006e,
>+	0x0000006c,0x000300f7,0x00000073,0x00000000,0x000400fa,0x0000006f,0x00000072,0x00000075,
>+	0x000200f8,0x00000072,0x0003003e,0x00000071,0x00000074,0x000200f9,0x00000073,0x000200f8,
>+	0x00000075,0x0004003d,0x00000006,0x00000077,0x0000006b,0x000500c4,0x00000028,0x00000078,
>+	0x00000076,0x00000077,0x00050082,0x00000028,0x00000079,0x00000078,0x00000076,0x0003003e,
>+	0x00000071,0x00000079,0x000200f9,0x00000073,0x000200f8,0x00000073,0x0004003d,0x00000028,
>+	0x0000007a,0x00000071,0x0004007c,0x00000006,0x0000007b,0x0000007a,0x0003003e,0x0000006d,
>+	0x0000007b,0x0004003d,0x00000006,0x0000007d,0x0000005b,0x0004003d,0x00000006,0x0000007e,
>+	0x00000066,0x000500c2,0x00000006,0x0000007f,0x0000007d,0x0000007e,0x0004003d,0x00000006,
>+	0x00000080,0x0000006d,0x000500c7,0x00000006,0x00000081,0x0000007f,0x00000080,0x0003003e,
>+	0x0000007c,0x00000081,0x0004003d,0x00000006,0x00000083,0x0000007c,0x0004007c,0x00000011,
>+	0x00000084,0x00000083,0x0003003e,0x00000082,0x00000084,0x0004003d,0x00000011,0x00000085,
>+	0x00000082,0x000200fe,0x00000085,0x00010038,0x00050036,0x00000011,0x00000019,0x00000000,
>+	0x00000017,0x00030037,0x00000016,0x00000018,0x000200f8,0x0000001a,0x0004003d,0x00000011,
>+	0x00000088,0x00000018,0x000200fe,0x00000088,0x00010038,0x00050036,0x00000006,0x0000001e,
>+	0x00000000,0x0000001b,0x00030037,0x00000007,0x0000001c,0x00030037,0x00000016,0x0000001d,
>+	0x000200f8,0x0000001f,0x0004003b,0x00000007,0x0000008b,0x00000007,0x0004003d,0x00000011,
>+	0x0000008c,0x0000001d,0x0004007c,0x00000028,0x0000008d,0x0000008c,0x0004007c,0x00000006,
>+	0x0000008e,0x0000008d,0x0003003e,0x0000008b,0x0000008e,0x0004003d,0x00000006,0x0000008f,
>+	0x0000008b,0x000200fe,0x0000008f,0x00010038,0x00050036,0x00000002,0x00000022,0x00000000,
>+	0x00000020,0x00030037,0x00000007,0x00000021,0x000200f8,0x00000023,0x00050041,0x0000009a,
>+	0x0000009b,0x00000098,0x00000099,0x0004003d,0x00000006,0x0000009c,0x0000009b,0x00050041,
>+	0x0000002a,0x0000009e,0x00000027,0x0000009d,0x0004003d,0x00000006,0x0000009f,0x0000009e,
>+	0x00050086,0x00000006,0x000000a0,0x0000009f,0x0000002f,0x00050080,0x00000006,0x000000a1,
>+	0x0000009c,0x000000a0,0x0004003d,0x00000006,0x000000a2,0x00000021,0x00060041,0x00000063,
>+	0x000000a3,0x00000095,0x00000060,0x000000a1,0x0003003e,0x000000a3,0x000000a2,0x000100fd,
>+	0x00010038
>+};
>+
>+#if 0  // Generated from:
>+#version 450 core
>+
>+layout(local_size_x = 64, local_size_y = 1, local_size_z = 1)in;
>+
>+layout(set = 0, binding = 0)buffer dest
>+{
>+    uint destData[];
>+};
>+
>+layout(set = 0, binding = 1)buffer src
>+{
>+    uint srcData[];
>+};
>+
>+layout(push_constant)uniform PushConstants
>+{
>+
>+    uint outputCount;
>+
>+    uint componentCount;
>+
>+    uint srcOffset;
>+    uint destOffset;
>+
>+    uint Ns;
>+    uint Bs;
>+    uint Ss;
>+    uint Es;
>+
>+    uint Nd;
>+    uint Bd;
>+    uint Sd;
>+    uint Ed;
>+} params;
>+
>+uint getSourceComponentOffset(uint vertex, uint component)
>+{
>+    return vertex * params . Ss + component * 4 + params . srcOffset;
>+}
>+
>+uint getDestinationComponentOffset(uint vertex, uint component)
>+{
>+    return vertex * params . Sd + component * 4 + params . destOffset;
>+}
>+
>+uint getShiftBits(uint offset, uint B)
>+{
>+
>+    uint shift =(offset % 4)* 8;
>+
>+    return shift;
>+}
>+
>+      float loadSourceComponent(uint cd)
>+{
>+
>+    uint vertex = cd / params . Nd;
>+    uint component = cd % params . Nd;
>+
>+    if(component >= params . Ns)
>+    {
>+        return 0;
>+    }
>+
>+    uint offset = getSourceComponentOffset(vertex, component);
>+    uint block = srcData[offset / 4];
>+    uint shiftBits = getShiftBits(offset, 4);
>+
>+    uint valueBits = 4 * 8;
>+    uint valueMask = valueBits == 32 ? - 1 :(1 << valueBits)- 1;
>+    uint valueAsUint =(block >> shiftBits)& valueMask;
>+
>+          float value = uintBitsToFloat(valueAsUint);
>+
>+    return value;
>+}
>+
>+       float convertComponent(float srcValue)
>+{
>+
>+    return srcValue;
>+}
>+
>+uint makeDestinationComponent(uint cd, float value)
>+{
>+
>+    uint valueAsUint = floatBitsToInt(value);
>+
>+    return valueAsUint;
>+}
>+
>+void storeDestinationComponents(uint valueAsUint)
>+{
>+
>+    destData[gl_GlobalInvocationID . x + params . destOffset / 4]= valueAsUint;
>+}
>+
>+void main()
>+{
>+
>+    uint valueOut = 0;
>+    for(uint i = 0;i < 1;++ i)
>+    {
>+        uint cd = gl_GlobalInvocationID . x * 1 + i;
>+
>+              float srcValue = loadSourceComponent(cd);
>+               float destValue = convertComponent(srcValue);
>+        valueOut |= makeDestinationComponent(cd, destValue);
>+    }
>+
>+    storeDestinationComponents(valueOut);
>+}
>+#endif  // Preprocessed code
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/gen/FullScreenQuad.vert.00000000.inc b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/gen/FullScreenQuad.vert.00000000.inc
>new file mode 100644
>index 00000000000..7338fb2763d
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/gen/FullScreenQuad.vert.00000000.inc
>@@ -0,0 +1,57 @@
>+	// 7.11.3188
>+	 #pragma once
>+const uint32_t kFullScreenQuad_vert_00000000[] = {
>+	0x07230203,0x00010000,0x00080007,0x00000028,0x00000000,0x00020011,0x00000001,0x0006000b,
>+	0x00000001,0x4c534c47,0x6474732e,0x3035342e,0x00000000,0x0003000e,0x00000000,0x00000001,
>+	0x0007000f,0x00000000,0x00000004,0x6e69616d,0x00000000,0x0000000d,0x0000001b,0x00030003,
>+	0x00000002,0x000001c2,0x00040005,0x00000004,0x6e69616d,0x00000000,0x00060005,0x0000000b,
>+	0x505f6c67,0x65567265,0x78657472,0x00000000,0x00060006,0x0000000b,0x00000000,0x505f6c67,
>+	0x7469736f,0x006e6f69,0x00070006,0x0000000b,0x00000001,0x505f6c67,0x746e696f,0x657a6953,
>+	0x00000000,0x00070006,0x0000000b,0x00000002,0x435f6c67,0x4470696c,0x61747369,0x0065636e,
>+	0x00070006,0x0000000b,0x00000003,0x435f6c67,0x446c6c75,0x61747369,0x0065636e,0x00030005,
>+	0x0000000d,0x00000000,0x00060005,0x0000001b,0x565f6c67,0x65747265,0x646e4978,0x00007865,
>+	0x00050005,0x0000001e,0x65646e69,0x6c626178,0x00000065,0x00050048,0x0000000b,0x00000000,
>+	0x0000000b,0x00000000,0x00050048,0x0000000b,0x00000001,0x0000000b,0x00000001,0x00050048,
>+	0x0000000b,0x00000002,0x0000000b,0x00000003,0x00050048,0x0000000b,0x00000003,0x0000000b,
>+	0x00000004,0x00030047,0x0000000b,0x00000002,0x00040047,0x0000001b,0x0000000b,0x0000002a,
>+	0x00020013,0x00000002,0x00030021,0x00000003,0x00000002,0x00030016,0x00000006,0x00000020,
>+	0x00040017,0x00000007,0x00000006,0x00000004,0x00040015,0x00000008,0x00000020,0x00000000,
>+	0x0004002b,0x00000008,0x00000009,0x00000001,0x0004001c,0x0000000a,0x00000006,0x00000009,
>+	0x0006001e,0x0000000b,0x00000007,0x00000006,0x0000000a,0x0000000a,0x00040020,0x0000000c,
>+	0x00000003,0x0000000b,0x0004003b,0x0000000c,0x0000000d,0x00000003,0x00040015,0x0000000e,
>+	0x00000020,0x00000001,0x0004002b,0x0000000e,0x0000000f,0x00000000,0x00040017,0x00000010,
>+	0x00000006,0x00000002,0x0004002b,0x00000008,0x00000011,0x00000006,0x0004001c,0x00000012,
>+	0x00000010,0x00000011,0x0004002b,0x00000006,0x00000013,0xbf800000,0x0004002b,0x00000006,
>+	0x00000014,0x3f800000,0x0005002c,0x00000010,0x00000015,0x00000013,0x00000014,0x0005002c,
>+	0x00000010,0x00000016,0x00000013,0x00000013,0x0005002c,0x00000010,0x00000017,0x00000014,
>+	0x00000013,0x0005002c,0x00000010,0x00000018,0x00000014,0x00000014,0x0009002c,0x00000012,
>+	0x00000019,0x00000015,0x00000016,0x00000017,0x00000015,0x00000017,0x00000018,0x00040020,
>+	0x0000001a,0x00000001,0x0000000e,0x0004003b,0x0000001a,0x0000001b,0x00000001,0x00040020,
>+	0x0000001d,0x00000007,0x00000012,0x00040020,0x0000001f,0x00000007,0x00000010,0x0004002b,
>+	0x00000006,0x00000022,0x00000000,0x00040020,0x00000026,0x00000003,0x00000007,0x00050036,
>+	0x00000002,0x00000004,0x00000000,0x00000003,0x000200f8,0x00000005,0x0004003b,0x0000001d,
>+	0x0000001e,0x00000007,0x0004003d,0x0000000e,0x0000001c,0x0000001b,0x0003003e,0x0000001e,
>+	0x00000019,0x00050041,0x0000001f,0x00000020,0x0000001e,0x0000001c,0x0004003d,0x00000010,
>+	0x00000021,0x00000020,0x00050051,0x00000006,0x00000023,0x00000021,0x00000000,0x00050051,
>+	0x00000006,0x00000024,0x00000021,0x00000001,0x00070050,0x00000007,0x00000025,0x00000023,
>+	0x00000024,0x00000022,0x00000014,0x00050041,0x00000026,0x00000027,0x0000000d,0x0000000f,
>+	0x0003003e,0x00000027,0x00000025,0x000100fd,0x00010038
>+};
>+
>+#if 0  // Generated from:
>+#version 450 core
>+
>+const vec2 kQuadVertices[]= {
>+    vec2(- 1, 1),
>+    vec2(- 1, - 1),
>+    vec2(1, - 1),
>+    vec2(- 1, 1),
>+    vec2(1, - 1),
>+    vec2(1, 1),
>+};
>+
>+void main()
>+{
>+    gl_Position = vec4(kQuadVertices[gl_VertexIndex], 0, 1);
>+}
>+#endif  // Preprocessed code
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000000.inc b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000000.inc
>new file mode 100644
>index 00000000000..6dd932b19e2
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000000.inc
>@@ -0,0 +1,36 @@
>+	// 7.11.3188
>+	 #pragma once
>+const uint32_t kImageClear_frag_00000000[] = {
>+	0x07230203,0x00010000,0x00080007,0x00000012,0x00000000,0x00020011,0x00000001,0x0006000b,
>+	0x00000001,0x4c534c47,0x6474732e,0x3035342e,0x00000000,0x0003000e,0x00000000,0x00000001,
>+	0x0006000f,0x00000004,0x00000004,0x6e69616d,0x00000000,0x00000009,0x00030010,0x00000004,
>+	0x00000007,0x00030003,0x00000002,0x000001c2,0x00040005,0x00000004,0x6e69616d,0x00000000,
>+	0x00050005,0x00000009,0x6f6c6f63,0x74754f72,0x00000000,0x00060005,0x0000000a,0x68737550,
>+	0x736e6f43,0x746e6174,0x00000073,0x00060006,0x0000000a,0x00000000,0x61656c63,0x6c6f4372,
>+	0x0000726f,0x00040005,0x0000000c,0x61726170,0x0000736d,0x00040047,0x00000009,0x0000001e,
>+	0x00000000,0x00050048,0x0000000a,0x00000000,0x00000023,0x00000000,0x00030047,0x0000000a,
>+	0x00000002,0x00020013,0x00000002,0x00030021,0x00000003,0x00000002,0x00030016,0x00000006,
>+	0x00000020,0x00040017,0x00000007,0x00000006,0x00000004,0x00040020,0x00000008,0x00000003,
>+	0x00000007,0x0004003b,0x00000008,0x00000009,0x00000003,0x0003001e,0x0000000a,0x00000007,
>+	0x00040020,0x0000000b,0x00000009,0x0000000a,0x0004003b,0x0000000b,0x0000000c,0x00000009,
>+	0x00040015,0x0000000d,0x00000020,0x00000001,0x0004002b,0x0000000d,0x0000000e,0x00000000,
>+	0x00040020,0x0000000f,0x00000009,0x00000007,0x00050036,0x00000002,0x00000004,0x00000000,
>+	0x00000003,0x000200f8,0x00000005,0x00050041,0x0000000f,0x00000010,0x0000000c,0x0000000e,
>+	0x0004003d,0x00000007,0x00000011,0x00000010,0x0003003e,0x00000009,0x00000011,0x000100fd,
>+	0x00010038
>+};
>+
>+#if 0  // Generated from:
>+#version 450 core
>+
>+layout(push_constant)uniform PushConstants {
>+       vec4 clearColor;
>+} params;
>+
>+layout(location = 0)out vec4 colorOut;
>+
>+void main()
>+{
>+    colorOut = params . clearColor;
>+}
>+#endif  // Preprocessed code
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000001.inc b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000001.inc
>new file mode 100644
>index 00000000000..5188be90135
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000001.inc
>@@ -0,0 +1,36 @@
>+	// 7.11.3188
>+	 #pragma once
>+const uint32_t kImageClear_frag_00000001[] = {
>+	0x07230203,0x00010000,0x00080007,0x00000012,0x00000000,0x00020011,0x00000001,0x0006000b,
>+	0x00000001,0x4c534c47,0x6474732e,0x3035342e,0x00000000,0x0003000e,0x00000000,0x00000001,
>+	0x0006000f,0x00000004,0x00000004,0x6e69616d,0x00000000,0x00000009,0x00030010,0x00000004,
>+	0x00000007,0x00030003,0x00000002,0x000001c2,0x00040005,0x00000004,0x6e69616d,0x00000000,
>+	0x00050005,0x00000009,0x6f6c6f63,0x74754f72,0x00000000,0x00060005,0x0000000a,0x68737550,
>+	0x736e6f43,0x746e6174,0x00000073,0x00060006,0x0000000a,0x00000000,0x61656c63,0x6c6f4372,
>+	0x0000726f,0x00040005,0x0000000c,0x61726170,0x0000736d,0x00040047,0x00000009,0x0000001e,
>+	0x00000001,0x00050048,0x0000000a,0x00000000,0x00000023,0x00000000,0x00030047,0x0000000a,
>+	0x00000002,0x00020013,0x00000002,0x00030021,0x00000003,0x00000002,0x00030016,0x00000006,
>+	0x00000020,0x00040017,0x00000007,0x00000006,0x00000004,0x00040020,0x00000008,0x00000003,
>+	0x00000007,0x0004003b,0x00000008,0x00000009,0x00000003,0x0003001e,0x0000000a,0x00000007,
>+	0x00040020,0x0000000b,0x00000009,0x0000000a,0x0004003b,0x0000000b,0x0000000c,0x00000009,
>+	0x00040015,0x0000000d,0x00000020,0x00000001,0x0004002b,0x0000000d,0x0000000e,0x00000000,
>+	0x00040020,0x0000000f,0x00000009,0x00000007,0x00050036,0x00000002,0x00000004,0x00000000,
>+	0x00000003,0x000200f8,0x00000005,0x00050041,0x0000000f,0x00000010,0x0000000c,0x0000000e,
>+	0x0004003d,0x00000007,0x00000011,0x00000010,0x0003003e,0x00000009,0x00000011,0x000100fd,
>+	0x00010038
>+};
>+
>+#if 0  // Generated from:
>+#version 450 core
>+
>+layout(push_constant)uniform PushConstants {
>+       vec4 clearColor;
>+} params;
>+
>+layout(location = 1)out vec4 colorOut;
>+
>+void main()
>+{
>+    colorOut = params . clearColor;
>+}
>+#endif  // Preprocessed code
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000002.inc b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000002.inc
>new file mode 100644
>index 00000000000..cefdd551b44
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000002.inc
>@@ -0,0 +1,36 @@
>+	// 7.11.3188
>+	 #pragma once
>+const uint32_t kImageClear_frag_00000002[] = {
>+	0x07230203,0x00010000,0x00080007,0x00000012,0x00000000,0x00020011,0x00000001,0x0006000b,
>+	0x00000001,0x4c534c47,0x6474732e,0x3035342e,0x00000000,0x0003000e,0x00000000,0x00000001,
>+	0x0006000f,0x00000004,0x00000004,0x6e69616d,0x00000000,0x00000009,0x00030010,0x00000004,
>+	0x00000007,0x00030003,0x00000002,0x000001c2,0x00040005,0x00000004,0x6e69616d,0x00000000,
>+	0x00050005,0x00000009,0x6f6c6f63,0x74754f72,0x00000000,0x00060005,0x0000000a,0x68737550,
>+	0x736e6f43,0x746e6174,0x00000073,0x00060006,0x0000000a,0x00000000,0x61656c63,0x6c6f4372,
>+	0x0000726f,0x00040005,0x0000000c,0x61726170,0x0000736d,0x00040047,0x00000009,0x0000001e,
>+	0x00000002,0x00050048,0x0000000a,0x00000000,0x00000023,0x00000000,0x00030047,0x0000000a,
>+	0x00000002,0x00020013,0x00000002,0x00030021,0x00000003,0x00000002,0x00030016,0x00000006,
>+	0x00000020,0x00040017,0x00000007,0x00000006,0x00000004,0x00040020,0x00000008,0x00000003,
>+	0x00000007,0x0004003b,0x00000008,0x00000009,0x00000003,0x0003001e,0x0000000a,0x00000007,
>+	0x00040020,0x0000000b,0x00000009,0x0000000a,0x0004003b,0x0000000b,0x0000000c,0x00000009,
>+	0x00040015,0x0000000d,0x00000020,0x00000001,0x0004002b,0x0000000d,0x0000000e,0x00000000,
>+	0x00040020,0x0000000f,0x00000009,0x00000007,0x00050036,0x00000002,0x00000004,0x00000000,
>+	0x00000003,0x000200f8,0x00000005,0x00050041,0x0000000f,0x00000010,0x0000000c,0x0000000e,
>+	0x0004003d,0x00000007,0x00000011,0x00000010,0x0003003e,0x00000009,0x00000011,0x000100fd,
>+	0x00010038
>+};
>+
>+#if 0  // Generated from:
>+#version 450 core
>+
>+layout(push_constant)uniform PushConstants {
>+       vec4 clearColor;
>+} params;
>+
>+layout(location = 2)out vec4 colorOut;
>+
>+void main()
>+{
>+    colorOut = params . clearColor;
>+}
>+#endif  // Preprocessed code
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000003.inc b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000003.inc
>new file mode 100644
>index 00000000000..e936055abf8
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000003.inc
>@@ -0,0 +1,36 @@
>+	// 7.11.3188
>+	 #pragma once
>+const uint32_t kImageClear_frag_00000003[] = {
>+	0x07230203,0x00010000,0x00080007,0x00000012,0x00000000,0x00020011,0x00000001,0x0006000b,
>+	0x00000001,0x4c534c47,0x6474732e,0x3035342e,0x00000000,0x0003000e,0x00000000,0x00000001,
>+	0x0006000f,0x00000004,0x00000004,0x6e69616d,0x00000000,0x00000009,0x00030010,0x00000004,
>+	0x00000007,0x00030003,0x00000002,0x000001c2,0x00040005,0x00000004,0x6e69616d,0x00000000,
>+	0x00050005,0x00000009,0x6f6c6f63,0x74754f72,0x00000000,0x00060005,0x0000000a,0x68737550,
>+	0x736e6f43,0x746e6174,0x00000073,0x00060006,0x0000000a,0x00000000,0x61656c63,0x6c6f4372,
>+	0x0000726f,0x00040005,0x0000000c,0x61726170,0x0000736d,0x00040047,0x00000009,0x0000001e,
>+	0x00000003,0x00050048,0x0000000a,0x00000000,0x00000023,0x00000000,0x00030047,0x0000000a,
>+	0x00000002,0x00020013,0x00000002,0x00030021,0x00000003,0x00000002,0x00030016,0x00000006,
>+	0x00000020,0x00040017,0x00000007,0x00000006,0x00000004,0x00040020,0x00000008,0x00000003,
>+	0x00000007,0x0004003b,0x00000008,0x00000009,0x00000003,0x0003001e,0x0000000a,0x00000007,
>+	0x00040020,0x0000000b,0x00000009,0x0000000a,0x0004003b,0x0000000b,0x0000000c,0x00000009,
>+	0x00040015,0x0000000d,0x00000020,0x00000001,0x0004002b,0x0000000d,0x0000000e,0x00000000,
>+	0x00040020,0x0000000f,0x00000009,0x00000007,0x00050036,0x00000002,0x00000004,0x00000000,
>+	0x00000003,0x000200f8,0x00000005,0x00050041,0x0000000f,0x00000010,0x0000000c,0x0000000e,
>+	0x0004003d,0x00000007,0x00000011,0x00000010,0x0003003e,0x00000009,0x00000011,0x000100fd,
>+	0x00010038
>+};
>+
>+#if 0  // Generated from:
>+#version 450 core
>+
>+layout(push_constant)uniform PushConstants {
>+       vec4 clearColor;
>+} params;
>+
>+layout(location = 3)out vec4 colorOut;
>+
>+void main()
>+{
>+    colorOut = params . clearColor;
>+}
>+#endif  // Preprocessed code
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000004.inc b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000004.inc
>new file mode 100644
>index 00000000000..a77e9bfa80e
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000004.inc
>@@ -0,0 +1,36 @@
>+	// 7.11.3188
>+	 #pragma once
>+const uint32_t kImageClear_frag_00000004[] = {
>+	0x07230203,0x00010000,0x00080007,0x00000012,0x00000000,0x00020011,0x00000001,0x0006000b,
>+	0x00000001,0x4c534c47,0x6474732e,0x3035342e,0x00000000,0x0003000e,0x00000000,0x00000001,
>+	0x0006000f,0x00000004,0x00000004,0x6e69616d,0x00000000,0x00000009,0x00030010,0x00000004,
>+	0x00000007,0x00030003,0x00000002,0x000001c2,0x00040005,0x00000004,0x6e69616d,0x00000000,
>+	0x00050005,0x00000009,0x6f6c6f63,0x74754f72,0x00000000,0x00060005,0x0000000a,0x68737550,
>+	0x736e6f43,0x746e6174,0x00000073,0x00060006,0x0000000a,0x00000000,0x61656c63,0x6c6f4372,
>+	0x0000726f,0x00040005,0x0000000c,0x61726170,0x0000736d,0x00040047,0x00000009,0x0000001e,
>+	0x00000004,0x00050048,0x0000000a,0x00000000,0x00000023,0x00000000,0x00030047,0x0000000a,
>+	0x00000002,0x00020013,0x00000002,0x00030021,0x00000003,0x00000002,0x00030016,0x00000006,
>+	0x00000020,0x00040017,0x00000007,0x00000006,0x00000004,0x00040020,0x00000008,0x00000003,
>+	0x00000007,0x0004003b,0x00000008,0x00000009,0x00000003,0x0003001e,0x0000000a,0x00000007,
>+	0x00040020,0x0000000b,0x00000009,0x0000000a,0x0004003b,0x0000000b,0x0000000c,0x00000009,
>+	0x00040015,0x0000000d,0x00000020,0x00000001,0x0004002b,0x0000000d,0x0000000e,0x00000000,
>+	0x00040020,0x0000000f,0x00000009,0x00000007,0x00050036,0x00000002,0x00000004,0x00000000,
>+	0x00000003,0x000200f8,0x00000005,0x00050041,0x0000000f,0x00000010,0x0000000c,0x0000000e,
>+	0x0004003d,0x00000007,0x00000011,0x00000010,0x0003003e,0x00000009,0x00000011,0x000100fd,
>+	0x00010038
>+};
>+
>+#if 0  // Generated from:
>+#version 450 core
>+
>+layout(push_constant)uniform PushConstants {
>+       vec4 clearColor;
>+} params;
>+
>+layout(location = 4)out vec4 colorOut;
>+
>+void main()
>+{
>+    colorOut = params . clearColor;
>+}
>+#endif  // Preprocessed code
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000005.inc b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000005.inc
>new file mode 100644
>index 00000000000..1aae4816275
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000005.inc
>@@ -0,0 +1,36 @@
>+	// 7.11.3188
>+	 #pragma once
>+const uint32_t kImageClear_frag_00000005[] = {
>+	0x07230203,0x00010000,0x00080007,0x00000012,0x00000000,0x00020011,0x00000001,0x0006000b,
>+	0x00000001,0x4c534c47,0x6474732e,0x3035342e,0x00000000,0x0003000e,0x00000000,0x00000001,
>+	0x0006000f,0x00000004,0x00000004,0x6e69616d,0x00000000,0x00000009,0x00030010,0x00000004,
>+	0x00000007,0x00030003,0x00000002,0x000001c2,0x00040005,0x00000004,0x6e69616d,0x00000000,
>+	0x00050005,0x00000009,0x6f6c6f63,0x74754f72,0x00000000,0x00060005,0x0000000a,0x68737550,
>+	0x736e6f43,0x746e6174,0x00000073,0x00060006,0x0000000a,0x00000000,0x61656c63,0x6c6f4372,
>+	0x0000726f,0x00040005,0x0000000c,0x61726170,0x0000736d,0x00040047,0x00000009,0x0000001e,
>+	0x00000005,0x00050048,0x0000000a,0x00000000,0x00000023,0x00000000,0x00030047,0x0000000a,
>+	0x00000002,0x00020013,0x00000002,0x00030021,0x00000003,0x00000002,0x00030016,0x00000006,
>+	0x00000020,0x00040017,0x00000007,0x00000006,0x00000004,0x00040020,0x00000008,0x00000003,
>+	0x00000007,0x0004003b,0x00000008,0x00000009,0x00000003,0x0003001e,0x0000000a,0x00000007,
>+	0x00040020,0x0000000b,0x00000009,0x0000000a,0x0004003b,0x0000000b,0x0000000c,0x00000009,
>+	0x00040015,0x0000000d,0x00000020,0x00000001,0x0004002b,0x0000000d,0x0000000e,0x00000000,
>+	0x00040020,0x0000000f,0x00000009,0x00000007,0x00050036,0x00000002,0x00000004,0x00000000,
>+	0x00000003,0x000200f8,0x00000005,0x00050041,0x0000000f,0x00000010,0x0000000c,0x0000000e,
>+	0x0004003d,0x00000007,0x00000011,0x00000010,0x0003003e,0x00000009,0x00000011,0x000100fd,
>+	0x00010038
>+};
>+
>+#if 0  // Generated from:
>+#version 450 core
>+
>+layout(push_constant)uniform PushConstants {
>+       vec4 clearColor;
>+} params;
>+
>+layout(location = 5)out vec4 colorOut;
>+
>+void main()
>+{
>+    colorOut = params . clearColor;
>+}
>+#endif  // Preprocessed code
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000006.inc b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000006.inc
>new file mode 100644
>index 00000000000..bd1e5d24a3f
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000006.inc
>@@ -0,0 +1,36 @@
>+	// 7.11.3188
>+	 #pragma once
>+const uint32_t kImageClear_frag_00000006[] = {
>+	0x07230203,0x00010000,0x00080007,0x00000012,0x00000000,0x00020011,0x00000001,0x0006000b,
>+	0x00000001,0x4c534c47,0x6474732e,0x3035342e,0x00000000,0x0003000e,0x00000000,0x00000001,
>+	0x0006000f,0x00000004,0x00000004,0x6e69616d,0x00000000,0x00000009,0x00030010,0x00000004,
>+	0x00000007,0x00030003,0x00000002,0x000001c2,0x00040005,0x00000004,0x6e69616d,0x00000000,
>+	0x00050005,0x00000009,0x6f6c6f63,0x74754f72,0x00000000,0x00060005,0x0000000a,0x68737550,
>+	0x736e6f43,0x746e6174,0x00000073,0x00060006,0x0000000a,0x00000000,0x61656c63,0x6c6f4372,
>+	0x0000726f,0x00040005,0x0000000c,0x61726170,0x0000736d,0x00040047,0x00000009,0x0000001e,
>+	0x00000006,0x00050048,0x0000000a,0x00000000,0x00000023,0x00000000,0x00030047,0x0000000a,
>+	0x00000002,0x00020013,0x00000002,0x00030021,0x00000003,0x00000002,0x00030016,0x00000006,
>+	0x00000020,0x00040017,0x00000007,0x00000006,0x00000004,0x00040020,0x00000008,0x00000003,
>+	0x00000007,0x0004003b,0x00000008,0x00000009,0x00000003,0x0003001e,0x0000000a,0x00000007,
>+	0x00040020,0x0000000b,0x00000009,0x0000000a,0x0004003b,0x0000000b,0x0000000c,0x00000009,
>+	0x00040015,0x0000000d,0x00000020,0x00000001,0x0004002b,0x0000000d,0x0000000e,0x00000000,
>+	0x00040020,0x0000000f,0x00000009,0x00000007,0x00050036,0x00000002,0x00000004,0x00000000,
>+	0x00000003,0x000200f8,0x00000005,0x00050041,0x0000000f,0x00000010,0x0000000c,0x0000000e,
>+	0x0004003d,0x00000007,0x00000011,0x00000010,0x0003003e,0x00000009,0x00000011,0x000100fd,
>+	0x00010038
>+};
>+
>+#if 0  // Generated from:
>+#version 450 core
>+
>+layout(push_constant)uniform PushConstants {
>+       vec4 clearColor;
>+} params;
>+
>+layout(location = 6)out vec4 colorOut;
>+
>+void main()
>+{
>+    colorOut = params . clearColor;
>+}
>+#endif  // Preprocessed code
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000007.inc b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000007.inc
>new file mode 100644
>index 00000000000..b5f34b10aea
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000007.inc
>@@ -0,0 +1,36 @@
>+	// 7.11.3188
>+	 #pragma once
>+const uint32_t kImageClear_frag_00000007[] = {
>+	0x07230203,0x00010000,0x00080007,0x00000012,0x00000000,0x00020011,0x00000001,0x0006000b,
>+	0x00000001,0x4c534c47,0x6474732e,0x3035342e,0x00000000,0x0003000e,0x00000000,0x00000001,
>+	0x0006000f,0x00000004,0x00000004,0x6e69616d,0x00000000,0x00000009,0x00030010,0x00000004,
>+	0x00000007,0x00030003,0x00000002,0x000001c2,0x00040005,0x00000004,0x6e69616d,0x00000000,
>+	0x00050005,0x00000009,0x6f6c6f63,0x74754f72,0x00000000,0x00060005,0x0000000a,0x68737550,
>+	0x736e6f43,0x746e6174,0x00000073,0x00060006,0x0000000a,0x00000000,0x61656c63,0x6c6f4372,
>+	0x0000726f,0x00040005,0x0000000c,0x61726170,0x0000736d,0x00040047,0x00000009,0x0000001e,
>+	0x00000007,0x00050048,0x0000000a,0x00000000,0x00000023,0x00000000,0x00030047,0x0000000a,
>+	0x00000002,0x00020013,0x00000002,0x00030021,0x00000003,0x00000002,0x00030016,0x00000006,
>+	0x00000020,0x00040017,0x00000007,0x00000006,0x00000004,0x00040020,0x00000008,0x00000003,
>+	0x00000007,0x0004003b,0x00000008,0x00000009,0x00000003,0x0003001e,0x0000000a,0x00000007,
>+	0x00040020,0x0000000b,0x00000009,0x0000000a,0x0004003b,0x0000000b,0x0000000c,0x00000009,
>+	0x00040015,0x0000000d,0x00000020,0x00000001,0x0004002b,0x0000000d,0x0000000e,0x00000000,
>+	0x00040020,0x0000000f,0x00000009,0x00000007,0x00050036,0x00000002,0x00000004,0x00000000,
>+	0x00000003,0x000200f8,0x00000005,0x00050041,0x0000000f,0x00000010,0x0000000c,0x0000000e,
>+	0x0004003d,0x00000007,0x00000011,0x00000010,0x0003003e,0x00000009,0x00000011,0x000100fd,
>+	0x00010038
>+};
>+
>+#if 0  // Generated from:
>+#version 450 core
>+
>+layout(push_constant)uniform PushConstants {
>+       vec4 clearColor;
>+} params;
>+
>+layout(location = 7)out vec4 colorOut;
>+
>+void main()
>+{
>+    colorOut = params . clearColor;
>+}
>+#endif  // Preprocessed code
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000008.inc b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000008.inc
>new file mode 100644
>index 00000000000..4da1be756a8
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000008.inc
>@@ -0,0 +1,35 @@
>+	// 7.11.3188
>+	 #pragma once
>+const uint32_t kImageClear_frag_00000008[] = {
>+	0x07230203,0x00010000,0x00080007,0x00000011,0x00000000,0x00020011,0x00000001,0x0006000b,
>+	0x00000001,0x4c534c47,0x6474732e,0x3035342e,0x00000000,0x0003000e,0x00000000,0x00000001,
>+	0x0006000f,0x00000004,0x00000004,0x6e69616d,0x00000000,0x00000009,0x00030010,0x00000004,
>+	0x00000007,0x00030003,0x00000002,0x000001c2,0x00040005,0x00000004,0x6e69616d,0x00000000,
>+	0x00050005,0x00000009,0x6f6c6f63,0x74754f72,0x00000000,0x00060005,0x0000000a,0x68737550,
>+	0x736e6f43,0x746e6174,0x00000073,0x00060006,0x0000000a,0x00000000,0x61656c63,0x6c6f4372,
>+	0x0000726f,0x00040005,0x0000000c,0x61726170,0x0000736d,0x00040047,0x00000009,0x0000001e,
>+	0x00000000,0x00050048,0x0000000a,0x00000000,0x00000023,0x00000000,0x00030047,0x0000000a,
>+	0x00000002,0x00020013,0x00000002,0x00030021,0x00000003,0x00000002,0x00040015,0x00000006,
>+	0x00000020,0x00000001,0x00040017,0x00000007,0x00000006,0x00000004,0x00040020,0x00000008,
>+	0x00000003,0x00000007,0x0004003b,0x00000008,0x00000009,0x00000003,0x0003001e,0x0000000a,
>+	0x00000007,0x00040020,0x0000000b,0x00000009,0x0000000a,0x0004003b,0x0000000b,0x0000000c,
>+	0x00000009,0x0004002b,0x00000006,0x0000000d,0x00000000,0x00040020,0x0000000e,0x00000009,
>+	0x00000007,0x00050036,0x00000002,0x00000004,0x00000000,0x00000003,0x000200f8,0x00000005,
>+	0x00050041,0x0000000e,0x0000000f,0x0000000c,0x0000000d,0x0004003d,0x00000007,0x00000010,
>+	0x0000000f,0x0003003e,0x00000009,0x00000010,0x000100fd,0x00010038
>+};
>+
>+#if 0  // Generated from:
>+#version 450 core
>+
>+layout(push_constant)uniform PushConstants {
>+       ivec4 clearColor;
>+} params;
>+
>+layout(location = 0)out ivec4 colorOut;
>+
>+void main()
>+{
>+    colorOut = params . clearColor;
>+}
>+#endif  // Preprocessed code
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000009.inc b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000009.inc
>new file mode 100644
>index 00000000000..d8a7135a081
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000009.inc
>@@ -0,0 +1,35 @@
>+	// 7.11.3188
>+	 #pragma once
>+const uint32_t kImageClear_frag_00000009[] = {
>+	0x07230203,0x00010000,0x00080007,0x00000011,0x00000000,0x00020011,0x00000001,0x0006000b,
>+	0x00000001,0x4c534c47,0x6474732e,0x3035342e,0x00000000,0x0003000e,0x00000000,0x00000001,
>+	0x0006000f,0x00000004,0x00000004,0x6e69616d,0x00000000,0x00000009,0x00030010,0x00000004,
>+	0x00000007,0x00030003,0x00000002,0x000001c2,0x00040005,0x00000004,0x6e69616d,0x00000000,
>+	0x00050005,0x00000009,0x6f6c6f63,0x74754f72,0x00000000,0x00060005,0x0000000a,0x68737550,
>+	0x736e6f43,0x746e6174,0x00000073,0x00060006,0x0000000a,0x00000000,0x61656c63,0x6c6f4372,
>+	0x0000726f,0x00040005,0x0000000c,0x61726170,0x0000736d,0x00040047,0x00000009,0x0000001e,
>+	0x00000001,0x00050048,0x0000000a,0x00000000,0x00000023,0x00000000,0x00030047,0x0000000a,
>+	0x00000002,0x00020013,0x00000002,0x00030021,0x00000003,0x00000002,0x00040015,0x00000006,
>+	0x00000020,0x00000001,0x00040017,0x00000007,0x00000006,0x00000004,0x00040020,0x00000008,
>+	0x00000003,0x00000007,0x0004003b,0x00000008,0x00000009,0x00000003,0x0003001e,0x0000000a,
>+	0x00000007,0x00040020,0x0000000b,0x00000009,0x0000000a,0x0004003b,0x0000000b,0x0000000c,
>+	0x00000009,0x0004002b,0x00000006,0x0000000d,0x00000000,0x00040020,0x0000000e,0x00000009,
>+	0x00000007,0x00050036,0x00000002,0x00000004,0x00000000,0x00000003,0x000200f8,0x00000005,
>+	0x00050041,0x0000000e,0x0000000f,0x0000000c,0x0000000d,0x0004003d,0x00000007,0x00000010,
>+	0x0000000f,0x0003003e,0x00000009,0x00000010,0x000100fd,0x00010038
>+};
>+
>+#if 0  // Generated from:
>+#version 450 core
>+
>+layout(push_constant)uniform PushConstants {
>+       ivec4 clearColor;
>+} params;
>+
>+layout(location = 1)out ivec4 colorOut;
>+
>+void main()
>+{
>+    colorOut = params . clearColor;
>+}
>+#endif  // Preprocessed code
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.0000000A.inc b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.0000000A.inc
>new file mode 100644
>index 00000000000..41d23578438
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.0000000A.inc
>@@ -0,0 +1,35 @@
>+	// 7.11.3188
>+	 #pragma once
>+const uint32_t kImageClear_frag_0000000A[] = {
>+	0x07230203,0x00010000,0x00080007,0x00000011,0x00000000,0x00020011,0x00000001,0x0006000b,
>+	0x00000001,0x4c534c47,0x6474732e,0x3035342e,0x00000000,0x0003000e,0x00000000,0x00000001,
>+	0x0006000f,0x00000004,0x00000004,0x6e69616d,0x00000000,0x00000009,0x00030010,0x00000004,
>+	0x00000007,0x00030003,0x00000002,0x000001c2,0x00040005,0x00000004,0x6e69616d,0x00000000,
>+	0x00050005,0x00000009,0x6f6c6f63,0x74754f72,0x00000000,0x00060005,0x0000000a,0x68737550,
>+	0x736e6f43,0x746e6174,0x00000073,0x00060006,0x0000000a,0x00000000,0x61656c63,0x6c6f4372,
>+	0x0000726f,0x00040005,0x0000000c,0x61726170,0x0000736d,0x00040047,0x00000009,0x0000001e,
>+	0x00000002,0x00050048,0x0000000a,0x00000000,0x00000023,0x00000000,0x00030047,0x0000000a,
>+	0x00000002,0x00020013,0x00000002,0x00030021,0x00000003,0x00000002,0x00040015,0x00000006,
>+	0x00000020,0x00000001,0x00040017,0x00000007,0x00000006,0x00000004,0x00040020,0x00000008,
>+	0x00000003,0x00000007,0x0004003b,0x00000008,0x00000009,0x00000003,0x0003001e,0x0000000a,
>+	0x00000007,0x00040020,0x0000000b,0x00000009,0x0000000a,0x0004003b,0x0000000b,0x0000000c,
>+	0x00000009,0x0004002b,0x00000006,0x0000000d,0x00000000,0x00040020,0x0000000e,0x00000009,
>+	0x00000007,0x00050036,0x00000002,0x00000004,0x00000000,0x00000003,0x000200f8,0x00000005,
>+	0x00050041,0x0000000e,0x0000000f,0x0000000c,0x0000000d,0x0004003d,0x00000007,0x00000010,
>+	0x0000000f,0x0003003e,0x00000009,0x00000010,0x000100fd,0x00010038
>+};
>+
>+#if 0  // Generated from:
>+#version 450 core
>+
>+layout(push_constant)uniform PushConstants {
>+       ivec4 clearColor;
>+} params;
>+
>+layout(location = 2)out ivec4 colorOut;
>+
>+void main()
>+{
>+    colorOut = params . clearColor;
>+}
>+#endif  // Preprocessed code
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.0000000B.inc b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.0000000B.inc
>new file mode 100644
>index 00000000000..f0a17ab1f26
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.0000000B.inc
>@@ -0,0 +1,35 @@
>+	// 7.11.3188
>+	 #pragma once
>+const uint32_t kImageClear_frag_0000000B[] = {
>+	0x07230203,0x00010000,0x00080007,0x00000011,0x00000000,0x00020011,0x00000001,0x0006000b,
>+	0x00000001,0x4c534c47,0x6474732e,0x3035342e,0x00000000,0x0003000e,0x00000000,0x00000001,
>+	0x0006000f,0x00000004,0x00000004,0x6e69616d,0x00000000,0x00000009,0x00030010,0x00000004,
>+	0x00000007,0x00030003,0x00000002,0x000001c2,0x00040005,0x00000004,0x6e69616d,0x00000000,
>+	0x00050005,0x00000009,0x6f6c6f63,0x74754f72,0x00000000,0x00060005,0x0000000a,0x68737550,
>+	0x736e6f43,0x746e6174,0x00000073,0x00060006,0x0000000a,0x00000000,0x61656c63,0x6c6f4372,
>+	0x0000726f,0x00040005,0x0000000c,0x61726170,0x0000736d,0x00040047,0x00000009,0x0000001e,
>+	0x00000003,0x00050048,0x0000000a,0x00000000,0x00000023,0x00000000,0x00030047,0x0000000a,
>+	0x00000002,0x00020013,0x00000002,0x00030021,0x00000003,0x00000002,0x00040015,0x00000006,
>+	0x00000020,0x00000001,0x00040017,0x00000007,0x00000006,0x00000004,0x00040020,0x00000008,
>+	0x00000003,0x00000007,0x0004003b,0x00000008,0x00000009,0x00000003,0x0003001e,0x0000000a,
>+	0x00000007,0x00040020,0x0000000b,0x00000009,0x0000000a,0x0004003b,0x0000000b,0x0000000c,
>+	0x00000009,0x0004002b,0x00000006,0x0000000d,0x00000000,0x00040020,0x0000000e,0x00000009,
>+	0x00000007,0x00050036,0x00000002,0x00000004,0x00000000,0x00000003,0x000200f8,0x00000005,
>+	0x00050041,0x0000000e,0x0000000f,0x0000000c,0x0000000d,0x0004003d,0x00000007,0x00000010,
>+	0x0000000f,0x0003003e,0x00000009,0x00000010,0x000100fd,0x00010038
>+};
>+
>+#if 0  // Generated from:
>+#version 450 core
>+
>+layout(push_constant)uniform PushConstants {
>+       ivec4 clearColor;
>+} params;
>+
>+layout(location = 3)out ivec4 colorOut;
>+
>+void main()
>+{
>+    colorOut = params . clearColor;
>+}
>+#endif  // Preprocessed code
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.0000000C.inc b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.0000000C.inc
>new file mode 100644
>index 00000000000..06c8fefa3b1
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.0000000C.inc
>@@ -0,0 +1,35 @@
>+	// 7.11.3188
>+	 #pragma once
>+const uint32_t kImageClear_frag_0000000C[] = {
>+	0x07230203,0x00010000,0x00080007,0x00000011,0x00000000,0x00020011,0x00000001,0x0006000b,
>+	0x00000001,0x4c534c47,0x6474732e,0x3035342e,0x00000000,0x0003000e,0x00000000,0x00000001,
>+	0x0006000f,0x00000004,0x00000004,0x6e69616d,0x00000000,0x00000009,0x00030010,0x00000004,
>+	0x00000007,0x00030003,0x00000002,0x000001c2,0x00040005,0x00000004,0x6e69616d,0x00000000,
>+	0x00050005,0x00000009,0x6f6c6f63,0x74754f72,0x00000000,0x00060005,0x0000000a,0x68737550,
>+	0x736e6f43,0x746e6174,0x00000073,0x00060006,0x0000000a,0x00000000,0x61656c63,0x6c6f4372,
>+	0x0000726f,0x00040005,0x0000000c,0x61726170,0x0000736d,0x00040047,0x00000009,0x0000001e,
>+	0x00000004,0x00050048,0x0000000a,0x00000000,0x00000023,0x00000000,0x00030047,0x0000000a,
>+	0x00000002,0x00020013,0x00000002,0x00030021,0x00000003,0x00000002,0x00040015,0x00000006,
>+	0x00000020,0x00000001,0x00040017,0x00000007,0x00000006,0x00000004,0x00040020,0x00000008,
>+	0x00000003,0x00000007,0x0004003b,0x00000008,0x00000009,0x00000003,0x0003001e,0x0000000a,
>+	0x00000007,0x00040020,0x0000000b,0x00000009,0x0000000a,0x0004003b,0x0000000b,0x0000000c,
>+	0x00000009,0x0004002b,0x00000006,0x0000000d,0x00000000,0x00040020,0x0000000e,0x00000009,
>+	0x00000007,0x00050036,0x00000002,0x00000004,0x00000000,0x00000003,0x000200f8,0x00000005,
>+	0x00050041,0x0000000e,0x0000000f,0x0000000c,0x0000000d,0x0004003d,0x00000007,0x00000010,
>+	0x0000000f,0x0003003e,0x00000009,0x00000010,0x000100fd,0x00010038
>+};
>+
>+#if 0  // Generated from:
>+#version 450 core
>+
>+layout(push_constant)uniform PushConstants {
>+       ivec4 clearColor;
>+} params;
>+
>+layout(location = 4)out ivec4 colorOut;
>+
>+void main()
>+{
>+    colorOut = params . clearColor;
>+}
>+#endif  // Preprocessed code
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.0000000D.inc b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.0000000D.inc
>new file mode 100644
>index 00000000000..84c5706413f
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.0000000D.inc
>@@ -0,0 +1,35 @@
>+	// 7.11.3188
>+	 #pragma once
>+const uint32_t kImageClear_frag_0000000D[] = {
>+	0x07230203,0x00010000,0x00080007,0x00000011,0x00000000,0x00020011,0x00000001,0x0006000b,
>+	0x00000001,0x4c534c47,0x6474732e,0x3035342e,0x00000000,0x0003000e,0x00000000,0x00000001,
>+	0x0006000f,0x00000004,0x00000004,0x6e69616d,0x00000000,0x00000009,0x00030010,0x00000004,
>+	0x00000007,0x00030003,0x00000002,0x000001c2,0x00040005,0x00000004,0x6e69616d,0x00000000,
>+	0x00050005,0x00000009,0x6f6c6f63,0x74754f72,0x00000000,0x00060005,0x0000000a,0x68737550,
>+	0x736e6f43,0x746e6174,0x00000073,0x00060006,0x0000000a,0x00000000,0x61656c63,0x6c6f4372,
>+	0x0000726f,0x00040005,0x0000000c,0x61726170,0x0000736d,0x00040047,0x00000009,0x0000001e,
>+	0x00000005,0x00050048,0x0000000a,0x00000000,0x00000023,0x00000000,0x00030047,0x0000000a,
>+	0x00000002,0x00020013,0x00000002,0x00030021,0x00000003,0x00000002,0x00040015,0x00000006,
>+	0x00000020,0x00000001,0x00040017,0x00000007,0x00000006,0x00000004,0x00040020,0x00000008,
>+	0x00000003,0x00000007,0x0004003b,0x00000008,0x00000009,0x00000003,0x0003001e,0x0000000a,
>+	0x00000007,0x00040020,0x0000000b,0x00000009,0x0000000a,0x0004003b,0x0000000b,0x0000000c,
>+	0x00000009,0x0004002b,0x00000006,0x0000000d,0x00000000,0x00040020,0x0000000e,0x00000009,
>+	0x00000007,0x00050036,0x00000002,0x00000004,0x00000000,0x00000003,0x000200f8,0x00000005,
>+	0x00050041,0x0000000e,0x0000000f,0x0000000c,0x0000000d,0x0004003d,0x00000007,0x00000010,
>+	0x0000000f,0x0003003e,0x00000009,0x00000010,0x000100fd,0x00010038
>+};
>+
>+#if 0  // Generated from:
>+#version 450 core
>+
>+layout(push_constant)uniform PushConstants {
>+       ivec4 clearColor;
>+} params;
>+
>+layout(location = 5)out ivec4 colorOut;
>+
>+void main()
>+{
>+    colorOut = params . clearColor;
>+}
>+#endif  // Preprocessed code
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.0000000E.inc b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.0000000E.inc
>new file mode 100644
>index 00000000000..e1402d2ecdf
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.0000000E.inc
>@@ -0,0 +1,35 @@
>+	// 7.11.3188
>+	 #pragma once
>+const uint32_t kImageClear_frag_0000000E[] = {
>+	0x07230203,0x00010000,0x00080007,0x00000011,0x00000000,0x00020011,0x00000001,0x0006000b,
>+	0x00000001,0x4c534c47,0x6474732e,0x3035342e,0x00000000,0x0003000e,0x00000000,0x00000001,
>+	0x0006000f,0x00000004,0x00000004,0x6e69616d,0x00000000,0x00000009,0x00030010,0x00000004,
>+	0x00000007,0x00030003,0x00000002,0x000001c2,0x00040005,0x00000004,0x6e69616d,0x00000000,
>+	0x00050005,0x00000009,0x6f6c6f63,0x74754f72,0x00000000,0x00060005,0x0000000a,0x68737550,
>+	0x736e6f43,0x746e6174,0x00000073,0x00060006,0x0000000a,0x00000000,0x61656c63,0x6c6f4372,
>+	0x0000726f,0x00040005,0x0000000c,0x61726170,0x0000736d,0x00040047,0x00000009,0x0000001e,
>+	0x00000006,0x00050048,0x0000000a,0x00000000,0x00000023,0x00000000,0x00030047,0x0000000a,
>+	0x00000002,0x00020013,0x00000002,0x00030021,0x00000003,0x00000002,0x00040015,0x00000006,
>+	0x00000020,0x00000001,0x00040017,0x00000007,0x00000006,0x00000004,0x00040020,0x00000008,
>+	0x00000003,0x00000007,0x0004003b,0x00000008,0x00000009,0x00000003,0x0003001e,0x0000000a,
>+	0x00000007,0x00040020,0x0000000b,0x00000009,0x0000000a,0x0004003b,0x0000000b,0x0000000c,
>+	0x00000009,0x0004002b,0x00000006,0x0000000d,0x00000000,0x00040020,0x0000000e,0x00000009,
>+	0x00000007,0x00050036,0x00000002,0x00000004,0x00000000,0x00000003,0x000200f8,0x00000005,
>+	0x00050041,0x0000000e,0x0000000f,0x0000000c,0x0000000d,0x0004003d,0x00000007,0x00000010,
>+	0x0000000f,0x0003003e,0x00000009,0x00000010,0x000100fd,0x00010038
>+};
>+
>+#if 0  // Generated from:
>+#version 450 core
>+
>+layout(push_constant)uniform PushConstants {
>+       ivec4 clearColor;
>+} params;
>+
>+layout(location = 6)out ivec4 colorOut;
>+
>+void main()
>+{
>+    colorOut = params . clearColor;
>+}
>+#endif  // Preprocessed code
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.0000000F.inc b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.0000000F.inc
>new file mode 100644
>index 00000000000..c866f6fa2e6
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.0000000F.inc
>@@ -0,0 +1,35 @@
>+	// 7.11.3188
>+	 #pragma once
>+const uint32_t kImageClear_frag_0000000F[] = {
>+	0x07230203,0x00010000,0x00080007,0x00000011,0x00000000,0x00020011,0x00000001,0x0006000b,
>+	0x00000001,0x4c534c47,0x6474732e,0x3035342e,0x00000000,0x0003000e,0x00000000,0x00000001,
>+	0x0006000f,0x00000004,0x00000004,0x6e69616d,0x00000000,0x00000009,0x00030010,0x00000004,
>+	0x00000007,0x00030003,0x00000002,0x000001c2,0x00040005,0x00000004,0x6e69616d,0x00000000,
>+	0x00050005,0x00000009,0x6f6c6f63,0x74754f72,0x00000000,0x00060005,0x0000000a,0x68737550,
>+	0x736e6f43,0x746e6174,0x00000073,0x00060006,0x0000000a,0x00000000,0x61656c63,0x6c6f4372,
>+	0x0000726f,0x00040005,0x0000000c,0x61726170,0x0000736d,0x00040047,0x00000009,0x0000001e,
>+	0x00000007,0x00050048,0x0000000a,0x00000000,0x00000023,0x00000000,0x00030047,0x0000000a,
>+	0x00000002,0x00020013,0x00000002,0x00030021,0x00000003,0x00000002,0x00040015,0x00000006,
>+	0x00000020,0x00000001,0x00040017,0x00000007,0x00000006,0x00000004,0x00040020,0x00000008,
>+	0x00000003,0x00000007,0x0004003b,0x00000008,0x00000009,0x00000003,0x0003001e,0x0000000a,
>+	0x00000007,0x00040020,0x0000000b,0x00000009,0x0000000a,0x0004003b,0x0000000b,0x0000000c,
>+	0x00000009,0x0004002b,0x00000006,0x0000000d,0x00000000,0x00040020,0x0000000e,0x00000009,
>+	0x00000007,0x00050036,0x00000002,0x00000004,0x00000000,0x00000003,0x000200f8,0x00000005,
>+	0x00050041,0x0000000e,0x0000000f,0x0000000c,0x0000000d,0x0004003d,0x00000007,0x00000010,
>+	0x0000000f,0x0003003e,0x00000009,0x00000010,0x000100fd,0x00010038
>+};
>+
>+#if 0  // Generated from:
>+#version 450 core
>+
>+layout(push_constant)uniform PushConstants {
>+       ivec4 clearColor;
>+} params;
>+
>+layout(location = 7)out ivec4 colorOut;
>+
>+void main()
>+{
>+    colorOut = params . clearColor;
>+}
>+#endif  // Preprocessed code
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000010.inc b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000010.inc
>new file mode 100644
>index 00000000000..7a5192219a7
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000010.inc
>@@ -0,0 +1,36 @@
>+	// 7.11.3188
>+	 #pragma once
>+const uint32_t kImageClear_frag_00000010[] = {
>+	0x07230203,0x00010000,0x00080007,0x00000012,0x00000000,0x00020011,0x00000001,0x0006000b,
>+	0x00000001,0x4c534c47,0x6474732e,0x3035342e,0x00000000,0x0003000e,0x00000000,0x00000001,
>+	0x0006000f,0x00000004,0x00000004,0x6e69616d,0x00000000,0x00000009,0x00030010,0x00000004,
>+	0x00000007,0x00030003,0x00000002,0x000001c2,0x00040005,0x00000004,0x6e69616d,0x00000000,
>+	0x00050005,0x00000009,0x6f6c6f63,0x74754f72,0x00000000,0x00060005,0x0000000a,0x68737550,
>+	0x736e6f43,0x746e6174,0x00000073,0x00060006,0x0000000a,0x00000000,0x61656c63,0x6c6f4372,
>+	0x0000726f,0x00040005,0x0000000c,0x61726170,0x0000736d,0x00040047,0x00000009,0x0000001e,
>+	0x00000000,0x00050048,0x0000000a,0x00000000,0x00000023,0x00000000,0x00030047,0x0000000a,
>+	0x00000002,0x00020013,0x00000002,0x00030021,0x00000003,0x00000002,0x00040015,0x00000006,
>+	0x00000020,0x00000000,0x00040017,0x00000007,0x00000006,0x00000004,0x00040020,0x00000008,
>+	0x00000003,0x00000007,0x0004003b,0x00000008,0x00000009,0x00000003,0x0003001e,0x0000000a,
>+	0x00000007,0x00040020,0x0000000b,0x00000009,0x0000000a,0x0004003b,0x0000000b,0x0000000c,
>+	0x00000009,0x00040015,0x0000000d,0x00000020,0x00000001,0x0004002b,0x0000000d,0x0000000e,
>+	0x00000000,0x00040020,0x0000000f,0x00000009,0x00000007,0x00050036,0x00000002,0x00000004,
>+	0x00000000,0x00000003,0x000200f8,0x00000005,0x00050041,0x0000000f,0x00000010,0x0000000c,
>+	0x0000000e,0x0004003d,0x00000007,0x00000011,0x00000010,0x0003003e,0x00000009,0x00000011,
>+	0x000100fd,0x00010038
>+};
>+
>+#if 0  // Generated from:
>+#version 450 core
>+
>+layout(push_constant)uniform PushConstants {
>+       uvec4 clearColor;
>+} params;
>+
>+layout(location = 0)out uvec4 colorOut;
>+
>+void main()
>+{
>+    colorOut = params . clearColor;
>+}
>+#endif  // Preprocessed code
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000011.inc b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000011.inc
>new file mode 100644
>index 00000000000..8b4df0eba65
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000011.inc
>@@ -0,0 +1,36 @@
>+	// 7.11.3188
>+	 #pragma once
>+const uint32_t kImageClear_frag_00000011[] = {
>+	0x07230203,0x00010000,0x00080007,0x00000012,0x00000000,0x00020011,0x00000001,0x0006000b,
>+	0x00000001,0x4c534c47,0x6474732e,0x3035342e,0x00000000,0x0003000e,0x00000000,0x00000001,
>+	0x0006000f,0x00000004,0x00000004,0x6e69616d,0x00000000,0x00000009,0x00030010,0x00000004,
>+	0x00000007,0x00030003,0x00000002,0x000001c2,0x00040005,0x00000004,0x6e69616d,0x00000000,
>+	0x00050005,0x00000009,0x6f6c6f63,0x74754f72,0x00000000,0x00060005,0x0000000a,0x68737550,
>+	0x736e6f43,0x746e6174,0x00000073,0x00060006,0x0000000a,0x00000000,0x61656c63,0x6c6f4372,
>+	0x0000726f,0x00040005,0x0000000c,0x61726170,0x0000736d,0x00040047,0x00000009,0x0000001e,
>+	0x00000001,0x00050048,0x0000000a,0x00000000,0x00000023,0x00000000,0x00030047,0x0000000a,
>+	0x00000002,0x00020013,0x00000002,0x00030021,0x00000003,0x00000002,0x00040015,0x00000006,
>+	0x00000020,0x00000000,0x00040017,0x00000007,0x00000006,0x00000004,0x00040020,0x00000008,
>+	0x00000003,0x00000007,0x0004003b,0x00000008,0x00000009,0x00000003,0x0003001e,0x0000000a,
>+	0x00000007,0x00040020,0x0000000b,0x00000009,0x0000000a,0x0004003b,0x0000000b,0x0000000c,
>+	0x00000009,0x00040015,0x0000000d,0x00000020,0x00000001,0x0004002b,0x0000000d,0x0000000e,
>+	0x00000000,0x00040020,0x0000000f,0x00000009,0x00000007,0x00050036,0x00000002,0x00000004,
>+	0x00000000,0x00000003,0x000200f8,0x00000005,0x00050041,0x0000000f,0x00000010,0x0000000c,
>+	0x0000000e,0x0004003d,0x00000007,0x00000011,0x00000010,0x0003003e,0x00000009,0x00000011,
>+	0x000100fd,0x00010038
>+};
>+
>+#if 0  // Generated from:
>+#version 450 core
>+
>+layout(push_constant)uniform PushConstants {
>+       uvec4 clearColor;
>+} params;
>+
>+layout(location = 1)out uvec4 colorOut;
>+
>+void main()
>+{
>+    colorOut = params . clearColor;
>+}
>+#endif  // Preprocessed code
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000012.inc b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000012.inc
>new file mode 100644
>index 00000000000..2f04fb4f532
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000012.inc
>@@ -0,0 +1,36 @@
>+	// 7.11.3188
>+	 #pragma once
>+const uint32_t kImageClear_frag_00000012[] = {
>+	0x07230203,0x00010000,0x00080007,0x00000012,0x00000000,0x00020011,0x00000001,0x0006000b,
>+	0x00000001,0x4c534c47,0x6474732e,0x3035342e,0x00000000,0x0003000e,0x00000000,0x00000001,
>+	0x0006000f,0x00000004,0x00000004,0x6e69616d,0x00000000,0x00000009,0x00030010,0x00000004,
>+	0x00000007,0x00030003,0x00000002,0x000001c2,0x00040005,0x00000004,0x6e69616d,0x00000000,
>+	0x00050005,0x00000009,0x6f6c6f63,0x74754f72,0x00000000,0x00060005,0x0000000a,0x68737550,
>+	0x736e6f43,0x746e6174,0x00000073,0x00060006,0x0000000a,0x00000000,0x61656c63,0x6c6f4372,
>+	0x0000726f,0x00040005,0x0000000c,0x61726170,0x0000736d,0x00040047,0x00000009,0x0000001e,
>+	0x00000002,0x00050048,0x0000000a,0x00000000,0x00000023,0x00000000,0x00030047,0x0000000a,
>+	0x00000002,0x00020013,0x00000002,0x00030021,0x00000003,0x00000002,0x00040015,0x00000006,
>+	0x00000020,0x00000000,0x00040017,0x00000007,0x00000006,0x00000004,0x00040020,0x00000008,
>+	0x00000003,0x00000007,0x0004003b,0x00000008,0x00000009,0x00000003,0x0003001e,0x0000000a,
>+	0x00000007,0x00040020,0x0000000b,0x00000009,0x0000000a,0x0004003b,0x0000000b,0x0000000c,
>+	0x00000009,0x00040015,0x0000000d,0x00000020,0x00000001,0x0004002b,0x0000000d,0x0000000e,
>+	0x00000000,0x00040020,0x0000000f,0x00000009,0x00000007,0x00050036,0x00000002,0x00000004,
>+	0x00000000,0x00000003,0x000200f8,0x00000005,0x00050041,0x0000000f,0x00000010,0x0000000c,
>+	0x0000000e,0x0004003d,0x00000007,0x00000011,0x00000010,0x0003003e,0x00000009,0x00000011,
>+	0x000100fd,0x00010038
>+};
>+
>+#if 0  // Generated from:
>+#version 450 core
>+
>+layout(push_constant)uniform PushConstants {
>+       uvec4 clearColor;
>+} params;
>+
>+layout(location = 2)out uvec4 colorOut;
>+
>+void main()
>+{
>+    colorOut = params . clearColor;
>+}
>+#endif  // Preprocessed code
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000013.inc b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000013.inc
>new file mode 100644
>index 00000000000..513bbc5094b
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000013.inc
>@@ -0,0 +1,36 @@
>+	// 7.11.3188
>+	 #pragma once
>+const uint32_t kImageClear_frag_00000013[] = {
>+	0x07230203,0x00010000,0x00080007,0x00000012,0x00000000,0x00020011,0x00000001,0x0006000b,
>+	0x00000001,0x4c534c47,0x6474732e,0x3035342e,0x00000000,0x0003000e,0x00000000,0x00000001,
>+	0x0006000f,0x00000004,0x00000004,0x6e69616d,0x00000000,0x00000009,0x00030010,0x00000004,
>+	0x00000007,0x00030003,0x00000002,0x000001c2,0x00040005,0x00000004,0x6e69616d,0x00000000,
>+	0x00050005,0x00000009,0x6f6c6f63,0x74754f72,0x00000000,0x00060005,0x0000000a,0x68737550,
>+	0x736e6f43,0x746e6174,0x00000073,0x00060006,0x0000000a,0x00000000,0x61656c63,0x6c6f4372,
>+	0x0000726f,0x00040005,0x0000000c,0x61726170,0x0000736d,0x00040047,0x00000009,0x0000001e,
>+	0x00000003,0x00050048,0x0000000a,0x00000000,0x00000023,0x00000000,0x00030047,0x0000000a,
>+	0x00000002,0x00020013,0x00000002,0x00030021,0x00000003,0x00000002,0x00040015,0x00000006,
>+	0x00000020,0x00000000,0x00040017,0x00000007,0x00000006,0x00000004,0x00040020,0x00000008,
>+	0x00000003,0x00000007,0x0004003b,0x00000008,0x00000009,0x00000003,0x0003001e,0x0000000a,
>+	0x00000007,0x00040020,0x0000000b,0x00000009,0x0000000a,0x0004003b,0x0000000b,0x0000000c,
>+	0x00000009,0x00040015,0x0000000d,0x00000020,0x00000001,0x0004002b,0x0000000d,0x0000000e,
>+	0x00000000,0x00040020,0x0000000f,0x00000009,0x00000007,0x00050036,0x00000002,0x00000004,
>+	0x00000000,0x00000003,0x000200f8,0x00000005,0x00050041,0x0000000f,0x00000010,0x0000000c,
>+	0x0000000e,0x0004003d,0x00000007,0x00000011,0x00000010,0x0003003e,0x00000009,0x00000011,
>+	0x000100fd,0x00010038
>+};
>+
>+#if 0  // Generated from:
>+#version 450 core
>+
>+layout(push_constant)uniform PushConstants {
>+       uvec4 clearColor;
>+} params;
>+
>+layout(location = 3)out uvec4 colorOut;
>+
>+void main()
>+{
>+    colorOut = params . clearColor;
>+}
>+#endif  // Preprocessed code
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000014.inc b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000014.inc
>new file mode 100644
>index 00000000000..53ab0813664
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000014.inc
>@@ -0,0 +1,36 @@
>+	// 7.11.3188
>+	 #pragma once
>+const uint32_t kImageClear_frag_00000014[] = {
>+	0x07230203,0x00010000,0x00080007,0x00000012,0x00000000,0x00020011,0x00000001,0x0006000b,
>+	0x00000001,0x4c534c47,0x6474732e,0x3035342e,0x00000000,0x0003000e,0x00000000,0x00000001,
>+	0x0006000f,0x00000004,0x00000004,0x6e69616d,0x00000000,0x00000009,0x00030010,0x00000004,
>+	0x00000007,0x00030003,0x00000002,0x000001c2,0x00040005,0x00000004,0x6e69616d,0x00000000,
>+	0x00050005,0x00000009,0x6f6c6f63,0x74754f72,0x00000000,0x00060005,0x0000000a,0x68737550,
>+	0x736e6f43,0x746e6174,0x00000073,0x00060006,0x0000000a,0x00000000,0x61656c63,0x6c6f4372,
>+	0x0000726f,0x00040005,0x0000000c,0x61726170,0x0000736d,0x00040047,0x00000009,0x0000001e,
>+	0x00000004,0x00050048,0x0000000a,0x00000000,0x00000023,0x00000000,0x00030047,0x0000000a,
>+	0x00000002,0x00020013,0x00000002,0x00030021,0x00000003,0x00000002,0x00040015,0x00000006,
>+	0x00000020,0x00000000,0x00040017,0x00000007,0x00000006,0x00000004,0x00040020,0x00000008,
>+	0x00000003,0x00000007,0x0004003b,0x00000008,0x00000009,0x00000003,0x0003001e,0x0000000a,
>+	0x00000007,0x00040020,0x0000000b,0x00000009,0x0000000a,0x0004003b,0x0000000b,0x0000000c,
>+	0x00000009,0x00040015,0x0000000d,0x00000020,0x00000001,0x0004002b,0x0000000d,0x0000000e,
>+	0x00000000,0x00040020,0x0000000f,0x00000009,0x00000007,0x00050036,0x00000002,0x00000004,
>+	0x00000000,0x00000003,0x000200f8,0x00000005,0x00050041,0x0000000f,0x00000010,0x0000000c,
>+	0x0000000e,0x0004003d,0x00000007,0x00000011,0x00000010,0x0003003e,0x00000009,0x00000011,
>+	0x000100fd,0x00010038
>+};
>+
>+#if 0  // Generated from:
>+#version 450 core
>+
>+layout(push_constant)uniform PushConstants {
>+       uvec4 clearColor;
>+} params;
>+
>+layout(location = 4)out uvec4 colorOut;
>+
>+void main()
>+{
>+    colorOut = params . clearColor;
>+}
>+#endif  // Preprocessed code
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000015.inc b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000015.inc
>new file mode 100644
>index 00000000000..f8157cd06fc
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000015.inc
>@@ -0,0 +1,36 @@
>+	// 7.11.3188
>+	 #pragma once
>+const uint32_t kImageClear_frag_00000015[] = {
>+	0x07230203,0x00010000,0x00080007,0x00000012,0x00000000,0x00020011,0x00000001,0x0006000b,
>+	0x00000001,0x4c534c47,0x6474732e,0x3035342e,0x00000000,0x0003000e,0x00000000,0x00000001,
>+	0x0006000f,0x00000004,0x00000004,0x6e69616d,0x00000000,0x00000009,0x00030010,0x00000004,
>+	0x00000007,0x00030003,0x00000002,0x000001c2,0x00040005,0x00000004,0x6e69616d,0x00000000,
>+	0x00050005,0x00000009,0x6f6c6f63,0x74754f72,0x00000000,0x00060005,0x0000000a,0x68737550,
>+	0x736e6f43,0x746e6174,0x00000073,0x00060006,0x0000000a,0x00000000,0x61656c63,0x6c6f4372,
>+	0x0000726f,0x00040005,0x0000000c,0x61726170,0x0000736d,0x00040047,0x00000009,0x0000001e,
>+	0x00000005,0x00050048,0x0000000a,0x00000000,0x00000023,0x00000000,0x00030047,0x0000000a,
>+	0x00000002,0x00020013,0x00000002,0x00030021,0x00000003,0x00000002,0x00040015,0x00000006,
>+	0x00000020,0x00000000,0x00040017,0x00000007,0x00000006,0x00000004,0x00040020,0x00000008,
>+	0x00000003,0x00000007,0x0004003b,0x00000008,0x00000009,0x00000003,0x0003001e,0x0000000a,
>+	0x00000007,0x00040020,0x0000000b,0x00000009,0x0000000a,0x0004003b,0x0000000b,0x0000000c,
>+	0x00000009,0x00040015,0x0000000d,0x00000020,0x00000001,0x0004002b,0x0000000d,0x0000000e,
>+	0x00000000,0x00040020,0x0000000f,0x00000009,0x00000007,0x00050036,0x00000002,0x00000004,
>+	0x00000000,0x00000003,0x000200f8,0x00000005,0x00050041,0x0000000f,0x00000010,0x0000000c,
>+	0x0000000e,0x0004003d,0x00000007,0x00000011,0x00000010,0x0003003e,0x00000009,0x00000011,
>+	0x000100fd,0x00010038
>+};
>+
>+#if 0  // Generated from:
>+#version 450 core
>+
>+layout(push_constant)uniform PushConstants {
>+       uvec4 clearColor;
>+} params;
>+
>+layout(location = 5)out uvec4 colorOut;
>+
>+void main()
>+{
>+    colorOut = params . clearColor;
>+}
>+#endif  // Preprocessed code
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000016.inc b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000016.inc
>new file mode 100644
>index 00000000000..f6fd93bb7e2
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000016.inc
>@@ -0,0 +1,36 @@
>+	// 7.11.3188
>+	 #pragma once
>+const uint32_t kImageClear_frag_00000016[] = {
>+	0x07230203,0x00010000,0x00080007,0x00000012,0x00000000,0x00020011,0x00000001,0x0006000b,
>+	0x00000001,0x4c534c47,0x6474732e,0x3035342e,0x00000000,0x0003000e,0x00000000,0x00000001,
>+	0x0006000f,0x00000004,0x00000004,0x6e69616d,0x00000000,0x00000009,0x00030010,0x00000004,
>+	0x00000007,0x00030003,0x00000002,0x000001c2,0x00040005,0x00000004,0x6e69616d,0x00000000,
>+	0x00050005,0x00000009,0x6f6c6f63,0x74754f72,0x00000000,0x00060005,0x0000000a,0x68737550,
>+	0x736e6f43,0x746e6174,0x00000073,0x00060006,0x0000000a,0x00000000,0x61656c63,0x6c6f4372,
>+	0x0000726f,0x00040005,0x0000000c,0x61726170,0x0000736d,0x00040047,0x00000009,0x0000001e,
>+	0x00000006,0x00050048,0x0000000a,0x00000000,0x00000023,0x00000000,0x00030047,0x0000000a,
>+	0x00000002,0x00020013,0x00000002,0x00030021,0x00000003,0x00000002,0x00040015,0x00000006,
>+	0x00000020,0x00000000,0x00040017,0x00000007,0x00000006,0x00000004,0x00040020,0x00000008,
>+	0x00000003,0x00000007,0x0004003b,0x00000008,0x00000009,0x00000003,0x0003001e,0x0000000a,
>+	0x00000007,0x00040020,0x0000000b,0x00000009,0x0000000a,0x0004003b,0x0000000b,0x0000000c,
>+	0x00000009,0x00040015,0x0000000d,0x00000020,0x00000001,0x0004002b,0x0000000d,0x0000000e,
>+	0x00000000,0x00040020,0x0000000f,0x00000009,0x00000007,0x00050036,0x00000002,0x00000004,
>+	0x00000000,0x00000003,0x000200f8,0x00000005,0x00050041,0x0000000f,0x00000010,0x0000000c,
>+	0x0000000e,0x0004003d,0x00000007,0x00000011,0x00000010,0x0003003e,0x00000009,0x00000011,
>+	0x000100fd,0x00010038
>+};
>+
>+#if 0  // Generated from:
>+#version 450 core
>+
>+layout(push_constant)uniform PushConstants {
>+       uvec4 clearColor;
>+} params;
>+
>+layout(location = 6)out uvec4 colorOut;
>+
>+void main()
>+{
>+    colorOut = params . clearColor;
>+}
>+#endif  // Preprocessed code
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000017.inc b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000017.inc
>new file mode 100644
>index 00000000000..5d57bba79c8
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000017.inc
>@@ -0,0 +1,36 @@
>+	// 7.11.3188
>+	 #pragma once
>+const uint32_t kImageClear_frag_00000017[] = {
>+	0x07230203,0x00010000,0x00080007,0x00000012,0x00000000,0x00020011,0x00000001,0x0006000b,
>+	0x00000001,0x4c534c47,0x6474732e,0x3035342e,0x00000000,0x0003000e,0x00000000,0x00000001,
>+	0x0006000f,0x00000004,0x00000004,0x6e69616d,0x00000000,0x00000009,0x00030010,0x00000004,
>+	0x00000007,0x00030003,0x00000002,0x000001c2,0x00040005,0x00000004,0x6e69616d,0x00000000,
>+	0x00050005,0x00000009,0x6f6c6f63,0x74754f72,0x00000000,0x00060005,0x0000000a,0x68737550,
>+	0x736e6f43,0x746e6174,0x00000073,0x00060006,0x0000000a,0x00000000,0x61656c63,0x6c6f4372,
>+	0x0000726f,0x00040005,0x0000000c,0x61726170,0x0000736d,0x00040047,0x00000009,0x0000001e,
>+	0x00000007,0x00050048,0x0000000a,0x00000000,0x00000023,0x00000000,0x00030047,0x0000000a,
>+	0x00000002,0x00020013,0x00000002,0x00030021,0x00000003,0x00000002,0x00040015,0x00000006,
>+	0x00000020,0x00000000,0x00040017,0x00000007,0x00000006,0x00000004,0x00040020,0x00000008,
>+	0x00000003,0x00000007,0x0004003b,0x00000008,0x00000009,0x00000003,0x0003001e,0x0000000a,
>+	0x00000007,0x00040020,0x0000000b,0x00000009,0x0000000a,0x0004003b,0x0000000b,0x0000000c,
>+	0x00000009,0x00040015,0x0000000d,0x00000020,0x00000001,0x0004002b,0x0000000d,0x0000000e,
>+	0x00000000,0x00040020,0x0000000f,0x00000009,0x00000007,0x00050036,0x00000002,0x00000004,
>+	0x00000000,0x00000003,0x000200f8,0x00000005,0x00050041,0x0000000f,0x00000010,0x0000000c,
>+	0x0000000e,0x0004003d,0x00000007,0x00000011,0x00000010,0x0003003e,0x00000009,0x00000011,
>+	0x000100fd,0x00010038
>+};
>+
>+#if 0  // Generated from:
>+#version 450 core
>+
>+layout(push_constant)uniform PushConstants {
>+       uvec4 clearColor;
>+} params;
>+
>+layout(location = 7)out uvec4 colorOut;
>+
>+void main()
>+{
>+    colorOut = params . clearColor;
>+}
>+#endif  // Preprocessed code
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000000.inc b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000000.inc
>new file mode 100644
>index 00000000000..2219c1e0bfa
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000000.inc
>@@ -0,0 +1,208 @@
>+	// 7.11.3188
>+	 #pragma once
>+const uint32_t kImageCopy_frag_00000000[] = {
>+	0x07230203,0x00010000,0x00080007,0x00000099,0x00000000,0x00020011,0x00000001,0x0006000b,
>+	0x00000001,0x4c534c47,0x6474732e,0x3035342e,0x00000000,0x0003000e,0x00000000,0x00000001,
>+	0x0007000f,0x00000004,0x00000004,0x6e69616d,0x00000000,0x0000000d,0x00000097,0x00030010,
>+	0x00000004,0x00000007,0x00030003,0x00000002,0x000001c2,0x000b0004,0x455f4c47,0x735f5458,
>+	0x6c706d61,0x656c7265,0x745f7373,0x75747865,0x665f6572,0x74636e75,0x736e6f69,0x00000000,
>+	0x00040005,0x00000004,0x6e69616d,0x00000000,0x00070005,0x00000009,0x74736564,0x49627553,
>+	0x6567616d,0x726f6f43,0x00007364,0x00060005,0x0000000d,0x465f6c67,0x43676172,0x64726f6f,
>+	0x00000000,0x00060005,0x00000013,0x68737550,0x736e6f43,0x746e6174,0x00000073,0x00060006,
>+	0x00000013,0x00000000,0x4f637273,0x65736666,0x00000074,0x00060006,0x00000013,0x00000001,
>+	0x74736564,0x7366664f,0x00007465,0x00050006,0x00000013,0x00000002,0x4d637273,0x00007069,
>+	0x00060006,0x00000013,0x00000003,0x4c637273,0x72657961,0x00000000,0x00050006,0x00000013,
>+	0x00000004,0x70696c66,0x00000059,0x00080006,0x00000013,0x00000005,0x6d657270,0x69746c75,
>+	0x41796c70,0x6168706c,0x00000000,0x00070006,0x00000013,0x00000006,0x756d6e75,0x7069746c,
>+	0x6c41796c,0x00616870,0x00080006,0x00000013,0x00000007,0x74736564,0x4c736148,0x6e696d75,
>+	0x65636e61,0x00000000,0x00060006,0x00000013,0x00000008,0x74736564,0x6c417349,0x00616870,
>+	0x00090006,0x00000013,0x00000009,0x74736564,0x61666544,0x43746c75,0x6e6e6168,0x4d736c65,
>+	0x006b7361,0x00040005,0x00000015,0x61726170,0x0000736d,0x00070005,0x0000001b,0x53637273,
>+	0x6d496275,0x43656761,0x64726f6f,0x00000073,0x00050005,0x0000002d,0x56637273,0x65756c61,
>+	0x00000000,0x00030005,0x00000030,0x00637273,0x00050005,0x00000062,0x74736564,0x756c6156,
>+	0x00000065,0x00070005,0x0000007e,0x61666564,0x43746c75,0x6e6e6168,0x4d736c65,0x006b7361,
>+	0x00040005,0x00000097,0x74736564,0x00000000,0x00040047,0x0000000d,0x0000000b,0x0000000f,
>+	0x00050048,0x00000013,0x00000000,0x00000023,0x00000000,0x00050048,0x00000013,0x00000001,
>+	0x00000023,0x00000008,0x00050048,0x00000013,0x00000002,0x00000023,0x00000010,0x00050048,
>+	0x00000013,0x00000003,0x00000023,0x00000014,0x00050048,0x00000013,0x00000004,0x00000023,
>+	0x00000018,0x00050048,0x00000013,0x00000005,0x00000023,0x0000001c,0x00050048,0x00000013,
>+	0x00000006,0x00000023,0x00000020,0x00050048,0x00000013,0x00000007,0x00000023,0x00000024,
>+	0x00050048,0x00000013,0x00000008,0x00000023,0x00000028,0x00050048,0x00000013,0x00000009,
>+	0x00000023,0x0000002c,0x00030047,0x00000013,0x00000002,0x00040047,0x00000030,0x00000022,
>+	0x00000000,0x00040047,0x00000030,0x00000021,0x00000000,0x00040047,0x00000097,0x0000001e,
>+	0x00000000,0x00020013,0x00000002,0x00030021,0x00000003,0x00000002,0x00040015,0x00000006,
>+	0x00000020,0x00000001,0x00040017,0x00000007,0x00000006,0x00000002,0x00040020,0x00000008,
>+	0x00000007,0x00000007,0x00030016,0x0000000a,0x00000020,0x00040017,0x0000000b,0x0000000a,
>+	0x00000004,0x00040020,0x0000000c,0x00000001,0x0000000b,0x0004003b,0x0000000c,0x0000000d,
>+	0x00000001,0x00040017,0x0000000e,0x0000000a,0x00000002,0x00040015,0x00000012,0x00000020,
>+	0x00000000,0x000c001e,0x00000013,0x00000007,0x00000007,0x00000006,0x00000006,0x00000012,
>+	0x00000012,0x00000012,0x00000012,0x00000012,0x00000006,0x00040020,0x00000014,0x00000009,
>+	0x00000013,0x0004003b,0x00000014,0x00000015,0x00000009,0x0004002b,0x00000006,0x00000016,
>+	0x00000001,0x00040020,0x00000017,0x00000009,0x00000007,0x0004002b,0x00000006,0x0000001d,
>+	0x00000004,0x00040020,0x0000001e,0x00000009,0x00000012,0x00020014,0x00000021,0x0004002b,
>+	0x00000012,0x00000022,0x00000000,0x0004002b,0x00000012,0x00000026,0x00000001,0x00040020,
>+	0x00000027,0x00000007,0x00000006,0x00040020,0x0000002c,0x00000007,0x0000000b,0x00090019,
>+	0x0000002e,0x0000000a,0x00000001,0x00000000,0x00000000,0x00000000,0x00000001,0x00000000,
>+	0x00040020,0x0000002f,0x00000000,0x0000002e,0x0004003b,0x0000002f,0x00000030,0x00000000,
>+	0x0004002b,0x00000006,0x00000032,0x00000000,0x0004002b,0x00000006,0x00000037,0x00000002,
>+	0x00040020,0x00000038,0x00000009,0x00000006,0x0004002b,0x00000006,0x0000003c,0x00000005,
>+	0x0004002b,0x00000012,0x00000042,0x00000003,0x00040020,0x00000043,0x00000007,0x0000000a,
>+	0x00040017,0x00000046,0x0000000a,0x00000003,0x0004002b,0x00000006,0x0000004d,0x00000006,
>+	0x0004002b,0x0000000a,0x00000055,0x00000000,0x0004002b,0x00000006,0x00000069,0x00000007,
>+	0x0004002b,0x00000006,0x00000074,0x00000008,0x0004002b,0x00000006,0x0000007f,0x00000009,
>+	0x0004002b,0x00000012,0x0000008d,0x00000002,0x0004002b,0x0000000a,0x00000094,0x3f800000,
>+	0x00040020,0x00000096,0x00000003,0x0000000b,0x0004003b,0x00000096,0x00000097,0x00000003,
>+	0x00050036,0x00000002,0x00000004,0x00000000,0x00000003,0x000200f8,0x00000005,0x0004003b,
>+	0x00000008,0x00000009,0x00000007,0x0004003b,0x00000008,0x0000001b,0x00000007,0x0004003b,
>+	0x0000002c,0x0000002d,0x00000007,0x0004003b,0x0000002c,0x00000062,0x00000007,0x0004003b,
>+	0x00000027,0x0000007e,0x00000007,0x0004003d,0x0000000b,0x0000000f,0x0000000d,0x0007004f,
>+	0x0000000e,0x00000010,0x0000000f,0x0000000f,0x00000000,0x00000001,0x0004006e,0x00000007,
>+	0x00000011,0x00000010,0x00050041,0x00000017,0x00000018,0x00000015,0x00000016,0x0004003d,
>+	0x00000007,0x00000019,0x00000018,0x00050082,0x00000007,0x0000001a,0x00000011,0x00000019,
>+	0x0003003e,0x00000009,0x0000001a,0x0004003d,0x00000007,0x0000001c,0x00000009,0x0003003e,
>+	0x0000001b,0x0000001c,0x00050041,0x0000001e,0x0000001f,0x00000015,0x0000001d,0x0004003d,
>+	0x00000012,0x00000020,0x0000001f,0x000500ab,0x00000021,0x00000023,0x00000020,0x00000022,
>+	0x000300f7,0x00000025,0x00000000,0x000400fa,0x00000023,0x00000024,0x00000025,0x000200f8,
>+	0x00000024,0x00050041,0x00000027,0x00000028,0x0000001b,0x00000026,0x0004003d,0x00000006,
>+	0x00000029,0x00000028,0x0004007e,0x00000006,0x0000002a,0x00000029,0x00050041,0x00000027,
>+	0x0000002b,0x0000001b,0x00000026,0x0003003e,0x0000002b,0x0000002a,0x000200f9,0x00000025,
>+	0x000200f8,0x00000025,0x0004003d,0x0000002e,0x00000031,0x00000030,0x00050041,0x00000017,
>+	0x00000033,0x00000015,0x00000032,0x0004003d,0x00000007,0x00000034,0x00000033,0x0004003d,
>+	0x00000007,0x00000035,0x0000001b,0x00050080,0x00000007,0x00000036,0x00000034,0x00000035,
>+	0x00050041,0x00000038,0x00000039,0x00000015,0x00000037,0x0004003d,0x00000006,0x0000003a,
>+	0x00000039,0x0007005f,0x0000000b,0x0000003b,0x00000031,0x00000036,0x00000002,0x0000003a,
>+	0x0003003e,0x0000002d,0x0000003b,0x00050041,0x0000001e,0x0000003d,0x00000015,0x0000003c,
>+	0x0004003d,0x00000012,0x0000003e,0x0000003d,0x000500ab,0x00000021,0x0000003f,0x0000003e,
>+	0x00000022,0x000300f7,0x00000041,0x00000000,0x000400fa,0x0000003f,0x00000040,0x0000004c,
>+	0x000200f8,0x00000040,0x00050041,0x00000043,0x00000044,0x0000002d,0x00000042,0x0004003d,
>+	0x0000000a,0x00000045,0x00000044,0x0004003d,0x0000000b,0x00000047,0x0000002d,0x0008004f,
>+	0x00000046,0x00000048,0x00000047,0x00000047,0x00000000,0x00000001,0x00000002,0x0005008e,
>+	0x00000046,0x00000049,0x00000048,0x00000045,0x0004003d,0x0000000b,0x0000004a,0x0000002d,
>+	0x0009004f,0x0000000b,0x0000004b,0x0000004a,0x00000049,0x00000004,0x00000005,0x00000006,
>+	0x00000003,0x0003003e,0x0000002d,0x0000004b,0x000200f9,0x00000041,0x000200f8,0x0000004c,
>+	0x00050041,0x0000001e,0x0000004e,0x00000015,0x0000004d,0x0004003d,0x00000012,0x0000004f,
>+	0x0000004e,0x000500ab,0x00000021,0x00000050,0x0000004f,0x00000022,0x000300f7,0x00000052,
>+	0x00000000,0x000400fa,0x00000050,0x00000051,0x00000052,0x000200f8,0x00000051,0x00050041,
>+	0x00000043,0x00000053,0x0000002d,0x00000042,0x0004003d,0x0000000a,0x00000054,0x00000053,
>+	0x000500ba,0x00000021,0x00000056,0x00000054,0x00000055,0x000200f9,0x00000052,0x000200f8,
>+	0x00000052,0x000700f5,0x00000021,0x00000057,0x00000050,0x0000004c,0x00000056,0x00000051,
>+	0x000300f7,0x00000059,0x00000000,0x000400fa,0x00000057,0x00000058,0x00000059,0x000200f8,
>+	0x00000058,0x00050041,0x00000043,0x0000005a,0x0000002d,0x00000042,0x0004003d,0x0000000a,
>+	0x0000005b,0x0000005a,0x0004003d,0x0000000b,0x0000005c,0x0000002d,0x0008004f,0x00000046,
>+	0x0000005d,0x0000005c,0x0000005c,0x00000000,0x00000001,0x00000002,0x00060050,0x00000046,
>+	0x0000005e,0x0000005b,0x0000005b,0x0000005b,0x00050088,0x00000046,0x0000005f,0x0000005d,
>+	0x0000005e,0x0004003d,0x0000000b,0x00000060,0x0000002d,0x0009004f,0x0000000b,0x00000061,
>+	0x00000060,0x0000005f,0x00000004,0x00000005,0x00000006,0x00000003,0x0003003e,0x0000002d,
>+	0x00000061,0x000200f9,0x00000059,0x000200f8,0x00000059,0x000200f9,0x00000041,0x000200f8,
>+	0x00000041,0x0004003d,0x0000000b,0x00000063,0x0000002d,0x00050051,0x0000000a,0x00000064,
>+	0x00000063,0x00000000,0x00050051,0x0000000a,0x00000065,0x00000063,0x00000001,0x00050051,
>+	0x0000000a,0x00000066,0x00000063,0x00000002,0x00050051,0x0000000a,0x00000067,0x00000063,
>+	0x00000003,0x00070050,0x0000000b,0x00000068,0x00000064,0x00000065,0x00000066,0x00000067,
>+	0x0003003e,0x00000062,0x00000068,0x00050041,0x0000001e,0x0000006a,0x00000015,0x00000069,
>+	0x0004003d,0x00000012,0x0000006b,0x0000006a,0x000500ab,0x00000021,0x0000006c,0x0000006b,
>+	0x00000022,0x000300f7,0x0000006e,0x00000000,0x000400fa,0x0000006c,0x0000006d,0x00000073,
>+	0x000200f8,0x0000006d,0x0004003d,0x0000000b,0x0000006f,0x00000062,0x0007004f,0x0000000e,
>+	0x00000070,0x0000006f,0x0000006f,0x00000000,0x00000003,0x0004003d,0x0000000b,0x00000071,
>+	0x00000062,0x0009004f,0x0000000b,0x00000072,0x00000071,0x00000070,0x00000004,0x00000005,
>+	0x00000002,0x00000003,0x0003003e,0x00000062,0x00000072,0x000200f9,0x0000006e,0x000200f8,
>+	0x00000073,0x00050041,0x0000001e,0x00000075,0x00000015,0x00000074,0x0004003d,0x00000012,
>+	0x00000076,0x00000075,0x000500ab,0x00000021,0x00000077,0x00000076,0x00000022,0x000300f7,
>+	0x00000079,0x00000000,0x000400fa,0x00000077,0x00000078,0x0000007d,0x000200f8,0x00000078,
>+	0x00050041,0x00000043,0x0000007a,0x00000062,0x00000042,0x0004003d,0x0000000a,0x0000007b,
>+	0x0000007a,0x00050041,0x00000043,0x0000007c,0x00000062,0x00000022,0x0003003e,0x0000007c,
>+	0x0000007b,0x000200f9,0x00000079,0x000200f8,0x0000007d,0x00050041,0x00000038,0x00000080,
>+	0x00000015,0x0000007f,0x0004003d,0x00000006,0x00000081,0x00000080,0x0003003e,0x0000007e,
>+	0x00000081,0x0004003d,0x00000006,0x00000082,0x0000007e,0x000500c7,0x00000006,0x00000083,
>+	0x00000082,0x00000037,0x000500ab,0x00000021,0x00000084,0x00000083,0x00000032,0x000300f7,
>+	0x00000086,0x00000000,0x000400fa,0x00000084,0x00000085,0x00000086,0x000200f8,0x00000085,
>+	0x00050041,0x00000043,0x00000087,0x00000062,0x00000026,0x0003003e,0x00000087,0x00000055,
>+	0x000200f9,0x00000086,0x000200f8,0x00000086,0x0004003d,0x00000006,0x00000088,0x0000007e,
>+	0x000500c7,0x00000006,0x00000089,0x00000088,0x0000001d,0x000500ab,0x00000021,0x0000008a,
>+	0x00000089,0x00000032,0x000300f7,0x0000008c,0x00000000,0x000400fa,0x0000008a,0x0000008b,
>+	0x0000008c,0x000200f8,0x0000008b,0x00050041,0x00000043,0x0000008e,0x00000062,0x0000008d,
>+	0x0003003e,0x0000008e,0x00000055,0x000200f9,0x0000008c,0x000200f8,0x0000008c,0x0004003d,
>+	0x00000006,0x0000008f,0x0000007e,0x000500c7,0x00000006,0x00000090,0x0000008f,0x00000074,
>+	0x000500ab,0x00000021,0x00000091,0x00000090,0x00000032,0x000300f7,0x00000093,0x00000000,
>+	0x000400fa,0x00000091,0x00000092,0x00000093,0x000200f8,0x00000092,0x00050041,0x00000043,
>+	0x00000095,0x00000062,0x00000042,0x0003003e,0x00000095,0x00000094,0x000200f9,0x00000093,
>+	0x000200f8,0x00000093,0x000200f9,0x00000079,0x000200f8,0x00000079,0x000200f9,0x0000006e,
>+	0x000200f8,0x0000006e,0x0004003d,0x0000000b,0x00000098,0x00000062,0x0003003e,0x00000097,
>+	0x00000098,0x000100fd,0x00010038
>+};
>+
>+#if 0  // Generated from:
>+#version 450 core
>+
>+#extension GL_EXT_samplerless_texture_functions : require
>+
>+layout(set = 0, binding = 0)uniform texture2D src;
>+layout(location = 0)out vec4 dest;
>+
>+layout(push_constant)uniform PushConstants {
>+
>+    ivec2 srcOffset;
>+    ivec2 destOffset;
>+    int srcMip;
>+    int srcLayer;
>+
>+    bool flipY;
>+
>+    bool premultiplyAlpha;
>+    bool unmultiplyAlpha;
>+
>+    bool destHasLuminance;
>+    bool destIsAlpha;
>+
>+    int destDefaultChannelsMask;
>+} params;
>+
>+void main()
>+{
>+    ivec2 destSubImageCoords = ivec2(gl_FragCoord . xy)- params . destOffset;
>+
>+    ivec2 srcSubImageCoords = destSubImageCoords;
>+
>+    if(params . flipY)
>+        srcSubImageCoords . y = - srcSubImageCoords . y;
>+
>+          vec4 srcValue = texelFetch(src, params . srcOffset + srcSubImageCoords, params . srcMip);
>+
>+    if(params . premultiplyAlpha)
>+    {
>+        srcValue . rgb *= srcValue . a;
>+    }
>+    else if(params . unmultiplyAlpha && srcValue . a > 0)
>+    {
>+        srcValue . rgb /= srcValue . a;
>+    }
>+
>+           vec4 destValue = vec4(srcValue);
>+
>+    if(params . destHasLuminance)
>+    {
>+        destValue . rg = destValue . ra;
>+    }
>+    else if(params . destIsAlpha)
>+    {
>+        destValue . r = destValue . a;
>+    }
>+    else
>+    {
>+        int defaultChannelsMask = params . destDefaultChannelsMask;
>+        if((defaultChannelsMask & 2)!= 0)
>+        {
>+            destValue . g = 0;
>+        }
>+        if((defaultChannelsMask & 4)!= 0)
>+        {
>+            destValue . b = 0;
>+        }
>+        if((defaultChannelsMask & 8)!= 0)
>+        {
>+            destValue . a = 1;
>+        }
>+    }
>+
>+    dest = destValue;
>+}
>+#endif  // Preprocessed code
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000001.inc b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000001.inc
>new file mode 100644
>index 00000000000..a6dfa752a24
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000001.inc
>@@ -0,0 +1,212 @@
>+	// 7.11.3188
>+	 #pragma once
>+const uint32_t kImageCopy_frag_00000001[] = {
>+	0x07230203,0x00010000,0x00080007,0x000000a0,0x00000000,0x00020011,0x00000001,0x0006000b,
>+	0x00000001,0x4c534c47,0x6474732e,0x3035342e,0x00000000,0x0003000e,0x00000000,0x00000001,
>+	0x0007000f,0x00000004,0x00000004,0x6e69616d,0x00000000,0x0000000d,0x0000009e,0x00030010,
>+	0x00000004,0x00000007,0x00030003,0x00000002,0x000001c2,0x000b0004,0x455f4c47,0x735f5458,
>+	0x6c706d61,0x656c7265,0x745f7373,0x75747865,0x665f6572,0x74636e75,0x736e6f69,0x00000000,
>+	0x00040005,0x00000004,0x6e69616d,0x00000000,0x00070005,0x00000009,0x74736564,0x49627553,
>+	0x6567616d,0x726f6f43,0x00007364,0x00060005,0x0000000d,0x465f6c67,0x43676172,0x64726f6f,
>+	0x00000000,0x00060005,0x00000013,0x68737550,0x736e6f43,0x746e6174,0x00000073,0x00060006,
>+	0x00000013,0x00000000,0x4f637273,0x65736666,0x00000074,0x00060006,0x00000013,0x00000001,
>+	0x74736564,0x7366664f,0x00007465,0x00050006,0x00000013,0x00000002,0x4d637273,0x00007069,
>+	0x00060006,0x00000013,0x00000003,0x4c637273,0x72657961,0x00000000,0x00050006,0x00000013,
>+	0x00000004,0x70696c66,0x00000059,0x00080006,0x00000013,0x00000005,0x6d657270,0x69746c75,
>+	0x41796c70,0x6168706c,0x00000000,0x00070006,0x00000013,0x00000006,0x756d6e75,0x7069746c,
>+	0x6c41796c,0x00616870,0x00080006,0x00000013,0x00000007,0x74736564,0x4c736148,0x6e696d75,
>+	0x65636e61,0x00000000,0x00060006,0x00000013,0x00000008,0x74736564,0x6c417349,0x00616870,
>+	0x00090006,0x00000013,0x00000009,0x74736564,0x61666544,0x43746c75,0x6e6e6168,0x4d736c65,
>+	0x006b7361,0x00040005,0x00000015,0x61726170,0x0000736d,0x00070005,0x0000001b,0x53637273,
>+	0x6d496275,0x43656761,0x64726f6f,0x00000073,0x00050005,0x0000002d,0x56637273,0x65756c61,
>+	0x00000000,0x00030005,0x00000030,0x00637273,0x00050005,0x00000069,0x74736564,0x756c6156,
>+	0x00000065,0x00070005,0x00000085,0x61666564,0x43746c75,0x6e6e6168,0x4d736c65,0x006b7361,
>+	0x00040005,0x0000009e,0x74736564,0x00000000,0x00040047,0x0000000d,0x0000000b,0x0000000f,
>+	0x00050048,0x00000013,0x00000000,0x00000023,0x00000000,0x00050048,0x00000013,0x00000001,
>+	0x00000023,0x00000008,0x00050048,0x00000013,0x00000002,0x00000023,0x00000010,0x00050048,
>+	0x00000013,0x00000003,0x00000023,0x00000014,0x00050048,0x00000013,0x00000004,0x00000023,
>+	0x00000018,0x00050048,0x00000013,0x00000005,0x00000023,0x0000001c,0x00050048,0x00000013,
>+	0x00000006,0x00000023,0x00000020,0x00050048,0x00000013,0x00000007,0x00000023,0x00000024,
>+	0x00050048,0x00000013,0x00000008,0x00000023,0x00000028,0x00050048,0x00000013,0x00000009,
>+	0x00000023,0x0000002c,0x00030047,0x00000013,0x00000002,0x00040047,0x00000030,0x00000022,
>+	0x00000000,0x00040047,0x00000030,0x00000021,0x00000000,0x00040047,0x0000009e,0x0000001e,
>+	0x00000000,0x00020013,0x00000002,0x00030021,0x00000003,0x00000002,0x00040015,0x00000006,
>+	0x00000020,0x00000001,0x00040017,0x00000007,0x00000006,0x00000002,0x00040020,0x00000008,
>+	0x00000007,0x00000007,0x00030016,0x0000000a,0x00000020,0x00040017,0x0000000b,0x0000000a,
>+	0x00000004,0x00040020,0x0000000c,0x00000001,0x0000000b,0x0004003b,0x0000000c,0x0000000d,
>+	0x00000001,0x00040017,0x0000000e,0x0000000a,0x00000002,0x00040015,0x00000012,0x00000020,
>+	0x00000000,0x000c001e,0x00000013,0x00000007,0x00000007,0x00000006,0x00000006,0x00000012,
>+	0x00000012,0x00000012,0x00000012,0x00000012,0x00000006,0x00040020,0x00000014,0x00000009,
>+	0x00000013,0x0004003b,0x00000014,0x00000015,0x00000009,0x0004002b,0x00000006,0x00000016,
>+	0x00000001,0x00040020,0x00000017,0x00000009,0x00000007,0x0004002b,0x00000006,0x0000001d,
>+	0x00000004,0x00040020,0x0000001e,0x00000009,0x00000012,0x00020014,0x00000021,0x0004002b,
>+	0x00000012,0x00000022,0x00000000,0x0004002b,0x00000012,0x00000026,0x00000001,0x00040020,
>+	0x00000027,0x00000007,0x00000006,0x00040020,0x0000002c,0x00000007,0x0000000b,0x00090019,
>+	0x0000002e,0x0000000a,0x00000001,0x00000000,0x00000001,0x00000000,0x00000001,0x00000000,
>+	0x00040020,0x0000002f,0x00000000,0x0000002e,0x0004003b,0x0000002f,0x00000030,0x00000000,
>+	0x0004002b,0x00000006,0x00000032,0x00000000,0x0004002b,0x00000006,0x00000037,0x00000003,
>+	0x00040020,0x00000038,0x00000009,0x00000006,0x00040017,0x0000003b,0x00000006,0x00000003,
>+	0x0004002b,0x00000006,0x0000003f,0x00000002,0x0004002b,0x00000006,0x00000043,0x00000005,
>+	0x0004002b,0x00000012,0x00000049,0x00000003,0x00040020,0x0000004a,0x00000007,0x0000000a,
>+	0x00040017,0x0000004d,0x0000000a,0x00000003,0x0004002b,0x00000006,0x00000054,0x00000006,
>+	0x0004002b,0x0000000a,0x0000005c,0x00000000,0x0004002b,0x00000006,0x00000070,0x00000007,
>+	0x0004002b,0x00000006,0x0000007b,0x00000008,0x0004002b,0x00000006,0x00000086,0x00000009,
>+	0x0004002b,0x00000012,0x00000094,0x00000002,0x0004002b,0x0000000a,0x0000009b,0x3f800000,
>+	0x00040020,0x0000009d,0x00000003,0x0000000b,0x0004003b,0x0000009d,0x0000009e,0x00000003,
>+	0x00050036,0x00000002,0x00000004,0x00000000,0x00000003,0x000200f8,0x00000005,0x0004003b,
>+	0x00000008,0x00000009,0x00000007,0x0004003b,0x00000008,0x0000001b,0x00000007,0x0004003b,
>+	0x0000002c,0x0000002d,0x00000007,0x0004003b,0x0000002c,0x00000069,0x00000007,0x0004003b,
>+	0x00000027,0x00000085,0x00000007,0x0004003d,0x0000000b,0x0000000f,0x0000000d,0x0007004f,
>+	0x0000000e,0x00000010,0x0000000f,0x0000000f,0x00000000,0x00000001,0x0004006e,0x00000007,
>+	0x00000011,0x00000010,0x00050041,0x00000017,0x00000018,0x00000015,0x00000016,0x0004003d,
>+	0x00000007,0x00000019,0x00000018,0x00050082,0x00000007,0x0000001a,0x00000011,0x00000019,
>+	0x0003003e,0x00000009,0x0000001a,0x0004003d,0x00000007,0x0000001c,0x00000009,0x0003003e,
>+	0x0000001b,0x0000001c,0x00050041,0x0000001e,0x0000001f,0x00000015,0x0000001d,0x0004003d,
>+	0x00000012,0x00000020,0x0000001f,0x000500ab,0x00000021,0x00000023,0x00000020,0x00000022,
>+	0x000300f7,0x00000025,0x00000000,0x000400fa,0x00000023,0x00000024,0x00000025,0x000200f8,
>+	0x00000024,0x00050041,0x00000027,0x00000028,0x0000001b,0x00000026,0x0004003d,0x00000006,
>+	0x00000029,0x00000028,0x0004007e,0x00000006,0x0000002a,0x00000029,0x00050041,0x00000027,
>+	0x0000002b,0x0000001b,0x00000026,0x0003003e,0x0000002b,0x0000002a,0x000200f9,0x00000025,
>+	0x000200f8,0x00000025,0x0004003d,0x0000002e,0x00000031,0x00000030,0x00050041,0x00000017,
>+	0x00000033,0x00000015,0x00000032,0x0004003d,0x00000007,0x00000034,0x00000033,0x0004003d,
>+	0x00000007,0x00000035,0x0000001b,0x00050080,0x00000007,0x00000036,0x00000034,0x00000035,
>+	0x00050041,0x00000038,0x00000039,0x00000015,0x00000037,0x0004003d,0x00000006,0x0000003a,
>+	0x00000039,0x00050051,0x00000006,0x0000003c,0x00000036,0x00000000,0x00050051,0x00000006,
>+	0x0000003d,0x00000036,0x00000001,0x00060050,0x0000003b,0x0000003e,0x0000003c,0x0000003d,
>+	0x0000003a,0x00050041,0x00000038,0x00000040,0x00000015,0x0000003f,0x0004003d,0x00000006,
>+	0x00000041,0x00000040,0x0007005f,0x0000000b,0x00000042,0x00000031,0x0000003e,0x00000002,
>+	0x00000041,0x0003003e,0x0000002d,0x00000042,0x00050041,0x0000001e,0x00000044,0x00000015,
>+	0x00000043,0x0004003d,0x00000012,0x00000045,0x00000044,0x000500ab,0x00000021,0x00000046,
>+	0x00000045,0x00000022,0x000300f7,0x00000048,0x00000000,0x000400fa,0x00000046,0x00000047,
>+	0x00000053,0x000200f8,0x00000047,0x00050041,0x0000004a,0x0000004b,0x0000002d,0x00000049,
>+	0x0004003d,0x0000000a,0x0000004c,0x0000004b,0x0004003d,0x0000000b,0x0000004e,0x0000002d,
>+	0x0008004f,0x0000004d,0x0000004f,0x0000004e,0x0000004e,0x00000000,0x00000001,0x00000002,
>+	0x0005008e,0x0000004d,0x00000050,0x0000004f,0x0000004c,0x0004003d,0x0000000b,0x00000051,
>+	0x0000002d,0x0009004f,0x0000000b,0x00000052,0x00000051,0x00000050,0x00000004,0x00000005,
>+	0x00000006,0x00000003,0x0003003e,0x0000002d,0x00000052,0x000200f9,0x00000048,0x000200f8,
>+	0x00000053,0x00050041,0x0000001e,0x00000055,0x00000015,0x00000054,0x0004003d,0x00000012,
>+	0x00000056,0x00000055,0x000500ab,0x00000021,0x00000057,0x00000056,0x00000022,0x000300f7,
>+	0x00000059,0x00000000,0x000400fa,0x00000057,0x00000058,0x00000059,0x000200f8,0x00000058,
>+	0x00050041,0x0000004a,0x0000005a,0x0000002d,0x00000049,0x0004003d,0x0000000a,0x0000005b,
>+	0x0000005a,0x000500ba,0x00000021,0x0000005d,0x0000005b,0x0000005c,0x000200f9,0x00000059,
>+	0x000200f8,0x00000059,0x000700f5,0x00000021,0x0000005e,0x00000057,0x00000053,0x0000005d,
>+	0x00000058,0x000300f7,0x00000060,0x00000000,0x000400fa,0x0000005e,0x0000005f,0x00000060,
>+	0x000200f8,0x0000005f,0x00050041,0x0000004a,0x00000061,0x0000002d,0x00000049,0x0004003d,
>+	0x0000000a,0x00000062,0x00000061,0x0004003d,0x0000000b,0x00000063,0x0000002d,0x0008004f,
>+	0x0000004d,0x00000064,0x00000063,0x00000063,0x00000000,0x00000001,0x00000002,0x00060050,
>+	0x0000004d,0x00000065,0x00000062,0x00000062,0x00000062,0x00050088,0x0000004d,0x00000066,
>+	0x00000064,0x00000065,0x0004003d,0x0000000b,0x00000067,0x0000002d,0x0009004f,0x0000000b,
>+	0x00000068,0x00000067,0x00000066,0x00000004,0x00000005,0x00000006,0x00000003,0x0003003e,
>+	0x0000002d,0x00000068,0x000200f9,0x00000060,0x000200f8,0x00000060,0x000200f9,0x00000048,
>+	0x000200f8,0x00000048,0x0004003d,0x0000000b,0x0000006a,0x0000002d,0x00050051,0x0000000a,
>+	0x0000006b,0x0000006a,0x00000000,0x00050051,0x0000000a,0x0000006c,0x0000006a,0x00000001,
>+	0x00050051,0x0000000a,0x0000006d,0x0000006a,0x00000002,0x00050051,0x0000000a,0x0000006e,
>+	0x0000006a,0x00000003,0x00070050,0x0000000b,0x0000006f,0x0000006b,0x0000006c,0x0000006d,
>+	0x0000006e,0x0003003e,0x00000069,0x0000006f,0x00050041,0x0000001e,0x00000071,0x00000015,
>+	0x00000070,0x0004003d,0x00000012,0x00000072,0x00000071,0x000500ab,0x00000021,0x00000073,
>+	0x00000072,0x00000022,0x000300f7,0x00000075,0x00000000,0x000400fa,0x00000073,0x00000074,
>+	0x0000007a,0x000200f8,0x00000074,0x0004003d,0x0000000b,0x00000076,0x00000069,0x0007004f,
>+	0x0000000e,0x00000077,0x00000076,0x00000076,0x00000000,0x00000003,0x0004003d,0x0000000b,
>+	0x00000078,0x00000069,0x0009004f,0x0000000b,0x00000079,0x00000078,0x00000077,0x00000004,
>+	0x00000005,0x00000002,0x00000003,0x0003003e,0x00000069,0x00000079,0x000200f9,0x00000075,
>+	0x000200f8,0x0000007a,0x00050041,0x0000001e,0x0000007c,0x00000015,0x0000007b,0x0004003d,
>+	0x00000012,0x0000007d,0x0000007c,0x000500ab,0x00000021,0x0000007e,0x0000007d,0x00000022,
>+	0x000300f7,0x00000080,0x00000000,0x000400fa,0x0000007e,0x0000007f,0x00000084,0x000200f8,
>+	0x0000007f,0x00050041,0x0000004a,0x00000081,0x00000069,0x00000049,0x0004003d,0x0000000a,
>+	0x00000082,0x00000081,0x00050041,0x0000004a,0x00000083,0x00000069,0x00000022,0x0003003e,
>+	0x00000083,0x00000082,0x000200f9,0x00000080,0x000200f8,0x00000084,0x00050041,0x00000038,
>+	0x00000087,0x00000015,0x00000086,0x0004003d,0x00000006,0x00000088,0x00000087,0x0003003e,
>+	0x00000085,0x00000088,0x0004003d,0x00000006,0x00000089,0x00000085,0x000500c7,0x00000006,
>+	0x0000008a,0x00000089,0x0000003f,0x000500ab,0x00000021,0x0000008b,0x0000008a,0x00000032,
>+	0x000300f7,0x0000008d,0x00000000,0x000400fa,0x0000008b,0x0000008c,0x0000008d,0x000200f8,
>+	0x0000008c,0x00050041,0x0000004a,0x0000008e,0x00000069,0x00000026,0x0003003e,0x0000008e,
>+	0x0000005c,0x000200f9,0x0000008d,0x000200f8,0x0000008d,0x0004003d,0x00000006,0x0000008f,
>+	0x00000085,0x000500c7,0x00000006,0x00000090,0x0000008f,0x0000001d,0x000500ab,0x00000021,
>+	0x00000091,0x00000090,0x00000032,0x000300f7,0x00000093,0x00000000,0x000400fa,0x00000091,
>+	0x00000092,0x00000093,0x000200f8,0x00000092,0x00050041,0x0000004a,0x00000095,0x00000069,
>+	0x00000094,0x0003003e,0x00000095,0x0000005c,0x000200f9,0x00000093,0x000200f8,0x00000093,
>+	0x0004003d,0x00000006,0x00000096,0x00000085,0x000500c7,0x00000006,0x00000097,0x00000096,
>+	0x0000007b,0x000500ab,0x00000021,0x00000098,0x00000097,0x00000032,0x000300f7,0x0000009a,
>+	0x00000000,0x000400fa,0x00000098,0x00000099,0x0000009a,0x000200f8,0x00000099,0x00050041,
>+	0x0000004a,0x0000009c,0x00000069,0x00000049,0x0003003e,0x0000009c,0x0000009b,0x000200f9,
>+	0x0000009a,0x000200f8,0x0000009a,0x000200f9,0x00000080,0x000200f8,0x00000080,0x000200f9,
>+	0x00000075,0x000200f8,0x00000075,0x0004003d,0x0000000b,0x0000009f,0x00000069,0x0003003e,
>+	0x0000009e,0x0000009f,0x000100fd,0x00010038
>+};
>+
>+#if 0  // Generated from:
>+#version 450 core
>+
>+#extension GL_EXT_samplerless_texture_functions : require
>+
>+layout(set = 0, binding = 0)uniform texture2DArray src;
>+layout(location = 0)out vec4 dest;
>+
>+layout(push_constant)uniform PushConstants {
>+
>+    ivec2 srcOffset;
>+    ivec2 destOffset;
>+    int srcMip;
>+    int srcLayer;
>+
>+    bool flipY;
>+
>+    bool premultiplyAlpha;
>+    bool unmultiplyAlpha;
>+
>+    bool destHasLuminance;
>+    bool destIsAlpha;
>+
>+    int destDefaultChannelsMask;
>+} params;
>+
>+void main()
>+{
>+    ivec2 destSubImageCoords = ivec2(gl_FragCoord . xy)- params . destOffset;
>+
>+    ivec2 srcSubImageCoords = destSubImageCoords;
>+
>+    if(params . flipY)
>+        srcSubImageCoords . y = - srcSubImageCoords . y;
>+
>+          vec4 srcValue = texelFetch(src, ivec3(params . srcOffset + srcSubImageCoords, params . srcLayer), params . srcMip);
>+
>+    if(params . premultiplyAlpha)
>+    {
>+        srcValue . rgb *= srcValue . a;
>+    }
>+    else if(params . unmultiplyAlpha && srcValue . a > 0)
>+    {
>+        srcValue . rgb /= srcValue . a;
>+    }
>+
>+           vec4 destValue = vec4(srcValue);
>+
>+    if(params . destHasLuminance)
>+    {
>+        destValue . rg = destValue . ra;
>+    }
>+    else if(params . destIsAlpha)
>+    {
>+        destValue . r = destValue . a;
>+    }
>+    else
>+    {
>+        int defaultChannelsMask = params . destDefaultChannelsMask;
>+        if((defaultChannelsMask & 2)!= 0)
>+        {
>+            destValue . g = 0;
>+        }
>+        if((defaultChannelsMask & 4)!= 0)
>+        {
>+            destValue . b = 0;
>+        }
>+        if((defaultChannelsMask & 8)!= 0)
>+        {
>+            destValue . a = 1;
>+        }
>+    }
>+
>+    dest = destValue;
>+}
>+#endif  // Preprocessed code
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000002.inc b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000002.inc
>new file mode 100644
>index 00000000000..e4200ae3e50
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000002.inc
>@@ -0,0 +1,207 @@
>+	// 7.11.3188
>+	 #pragma once
>+const uint32_t kImageCopy_frag_00000002[] = {
>+	0x07230203,0x00010000,0x00080007,0x00000098,0x00000000,0x00020011,0x00000001,0x0006000b,
>+	0x00000001,0x4c534c47,0x6474732e,0x3035342e,0x00000000,0x0003000e,0x00000000,0x00000001,
>+	0x0007000f,0x00000004,0x00000004,0x6e69616d,0x00000000,0x0000000d,0x00000096,0x00030010,
>+	0x00000004,0x00000007,0x00030003,0x00000002,0x000001c2,0x000b0004,0x455f4c47,0x735f5458,
>+	0x6c706d61,0x656c7265,0x745f7373,0x75747865,0x665f6572,0x74636e75,0x736e6f69,0x00000000,
>+	0x00040005,0x00000004,0x6e69616d,0x00000000,0x00070005,0x00000009,0x74736564,0x49627553,
>+	0x6567616d,0x726f6f43,0x00007364,0x00060005,0x0000000d,0x465f6c67,0x43676172,0x64726f6f,
>+	0x00000000,0x00060005,0x00000013,0x68737550,0x736e6f43,0x746e6174,0x00000073,0x00060006,
>+	0x00000013,0x00000000,0x4f637273,0x65736666,0x00000074,0x00060006,0x00000013,0x00000001,
>+	0x74736564,0x7366664f,0x00007465,0x00050006,0x00000013,0x00000002,0x4d637273,0x00007069,
>+	0x00060006,0x00000013,0x00000003,0x4c637273,0x72657961,0x00000000,0x00050006,0x00000013,
>+	0x00000004,0x70696c66,0x00000059,0x00080006,0x00000013,0x00000005,0x6d657270,0x69746c75,
>+	0x41796c70,0x6168706c,0x00000000,0x00070006,0x00000013,0x00000006,0x756d6e75,0x7069746c,
>+	0x6c41796c,0x00616870,0x00080006,0x00000013,0x00000007,0x74736564,0x4c736148,0x6e696d75,
>+	0x65636e61,0x00000000,0x00060006,0x00000013,0x00000008,0x74736564,0x6c417349,0x00616870,
>+	0x00090006,0x00000013,0x00000009,0x74736564,0x61666544,0x43746c75,0x6e6e6168,0x4d736c65,
>+	0x006b7361,0x00040005,0x00000015,0x61726170,0x0000736d,0x00070005,0x0000001b,0x53637273,
>+	0x6d496275,0x43656761,0x64726f6f,0x00000073,0x00050005,0x0000002e,0x56637273,0x65756c61,
>+	0x00000000,0x00030005,0x00000031,0x00637273,0x00050005,0x00000063,0x74736564,0x756c6156,
>+	0x00000065,0x00070005,0x0000007c,0x61666564,0x43746c75,0x6e6e6168,0x4d736c65,0x006b7361,
>+	0x00040005,0x00000096,0x74736564,0x00000000,0x00040047,0x0000000d,0x0000000b,0x0000000f,
>+	0x00050048,0x00000013,0x00000000,0x00000023,0x00000000,0x00050048,0x00000013,0x00000001,
>+	0x00000023,0x00000008,0x00050048,0x00000013,0x00000002,0x00000023,0x00000010,0x00050048,
>+	0x00000013,0x00000003,0x00000023,0x00000014,0x00050048,0x00000013,0x00000004,0x00000023,
>+	0x00000018,0x00050048,0x00000013,0x00000005,0x00000023,0x0000001c,0x00050048,0x00000013,
>+	0x00000006,0x00000023,0x00000020,0x00050048,0x00000013,0x00000007,0x00000023,0x00000024,
>+	0x00050048,0x00000013,0x00000008,0x00000023,0x00000028,0x00050048,0x00000013,0x00000009,
>+	0x00000023,0x0000002c,0x00030047,0x00000013,0x00000002,0x00040047,0x00000031,0x00000022,
>+	0x00000000,0x00040047,0x00000031,0x00000021,0x00000000,0x00040047,0x00000096,0x0000001e,
>+	0x00000000,0x00020013,0x00000002,0x00030021,0x00000003,0x00000002,0x00040015,0x00000006,
>+	0x00000020,0x00000001,0x00040017,0x00000007,0x00000006,0x00000002,0x00040020,0x00000008,
>+	0x00000007,0x00000007,0x00030016,0x0000000a,0x00000020,0x00040017,0x0000000b,0x0000000a,
>+	0x00000004,0x00040020,0x0000000c,0x00000001,0x0000000b,0x0004003b,0x0000000c,0x0000000d,
>+	0x00000001,0x00040017,0x0000000e,0x0000000a,0x00000002,0x00040015,0x00000012,0x00000020,
>+	0x00000000,0x000c001e,0x00000013,0x00000007,0x00000007,0x00000006,0x00000006,0x00000012,
>+	0x00000012,0x00000012,0x00000012,0x00000012,0x00000006,0x00040020,0x00000014,0x00000009,
>+	0x00000013,0x0004003b,0x00000014,0x00000015,0x00000009,0x0004002b,0x00000006,0x00000016,
>+	0x00000001,0x00040020,0x00000017,0x00000009,0x00000007,0x0004002b,0x00000006,0x0000001d,
>+	0x00000004,0x00040020,0x0000001e,0x00000009,0x00000012,0x00020014,0x00000021,0x0004002b,
>+	0x00000012,0x00000022,0x00000000,0x0004002b,0x00000012,0x00000026,0x00000001,0x00040020,
>+	0x00000027,0x00000007,0x00000006,0x00040017,0x0000002c,0x00000006,0x00000004,0x00040020,
>+	0x0000002d,0x00000007,0x0000002c,0x00090019,0x0000002f,0x00000006,0x00000001,0x00000000,
>+	0x00000000,0x00000000,0x00000001,0x00000000,0x00040020,0x00000030,0x00000000,0x0000002f,
>+	0x0004003b,0x00000030,0x00000031,0x00000000,0x0004002b,0x00000006,0x00000033,0x00000000,
>+	0x0004002b,0x00000006,0x00000038,0x00000002,0x00040020,0x00000039,0x00000009,0x00000006,
>+	0x0004002b,0x00000006,0x0000003d,0x00000005,0x0004002b,0x00000012,0x00000043,0x00000003,
>+	0x00040017,0x00000046,0x00000006,0x00000003,0x0004002b,0x00000006,0x0000004e,0x00000006,
>+	0x00040020,0x00000062,0x00000007,0x0000000b,0x0004002b,0x00000006,0x00000066,0x00000007,
>+	0x0004002b,0x00000006,0x00000071,0x00000008,0x00040020,0x00000077,0x00000007,0x0000000a,
>+	0x0004002b,0x00000006,0x0000007d,0x00000009,0x0004002b,0x0000000a,0x00000085,0x00000000,
>+	0x0004002b,0x00000012,0x0000008c,0x00000002,0x0004002b,0x0000000a,0x00000093,0x3f800000,
>+	0x00040020,0x00000095,0x00000003,0x0000000b,0x0004003b,0x00000095,0x00000096,0x00000003,
>+	0x00050036,0x00000002,0x00000004,0x00000000,0x00000003,0x000200f8,0x00000005,0x0004003b,
>+	0x00000008,0x00000009,0x00000007,0x0004003b,0x00000008,0x0000001b,0x00000007,0x0004003b,
>+	0x0000002d,0x0000002e,0x00000007,0x0004003b,0x00000062,0x00000063,0x00000007,0x0004003b,
>+	0x00000027,0x0000007c,0x00000007,0x0004003d,0x0000000b,0x0000000f,0x0000000d,0x0007004f,
>+	0x0000000e,0x00000010,0x0000000f,0x0000000f,0x00000000,0x00000001,0x0004006e,0x00000007,
>+	0x00000011,0x00000010,0x00050041,0x00000017,0x00000018,0x00000015,0x00000016,0x0004003d,
>+	0x00000007,0x00000019,0x00000018,0x00050082,0x00000007,0x0000001a,0x00000011,0x00000019,
>+	0x0003003e,0x00000009,0x0000001a,0x0004003d,0x00000007,0x0000001c,0x00000009,0x0003003e,
>+	0x0000001b,0x0000001c,0x00050041,0x0000001e,0x0000001f,0x00000015,0x0000001d,0x0004003d,
>+	0x00000012,0x00000020,0x0000001f,0x000500ab,0x00000021,0x00000023,0x00000020,0x00000022,
>+	0x000300f7,0x00000025,0x00000000,0x000400fa,0x00000023,0x00000024,0x00000025,0x000200f8,
>+	0x00000024,0x00050041,0x00000027,0x00000028,0x0000001b,0x00000026,0x0004003d,0x00000006,
>+	0x00000029,0x00000028,0x0004007e,0x00000006,0x0000002a,0x00000029,0x00050041,0x00000027,
>+	0x0000002b,0x0000001b,0x00000026,0x0003003e,0x0000002b,0x0000002a,0x000200f9,0x00000025,
>+	0x000200f8,0x00000025,0x0004003d,0x0000002f,0x00000032,0x00000031,0x00050041,0x00000017,
>+	0x00000034,0x00000015,0x00000033,0x0004003d,0x00000007,0x00000035,0x00000034,0x0004003d,
>+	0x00000007,0x00000036,0x0000001b,0x00050080,0x00000007,0x00000037,0x00000035,0x00000036,
>+	0x00050041,0x00000039,0x0000003a,0x00000015,0x00000038,0x0004003d,0x00000006,0x0000003b,
>+	0x0000003a,0x0007005f,0x0000002c,0x0000003c,0x00000032,0x00000037,0x00000002,0x0000003b,
>+	0x0003003e,0x0000002e,0x0000003c,0x00050041,0x0000001e,0x0000003e,0x00000015,0x0000003d,
>+	0x0004003d,0x00000012,0x0000003f,0x0000003e,0x000500ab,0x00000021,0x00000040,0x0000003f,
>+	0x00000022,0x000300f7,0x00000042,0x00000000,0x000400fa,0x00000040,0x00000041,0x0000004d,
>+	0x000200f8,0x00000041,0x00050041,0x00000027,0x00000044,0x0000002e,0x00000043,0x0004003d,
>+	0x00000006,0x00000045,0x00000044,0x0004003d,0x0000002c,0x00000047,0x0000002e,0x0008004f,
>+	0x00000046,0x00000048,0x00000047,0x00000047,0x00000000,0x00000001,0x00000002,0x00060050,
>+	0x00000046,0x00000049,0x00000045,0x00000045,0x00000045,0x00050084,0x00000046,0x0000004a,
>+	0x00000048,0x00000049,0x0004003d,0x0000002c,0x0000004b,0x0000002e,0x0009004f,0x0000002c,
>+	0x0000004c,0x0000004b,0x0000004a,0x00000004,0x00000005,0x00000006,0x00000003,0x0003003e,
>+	0x0000002e,0x0000004c,0x000200f9,0x00000042,0x000200f8,0x0000004d,0x00050041,0x0000001e,
>+	0x0000004f,0x00000015,0x0000004e,0x0004003d,0x00000012,0x00000050,0x0000004f,0x000500ab,
>+	0x00000021,0x00000051,0x00000050,0x00000022,0x000300f7,0x00000053,0x00000000,0x000400fa,
>+	0x00000051,0x00000052,0x00000053,0x000200f8,0x00000052,0x00050041,0x00000027,0x00000054,
>+	0x0000002e,0x00000043,0x0004003d,0x00000006,0x00000055,0x00000054,0x000500ad,0x00000021,
>+	0x00000056,0x00000055,0x00000033,0x000200f9,0x00000053,0x000200f8,0x00000053,0x000700f5,
>+	0x00000021,0x00000057,0x00000051,0x0000004d,0x00000056,0x00000052,0x000300f7,0x00000059,
>+	0x00000000,0x000400fa,0x00000057,0x00000058,0x00000059,0x000200f8,0x00000058,0x00050041,
>+	0x00000027,0x0000005a,0x0000002e,0x00000043,0x0004003d,0x00000006,0x0000005b,0x0000005a,
>+	0x0004003d,0x0000002c,0x0000005c,0x0000002e,0x0008004f,0x00000046,0x0000005d,0x0000005c,
>+	0x0000005c,0x00000000,0x00000001,0x00000002,0x00060050,0x00000046,0x0000005e,0x0000005b,
>+	0x0000005b,0x0000005b,0x00050087,0x00000046,0x0000005f,0x0000005d,0x0000005e,0x0004003d,
>+	0x0000002c,0x00000060,0x0000002e,0x0009004f,0x0000002c,0x00000061,0x00000060,0x0000005f,
>+	0x00000004,0x00000005,0x00000006,0x00000003,0x0003003e,0x0000002e,0x00000061,0x000200f9,
>+	0x00000059,0x000200f8,0x00000059,0x000200f9,0x00000042,0x000200f8,0x00000042,0x0004003d,
>+	0x0000002c,0x00000064,0x0000002e,0x0004006f,0x0000000b,0x00000065,0x00000064,0x0003003e,
>+	0x00000063,0x00000065,0x00050041,0x0000001e,0x00000067,0x00000015,0x00000066,0x0004003d,
>+	0x00000012,0x00000068,0x00000067,0x000500ab,0x00000021,0x00000069,0x00000068,0x00000022,
>+	0x000300f7,0x0000006b,0x00000000,0x000400fa,0x00000069,0x0000006a,0x00000070,0x000200f8,
>+	0x0000006a,0x0004003d,0x0000000b,0x0000006c,0x00000063,0x0007004f,0x0000000e,0x0000006d,
>+	0x0000006c,0x0000006c,0x00000000,0x00000003,0x0004003d,0x0000000b,0x0000006e,0x00000063,
>+	0x0009004f,0x0000000b,0x0000006f,0x0000006e,0x0000006d,0x00000004,0x00000005,0x00000002,
>+	0x00000003,0x0003003e,0x00000063,0x0000006f,0x000200f9,0x0000006b,0x000200f8,0x00000070,
>+	0x00050041,0x0000001e,0x00000072,0x00000015,0x00000071,0x0004003d,0x00000012,0x00000073,
>+	0x00000072,0x000500ab,0x00000021,0x00000074,0x00000073,0x00000022,0x000300f7,0x00000076,
>+	0x00000000,0x000400fa,0x00000074,0x00000075,0x0000007b,0x000200f8,0x00000075,0x00050041,
>+	0x00000077,0x00000078,0x00000063,0x00000043,0x0004003d,0x0000000a,0x00000079,0x00000078,
>+	0x00050041,0x00000077,0x0000007a,0x00000063,0x00000022,0x0003003e,0x0000007a,0x00000079,
>+	0x000200f9,0x00000076,0x000200f8,0x0000007b,0x00050041,0x00000039,0x0000007e,0x00000015,
>+	0x0000007d,0x0004003d,0x00000006,0x0000007f,0x0000007e,0x0003003e,0x0000007c,0x0000007f,
>+	0x0004003d,0x00000006,0x00000080,0x0000007c,0x000500c7,0x00000006,0x00000081,0x00000080,
>+	0x00000038,0x000500ab,0x00000021,0x00000082,0x00000081,0x00000033,0x000300f7,0x00000084,
>+	0x00000000,0x000400fa,0x00000082,0x00000083,0x00000084,0x000200f8,0x00000083,0x00050041,
>+	0x00000077,0x00000086,0x00000063,0x00000026,0x0003003e,0x00000086,0x00000085,0x000200f9,
>+	0x00000084,0x000200f8,0x00000084,0x0004003d,0x00000006,0x00000087,0x0000007c,0x000500c7,
>+	0x00000006,0x00000088,0x00000087,0x0000001d,0x000500ab,0x00000021,0x00000089,0x00000088,
>+	0x00000033,0x000300f7,0x0000008b,0x00000000,0x000400fa,0x00000089,0x0000008a,0x0000008b,
>+	0x000200f8,0x0000008a,0x00050041,0x00000077,0x0000008d,0x00000063,0x0000008c,0x0003003e,
>+	0x0000008d,0x00000085,0x000200f9,0x0000008b,0x000200f8,0x0000008b,0x0004003d,0x00000006,
>+	0x0000008e,0x0000007c,0x000500c7,0x00000006,0x0000008f,0x0000008e,0x00000071,0x000500ab,
>+	0x00000021,0x00000090,0x0000008f,0x00000033,0x000300f7,0x00000092,0x00000000,0x000400fa,
>+	0x00000090,0x00000091,0x00000092,0x000200f8,0x00000091,0x00050041,0x00000077,0x00000094,
>+	0x00000063,0x00000043,0x0003003e,0x00000094,0x00000093,0x000200f9,0x00000092,0x000200f8,
>+	0x00000092,0x000200f9,0x00000076,0x000200f8,0x00000076,0x000200f9,0x0000006b,0x000200f8,
>+	0x0000006b,0x0004003d,0x0000000b,0x00000097,0x00000063,0x0003003e,0x00000096,0x00000097,
>+	0x000100fd,0x00010038
>+};
>+
>+#if 0  // Generated from:
>+#version 450 core
>+
>+#extension GL_EXT_samplerless_texture_functions : require
>+
>+layout(set = 0, binding = 0)uniform itexture2D src;
>+layout(location = 0)out vec4 dest;
>+
>+layout(push_constant)uniform PushConstants {
>+
>+    ivec2 srcOffset;
>+    ivec2 destOffset;
>+    int srcMip;
>+    int srcLayer;
>+
>+    bool flipY;
>+
>+    bool premultiplyAlpha;
>+    bool unmultiplyAlpha;
>+
>+    bool destHasLuminance;
>+    bool destIsAlpha;
>+
>+    int destDefaultChannelsMask;
>+} params;
>+
>+void main()
>+{
>+    ivec2 destSubImageCoords = ivec2(gl_FragCoord . xy)- params . destOffset;
>+
>+    ivec2 srcSubImageCoords = destSubImageCoords;
>+
>+    if(params . flipY)
>+        srcSubImageCoords . y = - srcSubImageCoords . y;
>+
>+          ivec4 srcValue = texelFetch(src, params . srcOffset + srcSubImageCoords, params . srcMip);
>+
>+    if(params . premultiplyAlpha)
>+    {
>+        srcValue . rgb *= srcValue . a;
>+    }
>+    else if(params . unmultiplyAlpha && srcValue . a > 0)
>+    {
>+        srcValue . rgb /= srcValue . a;
>+    }
>+
>+           vec4 destValue = vec4(srcValue);
>+
>+    if(params . destHasLuminance)
>+    {
>+        destValue . rg = destValue . ra;
>+    }
>+    else if(params . destIsAlpha)
>+    {
>+        destValue . r = destValue . a;
>+    }
>+    else
>+    {
>+        int defaultChannelsMask = params . destDefaultChannelsMask;
>+        if((defaultChannelsMask & 2)!= 0)
>+        {
>+            destValue . g = 0;
>+        }
>+        if((defaultChannelsMask & 4)!= 0)
>+        {
>+            destValue . b = 0;
>+        }
>+        if((defaultChannelsMask & 8)!= 0)
>+        {
>+            destValue . a = 1;
>+        }
>+    }
>+
>+    dest = destValue;
>+}
>+#endif  // Preprocessed code
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000003.inc b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000003.inc
>new file mode 100644
>index 00000000000..6acc4d019bc
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000003.inc
>@@ -0,0 +1,210 @@
>+	// 7.11.3188
>+	 #pragma once
>+const uint32_t kImageCopy_frag_00000003[] = {
>+	0x07230203,0x00010000,0x00080007,0x0000009e,0x00000000,0x00020011,0x00000001,0x0006000b,
>+	0x00000001,0x4c534c47,0x6474732e,0x3035342e,0x00000000,0x0003000e,0x00000000,0x00000001,
>+	0x0007000f,0x00000004,0x00000004,0x6e69616d,0x00000000,0x0000000d,0x0000009c,0x00030010,
>+	0x00000004,0x00000007,0x00030003,0x00000002,0x000001c2,0x000b0004,0x455f4c47,0x735f5458,
>+	0x6c706d61,0x656c7265,0x745f7373,0x75747865,0x665f6572,0x74636e75,0x736e6f69,0x00000000,
>+	0x00040005,0x00000004,0x6e69616d,0x00000000,0x00070005,0x00000009,0x74736564,0x49627553,
>+	0x6567616d,0x726f6f43,0x00007364,0x00060005,0x0000000d,0x465f6c67,0x43676172,0x64726f6f,
>+	0x00000000,0x00060005,0x00000013,0x68737550,0x736e6f43,0x746e6174,0x00000073,0x00060006,
>+	0x00000013,0x00000000,0x4f637273,0x65736666,0x00000074,0x00060006,0x00000013,0x00000001,
>+	0x74736564,0x7366664f,0x00007465,0x00050006,0x00000013,0x00000002,0x4d637273,0x00007069,
>+	0x00060006,0x00000013,0x00000003,0x4c637273,0x72657961,0x00000000,0x00050006,0x00000013,
>+	0x00000004,0x70696c66,0x00000059,0x00080006,0x00000013,0x00000005,0x6d657270,0x69746c75,
>+	0x41796c70,0x6168706c,0x00000000,0x00070006,0x00000013,0x00000006,0x756d6e75,0x7069746c,
>+	0x6c41796c,0x00616870,0x00080006,0x00000013,0x00000007,0x74736564,0x4c736148,0x6e696d75,
>+	0x65636e61,0x00000000,0x00060006,0x00000013,0x00000008,0x74736564,0x6c417349,0x00616870,
>+	0x00090006,0x00000013,0x00000009,0x74736564,0x61666544,0x43746c75,0x6e6e6168,0x4d736c65,
>+	0x006b7361,0x00040005,0x00000015,0x61726170,0x0000736d,0x00070005,0x0000001b,0x53637273,
>+	0x6d496275,0x43656761,0x64726f6f,0x00000073,0x00050005,0x0000002e,0x56637273,0x65756c61,
>+	0x00000000,0x00030005,0x00000031,0x00637273,0x00050005,0x00000069,0x74736564,0x756c6156,
>+	0x00000065,0x00070005,0x00000082,0x61666564,0x43746c75,0x6e6e6168,0x4d736c65,0x006b7361,
>+	0x00040005,0x0000009c,0x74736564,0x00000000,0x00040047,0x0000000d,0x0000000b,0x0000000f,
>+	0x00050048,0x00000013,0x00000000,0x00000023,0x00000000,0x00050048,0x00000013,0x00000001,
>+	0x00000023,0x00000008,0x00050048,0x00000013,0x00000002,0x00000023,0x00000010,0x00050048,
>+	0x00000013,0x00000003,0x00000023,0x00000014,0x00050048,0x00000013,0x00000004,0x00000023,
>+	0x00000018,0x00050048,0x00000013,0x00000005,0x00000023,0x0000001c,0x00050048,0x00000013,
>+	0x00000006,0x00000023,0x00000020,0x00050048,0x00000013,0x00000007,0x00000023,0x00000024,
>+	0x00050048,0x00000013,0x00000008,0x00000023,0x00000028,0x00050048,0x00000013,0x00000009,
>+	0x00000023,0x0000002c,0x00030047,0x00000013,0x00000002,0x00040047,0x00000031,0x00000022,
>+	0x00000000,0x00040047,0x00000031,0x00000021,0x00000000,0x00040047,0x0000009c,0x0000001e,
>+	0x00000000,0x00020013,0x00000002,0x00030021,0x00000003,0x00000002,0x00040015,0x00000006,
>+	0x00000020,0x00000001,0x00040017,0x00000007,0x00000006,0x00000002,0x00040020,0x00000008,
>+	0x00000007,0x00000007,0x00030016,0x0000000a,0x00000020,0x00040017,0x0000000b,0x0000000a,
>+	0x00000004,0x00040020,0x0000000c,0x00000001,0x0000000b,0x0004003b,0x0000000c,0x0000000d,
>+	0x00000001,0x00040017,0x0000000e,0x0000000a,0x00000002,0x00040015,0x00000012,0x00000020,
>+	0x00000000,0x000c001e,0x00000013,0x00000007,0x00000007,0x00000006,0x00000006,0x00000012,
>+	0x00000012,0x00000012,0x00000012,0x00000012,0x00000006,0x00040020,0x00000014,0x00000009,
>+	0x00000013,0x0004003b,0x00000014,0x00000015,0x00000009,0x0004002b,0x00000006,0x00000016,
>+	0x00000001,0x00040020,0x00000017,0x00000009,0x00000007,0x0004002b,0x00000006,0x0000001d,
>+	0x00000004,0x00040020,0x0000001e,0x00000009,0x00000012,0x00020014,0x00000021,0x0004002b,
>+	0x00000012,0x00000022,0x00000000,0x0004002b,0x00000012,0x00000026,0x00000001,0x00040020,
>+	0x00000027,0x00000007,0x00000006,0x00040017,0x0000002c,0x00000006,0x00000004,0x00040020,
>+	0x0000002d,0x00000007,0x0000002c,0x00090019,0x0000002f,0x00000006,0x00000001,0x00000000,
>+	0x00000001,0x00000000,0x00000001,0x00000000,0x00040020,0x00000030,0x00000000,0x0000002f,
>+	0x0004003b,0x00000030,0x00000031,0x00000000,0x0004002b,0x00000006,0x00000033,0x00000000,
>+	0x0004002b,0x00000006,0x00000038,0x00000003,0x00040020,0x00000039,0x00000009,0x00000006,
>+	0x00040017,0x0000003c,0x00000006,0x00000003,0x0004002b,0x00000006,0x00000040,0x00000002,
>+	0x0004002b,0x00000006,0x00000044,0x00000005,0x0004002b,0x00000012,0x0000004a,0x00000003,
>+	0x0004002b,0x00000006,0x00000054,0x00000006,0x00040020,0x00000068,0x00000007,0x0000000b,
>+	0x0004002b,0x00000006,0x0000006c,0x00000007,0x0004002b,0x00000006,0x00000077,0x00000008,
>+	0x00040020,0x0000007d,0x00000007,0x0000000a,0x0004002b,0x00000006,0x00000083,0x00000009,
>+	0x0004002b,0x0000000a,0x0000008b,0x00000000,0x0004002b,0x00000012,0x00000092,0x00000002,
>+	0x0004002b,0x0000000a,0x00000099,0x3f800000,0x00040020,0x0000009b,0x00000003,0x0000000b,
>+	0x0004003b,0x0000009b,0x0000009c,0x00000003,0x00050036,0x00000002,0x00000004,0x00000000,
>+	0x00000003,0x000200f8,0x00000005,0x0004003b,0x00000008,0x00000009,0x00000007,0x0004003b,
>+	0x00000008,0x0000001b,0x00000007,0x0004003b,0x0000002d,0x0000002e,0x00000007,0x0004003b,
>+	0x00000068,0x00000069,0x00000007,0x0004003b,0x00000027,0x00000082,0x00000007,0x0004003d,
>+	0x0000000b,0x0000000f,0x0000000d,0x0007004f,0x0000000e,0x00000010,0x0000000f,0x0000000f,
>+	0x00000000,0x00000001,0x0004006e,0x00000007,0x00000011,0x00000010,0x00050041,0x00000017,
>+	0x00000018,0x00000015,0x00000016,0x0004003d,0x00000007,0x00000019,0x00000018,0x00050082,
>+	0x00000007,0x0000001a,0x00000011,0x00000019,0x0003003e,0x00000009,0x0000001a,0x0004003d,
>+	0x00000007,0x0000001c,0x00000009,0x0003003e,0x0000001b,0x0000001c,0x00050041,0x0000001e,
>+	0x0000001f,0x00000015,0x0000001d,0x0004003d,0x00000012,0x00000020,0x0000001f,0x000500ab,
>+	0x00000021,0x00000023,0x00000020,0x00000022,0x000300f7,0x00000025,0x00000000,0x000400fa,
>+	0x00000023,0x00000024,0x00000025,0x000200f8,0x00000024,0x00050041,0x00000027,0x00000028,
>+	0x0000001b,0x00000026,0x0004003d,0x00000006,0x00000029,0x00000028,0x0004007e,0x00000006,
>+	0x0000002a,0x00000029,0x00050041,0x00000027,0x0000002b,0x0000001b,0x00000026,0x0003003e,
>+	0x0000002b,0x0000002a,0x000200f9,0x00000025,0x000200f8,0x00000025,0x0004003d,0x0000002f,
>+	0x00000032,0x00000031,0x00050041,0x00000017,0x00000034,0x00000015,0x00000033,0x0004003d,
>+	0x00000007,0x00000035,0x00000034,0x0004003d,0x00000007,0x00000036,0x0000001b,0x00050080,
>+	0x00000007,0x00000037,0x00000035,0x00000036,0x00050041,0x00000039,0x0000003a,0x00000015,
>+	0x00000038,0x0004003d,0x00000006,0x0000003b,0x0000003a,0x00050051,0x00000006,0x0000003d,
>+	0x00000037,0x00000000,0x00050051,0x00000006,0x0000003e,0x00000037,0x00000001,0x00060050,
>+	0x0000003c,0x0000003f,0x0000003d,0x0000003e,0x0000003b,0x00050041,0x00000039,0x00000041,
>+	0x00000015,0x00000040,0x0004003d,0x00000006,0x00000042,0x00000041,0x0007005f,0x0000002c,
>+	0x00000043,0x00000032,0x0000003f,0x00000002,0x00000042,0x0003003e,0x0000002e,0x00000043,
>+	0x00050041,0x0000001e,0x00000045,0x00000015,0x00000044,0x0004003d,0x00000012,0x00000046,
>+	0x00000045,0x000500ab,0x00000021,0x00000047,0x00000046,0x00000022,0x000300f7,0x00000049,
>+	0x00000000,0x000400fa,0x00000047,0x00000048,0x00000053,0x000200f8,0x00000048,0x00050041,
>+	0x00000027,0x0000004b,0x0000002e,0x0000004a,0x0004003d,0x00000006,0x0000004c,0x0000004b,
>+	0x0004003d,0x0000002c,0x0000004d,0x0000002e,0x0008004f,0x0000003c,0x0000004e,0x0000004d,
>+	0x0000004d,0x00000000,0x00000001,0x00000002,0x00060050,0x0000003c,0x0000004f,0x0000004c,
>+	0x0000004c,0x0000004c,0x00050084,0x0000003c,0x00000050,0x0000004e,0x0000004f,0x0004003d,
>+	0x0000002c,0x00000051,0x0000002e,0x0009004f,0x0000002c,0x00000052,0x00000051,0x00000050,
>+	0x00000004,0x00000005,0x00000006,0x00000003,0x0003003e,0x0000002e,0x00000052,0x000200f9,
>+	0x00000049,0x000200f8,0x00000053,0x00050041,0x0000001e,0x00000055,0x00000015,0x00000054,
>+	0x0004003d,0x00000012,0x00000056,0x00000055,0x000500ab,0x00000021,0x00000057,0x00000056,
>+	0x00000022,0x000300f7,0x00000059,0x00000000,0x000400fa,0x00000057,0x00000058,0x00000059,
>+	0x000200f8,0x00000058,0x00050041,0x00000027,0x0000005a,0x0000002e,0x0000004a,0x0004003d,
>+	0x00000006,0x0000005b,0x0000005a,0x000500ad,0x00000021,0x0000005c,0x0000005b,0x00000033,
>+	0x000200f9,0x00000059,0x000200f8,0x00000059,0x000700f5,0x00000021,0x0000005d,0x00000057,
>+	0x00000053,0x0000005c,0x00000058,0x000300f7,0x0000005f,0x00000000,0x000400fa,0x0000005d,
>+	0x0000005e,0x0000005f,0x000200f8,0x0000005e,0x00050041,0x00000027,0x00000060,0x0000002e,
>+	0x0000004a,0x0004003d,0x00000006,0x00000061,0x00000060,0x0004003d,0x0000002c,0x00000062,
>+	0x0000002e,0x0008004f,0x0000003c,0x00000063,0x00000062,0x00000062,0x00000000,0x00000001,
>+	0x00000002,0x00060050,0x0000003c,0x00000064,0x00000061,0x00000061,0x00000061,0x00050087,
>+	0x0000003c,0x00000065,0x00000063,0x00000064,0x0004003d,0x0000002c,0x00000066,0x0000002e,
>+	0x0009004f,0x0000002c,0x00000067,0x00000066,0x00000065,0x00000004,0x00000005,0x00000006,
>+	0x00000003,0x0003003e,0x0000002e,0x00000067,0x000200f9,0x0000005f,0x000200f8,0x0000005f,
>+	0x000200f9,0x00000049,0x000200f8,0x00000049,0x0004003d,0x0000002c,0x0000006a,0x0000002e,
>+	0x0004006f,0x0000000b,0x0000006b,0x0000006a,0x0003003e,0x00000069,0x0000006b,0x00050041,
>+	0x0000001e,0x0000006d,0x00000015,0x0000006c,0x0004003d,0x00000012,0x0000006e,0x0000006d,
>+	0x000500ab,0x00000021,0x0000006f,0x0000006e,0x00000022,0x000300f7,0x00000071,0x00000000,
>+	0x000400fa,0x0000006f,0x00000070,0x00000076,0x000200f8,0x00000070,0x0004003d,0x0000000b,
>+	0x00000072,0x00000069,0x0007004f,0x0000000e,0x00000073,0x00000072,0x00000072,0x00000000,
>+	0x00000003,0x0004003d,0x0000000b,0x00000074,0x00000069,0x0009004f,0x0000000b,0x00000075,
>+	0x00000074,0x00000073,0x00000004,0x00000005,0x00000002,0x00000003,0x0003003e,0x00000069,
>+	0x00000075,0x000200f9,0x00000071,0x000200f8,0x00000076,0x00050041,0x0000001e,0x00000078,
>+	0x00000015,0x00000077,0x0004003d,0x00000012,0x00000079,0x00000078,0x000500ab,0x00000021,
>+	0x0000007a,0x00000079,0x00000022,0x000300f7,0x0000007c,0x00000000,0x000400fa,0x0000007a,
>+	0x0000007b,0x00000081,0x000200f8,0x0000007b,0x00050041,0x0000007d,0x0000007e,0x00000069,
>+	0x0000004a,0x0004003d,0x0000000a,0x0000007f,0x0000007e,0x00050041,0x0000007d,0x00000080,
>+	0x00000069,0x00000022,0x0003003e,0x00000080,0x0000007f,0x000200f9,0x0000007c,0x000200f8,
>+	0x00000081,0x00050041,0x00000039,0x00000084,0x00000015,0x00000083,0x0004003d,0x00000006,
>+	0x00000085,0x00000084,0x0003003e,0x00000082,0x00000085,0x0004003d,0x00000006,0x00000086,
>+	0x00000082,0x000500c7,0x00000006,0x00000087,0x00000086,0x00000040,0x000500ab,0x00000021,
>+	0x00000088,0x00000087,0x00000033,0x000300f7,0x0000008a,0x00000000,0x000400fa,0x00000088,
>+	0x00000089,0x0000008a,0x000200f8,0x00000089,0x00050041,0x0000007d,0x0000008c,0x00000069,
>+	0x00000026,0x0003003e,0x0000008c,0x0000008b,0x000200f9,0x0000008a,0x000200f8,0x0000008a,
>+	0x0004003d,0x00000006,0x0000008d,0x00000082,0x000500c7,0x00000006,0x0000008e,0x0000008d,
>+	0x0000001d,0x000500ab,0x00000021,0x0000008f,0x0000008e,0x00000033,0x000300f7,0x00000091,
>+	0x00000000,0x000400fa,0x0000008f,0x00000090,0x00000091,0x000200f8,0x00000090,0x00050041,
>+	0x0000007d,0x00000093,0x00000069,0x00000092,0x0003003e,0x00000093,0x0000008b,0x000200f9,
>+	0x00000091,0x000200f8,0x00000091,0x0004003d,0x00000006,0x00000094,0x00000082,0x000500c7,
>+	0x00000006,0x00000095,0x00000094,0x00000077,0x000500ab,0x00000021,0x00000096,0x00000095,
>+	0x00000033,0x000300f7,0x00000098,0x00000000,0x000400fa,0x00000096,0x00000097,0x00000098,
>+	0x000200f8,0x00000097,0x00050041,0x0000007d,0x0000009a,0x00000069,0x0000004a,0x0003003e,
>+	0x0000009a,0x00000099,0x000200f9,0x00000098,0x000200f8,0x00000098,0x000200f9,0x0000007c,
>+	0x000200f8,0x0000007c,0x000200f9,0x00000071,0x000200f8,0x00000071,0x0004003d,0x0000000b,
>+	0x0000009d,0x00000069,0x0003003e,0x0000009c,0x0000009d,0x000100fd,0x00010038
>+};
>+
>+#if 0  // Generated from:
>+#version 450 core
>+
>+#extension GL_EXT_samplerless_texture_functions : require
>+
>+layout(set = 0, binding = 0)uniform itexture2DArray src;
>+layout(location = 0)out vec4 dest;
>+
>+layout(push_constant)uniform PushConstants {
>+
>+    ivec2 srcOffset;
>+    ivec2 destOffset;
>+    int srcMip;
>+    int srcLayer;
>+
>+    bool flipY;
>+
>+    bool premultiplyAlpha;
>+    bool unmultiplyAlpha;
>+
>+    bool destHasLuminance;
>+    bool destIsAlpha;
>+
>+    int destDefaultChannelsMask;
>+} params;
>+
>+void main()
>+{
>+    ivec2 destSubImageCoords = ivec2(gl_FragCoord . xy)- params . destOffset;
>+
>+    ivec2 srcSubImageCoords = destSubImageCoords;
>+
>+    if(params . flipY)
>+        srcSubImageCoords . y = - srcSubImageCoords . y;
>+
>+          ivec4 srcValue = texelFetch(src, ivec3(params . srcOffset + srcSubImageCoords, params . srcLayer), params . srcMip);
>+
>+    if(params . premultiplyAlpha)
>+    {
>+        srcValue . rgb *= srcValue . a;
>+    }
>+    else if(params . unmultiplyAlpha && srcValue . a > 0)
>+    {
>+        srcValue . rgb /= srcValue . a;
>+    }
>+
>+           vec4 destValue = vec4(srcValue);
>+
>+    if(params . destHasLuminance)
>+    {
>+        destValue . rg = destValue . ra;
>+    }
>+    else if(params . destIsAlpha)
>+    {
>+        destValue . r = destValue . a;
>+    }
>+    else
>+    {
>+        int defaultChannelsMask = params . destDefaultChannelsMask;
>+        if((defaultChannelsMask & 2)!= 0)
>+        {
>+            destValue . g = 0;
>+        }
>+        if((defaultChannelsMask & 4)!= 0)
>+        {
>+            destValue . b = 0;
>+        }
>+        if((defaultChannelsMask & 8)!= 0)
>+        {
>+            destValue . a = 1;
>+        }
>+    }
>+
>+    dest = destValue;
>+}
>+#endif  // Preprocessed code
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000004.inc b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000004.inc
>new file mode 100644
>index 00000000000..1e03fe67916
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000004.inc
>@@ -0,0 +1,207 @@
>+	// 7.11.3188
>+	 #pragma once
>+const uint32_t kImageCopy_frag_00000004[] = {
>+	0x07230203,0x00010000,0x00080007,0x00000099,0x00000000,0x00020011,0x00000001,0x0006000b,
>+	0x00000001,0x4c534c47,0x6474732e,0x3035342e,0x00000000,0x0003000e,0x00000000,0x00000001,
>+	0x0007000f,0x00000004,0x00000004,0x6e69616d,0x00000000,0x0000000d,0x00000097,0x00030010,
>+	0x00000004,0x00000007,0x00030003,0x00000002,0x000001c2,0x000b0004,0x455f4c47,0x735f5458,
>+	0x6c706d61,0x656c7265,0x745f7373,0x75747865,0x665f6572,0x74636e75,0x736e6f69,0x00000000,
>+	0x00040005,0x00000004,0x6e69616d,0x00000000,0x00070005,0x00000009,0x74736564,0x49627553,
>+	0x6567616d,0x726f6f43,0x00007364,0x00060005,0x0000000d,0x465f6c67,0x43676172,0x64726f6f,
>+	0x00000000,0x00060005,0x00000013,0x68737550,0x736e6f43,0x746e6174,0x00000073,0x00060006,
>+	0x00000013,0x00000000,0x4f637273,0x65736666,0x00000074,0x00060006,0x00000013,0x00000001,
>+	0x74736564,0x7366664f,0x00007465,0x00050006,0x00000013,0x00000002,0x4d637273,0x00007069,
>+	0x00060006,0x00000013,0x00000003,0x4c637273,0x72657961,0x00000000,0x00050006,0x00000013,
>+	0x00000004,0x70696c66,0x00000059,0x00080006,0x00000013,0x00000005,0x6d657270,0x69746c75,
>+	0x41796c70,0x6168706c,0x00000000,0x00070006,0x00000013,0x00000006,0x756d6e75,0x7069746c,
>+	0x6c41796c,0x00616870,0x00080006,0x00000013,0x00000007,0x74736564,0x4c736148,0x6e696d75,
>+	0x65636e61,0x00000000,0x00060006,0x00000013,0x00000008,0x74736564,0x6c417349,0x00616870,
>+	0x00090006,0x00000013,0x00000009,0x74736564,0x61666544,0x43746c75,0x6e6e6168,0x4d736c65,
>+	0x006b7361,0x00040005,0x00000015,0x61726170,0x0000736d,0x00070005,0x0000001b,0x53637273,
>+	0x6d496275,0x43656761,0x64726f6f,0x00000073,0x00050005,0x0000002e,0x56637273,0x65756c61,
>+	0x00000000,0x00030005,0x00000031,0x00637273,0x00050005,0x00000064,0x74736564,0x756c6156,
>+	0x00000065,0x00070005,0x0000007d,0x61666564,0x43746c75,0x6e6e6168,0x4d736c65,0x006b7361,
>+	0x00040005,0x00000097,0x74736564,0x00000000,0x00040047,0x0000000d,0x0000000b,0x0000000f,
>+	0x00050048,0x00000013,0x00000000,0x00000023,0x00000000,0x00050048,0x00000013,0x00000001,
>+	0x00000023,0x00000008,0x00050048,0x00000013,0x00000002,0x00000023,0x00000010,0x00050048,
>+	0x00000013,0x00000003,0x00000023,0x00000014,0x00050048,0x00000013,0x00000004,0x00000023,
>+	0x00000018,0x00050048,0x00000013,0x00000005,0x00000023,0x0000001c,0x00050048,0x00000013,
>+	0x00000006,0x00000023,0x00000020,0x00050048,0x00000013,0x00000007,0x00000023,0x00000024,
>+	0x00050048,0x00000013,0x00000008,0x00000023,0x00000028,0x00050048,0x00000013,0x00000009,
>+	0x00000023,0x0000002c,0x00030047,0x00000013,0x00000002,0x00040047,0x00000031,0x00000022,
>+	0x00000000,0x00040047,0x00000031,0x00000021,0x00000000,0x00040047,0x00000097,0x0000001e,
>+	0x00000000,0x00020013,0x00000002,0x00030021,0x00000003,0x00000002,0x00040015,0x00000006,
>+	0x00000020,0x00000001,0x00040017,0x00000007,0x00000006,0x00000002,0x00040020,0x00000008,
>+	0x00000007,0x00000007,0x00030016,0x0000000a,0x00000020,0x00040017,0x0000000b,0x0000000a,
>+	0x00000004,0x00040020,0x0000000c,0x00000001,0x0000000b,0x0004003b,0x0000000c,0x0000000d,
>+	0x00000001,0x00040017,0x0000000e,0x0000000a,0x00000002,0x00040015,0x00000012,0x00000020,
>+	0x00000000,0x000c001e,0x00000013,0x00000007,0x00000007,0x00000006,0x00000006,0x00000012,
>+	0x00000012,0x00000012,0x00000012,0x00000012,0x00000006,0x00040020,0x00000014,0x00000009,
>+	0x00000013,0x0004003b,0x00000014,0x00000015,0x00000009,0x0004002b,0x00000006,0x00000016,
>+	0x00000001,0x00040020,0x00000017,0x00000009,0x00000007,0x0004002b,0x00000006,0x0000001d,
>+	0x00000004,0x00040020,0x0000001e,0x00000009,0x00000012,0x00020014,0x00000021,0x0004002b,
>+	0x00000012,0x00000022,0x00000000,0x0004002b,0x00000012,0x00000026,0x00000001,0x00040020,
>+	0x00000027,0x00000007,0x00000006,0x00040017,0x0000002c,0x00000012,0x00000004,0x00040020,
>+	0x0000002d,0x00000007,0x0000002c,0x00090019,0x0000002f,0x00000012,0x00000001,0x00000000,
>+	0x00000000,0x00000000,0x00000001,0x00000000,0x00040020,0x00000030,0x00000000,0x0000002f,
>+	0x0004003b,0x00000030,0x00000031,0x00000000,0x0004002b,0x00000006,0x00000033,0x00000000,
>+	0x0004002b,0x00000006,0x00000038,0x00000002,0x00040020,0x00000039,0x00000009,0x00000006,
>+	0x0004002b,0x00000006,0x0000003d,0x00000005,0x0004002b,0x00000012,0x00000043,0x00000003,
>+	0x00040020,0x00000044,0x00000007,0x00000012,0x00040017,0x00000047,0x00000012,0x00000003,
>+	0x0004002b,0x00000006,0x0000004f,0x00000006,0x00040020,0x00000063,0x00000007,0x0000000b,
>+	0x0004002b,0x00000006,0x00000067,0x00000007,0x0004002b,0x00000006,0x00000072,0x00000008,
>+	0x00040020,0x00000078,0x00000007,0x0000000a,0x0004002b,0x00000006,0x0000007e,0x00000009,
>+	0x0004002b,0x0000000a,0x00000086,0x00000000,0x0004002b,0x00000012,0x0000008d,0x00000002,
>+	0x0004002b,0x0000000a,0x00000094,0x3f800000,0x00040020,0x00000096,0x00000003,0x0000000b,
>+	0x0004003b,0x00000096,0x00000097,0x00000003,0x00050036,0x00000002,0x00000004,0x00000000,
>+	0x00000003,0x000200f8,0x00000005,0x0004003b,0x00000008,0x00000009,0x00000007,0x0004003b,
>+	0x00000008,0x0000001b,0x00000007,0x0004003b,0x0000002d,0x0000002e,0x00000007,0x0004003b,
>+	0x00000063,0x00000064,0x00000007,0x0004003b,0x00000027,0x0000007d,0x00000007,0x0004003d,
>+	0x0000000b,0x0000000f,0x0000000d,0x0007004f,0x0000000e,0x00000010,0x0000000f,0x0000000f,
>+	0x00000000,0x00000001,0x0004006e,0x00000007,0x00000011,0x00000010,0x00050041,0x00000017,
>+	0x00000018,0x00000015,0x00000016,0x0004003d,0x00000007,0x00000019,0x00000018,0x00050082,
>+	0x00000007,0x0000001a,0x00000011,0x00000019,0x0003003e,0x00000009,0x0000001a,0x0004003d,
>+	0x00000007,0x0000001c,0x00000009,0x0003003e,0x0000001b,0x0000001c,0x00050041,0x0000001e,
>+	0x0000001f,0x00000015,0x0000001d,0x0004003d,0x00000012,0x00000020,0x0000001f,0x000500ab,
>+	0x00000021,0x00000023,0x00000020,0x00000022,0x000300f7,0x00000025,0x00000000,0x000400fa,
>+	0x00000023,0x00000024,0x00000025,0x000200f8,0x00000024,0x00050041,0x00000027,0x00000028,
>+	0x0000001b,0x00000026,0x0004003d,0x00000006,0x00000029,0x00000028,0x0004007e,0x00000006,
>+	0x0000002a,0x00000029,0x00050041,0x00000027,0x0000002b,0x0000001b,0x00000026,0x0003003e,
>+	0x0000002b,0x0000002a,0x000200f9,0x00000025,0x000200f8,0x00000025,0x0004003d,0x0000002f,
>+	0x00000032,0x00000031,0x00050041,0x00000017,0x00000034,0x00000015,0x00000033,0x0004003d,
>+	0x00000007,0x00000035,0x00000034,0x0004003d,0x00000007,0x00000036,0x0000001b,0x00050080,
>+	0x00000007,0x00000037,0x00000035,0x00000036,0x00050041,0x00000039,0x0000003a,0x00000015,
>+	0x00000038,0x0004003d,0x00000006,0x0000003b,0x0000003a,0x0007005f,0x0000002c,0x0000003c,
>+	0x00000032,0x00000037,0x00000002,0x0000003b,0x0003003e,0x0000002e,0x0000003c,0x00050041,
>+	0x0000001e,0x0000003e,0x00000015,0x0000003d,0x0004003d,0x00000012,0x0000003f,0x0000003e,
>+	0x000500ab,0x00000021,0x00000040,0x0000003f,0x00000022,0x000300f7,0x00000042,0x00000000,
>+	0x000400fa,0x00000040,0x00000041,0x0000004e,0x000200f8,0x00000041,0x00050041,0x00000044,
>+	0x00000045,0x0000002e,0x00000043,0x0004003d,0x00000012,0x00000046,0x00000045,0x0004003d,
>+	0x0000002c,0x00000048,0x0000002e,0x0008004f,0x00000047,0x00000049,0x00000048,0x00000048,
>+	0x00000000,0x00000001,0x00000002,0x00060050,0x00000047,0x0000004a,0x00000046,0x00000046,
>+	0x00000046,0x00050084,0x00000047,0x0000004b,0x00000049,0x0000004a,0x0004003d,0x0000002c,
>+	0x0000004c,0x0000002e,0x0009004f,0x0000002c,0x0000004d,0x0000004c,0x0000004b,0x00000004,
>+	0x00000005,0x00000006,0x00000003,0x0003003e,0x0000002e,0x0000004d,0x000200f9,0x00000042,
>+	0x000200f8,0x0000004e,0x00050041,0x0000001e,0x00000050,0x00000015,0x0000004f,0x0004003d,
>+	0x00000012,0x00000051,0x00000050,0x000500ab,0x00000021,0x00000052,0x00000051,0x00000022,
>+	0x000300f7,0x00000054,0x00000000,0x000400fa,0x00000052,0x00000053,0x00000054,0x000200f8,
>+	0x00000053,0x00050041,0x00000044,0x00000055,0x0000002e,0x00000043,0x0004003d,0x00000012,
>+	0x00000056,0x00000055,0x000500ac,0x00000021,0x00000057,0x00000056,0x00000022,0x000200f9,
>+	0x00000054,0x000200f8,0x00000054,0x000700f5,0x00000021,0x00000058,0x00000052,0x0000004e,
>+	0x00000057,0x00000053,0x000300f7,0x0000005a,0x00000000,0x000400fa,0x00000058,0x00000059,
>+	0x0000005a,0x000200f8,0x00000059,0x00050041,0x00000044,0x0000005b,0x0000002e,0x00000043,
>+	0x0004003d,0x00000012,0x0000005c,0x0000005b,0x0004003d,0x0000002c,0x0000005d,0x0000002e,
>+	0x0008004f,0x00000047,0x0000005e,0x0000005d,0x0000005d,0x00000000,0x00000001,0x00000002,
>+	0x00060050,0x00000047,0x0000005f,0x0000005c,0x0000005c,0x0000005c,0x00050086,0x00000047,
>+	0x00000060,0x0000005e,0x0000005f,0x0004003d,0x0000002c,0x00000061,0x0000002e,0x0009004f,
>+	0x0000002c,0x00000062,0x00000061,0x00000060,0x00000004,0x00000005,0x00000006,0x00000003,
>+	0x0003003e,0x0000002e,0x00000062,0x000200f9,0x0000005a,0x000200f8,0x0000005a,0x000200f9,
>+	0x00000042,0x000200f8,0x00000042,0x0004003d,0x0000002c,0x00000065,0x0000002e,0x00040070,
>+	0x0000000b,0x00000066,0x00000065,0x0003003e,0x00000064,0x00000066,0x00050041,0x0000001e,
>+	0x00000068,0x00000015,0x00000067,0x0004003d,0x00000012,0x00000069,0x00000068,0x000500ab,
>+	0x00000021,0x0000006a,0x00000069,0x00000022,0x000300f7,0x0000006c,0x00000000,0x000400fa,
>+	0x0000006a,0x0000006b,0x00000071,0x000200f8,0x0000006b,0x0004003d,0x0000000b,0x0000006d,
>+	0x00000064,0x0007004f,0x0000000e,0x0000006e,0x0000006d,0x0000006d,0x00000000,0x00000003,
>+	0x0004003d,0x0000000b,0x0000006f,0x00000064,0x0009004f,0x0000000b,0x00000070,0x0000006f,
>+	0x0000006e,0x00000004,0x00000005,0x00000002,0x00000003,0x0003003e,0x00000064,0x00000070,
>+	0x000200f9,0x0000006c,0x000200f8,0x00000071,0x00050041,0x0000001e,0x00000073,0x00000015,
>+	0x00000072,0x0004003d,0x00000012,0x00000074,0x00000073,0x000500ab,0x00000021,0x00000075,
>+	0x00000074,0x00000022,0x000300f7,0x00000077,0x00000000,0x000400fa,0x00000075,0x00000076,
>+	0x0000007c,0x000200f8,0x00000076,0x00050041,0x00000078,0x00000079,0x00000064,0x00000043,
>+	0x0004003d,0x0000000a,0x0000007a,0x00000079,0x00050041,0x00000078,0x0000007b,0x00000064,
>+	0x00000022,0x0003003e,0x0000007b,0x0000007a,0x000200f9,0x00000077,0x000200f8,0x0000007c,
>+	0x00050041,0x00000039,0x0000007f,0x00000015,0x0000007e,0x0004003d,0x00000006,0x00000080,
>+	0x0000007f,0x0003003e,0x0000007d,0x00000080,0x0004003d,0x00000006,0x00000081,0x0000007d,
>+	0x000500c7,0x00000006,0x00000082,0x00000081,0x00000038,0x000500ab,0x00000021,0x00000083,
>+	0x00000082,0x00000033,0x000300f7,0x00000085,0x00000000,0x000400fa,0x00000083,0x00000084,
>+	0x00000085,0x000200f8,0x00000084,0x00050041,0x00000078,0x00000087,0x00000064,0x00000026,
>+	0x0003003e,0x00000087,0x00000086,0x000200f9,0x00000085,0x000200f8,0x00000085,0x0004003d,
>+	0x00000006,0x00000088,0x0000007d,0x000500c7,0x00000006,0x00000089,0x00000088,0x0000001d,
>+	0x000500ab,0x00000021,0x0000008a,0x00000089,0x00000033,0x000300f7,0x0000008c,0x00000000,
>+	0x000400fa,0x0000008a,0x0000008b,0x0000008c,0x000200f8,0x0000008b,0x00050041,0x00000078,
>+	0x0000008e,0x00000064,0x0000008d,0x0003003e,0x0000008e,0x00000086,0x000200f9,0x0000008c,
>+	0x000200f8,0x0000008c,0x0004003d,0x00000006,0x0000008f,0x0000007d,0x000500c7,0x00000006,
>+	0x00000090,0x0000008f,0x00000072,0x000500ab,0x00000021,0x00000091,0x00000090,0x00000033,
>+	0x000300f7,0x00000093,0x00000000,0x000400fa,0x00000091,0x00000092,0x00000093,0x000200f8,
>+	0x00000092,0x00050041,0x00000078,0x00000095,0x00000064,0x00000043,0x0003003e,0x00000095,
>+	0x00000094,0x000200f9,0x00000093,0x000200f8,0x00000093,0x000200f9,0x00000077,0x000200f8,
>+	0x00000077,0x000200f9,0x0000006c,0x000200f8,0x0000006c,0x0004003d,0x0000000b,0x00000098,
>+	0x00000064,0x0003003e,0x00000097,0x00000098,0x000100fd,0x00010038
>+};
>+
>+#if 0  // Generated from:
>+#version 450 core
>+
>+#extension GL_EXT_samplerless_texture_functions : require
>+
>+layout(set = 0, binding = 0)uniform utexture2D src;
>+layout(location = 0)out vec4 dest;
>+
>+layout(push_constant)uniform PushConstants {
>+
>+    ivec2 srcOffset;
>+    ivec2 destOffset;
>+    int srcMip;
>+    int srcLayer;
>+
>+    bool flipY;
>+
>+    bool premultiplyAlpha;
>+    bool unmultiplyAlpha;
>+
>+    bool destHasLuminance;
>+    bool destIsAlpha;
>+
>+    int destDefaultChannelsMask;
>+} params;
>+
>+void main()
>+{
>+    ivec2 destSubImageCoords = ivec2(gl_FragCoord . xy)- params . destOffset;
>+
>+    ivec2 srcSubImageCoords = destSubImageCoords;
>+
>+    if(params . flipY)
>+        srcSubImageCoords . y = - srcSubImageCoords . y;
>+
>+          uvec4 srcValue = texelFetch(src, params . srcOffset + srcSubImageCoords, params . srcMip);
>+
>+    if(params . premultiplyAlpha)
>+    {
>+        srcValue . rgb *= srcValue . a;
>+    }
>+    else if(params . unmultiplyAlpha && srcValue . a > 0)
>+    {
>+        srcValue . rgb /= srcValue . a;
>+    }
>+
>+           vec4 destValue = vec4(srcValue);
>+
>+    if(params . destHasLuminance)
>+    {
>+        destValue . rg = destValue . ra;
>+    }
>+    else if(params . destIsAlpha)
>+    {
>+        destValue . r = destValue . a;
>+    }
>+    else
>+    {
>+        int defaultChannelsMask = params . destDefaultChannelsMask;
>+        if((defaultChannelsMask & 2)!= 0)
>+        {
>+            destValue . g = 0;
>+        }
>+        if((defaultChannelsMask & 4)!= 0)
>+        {
>+            destValue . b = 0;
>+        }
>+        if((defaultChannelsMask & 8)!= 0)
>+        {
>+            destValue . a = 1;
>+        }
>+    }
>+
>+    dest = destValue;
>+}
>+#endif  // Preprocessed code
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000005.inc b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000005.inc
>new file mode 100644
>index 00000000000..e1ce83d2eb3
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000005.inc
>@@ -0,0 +1,211 @@
>+	// 7.11.3188
>+	 #pragma once
>+const uint32_t kImageCopy_frag_00000005[] = {
>+	0x07230203,0x00010000,0x00080007,0x000000a0,0x00000000,0x00020011,0x00000001,0x0006000b,
>+	0x00000001,0x4c534c47,0x6474732e,0x3035342e,0x00000000,0x0003000e,0x00000000,0x00000001,
>+	0x0007000f,0x00000004,0x00000004,0x6e69616d,0x00000000,0x0000000d,0x0000009e,0x00030010,
>+	0x00000004,0x00000007,0x00030003,0x00000002,0x000001c2,0x000b0004,0x455f4c47,0x735f5458,
>+	0x6c706d61,0x656c7265,0x745f7373,0x75747865,0x665f6572,0x74636e75,0x736e6f69,0x00000000,
>+	0x00040005,0x00000004,0x6e69616d,0x00000000,0x00070005,0x00000009,0x74736564,0x49627553,
>+	0x6567616d,0x726f6f43,0x00007364,0x00060005,0x0000000d,0x465f6c67,0x43676172,0x64726f6f,
>+	0x00000000,0x00060005,0x00000013,0x68737550,0x736e6f43,0x746e6174,0x00000073,0x00060006,
>+	0x00000013,0x00000000,0x4f637273,0x65736666,0x00000074,0x00060006,0x00000013,0x00000001,
>+	0x74736564,0x7366664f,0x00007465,0x00050006,0x00000013,0x00000002,0x4d637273,0x00007069,
>+	0x00060006,0x00000013,0x00000003,0x4c637273,0x72657961,0x00000000,0x00050006,0x00000013,
>+	0x00000004,0x70696c66,0x00000059,0x00080006,0x00000013,0x00000005,0x6d657270,0x69746c75,
>+	0x41796c70,0x6168706c,0x00000000,0x00070006,0x00000013,0x00000006,0x756d6e75,0x7069746c,
>+	0x6c41796c,0x00616870,0x00080006,0x00000013,0x00000007,0x74736564,0x4c736148,0x6e696d75,
>+	0x65636e61,0x00000000,0x00060006,0x00000013,0x00000008,0x74736564,0x6c417349,0x00616870,
>+	0x00090006,0x00000013,0x00000009,0x74736564,0x61666544,0x43746c75,0x6e6e6168,0x4d736c65,
>+	0x006b7361,0x00040005,0x00000015,0x61726170,0x0000736d,0x00070005,0x0000001b,0x53637273,
>+	0x6d496275,0x43656761,0x64726f6f,0x00000073,0x00050005,0x0000002e,0x56637273,0x65756c61,
>+	0x00000000,0x00030005,0x00000031,0x00637273,0x00050005,0x0000006b,0x74736564,0x756c6156,
>+	0x00000065,0x00070005,0x00000084,0x61666564,0x43746c75,0x6e6e6168,0x4d736c65,0x006b7361,
>+	0x00040005,0x0000009e,0x74736564,0x00000000,0x00040047,0x0000000d,0x0000000b,0x0000000f,
>+	0x00050048,0x00000013,0x00000000,0x00000023,0x00000000,0x00050048,0x00000013,0x00000001,
>+	0x00000023,0x00000008,0x00050048,0x00000013,0x00000002,0x00000023,0x00000010,0x00050048,
>+	0x00000013,0x00000003,0x00000023,0x00000014,0x00050048,0x00000013,0x00000004,0x00000023,
>+	0x00000018,0x00050048,0x00000013,0x00000005,0x00000023,0x0000001c,0x00050048,0x00000013,
>+	0x00000006,0x00000023,0x00000020,0x00050048,0x00000013,0x00000007,0x00000023,0x00000024,
>+	0x00050048,0x00000013,0x00000008,0x00000023,0x00000028,0x00050048,0x00000013,0x00000009,
>+	0x00000023,0x0000002c,0x00030047,0x00000013,0x00000002,0x00040047,0x00000031,0x00000022,
>+	0x00000000,0x00040047,0x00000031,0x00000021,0x00000000,0x00040047,0x0000009e,0x0000001e,
>+	0x00000000,0x00020013,0x00000002,0x00030021,0x00000003,0x00000002,0x00040015,0x00000006,
>+	0x00000020,0x00000001,0x00040017,0x00000007,0x00000006,0x00000002,0x00040020,0x00000008,
>+	0x00000007,0x00000007,0x00030016,0x0000000a,0x00000020,0x00040017,0x0000000b,0x0000000a,
>+	0x00000004,0x00040020,0x0000000c,0x00000001,0x0000000b,0x0004003b,0x0000000c,0x0000000d,
>+	0x00000001,0x00040017,0x0000000e,0x0000000a,0x00000002,0x00040015,0x00000012,0x00000020,
>+	0x00000000,0x000c001e,0x00000013,0x00000007,0x00000007,0x00000006,0x00000006,0x00000012,
>+	0x00000012,0x00000012,0x00000012,0x00000012,0x00000006,0x00040020,0x00000014,0x00000009,
>+	0x00000013,0x0004003b,0x00000014,0x00000015,0x00000009,0x0004002b,0x00000006,0x00000016,
>+	0x00000001,0x00040020,0x00000017,0x00000009,0x00000007,0x0004002b,0x00000006,0x0000001d,
>+	0x00000004,0x00040020,0x0000001e,0x00000009,0x00000012,0x00020014,0x00000021,0x0004002b,
>+	0x00000012,0x00000022,0x00000000,0x0004002b,0x00000012,0x00000026,0x00000001,0x00040020,
>+	0x00000027,0x00000007,0x00000006,0x00040017,0x0000002c,0x00000012,0x00000004,0x00040020,
>+	0x0000002d,0x00000007,0x0000002c,0x00090019,0x0000002f,0x00000012,0x00000001,0x00000000,
>+	0x00000001,0x00000000,0x00000001,0x00000000,0x00040020,0x00000030,0x00000000,0x0000002f,
>+	0x0004003b,0x00000030,0x00000031,0x00000000,0x0004002b,0x00000006,0x00000033,0x00000000,
>+	0x0004002b,0x00000006,0x00000038,0x00000003,0x00040020,0x00000039,0x00000009,0x00000006,
>+	0x00040017,0x0000003c,0x00000006,0x00000003,0x0004002b,0x00000006,0x00000040,0x00000002,
>+	0x0004002b,0x00000006,0x00000044,0x00000005,0x0004002b,0x00000012,0x0000004a,0x00000003,
>+	0x00040020,0x0000004b,0x00000007,0x00000012,0x00040017,0x0000004e,0x00000012,0x00000003,
>+	0x0004002b,0x00000006,0x00000056,0x00000006,0x00040020,0x0000006a,0x00000007,0x0000000b,
>+	0x0004002b,0x00000006,0x0000006e,0x00000007,0x0004002b,0x00000006,0x00000079,0x00000008,
>+	0x00040020,0x0000007f,0x00000007,0x0000000a,0x0004002b,0x00000006,0x00000085,0x00000009,
>+	0x0004002b,0x0000000a,0x0000008d,0x00000000,0x0004002b,0x00000012,0x00000094,0x00000002,
>+	0x0004002b,0x0000000a,0x0000009b,0x3f800000,0x00040020,0x0000009d,0x00000003,0x0000000b,
>+	0x0004003b,0x0000009d,0x0000009e,0x00000003,0x00050036,0x00000002,0x00000004,0x00000000,
>+	0x00000003,0x000200f8,0x00000005,0x0004003b,0x00000008,0x00000009,0x00000007,0x0004003b,
>+	0x00000008,0x0000001b,0x00000007,0x0004003b,0x0000002d,0x0000002e,0x00000007,0x0004003b,
>+	0x0000006a,0x0000006b,0x00000007,0x0004003b,0x00000027,0x00000084,0x00000007,0x0004003d,
>+	0x0000000b,0x0000000f,0x0000000d,0x0007004f,0x0000000e,0x00000010,0x0000000f,0x0000000f,
>+	0x00000000,0x00000001,0x0004006e,0x00000007,0x00000011,0x00000010,0x00050041,0x00000017,
>+	0x00000018,0x00000015,0x00000016,0x0004003d,0x00000007,0x00000019,0x00000018,0x00050082,
>+	0x00000007,0x0000001a,0x00000011,0x00000019,0x0003003e,0x00000009,0x0000001a,0x0004003d,
>+	0x00000007,0x0000001c,0x00000009,0x0003003e,0x0000001b,0x0000001c,0x00050041,0x0000001e,
>+	0x0000001f,0x00000015,0x0000001d,0x0004003d,0x00000012,0x00000020,0x0000001f,0x000500ab,
>+	0x00000021,0x00000023,0x00000020,0x00000022,0x000300f7,0x00000025,0x00000000,0x000400fa,
>+	0x00000023,0x00000024,0x00000025,0x000200f8,0x00000024,0x00050041,0x00000027,0x00000028,
>+	0x0000001b,0x00000026,0x0004003d,0x00000006,0x00000029,0x00000028,0x0004007e,0x00000006,
>+	0x0000002a,0x00000029,0x00050041,0x00000027,0x0000002b,0x0000001b,0x00000026,0x0003003e,
>+	0x0000002b,0x0000002a,0x000200f9,0x00000025,0x000200f8,0x00000025,0x0004003d,0x0000002f,
>+	0x00000032,0x00000031,0x00050041,0x00000017,0x00000034,0x00000015,0x00000033,0x0004003d,
>+	0x00000007,0x00000035,0x00000034,0x0004003d,0x00000007,0x00000036,0x0000001b,0x00050080,
>+	0x00000007,0x00000037,0x00000035,0x00000036,0x00050041,0x00000039,0x0000003a,0x00000015,
>+	0x00000038,0x0004003d,0x00000006,0x0000003b,0x0000003a,0x00050051,0x00000006,0x0000003d,
>+	0x00000037,0x00000000,0x00050051,0x00000006,0x0000003e,0x00000037,0x00000001,0x00060050,
>+	0x0000003c,0x0000003f,0x0000003d,0x0000003e,0x0000003b,0x00050041,0x00000039,0x00000041,
>+	0x00000015,0x00000040,0x0004003d,0x00000006,0x00000042,0x00000041,0x0007005f,0x0000002c,
>+	0x00000043,0x00000032,0x0000003f,0x00000002,0x00000042,0x0003003e,0x0000002e,0x00000043,
>+	0x00050041,0x0000001e,0x00000045,0x00000015,0x00000044,0x0004003d,0x00000012,0x00000046,
>+	0x00000045,0x000500ab,0x00000021,0x00000047,0x00000046,0x00000022,0x000300f7,0x00000049,
>+	0x00000000,0x000400fa,0x00000047,0x00000048,0x00000055,0x000200f8,0x00000048,0x00050041,
>+	0x0000004b,0x0000004c,0x0000002e,0x0000004a,0x0004003d,0x00000012,0x0000004d,0x0000004c,
>+	0x0004003d,0x0000002c,0x0000004f,0x0000002e,0x0008004f,0x0000004e,0x00000050,0x0000004f,
>+	0x0000004f,0x00000000,0x00000001,0x00000002,0x00060050,0x0000004e,0x00000051,0x0000004d,
>+	0x0000004d,0x0000004d,0x00050084,0x0000004e,0x00000052,0x00000050,0x00000051,0x0004003d,
>+	0x0000002c,0x00000053,0x0000002e,0x0009004f,0x0000002c,0x00000054,0x00000053,0x00000052,
>+	0x00000004,0x00000005,0x00000006,0x00000003,0x0003003e,0x0000002e,0x00000054,0x000200f9,
>+	0x00000049,0x000200f8,0x00000055,0x00050041,0x0000001e,0x00000057,0x00000015,0x00000056,
>+	0x0004003d,0x00000012,0x00000058,0x00000057,0x000500ab,0x00000021,0x00000059,0x00000058,
>+	0x00000022,0x000300f7,0x0000005b,0x00000000,0x000400fa,0x00000059,0x0000005a,0x0000005b,
>+	0x000200f8,0x0000005a,0x00050041,0x0000004b,0x0000005c,0x0000002e,0x0000004a,0x0004003d,
>+	0x00000012,0x0000005d,0x0000005c,0x000500ac,0x00000021,0x0000005e,0x0000005d,0x00000022,
>+	0x000200f9,0x0000005b,0x000200f8,0x0000005b,0x000700f5,0x00000021,0x0000005f,0x00000059,
>+	0x00000055,0x0000005e,0x0000005a,0x000300f7,0x00000061,0x00000000,0x000400fa,0x0000005f,
>+	0x00000060,0x00000061,0x000200f8,0x00000060,0x00050041,0x0000004b,0x00000062,0x0000002e,
>+	0x0000004a,0x0004003d,0x00000012,0x00000063,0x00000062,0x0004003d,0x0000002c,0x00000064,
>+	0x0000002e,0x0008004f,0x0000004e,0x00000065,0x00000064,0x00000064,0x00000000,0x00000001,
>+	0x00000002,0x00060050,0x0000004e,0x00000066,0x00000063,0x00000063,0x00000063,0x00050086,
>+	0x0000004e,0x00000067,0x00000065,0x00000066,0x0004003d,0x0000002c,0x00000068,0x0000002e,
>+	0x0009004f,0x0000002c,0x00000069,0x00000068,0x00000067,0x00000004,0x00000005,0x00000006,
>+	0x00000003,0x0003003e,0x0000002e,0x00000069,0x000200f9,0x00000061,0x000200f8,0x00000061,
>+	0x000200f9,0x00000049,0x000200f8,0x00000049,0x0004003d,0x0000002c,0x0000006c,0x0000002e,
>+	0x00040070,0x0000000b,0x0000006d,0x0000006c,0x0003003e,0x0000006b,0x0000006d,0x00050041,
>+	0x0000001e,0x0000006f,0x00000015,0x0000006e,0x0004003d,0x00000012,0x00000070,0x0000006f,
>+	0x000500ab,0x00000021,0x00000071,0x00000070,0x00000022,0x000300f7,0x00000073,0x00000000,
>+	0x000400fa,0x00000071,0x00000072,0x00000078,0x000200f8,0x00000072,0x0004003d,0x0000000b,
>+	0x00000074,0x0000006b,0x0007004f,0x0000000e,0x00000075,0x00000074,0x00000074,0x00000000,
>+	0x00000003,0x0004003d,0x0000000b,0x00000076,0x0000006b,0x0009004f,0x0000000b,0x00000077,
>+	0x00000076,0x00000075,0x00000004,0x00000005,0x00000002,0x00000003,0x0003003e,0x0000006b,
>+	0x00000077,0x000200f9,0x00000073,0x000200f8,0x00000078,0x00050041,0x0000001e,0x0000007a,
>+	0x00000015,0x00000079,0x0004003d,0x00000012,0x0000007b,0x0000007a,0x000500ab,0x00000021,
>+	0x0000007c,0x0000007b,0x00000022,0x000300f7,0x0000007e,0x00000000,0x000400fa,0x0000007c,
>+	0x0000007d,0x00000083,0x000200f8,0x0000007d,0x00050041,0x0000007f,0x00000080,0x0000006b,
>+	0x0000004a,0x0004003d,0x0000000a,0x00000081,0x00000080,0x00050041,0x0000007f,0x00000082,
>+	0x0000006b,0x00000022,0x0003003e,0x00000082,0x00000081,0x000200f9,0x0000007e,0x000200f8,
>+	0x00000083,0x00050041,0x00000039,0x00000086,0x00000015,0x00000085,0x0004003d,0x00000006,
>+	0x00000087,0x00000086,0x0003003e,0x00000084,0x00000087,0x0004003d,0x00000006,0x00000088,
>+	0x00000084,0x000500c7,0x00000006,0x00000089,0x00000088,0x00000040,0x000500ab,0x00000021,
>+	0x0000008a,0x00000089,0x00000033,0x000300f7,0x0000008c,0x00000000,0x000400fa,0x0000008a,
>+	0x0000008b,0x0000008c,0x000200f8,0x0000008b,0x00050041,0x0000007f,0x0000008e,0x0000006b,
>+	0x00000026,0x0003003e,0x0000008e,0x0000008d,0x000200f9,0x0000008c,0x000200f8,0x0000008c,
>+	0x0004003d,0x00000006,0x0000008f,0x00000084,0x000500c7,0x00000006,0x00000090,0x0000008f,
>+	0x0000001d,0x000500ab,0x00000021,0x00000091,0x00000090,0x00000033,0x000300f7,0x00000093,
>+	0x00000000,0x000400fa,0x00000091,0x00000092,0x00000093,0x000200f8,0x00000092,0x00050041,
>+	0x0000007f,0x00000095,0x0000006b,0x00000094,0x0003003e,0x00000095,0x0000008d,0x000200f9,
>+	0x00000093,0x000200f8,0x00000093,0x0004003d,0x00000006,0x00000096,0x00000084,0x000500c7,
>+	0x00000006,0x00000097,0x00000096,0x00000079,0x000500ab,0x00000021,0x00000098,0x00000097,
>+	0x00000033,0x000300f7,0x0000009a,0x00000000,0x000400fa,0x00000098,0x00000099,0x0000009a,
>+	0x000200f8,0x00000099,0x00050041,0x0000007f,0x0000009c,0x0000006b,0x0000004a,0x0003003e,
>+	0x0000009c,0x0000009b,0x000200f9,0x0000009a,0x000200f8,0x0000009a,0x000200f9,0x0000007e,
>+	0x000200f8,0x0000007e,0x000200f9,0x00000073,0x000200f8,0x00000073,0x0004003d,0x0000000b,
>+	0x0000009f,0x0000006b,0x0003003e,0x0000009e,0x0000009f,0x000100fd,0x00010038
>+};
>+
>+#if 0  // Generated from:
>+#version 450 core
>+
>+#extension GL_EXT_samplerless_texture_functions : require
>+
>+layout(set = 0, binding = 0)uniform utexture2DArray src;
>+layout(location = 0)out vec4 dest;
>+
>+layout(push_constant)uniform PushConstants {
>+
>+    ivec2 srcOffset;
>+    ivec2 destOffset;
>+    int srcMip;
>+    int srcLayer;
>+
>+    bool flipY;
>+
>+    bool premultiplyAlpha;
>+    bool unmultiplyAlpha;
>+
>+    bool destHasLuminance;
>+    bool destIsAlpha;
>+
>+    int destDefaultChannelsMask;
>+} params;
>+
>+void main()
>+{
>+    ivec2 destSubImageCoords = ivec2(gl_FragCoord . xy)- params . destOffset;
>+
>+    ivec2 srcSubImageCoords = destSubImageCoords;
>+
>+    if(params . flipY)
>+        srcSubImageCoords . y = - srcSubImageCoords . y;
>+
>+          uvec4 srcValue = texelFetch(src, ivec3(params . srcOffset + srcSubImageCoords, params . srcLayer), params . srcMip);
>+
>+    if(params . premultiplyAlpha)
>+    {
>+        srcValue . rgb *= srcValue . a;
>+    }
>+    else if(params . unmultiplyAlpha && srcValue . a > 0)
>+    {
>+        srcValue . rgb /= srcValue . a;
>+    }
>+
>+           vec4 destValue = vec4(srcValue);
>+
>+    if(params . destHasLuminance)
>+    {
>+        destValue . rg = destValue . ra;
>+    }
>+    else if(params . destIsAlpha)
>+    {
>+        destValue . r = destValue . a;
>+    }
>+    else
>+    {
>+        int defaultChannelsMask = params . destDefaultChannelsMask;
>+        if((defaultChannelsMask & 2)!= 0)
>+        {
>+            destValue . g = 0;
>+        }
>+        if((defaultChannelsMask & 4)!= 0)
>+        {
>+            destValue . b = 0;
>+        }
>+        if((defaultChannelsMask & 8)!= 0)
>+        {
>+            destValue . a = 1;
>+        }
>+    }
>+
>+    dest = destValue;
>+}
>+#endif  // Preprocessed code
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000008.inc b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000008.inc
>new file mode 100644
>index 00000000000..0bfe24898ff
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000008.inc
>@@ -0,0 +1,205 @@
>+	// 7.11.3188
>+	 #pragma once
>+const uint32_t kImageCopy_frag_00000008[] = {
>+	0x07230203,0x00010000,0x00080007,0x00000096,0x00000000,0x00020011,0x00000001,0x0006000b,
>+	0x00000001,0x4c534c47,0x6474732e,0x3035342e,0x00000000,0x0003000e,0x00000000,0x00000001,
>+	0x0007000f,0x00000004,0x00000004,0x6e69616d,0x00000000,0x0000000d,0x00000094,0x00030010,
>+	0x00000004,0x00000007,0x00030003,0x00000002,0x000001c2,0x000b0004,0x455f4c47,0x735f5458,
>+	0x6c706d61,0x656c7265,0x745f7373,0x75747865,0x665f6572,0x74636e75,0x736e6f69,0x00000000,
>+	0x00040005,0x00000004,0x6e69616d,0x00000000,0x00070005,0x00000009,0x74736564,0x49627553,
>+	0x6567616d,0x726f6f43,0x00007364,0x00060005,0x0000000d,0x465f6c67,0x43676172,0x64726f6f,
>+	0x00000000,0x00060005,0x00000013,0x68737550,0x736e6f43,0x746e6174,0x00000073,0x00060006,
>+	0x00000013,0x00000000,0x4f637273,0x65736666,0x00000074,0x00060006,0x00000013,0x00000001,
>+	0x74736564,0x7366664f,0x00007465,0x00050006,0x00000013,0x00000002,0x4d637273,0x00007069,
>+	0x00060006,0x00000013,0x00000003,0x4c637273,0x72657961,0x00000000,0x00050006,0x00000013,
>+	0x00000004,0x70696c66,0x00000059,0x00080006,0x00000013,0x00000005,0x6d657270,0x69746c75,
>+	0x41796c70,0x6168706c,0x00000000,0x00070006,0x00000013,0x00000006,0x756d6e75,0x7069746c,
>+	0x6c41796c,0x00616870,0x00080006,0x00000013,0x00000007,0x74736564,0x4c736148,0x6e696d75,
>+	0x65636e61,0x00000000,0x00060006,0x00000013,0x00000008,0x74736564,0x6c417349,0x00616870,
>+	0x00090006,0x00000013,0x00000009,0x74736564,0x61666544,0x43746c75,0x6e6e6168,0x4d736c65,
>+	0x006b7361,0x00040005,0x00000015,0x61726170,0x0000736d,0x00070005,0x0000001b,0x53637273,
>+	0x6d496275,0x43656761,0x64726f6f,0x00000073,0x00050005,0x0000002d,0x56637273,0x65756c61,
>+	0x00000000,0x00030005,0x00000030,0x00637273,0x00050005,0x00000064,0x74736564,0x756c6156,
>+	0x00000065,0x00070005,0x0000007c,0x61666564,0x43746c75,0x6e6e6168,0x4d736c65,0x006b7361,
>+	0x00040005,0x00000094,0x74736564,0x00000000,0x00040047,0x0000000d,0x0000000b,0x0000000f,
>+	0x00050048,0x00000013,0x00000000,0x00000023,0x00000000,0x00050048,0x00000013,0x00000001,
>+	0x00000023,0x00000008,0x00050048,0x00000013,0x00000002,0x00000023,0x00000010,0x00050048,
>+	0x00000013,0x00000003,0x00000023,0x00000014,0x00050048,0x00000013,0x00000004,0x00000023,
>+	0x00000018,0x00050048,0x00000013,0x00000005,0x00000023,0x0000001c,0x00050048,0x00000013,
>+	0x00000006,0x00000023,0x00000020,0x00050048,0x00000013,0x00000007,0x00000023,0x00000024,
>+	0x00050048,0x00000013,0x00000008,0x00000023,0x00000028,0x00050048,0x00000013,0x00000009,
>+	0x00000023,0x0000002c,0x00030047,0x00000013,0x00000002,0x00040047,0x00000030,0x00000022,
>+	0x00000000,0x00040047,0x00000030,0x00000021,0x00000000,0x00040047,0x00000094,0x0000001e,
>+	0x00000000,0x00020013,0x00000002,0x00030021,0x00000003,0x00000002,0x00040015,0x00000006,
>+	0x00000020,0x00000001,0x00040017,0x00000007,0x00000006,0x00000002,0x00040020,0x00000008,
>+	0x00000007,0x00000007,0x00030016,0x0000000a,0x00000020,0x00040017,0x0000000b,0x0000000a,
>+	0x00000004,0x00040020,0x0000000c,0x00000001,0x0000000b,0x0004003b,0x0000000c,0x0000000d,
>+	0x00000001,0x00040017,0x0000000e,0x0000000a,0x00000002,0x00040015,0x00000012,0x00000020,
>+	0x00000000,0x000c001e,0x00000013,0x00000007,0x00000007,0x00000006,0x00000006,0x00000012,
>+	0x00000012,0x00000012,0x00000012,0x00000012,0x00000006,0x00040020,0x00000014,0x00000009,
>+	0x00000013,0x0004003b,0x00000014,0x00000015,0x00000009,0x0004002b,0x00000006,0x00000016,
>+	0x00000001,0x00040020,0x00000017,0x00000009,0x00000007,0x0004002b,0x00000006,0x0000001d,
>+	0x00000004,0x00040020,0x0000001e,0x00000009,0x00000012,0x00020014,0x00000021,0x0004002b,
>+	0x00000012,0x00000022,0x00000000,0x0004002b,0x00000012,0x00000026,0x00000001,0x00040020,
>+	0x00000027,0x00000007,0x00000006,0x00040020,0x0000002c,0x00000007,0x0000000b,0x00090019,
>+	0x0000002e,0x0000000a,0x00000001,0x00000000,0x00000000,0x00000000,0x00000001,0x00000000,
>+	0x00040020,0x0000002f,0x00000000,0x0000002e,0x0004003b,0x0000002f,0x00000030,0x00000000,
>+	0x0004002b,0x00000006,0x00000032,0x00000000,0x0004002b,0x00000006,0x00000037,0x00000002,
>+	0x00040020,0x00000038,0x00000009,0x00000006,0x0004002b,0x00000006,0x0000003c,0x00000005,
>+	0x0004002b,0x00000012,0x00000042,0x00000003,0x00040020,0x00000043,0x00000007,0x0000000a,
>+	0x00040017,0x00000046,0x0000000a,0x00000003,0x0004002b,0x00000006,0x0000004d,0x00000006,
>+	0x0004002b,0x0000000a,0x00000055,0x00000000,0x00040017,0x00000062,0x00000006,0x00000004,
>+	0x00040020,0x00000063,0x00000007,0x00000062,0x0004002b,0x00000006,0x00000067,0x00000007,
>+	0x0004002b,0x00000006,0x00000072,0x00000008,0x0004002b,0x00000006,0x0000007d,0x00000009,
>+	0x0004002b,0x00000012,0x0000008b,0x00000002,0x00040020,0x00000093,0x00000003,0x00000062,
>+	0x0004003b,0x00000093,0x00000094,0x00000003,0x00050036,0x00000002,0x00000004,0x00000000,
>+	0x00000003,0x000200f8,0x00000005,0x0004003b,0x00000008,0x00000009,0x00000007,0x0004003b,
>+	0x00000008,0x0000001b,0x00000007,0x0004003b,0x0000002c,0x0000002d,0x00000007,0x0004003b,
>+	0x00000063,0x00000064,0x00000007,0x0004003b,0x00000027,0x0000007c,0x00000007,0x0004003d,
>+	0x0000000b,0x0000000f,0x0000000d,0x0007004f,0x0000000e,0x00000010,0x0000000f,0x0000000f,
>+	0x00000000,0x00000001,0x0004006e,0x00000007,0x00000011,0x00000010,0x00050041,0x00000017,
>+	0x00000018,0x00000015,0x00000016,0x0004003d,0x00000007,0x00000019,0x00000018,0x00050082,
>+	0x00000007,0x0000001a,0x00000011,0x00000019,0x0003003e,0x00000009,0x0000001a,0x0004003d,
>+	0x00000007,0x0000001c,0x00000009,0x0003003e,0x0000001b,0x0000001c,0x00050041,0x0000001e,
>+	0x0000001f,0x00000015,0x0000001d,0x0004003d,0x00000012,0x00000020,0x0000001f,0x000500ab,
>+	0x00000021,0x00000023,0x00000020,0x00000022,0x000300f7,0x00000025,0x00000000,0x000400fa,
>+	0x00000023,0x00000024,0x00000025,0x000200f8,0x00000024,0x00050041,0x00000027,0x00000028,
>+	0x0000001b,0x00000026,0x0004003d,0x00000006,0x00000029,0x00000028,0x0004007e,0x00000006,
>+	0x0000002a,0x00000029,0x00050041,0x00000027,0x0000002b,0x0000001b,0x00000026,0x0003003e,
>+	0x0000002b,0x0000002a,0x000200f9,0x00000025,0x000200f8,0x00000025,0x0004003d,0x0000002e,
>+	0x00000031,0x00000030,0x00050041,0x00000017,0x00000033,0x00000015,0x00000032,0x0004003d,
>+	0x00000007,0x00000034,0x00000033,0x0004003d,0x00000007,0x00000035,0x0000001b,0x00050080,
>+	0x00000007,0x00000036,0x00000034,0x00000035,0x00050041,0x00000038,0x00000039,0x00000015,
>+	0x00000037,0x0004003d,0x00000006,0x0000003a,0x00000039,0x0007005f,0x0000000b,0x0000003b,
>+	0x00000031,0x00000036,0x00000002,0x0000003a,0x0003003e,0x0000002d,0x0000003b,0x00050041,
>+	0x0000001e,0x0000003d,0x00000015,0x0000003c,0x0004003d,0x00000012,0x0000003e,0x0000003d,
>+	0x000500ab,0x00000021,0x0000003f,0x0000003e,0x00000022,0x000300f7,0x00000041,0x00000000,
>+	0x000400fa,0x0000003f,0x00000040,0x0000004c,0x000200f8,0x00000040,0x00050041,0x00000043,
>+	0x00000044,0x0000002d,0x00000042,0x0004003d,0x0000000a,0x00000045,0x00000044,0x0004003d,
>+	0x0000000b,0x00000047,0x0000002d,0x0008004f,0x00000046,0x00000048,0x00000047,0x00000047,
>+	0x00000000,0x00000001,0x00000002,0x0005008e,0x00000046,0x00000049,0x00000048,0x00000045,
>+	0x0004003d,0x0000000b,0x0000004a,0x0000002d,0x0009004f,0x0000000b,0x0000004b,0x0000004a,
>+	0x00000049,0x00000004,0x00000005,0x00000006,0x00000003,0x0003003e,0x0000002d,0x0000004b,
>+	0x000200f9,0x00000041,0x000200f8,0x0000004c,0x00050041,0x0000001e,0x0000004e,0x00000015,
>+	0x0000004d,0x0004003d,0x00000012,0x0000004f,0x0000004e,0x000500ab,0x00000021,0x00000050,
>+	0x0000004f,0x00000022,0x000300f7,0x00000052,0x00000000,0x000400fa,0x00000050,0x00000051,
>+	0x00000052,0x000200f8,0x00000051,0x00050041,0x00000043,0x00000053,0x0000002d,0x00000042,
>+	0x0004003d,0x0000000a,0x00000054,0x00000053,0x000500ba,0x00000021,0x00000056,0x00000054,
>+	0x00000055,0x000200f9,0x00000052,0x000200f8,0x00000052,0x000700f5,0x00000021,0x00000057,
>+	0x00000050,0x0000004c,0x00000056,0x00000051,0x000300f7,0x00000059,0x00000000,0x000400fa,
>+	0x00000057,0x00000058,0x00000059,0x000200f8,0x00000058,0x00050041,0x00000043,0x0000005a,
>+	0x0000002d,0x00000042,0x0004003d,0x0000000a,0x0000005b,0x0000005a,0x0004003d,0x0000000b,
>+	0x0000005c,0x0000002d,0x0008004f,0x00000046,0x0000005d,0x0000005c,0x0000005c,0x00000000,
>+	0x00000001,0x00000002,0x00060050,0x00000046,0x0000005e,0x0000005b,0x0000005b,0x0000005b,
>+	0x00050088,0x00000046,0x0000005f,0x0000005d,0x0000005e,0x0004003d,0x0000000b,0x00000060,
>+	0x0000002d,0x0009004f,0x0000000b,0x00000061,0x00000060,0x0000005f,0x00000004,0x00000005,
>+	0x00000006,0x00000003,0x0003003e,0x0000002d,0x00000061,0x000200f9,0x00000059,0x000200f8,
>+	0x00000059,0x000200f9,0x00000041,0x000200f8,0x00000041,0x0004003d,0x0000000b,0x00000065,
>+	0x0000002d,0x0004006e,0x00000062,0x00000066,0x00000065,0x0003003e,0x00000064,0x00000066,
>+	0x00050041,0x0000001e,0x00000068,0x00000015,0x00000067,0x0004003d,0x00000012,0x00000069,
>+	0x00000068,0x000500ab,0x00000021,0x0000006a,0x00000069,0x00000022,0x000300f7,0x0000006c,
>+	0x00000000,0x000400fa,0x0000006a,0x0000006b,0x00000071,0x000200f8,0x0000006b,0x0004003d,
>+	0x00000062,0x0000006d,0x00000064,0x0007004f,0x00000007,0x0000006e,0x0000006d,0x0000006d,
>+	0x00000000,0x00000003,0x0004003d,0x00000062,0x0000006f,0x00000064,0x0009004f,0x00000062,
>+	0x00000070,0x0000006f,0x0000006e,0x00000004,0x00000005,0x00000002,0x00000003,0x0003003e,
>+	0x00000064,0x00000070,0x000200f9,0x0000006c,0x000200f8,0x00000071,0x00050041,0x0000001e,
>+	0x00000073,0x00000015,0x00000072,0x0004003d,0x00000012,0x00000074,0x00000073,0x000500ab,
>+	0x00000021,0x00000075,0x00000074,0x00000022,0x000300f7,0x00000077,0x00000000,0x000400fa,
>+	0x00000075,0x00000076,0x0000007b,0x000200f8,0x00000076,0x00050041,0x00000027,0x00000078,
>+	0x00000064,0x00000042,0x0004003d,0x00000006,0x00000079,0x00000078,0x00050041,0x00000027,
>+	0x0000007a,0x00000064,0x00000022,0x0003003e,0x0000007a,0x00000079,0x000200f9,0x00000077,
>+	0x000200f8,0x0000007b,0x00050041,0x00000038,0x0000007e,0x00000015,0x0000007d,0x0004003d,
>+	0x00000006,0x0000007f,0x0000007e,0x0003003e,0x0000007c,0x0000007f,0x0004003d,0x00000006,
>+	0x00000080,0x0000007c,0x000500c7,0x00000006,0x00000081,0x00000080,0x00000037,0x000500ab,
>+	0x00000021,0x00000082,0x00000081,0x00000032,0x000300f7,0x00000084,0x00000000,0x000400fa,
>+	0x00000082,0x00000083,0x00000084,0x000200f8,0x00000083,0x00050041,0x00000027,0x00000085,
>+	0x00000064,0x00000026,0x0003003e,0x00000085,0x00000032,0x000200f9,0x00000084,0x000200f8,
>+	0x00000084,0x0004003d,0x00000006,0x00000086,0x0000007c,0x000500c7,0x00000006,0x00000087,
>+	0x00000086,0x0000001d,0x000500ab,0x00000021,0x00000088,0x00000087,0x00000032,0x000300f7,
>+	0x0000008a,0x00000000,0x000400fa,0x00000088,0x00000089,0x0000008a,0x000200f8,0x00000089,
>+	0x00050041,0x00000027,0x0000008c,0x00000064,0x0000008b,0x0003003e,0x0000008c,0x00000032,
>+	0x000200f9,0x0000008a,0x000200f8,0x0000008a,0x0004003d,0x00000006,0x0000008d,0x0000007c,
>+	0x000500c7,0x00000006,0x0000008e,0x0000008d,0x00000072,0x000500ab,0x00000021,0x0000008f,
>+	0x0000008e,0x00000032,0x000300f7,0x00000091,0x00000000,0x000400fa,0x0000008f,0x00000090,
>+	0x00000091,0x000200f8,0x00000090,0x00050041,0x00000027,0x00000092,0x00000064,0x00000042,
>+	0x0003003e,0x00000092,0x00000016,0x000200f9,0x00000091,0x000200f8,0x00000091,0x000200f9,
>+	0x00000077,0x000200f8,0x00000077,0x000200f9,0x0000006c,0x000200f8,0x0000006c,0x0004003d,
>+	0x00000062,0x00000095,0x00000064,0x0003003e,0x00000094,0x00000095,0x000100fd,0x00010038
>+};
>+
>+#if 0  // Generated from:
>+#version 450 core
>+
>+#extension GL_EXT_samplerless_texture_functions : require
>+
>+layout(set = 0, binding = 0)uniform texture2D src;
>+layout(location = 0)out ivec4 dest;
>+
>+layout(push_constant)uniform PushConstants {
>+
>+    ivec2 srcOffset;
>+    ivec2 destOffset;
>+    int srcMip;
>+    int srcLayer;
>+
>+    bool flipY;
>+
>+    bool premultiplyAlpha;
>+    bool unmultiplyAlpha;
>+
>+    bool destHasLuminance;
>+    bool destIsAlpha;
>+
>+    int destDefaultChannelsMask;
>+} params;
>+
>+void main()
>+{
>+    ivec2 destSubImageCoords = ivec2(gl_FragCoord . xy)- params . destOffset;
>+
>+    ivec2 srcSubImageCoords = destSubImageCoords;
>+
>+    if(params . flipY)
>+        srcSubImageCoords . y = - srcSubImageCoords . y;
>+
>+          vec4 srcValue = texelFetch(src, params . srcOffset + srcSubImageCoords, params . srcMip);
>+
>+    if(params . premultiplyAlpha)
>+    {
>+        srcValue . rgb *= srcValue . a;
>+    }
>+    else if(params . unmultiplyAlpha && srcValue . a > 0)
>+    {
>+        srcValue . rgb /= srcValue . a;
>+    }
>+
>+           ivec4 destValue = ivec4(srcValue);
>+
>+    if(params . destHasLuminance)
>+    {
>+        destValue . rg = destValue . ra;
>+    }
>+    else if(params . destIsAlpha)
>+    {
>+        destValue . r = destValue . a;
>+    }
>+    else
>+    {
>+        int defaultChannelsMask = params . destDefaultChannelsMask;
>+        if((defaultChannelsMask & 2)!= 0)
>+        {
>+            destValue . g = 0;
>+        }
>+        if((defaultChannelsMask & 4)!= 0)
>+        {
>+            destValue . b = 0;
>+        }
>+        if((defaultChannelsMask & 8)!= 0)
>+        {
>+            destValue . a = 1;
>+        }
>+    }
>+
>+    dest = destValue;
>+}
>+#endif  // Preprocessed code
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000009.inc b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000009.inc
>new file mode 100644
>index 00000000000..9a093090d5a
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000009.inc
>@@ -0,0 +1,210 @@
>+	// 7.11.3188
>+	 #pragma once
>+const uint32_t kImageCopy_frag_00000009[] = {
>+	0x07230203,0x00010000,0x00080007,0x0000009d,0x00000000,0x00020011,0x00000001,0x0006000b,
>+	0x00000001,0x4c534c47,0x6474732e,0x3035342e,0x00000000,0x0003000e,0x00000000,0x00000001,
>+	0x0007000f,0x00000004,0x00000004,0x6e69616d,0x00000000,0x0000000d,0x0000009b,0x00030010,
>+	0x00000004,0x00000007,0x00030003,0x00000002,0x000001c2,0x000b0004,0x455f4c47,0x735f5458,
>+	0x6c706d61,0x656c7265,0x745f7373,0x75747865,0x665f6572,0x74636e75,0x736e6f69,0x00000000,
>+	0x00040005,0x00000004,0x6e69616d,0x00000000,0x00070005,0x00000009,0x74736564,0x49627553,
>+	0x6567616d,0x726f6f43,0x00007364,0x00060005,0x0000000d,0x465f6c67,0x43676172,0x64726f6f,
>+	0x00000000,0x00060005,0x00000013,0x68737550,0x736e6f43,0x746e6174,0x00000073,0x00060006,
>+	0x00000013,0x00000000,0x4f637273,0x65736666,0x00000074,0x00060006,0x00000013,0x00000001,
>+	0x74736564,0x7366664f,0x00007465,0x00050006,0x00000013,0x00000002,0x4d637273,0x00007069,
>+	0x00060006,0x00000013,0x00000003,0x4c637273,0x72657961,0x00000000,0x00050006,0x00000013,
>+	0x00000004,0x70696c66,0x00000059,0x00080006,0x00000013,0x00000005,0x6d657270,0x69746c75,
>+	0x41796c70,0x6168706c,0x00000000,0x00070006,0x00000013,0x00000006,0x756d6e75,0x7069746c,
>+	0x6c41796c,0x00616870,0x00080006,0x00000013,0x00000007,0x74736564,0x4c736148,0x6e696d75,
>+	0x65636e61,0x00000000,0x00060006,0x00000013,0x00000008,0x74736564,0x6c417349,0x00616870,
>+	0x00090006,0x00000013,0x00000009,0x74736564,0x61666544,0x43746c75,0x6e6e6168,0x4d736c65,
>+	0x006b7361,0x00040005,0x00000015,0x61726170,0x0000736d,0x00070005,0x0000001b,0x53637273,
>+	0x6d496275,0x43656761,0x64726f6f,0x00000073,0x00050005,0x0000002d,0x56637273,0x65756c61,
>+	0x00000000,0x00030005,0x00000030,0x00637273,0x00050005,0x0000006b,0x74736564,0x756c6156,
>+	0x00000065,0x00070005,0x00000083,0x61666564,0x43746c75,0x6e6e6168,0x4d736c65,0x006b7361,
>+	0x00040005,0x0000009b,0x74736564,0x00000000,0x00040047,0x0000000d,0x0000000b,0x0000000f,
>+	0x00050048,0x00000013,0x00000000,0x00000023,0x00000000,0x00050048,0x00000013,0x00000001,
>+	0x00000023,0x00000008,0x00050048,0x00000013,0x00000002,0x00000023,0x00000010,0x00050048,
>+	0x00000013,0x00000003,0x00000023,0x00000014,0x00050048,0x00000013,0x00000004,0x00000023,
>+	0x00000018,0x00050048,0x00000013,0x00000005,0x00000023,0x0000001c,0x00050048,0x00000013,
>+	0x00000006,0x00000023,0x00000020,0x00050048,0x00000013,0x00000007,0x00000023,0x00000024,
>+	0x00050048,0x00000013,0x00000008,0x00000023,0x00000028,0x00050048,0x00000013,0x00000009,
>+	0x00000023,0x0000002c,0x00030047,0x00000013,0x00000002,0x00040047,0x00000030,0x00000022,
>+	0x00000000,0x00040047,0x00000030,0x00000021,0x00000000,0x00040047,0x0000009b,0x0000001e,
>+	0x00000000,0x00020013,0x00000002,0x00030021,0x00000003,0x00000002,0x00040015,0x00000006,
>+	0x00000020,0x00000001,0x00040017,0x00000007,0x00000006,0x00000002,0x00040020,0x00000008,
>+	0x00000007,0x00000007,0x00030016,0x0000000a,0x00000020,0x00040017,0x0000000b,0x0000000a,
>+	0x00000004,0x00040020,0x0000000c,0x00000001,0x0000000b,0x0004003b,0x0000000c,0x0000000d,
>+	0x00000001,0x00040017,0x0000000e,0x0000000a,0x00000002,0x00040015,0x00000012,0x00000020,
>+	0x00000000,0x000c001e,0x00000013,0x00000007,0x00000007,0x00000006,0x00000006,0x00000012,
>+	0x00000012,0x00000012,0x00000012,0x00000012,0x00000006,0x00040020,0x00000014,0x00000009,
>+	0x00000013,0x0004003b,0x00000014,0x00000015,0x00000009,0x0004002b,0x00000006,0x00000016,
>+	0x00000001,0x00040020,0x00000017,0x00000009,0x00000007,0x0004002b,0x00000006,0x0000001d,
>+	0x00000004,0x00040020,0x0000001e,0x00000009,0x00000012,0x00020014,0x00000021,0x0004002b,
>+	0x00000012,0x00000022,0x00000000,0x0004002b,0x00000012,0x00000026,0x00000001,0x00040020,
>+	0x00000027,0x00000007,0x00000006,0x00040020,0x0000002c,0x00000007,0x0000000b,0x00090019,
>+	0x0000002e,0x0000000a,0x00000001,0x00000000,0x00000001,0x00000000,0x00000001,0x00000000,
>+	0x00040020,0x0000002f,0x00000000,0x0000002e,0x0004003b,0x0000002f,0x00000030,0x00000000,
>+	0x0004002b,0x00000006,0x00000032,0x00000000,0x0004002b,0x00000006,0x00000037,0x00000003,
>+	0x00040020,0x00000038,0x00000009,0x00000006,0x00040017,0x0000003b,0x00000006,0x00000003,
>+	0x0004002b,0x00000006,0x0000003f,0x00000002,0x0004002b,0x00000006,0x00000043,0x00000005,
>+	0x0004002b,0x00000012,0x00000049,0x00000003,0x00040020,0x0000004a,0x00000007,0x0000000a,
>+	0x00040017,0x0000004d,0x0000000a,0x00000003,0x0004002b,0x00000006,0x00000054,0x00000006,
>+	0x0004002b,0x0000000a,0x0000005c,0x00000000,0x00040017,0x00000069,0x00000006,0x00000004,
>+	0x00040020,0x0000006a,0x00000007,0x00000069,0x0004002b,0x00000006,0x0000006e,0x00000007,
>+	0x0004002b,0x00000006,0x00000079,0x00000008,0x0004002b,0x00000006,0x00000084,0x00000009,
>+	0x0004002b,0x00000012,0x00000092,0x00000002,0x00040020,0x0000009a,0x00000003,0x00000069,
>+	0x0004003b,0x0000009a,0x0000009b,0x00000003,0x00050036,0x00000002,0x00000004,0x00000000,
>+	0x00000003,0x000200f8,0x00000005,0x0004003b,0x00000008,0x00000009,0x00000007,0x0004003b,
>+	0x00000008,0x0000001b,0x00000007,0x0004003b,0x0000002c,0x0000002d,0x00000007,0x0004003b,
>+	0x0000006a,0x0000006b,0x00000007,0x0004003b,0x00000027,0x00000083,0x00000007,0x0004003d,
>+	0x0000000b,0x0000000f,0x0000000d,0x0007004f,0x0000000e,0x00000010,0x0000000f,0x0000000f,
>+	0x00000000,0x00000001,0x0004006e,0x00000007,0x00000011,0x00000010,0x00050041,0x00000017,
>+	0x00000018,0x00000015,0x00000016,0x0004003d,0x00000007,0x00000019,0x00000018,0x00050082,
>+	0x00000007,0x0000001a,0x00000011,0x00000019,0x0003003e,0x00000009,0x0000001a,0x0004003d,
>+	0x00000007,0x0000001c,0x00000009,0x0003003e,0x0000001b,0x0000001c,0x00050041,0x0000001e,
>+	0x0000001f,0x00000015,0x0000001d,0x0004003d,0x00000012,0x00000020,0x0000001f,0x000500ab,
>+	0x00000021,0x00000023,0x00000020,0x00000022,0x000300f7,0x00000025,0x00000000,0x000400fa,
>+	0x00000023,0x00000024,0x00000025,0x000200f8,0x00000024,0x00050041,0x00000027,0x00000028,
>+	0x0000001b,0x00000026,0x0004003d,0x00000006,0x00000029,0x00000028,0x0004007e,0x00000006,
>+	0x0000002a,0x00000029,0x00050041,0x00000027,0x0000002b,0x0000001b,0x00000026,0x0003003e,
>+	0x0000002b,0x0000002a,0x000200f9,0x00000025,0x000200f8,0x00000025,0x0004003d,0x0000002e,
>+	0x00000031,0x00000030,0x00050041,0x00000017,0x00000033,0x00000015,0x00000032,0x0004003d,
>+	0x00000007,0x00000034,0x00000033,0x0004003d,0x00000007,0x00000035,0x0000001b,0x00050080,
>+	0x00000007,0x00000036,0x00000034,0x00000035,0x00050041,0x00000038,0x00000039,0x00000015,
>+	0x00000037,0x0004003d,0x00000006,0x0000003a,0x00000039,0x00050051,0x00000006,0x0000003c,
>+	0x00000036,0x00000000,0x00050051,0x00000006,0x0000003d,0x00000036,0x00000001,0x00060050,
>+	0x0000003b,0x0000003e,0x0000003c,0x0000003d,0x0000003a,0x00050041,0x00000038,0x00000040,
>+	0x00000015,0x0000003f,0x0004003d,0x00000006,0x00000041,0x00000040,0x0007005f,0x0000000b,
>+	0x00000042,0x00000031,0x0000003e,0x00000002,0x00000041,0x0003003e,0x0000002d,0x00000042,
>+	0x00050041,0x0000001e,0x00000044,0x00000015,0x00000043,0x0004003d,0x00000012,0x00000045,
>+	0x00000044,0x000500ab,0x00000021,0x00000046,0x00000045,0x00000022,0x000300f7,0x00000048,
>+	0x00000000,0x000400fa,0x00000046,0x00000047,0x00000053,0x000200f8,0x00000047,0x00050041,
>+	0x0000004a,0x0000004b,0x0000002d,0x00000049,0x0004003d,0x0000000a,0x0000004c,0x0000004b,
>+	0x0004003d,0x0000000b,0x0000004e,0x0000002d,0x0008004f,0x0000004d,0x0000004f,0x0000004e,
>+	0x0000004e,0x00000000,0x00000001,0x00000002,0x0005008e,0x0000004d,0x00000050,0x0000004f,
>+	0x0000004c,0x0004003d,0x0000000b,0x00000051,0x0000002d,0x0009004f,0x0000000b,0x00000052,
>+	0x00000051,0x00000050,0x00000004,0x00000005,0x00000006,0x00000003,0x0003003e,0x0000002d,
>+	0x00000052,0x000200f9,0x00000048,0x000200f8,0x00000053,0x00050041,0x0000001e,0x00000055,
>+	0x00000015,0x00000054,0x0004003d,0x00000012,0x00000056,0x00000055,0x000500ab,0x00000021,
>+	0x00000057,0x00000056,0x00000022,0x000300f7,0x00000059,0x00000000,0x000400fa,0x00000057,
>+	0x00000058,0x00000059,0x000200f8,0x00000058,0x00050041,0x0000004a,0x0000005a,0x0000002d,
>+	0x00000049,0x0004003d,0x0000000a,0x0000005b,0x0000005a,0x000500ba,0x00000021,0x0000005d,
>+	0x0000005b,0x0000005c,0x000200f9,0x00000059,0x000200f8,0x00000059,0x000700f5,0x00000021,
>+	0x0000005e,0x00000057,0x00000053,0x0000005d,0x00000058,0x000300f7,0x00000060,0x00000000,
>+	0x000400fa,0x0000005e,0x0000005f,0x00000060,0x000200f8,0x0000005f,0x00050041,0x0000004a,
>+	0x00000061,0x0000002d,0x00000049,0x0004003d,0x0000000a,0x00000062,0x00000061,0x0004003d,
>+	0x0000000b,0x00000063,0x0000002d,0x0008004f,0x0000004d,0x00000064,0x00000063,0x00000063,
>+	0x00000000,0x00000001,0x00000002,0x00060050,0x0000004d,0x00000065,0x00000062,0x00000062,
>+	0x00000062,0x00050088,0x0000004d,0x00000066,0x00000064,0x00000065,0x0004003d,0x0000000b,
>+	0x00000067,0x0000002d,0x0009004f,0x0000000b,0x00000068,0x00000067,0x00000066,0x00000004,
>+	0x00000005,0x00000006,0x00000003,0x0003003e,0x0000002d,0x00000068,0x000200f9,0x00000060,
>+	0x000200f8,0x00000060,0x000200f9,0x00000048,0x000200f8,0x00000048,0x0004003d,0x0000000b,
>+	0x0000006c,0x0000002d,0x0004006e,0x00000069,0x0000006d,0x0000006c,0x0003003e,0x0000006b,
>+	0x0000006d,0x00050041,0x0000001e,0x0000006f,0x00000015,0x0000006e,0x0004003d,0x00000012,
>+	0x00000070,0x0000006f,0x000500ab,0x00000021,0x00000071,0x00000070,0x00000022,0x000300f7,
>+	0x00000073,0x00000000,0x000400fa,0x00000071,0x00000072,0x00000078,0x000200f8,0x00000072,
>+	0x0004003d,0x00000069,0x00000074,0x0000006b,0x0007004f,0x00000007,0x00000075,0x00000074,
>+	0x00000074,0x00000000,0x00000003,0x0004003d,0x00000069,0x00000076,0x0000006b,0x0009004f,
>+	0x00000069,0x00000077,0x00000076,0x00000075,0x00000004,0x00000005,0x00000002,0x00000003,
>+	0x0003003e,0x0000006b,0x00000077,0x000200f9,0x00000073,0x000200f8,0x00000078,0x00050041,
>+	0x0000001e,0x0000007a,0x00000015,0x00000079,0x0004003d,0x00000012,0x0000007b,0x0000007a,
>+	0x000500ab,0x00000021,0x0000007c,0x0000007b,0x00000022,0x000300f7,0x0000007e,0x00000000,
>+	0x000400fa,0x0000007c,0x0000007d,0x00000082,0x000200f8,0x0000007d,0x00050041,0x00000027,
>+	0x0000007f,0x0000006b,0x00000049,0x0004003d,0x00000006,0x00000080,0x0000007f,0x00050041,
>+	0x00000027,0x00000081,0x0000006b,0x00000022,0x0003003e,0x00000081,0x00000080,0x000200f9,
>+	0x0000007e,0x000200f8,0x00000082,0x00050041,0x00000038,0x00000085,0x00000015,0x00000084,
>+	0x0004003d,0x00000006,0x00000086,0x00000085,0x0003003e,0x00000083,0x00000086,0x0004003d,
>+	0x00000006,0x00000087,0x00000083,0x000500c7,0x00000006,0x00000088,0x00000087,0x0000003f,
>+	0x000500ab,0x00000021,0x00000089,0x00000088,0x00000032,0x000300f7,0x0000008b,0x00000000,
>+	0x000400fa,0x00000089,0x0000008a,0x0000008b,0x000200f8,0x0000008a,0x00050041,0x00000027,
>+	0x0000008c,0x0000006b,0x00000026,0x0003003e,0x0000008c,0x00000032,0x000200f9,0x0000008b,
>+	0x000200f8,0x0000008b,0x0004003d,0x00000006,0x0000008d,0x00000083,0x000500c7,0x00000006,
>+	0x0000008e,0x0000008d,0x0000001d,0x000500ab,0x00000021,0x0000008f,0x0000008e,0x00000032,
>+	0x000300f7,0x00000091,0x00000000,0x000400fa,0x0000008f,0x00000090,0x00000091,0x000200f8,
>+	0x00000090,0x00050041,0x00000027,0x00000093,0x0000006b,0x00000092,0x0003003e,0x00000093,
>+	0x00000032,0x000200f9,0x00000091,0x000200f8,0x00000091,0x0004003d,0x00000006,0x00000094,
>+	0x00000083,0x000500c7,0x00000006,0x00000095,0x00000094,0x00000079,0x000500ab,0x00000021,
>+	0x00000096,0x00000095,0x00000032,0x000300f7,0x00000098,0x00000000,0x000400fa,0x00000096,
>+	0x00000097,0x00000098,0x000200f8,0x00000097,0x00050041,0x00000027,0x00000099,0x0000006b,
>+	0x00000049,0x0003003e,0x00000099,0x00000016,0x000200f9,0x00000098,0x000200f8,0x00000098,
>+	0x000200f9,0x0000007e,0x000200f8,0x0000007e,0x000200f9,0x00000073,0x000200f8,0x00000073,
>+	0x0004003d,0x00000069,0x0000009c,0x0000006b,0x0003003e,0x0000009b,0x0000009c,0x000100fd,
>+	0x00010038
>+};
>+
>+#if 0  // Generated from:
>+#version 450 core
>+
>+#extension GL_EXT_samplerless_texture_functions : require
>+
>+layout(set = 0, binding = 0)uniform texture2DArray src;
>+layout(location = 0)out ivec4 dest;
>+
>+layout(push_constant)uniform PushConstants {
>+
>+    ivec2 srcOffset;
>+    ivec2 destOffset;
>+    int srcMip;
>+    int srcLayer;
>+
>+    bool flipY;
>+
>+    bool premultiplyAlpha;
>+    bool unmultiplyAlpha;
>+
>+    bool destHasLuminance;
>+    bool destIsAlpha;
>+
>+    int destDefaultChannelsMask;
>+} params;
>+
>+void main()
>+{
>+    ivec2 destSubImageCoords = ivec2(gl_FragCoord . xy)- params . destOffset;
>+
>+    ivec2 srcSubImageCoords = destSubImageCoords;
>+
>+    if(params . flipY)
>+        srcSubImageCoords . y = - srcSubImageCoords . y;
>+
>+          vec4 srcValue = texelFetch(src, ivec3(params . srcOffset + srcSubImageCoords, params . srcLayer), params . srcMip);
>+
>+    if(params . premultiplyAlpha)
>+    {
>+        srcValue . rgb *= srcValue . a;
>+    }
>+    else if(params . unmultiplyAlpha && srcValue . a > 0)
>+    {
>+        srcValue . rgb /= srcValue . a;
>+    }
>+
>+           ivec4 destValue = ivec4(srcValue);
>+
>+    if(params . destHasLuminance)
>+    {
>+        destValue . rg = destValue . ra;
>+    }
>+    else if(params . destIsAlpha)
>+    {
>+        destValue . r = destValue . a;
>+    }
>+    else
>+    {
>+        int defaultChannelsMask = params . destDefaultChannelsMask;
>+        if((defaultChannelsMask & 2)!= 0)
>+        {
>+            destValue . g = 0;
>+        }
>+        if((defaultChannelsMask & 4)!= 0)
>+        {
>+            destValue . b = 0;
>+        }
>+        if((defaultChannelsMask & 8)!= 0)
>+        {
>+            destValue . a = 1;
>+        }
>+    }
>+
>+    dest = destValue;
>+}
>+#endif  // Preprocessed code
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.0000000A.inc b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.0000000A.inc
>new file mode 100644
>index 00000000000..ced6bb3ee21
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.0000000A.inc
>@@ -0,0 +1,208 @@
>+	// 7.11.3188
>+	 #pragma once
>+const uint32_t kImageCopy_frag_0000000A[] = {
>+	0x07230203,0x00010000,0x00080007,0x00000098,0x00000000,0x00020011,0x00000001,0x0006000b,
>+	0x00000001,0x4c534c47,0x6474732e,0x3035342e,0x00000000,0x0003000e,0x00000000,0x00000001,
>+	0x0007000f,0x00000004,0x00000004,0x6e69616d,0x00000000,0x0000000d,0x00000096,0x00030010,
>+	0x00000004,0x00000007,0x00030003,0x00000002,0x000001c2,0x000b0004,0x455f4c47,0x735f5458,
>+	0x6c706d61,0x656c7265,0x745f7373,0x75747865,0x665f6572,0x74636e75,0x736e6f69,0x00000000,
>+	0x00040005,0x00000004,0x6e69616d,0x00000000,0x00070005,0x00000009,0x74736564,0x49627553,
>+	0x6567616d,0x726f6f43,0x00007364,0x00060005,0x0000000d,0x465f6c67,0x43676172,0x64726f6f,
>+	0x00000000,0x00060005,0x00000013,0x68737550,0x736e6f43,0x746e6174,0x00000073,0x00060006,
>+	0x00000013,0x00000000,0x4f637273,0x65736666,0x00000074,0x00060006,0x00000013,0x00000001,
>+	0x74736564,0x7366664f,0x00007465,0x00050006,0x00000013,0x00000002,0x4d637273,0x00007069,
>+	0x00060006,0x00000013,0x00000003,0x4c637273,0x72657961,0x00000000,0x00050006,0x00000013,
>+	0x00000004,0x70696c66,0x00000059,0x00080006,0x00000013,0x00000005,0x6d657270,0x69746c75,
>+	0x41796c70,0x6168706c,0x00000000,0x00070006,0x00000013,0x00000006,0x756d6e75,0x7069746c,
>+	0x6c41796c,0x00616870,0x00080006,0x00000013,0x00000007,0x74736564,0x4c736148,0x6e696d75,
>+	0x65636e61,0x00000000,0x00060006,0x00000013,0x00000008,0x74736564,0x6c417349,0x00616870,
>+	0x00090006,0x00000013,0x00000009,0x74736564,0x61666544,0x43746c75,0x6e6e6168,0x4d736c65,
>+	0x006b7361,0x00040005,0x00000015,0x61726170,0x0000736d,0x00070005,0x0000001b,0x53637273,
>+	0x6d496275,0x43656761,0x64726f6f,0x00000073,0x00050005,0x0000002e,0x56637273,0x65756c61,
>+	0x00000000,0x00030005,0x00000031,0x00637273,0x00050005,0x00000062,0x74736564,0x756c6156,
>+	0x00000065,0x00070005,0x0000007e,0x61666564,0x43746c75,0x6e6e6168,0x4d736c65,0x006b7361,
>+	0x00040005,0x00000096,0x74736564,0x00000000,0x00040047,0x0000000d,0x0000000b,0x0000000f,
>+	0x00050048,0x00000013,0x00000000,0x00000023,0x00000000,0x00050048,0x00000013,0x00000001,
>+	0x00000023,0x00000008,0x00050048,0x00000013,0x00000002,0x00000023,0x00000010,0x00050048,
>+	0x00000013,0x00000003,0x00000023,0x00000014,0x00050048,0x00000013,0x00000004,0x00000023,
>+	0x00000018,0x00050048,0x00000013,0x00000005,0x00000023,0x0000001c,0x00050048,0x00000013,
>+	0x00000006,0x00000023,0x00000020,0x00050048,0x00000013,0x00000007,0x00000023,0x00000024,
>+	0x00050048,0x00000013,0x00000008,0x00000023,0x00000028,0x00050048,0x00000013,0x00000009,
>+	0x00000023,0x0000002c,0x00030047,0x00000013,0x00000002,0x00040047,0x00000031,0x00000022,
>+	0x00000000,0x00040047,0x00000031,0x00000021,0x00000000,0x00040047,0x00000096,0x0000001e,
>+	0x00000000,0x00020013,0x00000002,0x00030021,0x00000003,0x00000002,0x00040015,0x00000006,
>+	0x00000020,0x00000001,0x00040017,0x00000007,0x00000006,0x00000002,0x00040020,0x00000008,
>+	0x00000007,0x00000007,0x00030016,0x0000000a,0x00000020,0x00040017,0x0000000b,0x0000000a,
>+	0x00000004,0x00040020,0x0000000c,0x00000001,0x0000000b,0x0004003b,0x0000000c,0x0000000d,
>+	0x00000001,0x00040017,0x0000000e,0x0000000a,0x00000002,0x00040015,0x00000012,0x00000020,
>+	0x00000000,0x000c001e,0x00000013,0x00000007,0x00000007,0x00000006,0x00000006,0x00000012,
>+	0x00000012,0x00000012,0x00000012,0x00000012,0x00000006,0x00040020,0x00000014,0x00000009,
>+	0x00000013,0x0004003b,0x00000014,0x00000015,0x00000009,0x0004002b,0x00000006,0x00000016,
>+	0x00000001,0x00040020,0x00000017,0x00000009,0x00000007,0x0004002b,0x00000006,0x0000001d,
>+	0x00000004,0x00040020,0x0000001e,0x00000009,0x00000012,0x00020014,0x00000021,0x0004002b,
>+	0x00000012,0x00000022,0x00000000,0x0004002b,0x00000012,0x00000026,0x00000001,0x00040020,
>+	0x00000027,0x00000007,0x00000006,0x00040017,0x0000002c,0x00000006,0x00000004,0x00040020,
>+	0x0000002d,0x00000007,0x0000002c,0x00090019,0x0000002f,0x00000006,0x00000001,0x00000000,
>+	0x00000000,0x00000000,0x00000001,0x00000000,0x00040020,0x00000030,0x00000000,0x0000002f,
>+	0x0004003b,0x00000030,0x00000031,0x00000000,0x0004002b,0x00000006,0x00000033,0x00000000,
>+	0x0004002b,0x00000006,0x00000038,0x00000002,0x00040020,0x00000039,0x00000009,0x00000006,
>+	0x0004002b,0x00000006,0x0000003d,0x00000005,0x0004002b,0x00000012,0x00000043,0x00000003,
>+	0x00040017,0x00000046,0x00000006,0x00000003,0x0004002b,0x00000006,0x0000004e,0x00000006,
>+	0x0004002b,0x00000006,0x00000069,0x00000007,0x0004002b,0x00000006,0x00000074,0x00000008,
>+	0x0004002b,0x00000006,0x0000007f,0x00000009,0x0004002b,0x00000012,0x0000008d,0x00000002,
>+	0x00040020,0x00000095,0x00000003,0x0000002c,0x0004003b,0x00000095,0x00000096,0x00000003,
>+	0x00050036,0x00000002,0x00000004,0x00000000,0x00000003,0x000200f8,0x00000005,0x0004003b,
>+	0x00000008,0x00000009,0x00000007,0x0004003b,0x00000008,0x0000001b,0x00000007,0x0004003b,
>+	0x0000002d,0x0000002e,0x00000007,0x0004003b,0x0000002d,0x00000062,0x00000007,0x0004003b,
>+	0x00000027,0x0000007e,0x00000007,0x0004003d,0x0000000b,0x0000000f,0x0000000d,0x0007004f,
>+	0x0000000e,0x00000010,0x0000000f,0x0000000f,0x00000000,0x00000001,0x0004006e,0x00000007,
>+	0x00000011,0x00000010,0x00050041,0x00000017,0x00000018,0x00000015,0x00000016,0x0004003d,
>+	0x00000007,0x00000019,0x00000018,0x00050082,0x00000007,0x0000001a,0x00000011,0x00000019,
>+	0x0003003e,0x00000009,0x0000001a,0x0004003d,0x00000007,0x0000001c,0x00000009,0x0003003e,
>+	0x0000001b,0x0000001c,0x00050041,0x0000001e,0x0000001f,0x00000015,0x0000001d,0x0004003d,
>+	0x00000012,0x00000020,0x0000001f,0x000500ab,0x00000021,0x00000023,0x00000020,0x00000022,
>+	0x000300f7,0x00000025,0x00000000,0x000400fa,0x00000023,0x00000024,0x00000025,0x000200f8,
>+	0x00000024,0x00050041,0x00000027,0x00000028,0x0000001b,0x00000026,0x0004003d,0x00000006,
>+	0x00000029,0x00000028,0x0004007e,0x00000006,0x0000002a,0x00000029,0x00050041,0x00000027,
>+	0x0000002b,0x0000001b,0x00000026,0x0003003e,0x0000002b,0x0000002a,0x000200f9,0x00000025,
>+	0x000200f8,0x00000025,0x0004003d,0x0000002f,0x00000032,0x00000031,0x00050041,0x00000017,
>+	0x00000034,0x00000015,0x00000033,0x0004003d,0x00000007,0x00000035,0x00000034,0x0004003d,
>+	0x00000007,0x00000036,0x0000001b,0x00050080,0x00000007,0x00000037,0x00000035,0x00000036,
>+	0x00050041,0x00000039,0x0000003a,0x00000015,0x00000038,0x0004003d,0x00000006,0x0000003b,
>+	0x0000003a,0x0007005f,0x0000002c,0x0000003c,0x00000032,0x00000037,0x00000002,0x0000003b,
>+	0x0003003e,0x0000002e,0x0000003c,0x00050041,0x0000001e,0x0000003e,0x00000015,0x0000003d,
>+	0x0004003d,0x00000012,0x0000003f,0x0000003e,0x000500ab,0x00000021,0x00000040,0x0000003f,
>+	0x00000022,0x000300f7,0x00000042,0x00000000,0x000400fa,0x00000040,0x00000041,0x0000004d,
>+	0x000200f8,0x00000041,0x00050041,0x00000027,0x00000044,0x0000002e,0x00000043,0x0004003d,
>+	0x00000006,0x00000045,0x00000044,0x0004003d,0x0000002c,0x00000047,0x0000002e,0x0008004f,
>+	0x00000046,0x00000048,0x00000047,0x00000047,0x00000000,0x00000001,0x00000002,0x00060050,
>+	0x00000046,0x00000049,0x00000045,0x00000045,0x00000045,0x00050084,0x00000046,0x0000004a,
>+	0x00000048,0x00000049,0x0004003d,0x0000002c,0x0000004b,0x0000002e,0x0009004f,0x0000002c,
>+	0x0000004c,0x0000004b,0x0000004a,0x00000004,0x00000005,0x00000006,0x00000003,0x0003003e,
>+	0x0000002e,0x0000004c,0x000200f9,0x00000042,0x000200f8,0x0000004d,0x00050041,0x0000001e,
>+	0x0000004f,0x00000015,0x0000004e,0x0004003d,0x00000012,0x00000050,0x0000004f,0x000500ab,
>+	0x00000021,0x00000051,0x00000050,0x00000022,0x000300f7,0x00000053,0x00000000,0x000400fa,
>+	0x00000051,0x00000052,0x00000053,0x000200f8,0x00000052,0x00050041,0x00000027,0x00000054,
>+	0x0000002e,0x00000043,0x0004003d,0x00000006,0x00000055,0x00000054,0x000500ad,0x00000021,
>+	0x00000056,0x00000055,0x00000033,0x000200f9,0x00000053,0x000200f8,0x00000053,0x000700f5,
>+	0x00000021,0x00000057,0x00000051,0x0000004d,0x00000056,0x00000052,0x000300f7,0x00000059,
>+	0x00000000,0x000400fa,0x00000057,0x00000058,0x00000059,0x000200f8,0x00000058,0x00050041,
>+	0x00000027,0x0000005a,0x0000002e,0x00000043,0x0004003d,0x00000006,0x0000005b,0x0000005a,
>+	0x0004003d,0x0000002c,0x0000005c,0x0000002e,0x0008004f,0x00000046,0x0000005d,0x0000005c,
>+	0x0000005c,0x00000000,0x00000001,0x00000002,0x00060050,0x00000046,0x0000005e,0x0000005b,
>+	0x0000005b,0x0000005b,0x00050087,0x00000046,0x0000005f,0x0000005d,0x0000005e,0x0004003d,
>+	0x0000002c,0x00000060,0x0000002e,0x0009004f,0x0000002c,0x00000061,0x00000060,0x0000005f,
>+	0x00000004,0x00000005,0x00000006,0x00000003,0x0003003e,0x0000002e,0x00000061,0x000200f9,
>+	0x00000059,0x000200f8,0x00000059,0x000200f9,0x00000042,0x000200f8,0x00000042,0x0004003d,
>+	0x0000002c,0x00000063,0x0000002e,0x00050051,0x00000006,0x00000064,0x00000063,0x00000000,
>+	0x00050051,0x00000006,0x00000065,0x00000063,0x00000001,0x00050051,0x00000006,0x00000066,
>+	0x00000063,0x00000002,0x00050051,0x00000006,0x00000067,0x00000063,0x00000003,0x00070050,
>+	0x0000002c,0x00000068,0x00000064,0x00000065,0x00000066,0x00000067,0x0003003e,0x00000062,
>+	0x00000068,0x00050041,0x0000001e,0x0000006a,0x00000015,0x00000069,0x0004003d,0x00000012,
>+	0x0000006b,0x0000006a,0x000500ab,0x00000021,0x0000006c,0x0000006b,0x00000022,0x000300f7,
>+	0x0000006e,0x00000000,0x000400fa,0x0000006c,0x0000006d,0x00000073,0x000200f8,0x0000006d,
>+	0x0004003d,0x0000002c,0x0000006f,0x00000062,0x0007004f,0x00000007,0x00000070,0x0000006f,
>+	0x0000006f,0x00000000,0x00000003,0x0004003d,0x0000002c,0x00000071,0x00000062,0x0009004f,
>+	0x0000002c,0x00000072,0x00000071,0x00000070,0x00000004,0x00000005,0x00000002,0x00000003,
>+	0x0003003e,0x00000062,0x00000072,0x000200f9,0x0000006e,0x000200f8,0x00000073,0x00050041,
>+	0x0000001e,0x00000075,0x00000015,0x00000074,0x0004003d,0x00000012,0x00000076,0x00000075,
>+	0x000500ab,0x00000021,0x00000077,0x00000076,0x00000022,0x000300f7,0x00000079,0x00000000,
>+	0x000400fa,0x00000077,0x00000078,0x0000007d,0x000200f8,0x00000078,0x00050041,0x00000027,
>+	0x0000007a,0x00000062,0x00000043,0x0004003d,0x00000006,0x0000007b,0x0000007a,0x00050041,
>+	0x00000027,0x0000007c,0x00000062,0x00000022,0x0003003e,0x0000007c,0x0000007b,0x000200f9,
>+	0x00000079,0x000200f8,0x0000007d,0x00050041,0x00000039,0x00000080,0x00000015,0x0000007f,
>+	0x0004003d,0x00000006,0x00000081,0x00000080,0x0003003e,0x0000007e,0x00000081,0x0004003d,
>+	0x00000006,0x00000082,0x0000007e,0x000500c7,0x00000006,0x00000083,0x00000082,0x00000038,
>+	0x000500ab,0x00000021,0x00000084,0x00000083,0x00000033,0x000300f7,0x00000086,0x00000000,
>+	0x000400fa,0x00000084,0x00000085,0x00000086,0x000200f8,0x00000085,0x00050041,0x00000027,
>+	0x00000087,0x00000062,0x00000026,0x0003003e,0x00000087,0x00000033,0x000200f9,0x00000086,
>+	0x000200f8,0x00000086,0x0004003d,0x00000006,0x00000088,0x0000007e,0x000500c7,0x00000006,
>+	0x00000089,0x00000088,0x0000001d,0x000500ab,0x00000021,0x0000008a,0x00000089,0x00000033,
>+	0x000300f7,0x0000008c,0x00000000,0x000400fa,0x0000008a,0x0000008b,0x0000008c,0x000200f8,
>+	0x0000008b,0x00050041,0x00000027,0x0000008e,0x00000062,0x0000008d,0x0003003e,0x0000008e,
>+	0x00000033,0x000200f9,0x0000008c,0x000200f8,0x0000008c,0x0004003d,0x00000006,0x0000008f,
>+	0x0000007e,0x000500c7,0x00000006,0x00000090,0x0000008f,0x00000074,0x000500ab,0x00000021,
>+	0x00000091,0x00000090,0x00000033,0x000300f7,0x00000093,0x00000000,0x000400fa,0x00000091,
>+	0x00000092,0x00000093,0x000200f8,0x00000092,0x00050041,0x00000027,0x00000094,0x00000062,
>+	0x00000043,0x0003003e,0x00000094,0x00000016,0x000200f9,0x00000093,0x000200f8,0x00000093,
>+	0x000200f9,0x00000079,0x000200f8,0x00000079,0x000200f9,0x0000006e,0x000200f8,0x0000006e,
>+	0x0004003d,0x0000002c,0x00000097,0x00000062,0x0003003e,0x00000096,0x00000097,0x000100fd,
>+	0x00010038
>+};
>+
>+#if 0  // Generated from:
>+#version 450 core
>+
>+#extension GL_EXT_samplerless_texture_functions : require
>+
>+layout(set = 0, binding = 0)uniform itexture2D src;
>+layout(location = 0)out ivec4 dest;
>+
>+layout(push_constant)uniform PushConstants {
>+
>+    ivec2 srcOffset;
>+    ivec2 destOffset;
>+    int srcMip;
>+    int srcLayer;
>+
>+    bool flipY;
>+
>+    bool premultiplyAlpha;
>+    bool unmultiplyAlpha;
>+
>+    bool destHasLuminance;
>+    bool destIsAlpha;
>+
>+    int destDefaultChannelsMask;
>+} params;
>+
>+void main()
>+{
>+    ivec2 destSubImageCoords = ivec2(gl_FragCoord . xy)- params . destOffset;
>+
>+    ivec2 srcSubImageCoords = destSubImageCoords;
>+
>+    if(params . flipY)
>+        srcSubImageCoords . y = - srcSubImageCoords . y;
>+
>+          ivec4 srcValue = texelFetch(src, params . srcOffset + srcSubImageCoords, params . srcMip);
>+
>+    if(params . premultiplyAlpha)
>+    {
>+        srcValue . rgb *= srcValue . a;
>+    }
>+    else if(params . unmultiplyAlpha && srcValue . a > 0)
>+    {
>+        srcValue . rgb /= srcValue . a;
>+    }
>+
>+           ivec4 destValue = ivec4(srcValue);
>+
>+    if(params . destHasLuminance)
>+    {
>+        destValue . rg = destValue . ra;
>+    }
>+    else if(params . destIsAlpha)
>+    {
>+        destValue . r = destValue . a;
>+    }
>+    else
>+    {
>+        int defaultChannelsMask = params . destDefaultChannelsMask;
>+        if((defaultChannelsMask & 2)!= 0)
>+        {
>+            destValue . g = 0;
>+        }
>+        if((defaultChannelsMask & 4)!= 0)
>+        {
>+            destValue . b = 0;
>+        }
>+        if((defaultChannelsMask & 8)!= 0)
>+        {
>+            destValue . a = 1;
>+        }
>+    }
>+
>+    dest = destValue;
>+}
>+#endif  // Preprocessed code
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.0000000B.inc b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.0000000B.inc
>new file mode 100644
>index 00000000000..65422bb6791
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.0000000B.inc
>@@ -0,0 +1,211 @@
>+	// 7.11.3188
>+	 #pragma once
>+const uint32_t kImageCopy_frag_0000000B[] = {
>+	0x07230203,0x00010000,0x00080007,0x0000009e,0x00000000,0x00020011,0x00000001,0x0006000b,
>+	0x00000001,0x4c534c47,0x6474732e,0x3035342e,0x00000000,0x0003000e,0x00000000,0x00000001,
>+	0x0007000f,0x00000004,0x00000004,0x6e69616d,0x00000000,0x0000000d,0x0000009c,0x00030010,
>+	0x00000004,0x00000007,0x00030003,0x00000002,0x000001c2,0x000b0004,0x455f4c47,0x735f5458,
>+	0x6c706d61,0x656c7265,0x745f7373,0x75747865,0x665f6572,0x74636e75,0x736e6f69,0x00000000,
>+	0x00040005,0x00000004,0x6e69616d,0x00000000,0x00070005,0x00000009,0x74736564,0x49627553,
>+	0x6567616d,0x726f6f43,0x00007364,0x00060005,0x0000000d,0x465f6c67,0x43676172,0x64726f6f,
>+	0x00000000,0x00060005,0x00000013,0x68737550,0x736e6f43,0x746e6174,0x00000073,0x00060006,
>+	0x00000013,0x00000000,0x4f637273,0x65736666,0x00000074,0x00060006,0x00000013,0x00000001,
>+	0x74736564,0x7366664f,0x00007465,0x00050006,0x00000013,0x00000002,0x4d637273,0x00007069,
>+	0x00060006,0x00000013,0x00000003,0x4c637273,0x72657961,0x00000000,0x00050006,0x00000013,
>+	0x00000004,0x70696c66,0x00000059,0x00080006,0x00000013,0x00000005,0x6d657270,0x69746c75,
>+	0x41796c70,0x6168706c,0x00000000,0x00070006,0x00000013,0x00000006,0x756d6e75,0x7069746c,
>+	0x6c41796c,0x00616870,0x00080006,0x00000013,0x00000007,0x74736564,0x4c736148,0x6e696d75,
>+	0x65636e61,0x00000000,0x00060006,0x00000013,0x00000008,0x74736564,0x6c417349,0x00616870,
>+	0x00090006,0x00000013,0x00000009,0x74736564,0x61666544,0x43746c75,0x6e6e6168,0x4d736c65,
>+	0x006b7361,0x00040005,0x00000015,0x61726170,0x0000736d,0x00070005,0x0000001b,0x53637273,
>+	0x6d496275,0x43656761,0x64726f6f,0x00000073,0x00050005,0x0000002e,0x56637273,0x65756c61,
>+	0x00000000,0x00030005,0x00000031,0x00637273,0x00050005,0x00000068,0x74736564,0x756c6156,
>+	0x00000065,0x00070005,0x00000084,0x61666564,0x43746c75,0x6e6e6168,0x4d736c65,0x006b7361,
>+	0x00040005,0x0000009c,0x74736564,0x00000000,0x00040047,0x0000000d,0x0000000b,0x0000000f,
>+	0x00050048,0x00000013,0x00000000,0x00000023,0x00000000,0x00050048,0x00000013,0x00000001,
>+	0x00000023,0x00000008,0x00050048,0x00000013,0x00000002,0x00000023,0x00000010,0x00050048,
>+	0x00000013,0x00000003,0x00000023,0x00000014,0x00050048,0x00000013,0x00000004,0x00000023,
>+	0x00000018,0x00050048,0x00000013,0x00000005,0x00000023,0x0000001c,0x00050048,0x00000013,
>+	0x00000006,0x00000023,0x00000020,0x00050048,0x00000013,0x00000007,0x00000023,0x00000024,
>+	0x00050048,0x00000013,0x00000008,0x00000023,0x00000028,0x00050048,0x00000013,0x00000009,
>+	0x00000023,0x0000002c,0x00030047,0x00000013,0x00000002,0x00040047,0x00000031,0x00000022,
>+	0x00000000,0x00040047,0x00000031,0x00000021,0x00000000,0x00040047,0x0000009c,0x0000001e,
>+	0x00000000,0x00020013,0x00000002,0x00030021,0x00000003,0x00000002,0x00040015,0x00000006,
>+	0x00000020,0x00000001,0x00040017,0x00000007,0x00000006,0x00000002,0x00040020,0x00000008,
>+	0x00000007,0x00000007,0x00030016,0x0000000a,0x00000020,0x00040017,0x0000000b,0x0000000a,
>+	0x00000004,0x00040020,0x0000000c,0x00000001,0x0000000b,0x0004003b,0x0000000c,0x0000000d,
>+	0x00000001,0x00040017,0x0000000e,0x0000000a,0x00000002,0x00040015,0x00000012,0x00000020,
>+	0x00000000,0x000c001e,0x00000013,0x00000007,0x00000007,0x00000006,0x00000006,0x00000012,
>+	0x00000012,0x00000012,0x00000012,0x00000012,0x00000006,0x00040020,0x00000014,0x00000009,
>+	0x00000013,0x0004003b,0x00000014,0x00000015,0x00000009,0x0004002b,0x00000006,0x00000016,
>+	0x00000001,0x00040020,0x00000017,0x00000009,0x00000007,0x0004002b,0x00000006,0x0000001d,
>+	0x00000004,0x00040020,0x0000001e,0x00000009,0x00000012,0x00020014,0x00000021,0x0004002b,
>+	0x00000012,0x00000022,0x00000000,0x0004002b,0x00000012,0x00000026,0x00000001,0x00040020,
>+	0x00000027,0x00000007,0x00000006,0x00040017,0x0000002c,0x00000006,0x00000004,0x00040020,
>+	0x0000002d,0x00000007,0x0000002c,0x00090019,0x0000002f,0x00000006,0x00000001,0x00000000,
>+	0x00000001,0x00000000,0x00000001,0x00000000,0x00040020,0x00000030,0x00000000,0x0000002f,
>+	0x0004003b,0x00000030,0x00000031,0x00000000,0x0004002b,0x00000006,0x00000033,0x00000000,
>+	0x0004002b,0x00000006,0x00000038,0x00000003,0x00040020,0x00000039,0x00000009,0x00000006,
>+	0x00040017,0x0000003c,0x00000006,0x00000003,0x0004002b,0x00000006,0x00000040,0x00000002,
>+	0x0004002b,0x00000006,0x00000044,0x00000005,0x0004002b,0x00000012,0x0000004a,0x00000003,
>+	0x0004002b,0x00000006,0x00000054,0x00000006,0x0004002b,0x00000006,0x0000006f,0x00000007,
>+	0x0004002b,0x00000006,0x0000007a,0x00000008,0x0004002b,0x00000006,0x00000085,0x00000009,
>+	0x0004002b,0x00000012,0x00000093,0x00000002,0x00040020,0x0000009b,0x00000003,0x0000002c,
>+	0x0004003b,0x0000009b,0x0000009c,0x00000003,0x00050036,0x00000002,0x00000004,0x00000000,
>+	0x00000003,0x000200f8,0x00000005,0x0004003b,0x00000008,0x00000009,0x00000007,0x0004003b,
>+	0x00000008,0x0000001b,0x00000007,0x0004003b,0x0000002d,0x0000002e,0x00000007,0x0004003b,
>+	0x0000002d,0x00000068,0x00000007,0x0004003b,0x00000027,0x00000084,0x00000007,0x0004003d,
>+	0x0000000b,0x0000000f,0x0000000d,0x0007004f,0x0000000e,0x00000010,0x0000000f,0x0000000f,
>+	0x00000000,0x00000001,0x0004006e,0x00000007,0x00000011,0x00000010,0x00050041,0x00000017,
>+	0x00000018,0x00000015,0x00000016,0x0004003d,0x00000007,0x00000019,0x00000018,0x00050082,
>+	0x00000007,0x0000001a,0x00000011,0x00000019,0x0003003e,0x00000009,0x0000001a,0x0004003d,
>+	0x00000007,0x0000001c,0x00000009,0x0003003e,0x0000001b,0x0000001c,0x00050041,0x0000001e,
>+	0x0000001f,0x00000015,0x0000001d,0x0004003d,0x00000012,0x00000020,0x0000001f,0x000500ab,
>+	0x00000021,0x00000023,0x00000020,0x00000022,0x000300f7,0x00000025,0x00000000,0x000400fa,
>+	0x00000023,0x00000024,0x00000025,0x000200f8,0x00000024,0x00050041,0x00000027,0x00000028,
>+	0x0000001b,0x00000026,0x0004003d,0x00000006,0x00000029,0x00000028,0x0004007e,0x00000006,
>+	0x0000002a,0x00000029,0x00050041,0x00000027,0x0000002b,0x0000001b,0x00000026,0x0003003e,
>+	0x0000002b,0x0000002a,0x000200f9,0x00000025,0x000200f8,0x00000025,0x0004003d,0x0000002f,
>+	0x00000032,0x00000031,0x00050041,0x00000017,0x00000034,0x00000015,0x00000033,0x0004003d,
>+	0x00000007,0x00000035,0x00000034,0x0004003d,0x00000007,0x00000036,0x0000001b,0x00050080,
>+	0x00000007,0x00000037,0x00000035,0x00000036,0x00050041,0x00000039,0x0000003a,0x00000015,
>+	0x00000038,0x0004003d,0x00000006,0x0000003b,0x0000003a,0x00050051,0x00000006,0x0000003d,
>+	0x00000037,0x00000000,0x00050051,0x00000006,0x0000003e,0x00000037,0x00000001,0x00060050,
>+	0x0000003c,0x0000003f,0x0000003d,0x0000003e,0x0000003b,0x00050041,0x00000039,0x00000041,
>+	0x00000015,0x00000040,0x0004003d,0x00000006,0x00000042,0x00000041,0x0007005f,0x0000002c,
>+	0x00000043,0x00000032,0x0000003f,0x00000002,0x00000042,0x0003003e,0x0000002e,0x00000043,
>+	0x00050041,0x0000001e,0x00000045,0x00000015,0x00000044,0x0004003d,0x00000012,0x00000046,
>+	0x00000045,0x000500ab,0x00000021,0x00000047,0x00000046,0x00000022,0x000300f7,0x00000049,
>+	0x00000000,0x000400fa,0x00000047,0x00000048,0x00000053,0x000200f8,0x00000048,0x00050041,
>+	0x00000027,0x0000004b,0x0000002e,0x0000004a,0x0004003d,0x00000006,0x0000004c,0x0000004b,
>+	0x0004003d,0x0000002c,0x0000004d,0x0000002e,0x0008004f,0x0000003c,0x0000004e,0x0000004d,
>+	0x0000004d,0x00000000,0x00000001,0x00000002,0x00060050,0x0000003c,0x0000004f,0x0000004c,
>+	0x0000004c,0x0000004c,0x00050084,0x0000003c,0x00000050,0x0000004e,0x0000004f,0x0004003d,
>+	0x0000002c,0x00000051,0x0000002e,0x0009004f,0x0000002c,0x00000052,0x00000051,0x00000050,
>+	0x00000004,0x00000005,0x00000006,0x00000003,0x0003003e,0x0000002e,0x00000052,0x000200f9,
>+	0x00000049,0x000200f8,0x00000053,0x00050041,0x0000001e,0x00000055,0x00000015,0x00000054,
>+	0x0004003d,0x00000012,0x00000056,0x00000055,0x000500ab,0x00000021,0x00000057,0x00000056,
>+	0x00000022,0x000300f7,0x00000059,0x00000000,0x000400fa,0x00000057,0x00000058,0x00000059,
>+	0x000200f8,0x00000058,0x00050041,0x00000027,0x0000005a,0x0000002e,0x0000004a,0x0004003d,
>+	0x00000006,0x0000005b,0x0000005a,0x000500ad,0x00000021,0x0000005c,0x0000005b,0x00000033,
>+	0x000200f9,0x00000059,0x000200f8,0x00000059,0x000700f5,0x00000021,0x0000005d,0x00000057,
>+	0x00000053,0x0000005c,0x00000058,0x000300f7,0x0000005f,0x00000000,0x000400fa,0x0000005d,
>+	0x0000005e,0x0000005f,0x000200f8,0x0000005e,0x00050041,0x00000027,0x00000060,0x0000002e,
>+	0x0000004a,0x0004003d,0x00000006,0x00000061,0x00000060,0x0004003d,0x0000002c,0x00000062,
>+	0x0000002e,0x0008004f,0x0000003c,0x00000063,0x00000062,0x00000062,0x00000000,0x00000001,
>+	0x00000002,0x00060050,0x0000003c,0x00000064,0x00000061,0x00000061,0x00000061,0x00050087,
>+	0x0000003c,0x00000065,0x00000063,0x00000064,0x0004003d,0x0000002c,0x00000066,0x0000002e,
>+	0x0009004f,0x0000002c,0x00000067,0x00000066,0x00000065,0x00000004,0x00000005,0x00000006,
>+	0x00000003,0x0003003e,0x0000002e,0x00000067,0x000200f9,0x0000005f,0x000200f8,0x0000005f,
>+	0x000200f9,0x00000049,0x000200f8,0x00000049,0x0004003d,0x0000002c,0x00000069,0x0000002e,
>+	0x00050051,0x00000006,0x0000006a,0x00000069,0x00000000,0x00050051,0x00000006,0x0000006b,
>+	0x00000069,0x00000001,0x00050051,0x00000006,0x0000006c,0x00000069,0x00000002,0x00050051,
>+	0x00000006,0x0000006d,0x00000069,0x00000003,0x00070050,0x0000002c,0x0000006e,0x0000006a,
>+	0x0000006b,0x0000006c,0x0000006d,0x0003003e,0x00000068,0x0000006e,0x00050041,0x0000001e,
>+	0x00000070,0x00000015,0x0000006f,0x0004003d,0x00000012,0x00000071,0x00000070,0x000500ab,
>+	0x00000021,0x00000072,0x00000071,0x00000022,0x000300f7,0x00000074,0x00000000,0x000400fa,
>+	0x00000072,0x00000073,0x00000079,0x000200f8,0x00000073,0x0004003d,0x0000002c,0x00000075,
>+	0x00000068,0x0007004f,0x00000007,0x00000076,0x00000075,0x00000075,0x00000000,0x00000003,
>+	0x0004003d,0x0000002c,0x00000077,0x00000068,0x0009004f,0x0000002c,0x00000078,0x00000077,
>+	0x00000076,0x00000004,0x00000005,0x00000002,0x00000003,0x0003003e,0x00000068,0x00000078,
>+	0x000200f9,0x00000074,0x000200f8,0x00000079,0x00050041,0x0000001e,0x0000007b,0x00000015,
>+	0x0000007a,0x0004003d,0x00000012,0x0000007c,0x0000007b,0x000500ab,0x00000021,0x0000007d,
>+	0x0000007c,0x00000022,0x000300f7,0x0000007f,0x00000000,0x000400fa,0x0000007d,0x0000007e,
>+	0x00000083,0x000200f8,0x0000007e,0x00050041,0x00000027,0x00000080,0x00000068,0x0000004a,
>+	0x0004003d,0x00000006,0x00000081,0x00000080,0x00050041,0x00000027,0x00000082,0x00000068,
>+	0x00000022,0x0003003e,0x00000082,0x00000081,0x000200f9,0x0000007f,0x000200f8,0x00000083,
>+	0x00050041,0x00000039,0x00000086,0x00000015,0x00000085,0x0004003d,0x00000006,0x00000087,
>+	0x00000086,0x0003003e,0x00000084,0x00000087,0x0004003d,0x00000006,0x00000088,0x00000084,
>+	0x000500c7,0x00000006,0x00000089,0x00000088,0x00000040,0x000500ab,0x00000021,0x0000008a,
>+	0x00000089,0x00000033,0x000300f7,0x0000008c,0x00000000,0x000400fa,0x0000008a,0x0000008b,
>+	0x0000008c,0x000200f8,0x0000008b,0x00050041,0x00000027,0x0000008d,0x00000068,0x00000026,
>+	0x0003003e,0x0000008d,0x00000033,0x000200f9,0x0000008c,0x000200f8,0x0000008c,0x0004003d,
>+	0x00000006,0x0000008e,0x00000084,0x000500c7,0x00000006,0x0000008f,0x0000008e,0x0000001d,
>+	0x000500ab,0x00000021,0x00000090,0x0000008f,0x00000033,0x000300f7,0x00000092,0x00000000,
>+	0x000400fa,0x00000090,0x00000091,0x00000092,0x000200f8,0x00000091,0x00050041,0x00000027,
>+	0x00000094,0x00000068,0x00000093,0x0003003e,0x00000094,0x00000033,0x000200f9,0x00000092,
>+	0x000200f8,0x00000092,0x0004003d,0x00000006,0x00000095,0x00000084,0x000500c7,0x00000006,
>+	0x00000096,0x00000095,0x0000007a,0x000500ab,0x00000021,0x00000097,0x00000096,0x00000033,
>+	0x000300f7,0x00000099,0x00000000,0x000400fa,0x00000097,0x00000098,0x00000099,0x000200f8,
>+	0x00000098,0x00050041,0x00000027,0x0000009a,0x00000068,0x0000004a,0x0003003e,0x0000009a,
>+	0x00000016,0x000200f9,0x00000099,0x000200f8,0x00000099,0x000200f9,0x0000007f,0x000200f8,
>+	0x0000007f,0x000200f9,0x00000074,0x000200f8,0x00000074,0x0004003d,0x0000002c,0x0000009d,
>+	0x00000068,0x0003003e,0x0000009c,0x0000009d,0x000100fd,0x00010038
>+};
>+
>+#if 0  // Generated from:
>+#version 450 core
>+
>+#extension GL_EXT_samplerless_texture_functions : require
>+
>+layout(set = 0, binding = 0)uniform itexture2DArray src;
>+layout(location = 0)out ivec4 dest;
>+
>+layout(push_constant)uniform PushConstants {
>+
>+    ivec2 srcOffset;
>+    ivec2 destOffset;
>+    int srcMip;
>+    int srcLayer;
>+
>+    bool flipY;
>+
>+    bool premultiplyAlpha;
>+    bool unmultiplyAlpha;
>+
>+    bool destHasLuminance;
>+    bool destIsAlpha;
>+
>+    int destDefaultChannelsMask;
>+} params;
>+
>+void main()
>+{
>+    ivec2 destSubImageCoords = ivec2(gl_FragCoord . xy)- params . destOffset;
>+
>+    ivec2 srcSubImageCoords = destSubImageCoords;
>+
>+    if(params . flipY)
>+        srcSubImageCoords . y = - srcSubImageCoords . y;
>+
>+          ivec4 srcValue = texelFetch(src, ivec3(params . srcOffset + srcSubImageCoords, params . srcLayer), params . srcMip);
>+
>+    if(params . premultiplyAlpha)
>+    {
>+        srcValue . rgb *= srcValue . a;
>+    }
>+    else if(params . unmultiplyAlpha && srcValue . a > 0)
>+    {
>+        srcValue . rgb /= srcValue . a;
>+    }
>+
>+           ivec4 destValue = ivec4(srcValue);
>+
>+    if(params . destHasLuminance)
>+    {
>+        destValue . rg = destValue . ra;
>+    }
>+    else if(params . destIsAlpha)
>+    {
>+        destValue . r = destValue . a;
>+    }
>+    else
>+    {
>+        int defaultChannelsMask = params . destDefaultChannelsMask;
>+        if((defaultChannelsMask & 2)!= 0)
>+        {
>+            destValue . g = 0;
>+        }
>+        if((defaultChannelsMask & 4)!= 0)
>+        {
>+            destValue . b = 0;
>+        }
>+        if((defaultChannelsMask & 8)!= 0)
>+        {
>+            destValue . a = 1;
>+        }
>+    }
>+
>+    dest = destValue;
>+}
>+#endif  // Preprocessed code
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.0000000C.inc b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.0000000C.inc
>new file mode 100644
>index 00000000000..6bfeb07b3c0
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.0000000C.inc
>@@ -0,0 +1,206 @@
>+	// 7.11.3188
>+	 #pragma once
>+const uint32_t kImageCopy_frag_0000000C[] = {
>+	0x07230203,0x00010000,0x00080007,0x00000097,0x00000000,0x00020011,0x00000001,0x0006000b,
>+	0x00000001,0x4c534c47,0x6474732e,0x3035342e,0x00000000,0x0003000e,0x00000000,0x00000001,
>+	0x0007000f,0x00000004,0x00000004,0x6e69616d,0x00000000,0x0000000d,0x00000095,0x00030010,
>+	0x00000004,0x00000007,0x00030003,0x00000002,0x000001c2,0x000b0004,0x455f4c47,0x735f5458,
>+	0x6c706d61,0x656c7265,0x745f7373,0x75747865,0x665f6572,0x74636e75,0x736e6f69,0x00000000,
>+	0x00040005,0x00000004,0x6e69616d,0x00000000,0x00070005,0x00000009,0x74736564,0x49627553,
>+	0x6567616d,0x726f6f43,0x00007364,0x00060005,0x0000000d,0x465f6c67,0x43676172,0x64726f6f,
>+	0x00000000,0x00060005,0x00000013,0x68737550,0x736e6f43,0x746e6174,0x00000073,0x00060006,
>+	0x00000013,0x00000000,0x4f637273,0x65736666,0x00000074,0x00060006,0x00000013,0x00000001,
>+	0x74736564,0x7366664f,0x00007465,0x00050006,0x00000013,0x00000002,0x4d637273,0x00007069,
>+	0x00060006,0x00000013,0x00000003,0x4c637273,0x72657961,0x00000000,0x00050006,0x00000013,
>+	0x00000004,0x70696c66,0x00000059,0x00080006,0x00000013,0x00000005,0x6d657270,0x69746c75,
>+	0x41796c70,0x6168706c,0x00000000,0x00070006,0x00000013,0x00000006,0x756d6e75,0x7069746c,
>+	0x6c41796c,0x00616870,0x00080006,0x00000013,0x00000007,0x74736564,0x4c736148,0x6e696d75,
>+	0x65636e61,0x00000000,0x00060006,0x00000013,0x00000008,0x74736564,0x6c417349,0x00616870,
>+	0x00090006,0x00000013,0x00000009,0x74736564,0x61666544,0x43746c75,0x6e6e6168,0x4d736c65,
>+	0x006b7361,0x00040005,0x00000015,0x61726170,0x0000736d,0x00070005,0x0000001b,0x53637273,
>+	0x6d496275,0x43656761,0x64726f6f,0x00000073,0x00050005,0x0000002e,0x56637273,0x65756c61,
>+	0x00000000,0x00030005,0x00000031,0x00637273,0x00050005,0x00000065,0x74736564,0x756c6156,
>+	0x00000065,0x00070005,0x0000007d,0x61666564,0x43746c75,0x6e6e6168,0x4d736c65,0x006b7361,
>+	0x00040005,0x00000095,0x74736564,0x00000000,0x00040047,0x0000000d,0x0000000b,0x0000000f,
>+	0x00050048,0x00000013,0x00000000,0x00000023,0x00000000,0x00050048,0x00000013,0x00000001,
>+	0x00000023,0x00000008,0x00050048,0x00000013,0x00000002,0x00000023,0x00000010,0x00050048,
>+	0x00000013,0x00000003,0x00000023,0x00000014,0x00050048,0x00000013,0x00000004,0x00000023,
>+	0x00000018,0x00050048,0x00000013,0x00000005,0x00000023,0x0000001c,0x00050048,0x00000013,
>+	0x00000006,0x00000023,0x00000020,0x00050048,0x00000013,0x00000007,0x00000023,0x00000024,
>+	0x00050048,0x00000013,0x00000008,0x00000023,0x00000028,0x00050048,0x00000013,0x00000009,
>+	0x00000023,0x0000002c,0x00030047,0x00000013,0x00000002,0x00040047,0x00000031,0x00000022,
>+	0x00000000,0x00040047,0x00000031,0x00000021,0x00000000,0x00040047,0x00000095,0x0000001e,
>+	0x00000000,0x00020013,0x00000002,0x00030021,0x00000003,0x00000002,0x00040015,0x00000006,
>+	0x00000020,0x00000001,0x00040017,0x00000007,0x00000006,0x00000002,0x00040020,0x00000008,
>+	0x00000007,0x00000007,0x00030016,0x0000000a,0x00000020,0x00040017,0x0000000b,0x0000000a,
>+	0x00000004,0x00040020,0x0000000c,0x00000001,0x0000000b,0x0004003b,0x0000000c,0x0000000d,
>+	0x00000001,0x00040017,0x0000000e,0x0000000a,0x00000002,0x00040015,0x00000012,0x00000020,
>+	0x00000000,0x000c001e,0x00000013,0x00000007,0x00000007,0x00000006,0x00000006,0x00000012,
>+	0x00000012,0x00000012,0x00000012,0x00000012,0x00000006,0x00040020,0x00000014,0x00000009,
>+	0x00000013,0x0004003b,0x00000014,0x00000015,0x00000009,0x0004002b,0x00000006,0x00000016,
>+	0x00000001,0x00040020,0x00000017,0x00000009,0x00000007,0x0004002b,0x00000006,0x0000001d,
>+	0x00000004,0x00040020,0x0000001e,0x00000009,0x00000012,0x00020014,0x00000021,0x0004002b,
>+	0x00000012,0x00000022,0x00000000,0x0004002b,0x00000012,0x00000026,0x00000001,0x00040020,
>+	0x00000027,0x00000007,0x00000006,0x00040017,0x0000002c,0x00000012,0x00000004,0x00040020,
>+	0x0000002d,0x00000007,0x0000002c,0x00090019,0x0000002f,0x00000012,0x00000001,0x00000000,
>+	0x00000000,0x00000000,0x00000001,0x00000000,0x00040020,0x00000030,0x00000000,0x0000002f,
>+	0x0004003b,0x00000030,0x00000031,0x00000000,0x0004002b,0x00000006,0x00000033,0x00000000,
>+	0x0004002b,0x00000006,0x00000038,0x00000002,0x00040020,0x00000039,0x00000009,0x00000006,
>+	0x0004002b,0x00000006,0x0000003d,0x00000005,0x0004002b,0x00000012,0x00000043,0x00000003,
>+	0x00040020,0x00000044,0x00000007,0x00000012,0x00040017,0x00000047,0x00000012,0x00000003,
>+	0x0004002b,0x00000006,0x0000004f,0x00000006,0x00040017,0x00000063,0x00000006,0x00000004,
>+	0x00040020,0x00000064,0x00000007,0x00000063,0x0004002b,0x00000006,0x00000068,0x00000007,
>+	0x0004002b,0x00000006,0x00000073,0x00000008,0x0004002b,0x00000006,0x0000007e,0x00000009,
>+	0x0004002b,0x00000012,0x0000008c,0x00000002,0x00040020,0x00000094,0x00000003,0x00000063,
>+	0x0004003b,0x00000094,0x00000095,0x00000003,0x00050036,0x00000002,0x00000004,0x00000000,
>+	0x00000003,0x000200f8,0x00000005,0x0004003b,0x00000008,0x00000009,0x00000007,0x0004003b,
>+	0x00000008,0x0000001b,0x00000007,0x0004003b,0x0000002d,0x0000002e,0x00000007,0x0004003b,
>+	0x00000064,0x00000065,0x00000007,0x0004003b,0x00000027,0x0000007d,0x00000007,0x0004003d,
>+	0x0000000b,0x0000000f,0x0000000d,0x0007004f,0x0000000e,0x00000010,0x0000000f,0x0000000f,
>+	0x00000000,0x00000001,0x0004006e,0x00000007,0x00000011,0x00000010,0x00050041,0x00000017,
>+	0x00000018,0x00000015,0x00000016,0x0004003d,0x00000007,0x00000019,0x00000018,0x00050082,
>+	0x00000007,0x0000001a,0x00000011,0x00000019,0x0003003e,0x00000009,0x0000001a,0x0004003d,
>+	0x00000007,0x0000001c,0x00000009,0x0003003e,0x0000001b,0x0000001c,0x00050041,0x0000001e,
>+	0x0000001f,0x00000015,0x0000001d,0x0004003d,0x00000012,0x00000020,0x0000001f,0x000500ab,
>+	0x00000021,0x00000023,0x00000020,0x00000022,0x000300f7,0x00000025,0x00000000,0x000400fa,
>+	0x00000023,0x00000024,0x00000025,0x000200f8,0x00000024,0x00050041,0x00000027,0x00000028,
>+	0x0000001b,0x00000026,0x0004003d,0x00000006,0x00000029,0x00000028,0x0004007e,0x00000006,
>+	0x0000002a,0x00000029,0x00050041,0x00000027,0x0000002b,0x0000001b,0x00000026,0x0003003e,
>+	0x0000002b,0x0000002a,0x000200f9,0x00000025,0x000200f8,0x00000025,0x0004003d,0x0000002f,
>+	0x00000032,0x00000031,0x00050041,0x00000017,0x00000034,0x00000015,0x00000033,0x0004003d,
>+	0x00000007,0x00000035,0x00000034,0x0004003d,0x00000007,0x00000036,0x0000001b,0x00050080,
>+	0x00000007,0x00000037,0x00000035,0x00000036,0x00050041,0x00000039,0x0000003a,0x00000015,
>+	0x00000038,0x0004003d,0x00000006,0x0000003b,0x0000003a,0x0007005f,0x0000002c,0x0000003c,
>+	0x00000032,0x00000037,0x00000002,0x0000003b,0x0003003e,0x0000002e,0x0000003c,0x00050041,
>+	0x0000001e,0x0000003e,0x00000015,0x0000003d,0x0004003d,0x00000012,0x0000003f,0x0000003e,
>+	0x000500ab,0x00000021,0x00000040,0x0000003f,0x00000022,0x000300f7,0x00000042,0x00000000,
>+	0x000400fa,0x00000040,0x00000041,0x0000004e,0x000200f8,0x00000041,0x00050041,0x00000044,
>+	0x00000045,0x0000002e,0x00000043,0x0004003d,0x00000012,0x00000046,0x00000045,0x0004003d,
>+	0x0000002c,0x00000048,0x0000002e,0x0008004f,0x00000047,0x00000049,0x00000048,0x00000048,
>+	0x00000000,0x00000001,0x00000002,0x00060050,0x00000047,0x0000004a,0x00000046,0x00000046,
>+	0x00000046,0x00050084,0x00000047,0x0000004b,0x00000049,0x0000004a,0x0004003d,0x0000002c,
>+	0x0000004c,0x0000002e,0x0009004f,0x0000002c,0x0000004d,0x0000004c,0x0000004b,0x00000004,
>+	0x00000005,0x00000006,0x00000003,0x0003003e,0x0000002e,0x0000004d,0x000200f9,0x00000042,
>+	0x000200f8,0x0000004e,0x00050041,0x0000001e,0x00000050,0x00000015,0x0000004f,0x0004003d,
>+	0x00000012,0x00000051,0x00000050,0x000500ab,0x00000021,0x00000052,0x00000051,0x00000022,
>+	0x000300f7,0x00000054,0x00000000,0x000400fa,0x00000052,0x00000053,0x00000054,0x000200f8,
>+	0x00000053,0x00050041,0x00000044,0x00000055,0x0000002e,0x00000043,0x0004003d,0x00000012,
>+	0x00000056,0x00000055,0x000500ac,0x00000021,0x00000057,0x00000056,0x00000022,0x000200f9,
>+	0x00000054,0x000200f8,0x00000054,0x000700f5,0x00000021,0x00000058,0x00000052,0x0000004e,
>+	0x00000057,0x00000053,0x000300f7,0x0000005a,0x00000000,0x000400fa,0x00000058,0x00000059,
>+	0x0000005a,0x000200f8,0x00000059,0x00050041,0x00000044,0x0000005b,0x0000002e,0x00000043,
>+	0x0004003d,0x00000012,0x0000005c,0x0000005b,0x0004003d,0x0000002c,0x0000005d,0x0000002e,
>+	0x0008004f,0x00000047,0x0000005e,0x0000005d,0x0000005d,0x00000000,0x00000001,0x00000002,
>+	0x00060050,0x00000047,0x0000005f,0x0000005c,0x0000005c,0x0000005c,0x00050086,0x00000047,
>+	0x00000060,0x0000005e,0x0000005f,0x0004003d,0x0000002c,0x00000061,0x0000002e,0x0009004f,
>+	0x0000002c,0x00000062,0x00000061,0x00000060,0x00000004,0x00000005,0x00000006,0x00000003,
>+	0x0003003e,0x0000002e,0x00000062,0x000200f9,0x0000005a,0x000200f8,0x0000005a,0x000200f9,
>+	0x00000042,0x000200f8,0x00000042,0x0004003d,0x0000002c,0x00000066,0x0000002e,0x0004007c,
>+	0x00000063,0x00000067,0x00000066,0x0003003e,0x00000065,0x00000067,0x00050041,0x0000001e,
>+	0x00000069,0x00000015,0x00000068,0x0004003d,0x00000012,0x0000006a,0x00000069,0x000500ab,
>+	0x00000021,0x0000006b,0x0000006a,0x00000022,0x000300f7,0x0000006d,0x00000000,0x000400fa,
>+	0x0000006b,0x0000006c,0x00000072,0x000200f8,0x0000006c,0x0004003d,0x00000063,0x0000006e,
>+	0x00000065,0x0007004f,0x00000007,0x0000006f,0x0000006e,0x0000006e,0x00000000,0x00000003,
>+	0x0004003d,0x00000063,0x00000070,0x00000065,0x0009004f,0x00000063,0x00000071,0x00000070,
>+	0x0000006f,0x00000004,0x00000005,0x00000002,0x00000003,0x0003003e,0x00000065,0x00000071,
>+	0x000200f9,0x0000006d,0x000200f8,0x00000072,0x00050041,0x0000001e,0x00000074,0x00000015,
>+	0x00000073,0x0004003d,0x00000012,0x00000075,0x00000074,0x000500ab,0x00000021,0x00000076,
>+	0x00000075,0x00000022,0x000300f7,0x00000078,0x00000000,0x000400fa,0x00000076,0x00000077,
>+	0x0000007c,0x000200f8,0x00000077,0x00050041,0x00000027,0x00000079,0x00000065,0x00000043,
>+	0x0004003d,0x00000006,0x0000007a,0x00000079,0x00050041,0x00000027,0x0000007b,0x00000065,
>+	0x00000022,0x0003003e,0x0000007b,0x0000007a,0x000200f9,0x00000078,0x000200f8,0x0000007c,
>+	0x00050041,0x00000039,0x0000007f,0x00000015,0x0000007e,0x0004003d,0x00000006,0x00000080,
>+	0x0000007f,0x0003003e,0x0000007d,0x00000080,0x0004003d,0x00000006,0x00000081,0x0000007d,
>+	0x000500c7,0x00000006,0x00000082,0x00000081,0x00000038,0x000500ab,0x00000021,0x00000083,
>+	0x00000082,0x00000033,0x000300f7,0x00000085,0x00000000,0x000400fa,0x00000083,0x00000084,
>+	0x00000085,0x000200f8,0x00000084,0x00050041,0x00000027,0x00000086,0x00000065,0x00000026,
>+	0x0003003e,0x00000086,0x00000033,0x000200f9,0x00000085,0x000200f8,0x00000085,0x0004003d,
>+	0x00000006,0x00000087,0x0000007d,0x000500c7,0x00000006,0x00000088,0x00000087,0x0000001d,
>+	0x000500ab,0x00000021,0x00000089,0x00000088,0x00000033,0x000300f7,0x0000008b,0x00000000,
>+	0x000400fa,0x00000089,0x0000008a,0x0000008b,0x000200f8,0x0000008a,0x00050041,0x00000027,
>+	0x0000008d,0x00000065,0x0000008c,0x0003003e,0x0000008d,0x00000033,0x000200f9,0x0000008b,
>+	0x000200f8,0x0000008b,0x0004003d,0x00000006,0x0000008e,0x0000007d,0x000500c7,0x00000006,
>+	0x0000008f,0x0000008e,0x00000073,0x000500ab,0x00000021,0x00000090,0x0000008f,0x00000033,
>+	0x000300f7,0x00000092,0x00000000,0x000400fa,0x00000090,0x00000091,0x00000092,0x000200f8,
>+	0x00000091,0x00050041,0x00000027,0x00000093,0x00000065,0x00000043,0x0003003e,0x00000093,
>+	0x00000016,0x000200f9,0x00000092,0x000200f8,0x00000092,0x000200f9,0x00000078,0x000200f8,
>+	0x00000078,0x000200f9,0x0000006d,0x000200f8,0x0000006d,0x0004003d,0x00000063,0x00000096,
>+	0x00000065,0x0003003e,0x00000095,0x00000096,0x000100fd,0x00010038
>+};
>+
>+#if 0  // Generated from:
>+#version 450 core
>+
>+#extension GL_EXT_samplerless_texture_functions : require
>+
>+layout(set = 0, binding = 0)uniform utexture2D src;
>+layout(location = 0)out ivec4 dest;
>+
>+layout(push_constant)uniform PushConstants {
>+
>+    ivec2 srcOffset;
>+    ivec2 destOffset;
>+    int srcMip;
>+    int srcLayer;
>+
>+    bool flipY;
>+
>+    bool premultiplyAlpha;
>+    bool unmultiplyAlpha;
>+
>+    bool destHasLuminance;
>+    bool destIsAlpha;
>+
>+    int destDefaultChannelsMask;
>+} params;
>+
>+void main()
>+{
>+    ivec2 destSubImageCoords = ivec2(gl_FragCoord . xy)- params . destOffset;
>+
>+    ivec2 srcSubImageCoords = destSubImageCoords;
>+
>+    if(params . flipY)
>+        srcSubImageCoords . y = - srcSubImageCoords . y;
>+
>+          uvec4 srcValue = texelFetch(src, params . srcOffset + srcSubImageCoords, params . srcMip);
>+
>+    if(params . premultiplyAlpha)
>+    {
>+        srcValue . rgb *= srcValue . a;
>+    }
>+    else if(params . unmultiplyAlpha && srcValue . a > 0)
>+    {
>+        srcValue . rgb /= srcValue . a;
>+    }
>+
>+           ivec4 destValue = ivec4(srcValue);
>+
>+    if(params . destHasLuminance)
>+    {
>+        destValue . rg = destValue . ra;
>+    }
>+    else if(params . destIsAlpha)
>+    {
>+        destValue . r = destValue . a;
>+    }
>+    else
>+    {
>+        int defaultChannelsMask = params . destDefaultChannelsMask;
>+        if((defaultChannelsMask & 2)!= 0)
>+        {
>+            destValue . g = 0;
>+        }
>+        if((defaultChannelsMask & 4)!= 0)
>+        {
>+            destValue . b = 0;
>+        }
>+        if((defaultChannelsMask & 8)!= 0)
>+        {
>+            destValue . a = 1;
>+        }
>+    }
>+
>+    dest = destValue;
>+}
>+#endif  // Preprocessed code
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.0000000D.inc b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.0000000D.inc
>new file mode 100644
>index 00000000000..eecb097eb06
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.0000000D.inc
>@@ -0,0 +1,210 @@
>+	// 7.11.3188
>+	 #pragma once
>+const uint32_t kImageCopy_frag_0000000D[] = {
>+	0x07230203,0x00010000,0x00080007,0x0000009e,0x00000000,0x00020011,0x00000001,0x0006000b,
>+	0x00000001,0x4c534c47,0x6474732e,0x3035342e,0x00000000,0x0003000e,0x00000000,0x00000001,
>+	0x0007000f,0x00000004,0x00000004,0x6e69616d,0x00000000,0x0000000d,0x0000009c,0x00030010,
>+	0x00000004,0x00000007,0x00030003,0x00000002,0x000001c2,0x000b0004,0x455f4c47,0x735f5458,
>+	0x6c706d61,0x656c7265,0x745f7373,0x75747865,0x665f6572,0x74636e75,0x736e6f69,0x00000000,
>+	0x00040005,0x00000004,0x6e69616d,0x00000000,0x00070005,0x00000009,0x74736564,0x49627553,
>+	0x6567616d,0x726f6f43,0x00007364,0x00060005,0x0000000d,0x465f6c67,0x43676172,0x64726f6f,
>+	0x00000000,0x00060005,0x00000013,0x68737550,0x736e6f43,0x746e6174,0x00000073,0x00060006,
>+	0x00000013,0x00000000,0x4f637273,0x65736666,0x00000074,0x00060006,0x00000013,0x00000001,
>+	0x74736564,0x7366664f,0x00007465,0x00050006,0x00000013,0x00000002,0x4d637273,0x00007069,
>+	0x00060006,0x00000013,0x00000003,0x4c637273,0x72657961,0x00000000,0x00050006,0x00000013,
>+	0x00000004,0x70696c66,0x00000059,0x00080006,0x00000013,0x00000005,0x6d657270,0x69746c75,
>+	0x41796c70,0x6168706c,0x00000000,0x00070006,0x00000013,0x00000006,0x756d6e75,0x7069746c,
>+	0x6c41796c,0x00616870,0x00080006,0x00000013,0x00000007,0x74736564,0x4c736148,0x6e696d75,
>+	0x65636e61,0x00000000,0x00060006,0x00000013,0x00000008,0x74736564,0x6c417349,0x00616870,
>+	0x00090006,0x00000013,0x00000009,0x74736564,0x61666544,0x43746c75,0x6e6e6168,0x4d736c65,
>+	0x006b7361,0x00040005,0x00000015,0x61726170,0x0000736d,0x00070005,0x0000001b,0x53637273,
>+	0x6d496275,0x43656761,0x64726f6f,0x00000073,0x00050005,0x0000002e,0x56637273,0x65756c61,
>+	0x00000000,0x00030005,0x00000031,0x00637273,0x00050005,0x0000006c,0x74736564,0x756c6156,
>+	0x00000065,0x00070005,0x00000084,0x61666564,0x43746c75,0x6e6e6168,0x4d736c65,0x006b7361,
>+	0x00040005,0x0000009c,0x74736564,0x00000000,0x00040047,0x0000000d,0x0000000b,0x0000000f,
>+	0x00050048,0x00000013,0x00000000,0x00000023,0x00000000,0x00050048,0x00000013,0x00000001,
>+	0x00000023,0x00000008,0x00050048,0x00000013,0x00000002,0x00000023,0x00000010,0x00050048,
>+	0x00000013,0x00000003,0x00000023,0x00000014,0x00050048,0x00000013,0x00000004,0x00000023,
>+	0x00000018,0x00050048,0x00000013,0x00000005,0x00000023,0x0000001c,0x00050048,0x00000013,
>+	0x00000006,0x00000023,0x00000020,0x00050048,0x00000013,0x00000007,0x00000023,0x00000024,
>+	0x00050048,0x00000013,0x00000008,0x00000023,0x00000028,0x00050048,0x00000013,0x00000009,
>+	0x00000023,0x0000002c,0x00030047,0x00000013,0x00000002,0x00040047,0x00000031,0x00000022,
>+	0x00000000,0x00040047,0x00000031,0x00000021,0x00000000,0x00040047,0x0000009c,0x0000001e,
>+	0x00000000,0x00020013,0x00000002,0x00030021,0x00000003,0x00000002,0x00040015,0x00000006,
>+	0x00000020,0x00000001,0x00040017,0x00000007,0x00000006,0x00000002,0x00040020,0x00000008,
>+	0x00000007,0x00000007,0x00030016,0x0000000a,0x00000020,0x00040017,0x0000000b,0x0000000a,
>+	0x00000004,0x00040020,0x0000000c,0x00000001,0x0000000b,0x0004003b,0x0000000c,0x0000000d,
>+	0x00000001,0x00040017,0x0000000e,0x0000000a,0x00000002,0x00040015,0x00000012,0x00000020,
>+	0x00000000,0x000c001e,0x00000013,0x00000007,0x00000007,0x00000006,0x00000006,0x00000012,
>+	0x00000012,0x00000012,0x00000012,0x00000012,0x00000006,0x00040020,0x00000014,0x00000009,
>+	0x00000013,0x0004003b,0x00000014,0x00000015,0x00000009,0x0004002b,0x00000006,0x00000016,
>+	0x00000001,0x00040020,0x00000017,0x00000009,0x00000007,0x0004002b,0x00000006,0x0000001d,
>+	0x00000004,0x00040020,0x0000001e,0x00000009,0x00000012,0x00020014,0x00000021,0x0004002b,
>+	0x00000012,0x00000022,0x00000000,0x0004002b,0x00000012,0x00000026,0x00000001,0x00040020,
>+	0x00000027,0x00000007,0x00000006,0x00040017,0x0000002c,0x00000012,0x00000004,0x00040020,
>+	0x0000002d,0x00000007,0x0000002c,0x00090019,0x0000002f,0x00000012,0x00000001,0x00000000,
>+	0x00000001,0x00000000,0x00000001,0x00000000,0x00040020,0x00000030,0x00000000,0x0000002f,
>+	0x0004003b,0x00000030,0x00000031,0x00000000,0x0004002b,0x00000006,0x00000033,0x00000000,
>+	0x0004002b,0x00000006,0x00000038,0x00000003,0x00040020,0x00000039,0x00000009,0x00000006,
>+	0x00040017,0x0000003c,0x00000006,0x00000003,0x0004002b,0x00000006,0x00000040,0x00000002,
>+	0x0004002b,0x00000006,0x00000044,0x00000005,0x0004002b,0x00000012,0x0000004a,0x00000003,
>+	0x00040020,0x0000004b,0x00000007,0x00000012,0x00040017,0x0000004e,0x00000012,0x00000003,
>+	0x0004002b,0x00000006,0x00000056,0x00000006,0x00040017,0x0000006a,0x00000006,0x00000004,
>+	0x00040020,0x0000006b,0x00000007,0x0000006a,0x0004002b,0x00000006,0x0000006f,0x00000007,
>+	0x0004002b,0x00000006,0x0000007a,0x00000008,0x0004002b,0x00000006,0x00000085,0x00000009,
>+	0x0004002b,0x00000012,0x00000093,0x00000002,0x00040020,0x0000009b,0x00000003,0x0000006a,
>+	0x0004003b,0x0000009b,0x0000009c,0x00000003,0x00050036,0x00000002,0x00000004,0x00000000,
>+	0x00000003,0x000200f8,0x00000005,0x0004003b,0x00000008,0x00000009,0x00000007,0x0004003b,
>+	0x00000008,0x0000001b,0x00000007,0x0004003b,0x0000002d,0x0000002e,0x00000007,0x0004003b,
>+	0x0000006b,0x0000006c,0x00000007,0x0004003b,0x00000027,0x00000084,0x00000007,0x0004003d,
>+	0x0000000b,0x0000000f,0x0000000d,0x0007004f,0x0000000e,0x00000010,0x0000000f,0x0000000f,
>+	0x00000000,0x00000001,0x0004006e,0x00000007,0x00000011,0x00000010,0x00050041,0x00000017,
>+	0x00000018,0x00000015,0x00000016,0x0004003d,0x00000007,0x00000019,0x00000018,0x00050082,
>+	0x00000007,0x0000001a,0x00000011,0x00000019,0x0003003e,0x00000009,0x0000001a,0x0004003d,
>+	0x00000007,0x0000001c,0x00000009,0x0003003e,0x0000001b,0x0000001c,0x00050041,0x0000001e,
>+	0x0000001f,0x00000015,0x0000001d,0x0004003d,0x00000012,0x00000020,0x0000001f,0x000500ab,
>+	0x00000021,0x00000023,0x00000020,0x00000022,0x000300f7,0x00000025,0x00000000,0x000400fa,
>+	0x00000023,0x00000024,0x00000025,0x000200f8,0x00000024,0x00050041,0x00000027,0x00000028,
>+	0x0000001b,0x00000026,0x0004003d,0x00000006,0x00000029,0x00000028,0x0004007e,0x00000006,
>+	0x0000002a,0x00000029,0x00050041,0x00000027,0x0000002b,0x0000001b,0x00000026,0x0003003e,
>+	0x0000002b,0x0000002a,0x000200f9,0x00000025,0x000200f8,0x00000025,0x0004003d,0x0000002f,
>+	0x00000032,0x00000031,0x00050041,0x00000017,0x00000034,0x00000015,0x00000033,0x0004003d,
>+	0x00000007,0x00000035,0x00000034,0x0004003d,0x00000007,0x00000036,0x0000001b,0x00050080,
>+	0x00000007,0x00000037,0x00000035,0x00000036,0x00050041,0x00000039,0x0000003a,0x00000015,
>+	0x00000038,0x0004003d,0x00000006,0x0000003b,0x0000003a,0x00050051,0x00000006,0x0000003d,
>+	0x00000037,0x00000000,0x00050051,0x00000006,0x0000003e,0x00000037,0x00000001,0x00060050,
>+	0x0000003c,0x0000003f,0x0000003d,0x0000003e,0x0000003b,0x00050041,0x00000039,0x00000041,
>+	0x00000015,0x00000040,0x0004003d,0x00000006,0x00000042,0x00000041,0x0007005f,0x0000002c,
>+	0x00000043,0x00000032,0x0000003f,0x00000002,0x00000042,0x0003003e,0x0000002e,0x00000043,
>+	0x00050041,0x0000001e,0x00000045,0x00000015,0x00000044,0x0004003d,0x00000012,0x00000046,
>+	0x00000045,0x000500ab,0x00000021,0x00000047,0x00000046,0x00000022,0x000300f7,0x00000049,
>+	0x00000000,0x000400fa,0x00000047,0x00000048,0x00000055,0x000200f8,0x00000048,0x00050041,
>+	0x0000004b,0x0000004c,0x0000002e,0x0000004a,0x0004003d,0x00000012,0x0000004d,0x0000004c,
>+	0x0004003d,0x0000002c,0x0000004f,0x0000002e,0x0008004f,0x0000004e,0x00000050,0x0000004f,
>+	0x0000004f,0x00000000,0x00000001,0x00000002,0x00060050,0x0000004e,0x00000051,0x0000004d,
>+	0x0000004d,0x0000004d,0x00050084,0x0000004e,0x00000052,0x00000050,0x00000051,0x0004003d,
>+	0x0000002c,0x00000053,0x0000002e,0x0009004f,0x0000002c,0x00000054,0x00000053,0x00000052,
>+	0x00000004,0x00000005,0x00000006,0x00000003,0x0003003e,0x0000002e,0x00000054,0x000200f9,
>+	0x00000049,0x000200f8,0x00000055,0x00050041,0x0000001e,0x00000057,0x00000015,0x00000056,
>+	0x0004003d,0x00000012,0x00000058,0x00000057,0x000500ab,0x00000021,0x00000059,0x00000058,
>+	0x00000022,0x000300f7,0x0000005b,0x00000000,0x000400fa,0x00000059,0x0000005a,0x0000005b,
>+	0x000200f8,0x0000005a,0x00050041,0x0000004b,0x0000005c,0x0000002e,0x0000004a,0x0004003d,
>+	0x00000012,0x0000005d,0x0000005c,0x000500ac,0x00000021,0x0000005e,0x0000005d,0x00000022,
>+	0x000200f9,0x0000005b,0x000200f8,0x0000005b,0x000700f5,0x00000021,0x0000005f,0x00000059,
>+	0x00000055,0x0000005e,0x0000005a,0x000300f7,0x00000061,0x00000000,0x000400fa,0x0000005f,
>+	0x00000060,0x00000061,0x000200f8,0x00000060,0x00050041,0x0000004b,0x00000062,0x0000002e,
>+	0x0000004a,0x0004003d,0x00000012,0x00000063,0x00000062,0x0004003d,0x0000002c,0x00000064,
>+	0x0000002e,0x0008004f,0x0000004e,0x00000065,0x00000064,0x00000064,0x00000000,0x00000001,
>+	0x00000002,0x00060050,0x0000004e,0x00000066,0x00000063,0x00000063,0x00000063,0x00050086,
>+	0x0000004e,0x00000067,0x00000065,0x00000066,0x0004003d,0x0000002c,0x00000068,0x0000002e,
>+	0x0009004f,0x0000002c,0x00000069,0x00000068,0x00000067,0x00000004,0x00000005,0x00000006,
>+	0x00000003,0x0003003e,0x0000002e,0x00000069,0x000200f9,0x00000061,0x000200f8,0x00000061,
>+	0x000200f9,0x00000049,0x000200f8,0x00000049,0x0004003d,0x0000002c,0x0000006d,0x0000002e,
>+	0x0004007c,0x0000006a,0x0000006e,0x0000006d,0x0003003e,0x0000006c,0x0000006e,0x00050041,
>+	0x0000001e,0x00000070,0x00000015,0x0000006f,0x0004003d,0x00000012,0x00000071,0x00000070,
>+	0x000500ab,0x00000021,0x00000072,0x00000071,0x00000022,0x000300f7,0x00000074,0x00000000,
>+	0x000400fa,0x00000072,0x00000073,0x00000079,0x000200f8,0x00000073,0x0004003d,0x0000006a,
>+	0x00000075,0x0000006c,0x0007004f,0x00000007,0x00000076,0x00000075,0x00000075,0x00000000,
>+	0x00000003,0x0004003d,0x0000006a,0x00000077,0x0000006c,0x0009004f,0x0000006a,0x00000078,
>+	0x00000077,0x00000076,0x00000004,0x00000005,0x00000002,0x00000003,0x0003003e,0x0000006c,
>+	0x00000078,0x000200f9,0x00000074,0x000200f8,0x00000079,0x00050041,0x0000001e,0x0000007b,
>+	0x00000015,0x0000007a,0x0004003d,0x00000012,0x0000007c,0x0000007b,0x000500ab,0x00000021,
>+	0x0000007d,0x0000007c,0x00000022,0x000300f7,0x0000007f,0x00000000,0x000400fa,0x0000007d,
>+	0x0000007e,0x00000083,0x000200f8,0x0000007e,0x00050041,0x00000027,0x00000080,0x0000006c,
>+	0x0000004a,0x0004003d,0x00000006,0x00000081,0x00000080,0x00050041,0x00000027,0x00000082,
>+	0x0000006c,0x00000022,0x0003003e,0x00000082,0x00000081,0x000200f9,0x0000007f,0x000200f8,
>+	0x00000083,0x00050041,0x00000039,0x00000086,0x00000015,0x00000085,0x0004003d,0x00000006,
>+	0x00000087,0x00000086,0x0003003e,0x00000084,0x00000087,0x0004003d,0x00000006,0x00000088,
>+	0x00000084,0x000500c7,0x00000006,0x00000089,0x00000088,0x00000040,0x000500ab,0x00000021,
>+	0x0000008a,0x00000089,0x00000033,0x000300f7,0x0000008c,0x00000000,0x000400fa,0x0000008a,
>+	0x0000008b,0x0000008c,0x000200f8,0x0000008b,0x00050041,0x00000027,0x0000008d,0x0000006c,
>+	0x00000026,0x0003003e,0x0000008d,0x00000033,0x000200f9,0x0000008c,0x000200f8,0x0000008c,
>+	0x0004003d,0x00000006,0x0000008e,0x00000084,0x000500c7,0x00000006,0x0000008f,0x0000008e,
>+	0x0000001d,0x000500ab,0x00000021,0x00000090,0x0000008f,0x00000033,0x000300f7,0x00000092,
>+	0x00000000,0x000400fa,0x00000090,0x00000091,0x00000092,0x000200f8,0x00000091,0x00050041,
>+	0x00000027,0x00000094,0x0000006c,0x00000093,0x0003003e,0x00000094,0x00000033,0x000200f9,
>+	0x00000092,0x000200f8,0x00000092,0x0004003d,0x00000006,0x00000095,0x00000084,0x000500c7,
>+	0x00000006,0x00000096,0x00000095,0x0000007a,0x000500ab,0x00000021,0x00000097,0x00000096,
>+	0x00000033,0x000300f7,0x00000099,0x00000000,0x000400fa,0x00000097,0x00000098,0x00000099,
>+	0x000200f8,0x00000098,0x00050041,0x00000027,0x0000009a,0x0000006c,0x0000004a,0x0003003e,
>+	0x0000009a,0x00000016,0x000200f9,0x00000099,0x000200f8,0x00000099,0x000200f9,0x0000007f,
>+	0x000200f8,0x0000007f,0x000200f9,0x00000074,0x000200f8,0x00000074,0x0004003d,0x0000006a,
>+	0x0000009d,0x0000006c,0x0003003e,0x0000009c,0x0000009d,0x000100fd,0x00010038
>+};
>+
>+#if 0  // Generated from:
>+#version 450 core
>+
>+#extension GL_EXT_samplerless_texture_functions : require
>+
>+layout(set = 0, binding = 0)uniform utexture2DArray src;
>+layout(location = 0)out ivec4 dest;
>+
>+layout(push_constant)uniform PushConstants {
>+
>+    ivec2 srcOffset;
>+    ivec2 destOffset;
>+    int srcMip;
>+    int srcLayer;
>+
>+    bool flipY;
>+
>+    bool premultiplyAlpha;
>+    bool unmultiplyAlpha;
>+
>+    bool destHasLuminance;
>+    bool destIsAlpha;
>+
>+    int destDefaultChannelsMask;
>+} params;
>+
>+void main()
>+{
>+    ivec2 destSubImageCoords = ivec2(gl_FragCoord . xy)- params . destOffset;
>+
>+    ivec2 srcSubImageCoords = destSubImageCoords;
>+
>+    if(params . flipY)
>+        srcSubImageCoords . y = - srcSubImageCoords . y;
>+
>+          uvec4 srcValue = texelFetch(src, ivec3(params . srcOffset + srcSubImageCoords, params . srcLayer), params . srcMip);
>+
>+    if(params . premultiplyAlpha)
>+    {
>+        srcValue . rgb *= srcValue . a;
>+    }
>+    else if(params . unmultiplyAlpha && srcValue . a > 0)
>+    {
>+        srcValue . rgb /= srcValue . a;
>+    }
>+
>+           ivec4 destValue = ivec4(srcValue);
>+
>+    if(params . destHasLuminance)
>+    {
>+        destValue . rg = destValue . ra;
>+    }
>+    else if(params . destIsAlpha)
>+    {
>+        destValue . r = destValue . a;
>+    }
>+    else
>+    {
>+        int defaultChannelsMask = params . destDefaultChannelsMask;
>+        if((defaultChannelsMask & 2)!= 0)
>+        {
>+            destValue . g = 0;
>+        }
>+        if((defaultChannelsMask & 4)!= 0)
>+        {
>+            destValue . b = 0;
>+        }
>+        if((defaultChannelsMask & 8)!= 0)
>+        {
>+            destValue . a = 1;
>+        }
>+    }
>+
>+    dest = destValue;
>+}
>+#endif  // Preprocessed code
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000010.inc b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000010.inc
>new file mode 100644
>index 00000000000..de27e5a028c
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000010.inc
>@@ -0,0 +1,206 @@
>+	// 7.11.3188
>+	 #pragma once
>+const uint32_t kImageCopy_frag_00000010[] = {
>+	0x07230203,0x00010000,0x00080007,0x00000098,0x00000000,0x00020011,0x00000001,0x0006000b,
>+	0x00000001,0x4c534c47,0x6474732e,0x3035342e,0x00000000,0x0003000e,0x00000000,0x00000001,
>+	0x0007000f,0x00000004,0x00000004,0x6e69616d,0x00000000,0x0000000d,0x00000096,0x00030010,
>+	0x00000004,0x00000007,0x00030003,0x00000002,0x000001c2,0x000b0004,0x455f4c47,0x735f5458,
>+	0x6c706d61,0x656c7265,0x745f7373,0x75747865,0x665f6572,0x74636e75,0x736e6f69,0x00000000,
>+	0x00040005,0x00000004,0x6e69616d,0x00000000,0x00070005,0x00000009,0x74736564,0x49627553,
>+	0x6567616d,0x726f6f43,0x00007364,0x00060005,0x0000000d,0x465f6c67,0x43676172,0x64726f6f,
>+	0x00000000,0x00060005,0x00000013,0x68737550,0x736e6f43,0x746e6174,0x00000073,0x00060006,
>+	0x00000013,0x00000000,0x4f637273,0x65736666,0x00000074,0x00060006,0x00000013,0x00000001,
>+	0x74736564,0x7366664f,0x00007465,0x00050006,0x00000013,0x00000002,0x4d637273,0x00007069,
>+	0x00060006,0x00000013,0x00000003,0x4c637273,0x72657961,0x00000000,0x00050006,0x00000013,
>+	0x00000004,0x70696c66,0x00000059,0x00080006,0x00000013,0x00000005,0x6d657270,0x69746c75,
>+	0x41796c70,0x6168706c,0x00000000,0x00070006,0x00000013,0x00000006,0x756d6e75,0x7069746c,
>+	0x6c41796c,0x00616870,0x00080006,0x00000013,0x00000007,0x74736564,0x4c736148,0x6e696d75,
>+	0x65636e61,0x00000000,0x00060006,0x00000013,0x00000008,0x74736564,0x6c417349,0x00616870,
>+	0x00090006,0x00000013,0x00000009,0x74736564,0x61666544,0x43746c75,0x6e6e6168,0x4d736c65,
>+	0x006b7361,0x00040005,0x00000015,0x61726170,0x0000736d,0x00070005,0x0000001b,0x53637273,
>+	0x6d496275,0x43656761,0x64726f6f,0x00000073,0x00050005,0x0000002d,0x56637273,0x65756c61,
>+	0x00000000,0x00030005,0x00000030,0x00637273,0x00050005,0x00000064,0x74736564,0x756c6156,
>+	0x00000065,0x00070005,0x0000007e,0x61666564,0x43746c75,0x6e6e6168,0x4d736c65,0x006b7361,
>+	0x00040005,0x00000096,0x74736564,0x00000000,0x00040047,0x0000000d,0x0000000b,0x0000000f,
>+	0x00050048,0x00000013,0x00000000,0x00000023,0x00000000,0x00050048,0x00000013,0x00000001,
>+	0x00000023,0x00000008,0x00050048,0x00000013,0x00000002,0x00000023,0x00000010,0x00050048,
>+	0x00000013,0x00000003,0x00000023,0x00000014,0x00050048,0x00000013,0x00000004,0x00000023,
>+	0x00000018,0x00050048,0x00000013,0x00000005,0x00000023,0x0000001c,0x00050048,0x00000013,
>+	0x00000006,0x00000023,0x00000020,0x00050048,0x00000013,0x00000007,0x00000023,0x00000024,
>+	0x00050048,0x00000013,0x00000008,0x00000023,0x00000028,0x00050048,0x00000013,0x00000009,
>+	0x00000023,0x0000002c,0x00030047,0x00000013,0x00000002,0x00040047,0x00000030,0x00000022,
>+	0x00000000,0x00040047,0x00000030,0x00000021,0x00000000,0x00040047,0x00000096,0x0000001e,
>+	0x00000000,0x00020013,0x00000002,0x00030021,0x00000003,0x00000002,0x00040015,0x00000006,
>+	0x00000020,0x00000001,0x00040017,0x00000007,0x00000006,0x00000002,0x00040020,0x00000008,
>+	0x00000007,0x00000007,0x00030016,0x0000000a,0x00000020,0x00040017,0x0000000b,0x0000000a,
>+	0x00000004,0x00040020,0x0000000c,0x00000001,0x0000000b,0x0004003b,0x0000000c,0x0000000d,
>+	0x00000001,0x00040017,0x0000000e,0x0000000a,0x00000002,0x00040015,0x00000012,0x00000020,
>+	0x00000000,0x000c001e,0x00000013,0x00000007,0x00000007,0x00000006,0x00000006,0x00000012,
>+	0x00000012,0x00000012,0x00000012,0x00000012,0x00000006,0x00040020,0x00000014,0x00000009,
>+	0x00000013,0x0004003b,0x00000014,0x00000015,0x00000009,0x0004002b,0x00000006,0x00000016,
>+	0x00000001,0x00040020,0x00000017,0x00000009,0x00000007,0x0004002b,0x00000006,0x0000001d,
>+	0x00000004,0x00040020,0x0000001e,0x00000009,0x00000012,0x00020014,0x00000021,0x0004002b,
>+	0x00000012,0x00000022,0x00000000,0x0004002b,0x00000012,0x00000026,0x00000001,0x00040020,
>+	0x00000027,0x00000007,0x00000006,0x00040020,0x0000002c,0x00000007,0x0000000b,0x00090019,
>+	0x0000002e,0x0000000a,0x00000001,0x00000000,0x00000000,0x00000000,0x00000001,0x00000000,
>+	0x00040020,0x0000002f,0x00000000,0x0000002e,0x0004003b,0x0000002f,0x00000030,0x00000000,
>+	0x0004002b,0x00000006,0x00000032,0x00000000,0x0004002b,0x00000006,0x00000037,0x00000002,
>+	0x00040020,0x00000038,0x00000009,0x00000006,0x0004002b,0x00000006,0x0000003c,0x00000005,
>+	0x0004002b,0x00000012,0x00000042,0x00000003,0x00040020,0x00000043,0x00000007,0x0000000a,
>+	0x00040017,0x00000046,0x0000000a,0x00000003,0x0004002b,0x00000006,0x0000004d,0x00000006,
>+	0x0004002b,0x0000000a,0x00000055,0x00000000,0x00040017,0x00000062,0x00000012,0x00000004,
>+	0x00040020,0x00000063,0x00000007,0x00000062,0x0004002b,0x00000006,0x00000067,0x00000007,
>+	0x00040017,0x0000006d,0x00000012,0x00000002,0x0004002b,0x00000006,0x00000073,0x00000008,
>+	0x00040020,0x00000079,0x00000007,0x00000012,0x0004002b,0x00000006,0x0000007f,0x00000009,
>+	0x0004002b,0x00000012,0x0000008d,0x00000002,0x00040020,0x00000095,0x00000003,0x00000062,
>+	0x0004003b,0x00000095,0x00000096,0x00000003,0x00050036,0x00000002,0x00000004,0x00000000,
>+	0x00000003,0x000200f8,0x00000005,0x0004003b,0x00000008,0x00000009,0x00000007,0x0004003b,
>+	0x00000008,0x0000001b,0x00000007,0x0004003b,0x0000002c,0x0000002d,0x00000007,0x0004003b,
>+	0x00000063,0x00000064,0x00000007,0x0004003b,0x00000027,0x0000007e,0x00000007,0x0004003d,
>+	0x0000000b,0x0000000f,0x0000000d,0x0007004f,0x0000000e,0x00000010,0x0000000f,0x0000000f,
>+	0x00000000,0x00000001,0x0004006e,0x00000007,0x00000011,0x00000010,0x00050041,0x00000017,
>+	0x00000018,0x00000015,0x00000016,0x0004003d,0x00000007,0x00000019,0x00000018,0x00050082,
>+	0x00000007,0x0000001a,0x00000011,0x00000019,0x0003003e,0x00000009,0x0000001a,0x0004003d,
>+	0x00000007,0x0000001c,0x00000009,0x0003003e,0x0000001b,0x0000001c,0x00050041,0x0000001e,
>+	0x0000001f,0x00000015,0x0000001d,0x0004003d,0x00000012,0x00000020,0x0000001f,0x000500ab,
>+	0x00000021,0x00000023,0x00000020,0x00000022,0x000300f7,0x00000025,0x00000000,0x000400fa,
>+	0x00000023,0x00000024,0x00000025,0x000200f8,0x00000024,0x00050041,0x00000027,0x00000028,
>+	0x0000001b,0x00000026,0x0004003d,0x00000006,0x00000029,0x00000028,0x0004007e,0x00000006,
>+	0x0000002a,0x00000029,0x00050041,0x00000027,0x0000002b,0x0000001b,0x00000026,0x0003003e,
>+	0x0000002b,0x0000002a,0x000200f9,0x00000025,0x000200f8,0x00000025,0x0004003d,0x0000002e,
>+	0x00000031,0x00000030,0x00050041,0x00000017,0x00000033,0x00000015,0x00000032,0x0004003d,
>+	0x00000007,0x00000034,0x00000033,0x0004003d,0x00000007,0x00000035,0x0000001b,0x00050080,
>+	0x00000007,0x00000036,0x00000034,0x00000035,0x00050041,0x00000038,0x00000039,0x00000015,
>+	0x00000037,0x0004003d,0x00000006,0x0000003a,0x00000039,0x0007005f,0x0000000b,0x0000003b,
>+	0x00000031,0x00000036,0x00000002,0x0000003a,0x0003003e,0x0000002d,0x0000003b,0x00050041,
>+	0x0000001e,0x0000003d,0x00000015,0x0000003c,0x0004003d,0x00000012,0x0000003e,0x0000003d,
>+	0x000500ab,0x00000021,0x0000003f,0x0000003e,0x00000022,0x000300f7,0x00000041,0x00000000,
>+	0x000400fa,0x0000003f,0x00000040,0x0000004c,0x000200f8,0x00000040,0x00050041,0x00000043,
>+	0x00000044,0x0000002d,0x00000042,0x0004003d,0x0000000a,0x00000045,0x00000044,0x0004003d,
>+	0x0000000b,0x00000047,0x0000002d,0x0008004f,0x00000046,0x00000048,0x00000047,0x00000047,
>+	0x00000000,0x00000001,0x00000002,0x0005008e,0x00000046,0x00000049,0x00000048,0x00000045,
>+	0x0004003d,0x0000000b,0x0000004a,0x0000002d,0x0009004f,0x0000000b,0x0000004b,0x0000004a,
>+	0x00000049,0x00000004,0x00000005,0x00000006,0x00000003,0x0003003e,0x0000002d,0x0000004b,
>+	0x000200f9,0x00000041,0x000200f8,0x0000004c,0x00050041,0x0000001e,0x0000004e,0x00000015,
>+	0x0000004d,0x0004003d,0x00000012,0x0000004f,0x0000004e,0x000500ab,0x00000021,0x00000050,
>+	0x0000004f,0x00000022,0x000300f7,0x00000052,0x00000000,0x000400fa,0x00000050,0x00000051,
>+	0x00000052,0x000200f8,0x00000051,0x00050041,0x00000043,0x00000053,0x0000002d,0x00000042,
>+	0x0004003d,0x0000000a,0x00000054,0x00000053,0x000500ba,0x00000021,0x00000056,0x00000054,
>+	0x00000055,0x000200f9,0x00000052,0x000200f8,0x00000052,0x000700f5,0x00000021,0x00000057,
>+	0x00000050,0x0000004c,0x00000056,0x00000051,0x000300f7,0x00000059,0x00000000,0x000400fa,
>+	0x00000057,0x00000058,0x00000059,0x000200f8,0x00000058,0x00050041,0x00000043,0x0000005a,
>+	0x0000002d,0x00000042,0x0004003d,0x0000000a,0x0000005b,0x0000005a,0x0004003d,0x0000000b,
>+	0x0000005c,0x0000002d,0x0008004f,0x00000046,0x0000005d,0x0000005c,0x0000005c,0x00000000,
>+	0x00000001,0x00000002,0x00060050,0x00000046,0x0000005e,0x0000005b,0x0000005b,0x0000005b,
>+	0x00050088,0x00000046,0x0000005f,0x0000005d,0x0000005e,0x0004003d,0x0000000b,0x00000060,
>+	0x0000002d,0x0009004f,0x0000000b,0x00000061,0x00000060,0x0000005f,0x00000004,0x00000005,
>+	0x00000006,0x00000003,0x0003003e,0x0000002d,0x00000061,0x000200f9,0x00000059,0x000200f8,
>+	0x00000059,0x000200f9,0x00000041,0x000200f8,0x00000041,0x0004003d,0x0000000b,0x00000065,
>+	0x0000002d,0x0004006d,0x00000062,0x00000066,0x00000065,0x0003003e,0x00000064,0x00000066,
>+	0x00050041,0x0000001e,0x00000068,0x00000015,0x00000067,0x0004003d,0x00000012,0x00000069,
>+	0x00000068,0x000500ab,0x00000021,0x0000006a,0x00000069,0x00000022,0x000300f7,0x0000006c,
>+	0x00000000,0x000400fa,0x0000006a,0x0000006b,0x00000072,0x000200f8,0x0000006b,0x0004003d,
>+	0x00000062,0x0000006e,0x00000064,0x0007004f,0x0000006d,0x0000006f,0x0000006e,0x0000006e,
>+	0x00000000,0x00000003,0x0004003d,0x00000062,0x00000070,0x00000064,0x0009004f,0x00000062,
>+	0x00000071,0x00000070,0x0000006f,0x00000004,0x00000005,0x00000002,0x00000003,0x0003003e,
>+	0x00000064,0x00000071,0x000200f9,0x0000006c,0x000200f8,0x00000072,0x00050041,0x0000001e,
>+	0x00000074,0x00000015,0x00000073,0x0004003d,0x00000012,0x00000075,0x00000074,0x000500ab,
>+	0x00000021,0x00000076,0x00000075,0x00000022,0x000300f7,0x00000078,0x00000000,0x000400fa,
>+	0x00000076,0x00000077,0x0000007d,0x000200f8,0x00000077,0x00050041,0x00000079,0x0000007a,
>+	0x00000064,0x00000042,0x0004003d,0x00000012,0x0000007b,0x0000007a,0x00050041,0x00000079,
>+	0x0000007c,0x00000064,0x00000022,0x0003003e,0x0000007c,0x0000007b,0x000200f9,0x00000078,
>+	0x000200f8,0x0000007d,0x00050041,0x00000038,0x00000080,0x00000015,0x0000007f,0x0004003d,
>+	0x00000006,0x00000081,0x00000080,0x0003003e,0x0000007e,0x00000081,0x0004003d,0x00000006,
>+	0x00000082,0x0000007e,0x000500c7,0x00000006,0x00000083,0x00000082,0x00000037,0x000500ab,
>+	0x00000021,0x00000084,0x00000083,0x00000032,0x000300f7,0x00000086,0x00000000,0x000400fa,
>+	0x00000084,0x00000085,0x00000086,0x000200f8,0x00000085,0x00050041,0x00000079,0x00000087,
>+	0x00000064,0x00000026,0x0003003e,0x00000087,0x00000022,0x000200f9,0x00000086,0x000200f8,
>+	0x00000086,0x0004003d,0x00000006,0x00000088,0x0000007e,0x000500c7,0x00000006,0x00000089,
>+	0x00000088,0x0000001d,0x000500ab,0x00000021,0x0000008a,0x00000089,0x00000032,0x000300f7,
>+	0x0000008c,0x00000000,0x000400fa,0x0000008a,0x0000008b,0x0000008c,0x000200f8,0x0000008b,
>+	0x00050041,0x00000079,0x0000008e,0x00000064,0x0000008d,0x0003003e,0x0000008e,0x00000022,
>+	0x000200f9,0x0000008c,0x000200f8,0x0000008c,0x0004003d,0x00000006,0x0000008f,0x0000007e,
>+	0x000500c7,0x00000006,0x00000090,0x0000008f,0x00000073,0x000500ab,0x00000021,0x00000091,
>+	0x00000090,0x00000032,0x000300f7,0x00000093,0x00000000,0x000400fa,0x00000091,0x00000092,
>+	0x00000093,0x000200f8,0x00000092,0x00050041,0x00000079,0x00000094,0x00000064,0x00000042,
>+	0x0003003e,0x00000094,0x00000026,0x000200f9,0x00000093,0x000200f8,0x00000093,0x000200f9,
>+	0x00000078,0x000200f8,0x00000078,0x000200f9,0x0000006c,0x000200f8,0x0000006c,0x0004003d,
>+	0x00000062,0x00000097,0x00000064,0x0003003e,0x00000096,0x00000097,0x000100fd,0x00010038
>+};
>+
>+#if 0  // Generated from:
>+#version 450 core
>+
>+#extension GL_EXT_samplerless_texture_functions : require
>+
>+layout(set = 0, binding = 0)uniform texture2D src;
>+layout(location = 0)out uvec4 dest;
>+
>+layout(push_constant)uniform PushConstants {
>+
>+    ivec2 srcOffset;
>+    ivec2 destOffset;
>+    int srcMip;
>+    int srcLayer;
>+
>+    bool flipY;
>+
>+    bool premultiplyAlpha;
>+    bool unmultiplyAlpha;
>+
>+    bool destHasLuminance;
>+    bool destIsAlpha;
>+
>+    int destDefaultChannelsMask;
>+} params;
>+
>+void main()
>+{
>+    ivec2 destSubImageCoords = ivec2(gl_FragCoord . xy)- params . destOffset;
>+
>+    ivec2 srcSubImageCoords = destSubImageCoords;
>+
>+    if(params . flipY)
>+        srcSubImageCoords . y = - srcSubImageCoords . y;
>+
>+          vec4 srcValue = texelFetch(src, params . srcOffset + srcSubImageCoords, params . srcMip);
>+
>+    if(params . premultiplyAlpha)
>+    {
>+        srcValue . rgb *= srcValue . a;
>+    }
>+    else if(params . unmultiplyAlpha && srcValue . a > 0)
>+    {
>+        srcValue . rgb /= srcValue . a;
>+    }
>+
>+           uvec4 destValue = uvec4(srcValue);
>+
>+    if(params . destHasLuminance)
>+    {
>+        destValue . rg = destValue . ra;
>+    }
>+    else if(params . destIsAlpha)
>+    {
>+        destValue . r = destValue . a;
>+    }
>+    else
>+    {
>+        int defaultChannelsMask = params . destDefaultChannelsMask;
>+        if((defaultChannelsMask & 2)!= 0)
>+        {
>+            destValue . g = 0;
>+        }
>+        if((defaultChannelsMask & 4)!= 0)
>+        {
>+            destValue . b = 0;
>+        }
>+        if((defaultChannelsMask & 8)!= 0)
>+        {
>+            destValue . a = 1;
>+        }
>+    }
>+
>+    dest = destValue;
>+}
>+#endif  // Preprocessed code
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000011.inc b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000011.inc
>new file mode 100644
>index 00000000000..c8b4b2191a7
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000011.inc
>@@ -0,0 +1,211 @@
>+	// 7.11.3188
>+	 #pragma once
>+const uint32_t kImageCopy_frag_00000011[] = {
>+	0x07230203,0x00010000,0x00080007,0x0000009f,0x00000000,0x00020011,0x00000001,0x0006000b,
>+	0x00000001,0x4c534c47,0x6474732e,0x3035342e,0x00000000,0x0003000e,0x00000000,0x00000001,
>+	0x0007000f,0x00000004,0x00000004,0x6e69616d,0x00000000,0x0000000d,0x0000009d,0x00030010,
>+	0x00000004,0x00000007,0x00030003,0x00000002,0x000001c2,0x000b0004,0x455f4c47,0x735f5458,
>+	0x6c706d61,0x656c7265,0x745f7373,0x75747865,0x665f6572,0x74636e75,0x736e6f69,0x00000000,
>+	0x00040005,0x00000004,0x6e69616d,0x00000000,0x00070005,0x00000009,0x74736564,0x49627553,
>+	0x6567616d,0x726f6f43,0x00007364,0x00060005,0x0000000d,0x465f6c67,0x43676172,0x64726f6f,
>+	0x00000000,0x00060005,0x00000013,0x68737550,0x736e6f43,0x746e6174,0x00000073,0x00060006,
>+	0x00000013,0x00000000,0x4f637273,0x65736666,0x00000074,0x00060006,0x00000013,0x00000001,
>+	0x74736564,0x7366664f,0x00007465,0x00050006,0x00000013,0x00000002,0x4d637273,0x00007069,
>+	0x00060006,0x00000013,0x00000003,0x4c637273,0x72657961,0x00000000,0x00050006,0x00000013,
>+	0x00000004,0x70696c66,0x00000059,0x00080006,0x00000013,0x00000005,0x6d657270,0x69746c75,
>+	0x41796c70,0x6168706c,0x00000000,0x00070006,0x00000013,0x00000006,0x756d6e75,0x7069746c,
>+	0x6c41796c,0x00616870,0x00080006,0x00000013,0x00000007,0x74736564,0x4c736148,0x6e696d75,
>+	0x65636e61,0x00000000,0x00060006,0x00000013,0x00000008,0x74736564,0x6c417349,0x00616870,
>+	0x00090006,0x00000013,0x00000009,0x74736564,0x61666544,0x43746c75,0x6e6e6168,0x4d736c65,
>+	0x006b7361,0x00040005,0x00000015,0x61726170,0x0000736d,0x00070005,0x0000001b,0x53637273,
>+	0x6d496275,0x43656761,0x64726f6f,0x00000073,0x00050005,0x0000002d,0x56637273,0x65756c61,
>+	0x00000000,0x00030005,0x00000030,0x00637273,0x00050005,0x0000006b,0x74736564,0x756c6156,
>+	0x00000065,0x00070005,0x00000085,0x61666564,0x43746c75,0x6e6e6168,0x4d736c65,0x006b7361,
>+	0x00040005,0x0000009d,0x74736564,0x00000000,0x00040047,0x0000000d,0x0000000b,0x0000000f,
>+	0x00050048,0x00000013,0x00000000,0x00000023,0x00000000,0x00050048,0x00000013,0x00000001,
>+	0x00000023,0x00000008,0x00050048,0x00000013,0x00000002,0x00000023,0x00000010,0x00050048,
>+	0x00000013,0x00000003,0x00000023,0x00000014,0x00050048,0x00000013,0x00000004,0x00000023,
>+	0x00000018,0x00050048,0x00000013,0x00000005,0x00000023,0x0000001c,0x00050048,0x00000013,
>+	0x00000006,0x00000023,0x00000020,0x00050048,0x00000013,0x00000007,0x00000023,0x00000024,
>+	0x00050048,0x00000013,0x00000008,0x00000023,0x00000028,0x00050048,0x00000013,0x00000009,
>+	0x00000023,0x0000002c,0x00030047,0x00000013,0x00000002,0x00040047,0x00000030,0x00000022,
>+	0x00000000,0x00040047,0x00000030,0x00000021,0x00000000,0x00040047,0x0000009d,0x0000001e,
>+	0x00000000,0x00020013,0x00000002,0x00030021,0x00000003,0x00000002,0x00040015,0x00000006,
>+	0x00000020,0x00000001,0x00040017,0x00000007,0x00000006,0x00000002,0x00040020,0x00000008,
>+	0x00000007,0x00000007,0x00030016,0x0000000a,0x00000020,0x00040017,0x0000000b,0x0000000a,
>+	0x00000004,0x00040020,0x0000000c,0x00000001,0x0000000b,0x0004003b,0x0000000c,0x0000000d,
>+	0x00000001,0x00040017,0x0000000e,0x0000000a,0x00000002,0x00040015,0x00000012,0x00000020,
>+	0x00000000,0x000c001e,0x00000013,0x00000007,0x00000007,0x00000006,0x00000006,0x00000012,
>+	0x00000012,0x00000012,0x00000012,0x00000012,0x00000006,0x00040020,0x00000014,0x00000009,
>+	0x00000013,0x0004003b,0x00000014,0x00000015,0x00000009,0x0004002b,0x00000006,0x00000016,
>+	0x00000001,0x00040020,0x00000017,0x00000009,0x00000007,0x0004002b,0x00000006,0x0000001d,
>+	0x00000004,0x00040020,0x0000001e,0x00000009,0x00000012,0x00020014,0x00000021,0x0004002b,
>+	0x00000012,0x00000022,0x00000000,0x0004002b,0x00000012,0x00000026,0x00000001,0x00040020,
>+	0x00000027,0x00000007,0x00000006,0x00040020,0x0000002c,0x00000007,0x0000000b,0x00090019,
>+	0x0000002e,0x0000000a,0x00000001,0x00000000,0x00000001,0x00000000,0x00000001,0x00000000,
>+	0x00040020,0x0000002f,0x00000000,0x0000002e,0x0004003b,0x0000002f,0x00000030,0x00000000,
>+	0x0004002b,0x00000006,0x00000032,0x00000000,0x0004002b,0x00000006,0x00000037,0x00000003,
>+	0x00040020,0x00000038,0x00000009,0x00000006,0x00040017,0x0000003b,0x00000006,0x00000003,
>+	0x0004002b,0x00000006,0x0000003f,0x00000002,0x0004002b,0x00000006,0x00000043,0x00000005,
>+	0x0004002b,0x00000012,0x00000049,0x00000003,0x00040020,0x0000004a,0x00000007,0x0000000a,
>+	0x00040017,0x0000004d,0x0000000a,0x00000003,0x0004002b,0x00000006,0x00000054,0x00000006,
>+	0x0004002b,0x0000000a,0x0000005c,0x00000000,0x00040017,0x00000069,0x00000012,0x00000004,
>+	0x00040020,0x0000006a,0x00000007,0x00000069,0x0004002b,0x00000006,0x0000006e,0x00000007,
>+	0x00040017,0x00000074,0x00000012,0x00000002,0x0004002b,0x00000006,0x0000007a,0x00000008,
>+	0x00040020,0x00000080,0x00000007,0x00000012,0x0004002b,0x00000006,0x00000086,0x00000009,
>+	0x0004002b,0x00000012,0x00000094,0x00000002,0x00040020,0x0000009c,0x00000003,0x00000069,
>+	0x0004003b,0x0000009c,0x0000009d,0x00000003,0x00050036,0x00000002,0x00000004,0x00000000,
>+	0x00000003,0x000200f8,0x00000005,0x0004003b,0x00000008,0x00000009,0x00000007,0x0004003b,
>+	0x00000008,0x0000001b,0x00000007,0x0004003b,0x0000002c,0x0000002d,0x00000007,0x0004003b,
>+	0x0000006a,0x0000006b,0x00000007,0x0004003b,0x00000027,0x00000085,0x00000007,0x0004003d,
>+	0x0000000b,0x0000000f,0x0000000d,0x0007004f,0x0000000e,0x00000010,0x0000000f,0x0000000f,
>+	0x00000000,0x00000001,0x0004006e,0x00000007,0x00000011,0x00000010,0x00050041,0x00000017,
>+	0x00000018,0x00000015,0x00000016,0x0004003d,0x00000007,0x00000019,0x00000018,0x00050082,
>+	0x00000007,0x0000001a,0x00000011,0x00000019,0x0003003e,0x00000009,0x0000001a,0x0004003d,
>+	0x00000007,0x0000001c,0x00000009,0x0003003e,0x0000001b,0x0000001c,0x00050041,0x0000001e,
>+	0x0000001f,0x00000015,0x0000001d,0x0004003d,0x00000012,0x00000020,0x0000001f,0x000500ab,
>+	0x00000021,0x00000023,0x00000020,0x00000022,0x000300f7,0x00000025,0x00000000,0x000400fa,
>+	0x00000023,0x00000024,0x00000025,0x000200f8,0x00000024,0x00050041,0x00000027,0x00000028,
>+	0x0000001b,0x00000026,0x0004003d,0x00000006,0x00000029,0x00000028,0x0004007e,0x00000006,
>+	0x0000002a,0x00000029,0x00050041,0x00000027,0x0000002b,0x0000001b,0x00000026,0x0003003e,
>+	0x0000002b,0x0000002a,0x000200f9,0x00000025,0x000200f8,0x00000025,0x0004003d,0x0000002e,
>+	0x00000031,0x00000030,0x00050041,0x00000017,0x00000033,0x00000015,0x00000032,0x0004003d,
>+	0x00000007,0x00000034,0x00000033,0x0004003d,0x00000007,0x00000035,0x0000001b,0x00050080,
>+	0x00000007,0x00000036,0x00000034,0x00000035,0x00050041,0x00000038,0x00000039,0x00000015,
>+	0x00000037,0x0004003d,0x00000006,0x0000003a,0x00000039,0x00050051,0x00000006,0x0000003c,
>+	0x00000036,0x00000000,0x00050051,0x00000006,0x0000003d,0x00000036,0x00000001,0x00060050,
>+	0x0000003b,0x0000003e,0x0000003c,0x0000003d,0x0000003a,0x00050041,0x00000038,0x00000040,
>+	0x00000015,0x0000003f,0x0004003d,0x00000006,0x00000041,0x00000040,0x0007005f,0x0000000b,
>+	0x00000042,0x00000031,0x0000003e,0x00000002,0x00000041,0x0003003e,0x0000002d,0x00000042,
>+	0x00050041,0x0000001e,0x00000044,0x00000015,0x00000043,0x0004003d,0x00000012,0x00000045,
>+	0x00000044,0x000500ab,0x00000021,0x00000046,0x00000045,0x00000022,0x000300f7,0x00000048,
>+	0x00000000,0x000400fa,0x00000046,0x00000047,0x00000053,0x000200f8,0x00000047,0x00050041,
>+	0x0000004a,0x0000004b,0x0000002d,0x00000049,0x0004003d,0x0000000a,0x0000004c,0x0000004b,
>+	0x0004003d,0x0000000b,0x0000004e,0x0000002d,0x0008004f,0x0000004d,0x0000004f,0x0000004e,
>+	0x0000004e,0x00000000,0x00000001,0x00000002,0x0005008e,0x0000004d,0x00000050,0x0000004f,
>+	0x0000004c,0x0004003d,0x0000000b,0x00000051,0x0000002d,0x0009004f,0x0000000b,0x00000052,
>+	0x00000051,0x00000050,0x00000004,0x00000005,0x00000006,0x00000003,0x0003003e,0x0000002d,
>+	0x00000052,0x000200f9,0x00000048,0x000200f8,0x00000053,0x00050041,0x0000001e,0x00000055,
>+	0x00000015,0x00000054,0x0004003d,0x00000012,0x00000056,0x00000055,0x000500ab,0x00000021,
>+	0x00000057,0x00000056,0x00000022,0x000300f7,0x00000059,0x00000000,0x000400fa,0x00000057,
>+	0x00000058,0x00000059,0x000200f8,0x00000058,0x00050041,0x0000004a,0x0000005a,0x0000002d,
>+	0x00000049,0x0004003d,0x0000000a,0x0000005b,0x0000005a,0x000500ba,0x00000021,0x0000005d,
>+	0x0000005b,0x0000005c,0x000200f9,0x00000059,0x000200f8,0x00000059,0x000700f5,0x00000021,
>+	0x0000005e,0x00000057,0x00000053,0x0000005d,0x00000058,0x000300f7,0x00000060,0x00000000,
>+	0x000400fa,0x0000005e,0x0000005f,0x00000060,0x000200f8,0x0000005f,0x00050041,0x0000004a,
>+	0x00000061,0x0000002d,0x00000049,0x0004003d,0x0000000a,0x00000062,0x00000061,0x0004003d,
>+	0x0000000b,0x00000063,0x0000002d,0x0008004f,0x0000004d,0x00000064,0x00000063,0x00000063,
>+	0x00000000,0x00000001,0x00000002,0x00060050,0x0000004d,0x00000065,0x00000062,0x00000062,
>+	0x00000062,0x00050088,0x0000004d,0x00000066,0x00000064,0x00000065,0x0004003d,0x0000000b,
>+	0x00000067,0x0000002d,0x0009004f,0x0000000b,0x00000068,0x00000067,0x00000066,0x00000004,
>+	0x00000005,0x00000006,0x00000003,0x0003003e,0x0000002d,0x00000068,0x000200f9,0x00000060,
>+	0x000200f8,0x00000060,0x000200f9,0x00000048,0x000200f8,0x00000048,0x0004003d,0x0000000b,
>+	0x0000006c,0x0000002d,0x0004006d,0x00000069,0x0000006d,0x0000006c,0x0003003e,0x0000006b,
>+	0x0000006d,0x00050041,0x0000001e,0x0000006f,0x00000015,0x0000006e,0x0004003d,0x00000012,
>+	0x00000070,0x0000006f,0x000500ab,0x00000021,0x00000071,0x00000070,0x00000022,0x000300f7,
>+	0x00000073,0x00000000,0x000400fa,0x00000071,0x00000072,0x00000079,0x000200f8,0x00000072,
>+	0x0004003d,0x00000069,0x00000075,0x0000006b,0x0007004f,0x00000074,0x00000076,0x00000075,
>+	0x00000075,0x00000000,0x00000003,0x0004003d,0x00000069,0x00000077,0x0000006b,0x0009004f,
>+	0x00000069,0x00000078,0x00000077,0x00000076,0x00000004,0x00000005,0x00000002,0x00000003,
>+	0x0003003e,0x0000006b,0x00000078,0x000200f9,0x00000073,0x000200f8,0x00000079,0x00050041,
>+	0x0000001e,0x0000007b,0x00000015,0x0000007a,0x0004003d,0x00000012,0x0000007c,0x0000007b,
>+	0x000500ab,0x00000021,0x0000007d,0x0000007c,0x00000022,0x000300f7,0x0000007f,0x00000000,
>+	0x000400fa,0x0000007d,0x0000007e,0x00000084,0x000200f8,0x0000007e,0x00050041,0x00000080,
>+	0x00000081,0x0000006b,0x00000049,0x0004003d,0x00000012,0x00000082,0x00000081,0x00050041,
>+	0x00000080,0x00000083,0x0000006b,0x00000022,0x0003003e,0x00000083,0x00000082,0x000200f9,
>+	0x0000007f,0x000200f8,0x00000084,0x00050041,0x00000038,0x00000087,0x00000015,0x00000086,
>+	0x0004003d,0x00000006,0x00000088,0x00000087,0x0003003e,0x00000085,0x00000088,0x0004003d,
>+	0x00000006,0x00000089,0x00000085,0x000500c7,0x00000006,0x0000008a,0x00000089,0x0000003f,
>+	0x000500ab,0x00000021,0x0000008b,0x0000008a,0x00000032,0x000300f7,0x0000008d,0x00000000,
>+	0x000400fa,0x0000008b,0x0000008c,0x0000008d,0x000200f8,0x0000008c,0x00050041,0x00000080,
>+	0x0000008e,0x0000006b,0x00000026,0x0003003e,0x0000008e,0x00000022,0x000200f9,0x0000008d,
>+	0x000200f8,0x0000008d,0x0004003d,0x00000006,0x0000008f,0x00000085,0x000500c7,0x00000006,
>+	0x00000090,0x0000008f,0x0000001d,0x000500ab,0x00000021,0x00000091,0x00000090,0x00000032,
>+	0x000300f7,0x00000093,0x00000000,0x000400fa,0x00000091,0x00000092,0x00000093,0x000200f8,
>+	0x00000092,0x00050041,0x00000080,0x00000095,0x0000006b,0x00000094,0x0003003e,0x00000095,
>+	0x00000022,0x000200f9,0x00000093,0x000200f8,0x00000093,0x0004003d,0x00000006,0x00000096,
>+	0x00000085,0x000500c7,0x00000006,0x00000097,0x00000096,0x0000007a,0x000500ab,0x00000021,
>+	0x00000098,0x00000097,0x00000032,0x000300f7,0x0000009a,0x00000000,0x000400fa,0x00000098,
>+	0x00000099,0x0000009a,0x000200f8,0x00000099,0x00050041,0x00000080,0x0000009b,0x0000006b,
>+	0x00000049,0x0003003e,0x0000009b,0x00000026,0x000200f9,0x0000009a,0x000200f8,0x0000009a,
>+	0x000200f9,0x0000007f,0x000200f8,0x0000007f,0x000200f9,0x00000073,0x000200f8,0x00000073,
>+	0x0004003d,0x00000069,0x0000009e,0x0000006b,0x0003003e,0x0000009d,0x0000009e,0x000100fd,
>+	0x00010038
>+};
>+
>+#if 0  // Generated from:
>+#version 450 core
>+
>+#extension GL_EXT_samplerless_texture_functions : require
>+
>+layout(set = 0, binding = 0)uniform texture2DArray src;
>+layout(location = 0)out uvec4 dest;
>+
>+layout(push_constant)uniform PushConstants {
>+
>+    ivec2 srcOffset;
>+    ivec2 destOffset;
>+    int srcMip;
>+    int srcLayer;
>+
>+    bool flipY;
>+
>+    bool premultiplyAlpha;
>+    bool unmultiplyAlpha;
>+
>+    bool destHasLuminance;
>+    bool destIsAlpha;
>+
>+    int destDefaultChannelsMask;
>+} params;
>+
>+void main()
>+{
>+    ivec2 destSubImageCoords = ivec2(gl_FragCoord . xy)- params . destOffset;
>+
>+    ivec2 srcSubImageCoords = destSubImageCoords;
>+
>+    if(params . flipY)
>+        srcSubImageCoords . y = - srcSubImageCoords . y;
>+
>+          vec4 srcValue = texelFetch(src, ivec3(params . srcOffset + srcSubImageCoords, params . srcLayer), params . srcMip);
>+
>+    if(params . premultiplyAlpha)
>+    {
>+        srcValue . rgb *= srcValue . a;
>+    }
>+    else if(params . unmultiplyAlpha && srcValue . a > 0)
>+    {
>+        srcValue . rgb /= srcValue . a;
>+    }
>+
>+           uvec4 destValue = uvec4(srcValue);
>+
>+    if(params . destHasLuminance)
>+    {
>+        destValue . rg = destValue . ra;
>+    }
>+    else if(params . destIsAlpha)
>+    {
>+        destValue . r = destValue . a;
>+    }
>+    else
>+    {
>+        int defaultChannelsMask = params . destDefaultChannelsMask;
>+        if((defaultChannelsMask & 2)!= 0)
>+        {
>+            destValue . g = 0;
>+        }
>+        if((defaultChannelsMask & 4)!= 0)
>+        {
>+            destValue . b = 0;
>+        }
>+        if((defaultChannelsMask & 8)!= 0)
>+        {
>+            destValue . a = 1;
>+        }
>+    }
>+
>+    dest = destValue;
>+}
>+#endif  // Preprocessed code
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000012.inc b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000012.inc
>new file mode 100644
>index 00000000000..a18a5c7c422
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000012.inc
>@@ -0,0 +1,207 @@
>+	// 7.11.3188
>+	 #pragma once
>+const uint32_t kImageCopy_frag_00000012[] = {
>+	0x07230203,0x00010000,0x00080007,0x00000098,0x00000000,0x00020011,0x00000001,0x0006000b,
>+	0x00000001,0x4c534c47,0x6474732e,0x3035342e,0x00000000,0x0003000e,0x00000000,0x00000001,
>+	0x0007000f,0x00000004,0x00000004,0x6e69616d,0x00000000,0x0000000d,0x00000096,0x00030010,
>+	0x00000004,0x00000007,0x00030003,0x00000002,0x000001c2,0x000b0004,0x455f4c47,0x735f5458,
>+	0x6c706d61,0x656c7265,0x745f7373,0x75747865,0x665f6572,0x74636e75,0x736e6f69,0x00000000,
>+	0x00040005,0x00000004,0x6e69616d,0x00000000,0x00070005,0x00000009,0x74736564,0x49627553,
>+	0x6567616d,0x726f6f43,0x00007364,0x00060005,0x0000000d,0x465f6c67,0x43676172,0x64726f6f,
>+	0x00000000,0x00060005,0x00000013,0x68737550,0x736e6f43,0x746e6174,0x00000073,0x00060006,
>+	0x00000013,0x00000000,0x4f637273,0x65736666,0x00000074,0x00060006,0x00000013,0x00000001,
>+	0x74736564,0x7366664f,0x00007465,0x00050006,0x00000013,0x00000002,0x4d637273,0x00007069,
>+	0x00060006,0x00000013,0x00000003,0x4c637273,0x72657961,0x00000000,0x00050006,0x00000013,
>+	0x00000004,0x70696c66,0x00000059,0x00080006,0x00000013,0x00000005,0x6d657270,0x69746c75,
>+	0x41796c70,0x6168706c,0x00000000,0x00070006,0x00000013,0x00000006,0x756d6e75,0x7069746c,
>+	0x6c41796c,0x00616870,0x00080006,0x00000013,0x00000007,0x74736564,0x4c736148,0x6e696d75,
>+	0x65636e61,0x00000000,0x00060006,0x00000013,0x00000008,0x74736564,0x6c417349,0x00616870,
>+	0x00090006,0x00000013,0x00000009,0x74736564,0x61666544,0x43746c75,0x6e6e6168,0x4d736c65,
>+	0x006b7361,0x00040005,0x00000015,0x61726170,0x0000736d,0x00070005,0x0000001b,0x53637273,
>+	0x6d496275,0x43656761,0x64726f6f,0x00000073,0x00050005,0x0000002e,0x56637273,0x65756c61,
>+	0x00000000,0x00030005,0x00000031,0x00637273,0x00050005,0x00000064,0x74736564,0x756c6156,
>+	0x00000065,0x00070005,0x0000007e,0x61666564,0x43746c75,0x6e6e6168,0x4d736c65,0x006b7361,
>+	0x00040005,0x00000096,0x74736564,0x00000000,0x00040047,0x0000000d,0x0000000b,0x0000000f,
>+	0x00050048,0x00000013,0x00000000,0x00000023,0x00000000,0x00050048,0x00000013,0x00000001,
>+	0x00000023,0x00000008,0x00050048,0x00000013,0x00000002,0x00000023,0x00000010,0x00050048,
>+	0x00000013,0x00000003,0x00000023,0x00000014,0x00050048,0x00000013,0x00000004,0x00000023,
>+	0x00000018,0x00050048,0x00000013,0x00000005,0x00000023,0x0000001c,0x00050048,0x00000013,
>+	0x00000006,0x00000023,0x00000020,0x00050048,0x00000013,0x00000007,0x00000023,0x00000024,
>+	0x00050048,0x00000013,0x00000008,0x00000023,0x00000028,0x00050048,0x00000013,0x00000009,
>+	0x00000023,0x0000002c,0x00030047,0x00000013,0x00000002,0x00040047,0x00000031,0x00000022,
>+	0x00000000,0x00040047,0x00000031,0x00000021,0x00000000,0x00040047,0x00000096,0x0000001e,
>+	0x00000000,0x00020013,0x00000002,0x00030021,0x00000003,0x00000002,0x00040015,0x00000006,
>+	0x00000020,0x00000001,0x00040017,0x00000007,0x00000006,0x00000002,0x00040020,0x00000008,
>+	0x00000007,0x00000007,0x00030016,0x0000000a,0x00000020,0x00040017,0x0000000b,0x0000000a,
>+	0x00000004,0x00040020,0x0000000c,0x00000001,0x0000000b,0x0004003b,0x0000000c,0x0000000d,
>+	0x00000001,0x00040017,0x0000000e,0x0000000a,0x00000002,0x00040015,0x00000012,0x00000020,
>+	0x00000000,0x000c001e,0x00000013,0x00000007,0x00000007,0x00000006,0x00000006,0x00000012,
>+	0x00000012,0x00000012,0x00000012,0x00000012,0x00000006,0x00040020,0x00000014,0x00000009,
>+	0x00000013,0x0004003b,0x00000014,0x00000015,0x00000009,0x0004002b,0x00000006,0x00000016,
>+	0x00000001,0x00040020,0x00000017,0x00000009,0x00000007,0x0004002b,0x00000006,0x0000001d,
>+	0x00000004,0x00040020,0x0000001e,0x00000009,0x00000012,0x00020014,0x00000021,0x0004002b,
>+	0x00000012,0x00000022,0x00000000,0x0004002b,0x00000012,0x00000026,0x00000001,0x00040020,
>+	0x00000027,0x00000007,0x00000006,0x00040017,0x0000002c,0x00000006,0x00000004,0x00040020,
>+	0x0000002d,0x00000007,0x0000002c,0x00090019,0x0000002f,0x00000006,0x00000001,0x00000000,
>+	0x00000000,0x00000000,0x00000001,0x00000000,0x00040020,0x00000030,0x00000000,0x0000002f,
>+	0x0004003b,0x00000030,0x00000031,0x00000000,0x0004002b,0x00000006,0x00000033,0x00000000,
>+	0x0004002b,0x00000006,0x00000038,0x00000002,0x00040020,0x00000039,0x00000009,0x00000006,
>+	0x0004002b,0x00000006,0x0000003d,0x00000005,0x0004002b,0x00000012,0x00000043,0x00000003,
>+	0x00040017,0x00000046,0x00000006,0x00000003,0x0004002b,0x00000006,0x0000004e,0x00000006,
>+	0x00040017,0x00000062,0x00000012,0x00000004,0x00040020,0x00000063,0x00000007,0x00000062,
>+	0x0004002b,0x00000006,0x00000067,0x00000007,0x00040017,0x0000006d,0x00000012,0x00000002,
>+	0x0004002b,0x00000006,0x00000073,0x00000008,0x00040020,0x00000079,0x00000007,0x00000012,
>+	0x0004002b,0x00000006,0x0000007f,0x00000009,0x0004002b,0x00000012,0x0000008d,0x00000002,
>+	0x00040020,0x00000095,0x00000003,0x00000062,0x0004003b,0x00000095,0x00000096,0x00000003,
>+	0x00050036,0x00000002,0x00000004,0x00000000,0x00000003,0x000200f8,0x00000005,0x0004003b,
>+	0x00000008,0x00000009,0x00000007,0x0004003b,0x00000008,0x0000001b,0x00000007,0x0004003b,
>+	0x0000002d,0x0000002e,0x00000007,0x0004003b,0x00000063,0x00000064,0x00000007,0x0004003b,
>+	0x00000027,0x0000007e,0x00000007,0x0004003d,0x0000000b,0x0000000f,0x0000000d,0x0007004f,
>+	0x0000000e,0x00000010,0x0000000f,0x0000000f,0x00000000,0x00000001,0x0004006e,0x00000007,
>+	0x00000011,0x00000010,0x00050041,0x00000017,0x00000018,0x00000015,0x00000016,0x0004003d,
>+	0x00000007,0x00000019,0x00000018,0x00050082,0x00000007,0x0000001a,0x00000011,0x00000019,
>+	0x0003003e,0x00000009,0x0000001a,0x0004003d,0x00000007,0x0000001c,0x00000009,0x0003003e,
>+	0x0000001b,0x0000001c,0x00050041,0x0000001e,0x0000001f,0x00000015,0x0000001d,0x0004003d,
>+	0x00000012,0x00000020,0x0000001f,0x000500ab,0x00000021,0x00000023,0x00000020,0x00000022,
>+	0x000300f7,0x00000025,0x00000000,0x000400fa,0x00000023,0x00000024,0x00000025,0x000200f8,
>+	0x00000024,0x00050041,0x00000027,0x00000028,0x0000001b,0x00000026,0x0004003d,0x00000006,
>+	0x00000029,0x00000028,0x0004007e,0x00000006,0x0000002a,0x00000029,0x00050041,0x00000027,
>+	0x0000002b,0x0000001b,0x00000026,0x0003003e,0x0000002b,0x0000002a,0x000200f9,0x00000025,
>+	0x000200f8,0x00000025,0x0004003d,0x0000002f,0x00000032,0x00000031,0x00050041,0x00000017,
>+	0x00000034,0x00000015,0x00000033,0x0004003d,0x00000007,0x00000035,0x00000034,0x0004003d,
>+	0x00000007,0x00000036,0x0000001b,0x00050080,0x00000007,0x00000037,0x00000035,0x00000036,
>+	0x00050041,0x00000039,0x0000003a,0x00000015,0x00000038,0x0004003d,0x00000006,0x0000003b,
>+	0x0000003a,0x0007005f,0x0000002c,0x0000003c,0x00000032,0x00000037,0x00000002,0x0000003b,
>+	0x0003003e,0x0000002e,0x0000003c,0x00050041,0x0000001e,0x0000003e,0x00000015,0x0000003d,
>+	0x0004003d,0x00000012,0x0000003f,0x0000003e,0x000500ab,0x00000021,0x00000040,0x0000003f,
>+	0x00000022,0x000300f7,0x00000042,0x00000000,0x000400fa,0x00000040,0x00000041,0x0000004d,
>+	0x000200f8,0x00000041,0x00050041,0x00000027,0x00000044,0x0000002e,0x00000043,0x0004003d,
>+	0x00000006,0x00000045,0x00000044,0x0004003d,0x0000002c,0x00000047,0x0000002e,0x0008004f,
>+	0x00000046,0x00000048,0x00000047,0x00000047,0x00000000,0x00000001,0x00000002,0x00060050,
>+	0x00000046,0x00000049,0x00000045,0x00000045,0x00000045,0x00050084,0x00000046,0x0000004a,
>+	0x00000048,0x00000049,0x0004003d,0x0000002c,0x0000004b,0x0000002e,0x0009004f,0x0000002c,
>+	0x0000004c,0x0000004b,0x0000004a,0x00000004,0x00000005,0x00000006,0x00000003,0x0003003e,
>+	0x0000002e,0x0000004c,0x000200f9,0x00000042,0x000200f8,0x0000004d,0x00050041,0x0000001e,
>+	0x0000004f,0x00000015,0x0000004e,0x0004003d,0x00000012,0x00000050,0x0000004f,0x000500ab,
>+	0x00000021,0x00000051,0x00000050,0x00000022,0x000300f7,0x00000053,0x00000000,0x000400fa,
>+	0x00000051,0x00000052,0x00000053,0x000200f8,0x00000052,0x00050041,0x00000027,0x00000054,
>+	0x0000002e,0x00000043,0x0004003d,0x00000006,0x00000055,0x00000054,0x000500ad,0x00000021,
>+	0x00000056,0x00000055,0x00000033,0x000200f9,0x00000053,0x000200f8,0x00000053,0x000700f5,
>+	0x00000021,0x00000057,0x00000051,0x0000004d,0x00000056,0x00000052,0x000300f7,0x00000059,
>+	0x00000000,0x000400fa,0x00000057,0x00000058,0x00000059,0x000200f8,0x00000058,0x00050041,
>+	0x00000027,0x0000005a,0x0000002e,0x00000043,0x0004003d,0x00000006,0x0000005b,0x0000005a,
>+	0x0004003d,0x0000002c,0x0000005c,0x0000002e,0x0008004f,0x00000046,0x0000005d,0x0000005c,
>+	0x0000005c,0x00000000,0x00000001,0x00000002,0x00060050,0x00000046,0x0000005e,0x0000005b,
>+	0x0000005b,0x0000005b,0x00050087,0x00000046,0x0000005f,0x0000005d,0x0000005e,0x0004003d,
>+	0x0000002c,0x00000060,0x0000002e,0x0009004f,0x0000002c,0x00000061,0x00000060,0x0000005f,
>+	0x00000004,0x00000005,0x00000006,0x00000003,0x0003003e,0x0000002e,0x00000061,0x000200f9,
>+	0x00000059,0x000200f8,0x00000059,0x000200f9,0x00000042,0x000200f8,0x00000042,0x0004003d,
>+	0x0000002c,0x00000065,0x0000002e,0x0004007c,0x00000062,0x00000066,0x00000065,0x0003003e,
>+	0x00000064,0x00000066,0x00050041,0x0000001e,0x00000068,0x00000015,0x00000067,0x0004003d,
>+	0x00000012,0x00000069,0x00000068,0x000500ab,0x00000021,0x0000006a,0x00000069,0x00000022,
>+	0x000300f7,0x0000006c,0x00000000,0x000400fa,0x0000006a,0x0000006b,0x00000072,0x000200f8,
>+	0x0000006b,0x0004003d,0x00000062,0x0000006e,0x00000064,0x0007004f,0x0000006d,0x0000006f,
>+	0x0000006e,0x0000006e,0x00000000,0x00000003,0x0004003d,0x00000062,0x00000070,0x00000064,
>+	0x0009004f,0x00000062,0x00000071,0x00000070,0x0000006f,0x00000004,0x00000005,0x00000002,
>+	0x00000003,0x0003003e,0x00000064,0x00000071,0x000200f9,0x0000006c,0x000200f8,0x00000072,
>+	0x00050041,0x0000001e,0x00000074,0x00000015,0x00000073,0x0004003d,0x00000012,0x00000075,
>+	0x00000074,0x000500ab,0x00000021,0x00000076,0x00000075,0x00000022,0x000300f7,0x00000078,
>+	0x00000000,0x000400fa,0x00000076,0x00000077,0x0000007d,0x000200f8,0x00000077,0x00050041,
>+	0x00000079,0x0000007a,0x00000064,0x00000043,0x0004003d,0x00000012,0x0000007b,0x0000007a,
>+	0x00050041,0x00000079,0x0000007c,0x00000064,0x00000022,0x0003003e,0x0000007c,0x0000007b,
>+	0x000200f9,0x00000078,0x000200f8,0x0000007d,0x00050041,0x00000039,0x00000080,0x00000015,
>+	0x0000007f,0x0004003d,0x00000006,0x00000081,0x00000080,0x0003003e,0x0000007e,0x00000081,
>+	0x0004003d,0x00000006,0x00000082,0x0000007e,0x000500c7,0x00000006,0x00000083,0x00000082,
>+	0x00000038,0x000500ab,0x00000021,0x00000084,0x00000083,0x00000033,0x000300f7,0x00000086,
>+	0x00000000,0x000400fa,0x00000084,0x00000085,0x00000086,0x000200f8,0x00000085,0x00050041,
>+	0x00000079,0x00000087,0x00000064,0x00000026,0x0003003e,0x00000087,0x00000022,0x000200f9,
>+	0x00000086,0x000200f8,0x00000086,0x0004003d,0x00000006,0x00000088,0x0000007e,0x000500c7,
>+	0x00000006,0x00000089,0x00000088,0x0000001d,0x000500ab,0x00000021,0x0000008a,0x00000089,
>+	0x00000033,0x000300f7,0x0000008c,0x00000000,0x000400fa,0x0000008a,0x0000008b,0x0000008c,
>+	0x000200f8,0x0000008b,0x00050041,0x00000079,0x0000008e,0x00000064,0x0000008d,0x0003003e,
>+	0x0000008e,0x00000022,0x000200f9,0x0000008c,0x000200f8,0x0000008c,0x0004003d,0x00000006,
>+	0x0000008f,0x0000007e,0x000500c7,0x00000006,0x00000090,0x0000008f,0x00000073,0x000500ab,
>+	0x00000021,0x00000091,0x00000090,0x00000033,0x000300f7,0x00000093,0x00000000,0x000400fa,
>+	0x00000091,0x00000092,0x00000093,0x000200f8,0x00000092,0x00050041,0x00000079,0x00000094,
>+	0x00000064,0x00000043,0x0003003e,0x00000094,0x00000026,0x000200f9,0x00000093,0x000200f8,
>+	0x00000093,0x000200f9,0x00000078,0x000200f8,0x00000078,0x000200f9,0x0000006c,0x000200f8,
>+	0x0000006c,0x0004003d,0x00000062,0x00000097,0x00000064,0x0003003e,0x00000096,0x00000097,
>+	0x000100fd,0x00010038
>+};
>+
>+#if 0  // Generated from:
>+#version 450 core
>+
>+#extension GL_EXT_samplerless_texture_functions : require
>+
>+layout(set = 0, binding = 0)uniform itexture2D src;
>+layout(location = 0)out uvec4 dest;
>+
>+layout(push_constant)uniform PushConstants {
>+
>+    ivec2 srcOffset;
>+    ivec2 destOffset;
>+    int srcMip;
>+    int srcLayer;
>+
>+    bool flipY;
>+
>+    bool premultiplyAlpha;
>+    bool unmultiplyAlpha;
>+
>+    bool destHasLuminance;
>+    bool destIsAlpha;
>+
>+    int destDefaultChannelsMask;
>+} params;
>+
>+void main()
>+{
>+    ivec2 destSubImageCoords = ivec2(gl_FragCoord . xy)- params . destOffset;
>+
>+    ivec2 srcSubImageCoords = destSubImageCoords;
>+
>+    if(params . flipY)
>+        srcSubImageCoords . y = - srcSubImageCoords . y;
>+
>+          ivec4 srcValue = texelFetch(src, params . srcOffset + srcSubImageCoords, params . srcMip);
>+
>+    if(params . premultiplyAlpha)
>+    {
>+        srcValue . rgb *= srcValue . a;
>+    }
>+    else if(params . unmultiplyAlpha && srcValue . a > 0)
>+    {
>+        srcValue . rgb /= srcValue . a;
>+    }
>+
>+           uvec4 destValue = uvec4(srcValue);
>+
>+    if(params . destHasLuminance)
>+    {
>+        destValue . rg = destValue . ra;
>+    }
>+    else if(params . destIsAlpha)
>+    {
>+        destValue . r = destValue . a;
>+    }
>+    else
>+    {
>+        int defaultChannelsMask = params . destDefaultChannelsMask;
>+        if((defaultChannelsMask & 2)!= 0)
>+        {
>+            destValue . g = 0;
>+        }
>+        if((defaultChannelsMask & 4)!= 0)
>+        {
>+            destValue . b = 0;
>+        }
>+        if((defaultChannelsMask & 8)!= 0)
>+        {
>+            destValue . a = 1;
>+        }
>+    }
>+
>+    dest = destValue;
>+}
>+#endif  // Preprocessed code
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000013.inc b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000013.inc
>new file mode 100644
>index 00000000000..24c4efdbff0
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000013.inc
>@@ -0,0 +1,210 @@
>+	// 7.11.3188
>+	 #pragma once
>+const uint32_t kImageCopy_frag_00000013[] = {
>+	0x07230203,0x00010000,0x00080007,0x0000009e,0x00000000,0x00020011,0x00000001,0x0006000b,
>+	0x00000001,0x4c534c47,0x6474732e,0x3035342e,0x00000000,0x0003000e,0x00000000,0x00000001,
>+	0x0007000f,0x00000004,0x00000004,0x6e69616d,0x00000000,0x0000000d,0x0000009c,0x00030010,
>+	0x00000004,0x00000007,0x00030003,0x00000002,0x000001c2,0x000b0004,0x455f4c47,0x735f5458,
>+	0x6c706d61,0x656c7265,0x745f7373,0x75747865,0x665f6572,0x74636e75,0x736e6f69,0x00000000,
>+	0x00040005,0x00000004,0x6e69616d,0x00000000,0x00070005,0x00000009,0x74736564,0x49627553,
>+	0x6567616d,0x726f6f43,0x00007364,0x00060005,0x0000000d,0x465f6c67,0x43676172,0x64726f6f,
>+	0x00000000,0x00060005,0x00000013,0x68737550,0x736e6f43,0x746e6174,0x00000073,0x00060006,
>+	0x00000013,0x00000000,0x4f637273,0x65736666,0x00000074,0x00060006,0x00000013,0x00000001,
>+	0x74736564,0x7366664f,0x00007465,0x00050006,0x00000013,0x00000002,0x4d637273,0x00007069,
>+	0x00060006,0x00000013,0x00000003,0x4c637273,0x72657961,0x00000000,0x00050006,0x00000013,
>+	0x00000004,0x70696c66,0x00000059,0x00080006,0x00000013,0x00000005,0x6d657270,0x69746c75,
>+	0x41796c70,0x6168706c,0x00000000,0x00070006,0x00000013,0x00000006,0x756d6e75,0x7069746c,
>+	0x6c41796c,0x00616870,0x00080006,0x00000013,0x00000007,0x74736564,0x4c736148,0x6e696d75,
>+	0x65636e61,0x00000000,0x00060006,0x00000013,0x00000008,0x74736564,0x6c417349,0x00616870,
>+	0x00090006,0x00000013,0x00000009,0x74736564,0x61666544,0x43746c75,0x6e6e6168,0x4d736c65,
>+	0x006b7361,0x00040005,0x00000015,0x61726170,0x0000736d,0x00070005,0x0000001b,0x53637273,
>+	0x6d496275,0x43656761,0x64726f6f,0x00000073,0x00050005,0x0000002e,0x56637273,0x65756c61,
>+	0x00000000,0x00030005,0x00000031,0x00637273,0x00050005,0x0000006a,0x74736564,0x756c6156,
>+	0x00000065,0x00070005,0x00000084,0x61666564,0x43746c75,0x6e6e6168,0x4d736c65,0x006b7361,
>+	0x00040005,0x0000009c,0x74736564,0x00000000,0x00040047,0x0000000d,0x0000000b,0x0000000f,
>+	0x00050048,0x00000013,0x00000000,0x00000023,0x00000000,0x00050048,0x00000013,0x00000001,
>+	0x00000023,0x00000008,0x00050048,0x00000013,0x00000002,0x00000023,0x00000010,0x00050048,
>+	0x00000013,0x00000003,0x00000023,0x00000014,0x00050048,0x00000013,0x00000004,0x00000023,
>+	0x00000018,0x00050048,0x00000013,0x00000005,0x00000023,0x0000001c,0x00050048,0x00000013,
>+	0x00000006,0x00000023,0x00000020,0x00050048,0x00000013,0x00000007,0x00000023,0x00000024,
>+	0x00050048,0x00000013,0x00000008,0x00000023,0x00000028,0x00050048,0x00000013,0x00000009,
>+	0x00000023,0x0000002c,0x00030047,0x00000013,0x00000002,0x00040047,0x00000031,0x00000022,
>+	0x00000000,0x00040047,0x00000031,0x00000021,0x00000000,0x00040047,0x0000009c,0x0000001e,
>+	0x00000000,0x00020013,0x00000002,0x00030021,0x00000003,0x00000002,0x00040015,0x00000006,
>+	0x00000020,0x00000001,0x00040017,0x00000007,0x00000006,0x00000002,0x00040020,0x00000008,
>+	0x00000007,0x00000007,0x00030016,0x0000000a,0x00000020,0x00040017,0x0000000b,0x0000000a,
>+	0x00000004,0x00040020,0x0000000c,0x00000001,0x0000000b,0x0004003b,0x0000000c,0x0000000d,
>+	0x00000001,0x00040017,0x0000000e,0x0000000a,0x00000002,0x00040015,0x00000012,0x00000020,
>+	0x00000000,0x000c001e,0x00000013,0x00000007,0x00000007,0x00000006,0x00000006,0x00000012,
>+	0x00000012,0x00000012,0x00000012,0x00000012,0x00000006,0x00040020,0x00000014,0x00000009,
>+	0x00000013,0x0004003b,0x00000014,0x00000015,0x00000009,0x0004002b,0x00000006,0x00000016,
>+	0x00000001,0x00040020,0x00000017,0x00000009,0x00000007,0x0004002b,0x00000006,0x0000001d,
>+	0x00000004,0x00040020,0x0000001e,0x00000009,0x00000012,0x00020014,0x00000021,0x0004002b,
>+	0x00000012,0x00000022,0x00000000,0x0004002b,0x00000012,0x00000026,0x00000001,0x00040020,
>+	0x00000027,0x00000007,0x00000006,0x00040017,0x0000002c,0x00000006,0x00000004,0x00040020,
>+	0x0000002d,0x00000007,0x0000002c,0x00090019,0x0000002f,0x00000006,0x00000001,0x00000000,
>+	0x00000001,0x00000000,0x00000001,0x00000000,0x00040020,0x00000030,0x00000000,0x0000002f,
>+	0x0004003b,0x00000030,0x00000031,0x00000000,0x0004002b,0x00000006,0x00000033,0x00000000,
>+	0x0004002b,0x00000006,0x00000038,0x00000003,0x00040020,0x00000039,0x00000009,0x00000006,
>+	0x00040017,0x0000003c,0x00000006,0x00000003,0x0004002b,0x00000006,0x00000040,0x00000002,
>+	0x0004002b,0x00000006,0x00000044,0x00000005,0x0004002b,0x00000012,0x0000004a,0x00000003,
>+	0x0004002b,0x00000006,0x00000054,0x00000006,0x00040017,0x00000068,0x00000012,0x00000004,
>+	0x00040020,0x00000069,0x00000007,0x00000068,0x0004002b,0x00000006,0x0000006d,0x00000007,
>+	0x00040017,0x00000073,0x00000012,0x00000002,0x0004002b,0x00000006,0x00000079,0x00000008,
>+	0x00040020,0x0000007f,0x00000007,0x00000012,0x0004002b,0x00000006,0x00000085,0x00000009,
>+	0x0004002b,0x00000012,0x00000093,0x00000002,0x00040020,0x0000009b,0x00000003,0x00000068,
>+	0x0004003b,0x0000009b,0x0000009c,0x00000003,0x00050036,0x00000002,0x00000004,0x00000000,
>+	0x00000003,0x000200f8,0x00000005,0x0004003b,0x00000008,0x00000009,0x00000007,0x0004003b,
>+	0x00000008,0x0000001b,0x00000007,0x0004003b,0x0000002d,0x0000002e,0x00000007,0x0004003b,
>+	0x00000069,0x0000006a,0x00000007,0x0004003b,0x00000027,0x00000084,0x00000007,0x0004003d,
>+	0x0000000b,0x0000000f,0x0000000d,0x0007004f,0x0000000e,0x00000010,0x0000000f,0x0000000f,
>+	0x00000000,0x00000001,0x0004006e,0x00000007,0x00000011,0x00000010,0x00050041,0x00000017,
>+	0x00000018,0x00000015,0x00000016,0x0004003d,0x00000007,0x00000019,0x00000018,0x00050082,
>+	0x00000007,0x0000001a,0x00000011,0x00000019,0x0003003e,0x00000009,0x0000001a,0x0004003d,
>+	0x00000007,0x0000001c,0x00000009,0x0003003e,0x0000001b,0x0000001c,0x00050041,0x0000001e,
>+	0x0000001f,0x00000015,0x0000001d,0x0004003d,0x00000012,0x00000020,0x0000001f,0x000500ab,
>+	0x00000021,0x00000023,0x00000020,0x00000022,0x000300f7,0x00000025,0x00000000,0x000400fa,
>+	0x00000023,0x00000024,0x00000025,0x000200f8,0x00000024,0x00050041,0x00000027,0x00000028,
>+	0x0000001b,0x00000026,0x0004003d,0x00000006,0x00000029,0x00000028,0x0004007e,0x00000006,
>+	0x0000002a,0x00000029,0x00050041,0x00000027,0x0000002b,0x0000001b,0x00000026,0x0003003e,
>+	0x0000002b,0x0000002a,0x000200f9,0x00000025,0x000200f8,0x00000025,0x0004003d,0x0000002f,
>+	0x00000032,0x00000031,0x00050041,0x00000017,0x00000034,0x00000015,0x00000033,0x0004003d,
>+	0x00000007,0x00000035,0x00000034,0x0004003d,0x00000007,0x00000036,0x0000001b,0x00050080,
>+	0x00000007,0x00000037,0x00000035,0x00000036,0x00050041,0x00000039,0x0000003a,0x00000015,
>+	0x00000038,0x0004003d,0x00000006,0x0000003b,0x0000003a,0x00050051,0x00000006,0x0000003d,
>+	0x00000037,0x00000000,0x00050051,0x00000006,0x0000003e,0x00000037,0x00000001,0x00060050,
>+	0x0000003c,0x0000003f,0x0000003d,0x0000003e,0x0000003b,0x00050041,0x00000039,0x00000041,
>+	0x00000015,0x00000040,0x0004003d,0x00000006,0x00000042,0x00000041,0x0007005f,0x0000002c,
>+	0x00000043,0x00000032,0x0000003f,0x00000002,0x00000042,0x0003003e,0x0000002e,0x00000043,
>+	0x00050041,0x0000001e,0x00000045,0x00000015,0x00000044,0x0004003d,0x00000012,0x00000046,
>+	0x00000045,0x000500ab,0x00000021,0x00000047,0x00000046,0x00000022,0x000300f7,0x00000049,
>+	0x00000000,0x000400fa,0x00000047,0x00000048,0x00000053,0x000200f8,0x00000048,0x00050041,
>+	0x00000027,0x0000004b,0x0000002e,0x0000004a,0x0004003d,0x00000006,0x0000004c,0x0000004b,
>+	0x0004003d,0x0000002c,0x0000004d,0x0000002e,0x0008004f,0x0000003c,0x0000004e,0x0000004d,
>+	0x0000004d,0x00000000,0x00000001,0x00000002,0x00060050,0x0000003c,0x0000004f,0x0000004c,
>+	0x0000004c,0x0000004c,0x00050084,0x0000003c,0x00000050,0x0000004e,0x0000004f,0x0004003d,
>+	0x0000002c,0x00000051,0x0000002e,0x0009004f,0x0000002c,0x00000052,0x00000051,0x00000050,
>+	0x00000004,0x00000005,0x00000006,0x00000003,0x0003003e,0x0000002e,0x00000052,0x000200f9,
>+	0x00000049,0x000200f8,0x00000053,0x00050041,0x0000001e,0x00000055,0x00000015,0x00000054,
>+	0x0004003d,0x00000012,0x00000056,0x00000055,0x000500ab,0x00000021,0x00000057,0x00000056,
>+	0x00000022,0x000300f7,0x00000059,0x00000000,0x000400fa,0x00000057,0x00000058,0x00000059,
>+	0x000200f8,0x00000058,0x00050041,0x00000027,0x0000005a,0x0000002e,0x0000004a,0x0004003d,
>+	0x00000006,0x0000005b,0x0000005a,0x000500ad,0x00000021,0x0000005c,0x0000005b,0x00000033,
>+	0x000200f9,0x00000059,0x000200f8,0x00000059,0x000700f5,0x00000021,0x0000005d,0x00000057,
>+	0x00000053,0x0000005c,0x00000058,0x000300f7,0x0000005f,0x00000000,0x000400fa,0x0000005d,
>+	0x0000005e,0x0000005f,0x000200f8,0x0000005e,0x00050041,0x00000027,0x00000060,0x0000002e,
>+	0x0000004a,0x0004003d,0x00000006,0x00000061,0x00000060,0x0004003d,0x0000002c,0x00000062,
>+	0x0000002e,0x0008004f,0x0000003c,0x00000063,0x00000062,0x00000062,0x00000000,0x00000001,
>+	0x00000002,0x00060050,0x0000003c,0x00000064,0x00000061,0x00000061,0x00000061,0x00050087,
>+	0x0000003c,0x00000065,0x00000063,0x00000064,0x0004003d,0x0000002c,0x00000066,0x0000002e,
>+	0x0009004f,0x0000002c,0x00000067,0x00000066,0x00000065,0x00000004,0x00000005,0x00000006,
>+	0x00000003,0x0003003e,0x0000002e,0x00000067,0x000200f9,0x0000005f,0x000200f8,0x0000005f,
>+	0x000200f9,0x00000049,0x000200f8,0x00000049,0x0004003d,0x0000002c,0x0000006b,0x0000002e,
>+	0x0004007c,0x00000068,0x0000006c,0x0000006b,0x0003003e,0x0000006a,0x0000006c,0x00050041,
>+	0x0000001e,0x0000006e,0x00000015,0x0000006d,0x0004003d,0x00000012,0x0000006f,0x0000006e,
>+	0x000500ab,0x00000021,0x00000070,0x0000006f,0x00000022,0x000300f7,0x00000072,0x00000000,
>+	0x000400fa,0x00000070,0x00000071,0x00000078,0x000200f8,0x00000071,0x0004003d,0x00000068,
>+	0x00000074,0x0000006a,0x0007004f,0x00000073,0x00000075,0x00000074,0x00000074,0x00000000,
>+	0x00000003,0x0004003d,0x00000068,0x00000076,0x0000006a,0x0009004f,0x00000068,0x00000077,
>+	0x00000076,0x00000075,0x00000004,0x00000005,0x00000002,0x00000003,0x0003003e,0x0000006a,
>+	0x00000077,0x000200f9,0x00000072,0x000200f8,0x00000078,0x00050041,0x0000001e,0x0000007a,
>+	0x00000015,0x00000079,0x0004003d,0x00000012,0x0000007b,0x0000007a,0x000500ab,0x00000021,
>+	0x0000007c,0x0000007b,0x00000022,0x000300f7,0x0000007e,0x00000000,0x000400fa,0x0000007c,
>+	0x0000007d,0x00000083,0x000200f8,0x0000007d,0x00050041,0x0000007f,0x00000080,0x0000006a,
>+	0x0000004a,0x0004003d,0x00000012,0x00000081,0x00000080,0x00050041,0x0000007f,0x00000082,
>+	0x0000006a,0x00000022,0x0003003e,0x00000082,0x00000081,0x000200f9,0x0000007e,0x000200f8,
>+	0x00000083,0x00050041,0x00000039,0x00000086,0x00000015,0x00000085,0x0004003d,0x00000006,
>+	0x00000087,0x00000086,0x0003003e,0x00000084,0x00000087,0x0004003d,0x00000006,0x00000088,
>+	0x00000084,0x000500c7,0x00000006,0x00000089,0x00000088,0x00000040,0x000500ab,0x00000021,
>+	0x0000008a,0x00000089,0x00000033,0x000300f7,0x0000008c,0x00000000,0x000400fa,0x0000008a,
>+	0x0000008b,0x0000008c,0x000200f8,0x0000008b,0x00050041,0x0000007f,0x0000008d,0x0000006a,
>+	0x00000026,0x0003003e,0x0000008d,0x00000022,0x000200f9,0x0000008c,0x000200f8,0x0000008c,
>+	0x0004003d,0x00000006,0x0000008e,0x00000084,0x000500c7,0x00000006,0x0000008f,0x0000008e,
>+	0x0000001d,0x000500ab,0x00000021,0x00000090,0x0000008f,0x00000033,0x000300f7,0x00000092,
>+	0x00000000,0x000400fa,0x00000090,0x00000091,0x00000092,0x000200f8,0x00000091,0x00050041,
>+	0x0000007f,0x00000094,0x0000006a,0x00000093,0x0003003e,0x00000094,0x00000022,0x000200f9,
>+	0x00000092,0x000200f8,0x00000092,0x0004003d,0x00000006,0x00000095,0x00000084,0x000500c7,
>+	0x00000006,0x00000096,0x00000095,0x00000079,0x000500ab,0x00000021,0x00000097,0x00000096,
>+	0x00000033,0x000300f7,0x00000099,0x00000000,0x000400fa,0x00000097,0x00000098,0x00000099,
>+	0x000200f8,0x00000098,0x00050041,0x0000007f,0x0000009a,0x0000006a,0x0000004a,0x0003003e,
>+	0x0000009a,0x00000026,0x000200f9,0x00000099,0x000200f8,0x00000099,0x000200f9,0x0000007e,
>+	0x000200f8,0x0000007e,0x000200f9,0x00000072,0x000200f8,0x00000072,0x0004003d,0x00000068,
>+	0x0000009d,0x0000006a,0x0003003e,0x0000009c,0x0000009d,0x000100fd,0x00010038
>+};
>+
>+#if 0  // Generated from:
>+#version 450 core
>+
>+#extension GL_EXT_samplerless_texture_functions : require
>+
>+layout(set = 0, binding = 0)uniform itexture2DArray src;
>+layout(location = 0)out uvec4 dest;
>+
>+layout(push_constant)uniform PushConstants {
>+
>+    ivec2 srcOffset;
>+    ivec2 destOffset;
>+    int srcMip;
>+    int srcLayer;
>+
>+    bool flipY;
>+
>+    bool premultiplyAlpha;
>+    bool unmultiplyAlpha;
>+
>+    bool destHasLuminance;
>+    bool destIsAlpha;
>+
>+    int destDefaultChannelsMask;
>+} params;
>+
>+void main()
>+{
>+    ivec2 destSubImageCoords = ivec2(gl_FragCoord . xy)- params . destOffset;
>+
>+    ivec2 srcSubImageCoords = destSubImageCoords;
>+
>+    if(params . flipY)
>+        srcSubImageCoords . y = - srcSubImageCoords . y;
>+
>+          ivec4 srcValue = texelFetch(src, ivec3(params . srcOffset + srcSubImageCoords, params . srcLayer), params . srcMip);
>+
>+    if(params . premultiplyAlpha)
>+    {
>+        srcValue . rgb *= srcValue . a;
>+    }
>+    else if(params . unmultiplyAlpha && srcValue . a > 0)
>+    {
>+        srcValue . rgb /= srcValue . a;
>+    }
>+
>+           uvec4 destValue = uvec4(srcValue);
>+
>+    if(params . destHasLuminance)
>+    {
>+        destValue . rg = destValue . ra;
>+    }
>+    else if(params . destIsAlpha)
>+    {
>+        destValue . r = destValue . a;
>+    }
>+    else
>+    {
>+        int defaultChannelsMask = params . destDefaultChannelsMask;
>+        if((defaultChannelsMask & 2)!= 0)
>+        {
>+            destValue . g = 0;
>+        }
>+        if((defaultChannelsMask & 4)!= 0)
>+        {
>+            destValue . b = 0;
>+        }
>+        if((defaultChannelsMask & 8)!= 0)
>+        {
>+            destValue . a = 1;
>+        }
>+    }
>+
>+    dest = destValue;
>+}
>+#endif  // Preprocessed code
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000014.inc b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000014.inc
>new file mode 100644
>index 00000000000..3f2e0fb8a12
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000014.inc
>@@ -0,0 +1,209 @@
>+	// 7.11.3188
>+	 #pragma once
>+const uint32_t kImageCopy_frag_00000014[] = {
>+	0x07230203,0x00010000,0x00080007,0x0000009a,0x00000000,0x00020011,0x00000001,0x0006000b,
>+	0x00000001,0x4c534c47,0x6474732e,0x3035342e,0x00000000,0x0003000e,0x00000000,0x00000001,
>+	0x0007000f,0x00000004,0x00000004,0x6e69616d,0x00000000,0x0000000d,0x00000098,0x00030010,
>+	0x00000004,0x00000007,0x00030003,0x00000002,0x000001c2,0x000b0004,0x455f4c47,0x735f5458,
>+	0x6c706d61,0x656c7265,0x745f7373,0x75747865,0x665f6572,0x74636e75,0x736e6f69,0x00000000,
>+	0x00040005,0x00000004,0x6e69616d,0x00000000,0x00070005,0x00000009,0x74736564,0x49627553,
>+	0x6567616d,0x726f6f43,0x00007364,0x00060005,0x0000000d,0x465f6c67,0x43676172,0x64726f6f,
>+	0x00000000,0x00060005,0x00000013,0x68737550,0x736e6f43,0x746e6174,0x00000073,0x00060006,
>+	0x00000013,0x00000000,0x4f637273,0x65736666,0x00000074,0x00060006,0x00000013,0x00000001,
>+	0x74736564,0x7366664f,0x00007465,0x00050006,0x00000013,0x00000002,0x4d637273,0x00007069,
>+	0x00060006,0x00000013,0x00000003,0x4c637273,0x72657961,0x00000000,0x00050006,0x00000013,
>+	0x00000004,0x70696c66,0x00000059,0x00080006,0x00000013,0x00000005,0x6d657270,0x69746c75,
>+	0x41796c70,0x6168706c,0x00000000,0x00070006,0x00000013,0x00000006,0x756d6e75,0x7069746c,
>+	0x6c41796c,0x00616870,0x00080006,0x00000013,0x00000007,0x74736564,0x4c736148,0x6e696d75,
>+	0x65636e61,0x00000000,0x00060006,0x00000013,0x00000008,0x74736564,0x6c417349,0x00616870,
>+	0x00090006,0x00000013,0x00000009,0x74736564,0x61666544,0x43746c75,0x6e6e6168,0x4d736c65,
>+	0x006b7361,0x00040005,0x00000015,0x61726170,0x0000736d,0x00070005,0x0000001b,0x53637273,
>+	0x6d496275,0x43656761,0x64726f6f,0x00000073,0x00050005,0x0000002e,0x56637273,0x65756c61,
>+	0x00000000,0x00030005,0x00000031,0x00637273,0x00050005,0x00000063,0x74736564,0x756c6156,
>+	0x00000065,0x00070005,0x00000080,0x61666564,0x43746c75,0x6e6e6168,0x4d736c65,0x006b7361,
>+	0x00040005,0x00000098,0x74736564,0x00000000,0x00040047,0x0000000d,0x0000000b,0x0000000f,
>+	0x00050048,0x00000013,0x00000000,0x00000023,0x00000000,0x00050048,0x00000013,0x00000001,
>+	0x00000023,0x00000008,0x00050048,0x00000013,0x00000002,0x00000023,0x00000010,0x00050048,
>+	0x00000013,0x00000003,0x00000023,0x00000014,0x00050048,0x00000013,0x00000004,0x00000023,
>+	0x00000018,0x00050048,0x00000013,0x00000005,0x00000023,0x0000001c,0x00050048,0x00000013,
>+	0x00000006,0x00000023,0x00000020,0x00050048,0x00000013,0x00000007,0x00000023,0x00000024,
>+	0x00050048,0x00000013,0x00000008,0x00000023,0x00000028,0x00050048,0x00000013,0x00000009,
>+	0x00000023,0x0000002c,0x00030047,0x00000013,0x00000002,0x00040047,0x00000031,0x00000022,
>+	0x00000000,0x00040047,0x00000031,0x00000021,0x00000000,0x00040047,0x00000098,0x0000001e,
>+	0x00000000,0x00020013,0x00000002,0x00030021,0x00000003,0x00000002,0x00040015,0x00000006,
>+	0x00000020,0x00000001,0x00040017,0x00000007,0x00000006,0x00000002,0x00040020,0x00000008,
>+	0x00000007,0x00000007,0x00030016,0x0000000a,0x00000020,0x00040017,0x0000000b,0x0000000a,
>+	0x00000004,0x00040020,0x0000000c,0x00000001,0x0000000b,0x0004003b,0x0000000c,0x0000000d,
>+	0x00000001,0x00040017,0x0000000e,0x0000000a,0x00000002,0x00040015,0x00000012,0x00000020,
>+	0x00000000,0x000c001e,0x00000013,0x00000007,0x00000007,0x00000006,0x00000006,0x00000012,
>+	0x00000012,0x00000012,0x00000012,0x00000012,0x00000006,0x00040020,0x00000014,0x00000009,
>+	0x00000013,0x0004003b,0x00000014,0x00000015,0x00000009,0x0004002b,0x00000006,0x00000016,
>+	0x00000001,0x00040020,0x00000017,0x00000009,0x00000007,0x0004002b,0x00000006,0x0000001d,
>+	0x00000004,0x00040020,0x0000001e,0x00000009,0x00000012,0x00020014,0x00000021,0x0004002b,
>+	0x00000012,0x00000022,0x00000000,0x0004002b,0x00000012,0x00000026,0x00000001,0x00040020,
>+	0x00000027,0x00000007,0x00000006,0x00040017,0x0000002c,0x00000012,0x00000004,0x00040020,
>+	0x0000002d,0x00000007,0x0000002c,0x00090019,0x0000002f,0x00000012,0x00000001,0x00000000,
>+	0x00000000,0x00000000,0x00000001,0x00000000,0x00040020,0x00000030,0x00000000,0x0000002f,
>+	0x0004003b,0x00000030,0x00000031,0x00000000,0x0004002b,0x00000006,0x00000033,0x00000000,
>+	0x0004002b,0x00000006,0x00000038,0x00000002,0x00040020,0x00000039,0x00000009,0x00000006,
>+	0x0004002b,0x00000006,0x0000003d,0x00000005,0x0004002b,0x00000012,0x00000043,0x00000003,
>+	0x00040020,0x00000044,0x00000007,0x00000012,0x00040017,0x00000047,0x00000012,0x00000003,
>+	0x0004002b,0x00000006,0x0000004f,0x00000006,0x0004002b,0x00000006,0x0000006a,0x00000007,
>+	0x00040017,0x00000070,0x00000012,0x00000002,0x0004002b,0x00000006,0x00000076,0x00000008,
>+	0x0004002b,0x00000006,0x00000081,0x00000009,0x0004002b,0x00000012,0x0000008f,0x00000002,
>+	0x00040020,0x00000097,0x00000003,0x0000002c,0x0004003b,0x00000097,0x00000098,0x00000003,
>+	0x00050036,0x00000002,0x00000004,0x00000000,0x00000003,0x000200f8,0x00000005,0x0004003b,
>+	0x00000008,0x00000009,0x00000007,0x0004003b,0x00000008,0x0000001b,0x00000007,0x0004003b,
>+	0x0000002d,0x0000002e,0x00000007,0x0004003b,0x0000002d,0x00000063,0x00000007,0x0004003b,
>+	0x00000027,0x00000080,0x00000007,0x0004003d,0x0000000b,0x0000000f,0x0000000d,0x0007004f,
>+	0x0000000e,0x00000010,0x0000000f,0x0000000f,0x00000000,0x00000001,0x0004006e,0x00000007,
>+	0x00000011,0x00000010,0x00050041,0x00000017,0x00000018,0x00000015,0x00000016,0x0004003d,
>+	0x00000007,0x00000019,0x00000018,0x00050082,0x00000007,0x0000001a,0x00000011,0x00000019,
>+	0x0003003e,0x00000009,0x0000001a,0x0004003d,0x00000007,0x0000001c,0x00000009,0x0003003e,
>+	0x0000001b,0x0000001c,0x00050041,0x0000001e,0x0000001f,0x00000015,0x0000001d,0x0004003d,
>+	0x00000012,0x00000020,0x0000001f,0x000500ab,0x00000021,0x00000023,0x00000020,0x00000022,
>+	0x000300f7,0x00000025,0x00000000,0x000400fa,0x00000023,0x00000024,0x00000025,0x000200f8,
>+	0x00000024,0x00050041,0x00000027,0x00000028,0x0000001b,0x00000026,0x0004003d,0x00000006,
>+	0x00000029,0x00000028,0x0004007e,0x00000006,0x0000002a,0x00000029,0x00050041,0x00000027,
>+	0x0000002b,0x0000001b,0x00000026,0x0003003e,0x0000002b,0x0000002a,0x000200f9,0x00000025,
>+	0x000200f8,0x00000025,0x0004003d,0x0000002f,0x00000032,0x00000031,0x00050041,0x00000017,
>+	0x00000034,0x00000015,0x00000033,0x0004003d,0x00000007,0x00000035,0x00000034,0x0004003d,
>+	0x00000007,0x00000036,0x0000001b,0x00050080,0x00000007,0x00000037,0x00000035,0x00000036,
>+	0x00050041,0x00000039,0x0000003a,0x00000015,0x00000038,0x0004003d,0x00000006,0x0000003b,
>+	0x0000003a,0x0007005f,0x0000002c,0x0000003c,0x00000032,0x00000037,0x00000002,0x0000003b,
>+	0x0003003e,0x0000002e,0x0000003c,0x00050041,0x0000001e,0x0000003e,0x00000015,0x0000003d,
>+	0x0004003d,0x00000012,0x0000003f,0x0000003e,0x000500ab,0x00000021,0x00000040,0x0000003f,
>+	0x00000022,0x000300f7,0x00000042,0x00000000,0x000400fa,0x00000040,0x00000041,0x0000004e,
>+	0x000200f8,0x00000041,0x00050041,0x00000044,0x00000045,0x0000002e,0x00000043,0x0004003d,
>+	0x00000012,0x00000046,0x00000045,0x0004003d,0x0000002c,0x00000048,0x0000002e,0x0008004f,
>+	0x00000047,0x00000049,0x00000048,0x00000048,0x00000000,0x00000001,0x00000002,0x00060050,
>+	0x00000047,0x0000004a,0x00000046,0x00000046,0x00000046,0x00050084,0x00000047,0x0000004b,
>+	0x00000049,0x0000004a,0x0004003d,0x0000002c,0x0000004c,0x0000002e,0x0009004f,0x0000002c,
>+	0x0000004d,0x0000004c,0x0000004b,0x00000004,0x00000005,0x00000006,0x00000003,0x0003003e,
>+	0x0000002e,0x0000004d,0x000200f9,0x00000042,0x000200f8,0x0000004e,0x00050041,0x0000001e,
>+	0x00000050,0x00000015,0x0000004f,0x0004003d,0x00000012,0x00000051,0x00000050,0x000500ab,
>+	0x00000021,0x00000052,0x00000051,0x00000022,0x000300f7,0x00000054,0x00000000,0x000400fa,
>+	0x00000052,0x00000053,0x00000054,0x000200f8,0x00000053,0x00050041,0x00000044,0x00000055,
>+	0x0000002e,0x00000043,0x0004003d,0x00000012,0x00000056,0x00000055,0x000500ac,0x00000021,
>+	0x00000057,0x00000056,0x00000022,0x000200f9,0x00000054,0x000200f8,0x00000054,0x000700f5,
>+	0x00000021,0x00000058,0x00000052,0x0000004e,0x00000057,0x00000053,0x000300f7,0x0000005a,
>+	0x00000000,0x000400fa,0x00000058,0x00000059,0x0000005a,0x000200f8,0x00000059,0x00050041,
>+	0x00000044,0x0000005b,0x0000002e,0x00000043,0x0004003d,0x00000012,0x0000005c,0x0000005b,
>+	0x0004003d,0x0000002c,0x0000005d,0x0000002e,0x0008004f,0x00000047,0x0000005e,0x0000005d,
>+	0x0000005d,0x00000000,0x00000001,0x00000002,0x00060050,0x00000047,0x0000005f,0x0000005c,
>+	0x0000005c,0x0000005c,0x00050086,0x00000047,0x00000060,0x0000005e,0x0000005f,0x0004003d,
>+	0x0000002c,0x00000061,0x0000002e,0x0009004f,0x0000002c,0x00000062,0x00000061,0x00000060,
>+	0x00000004,0x00000005,0x00000006,0x00000003,0x0003003e,0x0000002e,0x00000062,0x000200f9,
>+	0x0000005a,0x000200f8,0x0000005a,0x000200f9,0x00000042,0x000200f8,0x00000042,0x0004003d,
>+	0x0000002c,0x00000064,0x0000002e,0x00050051,0x00000012,0x00000065,0x00000064,0x00000000,
>+	0x00050051,0x00000012,0x00000066,0x00000064,0x00000001,0x00050051,0x00000012,0x00000067,
>+	0x00000064,0x00000002,0x00050051,0x00000012,0x00000068,0x00000064,0x00000003,0x00070050,
>+	0x0000002c,0x00000069,0x00000065,0x00000066,0x00000067,0x00000068,0x0003003e,0x00000063,
>+	0x00000069,0x00050041,0x0000001e,0x0000006b,0x00000015,0x0000006a,0x0004003d,0x00000012,
>+	0x0000006c,0x0000006b,0x000500ab,0x00000021,0x0000006d,0x0000006c,0x00000022,0x000300f7,
>+	0x0000006f,0x00000000,0x000400fa,0x0000006d,0x0000006e,0x00000075,0x000200f8,0x0000006e,
>+	0x0004003d,0x0000002c,0x00000071,0x00000063,0x0007004f,0x00000070,0x00000072,0x00000071,
>+	0x00000071,0x00000000,0x00000003,0x0004003d,0x0000002c,0x00000073,0x00000063,0x0009004f,
>+	0x0000002c,0x00000074,0x00000073,0x00000072,0x00000004,0x00000005,0x00000002,0x00000003,
>+	0x0003003e,0x00000063,0x00000074,0x000200f9,0x0000006f,0x000200f8,0x00000075,0x00050041,
>+	0x0000001e,0x00000077,0x00000015,0x00000076,0x0004003d,0x00000012,0x00000078,0x00000077,
>+	0x000500ab,0x00000021,0x00000079,0x00000078,0x00000022,0x000300f7,0x0000007b,0x00000000,
>+	0x000400fa,0x00000079,0x0000007a,0x0000007f,0x000200f8,0x0000007a,0x00050041,0x00000044,
>+	0x0000007c,0x00000063,0x00000043,0x0004003d,0x00000012,0x0000007d,0x0000007c,0x00050041,
>+	0x00000044,0x0000007e,0x00000063,0x00000022,0x0003003e,0x0000007e,0x0000007d,0x000200f9,
>+	0x0000007b,0x000200f8,0x0000007f,0x00050041,0x00000039,0x00000082,0x00000015,0x00000081,
>+	0x0004003d,0x00000006,0x00000083,0x00000082,0x0003003e,0x00000080,0x00000083,0x0004003d,
>+	0x00000006,0x00000084,0x00000080,0x000500c7,0x00000006,0x00000085,0x00000084,0x00000038,
>+	0x000500ab,0x00000021,0x00000086,0x00000085,0x00000033,0x000300f7,0x00000088,0x00000000,
>+	0x000400fa,0x00000086,0x00000087,0x00000088,0x000200f8,0x00000087,0x00050041,0x00000044,
>+	0x00000089,0x00000063,0x00000026,0x0003003e,0x00000089,0x00000022,0x000200f9,0x00000088,
>+	0x000200f8,0x00000088,0x0004003d,0x00000006,0x0000008a,0x00000080,0x000500c7,0x00000006,
>+	0x0000008b,0x0000008a,0x0000001d,0x000500ab,0x00000021,0x0000008c,0x0000008b,0x00000033,
>+	0x000300f7,0x0000008e,0x00000000,0x000400fa,0x0000008c,0x0000008d,0x0000008e,0x000200f8,
>+	0x0000008d,0x00050041,0x00000044,0x00000090,0x00000063,0x0000008f,0x0003003e,0x00000090,
>+	0x00000022,0x000200f9,0x0000008e,0x000200f8,0x0000008e,0x0004003d,0x00000006,0x00000091,
>+	0x00000080,0x000500c7,0x00000006,0x00000092,0x00000091,0x00000076,0x000500ab,0x00000021,
>+	0x00000093,0x00000092,0x00000033,0x000300f7,0x00000095,0x00000000,0x000400fa,0x00000093,
>+	0x00000094,0x00000095,0x000200f8,0x00000094,0x00050041,0x00000044,0x00000096,0x00000063,
>+	0x00000043,0x0003003e,0x00000096,0x00000026,0x000200f9,0x00000095,0x000200f8,0x00000095,
>+	0x000200f9,0x0000007b,0x000200f8,0x0000007b,0x000200f9,0x0000006f,0x000200f8,0x0000006f,
>+	0x0004003d,0x0000002c,0x00000099,0x00000063,0x0003003e,0x00000098,0x00000099,0x000100fd,
>+	0x00010038
>+};
>+
>+#if 0  // Generated from:
>+#version 450 core
>+
>+#extension GL_EXT_samplerless_texture_functions : require
>+
>+layout(set = 0, binding = 0)uniform utexture2D src;
>+layout(location = 0)out uvec4 dest;
>+
>+layout(push_constant)uniform PushConstants {
>+
>+    ivec2 srcOffset;
>+    ivec2 destOffset;
>+    int srcMip;
>+    int srcLayer;
>+
>+    bool flipY;
>+
>+    bool premultiplyAlpha;
>+    bool unmultiplyAlpha;
>+
>+    bool destHasLuminance;
>+    bool destIsAlpha;
>+
>+    int destDefaultChannelsMask;
>+} params;
>+
>+void main()
>+{
>+    ivec2 destSubImageCoords = ivec2(gl_FragCoord . xy)- params . destOffset;
>+
>+    ivec2 srcSubImageCoords = destSubImageCoords;
>+
>+    if(params . flipY)
>+        srcSubImageCoords . y = - srcSubImageCoords . y;
>+
>+          uvec4 srcValue = texelFetch(src, params . srcOffset + srcSubImageCoords, params . srcMip);
>+
>+    if(params . premultiplyAlpha)
>+    {
>+        srcValue . rgb *= srcValue . a;
>+    }
>+    else if(params . unmultiplyAlpha && srcValue . a > 0)
>+    {
>+        srcValue . rgb /= srcValue . a;
>+    }
>+
>+           uvec4 destValue = uvec4(srcValue);
>+
>+    if(params . destHasLuminance)
>+    {
>+        destValue . rg = destValue . ra;
>+    }
>+    else if(params . destIsAlpha)
>+    {
>+        destValue . r = destValue . a;
>+    }
>+    else
>+    {
>+        int defaultChannelsMask = params . destDefaultChannelsMask;
>+        if((defaultChannelsMask & 2)!= 0)
>+        {
>+            destValue . g = 0;
>+        }
>+        if((defaultChannelsMask & 4)!= 0)
>+        {
>+            destValue . b = 0;
>+        }
>+        if((defaultChannelsMask & 8)!= 0)
>+        {
>+            destValue . a = 1;
>+        }
>+    }
>+
>+    dest = destValue;
>+}
>+#endif  // Preprocessed code
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000015.inc b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000015.inc
>new file mode 100644
>index 00000000000..0ff3b118b84
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000015.inc
>@@ -0,0 +1,213 @@
>+	// 7.11.3188
>+	 #pragma once
>+const uint32_t kImageCopy_frag_00000015[] = {
>+	0x07230203,0x00010000,0x00080007,0x000000a1,0x00000000,0x00020011,0x00000001,0x0006000b,
>+	0x00000001,0x4c534c47,0x6474732e,0x3035342e,0x00000000,0x0003000e,0x00000000,0x00000001,
>+	0x0007000f,0x00000004,0x00000004,0x6e69616d,0x00000000,0x0000000d,0x0000009f,0x00030010,
>+	0x00000004,0x00000007,0x00030003,0x00000002,0x000001c2,0x000b0004,0x455f4c47,0x735f5458,
>+	0x6c706d61,0x656c7265,0x745f7373,0x75747865,0x665f6572,0x74636e75,0x736e6f69,0x00000000,
>+	0x00040005,0x00000004,0x6e69616d,0x00000000,0x00070005,0x00000009,0x74736564,0x49627553,
>+	0x6567616d,0x726f6f43,0x00007364,0x00060005,0x0000000d,0x465f6c67,0x43676172,0x64726f6f,
>+	0x00000000,0x00060005,0x00000013,0x68737550,0x736e6f43,0x746e6174,0x00000073,0x00060006,
>+	0x00000013,0x00000000,0x4f637273,0x65736666,0x00000074,0x00060006,0x00000013,0x00000001,
>+	0x74736564,0x7366664f,0x00007465,0x00050006,0x00000013,0x00000002,0x4d637273,0x00007069,
>+	0x00060006,0x00000013,0x00000003,0x4c637273,0x72657961,0x00000000,0x00050006,0x00000013,
>+	0x00000004,0x70696c66,0x00000059,0x00080006,0x00000013,0x00000005,0x6d657270,0x69746c75,
>+	0x41796c70,0x6168706c,0x00000000,0x00070006,0x00000013,0x00000006,0x756d6e75,0x7069746c,
>+	0x6c41796c,0x00616870,0x00080006,0x00000013,0x00000007,0x74736564,0x4c736148,0x6e696d75,
>+	0x65636e61,0x00000000,0x00060006,0x00000013,0x00000008,0x74736564,0x6c417349,0x00616870,
>+	0x00090006,0x00000013,0x00000009,0x74736564,0x61666544,0x43746c75,0x6e6e6168,0x4d736c65,
>+	0x006b7361,0x00040005,0x00000015,0x61726170,0x0000736d,0x00070005,0x0000001b,0x53637273,
>+	0x6d496275,0x43656761,0x64726f6f,0x00000073,0x00050005,0x0000002e,0x56637273,0x65756c61,
>+	0x00000000,0x00030005,0x00000031,0x00637273,0x00050005,0x0000006a,0x74736564,0x756c6156,
>+	0x00000065,0x00070005,0x00000087,0x61666564,0x43746c75,0x6e6e6168,0x4d736c65,0x006b7361,
>+	0x00040005,0x0000009f,0x74736564,0x00000000,0x00040047,0x0000000d,0x0000000b,0x0000000f,
>+	0x00050048,0x00000013,0x00000000,0x00000023,0x00000000,0x00050048,0x00000013,0x00000001,
>+	0x00000023,0x00000008,0x00050048,0x00000013,0x00000002,0x00000023,0x00000010,0x00050048,
>+	0x00000013,0x00000003,0x00000023,0x00000014,0x00050048,0x00000013,0x00000004,0x00000023,
>+	0x00000018,0x00050048,0x00000013,0x00000005,0x00000023,0x0000001c,0x00050048,0x00000013,
>+	0x00000006,0x00000023,0x00000020,0x00050048,0x00000013,0x00000007,0x00000023,0x00000024,
>+	0x00050048,0x00000013,0x00000008,0x00000023,0x00000028,0x00050048,0x00000013,0x00000009,
>+	0x00000023,0x0000002c,0x00030047,0x00000013,0x00000002,0x00040047,0x00000031,0x00000022,
>+	0x00000000,0x00040047,0x00000031,0x00000021,0x00000000,0x00040047,0x0000009f,0x0000001e,
>+	0x00000000,0x00020013,0x00000002,0x00030021,0x00000003,0x00000002,0x00040015,0x00000006,
>+	0x00000020,0x00000001,0x00040017,0x00000007,0x00000006,0x00000002,0x00040020,0x00000008,
>+	0x00000007,0x00000007,0x00030016,0x0000000a,0x00000020,0x00040017,0x0000000b,0x0000000a,
>+	0x00000004,0x00040020,0x0000000c,0x00000001,0x0000000b,0x0004003b,0x0000000c,0x0000000d,
>+	0x00000001,0x00040017,0x0000000e,0x0000000a,0x00000002,0x00040015,0x00000012,0x00000020,
>+	0x00000000,0x000c001e,0x00000013,0x00000007,0x00000007,0x00000006,0x00000006,0x00000012,
>+	0x00000012,0x00000012,0x00000012,0x00000012,0x00000006,0x00040020,0x00000014,0x00000009,
>+	0x00000013,0x0004003b,0x00000014,0x00000015,0x00000009,0x0004002b,0x00000006,0x00000016,
>+	0x00000001,0x00040020,0x00000017,0x00000009,0x00000007,0x0004002b,0x00000006,0x0000001d,
>+	0x00000004,0x00040020,0x0000001e,0x00000009,0x00000012,0x00020014,0x00000021,0x0004002b,
>+	0x00000012,0x00000022,0x00000000,0x0004002b,0x00000012,0x00000026,0x00000001,0x00040020,
>+	0x00000027,0x00000007,0x00000006,0x00040017,0x0000002c,0x00000012,0x00000004,0x00040020,
>+	0x0000002d,0x00000007,0x0000002c,0x00090019,0x0000002f,0x00000012,0x00000001,0x00000000,
>+	0x00000001,0x00000000,0x00000001,0x00000000,0x00040020,0x00000030,0x00000000,0x0000002f,
>+	0x0004003b,0x00000030,0x00000031,0x00000000,0x0004002b,0x00000006,0x00000033,0x00000000,
>+	0x0004002b,0x00000006,0x00000038,0x00000003,0x00040020,0x00000039,0x00000009,0x00000006,
>+	0x00040017,0x0000003c,0x00000006,0x00000003,0x0004002b,0x00000006,0x00000040,0x00000002,
>+	0x0004002b,0x00000006,0x00000044,0x00000005,0x0004002b,0x00000012,0x0000004a,0x00000003,
>+	0x00040020,0x0000004b,0x00000007,0x00000012,0x00040017,0x0000004e,0x00000012,0x00000003,
>+	0x0004002b,0x00000006,0x00000056,0x00000006,0x0004002b,0x00000006,0x00000071,0x00000007,
>+	0x00040017,0x00000077,0x00000012,0x00000002,0x0004002b,0x00000006,0x0000007d,0x00000008,
>+	0x0004002b,0x00000006,0x00000088,0x00000009,0x0004002b,0x00000012,0x00000096,0x00000002,
>+	0x00040020,0x0000009e,0x00000003,0x0000002c,0x0004003b,0x0000009e,0x0000009f,0x00000003,
>+	0x00050036,0x00000002,0x00000004,0x00000000,0x00000003,0x000200f8,0x00000005,0x0004003b,
>+	0x00000008,0x00000009,0x00000007,0x0004003b,0x00000008,0x0000001b,0x00000007,0x0004003b,
>+	0x0000002d,0x0000002e,0x00000007,0x0004003b,0x0000002d,0x0000006a,0x00000007,0x0004003b,
>+	0x00000027,0x00000087,0x00000007,0x0004003d,0x0000000b,0x0000000f,0x0000000d,0x0007004f,
>+	0x0000000e,0x00000010,0x0000000f,0x0000000f,0x00000000,0x00000001,0x0004006e,0x00000007,
>+	0x00000011,0x00000010,0x00050041,0x00000017,0x00000018,0x00000015,0x00000016,0x0004003d,
>+	0x00000007,0x00000019,0x00000018,0x00050082,0x00000007,0x0000001a,0x00000011,0x00000019,
>+	0x0003003e,0x00000009,0x0000001a,0x0004003d,0x00000007,0x0000001c,0x00000009,0x0003003e,
>+	0x0000001b,0x0000001c,0x00050041,0x0000001e,0x0000001f,0x00000015,0x0000001d,0x0004003d,
>+	0x00000012,0x00000020,0x0000001f,0x000500ab,0x00000021,0x00000023,0x00000020,0x00000022,
>+	0x000300f7,0x00000025,0x00000000,0x000400fa,0x00000023,0x00000024,0x00000025,0x000200f8,
>+	0x00000024,0x00050041,0x00000027,0x00000028,0x0000001b,0x00000026,0x0004003d,0x00000006,
>+	0x00000029,0x00000028,0x0004007e,0x00000006,0x0000002a,0x00000029,0x00050041,0x00000027,
>+	0x0000002b,0x0000001b,0x00000026,0x0003003e,0x0000002b,0x0000002a,0x000200f9,0x00000025,
>+	0x000200f8,0x00000025,0x0004003d,0x0000002f,0x00000032,0x00000031,0x00050041,0x00000017,
>+	0x00000034,0x00000015,0x00000033,0x0004003d,0x00000007,0x00000035,0x00000034,0x0004003d,
>+	0x00000007,0x00000036,0x0000001b,0x00050080,0x00000007,0x00000037,0x00000035,0x00000036,
>+	0x00050041,0x00000039,0x0000003a,0x00000015,0x00000038,0x0004003d,0x00000006,0x0000003b,
>+	0x0000003a,0x00050051,0x00000006,0x0000003d,0x00000037,0x00000000,0x00050051,0x00000006,
>+	0x0000003e,0x00000037,0x00000001,0x00060050,0x0000003c,0x0000003f,0x0000003d,0x0000003e,
>+	0x0000003b,0x00050041,0x00000039,0x00000041,0x00000015,0x00000040,0x0004003d,0x00000006,
>+	0x00000042,0x00000041,0x0007005f,0x0000002c,0x00000043,0x00000032,0x0000003f,0x00000002,
>+	0x00000042,0x0003003e,0x0000002e,0x00000043,0x00050041,0x0000001e,0x00000045,0x00000015,
>+	0x00000044,0x0004003d,0x00000012,0x00000046,0x00000045,0x000500ab,0x00000021,0x00000047,
>+	0x00000046,0x00000022,0x000300f7,0x00000049,0x00000000,0x000400fa,0x00000047,0x00000048,
>+	0x00000055,0x000200f8,0x00000048,0x00050041,0x0000004b,0x0000004c,0x0000002e,0x0000004a,
>+	0x0004003d,0x00000012,0x0000004d,0x0000004c,0x0004003d,0x0000002c,0x0000004f,0x0000002e,
>+	0x0008004f,0x0000004e,0x00000050,0x0000004f,0x0000004f,0x00000000,0x00000001,0x00000002,
>+	0x00060050,0x0000004e,0x00000051,0x0000004d,0x0000004d,0x0000004d,0x00050084,0x0000004e,
>+	0x00000052,0x00000050,0x00000051,0x0004003d,0x0000002c,0x00000053,0x0000002e,0x0009004f,
>+	0x0000002c,0x00000054,0x00000053,0x00000052,0x00000004,0x00000005,0x00000006,0x00000003,
>+	0x0003003e,0x0000002e,0x00000054,0x000200f9,0x00000049,0x000200f8,0x00000055,0x00050041,
>+	0x0000001e,0x00000057,0x00000015,0x00000056,0x0004003d,0x00000012,0x00000058,0x00000057,
>+	0x000500ab,0x00000021,0x00000059,0x00000058,0x00000022,0x000300f7,0x0000005b,0x00000000,
>+	0x000400fa,0x00000059,0x0000005a,0x0000005b,0x000200f8,0x0000005a,0x00050041,0x0000004b,
>+	0x0000005c,0x0000002e,0x0000004a,0x0004003d,0x00000012,0x0000005d,0x0000005c,0x000500ac,
>+	0x00000021,0x0000005e,0x0000005d,0x00000022,0x000200f9,0x0000005b,0x000200f8,0x0000005b,
>+	0x000700f5,0x00000021,0x0000005f,0x00000059,0x00000055,0x0000005e,0x0000005a,0x000300f7,
>+	0x00000061,0x00000000,0x000400fa,0x0000005f,0x00000060,0x00000061,0x000200f8,0x00000060,
>+	0x00050041,0x0000004b,0x00000062,0x0000002e,0x0000004a,0x0004003d,0x00000012,0x00000063,
>+	0x00000062,0x0004003d,0x0000002c,0x00000064,0x0000002e,0x0008004f,0x0000004e,0x00000065,
>+	0x00000064,0x00000064,0x00000000,0x00000001,0x00000002,0x00060050,0x0000004e,0x00000066,
>+	0x00000063,0x00000063,0x00000063,0x00050086,0x0000004e,0x00000067,0x00000065,0x00000066,
>+	0x0004003d,0x0000002c,0x00000068,0x0000002e,0x0009004f,0x0000002c,0x00000069,0x00000068,
>+	0x00000067,0x00000004,0x00000005,0x00000006,0x00000003,0x0003003e,0x0000002e,0x00000069,
>+	0x000200f9,0x00000061,0x000200f8,0x00000061,0x000200f9,0x00000049,0x000200f8,0x00000049,
>+	0x0004003d,0x0000002c,0x0000006b,0x0000002e,0x00050051,0x00000012,0x0000006c,0x0000006b,
>+	0x00000000,0x00050051,0x00000012,0x0000006d,0x0000006b,0x00000001,0x00050051,0x00000012,
>+	0x0000006e,0x0000006b,0x00000002,0x00050051,0x00000012,0x0000006f,0x0000006b,0x00000003,
>+	0x00070050,0x0000002c,0x00000070,0x0000006c,0x0000006d,0x0000006e,0x0000006f,0x0003003e,
>+	0x0000006a,0x00000070,0x00050041,0x0000001e,0x00000072,0x00000015,0x00000071,0x0004003d,
>+	0x00000012,0x00000073,0x00000072,0x000500ab,0x00000021,0x00000074,0x00000073,0x00000022,
>+	0x000300f7,0x00000076,0x00000000,0x000400fa,0x00000074,0x00000075,0x0000007c,0x000200f8,
>+	0x00000075,0x0004003d,0x0000002c,0x00000078,0x0000006a,0x0007004f,0x00000077,0x00000079,
>+	0x00000078,0x00000078,0x00000000,0x00000003,0x0004003d,0x0000002c,0x0000007a,0x0000006a,
>+	0x0009004f,0x0000002c,0x0000007b,0x0000007a,0x00000079,0x00000004,0x00000005,0x00000002,
>+	0x00000003,0x0003003e,0x0000006a,0x0000007b,0x000200f9,0x00000076,0x000200f8,0x0000007c,
>+	0x00050041,0x0000001e,0x0000007e,0x00000015,0x0000007d,0x0004003d,0x00000012,0x0000007f,
>+	0x0000007e,0x000500ab,0x00000021,0x00000080,0x0000007f,0x00000022,0x000300f7,0x00000082,
>+	0x00000000,0x000400fa,0x00000080,0x00000081,0x00000086,0x000200f8,0x00000081,0x00050041,
>+	0x0000004b,0x00000083,0x0000006a,0x0000004a,0x0004003d,0x00000012,0x00000084,0x00000083,
>+	0x00050041,0x0000004b,0x00000085,0x0000006a,0x00000022,0x0003003e,0x00000085,0x00000084,
>+	0x000200f9,0x00000082,0x000200f8,0x00000086,0x00050041,0x00000039,0x00000089,0x00000015,
>+	0x00000088,0x0004003d,0x00000006,0x0000008a,0x00000089,0x0003003e,0x00000087,0x0000008a,
>+	0x0004003d,0x00000006,0x0000008b,0x00000087,0x000500c7,0x00000006,0x0000008c,0x0000008b,
>+	0x00000040,0x000500ab,0x00000021,0x0000008d,0x0000008c,0x00000033,0x000300f7,0x0000008f,
>+	0x00000000,0x000400fa,0x0000008d,0x0000008e,0x0000008f,0x000200f8,0x0000008e,0x00050041,
>+	0x0000004b,0x00000090,0x0000006a,0x00000026,0x0003003e,0x00000090,0x00000022,0x000200f9,
>+	0x0000008f,0x000200f8,0x0000008f,0x0004003d,0x00000006,0x00000091,0x00000087,0x000500c7,
>+	0x00000006,0x00000092,0x00000091,0x0000001d,0x000500ab,0x00000021,0x00000093,0x00000092,
>+	0x00000033,0x000300f7,0x00000095,0x00000000,0x000400fa,0x00000093,0x00000094,0x00000095,
>+	0x000200f8,0x00000094,0x00050041,0x0000004b,0x00000097,0x0000006a,0x00000096,0x0003003e,
>+	0x00000097,0x00000022,0x000200f9,0x00000095,0x000200f8,0x00000095,0x0004003d,0x00000006,
>+	0x00000098,0x00000087,0x000500c7,0x00000006,0x00000099,0x00000098,0x0000007d,0x000500ab,
>+	0x00000021,0x0000009a,0x00000099,0x00000033,0x000300f7,0x0000009c,0x00000000,0x000400fa,
>+	0x0000009a,0x0000009b,0x0000009c,0x000200f8,0x0000009b,0x00050041,0x0000004b,0x0000009d,
>+	0x0000006a,0x0000004a,0x0003003e,0x0000009d,0x00000026,0x000200f9,0x0000009c,0x000200f8,
>+	0x0000009c,0x000200f9,0x00000082,0x000200f8,0x00000082,0x000200f9,0x00000076,0x000200f8,
>+	0x00000076,0x0004003d,0x0000002c,0x000000a0,0x0000006a,0x0003003e,0x0000009f,0x000000a0,
>+	0x000100fd,0x00010038
>+};
>+
>+#if 0  // Generated from:
>+#version 450 core
>+
>+#extension GL_EXT_samplerless_texture_functions : require
>+
>+layout(set = 0, binding = 0)uniform utexture2DArray src;
>+layout(location = 0)out uvec4 dest;
>+
>+layout(push_constant)uniform PushConstants {
>+
>+    ivec2 srcOffset;
>+    ivec2 destOffset;
>+    int srcMip;
>+    int srcLayer;
>+
>+    bool flipY;
>+
>+    bool premultiplyAlpha;
>+    bool unmultiplyAlpha;
>+
>+    bool destHasLuminance;
>+    bool destIsAlpha;
>+
>+    int destDefaultChannelsMask;
>+} params;
>+
>+void main()
>+{
>+    ivec2 destSubImageCoords = ivec2(gl_FragCoord . xy)- params . destOffset;
>+
>+    ivec2 srcSubImageCoords = destSubImageCoords;
>+
>+    if(params . flipY)
>+        srcSubImageCoords . y = - srcSubImageCoords . y;
>+
>+          uvec4 srcValue = texelFetch(src, ivec3(params . srcOffset + srcSubImageCoords, params . srcLayer), params . srcMip);
>+
>+    if(params . premultiplyAlpha)
>+    {
>+        srcValue . rgb *= srcValue . a;
>+    }
>+    else if(params . unmultiplyAlpha && srcValue . a > 0)
>+    {
>+        srcValue . rgb /= srcValue . a;
>+    }
>+
>+           uvec4 destValue = uvec4(srcValue);
>+
>+    if(params . destHasLuminance)
>+    {
>+        destValue . rg = destValue . ra;
>+    }
>+    else if(params . destIsAlpha)
>+    {
>+        destValue . r = destValue . a;
>+    }
>+    else
>+    {
>+        int defaultChannelsMask = params . destDefaultChannelsMask;
>+        if((defaultChannelsMask & 2)!= 0)
>+        {
>+            destValue . g = 0;
>+        }
>+        if((defaultChannelsMask & 4)!= 0)
>+        {
>+            destValue . b = 0;
>+        }
>+        if((defaultChannelsMask & 8)!= 0)
>+        {
>+            destValue . a = 1;
>+        }
>+    }
>+
>+    dest = destValue;
>+}
>+#endif  // Preprocessed code
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/src/BufferUtils.comp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/src/BufferUtils.comp
>new file mode 100644
>index 00000000000..328b1dff3bc
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/src/BufferUtils.comp
>@@ -0,0 +1,82 @@
>+//
>+// Copyright 2018 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// BufferUtils.comp: various utilities such as clear and copy.
>+//
>+// The following defines tweak the functionality, and a different shader is built based on these.
>+//
>+//   - Flags:
>+//     * IsAligned: if true, assumes the workgroup size divides the buffer size, so there is no
>+//                  need for bound checking
>+//   - Format:
>+//     * IsFloat
>+//     * IsInt
>+//     * IsUint
>+//   - Function:
>+//     * IsClear: the buffer will be cleared
>+//     * IsCopy: a buffer will be copied to another
>+//
>+
>+#version 450 core
>+
>+layout (local_size_x = 64, local_size_y = 1, local_size_z = 1) in;
>+
>+#if IsFloat
>+#define ADD_TYPE_PREFIX(type) type
>+#define BUFFER_FORMAT rgba32f
>+#define GVEC4 vec4
>+#elif IsInt
>+#define ADD_TYPE_PREFIX(type) i ## type
>+#define BUFFER_FORMAT rgba32i
>+#define GVEC4 ivec4
>+#elif IsUint
>+#define ADD_TYPE_PREFIX(type) u ## type
>+#define BUFFER_FORMAT rgba32ui
>+#define GVEC4 uvec4
>+#else
>+#error "Not all formats are accounted for"
>+#endif
>+
>+#define BUFFER_WRITE_TYPE ADD_TYPE_PREFIX(imageBuffer)
>+#define BUFFER_READ_TYPE ADD_TYPE_PREFIX(samplerBuffer)
>+
>+layout (set = 0, binding = 0, BUFFER_FORMAT) uniform writeonly BUFFER_WRITE_TYPE dest;
>+#if IsCopy
>+layout (set = 0, binding = 1) uniform BUFFER_READ_TYPE src;
>+#endif // IsCopy
>+
>+layout (push_constant) uniform PushConstants
>+{
>+    // destOffset: used in all cases
>+    uint destOffset;
>+    // size: used if !IsAligned
>+    uint size;
>+    // srcOffset: used if IsCopy
>+    uint srcOffset;
>+    uint padding;
>+    // clearValue: used if IsClear
>+    GVEC4 clearValue;
>+} params;
>+
>+void main()
>+{
>+#if !IsAligned
>+    if (gl_GlobalInvocationID.x >= params.size)
>+        return;
>+#endif // IsAligned
>+
>+    int destIndex = int(params.destOffset.x + gl_GlobalInvocationID.x);
>+    int srcIndex = int(params.srcOffset.x + gl_GlobalInvocationID.x);
>+
>+#if IsClear
>+    GVEC4 srcValue = params.clearValue;
>+#elif IsCopy
>+    GVEC4 srcValue = texelFetch(src, srcIndex);
>+#else
>+#error "Not all functions are accounted for"
>+#endif // Function
>+
>+    imageStore(dest, destIndex, srcValue);
>+}
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/src/BufferUtils.comp.json b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/src/BufferUtils.comp.json
>new file mode 100644
>index 00000000000..0bf883df026
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/src/BufferUtils.comp.json
>@@ -0,0 +1,22 @@
>+{
>+    "Description": [
>+        "Copyright 2018 The ANGLE Project Authors. All rights reserved.",
>+        "Use of this source code is governed by a BSD-style license that can be",
>+        "found in the LICENSE file.",
>+        "",
>+        "BufferUtils.comp.json: Build parameters for BufferUtils.comp."
>+    ],
>+    "Flags": [
>+        "IsAligned"
>+    ],
>+    "Format": [
>+        "IsFloat",
>+        "IsInt",
>+        "IsUint"
>+    ],
>+    "Function": [
>+        "IsClear",
>+        "IsCopy"
>+    ]
>+}
>+
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/src/ConvertVertex.comp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/src/ConvertVertex.comp
>new file mode 100644
>index 00000000000..4cb52aee7b1
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/src/ConvertVertex.comp
>@@ -0,0 +1,299 @@
>+//
>+// Copyright 2018 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// ConvertVertex.comp: vertex buffer conversion.  Implements functionality in copyvertex.inc.
>+//
>+// Each thread of the dispatch call fills in one 4-byte element, no matter how many components
>+// fit in it.  The src data is laid out in the most general form as follows.  Note that component
>+// size is assumed to divide buffer stride.
>+//
>+//    Ns components, each Bs bytes
>+//         ____^_____
>+//        /          |
>+//       +--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+
>+//       |C1|C2|..|CN|..|..|..|..|C1|C2|..|CN|..|..|..|..|C1|C2|..|CN| ... Repeated V times
>+//       +--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+
>+//        \__________ __________/
>+//                   V
>+//           Ss bytes of stride
>+//
>+// The output is the array of components converted to the destination format (each Bd bytes) with
>+// stride Sd = Nd*Bd (i.e. packed).  The output size is therefore V*Nd*Bd bytes.  The dispatch size
>+// is accordingly ciel(V*Nd*Bd / 4).
>+//
>+// The input is received in 4-byte elements, therefore each element has Es=4/Bs components.
>+//
>+// To output exactly one 4-byte element, each thread is responsible for Ed=4/Bd components.
>+// Therefore, thread t is responsible for component indices [Ed*t, Ed*(t + 1)).
>+//
>+// Component index c is at source offset:
>+//
>+//     floor(c / Ns) * Ss + mod(c, Ns) * Bs
>+//
>+//   - Flags:
>+//     * IsAligned: if true, assumes the workgroup size divides the output count, so there is no
>+//                  need for bound checking.
>+//     * IsBigEndian
>+//   - Conversion:
>+//     * IntToInt: covers byte, short and int types (distinguished by Bs and Bd).
>+//     * UintToUint: covers ubyte, ushort and uint types (distinguished by Bs and Bd).
>+//     * IntToFloat: Same types as IntToInt for source (including scaled).  Converts to float.
>+//     * UintToFloat: Same types as UintToUint for source (including uscaled).  Converst to float.
>+//     * SnormToFloat: Similar to IntToFloat, but normalized.
>+//     * UnormToFloat: Similar to UintToFloat, but normalized.
>+//     * FixedToFloat: 16.16 signed fixed-point to floating point.
>+//     * FloatToFloat: float.
>+//
>+// IntToInt, UintToUint and FloatToFloat correspond to CopyNativeVertexData() and
>+// Copy8SintTo16SintVertexData() in renderer/copyvertex.inc, FixedToFloat corresponds to
>+// Copy32FixedTo32FVertexData, IntToFloat and UintToFloat correspond to CopyTo32FVertexData with
>+// normalized=false and SnormToFloat and UnormToFloat correspond to CopyTo32FVertexData with
>+// normalized=true.
>+//
>+
>+#version 450 core
>+
>+// Source type
>+#if IntToInt || IntToFloat
>+#define SrcType int
>+#elif UintToUint || UintToFloat
>+#define SrcType uint
>+#elif SnormToFloat || UnormToFloat || FixedToFloat || FloatToFloat
>+#define SrcType float
>+#else
>+#error "Not all conversions are accounted for"
>+#endif
>+
>+// Destination type
>+#if IntToInt
>+#define DestType int
>+#define IsDestFloat 0
>+#elif UintToUint
>+#define DestType uint
>+#define IsDestFloat 0
>+#elif IntToFloat || UintToFloat || SnormToFloat || UnormToFloat || FixedToFloat || FloatToFloat
>+#define DestType float
>+#define IsDestFloat 1
>+#else
>+#error "Not all conversions are accounted for"
>+#endif
>+
>+layout (local_size_x = 64, local_size_y = 1, local_size_z = 1) in;
>+
>+layout (set = 0, binding = 0) buffer dest
>+{
>+    uint destData[];
>+};
>+
>+layout (set = 0, binding = 1) buffer src
>+{
>+    uint srcData[];
>+};
>+
>+layout (push_constant) uniform PushConstants
>+{
>+    // outputs to write (= total number of components / Ed): used for range checking
>+    uint outputCount;
>+    // total number of output components: used for range checking
>+    uint componentCount;
>+    // source and destination offsets are handled in the shader (instead of binding the buffer with
>+    // these offsets), as the binding offset requires alignment with
>+    // minStorageBufferOffsetAlignment, which is impossible to enforce on source, and therefore
>+    // would limit the usability of the shader.  Note that source is a storage buffer, instead of a
>+    // uniform buffer, so it wouldn't be affected by the possibly smaller max size of uniform
>+    // buffers.
>+    uint srcOffset;
>+    uint destOffset;
>+
>+    // Parameters from the above explanation
>+    uint Ns;       // Number of source components in one vertex attribute
>+    uint Bs;       // Source component byte size
>+    uint Ss;       // Source vertex attribyte byte stride
>+    uint Es;       // Precalculated 4/Bs
>+
>+    uint Nd;       // Number of destination components in one vertex attribute
>+    uint Bd;       // Destination component byte size
>+    uint Sd;       // Precalculated Nd*Bd
>+    uint Ed;       // Precalculated 4/Bd
>+} params;
>+
>+// Define shorthands for more readable formulas:
>+#define Ns params.Ns
>+#define Ss params.Ss
>+#define Nd params.Nd
>+#define Sd params.Sd
>+
>+// With fixed-point and float types, Bs and Bd can only be 4, so they are hardcoded for more
>+// efficiency.
>+#if FixedToFloat || FloatToFloat
>+#define Bs 4
>+#define Es 1
>+#else
>+#define Bs params.Bs
>+#define Es params.Es
>+#endif
>+
>+#if IsDestFloat
>+#define Bd 4
>+#define Ed 1
>+#else
>+#define Bd params.Bd
>+#define Ed params.Ed
>+#endif
>+
>+uint getSourceComponentOffset(uint vertex, uint component)
>+{
>+    return vertex * Ss + component * Bs + params.srcOffset;
>+}
>+
>+uint getDestinationComponentOffset(uint vertex, uint component)
>+{
>+    return vertex * Sd + component * Bd + params.destOffset;
>+}
>+
>+uint getShiftBits(uint offset, uint B)
>+{
>+    // Given a byte offset, calculates the bit shift required to extract/store a component.
>+    //
>+    // On little endian, it implements the following function:
>+    //
>+    // Bs == 1: 0->0, 1->8, 2->16, 3->24
>+    // Bs == 2: 0->0, 2->16   (1 and 3 are impossible values as Bx is assumed to divide Sx)
>+    // Bs == 4: 0->0          (similarly, 1, 2, and 3 are impossible values)
>+    //
>+    // This is simply given by (offset % 4) * 8.
>+    //
>+    // On big endian, it implements the following function:
>+    //
>+    // Bs == 1: 0->24, 1->16, 2->8, 3->0
>+    // Bs == 2: 0->16, 2->0
>+    // Bs == 4: 0->0
>+    //
>+    // This is given by (4 - Bx - offset % 4) * 8
>+
>+    uint shift = (offset % 4) * 8;
>+
>+    // If big-endian, the most-significant bits contain the first components, so we reverse the
>+    // shift count.
>+#if IsBigEndian
>+    shift = (4 - B) * 8 - shift;
>+#endif
>+
>+    return shift;
>+}
>+
>+SrcType loadSourceComponent(uint cd)
>+{
>+    // cd is component index in the destination buffer
>+    uint vertex = cd / Nd;
>+    uint component = cd % Nd;
>+
>+    // If no such component, return 0
>+    if (component >= Ns)
>+    {
>+        return 0;
>+    }
>+
>+    // Load the source component
>+    uint offset = getSourceComponentOffset(vertex, component);
>+    uint block = srcData[offset / 4];
>+    uint shiftBits = getShiftBits(offset, Bs);
>+
>+    uint valueBits = Bs * 8;
>+    uint valueMask = valueBits == 32 ? -1 : (1 << valueBits) - 1;
>+    uint valueAsUint = (block >> shiftBits) & valueMask;
>+
>+    // Convert to SrcType
>+#if IntToInt || IntToFloat
>+    bool isNegative = (valueAsUint & (1 << (valueBits - 1))) != 0;
>+    // Sign extend
>+    SrcType value = SrcType(valueAsUint | (isNegative ? 0xFFFFFFFF << valueBits : 0));
>+#elif UintToUint || UintToFloat
>+    SrcType value = valueAsUint;
>+#elif SnormToFloat
>+    bool isNegative = (valueAsUint & (1 << (valueBits - 1))) != 0;
>+    int valueAsInt = int(valueAsUint | (isNegative ? 0xFFFFFFFF << valueBits : 0));
>+    SrcType value = (2 * float(valueAsInt) + 1) / valueMask;
>+#elif UnormToFloat
>+    float positiveMax = valueMask;
>+    // Scale [0, P] to [0, 1]
>+    SrcType value = valueAsUint / positiveMax;
>+#elif FixedToFloat
>+    float divisor = 1.0f / 65536.0f;
>+    SrcType value = int(valueAsUint) * divisor;
>+#elif FloatToFloat
>+    SrcType value = uintBitsToFloat(valueAsUint);
>+#else
>+#error "Not all conversions are accounted for"
>+#endif
>+
>+    return value;
>+}
>+
>+DestType convertComponent(SrcType srcValue)
>+{
>+    // In all cases, SrcValue already contains the final value, except it may need a cast, which
>+    // happens implicitly here.
>+    return srcValue;
>+}
>+
>+uint makeDestinationComponent(uint cd, DestType value)
>+{
>+    // Return valueAsUint, shifted to the right spot.  Multiple calls to this function should be |ed
>+    // and eventually written to the destination.
>+
>+#if IntToInt || UintToUint
>+    uint vertex = cd / Nd;
>+    uint component = cd % Nd;
>+
>+    uint offset = getDestinationComponentOffset(vertex, component);
>+    uint shiftBits = getShiftBits(offset, Bd);
>+
>+    uint valueBits = Bd * 8;
>+    uint valueMask = valueBits == 32 ? -1 : (1 << valueBits) - 1;
>+    uint valueAsUint = (uint(value) & valueMask) << shiftBits;
>+
>+#elif IsDestFloat
>+    // If the destination is float, it will occupy the whole result.
>+    uint valueAsUint = floatBitsToInt(value);
>+
>+#else
>+#error "Not all conversions are accounted for"
>+#endif
>+
>+    return valueAsUint;
>+}
>+
>+void storeDestinationComponents(uint valueAsUint)
>+{
>+    // Note that the destination allocations are always aligned to kMaxVertexFormatAlignment.
>+    destData[gl_GlobalInvocationID.x + params.destOffset / 4] = valueAsUint;
>+}
>+
>+void main()
>+{
>+#if !IsAligned
>+    if (gl_GlobalInvocationID.x >= params.outputCount)
>+        return;
>+#endif // IsAligned
>+
>+    uint valueOut = 0;
>+    for (uint i = 0; i < Ed; ++i)
>+    {
>+        uint cd = gl_GlobalInvocationID.x * Ed + i;
>+#if !IsAligned
>+        if (cd >= params.componentCount)
>+        {
>+            break;
>+        }
>+#endif
>+
>+        SrcType srcValue = loadSourceComponent(cd);
>+        DestType destValue = convertComponent(srcValue);
>+        valueOut |= makeDestinationComponent(cd, destValue);
>+    }
>+
>+    storeDestinationComponents(valueOut);
>+}
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/src/ConvertVertex.comp.json b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/src/ConvertVertex.comp.json
>new file mode 100644
>index 00000000000..7d9fb864765
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/src/ConvertVertex.comp.json
>@@ -0,0 +1,23 @@
>+{
>+    "Description": [
>+        "Copyright 2018 The ANGLE Project Authors. All rights reserved.",
>+        "Use of this source code is governed by a BSD-style license that can be",
>+        "found in the LICENSE file.",
>+        "",
>+        "ConvertVertex.comp.json: Build parameters for ConvertVertex.comp."
>+    ],
>+    "Flags": [
>+        "IsAligned"
>+    ],
>+    "Conversion": [
>+        "IntToInt",
>+        "UintToUint",
>+        "IntToFloat",
>+        "UintToFloat",
>+        "SnormToFloat",
>+        "UnormToFloat",
>+        "FixedToFloat",
>+        "FloatToFloat"
>+    ]
>+}
>+
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/src/FullScreenQuad.vert b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/src/FullScreenQuad.vert
>new file mode 100644
>index 00000000000..dec63e95625
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/src/FullScreenQuad.vert
>@@ -0,0 +1,22 @@
>+//
>+// Copyright 2018 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// FullScreenQuad.vert: Simple full-screen quad vertex shader.
>+
>+#version 450 core
>+
>+const vec2 kQuadVertices[] = {
>+    vec2(-1, 1),
>+    vec2(-1, -1),
>+    vec2(1, -1),
>+    vec2(-1, 1),
>+    vec2(1, -1),
>+    vec2(1, 1),
>+};
>+
>+void main()
>+{
>+    gl_Position = vec4(kQuadVertices[gl_VertexIndex], 0, 1);
>+}
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/src/ImageClear.frag b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/src/ImageClear.frag
>new file mode 100644
>index 00000000000..cba0ef4316f
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/src/ImageClear.frag
>@@ -0,0 +1,49 @@
>+//
>+// Copyright 2019 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// ImageClear.frag: Clear image to a solid color.
>+
>+#version 450 core
>+
>+#if IsFloat
>+#define Type vec4
>+#elif IsInt
>+#define Type ivec4
>+#elif IsUint
>+#define Type uvec4
>+#else
>+#error "Not all formats are accounted for"
>+#endif
>+
>+#if Attachment0
>+#define ATTACHMENT 0
>+#elif Attachment1
>+#define ATTACHMENT 1
>+#elif Attachment2
>+#define ATTACHMENT 2
>+#elif Attachment3
>+#define ATTACHMENT 3
>+#elif Attachment4
>+#define ATTACHMENT 4
>+#elif Attachment5
>+#define ATTACHMENT 5
>+#elif Attachment6
>+#define ATTACHMENT 6
>+#elif Attachment7
>+#define ATTACHMENT 7
>+#else
>+#error "Not all attachment index possibilities are accounted for"
>+#endif
>+
>+layout(push_constant) uniform PushConstants {
>+    Type clearColor;
>+} params;
>+
>+layout(location = ATTACHMENT) out Type colorOut;
>+
>+void main()
>+{
>+    colorOut = params.clearColor;
>+}
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/src/ImageClear.frag.json b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/src/ImageClear.frag.json
>new file mode 100644
>index 00000000000..94238b85042
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/src/ImageClear.frag.json
>@@ -0,0 +1,24 @@
>+{
>+    "Description": [
>+        "Copyright 2019 The ANGLE Project Authors. All rights reserved.",
>+        "Use of this source code is governed by a BSD-style license that can be",
>+        "found in the LICENSE file.",
>+        "",
>+        "ImageClear.frag.json: Build parameters for ImageClear.frag."
>+    ],
>+    "AttachmentIndex": [
>+        "Attachment0",
>+        "Attachment1",
>+        "Attachment2",
>+        "Attachment3",
>+        "Attachment4",
>+        "Attachment5",
>+        "Attachment6",
>+        "Attachment7"
>+    ],
>+    "Format": [
>+        "IsFloat",
>+        "IsInt",
>+        "IsUint"
>+    ]
>+}
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/src/ImageCopy.frag b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/src/ImageCopy.frag
>new file mode 100644
>index 00000000000..41212ba7fc6
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/src/ImageCopy.frag
>@@ -0,0 +1,122 @@
>+//
>+// Copyright 2018 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// ImageCopy.frag: Copy parts of an image to another.
>+
>+#version 450 core
>+
>+#extension GL_EXT_samplerless_texture_functions : require
>+
>+#define MAKE_SRC_RESOURCE(prefix, type) prefix ## type
>+
>+#if SrcIsFloat
>+#define SRC_RESOURCE(type) type
>+#define SrcType vec4
>+#elif SrcIsInt
>+#define SRC_RESOURCE(type) MAKE_SRC_RESOURCE(i, type)
>+#define SrcType ivec4
>+#elif SrcIsUint
>+#define SRC_RESOURCE(type) MAKE_SRC_RESOURCE(u, type)
>+#define SrcType uvec4
>+#else
>+#error "Not all source formats are accounted for"
>+#endif
>+
>+#if SrcIsArray
>+#define SRC_RESOURCE_NAME texture2DArray
>+#else
>+#define SRC_RESOURCE_NAME texture2D
>+#endif
>+
>+#if DestIsFloat
>+#define DestType vec4
>+#elif DestIsInt
>+#define DestType ivec4
>+#elif DestIsUint
>+#define DestType uvec4
>+#else
>+#error "Not all destination formats are accounted for"
>+#endif
>+
>+layout(set = 0, binding = 0) uniform SRC_RESOURCE(SRC_RESOURCE_NAME) src;
>+layout(location = 0) out DestType dest;
>+
>+layout(push_constant) uniform PushConstants {
>+    // Translation from source to destination coordinates.
>+    ivec2 srcOffset;
>+    ivec2 destOffset;
>+    int srcMip;
>+    int srcLayer;
>+    // Whether y needs to be flipped
>+    bool flipY;
>+    // Premultiplied alpha conversions
>+    bool premultiplyAlpha;
>+    bool unmultiplyAlpha;
>+    // Whether destination is emulated luminance/alpha.
>+    bool destHasLuminance;
>+    bool destIsAlpha;
>+    // Bits 0~3 tell whether R,G,B or A exist in destination, but as a result of format emulation.
>+    // Bit 0 is ignored, because R is always present.  For B and G, the result is set to 0 and for
>+    // A, the result is set to 1.
>+    int destDefaultChannelsMask;
>+} params;
>+
>+void main()
>+{
>+    ivec2 destSubImageCoords = ivec2(gl_FragCoord.xy) - params.destOffset;
>+
>+    ivec2 srcSubImageCoords = destSubImageCoords;
>+
>+    // If flipping Y, srcOffset would contain the opposite y coordinate, so we can
>+    // simply reverse the direction in which y grows.
>+    if (params.flipY)
>+        srcSubImageCoords.y = -srcSubImageCoords.y;
>+
>+#if SrcIsArray
>+    SrcType srcValue = texelFetch(src, ivec3(params.srcOffset + srcSubImageCoords, params.srcLayer), params.srcMip);
>+#else
>+    SrcType srcValue = texelFetch(src, params.srcOffset + srcSubImageCoords, params.srcMip);
>+#endif
>+
>+    if (params.premultiplyAlpha)
>+    {
>+        srcValue.rgb *= srcValue.a;
>+    }
>+    else if (params.unmultiplyAlpha && srcValue.a > 0)
>+    {
>+        srcValue.rgb /= srcValue.a;
>+    }
>+
>+    // Convert value to destination type.
>+    DestType destValue = DestType(srcValue);
>+
>+    // If dest is luminance/alpha, it's implemented with R or RG.  Do the appropriate swizzle.
>+    if (params.destHasLuminance)
>+    {
>+        destValue.rg = destValue.ra;
>+    }
>+    else if (params.destIsAlpha)
>+    {
>+        destValue.r = destValue.a;
>+    }
>+    else
>+    {
>+        int defaultChannelsMask = params.destDefaultChannelsMask;
>+        if ((defaultChannelsMask & 2) != 0)
>+        {
>+            destValue.g = 0;
>+        }
>+        if ((defaultChannelsMask & 4) != 0)
>+        {
>+            destValue.b = 0;
>+        }
>+        if ((defaultChannelsMask & 8) != 0)
>+        {
>+            destValue.a = 1;
>+        }
>+    }
>+
>+    dest = destValue;
>+}
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/src/ImageCopy.frag.json b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/src/ImageCopy.frag.json
>new file mode 100644
>index 00000000000..e49aa1a77f1
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/shaders/src/ImageCopy.frag.json
>@@ -0,0 +1,23 @@
>+{
>+    "Description": [
>+        "Copyright 2018 The ANGLE Project Authors. All rights reserved.",
>+        "Use of this source code is governed by a BSD-style license that can be",
>+        "found in the LICENSE file.",
>+        "",
>+        "ImageCopy.frag.json: Build parameters for ImageCopy.frag."
>+    ],
>+    "Flags": [
>+        "SrcIsArray"
>+    ],
>+    "SrcFormat": [
>+        "SrcIsFloat",
>+        "SrcIsInt",
>+        "SrcIsUint"
>+    ],
>+    "DestFormat": [
>+        "DestIsFloat",
>+        "DestIsInt",
>+        "DestIsUint"
>+    ]
>+}
>+
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/vk_cache_utils.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/vk_cache_utils.cpp
>new file mode 100644
>index 00000000000..92bc6ecfd90
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/vk_cache_utils.cpp
>@@ -0,0 +1,1620 @@
>+//
>+// Copyright 2018 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// vk_cache_utils.cpp:
>+//    Contains the classes for the Pipeline State Object cache as well as the RenderPass cache.
>+//    Also contains the structures for the packed descriptions for the RenderPass and Pipeline.
>+//
>+
>+#include "libANGLE/renderer/vulkan/vk_cache_utils.h"
>+
>+#include "common/aligned_memory.h"
>+#include "libANGLE/BlobCache.h"
>+#include "libANGLE/VertexAttribute.h"
>+#include "libANGLE/renderer/vulkan/FramebufferVk.h"
>+#include "libANGLE/renderer/vulkan/ProgramVk.h"
>+#include "libANGLE/renderer/vulkan/RendererVk.h"
>+#include "libANGLE/renderer/vulkan/vk_format_utils.h"
>+#include "libANGLE/renderer/vulkan/vk_helpers.h"
>+
>+#include <type_traits>
>+
>+namespace rx
>+{
>+namespace vk
>+{
>+
>+namespace
>+{
>+
>+uint8_t PackGLBlendOp(GLenum blendOp)
>+{
>+    switch (blendOp)
>+    {
>+        case GL_FUNC_ADD:
>+            return static_cast<uint8_t>(VK_BLEND_OP_ADD);
>+        case GL_FUNC_SUBTRACT:
>+            return static_cast<uint8_t>(VK_BLEND_OP_SUBTRACT);
>+        case GL_FUNC_REVERSE_SUBTRACT:
>+            return static_cast<uint8_t>(VK_BLEND_OP_REVERSE_SUBTRACT);
>+        default:
>+            UNREACHABLE();
>+            return 0;
>+    }
>+}
>+
>+uint8_t PackGLBlendFactor(GLenum blendFactor)
>+{
>+    switch (blendFactor)
>+    {
>+        case GL_ZERO:
>+            return static_cast<uint8_t>(VK_BLEND_FACTOR_ZERO);
>+        case GL_ONE:
>+            return static_cast<uint8_t>(VK_BLEND_FACTOR_ONE);
>+        case GL_SRC_COLOR:
>+            return static_cast<uint8_t>(VK_BLEND_FACTOR_SRC_COLOR);
>+        case GL_DST_COLOR:
>+            return static_cast<uint8_t>(VK_BLEND_FACTOR_DST_COLOR);
>+        case GL_ONE_MINUS_SRC_COLOR:
>+            return static_cast<uint8_t>(VK_BLEND_FACTOR_ONE_MINUS_SRC_COLOR);
>+        case GL_SRC_ALPHA:
>+            return static_cast<uint8_t>(VK_BLEND_FACTOR_SRC_ALPHA);
>+        case GL_ONE_MINUS_SRC_ALPHA:
>+            return static_cast<uint8_t>(VK_BLEND_FACTOR_ONE_MINUS_SRC_ALPHA);
>+        case GL_DST_ALPHA:
>+            return static_cast<uint8_t>(VK_BLEND_FACTOR_DST_ALPHA);
>+        case GL_ONE_MINUS_DST_ALPHA:
>+            return static_cast<uint8_t>(VK_BLEND_FACTOR_ONE_MINUS_DST_ALPHA);
>+        case GL_ONE_MINUS_DST_COLOR:
>+            return static_cast<uint8_t>(VK_BLEND_FACTOR_ONE_MINUS_DST_COLOR);
>+        case GL_SRC_ALPHA_SATURATE:
>+            return static_cast<uint8_t>(VK_BLEND_FACTOR_SRC_ALPHA_SATURATE);
>+        case GL_CONSTANT_COLOR:
>+            return static_cast<uint8_t>(VK_BLEND_FACTOR_CONSTANT_COLOR);
>+        case GL_CONSTANT_ALPHA:
>+            return static_cast<uint8_t>(VK_BLEND_FACTOR_CONSTANT_ALPHA);
>+        case GL_ONE_MINUS_CONSTANT_COLOR:
>+            return static_cast<uint8_t>(VK_BLEND_FACTOR_ONE_MINUS_CONSTANT_COLOR);
>+        case GL_ONE_MINUS_CONSTANT_ALPHA:
>+            return static_cast<uint8_t>(VK_BLEND_FACTOR_ONE_MINUS_CONSTANT_ALPHA);
>+        default:
>+            UNREACHABLE();
>+            return 0;
>+    }
>+}
>+
>+VkStencilOp PackGLStencilOp(GLenum compareOp)
>+{
>+    switch (compareOp)
>+    {
>+        case GL_KEEP:
>+            return VK_STENCIL_OP_KEEP;
>+        case GL_ZERO:
>+            return VK_STENCIL_OP_ZERO;
>+        case GL_REPLACE:
>+            return VK_STENCIL_OP_REPLACE;
>+        case GL_INCR:
>+            return VK_STENCIL_OP_INCREMENT_AND_CLAMP;
>+        case GL_DECR:
>+            return VK_STENCIL_OP_DECREMENT_AND_CLAMP;
>+        case GL_INCR_WRAP:
>+            return VK_STENCIL_OP_INCREMENT_AND_WRAP;
>+        case GL_DECR_WRAP:
>+            return VK_STENCIL_OP_DECREMENT_AND_WRAP;
>+        case GL_INVERT:
>+            return VK_STENCIL_OP_INVERT;
>+        default:
>+            UNREACHABLE();
>+            return VK_STENCIL_OP_KEEP;
>+    }
>+}
>+
>+VkCompareOp PackGLCompareFunc(GLenum compareFunc)
>+{
>+    switch (compareFunc)
>+    {
>+        case GL_NEVER:
>+            return VK_COMPARE_OP_NEVER;
>+        case GL_ALWAYS:
>+            return VK_COMPARE_OP_ALWAYS;
>+        case GL_LESS:
>+            return VK_COMPARE_OP_LESS;
>+        case GL_LEQUAL:
>+            return VK_COMPARE_OP_LESS_OR_EQUAL;
>+        case GL_EQUAL:
>+            return VK_COMPARE_OP_EQUAL;
>+        case GL_GREATER:
>+            return VK_COMPARE_OP_GREATER;
>+        case GL_GEQUAL:
>+            return VK_COMPARE_OP_GREATER_OR_EQUAL;
>+        case GL_NOTEQUAL:
>+            return VK_COMPARE_OP_NOT_EQUAL;
>+        default:
>+            UNREACHABLE();
>+            return VK_COMPARE_OP_NEVER;
>+    }
>+}
>+
>+void UnpackAttachmentDesc(VkAttachmentDescription *desc,
>+                          const vk::Format &format,
>+                          uint8_t samples,
>+                          const vk::PackedAttachmentOpsDesc &ops)
>+{
>+    // We would only need this flag for duplicated attachments. Apply it conservatively.
>+    desc->flags          = VK_ATTACHMENT_DESCRIPTION_MAY_ALIAS_BIT;
>+    desc->format         = format.vkImageFormat;
>+    desc->samples        = gl_vk::GetSamples(samples);
>+    desc->loadOp         = static_cast<VkAttachmentLoadOp>(ops.loadOp);
>+    desc->storeOp        = static_cast<VkAttachmentStoreOp>(ops.storeOp);
>+    desc->stencilLoadOp  = static_cast<VkAttachmentLoadOp>(ops.stencilLoadOp);
>+    desc->stencilStoreOp = static_cast<VkAttachmentStoreOp>(ops.stencilStoreOp);
>+    desc->initialLayout  = static_cast<VkImageLayout>(ops.initialLayout);
>+    desc->finalLayout    = static_cast<VkImageLayout>(ops.finalLayout);
>+}
>+
>+void UnpackStencilState(const vk::PackedStencilOpState &packedState,
>+                        uint8_t stencilReference,
>+                        VkStencilOpState *stateOut)
>+{
>+    stateOut->failOp      = static_cast<VkStencilOp>(packedState.ops.fail);
>+    stateOut->passOp      = static_cast<VkStencilOp>(packedState.ops.pass);
>+    stateOut->depthFailOp = static_cast<VkStencilOp>(packedState.ops.depthFail);
>+    stateOut->compareOp   = static_cast<VkCompareOp>(packedState.ops.compare);
>+    stateOut->compareMask = packedState.compareMask;
>+    stateOut->writeMask   = packedState.writeMask;
>+    stateOut->reference   = stencilReference;
>+}
>+
>+void UnpackBlendAttachmentState(const vk::PackedColorBlendAttachmentState &packedState,
>+                                VkPipelineColorBlendAttachmentState *stateOut)
>+{
>+    stateOut->srcColorBlendFactor = static_cast<VkBlendFactor>(packedState.srcColorBlendFactor);
>+    stateOut->dstColorBlendFactor = static_cast<VkBlendFactor>(packedState.dstColorBlendFactor);
>+    stateOut->colorBlendOp        = static_cast<VkBlendOp>(packedState.colorBlendOp);
>+    stateOut->srcAlphaBlendFactor = static_cast<VkBlendFactor>(packedState.srcAlphaBlendFactor);
>+    stateOut->dstAlphaBlendFactor = static_cast<VkBlendFactor>(packedState.dstAlphaBlendFactor);
>+    stateOut->alphaBlendOp        = static_cast<VkBlendOp>(packedState.alphaBlendOp);
>+}
>+
>+angle::Result InitializeRenderPassFromDesc(vk::Context *context,
>+                                           const RenderPassDesc &desc,
>+                                           const AttachmentOpsArray &ops,
>+                                           RenderPass *renderPass)
>+{
>+    size_t attachmentCount = desc.attachmentCount();
>+
>+    // Unpack the packed and split representation into the format required by Vulkan.
>+    gl::DrawBuffersVector<VkAttachmentReference> colorAttachmentRefs;
>+    VkAttachmentReference depthStencilAttachmentRef = {VK_ATTACHMENT_UNUSED};
>+    gl::AttachmentArray<VkAttachmentDescription> attachmentDescs;
>+    for (uint32_t attachmentIndex = 0; attachmentIndex < attachmentCount; ++attachmentIndex)
>+    {
>+        angle::FormatID formatID = desc[attachmentIndex];
>+        ASSERT(formatID != angle::FormatID::NONE);
>+        const vk::Format &format = context->getRenderer()->getFormat(formatID);
>+
>+        if (!format.angleFormat().hasDepthOrStencilBits())
>+        {
>+            VkAttachmentReference colorRef = colorAttachmentRefs[attachmentIndex];
>+            colorRef.attachment            = attachmentIndex;
>+            colorRef.layout                = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL;
>+
>+            colorAttachmentRefs.push_back(colorRef);
>+        }
>+        else
>+        {
>+            ASSERT(depthStencilAttachmentRef.attachment == VK_ATTACHMENT_UNUSED);
>+            depthStencilAttachmentRef.attachment = attachmentIndex;
>+            depthStencilAttachmentRef.layout     = VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL;
>+        }
>+
>+        UnpackAttachmentDesc(&attachmentDescs[attachmentIndex], format, desc.samples(),
>+                             ops[attachmentIndex]);
>+    }
>+
>+    VkSubpassDescription subpassDesc = {};
>+
>+    subpassDesc.flags                = 0;
>+    subpassDesc.pipelineBindPoint    = VK_PIPELINE_BIND_POINT_GRAPHICS;
>+    subpassDesc.inputAttachmentCount = 0;
>+    subpassDesc.pInputAttachments    = nullptr;
>+    subpassDesc.colorAttachmentCount = static_cast<uint32_t>(colorAttachmentRefs.size());
>+    subpassDesc.pColorAttachments    = colorAttachmentRefs.data();
>+    subpassDesc.pResolveAttachments  = nullptr;
>+    subpassDesc.pDepthStencilAttachment =
>+        (depthStencilAttachmentRef.attachment != VK_ATTACHMENT_UNUSED ? &depthStencilAttachmentRef
>+                                                                      : nullptr);
>+    subpassDesc.preserveAttachmentCount = 0;
>+    subpassDesc.pPreserveAttachments    = nullptr;
>+
>+    VkRenderPassCreateInfo createInfo = {};
>+    createInfo.sType                  = VK_STRUCTURE_TYPE_RENDER_PASS_CREATE_INFO;
>+    createInfo.flags                  = 0;
>+    createInfo.attachmentCount        = attachmentCount;
>+    createInfo.pAttachments           = attachmentDescs.data();
>+    createInfo.subpassCount           = 1;
>+    createInfo.pSubpasses             = &subpassDesc;
>+    createInfo.dependencyCount        = 0;
>+    createInfo.pDependencies          = nullptr;
>+
>+    ANGLE_VK_TRY(context, renderPass->init(context->getDevice(), createInfo));
>+    return angle::Result::Continue;
>+}
>+
>+// Utility for setting a value on a packed 4-bit integer array.
>+template <typename SrcT>
>+void Int4Array_Set(uint8_t *arrayBytes, uint32_t arrayIndex, SrcT value)
>+{
>+    uint32_t byteIndex = arrayIndex >> 1;
>+    ASSERT(value < 16);
>+
>+    if ((arrayIndex & 1) == 0)
>+    {
>+        arrayBytes[byteIndex] &= 0xF0;
>+        arrayBytes[byteIndex] |= static_cast<uint8_t>(value);
>+    }
>+    else
>+    {
>+        arrayBytes[byteIndex] &= 0x0F;
>+        arrayBytes[byteIndex] |= static_cast<uint8_t>(value) << 4;
>+    }
>+}
>+
>+// Utility for getting a value from a packed 4-bit integer array.
>+template <typename DestT>
>+DestT Int4Array_Get(const uint8_t *arrayBytes, uint32_t arrayIndex)
>+{
>+    uint32_t byteIndex = arrayIndex >> 1;
>+
>+    if ((arrayIndex & 1) == 0)
>+    {
>+        return static_cast<DestT>(arrayBytes[byteIndex] & 0xF);
>+    }
>+    else
>+    {
>+        return static_cast<DestT>(arrayBytes[byteIndex] >> 4);
>+    }
>+}
>+
>+// Helper macro that casts to a bitfield type then verifies no bits were dropped.
>+#define SetBitField(lhs, rhs)                                         \
>+    lhs = static_cast<typename std::decay<decltype(lhs)>::type>(rhs); \
>+    ASSERT(static_cast<decltype(rhs)>(lhs) == (rhs))
>+
>+// When converting a byte number to a transition bit index we can shift instead of divide.
>+constexpr size_t kTransitionByteShift = Log2(kGraphicsPipelineDirtyBitBytes);
>+
>+// When converting a number of bits offset to a transition bit index we can also shift.
>+constexpr size_t kBitsPerByte        = 8;
>+constexpr size_t kTransitionBitShift = kTransitionByteShift + Log2(kBitsPerByte);
>+
>+// Helper macro to map from a PipelineDesc struct and field to a dirty bit index.
>+// Uses the 'offsetof' macro to compute the offset 'Member' within the PipelineDesc
>+// and the offset of 'Field' within 'Member'. We can optimize the dirty bit setting by computing
>+// the shifted dirty bit at compile time instead of calling "set".
>+#define ANGLE_GET_TRANSITION_BIT(Member, Field)                                      \
>+    ((offsetof(GraphicsPipelineDesc, Member) + offsetof(decltype(Member), Field)) >> \
>+     kTransitionByteShift)
>+
>+// Indexed dirty bits cannot be entirely computed at compile time since the index is passed to
>+// the update function.
>+#define ANGLE_GET_INDEXED_TRANSITION_BIT(Member, Field, Index, BitWidth) \
>+    (((BitWidth * Index) >> kTransitionBitShift) + ANGLE_GET_TRANSITION_BIT(Member, Field))
>+}  // anonymous namespace
>+
>+// RenderPassDesc implementation.
>+RenderPassDesc::RenderPassDesc()
>+{
>+    memset(this, 0, sizeof(RenderPassDesc));
>+}
>+
>+RenderPassDesc::~RenderPassDesc() = default;
>+
>+RenderPassDesc::RenderPassDesc(const RenderPassDesc &other)
>+{
>+    memcpy(this, &other, sizeof(RenderPassDesc));
>+}
>+
>+size_t RenderPassDesc::colorAttachmentCount() const
>+{
>+    return mColorAttachmentCount;
>+}
>+
>+size_t RenderPassDesc::attachmentCount() const
>+{
>+    return mColorAttachmentCount + mDepthStencilAttachmentCount;
>+}
>+
>+void RenderPassDesc::setSamples(GLint samples)
>+{
>+    ASSERT(samples < std::numeric_limits<uint8_t>::max());
>+    mSamples = static_cast<uint8_t>(samples);
>+}
>+
>+void RenderPassDesc::packAttachment(const Format &format)
>+{
>+    ASSERT(attachmentCount() < mAttachmentFormats.size() - 1);
>+    static_assert(angle::kNumANGLEFormats < std::numeric_limits<uint8_t>::max(),
>+                  "Too many ANGLE formats to fit in uint8_t");
>+    uint8_t &packedFormat = mAttachmentFormats[attachmentCount()];
>+    SetBitField(packedFormat, format.angleFormatID);
>+    if (format.angleFormat().hasDepthOrStencilBits())
>+    {
>+        mDepthStencilAttachmentCount++;
>+    }
>+    else
>+    {
>+        // Force the user to pack the depth/stencil attachment last.
>+        ASSERT(mDepthStencilAttachmentCount == 0);
>+        mColorAttachmentCount++;
>+    }
>+}
>+
>+RenderPassDesc &RenderPassDesc::operator=(const RenderPassDesc &other)
>+{
>+    memcpy(this, &other, sizeof(RenderPassDesc));
>+    return *this;
>+}
>+
>+size_t RenderPassDesc::hash() const
>+{
>+    return angle::ComputeGenericHash(*this);
>+}
>+
>+bool operator==(const RenderPassDesc &lhs, const RenderPassDesc &rhs)
>+{
>+    return (memcmp(&lhs, &rhs, sizeof(RenderPassDesc)) == 0);
>+}
>+
>+// GraphicsPipelineDesc implementation.
>+// Use aligned allocation and free so we can use the alignas keyword.
>+void *GraphicsPipelineDesc::operator new(std::size_t size)
>+{
>+    return angle::AlignedAlloc(size, 32);
>+}
>+
>+void GraphicsPipelineDesc::operator delete(void *ptr)
>+{
>+    return angle::AlignedFree(ptr);
>+}
>+
>+GraphicsPipelineDesc::GraphicsPipelineDesc()
>+{
>+    memset(this, 0, sizeof(GraphicsPipelineDesc));
>+}
>+
>+GraphicsPipelineDesc::~GraphicsPipelineDesc() = default;
>+
>+GraphicsPipelineDesc::GraphicsPipelineDesc(const GraphicsPipelineDesc &other)
>+{
>+    memcpy(this, &other, sizeof(GraphicsPipelineDesc));
>+}
>+
>+GraphicsPipelineDesc &GraphicsPipelineDesc::operator=(const GraphicsPipelineDesc &other)
>+{
>+    memcpy(this, &other, sizeof(GraphicsPipelineDesc));
>+    return *this;
>+}
>+
>+size_t GraphicsPipelineDesc::hash() const
>+{
>+    return angle::ComputeGenericHash(*this);
>+}
>+
>+bool GraphicsPipelineDesc::operator==(const GraphicsPipelineDesc &other) const
>+{
>+    return (memcmp(this, &other, sizeof(GraphicsPipelineDesc)) == 0);
>+}
>+
>+// TODO(jmadill): We should prefer using Packed GLenums. http://anglebug.com/2169
>+
>+void GraphicsPipelineDesc::initDefaults()
>+{
>+    mRasterizationAndMultisampleStateInfo.bits.depthClampEnable           = 0;
>+    mRasterizationAndMultisampleStateInfo.bits.rasterizationDiscardEnable = 0;
>+    SetBitField(mRasterizationAndMultisampleStateInfo.bits.polygonMode, VK_POLYGON_MODE_FILL);
>+    SetBitField(mRasterizationAndMultisampleStateInfo.bits.cullMode, VK_CULL_MODE_NONE);
>+    SetBitField(mRasterizationAndMultisampleStateInfo.bits.frontFace, VK_FRONT_FACE_CLOCKWISE);
>+    mRasterizationAndMultisampleStateInfo.bits.depthBiasEnable    = 0;
>+    mRasterizationAndMultisampleStateInfo.depthBiasConstantFactor = 0.0f;
>+    mRasterizationAndMultisampleStateInfo.depthBiasClamp          = 0.0f;
>+    mRasterizationAndMultisampleStateInfo.depthBiasSlopeFactor    = 0.0f;
>+    mRasterizationAndMultisampleStateInfo.lineWidth               = 1.0f;
>+
>+    mRasterizationAndMultisampleStateInfo.bits.rasterizationSamples = 1;
>+    mRasterizationAndMultisampleStateInfo.bits.sampleShadingEnable  = 0;
>+    mRasterizationAndMultisampleStateInfo.minSampleShading          = 0.0f;
>+    for (uint32_t &sampleMask : mRasterizationAndMultisampleStateInfo.sampleMask)
>+    {
>+        sampleMask = 0;
>+    }
>+    mRasterizationAndMultisampleStateInfo.bits.alphaToCoverageEnable = 0;
>+    mRasterizationAndMultisampleStateInfo.bits.alphaToOneEnable      = 0;
>+
>+    mDepthStencilStateInfo.enable.depthTest  = 0;
>+    mDepthStencilStateInfo.enable.depthWrite = 1;
>+    SetBitField(mDepthStencilStateInfo.depthCompareOp, VK_COMPARE_OP_LESS);
>+    mDepthStencilStateInfo.enable.depthBoundsTest = 0;
>+    mDepthStencilStateInfo.enable.stencilTest     = 0;
>+    mDepthStencilStateInfo.minDepthBounds         = 0.0f;
>+    mDepthStencilStateInfo.maxDepthBounds         = 0.0f;
>+    SetBitField(mDepthStencilStateInfo.front.ops.fail, VK_STENCIL_OP_KEEP);
>+    SetBitField(mDepthStencilStateInfo.front.ops.pass, VK_STENCIL_OP_KEEP);
>+    SetBitField(mDepthStencilStateInfo.front.ops.depthFail, VK_STENCIL_OP_KEEP);
>+    SetBitField(mDepthStencilStateInfo.front.ops.compare, VK_COMPARE_OP_ALWAYS);
>+    SetBitField(mDepthStencilStateInfo.front.compareMask, 0xFF);
>+    SetBitField(mDepthStencilStateInfo.front.writeMask, 0xFF);
>+    mDepthStencilStateInfo.frontStencilReference = 0;
>+    SetBitField(mDepthStencilStateInfo.back.ops.fail, VK_STENCIL_OP_KEEP);
>+    SetBitField(mDepthStencilStateInfo.back.ops.pass, VK_STENCIL_OP_KEEP);
>+    SetBitField(mDepthStencilStateInfo.back.ops.depthFail, VK_STENCIL_OP_KEEP);
>+    SetBitField(mDepthStencilStateInfo.back.ops.compare, VK_COMPARE_OP_ALWAYS);
>+    SetBitField(mDepthStencilStateInfo.back.compareMask, 0xFF);
>+    SetBitField(mDepthStencilStateInfo.back.writeMask, 0xFF);
>+    mDepthStencilStateInfo.backStencilReference = 0;
>+
>+    PackedInputAssemblyAndColorBlendStateInfo &inputAndBlend = mInputAssemblyAndColorBlendStateInfo;
>+    inputAndBlend.logic.opEnable                             = 0;
>+    inputAndBlend.logic.op          = static_cast<uint32_t>(VK_LOGIC_OP_CLEAR);
>+    inputAndBlend.blendEnableMask   = 0;
>+    inputAndBlend.blendConstants[0] = 0.0f;
>+    inputAndBlend.blendConstants[1] = 0.0f;
>+    inputAndBlend.blendConstants[2] = 0.0f;
>+    inputAndBlend.blendConstants[3] = 0.0f;
>+
>+    VkFlags allColorBits = (VK_COLOR_COMPONENT_R_BIT | VK_COLOR_COMPONENT_G_BIT |
>+                            VK_COLOR_COMPONENT_B_BIT | VK_COLOR_COMPONENT_A_BIT);
>+
>+    for (uint32_t colorIndex = 0; colorIndex < gl::IMPLEMENTATION_MAX_DRAW_BUFFERS; ++colorIndex)
>+    {
>+        Int4Array_Set(inputAndBlend.colorWriteMaskBits, colorIndex, allColorBits);
>+    }
>+
>+    PackedColorBlendAttachmentState blendAttachmentState;
>+    SetBitField(blendAttachmentState.srcColorBlendFactor, VK_BLEND_FACTOR_ONE);
>+    SetBitField(blendAttachmentState.dstColorBlendFactor, VK_BLEND_FACTOR_ONE);
>+    SetBitField(blendAttachmentState.colorBlendOp, VK_BLEND_OP_ADD);
>+    SetBitField(blendAttachmentState.srcAlphaBlendFactor, VK_BLEND_FACTOR_ONE);
>+    SetBitField(blendAttachmentState.dstAlphaBlendFactor, VK_BLEND_FACTOR_ONE);
>+    SetBitField(blendAttachmentState.alphaBlendOp, VK_BLEND_OP_ADD);
>+
>+    std::fill(&inputAndBlend.attachments[0],
>+              &inputAndBlend.attachments[gl::IMPLEMENTATION_MAX_DRAW_BUFFERS],
>+              blendAttachmentState);
>+
>+    inputAndBlend.primitive.topology = static_cast<uint16_t>(VK_PRIMITIVE_TOPOLOGY_TRIANGLE_LIST);
>+    inputAndBlend.primitive.restartEnable = 0;
>+}
>+
>+angle::Result GraphicsPipelineDesc::initializePipeline(
>+    vk::Context *context,
>+    const vk::PipelineCache &pipelineCacheVk,
>+    const RenderPass &compatibleRenderPass,
>+    const PipelineLayout &pipelineLayout,
>+    const gl::AttributesMask &activeAttribLocationsMask,
>+    const ShaderModule *vertexModule,
>+    const ShaderModule *fragmentModule,
>+    Pipeline *pipelineOut) const
>+{
>+    angle::FixedVector<VkPipelineShaderStageCreateInfo, 2> shaderStages;
>+    VkPipelineVertexInputStateCreateInfo vertexInputState     = {};
>+    VkPipelineInputAssemblyStateCreateInfo inputAssemblyState = {};
>+    VkPipelineViewportStateCreateInfo viewportState           = {};
>+    VkPipelineRasterizationStateCreateInfo rasterState        = {};
>+    VkPipelineMultisampleStateCreateInfo multisampleState     = {};
>+    VkPipelineDepthStencilStateCreateInfo depthStencilState   = {};
>+    std::array<VkPipelineColorBlendAttachmentState, gl::IMPLEMENTATION_MAX_DRAW_BUFFERS>
>+        blendAttachmentState;
>+    VkPipelineColorBlendStateCreateInfo blendState = {};
>+    VkGraphicsPipelineCreateInfo createInfo        = {};
>+
>+    // Vertex shader is always expected to be present.
>+    ASSERT(vertexModule != nullptr);
>+    VkPipelineShaderStageCreateInfo vertexStage = {};
>+    vertexStage.sType               = VK_STRUCTURE_TYPE_PIPELINE_SHADER_STAGE_CREATE_INFO;
>+    vertexStage.flags               = 0;
>+    vertexStage.stage               = VK_SHADER_STAGE_VERTEX_BIT;
>+    vertexStage.module              = vertexModule->getHandle();
>+    vertexStage.pName               = "main";
>+    vertexStage.pSpecializationInfo = nullptr;
>+    shaderStages.push_back(vertexStage);
>+
>+    // Fragment shader is optional.
>+    if (fragmentModule)
>+    {
>+        VkPipelineShaderStageCreateInfo fragmentStage = {};
>+        fragmentStage.sType               = VK_STRUCTURE_TYPE_PIPELINE_SHADER_STAGE_CREATE_INFO;
>+        fragmentStage.flags               = 0;
>+        fragmentStage.stage               = VK_SHADER_STAGE_FRAGMENT_BIT;
>+        fragmentStage.module              = fragmentModule->getHandle();
>+        fragmentStage.pName               = "main";
>+        fragmentStage.pSpecializationInfo = nullptr;
>+        shaderStages.push_back(fragmentStage);
>+    }
>+
>+    // TODO(jmadill): Possibly use different path for ES 3.1 split bindings/attribs.
>+    gl::AttribArray<VkVertexInputBindingDescription> bindingDescs;
>+    gl::AttribArray<VkVertexInputAttributeDescription> attributeDescs;
>+
>+    uint32_t vertexAttribCount = 0;
>+
>+    size_t unpackedSize = sizeof(shaderStages) + sizeof(vertexInputState) +
>+                          sizeof(inputAssemblyState) + sizeof(viewportState) + sizeof(rasterState) +
>+                          sizeof(multisampleState) + sizeof(depthStencilState) +
>+                          sizeof(blendAttachmentState) + sizeof(blendState) + sizeof(bindingDescs) +
>+                          sizeof(attributeDescs);
>+    ANGLE_UNUSED_VARIABLE(unpackedSize);
>+
>+    gl::AttribArray<VkVertexInputBindingDivisorDescriptionEXT> divisorDesc;
>+    VkPipelineVertexInputDivisorStateCreateInfoEXT divisorState = {};
>+    divisorState.sType = VK_STRUCTURE_TYPE_PIPELINE_VERTEX_INPUT_DIVISOR_STATE_CREATE_INFO_EXT;
>+    divisorState.pVertexBindingDivisors = divisorDesc.data();
>+
>+    for (size_t attribIndexSizeT : activeAttribLocationsMask)
>+    {
>+        const uint32_t attribIndex = static_cast<uint32_t>(attribIndexSizeT);
>+
>+        VkVertexInputBindingDescription &bindingDesc  = bindingDescs[vertexAttribCount];
>+        VkVertexInputAttributeDescription &attribDesc = attributeDescs[vertexAttribCount];
>+        const PackedAttribDesc &packedAttrib          = mVertexInputAttribs.attribs[attribIndex];
>+
>+        bindingDesc.binding = attribIndex;
>+        bindingDesc.stride  = static_cast<uint32_t>(packedAttrib.stride);
>+        if (packedAttrib.divisor != 0)
>+        {
>+            bindingDesc.inputRate = static_cast<VkVertexInputRate>(VK_VERTEX_INPUT_RATE_INSTANCE);
>+            divisorDesc[divisorState.vertexBindingDivisorCount].binding = bindingDesc.binding;
>+            divisorDesc[divisorState.vertexBindingDivisorCount].divisor = packedAttrib.divisor;
>+            ++divisorState.vertexBindingDivisorCount;
>+        }
>+        else
>+        {
>+            bindingDesc.inputRate = static_cast<VkVertexInputRate>(VK_VERTEX_INPUT_RATE_VERTEX);
>+        }
>+
>+        // The binding index could become more dynamic in ES 3.1.
>+        attribDesc.binding  = attribIndex;
>+        attribDesc.format   = static_cast<VkFormat>(packedAttrib.format);
>+        attribDesc.location = static_cast<uint32_t>(attribIndex);
>+        attribDesc.offset   = packedAttrib.offset;
>+
>+        vertexAttribCount++;
>+    }
>+
>+    // The binding descriptions are filled in at draw time.
>+    vertexInputState.sType = VK_STRUCTURE_TYPE_PIPELINE_VERTEX_INPUT_STATE_CREATE_INFO;
>+    vertexInputState.flags = 0;
>+    vertexInputState.vertexBindingDescriptionCount   = vertexAttribCount;
>+    vertexInputState.pVertexBindingDescriptions      = bindingDescs.data();
>+    vertexInputState.vertexAttributeDescriptionCount = vertexAttribCount;
>+    vertexInputState.pVertexAttributeDescriptions    = attributeDescs.data();
>+    if (divisorState.vertexBindingDivisorCount)
>+        vertexInputState.pNext = &divisorState;
>+
>+    // Primitive topology is filled in at draw time.
>+    inputAssemblyState.sType = VK_STRUCTURE_TYPE_PIPELINE_INPUT_ASSEMBLY_STATE_CREATE_INFO;
>+    inputAssemblyState.flags = 0;
>+    inputAssemblyState.topology =
>+        static_cast<VkPrimitiveTopology>(mInputAssemblyAndColorBlendStateInfo.primitive.topology);
>+    inputAssemblyState.primitiveRestartEnable =
>+        static_cast<VkBool32>(mInputAssemblyAndColorBlendStateInfo.primitive.restartEnable);
>+
>+    // Set initial viewport and scissor state.
>+
>+    viewportState.sType         = VK_STRUCTURE_TYPE_PIPELINE_VIEWPORT_STATE_CREATE_INFO;
>+    viewportState.flags         = 0;
>+    viewportState.viewportCount = 1;
>+    viewportState.pViewports    = &mViewport;
>+    viewportState.scissorCount  = 1;
>+    viewportState.pScissors     = &mScissor;
>+
>+    const PackedRasterizationAndMultisampleStateInfo &rasterAndMS =
>+        mRasterizationAndMultisampleStateInfo;
>+
>+    // Rasterizer state.
>+    rasterState.sType            = VK_STRUCTURE_TYPE_PIPELINE_RASTERIZATION_STATE_CREATE_INFO;
>+    rasterState.flags            = 0;
>+    rasterState.depthClampEnable = static_cast<VkBool32>(rasterAndMS.bits.depthClampEnable);
>+    rasterState.rasterizerDiscardEnable =
>+        static_cast<VkBool32>(rasterAndMS.bits.rasterizationDiscardEnable);
>+    rasterState.polygonMode             = static_cast<VkPolygonMode>(rasterAndMS.bits.polygonMode);
>+    rasterState.cullMode                = static_cast<VkCullModeFlags>(rasterAndMS.bits.cullMode);
>+    rasterState.frontFace               = static_cast<VkFrontFace>(rasterAndMS.bits.frontFace);
>+    rasterState.depthBiasEnable         = static_cast<VkBool32>(rasterAndMS.bits.depthBiasEnable);
>+    rasterState.depthBiasConstantFactor = rasterAndMS.depthBiasConstantFactor;
>+    rasterState.depthBiasClamp          = rasterAndMS.depthBiasClamp;
>+    rasterState.depthBiasSlopeFactor    = rasterAndMS.depthBiasSlopeFactor;
>+    rasterState.lineWidth               = rasterAndMS.lineWidth;
>+
>+    // Multisample state.
>+    multisampleState.sType = VK_STRUCTURE_TYPE_PIPELINE_MULTISAMPLE_STATE_CREATE_INFO;
>+    multisampleState.flags = 0;
>+    multisampleState.rasterizationSamples =
>+        gl_vk::GetSamples(rasterAndMS.bits.rasterizationSamples);
>+    multisampleState.sampleShadingEnable =
>+        static_cast<VkBool32>(rasterAndMS.bits.sampleShadingEnable);
>+    multisampleState.minSampleShading = rasterAndMS.minSampleShading;
>+    // TODO(jmadill): sample masks
>+    multisampleState.pSampleMask = nullptr;
>+    multisampleState.alphaToCoverageEnable =
>+        static_cast<VkBool32>(rasterAndMS.bits.alphaToCoverageEnable);
>+    multisampleState.alphaToOneEnable = static_cast<VkBool32>(rasterAndMS.bits.alphaToOneEnable);
>+
>+    // Depth/stencil state.
>+    depthStencilState.sType = VK_STRUCTURE_TYPE_PIPELINE_DEPTH_STENCIL_STATE_CREATE_INFO;
>+    depthStencilState.flags = 0;
>+    depthStencilState.depthTestEnable =
>+        static_cast<VkBool32>(mDepthStencilStateInfo.enable.depthTest);
>+    depthStencilState.depthWriteEnable =
>+        static_cast<VkBool32>(mDepthStencilStateInfo.enable.depthWrite);
>+    depthStencilState.depthCompareOp =
>+        static_cast<VkCompareOp>(mDepthStencilStateInfo.depthCompareOp);
>+    depthStencilState.depthBoundsTestEnable =
>+        static_cast<VkBool32>(mDepthStencilStateInfo.enable.depthBoundsTest);
>+    depthStencilState.stencilTestEnable =
>+        static_cast<VkBool32>(mDepthStencilStateInfo.enable.stencilTest);
>+    UnpackStencilState(mDepthStencilStateInfo.front, mDepthStencilStateInfo.frontStencilReference,
>+                       &depthStencilState.front);
>+    UnpackStencilState(mDepthStencilStateInfo.back, mDepthStencilStateInfo.backStencilReference,
>+                       &depthStencilState.back);
>+    depthStencilState.minDepthBounds = mDepthStencilStateInfo.minDepthBounds;
>+    depthStencilState.maxDepthBounds = mDepthStencilStateInfo.maxDepthBounds;
>+
>+    const PackedInputAssemblyAndColorBlendStateInfo &inputAndBlend =
>+        mInputAssemblyAndColorBlendStateInfo;
>+
>+    blendState.sType           = VK_STRUCTURE_TYPE_PIPELINE_COLOR_BLEND_STATE_CREATE_INFO;
>+    blendState.flags           = 0;
>+    blendState.logicOpEnable   = static_cast<VkBool32>(inputAndBlend.logic.opEnable);
>+    blendState.logicOp         = static_cast<VkLogicOp>(inputAndBlend.logic.op);
>+    blendState.attachmentCount = mRenderPassDesc.colorAttachmentCount();
>+    blendState.pAttachments    = blendAttachmentState.data();
>+
>+    for (int i = 0; i < 4; i++)
>+    {
>+        blendState.blendConstants[i] = inputAndBlend.blendConstants[i];
>+    }
>+
>+    const gl::DrawBufferMask blendEnableMask(inputAndBlend.blendEnableMask);
>+
>+    for (uint32_t colorIndex = 0; colorIndex < blendState.attachmentCount; ++colorIndex)
>+    {
>+        VkPipelineColorBlendAttachmentState &state = blendAttachmentState[colorIndex];
>+
>+        state.blendEnable = blendEnableMask[colorIndex] ? VK_TRUE : VK_FALSE;
>+        state.colorWriteMask =
>+            Int4Array_Get<VkColorComponentFlags>(inputAndBlend.colorWriteMaskBits, colorIndex);
>+        UnpackBlendAttachmentState(inputAndBlend.attachments[colorIndex], &state);
>+    }
>+
>+    // We would define dynamic state here if it were to be used.
>+
>+    createInfo.sType               = VK_STRUCTURE_TYPE_GRAPHICS_PIPELINE_CREATE_INFO;
>+    createInfo.flags               = 0;
>+    createInfo.stageCount          = shaderStages.size();
>+    createInfo.pStages             = shaderStages.data();
>+    createInfo.pVertexInputState   = &vertexInputState;
>+    createInfo.pInputAssemblyState = &inputAssemblyState;
>+    createInfo.pTessellationState  = nullptr;
>+    createInfo.pViewportState      = &viewportState;
>+    createInfo.pRasterizationState = &rasterState;
>+    createInfo.pMultisampleState   = &multisampleState;
>+    createInfo.pDepthStencilState  = &depthStencilState;
>+    createInfo.pColorBlendState    = &blendState;
>+    createInfo.pDynamicState       = nullptr;
>+    createInfo.layout              = pipelineLayout.getHandle();
>+    createInfo.renderPass          = compatibleRenderPass.getHandle();
>+    createInfo.subpass             = 0;
>+    createInfo.basePipelineHandle  = VK_NULL_HANDLE;
>+    createInfo.basePipelineIndex   = 0;
>+
>+    ANGLE_VK_TRY(context,
>+                 pipelineOut->initGraphics(context->getDevice(), createInfo, pipelineCacheVk));
>+    return angle::Result::Continue;
>+}
>+
>+void GraphicsPipelineDesc::updateVertexInput(GraphicsPipelineTransitionBits *transition,
>+                                             uint32_t attribIndex,
>+                                             GLuint stride,
>+                                             GLuint divisor,
>+                                             VkFormat format,
>+                                             GLuint relativeOffset)
>+{
>+    vk::PackedAttribDesc &packedAttrib = mVertexInputAttribs.attribs[attribIndex];
>+
>+    // TODO: Handle the case where the divisor overflows the field that holds it.
>+    // http://anglebug.com/2672
>+    ASSERT(divisor <= std::numeric_limits<decltype(packedAttrib.divisor)>::max());
>+
>+    SetBitField(packedAttrib.stride, stride);
>+    SetBitField(packedAttrib.divisor, divisor);
>+
>+    if (format == VK_FORMAT_UNDEFINED)
>+    {
>+        UNIMPLEMENTED();
>+    }
>+
>+    SetBitField(packedAttrib.format, format);
>+    SetBitField(packedAttrib.offset, relativeOffset);
>+
>+    constexpr size_t kAttribBits = kPackedAttribDescSize * kBitsPerByte;
>+    const size_t kBit =
>+        ANGLE_GET_INDEXED_TRANSITION_BIT(mVertexInputAttribs, attribs, attribIndex, kAttribBits);
>+
>+    // Cover the next dirty bit conservatively. Because each attribute is 6 bytes.
>+    transition->set(kBit);
>+    transition->set(kBit + 1);
>+}
>+
>+void GraphicsPipelineDesc::updateTopology(GraphicsPipelineTransitionBits *transition,
>+                                          gl::PrimitiveMode drawMode)
>+{
>+    VkPrimitiveTopology vkTopology = gl_vk::GetPrimitiveTopology(drawMode);
>+    SetBitField(mInputAssemblyAndColorBlendStateInfo.primitive.topology, vkTopology);
>+
>+    transition->set(ANGLE_GET_TRANSITION_BIT(mInputAssemblyAndColorBlendStateInfo, primitive));
>+}
>+
>+void GraphicsPipelineDesc::updateCullMode(GraphicsPipelineTransitionBits *transition,
>+                                          const gl::RasterizerState &rasterState)
>+{
>+    mRasterizationAndMultisampleStateInfo.bits.cullMode =
>+        static_cast<uint16_t>(gl_vk::GetCullMode(rasterState));
>+    transition->set(ANGLE_GET_TRANSITION_BIT(mRasterizationAndMultisampleStateInfo, bits));
>+}
>+
>+void GraphicsPipelineDesc::updateFrontFace(GraphicsPipelineTransitionBits *transition,
>+                                           const gl::RasterizerState &rasterState,
>+                                           bool invertFrontFace)
>+{
>+    mRasterizationAndMultisampleStateInfo.bits.frontFace =
>+        static_cast<uint16_t>(gl_vk::GetFrontFace(rasterState.frontFace, invertFrontFace));
>+    transition->set(ANGLE_GET_TRANSITION_BIT(mRasterizationAndMultisampleStateInfo, bits));
>+}
>+
>+void GraphicsPipelineDesc::updateLineWidth(GraphicsPipelineTransitionBits *transition,
>+                                           float lineWidth)
>+{
>+    mRasterizationAndMultisampleStateInfo.lineWidth = lineWidth;
>+    transition->set(ANGLE_GET_TRANSITION_BIT(mRasterizationAndMultisampleStateInfo, lineWidth));
>+}
>+
>+void GraphicsPipelineDesc::updateBlendColor(GraphicsPipelineTransitionBits *transition,
>+                                            const gl::ColorF &color)
>+{
>+    mInputAssemblyAndColorBlendStateInfo.blendConstants[0] = color.red;
>+    mInputAssemblyAndColorBlendStateInfo.blendConstants[1] = color.green;
>+    mInputAssemblyAndColorBlendStateInfo.blendConstants[2] = color.blue;
>+    mInputAssemblyAndColorBlendStateInfo.blendConstants[3] = color.alpha;
>+    constexpr size_t kSize = sizeof(mInputAssemblyAndColorBlendStateInfo.blendConstants[0]) * 8;
>+
>+    for (int index = 0; index < 4; ++index)
>+    {
>+        const size_t kBit = ANGLE_GET_INDEXED_TRANSITION_BIT(mInputAssemblyAndColorBlendStateInfo,
>+                                                             blendConstants, index, kSize);
>+        transition->set(kBit);
>+    }
>+}
>+
>+void GraphicsPipelineDesc::updateBlendEnabled(GraphicsPipelineTransitionBits *transition,
>+                                              bool isBlendEnabled)
>+{
>+    gl::DrawBufferMask blendEnabled;
>+    if (isBlendEnabled)
>+        blendEnabled.set();
>+    mInputAssemblyAndColorBlendStateInfo.blendEnableMask =
>+        static_cast<uint8_t>(blendEnabled.bits());
>+    transition->set(
>+        ANGLE_GET_TRANSITION_BIT(mInputAssemblyAndColorBlendStateInfo, blendEnableMask));
>+}
>+
>+void GraphicsPipelineDesc::updateBlendEquations(GraphicsPipelineTransitionBits *transition,
>+                                                const gl::BlendState &blendState)
>+{
>+    constexpr size_t kSize = sizeof(PackedColorBlendAttachmentState) * 8;
>+
>+    for (size_t attachmentIndex = 0; attachmentIndex < gl::IMPLEMENTATION_MAX_DRAW_BUFFERS;
>+         ++attachmentIndex)
>+    {
>+        PackedColorBlendAttachmentState &blendAttachmentState =
>+            mInputAssemblyAndColorBlendStateInfo.attachments[attachmentIndex];
>+        blendAttachmentState.colorBlendOp = PackGLBlendOp(blendState.blendEquationRGB);
>+        blendAttachmentState.alphaBlendOp = PackGLBlendOp(blendState.blendEquationAlpha);
>+        transition->set(ANGLE_GET_INDEXED_TRANSITION_BIT(mInputAssemblyAndColorBlendStateInfo,
>+                                                         attachments, attachmentIndex, kSize));
>+    }
>+}
>+
>+void GraphicsPipelineDesc::updateBlendFuncs(GraphicsPipelineTransitionBits *transition,
>+                                            const gl::BlendState &blendState)
>+{
>+    constexpr size_t kSize = sizeof(PackedColorBlendAttachmentState) * 8;
>+    for (size_t attachmentIndex = 0; attachmentIndex < gl::IMPLEMENTATION_MAX_DRAW_BUFFERS;
>+         ++attachmentIndex)
>+    {
>+        PackedColorBlendAttachmentState &blendAttachmentState =
>+            mInputAssemblyAndColorBlendStateInfo.attachments[attachmentIndex];
>+        blendAttachmentState.srcColorBlendFactor = PackGLBlendFactor(blendState.sourceBlendRGB);
>+        blendAttachmentState.dstColorBlendFactor = PackGLBlendFactor(blendState.destBlendRGB);
>+        blendAttachmentState.srcAlphaBlendFactor = PackGLBlendFactor(blendState.sourceBlendAlpha);
>+        blendAttachmentState.dstAlphaBlendFactor = PackGLBlendFactor(blendState.destBlendAlpha);
>+        transition->set(ANGLE_GET_INDEXED_TRANSITION_BIT(mInputAssemblyAndColorBlendStateInfo,
>+                                                         attachments, attachmentIndex, kSize));
>+    }
>+}
>+
>+void GraphicsPipelineDesc::setColorWriteMask(VkColorComponentFlags colorComponentFlags,
>+                                             const gl::DrawBufferMask &alphaMask)
>+{
>+    PackedInputAssemblyAndColorBlendStateInfo &inputAndBlend = mInputAssemblyAndColorBlendStateInfo;
>+    uint8_t colorMask = static_cast<uint8_t>(colorComponentFlags);
>+
>+    for (size_t colorIndex = 0; colorIndex < gl::IMPLEMENTATION_MAX_DRAW_BUFFERS; colorIndex++)
>+    {
>+        uint8_t mask = alphaMask[colorIndex] ? (colorMask & ~VK_COLOR_COMPONENT_A_BIT) : colorMask;
>+        Int4Array_Set(inputAndBlend.colorWriteMaskBits, colorIndex, mask);
>+    }
>+}
>+
>+void GraphicsPipelineDesc::setSingleColorWriteMask(uint32_t colorIndex,
>+                                                   VkColorComponentFlags colorComponentFlags)
>+{
>+    PackedInputAssemblyAndColorBlendStateInfo &inputAndBlend = mInputAssemblyAndColorBlendStateInfo;
>+    uint8_t colorMask = static_cast<uint8_t>(colorComponentFlags);
>+    Int4Array_Set(inputAndBlend.colorWriteMaskBits, colorIndex, colorMask);
>+}
>+
>+void GraphicsPipelineDesc::updateColorWriteMask(GraphicsPipelineTransitionBits *transition,
>+                                                VkColorComponentFlags colorComponentFlags,
>+                                                const gl::DrawBufferMask &alphaMask)
>+{
>+    setColorWriteMask(colorComponentFlags, alphaMask);
>+
>+    for (size_t colorIndex = 0; colorIndex < gl::IMPLEMENTATION_MAX_DRAW_BUFFERS; colorIndex++)
>+    {
>+        transition->set(ANGLE_GET_INDEXED_TRANSITION_BIT(mInputAssemblyAndColorBlendStateInfo,
>+                                                         colorWriteMaskBits, colorIndex, 4));
>+    }
>+}
>+
>+void GraphicsPipelineDesc::setDepthTestEnabled(bool enabled)
>+{
>+    mDepthStencilStateInfo.enable.depthTest = enabled;
>+}
>+
>+void GraphicsPipelineDesc::setDepthWriteEnabled(bool enabled)
>+{
>+    mDepthStencilStateInfo.enable.depthWrite = enabled;
>+}
>+
>+void GraphicsPipelineDesc::setDepthFunc(VkCompareOp op)
>+{
>+    SetBitField(mDepthStencilStateInfo.depthCompareOp, op);
>+}
>+
>+void GraphicsPipelineDesc::setStencilTestEnabled(bool enabled)
>+{
>+    mDepthStencilStateInfo.enable.stencilTest = enabled;
>+}
>+
>+void GraphicsPipelineDesc::setStencilFrontFuncs(uint8_t reference,
>+                                                VkCompareOp compareOp,
>+                                                uint8_t compareMask)
>+{
>+    mDepthStencilStateInfo.frontStencilReference = reference;
>+    mDepthStencilStateInfo.front.compareMask     = compareMask;
>+    SetBitField(mDepthStencilStateInfo.front.ops.compare, compareOp);
>+}
>+
>+void GraphicsPipelineDesc::setStencilBackFuncs(uint8_t reference,
>+                                               VkCompareOp compareOp,
>+                                               uint8_t compareMask)
>+{
>+    mDepthStencilStateInfo.backStencilReference = reference;
>+    mDepthStencilStateInfo.back.compareMask     = compareMask;
>+    SetBitField(mDepthStencilStateInfo.back.ops.compare, compareOp);
>+}
>+
>+void GraphicsPipelineDesc::setStencilFrontOps(VkStencilOp failOp,
>+                                              VkStencilOp passOp,
>+                                              VkStencilOp depthFailOp)
>+{
>+    SetBitField(mDepthStencilStateInfo.front.ops.fail, failOp);
>+    SetBitField(mDepthStencilStateInfo.front.ops.pass, passOp);
>+    SetBitField(mDepthStencilStateInfo.front.ops.depthFail, depthFailOp);
>+}
>+
>+void GraphicsPipelineDesc::setStencilBackOps(VkStencilOp failOp,
>+                                             VkStencilOp passOp,
>+                                             VkStencilOp depthFailOp)
>+{
>+    SetBitField(mDepthStencilStateInfo.back.ops.fail, failOp);
>+    SetBitField(mDepthStencilStateInfo.back.ops.pass, passOp);
>+    SetBitField(mDepthStencilStateInfo.back.ops.depthFail, depthFailOp);
>+}
>+
>+void GraphicsPipelineDesc::setStencilFrontWriteMask(uint8_t mask)
>+{
>+    mDepthStencilStateInfo.front.writeMask = mask;
>+}
>+
>+void GraphicsPipelineDesc::setStencilBackWriteMask(uint8_t mask)
>+{
>+    mDepthStencilStateInfo.back.writeMask = mask;
>+}
>+
>+void GraphicsPipelineDesc::updateDepthTestEnabled(GraphicsPipelineTransitionBits *transition,
>+                                                  const gl::DepthStencilState &depthStencilState,
>+                                                  const gl::Framebuffer *drawFramebuffer)
>+{
>+    // Only enable the depth test if the draw framebuffer has a depth buffer.  It's possible that
>+    // we're emulating a stencil-only buffer with a depth-stencil buffer
>+    setDepthTestEnabled(depthStencilState.depthTest && drawFramebuffer->hasDepth());
>+    transition->set(ANGLE_GET_TRANSITION_BIT(mDepthStencilStateInfo, enable));
>+}
>+
>+void GraphicsPipelineDesc::updateDepthFunc(GraphicsPipelineTransitionBits *transition,
>+                                           const gl::DepthStencilState &depthStencilState)
>+{
>+    setDepthFunc(PackGLCompareFunc(depthStencilState.depthFunc));
>+    transition->set(ANGLE_GET_TRANSITION_BIT(mDepthStencilStateInfo, depthCompareOp));
>+}
>+
>+void GraphicsPipelineDesc::updateDepthWriteEnabled(GraphicsPipelineTransitionBits *transition,
>+                                                   const gl::DepthStencilState &depthStencilState,
>+                                                   const gl::Framebuffer *drawFramebuffer)
>+{
>+    // Don't write to depth buffers that should not exist
>+    setDepthWriteEnabled(drawFramebuffer->hasDepth() ? depthStencilState.depthMask : false);
>+    transition->set(ANGLE_GET_TRANSITION_BIT(mDepthStencilStateInfo, enable));
>+}
>+
>+void GraphicsPipelineDesc::updateStencilTestEnabled(GraphicsPipelineTransitionBits *transition,
>+                                                    const gl::DepthStencilState &depthStencilState,
>+                                                    const gl::Framebuffer *drawFramebuffer)
>+{
>+    // Only enable the stencil test if the draw framebuffer has a stencil buffer.  It's possible
>+    // that we're emulating a depth-only buffer with a depth-stencil buffer
>+    setStencilTestEnabled(depthStencilState.stencilTest && drawFramebuffer->hasStencil());
>+    transition->set(ANGLE_GET_TRANSITION_BIT(mDepthStencilStateInfo, enable));
>+}
>+
>+void GraphicsPipelineDesc::updateStencilFrontFuncs(GraphicsPipelineTransitionBits *transition,
>+                                                   GLint ref,
>+                                                   const gl::DepthStencilState &depthStencilState)
>+{
>+    setStencilFrontFuncs(static_cast<uint8_t>(ref),
>+                         PackGLCompareFunc(depthStencilState.stencilFunc),
>+                         static_cast<uint8_t>(depthStencilState.stencilMask));
>+    transition->set(ANGLE_GET_TRANSITION_BIT(mDepthStencilStateInfo, front));
>+    transition->set(ANGLE_GET_TRANSITION_BIT(mDepthStencilStateInfo, frontStencilReference));
>+}
>+
>+void GraphicsPipelineDesc::updateStencilBackFuncs(GraphicsPipelineTransitionBits *transition,
>+                                                  GLint ref,
>+                                                  const gl::DepthStencilState &depthStencilState)
>+{
>+    setStencilBackFuncs(static_cast<uint8_t>(ref),
>+                        PackGLCompareFunc(depthStencilState.stencilBackFunc),
>+                        static_cast<uint8_t>(depthStencilState.stencilBackMask));
>+    transition->set(ANGLE_GET_TRANSITION_BIT(mDepthStencilStateInfo, back));
>+    transition->set(ANGLE_GET_TRANSITION_BIT(mDepthStencilStateInfo, backStencilReference));
>+}
>+
>+void GraphicsPipelineDesc::updateStencilFrontOps(GraphicsPipelineTransitionBits *transition,
>+                                                 const gl::DepthStencilState &depthStencilState)
>+{
>+    setStencilFrontOps(PackGLStencilOp(depthStencilState.stencilFail),
>+                       PackGLStencilOp(depthStencilState.stencilPassDepthPass),
>+                       PackGLStencilOp(depthStencilState.stencilPassDepthFail));
>+    transition->set(ANGLE_GET_TRANSITION_BIT(mDepthStencilStateInfo, front));
>+}
>+
>+void GraphicsPipelineDesc::updateStencilBackOps(GraphicsPipelineTransitionBits *transition,
>+                                                const gl::DepthStencilState &depthStencilState)
>+{
>+    setStencilBackOps(PackGLStencilOp(depthStencilState.stencilBackFail),
>+                      PackGLStencilOp(depthStencilState.stencilBackPassDepthPass),
>+                      PackGLStencilOp(depthStencilState.stencilBackPassDepthFail));
>+    transition->set(ANGLE_GET_TRANSITION_BIT(mDepthStencilStateInfo, back));
>+}
>+
>+void GraphicsPipelineDesc::updateStencilFrontWriteMask(
>+    GraphicsPipelineTransitionBits *transition,
>+    const gl::DepthStencilState &depthStencilState,
>+    const gl::Framebuffer *drawFramebuffer)
>+{
>+    // Don't write to stencil buffers that should not exist
>+    setStencilFrontWriteMask(static_cast<uint8_t>(
>+        drawFramebuffer->hasStencil() ? depthStencilState.stencilWritemask : 0));
>+    transition->set(ANGLE_GET_TRANSITION_BIT(mDepthStencilStateInfo, front));
>+}
>+
>+void GraphicsPipelineDesc::updateStencilBackWriteMask(
>+    GraphicsPipelineTransitionBits *transition,
>+    const gl::DepthStencilState &depthStencilState,
>+    const gl::Framebuffer *drawFramebuffer)
>+{
>+    // Don't write to stencil buffers that should not exist
>+    setStencilBackWriteMask(static_cast<uint8_t>(
>+        drawFramebuffer->hasStencil() ? depthStencilState.stencilBackWritemask : 0));
>+    transition->set(ANGLE_GET_TRANSITION_BIT(mDepthStencilStateInfo, back));
>+}
>+
>+void GraphicsPipelineDesc::updatePolygonOffsetFillEnabled(
>+    GraphicsPipelineTransitionBits *transition,
>+    bool enabled)
>+{
>+    mRasterizationAndMultisampleStateInfo.bits.depthBiasEnable = enabled;
>+    transition->set(ANGLE_GET_TRANSITION_BIT(mRasterizationAndMultisampleStateInfo, bits));
>+}
>+
>+void GraphicsPipelineDesc::updatePolygonOffset(GraphicsPipelineTransitionBits *transition,
>+                                               const gl::RasterizerState &rasterState)
>+{
>+    mRasterizationAndMultisampleStateInfo.depthBiasSlopeFactor    = rasterState.polygonOffsetFactor;
>+    mRasterizationAndMultisampleStateInfo.depthBiasConstantFactor = rasterState.polygonOffsetUnits;
>+    transition->set(
>+        ANGLE_GET_TRANSITION_BIT(mRasterizationAndMultisampleStateInfo, depthBiasSlopeFactor));
>+    transition->set(
>+        ANGLE_GET_TRANSITION_BIT(mRasterizationAndMultisampleStateInfo, depthBiasConstantFactor));
>+}
>+
>+void GraphicsPipelineDesc::setRenderPassDesc(const RenderPassDesc &renderPassDesc)
>+{
>+    mRenderPassDesc = renderPassDesc;
>+}
>+
>+void GraphicsPipelineDesc::setViewport(const VkViewport &viewport)
>+{
>+    mViewport = viewport;
>+}
>+
>+void GraphicsPipelineDesc::updateViewport(GraphicsPipelineTransitionBits *transition,
>+                                          const VkViewport &viewport)
>+{
>+    mViewport = viewport;
>+    transition->set(ANGLE_GET_TRANSITION_BIT(mViewport, x));
>+    transition->set(ANGLE_GET_TRANSITION_BIT(mViewport, y));
>+    transition->set(ANGLE_GET_TRANSITION_BIT(mViewport, width));
>+    transition->set(ANGLE_GET_TRANSITION_BIT(mViewport, height));
>+    transition->set(ANGLE_GET_TRANSITION_BIT(mViewport, minDepth));
>+    transition->set(ANGLE_GET_TRANSITION_BIT(mViewport, maxDepth));
>+}
>+
>+void GraphicsPipelineDesc::updateDepthRange(GraphicsPipelineTransitionBits *transition,
>+                                            float nearPlane,
>+                                            float farPlane)
>+{
>+    // GLES2.0 Section 2.12.1: Each of n and f are clamped to lie within [0, 1], as are all
>+    // arguments of type clampf.
>+    mViewport.minDepth = gl::clamp01(nearPlane);
>+    mViewport.maxDepth = gl::clamp01(farPlane);
>+    transition->set(ANGLE_GET_TRANSITION_BIT(mViewport, minDepth));
>+    transition->set(ANGLE_GET_TRANSITION_BIT(mViewport, maxDepth));
>+}
>+
>+void GraphicsPipelineDesc::setScissor(const VkRect2D &scissor)
>+{
>+    mScissor = scissor;
>+}
>+
>+void GraphicsPipelineDesc::updateScissor(GraphicsPipelineTransitionBits *transition,
>+                                         const VkRect2D &scissor)
>+{
>+    mScissor = scissor;
>+    transition->set(ANGLE_GET_TRANSITION_BIT(mScissor, offset.x));
>+    transition->set(ANGLE_GET_TRANSITION_BIT(mScissor, offset.y));
>+    transition->set(ANGLE_GET_TRANSITION_BIT(mScissor, extent.width));
>+    transition->set(ANGLE_GET_TRANSITION_BIT(mScissor, extent.height));
>+}
>+
>+void GraphicsPipelineDesc::updateRenderPassDesc(GraphicsPipelineTransitionBits *transition,
>+                                                const RenderPassDesc &renderPassDesc)
>+{
>+    setRenderPassDesc(renderPassDesc);
>+
>+    // The RenderPass is a special case where it spans multiple bits but has no member.
>+    constexpr size_t kFirstBit =
>+        offsetof(GraphicsPipelineDesc, mRenderPassDesc) >> kTransitionByteShift;
>+    constexpr size_t kBitCount = kRenderPassDescSize >> kTransitionByteShift;
>+    for (size_t bit = 0; bit < kBitCount; ++bit)
>+    {
>+        transition->set(kFirstBit + bit);
>+    }
>+}
>+
>+// AttachmentOpsArray implementation.
>+AttachmentOpsArray::AttachmentOpsArray()
>+{
>+    memset(&mOps, 0, sizeof(PackedAttachmentOpsDesc) * mOps.size());
>+}
>+
>+AttachmentOpsArray::~AttachmentOpsArray() = default;
>+
>+AttachmentOpsArray::AttachmentOpsArray(const AttachmentOpsArray &other)
>+{
>+    memcpy(&mOps, &other.mOps, sizeof(PackedAttachmentOpsDesc) * mOps.size());
>+}
>+
>+AttachmentOpsArray &AttachmentOpsArray::operator=(const AttachmentOpsArray &other)
>+{
>+    memcpy(&mOps, &other.mOps, sizeof(PackedAttachmentOpsDesc) * mOps.size());
>+    return *this;
>+}
>+
>+const PackedAttachmentOpsDesc &AttachmentOpsArray::operator[](size_t index) const
>+{
>+    return mOps[index];
>+}
>+
>+PackedAttachmentOpsDesc &AttachmentOpsArray::operator[](size_t index)
>+{
>+    return mOps[index];
>+}
>+
>+void AttachmentOpsArray::initDummyOp(size_t index,
>+                                     VkImageLayout initialLayout,
>+                                     VkImageLayout finalLayout)
>+{
>+    PackedAttachmentOpsDesc &ops = mOps[index];
>+
>+    SetBitField(ops.initialLayout, initialLayout);
>+    SetBitField(ops.finalLayout, finalLayout);
>+    SetBitField(ops.loadOp, VK_ATTACHMENT_LOAD_OP_LOAD);
>+    SetBitField(ops.stencilLoadOp, VK_ATTACHMENT_LOAD_OP_DONT_CARE);
>+    SetBitField(ops.storeOp, VK_ATTACHMENT_STORE_OP_STORE);
>+    SetBitField(ops.stencilStoreOp, VK_ATTACHMENT_STORE_OP_DONT_CARE);
>+}
>+
>+void AttachmentOpsArray::initWithLoadStore(size_t index,
>+                                           VkImageLayout initialLayout,
>+                                           VkImageLayout finalLayout)
>+{
>+    PackedAttachmentOpsDesc &ops = mOps[index];
>+
>+    SetBitField(ops.initialLayout, initialLayout);
>+    SetBitField(ops.finalLayout, finalLayout);
>+    SetBitField(ops.loadOp, VK_ATTACHMENT_LOAD_OP_LOAD);
>+    SetBitField(ops.stencilLoadOp, VK_ATTACHMENT_LOAD_OP_LOAD);
>+    SetBitField(ops.storeOp, VK_ATTACHMENT_STORE_OP_STORE);
>+    SetBitField(ops.stencilStoreOp, VK_ATTACHMENT_STORE_OP_STORE);
>+}
>+
>+size_t AttachmentOpsArray::hash() const
>+{
>+    return angle::ComputeGenericHash(mOps);
>+}
>+
>+bool operator==(const AttachmentOpsArray &lhs, const AttachmentOpsArray &rhs)
>+{
>+    return (memcmp(&lhs, &rhs, sizeof(AttachmentOpsArray)) == 0);
>+}
>+
>+// DescriptorSetLayoutDesc implementation.
>+DescriptorSetLayoutDesc::DescriptorSetLayoutDesc() : mPackedDescriptorSetLayout{} {}
>+
>+DescriptorSetLayoutDesc::~DescriptorSetLayoutDesc() = default;
>+
>+DescriptorSetLayoutDesc::DescriptorSetLayoutDesc(const DescriptorSetLayoutDesc &other) = default;
>+
>+DescriptorSetLayoutDesc &DescriptorSetLayoutDesc::operator=(const DescriptorSetLayoutDesc &other) =
>+    default;
>+
>+size_t DescriptorSetLayoutDesc::hash() const
>+{
>+    return angle::ComputeGenericHash(mPackedDescriptorSetLayout);
>+}
>+
>+bool DescriptorSetLayoutDesc::operator==(const DescriptorSetLayoutDesc &other) const
>+{
>+    return (memcmp(&mPackedDescriptorSetLayout, &other.mPackedDescriptorSetLayout,
>+                   sizeof(mPackedDescriptorSetLayout)) == 0);
>+}
>+
>+void DescriptorSetLayoutDesc::update(uint32_t bindingIndex, VkDescriptorType type, uint32_t count)
>+{
>+    ASSERT(static_cast<size_t>(type) < std::numeric_limits<uint16_t>::max());
>+    ASSERT(count < std::numeric_limits<uint16_t>::max());
>+
>+    PackedDescriptorSetBinding &packedBinding = mPackedDescriptorSetLayout[bindingIndex];
>+
>+    packedBinding.type  = static_cast<uint16_t>(type);
>+    packedBinding.count = static_cast<uint16_t>(count);
>+}
>+
>+void DescriptorSetLayoutDesc::unpackBindings(DescriptorSetLayoutBindingVector *bindings) const
>+{
>+    for (uint32_t bindingIndex = 0; bindingIndex < kMaxDescriptorSetLayoutBindings; ++bindingIndex)
>+    {
>+        const PackedDescriptorSetBinding &packedBinding = mPackedDescriptorSetLayout[bindingIndex];
>+        if (packedBinding.count == 0)
>+            continue;
>+
>+        VkDescriptorSetLayoutBinding binding = {};
>+        binding.binding                      = bindingIndex;
>+        binding.descriptorCount              = packedBinding.count;
>+        binding.descriptorType               = static_cast<VkDescriptorType>(packedBinding.type);
>+        binding.stageFlags =
>+            VK_SHADER_STAGE_VERTEX_BIT | VK_SHADER_STAGE_FRAGMENT_BIT | VK_SHADER_STAGE_COMPUTE_BIT;
>+        binding.pImmutableSamplers = nullptr;
>+
>+        bindings->push_back(binding);
>+    }
>+}
>+
>+// PipelineLayoutDesc implementation.
>+PipelineLayoutDesc::PipelineLayoutDesc() : mDescriptorSetLayouts{}, mPushConstantRanges{} {}
>+
>+PipelineLayoutDesc::~PipelineLayoutDesc() = default;
>+
>+PipelineLayoutDesc::PipelineLayoutDesc(const PipelineLayoutDesc &other) = default;
>+
>+PipelineLayoutDesc &PipelineLayoutDesc::operator=(const PipelineLayoutDesc &rhs)
>+{
>+    mDescriptorSetLayouts = rhs.mDescriptorSetLayouts;
>+    mPushConstantRanges   = rhs.mPushConstantRanges;
>+    return *this;
>+}
>+
>+size_t PipelineLayoutDesc::hash() const
>+{
>+    return angle::ComputeGenericHash(*this);
>+}
>+
>+bool PipelineLayoutDesc::operator==(const PipelineLayoutDesc &other) const
>+{
>+    return memcmp(this, &other, sizeof(PipelineLayoutDesc)) == 0;
>+}
>+
>+void PipelineLayoutDesc::updateDescriptorSetLayout(uint32_t setIndex,
>+                                                   const DescriptorSetLayoutDesc &desc)
>+{
>+    ASSERT(setIndex < mDescriptorSetLayouts.size());
>+    mDescriptorSetLayouts[setIndex] = desc;
>+}
>+
>+void PipelineLayoutDesc::updatePushConstantRange(gl::ShaderType shaderType,
>+                                                 uint32_t offset,
>+                                                 uint32_t size)
>+{
>+    ASSERT(shaderType == gl::ShaderType::Vertex || shaderType == gl::ShaderType::Fragment ||
>+           shaderType == gl::ShaderType::Compute);
>+    PackedPushConstantRange &packed = mPushConstantRanges[static_cast<size_t>(shaderType)];
>+    packed.offset                   = offset;
>+    packed.size                     = size;
>+}
>+
>+const PushConstantRangeArray<PackedPushConstantRange> &PipelineLayoutDesc::getPushConstantRanges()
>+    const
>+{
>+    return mPushConstantRanges;
>+}
>+
>+// PipelineHelper implementation.
>+PipelineHelper::PipelineHelper() = default;
>+
>+PipelineHelper::~PipelineHelper() = default;
>+
>+void PipelineHelper::destroy(VkDevice device)
>+{
>+    mPipeline.destroy(device);
>+}
>+
>+void PipelineHelper::addTransition(GraphicsPipelineTransitionBits bits,
>+                                   const GraphicsPipelineDesc *desc,
>+                                   PipelineHelper *pipeline)
>+{
>+    mTransitions.emplace_back(bits, desc, pipeline);
>+}
>+}  // namespace vk
>+
>+// RenderPassCache implementation.
>+RenderPassCache::RenderPassCache() = default;
>+
>+RenderPassCache::~RenderPassCache()
>+{
>+    ASSERT(mPayload.empty());
>+}
>+
>+void RenderPassCache::destroy(VkDevice device)
>+{
>+    for (auto &outerIt : mPayload)
>+    {
>+        for (auto &innerIt : outerIt.second)
>+        {
>+            innerIt.second.get().destroy(device);
>+        }
>+    }
>+    mPayload.clear();
>+}
>+
>+angle::Result RenderPassCache::addRenderPass(vk::Context *context,
>+                                             Serial serial,
>+                                             const vk::RenderPassDesc &desc,
>+                                             vk::RenderPass **renderPassOut)
>+{
>+    // Insert some dummy attachment ops.
>+    // It would be nice to pre-populate the cache in the Renderer so we rarely miss here.
>+    vk::AttachmentOpsArray ops;
>+
>+    for (uint32_t attachmentIndex = 0; attachmentIndex < desc.attachmentCount(); ++attachmentIndex)
>+    {
>+        angle::FormatID formatID = desc[attachmentIndex];
>+        ASSERT(formatID != angle::FormatID::NONE);
>+        const vk::Format &format = context->getRenderer()->getFormat(formatID);
>+        if (!format.angleFormat().hasDepthOrStencilBits())
>+        {
>+            ops.initDummyOp(attachmentIndex, VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL,
>+                            VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL);
>+        }
>+        else
>+        {
>+            ops.initDummyOp(attachmentIndex, VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL,
>+                            VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL);
>+        }
>+    }
>+
>+    return getRenderPassWithOps(context, serial, desc, ops, renderPassOut);
>+}
>+
>+angle::Result RenderPassCache::getRenderPassWithOps(vk::Context *context,
>+                                                    Serial serial,
>+                                                    const vk::RenderPassDesc &desc,
>+                                                    const vk::AttachmentOpsArray &attachmentOps,
>+                                                    vk::RenderPass **renderPassOut)
>+{
>+    auto outerIt = mPayload.find(desc);
>+    if (outerIt != mPayload.end())
>+    {
>+        InnerCache &innerCache = outerIt->second;
>+
>+        auto innerIt = innerCache.find(attachmentOps);
>+        if (innerIt != innerCache.end())
>+        {
>+            // Update the serial before we return.
>+            // TODO(jmadill): Could possibly use an MRU cache here.
>+            innerIt->second.updateSerial(serial);
>+            *renderPassOut = &innerIt->second.get();
>+            return angle::Result::Continue;
>+        }
>+    }
>+    else
>+    {
>+        auto emplaceResult = mPayload.emplace(desc, InnerCache());
>+        outerIt            = emplaceResult.first;
>+    }
>+
>+    vk::RenderPass newRenderPass;
>+    ANGLE_TRY(vk::InitializeRenderPassFromDesc(context, desc, attachmentOps, &newRenderPass));
>+
>+    vk::RenderPassAndSerial withSerial(std::move(newRenderPass), serial);
>+
>+    InnerCache &innerCache = outerIt->second;
>+    auto insertPos         = innerCache.emplace(attachmentOps, std::move(withSerial));
>+    *renderPassOut         = &insertPos.first->second.get();
>+
>+    // TODO(jmadill): Trim cache, and pre-populate with the most common RPs on startup.
>+    return angle::Result::Continue;
>+}
>+
>+// GraphicsPipelineCache implementation.
>+GraphicsPipelineCache::GraphicsPipelineCache() = default;
>+
>+GraphicsPipelineCache::~GraphicsPipelineCache()
>+{
>+    ASSERT(mPayload.empty());
>+}
>+
>+void GraphicsPipelineCache::destroy(VkDevice device)
>+{
>+    for (auto &item : mPayload)
>+    {
>+        vk::PipelineHelper &pipeline = item.second;
>+        pipeline.destroy(device);
>+    }
>+
>+    mPayload.clear();
>+}
>+
>+void GraphicsPipelineCache::release(RendererVk *renderer)
>+{
>+    for (auto &item : mPayload)
>+    {
>+        vk::PipelineHelper &pipeline = item.second;
>+        renderer->releaseObject(pipeline.getSerial(), &pipeline.getPipeline());
>+    }
>+
>+    mPayload.clear();
>+}
>+
>+angle::Result GraphicsPipelineCache::insertPipeline(
>+    vk::Context *context,
>+    const vk::PipelineCache &pipelineCacheVk,
>+    const vk::RenderPass &compatibleRenderPass,
>+    const vk::PipelineLayout &pipelineLayout,
>+    const gl::AttributesMask &activeAttribLocationsMask,
>+    const vk::ShaderModule *vertexModule,
>+    const vk::ShaderModule *fragmentModule,
>+    const vk::GraphicsPipelineDesc &desc,
>+    const vk::GraphicsPipelineDesc **descPtrOut,
>+    vk::PipelineHelper **pipelineOut)
>+{
>+    vk::Pipeline newPipeline;
>+
>+    // This "if" is left here for the benefit of VulkanPipelineCachePerfTest.
>+    if (context != nullptr)
>+    {
>+        ANGLE_TRY(desc.initializePipeline(context, pipelineCacheVk, compatibleRenderPass,
>+                                          pipelineLayout, activeAttribLocationsMask, vertexModule,
>+                                          fragmentModule, &newPipeline));
>+    }
>+
>+    // The Serial will be updated outside of this query.
>+    auto insertedItem = mPayload.emplace(desc, std::move(newPipeline));
>+    *descPtrOut       = &insertedItem.first->first;
>+    *pipelineOut      = &insertedItem.first->second;
>+
>+    return angle::Result::Continue;
>+}
>+
>+void GraphicsPipelineCache::populate(const vk::GraphicsPipelineDesc &desc, vk::Pipeline &&pipeline)
>+{
>+    auto item = mPayload.find(desc);
>+    if (item != mPayload.end())
>+    {
>+        return;
>+    }
>+
>+    mPayload.emplace(desc, std::move(pipeline));
>+}
>+
>+// DescriptorSetLayoutCache implementation.
>+DescriptorSetLayoutCache::DescriptorSetLayoutCache() = default;
>+
>+DescriptorSetLayoutCache::~DescriptorSetLayoutCache()
>+{
>+    ASSERT(mPayload.empty());
>+}
>+
>+void DescriptorSetLayoutCache::destroy(VkDevice device)
>+{
>+    for (auto &item : mPayload)
>+    {
>+        vk::RefCountedDescriptorSetLayout &layout = item.second;
>+        ASSERT(!layout.isReferenced());
>+        layout.get().destroy(device);
>+    }
>+
>+    mPayload.clear();
>+}
>+
>+angle::Result DescriptorSetLayoutCache::getDescriptorSetLayout(
>+    vk::Context *context,
>+    const vk::DescriptorSetLayoutDesc &desc,
>+    vk::BindingPointer<vk::DescriptorSetLayout> *descriptorSetLayoutOut)
>+{
>+    auto iter = mPayload.find(desc);
>+    if (iter != mPayload.end())
>+    {
>+        vk::RefCountedDescriptorSetLayout &layout = iter->second;
>+        descriptorSetLayoutOut->set(&layout);
>+        return angle::Result::Continue;
>+    }
>+
>+    // We must unpack the descriptor set layout description.
>+    vk::DescriptorSetLayoutBindingVector bindings;
>+    desc.unpackBindings(&bindings);
>+
>+    VkDescriptorSetLayoutCreateInfo createInfo = {};
>+    createInfo.sType        = VK_STRUCTURE_TYPE_DESCRIPTOR_SET_LAYOUT_CREATE_INFO;
>+    createInfo.flags        = 0;
>+    createInfo.bindingCount = static_cast<uint32_t>(bindings.size());
>+    createInfo.pBindings    = bindings.data();
>+
>+    vk::DescriptorSetLayout newLayout;
>+    ANGLE_VK_TRY(context, newLayout.init(context->getDevice(), createInfo));
>+
>+    auto insertedItem =
>+        mPayload.emplace(desc, vk::RefCountedDescriptorSetLayout(std::move(newLayout)));
>+    vk::RefCountedDescriptorSetLayout &insertedLayout = insertedItem.first->second;
>+    descriptorSetLayoutOut->set(&insertedLayout);
>+
>+    return angle::Result::Continue;
>+}
>+
>+// PipelineLayoutCache implementation.
>+PipelineLayoutCache::PipelineLayoutCache() = default;
>+
>+PipelineLayoutCache::~PipelineLayoutCache()
>+{
>+    ASSERT(mPayload.empty());
>+}
>+
>+void PipelineLayoutCache::destroy(VkDevice device)
>+{
>+    for (auto &item : mPayload)
>+    {
>+        vk::RefCountedPipelineLayout &layout = item.second;
>+        layout.get().destroy(device);
>+    }
>+
>+    mPayload.clear();
>+}
>+
>+angle::Result PipelineLayoutCache::getPipelineLayout(
>+    vk::Context *context,
>+    const vk::PipelineLayoutDesc &desc,
>+    const vk::DescriptorSetLayoutPointerArray &descriptorSetLayouts,
>+    vk::BindingPointer<vk::PipelineLayout> *pipelineLayoutOut)
>+{
>+    auto iter = mPayload.find(desc);
>+    if (iter != mPayload.end())
>+    {
>+        vk::RefCountedPipelineLayout &layout = iter->second;
>+        pipelineLayoutOut->set(&layout);
>+        return angle::Result::Continue;
>+    }
>+
>+    // Note this does not handle gaps in descriptor set layouts gracefully.
>+    angle::FixedVector<VkDescriptorSetLayout, vk::kMaxDescriptorSetLayouts> setLayoutHandles;
>+    for (const vk::BindingPointer<vk::DescriptorSetLayout> &layoutPtr : descriptorSetLayouts)
>+    {
>+        if (layoutPtr.valid())
>+        {
>+            VkDescriptorSetLayout setLayout = layoutPtr.get().getHandle();
>+            if (setLayout != VK_NULL_HANDLE)
>+            {
>+                setLayoutHandles.push_back(setLayout);
>+            }
>+        }
>+    }
>+
>+    angle::FixedVector<VkPushConstantRange, vk::kMaxPushConstantRanges> pushConstantRanges;
>+    const vk::PushConstantRangeArray<vk::PackedPushConstantRange> &descPushConstantRanges =
>+        desc.getPushConstantRanges();
>+    for (size_t shaderIndex = 0; shaderIndex < descPushConstantRanges.size(); ++shaderIndex)
>+    {
>+        const vk::PackedPushConstantRange &pushConstantDesc = descPushConstantRanges[shaderIndex];
>+        if (pushConstantDesc.size > 0)
>+        {
>+            static constexpr VkShaderStageFlagBits kShaderStages[vk::kMaxPushConstantRanges] = {
>+                VK_SHADER_STAGE_VERTEX_BIT,
>+                VK_SHADER_STAGE_FRAGMENT_BIT,
>+                VK_SHADER_STAGE_GEOMETRY_BIT,
>+                VK_SHADER_STAGE_COMPUTE_BIT,
>+            };
>+            static_assert(static_cast<uint32_t>(gl::ShaderType::Vertex) == 0, "Fix this table");
>+            static_assert(static_cast<uint32_t>(gl::ShaderType::Fragment) == 1, "Fix this table");
>+            static_assert(static_cast<uint32_t>(gl::ShaderType::Geometry) == 2, "Fix this table");
>+            static_assert(static_cast<uint32_t>(gl::ShaderType::Compute) == 3, "Fix this table");
>+            VkPushConstantRange pushConstantRange = {};
>+            pushConstantRange.stageFlags          = kShaderStages[shaderIndex];
>+            pushConstantRange.offset              = pushConstantDesc.offset;
>+            pushConstantRange.size                = pushConstantDesc.size;
>+
>+            pushConstantRanges.push_back(pushConstantRange);
>+        }
>+    }
>+
>+    // No pipeline layout found. We must create a new one.
>+    VkPipelineLayoutCreateInfo createInfo = {};
>+    createInfo.sType                      = VK_STRUCTURE_TYPE_PIPELINE_LAYOUT_CREATE_INFO;
>+    createInfo.flags                      = 0;
>+    createInfo.setLayoutCount             = static_cast<uint32_t>(setLayoutHandles.size());
>+    createInfo.pSetLayouts                = setLayoutHandles.data();
>+    createInfo.pushConstantRangeCount     = static_cast<uint32_t>(pushConstantRanges.size());
>+    createInfo.pPushConstantRanges        = pushConstantRanges.data();
>+
>+    vk::PipelineLayout newLayout;
>+    ANGLE_VK_TRY(context, newLayout.init(context->getDevice(), createInfo));
>+
>+    auto insertedItem = mPayload.emplace(desc, vk::RefCountedPipelineLayout(std::move(newLayout)));
>+    vk::RefCountedPipelineLayout &insertedLayout = insertedItem.first->second;
>+    pipelineLayoutOut->set(&insertedLayout);
>+
>+    return angle::Result::Continue;
>+}
>+}  // namespace rx
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/vk_cache_utils.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/vk_cache_utils.h
>new file mode 100644
>index 00000000000..ad046740004
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/vk_cache_utils.h
>@@ -0,0 +1,819 @@
>+//
>+// Copyright 2018 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// vk_cache_utils.h:
>+//    Contains the classes for the Pipeline State Object cache as well as the RenderPass cache.
>+//    Also contains the structures for the packed descriptions for the RenderPass and Pipeline.
>+//
>+
>+#ifndef LIBANGLE_RENDERER_VULKAN_VK_CACHE_UTILS_H_
>+#define LIBANGLE_RENDERER_VULKAN_VK_CACHE_UTILS_H_
>+
>+#include "common/Color.h"
>+#include "common/FixedVector.h"
>+#include "libANGLE/renderer/vulkan/vk_utils.h"
>+
>+namespace rx
>+{
>+
>+namespace vk
>+{
>+class ImageHelper;
>+
>+using RenderPassAndSerial = ObjectAndSerial<RenderPass>;
>+using PipelineAndSerial   = ObjectAndSerial<Pipeline>;
>+
>+using RefCountedDescriptorSetLayout = RefCounted<DescriptorSetLayout>;
>+using RefCountedPipelineLayout      = RefCounted<PipelineLayout>;
>+
>+// Packed Vk resource descriptions.
>+// Most Vk types use many more bits than required to represent the underlying data.
>+// Since ANGLE wants to cache things like RenderPasses and Pipeline State Objects using
>+// hashing (and also needs to check equality) we can optimize these operations by
>+// using fewer bits. Hence the packed types.
>+//
>+// One implementation note: these types could potentially be improved by using even
>+// fewer bits. For example, boolean values could be represented by a single bit instead
>+// of a uint8_t. However at the current time there are concerns about the portability
>+// of bitfield operators, and complexity issues with using bit mask operations. This is
>+// something likely we will want to investigate as the Vulkan implementation progresses.
>+//
>+// Second implementation note: the struct packing is also a bit fragile, and some of the
>+// packing requirements depend on using alignas and field ordering to get the result of
>+// packing nicely into the desired space. This is something we could also potentially fix
>+// with a redesign to use bitfields or bit mask operations.
>+
>+// Enable struct padding warnings for the code below since it is used in caches.
>+ANGLE_ENABLE_STRUCT_PADDING_WARNINGS
>+
>+class alignas(4) RenderPassDesc final
>+{
>+  public:
>+    RenderPassDesc();
>+    ~RenderPassDesc();
>+    RenderPassDesc(const RenderPassDesc &other);
>+    RenderPassDesc &operator=(const RenderPassDesc &other);
>+
>+    // The caller must pack the depth/stencil attachment last.
>+    void packAttachment(const Format &format);
>+
>+    size_t hash() const;
>+
>+    size_t colorAttachmentCount() const;
>+    size_t attachmentCount() const;
>+
>+    void setSamples(GLint samples);
>+
>+    uint8_t samples() const { return mSamples; }
>+
>+    angle::FormatID operator[](size_t index) const
>+    {
>+        ASSERT(index < gl::IMPLEMENTATION_MAX_DRAW_BUFFERS + 1);
>+        return static_cast<angle::FormatID>(mAttachmentFormats[index]);
>+    }
>+
>+  private:
>+    uint8_t mSamples;
>+    uint8_t mColorAttachmentCount : 4;
>+    uint8_t mDepthStencilAttachmentCount : 4;
>+    gl::AttachmentArray<uint8_t> mAttachmentFormats;
>+};
>+
>+bool operator==(const RenderPassDesc &lhs, const RenderPassDesc &rhs);
>+
>+constexpr size_t kRenderPassDescSize = sizeof(RenderPassDesc);
>+static_assert(kRenderPassDescSize == 12, "Size check failed");
>+
>+struct PackedAttachmentOpsDesc final
>+{
>+    // VkAttachmentLoadOp is in range [0, 2], and VkAttachmentStoreOp is in range [0, 1].
>+    uint16_t loadOp : 2;
>+    uint16_t storeOp : 1;
>+    uint16_t stencilLoadOp : 2;
>+    uint16_t stencilStoreOp : 1;
>+
>+    // 5-bits to force pad the structure to exactly 2 bytes.  Note that we currently don't support
>+    // any of the extension layouts, whose values start at 1'000'000'000.
>+    uint16_t initialLayout : 5;
>+    uint16_t finalLayout : 5;
>+};
>+
>+static_assert(sizeof(PackedAttachmentOpsDesc) == 2, "Size check failed");
>+
>+class AttachmentOpsArray final
>+{
>+  public:
>+    AttachmentOpsArray();
>+    ~AttachmentOpsArray();
>+    AttachmentOpsArray(const AttachmentOpsArray &other);
>+    AttachmentOpsArray &operator=(const AttachmentOpsArray &other);
>+
>+    const PackedAttachmentOpsDesc &operator[](size_t index) const;
>+    PackedAttachmentOpsDesc &operator[](size_t index);
>+
>+    // Initializes an attachment op with whatever values. Used for compatible RenderPass checks.
>+    void initDummyOp(size_t index, VkImageLayout initialLayout, VkImageLayout finalLayout);
>+    // Initialize an attachment op with all load and store operations.
>+    void initWithLoadStore(size_t index, VkImageLayout initialLayout, VkImageLayout finalLayout);
>+
>+    size_t hash() const;
>+
>+  private:
>+    gl::AttachmentArray<PackedAttachmentOpsDesc> mOps;
>+};
>+
>+bool operator==(const AttachmentOpsArray &lhs, const AttachmentOpsArray &rhs);
>+
>+static_assert(sizeof(AttachmentOpsArray) == 20, "Size check failed");
>+
>+struct PackedAttribDesc final
>+{
>+    uint8_t format;
>+
>+    // TODO(http://anglebug.com/2672): Emulate divisors greater than UBYTE_MAX.
>+    uint8_t divisor;
>+
>+    // Can only take 11 bits on NV.
>+    uint16_t offset;
>+
>+    // Although technically stride can be any value in ES 2.0, in practice supporting stride
>+    // greater than MAX_USHORT should not be that helpful. Note that stride limits are
>+    // introduced in ES 3.1.
>+    uint16_t stride;
>+};
>+
>+constexpr size_t kPackedAttribDescSize = sizeof(PackedAttribDesc);
>+static_assert(kPackedAttribDescSize == 6, "Size mismatch");
>+
>+struct VertexInputAttributes final
>+{
>+    PackedAttribDesc attribs[gl::MAX_VERTEX_ATTRIBS];
>+};
>+
>+constexpr size_t kVertexInputAttributesSize = sizeof(VertexInputAttributes);
>+static_assert(kVertexInputAttributesSize == 96, "Size mismatch");
>+
>+struct RasterizationStateBits final
>+{
>+    uint32_t depthClampEnable : 4;
>+    uint32_t rasterizationDiscardEnable : 4;
>+    uint32_t polygonMode : 4;
>+    uint32_t cullMode : 4;
>+    uint32_t frontFace : 4;
>+    uint32_t depthBiasEnable : 4;
>+    uint32_t rasterizationSamples : 4;
>+    uint32_t sampleShadingEnable : 1;
>+    uint32_t alphaToCoverageEnable : 1;
>+    uint32_t alphaToOneEnable : 2;
>+};
>+
>+constexpr size_t kRasterizationStateBitsSize = sizeof(RasterizationStateBits);
>+static_assert(kRasterizationStateBitsSize == 4, "Size check failed");
>+
>+struct PackedRasterizationAndMultisampleStateInfo final
>+{
>+    RasterizationStateBits bits;
>+    // Padded to ensure there's no gaps in this structure or those that use it.
>+    float minSampleShading;
>+    uint32_t sampleMask[gl::MAX_SAMPLE_MASK_WORDS];
>+    // Note: depth bias clamp is only exposed in a 3.1 extension, but left here for completeness.
>+    float depthBiasClamp;
>+    float depthBiasConstantFactor;
>+    float depthBiasSlopeFactor;
>+    float lineWidth;
>+};
>+
>+constexpr size_t kPackedRasterizationAndMultisampleStateSize =
>+    sizeof(PackedRasterizationAndMultisampleStateInfo);
>+static_assert(kPackedRasterizationAndMultisampleStateSize == 32, "Size check failed");
>+
>+struct StencilOps final
>+{
>+    uint8_t fail : 4;
>+    uint8_t pass : 4;
>+    uint8_t depthFail : 4;
>+    uint8_t compare : 4;
>+};
>+
>+constexpr size_t kStencilOpsSize = sizeof(StencilOps);
>+static_assert(kStencilOpsSize == 2, "Size check failed");
>+
>+struct PackedStencilOpState final
>+{
>+    StencilOps ops;
>+    uint8_t compareMask;
>+    uint8_t writeMask;
>+};
>+
>+constexpr size_t kPackedStencilOpSize = sizeof(PackedStencilOpState);
>+static_assert(kPackedStencilOpSize == 4, "Size check failed");
>+
>+struct DepthStencilEnableFlags final
>+{
>+    uint8_t depthTest : 2;  // these only need one bit each. the extra is used as padding.
>+    uint8_t depthWrite : 2;
>+    uint8_t depthBoundsTest : 2;
>+    uint8_t stencilTest : 2;
>+};
>+
>+constexpr size_t kDepthStencilEnableFlagsSize = sizeof(DepthStencilEnableFlags);
>+static_assert(kDepthStencilEnableFlagsSize == 1, "Size check failed");
>+
>+struct PackedDepthStencilStateInfo final
>+{
>+    DepthStencilEnableFlags enable;
>+    uint8_t frontStencilReference;
>+    uint8_t backStencilReference;
>+    uint8_t depthCompareOp;  // only needs 4 bits. extra used as padding.
>+    float minDepthBounds;
>+    float maxDepthBounds;
>+    PackedStencilOpState front;
>+    PackedStencilOpState back;
>+};
>+
>+constexpr size_t kPackedDepthStencilStateSize = sizeof(PackedDepthStencilStateInfo);
>+static_assert(kPackedDepthStencilStateSize == 20, "Size check failed");
>+
>+struct LogicOpState final
>+{
>+    uint8_t opEnable : 1;
>+    uint8_t op : 7;
>+};
>+
>+constexpr size_t kLogicOpStateSize = sizeof(LogicOpState);
>+static_assert(kLogicOpStateSize == 1, "Size check failed");
>+
>+struct PackedColorBlendAttachmentState final
>+{
>+    uint16_t srcColorBlendFactor : 5;
>+    uint16_t dstColorBlendFactor : 5;
>+    uint16_t colorBlendOp : 6;
>+    uint16_t srcAlphaBlendFactor : 5;
>+    uint16_t dstAlphaBlendFactor : 5;
>+    uint16_t alphaBlendOp : 6;
>+};
>+
>+constexpr size_t kPackedColorBlendAttachmentStateSize = sizeof(PackedColorBlendAttachmentState);
>+static_assert(kPackedColorBlendAttachmentStateSize == 4, "Size check failed");
>+
>+struct PrimitiveState final
>+{
>+    uint16_t topology : 15;
>+    uint16_t restartEnable : 1;
>+};
>+
>+constexpr size_t kPrimitiveStateSize = sizeof(PrimitiveState);
>+static_assert(kPrimitiveStateSize == 2, "Size check failed");
>+
>+struct PackedInputAssemblyAndColorBlendStateInfo final
>+{
>+    uint8_t colorWriteMaskBits[gl::IMPLEMENTATION_MAX_DRAW_BUFFERS / 2];
>+    PackedColorBlendAttachmentState attachments[gl::IMPLEMENTATION_MAX_DRAW_BUFFERS];
>+    float blendConstants[4];
>+    LogicOpState logic;
>+    uint8_t blendEnableMask;
>+    PrimitiveState primitive;
>+};
>+
>+constexpr size_t kPackedInputAssemblyAndColorBlendStateSize =
>+    sizeof(PackedInputAssemblyAndColorBlendStateInfo);
>+static_assert(kPackedInputAssemblyAndColorBlendStateSize == 56, "Size check failed");
>+
>+constexpr size_t kGraphicsPipelineDescSumOfSizes =
>+    kVertexInputAttributesSize + kPackedInputAssemblyAndColorBlendStateSize +
>+    kPackedRasterizationAndMultisampleStateSize + kPackedDepthStencilStateSize +
>+    kRenderPassDescSize + sizeof(VkViewport) + sizeof(VkRect2D);
>+
>+// Number of dirty bits in the dirty bit set.
>+constexpr size_t kGraphicsPipelineDirtyBitBytes = 4;
>+constexpr static size_t kNumGraphicsPipelineDirtyBits =
>+    kGraphicsPipelineDescSumOfSizes / kGraphicsPipelineDirtyBitBytes;
>+static_assert(kNumGraphicsPipelineDirtyBits <= 64, "Too many pipeline dirty bits");
>+
>+// Set of dirty bits. Each bit represents kGraphicsPipelineDirtyBitBytes in the desc.
>+using GraphicsPipelineTransitionBits = angle::BitSet<kNumGraphicsPipelineDirtyBits>;
>+
>+// State changes are applied through the update methods. Each update method can also have a
>+// sibling method that applies the update without marking a state transition. The non-transition
>+// update methods are used for internal shader pipelines. Not every non-transition update method
>+// is implemented yet as not every state is used in internal shaders.
>+class GraphicsPipelineDesc final
>+{
>+  public:
>+    // Use aligned allocation and free so we can use the alignas keyword.
>+    void *operator new(std::size_t size);
>+    void operator delete(void *ptr);
>+
>+    GraphicsPipelineDesc();
>+    ~GraphicsPipelineDesc();
>+    GraphicsPipelineDesc(const GraphicsPipelineDesc &other);
>+    GraphicsPipelineDesc &operator=(const GraphicsPipelineDesc &other);
>+
>+    size_t hash() const;
>+    bool operator==(const GraphicsPipelineDesc &other) const;
>+
>+    void initDefaults();
>+
>+    // For custom comparisons.
>+    template <typename T>
>+    const T *getPtr() const
>+    {
>+        return reinterpret_cast<const T *>(this);
>+    }
>+
>+    angle::Result initializePipeline(vk::Context *context,
>+                                     const vk::PipelineCache &pipelineCacheVk,
>+                                     const RenderPass &compatibleRenderPass,
>+                                     const PipelineLayout &pipelineLayout,
>+                                     const gl::AttributesMask &activeAttribLocationsMask,
>+                                     const ShaderModule *vertexModule,
>+                                     const ShaderModule *fragmentModule,
>+                                     Pipeline *pipelineOut) const;
>+
>+    // Vertex input state. For ES 3.1 this should be separated into binding and attribute.
>+    void updateVertexInput(GraphicsPipelineTransitionBits *transition,
>+                           uint32_t attribIndex,
>+                           GLuint stride,
>+                           GLuint divisor,
>+                           VkFormat format,
>+                           GLuint relativeOffset);
>+
>+    // Input assembly info
>+    void updateTopology(GraphicsPipelineTransitionBits *transition, gl::PrimitiveMode drawMode);
>+
>+    // Raster states
>+    void updateCullMode(GraphicsPipelineTransitionBits *transition,
>+                        const gl::RasterizerState &rasterState);
>+    void updateFrontFace(GraphicsPipelineTransitionBits *transition,
>+                         const gl::RasterizerState &rasterState,
>+                         bool invertFrontFace);
>+    void updateLineWidth(GraphicsPipelineTransitionBits *transition, float lineWidth);
>+
>+    // RenderPass description.
>+    const RenderPassDesc &getRenderPassDesc() const { return mRenderPassDesc; }
>+
>+    void setRenderPassDesc(const RenderPassDesc &renderPassDesc);
>+    void updateRenderPassDesc(GraphicsPipelineTransitionBits *transition,
>+                              const RenderPassDesc &renderPassDesc);
>+
>+    // Blend states
>+    void updateBlendEnabled(GraphicsPipelineTransitionBits *transition, bool isBlendEnabled);
>+    void updateBlendColor(GraphicsPipelineTransitionBits *transition, const gl::ColorF &color);
>+    void updateBlendFuncs(GraphicsPipelineTransitionBits *transition,
>+                          const gl::BlendState &blendState);
>+    void updateBlendEquations(GraphicsPipelineTransitionBits *transition,
>+                              const gl::BlendState &blendState);
>+    void setColorWriteMask(VkColorComponentFlags colorComponentFlags,
>+                           const gl::DrawBufferMask &alphaMask);
>+    void setSingleColorWriteMask(uint32_t colorIndex, VkColorComponentFlags colorComponentFlags);
>+    void updateColorWriteMask(GraphicsPipelineTransitionBits *transition,
>+                              VkColorComponentFlags colorComponentFlags,
>+                              const gl::DrawBufferMask &alphaMask);
>+
>+    // Depth/stencil states.
>+    void setDepthTestEnabled(bool enabled);
>+    void setDepthWriteEnabled(bool enabled);
>+    void setDepthFunc(VkCompareOp op);
>+    void setStencilTestEnabled(bool enabled);
>+    void setStencilFrontFuncs(uint8_t reference, VkCompareOp compareOp, uint8_t compareMask);
>+    void setStencilBackFuncs(uint8_t reference, VkCompareOp compareOp, uint8_t compareMask);
>+    void setStencilFrontOps(VkStencilOp failOp, VkStencilOp passOp, VkStencilOp depthFailOp);
>+    void setStencilBackOps(VkStencilOp failOp, VkStencilOp passOp, VkStencilOp depthFailOp);
>+    void setStencilFrontWriteMask(uint8_t mask);
>+    void setStencilBackWriteMask(uint8_t mask);
>+    void updateDepthTestEnabled(GraphicsPipelineTransitionBits *transition,
>+                                const gl::DepthStencilState &depthStencilState,
>+                                const gl::Framebuffer *drawFramebuffer);
>+    void updateDepthFunc(GraphicsPipelineTransitionBits *transition,
>+                         const gl::DepthStencilState &depthStencilState);
>+    void updateDepthWriteEnabled(GraphicsPipelineTransitionBits *transition,
>+                                 const gl::DepthStencilState &depthStencilState,
>+                                 const gl::Framebuffer *drawFramebuffer);
>+    void updateStencilTestEnabled(GraphicsPipelineTransitionBits *transition,
>+                                  const gl::DepthStencilState &depthStencilState,
>+                                  const gl::Framebuffer *drawFramebuffer);
>+    void updateStencilFrontFuncs(GraphicsPipelineTransitionBits *transition,
>+                                 GLint ref,
>+                                 const gl::DepthStencilState &depthStencilState);
>+    void updateStencilBackFuncs(GraphicsPipelineTransitionBits *transition,
>+                                GLint ref,
>+                                const gl::DepthStencilState &depthStencilState);
>+    void updateStencilFrontOps(GraphicsPipelineTransitionBits *transition,
>+                               const gl::DepthStencilState &depthStencilState);
>+    void updateStencilBackOps(GraphicsPipelineTransitionBits *transition,
>+                              const gl::DepthStencilState &depthStencilState);
>+    void updateStencilFrontWriteMask(GraphicsPipelineTransitionBits *transition,
>+                                     const gl::DepthStencilState &depthStencilState,
>+                                     const gl::Framebuffer *drawFramebuffer);
>+    void updateStencilBackWriteMask(GraphicsPipelineTransitionBits *transition,
>+                                    const gl::DepthStencilState &depthStencilState,
>+                                    const gl::Framebuffer *drawFramebuffer);
>+
>+    // Depth offset.
>+    void updatePolygonOffsetFillEnabled(GraphicsPipelineTransitionBits *transition, bool enabled);
>+    void updatePolygonOffset(GraphicsPipelineTransitionBits *transition,
>+                             const gl::RasterizerState &rasterState);
>+
>+    // Viewport and scissor.
>+    void setViewport(const VkViewport &viewport);
>+    void updateViewport(GraphicsPipelineTransitionBits *transition, const VkViewport &viewport);
>+    void updateDepthRange(GraphicsPipelineTransitionBits *transition,
>+                          float nearPlane,
>+                          float farPlane);
>+    void setScissor(const VkRect2D &scissor);
>+    void updateScissor(GraphicsPipelineTransitionBits *transition, const VkRect2D &scissor);
>+
>+  private:
>+    VertexInputAttributes mVertexInputAttribs;
>+    RenderPassDesc mRenderPassDesc;
>+    PackedRasterizationAndMultisampleStateInfo mRasterizationAndMultisampleStateInfo;
>+    PackedDepthStencilStateInfo mDepthStencilStateInfo;
>+    PackedInputAssemblyAndColorBlendStateInfo mInputAssemblyAndColorBlendStateInfo;
>+    VkViewport mViewport;
>+    VkRect2D mScissor;
>+};
>+
>+// Verify the packed pipeline description has no gaps in the packing.
>+// This is not guaranteed by the spec, but is validated by a compile-time check.
>+// No gaps or padding at the end ensures that hashing and memcmp checks will not run
>+// into uninitialized memory regions.
>+constexpr size_t kGraphicsPipelineDescSize = sizeof(GraphicsPipelineDesc);
>+static_assert(kGraphicsPipelineDescSize == kGraphicsPipelineDescSumOfSizes, "Size mismatch");
>+
>+constexpr uint32_t kMaxDescriptorSetLayoutBindings = gl::IMPLEMENTATION_MAX_ACTIVE_TEXTURES;
>+
>+using DescriptorSetLayoutBindingVector =
>+    angle::FixedVector<VkDescriptorSetLayoutBinding, kMaxDescriptorSetLayoutBindings>;
>+
>+// A packed description of a descriptor set layout. Use similarly to RenderPassDesc and
>+// GraphicsPipelineDesc. Currently we only need to differentiate layouts based on sampler usage. In
>+// the future we could generalize this.
>+class DescriptorSetLayoutDesc final
>+{
>+  public:
>+    DescriptorSetLayoutDesc();
>+    ~DescriptorSetLayoutDesc();
>+    DescriptorSetLayoutDesc(const DescriptorSetLayoutDesc &other);
>+    DescriptorSetLayoutDesc &operator=(const DescriptorSetLayoutDesc &other);
>+
>+    size_t hash() const;
>+    bool operator==(const DescriptorSetLayoutDesc &other) const;
>+
>+    void update(uint32_t bindingIndex, VkDescriptorType type, uint32_t count);
>+
>+    void unpackBindings(DescriptorSetLayoutBindingVector *bindings) const;
>+
>+  private:
>+    struct PackedDescriptorSetBinding
>+    {
>+        uint16_t type;   // Stores a packed VkDescriptorType descriptorType.
>+        uint16_t count;  // Stores a packed uint32_t descriptorCount.
>+        // We currently make all descriptors available in the VS and FS shaders.
>+    };
>+
>+    static_assert(sizeof(PackedDescriptorSetBinding) == sizeof(uint32_t), "Unexpected size");
>+
>+    // This is a compact representation of a descriptor set layout.
>+    std::array<PackedDescriptorSetBinding, kMaxDescriptorSetLayoutBindings>
>+        mPackedDescriptorSetLayout;
>+};
>+
>+// The following are for caching descriptor set layouts. Limited to max two descriptor set layouts
>+// and one push constant per shader stage. This can be extended in the future.
>+constexpr size_t kMaxDescriptorSetLayouts = 3;
>+constexpr size_t kMaxPushConstantRanges   = angle::EnumSize<gl::ShaderType>();
>+
>+struct PackedPushConstantRange
>+{
>+    uint32_t offset;
>+    uint32_t size;
>+};
>+
>+template <typename T>
>+using DescriptorSetLayoutArray = std::array<T, kMaxDescriptorSetLayouts>;
>+using DescriptorSetLayoutPointerArray =
>+    DescriptorSetLayoutArray<BindingPointer<DescriptorSetLayout>>;
>+template <typename T>
>+using PushConstantRangeArray = std::array<T, kMaxPushConstantRanges>;
>+
>+class PipelineLayoutDesc final
>+{
>+  public:
>+    PipelineLayoutDesc();
>+    ~PipelineLayoutDesc();
>+    PipelineLayoutDesc(const PipelineLayoutDesc &other);
>+    PipelineLayoutDesc &operator=(const PipelineLayoutDesc &rhs);
>+
>+    size_t hash() const;
>+    bool operator==(const PipelineLayoutDesc &other) const;
>+
>+    void updateDescriptorSetLayout(uint32_t setIndex, const DescriptorSetLayoutDesc &desc);
>+    void updatePushConstantRange(gl::ShaderType shaderType, uint32_t offset, uint32_t size);
>+
>+    const PushConstantRangeArray<PackedPushConstantRange> &getPushConstantRanges() const;
>+
>+  private:
>+    DescriptorSetLayoutArray<DescriptorSetLayoutDesc> mDescriptorSetLayouts;
>+    PushConstantRangeArray<PackedPushConstantRange> mPushConstantRanges;
>+
>+    // Verify the arrays are properly packed.
>+    static_assert(sizeof(decltype(mDescriptorSetLayouts)) ==
>+                      (sizeof(DescriptorSetLayoutDesc) * kMaxDescriptorSetLayouts),
>+                  "Unexpected size");
>+    static_assert(sizeof(decltype(mPushConstantRanges)) ==
>+                      (sizeof(PackedPushConstantRange) * kMaxPushConstantRanges),
>+                  "Unexpected size");
>+};
>+
>+// Verify the structure is properly packed.
>+static_assert(sizeof(PipelineLayoutDesc) ==
>+                  (sizeof(DescriptorSetLayoutArray<DescriptorSetLayoutDesc>) +
>+                   sizeof(std::array<PackedPushConstantRange, kMaxPushConstantRanges>)),
>+              "Unexpected Size");
>+
>+// Disable warnings about struct padding.
>+ANGLE_DISABLE_STRUCT_PADDING_WARNINGS
>+
>+class PipelineHelper;
>+
>+struct GraphicsPipelineTransition
>+{
>+    GraphicsPipelineTransition();
>+    GraphicsPipelineTransition(const GraphicsPipelineTransition &other);
>+    GraphicsPipelineTransition(GraphicsPipelineTransitionBits bits,
>+                               const GraphicsPipelineDesc *desc,
>+                               PipelineHelper *pipeline);
>+
>+    GraphicsPipelineTransitionBits bits;
>+    const GraphicsPipelineDesc *desc;
>+    PipelineHelper *target;
>+};
>+
>+ANGLE_INLINE GraphicsPipelineTransition::GraphicsPipelineTransition() = default;
>+
>+ANGLE_INLINE GraphicsPipelineTransition::GraphicsPipelineTransition(
>+    const GraphicsPipelineTransition &other) = default;
>+
>+ANGLE_INLINE GraphicsPipelineTransition::GraphicsPipelineTransition(
>+    GraphicsPipelineTransitionBits bits,
>+    const GraphicsPipelineDesc *desc,
>+    PipelineHelper *pipeline)
>+    : bits(bits), desc(desc), target(pipeline)
>+{}
>+
>+ANGLE_INLINE bool GraphicsPipelineTransitionMatch(GraphicsPipelineTransitionBits bitsA,
>+                                                  GraphicsPipelineTransitionBits bitsB,
>+                                                  const GraphicsPipelineDesc &descA,
>+                                                  const GraphicsPipelineDesc &descB)
>+{
>+    if (bitsA != bitsB)
>+        return false;
>+
>+    // We currently mask over 4 bytes of the pipeline description with each dirty bit.
>+    // We could consider using 8 bytes and a mask of 32 bits. This would make some parts
>+    // of the code faster. The for loop below would scan over twice as many bits per iteration.
>+    // But there may be more collisions between the same dirty bit masks leading to different
>+    // transitions. Thus there may be additional cost when applications use many transitions.
>+    // We should revisit this in the future and investigate using different bit widths.
>+    static_assert(sizeof(uint32_t) == kGraphicsPipelineDirtyBitBytes, "Size mismatch");
>+
>+    const uint32_t *rawPtrA = descA.getPtr<uint32_t>();
>+    const uint32_t *rawPtrB = descB.getPtr<uint32_t>();
>+
>+    for (size_t dirtyBit : bitsA)
>+    {
>+        if (rawPtrA[dirtyBit] != rawPtrB[dirtyBit])
>+            return false;
>+    }
>+
>+    return true;
>+}
>+
>+class PipelineHelper final : angle::NonCopyable
>+{
>+  public:
>+    PipelineHelper();
>+    ~PipelineHelper();
>+    inline explicit PipelineHelper(Pipeline &&pipeline);
>+
>+    void destroy(VkDevice device);
>+
>+    void updateSerial(Serial serial) { mSerial = serial; }
>+    bool valid() const { return mPipeline.valid(); }
>+    Serial getSerial() const { return mSerial; }
>+    Pipeline &getPipeline() { return mPipeline; }
>+
>+    ANGLE_INLINE bool findTransition(GraphicsPipelineTransitionBits bits,
>+                                     const GraphicsPipelineDesc &desc,
>+                                     PipelineHelper **pipelineOut) const
>+    {
>+        // Search could be improved using sorting or hashing.
>+        for (const GraphicsPipelineTransition &transition : mTransitions)
>+        {
>+            if (GraphicsPipelineTransitionMatch(transition.bits, bits, *transition.desc, desc))
>+            {
>+                *pipelineOut = transition.target;
>+                return true;
>+            }
>+        }
>+
>+        return false;
>+    }
>+
>+    void addTransition(GraphicsPipelineTransitionBits bits,
>+                       const GraphicsPipelineDesc *desc,
>+                       PipelineHelper *pipeline);
>+
>+  private:
>+    std::vector<GraphicsPipelineTransition> mTransitions;
>+    Serial mSerial;
>+    Pipeline mPipeline;
>+};
>+
>+ANGLE_INLINE PipelineHelper::PipelineHelper(Pipeline &&pipeline) : mPipeline(std::move(pipeline)) {}
>+
>+}  // namespace vk
>+}  // namespace rx
>+
>+// Introduce a std::hash for a RenderPassDesc
>+namespace std
>+{
>+template <>
>+struct hash<rx::vk::RenderPassDesc>
>+{
>+    size_t operator()(const rx::vk::RenderPassDesc &key) const { return key.hash(); }
>+};
>+
>+template <>
>+struct hash<rx::vk::AttachmentOpsArray>
>+{
>+    size_t operator()(const rx::vk::AttachmentOpsArray &key) const { return key.hash(); }
>+};
>+
>+template <>
>+struct hash<rx::vk::GraphicsPipelineDesc>
>+{
>+    size_t operator()(const rx::vk::GraphicsPipelineDesc &key) const { return key.hash(); }
>+};
>+
>+template <>
>+struct hash<rx::vk::DescriptorSetLayoutDesc>
>+{
>+    size_t operator()(const rx::vk::DescriptorSetLayoutDesc &key) const { return key.hash(); }
>+};
>+
>+template <>
>+struct hash<rx::vk::PipelineLayoutDesc>
>+{
>+    size_t operator()(const rx::vk::PipelineLayoutDesc &key) const { return key.hash(); }
>+};
>+}  // namespace std
>+
>+namespace rx
>+{
>+// TODO(jmadill): Add cache trimming/eviction.
>+class RenderPassCache final : angle::NonCopyable
>+{
>+  public:
>+    RenderPassCache();
>+    ~RenderPassCache();
>+
>+    void destroy(VkDevice device);
>+
>+    ANGLE_INLINE angle::Result getCompatibleRenderPass(vk::Context *context,
>+                                                       Serial serial,
>+                                                       const vk::RenderPassDesc &desc,
>+                                                       vk::RenderPass **renderPassOut)
>+    {
>+        auto outerIt = mPayload.find(desc);
>+        if (outerIt != mPayload.end())
>+        {
>+            InnerCache &innerCache = outerIt->second;
>+            ASSERT(!innerCache.empty());
>+
>+            // Find the first element and return it.
>+            innerCache.begin()->second.updateSerial(serial);
>+            *renderPassOut = &innerCache.begin()->second.get();
>+            return angle::Result::Continue;
>+        }
>+
>+        return addRenderPass(context, serial, desc, renderPassOut);
>+    }
>+
>+    angle::Result getRenderPassWithOps(vk::Context *context,
>+                                       Serial serial,
>+                                       const vk::RenderPassDesc &desc,
>+                                       const vk::AttachmentOpsArray &attachmentOps,
>+                                       vk::RenderPass **renderPassOut);
>+
>+  private:
>+    angle::Result addRenderPass(vk::Context *context,
>+                                Serial serial,
>+                                const vk::RenderPassDesc &desc,
>+                                vk::RenderPass **renderPassOut);
>+
>+    // Use a two-layer caching scheme. The top level matches the "compatible" RenderPass elements.
>+    // The second layer caches the attachment load/store ops and initial/final layout.
>+    using InnerCache = std::unordered_map<vk::AttachmentOpsArray, vk::RenderPassAndSerial>;
>+    using OuterCache = std::unordered_map<vk::RenderPassDesc, InnerCache>;
>+
>+    OuterCache mPayload;
>+};
>+
>+// TODO(jmadill): Add cache trimming/eviction.
>+class GraphicsPipelineCache final : angle::NonCopyable
>+{
>+  public:
>+    GraphicsPipelineCache();
>+    ~GraphicsPipelineCache();
>+
>+    void destroy(VkDevice device);
>+    void release(RendererVk *renderer);
>+
>+    void populate(const vk::GraphicsPipelineDesc &desc, vk::Pipeline &&pipeline);
>+
>+    ANGLE_INLINE angle::Result getPipeline(vk::Context *context,
>+                                           const vk::PipelineCache &pipelineCacheVk,
>+                                           const vk::RenderPass &compatibleRenderPass,
>+                                           const vk::PipelineLayout &pipelineLayout,
>+                                           const gl::AttributesMask &activeAttribLocationsMask,
>+                                           const vk::ShaderModule *vertexModule,
>+                                           const vk::ShaderModule *fragmentModule,
>+                                           const vk::GraphicsPipelineDesc &desc,
>+                                           const vk::GraphicsPipelineDesc **descPtrOut,
>+                                           vk::PipelineHelper **pipelineOut)
>+    {
>+        auto item = mPayload.find(desc);
>+        if (item != mPayload.end())
>+        {
>+            *descPtrOut  = &item->first;
>+            *pipelineOut = &item->second;
>+            return angle::Result::Continue;
>+        }
>+
>+        return insertPipeline(context, pipelineCacheVk, compatibleRenderPass, pipelineLayout,
>+                              activeAttribLocationsMask, vertexModule, fragmentModule, desc,
>+                              descPtrOut, pipelineOut);
>+    }
>+
>+  private:
>+    angle::Result insertPipeline(vk::Context *context,
>+                                 const vk::PipelineCache &pipelineCacheVk,
>+                                 const vk::RenderPass &compatibleRenderPass,
>+                                 const vk::PipelineLayout &pipelineLayout,
>+                                 const gl::AttributesMask &activeAttribLocationsMask,
>+                                 const vk::ShaderModule *vertexModule,
>+                                 const vk::ShaderModule *fragmentModule,
>+                                 const vk::GraphicsPipelineDesc &desc,
>+                                 const vk::GraphicsPipelineDesc **descPtrOut,
>+                                 vk::PipelineHelper **pipelineOut);
>+
>+    std::unordered_map<vk::GraphicsPipelineDesc, vk::PipelineHelper> mPayload;
>+};
>+
>+class DescriptorSetLayoutCache final : angle::NonCopyable
>+{
>+  public:
>+    DescriptorSetLayoutCache();
>+    ~DescriptorSetLayoutCache();
>+
>+    void destroy(VkDevice device);
>+
>+    angle::Result getDescriptorSetLayout(
>+        vk::Context *context,
>+        const vk::DescriptorSetLayoutDesc &desc,
>+        vk::BindingPointer<vk::DescriptorSetLayout> *descriptorSetLayoutOut);
>+
>+  private:
>+    std::unordered_map<vk::DescriptorSetLayoutDesc, vk::RefCountedDescriptorSetLayout> mPayload;
>+};
>+
>+class PipelineLayoutCache final : angle::NonCopyable
>+{
>+  public:
>+    PipelineLayoutCache();
>+    ~PipelineLayoutCache();
>+
>+    void destroy(VkDevice device);
>+
>+    angle::Result getPipelineLayout(vk::Context *context,
>+                                    const vk::PipelineLayoutDesc &desc,
>+                                    const vk::DescriptorSetLayoutPointerArray &descriptorSetLayouts,
>+                                    vk::BindingPointer<vk::PipelineLayout> *pipelineLayoutOut);
>+
>+  private:
>+    std::unordered_map<vk::PipelineLayoutDesc, vk::RefCountedPipelineLayout> mPayload;
>+};
>+
>+// Some descriptor set and pipeline layout constants.
>+constexpr uint32_t kVertexUniformsBindingIndex       = 0;
>+constexpr uint32_t kFragmentUniformsBindingIndex     = 1;
>+constexpr uint32_t kUniformsDescriptorSetIndex       = 0;
>+constexpr uint32_t kTextureDescriptorSetIndex        = 1;
>+constexpr uint32_t kDriverUniformsDescriptorSetIndex = 2;
>+
>+}  // namespace rx
>+
>+#endif  // LIBANGLE_RENDERER_VULKAN_VK_CACHE_UTILS_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/vk_caps_utils.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/vk_caps_utils.cpp
>new file mode 100644
>index 00000000000..2f1e9086106
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/vk_caps_utils.cpp
>@@ -0,0 +1,346 @@
>+//
>+// Copyright 2018 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// vk_utils:
>+//    Helper functions for the Vulkan Caps.
>+//
>+
>+#include "libANGLE/renderer/vulkan/vk_caps_utils.h"
>+
>+#include <type_traits>
>+
>+#include "common/utilities.h"
>+#include "libANGLE/Caps.h"
>+#include "libANGLE/formatutils.h"
>+#include "libANGLE/renderer/vulkan/DisplayVk.h"
>+#include "libANGLE/renderer/vulkan/RendererVk.h"
>+#include "vk_format_utils.h"
>+
>+namespace
>+{
>+constexpr unsigned int kComponentsPerVector = 4;
>+}  // anonymous namespace
>+
>+namespace rx
>+{
>+
>+void RendererVk::ensureCapsInitialized() const
>+{
>+    if (mCapsInitialized)
>+        return;
>+    mCapsInitialized = true;
>+
>+    ASSERT(mCurrentQueueFamilyIndex < mQueueFamilyProperties.size());
>+    const VkQueueFamilyProperties &queueFamilyProperties =
>+        mQueueFamilyProperties[mCurrentQueueFamilyIndex];
>+
>+    mNativeExtensions.setTextureExtensionSupport(mNativeTextureCaps);
>+
>+    // Enable this for simple buffer readback testing, but some functionality is missing.
>+    // TODO(jmadill): Support full mapBufferRange extension.
>+    mNativeExtensions.mapBuffer              = true;
>+    mNativeExtensions.mapBufferRange         = true;
>+    mNativeExtensions.textureStorage         = true;
>+    mNativeExtensions.framebufferBlit        = true;
>+    mNativeExtensions.copyTexture            = true;
>+    mNativeExtensions.copyCompressedTexture  = true;
>+    mNativeExtensions.debugMarker            = true;
>+    mNativeExtensions.robustness             = true;
>+    mNativeExtensions.textureBorderClamp     = false;  // not implemented yet
>+    mNativeExtensions.translatedShaderSource = true;
>+
>+    mNativeExtensions.eglImage         = true;
>+    mNativeExtensions.eglImageExternal = true;
>+    // TODO(geofflang): Support GL_OES_EGL_image_external_essl3. http://anglebug.com/2668
>+    mNativeExtensions.eglImageExternalEssl3 = false;
>+
>+    mNativeExtensions.memoryObject   = true;
>+    mNativeExtensions.memoryObjectFd = getFeatures().supportsExternalMemoryFd;
>+
>+    mNativeExtensions.semaphore   = true;
>+    mNativeExtensions.semaphoreFd = getFeatures().supportsExternalSemaphoreFd;
>+
>+    // TODO: Enable this always and emulate instanced draws if any divisor exceeds the maximum
>+    // supported.  http://anglebug.com/2672
>+    mNativeExtensions.instancedArraysANGLE = mMaxVertexAttribDivisor > 1;
>+
>+    // Only expose robust buffer access if the physical device supports it.
>+    mNativeExtensions.robustBufferAccessBehavior = mPhysicalDeviceFeatures.robustBufferAccess;
>+
>+    mNativeExtensions.eglSync = true;
>+
>+    // We use secondary command buffers almost everywhere and they require a feature to be
>+    // able to execute in the presence of queries.  As a result, we won't support queries
>+    // unless that feature is available.
>+    mNativeExtensions.occlusionQueryBoolean =
>+        vk::CommandBuffer::SupportsQueries(mPhysicalDeviceFeatures);
>+
>+    // From the Vulkan specs:
>+    // > The number of valid bits in a timestamp value is determined by the
>+    // > VkQueueFamilyProperties::timestampValidBits property of the queue on which the timestamp is
>+    // > written. Timestamps are supported on any queue which reports a non-zero value for
>+    // > timestampValidBits via vkGetPhysicalDeviceQueueFamilyProperties.
>+    mNativeExtensions.disjointTimerQuery          = queueFamilyProperties.timestampValidBits > 0;
>+    mNativeExtensions.queryCounterBitsTimeElapsed = queueFamilyProperties.timestampValidBits;
>+    mNativeExtensions.queryCounterBitsTimestamp   = queueFamilyProperties.timestampValidBits;
>+
>+    mNativeExtensions.textureFilterAnisotropic =
>+        mPhysicalDeviceFeatures.samplerAnisotropy &&
>+        mPhysicalDeviceProperties.limits.maxSamplerAnisotropy > 1.0f;
>+    mNativeExtensions.maxTextureAnisotropy =
>+        mNativeExtensions.textureFilterAnisotropic
>+            ? mPhysicalDeviceProperties.limits.maxSamplerAnisotropy
>+            : 0.0f;
>+
>+    // Vulkan natively supports non power-of-two textures
>+    mNativeExtensions.textureNPOT = true;
>+
>+    // TODO(lucferron): Eventually remove everything above this line in this function as the caps
>+    // get implemented.
>+    // https://vulkan.lunarg.com/doc/view/1.0.30.0/linux/vkspec.chunked/ch31s02.html
>+    mNativeCaps.maxElementIndex       = std::numeric_limits<GLuint>::max() - 1;
>+    mNativeCaps.max3DTextureSize      = mPhysicalDeviceProperties.limits.maxImageDimension3D;
>+    mNativeCaps.max2DTextureSize      = mPhysicalDeviceProperties.limits.maxImageDimension2D;
>+    mNativeCaps.maxArrayTextureLayers = mPhysicalDeviceProperties.limits.maxImageArrayLayers;
>+    mNativeCaps.maxLODBias            = mPhysicalDeviceProperties.limits.maxSamplerLodBias;
>+    mNativeCaps.maxCubeMapTextureSize = mPhysicalDeviceProperties.limits.maxImageDimensionCube;
>+    mNativeCaps.maxRenderbufferSize   = mNativeCaps.max2DTextureSize;
>+    mNativeCaps.minAliasedPointSize =
>+        std::max(1.0f, mPhysicalDeviceProperties.limits.pointSizeRange[0]);
>+    mNativeCaps.maxAliasedPointSize = mPhysicalDeviceProperties.limits.pointSizeRange[1];
>+
>+    mNativeCaps.minAliasedLineWidth = 1.0f;
>+    mNativeCaps.maxAliasedLineWidth = 1.0f;
>+
>+    mNativeCaps.maxDrawBuffers =
>+        std::min<uint32_t>(mPhysicalDeviceProperties.limits.maxColorAttachments,
>+                           mPhysicalDeviceProperties.limits.maxFragmentOutputAttachments);
>+    mNativeCaps.maxFramebufferWidth  = mPhysicalDeviceProperties.limits.maxFramebufferWidth;
>+    mNativeCaps.maxFramebufferHeight = mPhysicalDeviceProperties.limits.maxFramebufferHeight;
>+    mNativeCaps.maxColorAttachments  = mPhysicalDeviceProperties.limits.maxColorAttachments;
>+    mNativeCaps.maxViewportWidth     = mPhysicalDeviceProperties.limits.maxViewportDimensions[0];
>+    mNativeCaps.maxViewportHeight    = mPhysicalDeviceProperties.limits.maxViewportDimensions[1];
>+    mNativeCaps.maxSampleMaskWords   = mPhysicalDeviceProperties.limits.maxSampleMaskWords;
>+    mNativeCaps.maxColorTextureSamples =
>+        mPhysicalDeviceProperties.limits.sampledImageColorSampleCounts;
>+    mNativeCaps.maxDepthTextureSamples =
>+        mPhysicalDeviceProperties.limits.sampledImageDepthSampleCounts;
>+    mNativeCaps.maxIntegerSamples =
>+        mPhysicalDeviceProperties.limits.sampledImageIntegerSampleCounts;
>+
>+    mNativeCaps.maxVertexAttributes     = mPhysicalDeviceProperties.limits.maxVertexInputAttributes;
>+    mNativeCaps.maxVertexAttribBindings = mPhysicalDeviceProperties.limits.maxVertexInputBindings;
>+    mNativeCaps.maxVertexAttribRelativeOffset =
>+        mPhysicalDeviceProperties.limits.maxVertexInputAttributeOffset;
>+    mNativeCaps.maxVertexAttribStride =
>+        mPhysicalDeviceProperties.limits.maxVertexInputBindingStride;
>+
>+    mNativeCaps.maxElementsIndices  = std::numeric_limits<GLuint>::max();
>+    mNativeCaps.maxElementsVertices = std::numeric_limits<GLuint>::max();
>+
>+    // Looks like all floats are IEEE according to the docs here:
>+    // https://www.khronos.org/registry/vulkan/specs/1.0-wsi_extensions/html/vkspec.html#spirvenv-precision-operation
>+    mNativeCaps.vertexHighpFloat.setIEEEFloat();
>+    mNativeCaps.vertexMediumpFloat.setIEEEFloat();
>+    mNativeCaps.vertexLowpFloat.setIEEEFloat();
>+    mNativeCaps.fragmentHighpFloat.setIEEEFloat();
>+    mNativeCaps.fragmentMediumpFloat.setIEEEFloat();
>+    mNativeCaps.fragmentLowpFloat.setIEEEFloat();
>+
>+    // Can't find documentation on the int precision in Vulkan.
>+    mNativeCaps.vertexHighpInt.setTwosComplementInt(32);
>+    mNativeCaps.vertexMediumpInt.setTwosComplementInt(32);
>+    mNativeCaps.vertexLowpInt.setTwosComplementInt(32);
>+    mNativeCaps.fragmentHighpInt.setTwosComplementInt(32);
>+    mNativeCaps.fragmentMediumpInt.setTwosComplementInt(32);
>+    mNativeCaps.fragmentLowpInt.setTwosComplementInt(32);
>+
>+    // TODO(lucferron): This is something we'll need to implement custom in the back-end.
>+    // Vulkan doesn't do any waiting for you, our back-end code is going to manage sync objects,
>+    // and we'll have to check that we've exceeded the max wait timeout. Also, this is ES 3.0 so
>+    // we'll defer the implementation until we tackle the next version.
>+    // mNativeCaps.maxServerWaitTimeout
>+
>+    GLuint maxUniformVectors = mPhysicalDeviceProperties.limits.maxUniformBufferRange /
>+                               (sizeof(GLfloat) * kComponentsPerVector);
>+
>+    // Clamp the maxUniformVectors to 1024u, on AMD the maxUniformBufferRange is way too high.
>+    maxUniformVectors = std::min(1024u, maxUniformVectors);
>+
>+    const GLuint maxUniformComponents = maxUniformVectors * kComponentsPerVector;
>+
>+    // Uniforms are implemented using a uniform buffer, so the max number of uniforms we can
>+    // support is the max buffer range divided by the size of a single uniform (4X float).
>+    mNativeCaps.maxVertexUniformVectors                              = maxUniformVectors;
>+    mNativeCaps.maxShaderUniformComponents[gl::ShaderType::Vertex]   = maxUniformComponents;
>+    mNativeCaps.maxFragmentUniformVectors                            = maxUniformVectors;
>+    mNativeCaps.maxShaderUniformComponents[gl::ShaderType::Fragment] = maxUniformComponents;
>+
>+    // TODO(jmadill): this is an ES 3.0 property and we can skip implementing it for now.
>+    // This is maxDescriptorSetUniformBuffers minus the number of uniform buffers we
>+    // reserve for internal variables. We reserve one per shader stage for default uniforms
>+    // and likely one per shader stage for ANGLE internal variables.
>+    // mNativeCaps.maxShaderUniformBlocks[gl::ShaderType::Vertex] = ...
>+
>+    // we use the same bindings on each stage, so the limitation is the same combined or not.
>+    mNativeCaps.maxCombinedTextureImageUnits =
>+        mPhysicalDeviceProperties.limits.maxPerStageDescriptorSamplers;
>+    mNativeCaps.maxShaderTextureImageUnits[gl::ShaderType::Fragment] =
>+        mPhysicalDeviceProperties.limits.maxPerStageDescriptorSamplers;
>+    mNativeCaps.maxShaderTextureImageUnits[gl::ShaderType::Vertex] =
>+        mPhysicalDeviceProperties.limits.maxPerStageDescriptorSamplers;
>+
>+    // The max vertex output components should not include gl_Position.
>+    // The gles2.0 section 2.10 states that "gl_Position is not a varying variable and does
>+    // not count against this limit.", but the Vulkan spec has no such mention in its Built-in
>+    // vars section. It is implicit that we need to actually reserve it for Vulkan in that case.
>+    // TODO(lucferron): AMD has a weird behavior when we edge toward the maximum number of varyings
>+    // and can often crash. Reserving an additional varying just for them bringing the total to 2.
>+    // http://anglebug.com/2483
>+    constexpr GLint kReservedVaryingCount = 2;
>+    mNativeCaps.maxVaryingVectors =
>+        (mPhysicalDeviceProperties.limits.maxVertexOutputComponents / 4) - kReservedVaryingCount;
>+    mNativeCaps.maxVertexOutputComponents = mNativeCaps.maxVaryingVectors * 4;
>+
>+    mNativeCaps.subPixelBits = mPhysicalDeviceProperties.limits.subPixelPrecisionBits;
>+}
>+
>+namespace egl_vk
>+{
>+
>+namespace
>+{
>+
>+EGLint ComputeMaximumPBufferPixels(const VkPhysicalDeviceProperties &physicalDeviceProperties)
>+{
>+    // EGLints are signed 32-bit integers, it's fairly easy to overflow them, especially since
>+    // Vulkan's minimum guaranteed VkImageFormatProperties::maxResourceSize is 2^31 bytes.
>+    constexpr uint64_t kMaxValueForEGLint =
>+        static_cast<uint64_t>(std::numeric_limits<EGLint>::max());
>+
>+    // TODO(geofflang): Compute the maximum size of a pbuffer by using the maxResourceSize result
>+    // from vkGetPhysicalDeviceImageFormatProperties for both the color and depth stencil format and
>+    // the exact image creation parameters that would be used to create the pbuffer. Because it is
>+    // always safe to return out-of-memory errors on pbuffer allocation, it's fine to simply return
>+    // the number of pixels in a max width by max height pbuffer for now. http://anglebug.com/2622
>+
>+    // Storing the result of squaring a 32-bit unsigned int in a 64-bit unsigned int is safe.
>+    static_assert(std::is_same<decltype(physicalDeviceProperties.limits.maxImageDimension2D),
>+                               uint32_t>::value,
>+                  "physicalDeviceProperties.limits.maxImageDimension2D expected to be a uint32_t.");
>+    const uint64_t maxDimensionsSquared =
>+        static_cast<uint64_t>(physicalDeviceProperties.limits.maxImageDimension2D) *
>+        static_cast<uint64_t>(physicalDeviceProperties.limits.maxImageDimension2D);
>+
>+    return static_cast<EGLint>(std::min(maxDimensionsSquared, kMaxValueForEGLint));
>+}
>+
>+// Generates a basic config for a combination of color format, depth stencil format and sample
>+// count.
>+egl::Config GenerateDefaultConfig(const RendererVk *renderer,
>+                                  const gl::InternalFormat &colorFormat,
>+                                  const gl::InternalFormat &depthStencilFormat,
>+                                  EGLint sampleCount)
>+{
>+    const VkPhysicalDeviceProperties &physicalDeviceProperties =
>+        renderer->getPhysicalDeviceProperties();
>+    gl::Version maxSupportedESVersion = renderer->getMaxSupportedESVersion();
>+
>+    EGLint es2Support = (maxSupportedESVersion.major >= 2 ? EGL_OPENGL_ES2_BIT : 0);
>+    EGLint es3Support = (maxSupportedESVersion.major >= 3 ? EGL_OPENGL_ES3_BIT : 0);
>+
>+    egl::Config config;
>+
>+    config.renderTargetFormat = colorFormat.internalFormat;
>+    config.depthStencilFormat = depthStencilFormat.internalFormat;
>+    config.bufferSize         = colorFormat.pixelBytes * 8;
>+    config.redSize            = colorFormat.redBits;
>+    config.greenSize          = colorFormat.greenBits;
>+    config.blueSize           = colorFormat.blueBits;
>+    config.alphaSize          = colorFormat.alphaBits;
>+    config.alphaMaskSize      = 0;
>+    config.bindToTextureRGB   = colorFormat.format == GL_RGB;
>+    config.bindToTextureRGBA  = colorFormat.format == GL_RGBA || colorFormat.format == GL_BGRA_EXT;
>+    config.colorBufferType    = EGL_RGB_BUFFER;
>+    config.configCaveat       = EGL_NONE;
>+    config.conformant         = es2Support | es3Support;
>+    config.depthSize          = depthStencilFormat.depthBits;
>+    config.stencilSize        = depthStencilFormat.stencilBits;
>+    config.level              = 0;
>+    config.matchNativePixmap  = EGL_NONE;
>+    config.maxPBufferWidth    = physicalDeviceProperties.limits.maxImageDimension2D;
>+    config.maxPBufferHeight   = physicalDeviceProperties.limits.maxImageDimension2D;
>+    config.maxPBufferPixels   = ComputeMaximumPBufferPixels(physicalDeviceProperties);
>+    config.maxSwapInterval    = 1;
>+    config.minSwapInterval    = 0;
>+    config.nativeRenderable   = EGL_TRUE;
>+    config.nativeVisualID     = 0;
>+    config.nativeVisualType   = EGL_NONE;
>+    config.renderableType     = es2Support | es3Support;
>+    config.sampleBuffers      = (sampleCount > 0) ? 1 : 0;
>+    config.samples            = sampleCount;
>+    config.surfaceType        = EGL_WINDOW_BIT | EGL_PBUFFER_BIT;
>+    // Vulkan surfaces use a different origin than OpenGL, always prefer to be flipped vertically if
>+    // possible.
>+    config.optimalOrientation    = EGL_SURFACE_ORIENTATION_INVERT_Y_ANGLE;
>+    config.transparentType       = EGL_NONE;
>+    config.transparentRedValue   = 0;
>+    config.transparentGreenValue = 0;
>+    config.transparentBlueValue  = 0;
>+    config.colorComponentType =
>+        gl_egl::GLComponentTypeToEGLColorComponentType(colorFormat.componentType);
>+
>+    return config;
>+}
>+
>+}  // anonymous namespace
>+
>+egl::ConfigSet GenerateConfigs(const GLenum *colorFormats,
>+                               size_t colorFormatsCount,
>+                               const GLenum *depthStencilFormats,
>+                               size_t depthStencilFormatCount,
>+                               const EGLint *sampleCounts,
>+                               size_t sampleCountsCount,
>+                               DisplayVk *display)
>+{
>+    ASSERT(colorFormatsCount > 0);
>+    ASSERT(display != nullptr);
>+
>+    egl::ConfigSet configSet;
>+
>+    for (size_t colorFormatIdx = 0; colorFormatIdx < colorFormatsCount; colorFormatIdx++)
>+    {
>+        const gl::InternalFormat &colorFormatInfo =
>+            gl::GetSizedInternalFormatInfo(colorFormats[colorFormatIdx]);
>+        ASSERT(colorFormatInfo.sized);
>+
>+        for (size_t depthStencilFormatIdx = 0; depthStencilFormatIdx < depthStencilFormatCount;
>+             depthStencilFormatIdx++)
>+        {
>+            const gl::InternalFormat &depthStencilFormatInfo =
>+                gl::GetSizedInternalFormatInfo(depthStencilFormats[depthStencilFormatIdx]);
>+            ASSERT(depthStencilFormats[depthStencilFormatIdx] == GL_NONE ||
>+                   depthStencilFormatInfo.sized);
>+
>+            for (size_t sampleCountIndex = 0; sampleCountIndex < sampleCountsCount;
>+                 sampleCountIndex++)
>+            {
>+                egl::Config config =
>+                    GenerateDefaultConfig(display->getRenderer(), colorFormatInfo,
>+                                          depthStencilFormatInfo, sampleCounts[sampleCountIndex]);
>+                if (display->checkConfigSupport(&config))
>+                {
>+                    configSet.add(config);
>+                }
>+            }
>+        }
>+    }
>+
>+    return configSet;
>+}
>+
>+}  // namespace egl_vk
>+
>+}  // namespace rx
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/vk_caps_utils.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/vk_caps_utils.h
>new file mode 100644
>index 00000000000..e90ca7d0e9b
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/vk_caps_utils.h
>@@ -0,0 +1,61 @@
>+//
>+// Copyright 2018 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// vk_utils:
>+//    Helper functions for the Vulkan Caps.
>+//
>+
>+#ifndef LIBANGLE_RENDERER_VULKAN_VK_CAPS_UTILS_H_
>+#define LIBANGLE_RENDERER_VULKAN_VK_CAPS_UTILS_H_
>+
>+#include <vulkan/vulkan.h>
>+
>+#include "libANGLE/Config.h"
>+
>+namespace gl
>+{
>+struct Limitations;
>+struct Extensions;
>+class TextureCapsMap;
>+struct Caps;
>+struct TextureCaps;
>+struct InternalFormat;
>+}  // namespace gl
>+
>+namespace rx
>+{
>+struct FeaturesVk;
>+
>+class DisplayVk;
>+
>+namespace egl_vk
>+{
>+constexpr GLenum kConfigDepthStencilFormats[] = {GL_NONE, GL_DEPTH24_STENCIL8, GL_DEPTH_COMPONENT24,
>+                                                 GL_DEPTH_COMPONENT16};
>+
>+// Permutes over all combinations of color format, depth stencil format and sample count and
>+// generates a basic config which is passed to DisplayVk::checkConfigSupport.
>+egl::ConfigSet GenerateConfigs(const GLenum *colorFormats,
>+                               size_t colorFormatsCount,
>+                               const GLenum *depthStencilFormats,
>+                               size_t depthStencilFormatCount,
>+                               const EGLint *sampleCounts,
>+                               size_t sampleCountsCount,
>+                               DisplayVk *display);
>+
>+template <size_t ColorFormatCount, size_t DepthStencilFormatCount, size_t SampleCountsCount>
>+egl::ConfigSet GenerateConfigs(const GLenum (&colorFormats)[ColorFormatCount],
>+                               const GLenum (&depthStencilFormats)[DepthStencilFormatCount],
>+                               const EGLint (&sampleCounts)[SampleCountsCount],
>+                               DisplayVk *display)
>+{
>+    return GenerateConfigs(colorFormats, ColorFormatCount, depthStencilFormats,
>+                           DepthStencilFormatCount, sampleCounts, SampleCountsCount, display);
>+}
>+}  // namespace egl_vk
>+
>+}  // namespace rx
>+
>+#endif
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/vk_format_map.json b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/vk_format_map.json
>index af7c3bfadd8..f6d0b264c7a 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/vk_format_map.json
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/vk_format_map.json
>@@ -1,164 +1,356 @@
> {
>-    "NONE": "VK_FORMAT_UNDEFINED",
>-    "R4G4B4A4_UNORM": "VK_FORMAT_R4G4B4A4_UNORM_PACK16",
>-    "B4G4R4A4_UNORM": "VK_FORMAT_B4G4R4A4_UNORM_PACK16",
>-    "R5G6B5_UNORM": "VK_FORMAT_R5G6B5_UNORM_PACK16",
>-    "B5G6R5_UNORM": "VK_FORMAT_B5G6R5_UNORM_PACK16",
>-    "R5G5B5A1_UNORM": "VK_FORMAT_R5G5B5A1_UNORM_PACK16",
>-    "B5G5R5A1_UNORM": "VK_FORMAT_B5G5R5A1_UNORM_PACK16",
>-    "A1R5G5B5_UNORM": "VK_FORMAT_A1R5G5B5_UNORM_PACK16",
>-    "R8_UNORM": "VK_FORMAT_R8_UNORM",
>-    "R8_SNORM": "VK_FORMAT_R8_SNORM",
>-    "R8_UINT": "VK_FORMAT_R8_UINT",
>-    "R8_SINT": "VK_FORMAT_R8_SINT",
>-    "R8_SRGB": "VK_FORMAT_R8_SRGB",
>-    "R8G8_UNORM": "VK_FORMAT_R8G8_UNORM",
>-    "R8G8_SNORM": "VK_FORMAT_R8G8_SNORM",
>-    "R8G8_UINT": "VK_FORMAT_R8G8_UINT",
>-    "R8G8_SINT": "VK_FORMAT_R8G8_SINT",
>-    "R8G8_SRGB": "VK_FORMAT_R8G8_SRGB",
>-    "R8G8B8_UNORM": {
>-        "native": "VK_FORMAT_R8G8B8_UNORM",
>-        "texture": "R8G8B8A8_UNORM"
>+    "description": [
>+        "Copyright 2018 The ANGLE Project Authors. All rights reserved.",
>+        "Use of this source code is governed by a BSD-style license that can be",
>+        "found in the LICENSE file.",
>+        "",
>+        "vk_format_map.json: Format mapping between OpenGL and Vulkan.",
>+        "",
>+        "The format of the map is a dictionary where the key of each entry is the",
>+        "ANGLE format ID, and the value is the Vulkan format enum. Note some formats",
>+        "are missing from the map, these formats are either unsupported or emulated",
>+        "on Vulkan. The map matches GL formats to identical Vulkan formats; missing",
>+        "formats use the overrides table for emulation.",
>+        "",
>+        "We implement formats that aren't natively supported in Vulkan using",
>+        "fallback and override formats. These are specified as dictionaries (also keyed on",
>+        "the angle format ID), with two optional entries for Buffer and Image",
>+        "formats. Each entry specifies a fallback or override format.",
>+        "",
>+        "Override formats are used for emulated support for formats we assume are never",
>+        "supported by any Vulkan device, although they might exist. Fallback formats",
>+        "differ in that they are tested at runtime for support, and we only fall back",
>+        "if the main format is not available on this device.",
>+        "",
>+        "Also see gen_vk_format_table.py for the code generation step."
>+    ],
>+    "map": {
>+        "NONE": "VK_FORMAT_UNDEFINED",
>+        "A1R5G5B5_UNORM": "VK_FORMAT_A1R5G5B5_UNORM_PACK16",
>+        "B4G4R4A4_UNORM": "VK_FORMAT_B4G4R4A4_UNORM_PACK16",
>+        "R4G4B4A4_UNORM": "VK_FORMAT_R4G4B4A4_UNORM_PACK16",
>+        "R5G6B5_UNORM": "VK_FORMAT_R5G6B5_UNORM_PACK16",
>+        "R5G5B5A1_UNORM": "VK_FORMAT_R5G5B5A1_UNORM_PACK16",
>+        "B5G6R5_UNORM": "VK_FORMAT_B5G6R5_UNORM_PACK16",
>+        "B5G5R5A1_UNORM": "VK_FORMAT_B5G5R5A1_UNORM_PACK16",
>+        "R8_UNORM": "VK_FORMAT_R8_UNORM",
>+        "R8_SNORM": "VK_FORMAT_R8_SNORM",
>+        "R8_UINT": "VK_FORMAT_R8_UINT",
>+        "R8_SINT": "VK_FORMAT_R8_SINT",
>+        "R8_USCALED": "VK_FORMAT_R8_USCALED",
>+        "R8_SSCALED": "VK_FORMAT_R8_SSCALED",
>+        "R8G8_UNORM": "VK_FORMAT_R8G8_UNORM",
>+        "R8G8_SNORM": "VK_FORMAT_R8G8_SNORM",
>+        "R8G8_UINT": "VK_FORMAT_R8G8_UINT",
>+        "R8G8_SINT": "VK_FORMAT_R8G8_SINT",
>+        "R8G8_USCALED": "VK_FORMAT_R8G8_USCALED",
>+        "R8G8_SSCALED": "VK_FORMAT_R8G8_SSCALED",
>+        "R8G8B8_UNORM": "VK_FORMAT_R8G8B8_UNORM",
>+        "R8G8B8_SNORM": "VK_FORMAT_R8G8B8_SNORM",
>+        "R8G8B8_UINT": "VK_FORMAT_R8G8B8_UINT",
>+        "R8G8B8_SINT": "VK_FORMAT_R8G8B8_SINT",
>+        "R8G8B8_USCALED": "VK_FORMAT_R8G8B8_USCALED",
>+        "R8G8B8_SSCALED": "VK_FORMAT_R8G8B8_SSCALED",
>+        "R8G8B8_UNORM_SRGB": "VK_FORMAT_R8G8B8_SRGB",
>+        "B8G8R8_UNORM": "VK_FORMAT_B8G8R8_UNORM",
>+        "B8G8R8_SNORM": "VK_FORMAT_B8G8R8_SNORM",
>+        "B8G8R8_UINT": "VK_FORMAT_B8G8R8_UINT",
>+        "B8G8R8_SINT": "VK_FORMAT_B8G8R8_SINT",
>+        "R8G8B8A8_UNORM": "VK_FORMAT_R8G8B8A8_UNORM",
>+        "R8G8B8A8_SNORM": "VK_FORMAT_R8G8B8A8_SNORM",
>+        "R8G8B8A8_UINT": "VK_FORMAT_R8G8B8A8_UINT",
>+        "R8G8B8A8_SINT": "VK_FORMAT_R8G8B8A8_SINT",
>+        "R8G8B8A8_USCALED": "VK_FORMAT_R8G8B8A8_USCALED",
>+        "R8G8B8A8_SSCALED": "VK_FORMAT_R8G8B8A8_SSCALED",
>+        "R8G8B8A8_UNORM_SRGB": "VK_FORMAT_R8G8B8A8_SRGB",
>+        "B8G8R8A8_UNORM": "VK_FORMAT_B8G8R8A8_UNORM",
>+        "B8G8R8A8_SNORM": "VK_FORMAT_B8G8R8A8_SNORM",
>+        "B8G8R8A8_USCALED": "VK_FORMAT_B8G8R8A8_USCALED",
>+        "B8G8R8A8_SSCALED": "VK_FORMAT_B8G8R8A8_SSCALED",
>+        "B8G8R8A8_UINT": "VK_FORMAT_B8G8R8A8_UINT",
>+        "B8G8R8A8_SINT": "VK_FORMAT_B8G8R8A8_SINT",
>+        "B8G8R8A8_UNORM_SRGB": "VK_FORMAT_B8G8R8A8_SRGB",
>+        "R10G10B10A2_UNORM": "VK_FORMAT_A2B10G10R10_UNORM_PACK32",
>+        "R10G10B10A2_SNORM": "VK_FORMAT_A2B10G10R10_SNORM_PACK32",
>+        "R10G10B10A2_USCALED": "VK_FORMAT_A2B10G10R10_USCALED_PACK32",
>+        "R10G10B10A2_SSCALED": "VK_FORMAT_A2B10G10R10_SSCALED_PACK32",
>+        "R10G10B10A2_UINT": "VK_FORMAT_A2B10G10R10_UINT_PACK32",
>+        "R10G10B10A2_SINT": "VK_FORMAT_A2B10G10R10_SINT_PACK32",
>+        "R16_UNORM": "VK_FORMAT_R16_UNORM",
>+        "R16_SNORM": "VK_FORMAT_R16_SNORM",
>+        "R16_USCALED": "VK_FORMAT_R16_USCALED",
>+        "R16_SSCALED": "VK_FORMAT_R16_SSCALED",
>+        "R16_UINT": "VK_FORMAT_R16_UINT",
>+        "R16_SINT": "VK_FORMAT_R16_SINT",
>+        "R16_FLOAT": "VK_FORMAT_R16_SFLOAT",
>+        "R16G16_UNORM": "VK_FORMAT_R16G16_UNORM",
>+        "R16G16_SNORM": "VK_FORMAT_R16G16_SNORM",
>+        "R16G16_USCALED": "VK_FORMAT_R16G16_USCALED",
>+        "R16G16_SSCALED": "VK_FORMAT_R16G16_SSCALED",
>+        "R16G16_UINT": "VK_FORMAT_R16G16_UINT",
>+        "R16G16_SINT": "VK_FORMAT_R16G16_SINT",
>+        "R16G16_FLOAT": "VK_FORMAT_R16G16_SFLOAT",
>+        "R16G16B16_UNORM": "VK_FORMAT_R16G16B16_UNORM",
>+        "R16G16B16_SNORM": "VK_FORMAT_R16G16B16_SNORM",
>+        "R16G16B16_USCALED": "VK_FORMAT_R16G16B16_USCALED",
>+        "R16G16B16_SSCALED": "VK_FORMAT_R16G16B16_SSCALED",
>+        "R16G16B16_UINT": "VK_FORMAT_R16G16B16_UINT",
>+        "R16G16B16_SINT": "VK_FORMAT_R16G16B16_SINT",
>+        "R16G16B16_FLOAT": "VK_FORMAT_R16G16B16_SFLOAT",
>+        "R16G16B16A16_UNORM": "VK_FORMAT_R16G16B16A16_UNORM",
>+        "R16G16B16A16_SNORM": "VK_FORMAT_R16G16B16A16_SNORM",
>+        "R16G16B16A16_USCALED": "VK_FORMAT_R16G16B16A16_USCALED",
>+        "R16G16B16A16_SSCALED": "VK_FORMAT_R16G16B16A16_SSCALED",
>+        "R16G16B16A16_UINT": "VK_FORMAT_R16G16B16A16_UINT",
>+        "R16G16B16A16_SINT": "VK_FORMAT_R16G16B16A16_SINT",
>+        "R16G16B16A16_FLOAT": "VK_FORMAT_R16G16B16A16_SFLOAT",
>+        "R32_UINT": "VK_FORMAT_R32_UINT",
>+        "R32_SINT": "VK_FORMAT_R32_SINT",
>+        "R32_FLOAT": "VK_FORMAT_R32_SFLOAT",
>+        "R32G32_UINT": "VK_FORMAT_R32G32_UINT",
>+        "R32G32_SINT": "VK_FORMAT_R32G32_SINT",
>+        "R32G32_FLOAT": "VK_FORMAT_R32G32_SFLOAT",
>+        "R32G32B32_UINT": "VK_FORMAT_R32G32B32_UINT",
>+        "R32G32B32_SINT": "VK_FORMAT_R32G32B32_SINT",
>+        "R32G32B32_FLOAT": "VK_FORMAT_R32G32B32_SFLOAT",
>+        "R32G32B32A32_UINT": "VK_FORMAT_R32G32B32A32_UINT",
>+        "R32G32B32A32_SINT": "VK_FORMAT_R32G32B32A32_SINT",
>+        "R32G32B32A32_FLOAT": "VK_FORMAT_R32G32B32A32_SFLOAT",
>+        "R64_UINT": "VK_FORMAT_R64_UINT",
>+        "R64_SINT": "VK_FORMAT_R64_SINT",
>+        "R64_FLOAT": "VK_FORMAT_R64_SFLOAT",
>+        "R64G64_UINT": "VK_FORMAT_R64G64_UINT",
>+        "R64G64_SINT": "VK_FORMAT_R64G64_SINT",
>+        "R64G64_FLOAT": "VK_FORMAT_R64G64_SFLOAT",
>+        "R64G64B64_UINT": "VK_FORMAT_R64G64B64_UINT",
>+        "R64G64B64_SINT": "VK_FORMAT_R64G64B64_SINT",
>+        "R64G64B64_FLOAT": "VK_FORMAT_R64G64B64_SFLOAT",
>+        "R64G64B64A64_UINT": "VK_FORMAT_R64G64B64A64_UINT",
>+        "R64G64B64A64_SINT": "VK_FORMAT_R64G64B64A64_SINT",
>+        "R64G64B64A64_FLOAT": "VK_FORMAT_R64G64B64A64_SFLOAT",
>+        "B10G11R11_UFLOAT_PACK32": "VK_FORMAT_B10G11R11_UFLOAT_PACK32",
>+        "E5B9G9R9_UFLOAT_PACK32": "VK_FORMAT_E5B9G9R9_UFLOAT_PACK32",
>+        "D16_UNORM": "VK_FORMAT_D16_UNORM",
>+        "X8_D24_UNORM_PACK32": "VK_FORMAT_X8_D24_UNORM_PACK32",
>+        "D32_FLOAT": "VK_FORMAT_D32_SFLOAT",
>+        "S8_UINT": "VK_FORMAT_S8_UINT",
>+        "D16_UNORM_S8_UINT": "VK_FORMAT_D16_UNORM_S8_UINT",
>+        "D24_UNORM_S8_UINT": "VK_FORMAT_D24_UNORM_S8_UINT",
>+        "D32_FLOAT_S8X24_UINT": "VK_FORMAT_D32_SFLOAT_S8_UINT",
>+        "BC1_RGB_UNORM_BLOCK": "VK_FORMAT_BC1_RGB_UNORM_BLOCK",
>+        "BC1_RGB_UNORM_SRGB_BLOCK": "VK_FORMAT_BC1_RGB_SRGB_BLOCK",
>+        "BC1_RGBA_UNORM_BLOCK": "VK_FORMAT_BC1_RGBA_UNORM_BLOCK",
>+        "BC1_RGBA_UNORM_SRGB_BLOCK": "VK_FORMAT_BC1_RGBA_SRGB_BLOCK",
>+        "BC2_RGBA_UNORM_BLOCK": "VK_FORMAT_BC2_UNORM_BLOCK",
>+        "BC2_RGBA_UNORM_SRGB_BLOCK": "VK_FORMAT_BC2_SRGB_BLOCK",
>+        "BC3_RGBA_UNORM_BLOCK": "VK_FORMAT_BC3_UNORM_BLOCK",
>+        "BC3_RGBA_UNORM_SRGB_BLOCK": "VK_FORMAT_BC3_SRGB_BLOCK",
>+        "BPTC_RGB_UNSIGNED_FLOAT_BLOCK": "VK_FORMAT_BC6H_UFLOAT_BLOCK",
>+        "BPTC_RGB_SIGNED_FLOAT_BLOCK": "VK_FORMAT_BC6H_SFLOAT_BLOCK",
>+        "BPTC_RGBA_UNORM_BLOCK": "VK_FORMAT_BC7_UNORM_BLOCK",
>+        "BPTC_SRGB_ALPHA_UNORM_BLOCK": "VK_FORMAT_BC7_SRGB_BLOCK",
>+        "ETC2_R8G8B8_UNORM_BLOCK": "VK_FORMAT_ETC2_R8G8B8_UNORM_BLOCK",
>+        "ETC2_R8G8B8_SRGB_BLOCK": "VK_FORMAT_ETC2_R8G8B8_SRGB_BLOCK",
>+        "ETC2_R8G8B8A1_UNORM_BLOCK": "VK_FORMAT_ETC2_R8G8B8A1_UNORM_BLOCK",
>+        "ETC2_R8G8B8A1_SRGB_BLOCK": "VK_FORMAT_ETC2_R8G8B8A1_SRGB_BLOCK",
>+        "ETC2_R8G8B8A8_UNORM_BLOCK": "VK_FORMAT_ETC2_R8G8B8A8_UNORM_BLOCK",
>+        "ETC2_R8G8B8A8_SRGB_BLOCK": "VK_FORMAT_ETC2_R8G8B8A8_SRGB_BLOCK",
>+        "EAC_R11_UNORM_BLOCK": "VK_FORMAT_EAC_R11_UNORM_BLOCK",
>+        "EAC_R11_SNORM_BLOCK": "VK_FORMAT_EAC_R11_SNORM_BLOCK",
>+        "EAC_R11G11_UNORM_BLOCK": "VK_FORMAT_EAC_R11G11_UNORM_BLOCK",
>+        "EAC_R11G11_SNORM_BLOCK": "VK_FORMAT_EAC_R11G11_SNORM_BLOCK",
>+        "ASTC_4x4_UNORM_BLOCK": "VK_FORMAT_ASTC_4x4_UNORM_BLOCK",
>+        "ASTC_4x4_SRGB_BLOCK": "VK_FORMAT_ASTC_4x4_SRGB_BLOCK",
>+        "ASTC_5x4_UNORM_BLOCK": "VK_FORMAT_ASTC_5x4_UNORM_BLOCK",
>+        "ASTC_5x4_SRGB_BLOCK": "VK_FORMAT_ASTC_5x4_SRGB_BLOCK",
>+        "ASTC_5x5_UNORM_BLOCK": "VK_FORMAT_ASTC_5x5_UNORM_BLOCK",
>+        "ASTC_5x5_SRGB_BLOCK": "VK_FORMAT_ASTC_5x5_SRGB_BLOCK",
>+        "ASTC_6x5_UNORM_BLOCK": "VK_FORMAT_ASTC_6x5_UNORM_BLOCK",
>+        "ASTC_6x5_SRGB_BLOCK": "VK_FORMAT_ASTC_6x5_SRGB_BLOCK",
>+        "ASTC_6x6_UNORM_BLOCK": "VK_FORMAT_ASTC_6x6_UNORM_BLOCK",
>+        "ASTC_6x6_SRGB_BLOCK": "VK_FORMAT_ASTC_6x6_SRGB_BLOCK",
>+        "ASTC_8x5_UNORM_BLOCK": "VK_FORMAT_ASTC_8x5_UNORM_BLOCK",
>+        "ASTC_8x5_SRGB_BLOCK": "VK_FORMAT_ASTC_8x5_SRGB_BLOCK",
>+        "ASTC_8x6_UNORM_BLOCK": "VK_FORMAT_ASTC_8x6_UNORM_BLOCK",
>+        "ASTC_8x6_SRGB_BLOCK": "VK_FORMAT_ASTC_8x6_SRGB_BLOCK",
>+        "ASTC_8x8_UNORM_BLOCK": "VK_FORMAT_ASTC_8x8_UNORM_BLOCK",
>+        "ASTC_8x8_SRGB_BLOCK": "VK_FORMAT_ASTC_8x8_SRGB_BLOCK",
>+        "ASTC_10x5_UNORM_BLOCK": "VK_FORMAT_ASTC_10x5_UNORM_BLOCK",
>+        "ASTC_10x5_SRGB_BLOCK": "VK_FORMAT_ASTC_10x5_SRGB_BLOCK",
>+        "ASTC_10x6_UNORM_BLOCK": "VK_FORMAT_ASTC_10x6_UNORM_BLOCK",
>+        "ASTC_10x6_SRGB_BLOCK": "VK_FORMAT_ASTC_10x6_SRGB_BLOCK",
>+        "ASTC_10x8_UNORM_BLOCK": "VK_FORMAT_ASTC_10x8_UNORM_BLOCK",
>+        "ASTC_10x8_SRGB_BLOCK": "VK_FORMAT_ASTC_10x8_SRGB_BLOCK",
>+        "ASTC_10x10_UNORM_BLOCK": "VK_FORMAT_ASTC_10x10_UNORM_BLOCK",
>+        "ASTC_10x10_SRGB_BLOCK": "VK_FORMAT_ASTC_10x10_SRGB_BLOCK",
>+        "ASTC_12x10_UNORM_BLOCK": "VK_FORMAT_ASTC_12x10_UNORM_BLOCK",
>+        "ASTC_12x10_SRGB_BLOCK": "VK_FORMAT_ASTC_12x10_SRGB_BLOCK",
>+        "ASTC_12x12_UNORM_BLOCK": "VK_FORMAT_ASTC_12x12_UNORM_BLOCK",
>+        "ASTC_12x12_SRGB_BLOCK": "VK_FORMAT_ASTC_12x12_SRGB_BLOCK"
>     },
>-    "R8G8B8_SNORM": "VK_FORMAT_R8G8B8_SNORM",
>-    "R8G8B8_UINT": "VK_FORMAT_R8G8B8_UINT",
>-    "R8G8B8_SINT": "VK_FORMAT_R8G8B8_SINT",
>-    "R8G8B8_SRGB": "VK_FORMAT_R8G8B8_SRGB",
>-    "B8G8R8_UNORM": "VK_FORMAT_B8G8R8_UNORM",
>-    "B8G8R8_SNORM": "VK_FORMAT_B8G8R8_SNORM",
>-    "B8G8R8_UINT": "VK_FORMAT_B8G8R8_UINT",
>-    "B8G8R8_SINT": "VK_FORMAT_B8G8R8_SINT",
>-    "B8G8R8_SRGB": "VK_FORMAT_B8G8R8_SRGB",
>-    "R8G8B8A8_UNORM": "VK_FORMAT_R8G8B8A8_UNORM",
>-    "R8G8B8A8_SNORM": "VK_FORMAT_R8G8B8A8_SNORM",
>-    "R8G8B8A8_UINT": "VK_FORMAT_R8G8B8A8_UINT",
>-    "R8G8B8A8_SINT": "VK_FORMAT_R8G8B8A8_SINT",
>-    "R8G8B8A8_SRGB": "VK_FORMAT_R8G8B8A8_SRGB",
>-    "B8G8R8A8_UNORM": "VK_FORMAT_B8G8R8A8_UNORM",
>-    "B8G8R8A8_SNORM": "VK_FORMAT_B8G8R8A8_SNORM",
>-    "B8G8R8A8_USCALED": "VK_FORMAT_B8G8R8A8_USCALED",
>-    "B8G8R8A8_SSCALED": "VK_FORMAT_B8G8R8A8_SSCALED",
>-    "B8G8R8A8_UINT": "VK_FORMAT_B8G8R8A8_UINT",
>-    "B8G8R8A8_SINT": "VK_FORMAT_B8G8R8A8_SINT",
>-    "B8G8R8A8_SRGB": "VK_FORMAT_B8G8R8A8_SRGB",
>-    "A2R10G10B10_UNORM_PACK32": "VK_FORMAT_A2R10G10B10_UNORM_PACK32",
>-    "A2R10G10B10_SNORM_PACK32": "VK_FORMAT_A2R10G10B10_SNORM_PACK32",
>-    "A2R10G10B10_USCALED_PACK32": "VK_FORMAT_A2R10G10B10_USCALED_PACK32",
>-    "A2R10G10B10_SSCALED_PACK32": "VK_FORMAT_A2R10G10B10_SSCALED_PACK32",
>-    "A2R10G10B10_UINT_PACK32": "VK_FORMAT_A2R10G10B10_UINT_PACK32",
>-    "A2R10G10B10_SINT_PACK32": "VK_FORMAT_A2R10G10B10_SINT_PACK32",
>-    "A2B10G10R10_UNORM_PACK32": "VK_FORMAT_A2B10G10R10_UNORM_PACK32",
>-    "A2B10G10R10_SNORM_PACK32": "VK_FORMAT_A2B10G10R10_SNORM_PACK32",
>-    "A2B10G10R10_USCALED_PACK32": "VK_FORMAT_A2B10G10R10_USCALED_PACK32",
>-    "A2B10G10R10_SSCALED_PACK32": "VK_FORMAT_A2B10G10R10_SSCALED_PACK32",
>-    "A2B10G10R10_UINT_PACK32": "VK_FORMAT_A2B10G10R10_UINT_PACK32",
>-    "A2B10G10R10_SINT_PACK32": "VK_FORMAT_A2B10G10R10_SINT_PACK32",
>-    "R16_UNORM": "VK_FORMAT_R16_UNORM",
>-    "R16_SNORM": "VK_FORMAT_R16_SNORM",
>-    "R16_UINT": "VK_FORMAT_R16_UINT",
>-    "R16_SINT": "VK_FORMAT_R16_SINT",
>-    "R16_FLOAT": "VK_FORMAT_R16_SFLOAT",
>-    "R16G16_UNORM": "VK_FORMAT_R16G16_UNORM",
>-    "R16G16_SNORM": "VK_FORMAT_R16G16_SNORM",
>-    "R16G16_UINT": "VK_FORMAT_R16G16_UINT",
>-    "R16G16_SINT": "VK_FORMAT_R16G16_SINT",
>-    "R16G16_FLOAT": "VK_FORMAT_R16G16_SFLOAT",
>-    "R16G16B16_UNORM": "VK_FORMAT_R16G16B16_UNORM",
>-    "R16G16B16_SNORM": "VK_FORMAT_R16G16B16_SNORM",
>-    "R16G16B16_UINT": "VK_FORMAT_R16G16B16_UINT",
>-    "R16G16B16_SINT": "VK_FORMAT_R16G16B16_SINT",
>-    "R16G16B16_FLOAT": "VK_FORMAT_R16G16B16_SFLOAT",
>-    "R16G16B16A16_UNORM": "VK_FORMAT_R16G16B16A16_UNORM",
>-    "R16G16B16A16_SNORM": "VK_FORMAT_R16G16B16A16_SNORM",
>-    "R16G16B16A16_UINT": "VK_FORMAT_R16G16B16A16_UINT",
>-    "R16G16B16A16_SINT": "VK_FORMAT_R16G16B16A16_SINT",
>-    "R16G16B16A16_FLOAT": "VK_FORMAT_R16G16B16A16_SFLOAT",
>-    "R32_UINT": "VK_FORMAT_R32_UINT",
>-    "R32_SINT": "VK_FORMAT_R32_SINT",
>-    "R32_FLOAT": "VK_FORMAT_R32_SFLOAT",
>-    "R32G32_UINT": "VK_FORMAT_R32G32_UINT",
>-    "R32G32_SINT": "VK_FORMAT_R32G32_SINT",
>-    "R32G32_FLOAT": "VK_FORMAT_R32G32_SFLOAT",
>-    "R32G32B32_UINT": "VK_FORMAT_R32G32B32_UINT",
>-    "R32G32B32_SINT": "VK_FORMAT_R32G32B32_SINT",
>-    "R32G32B32_FLOAT": "VK_FORMAT_R32G32B32_SFLOAT",
>-    "R32G32B32A32_UINT": "VK_FORMAT_R32G32B32A32_UINT",
>-    "R32G32B32A32_SINT": "VK_FORMAT_R32G32B32A32_SINT",
>-    "R32G32B32A32_FLOAT": "VK_FORMAT_R32G32B32A32_SFLOAT",
>-    "R64_UINT": "VK_FORMAT_R64_UINT",
>-    "R64_SINT": "VK_FORMAT_R64_SINT",
>-    "R64_FLOAT": "VK_FORMAT_R64_SFLOAT",
>-    "R64G64_UINT": "VK_FORMAT_R64G64_UINT",
>-    "R64G64_SINT": "VK_FORMAT_R64G64_SINT",
>-    "R64G64_FLOAT": "VK_FORMAT_R64G64_SFLOAT",
>-    "R64G64B64_UINT": "VK_FORMAT_R64G64B64_UINT",
>-    "R64G64B64_SINT": "VK_FORMAT_R64G64B64_SINT",
>-    "R64G64B64_FLOAT": "VK_FORMAT_R64G64B64_SFLOAT",
>-    "R64G64B64A64_UINT": "VK_FORMAT_R64G64B64A64_UINT",
>-    "R64G64B64A64_SINT": "VK_FORMAT_R64G64B64A64_SINT",
>-    "R64G64B64A64_FLOAT": "VK_FORMAT_R64G64B64A64_SFLOAT",
>-    "B10G11R11_UFLOAT_PACK32": "VK_FORMAT_B10G11R11_UFLOAT_PACK32",
>-    "E5B9G9R9_UFLOAT_PACK32": "VK_FORMAT_E5B9G9R9_UFLOAT_PACK32",
>-    "D16_UNORM": "VK_FORMAT_D16_UNORM",
>-    "X8_D24_UNORM_PACK32": "VK_FORMAT_X8_D24_UNORM_PACK32",
>-    "D32_FLOAT": "VK_FORMAT_D32_SFLOAT",
>-    "S8_UINT": "VK_FORMAT_S8_UINT",
>-    "D16_UNORM_S8_UINT": "VK_FORMAT_D16_UNORM_S8_UINT",
>-    "D24_UNORM_S8_UINT": "VK_FORMAT_D24_UNORM_S8_UINT",
>-    "D32_SFLOAT_S8_UINT": "VK_FORMAT_D32_SFLOAT_S8_UINT",
>-    "BC1_RGB_UNORM_BLOCK": "VK_FORMAT_BC1_RGB_UNORM_BLOCK",
>-    "BC1_RGB_SRGB_BLOCK": "VK_FORMAT_BC1_RGB_SRGB_BLOCK",
>-    "BC1_RGBA_UNORM_BLOCK": "VK_FORMAT_BC1_RGBA_UNORM_BLOCK",
>-    "BC1_RGBA_SRGB_BLOCK": "VK_FORMAT_BC1_RGBA_SRGB_BLOCK",
>-    "BC2_UNORM_BLOCK": "VK_FORMAT_BC2_UNORM_BLOCK",
>-    "BC2_SRGB_BLOCK": "VK_FORMAT_BC2_SRGB_BLOCK",
>-    "BC3_UNORM_BLOCK": "VK_FORMAT_BC3_UNORM_BLOCK",
>-    "BC3_SRGB_BLOCK": "VK_FORMAT_BC3_SRGB_BLOCK",
>-    "BC4_UNORM_BLOCK": "VK_FORMAT_BC4_UNORM_BLOCK",
>-    "BC4_SNORM_BLOCK": "VK_FORMAT_BC4_SNORM_BLOCK",
>-    "BC5_UNORM_BLOCK": "VK_FORMAT_BC5_UNORM_BLOCK",
>-    "BC5_SNORM_BLOCK": "VK_FORMAT_BC5_SNORM_BLOCK",
>-    "BC6H_UFLOAT_BLOCK": "VK_FORMAT_BC6H_UFLOAT_BLOCK",
>-    "BC6H_SFLOAT_BLOCK": "VK_FORMAT_BC6H_SFLOAT_BLOCK",
>-    "BC7_UNORM_BLOCK": "VK_FORMAT_BC7_UNORM_BLOCK",
>-    "BC7_SRGB_BLOCK": "VK_FORMAT_BC7_SRGB_BLOCK",
>-    "ETC2_R8G8B8_UNORM_BLOCK": "VK_FORMAT_ETC2_R8G8B8_UNORM_BLOCK",
>-    "ETC2_R8G8B8_SRGB_BLOCK": "VK_FORMAT_ETC2_R8G8B8_SRGB_BLOCK",
>-    "ETC2_R8G8B8A1_UNORM_BLOCK": "VK_FORMAT_ETC2_R8G8B8A1_UNORM_BLOCK",
>-    "ETC2_R8G8B8A1_SRGB_BLOCK": "VK_FORMAT_ETC2_R8G8B8A1_SRGB_BLOCK",
>-    "ETC2_R8G8B8A8_UNORM_BLOCK": "VK_FORMAT_ETC2_R8G8B8A8_UNORM_BLOCK",
>-    "ETC2_R8G8B8A8_SRGB_BLOCK": "VK_FORMAT_ETC2_R8G8B8A8_SRGB_BLOCK",
>-    "EAC_R11_UNORM_BLOCK": "VK_FORMAT_EAC_R11_UNORM_BLOCK",
>-    "EAC_R11_SNORM_BLOCK": "VK_FORMAT_EAC_R11_SNORM_BLOCK",
>-    "EAC_R11G11_UNORM_BLOCK": "VK_FORMAT_EAC_R11G11_UNORM_BLOCK",
>-    "EAC_R11G11_SNORM_BLOCK": "VK_FORMAT_EAC_R11G11_SNORM_BLOCK",
>-    "ASTC_4x4_UNORM_BLOCK": "VK_FORMAT_ASTC_4x4_UNORM_BLOCK",
>-    "ASTC_4x4_SRGB_BLOCK": "VK_FORMAT_ASTC_4x4_SRGB_BLOCK",
>-    "ASTC_5x4_UNORM_BLOCK": "VK_FORMAT_ASTC_5x4_UNORM_BLOCK",
>-    "ASTC_5x4_SRGB_BLOCK": "VK_FORMAT_ASTC_5x4_SRGB_BLOCK",
>-    "ASTC_5x5_UNORM_BLOCK": "VK_FORMAT_ASTC_5x5_UNORM_BLOCK",
>-    "ASTC_5x5_SRGB_BLOCK": "VK_FORMAT_ASTC_5x5_SRGB_BLOCK",
>-    "ASTC_6x5_UNORM_BLOCK": "VK_FORMAT_ASTC_6x5_UNORM_BLOCK",
>-    "ASTC_6x5_SRGB_BLOCK": "VK_FORMAT_ASTC_6x5_SRGB_BLOCK",
>-    "ASTC_6x6_UNORM_BLOCK": "VK_FORMAT_ASTC_6x6_UNORM_BLOCK",
>-    "ASTC_6x6_SRGB_BLOCK": "VK_FORMAT_ASTC_6x6_SRGB_BLOCK",
>-    "ASTC_8x5_UNORM_BLOCK": "VK_FORMAT_ASTC_8x5_UNORM_BLOCK",
>-    "ASTC_8x5_SRGB_BLOCK": "VK_FORMAT_ASTC_8x5_SRGB_BLOCK",
>-    "ASTC_8x6_UNORM_BLOCK": "VK_FORMAT_ASTC_8x6_UNORM_BLOCK",
>-    "ASTC_8x6_SRGB_BLOCK": "VK_FORMAT_ASTC_8x6_SRGB_BLOCK",
>-    "ASTC_8x8_UNORM_BLOCK": "VK_FORMAT_ASTC_8x8_UNORM_BLOCK",
>-    "ASTC_8x8_SRGB_BLOCK": "VK_FORMAT_ASTC_8x8_SRGB_BLOCK",
>-    "ASTC_10x5_UNORM_BLOCK": "VK_FORMAT_ASTC_10x5_UNORM_BLOCK",
>-    "ASTC_10x5_SRGB_BLOCK": "VK_FORMAT_ASTC_10x5_SRGB_BLOCK",
>-    "ASTC_10x6_UNORM_BLOCK": "VK_FORMAT_ASTC_10x6_UNORM_BLOCK",
>-    "ASTC_10x6_SRGB_BLOCK": "VK_FORMAT_ASTC_10x6_SRGB_BLOCK",
>-    "ASTC_10x8_UNORM_BLOCK": "VK_FORMAT_ASTC_10x8_UNORM_BLOCK",
>-    "ASTC_10x8_SRGB_BLOCK": "VK_FORMAT_ASTC_10x8_SRGB_BLOCK",
>-    "ASTC_10x10_UNORM_BLOCK": "VK_FORMAT_ASTC_10x10_UNORM_BLOCK",
>-    "ASTC_10x10_SRGB_BLOCK": "VK_FORMAT_ASTC_10x10_SRGB_BLOCK",
>-    "ASTC_12x10_UNORM_BLOCK": "VK_FORMAT_ASTC_12x10_UNORM_BLOCK",
>-    "ASTC_12x10_SRGB_BLOCK": "VK_FORMAT_ASTC_12x10_SRGB_BLOCK",
>-    "ASTC_12x12_UNORM_BLOCK": "VK_FORMAT_ASTC_12x12_UNORM_BLOCK",
>-    "ASTC_12x12_SRGB_BLOC": "VK_FORMAT_ASTC_12x12_SRGB_BLOCK"
>+    "overrides": {
>+        "A16_FLOAT": {
>+            "image": "R16_FLOAT"
>+        },
>+        "A32_FLOAT": {
>+            "image": "R32_FLOAT"
>+        },
>+        "A8_UNORM": {
>+            "image": "R8_UNORM"
>+        },
>+        "L8_UNORM": {
>+            "image": "R8_UNORM"
>+        },
>+        "L8A8_UNORM": {
>+            "image": "R8G8_UNORM"
>+        },
>+        "R4G4B4A4_UNORM": {
>+            "image": "R8G8B8A8_UNORM"
>+        },
>+        "R5G5B5A1_UNORM": {
>+            "image": "A1R5G5B5_UNORM"
>+        },
>+        "R8G8B8_UNORM": {
>+            "image": "R8G8B8A8_UNORM"
>+        },
>+        "R8G8B8_UNORM_SRGB": {
>+            "image": "R8G8B8A8_UNORM_SRGB"
>+        },
>+        "B8G8R8X8_UNORM": {
>+            "buffer": "NONE",
>+            "image": "B8G8R8A8_UNORM"
>+        },
>+        "D24_UNORM_X8_UINT": {
>+            "buffer": "NONE",
>+            "image": "D24_UNORM_S8_UINT"
>+        },
>+        "ETC1_R8G8B8_UNORM_BLOCK": {
>+            "buffer": "NONE",
>+            "image": "ETC2_R8G8B8_UNORM_BLOCK"
>+        },
>+        "R32_FIXED": {
>+            "buffer": "R32_FLOAT"
>+        },
>+        "R32G32_FIXED": {
>+            "buffer": "R32G32_FLOAT"
>+        },
>+        "R32G32B32_FIXED": {
>+            "buffer": "R32G32B32_FLOAT"
>+        },
>+        "R32G32B32A32_FIXED": {
>+            "buffer": "R32G32B32A32_FLOAT"
>+        }
>+    },
>+    "fallbacks": {
>+        "D32_FLOAT_S8X24_UINT": {
>+            "image": ["D24_UNORM_S8_UINT", "D32_FLOAT_S8X24_UINT"]
>+        },
>+        "D24_UNORM_S8_UINT": {
>+            "image": ["D32_FLOAT_S8X24_UINT", "D24_UNORM_S8_UINT"]
>+        },
>+        "D24_UNORM_X8_UINT": {
>+            "image": ["D32_FLOAT_S8X24_UINT", "D24_UNORM_S8_UINT"]
>+        },
>+        "S8_UINT": {
>+            "image": ["D24_UNORM_S8_UINT", "D32_FLOAT_S8X24_UINT", "S8_UINT"]
>+        },
>+
>+        "R8_UNORM": {
>+            "buffer": "R32_FLOAT"
>+        },
>+        "R8_SNORM": {
>+            "buffer": "R32_FLOAT"
>+        },
>+        "R8_USCALED": {
>+            "buffer": "R32_FLOAT"
>+        },
>+        "R8_SSCALED": {
>+            "buffer": "R32_FLOAT"
>+        },
>+        "R8G8_UNORM": {
>+            "buffer": "R32G32_FLOAT"
>+        },
>+        "R8G8_SNORM": {
>+            "buffer": "R32G32_FLOAT"
>+        },
>+        "R8G8_USCALED": {
>+            "buffer": "R32G32_FLOAT"
>+        },
>+        "R8G8_SSCALED": {
>+            "buffer": "R32G32_FLOAT"
>+        },
>+        "R8G8B8_UNORM": {
>+            "buffer": "R32G32B32_FLOAT"
>+        },
>+        "R8G8B8_SNORM": {
>+            "buffer": "R32G32B32_FLOAT"
>+        },
>+        "R8G8B8_USCALED": {
>+            "buffer": "R32G32B32_FLOAT"
>+        },
>+        "R8G8B8_SSCALED": {
>+            "buffer": "R32G32B32_FLOAT"
>+        },
>+        "R8G8B8A8_UNORM": {
>+            "buffer": "R32G32B32A32_FLOAT"
>+        },
>+        "R8G8B8A8_SNORM": {
>+            "buffer": "R32G32B32A32_FLOAT"
>+        },
>+        "R8G8B8A8_USCALED": {
>+            "buffer": "R32G32B32A32_FLOAT"
>+        },
>+        "R8G8B8A8_SSCALED": {
>+            "buffer": "R32G32B32A32_FLOAT"
>+        },
>+
>+        "R16_UNORM": {
>+            "buffer": "R32_FLOAT"
>+        },
>+        "R16_SNORM": {
>+            "buffer": "R32_FLOAT"
>+        },
>+        "R16_USCALED": {
>+            "buffer": "R32_FLOAT"
>+        },
>+        "R16_SSCALED": {
>+            "buffer": "R32_FLOAT"
>+        },
>+        "R16G16_UNORM": {
>+            "buffer": "R32G32_FLOAT"
>+        },
>+        "R16G16_SNORM": {
>+            "buffer": "R32G32_FLOAT"
>+        },
>+        "R16G16_USCALED": {
>+            "buffer": "R32G32_FLOAT"
>+        },
>+        "R16G16_SSCALED": {
>+            "buffer": "R32G32_FLOAT"
>+        },
>+        "R16G16B16_UNORM": {
>+            "buffer": "R32G32B32_FLOAT"
>+        },
>+        "R16G16B16_SNORM": {
>+            "buffer": "R32G32B32_FLOAT"
>+        },
>+        "R16G16B16_USCALED": {
>+            "buffer": "R32G32B32_FLOAT"
>+        },
>+        "R16G16B16_SSCALED": {
>+            "buffer": "R32G32B32_FLOAT"
>+        },
>+        "R16G16B16A16_UNORM": {
>+            "buffer": "R32G32B32A32_FLOAT"
>+        },
>+        "R16G16B16A16_SNORM": {
>+            "buffer": "R32G32B32A32_FLOAT"
>+        },
>+        "R16G16B16A16_USCALED": {
>+            "buffer": "R32G32B32A32_FLOAT"
>+        },
>+        "R16G16B16A16_SSCALED": {
>+            "buffer": "R32G32B32A32_FLOAT"
>+        }
>+    }
> }
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/vk_format_table_autogen.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/vk_format_table_autogen.cpp
>index d98ce27e8cb..a49c8523348 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/vk_format_table_autogen.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/vk_format_table_autogen.cpp
>@@ -1,14 +1,14 @@
> // GENERATED FILE - DO NOT EDIT.
> // Generated by gen_vk_format_table.py using data from vk_format_map.json
> //
>-// Copyright 2017 The ANGLE Project Authors. All rights reserved.
>+// Copyright 2019 The ANGLE Project Authors. All rights reserved.
> // Use of this source code is governed by a BSD-style license that can be
> // found in the LICENSE file.
> //
>-// vk_format_table:
>+// vk_format_table_autogen.cpp:
> //   Queries for full Vulkan format information based on GL format.
> 
>-#include "libANGLE/renderer/vulkan/formatutilsvk.h"
>+#include "libANGLE/renderer/vulkan/vk_format_utils.h"
> 
> #include "image_util/copyimage.h"
> #include "image_util/generatemip.h"
>@@ -22,1207 +22,1986 @@ namespace rx
> namespace vk
> {
> 
>-void Format::initialize(VkPhysicalDevice physicalDevice, const angle::Format &angleFormat)
>+void Format::initialize(RendererVk *renderer, const angle::Format &angleFormat)
> {
>     switch (angleFormat.id)
>     {
>-        case angle::Format::ID::A16_FLOAT:
>+        case angle::FormatID::A16_FLOAT:
>+            internalFormat           = GL_ALPHA16F_EXT;
>+            imageFormatID            = angle::FormatID::R16_FLOAT;
>+            vkImageFormat            = VK_FORMAT_R16_SFLOAT;
>+            imageInitializerFunction = nullptr;
>+
>+            break;
>+
>+        case angle::FormatID::A1R5G5B5_UNORM:
>+            internalFormat               = GL_A1RGB5_ANGLEX;
>+            imageFormatID                = angle::FormatID::A1R5G5B5_UNORM;
>+            vkImageFormat                = VK_FORMAT_A1R5G5B5_UNORM_PACK16;
>+            imageInitializerFunction     = nullptr;
>+            bufferFormatID               = angle::FormatID::A1R5G5B5_UNORM;
>+            vkBufferFormat               = VK_FORMAT_A1R5G5B5_UNORM_PACK16;
>+            vkBufferFormatIsPacked       = true;
>+            vertexLoadFunction           = nullptr;
>+            vertexLoadRequiresConversion = false;
>+            break;
>+
>+        case angle::FormatID::A32_FLOAT:
>+            internalFormat           = GL_ALPHA32F_EXT;
>+            imageFormatID            = angle::FormatID::R32_FLOAT;
>+            vkImageFormat            = VK_FORMAT_R32_SFLOAT;
>+            imageInitializerFunction = nullptr;
>+
>+            break;
>+
>+        case angle::FormatID::A8_UNORM:
>+            internalFormat           = GL_ALPHA8_EXT;
>+            imageFormatID            = angle::FormatID::R8_UNORM;
>+            vkImageFormat            = VK_FORMAT_R8_UNORM;
>+            imageInitializerFunction = nullptr;
>+
>+            break;
>+
>+        case angle::FormatID::ASTC_10x10_SRGB_BLOCK:
>+            internalFormat               = GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x10_KHR;
>+            imageFormatID                = angle::FormatID::ASTC_10x10_SRGB_BLOCK;
>+            vkImageFormat                = VK_FORMAT_ASTC_10x10_SRGB_BLOCK;
>+            imageInitializerFunction     = nullptr;
>+            bufferFormatID               = angle::FormatID::ASTC_10x10_SRGB_BLOCK;
>+            vkBufferFormat               = VK_FORMAT_ASTC_10x10_SRGB_BLOCK;
>+            vkBufferFormatIsPacked       = false;
>+            vertexLoadFunction           = nullptr;
>+            vertexLoadRequiresConversion = false;
>+            break;
>+
>+        case angle::FormatID::ASTC_10x10_UNORM_BLOCK:
>+            internalFormat               = GL_COMPRESSED_RGBA_ASTC_10x10_KHR;
>+            imageFormatID                = angle::FormatID::ASTC_10x10_UNORM_BLOCK;
>+            vkImageFormat                = VK_FORMAT_ASTC_10x10_UNORM_BLOCK;
>+            imageInitializerFunction     = nullptr;
>+            bufferFormatID               = angle::FormatID::ASTC_10x10_UNORM_BLOCK;
>+            vkBufferFormat               = VK_FORMAT_ASTC_10x10_UNORM_BLOCK;
>+            vkBufferFormatIsPacked       = false;
>+            vertexLoadFunction           = nullptr;
>+            vertexLoadRequiresConversion = false;
>+            break;
>+
>+        case angle::FormatID::ASTC_10x5_SRGB_BLOCK:
>+            internalFormat               = GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x5_KHR;
>+            imageFormatID                = angle::FormatID::ASTC_10x5_SRGB_BLOCK;
>+            vkImageFormat                = VK_FORMAT_ASTC_10x5_SRGB_BLOCK;
>+            imageInitializerFunction     = nullptr;
>+            bufferFormatID               = angle::FormatID::ASTC_10x5_SRGB_BLOCK;
>+            vkBufferFormat               = VK_FORMAT_ASTC_10x5_SRGB_BLOCK;
>+            vkBufferFormatIsPacked       = false;
>+            vertexLoadFunction           = nullptr;
>+            vertexLoadRequiresConversion = false;
>+            break;
>+
>+        case angle::FormatID::ASTC_10x5_UNORM_BLOCK:
>+            internalFormat               = GL_COMPRESSED_RGBA_ASTC_10x5_KHR;
>+            imageFormatID                = angle::FormatID::ASTC_10x5_UNORM_BLOCK;
>+            vkImageFormat                = VK_FORMAT_ASTC_10x5_UNORM_BLOCK;
>+            imageInitializerFunction     = nullptr;
>+            bufferFormatID               = angle::FormatID::ASTC_10x5_UNORM_BLOCK;
>+            vkBufferFormat               = VK_FORMAT_ASTC_10x5_UNORM_BLOCK;
>+            vkBufferFormatIsPacked       = false;
>+            vertexLoadFunction           = nullptr;
>+            vertexLoadRequiresConversion = false;
>+            break;
>+
>+        case angle::FormatID::ASTC_10x6_SRGB_BLOCK:
>+            internalFormat               = GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x6_KHR;
>+            imageFormatID                = angle::FormatID::ASTC_10x6_SRGB_BLOCK;
>+            vkImageFormat                = VK_FORMAT_ASTC_10x6_SRGB_BLOCK;
>+            imageInitializerFunction     = nullptr;
>+            bufferFormatID               = angle::FormatID::ASTC_10x6_SRGB_BLOCK;
>+            vkBufferFormat               = VK_FORMAT_ASTC_10x6_SRGB_BLOCK;
>+            vkBufferFormatIsPacked       = false;
>+            vertexLoadFunction           = nullptr;
>+            vertexLoadRequiresConversion = false;
>+            break;
>+
>+        case angle::FormatID::ASTC_10x6_UNORM_BLOCK:
>+            internalFormat               = GL_COMPRESSED_RGBA_ASTC_10x6_KHR;
>+            imageFormatID                = angle::FormatID::ASTC_10x6_UNORM_BLOCK;
>+            vkImageFormat                = VK_FORMAT_ASTC_10x6_UNORM_BLOCK;
>+            imageInitializerFunction     = nullptr;
>+            bufferFormatID               = angle::FormatID::ASTC_10x6_UNORM_BLOCK;
>+            vkBufferFormat               = VK_FORMAT_ASTC_10x6_UNORM_BLOCK;
>+            vkBufferFormatIsPacked       = false;
>+            vertexLoadFunction           = nullptr;
>+            vertexLoadRequiresConversion = false;
>+            break;
>+
>+        case angle::FormatID::ASTC_10x8_SRGB_BLOCK:
>+            internalFormat               = GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x8_KHR;
>+            imageFormatID                = angle::FormatID::ASTC_10x8_SRGB_BLOCK;
>+            vkImageFormat                = VK_FORMAT_ASTC_10x8_SRGB_BLOCK;
>+            imageInitializerFunction     = nullptr;
>+            bufferFormatID               = angle::FormatID::ASTC_10x8_SRGB_BLOCK;
>+            vkBufferFormat               = VK_FORMAT_ASTC_10x8_SRGB_BLOCK;
>+            vkBufferFormatIsPacked       = false;
>+            vertexLoadFunction           = nullptr;
>+            vertexLoadRequiresConversion = false;
>+            break;
>+
>+        case angle::FormatID::ASTC_10x8_UNORM_BLOCK:
>+            internalFormat               = GL_COMPRESSED_RGBA_ASTC_10x8_KHR;
>+            imageFormatID                = angle::FormatID::ASTC_10x8_UNORM_BLOCK;
>+            vkImageFormat                = VK_FORMAT_ASTC_10x8_UNORM_BLOCK;
>+            imageInitializerFunction     = nullptr;
>+            bufferFormatID               = angle::FormatID::ASTC_10x8_UNORM_BLOCK;
>+            vkBufferFormat               = VK_FORMAT_ASTC_10x8_UNORM_BLOCK;
>+            vkBufferFormatIsPacked       = false;
>+            vertexLoadFunction           = nullptr;
>+            vertexLoadRequiresConversion = false;
>+            break;
>+
>+        case angle::FormatID::ASTC_12x10_SRGB_BLOCK:
>+            internalFormat               = GL_COMPRESSED_SRGB8_ALPHA8_ASTC_12x10_KHR;
>+            imageFormatID                = angle::FormatID::ASTC_12x10_SRGB_BLOCK;
>+            vkImageFormat                = VK_FORMAT_ASTC_12x10_SRGB_BLOCK;
>+            imageInitializerFunction     = nullptr;
>+            bufferFormatID               = angle::FormatID::ASTC_12x10_SRGB_BLOCK;
>+            vkBufferFormat               = VK_FORMAT_ASTC_12x10_SRGB_BLOCK;
>+            vkBufferFormatIsPacked       = false;
>+            vertexLoadFunction           = nullptr;
>+            vertexLoadRequiresConversion = false;
>+            break;
>+
>+        case angle::FormatID::ASTC_12x10_UNORM_BLOCK:
>+            internalFormat               = GL_COMPRESSED_RGBA_ASTC_12x10_KHR;
>+            imageFormatID                = angle::FormatID::ASTC_12x10_UNORM_BLOCK;
>+            vkImageFormat                = VK_FORMAT_ASTC_12x10_UNORM_BLOCK;
>+            imageInitializerFunction     = nullptr;
>+            bufferFormatID               = angle::FormatID::ASTC_12x10_UNORM_BLOCK;
>+            vkBufferFormat               = VK_FORMAT_ASTC_12x10_UNORM_BLOCK;
>+            vkBufferFormatIsPacked       = false;
>+            vertexLoadFunction           = nullptr;
>+            vertexLoadRequiresConversion = false;
>+            break;
>+
>+        case angle::FormatID::ASTC_12x12_SRGB_BLOCK:
>+            internalFormat               = GL_COMPRESSED_SRGB8_ALPHA8_ASTC_12x12_KHR;
>+            imageFormatID                = angle::FormatID::ASTC_12x12_SRGB_BLOCK;
>+            vkImageFormat                = VK_FORMAT_ASTC_12x12_SRGB_BLOCK;
>+            imageInitializerFunction     = nullptr;
>+            bufferFormatID               = angle::FormatID::ASTC_12x12_SRGB_BLOCK;
>+            vkBufferFormat               = VK_FORMAT_ASTC_12x12_SRGB_BLOCK;
>+            vkBufferFormatIsPacked       = false;
>+            vertexLoadFunction           = nullptr;
>+            vertexLoadRequiresConversion = false;
>+            break;
>+
>+        case angle::FormatID::ASTC_12x12_UNORM_BLOCK:
>+            internalFormat               = GL_COMPRESSED_RGBA_ASTC_12x12_KHR;
>+            imageFormatID                = angle::FormatID::ASTC_12x12_UNORM_BLOCK;
>+            vkImageFormat                = VK_FORMAT_ASTC_12x12_UNORM_BLOCK;
>+            imageInitializerFunction     = nullptr;
>+            bufferFormatID               = angle::FormatID::ASTC_12x12_UNORM_BLOCK;
>+            vkBufferFormat               = VK_FORMAT_ASTC_12x12_UNORM_BLOCK;
>+            vkBufferFormatIsPacked       = false;
>+            vertexLoadFunction           = nullptr;
>+            vertexLoadRequiresConversion = false;
>+            break;
>+
>+        case angle::FormatID::ASTC_4x4_SRGB_BLOCK:
>+            internalFormat               = GL_COMPRESSED_SRGB8_ALPHA8_ASTC_4x4_KHR;
>+            imageFormatID                = angle::FormatID::ASTC_4x4_SRGB_BLOCK;
>+            vkImageFormat                = VK_FORMAT_ASTC_4x4_SRGB_BLOCK;
>+            imageInitializerFunction     = nullptr;
>+            bufferFormatID               = angle::FormatID::ASTC_4x4_SRGB_BLOCK;
>+            vkBufferFormat               = VK_FORMAT_ASTC_4x4_SRGB_BLOCK;
>+            vkBufferFormatIsPacked       = false;
>+            vertexLoadFunction           = nullptr;
>+            vertexLoadRequiresConversion = false;
>+            break;
>+
>+        case angle::FormatID::ASTC_4x4_UNORM_BLOCK:
>+            internalFormat               = GL_COMPRESSED_RGBA_ASTC_4x4_KHR;
>+            imageFormatID                = angle::FormatID::ASTC_4x4_UNORM_BLOCK;
>+            vkImageFormat                = VK_FORMAT_ASTC_4x4_UNORM_BLOCK;
>+            imageInitializerFunction     = nullptr;
>+            bufferFormatID               = angle::FormatID::ASTC_4x4_UNORM_BLOCK;
>+            vkBufferFormat               = VK_FORMAT_ASTC_4x4_UNORM_BLOCK;
>+            vkBufferFormatIsPacked       = false;
>+            vertexLoadFunction           = nullptr;
>+            vertexLoadRequiresConversion = false;
>+            break;
>+
>+        case angle::FormatID::ASTC_5x4_SRGB_BLOCK:
>+            internalFormat               = GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x4_KHR;
>+            imageFormatID                = angle::FormatID::ASTC_5x4_SRGB_BLOCK;
>+            vkImageFormat                = VK_FORMAT_ASTC_5x4_SRGB_BLOCK;
>+            imageInitializerFunction     = nullptr;
>+            bufferFormatID               = angle::FormatID::ASTC_5x4_SRGB_BLOCK;
>+            vkBufferFormat               = VK_FORMAT_ASTC_5x4_SRGB_BLOCK;
>+            vkBufferFormatIsPacked       = false;
>+            vertexLoadFunction           = nullptr;
>+            vertexLoadRequiresConversion = false;
>+            break;
>+
>+        case angle::FormatID::ASTC_5x4_UNORM_BLOCK:
>+            internalFormat               = GL_COMPRESSED_RGBA_ASTC_5x4_KHR;
>+            imageFormatID                = angle::FormatID::ASTC_5x4_UNORM_BLOCK;
>+            vkImageFormat                = VK_FORMAT_ASTC_5x4_UNORM_BLOCK;
>+            imageInitializerFunction     = nullptr;
>+            bufferFormatID               = angle::FormatID::ASTC_5x4_UNORM_BLOCK;
>+            vkBufferFormat               = VK_FORMAT_ASTC_5x4_UNORM_BLOCK;
>+            vkBufferFormatIsPacked       = false;
>+            vertexLoadFunction           = nullptr;
>+            vertexLoadRequiresConversion = false;
>+            break;
>+
>+        case angle::FormatID::ASTC_5x5_SRGB_BLOCK:
>+            internalFormat               = GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x5_KHR;
>+            imageFormatID                = angle::FormatID::ASTC_5x5_SRGB_BLOCK;
>+            vkImageFormat                = VK_FORMAT_ASTC_5x5_SRGB_BLOCK;
>+            imageInitializerFunction     = nullptr;
>+            bufferFormatID               = angle::FormatID::ASTC_5x5_SRGB_BLOCK;
>+            vkBufferFormat               = VK_FORMAT_ASTC_5x5_SRGB_BLOCK;
>+            vkBufferFormatIsPacked       = false;
>+            vertexLoadFunction           = nullptr;
>+            vertexLoadRequiresConversion = false;
>+            break;
>+
>+        case angle::FormatID::ASTC_5x5_UNORM_BLOCK:
>+            internalFormat               = GL_COMPRESSED_RGBA_ASTC_5x5_KHR;
>+            imageFormatID                = angle::FormatID::ASTC_5x5_UNORM_BLOCK;
>+            vkImageFormat                = VK_FORMAT_ASTC_5x5_UNORM_BLOCK;
>+            imageInitializerFunction     = nullptr;
>+            bufferFormatID               = angle::FormatID::ASTC_5x5_UNORM_BLOCK;
>+            vkBufferFormat               = VK_FORMAT_ASTC_5x5_UNORM_BLOCK;
>+            vkBufferFormatIsPacked       = false;
>+            vertexLoadFunction           = nullptr;
>+            vertexLoadRequiresConversion = false;
>+            break;
>+
>+        case angle::FormatID::ASTC_6x5_SRGB_BLOCK:
>+            internalFormat               = GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x5_KHR;
>+            imageFormatID                = angle::FormatID::ASTC_6x5_SRGB_BLOCK;
>+            vkImageFormat                = VK_FORMAT_ASTC_6x5_SRGB_BLOCK;
>+            imageInitializerFunction     = nullptr;
>+            bufferFormatID               = angle::FormatID::ASTC_6x5_SRGB_BLOCK;
>+            vkBufferFormat               = VK_FORMAT_ASTC_6x5_SRGB_BLOCK;
>+            vkBufferFormatIsPacked       = false;
>+            vertexLoadFunction           = nullptr;
>+            vertexLoadRequiresConversion = false;
>+            break;
>+
>+        case angle::FormatID::ASTC_6x5_UNORM_BLOCK:
>+            internalFormat               = GL_COMPRESSED_RGBA_ASTC_6x5_KHR;
>+            imageFormatID                = angle::FormatID::ASTC_6x5_UNORM_BLOCK;
>+            vkImageFormat                = VK_FORMAT_ASTC_6x5_UNORM_BLOCK;
>+            imageInitializerFunction     = nullptr;
>+            bufferFormatID               = angle::FormatID::ASTC_6x5_UNORM_BLOCK;
>+            vkBufferFormat               = VK_FORMAT_ASTC_6x5_UNORM_BLOCK;
>+            vkBufferFormatIsPacked       = false;
>+            vertexLoadFunction           = nullptr;
>+            vertexLoadRequiresConversion = false;
>+            break;
>+
>+        case angle::FormatID::ASTC_6x6_SRGB_BLOCK:
>+            internalFormat               = GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x6_KHR;
>+            imageFormatID                = angle::FormatID::ASTC_6x6_SRGB_BLOCK;
>+            vkImageFormat                = VK_FORMAT_ASTC_6x6_SRGB_BLOCK;
>+            imageInitializerFunction     = nullptr;
>+            bufferFormatID               = angle::FormatID::ASTC_6x6_SRGB_BLOCK;
>+            vkBufferFormat               = VK_FORMAT_ASTC_6x6_SRGB_BLOCK;
>+            vkBufferFormatIsPacked       = false;
>+            vertexLoadFunction           = nullptr;
>+            vertexLoadRequiresConversion = false;
>+            break;
>+
>+        case angle::FormatID::ASTC_6x6_UNORM_BLOCK:
>+            internalFormat               = GL_COMPRESSED_RGBA_ASTC_6x6_KHR;
>+            imageFormatID                = angle::FormatID::ASTC_6x6_UNORM_BLOCK;
>+            vkImageFormat                = VK_FORMAT_ASTC_6x6_UNORM_BLOCK;
>+            imageInitializerFunction     = nullptr;
>+            bufferFormatID               = angle::FormatID::ASTC_6x6_UNORM_BLOCK;
>+            vkBufferFormat               = VK_FORMAT_ASTC_6x6_UNORM_BLOCK;
>+            vkBufferFormatIsPacked       = false;
>+            vertexLoadFunction           = nullptr;
>+            vertexLoadRequiresConversion = false;
>+            break;
>+
>+        case angle::FormatID::ASTC_8x5_SRGB_BLOCK:
>+            internalFormat               = GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x5_KHR;
>+            imageFormatID                = angle::FormatID::ASTC_8x5_SRGB_BLOCK;
>+            vkImageFormat                = VK_FORMAT_ASTC_8x5_SRGB_BLOCK;
>+            imageInitializerFunction     = nullptr;
>+            bufferFormatID               = angle::FormatID::ASTC_8x5_SRGB_BLOCK;
>+            vkBufferFormat               = VK_FORMAT_ASTC_8x5_SRGB_BLOCK;
>+            vkBufferFormatIsPacked       = false;
>+            vertexLoadFunction           = nullptr;
>+            vertexLoadRequiresConversion = false;
>+            break;
>+
>+        case angle::FormatID::ASTC_8x5_UNORM_BLOCK:
>+            internalFormat               = GL_COMPRESSED_RGBA_ASTC_8x5_KHR;
>+            imageFormatID                = angle::FormatID::ASTC_8x5_UNORM_BLOCK;
>+            vkImageFormat                = VK_FORMAT_ASTC_8x5_UNORM_BLOCK;
>+            imageInitializerFunction     = nullptr;
>+            bufferFormatID               = angle::FormatID::ASTC_8x5_UNORM_BLOCK;
>+            vkBufferFormat               = VK_FORMAT_ASTC_8x5_UNORM_BLOCK;
>+            vkBufferFormatIsPacked       = false;
>+            vertexLoadFunction           = nullptr;
>+            vertexLoadRequiresConversion = false;
>+            break;
>+
>+        case angle::FormatID::ASTC_8x6_SRGB_BLOCK:
>+            internalFormat               = GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x6_KHR;
>+            imageFormatID                = angle::FormatID::ASTC_8x6_SRGB_BLOCK;
>+            vkImageFormat                = VK_FORMAT_ASTC_8x6_SRGB_BLOCK;
>+            imageInitializerFunction     = nullptr;
>+            bufferFormatID               = angle::FormatID::ASTC_8x6_SRGB_BLOCK;
>+            vkBufferFormat               = VK_FORMAT_ASTC_8x6_SRGB_BLOCK;
>+            vkBufferFormatIsPacked       = false;
>+            vertexLoadFunction           = nullptr;
>+            vertexLoadRequiresConversion = false;
>+            break;
>+
>+        case angle::FormatID::ASTC_8x6_UNORM_BLOCK:
>+            internalFormat               = GL_COMPRESSED_RGBA_ASTC_8x6_KHR;
>+            imageFormatID                = angle::FormatID::ASTC_8x6_UNORM_BLOCK;
>+            vkImageFormat                = VK_FORMAT_ASTC_8x6_UNORM_BLOCK;
>+            imageInitializerFunction     = nullptr;
>+            bufferFormatID               = angle::FormatID::ASTC_8x6_UNORM_BLOCK;
>+            vkBufferFormat               = VK_FORMAT_ASTC_8x6_UNORM_BLOCK;
>+            vkBufferFormatIsPacked       = false;
>+            vertexLoadFunction           = nullptr;
>+            vertexLoadRequiresConversion = false;
>+            break;
>+
>+        case angle::FormatID::ASTC_8x8_SRGB_BLOCK:
>+            internalFormat               = GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x8_KHR;
>+            imageFormatID                = angle::FormatID::ASTC_8x8_SRGB_BLOCK;
>+            vkImageFormat                = VK_FORMAT_ASTC_8x8_SRGB_BLOCK;
>+            imageInitializerFunction     = nullptr;
>+            bufferFormatID               = angle::FormatID::ASTC_8x8_SRGB_BLOCK;
>+            vkBufferFormat               = VK_FORMAT_ASTC_8x8_SRGB_BLOCK;
>+            vkBufferFormatIsPacked       = false;
>+            vertexLoadFunction           = nullptr;
>+            vertexLoadRequiresConversion = false;
>+            break;
>+
>+        case angle::FormatID::ASTC_8x8_UNORM_BLOCK:
>+            internalFormat               = GL_COMPRESSED_RGBA_ASTC_8x8_KHR;
>+            imageFormatID                = angle::FormatID::ASTC_8x8_UNORM_BLOCK;
>+            vkImageFormat                = VK_FORMAT_ASTC_8x8_UNORM_BLOCK;
>+            imageInitializerFunction     = nullptr;
>+            bufferFormatID               = angle::FormatID::ASTC_8x8_UNORM_BLOCK;
>+            vkBufferFormat               = VK_FORMAT_ASTC_8x8_UNORM_BLOCK;
>+            vkBufferFormatIsPacked       = false;
>+            vertexLoadFunction           = nullptr;
>+            vertexLoadRequiresConversion = false;
>+            break;
>+
>+        case angle::FormatID::B4G4R4A4_UNORM:
>+            internalFormat               = GL_BGRA4_ANGLEX;
>+            imageFormatID                = angle::FormatID::B4G4R4A4_UNORM;
>+            vkImageFormat                = VK_FORMAT_B4G4R4A4_UNORM_PACK16;
>+            imageInitializerFunction     = nullptr;
>+            bufferFormatID               = angle::FormatID::B4G4R4A4_UNORM;
>+            vkBufferFormat               = VK_FORMAT_B4G4R4A4_UNORM_PACK16;
>+            vkBufferFormatIsPacked       = true;
>+            vertexLoadFunction           = nullptr;
>+            vertexLoadRequiresConversion = false;
>+            break;
>+
>+        case angle::FormatID::B5G5R5A1_UNORM:
>+            internalFormat               = GL_BGR5_A1_ANGLEX;
>+            imageFormatID                = angle::FormatID::B5G5R5A1_UNORM;
>+            vkImageFormat                = VK_FORMAT_B5G5R5A1_UNORM_PACK16;
>+            imageInitializerFunction     = nullptr;
>+            bufferFormatID               = angle::FormatID::B5G5R5A1_UNORM;
>+            vkBufferFormat               = VK_FORMAT_B5G5R5A1_UNORM_PACK16;
>+            vkBufferFormatIsPacked       = true;
>+            vertexLoadFunction           = nullptr;
>+            vertexLoadRequiresConversion = false;
>+            break;
>+
>+        case angle::FormatID::B5G6R5_UNORM:
>+            internalFormat               = GL_BGR565_ANGLEX;
>+            imageFormatID                = angle::FormatID::B5G6R5_UNORM;
>+            vkImageFormat                = VK_FORMAT_B5G6R5_UNORM_PACK16;
>+            imageInitializerFunction     = nullptr;
>+            bufferFormatID               = angle::FormatID::B5G6R5_UNORM;
>+            vkBufferFormat               = VK_FORMAT_B5G6R5_UNORM_PACK16;
>+            vkBufferFormatIsPacked       = true;
>+            vertexLoadFunction           = nullptr;
>+            vertexLoadRequiresConversion = false;
>+            break;
>+
>+        case angle::FormatID::B8G8R8A8_TYPELESS:
>             // This format is not implemented in Vulkan.
>             break;
> 
>-        case angle::Format::ID::A32_FLOAT:
>+        case angle::FormatID::B8G8R8A8_TYPELESS_SRGB:
>             // This format is not implemented in Vulkan.
>             break;
> 
>-        case angle::Format::ID::A8_UNORM:
>+        case angle::FormatID::B8G8R8A8_UNORM:
>+            internalFormat               = GL_BGRA8_EXT;
>+            imageFormatID                = angle::FormatID::B8G8R8A8_UNORM;
>+            vkImageFormat                = VK_FORMAT_B8G8R8A8_UNORM;
>+            imageInitializerFunction     = nullptr;
>+            bufferFormatID               = angle::FormatID::B8G8R8A8_UNORM;
>+            vkBufferFormat               = VK_FORMAT_B8G8R8A8_UNORM;
>+            vkBufferFormatIsPacked       = false;
>+            vertexLoadFunction           = CopyNativeVertexData<GLubyte, 4, 4, 0>;
>+            vertexLoadRequiresConversion = false;
>+            break;
>+
>+        case angle::FormatID::B8G8R8A8_UNORM_SRGB:
>+            internalFormat               = GL_BGRA8_SRGB_ANGLEX;
>+            imageFormatID                = angle::FormatID::B8G8R8A8_UNORM_SRGB;
>+            vkImageFormat                = VK_FORMAT_B8G8R8A8_SRGB;
>+            imageInitializerFunction     = nullptr;
>+            bufferFormatID               = angle::FormatID::B8G8R8A8_UNORM_SRGB;
>+            vkBufferFormat               = VK_FORMAT_B8G8R8A8_SRGB;
>+            vkBufferFormatIsPacked       = false;
>+            vertexLoadFunction           = CopyNativeVertexData<GLubyte, 4, 4, 0>;
>+            vertexLoadRequiresConversion = false;
>+            break;
>+
>+        case angle::FormatID::B8G8R8X8_UNORM:
>+            internalFormat               = GL_BGRX8_ANGLEX;
>+            imageFormatID                = angle::FormatID::B8G8R8A8_UNORM;
>+            vkImageFormat                = VK_FORMAT_B8G8R8A8_UNORM;
>+            imageInitializerFunction     = nullptr;
>+            bufferFormatID               = angle::FormatID::NONE;
>+            vkBufferFormat               = VK_FORMAT_UNDEFINED;
>+            vkBufferFormatIsPacked       = false;
>+            vertexLoadFunction           = nullptr;
>+            vertexLoadRequiresConversion = true;
>+            break;
>+
>+        case angle::FormatID::BC1_RGBA_UNORM_BLOCK:
>+            internalFormat               = GL_COMPRESSED_RGBA_S3TC_DXT1_EXT;
>+            imageFormatID                = angle::FormatID::BC1_RGBA_UNORM_BLOCK;
>+            vkImageFormat                = VK_FORMAT_BC1_RGBA_UNORM_BLOCK;
>+            imageInitializerFunction     = nullptr;
>+            bufferFormatID               = angle::FormatID::BC1_RGBA_UNORM_BLOCK;
>+            vkBufferFormat               = VK_FORMAT_BC1_RGBA_UNORM_BLOCK;
>+            vkBufferFormatIsPacked       = false;
>+            vertexLoadFunction           = nullptr;
>+            vertexLoadRequiresConversion = false;
>+            break;
>+
>+        case angle::FormatID::BC1_RGBA_UNORM_SRGB_BLOCK:
>+            internalFormat               = GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT1_EXT;
>+            imageFormatID                = angle::FormatID::BC1_RGBA_UNORM_SRGB_BLOCK;
>+            vkImageFormat                = VK_FORMAT_BC1_RGBA_SRGB_BLOCK;
>+            imageInitializerFunction     = nullptr;
>+            bufferFormatID               = angle::FormatID::BC1_RGBA_UNORM_SRGB_BLOCK;
>+            vkBufferFormat               = VK_FORMAT_BC1_RGBA_SRGB_BLOCK;
>+            vkBufferFormatIsPacked       = false;
>+            vertexLoadFunction           = nullptr;
>+            vertexLoadRequiresConversion = false;
>+            break;
>+
>+        case angle::FormatID::BC1_RGB_UNORM_BLOCK:
>+            internalFormat               = GL_COMPRESSED_RGB_S3TC_DXT1_EXT;
>+            imageFormatID                = angle::FormatID::BC1_RGB_UNORM_BLOCK;
>+            vkImageFormat                = VK_FORMAT_BC1_RGB_UNORM_BLOCK;
>+            imageInitializerFunction     = nullptr;
>+            bufferFormatID               = angle::FormatID::BC1_RGB_UNORM_BLOCK;
>+            vkBufferFormat               = VK_FORMAT_BC1_RGB_UNORM_BLOCK;
>+            vkBufferFormatIsPacked       = false;
>+            vertexLoadFunction           = nullptr;
>+            vertexLoadRequiresConversion = false;
>+            break;
>+
>+        case angle::FormatID::BC1_RGB_UNORM_SRGB_BLOCK:
>+            internalFormat               = GL_COMPRESSED_SRGB_S3TC_DXT1_EXT;
>+            imageFormatID                = angle::FormatID::BC1_RGB_UNORM_SRGB_BLOCK;
>+            vkImageFormat                = VK_FORMAT_BC1_RGB_SRGB_BLOCK;
>+            imageInitializerFunction     = nullptr;
>+            bufferFormatID               = angle::FormatID::BC1_RGB_UNORM_SRGB_BLOCK;
>+            vkBufferFormat               = VK_FORMAT_BC1_RGB_SRGB_BLOCK;
>+            vkBufferFormatIsPacked       = false;
>+            vertexLoadFunction           = nullptr;
>+            vertexLoadRequiresConversion = false;
>+            break;
>+
>+        case angle::FormatID::BC2_RGBA_UNORM_BLOCK:
>+            internalFormat               = GL_COMPRESSED_RGBA_S3TC_DXT3_ANGLE;
>+            imageFormatID                = angle::FormatID::BC2_RGBA_UNORM_BLOCK;
>+            vkImageFormat                = VK_FORMAT_BC2_UNORM_BLOCK;
>+            imageInitializerFunction     = nullptr;
>+            bufferFormatID               = angle::FormatID::BC2_RGBA_UNORM_BLOCK;
>+            vkBufferFormat               = VK_FORMAT_BC2_UNORM_BLOCK;
>+            vkBufferFormatIsPacked       = false;
>+            vertexLoadFunction           = nullptr;
>+            vertexLoadRequiresConversion = false;
>+            break;
>+
>+        case angle::FormatID::BC2_RGBA_UNORM_SRGB_BLOCK:
>+            internalFormat               = GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT3_EXT;
>+            imageFormatID                = angle::FormatID::BC2_RGBA_UNORM_SRGB_BLOCK;
>+            vkImageFormat                = VK_FORMAT_BC2_SRGB_BLOCK;
>+            imageInitializerFunction     = nullptr;
>+            bufferFormatID               = angle::FormatID::BC2_RGBA_UNORM_SRGB_BLOCK;
>+            vkBufferFormat               = VK_FORMAT_BC2_SRGB_BLOCK;
>+            vkBufferFormatIsPacked       = false;
>+            vertexLoadFunction           = nullptr;
>+            vertexLoadRequiresConversion = false;
>+            break;
>+
>+        case angle::FormatID::BC3_RGBA_UNORM_BLOCK:
>+            internalFormat               = GL_COMPRESSED_RGBA_S3TC_DXT5_ANGLE;
>+            imageFormatID                = angle::FormatID::BC3_RGBA_UNORM_BLOCK;
>+            vkImageFormat                = VK_FORMAT_BC3_UNORM_BLOCK;
>+            imageInitializerFunction     = nullptr;
>+            bufferFormatID               = angle::FormatID::BC3_RGBA_UNORM_BLOCK;
>+            vkBufferFormat               = VK_FORMAT_BC3_UNORM_BLOCK;
>+            vkBufferFormatIsPacked       = false;
>+            vertexLoadFunction           = nullptr;
>+            vertexLoadRequiresConversion = false;
>+            break;
>+
>+        case angle::FormatID::BC3_RGBA_UNORM_SRGB_BLOCK:
>+            internalFormat               = GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT5_EXT;
>+            imageFormatID                = angle::FormatID::BC3_RGBA_UNORM_SRGB_BLOCK;
>+            vkImageFormat                = VK_FORMAT_BC3_SRGB_BLOCK;
>+            imageInitializerFunction     = nullptr;
>+            bufferFormatID               = angle::FormatID::BC3_RGBA_UNORM_SRGB_BLOCK;
>+            vkBufferFormat               = VK_FORMAT_BC3_SRGB_BLOCK;
>+            vkBufferFormatIsPacked       = false;
>+            vertexLoadFunction           = nullptr;
>+            vertexLoadRequiresConversion = false;
>+            break;
>+
>+        case angle::FormatID::BPTC_RGBA_UNORM_BLOCK:
>+            internalFormat               = GL_COMPRESSED_RGBA_BPTC_UNORM_EXT;
>+            imageFormatID                = angle::FormatID::BPTC_RGBA_UNORM_BLOCK;
>+            vkImageFormat                = VK_FORMAT_BC7_UNORM_BLOCK;
>+            imageInitializerFunction     = nullptr;
>+            bufferFormatID               = angle::FormatID::BPTC_RGBA_UNORM_BLOCK;
>+            vkBufferFormat               = VK_FORMAT_BC7_UNORM_BLOCK;
>+            vkBufferFormatIsPacked       = false;
>+            vertexLoadFunction           = nullptr;
>+            vertexLoadRequiresConversion = false;
>+            break;
>+
>+        case angle::FormatID::BPTC_RGB_SIGNED_FLOAT_BLOCK:
>+            internalFormat               = GL_COMPRESSED_RGB_BPTC_SIGNED_FLOAT_EXT;
>+            imageFormatID                = angle::FormatID::BPTC_RGB_SIGNED_FLOAT_BLOCK;
>+            vkImageFormat                = VK_FORMAT_BC6H_SFLOAT_BLOCK;
>+            imageInitializerFunction     = nullptr;
>+            bufferFormatID               = angle::FormatID::BPTC_RGB_SIGNED_FLOAT_BLOCK;
>+            vkBufferFormat               = VK_FORMAT_BC6H_SFLOAT_BLOCK;
>+            vkBufferFormatIsPacked       = false;
>+            vertexLoadFunction           = nullptr;
>+            vertexLoadRequiresConversion = false;
>+            break;
>+
>+        case angle::FormatID::BPTC_RGB_UNSIGNED_FLOAT_BLOCK:
>+            internalFormat               = GL_COMPRESSED_RGB_BPTC_UNSIGNED_FLOAT_EXT;
>+            imageFormatID                = angle::FormatID::BPTC_RGB_UNSIGNED_FLOAT_BLOCK;
>+            vkImageFormat                = VK_FORMAT_BC6H_UFLOAT_BLOCK;
>+            imageInitializerFunction     = nullptr;
>+            bufferFormatID               = angle::FormatID::BPTC_RGB_UNSIGNED_FLOAT_BLOCK;
>+            vkBufferFormat               = VK_FORMAT_BC6H_UFLOAT_BLOCK;
>+            vkBufferFormatIsPacked       = false;
>+            vertexLoadFunction           = nullptr;
>+            vertexLoadRequiresConversion = false;
>+            break;
>+
>+        case angle::FormatID::BPTC_SRGB_ALPHA_UNORM_BLOCK:
>+            internalFormat               = GL_COMPRESSED_SRGB_ALPHA_BPTC_UNORM_EXT;
>+            imageFormatID                = angle::FormatID::BPTC_SRGB_ALPHA_UNORM_BLOCK;
>+            vkImageFormat                = VK_FORMAT_BC7_SRGB_BLOCK;
>+            imageInitializerFunction     = nullptr;
>+            bufferFormatID               = angle::FormatID::BPTC_SRGB_ALPHA_UNORM_BLOCK;
>+            vkBufferFormat               = VK_FORMAT_BC7_SRGB_BLOCK;
>+            vkBufferFormatIsPacked       = false;
>+            vertexLoadFunction           = nullptr;
>+            vertexLoadRequiresConversion = false;
>+            break;
>+
>+        case angle::FormatID::D16_UNORM:
>+            internalFormat               = GL_DEPTH_COMPONENT16;
>+            imageFormatID                = angle::FormatID::D16_UNORM;
>+            vkImageFormat                = VK_FORMAT_D16_UNORM;
>+            imageInitializerFunction     = nullptr;
>+            bufferFormatID               = angle::FormatID::D16_UNORM;
>+            vkBufferFormat               = VK_FORMAT_D16_UNORM;
>+            vkBufferFormatIsPacked       = false;
>+            vertexLoadFunction           = nullptr;
>+            vertexLoadRequiresConversion = false;
>+            break;
>+
>+        case angle::FormatID::D24_UNORM_S8_UINT:
>+            internalFormat = GL_DEPTH24_STENCIL8;
>+            {
>+                static constexpr ImageFormatInitInfo kInfo[] = {
>+                    {angle::FormatID::D24_UNORM_S8_UINT, VK_FORMAT_D24_UNORM_S8_UINT, nullptr},
>+                    {angle::FormatID::D32_FLOAT_S8X24_UINT, VK_FORMAT_D32_SFLOAT_S8_UINT, nullptr},
>+                    {angle::FormatID::D24_UNORM_S8_UINT, VK_FORMAT_D24_UNORM_S8_UINT, nullptr}};
>+                initImageFallback(renderer, kInfo, ArraySize(kInfo));
>+            }
>+            bufferFormatID               = angle::FormatID::D24_UNORM_S8_UINT;
>+            vkBufferFormat               = VK_FORMAT_D24_UNORM_S8_UINT;
>+            vkBufferFormatIsPacked       = false;
>+            vertexLoadFunction           = nullptr;
>+            vertexLoadRequiresConversion = false;
>+            break;
>+
>+        case angle::FormatID::D24_UNORM_X8_UINT:
>+            internalFormat = GL_DEPTH_COMPONENT24;
>+            {
>+                static constexpr ImageFormatInitInfo kInfo[] = {
>+                    {angle::FormatID::D24_UNORM_S8_UINT, VK_FORMAT_D24_UNORM_S8_UINT, nullptr},
>+                    {angle::FormatID::D32_FLOAT_S8X24_UINT, VK_FORMAT_D32_SFLOAT_S8_UINT, nullptr},
>+                    {angle::FormatID::D24_UNORM_S8_UINT, VK_FORMAT_D24_UNORM_S8_UINT, nullptr}};
>+                initImageFallback(renderer, kInfo, ArraySize(kInfo));
>+            }
>+            bufferFormatID               = angle::FormatID::NONE;
>+            vkBufferFormat               = VK_FORMAT_UNDEFINED;
>+            vkBufferFormatIsPacked       = false;
>+            vertexLoadFunction           = nullptr;
>+            vertexLoadRequiresConversion = true;
>+            break;
>+
>+        case angle::FormatID::D32_FLOAT:
>+            internalFormat               = GL_DEPTH_COMPONENT32F;
>+            imageFormatID                = angle::FormatID::D32_FLOAT;
>+            vkImageFormat                = VK_FORMAT_D32_SFLOAT;
>+            imageInitializerFunction     = nullptr;
>+            bufferFormatID               = angle::FormatID::D32_FLOAT;
>+            vkBufferFormat               = VK_FORMAT_D32_SFLOAT;
>+            vkBufferFormatIsPacked       = false;
>+            vertexLoadFunction           = CopyNativeVertexData<GLfloat, 1, 1, 0>;
>+            vertexLoadRequiresConversion = false;
>+            break;
>+
>+        case angle::FormatID::D32_FLOAT_S8X24_UINT:
>+            internalFormat = GL_DEPTH32F_STENCIL8;
>+            {
>+                static constexpr ImageFormatInitInfo kInfo[] = {
>+                    {angle::FormatID::D32_FLOAT_S8X24_UINT, VK_FORMAT_D32_SFLOAT_S8_UINT, nullptr},
>+                    {angle::FormatID::D24_UNORM_S8_UINT, VK_FORMAT_D24_UNORM_S8_UINT, nullptr},
>+                    {angle::FormatID::D32_FLOAT_S8X24_UINT, VK_FORMAT_D32_SFLOAT_S8_UINT, nullptr}};
>+                initImageFallback(renderer, kInfo, ArraySize(kInfo));
>+            }
>+            bufferFormatID               = angle::FormatID::D32_FLOAT_S8X24_UINT;
>+            vkBufferFormat               = VK_FORMAT_D32_SFLOAT_S8_UINT;
>+            vkBufferFormatIsPacked       = false;
>+            vertexLoadFunction           = CopyNativeVertexData<GLfloat, 3, 3, 0>;
>+            vertexLoadRequiresConversion = false;
>+            break;
>+
>+        case angle::FormatID::D32_UNORM:
>             // This format is not implemented in Vulkan.
>             break;
> 
>-        case angle::Format::ID::ASTC_10x10_SRGB_BLOCK:
>-        {
>-            internalFormat          = GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x10_KHR;
>-            textureFormatID         = angle::Format::ID::ASTC_10x10_SRGB_BLOCK;
>-            vkTextureFormat         = VK_FORMAT_ASTC_10x10_SRGB_BLOCK;
>-            bufferFormatID          = angle::Format::ID::ASTC_10x10_SRGB_BLOCK;
>-            vkBufferFormat          = VK_FORMAT_ASTC_10x10_SRGB_BLOCK;
>-            dataInitializerFunction = nullptr;
>-            break;
>-        }
>-
>-        case angle::Format::ID::ASTC_10x10_UNORM_BLOCK:
>-        {
>-            internalFormat          = GL_COMPRESSED_RGBA_ASTC_10x10_KHR;
>-            textureFormatID         = angle::Format::ID::ASTC_10x10_UNORM_BLOCK;
>-            vkTextureFormat         = VK_FORMAT_ASTC_10x10_UNORM_BLOCK;
>-            bufferFormatID          = angle::Format::ID::ASTC_10x10_UNORM_BLOCK;
>-            vkBufferFormat          = VK_FORMAT_ASTC_10x10_UNORM_BLOCK;
>-            dataInitializerFunction = nullptr;
>-            break;
>-        }
>-
>-        case angle::Format::ID::ASTC_10x5_SRGB_BLOCK:
>-        {
>-            internalFormat          = GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x5_KHR;
>-            textureFormatID         = angle::Format::ID::ASTC_10x5_SRGB_BLOCK;
>-            vkTextureFormat         = VK_FORMAT_ASTC_10x5_SRGB_BLOCK;
>-            bufferFormatID          = angle::Format::ID::ASTC_10x5_SRGB_BLOCK;
>-            vkBufferFormat          = VK_FORMAT_ASTC_10x5_SRGB_BLOCK;
>-            dataInitializerFunction = nullptr;
>-            break;
>-        }
>-
>-        case angle::Format::ID::ASTC_10x5_UNORM_BLOCK:
>-        {
>-            internalFormat          = GL_COMPRESSED_RGBA_ASTC_10x5_KHR;
>-            textureFormatID         = angle::Format::ID::ASTC_10x5_UNORM_BLOCK;
>-            vkTextureFormat         = VK_FORMAT_ASTC_10x5_UNORM_BLOCK;
>-            bufferFormatID          = angle::Format::ID::ASTC_10x5_UNORM_BLOCK;
>-            vkBufferFormat          = VK_FORMAT_ASTC_10x5_UNORM_BLOCK;
>-            dataInitializerFunction = nullptr;
>-            break;
>-        }
>-
>-        case angle::Format::ID::ASTC_10x6_SRGB_BLOCK:
>-        {
>-            internalFormat          = GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x6_KHR;
>-            textureFormatID         = angle::Format::ID::ASTC_10x6_SRGB_BLOCK;
>-            vkTextureFormat         = VK_FORMAT_ASTC_10x6_SRGB_BLOCK;
>-            bufferFormatID          = angle::Format::ID::ASTC_10x6_SRGB_BLOCK;
>-            vkBufferFormat          = VK_FORMAT_ASTC_10x6_SRGB_BLOCK;
>-            dataInitializerFunction = nullptr;
>-            break;
>-        }
>-
>-        case angle::Format::ID::ASTC_10x6_UNORM_BLOCK:
>-        {
>-            internalFormat          = GL_COMPRESSED_RGBA_ASTC_10x6_KHR;
>-            textureFormatID         = angle::Format::ID::ASTC_10x6_UNORM_BLOCK;
>-            vkTextureFormat         = VK_FORMAT_ASTC_10x6_UNORM_BLOCK;
>-            bufferFormatID          = angle::Format::ID::ASTC_10x6_UNORM_BLOCK;
>-            vkBufferFormat          = VK_FORMAT_ASTC_10x6_UNORM_BLOCK;
>-            dataInitializerFunction = nullptr;
>-            break;
>-        }
>-
>-        case angle::Format::ID::ASTC_10x8_SRGB_BLOCK:
>-        {
>-            internalFormat          = GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x8_KHR;
>-            textureFormatID         = angle::Format::ID::ASTC_10x8_SRGB_BLOCK;
>-            vkTextureFormat         = VK_FORMAT_ASTC_10x8_SRGB_BLOCK;
>-            bufferFormatID          = angle::Format::ID::ASTC_10x8_SRGB_BLOCK;
>-            vkBufferFormat          = VK_FORMAT_ASTC_10x8_SRGB_BLOCK;
>-            dataInitializerFunction = nullptr;
>-            break;
>-        }
>-
>-        case angle::Format::ID::ASTC_10x8_UNORM_BLOCK:
>-        {
>-            internalFormat          = GL_COMPRESSED_RGBA_ASTC_10x8_KHR;
>-            textureFormatID         = angle::Format::ID::ASTC_10x8_UNORM_BLOCK;
>-            vkTextureFormat         = VK_FORMAT_ASTC_10x8_UNORM_BLOCK;
>-            bufferFormatID          = angle::Format::ID::ASTC_10x8_UNORM_BLOCK;
>-            vkBufferFormat          = VK_FORMAT_ASTC_10x8_UNORM_BLOCK;
>-            dataInitializerFunction = nullptr;
>-            break;
>-        }
>-
>-        case angle::Format::ID::ASTC_12x10_SRGB_BLOCK:
>-        {
>-            internalFormat          = GL_COMPRESSED_SRGB8_ALPHA8_ASTC_12x10_KHR;
>-            textureFormatID         = angle::Format::ID::ASTC_12x10_SRGB_BLOCK;
>-            vkTextureFormat         = VK_FORMAT_ASTC_12x10_SRGB_BLOCK;
>-            bufferFormatID          = angle::Format::ID::ASTC_12x10_SRGB_BLOCK;
>-            vkBufferFormat          = VK_FORMAT_ASTC_12x10_SRGB_BLOCK;
>-            dataInitializerFunction = nullptr;
>-            break;
>-        }
>-
>-        case angle::Format::ID::ASTC_12x10_UNORM_BLOCK:
>-        {
>-            internalFormat          = GL_COMPRESSED_RGBA_ASTC_12x10_KHR;
>-            textureFormatID         = angle::Format::ID::ASTC_12x10_UNORM_BLOCK;
>-            vkTextureFormat         = VK_FORMAT_ASTC_12x10_UNORM_BLOCK;
>-            bufferFormatID          = angle::Format::ID::ASTC_12x10_UNORM_BLOCK;
>-            vkBufferFormat          = VK_FORMAT_ASTC_12x10_UNORM_BLOCK;
>-            dataInitializerFunction = nullptr;
>-            break;
>-        }
>-
>-        case angle::Format::ID::ASTC_12x12_SRGB_BLOCK:
>+        case angle::FormatID::EAC_R11G11_SNORM_BLOCK:
>+            internalFormat               = GL_COMPRESSED_SIGNED_RG11_EAC;
>+            imageFormatID                = angle::FormatID::EAC_R11G11_SNORM_BLOCK;
>+            vkImageFormat                = VK_FORMAT_EAC_R11G11_SNORM_BLOCK;
>+            imageInitializerFunction     = nullptr;
>+            bufferFormatID               = angle::FormatID::EAC_R11G11_SNORM_BLOCK;
>+            vkBufferFormat               = VK_FORMAT_EAC_R11G11_SNORM_BLOCK;
>+            vkBufferFormatIsPacked       = false;
>+            vertexLoadFunction           = nullptr;
>+            vertexLoadRequiresConversion = false;
>+            break;
>+
>+        case angle::FormatID::EAC_R11G11_UNORM_BLOCK:
>+            internalFormat               = GL_COMPRESSED_RG11_EAC;
>+            imageFormatID                = angle::FormatID::EAC_R11G11_UNORM_BLOCK;
>+            vkImageFormat                = VK_FORMAT_EAC_R11G11_UNORM_BLOCK;
>+            imageInitializerFunction     = nullptr;
>+            bufferFormatID               = angle::FormatID::EAC_R11G11_UNORM_BLOCK;
>+            vkBufferFormat               = VK_FORMAT_EAC_R11G11_UNORM_BLOCK;
>+            vkBufferFormatIsPacked       = false;
>+            vertexLoadFunction           = nullptr;
>+            vertexLoadRequiresConversion = false;
>+            break;
>+
>+        case angle::FormatID::EAC_R11_SNORM_BLOCK:
>+            internalFormat               = GL_COMPRESSED_SIGNED_R11_EAC;
>+            imageFormatID                = angle::FormatID::EAC_R11_SNORM_BLOCK;
>+            vkImageFormat                = VK_FORMAT_EAC_R11_SNORM_BLOCK;
>+            imageInitializerFunction     = nullptr;
>+            bufferFormatID               = angle::FormatID::EAC_R11_SNORM_BLOCK;
>+            vkBufferFormat               = VK_FORMAT_EAC_R11_SNORM_BLOCK;
>+            vkBufferFormatIsPacked       = false;
>+            vertexLoadFunction           = nullptr;
>+            vertexLoadRequiresConversion = false;
>+            break;
>+
>+        case angle::FormatID::EAC_R11_UNORM_BLOCK:
>+            internalFormat               = GL_COMPRESSED_R11_EAC;
>+            imageFormatID                = angle::FormatID::EAC_R11_UNORM_BLOCK;
>+            vkImageFormat                = VK_FORMAT_EAC_R11_UNORM_BLOCK;
>+            imageInitializerFunction     = nullptr;
>+            bufferFormatID               = angle::FormatID::EAC_R11_UNORM_BLOCK;
>+            vkBufferFormat               = VK_FORMAT_EAC_R11_UNORM_BLOCK;
>+            vkBufferFormatIsPacked       = false;
>+            vertexLoadFunction           = nullptr;
>+            vertexLoadRequiresConversion = false;
>+            break;
>+
>+        case angle::FormatID::ETC1_LOSSY_DECODE_R8G8B8_UNORM_BLOCK:
>             // This format is not implemented in Vulkan.
>             break;
> 
>-        case angle::Format::ID::ASTC_12x12_UNORM_BLOCK:
>-        {
>-            internalFormat          = GL_COMPRESSED_RGBA_ASTC_12x12_KHR;
>-            textureFormatID         = angle::Format::ID::ASTC_12x12_UNORM_BLOCK;
>-            vkTextureFormat         = VK_FORMAT_ASTC_12x12_UNORM_BLOCK;
>-            bufferFormatID          = angle::Format::ID::ASTC_12x12_UNORM_BLOCK;
>-            vkBufferFormat          = VK_FORMAT_ASTC_12x12_UNORM_BLOCK;
>-            dataInitializerFunction = nullptr;
>-            break;
>-        }
>-
>-        case angle::Format::ID::ASTC_4x4_SRGB_BLOCK:
>-        {
>-            internalFormat          = GL_COMPRESSED_SRGB8_ALPHA8_ASTC_4x4_KHR;
>-            textureFormatID         = angle::Format::ID::ASTC_4x4_SRGB_BLOCK;
>-            vkTextureFormat         = VK_FORMAT_ASTC_4x4_SRGB_BLOCK;
>-            bufferFormatID          = angle::Format::ID::ASTC_4x4_SRGB_BLOCK;
>-            vkBufferFormat          = VK_FORMAT_ASTC_4x4_SRGB_BLOCK;
>-            dataInitializerFunction = nullptr;
>-            break;
>-        }
>-
>-        case angle::Format::ID::ASTC_4x4_UNORM_BLOCK:
>-        {
>-            internalFormat          = GL_COMPRESSED_RGBA_ASTC_4x4_KHR;
>-            textureFormatID         = angle::Format::ID::ASTC_4x4_UNORM_BLOCK;
>-            vkTextureFormat         = VK_FORMAT_ASTC_4x4_UNORM_BLOCK;
>-            bufferFormatID          = angle::Format::ID::ASTC_4x4_UNORM_BLOCK;
>-            vkBufferFormat          = VK_FORMAT_ASTC_4x4_UNORM_BLOCK;
>-            dataInitializerFunction = nullptr;
>-            break;
>-        }
>-
>-        case angle::Format::ID::ASTC_5x4_SRGB_BLOCK:
>-        {
>-            internalFormat          = GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x4_KHR;
>-            textureFormatID         = angle::Format::ID::ASTC_5x4_SRGB_BLOCK;
>-            vkTextureFormat         = VK_FORMAT_ASTC_5x4_SRGB_BLOCK;
>-            bufferFormatID          = angle::Format::ID::ASTC_5x4_SRGB_BLOCK;
>-            vkBufferFormat          = VK_FORMAT_ASTC_5x4_SRGB_BLOCK;
>-            dataInitializerFunction = nullptr;
>-            break;
>-        }
>-
>-        case angle::Format::ID::ASTC_5x4_UNORM_BLOCK:
>-        {
>-            internalFormat          = GL_COMPRESSED_RGBA_ASTC_5x4_KHR;
>-            textureFormatID         = angle::Format::ID::ASTC_5x4_UNORM_BLOCK;
>-            vkTextureFormat         = VK_FORMAT_ASTC_5x4_UNORM_BLOCK;
>-            bufferFormatID          = angle::Format::ID::ASTC_5x4_UNORM_BLOCK;
>-            vkBufferFormat          = VK_FORMAT_ASTC_5x4_UNORM_BLOCK;
>-            dataInitializerFunction = nullptr;
>-            break;
>-        }
>-
>-        case angle::Format::ID::ASTC_5x5_SRGB_BLOCK:
>-        {
>-            internalFormat          = GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x5_KHR;
>-            textureFormatID         = angle::Format::ID::ASTC_5x5_SRGB_BLOCK;
>-            vkTextureFormat         = VK_FORMAT_ASTC_5x5_SRGB_BLOCK;
>-            bufferFormatID          = angle::Format::ID::ASTC_5x5_SRGB_BLOCK;
>-            vkBufferFormat          = VK_FORMAT_ASTC_5x5_SRGB_BLOCK;
>-            dataInitializerFunction = nullptr;
>-            break;
>-        }
>-
>-        case angle::Format::ID::ASTC_5x5_UNORM_BLOCK:
>-        {
>-            internalFormat          = GL_COMPRESSED_RGBA_ASTC_5x5_KHR;
>-            textureFormatID         = angle::Format::ID::ASTC_5x5_UNORM_BLOCK;
>-            vkTextureFormat         = VK_FORMAT_ASTC_5x5_UNORM_BLOCK;
>-            bufferFormatID          = angle::Format::ID::ASTC_5x5_UNORM_BLOCK;
>-            vkBufferFormat          = VK_FORMAT_ASTC_5x5_UNORM_BLOCK;
>-            dataInitializerFunction = nullptr;
>-            break;
>-        }
>-
>-        case angle::Format::ID::ASTC_6x5_SRGB_BLOCK:
>-        {
>-            internalFormat          = GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x5_KHR;
>-            textureFormatID         = angle::Format::ID::ASTC_6x5_SRGB_BLOCK;
>-            vkTextureFormat         = VK_FORMAT_ASTC_6x5_SRGB_BLOCK;
>-            bufferFormatID          = angle::Format::ID::ASTC_6x5_SRGB_BLOCK;
>-            vkBufferFormat          = VK_FORMAT_ASTC_6x5_SRGB_BLOCK;
>-            dataInitializerFunction = nullptr;
>-            break;
>-        }
>-
>-        case angle::Format::ID::ASTC_6x5_UNORM_BLOCK:
>-        {
>-            internalFormat          = GL_COMPRESSED_RGBA_ASTC_6x5_KHR;
>-            textureFormatID         = angle::Format::ID::ASTC_6x5_UNORM_BLOCK;
>-            vkTextureFormat         = VK_FORMAT_ASTC_6x5_UNORM_BLOCK;
>-            bufferFormatID          = angle::Format::ID::ASTC_6x5_UNORM_BLOCK;
>-            vkBufferFormat          = VK_FORMAT_ASTC_6x5_UNORM_BLOCK;
>-            dataInitializerFunction = nullptr;
>-            break;
>-        }
>-
>-        case angle::Format::ID::ASTC_6x6_SRGB_BLOCK:
>-        {
>-            internalFormat          = GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x6_KHR;
>-            textureFormatID         = angle::Format::ID::ASTC_6x6_SRGB_BLOCK;
>-            vkTextureFormat         = VK_FORMAT_ASTC_6x6_SRGB_BLOCK;
>-            bufferFormatID          = angle::Format::ID::ASTC_6x6_SRGB_BLOCK;
>-            vkBufferFormat          = VK_FORMAT_ASTC_6x6_SRGB_BLOCK;
>-            dataInitializerFunction = nullptr;
>-            break;
>-        }
>-
>-        case angle::Format::ID::ASTC_6x6_UNORM_BLOCK:
>-        {
>-            internalFormat          = GL_COMPRESSED_RGBA_ASTC_6x6_KHR;
>-            textureFormatID         = angle::Format::ID::ASTC_6x6_UNORM_BLOCK;
>-            vkTextureFormat         = VK_FORMAT_ASTC_6x6_UNORM_BLOCK;
>-            bufferFormatID          = angle::Format::ID::ASTC_6x6_UNORM_BLOCK;
>-            vkBufferFormat          = VK_FORMAT_ASTC_6x6_UNORM_BLOCK;
>-            dataInitializerFunction = nullptr;
>-            break;
>-        }
>-
>-        case angle::Format::ID::ASTC_8x5_SRGB_BLOCK:
>-        {
>-            internalFormat          = GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x5_KHR;
>-            textureFormatID         = angle::Format::ID::ASTC_8x5_SRGB_BLOCK;
>-            vkTextureFormat         = VK_FORMAT_ASTC_8x5_SRGB_BLOCK;
>-            bufferFormatID          = angle::Format::ID::ASTC_8x5_SRGB_BLOCK;
>-            vkBufferFormat          = VK_FORMAT_ASTC_8x5_SRGB_BLOCK;
>-            dataInitializerFunction = nullptr;
>-            break;
>-        }
>-
>-        case angle::Format::ID::ASTC_8x5_UNORM_BLOCK:
>-        {
>-            internalFormat          = GL_COMPRESSED_RGBA_ASTC_8x5_KHR;
>-            textureFormatID         = angle::Format::ID::ASTC_8x5_UNORM_BLOCK;
>-            vkTextureFormat         = VK_FORMAT_ASTC_8x5_UNORM_BLOCK;
>-            bufferFormatID          = angle::Format::ID::ASTC_8x5_UNORM_BLOCK;
>-            vkBufferFormat          = VK_FORMAT_ASTC_8x5_UNORM_BLOCK;
>-            dataInitializerFunction = nullptr;
>-            break;
>-        }
>-
>-        case angle::Format::ID::ASTC_8x6_SRGB_BLOCK:
>-        {
>-            internalFormat          = GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x6_KHR;
>-            textureFormatID         = angle::Format::ID::ASTC_8x6_SRGB_BLOCK;
>-            vkTextureFormat         = VK_FORMAT_ASTC_8x6_SRGB_BLOCK;
>-            bufferFormatID          = angle::Format::ID::ASTC_8x6_SRGB_BLOCK;
>-            vkBufferFormat          = VK_FORMAT_ASTC_8x6_SRGB_BLOCK;
>-            dataInitializerFunction = nullptr;
>-            break;
>-        }
>-
>-        case angle::Format::ID::ASTC_8x6_UNORM_BLOCK:
>-        {
>-            internalFormat          = GL_COMPRESSED_RGBA_ASTC_8x6_KHR;
>-            textureFormatID         = angle::Format::ID::ASTC_8x6_UNORM_BLOCK;
>-            vkTextureFormat         = VK_FORMAT_ASTC_8x6_UNORM_BLOCK;
>-            bufferFormatID          = angle::Format::ID::ASTC_8x6_UNORM_BLOCK;
>-            vkBufferFormat          = VK_FORMAT_ASTC_8x6_UNORM_BLOCK;
>-            dataInitializerFunction = nullptr;
>-            break;
>-        }
>-
>-        case angle::Format::ID::ASTC_8x8_SRGB_BLOCK:
>-        {
>-            internalFormat          = GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x8_KHR;
>-            textureFormatID         = angle::Format::ID::ASTC_8x8_SRGB_BLOCK;
>-            vkTextureFormat         = VK_FORMAT_ASTC_8x8_SRGB_BLOCK;
>-            bufferFormatID          = angle::Format::ID::ASTC_8x8_SRGB_BLOCK;
>-            vkBufferFormat          = VK_FORMAT_ASTC_8x8_SRGB_BLOCK;
>-            dataInitializerFunction = nullptr;
>-            break;
>-        }
>-
>-        case angle::Format::ID::ASTC_8x8_UNORM_BLOCK:
>-        {
>-            internalFormat          = GL_COMPRESSED_RGBA_ASTC_8x8_KHR;
>-            textureFormatID         = angle::Format::ID::ASTC_8x8_UNORM_BLOCK;
>-            vkTextureFormat         = VK_FORMAT_ASTC_8x8_UNORM_BLOCK;
>-            bufferFormatID          = angle::Format::ID::ASTC_8x8_UNORM_BLOCK;
>-            vkBufferFormat          = VK_FORMAT_ASTC_8x8_UNORM_BLOCK;
>-            dataInitializerFunction = nullptr;
>-            break;
>-        }
>-
>-        case angle::Format::ID::B4G4R4A4_UNORM:
>-        {
>-            internalFormat          = GL_BGRA4_ANGLEX;
>-            textureFormatID         = angle::Format::ID::B4G4R4A4_UNORM;
>-            vkTextureFormat         = VK_FORMAT_B4G4R4A4_UNORM_PACK16;
>-            bufferFormatID          = angle::Format::ID::B4G4R4A4_UNORM;
>-            vkBufferFormat          = VK_FORMAT_B4G4R4A4_UNORM_PACK16;
>-            dataInitializerFunction = nullptr;
>-            break;
>-        }
>-
>-        case angle::Format::ID::B5G5R5A1_UNORM:
>-        {
>-            internalFormat          = GL_BGR5_A1_ANGLEX;
>-            textureFormatID         = angle::Format::ID::B5G5R5A1_UNORM;
>-            vkTextureFormat         = VK_FORMAT_B5G5R5A1_UNORM_PACK16;
>-            bufferFormatID          = angle::Format::ID::B5G5R5A1_UNORM;
>-            vkBufferFormat          = VK_FORMAT_B5G5R5A1_UNORM_PACK16;
>-            dataInitializerFunction = nullptr;
>-            break;
>-        }
>-
>-        case angle::Format::ID::B5G6R5_UNORM:
>-        {
>-            internalFormat          = GL_BGR565_ANGLEX;
>-            textureFormatID         = angle::Format::ID::B5G6R5_UNORM;
>-            vkTextureFormat         = VK_FORMAT_B5G6R5_UNORM_PACK16;
>-            bufferFormatID          = angle::Format::ID::B5G6R5_UNORM;
>-            vkBufferFormat          = VK_FORMAT_B5G6R5_UNORM_PACK16;
>-            dataInitializerFunction = nullptr;
>-            break;
>-        }
>-
>-        case angle::Format::ID::B8G8R8A8_UNORM:
>-        {
>-            internalFormat          = GL_BGRA8_EXT;
>-            textureFormatID         = angle::Format::ID::B8G8R8A8_UNORM;
>-            vkTextureFormat         = VK_FORMAT_B8G8R8A8_UNORM;
>-            bufferFormatID          = angle::Format::ID::B8G8R8A8_UNORM;
>-            vkBufferFormat          = VK_FORMAT_B8G8R8A8_UNORM;
>-            dataInitializerFunction = nullptr;
>-            break;
>-        }
>-
>-        case angle::Format::ID::B8G8R8A8_UNORM_SRGB:
>+        case angle::FormatID::ETC1_R8G8B8_UNORM_BLOCK:
>+            internalFormat               = GL_ETC1_RGB8_OES;
>+            imageFormatID                = angle::FormatID::ETC2_R8G8B8_UNORM_BLOCK;
>+            vkImageFormat                = VK_FORMAT_ETC2_R8G8B8_UNORM_BLOCK;
>+            imageInitializerFunction     = nullptr;
>+            bufferFormatID               = angle::FormatID::NONE;
>+            vkBufferFormat               = VK_FORMAT_UNDEFINED;
>+            vkBufferFormatIsPacked       = false;
>+            vertexLoadFunction           = nullptr;
>+            vertexLoadRequiresConversion = true;
>+            break;
>+
>+        case angle::FormatID::ETC2_R8G8B8A1_SRGB_BLOCK:
>+            internalFormat               = GL_COMPRESSED_SRGB8_PUNCHTHROUGH_ALPHA1_ETC2;
>+            imageFormatID                = angle::FormatID::ETC2_R8G8B8A1_SRGB_BLOCK;
>+            vkImageFormat                = VK_FORMAT_ETC2_R8G8B8A1_SRGB_BLOCK;
>+            imageInitializerFunction     = nullptr;
>+            bufferFormatID               = angle::FormatID::ETC2_R8G8B8A1_SRGB_BLOCK;
>+            vkBufferFormat               = VK_FORMAT_ETC2_R8G8B8A1_SRGB_BLOCK;
>+            vkBufferFormatIsPacked       = false;
>+            vertexLoadFunction           = CopyNativeVertexData<GLbyte, 4, 4, 0>;
>+            vertexLoadRequiresConversion = false;
>+            break;
>+
>+        case angle::FormatID::ETC2_R8G8B8A1_UNORM_BLOCK:
>+            internalFormat           = GL_COMPRESSED_RGB8_PUNCHTHROUGH_ALPHA1_ETC2;
>+            imageFormatID            = angle::FormatID::ETC2_R8G8B8A1_UNORM_BLOCK;
>+            vkImageFormat            = VK_FORMAT_ETC2_R8G8B8A1_UNORM_BLOCK;
>+            imageInitializerFunction = Initialize4ComponentData<GLubyte, 0x00, 0x00, 0x00, 0xFF>;
>+            bufferFormatID           = angle::FormatID::ETC2_R8G8B8A1_UNORM_BLOCK;
>+            vkBufferFormat           = VK_FORMAT_ETC2_R8G8B8A1_UNORM_BLOCK;
>+            vkBufferFormatIsPacked   = false;
>+            vertexLoadFunction       = CopyNativeVertexData<GLubyte, 4, 4, 0>;
>+            vertexLoadRequiresConversion = false;
>+            break;
>+
>+        case angle::FormatID::ETC2_R8G8B8A8_SRGB_BLOCK:
>+            internalFormat               = GL_COMPRESSED_SRGB8_ALPHA8_ETC2_EAC;
>+            imageFormatID                = angle::FormatID::ETC2_R8G8B8A8_SRGB_BLOCK;
>+            vkImageFormat                = VK_FORMAT_ETC2_R8G8B8A8_SRGB_BLOCK;
>+            imageInitializerFunction     = nullptr;
>+            bufferFormatID               = angle::FormatID::ETC2_R8G8B8A8_SRGB_BLOCK;
>+            vkBufferFormat               = VK_FORMAT_ETC2_R8G8B8A8_SRGB_BLOCK;
>+            vkBufferFormatIsPacked       = false;
>+            vertexLoadFunction           = CopyNativeVertexData<GLbyte, 4, 4, 0>;
>+            vertexLoadRequiresConversion = false;
>+            break;
>+
>+        case angle::FormatID::ETC2_R8G8B8A8_UNORM_BLOCK:
>+            internalFormat               = GL_COMPRESSED_RGBA8_ETC2_EAC;
>+            imageFormatID                = angle::FormatID::ETC2_R8G8B8A8_UNORM_BLOCK;
>+            vkImageFormat                = VK_FORMAT_ETC2_R8G8B8A8_UNORM_BLOCK;
>+            imageInitializerFunction     = nullptr;
>+            bufferFormatID               = angle::FormatID::ETC2_R8G8B8A8_UNORM_BLOCK;
>+            vkBufferFormat               = VK_FORMAT_ETC2_R8G8B8A8_UNORM_BLOCK;
>+            vkBufferFormatIsPacked       = false;
>+            vertexLoadFunction           = CopyNativeVertexData<GLubyte, 4, 4, 0>;
>+            vertexLoadRequiresConversion = false;
>+            break;
>+
>+        case angle::FormatID::ETC2_R8G8B8_SRGB_BLOCK:
>+            internalFormat               = GL_COMPRESSED_SRGB8_ETC2;
>+            imageFormatID                = angle::FormatID::ETC2_R8G8B8_SRGB_BLOCK;
>+            vkImageFormat                = VK_FORMAT_ETC2_R8G8B8_SRGB_BLOCK;
>+            imageInitializerFunction     = nullptr;
>+            bufferFormatID               = angle::FormatID::ETC2_R8G8B8_SRGB_BLOCK;
>+            vkBufferFormat               = VK_FORMAT_ETC2_R8G8B8_SRGB_BLOCK;
>+            vkBufferFormatIsPacked       = false;
>+            vertexLoadFunction           = CopyNativeVertexData<GLbyte, 3, 3, 0>;
>+            vertexLoadRequiresConversion = false;
>+            break;
>+
>+        case angle::FormatID::ETC2_R8G8B8_UNORM_BLOCK:
>+            internalFormat               = GL_COMPRESSED_RGB8_ETC2;
>+            imageFormatID                = angle::FormatID::ETC2_R8G8B8_UNORM_BLOCK;
>+            vkImageFormat                = VK_FORMAT_ETC2_R8G8B8_UNORM_BLOCK;
>+            imageInitializerFunction     = nullptr;
>+            bufferFormatID               = angle::FormatID::ETC2_R8G8B8_UNORM_BLOCK;
>+            vkBufferFormat               = VK_FORMAT_ETC2_R8G8B8_UNORM_BLOCK;
>+            vkBufferFormatIsPacked       = false;
>+            vertexLoadFunction           = CopyNativeVertexData<GLubyte, 3, 3, 0>;
>+            vertexLoadRequiresConversion = false;
>+            break;
>+
>+        case angle::FormatID::L16A16_FLOAT:
>             // This format is not implemented in Vulkan.
>             break;
> 
>-        case angle::Format::ID::B8G8R8X8_UNORM:
>+        case angle::FormatID::L16_FLOAT:
>             // This format is not implemented in Vulkan.
>             break;
> 
>-        case angle::Format::ID::BC1_RGBA_UNORM_BLOCK:
>-        {
>-            internalFormat          = GL_COMPRESSED_RGBA_S3TC_DXT1_EXT;
>-            textureFormatID         = angle::Format::ID::BC1_RGBA_UNORM_BLOCK;
>-            vkTextureFormat         = VK_FORMAT_BC1_RGBA_UNORM_BLOCK;
>-            bufferFormatID          = angle::Format::ID::BC1_RGBA_UNORM_BLOCK;
>-            vkBufferFormat          = VK_FORMAT_BC1_RGBA_UNORM_BLOCK;
>-            dataInitializerFunction = nullptr;
>+        case angle::FormatID::L32A32_FLOAT:
>+            // This format is not implemented in Vulkan.
>             break;
>-        }
> 
>-        case angle::Format::ID::BC1_RGBA_UNORM_SRGB_BLOCK:
>+        case angle::FormatID::L32_FLOAT:
>             // This format is not implemented in Vulkan.
>             break;
> 
>-        case angle::Format::ID::BC1_RGB_UNORM_BLOCK:
>-        {
>-            internalFormat          = GL_COMPRESSED_RGB_S3TC_DXT1_EXT;
>-            textureFormatID         = angle::Format::ID::BC1_RGB_UNORM_BLOCK;
>-            vkTextureFormat         = VK_FORMAT_BC1_RGB_UNORM_BLOCK;
>-            bufferFormatID          = angle::Format::ID::BC1_RGB_UNORM_BLOCK;
>-            vkBufferFormat          = VK_FORMAT_BC1_RGB_UNORM_BLOCK;
>-            dataInitializerFunction = nullptr;
>+        case angle::FormatID::L8A8_UNORM:
>+            internalFormat           = GL_LUMINANCE8_ALPHA8_EXT;
>+            imageFormatID            = angle::FormatID::R8G8_UNORM;
>+            vkImageFormat            = VK_FORMAT_R8G8_UNORM;
>+            imageInitializerFunction = nullptr;
>+
>             break;
>-        }
> 
>-        case angle::Format::ID::BC1_RGB_UNORM_SRGB_BLOCK:
>-            // This format is not implemented in Vulkan.
>+        case angle::FormatID::L8_UNORM:
>+            internalFormat           = GL_LUMINANCE8_EXT;
>+            imageFormatID            = angle::FormatID::R8_UNORM;
>+            vkImageFormat            = VK_FORMAT_R8_UNORM;
>+            imageInitializerFunction = nullptr;
>+
>             break;
> 
>-        case angle::Format::ID::BC2_RGBA_UNORM_BLOCK:
>+        case angle::FormatID::NONE:
>             // This format is not implemented in Vulkan.
>             break;
> 
>-        case angle::Format::ID::BC2_RGBA_UNORM_SRGB_BLOCK:
>+        case angle::FormatID::R10G10B10A2_SINT:
>+            internalFormat               = GL_RGB10_A2_SINT_ANGLEX;
>+            imageFormatID                = angle::FormatID::R10G10B10A2_SINT;
>+            vkImageFormat                = VK_FORMAT_A2B10G10R10_SINT_PACK32;
>+            imageInitializerFunction     = nullptr;
>+            bufferFormatID               = angle::FormatID::R10G10B10A2_SINT;
>+            vkBufferFormat               = VK_FORMAT_A2B10G10R10_SINT_PACK32;
>+            vkBufferFormatIsPacked       = true;
>+            vertexLoadFunction           = nullptr;
>+            vertexLoadRequiresConversion = false;
>+            break;
>+
>+        case angle::FormatID::R10G10B10A2_SNORM:
>+            internalFormat               = GL_RGB10_A2_SNORM_ANGLEX;
>+            imageFormatID                = angle::FormatID::R10G10B10A2_SNORM;
>+            vkImageFormat                = VK_FORMAT_A2B10G10R10_SNORM_PACK32;
>+            imageInitializerFunction     = nullptr;
>+            bufferFormatID               = angle::FormatID::R10G10B10A2_SNORM;
>+            vkBufferFormat               = VK_FORMAT_A2B10G10R10_SNORM_PACK32;
>+            vkBufferFormatIsPacked       = true;
>+            vertexLoadFunction           = nullptr;
>+            vertexLoadRequiresConversion = false;
>+            break;
>+
>+        case angle::FormatID::R10G10B10A2_SSCALED:
>+            internalFormat               = GL_RGB10_A2_SSCALED_ANGLEX;
>+            imageFormatID                = angle::FormatID::R10G10B10A2_SSCALED;
>+            vkImageFormat                = VK_FORMAT_A2B10G10R10_SSCALED_PACK32;
>+            imageInitializerFunction     = nullptr;
>+            bufferFormatID               = angle::FormatID::R10G10B10A2_SSCALED;
>+            vkBufferFormat               = VK_FORMAT_A2B10G10R10_SSCALED_PACK32;
>+            vkBufferFormatIsPacked       = true;
>+            vertexLoadFunction           = nullptr;
>+            vertexLoadRequiresConversion = false;
>+            break;
>+
>+        case angle::FormatID::R10G10B10A2_UINT:
>+            internalFormat               = GL_RGB10_A2UI;
>+            imageFormatID                = angle::FormatID::R10G10B10A2_UINT;
>+            vkImageFormat                = VK_FORMAT_A2B10G10R10_UINT_PACK32;
>+            imageInitializerFunction     = nullptr;
>+            bufferFormatID               = angle::FormatID::R10G10B10A2_UINT;
>+            vkBufferFormat               = VK_FORMAT_A2B10G10R10_UINT_PACK32;
>+            vkBufferFormatIsPacked       = true;
>+            vertexLoadFunction           = nullptr;
>+            vertexLoadRequiresConversion = false;
>+            break;
>+
>+        case angle::FormatID::R10G10B10A2_UNORM:
>+            internalFormat               = GL_RGB10_A2;
>+            imageFormatID                = angle::FormatID::R10G10B10A2_UNORM;
>+            vkImageFormat                = VK_FORMAT_A2B10G10R10_UNORM_PACK32;
>+            imageInitializerFunction     = nullptr;
>+            bufferFormatID               = angle::FormatID::R10G10B10A2_UNORM;
>+            vkBufferFormat               = VK_FORMAT_A2B10G10R10_UNORM_PACK32;
>+            vkBufferFormatIsPacked       = true;
>+            vertexLoadFunction           = nullptr;
>+            vertexLoadRequiresConversion = false;
>+            break;
>+
>+        case angle::FormatID::R10G10B10A2_USCALED:
>+            internalFormat               = GL_RGB10_A2_USCALED_ANGLEX;
>+            imageFormatID                = angle::FormatID::R10G10B10A2_USCALED;
>+            vkImageFormat                = VK_FORMAT_A2B10G10R10_USCALED_PACK32;
>+            imageInitializerFunction     = nullptr;
>+            bufferFormatID               = angle::FormatID::R10G10B10A2_USCALED;
>+            vkBufferFormat               = VK_FORMAT_A2B10G10R10_USCALED_PACK32;
>+            vkBufferFormatIsPacked       = true;
>+            vertexLoadFunction           = nullptr;
>+            vertexLoadRequiresConversion = false;
>+            break;
>+
>+        case angle::FormatID::R11G11B10_FLOAT:
>             // This format is not implemented in Vulkan.
>             break;
> 
>-        case angle::Format::ID::BC3_RGBA_UNORM_BLOCK:
>+        case angle::FormatID::R16G16B16A16_FLOAT:
>+            internalFormat               = GL_RGBA16F;
>+            imageFormatID                = angle::FormatID::R16G16B16A16_FLOAT;
>+            vkImageFormat                = VK_FORMAT_R16G16B16A16_SFLOAT;
>+            imageInitializerFunction     = nullptr;
>+            bufferFormatID               = angle::FormatID::R16G16B16A16_FLOAT;
>+            vkBufferFormat               = VK_FORMAT_R16G16B16A16_SFLOAT;
>+            vkBufferFormatIsPacked       = false;
>+            vertexLoadFunction           = CopyNativeVertexData<GLfloat, 4, 4, 0>;
>+            vertexLoadRequiresConversion = false;
>+            break;
>+
>+        case angle::FormatID::R16G16B16A16_SINT:
>+            internalFormat               = GL_RGBA16I;
>+            imageFormatID                = angle::FormatID::R16G16B16A16_SINT;
>+            vkImageFormat                = VK_FORMAT_R16G16B16A16_SINT;
>+            imageInitializerFunction     = nullptr;
>+            bufferFormatID               = angle::FormatID::R16G16B16A16_SINT;
>+            vkBufferFormat               = VK_FORMAT_R16G16B16A16_SINT;
>+            vkBufferFormatIsPacked       = false;
>+            vertexLoadFunction           = CopyNativeVertexData<GLshort, 4, 4, 0>;
>+            vertexLoadRequiresConversion = false;
>+            break;
>+
>+        case angle::FormatID::R16G16B16A16_SNORM:
>+            internalFormat           = GL_RGBA16_SNORM_EXT;
>+            imageFormatID            = angle::FormatID::R16G16B16A16_SNORM;
>+            vkImageFormat            = VK_FORMAT_R16G16B16A16_SNORM;
>+            imageInitializerFunction = nullptr;
>+            {
>+                static constexpr BufferFormatInitInfo kInfo[] = {
>+                    {angle::FormatID::R16G16B16A16_SNORM, VK_FORMAT_R16G16B16A16_SNORM, false,
>+                     CopyNativeVertexData<GLshort, 4, 4, 0>, false},
>+                    {angle::FormatID::R32G32B32A32_FLOAT, VK_FORMAT_R32G32B32A32_SFLOAT, false,
>+                     CopyTo32FVertexData<GLshort, 4, 4, true>, true}};
>+                initBufferFallback(renderer, kInfo, ArraySize(kInfo));
>+            }
>+            break;
>+
>+        case angle::FormatID::R16G16B16A16_SSCALED:
>+            internalFormat           = GL_RGBA16_SSCALED_ANGLEX;
>+            imageFormatID            = angle::FormatID::R16G16B16A16_SSCALED;
>+            vkImageFormat            = VK_FORMAT_R16G16B16A16_SSCALED;
>+            imageInitializerFunction = nullptr;
>+            {
>+                static constexpr BufferFormatInitInfo kInfo[] = {
>+                    {angle::FormatID::R16G16B16A16_SSCALED, VK_FORMAT_R16G16B16A16_SSCALED, false,
>+                     CopyNativeVertexData<GLshort, 4, 4, 0>, false},
>+                    {angle::FormatID::R32G32B32A32_FLOAT, VK_FORMAT_R32G32B32A32_SFLOAT, false,
>+                     CopyTo32FVertexData<GLshort, 4, 4, false>, true}};
>+                initBufferFallback(renderer, kInfo, ArraySize(kInfo));
>+            }
>+            break;
>+
>+        case angle::FormatID::R16G16B16A16_UINT:
>+            internalFormat               = GL_RGBA16UI;
>+            imageFormatID                = angle::FormatID::R16G16B16A16_UINT;
>+            vkImageFormat                = VK_FORMAT_R16G16B16A16_UINT;
>+            imageInitializerFunction     = nullptr;
>+            bufferFormatID               = angle::FormatID::R16G16B16A16_UINT;
>+            vkBufferFormat               = VK_FORMAT_R16G16B16A16_UINT;
>+            vkBufferFormatIsPacked       = false;
>+            vertexLoadFunction           = CopyNativeVertexData<GLushort, 4, 4, 0>;
>+            vertexLoadRequiresConversion = false;
>+            break;
>+
>+        case angle::FormatID::R16G16B16A16_UNORM:
>+            internalFormat           = GL_RGBA16_EXT;
>+            imageFormatID            = angle::FormatID::R16G16B16A16_UNORM;
>+            vkImageFormat            = VK_FORMAT_R16G16B16A16_UNORM;
>+            imageInitializerFunction = nullptr;
>+            {
>+                static constexpr BufferFormatInitInfo kInfo[] = {
>+                    {angle::FormatID::R16G16B16A16_UNORM, VK_FORMAT_R16G16B16A16_UNORM, false,
>+                     CopyNativeVertexData<GLushort, 4, 4, 0>, false},
>+                    {angle::FormatID::R32G32B32A32_FLOAT, VK_FORMAT_R32G32B32A32_SFLOAT, false,
>+                     CopyTo32FVertexData<GLushort, 4, 4, true>, true}};
>+                initBufferFallback(renderer, kInfo, ArraySize(kInfo));
>+            }
>+            break;
>+
>+        case angle::FormatID::R16G16B16A16_USCALED:
>+            internalFormat           = GL_RGBA16_USCALED_ANGLEX;
>+            imageFormatID            = angle::FormatID::R16G16B16A16_USCALED;
>+            vkImageFormat            = VK_FORMAT_R16G16B16A16_USCALED;
>+            imageInitializerFunction = nullptr;
>+            {
>+                static constexpr BufferFormatInitInfo kInfo[] = {
>+                    {angle::FormatID::R16G16B16A16_USCALED, VK_FORMAT_R16G16B16A16_USCALED, false,
>+                     CopyNativeVertexData<GLushort, 4, 4, 0>, false},
>+                    {angle::FormatID::R32G32B32A32_FLOAT, VK_FORMAT_R32G32B32A32_SFLOAT, false,
>+                     CopyTo32FVertexData<GLushort, 4, 4, false>, true}};
>+                initBufferFallback(renderer, kInfo, ArraySize(kInfo));
>+            }
>+            break;
>+
>+        case angle::FormatID::R16G16B16_FLOAT:
>+            internalFormat               = GL_RGB16F;
>+            imageFormatID                = angle::FormatID::R16G16B16_FLOAT;
>+            vkImageFormat                = VK_FORMAT_R16G16B16_SFLOAT;
>+            imageInitializerFunction     = nullptr;
>+            bufferFormatID               = angle::FormatID::R16G16B16_FLOAT;
>+            vkBufferFormat               = VK_FORMAT_R16G16B16_SFLOAT;
>+            vkBufferFormatIsPacked       = false;
>+            vertexLoadFunction           = CopyNativeVertexData<GLfloat, 3, 3, 0>;
>+            vertexLoadRequiresConversion = false;
>+            break;
>+
>+        case angle::FormatID::R16G16B16_SINT:
>+            internalFormat               = GL_RGB16I;
>+            imageFormatID                = angle::FormatID::R16G16B16_SINT;
>+            vkImageFormat                = VK_FORMAT_R16G16B16_SINT;
>+            imageInitializerFunction     = nullptr;
>+            bufferFormatID               = angle::FormatID::R16G16B16_SINT;
>+            vkBufferFormat               = VK_FORMAT_R16G16B16_SINT;
>+            vkBufferFormatIsPacked       = false;
>+            vertexLoadFunction           = CopyNativeVertexData<GLshort, 3, 3, 0>;
>+            vertexLoadRequiresConversion = false;
>+            break;
>+
>+        case angle::FormatID::R16G16B16_SNORM:
>+            internalFormat           = GL_RGB16_SNORM_EXT;
>+            imageFormatID            = angle::FormatID::R16G16B16_SNORM;
>+            vkImageFormat            = VK_FORMAT_R16G16B16_SNORM;
>+            imageInitializerFunction = nullptr;
>+            {
>+                static constexpr BufferFormatInitInfo kInfo[] = {
>+                    {angle::FormatID::R16G16B16_SNORM, VK_FORMAT_R16G16B16_SNORM, false,
>+                     CopyNativeVertexData<GLshort, 3, 3, 0>, false},
>+                    {angle::FormatID::R32G32B32_FLOAT, VK_FORMAT_R32G32B32_SFLOAT, false,
>+                     CopyTo32FVertexData<GLshort, 3, 3, true>, true}};
>+                initBufferFallback(renderer, kInfo, ArraySize(kInfo));
>+            }
>+            break;
>+
>+        case angle::FormatID::R16G16B16_SSCALED:
>+            internalFormat           = GL_RGB16_SSCALED_ANGLEX;
>+            imageFormatID            = angle::FormatID::R16G16B16_SSCALED;
>+            vkImageFormat            = VK_FORMAT_R16G16B16_SSCALED;
>+            imageInitializerFunction = nullptr;
>+            {
>+                static constexpr BufferFormatInitInfo kInfo[] = {
>+                    {angle::FormatID::R16G16B16_SSCALED, VK_FORMAT_R16G16B16_SSCALED, false,
>+                     CopyNativeVertexData<GLshort, 3, 3, 0>, false},
>+                    {angle::FormatID::R32G32B32_FLOAT, VK_FORMAT_R32G32B32_SFLOAT, false,
>+                     CopyTo32FVertexData<GLshort, 3, 3, false>, true}};
>+                initBufferFallback(renderer, kInfo, ArraySize(kInfo));
>+            }
>+            break;
>+
>+        case angle::FormatID::R16G16B16_UINT:
>+            internalFormat               = GL_RGB16UI;
>+            imageFormatID                = angle::FormatID::R16G16B16_UINT;
>+            vkImageFormat                = VK_FORMAT_R16G16B16_UINT;
>+            imageInitializerFunction     = nullptr;
>+            bufferFormatID               = angle::FormatID::R16G16B16_UINT;
>+            vkBufferFormat               = VK_FORMAT_R16G16B16_UINT;
>+            vkBufferFormatIsPacked       = false;
>+            vertexLoadFunction           = CopyNativeVertexData<GLushort, 3, 3, 0>;
>+            vertexLoadRequiresConversion = false;
>+            break;
>+
>+        case angle::FormatID::R16G16B16_UNORM:
>+            internalFormat           = GL_RGB16_EXT;
>+            imageFormatID            = angle::FormatID::R16G16B16_UNORM;
>+            vkImageFormat            = VK_FORMAT_R16G16B16_UNORM;
>+            imageInitializerFunction = nullptr;
>+            {
>+                static constexpr BufferFormatInitInfo kInfo[] = {
>+                    {angle::FormatID::R16G16B16_UNORM, VK_FORMAT_R16G16B16_UNORM, false,
>+                     CopyNativeVertexData<GLushort, 3, 3, 0>, false},
>+                    {angle::FormatID::R32G32B32_FLOAT, VK_FORMAT_R32G32B32_SFLOAT, false,
>+                     CopyTo32FVertexData<GLushort, 3, 3, true>, true}};
>+                initBufferFallback(renderer, kInfo, ArraySize(kInfo));
>+            }
>+            break;
>+
>+        case angle::FormatID::R16G16B16_USCALED:
>+            internalFormat           = GL_RGB16_USCALED_ANGLEX;
>+            imageFormatID            = angle::FormatID::R16G16B16_USCALED;
>+            vkImageFormat            = VK_FORMAT_R16G16B16_USCALED;
>+            imageInitializerFunction = nullptr;
>+            {
>+                static constexpr BufferFormatInitInfo kInfo[] = {
>+                    {angle::FormatID::R16G16B16_USCALED, VK_FORMAT_R16G16B16_USCALED, false,
>+                     CopyNativeVertexData<GLushort, 3, 3, 0>, false},
>+                    {angle::FormatID::R32G32B32_FLOAT, VK_FORMAT_R32G32B32_SFLOAT, false,
>+                     CopyTo32FVertexData<GLushort, 3, 3, false>, true}};
>+                initBufferFallback(renderer, kInfo, ArraySize(kInfo));
>+            }
>+            break;
>+
>+        case angle::FormatID::R16G16_FLOAT:
>+            internalFormat               = GL_RG16F;
>+            imageFormatID                = angle::FormatID::R16G16_FLOAT;
>+            vkImageFormat                = VK_FORMAT_R16G16_SFLOAT;
>+            imageInitializerFunction     = nullptr;
>+            bufferFormatID               = angle::FormatID::R16G16_FLOAT;
>+            vkBufferFormat               = VK_FORMAT_R16G16_SFLOAT;
>+            vkBufferFormatIsPacked       = false;
>+            vertexLoadFunction           = CopyNativeVertexData<GLfloat, 2, 2, 0>;
>+            vertexLoadRequiresConversion = false;
>+            break;
>+
>+        case angle::FormatID::R16G16_SINT:
>+            internalFormat               = GL_RG16I;
>+            imageFormatID                = angle::FormatID::R16G16_SINT;
>+            vkImageFormat                = VK_FORMAT_R16G16_SINT;
>+            imageInitializerFunction     = nullptr;
>+            bufferFormatID               = angle::FormatID::R16G16_SINT;
>+            vkBufferFormat               = VK_FORMAT_R16G16_SINT;
>+            vkBufferFormatIsPacked       = false;
>+            vertexLoadFunction           = CopyNativeVertexData<GLshort, 2, 2, 0>;
>+            vertexLoadRequiresConversion = false;
>+            break;
>+
>+        case angle::FormatID::R16G16_SNORM:
>+            internalFormat           = GL_RG16_SNORM_EXT;
>+            imageFormatID            = angle::FormatID::R16G16_SNORM;
>+            vkImageFormat            = VK_FORMAT_R16G16_SNORM;
>+            imageInitializerFunction = nullptr;
>+            {
>+                static constexpr BufferFormatInitInfo kInfo[] = {
>+                    {angle::FormatID::R16G16_SNORM, VK_FORMAT_R16G16_SNORM, false,
>+                     CopyNativeVertexData<GLshort, 2, 2, 0>, false},
>+                    {angle::FormatID::R32G32_FLOAT, VK_FORMAT_R32G32_SFLOAT, false,
>+                     CopyTo32FVertexData<GLshort, 2, 2, true>, true}};
>+                initBufferFallback(renderer, kInfo, ArraySize(kInfo));
>+            }
>+            break;
>+
>+        case angle::FormatID::R16G16_SSCALED:
>+            internalFormat           = GL_RG16_SSCALED_ANGLEX;
>+            imageFormatID            = angle::FormatID::R16G16_SSCALED;
>+            vkImageFormat            = VK_FORMAT_R16G16_SSCALED;
>+            imageInitializerFunction = nullptr;
>+            {
>+                static constexpr BufferFormatInitInfo kInfo[] = {
>+                    {angle::FormatID::R16G16_SSCALED, VK_FORMAT_R16G16_SSCALED, false,
>+                     CopyNativeVertexData<GLshort, 2, 2, 0>, false},
>+                    {angle::FormatID::R32G32_FLOAT, VK_FORMAT_R32G32_SFLOAT, false,
>+                     CopyTo32FVertexData<GLshort, 2, 2, false>, true}};
>+                initBufferFallback(renderer, kInfo, ArraySize(kInfo));
>+            }
>+            break;
>+
>+        case angle::FormatID::R16G16_UINT:
>+            internalFormat               = GL_RG16UI;
>+            imageFormatID                = angle::FormatID::R16G16_UINT;
>+            vkImageFormat                = VK_FORMAT_R16G16_UINT;
>+            imageInitializerFunction     = nullptr;
>+            bufferFormatID               = angle::FormatID::R16G16_UINT;
>+            vkBufferFormat               = VK_FORMAT_R16G16_UINT;
>+            vkBufferFormatIsPacked       = false;
>+            vertexLoadFunction           = CopyNativeVertexData<GLushort, 2, 2, 0>;
>+            vertexLoadRequiresConversion = false;
>+            break;
>+
>+        case angle::FormatID::R16G16_UNORM:
>+            internalFormat           = GL_RG16_EXT;
>+            imageFormatID            = angle::FormatID::R16G16_UNORM;
>+            vkImageFormat            = VK_FORMAT_R16G16_UNORM;
>+            imageInitializerFunction = nullptr;
>+            {
>+                static constexpr BufferFormatInitInfo kInfo[] = {
>+                    {angle::FormatID::R16G16_UNORM, VK_FORMAT_R16G16_UNORM, false,
>+                     CopyNativeVertexData<GLushort, 2, 2, 0>, false},
>+                    {angle::FormatID::R32G32_FLOAT, VK_FORMAT_R32G32_SFLOAT, false,
>+                     CopyTo32FVertexData<GLushort, 2, 2, true>, true}};
>+                initBufferFallback(renderer, kInfo, ArraySize(kInfo));
>+            }
>+            break;
>+
>+        case angle::FormatID::R16G16_USCALED:
>+            internalFormat           = GL_RG16_USCALED_ANGLEX;
>+            imageFormatID            = angle::FormatID::R16G16_USCALED;
>+            vkImageFormat            = VK_FORMAT_R16G16_USCALED;
>+            imageInitializerFunction = nullptr;
>+            {
>+                static constexpr BufferFormatInitInfo kInfo[] = {
>+                    {angle::FormatID::R16G16_USCALED, VK_FORMAT_R16G16_USCALED, false,
>+                     CopyNativeVertexData<GLushort, 2, 2, 0>, false},
>+                    {angle::FormatID::R32G32_FLOAT, VK_FORMAT_R32G32_SFLOAT, false,
>+                     CopyTo32FVertexData<GLushort, 2, 2, false>, true}};
>+                initBufferFallback(renderer, kInfo, ArraySize(kInfo));
>+            }
>+            break;
>+
>+        case angle::FormatID::R16_FLOAT:
>+            internalFormat               = GL_R16F;
>+            imageFormatID                = angle::FormatID::R16_FLOAT;
>+            vkImageFormat                = VK_FORMAT_R16_SFLOAT;
>+            imageInitializerFunction     = nullptr;
>+            bufferFormatID               = angle::FormatID::R16_FLOAT;
>+            vkBufferFormat               = VK_FORMAT_R16_SFLOAT;
>+            vkBufferFormatIsPacked       = false;
>+            vertexLoadFunction           = CopyNativeVertexData<GLfloat, 1, 1, 0>;
>+            vertexLoadRequiresConversion = false;
>+            break;
>+
>+        case angle::FormatID::R16_SINT:
>+            internalFormat               = GL_R16I;
>+            imageFormatID                = angle::FormatID::R16_SINT;
>+            vkImageFormat                = VK_FORMAT_R16_SINT;
>+            imageInitializerFunction     = nullptr;
>+            bufferFormatID               = angle::FormatID::R16_SINT;
>+            vkBufferFormat               = VK_FORMAT_R16_SINT;
>+            vkBufferFormatIsPacked       = false;
>+            vertexLoadFunction           = CopyNativeVertexData<GLshort, 1, 1, 0>;
>+            vertexLoadRequiresConversion = false;
>+            break;
>+
>+        case angle::FormatID::R16_SNORM:
>+            internalFormat           = GL_R16_SNORM_EXT;
>+            imageFormatID            = angle::FormatID::R16_SNORM;
>+            vkImageFormat            = VK_FORMAT_R16_SNORM;
>+            imageInitializerFunction = nullptr;
>+            {
>+                static constexpr BufferFormatInitInfo kInfo[] = {
>+                    {angle::FormatID::R16_SNORM, VK_FORMAT_R16_SNORM, false,
>+                     CopyNativeVertexData<GLshort, 1, 1, 0>, false},
>+                    {angle::FormatID::R32_FLOAT, VK_FORMAT_R32_SFLOAT, false,
>+                     CopyTo32FVertexData<GLshort, 1, 1, true>, true}};
>+                initBufferFallback(renderer, kInfo, ArraySize(kInfo));
>+            }
>+            break;
>+
>+        case angle::FormatID::R16_SSCALED:
>+            internalFormat           = GL_R16_SSCALED_ANGLEX;
>+            imageFormatID            = angle::FormatID::R16_SSCALED;
>+            vkImageFormat            = VK_FORMAT_R16_SSCALED;
>+            imageInitializerFunction = nullptr;
>+            {
>+                static constexpr BufferFormatInitInfo kInfo[] = {
>+                    {angle::FormatID::R16_SSCALED, VK_FORMAT_R16_SSCALED, false,
>+                     CopyNativeVertexData<GLshort, 1, 1, 0>, false},
>+                    {angle::FormatID::R32_FLOAT, VK_FORMAT_R32_SFLOAT, false,
>+                     CopyTo32FVertexData<GLshort, 1, 1, false>, true}};
>+                initBufferFallback(renderer, kInfo, ArraySize(kInfo));
>+            }
>+            break;
>+
>+        case angle::FormatID::R16_UINT:
>+            internalFormat               = GL_R16UI;
>+            imageFormatID                = angle::FormatID::R16_UINT;
>+            vkImageFormat                = VK_FORMAT_R16_UINT;
>+            imageInitializerFunction     = nullptr;
>+            bufferFormatID               = angle::FormatID::R16_UINT;
>+            vkBufferFormat               = VK_FORMAT_R16_UINT;
>+            vkBufferFormatIsPacked       = false;
>+            vertexLoadFunction           = CopyNativeVertexData<GLushort, 1, 1, 0>;
>+            vertexLoadRequiresConversion = false;
>+            break;
>+
>+        case angle::FormatID::R16_UNORM:
>+            internalFormat           = GL_R16_EXT;
>+            imageFormatID            = angle::FormatID::R16_UNORM;
>+            vkImageFormat            = VK_FORMAT_R16_UNORM;
>+            imageInitializerFunction = nullptr;
>+            {
>+                static constexpr BufferFormatInitInfo kInfo[] = {
>+                    {angle::FormatID::R16_UNORM, VK_FORMAT_R16_UNORM, false,
>+                     CopyNativeVertexData<GLushort, 1, 1, 0>, false},
>+                    {angle::FormatID::R32_FLOAT, VK_FORMAT_R32_SFLOAT, false,
>+                     CopyTo32FVertexData<GLushort, 1, 1, true>, true}};
>+                initBufferFallback(renderer, kInfo, ArraySize(kInfo));
>+            }
>+            break;
>+
>+        case angle::FormatID::R16_USCALED:
>+            internalFormat           = GL_R16_USCALED_ANGLEX;
>+            imageFormatID            = angle::FormatID::R16_USCALED;
>+            vkImageFormat            = VK_FORMAT_R16_USCALED;
>+            imageInitializerFunction = nullptr;
>+            {
>+                static constexpr BufferFormatInitInfo kInfo[] = {
>+                    {angle::FormatID::R16_USCALED, VK_FORMAT_R16_USCALED, false,
>+                     CopyNativeVertexData<GLushort, 1, 1, 0>, false},
>+                    {angle::FormatID::R32_FLOAT, VK_FORMAT_R32_SFLOAT, false,
>+                     CopyTo32FVertexData<GLushort, 1, 1, false>, true}};
>+                initBufferFallback(renderer, kInfo, ArraySize(kInfo));
>+            }
>+            break;
>+
>+        case angle::FormatID::R32G32B32A32_FIXED:
>+            internalFormat = GL_RGBA32_FIXED_ANGLEX;
>+
>+            bufferFormatID               = angle::FormatID::R32G32B32A32_FLOAT;
>+            vkBufferFormat               = VK_FORMAT_R32G32B32A32_SFLOAT;
>+            vkBufferFormatIsPacked       = false;
>+            vertexLoadFunction           = Copy32FixedTo32FVertexData<4, 4>;
>+            vertexLoadRequiresConversion = true;
>+            break;
>+
>+        case angle::FormatID::R32G32B32A32_FLOAT:
>+            internalFormat               = GL_RGBA32F;
>+            imageFormatID                = angle::FormatID::R32G32B32A32_FLOAT;
>+            vkImageFormat                = VK_FORMAT_R32G32B32A32_SFLOAT;
>+            imageInitializerFunction     = nullptr;
>+            bufferFormatID               = angle::FormatID::R32G32B32A32_FLOAT;
>+            vkBufferFormat               = VK_FORMAT_R32G32B32A32_SFLOAT;
>+            vkBufferFormatIsPacked       = false;
>+            vertexLoadFunction           = CopyNativeVertexData<GLfloat, 4, 4, 0>;
>+            vertexLoadRequiresConversion = false;
>+            break;
>+
>+        case angle::FormatID::R32G32B32A32_SINT:
>+            internalFormat               = GL_RGBA32I;
>+            imageFormatID                = angle::FormatID::R32G32B32A32_SINT;
>+            vkImageFormat                = VK_FORMAT_R32G32B32A32_SINT;
>+            imageInitializerFunction     = nullptr;
>+            bufferFormatID               = angle::FormatID::R32G32B32A32_SINT;
>+            vkBufferFormat               = VK_FORMAT_R32G32B32A32_SINT;
>+            vkBufferFormatIsPacked       = false;
>+            vertexLoadFunction           = CopyNativeVertexData<GLint, 4, 4, 0>;
>+            vertexLoadRequiresConversion = false;
>+            break;
>+
>+        case angle::FormatID::R32G32B32A32_SNORM:
>             // This format is not implemented in Vulkan.
>             break;
> 
>-        case angle::Format::ID::BC3_RGBA_UNORM_SRGB_BLOCK:
>+        case angle::FormatID::R32G32B32A32_SSCALED:
>             // This format is not implemented in Vulkan.
>             break;
> 
>-        case angle::Format::ID::D16_UNORM:
>-        {
>-            internalFormat          = GL_DEPTH_COMPONENT16;
>-            textureFormatID         = angle::Format::ID::D16_UNORM;
>-            vkTextureFormat         = VK_FORMAT_D16_UNORM;
>-            bufferFormatID          = angle::Format::ID::D16_UNORM;
>-            vkBufferFormat          = VK_FORMAT_D16_UNORM;
>-            dataInitializerFunction = nullptr;
>+        case angle::FormatID::R32G32B32A32_UINT:
>+            internalFormat               = GL_RGBA32UI;
>+            imageFormatID                = angle::FormatID::R32G32B32A32_UINT;
>+            vkImageFormat                = VK_FORMAT_R32G32B32A32_UINT;
>+            imageInitializerFunction     = nullptr;
>+            bufferFormatID               = angle::FormatID::R32G32B32A32_UINT;
>+            vkBufferFormat               = VK_FORMAT_R32G32B32A32_UINT;
>+            vkBufferFormatIsPacked       = false;
>+            vertexLoadFunction           = CopyNativeVertexData<GLuint, 4, 4, 0>;
>+            vertexLoadRequiresConversion = false;
>             break;
>-        }
> 
>-        case angle::Format::ID::D24_UNORM:
>+        case angle::FormatID::R32G32B32A32_UNORM:
>             // This format is not implemented in Vulkan.
>             break;
> 
>-        case angle::Format::ID::D24_UNORM_S8_UINT:
>-        {
>-            internalFormat          = GL_DEPTH24_STENCIL8;
>-            textureFormatID         = angle::Format::ID::D24_UNORM_S8_UINT;
>-            vkTextureFormat         = VK_FORMAT_D24_UNORM_S8_UINT;
>-            bufferFormatID          = angle::Format::ID::D24_UNORM_S8_UINT;
>-            vkBufferFormat          = VK_FORMAT_D24_UNORM_S8_UINT;
>-            dataInitializerFunction = nullptr;
>+        case angle::FormatID::R32G32B32A32_USCALED:
>+            // This format is not implemented in Vulkan.
>             break;
>-        }
> 
>-        case angle::Format::ID::D32_FLOAT:
>-        {
>-            internalFormat          = GL_DEPTH_COMPONENT32F;
>-            textureFormatID         = angle::Format::ID::D32_FLOAT;
>-            vkTextureFormat         = VK_FORMAT_D32_SFLOAT;
>-            bufferFormatID          = angle::Format::ID::D32_FLOAT;
>-            vkBufferFormat          = VK_FORMAT_D32_SFLOAT;
>-            dataInitializerFunction = nullptr;
>+        case angle::FormatID::R32G32B32_FIXED:
>+            internalFormat = GL_RGB32_FIXED_ANGLEX;
>+
>+            bufferFormatID               = angle::FormatID::R32G32B32_FLOAT;
>+            vkBufferFormat               = VK_FORMAT_R32G32B32_SFLOAT;
>+            vkBufferFormatIsPacked       = false;
>+            vertexLoadFunction           = Copy32FixedTo32FVertexData<3, 3>;
>+            vertexLoadRequiresConversion = true;
>             break;
>-        }
> 
>-        case angle::Format::ID::D32_FLOAT_S8X24_UINT:
>-            // This format is not implemented in Vulkan.
>+        case angle::FormatID::R32G32B32_FLOAT:
>+            internalFormat               = GL_RGB32F;
>+            imageFormatID                = angle::FormatID::R32G32B32_FLOAT;
>+            vkImageFormat                = VK_FORMAT_R32G32B32_SFLOAT;
>+            imageInitializerFunction     = nullptr;
>+            bufferFormatID               = angle::FormatID::R32G32B32_FLOAT;
>+            vkBufferFormat               = VK_FORMAT_R32G32B32_SFLOAT;
>+            vkBufferFormatIsPacked       = false;
>+            vertexLoadFunction           = CopyNativeVertexData<GLfloat, 3, 3, 0>;
>+            vertexLoadRequiresConversion = false;
>             break;
> 
>-        case angle::Format::ID::D32_UNORM:
>-            // This format is not implemented in Vulkan.
>+        case angle::FormatID::R32G32B32_SINT:
>+            internalFormat               = GL_RGB32I;
>+            imageFormatID                = angle::FormatID::R32G32B32_SINT;
>+            vkImageFormat                = VK_FORMAT_R32G32B32_SINT;
>+            imageInitializerFunction     = nullptr;
>+            bufferFormatID               = angle::FormatID::R32G32B32_SINT;
>+            vkBufferFormat               = VK_FORMAT_R32G32B32_SINT;
>+            vkBufferFormatIsPacked       = false;
>+            vertexLoadFunction           = CopyNativeVertexData<GLint, 3, 3, 0>;
>+            vertexLoadRequiresConversion = false;
>             break;
> 
>-        case angle::Format::ID::EAC_R11G11_SNORM_BLOCK:
>-        {
>-            internalFormat          = GL_COMPRESSED_SIGNED_RG11_EAC;
>-            textureFormatID         = angle::Format::ID::EAC_R11G11_SNORM_BLOCK;
>-            vkTextureFormat         = VK_FORMAT_EAC_R11G11_SNORM_BLOCK;
>-            bufferFormatID          = angle::Format::ID::EAC_R11G11_SNORM_BLOCK;
>-            vkBufferFormat          = VK_FORMAT_EAC_R11G11_SNORM_BLOCK;
>-            dataInitializerFunction = nullptr;
>-            break;
>-        }
>-
>-        case angle::Format::ID::EAC_R11G11_UNORM_BLOCK:
>-        {
>-            internalFormat          = GL_COMPRESSED_RG11_EAC;
>-            textureFormatID         = angle::Format::ID::EAC_R11G11_UNORM_BLOCK;
>-            vkTextureFormat         = VK_FORMAT_EAC_R11G11_UNORM_BLOCK;
>-            bufferFormatID          = angle::Format::ID::EAC_R11G11_UNORM_BLOCK;
>-            vkBufferFormat          = VK_FORMAT_EAC_R11G11_UNORM_BLOCK;
>-            dataInitializerFunction = nullptr;
>-            break;
>-        }
>-
>-        case angle::Format::ID::EAC_R11_SNORM_BLOCK:
>-        {
>-            internalFormat          = GL_COMPRESSED_SIGNED_R11_EAC;
>-            textureFormatID         = angle::Format::ID::EAC_R11_SNORM_BLOCK;
>-            vkTextureFormat         = VK_FORMAT_EAC_R11_SNORM_BLOCK;
>-            bufferFormatID          = angle::Format::ID::EAC_R11_SNORM_BLOCK;
>-            vkBufferFormat          = VK_FORMAT_EAC_R11_SNORM_BLOCK;
>-            dataInitializerFunction = nullptr;
>-            break;
>-        }
>-
>-        case angle::Format::ID::EAC_R11_UNORM_BLOCK:
>-        {
>-            internalFormat          = GL_COMPRESSED_R11_EAC;
>-            textureFormatID         = angle::Format::ID::EAC_R11_UNORM_BLOCK;
>-            vkTextureFormat         = VK_FORMAT_EAC_R11_UNORM_BLOCK;
>-            bufferFormatID          = angle::Format::ID::EAC_R11_UNORM_BLOCK;
>-            vkBufferFormat          = VK_FORMAT_EAC_R11_UNORM_BLOCK;
>-            dataInitializerFunction = nullptr;
>-            break;
>-        }
>-
>-        case angle::Format::ID::ETC1_LOSSY_DECODE_R8G8B8_UNORM_BLOCK:
>+        case angle::FormatID::R32G32B32_SNORM:
>             // This format is not implemented in Vulkan.
>             break;
> 
>-        case angle::Format::ID::ETC1_R8G8B8_UNORM_BLOCK:
>+        case angle::FormatID::R32G32B32_SSCALED:
>             // This format is not implemented in Vulkan.
>             break;
> 
>-        case angle::Format::ID::ETC2_R8G8B8A1_SRGB_BLOCK:
>-        {
>-            internalFormat          = GL_COMPRESSED_SRGB8_PUNCHTHROUGH_ALPHA1_ETC2;
>-            textureFormatID         = angle::Format::ID::ETC2_R8G8B8A1_SRGB_BLOCK;
>-            vkTextureFormat         = VK_FORMAT_ETC2_R8G8B8A1_SRGB_BLOCK;
>-            bufferFormatID          = angle::Format::ID::ETC2_R8G8B8A1_SRGB_BLOCK;
>-            vkBufferFormat          = VK_FORMAT_ETC2_R8G8B8A1_SRGB_BLOCK;
>-            dataInitializerFunction = nullptr;
>-            break;
>-        }
>-
>-        case angle::Format::ID::ETC2_R8G8B8A1_UNORM_BLOCK:
>-        {
>-            internalFormat          = GL_COMPRESSED_RGB8_PUNCHTHROUGH_ALPHA1_ETC2;
>-            textureFormatID         = angle::Format::ID::ETC2_R8G8B8A1_UNORM_BLOCK;
>-            vkTextureFormat         = VK_FORMAT_ETC2_R8G8B8A1_UNORM_BLOCK;
>-            bufferFormatID          = angle::Format::ID::ETC2_R8G8B8A1_UNORM_BLOCK;
>-            vkBufferFormat          = VK_FORMAT_ETC2_R8G8B8A1_UNORM_BLOCK;
>-            dataInitializerFunction = Initialize4ComponentData<GLubyte, 0x00, 0x00, 0x00, 0xFF>;
>-            break;
>-        }
>-
>-        case angle::Format::ID::ETC2_R8G8B8A8_SRGB_BLOCK:
>-        {
>-            internalFormat          = GL_COMPRESSED_SRGB8_ALPHA8_ETC2_EAC;
>-            textureFormatID         = angle::Format::ID::ETC2_R8G8B8A8_SRGB_BLOCK;
>-            vkTextureFormat         = VK_FORMAT_ETC2_R8G8B8A8_SRGB_BLOCK;
>-            bufferFormatID          = angle::Format::ID::ETC2_R8G8B8A8_SRGB_BLOCK;
>-            vkBufferFormat          = VK_FORMAT_ETC2_R8G8B8A8_SRGB_BLOCK;
>-            dataInitializerFunction = nullptr;
>-            break;
>-        }
>-
>-        case angle::Format::ID::ETC2_R8G8B8A8_UNORM_BLOCK:
>-        {
>-            internalFormat          = GL_COMPRESSED_RGBA8_ETC2_EAC;
>-            textureFormatID         = angle::Format::ID::ETC2_R8G8B8A8_UNORM_BLOCK;
>-            vkTextureFormat         = VK_FORMAT_ETC2_R8G8B8A8_UNORM_BLOCK;
>-            bufferFormatID          = angle::Format::ID::ETC2_R8G8B8A8_UNORM_BLOCK;
>-            vkBufferFormat          = VK_FORMAT_ETC2_R8G8B8A8_UNORM_BLOCK;
>-            dataInitializerFunction = nullptr;
>-            break;
>-        }
>-
>-        case angle::Format::ID::ETC2_R8G8B8_SRGB_BLOCK:
>-        {
>-            internalFormat          = GL_COMPRESSED_SRGB8_ETC2;
>-            textureFormatID         = angle::Format::ID::ETC2_R8G8B8_SRGB_BLOCK;
>-            vkTextureFormat         = VK_FORMAT_ETC2_R8G8B8_SRGB_BLOCK;
>-            bufferFormatID          = angle::Format::ID::ETC2_R8G8B8_SRGB_BLOCK;
>-            vkBufferFormat          = VK_FORMAT_ETC2_R8G8B8_SRGB_BLOCK;
>-            dataInitializerFunction = nullptr;
>-            break;
>-        }
>-
>-        case angle::Format::ID::ETC2_R8G8B8_UNORM_BLOCK:
>-        {
>-            internalFormat          = GL_COMPRESSED_RGB8_ETC2;
>-            textureFormatID         = angle::Format::ID::ETC2_R8G8B8_UNORM_BLOCK;
>-            vkTextureFormat         = VK_FORMAT_ETC2_R8G8B8_UNORM_BLOCK;
>-            bufferFormatID          = angle::Format::ID::ETC2_R8G8B8_UNORM_BLOCK;
>-            vkBufferFormat          = VK_FORMAT_ETC2_R8G8B8_UNORM_BLOCK;
>-            dataInitializerFunction = nullptr;
>-            break;
>-        }
>-
>-        case angle::Format::ID::L16A16_FLOAT:
>+        case angle::FormatID::R32G32B32_UINT:
>+            internalFormat               = GL_RGB32UI;
>+            imageFormatID                = angle::FormatID::R32G32B32_UINT;
>+            vkImageFormat                = VK_FORMAT_R32G32B32_UINT;
>+            imageInitializerFunction     = nullptr;
>+            bufferFormatID               = angle::FormatID::R32G32B32_UINT;
>+            vkBufferFormat               = VK_FORMAT_R32G32B32_UINT;
>+            vkBufferFormatIsPacked       = false;
>+            vertexLoadFunction           = CopyNativeVertexData<GLuint, 3, 3, 0>;
>+            vertexLoadRequiresConversion = false;
>+            break;
>+
>+        case angle::FormatID::R32G32B32_UNORM:
>             // This format is not implemented in Vulkan.
>             break;
> 
>-        case angle::Format::ID::L16_FLOAT:
>+        case angle::FormatID::R32G32B32_USCALED:
>             // This format is not implemented in Vulkan.
>             break;
> 
>-        case angle::Format::ID::L32A32_FLOAT:
>+        case angle::FormatID::R32G32_FIXED:
>+            internalFormat = GL_RG32_FIXED_ANGLEX;
>+
>+            bufferFormatID               = angle::FormatID::R32G32_FLOAT;
>+            vkBufferFormat               = VK_FORMAT_R32G32_SFLOAT;
>+            vkBufferFormatIsPacked       = false;
>+            vertexLoadFunction           = Copy32FixedTo32FVertexData<2, 2>;
>+            vertexLoadRequiresConversion = true;
>+            break;
>+
>+        case angle::FormatID::R32G32_FLOAT:
>+            internalFormat               = GL_RG32F;
>+            imageFormatID                = angle::FormatID::R32G32_FLOAT;
>+            vkImageFormat                = VK_FORMAT_R32G32_SFLOAT;
>+            imageInitializerFunction     = nullptr;
>+            bufferFormatID               = angle::FormatID::R32G32_FLOAT;
>+            vkBufferFormat               = VK_FORMAT_R32G32_SFLOAT;
>+            vkBufferFormatIsPacked       = false;
>+            vertexLoadFunction           = CopyNativeVertexData<GLfloat, 2, 2, 0>;
>+            vertexLoadRequiresConversion = false;
>+            break;
>+
>+        case angle::FormatID::R32G32_SINT:
>+            internalFormat               = GL_RG32I;
>+            imageFormatID                = angle::FormatID::R32G32_SINT;
>+            vkImageFormat                = VK_FORMAT_R32G32_SINT;
>+            imageInitializerFunction     = nullptr;
>+            bufferFormatID               = angle::FormatID::R32G32_SINT;
>+            vkBufferFormat               = VK_FORMAT_R32G32_SINT;
>+            vkBufferFormatIsPacked       = false;
>+            vertexLoadFunction           = CopyNativeVertexData<GLint, 2, 2, 0>;
>+            vertexLoadRequiresConversion = false;
>+            break;
>+
>+        case angle::FormatID::R32G32_SNORM:
>             // This format is not implemented in Vulkan.
>             break;
> 
>-        case angle::Format::ID::L32_FLOAT:
>+        case angle::FormatID::R32G32_SSCALED:
>             // This format is not implemented in Vulkan.
>             break;
> 
>-        case angle::Format::ID::L8A8_UNORM:
>+        case angle::FormatID::R32G32_UINT:
>+            internalFormat               = GL_RG32UI;
>+            imageFormatID                = angle::FormatID::R32G32_UINT;
>+            vkImageFormat                = VK_FORMAT_R32G32_UINT;
>+            imageInitializerFunction     = nullptr;
>+            bufferFormatID               = angle::FormatID::R32G32_UINT;
>+            vkBufferFormat               = VK_FORMAT_R32G32_UINT;
>+            vkBufferFormatIsPacked       = false;
>+            vertexLoadFunction           = CopyNativeVertexData<GLuint, 2, 2, 0>;
>+            vertexLoadRequiresConversion = false;
>+            break;
>+
>+        case angle::FormatID::R32G32_UNORM:
>             // This format is not implemented in Vulkan.
>             break;
> 
>-        case angle::Format::ID::L8_UNORM:
>+        case angle::FormatID::R32G32_USCALED:
>             // This format is not implemented in Vulkan.
>             break;
> 
>-        case angle::Format::ID::NONE:
>+        case angle::FormatID::R32_FIXED:
>+            internalFormat = GL_R32_FIXED_ANGLEX;
>+
>+            bufferFormatID               = angle::FormatID::R32_FLOAT;
>+            vkBufferFormat               = VK_FORMAT_R32_SFLOAT;
>+            vkBufferFormatIsPacked       = false;
>+            vertexLoadFunction           = Copy32FixedTo32FVertexData<1, 1>;
>+            vertexLoadRequiresConversion = true;
>+            break;
>+
>+        case angle::FormatID::R32_FLOAT:
>+            internalFormat               = GL_R32F;
>+            imageFormatID                = angle::FormatID::R32_FLOAT;
>+            vkImageFormat                = VK_FORMAT_R32_SFLOAT;
>+            imageInitializerFunction     = nullptr;
>+            bufferFormatID               = angle::FormatID::R32_FLOAT;
>+            vkBufferFormat               = VK_FORMAT_R32_SFLOAT;
>+            vkBufferFormatIsPacked       = false;
>+            vertexLoadFunction           = CopyNativeVertexData<GLfloat, 1, 1, 0>;
>+            vertexLoadRequiresConversion = false;
>+            break;
>+
>+        case angle::FormatID::R32_SINT:
>+            internalFormat               = GL_R32I;
>+            imageFormatID                = angle::FormatID::R32_SINT;
>+            vkImageFormat                = VK_FORMAT_R32_SINT;
>+            imageInitializerFunction     = nullptr;
>+            bufferFormatID               = angle::FormatID::R32_SINT;
>+            vkBufferFormat               = VK_FORMAT_R32_SINT;
>+            vkBufferFormatIsPacked       = false;
>+            vertexLoadFunction           = CopyNativeVertexData<GLint, 1, 1, 0>;
>+            vertexLoadRequiresConversion = false;
>+            break;
>+
>+        case angle::FormatID::R32_SNORM:
>             // This format is not implemented in Vulkan.
>             break;
> 
>-        case angle::Format::ID::R10G10B10A2_UINT:
>+        case angle::FormatID::R32_SSCALED:
>             // This format is not implemented in Vulkan.
>             break;
> 
>-        case angle::Format::ID::R10G10B10A2_UNORM:
>+        case angle::FormatID::R32_UINT:
>+            internalFormat               = GL_R32UI;
>+            imageFormatID                = angle::FormatID::R32_UINT;
>+            vkImageFormat                = VK_FORMAT_R32_UINT;
>+            imageInitializerFunction     = nullptr;
>+            bufferFormatID               = angle::FormatID::R32_UINT;
>+            vkBufferFormat               = VK_FORMAT_R32_UINT;
>+            vkBufferFormatIsPacked       = false;
>+            vertexLoadFunction           = CopyNativeVertexData<GLuint, 1, 1, 0>;
>+            vertexLoadRequiresConversion = false;
>+            break;
>+
>+        case angle::FormatID::R32_UNORM:
>             // This format is not implemented in Vulkan.
>             break;
> 
>-        case angle::Format::ID::R11G11B10_FLOAT:
>+        case angle::FormatID::R32_USCALED:
>             // This format is not implemented in Vulkan.
>             break;
> 
>-        case angle::Format::ID::R16G16B16A16_FLOAT:
>-        {
>-            internalFormat          = GL_RGBA16F;
>-            textureFormatID         = angle::Format::ID::R16G16B16A16_FLOAT;
>-            vkTextureFormat         = VK_FORMAT_R16G16B16A16_SFLOAT;
>-            bufferFormatID          = angle::Format::ID::R16G16B16A16_FLOAT;
>-            vkBufferFormat          = VK_FORMAT_R16G16B16A16_SFLOAT;
>-            dataInitializerFunction = nullptr;
>-            break;
>-        }
>-
>-        case angle::Format::ID::R16G16B16A16_SINT:
>-        {
>-            internalFormat          = GL_RGBA16I;
>-            textureFormatID         = angle::Format::ID::R16G16B16A16_SINT;
>-            vkTextureFormat         = VK_FORMAT_R16G16B16A16_SINT;
>-            bufferFormatID          = angle::Format::ID::R16G16B16A16_SINT;
>-            vkBufferFormat          = VK_FORMAT_R16G16B16A16_SINT;
>-            dataInitializerFunction = nullptr;
>-            break;
>-        }
>-
>-        case angle::Format::ID::R16G16B16A16_SNORM:
>-        {
>-            internalFormat          = GL_RGBA16_SNORM_EXT;
>-            textureFormatID         = angle::Format::ID::R16G16B16A16_SNORM;
>-            vkTextureFormat         = VK_FORMAT_R16G16B16A16_SNORM;
>-            bufferFormatID          = angle::Format::ID::R16G16B16A16_SNORM;
>-            vkBufferFormat          = VK_FORMAT_R16G16B16A16_SNORM;
>-            dataInitializerFunction = nullptr;
>-            break;
>-        }
>-
>-        case angle::Format::ID::R16G16B16A16_UINT:
>-        {
>-            internalFormat          = GL_RGBA16UI;
>-            textureFormatID         = angle::Format::ID::R16G16B16A16_UINT;
>-            vkTextureFormat         = VK_FORMAT_R16G16B16A16_UINT;
>-            bufferFormatID          = angle::Format::ID::R16G16B16A16_UINT;
>-            vkBufferFormat          = VK_FORMAT_R16G16B16A16_UINT;
>-            dataInitializerFunction = nullptr;
>-            break;
>-        }
>-
>-        case angle::Format::ID::R16G16B16A16_UNORM:
>-        {
>-            internalFormat          = GL_RGBA16_EXT;
>-            textureFormatID         = angle::Format::ID::R16G16B16A16_UNORM;
>-            vkTextureFormat         = VK_FORMAT_R16G16B16A16_UNORM;
>-            bufferFormatID          = angle::Format::ID::R16G16B16A16_UNORM;
>-            vkBufferFormat          = VK_FORMAT_R16G16B16A16_UNORM;
>-            dataInitializerFunction = nullptr;
>-            break;
>-        }
>-
>-        case angle::Format::ID::R16G16B16_FLOAT:
>-        {
>-            internalFormat          = GL_RGB16F;
>-            textureFormatID         = angle::Format::ID::R16G16B16_FLOAT;
>-            vkTextureFormat         = VK_FORMAT_R16G16B16_SFLOAT;
>-            bufferFormatID          = angle::Format::ID::R16G16B16_FLOAT;
>-            vkBufferFormat          = VK_FORMAT_R16G16B16_SFLOAT;
>-            dataInitializerFunction = nullptr;
>-            break;
>-        }
>-
>-        case angle::Format::ID::R16G16B16_SINT:
>-        {
>-            internalFormat          = GL_RGB16I;
>-            textureFormatID         = angle::Format::ID::R16G16B16_SINT;
>-            vkTextureFormat         = VK_FORMAT_R16G16B16_SINT;
>-            bufferFormatID          = angle::Format::ID::R16G16B16_SINT;
>-            vkBufferFormat          = VK_FORMAT_R16G16B16_SINT;
>-            dataInitializerFunction = nullptr;
>-            break;
>-        }
>-
>-        case angle::Format::ID::R16G16B16_SNORM:
>-        {
>-            internalFormat          = GL_RGB16_SNORM_EXT;
>-            textureFormatID         = angle::Format::ID::R16G16B16_SNORM;
>-            vkTextureFormat         = VK_FORMAT_R16G16B16_SNORM;
>-            bufferFormatID          = angle::Format::ID::R16G16B16_SNORM;
>-            vkBufferFormat          = VK_FORMAT_R16G16B16_SNORM;
>-            dataInitializerFunction = nullptr;
>-            break;
>-        }
>-
>-        case angle::Format::ID::R16G16B16_UINT:
>-        {
>-            internalFormat          = GL_RGB16UI;
>-            textureFormatID         = angle::Format::ID::R16G16B16_UINT;
>-            vkTextureFormat         = VK_FORMAT_R16G16B16_UINT;
>-            bufferFormatID          = angle::Format::ID::R16G16B16_UINT;
>-            vkBufferFormat          = VK_FORMAT_R16G16B16_UINT;
>-            dataInitializerFunction = nullptr;
>-            break;
>-        }
>-
>-        case angle::Format::ID::R16G16B16_UNORM:
>-        {
>-            internalFormat          = GL_RGB16_EXT;
>-            textureFormatID         = angle::Format::ID::R16G16B16_UNORM;
>-            vkTextureFormat         = VK_FORMAT_R16G16B16_UNORM;
>-            bufferFormatID          = angle::Format::ID::R16G16B16_UNORM;
>-            vkBufferFormat          = VK_FORMAT_R16G16B16_UNORM;
>-            dataInitializerFunction = nullptr;
>-            break;
>-        }
>-
>-        case angle::Format::ID::R16G16_FLOAT:
>-        {
>-            internalFormat          = GL_RG16F;
>-            textureFormatID         = angle::Format::ID::R16G16_FLOAT;
>-            vkTextureFormat         = VK_FORMAT_R16G16_SFLOAT;
>-            bufferFormatID          = angle::Format::ID::R16G16_FLOAT;
>-            vkBufferFormat          = VK_FORMAT_R16G16_SFLOAT;
>-            dataInitializerFunction = nullptr;
>-            break;
>-        }
>-
>-        case angle::Format::ID::R16G16_SINT:
>-        {
>-            internalFormat          = GL_RG16I;
>-            textureFormatID         = angle::Format::ID::R16G16_SINT;
>-            vkTextureFormat         = VK_FORMAT_R16G16_SINT;
>-            bufferFormatID          = angle::Format::ID::R16G16_SINT;
>-            vkBufferFormat          = VK_FORMAT_R16G16_SINT;
>-            dataInitializerFunction = nullptr;
>-            break;
>-        }
>-
>-        case angle::Format::ID::R16G16_SNORM:
>-        {
>-            internalFormat          = GL_RG16_SNORM_EXT;
>-            textureFormatID         = angle::Format::ID::R16G16_SNORM;
>-            vkTextureFormat         = VK_FORMAT_R16G16_SNORM;
>-            bufferFormatID          = angle::Format::ID::R16G16_SNORM;
>-            vkBufferFormat          = VK_FORMAT_R16G16_SNORM;
>-            dataInitializerFunction = nullptr;
>-            break;
>-        }
>-
>-        case angle::Format::ID::R16G16_UINT:
>-        {
>-            internalFormat          = GL_RG16UI;
>-            textureFormatID         = angle::Format::ID::R16G16_UINT;
>-            vkTextureFormat         = VK_FORMAT_R16G16_UINT;
>-            bufferFormatID          = angle::Format::ID::R16G16_UINT;
>-            vkBufferFormat          = VK_FORMAT_R16G16_UINT;
>-            dataInitializerFunction = nullptr;
>-            break;
>-        }
>-
>-        case angle::Format::ID::R16G16_UNORM:
>-        {
>-            internalFormat          = GL_RG16_EXT;
>-            textureFormatID         = angle::Format::ID::R16G16_UNORM;
>-            vkTextureFormat         = VK_FORMAT_R16G16_UNORM;
>-            bufferFormatID          = angle::Format::ID::R16G16_UNORM;
>-            vkBufferFormat          = VK_FORMAT_R16G16_UNORM;
>-            dataInitializerFunction = nullptr;
>-            break;
>-        }
>-
>-        case angle::Format::ID::R16_FLOAT:
>-        {
>-            internalFormat          = GL_R16F;
>-            textureFormatID         = angle::Format::ID::R16_FLOAT;
>-            vkTextureFormat         = VK_FORMAT_R16_SFLOAT;
>-            bufferFormatID          = angle::Format::ID::R16_FLOAT;
>-            vkBufferFormat          = VK_FORMAT_R16_SFLOAT;
>-            dataInitializerFunction = nullptr;
>-            break;
>-        }
>-
>-        case angle::Format::ID::R16_SINT:
>-        {
>-            internalFormat          = GL_R16I;
>-            textureFormatID         = angle::Format::ID::R16_SINT;
>-            vkTextureFormat         = VK_FORMAT_R16_SINT;
>-            bufferFormatID          = angle::Format::ID::R16_SINT;
>-            vkBufferFormat          = VK_FORMAT_R16_SINT;
>-            dataInitializerFunction = nullptr;
>-            break;
>-        }
>-
>-        case angle::Format::ID::R16_SNORM:
>-        {
>-            internalFormat          = GL_R16_SNORM_EXT;
>-            textureFormatID         = angle::Format::ID::R16_SNORM;
>-            vkTextureFormat         = VK_FORMAT_R16_SNORM;
>-            bufferFormatID          = angle::Format::ID::R16_SNORM;
>-            vkBufferFormat          = VK_FORMAT_R16_SNORM;
>-            dataInitializerFunction = nullptr;
>-            break;
>-        }
>-
>-        case angle::Format::ID::R16_UINT:
>-        {
>-            internalFormat          = GL_R16UI;
>-            textureFormatID         = angle::Format::ID::R16_UINT;
>-            vkTextureFormat         = VK_FORMAT_R16_UINT;
>-            bufferFormatID          = angle::Format::ID::R16_UINT;
>-            vkBufferFormat          = VK_FORMAT_R16_UINT;
>-            dataInitializerFunction = nullptr;
>-            break;
>-        }
>-
>-        case angle::Format::ID::R16_UNORM:
>-        {
>-            internalFormat          = GL_R16_EXT;
>-            textureFormatID         = angle::Format::ID::R16_UNORM;
>-            vkTextureFormat         = VK_FORMAT_R16_UNORM;
>-            bufferFormatID          = angle::Format::ID::R16_UNORM;
>-            vkBufferFormat          = VK_FORMAT_R16_UNORM;
>-            dataInitializerFunction = nullptr;
>-            break;
>-        }
>-
>-        case angle::Format::ID::R32G32B32A32_FLOAT:
>-        {
>-            internalFormat          = GL_RGBA32F;
>-            textureFormatID         = angle::Format::ID::R32G32B32A32_FLOAT;
>-            vkTextureFormat         = VK_FORMAT_R32G32B32A32_SFLOAT;
>-            bufferFormatID          = angle::Format::ID::R32G32B32A32_FLOAT;
>-            vkBufferFormat          = VK_FORMAT_R32G32B32A32_SFLOAT;
>-            dataInitializerFunction = nullptr;
>-            break;
>-        }
>-
>-        case angle::Format::ID::R32G32B32A32_SINT:
>-        {
>-            internalFormat          = GL_RGBA32I;
>-            textureFormatID         = angle::Format::ID::R32G32B32A32_SINT;
>-            vkTextureFormat         = VK_FORMAT_R32G32B32A32_SINT;
>-            bufferFormatID          = angle::Format::ID::R32G32B32A32_SINT;
>-            vkBufferFormat          = VK_FORMAT_R32G32B32A32_SINT;
>-            dataInitializerFunction = nullptr;
>-            break;
>-        }
>-
>-        case angle::Format::ID::R32G32B32A32_UINT:
>-        {
>-            internalFormat          = GL_RGBA32UI;
>-            textureFormatID         = angle::Format::ID::R32G32B32A32_UINT;
>-            vkTextureFormat         = VK_FORMAT_R32G32B32A32_UINT;
>-            bufferFormatID          = angle::Format::ID::R32G32B32A32_UINT;
>-            vkBufferFormat          = VK_FORMAT_R32G32B32A32_UINT;
>-            dataInitializerFunction = nullptr;
>-            break;
>-        }
>-
>-        case angle::Format::ID::R32G32B32_FLOAT:
>-        {
>-            internalFormat          = GL_RGB32F;
>-            textureFormatID         = angle::Format::ID::R32G32B32_FLOAT;
>-            vkTextureFormat         = VK_FORMAT_R32G32B32_SFLOAT;
>-            bufferFormatID          = angle::Format::ID::R32G32B32_FLOAT;
>-            vkBufferFormat          = VK_FORMAT_R32G32B32_SFLOAT;
>-            dataInitializerFunction = nullptr;
>-            break;
>-        }
>-
>-        case angle::Format::ID::R32G32B32_SINT:
>-        {
>-            internalFormat          = GL_RGB32I;
>-            textureFormatID         = angle::Format::ID::R32G32B32_SINT;
>-            vkTextureFormat         = VK_FORMAT_R32G32B32_SINT;
>-            bufferFormatID          = angle::Format::ID::R32G32B32_SINT;
>-            vkBufferFormat          = VK_FORMAT_R32G32B32_SINT;
>-            dataInitializerFunction = nullptr;
>-            break;
>-        }
>-
>-        case angle::Format::ID::R32G32B32_UINT:
>-        {
>-            internalFormat          = GL_RGB32UI;
>-            textureFormatID         = angle::Format::ID::R32G32B32_UINT;
>-            vkTextureFormat         = VK_FORMAT_R32G32B32_UINT;
>-            bufferFormatID          = angle::Format::ID::R32G32B32_UINT;
>-            vkBufferFormat          = VK_FORMAT_R32G32B32_UINT;
>-            dataInitializerFunction = nullptr;
>-            break;
>-        }
>-
>-        case angle::Format::ID::R32G32_FLOAT:
>-        {
>-            internalFormat          = GL_RG32F;
>-            textureFormatID         = angle::Format::ID::R32G32_FLOAT;
>-            vkTextureFormat         = VK_FORMAT_R32G32_SFLOAT;
>-            bufferFormatID          = angle::Format::ID::R32G32_FLOAT;
>-            vkBufferFormat          = VK_FORMAT_R32G32_SFLOAT;
>-            dataInitializerFunction = nullptr;
>-            break;
>-        }
>-
>-        case angle::Format::ID::R32G32_SINT:
>-        {
>-            internalFormat          = GL_RG32I;
>-            textureFormatID         = angle::Format::ID::R32G32_SINT;
>-            vkTextureFormat         = VK_FORMAT_R32G32_SINT;
>-            bufferFormatID          = angle::Format::ID::R32G32_SINT;
>-            vkBufferFormat          = VK_FORMAT_R32G32_SINT;
>-            dataInitializerFunction = nullptr;
>-            break;
>-        }
>-
>-        case angle::Format::ID::R32G32_UINT:
>-        {
>-            internalFormat          = GL_RG32UI;
>-            textureFormatID         = angle::Format::ID::R32G32_UINT;
>-            vkTextureFormat         = VK_FORMAT_R32G32_UINT;
>-            bufferFormatID          = angle::Format::ID::R32G32_UINT;
>-            vkBufferFormat          = VK_FORMAT_R32G32_UINT;
>-            dataInitializerFunction = nullptr;
>-            break;
>-        }
>-
>-        case angle::Format::ID::R32_FLOAT:
>-        {
>-            internalFormat          = GL_R32F;
>-            textureFormatID         = angle::Format::ID::R32_FLOAT;
>-            vkTextureFormat         = VK_FORMAT_R32_SFLOAT;
>-            bufferFormatID          = angle::Format::ID::R32_FLOAT;
>-            vkBufferFormat          = VK_FORMAT_R32_SFLOAT;
>-            dataInitializerFunction = nullptr;
>-            break;
>-        }
>-
>-        case angle::Format::ID::R32_SINT:
>-        {
>-            internalFormat          = GL_R32I;
>-            textureFormatID         = angle::Format::ID::R32_SINT;
>-            vkTextureFormat         = VK_FORMAT_R32_SINT;
>-            bufferFormatID          = angle::Format::ID::R32_SINT;
>-            vkBufferFormat          = VK_FORMAT_R32_SINT;
>-            dataInitializerFunction = nullptr;
>-            break;
>-        }
>-
>-        case angle::Format::ID::R32_UINT:
>-        {
>-            internalFormat          = GL_R32UI;
>-            textureFormatID         = angle::Format::ID::R32_UINT;
>-            vkTextureFormat         = VK_FORMAT_R32_UINT;
>-            bufferFormatID          = angle::Format::ID::R32_UINT;
>-            vkBufferFormat          = VK_FORMAT_R32_UINT;
>-            dataInitializerFunction = nullptr;
>-            break;
>-        }
>-
>-        case angle::Format::ID::R4G4B4A4_UNORM:
>-        {
>-            internalFormat          = GL_RGBA4;
>-            textureFormatID         = angle::Format::ID::R4G4B4A4_UNORM;
>-            vkTextureFormat         = VK_FORMAT_R4G4B4A4_UNORM_PACK16;
>-            bufferFormatID          = angle::Format::ID::R4G4B4A4_UNORM;
>-            vkBufferFormat          = VK_FORMAT_R4G4B4A4_UNORM_PACK16;
>-            dataInitializerFunction = nullptr;
>-            break;
>-        }
>-
>-        case angle::Format::ID::R5G5B5A1_UNORM:
>-        {
>-            internalFormat          = GL_RGB5_A1;
>-            textureFormatID         = angle::Format::ID::R5G5B5A1_UNORM;
>-            vkTextureFormat         = VK_FORMAT_R5G5B5A1_UNORM_PACK16;
>-            bufferFormatID          = angle::Format::ID::R5G5B5A1_UNORM;
>-            vkBufferFormat          = VK_FORMAT_R5G5B5A1_UNORM_PACK16;
>-            dataInitializerFunction = nullptr;
>-            break;
>-        }
>-
>-        case angle::Format::ID::R5G6B5_UNORM:
>-        {
>-            internalFormat          = GL_RGB565;
>-            textureFormatID         = angle::Format::ID::R5G6B5_UNORM;
>-            vkTextureFormat         = VK_FORMAT_R5G6B5_UNORM_PACK16;
>-            bufferFormatID          = angle::Format::ID::R5G6B5_UNORM;
>-            vkBufferFormat          = VK_FORMAT_R5G6B5_UNORM_PACK16;
>-            dataInitializerFunction = nullptr;
>-            break;
>-        }
>-
>-        case angle::Format::ID::R8G8B8A8_SINT:
>-        {
>-            internalFormat          = GL_RGBA8I;
>-            textureFormatID         = angle::Format::ID::R8G8B8A8_SINT;
>-            vkTextureFormat         = VK_FORMAT_R8G8B8A8_SINT;
>-            bufferFormatID          = angle::Format::ID::R8G8B8A8_SINT;
>-            vkBufferFormat          = VK_FORMAT_R8G8B8A8_SINT;
>-            dataInitializerFunction = nullptr;
>-            break;
>-        }
>-
>-        case angle::Format::ID::R8G8B8A8_SNORM:
>-        {
>-            internalFormat          = GL_RGBA8_SNORM;
>-            textureFormatID         = angle::Format::ID::R8G8B8A8_SNORM;
>-            vkTextureFormat         = VK_FORMAT_R8G8B8A8_SNORM;
>-            bufferFormatID          = angle::Format::ID::R8G8B8A8_SNORM;
>-            vkBufferFormat          = VK_FORMAT_R8G8B8A8_SNORM;
>-            dataInitializerFunction = nullptr;
>-            break;
>-        }
>-
>-        case angle::Format::ID::R8G8B8A8_UINT:
>-        {
>-            internalFormat          = GL_RGBA8UI;
>-            textureFormatID         = angle::Format::ID::R8G8B8A8_UINT;
>-            vkTextureFormat         = VK_FORMAT_R8G8B8A8_UINT;
>-            bufferFormatID          = angle::Format::ID::R8G8B8A8_UINT;
>-            vkBufferFormat          = VK_FORMAT_R8G8B8A8_UINT;
>-            dataInitializerFunction = nullptr;
>-            break;
>-        }
>-
>-        case angle::Format::ID::R8G8B8A8_UNORM:
>-        {
>-            internalFormat          = GL_RGBA8;
>-            textureFormatID         = angle::Format::ID::R8G8B8A8_UNORM;
>-            vkTextureFormat         = VK_FORMAT_R8G8B8A8_UNORM;
>-            bufferFormatID          = angle::Format::ID::R8G8B8A8_UNORM;
>-            vkBufferFormat          = VK_FORMAT_R8G8B8A8_UNORM;
>-            dataInitializerFunction = nullptr;
>-            break;
>-        }
>-
>-        case angle::Format::ID::R8G8B8A8_UNORM_SRGB:
>+        case angle::FormatID::R4G4B4A4_UNORM:
>+            internalFormat               = GL_RGBA4;
>+            imageFormatID                = angle::FormatID::R8G8B8A8_UNORM;
>+            vkImageFormat                = VK_FORMAT_R8G8B8A8_UNORM;
>+            imageInitializerFunction     = nullptr;
>+            bufferFormatID               = angle::FormatID::R4G4B4A4_UNORM;
>+            vkBufferFormat               = VK_FORMAT_R4G4B4A4_UNORM_PACK16;
>+            vkBufferFormatIsPacked       = true;
>+            vertexLoadFunction           = nullptr;
>+            vertexLoadRequiresConversion = false;
>+            break;
>+
>+        case angle::FormatID::R5G5B5A1_UNORM:
>+            internalFormat               = GL_RGB5_A1;
>+            imageFormatID                = angle::FormatID::A1R5G5B5_UNORM;
>+            vkImageFormat                = VK_FORMAT_A1R5G5B5_UNORM_PACK16;
>+            imageInitializerFunction     = nullptr;
>+            bufferFormatID               = angle::FormatID::R5G5B5A1_UNORM;
>+            vkBufferFormat               = VK_FORMAT_R5G5B5A1_UNORM_PACK16;
>+            vkBufferFormatIsPacked       = true;
>+            vertexLoadFunction           = nullptr;
>+            vertexLoadRequiresConversion = false;
>+            break;
>+
>+        case angle::FormatID::R5G6B5_UNORM:
>+            internalFormat               = GL_RGB565;
>+            imageFormatID                = angle::FormatID::R5G6B5_UNORM;
>+            vkImageFormat                = VK_FORMAT_R5G6B5_UNORM_PACK16;
>+            imageInitializerFunction     = nullptr;
>+            bufferFormatID               = angle::FormatID::R5G6B5_UNORM;
>+            vkBufferFormat               = VK_FORMAT_R5G6B5_UNORM_PACK16;
>+            vkBufferFormatIsPacked       = true;
>+            vertexLoadFunction           = nullptr;
>+            vertexLoadRequiresConversion = false;
>+            break;
>+
>+        case angle::FormatID::R8G8B8A8_SINT:
>+            internalFormat               = GL_RGBA8I;
>+            imageFormatID                = angle::FormatID::R8G8B8A8_SINT;
>+            vkImageFormat                = VK_FORMAT_R8G8B8A8_SINT;
>+            imageInitializerFunction     = nullptr;
>+            bufferFormatID               = angle::FormatID::R8G8B8A8_SINT;
>+            vkBufferFormat               = VK_FORMAT_R8G8B8A8_SINT;
>+            vkBufferFormatIsPacked       = false;
>+            vertexLoadFunction           = CopyNativeVertexData<GLbyte, 4, 4, 0>;
>+            vertexLoadRequiresConversion = false;
>+            break;
>+
>+        case angle::FormatID::R8G8B8A8_SNORM:
>+            internalFormat           = GL_RGBA8_SNORM;
>+            imageFormatID            = angle::FormatID::R8G8B8A8_SNORM;
>+            vkImageFormat            = VK_FORMAT_R8G8B8A8_SNORM;
>+            imageInitializerFunction = nullptr;
>+            {
>+                static constexpr BufferFormatInitInfo kInfo[] = {
>+                    {angle::FormatID::R8G8B8A8_SNORM, VK_FORMAT_R8G8B8A8_SNORM, false,
>+                     CopyNativeVertexData<GLbyte, 4, 4, 0>, false},
>+                    {angle::FormatID::R32G32B32A32_FLOAT, VK_FORMAT_R32G32B32A32_SFLOAT, false,
>+                     CopyTo32FVertexData<GLbyte, 4, 4, true>, true}};
>+                initBufferFallback(renderer, kInfo, ArraySize(kInfo));
>+            }
>+            break;
>+
>+        case angle::FormatID::R8G8B8A8_SSCALED:
>+            internalFormat           = GL_RGBA8_SSCALED_ANGLEX;
>+            imageFormatID            = angle::FormatID::R8G8B8A8_SSCALED;
>+            vkImageFormat            = VK_FORMAT_R8G8B8A8_SSCALED;
>+            imageInitializerFunction = nullptr;
>+            {
>+                static constexpr BufferFormatInitInfo kInfo[] = {
>+                    {angle::FormatID::R8G8B8A8_SSCALED, VK_FORMAT_R8G8B8A8_SSCALED, false,
>+                     CopyNativeVertexData<GLbyte, 4, 4, 0>, false},
>+                    {angle::FormatID::R32G32B32A32_FLOAT, VK_FORMAT_R32G32B32A32_SFLOAT, false,
>+                     CopyTo32FVertexData<GLbyte, 4, 4, false>, true}};
>+                initBufferFallback(renderer, kInfo, ArraySize(kInfo));
>+            }
>+            break;
>+
>+        case angle::FormatID::R8G8B8A8_TYPELESS:
>             // This format is not implemented in Vulkan.
>             break;
> 
>-        case angle::Format::ID::R8G8B8_SINT:
>-        {
>-            internalFormat          = GL_RGB8I;
>-            textureFormatID         = angle::Format::ID::R8G8B8_SINT;
>-            vkTextureFormat         = VK_FORMAT_R8G8B8_SINT;
>-            bufferFormatID          = angle::Format::ID::R8G8B8_SINT;
>-            vkBufferFormat          = VK_FORMAT_R8G8B8_SINT;
>-            dataInitializerFunction = nullptr;
>-            break;
>-        }
>-
>-        case angle::Format::ID::R8G8B8_SNORM:
>-        {
>-            internalFormat          = GL_RGB8_SNORM;
>-            textureFormatID         = angle::Format::ID::R8G8B8_SNORM;
>-            vkTextureFormat         = VK_FORMAT_R8G8B8_SNORM;
>-            bufferFormatID          = angle::Format::ID::R8G8B8_SNORM;
>-            vkBufferFormat          = VK_FORMAT_R8G8B8_SNORM;
>-            dataInitializerFunction = nullptr;
>-            break;
>-        }
>-
>-        case angle::Format::ID::R8G8B8_UINT:
>-        {
>-            internalFormat          = GL_RGB8UI;
>-            textureFormatID         = angle::Format::ID::R8G8B8_UINT;
>-            vkTextureFormat         = VK_FORMAT_R8G8B8_UINT;
>-            bufferFormatID          = angle::Format::ID::R8G8B8_UINT;
>-            vkBufferFormat          = VK_FORMAT_R8G8B8_UINT;
>-            dataInitializerFunction = nullptr;
>-            break;
>-        }
>-
>-        case angle::Format::ID::R8G8B8_UNORM:
>-        {
>-            internalFormat          = GL_RGB8;
>-            textureFormatID         = angle::Format::ID::R8G8B8A8_UNORM;
>-            vkTextureFormat         = VK_FORMAT_R8G8B8A8_UNORM;
>-            bufferFormatID          = angle::Format::ID::R8G8B8_UNORM;
>-            vkBufferFormat          = VK_FORMAT_R8G8B8_UNORM;
>-            dataInitializerFunction = Initialize4ComponentData<GLubyte, 0x00, 0x00, 0x00, 0xFF>;
>-            break;
>-        }
>-
>-        case angle::Format::ID::R8G8B8_UNORM_SRGB:
>+        case angle::FormatID::R8G8B8A8_TYPELESS_SRGB:
>             // This format is not implemented in Vulkan.
>             break;
> 
>-        case angle::Format::ID::R8G8_SINT:
>-        {
>-            internalFormat          = GL_RG8I;
>-            textureFormatID         = angle::Format::ID::R8G8_SINT;
>-            vkTextureFormat         = VK_FORMAT_R8G8_SINT;
>-            bufferFormatID          = angle::Format::ID::R8G8_SINT;
>-            vkBufferFormat          = VK_FORMAT_R8G8_SINT;
>-            dataInitializerFunction = nullptr;
>-            break;
>-        }
>-
>-        case angle::Format::ID::R8G8_SNORM:
>-        {
>-            internalFormat          = GL_RG8_SNORM;
>-            textureFormatID         = angle::Format::ID::R8G8_SNORM;
>-            vkTextureFormat         = VK_FORMAT_R8G8_SNORM;
>-            bufferFormatID          = angle::Format::ID::R8G8_SNORM;
>-            vkBufferFormat          = VK_FORMAT_R8G8_SNORM;
>-            dataInitializerFunction = nullptr;
>-            break;
>-        }
>-
>-        case angle::Format::ID::R8G8_UINT:
>-        {
>-            internalFormat          = GL_RG8UI;
>-            textureFormatID         = angle::Format::ID::R8G8_UINT;
>-            vkTextureFormat         = VK_FORMAT_R8G8_UINT;
>-            bufferFormatID          = angle::Format::ID::R8G8_UINT;
>-            vkBufferFormat          = VK_FORMAT_R8G8_UINT;
>-            dataInitializerFunction = nullptr;
>-            break;
>-        }
>-
>-        case angle::Format::ID::R8G8_UNORM:
>-        {
>-            internalFormat          = GL_RG8;
>-            textureFormatID         = angle::Format::ID::R8G8_UNORM;
>-            vkTextureFormat         = VK_FORMAT_R8G8_UNORM;
>-            bufferFormatID          = angle::Format::ID::R8G8_UNORM;
>-            vkBufferFormat          = VK_FORMAT_R8G8_UNORM;
>-            dataInitializerFunction = nullptr;
>-            break;
>-        }
>-
>-        case angle::Format::ID::R8_SINT:
>-        {
>-            internalFormat          = GL_R8I;
>-            textureFormatID         = angle::Format::ID::R8_SINT;
>-            vkTextureFormat         = VK_FORMAT_R8_SINT;
>-            bufferFormatID          = angle::Format::ID::R8_SINT;
>-            vkBufferFormat          = VK_FORMAT_R8_SINT;
>-            dataInitializerFunction = nullptr;
>-            break;
>-        }
>-
>-        case angle::Format::ID::R8_SNORM:
>-        {
>-            internalFormat          = GL_R8_SNORM;
>-            textureFormatID         = angle::Format::ID::R8_SNORM;
>-            vkTextureFormat         = VK_FORMAT_R8_SNORM;
>-            bufferFormatID          = angle::Format::ID::R8_SNORM;
>-            vkBufferFormat          = VK_FORMAT_R8_SNORM;
>-            dataInitializerFunction = nullptr;
>-            break;
>-        }
>-
>-        case angle::Format::ID::R8_UINT:
>-        {
>-            internalFormat          = GL_R8UI;
>-            textureFormatID         = angle::Format::ID::R8_UINT;
>-            vkTextureFormat         = VK_FORMAT_R8_UINT;
>-            bufferFormatID          = angle::Format::ID::R8_UINT;
>-            vkBufferFormat          = VK_FORMAT_R8_UINT;
>-            dataInitializerFunction = nullptr;
>-            break;
>-        }
>-
>-        case angle::Format::ID::R8_UNORM:
>-        {
>-            internalFormat          = GL_R8;
>-            textureFormatID         = angle::Format::ID::R8_UNORM;
>-            vkTextureFormat         = VK_FORMAT_R8_UNORM;
>-            bufferFormatID          = angle::Format::ID::R8_UNORM;
>-            vkBufferFormat          = VK_FORMAT_R8_UNORM;
>-            dataInitializerFunction = nullptr;
>-            break;
>-        }
>-
>-        case angle::Format::ID::R9G9B9E5_SHAREDEXP:
>+        case angle::FormatID::R8G8B8A8_UINT:
>+            internalFormat               = GL_RGBA8UI;
>+            imageFormatID                = angle::FormatID::R8G8B8A8_UINT;
>+            vkImageFormat                = VK_FORMAT_R8G8B8A8_UINT;
>+            imageInitializerFunction     = nullptr;
>+            bufferFormatID               = angle::FormatID::R8G8B8A8_UINT;
>+            vkBufferFormat               = VK_FORMAT_R8G8B8A8_UINT;
>+            vkBufferFormatIsPacked       = false;
>+            vertexLoadFunction           = CopyNativeVertexData<GLubyte, 4, 4, 0>;
>+            vertexLoadRequiresConversion = false;
>+            break;
>+
>+        case angle::FormatID::R8G8B8A8_UNORM:
>+            internalFormat           = GL_RGBA8;
>+            imageFormatID            = angle::FormatID::R8G8B8A8_UNORM;
>+            vkImageFormat            = VK_FORMAT_R8G8B8A8_UNORM;
>+            imageInitializerFunction = nullptr;
>+            {
>+                static constexpr BufferFormatInitInfo kInfo[] = {
>+                    {angle::FormatID::R8G8B8A8_UNORM, VK_FORMAT_R8G8B8A8_UNORM, false,
>+                     CopyNativeVertexData<GLubyte, 4, 4, 0>, false},
>+                    {angle::FormatID::R32G32B32A32_FLOAT, VK_FORMAT_R32G32B32A32_SFLOAT, false,
>+                     CopyTo32FVertexData<GLubyte, 4, 4, true>, true}};
>+                initBufferFallback(renderer, kInfo, ArraySize(kInfo));
>+            }
>+            break;
>+
>+        case angle::FormatID::R8G8B8A8_UNORM_SRGB:
>+            internalFormat               = GL_SRGB8_ALPHA8;
>+            imageFormatID                = angle::FormatID::R8G8B8A8_UNORM_SRGB;
>+            vkImageFormat                = VK_FORMAT_R8G8B8A8_SRGB;
>+            imageInitializerFunction     = nullptr;
>+            bufferFormatID               = angle::FormatID::R8G8B8A8_UNORM_SRGB;
>+            vkBufferFormat               = VK_FORMAT_R8G8B8A8_SRGB;
>+            vkBufferFormatIsPacked       = false;
>+            vertexLoadFunction           = CopyNativeVertexData<GLubyte, 4, 4, 0>;
>+            vertexLoadRequiresConversion = false;
>+            break;
>+
>+        case angle::FormatID::R8G8B8A8_USCALED:
>+            internalFormat           = GL_RGBA8_USCALED_ANGLEX;
>+            imageFormatID            = angle::FormatID::R8G8B8A8_USCALED;
>+            vkImageFormat            = VK_FORMAT_R8G8B8A8_USCALED;
>+            imageInitializerFunction = nullptr;
>+            {
>+                static constexpr BufferFormatInitInfo kInfo[] = {
>+                    {angle::FormatID::R8G8B8A8_USCALED, VK_FORMAT_R8G8B8A8_USCALED, false,
>+                     CopyNativeVertexData<GLubyte, 4, 4, 0>, false},
>+                    {angle::FormatID::R32G32B32A32_FLOAT, VK_FORMAT_R32G32B32A32_SFLOAT, false,
>+                     CopyTo32FVertexData<GLubyte, 4, 4, false>, true}};
>+                initBufferFallback(renderer, kInfo, ArraySize(kInfo));
>+            }
>+            break;
>+
>+        case angle::FormatID::R8G8B8_SINT:
>+            internalFormat               = GL_RGB8I;
>+            imageFormatID                = angle::FormatID::R8G8B8_SINT;
>+            vkImageFormat                = VK_FORMAT_R8G8B8_SINT;
>+            imageInitializerFunction     = nullptr;
>+            bufferFormatID               = angle::FormatID::R8G8B8_SINT;
>+            vkBufferFormat               = VK_FORMAT_R8G8B8_SINT;
>+            vkBufferFormatIsPacked       = false;
>+            vertexLoadFunction           = CopyNativeVertexData<GLbyte, 3, 3, 0>;
>+            vertexLoadRequiresConversion = false;
>+            break;
>+
>+        case angle::FormatID::R8G8B8_SNORM:
>+            internalFormat           = GL_RGB8_SNORM;
>+            imageFormatID            = angle::FormatID::R8G8B8_SNORM;
>+            vkImageFormat            = VK_FORMAT_R8G8B8_SNORM;
>+            imageInitializerFunction = nullptr;
>+            {
>+                static constexpr BufferFormatInitInfo kInfo[] = {
>+                    {angle::FormatID::R8G8B8_SNORM, VK_FORMAT_R8G8B8_SNORM, false,
>+                     CopyNativeVertexData<GLbyte, 3, 3, 0>, false},
>+                    {angle::FormatID::R32G32B32_FLOAT, VK_FORMAT_R32G32B32_SFLOAT, false,
>+                     CopyTo32FVertexData<GLbyte, 3, 3, true>, true}};
>+                initBufferFallback(renderer, kInfo, ArraySize(kInfo));
>+            }
>+            break;
>+
>+        case angle::FormatID::R8G8B8_SSCALED:
>+            internalFormat           = GL_RGB8_SSCALED_ANGLEX;
>+            imageFormatID            = angle::FormatID::R8G8B8_SSCALED;
>+            vkImageFormat            = VK_FORMAT_R8G8B8_SSCALED;
>+            imageInitializerFunction = nullptr;
>+            {
>+                static constexpr BufferFormatInitInfo kInfo[] = {
>+                    {angle::FormatID::R8G8B8_SSCALED, VK_FORMAT_R8G8B8_SSCALED, false,
>+                     CopyNativeVertexData<GLbyte, 3, 3, 0>, false},
>+                    {angle::FormatID::R32G32B32_FLOAT, VK_FORMAT_R32G32B32_SFLOAT, false,
>+                     CopyTo32FVertexData<GLbyte, 3, 3, false>, true}};
>+                initBufferFallback(renderer, kInfo, ArraySize(kInfo));
>+            }
>+            break;
>+
>+        case angle::FormatID::R8G8B8_UINT:
>+            internalFormat               = GL_RGB8UI;
>+            imageFormatID                = angle::FormatID::R8G8B8_UINT;
>+            vkImageFormat                = VK_FORMAT_R8G8B8_UINT;
>+            imageInitializerFunction     = nullptr;
>+            bufferFormatID               = angle::FormatID::R8G8B8_UINT;
>+            vkBufferFormat               = VK_FORMAT_R8G8B8_UINT;
>+            vkBufferFormatIsPacked       = false;
>+            vertexLoadFunction           = CopyNativeVertexData<GLubyte, 3, 3, 0>;
>+            vertexLoadRequiresConversion = false;
>+            break;
>+
>+        case angle::FormatID::R8G8B8_UNORM:
>+            internalFormat           = GL_RGB8;
>+            imageFormatID            = angle::FormatID::R8G8B8A8_UNORM;
>+            vkImageFormat            = VK_FORMAT_R8G8B8A8_UNORM;
>+            imageInitializerFunction = Initialize4ComponentData<GLubyte, 0x00, 0x00, 0x00, 0xFF>;
>+            {
>+                static constexpr BufferFormatInitInfo kInfo[] = {
>+                    {angle::FormatID::R8G8B8_UNORM, VK_FORMAT_R8G8B8_UNORM, false,
>+                     CopyNativeVertexData<GLubyte, 3, 3, 0>, false},
>+                    {angle::FormatID::R32G32B32_FLOAT, VK_FORMAT_R32G32B32_SFLOAT, false,
>+                     CopyTo32FVertexData<GLubyte, 3, 3, true>, true}};
>+                initBufferFallback(renderer, kInfo, ArraySize(kInfo));
>+            }
>+            break;
>+
>+        case angle::FormatID::R8G8B8_UNORM_SRGB:
>+            internalFormat           = GL_SRGB8;
>+            imageFormatID            = angle::FormatID::R8G8B8A8_UNORM_SRGB;
>+            vkImageFormat            = VK_FORMAT_R8G8B8A8_SRGB;
>+            imageInitializerFunction = Initialize4ComponentData<GLubyte, 0x00, 0x00, 0x00, 0xFF>;
>+            bufferFormatID           = angle::FormatID::R8G8B8_UNORM_SRGB;
>+            vkBufferFormat           = VK_FORMAT_R8G8B8_SRGB;
>+            vkBufferFormatIsPacked   = false;
>+            vertexLoadFunction       = CopyNativeVertexData<GLubyte, 3, 3, 0>;
>+            vertexLoadRequiresConversion = false;
>+            break;
>+
>+        case angle::FormatID::R8G8B8_USCALED:
>+            internalFormat           = GL_RGB8_USCALED_ANGLEX;
>+            imageFormatID            = angle::FormatID::R8G8B8_USCALED;
>+            vkImageFormat            = VK_FORMAT_R8G8B8_USCALED;
>+            imageInitializerFunction = nullptr;
>+            {
>+                static constexpr BufferFormatInitInfo kInfo[] = {
>+                    {angle::FormatID::R8G8B8_USCALED, VK_FORMAT_R8G8B8_USCALED, false,
>+                     CopyNativeVertexData<GLubyte, 3, 3, 0>, false},
>+                    {angle::FormatID::R32G32B32_FLOAT, VK_FORMAT_R32G32B32_SFLOAT, false,
>+                     CopyTo32FVertexData<GLubyte, 3, 3, false>, true}};
>+                initBufferFallback(renderer, kInfo, ArraySize(kInfo));
>+            }
>+            break;
>+
>+        case angle::FormatID::R8G8_SINT:
>+            internalFormat               = GL_RG8I;
>+            imageFormatID                = angle::FormatID::R8G8_SINT;
>+            vkImageFormat                = VK_FORMAT_R8G8_SINT;
>+            imageInitializerFunction     = nullptr;
>+            bufferFormatID               = angle::FormatID::R8G8_SINT;
>+            vkBufferFormat               = VK_FORMAT_R8G8_SINT;
>+            vkBufferFormatIsPacked       = false;
>+            vertexLoadFunction           = CopyNativeVertexData<GLbyte, 2, 2, 0>;
>+            vertexLoadRequiresConversion = false;
>+            break;
>+
>+        case angle::FormatID::R8G8_SNORM:
>+            internalFormat           = GL_RG8_SNORM;
>+            imageFormatID            = angle::FormatID::R8G8_SNORM;
>+            vkImageFormat            = VK_FORMAT_R8G8_SNORM;
>+            imageInitializerFunction = nullptr;
>+            {
>+                static constexpr BufferFormatInitInfo kInfo[] = {
>+                    {angle::FormatID::R8G8_SNORM, VK_FORMAT_R8G8_SNORM, false,
>+                     CopyNativeVertexData<GLbyte, 2, 2, 0>, false},
>+                    {angle::FormatID::R32G32_FLOAT, VK_FORMAT_R32G32_SFLOAT, false,
>+                     CopyTo32FVertexData<GLbyte, 2, 2, true>, true}};
>+                initBufferFallback(renderer, kInfo, ArraySize(kInfo));
>+            }
>+            break;
>+
>+        case angle::FormatID::R8G8_SSCALED:
>+            internalFormat           = GL_RG8_SSCALED_ANGLEX;
>+            imageFormatID            = angle::FormatID::R8G8_SSCALED;
>+            vkImageFormat            = VK_FORMAT_R8G8_SSCALED;
>+            imageInitializerFunction = nullptr;
>+            {
>+                static constexpr BufferFormatInitInfo kInfo[] = {
>+                    {angle::FormatID::R8G8_SSCALED, VK_FORMAT_R8G8_SSCALED, false,
>+                     CopyNativeVertexData<GLbyte, 2, 2, 0>, false},
>+                    {angle::FormatID::R32G32_FLOAT, VK_FORMAT_R32G32_SFLOAT, false,
>+                     CopyTo32FVertexData<GLbyte, 2, 2, false>, true}};
>+                initBufferFallback(renderer, kInfo, ArraySize(kInfo));
>+            }
>+            break;
>+
>+        case angle::FormatID::R8G8_UINT:
>+            internalFormat               = GL_RG8UI;
>+            imageFormatID                = angle::FormatID::R8G8_UINT;
>+            vkImageFormat                = VK_FORMAT_R8G8_UINT;
>+            imageInitializerFunction     = nullptr;
>+            bufferFormatID               = angle::FormatID::R8G8_UINT;
>+            vkBufferFormat               = VK_FORMAT_R8G8_UINT;
>+            vkBufferFormatIsPacked       = false;
>+            vertexLoadFunction           = CopyNativeVertexData<GLubyte, 2, 2, 0>;
>+            vertexLoadRequiresConversion = false;
>+            break;
>+
>+        case angle::FormatID::R8G8_UNORM:
>+            internalFormat           = GL_RG8;
>+            imageFormatID            = angle::FormatID::R8G8_UNORM;
>+            vkImageFormat            = VK_FORMAT_R8G8_UNORM;
>+            imageInitializerFunction = nullptr;
>+            {
>+                static constexpr BufferFormatInitInfo kInfo[] = {
>+                    {angle::FormatID::R8G8_UNORM, VK_FORMAT_R8G8_UNORM, false,
>+                     CopyNativeVertexData<GLubyte, 2, 2, 0>, false},
>+                    {angle::FormatID::R32G32_FLOAT, VK_FORMAT_R32G32_SFLOAT, false,
>+                     CopyTo32FVertexData<GLubyte, 2, 2, true>, true}};
>+                initBufferFallback(renderer, kInfo, ArraySize(kInfo));
>+            }
>+            break;
>+
>+        case angle::FormatID::R8G8_USCALED:
>+            internalFormat           = GL_RG8_USCALED_ANGLEX;
>+            imageFormatID            = angle::FormatID::R8G8_USCALED;
>+            vkImageFormat            = VK_FORMAT_R8G8_USCALED;
>+            imageInitializerFunction = nullptr;
>+            {
>+                static constexpr BufferFormatInitInfo kInfo[] = {
>+                    {angle::FormatID::R8G8_USCALED, VK_FORMAT_R8G8_USCALED, false,
>+                     CopyNativeVertexData<GLubyte, 2, 2, 0>, false},
>+                    {angle::FormatID::R32G32_FLOAT, VK_FORMAT_R32G32_SFLOAT, false,
>+                     CopyTo32FVertexData<GLubyte, 2, 2, false>, true}};
>+                initBufferFallback(renderer, kInfo, ArraySize(kInfo));
>+            }
>+            break;
>+
>+        case angle::FormatID::R8_SINT:
>+            internalFormat               = GL_R8I;
>+            imageFormatID                = angle::FormatID::R8_SINT;
>+            vkImageFormat                = VK_FORMAT_R8_SINT;
>+            imageInitializerFunction     = nullptr;
>+            bufferFormatID               = angle::FormatID::R8_SINT;
>+            vkBufferFormat               = VK_FORMAT_R8_SINT;
>+            vkBufferFormatIsPacked       = false;
>+            vertexLoadFunction           = CopyNativeVertexData<GLbyte, 1, 1, 0>;
>+            vertexLoadRequiresConversion = false;
>+            break;
>+
>+        case angle::FormatID::R8_SNORM:
>+            internalFormat           = GL_R8_SNORM;
>+            imageFormatID            = angle::FormatID::R8_SNORM;
>+            vkImageFormat            = VK_FORMAT_R8_SNORM;
>+            imageInitializerFunction = nullptr;
>+            {
>+                static constexpr BufferFormatInitInfo kInfo[] = {
>+                    {angle::FormatID::R8_SNORM, VK_FORMAT_R8_SNORM, false,
>+                     CopyNativeVertexData<GLbyte, 1, 1, 0>, false},
>+                    {angle::FormatID::R32_FLOAT, VK_FORMAT_R32_SFLOAT, false,
>+                     CopyTo32FVertexData<GLbyte, 1, 1, true>, true}};
>+                initBufferFallback(renderer, kInfo, ArraySize(kInfo));
>+            }
>+            break;
>+
>+        case angle::FormatID::R8_SSCALED:
>+            internalFormat           = GL_R8_SSCALED_ANGLEX;
>+            imageFormatID            = angle::FormatID::R8_SSCALED;
>+            vkImageFormat            = VK_FORMAT_R8_SSCALED;
>+            imageInitializerFunction = nullptr;
>+            {
>+                static constexpr BufferFormatInitInfo kInfo[] = {
>+                    {angle::FormatID::R8_SSCALED, VK_FORMAT_R8_SSCALED, false,
>+                     CopyNativeVertexData<GLbyte, 1, 1, 0>, false},
>+                    {angle::FormatID::R32_FLOAT, VK_FORMAT_R32_SFLOAT, false,
>+                     CopyTo32FVertexData<GLbyte, 1, 1, false>, true}};
>+                initBufferFallback(renderer, kInfo, ArraySize(kInfo));
>+            }
>+            break;
>+
>+        case angle::FormatID::R8_UINT:
>+            internalFormat               = GL_R8UI;
>+            imageFormatID                = angle::FormatID::R8_UINT;
>+            vkImageFormat                = VK_FORMAT_R8_UINT;
>+            imageInitializerFunction     = nullptr;
>+            bufferFormatID               = angle::FormatID::R8_UINT;
>+            vkBufferFormat               = VK_FORMAT_R8_UINT;
>+            vkBufferFormatIsPacked       = false;
>+            vertexLoadFunction           = CopyNativeVertexData<GLubyte, 1, 1, 0>;
>+            vertexLoadRequiresConversion = false;
>+            break;
>+
>+        case angle::FormatID::R8_UNORM:
>+            internalFormat           = GL_R8;
>+            imageFormatID            = angle::FormatID::R8_UNORM;
>+            vkImageFormat            = VK_FORMAT_R8_UNORM;
>+            imageInitializerFunction = nullptr;
>+            {
>+                static constexpr BufferFormatInitInfo kInfo[] = {
>+                    {angle::FormatID::R8_UNORM, VK_FORMAT_R8_UNORM, false,
>+                     CopyNativeVertexData<GLubyte, 1, 1, 0>, false},
>+                    {angle::FormatID::R32_FLOAT, VK_FORMAT_R32_SFLOAT, false,
>+                     CopyTo32FVertexData<GLubyte, 1, 1, true>, true}};
>+                initBufferFallback(renderer, kInfo, ArraySize(kInfo));
>+            }
>+            break;
>+
>+        case angle::FormatID::R8_USCALED:
>+            internalFormat           = GL_R8_USCALED_ANGLEX;
>+            imageFormatID            = angle::FormatID::R8_USCALED;
>+            vkImageFormat            = VK_FORMAT_R8_USCALED;
>+            imageInitializerFunction = nullptr;
>+            {
>+                static constexpr BufferFormatInitInfo kInfo[] = {
>+                    {angle::FormatID::R8_USCALED, VK_FORMAT_R8_USCALED, false,
>+                     CopyNativeVertexData<GLubyte, 1, 1, 0>, false},
>+                    {angle::FormatID::R32_FLOAT, VK_FORMAT_R32_SFLOAT, false,
>+                     CopyTo32FVertexData<GLubyte, 1, 1, false>, true}};
>+                initBufferFallback(renderer, kInfo, ArraySize(kInfo));
>+            }
>+            break;
>+
>+        case angle::FormatID::R9G9B9E5_SHAREDEXP:
>             // This format is not implemented in Vulkan.
>             break;
> 
>-        case angle::Format::ID::S8_UINT:
>-        {
>-            internalFormat          = GL_STENCIL_INDEX8;
>-            textureFormatID         = angle::Format::ID::S8_UINT;
>-            vkTextureFormat         = VK_FORMAT_S8_UINT;
>-            bufferFormatID          = angle::Format::ID::S8_UINT;
>-            vkBufferFormat          = VK_FORMAT_S8_UINT;
>-            dataInitializerFunction = nullptr;
>+        case angle::FormatID::S8_UINT:
>+            internalFormat = GL_STENCIL_INDEX8;
>+            {
>+                static constexpr ImageFormatInitInfo kInfo[] = {
>+                    {angle::FormatID::S8_UINT, VK_FORMAT_S8_UINT, nullptr},
>+                    {angle::FormatID::D24_UNORM_S8_UINT, VK_FORMAT_D24_UNORM_S8_UINT, nullptr},
>+                    {angle::FormatID::D32_FLOAT_S8X24_UINT, VK_FORMAT_D32_SFLOAT_S8_UINT, nullptr},
>+                    {angle::FormatID::S8_UINT, VK_FORMAT_S8_UINT, nullptr}};
>+                initImageFallback(renderer, kInfo, ArraySize(kInfo));
>+            }
>+            bufferFormatID               = angle::FormatID::S8_UINT;
>+            vkBufferFormat               = VK_FORMAT_S8_UINT;
>+            vkBufferFormatIsPacked       = false;
>+            vertexLoadFunction           = nullptr;
>+            vertexLoadRequiresConversion = false;
>             break;
>-        }
> 
>         default:
>             UNREACHABLE();
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/vk_format_utils.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/vk_format_utils.cpp
>new file mode 100644
>index 00000000000..dd974b418ee
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/vk_format_utils.cpp
>@@ -0,0 +1,336 @@
>+//
>+// Copyright 2016 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// vk_format_utils:
>+//   Helper for Vulkan format code.
>+
>+#include "libANGLE/renderer/vulkan/vk_format_utils.h"
>+
>+#include "libANGLE/Texture.h"
>+#include "libANGLE/formatutils.h"
>+#include "libANGLE/renderer/load_functions_table.h"
>+#include "libANGLE/renderer/vulkan/RendererVk.h"
>+#include "libANGLE/renderer/vulkan/vk_caps_utils.h"
>+
>+namespace rx
>+{
>+namespace
>+{
>+void AddSampleCounts(VkSampleCountFlags sampleCounts, gl::SupportedSampleSet *outSet)
>+{
>+    // The possible bits are VK_SAMPLE_COUNT_n_BIT = n, with n = 1 << b.  At the time of this
>+    // writing, b is in [0, 6], however, we test all 32 bits in case the enum is extended.
>+    for (unsigned int i = 0; i < 32; ++i)
>+    {
>+        if ((sampleCounts & (1 << i)) != 0)
>+        {
>+            outSet->insert(1 << i);
>+        }
>+    }
>+}
>+
>+void FillTextureFormatCaps(RendererVk *renderer, VkFormat format, gl::TextureCaps *outTextureCaps)
>+{
>+    const VkPhysicalDeviceLimits &physicalDeviceLimits =
>+        renderer->getPhysicalDeviceProperties().limits;
>+    bool hasColorAttachmentFeatureBit =
>+        renderer->hasImageFormatFeatureBits(format, VK_FORMAT_FEATURE_COLOR_ATTACHMENT_BIT);
>+    bool hasDepthAttachmentFeatureBit =
>+        renderer->hasImageFormatFeatureBits(format, VK_FORMAT_FEATURE_DEPTH_STENCIL_ATTACHMENT_BIT);
>+
>+    outTextureCaps->texturable =
>+        renderer->hasImageFormatFeatureBits(format, VK_FORMAT_FEATURE_SAMPLED_IMAGE_BIT);
>+    outTextureCaps->filterable = renderer->hasImageFormatFeatureBits(
>+        format, VK_FORMAT_FEATURE_SAMPLED_IMAGE_FILTER_LINEAR_BIT);
>+    outTextureCaps->textureAttachment =
>+        hasColorAttachmentFeatureBit || hasDepthAttachmentFeatureBit;
>+    outTextureCaps->renderbuffer = outTextureCaps->textureAttachment;
>+
>+    if (outTextureCaps->renderbuffer)
>+    {
>+        if (hasColorAttachmentFeatureBit)
>+        {
>+            AddSampleCounts(physicalDeviceLimits.framebufferColorSampleCounts,
>+                            &outTextureCaps->sampleCounts);
>+        }
>+        if (hasDepthAttachmentFeatureBit)
>+        {
>+            AddSampleCounts(physicalDeviceLimits.framebufferDepthSampleCounts,
>+                            &outTextureCaps->sampleCounts);
>+            AddSampleCounts(physicalDeviceLimits.framebufferStencilSampleCounts,
>+                            &outTextureCaps->sampleCounts);
>+        }
>+    }
>+}
>+
>+bool HasFullBufferFormatSupport(RendererVk *renderer, VkFormat vkFormat)
>+{
>+    return renderer->hasBufferFormatFeatureBits(vkFormat, VK_FORMAT_FEATURE_VERTEX_BUFFER_BIT);
>+}
>+
>+using SupportTest = bool (*)(RendererVk *renderer, VkFormat vkFormat);
>+
>+template <class FormatInitInfo>
>+int FindSupportedFormat(RendererVk *renderer,
>+                        const FormatInitInfo *info,
>+                        int numInfo,
>+                        SupportTest hasSupport)
>+{
>+    ASSERT(numInfo > 0);
>+    const int last = numInfo - 1;
>+
>+    for (int i = 0; i < last; ++i)
>+    {
>+        ASSERT(info[i].format != angle::FormatID::NONE);
>+        if (hasSupport(renderer, info[i].vkFormat))
>+            return i;
>+    }
>+
>+    // List must contain a supported item.  We failed on all the others so the last one must be it.
>+    ASSERT(info[last].format != angle::FormatID::NONE);
>+    ASSERT(hasSupport(renderer, info[last].vkFormat));
>+    return last;
>+}
>+
>+}  // anonymous namespace
>+
>+namespace vk
>+{
>+
>+// Format implementation.
>+Format::Format()
>+    : angleFormatID(angle::FormatID::NONE),
>+      internalFormat(GL_NONE),
>+      imageFormatID(angle::FormatID::NONE),
>+      vkImageFormat(VK_FORMAT_UNDEFINED),
>+      bufferFormatID(angle::FormatID::NONE),
>+      vkBufferFormat(VK_FORMAT_UNDEFINED),
>+      imageInitializerFunction(nullptr),
>+      textureLoadFunctions(),
>+      vertexLoadRequiresConversion(false),
>+      vkBufferFormatIsPacked(false),
>+      vkSupportsStorageBuffer(false),
>+      vkFormatIsInt(false),
>+      vkFormatIsUnsigned(false)
>+{}
>+
>+void Format::initImageFallback(RendererVk *renderer, const ImageFormatInitInfo *info, int numInfo)
>+{
>+    size_t skip = renderer->getFeatures().forceFallbackFormat ? 1 : 0;
>+    int i = FindSupportedFormat(renderer, info + skip, numInfo - skip, HasFullTextureFormatSupport);
>+    i += skip;
>+
>+    imageFormatID            = info[i].format;
>+    vkImageFormat            = info[i].vkFormat;
>+    imageInitializerFunction = info[i].initializer;
>+}
>+
>+void Format::initBufferFallback(RendererVk *renderer, const BufferFormatInitInfo *info, int numInfo)
>+{
>+    size_t skip = renderer->getFeatures().forceFallbackFormat ? 1 : 0;
>+    int i = FindSupportedFormat(renderer, info + skip, numInfo - skip, HasFullBufferFormatSupport);
>+    i += skip;
>+
>+    bufferFormatID               = info[i].format;
>+    vkBufferFormat               = info[i].vkFormat;
>+    vkBufferFormatIsPacked       = info[i].vkFormatIsPacked;
>+    vertexLoadFunction           = info[i].vertexLoadFunction;
>+    vertexLoadRequiresConversion = info[i].vertexLoadRequiresConversion;
>+}
>+
>+size_t Format::getImageCopyBufferAlignment() const
>+{
>+    // vkCmdCopyBufferToImage must have an offset that is a multiple of 4 as well as a multiple
>+    // of the pixel block size.
>+    // https://www.khronos.org/registry/vulkan/specs/1.0/man/html/VkBufferImageCopy.html
>+    //
>+    // We need lcm(4, blockSize) (lcm = least common multiplier).  Since 4 is constant, this
>+    // can be calculated as:
>+    //
>+    //                      | blockSize             blockSize % 4 == 0
>+    //                      | 4 * blockSize         blockSize % 4 == 1
>+    // lcm(4, blockSize) = <
>+    //                      | 2 * blockSize         blockSize % 4 == 2
>+    //                      | 4 * blockSize         blockSize % 4 == 3
>+    //
>+    // This means:
>+    //
>+    // - blockSize % 2 != 0 gives a 4x multiplier
>+    // - else blockSize % 4 != 0 gives a 2x multiplier
>+    // - else there's no multiplier.
>+    //
>+    const angle::Format &format = imageFormat();
>+
>+    if (!format.isBlock)
>+    {
>+        // Currently, 4 is sufficient for any known non-block format.
>+        return 4;
>+    }
>+
>+    const size_t blockSize  = format.pixelBytes;
>+    const size_t multiplier = blockSize % 2 != 0 ? 4 : blockSize % 4 != 0 ? 2 : 1;
>+    const size_t alignment  = multiplier * blockSize;
>+
>+    return alignment;
>+}
>+
>+bool Format::hasEmulatedImageChannels() const
>+{
>+    const angle::Format &angleFmt   = angleFormat();
>+    const angle::Format &textureFmt = imageFormat();
>+
>+    return (angleFmt.alphaBits == 0 && textureFmt.alphaBits > 0) ||
>+           (angleFmt.blueBits == 0 && textureFmt.blueBits > 0) ||
>+           (angleFmt.greenBits == 0 && textureFmt.greenBits > 0) ||
>+           (angleFmt.depthBits == 0 && textureFmt.depthBits > 0) ||
>+           (angleFmt.stencilBits == 0 && textureFmt.stencilBits > 0);
>+}
>+
>+bool operator==(const Format &lhs, const Format &rhs)
>+{
>+    return &lhs == &rhs;
>+}
>+
>+bool operator!=(const Format &lhs, const Format &rhs)
>+{
>+    return &lhs != &rhs;
>+}
>+
>+// FormatTable implementation.
>+FormatTable::FormatTable() {}
>+
>+FormatTable::~FormatTable() {}
>+
>+void FormatTable::initialize(RendererVk *renderer,
>+                             gl::TextureCapsMap *outTextureCapsMap,
>+                             std::vector<GLenum> *outCompressedTextureFormats)
>+{
>+    for (size_t formatIndex = 0; formatIndex < angle::kNumANGLEFormats; ++formatIndex)
>+    {
>+        vk::Format &format               = mFormatData[formatIndex];
>+        const auto formatID              = static_cast<angle::FormatID>(formatIndex);
>+        const angle::Format &angleFormat = angle::Format::Get(formatID);
>+
>+        format.initialize(renderer, angleFormat);
>+        const GLenum internalFormat = format.internalFormat;
>+        format.angleFormatID        = formatID;
>+
>+        if (!format.valid())
>+        {
>+            continue;
>+        }
>+
>+        format.vkSupportsStorageBuffer = renderer->hasBufferFormatFeatureBits(
>+            format.vkBufferFormat, VK_FORMAT_FEATURE_STORAGE_TEXEL_BUFFER_BIT);
>+
>+        gl::TextureCaps textureCaps;
>+        FillTextureFormatCaps(renderer, format.vkImageFormat, &textureCaps);
>+        outTextureCapsMap->set(formatID, textureCaps);
>+
>+        if (textureCaps.texturable)
>+        {
>+            format.textureLoadFunctions = GetLoadFunctionsMap(internalFormat, format.imageFormatID);
>+        }
>+
>+        if (angleFormat.isBlock)
>+        {
>+            outCompressedTextureFormats->push_back(internalFormat);
>+        }
>+    }
>+}
>+
>+VkImageUsageFlags GetMaximalImageUsageFlags(RendererVk *renderer, VkFormat format)
>+{
>+    constexpr VkFormatFeatureFlags kImageUsageFeatureBits =
>+        VK_FORMAT_FEATURE_SAMPLED_IMAGE_BIT | VK_FORMAT_FEATURE_STORAGE_IMAGE_BIT |
>+        VK_FORMAT_FEATURE_COLOR_ATTACHMENT_BIT | VK_FORMAT_FEATURE_DEPTH_STENCIL_ATTACHMENT_BIT |
>+        VK_FORMAT_FEATURE_TRANSFER_SRC_BIT | VK_FORMAT_FEATURE_TRANSFER_DST_BIT;
>+    VkFormatFeatureFlags featureBits =
>+        renderer->getImageFormatFeatureBits(format, kImageUsageFeatureBits);
>+    VkImageUsageFlags imageUsageFlags = 0;
>+    if (featureBits & VK_FORMAT_FEATURE_SAMPLED_IMAGE_BIT)
>+        imageUsageFlags |= VK_IMAGE_USAGE_SAMPLED_BIT;
>+    if (featureBits & VK_FORMAT_FEATURE_STORAGE_IMAGE_BIT)
>+        imageUsageFlags |= VK_IMAGE_USAGE_STORAGE_BIT;
>+    if (featureBits & VK_FORMAT_FEATURE_COLOR_ATTACHMENT_BIT)
>+        imageUsageFlags |= VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT;
>+    if (featureBits & VK_FORMAT_FEATURE_DEPTH_STENCIL_ATTACHMENT_BIT)
>+        imageUsageFlags |= VK_IMAGE_USAGE_DEPTH_STENCIL_ATTACHMENT_BIT;
>+    if (featureBits & VK_FORMAT_FEATURE_TRANSFER_SRC_BIT)
>+        imageUsageFlags |= VK_IMAGE_USAGE_TRANSFER_SRC_BIT;
>+    if (featureBits & VK_FORMAT_FEATURE_TRANSFER_DST_BIT)
>+        imageUsageFlags |= VK_IMAGE_USAGE_TRANSFER_DST_BIT;
>+    imageUsageFlags |= VK_IMAGE_USAGE_INPUT_ATTACHMENT_BIT;
>+    return imageUsageFlags;
>+}
>+
>+}  // namespace vk
>+
>+bool HasFullTextureFormatSupport(RendererVk *renderer, VkFormat vkFormat)
>+{
>+    constexpr uint32_t kBitsColor = VK_FORMAT_FEATURE_SAMPLED_IMAGE_BIT |
>+                                    VK_FORMAT_FEATURE_SAMPLED_IMAGE_FILTER_LINEAR_BIT |
>+                                    VK_FORMAT_FEATURE_COLOR_ATTACHMENT_BIT;
>+    constexpr uint32_t kBitsDepth = VK_FORMAT_FEATURE_DEPTH_STENCIL_ATTACHMENT_BIT;
>+
>+    return renderer->hasImageFormatFeatureBits(vkFormat, kBitsColor) ||
>+           renderer->hasImageFormatFeatureBits(vkFormat, kBitsDepth);
>+}
>+
>+size_t GetVertexInputAlignment(const vk::Format &format)
>+{
>+    const angle::Format &bufferFormat = format.bufferFormat();
>+    size_t pixelBytes                 = bufferFormat.pixelBytes;
>+    return format.vkBufferFormatIsPacked ? pixelBytes : (pixelBytes / bufferFormat.channelCount());
>+}
>+
>+void MapSwizzleState(const vk::Format &format,
>+                     const gl::SwizzleState &swizzleState,
>+                     gl::SwizzleState *swizzleStateOut)
>+{
>+    const angle::Format &angleFormat = format.angleFormat();
>+
>+    if (angleFormat.isBlock)
>+    {
>+        // No need to override swizzles for compressed images, as they are not emulated.
>+        // Either way, angleFormat.xBits (with x in {red, green, blue, alpha}) is zero for blocked
>+        // formats so the following code would incorrectly turn its swizzle to (0, 0, 0, 1).
>+        return;
>+    }
>+
>+    switch (format.internalFormat)
>+    {
>+        case GL_LUMINANCE8_OES:
>+            swizzleStateOut->swizzleRed   = swizzleState.swizzleRed;
>+            swizzleStateOut->swizzleGreen = swizzleState.swizzleRed;
>+            swizzleStateOut->swizzleBlue  = swizzleState.swizzleRed;
>+            swizzleStateOut->swizzleAlpha = GL_ONE;
>+            break;
>+        case GL_LUMINANCE8_ALPHA8_OES:
>+            swizzleStateOut->swizzleRed   = swizzleState.swizzleRed;
>+            swizzleStateOut->swizzleGreen = swizzleState.swizzleRed;
>+            swizzleStateOut->swizzleBlue  = swizzleState.swizzleRed;
>+            swizzleStateOut->swizzleAlpha = swizzleState.swizzleGreen;
>+            break;
>+        case GL_ALPHA8_OES:
>+            swizzleStateOut->swizzleRed   = GL_ZERO;
>+            swizzleStateOut->swizzleGreen = GL_ZERO;
>+            swizzleStateOut->swizzleBlue  = GL_ZERO;
>+            swizzleStateOut->swizzleAlpha = swizzleState.swizzleRed;
>+            break;
>+        default:
>+            // Set any missing channel to default in case the emulated format has that channel.
>+            swizzleStateOut->swizzleRed =
>+                angleFormat.redBits > 0 ? swizzleState.swizzleRed : GL_ZERO;
>+            swizzleStateOut->swizzleGreen =
>+                angleFormat.greenBits > 0 ? swizzleState.swizzleGreen : GL_ZERO;
>+            swizzleStateOut->swizzleBlue =
>+                angleFormat.blueBits > 0 ? swizzleState.swizzleBlue : GL_ZERO;
>+            swizzleStateOut->swizzleAlpha =
>+                angleFormat.alphaBits > 0 ? swizzleState.swizzleAlpha : GL_ONE;
>+            break;
>+    }
>+}
>+}  // namespace rx
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/vk_format_utils.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/vk_format_utils.h
>new file mode 100644
>index 00000000000..56ccbd44cf7
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/vk_format_utils.h
>@@ -0,0 +1,157 @@
>+//
>+// Copyright 2016 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// vk_format_utils:
>+//   Helper for Vulkan format code.
>+
>+#ifndef LIBANGLE_RENDERER_VULKAN_VK_FORMAT_UTILS_H_
>+#define LIBANGLE_RENDERER_VULKAN_VK_FORMAT_UTILS_H_
>+
>+#include <vulkan/vulkan.h>
>+
>+#include "libANGLE/formatutils.h"
>+#include "libANGLE/renderer/Format.h"
>+#include "libANGLE/renderer/copyvertex.h"
>+#include "libANGLE/renderer/renderer_utils.h"
>+#include "platform/FeaturesVk.h"
>+
>+#include <array>
>+
>+namespace gl
>+{
>+struct SwizzleState;
>+class TextureCapsMap;
>+}  // namespace gl
>+
>+namespace rx
>+{
>+class RendererVk;
>+
>+namespace vk
>+{
>+// VkFormat values in range [0, kNumVkFormats) are used as indices in various tables.
>+constexpr uint32_t kNumVkFormats = 185;
>+
>+struct ImageFormatInitInfo final
>+{
>+    angle::FormatID format;
>+    VkFormat vkFormat;
>+    InitializeTextureDataFunction initializer;
>+};
>+
>+struct BufferFormatInitInfo final
>+{
>+    angle::FormatID format;
>+    VkFormat vkFormat;
>+    bool vkFormatIsPacked;
>+    VertexCopyFunction vertexLoadFunction;
>+    bool vertexLoadRequiresConversion;
>+};
>+
>+struct Format final : private angle::NonCopyable
>+{
>+    Format();
>+
>+    bool valid() const { return internalFormat != 0; }
>+
>+    // The ANGLE format is the front-end format.
>+    const angle::Format &angleFormat() const { return angle::Format::Get(angleFormatID); }
>+
>+    // The Image format is the VkFormat used to implement the front-end format for VkImages.
>+    const angle::Format &imageFormat() const { return angle::Format::Get(imageFormatID); }
>+
>+    // The Buffer format is the VkFormat used to implement the front-end format for VkBuffers.
>+    const angle::Format &bufferFormat() const { return angle::Format::Get(bufferFormatID); }
>+
>+    // Returns OpenGL format information for the front-end format.
>+    const gl::InternalFormat &getInternalFormatInfo(GLenum type) const
>+    {
>+        return gl::GetInternalFormatInfo(internalFormat, type);
>+    }
>+
>+    // Get buffer alignment for image-copy operations (to or from a buffer).
>+    size_t getImageCopyBufferAlignment() const;
>+
>+    // Returns true if the Image format has more channels than the ANGLE format.
>+    bool hasEmulatedImageChannels() const;
>+
>+    // This is an auto-generated method in vk_format_table_autogen.cpp.
>+    void initialize(RendererVk *renderer, const angle::Format &angleFormat);
>+
>+    // These are used in the format table init.
>+    void initImageFallback(RendererVk *renderer, const ImageFormatInitInfo *info, int numInfo);
>+    void initBufferFallback(RendererVk *renderer, const BufferFormatInitInfo *info, int numInfo);
>+
>+    angle::FormatID angleFormatID;
>+    GLenum internalFormat;
>+    angle::FormatID imageFormatID;
>+    VkFormat vkImageFormat;
>+    angle::FormatID bufferFormatID;
>+    VkFormat vkBufferFormat;
>+
>+    InitializeTextureDataFunction imageInitializerFunction;
>+    LoadFunctionMap textureLoadFunctions;
>+    VertexCopyFunction vertexLoadFunction;
>+
>+    bool vertexLoadRequiresConversion;
>+    bool vkBufferFormatIsPacked;
>+    bool vkSupportsStorageBuffer;
>+    bool vkFormatIsInt;
>+    bool vkFormatIsUnsigned;
>+};
>+
>+bool operator==(const Format &lhs, const Format &rhs);
>+bool operator!=(const Format &lhs, const Format &rhs);
>+
>+class FormatTable final : angle::NonCopyable
>+{
>+  public:
>+    FormatTable();
>+    ~FormatTable();
>+
>+    // Also initializes the TextureCapsMap and the compressedTextureCaps in the Caps instance.
>+    void initialize(RendererVk *renderer,
>+                    gl::TextureCapsMap *outTextureCapsMap,
>+                    std::vector<GLenum> *outCompressedTextureFormats);
>+
>+    ANGLE_INLINE const Format &operator[](GLenum internalFormat) const
>+    {
>+        angle::FormatID formatID = angle::Format::InternalFormatToID(internalFormat);
>+        return mFormatData[static_cast<size_t>(formatID)];
>+    }
>+
>+    ANGLE_INLINE const Format &operator[](angle::FormatID formatID) const
>+    {
>+        return mFormatData[static_cast<size_t>(formatID)];
>+    }
>+
>+  private:
>+    // The table data is indexed by angle::FormatID.
>+    std::array<Format, angle::kNumANGLEFormats> mFormatData;
>+};
>+
>+// This will return a reference to a VkFormatProperties with the feature flags supported
>+// if the format is a mandatory format described in section 31.3.3. Required Format Support
>+// of the Vulkan spec. If the vkFormat isn't mandatory, it will return a VkFormatProperties
>+// initialized to 0.
>+const VkFormatProperties &GetMandatoryFormatSupport(VkFormat vkFormat);
>+
>+VkImageUsageFlags GetMaximalImageUsageFlags(RendererVk *renderer, VkFormat format);
>+
>+}  // namespace vk
>+
>+// Checks if a vkFormat supports all the features needed to use it as a GL texture format
>+bool HasFullTextureFormatSupport(RendererVk *renderer, VkFormat vkFormat);
>+
>+// Returns the alignment for a buffer to be used with the vertex input stage in Vulkan. This
>+// calculation is listed in the Vulkan spec at the end of the section 'Vertex Input Description'.
>+size_t GetVertexInputAlignment(const vk::Format &format);
>+
>+void MapSwizzleState(const vk::Format &format,
>+                     const gl::SwizzleState &swizzleState,
>+                     gl::SwizzleState *swizzleStateOut);
>+}  // namespace rx
>+
>+#endif  // LIBANGLE_RENDERER_VULKAN_VK_FORMAT_UTILS_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/vk_helpers.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/vk_helpers.cpp
>new file mode 100644
>index 00000000000..5c9f059a7e7
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/vk_helpers.cpp
>@@ -0,0 +1,2375 @@
>+//
>+// Copyright 2018 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// vk_helpers:
>+//   Helper utilitiy classes that manage Vulkan resources.
>+
>+#include "libANGLE/renderer/vulkan/vk_helpers.h"
>+
>+#include "common/utilities.h"
>+#include "libANGLE/Context.h"
>+#include "libANGLE/renderer/vulkan/BufferVk.h"
>+#include "libANGLE/renderer/vulkan/ContextVk.h"
>+#include "libANGLE/renderer/vulkan/FramebufferVk.h"
>+#include "libANGLE/renderer/vulkan/RendererVk.h"
>+#include "libANGLE/renderer/vulkan/vk_utils.h"
>+#include "third_party/trace_event/trace_event.h"
>+
>+namespace rx
>+{
>+namespace vk
>+{
>+namespace
>+{
>+// WebGL requires color textures to be initialized to transparent black.
>+constexpr VkClearColorValue kWebGLInitColorValue = {{0, 0, 0, 0}};
>+// When emulating a texture, we want the emulated channels to be 0, with alpha 1.
>+constexpr VkClearColorValue kEmulatedInitColorValue = {{0, 0, 0, 1.0f}};
>+// WebGL requires depth/stencil textures to be initialized to depth=1, stencil=0.  We are fine with
>+// these values for emulated depth/stencil textures too.
>+constexpr VkClearDepthStencilValue kWebGLInitDepthStencilValue = {1.0f, 0};
>+
>+constexpr VkBufferUsageFlags kLineLoopDynamicBufferUsage =
>+    VK_BUFFER_USAGE_INDEX_BUFFER_BIT | VK_BUFFER_USAGE_TRANSFER_DST_BIT |
>+    VK_BUFFER_USAGE_UNIFORM_TEXEL_BUFFER_BIT | VK_BUFFER_USAGE_STORAGE_TEXEL_BUFFER_BIT;
>+constexpr int kLineLoopDynamicBufferMinSize = 1024 * 1024;
>+
>+// This is an arbitrary max. We can change this later if necessary.
>+constexpr uint32_t kDefaultDescriptorPoolMaxSets = 128;
>+
>+struct ImageMemoryBarrierData
>+{
>+    // The Vk layout corresponding to the ImageLayout key.
>+    VkImageLayout layout;
>+    // The stage in which the image is used (or Bottom/Top if not using any specific stage).  Unless
>+    // Bottom/Top (Bottom used for transition to and Top used for transition from), the two values
>+    // should match.
>+    VkPipelineStageFlags dstStageMask;
>+    VkPipelineStageFlags srcStageMask;
>+    // Access mask when transitioning into this layout.
>+    VkAccessFlags dstAccessMask;
>+    // Access mask when transitioning out from this layout.  Note that source access mask never
>+    // needs a READ bit, as WAR hazards don't need memory barriers (just execution barriers).
>+    VkAccessFlags srcAccessMask;
>+
>+    // If access is read-only, the execution barrier can be skipped altogether if retransitioning to
>+    // the same layout. This is because read-after-read does not need an execution or memory
>+    // barrier.
>+    bool isReadOnlyAccess;
>+};
>+
>+// clang-format off
>+constexpr angle::PackedEnumMap<ImageLayout, ImageMemoryBarrierData> kImageMemoryBarrierData = {
>+    {
>+        ImageLayout::Undefined,
>+        {
>+            VK_IMAGE_LAYOUT_UNDEFINED,
>+            VK_PIPELINE_STAGE_BOTTOM_OF_PIPE_BIT,
>+            VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT,
>+            // Transition to: we don't expect to transition into Undefined.
>+            0,
>+            // Transition from: there's no data in the image to care about.
>+            0,
>+            true,
>+        },
>+    },
>+    {
>+        ImageLayout::ExternalPreInitialized,
>+        {
>+            VK_IMAGE_LAYOUT_PREINITIALIZED,
>+            VK_PIPELINE_STAGE_BOTTOM_OF_PIPE_BIT,
>+            VK_PIPELINE_STAGE_HOST_BIT | VK_PIPELINE_STAGE_ALL_COMMANDS_BIT,
>+            // Transition to: we don't expect to transition into PreInitialized.
>+            0,
>+            // Transition from: all writes must finish before barrier.
>+            VK_ACCESS_MEMORY_WRITE_BIT,
>+            false,
>+        },
>+    },
>+    {
>+        ImageLayout::TransferSrc,
>+        {
>+            VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL,
>+            VK_PIPELINE_STAGE_TRANSFER_BIT,
>+            VK_PIPELINE_STAGE_TRANSFER_BIT,
>+            // Transition to: all reads must happen after barrier.
>+            VK_ACCESS_TRANSFER_READ_BIT,
>+            // Transition from: RAR and WAR don't need memory barrier.
>+            0,
>+            true,
>+        },
>+    },
>+    {
>+        ImageLayout::TransferDst,
>+        {
>+            VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL,
>+            VK_PIPELINE_STAGE_TRANSFER_BIT,
>+            VK_PIPELINE_STAGE_TRANSFER_BIT,
>+            // Transition to: all writes must happen after barrier.
>+            VK_ACCESS_TRANSFER_WRITE_BIT,
>+            // Transition from: all writes must finish before barrier.
>+            VK_ACCESS_TRANSFER_WRITE_BIT,
>+            false,
>+        },
>+    },
>+    {
>+        ImageLayout::ComputeShaderReadOnly,
>+        {
>+            VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL,
>+            VK_PIPELINE_STAGE_COMPUTE_SHADER_BIT,
>+            VK_PIPELINE_STAGE_COMPUTE_SHADER_BIT,
>+            // Transition to: all reads must happen after barrier.
>+            VK_ACCESS_SHADER_READ_BIT,
>+            // Transition from: RAR and WAR don't need memory barrier.
>+            0,
>+            true,
>+        },
>+    },
>+    {
>+        ImageLayout::ComputeShaderWrite,
>+        {
>+            VK_IMAGE_LAYOUT_GENERAL,
>+            VK_PIPELINE_STAGE_COMPUTE_SHADER_BIT,
>+            VK_PIPELINE_STAGE_COMPUTE_SHADER_BIT,
>+            // Transition to: all reads and writes must happen after barrier.
>+            VK_ACCESS_SHADER_READ_BIT | VK_ACCESS_SHADER_WRITE_BIT,
>+            // Transition from: all writes must finish before barrier.
>+            VK_ACCESS_SHADER_WRITE_BIT,
>+            false,
>+        },
>+    },
>+    {
>+        ImageLayout::FragmentShaderReadOnly,
>+        {
>+            VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL,
>+            VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT,
>+            VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT,
>+            // Transition to: all reads must happen after barrier.
>+            VK_ACCESS_SHADER_READ_BIT,
>+            // Transition from: RAR and WAR don't need memory barrier.
>+            0,
>+            true,
>+        },
>+    },
>+    {
>+        ImageLayout::ColorAttachment,
>+        {
>+            VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL,
>+            VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT,
>+            VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT,
>+            // Transition to: all reads and writes must happen after barrier.
>+            VK_ACCESS_COLOR_ATTACHMENT_READ_BIT | VK_ACCESS_COLOR_ATTACHMENT_WRITE_BIT,
>+            // Transition from: all writes must finish before barrier.
>+            VK_ACCESS_COLOR_ATTACHMENT_WRITE_BIT,
>+            false,
>+        },
>+    },
>+    {
>+        ImageLayout::DepthStencilAttachment,
>+        {
>+            VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL,
>+            VK_PIPELINE_STAGE_LATE_FRAGMENT_TESTS_BIT,
>+            VK_PIPELINE_STAGE_LATE_FRAGMENT_TESTS_BIT,
>+            // Transition to: all reads and writes must happen after barrier.
>+            VK_ACCESS_DEPTH_STENCIL_ATTACHMENT_READ_BIT | VK_ACCESS_DEPTH_STENCIL_ATTACHMENT_WRITE_BIT,
>+            // Transition from: all writes must finish before barrier.
>+            VK_ACCESS_DEPTH_STENCIL_ATTACHMENT_WRITE_BIT,
>+            false,
>+        },
>+    },
>+    {
>+        ImageLayout::Present,
>+        {
>+            VK_IMAGE_LAYOUT_PRESENT_SRC_KHR,
>+            VK_PIPELINE_STAGE_BOTTOM_OF_PIPE_BIT,
>+            VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT,
>+            // transition to: vkQueuePresentKHR automatically performs the appropriate memory barriers:
>+            //
>+            // > Any writes to memory backing the images referenced by the pImageIndices and
>+            // > pSwapchains members of pPresentInfo, that are available before vkQueuePresentKHR
>+            // > is executed, are automatically made visible to the read access performed by the
>+            // > presentation engine.
>+            0,
>+            // Transition from: RAR and WAR don't need memory barrier.
>+            0,
>+            true,
>+        },
>+    },
>+};
>+// clang-format on
>+
>+VkImageCreateFlags GetImageCreateFlags(gl::TextureType textureType)
>+{
>+    if (textureType == gl::TextureType::CubeMap)
>+    {
>+        return VK_IMAGE_CREATE_CUBE_COMPATIBLE_BIT;
>+    }
>+    else
>+    {
>+        return 0;
>+    }
>+}
>+}  // anonymous namespace
>+
>+// DynamicBuffer implementation.
>+DynamicBuffer::DynamicBuffer(VkBufferUsageFlags usage, size_t minSize, bool hostVisible)
>+    : mUsage(usage),
>+      mHostVisible(hostVisible),
>+      mMinSize(minSize),
>+      mBuffer(nullptr),
>+      mNextAllocationOffset(0),
>+      mLastFlushOrInvalidateOffset(0),
>+      mSize(0),
>+      mAlignment(0)
>+{}
>+
>+DynamicBuffer::DynamicBuffer(DynamicBuffer &&other)
>+    : mUsage(other.mUsage),
>+      mHostVisible(other.mHostVisible),
>+      mMinSize(other.mMinSize),
>+      mBuffer(other.mBuffer),
>+      mNextAllocationOffset(other.mNextAllocationOffset),
>+      mLastFlushOrInvalidateOffset(other.mLastFlushOrInvalidateOffset),
>+      mSize(other.mSize),
>+      mAlignment(other.mAlignment),
>+      mRetainedBuffers(std::move(other.mRetainedBuffers))
>+{
>+    other.mBuffer = nullptr;
>+}
>+
>+void DynamicBuffer::init(size_t alignment, RendererVk *renderer)
>+{
>+    // Workaround for the mock ICD not supporting allocations greater than 0x1000.
>+    // Could be removed if https://github.com/KhronosGroup/Vulkan-Tools/issues/84 is fixed.
>+    if (renderer->isMockICDEnabled())
>+    {
>+        mMinSize = std::min<size_t>(mMinSize, 0x1000);
>+    }
>+
>+    updateAlignment(renderer, alignment);
>+}
>+
>+DynamicBuffer::~DynamicBuffer()
>+{
>+    ASSERT(mBuffer == nullptr);
>+}
>+
>+angle::Result DynamicBuffer::allocate(Context *context,
>+                                      size_t sizeInBytes,
>+                                      uint8_t **ptrOut,
>+                                      VkBuffer *bufferOut,
>+                                      VkDeviceSize *offsetOut,
>+                                      bool *newBufferAllocatedOut)
>+{
>+    size_t sizeToAllocate = roundUp(sizeInBytes, mAlignment);
>+
>+    angle::base::CheckedNumeric<size_t> checkedNextWriteOffset = mNextAllocationOffset;
>+    checkedNextWriteOffset += sizeToAllocate;
>+
>+    if (!checkedNextWriteOffset.IsValid() || checkedNextWriteOffset.ValueOrDie() >= mSize)
>+    {
>+        if (mBuffer)
>+        {
>+            ANGLE_TRY(flush(context));
>+            mBuffer->unmap(context->getDevice());
>+
>+            mRetainedBuffers.push_back(mBuffer);
>+            mBuffer = nullptr;
>+        }
>+
>+        mSize = std::max(sizeToAllocate, mMinSize);
>+
>+        std::unique_ptr<BufferHelper> buffer = std::make_unique<BufferHelper>();
>+
>+        VkBufferCreateInfo createInfo    = {};
>+        createInfo.sType                 = VK_STRUCTURE_TYPE_BUFFER_CREATE_INFO;
>+        createInfo.flags                 = 0;
>+        createInfo.size                  = mSize;
>+        createInfo.usage                 = mUsage;
>+        createInfo.sharingMode           = VK_SHARING_MODE_EXCLUSIVE;
>+        createInfo.queueFamilyIndexCount = 0;
>+        createInfo.pQueueFamilyIndices   = nullptr;
>+
>+        const VkMemoryPropertyFlags memoryProperty = mHostVisible
>+                                                         ? VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT
>+                                                         : VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT;
>+        ANGLE_TRY(buffer->init(context, createInfo, memoryProperty));
>+        mBuffer = buffer.release();
>+
>+        mNextAllocationOffset        = 0;
>+        mLastFlushOrInvalidateOffset = 0;
>+
>+        if (newBufferAllocatedOut != nullptr)
>+        {
>+            *newBufferAllocatedOut = true;
>+        }
>+    }
>+    else if (newBufferAllocatedOut != nullptr)
>+    {
>+        *newBufferAllocatedOut = false;
>+    }
>+
>+    ASSERT(mBuffer != nullptr);
>+
>+    if (bufferOut != nullptr)
>+    {
>+        *bufferOut = mBuffer->getBuffer().getHandle();
>+    }
>+
>+    // Optionally map() the buffer if possible
>+    if (ptrOut)
>+    {
>+        ASSERT(mHostVisible);
>+        uint8_t *mappedMemory;
>+        ANGLE_TRY(mBuffer->map(context, &mappedMemory));
>+        *ptrOut = mappedMemory + mNextAllocationOffset;
>+    }
>+
>+    *offsetOut = static_cast<VkDeviceSize>(mNextAllocationOffset);
>+    mNextAllocationOffset += static_cast<uint32_t>(sizeToAllocate);
>+    return angle::Result::Continue;
>+}
>+
>+angle::Result DynamicBuffer::flush(Context *context)
>+{
>+    if (mHostVisible && (mNextAllocationOffset > mLastFlushOrInvalidateOffset))
>+    {
>+        ASSERT(mBuffer != nullptr);
>+        ANGLE_TRY(mBuffer->flush(context, mLastFlushOrInvalidateOffset,
>+                                 mNextAllocationOffset - mLastFlushOrInvalidateOffset));
>+        mLastFlushOrInvalidateOffset = mNextAllocationOffset;
>+    }
>+    return angle::Result::Continue;
>+}
>+
>+angle::Result DynamicBuffer::invalidate(Context *context)
>+{
>+    if (mHostVisible && (mNextAllocationOffset > mLastFlushOrInvalidateOffset))
>+    {
>+        ASSERT(mBuffer != nullptr);
>+        ANGLE_TRY(mBuffer->invalidate(context, mLastFlushOrInvalidateOffset,
>+                                      mNextAllocationOffset - mLastFlushOrInvalidateOffset));
>+        mLastFlushOrInvalidateOffset = mNextAllocationOffset;
>+    }
>+    return angle::Result::Continue;
>+}
>+
>+void DynamicBuffer::release(RendererVk *renderer)
>+{
>+    reset();
>+    releaseRetainedBuffers(renderer);
>+
>+    if (mBuffer)
>+    {
>+        mBuffer->unmap(renderer->getDevice());
>+
>+        // The buffers may not have been recording commands, but they could be used to store data so
>+        // they should live until at most this frame.  For example a vertex buffer filled entirely
>+        // by the CPU currently never gets a chance to have its serial set.
>+        mBuffer->updateQueueSerial(renderer->getCurrentQueueSerial());
>+        mBuffer->release(renderer);
>+        delete mBuffer;
>+        mBuffer = nullptr;
>+    }
>+}
>+
>+void DynamicBuffer::releaseRetainedBuffers(RendererVk *renderer)
>+{
>+    for (BufferHelper *toFree : mRetainedBuffers)
>+    {
>+        // See note in release().
>+        toFree->updateQueueSerial(renderer->getCurrentQueueSerial());
>+        toFree->release(renderer);
>+        delete toFree;
>+    }
>+
>+    mRetainedBuffers.clear();
>+}
>+
>+void DynamicBuffer::destroy(VkDevice device)
>+{
>+    reset();
>+
>+    for (BufferHelper *toFree : mRetainedBuffers)
>+    {
>+        toFree->destroy(device);
>+        delete toFree;
>+    }
>+
>+    mRetainedBuffers.clear();
>+
>+    if (mBuffer)
>+    {
>+        mBuffer->unmap(device);
>+        mBuffer->destroy(device);
>+        delete mBuffer;
>+        mBuffer = nullptr;
>+    }
>+}
>+
>+void DynamicBuffer::updateAlignment(RendererVk *renderer, size_t alignment)
>+{
>+    ASSERT(alignment > 0);
>+
>+    size_t atomSize =
>+        static_cast<size_t>(renderer->getPhysicalDeviceProperties().limits.nonCoherentAtomSize);
>+
>+    // We need lcm(alignment, atomSize), we are assuming one divides the other so std::max() could
>+    // be used instead.
>+    ASSERT(alignment % atomSize == 0 || atomSize % alignment == 0);
>+    alignment = std::max(alignment, atomSize);
>+
>+    // If alignment has changed, make sure the next allocation is done at an aligned offset.
>+    if (alignment != mAlignment)
>+    {
>+        mNextAllocationOffset = roundUp(mNextAllocationOffset, static_cast<uint32_t>(alignment));
>+    }
>+
>+    mAlignment = alignment;
>+}
>+
>+void DynamicBuffer::setMinimumSizeForTesting(size_t minSize)
>+{
>+    // This will really only have an effect next time we call allocate.
>+    mMinSize = minSize;
>+
>+    // Forces a new allocation on the next allocate.
>+    mSize = 0;
>+}
>+
>+void DynamicBuffer::reset()
>+{
>+    mSize                        = 0;
>+    mNextAllocationOffset        = 0;
>+    mLastFlushOrInvalidateOffset = 0;
>+}
>+
>+// DescriptorPoolHelper implementation.
>+DescriptorPoolHelper::DescriptorPoolHelper() : mFreeDescriptorSets(0) {}
>+
>+DescriptorPoolHelper::~DescriptorPoolHelper() = default;
>+
>+bool DescriptorPoolHelper::hasCapacity(uint32_t descriptorSetCount) const
>+{
>+    return mFreeDescriptorSets >= descriptorSetCount;
>+}
>+
>+angle::Result DescriptorPoolHelper::init(Context *context,
>+                                         const std::vector<VkDescriptorPoolSize> &poolSizes,
>+                                         uint32_t maxSets)
>+{
>+    if (mDescriptorPool.valid())
>+    {
>+        // This could be improved by recycling the descriptor pool.
>+        mDescriptorPool.destroy(context->getDevice());
>+    }
>+
>+    VkDescriptorPoolCreateInfo descriptorPoolInfo = {};
>+    descriptorPoolInfo.sType                      = VK_STRUCTURE_TYPE_DESCRIPTOR_POOL_CREATE_INFO;
>+    descriptorPoolInfo.flags                      = 0;
>+    descriptorPoolInfo.maxSets                    = maxSets;
>+    descriptorPoolInfo.poolSizeCount              = static_cast<uint32_t>(poolSizes.size());
>+    descriptorPoolInfo.pPoolSizes                 = poolSizes.data();
>+
>+    mFreeDescriptorSets = maxSets;
>+
>+    ANGLE_VK_TRY(context, mDescriptorPool.init(context->getDevice(), descriptorPoolInfo));
>+    return angle::Result::Continue;
>+}
>+
>+void DescriptorPoolHelper::destroy(VkDevice device)
>+{
>+    mDescriptorPool.destroy(device);
>+}
>+
>+angle::Result DescriptorPoolHelper::allocateSets(Context *context,
>+                                                 const VkDescriptorSetLayout *descriptorSetLayout,
>+                                                 uint32_t descriptorSetCount,
>+                                                 VkDescriptorSet *descriptorSetsOut)
>+{
>+    VkDescriptorSetAllocateInfo allocInfo = {};
>+    allocInfo.sType                       = VK_STRUCTURE_TYPE_DESCRIPTOR_SET_ALLOCATE_INFO;
>+    allocInfo.descriptorPool              = mDescriptorPool.getHandle();
>+    allocInfo.descriptorSetCount          = descriptorSetCount;
>+    allocInfo.pSetLayouts                 = descriptorSetLayout;
>+
>+    ASSERT(mFreeDescriptorSets >= descriptorSetCount);
>+    mFreeDescriptorSets -= descriptorSetCount;
>+
>+    ANGLE_VK_TRY(context, mDescriptorPool.allocateDescriptorSets(context->getDevice(), allocInfo,
>+                                                                 descriptorSetsOut));
>+    return angle::Result::Continue;
>+}
>+
>+// DynamicDescriptorPool implementation.
>+DynamicDescriptorPool::DynamicDescriptorPool()
>+    : mMaxSetsPerPool(kDefaultDescriptorPoolMaxSets), mCurrentPoolIndex(0)
>+{}
>+
>+DynamicDescriptorPool::~DynamicDescriptorPool() = default;
>+
>+angle::Result DynamicDescriptorPool::init(Context *context,
>+                                          const VkDescriptorPoolSize *setSizes,
>+                                          uint32_t setSizeCount)
>+{
>+    ASSERT(mCurrentPoolIndex == 0);
>+    ASSERT(mDescriptorPools.empty() || (mDescriptorPools.size() == 1 &&
>+                                        mDescriptorPools[0]->get().hasCapacity(mMaxSetsPerPool)));
>+
>+    mPoolSizes.assign(setSizes, setSizes + setSizeCount);
>+    for (uint32_t i = 0; i < setSizeCount; ++i)
>+    {
>+        mPoolSizes[i].descriptorCount *= mMaxSetsPerPool;
>+    }
>+
>+    mDescriptorPools.push_back(new RefCountedDescriptorPoolHelper());
>+    return mDescriptorPools[0]->get().init(context, mPoolSizes, mMaxSetsPerPool);
>+}
>+
>+void DynamicDescriptorPool::destroy(VkDevice device)
>+{
>+    for (RefCountedDescriptorPoolHelper *pool : mDescriptorPools)
>+    {
>+        ASSERT(!pool->isReferenced());
>+        pool->get().destroy(device);
>+        delete pool;
>+    }
>+
>+    mDescriptorPools.clear();
>+}
>+
>+angle::Result DynamicDescriptorPool::allocateSets(Context *context,
>+                                                  const VkDescriptorSetLayout *descriptorSetLayout,
>+                                                  uint32_t descriptorSetCount,
>+                                                  RefCountedDescriptorPoolBinding *bindingOut,
>+                                                  VkDescriptorSet *descriptorSetsOut)
>+{
>+    if (!bindingOut->valid() || !bindingOut->get().hasCapacity(descriptorSetCount))
>+    {
>+        if (!mDescriptorPools[mCurrentPoolIndex]->get().hasCapacity(descriptorSetCount))
>+        {
>+            ANGLE_TRY(allocateNewPool(context));
>+        }
>+
>+        // Make sure the old binding knows the descriptor sets can still be in-use. We only need
>+        // to update the serial when we move to a new pool. This is because we only check serials
>+        // when we move to a new pool.
>+        if (bindingOut->valid())
>+        {
>+            Serial currentSerial = context->getRenderer()->getCurrentQueueSerial();
>+            bindingOut->get().updateSerial(currentSerial);
>+        }
>+
>+        bindingOut->set(mDescriptorPools[mCurrentPoolIndex]);
>+    }
>+
>+    return bindingOut->get().allocateSets(context, descriptorSetLayout, descriptorSetCount,
>+                                          descriptorSetsOut);
>+}
>+
>+angle::Result DynamicDescriptorPool::allocateNewPool(Context *context)
>+{
>+    RendererVk *renderer = context->getRenderer();
>+
>+    bool found = false;
>+
>+    for (size_t poolIndex = 0; poolIndex < mDescriptorPools.size(); ++poolIndex)
>+    {
>+        if (!mDescriptorPools[poolIndex]->isReferenced() &&
>+            !renderer->isSerialInUse(mDescriptorPools[poolIndex]->get().getSerial()))
>+        {
>+            mCurrentPoolIndex = poolIndex;
>+            found             = true;
>+            break;
>+        }
>+    }
>+
>+    if (!found)
>+    {
>+        mDescriptorPools.push_back(new RefCountedDescriptorPoolHelper());
>+        mCurrentPoolIndex = mDescriptorPools.size() - 1;
>+
>+        static constexpr size_t kMaxPools = 99999;
>+        ANGLE_VK_CHECK(context, mDescriptorPools.size() < kMaxPools, VK_ERROR_TOO_MANY_OBJECTS);
>+    }
>+
>+    return mDescriptorPools[mCurrentPoolIndex]->get().init(context, mPoolSizes, mMaxSetsPerPool);
>+}
>+
>+void DynamicDescriptorPool::setMaxSetsPerPoolForTesting(uint32_t maxSetsPerPool)
>+{
>+    mMaxSetsPerPool = maxSetsPerPool;
>+}
>+
>+// DynamicallyGrowingPool implementation
>+template <typename Pool>
>+DynamicallyGrowingPool<Pool>::DynamicallyGrowingPool()
>+    : mPoolSize(0), mCurrentPool(0), mCurrentFreeEntry(0)
>+{}
>+
>+template <typename Pool>
>+DynamicallyGrowingPool<Pool>::~DynamicallyGrowingPool() = default;
>+
>+template <typename Pool>
>+angle::Result DynamicallyGrowingPool<Pool>::initEntryPool(Context *context, uint32_t poolSize)
>+{
>+    ASSERT(mPools.empty() && mPoolStats.empty());
>+    mPoolSize = poolSize;
>+    return angle::Result::Continue;
>+}
>+
>+template <typename Pool>
>+void DynamicallyGrowingPool<Pool>::destroyEntryPool()
>+{
>+    mPools.clear();
>+    mPoolStats.clear();
>+}
>+
>+template <typename Pool>
>+bool DynamicallyGrowingPool<Pool>::findFreeEntryPool(Context *context)
>+{
>+    Serial lastCompletedQueueSerial = context->getRenderer()->getLastCompletedQueueSerial();
>+    for (size_t i = 0; i < mPools.size(); ++i)
>+    {
>+        if (mPoolStats[i].freedCount == mPoolSize &&
>+            mPoolStats[i].serial <= lastCompletedQueueSerial)
>+        {
>+            mCurrentPool      = i;
>+            mCurrentFreeEntry = 0;
>+
>+            mPoolStats[i].freedCount = 0;
>+
>+            return true;
>+        }
>+    }
>+
>+    return false;
>+}
>+
>+template <typename Pool>
>+angle::Result DynamicallyGrowingPool<Pool>::allocateNewEntryPool(Context *context, Pool &&pool)
>+{
>+    mPools.push_back(std::move(pool));
>+
>+    PoolStats poolStats = {0, Serial()};
>+    mPoolStats.push_back(poolStats);
>+
>+    mCurrentPool      = mPools.size() - 1;
>+    mCurrentFreeEntry = 0;
>+
>+    return angle::Result::Continue;
>+}
>+
>+template <typename Pool>
>+void DynamicallyGrowingPool<Pool>::onEntryFreed(Context *context, size_t poolIndex)
>+{
>+    ASSERT(poolIndex < mPoolStats.size() && mPoolStats[poolIndex].freedCount < mPoolSize);
>+
>+    // Take note of the current serial to avoid reallocating a query in the same pool
>+    mPoolStats[poolIndex].serial = context->getRenderer()->getCurrentQueueSerial();
>+    ++mPoolStats[poolIndex].freedCount;
>+}
>+
>+// DynamicQueryPool implementation
>+DynamicQueryPool::DynamicQueryPool() = default;
>+
>+DynamicQueryPool::~DynamicQueryPool() = default;
>+
>+angle::Result DynamicQueryPool::init(Context *context, VkQueryType type, uint32_t poolSize)
>+{
>+    ANGLE_TRY(initEntryPool(context, poolSize));
>+
>+    mQueryType = type;
>+    ANGLE_TRY(allocateNewPool(context));
>+
>+    return angle::Result::Continue;
>+}
>+
>+void DynamicQueryPool::destroy(VkDevice device)
>+{
>+    for (QueryPool &queryPool : mPools)
>+    {
>+        queryPool.destroy(device);
>+    }
>+
>+    destroyEntryPool();
>+}
>+
>+angle::Result DynamicQueryPool::allocateQuery(Context *context, QueryHelper *queryOut)
>+{
>+    ASSERT(!queryOut->getQueryPool());
>+
>+    size_t poolIndex    = 0;
>+    uint32_t queryIndex = 0;
>+    ANGLE_TRY(allocateQuery(context, &poolIndex, &queryIndex));
>+
>+    queryOut->init(this, poolIndex, queryIndex);
>+
>+    return angle::Result::Continue;
>+}
>+
>+void DynamicQueryPool::freeQuery(Context *context, QueryHelper *query)
>+{
>+    if (query->getQueryPool())
>+    {
>+        size_t poolIndex = query->getQueryPoolIndex();
>+        ASSERT(query->getQueryPool()->valid());
>+
>+        freeQuery(context, poolIndex, query->getQuery());
>+
>+        query->deinit();
>+    }
>+}
>+
>+angle::Result DynamicQueryPool::allocateQuery(Context *context,
>+                                              size_t *poolIndex,
>+                                              uint32_t *queryIndex)
>+{
>+    if (mCurrentFreeEntry >= mPoolSize)
>+    {
>+        // No more queries left in this pool, create another one.
>+        ANGLE_TRY(allocateNewPool(context));
>+    }
>+
>+    *poolIndex  = mCurrentPool;
>+    *queryIndex = mCurrentFreeEntry++;
>+
>+    return angle::Result::Continue;
>+}
>+
>+void DynamicQueryPool::freeQuery(Context *context, size_t poolIndex, uint32_t queryIndex)
>+{
>+    ANGLE_UNUSED_VARIABLE(queryIndex);
>+    onEntryFreed(context, poolIndex);
>+}
>+
>+angle::Result DynamicQueryPool::allocateNewPool(Context *context)
>+{
>+    if (findFreeEntryPool(context))
>+    {
>+        return angle::Result::Continue;
>+    }
>+
>+    VkQueryPoolCreateInfo queryPoolInfo = {};
>+    queryPoolInfo.sType                 = VK_STRUCTURE_TYPE_QUERY_POOL_CREATE_INFO;
>+    queryPoolInfo.flags                 = 0;
>+    queryPoolInfo.queryType             = mQueryType;
>+    queryPoolInfo.queryCount            = mPoolSize;
>+    queryPoolInfo.pipelineStatistics    = 0;
>+
>+    vk::QueryPool queryPool;
>+
>+    ANGLE_VK_TRY(context, queryPool.init(context->getDevice(), queryPoolInfo));
>+
>+    return allocateNewEntryPool(context, std::move(queryPool));
>+}
>+
>+// QueryHelper implementation
>+QueryHelper::QueryHelper() : mDynamicQueryPool(nullptr), mQueryPoolIndex(0), mQuery(0) {}
>+
>+QueryHelper::~QueryHelper() {}
>+
>+void QueryHelper::init(const DynamicQueryPool *dynamicQueryPool,
>+                       const size_t queryPoolIndex,
>+                       uint32_t query)
>+{
>+    mDynamicQueryPool = dynamicQueryPool;
>+    mQueryPoolIndex   = queryPoolIndex;
>+    mQuery            = query;
>+}
>+
>+void QueryHelper::deinit()
>+{
>+    mDynamicQueryPool = nullptr;
>+    mQueryPoolIndex   = 0;
>+    mQuery            = 0;
>+}
>+
>+void QueryHelper::beginQuery(vk::Context *context)
>+{
>+    RendererVk *renderer = context->getRenderer();
>+    renderer->getCommandGraph()->beginQuery(getQueryPool(), getQuery());
>+    mMostRecentSerial = renderer->getCurrentQueueSerial();
>+}
>+
>+void QueryHelper::endQuery(vk::Context *context)
>+{
>+    RendererVk *renderer = context->getRenderer();
>+    renderer->getCommandGraph()->endQuery(getQueryPool(), getQuery());
>+    mMostRecentSerial = renderer->getCurrentQueueSerial();
>+}
>+
>+void QueryHelper::writeTimestamp(vk::Context *context)
>+{
>+    RendererVk *renderer = context->getRenderer();
>+    renderer->getCommandGraph()->writeTimestamp(getQueryPool(), getQuery());
>+    mMostRecentSerial = renderer->getCurrentQueueSerial();
>+}
>+
>+bool QueryHelper::hasPendingWork(RendererVk *renderer)
>+{
>+    // If the renderer has a queue serial higher than the stored one, the command buffers that
>+    // recorded this query have already been submitted, so there is no pending work.
>+    return mMostRecentSerial == renderer->getCurrentQueueSerial();
>+}
>+
>+// DynamicSemaphorePool implementation
>+DynamicSemaphorePool::DynamicSemaphorePool() = default;
>+
>+DynamicSemaphorePool::~DynamicSemaphorePool() = default;
>+
>+angle::Result DynamicSemaphorePool::init(Context *context, uint32_t poolSize)
>+{
>+    ANGLE_TRY(initEntryPool(context, poolSize));
>+    ANGLE_TRY(allocateNewPool(context));
>+    return angle::Result::Continue;
>+}
>+
>+void DynamicSemaphorePool::destroy(VkDevice device)
>+{
>+    for (auto &semaphorePool : mPools)
>+    {
>+        for (Semaphore &semaphore : semaphorePool)
>+        {
>+            semaphore.destroy(device);
>+        }
>+    }
>+
>+    destroyEntryPool();
>+}
>+
>+angle::Result DynamicSemaphorePool::allocateSemaphore(Context *context,
>+                                                      SemaphoreHelper *semaphoreOut)
>+{
>+    ASSERT(!semaphoreOut->getSemaphore());
>+
>+    if (mCurrentFreeEntry >= mPoolSize)
>+    {
>+        // No more queries left in this pool, create another one.
>+        ANGLE_TRY(allocateNewPool(context));
>+    }
>+
>+    semaphoreOut->init(mCurrentPool, &mPools[mCurrentPool][mCurrentFreeEntry++]);
>+
>+    return angle::Result::Continue;
>+}
>+
>+void DynamicSemaphorePool::freeSemaphore(Context *context, SemaphoreHelper *semaphore)
>+{
>+    if (semaphore->getSemaphore())
>+    {
>+        onEntryFreed(context, semaphore->getSemaphorePoolIndex());
>+        semaphore->deinit();
>+    }
>+}
>+
>+angle::Result DynamicSemaphorePool::allocateNewPool(Context *context)
>+{
>+    if (findFreeEntryPool(context))
>+    {
>+        return angle::Result::Continue;
>+    }
>+
>+    std::vector<Semaphore> newPool(mPoolSize);
>+
>+    for (Semaphore &semaphore : newPool)
>+    {
>+        ANGLE_VK_TRY(context, semaphore.init(context->getDevice()));
>+    }
>+
>+    // This code is safe as long as the growth of the outer vector in vector<vector<T>> is done by
>+    // moving the inner vectors, making sure references to the inner vector remain intact.
>+    Semaphore *assertMove = mPools.size() > 0 ? mPools[0].data() : nullptr;
>+
>+    ANGLE_TRY(allocateNewEntryPool(context, std::move(newPool)));
>+
>+    ASSERT(assertMove == nullptr || assertMove == mPools[0].data());
>+
>+    return angle::Result::Continue;
>+}
>+
>+// SemaphoreHelper implementation
>+SemaphoreHelper::SemaphoreHelper() : mSemaphorePoolIndex(0), mSemaphore(0) {}
>+
>+SemaphoreHelper::~SemaphoreHelper() {}
>+
>+SemaphoreHelper::SemaphoreHelper(SemaphoreHelper &&other)
>+    : mSemaphorePoolIndex(other.mSemaphorePoolIndex), mSemaphore(other.mSemaphore)
>+{
>+    other.mSemaphore = nullptr;
>+}
>+
>+SemaphoreHelper &SemaphoreHelper::operator=(SemaphoreHelper &&other)
>+{
>+    std::swap(mSemaphorePoolIndex, other.mSemaphorePoolIndex);
>+    std::swap(mSemaphore, other.mSemaphore);
>+    return *this;
>+}
>+
>+void SemaphoreHelper::init(const size_t semaphorePoolIndex, const vk::Semaphore *semaphore)
>+{
>+    mSemaphorePoolIndex = semaphorePoolIndex;
>+    mSemaphore          = semaphore;
>+}
>+
>+void SemaphoreHelper::deinit()
>+{
>+    mSemaphorePoolIndex = 0;
>+    mSemaphore          = nullptr;
>+}
>+
>+// LineLoopHelper implementation.
>+LineLoopHelper::LineLoopHelper(RendererVk *renderer)
>+    : mDynamicIndexBuffer(kLineLoopDynamicBufferUsage, kLineLoopDynamicBufferMinSize, true)
>+{
>+    // We need to use an alignment of the maximum size we're going to allocate, which is
>+    // VK_INDEX_TYPE_UINT32. When we switch from a drawElement to a drawArray call, the allocations
>+    // can vary in size. According to the Vulkan spec, when calling vkCmdBindIndexBuffer: 'The
>+    // sum of offset and the address of the range of VkDeviceMemory object that is backing buffer,
>+    // must be a multiple of the type indicated by indexType'.
>+    mDynamicIndexBuffer.init(sizeof(uint32_t), renderer);
>+}
>+
>+LineLoopHelper::~LineLoopHelper() = default;
>+
>+angle::Result LineLoopHelper::getIndexBufferForDrawArrays(ContextVk *contextVk,
>+                                                          uint32_t clampedVertexCount,
>+                                                          GLint firstVertex,
>+                                                          vk::BufferHelper **bufferOut,
>+                                                          VkDeviceSize *offsetOut)
>+{
>+    uint32_t *indices    = nullptr;
>+    size_t allocateBytes = sizeof(uint32_t) * (static_cast<size_t>(clampedVertexCount) + 1);
>+
>+    mDynamicIndexBuffer.releaseRetainedBuffers(contextVk->getRenderer());
>+    ANGLE_TRY(mDynamicIndexBuffer.allocate(contextVk, allocateBytes,
>+                                           reinterpret_cast<uint8_t **>(&indices), nullptr,
>+                                           offsetOut, nullptr));
>+    *bufferOut = mDynamicIndexBuffer.getCurrentBuffer();
>+
>+    // Note: there could be an overflow in this addition.
>+    uint32_t unsignedFirstVertex = static_cast<uint32_t>(firstVertex);
>+    uint32_t vertexCount         = (clampedVertexCount + unsignedFirstVertex);
>+    for (uint32_t vertexIndex = unsignedFirstVertex; vertexIndex < vertexCount; vertexIndex++)
>+    {
>+        *indices++ = vertexIndex;
>+    }
>+    *indices = unsignedFirstVertex;
>+
>+    // Since we are not using the VK_MEMORY_PROPERTY_HOST_COHERENT_BIT flag when creating the
>+    // device memory in the StreamingBuffer, we always need to make sure we flush it after
>+    // writing.
>+    ANGLE_TRY(mDynamicIndexBuffer.flush(contextVk));
>+
>+    return angle::Result::Continue;
>+}
>+
>+angle::Result LineLoopHelper::getIndexBufferForElementArrayBuffer(ContextVk *contextVk,
>+                                                                  BufferVk *elementArrayBufferVk,
>+                                                                  gl::DrawElementsType glIndexType,
>+                                                                  int indexCount,
>+                                                                  intptr_t elementArrayOffset,
>+                                                                  vk::BufferHelper **bufferOut,
>+                                                                  VkDeviceSize *bufferOffsetOut)
>+{
>+    if (glIndexType == gl::DrawElementsType::UnsignedByte)
>+    {
>+        TRACE_EVENT0("gpu.angle", "LineLoopHelper::getIndexBufferForElementArrayBuffer");
>+        // Needed before reading buffer or we could get stale data.
>+        ANGLE_TRY(contextVk->finishImpl());
>+
>+        void *srcDataMapping = nullptr;
>+        ANGLE_TRY(elementArrayBufferVk->mapImpl(contextVk, &srcDataMapping));
>+        ANGLE_TRY(streamIndices(contextVk, glIndexType, indexCount,
>+                                static_cast<const uint8_t *>(srcDataMapping) + elementArrayOffset,
>+                                bufferOut, bufferOffsetOut));
>+        ANGLE_TRY(elementArrayBufferVk->unmapImpl(contextVk));
>+        return angle::Result::Continue;
>+    }
>+
>+    VkIndexType indexType = gl_vk::kIndexTypeMap[glIndexType];
>+    ASSERT(indexType == VK_INDEX_TYPE_UINT16 || indexType == VK_INDEX_TYPE_UINT32);
>+    uint32_t *indices = nullptr;
>+
>+    auto unitSize = (indexType == VK_INDEX_TYPE_UINT16 ? sizeof(uint16_t) : sizeof(uint32_t));
>+    size_t allocateBytes = unitSize * (indexCount + 1) + 1;
>+
>+    mDynamicIndexBuffer.releaseRetainedBuffers(contextVk->getRenderer());
>+    ANGLE_TRY(mDynamicIndexBuffer.allocate(contextVk, allocateBytes,
>+                                           reinterpret_cast<uint8_t **>(&indices), nullptr,
>+                                           bufferOffsetOut, nullptr));
>+    *bufferOut = mDynamicIndexBuffer.getCurrentBuffer();
>+
>+    VkDeviceSize sourceOffset                  = static_cast<VkDeviceSize>(elementArrayOffset);
>+    uint64_t unitCount                         = static_cast<VkDeviceSize>(indexCount);
>+    angle::FixedVector<VkBufferCopy, 3> copies = {
>+        {sourceOffset, *bufferOffsetOut, unitCount * unitSize},
>+        {sourceOffset, *bufferOffsetOut + unitCount * unitSize, unitSize},
>+    };
>+    if (contextVk->getRenderer()->getFeatures().extraCopyBufferRegion)
>+        copies.push_back({sourceOffset, *bufferOffsetOut + (unitCount + 1) * unitSize, 1});
>+
>+    ANGLE_TRY(
>+        elementArrayBufferVk->copyToBuffer(contextVk, *bufferOut, copies.size(), copies.data()));
>+    ANGLE_TRY(mDynamicIndexBuffer.flush(contextVk));
>+    return angle::Result::Continue;
>+}
>+
>+angle::Result LineLoopHelper::streamIndices(ContextVk *contextVk,
>+                                            gl::DrawElementsType glIndexType,
>+                                            GLsizei indexCount,
>+                                            const uint8_t *srcPtr,
>+                                            vk::BufferHelper **bufferOut,
>+                                            VkDeviceSize *bufferOffsetOut)
>+{
>+    VkIndexType indexType = gl_vk::kIndexTypeMap[glIndexType];
>+
>+    uint8_t *indices = nullptr;
>+
>+    auto unitSize = (indexType == VK_INDEX_TYPE_UINT16 ? sizeof(uint16_t) : sizeof(uint32_t));
>+    size_t allocateBytes = unitSize * (indexCount + 1);
>+    ANGLE_TRY(mDynamicIndexBuffer.allocate(contextVk, allocateBytes,
>+                                           reinterpret_cast<uint8_t **>(&indices), nullptr,
>+                                           bufferOffsetOut, nullptr));
>+    *bufferOut = mDynamicIndexBuffer.getCurrentBuffer();
>+
>+    if (glIndexType == gl::DrawElementsType::UnsignedByte)
>+    {
>+        // Vulkan doesn't support uint8 index types, so we need to emulate it.
>+        ASSERT(indexType == VK_INDEX_TYPE_UINT16);
>+        uint16_t *indicesDst = reinterpret_cast<uint16_t *>(indices);
>+        for (int i = 0; i < indexCount; i++)
>+        {
>+            indicesDst[i] = srcPtr[i];
>+        }
>+
>+        indicesDst[indexCount] = srcPtr[0];
>+    }
>+    else
>+    {
>+        memcpy(indices, srcPtr, unitSize * indexCount);
>+        memcpy(indices + unitSize * indexCount, srcPtr, unitSize);
>+    }
>+
>+    ANGLE_TRY(mDynamicIndexBuffer.flush(contextVk));
>+    return angle::Result::Continue;
>+}
>+
>+void LineLoopHelper::release(RendererVk *renderer)
>+{
>+    mDynamicIndexBuffer.release(renderer);
>+}
>+
>+void LineLoopHelper::destroy(VkDevice device)
>+{
>+    mDynamicIndexBuffer.destroy(device);
>+}
>+
>+// static
>+void LineLoopHelper::Draw(uint32_t count, vk::CommandBuffer *commandBuffer)
>+{
>+    // Our first index is always 0 because that's how we set it up in createIndexBuffer*.
>+    // Note: this could theoretically overflow and wrap to zero.
>+    commandBuffer->drawIndexed(count + 1);
>+}
>+
>+// BufferHelper implementation.
>+BufferHelper::BufferHelper()
>+    : CommandGraphResource(CommandGraphResourceType::Buffer),
>+      mMemoryPropertyFlags{},
>+      mSize(0),
>+      mMappedMemory(nullptr),
>+      mViewFormat(nullptr),
>+      mCurrentWriteAccess(0),
>+      mCurrentReadAccess(0)
>+{}
>+
>+BufferHelper::~BufferHelper() = default;
>+
>+angle::Result BufferHelper::init(Context *context,
>+                                 const VkBufferCreateInfo &createInfo,
>+                                 VkMemoryPropertyFlags memoryPropertyFlags)
>+{
>+    mSize = createInfo.size;
>+    ANGLE_VK_TRY(context, mBuffer.init(context->getDevice(), createInfo));
>+    return vk::AllocateBufferMemory(context, memoryPropertyFlags, &mMemoryPropertyFlags, nullptr,
>+                                    &mBuffer, &mDeviceMemory);
>+}
>+
>+void BufferHelper::destroy(VkDevice device)
>+{
>+    unmap(device);
>+    mSize       = 0;
>+    mViewFormat = nullptr;
>+
>+    mBuffer.destroy(device);
>+    mBufferView.destroy(device);
>+    mDeviceMemory.destroy(device);
>+}
>+
>+void BufferHelper::release(RendererVk *renderer)
>+{
>+    unmap(renderer->getDevice());
>+    mSize       = 0;
>+    mViewFormat = nullptr;
>+
>+    renderer->releaseObject(getStoredQueueSerial(), &mBuffer);
>+    renderer->releaseObject(getStoredQueueSerial(), &mBufferView);
>+    renderer->releaseObject(getStoredQueueSerial(), &mDeviceMemory);
>+}
>+
>+void BufferHelper::onWrite(VkAccessFlagBits writeAccessType)
>+{
>+    if (mCurrentReadAccess != 0 || mCurrentWriteAccess != 0)
>+    {
>+        addGlobalMemoryBarrier(mCurrentReadAccess | mCurrentWriteAccess, writeAccessType);
>+    }
>+
>+    mCurrentWriteAccess = writeAccessType;
>+    mCurrentReadAccess  = 0;
>+}
>+
>+angle::Result BufferHelper::copyFromBuffer(Context *context,
>+                                           const Buffer &buffer,
>+                                           const VkBufferCopy &copyRegion)
>+{
>+    // 'recordCommands' will implicitly stop any reads from using the old buffer data.
>+    vk::CommandBuffer *commandBuffer = nullptr;
>+    ANGLE_TRY(recordCommands(context, &commandBuffer));
>+
>+    if (mCurrentReadAccess != 0 || mCurrentWriteAccess != 0)
>+    {
>+        // Insert a barrier to ensure reads/writes are complete.
>+        // Use a global memory barrier to keep things simple.
>+        VkMemoryBarrier memoryBarrier = {};
>+        memoryBarrier.sType           = VK_STRUCTURE_TYPE_MEMORY_BARRIER;
>+        memoryBarrier.srcAccessMask   = mCurrentReadAccess | mCurrentWriteAccess;
>+        memoryBarrier.dstAccessMask   = VK_ACCESS_TRANSFER_WRITE_BIT;
>+
>+        commandBuffer->pipelineBarrier(VK_PIPELINE_STAGE_ALL_COMMANDS_BIT,
>+                                       VK_PIPELINE_STAGE_TRANSFER_BIT, 0, 1, &memoryBarrier, 0,
>+                                       nullptr, 0, nullptr);
>+
>+        mCurrentWriteAccess = VK_ACCESS_TRANSFER_WRITE_BIT;
>+        mCurrentReadAccess  = 0;
>+    }
>+
>+    commandBuffer->copyBuffer(buffer, mBuffer, 1, &copyRegion);
>+
>+    return angle::Result::Continue;
>+}
>+
>+angle::Result BufferHelper::initBufferView(Context *context, const Format &format)
>+{
>+    ASSERT(format.valid());
>+
>+    if (mBufferView.valid())
>+    {
>+        ASSERT(mViewFormat->vkBufferFormat == format.vkBufferFormat);
>+        return angle::Result::Continue;
>+    }
>+
>+    VkBufferViewCreateInfo viewCreateInfo = {};
>+    viewCreateInfo.sType                  = VK_STRUCTURE_TYPE_BUFFER_VIEW_CREATE_INFO;
>+    viewCreateInfo.buffer                 = mBuffer.getHandle();
>+    viewCreateInfo.format                 = format.vkBufferFormat;
>+    viewCreateInfo.offset                 = 0;
>+    viewCreateInfo.range                  = mSize;
>+
>+    ANGLE_VK_TRY(context, mBufferView.init(context->getDevice(), viewCreateInfo));
>+    mViewFormat = &format;
>+
>+    return angle::Result::Continue;
>+}
>+
>+angle::Result BufferHelper::mapImpl(Context *context)
>+{
>+    ANGLE_VK_TRY(context, mDeviceMemory.map(context->getDevice(), 0, mSize, 0, &mMappedMemory));
>+    return angle::Result::Continue;
>+}
>+
>+void BufferHelper::unmap(VkDevice device)
>+{
>+    if (mMappedMemory)
>+    {
>+        mDeviceMemory.unmap(device);
>+        mMappedMemory = nullptr;
>+    }
>+}
>+
>+angle::Result BufferHelper::flush(Context *context, size_t offset, size_t size)
>+{
>+    bool hostVisible  = mMemoryPropertyFlags & VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT;
>+    bool hostCoherent = mMemoryPropertyFlags & VK_MEMORY_PROPERTY_HOST_COHERENT_BIT;
>+    if (hostVisible && !hostCoherent)
>+    {
>+        VkMappedMemoryRange range = {};
>+        range.sType               = VK_STRUCTURE_TYPE_MAPPED_MEMORY_RANGE;
>+        range.memory              = mDeviceMemory.getHandle();
>+        range.offset              = offset;
>+        range.size                = size;
>+        ANGLE_VK_TRY(context, vkFlushMappedMemoryRanges(context->getDevice(), 1, &range));
>+    }
>+    return angle::Result::Continue;
>+}
>+
>+angle::Result BufferHelper::invalidate(Context *context, size_t offset, size_t size)
>+{
>+    bool hostVisible  = mMemoryPropertyFlags & VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT;
>+    bool hostCoherent = mMemoryPropertyFlags & VK_MEMORY_PROPERTY_HOST_COHERENT_BIT;
>+    if (hostVisible && !hostCoherent)
>+    {
>+        VkMappedMemoryRange range = {};
>+        range.sType               = VK_STRUCTURE_TYPE_MAPPED_MEMORY_RANGE;
>+        range.memory              = mDeviceMemory.getHandle();
>+        range.offset              = offset;
>+        range.size                = size;
>+        ANGLE_VK_TRY(context, vkInvalidateMappedMemoryRanges(context->getDevice(), 1, &range));
>+    }
>+    return angle::Result::Continue;
>+}
>+
>+namespace
>+{
>+constexpr VkBufferUsageFlags kStagingBufferFlags =
>+    VK_BUFFER_USAGE_TRANSFER_SRC_BIT | VK_BUFFER_USAGE_TRANSFER_DST_BIT;
>+constexpr size_t kStagingBufferSize = 1024 * 16;
>+
>+}  // anonymous namespace
>+
>+// ImageHelper implementation.
>+ImageHelper::ImageHelper()
>+    : CommandGraphResource(CommandGraphResourceType::Image),
>+      mFormat(nullptr),
>+      mSamples(0),
>+      mCurrentLayout(ImageLayout::Undefined),
>+      mCurrentQueueFamilyIndex(std::numeric_limits<uint32_t>::max()),
>+      mLayerCount(0),
>+      mLevelCount(0),
>+      mStagingBuffer(kStagingBufferFlags, kStagingBufferSize, true)
>+{}
>+
>+ImageHelper::ImageHelper(ImageHelper &&other)
>+    : CommandGraphResource(CommandGraphResourceType::Image),
>+      mImage(std::move(other.mImage)),
>+      mDeviceMemory(std::move(other.mDeviceMemory)),
>+      mExtents(other.mExtents),
>+      mFormat(other.mFormat),
>+      mSamples(other.mSamples),
>+      mCurrentLayout(other.mCurrentLayout),
>+      mCurrentQueueFamilyIndex(other.mCurrentQueueFamilyIndex),
>+      mLayerCount(other.mLayerCount),
>+      mLevelCount(other.mLevelCount),
>+      mStagingBuffer(std::move(other.mStagingBuffer)),
>+      mSubresourceUpdates(std::move(other.mSubresourceUpdates))
>+{
>+    ASSERT(this != &other);
>+    other.mCurrentLayout = ImageLayout::Undefined;
>+    other.mLayerCount    = 0;
>+    other.mLevelCount    = 0;
>+}
>+
>+ImageHelper::~ImageHelper()
>+{
>+    ASSERT(!valid());
>+}
>+
>+void ImageHelper::initStagingBuffer(RendererVk *renderer, const vk::Format &format)
>+{
>+    mStagingBuffer.updateAlignment(renderer, format.getImageCopyBufferAlignment());
>+}
>+
>+angle::Result ImageHelper::init(Context *context,
>+                                gl::TextureType textureType,
>+                                const gl::Extents &extents,
>+                                const Format &format,
>+                                GLint samples,
>+                                VkImageUsageFlags usage,
>+                                uint32_t mipLevels,
>+                                uint32_t layerCount)
>+{
>+    return initExternal(context, textureType, extents, format, samples, usage,
>+                        ImageLayout::Undefined, nullptr, mipLevels, layerCount);
>+}
>+
>+angle::Result ImageHelper::initExternal(Context *context,
>+                                        gl::TextureType textureType,
>+                                        const gl::Extents &extents,
>+                                        const Format &format,
>+                                        GLint samples,
>+                                        VkImageUsageFlags usage,
>+                                        ImageLayout initialLayout,
>+                                        const void *externalImageCreateInfo,
>+                                        uint32_t mipLevels,
>+                                        uint32_t layerCount)
>+{
>+    ASSERT(!valid());
>+
>+    // Validate that the input layerCount is compatible with the texture type
>+    ASSERT(textureType != gl::TextureType::_3D || layerCount == 1);
>+    ASSERT(textureType != gl::TextureType::External || layerCount == 1);
>+    ASSERT(textureType != gl::TextureType::Rectangle || layerCount == 1);
>+    ASSERT(textureType != gl::TextureType::CubeMap || layerCount == gl::kCubeFaceCount);
>+
>+    mExtents    = extents;
>+    mFormat     = &format;
>+    mSamples    = samples;
>+    mLayerCount = layerCount;
>+    mLevelCount = mipLevels;
>+
>+    VkImageCreateInfo imageInfo     = {};
>+    imageInfo.sType                 = VK_STRUCTURE_TYPE_IMAGE_CREATE_INFO;
>+    imageInfo.pNext                 = externalImageCreateInfo;
>+    imageInfo.flags                 = GetImageCreateFlags(textureType);
>+    imageInfo.imageType             = gl_vk::GetImageType(textureType);
>+    imageInfo.format                = format.vkImageFormat;
>+    imageInfo.extent.width          = static_cast<uint32_t>(extents.width);
>+    imageInfo.extent.height         = static_cast<uint32_t>(extents.height);
>+    imageInfo.extent.depth          = 1;
>+    imageInfo.mipLevels             = mipLevels;
>+    imageInfo.arrayLayers           = mLayerCount;
>+    imageInfo.samples               = gl_vk::GetSamples(samples);
>+    imageInfo.tiling                = VK_IMAGE_TILING_OPTIMAL;
>+    imageInfo.usage                 = usage;
>+    imageInfo.sharingMode           = VK_SHARING_MODE_EXCLUSIVE;
>+    imageInfo.queueFamilyIndexCount = 0;
>+    imageInfo.pQueueFamilyIndices   = nullptr;
>+    imageInfo.initialLayout         = kImageMemoryBarrierData[initialLayout].layout;
>+
>+    mCurrentLayout = initialLayout;
>+
>+    ANGLE_VK_TRY(context, mImage.init(context->getDevice(), imageInfo));
>+
>+    return angle::Result::Continue;
>+}
>+
>+void ImageHelper::releaseImage(RendererVk *renderer)
>+{
>+    renderer->releaseObject(getStoredQueueSerial(), &mImage);
>+    renderer->releaseObject(getStoredQueueSerial(), &mDeviceMemory);
>+}
>+
>+void ImageHelper::releaseStagingBuffer(RendererVk *renderer)
>+{
>+    // Remove updates that never made it to the texture.
>+    for (SubresourceUpdate &update : mSubresourceUpdates)
>+    {
>+        update.release(renderer);
>+    }
>+    mStagingBuffer.release(renderer);
>+    mSubresourceUpdates.clear();
>+}
>+
>+void ImageHelper::resetImageWeakReference()
>+{
>+    mImage.reset();
>+}
>+
>+angle::Result ImageHelper::initMemory(Context *context,
>+                                      const MemoryProperties &memoryProperties,
>+                                      VkMemoryPropertyFlags flags)
>+{
>+    // TODO(jmadill): Memory sub-allocation. http://anglebug.com/2162
>+    ANGLE_TRY(AllocateImageMemory(context, flags, nullptr, &mImage, &mDeviceMemory));
>+    mCurrentQueueFamilyIndex = context->getRenderer()->getQueueFamilyIndex();
>+    return angle::Result::Continue;
>+}
>+
>+angle::Result ImageHelper::initExternalMemory(Context *context,
>+                                              const MemoryProperties &memoryProperties,
>+                                              const VkMemoryRequirements &memoryRequirements,
>+                                              const void *extraAllocationInfo,
>+                                              uint32_t currentQueueFamilyIndex,
>+
>+                                              VkMemoryPropertyFlags flags)
>+{
>+    // TODO(jmadill): Memory sub-allocation. http://anglebug.com/2162
>+    ANGLE_TRY(AllocateImageMemoryWithRequirements(context, flags, memoryRequirements,
>+                                                  extraAllocationInfo, &mImage, &mDeviceMemory));
>+    mCurrentQueueFamilyIndex = currentQueueFamilyIndex;
>+    return angle::Result::Continue;
>+}
>+
>+angle::Result ImageHelper::initImageView(Context *context,
>+                                         gl::TextureType textureType,
>+                                         VkImageAspectFlags aspectMask,
>+                                         const gl::SwizzleState &swizzleMap,
>+                                         ImageView *imageViewOut,
>+                                         uint32_t baseMipLevel,
>+                                         uint32_t levelCount)
>+{
>+    return initLayerImageView(context, textureType, aspectMask, swizzleMap, imageViewOut,
>+                              baseMipLevel, levelCount, 0, mLayerCount);
>+}
>+
>+angle::Result ImageHelper::initLayerImageView(Context *context,
>+                                              gl::TextureType textureType,
>+                                              VkImageAspectFlags aspectMask,
>+                                              const gl::SwizzleState &swizzleMap,
>+                                              ImageView *imageViewOut,
>+                                              uint32_t baseMipLevel,
>+                                              uint32_t levelCount,
>+                                              uint32_t baseArrayLayer,
>+                                              uint32_t layerCount)
>+{
>+    VkImageViewCreateInfo viewInfo = {};
>+    viewInfo.sType                 = VK_STRUCTURE_TYPE_IMAGE_VIEW_CREATE_INFO;
>+    viewInfo.flags                 = 0;
>+    viewInfo.image                 = mImage.getHandle();
>+    viewInfo.viewType              = gl_vk::GetImageViewType(textureType);
>+    viewInfo.format                = mFormat->vkImageFormat;
>+    if (swizzleMap.swizzleRequired())
>+    {
>+        viewInfo.components.r = gl_vk::GetSwizzle(swizzleMap.swizzleRed);
>+        viewInfo.components.g = gl_vk::GetSwizzle(swizzleMap.swizzleGreen);
>+        viewInfo.components.b = gl_vk::GetSwizzle(swizzleMap.swizzleBlue);
>+        viewInfo.components.a = gl_vk::GetSwizzle(swizzleMap.swizzleAlpha);
>+    }
>+    else
>+    {
>+        viewInfo.components.r = VK_COMPONENT_SWIZZLE_IDENTITY;
>+        viewInfo.components.g = VK_COMPONENT_SWIZZLE_IDENTITY;
>+        viewInfo.components.b = VK_COMPONENT_SWIZZLE_IDENTITY;
>+        viewInfo.components.a = VK_COMPONENT_SWIZZLE_IDENTITY;
>+    }
>+    viewInfo.subresourceRange.aspectMask     = aspectMask;
>+    viewInfo.subresourceRange.baseMipLevel   = baseMipLevel;
>+    viewInfo.subresourceRange.levelCount     = levelCount;
>+    viewInfo.subresourceRange.baseArrayLayer = baseArrayLayer;
>+    viewInfo.subresourceRange.layerCount     = layerCount;
>+
>+    ANGLE_VK_TRY(context, imageViewOut->init(context->getDevice(), viewInfo));
>+    return angle::Result::Continue;
>+}
>+
>+void ImageHelper::destroy(VkDevice device)
>+{
>+    mImage.destroy(device);
>+    mDeviceMemory.destroy(device);
>+    mCurrentLayout = ImageLayout::Undefined;
>+    mLayerCount    = 0;
>+    mLevelCount    = 0;
>+}
>+
>+void ImageHelper::init2DWeakReference(VkImage handle,
>+                                      const gl::Extents &extents,
>+                                      const Format &format,
>+                                      GLint samples)
>+{
>+    ASSERT(!valid());
>+
>+    mExtents       = extents;
>+    mFormat        = &format;
>+    mSamples       = samples;
>+    mCurrentLayout = ImageLayout::Undefined;
>+    mLayerCount    = 1;
>+    mLevelCount    = 1;
>+
>+    mImage.setHandle(handle);
>+}
>+
>+angle::Result ImageHelper::init2DStaging(Context *context,
>+                                         const MemoryProperties &memoryProperties,
>+                                         const gl::Extents &extents,
>+                                         const Format &format,
>+                                         VkImageUsageFlags usage,
>+                                         uint32_t layerCount)
>+{
>+    ASSERT(!valid());
>+
>+    mExtents    = extents;
>+    mFormat     = &format;
>+    mSamples    = 1;
>+    mLayerCount = layerCount;
>+    mLevelCount = 1;
>+
>+    mCurrentLayout = ImageLayout::Undefined;
>+
>+    VkImageCreateInfo imageInfo     = {};
>+    imageInfo.sType                 = VK_STRUCTURE_TYPE_IMAGE_CREATE_INFO;
>+    imageInfo.flags                 = 0;
>+    imageInfo.imageType             = VK_IMAGE_TYPE_2D;
>+    imageInfo.format                = format.vkImageFormat;
>+    imageInfo.extent.width          = static_cast<uint32_t>(extents.width);
>+    imageInfo.extent.height         = static_cast<uint32_t>(extents.height);
>+    imageInfo.extent.depth          = 1;
>+    imageInfo.mipLevels             = 1;
>+    imageInfo.arrayLayers           = mLayerCount;
>+    imageInfo.samples               = gl_vk::GetSamples(mSamples);
>+    imageInfo.tiling                = VK_IMAGE_TILING_OPTIMAL;
>+    imageInfo.usage                 = usage;
>+    imageInfo.sharingMode           = VK_SHARING_MODE_EXCLUSIVE;
>+    imageInfo.queueFamilyIndexCount = 0;
>+    imageInfo.pQueueFamilyIndices   = nullptr;
>+    imageInfo.initialLayout         = getCurrentLayout();
>+
>+    ANGLE_VK_TRY(context, mImage.init(context->getDevice(), imageInfo));
>+
>+    // Allocate and bind device-local memory.
>+    VkMemoryPropertyFlags memoryPropertyFlags = VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT;
>+    ANGLE_TRY(initMemory(context, memoryProperties, memoryPropertyFlags));
>+
>+    return angle::Result::Continue;
>+}
>+
>+VkImageAspectFlags ImageHelper::getAspectFlags() const
>+{
>+    return GetFormatAspectFlags(mFormat->imageFormat());
>+}
>+
>+void ImageHelper::dumpResources(Serial serial, std::vector<GarbageObject> *garbageQueue)
>+{
>+    mImage.dumpResources(serial, garbageQueue);
>+    mDeviceMemory.dumpResources(serial, garbageQueue);
>+}
>+
>+VkImageLayout ImageHelper::getCurrentLayout() const
>+{
>+    return kImageMemoryBarrierData[mCurrentLayout].layout;
>+}
>+
>+gl::Extents ImageHelper::getLevelExtents2D(uint32_t level) const
>+{
>+    int width  = std::max(mExtents.width >> level, 1);
>+    int height = std::max(mExtents.height >> level, 1);
>+
>+    return gl::Extents(width, height, 1);
>+}
>+
>+bool ImageHelper::isLayoutChangeNecessary(ImageLayout newLayout) const
>+{
>+    const ImageMemoryBarrierData &layoutData = kImageMemoryBarrierData[mCurrentLayout];
>+
>+    // If transitioning to the same read-only layout (RAR), don't generate a barrier.
>+    bool sameLayoutReadAfterRead = mCurrentLayout == newLayout && layoutData.isReadOnlyAccess;
>+
>+    return !sameLayoutReadAfterRead;
>+}
>+
>+void ImageHelper::changeLayout(VkImageAspectFlags aspectMask,
>+                               ImageLayout newLayout,
>+                               vk::CommandBuffer *commandBuffer)
>+{
>+    if (!isLayoutChangeNecessary(newLayout))
>+    {
>+        return;
>+    }
>+
>+    forceChangeLayoutAndQueue(aspectMask, newLayout, mCurrentQueueFamilyIndex, commandBuffer);
>+}
>+
>+void ImageHelper::changeLayoutAndQueue(VkImageAspectFlags aspectMask,
>+                                       ImageLayout newLayout,
>+                                       uint32_t newQueueFamilyIndex,
>+                                       vk::CommandBuffer *commandBuffer)
>+{
>+    ASSERT(isQueueChangeNeccesary(newQueueFamilyIndex));
>+    forceChangeLayoutAndQueue(aspectMask, newLayout, newQueueFamilyIndex, commandBuffer);
>+}
>+
>+void ImageHelper::forceChangeLayoutAndQueue(VkImageAspectFlags aspectMask,
>+                                            ImageLayout newLayout,
>+                                            uint32_t newQueueFamilyIndex,
>+                                            vk::CommandBuffer *commandBuffer)
>+{
>+
>+    const ImageMemoryBarrierData &transitionFrom = kImageMemoryBarrierData[mCurrentLayout];
>+    const ImageMemoryBarrierData &transitionTo   = kImageMemoryBarrierData[newLayout];
>+
>+    VkImageMemoryBarrier imageMemoryBarrier = {};
>+    imageMemoryBarrier.sType                = VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER;
>+    imageMemoryBarrier.srcAccessMask        = transitionFrom.srcAccessMask;
>+    imageMemoryBarrier.dstAccessMask        = transitionTo.dstAccessMask;
>+    imageMemoryBarrier.oldLayout            = transitionFrom.layout;
>+    imageMemoryBarrier.newLayout            = transitionTo.layout;
>+    imageMemoryBarrier.srcQueueFamilyIndex  = mCurrentQueueFamilyIndex;
>+    imageMemoryBarrier.dstQueueFamilyIndex  = newQueueFamilyIndex;
>+    imageMemoryBarrier.image                = mImage.getHandle();
>+
>+    // TODO(jmadill): Is this needed for mipped/layer images?
>+    imageMemoryBarrier.subresourceRange.aspectMask     = aspectMask;
>+    imageMemoryBarrier.subresourceRange.baseMipLevel   = 0;
>+    imageMemoryBarrier.subresourceRange.levelCount     = mLevelCount;
>+    imageMemoryBarrier.subresourceRange.baseArrayLayer = 0;
>+    imageMemoryBarrier.subresourceRange.layerCount     = mLayerCount;
>+
>+    commandBuffer->imageBarrier(transitionFrom.srcStageMask, transitionTo.dstStageMask,
>+                                &imageMemoryBarrier);
>+    mCurrentLayout           = newLayout;
>+    mCurrentQueueFamilyIndex = newQueueFamilyIndex;
>+}
>+
>+void ImageHelper::clearColor(const VkClearColorValue &color,
>+                             uint32_t baseMipLevel,
>+                             uint32_t levelCount,
>+                             uint32_t baseArrayLayer,
>+                             uint32_t layerCount,
>+                             vk::CommandBuffer *commandBuffer)
>+{
>+    ASSERT(valid());
>+
>+    changeLayout(VK_IMAGE_ASPECT_COLOR_BIT, ImageLayout::TransferDst, commandBuffer);
>+
>+    VkImageSubresourceRange range = {};
>+    range.aspectMask              = VK_IMAGE_ASPECT_COLOR_BIT;
>+    range.baseMipLevel            = baseMipLevel;
>+    range.levelCount              = levelCount;
>+    range.baseArrayLayer          = baseArrayLayer;
>+    range.layerCount              = layerCount;
>+
>+    commandBuffer->clearColorImage(mImage, getCurrentLayout(), color, 1, &range);
>+}
>+
>+void ImageHelper::clearDepthStencil(VkImageAspectFlags imageAspectFlags,
>+                                    VkImageAspectFlags clearAspectFlags,
>+                                    const VkClearDepthStencilValue &depthStencil,
>+                                    vk::CommandBuffer *commandBuffer)
>+{
>+    ASSERT(valid());
>+
>+    changeLayout(imageAspectFlags, ImageLayout::TransferDst, commandBuffer);
>+
>+    VkImageSubresourceRange clearRange = {
>+        /*aspectMask*/ clearAspectFlags,
>+        /*baseMipLevel*/ 0,
>+        /*levelCount*/ 1,
>+        /*baseArrayLayer*/ 0,
>+        /*layerCount*/ 1,
>+    };
>+
>+    commandBuffer->clearDepthStencilImage(mImage, getCurrentLayout(), depthStencil, 1, &clearRange);
>+}
>+
>+void ImageHelper::clear(const VkClearValue &value,
>+                        uint32_t mipLevel,
>+                        uint32_t baseArrayLayer,
>+                        uint32_t layerCount,
>+                        vk::CommandBuffer *commandBuffer)
>+{
>+    const angle::Format &angleFormat = mFormat->angleFormat();
>+    bool isDepthStencil              = angleFormat.depthBits > 0 || angleFormat.stencilBits > 0;
>+
>+    if (isDepthStencil)
>+    {
>+        ASSERT(mipLevel == 0 && baseArrayLayer == 0 && layerCount == 1);
>+        const VkImageAspectFlags aspect = vk::GetDepthStencilAspectFlags(mFormat->imageFormat());
>+        clearDepthStencil(aspect, aspect, value.depthStencil, commandBuffer);
>+    }
>+    else
>+    {
>+        clearColor(value.color, mipLevel, 1, baseArrayLayer, layerCount, commandBuffer);
>+    }
>+}
>+
>+gl::Extents ImageHelper::getSize(const gl::ImageIndex &index) const
>+{
>+    ASSERT(mExtents.depth == 1);
>+    GLint mipLevel = index.getLevelIndex();
>+    // Level 0 should be the size of the extents, after that every time you increase a level
>+    // you shrink the extents by half.
>+    return gl::Extents(std::max(1, mExtents.width >> mipLevel),
>+                       std::max(1, mExtents.height >> mipLevel), mExtents.depth);
>+}
>+
>+// static
>+void ImageHelper::Copy(ImageHelper *srcImage,
>+                       ImageHelper *dstImage,
>+                       const gl::Offset &srcOffset,
>+                       const gl::Offset &dstOffset,
>+                       const gl::Extents &copySize,
>+                       const VkImageSubresourceLayers &srcSubresource,
>+                       const VkImageSubresourceLayers &dstSubresource,
>+                       vk::CommandBuffer *commandBuffer)
>+{
>+    ASSERT(commandBuffer->valid() && srcImage->valid() && dstImage->valid());
>+
>+    ASSERT(srcImage->getCurrentLayout() == VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL);
>+    ASSERT(dstImage->getCurrentLayout() == VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL);
>+
>+    VkImageCopy region    = {};
>+    region.srcSubresource = srcSubresource;
>+    region.srcOffset.x    = srcOffset.x;
>+    region.srcOffset.y    = srcOffset.y;
>+    region.srcOffset.z    = srcOffset.z;
>+    region.dstSubresource = dstSubresource;
>+    region.dstOffset.x    = dstOffset.x;
>+    region.dstOffset.y    = dstOffset.y;
>+    region.dstOffset.z    = dstOffset.z;
>+    region.extent.width   = copySize.width;
>+    region.extent.height  = copySize.height;
>+    region.extent.depth   = copySize.depth;
>+
>+    commandBuffer->copyImage(srcImage->getImage(), srcImage->getCurrentLayout(),
>+                             dstImage->getImage(), dstImage->getCurrentLayout(), 1, &region);
>+}
>+
>+angle::Result ImageHelper::generateMipmapsWithBlit(ContextVk *contextVk, GLuint maxLevel)
>+{
>+    vk::CommandBuffer *commandBuffer = nullptr;
>+    ANGLE_TRY(recordCommands(contextVk, &commandBuffer));
>+
>+    changeLayout(VK_IMAGE_ASPECT_COLOR_BIT, ImageLayout::TransferDst, commandBuffer);
>+
>+    // We are able to use blitImage since the image format we are using supports it. This
>+    // is a faster way we can generate the mips.
>+    int32_t mipWidth  = mExtents.width;
>+    int32_t mipHeight = mExtents.height;
>+
>+    // Manually manage the image memory barrier because it uses a lot more parameters than our
>+    // usual one.
>+    VkImageMemoryBarrier barrier            = {};
>+    barrier.sType                           = VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER;
>+    barrier.image                           = mImage.getHandle();
>+    barrier.srcQueueFamilyIndex             = VK_QUEUE_FAMILY_IGNORED;
>+    barrier.dstQueueFamilyIndex             = VK_QUEUE_FAMILY_IGNORED;
>+    barrier.subresourceRange.aspectMask     = VK_IMAGE_ASPECT_COLOR_BIT;
>+    barrier.subresourceRange.baseArrayLayer = 0;
>+    barrier.subresourceRange.layerCount     = mLayerCount;
>+    barrier.subresourceRange.levelCount     = 1;
>+
>+    for (uint32_t mipLevel = 1; mipLevel <= maxLevel; mipLevel++)
>+    {
>+        int32_t nextMipWidth  = std::max<int32_t>(1, mipWidth >> 1);
>+        int32_t nextMipHeight = std::max<int32_t>(1, mipHeight >> 1);
>+
>+        barrier.subresourceRange.baseMipLevel = mipLevel - 1;
>+        barrier.oldLayout                     = getCurrentLayout();
>+        barrier.newLayout                     = VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL;
>+        barrier.srcAccessMask                 = VK_ACCESS_TRANSFER_WRITE_BIT;
>+        barrier.dstAccessMask                 = VK_ACCESS_TRANSFER_READ_BIT;
>+
>+        // We can do it for all layers at once.
>+        commandBuffer->imageBarrier(VK_PIPELINE_STAGE_TRANSFER_BIT, VK_PIPELINE_STAGE_TRANSFER_BIT,
>+                                    &barrier);
>+        VkImageBlit blit                   = {};
>+        blit.srcOffsets[0]                 = {0, 0, 0};
>+        blit.srcOffsets[1]                 = {mipWidth, mipHeight, 1};
>+        blit.srcSubresource.aspectMask     = VK_IMAGE_ASPECT_COLOR_BIT;
>+        blit.srcSubresource.mipLevel       = mipLevel - 1;
>+        blit.srcSubresource.baseArrayLayer = 0;
>+        blit.srcSubresource.layerCount     = mLayerCount;
>+        blit.dstOffsets[0]                 = {0, 0, 0};
>+        blit.dstOffsets[1]                 = {nextMipWidth, nextMipHeight, 1};
>+        blit.dstSubresource.aspectMask     = VK_IMAGE_ASPECT_COLOR_BIT;
>+        blit.dstSubresource.mipLevel       = mipLevel;
>+        blit.dstSubresource.baseArrayLayer = 0;
>+        blit.dstSubresource.layerCount     = mLayerCount;
>+
>+        mipWidth  = nextMipWidth;
>+        mipHeight = nextMipHeight;
>+
>+        commandBuffer->blitImage(mImage, VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL, mImage,
>+                                 VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, 1, &blit, VK_FILTER_LINEAR);
>+    }
>+
>+    // Transition the last mip level to the same layout as all the other ones, so we can declare
>+    // our whole image layout to be SRC_OPTIMAL.
>+    barrier.subresourceRange.baseMipLevel = maxLevel;
>+    barrier.oldLayout                     = VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL;
>+    barrier.newLayout                     = VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL;
>+
>+    // We can do it for all layers at once.
>+    commandBuffer->imageBarrier(VK_PIPELINE_STAGE_TRANSFER_BIT, VK_PIPELINE_STAGE_TRANSFER_BIT,
>+                                &barrier);
>+    // This is just changing the internal state of the image helper so that the next call
>+    // to changeLayout will use this layout as the "oldLayout" argument.
>+    mCurrentLayout = ImageLayout::TransferSrc;
>+
>+    return angle::Result::Continue;
>+}
>+
>+void ImageHelper::removeStagedUpdates(RendererVk *renderer, const gl::ImageIndex &index)
>+{
>+    // Find any staged updates for this index and removes them from the pending list.
>+    uint32_t levelIndex = index.getLevelIndex();
>+    uint32_t layerIndex = index.hasLayer() ? index.getLayerIndex() : 0;
>+
>+    for (size_t index = 0; index < mSubresourceUpdates.size();)
>+    {
>+        auto update = mSubresourceUpdates.begin() + index;
>+        if (update->isUpdateToLayerLevel(layerIndex, levelIndex))
>+        {
>+            update->release(renderer);
>+            mSubresourceUpdates.erase(update);
>+        }
>+        else
>+        {
>+            index++;
>+        }
>+    }
>+}
>+
>+angle::Result ImageHelper::stageSubresourceUpdate(ContextVk *contextVk,
>+                                                  const gl::ImageIndex &index,
>+                                                  const gl::Extents &extents,
>+                                                  const gl::Offset &offset,
>+                                                  const gl::InternalFormat &formatInfo,
>+                                                  const gl::PixelUnpackState &unpack,
>+                                                  GLenum type,
>+                                                  const uint8_t *pixels,
>+                                                  const vk::Format &vkFormat)
>+{
>+    GLuint inputRowPitch = 0;
>+    ANGLE_VK_CHECK_MATH(contextVk, formatInfo.computeRowPitch(type, extents.width, unpack.alignment,
>+                                                              unpack.rowLength, &inputRowPitch));
>+
>+    GLuint inputDepthPitch = 0;
>+    ANGLE_VK_CHECK_MATH(contextVk, formatInfo.computeDepthPitch(extents.height, unpack.imageHeight,
>+                                                                inputRowPitch, &inputDepthPitch));
>+
>+    // Note: skip images for 3D Textures.
>+    ASSERT(!index.usesTex3D());
>+    bool applySkipImages = false;
>+
>+    GLuint inputSkipBytes = 0;
>+    ANGLE_VK_CHECK_MATH(contextVk,
>+                        formatInfo.computeSkipBytes(type, inputRowPitch, inputDepthPitch, unpack,
>+                                                    applySkipImages, &inputSkipBytes));
>+
>+    const angle::Format &storageFormat = vkFormat.imageFormat();
>+
>+    size_t outputRowPitch;
>+    size_t outputDepthPitch;
>+    uint32_t bufferRowLength;
>+    uint32_t bufferImageHeight;
>+
>+    if (storageFormat.isBlock)
>+    {
>+        const gl::InternalFormat &storageFormatInfo = vkFormat.getInternalFormatInfo(type);
>+        GLuint rowPitch;
>+        GLuint depthPitch;
>+
>+        ANGLE_VK_CHECK_MATH(contextVk, storageFormatInfo.computeCompressedImageSize(
>+                                           gl::Extents(extents.width, 1, 1), &rowPitch));
>+        ANGLE_VK_CHECK_MATH(contextVk,
>+                            storageFormatInfo.computeCompressedImageSize(
>+                                gl::Extents(extents.width, extents.height, 1), &depthPitch));
>+
>+        outputRowPitch   = rowPitch;
>+        outputDepthPitch = depthPitch;
>+
>+        angle::CheckedNumeric<uint32_t> checkedRowLength =
>+            rx::CheckedRoundUp<uint32_t>(extents.width, storageFormatInfo.compressedBlockWidth);
>+        angle::CheckedNumeric<uint32_t> checkedImageHeight =
>+            rx::CheckedRoundUp<uint32_t>(extents.height, storageFormatInfo.compressedBlockHeight);
>+
>+        ANGLE_VK_CHECK_MATH(contextVk, checkedRowLength.IsValid());
>+        ANGLE_VK_CHECK_MATH(contextVk, checkedImageHeight.IsValid());
>+
>+        bufferRowLength   = checkedRowLength.ValueOrDie();
>+        bufferImageHeight = checkedImageHeight.ValueOrDie();
>+    }
>+    else
>+    {
>+        ASSERT(storageFormat.pixelBytes != 0);
>+
>+        outputRowPitch   = storageFormat.pixelBytes * extents.width;
>+        outputDepthPitch = outputRowPitch * extents.height;
>+
>+        bufferRowLength   = extents.width;
>+        bufferImageHeight = extents.height;
>+    }
>+
>+    VkBuffer bufferHandle = VK_NULL_HANDLE;
>+
>+    uint8_t *stagingPointer    = nullptr;
>+    VkDeviceSize stagingOffset = 0;
>+    size_t allocationSize      = outputDepthPitch * extents.depth;
>+    ANGLE_TRY(mStagingBuffer.allocate(contextVk, allocationSize, &stagingPointer, &bufferHandle,
>+                                      &stagingOffset, nullptr));
>+
>+    const uint8_t *source = pixels + inputSkipBytes;
>+
>+    LoadImageFunctionInfo loadFunction = vkFormat.textureLoadFunctions(type);
>+
>+    loadFunction.loadFunction(extents.width, extents.height, extents.depth, source, inputRowPitch,
>+                              inputDepthPitch, stagingPointer, outputRowPitch, outputDepthPitch);
>+
>+    VkBufferImageCopy copy = {};
>+
>+    copy.bufferOffset                    = stagingOffset;
>+    copy.bufferRowLength                 = bufferRowLength;
>+    copy.bufferImageHeight               = bufferImageHeight;
>+    copy.imageSubresource.aspectMask     = VK_IMAGE_ASPECT_COLOR_BIT;
>+    copy.imageSubresource.mipLevel       = index.getLevelIndex();
>+    copy.imageSubresource.baseArrayLayer = index.hasLayer() ? index.getLayerIndex() : 0;
>+    copy.imageSubresource.layerCount     = index.getLayerCount();
>+
>+    gl_vk::GetOffset(offset, &copy.imageOffset);
>+    gl_vk::GetExtent(extents, &copy.imageExtent);
>+
>+    mSubresourceUpdates.emplace_back(bufferHandle, copy);
>+
>+    return angle::Result::Continue;
>+}
>+
>+angle::Result ImageHelper::stageSubresourceUpdateAndGetData(ContextVk *contextVk,
>+                                                            size_t allocationSize,
>+                                                            const gl::ImageIndex &imageIndex,
>+                                                            const gl::Extents &extents,
>+                                                            const gl::Offset &offset,
>+                                                            uint8_t **destData)
>+{
>+    VkBuffer bufferHandle;
>+    VkDeviceSize stagingOffset = 0;
>+    ANGLE_TRY(mStagingBuffer.allocate(contextVk, allocationSize, destData, &bufferHandle,
>+                                      &stagingOffset, nullptr));
>+
>+    VkBufferImageCopy copy               = {};
>+    copy.bufferOffset                    = stagingOffset;
>+    copy.bufferRowLength                 = extents.width;
>+    copy.bufferImageHeight               = extents.height;
>+    copy.imageSubresource.aspectMask     = VK_IMAGE_ASPECT_COLOR_BIT;
>+    copy.imageSubresource.mipLevel       = imageIndex.getLevelIndex();
>+    copy.imageSubresource.baseArrayLayer = imageIndex.hasLayer() ? imageIndex.getLayerIndex() : 0;
>+    copy.imageSubresource.layerCount     = imageIndex.getLayerCount();
>+
>+    gl_vk::GetOffset(offset, &copy.imageOffset);
>+    gl_vk::GetExtent(extents, &copy.imageExtent);
>+
>+    mSubresourceUpdates.emplace_back(bufferHandle, copy);
>+
>+    return angle::Result::Continue;
>+}
>+
>+angle::Result ImageHelper::stageSubresourceUpdateFromFramebuffer(
>+    const gl::Context *context,
>+    const gl::ImageIndex &index,
>+    const gl::Rectangle &sourceArea,
>+    const gl::Offset &dstOffset,
>+    const gl::Extents &dstExtent,
>+    const gl::InternalFormat &formatInfo,
>+    FramebufferVk *framebufferVk)
>+{
>+    ContextVk *contextVk = vk::GetImpl(context);
>+
>+    // If the extents and offset is outside the source image, we need to clip.
>+    gl::Rectangle clippedRectangle;
>+    const gl::Extents readExtents = framebufferVk->getReadImageExtents();
>+    if (!ClipRectangle(sourceArea, gl::Rectangle(0, 0, readExtents.width, readExtents.height),
>+                       &clippedRectangle))
>+    {
>+        // Empty source area, nothing to do.
>+        return angle::Result::Continue;
>+    }
>+
>+    bool isViewportFlipEnabled = contextVk->isViewportFlipEnabledForDrawFBO();
>+    if (isViewportFlipEnabled)
>+    {
>+        clippedRectangle.y = readExtents.height - clippedRectangle.y - clippedRectangle.height;
>+    }
>+
>+    // 1- obtain a buffer handle to copy to
>+    RendererVk *renderer = contextVk->getRenderer();
>+
>+    const vk::Format &vkFormat         = renderer->getFormat(formatInfo.sizedInternalFormat);
>+    const angle::Format &storageFormat = vkFormat.imageFormat();
>+    LoadImageFunctionInfo loadFunction = vkFormat.textureLoadFunctions(formatInfo.type);
>+
>+    size_t outputRowPitch   = storageFormat.pixelBytes * clippedRectangle.width;
>+    size_t outputDepthPitch = outputRowPitch * clippedRectangle.height;
>+
>+    VkBuffer bufferHandle = VK_NULL_HANDLE;
>+
>+    uint8_t *stagingPointer    = nullptr;
>+    VkDeviceSize stagingOffset = 0;
>+
>+    // The destination is only one layer deep.
>+    size_t allocationSize = outputDepthPitch;
>+    ANGLE_TRY(mStagingBuffer.allocate(contextVk, allocationSize, &stagingPointer, &bufferHandle,
>+                                      &stagingOffset, nullptr));
>+
>+    const angle::Format &copyFormat =
>+        GetFormatFromFormatType(formatInfo.internalFormat, formatInfo.type);
>+    PackPixelsParams params(clippedRectangle, copyFormat, static_cast<GLuint>(outputRowPitch),
>+                            isViewportFlipEnabled, nullptr, 0);
>+
>+    // 2- copy the source image region to the pixel buffer using a cpu readback
>+    if (loadFunction.requiresConversion)
>+    {
>+        // When a conversion is required, we need to use the loadFunction to read from a temporary
>+        // buffer instead so its an even slower path.
>+        size_t bufferSize =
>+            storageFormat.pixelBytes * clippedRectangle.width * clippedRectangle.height;
>+        angle::MemoryBuffer *memoryBuffer = nullptr;
>+        ANGLE_VK_CHECK_ALLOC(contextVk, context->getScratchBuffer(bufferSize, &memoryBuffer));
>+
>+        // Read into the scratch buffer
>+        ANGLE_TRY(framebufferVk->readPixelsImpl(
>+            contextVk, clippedRectangle, params, VK_IMAGE_ASPECT_COLOR_BIT,
>+            framebufferVk->getColorReadRenderTarget(), memoryBuffer->data()));
>+
>+        // Load from scratch buffer to our pixel buffer
>+        loadFunction.loadFunction(clippedRectangle.width, clippedRectangle.height, 1,
>+                                  memoryBuffer->data(), outputRowPitch, 0, stagingPointer,
>+                                  outputRowPitch, 0);
>+    }
>+    else
>+    {
>+        // We read directly from the framebuffer into our pixel buffer.
>+        ANGLE_TRY(framebufferVk->readPixelsImpl(
>+            contextVk, clippedRectangle, params, VK_IMAGE_ASPECT_COLOR_BIT,
>+            framebufferVk->getColorReadRenderTarget(), stagingPointer));
>+    }
>+
>+    // 3- enqueue the destination image subresource update
>+    VkBufferImageCopy copyToImage               = {};
>+    copyToImage.bufferOffset                    = static_cast<VkDeviceSize>(stagingOffset);
>+    copyToImage.bufferRowLength                 = 0;  // Tightly packed data can be specified as 0.
>+    copyToImage.bufferImageHeight               = clippedRectangle.height;
>+    copyToImage.imageSubresource.aspectMask     = VK_IMAGE_ASPECT_COLOR_BIT;
>+    copyToImage.imageSubresource.mipLevel       = index.getLevelIndex();
>+    copyToImage.imageSubresource.baseArrayLayer = index.hasLayer() ? index.getLayerIndex() : 0;
>+    copyToImage.imageSubresource.layerCount     = index.getLayerCount();
>+    gl_vk::GetOffset(dstOffset, &copyToImage.imageOffset);
>+    gl_vk::GetExtent(dstExtent, &copyToImage.imageExtent);
>+
>+    // 3- enqueue the destination image subresource update
>+    mSubresourceUpdates.emplace_back(bufferHandle, copyToImage);
>+    return angle::Result::Continue;
>+}
>+
>+void ImageHelper::stageSubresourceUpdateFromImage(vk::ImageHelper *image,
>+                                                  const gl::ImageIndex &index,
>+                                                  const gl::Offset &destOffset,
>+                                                  const gl::Extents &extents)
>+{
>+    VkImageCopy copyToImage                   = {};
>+    copyToImage.srcSubresource.aspectMask     = VK_IMAGE_ASPECT_COLOR_BIT;
>+    copyToImage.srcSubresource.layerCount     = index.getLayerCount();
>+    copyToImage.dstSubresource.aspectMask     = VK_IMAGE_ASPECT_COLOR_BIT;
>+    copyToImage.dstSubresource.mipLevel       = index.getLevelIndex();
>+    copyToImage.dstSubresource.baseArrayLayer = index.hasLayer() ? index.getLayerIndex() : 0;
>+    copyToImage.dstSubresource.layerCount     = index.getLayerCount();
>+    gl_vk::GetOffset(destOffset, &copyToImage.dstOffset);
>+    gl_vk::GetExtent(extents, &copyToImage.extent);
>+
>+    mSubresourceUpdates.emplace_back(image, copyToImage);
>+}
>+
>+void ImageHelper::stageSubresourceRobustClear(const gl::ImageIndex &index,
>+                                              const angle::Format &format)
>+{
>+    stageSubresourceClear(index, format, kWebGLInitColorValue, kWebGLInitDepthStencilValue);
>+}
>+
>+void ImageHelper::stageSubresourceEmulatedClear(const gl::ImageIndex &index,
>+                                                const angle::Format &format)
>+{
>+    stageSubresourceClear(index, format, kEmulatedInitColorValue, kWebGLInitDepthStencilValue);
>+}
>+
>+angle::Result ImageHelper::clearIfEmulatedFormat(Context *context,
>+                                                 const gl::ImageIndex &index,
>+                                                 const Format &format)
>+{
>+    if (format.hasEmulatedImageChannels())
>+    {
>+        stageSubresourceEmulatedClear(index, format.angleFormat());
>+        ANGLE_TRY(flushAllStagedUpdates(context));
>+    }
>+
>+    return angle::Result::Continue;
>+}
>+
>+void ImageHelper::stageSubresourceClear(const gl::ImageIndex &index,
>+                                        const angle::Format &format,
>+                                        const VkClearColorValue &colorValue,
>+                                        const VkClearDepthStencilValue &depthStencilValue)
>+{
>+    VkClearValue clearValue;
>+
>+    bool isDepthStencil = format.depthBits > 0 || format.stencilBits > 0;
>+    if (isDepthStencil)
>+    {
>+        clearValue.depthStencil = depthStencilValue;
>+    }
>+    else
>+    {
>+        clearValue.color = colorValue;
>+    }
>+
>+    // Note that clears can arrive out of order from the front-end with respect to staged changes,
>+    // but they are intended to be done first.
>+    mSubresourceUpdates.emplace(mSubresourceUpdates.begin(), clearValue, index);
>+}
>+
>+angle::Result ImageHelper::allocateStagingMemory(ContextVk *contextVk,
>+                                                 size_t sizeInBytes,
>+                                                 uint8_t **ptrOut,
>+                                                 VkBuffer *handleOut,
>+                                                 VkDeviceSize *offsetOut,
>+                                                 bool *newBufferAllocatedOut)
>+{
>+    return mStagingBuffer.allocate(contextVk, sizeInBytes, ptrOut, handleOut, offsetOut,
>+                                   newBufferAllocatedOut);
>+}
>+
>+angle::Result ImageHelper::flushStagedUpdates(Context *context,
>+                                              uint32_t levelStart,
>+                                              uint32_t levelEnd,
>+                                              uint32_t layerStart,
>+                                              uint32_t layerEnd,
>+                                              vk::CommandBuffer *commandBuffer)
>+{
>+    if (mSubresourceUpdates.empty())
>+    {
>+        return angle::Result::Continue;
>+    }
>+
>+    RendererVk *renderer = context->getRenderer();
>+
>+    ANGLE_TRY(mStagingBuffer.flush(context));
>+
>+    std::vector<SubresourceUpdate> updatesToKeep;
>+    const VkImageAspectFlags aspectFlags = GetFormatAspectFlags(mFormat->imageFormat());
>+
>+    for (SubresourceUpdate &update : mSubresourceUpdates)
>+    {
>+        ASSERT(update.updateSource == SubresourceUpdate::UpdateSource::Clear ||
>+               (update.updateSource == SubresourceUpdate::UpdateSource::Buffer &&
>+                update.buffer.bufferHandle != VK_NULL_HANDLE) ||
>+               (update.updateSource == SubresourceUpdate::UpdateSource::Image &&
>+                update.image.image != nullptr && update.image.image->valid()));
>+
>+        uint32_t updateMipLevel;
>+        uint32_t updateBaseLayer;
>+        uint32_t updateLayerCount;
>+        if (update.updateSource == SubresourceUpdate::UpdateSource::Clear)
>+        {
>+            updateMipLevel   = update.clear.levelIndex;
>+            updateBaseLayer  = update.clear.layerIndex;
>+            updateLayerCount = update.clear.layerCount;
>+            if (updateLayerCount == static_cast<uint32_t>(gl::ImageIndex::kEntireLevel))
>+            {
>+                updateLayerCount = mLayerCount;
>+            }
>+        }
>+        else
>+        {
>+            const VkImageSubresourceLayers &dstSubresource = update.dstSubresource();
>+            updateMipLevel                                 = dstSubresource.mipLevel;
>+            updateBaseLayer                                = dstSubresource.baseArrayLayer;
>+            updateLayerCount                               = dstSubresource.layerCount;
>+        }
>+
>+        // If the update level is not within the requested range, skip the update.
>+        const bool isUpdateLevelOutsideRange =
>+            updateMipLevel < levelStart || updateMipLevel >= levelEnd;
>+        // If the update layers don't intersect the requested layers, skip the update.
>+        const bool areUpdateLayersOutsideRange =
>+            updateBaseLayer + updateLayerCount <= layerStart || updateBaseLayer >= layerEnd;
>+
>+        if (isUpdateLevelOutsideRange || areUpdateLayersOutsideRange)
>+        {
>+            updatesToKeep.emplace_back(update);
>+            continue;
>+        }
>+
>+        // Conservatively add a barrier between every update.  This is to avoid races when updating
>+        // the same subresource.  A possible optimization could be to only issue this barrier when
>+        // an overlap in updates is observed.
>+        changeLayout(aspectFlags, vk::ImageLayout::TransferDst, commandBuffer);
>+
>+        if (update.updateSource == SubresourceUpdate::UpdateSource::Clear)
>+        {
>+            clear(update.clear.value, updateMipLevel, updateBaseLayer, updateLayerCount,
>+                  commandBuffer);
>+        }
>+        else if (update.updateSource == SubresourceUpdate::UpdateSource::Buffer)
>+        {
>+            commandBuffer->copyBufferToImage(update.buffer.bufferHandle, mImage, getCurrentLayout(),
>+                                             1, &update.buffer.copyRegion);
>+        }
>+        else
>+        {
>+            update.image.image->changeLayout(aspectFlags, vk::ImageLayout::TransferSrc,
>+                                             commandBuffer);
>+
>+            update.image.image->addReadDependency(this);
>+
>+            commandBuffer->copyImage(update.image.image->getImage(),
>+                                     update.image.image->getCurrentLayout(), mImage,
>+                                     getCurrentLayout(), 1, &update.image.copyRegion);
>+        }
>+
>+        update.release(renderer);
>+    }
>+
>+    // Only remove the updates that were actually applied to the image.
>+    mSubresourceUpdates = std::move(updatesToKeep);
>+
>+    if (mSubresourceUpdates.empty())
>+    {
>+        mStagingBuffer.releaseRetainedBuffers(context->getRenderer());
>+    }
>+
>+    return angle::Result::Continue;
>+}
>+
>+angle::Result ImageHelper::flushAllStagedUpdates(Context *context)
>+{
>+    // Clear the image.
>+    vk::CommandBuffer *commandBuffer = nullptr;
>+    ANGLE_TRY(recordCommands(context, &commandBuffer));
>+    return flushStagedUpdates(context, 0, mLevelCount, 0, mLayerCount, commandBuffer);
>+}
>+
>+// ImageHelper::SubresourceUpdate implementation
>+ImageHelper::SubresourceUpdate::SubresourceUpdate()
>+    : updateSource(UpdateSource::Buffer), buffer{VK_NULL_HANDLE}
>+{}
>+
>+ImageHelper::SubresourceUpdate::SubresourceUpdate(VkBuffer bufferHandleIn,
>+                                                  const VkBufferImageCopy &copyRegionIn)
>+    : updateSource(UpdateSource::Buffer), buffer{bufferHandleIn, copyRegionIn}
>+{}
>+
>+ImageHelper::SubresourceUpdate::SubresourceUpdate(vk::ImageHelper *imageIn,
>+                                                  const VkImageCopy &copyRegionIn)
>+    : updateSource(UpdateSource::Image), image{imageIn, copyRegionIn}
>+{}
>+
>+ImageHelper::SubresourceUpdate::SubresourceUpdate(const VkClearValue &clearValue,
>+                                                  const gl::ImageIndex &imageIndex)
>+    : updateSource(UpdateSource::Clear)
>+{
>+    clear.value      = clearValue;
>+    clear.levelIndex = imageIndex.getLevelIndex();
>+    clear.layerIndex = imageIndex.hasLayer() ? imageIndex.getLayerIndex() : 0;
>+    clear.layerCount = imageIndex.getLayerCount();
>+}
>+
>+ImageHelper::SubresourceUpdate::SubresourceUpdate(const SubresourceUpdate &other)
>+    : updateSource(other.updateSource)
>+{
>+    if (updateSource == UpdateSource::Clear)
>+    {
>+        clear = other.clear;
>+    }
>+    else if (updateSource == UpdateSource::Buffer)
>+    {
>+        buffer = other.buffer;
>+    }
>+    else
>+    {
>+        image = other.image;
>+    }
>+}
>+
>+void ImageHelper::SubresourceUpdate::release(RendererVk *renderer)
>+{
>+    if (updateSource == UpdateSource::Image)
>+    {
>+        image.image->releaseImage(renderer);
>+        image.image->releaseStagingBuffer(renderer);
>+        SafeDelete(image.image);
>+    }
>+}
>+
>+bool ImageHelper::SubresourceUpdate::isUpdateToLayerLevel(uint32_t layerIndex,
>+                                                          uint32_t levelIndex) const
>+{
>+    if (updateSource == UpdateSource::Clear)
>+    {
>+        return clear.levelIndex == levelIndex && clear.layerIndex == layerIndex;
>+    }
>+
>+    const VkImageSubresourceLayers &dst = dstSubresource();
>+    return dst.baseArrayLayer == layerIndex && dst.mipLevel == levelIndex;
>+}
>+
>+// FramebufferHelper implementation.
>+FramebufferHelper::FramebufferHelper() : CommandGraphResource(CommandGraphResourceType::Framebuffer)
>+{}
>+
>+FramebufferHelper::~FramebufferHelper() = default;
>+
>+angle::Result FramebufferHelper::init(ContextVk *contextVk,
>+                                      const VkFramebufferCreateInfo &createInfo)
>+{
>+    ANGLE_VK_TRY(contextVk, mFramebuffer.init(contextVk->getDevice(), createInfo));
>+    return angle::Result::Continue;
>+}
>+
>+void FramebufferHelper::release(RendererVk *renderer)
>+{
>+    renderer->releaseObject(getStoredQueueSerial(), &mFramebuffer);
>+}
>+
>+// ShaderProgramHelper implementation.
>+ShaderProgramHelper::ShaderProgramHelper() = default;
>+
>+ShaderProgramHelper::~ShaderProgramHelper() = default;
>+
>+bool ShaderProgramHelper::valid() const
>+{
>+    // This will need to be extended for compute shader support.
>+    return mShaders[gl::ShaderType::Vertex].valid();
>+}
>+
>+void ShaderProgramHelper::destroy(VkDevice device)
>+{
>+    mGraphicsPipelines.destroy(device);
>+    mComputePipeline.destroy(device);
>+    for (BindingPointer<ShaderAndSerial> &shader : mShaders)
>+    {
>+        shader.reset();
>+    }
>+}
>+
>+void ShaderProgramHelper::release(RendererVk *renderer)
>+{
>+    mGraphicsPipelines.release(renderer);
>+    renderer->releaseObject(mComputePipeline.getSerial(), &mComputePipeline.get());
>+    for (BindingPointer<ShaderAndSerial> &shader : mShaders)
>+    {
>+        shader.reset();
>+    }
>+}
>+
>+void ShaderProgramHelper::setShader(gl::ShaderType shaderType, RefCounted<ShaderAndSerial> *shader)
>+{
>+    mShaders[shaderType].set(shader);
>+}
>+
>+angle::Result ShaderProgramHelper::getComputePipeline(Context *context,
>+                                                      const PipelineLayout &pipelineLayout,
>+                                                      PipelineAndSerial **pipelineOut)
>+{
>+    if (mComputePipeline.valid())
>+    {
>+        *pipelineOut = &mComputePipeline;
>+        return angle::Result::Continue;
>+    }
>+
>+    RendererVk *renderer = context->getRenderer();
>+
>+    VkPipelineShaderStageCreateInfo shaderStage = {};
>+    VkComputePipelineCreateInfo createInfo      = {};
>+
>+    shaderStage.sType               = VK_STRUCTURE_TYPE_PIPELINE_SHADER_STAGE_CREATE_INFO;
>+    shaderStage.flags               = 0;
>+    shaderStage.stage               = VK_SHADER_STAGE_COMPUTE_BIT;
>+    shaderStage.module              = mShaders[gl::ShaderType::Compute].get().get().getHandle();
>+    shaderStage.pName               = "main";
>+    shaderStage.pSpecializationInfo = nullptr;
>+
>+    createInfo.sType              = VK_STRUCTURE_TYPE_COMPUTE_PIPELINE_CREATE_INFO;
>+    createInfo.flags              = 0;
>+    createInfo.stage              = shaderStage;
>+    createInfo.layout             = pipelineLayout.getHandle();
>+    createInfo.basePipelineHandle = VK_NULL_HANDLE;
>+    createInfo.basePipelineIndex  = 0;
>+
>+    ANGLE_VK_TRY(context, mComputePipeline.get().initCompute(context->getDevice(), createInfo,
>+                                                             renderer->getPipelineCache()));
>+
>+    *pipelineOut = &mComputePipeline;
>+    return angle::Result::Continue;
>+}
>+
>+}  // namespace vk
>+}  // namespace rx
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/vk_helpers.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/vk_helpers.h
>new file mode 100644
>index 00000000000..fc437f6e9d3
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/vk_helpers.h
>@@ -0,0 +1,914 @@
>+//
>+// Copyright 2018 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// vk_helpers:
>+//   Helper utilitiy classes that manage Vulkan resources.
>+
>+#ifndef LIBANGLE_RENDERER_VULKAN_VK_HELPERS_H_
>+#define LIBANGLE_RENDERER_VULKAN_VK_HELPERS_H_
>+
>+#include "libANGLE/renderer/vulkan/CommandGraph.h"
>+#include "libANGLE/renderer/vulkan/vk_utils.h"
>+
>+namespace gl
>+{
>+class ImageIndex;
>+}  // namespace gl
>+
>+namespace rx
>+{
>+namespace vk
>+{
>+// A dynamic buffer is conceptually an infinitely long buffer. Each time you write to the buffer,
>+// you will always write to a previously unused portion. After a series of writes, you must flush
>+// the buffer data to the device. Buffer lifetime currently assumes that each new allocation will
>+// last as long or longer than each prior allocation.
>+//
>+// Dynamic buffers are used to implement a variety of data streaming operations in Vulkan, such
>+// as for immediate vertex array and element array data, uniform updates, and other dynamic data.
>+class BufferHelper;
>+class DynamicBuffer : angle::NonCopyable
>+{
>+  public:
>+    DynamicBuffer(VkBufferUsageFlags usage, size_t minSize, bool hostVisible);
>+    DynamicBuffer(DynamicBuffer &&other);
>+    ~DynamicBuffer();
>+
>+    // Init is called after the buffer creation so that the alignment can be specified later.
>+    void init(size_t alignment, RendererVk *renderer);
>+
>+    // This call will allocate a new region at the end of the buffer. It internally may trigger
>+    // a new buffer to be created (which is returned in the optional parameter
>+    // `newBufferAllocatedOut`).  The new region will be in the returned buffer at given offset. If
>+    // a memory pointer is given, the buffer will be automatically map()ed.
>+    angle::Result allocate(Context *context,
>+                           size_t sizeInBytes,
>+                           uint8_t **ptrOut,
>+                           VkBuffer *bufferOut,
>+                           VkDeviceSize *offsetOut,
>+                           bool *newBufferAllocatedOut);
>+
>+    // After a sequence of writes, call flush to ensure the data is visible to the device.
>+    angle::Result flush(Context *context);
>+
>+    // After a sequence of writes, call invalidate to ensure the data is visible to the host.
>+    angle::Result invalidate(Context *context);
>+
>+    // This releases resources when they might currently be in use.
>+    void release(RendererVk *renderer);
>+
>+    // This releases all the buffers that have been allocated since this was last called.
>+    void releaseRetainedBuffers(RendererVk *renderer);
>+
>+    // This frees resources immediately.
>+    void destroy(VkDevice device);
>+
>+    BufferHelper *getCurrentBuffer() { return mBuffer; }
>+
>+    size_t getAlignment() { return mAlignment; }
>+    void updateAlignment(RendererVk *renderer, size_t alignment);
>+
>+    // For testing only!
>+    void setMinimumSizeForTesting(size_t minSize);
>+
>+  private:
>+    void reset();
>+
>+    VkBufferUsageFlags mUsage;
>+    bool mHostVisible;
>+    size_t mMinSize;
>+    BufferHelper *mBuffer;
>+    uint32_t mNextAllocationOffset;
>+    uint32_t mLastFlushOrInvalidateOffset;
>+    size_t mSize;
>+    size_t mAlignment;
>+
>+    std::vector<BufferHelper *> mRetainedBuffers;
>+};
>+
>+// Uses DescriptorPool to allocate descriptor sets as needed. If a descriptor pool becomes full, we
>+// allocate new pools internally as needed. RendererVk takes care of the lifetime of the discarded
>+// pools. Note that we used a fixed layout for descriptor pools in ANGLE. Uniform buffers must
>+// use set zero and combined Image Samplers must use set 1. We conservatively count each new set
>+// using the maximum number of descriptor sets and buffers with each allocation. Currently: 2
>+// (Vertex/Fragment) uniform buffers and 64 (MAX_ACTIVE_TEXTURES) image/samplers.
>+
>+// Shared handle to a descriptor pool. Each helper is allocated from the dynamic descriptor pool.
>+// Can be used to share descriptor pools between multiple ProgramVks and the ContextVk.
>+class DescriptorPoolHelper
>+{
>+  public:
>+    DescriptorPoolHelper();
>+    ~DescriptorPoolHelper();
>+
>+    bool valid() { return mDescriptorPool.valid(); }
>+
>+    bool hasCapacity(uint32_t descriptorSetCount) const;
>+    angle::Result init(Context *context,
>+                       const std::vector<VkDescriptorPoolSize> &poolSizes,
>+                       uint32_t maxSets);
>+    void destroy(VkDevice device);
>+
>+    angle::Result allocateSets(Context *context,
>+                               const VkDescriptorSetLayout *descriptorSetLayout,
>+                               uint32_t descriptorSetCount,
>+                               VkDescriptorSet *descriptorSetsOut);
>+
>+    void updateSerial(Serial serial) { mMostRecentSerial = serial; }
>+
>+    Serial getSerial() const { return mMostRecentSerial; }
>+
>+  private:
>+    uint32_t mFreeDescriptorSets;
>+    DescriptorPool mDescriptorPool;
>+    Serial mMostRecentSerial;
>+};
>+
>+using RefCountedDescriptorPoolHelper  = RefCounted<DescriptorPoolHelper>;
>+using RefCountedDescriptorPoolBinding = BindingPointer<DescriptorPoolHelper>;
>+
>+class DynamicDescriptorPool final : angle::NonCopyable
>+{
>+  public:
>+    DynamicDescriptorPool();
>+    ~DynamicDescriptorPool();
>+
>+    // The DynamicDescriptorPool only handles one pool size at this time.
>+    // Note that setSizes[i].descriptorCount is expected to be the number of descriptors in
>+    // an individual set.  The pool size will be calculated accordingly.
>+    angle::Result init(Context *context,
>+                       const VkDescriptorPoolSize *setSizes,
>+                       uint32_t setSizeCount);
>+    void destroy(VkDevice device);
>+
>+    // We use the descriptor type to help count the number of free sets.
>+    // By convention, sets are indexed according to the constants in vk_cache_utils.h.
>+    angle::Result allocateSets(Context *context,
>+                               const VkDescriptorSetLayout *descriptorSetLayout,
>+                               uint32_t descriptorSetCount,
>+                               RefCountedDescriptorPoolBinding *bindingOut,
>+                               VkDescriptorSet *descriptorSetsOut);
>+
>+    // For testing only!
>+    void setMaxSetsPerPoolForTesting(uint32_t maxSetsPerPool);
>+
>+  private:
>+    angle::Result allocateNewPool(Context *context);
>+
>+    uint32_t mMaxSetsPerPool;
>+    size_t mCurrentPoolIndex;
>+    std::vector<RefCountedDescriptorPoolHelper *> mDescriptorPools;
>+    std::vector<VkDescriptorPoolSize> mPoolSizes;
>+};
>+
>+template <typename Pool>
>+class DynamicallyGrowingPool : angle::NonCopyable
>+{
>+  public:
>+    DynamicallyGrowingPool();
>+    virtual ~DynamicallyGrowingPool();
>+
>+    bool isValid() { return mPoolSize > 0; }
>+
>+  protected:
>+    angle::Result initEntryPool(Context *context, uint32_t poolSize);
>+    void destroyEntryPool();
>+
>+    // Checks to see if any pool is already free, in which case it sets it as current pool and
>+    // returns true.
>+    bool findFreeEntryPool(Context *context);
>+
>+    // Allocates a new entry and initializes it with the given pool.
>+    angle::Result allocateNewEntryPool(Context *context, Pool &&pool);
>+
>+    // Called by the implementation whenever an entry is freed.
>+    void onEntryFreed(Context *context, size_t poolIndex);
>+
>+    // The pool size, to know when a pool is completely freed.
>+    uint32_t mPoolSize;
>+
>+    std::vector<Pool> mPools;
>+
>+    struct PoolStats
>+    {
>+        // A count corresponding to each pool indicating how many of its allocated entries
>+        // have been freed. Once that value reaches mPoolSize for each pool, that pool is considered
>+        // free and reusable.  While keeping a bitset would allow allocation of each index, the
>+        // slight runtime overhead of finding free indices is not worth the slight memory overhead
>+        // of creating new pools when unnecessary.
>+        uint32_t freedCount;
>+        // The serial of the renderer is stored on each object free to make sure no
>+        // new allocations are made from the pool until it's not in use.
>+        Serial serial;
>+    };
>+    std::vector<PoolStats> mPoolStats;
>+
>+    // Index into mPools indicating pool we are currently allocating from.
>+    size_t mCurrentPool;
>+    // Index inside mPools[mCurrentPool] indicating which index can be allocated next.
>+    uint32_t mCurrentFreeEntry;
>+};
>+
>+// DynamicQueryPool allocates indices out of QueryPool as needed.  Once a QueryPool is exhausted,
>+// another is created.  The query pools live permanently, but are recycled as indices get freed.
>+
>+// These are arbitrary default sizes for query pools.
>+constexpr uint32_t kDefaultOcclusionQueryPoolSize = 64;
>+constexpr uint32_t kDefaultTimestampQueryPoolSize = 64;
>+
>+class QueryHelper;
>+
>+class DynamicQueryPool final : public DynamicallyGrowingPool<QueryPool>
>+{
>+  public:
>+    DynamicQueryPool();
>+    ~DynamicQueryPool() override;
>+
>+    angle::Result init(Context *context, VkQueryType type, uint32_t poolSize);
>+    void destroy(VkDevice device);
>+
>+    angle::Result allocateQuery(Context *context, QueryHelper *queryOut);
>+    void freeQuery(Context *context, QueryHelper *query);
>+
>+    // Special allocator that doesn't work with QueryHelper, which is a CommandGraphResource.
>+    // Currently only used with RendererVk::GpuEventQuery.
>+    angle::Result allocateQuery(Context *context, size_t *poolIndex, uint32_t *queryIndex);
>+    void freeQuery(Context *context, size_t poolIndex, uint32_t queryIndex);
>+
>+    const QueryPool *getQueryPool(size_t index) const { return &mPools[index]; }
>+
>+  private:
>+    angle::Result allocateNewPool(Context *context);
>+
>+    // Information required to create new query pools
>+    VkQueryType mQueryType;
>+};
>+
>+// Queries in vulkan are identified by the query pool and an index for a query within that pool.
>+// Unlike other pools, such as descriptor pools where an allocation returns an independent object
>+// from the pool, the query allocations are not done through a Vulkan function and are only an
>+// integer index.
>+//
>+// Furthermore, to support arbitrarily large number of queries, DynamicQueryPool creates query pools
>+// of a fixed size as needed and allocates indices within those pools.
>+//
>+// The QueryHelper class below keeps the pool and index pair together.
>+class QueryHelper final
>+{
>+  public:
>+    QueryHelper();
>+    ~QueryHelper();
>+
>+    void init(const DynamicQueryPool *dynamicQueryPool,
>+              const size_t queryPoolIndex,
>+              uint32_t query);
>+    void deinit();
>+
>+    const QueryPool *getQueryPool() const
>+    {
>+        return mDynamicQueryPool ? mDynamicQueryPool->getQueryPool(mQueryPoolIndex) : nullptr;
>+    }
>+    uint32_t getQuery() const { return mQuery; }
>+
>+    // Used only by DynamicQueryPool.
>+    size_t getQueryPoolIndex() const { return mQueryPoolIndex; }
>+
>+    void beginQuery(vk::Context *context);
>+    void endQuery(vk::Context *context);
>+    void writeTimestamp(vk::Context *context);
>+
>+    Serial getStoredQueueSerial() { return mMostRecentSerial; }
>+    bool hasPendingWork(RendererVk *renderer);
>+
>+  private:
>+    const DynamicQueryPool *mDynamicQueryPool;
>+    size_t mQueryPoolIndex;
>+    uint32_t mQuery;
>+    Serial mMostRecentSerial;
>+};
>+
>+// DynamicSemaphorePool allocates semaphores as needed.  It uses a std::vector
>+// as a pool to allocate many semaphores at once.  The pools live permanently,
>+// but are recycled as semaphores get freed.
>+
>+// These are arbitrary default sizes for semaphore pools.
>+constexpr uint32_t kDefaultSemaphorePoolSize = 64;
>+
>+class SemaphoreHelper;
>+
>+class DynamicSemaphorePool final : public DynamicallyGrowingPool<std::vector<Semaphore>>
>+{
>+  public:
>+    DynamicSemaphorePool();
>+    ~DynamicSemaphorePool() override;
>+
>+    angle::Result init(Context *context, uint32_t poolSize);
>+    void destroy(VkDevice device);
>+
>+    bool isValid() { return mPoolSize > 0; }
>+
>+    // autoFree can be used to allocate a semaphore that's expected to be freed at the end of the
>+    // frame.  This renders freeSemaphore unnecessary and saves an eventual search.
>+    angle::Result allocateSemaphore(Context *context, SemaphoreHelper *semaphoreOut);
>+    void freeSemaphore(Context *context, SemaphoreHelper *semaphore);
>+
>+  private:
>+    angle::Result allocateNewPool(Context *context);
>+};
>+
>+// Semaphores that are allocated from the semaphore pool are encapsulated in a helper object,
>+// keeping track of where in the pool they are allocated from.
>+class SemaphoreHelper final : angle::NonCopyable
>+{
>+  public:
>+    SemaphoreHelper();
>+    ~SemaphoreHelper();
>+
>+    SemaphoreHelper(SemaphoreHelper &&other);
>+    SemaphoreHelper &operator=(SemaphoreHelper &&other);
>+
>+    void init(const size_t semaphorePoolIndex, const Semaphore *semaphore);
>+    void deinit();
>+
>+    const Semaphore *getSemaphore() const { return mSemaphore; }
>+
>+    // Used only by DynamicSemaphorePool.
>+    size_t getSemaphorePoolIndex() const { return mSemaphorePoolIndex; }
>+
>+  private:
>+    size_t mSemaphorePoolIndex;
>+    const Semaphore *mSemaphore;
>+};
>+
>+// This class' responsibility is to create index buffers needed to support line loops in Vulkan.
>+// In the setup phase of drawing, the createIndexBuffer method should be called with the
>+// current draw call parameters. If an element array buffer is bound for an indexed draw, use
>+// createIndexBufferFromElementArrayBuffer.
>+//
>+// If the user wants to draw a loop between [v1, v2, v3], we will create an indexed buffer with
>+// these indexes: [0, 1, 2, 3, 0] to emulate the loop.
>+class LineLoopHelper final : angle::NonCopyable
>+{
>+  public:
>+    LineLoopHelper(RendererVk *renderer);
>+    ~LineLoopHelper();
>+
>+    angle::Result getIndexBufferForDrawArrays(ContextVk *contextVk,
>+                                              uint32_t clampedVertexCount,
>+                                              GLint firstVertex,
>+                                              vk::BufferHelper **bufferOut,
>+                                              VkDeviceSize *offsetOut);
>+
>+    angle::Result getIndexBufferForElementArrayBuffer(ContextVk *contextVk,
>+                                                      BufferVk *elementArrayBufferVk,
>+                                                      gl::DrawElementsType glIndexType,
>+                                                      int indexCount,
>+                                                      intptr_t elementArrayOffset,
>+                                                      vk::BufferHelper **bufferOut,
>+                                                      VkDeviceSize *bufferOffsetOut);
>+
>+    angle::Result streamIndices(ContextVk *contextVk,
>+                                gl::DrawElementsType glIndexType,
>+                                GLsizei indexCount,
>+                                const uint8_t *srcPtr,
>+                                vk::BufferHelper **bufferOut,
>+                                VkDeviceSize *bufferOffsetOut);
>+
>+    void release(RendererVk *renderer);
>+    void destroy(VkDevice device);
>+
>+    static void Draw(uint32_t count, vk::CommandBuffer *commandBuffer);
>+
>+  private:
>+    DynamicBuffer mDynamicIndexBuffer;
>+};
>+
>+class FramebufferHelper;
>+
>+class BufferHelper final : public CommandGraphResource
>+{
>+  public:
>+    BufferHelper();
>+    ~BufferHelper() override;
>+
>+    angle::Result init(Context *context,
>+                       const VkBufferCreateInfo &createInfo,
>+                       VkMemoryPropertyFlags memoryPropertyFlags);
>+    void destroy(VkDevice device);
>+    void release(RendererVk *renderer);
>+
>+    bool valid() const { return mBuffer.valid(); }
>+    const Buffer &getBuffer() const { return mBuffer; }
>+    const DeviceMemory &getDeviceMemory() const { return mDeviceMemory; }
>+
>+    // Helpers for setting the graph dependencies *and* setting the appropriate barrier.
>+    ANGLE_INLINE void onRead(CommandGraphResource *reader, VkAccessFlagBits readAccessType)
>+    {
>+        addReadDependency(reader);
>+
>+        if (mCurrentWriteAccess != 0 && (mCurrentReadAccess & readAccessType) == 0)
>+        {
>+            reader->addGlobalMemoryBarrier(mCurrentWriteAccess, readAccessType);
>+            mCurrentReadAccess |= readAccessType;
>+        }
>+    }
>+
>+    void onWrite(VkAccessFlagBits writeAccessType);
>+
>+    // Also implicitly sets up the correct barriers.
>+    angle::Result copyFromBuffer(Context *context,
>+                                 const Buffer &buffer,
>+                                 const VkBufferCopy &copyRegion);
>+
>+    // Note: currently only one view is allowed.  If needs be, multiple views can be created
>+    // based on format.
>+    angle::Result initBufferView(Context *context, const Format &format);
>+
>+    const BufferView &getBufferView() const
>+    {
>+        ASSERT(mBufferView.valid());
>+        return mBufferView;
>+    }
>+
>+    const Format &getViewFormat() const
>+    {
>+        ASSERT(mViewFormat);
>+        return *mViewFormat;
>+    }
>+
>+    angle::Result map(Context *context, uint8_t **ptrOut)
>+    {
>+        if (!mMappedMemory)
>+        {
>+            ANGLE_TRY(mapImpl(context));
>+        }
>+        *ptrOut = mMappedMemory;
>+        return angle::Result::Continue;
>+    }
>+    void unmap(VkDevice device);
>+
>+    // After a sequence of writes, call flush to ensure the data is visible to the device.
>+    angle::Result flush(Context *context, size_t offset, size_t size);
>+
>+    // After a sequence of writes, call invalidate to ensure the data is visible to the host.
>+    angle::Result invalidate(Context *context, size_t offset, size_t size);
>+
>+  private:
>+    angle::Result mapImpl(Context *context);
>+
>+    // Vulkan objects.
>+    Buffer mBuffer;
>+    BufferView mBufferView;
>+    DeviceMemory mDeviceMemory;
>+
>+    // Cached properties.
>+    VkMemoryPropertyFlags mMemoryPropertyFlags;
>+    VkDeviceSize mSize;
>+    uint8_t *mMappedMemory;
>+    const Format *mViewFormat;
>+
>+    // For memory barriers.
>+    VkFlags mCurrentWriteAccess;
>+    VkFlags mCurrentReadAccess;
>+};
>+
>+// Imagine an image going through a few layout transitions:
>+//
>+//           srcStage 1    dstStage 2          srcStage 2     dstStage 3
>+//  Layout 1 ------Transition 1-----> Layout 2 ------Transition 2------> Layout 3
>+//           srcAccess 1  dstAccess 2          srcAccess 2   dstAccess 3
>+//   \_________________  ___________________/
>+//                     \/
>+//               A transition
>+//
>+// Every transition requires 6 pieces of information: from/to layouts, src/dst stage masks and
>+// src/dst access masks.  At the moment we decide to transition the image to Layout 2 (i.e.
>+// Transition 1), we need to have Layout 1, srcStage 1 and srcAccess 1 stored as history of the
>+// image.  To perform the transition, we need to know Layout 2, dstStage 2 and dstAccess 2.
>+// Additionally, we need to know srcStage 2 and srcAccess 2 to retain them for the next transition.
>+//
>+// That is, with the history kept, on every new transition we need 5 pieces of new information:
>+// layout/dstStage/dstAccess to transition into the layout, and srcStage/srcAccess for the future
>+// transition out from it.  Given the small number of possible combinations of these values, an
>+// enum is used were each value encapsulates these 5 pieces of information:
>+//
>+//                       +--------------------------------+
>+//           srcStage 1  | dstStage 2          srcStage 2 |   dstStage 3
>+//  Layout 1 ------Transition 1-----> Layout 2 ------Transition 2------> Layout 3
>+//           srcAccess 1 |dstAccess 2          srcAccess 2|  dstAccess 3
>+//                       +---------------  ---------------+
>+//                                       \/
>+//                                 One enum value
>+//
>+// Note that, while generally dstStage for the to-transition and srcStage for the from-transition
>+// are the same, they may occasionally be BOTTOM_OF_PIPE and TOP_OF_PIPE respectively.
>+enum class ImageLayout
>+{
>+    Undefined              = 0,
>+    ExternalPreInitialized = 1,
>+    TransferSrc            = 2,
>+    TransferDst            = 3,
>+    ComputeShaderReadOnly  = 4,
>+    ComputeShaderWrite     = 5,
>+    FragmentShaderReadOnly = 6,
>+    ColorAttachment        = 7,
>+    DepthStencilAttachment = 8,
>+    Present                = 9,
>+
>+    InvalidEnum = 10,
>+    EnumCount   = 10,
>+};
>+
>+class ImageHelper final : public CommandGraphResource
>+{
>+  public:
>+    ImageHelper();
>+    ImageHelper(ImageHelper &&other);
>+    ~ImageHelper() override;
>+
>+    void initStagingBuffer(RendererVk *renderer, const vk::Format &format);
>+
>+    angle::Result init(Context *context,
>+                       gl::TextureType textureType,
>+                       const gl::Extents &extents,
>+                       const Format &format,
>+                       GLint samples,
>+                       VkImageUsageFlags usage,
>+                       uint32_t mipLevels,
>+                       uint32_t layerCount);
>+    angle::Result initExternal(Context *context,
>+                               gl::TextureType textureType,
>+                               const gl::Extents &extents,
>+                               const Format &format,
>+                               GLint samples,
>+                               VkImageUsageFlags usage,
>+                               ImageLayout initialLayout,
>+                               const void *externalImageCreateInfo,
>+                               uint32_t mipLevels,
>+                               uint32_t layerCount);
>+    angle::Result initMemory(Context *context,
>+                             const MemoryProperties &memoryProperties,
>+                             VkMemoryPropertyFlags flags);
>+    angle::Result initExternalMemory(Context *context,
>+                                     const MemoryProperties &memoryProperties,
>+                                     const VkMemoryRequirements &memoryRequirements,
>+                                     const void *extraAllocationInfo,
>+                                     uint32_t currentQueueFamilyIndex,
>+                                     VkMemoryPropertyFlags flags);
>+    angle::Result initLayerImageView(Context *context,
>+                                     gl::TextureType textureType,
>+                                     VkImageAspectFlags aspectMask,
>+                                     const gl::SwizzleState &swizzleMap,
>+                                     ImageView *imageViewOut,
>+                                     uint32_t baseMipLevel,
>+                                     uint32_t levelCount,
>+                                     uint32_t baseArrayLayer,
>+                                     uint32_t layerCount);
>+    angle::Result initImageView(Context *context,
>+                                gl::TextureType textureType,
>+                                VkImageAspectFlags aspectMask,
>+                                const gl::SwizzleState &swizzleMap,
>+                                ImageView *imageViewOut,
>+                                uint32_t baseMipLevel,
>+                                uint32_t levelCount);
>+    // Create a 2D[Array] for staging purposes.  Used by:
>+    //
>+    // - TextureVk::copySubImageImplWithDraw
>+    //
>+    angle::Result init2DStaging(Context *context,
>+                                const MemoryProperties &memoryProperties,
>+                                const gl::Extents &extent,
>+                                const Format &format,
>+                                VkImageUsageFlags usage,
>+                                uint32_t layerCount);
>+
>+    void releaseImage(RendererVk *renderer);
>+    void releaseStagingBuffer(RendererVk *renderer);
>+
>+    bool valid() const { return mImage.valid(); }
>+
>+    VkImageAspectFlags getAspectFlags() const;
>+    void destroy(VkDevice device);
>+    void dumpResources(Serial serial, std::vector<GarbageObject> *garbageQueue);
>+
>+    void init2DWeakReference(VkImage handle,
>+                             const gl::Extents &extents,
>+                             const Format &format,
>+                             GLint samples);
>+    void resetImageWeakReference();
>+
>+    const Image &getImage() const { return mImage; }
>+    const DeviceMemory &getDeviceMemory() const { return mDeviceMemory; }
>+
>+    const gl::Extents &getExtents() const { return mExtents; }
>+    uint32_t getLayerCount() const { return mLayerCount; }
>+    uint32_t getLevelCount() const { return mLevelCount; }
>+    const Format &getFormat() const { return *mFormat; }
>+    GLint getSamples() const { return mSamples; }
>+
>+    VkImageLayout getCurrentLayout() const;
>+
>+    // Helper function to calculate the extents of a render target created for a certain mip of the
>+    // image.
>+    gl::Extents getLevelExtents2D(uint32_t level) const;
>+
>+    // Clear either color or depth/stencil based on image format.
>+    void clear(const VkClearValue &value,
>+               uint32_t mipLevel,
>+               uint32_t baseArrayLayer,
>+               uint32_t layerCount,
>+               vk::CommandBuffer *commandBuffer);
>+
>+    gl::Extents getSize(const gl::ImageIndex &index) const;
>+
>+    static void Copy(ImageHelper *srcImage,
>+                     ImageHelper *dstImage,
>+                     const gl::Offset &srcOffset,
>+                     const gl::Offset &dstOffset,
>+                     const gl::Extents &copySize,
>+                     const VkImageSubresourceLayers &srcSubresources,
>+                     const VkImageSubresourceLayers &dstSubresources,
>+                     vk::CommandBuffer *commandBuffer);
>+
>+    angle::Result generateMipmapsWithBlit(ContextVk *contextVk, GLuint maxLevel);
>+
>+    // Data staging
>+    void removeStagedUpdates(RendererVk *renderer, const gl::ImageIndex &index);
>+
>+    angle::Result stageSubresourceUpdate(ContextVk *contextVk,
>+                                         const gl::ImageIndex &index,
>+                                         const gl::Extents &extents,
>+                                         const gl::Offset &offset,
>+                                         const gl::InternalFormat &formatInfo,
>+                                         const gl::PixelUnpackState &unpack,
>+                                         GLenum type,
>+                                         const uint8_t *pixels,
>+                                         const vk::Format &vkFormat);
>+
>+    angle::Result stageSubresourceUpdateAndGetData(ContextVk *contextVk,
>+                                                   size_t allocationSize,
>+                                                   const gl::ImageIndex &imageIndex,
>+                                                   const gl::Extents &extents,
>+                                                   const gl::Offset &offset,
>+                                                   uint8_t **destData);
>+
>+    angle::Result stageSubresourceUpdateFromFramebuffer(const gl::Context *context,
>+                                                        const gl::ImageIndex &index,
>+                                                        const gl::Rectangle &sourceArea,
>+                                                        const gl::Offset &dstOffset,
>+                                                        const gl::Extents &dstExtent,
>+                                                        const gl::InternalFormat &formatInfo,
>+                                                        FramebufferVk *framebufferVk);
>+
>+    void stageSubresourceUpdateFromImage(vk::ImageHelper *image,
>+                                         const gl::ImageIndex &index,
>+                                         const gl::Offset &destOffset,
>+                                         const gl::Extents &extents);
>+
>+    // Stage a clear operation to a clear value based on WebGL requirements.
>+    void stageSubresourceRobustClear(const gl::ImageIndex &index, const angle::Format &format);
>+
>+    // Stage a clear operation to a clear value that initializes emulated channels to the desired
>+    // values.
>+    void stageSubresourceEmulatedClear(const gl::ImageIndex &index, const angle::Format &format);
>+
>+    // If the image has emulated channels, we clear them once so as not to leave garbage on those
>+    // channels.
>+    angle::Result clearIfEmulatedFormat(Context *context,
>+                                        const gl::ImageIndex &index,
>+                                        const Format &format);
>+
>+    // This will use the underlying dynamic buffer to allocate some memory to be used as a src or
>+    // dst.
>+    angle::Result allocateStagingMemory(ContextVk *contextVk,
>+                                        size_t sizeInBytes,
>+                                        uint8_t **ptrOut,
>+                                        VkBuffer *handleOut,
>+                                        VkDeviceSize *offsetOut,
>+                                        bool *newBufferAllocatedOut);
>+
>+    // Flushes staged updates to a range of levels and layers from start to (but not including) end.
>+    // Due to the nature of updates (done wholly to a VkImageSubresourceLayers), some unsolicited
>+    // layers may also be updated.
>+    angle::Result flushStagedUpdates(Context *context,
>+                                     uint32_t levelStart,
>+                                     uint32_t levelEnd,
>+                                     uint32_t layerStart,
>+                                     uint32_t layerEnd,
>+                                     vk::CommandBuffer *commandBuffer);
>+    // Creates a command buffer and flushes all staged updates.  This is used for one-time
>+    // initialization of resources that we don't expect to accumulate further staged updates, such
>+    // as with renderbuffers or surface images.
>+    angle::Result flushAllStagedUpdates(Context *context);
>+
>+    bool hasStagedUpdates() const { return !mSubresourceUpdates.empty(); }
>+
>+    // changeLayout automatically skips the layout change if it's unnecessary.  This function can be
>+    // used to prevent creating a command graph node and subsequently a command buffer for the sole
>+    // purpose of performing a transition (which may then not be issued).
>+    bool isLayoutChangeNecessary(ImageLayout newLayout) const;
>+
>+    void changeLayout(VkImageAspectFlags aspectMask,
>+                      ImageLayout newLayout,
>+                      vk::CommandBuffer *commandBuffer);
>+
>+    bool isQueueChangeNeccesary(uint32_t newQueueFamilyIndex) const
>+    {
>+        return mCurrentQueueFamilyIndex != newQueueFamilyIndex;
>+    }
>+
>+    void changeLayoutAndQueue(VkImageAspectFlags aspectMask,
>+                              ImageLayout newLayout,
>+                              uint32_t newQueueFamilyIndex,
>+                              vk::CommandBuffer *commandBuffer);
>+
>+  private:
>+    void forceChangeLayoutAndQueue(VkImageAspectFlags aspectMask,
>+                                   ImageLayout newLayout,
>+                                   uint32_t newQueueFamilyIndex,
>+                                   vk::CommandBuffer *commandBuffer);
>+
>+    void stageSubresourceClear(const gl::ImageIndex &index,
>+                               const angle::Format &format,
>+                               const VkClearColorValue &colorValue,
>+                               const VkClearDepthStencilValue &depthStencilValue);
>+
>+    void clearColor(const VkClearColorValue &color,
>+                    uint32_t baseMipLevel,
>+                    uint32_t levelCount,
>+                    uint32_t baseArrayLayer,
>+                    uint32_t layerCount,
>+                    vk::CommandBuffer *commandBuffer);
>+
>+    void clearDepthStencil(VkImageAspectFlags imageAspectFlags,
>+                           VkImageAspectFlags clearAspectFlags,
>+                           const VkClearDepthStencilValue &depthStencil,
>+                           vk::CommandBuffer *commandBuffer);
>+
>+    struct SubresourceUpdate
>+    {
>+        SubresourceUpdate();
>+        SubresourceUpdate(VkBuffer bufferHandle, const VkBufferImageCopy &copyRegion);
>+        SubresourceUpdate(vk::ImageHelper *image, const VkImageCopy &copyRegion);
>+        SubresourceUpdate(const VkClearValue &clearValue, const gl::ImageIndex &imageIndex);
>+        SubresourceUpdate(const SubresourceUpdate &other);
>+
>+        void release(RendererVk *renderer);
>+
>+        const VkImageSubresourceLayers &dstSubresource() const
>+        {
>+            ASSERT(updateSource == UpdateSource::Buffer || updateSource == UpdateSource::Image);
>+            return updateSource == UpdateSource::Buffer ? buffer.copyRegion.imageSubresource
>+                                                        : image.copyRegion.dstSubresource;
>+        }
>+        bool isUpdateToLayerLevel(uint32_t layerIndex, uint32_t levelIndex) const;
>+
>+        enum class UpdateSource
>+        {
>+            Clear,
>+            Buffer,
>+            Image,
>+        };
>+        struct ClearUpdate
>+        {
>+            VkClearValue value;
>+            uint32_t levelIndex;
>+            uint32_t layerIndex;
>+            uint32_t layerCount;
>+        };
>+        struct BufferUpdate
>+        {
>+            VkBuffer bufferHandle;
>+            VkBufferImageCopy copyRegion;
>+        };
>+        struct ImageUpdate
>+        {
>+            vk::ImageHelper *image;
>+            VkImageCopy copyRegion;
>+        };
>+
>+        UpdateSource updateSource;
>+        union
>+        {
>+            ClearUpdate clear;
>+            BufferUpdate buffer;
>+            ImageUpdate image;
>+        };
>+    };
>+
>+    // Vulkan objects.
>+    Image mImage;
>+    DeviceMemory mDeviceMemory;
>+
>+    // Image properties.
>+    gl::Extents mExtents;
>+    const Format *mFormat;
>+    GLint mSamples;
>+
>+    // Current state.
>+    ImageLayout mCurrentLayout;
>+    uint32_t mCurrentQueueFamilyIndex;
>+
>+    // Cached properties.
>+    uint32_t mLayerCount;
>+    uint32_t mLevelCount;
>+
>+    // Staging buffer
>+    vk::DynamicBuffer mStagingBuffer;
>+    std::vector<SubresourceUpdate> mSubresourceUpdates;
>+};
>+
>+class FramebufferHelper : public CommandGraphResource
>+{
>+  public:
>+    FramebufferHelper();
>+    ~FramebufferHelper() override;
>+
>+    angle::Result init(ContextVk *contextVk, const VkFramebufferCreateInfo &createInfo);
>+    void release(RendererVk *renderer);
>+
>+    bool valid() { return mFramebuffer.valid(); }
>+
>+    const Framebuffer &getFramebuffer() const
>+    {
>+        ASSERT(mFramebuffer.valid());
>+        return mFramebuffer;
>+    }
>+
>+    Framebuffer &getFramebuffer()
>+    {
>+        ASSERT(mFramebuffer.valid());
>+        return mFramebuffer;
>+    }
>+
>+  private:
>+    // Vulkan object.
>+    Framebuffer mFramebuffer;
>+};
>+
>+class ShaderProgramHelper : angle::NonCopyable
>+{
>+  public:
>+    ShaderProgramHelper();
>+    ~ShaderProgramHelper();
>+
>+    bool valid() const;
>+    void destroy(VkDevice device);
>+    void release(RendererVk *renderer);
>+
>+    bool isGraphicsProgram() const
>+    {
>+        ASSERT(mShaders[gl::ShaderType::Vertex].valid() !=
>+               mShaders[gl::ShaderType::Compute].valid());
>+        return mShaders[gl::ShaderType::Vertex].valid();
>+    }
>+
>+    vk::ShaderAndSerial &getShader(gl::ShaderType shaderType) { return mShaders[shaderType].get(); }
>+
>+    void setShader(gl::ShaderType shaderType, RefCounted<ShaderAndSerial> *shader);
>+
>+    // For getting a vk::Pipeline and from the pipeline cache.
>+    ANGLE_INLINE angle::Result getGraphicsPipeline(
>+        Context *context,
>+        RenderPassCache *renderPassCache,
>+        const PipelineCache &pipelineCache,
>+        Serial currentQueueSerial,
>+        const PipelineLayout &pipelineLayout,
>+        const GraphicsPipelineDesc &pipelineDesc,
>+        const gl::AttributesMask &activeAttribLocationsMask,
>+        const vk::GraphicsPipelineDesc **descPtrOut,
>+        PipelineHelper **pipelineOut)
>+    {
>+        // Pull in a compatible RenderPass.
>+        vk::RenderPass *compatibleRenderPass = nullptr;
>+        ANGLE_TRY(renderPassCache->getCompatibleRenderPass(
>+            context, currentQueueSerial, pipelineDesc.getRenderPassDesc(), &compatibleRenderPass));
>+
>+        ShaderModule *vertexShader   = &mShaders[gl::ShaderType::Vertex].get().get();
>+        ShaderModule *fragmentShader = mShaders[gl::ShaderType::Fragment].valid()
>+                                           ? &mShaders[gl::ShaderType::Fragment].get().get()
>+                                           : nullptr;
>+
>+        return mGraphicsPipelines.getPipeline(context, pipelineCache, *compatibleRenderPass,
>+                                              pipelineLayout, activeAttribLocationsMask,
>+                                              vertexShader, fragmentShader, pipelineDesc,
>+                                              descPtrOut, pipelineOut);
>+    }
>+
>+    angle::Result getComputePipeline(Context *context,
>+                                     const PipelineLayout &pipelineLayout,
>+                                     PipelineAndSerial **pipelineOut);
>+
>+  private:
>+    gl::ShaderMap<BindingPointer<ShaderAndSerial>> mShaders;
>+    GraphicsPipelineCache mGraphicsPipelines;
>+
>+    // We should probably use PipelineHelper here so we can remove PipelineAndSerial.
>+    PipelineAndSerial mComputePipeline;
>+};
>+}  // namespace vk
>+}  // namespace rx
>+
>+#endif  // LIBANGLE_RENDERER_VULKAN_VK_HELPERS_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/vk_internal_shaders_autogen.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/vk_internal_shaders_autogen.cpp
>new file mode 100644
>index 00000000000..2056ee8d074
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/vk_internal_shaders_autogen.cpp
>@@ -0,0 +1,277 @@
>+// GENERATED FILE - DO NOT EDIT.
>+// Generated by gen_vk_internal_shaders.py using data from shaders/src/*
>+//
>+// Copyright 2019 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// vk_internal_shaders_autogen.cpp:
>+//   Pre-generated shader library for the ANGLE Vulkan back-end.
>+
>+#include "libANGLE/renderer/vulkan/vk_internal_shaders_autogen.h"
>+
>+namespace rx
>+{
>+namespace vk
>+{
>+namespace
>+{
>+#include "libANGLE/renderer/vulkan/shaders/gen/BufferUtils.comp.00000000.inc"
>+#include "libANGLE/renderer/vulkan/shaders/gen/BufferUtils.comp.00000001.inc"
>+#include "libANGLE/renderer/vulkan/shaders/gen/BufferUtils.comp.00000002.inc"
>+#include "libANGLE/renderer/vulkan/shaders/gen/BufferUtils.comp.00000003.inc"
>+#include "libANGLE/renderer/vulkan/shaders/gen/BufferUtils.comp.00000004.inc"
>+#include "libANGLE/renderer/vulkan/shaders/gen/BufferUtils.comp.00000005.inc"
>+#include "libANGLE/renderer/vulkan/shaders/gen/BufferUtils.comp.00000006.inc"
>+#include "libANGLE/renderer/vulkan/shaders/gen/BufferUtils.comp.00000007.inc"
>+#include "libANGLE/renderer/vulkan/shaders/gen/BufferUtils.comp.00000008.inc"
>+#include "libANGLE/renderer/vulkan/shaders/gen/BufferUtils.comp.00000009.inc"
>+#include "libANGLE/renderer/vulkan/shaders/gen/BufferUtils.comp.0000000A.inc"
>+#include "libANGLE/renderer/vulkan/shaders/gen/BufferUtils.comp.0000000B.inc"
>+#include "libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.00000000.inc"
>+#include "libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.00000001.inc"
>+#include "libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.00000002.inc"
>+#include "libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.00000003.inc"
>+#include "libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.00000004.inc"
>+#include "libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.00000005.inc"
>+#include "libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.00000006.inc"
>+#include "libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.00000007.inc"
>+#include "libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.00000008.inc"
>+#include "libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.00000009.inc"
>+#include "libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.0000000A.inc"
>+#include "libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.0000000B.inc"
>+#include "libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.0000000C.inc"
>+#include "libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.0000000D.inc"
>+#include "libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.0000000E.inc"
>+#include "libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.0000000F.inc"
>+#include "libANGLE/renderer/vulkan/shaders/gen/FullScreenQuad.vert.00000000.inc"
>+#include "libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000000.inc"
>+#include "libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000001.inc"
>+#include "libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000002.inc"
>+#include "libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000003.inc"
>+#include "libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000004.inc"
>+#include "libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000005.inc"
>+#include "libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000006.inc"
>+#include "libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000007.inc"
>+#include "libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000008.inc"
>+#include "libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000009.inc"
>+#include "libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.0000000A.inc"
>+#include "libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.0000000B.inc"
>+#include "libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.0000000C.inc"
>+#include "libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.0000000D.inc"
>+#include "libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.0000000E.inc"
>+#include "libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.0000000F.inc"
>+#include "libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000010.inc"
>+#include "libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000011.inc"
>+#include "libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000012.inc"
>+#include "libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000013.inc"
>+#include "libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000014.inc"
>+#include "libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000015.inc"
>+#include "libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000016.inc"
>+#include "libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000017.inc"
>+#include "libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000000.inc"
>+#include "libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000001.inc"
>+#include "libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000002.inc"
>+#include "libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000003.inc"
>+#include "libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000004.inc"
>+#include "libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000005.inc"
>+#include "libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000008.inc"
>+#include "libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000009.inc"
>+#include "libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.0000000A.inc"
>+#include "libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.0000000B.inc"
>+#include "libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.0000000C.inc"
>+#include "libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.0000000D.inc"
>+#include "libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000010.inc"
>+#include "libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000011.inc"
>+#include "libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000012.inc"
>+#include "libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000013.inc"
>+#include "libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000014.inc"
>+#include "libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000015.inc"
>+
>+// This is SPIR-V binary blob and the size.
>+struct ShaderBlob
>+{
>+    const uint32_t *code;
>+    size_t codeSize;
>+};
>+
>+constexpr ShaderBlob kBufferUtils_comp_shaders[] = {
>+    {kBufferUtils_comp_00000000, sizeof(kBufferUtils_comp_00000000)},
>+    {kBufferUtils_comp_00000001, sizeof(kBufferUtils_comp_00000001)},
>+    {kBufferUtils_comp_00000002, sizeof(kBufferUtils_comp_00000002)},
>+    {kBufferUtils_comp_00000003, sizeof(kBufferUtils_comp_00000003)},
>+    {kBufferUtils_comp_00000004, sizeof(kBufferUtils_comp_00000004)},
>+    {kBufferUtils_comp_00000005, sizeof(kBufferUtils_comp_00000005)},
>+    {kBufferUtils_comp_00000006, sizeof(kBufferUtils_comp_00000006)},
>+    {kBufferUtils_comp_00000007, sizeof(kBufferUtils_comp_00000007)},
>+    {kBufferUtils_comp_00000008, sizeof(kBufferUtils_comp_00000008)},
>+    {kBufferUtils_comp_00000009, sizeof(kBufferUtils_comp_00000009)},
>+    {kBufferUtils_comp_0000000A, sizeof(kBufferUtils_comp_0000000A)},
>+    {kBufferUtils_comp_0000000B, sizeof(kBufferUtils_comp_0000000B)},
>+};
>+constexpr ShaderBlob kConvertVertex_comp_shaders[] = {
>+    {kConvertVertex_comp_00000000, sizeof(kConvertVertex_comp_00000000)},
>+    {kConvertVertex_comp_00000001, sizeof(kConvertVertex_comp_00000001)},
>+    {kConvertVertex_comp_00000002, sizeof(kConvertVertex_comp_00000002)},
>+    {kConvertVertex_comp_00000003, sizeof(kConvertVertex_comp_00000003)},
>+    {kConvertVertex_comp_00000004, sizeof(kConvertVertex_comp_00000004)},
>+    {kConvertVertex_comp_00000005, sizeof(kConvertVertex_comp_00000005)},
>+    {kConvertVertex_comp_00000006, sizeof(kConvertVertex_comp_00000006)},
>+    {kConvertVertex_comp_00000007, sizeof(kConvertVertex_comp_00000007)},
>+    {kConvertVertex_comp_00000008, sizeof(kConvertVertex_comp_00000008)},
>+    {kConvertVertex_comp_00000009, sizeof(kConvertVertex_comp_00000009)},
>+    {kConvertVertex_comp_0000000A, sizeof(kConvertVertex_comp_0000000A)},
>+    {kConvertVertex_comp_0000000B, sizeof(kConvertVertex_comp_0000000B)},
>+    {kConvertVertex_comp_0000000C, sizeof(kConvertVertex_comp_0000000C)},
>+    {kConvertVertex_comp_0000000D, sizeof(kConvertVertex_comp_0000000D)},
>+    {kConvertVertex_comp_0000000E, sizeof(kConvertVertex_comp_0000000E)},
>+    {kConvertVertex_comp_0000000F, sizeof(kConvertVertex_comp_0000000F)},
>+};
>+constexpr ShaderBlob kFullScreenQuad_vert_shaders[] = {
>+    {kFullScreenQuad_vert_00000000, sizeof(kFullScreenQuad_vert_00000000)},
>+};
>+constexpr ShaderBlob kImageClear_frag_shaders[] = {
>+    {kImageClear_frag_00000000, sizeof(kImageClear_frag_00000000)},
>+    {kImageClear_frag_00000001, sizeof(kImageClear_frag_00000001)},
>+    {kImageClear_frag_00000002, sizeof(kImageClear_frag_00000002)},
>+    {kImageClear_frag_00000003, sizeof(kImageClear_frag_00000003)},
>+    {kImageClear_frag_00000004, sizeof(kImageClear_frag_00000004)},
>+    {kImageClear_frag_00000005, sizeof(kImageClear_frag_00000005)},
>+    {kImageClear_frag_00000006, sizeof(kImageClear_frag_00000006)},
>+    {kImageClear_frag_00000007, sizeof(kImageClear_frag_00000007)},
>+    {kImageClear_frag_00000008, sizeof(kImageClear_frag_00000008)},
>+    {kImageClear_frag_00000009, sizeof(kImageClear_frag_00000009)},
>+    {kImageClear_frag_0000000A, sizeof(kImageClear_frag_0000000A)},
>+    {kImageClear_frag_0000000B, sizeof(kImageClear_frag_0000000B)},
>+    {kImageClear_frag_0000000C, sizeof(kImageClear_frag_0000000C)},
>+    {kImageClear_frag_0000000D, sizeof(kImageClear_frag_0000000D)},
>+    {kImageClear_frag_0000000E, sizeof(kImageClear_frag_0000000E)},
>+    {kImageClear_frag_0000000F, sizeof(kImageClear_frag_0000000F)},
>+    {kImageClear_frag_00000010, sizeof(kImageClear_frag_00000010)},
>+    {kImageClear_frag_00000011, sizeof(kImageClear_frag_00000011)},
>+    {kImageClear_frag_00000012, sizeof(kImageClear_frag_00000012)},
>+    {kImageClear_frag_00000013, sizeof(kImageClear_frag_00000013)},
>+    {kImageClear_frag_00000014, sizeof(kImageClear_frag_00000014)},
>+    {kImageClear_frag_00000015, sizeof(kImageClear_frag_00000015)},
>+    {kImageClear_frag_00000016, sizeof(kImageClear_frag_00000016)},
>+    {kImageClear_frag_00000017, sizeof(kImageClear_frag_00000017)},
>+};
>+constexpr ShaderBlob kImageCopy_frag_shaders[] = {
>+    {kImageCopy_frag_00000000, sizeof(kImageCopy_frag_00000000)},
>+    {kImageCopy_frag_00000001, sizeof(kImageCopy_frag_00000001)},
>+    {kImageCopy_frag_00000002, sizeof(kImageCopy_frag_00000002)},
>+    {kImageCopy_frag_00000003, sizeof(kImageCopy_frag_00000003)},
>+    {kImageCopy_frag_00000004, sizeof(kImageCopy_frag_00000004)},
>+    {kImageCopy_frag_00000005, sizeof(kImageCopy_frag_00000005)},
>+    {nullptr, 0},  // 0x00000006
>+    {nullptr, 0},  // 0x00000007
>+    {kImageCopy_frag_00000008, sizeof(kImageCopy_frag_00000008)},
>+    {kImageCopy_frag_00000009, sizeof(kImageCopy_frag_00000009)},
>+    {kImageCopy_frag_0000000A, sizeof(kImageCopy_frag_0000000A)},
>+    {kImageCopy_frag_0000000B, sizeof(kImageCopy_frag_0000000B)},
>+    {kImageCopy_frag_0000000C, sizeof(kImageCopy_frag_0000000C)},
>+    {kImageCopy_frag_0000000D, sizeof(kImageCopy_frag_0000000D)},
>+    {nullptr, 0},  // 0x0000000E
>+    {nullptr, 0},  // 0x0000000F
>+    {kImageCopy_frag_00000010, sizeof(kImageCopy_frag_00000010)},
>+    {kImageCopy_frag_00000011, sizeof(kImageCopy_frag_00000011)},
>+    {kImageCopy_frag_00000012, sizeof(kImageCopy_frag_00000012)},
>+    {kImageCopy_frag_00000013, sizeof(kImageCopy_frag_00000013)},
>+    {kImageCopy_frag_00000014, sizeof(kImageCopy_frag_00000014)},
>+    {kImageCopy_frag_00000015, sizeof(kImageCopy_frag_00000015)},
>+};
>+
>+angle::Result GetShader(Context *context,
>+                        RefCounted<ShaderAndSerial> *shaders,
>+                        const ShaderBlob *shaderBlobs,
>+                        size_t shadersCount,
>+                        uint32_t shaderFlags,
>+                        RefCounted<ShaderAndSerial> **shaderOut)
>+{
>+    ASSERT(shaderFlags < shadersCount);
>+    RefCounted<ShaderAndSerial> &shader = shaders[shaderFlags];
>+    *shaderOut                          = &shader;
>+
>+    if (shader.get().valid())
>+    {
>+        return angle::Result::Continue;
>+    }
>+
>+    // Create shader lazily. Access will need to be locked for multi-threading.
>+    const ShaderBlob &shaderCode = shaderBlobs[shaderFlags];
>+    ASSERT(shaderCode.code != nullptr);
>+
>+    return InitShaderAndSerial(context, &shader.get(), shaderCode.code, shaderCode.codeSize);
>+}
>+}  // anonymous namespace
>+
>+ShaderLibrary::ShaderLibrary() {}
>+
>+ShaderLibrary::~ShaderLibrary() {}
>+
>+void ShaderLibrary::destroy(VkDevice device)
>+{
>+    for (RefCounted<ShaderAndSerial> &shader : mBufferUtils_comp_shaders)
>+    {
>+        shader.get().destroy(device);
>+    }
>+    for (RefCounted<ShaderAndSerial> &shader : mConvertVertex_comp_shaders)
>+    {
>+        shader.get().destroy(device);
>+    }
>+    for (RefCounted<ShaderAndSerial> &shader : mFullScreenQuad_vert_shaders)
>+    {
>+        shader.get().destroy(device);
>+    }
>+    for (RefCounted<ShaderAndSerial> &shader : mImageClear_frag_shaders)
>+    {
>+        shader.get().destroy(device);
>+    }
>+    for (RefCounted<ShaderAndSerial> &shader : mImageCopy_frag_shaders)
>+    {
>+        shader.get().destroy(device);
>+    }
>+}
>+
>+angle::Result ShaderLibrary::getBufferUtils_comp(Context *context,
>+                                                 uint32_t shaderFlags,
>+                                                 RefCounted<ShaderAndSerial> **shaderOut)
>+{
>+    return GetShader(context, mBufferUtils_comp_shaders, kBufferUtils_comp_shaders,
>+                     ArraySize(kBufferUtils_comp_shaders), shaderFlags, shaderOut);
>+}
>+
>+angle::Result ShaderLibrary::getConvertVertex_comp(Context *context,
>+                                                   uint32_t shaderFlags,
>+                                                   RefCounted<ShaderAndSerial> **shaderOut)
>+{
>+    return GetShader(context, mConvertVertex_comp_shaders, kConvertVertex_comp_shaders,
>+                     ArraySize(kConvertVertex_comp_shaders), shaderFlags, shaderOut);
>+}
>+
>+angle::Result ShaderLibrary::getFullScreenQuad_vert(Context *context,
>+                                                    uint32_t shaderFlags,
>+                                                    RefCounted<ShaderAndSerial> **shaderOut)
>+{
>+    return GetShader(context, mFullScreenQuad_vert_shaders, kFullScreenQuad_vert_shaders,
>+                     ArraySize(kFullScreenQuad_vert_shaders), shaderFlags, shaderOut);
>+}
>+
>+angle::Result ShaderLibrary::getImageClear_frag(Context *context,
>+                                                uint32_t shaderFlags,
>+                                                RefCounted<ShaderAndSerial> **shaderOut)
>+{
>+    return GetShader(context, mImageClear_frag_shaders, kImageClear_frag_shaders,
>+                     ArraySize(kImageClear_frag_shaders), shaderFlags, shaderOut);
>+}
>+
>+angle::Result ShaderLibrary::getImageCopy_frag(Context *context,
>+                                               uint32_t shaderFlags,
>+                                               RefCounted<ShaderAndSerial> **shaderOut)
>+{
>+    return GetShader(context, mImageCopy_frag_shaders, kImageCopy_frag_shaders,
>+                     ArraySize(kImageCopy_frag_shaders), shaderFlags, shaderOut);
>+}
>+
>+}  // namespace vk
>+}  // namespace rx
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/vk_internal_shaders_autogen.gni b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/vk_internal_shaders_autogen.gni
>new file mode 100644
>index 00000000000..ecc388d3f48
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/vk_internal_shaders_autogen.gni
>@@ -0,0 +1,83 @@
>+# GENERATED FILE - DO NOT EDIT.
>+# Generated by gen_vk_internal_shaders.py using data from shaders/src/*
>+#
>+# Copyright 2019 The ANGLE Project Authors. All rights reserved.
>+# Use of this source code is governed by a BSD-style license that can be
>+# found in the LICENSE file.
>+#
>+# vk_internal_shaders_autogen.gni:
>+#   List of generated shaders for inclusion in ANGLE's build process.
>+
>+angle_vulkan_internal_shaders = [
>+  "shaders/gen/BufferUtils.comp.00000000.inc",
>+  "shaders/gen/BufferUtils.comp.00000001.inc",
>+  "shaders/gen/BufferUtils.comp.00000002.inc",
>+  "shaders/gen/BufferUtils.comp.00000003.inc",
>+  "shaders/gen/BufferUtils.comp.00000004.inc",
>+  "shaders/gen/BufferUtils.comp.00000005.inc",
>+  "shaders/gen/BufferUtils.comp.00000006.inc",
>+  "shaders/gen/BufferUtils.comp.00000007.inc",
>+  "shaders/gen/BufferUtils.comp.00000008.inc",
>+  "shaders/gen/BufferUtils.comp.00000009.inc",
>+  "shaders/gen/BufferUtils.comp.0000000A.inc",
>+  "shaders/gen/BufferUtils.comp.0000000B.inc",
>+  "shaders/gen/ConvertVertex.comp.00000000.inc",
>+  "shaders/gen/ConvertVertex.comp.00000001.inc",
>+  "shaders/gen/ConvertVertex.comp.00000002.inc",
>+  "shaders/gen/ConvertVertex.comp.00000003.inc",
>+  "shaders/gen/ConvertVertex.comp.00000004.inc",
>+  "shaders/gen/ConvertVertex.comp.00000005.inc",
>+  "shaders/gen/ConvertVertex.comp.00000006.inc",
>+  "shaders/gen/ConvertVertex.comp.00000007.inc",
>+  "shaders/gen/ConvertVertex.comp.00000008.inc",
>+  "shaders/gen/ConvertVertex.comp.00000009.inc",
>+  "shaders/gen/ConvertVertex.comp.0000000A.inc",
>+  "shaders/gen/ConvertVertex.comp.0000000B.inc",
>+  "shaders/gen/ConvertVertex.comp.0000000C.inc",
>+  "shaders/gen/ConvertVertex.comp.0000000D.inc",
>+  "shaders/gen/ConvertVertex.comp.0000000E.inc",
>+  "shaders/gen/ConvertVertex.comp.0000000F.inc",
>+  "shaders/gen/FullScreenQuad.vert.00000000.inc",
>+  "shaders/gen/ImageClear.frag.00000000.inc",
>+  "shaders/gen/ImageClear.frag.00000001.inc",
>+  "shaders/gen/ImageClear.frag.00000002.inc",
>+  "shaders/gen/ImageClear.frag.00000003.inc",
>+  "shaders/gen/ImageClear.frag.00000004.inc",
>+  "shaders/gen/ImageClear.frag.00000005.inc",
>+  "shaders/gen/ImageClear.frag.00000006.inc",
>+  "shaders/gen/ImageClear.frag.00000007.inc",
>+  "shaders/gen/ImageClear.frag.00000008.inc",
>+  "shaders/gen/ImageClear.frag.00000009.inc",
>+  "shaders/gen/ImageClear.frag.0000000A.inc",
>+  "shaders/gen/ImageClear.frag.0000000B.inc",
>+  "shaders/gen/ImageClear.frag.0000000C.inc",
>+  "shaders/gen/ImageClear.frag.0000000D.inc",
>+  "shaders/gen/ImageClear.frag.0000000E.inc",
>+  "shaders/gen/ImageClear.frag.0000000F.inc",
>+  "shaders/gen/ImageClear.frag.00000010.inc",
>+  "shaders/gen/ImageClear.frag.00000011.inc",
>+  "shaders/gen/ImageClear.frag.00000012.inc",
>+  "shaders/gen/ImageClear.frag.00000013.inc",
>+  "shaders/gen/ImageClear.frag.00000014.inc",
>+  "shaders/gen/ImageClear.frag.00000015.inc",
>+  "shaders/gen/ImageClear.frag.00000016.inc",
>+  "shaders/gen/ImageClear.frag.00000017.inc",
>+  "shaders/gen/ImageCopy.frag.00000000.inc",
>+  "shaders/gen/ImageCopy.frag.00000001.inc",
>+  "shaders/gen/ImageCopy.frag.00000002.inc",
>+  "shaders/gen/ImageCopy.frag.00000003.inc",
>+  "shaders/gen/ImageCopy.frag.00000004.inc",
>+  "shaders/gen/ImageCopy.frag.00000005.inc",
>+  "shaders/gen/ImageCopy.frag.00000008.inc",
>+  "shaders/gen/ImageCopy.frag.00000009.inc",
>+  "shaders/gen/ImageCopy.frag.0000000A.inc",
>+  "shaders/gen/ImageCopy.frag.0000000B.inc",
>+  "shaders/gen/ImageCopy.frag.0000000C.inc",
>+  "shaders/gen/ImageCopy.frag.0000000D.inc",
>+  "shaders/gen/ImageCopy.frag.00000010.inc",
>+  "shaders/gen/ImageCopy.frag.00000011.inc",
>+  "shaders/gen/ImageCopy.frag.00000012.inc",
>+  "shaders/gen/ImageCopy.frag.00000013.inc",
>+  "shaders/gen/ImageCopy.frag.00000014.inc",
>+  "shaders/gen/ImageCopy.frag.00000015.inc",
>+]
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/vk_internal_shaders_autogen.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/vk_internal_shaders_autogen.h
>new file mode 100644
>index 00000000000..fea5ae2abf1
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/vk_internal_shaders_autogen.h
>@@ -0,0 +1,160 @@
>+// GENERATED FILE - DO NOT EDIT.
>+// Generated by gen_vk_internal_shaders.py using data from shaders/src/*
>+//
>+// Copyright 2019 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// vk_internal_shaders_autogen.h:
>+//   Pre-generated shader library for the ANGLE Vulkan back-end.
>+
>+#ifndef LIBANGLE_RENDERER_VULKAN_VK_INTERNAL_SHADERS_AUTOGEN_H_
>+#define LIBANGLE_RENDERER_VULKAN_VK_INTERNAL_SHADERS_AUTOGEN_H_
>+
>+#include "libANGLE/renderer/vulkan/vk_utils.h"
>+
>+namespace rx
>+{
>+namespace vk
>+{
>+namespace InternalShader
>+{
>+namespace BufferUtils_comp
>+{
>+enum flags
>+{
>+    kIsAligned = 0x00000001,
>+    kFlagsMask = 0x00000001,
>+};
>+enum Function
>+{
>+    kIsClear      = 0x00000000,
>+    kIsCopy       = 0x00000002,
>+    kFunctionMask = 0x00000002,
>+};
>+enum Format
>+{
>+    kIsFloat    = 0x00000000,
>+    kIsInt      = 0x00000004,
>+    kIsUint     = 0x00000008,
>+    kFormatMask = 0x0000000C,
>+};
>+}  // namespace BufferUtils_comp
>+
>+namespace ConvertVertex_comp
>+{
>+enum flags
>+{
>+    kIsAligned = 0x00000001,
>+    kFlagsMask = 0x00000001,
>+};
>+enum Conversion
>+{
>+    kIntToInt       = 0x00000000,
>+    kUintToUint     = 0x00000002,
>+    kIntToFloat     = 0x00000004,
>+    kUintToFloat    = 0x00000006,
>+    kSnormToFloat   = 0x00000008,
>+    kUnormToFloat   = 0x0000000A,
>+    kFixedToFloat   = 0x0000000C,
>+    kFloatToFloat   = 0x0000000E,
>+    kConversionMask = 0x0000000E,
>+};
>+}  // namespace ConvertVertex_comp
>+
>+namespace FullScreenQuad_vert
>+{}  // namespace FullScreenQuad_vert
>+
>+namespace ImageClear_frag
>+{
>+enum AttachmentIndex
>+{
>+    kAttachment0         = 0x00000000,
>+    kAttachment1         = 0x00000001,
>+    kAttachment2         = 0x00000002,
>+    kAttachment3         = 0x00000003,
>+    kAttachment4         = 0x00000004,
>+    kAttachment5         = 0x00000005,
>+    kAttachment6         = 0x00000006,
>+    kAttachment7         = 0x00000007,
>+    kAttachmentIndexMask = 0x00000007,
>+};
>+enum Format
>+{
>+    kIsFloat    = 0x00000000,
>+    kIsInt      = 0x00000008,
>+    kIsUint     = 0x00000010,
>+    kFormatMask = 0x00000018,
>+};
>+}  // namespace ImageClear_frag
>+
>+namespace ImageCopy_frag
>+{
>+enum flags
>+{
>+    kSrcIsArray = 0x00000001,
>+    kFlagsMask  = 0x00000001,
>+};
>+enum SrcFormat
>+{
>+    kSrcIsFloat    = 0x00000000,
>+    kSrcIsInt      = 0x00000002,
>+    kSrcIsUint     = 0x00000004,
>+    kSrcFormatMask = 0x00000006,
>+};
>+enum DestFormat
>+{
>+    kDestIsFloat    = 0x00000000,
>+    kDestIsInt      = 0x00000008,
>+    kDestIsUint     = 0x00000010,
>+    kDestFormatMask = 0x00000018,
>+};
>+}  // namespace ImageCopy_frag
>+
>+}  // namespace InternalShader
>+
>+class ShaderLibrary final : angle::NonCopyable
>+{
>+  public:
>+    ShaderLibrary();
>+    ~ShaderLibrary();
>+
>+    void destroy(VkDevice device);
>+
>+    angle::Result getBufferUtils_comp(Context *context,
>+                                      uint32_t shaderFlags,
>+                                      RefCounted<ShaderAndSerial> **shaderOut);
>+    angle::Result getConvertVertex_comp(Context *context,
>+                                        uint32_t shaderFlags,
>+                                        RefCounted<ShaderAndSerial> **shaderOut);
>+    angle::Result getFullScreenQuad_vert(Context *context,
>+                                         uint32_t shaderFlags,
>+                                         RefCounted<ShaderAndSerial> **shaderOut);
>+    angle::Result getImageClear_frag(Context *context,
>+                                     uint32_t shaderFlags,
>+                                     RefCounted<ShaderAndSerial> **shaderOut);
>+    angle::Result getImageCopy_frag(Context *context,
>+                                    uint32_t shaderFlags,
>+                                    RefCounted<ShaderAndSerial> **shaderOut);
>+
>+  private:
>+    RefCounted<ShaderAndSerial>
>+        mBufferUtils_comp_shaders[InternalShader::BufferUtils_comp::kFlagsMask |
>+                                  InternalShader::BufferUtils_comp::kFunctionMask |
>+                                  InternalShader::BufferUtils_comp::kFormatMask];
>+    RefCounted<ShaderAndSerial>
>+        mConvertVertex_comp_shaders[InternalShader::ConvertVertex_comp::kFlagsMask |
>+                                    InternalShader::ConvertVertex_comp::kConversionMask];
>+    RefCounted<ShaderAndSerial> mFullScreenQuad_vert_shaders[1];
>+    RefCounted<ShaderAndSerial>
>+        mImageClear_frag_shaders[InternalShader::ImageClear_frag::kAttachmentIndexMask |
>+                                 InternalShader::ImageClear_frag::kFormatMask];
>+    RefCounted<ShaderAndSerial>
>+        mImageCopy_frag_shaders[InternalShader::ImageCopy_frag::kFlagsMask |
>+                                InternalShader::ImageCopy_frag::kSrcFormatMask |
>+                                InternalShader::ImageCopy_frag::kDestFormatMask];
>+};
>+}  // namespace vk
>+}  // namespace rx
>+
>+#endif  // LIBANGLE_RENDERER_VULKAN_VK_INTERNAL_SHADERS_AUTOGEN_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/vk_mandatory_format_support_data.json b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/vk_mandatory_format_support_data.json
>new file mode 100644
>index 00000000000..7d3086c35b8
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/vk_mandatory_format_support_data.json
>@@ -0,0 +1,439 @@
>+{
>+    "VK_FORMAT_B4G4R4A4_UNORM_PACK16": [
>+        "VK_FORMAT_FEATURE_SAMPLED_IMAGE_BIT",
>+        "VK_FORMAT_FEATURE_BLIT_SRC_BIT",
>+        "VK_FORMAT_FEATURE_SAMPLED_IMAGE_FILTER_LINEAR_BIT"
>+    ],
>+    "VK_FORMAT_R5G6B5_UNORM_PACK16": [
>+        "VK_FORMAT_FEATURE_SAMPLED_IMAGE_BIT",
>+        "VK_FORMAT_FEATURE_BLIT_SRC_BIT",
>+        "VK_FORMAT_FEATURE_SAMPLED_IMAGE_FILTER_LINEAR_BIT",
>+        "VK_FORMAT_FEATURE_COLOR_ATTACHMENT_BIT",
>+        "VK_FORMAT_FEATURE_BLIT_DST_BIT",
>+        "VK_FORMAT_FEATURE_COLOR_ATTACHMENT_BLEND_BIT"
>+    ],
>+    "VK_FORMAT_A1R5G5B5_UNORM_PACK16": [
>+        "VK_FORMAT_FEATURE_SAMPLED_IMAGE_BIT",
>+        "VK_FORMAT_FEATURE_BLIT_SRC_BIT",
>+        "VK_FORMAT_FEATURE_SAMPLED_IMAGE_FILTER_LINEAR_BIT",
>+        "VK_FORMAT_FEATURE_COLOR_ATTACHMENT_BIT",
>+        "VK_FORMAT_FEATURE_BLIT_DST_BIT",
>+        "VK_FORMAT_FEATURE_COLOR_ATTACHMENT_BLEND_BIT"
>+    ],
>+    "VK_FORMAT_R8_UNORM": [
>+        "VK_FORMAT_FEATURE_SAMPLED_IMAGE_BIT",
>+        "VK_FORMAT_FEATURE_BLIT_SRC_BIT",
>+        "VK_FORMAT_FEATURE_SAMPLED_IMAGE_FILTER_LINEAR_BIT",
>+        "VK_FORMAT_FEATURE_COLOR_ATTACHMENT_BIT",
>+        "VK_FORMAT_FEATURE_BLIT_DST_BIT",
>+        "VK_FORMAT_FEATURE_COLOR_ATTACHMENT_BLEND_BIT",
>+        "VK_FORMAT_FEATURE_VERTEX_BUFFER_BIT",
>+        "VK_FORMAT_FEATURE_UNIFORM_TEXEL_BUFFER_BIT"
>+    ],
>+    "VK_FORMAT_R8_SNORM": [
>+        "VK_FORMAT_FEATURE_SAMPLED_IMAGE_BIT",
>+        "VK_FORMAT_FEATURE_BLIT_SRC_BIT",
>+        "VK_FORMAT_FEATURE_SAMPLED_IMAGE_FILTER_LINEAR_BIT",
>+        "VK_FORMAT_FEATURE_VERTEX_BUFFER_BIT",
>+        "VK_FORMAT_FEATURE_UNIFORM_TEXEL_BUFFER_BIT"
>+    ],
>+    "VK_FORMAT_R8_UINT": [
>+        "VK_FORMAT_FEATURE_SAMPLED_IMAGE_BIT",
>+        "VK_FORMAT_FEATURE_BLIT_SRC_BIT",
>+        "VK_FORMAT_FEATURE_COLOR_ATTACHMENT_BIT",
>+        "VK_FORMAT_FEATURE_BLIT_DST_BIT",
>+        "VK_FORMAT_FEATURE_VERTEX_BUFFER_BIT",
>+        "VK_FORMAT_FEATURE_UNIFORM_TEXEL_BUFFER_BIT"
>+    ],
>+    "VK_FORMAT_R8_SINT": [
>+        "VK_FORMAT_FEATURE_SAMPLED_IMAGE_BIT",
>+        "VK_FORMAT_FEATURE_BLIT_SRC_BIT",
>+        "VK_FORMAT_FEATURE_COLOR_ATTACHMENT_BIT",
>+        "VK_FORMAT_FEATURE_BLIT_DST_BIT",
>+        "VK_FORMAT_FEATURE_VERTEX_BUFFER_BIT",
>+        "VK_FORMAT_FEATURE_UNIFORM_TEXEL_BUFFER_BIT"
>+    ],
>+    "VK_FORMAT_R8G8_UNORM": [
>+        "VK_FORMAT_FEATURE_SAMPLED_IMAGE_BIT",
>+        "VK_FORMAT_FEATURE_BLIT_SRC_BIT",
>+        "VK_FORMAT_FEATURE_SAMPLED_IMAGE_FILTER_LINEAR_BIT",
>+        "VK_FORMAT_FEATURE_COLOR_ATTACHMENT_BIT",
>+        "VK_FORMAT_FEATURE_BLIT_DST_BIT",
>+        "VK_FORMAT_FEATURE_COLOR_ATTACHMENT_BLEND_BIT",
>+        "VK_FORMAT_FEATURE_VERTEX_BUFFER_BIT",
>+        "VK_FORMAT_FEATURE_UNIFORM_TEXEL_BUFFER_BIT"
>+    ],
>+    "VK_FORMAT_R8G8_SNORM": [
>+        "VK_FORMAT_FEATURE_SAMPLED_IMAGE_BIT",
>+        "VK_FORMAT_FEATURE_BLIT_SRC_BIT",
>+        "VK_FORMAT_FEATURE_SAMPLED_IMAGE_FILTER_LINEAR_BIT",
>+        "VK_FORMAT_FEATURE_VERTEX_BUFFER_BIT",
>+        "VK_FORMAT_FEATURE_UNIFORM_TEXEL_BUFFER_BIT"
>+    ],
>+    "VK_FORMAT_R8G8_UINT": [
>+        "VK_FORMAT_FEATURE_SAMPLED_IMAGE_BIT",
>+        "VK_FORMAT_FEATURE_BLIT_SRC_BIT",
>+        "VK_FORMAT_FEATURE_COLOR_ATTACHMENT_BIT",
>+        "VK_FORMAT_FEATURE_BLIT_DST_BIT",
>+        "VK_FORMAT_FEATURE_VERTEX_BUFFER_BIT",
>+        "VK_FORMAT_FEATURE_UNIFORM_TEXEL_BUFFER_BIT"
>+    ],
>+    "VK_FORMAT_R8G8_SINT": [
>+        "VK_FORMAT_FEATURE_SAMPLED_IMAGE_BIT",
>+        "VK_FORMAT_FEATURE_BLIT_SRC_BIT",
>+        "VK_FORMAT_FEATURE_COLOR_ATTACHMENT_BIT",
>+        "VK_FORMAT_FEATURE_BLIT_DST_BIT",
>+        "VK_FORMAT_FEATURE_VERTEX_BUFFER_BIT",
>+        "VK_FORMAT_FEATURE_UNIFORM_TEXEL_BUFFER_BIT"
>+    ],
>+    "VK_FORMAT_R8G8B8A8_UNORM": [
>+        "VK_FORMAT_FEATURE_SAMPLED_IMAGE_BIT",
>+        "VK_FORMAT_FEATURE_BLIT_SRC_BIT",
>+        "VK_FORMAT_FEATURE_SAMPLED_IMAGE_FILTER_LINEAR_BIT",
>+        "VK_FORMAT_FEATURE_STORAGE_IMAGE_BIT",
>+        "VK_FORMAT_FEATURE_COLOR_ATTACHMENT_BIT",
>+        "VK_FORMAT_FEATURE_BLIT_DST_BIT",
>+        "VK_FORMAT_FEATURE_COLOR_ATTACHMENT_BLEND_BIT",
>+        "VK_FORMAT_FEATURE_VERTEX_BUFFER_BIT",
>+        "VK_FORMAT_FEATURE_UNIFORM_TEXEL_BUFFER_BIT",
>+        "VK_FORMAT_FEATURE_STORAGE_TEXEL_BUFFER_BIT"
>+    ],
>+    "VK_FORMAT_R8G8B8A8_SNORM": [
>+        "VK_FORMAT_FEATURE_SAMPLED_IMAGE_BIT",
>+        "VK_FORMAT_FEATURE_BLIT_SRC_BIT",
>+        "VK_FORMAT_FEATURE_SAMPLED_IMAGE_FILTER_LINEAR_BIT",
>+        "VK_FORMAT_FEATURE_STORAGE_IMAGE_BIT",
>+        "VK_FORMAT_FEATURE_VERTEX_BUFFER_BIT",
>+        "VK_FORMAT_FEATURE_UNIFORM_TEXEL_BUFFER_BIT",
>+        "VK_FORMAT_FEATURE_STORAGE_TEXEL_BUFFER_BIT"
>+    ],
>+    "VK_FORMAT_R8G8B8A8_UINT": [
>+        "VK_FORMAT_FEATURE_SAMPLED_IMAGE_BIT",
>+        "VK_FORMAT_FEATURE_BLIT_SRC_BIT",
>+        "VK_FORMAT_FEATURE_STORAGE_IMAGE_BIT",
>+        "VK_FORMAT_FEATURE_COLOR_ATTACHMENT_BIT",
>+        "VK_FORMAT_FEATURE_BLIT_DST_BIT",
>+        "VK_FORMAT_FEATURE_VERTEX_BUFFER_BIT",
>+        "VK_FORMAT_FEATURE_UNIFORM_TEXEL_BUFFER_BIT",
>+        "VK_FORMAT_FEATURE_STORAGE_TEXEL_BUFFER_BIT"
>+    ],
>+    "VK_FORMAT_R8G8B8A8_SINT": [
>+        "VK_FORMAT_FEATURE_SAMPLED_IMAGE_BIT",
>+        "VK_FORMAT_FEATURE_BLIT_SRC_BIT",
>+        "VK_FORMAT_FEATURE_STORAGE_IMAGE_BIT",
>+        "VK_FORMAT_FEATURE_COLOR_ATTACHMENT_BIT",
>+        "VK_FORMAT_FEATURE_BLIT_DST_BIT",
>+        "VK_FORMAT_FEATURE_VERTEX_BUFFER_BIT",
>+        "VK_FORMAT_FEATURE_UNIFORM_TEXEL_BUFFER_BIT",
>+        "VK_FORMAT_FEATURE_STORAGE_TEXEL_BUFFER_BIT"
>+    ],
>+    "VK_FORMAT_R8G8B8A8_SRGB": [
>+        "VK_FORMAT_FEATURE_SAMPLED_IMAGE_BIT",
>+        "VK_FORMAT_FEATURE_BLIT_SRC_BIT",
>+        "VK_FORMAT_FEATURE_SAMPLED_IMAGE_FILTER_LINEAR_BIT",
>+        "VK_FORMAT_FEATURE_COLOR_ATTACHMENT_BIT",
>+        "VK_FORMAT_FEATURE_BLIT_DST_BIT",
>+        "VK_FORMAT_FEATURE_COLOR_ATTACHMENT_BLEND_BIT"
>+    ],
>+    "VK_FORMAT_B8G8R8A8_UNORM": [
>+        "VK_FORMAT_FEATURE_SAMPLED_IMAGE_BIT",
>+        "VK_FORMAT_FEATURE_BLIT_SRC_BIT",
>+        "VK_FORMAT_FEATURE_SAMPLED_IMAGE_FILTER_LINEAR_BIT",
>+        "VK_FORMAT_FEATURE_COLOR_ATTACHMENT_BIT",
>+        "VK_FORMAT_FEATURE_BLIT_DST_BIT",
>+        "VK_FORMAT_FEATURE_COLOR_ATTACHMENT_BLEND_BIT",
>+        "VK_FORMAT_FEATURE_VERTEX_BUFFER_BIT",
>+        "VK_FORMAT_FEATURE_UNIFORM_TEXEL_BUFFER_BIT"
>+    ],
>+    "VK_FORMAT_B8G8R8A8_SRGB": [
>+        "VK_FORMAT_FEATURE_SAMPLED_IMAGE_BIT",
>+        "VK_FORMAT_FEATURE_BLIT_SRC_BIT",
>+        "VK_FORMAT_FEATURE_SAMPLED_IMAGE_FILTER_LINEAR_BIT",
>+        "VK_FORMAT_FEATURE_COLOR_ATTACHMENT_BIT",
>+        "VK_FORMAT_FEATURE_BLIT_DST_BIT",
>+        "VK_FORMAT_FEATURE_COLOR_ATTACHMENT_BLEND_BIT"
>+    ],
>+    "VK_FORMAT_A8B8G8R8_UNORM_PACK32": [
>+        "VK_FORMAT_FEATURE_SAMPLED_IMAGE_BIT",
>+        "VK_FORMAT_FEATURE_BLIT_SRC_BIT",
>+        "VK_FORMAT_FEATURE_SAMPLED_IMAGE_FILTER_LINEAR_BIT",
>+        "VK_FORMAT_FEATURE_COLOR_ATTACHMENT_BIT",
>+        "VK_FORMAT_FEATURE_BLIT_DST_BIT",
>+        "VK_FORMAT_FEATURE_COLOR_ATTACHMENT_BLEND_BIT",
>+        "VK_FORMAT_FEATURE_VERTEX_BUFFER_BIT",
>+        "VK_FORMAT_FEATURE_UNIFORM_TEXEL_BUFFER_BIT",
>+        "VK_FORMAT_FEATURE_STORAGE_TEXEL_BUFFER_BIT"
>+    ],
>+    "VK_FORMAT_A8B8G8R8_SNORM_PACK32": [
>+        "VK_FORMAT_FEATURE_SAMPLED_IMAGE_BIT",
>+        "VK_FORMAT_FEATURE_BLIT_SRC_BIT",
>+        "VK_FORMAT_FEATURE_SAMPLED_IMAGE_FILTER_LINEAR_BIT",
>+        "VK_FORMAT_FEATURE_VERTEX_BUFFER_BIT",
>+        "VK_FORMAT_FEATURE_UNIFORM_TEXEL_BUFFER_BIT",
>+        "VK_FORMAT_FEATURE_STORAGE_TEXEL_BUFFER_BIT"
>+    ],
>+    "VK_FORMAT_A8B8G8R8_UINT_PACK32": [
>+        "VK_FORMAT_FEATURE_SAMPLED_IMAGE_BIT",
>+        "VK_FORMAT_FEATURE_BLIT_SRC_BIT",
>+        "VK_FORMAT_FEATURE_COLOR_ATTACHMENT_BIT",
>+        "VK_FORMAT_FEATURE_BLIT_DST_BIT",
>+        "VK_FORMAT_FEATURE_VERTEX_BUFFER_BIT",
>+        "VK_FORMAT_FEATURE_UNIFORM_TEXEL_BUFFER_BIT",
>+        "VK_FORMAT_FEATURE_STORAGE_TEXEL_BUFFER_BIT"
>+    ],
>+    "VK_FORMAT_A8B8G8R8_SINT_PACK32": [
>+        "VK_FORMAT_FEATURE_SAMPLED_IMAGE_BIT",
>+        "VK_FORMAT_FEATURE_BLIT_SRC_BIT",
>+        "VK_FORMAT_FEATURE_COLOR_ATTACHMENT_BIT",
>+        "VK_FORMAT_FEATURE_BLIT_DST_BIT",
>+        "VK_FORMAT_FEATURE_VERTEX_BUFFER_BIT",
>+        "VK_FORMAT_FEATURE_UNIFORM_TEXEL_BUFFER_BIT",
>+        "VK_FORMAT_FEATURE_STORAGE_TEXEL_BUFFER_BIT"
>+    ],
>+    "VK_FORMAT_A8B8G8R8_SRGB_PACK32": [
>+        "VK_FORMAT_FEATURE_SAMPLED_IMAGE_BIT",
>+        "VK_FORMAT_FEATURE_BLIT_SRC_BIT",
>+        "VK_FORMAT_FEATURE_SAMPLED_IMAGE_FILTER_LINEAR_BIT",
>+        "VK_FORMAT_FEATURE_COLOR_ATTACHMENT_BIT",
>+        "VK_FORMAT_FEATURE_BLIT_DST_BIT",
>+        "VK_FORMAT_FEATURE_COLOR_ATTACHMENT_BLEND_BIT"
>+    ],
>+    "VK_FORMAT_A2B10G10R10_UNORM_PACK32": [
>+        "VK_FORMAT_FEATURE_SAMPLED_IMAGE_BIT",
>+        "VK_FORMAT_FEATURE_BLIT_SRC_BIT",
>+        "VK_FORMAT_FEATURE_SAMPLED_IMAGE_FILTER_LINEAR_BIT",
>+        "VK_FORMAT_FEATURE_COLOR_ATTACHMENT_BIT",
>+        "VK_FORMAT_FEATURE_BLIT_DST_BIT",
>+        "VK_FORMAT_FEATURE_COLOR_ATTACHMENT_BLEND_BIT",
>+        "VK_FORMAT_FEATURE_VERTEX_BUFFER_BIT",
>+        "VK_FORMAT_FEATURE_UNIFORM_TEXEL_BUFFER_BIT"
>+    ],
>+    "VK_FORMAT_A2B10G10R10_UINT_PACK32": [
>+        "VK_FORMAT_FEATURE_SAMPLED_IMAGE_BIT",
>+        "VK_FORMAT_FEATURE_BLIT_SRC_BIT",
>+        "VK_FORMAT_FEATURE_COLOR_ATTACHMENT_BIT",
>+        "VK_FORMAT_FEATURE_BLIT_DST_BIT",
>+        "VK_FORMAT_FEATURE_UNIFORM_TEXEL_BUFFER_BIT"
>+    ],
>+    "VK_FORMAT_R16_UNORM": [
>+        "VK_FORMAT_FEATURE_VERTEX_BUFFER_BIT"
>+    ],
>+    "VK_FORMAT_R16_SNORM": [
>+        "VK_FORMAT_FEATURE_VERTEX_BUFFER_BIT"
>+    ],
>+    "VK_FORMAT_R16_UINT": [
>+        "VK_FORMAT_FEATURE_SAMPLED_IMAGE_BIT",
>+        "VK_FORMAT_FEATURE_BLIT_SRC_BIT",
>+        "VK_FORMAT_FEATURE_COLOR_ATTACHMENT_BIT",
>+        "VK_FORMAT_FEATURE_BLIT_DST_BIT",
>+        "VK_FORMAT_FEATURE_VERTEX_BUFFER_BIT",
>+        "VK_FORMAT_FEATURE_UNIFORM_TEXEL_BUFFER_BIT"
>+    ],
>+    "VK_FORMAT_R16_SINT": [
>+        "VK_FORMAT_FEATURE_SAMPLED_IMAGE_BIT",
>+        "VK_FORMAT_FEATURE_BLIT_SRC_BIT",
>+        "VK_FORMAT_FEATURE_COLOR_ATTACHMENT_BIT",
>+        "VK_FORMAT_FEATURE_BLIT_DST_BIT",
>+        "VK_FORMAT_FEATURE_VERTEX_BUFFER_BIT",
>+        "VK_FORMAT_FEATURE_UNIFORM_TEXEL_BUFFER_BIT"
>+    ],
>+    "VK_FORMAT_R16_SFLOAT": [
>+        "VK_FORMAT_FEATURE_SAMPLED_IMAGE_BIT",
>+        "VK_FORMAT_FEATURE_BLIT_SRC_BIT",
>+        "VK_FORMAT_FEATURE_SAMPLED_IMAGE_FILTER_LINEAR_BIT",
>+        "VK_FORMAT_FEATURE_COLOR_ATTACHMENT_BIT",
>+        "VK_FORMAT_FEATURE_BLIT_DST_BIT",
>+        "VK_FORMAT_FEATURE_COLOR_ATTACHMENT_BLEND_BIT",
>+        "VK_FORMAT_FEATURE_VERTEX_BUFFER_BIT",
>+        "VK_FORMAT_FEATURE_UNIFORM_TEXEL_BUFFER_BIT"
>+    ],
>+    "VK_FORMAT_R16G16_UNORM": [
>+        "VK_FORMAT_FEATURE_VERTEX_BUFFER_BIT"
>+    ],
>+    "VK_FORMAT_R16G16_SNORM": [
>+        "VK_FORMAT_FEATURE_VERTEX_BUFFER_BIT"
>+    ],
>+    "VK_FORMAT_R16G16_UINT": [
>+        "VK_FORMAT_FEATURE_SAMPLED_IMAGE_BIT",
>+        "VK_FORMAT_FEATURE_BLIT_SRC_BIT",
>+        "VK_FORMAT_FEATURE_COLOR_ATTACHMENT_BIT",
>+        "VK_FORMAT_FEATURE_BLIT_DST_BIT",
>+        "VK_FORMAT_FEATURE_VERTEX_BUFFER_BIT",
>+        "VK_FORMAT_FEATURE_UNIFORM_TEXEL_BUFFER_BIT"
>+    ],
>+    "VK_FORMAT_R16G16_SINT": [
>+        "VK_FORMAT_FEATURE_SAMPLED_IMAGE_BIT",
>+        "VK_FORMAT_FEATURE_BLIT_SRC_BIT",
>+        "VK_FORMAT_FEATURE_COLOR_ATTACHMENT_BIT",
>+        "VK_FORMAT_FEATURE_BLIT_DST_BIT",
>+        "VK_FORMAT_FEATURE_VERTEX_BUFFER_BIT",
>+        "VK_FORMAT_FEATURE_UNIFORM_TEXEL_BUFFER_BIT"
>+    ],
>+    "VK_FORMAT_R16G16_SFLOAT": [
>+        "VK_FORMAT_FEATURE_SAMPLED_IMAGE_BIT",
>+        "VK_FORMAT_FEATURE_BLIT_SRC_BIT",
>+        "VK_FORMAT_FEATURE_SAMPLED_IMAGE_FILTER_LINEAR_BIT",
>+        "VK_FORMAT_FEATURE_COLOR_ATTACHMENT_BIT",
>+        "VK_FORMAT_FEATURE_BLIT_DST_BIT",
>+        "VK_FORMAT_FEATURE_COLOR_ATTACHMENT_BLEND_BIT",
>+        "VK_FORMAT_FEATURE_VERTEX_BUFFER_BIT",
>+        "VK_FORMAT_FEATURE_UNIFORM_TEXEL_BUFFER_BIT"
>+    ],
>+    "VK_FORMAT_R16G16B16A16_UNORM": [
>+        "VK_FORMAT_FEATURE_VERTEX_BUFFER_BIT"
>+    ],
>+    "VK_FORMAT_R16G16B16A16_SNORM": [
>+        "VK_FORMAT_FEATURE_VERTEX_BUFFER_BIT"
>+    ],
>+    "VK_FORMAT_R16G16B16A16_UINT": [
>+        "VK_FORMAT_FEATURE_SAMPLED_IMAGE_BIT",
>+        "VK_FORMAT_FEATURE_BLIT_SRC_BIT",
>+        "VK_FORMAT_FEATURE_STORAGE_IMAGE_BIT",
>+        "VK_FORMAT_FEATURE_COLOR_ATTACHMENT_BIT",
>+        "VK_FORMAT_FEATURE_BLIT_DST_BIT",
>+        "VK_FORMAT_FEATURE_VERTEX_BUFFER_BIT",
>+        "VK_FORMAT_FEATURE_UNIFORM_TEXEL_BUFFER_BIT",
>+        "VK_FORMAT_FEATURE_STORAGE_TEXEL_BUFFER_BIT"
>+    ],
>+    "VK_FORMAT_R16G16B16A16_SINT": [
>+        "VK_FORMAT_FEATURE_SAMPLED_IMAGE_BIT",
>+        "VK_FORMAT_FEATURE_BLIT_SRC_BIT",
>+        "VK_FORMAT_FEATURE_STORAGE_IMAGE_BIT",
>+        "VK_FORMAT_FEATURE_COLOR_ATTACHMENT_BIT",
>+        "VK_FORMAT_FEATURE_BLIT_DST_BIT",
>+        "VK_FORMAT_FEATURE_VERTEX_BUFFER_BIT",
>+        "VK_FORMAT_FEATURE_UNIFORM_TEXEL_BUFFER_BIT",
>+        "VK_FORMAT_FEATURE_STORAGE_TEXEL_BUFFER_BIT"
>+    ],
>+    "VK_FORMAT_R16G16B16A16_SFLOAT": [
>+        "VK_FORMAT_FEATURE_SAMPLED_IMAGE_BIT",
>+        "VK_FORMAT_FEATURE_BLIT_SRC_BIT",
>+        "VK_FORMAT_FEATURE_SAMPLED_IMAGE_FILTER_LINEAR_BIT",
>+        "VK_FORMAT_FEATURE_STORAGE_IMAGE_BIT",
>+        "VK_FORMAT_FEATURE_COLOR_ATTACHMENT_BIT",
>+        "VK_FORMAT_FEATURE_BLIT_DST_BIT",
>+        "VK_FORMAT_FEATURE_COLOR_ATTACHMENT_BLEND_BIT",
>+        "VK_FORMAT_FEATURE_VERTEX_BUFFER_BIT",
>+        "VK_FORMAT_FEATURE_UNIFORM_TEXEL_BUFFER_BIT",
>+        "VK_FORMAT_FEATURE_STORAGE_TEXEL_BUFFER_BIT"
>+    ],
>+    "VK_FORMAT_R32_UINT": [
>+        "VK_FORMAT_FEATURE_SAMPLED_IMAGE_BIT",
>+        "VK_FORMAT_FEATURE_BLIT_SRC_BIT",
>+        "VK_FORMAT_FEATURE_STORAGE_IMAGE_BIT",
>+        "VK_FORMAT_FEATURE_STORAGE_IMAGE_ATOMIC_BIT",
>+        "VK_FORMAT_FEATURE_COLOR_ATTACHMENT_BIT",
>+        "VK_FORMAT_FEATURE_BLIT_DST_BIT",
>+        "VK_FORMAT_FEATURE_VERTEX_BUFFER_BIT",
>+        "VK_FORMAT_FEATURE_UNIFORM_TEXEL_BUFFER_BIT",
>+        "VK_FORMAT_FEATURE_STORAGE_TEXEL_BUFFER_BIT",
>+        "VK_FORMAT_FEATURE_STORAGE_TEXEL_BUFFER_ATOMIC_BIT"
>+    ],
>+    "VK_FORMAT_R32_SINT": [
>+        "VK_FORMAT_FEATURE_SAMPLED_IMAGE_BIT",
>+        "VK_FORMAT_FEATURE_BLIT_SRC_BIT",
>+        "VK_FORMAT_FEATURE_STORAGE_IMAGE_BIT",
>+        "VK_FORMAT_FEATURE_STORAGE_IMAGE_ATOMIC_BIT",
>+        "VK_FORMAT_FEATURE_COLOR_ATTACHMENT_BIT",
>+        "VK_FORMAT_FEATURE_BLIT_DST_BIT",
>+        "VK_FORMAT_FEATURE_VERTEX_BUFFER_BIT",
>+        "VK_FORMAT_FEATURE_UNIFORM_TEXEL_BUFFER_BIT",
>+        "VK_FORMAT_FEATURE_STORAGE_TEXEL_BUFFER_BIT",
>+        "VK_FORMAT_FEATURE_STORAGE_TEXEL_BUFFER_ATOMIC_BIT"
>+    ],
>+    "VK_FORMAT_R32_SFLOAT": [
>+        "VK_FORMAT_FEATURE_SAMPLED_IMAGE_BIT",
>+        "VK_FORMAT_FEATURE_BLIT_SRC_BIT",
>+        "VK_FORMAT_FEATURE_STORAGE_IMAGE_BIT",
>+        "VK_FORMAT_FEATURE_COLOR_ATTACHMENT_BIT",
>+        "VK_FORMAT_FEATURE_BLIT_DST_BIT",
>+        "VK_FORMAT_FEATURE_VERTEX_BUFFER_BIT",
>+        "VK_FORMAT_FEATURE_UNIFORM_TEXEL_BUFFER_BIT",
>+        "VK_FORMAT_FEATURE_STORAGE_TEXEL_BUFFER_BIT"
>+    ],
>+    "VK_FORMAT_R32G32_UINT": [
>+        "VK_FORMAT_FEATURE_SAMPLED_IMAGE_BIT",
>+        "VK_FORMAT_FEATURE_BLIT_SRC_BIT",
>+        "VK_FORMAT_FEATURE_STORAGE_IMAGE_BIT",
>+        "VK_FORMAT_FEATURE_COLOR_ATTACHMENT_BIT",
>+        "VK_FORMAT_FEATURE_BLIT_DST_BIT",
>+        "VK_FORMAT_FEATURE_VERTEX_BUFFER_BIT",
>+        "VK_FORMAT_FEATURE_UNIFORM_TEXEL_BUFFER_BIT",
>+        "VK_FORMAT_FEATURE_STORAGE_TEXEL_BUFFER_BIT"
>+    ],
>+    "VK_FORMAT_R32G32_SINT": [
>+        "VK_FORMAT_FEATURE_SAMPLED_IMAGE_BIT",
>+        "VK_FORMAT_FEATURE_BLIT_SRC_BIT",
>+        "VK_FORMAT_FEATURE_STORAGE_IMAGE_BIT",
>+        "VK_FORMAT_FEATURE_COLOR_ATTACHMENT_BIT",
>+        "VK_FORMAT_FEATURE_BLIT_DST_BIT",
>+        "VK_FORMAT_FEATURE_VERTEX_BUFFER_BIT",
>+        "VK_FORMAT_FEATURE_UNIFORM_TEXEL_BUFFER_BIT",
>+        "VK_FORMAT_FEATURE_STORAGE_TEXEL_BUFFER_BIT"
>+    ],
>+    "VK_FORMAT_R32G32_SFLOAT": [
>+        "VK_FORMAT_FEATURE_SAMPLED_IMAGE_BIT",
>+        "VK_FORMAT_FEATURE_BLIT_SRC_BIT",
>+        "VK_FORMAT_FEATURE_STORAGE_IMAGE_BIT",
>+        "VK_FORMAT_FEATURE_COLOR_ATTACHMENT_BIT",
>+        "VK_FORMAT_FEATURE_BLIT_DST_BIT",
>+        "VK_FORMAT_FEATURE_VERTEX_BUFFER_BIT",
>+        "VK_FORMAT_FEATURE_UNIFORM_TEXEL_BUFFER_BIT",
>+        "VK_FORMAT_FEATURE_STORAGE_TEXEL_BUFFER_BIT"
>+    ],
>+    "VK_FORMAT_R32G32B32_UINT": [
>+        "VK_FORMAT_FEATURE_VERTEX_BUFFER_BIT"
>+    ],
>+    "VK_FORMAT_R32G32B32_SINT": [
>+        "VK_FORMAT_FEATURE_VERTEX_BUFFER_BIT"
>+    ],
>+    "VK_FORMAT_R32G32B32_SFLOAT": [
>+        "VK_FORMAT_FEATURE_VERTEX_BUFFER_BIT"
>+    ],
>+    "VK_FORMAT_R32G32B32A32_UINT": [
>+        "VK_FORMAT_FEATURE_SAMPLED_IMAGE_BIT",
>+        "VK_FORMAT_FEATURE_BLIT_SRC_BIT",
>+        "VK_FORMAT_FEATURE_STORAGE_IMAGE_BIT",
>+        "VK_FORMAT_FEATURE_COLOR_ATTACHMENT_BIT",
>+        "VK_FORMAT_FEATURE_BLIT_DST_BIT",
>+        "VK_FORMAT_FEATURE_VERTEX_BUFFER_BIT",
>+        "VK_FORMAT_FEATURE_UNIFORM_TEXEL_BUFFER_BIT",
>+        "VK_FORMAT_FEATURE_STORAGE_TEXEL_BUFFER_BIT"
>+    ],
>+    "VK_FORMAT_R32G32B32A32_SINT": [
>+        "VK_FORMAT_FEATURE_SAMPLED_IMAGE_BIT",
>+        "VK_FORMAT_FEATURE_BLIT_SRC_BIT",
>+        "VK_FORMAT_FEATURE_STORAGE_IMAGE_BIT",
>+        "VK_FORMAT_FEATURE_COLOR_ATTACHMENT_BIT",
>+        "VK_FORMAT_FEATURE_BLIT_DST_BIT",
>+        "VK_FORMAT_FEATURE_VERTEX_BUFFER_BIT",
>+        "VK_FORMAT_FEATURE_UNIFORM_TEXEL_BUFFER_BIT",
>+        "VK_FORMAT_FEATURE_STORAGE_TEXEL_BUFFER_BIT"
>+    ],
>+    "VK_FORMAT_R32G32B32A32_SFLOAT": [
>+        "VK_FORMAT_FEATURE_SAMPLED_IMAGE_BIT",
>+        "VK_FORMAT_FEATURE_BLIT_SRC_BIT",
>+        "VK_FORMAT_FEATURE_STORAGE_IMAGE_BIT",
>+        "VK_FORMAT_FEATURE_COLOR_ATTACHMENT_BIT",
>+        "VK_FORMAT_FEATURE_BLIT_DST_BIT",
>+        "VK_FORMAT_FEATURE_VERTEX_BUFFER_BIT",
>+        "VK_FORMAT_FEATURE_UNIFORM_TEXEL_BUFFER_BIT",
>+        "VK_FORMAT_FEATURE_STORAGE_TEXEL_BUFFER_BIT"
>+    ],
>+    "VK_FORMAT_B10G11R11_UFLOAT_PACK32": [
>+        "VK_FORMAT_FEATURE_SAMPLED_IMAGE_BIT",
>+        "VK_FORMAT_FEATURE_BLIT_SRC_BIT",
>+        "VK_FORMAT_FEATURE_SAMPLED_IMAGE_FILTER_LINEAR_BIT",
>+        "VK_FORMAT_FEATURE_UNIFORM_TEXEL_BUFFER_BIT"
>+    ],
>+    "VK_FORMAT_E5B9G9R9_UFLOAT_PACK32": [
>+        "VK_FORMAT_FEATURE_SAMPLED_IMAGE_BIT",
>+        "VK_FORMAT_FEATURE_BLIT_SRC_BIT",
>+        "VK_FORMAT_FEATURE_SAMPLED_IMAGE_FILTER_LINEAR_BIT"
>+    ],
>+    "VK_FORMAT_D16_UNORM": [
>+        "VK_FORMAT_FEATURE_SAMPLED_IMAGE_BIT",
>+        "VK_FORMAT_FEATURE_BLIT_SRC_BIT",
>+        "VK_FORMAT_FEATURE_DEPTH_STENCIL_ATTACHMENT_BIT"
>+    ]
>+}
>\ No newline at end of file
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/vk_mandatory_format_support_table_autogen.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/vk_mandatory_format_support_table_autogen.cpp
>new file mode 100644
>index 00000000000..dbc2baaa51d
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/vk_mandatory_format_support_table_autogen.cpp
>@@ -0,0 +1,609 @@
>+// GENERATED FILE - DO NOT EDIT.
>+// Generated by gen_vk_mandatory_format_support_table.py using data from
>+// vk_mandatory_format_support_data.json and the vk.xml file situated at
>+// /third_party/vulkan-validation-layers/src/scripts/vk.xml
>+//
>+// Copyright 2019 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// vk_mandatory_format_support_table_autogen.cpp:
>+//   Queries for full Vulkan mandatory format support information based on VK format.
>+
>+#include "libANGLE/renderer/vulkan/vk_format_utils.h"
>+
>+using namespace angle;
>+
>+namespace rx
>+{
>+
>+namespace vk
>+{
>+
>+namespace
>+{
>+static_assert(185 == kNumVkFormats, "Update kNumVkFormats");
>+constexpr std::array<VkFormatProperties, kNumVkFormats> kFormatProperties = {{
>+
>+    /* VK_FORMAT_UNDEFINED */
>+    {0, 0, 0},
>+    /* VK_FORMAT_R4G4_UNORM_PACK8 */
>+    {0, 0, 0},
>+    /* VK_FORMAT_R4G4B4A4_UNORM_PACK16 */
>+    {0, 0, 0},
>+    /* VK_FORMAT_B4G4R4A4_UNORM_PACK16 */
>+    {0,
>+     VK_FORMAT_FEATURE_SAMPLED_IMAGE_BIT | VK_FORMAT_FEATURE_BLIT_SRC_BIT |
>+         VK_FORMAT_FEATURE_SAMPLED_IMAGE_FILTER_LINEAR_BIT,
>+     0},
>+    /* VK_FORMAT_R5G6B5_UNORM_PACK16 */
>+    {0,
>+     VK_FORMAT_FEATURE_SAMPLED_IMAGE_BIT | VK_FORMAT_FEATURE_BLIT_SRC_BIT |
>+         VK_FORMAT_FEATURE_SAMPLED_IMAGE_FILTER_LINEAR_BIT |
>+         VK_FORMAT_FEATURE_COLOR_ATTACHMENT_BIT | VK_FORMAT_FEATURE_BLIT_DST_BIT |
>+         VK_FORMAT_FEATURE_COLOR_ATTACHMENT_BLEND_BIT,
>+     0},
>+    /* VK_FORMAT_B5G6R5_UNORM_PACK16 */
>+    {0, 0, 0},
>+    /* VK_FORMAT_R5G5B5A1_UNORM_PACK16 */
>+    {0, 0, 0},
>+    /* VK_FORMAT_B5G5R5A1_UNORM_PACK16 */
>+    {0, 0, 0},
>+    /* VK_FORMAT_A1R5G5B5_UNORM_PACK16 */
>+    {0,
>+     VK_FORMAT_FEATURE_SAMPLED_IMAGE_BIT | VK_FORMAT_FEATURE_BLIT_SRC_BIT |
>+         VK_FORMAT_FEATURE_SAMPLED_IMAGE_FILTER_LINEAR_BIT |
>+         VK_FORMAT_FEATURE_COLOR_ATTACHMENT_BIT | VK_FORMAT_FEATURE_BLIT_DST_BIT |
>+         VK_FORMAT_FEATURE_COLOR_ATTACHMENT_BLEND_BIT,
>+     0},
>+    /* VK_FORMAT_R8_UNORM */
>+    {0,
>+     VK_FORMAT_FEATURE_SAMPLED_IMAGE_BIT | VK_FORMAT_FEATURE_BLIT_SRC_BIT |
>+         VK_FORMAT_FEATURE_SAMPLED_IMAGE_FILTER_LINEAR_BIT |
>+         VK_FORMAT_FEATURE_COLOR_ATTACHMENT_BIT | VK_FORMAT_FEATURE_BLIT_DST_BIT |
>+         VK_FORMAT_FEATURE_COLOR_ATTACHMENT_BLEND_BIT,
>+     VK_FORMAT_FEATURE_VERTEX_BUFFER_BIT | VK_FORMAT_FEATURE_UNIFORM_TEXEL_BUFFER_BIT},
>+    /* VK_FORMAT_R8_SNORM */
>+    {0,
>+     VK_FORMAT_FEATURE_SAMPLED_IMAGE_BIT | VK_FORMAT_FEATURE_BLIT_SRC_BIT |
>+         VK_FORMAT_FEATURE_SAMPLED_IMAGE_FILTER_LINEAR_BIT,
>+     VK_FORMAT_FEATURE_VERTEX_BUFFER_BIT | VK_FORMAT_FEATURE_UNIFORM_TEXEL_BUFFER_BIT},
>+    /* VK_FORMAT_R8_USCALED */
>+    {0, 0, 0},
>+    /* VK_FORMAT_R8_SSCALED */
>+    {0, 0, 0},
>+    /* VK_FORMAT_R8_UINT */
>+    {0,
>+     VK_FORMAT_FEATURE_SAMPLED_IMAGE_BIT | VK_FORMAT_FEATURE_BLIT_SRC_BIT |
>+         VK_FORMAT_FEATURE_COLOR_ATTACHMENT_BIT | VK_FORMAT_FEATURE_BLIT_DST_BIT,
>+     VK_FORMAT_FEATURE_VERTEX_BUFFER_BIT | VK_FORMAT_FEATURE_UNIFORM_TEXEL_BUFFER_BIT},
>+    /* VK_FORMAT_R8_SINT */
>+    {0,
>+     VK_FORMAT_FEATURE_SAMPLED_IMAGE_BIT | VK_FORMAT_FEATURE_BLIT_SRC_BIT |
>+         VK_FORMAT_FEATURE_COLOR_ATTACHMENT_BIT | VK_FORMAT_FEATURE_BLIT_DST_BIT,
>+     VK_FORMAT_FEATURE_VERTEX_BUFFER_BIT | VK_FORMAT_FEATURE_UNIFORM_TEXEL_BUFFER_BIT},
>+    /* VK_FORMAT_R8_SRGB */
>+    {0, 0, 0},
>+    /* VK_FORMAT_R8G8_UNORM */
>+    {0,
>+     VK_FORMAT_FEATURE_SAMPLED_IMAGE_BIT | VK_FORMAT_FEATURE_BLIT_SRC_BIT |
>+         VK_FORMAT_FEATURE_SAMPLED_IMAGE_FILTER_LINEAR_BIT |
>+         VK_FORMAT_FEATURE_COLOR_ATTACHMENT_BIT | VK_FORMAT_FEATURE_BLIT_DST_BIT |
>+         VK_FORMAT_FEATURE_COLOR_ATTACHMENT_BLEND_BIT,
>+     VK_FORMAT_FEATURE_VERTEX_BUFFER_BIT | VK_FORMAT_FEATURE_UNIFORM_TEXEL_BUFFER_BIT},
>+    /* VK_FORMAT_R8G8_SNORM */
>+    {0,
>+     VK_FORMAT_FEATURE_SAMPLED_IMAGE_BIT | VK_FORMAT_FEATURE_BLIT_SRC_BIT |
>+         VK_FORMAT_FEATURE_SAMPLED_IMAGE_FILTER_LINEAR_BIT,
>+     VK_FORMAT_FEATURE_VERTEX_BUFFER_BIT | VK_FORMAT_FEATURE_UNIFORM_TEXEL_BUFFER_BIT},
>+    /* VK_FORMAT_R8G8_USCALED */
>+    {0, 0, 0},
>+    /* VK_FORMAT_R8G8_SSCALED */
>+    {0, 0, 0},
>+    /* VK_FORMAT_R8G8_UINT */
>+    {0,
>+     VK_FORMAT_FEATURE_SAMPLED_IMAGE_BIT | VK_FORMAT_FEATURE_BLIT_SRC_BIT |
>+         VK_FORMAT_FEATURE_COLOR_ATTACHMENT_BIT | VK_FORMAT_FEATURE_BLIT_DST_BIT,
>+     VK_FORMAT_FEATURE_VERTEX_BUFFER_BIT | VK_FORMAT_FEATURE_UNIFORM_TEXEL_BUFFER_BIT},
>+    /* VK_FORMAT_R8G8_SINT */
>+    {0,
>+     VK_FORMAT_FEATURE_SAMPLED_IMAGE_BIT | VK_FORMAT_FEATURE_BLIT_SRC_BIT |
>+         VK_FORMAT_FEATURE_COLOR_ATTACHMENT_BIT | VK_FORMAT_FEATURE_BLIT_DST_BIT,
>+     VK_FORMAT_FEATURE_VERTEX_BUFFER_BIT | VK_FORMAT_FEATURE_UNIFORM_TEXEL_BUFFER_BIT},
>+    /* VK_FORMAT_R8G8_SRGB */
>+    {0, 0, 0},
>+    /* VK_FORMAT_R8G8B8_UNORM */
>+    {0, 0, 0},
>+    /* VK_FORMAT_R8G8B8_SNORM */
>+    {0, 0, 0},
>+    /* VK_FORMAT_R8G8B8_USCALED */
>+    {0, 0, 0},
>+    /* VK_FORMAT_R8G8B8_SSCALED */
>+    {0, 0, 0},
>+    /* VK_FORMAT_R8G8B8_UINT */
>+    {0, 0, 0},
>+    /* VK_FORMAT_R8G8B8_SINT */
>+    {0, 0, 0},
>+    /* VK_FORMAT_R8G8B8_SRGB */
>+    {0, 0, 0},
>+    /* VK_FORMAT_B8G8R8_UNORM */
>+    {0, 0, 0},
>+    /* VK_FORMAT_B8G8R8_SNORM */
>+    {0, 0, 0},
>+    /* VK_FORMAT_B8G8R8_USCALED */
>+    {0, 0, 0},
>+    /* VK_FORMAT_B8G8R8_SSCALED */
>+    {0, 0, 0},
>+    /* VK_FORMAT_B8G8R8_UINT */
>+    {0, 0, 0},
>+    /* VK_FORMAT_B8G8R8_SINT */
>+    {0, 0, 0},
>+    /* VK_FORMAT_B8G8R8_SRGB */
>+    {0, 0, 0},
>+    /* VK_FORMAT_R8G8B8A8_UNORM */
>+    {0,
>+     VK_FORMAT_FEATURE_SAMPLED_IMAGE_BIT | VK_FORMAT_FEATURE_BLIT_SRC_BIT |
>+         VK_FORMAT_FEATURE_SAMPLED_IMAGE_FILTER_LINEAR_BIT | VK_FORMAT_FEATURE_STORAGE_IMAGE_BIT |
>+         VK_FORMAT_FEATURE_COLOR_ATTACHMENT_BIT | VK_FORMAT_FEATURE_BLIT_DST_BIT |
>+         VK_FORMAT_FEATURE_COLOR_ATTACHMENT_BLEND_BIT,
>+     VK_FORMAT_FEATURE_VERTEX_BUFFER_BIT | VK_FORMAT_FEATURE_UNIFORM_TEXEL_BUFFER_BIT |
>+         VK_FORMAT_FEATURE_STORAGE_TEXEL_BUFFER_BIT},
>+    /* VK_FORMAT_R8G8B8A8_SNORM */
>+    {0,
>+     VK_FORMAT_FEATURE_SAMPLED_IMAGE_BIT | VK_FORMAT_FEATURE_BLIT_SRC_BIT |
>+         VK_FORMAT_FEATURE_SAMPLED_IMAGE_FILTER_LINEAR_BIT | VK_FORMAT_FEATURE_STORAGE_IMAGE_BIT,
>+     VK_FORMAT_FEATURE_VERTEX_BUFFER_BIT | VK_FORMAT_FEATURE_UNIFORM_TEXEL_BUFFER_BIT |
>+         VK_FORMAT_FEATURE_STORAGE_TEXEL_BUFFER_BIT},
>+    /* VK_FORMAT_R8G8B8A8_USCALED */
>+    {0, 0, 0},
>+    /* VK_FORMAT_R8G8B8A8_SSCALED */
>+    {0, 0, 0},
>+    /* VK_FORMAT_R8G8B8A8_UINT */
>+    {0,
>+     VK_FORMAT_FEATURE_SAMPLED_IMAGE_BIT | VK_FORMAT_FEATURE_BLIT_SRC_BIT |
>+         VK_FORMAT_FEATURE_STORAGE_IMAGE_BIT | VK_FORMAT_FEATURE_COLOR_ATTACHMENT_BIT |
>+         VK_FORMAT_FEATURE_BLIT_DST_BIT,
>+     VK_FORMAT_FEATURE_VERTEX_BUFFER_BIT | VK_FORMAT_FEATURE_UNIFORM_TEXEL_BUFFER_BIT |
>+         VK_FORMAT_FEATURE_STORAGE_TEXEL_BUFFER_BIT},
>+    /* VK_FORMAT_R8G8B8A8_SINT */
>+    {0,
>+     VK_FORMAT_FEATURE_SAMPLED_IMAGE_BIT | VK_FORMAT_FEATURE_BLIT_SRC_BIT |
>+         VK_FORMAT_FEATURE_STORAGE_IMAGE_BIT | VK_FORMAT_FEATURE_COLOR_ATTACHMENT_BIT |
>+         VK_FORMAT_FEATURE_BLIT_DST_BIT,
>+     VK_FORMAT_FEATURE_VERTEX_BUFFER_BIT | VK_FORMAT_FEATURE_UNIFORM_TEXEL_BUFFER_BIT |
>+         VK_FORMAT_FEATURE_STORAGE_TEXEL_BUFFER_BIT},
>+    /* VK_FORMAT_R8G8B8A8_SRGB */
>+    {0,
>+     VK_FORMAT_FEATURE_SAMPLED_IMAGE_BIT | VK_FORMAT_FEATURE_BLIT_SRC_BIT |
>+         VK_FORMAT_FEATURE_SAMPLED_IMAGE_FILTER_LINEAR_BIT |
>+         VK_FORMAT_FEATURE_COLOR_ATTACHMENT_BIT | VK_FORMAT_FEATURE_BLIT_DST_BIT |
>+         VK_FORMAT_FEATURE_COLOR_ATTACHMENT_BLEND_BIT,
>+     0},
>+    /* VK_FORMAT_B8G8R8A8_UNORM */
>+    {0,
>+     VK_FORMAT_FEATURE_SAMPLED_IMAGE_BIT | VK_FORMAT_FEATURE_BLIT_SRC_BIT |
>+         VK_FORMAT_FEATURE_SAMPLED_IMAGE_FILTER_LINEAR_BIT |
>+         VK_FORMAT_FEATURE_COLOR_ATTACHMENT_BIT | VK_FORMAT_FEATURE_BLIT_DST_BIT |
>+         VK_FORMAT_FEATURE_COLOR_ATTACHMENT_BLEND_BIT,
>+     VK_FORMAT_FEATURE_VERTEX_BUFFER_BIT | VK_FORMAT_FEATURE_UNIFORM_TEXEL_BUFFER_BIT},
>+    /* VK_FORMAT_B8G8R8A8_SNORM */
>+    {0, 0, 0},
>+    /* VK_FORMAT_B8G8R8A8_USCALED */
>+    {0, 0, 0},
>+    /* VK_FORMAT_B8G8R8A8_SSCALED */
>+    {0, 0, 0},
>+    /* VK_FORMAT_B8G8R8A8_UINT */
>+    {0, 0, 0},
>+    /* VK_FORMAT_B8G8R8A8_SINT */
>+    {0, 0, 0},
>+    /* VK_FORMAT_B8G8R8A8_SRGB */
>+    {0,
>+     VK_FORMAT_FEATURE_SAMPLED_IMAGE_BIT | VK_FORMAT_FEATURE_BLIT_SRC_BIT |
>+         VK_FORMAT_FEATURE_SAMPLED_IMAGE_FILTER_LINEAR_BIT |
>+         VK_FORMAT_FEATURE_COLOR_ATTACHMENT_BIT | VK_FORMAT_FEATURE_BLIT_DST_BIT |
>+         VK_FORMAT_FEATURE_COLOR_ATTACHMENT_BLEND_BIT,
>+     0},
>+    /* VK_FORMAT_A8B8G8R8_UNORM_PACK32 */
>+    {0,
>+     VK_FORMAT_FEATURE_SAMPLED_IMAGE_BIT | VK_FORMAT_FEATURE_BLIT_SRC_BIT |
>+         VK_FORMAT_FEATURE_SAMPLED_IMAGE_FILTER_LINEAR_BIT |
>+         VK_FORMAT_FEATURE_COLOR_ATTACHMENT_BIT | VK_FORMAT_FEATURE_BLIT_DST_BIT |
>+         VK_FORMAT_FEATURE_COLOR_ATTACHMENT_BLEND_BIT,
>+     VK_FORMAT_FEATURE_VERTEX_BUFFER_BIT | VK_FORMAT_FEATURE_UNIFORM_TEXEL_BUFFER_BIT |
>+         VK_FORMAT_FEATURE_STORAGE_TEXEL_BUFFER_BIT},
>+    /* VK_FORMAT_A8B8G8R8_SNORM_PACK32 */
>+    {0,
>+     VK_FORMAT_FEATURE_SAMPLED_IMAGE_BIT | VK_FORMAT_FEATURE_BLIT_SRC_BIT |
>+         VK_FORMAT_FEATURE_SAMPLED_IMAGE_FILTER_LINEAR_BIT,
>+     VK_FORMAT_FEATURE_VERTEX_BUFFER_BIT | VK_FORMAT_FEATURE_UNIFORM_TEXEL_BUFFER_BIT |
>+         VK_FORMAT_FEATURE_STORAGE_TEXEL_BUFFER_BIT},
>+    /* VK_FORMAT_A8B8G8R8_USCALED_PACK32 */
>+    {0, 0, 0},
>+    /* VK_FORMAT_A8B8G8R8_SSCALED_PACK32 */
>+    {0, 0, 0},
>+    /* VK_FORMAT_A8B8G8R8_UINT_PACK32 */
>+    {0,
>+     VK_FORMAT_FEATURE_SAMPLED_IMAGE_BIT | VK_FORMAT_FEATURE_BLIT_SRC_BIT |
>+         VK_FORMAT_FEATURE_COLOR_ATTACHMENT_BIT | VK_FORMAT_FEATURE_BLIT_DST_BIT,
>+     VK_FORMAT_FEATURE_VERTEX_BUFFER_BIT | VK_FORMAT_FEATURE_UNIFORM_TEXEL_BUFFER_BIT |
>+         VK_FORMAT_FEATURE_STORAGE_TEXEL_BUFFER_BIT},
>+    /* VK_FORMAT_A8B8G8R8_SINT_PACK32 */
>+    {0,
>+     VK_FORMAT_FEATURE_SAMPLED_IMAGE_BIT | VK_FORMAT_FEATURE_BLIT_SRC_BIT |
>+         VK_FORMAT_FEATURE_COLOR_ATTACHMENT_BIT | VK_FORMAT_FEATURE_BLIT_DST_BIT,
>+     VK_FORMAT_FEATURE_VERTEX_BUFFER_BIT | VK_FORMAT_FEATURE_UNIFORM_TEXEL_BUFFER_BIT |
>+         VK_FORMAT_FEATURE_STORAGE_TEXEL_BUFFER_BIT},
>+    /* VK_FORMAT_A8B8G8R8_SRGB_PACK32 */
>+    {0,
>+     VK_FORMAT_FEATURE_SAMPLED_IMAGE_BIT | VK_FORMAT_FEATURE_BLIT_SRC_BIT |
>+         VK_FORMAT_FEATURE_SAMPLED_IMAGE_FILTER_LINEAR_BIT |
>+         VK_FORMAT_FEATURE_COLOR_ATTACHMENT_BIT | VK_FORMAT_FEATURE_BLIT_DST_BIT |
>+         VK_FORMAT_FEATURE_COLOR_ATTACHMENT_BLEND_BIT,
>+     0},
>+    /* VK_FORMAT_A2R10G10B10_UNORM_PACK32 */
>+    {0, 0, 0},
>+    /* VK_FORMAT_A2R10G10B10_SNORM_PACK32 */
>+    {0, 0, 0},
>+    /* VK_FORMAT_A2R10G10B10_USCALED_PACK32 */
>+    {0, 0, 0},
>+    /* VK_FORMAT_A2R10G10B10_SSCALED_PACK32 */
>+    {0, 0, 0},
>+    /* VK_FORMAT_A2R10G10B10_UINT_PACK32 */
>+    {0, 0, 0},
>+    /* VK_FORMAT_A2R10G10B10_SINT_PACK32 */
>+    {0, 0, 0},
>+    /* VK_FORMAT_A2B10G10R10_UNORM_PACK32 */
>+    {0,
>+     VK_FORMAT_FEATURE_SAMPLED_IMAGE_BIT | VK_FORMAT_FEATURE_BLIT_SRC_BIT |
>+         VK_FORMAT_FEATURE_SAMPLED_IMAGE_FILTER_LINEAR_BIT |
>+         VK_FORMAT_FEATURE_COLOR_ATTACHMENT_BIT | VK_FORMAT_FEATURE_BLIT_DST_BIT |
>+         VK_FORMAT_FEATURE_COLOR_ATTACHMENT_BLEND_BIT,
>+     VK_FORMAT_FEATURE_VERTEX_BUFFER_BIT | VK_FORMAT_FEATURE_UNIFORM_TEXEL_BUFFER_BIT},
>+    /* VK_FORMAT_A2B10G10R10_SNORM_PACK32 */
>+    {0, 0, 0},
>+    /* VK_FORMAT_A2B10G10R10_USCALED_PACK32 */
>+    {0, 0, 0},
>+    /* VK_FORMAT_A2B10G10R10_SSCALED_PACK32 */
>+    {0, 0, 0},
>+    /* VK_FORMAT_A2B10G10R10_UINT_PACK32 */
>+    {0,
>+     VK_FORMAT_FEATURE_SAMPLED_IMAGE_BIT | VK_FORMAT_FEATURE_BLIT_SRC_BIT |
>+         VK_FORMAT_FEATURE_COLOR_ATTACHMENT_BIT | VK_FORMAT_FEATURE_BLIT_DST_BIT,
>+     VK_FORMAT_FEATURE_UNIFORM_TEXEL_BUFFER_BIT},
>+    /* VK_FORMAT_A2B10G10R10_SINT_PACK32 */
>+    {0, 0, 0},
>+    /* VK_FORMAT_R16_UNORM */
>+    {0, 0, VK_FORMAT_FEATURE_VERTEX_BUFFER_BIT},
>+    /* VK_FORMAT_R16_SNORM */
>+    {0, 0, VK_FORMAT_FEATURE_VERTEX_BUFFER_BIT},
>+    /* VK_FORMAT_R16_USCALED */
>+    {0, 0, 0},
>+    /* VK_FORMAT_R16_SSCALED */
>+    {0, 0, 0},
>+    /* VK_FORMAT_R16_UINT */
>+    {0,
>+     VK_FORMAT_FEATURE_SAMPLED_IMAGE_BIT | VK_FORMAT_FEATURE_BLIT_SRC_BIT |
>+         VK_FORMAT_FEATURE_COLOR_ATTACHMENT_BIT | VK_FORMAT_FEATURE_BLIT_DST_BIT,
>+     VK_FORMAT_FEATURE_VERTEX_BUFFER_BIT | VK_FORMAT_FEATURE_UNIFORM_TEXEL_BUFFER_BIT},
>+    /* VK_FORMAT_R16_SINT */
>+    {0,
>+     VK_FORMAT_FEATURE_SAMPLED_IMAGE_BIT | VK_FORMAT_FEATURE_BLIT_SRC_BIT |
>+         VK_FORMAT_FEATURE_COLOR_ATTACHMENT_BIT | VK_FORMAT_FEATURE_BLIT_DST_BIT,
>+     VK_FORMAT_FEATURE_VERTEX_BUFFER_BIT | VK_FORMAT_FEATURE_UNIFORM_TEXEL_BUFFER_BIT},
>+    /* VK_FORMAT_R16_SFLOAT */
>+    {0,
>+     VK_FORMAT_FEATURE_SAMPLED_IMAGE_BIT | VK_FORMAT_FEATURE_BLIT_SRC_BIT |
>+         VK_FORMAT_FEATURE_SAMPLED_IMAGE_FILTER_LINEAR_BIT |
>+         VK_FORMAT_FEATURE_COLOR_ATTACHMENT_BIT | VK_FORMAT_FEATURE_BLIT_DST_BIT |
>+         VK_FORMAT_FEATURE_COLOR_ATTACHMENT_BLEND_BIT,
>+     VK_FORMAT_FEATURE_VERTEX_BUFFER_BIT | VK_FORMAT_FEATURE_UNIFORM_TEXEL_BUFFER_BIT},
>+    /* VK_FORMAT_R16G16_UNORM */
>+    {0, 0, VK_FORMAT_FEATURE_VERTEX_BUFFER_BIT},
>+    /* VK_FORMAT_R16G16_SNORM */
>+    {0, 0, VK_FORMAT_FEATURE_VERTEX_BUFFER_BIT},
>+    /* VK_FORMAT_R16G16_USCALED */
>+    {0, 0, 0},
>+    /* VK_FORMAT_R16G16_SSCALED */
>+    {0, 0, 0},
>+    /* VK_FORMAT_R16G16_UINT */
>+    {0,
>+     VK_FORMAT_FEATURE_SAMPLED_IMAGE_BIT | VK_FORMAT_FEATURE_BLIT_SRC_BIT |
>+         VK_FORMAT_FEATURE_COLOR_ATTACHMENT_BIT | VK_FORMAT_FEATURE_BLIT_DST_BIT,
>+     VK_FORMAT_FEATURE_VERTEX_BUFFER_BIT | VK_FORMAT_FEATURE_UNIFORM_TEXEL_BUFFER_BIT},
>+    /* VK_FORMAT_R16G16_SINT */
>+    {0,
>+     VK_FORMAT_FEATURE_SAMPLED_IMAGE_BIT | VK_FORMAT_FEATURE_BLIT_SRC_BIT |
>+         VK_FORMAT_FEATURE_COLOR_ATTACHMENT_BIT | VK_FORMAT_FEATURE_BLIT_DST_BIT,
>+     VK_FORMAT_FEATURE_VERTEX_BUFFER_BIT | VK_FORMAT_FEATURE_UNIFORM_TEXEL_BUFFER_BIT},
>+    /* VK_FORMAT_R16G16_SFLOAT */
>+    {0,
>+     VK_FORMAT_FEATURE_SAMPLED_IMAGE_BIT | VK_FORMAT_FEATURE_BLIT_SRC_BIT |
>+         VK_FORMAT_FEATURE_SAMPLED_IMAGE_FILTER_LINEAR_BIT |
>+         VK_FORMAT_FEATURE_COLOR_ATTACHMENT_BIT | VK_FORMAT_FEATURE_BLIT_DST_BIT |
>+         VK_FORMAT_FEATURE_COLOR_ATTACHMENT_BLEND_BIT,
>+     VK_FORMAT_FEATURE_VERTEX_BUFFER_BIT | VK_FORMAT_FEATURE_UNIFORM_TEXEL_BUFFER_BIT},
>+    /* VK_FORMAT_R16G16B16_UNORM */
>+    {0, 0, 0},
>+    /* VK_FORMAT_R16G16B16_SNORM */
>+    {0, 0, 0},
>+    /* VK_FORMAT_R16G16B16_USCALED */
>+    {0, 0, 0},
>+    /* VK_FORMAT_R16G16B16_SSCALED */
>+    {0, 0, 0},
>+    /* VK_FORMAT_R16G16B16_UINT */
>+    {0, 0, 0},
>+    /* VK_FORMAT_R16G16B16_SINT */
>+    {0, 0, 0},
>+    /* VK_FORMAT_R16G16B16_SFLOAT */
>+    {0, 0, 0},
>+    /* VK_FORMAT_R16G16B16A16_UNORM */
>+    {0, 0, VK_FORMAT_FEATURE_VERTEX_BUFFER_BIT},
>+    /* VK_FORMAT_R16G16B16A16_SNORM */
>+    {0, 0, VK_FORMAT_FEATURE_VERTEX_BUFFER_BIT},
>+    /* VK_FORMAT_R16G16B16A16_USCALED */
>+    {0, 0, 0},
>+    /* VK_FORMAT_R16G16B16A16_SSCALED */
>+    {0, 0, 0},
>+    /* VK_FORMAT_R16G16B16A16_UINT */
>+    {0,
>+     VK_FORMAT_FEATURE_SAMPLED_IMAGE_BIT | VK_FORMAT_FEATURE_BLIT_SRC_BIT |
>+         VK_FORMAT_FEATURE_STORAGE_IMAGE_BIT | VK_FORMAT_FEATURE_COLOR_ATTACHMENT_BIT |
>+         VK_FORMAT_FEATURE_BLIT_DST_BIT,
>+     VK_FORMAT_FEATURE_VERTEX_BUFFER_BIT | VK_FORMAT_FEATURE_UNIFORM_TEXEL_BUFFER_BIT |
>+         VK_FORMAT_FEATURE_STORAGE_TEXEL_BUFFER_BIT},
>+    /* VK_FORMAT_R16G16B16A16_SINT */
>+    {0,
>+     VK_FORMAT_FEATURE_SAMPLED_IMAGE_BIT | VK_FORMAT_FEATURE_BLIT_SRC_BIT |
>+         VK_FORMAT_FEATURE_STORAGE_IMAGE_BIT | VK_FORMAT_FEATURE_COLOR_ATTACHMENT_BIT |
>+         VK_FORMAT_FEATURE_BLIT_DST_BIT,
>+     VK_FORMAT_FEATURE_VERTEX_BUFFER_BIT | VK_FORMAT_FEATURE_UNIFORM_TEXEL_BUFFER_BIT |
>+         VK_FORMAT_FEATURE_STORAGE_TEXEL_BUFFER_BIT},
>+    /* VK_FORMAT_R16G16B16A16_SFLOAT */
>+    {0,
>+     VK_FORMAT_FEATURE_SAMPLED_IMAGE_BIT | VK_FORMAT_FEATURE_BLIT_SRC_BIT |
>+         VK_FORMAT_FEATURE_SAMPLED_IMAGE_FILTER_LINEAR_BIT | VK_FORMAT_FEATURE_STORAGE_IMAGE_BIT |
>+         VK_FORMAT_FEATURE_COLOR_ATTACHMENT_BIT | VK_FORMAT_FEATURE_BLIT_DST_BIT |
>+         VK_FORMAT_FEATURE_COLOR_ATTACHMENT_BLEND_BIT,
>+     VK_FORMAT_FEATURE_VERTEX_BUFFER_BIT | VK_FORMAT_FEATURE_UNIFORM_TEXEL_BUFFER_BIT |
>+         VK_FORMAT_FEATURE_STORAGE_TEXEL_BUFFER_BIT},
>+    /* VK_FORMAT_R32_UINT */
>+    {0,
>+     VK_FORMAT_FEATURE_SAMPLED_IMAGE_BIT | VK_FORMAT_FEATURE_BLIT_SRC_BIT |
>+         VK_FORMAT_FEATURE_STORAGE_IMAGE_BIT | VK_FORMAT_FEATURE_STORAGE_IMAGE_ATOMIC_BIT |
>+         VK_FORMAT_FEATURE_COLOR_ATTACHMENT_BIT | VK_FORMAT_FEATURE_BLIT_DST_BIT,
>+     VK_FORMAT_FEATURE_VERTEX_BUFFER_BIT | VK_FORMAT_FEATURE_UNIFORM_TEXEL_BUFFER_BIT |
>+         VK_FORMAT_FEATURE_STORAGE_TEXEL_BUFFER_BIT |
>+         VK_FORMAT_FEATURE_STORAGE_TEXEL_BUFFER_ATOMIC_BIT},
>+    /* VK_FORMAT_R32_SINT */
>+    {0,
>+     VK_FORMAT_FEATURE_SAMPLED_IMAGE_BIT | VK_FORMAT_FEATURE_BLIT_SRC_BIT |
>+         VK_FORMAT_FEATURE_STORAGE_IMAGE_BIT | VK_FORMAT_FEATURE_STORAGE_IMAGE_ATOMIC_BIT |
>+         VK_FORMAT_FEATURE_COLOR_ATTACHMENT_BIT | VK_FORMAT_FEATURE_BLIT_DST_BIT,
>+     VK_FORMAT_FEATURE_VERTEX_BUFFER_BIT | VK_FORMAT_FEATURE_UNIFORM_TEXEL_BUFFER_BIT |
>+         VK_FORMAT_FEATURE_STORAGE_TEXEL_BUFFER_BIT |
>+         VK_FORMAT_FEATURE_STORAGE_TEXEL_BUFFER_ATOMIC_BIT},
>+    /* VK_FORMAT_R32_SFLOAT */
>+    {0,
>+     VK_FORMAT_FEATURE_SAMPLED_IMAGE_BIT | VK_FORMAT_FEATURE_BLIT_SRC_BIT |
>+         VK_FORMAT_FEATURE_STORAGE_IMAGE_BIT | VK_FORMAT_FEATURE_COLOR_ATTACHMENT_BIT |
>+         VK_FORMAT_FEATURE_BLIT_DST_BIT,
>+     VK_FORMAT_FEATURE_VERTEX_BUFFER_BIT | VK_FORMAT_FEATURE_UNIFORM_TEXEL_BUFFER_BIT |
>+         VK_FORMAT_FEATURE_STORAGE_TEXEL_BUFFER_BIT},
>+    /* VK_FORMAT_R32G32_UINT */
>+    {0,
>+     VK_FORMAT_FEATURE_SAMPLED_IMAGE_BIT | VK_FORMAT_FEATURE_BLIT_SRC_BIT |
>+         VK_FORMAT_FEATURE_STORAGE_IMAGE_BIT | VK_FORMAT_FEATURE_COLOR_ATTACHMENT_BIT |
>+         VK_FORMAT_FEATURE_BLIT_DST_BIT,
>+     VK_FORMAT_FEATURE_VERTEX_BUFFER_BIT | VK_FORMAT_FEATURE_UNIFORM_TEXEL_BUFFER_BIT |
>+         VK_FORMAT_FEATURE_STORAGE_TEXEL_BUFFER_BIT},
>+    /* VK_FORMAT_R32G32_SINT */
>+    {0,
>+     VK_FORMAT_FEATURE_SAMPLED_IMAGE_BIT | VK_FORMAT_FEATURE_BLIT_SRC_BIT |
>+         VK_FORMAT_FEATURE_STORAGE_IMAGE_BIT | VK_FORMAT_FEATURE_COLOR_ATTACHMENT_BIT |
>+         VK_FORMAT_FEATURE_BLIT_DST_BIT,
>+     VK_FORMAT_FEATURE_VERTEX_BUFFER_BIT | VK_FORMAT_FEATURE_UNIFORM_TEXEL_BUFFER_BIT |
>+         VK_FORMAT_FEATURE_STORAGE_TEXEL_BUFFER_BIT},
>+    /* VK_FORMAT_R32G32_SFLOAT */
>+    {0,
>+     VK_FORMAT_FEATURE_SAMPLED_IMAGE_BIT | VK_FORMAT_FEATURE_BLIT_SRC_BIT |
>+         VK_FORMAT_FEATURE_STORAGE_IMAGE_BIT | VK_FORMAT_FEATURE_COLOR_ATTACHMENT_BIT |
>+         VK_FORMAT_FEATURE_BLIT_DST_BIT,
>+     VK_FORMAT_FEATURE_VERTEX_BUFFER_BIT | VK_FORMAT_FEATURE_UNIFORM_TEXEL_BUFFER_BIT |
>+         VK_FORMAT_FEATURE_STORAGE_TEXEL_BUFFER_BIT},
>+    /* VK_FORMAT_R32G32B32_UINT */
>+    {0, 0, VK_FORMAT_FEATURE_VERTEX_BUFFER_BIT},
>+    /* VK_FORMAT_R32G32B32_SINT */
>+    {0, 0, VK_FORMAT_FEATURE_VERTEX_BUFFER_BIT},
>+    /* VK_FORMAT_R32G32B32_SFLOAT */
>+    {0, 0, VK_FORMAT_FEATURE_VERTEX_BUFFER_BIT},
>+    /* VK_FORMAT_R32G32B32A32_UINT */
>+    {0,
>+     VK_FORMAT_FEATURE_SAMPLED_IMAGE_BIT | VK_FORMAT_FEATURE_BLIT_SRC_BIT |
>+         VK_FORMAT_FEATURE_STORAGE_IMAGE_BIT | VK_FORMAT_FEATURE_COLOR_ATTACHMENT_BIT |
>+         VK_FORMAT_FEATURE_BLIT_DST_BIT,
>+     VK_FORMAT_FEATURE_VERTEX_BUFFER_BIT | VK_FORMAT_FEATURE_UNIFORM_TEXEL_BUFFER_BIT |
>+         VK_FORMAT_FEATURE_STORAGE_TEXEL_BUFFER_BIT},
>+    /* VK_FORMAT_R32G32B32A32_SINT */
>+    {0,
>+     VK_FORMAT_FEATURE_SAMPLED_IMAGE_BIT | VK_FORMAT_FEATURE_BLIT_SRC_BIT |
>+         VK_FORMAT_FEATURE_STORAGE_IMAGE_BIT | VK_FORMAT_FEATURE_COLOR_ATTACHMENT_BIT |
>+         VK_FORMAT_FEATURE_BLIT_DST_BIT,
>+     VK_FORMAT_FEATURE_VERTEX_BUFFER_BIT | VK_FORMAT_FEATURE_UNIFORM_TEXEL_BUFFER_BIT |
>+         VK_FORMAT_FEATURE_STORAGE_TEXEL_BUFFER_BIT},
>+    /* VK_FORMAT_R32G32B32A32_SFLOAT */
>+    {0,
>+     VK_FORMAT_FEATURE_SAMPLED_IMAGE_BIT | VK_FORMAT_FEATURE_BLIT_SRC_BIT |
>+         VK_FORMAT_FEATURE_STORAGE_IMAGE_BIT | VK_FORMAT_FEATURE_COLOR_ATTACHMENT_BIT |
>+         VK_FORMAT_FEATURE_BLIT_DST_BIT,
>+     VK_FORMAT_FEATURE_VERTEX_BUFFER_BIT | VK_FORMAT_FEATURE_UNIFORM_TEXEL_BUFFER_BIT |
>+         VK_FORMAT_FEATURE_STORAGE_TEXEL_BUFFER_BIT},
>+    /* VK_FORMAT_R64_UINT */
>+    {0, 0, 0},
>+    /* VK_FORMAT_R64_SINT */
>+    {0, 0, 0},
>+    /* VK_FORMAT_R64_SFLOAT */
>+    {0, 0, 0},
>+    /* VK_FORMAT_R64G64_UINT */
>+    {0, 0, 0},
>+    /* VK_FORMAT_R64G64_SINT */
>+    {0, 0, 0},
>+    /* VK_FORMAT_R64G64_SFLOAT */
>+    {0, 0, 0},
>+    /* VK_FORMAT_R64G64B64_UINT */
>+    {0, 0, 0},
>+    /* VK_FORMAT_R64G64B64_SINT */
>+    {0, 0, 0},
>+    /* VK_FORMAT_R64G64B64_SFLOAT */
>+    {0, 0, 0},
>+    /* VK_FORMAT_R64G64B64A64_UINT */
>+    {0, 0, 0},
>+    /* VK_FORMAT_R64G64B64A64_SINT */
>+    {0, 0, 0},
>+    /* VK_FORMAT_R64G64B64A64_SFLOAT */
>+    {0, 0, 0},
>+    /* VK_FORMAT_B10G11R11_UFLOAT_PACK32 */
>+    {0,
>+     VK_FORMAT_FEATURE_SAMPLED_IMAGE_BIT | VK_FORMAT_FEATURE_BLIT_SRC_BIT |
>+         VK_FORMAT_FEATURE_SAMPLED_IMAGE_FILTER_LINEAR_BIT,
>+     VK_FORMAT_FEATURE_UNIFORM_TEXEL_BUFFER_BIT},
>+    /* VK_FORMAT_E5B9G9R9_UFLOAT_PACK32 */
>+    {0,
>+     VK_FORMAT_FEATURE_SAMPLED_IMAGE_BIT | VK_FORMAT_FEATURE_BLIT_SRC_BIT |
>+         VK_FORMAT_FEATURE_SAMPLED_IMAGE_FILTER_LINEAR_BIT,
>+     0},
>+    /* VK_FORMAT_D16_UNORM */
>+    {0,
>+     VK_FORMAT_FEATURE_SAMPLED_IMAGE_BIT | VK_FORMAT_FEATURE_BLIT_SRC_BIT |
>+         VK_FORMAT_FEATURE_DEPTH_STENCIL_ATTACHMENT_BIT,
>+     0},
>+    /* VK_FORMAT_X8_D24_UNORM_PACK32 */
>+    {0, 0, 0},
>+    /* VK_FORMAT_D32_SFLOAT */
>+    {0, 0, 0},
>+    /* VK_FORMAT_S8_UINT */
>+    {0, 0, 0},
>+    /* VK_FORMAT_D16_UNORM_S8_UINT */
>+    {0, 0, 0},
>+    /* VK_FORMAT_D24_UNORM_S8_UINT */
>+    {0, 0, 0},
>+    /* VK_FORMAT_D32_SFLOAT_S8_UINT */
>+    {0, 0, 0},
>+    /* VK_FORMAT_BC1_RGB_UNORM_BLOCK */
>+    {0, 0, 0},
>+    /* VK_FORMAT_BC1_RGB_SRGB_BLOCK */
>+    {0, 0, 0},
>+    /* VK_FORMAT_BC1_RGBA_UNORM_BLOCK */
>+    {0, 0, 0},
>+    /* VK_FORMAT_BC1_RGBA_SRGB_BLOCK */
>+    {0, 0, 0},
>+    /* VK_FORMAT_BC2_UNORM_BLOCK */
>+    {0, 0, 0},
>+    /* VK_FORMAT_BC2_SRGB_BLOCK */
>+    {0, 0, 0},
>+    /* VK_FORMAT_BC3_UNORM_BLOCK */
>+    {0, 0, 0},
>+    /* VK_FORMAT_BC3_SRGB_BLOCK */
>+    {0, 0, 0},
>+    /* VK_FORMAT_BC4_UNORM_BLOCK */
>+    {0, 0, 0},
>+    /* VK_FORMAT_BC4_SNORM_BLOCK */
>+    {0, 0, 0},
>+    /* VK_FORMAT_BC5_UNORM_BLOCK */
>+    {0, 0, 0},
>+    /* VK_FORMAT_BC5_SNORM_BLOCK */
>+    {0, 0, 0},
>+    /* VK_FORMAT_BC6H_UFLOAT_BLOCK */
>+    {0, 0, 0},
>+    /* VK_FORMAT_BC6H_SFLOAT_BLOCK */
>+    {0, 0, 0},
>+    /* VK_FORMAT_BC7_UNORM_BLOCK */
>+    {0, 0, 0},
>+    /* VK_FORMAT_BC7_SRGB_BLOCK */
>+    {0, 0, 0},
>+    /* VK_FORMAT_ETC2_R8G8B8_UNORM_BLOCK */
>+    {0, 0, 0},
>+    /* VK_FORMAT_ETC2_R8G8B8_SRGB_BLOCK */
>+    {0, 0, 0},
>+    /* VK_FORMAT_ETC2_R8G8B8A1_UNORM_BLOCK */
>+    {0, 0, 0},
>+    /* VK_FORMAT_ETC2_R8G8B8A1_SRGB_BLOCK */
>+    {0, 0, 0},
>+    /* VK_FORMAT_ETC2_R8G8B8A8_UNORM_BLOCK */
>+    {0, 0, 0},
>+    /* VK_FORMAT_ETC2_R8G8B8A8_SRGB_BLOCK */
>+    {0, 0, 0},
>+    /* VK_FORMAT_EAC_R11_UNORM_BLOCK */
>+    {0, 0, 0},
>+    /* VK_FORMAT_EAC_R11_SNORM_BLOCK */
>+    {0, 0, 0},
>+    /* VK_FORMAT_EAC_R11G11_UNORM_BLOCK */
>+    {0, 0, 0},
>+    /* VK_FORMAT_EAC_R11G11_SNORM_BLOCK */
>+    {0, 0, 0},
>+    /* VK_FORMAT_ASTC_4x4_UNORM_BLOCK */
>+    {0, 0, 0},
>+    /* VK_FORMAT_ASTC_4x4_SRGB_BLOCK */
>+    {0, 0, 0},
>+    /* VK_FORMAT_ASTC_5x4_UNORM_BLOCK */
>+    {0, 0, 0},
>+    /* VK_FORMAT_ASTC_5x4_SRGB_BLOCK */
>+    {0, 0, 0},
>+    /* VK_FORMAT_ASTC_5x5_UNORM_BLOCK */
>+    {0, 0, 0},
>+    /* VK_FORMAT_ASTC_5x5_SRGB_BLOCK */
>+    {0, 0, 0},
>+    /* VK_FORMAT_ASTC_6x5_UNORM_BLOCK */
>+    {0, 0, 0},
>+    /* VK_FORMAT_ASTC_6x5_SRGB_BLOCK */
>+    {0, 0, 0},
>+    /* VK_FORMAT_ASTC_6x6_UNORM_BLOCK */
>+    {0, 0, 0},
>+    /* VK_FORMAT_ASTC_6x6_SRGB_BLOCK */
>+    {0, 0, 0},
>+    /* VK_FORMAT_ASTC_8x5_UNORM_BLOCK */
>+    {0, 0, 0},
>+    /* VK_FORMAT_ASTC_8x5_SRGB_BLOCK */
>+    {0, 0, 0},
>+    /* VK_FORMAT_ASTC_8x6_UNORM_BLOCK */
>+    {0, 0, 0},
>+    /* VK_FORMAT_ASTC_8x6_SRGB_BLOCK */
>+    {0, 0, 0},
>+    /* VK_FORMAT_ASTC_8x8_UNORM_BLOCK */
>+    {0, 0, 0},
>+    /* VK_FORMAT_ASTC_8x8_SRGB_BLOCK */
>+    {0, 0, 0},
>+    /* VK_FORMAT_ASTC_10x5_UNORM_BLOCK */
>+    {0, 0, 0},
>+    /* VK_FORMAT_ASTC_10x5_SRGB_BLOCK */
>+    {0, 0, 0},
>+    /* VK_FORMAT_ASTC_10x6_UNORM_BLOCK */
>+    {0, 0, 0},
>+    /* VK_FORMAT_ASTC_10x6_SRGB_BLOCK */
>+    {0, 0, 0},
>+    /* VK_FORMAT_ASTC_10x8_UNORM_BLOCK */
>+    {0, 0, 0},
>+    /* VK_FORMAT_ASTC_10x8_SRGB_BLOCK */
>+    {0, 0, 0},
>+    /* VK_FORMAT_ASTC_10x10_UNORM_BLOCK */
>+    {0, 0, 0},
>+    /* VK_FORMAT_ASTC_10x10_SRGB_BLOCK */
>+    {0, 0, 0},
>+    /* VK_FORMAT_ASTC_12x10_UNORM_BLOCK */
>+    {0, 0, 0},
>+    /* VK_FORMAT_ASTC_12x10_SRGB_BLOCK */
>+    {0, 0, 0},
>+    /* VK_FORMAT_ASTC_12x12_UNORM_BLOCK */
>+    {0, 0, 0},
>+    /* VK_FORMAT_ASTC_12x12_SRGB_BLOCK */
>+    {0, 0, 0}}};
>+}  // anonymous namespace
>+
>+const VkFormatProperties &GetMandatoryFormatSupport(VkFormat vkFormat)
>+{
>+    ASSERT(static_cast<uint64_t>(vkFormat) < sizeof(kFormatProperties));
>+    return kFormatProperties[vkFormat];
>+}
>+
>+}  // namespace vk
>+
>+}  // namespace rx
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/vk_utils.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/vk_utils.cpp
>new file mode 100644
>index 00000000000..d49cca0c2ce
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/vk_utils.cpp
>@@ -0,0 +1,825 @@
>+//
>+// Copyright 2016 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// vk_utils:
>+//    Helper functions for the Vulkan Renderer.
>+//
>+
>+#include "libANGLE/renderer/vulkan/vk_utils.h"
>+
>+#include "libANGLE/Context.h"
>+#include "libANGLE/renderer/vulkan/BufferVk.h"
>+#include "libANGLE/renderer/vulkan/CommandGraph.h"
>+#include "libANGLE/renderer/vulkan/ContextVk.h"
>+#include "libANGLE/renderer/vulkan/DisplayVk.h"
>+#include "libANGLE/renderer/vulkan/RendererVk.h"
>+
>+namespace
>+{
>+VkImageUsageFlags GetStagingBufferUsageFlags(rx::vk::StagingUsage usage)
>+{
>+    switch (usage)
>+    {
>+        case rx::vk::StagingUsage::Read:
>+            return VK_BUFFER_USAGE_TRANSFER_DST_BIT;
>+        case rx::vk::StagingUsage::Write:
>+            return VK_BUFFER_USAGE_TRANSFER_SRC_BIT;
>+        case rx::vk::StagingUsage::Both:
>+            return (VK_BUFFER_USAGE_TRANSFER_DST_BIT | VK_BUFFER_USAGE_TRANSFER_SRC_BIT);
>+        default:
>+            UNREACHABLE();
>+            return 0;
>+    }
>+}
>+}  // anonymous namespace
>+
>+namespace angle
>+{
>+egl::Error ToEGL(Result result, rx::DisplayVk *displayVk, EGLint errorCode)
>+{
>+    if (result != angle::Result::Continue)
>+    {
>+        return displayVk->getEGLError(errorCode);
>+    }
>+    else
>+    {
>+        return egl::NoError();
>+    }
>+}
>+}  // namespace angle
>+
>+namespace rx
>+{
>+// Mirrors std_validation_str in loader.c
>+const char *g_VkStdValidationLayerName = "VK_LAYER_LUNARG_standard_validation";
>+const char *g_VkValidationLayerNames[] = {
>+    "VK_LAYER_GOOGLE_threading", "VK_LAYER_LUNARG_parameter_validation",
>+    "VK_LAYER_LUNARG_object_tracker", "VK_LAYER_LUNARG_core_validation",
>+    "VK_LAYER_GOOGLE_unique_objects"};
>+
>+bool HasValidationLayer(const std::vector<VkLayerProperties> &layerProps, const char *layerName)
>+{
>+    for (const auto &layerProp : layerProps)
>+    {
>+        if (std::string(layerProp.layerName) == layerName)
>+        {
>+            return true;
>+        }
>+    }
>+
>+    return false;
>+}
>+
>+bool HasStandardValidationLayer(const std::vector<VkLayerProperties> &layerProps)
>+{
>+    return HasValidationLayer(layerProps, g_VkStdValidationLayerName);
>+}
>+
>+bool HasValidationLayers(const std::vector<VkLayerProperties> &layerProps)
>+{
>+    for (const char *layerName : g_VkValidationLayerNames)
>+    {
>+        if (!HasValidationLayer(layerProps, layerName))
>+        {
>+            return false;
>+        }
>+    }
>+
>+    return true;
>+}
>+
>+angle::Result FindAndAllocateCompatibleMemory(vk::Context *context,
>+                                              const vk::MemoryProperties &memoryProperties,
>+                                              VkMemoryPropertyFlags requestedMemoryPropertyFlags,
>+                                              VkMemoryPropertyFlags *memoryPropertyFlagsOut,
>+                                              const VkMemoryRequirements &memoryRequirements,
>+                                              const void *extraAllocationInfo,
>+                                              vk::DeviceMemory *deviceMemoryOut)
>+{
>+    uint32_t memoryTypeIndex = 0;
>+    ANGLE_TRY(memoryProperties.findCompatibleMemoryIndex(context, memoryRequirements,
>+                                                         requestedMemoryPropertyFlags,
>+                                                         memoryPropertyFlagsOut, &memoryTypeIndex));
>+
>+    VkMemoryAllocateInfo allocInfo = {};
>+    allocInfo.sType                = VK_STRUCTURE_TYPE_MEMORY_ALLOCATE_INFO;
>+    allocInfo.pNext                = extraAllocationInfo;
>+    allocInfo.memoryTypeIndex      = memoryTypeIndex;
>+    allocInfo.allocationSize       = memoryRequirements.size;
>+
>+    ANGLE_VK_TRY(context, deviceMemoryOut->allocate(context->getDevice(), allocInfo));
>+    return angle::Result::Continue;
>+}
>+
>+template <typename T>
>+angle::Result AllocateAndBindBufferOrImageMemory(vk::Context *context,
>+                                                 VkMemoryPropertyFlags requestedMemoryPropertyFlags,
>+                                                 VkMemoryPropertyFlags *memoryPropertyFlagsOut,
>+                                                 const VkMemoryRequirements &memoryRequirements,
>+                                                 const void *extraAllocationInfo,
>+                                                 T *bufferOrImage,
>+                                                 vk::DeviceMemory *deviceMemoryOut)
>+{
>+    const vk::MemoryProperties &memoryProperties = context->getRenderer()->getMemoryProperties();
>+
>+    ANGLE_TRY(FindAndAllocateCompatibleMemory(
>+        context, memoryProperties, requestedMemoryPropertyFlags, memoryPropertyFlagsOut,
>+        memoryRequirements, extraAllocationInfo, deviceMemoryOut));
>+    ANGLE_VK_TRY(context, bufferOrImage->bindMemory(context->getDevice(), *deviceMemoryOut));
>+    return angle::Result::Continue;
>+}
>+
>+template <typename T>
>+angle::Result AllocateBufferOrImageMemory(vk::Context *context,
>+                                          VkMemoryPropertyFlags requestedMemoryPropertyFlags,
>+                                          VkMemoryPropertyFlags *memoryPropertyFlagsOut,
>+                                          const void *extraAllocationInfo,
>+                                          T *bufferOrImage,
>+                                          vk::DeviceMemory *deviceMemoryOut)
>+{
>+    // Call driver to determine memory requirements.
>+    VkMemoryRequirements memoryRequirements;
>+    bufferOrImage->getMemoryRequirements(context->getDevice(), &memoryRequirements);
>+
>+    ANGLE_TRY(AllocateAndBindBufferOrImageMemory(
>+        context, requestedMemoryPropertyFlags, memoryPropertyFlagsOut, memoryRequirements,
>+        extraAllocationInfo, bufferOrImage, deviceMemoryOut));
>+
>+    return angle::Result::Continue;
>+}
>+
>+const char *g_VkLoaderLayersPathEnv = "VK_LAYER_PATH";
>+const char *g_VkICDPathEnv          = "VK_ICD_FILENAMES";
>+
>+const char *VulkanResultString(VkResult result)
>+{
>+    switch (result)
>+    {
>+        case VK_SUCCESS:
>+            return "Command successfully completed.";
>+        case VK_NOT_READY:
>+            return "A fence or query has not yet completed.";
>+        case VK_TIMEOUT:
>+            return "A wait operation has not completed in the specified time.";
>+        case VK_EVENT_SET:
>+            return "An event is signaled.";
>+        case VK_EVENT_RESET:
>+            return "An event is unsignaled.";
>+        case VK_INCOMPLETE:
>+            return "A return array was too small for the result.";
>+        case VK_SUBOPTIMAL_KHR:
>+            return "A swapchain no longer matches the surface properties exactly, but can still be "
>+                   "used to present to the surface successfully.";
>+        case VK_ERROR_OUT_OF_HOST_MEMORY:
>+            return "A host memory allocation has failed.";
>+        case VK_ERROR_OUT_OF_DEVICE_MEMORY:
>+            return "A device memory allocation has failed.";
>+        case VK_ERROR_INITIALIZATION_FAILED:
>+            return "Initialization of an object could not be completed for implementation-specific "
>+                   "reasons.";
>+        case VK_ERROR_DEVICE_LOST:
>+            return "The logical or physical device has been lost.";
>+        case VK_ERROR_MEMORY_MAP_FAILED:
>+            return "Mapping of a memory object has failed.";
>+        case VK_ERROR_LAYER_NOT_PRESENT:
>+            return "A requested layer is not present or could not be loaded.";
>+        case VK_ERROR_EXTENSION_NOT_PRESENT:
>+            return "A requested extension is not supported.";
>+        case VK_ERROR_FEATURE_NOT_PRESENT:
>+            return "A requested feature is not supported.";
>+        case VK_ERROR_INCOMPATIBLE_DRIVER:
>+            return "The requested version of Vulkan is not supported by the driver or is otherwise "
>+                   "incompatible for implementation-specific reasons.";
>+        case VK_ERROR_TOO_MANY_OBJECTS:
>+            return "Too many objects of the type have already been created.";
>+        case VK_ERROR_FORMAT_NOT_SUPPORTED:
>+            return "A requested format is not supported on this device.";
>+        case VK_ERROR_SURFACE_LOST_KHR:
>+            return "A surface is no longer available.";
>+        case VK_ERROR_NATIVE_WINDOW_IN_USE_KHR:
>+            return "The requested window is already connected to a VkSurfaceKHR, or to some other "
>+                   "non-Vulkan API.";
>+        case VK_ERROR_OUT_OF_DATE_KHR:
>+            return "A surface has changed in such a way that it is no longer compatible with the "
>+                   "swapchain.";
>+        case VK_ERROR_INCOMPATIBLE_DISPLAY_KHR:
>+            return "The display used by a swapchain does not use the same presentable image "
>+                   "layout, or is incompatible in a way that prevents sharing an image.";
>+        case VK_ERROR_VALIDATION_FAILED_EXT:
>+            return "The validation layers detected invalid API usage.";
>+        default:
>+            return "Unknown vulkan error code.";
>+    }
>+}
>+
>+bool GetAvailableValidationLayers(const std::vector<VkLayerProperties> &layerProps,
>+                                  bool mustHaveLayers,
>+                                  VulkanLayerVector *enabledLayerNames)
>+{
>+    if (HasStandardValidationLayer(layerProps))
>+    {
>+        enabledLayerNames->push_back(g_VkStdValidationLayerName);
>+    }
>+    else if (HasValidationLayers(layerProps))
>+    {
>+        for (const char *layerName : g_VkValidationLayerNames)
>+        {
>+            enabledLayerNames->push_back(layerName);
>+        }
>+    }
>+    else
>+    {
>+        // Generate an error if the layers were explicitly requested, warning otherwise.
>+        if (mustHaveLayers)
>+        {
>+            ERR() << "Vulkan validation layers are missing.";
>+        }
>+        else
>+        {
>+            WARN() << "Vulkan validation layers are missing.";
>+        }
>+
>+        return false;
>+    }
>+
>+    return true;
>+}
>+
>+namespace vk
>+{
>+VkImageAspectFlags GetDepthStencilAspectFlags(const angle::Format &format)
>+{
>+    return (format.depthBits > 0 ? VK_IMAGE_ASPECT_DEPTH_BIT : 0) |
>+           (format.stencilBits > 0 ? VK_IMAGE_ASPECT_STENCIL_BIT : 0);
>+}
>+
>+VkImageAspectFlags GetFormatAspectFlags(const angle::Format &format)
>+{
>+    VkImageAspectFlags dsAspect = GetDepthStencilAspectFlags(format);
>+    // If the image is not depth stencil, assume color aspect.  Note that detecting color formats
>+    // is less trivial than depth/stencil, e.g. as block formats don't indicate any bits for RGBA
>+    // channels.
>+    return dsAspect != 0 ? dsAspect : VK_IMAGE_ASPECT_COLOR_BIT;
>+}
>+
>+VkImageAspectFlags GetDepthStencilAspectFlagsForCopy(bool copyDepth, bool copyStencil)
>+{
>+    return copyDepth ? VK_IMAGE_ASPECT_DEPTH_BIT
>+                     : 0 | copyStencil ? VK_IMAGE_ASPECT_STENCIL_BIT : 0;
>+}
>+
>+// Context implementation.
>+Context::Context(RendererVk *renderer) : mRenderer(renderer) {}
>+
>+Context::~Context() {}
>+
>+VkDevice Context::getDevice() const
>+{
>+    return mRenderer->getDevice();
>+}
>+
>+// MemoryProperties implementation.
>+MemoryProperties::MemoryProperties() : mMemoryProperties{0} {}
>+
>+void MemoryProperties::init(VkPhysicalDevice physicalDevice)
>+{
>+    ASSERT(mMemoryProperties.memoryTypeCount == 0);
>+    vkGetPhysicalDeviceMemoryProperties(physicalDevice, &mMemoryProperties);
>+    ASSERT(mMemoryProperties.memoryTypeCount > 0);
>+}
>+
>+void MemoryProperties::destroy()
>+{
>+    mMemoryProperties = {0};
>+}
>+
>+angle::Result MemoryProperties::findCompatibleMemoryIndex(
>+    Context *context,
>+    const VkMemoryRequirements &memoryRequirements,
>+    VkMemoryPropertyFlags requestedMemoryPropertyFlags,
>+    VkMemoryPropertyFlags *memoryPropertyFlagsOut,
>+    uint32_t *typeIndexOut) const
>+{
>+    ASSERT(mMemoryProperties.memoryTypeCount > 0 && mMemoryProperties.memoryTypeCount <= 32);
>+
>+    // Find a compatible memory pool index. If the index doesn't change, we could cache it.
>+    // Not finding a valid memory pool means an out-of-spec driver, or internal error.
>+    // TODO(jmadill): Determine if it is possible to cache indexes.
>+    // TODO(jmadill): More efficient memory allocation.
>+    for (size_t memoryIndex : angle::BitSet32<32>(memoryRequirements.memoryTypeBits))
>+    {
>+        ASSERT(memoryIndex < mMemoryProperties.memoryTypeCount);
>+
>+        if ((mMemoryProperties.memoryTypes[memoryIndex].propertyFlags &
>+             requestedMemoryPropertyFlags) == requestedMemoryPropertyFlags)
>+        {
>+            *memoryPropertyFlagsOut = mMemoryProperties.memoryTypes[memoryIndex].propertyFlags;
>+            *typeIndexOut           = static_cast<uint32_t>(memoryIndex);
>+            return angle::Result::Continue;
>+        }
>+    }
>+
>+    // TODO(jmadill): Add error message to error.
>+    context->handleError(VK_ERROR_INCOMPATIBLE_DRIVER, __FILE__, ANGLE_FUNCTION, __LINE__);
>+    return angle::Result::Stop;
>+}
>+
>+// StagingBuffer implementation.
>+StagingBuffer::StagingBuffer() : mSize(0) {}
>+
>+void StagingBuffer::destroy(VkDevice device)
>+{
>+    mBuffer.destroy(device);
>+    mDeviceMemory.destroy(device);
>+    mSize = 0;
>+}
>+
>+angle::Result StagingBuffer::init(Context *context, VkDeviceSize size, StagingUsage usage)
>+{
>+    VkBufferCreateInfo createInfo    = {};
>+    createInfo.sType                 = VK_STRUCTURE_TYPE_BUFFER_CREATE_INFO;
>+    createInfo.flags                 = 0;
>+    createInfo.size                  = size;
>+    createInfo.usage                 = GetStagingBufferUsageFlags(usage);
>+    createInfo.sharingMode           = VK_SHARING_MODE_EXCLUSIVE;
>+    createInfo.queueFamilyIndexCount = 0;
>+    createInfo.pQueueFamilyIndices   = nullptr;
>+
>+    VkMemoryPropertyFlags flags =
>+        (VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT | VK_MEMORY_PROPERTY_HOST_COHERENT_BIT);
>+
>+    ANGLE_VK_TRY(context, mBuffer.init(context->getDevice(), createInfo));
>+    VkMemoryPropertyFlags flagsOut = 0;
>+    ANGLE_TRY(AllocateBufferMemory(context, flags, &flagsOut, nullptr, &mBuffer, &mDeviceMemory));
>+    mSize = static_cast<size_t>(size);
>+    return angle::Result::Continue;
>+}
>+
>+void StagingBuffer::dumpResources(Serial serial, std::vector<vk::GarbageObject> *garbageQueue)
>+{
>+    mBuffer.dumpResources(serial, garbageQueue);
>+    mDeviceMemory.dumpResources(serial, garbageQueue);
>+}
>+
>+angle::Result AllocateBufferMemory(vk::Context *context,
>+                                   VkMemoryPropertyFlags requestedMemoryPropertyFlags,
>+                                   VkMemoryPropertyFlags *memoryPropertyFlagsOut,
>+                                   const void *extraAllocationInfo,
>+                                   Buffer *buffer,
>+                                   DeviceMemory *deviceMemoryOut)
>+{
>+    return AllocateBufferOrImageMemory(context, requestedMemoryPropertyFlags,
>+                                       memoryPropertyFlagsOut, extraAllocationInfo, buffer,
>+                                       deviceMemoryOut);
>+}
>+
>+angle::Result AllocateImageMemory(vk::Context *context,
>+                                  VkMemoryPropertyFlags memoryPropertyFlags,
>+                                  const void *extraAllocationInfo,
>+                                  Image *image,
>+                                  DeviceMemory *deviceMemoryOut)
>+{
>+    VkMemoryPropertyFlags memoryPropertyFlagsOut = 0;
>+    return AllocateBufferOrImageMemory(context, memoryPropertyFlags, &memoryPropertyFlagsOut,
>+                                       extraAllocationInfo, image, deviceMemoryOut);
>+}
>+
>+angle::Result AllocateImageMemoryWithRequirements(vk::Context *context,
>+                                                  VkMemoryPropertyFlags memoryPropertyFlags,
>+                                                  const VkMemoryRequirements &memoryRequirements,
>+                                                  const void *extraAllocationInfo,
>+                                                  Image *image,
>+                                                  DeviceMemory *deviceMemoryOut)
>+{
>+    VkMemoryPropertyFlags memoryPropertyFlagsOut = 0;
>+    return AllocateAndBindBufferOrImageMemory(context, memoryPropertyFlags, &memoryPropertyFlagsOut,
>+                                              memoryRequirements, extraAllocationInfo, image,
>+                                              deviceMemoryOut);
>+}
>+
>+angle::Result InitShaderAndSerial(Context *context,
>+                                  ShaderAndSerial *shaderAndSerial,
>+                                  const uint32_t *shaderCode,
>+                                  size_t shaderCodeSize)
>+{
>+    VkShaderModuleCreateInfo createInfo = {};
>+    createInfo.sType                    = VK_STRUCTURE_TYPE_SHADER_MODULE_CREATE_INFO;
>+    createInfo.flags                    = 0;
>+    createInfo.codeSize                 = shaderCodeSize;
>+    createInfo.pCode                    = shaderCode;
>+
>+    ANGLE_VK_TRY(context, shaderAndSerial->get().init(context->getDevice(), createInfo));
>+    shaderAndSerial->updateSerial(context->getRenderer()->issueShaderSerial());
>+    return angle::Result::Continue;
>+}
>+
>+// GarbageObject implementation.
>+GarbageObject::GarbageObject()
>+    : mSerial(), mHandleType(HandleType::Invalid), mHandle(VK_NULL_HANDLE)
>+{}
>+
>+GarbageObject::GarbageObject(const GarbageObject &other) = default;
>+
>+GarbageObject &GarbageObject::operator=(const GarbageObject &other) = default;
>+
>+bool GarbageObject::destroyIfComplete(VkDevice device, Serial completedSerial)
>+{
>+    if (completedSerial >= mSerial)
>+    {
>+        destroy(device);
>+        return true;
>+    }
>+
>+    return false;
>+}
>+
>+void GarbageObject::destroy(VkDevice device)
>+{
>+    switch (mHandleType)
>+    {
>+        case HandleType::Semaphore:
>+            vkDestroySemaphore(device, reinterpret_cast<VkSemaphore>(mHandle), nullptr);
>+            break;
>+        case HandleType::CommandBuffer:
>+            // Command buffers are pool allocated.
>+            UNREACHABLE();
>+            break;
>+        case HandleType::Event:
>+            vkDestroyEvent(device, reinterpret_cast<VkEvent>(mHandle), nullptr);
>+            break;
>+        case HandleType::Fence:
>+            vkDestroyFence(device, reinterpret_cast<VkFence>(mHandle), nullptr);
>+            break;
>+        case HandleType::DeviceMemory:
>+            vkFreeMemory(device, reinterpret_cast<VkDeviceMemory>(mHandle), nullptr);
>+            break;
>+        case HandleType::Buffer:
>+            vkDestroyBuffer(device, reinterpret_cast<VkBuffer>(mHandle), nullptr);
>+            break;
>+        case HandleType::BufferView:
>+            vkDestroyBufferView(device, reinterpret_cast<VkBufferView>(mHandle), nullptr);
>+            break;
>+        case HandleType::Image:
>+            vkDestroyImage(device, reinterpret_cast<VkImage>(mHandle), nullptr);
>+            break;
>+        case HandleType::ImageView:
>+            vkDestroyImageView(device, reinterpret_cast<VkImageView>(mHandle), nullptr);
>+            break;
>+        case HandleType::ShaderModule:
>+            vkDestroyShaderModule(device, reinterpret_cast<VkShaderModule>(mHandle), nullptr);
>+            break;
>+        case HandleType::PipelineLayout:
>+            vkDestroyPipelineLayout(device, reinterpret_cast<VkPipelineLayout>(mHandle), nullptr);
>+            break;
>+        case HandleType::RenderPass:
>+            vkDestroyRenderPass(device, reinterpret_cast<VkRenderPass>(mHandle), nullptr);
>+            break;
>+        case HandleType::Pipeline:
>+            vkDestroyPipeline(device, reinterpret_cast<VkPipeline>(mHandle), nullptr);
>+            break;
>+        case HandleType::DescriptorSetLayout:
>+            vkDestroyDescriptorSetLayout(device, reinterpret_cast<VkDescriptorSetLayout>(mHandle),
>+                                         nullptr);
>+            break;
>+        case HandleType::Sampler:
>+            vkDestroySampler(device, reinterpret_cast<VkSampler>(mHandle), nullptr);
>+            break;
>+        case HandleType::DescriptorPool:
>+            vkDestroyDescriptorPool(device, reinterpret_cast<VkDescriptorPool>(mHandle), nullptr);
>+            break;
>+        case HandleType::Framebuffer:
>+            vkDestroyFramebuffer(device, reinterpret_cast<VkFramebuffer>(mHandle), nullptr);
>+            break;
>+        case HandleType::CommandPool:
>+            vkDestroyCommandPool(device, reinterpret_cast<VkCommandPool>(mHandle), nullptr);
>+            break;
>+        case HandleType::QueryPool:
>+            vkDestroyQueryPool(device, reinterpret_cast<VkQueryPool>(mHandle), nullptr);
>+            break;
>+        default:
>+            UNREACHABLE();
>+            break;
>+    }
>+}
>+}  // namespace vk
>+
>+// VK_EXT_debug_utils
>+PFN_vkCreateDebugUtilsMessengerEXT vkCreateDebugUtilsMessengerEXT   = nullptr;
>+PFN_vkDestroyDebugUtilsMessengerEXT vkDestroyDebugUtilsMessengerEXT = nullptr;
>+PFN_vkCmdBeginDebugUtilsLabelEXT vkCmdBeginDebugUtilsLabelEXT       = nullptr;
>+PFN_vkCmdEndDebugUtilsLabelEXT vkCmdEndDebugUtilsLabelEXT           = nullptr;
>+PFN_vkCmdInsertDebugUtilsLabelEXT vkCmdInsertDebugUtilsLabelEXT     = nullptr;
>+
>+// VK_EXT_debug_report
>+PFN_vkCreateDebugReportCallbackEXT vkCreateDebugReportCallbackEXT   = nullptr;
>+PFN_vkDestroyDebugReportCallbackEXT vkDestroyDebugReportCallbackEXT = nullptr;
>+
>+// VK_KHR_get_physical_device_properties2
>+PFN_vkGetPhysicalDeviceProperties2KHR vkGetPhysicalDeviceProperties2KHR = nullptr;
>+
>+#if defined(ANGLE_PLATFORM_FUCHSIA)
>+// VK_FUCHSIA_imagepipe_surface
>+PFN_vkCreateImagePipeSurfaceFUCHSIA vkCreateImagePipeSurfaceFUCHSIA = nullptr;
>+#endif
>+
>+#define GET_FUNC(vkName)                                                                   \
>+    do                                                                                     \
>+    {                                                                                      \
>+        vkName = reinterpret_cast<PFN_##vkName>(vkGetInstanceProcAddr(instance, #vkName)); \
>+        ASSERT(vkName);                                                                    \
>+    } while (0)
>+
>+void InitDebugUtilsEXTFunctions(VkInstance instance)
>+{
>+    GET_FUNC(vkCreateDebugUtilsMessengerEXT);
>+    GET_FUNC(vkDestroyDebugUtilsMessengerEXT);
>+    GET_FUNC(vkCmdBeginDebugUtilsLabelEXT);
>+    GET_FUNC(vkCmdEndDebugUtilsLabelEXT);
>+    GET_FUNC(vkCmdInsertDebugUtilsLabelEXT);
>+}
>+
>+void InitDebugReportEXTFunctions(VkInstance instance)
>+{
>+    GET_FUNC(vkCreateDebugReportCallbackEXT);
>+    GET_FUNC(vkDestroyDebugReportCallbackEXT);
>+}
>+
>+void InitGetPhysicalDeviceProperties2KHRFunctions(VkInstance instance)
>+{
>+    GET_FUNC(vkGetPhysicalDeviceProperties2KHR);
>+}
>+
>+#if defined(ANGLE_PLATFORM_FUCHSIA)
>+void InitImagePipeSurfaceFUCHSIAFunctions(VkInstance instance)
>+{
>+    GET_FUNC(vkCreateImagePipeSurfaceFUCHSIA);
>+}
>+#endif
>+
>+#if defined(ANGLE_PLATFORM_ANDROID)
>+PFN_vkGetAndroidHardwareBufferPropertiesANDROID vkGetAndroidHardwareBufferPropertiesANDROID =
>+    nullptr;
>+PFN_vkGetMemoryAndroidHardwareBufferANDROID vkGetMemoryAndroidHardwareBufferANDROID = nullptr;
>+void InitExternalMemoryHardwareBufferANDROIDFunctions(VkInstance instance)
>+{
>+    GET_FUNC(vkGetAndroidHardwareBufferPropertiesANDROID);
>+    GET_FUNC(vkGetMemoryAndroidHardwareBufferANDROID);
>+}
>+#endif
>+
>+#undef GET_FUNC
>+
>+namespace gl_vk
>+{
>+
>+VkFilter GetFilter(const GLenum filter)
>+{
>+    switch (filter)
>+    {
>+        case GL_LINEAR_MIPMAP_LINEAR:
>+        case GL_LINEAR_MIPMAP_NEAREST:
>+        case GL_LINEAR:
>+            return VK_FILTER_LINEAR;
>+        case GL_NEAREST_MIPMAP_LINEAR:
>+        case GL_NEAREST_MIPMAP_NEAREST:
>+        case GL_NEAREST:
>+            return VK_FILTER_NEAREST;
>+        default:
>+            UNIMPLEMENTED();
>+            return VK_FILTER_MAX_ENUM;
>+    }
>+}
>+
>+VkSamplerMipmapMode GetSamplerMipmapMode(const GLenum filter)
>+{
>+    switch (filter)
>+    {
>+        case GL_LINEAR:
>+        case GL_LINEAR_MIPMAP_LINEAR:
>+        case GL_NEAREST_MIPMAP_LINEAR:
>+            return VK_SAMPLER_MIPMAP_MODE_LINEAR;
>+        case GL_NEAREST:
>+        case GL_NEAREST_MIPMAP_NEAREST:
>+        case GL_LINEAR_MIPMAP_NEAREST:
>+            return VK_SAMPLER_MIPMAP_MODE_NEAREST;
>+        default:
>+            UNIMPLEMENTED();
>+            return VK_SAMPLER_MIPMAP_MODE_MAX_ENUM;
>+    }
>+}
>+
>+VkSamplerAddressMode GetSamplerAddressMode(const GLenum wrap)
>+{
>+    switch (wrap)
>+    {
>+        case GL_REPEAT:
>+            return VK_SAMPLER_ADDRESS_MODE_REPEAT;
>+        case GL_MIRRORED_REPEAT:
>+            return VK_SAMPLER_ADDRESS_MODE_MIRRORED_REPEAT;
>+        case GL_CLAMP_TO_BORDER:
>+            return VK_SAMPLER_ADDRESS_MODE_CLAMP_TO_BORDER;
>+        case GL_CLAMP_TO_EDGE:
>+            return VK_SAMPLER_ADDRESS_MODE_CLAMP_TO_EDGE;
>+        default:
>+            UNIMPLEMENTED();
>+            return VK_SAMPLER_ADDRESS_MODE_MAX_ENUM;
>+    }
>+}
>+
>+VkRect2D GetRect(const gl::Rectangle &source)
>+{
>+    return {{source.x, source.y},
>+            {static_cast<uint32_t>(source.width), static_cast<uint32_t>(source.height)}};
>+}
>+
>+VkPrimitiveTopology GetPrimitiveTopology(gl::PrimitiveMode mode)
>+{
>+    switch (mode)
>+    {
>+        case gl::PrimitiveMode::Triangles:
>+            return VK_PRIMITIVE_TOPOLOGY_TRIANGLE_LIST;
>+        case gl::PrimitiveMode::Points:
>+            return VK_PRIMITIVE_TOPOLOGY_POINT_LIST;
>+        case gl::PrimitiveMode::Lines:
>+            return VK_PRIMITIVE_TOPOLOGY_LINE_LIST;
>+        case gl::PrimitiveMode::LineStrip:
>+            return VK_PRIMITIVE_TOPOLOGY_LINE_STRIP;
>+        case gl::PrimitiveMode::TriangleFan:
>+            return VK_PRIMITIVE_TOPOLOGY_TRIANGLE_FAN;
>+        case gl::PrimitiveMode::TriangleStrip:
>+            return VK_PRIMITIVE_TOPOLOGY_TRIANGLE_STRIP;
>+        case gl::PrimitiveMode::LineLoop:
>+            return VK_PRIMITIVE_TOPOLOGY_LINE_STRIP;
>+        default:
>+            UNREACHABLE();
>+            return VK_PRIMITIVE_TOPOLOGY_POINT_LIST;
>+    }
>+}
>+
>+VkCullModeFlags GetCullMode(const gl::RasterizerState &rasterState)
>+{
>+    if (!rasterState.cullFace)
>+    {
>+        return VK_CULL_MODE_NONE;
>+    }
>+
>+    switch (rasterState.cullMode)
>+    {
>+        case gl::CullFaceMode::Front:
>+            return VK_CULL_MODE_FRONT_BIT;
>+        case gl::CullFaceMode::Back:
>+            return VK_CULL_MODE_BACK_BIT;
>+        case gl::CullFaceMode::FrontAndBack:
>+            return VK_CULL_MODE_FRONT_AND_BACK;
>+        default:
>+            UNREACHABLE();
>+            return VK_CULL_MODE_NONE;
>+    }
>+}
>+
>+VkFrontFace GetFrontFace(GLenum frontFace, bool invertCullFace)
>+{
>+    // Invert CW and CCW to have the same behavior as OpenGL.
>+    switch (frontFace)
>+    {
>+        case GL_CW:
>+            return invertCullFace ? VK_FRONT_FACE_CLOCKWISE : VK_FRONT_FACE_COUNTER_CLOCKWISE;
>+        case GL_CCW:
>+            return invertCullFace ? VK_FRONT_FACE_COUNTER_CLOCKWISE : VK_FRONT_FACE_CLOCKWISE;
>+        default:
>+            UNREACHABLE();
>+            return VK_FRONT_FACE_CLOCKWISE;
>+    }
>+}
>+
>+VkSampleCountFlagBits GetSamples(GLint sampleCount)
>+{
>+    switch (sampleCount)
>+    {
>+        case 0:
>+        case 1:
>+            return VK_SAMPLE_COUNT_1_BIT;
>+        case 2:
>+            return VK_SAMPLE_COUNT_2_BIT;
>+        case 4:
>+            return VK_SAMPLE_COUNT_4_BIT;
>+        case 8:
>+            return VK_SAMPLE_COUNT_8_BIT;
>+        case 16:
>+            return VK_SAMPLE_COUNT_16_BIT;
>+        case 32:
>+            return VK_SAMPLE_COUNT_32_BIT;
>+        default:
>+            UNREACHABLE();
>+            return VK_SAMPLE_COUNT_FLAG_BITS_MAX_ENUM;
>+    }
>+}
>+
>+VkComponentSwizzle GetSwizzle(const GLenum swizzle)
>+{
>+    switch (swizzle)
>+    {
>+        case GL_ALPHA:
>+            return VK_COMPONENT_SWIZZLE_A;
>+        case GL_RED:
>+            return VK_COMPONENT_SWIZZLE_R;
>+        case GL_GREEN:
>+            return VK_COMPONENT_SWIZZLE_G;
>+        case GL_BLUE:
>+            return VK_COMPONENT_SWIZZLE_B;
>+        case GL_ZERO:
>+            return VK_COMPONENT_SWIZZLE_ZERO;
>+        case GL_ONE:
>+            return VK_COMPONENT_SWIZZLE_ONE;
>+        default:
>+            UNREACHABLE();
>+            return VK_COMPONENT_SWIZZLE_IDENTITY;
>+    }
>+}
>+
>+void GetOffset(const gl::Offset &glOffset, VkOffset3D *vkOffset)
>+{
>+    vkOffset->x = glOffset.x;
>+    vkOffset->y = glOffset.y;
>+    vkOffset->z = glOffset.z;
>+}
>+
>+void GetExtent(const gl::Extents &glExtent, VkExtent3D *vkExtent)
>+{
>+    vkExtent->width  = glExtent.width;
>+    vkExtent->height = glExtent.height;
>+    vkExtent->depth  = glExtent.depth;
>+}
>+
>+VkImageType GetImageType(gl::TextureType textureType)
>+{
>+    switch (textureType)
>+    {
>+        case gl::TextureType::_2D:
>+        case gl::TextureType::_2DArray:
>+        case gl::TextureType::_2DMultisample:
>+        case gl::TextureType::_2DMultisampleArray:
>+        case gl::TextureType::CubeMap:
>+        case gl::TextureType::External:
>+            return VK_IMAGE_TYPE_2D;
>+        case gl::TextureType::_3D:
>+            return VK_IMAGE_TYPE_3D;
>+        default:
>+            // We will need to implement all the texture types for ES3+.
>+            UNIMPLEMENTED();
>+            return VK_IMAGE_TYPE_MAX_ENUM;
>+    }
>+}
>+
>+VkImageViewType GetImageViewType(gl::TextureType textureType)
>+{
>+    switch (textureType)
>+    {
>+        case gl::TextureType::_2D:
>+        case gl::TextureType::_2DMultisample:
>+        case gl::TextureType::External:
>+            return VK_IMAGE_VIEW_TYPE_2D;
>+        case gl::TextureType::_2DArray:
>+        case gl::TextureType::_2DMultisampleArray:
>+            return VK_IMAGE_VIEW_TYPE_2D_ARRAY;
>+        case gl::TextureType::_3D:
>+            return VK_IMAGE_VIEW_TYPE_3D;
>+        case gl::TextureType::CubeMap:
>+            return VK_IMAGE_VIEW_TYPE_CUBE;
>+        default:
>+            // We will need to implement all the texture types for ES3+.
>+            UNIMPLEMENTED();
>+            return VK_IMAGE_VIEW_TYPE_MAX_ENUM;
>+    }
>+}
>+
>+VkColorComponentFlags GetColorComponentFlags(bool red, bool green, bool blue, bool alpha)
>+{
>+    return (red ? VK_COLOR_COMPONENT_R_BIT : 0) | (green ? VK_COLOR_COMPONENT_G_BIT : 0) |
>+           (blue ? VK_COLOR_COMPONENT_B_BIT : 0) | (alpha ? VK_COLOR_COMPONENT_A_BIT : 0);
>+}
>+
>+void GetViewport(const gl::Rectangle &viewport,
>+                 float nearPlane,
>+                 float farPlane,
>+                 bool invertViewport,
>+                 GLint renderAreaHeight,
>+                 VkViewport *viewportOut)
>+{
>+    viewportOut->x        = static_cast<float>(viewport.x);
>+    viewportOut->y        = static_cast<float>(viewport.y);
>+    viewportOut->width    = static_cast<float>(viewport.width);
>+    viewportOut->height   = static_cast<float>(viewport.height);
>+    viewportOut->minDepth = gl::clamp01(nearPlane);
>+    viewportOut->maxDepth = gl::clamp01(farPlane);
>+
>+    if (invertViewport)
>+    {
>+        viewportOut->y      = static_cast<float>(renderAreaHeight - viewport.y);
>+        viewportOut->height = -viewportOut->height;
>+    }
>+}
>+}  // namespace gl_vk
>+}  // namespace rx
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/vk_utils.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/vk_utils.h
>new file mode 100644
>index 00000000000..07403d4896b
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/vk_utils.h
>@@ -0,0 +1,560 @@
>+//
>+// Copyright 2016 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// vk_utils:
>+//    Helper functions for the Vulkan Renderer.
>+//
>+
>+#ifndef LIBANGLE_RENDERER_VULKAN_VK_UTILS_H_
>+#define LIBANGLE_RENDERER_VULKAN_VK_UTILS_H_
>+
>+#include <limits>
>+
>+#include "common/FixedVector.h"
>+#include "common/Optional.h"
>+#include "common/PackedEnums.h"
>+#include "common/debug.h"
>+#include "libANGLE/Error.h"
>+#include "libANGLE/Observer.h"
>+#include "libANGLE/renderer/vulkan/SecondaryCommandBuffer.h"
>+#include "libANGLE/renderer/vulkan/vk_wrapper.h"
>+
>+#define ANGLE_GL_OBJECTS_X(PROC) \
>+    PROC(Buffer)                 \
>+    PROC(Context)                \
>+    PROC(Framebuffer)            \
>+    PROC(MemoryObject)           \
>+    PROC(Program)                \
>+    PROC(Texture)                \
>+    PROC(VertexArray)
>+
>+#define ANGLE_PRE_DECLARE_OBJECT(OBJ) class OBJ;
>+
>+namespace egl
>+{
>+class Display;
>+class Image;
>+}  // namespace egl
>+
>+namespace gl
>+{
>+struct Box;
>+struct Extents;
>+struct RasterizerState;
>+struct Rectangle;
>+class State;
>+struct SwizzleState;
>+struct VertexAttribute;
>+class VertexBinding;
>+
>+ANGLE_GL_OBJECTS_X(ANGLE_PRE_DECLARE_OBJECT)
>+}  // namespace gl
>+
>+#define ANGLE_PRE_DECLARE_VK_OBJECT(OBJ) class OBJ##Vk;
>+
>+namespace rx
>+{
>+class CommandGraphResource;
>+class DisplayVk;
>+class ImageVk;
>+class RenderTargetVk;
>+class RendererVk;
>+class RenderPassCache;
>+}  // namespace rx
>+
>+namespace angle
>+{
>+egl::Error ToEGL(Result result, rx::DisplayVk *displayVk, EGLint errorCode);
>+}  // namespace angle
>+
>+namespace rx
>+{
>+ANGLE_GL_OBJECTS_X(ANGLE_PRE_DECLARE_VK_OBJECT)
>+
>+const char *VulkanResultString(VkResult result);
>+
>+constexpr size_t kMaxVulkanLayers = 20;
>+using VulkanLayerVector           = angle::FixedVector<const char *, kMaxVulkanLayers>;
>+
>+// Verify that validation layers are available.
>+bool GetAvailableValidationLayers(const std::vector<VkLayerProperties> &layerProps,
>+                                  bool mustHaveLayers,
>+                                  VulkanLayerVector *enabledLayerNames);
>+
>+extern const char *g_VkLoaderLayersPathEnv;
>+extern const char *g_VkICDPathEnv;
>+
>+enum class TextureDimension
>+{
>+    TEX_2D,
>+    TEX_CUBE,
>+    TEX_3D,
>+    TEX_2D_ARRAY,
>+};
>+
>+namespace vk
>+{
>+struct Format;
>+
>+// Abstracts error handling. Implemented by both ContextVk for GL and DisplayVk for EGL errors.
>+class Context : angle::NonCopyable
>+{
>+  public:
>+    Context(RendererVk *renderer);
>+    virtual ~Context();
>+
>+    virtual void handleError(VkResult result,
>+                             const char *file,
>+                             const char *function,
>+                             unsigned int line) = 0;
>+    VkDevice getDevice() const;
>+    RendererVk *getRenderer() const { return mRenderer; }
>+
>+  protected:
>+    RendererVk *const mRenderer;
>+};
>+
>+#if ANGLE_USE_CUSTOM_VULKAN_CMD_BUFFERS
>+using CommandBuffer = priv::SecondaryCommandBuffer;
>+#else
>+using CommandBuffer = priv::CommandBuffer;
>+#endif
>+
>+using PrimaryCommandBuffer = priv::CommandBuffer;
>+
>+VkImageAspectFlags GetDepthStencilAspectFlags(const angle::Format &format);
>+VkImageAspectFlags GetFormatAspectFlags(const angle::Format &format);
>+VkImageAspectFlags GetDepthStencilAspectFlagsForCopy(bool copyDepth, bool copyStencil);
>+
>+template <typename T>
>+struct ImplTypeHelper;
>+
>+// clang-format off
>+#define ANGLE_IMPL_TYPE_HELPER_GL(OBJ) \
>+template<>                             \
>+struct ImplTypeHelper<gl::OBJ>         \
>+{                                      \
>+    using ImplType = OBJ##Vk;          \
>+};
>+// clang-format on
>+
>+ANGLE_GL_OBJECTS_X(ANGLE_IMPL_TYPE_HELPER_GL)
>+
>+template <>
>+struct ImplTypeHelper<egl::Display>
>+{
>+    using ImplType = DisplayVk;
>+};
>+
>+template <>
>+struct ImplTypeHelper<egl::Image>
>+{
>+    using ImplType = ImageVk;
>+};
>+
>+template <typename T>
>+using GetImplType = typename ImplTypeHelper<T>::ImplType;
>+
>+template <typename T>
>+GetImplType<T> *GetImpl(const T *glObject)
>+{
>+    return GetImplAs<GetImplType<T>>(glObject);
>+}
>+
>+class GarbageObject final
>+{
>+  public:
>+    template <typename ObjectT>
>+    GarbageObject(Serial serial, const ObjectT &object)
>+        : mSerial(serial),
>+          mHandleType(HandleTypeHelper<ObjectT>::kHandleType),
>+          mHandle(reinterpret_cast<VkDevice>(object.getHandle()))
>+    {}
>+
>+    GarbageObject();
>+    GarbageObject(const GarbageObject &other);
>+    GarbageObject &operator=(const GarbageObject &other);
>+
>+    bool destroyIfComplete(VkDevice device, Serial completedSerial);
>+    void destroy(VkDevice device);
>+
>+  private:
>+    // TODO(jmadill): Since many objects will have the same serial, it might be more efficient to
>+    // store the serial outside of the garbage object itself. We could index ranges of garbage
>+    // objects in the Renderer, using a circular buffer.
>+    Serial mSerial;
>+    HandleType mHandleType;
>+    VkDevice mHandle;
>+};
>+
>+class MemoryProperties final : angle::NonCopyable
>+{
>+  public:
>+    MemoryProperties();
>+
>+    void init(VkPhysicalDevice physicalDevice);
>+    angle::Result findCompatibleMemoryIndex(Context *context,
>+                                            const VkMemoryRequirements &memoryRequirements,
>+                                            VkMemoryPropertyFlags requestedMemoryPropertyFlags,
>+                                            VkMemoryPropertyFlags *memoryPropertyFlagsOut,
>+                                            uint32_t *indexOut) const;
>+    void destroy();
>+
>+  private:
>+    VkPhysicalDeviceMemoryProperties mMemoryProperties;
>+};
>+
>+// Similar to StagingImage, for Buffers.
>+class StagingBuffer final : angle::NonCopyable
>+{
>+  public:
>+    StagingBuffer();
>+    void destroy(VkDevice device);
>+
>+    angle::Result init(Context *context, VkDeviceSize size, StagingUsage usage);
>+
>+    Buffer &getBuffer() { return mBuffer; }
>+    const Buffer &getBuffer() const { return mBuffer; }
>+    DeviceMemory &getDeviceMemory() { return mDeviceMemory; }
>+    const DeviceMemory &getDeviceMemory() const { return mDeviceMemory; }
>+    size_t getSize() const { return mSize; }
>+
>+    void dumpResources(Serial serial, std::vector<GarbageObject> *garbageQueue);
>+
>+  private:
>+    Buffer mBuffer;
>+    DeviceMemory mDeviceMemory;
>+    size_t mSize;
>+};
>+
>+template <typename ObjT>
>+class ObjectAndSerial final : angle::NonCopyable
>+{
>+  public:
>+    ObjectAndSerial() {}
>+
>+    ObjectAndSerial(ObjT &&object, Serial serial) : mObject(std::move(object)), mSerial(serial) {}
>+
>+    ObjectAndSerial(ObjectAndSerial &&other)
>+        : mObject(std::move(other.mObject)), mSerial(std::move(other.mSerial))
>+    {}
>+    ObjectAndSerial &operator=(ObjectAndSerial &&other)
>+    {
>+        mObject = std::move(other.mObject);
>+        mSerial = std::move(other.mSerial);
>+        return *this;
>+    }
>+
>+    Serial getSerial() const { return mSerial; }
>+    void updateSerial(Serial newSerial) { mSerial = newSerial; }
>+
>+    const ObjT &get() const { return mObject; }
>+    ObjT &get() { return mObject; }
>+
>+    bool valid() const { return mObject.valid(); }
>+
>+    void destroy(VkDevice device)
>+    {
>+        mObject.destroy(device);
>+        mSerial = Serial();
>+    }
>+
>+  private:
>+    ObjT mObject;
>+    Serial mSerial;
>+};
>+
>+angle::Result AllocateBufferMemory(vk::Context *context,
>+                                   VkMemoryPropertyFlags requestedMemoryPropertyFlags,
>+                                   VkMemoryPropertyFlags *memoryPropertyFlagsOut,
>+                                   const void *extraAllocationInfo,
>+                                   Buffer *buffer,
>+                                   DeviceMemory *deviceMemoryOut);
>+
>+angle::Result AllocateImageMemory(vk::Context *context,
>+                                  VkMemoryPropertyFlags memoryPropertyFlags,
>+                                  const void *extraAllocationInfo,
>+                                  Image *image,
>+                                  DeviceMemory *deviceMemoryOut);
>+angle::Result AllocateImageMemoryWithRequirements(vk::Context *context,
>+                                                  VkMemoryPropertyFlags memoryPropertyFlags,
>+                                                  const VkMemoryRequirements &memoryRequirements,
>+                                                  const void *extraAllocationInfo,
>+                                                  Image *image,
>+                                                  DeviceMemory *deviceMemoryOut);
>+
>+using ShaderAndSerial = ObjectAndSerial<ShaderModule>;
>+
>+angle::Result InitShaderAndSerial(Context *context,
>+                                  ShaderAndSerial *shaderAndSerial,
>+                                  const uint32_t *shaderCode,
>+                                  size_t shaderCodeSize);
>+
>+enum class RecordingMode
>+{
>+    Start,
>+    Append,
>+};
>+
>+// Helper class to handle RAII patterns for initialization. Requires that T have a destroy method
>+// that takes a VkDevice and returns void.
>+template <typename T>
>+class Scoped final : angle::NonCopyable
>+{
>+  public:
>+    Scoped(VkDevice device) : mDevice(device) {}
>+    ~Scoped() { mVar.destroy(mDevice); }
>+
>+    const T &get() const { return mVar; }
>+    T &get() { return mVar; }
>+
>+    T &&release() { return std::move(mVar); }
>+
>+  private:
>+    VkDevice mDevice;
>+    T mVar;
>+};
>+
>+// This is a very simple RefCount class that has no autoreleasing. Used in the descriptor set and
>+// pipeline layout caches.
>+template <typename T>
>+class RefCounted : angle::NonCopyable
>+{
>+  public:
>+    RefCounted() : mRefCount(0) {}
>+    explicit RefCounted(T &&newObject) : mRefCount(0), mObject(std::move(newObject)) {}
>+    ~RefCounted() { ASSERT(mRefCount == 0 && !mObject.valid()); }
>+
>+    RefCounted(RefCounted &&copy) : mRefCount(copy.mRefCount), mObject(std::move(copy.mObject))
>+    {
>+        ASSERT(this != &copy);
>+        copy.mRefCount = 0;
>+    }
>+
>+    RefCounted &operator=(RefCounted &&rhs)
>+    {
>+        std::swap(mRefCount, rhs.mRefCount);
>+        mObject = std::move(rhs.mObject);
>+        return *this;
>+    }
>+
>+    void addRef()
>+    {
>+        ASSERT(mRefCount != std::numeric_limits<uint32_t>::max());
>+        mRefCount++;
>+    }
>+
>+    void releaseRef()
>+    {
>+        ASSERT(isReferenced());
>+        mRefCount--;
>+    }
>+
>+    bool isReferenced() const { return mRefCount != 0; }
>+
>+    T &get() { return mObject; }
>+    const T &get() const { return mObject; }
>+
>+  private:
>+    uint32_t mRefCount;
>+    T mObject;
>+};
>+
>+template <typename T>
>+class BindingPointer final : angle::NonCopyable
>+{
>+  public:
>+    BindingPointer() : mRefCounted(nullptr) {}
>+
>+    ~BindingPointer() { reset(); }
>+
>+    void set(RefCounted<T> *refCounted)
>+    {
>+        if (mRefCounted)
>+        {
>+            mRefCounted->releaseRef();
>+        }
>+
>+        mRefCounted = refCounted;
>+
>+        if (mRefCounted)
>+        {
>+            mRefCounted->addRef();
>+        }
>+    }
>+
>+    void reset() { set(nullptr); }
>+
>+    T &get() { return mRefCounted->get(); }
>+    const T &get() const { return mRefCounted->get(); }
>+
>+    bool valid() const { return mRefCounted != nullptr; }
>+
>+  private:
>+    RefCounted<T> *mRefCounted;
>+};
>+
>+// Helper class to share ref-counted Vulkan objects.  Requires that T have a destroy method
>+// that takes a VkDevice and returns void.
>+template <typename T>
>+class Shared final : angle::NonCopyable
>+{
>+  public:
>+    Shared() : mRefCounted(nullptr) {}
>+    ~Shared() { ASSERT(mRefCounted == nullptr); }
>+
>+    Shared(Shared &&other) { *this = std::move(other); }
>+    Shared &operator=(Shared &&other)
>+    {
>+        ASSERT(this != &other);
>+        mRefCounted       = other.mRefCounted;
>+        other.mRefCounted = nullptr;
>+        return *this;
>+    }
>+
>+    void set(VkDevice device, RefCounted<T> *refCounted)
>+    {
>+        if (mRefCounted)
>+        {
>+            mRefCounted->releaseRef();
>+            if (!mRefCounted->isReferenced())
>+            {
>+                mRefCounted->get().destroy(device);
>+                SafeDelete(mRefCounted);
>+            }
>+        }
>+
>+        mRefCounted = refCounted;
>+
>+        if (mRefCounted)
>+        {
>+            mRefCounted->addRef();
>+        }
>+    }
>+
>+    void assign(VkDevice device, T &&newObject)
>+    {
>+        set(device, new RefCounted<T>(std::move(newObject)));
>+    }
>+
>+    void copy(VkDevice device, const Shared<T> &other) { set(device, other.mRefCounted); }
>+
>+    void reset(VkDevice device) { set(device, nullptr); }
>+
>+    bool isReferenced() const
>+    {
>+        // If reference is zero, the object should have been deleted.  I.e. if the object is not
>+        // nullptr, it should have a reference.
>+        ASSERT(!mRefCounted || mRefCounted->isReferenced());
>+        return mRefCounted != nullptr;
>+    }
>+
>+    T &get()
>+    {
>+        ASSERT(mRefCounted && mRefCounted->isReferenced());
>+        return mRefCounted->get();
>+    }
>+    const T &get() const
>+    {
>+        ASSERT(mRefCounted && mRefCounted->isReferenced());
>+        return mRefCounted->get();
>+    }
>+
>+  private:
>+    RefCounted<T> *mRefCounted;
>+};
>+}  // namespace vk
>+
>+// List of function pointers for used extensions.
>+// VK_EXT_debug_utils
>+extern PFN_vkCreateDebugUtilsMessengerEXT vkCreateDebugUtilsMessengerEXT;
>+extern PFN_vkDestroyDebugUtilsMessengerEXT vkDestroyDebugUtilsMessengerEXT;
>+extern PFN_vkCmdBeginDebugUtilsLabelEXT vkCmdBeginDebugUtilsLabelEXT;
>+extern PFN_vkCmdEndDebugUtilsLabelEXT vkCmdEndDebugUtilsLabelEXT;
>+extern PFN_vkCmdInsertDebugUtilsLabelEXT vkCmdInsertDebugUtilsLabelEXT;
>+
>+// VK_EXT_debug_report
>+extern PFN_vkCreateDebugReportCallbackEXT vkCreateDebugReportCallbackEXT;
>+extern PFN_vkDestroyDebugReportCallbackEXT vkDestroyDebugReportCallbackEXT;
>+
>+// VK_KHR_get_physical_device_properties2
>+extern PFN_vkGetPhysicalDeviceProperties2KHR vkGetPhysicalDeviceProperties2KHR;
>+
>+// Lazily load entry points for each extension as necessary.
>+void InitDebugUtilsEXTFunctions(VkInstance instance);
>+void InitDebugReportEXTFunctions(VkInstance instance);
>+void InitGetPhysicalDeviceProperties2KHRFunctions(VkInstance instance);
>+
>+#if defined(ANGLE_PLATFORM_FUCHSIA)
>+// VK_FUCHSIA_imagepipe_surface
>+extern PFN_vkCreateImagePipeSurfaceFUCHSIA vkCreateImagePipeSurfaceFUCHSIA;
>+void InitImagePipeSurfaceFUCHSIAFunctions(VkInstance instance);
>+#endif
>+
>+#if defined(ANGLE_PLATFORM_ANDROID)
>+// VK_ANDROID_external_memory_android_hardware_buffer
>+extern PFN_vkGetAndroidHardwareBufferPropertiesANDROID vkGetAndroidHardwareBufferPropertiesANDROID;
>+extern PFN_vkGetMemoryAndroidHardwareBufferANDROID vkGetMemoryAndroidHardwareBufferANDROID;
>+void InitExternalMemoryHardwareBufferANDROIDFunctions(VkInstance instance);
>+#endif
>+
>+namespace gl_vk
>+{
>+VkRect2D GetRect(const gl::Rectangle &source);
>+VkFilter GetFilter(const GLenum filter);
>+VkSamplerMipmapMode GetSamplerMipmapMode(const GLenum filter);
>+VkSamplerAddressMode GetSamplerAddressMode(const GLenum wrap);
>+VkPrimitiveTopology GetPrimitiveTopology(gl::PrimitiveMode mode);
>+VkCullModeFlags GetCullMode(const gl::RasterizerState &rasterState);
>+VkFrontFace GetFrontFace(GLenum frontFace, bool invertCullFace);
>+VkSampleCountFlagBits GetSamples(GLint sampleCount);
>+VkComponentSwizzle GetSwizzle(const GLenum swizzle);
>+
>+constexpr angle::PackedEnumMap<gl::DrawElementsType, VkIndexType> kIndexTypeMap = {
>+    {gl::DrawElementsType::UnsignedByte, VK_INDEX_TYPE_UINT16},
>+    {gl::DrawElementsType::UnsignedShort, VK_INDEX_TYPE_UINT16},
>+    {gl::DrawElementsType::UnsignedInt, VK_INDEX_TYPE_UINT32},
>+};
>+
>+void GetOffset(const gl::Offset &glOffset, VkOffset3D *vkOffset);
>+void GetExtent(const gl::Extents &glExtent, VkExtent3D *vkExtent);
>+VkImageType GetImageType(gl::TextureType textureType);
>+VkImageViewType GetImageViewType(gl::TextureType textureType);
>+VkColorComponentFlags GetColorComponentFlags(bool red, bool green, bool blue, bool alpha);
>+
>+void GetViewport(const gl::Rectangle &viewport,
>+                 float nearPlane,
>+                 float farPlane,
>+                 bool invertViewport,
>+                 GLint renderAreaHeight,
>+                 VkViewport *viewportOut);
>+}  // namespace gl_vk
>+
>+}  // namespace rx
>+
>+#define ANGLE_VK_TRY(context, command)                                                 \
>+    do                                                                                 \
>+    {                                                                                  \
>+        auto ANGLE_LOCAL_VAR = command;                                                \
>+        if (ANGLE_UNLIKELY(ANGLE_LOCAL_VAR != VK_SUCCESS))                             \
>+        {                                                                              \
>+            context->handleError(ANGLE_LOCAL_VAR, __FILE__, ANGLE_FUNCTION, __LINE__); \
>+            return angle::Result::Stop;                                                \
>+        }                                                                              \
>+    } while (0)
>+
>+#define ANGLE_VK_CHECK(context, test, error) ANGLE_VK_TRY(context, test ? VK_SUCCESS : error)
>+
>+#define ANGLE_VK_CHECK_MATH(context, result) \
>+    ANGLE_VK_CHECK(context, result, VK_ERROR_VALIDATION_FAILED_EXT)
>+
>+#define ANGLE_VK_CHECK_ALLOC(context, result) \
>+    ANGLE_VK_CHECK(context, result, VK_ERROR_OUT_OF_HOST_MEMORY)
>+
>+#define ANGLE_VK_UNREACHABLE(context) \
>+    UNREACHABLE();                    \
>+    ANGLE_VK_CHECK(context, false, VK_ERROR_FEATURE_NOT_PRESENT)
>+
>+#endif  // LIBANGLE_RENDERER_VULKAN_VK_UTILS_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/vk_wrapper.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/vk_wrapper.h
>new file mode 100644
>index 00000000000..4145c2dd47d
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/vk_wrapper.h
>@@ -0,0 +1,1386 @@
>+//
>+// Copyright 2019 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// vk_wrapper:
>+//    Wrapper classes around Vulkan objects. In an ideal world we could generate this
>+//    from vk.xml. Or reuse the generator in the vkhpp tool. For now this is manually
>+//    generated and we must add missing functions and objects as we need them.
>+
>+#ifndef LIBANGLE_RENDERER_VULKAN_VK_WRAPPER_H_
>+#define LIBANGLE_RENDERER_VULKAN_VK_WRAPPER_H_
>+
>+#include <vulkan/vulkan.h>
>+
>+#include "libANGLE/renderer/renderer_utils.h"
>+
>+namespace rx
>+{
>+namespace vk
>+{
>+// Base class for all wrapped vulkan objects. Implements several common helper routines.
>+template <typename DerivedT, typename HandleT>
>+class WrappedObject : angle::NonCopyable
>+{
>+  public:
>+    HandleT getHandle() const { return mHandle; }
>+    bool valid() const { return (mHandle != VK_NULL_HANDLE); }
>+
>+    const HandleT *ptr() const { return &mHandle; }
>+
>+    template <typename ResourceOutType>
>+    void dumpResources(Serial serial, std::vector<ResourceOutType> *outQueue)
>+    {
>+        if (valid())
>+        {
>+            outQueue->emplace_back(serial, *static_cast<DerivedT *>(this));
>+            mHandle = VK_NULL_HANDLE;
>+        }
>+    }
>+
>+  protected:
>+    WrappedObject() : mHandle(VK_NULL_HANDLE) {}
>+    ~WrappedObject() { ASSERT(!valid()); }
>+
>+    WrappedObject(WrappedObject &&other) : mHandle(other.mHandle)
>+    {
>+        other.mHandle = VK_NULL_HANDLE;
>+    }
>+
>+    // Only works to initialize empty objects, since we don't have the device handle.
>+    WrappedObject &operator=(WrappedObject &&other)
>+    {
>+        ASSERT(!valid());
>+        std::swap(mHandle, other.mHandle);
>+        return *this;
>+    }
>+
>+    HandleT mHandle;
>+};
>+
>+// Helper macros that apply to all the wrapped object types.
>+// Unimplemented handle types:
>+// Instance
>+// PhysicalDevice
>+// Device
>+// Queue
>+// DescriptorSet
>+
>+#define ANGLE_HANDLE_TYPES_X(FUNC) \
>+    FUNC(Buffer)                   \
>+    FUNC(BufferView)               \
>+    FUNC(CommandPool)              \
>+    FUNC(DescriptorPool)           \
>+    FUNC(DescriptorSetLayout)      \
>+    FUNC(DeviceMemory)             \
>+    FUNC(Event)                    \
>+    FUNC(Fence)                    \
>+    FUNC(Framebuffer)              \
>+    FUNC(Image)                    \
>+    FUNC(ImageView)                \
>+    FUNC(Pipeline)                 \
>+    FUNC(PipelineCache)            \
>+    FUNC(PipelineLayout)           \
>+    FUNC(QueryPool)                \
>+    FUNC(RenderPass)               \
>+    FUNC(Sampler)                  \
>+    FUNC(Semaphore)                \
>+    FUNC(ShaderModule)
>+
>+#define ANGLE_COMMA_SEP_FUNC(TYPE) TYPE,
>+
>+enum class HandleType
>+{
>+    Invalid,
>+    CommandBuffer,
>+    ANGLE_HANDLE_TYPES_X(ANGLE_COMMA_SEP_FUNC)
>+};
>+
>+#undef ANGLE_COMMA_SEP_FUNC
>+
>+#define ANGLE_PRE_DECLARE_CLASS_FUNC(TYPE) class TYPE;
>+ANGLE_HANDLE_TYPES_X(ANGLE_PRE_DECLARE_CLASS_FUNC)
>+namespace priv
>+{
>+class CommandBuffer;
>+}  // namespace priv
>+#undef ANGLE_PRE_DECLARE_CLASS_FUNC
>+
>+// Returns the HandleType of a Vk Handle.
>+template <typename T>
>+struct HandleTypeHelper;
>+
>+#define ANGLE_HANDLE_TYPE_HELPER_FUNC(TYPE)                         \
>+    template <>                                                     \
>+    struct HandleTypeHelper<TYPE>                                   \
>+    {                                                               \
>+        constexpr static HandleType kHandleType = HandleType::TYPE; \
>+    };
>+
>+ANGLE_HANDLE_TYPES_X(ANGLE_HANDLE_TYPE_HELPER_FUNC)
>+template <>
>+struct HandleTypeHelper<priv::CommandBuffer>
>+{
>+    constexpr static HandleType kHandleType = HandleType::CommandBuffer;
>+};
>+
>+#undef ANGLE_HANDLE_TYPE_HELPER_FUNC
>+
>+class CommandPool final : public WrappedObject<CommandPool, VkCommandPool>
>+{
>+  public:
>+    CommandPool() = default;
>+
>+    void destroy(VkDevice device);
>+
>+    VkResult init(VkDevice device, const VkCommandPoolCreateInfo &createInfo);
>+};
>+
>+class Pipeline final : public WrappedObject<Pipeline, VkPipeline>
>+{
>+  public:
>+    Pipeline() = default;
>+    void destroy(VkDevice device);
>+
>+    VkResult initGraphics(VkDevice device,
>+                          const VkGraphicsPipelineCreateInfo &createInfo,
>+                          const PipelineCache &pipelineCacheVk);
>+    VkResult initCompute(VkDevice device,
>+                         const VkComputePipelineCreateInfo &createInfo,
>+                         const PipelineCache &pipelineCacheVk);
>+};
>+
>+namespace priv
>+{
>+
>+// Helper class that wraps a Vulkan command buffer.
>+class CommandBuffer : public WrappedObject<CommandBuffer, VkCommandBuffer>
>+{
>+  public:
>+    CommandBuffer() = default;
>+
>+    VkCommandBuffer releaseHandle();
>+
>+    // This is used for normal pool allocated command buffers. It reset the handle.
>+    void destroy(VkDevice device);
>+
>+    // This is used in conjunction with VK_COMMAND_POOL_CREATE_RESET_COMMAND_BUFFER_BIT.
>+    void destroy(VkDevice device, const CommandPool &commandPool);
>+
>+    VkResult init(VkDevice device, const VkCommandBufferAllocateInfo &createInfo);
>+
>+    // There is no way to know if the command buffer contains any commands.
>+    bool empty() const { return false; }
>+
>+    using WrappedObject::operator=;
>+
>+    static bool SupportsQueries(const VkPhysicalDeviceFeatures &features)
>+    {
>+        return features.inheritedQueries;
>+    }
>+
>+    // Vulkan command buffers are executed as secondary command buffers within a primary command
>+    // buffer.
>+    static constexpr bool ExecutesInline() { return false; }
>+
>+    VkResult begin(const VkCommandBufferBeginInfo &info);
>+
>+    void beginQuery(VkQueryPool queryPool, uint32_t query, VkQueryControlFlags flags);
>+
>+    void beginRenderPass(const VkRenderPassBeginInfo &beginInfo, VkSubpassContents subpassContents);
>+
>+    void bindGraphicsDescriptorSets(const PipelineLayout &layout,
>+                                    uint32_t firstSet,
>+                                    uint32_t descriptorSetCount,
>+                                    const VkDescriptorSet *descriptorSets,
>+                                    uint32_t dynamicOffsetCount,
>+                                    const uint32_t *dynamicOffsets);
>+    void bindGraphicsPipeline(const Pipeline &pipeline);
>+    void bindComputeDescriptorSets(const PipelineLayout &layout,
>+                                   const VkDescriptorSet *descriptorSets);
>+    void bindComputePipeline(const Pipeline &pipeline);
>+    void bindPipeline(VkPipelineBindPoint pipelineBindPoint, const Pipeline &pipeline);
>+
>+    void bindIndexBuffer(const Buffer &buffer, VkDeviceSize offset, VkIndexType indexType);
>+    void bindVertexBuffers(uint32_t firstBinding,
>+                           uint32_t bindingCount,
>+                           const VkBuffer *buffers,
>+                           const VkDeviceSize *offsets);
>+
>+    void blitImage(const Image &srcImage,
>+                   VkImageLayout srcImageLayout,
>+                   const Image &dstImage,
>+                   VkImageLayout dstImageLayout,
>+                   uint32_t regionCount,
>+                   VkImageBlit *pRegions,
>+                   VkFilter filter);
>+
>+    void clearColorImage(const Image &image,
>+                         VkImageLayout imageLayout,
>+                         const VkClearColorValue &color,
>+                         uint32_t rangeCount,
>+                         const VkImageSubresourceRange *ranges);
>+    void clearDepthStencilImage(const Image &image,
>+                                VkImageLayout imageLayout,
>+                                const VkClearDepthStencilValue &depthStencil,
>+                                uint32_t rangeCount,
>+                                const VkImageSubresourceRange *ranges);
>+
>+    void clearAttachments(uint32_t attachmentCount,
>+                          const VkClearAttachment *attachments,
>+                          uint32_t rectCount,
>+                          const VkClearRect *rects);
>+
>+    void copyBuffer(const Buffer &srcBuffer,
>+                    const Buffer &destBuffer,
>+                    uint32_t regionCount,
>+                    const VkBufferCopy *regions);
>+
>+    void copyBufferToImage(VkBuffer srcBuffer,
>+                           const Image &dstImage,
>+                           VkImageLayout dstImageLayout,
>+                           uint32_t regionCount,
>+                           const VkBufferImageCopy *regions);
>+    void copyImageToBuffer(const Image &srcImage,
>+                           VkImageLayout srcImageLayout,
>+                           VkBuffer dstBuffer,
>+                           uint32_t regionCount,
>+                           const VkBufferImageCopy *regions);
>+    void copyImage(const Image &srcImage,
>+                   VkImageLayout srcImageLayout,
>+                   const Image &dstImage,
>+                   VkImageLayout dstImageLayout,
>+                   uint32_t regionCount,
>+                   const VkImageCopy *regions);
>+
>+    void dispatch(uint32_t groupCountX, uint32_t groupCountY, uint32_t groupCountZ);
>+
>+    void draw(uint32_t vertexCount,
>+              uint32_t instanceCount,
>+              uint32_t firstVertex,
>+              uint32_t firstInstance);
>+    void draw(uint32_t vertexCount, uint32_t firstVertex);
>+    void drawInstanced(uint32_t vertexCount, uint32_t instanceCount, uint32_t firstVertex);
>+    void drawIndexed(uint32_t indexCount,
>+                     uint32_t instanceCount,
>+                     uint32_t firstIndex,
>+                     int32_t vertexOffset,
>+                     uint32_t firstInstance);
>+    void drawIndexed(uint32_t indexCount);
>+    void drawIndexedInstanced(uint32_t indexCount, uint32_t instanceCount);
>+
>+    VkResult end();
>+    void endQuery(VkQueryPool queryPool, uint32_t query);
>+    void endRenderPass();
>+    void executeCommands(uint32_t commandBufferCount, const CommandBuffer *commandBuffers);
>+
>+    void imageBarrier(VkPipelineStageFlags srcStageMask,
>+                      VkPipelineStageFlags dstStageMask,
>+                      const VkImageMemoryBarrier *imageMemoryBarrier);
>+
>+    void memoryBarrier(VkPipelineStageFlags srcStageMask,
>+                       VkPipelineStageFlags dstStageMask,
>+                       const VkMemoryBarrier *memoryBarrier);
>+
>+    void pipelineBarrier(VkPipelineStageFlags srcStageMask,
>+                         VkPipelineStageFlags dstStageMask,
>+                         VkDependencyFlags dependencyFlags,
>+                         uint32_t memoryBarrierCount,
>+                         const VkMemoryBarrier *memoryBarriers,
>+                         uint32_t bufferMemoryBarrierCount,
>+                         const VkBufferMemoryBarrier *bufferMemoryBarriers,
>+                         uint32_t imageMemoryBarrierCount,
>+                         const VkImageMemoryBarrier *imageMemoryBarriers);
>+
>+    void pushConstants(const PipelineLayout &layout,
>+                       VkShaderStageFlags flag,
>+                       uint32_t offset,
>+                       uint32_t size,
>+                       const void *data);
>+
>+    void setEvent(VkEvent event, VkPipelineStageFlags stageMask);
>+    VkResult reset();
>+    void resetEvent(VkEvent event, VkPipelineStageFlags stageMask);
>+    void resetQueryPool(VkQueryPool queryPool, uint32_t firstQuery, uint32_t queryCount);
>+    void waitEvents(uint32_t eventCount,
>+                    const VkEvent *events,
>+                    VkPipelineStageFlags srcStageMask,
>+                    VkPipelineStageFlags dstStageMask,
>+                    uint32_t memoryBarrierCount,
>+                    const VkMemoryBarrier *memoryBarriers,
>+                    uint32_t bufferMemoryBarrierCount,
>+                    const VkBufferMemoryBarrier *bufferMemoryBarriers,
>+                    uint32_t imageMemoryBarrierCount,
>+                    const VkImageMemoryBarrier *imageMemoryBarriers);
>+
>+    void writeTimestamp(VkPipelineStageFlagBits pipelineStage,
>+                        VkQueryPool queryPool,
>+                        uint32_t query);
>+};
>+}  // namespace priv
>+
>+class Image final : public WrappedObject<Image, VkImage>
>+{
>+  public:
>+    Image() = default;
>+
>+    // Use this method if the lifetime of the image is not controlled by ANGLE. (SwapChain)
>+    void setHandle(VkImage handle);
>+
>+    // Called on shutdown when the helper class *doesn't* own the handle to the image resource.
>+    void reset();
>+
>+    // Called on shutdown when the helper class *does* own the handle to the image resource.
>+    void destroy(VkDevice device);
>+
>+    VkResult init(VkDevice device, const VkImageCreateInfo &createInfo);
>+
>+    void getMemoryRequirements(VkDevice device, VkMemoryRequirements *requirementsOut) const;
>+    VkResult bindMemory(VkDevice device, const DeviceMemory &deviceMemory);
>+
>+    void getSubresourceLayout(VkDevice device,
>+                              VkImageAspectFlagBits aspectMask,
>+                              uint32_t mipLevel,
>+                              uint32_t arrayLayer,
>+                              VkSubresourceLayout *outSubresourceLayout) const;
>+};
>+
>+class ImageView final : public WrappedObject<ImageView, VkImageView>
>+{
>+  public:
>+    ImageView() = default;
>+    void destroy(VkDevice device);
>+
>+    VkResult init(VkDevice device, const VkImageViewCreateInfo &createInfo);
>+};
>+
>+class Semaphore final : public WrappedObject<Semaphore, VkSemaphore>
>+{
>+  public:
>+    Semaphore() = default;
>+    void destroy(VkDevice device);
>+
>+    VkResult init(VkDevice device);
>+};
>+
>+class Framebuffer final : public WrappedObject<Framebuffer, VkFramebuffer>
>+{
>+  public:
>+    Framebuffer() = default;
>+    void destroy(VkDevice device);
>+
>+    // Use this method only in necessary cases. (RenderPass)
>+    void setHandle(VkFramebuffer handle);
>+
>+    VkResult init(VkDevice device, const VkFramebufferCreateInfo &createInfo);
>+};
>+
>+class DeviceMemory final : public WrappedObject<DeviceMemory, VkDeviceMemory>
>+{
>+  public:
>+    DeviceMemory() = default;
>+    void destroy(VkDevice device);
>+
>+    VkResult allocate(VkDevice device, const VkMemoryAllocateInfo &allocInfo);
>+    VkResult map(VkDevice device,
>+                 VkDeviceSize offset,
>+                 VkDeviceSize size,
>+                 VkMemoryMapFlags flags,
>+                 uint8_t **mapPointer) const;
>+    void unmap(VkDevice device) const;
>+};
>+
>+class RenderPass final : public WrappedObject<RenderPass, VkRenderPass>
>+{
>+  public:
>+    RenderPass() = default;
>+    void destroy(VkDevice device);
>+
>+    VkResult init(VkDevice device, const VkRenderPassCreateInfo &createInfo);
>+};
>+
>+enum class StagingUsage
>+{
>+    Read,
>+    Write,
>+    Both,
>+};
>+
>+class Buffer final : public WrappedObject<Buffer, VkBuffer>
>+{
>+  public:
>+    Buffer() = default;
>+    void destroy(VkDevice device);
>+
>+    VkResult init(VkDevice device, const VkBufferCreateInfo &createInfo);
>+    VkResult bindMemory(VkDevice device, const DeviceMemory &deviceMemory);
>+    void getMemoryRequirements(VkDevice device, VkMemoryRequirements *memoryRequirementsOut);
>+};
>+
>+class BufferView final : public WrappedObject<BufferView, VkBufferView>
>+{
>+  public:
>+    BufferView() = default;
>+    void destroy(VkDevice device);
>+
>+    VkResult init(VkDevice device, const VkBufferViewCreateInfo &createInfo);
>+};
>+
>+class ShaderModule final : public WrappedObject<ShaderModule, VkShaderModule>
>+{
>+  public:
>+    ShaderModule() = default;
>+    void destroy(VkDevice device);
>+
>+    VkResult init(VkDevice device, const VkShaderModuleCreateInfo &createInfo);
>+};
>+
>+class PipelineLayout final : public WrappedObject<PipelineLayout, VkPipelineLayout>
>+{
>+  public:
>+    PipelineLayout() = default;
>+    void destroy(VkDevice device);
>+
>+    VkResult init(VkDevice device, const VkPipelineLayoutCreateInfo &createInfo);
>+};
>+
>+class PipelineCache final : public WrappedObject<PipelineCache, VkPipelineCache>
>+{
>+  public:
>+    PipelineCache() = default;
>+    void destroy(VkDevice device);
>+
>+    VkResult init(VkDevice device, const VkPipelineCacheCreateInfo &createInfo);
>+    VkResult getCacheData(VkDevice device, size_t *cacheSize, void *cacheData);
>+};
>+
>+class DescriptorSetLayout final : public WrappedObject<DescriptorSetLayout, VkDescriptorSetLayout>
>+{
>+  public:
>+    DescriptorSetLayout() = default;
>+    void destroy(VkDevice device);
>+
>+    VkResult init(VkDevice device, const VkDescriptorSetLayoutCreateInfo &createInfo);
>+};
>+
>+class DescriptorPool final : public WrappedObject<DescriptorPool, VkDescriptorPool>
>+{
>+  public:
>+    DescriptorPool() = default;
>+    void destroy(VkDevice device);
>+
>+    VkResult init(VkDevice device, const VkDescriptorPoolCreateInfo &createInfo);
>+
>+    VkResult allocateDescriptorSets(VkDevice device,
>+                                    const VkDescriptorSetAllocateInfo &allocInfo,
>+                                    VkDescriptorSet *descriptorSetsOut);
>+    VkResult freeDescriptorSets(VkDevice device,
>+                                uint32_t descriptorSetCount,
>+                                const VkDescriptorSet *descriptorSets);
>+};
>+
>+class Sampler final : public WrappedObject<Sampler, VkSampler>
>+{
>+  public:
>+    Sampler() = default;
>+    void destroy(VkDevice device);
>+    VkResult init(VkDevice device, const VkSamplerCreateInfo &createInfo);
>+};
>+
>+class Event final : public WrappedObject<Event, VkEvent>
>+{
>+  public:
>+    Event() = default;
>+    void destroy(VkDevice device);
>+    using WrappedObject::operator=;
>+
>+    VkResult init(VkDevice device, const VkEventCreateInfo &createInfo);
>+    VkResult getStatus(VkDevice device) const;
>+    VkResult set(VkDevice device) const;
>+    VkResult reset(VkDevice device) const;
>+};
>+
>+class Fence final : public WrappedObject<Fence, VkFence>
>+{
>+  public:
>+    Fence() = default;
>+    void destroy(VkDevice device);
>+    using WrappedObject::operator=;
>+
>+    VkResult init(VkDevice device, const VkFenceCreateInfo &createInfo);
>+    VkResult getStatus(VkDevice device) const;
>+    VkResult wait(VkDevice device, uint64_t timeout) const;
>+};
>+
>+class QueryPool final : public WrappedObject<QueryPool, VkQueryPool>
>+{
>+  public:
>+    QueryPool() = default;
>+    void destroy(VkDevice device);
>+
>+    VkResult init(VkDevice device, const VkQueryPoolCreateInfo &createInfo);
>+    VkResult getResults(VkDevice device,
>+                        uint32_t firstQuery,
>+                        uint32_t queryCount,
>+                        size_t dataSize,
>+                        void *data,
>+                        VkDeviceSize stride,
>+                        VkQueryResultFlags flags) const;
>+};
>+
>+// CommandPool implementation.
>+ANGLE_INLINE void CommandPool::destroy(VkDevice device)
>+{
>+    if (valid())
>+    {
>+        vkDestroyCommandPool(device, mHandle, nullptr);
>+        mHandle = VK_NULL_HANDLE;
>+    }
>+}
>+
>+ANGLE_INLINE VkResult CommandPool::init(VkDevice device, const VkCommandPoolCreateInfo &createInfo)
>+{
>+    ASSERT(!valid());
>+    return vkCreateCommandPool(device, &createInfo, nullptr, &mHandle);
>+}
>+
>+namespace priv
>+{
>+
>+// CommandBuffer implementation.
>+ANGLE_INLINE VkCommandBuffer CommandBuffer::releaseHandle()
>+{
>+    VkCommandBuffer handle = mHandle;
>+    mHandle                = nullptr;
>+    return handle;
>+}
>+
>+ANGLE_INLINE VkResult CommandBuffer::init(VkDevice device,
>+                                          const VkCommandBufferAllocateInfo &createInfo)
>+{
>+    ASSERT(!valid());
>+    return vkAllocateCommandBuffers(device, &createInfo, &mHandle);
>+}
>+
>+ANGLE_INLINE void CommandBuffer::blitImage(const Image &srcImage,
>+                                           VkImageLayout srcImageLayout,
>+                                           const Image &dstImage,
>+                                           VkImageLayout dstImageLayout,
>+                                           uint32_t regionCount,
>+                                           VkImageBlit *pRegions,
>+                                           VkFilter filter)
>+{
>+    ASSERT(valid() && srcImage.valid() && dstImage.valid());
>+    ASSERT(regionCount == 1);
>+    vkCmdBlitImage(mHandle, srcImage.getHandle(), srcImageLayout, dstImage.getHandle(),
>+                   dstImageLayout, 1, pRegions, filter);
>+}
>+
>+ANGLE_INLINE VkResult CommandBuffer::begin(const VkCommandBufferBeginInfo &info)
>+{
>+    ASSERT(valid());
>+    return vkBeginCommandBuffer(mHandle, &info);
>+}
>+
>+ANGLE_INLINE VkResult CommandBuffer::end()
>+{
>+    ASSERT(valid());
>+    return vkEndCommandBuffer(mHandle);
>+}
>+
>+ANGLE_INLINE VkResult CommandBuffer::reset()
>+{
>+    ASSERT(valid());
>+    return vkResetCommandBuffer(mHandle, 0);
>+}
>+
>+ANGLE_INLINE void CommandBuffer::memoryBarrier(VkPipelineStageFlags srcStageMask,
>+                                               VkPipelineStageFlags dstStageMask,
>+                                               const VkMemoryBarrier *memoryBarrier)
>+{
>+    ASSERT(valid());
>+    vkCmdPipelineBarrier(mHandle, srcStageMask, dstStageMask, 0, 1, memoryBarrier, 0, nullptr, 0,
>+                         nullptr);
>+}
>+
>+ANGLE_INLINE void CommandBuffer::pipelineBarrier(VkPipelineStageFlags srcStageMask,
>+                                                 VkPipelineStageFlags dstStageMask,
>+                                                 VkDependencyFlags dependencyFlags,
>+                                                 uint32_t memoryBarrierCount,
>+                                                 const VkMemoryBarrier *memoryBarriers,
>+                                                 uint32_t bufferMemoryBarrierCount,
>+                                                 const VkBufferMemoryBarrier *bufferMemoryBarriers,
>+                                                 uint32_t imageMemoryBarrierCount,
>+                                                 const VkImageMemoryBarrier *imageMemoryBarriers)
>+{
>+    ASSERT(valid());
>+    vkCmdPipelineBarrier(mHandle, srcStageMask, dstStageMask, dependencyFlags, memoryBarrierCount,
>+                         memoryBarriers, bufferMemoryBarrierCount, bufferMemoryBarriers,
>+                         imageMemoryBarrierCount, imageMemoryBarriers);
>+}
>+
>+ANGLE_INLINE void CommandBuffer::imageBarrier(VkPipelineStageFlags srcStageMask,
>+                                              VkPipelineStageFlags dstStageMask,
>+                                              const VkImageMemoryBarrier *imageMemoryBarrier)
>+{
>+    ASSERT(valid());
>+    vkCmdPipelineBarrier(mHandle, srcStageMask, dstStageMask, 0, 0, nullptr, 0, nullptr, 1,
>+                         imageMemoryBarrier);
>+}
>+
>+ANGLE_INLINE void CommandBuffer::destroy(VkDevice device)
>+{
>+    releaseHandle();
>+}
>+
>+ANGLE_INLINE void CommandBuffer::destroy(VkDevice device, const vk::CommandPool &commandPool)
>+{
>+    if (valid())
>+    {
>+        ASSERT(commandPool.valid());
>+        vkFreeCommandBuffers(device, commandPool.getHandle(), 1, &mHandle);
>+        mHandle = VK_NULL_HANDLE;
>+    }
>+}
>+
>+ANGLE_INLINE void CommandBuffer::copyBuffer(const Buffer &srcBuffer,
>+                                            const Buffer &destBuffer,
>+                                            uint32_t regionCount,
>+                                            const VkBufferCopy *regions)
>+{
>+    ASSERT(valid() && srcBuffer.valid() && destBuffer.valid());
>+    vkCmdCopyBuffer(mHandle, srcBuffer.getHandle(), destBuffer.getHandle(), regionCount, regions);
>+}
>+
>+ANGLE_INLINE void CommandBuffer::copyBufferToImage(VkBuffer srcBuffer,
>+                                                   const Image &dstImage,
>+                                                   VkImageLayout dstImageLayout,
>+                                                   uint32_t regionCount,
>+                                                   const VkBufferImageCopy *regions)
>+{
>+    ASSERT(valid() && dstImage.valid());
>+    ASSERT(srcBuffer != VK_NULL_HANDLE);
>+    ASSERT(regionCount == 1);
>+    vkCmdCopyBufferToImage(mHandle, srcBuffer, dstImage.getHandle(), dstImageLayout, 1, regions);
>+}
>+
>+ANGLE_INLINE void CommandBuffer::copyImageToBuffer(const Image &srcImage,
>+                                                   VkImageLayout srcImageLayout,
>+                                                   VkBuffer dstBuffer,
>+                                                   uint32_t regionCount,
>+                                                   const VkBufferImageCopy *regions)
>+{
>+    ASSERT(valid() && srcImage.valid());
>+    ASSERT(dstBuffer != VK_NULL_HANDLE);
>+    ASSERT(regionCount == 1);
>+    vkCmdCopyImageToBuffer(mHandle, srcImage.getHandle(), srcImageLayout, dstBuffer, 1, regions);
>+}
>+
>+ANGLE_INLINE void CommandBuffer::clearColorImage(const Image &image,
>+                                                 VkImageLayout imageLayout,
>+                                                 const VkClearColorValue &color,
>+                                                 uint32_t rangeCount,
>+                                                 const VkImageSubresourceRange *ranges)
>+{
>+    ASSERT(valid());
>+    ASSERT(rangeCount == 1);
>+    vkCmdClearColorImage(mHandle, image.getHandle(), imageLayout, &color, 1, ranges);
>+}
>+
>+ANGLE_INLINE void CommandBuffer::clearDepthStencilImage(
>+    const Image &image,
>+    VkImageLayout imageLayout,
>+    const VkClearDepthStencilValue &depthStencil,
>+    uint32_t rangeCount,
>+    const VkImageSubresourceRange *ranges)
>+{
>+    ASSERT(valid());
>+    ASSERT(rangeCount == 1);
>+    vkCmdClearDepthStencilImage(mHandle, image.getHandle(), imageLayout, &depthStencil, 1, ranges);
>+}
>+
>+ANGLE_INLINE void CommandBuffer::clearAttachments(uint32_t attachmentCount,
>+                                                  const VkClearAttachment *attachments,
>+                                                  uint32_t rectCount,
>+                                                  const VkClearRect *rects)
>+{
>+    ASSERT(valid());
>+    vkCmdClearAttachments(mHandle, attachmentCount, attachments, rectCount, rects);
>+}
>+
>+ANGLE_INLINE void CommandBuffer::copyImage(const Image &srcImage,
>+                                           VkImageLayout srcImageLayout,
>+                                           const Image &dstImage,
>+                                           VkImageLayout dstImageLayout,
>+                                           uint32_t regionCount,
>+                                           const VkImageCopy *regions)
>+{
>+    ASSERT(valid() && srcImage.valid() && dstImage.valid());
>+    ASSERT(regionCount == 1);
>+    vkCmdCopyImage(mHandle, srcImage.getHandle(), srcImageLayout, dstImage.getHandle(),
>+                   dstImageLayout, 1, regions);
>+}
>+
>+ANGLE_INLINE void CommandBuffer::beginRenderPass(const VkRenderPassBeginInfo &beginInfo,
>+                                                 VkSubpassContents subpassContents)
>+{
>+    ASSERT(valid());
>+    vkCmdBeginRenderPass(mHandle, &beginInfo, subpassContents);
>+}
>+
>+ANGLE_INLINE void CommandBuffer::endRenderPass()
>+{
>+    ASSERT(mHandle != VK_NULL_HANDLE);
>+    vkCmdEndRenderPass(mHandle);
>+}
>+
>+ANGLE_INLINE void CommandBuffer::bindIndexBuffer(const Buffer &buffer,
>+                                                 VkDeviceSize offset,
>+                                                 VkIndexType indexType)
>+{
>+    ASSERT(valid());
>+    vkCmdBindIndexBuffer(mHandle, buffer.getHandle(), offset, indexType);
>+}
>+
>+ANGLE_INLINE void CommandBuffer::bindComputeDescriptorSets(const PipelineLayout &layout,
>+                                                           const VkDescriptorSet *descriptorSets)
>+{
>+    ASSERT(valid() && layout.valid());
>+    vkCmdBindDescriptorSets(mHandle, VK_PIPELINE_BIND_POINT_COMPUTE, layout.getHandle(), 0, 1,
>+                            descriptorSets, 0, nullptr);
>+}
>+
>+ANGLE_INLINE void CommandBuffer::bindGraphicsDescriptorSets(const PipelineLayout &layout,
>+                                                            uint32_t firstSet,
>+                                                            uint32_t descriptorSetCount,
>+                                                            const VkDescriptorSet *descriptorSets,
>+                                                            uint32_t dynamicOffsetCount,
>+                                                            const uint32_t *dynamicOffsets)
>+{
>+    ASSERT(valid() && layout.valid());
>+    vkCmdBindDescriptorSets(mHandle, VK_PIPELINE_BIND_POINT_GRAPHICS, layout.getHandle(), firstSet,
>+                            descriptorSetCount, descriptorSets, dynamicOffsetCount, dynamicOffsets);
>+}
>+
>+ANGLE_INLINE void CommandBuffer::executeCommands(uint32_t commandBufferCount,
>+                                                 const CommandBuffer *commandBuffers)
>+{
>+    ASSERT(valid());
>+    vkCmdExecuteCommands(mHandle, commandBufferCount, commandBuffers[0].ptr());
>+}
>+
>+ANGLE_INLINE void CommandBuffer::pushConstants(const PipelineLayout &layout,
>+                                               VkShaderStageFlags flag,
>+                                               uint32_t offset,
>+                                               uint32_t size,
>+                                               const void *data)
>+{
>+    ASSERT(valid() && layout.valid());
>+    ASSERT(offset == 0);
>+    vkCmdPushConstants(mHandle, layout.getHandle(), flag, 0, size, data);
>+}
>+
>+ANGLE_INLINE void CommandBuffer::setEvent(VkEvent event, VkPipelineStageFlags stageMask)
>+{
>+    ASSERT(valid() && event != VK_NULL_HANDLE);
>+    vkCmdSetEvent(mHandle, event, stageMask);
>+}
>+
>+ANGLE_INLINE void CommandBuffer::resetEvent(VkEvent event, VkPipelineStageFlags stageMask)
>+{
>+    ASSERT(valid() && event != VK_NULL_HANDLE);
>+    vkCmdResetEvent(mHandle, event, stageMask);
>+}
>+
>+ANGLE_INLINE void CommandBuffer::waitEvents(uint32_t eventCount,
>+                                            const VkEvent *events,
>+                                            VkPipelineStageFlags srcStageMask,
>+                                            VkPipelineStageFlags dstStageMask,
>+                                            uint32_t memoryBarrierCount,
>+                                            const VkMemoryBarrier *memoryBarriers,
>+                                            uint32_t bufferMemoryBarrierCount,
>+                                            const VkBufferMemoryBarrier *bufferMemoryBarriers,
>+                                            uint32_t imageMemoryBarrierCount,
>+                                            const VkImageMemoryBarrier *imageMemoryBarriers)
>+{
>+    ASSERT(valid());
>+    vkCmdWaitEvents(mHandle, eventCount, events, srcStageMask, dstStageMask, memoryBarrierCount,
>+                    memoryBarriers, bufferMemoryBarrierCount, bufferMemoryBarriers,
>+                    imageMemoryBarrierCount, imageMemoryBarriers);
>+}
>+
>+ANGLE_INLINE void CommandBuffer::resetQueryPool(VkQueryPool queryPool,
>+                                                uint32_t firstQuery,
>+                                                uint32_t queryCount)
>+{
>+    ASSERT(valid());
>+    vkCmdResetQueryPool(mHandle, queryPool, firstQuery, queryCount);
>+}
>+
>+ANGLE_INLINE void CommandBuffer::beginQuery(VkQueryPool queryPool,
>+                                            uint32_t query,
>+                                            VkQueryControlFlags flags)
>+{
>+    ASSERT(valid());
>+    vkCmdBeginQuery(mHandle, queryPool, query, flags);
>+}
>+
>+ANGLE_INLINE void CommandBuffer::endQuery(VkQueryPool queryPool, uint32_t query)
>+{
>+    ASSERT(valid());
>+    vkCmdEndQuery(mHandle, queryPool, query);
>+}
>+
>+ANGLE_INLINE void CommandBuffer::writeTimestamp(VkPipelineStageFlagBits pipelineStage,
>+                                                VkQueryPool queryPool,
>+                                                uint32_t query)
>+{
>+    ASSERT(valid());
>+    vkCmdWriteTimestamp(mHandle, pipelineStage, queryPool, query);
>+}
>+
>+ANGLE_INLINE void CommandBuffer::draw(uint32_t vertexCount,
>+                                      uint32_t instanceCount,
>+                                      uint32_t firstVertex,
>+                                      uint32_t firstInstance)
>+{
>+    ASSERT(valid());
>+    vkCmdDraw(mHandle, vertexCount, instanceCount, firstVertex, firstInstance);
>+}
>+
>+ANGLE_INLINE void CommandBuffer::draw(uint32_t vertexCount, uint32_t firstVertex)
>+{
>+    ASSERT(valid());
>+    vkCmdDraw(mHandle, vertexCount, 1, firstVertex, 0);
>+}
>+
>+ANGLE_INLINE void CommandBuffer::drawInstanced(uint32_t vertexCount,
>+                                               uint32_t instanceCount,
>+                                               uint32_t firstVertex)
>+{
>+    ASSERT(valid());
>+    vkCmdDraw(mHandle, vertexCount, instanceCount, firstVertex, 0);
>+}
>+
>+ANGLE_INLINE void CommandBuffer::drawIndexed(uint32_t indexCount,
>+                                             uint32_t instanceCount,
>+                                             uint32_t firstIndex,
>+                                             int32_t vertexOffset,
>+                                             uint32_t firstInstance)
>+{
>+    ASSERT(valid());
>+    vkCmdDrawIndexed(mHandle, indexCount, instanceCount, firstIndex, vertexOffset, firstInstance);
>+}
>+
>+ANGLE_INLINE void CommandBuffer::drawIndexed(uint32_t indexCount)
>+{
>+    ASSERT(valid());
>+    vkCmdDrawIndexed(mHandle, indexCount, 1, 0, 0, 0);
>+}
>+
>+ANGLE_INLINE void CommandBuffer::drawIndexedInstanced(uint32_t indexCount, uint32_t instanceCount)
>+{
>+    ASSERT(valid());
>+    vkCmdDrawIndexed(mHandle, indexCount, instanceCount, 0, 0, 0);
>+}
>+
>+ANGLE_INLINE void CommandBuffer::dispatch(uint32_t groupCountX,
>+                                          uint32_t groupCountY,
>+                                          uint32_t groupCountZ)
>+{
>+    ASSERT(valid());
>+    vkCmdDispatch(mHandle, groupCountX, groupCountY, groupCountZ);
>+}
>+
>+ANGLE_INLINE void CommandBuffer::bindPipeline(VkPipelineBindPoint pipelineBindPoint,
>+                                              const Pipeline &pipeline)
>+{
>+    ASSERT(valid() && pipeline.valid());
>+    vkCmdBindPipeline(mHandle, pipelineBindPoint, pipeline.getHandle());
>+}
>+
>+ANGLE_INLINE void CommandBuffer::bindGraphicsPipeline(const Pipeline &pipeline)
>+{
>+    ASSERT(valid() && pipeline.valid());
>+    vkCmdBindPipeline(mHandle, VK_PIPELINE_BIND_POINT_GRAPHICS, pipeline.getHandle());
>+}
>+
>+ANGLE_INLINE void CommandBuffer::bindComputePipeline(const Pipeline &pipeline)
>+{
>+    ASSERT(valid() && pipeline.valid());
>+    vkCmdBindPipeline(mHandle, VK_PIPELINE_BIND_POINT_COMPUTE, pipeline.getHandle());
>+}
>+
>+ANGLE_INLINE void CommandBuffer::bindVertexBuffers(uint32_t firstBinding,
>+                                                   uint32_t bindingCount,
>+                                                   const VkBuffer *buffers,
>+                                                   const VkDeviceSize *offsets)
>+{
>+    ASSERT(valid());
>+    vkCmdBindVertexBuffers(mHandle, firstBinding, bindingCount, buffers, offsets);
>+}
>+
>+}  // namespace priv
>+
>+// Image implementation.
>+ANGLE_INLINE void Image::setHandle(VkImage handle)
>+{
>+    mHandle = handle;
>+}
>+
>+ANGLE_INLINE void Image::reset()
>+{
>+    mHandle = VK_NULL_HANDLE;
>+}
>+
>+ANGLE_INLINE void Image::destroy(VkDevice device)
>+{
>+    if (valid())
>+    {
>+        vkDestroyImage(device, mHandle, nullptr);
>+        mHandle = VK_NULL_HANDLE;
>+    }
>+}
>+
>+ANGLE_INLINE VkResult Image::init(VkDevice device, const VkImageCreateInfo &createInfo)
>+{
>+    ASSERT(!valid());
>+    return vkCreateImage(device, &createInfo, nullptr, &mHandle);
>+}
>+
>+ANGLE_INLINE void Image::getMemoryRequirements(VkDevice device,
>+                                               VkMemoryRequirements *requirementsOut) const
>+{
>+    ASSERT(valid());
>+    vkGetImageMemoryRequirements(device, mHandle, requirementsOut);
>+}
>+
>+ANGLE_INLINE VkResult Image::bindMemory(VkDevice device, const vk::DeviceMemory &deviceMemory)
>+{
>+    ASSERT(valid() && deviceMemory.valid());
>+    return vkBindImageMemory(device, mHandle, deviceMemory.getHandle(), 0);
>+}
>+
>+ANGLE_INLINE void Image::getSubresourceLayout(VkDevice device,
>+                                              VkImageAspectFlagBits aspectMask,
>+                                              uint32_t mipLevel,
>+                                              uint32_t arrayLayer,
>+                                              VkSubresourceLayout *outSubresourceLayout) const
>+{
>+    VkImageSubresource subresource = {};
>+    subresource.aspectMask         = aspectMask;
>+    subresource.mipLevel           = mipLevel;
>+    subresource.arrayLayer         = arrayLayer;
>+
>+    vkGetImageSubresourceLayout(device, getHandle(), &subresource, outSubresourceLayout);
>+}
>+
>+// ImageView implementation.
>+ANGLE_INLINE void ImageView::destroy(VkDevice device)
>+{
>+    if (valid())
>+    {
>+        vkDestroyImageView(device, mHandle, nullptr);
>+        mHandle = VK_NULL_HANDLE;
>+    }
>+}
>+
>+ANGLE_INLINE VkResult ImageView::init(VkDevice device, const VkImageViewCreateInfo &createInfo)
>+{
>+    return vkCreateImageView(device, &createInfo, nullptr, &mHandle);
>+}
>+
>+// Semaphore implementation.
>+ANGLE_INLINE void Semaphore::destroy(VkDevice device)
>+{
>+    if (valid())
>+    {
>+        vkDestroySemaphore(device, mHandle, nullptr);
>+        mHandle = VK_NULL_HANDLE;
>+    }
>+}
>+
>+ANGLE_INLINE VkResult Semaphore::init(VkDevice device)
>+{
>+    ASSERT(!valid());
>+
>+    VkSemaphoreCreateInfo semaphoreInfo = {};
>+    semaphoreInfo.sType                 = VK_STRUCTURE_TYPE_SEMAPHORE_CREATE_INFO;
>+    semaphoreInfo.flags                 = 0;
>+
>+    return vkCreateSemaphore(device, &semaphoreInfo, nullptr, &mHandle);
>+}
>+
>+// Framebuffer implementation.
>+ANGLE_INLINE void Framebuffer::destroy(VkDevice device)
>+{
>+    if (valid())
>+    {
>+        vkDestroyFramebuffer(device, mHandle, nullptr);
>+        mHandle = VK_NULL_HANDLE;
>+    }
>+}
>+
>+ANGLE_INLINE VkResult Framebuffer::init(VkDevice device, const VkFramebufferCreateInfo &createInfo)
>+{
>+    ASSERT(!valid());
>+    return vkCreateFramebuffer(device, &createInfo, nullptr, &mHandle);
>+}
>+
>+ANGLE_INLINE void Framebuffer::setHandle(VkFramebuffer handle)
>+{
>+    mHandle = handle;
>+}
>+
>+// DeviceMemory implementation.
>+ANGLE_INLINE void DeviceMemory::destroy(VkDevice device)
>+{
>+    if (valid())
>+    {
>+        vkFreeMemory(device, mHandle, nullptr);
>+        mHandle = VK_NULL_HANDLE;
>+    }
>+}
>+
>+ANGLE_INLINE VkResult DeviceMemory::allocate(VkDevice device, const VkMemoryAllocateInfo &allocInfo)
>+{
>+    ASSERT(!valid());
>+    return vkAllocateMemory(device, &allocInfo, nullptr, &mHandle);
>+}
>+
>+ANGLE_INLINE VkResult DeviceMemory::map(VkDevice device,
>+                                        VkDeviceSize offset,
>+                                        VkDeviceSize size,
>+                                        VkMemoryMapFlags flags,
>+                                        uint8_t **mapPointer) const
>+{
>+    ASSERT(valid());
>+    return vkMapMemory(device, mHandle, offset, size, flags, reinterpret_cast<void **>(mapPointer));
>+}
>+
>+ANGLE_INLINE void DeviceMemory::unmap(VkDevice device) const
>+{
>+    ASSERT(valid());
>+    vkUnmapMemory(device, mHandle);
>+}
>+
>+// RenderPass implementation.
>+ANGLE_INLINE void RenderPass::destroy(VkDevice device)
>+{
>+    if (valid())
>+    {
>+        vkDestroyRenderPass(device, mHandle, nullptr);
>+        mHandle = VK_NULL_HANDLE;
>+    }
>+}
>+
>+ANGLE_INLINE VkResult RenderPass::init(VkDevice device, const VkRenderPassCreateInfo &createInfo)
>+{
>+    ASSERT(!valid());
>+    return vkCreateRenderPass(device, &createInfo, nullptr, &mHandle);
>+}
>+
>+// Buffer implementation.
>+ANGLE_INLINE void Buffer::destroy(VkDevice device)
>+{
>+    if (valid())
>+    {
>+        vkDestroyBuffer(device, mHandle, nullptr);
>+        mHandle = VK_NULL_HANDLE;
>+    }
>+}
>+
>+ANGLE_INLINE VkResult Buffer::init(VkDevice device, const VkBufferCreateInfo &createInfo)
>+{
>+    ASSERT(!valid());
>+    return vkCreateBuffer(device, &createInfo, nullptr, &mHandle);
>+}
>+
>+ANGLE_INLINE VkResult Buffer::bindMemory(VkDevice device, const DeviceMemory &deviceMemory)
>+{
>+    ASSERT(valid() && deviceMemory.valid());
>+    return vkBindBufferMemory(device, mHandle, deviceMemory.getHandle(), 0);
>+}
>+
>+ANGLE_INLINE void Buffer::getMemoryRequirements(VkDevice device,
>+                                                VkMemoryRequirements *memoryRequirementsOut)
>+{
>+    ASSERT(valid());
>+    vkGetBufferMemoryRequirements(device, mHandle, memoryRequirementsOut);
>+}
>+
>+// BufferView implementation.
>+ANGLE_INLINE void BufferView::destroy(VkDevice device)
>+{
>+    if (valid())
>+    {
>+        vkDestroyBufferView(device, mHandle, nullptr);
>+        mHandle = VK_NULL_HANDLE;
>+    }
>+}
>+
>+ANGLE_INLINE VkResult BufferView::init(VkDevice device, const VkBufferViewCreateInfo &createInfo)
>+{
>+    ASSERT(!valid());
>+    return vkCreateBufferView(device, &createInfo, nullptr, &mHandle);
>+}
>+
>+// ShaderModule implementation.
>+ANGLE_INLINE void ShaderModule::destroy(VkDevice device)
>+{
>+    if (mHandle != VK_NULL_HANDLE)
>+    {
>+        vkDestroyShaderModule(device, mHandle, nullptr);
>+        mHandle = VK_NULL_HANDLE;
>+    }
>+}
>+
>+ANGLE_INLINE VkResult ShaderModule::init(VkDevice device,
>+                                         const VkShaderModuleCreateInfo &createInfo)
>+{
>+    ASSERT(!valid());
>+    return vkCreateShaderModule(device, &createInfo, nullptr, &mHandle);
>+}
>+
>+// PipelineLayout implementation.
>+ANGLE_INLINE void PipelineLayout::destroy(VkDevice device)
>+{
>+    if (valid())
>+    {
>+        vkDestroyPipelineLayout(device, mHandle, nullptr);
>+        mHandle = VK_NULL_HANDLE;
>+    }
>+}
>+
>+ANGLE_INLINE VkResult PipelineLayout::init(VkDevice device,
>+                                           const VkPipelineLayoutCreateInfo &createInfo)
>+{
>+    ASSERT(!valid());
>+    return vkCreatePipelineLayout(device, &createInfo, nullptr, &mHandle);
>+}
>+
>+// PipelineCache implementation.
>+ANGLE_INLINE void PipelineCache::destroy(VkDevice device)
>+{
>+    if (valid())
>+    {
>+        vkDestroyPipelineCache(device, mHandle, nullptr);
>+        mHandle = VK_NULL_HANDLE;
>+    }
>+}
>+
>+ANGLE_INLINE VkResult PipelineCache::init(VkDevice device,
>+                                          const VkPipelineCacheCreateInfo &createInfo)
>+{
>+    ASSERT(!valid());
>+    // Note: if we are concerned with memory usage of this cache, we should give it custom
>+    // allocators.  Also, failure of this function is of little importance.
>+    return vkCreatePipelineCache(device, &createInfo, nullptr, &mHandle);
>+}
>+
>+ANGLE_INLINE VkResult PipelineCache::getCacheData(VkDevice device,
>+                                                  size_t *cacheSize,
>+                                                  void *cacheData)
>+{
>+    ASSERT(valid());
>+
>+    // Note: vkGetPipelineCacheData can return VK_INCOMPLETE if cacheSize is smaller than actual
>+    // size. There are two usages of this function.  One is with *cacheSize == 0 to query the size
>+    // of the cache, and one is with an appropriate buffer to retrieve the cache contents.
>+    // VK_INCOMPLETE in the first case is an expected output.  In the second case, VK_INCOMPLETE is
>+    // also acceptable and the resulting buffer will contain valid value by spec.  Angle currently
>+    // ensures *cacheSize to be either 0 or of enough size, therefore VK_INCOMPLETE is not expected.
>+    return vkGetPipelineCacheData(device, mHandle, cacheSize, cacheData);
>+}
>+
>+// Pipeline implementation.
>+ANGLE_INLINE void Pipeline::destroy(VkDevice device)
>+{
>+    if (valid())
>+    {
>+        vkDestroyPipeline(device, mHandle, nullptr);
>+        mHandle = VK_NULL_HANDLE;
>+    }
>+}
>+
>+ANGLE_INLINE VkResult Pipeline::initGraphics(VkDevice device,
>+                                             const VkGraphicsPipelineCreateInfo &createInfo,
>+                                             const PipelineCache &pipelineCacheVk)
>+{
>+    ASSERT(!valid());
>+    return vkCreateGraphicsPipelines(device, pipelineCacheVk.getHandle(), 1, &createInfo, nullptr,
>+                                     &mHandle);
>+}
>+
>+ANGLE_INLINE VkResult Pipeline::initCompute(VkDevice device,
>+                                            const VkComputePipelineCreateInfo &createInfo,
>+                                            const PipelineCache &pipelineCacheVk)
>+{
>+    ASSERT(!valid());
>+    return vkCreateComputePipelines(device, pipelineCacheVk.getHandle(), 1, &createInfo, nullptr,
>+                                    &mHandle);
>+}
>+
>+// DescriptorSetLayout implementation.
>+ANGLE_INLINE void DescriptorSetLayout::destroy(VkDevice device)
>+{
>+    if (valid())
>+    {
>+        vkDestroyDescriptorSetLayout(device, mHandle, nullptr);
>+        mHandle = VK_NULL_HANDLE;
>+    }
>+}
>+
>+ANGLE_INLINE VkResult DescriptorSetLayout::init(VkDevice device,
>+                                                const VkDescriptorSetLayoutCreateInfo &createInfo)
>+{
>+    ASSERT(!valid());
>+    return vkCreateDescriptorSetLayout(device, &createInfo, nullptr, &mHandle);
>+}
>+
>+// DescriptorPool implementation.
>+ANGLE_INLINE void DescriptorPool::destroy(VkDevice device)
>+{
>+    if (valid())
>+    {
>+        vkDestroyDescriptorPool(device, mHandle, nullptr);
>+        mHandle = VK_NULL_HANDLE;
>+    }
>+}
>+
>+ANGLE_INLINE VkResult DescriptorPool::init(VkDevice device,
>+                                           const VkDescriptorPoolCreateInfo &createInfo)
>+{
>+    ASSERT(!valid());
>+    return vkCreateDescriptorPool(device, &createInfo, nullptr, &mHandle);
>+}
>+
>+ANGLE_INLINE VkResult
>+DescriptorPool::allocateDescriptorSets(VkDevice device,
>+                                       const VkDescriptorSetAllocateInfo &allocInfo,
>+                                       VkDescriptorSet *descriptorSetsOut)
>+{
>+    ASSERT(valid());
>+    return vkAllocateDescriptorSets(device, &allocInfo, descriptorSetsOut);
>+}
>+
>+ANGLE_INLINE VkResult DescriptorPool::freeDescriptorSets(VkDevice device,
>+                                                         uint32_t descriptorSetCount,
>+                                                         const VkDescriptorSet *descriptorSets)
>+{
>+    ASSERT(valid());
>+    ASSERT(descriptorSetCount > 0);
>+    return vkFreeDescriptorSets(device, mHandle, descriptorSetCount, descriptorSets);
>+}
>+
>+// Sampler implementation.
>+ANGLE_INLINE void Sampler::destroy(VkDevice device)
>+{
>+    if (valid())
>+    {
>+        vkDestroySampler(device, mHandle, nullptr);
>+        mHandle = VK_NULL_HANDLE;
>+    }
>+}
>+
>+ANGLE_INLINE VkResult Sampler::init(VkDevice device, const VkSamplerCreateInfo &createInfo)
>+{
>+    ASSERT(!valid());
>+    return vkCreateSampler(device, &createInfo, nullptr, &mHandle);
>+}
>+
>+// Event implementation.
>+ANGLE_INLINE void Event::destroy(VkDevice device)
>+{
>+    if (valid())
>+    {
>+        vkDestroyEvent(device, mHandle, nullptr);
>+        mHandle = VK_NULL_HANDLE;
>+    }
>+}
>+
>+ANGLE_INLINE VkResult Event::init(VkDevice device, const VkEventCreateInfo &createInfo)
>+{
>+    ASSERT(!valid());
>+    return vkCreateEvent(device, &createInfo, nullptr, &mHandle);
>+}
>+
>+ANGLE_INLINE VkResult Event::getStatus(VkDevice device) const
>+{
>+    ASSERT(valid());
>+    return vkGetEventStatus(device, mHandle);
>+}
>+
>+ANGLE_INLINE VkResult Event::set(VkDevice device) const
>+{
>+    ASSERT(valid());
>+    return vkSetEvent(device, mHandle);
>+}
>+
>+ANGLE_INLINE VkResult Event::reset(VkDevice device) const
>+{
>+    ASSERT(valid());
>+    return vkResetEvent(device, mHandle);
>+}
>+
>+// Fence implementation.
>+ANGLE_INLINE void Fence::destroy(VkDevice device)
>+{
>+    if (valid())
>+    {
>+        vkDestroyFence(device, mHandle, nullptr);
>+        mHandle = VK_NULL_HANDLE;
>+    }
>+}
>+
>+ANGLE_INLINE VkResult Fence::init(VkDevice device, const VkFenceCreateInfo &createInfo)
>+{
>+    ASSERT(!valid());
>+    return vkCreateFence(device, &createInfo, nullptr, &mHandle);
>+}
>+
>+ANGLE_INLINE VkResult Fence::getStatus(VkDevice device) const
>+{
>+    ASSERT(valid());
>+    return vkGetFenceStatus(device, mHandle);
>+}
>+
>+ANGLE_INLINE VkResult Fence::wait(VkDevice device, uint64_t timeout) const
>+{
>+    ASSERT(valid());
>+    return vkWaitForFences(device, 1, &mHandle, true, timeout);
>+}
>+
>+// QueryPool implementation.
>+ANGLE_INLINE void QueryPool::destroy(VkDevice device)
>+{
>+    if (valid())
>+    {
>+        vkDestroyQueryPool(device, mHandle, nullptr);
>+        mHandle = VK_NULL_HANDLE;
>+    }
>+}
>+
>+ANGLE_INLINE VkResult QueryPool::init(VkDevice device, const VkQueryPoolCreateInfo &createInfo)
>+{
>+    ASSERT(!valid());
>+    return vkCreateQueryPool(device, &createInfo, nullptr, &mHandle);
>+}
>+
>+ANGLE_INLINE VkResult QueryPool::getResults(VkDevice device,
>+                                            uint32_t firstQuery,
>+                                            uint32_t queryCount,
>+                                            size_t dataSize,
>+                                            void *data,
>+                                            VkDeviceSize stride,
>+                                            VkQueryResultFlags flags) const
>+{
>+    ASSERT(valid());
>+    return vkGetQueryPoolResults(device, mHandle, firstQuery, queryCount, dataSize, data, stride,
>+                                 flags);
>+}
>+}  // namespace vk
>+}  // namespace rx
>+
>+#endif  // LIBANGLE_RENDERER_VULKAN_VK_WRAPPER_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/win32/DisplayVkWin32.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/win32/DisplayVkWin32.cpp
>index 48a7bba15a4..2c3eaa1414c 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/win32/DisplayVkWin32.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/win32/DisplayVkWin32.cpp
>@@ -11,14 +11,13 @@
> 
> #include <vulkan/vulkan.h>
> 
>+#include "libANGLE/renderer/vulkan/vk_caps_utils.h"
> #include "libANGLE/renderer/vulkan/win32/WindowSurfaceVkWin32.h"
> 
> namespace rx
> {
> 
>-DisplayVkWin32::DisplayVkWin32(const egl::DisplayState &state) : DisplayVk(state)
>-{
>-}
>+DisplayVkWin32::DisplayVkWin32(const egl::DisplayState &state) : DisplayVk(state) {}
> 
> bool DisplayVkWin32::isValidNativeWindow(EGLNativeWindowType window) const
> {
>@@ -33,7 +32,22 @@ SurfaceImpl *DisplayVkWin32::createWindowSurfaceVk(const egl::SurfaceState &stat
>     return new WindowSurfaceVkWin32(state, window, width, height);
> }
> 
>-const char *DisplayVkWin32::getWSIName() const
>+egl::ConfigSet DisplayVkWin32::generateConfigs()
>+{
>+    constexpr GLenum kColorFormats[] = {GL_BGRA8_EXT, GL_BGRX8_ANGLEX};
>+    constexpr EGLint kSampleCounts[] = {0};
>+    return egl_vk::GenerateConfigs(kColorFormats, egl_vk::kConfigDepthStencilFormats, kSampleCounts,
>+                                   this);
>+}
>+
>+bool DisplayVkWin32::checkConfigSupport(egl::Config *config)
>+{
>+    // TODO(geofflang): Test for native support and modify the config accordingly.
>+    // anglebug.com/2692
>+    return true;
>+}
>+
>+const char *DisplayVkWin32::getWSIExtension() const
> {
>     return VK_KHR_WIN32_SURFACE_EXTENSION_NAME;
> }
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/win32/DisplayVkWin32.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/win32/DisplayVkWin32.h
>index 59421551b8c..79addc1b71a 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/win32/DisplayVkWin32.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/win32/DisplayVkWin32.h
>@@ -26,7 +26,10 @@ class DisplayVkWin32 : public DisplayVk
>                                        EGLint width,
>                                        EGLint height) override;
> 
>-    const char *getWSIName() const override;
>+    egl::ConfigSet generateConfigs() override;
>+    bool checkConfigSupport(egl::Config *config) override;
>+
>+    const char *getWSIExtension() const override;
> };
> 
> }  // namespace rx
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/win32/WindowSurfaceVkWin32.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/win32/WindowSurfaceVkWin32.cpp
>index b9de8d8c270..2d7d164857b 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/win32/WindowSurfaceVkWin32.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/win32/WindowSurfaceVkWin32.cpp
>@@ -19,24 +19,31 @@ WindowSurfaceVkWin32::WindowSurfaceVkWin32(const egl::SurfaceState &surfaceState
>                                            EGLint width,
>                                            EGLint height)
>     : WindowSurfaceVk(surfaceState, window, width, height)
>-{
>-}
>+{}
> 
>-vk::ErrorOrResult<gl::Extents> WindowSurfaceVkWin32::createSurfaceVk(RendererVk *renderer)
>+angle::Result WindowSurfaceVkWin32::createSurfaceVk(vk::Context *context, gl::Extents *extentsOut)
> {
>-    VkWin32SurfaceCreateInfoKHR createInfo;
>+    VkWin32SurfaceCreateInfoKHR createInfo = {};
> 
>     createInfo.sType     = VK_STRUCTURE_TYPE_WIN32_SURFACE_CREATE_INFO_KHR;
>-    createInfo.pNext     = nullptr;
>     createInfo.flags     = 0;
>     createInfo.hinstance = GetModuleHandle(nullptr);
>     createInfo.hwnd      = mNativeWindowType;
>-    ANGLE_VK_TRY(vkCreateWin32SurfaceKHR(renderer->getInstance(), &createInfo, nullptr, &mSurface));
>+    ANGLE_VK_TRY(context, vkCreateWin32SurfaceKHR(context->getRenderer()->getInstance(),
>+                                                  &createInfo, nullptr, &mSurface));
> 
>+    return getCurrentWindowSize(context, extentsOut);
>+}
>+
>+angle::Result WindowSurfaceVkWin32::getCurrentWindowSize(vk::Context *context,
>+                                                         gl::Extents *extentsOut)
>+{
>     RECT rect;
>-    ANGLE_VK_CHECK(GetClientRect(mNativeWindowType, &rect) == TRUE, VK_ERROR_INITIALIZATION_FAILED);
>+    ANGLE_VK_CHECK(context, GetClientRect(mNativeWindowType, &rect) == TRUE,
>+                   VK_ERROR_INITIALIZATION_FAILED);
> 
>-    return gl::Extents(rect.right - rect.left, rect.bottom - rect.top, 0);
>+    *extentsOut = gl::Extents(rect.right - rect.left, rect.bottom - rect.top, 0);
>+    return angle::Result::Continue;
> }
> 
> }  // namespace rx
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/win32/WindowSurfaceVkWin32.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/win32/WindowSurfaceVkWin32.h
>index 5d0c9789fee..7e06271ca3d 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/win32/WindowSurfaceVkWin32.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/win32/WindowSurfaceVkWin32.h
>@@ -24,7 +24,8 @@ class WindowSurfaceVkWin32 : public WindowSurfaceVk
>                          EGLint height);
> 
>   private:
>-    vk::ErrorOrResult<gl::Extents> createSurfaceVk(RendererVk *renderer) override;
>+    angle::Result createSurfaceVk(vk::Context *context, gl::Extents *extentsOut) override;
>+    angle::Result getCurrentWindowSize(vk::Context *context, gl::Extents *extentsOut) override;
> };
> 
> }  // namespace rx
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/xcb/DisplayVkXcb.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/xcb/DisplayVkXcb.cpp
>index 68b1a0980e7..64722151821 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/xcb/DisplayVkXcb.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/xcb/DisplayVkXcb.cpp
>@@ -11,15 +11,37 @@
> 
> #include <xcb/xcb.h>
> 
>+#include "libANGLE/renderer/vulkan/vk_caps_utils.h"
> #include "libANGLE/renderer/vulkan/xcb/WindowSurfaceVkXcb.h"
> 
> namespace rx
> {
> 
>-DisplayVkXcb::DisplayVkXcb(const egl::DisplayState &state)
>-    : DisplayVk(state), mXcbConnection(nullptr)
>+namespace
>+{
>+EGLint GetXcbVisualType(xcb_screen_t *screen)
> {
>+    // Visual type is the class member of xcb_visualtype_t whose id matches the root visual.
>+    for (xcb_depth_iterator_t depth_iter = xcb_screen_allowed_depths_iterator(screen);
>+         depth_iter.rem; xcb_depth_next(&depth_iter))
>+    {
>+        for (xcb_visualtype_iterator_t visual_iter = xcb_depth_visuals_iterator(depth_iter.data);
>+             visual_iter.rem; xcb_visualtype_next(&visual_iter))
>+        {
>+            if (screen->root_visual == visual_iter.data->visual_id)
>+            {
>+                return visual_iter.data->_class;
>+            }
>+        }
>+    }
>+
>+    return EGL_NONE;
> }
>+}  // namespace
>+
>+DisplayVkXcb::DisplayVkXcb(const egl::DisplayState &state)
>+    : DisplayVk(state), mXcbConnection(nullptr)
>+{}
> 
> egl::Error DisplayVkXcb::initialize(egl::Display *display)
> {
>@@ -61,7 +83,34 @@ SurfaceImpl *DisplayVkXcb::createWindowSurfaceVk(const egl::SurfaceState &state,
>     return new WindowSurfaceVkXcb(state, window, width, height, mXcbConnection);
> }
> 
>-const char *DisplayVkXcb::getWSIName() const
>+egl::ConfigSet DisplayVkXcb::generateConfigs()
>+{
>+    constexpr GLenum kColorFormats[] = {GL_BGRA8_EXT, GL_BGRX8_ANGLEX};
>+    constexpr EGLint kSampleCounts[] = {0};
>+    return egl_vk::GenerateConfigs(kColorFormats, egl_vk::kConfigDepthStencilFormats, kSampleCounts,
>+                                   this);
>+}
>+
>+bool DisplayVkXcb::checkConfigSupport(egl::Config *config)
>+{
>+    // TODO(geofflang): Test for native support and modify the config accordingly.
>+    // http://anglebug.com/2692
>+
>+    // Find the screen the window was created on:
>+    xcb_screen_iterator_t screenIterator = xcb_setup_roots_iterator(xcb_get_setup(mXcbConnection));
>+    ASSERT(screenIterator.rem);
>+
>+    xcb_screen_t *screen = screenIterator.data;
>+    ASSERT(screen);
>+
>+    // Visual id is root_visual of the screen
>+    config->nativeVisualID   = screen->root_visual;
>+    config->nativeVisualType = GetXcbVisualType(screen);
>+
>+    return true;
>+}
>+
>+const char *DisplayVkXcb::getWSIExtension() const
> {
>     return VK_KHR_XCB_SURFACE_EXTENSION_NAME;
> }
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/xcb/DisplayVkXcb.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/xcb/DisplayVkXcb.h
>index eea95bb98de..6636e23731f 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/xcb/DisplayVkXcb.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/xcb/DisplayVkXcb.h
>@@ -32,7 +32,10 @@ class DisplayVkXcb : public DisplayVk
>                                        EGLint width,
>                                        EGLint height) override;
> 
>-    const char *getWSIName() const override;
>+    egl::ConfigSet generateConfigs() override;
>+    bool checkConfigSupport(egl::Config *config) override;
>+
>+    const char *getWSIExtension() const override;
> 
>   private:
>     xcb_connection_t *mXcbConnection;
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/xcb/WindowSurfaceVkXcb.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/xcb/WindowSurfaceVkXcb.cpp
>index b486b74d665..c9a5545f2d1 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/xcb/WindowSurfaceVkXcb.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/xcb/WindowSurfaceVkXcb.cpp
>@@ -20,26 +20,31 @@ WindowSurfaceVkXcb::WindowSurfaceVkXcb(const egl::SurfaceState &surfaceState,
>                                        EGLint height,
>                                        xcb_connection_t *conn)
>     : WindowSurfaceVk(surfaceState, window, width, height), mXcbConnection(conn)
>-{
>-}
>+{}
> 
>-vk::ErrorOrResult<gl::Extents> WindowSurfaceVkXcb::createSurfaceVk(RendererVk *renderer)
>+angle::Result WindowSurfaceVkXcb::createSurfaceVk(vk::Context *context, gl::Extents *extentsOut)
> {
>-    VkXcbSurfaceCreateInfoKHR createInfo;
>+    VkXcbSurfaceCreateInfoKHR createInfo = {};
> 
>     createInfo.sType      = VK_STRUCTURE_TYPE_XCB_SURFACE_CREATE_INFO_KHR;
>-    createInfo.pNext      = nullptr;
>     createInfo.flags      = 0;
>     createInfo.connection = mXcbConnection;
>     createInfo.window     = mNativeWindowType;
>-    ANGLE_VK_TRY(vkCreateXcbSurfaceKHR(renderer->getInstance(), &createInfo, nullptr, &mSurface));
>+    ANGLE_VK_TRY(context, vkCreateXcbSurfaceKHR(context->getRenderer()->getInstance(), &createInfo,
>+                                                nullptr, &mSurface));
> 
>+    return getCurrentWindowSize(context, extentsOut);
>+}
>+
>+angle::Result WindowSurfaceVkXcb::getCurrentWindowSize(vk::Context *context,
>+                                                       gl::Extents *extentsOut)
>+{
>     xcb_get_geometry_cookie_t cookie = xcb_get_geometry(mXcbConnection, mNativeWindowType);
>     xcb_get_geometry_reply_t *reply  = xcb_get_geometry_reply(mXcbConnection, cookie, nullptr);
>     ASSERT(reply);
>-    gl::Extents result(reply->width, reply->height, 0);
>+    *extentsOut = gl::Extents(reply->width, reply->height, 0);
>     free(reply);
>-    return result;
>+    return angle::Result::Continue;
> }
> 
> }  // namespace rx
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/xcb/WindowSurfaceVkXcb.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/xcb/WindowSurfaceVkXcb.h
>index 1d3cdc0cba5..037c2a5c263 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/xcb/WindowSurfaceVkXcb.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/xcb/WindowSurfaceVkXcb.h
>@@ -27,7 +27,8 @@ class WindowSurfaceVkXcb : public WindowSurfaceVk
>                        xcb_connection_t *conn);
> 
>   private:
>-    vk::ErrorOrResult<gl::Extents> createSurfaceVk(RendererVk *renderer) override;
>+    angle::Result createSurfaceVk(vk::Context *context, gl::Extents *extentsOut) override;
>+    angle::Result getCurrentWindowSize(vk::Context *context, gl::Extents *extentsOut) override;
> 
>     xcb_connection_t *mXcbConnection;
> };
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/signal_utils.h b/Source/ThirdParty/ANGLE/src/libANGLE/signal_utils.h
>deleted file mode 100644
>index 3dd13320133..00000000000
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/signal_utils.h
>+++ /dev/null
>@@ -1,187 +0,0 @@
>-//
>-// Copyright 2016 The ANGLE Project Authors. All rights reserved.
>-// Use of this source code is governed by a BSD-style license that can be
>-// found in the LICENSE file.
>-//
>-// signal_utils:
>-//   Helper classes for tracking dependent state changes between objects.
>-//   These changes are signaled to the dependent class via channels.
>-//   See design document:
>-//   https://docs.google.com/document/d/15Edfotqg6_l1skTEL8ADQudF_oIdNa7i8Po43k6jMd4/
>-
>-#ifndef LIBANGLE_SIGNAL_UTILS_H_
>-#define LIBANGLE_SIGNAL_UTILS_H_
>-
>-#include <set>
>-
>-#include "common/angleutils.h"
>-#include "common/debug.h"
>-
>-namespace angle
>-{
>-
>-// Interface that the depending class inherits from.
>-template <typename ChannelID = uint32_t, typename... MessageT>
>-class SignalReceiver
>-{
>-  public:
>-    virtual ~SignalReceiver() = default;
>-    virtual void signal(ChannelID channelID, MessageT... message) = 0;
>-};
>-
>-template <typename ChannelID, typename... MessageT>
>-class ChannelBinding;
>-
>-// The host class owns the channel. It uses the channel to fire signals to the receiver.
>-template <typename ChannelID = uint32_t, typename... MessageT>
>-class BroadcastChannel final : NonCopyable
>-{
>-  public:
>-    BroadcastChannel();
>-    ~BroadcastChannel();
>-
>-    void signal(MessageT... message) const;
>-
>-    void reset();
>-
>-    bool empty() const;
>-
>-  private:
>-    // Only the ChannelBinding class should add or remove receivers.
>-    friend class ChannelBinding<ChannelID, MessageT...>;
>-    void addReceiver(ChannelBinding<ChannelID, MessageT...> *receiver);
>-    void removeReceiver(ChannelBinding<ChannelID, MessageT...> *receiver);
>-
>-    std::vector<ChannelBinding<ChannelID, MessageT...> *> mReceivers;
>-};
>-
>-template <typename ChannelID, typename... MessageT>
>-BroadcastChannel<ChannelID, MessageT...>::BroadcastChannel()
>-{
>-}
>-
>-template <typename ChannelID, typename... MessageT>
>-BroadcastChannel<ChannelID, MessageT...>::~BroadcastChannel()
>-{
>-    reset();
>-}
>-
>-template <typename ChannelID, typename... MessageT>
>-void BroadcastChannel<ChannelID, MessageT...>::addReceiver(
>-    ChannelBinding<ChannelID, MessageT...> *receiver)
>-{
>-    ASSERT(std::find(mReceivers.begin(), mReceivers.end(), receiver) == mReceivers.end());
>-    mReceivers.push_back(receiver);
>-}
>-
>-template <typename ChannelID, typename... MessageT>
>-void BroadcastChannel<ChannelID, MessageT...>::removeReceiver(
>-    ChannelBinding<ChannelID, MessageT...> *receiver)
>-{
>-    auto iter = std::find(mReceivers.begin(), mReceivers.end(), receiver);
>-    ASSERT(iter != mReceivers.end());
>-    mReceivers.erase(iter);
>-}
>-
>-template <typename ChannelID, typename... MessageT>
>-void BroadcastChannel<ChannelID, MessageT...>::signal(MessageT... message) const
>-{
>-    if (mReceivers.empty())
>-        return;
>-
>-    for (const auto *receiver : mReceivers)
>-    {
>-        receiver->signal(message...);
>-    }
>-}
>-
>-template <typename ChannelID, typename... MessageT>
>-void BroadcastChannel<ChannelID, MessageT...>::reset()
>-{
>-    for (auto receiver : mReceivers)
>-    {
>-        receiver->onChannelClosed();
>-    }
>-    mReceivers.clear();
>-}
>-
>-template <typename ChannelID, typename... MessageT>
>-bool BroadcastChannel<ChannelID, MessageT...>::empty() const
>-{
>-    return mReceivers.empty();
>-}
>-
>-// The dependent class keeps bindings to the host's BroadcastChannel.
>-template <typename ChannelID = uint32_t, typename... MessageT>
>-class ChannelBinding final
>-{
>-  public:
>-    ChannelBinding(SignalReceiver<ChannelID, MessageT...> *receiver, ChannelID channelID);
>-    ~ChannelBinding();
>-    ChannelBinding(const ChannelBinding &other) = default;
>-    ChannelBinding &operator=(const ChannelBinding &other) = default;
>-
>-    void bind(BroadcastChannel<ChannelID, MessageT...> *channel);
>-    void reset();
>-    void signal(MessageT... message) const;
>-    void onChannelClosed();
>-
>-  private:
>-    BroadcastChannel<ChannelID, MessageT...> *mChannel;
>-    SignalReceiver<ChannelID, MessageT...> *mReceiver;
>-    ChannelID mChannelID;
>-};
>-
>-template <typename ChannelID, typename... MessageT>
>-ChannelBinding<ChannelID, MessageT...>::ChannelBinding(
>-    SignalReceiver<ChannelID, MessageT...> *receiver,
>-    ChannelID channelID)
>-    : mChannel(nullptr), mReceiver(receiver), mChannelID(channelID)
>-{
>-    ASSERT(receiver);
>-}
>-
>-template <typename ChannelID, typename... MessageT>
>-ChannelBinding<ChannelID, MessageT...>::~ChannelBinding()
>-{
>-    reset();
>-}
>-
>-template <typename ChannelID, typename... MessageT>
>-void ChannelBinding<ChannelID, MessageT...>::bind(BroadcastChannel<ChannelID, MessageT...> *channel)
>-{
>-    ASSERT(mReceiver);
>-    if (mChannel)
>-    {
>-        mChannel->removeReceiver(this);
>-    }
>-
>-    mChannel = channel;
>-
>-    if (mChannel)
>-    {
>-        mChannel->addReceiver(this);
>-    }
>-}
>-
>-template <typename ChannelID, typename... MessageT>
>-void ChannelBinding<ChannelID, MessageT...>::reset()
>-{
>-    bind(nullptr);
>-}
>-
>-template <typename ChannelID, typename... MessageT>
>-void ChannelBinding<ChannelID, MessageT...>::signal(MessageT... message) const
>-{
>-    mReceiver->signal(mChannelID, message...);
>-}
>-
>-template <typename ChannelID, typename... MessageT>
>-void ChannelBinding<ChannelID, MessageT...>::onChannelClosed()
>-{
>-    mChannel = nullptr;
>-}
>-
>-}  // namespace angle
>-
>-#endif  // LIBANGLE_SIGNAL_UTILS_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/signal_utils_unittest.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/signal_utils_unittest.cpp
>deleted file mode 100644
>index 06cb3922916..00000000000
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/signal_utils_unittest.cpp
>+++ /dev/null
>@@ -1,38 +0,0 @@
>-//
>-// Copyright (c) 2016 The ANGLE Project Authors. All rights reserved.
>-// Use of this source code is governed by a BSD-style license that can be
>-// found in the LICENSE file.
>-//
>-// signal_utils_unittest:
>-//   Unit tests for signals and related utils.
>-
>-#include <gtest/gtest.h>
>-
>-#include "libANGLE/signal_utils.h"
>-
>-using namespace angle;
>-using namespace testing;
>-
>-namespace
>-{
>-
>-struct SignalThing : public SignalReceiver<>
>-{
>-    void signal(uint32_t channelID) override { wasSignaled = true; }
>-    bool wasSignaled = false;
>-};
>-
>-// Test that broadcast signals work.
>-TEST(SignalTest, BroadcastSignals)
>-{
>-    BroadcastChannel<> channel;
>-    SignalThing thing;
>-    ChannelBinding<> binding(&thing, 0u);
>-
>-    binding.bind(&channel);
>-    ASSERT_FALSE(thing.wasSignaled);
>-    channel.signal();
>-    ASSERT_TRUE(thing.wasSignaled);
>-}
>-
>-}  // anonymous namespace
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/validationEGL.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/validationEGL.cpp
>index 13a3a9e2805..1c0b25f41ec 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/validationEGL.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/validationEGL.cpp
>@@ -13,10 +13,12 @@
> #include "libANGLE/Context.h"
> #include "libANGLE/Device.h"
> #include "libANGLE/Display.h"
>+#include "libANGLE/EGLSync.h"
> #include "libANGLE/Image.h"
> #include "libANGLE/Stream.h"
> #include "libANGLE/Surface.h"
> #include "libANGLE/Texture.h"
>+#include "libANGLE/Thread.h"
> #include "libANGLE/formatutils.h"
> 
> #include <EGL/eglext.h>
>@@ -25,28 +27,28 @@ namespace egl
> {
> namespace
> {
>-size_t GetMaximumMipLevel(const gl::Context *context, GLenum target)
>+size_t GetMaximumMipLevel(const gl::Context *context, gl::TextureType type)
> {
>     const gl::Caps &caps = context->getCaps();
> 
>     size_t maxDimension = 0;
>-    switch (target)
>+    switch (type)
>     {
>-        case GL_TEXTURE_2D:
>+        case gl::TextureType::_2D:
>+        case gl::TextureType::_2DArray:
>+        case gl::TextureType::_2DMultisample:
>             maxDimension = caps.max2DTextureSize;
>             break;
>-        case GL_TEXTURE_RECTANGLE_ANGLE:
>+        case gl::TextureType::Rectangle:
>             maxDimension = caps.maxRectangleTextureSize;
>             break;
>-        case GL_TEXTURE_CUBE_MAP:
>+        case gl::TextureType::CubeMap:
>             maxDimension = caps.maxCubeMapTextureSize;
>             break;
>-        case GL_TEXTURE_3D:
>+        case gl::TextureType::_3D:
>             maxDimension = caps.max3DTextureSize;
>             break;
>-        case GL_TEXTURE_2D_ARRAY:
>-            maxDimension = caps.max2DTextureSize;
>-            break;
>+
>         default:
>             UNREACHABLE();
>     }
>@@ -56,13 +58,12 @@ size_t GetMaximumMipLevel(const gl::Context *context, GLenum target)
> 
> bool TextureHasNonZeroMipLevelsSpecified(const gl::Context *context, const gl::Texture *texture)
> {
>-    size_t maxMip = GetMaximumMipLevel(context, texture->getTarget());
>+    size_t maxMip = GetMaximumMipLevel(context, texture->getType());
>     for (size_t level = 1; level < maxMip; level++)
>     {
>-        if (texture->getTarget() == GL_TEXTURE_CUBE_MAP)
>+        if (texture->getType() == gl::TextureType::CubeMap)
>         {
>-            for (GLenum face = gl::FirstCubeMapTextureTarget; face <= gl::LastCubeMapTextureTarget;
>-                 face++)
>+            for (gl::TextureTarget face : gl::AllCubeFaceTextureTargets())
>             {
>                 if (texture->getFormat(face, level).valid())
>                 {
>@@ -72,7 +73,8 @@ bool TextureHasNonZeroMipLevelsSpecified(const gl::Context *context, const gl::T
>         }
>         else
>         {
>-            if (texture->getFormat(texture->getTarget(), level).valid())
>+            if (texture->getFormat(gl::NonCubeTextureTypeToTarget(texture->getType()), level)
>+                    .valid())
>             {
>                 return true;
>             }
>@@ -84,8 +86,8 @@ bool TextureHasNonZeroMipLevelsSpecified(const gl::Context *context, const gl::T
> 
> bool CubeTextureHasUnspecifiedLevel0Face(const gl::Texture *texture)
> {
>-    ASSERT(texture->getTarget() == GL_TEXTURE_CUBE_MAP);
>-    for (GLenum face = gl::FirstCubeMapTextureTarget; face <= gl::LastCubeMapTextureTarget; face++)
>+    ASSERT(texture->getType() == gl::TextureType::CubeMap);
>+    for (gl::TextureTarget face : gl::AllCubeFaceTextureTargets())
>     {
>         if (!texture->getFormat(face, 0).valid())
>         {
>@@ -209,6 +211,13 @@ Error ValidateConfigAttribute(const Display *display, EGLAttrib attribute)
>             }
>             break;
> 
>+        case EGL_RECORDABLE_ANDROID:
>+            if (!display->getExtensions().recordable)
>+            {
>+                return EglBadAttribute() << "EGL_ANDROID_recordable is not enabled.";
>+            }
>+            break;
>+
>         default:
>             return EglBadAttribute() << "Unknown attribute.";
>     }
>@@ -216,11 +225,90 @@ Error ValidateConfigAttribute(const Display *display, EGLAttrib attribute)
>     return NoError();
> }
> 
>+Error ValidateConfigAttributeValue(const Display *display, EGLAttrib attribute, EGLAttrib value)
>+{
>+    switch (attribute)
>+    {
>+
>+        case EGL_BIND_TO_TEXTURE_RGB:
>+        case EGL_BIND_TO_TEXTURE_RGBA:
>+            switch (value)
>+            {
>+                case EGL_DONT_CARE:
>+                case EGL_TRUE:
>+                case EGL_FALSE:
>+                    break;
>+                default:
>+                    return EglBadAttribute() << "EGL_bind_to_texture invalid attribute: " << value;
>+            }
>+            break;
>+
>+        case EGL_COLOR_BUFFER_TYPE:
>+            switch (value)
>+            {
>+                case EGL_RGB_BUFFER:
>+                case EGL_LUMINANCE_BUFFER:
>+                // EGL_DONT_CARE doesn't match the spec, but does match dEQP usage
>+                case EGL_DONT_CARE:
>+                    break;
>+                default:
>+                    return EglBadAttribute()
>+                           << "EGL_color_buffer_type invalid attribute: " << value;
>+            }
>+            break;
>+
>+        case EGL_NATIVE_RENDERABLE:
>+            switch (value)
>+            {
>+                case EGL_DONT_CARE:
>+                case EGL_TRUE:
>+                case EGL_FALSE:
>+                    break;
>+                default:
>+                    return EglBadAttribute()
>+                           << "EGL_native_renderable invalid attribute: " << value;
>+            }
>+            break;
>+
>+        case EGL_TRANSPARENT_TYPE:
>+            switch (value)
>+            {
>+                case EGL_NONE:
>+                case EGL_TRANSPARENT_RGB:
>+                // EGL_DONT_CARE doesn't match the spec, but does match dEQP usage
>+                case EGL_DONT_CARE:
>+                    break;
>+                default:
>+                    return EglBadAttribute() << "EGL_transparent_type invalid attribute: " << value;
>+            }
>+            break;
>+
>+        case EGL_RECORDABLE_ANDROID:
>+            switch (value)
>+            {
>+                case EGL_TRUE:
>+                case EGL_FALSE:
>+                case EGL_DONT_CARE:
>+                    break;
>+                default:
>+                    return EglBadAttribute()
>+                           << "EGL_RECORDABLE_ANDROID invalid attribute: " << value;
>+            }
>+            break;
>+
>+        default:
>+            break;
>+    }
>+
>+    return NoError();
>+}
>+
> Error ValidateConfigAttributes(const Display *display, const AttributeMap &attributes)
> {
>     for (const auto &attrib : attributes)
>     {
>         ANGLE_TRY(ValidateConfigAttribute(display, attrib.first));
>+        ANGLE_TRY(ValidateConfigAttributeValue(display, attrib.first, attrib.second));
>     }
> 
>     return NoError();
>@@ -298,13 +386,13 @@ Error ValidateGetPlatformDisplayCommon(EGLenum platform,
>     if (platform == EGL_PLATFORM_ANGLE_ANGLE)
>     {
>         EGLAttrib platformType       = EGL_PLATFORM_ANGLE_TYPE_DEFAULT_ANGLE;
>-        EGLAttrib deviceType         = EGL_PLATFORM_ANGLE_DEVICE_TYPE_HARDWARE_ANGLE;
>         bool enableAutoTrimSpecified = false;
>-        bool deviceTypeSpecified     = false;
>         bool presentPathSpecified    = false;
> 
>         Optional<EGLAttrib> majorVersion;
>         Optional<EGLAttrib> minorVersion;
>+        Optional<EGLAttrib> deviceType;
>+        Optional<EGLAttrib> eglHandle;
> 
>         for (const auto &curAttrib : attribMap)
>         {
>@@ -368,13 +456,16 @@ Error ValidateGetPlatformDisplayCommon(EGLenum platform,
>                     switch (value)
>                     {
>                         case EGL_PLATFORM_ANGLE_DEVICE_TYPE_HARDWARE_ANGLE:
>-                        case EGL_PLATFORM_ANGLE_DEVICE_TYPE_WARP_ANGLE:
>-                        case EGL_PLATFORM_ANGLE_DEVICE_TYPE_REFERENCE_ANGLE:
>-                            deviceTypeSpecified = true;
>+                        case EGL_PLATFORM_ANGLE_DEVICE_TYPE_NULL_ANGLE:
>                             break;
> 
>-                        case EGL_PLATFORM_ANGLE_DEVICE_TYPE_NULL_ANGLE:
>-                            // This is a hidden option, accepted by the OpenGL back-end.
>+                        case EGL_PLATFORM_ANGLE_DEVICE_TYPE_D3D_WARP_ANGLE:
>+                        case EGL_PLATFORM_ANGLE_DEVICE_TYPE_D3D_REFERENCE_ANGLE:
>+                            if (!clientExtensions.platformANGLED3D)
>+                            {
>+                                return EglBadAttribute()
>+                                       << "EGL_ANGLE_platform_angle_d3d is not supported";
>+                            }
>                             break;
> 
>                         default:
>@@ -398,6 +489,34 @@ Error ValidateGetPlatformDisplayCommon(EGLenum platform,
>                     }
>                     break;
> 
>+                case EGL_PLATFORM_ANGLE_EGL_HANDLE_ANGLE:
>+                    if (value != EGL_DONT_CARE)
>+                    {
>+                        eglHandle = value;
>+                    }
>+                    break;
>+
>+                case EGL_PLATFORM_ANGLE_CONTEXT_VIRTUALIZATION_ANGLE:
>+                    if (!clientExtensions.platformANGLEContextVirtualization)
>+                    {
>+                        return EglBadAttribute() << "EGL_ANGLE_platform_angle_context_"
>+                                                    "virtualization extension not active";
>+                    }
>+
>+                    switch (value)
>+                    {
>+                        case EGL_DONT_CARE:
>+                        case EGL_FALSE:
>+                        case EGL_TRUE:
>+                            break;
>+
>+                        default:
>+                            return EglBadAttribute() << "Invalid value for "
>+                                                        "EGL_PLATFORM_ANGLE_CONTEXT_VIRTUALIZATION_"
>+                                                        "ANGLE attrib";
>+                    }
>+                    break;
>+
>                 default:
>                     break;
>             }
>@@ -409,7 +528,7 @@ Error ValidateGetPlatformDisplayCommon(EGLenum platform,
>                    << "Must specify major version if you specify a minor version.";
>         }
> 
>-        if (deviceType == EGL_PLATFORM_ANGLE_DEVICE_TYPE_WARP_ANGLE &&
>+        if (deviceType == EGL_PLATFORM_ANGLE_DEVICE_TYPE_D3D_WARP_ANGLE &&
>             platformType != EGL_PLATFORM_ANGLE_TYPE_D3D11_ANGLE)
>         {
>             return EglBadAttribute() << "EGL_PLATFORM_ANGLE_DEVICE_TYPE_WARP_ANGLE requires a "
>@@ -429,12 +548,24 @@ Error ValidateGetPlatformDisplayCommon(EGLenum platform,
>                                         "device type of EGL_PLATFORM_ANGLE_TYPE_D3D11_ANGLE.";
>         }
> 
>-        if (deviceTypeSpecified && platformType != EGL_PLATFORM_ANGLE_TYPE_D3D9_ANGLE &&
>-            platformType != EGL_PLATFORM_ANGLE_TYPE_D3D11_ANGLE)
>+        if (deviceType.valid())
>         {
>-            return EglBadAttribute() << "EGL_PLATFORM_ANGLE_DEVICE_TYPE_ANGLE requires a "
>-                                        "device type of EGL_PLATFORM_ANGLE_TYPE_D3D9_ANGLE or "
>-                                        "EGL_PLATFORM_ANGLE_TYPE_D3D9_ANGLE.";
>+            switch (deviceType.value())
>+            {
>+                case EGL_PLATFORM_ANGLE_DEVICE_TYPE_D3D_REFERENCE_ANGLE:
>+                case EGL_PLATFORM_ANGLE_DEVICE_TYPE_D3D_WARP_ANGLE:
>+                    if (platformType != EGL_PLATFORM_ANGLE_TYPE_D3D9_ANGLE &&
>+                        platformType != EGL_PLATFORM_ANGLE_TYPE_D3D11_ANGLE)
>+                    {
>+                        return EglBadAttribute()
>+                               << "This device type requires a "
>+                                  "platform type of EGL_PLATFORM_ANGLE_TYPE_D3D9_ANGLE or "
>+                                  "EGL_PLATFORM_ANGLE_TYPE_D3D9_ANGLE.";
>+                    }
>+                    break;
>+                default:
>+                    break;
>+            }
>         }
> 
>         if (platformType == EGL_PLATFORM_ANGLE_TYPE_VULKAN_ANGLE)
>@@ -446,10 +577,17 @@ Error ValidateGetPlatformDisplayCommon(EGLenum platform,
>                                             "only supports Vulkan 1.0.";
>             }
>         }
>+
>+        if (eglHandle.valid() && platformType != EGL_PLATFORM_ANGLE_TYPE_OPENGLES_ANGLE &&
>+            platformType != EGL_PLATFORM_ANGLE_TYPE_DEFAULT_ANGLE)
>+        {
>+            return EglBadAttribute() << "EGL_PLATFORM_ANGLE_EGL_HANDLE_ANGLE requires a "
>+                                        "device type of EGL_PLATFORM_ANGLE_TYPE_OPENGLES_ANGLE.";
>+        }
>     }
>     else if (platform == EGL_PLATFORM_DEVICE_EXT)
>     {
>-        Device *eglDevice = reinterpret_cast<Device *>(native_display);
>+        Device *eglDevice = static_cast<Device *>(native_display);
>         if (eglDevice == nullptr || !Device::IsValidDevice(eglDevice))
>         {
>             return EglBadAttribute() << "native_display should be a valid EGL device if "
>@@ -464,9 +602,102 @@ Error ValidateGetPlatformDisplayCommon(EGLenum platform,
>     return NoError();
> }
> 
>-}  // namespace
>+Error ValidateStream(const Display *display, const Stream *stream)
>+{
>+    ANGLE_TRY(ValidateDisplay(display));
> 
>-Error ValidateDisplay(const Display *display)
>+    const DisplayExtensions &displayExtensions = display->getExtensions();
>+    if (!displayExtensions.stream)
>+    {
>+        return EglBadAccess() << "Stream extension not active";
>+    }
>+
>+    if (stream == EGL_NO_STREAM_KHR || !display->isValidStream(stream))
>+    {
>+        return EglBadStream() << "Invalid stream";
>+    }
>+
>+    return NoError();
>+}
>+
>+Error ValidateLabeledObject(Thread *thread,
>+                            const Display *display,
>+                            ObjectType objectType,
>+                            EGLObjectKHR object,
>+                            LabeledObject **outLabeledObject)
>+{
>+    switch (objectType)
>+    {
>+        case ObjectType::Context:
>+        {
>+            gl::Context *context = static_cast<gl::Context *>(object);
>+            ANGLE_TRY(ValidateContext(display, context));
>+            *outLabeledObject = context;
>+            break;
>+        }
>+
>+        case ObjectType::Display:
>+        {
>+            ANGLE_TRY(ValidateDisplay(display));
>+            if (display != object)
>+            {
>+                return EglBadParameter() << "when object type is EGL_OBJECT_DISPLAY_KHR, the "
>+                                            "object must be the same as the display.";
>+            }
>+
>+            *outLabeledObject = static_cast<Display *>(object);
>+            break;
>+        }
>+
>+        case ObjectType::Image:
>+        {
>+            Image *image = static_cast<Image *>(object);
>+            ANGLE_TRY(ValidateImage(display, image));
>+            *outLabeledObject = image;
>+            break;
>+        }
>+
>+        case ObjectType::Stream:
>+        {
>+            Stream *stream = static_cast<Stream *>(object);
>+            ANGLE_TRY(ValidateStream(display, stream));
>+            *outLabeledObject = stream;
>+            break;
>+        }
>+
>+        case ObjectType::Surface:
>+        {
>+            Surface *surface = static_cast<Surface *>(object);
>+            ANGLE_TRY(ValidateSurface(display, surface));
>+            *outLabeledObject = surface;
>+            break;
>+        }
>+
>+        case ObjectType::Sync:
>+        {
>+            ANGLE_TRY(ValidateDisplay(display));
>+            // TODO(geofflang): Implement sync objects. http://anglebug.com/2466
>+            UNIMPLEMENTED();
>+            return EglBadDisplay() << "Sync objects are unimplemented.";
>+
>+            break;
>+        }
>+
>+        case ObjectType::Thread:
>+        {
>+            *outLabeledObject = thread;
>+            break;
>+        }
>+
>+        default:
>+            return EglBadParameter() << "unknown object type.";
>+    }
>+
>+    return NoError();
>+}
>+
>+// This is a common sub-check of Display status that's shared by multiple functions
>+Error ValidateDisplayPointer(const Display *display)
> {
>     if (display == EGL_NO_DISPLAY)
>     {
>@@ -478,6 +709,49 @@ Error ValidateDisplay(const Display *display)
>         return EglBadDisplay() << "display is not a valid display.";
>     }
> 
>+    return NoError();
>+}
>+
>+bool ValidCompositorTimingName(CompositorTiming name)
>+{
>+    switch (name)
>+    {
>+        case CompositorTiming::CompositeDeadline:
>+        case CompositorTiming::CompositInterval:
>+        case CompositorTiming::CompositToPresentLatency:
>+            return true;
>+
>+        default:
>+            return false;
>+    }
>+}
>+
>+bool ValidTimestampType(Timestamp timestamp)
>+{
>+    switch (timestamp)
>+    {
>+        case Timestamp::RequestedPresentTime:
>+        case Timestamp::RenderingCompleteTime:
>+        case Timestamp::CompositionLatchTime:
>+        case Timestamp::FirstCompositionStartTime:
>+        case Timestamp::LastCompositionStartTime:
>+        case Timestamp::FirstCompositionGPUFinishedTime:
>+        case Timestamp::DisplayPresentTime:
>+        case Timestamp::DequeueReadyTime:
>+        case Timestamp::ReadsDoneTime:
>+            return true;
>+
>+        default:
>+            return false;
>+    }
>+}
>+
>+}  // anonymous namespace
>+
>+Error ValidateDisplay(const Display *display)
>+{
>+    ANGLE_TRY(ValidateDisplayPointer(display));
>+
>     if (!display->isInitialized())
>     {
>         return EglNotInitialized() << "display is not initialized.";
>@@ -539,26 +813,137 @@ Error ValidateImage(const Display *display, const Image *image)
>     return NoError();
> }
> 
>-Error ValidateStream(const Display *display, const Stream *stream)
>+Error ValidateDevice(const Device *device)
> {
>-    ANGLE_TRY(ValidateDisplay(display));
>+    if (device == EGL_NO_DEVICE_EXT)
>+    {
>+        return EglBadAccess() << "device is EGL_NO_DEVICE.";
>+    }
> 
>-    const DisplayExtensions &displayExtensions = display->getExtensions();
>-    if (!displayExtensions.stream)
>+    if (!Device::IsValidDevice(device))
>     {
>-        return EglBadAccess() << "Stream extension not active";
>+        return EglBadAccess() << "device is not valid.";
>     }
> 
>-    if (stream == EGL_NO_STREAM_KHR || !display->isValidStream(stream))
>+    return NoError();
>+}
>+
>+Error ValidateSync(const Display *display, const Sync *sync)
>+{
>+    ANGLE_TRY(ValidateDisplay(display));
>+
>+    if (!display->isValidSync(sync))
>     {
>-        return EglBadStream() << "Invalid stream";
>+        return EglBadParameter() << "sync object is not valid.";
>     }
> 
>     return NoError();
> }
> 
>-Error ValidateCreateContext(Display *display, Config *configuration, gl::Context *shareContext,
>-                            const AttributeMap& attributes)
>+const Thread *GetThreadIfValid(const Thread *thread)
>+{
>+    // Threads should always be valid
>+    return thread;
>+}
>+
>+const Display *GetDisplayIfValid(const Display *display)
>+{
>+    if (ValidateDisplay(display).isError())
>+    {
>+        return nullptr;
>+    }
>+
>+    return display;
>+}
>+
>+const Surface *GetSurfaceIfValid(const Display *display, const Surface *surface)
>+{
>+    if (ValidateSurface(display, surface).isError())
>+    {
>+        return nullptr;
>+    }
>+
>+    return surface;
>+}
>+
>+const Image *GetImageIfValid(const Display *display, const Image *image)
>+{
>+    if (ValidateImage(display, image).isError())
>+    {
>+        return nullptr;
>+    }
>+
>+    return image;
>+}
>+
>+const Stream *GetStreamIfValid(const Display *display, const Stream *stream)
>+{
>+    if (ValidateStream(display, stream).isError())
>+    {
>+        return nullptr;
>+    }
>+
>+    return stream;
>+}
>+
>+const gl::Context *GetContextIfValid(const Display *display, const gl::Context *context)
>+{
>+    if (ValidateContext(display, context).isError())
>+    {
>+        return nullptr;
>+    }
>+
>+    return context;
>+}
>+
>+const Device *GetDeviceIfValid(const Device *device)
>+{
>+    if (ValidateDevice(device).isError())
>+    {
>+        return nullptr;
>+    }
>+
>+    return device;
>+}
>+
>+const Sync *GetSyncIfValid(const Display *display, const Sync *sync)
>+{
>+    if (ValidateSync(display, sync).isError())
>+    {
>+        return nullptr;
>+    }
>+
>+    return sync;
>+}
>+
>+LabeledObject *GetLabeledObjectIfValid(Thread *thread,
>+                                       const Display *display,
>+                                       ObjectType objectType,
>+                                       EGLObjectKHR object)
>+{
>+    LabeledObject *labeledObject = nullptr;
>+    if (ValidateLabeledObject(thread, display, objectType, object, &labeledObject).isError())
>+    {
>+        return nullptr;
>+    }
>+
>+    return labeledObject;
>+}
>+
>+Error ValidateInitialize(const Display *display)
>+{
>+    return ValidateDisplayPointer(display);
>+}
>+
>+Error ValidateTerminate(const Display *display)
>+{
>+    return ValidateDisplayPointer(display);
>+}
>+
>+Error ValidateCreateContext(Display *display,
>+                            Config *configuration,
>+                            gl::Context *shareContext,
>+                            const AttributeMap &attributes)
> {
>     ANGLE_TRY(ValidateConfig(display, configuration));
> 
>@@ -566,171 +951,210 @@ Error ValidateCreateContext(Display *display, Config *configuration, gl::Context
>     EGLAttrib clientMajorVersion = 1;
>     EGLAttrib clientMinorVersion = 0;
>     EGLAttrib contextFlags       = 0;
>-    bool resetNotification = false;
>-    for (AttributeMap::const_iterator attributeIter = attributes.begin(); attributeIter != attributes.end(); attributeIter++)
>+    bool resetNotification       = false;
>+    for (AttributeMap::const_iterator attributeIter = attributes.begin();
>+         attributeIter != attributes.end(); attributeIter++)
>     {
>         EGLAttrib attribute = attributeIter->first;
>         EGLAttrib value     = attributeIter->second;
> 
>         switch (attribute)
>         {
>-          case EGL_CONTEXT_CLIENT_VERSION:
>-            clientMajorVersion = value;
>-            break;
>-
>-          case EGL_CONTEXT_MINOR_VERSION:
>-            clientMinorVersion = value;
>-            break;
>+            case EGL_CONTEXT_CLIENT_VERSION:
>+                clientMajorVersion = value;
>+                break;
> 
>-          case EGL_CONTEXT_FLAGS_KHR:
>-            contextFlags = value;
>-            break;
>+            case EGL_CONTEXT_MINOR_VERSION:
>+                clientMinorVersion = value;
>+                break;
> 
>-          case EGL_CONTEXT_OPENGL_DEBUG:
>-              break;
>+            case EGL_CONTEXT_FLAGS_KHR:
>+                contextFlags = value;
>+                break;
> 
>-          case EGL_CONTEXT_OPENGL_PROFILE_MASK_KHR:
>-            // Only valid for OpenGL (non-ES) contexts
>-            return EglBadAttribute();
>+            case EGL_CONTEXT_OPENGL_DEBUG:
>+                break;
> 
>-          case EGL_CONTEXT_OPENGL_ROBUST_ACCESS_EXT:
>-            if (!display->getExtensions().createContextRobustness)
>-            {
>+            case EGL_CONTEXT_OPENGL_PROFILE_MASK_KHR:
>+                // Only valid for OpenGL (non-ES) contexts
>                 return EglBadAttribute();
>-            }
>-            if (value != EGL_TRUE && value != EGL_FALSE)
>-            {
>-                return EglBadAttribute();
>-            }
>-            break;
> 
>-          case EGL_CONTEXT_OPENGL_RESET_NOTIFICATION_STRATEGY_KHR:
>-            return EglBadAttribute() << "EGL_CONTEXT_OPENGL_RESET_NOTIFICATION_STRATEGY_KHR is not"
>-                                     << " valid for GLES with EGL 1.4 and KHR_create_context. Use"
>-                                     << " EXT_create_context_robustness.";
>-          case EGL_CONTEXT_OPENGL_RESET_NOTIFICATION_STRATEGY_EXT:
>-            if (!display->getExtensions().createContextRobustness)
>-            {
>-                return EglBadAttribute();
>-            }
>-            if (value == EGL_LOSE_CONTEXT_ON_RESET_EXT)
>-            {
>-                resetNotification = true;
>-            }
>-            else if (value != EGL_NO_RESET_NOTIFICATION_EXT)
>-            {
>-                return EglBadAttribute();
>-            }
>-            break;
>+            case EGL_CONTEXT_OPENGL_ROBUST_ACCESS_EXT:
>+                if (!display->getExtensions().createContextRobustness)
>+                {
>+                    return EglBadAttribute();
>+                }
>+                if (value != EGL_TRUE && value != EGL_FALSE)
>+                {
>+                    return EglBadAttribute();
>+                }
>+                break;
>+
>+            case EGL_CONTEXT_OPENGL_RESET_NOTIFICATION_STRATEGY_KHR:
>+                return EglBadAttribute()
>+                       << "EGL_CONTEXT_OPENGL_RESET_NOTIFICATION_STRATEGY_KHR is not"
>+                       << " valid for GLES with EGL 1.4 and KHR_create_context. Use"
>+                       << " EXT_create_context_robustness.";
>+            case EGL_CONTEXT_OPENGL_RESET_NOTIFICATION_STRATEGY_EXT:
>+                if (!display->getExtensions().createContextRobustness)
>+                {
>+                    return EglBadAttribute();
>+                }
>+                if (value == EGL_LOSE_CONTEXT_ON_RESET_EXT)
>+                {
>+                    resetNotification = true;
>+                }
>+                else if (value != EGL_NO_RESET_NOTIFICATION_EXT)
>+                {
>+                    return EglBadAttribute();
>+                }
>+                break;
>+
>+            case EGL_CONTEXT_OPENGL_NO_ERROR_KHR:
>+                if (!display->getExtensions().createContextNoError)
>+                {
>+                    return EglBadAttribute() << "Invalid Context attribute.";
>+                }
>+                if (value != EGL_TRUE && value != EGL_FALSE)
>+                {
>+                    return EglBadAttribute() << "Attribute must be EGL_TRUE or EGL_FALSE.";
>+                }
>+                break;
>+
>+            case EGL_CONTEXT_WEBGL_COMPATIBILITY_ANGLE:
>+                if (!display->getExtensions().createContextWebGLCompatibility)
>+                {
>+                    return EglBadAttribute() << "Attribute "
>+                                                "EGL_CONTEXT_WEBGL_COMPATIBILITY_ANGLE requires "
>+                                                "EGL_ANGLE_create_context_webgl_compatibility.";
>+                }
>+                if (value != EGL_TRUE && value != EGL_FALSE)
>+                {
>+                    return EglBadAttribute() << "EGL_CONTEXT_WEBGL_COMPATIBILITY_ANGLE must be "
>+                                                "EGL_TRUE or EGL_FALSE.";
>+                }
>+                break;
>+
>+            case EGL_CONTEXT_BIND_GENERATES_RESOURCE_CHROMIUM:
>+                if (!display->getExtensions().createContextBindGeneratesResource)
>+                {
>+                    return EglBadAttribute()
>+                           << "Attribute EGL_CONTEXT_BIND_GENERATES_RESOURCE_CHROMIUM requires "
>+                              "EGL_CHROMIUM_create_context_bind_generates_resource.";
>+                }
>+                if (value != EGL_TRUE && value != EGL_FALSE)
>+                {
>+                    return EglBadAttribute() << "EGL_CONTEXT_BIND_GENERATES_RESOURCE_CHROMIUM "
>+                                                "must be EGL_TRUE or EGL_FALSE.";
>+                }
>+                break;
>+
>+            case EGL_DISPLAY_TEXTURE_SHARE_GROUP_ANGLE:
>+                if (!display->getExtensions().displayTextureShareGroup)
>+                {
>+                    return EglBadAttribute() << "Attribute "
>+                                                "EGL_DISPLAY_TEXTURE_SHARE_GROUP_ANGLE requires "
>+                                                "EGL_ANGLE_display_texture_share_group.";
>+                }
>+                if (value != EGL_TRUE && value != EGL_FALSE)
>+                {
>+                    return EglBadAttribute() << "EGL_DISPLAY_TEXTURE_SHARE_GROUP_ANGLE must be "
>+                                                "EGL_TRUE or EGL_FALSE.";
>+                }
>+                if (shareContext &&
>+                    (shareContext->usingDisplayTextureShareGroup() != (value == EGL_TRUE)))
>+                {
>+                    return EglBadAttribute() << "All contexts within a share group must be "
>+                                                "created with the same value of "
>+                                                "EGL_DISPLAY_TEXTURE_SHARE_GROUP_ANGLE.";
>+                }
>+                break;
>+
>+            case EGL_CONTEXT_CLIENT_ARRAYS_ENABLED_ANGLE:
>+                if (!display->getExtensions().createContextClientArrays)
>+                {
>+                    return EglBadAttribute()
>+                           << "Attribute EGL_CONTEXT_CLIENT_ARRAYS_ENABLED_ANGLE requires "
>+                              "EGL_ANGLE_create_context_client_arrays.";
>+                }
>+                if (value != EGL_TRUE && value != EGL_FALSE)
>+                {
>+                    return EglBadAttribute() << "EGL_CONTEXT_CLIENT_ARRAYS_ENABLED_ANGLE must "
>+                                                "be EGL_TRUE or EGL_FALSE.";
>+                }
>+                break;
>+
>+            case EGL_CONTEXT_PROGRAM_BINARY_CACHE_ENABLED_ANGLE:
>+                if (!display->getExtensions().programCacheControl)
>+                {
>+                    return EglBadAttribute()
>+                           << "Attribute EGL_CONTEXT_PROGRAM_BINARY_CACHE_ENABLED_ANGLE "
>+                              "requires EGL_ANGLE_program_cache_control.";
>+                }
>+                if (value != EGL_TRUE && value != EGL_FALSE)
>+                {
>+                    return EglBadAttribute()
>+                           << "EGL_CONTEXT_PROGRAM_BINARY_CACHE_ENABLED_ANGLE must "
>+                              "be EGL_TRUE or EGL_FALSE.";
>+                }
>+                break;
>+
>+            case EGL_ROBUST_RESOURCE_INITIALIZATION_ANGLE:
>+                if (!display->getExtensions().robustResourceInitialization)
>+                {
>+                    return EglBadAttribute()
>+                           << "Attribute EGL_ROBUST_RESOURCE_INITIALIZATION_ANGLE "
>+                              "requires EGL_ANGLE_robust_resource_initialization.";
>+                }
>+                if (value != EGL_TRUE && value != EGL_FALSE)
>+                {
>+                    return EglBadAttribute() << "EGL_ROBUST_RESOURCE_INITIALIZATION_ANGLE must be "
>+                                                "either EGL_TRUE or EGL_FALSE.";
>+                }
>+                break;
>+
>+            case EGL_EXTENSIONS_ENABLED_ANGLE:
>+                if (!display->getExtensions().createContextExtensionsEnabled)
>+                {
>+                    return EglBadAttribute()
>+                           << "Attribute EGL_EXTENSIONS_ENABLED_ANGLE "
>+                              "requires EGL_ANGLE_create_context_extensions_enabled.";
>+                }
>+                if (value != EGL_TRUE && value != EGL_FALSE)
>+                {
>+                    return EglBadAttribute() << "EGL_EXTENSIONS_ENABLED_ANGLE must be "
>+                                                "either EGL_TRUE or EGL_FALSE.";
>+                }
>+                break;
>+
>+            case EGL_POWER_PREFERENCE_ANGLE:
>+                if (!display->getExtensions().powerPreference)
>+                {
>+                    return EglBadAttribute() << "Attribute EGL_POWER_PREFERENCE_ANGLE "
>+                                                "requires EGL_ANGLE_power_preference.";
>+                }
>+                if (value != EGL_LOW_POWER_ANGLE && value != EGL_HIGH_POWER_ANGLE)
>+                {
>+                    return EglBadAttribute()
>+                           << "EGL_POWER_PREFERENCE_ANGLE must be "
>+                              "either EGL_LOW_POWER_ANGLE or EGL_HIGH_POWER_ANGLE.";
>+                }
>+                break;
> 
>-          case EGL_CONTEXT_OPENGL_NO_ERROR_KHR:
>-              if (!display->getExtensions().createContextNoError)
>-              {
>-                  return EglBadAttribute() << "Invalid Context attribute.";
>-              }
>-              if (value != EGL_TRUE && value != EGL_FALSE)
>-              {
>-                  return EglBadAttribute() << "Attribute must be EGL_TRUE or EGL_FALSE.";
>-              }
>-              break;
>-
>-          case EGL_CONTEXT_WEBGL_COMPATIBILITY_ANGLE:
>-              if (!display->getExtensions().createContextWebGLCompatibility)
>-              {
>-                  return EglBadAttribute() << "Attribute "
>-                                              "EGL_CONTEXT_WEBGL_COMPATIBILITY_ANGLE requires "
>-                                              "EGL_ANGLE_create_context_webgl_compatibility.";
>-              }
>-              if (value != EGL_TRUE && value != EGL_FALSE)
>-              {
>-                  return EglBadAttribute()
>-                         << "EGL_CONTEXT_WEBGL_COMPATIBILITY_ANGLE must be EGL_TRUE or EGL_FALSE.";
>-              }
>-              break;
>-
>-          case EGL_CONTEXT_BIND_GENERATES_RESOURCE_CHROMIUM:
>-              if (!display->getExtensions().createContextBindGeneratesResource)
>-              {
>-                  return EglBadAttribute()
>-                         << "Attribute EGL_CONTEXT_BIND_GENERATES_RESOURCE_CHROMIUM requires "
>-                            "EGL_CHROMIUM_create_context_bind_generates_resource.";
>-              }
>-              if (value != EGL_TRUE && value != EGL_FALSE)
>-              {
>-                  return EglBadAttribute() << "EGL_CONTEXT_BIND_GENERATES_RESOURCE_CHROMIUM "
>-                                              "must be EGL_TRUE or EGL_FALSE.";
>-              }
>-              break;
>-
>-          case EGL_DISPLAY_TEXTURE_SHARE_GROUP_ANGLE:
>-              if (!display->getExtensions().displayTextureShareGroup)
>-              {
>-                  return EglBadAttribute() << "Attribute "
>-                                              "EGL_DISPLAY_TEXTURE_SHARE_GROUP_ANGLE requires "
>-                                              "EGL_ANGLE_display_texture_share_group.";
>-              }
>-              if (value != EGL_TRUE && value != EGL_FALSE)
>-              {
>-                  return EglBadAttribute()
>-                         << "EGL_DISPLAY_TEXTURE_SHARE_GROUP_ANGLE must be EGL_TRUE or EGL_FALSE.";
>-              }
>-              if (shareContext &&
>-                  (shareContext->usingDisplayTextureShareGroup() != (value == EGL_TRUE)))
>-              {
>-                  return EglBadAttribute() << "All contexts within a share group must be "
>-                                              "created with the same value of "
>-                                              "EGL_DISPLAY_TEXTURE_SHARE_GROUP_ANGLE.";
>-              }
>-              break;
>-
>-          case EGL_CONTEXT_CLIENT_ARRAYS_ENABLED_ANGLE:
>-              if (!display->getExtensions().createContextClientArrays)
>-              {
>-                  return EglBadAttribute()
>-                         << "Attribute EGL_CONTEXT_CLIENT_ARRAYS_ENABLED_ANGLE requires "
>-                            "EGL_ANGLE_create_context_client_arrays.";
>-              }
>-              if (value != EGL_TRUE && value != EGL_FALSE)
>-              {
>-                  return EglBadAttribute() << "EGL_CONTEXT_CLIENT_ARRAYS_ENABLED_ANGLE must "
>-                                              "be EGL_TRUE or EGL_FALSE.";
>-              }
>-              break;
>-
>-          case EGL_CONTEXT_PROGRAM_BINARY_CACHE_ENABLED_ANGLE:
>-              if (!display->getExtensions().programCacheControl)
>-              {
>-                  return EglBadAttribute()
>-                         << "Attribute EGL_CONTEXT_PROGRAM_BINARY_CACHE_ENABLED_ANGLE "
>-                            "requires EGL_ANGLE_program_cache_control.";
>-              }
>-              if (value != EGL_TRUE && value != EGL_FALSE)
>-              {
>-                  return EglBadAttribute() << "EGL_CONTEXT_PROGRAM_BINARY_CACHE_ENABLED_ANGLE must "
>-                                              "be EGL_TRUE or EGL_FALSE.";
>-              }
>-              break;
>-
>-          case EGL_ROBUST_RESOURCE_INITIALIZATION_ANGLE:
>-              if (!display->getExtensions().robustResourceInitialization)
>-              {
>-                  return EglBadAttribute() << "Attribute EGL_ROBUST_RESOURCE_INITIALIZATION_ANGLE "
>-                                              "requires EGL_ANGLE_robust_resource_initialization.";
>-              }
>-              if (value != EGL_TRUE && value != EGL_FALSE)
>-              {
>-                  return EglBadAttribute() << "EGL_ROBUST_RESOURCE_INITIALIZATION_ANGLE must be "
>-                                              "either EGL_TRUE or EGL_FALSE.";
>-              }
>-              break;
>-
>-          default:
>-              return EglBadAttribute() << "Unknown attribute.";
>+            default:
>+                return EglBadAttribute() << "Unknown attribute.";
>         }
>     }
> 
>     switch (clientMajorVersion)
>     {
>+        case 1:
>+            if (clientMinorVersion != 0 && clientMinorVersion != 1)
>+            {
>+                return EglBadConfig();
>+            }
>+            break;
>+
>         case 2:
>             if (clientMinorVersion != 0)
>             {
>@@ -742,7 +1166,7 @@ Error ValidateCreateContext(Display *display, Config *configuration, gl::Context
>             {
>                 return EglBadConfig();
>             }
>-            if (!(configuration->conformant & EGL_OPENGL_ES3_BIT_KHR))
>+            if (!(configuration->renderableType & EGL_OPENGL_ES3_BIT_KHR))
>             {
>                 return EglBadConfig();
>             }
>@@ -759,8 +1183,8 @@ Error ValidateCreateContext(Display *display, Config *configuration, gl::Context
>     }
> 
>     // Note: EGL_CONTEXT_OPENGL_FORWARD_COMPATIBLE_BIT_KHR does not apply to ES
>-    const EGLint validContextFlags = (EGL_CONTEXT_OPENGL_DEBUG_BIT_KHR |
>-                                      EGL_CONTEXT_OPENGL_ROBUST_ACCESS_BIT_KHR);
>+    const EGLint validContextFlags =
>+        (EGL_CONTEXT_OPENGL_DEBUG_BIT_KHR | EGL_CONTEXT_OPENGL_ROBUST_ACCESS_BIT_KHR);
>     if ((contextFlags & ~validContextFlags) != 0)
>     {
>         return EglBadAttribute();
>@@ -789,8 +1213,10 @@ Error ValidateCreateContext(Display *display, Config *configuration, gl::Context
>     return NoError();
> }
> 
>-Error ValidateCreateWindowSurface(Display *display, Config *config, EGLNativeWindowType window,
>-                                  const AttributeMap& attributes)
>+Error ValidateCreateWindowSurface(Display *display,
>+                                  Config *config,
>+                                  EGLNativeWindowType window,
>+                                  const AttributeMap &attributes)
> {
>     ANGLE_TRY(ValidateConfig(display, config));
> 
>@@ -801,93 +1227,95 @@ Error ValidateCreateWindowSurface(Display *display, Config *config, EGLNativeWin
> 
>     const DisplayExtensions &displayExtensions = display->getExtensions();
> 
>-    for (AttributeMap::const_iterator attributeIter = attributes.begin(); attributeIter != attributes.end(); attributeIter++)
>+    for (AttributeMap::const_iterator attributeIter = attributes.begin();
>+         attributeIter != attributes.end(); attributeIter++)
>     {
>         EGLAttrib attribute = attributeIter->first;
>         EGLAttrib value     = attributeIter->second;
> 
>         switch (attribute)
>         {
>-          case EGL_RENDER_BUFFER:
>-            switch (value)
>-            {
>-              case EGL_BACK_BUFFER:
>+            case EGL_RENDER_BUFFER:
>+                switch (value)
>+                {
>+                    case EGL_BACK_BUFFER:
>+                        break;
>+                    case EGL_SINGLE_BUFFER:
>+                        return EglBadMatch();  // Rendering directly to front buffer not supported
>+                    default:
>+                        return EglBadAttribute();
>+                }
>                 break;
>-              case EGL_SINGLE_BUFFER:
>-                  return EglBadMatch();  // Rendering directly to front buffer not supported
>-              default:
>-                  return EglBadAttribute();
>-            }
>-            break;
> 
>-          case EGL_POST_SUB_BUFFER_SUPPORTED_NV:
>-            if (!displayExtensions.postSubBuffer)
>-            {
>-                return EglBadAttribute();
>-            }
>-            break;
>+            case EGL_POST_SUB_BUFFER_SUPPORTED_NV:
>+                if (!displayExtensions.postSubBuffer)
>+                {
>+                    return EglBadAttribute();
>+                }
>+                break;
> 
>-          case EGL_FLEXIBLE_SURFACE_COMPATIBILITY_SUPPORTED_ANGLE:
>-              if (!displayExtensions.flexibleSurfaceCompatibility)
>-              {
>-                  return EglBadAttribute();
>-              }
>-              break;
>+            case EGL_FLEXIBLE_SURFACE_COMPATIBILITY_SUPPORTED_ANGLE:
>+                if (!displayExtensions.flexibleSurfaceCompatibility)
>+                {
>+                    return EglBadAttribute();
>+                }
>+                break;
> 
>-          case EGL_WIDTH:
>-          case EGL_HEIGHT:
>-            if (!displayExtensions.windowFixedSize)
>-            {
>-                return EglBadAttribute();
>-            }
>-            if (value < 0)
>-            {
>-                return EglBadParameter();
>-            }
>-            break;
>+            case EGL_WIDTH:
>+            case EGL_HEIGHT:
>+                if (!displayExtensions.windowFixedSize)
>+                {
>+                    return EglBadAttribute();
>+                }
>+                if (value < 0)
>+                {
>+                    return EglBadParameter();
>+                }
>+                break;
> 
>-          case EGL_FIXED_SIZE_ANGLE:
>-            if (!displayExtensions.windowFixedSize)
>-            {
>-                return EglBadAttribute();
>-            }
>-            break;
>+            case EGL_FIXED_SIZE_ANGLE:
>+                if (!displayExtensions.windowFixedSize)
>+                {
>+                    return EglBadAttribute();
>+                }
>+                break;
> 
>-          case EGL_SURFACE_ORIENTATION_ANGLE:
>-              if (!displayExtensions.surfaceOrientation)
>-              {
>-                  return EglBadAttribute() << "EGL_ANGLE_surface_orientation is not enabled.";
>-              }
>-              break;
>-
>-          case EGL_VG_COLORSPACE:
>-              return EglBadMatch();
>-
>-          case EGL_VG_ALPHA_FORMAT:
>-              return EglBadMatch();
>-
>-          case EGL_DIRECT_COMPOSITION_ANGLE:
>-              if (!displayExtensions.directComposition)
>-              {
>-                  return EglBadAttribute();
>-              }
>-              break;
>-
>-          case EGL_ROBUST_RESOURCE_INITIALIZATION_ANGLE:
>-              if (!display->getExtensions().robustResourceInitialization)
>-              {
>-                  return EglBadAttribute() << "Attribute EGL_ROBUST_RESOURCE_INITIALIZATION_ANGLE "
>-                                              "requires EGL_ANGLE_robust_resource_initialization.";
>-              }
>-              if (value != EGL_TRUE && value != EGL_FALSE)
>-              {
>-                  return EglBadAttribute() << "EGL_ROBUST_RESOURCE_INITIALIZATION_ANGLE must be "
>-                                              "either EGL_TRUE or EGL_FALSE.";
>-              }
>-              break;
>-
>-          default:
>-              return EglBadAttribute();
>+            case EGL_SURFACE_ORIENTATION_ANGLE:
>+                if (!displayExtensions.surfaceOrientation)
>+                {
>+                    return EglBadAttribute() << "EGL_ANGLE_surface_orientation is not enabled.";
>+                }
>+                break;
>+
>+            case EGL_VG_COLORSPACE:
>+                return EglBadMatch();
>+
>+            case EGL_VG_ALPHA_FORMAT:
>+                return EglBadMatch();
>+
>+            case EGL_DIRECT_COMPOSITION_ANGLE:
>+                if (!displayExtensions.directComposition)
>+                {
>+                    return EglBadAttribute();
>+                }
>+                break;
>+
>+            case EGL_ROBUST_RESOURCE_INITIALIZATION_ANGLE:
>+                if (!display->getExtensions().robustResourceInitialization)
>+                {
>+                    return EglBadAttribute()
>+                           << "Attribute EGL_ROBUST_RESOURCE_INITIALIZATION_ANGLE "
>+                              "requires EGL_ANGLE_robust_resource_initialization.";
>+                }
>+                if (value != EGL_TRUE && value != EGL_FALSE)
>+                {
>+                    return EglBadAttribute() << "EGL_ROBUST_RESOURCE_INITIALIZATION_ANGLE must be "
>+                                                "either EGL_TRUE or EGL_FALSE.";
>+                }
>+                break;
>+
>+            default:
>+                return EglBadAttribute();
>         }
>     }
> 
>@@ -899,86 +1327,88 @@ Error ValidateCreateWindowSurface(Display *display, Config *config, EGLNativeWin
>     return NoError();
> }
> 
>-Error ValidateCreatePbufferSurface(Display *display, Config *config, const AttributeMap& attributes)
>+Error ValidateCreatePbufferSurface(Display *display, Config *config, const AttributeMap &attributes)
> {
>     ANGLE_TRY(ValidateConfig(display, config));
> 
>     const DisplayExtensions &displayExtensions = display->getExtensions();
> 
>-    for (AttributeMap::const_iterator attributeIter = attributes.begin(); attributeIter != attributes.end(); attributeIter++)
>+    for (AttributeMap::const_iterator attributeIter = attributes.begin();
>+         attributeIter != attributes.end(); attributeIter++)
>     {
>         EGLAttrib attribute = attributeIter->first;
>         EGLAttrib value     = attributeIter->second;
> 
>         switch (attribute)
>         {
>-          case EGL_WIDTH:
>-          case EGL_HEIGHT:
>-            if (value < 0)
>-            {
>-                return EglBadParameter();
>-            }
>-            break;
>+            case EGL_WIDTH:
>+            case EGL_HEIGHT:
>+                if (value < 0)
>+                {
>+                    return EglBadParameter();
>+                }
>+                break;
> 
>-          case EGL_LARGEST_PBUFFER:
>-            break;
>+            case EGL_LARGEST_PBUFFER:
>+                break;
> 
>-          case EGL_TEXTURE_FORMAT:
>-            switch (value)
>-            {
>-              case EGL_NO_TEXTURE:
>-              case EGL_TEXTURE_RGB:
>-              case EGL_TEXTURE_RGBA:
>+            case EGL_TEXTURE_FORMAT:
>+                switch (value)
>+                {
>+                    case EGL_NO_TEXTURE:
>+                    case EGL_TEXTURE_RGB:
>+                    case EGL_TEXTURE_RGBA:
>+                        break;
>+                    default:
>+                        return EglBadAttribute();
>+                }
>                 break;
>-              default:
>-                  return EglBadAttribute();
>-            }
>-            break;
> 
>-          case EGL_TEXTURE_TARGET:
>-            switch (value)
>-            {
>-              case EGL_NO_TEXTURE:
>-              case EGL_TEXTURE_2D:
>+            case EGL_TEXTURE_TARGET:
>+                switch (value)
>+                {
>+                    case EGL_NO_TEXTURE:
>+                    case EGL_TEXTURE_2D:
>+                        break;
>+                    default:
>+                        return EglBadAttribute();
>+                }
>                 break;
>-              default:
>-                  return EglBadAttribute();
>-            }
>-            break;
> 
>-          case EGL_MIPMAP_TEXTURE:
>-            break;
>+            case EGL_MIPMAP_TEXTURE:
>+                break;
> 
>-          case EGL_VG_COLORSPACE:
>-            break;
>+            case EGL_VG_COLORSPACE:
>+                break;
> 
>-          case EGL_VG_ALPHA_FORMAT:
>-            break;
>+            case EGL_VG_ALPHA_FORMAT:
>+                break;
> 
>-          case EGL_FLEXIBLE_SURFACE_COMPATIBILITY_SUPPORTED_ANGLE:
>-              if (!displayExtensions.flexibleSurfaceCompatibility)
>-              {
>-                  return EglBadAttribute()
>-                         << "EGL_FLEXIBLE_SURFACE_COMPATIBILITY_SUPPORTED_ANGLE cannot be used "
>-                            "without EGL_ANGLE_flexible_surface_compatibility support.";
>-              }
>-              break;
>+            case EGL_FLEXIBLE_SURFACE_COMPATIBILITY_SUPPORTED_ANGLE:
>+                if (!displayExtensions.flexibleSurfaceCompatibility)
>+                {
>+                    return EglBadAttribute()
>+                           << "EGL_FLEXIBLE_SURFACE_COMPATIBILITY_SUPPORTED_ANGLE cannot be used "
>+                              "without EGL_ANGLE_flexible_surface_compatibility support.";
>+                }
>+                break;
> 
>-          case EGL_ROBUST_RESOURCE_INITIALIZATION_ANGLE:
>-              if (!display->getExtensions().robustResourceInitialization)
>-              {
>-                  return EglBadAttribute() << "Attribute EGL_ROBUST_RESOURCE_INITIALIZATION_ANGLE "
>-                                              "requires EGL_ANGLE_robust_resource_initialization.";
>-              }
>-              if (value != EGL_TRUE && value != EGL_FALSE)
>-              {
>-                  return EglBadAttribute() << "EGL_ROBUST_RESOURCE_INITIALIZATION_ANGLE must be "
>-                                              "either EGL_TRUE or EGL_FALSE.";
>-              }
>-              break;
>+            case EGL_ROBUST_RESOURCE_INITIALIZATION_ANGLE:
>+                if (!display->getExtensions().robustResourceInitialization)
>+                {
>+                    return EglBadAttribute()
>+                           << "Attribute EGL_ROBUST_RESOURCE_INITIALIZATION_ANGLE "
>+                              "requires EGL_ANGLE_robust_resource_initialization.";
>+                }
>+                if (value != EGL_TRUE && value != EGL_FALSE)
>+                {
>+                    return EglBadAttribute() << "EGL_ROBUST_RESOURCE_INITIALIZATION_ANGLE must be "
>+                                                "either EGL_TRUE or EGL_FALSE.";
>+                }
>+                break;
> 
>-          default:
>-              return EglBadAttribute();
>+            default:
>+                return EglBadAttribute();
>         }
>     }
> 
>@@ -998,7 +1428,7 @@ Error ValidateCreatePbufferSurface(Display *display, Config *config, const Attri
>         return EglBadMatch();
>     }
> 
>-    if ((textureFormat == EGL_TEXTURE_RGB  && config->bindToTextureRGB != EGL_TRUE) ||
>+    if ((textureFormat == EGL_TEXTURE_RGB && config->bindToTextureRGB != EGL_TRUE) ||
>         (textureFormat == EGL_TEXTURE_RGBA && config->bindToTextureRGBA != EGL_TRUE))
>     {
>         return EglBadAttribute();
>@@ -1006,7 +1436,8 @@ Error ValidateCreatePbufferSurface(Display *display, Config *config, const Attri
> 
>     EGLint width  = static_cast<EGLint>(attributes.get(EGL_WIDTH, 0));
>     EGLint height = static_cast<EGLint>(attributes.get(EGL_HEIGHT, 0));
>-    if (textureFormat != EGL_NO_TEXTURE && !caps.textureNPOT && (!gl::isPow2(width) || !gl::isPow2(height)))
>+    if (textureFormat != EGL_NO_TEXTURE && !caps.textureNPOT &&
>+        (!gl::isPow2(width) || !gl::isPow2(height)))
>     {
>         return EglBadMatch();
>     }
>@@ -1014,8 +1445,11 @@ Error ValidateCreatePbufferSurface(Display *display, Config *config, const Attri
>     return NoError();
> }
> 
>-Error ValidateCreatePbufferFromClientBuffer(Display *display, EGLenum buftype, EGLClientBuffer buffer,
>-                                            Config *config, const AttributeMap& attributes)
>+Error ValidateCreatePbufferFromClientBuffer(Display *display,
>+                                            EGLenum buftype,
>+                                            EGLClientBuffer buffer,
>+                                            Config *config,
>+                                            const AttributeMap &attributes)
> {
>     ANGLE_TRY(ValidateConfig(display, config));
> 
>@@ -1023,91 +1457,146 @@ Error ValidateCreatePbufferFromClientBuffer(Display *display, EGLenum buftype, E
> 
>     switch (buftype)
>     {
>-      case EGL_D3D_TEXTURE_2D_SHARE_HANDLE_ANGLE:
>-        if (!displayExtensions.d3dShareHandleClientBuffer)
>-        {
>-            return EglBadParameter();
>-        }
>-        if (buffer == nullptr)
>-        {
>-            return EglBadParameter();
>-        }
>-        break;
>-
>-      case EGL_D3D_TEXTURE_ANGLE:
>-          if (!displayExtensions.d3dTextureClientBuffer)
>-          {
>-              return EglBadParameter();
>-          }
>-          if (buffer == nullptr)
>-          {
>-              return EglBadParameter();
>-          }
>-          break;
>-
>-      default:
>-          return EglBadParameter();
>-    }
>-
>-    for (AttributeMap::const_iterator attributeIter = attributes.begin(); attributeIter != attributes.end(); attributeIter++)
>-    {
>-        EGLAttrib attribute = attributeIter->first;
>-        EGLAttrib value     = attributeIter->second;
>-
>-        switch (attribute)
>-        {
>-          case EGL_WIDTH:
>-          case EGL_HEIGHT:
>+        case EGL_D3D_TEXTURE_2D_SHARE_HANDLE_ANGLE:
>             if (!displayExtensions.d3dShareHandleClientBuffer)
>             {
>                 return EglBadParameter();
>             }
>-            if (value < 0)
>+            if (buffer == nullptr)
>             {
>                 return EglBadParameter();
>             }
>             break;
> 
>-          case EGL_TEXTURE_FORMAT:
>-            switch (value)
>+        case EGL_D3D_TEXTURE_ANGLE:
>+            if (!displayExtensions.d3dTextureClientBuffer)
>             {
>-              case EGL_NO_TEXTURE:
>-              case EGL_TEXTURE_RGB:
>-              case EGL_TEXTURE_RGBA:
>-                break;
>-              default:
>-                  return EglBadAttribute();
>+                return EglBadParameter();
>+            }
>+            if (buffer == nullptr)
>+            {
>+                return EglBadParameter();
>             }
>             break;
> 
>-          case EGL_TEXTURE_TARGET:
>-            switch (value)
>+        case EGL_IOSURFACE_ANGLE:
>+            if (!displayExtensions.iosurfaceClientBuffer)
>             {
>-              case EGL_NO_TEXTURE:
>-              case EGL_TEXTURE_2D:
>-                break;
>-              default:
>-                  return EglBadAttribute();
>+                return EglBadParameter() << "<buftype> EGL_IOSURFACE_ANGLE requires the "
>+                                            "EGL_ANGLE_iosurface_client_buffer extension.";
>+            }
>+            if (buffer == nullptr)
>+            {
>+                return EglBadParameter() << "<buffer> must be non null";
>             }
>             break;
> 
>-          case EGL_MIPMAP_TEXTURE:
>-            break;
>+        default:
>+            return EglBadParameter();
>+    }
>+
>+    for (AttributeMap::const_iterator attributeIter = attributes.begin();
>+         attributeIter != attributes.end(); attributeIter++)
>+    {
>+        EGLAttrib attribute = attributeIter->first;
>+        EGLAttrib value     = attributeIter->second;
>+
>+        switch (attribute)
>+        {
>+            case EGL_WIDTH:
>+            case EGL_HEIGHT:
>+                if (buftype != EGL_D3D_TEXTURE_2D_SHARE_HANDLE_ANGLE &&
>+                    buftype != EGL_D3D_TEXTURE_ANGLE && buftype != EGL_IOSURFACE_ANGLE)
>+                {
>+                    return EglBadParameter()
>+                           << "Width and Height are not supported for thie <buftype>";
>+                }
>+                if (value < 0)
>+                {
>+                    return EglBadParameter() << "Width and Height must be positive";
>+                }
>+                break;
>+
>+            case EGL_TEXTURE_FORMAT:
>+                switch (value)
>+                {
>+                    case EGL_NO_TEXTURE:
>+                    case EGL_TEXTURE_RGB:
>+                    case EGL_TEXTURE_RGBA:
>+                        break;
>+                    default:
>+                        return EglBadAttribute() << "Invalid value for EGL_TEXTURE_FORMAT";
>+                }
>+                break;
>+
>+            case EGL_TEXTURE_TARGET:
>+                switch (value)
>+                {
>+                    case EGL_NO_TEXTURE:
>+                    case EGL_TEXTURE_2D:
>+                        break;
>+                    case EGL_TEXTURE_RECTANGLE_ANGLE:
>+                        if (buftype != EGL_IOSURFACE_ANGLE)
>+                        {
>+                            return EglBadParameter()
>+                                   << "<buftype> doesn't support rectangle texture targets";
>+                        }
>+                        break;
>+
>+                    default:
>+                        return EglBadAttribute() << "Invalid value for EGL_TEXTURE_TARGET";
>+                }
>+                break;
>+
>+            case EGL_MIPMAP_TEXTURE:
>+                break;
>+
>+            case EGL_FLEXIBLE_SURFACE_COMPATIBILITY_SUPPORTED_ANGLE:
>+                if (!displayExtensions.flexibleSurfaceCompatibility)
>+                {
>+                    return EglBadAttribute()
>+                           << "EGL_FLEXIBLE_SURFACE_COMPATIBILITY_SUPPORTED_ANGLE cannot be used "
>+                              "without EGL_ANGLE_flexible_surface_compatibility support.";
>+                }
>+                break;
>+
>+            case EGL_IOSURFACE_PLANE_ANGLE:
>+                if (buftype != EGL_IOSURFACE_ANGLE)
>+                {
>+                    return EglBadAttribute() << "<buftype> doesn't support iosurface plane";
>+                }
>+                break;
> 
>-          case EGL_FLEXIBLE_SURFACE_COMPATIBILITY_SUPPORTED_ANGLE:
>-              if (!displayExtensions.flexibleSurfaceCompatibility)
>-              {
>-                  return EglBadAttribute()
>-                         << "EGL_FLEXIBLE_SURFACE_COMPATIBILITY_SUPPORTED_ANGLE cannot be used "
>-                            "without EGL_ANGLE_flexible_surface_compatibility support.";
>-              }
>-              break;
>+            case EGL_TEXTURE_TYPE_ANGLE:
>+                if (buftype != EGL_IOSURFACE_ANGLE)
>+                {
>+                    return EglBadAttribute() << "<buftype> doesn't support texture type";
>+                }
>+                break;
> 
>-          default:
>-              return EglBadAttribute();
>+            case EGL_TEXTURE_INTERNAL_FORMAT_ANGLE:
>+                if (buftype != EGL_IOSURFACE_ANGLE)
>+                {
>+                    return EglBadAttribute() << "<buftype> doesn't support texture internal format";
>+                }
>+                break;
>+            case EGL_GL_COLORSPACE:
>+                if (buftype != EGL_D3D_TEXTURE_ANGLE)
>+                {
>+                    return EglBadAttribute() << "<buftype> doesn't support setting GL colorspace";
>+                }
>+                break;
>+            default:
>+                return EglBadAttribute();
>         }
>     }
> 
>+    EGLAttrib colorspace = attributes.get(EGL_GL_COLORSPACE, EGL_GL_COLORSPACE_LINEAR);
>+    if (colorspace != EGL_GL_COLORSPACE_LINEAR && colorspace != EGL_GL_COLORSPACE_SRGB)
>+    {
>+        return EglBadAttribute() << "invalid GL colorspace";
>+    }
>+
>     if (!(config->surfaceType & EGL_PBUFFER_BIT))
>     {
>         return EglBadMatch();
>@@ -1120,11 +1609,20 @@ Error ValidateCreatePbufferFromClientBuffer(Display *display, EGLenum buftype, E
>     {
>         return EglBadMatch();
>     }
>-
>-    if ((textureFormat == EGL_TEXTURE_RGB  && config->bindToTextureRGB  != EGL_TRUE) ||
>+    if ((textureFormat == EGL_TEXTURE_RGB && config->bindToTextureRGB != EGL_TRUE) ||
>         (textureFormat == EGL_TEXTURE_RGBA && config->bindToTextureRGBA != EGL_TRUE))
>     {
>-        return EglBadAttribute();
>+        // TODO(cwallez@chromium.org): For IOSurface pbuffers we require that EGL_TEXTURE_RGBA is
>+        // set so that eglBindTexImage works. Normally this is only allowed if the config exposes
>+        // the bindToTextureRGB/RGBA flag. This issue is that enabling this flags means that
>+        // eglBindTexImage should also work for regular pbuffers which isn't implemented on macOS.
>+        // Instead of adding the flag we special case the check here to be ignored for IOSurfaces.
>+        // The TODO is to find a proper solution for this, maybe by implementing eglBindTexImage on
>+        // OSX?
>+        if (buftype != EGL_IOSURFACE_ANGLE)
>+        {
>+            return EglBadAttribute();
>+        }
>     }
> 
>     if (buftype == EGL_D3D_TEXTURE_2D_SHARE_HANDLE_ANGLE)
>@@ -1134,13 +1632,36 @@ Error ValidateCreatePbufferFromClientBuffer(Display *display, EGLenum buftype, E
> 
>         if (width == 0 || height == 0)
>         {
>-            return EglBadAttribute();
>+            return EglBadAttribute();
>+        }
>+
>+        const Caps &caps = display->getCaps();
>+        if (textureFormat != EGL_NO_TEXTURE && !caps.textureNPOT &&
>+            (!gl::isPow2(width) || !gl::isPow2(height)))
>+        {
>+            return EglBadMatch();
>+        }
>+    }
>+
>+    if (buftype == EGL_IOSURFACE_ANGLE)
>+    {
>+        if (textureTarget != EGL_TEXTURE_RECTANGLE_ANGLE)
>+        {
>+            return EglBadAttribute() << "EGL_IOSURFACE requires the EGL_TEXTURE_RECTANGLE target";
>+        }
>+
>+        if (textureFormat != EGL_TEXTURE_RGBA)
>+        {
>+            return EglBadAttribute() << "EGL_IOSURFACE requires the EGL_TEXTURE_RGBA format";
>         }
> 
>-        const Caps &caps = display->getCaps();
>-        if (textureFormat != EGL_NO_TEXTURE && !caps.textureNPOT && (!gl::isPow2(width) || !gl::isPow2(height)))
>+        if (!attributes.contains(EGL_WIDTH) || !attributes.contains(EGL_HEIGHT) ||
>+            !attributes.contains(EGL_TEXTURE_FORMAT) ||
>+            !attributes.contains(EGL_TEXTURE_TYPE_ANGLE) ||
>+            !attributes.contains(EGL_TEXTURE_INTERNAL_FORMAT_ANGLE) ||
>+            !attributes.contains(EGL_IOSURFACE_PLANE_ANGLE))
>         {
>-            return EglBadMatch();
>+            return EglBadParameter() << "Missing required attribute for EGL_IOSURFACE";
>         }
>     }
> 
>@@ -1149,7 +1670,7 @@ Error ValidateCreatePbufferFromClientBuffer(Display *display, EGLenum buftype, E
>     return NoError();
> }
> 
>-Error ValidateMakeCurrent(Display *display, EGLSurface draw, EGLSurface read, gl::Context *context)
>+Error ValidateMakeCurrent(Display *display, Surface *draw, Surface *read, gl::Context *context)
> {
>     if (context == EGL_NO_CONTEXT && (draw != EGL_NO_SURFACE || read != EGL_NO_SURFACE))
>     {
>@@ -1200,37 +1721,31 @@ Error ValidateMakeCurrent(Display *display, EGLSurface draw, EGLSurface read, gl
>         ANGLE_TRY(ValidateContext(display, context));
>     }
> 
>-    if (display->isInitialized() && display->testDeviceLost())
>+    if (display->isInitialized() && display->isDeviceLost())
>     {
>         return EglContextLost();
>     }
> 
>-    Surface *drawSurface = static_cast<Surface *>(draw);
>     if (draw != EGL_NO_SURFACE)
>     {
>-        ANGLE_TRY(ValidateSurface(display, drawSurface));
>+        ANGLE_TRY(ValidateSurface(display, draw));
>     }
> 
>-    Surface *readSurface = static_cast<Surface *>(read);
>     if (read != EGL_NO_SURFACE)
>     {
>-        ANGLE_TRY(ValidateSurface(display, readSurface));
>-    }
>-
>-    if (readSurface)
>-    {
>-        ANGLE_TRY(ValidateCompatibleConfigs(display, readSurface->getConfig(), readSurface,
>-                                            context->getConfig(), readSurface->getType()));
>+        ANGLE_TRY(ValidateSurface(display, read));
>+        ANGLE_TRY(ValidateCompatibleConfigs(display, read->getConfig(), read, context->getConfig(),
>+                                            read->getType()));
>     }
> 
>     if (draw != read)
>     {
>         UNIMPLEMENTED();  // FIXME
> 
>-        if (drawSurface)
>+        if (draw)
>         {
>-            ANGLE_TRY(ValidateCompatibleConfigs(display, drawSurface->getConfig(), drawSurface,
>-                                                context->getConfig(), drawSurface->getType()));
>+            ANGLE_TRY(ValidateCompatibleConfigs(display, draw->getConfig(), draw,
>+                                                context->getConfig(), draw->getType()));
>         }
>     }
>     return NoError();
>@@ -1291,7 +1806,8 @@ Error ValidateCreateImageKHR(const Display *display,
>                              EGLClientBuffer buffer,
>                              const AttributeMap &attributes)
> {
>-    ANGLE_TRY(ValidateContext(display, context));
>+
>+    ANGLE_TRY(ValidateDisplay(display));
> 
>     const DisplayExtensions &displayExtensions = display->getExtensions();
> 
>@@ -1370,9 +1886,10 @@ Error ValidateCreateImageKHR(const Display *display,
>                 return EglBadParameter() << "buffer cannot reference a 2D texture with the name 0.";
>             }
> 
>+            ANGLE_TRY(ValidateContext(display, context));
>             const gl::Texture *texture =
>                 context->getTexture(egl_gl::EGLClientBufferToGLObjectHandle(buffer));
>-            if (texture == nullptr || texture->getTarget() != GL_TEXTURE_2D)
>+            if (texture == nullptr || texture->getType() != gl::TextureType::_2D)
>             {
>                 return EglBadParameter() << "target is not a 2D texture.";
>             }
>@@ -1383,8 +1900,8 @@ Error ValidateCreateImageKHR(const Display *display,
>             }
> 
>             EGLAttrib level = attributes.get(EGL_GL_TEXTURE_LEVEL_KHR, 0);
>-            if (texture->getWidth(GL_TEXTURE_2D, static_cast<size_t>(level)) == 0 ||
>-                texture->getHeight(GL_TEXTURE_2D, static_cast<size_t>(level)) == 0)
>+            if (texture->getWidth(gl::TextureTarget::_2D, static_cast<size_t>(level)) == 0 ||
>+                texture->getHeight(gl::TextureTarget::_2D, static_cast<size_t>(level)) == 0)
>             {
>                 return EglBadParameter()
>                        << "target 2D texture does not have a valid size at specified level.";
>@@ -1412,9 +1929,10 @@ Error ValidateCreateImageKHR(const Display *display,
>                        << "buffer cannot reference a cubemap texture with the name 0.";
>             }
> 
>+            ANGLE_TRY(ValidateContext(display, context));
>             const gl::Texture *texture =
>                 context->getTexture(egl_gl::EGLClientBufferToGLObjectHandle(buffer));
>-            if (texture == nullptr || texture->getTarget() != GL_TEXTURE_CUBE_MAP)
>+            if (texture == nullptr || texture->getType() != gl::TextureType::CubeMap)
>             {
>                 return EglBadParameter() << "target is not a cubemap texture.";
>             }
>@@ -1424,8 +1942,8 @@ Error ValidateCreateImageKHR(const Display *display,
>                 return EglBadAccess() << "texture has a surface bound to it.";
>             }
> 
>-            EGLAttrib level    = attributes.get(EGL_GL_TEXTURE_LEVEL_KHR, 0);
>-            GLenum cubeMapFace = egl_gl::EGLCubeMapTargetToGLCubeMapTarget(target);
>+            EGLAttrib level               = attributes.get(EGL_GL_TEXTURE_LEVEL_KHR, 0);
>+            gl::TextureTarget cubeMapFace = egl_gl::EGLCubeMapTargetToCubeMapTarget(target);
>             if (texture->getWidth(cubeMapFace, static_cast<size_t>(level)) == 0 ||
>                 texture->getHeight(cubeMapFace, static_cast<size_t>(level)) == 0)
>             {
>@@ -1457,9 +1975,10 @@ Error ValidateCreateImageKHR(const Display *display,
>                 return EglBadParameter() << "buffer cannot reference a 3D texture with the name 0.";
>             }
> 
>+            ANGLE_TRY(ValidateContext(display, context));
>             const gl::Texture *texture =
>                 context->getTexture(egl_gl::EGLClientBufferToGLObjectHandle(buffer));
>-            if (texture == nullptr || texture->getTarget() != GL_TEXTURE_3D)
>+            if (texture == nullptr || texture->getType() != gl::TextureType::_3D)
>             {
>                 return EglBadParameter() << "target is not a 3D texture.";
>             }
>@@ -1471,16 +1990,16 @@ Error ValidateCreateImageKHR(const Display *display,
> 
>             EGLAttrib level   = attributes.get(EGL_GL_TEXTURE_LEVEL_KHR, 0);
>             EGLAttrib zOffset = attributes.get(EGL_GL_TEXTURE_ZOFFSET_KHR, 0);
>-            if (texture->getWidth(GL_TEXTURE_3D, static_cast<size_t>(level)) == 0 ||
>-                texture->getHeight(GL_TEXTURE_3D, static_cast<size_t>(level)) == 0 ||
>-                texture->getDepth(GL_TEXTURE_3D, static_cast<size_t>(level)) == 0)
>+            if (texture->getWidth(gl::TextureTarget::_3D, static_cast<size_t>(level)) == 0 ||
>+                texture->getHeight(gl::TextureTarget::_3D, static_cast<size_t>(level)) == 0 ||
>+                texture->getDepth(gl::TextureTarget::_3D, static_cast<size_t>(level)) == 0)
>             {
>                 return EglBadParameter()
>                        << "target 3D texture does not have a valid size at specified level.";
>             }
> 
>             if (static_cast<size_t>(zOffset) >=
>-                texture->getDepth(GL_TEXTURE_3D, static_cast<size_t>(level)))
>+                texture->getDepth(gl::TextureTarget::_3D, static_cast<size_t>(level)))
>             {
>                 return EglBadParameter() << "target 3D texture does not have enough layers "
>                                             "for the specified Z offset at the specified "
>@@ -1510,6 +2029,7 @@ Error ValidateCreateImageKHR(const Display *display,
>                        << "buffer cannot reference a renderbuffer with the name 0.";
>             }
> 
>+            ANGLE_TRY(ValidateContext(display, context));
>             const gl::Renderbuffer *renderbuffer =
>                 context->getRenderbuffer(egl_gl::EGLClientBufferToGLObjectHandle(buffer));
>             if (renderbuffer == nullptr)
>@@ -1524,11 +2044,33 @@ Error ValidateCreateImageKHR(const Display *display,
>         }
>         break;
> 
>+        case EGL_NATIVE_BUFFER_ANDROID:
>+        {
>+            if (!displayExtensions.imageNativeBuffer)
>+            {
>+                return EglBadParameter() << "EGL_ANDROID_image_native_buffer not supported.";
>+            }
>+
>+            if (context != nullptr)
>+            {
>+                return EglBadContext() << "ctx must be EGL_NO_CONTEXT.";
>+            }
>+
>+            ANGLE_TRY(display->validateImageClientBuffer(context, target, buffer, attributes));
>+        }
>+        break;
>+
>         default:
>             return EglBadParameter()
>                    << "invalid target: 0x" << std::hex << std::uppercase << target;
>     }
> 
>+    if (attributes.contains(EGL_GL_TEXTURE_ZOFFSET_KHR) && target != EGL_GL_TEXTURE_3D_KHR)
>+    {
>+        return EglBadParameter()
>+               << "EGL_GL_TEXTURE_ZOFFSET_KHR must be used with a 3D texture target.";
>+    }
>+
>     return NoError();
> }
> 
>@@ -1599,6 +2141,172 @@ Error ValidateReleaseDeviceANGLE(Device *device)
>     return NoError();
> }
> 
>+Error ValidateCreateSyncBase(const Display *display,
>+                             EGLenum type,
>+                             const AttributeMap &attribs,
>+                             const Display *currentDisplay,
>+                             const gl::Context *currentContext,
>+                             bool isExt)
>+{
>+    ANGLE_TRY(ValidateDisplay(display));
>+
>+    switch (type)
>+    {
>+        case EGL_SYNC_FENCE_KHR:
>+            if (!attribs.isEmpty())
>+            {
>+                return EglBadAttribute() << "Invalid attribute";
>+            }
>+
>+            if (display != currentDisplay)
>+            {
>+                return EglBadMatch() << "CreateSync can only be called on the current display";
>+            }
>+
>+            ANGLE_TRY(ValidateContext(currentDisplay, currentContext));
>+
>+            if (!currentContext->getExtensions().eglSync)
>+            {
>+                return EglBadMatch() << "EGL_SYNC_FENCE_KHR cannot be used without "
>+                                        "GL_OES_EGL_sync support.";
>+            }
>+            break;
>+        default:
>+            if (isExt)
>+            {
>+                return EglBadAttribute() << "Invalid type parameter";
>+            }
>+            else
>+            {
>+                return EglBadParameter() << "Invalid type parameter";
>+            }
>+    }
>+
>+    return NoError();
>+}
>+
>+Error ValidateGetSyncAttribBase(const Display *display, const Sync *sync, EGLint attribute)
>+{
>+    ANGLE_TRY(ValidateSync(display, sync));
>+
>+    switch (attribute)
>+    {
>+        case EGL_SYNC_CONDITION_KHR:
>+            if (sync->getType() != EGL_SYNC_FENCE_KHR)
>+            {
>+                return EglBadAttribute() << "EGL_SYNC_CONDITION_KHR is only valid for fence syncs";
>+            }
>+            break;
>+        // The following attributes are accepted by all types
>+        case EGL_SYNC_TYPE_KHR:
>+        case EGL_SYNC_STATUS_KHR:
>+            break;
>+        default:
>+            return EglBadAttribute() << "Invalid attribute";
>+    }
>+
>+    return NoError();
>+}
>+
>+Error ValidateCreateSyncKHR(const Display *display,
>+                            EGLenum type,
>+                            const AttributeMap &attribs,
>+                            const Display *currentDisplay,
>+                            const gl::Context *currentContext)
>+{
>+    ANGLE_TRY(ValidateDisplay(display));
>+
>+    const DisplayExtensions &extensions = display->getExtensions();
>+    if (!extensions.fenceSync)
>+    {
>+        return EglBadAccess() << "EGL_KHR_fence_sync extension is not available";
>+    }
>+
>+    return ValidateCreateSyncBase(display, type, attribs, currentDisplay, currentContext, true);
>+}
>+
>+Error ValidateCreateSync(const Display *display,
>+                         EGLenum type,
>+                         const AttributeMap &attribs,
>+                         const Display *currentDisplay,
>+                         const gl::Context *currentContext)
>+{
>+    return ValidateCreateSyncBase(display, type, attribs, currentDisplay, currentContext, false);
>+}
>+
>+Error ValidateDestroySync(const Display *display, const Sync *sync)
>+{
>+    ANGLE_TRY(ValidateSync(display, sync));
>+    return NoError();
>+}
>+
>+Error ValidateClientWaitSync(const Display *display,
>+                             const Sync *sync,
>+                             EGLint flags,
>+                             EGLTime timeout)
>+{
>+    ANGLE_TRY(ValidateSync(display, sync));
>+    return NoError();
>+}
>+
>+Error ValidateWaitSync(const Display *display,
>+                       const gl::Context *context,
>+                       const Sync *sync,
>+                       EGLint flags)
>+{
>+    ANGLE_TRY(ValidateDisplay(display));
>+
>+    const DisplayExtensions &extensions = display->getExtensions();
>+    if (!extensions.waitSync)
>+    {
>+        return EglBadAccess() << "EGL_KHR_wait_sync extension is not available";
>+    }
>+
>+    ANGLE_TRY(ValidateSync(display, sync));
>+
>+    if (context == nullptr)
>+    {
>+        return EglBadMatch() << "No context is current.";
>+    }
>+
>+    if (!context->getExtensions().eglSync)
>+    {
>+        return EglBadMatch() << "Server-side waits cannot be performed without "
>+                                "GL_OES_EGL_sync support.";
>+    }
>+
>+    if (flags != 0)
>+    {
>+        return EglBadParameter() << "flags must be zero";
>+    }
>+
>+    return NoError();
>+}
>+
>+Error ValidateGetSyncAttribKHR(const Display *display,
>+                               const Sync *sync,
>+                               EGLint attribute,
>+                               EGLint *value)
>+{
>+    if (value == nullptr)
>+    {
>+        return EglBadParameter() << "Invalid value parameter";
>+    }
>+    return ValidateGetSyncAttribBase(display, sync, attribute);
>+}
>+
>+Error ValidateGetSyncAttrib(const Display *display,
>+                            const Sync *sync,
>+                            EGLint attribute,
>+                            EGLAttrib *value)
>+{
>+    if (value == nullptr)
>+    {
>+        return EglBadParameter() << "Invalid value parameter";
>+    }
>+    return ValidateGetSyncAttribBase(display, sync, attribute);
>+}
>+
> Error ValidateCreateStreamKHR(const Display *display, const AttributeMap &attributes)
> {
>     ANGLE_TRY(ValidateDisplay(display));
>@@ -1689,7 +2397,6 @@ Error ValidateStreamConsumerGLTextureExternalKHR(const Display *display,
>                                                  gl::Context *context,
>                                                  const Stream *stream)
> {
>-    ANGLE_TRY(ValidateDisplay(display));
>     ANGLE_TRY(ValidateContext(display, context));
> 
>     const DisplayExtensions &displayExtensions = display->getExtensions();
>@@ -1714,7 +2421,7 @@ Error ValidateStreamConsumerGLTextureExternalKHR(const Display *display,
>     }
> 
>     // Lookup the texture and ensure it is correct
>-    gl::Texture *texture = context->getGLState().getTargetTexture(GL_TEXTURE_EXTERNAL_OES);
>+    gl::Texture *texture = context->getState().getTargetTexture(gl::TextureType::External);
>     if (texture == nullptr || texture->getId() == 0)
>     {
>         return EglBadAccess() << "No external texture bound";
>@@ -1919,7 +2626,7 @@ Error ValidateStreamConsumerGLTextureExternalAttribsNV(const Display *display,
>         }
> 
>         // Lookup the texture and ensure it is correct
>-        gl::Texture *texture = context->getGLState().getTargetTexture(GL_TEXTURE_EXTERNAL_OES);
>+        gl::Texture *texture = context->getState().getTargetTexture(gl::TextureType::External);
>         if (texture == nullptr || texture->getId() == 0)
>         {
>             return EglBadAccess() << "No external texture bound";
>@@ -1953,8 +2660,8 @@ Error ValidateStreamConsumerGLTextureExternalAttribsNV(const Display *display,
>             }
>             if (plane[i] != EGL_NONE)
>             {
>-                gl::Texture *texture = context->getGLState().getSamplerTexture(
>-                    static_cast<unsigned int>(plane[i]), GL_TEXTURE_EXTERNAL_OES);
>+                gl::Texture *texture = context->getState().getSamplerTexture(
>+                    static_cast<unsigned int>(plane[i]), gl::TextureType::External);
>                 if (texture == nullptr || texture->getId() == 0)
>                 {
>                     return EglBadAccess()
>@@ -1972,14 +2679,14 @@ Error ValidateStreamConsumerGLTextureExternalAttribsNV(const Display *display,
>     return NoError();
> }
> 
>-Error ValidateCreateStreamProducerD3DTextureNV12ANGLE(const Display *display,
>-                                                      const Stream *stream,
>-                                                      const AttributeMap &attribs)
>+Error ValidateCreateStreamProducerD3DTextureANGLE(const Display *display,
>+                                                  const Stream *stream,
>+                                                  const AttributeMap &attribs)
> {
>     ANGLE_TRY(ValidateDisplay(display));
> 
>     const DisplayExtensions &displayExtensions = display->getExtensions();
>-    if (!displayExtensions.streamProducerD3DTextureNV12)
>+    if (!displayExtensions.streamProducerD3DTexture)
>     {
>         return EglBadAccess() << "Stream producer extension not active";
>     }
>@@ -1996,24 +2703,38 @@ Error ValidateCreateStreamProducerD3DTextureNV12ANGLE(const Display *display,
>         return EglBadState() << "Stream not in connecting state";
>     }
> 
>-    if (stream->getConsumerType() != Stream::ConsumerType::GLTextureYUV ||
>-        stream->getPlaneCount() != 2)
>+    switch (stream->getConsumerType())
>     {
>-        return EglBadMatch() << "Incompatible stream consumer type";
>+        case Stream::ConsumerType::GLTextureYUV:
>+            if (stream->getPlaneCount() != 2)
>+            {
>+                return EglBadMatch() << "Incompatible stream consumer type";
>+            }
>+            break;
>+
>+        case Stream::ConsumerType::GLTextureRGB:
>+            if (stream->getPlaneCount() != 1)
>+            {
>+                return EglBadMatch() << "Incompatible stream consumer type";
>+            }
>+            break;
>+
>+        default:
>+            return EglBadMatch() << "Incompatible stream consumer type";
>     }
> 
>     return NoError();
> }
> 
>-Error ValidateStreamPostD3DTextureNV12ANGLE(const Display *display,
>-                                            const Stream *stream,
>-                                            void *texture,
>-                                            const AttributeMap &attribs)
>+Error ValidateStreamPostD3DTextureANGLE(const Display *display,
>+                                        const Stream *stream,
>+                                        void *texture,
>+                                        const AttributeMap &attribs)
> {
>     ANGLE_TRY(ValidateDisplay(display));
> 
>     const DisplayExtensions &displayExtensions = display->getExtensions();
>-    if (!displayExtensions.streamProducerD3DTextureNV12)
>+    if (!displayExtensions.streamProducerD3DTexture)
>     {
>         return EglBadAccess() << "Stream producer extension not active";
>     }
>@@ -2033,6 +2754,12 @@ Error ValidateStreamPostD3DTextureNV12ANGLE(const Display *display,
>                     return EglBadParameter() << "Invalid subresource index";
>                 }
>                 break;
>+            case EGL_NATIVE_BUFFER_PLANE_OFFSET_IMG:
>+                if (value < 0)
>+                {
>+                    return EglBadParameter() << "Invalid plane offset";
>+                }
>+                break;
>             default:
>                 return EglBadAttribute() << "Invalid attribute";
>         }
>@@ -2045,7 +2772,7 @@ Error ValidateStreamPostD3DTextureNV12ANGLE(const Display *display,
>         return EglBadState() << "Stream not fully configured";
>     }
> 
>-    if (stream->getProducerType() != Stream::ProducerType::D3D11TextureNV12)
>+    if (stream->getProducerType() != Stream::ProducerType::D3D11Texture)
>     {
>         return EglBadMatch() << "Incompatible stream producer";
>     }
>@@ -2055,7 +2782,7 @@ Error ValidateStreamPostD3DTextureNV12ANGLE(const Display *display,
>         return EglBadParameter() << "Texture is null";
>     }
> 
>-    return stream->validateD3D11NV12Texture(texture);
>+    return stream->validateD3D11Texture(texture, attribs);
> }
> 
> Error ValidateGetSyncValuesCHROMIUM(const Display *display,
>@@ -2066,80 +2793,285 @@ Error ValidateGetSyncValuesCHROMIUM(const Display *display,
> {
>     ANGLE_TRY(ValidateDisplay(display));
> 
>-    const DisplayExtensions &displayExtensions = display->getExtensions();
>-    if (!displayExtensions.getSyncValues)
>+    const DisplayExtensions &displayExtensions = display->getExtensions();
>+    if (!displayExtensions.getSyncValues)
>+    {
>+        return EglBadAccess() << "getSyncValues extension not active";
>+    }
>+
>+    if (display->isDeviceLost())
>+    {
>+        return EglContextLost() << "Context is lost.";
>+    }
>+
>+    if (surface == EGL_NO_SURFACE)
>+    {
>+        return EglBadSurface() << "getSyncValues surface cannot be EGL_NO_SURFACE";
>+    }
>+
>+    if (!surface->directComposition())
>+    {
>+        return EglBadSurface() << "getSyncValues surface requires Direct Composition to be enabled";
>+    }
>+
>+    if (ust == nullptr)
>+    {
>+        return EglBadParameter() << "ust is null";
>+    }
>+
>+    if (msc == nullptr)
>+    {
>+        return EglBadParameter() << "msc is null";
>+    }
>+
>+    if (sbc == nullptr)
>+    {
>+        return EglBadParameter() << "sbc is null";
>+    }
>+
>+    return NoError();
>+}
>+
>+Error ValidateDestroySurface(const Display *display,
>+                             const Surface *surface,
>+                             const EGLSurface eglSurface)
>+{
>+    ANGLE_TRY(ValidateSurface(display, surface));
>+
>+    if (eglSurface == EGL_NO_SURFACE)
>+    {
>+        return EglBadSurface();
>+    }
>+
>+    return NoError();
>+}
>+
>+Error ValidateDestroyContext(const Display *display,
>+                             const gl::Context *glCtx,
>+                             const EGLContext eglCtx)
>+{
>+    ANGLE_TRY(ValidateContext(display, glCtx));
>+
>+    if (eglCtx == EGL_NO_CONTEXT)
>+    {
>+        return EglBadContext();
>+    }
>+
>+    return NoError();
>+}
>+
>+Error ValidateSwapBuffers(Thread *thread, const Display *display, const Surface *eglSurface)
>+{
>+    ANGLE_TRY(ValidateSurface(display, eglSurface));
>+
>+    if (display->isDeviceLost())
>+    {
>+        return EglContextLost();
>+    }
>+
>+    if (eglSurface == EGL_NO_SURFACE || !thread->getContext() ||
>+        thread->getCurrentDrawSurface() != eglSurface)
>+    {
>+        return EglBadSurface();
>+    }
>+
>+    return NoError();
>+}
>+
>+Error ValidateSwapBuffersWithDamageKHR(const Display *display,
>+                                       const Surface *surface,
>+                                       EGLint *rects,
>+                                       EGLint n_rects)
>+{
>+    ANGLE_TRY(ValidateSurface(display, surface));
>+
>+    if (!display->getExtensions().swapBuffersWithDamage)
>+    {
>+        // It is out of spec what happens when calling an extension function when the extension is
>+        // not available. EGL_BAD_DISPLAY seems like a reasonable error.
>+        return EglBadDisplay() << "EGL_KHR_swap_buffers_with_damage is not available.";
>+    }
>+
>+    if (surface == EGL_NO_SURFACE)
>+    {
>+        return EglBadSurface() << "Swap surface cannot be EGL_NO_SURFACE.";
>+    }
>+
>+    if (n_rects < 0)
>+    {
>+        return EglBadParameter() << "n_rects cannot be negative.";
>+    }
>+
>+    if (n_rects > 0 && rects == nullptr)
>+    {
>+        return EglBadParameter() << "n_rects cannot be greater than zero when rects is NULL.";
>+    }
>+
>+    // TODO(jmadill): Validate Surface is bound to the thread.
>+
>+    return NoError();
>+}
>+
>+Error ValidateWaitNative(const Display *display, const EGLint engine)
>+{
>+    ANGLE_TRY(ValidateDisplay(display));
>+
>+    if (engine != EGL_CORE_NATIVE_ENGINE)
>+    {
>+        return EglBadParameter() << "the 'engine' parameter has an unrecognized value";
>+    }
>+
>+    return NoError();
>+}
>+
>+Error ValidateCopyBuffers(Display *display, const Surface *surface)
>+{
>+    ANGLE_TRY(ValidateSurface(display, surface));
>+
>+    if (display->testDeviceLost())
>+    {
>+        return EglContextLost();
>+    }
>+
>+    return NoError();
>+}
>+
>+// Validate state for eglBindTexImage. If context is non-null then textureObject will be set to
>+// surface's texture that will have an image bound to it
>+Error ValidateBindTexImage(const Display *display,
>+                           const Surface *surface,
>+                           const EGLSurface eglSurface,
>+                           const EGLint buffer,
>+                           const gl::Context *context,
>+                           gl::Texture **textureObject)
>+{
>+    ANGLE_TRY(ValidateSurface(display, surface));
>+
>+    if (buffer != EGL_BACK_BUFFER)
>+    {
>+        return EglBadParameter();
>+    }
>+
>+    if (eglSurface == EGL_NO_SURFACE || surface->getType() == EGL_WINDOW_BIT)
>     {
>-        return EglBadAccess() << "getSyncValues extension not active";
>+        return EglBadSurface();
>     }
> 
>-    if (display->isDeviceLost())
>+    if (surface->getBoundTexture())
>     {
>-        return EglContextLost() << "Context is lost.";
>+        return EglBadAccess();
>     }
> 
>-    if (surface == EGL_NO_SURFACE)
>+    if (surface->getTextureFormat() == TextureFormat::NoTexture)
>     {
>-        return EglBadSurface() << "getSyncValues surface cannot be EGL_NO_SURFACE";
>+        return EglBadMatch();
>     }
> 
>-    if (!surface->directComposition())
>+    if (context)
>     {
>-        return EglBadSurface() << "getSyncValues surface requires Direct Composition to be enabled";
>+        gl::TextureType type = egl_gl::EGLTextureTargetToTextureType(surface->getTextureTarget());
>+        *textureObject       = context->getTextureByType(type);
>+        ASSERT(*textureObject != nullptr);
>+
>+        if ((*textureObject)->getImmutableFormat())
>+        {
>+            return EglBadMatch();
>+        }
>     }
> 
>-    if (ust == nullptr)
>+    return NoError();
>+}
>+
>+Error ValidateReleaseTexImage(const Display *display,
>+                              const Surface *surface,
>+                              const EGLSurface eglSurface,
>+                              const EGLint buffer)
>+{
>+    ANGLE_TRY(ValidateSurface(display, surface));
>+
>+    if (buffer != EGL_BACK_BUFFER)
>     {
>-        return EglBadParameter() << "ust is null";
>+        return EglBadParameter();
>     }
> 
>-    if (msc == nullptr)
>+    if (eglSurface == EGL_NO_SURFACE || surface->getType() == EGL_WINDOW_BIT)
>     {
>-        return EglBadParameter() << "msc is null";
>+        return EglBadSurface();
>     }
> 
>-    if (sbc == nullptr)
>+    if (surface->getTextureFormat() == TextureFormat::NoTexture)
>     {
>-        return EglBadParameter() << "sbc is null";
>+        return EglBadMatch();
>     }
> 
>     return NoError();
> }
> 
>-Error ValidateSwapBuffersWithDamageEXT(const Display *display,
>-                                       const Surface *surface,
>-                                       EGLint *rects,
>-                                       EGLint n_rects)
>+Error ValidateSwapInterval(const Display *display,
>+                           const Surface *draw_surface,
>+                           const gl::Context *context)
> {
>-    Error error = ValidateSurface(display, surface);
>-    if (error.isError())
>+    ANGLE_TRY(ValidateContext(display, context));
>+
>+    if (draw_surface == nullptr)
>     {
>-        return error;
>+        return EglBadSurface();
>     }
> 
>-    if (!display->getExtensions().swapBuffersWithDamage)
>+    return NoError();
>+}
>+
>+Error ValidateBindAPI(const EGLenum api)
>+{
>+    switch (api)
>     {
>-        // It is out of spec what happens when calling an extension function when the extension is
>-        // not available. EGL_BAD_DISPLAY seems like a reasonable error.
>-        return EglBadDisplay() << "EGL_EXT_swap_buffers_with_damage is not available.";
>+        case EGL_OPENGL_API:
>+        case EGL_OPENVG_API:
>+            return EglBadParameter();  // Not supported by this implementation
>+        case EGL_OPENGL_ES_API:
>+            break;
>+        default:
>+            return EglBadParameter();
>     }
> 
>-    if (surface == EGL_NO_SURFACE)
>+    return NoError();
>+}
>+
>+Error ValidatePresentationTimeANDROID(const Display *display,
>+                                      const Surface *surface,
>+                                      EGLnsecsANDROID time)
>+{
>+    ANGLE_TRY(ValidateDisplay(display));
>+
>+    if (!display->getExtensions().presentationTime)
>     {
>-        return EglBadSurface() << "Swap surface cannot be EGL_NO_SURFACE.";
>+        // It is out of spec what happens when calling an extension function when the extension is
>+        // not available. EGL_BAD_DISPLAY seems like a reasonable error.
>+        return EglBadDisplay() << "EGL_ANDROID_presentation_time is not available.";
>     }
> 
>-    if (n_rects < 0)
>+    ANGLE_TRY(ValidateSurface(display, surface));
>+
>+    return NoError();
>+}
>+
>+Error ValidateSetBlobCacheANDROID(const Display *display,
>+                                  EGLSetBlobFuncANDROID set,
>+                                  EGLGetBlobFuncANDROID get)
>+{
>+    ANGLE_TRY(ValidateDisplay(display));
>+
>+    if (display->areBlobCacheFuncsSet())
>     {
>-        return EglBadParameter() << "n_rects cannot be negative.";
>+        return EglBadParameter()
>+               << "Blob cache functions can only be set once in the lifetime of a Display";
>     }
> 
>-    if (n_rects > 0 && rects == nullptr)
>+    if (set == nullptr || get == nullptr)
>     {
>-        return EglBadParameter() << "n_rects cannot be greater than zero when rects is NULL.";
>+        return EglBadParameter() << "Blob cache callbacks cannot be null.";
>     }
> 
>-    // TODO(jmadill): Validate Surface is bound to the thread.
>-
>     return NoError();
> }
> 
>@@ -2194,6 +3126,36 @@ Error ValidateGetPlatformDisplayEXT(EGLenum platform,
>     return ValidateGetPlatformDisplayCommon(platform, native_display, attribMap);
> }
> 
>+Error ValidateCreatePlatformWindowSurfaceEXT(const Display *display,
>+                                             const Config *configuration,
>+                                             void *nativeWindow,
>+                                             const AttributeMap &attributes)
>+{
>+    if (!Display::GetClientExtensions().platformBase)
>+    {
>+        return EglBadAccess() << "EGL_EXT_platform_base not supported";
>+    }
>+
>+    ANGLE_TRY(ValidateConfig(display, configuration));
>+
>+    return EglBadDisplay() << "ValidateCreatePlatformWindowSurfaceEXT unimplemented.";
>+}
>+
>+Error ValidateCreatePlatformPixmapSurfaceEXT(const Display *display,
>+                                             const Config *configuration,
>+                                             void *nativePixmap,
>+                                             const AttributeMap &attributes)
>+{
>+    if (!Display::GetClientExtensions().platformBase)
>+    {
>+        return EglBadAccess() << "EGL_EXT_platform_base not supported";
>+    }
>+
>+    ANGLE_TRY(ValidateConfig(display, configuration));
>+
>+    return EglBadDisplay() << "ValidateCreatePlatformPixmapSurfaceEXT unimplemented.";
>+}
>+
> Error ValidateProgramCacheGetAttribANGLE(const Display *display, EGLenum attrib)
> {
>     ANGLE_TRY(ValidateDisplay(display));
>@@ -2240,7 +3202,7 @@ Error ValidateProgramCacheQueryANGLE(const Display *display,
>         return EglBadParameter() << "keysize and binarysize must always be valid pointers.";
>     }
> 
>-    if (binary && *keysize != static_cast<EGLint>(gl::kProgramHashLength))
>+    if (binary && *keysize != static_cast<EGLint>(egl::BlobCache::kKeyLength))
>     {
>         return EglBadParameter() << "Invalid program key size.";
>     }
>@@ -2266,7 +3228,7 @@ Error ValidateProgramCachePopulateANGLE(const Display *display,
>         return EglBadAccess() << "Extension not supported";
>     }
> 
>-    if (keysize != static_cast<EGLint>(gl::kProgramHashLength))
>+    if (keysize != static_cast<EGLint>(egl::BlobCache::kKeyLength))
>     {
>         return EglBadParameter() << "Invalid program key size.";
>     }
>@@ -2347,6 +3309,7 @@ Error ValidateSurfaceAttrib(const Display *display,
>                 default:
>                     return EglBadAttribute() << "Invalid multisample resolve type.";
>             }
>+            break;
> 
>         case EGL_SWAP_BEHAVIOR:
>             switch (value)
>@@ -2365,6 +3328,38 @@ Error ValidateSurfaceAttrib(const Display *display,
>                 default:
>                     return EglBadAttribute() << "Invalid swap behaviour.";
>             }
>+            break;
>+
>+        case EGL_WIDTH:
>+        case EGL_HEIGHT:
>+            if (!display->getExtensions().windowFixedSize)
>+            {
>+                return EglBadAttribute() << "EGL_WIDTH or EGL_HEIGHT cannot be set without "
>+                                            "EGL_ANGLE_window_fixed_size support.";
>+            }
>+            if (!surface->isFixedSize())
>+            {
>+                return EglBadMatch() << "EGL_WIDTH or EGL_HEIGHT cannot be set without "
>+                                        "EGL_FIXED_SIZE_ANGLE being enabled on the surface.";
>+            }
>+            break;
>+
>+        case EGL_TIMESTAMPS_ANDROID:
>+            if (!display->getExtensions().getFrameTimestamps)
>+            {
>+                return EglBadAttribute() << "EGL_TIMESTAMPS_ANDROID cannot be used without "
>+                                            "EGL_ANDROID_get_frame_timestamps support.";
>+            }
>+            switch (value)
>+            {
>+                case EGL_TRUE:
>+                case EGL_FALSE:
>+                    break;
>+
>+                default:
>+                    return EglBadAttribute() << "Invalid value.";
>+            }
>+            break;
> 
>         default:
>             return EglBadAttribute() << "Invalid surface attribute.";
>@@ -2459,6 +3454,14 @@ Error ValidateQuerySurface(const Display *display,
>             }
>             break;
> 
>+        case EGL_TIMESTAMPS_ANDROID:
>+            if (!display->getExtensions().getFrameTimestamps)
>+            {
>+                return EglBadAttribute() << "EGL_TIMESTAMPS_ANDROID cannot be used without "
>+                                            "EGL_ANDROID_get_frame_timestamps support.";
>+            }
>+            break;
>+
>         default:
>             return EglBadAttribute() << "Invalid surface attribute.";
>     }
>@@ -2471,7 +3474,6 @@ Error ValidateQueryContext(const Display *display,
>                            EGLint attribute,
>                            EGLint *value)
> {
>-    ANGLE_TRY(ValidateDisplay(display));
>     ANGLE_TRY(ValidateContext(display, context));
> 
>     switch (attribute)
>@@ -2498,4 +3500,238 @@ Error ValidateQueryContext(const Display *display,
>     return NoError();
> }
> 
>+Error ValidateDebugMessageControlKHR(EGLDEBUGPROCKHR callback, const AttributeMap &attribs)
>+{
>+    const ClientExtensions &clientExtensions = Display::GetClientExtensions();
>+    if (!clientExtensions.debug)
>+    {
>+        return EglBadAccess() << "EGL_KHR_debug extension is not available.";
>+    }
>+
>+    for (const auto &attrib : attribs)
>+    {
>+        switch (attrib.first)
>+        {
>+            case EGL_DEBUG_MSG_CRITICAL_KHR:
>+            case EGL_DEBUG_MSG_ERROR_KHR:
>+            case EGL_DEBUG_MSG_WARN_KHR:
>+            case EGL_DEBUG_MSG_INFO_KHR:
>+                if (attrib.second != EGL_TRUE && attrib.second != EGL_FALSE)
>+                {
>+                    return EglBadAttribute() << "message controls must be EGL_TRUE or EGL_FALSE.";
>+                }
>+                break;
>+        }
>+    }
>+
>+    return NoError();
>+}
>+
>+Error ValidateQueryDebugKHR(EGLint attribute, EGLAttrib *value)
>+{
>+    const ClientExtensions &clientExtensions = Display::GetClientExtensions();
>+    if (!clientExtensions.debug)
>+    {
>+        return EglBadAccess() << "EGL_KHR_debug extension is not available.";
>+    }
>+
>+    switch (attribute)
>+    {
>+        case EGL_DEBUG_MSG_CRITICAL_KHR:
>+        case EGL_DEBUG_MSG_ERROR_KHR:
>+        case EGL_DEBUG_MSG_WARN_KHR:
>+        case EGL_DEBUG_MSG_INFO_KHR:
>+        case EGL_DEBUG_CALLBACK_KHR:
>+            break;
>+
>+        default:
>+            return EglBadAttribute() << "unknown attribute.";
>+    }
>+
>+    return NoError();
>+}
>+
>+Error ValidateLabelObjectKHR(Thread *thread,
>+                             const Display *display,
>+                             ObjectType objectType,
>+                             EGLObjectKHR object,
>+                             EGLLabelKHR label)
>+{
>+    const ClientExtensions &clientExtensions = Display::GetClientExtensions();
>+    if (!clientExtensions.debug)
>+    {
>+        return EglBadAccess() << "EGL_KHR_debug extension is not available.";
>+    }
>+
>+    LabeledObject *labeledObject = nullptr;
>+    ANGLE_TRY(ValidateLabeledObject(thread, display, objectType, object, &labeledObject));
>+
>+    return NoError();
>+}
>+
>+Error ValidateGetCompositorTimingSupportedANDROID(const Display *display,
>+                                                  const Surface *surface,
>+                                                  CompositorTiming name)
>+{
>+    ANGLE_TRY(ValidateDisplay(display));
>+
>+    if (!display->getExtensions().getFrameTimestamps)
>+    {
>+        return EglBadDisplay() << "EGL_ANDROID_get_frame_timestamps extension is not available.";
>+    }
>+
>+    ANGLE_TRY(ValidateSurface(display, surface));
>+
>+    if (!ValidCompositorTimingName(name))
>+    {
>+        return EglBadParameter() << "invalid timing name.";
>+    }
>+
>+    return NoError();
>+}
>+
>+Error ValidateGetCompositorTimingANDROID(const Display *display,
>+                                         const Surface *surface,
>+                                         EGLint numTimestamps,
>+                                         const EGLint *names,
>+                                         EGLnsecsANDROID *values)
>+{
>+    ANGLE_TRY(ValidateDisplay(display));
>+
>+    if (!display->getExtensions().getFrameTimestamps)
>+    {
>+        return EglBadDisplay() << "EGL_ANDROID_get_frame_timestamps extension is not available.";
>+    }
>+
>+    ANGLE_TRY(ValidateSurface(display, surface));
>+
>+    if (names == nullptr && numTimestamps > 0)
>+    {
>+        return EglBadParameter() << "names is NULL.";
>+    }
>+
>+    if (values == nullptr && numTimestamps > 0)
>+    {
>+        return EglBadParameter() << "values is NULL.";
>+    }
>+
>+    if (numTimestamps < 0)
>+    {
>+        return EglBadParameter() << "numTimestamps must be at least 0.";
>+    }
>+
>+    for (EGLint i = 0; i < numTimestamps; i++)
>+    {
>+        CompositorTiming name = FromEGLenum<CompositorTiming>(names[i]);
>+
>+        if (!ValidCompositorTimingName(name))
>+        {
>+            return EglBadParameter() << "invalid compositor timing.";
>+        }
>+
>+        if (!surface->getSupportedCompositorTimings().test(name))
>+        {
>+            return EglBadParameter() << "compositor timing not supported by surface.";
>+        }
>+    }
>+
>+    return NoError();
>+}
>+
>+Error ValidateGetNextFrameIdANDROID(const Display *display,
>+                                    const Surface *surface,
>+                                    EGLuint64KHR *frameId)
>+{
>+    ANGLE_TRY(ValidateDisplay(display));
>+
>+    if (!display->getExtensions().getFrameTimestamps)
>+    {
>+        return EglBadDisplay() << "EGL_ANDROID_get_frame_timestamps extension is not available.";
>+    }
>+
>+    ANGLE_TRY(ValidateSurface(display, surface));
>+
>+    if (frameId == nullptr)
>+    {
>+        return EglBadParameter() << "frameId is NULL.";
>+    }
>+
>+    return NoError();
>+}
>+
>+Error ValidateGetFrameTimestampSupportedANDROID(const Display *display,
>+                                                const Surface *surface,
>+                                                Timestamp timestamp)
>+{
>+    ANGLE_TRY(ValidateDisplay(display));
>+
>+    if (!display->getExtensions().getFrameTimestamps)
>+    {
>+        return EglBadDisplay() << "EGL_ANDROID_get_frame_timestamps extension is not available.";
>+    }
>+
>+    ANGLE_TRY(ValidateSurface(display, surface));
>+
>+    if (!ValidTimestampType(timestamp))
>+    {
>+        return EglBadParameter() << "invalid timestamp type.";
>+    }
>+
>+    return NoError();
>+}
>+
>+Error ValidateGetFrameTimestampsANDROID(const Display *display,
>+                                        const Surface *surface,
>+                                        EGLuint64KHR frameId,
>+                                        EGLint numTimestamps,
>+                                        const EGLint *timestamps,
>+                                        EGLnsecsANDROID *values)
>+{
>+    ANGLE_TRY(ValidateDisplay(display));
>+
>+    if (!display->getExtensions().getFrameTimestamps)
>+    {
>+        return EglBadDisplay() << "EGL_ANDROID_get_frame_timestamps extension is not available.";
>+    }
>+
>+    ANGLE_TRY(ValidateSurface(display, surface));
>+
>+    if (!surface->isTimestampsEnabled())
>+    {
>+        return EglBadSurface() << "timestamp collection is not enabled for this surface.";
>+    }
>+
>+    if (timestamps == nullptr && numTimestamps > 0)
>+    {
>+        return EglBadParameter() << "timestamps is NULL.";
>+    }
>+
>+    if (values == nullptr && numTimestamps > 0)
>+    {
>+        return EglBadParameter() << "values is NULL.";
>+    }
>+
>+    if (numTimestamps < 0)
>+    {
>+        return EglBadParameter() << "numTimestamps must be at least 0.";
>+    }
>+
>+    for (EGLint i = 0; i < numTimestamps; i++)
>+    {
>+        Timestamp timestamp = FromEGLenum<Timestamp>(timestamps[i]);
>+
>+        if (!ValidTimestampType(timestamp))
>+        {
>+            return EglBadParameter() << "invalid timestamp type.";
>+        }
>+
>+        if (!surface->getSupportedTimestamps().test(timestamp))
>+        {
>+            return EglBadParameter() << "timestamp not supported by surface.";
>+        }
>+    }
>+
>+    return NoError();
>+}
>+
> }  // namespace egl
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/validationEGL.h b/Source/ThirdParty/ANGLE/src/libANGLE/validationEGL.h
>index 3ab8232c7f2..a671bb0db1c 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/validationEGL.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/validationEGL.h
>@@ -9,7 +9,9 @@
> #ifndef LIBANGLE_VALIDATIONEGL_H_
> #define LIBANGLE_VALIDATIONEGL_H_
> 
>+#include "common/PackedEnums.h"
> #include "libANGLE/Error.h"
>+#include "libANGLE/Texture.h"
> 
> #include <EGL/egl.h>
> #include <EGL/eglext.h>
>@@ -30,6 +32,9 @@ class Display;
> class Image;
> class Stream;
> class Surface;
>+class Sync;
>+class Thread;
>+class LabeledObject;
> 
> // Object validation
> Error ValidateDisplay(const Display *display);
>@@ -37,19 +42,48 @@ Error ValidateSurface(const Display *display, const Surface *surface);
> Error ValidateConfig(const Display *display, const Config *config);
> Error ValidateContext(const Display *display, const gl::Context *context);
> Error ValidateImage(const Display *display, const Image *image);
>+Error ValidateDevice(const Device *device);
>+Error ValidateSync(const Device *device, const Sync *sync);
>+
>+// Return the requested object only if it is valid (otherwise nullptr)
>+const Thread *GetThreadIfValid(const Thread *thread);
>+const Display *GetDisplayIfValid(const Display *display);
>+const Surface *GetSurfaceIfValid(const Display *display, const Surface *surface);
>+const Image *GetImageIfValid(const Display *display, const Image *image);
>+const Stream *GetStreamIfValid(const Display *display, const Stream *stream);
>+const gl::Context *GetContextIfValid(const Display *display, const gl::Context *context);
>+const Device *GetDeviceIfValid(const Device *device);
>+const Sync *GetSyncIfValid(const Display *display, const Sync *sync);
>+LabeledObject *GetLabeledObjectIfValid(Thread *thread,
>+                                       const Display *display,
>+                                       ObjectType objectType,
>+                                       EGLObjectKHR object);
> 
> // Entry point validation
>-Error ValidateCreateContext(Display *display, Config *configuration, gl::Context *shareContext,
>-                            const AttributeMap& attributes);
>+Error ValidateInitialize(const Display *display);
>+
>+Error ValidateTerminate(const Display *display);
> 
>-Error ValidateCreateWindowSurface(Display *display, Config *config, EGLNativeWindowType window,
>-                                  const AttributeMap& attributes);
>+Error ValidateCreateContext(Display *display,
>+                            Config *configuration,
>+                            gl::Context *shareContext,
>+                            const AttributeMap &attributes);
> 
>-Error ValidateCreatePbufferSurface(Display *display, Config *config, const AttributeMap& attributes);
>-Error ValidateCreatePbufferFromClientBuffer(Display *display, EGLenum buftype, EGLClientBuffer buffer,
>-                                            Config *config, const AttributeMap& attributes);
>+Error ValidateCreateWindowSurface(Display *display,
>+                                  Config *config,
>+                                  EGLNativeWindowType window,
>+                                  const AttributeMap &attributes);
> 
>-Error ValidateMakeCurrent(Display *display, EGLSurface draw, EGLSurface read, gl::Context *context);
>+Error ValidateCreatePbufferSurface(Display *display,
>+                                   Config *config,
>+                                   const AttributeMap &attributes);
>+Error ValidateCreatePbufferFromClientBuffer(Display *display,
>+                                            EGLenum buftype,
>+                                            EGLClientBuffer buffer,
>+                                            Config *config,
>+                                            const AttributeMap &attributes);
>+
>+Error ValidateMakeCurrent(Display *display, Surface *draw, Surface *read, gl::Context *context);
> 
> Error ValidateCreateImageKHR(const Display *display,
>                              gl::Context *context,
>@@ -63,6 +97,42 @@ Error ValidateCreateDeviceANGLE(EGLint device_type,
>                                 const EGLAttrib *attrib_list);
> Error ValidateReleaseDeviceANGLE(Device *device);
> 
>+Error ValidateCreateSyncBase(const Display *display,
>+                             EGLenum type,
>+                             const AttributeMap &attribs,
>+                             const Display *currentDisplay,
>+                             const gl::Context *currentContext,
>+                             bool isExt);
>+Error ValidateGetSyncAttribBase(const Display *display, const Sync *sync, EGLint attribute);
>+
>+Error ValidateCreateSyncKHR(const Display *display,
>+                            EGLenum type,
>+                            const AttributeMap &attribs,
>+                            const Display *currentDisplay,
>+                            const gl::Context *currentContext);
>+Error ValidateCreateSync(const Display *display,
>+                         EGLenum type,
>+                         const AttributeMap &attribs,
>+                         const Display *currentDisplay,
>+                         const gl::Context *currentContext);
>+Error ValidateDestroySync(const Display *display, const Sync *sync);
>+Error ValidateClientWaitSync(const Display *display,
>+                             const Sync *sync,
>+                             EGLint flags,
>+                             EGLTime timeout);
>+Error ValidateWaitSync(const Display *display,
>+                       const gl::Context *context,
>+                       const Sync *sync,
>+                       EGLint flags);
>+Error ValidateGetSyncAttribKHR(const Display *display,
>+                               const Sync *sync,
>+                               EGLint attribute,
>+                               EGLint *value);
>+Error ValidateGetSyncAttrib(const Display *display,
>+                            const Sync *sync,
>+                            EGLint attribute,
>+                            EGLAttrib *value);
>+
> Error ValidateCreateStreamKHR(const Display *display, const AttributeMap &attributes);
> Error ValidateDestroyStreamKHR(const Display *display, const Stream *stream);
> Error ValidateStreamAttribKHR(const Display *display,
>@@ -90,13 +160,13 @@ Error ValidateStreamConsumerGLTextureExternalAttribsNV(const Display *display,
>                                                        gl::Context *context,
>                                                        const Stream *stream,
>                                                        const AttributeMap &attribs);
>-Error ValidateCreateStreamProducerD3DTextureNV12ANGLE(const Display *display,
>-                                                      const Stream *stream,
>-                                                      const AttributeMap &attribs);
>-Error ValidateStreamPostD3DTextureNV12ANGLE(const Display *display,
>-                                            const Stream *stream,
>-                                            void *texture,
>-                                            const AttributeMap &attribs);
>+Error ValidateCreateStreamProducerD3DTextureANGLE(const Display *display,
>+                                                  const Stream *stream,
>+                                                  const AttributeMap &attribs);
>+Error ValidateStreamPostD3DTextureANGLE(const Display *display,
>+                                        const Stream *stream,
>+                                        void *texture,
>+                                        const AttributeMap &attribs);
> 
> Error ValidateGetSyncValuesCHROMIUM(const Display *display,
>                                     const Surface *surface,
>@@ -104,11 +174,51 @@ Error ValidateGetSyncValuesCHROMIUM(const Display *display,
>                                     const EGLuint64KHR *msc,
>                                     const EGLuint64KHR *sbc);
> 
>-Error ValidateSwapBuffersWithDamageEXT(const Display *display,
>+Error ValidateDestroySurface(const Display *display,
>+                             const Surface *surface,
>+                             const EGLSurface eglSurface);
>+
>+Error ValidateDestroyContext(const Display *display,
>+                             const gl::Context *glCtx,
>+                             const EGLContext eglCtx);
>+
>+Error ValidateSwapBuffers(Thread *thread, const Display *display, const Surface *surface);
>+
>+Error ValidateWaitNative(const Display *display, const EGLint engine);
>+
>+Error ValidateCopyBuffers(Display *display, const Surface *surface);
>+
>+Error ValidateSwapBuffersWithDamageKHR(const Display *display,
>                                        const Surface *surface,
>                                        EGLint *rects,
>                                        EGLint n_rects);
> 
>+Error ValidateBindTexImage(const Display *display,
>+                           const Surface *surface,
>+                           const EGLSurface eglSurface,
>+                           const EGLint buffer,
>+                           const gl::Context *context,
>+                           gl::Texture **textureObject);
>+
>+Error ValidateReleaseTexImage(const Display *display,
>+                              const Surface *surface,
>+                              const EGLSurface eglSurface,
>+                              const EGLint buffer);
>+
>+Error ValidateSwapInterval(const Display *display,
>+                           const Surface *draw_surface,
>+                           const gl::Context *context);
>+
>+Error ValidateBindAPI(const EGLenum api);
>+
>+Error ValidatePresentationTimeANDROID(const Display *display,
>+                                      const Surface *surface,
>+                                      EGLnsecsANDROID time);
>+
>+Error ValidateSetBlobCacheANDROID(const Display *display,
>+                                  EGLSetBlobFuncANDROID set,
>+                                  EGLGetBlobFuncANDROID get);
>+
> Error ValidateGetConfigAttrib(const Display *display, const Config *config, EGLint attribute);
> Error ValidateChooseConfig(const Display *display,
>                            const AttributeMap &attribs,
>@@ -129,6 +239,14 @@ Error ValidateGetPlatformDisplay(EGLenum platform,
> Error ValidateGetPlatformDisplayEXT(EGLenum platform,
>                                     void *native_display,
>                                     const EGLint *attrib_list);
>+Error ValidateCreatePlatformWindowSurfaceEXT(const Display *display,
>+                                             const Config *configuration,
>+                                             void *nativeWindow,
>+                                             const AttributeMap &attributes);
>+Error ValidateCreatePlatformPixmapSurfaceEXT(const Display *display,
>+                                             const Config *configuration,
>+                                             void *nativePixmap,
>+                                             const AttributeMap &attributes);
> 
> Error ValidateProgramCacheGetAttribANGLE(const Display *display, EGLenum attrib);
> 
>@@ -160,23 +278,62 @@ Error ValidateQueryContext(const Display *display,
>                            EGLint attribute,
>                            EGLint *value);
> 
>+// EGL_KHR_debug
>+Error ValidateDebugMessageControlKHR(EGLDEBUGPROCKHR callback, const AttributeMap &attribs);
>+
>+Error ValidateQueryDebugKHR(EGLint attribute, EGLAttrib *value);
>+
>+Error ValidateLabelObjectKHR(Thread *thread,
>+                             const Display *display,
>+                             ObjectType objectType,
>+                             EGLObjectKHR object,
>+                             EGLLabelKHR label);
>+
>+// ANDROID_get_frame_timestamps
>+Error ValidateGetCompositorTimingSupportedANDROID(const Display *display,
>+                                                  const Surface *surface,
>+                                                  CompositorTiming name);
>+
>+Error ValidateGetCompositorTimingANDROID(const Display *display,
>+                                         const Surface *surface,
>+                                         EGLint numTimestamps,
>+                                         const EGLint *names,
>+                                         EGLnsecsANDROID *values);
>+
>+Error ValidateGetNextFrameIdANDROID(const Display *display,
>+                                    const Surface *surface,
>+                                    EGLuint64KHR *frameId);
>+
>+Error ValidateGetFrameTimestampSupportedANDROID(const Display *display,
>+                                                const Surface *surface,
>+                                                Timestamp timestamp);
>+
>+Error ValidateGetFrameTimestampsANDROID(const Display *display,
>+                                        const Surface *surface,
>+                                        EGLuint64KHR frameId,
>+                                        EGLint numTimestamps,
>+                                        const EGLint *timestamps,
>+                                        EGLnsecsANDROID *values);
>+
> }  // namespace egl
> 
>-#define ANGLE_EGL_TRY(THREAD, EXPR)                   \
>-    {                                                 \
>-        auto ANGLE_LOCAL_VAR = (EXPR);                \
>-        if (ANGLE_LOCAL_VAR.isError())                \
>-            return THREAD->setError(ANGLE_LOCAL_VAR); \
>-    }
>-
>-#define ANGLE_EGL_TRY_RETURN(THREAD, EXPR, RETVAL) \
>-    {                                              \
>-        auto ANGLE_LOCAL_VAR = (EXPR);             \
>-        if (ANGLE_LOCAL_VAR.isError())             \
>-        {                                          \
>-            THREAD->setError(ANGLE_LOCAL_VAR);     \
>-            return RETVAL;                         \
>-        }                                          \
>-    }
>-
>-#endif // LIBANGLE_VALIDATIONEGL_H_
>+#define ANGLE_EGL_TRY(THREAD, EXPR, FUNCNAME, LABELOBJECT)                               \
>+    do                                                                                   \
>+    {                                                                                    \
>+        auto ANGLE_LOCAL_VAR = (EXPR);                                                   \
>+        if (ANGLE_LOCAL_VAR.isError())                                                   \
>+            return THREAD->setError(ANGLE_LOCAL_VAR, GetDebug(), FUNCNAME, LABELOBJECT); \
>+    } while (0)
>+
>+#define ANGLE_EGL_TRY_RETURN(THREAD, EXPR, FUNCNAME, LABELOBJECT, RETVAL)         \
>+    do                                                                            \
>+    {                                                                             \
>+        auto ANGLE_LOCAL_VAR = (EXPR);                                            \
>+        if (ANGLE_LOCAL_VAR.isError())                                            \
>+        {                                                                         \
>+            THREAD->setError(ANGLE_LOCAL_VAR, GetDebug(), FUNCNAME, LABELOBJECT); \
>+            return RETVAL;                                                        \
>+        }                                                                         \
>+    } while (0)
>+
>+#endif  // LIBANGLE_VALIDATIONEGL_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/validationES.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/validationES.cpp
>index ae564b74122..54c54a8b581 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/validationES.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/validationES.cpp
>@@ -18,11 +18,12 @@
> #include "libANGLE/Query.h"
> #include "libANGLE/Texture.h"
> #include "libANGLE/TransformFeedback.h"
>-#include "libANGLE/VertexArray.h"
>+#include "libANGLE/angletypes.h"
> #include "libANGLE/formatutils.h"
> #include "libANGLE/queryconversions.h"
>-#include "libANGLE/validationES2.h"
>-#include "libANGLE/validationES3.h"
>+#include "libANGLE/queryutils.h"
>+#include "libANGLE/validationES2_autogen.h"
>+#include "libANGLE/validationES3_autogen.h"
> 
> #include "common/mathutil.h"
> #include "common/utilities.h"
>@@ -31,127 +32,59 @@ using namespace angle;
> 
> namespace gl
> {
>+using namespace err;
>+
> namespace
> {
>-
>-bool ValidateDrawAttribs(ValidationContext *context,
>-                         GLint primcount,
>-                         GLint maxVertex,
>-                         GLint vertexCount)
>+bool CompressedTextureFormatRequiresExactSize(GLenum internalFormat)
> {
>-    const gl::State &state     = context->getGLState();
>-    const gl::Program *program = state.getProgram();
>-
>-    bool webglCompatibility = context->getExtensions().webglCompatibility;
>-
>-    const VertexArray *vao     = state.getVertexArray();
>-    const auto &vertexAttribs  = vao->getVertexAttributes();
>-    const auto &vertexBindings = vao->getVertexBindings();
>-    size_t maxEnabledAttrib    = vao->getMaxEnabledAttribute();
>-    for (size_t attributeIndex = 0; attributeIndex < maxEnabledAttrib; ++attributeIndex)
>+    // List of compressed format that require that the texture size is smaller than or a multiple of
>+    // the compressed block size.
>+    switch (internalFormat)
>     {
>-        const VertexAttribute &attrib = vertexAttribs[attributeIndex];
>-
>-        // No need to range check for disabled attribs.
>-        if (!attrib.enabled)
>-        {
>-            continue;
>-        }
>-
>-        // If we have no buffer, then we either get an error, or there are no more checks to be
>-        // done.
>-        const VertexBinding &binding  = vertexBindings[attrib.bindingIndex];
>-        gl::Buffer *buffer            = binding.getBuffer().get();
>-        if (!buffer)
>-        {
>-            if (webglCompatibility || !state.areClientArraysEnabled())
>-            {
>-                // [WebGL 1.0] Section 6.5 Enabled Vertex Attributes and Range Checking
>-                // If a vertex attribute is enabled as an array via enableVertexAttribArray but
>-                // no buffer is bound to that attribute via bindBuffer and vertexAttribPointer,
>-                // then calls to drawArrays or drawElements will generate an INVALID_OPERATION
>-                // error.
>-                ANGLE_VALIDATION_ERR(context, InvalidOperation(), VertexArrayNoBuffer);
>-                return false;
>-            }
>-            else if (attrib.pointer == nullptr)
>-            {
>-                // This is an application error that would normally result in a crash,
>-                // but we catch it and return an error
>-                ANGLE_VALIDATION_ERR(context, InvalidOperation(), VertexArrayNoBufferPointer);
>-                return false;
>-            }
>-            continue;
>-        }
>-
>-        // This needs to come after the check for client arrays as even unused attributes cannot use
>-        // client-side arrays
>-        if (!program->isAttribLocationActive(attributeIndex))
>-        {
>-            continue;
>-        }
>-
>-        // If we're drawing zero vertices, we have enough data.
>-        if (vertexCount <= 0 || primcount <= 0)
>-        {
>-            continue;
>-        }
>-
>-        GLint maxVertexElement = 0;
>-        GLuint divisor         = binding.getDivisor();
>-        if (divisor == 0)
>-        {
>-            maxVertexElement = maxVertex;
>-        }
>-        else
>-        {
>-            maxVertexElement = (primcount - 1) / divisor;
>-        }
>-
>-        // We do manual overflow checks here instead of using safe_math.h because it was
>-        // a bottleneck. Thanks to some properties of GL we know inequalities that can
>-        // help us make the overflow checks faster.
>-
>-        // The max possible attribSize is 16 for a vector of 4 32 bit values.
>-        constexpr uint64_t kMaxAttribSize = 16;
>-        constexpr uint64_t kIntMax        = std::numeric_limits<int>::max();
>-        constexpr uint64_t kUint64Max     = std::numeric_limits<uint64_t>::max();
>-
>-        // We know attribStride is given as a GLsizei which is typedefed to int.
>-        // We also know an upper bound for attribSize.
>-        static_assert(std::is_same<int, GLsizei>::value, "");
>-        uint64_t attribStride = ComputeVertexAttributeStride(attrib, binding);
>-        uint64_t attribSize   = ComputeVertexAttributeTypeSize(attrib);
>-        ASSERT(attribStride <= kIntMax && attribSize <= kMaxAttribSize);
>-
>-        // Computing the max offset using uint64_t without attrib.offset is overflow
>-        // safe. Note: Last vertex element does not take the full stride!
>-        static_assert(kIntMax * kIntMax < kUint64Max - kMaxAttribSize, "");
>-        uint64_t attribDataSizeNoOffset = maxVertexElement * attribStride + attribSize;
>-
>-        // An overflow can happen when adding the offset, check for it.
>-        uint64_t attribOffset = ComputeVertexAttributeOffset(attrib, binding);
>-        if (attribDataSizeNoOffset > kUint64Max - attribOffset)
>-        {
>-            ANGLE_VALIDATION_ERR(context, InvalidOperation(), IntegerOverflow);
>-            return false;
>-        }
>-        uint64_t attribDataSizeWithOffset = attribDataSizeNoOffset + attribOffset;
>+        case GL_COMPRESSED_RGB_S3TC_DXT1_EXT:
>+        case GL_COMPRESSED_RGBA_S3TC_DXT1_EXT:
>+        case GL_COMPRESSED_RGBA_S3TC_DXT3_ANGLE:
>+        case GL_COMPRESSED_RGBA_S3TC_DXT5_ANGLE:
>+        case GL_COMPRESSED_SRGB_S3TC_DXT1_EXT:
>+        case GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT1_EXT:
>+        case GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT3_EXT:
>+        case GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT5_EXT:
>+        case GL_ETC1_RGB8_LOSSY_DECODE_ANGLE:
>+        case GL_COMPRESSED_RGB8_LOSSY_DECODE_ETC2_ANGLE:
>+        case GL_COMPRESSED_SRGB8_LOSSY_DECODE_ETC2_ANGLE:
>+        case GL_COMPRESSED_RGB8_PUNCHTHROUGH_ALPHA1_LOSSY_DECODE_ETC2_ANGLE:
>+        case GL_COMPRESSED_SRGB8_PUNCHTHROUGH_ALPHA1_LOSSY_DECODE_ETC2_ANGLE:
>+        case GL_COMPRESSED_RGBA8_LOSSY_DECODE_ETC2_EAC_ANGLE:
>+        case GL_COMPRESSED_SRGB8_ALPHA8_LOSSY_DECODE_ETC2_EAC_ANGLE:
>+        case GL_COMPRESSED_RGBA_BPTC_UNORM_EXT:
>+        case GL_COMPRESSED_SRGB_ALPHA_BPTC_UNORM_EXT:
>+        case GL_COMPRESSED_RGB_BPTC_SIGNED_FLOAT_EXT:
>+        case GL_COMPRESSED_RGB_BPTC_UNSIGNED_FLOAT_EXT:
>+            return true;
> 
>-        // [OpenGL ES 3.0.2] section 2.9.4 page 40:
>-        // We can return INVALID_OPERATION if our vertex attribute does not have
>-        // enough backing data.
>-        if (attribDataSizeWithOffset > static_cast<uint64_t>(buffer->getSize()))
>-        {
>-            ANGLE_VALIDATION_ERR(context, InvalidOperation(), InsufficientVertexBufferSize);
>+        default:
>             return false;
>-        }
>     }
>+}
>+bool CompressedSubTextureFormatRequiresExactSize(GLenum internalFormat)
>+{
>+    // Compressed sub textures have additional formats that requires exact size.
>+    // ES 3.1, Section 8.7, Page 171
>+    return CompressedTextureFormatRequiresExactSize(internalFormat) ||
>+           IsETC2EACFormat(internalFormat);
>+}
> 
>-    return true;
>+bool DifferenceCanOverflow(GLint a, GLint b)
>+{
>+    CheckedNumeric<GLint> checkedA(a);
>+    checkedA -= b;
>+    // Use negation to make sure that the difference can't overflow regardless of the order.
>+    checkedA = -checkedA;
>+    return !checkedA.IsValid();
> }
> 
>-bool ValidReadPixelsTypeEnum(ValidationContext *context, GLenum type)
>+bool ValidReadPixelsTypeEnum(Context *context, GLenum type)
> {
>     switch (type)
>     {
>@@ -192,7 +125,7 @@ bool ValidReadPixelsTypeEnum(ValidationContext *context, GLenum type)
>     }
> }
> 
>-bool ValidReadPixelsFormatEnum(ValidationContext *context, GLenum format)
>+bool ValidReadPixelsFormatEnum(Context *context, GLenum format)
> {
>     switch (format)
>     {
>@@ -223,7 +156,7 @@ bool ValidReadPixelsFormatEnum(ValidationContext *context, GLenum format)
>     }
> }
> 
>-bool ValidReadPixelsFormatType(ValidationContext *context,
>+bool ValidReadPixelsFormatType(Context *context,
>                                GLenum framebufferComponentType,
>                                GLenum format,
>                                GLenum type)
>@@ -263,18 +196,26 @@ bool ValidateTextureWrapModeValue(Context *context, ParamType *params, bool rest
>         case GL_CLAMP_TO_EDGE:
>             break;
> 
>+        case GL_CLAMP_TO_BORDER:
>+            if (!context->getExtensions().textureBorderClamp)
>+            {
>+                context->validationError(GL_INVALID_ENUM, kExtensionNotEnabled);
>+                return false;
>+            }
>+            break;
>+
>         case GL_REPEAT:
>         case GL_MIRRORED_REPEAT:
>             if (restrictedWrapModes)
>             {
>                 // OES_EGL_image_external and ANGLE_texture_rectangle specifies this error.
>-                ANGLE_VALIDATION_ERR(context, InvalidEnum(), InvalidWrapModeTexture);
>+                context->validationError(GL_INVALID_ENUM, kInvalidWrapModeTexture);
>                 return false;
>             }
>             break;
> 
>         default:
>-            ANGLE_VALIDATION_ERR(context, InvalidEnum(), InvalidTextureWrap);
>+            context->validationError(GL_INVALID_ENUM, kInvalidTextureWrap);
>             return false;
>     }
> 
>@@ -297,13 +238,13 @@ bool ValidateTextureMinFilterValue(Context *context, ParamType *params, bool res
>             if (restrictedMinFilter)
>             {
>                 // OES_EGL_image_external specifies this error.
>-                ANGLE_VALIDATION_ERR(context, InvalidEnum(), InvalidFilterTexture);
>+                context->validationError(GL_INVALID_ENUM, kInvalidFilterTexture);
>                 return false;
>             }
>             break;
> 
>         default:
>-            ANGLE_VALIDATION_ERR(context, InvalidEnum(), InvalidTextureFilterParam);
>+            context->validationError(GL_INVALID_ENUM, kInvalidTextureFilterParam);
>             return false;
>     }
> 
>@@ -320,7 +261,7 @@ bool ValidateTextureMagFilterValue(Context *context, ParamType *params)
>             break;
> 
>         default:
>-            ANGLE_VALIDATION_ERR(context, InvalidEnum(), InvalidTextureFilterParam);
>+            context->validationError(GL_INVALID_ENUM, kInvalidTextureFilterParam);
>             return false;
>     }
> 
>@@ -338,7 +279,7 @@ bool ValidateTextureCompareModeValue(Context *context, ParamType *params)
>             break;
> 
>         default:
>-            ANGLE_VALIDATION_ERR(context, InvalidEnum(), UnknownParameter);
>+            context->validationError(GL_INVALID_ENUM, kUnknownParameter);
>             return false;
>     }
> 
>@@ -362,7 +303,7 @@ bool ValidateTextureCompareFuncValue(Context *context, ParamType *params)
>             break;
> 
>         default:
>-            ANGLE_VALIDATION_ERR(context, InvalidEnum(), UnknownParameter);
>+            context->validationError(GL_INVALID_ENUM, kUnknownParameter);
>             return false;
>     }
> 
>@@ -374,7 +315,7 @@ bool ValidateTextureSRGBDecodeValue(Context *context, ParamType *params)
> {
>     if (!context->getExtensions().textureSRGBDecode)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidEnum(), ExtensionNotEnabled);
>+        context->validationError(GL_INVALID_ENUM, kExtensionNotEnabled);
>         return false;
>     }
> 
>@@ -385,103 +326,201 @@ bool ValidateTextureSRGBDecodeValue(Context *context, ParamType *params)
>             break;
> 
>         default:
>-            ANGLE_VALIDATION_ERR(context, InvalidEnum(), UnknownParameter);
>+            context->validationError(GL_INVALID_ENUM, kUnknownParameter);
>             return false;
>     }
> 
>     return true;
> }
> 
>-bool ValidateFragmentShaderColorBufferTypeMatch(ValidationContext *context)
>+bool ValidateTextureMaxAnisotropyExtensionEnabled(Context *context)
> {
>-    const Program *program         = context->getGLState().getProgram();
>-    const Framebuffer *framebuffer = context->getGLState().getDrawFramebuffer();
>-
>-    const auto &programOutputTypes = program->getOutputVariableTypes();
>-    for (size_t drawBufferIdx = 0; drawBufferIdx < programOutputTypes.size(); drawBufferIdx++)
>+    if (!context->getExtensions().textureFilterAnisotropic)
>     {
>-        GLenum outputType = programOutputTypes[drawBufferIdx];
>-        GLenum inputType  = framebuffer->getDrawbufferWriteType(drawBufferIdx);
>-        if (outputType != GL_NONE && inputType != GL_NONE && inputType != outputType)
>-        {
>-            context->handleError(InvalidOperation() << "Fragment shader output type does not "
>-                                                       "match the bound framebuffer attachment "
>-                                                       "type.");
>-            return false;
>-        }
>+        context->validationError(GL_INVALID_ENUM, kExtensionNotEnabled);
>+        return false;
>     }
> 
>     return true;
> }
> 
>-bool ValidateVertexShaderAttributeTypeMatch(ValidationContext *context)
>+bool ValidateTextureMaxAnisotropyValue(Context *context, GLfloat paramValue)
> {
>-    const auto &glState       = context->getGLState();
>-    const Program *program = context->getGLState().getProgram();
>-    const VertexArray *vao = context->getGLState().getVertexArray();
>-    const auto &vertexAttribs = vao->getVertexAttributes();
>-    const auto &currentValues = glState.getVertexAttribCurrentValues();
>+    if (!ValidateTextureMaxAnisotropyExtensionEnabled(context))
>+    {
>+        return false;
>+    }
>+
>+    GLfloat largest = context->getExtensions().maxTextureAnisotropy;
> 
>-    for (const sh::Attribute &shaderAttribute : program->getAttributes())
>+    if (paramValue < 1 || paramValue > largest)
>     {
>-        // gl_VertexID and gl_InstanceID are active attributes but don't have a bound attribute.
>-        if (shaderAttribute.isBuiltIn())
>-        {
>-            continue;
>-        }
>+        context->validationError(GL_INVALID_VALUE, kOutsideOfBounds);
>+        return false;
>+    }
> 
>-        GLenum shaderInputType = VariableComponentType(shaderAttribute.type);
>+    return true;
>+}
> 
>-        const auto &attrib = vertexAttribs[shaderAttribute.location];
>-        GLenum vertexType  = attrib.enabled ? GetVertexAttributeBaseType(attrib)
>-                                           : currentValues[shaderAttribute.location].Type;
>+bool ValidateFragmentShaderColorBufferMaskMatch(Context *context)
>+{
>+    const Program *program         = context->getState().getLinkedProgram(context);
>+    const Framebuffer *framebuffer = context->getState().getDrawFramebuffer();
> 
>-        if (shaderInputType != GL_NONE && vertexType != GL_NONE && shaderInputType != vertexType)
>-        {
>-            context->handleError(InvalidOperation() << "Vertex shader input type does not "
>-                                                       "match the type of the bound vertex "
>-                                                       "attribute.");
>+    auto drawBufferMask     = framebuffer->getDrawBufferMask().to_ulong();
>+    auto fragmentOutputMask = program->getActiveOutputVariables().to_ulong();
>+
>+    return drawBufferMask == (drawBufferMask & fragmentOutputMask);
>+}
>+
>+bool ValidateFragmentShaderColorBufferTypeMatch(Context *context)
>+{
>+    const Program *program         = context->getState().getLinkedProgram(context);
>+    const Framebuffer *framebuffer = context->getState().getDrawFramebuffer();
>+
>+    return ValidateComponentTypeMasks(program->getDrawBufferTypeMask().to_ulong(),
>+                                      framebuffer->getDrawBufferTypeMask().to_ulong(),
>+                                      program->getActiveOutputVariables().to_ulong(),
>+                                      framebuffer->getDrawBufferMask().to_ulong());
>+}
>+
>+bool ValidateVertexShaderAttributeTypeMatch(Context *context)
>+{
>+    const auto &glState    = context->getState();
>+    const Program *program = context->getState().getLinkedProgram(context);
>+    const VertexArray *vao = context->getState().getVertexArray();
>+
>+    unsigned long stateCurrentValuesTypeBits = glState.getCurrentValuesTypeMask().to_ulong();
>+    unsigned long vaoAttribTypeBits          = vao->getAttributesTypeMask().to_ulong();
>+    unsigned long vaoAttribEnabledMask       = vao->getAttributesMask().to_ulong();
>+
>+    vaoAttribEnabledMask |= vaoAttribEnabledMask << kMaxComponentTypeMaskIndex;
>+    vaoAttribTypeBits = (vaoAttribEnabledMask & vaoAttribTypeBits);
>+    vaoAttribTypeBits |= (~vaoAttribEnabledMask & stateCurrentValuesTypeBits);
>+
>+    return ValidateComponentTypeMasks(program->getAttributesTypeMask().to_ulong(),
>+                                      vaoAttribTypeBits, program->getAttributesMask().to_ulong(),
>+                                      0xFFFF);
>+}
>+
>+bool IsCompatibleDrawModeWithGeometryShader(PrimitiveMode drawMode,
>+                                            PrimitiveMode geometryShaderInputPrimitiveType)
>+{
>+    // [EXT_geometry_shader] Section 11.1gs.1, Geometry Shader Input Primitives
>+    switch (drawMode)
>+    {
>+        case PrimitiveMode::Points:
>+            return geometryShaderInputPrimitiveType == PrimitiveMode::Points;
>+        case PrimitiveMode::Lines:
>+        case PrimitiveMode::LineStrip:
>+        case PrimitiveMode::LineLoop:
>+            return geometryShaderInputPrimitiveType == PrimitiveMode::Lines;
>+        case PrimitiveMode::LinesAdjacency:
>+        case PrimitiveMode::LineStripAdjacency:
>+            return geometryShaderInputPrimitiveType == PrimitiveMode::LinesAdjacency;
>+        case PrimitiveMode::Triangles:
>+        case PrimitiveMode::TriangleFan:
>+        case PrimitiveMode::TriangleStrip:
>+            return geometryShaderInputPrimitiveType == PrimitiveMode::Triangles;
>+        case PrimitiveMode::TrianglesAdjacency:
>+        case PrimitiveMode::TriangleStripAdjacency:
>+            return geometryShaderInputPrimitiveType == PrimitiveMode::TrianglesAdjacency;
>+        default:
>+            UNREACHABLE();
>             return false;
>-        }
>     }
>+}
> 
>-    return true;
>+// GLES1 texture parameters are a small subset of the others
>+bool IsValidGLES1TextureParameter(GLenum pname)
>+{
>+    switch (pname)
>+    {
>+        case GL_TEXTURE_MAG_FILTER:
>+        case GL_TEXTURE_MIN_FILTER:
>+        case GL_TEXTURE_WRAP_S:
>+        case GL_TEXTURE_WRAP_T:
>+        case GL_TEXTURE_WRAP_R:
>+        case GL_GENERATE_MIPMAP:
>+        case GL_TEXTURE_CROP_RECT_OES:
>+            return true;
>+        default:
>+            return false;
>+    }
>+}
>+
>+unsigned int GetSamplerParameterCount(GLenum pname)
>+{
>+    return pname == GL_TEXTURE_BORDER_COLOR ? 4 : 1;
> }
> 
> }  // anonymous namespace
> 
>-bool ValidTextureTarget(const ValidationContext *context, GLenum target)
>+void SetRobustLengthParam(GLsizei *length, GLsizei value)
> {
>-    switch (target)
>+    if (length)
>+    {
>+        *length = value;
>+    }
>+}
>+
>+bool IsETC2EACFormat(const GLenum format)
>+{
>+    // ES 3.1, Table 8.19
>+    switch (format)
>+    {
>+        case GL_COMPRESSED_R11_EAC:
>+        case GL_COMPRESSED_SIGNED_R11_EAC:
>+        case GL_COMPRESSED_RG11_EAC:
>+        case GL_COMPRESSED_SIGNED_RG11_EAC:
>+        case GL_COMPRESSED_RGB8_ETC2:
>+        case GL_COMPRESSED_SRGB8_ETC2:
>+        case GL_COMPRESSED_RGB8_PUNCHTHROUGH_ALPHA1_ETC2:
>+        case GL_COMPRESSED_SRGB8_PUNCHTHROUGH_ALPHA1_ETC2:
>+        case GL_COMPRESSED_RGBA8_ETC2_EAC:
>+        case GL_COMPRESSED_SRGB8_ALPHA8_ETC2_EAC:
>+            return true;
>+
>+        default:
>+            return false;
>+    }
>+}
>+
>+bool ValidTextureTarget(const Context *context, TextureType type)
>+{
>+    switch (type)
>     {
>-        case GL_TEXTURE_2D:
>-        case GL_TEXTURE_CUBE_MAP:
>+        case TextureType::_2D:
>+        case TextureType::CubeMap:
>             return true;
> 
>-        case GL_TEXTURE_RECTANGLE_ANGLE:
>+        case TextureType::Rectangle:
>             return context->getExtensions().textureRectangle;
> 
>-        case GL_TEXTURE_3D:
>-        case GL_TEXTURE_2D_ARRAY:
>+        case TextureType::_3D:
>+        case TextureType::_2DArray:
>             return (context->getClientMajorVersion() >= 3);
> 
>-        case GL_TEXTURE_2D_MULTISAMPLE:
>-            return (context->getClientVersion() >= Version(3, 1));
>+        case TextureType::_2DMultisample:
>+            return (context->getClientVersion() >= Version(3, 1) ||
>+                    context->getExtensions().textureMultisample);
>+        case TextureType::_2DMultisampleArray:
>+            return context->getExtensions().textureStorageMultisample2DArray;
> 
>         default:
>             return false;
>     }
> }
> 
>-bool ValidTexture2DTarget(const ValidationContext *context, GLenum target)
>+bool ValidTexture2DTarget(const Context *context, TextureType type)
> {
>-    switch (target)
>+    switch (type)
>     {
>-        case GL_TEXTURE_2D:
>-        case GL_TEXTURE_CUBE_MAP:
>+        case TextureType::_2D:
>+        case TextureType::CubeMap:
>             return true;
> 
>-        case GL_TEXTURE_RECTANGLE_ANGLE:
>+        case TextureType::Rectangle:
>             return context->getExtensions().textureRectangle;
> 
>         default:
>@@ -489,12 +528,12 @@ bool ValidTexture2DTarget(const ValidationContext *context, GLenum target)
>     }
> }
> 
>-bool ValidTexture3DTarget(const ValidationContext *context, GLenum target)
>+bool ValidTexture3DTarget(const Context *context, TextureType target)
> {
>     switch (target)
>     {
>-        case GL_TEXTURE_3D:
>-        case GL_TEXTURE_2D_ARRAY:
>+        case TextureType::_3D:
>+        case TextureType::_2DArray:
>             return (context->getClientMajorVersion() >= 3);
> 
>         default:
>@@ -504,9 +543,9 @@ bool ValidTexture3DTarget(const ValidationContext *context, GLenum target)
> 
> // Most texture GL calls are not compatible with external textures, so we have a separate validation
> // function for use in the GL calls that do
>-bool ValidTextureExternalTarget(const ValidationContext *context, GLenum target)
>+bool ValidTextureExternalTarget(const Context *context, TextureType target)
> {
>-    return (target == GL_TEXTURE_EXTERNAL_OES) &&
>+    return (target == TextureType::External) &&
>            (context->getExtensions().eglImageExternal ||
>             context->getExtensions().eglStreamConsumerExternal);
> }
>@@ -515,36 +554,75 @@ bool ValidTextureExternalTarget(const ValidationContext *context, GLenum target)
> // usable as the destination of a 2D operation-- so a cube face is valid, but
> // GL_TEXTURE_CUBE_MAP is not.
> // Note: duplicate of IsInternalTextureTarget
>-bool ValidTexture2DDestinationTarget(const ValidationContext *context, GLenum target)
>+bool ValidTexture2DDestinationTarget(const Context *context, TextureTarget target)
> {
>     switch (target)
>     {
>-        case GL_TEXTURE_2D:
>-        case GL_TEXTURE_CUBE_MAP_POSITIVE_X:
>-        case GL_TEXTURE_CUBE_MAP_NEGATIVE_X:
>-        case GL_TEXTURE_CUBE_MAP_POSITIVE_Y:
>-        case GL_TEXTURE_CUBE_MAP_NEGATIVE_Y:
>-        case GL_TEXTURE_CUBE_MAP_POSITIVE_Z:
>-        case GL_TEXTURE_CUBE_MAP_NEGATIVE_Z:
>+        case TextureTarget::_2D:
>+        case TextureTarget::CubeMapNegativeX:
>+        case TextureTarget::CubeMapNegativeY:
>+        case TextureTarget::CubeMapNegativeZ:
>+        case TextureTarget::CubeMapPositiveX:
>+        case TextureTarget::CubeMapPositiveY:
>+        case TextureTarget::CubeMapPositiveZ:
>             return true;
>-        case GL_TEXTURE_RECTANGLE_ANGLE:
>+        case TextureTarget::Rectangle:
>             return context->getExtensions().textureRectangle;
>         default:
>             return false;
>     }
> }
> 
>-bool ValidateDrawElementsInstancedBase(ValidationContext *context,
>-                                       GLenum mode,
>+bool ValidateTransformFeedbackPrimitiveMode(const Context *context,
>+                                            PrimitiveMode transformFeedbackPrimitiveMode,
>+                                            PrimitiveMode renderPrimitiveMode)
>+{
>+    ASSERT(context);
>+
>+    if (!context->getExtensions().geometryShader)
>+    {
>+        // It is an invalid operation to call DrawArrays or DrawArraysInstanced with a draw mode
>+        // that does not match the current transform feedback object's draw mode (if transform
>+        // feedback is active), (3.0.2, section 2.14, pg 86)
>+        return transformFeedbackPrimitiveMode == renderPrimitiveMode;
>+    }
>+
>+    // [GL_EXT_geometry_shader] Table 12.1gs
>+    switch (renderPrimitiveMode)
>+    {
>+        case PrimitiveMode::Points:
>+            return transformFeedbackPrimitiveMode == PrimitiveMode::Points;
>+        case PrimitiveMode::Lines:
>+        case PrimitiveMode::LineStrip:
>+        case PrimitiveMode::LineLoop:
>+            return transformFeedbackPrimitiveMode == PrimitiveMode::Lines;
>+        case PrimitiveMode::Triangles:
>+        case PrimitiveMode::TriangleFan:
>+        case PrimitiveMode::TriangleStrip:
>+            return transformFeedbackPrimitiveMode == PrimitiveMode::Triangles;
>+        default:
>+            UNREACHABLE();
>+            return false;
>+    }
>+}
>+
>+bool ValidateDrawElementsInstancedBase(Context *context,
>+                                       PrimitiveMode mode,
>                                        GLsizei count,
>-                                       GLenum type,
>+                                       DrawElementsType type,
>                                        const GLvoid *indices,
>                                        GLsizei primcount)
> {
>-    if (primcount < 0)
>+    if (primcount <= 0)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidValue(), NegativePrimcount);
>-        return false;
>+        if (primcount < 0)
>+        {
>+            context->validationError(GL_INVALID_VALUE, kNegativePrimcount);
>+            return false;
>+        }
>+
>+        // Early exit.
>+        return ValidateDrawElementsCommon(context, mode, count, type, indices, primcount);
>     }
> 
>     if (!ValidateDrawElementsCommon(context, mode, count, type, indices, primcount))
>@@ -552,20 +630,31 @@ bool ValidateDrawElementsInstancedBase(ValidationContext *context,
>         return false;
>     }
> 
>-    // No-op zero primitive count
>-    return (primcount > 0);
>+    if (count == 0)
>+    {
>+        // Early exit.
>+        return true;
>+    }
>+
>+    return ValidateDrawInstancedAttribs(context, primcount);
> }
> 
> bool ValidateDrawArraysInstancedBase(Context *context,
>-                                     GLenum mode,
>+                                     PrimitiveMode mode,
>                                      GLint first,
>                                      GLsizei count,
>                                      GLsizei primcount)
> {
>-    if (primcount < 0)
>+    if (primcount <= 0)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidValue(), NegativePrimcount);
>-        return false;
>+        if (primcount < 0)
>+        {
>+            context->validationError(GL_INVALID_VALUE, kNegativePrimcount);
>+            return false;
>+        }
>+
>+        // Early exit.
>+        return ValidateDrawArraysCommon(context, mode, first, count, primcount);
>     }
> 
>     if (!ValidateDrawArraysCommon(context, mode, first, count, primcount))
>@@ -573,16 +662,21 @@ bool ValidateDrawArraysInstancedBase(Context *context,
>         return false;
>     }
> 
>-    // No-op if zero primitive count
>-    return (primcount > 0);
>+    if (count == 0)
>+    {
>+        // Early exit.
>+        return true;
>+    }
>+
>+    return ValidateDrawInstancedAttribs(context, primcount);
> }
> 
>-bool ValidateDrawInstancedANGLE(ValidationContext *context)
>+bool ValidateDrawInstancedANGLE(Context *context)
> {
>     // Verify there is at least one active attribute with a divisor of zero
>-    const State &state = context->getGLState();
>+    const State &state = context->getState();
> 
>-    Program *program = state.getProgram();
>+    Program *program = state.getLinkedProgram(context);
> 
>     const auto &attribs  = state.getVertexArray()->getVertexAttributes();
>     const auto &bindings = state.getVertexArray()->getVertexBindings();
>@@ -596,45 +690,42 @@ bool ValidateDrawInstancedANGLE(ValidationContext *context)
>         }
>     }
> 
>-    ANGLE_VALIDATION_ERR(context, InvalidOperation(), NoZeroDivisor);
>+    context->validationError(GL_INVALID_OPERATION, kNoZeroDivisor);
>     return false;
> }
> 
>-bool ValidTexture3DDestinationTarget(const ValidationContext *context, GLenum target)
>+bool ValidTexture3DDestinationTarget(const Context *context, TextureTarget target)
> {
>     switch (target)
>     {
>-        case GL_TEXTURE_3D:
>-        case GL_TEXTURE_2D_ARRAY:
>+        case TextureTarget::_3D:
>+        case TextureTarget::_2DArray:
>             return true;
>         default:
>             return false;
>     }
> }
> 
>-bool ValidTexLevelDestinationTarget(const ValidationContext *context, GLenum target)
>+bool ValidTexLevelDestinationTarget(const Context *context, TextureType type)
> {
>-    switch (target)
>+    switch (type)
>     {
>-        case GL_TEXTURE_2D:
>-        case GL_TEXTURE_CUBE_MAP_POSITIVE_X:
>-        case GL_TEXTURE_CUBE_MAP_NEGATIVE_X:
>-        case GL_TEXTURE_CUBE_MAP_POSITIVE_Y:
>-        case GL_TEXTURE_CUBE_MAP_NEGATIVE_Y:
>-        case GL_TEXTURE_CUBE_MAP_POSITIVE_Z:
>-        case GL_TEXTURE_CUBE_MAP_NEGATIVE_Z:
>-        case GL_TEXTURE_3D:
>-        case GL_TEXTURE_2D_ARRAY:
>-        case GL_TEXTURE_2D_MULTISAMPLE:
>+        case TextureType::_2D:
>+        case TextureType::_2DArray:
>+        case TextureType::_2DMultisample:
>+        case TextureType::CubeMap:
>+        case TextureType::_3D:
>             return true;
>-        case GL_TEXTURE_RECTANGLE_ANGLE:
>+        case TextureType::Rectangle:
>             return context->getExtensions().textureRectangle;
>+        case TextureType::_2DMultisampleArray:
>+            return context->getExtensions().textureStorageMultisample2DArray;
>         default:
>             return false;
>     }
> }
> 
>-bool ValidFramebufferTarget(const ValidationContext *context, GLenum target)
>+bool ValidFramebufferTarget(const Context *context, GLenum target)
> {
>     static_assert(GL_DRAW_FRAMEBUFFER_ANGLE == GL_DRAW_FRAMEBUFFER &&
>                       GL_READ_FRAMEBUFFER_ANGLE == GL_READ_FRAMEBUFFER,
>@@ -655,74 +746,42 @@ bool ValidFramebufferTarget(const ValidationContext *context, GLenum target)
>     }
> }
> 
>-bool ValidBufferType(const ValidationContext *context, BufferBinding target)
>-{
>-    switch (target)
>-    {
>-        case BufferBinding::ElementArray:
>-        case BufferBinding::Array:
>-            return true;
>-
>-        case BufferBinding::PixelPack:
>-        case BufferBinding::PixelUnpack:
>-            return (context->getExtensions().pixelBufferObject ||
>-                    context->getClientMajorVersion() >= 3);
>-
>-        case BufferBinding::CopyRead:
>-        case BufferBinding::CopyWrite:
>-        case BufferBinding::TransformFeedback:
>-        case BufferBinding::Uniform:
>-            return (context->getClientMajorVersion() >= 3);
>-
>-        case BufferBinding::AtomicCounter:
>-        case BufferBinding::ShaderStorage:
>-        case BufferBinding::DrawIndirect:
>-        case BufferBinding::DispatchIndirect:
>-            return context->getClientVersion() >= Version(3, 1);
>-
>-        default:
>-            return false;
>-    }
>-}
>-
>-bool ValidMipLevel(const ValidationContext *context, GLenum target, GLint level)
>+bool ValidMipLevel(const Context *context, TextureType type, GLint level)
> {
>     const auto &caps    = context->getCaps();
>     size_t maxDimension = 0;
>-    switch (target)
>+    switch (type)
>     {
>-        case GL_TEXTURE_2D:
>+        case TextureType::_2D:
>+        case TextureType::_2DArray:
>+        case TextureType::_2DMultisample:
>+        case TextureType::_2DMultisampleArray:
>+            // TODO(http://anglebug.com/2775): It's a bit unclear what the "maximum allowable
>+            // level-of-detail" for multisample textures should be. Could maybe make it zero.
>             maxDimension = caps.max2DTextureSize;
>             break;
>-        case GL_TEXTURE_CUBE_MAP:
>-        case GL_TEXTURE_CUBE_MAP_POSITIVE_X:
>-        case GL_TEXTURE_CUBE_MAP_NEGATIVE_X:
>-        case GL_TEXTURE_CUBE_MAP_POSITIVE_Y:
>-        case GL_TEXTURE_CUBE_MAP_NEGATIVE_Y:
>-        case GL_TEXTURE_CUBE_MAP_POSITIVE_Z:
>-        case GL_TEXTURE_CUBE_MAP_NEGATIVE_Z:
>+
>+        case TextureType::CubeMap:
>             maxDimension = caps.maxCubeMapTextureSize;
>             break;
>-        case GL_TEXTURE_RECTANGLE_ANGLE:
>+
>+        case TextureType::External:
>+        case TextureType::Rectangle:
>             return level == 0;
>-        case GL_TEXTURE_3D:
>+
>+        case TextureType::_3D:
>             maxDimension = caps.max3DTextureSize;
>             break;
>-        case GL_TEXTURE_2D_ARRAY:
>-            maxDimension = caps.max2DTextureSize;
>-            break;
>-        case GL_TEXTURE_2D_MULTISAMPLE:
>-            maxDimension = caps.max2DTextureSize;
>-            break;
>+
>         default:
>             UNREACHABLE();
>     }
> 
>-    return level <= gl::log2(static_cast<int>(maxDimension)) && level >= 0;
>+    return level <= log2(static_cast<int>(maxDimension)) && level >= 0;
> }
> 
>-bool ValidImageSizeParameters(ValidationContext *context,
>-                              GLenum target,
>+bool ValidImageSizeParameters(Context *context,
>+                              TextureType target,
>                               GLint level,
>                               GLsizei width,
>                               GLsizei height,
>@@ -731,7 +790,7 @@ bool ValidImageSizeParameters(ValidationContext *context,
> {
>     if (width < 0 || height < 0 || depth < 0)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidValue(), NegativeSize);
>+        context->validationError(GL_INVALID_VALUE, kNegativeSize);
>         return false;
>     }
>     // TexSubImage parameters can be NPOT without textureNPOT extension,
>@@ -739,62 +798,34 @@ bool ValidImageSizeParameters(ValidationContext *context,
>     bool hasNPOTSupport =
>         context->getExtensions().textureNPOT || context->getClientVersion() >= Version(3, 0);
>     if (!isSubImage && !hasNPOTSupport &&
>-        (level != 0 && (!gl::isPow2(width) || !gl::isPow2(height) || !gl::isPow2(depth))))
>+        (level != 0 && (!isPow2(width) || !isPow2(height) || !isPow2(depth))))
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidValue(), TextureNotPow2);
>+        context->validationError(GL_INVALID_VALUE, kTextureNotPow2);
>         return false;
>     }
> 
>     if (!ValidMipLevel(context, target, level))
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidValue(), InvalidMipLevel);
>+        context->validationError(GL_INVALID_VALUE, kInvalidMipLevel);
>         return false;
>     }
> 
>     return true;
> }
> 
>-bool CompressedTextureFormatRequiresExactSize(GLenum internalFormat)
>-{
>-    // List of compressed format that require that the texture size is smaller than or a multiple of
>-    // the compressed block size.
>-    switch (internalFormat)
>-    {
>-        case GL_COMPRESSED_RGB_S3TC_DXT1_EXT:
>-        case GL_COMPRESSED_RGBA_S3TC_DXT1_EXT:
>-        case GL_COMPRESSED_RGBA_S3TC_DXT3_ANGLE:
>-        case GL_COMPRESSED_RGBA_S3TC_DXT5_ANGLE:
>-        case GL_COMPRESSED_SRGB_S3TC_DXT1_EXT:
>-        case GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT1_EXT:
>-        case GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT3_EXT:
>-        case GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT5_EXT:
>-        case GL_ETC1_RGB8_LOSSY_DECODE_ANGLE:
>-        case GL_COMPRESSED_RGB8_LOSSY_DECODE_ETC2_ANGLE:
>-        case GL_COMPRESSED_SRGB8_LOSSY_DECODE_ETC2_ANGLE:
>-        case GL_COMPRESSED_RGB8_PUNCHTHROUGH_ALPHA1_LOSSY_DECODE_ETC2_ANGLE:
>-        case GL_COMPRESSED_SRGB8_PUNCHTHROUGH_ALPHA1_LOSSY_DECODE_ETC2_ANGLE:
>-        case GL_COMPRESSED_RGBA8_LOSSY_DECODE_ETC2_EAC_ANGLE:
>-        case GL_COMPRESSED_SRGB8_ALPHA8_LOSSY_DECODE_ETC2_EAC_ANGLE:
>-            return true;
>-
>-        default:
>-            return false;
>-    }
>-}
>-
> bool ValidCompressedDimension(GLsizei size, GLuint blockSize, bool smallerThanBlockSizeAllowed)
> {
>     return (smallerThanBlockSizeAllowed && (size > 0) && (blockSize % size == 0)) ||
>            (size % blockSize == 0);
> }
> 
>-bool ValidCompressedImageSize(const ValidationContext *context,
>+bool ValidCompressedImageSize(const Context *context,
>                               GLenum internalFormat,
>                               GLint level,
>                               GLsizei width,
>                               GLsizei height)
> {
>-    const gl::InternalFormat &formatInfo = gl::GetSizedInternalFormatInfo(internalFormat);
>+    const InternalFormat &formatInfo = GetSizedInternalFormatInfo(internalFormat);
>     if (!formatInfo.compressed)
>     {
>         return false;
>@@ -824,7 +855,7 @@ bool ValidCompressedImageSize(const ValidationContext *context,
>     return true;
> }
> 
>-bool ValidCompressedSubImageSize(const ValidationContext *context,
>+bool ValidCompressedSubImageSize(const Context *context,
>                                  GLenum internalFormat,
>                                  GLint xoffset,
>                                  GLint yoffset,
>@@ -833,7 +864,7 @@ bool ValidCompressedSubImageSize(const ValidationContext *context,
>                                  size_t textureWidth,
>                                  size_t textureHeight)
> {
>-    const gl::InternalFormat &formatInfo = gl::GetSizedInternalFormatInfo(internalFormat);
>+    const InternalFormat &formatInfo = GetSizedInternalFormatInfo(internalFormat);
>     if (!formatInfo.compressed)
>     {
>         return false;
>@@ -844,7 +875,7 @@ bool ValidCompressedSubImageSize(const ValidationContext *context,
>         return false;
>     }
> 
>-    if (CompressedTextureFormatRequiresExactSize(internalFormat))
>+    if (CompressedSubTextureFormatRequiresExactSize(internalFormat))
>     {
>         if (xoffset % formatInfo.compressedBlockWidth != 0 ||
>             yoffset % formatInfo.compressedBlockHeight != 0)
>@@ -868,8 +899,8 @@ bool ValidCompressedSubImageSize(const ValidationContext *context,
>     return true;
> }
> 
>-bool ValidImageDataSize(ValidationContext *context,
>-                        GLenum textureTarget,
>+bool ValidImageDataSize(Context *context,
>+                        TextureType texType,
>                         GLsizei width,
>                         GLsizei height,
>                         GLsizei depth,
>@@ -878,8 +909,7 @@ bool ValidImageDataSize(ValidationContext *context,
>                         const void *pixels,
>                         GLsizei imageSize)
> {
>-    gl::Buffer *pixelUnpackBuffer =
>-        context->getGLState().getTargetBuffer(BufferBinding::PixelUnpack);
>+    Buffer *pixelUnpackBuffer = context->getState().getTargetBuffer(BufferBinding::PixelUnpack);
>     if (pixelUnpackBuffer == nullptr && imageSize < 0)
>     {
>         // Checks are not required
>@@ -888,24 +918,22 @@ bool ValidImageDataSize(ValidationContext *context,
> 
>     // ...the data would be unpacked from the buffer object such that the memory reads required
>     // would exceed the data store size.
>-    const gl::InternalFormat &formatInfo = gl::GetInternalFormatInfo(format, type);
>+    const InternalFormat &formatInfo = GetInternalFormatInfo(format, type);
>     ASSERT(formatInfo.internalFormat != GL_NONE);
>-    const gl::Extents size(width, height, depth);
>-    const auto &unpack = context->getGLState().getUnpackState();
>+    const Extents size(width, height, depth);
>+    const auto &unpack = context->getState().getUnpackState();
> 
>-    bool targetIs3D   = textureTarget == GL_TEXTURE_3D || textureTarget == GL_TEXTURE_2D_ARRAY;
>-    auto endByteOrErr = formatInfo.computePackUnpackEndByte(type, size, unpack, targetIs3D);
>-    if (endByteOrErr.isError())
>+    bool targetIs3D = texType == TextureType::_3D || texType == TextureType::_2DArray;
>+    GLuint endByte  = 0;
>+    if (!formatInfo.computePackUnpackEndByte(type, size, unpack, targetIs3D, &endByte))
>     {
>-        context->handleError(endByteOrErr.getError());
>+        context->validationError(GL_INVALID_OPERATION, kIntegerOverflow);
>         return false;
>     }
> 
>-    GLuint endByte = endByteOrErr.getResult();
>-
>     if (pixelUnpackBuffer)
>     {
>-        CheckedNumeric<size_t> checkedEndByte(endByteOrErr.getResult());
>+        CheckedNumeric<size_t> checkedEndByte(endByte);
>         CheckedNumeric<size_t> checkedOffset(reinterpret_cast<size_t>(pixels));
>         checkedEndByte += checkedOffset;
> 
>@@ -913,7 +941,14 @@ bool ValidImageDataSize(ValidationContext *context,
>             (checkedEndByte.ValueOrDie() > static_cast<size_t>(pixelUnpackBuffer->getSize())))
>         {
>             // Overflow past the end of the buffer
>-            context->handleError(InvalidOperation());
>+            context->validationError(GL_INVALID_OPERATION, kIntegerOverflow);
>+            return false;
>+        }
>+        if (context->getExtensions().webglCompatibility &&
>+            pixelUnpackBuffer->isBoundForTransformFeedbackAndOtherUse())
>+        {
>+            context->validationError(GL_INVALID_OPERATION,
>+                                     kPixelUnpackBufferBoundForTransformFeedback);
>             return false;
>         }
>     }
>@@ -922,14 +957,13 @@ bool ValidImageDataSize(ValidationContext *context,
>         ASSERT(imageSize >= 0);
>         if (pixels == nullptr && imageSize != 0)
>         {
>-            context->handleError(InvalidOperation()
>-                                 << "imageSize must be 0 if no texture data is provided.");
>+            context->validationError(GL_INVALID_OPERATION, kImageSizeMustBeZero);
>             return false;
>         }
> 
>         if (pixels != nullptr && endByte > static_cast<GLuint>(imageSize))
>         {
>-            context->handleError(InvalidOperation() << "imageSize must be at least " << endByte);
>+            context->validationError(GL_INVALID_OPERATION, kImageSizeTooSmall);
>             return false;
>         }
>     }
>@@ -937,32 +971,29 @@ bool ValidImageDataSize(ValidationContext *context,
>     return true;
> }
> 
>-bool ValidQueryType(const Context *context, GLenum queryType)
>+bool ValidQueryType(const Context *context, QueryType queryType)
> {
>-    static_assert(GL_ANY_SAMPLES_PASSED == GL_ANY_SAMPLES_PASSED_EXT,
>-                  "GL extension enums not equal.");
>-    static_assert(GL_ANY_SAMPLES_PASSED_CONSERVATIVE == GL_ANY_SAMPLES_PASSED_CONSERVATIVE_EXT,
>-                  "GL extension enums not equal.");
>-
>     switch (queryType)
>     {
>-        case GL_ANY_SAMPLES_PASSED:
>-        case GL_ANY_SAMPLES_PASSED_CONSERVATIVE:
>+        case QueryType::AnySamples:
>+        case QueryType::AnySamplesConservative:
>             return context->getClientMajorVersion() >= 3 ||
>                    context->getExtensions().occlusionQueryBoolean;
>-        case GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN:
>+        case QueryType::TransformFeedbackPrimitivesWritten:
>             return (context->getClientMajorVersion() >= 3);
>-        case GL_TIME_ELAPSED_EXT:
>+        case QueryType::TimeElapsed:
>             return context->getExtensions().disjointTimerQuery;
>-        case GL_COMMANDS_COMPLETED_CHROMIUM:
>+        case QueryType::CommandsCompleted:
>             return context->getExtensions().syncQuery;
>+        case QueryType::PrimitivesGenerated:
>+            return context->getExtensions().geometryShader;
>         default:
>             return false;
>     }
> }
> 
>-bool ValidateWebGLVertexAttribPointer(ValidationContext *context,
>-                                      GLenum type,
>+bool ValidateWebGLVertexAttribPointer(Context *context,
>+                                      VertexAttribType type,
>                                       GLboolean normalized,
>                                       GLsizei stride,
>                                       const void *ptr,
>@@ -976,8 +1007,7 @@ bool ValidateWebGLVertexAttribPointer(ValidationContext *context,
>     constexpr GLsizei kMaxWebGLStride = 255;
>     if (stride > kMaxWebGLStride)
>     {
>-        context->handleError(InvalidValue()
>-                             << "Stride is over the maximum stride allowed by WebGL.");
>+        context->validationError(GL_INVALID_VALUE, kStrideExceedsWebGLLimit);
>         return false;
>     }
> 
>@@ -985,51 +1015,61 @@ bool ValidateWebGLVertexAttribPointer(ValidationContext *context,
>     // The offset arguments to drawElements and vertexAttribPointer, and the stride argument to
>     // vertexAttribPointer, must be a multiple of the size of the data type passed to the call,
>     // or an INVALID_OPERATION error is generated.
>-    VertexFormatType internalType = GetVertexFormatType(type, normalized, 1, pureInteger);
>-    size_t typeSize               = GetVertexFormatTypeSize(internalType);
>+    angle::FormatID internalType = GetVertexFormatID(type, normalized, 1, pureInteger);
>+    size_t typeSize              = GetVertexFormatSize(internalType);
> 
>     ASSERT(isPow2(typeSize) && typeSize > 0);
>     size_t sizeMask = (typeSize - 1);
>     if ((reinterpret_cast<intptr_t>(ptr) & sizeMask) != 0)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidOperation(), OffsetMustBeMultipleOfType);
>+        context->validationError(GL_INVALID_OPERATION, kOffsetMustBeMultipleOfType);
>         return false;
>     }
> 
>     if ((stride & sizeMask) != 0)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidOperation(), StrideMustBeMultipleOfType);
>+        context->validationError(GL_INVALID_OPERATION, kStrideMustBeMultipleOfType);
>         return false;
>     }
> 
>     return true;
> }
> 
>-Program *GetValidProgram(ValidationContext *context, GLuint id)
>+Program *GetValidProgramNoResolve(Context *context, GLuint id)
> {
>     // ES3 spec (section 2.11.1) -- "Commands that accept shader or program object names will
>     // generate the error INVALID_VALUE if the provided name is not the name of either a shader
>     // or program object and INVALID_OPERATION if the provided name identifies an object
>     // that is not the expected type."
> 
>-    Program *validProgram = context->getProgram(id);
>+    Program *validProgram = context->getProgramNoResolveLink(id);
> 
>     if (!validProgram)
>     {
>         if (context->getShader(id))
>         {
>-            ANGLE_VALIDATION_ERR(context, InvalidOperation(), ExpectedProgramName);
>+            context->validationError(GL_INVALID_OPERATION, kExpectedProgramName);
>         }
>         else
>         {
>-            ANGLE_VALIDATION_ERR(context, InvalidValue(), InvalidProgramName);
>+            context->validationError(GL_INVALID_VALUE, kInvalidProgramName);
>         }
>     }
> 
>     return validProgram;
> }
> 
>-Shader *GetValidShader(ValidationContext *context, GLuint id)
>+Program *GetValidProgram(Context *context, GLuint id)
>+{
>+    Program *program = GetValidProgramNoResolve(context, id);
>+    if (program)
>+    {
>+        program->resolveLink(context);
>+    }
>+    return program;
>+}
>+
>+Shader *GetValidShader(Context *context, GLuint id)
> {
>     // See ValidProgram for spec details.
> 
>@@ -1037,26 +1077,26 @@ Shader *GetValidShader(ValidationContext *context, GLuint id)
> 
>     if (!validShader)
>     {
>-        if (context->getProgram(id))
>+        if (context->getProgramNoResolveLink(id))
>         {
>-            ANGLE_VALIDATION_ERR(context, InvalidOperation(), ExpectedShaderName);
>+            context->validationError(GL_INVALID_OPERATION, kExpectedShaderName);
>         }
>         else
>         {
>-            ANGLE_VALIDATION_ERR(context, InvalidValue(), InvalidShaderName);
>+            context->validationError(GL_INVALID_VALUE, kInvalidShaderName);
>         }
>     }
> 
>     return validShader;
> }
> 
>-bool ValidateAttachmentTarget(gl::Context *context, GLenum attachment)
>+bool ValidateAttachmentTarget(Context *context, GLenum attachment)
> {
>     if (attachment >= GL_COLOR_ATTACHMENT1_EXT && attachment <= GL_COLOR_ATTACHMENT15_EXT)
>     {
>         if (context->getClientMajorVersion() < 3 && !context->getExtensions().drawBuffers)
>         {
>-            ANGLE_VALIDATION_ERR(context, InvalidEnum(), InvalidAttachment);
>+            context->validationError(GL_INVALID_ENUM, kInvalidAttachment);
>             return false;
>         }
> 
>@@ -1064,7 +1104,7 @@ bool ValidateAttachmentTarget(gl::Context *context, GLenum attachment)
>         const unsigned int colorAttachment = (attachment - GL_COLOR_ATTACHMENT0_EXT);
>         if (colorAttachment >= context->getCaps().maxColorAttachments)
>         {
>-            ANGLE_VALIDATION_ERR(context, InvalidOperation(), InvalidAttachment);
>+            context->validationError(GL_INVALID_OPERATION, kInvalidAttachment);
>             return false;
>         }
>     }
>@@ -1081,13 +1121,13 @@ bool ValidateAttachmentTarget(gl::Context *context, GLenum attachment)
>                 if (!context->getExtensions().webglCompatibility &&
>                     context->getClientMajorVersion() < 3)
>                 {
>-                    ANGLE_VALIDATION_ERR(context, InvalidEnum(), InvalidAttachment);
>+                    context->validationError(GL_INVALID_ENUM, kInvalidAttachment);
>                     return false;
>                 }
>                 break;
> 
>             default:
>-                ANGLE_VALIDATION_ERR(context, InvalidEnum(), InvalidAttachment);
>+                context->validationError(GL_INVALID_ENUM, kInvalidAttachment);
>                 return false;
>         }
>     }
>@@ -1095,7 +1135,7 @@ bool ValidateAttachmentTarget(gl::Context *context, GLenum attachment)
>     return true;
> }
> 
>-bool ValidateRenderbufferStorageParametersBase(ValidationContext *context,
>+bool ValidateRenderbufferStorageParametersBase(Context *context,
>                                                GLenum target,
>                                                GLsizei samples,
>                                                GLenum internalformat,
>@@ -1107,13 +1147,13 @@ bool ValidateRenderbufferStorageParametersBase(ValidationContext *context,
>         case GL_RENDERBUFFER:
>             break;
>         default:
>-            ANGLE_VALIDATION_ERR(context, InvalidEnum(), InvalidRenderbufferTarget);
>+            context->validationError(GL_INVALID_ENUM, kInvalidRenderbufferTarget);
>             return false;
>     }
> 
>     if (width < 0 || height < 0 || samples < 0)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidValue(), InvalidRenderbufferWidthHeight);
>+        context->validationError(GL_INVALID_VALUE, kInvalidRenderbufferWidthHeight);
>         return false;
>     }
> 
>@@ -1121,39 +1161,39 @@ bool ValidateRenderbufferStorageParametersBase(ValidationContext *context,
>     GLenum convertedInternalFormat = context->getConvertedRenderbufferFormat(internalformat);
> 
>     const TextureCaps &formatCaps = context->getTextureCaps().get(convertedInternalFormat);
>-    if (!formatCaps.renderable)
>+    if (!formatCaps.renderbuffer)
>     {
>-        context->handleError(InvalidEnum());
>+        context->validationError(GL_INVALID_ENUM, kInvalidRenderbufferInternalFormat);
>         return false;
>     }
> 
>     // ANGLE_framebuffer_multisample does not explicitly state that the internal format must be
>     // sized but it does state that the format must be in the ES2.0 spec table 4.5 which contains
>     // only sized internal formats.
>-    const gl::InternalFormat &formatInfo = gl::GetSizedInternalFormatInfo(convertedInternalFormat);
>+    const InternalFormat &formatInfo = GetSizedInternalFormatInfo(convertedInternalFormat);
>     if (formatInfo.internalFormat == GL_NONE)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidEnum(), InvalidRenderbufferInternalFormat);
>+        context->validationError(GL_INVALID_ENUM, kInvalidRenderbufferInternalFormat);
>         return false;
>     }
> 
>     if (static_cast<GLuint>(std::max(width, height)) > context->getCaps().maxRenderbufferSize)
>     {
>-        context->handleError(InvalidValue());
>+        context->validationError(GL_INVALID_VALUE, kResourceMaxRenderbufferSize);
>         return false;
>     }
> 
>-    GLuint handle = context->getGLState().getRenderbufferId();
>+    GLuint handle = context->getState().getRenderbufferId();
>     if (handle == 0)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidOperation(), InvalidRenderbufferTarget);
>+        context->validationError(GL_INVALID_OPERATION, kInvalidRenderbufferTarget);
>         return false;
>     }
> 
>     return true;
> }
> 
>-bool ValidateFramebufferRenderbufferParameters(gl::Context *context,
>+bool ValidateFramebufferRenderbufferParameters(Context *context,
>                                                GLenum target,
>                                                GLenum attachment,
>                                                GLenum renderbuffertarget,
>@@ -1161,16 +1201,16 @@ bool ValidateFramebufferRenderbufferParameters(gl::Context *context,
> {
>     if (!ValidFramebufferTarget(context, target))
>     {
>-        context->handleError(InvalidEnum());
>+        context->validationError(GL_INVALID_ENUM, kInvalidFramebufferTarget);
>         return false;
>     }
> 
>-    gl::Framebuffer *framebuffer = context->getGLState().getTargetFramebuffer(target);
>+    Framebuffer *framebuffer = context->getState().getTargetFramebuffer(target);
> 
>     ASSERT(framebuffer);
>     if (framebuffer->id() == 0)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidOperation(), DefaultFramebufferTarget);
>+        context->validationError(GL_INVALID_OPERATION, kDefaultFramebufferTarget);
>         return false;
>     }
> 
>@@ -1187,7 +1227,7 @@ bool ValidateFramebufferRenderbufferParameters(gl::Context *context,
>     {
>         if (!context->getRenderbuffer(renderbuffer))
>         {
>-            ANGLE_VALIDATION_ERR(context, InvalidOperation(), InvalidRenderbufferTarget);
>+            context->validationError(GL_INVALID_OPERATION, kInvalidRenderbufferTarget);
>             return false;
>         }
>     }
>@@ -1195,7 +1235,7 @@ bool ValidateFramebufferRenderbufferParameters(gl::Context *context,
>     return true;
> }
> 
>-bool ValidateBlitFramebufferParameters(ValidationContext *context,
>+bool ValidateBlitFramebufferParameters(Context *context,
>                                        GLint srcX0,
>                                        GLint srcY0,
>                                        GLint srcX1,
>@@ -1214,20 +1254,13 @@ bool ValidateBlitFramebufferParameters(ValidationContext *context,
>         case GL_LINEAR:
>             break;
>         default:
>-            context->handleError(InvalidEnum());
>+            context->validationError(GL_INVALID_ENUM, kBlitInvalidFilter);
>             return false;
>     }
> 
>     if ((mask & ~(GL_COLOR_BUFFER_BIT | GL_STENCIL_BUFFER_BIT | GL_DEPTH_BUFFER_BIT)) != 0)
>     {
>-        context->handleError(InvalidValue());
>-        return false;
>-    }
>-
>-    if (mask == 0)
>-    {
>-        // ES3.0 spec, section 4.3.2 specifies that a mask of zero is valid and no
>-        // buffers are copied.
>+        context->validationError(GL_INVALID_VALUE, kBlitInvalidMask);
>         return false;
>     }
> 
>@@ -1235,41 +1268,47 @@ bool ValidateBlitFramebufferParameters(ValidationContext *context,
>     // color buffer, leaving only nearest being unfiltered from above
>     if ((mask & ~GL_COLOR_BUFFER_BIT) != 0 && filter != GL_NEAREST)
>     {
>-        context->handleError(InvalidOperation());
>+        context->validationError(GL_INVALID_OPERATION, kBlitOnlyNearestForNonColor);
>         return false;
>     }
> 
>-    const auto &glState              = context->getGLState();
>-    gl::Framebuffer *readFramebuffer = glState.getReadFramebuffer();
>-    gl::Framebuffer *drawFramebuffer = glState.getDrawFramebuffer();
>+    const auto &glState          = context->getState();
>+    Framebuffer *readFramebuffer = glState.getReadFramebuffer();
>+    Framebuffer *drawFramebuffer = glState.getDrawFramebuffer();
> 
>     if (!readFramebuffer || !drawFramebuffer)
>     {
>-        context->handleError(InvalidFramebufferOperation());
>+        context->validationError(GL_INVALID_FRAMEBUFFER_OPERATION, kBlitFramebufferMissing);
>         return false;
>     }
> 
>-    if (readFramebuffer->id() == drawFramebuffer->id())
>+    if (!ValidateFramebufferComplete(context, readFramebuffer))
>+    {
>+        return false;
>+    }
>+
>+    if (!ValidateFramebufferComplete(context, drawFramebuffer))
>     {
>-        context->handleError(InvalidOperation());
>         return false;
>     }
> 
>-    if (readFramebuffer->checkStatus(context) != GL_FRAMEBUFFER_COMPLETE)
>+    if (readFramebuffer->id() == drawFramebuffer->id())
>     {
>-        context->handleError(InvalidFramebufferOperation());
>+        context->validationError(GL_INVALID_OPERATION, kBlitFeedbackLoop);
>         return false;
>     }
> 
>-    if (drawFramebuffer->checkStatus(context) != GL_FRAMEBUFFER_COMPLETE)
>+    if (!ValidateFramebufferNotMultisampled(context, drawFramebuffer))
>     {
>-        context->handleError(InvalidFramebufferOperation());
>         return false;
>     }
> 
>-    if (drawFramebuffer->getSamples(context) != 0)
>+    // This validation is specified in the WebGL 2.0 spec and not in the GLES 3.0.5 spec, but we
>+    // always run it in order to avoid triggering driver bugs.
>+    if (DifferenceCanOverflow(srcX0, srcX1) || DifferenceCanOverflow(srcY0, srcY1) ||
>+        DifferenceCanOverflow(dstX0, dstX1) || DifferenceCanOverflow(dstY0, dstY1))
>     {
>-        context->handleError(InvalidOperation());
>+        context->validationError(GL_INVALID_VALUE, kBlitDimensionsOutOfRange);
>         return false;
>     }
> 
>@@ -1277,8 +1316,8 @@ bool ValidateBlitFramebufferParameters(ValidationContext *context,
> 
>     if (mask & GL_COLOR_BUFFER_BIT)
>     {
>-        const gl::FramebufferAttachment *readColorBuffer = readFramebuffer->getReadColorbuffer();
>-        const Extensions &extensions                     = context->getExtensions();
>+        const FramebufferAttachment *readColorBuffer = readFramebuffer->getReadColorbuffer();
>+        const Extensions &extensions                 = context->getExtensions();
> 
>         if (readColorBuffer)
>         {
>@@ -1305,7 +1344,7 @@ bool ValidateBlitFramebufferParameters(ValidationContext *context,
>                     GLenum drawComponentType = drawFormat.info->componentType;
>                     bool readFixedPoint      = (readComponentType == GL_UNSIGNED_NORMALIZED ||
>                                            readComponentType == GL_SIGNED_NORMALIZED);
>-                    bool drawFixedPoint = (drawComponentType == GL_UNSIGNED_NORMALIZED ||
>+                    bool drawFixedPoint      = (drawComponentType == GL_UNSIGNED_NORMALIZED ||
>                                            drawComponentType == GL_SIGNED_NORMALIZED);
> 
>                     if (extensions.colorBufferFloat)
>@@ -1315,47 +1354,44 @@ bool ValidateBlitFramebufferParameters(ValidationContext *context,
> 
>                         if (readFixedOrFloat != drawFixedOrFloat)
>                         {
>-                            context->handleError(InvalidOperation()
>-                                                 << "If the read buffer contains fixed-point or "
>-                                                    "floating-point values, the draw buffer must "
>-                                                    "as well.");
>+                            context->validationError(GL_INVALID_OPERATION,
>+                                                     kBlitTypeMismatchFixedOrFloat);
>                             return false;
>                         }
>                     }
>                     else if (readFixedPoint != drawFixedPoint)
>                     {
>-                        context->handleError(InvalidOperation()
>-                                             << "If the read buffer contains fixed-point values, "
>-                                                "the draw buffer must as well.");
>+                        context->validationError(GL_INVALID_OPERATION, kBlitTypeMismatchFixedPoint);
>                         return false;
>                     }
> 
>                     if (readComponentType == GL_UNSIGNED_INT &&
>                         drawComponentType != GL_UNSIGNED_INT)
>                     {
>-                        context->handleError(InvalidOperation());
>+                        context->validationError(GL_INVALID_OPERATION,
>+                                                 kBlitTypeMismatchUnsignedInteger);
>                         return false;
>                     }
> 
>                     if (readComponentType == GL_INT && drawComponentType != GL_INT)
>                     {
>-                        context->handleError(InvalidOperation());
>+                        context->validationError(GL_INVALID_OPERATION,
>+                                                 kBlitTypeMismatchSignedInteger);
>                         return false;
>                     }
> 
>                     if (readColorBuffer->getSamples() > 0 &&
>                         (!Format::EquivalentForBlit(readFormat, drawFormat) || !sameBounds))
>                     {
>-                        context->handleError(InvalidOperation());
>+                        context->validationError(GL_INVALID_OPERATION,
>+                                                 kBlitMultisampledFormatOrBoundsMismatch);
>                         return false;
>                     }
> 
>                     if (context->getExtensions().webglCompatibility &&
>                         *readColorBuffer == *attachment)
>                     {
>-                        context->handleError(
>-                            InvalidOperation()
>-                            << "Read and write color attachments cannot be the same image.");
>+                        context->validationError(GL_INVALID_OPERATION, kBlitSameImageColor);
>                         return false;
>                     }
>                 }
>@@ -1365,7 +1401,7 @@ bool ValidateBlitFramebufferParameters(ValidationContext *context,
>                  readFormat.info->componentType == GL_UNSIGNED_INT) &&
>                 filter == GL_LINEAR)
>             {
>-                context->handleError(InvalidOperation());
>+                context->validationError(GL_INVALID_OPERATION, kBlitIntegerWithLinearFilter);
>                 return false;
>             }
>         }
>@@ -1375,9 +1411,7 @@ bool ValidateBlitFramebufferParameters(ValidationContext *context,
>         // situation is an application error that would lead to a crash in ANGLE.
>         else if (drawFramebuffer->hasEnabledDrawBuffer())
>         {
>-            context->handleError(
>-                InvalidOperation()
>-                << "Attempt to read from a missing color attachment of a complete framebuffer.");
>+            context->validationError(GL_INVALID_OPERATION, kBlitMissingColor);
>             return false;
>         }
>     }
>@@ -1388,57 +1422,53 @@ bool ValidateBlitFramebufferParameters(ValidationContext *context,
>     {
>         if (mask & masks[i])
>         {
>-            const gl::FramebufferAttachment *readBuffer =
>-                readFramebuffer->getAttachment(attachments[i]);
>-            const gl::FramebufferAttachment *drawBuffer =
>-                drawFramebuffer->getAttachment(attachments[i]);
>+            const FramebufferAttachment *readBuffer =
>+                readFramebuffer->getAttachment(context, attachments[i]);
>+            const FramebufferAttachment *drawBuffer =
>+                drawFramebuffer->getAttachment(context, attachments[i]);
> 
>             if (readBuffer && drawBuffer)
>             {
>                 if (!Format::EquivalentForBlit(readBuffer->getFormat(), drawBuffer->getFormat()))
>                 {
>-                    context->handleError(InvalidOperation());
>+                    context->validationError(GL_INVALID_OPERATION,
>+                                             kBlitDepthOrStencilFormatMismatch);
>                     return false;
>                 }
> 
>                 if (readBuffer->getSamples() > 0 && !sameBounds)
>                 {
>-                    context->handleError(InvalidOperation());
>+                    context->validationError(GL_INVALID_OPERATION, kBlitMultisampledBoundsMismatch);
>                     return false;
>                 }
> 
>                 if (context->getExtensions().webglCompatibility && *readBuffer == *drawBuffer)
>                 {
>-                    context->handleError(
>-                        InvalidOperation()
>-                        << "Read and write depth stencil attachments cannot be the same image.");
>+                    context->validationError(GL_INVALID_OPERATION, kBlitSameImageDepthOrStencil);
>                     return false;
>                 }
>             }
>             // WebGL 2.0 BlitFramebuffer when blitting from a missing attachment
>             else if (drawBuffer)
>             {
>-                context->handleError(InvalidOperation() << "Attempt to read from a missing "
>-                                                           "depth/stencil attachment of a "
>-                                                           "complete framebuffer.");
>+                context->validationError(GL_INVALID_OPERATION, kBlitMissingDepthOrStencil);
>                 return false;
>             }
>         }
>     }
> 
>-    // ANGLE_multiview, Revision 1:
>+    // OVR_multiview2:
>     // Calling BlitFramebuffer will result in an INVALID_FRAMEBUFFER_OPERATION error if the
>-    // multi-view layout of the current draw framebuffer or read framebuffer is not NONE.
>-    if (readFramebuffer->getMultiviewLayout() != GL_NONE)
>+    // current draw framebuffer isMultiview() or the number of
>+    // views in the current read framebuffer is more than one.
>+    if (readFramebuffer->readDisallowedByMultiview())
>     {
>-        context->handleError(InvalidFramebufferOperation()
>-                             << "Attempt to read from a multi-view framebuffer.");
>+        context->validationError(GL_INVALID_FRAMEBUFFER_OPERATION, kBlitFromMultiview);
>         return false;
>     }
>-    if (drawFramebuffer->getMultiviewLayout() != GL_NONE)
>+    if (drawFramebuffer->isMultiview())
>     {
>-        context->handleError(InvalidFramebufferOperation()
>-                             << "Attempt to write to a multi-view framebuffer.");
>+        context->validationError(GL_INVALID_FRAMEBUFFER_OPERATION, kBlitToMultiview);
>         return false;
>     }
> 
>@@ -1463,17 +1493,25 @@ bool ValidateReadPixelsRobustANGLE(Context *context,
>         return false;
>     }
> 
>-    if (!ValidateReadPixelsBase(context, x, y, width, height, format, type, bufSize, length,
>-                                columns, rows, pixels))
>+    GLsizei writeLength  = 0;
>+    GLsizei writeColumns = 0;
>+    GLsizei writeRows    = 0;
>+
>+    if (!ValidateReadPixelsBase(context, x, y, width, height, format, type, bufSize, &writeLength,
>+                                &writeColumns, &writeRows, pixels))
>     {
>         return false;
>     }
> 
>-    if (!ValidateRobustBufferSize(context, bufSize, *length))
>+    if (!ValidateRobustBufferSize(context, bufSize, writeLength))
>     {
>         return false;
>     }
> 
>+    SetRobustLengthParam(length, writeLength);
>+    SetRobustLengthParam(columns, writeColumns);
>+    SetRobustLengthParam(rows, writeRows);
>+
>     return true;
> }
> 
>@@ -1489,7 +1527,7 @@ bool ValidateReadnPixelsEXT(Context *context,
> {
>     if (bufSize < 0)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidValue(), NegativeBufferSize);
>+        context->validationError(GL_INVALID_VALUE, kNegativeBufferSize);
>         return false;
>     }
> 
>@@ -1510,72 +1548,80 @@ bool ValidateReadnPixelsRobustANGLE(Context *context,
>                                     GLsizei *rows,
>                                     void *data)
> {
>+    GLsizei writeLength  = 0;
>+    GLsizei writeColumns = 0;
>+    GLsizei writeRows    = 0;
>+
>     if (!ValidateRobustEntryPoint(context, bufSize))
>     {
>         return false;
>     }
> 
>-    if (!ValidateReadPixelsBase(context, x, y, width, height, format, type, bufSize, length,
>-                                columns, rows, data))
>+    if (!ValidateReadPixelsBase(context, x, y, width, height, format, type, bufSize, &writeLength,
>+                                &writeColumns, &writeRows, data))
>     {
>         return false;
>     }
> 
>-    if (!ValidateRobustBufferSize(context, bufSize, *length))
>+    if (!ValidateRobustBufferSize(context, bufSize, writeLength))
>     {
>         return false;
>     }
> 
>+    SetRobustLengthParam(length, writeLength);
>+    SetRobustLengthParam(columns, writeColumns);
>+    SetRobustLengthParam(rows, writeRows);
>+
>     return true;
> }
> 
>-bool ValidateGenQueriesEXT(gl::Context *context, GLsizei n, GLuint *ids)
>+bool ValidateGenQueriesEXT(Context *context, GLsizei n, GLuint *ids)
> {
>     if (!context->getExtensions().occlusionQueryBoolean &&
>         !context->getExtensions().disjointTimerQuery)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidOperation(), QueryExtensionNotEnabled);
>+        context->validationError(GL_INVALID_OPERATION, kQueryExtensionNotEnabled);
>         return false;
>     }
> 
>     return ValidateGenOrDelete(context, n);
> }
> 
>-bool ValidateDeleteQueriesEXT(gl::Context *context, GLsizei n, const GLuint *ids)
>+bool ValidateDeleteQueriesEXT(Context *context, GLsizei n, const GLuint *ids)
> {
>     if (!context->getExtensions().occlusionQueryBoolean &&
>         !context->getExtensions().disjointTimerQuery)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidOperation(), QueryExtensionNotEnabled);
>+        context->validationError(GL_INVALID_OPERATION, kQueryExtensionNotEnabled);
>         return false;
>     }
> 
>     return ValidateGenOrDelete(context, n);
> }
> 
>-bool ValidateIsQueryEXT(gl::Context *context, GLuint id)
>+bool ValidateIsQueryEXT(Context *context, GLuint id)
> {
>     if (!context->getExtensions().occlusionQueryBoolean &&
>         !context->getExtensions().disjointTimerQuery)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidOperation(), QueryExtensionNotEnabled);
>+        context->validationError(GL_INVALID_OPERATION, kQueryExtensionNotEnabled);
>         return false;
>     }
> 
>     return true;
> }
> 
>-bool ValidateBeginQueryBase(gl::Context *context, GLenum target, GLuint id)
>+bool ValidateBeginQueryBase(Context *context, QueryType target, GLuint id)
> {
>     if (!ValidQueryType(context, target))
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidEnum(), InvalidQueryType);
>+        context->validationError(GL_INVALID_ENUM, kInvalidQueryType);
>         return false;
>     }
> 
>     if (id == 0)
>     {
>-        context->handleError(InvalidOperation() << "Query id is 0");
>+        context->validationError(GL_INVALID_OPERATION, kInvalidQueryId);
>         return false;
>     }
> 
>@@ -1595,9 +1641,9 @@ bool ValidateBeginQueryBase(gl::Context *context, GLenum target, GLuint id)
>     //       of GL_ANY_SAMPLES_PASSED_EXT and GL_ANY_SAMPLES_PASSED_CONSERVATIVE_EXT,
>     //       no query may be active for either if glBeginQuery targets either.
> 
>-    if (context->getGLState().isQueryActive(target))
>+    if (context->getState().isQueryActive(target))
>     {
>-        context->handleError(InvalidOperation() << "Other query is active");
>+        context->validationError(GL_INVALID_OPERATION, kOtherQueryActive);
>         return false;
>     }
> 
>@@ -1606,125 +1652,125 @@ bool ValidateBeginQueryBase(gl::Context *context, GLenum target, GLuint id)
>     // check that name was obtained with glGenQueries
>     if (!queryObject)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidOperation(), InvalidQueryId);
>+        context->validationError(GL_INVALID_OPERATION, kInvalidQueryId);
>         return false;
>     }
> 
>     // check for type mismatch
>     if (queryObject->getType() != target)
>     {
>-        context->handleError(InvalidOperation() << "Query type does not match target");
>+        context->validationError(GL_INVALID_OPERATION, kQueryTargetMismatch);
>         return false;
>     }
> 
>     return true;
> }
> 
>-bool ValidateBeginQueryEXT(gl::Context *context, GLenum target, GLuint id)
>+bool ValidateBeginQueryEXT(Context *context, QueryType target, GLuint id)
> {
>     if (!context->getExtensions().occlusionQueryBoolean &&
>         !context->getExtensions().disjointTimerQuery && !context->getExtensions().syncQuery)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidOperation(), QueryExtensionNotEnabled);
>+        context->validationError(GL_INVALID_OPERATION, kQueryExtensionNotEnabled);
>         return false;
>     }
> 
>     return ValidateBeginQueryBase(context, target, id);
> }
> 
>-bool ValidateEndQueryBase(gl::Context *context, GLenum target)
>+bool ValidateEndQueryBase(Context *context, QueryType target)
> {
>     if (!ValidQueryType(context, target))
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidEnum(), InvalidQueryType);
>+        context->validationError(GL_INVALID_ENUM, kInvalidQueryType);
>         return false;
>     }
> 
>-    const Query *queryObject = context->getGLState().getActiveQuery(target);
>+    const Query *queryObject = context->getState().getActiveQuery(target);
> 
>     if (queryObject == nullptr)
>     {
>-        context->handleError(InvalidOperation() << "Query target not active");
>+        context->validationError(GL_INVALID_OPERATION, kQueryInactive);
>         return false;
>     }
> 
>     return true;
> }
> 
>-bool ValidateEndQueryEXT(gl::Context *context, GLenum target)
>+bool ValidateEndQueryEXT(Context *context, QueryType target)
> {
>     if (!context->getExtensions().occlusionQueryBoolean &&
>         !context->getExtensions().disjointTimerQuery && !context->getExtensions().syncQuery)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidOperation(), QueryExtensionNotEnabled);
>+        context->validationError(GL_INVALID_OPERATION, kQueryExtensionNotEnabled);
>         return false;
>     }
> 
>     return ValidateEndQueryBase(context, target);
> }
> 
>-bool ValidateQueryCounterEXT(Context *context, GLuint id, GLenum target)
>+bool ValidateQueryCounterEXT(Context *context, GLuint id, QueryType target)
> {
>     if (!context->getExtensions().disjointTimerQuery)
>     {
>-        context->handleError(InvalidOperation() << "Disjoint timer query not enabled");
>+        context->validationError(GL_INVALID_OPERATION, kExtensionNotEnabled);
>         return false;
>     }
> 
>-    if (target != GL_TIMESTAMP_EXT)
>+    if (target != QueryType::Timestamp)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidEnum(), InvalidQueryTarget);
>+        context->validationError(GL_INVALID_ENUM, kInvalidQueryTarget);
>         return false;
>     }
> 
>     Query *queryObject = context->getQuery(id, true, target);
>     if (queryObject == nullptr)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidOperation(), InvalidQueryId);
>+        context->validationError(GL_INVALID_OPERATION, kInvalidQueryId);
>         return false;
>     }
> 
>-    if (context->getGLState().isQueryActive(queryObject))
>+    if (context->getState().isQueryActive(queryObject))
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidOperation(), QueryActive);
>+        context->validationError(GL_INVALID_OPERATION, kQueryActive);
>         return false;
>     }
> 
>     return true;
> }
> 
>-bool ValidateGetQueryivBase(Context *context, GLenum target, GLenum pname, GLsizei *numParams)
>+bool ValidateGetQueryivBase(Context *context, QueryType target, GLenum pname, GLsizei *numParams)
> {
>     if (numParams)
>     {
>         *numParams = 0;
>     }
> 
>-    if (!ValidQueryType(context, target) && target != GL_TIMESTAMP_EXT)
>+    if (!ValidQueryType(context, target) && target != QueryType::Timestamp)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidEnum(), InvalidQueryType);
>+        context->validationError(GL_INVALID_ENUM, kInvalidQueryType);
>         return false;
>     }
> 
>     switch (pname)
>     {
>         case GL_CURRENT_QUERY_EXT:
>-            if (target == GL_TIMESTAMP_EXT)
>+            if (target == QueryType::Timestamp)
>             {
>-                context->handleError(InvalidEnum() << "Cannot use current query for timestamp");
>+                context->validationError(GL_INVALID_ENUM, kInvalidQueryTarget);
>                 return false;
>             }
>             break;
>         case GL_QUERY_COUNTER_BITS_EXT:
>             if (!context->getExtensions().disjointTimerQuery ||
>-                (target != GL_TIMESTAMP_EXT && target != GL_TIME_ELAPSED_EXT))
>+                (target != QueryType::Timestamp && target != QueryType::TimeElapsed))
>             {
>-                ANGLE_VALIDATION_ERR(context, InvalidEnum(), InvalidPname);
>+                context->validationError(GL_INVALID_ENUM, kInvalidPname);
>                 return false;
>             }
>             break;
>         default:
>-            ANGLE_VALIDATION_ERR(context, InvalidEnum(), InvalidPname);
>+            context->validationError(GL_INVALID_ENUM, kInvalidPname);
>             return false;
>     }
> 
>@@ -1737,12 +1783,12 @@ bool ValidateGetQueryivBase(Context *context, GLenum target, GLenum pname, GLsiz
>     return true;
> }
> 
>-bool ValidateGetQueryivEXT(Context *context, GLenum target, GLenum pname, GLint *params)
>+bool ValidateGetQueryivEXT(Context *context, QueryType target, GLenum pname, GLint *params)
> {
>     if (!context->getExtensions().occlusionQueryBoolean &&
>         !context->getExtensions().disjointTimerQuery && !context->getExtensions().syncQuery)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidOperation(), ExtensionNotEnabled);
>+        context->validationError(GL_INVALID_OPERATION, kExtensionNotEnabled);
>         return false;
>     }
> 
>@@ -1750,7 +1796,7 @@ bool ValidateGetQueryivEXT(Context *context, GLenum target, GLenum pname, GLint
> }
> 
> bool ValidateGetQueryivRobustANGLE(Context *context,
>-                                   GLenum target,
>+                                   QueryType target,
>                                    GLenum pname,
>                                    GLsizei bufSize,
>                                    GLsizei *length,
>@@ -1761,16 +1807,20 @@ bool ValidateGetQueryivRobustANGLE(Context *context,
>         return false;
>     }
> 
>-    if (!ValidateGetQueryivBase(context, target, pname, length))
>+    GLsizei numParams = 0;
>+
>+    if (!ValidateGetQueryivBase(context, target, pname, &numParams))
>     {
>         return false;
>     }
> 
>-    if (!ValidateRobustBufferSize(context, bufSize, *length))
>+    if (!ValidateRobustBufferSize(context, bufSize, numParams))
>     {
>         return false;
>     }
> 
>+    SetRobustLengthParam(length, numParams);
>+
>     return true;
> }
> 
>@@ -1778,20 +1828,36 @@ bool ValidateGetQueryObjectValueBase(Context *context, GLuint id, GLenum pname,
> {
>     if (numParams)
>     {
>-        *numParams = 0;
>+        *numParams = 1;
>+    }
>+
>+    if (context->isContextLost())
>+    {
>+        context->validationError(GL_CONTEXT_LOST, kContextLost);
>+
>+        if (pname == GL_QUERY_RESULT_AVAILABLE_EXT)
>+        {
>+            // Generate an error but still return true, the context still needs to return a
>+            // value in this case.
>+            return true;
>+        }
>+        else
>+        {
>+            return false;
>+        }
>     }
> 
>-    Query *queryObject = context->getQuery(id, false, GL_NONE);
>+    Query *queryObject = context->getQuery(id, false, QueryType::InvalidEnum);
> 
>     if (!queryObject)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidOperation(), InvalidQueryId);
>+        context->validationError(GL_INVALID_OPERATION, kInvalidQueryId);
>         return false;
>     }
> 
>-    if (context->getGLState().isQueryActive(queryObject))
>+    if (context->getState().isQueryActive(queryObject))
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidOperation(), QueryActive);
>+        context->validationError(GL_INVALID_OPERATION, kQueryActive);
>         return false;
>     }
> 
>@@ -1802,15 +1868,10 @@ bool ValidateGetQueryObjectValueBase(Context *context, GLuint id, GLenum pname,
>             break;
> 
>         default:
>-            ANGLE_VALIDATION_ERR(context, InvalidEnum(), EnumNotSupported);
>+            context->validationError(GL_INVALID_ENUM, kEnumNotSupported);
>             return false;
>     }
> 
>-    if (numParams)
>-    {
>-        *numParams = 1;
>-    }
>-
>     return true;
> }
> 
>@@ -1818,7 +1879,7 @@ bool ValidateGetQueryObjectivEXT(Context *context, GLuint id, GLenum pname, GLin
> {
>     if (!context->getExtensions().disjointTimerQuery)
>     {
>-        context->handleError(InvalidOperation() << "Timer query extension not enabled");
>+        context->validationError(GL_INVALID_OPERATION, kExtensionNotEnabled);
>         return false;
>     }
>     return ValidateGetQueryObjectValueBase(context, id, pname, nullptr);
>@@ -1833,7 +1894,7 @@ bool ValidateGetQueryObjectivRobustANGLE(Context *context,
> {
>     if (!context->getExtensions().disjointTimerQuery)
>     {
>-        context->handleError(InvalidOperation() << "Timer query extension not enabled");
>+        context->validationError(GL_INVALID_OPERATION, kExtensionNotEnabled);
>         return false;
>     }
> 
>@@ -1842,16 +1903,20 @@ bool ValidateGetQueryObjectivRobustANGLE(Context *context,
>         return false;
>     }
> 
>-    if (!ValidateGetQueryObjectValueBase(context, id, pname, length))
>+    GLsizei numParams = 0;
>+
>+    if (!ValidateGetQueryObjectValueBase(context, id, pname, &numParams))
>     {
>         return false;
>     }
> 
>-    if (!ValidateRobustBufferSize(context, bufSize, *length))
>+    if (!ValidateRobustBufferSize(context, bufSize, numParams))
>     {
>         return false;
>     }
> 
>+    SetRobustLengthParam(length, numParams);
>+
>     return true;
> }
> 
>@@ -1860,7 +1925,7 @@ bool ValidateGetQueryObjectuivEXT(Context *context, GLuint id, GLenum pname, GLu
>     if (!context->getExtensions().disjointTimerQuery &&
>         !context->getExtensions().occlusionQueryBoolean && !context->getExtensions().syncQuery)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidOperation(), ExtensionNotEnabled);
>+        context->validationError(GL_INVALID_OPERATION, kExtensionNotEnabled);
>         return false;
>     }
>     return ValidateGetQueryObjectValueBase(context, id, pname, nullptr);
>@@ -1876,7 +1941,7 @@ bool ValidateGetQueryObjectuivRobustANGLE(Context *context,
>     if (!context->getExtensions().disjointTimerQuery &&
>         !context->getExtensions().occlusionQueryBoolean && !context->getExtensions().syncQuery)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidOperation(), ExtensionNotEnabled);
>+        context->validationError(GL_INVALID_OPERATION, kExtensionNotEnabled);
>         return false;
>     }
> 
>@@ -1885,16 +1950,20 @@ bool ValidateGetQueryObjectuivRobustANGLE(Context *context,
>         return false;
>     }
> 
>-    if (!ValidateGetQueryObjectValueBase(context, id, pname, length))
>+    GLsizei numParams = 0;
>+
>+    if (!ValidateGetQueryObjectValueBase(context, id, pname, &numParams))
>     {
>         return false;
>     }
> 
>-    if (!ValidateRobustBufferSize(context, bufSize, *length))
>+    if (!ValidateRobustBufferSize(context, bufSize, numParams))
>     {
>         return false;
>     }
> 
>+    SetRobustLengthParam(length, numParams);
>+
>     return true;
> }
> 
>@@ -1902,7 +1971,7 @@ bool ValidateGetQueryObjecti64vEXT(Context *context, GLuint id, GLenum pname, GL
> {
>     if (!context->getExtensions().disjointTimerQuery)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidOperation(), ExtensionNotEnabled);
>+        context->validationError(GL_INVALID_OPERATION, kExtensionNotEnabled);
>         return false;
>     }
>     return ValidateGetQueryObjectValueBase(context, id, pname, nullptr);
>@@ -1917,7 +1986,7 @@ bool ValidateGetQueryObjecti64vRobustANGLE(Context *context,
> {
>     if (!context->getExtensions().disjointTimerQuery)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidOperation(), ExtensionNotEnabled);
>+        context->validationError(GL_INVALID_OPERATION, kExtensionNotEnabled);
>         return false;
>     }
> 
>@@ -1926,16 +1995,20 @@ bool ValidateGetQueryObjecti64vRobustANGLE(Context *context,
>         return false;
>     }
> 
>-    if (!ValidateGetQueryObjectValueBase(context, id, pname, length))
>+    GLsizei numParams = 0;
>+
>+    if (!ValidateGetQueryObjectValueBase(context, id, pname, &numParams))
>     {
>         return false;
>     }
> 
>-    if (!ValidateRobustBufferSize(context, bufSize, *length))
>+    if (!ValidateRobustBufferSize(context, bufSize, numParams))
>     {
>         return false;
>     }
> 
>+    SetRobustLengthParam(length, numParams);
>+
>     return true;
> }
> 
>@@ -1943,7 +2016,7 @@ bool ValidateGetQueryObjectui64vEXT(Context *context, GLuint id, GLenum pname, G
> {
>     if (!context->getExtensions().disjointTimerQuery)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidOperation(), ExtensionNotEnabled);
>+        context->validationError(GL_INVALID_OPERATION, kExtensionNotEnabled);
>         return false;
>     }
>     return ValidateGetQueryObjectValueBase(context, id, pname, nullptr);
>@@ -1958,7 +2031,7 @@ bool ValidateGetQueryObjectui64vRobustANGLE(Context *context,
> {
>     if (!context->getExtensions().disjointTimerQuery)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidOperation(), ExtensionNotEnabled);
>+        context->validationError(GL_INVALID_OPERATION, kExtensionNotEnabled);
>         return false;
>     }
> 
>@@ -1967,21 +2040,25 @@ bool ValidateGetQueryObjectui64vRobustANGLE(Context *context,
>         return false;
>     }
> 
>-    if (!ValidateGetQueryObjectValueBase(context, id, pname, length))
>+    GLsizei numParams = 0;
>+
>+    if (!ValidateGetQueryObjectValueBase(context, id, pname, &numParams))
>     {
>         return false;
>     }
> 
>-    if (!ValidateRobustBufferSize(context, bufSize, *length))
>+    if (!ValidateRobustBufferSize(context, bufSize, numParams))
>     {
>         return false;
>     }
> 
>+    SetRobustLengthParam(length, numParams);
>+
>     return true;
> }
> 
>-bool ValidateUniformCommonBase(ValidationContext *context,
>-                               gl::Program *program,
>+bool ValidateUniformCommonBase(Context *context,
>+                               Program *program,
>                                GLint location,
>                                GLsizei count,
>                                const LinkedUniform **uniformOut)
>@@ -1989,19 +2066,19 @@ bool ValidateUniformCommonBase(ValidationContext *context,
>     // TODO(Jiajia): Add image uniform check in future.
>     if (count < 0)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidValue(), NegativeCount);
>+        context->validationError(GL_INVALID_VALUE, kNegativeCount);
>         return false;
>     }
> 
>     if (!program)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidOperation(), InvalidProgramName);
>+        context->validationError(GL_INVALID_OPERATION, kInvalidProgramName);
>         return false;
>     }
> 
>     if (!program->isLinked())
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidOperation(), ProgramNotLinked);
>+        context->validationError(GL_INVALID_OPERATION, kProgramNotLinked);
>         return false;
>     }
> 
>@@ -2015,7 +2092,7 @@ bool ValidateUniformCommonBase(ValidationContext *context,
>     size_t castedLocation        = static_cast<size_t>(location);
>     if (castedLocation >= uniformLocations.size())
>     {
>-        context->handleError(InvalidOperation() << "Invalid uniform location");
>+        context->validationError(GL_INVALID_OPERATION, kInvalidUniformLocation);
>         return false;
>     }
> 
>@@ -2028,16 +2105,16 @@ bool ValidateUniformCommonBase(ValidationContext *context,
> 
>     if (!uniformLocation.used())
>     {
>-        context->handleError(InvalidOperation());
>+        context->validationError(GL_INVALID_OPERATION, kInvalidUniformLocation);
>         return false;
>     }
> 
>     const auto &uniform = program->getUniformByIndex(uniformLocation.index);
> 
>     // attempting to write an array to a non-array uniform is an INVALID_OPERATION
>-    if (!uniform.isArray() && count > 1)
>+    if (count > 1 && !uniform.isArray())
>     {
>-        context->handleError(InvalidOperation());
>+        context->validationError(GL_INVALID_OPERATION, kInvalidUniformCount);
>         return false;
>     }
> 
>@@ -2045,7 +2122,7 @@ bool ValidateUniformCommonBase(ValidationContext *context,
>     return true;
> }
> 
>-bool ValidateUniform1ivValue(ValidationContext *context,
>+bool ValidateUniform1ivValue(Context *context,
>                              GLenum uniformType,
>                              GLsizei count,
>                              const GLint *value)
>@@ -2066,31 +2143,18 @@ bool ValidateUniform1ivValue(ValidationContext *context,
>         {
>             if (value[i] < 0 || value[i] >= max)
>             {
>-                context->handleError(InvalidValue() << "sampler uniform value out of range");
>+                context->validationError(GL_INVALID_VALUE, kSamplerUniformValueOutOfRange);
>                 return false;
>             }
>         }
>         return true;
>     }
> 
>-    context->handleError(InvalidOperation() << "wrong type of value for uniform");
>-    return false;
>-}
>-
>-bool ValidateUniformValue(ValidationContext *context, GLenum valueType, GLenum uniformType)
>-{
>-    // Check that the value type is compatible with uniform type.
>-    // Do the cheaper test first, for a little extra speed.
>-    if (valueType == uniformType || VariableBoolVectorType(valueType) == uniformType)
>-    {
>-        return true;
>-    }
>-
>-    ANGLE_VALIDATION_ERR(context, InvalidOperation(), UniformSizeMismatch);
>+    context->validationError(GL_INVALID_OPERATION, kUniformTypeMismatch);
>     return false;
> }
> 
>-bool ValidateUniformMatrixValue(ValidationContext *context, GLenum valueType, GLenum uniformType)
>+bool ValidateUniformMatrixValue(Context *context, GLenum valueType, GLenum uniformType)
> {
>     // Check that the value type is compatible with uniform type.
>     if (valueType == uniformType)
>@@ -2098,30 +2162,27 @@ bool ValidateUniformMatrixValue(ValidationContext *context, GLenum valueType, GL
>         return true;
>     }
> 
>-    context->handleError(InvalidOperation() << "wrong type of value for uniform");
>+    context->validationError(GL_INVALID_OPERATION, kUniformTypeMismatch);
>     return false;
> }
> 
>-bool ValidateUniform(ValidationContext *context, GLenum valueType, GLint location, GLsizei count)
>+bool ValidateUniform(Context *context, GLenum valueType, GLint location, GLsizei count)
> {
>     const LinkedUniform *uniform = nullptr;
>-    gl::Program *programObject   = context->getGLState().getProgram();
>+    Program *programObject       = context->getState().getLinkedProgram(context);
>     return ValidateUniformCommonBase(context, programObject, location, count, &uniform) &&
>            ValidateUniformValue(context, valueType, uniform->type);
> }
> 
>-bool ValidateUniform1iv(ValidationContext *context,
>-                        GLint location,
>-                        GLsizei count,
>-                        const GLint *value)
>+bool ValidateUniform1iv(Context *context, GLint location, GLsizei count, const GLint *value)
> {
>     const LinkedUniform *uniform = nullptr;
>-    gl::Program *programObject   = context->getGLState().getProgram();
>+    Program *programObject       = context->getState().getLinkedProgram(context);
>     return ValidateUniformCommonBase(context, programObject, location, count, &uniform) &&
>            ValidateUniform1ivValue(context, uniform->type, count, value);
> }
> 
>-bool ValidateUniformMatrix(ValidationContext *context,
>+bool ValidateUniformMatrix(Context *context,
>                            GLenum valueType,
>                            GLint location,
>                            GLsizei count,
>@@ -2129,24 +2190,21 @@ bool ValidateUniformMatrix(ValidationContext *context,
> {
>     if (ConvertToBool(transpose) && context->getClientMajorVersion() < 3)
>     {
>-        context->handleError(InvalidValue());
>+        context->validationError(GL_INVALID_VALUE, kES3Required);
>         return false;
>     }
> 
>     const LinkedUniform *uniform = nullptr;
>-    gl::Program *programObject   = context->getGLState().getProgram();
>+    Program *programObject       = context->getState().getLinkedProgram(context);
>     return ValidateUniformCommonBase(context, programObject, location, count, &uniform) &&
>            ValidateUniformMatrixValue(context, valueType, uniform->type);
> }
> 
>-bool ValidateStateQuery(ValidationContext *context,
>-                        GLenum pname,
>-                        GLenum *nativeType,
>-                        unsigned int *numParams)
>+bool ValidateStateQuery(Context *context, GLenum pname, GLenum *nativeType, unsigned int *numParams)
> {
>     if (!context->getQueryParameterInfo(pname, nativeType, numParams))
>     {
>-        context->handleError(InvalidEnum());
>+        context->validationError(GL_INVALID_ENUM, kInvalidPname);
>         return false;
>     }
> 
>@@ -2158,7 +2216,7 @@ bool ValidateStateQuery(ValidationContext *context,
> 
>         if (colorAttachment >= caps.maxDrawBuffers)
>         {
>-            context->handleError(InvalidOperation());
>+            context->validationError(GL_INVALID_OPERATION, kIndexExceedsMaxDrawBuffer);
>             return false;
>         }
>     }
>@@ -2171,11 +2229,17 @@ bool ValidateStateQuery(ValidationContext *context,
>         case GL_TEXTURE_BINDING_2D_ARRAY:
>         case GL_TEXTURE_BINDING_2D_MULTISAMPLE:
>             break;
>+        case GL_TEXTURE_BINDING_2D_MULTISAMPLE_ARRAY:
>+            if (!context->getExtensions().textureStorageMultisample2DArray)
>+            {
>+                context->validationError(GL_INVALID_ENUM, kMultisampleArrayExtensionRequired);
>+                return false;
>+            }
>+            break;
>         case GL_TEXTURE_BINDING_RECTANGLE_ANGLE:
>             if (!context->getExtensions().textureRectangle)
>             {
>-                context->handleError(InvalidEnum()
>-                                     << "ANGLE_texture_rectangle extension not present");
>+                context->validationError(GL_INVALID_ENUM, kEnumNotSupported);
>                 return false;
>             }
>             break;
>@@ -2183,9 +2247,7 @@ bool ValidateStateQuery(ValidationContext *context,
>             if (!context->getExtensions().eglStreamConsumerExternal &&
>                 !context->getExtensions().eglImageExternal)
>             {
>-                context->handleError(InvalidEnum() << "Neither NV_EGL_stream_consumer_external "
>-                                                      "nor GL_OES_EGL_image_external "
>-                                                      "extensions enabled");
>+                context->validationError(GL_INVALID_ENUM, kEnumNotSupported);
>                 return false;
>             }
>             break;
>@@ -2193,26 +2255,24 @@ bool ValidateStateQuery(ValidationContext *context,
>         case GL_IMPLEMENTATION_COLOR_READ_TYPE:
>         case GL_IMPLEMENTATION_COLOR_READ_FORMAT:
>         {
>-            if (context->getGLState().getReadFramebuffer()->checkStatus(context) !=
>-                GL_FRAMEBUFFER_COMPLETE)
>+            Framebuffer *readFramebuffer = context->getState().getReadFramebuffer();
>+            ASSERT(readFramebuffer);
>+
>+            if (!ValidateFramebufferComplete<GL_INVALID_OPERATION>(context, readFramebuffer))
>             {
>-                context->handleError(InvalidOperation());
>                 return false;
>             }
> 
>-            const Framebuffer *framebuffer = context->getGLState().getReadFramebuffer();
>-            ASSERT(framebuffer);
>-
>-            if (framebuffer->getReadBufferState() == GL_NONE)
>+            if (readFramebuffer->getReadBufferState() == GL_NONE)
>             {
>-                ANGLE_VALIDATION_ERR(context, InvalidOperation(), ReadBufferNone);
>+                context->validationError(GL_INVALID_OPERATION, kReadBufferNone);
>                 return false;
>             }
> 
>-            const FramebufferAttachment *attachment = framebuffer->getReadColorbuffer();
>+            const FramebufferAttachment *attachment = readFramebuffer->getReadColorbuffer();
>             if (!attachment)
>             {
>-                context->handleError(InvalidOperation());
>+                context->validationError(GL_INVALID_OPERATION, kReadBufferNotAttached);
>                 return false;
>             }
>         }
>@@ -2231,7 +2291,88 @@ bool ValidateStateQuery(ValidationContext *context,
>     return true;
> }
> 
>-bool ValidateRobustStateQuery(ValidationContext *context,
>+bool ValidateGetBooleanvRobustANGLE(Context *context,
>+                                    GLenum pname,
>+                                    GLsizei bufSize,
>+                                    GLsizei *length,
>+                                    GLboolean *params)
>+{
>+    GLenum nativeType;
>+    unsigned int numParams = 0;
>+
>+    if (!ValidateRobustStateQuery(context, pname, bufSize, &nativeType, &numParams))
>+    {
>+        return false;
>+    }
>+
>+    SetRobustLengthParam(length, numParams);
>+
>+    return true;
>+}
>+
>+bool ValidateGetFloatvRobustANGLE(Context *context,
>+                                  GLenum pname,
>+                                  GLsizei bufSize,
>+                                  GLsizei *length,
>+                                  GLfloat *params)
>+{
>+    GLenum nativeType;
>+    unsigned int numParams = 0;
>+
>+    if (!ValidateRobustStateQuery(context, pname, bufSize, &nativeType, &numParams))
>+    {
>+        return false;
>+    }
>+
>+    SetRobustLengthParam(length, numParams);
>+
>+    return true;
>+}
>+
>+bool ValidateGetIntegervRobustANGLE(Context *context,
>+                                    GLenum pname,
>+                                    GLsizei bufSize,
>+                                    GLsizei *length,
>+                                    GLint *data)
>+{
>+    GLenum nativeType;
>+    unsigned int numParams = 0;
>+
>+    if (!ValidateRobustStateQuery(context, pname, bufSize, &nativeType, &numParams))
>+    {
>+        return false;
>+    }
>+
>+    SetRobustLengthParam(length, numParams);
>+
>+    return true;
>+}
>+
>+bool ValidateGetInteger64vRobustANGLE(Context *context,
>+                                      GLenum pname,
>+                                      GLsizei bufSize,
>+                                      GLsizei *length,
>+                                      GLint64 *data)
>+{
>+    GLenum nativeType;
>+    unsigned int numParams = 0;
>+
>+    if (!ValidateRobustStateQuery(context, pname, bufSize, &nativeType, &numParams))
>+    {
>+        return false;
>+    }
>+
>+    if (nativeType == GL_INT_64_ANGLEX)
>+    {
>+        CastStateValues(context, nativeType, pname, numParams, data);
>+        return false;
>+    }
>+
>+    SetRobustLengthParam(length, numParams);
>+    return true;
>+}
>+
>+bool ValidateRobustStateQuery(Context *context,
>                               GLenum pname,
>                               GLsizei bufSize,
>                               GLenum *nativeType,
>@@ -2255,8 +2396,8 @@ bool ValidateRobustStateQuery(ValidationContext *context,
>     return true;
> }
> 
>-bool ValidateCopyTexImageParametersBase(ValidationContext *context,
>-                                        GLenum target,
>+bool ValidateCopyTexImageParametersBase(Context *context,
>+                                        TextureTarget target,
>                                         GLint level,
>                                         GLenum internalformat,
>                                         bool isSubImage,
>@@ -2270,54 +2411,54 @@ bool ValidateCopyTexImageParametersBase(ValidationContext *context,
>                                         GLint border,
>                                         Format *textureFormatOut)
> {
>+    TextureType texType = TextureTargetToType(target);
>+
>     if (xoffset < 0 || yoffset < 0 || zoffset < 0)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidValue(), NegativeOffset);
>+        context->validationError(GL_INVALID_VALUE, kNegativeOffset);
>         return false;
>     }
> 
>     if (width < 0 || height < 0)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidValue(), NegativeSize);
>+        context->validationError(GL_INVALID_VALUE, kNegativeSize);
>         return false;
>     }
> 
>     if (std::numeric_limits<GLsizei>::max() - xoffset < width ||
>         std::numeric_limits<GLsizei>::max() - yoffset < height)
>     {
>-        context->handleError(InvalidValue());
>+        context->validationError(GL_INVALID_VALUE, kOffsetOverflow);
>         return false;
>     }
> 
>     if (border != 0)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidValue(), InvalidBorder);
>+        context->validationError(GL_INVALID_VALUE, kInvalidBorder);
>         return false;
>     }
> 
>-    if (!ValidMipLevel(context, target, level))
>+    if (!ValidMipLevel(context, texType, level))
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidValue(), InvalidMipLevel);
>+        context->validationError(GL_INVALID_VALUE, kInvalidMipLevel);
>         return false;
>     }
> 
>-    const auto &state    = context->getGLState();
>+    const State &state           = context->getState();
>     Framebuffer *readFramebuffer = state.getReadFramebuffer();
>-    if (readFramebuffer->checkStatus(context) != GL_FRAMEBUFFER_COMPLETE)
>+    if (!ValidateFramebufferComplete(context, readFramebuffer))
>     {
>-        context->handleError(InvalidFramebufferOperation());
>         return false;
>     }
> 
>-    if (readFramebuffer->id() != 0 && readFramebuffer->getSamples(context) != 0)
>+    if (readFramebuffer->id() != 0 && !ValidateFramebufferNotMultisampled(context, readFramebuffer))
>     {
>-        context->handleError(InvalidOperation());
>         return false;
>     }
> 
>     if (readFramebuffer->getReadBufferState() == GL_NONE)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidOperation(), ReadBufferNone);
>+        context->validationError(GL_INVALID_OPERATION, kReadBufferNone);
>         return false;
>     }
> 
>@@ -2328,77 +2469,71 @@ bool ValidateCopyTexImageParametersBase(ValidationContext *context,
>     const FramebufferAttachment *source = readFramebuffer->getReadColorbuffer();
>     if (source == nullptr)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidOperation(), MissingReadAttachment);
>+        context->validationError(GL_INVALID_OPERATION, kMissingReadAttachment);
>         return false;
>     }
> 
>     // ANGLE_multiview spec, Revision 1:
>     // Calling CopyTexSubImage3D, CopyTexImage2D, or CopyTexSubImage2D will result in an
>     // INVALID_FRAMEBUFFER_OPERATION error if the multi-view layout of the current read framebuffer
>-    // is not NONE.
>-    if (source->getMultiviewLayout() != GL_NONE)
>+    // is FRAMEBUFFER_MULTIVIEW_SIDE_BY_SIDE_ANGLE or the number of views in the current read
>+    // framebuffer is more than one.
>+    if (readFramebuffer->readDisallowedByMultiview())
>     {
>-        context->handleError(InvalidFramebufferOperation()
>-                             << "The active read framebuffer object has multiview attachments.");
>+        context->validationError(GL_INVALID_FRAMEBUFFER_OPERATION, kMultiviewReadFramebuffer);
>         return false;
>     }
> 
>-    const gl::Caps &caps = context->getCaps();
>+    const Caps &caps = context->getCaps();
> 
>     GLuint maxDimension = 0;
>-    switch (target)
>+    switch (texType)
>     {
>-        case GL_TEXTURE_2D:
>+        case TextureType::_2D:
>             maxDimension = caps.max2DTextureSize;
>             break;
> 
>-        case GL_TEXTURE_CUBE_MAP_POSITIVE_X:
>-        case GL_TEXTURE_CUBE_MAP_NEGATIVE_X:
>-        case GL_TEXTURE_CUBE_MAP_POSITIVE_Y:
>-        case GL_TEXTURE_CUBE_MAP_NEGATIVE_Y:
>-        case GL_TEXTURE_CUBE_MAP_POSITIVE_Z:
>-        case GL_TEXTURE_CUBE_MAP_NEGATIVE_Z:
>+        case TextureType::CubeMap:
>             maxDimension = caps.maxCubeMapTextureSize;
>             break;
> 
>-        case GL_TEXTURE_RECTANGLE_ANGLE:
>+        case TextureType::Rectangle:
>             maxDimension = caps.maxRectangleTextureSize;
>             break;
> 
>-        case GL_TEXTURE_2D_ARRAY:
>+        case TextureType::_2DArray:
>             maxDimension = caps.max2DTextureSize;
>             break;
> 
>-        case GL_TEXTURE_3D:
>+        case TextureType::_3D:
>             maxDimension = caps.max3DTextureSize;
>             break;
> 
>         default:
>-            context->handleError(InvalidEnum());
>+            context->validationError(GL_INVALID_ENUM, kInvalidTextureTarget);
>             return false;
>     }
> 
>-    gl::Texture *texture =
>-        state.getTargetTexture(IsCubeMapTextureTarget(target) ? GL_TEXTURE_CUBE_MAP : target);
>+    Texture *texture = state.getTargetTexture(texType);
>     if (!texture)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidOperation(), TextureNotBound);
>+        context->validationError(GL_INVALID_OPERATION, kTextureNotBound);
>         return false;
>     }
> 
>     if (texture->getImmutableFormat() && !isSubImage)
>     {
>-        context->handleError(InvalidOperation());
>+        context->validationError(GL_INVALID_OPERATION, kTextureIsImmutable);
>         return false;
>     }
> 
>-    const gl::InternalFormat &formatInfo =
>+    const InternalFormat &formatInfo =
>         isSubImage ? *texture->getFormat(target, level).info
>-                   : gl::GetInternalFormatInfo(internalformat, GL_UNSIGNED_BYTE);
>+                   : GetInternalFormatInfo(internalformat, GL_UNSIGNED_BYTE);
> 
>     if (formatInfo.depthBits > 0 || formatInfo.compressed)
>     {
>-        context->handleError(InvalidOperation());
>+        context->validationError(GL_INVALID_OPERATION, kInvalidFormat);
>         return false;
>     }
> 
>@@ -2408,21 +2543,21 @@ bool ValidateCopyTexImageParametersBase(ValidationContext *context,
>             static_cast<size_t>(yoffset + height) > texture->getHeight(target, level) ||
>             static_cast<size_t>(zoffset) >= texture->getDepth(target, level))
>         {
>-            context->handleError(InvalidValue());
>+            context->validationError(GL_INVALID_VALUE, kOffsetOverflow);
>             return false;
>         }
>     }
>     else
>     {
>-        if (IsCubeMapTextureTarget(target) && width != height)
>+        if (texType == TextureType::CubeMap && width != height)
>         {
>-            ANGLE_VALIDATION_ERR(context, InvalidValue(), CubemapIncomplete);
>+            context->validationError(GL_INVALID_VALUE, kCubemapIncomplete);
>             return false;
>         }
> 
>         if (!formatInfo.textureSupport(context->getClientVersion(), context->getExtensions()))
>         {
>-            ANGLE_VALIDATION_ERR(context, InvalidEnum(), EnumNotSupported);
>+            context->validationError(GL_INVALID_ENUM, kEnumNotSupported);
>             return false;
>         }
> 
>@@ -2430,7 +2565,7 @@ bool ValidateCopyTexImageParametersBase(ValidationContext *context,
>         if (static_cast<int>(width) > maxLevelDimension ||
>             static_cast<int>(height) > maxLevelDimension)
>         {
>-            ANGLE_VALIDATION_ERR(context, InvalidValue(), ResourceMaxTextureSize);
>+            context->validationError(GL_INVALID_VALUE, kResourceMaxTextureSize);
>             return false;
>         }
>     }
>@@ -2445,7 +2580,7 @@ bool ValidateCopyTexImageParametersBase(ValidationContext *context,
>     {
>         if (readFramebuffer->formsCopyingFeedbackLoopWith(texture->id(), level, zoffset))
>         {
>-            ANGLE_VALIDATION_ERR(context, InvalidOperation(), FeedbackLoop);
>+            context->validationError(GL_INVALID_OPERATION, kFeedbackLoop);
>             return false;
>         }
>     }
>@@ -2453,262 +2588,294 @@ bool ValidateCopyTexImageParametersBase(ValidationContext *context,
>     return true;
> }
> 
>-bool ValidateDrawBase(ValidationContext *context, GLenum mode, GLsizei count)
>+// Note all errors returned from this function are INVALID_OPERATION except for the draw framebuffer
>+// completeness check.
>+const char *ValidateDrawStates(Context *context)
> {
>-    switch (mode)
>-    {
>-        case GL_POINTS:
>-        case GL_LINES:
>-        case GL_LINE_LOOP:
>-        case GL_LINE_STRIP:
>-        case GL_TRIANGLES:
>-        case GL_TRIANGLE_STRIP:
>-        case GL_TRIANGLE_FAN:
>-            break;
>-        default:
>-            ANGLE_VALIDATION_ERR(context, InvalidEnum(), InvalidDrawMode);
>-            return false;
>-    }
>-
>-    if (count < 0)
>-    {
>-        ANGLE_VALIDATION_ERR(context, InvalidValue(), NegativeCount);
>-        return false;
>-    }
>-
>-    const State &state = context->getGLState();
>-
>     const Extensions &extensions = context->getExtensions();
>+    const State &state           = context->getState();
> 
>     // WebGL buffers cannot be mapped/unmapped because the MapBufferRange, FlushMappedBufferRange,
>     // and UnmapBuffer entry points are removed from the WebGL 2.0 API.
>     // https://www.khronos.org/registry/webgl/specs/latest/2.0/#5.14
>-    if (!extensions.webglCompatibility)
>+    VertexArray *vertexArray = state.getVertexArray();
>+    ASSERT(vertexArray);
>+
>+    if (!extensions.webglCompatibility && vertexArray->hasMappedEnabledArrayBuffer())
>     {
>-        // Check for mapped buffers
>-        // TODO(jmadill): Optimize this check for non - WebGL contexts.
>-        if (state.hasMappedBuffer(BufferBinding::Array))
>-        {
>-            context->handleError(InvalidOperation());
>-            return false;
>-        }
>+        return kBufferMapped;
>     }
> 
>     // Note: these separate values are not supported in WebGL, due to D3D's limitations. See
>     // Section 6.10 of the WebGL 1.0 spec.
>     Framebuffer *framebuffer = state.getDrawFramebuffer();
>+    ASSERT(framebuffer);
>+
>     if (context->getLimitations().noSeparateStencilRefsAndMasks || extensions.webglCompatibility)
>     {
>+        ASSERT(framebuffer);
>         const FramebufferAttachment *dsAttachment =
>             framebuffer->getStencilOrDepthStencilAttachment();
>-        GLuint stencilBits                = dsAttachment ? dsAttachment->getStencilSize() : 0;
>-        GLuint minimumRequiredStencilMask = (1 << stencilBits) - 1;
>+        const GLuint stencilBits = dsAttachment ? dsAttachment->getStencilSize() : 0;
>+        ASSERT(stencilBits <= 8);
>+
>         const DepthStencilState &depthStencilState = state.getDepthStencilState();
>+        if (depthStencilState.stencilTest && stencilBits > 0)
>+        {
>+            GLuint maxStencilValue = (1 << stencilBits) - 1;
> 
>-        bool differentRefs = state.getStencilRef() != state.getStencilBackRef();
>-        bool differentWritemasks =
>-            (depthStencilState.stencilWritemask & minimumRequiredStencilMask) !=
>-            (depthStencilState.stencilBackWritemask & minimumRequiredStencilMask);
>-        bool differentMasks = (depthStencilState.stencilMask & minimumRequiredStencilMask) !=
>-                              (depthStencilState.stencilBackMask & minimumRequiredStencilMask);
>+            bool differentRefs =
>+                clamp(state.getStencilRef(), 0, static_cast<GLint>(maxStencilValue)) !=
>+                clamp(state.getStencilBackRef(), 0, static_cast<GLint>(maxStencilValue));
>+            bool differentWritemasks = (depthStencilState.stencilWritemask & maxStencilValue) !=
>+                                       (depthStencilState.stencilBackWritemask & maxStencilValue);
>+            bool differentMasks = (depthStencilState.stencilMask & maxStencilValue) !=
>+                                  (depthStencilState.stencilBackMask & maxStencilValue);
> 
>-        if (differentRefs || differentWritemasks || differentMasks)
>-        {
>-            if (!extensions.webglCompatibility)
>+            if (differentRefs || differentWritemasks || differentMasks)
>             {
>-                ERR() << "This ANGLE implementation does not support separate front/back stencil "
>-                         "writemasks, reference values, or stencil mask values.";
>+                if (!extensions.webglCompatibility)
>+                {
>+                    WARN() << "This ANGLE implementation does not support separate front/back "
>+                              "stencil writemasks, reference values, or stencil mask values.";
>+                }
>+                return kStencilReferenceMaskOrMismatch;
>             }
>-            ANGLE_VALIDATION_ERR(context, InvalidOperation(), StencilReferenceMaskOrMismatch);
>-            return false;
>         }
>     }
> 
>-    if (framebuffer->checkStatus(context) != GL_FRAMEBUFFER_COMPLETE)
>+    if (!extensions.floatBlend && context->getState().isBlendEnabled() &&
>+        framebuffer->hasActiveFloat32ColorAttachment())
>     {
>-        context->handleError(InvalidFramebufferOperation());
>-        return false;
>+        return kUnsupportedFloatBlending;
>     }
> 
>-    gl::Program *program = state.getProgram();
>-    if (!program)
>+    if (!framebuffer->isComplete(context))
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidOperation(), ProgramNotBound);
>-        return false;
>+        // Note: this error should be generated as INVALID_FRAMEBUFFER_OPERATION.
>+        return kDrawFramebufferIncomplete;
>     }
> 
>-    // In OpenGL ES spec for UseProgram at section 7.3, trying to render without
>-    // vertex shader stage or fragment shader stage is a undefined behaviour.
>-    // But ANGLE should clearly generate an INVALID_OPERATION error instead of
>-    // produce undefined result.
>-    if (program->isLinked() &&
>-        (!program->hasLinkedVertexShader() || !program->hasLinkedFragmentShader()))
>+    if (context->getStateCache().hasAnyEnabledClientAttrib())
>     {
>-        context->handleError(InvalidOperation() << "It is a undefined behaviour to render without "
>-                                                   "vertex shader stage or fragment shader stage.");
>-        return false;
>-    }
>-
>-    if (!program->validateSamplers(nullptr, context->getCaps()))
>-    {
>-        context->handleError(InvalidOperation());
>-        return false;
>-    }
>-
>-    if (extensions.multiview)
>-    {
>-        const int programNumViews     = program->usesMultiview() ? program->getNumViews() : 1;
>-        const int framebufferNumViews = framebuffer->getNumViews();
>-        if (framebufferNumViews != programNumViews)
>+        if (context->getExtensions().webglCompatibility || !state.areClientArraysEnabled())
>         {
>-            context->handleError(InvalidOperation() << "The number of views in the active program "
>-                                                       "and draw framebuffer does not match.");
>-            return false;
>+            // [WebGL 1.0] Section 6.5 Enabled Vertex Attributes and Range Checking
>+            // If a vertex attribute is enabled as an array via enableVertexAttribArray but no
>+            // buffer is bound to that attribute via bindBuffer and vertexAttribPointer, then calls
>+            // to drawArrays or drawElements will generate an INVALID_OPERATION error.
>+            return kVertexArrayNoBuffer;
>         }
> 
>-        const TransformFeedback *transformFeedbackObject = state.getCurrentTransformFeedback();
>-        if (transformFeedbackObject != nullptr && transformFeedbackObject->isActive() &&
>-            framebufferNumViews > 1)
>+        if (state.getVertexArray()->hasEnabledNullPointerClientArray())
>         {
>-            context->handleError(InvalidOperation()
>-                                 << "There is an active transform feedback object "
>-                                    "when the number of views in the active draw "
>-                                    "framebuffer is greater than 1.");
>-            return false;
>-        }
>-
>-        if (extensions.disjointTimerQuery && framebufferNumViews > 1 &&
>-            state.isQueryActive(GL_TIME_ELAPSED_EXT))
>-        {
>-            context->handleError(InvalidOperation() << "There is an active query for target "
>-                                                       "GL_TIME_ELAPSED_EXT when the number of "
>-                                                       "views in the active draw framebuffer is "
>-                                                       "greater than 1.");
>-            return false;
>+            // This is an application error that would normally result in a crash, but we catch it
>+            // and return an error
>+            return kVertexArrayNoBufferPointer;
>         }
>     }
> 
>-    // Uniform buffer validation
>-    for (unsigned int uniformBlockIndex = 0;
>-         uniformBlockIndex < program->getActiveUniformBlockCount(); uniformBlockIndex++)
>+    // If we are running GLES1, there is no current program.
>+    if (context->getClientVersion() >= Version(2, 0))
>     {
>-        const gl::InterfaceBlock &uniformBlock = program->getUniformBlockByIndex(uniformBlockIndex);
>-        GLuint blockBinding                  = program->getUniformBlockBinding(uniformBlockIndex);
>-        const OffsetBindingPointer<Buffer> &uniformBuffer =
>-            state.getIndexedUniformBuffer(blockBinding);
>-
>-        if (uniformBuffer.get() == nullptr)
>+        Program *program = state.getLinkedProgram(context);
>+        if (!program)
>         {
>-            // undefined behaviour
>-            context->handleError(
>-                InvalidOperation()
>-                << "It is undefined behaviour to have a used but unbound uniform buffer.");
>-            return false;
>+            return kProgramNotBound;
>         }
> 
>-        size_t uniformBufferSize = uniformBuffer.getSize();
>-        if (uniformBufferSize == 0)
>+        // In OpenGL ES spec for UseProgram at section 7.3, trying to render without
>+        // vertex shader stage or fragment shader stage is a undefined behaviour.
>+        // But ANGLE should clearly generate an INVALID_OPERATION error instead of
>+        // produce undefined result.
>+        if (!program->hasLinkedShaderStage(ShaderType::Vertex) ||
>+            !program->hasLinkedShaderStage(ShaderType::Fragment))
>         {
>-            // Bind the whole buffer.
>-            uniformBufferSize = static_cast<size_t>(uniformBuffer->getSize());
>+            return kNoActiveGraphicsShaderStage;
>         }
> 
>-        if (uniformBufferSize < uniformBlock.dataSize)
>+        if (!program->validateSamplers(nullptr, context->getCaps()))
>         {
>-            // undefined behaviour
>-            context->handleError(
>-                InvalidOperation()
>-                << "It is undefined behaviour to use a uniform buffer that is too small.");
>-            return false;
>+            return kTextureTypeConflict;
>         }
>-    }
> 
>-    // Do some additonal WebGL-specific validation
>-    if (extensions.webglCompatibility)
>-    {
>-        // Detect rendering feedback loops for WebGL.
>-        if (framebuffer->formsRenderingFeedbackLoopWith(state))
>+        if (extensions.multiview2)
>         {
>-            ANGLE_VALIDATION_ERR(context, InvalidOperation(), FeedbackLoop);
>-            return false;
>+            const int programNumViews     = program->usesMultiview() ? program->getNumViews() : 1;
>+            const int framebufferNumViews = framebuffer->getNumViews();
>+            if (framebufferNumViews != programNumViews)
>+            {
>+                return kMultiviewMismatch;
>+            }
>+
>+            const TransformFeedback *transformFeedbackObject = state.getCurrentTransformFeedback();
>+            if (transformFeedbackObject != nullptr && transformFeedbackObject->isActive() &&
>+                !transformFeedbackObject->isPaused() && framebufferNumViews > 1)
>+            {
>+                return kMultiviewTransformFeedback;
>+            }
>+
>+            if (extensions.disjointTimerQuery && framebufferNumViews > 1 &&
>+                state.isQueryActive(QueryType::TimeElapsed))
>+            {
>+                return kMultiviewTimerQuery;
>+            }
>         }
> 
>-        // Detect that the vertex shader input types match the attribute types
>-        if (!ValidateVertexShaderAttributeTypeMatch(context))
>+        // Uniform buffer validation
>+        for (unsigned int uniformBlockIndex = 0;
>+             uniformBlockIndex < program->getActiveUniformBlockCount(); uniformBlockIndex++)
>         {
>-            return false;
>+            const InterfaceBlock &uniformBlock = program->getUniformBlockByIndex(uniformBlockIndex);
>+            GLuint blockBinding                = program->getUniformBlockBinding(uniformBlockIndex);
>+            const OffsetBindingPointer<Buffer> &uniformBuffer =
>+                state.getIndexedUniformBuffer(blockBinding);
>+
>+            if (uniformBuffer.get() == nullptr)
>+            {
>+                // undefined behaviour
>+                return kUniformBufferUnbound;
>+            }
>+
>+            size_t uniformBufferSize = GetBoundBufferAvailableSize(uniformBuffer);
>+            if (uniformBufferSize < uniformBlock.dataSize)
>+            {
>+                // undefined behaviour
>+                return kUniformBufferTooSmall;
>+            }
>+
>+            if (extensions.webglCompatibility &&
>+                uniformBuffer->isBoundForTransformFeedbackAndOtherUse())
>+            {
>+                return kUniformBufferBoundForTransformFeedback;
>+            }
>         }
> 
>-        // Detect that the color buffer types match the fragment shader output types
>-        if (!ValidateFragmentShaderColorBufferTypeMatch(context))
>+        // Do some additonal WebGL-specific validation
>+        if (extensions.webglCompatibility)
>         {
>-            return false;
>+            if (!state.validateSamplerFormats())
>+            {
>+                return kSamplerFormatMismatch;
>+            }
>+
>+            const TransformFeedback *transformFeedbackObject = state.getCurrentTransformFeedback();
>+            if (transformFeedbackObject != nullptr && transformFeedbackObject->isActive() &&
>+                transformFeedbackObject->buffersBoundForOtherUse())
>+            {
>+                return kTransformFeedbackBufferDoubleBound;
>+            }
>+
>+            // Detect rendering feedback loops for WebGL.
>+            if (framebuffer->formsRenderingFeedbackLoopWith(context))
>+            {
>+                return kFeedbackLoop;
>+            }
>+
>+            // Detect that the vertex shader input types match the attribute types
>+            if (!ValidateVertexShaderAttributeTypeMatch(context))
>+            {
>+                return kVertexShaderTypeMismatch;
>+            }
>+
>+            // Detect that if there's active color buffer without fragment shader output
>+            if (!ValidateFragmentShaderColorBufferMaskMatch(context))
>+            {
>+                return kDrawBufferMaskMismatch;
>+            }
>+
>+            // Detect that the color buffer types match the fragment shader output types
>+            if (!ValidateFragmentShaderColorBufferTypeMatch(context))
>+            {
>+                return kDrawBufferTypeMismatch;
>+            }
>+
>+            const VertexArray *vao = context->getState().getVertexArray();
>+            if (vao->hasTransformFeedbackBindingConflict(context))
>+            {
>+                return kVertexBufferBoundForTransformFeedback;
>+            }
>         }
>     }
> 
>-    // No-op if zero count
>-    return (count > 0);
>+    return nullptr;
> }
> 
>-bool ValidateDrawArraysCommon(ValidationContext *context,
>-                              GLenum mode,
>-                              GLint first,
>-                              GLsizei count,
>-                              GLsizei primcount)
>+void RecordDrawModeError(Context *context, PrimitiveMode mode)
> {
>-    if (first < 0)
>-    {
>-        ANGLE_VALIDATION_ERR(context, InvalidValue(), NegativeStart);
>-        return false;
>-    }
>-
>-    const State &state                          = context->getGLState();
>-    gl::TransformFeedback *curTransformFeedback = state.getCurrentTransformFeedback();
>+    const State &state                      = context->getState();
>+    TransformFeedback *curTransformFeedback = state.getCurrentTransformFeedback();
>     if (curTransformFeedback && curTransformFeedback->isActive() &&
>-        !curTransformFeedback->isPaused() && curTransformFeedback->getPrimitiveMode() != mode)
>+        !curTransformFeedback->isPaused())
>     {
>-        // It is an invalid operation to call DrawArrays or DrawArraysInstanced with a draw mode
>-        // that does not match the current transform feedback object's draw mode (if transform
>-        // feedback
>-        // is active), (3.0.2, section 2.14, pg 86)
>-        ANGLE_VALIDATION_ERR(context, InvalidOperation(), InvalidDrawModeTransformFeedback);
>-        return false;
>+        if (!ValidateTransformFeedbackPrimitiveMode(context,
>+                                                    curTransformFeedback->getPrimitiveMode(), mode))
>+        {
>+            context->validationError(GL_INVALID_OPERATION, kInvalidDrawModeTransformFeedback);
>+            return;
>+        }
>     }
> 
>-    if (!ValidateDrawBase(context, mode, count))
>-    {
>-        return false;
>-    }
>+    const Extensions &extensions = context->getExtensions();
> 
>-    // Check the computation of maxVertex doesn't overflow.
>-    // - first < 0 or count < 0 have been checked as an error condition
>-    // - count > 0 has been checked in ValidateDrawBase as it makes the call a noop
>-    // From this we know maxVertex will be positive, and only need to check if it overflows GLint.
>-    ASSERT(count > 0 && first >= 0);
>-    int64_t maxVertex = static_cast<int64_t>(first) + static_cast<int64_t>(count) - 1;
>-    if (maxVertex > static_cast<int64_t>(std::numeric_limits<GLint>::max()))
>+    switch (mode)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidOperation(), IntegerOverflow);
>-        return false;
>+        case PrimitiveMode::Points:
>+        case PrimitiveMode::Lines:
>+        case PrimitiveMode::LineLoop:
>+        case PrimitiveMode::LineStrip:
>+        case PrimitiveMode::Triangles:
>+        case PrimitiveMode::TriangleStrip:
>+        case PrimitiveMode::TriangleFan:
>+            break;
>+
>+        case PrimitiveMode::LinesAdjacency:
>+        case PrimitiveMode::LineStripAdjacency:
>+        case PrimitiveMode::TrianglesAdjacency:
>+        case PrimitiveMode::TriangleStripAdjacency:
>+            if (!extensions.geometryShader)
>+            {
>+                context->validationError(GL_INVALID_ENUM, kGeometryShaderExtensionNotEnabled);
>+                return;
>+            }
>+            break;
>+        default:
>+            context->validationError(GL_INVALID_ENUM, kInvalidDrawMode);
>+            return;
>     }
> 
>-    if (!ValidateDrawAttribs(context, primcount, static_cast<GLint>(maxVertex), count))
>+    // If we are running GLES1, there is no current program.
>+    if (context->getClientVersion() >= Version(2, 0))
>     {
>-        return false;
>+        Program *program = state.getLinkedProgram(context);
>+        ASSERT(program);
>+
>+        // Do geometry shader specific validations
>+        if (program->hasLinkedShaderStage(ShaderType::Geometry))
>+        {
>+            if (!IsCompatibleDrawModeWithGeometryShader(
>+                    mode, program->getGeometryShaderInputPrimitiveType()))
>+            {
>+                context->validationError(GL_INVALID_OPERATION,
>+                                         kIncompatibleDrawModeAgainstGeometryShader);
>+                return;
>+            }
>+        }
>     }
> 
>-    return true;
>+    // An error should be recorded.
>+    UNREACHABLE();
> }
> 
> bool ValidateDrawArraysInstancedANGLE(Context *context,
>-                                      GLenum mode,
>+                                      PrimitiveMode mode,
>                                       GLint first,
>                                       GLsizei count,
>                                       GLsizei primcount)
> {
>-    if (!context->getExtensions().instancedArrays)
>+    if (!context->getExtensions().instancedArraysANGLE)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidOperation(), ExtensionNotEnabled);
>+        context->validationError(GL_INVALID_OPERATION, kExtensionNotEnabled);
>         return false;
>     }
> 
>@@ -2720,224 +2887,88 @@ bool ValidateDrawArraysInstancedANGLE(Context *context,
>     return ValidateDrawInstancedANGLE(context);
> }
> 
>-bool ValidateDrawElementsBase(ValidationContext *context, GLenum type)
>+bool ValidateDrawArraysInstancedEXT(Context *context,
>+                                    PrimitiveMode mode,
>+                                    GLint first,
>+                                    GLsizei count,
>+                                    GLsizei primcount)
> {
>-    switch (type)
>+    if (!context->getExtensions().instancedArraysEXT)
>     {
>-        case GL_UNSIGNED_BYTE:
>-        case GL_UNSIGNED_SHORT:
>-            break;
>-        case GL_UNSIGNED_INT:
>-            if (context->getClientMajorVersion() < 3 && !context->getExtensions().elementIndexUint)
>-            {
>-                ANGLE_VALIDATION_ERR(context, InvalidEnum(), TypeNotUnsignedShortByte);
>-                return false;
>-            }
>-            break;
>-        default:
>-            ANGLE_VALIDATION_ERR(context, InvalidEnum(), TypeNotUnsignedShortByte);
>-            return false;
>+        context->validationError(GL_INVALID_OPERATION, kExtensionNotEnabled);
>+        return false;
>     }
> 
>-    const State &state = context->getGLState();
>-
>-    gl::TransformFeedback *curTransformFeedback = state.getCurrentTransformFeedback();
>-    if (curTransformFeedback && curTransformFeedback->isActive() &&
>-        !curTransformFeedback->isPaused())
>+    if (!ValidateDrawArraysInstancedBase(context, mode, first, count, primcount))
>     {
>-        // It is an invalid operation to call DrawElements, DrawRangeElements or
>-        // DrawElementsInstanced
>-        // while transform feedback is active, (3.0.2, section 2.14, pg 86)
>-        context->handleError(InvalidOperation());
>         return false;
>     }
> 
>     return true;
> }
> 
>-bool ValidateDrawElementsCommon(ValidationContext *context,
>-                                GLenum mode,
>-                                GLsizei count,
>-                                GLenum type,
>-                                const void *indices,
>-                                GLsizei primcount)
>+const char *ValidateDrawElementsStates(Context *context)
> {
>-    if (!ValidateDrawElementsBase(context, type))
>-        return false;
>-
>-    const State &state = context->getGLState();
>-
>-    if (!ValidateDrawBase(context, mode, count))
>-    {
>-        return false;
>-    }
>+    const State &state = context->getState();
> 
>-    // WebGL buffers cannot be mapped/unmapped because the MapBufferRange, FlushMappedBufferRange,
>-    // and UnmapBuffer entry points are removed from the WebGL 2.0 API.
>-    // https://www.khronos.org/registry/webgl/specs/latest/2.0/#5.14
>-    if (!context->getExtensions().webglCompatibility)
>+    if (context->getStateCache().isTransformFeedbackActiveUnpaused())
>     {
>-        // Check for mapped buffers
>-        // TODO(jmadill): Optimize this check for non - WebGL contexts.
>-        if (state.hasMappedBuffer(gl::BufferBinding::ElementArray))
>+        // EXT_geometry_shader allows transform feedback to work with all draw commands.
>+        // [EXT_geometry_shader] Section 12.1, "Transform Feedback"
>+        if (!context->getExtensions().geometryShader)
>         {
>-            context->handleError(InvalidOperation() << "Index buffer is mapped.");
>-            return false;
>+            // It is an invalid operation to call DrawElements, DrawRangeElements or
>+            // DrawElementsInstanced while transform feedback is active, (3.0.2, section 2.14, pg
>+            // 86)
>+            return kUnsupportedDrawModeForTransformFeedback;
>         }
>     }
> 
>-    const gl::VertexArray *vao     = state.getVertexArray();
>-    gl::Buffer *elementArrayBuffer = vao->getElementArrayBuffer().get();
>-
>-    GLuint typeBytes = gl::GetTypeInfo(type).bytes;
>-
>-    if (context->getExtensions().webglCompatibility)
>-    {
>-        ASSERT(isPow2(typeBytes) && typeBytes > 0);
>-        if ((reinterpret_cast<uintptr_t>(indices) & static_cast<uintptr_t>(typeBytes - 1)) != 0)
>-        {
>-            // [WebGL 1.0] Section 6.4 Buffer Offset and Stride Requirements
>-            // The offset arguments to drawElements and [...], must be a multiple of the size of the
>-            // data type passed to the call, or an INVALID_OPERATION error is generated.
>-            ANGLE_VALIDATION_ERR(context, InvalidOperation(), OffsetMustBeMultipleOfType);
>-            return false;
>-        }
>-
>-        // [WebGL 1.0] Section 6.4 Buffer Offset and Stride Requirements
>-        // In addition the offset argument to drawElements must be non-negative or an INVALID_VALUE
>-        // error is generated.
>-        if (reinterpret_cast<intptr_t>(indices) < 0)
>-        {
>-            ANGLE_VALIDATION_ERR(context, InvalidValue(), NegativeOffset);
>-            return false;
>-        }
>-    }
>-
>-    if (context->getExtensions().webglCompatibility ||
>-        !context->getGLState().areClientArraysEnabled())
>-    {
>-        if (!elementArrayBuffer && count > 0)
>-        {
>-            // [WebGL 1.0] Section 6.2 No Client Side Arrays
>-            // If drawElements is called with a count greater than zero, and no WebGLBuffer is bound
>-            // to the ELEMENT_ARRAY_BUFFER binding point, an INVALID_OPERATION error is generated.
>-            ANGLE_VALIDATION_ERR(context, InvalidOperation(), MustHaveElementArrayBinding);
>-            return false;
>-        }
>-    }
>+    const VertexArray *vao     = state.getVertexArray();
>+    Buffer *elementArrayBuffer = vao->getElementArrayBuffer();
> 
>-    if (count > 0)
>+    if (elementArrayBuffer)
>     {
>-        if (elementArrayBuffer)
>+        if (context->getExtensions().webglCompatibility)
>         {
>-            // The max possible type size is 8 and count is on 32 bits so doing the multiplication
>-            // in a 64 bit integer is safe. Also we are guaranteed that here count > 0.
>-            static_assert(std::is_same<int, GLsizei>::value, "GLsizei isn't the expected type");
>-            constexpr uint64_t kMaxTypeSize = 8;
>-            constexpr uint64_t kIntMax      = std::numeric_limits<int>::max();
>-            constexpr uint64_t kUint64Max   = std::numeric_limits<uint64_t>::max();
>-            static_assert(kIntMax < kUint64Max / kMaxTypeSize, "");
>-
>-            uint64_t typeSize     = typeBytes;
>-            uint64_t elementCount = static_cast<uint64_t>(count);
>-            ASSERT(elementCount > 0 && typeSize <= kMaxTypeSize);
>-
>-            // Doing the multiplication here is overflow-safe
>-            uint64_t elementDataSizeNoOffset = typeSize * elementCount;
>-
>-            // The offset can be any value, check for overflows
>-            uint64_t offset = static_cast<uint64_t>(reinterpret_cast<uintptr_t>(indices));
>-            if (elementDataSizeNoOffset > kUint64Max - offset)
>-            {
>-                ANGLE_VALIDATION_ERR(context, InvalidOperation(), IntegerOverflow);
>-                return false;
>-            }
>-
>-            uint64_t elementDataSizeWithOffset = elementDataSizeNoOffset + offset;
>-            if (elementDataSizeWithOffset > static_cast<uint64_t>(elementArrayBuffer->getSize()))
>+            if (elementArrayBuffer->isBoundForTransformFeedbackAndOtherUse())
>             {
>-                ANGLE_VALIDATION_ERR(context, InvalidOperation(), InsufficientBufferSize);
>-                return false;
>-            }
>-
>-            ASSERT(isPow2(typeSize) && typeSize > 0);
>-            if ((elementArrayBuffer->getSize() & (typeSize - 1)) != 0)
>-            {
>-                ANGLE_VALIDATION_ERR(context, InvalidOperation(), MismatchedByteCountType);
>-                return false;
>+                return kElementArrayBufferBoundForTransformFeedback;
>             }
>         }
>-        else if (!indices)
>-        {
>-            // This is an application error that would normally result in a crash,
>-            // but we catch it and return an error
>-            context->handleError(InvalidOperation() << "No element array buffer and no pointer.");
>-            return false;
>-        }
>-    }
>-
>-    if (context->getExtensions().robustBufferAccessBehavior)
>-    {
>-        // Here we use maxVertex = 0 and vertexCount = 1 to avoid retrieving IndexRange when robust
>-        // access is enabled.
>-        if (!ValidateDrawAttribs(context, primcount, 0, 1))
>+        else if (elementArrayBuffer->isMapped())
>         {
>-            return false;
>+            // WebGL buffers cannot be mapped/unmapped because the MapBufferRange,
>+            // FlushMappedBufferRange, and UnmapBuffer entry points are removed from the
>+            // WebGL 2.0 API. https://www.khronos.org/registry/webgl/specs/latest/2.0/#5.14
>+            return kBufferMapped;
>         }
>     }
>     else
>     {
>-        // Use the parameter buffer to retrieve and cache the index range.
>-        const auto &params        = context->getParams<HasIndexRange>();
>-        const auto &indexRangeOpt = params.getIndexRange();
>-        if (!indexRangeOpt.valid())
>-        {
>-            // Unexpected error.
>-            return false;
>-        }
>-
>-        // If we use an index greater than our maximum supported index range, return an error.
>-        // The ES3 spec does not specify behaviour here, it is undefined, but ANGLE should always
>-        // return an error if possible here.
>-        if (static_cast<GLuint64>(indexRangeOpt.value().end) >= context->getCaps().maxElementIndex)
>-        {
>-            ANGLE_VALIDATION_ERR(context, InvalidOperation(), ExceedsMaxElement);
>-            return false;
>-        }
>-
>-        if (!ValidateDrawAttribs(context, primcount, static_cast<GLint>(indexRangeOpt.value().end),
>-                                 static_cast<GLint>(indexRangeOpt.value().vertexCount())))
>+        // [WebGL 1.0] Section 6.2 No Client Side Arrays
>+        // If an indexed draw command (drawElements) is called and no WebGLBuffer is bound to
>+        // the ELEMENT_ARRAY_BUFFER binding point, an INVALID_OPERATION error is generated.
>+        if (!context->getState().areClientArraysEnabled() ||
>+            context->getExtensions().webglCompatibility)
>         {
>-            return false;
>+            return kMustHaveElementArrayBinding;
>         }
>-
>-        // No op if there are no real indices in the index data (all are primitive restart).
>-        return (indexRangeOpt.value().vertexIndexCount > 0);
>     }
> 
>-    return true;
>-}
>-
>-bool ValidateDrawElementsInstancedCommon(ValidationContext *context,
>-                                         GLenum mode,
>-                                         GLsizei count,
>-                                         GLenum type,
>-                                         const void *indices,
>-                                         GLsizei primcount)
>-{
>-    return ValidateDrawElementsInstancedBase(context, mode, count, type, indices, primcount);
>+    return nullptr;
> }
> 
> bool ValidateDrawElementsInstancedANGLE(Context *context,
>-                                        GLenum mode,
>+                                        PrimitiveMode mode,
>                                         GLsizei count,
>-                                        GLenum type,
>+                                        DrawElementsType type,
>                                         const void *indices,
>                                         GLsizei primcount)
> {
>-    if (!context->getExtensions().instancedArrays)
>+    if (!context->getExtensions().instancedArraysANGLE)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidOperation(), ExtensionNotEnabled);
>+        context->validationError(GL_INVALID_OPERATION, kExtensionNotEnabled);
>         return false;
>     }
> 
>@@ -2949,6 +2980,27 @@ bool ValidateDrawElementsInstancedANGLE(Context *context,
>     return ValidateDrawInstancedANGLE(context);
> }
> 
>+bool ValidateDrawElementsInstancedEXT(Context *context,
>+                                      PrimitiveMode mode,
>+                                      GLsizei count,
>+                                      DrawElementsType type,
>+                                      const void *indices,
>+                                      GLsizei primcount)
>+{
>+    if (!context->getExtensions().instancedArraysEXT)
>+    {
>+        context->validationError(GL_INVALID_OPERATION, kExtensionNotEnabled);
>+        return false;
>+    }
>+
>+    if (!ValidateDrawElementsInstancedBase(context, mode, count, type, indices, primcount))
>+    {
>+        return false;
>+    }
>+
>+    return true;
>+}
>+
> bool ValidateFramebufferTextureBase(Context *context,
>                                     GLenum target,
>                                     GLenum attachment,
>@@ -2957,7 +3009,7 @@ bool ValidateFramebufferTextureBase(Context *context,
> {
>     if (!ValidFramebufferTarget(context, target))
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidEnum(), InvalidFramebufferTarget);
>+        context->validationError(GL_INVALID_ENUM, kInvalidFramebufferTarget);
>         return false;
>     }
> 
>@@ -2968,27 +3020,27 @@ bool ValidateFramebufferTextureBase(Context *context,
> 
>     if (texture != 0)
>     {
>-        gl::Texture *tex = context->getTexture(texture);
>+        Texture *tex = context->getTexture(texture);
> 
>-        if (tex == NULL)
>+        if (tex == nullptr)
>         {
>-            context->handleError(InvalidOperation());
>+            context->validationError(GL_INVALID_OPERATION, kMissingTexture);
>             return false;
>         }
> 
>         if (level < 0)
>         {
>-            context->handleError(InvalidValue());
>+            context->validationError(GL_INVALID_VALUE, kInvalidMipLevel);
>             return false;
>         }
>     }
> 
>-    const gl::Framebuffer *framebuffer = context->getGLState().getTargetFramebuffer(target);
>+    const Framebuffer *framebuffer = context->getState().getTargetFramebuffer(target);
>     ASSERT(framebuffer);
> 
>     if (framebuffer->id() == 0)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidOperation(), DefaultFramebufferTarget);
>+        context->validationError(GL_INVALID_OPERATION, kDefaultFramebufferTarget);
>         return false;
>     }
> 
>@@ -2999,11 +3051,11 @@ bool ValidateGetUniformBase(Context *context, GLuint program, GLint location)
> {
>     if (program == 0)
>     {
>-        context->handleError(InvalidValue());
>+        context->validationError(GL_INVALID_VALUE, kProgramDoesNotExist);
>         return false;
>     }
> 
>-    gl::Program *programObject = GetValidProgram(context, program);
>+    Program *programObject = GetValidProgram(context, program);
>     if (!programObject)
>     {
>         return false;
>@@ -3011,13 +3063,13 @@ bool ValidateGetUniformBase(Context *context, GLuint program, GLint location)
> 
>     if (!programObject || !programObject->isLinked())
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidOperation(), ProgramNotLinked);
>+        context->validationError(GL_INVALID_OPERATION, kProgramNotLinked);
>         return false;
>     }
> 
>     if (!programObject->isValidUniformLocation(location))
>     {
>-        context->handleError(InvalidOperation());
>+        context->validationError(GL_INVALID_OPERATION, kInvalidUniformLocation);
>         return false;
>     }
> 
>@@ -3042,11 +3094,11 @@ static bool ValidateSizedGetUniform(Context *context,
> 
>     if (bufSize < 0)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidValue(), NegativeBufferSize);
>+        context->validationError(GL_INVALID_VALUE, kNegativeBufferSize);
>         return false;
>     }
> 
>-    gl::Program *programObject = context->getProgram(program);
>+    Program *programObject = context->getProgramResolveLink(program);
>     ASSERT(programObject);
> 
>     // sized queries -- ensure the provided buffer is large enough
>@@ -3054,7 +3106,7 @@ static bool ValidateSizedGetUniform(Context *context,
>     size_t requiredBytes         = VariableExternalSize(uniform.type);
>     if (static_cast<size_t>(bufSize) < requiredBytes)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidOperation(), InsufficientBufferSize);
>+        context->validationError(GL_INVALID_OPERATION, kInsufficientBufferSize);
>         return false;
>     }
> 
>@@ -3075,6 +3127,17 @@ bool ValidateGetnUniformfvEXT(Context *context,
>     return ValidateSizedGetUniform(context, program, location, bufSize, nullptr);
> }
> 
>+bool ValidateGetnUniformfvRobustANGLE(Context *context,
>+                                      GLuint program,
>+                                      GLint location,
>+                                      GLsizei bufSize,
>+                                      GLsizei *length,
>+                                      GLfloat *params)
>+{
>+    UNIMPLEMENTED();
>+    return false;
>+}
>+
> bool ValidateGetnUniformivEXT(Context *context,
>                               GLuint program,
>                               GLint location,
>@@ -3084,6 +3147,28 @@ bool ValidateGetnUniformivEXT(Context *context,
>     return ValidateSizedGetUniform(context, program, location, bufSize, nullptr);
> }
> 
>+bool ValidateGetnUniformivRobustANGLE(Context *context,
>+                                      GLuint program,
>+                                      GLint location,
>+                                      GLsizei bufSize,
>+                                      GLsizei *length,
>+                                      GLint *params)
>+{
>+    UNIMPLEMENTED();
>+    return false;
>+}
>+
>+bool ValidateGetnUniformuivRobustANGLE(Context *context,
>+                                       GLuint program,
>+                                       GLint location,
>+                                       GLsizei bufSize,
>+                                       GLsizei *length,
>+                                       GLuint *params)
>+{
>+    UNIMPLEMENTED();
>+    return false;
>+}
>+
> bool ValidateGetUniformfvRobustANGLE(Context *context,
>                                      GLuint program,
>                                      GLint location,
>@@ -3096,8 +3181,17 @@ bool ValidateGetUniformfvRobustANGLE(Context *context,
>         return false;
>     }
> 
>+    GLsizei writeLength = 0;
>+
>     // bufSize is validated in ValidateSizedGetUniform
>-    return ValidateSizedGetUniform(context, program, location, bufSize, length);
>+    if (!ValidateSizedGetUniform(context, program, location, bufSize, &writeLength))
>+    {
>+        return false;
>+    }
>+
>+    SetRobustLengthParam(length, writeLength);
>+
>+    return true;
> }
> 
> bool ValidateGetUniformivRobustANGLE(Context *context,
>@@ -3112,8 +3206,17 @@ bool ValidateGetUniformivRobustANGLE(Context *context,
>         return false;
>     }
> 
>+    GLsizei writeLength = 0;
>+
>     // bufSize is validated in ValidateSizedGetUniform
>-    return ValidateSizedGetUniform(context, program, location, bufSize, length);
>+    if (!ValidateSizedGetUniform(context, program, location, bufSize, &writeLength))
>+    {
>+        return false;
>+    }
>+
>+    SetRobustLengthParam(length, writeLength);
>+
>+    return true;
> }
> 
> bool ValidateGetUniformuivRobustANGLE(Context *context,
>@@ -3130,12 +3233,21 @@ bool ValidateGetUniformuivRobustANGLE(Context *context,
> 
>     if (context->getClientMajorVersion() < 3)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidOperation(), ES3Required);
>+        context->validationError(GL_INVALID_OPERATION, kES3Required);
>         return false;
>     }
> 
>+    GLsizei writeLength = 0;
>+
>     // bufSize is validated in ValidateSizedGetUniform
>-    return ValidateSizedGetUniform(context, program, location, bufSize, length);
>+    if (!ValidateSizedGetUniform(context, program, location, bufSize, &writeLength))
>+    {
>+        return false;
>+    }
>+
>+    SetRobustLengthParam(length, writeLength);
>+
>+    return true;
> }
> 
> bool ValidateDiscardFramebufferBase(Context *context,
>@@ -3146,7 +3258,7 @@ bool ValidateDiscardFramebufferBase(Context *context,
> {
>     if (numAttachments < 0)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidValue(), NegativeAttachments);
>+        context->validationError(GL_INVALID_VALUE, kNegativeAttachments);
>         return false;
>     }
> 
>@@ -3156,15 +3268,13 @@ bool ValidateDiscardFramebufferBase(Context *context,
>         {
>             if (defaultFramebuffer)
>             {
>-                ANGLE_VALIDATION_ERR(context, InvalidEnum(), DefaultFramebufferInvalidAttachment);
>+                context->validationError(GL_INVALID_ENUM, kDefaultFramebufferInvalidAttachment);
>                 return false;
>             }
> 
>             if (attachments[i] >= GL_COLOR_ATTACHMENT0 + context->getCaps().maxColorAttachments)
>             {
>-                context->handleError(InvalidOperation() << "Requested color attachment is "
>-                                                           "greater than the maximum supported "
>-                                                           "color attachments");
>+                context->validationError(GL_INVALID_OPERATION, kExceedsMaxColorAttachments);
>                 return false;
>             }
>         }
>@@ -3177,8 +3287,8 @@ bool ValidateDiscardFramebufferBase(Context *context,
>                 case GL_DEPTH_STENCIL_ATTACHMENT:
>                     if (defaultFramebuffer)
>                     {
>-                        ANGLE_VALIDATION_ERR(context, InvalidEnum(),
>-                                             DefaultFramebufferInvalidAttachment);
>+                        context->validationError(GL_INVALID_ENUM,
>+                                                 kDefaultFramebufferInvalidAttachment);
>                         return false;
>                     }
>                     break;
>@@ -3187,13 +3297,13 @@ bool ValidateDiscardFramebufferBase(Context *context,
>                 case GL_STENCIL:
>                     if (!defaultFramebuffer)
>                     {
>-                        ANGLE_VALIDATION_ERR(context, InvalidEnum(),
>-                                             DefaultFramebufferInvalidAttachment);
>+                        context->validationError(GL_INVALID_ENUM,
>+                                                 kDefaultFramebufferInvalidAttachment);
>                         return false;
>                     }
>                     break;
>                 default:
>-                    ANGLE_VALIDATION_ERR(context, InvalidEnum(), InvalidAttachment);
>+                    context->validationError(GL_INVALID_ENUM, kInvalidAttachment);
>                     return false;
>             }
>         }
>@@ -3204,8 +3314,15 @@ bool ValidateDiscardFramebufferBase(Context *context,
> 
> bool ValidateInsertEventMarkerEXT(Context *context, GLsizei length, const char *marker)
> {
>-    // Note that debug marker calls must not set error state
>+    if (!context->getExtensions().debugMarker)
>+    {
>+        // The debug marker calls should not set error state
>+        // However, it seems reasonable to set an error state if the extension is not enabled
>+        context->validationError(GL_INVALID_OPERATION, kExtensionNotEnabled);
>+        return false;
>+    }
> 
>+    // Note that debug marker calls must not set error state
>     if (length < 0)
>     {
>         return false;
>@@ -3221,8 +3338,15 @@ bool ValidateInsertEventMarkerEXT(Context *context, GLsizei length, const char *
> 
> bool ValidatePushGroupMarkerEXT(Context *context, GLsizei length, const char *marker)
> {
>-    // Note that debug marker calls must not set error state
>+    if (!context->getExtensions().debugMarker)
>+    {
>+        // The debug marker calls should not set error state
>+        // However, it seems reasonable to set an error state if the extension is not enabled
>+        context->validationError(GL_INVALID_OPERATION, kExtensionNotEnabled);
>+        return false;
>+    }
> 
>+    // Note that debug marker calls must not set error state
>     if (length < 0)
>     {
>         return false;
>@@ -3236,59 +3360,53 @@ bool ValidatePushGroupMarkerEXT(Context *context, GLsizei length, const char *ma
>     return true;
> }
> 
>-bool ValidateEGLImageTargetTexture2DOES(Context *context,
>-                                        GLenum target,
>-                                        egl::Image *image)
>+bool ValidateEGLImageTargetTexture2DOES(Context *context, TextureType type, GLeglImageOES image)
> {
>     if (!context->getExtensions().eglImage && !context->getExtensions().eglImageExternal)
>     {
>-        context->handleError(InvalidOperation());
>+        context->validationError(GL_INVALID_OPERATION, kExtensionNotEnabled);
>         return false;
>     }
> 
>-    switch (target)
>+    switch (type)
>     {
>-        case GL_TEXTURE_2D:
>+        case TextureType::_2D:
>             if (!context->getExtensions().eglImage)
>             {
>-                context->handleError(InvalidEnum()
>-                                     << "GL_TEXTURE_2D texture target requires GL_OES_EGL_image.");
>+                context->validationError(GL_INVALID_ENUM, kEnumNotSupported);
>             }
>             break;
> 
>-        case GL_TEXTURE_EXTERNAL_OES:
>+        case TextureType::External:
>             if (!context->getExtensions().eglImageExternal)
>             {
>-                context->handleError(InvalidEnum() << "GL_TEXTURE_EXTERNAL_OES texture target "
>-                                                      "requires GL_OES_EGL_image_external.");
>+                context->validationError(GL_INVALID_ENUM, kEnumNotSupported);
>             }
>             break;
> 
>         default:
>-            ANGLE_VALIDATION_ERR(context, InvalidEnum(), InvalidTextureTarget);
>+            context->validationError(GL_INVALID_ENUM, kInvalidTextureTarget);
>             return false;
>     }
> 
>-    ASSERT(context->getCurrentDisplay());
>-    if (!context->getCurrentDisplay()->isValidImage(image))
>+    egl::Image *imageObject = static_cast<egl::Image *>(image);
>+
>+    ASSERT(context->getDisplay());
>+    if (!context->getDisplay()->isValidImage(imageObject))
>     {
>-        context->handleError(InvalidValue() << "EGL image is not valid.");
>+        context->validationError(GL_INVALID_VALUE, kInvalidEGLImage);
>         return false;
>     }
> 
>-    if (image->getSamples() > 0)
>+    if (imageObject->getSamples() > 0)
>     {
>-        context->handleError(InvalidOperation()
>-                             << "cannot create a 2D texture from a multisampled EGL image.");
>+        context->validationError(GL_INVALID_OPERATION, kEGLImageCannotCreate2DMultisampled);
>         return false;
>     }
> 
>-    const TextureCaps &textureCaps =
>-        context->getTextureCaps().get(image->getFormat().info->sizedInternalFormat);
>-    if (!textureCaps.texturable)
>+    if (!imageObject->isTexturable(context))
>     {
>-        context->handleError(InvalidOperation()
>-                             << "EGL image internal format is not supported as a texture.");
>+        context->validationError(GL_INVALID_OPERATION, kEGLImageTextureFormatNotSupported);
>         return false;
>     }
> 
>@@ -3297,11 +3415,11 @@ bool ValidateEGLImageTargetTexture2DOES(Context *context,
> 
> bool ValidateEGLImageTargetRenderbufferStorageOES(Context *context,
>                                                   GLenum target,
>-                                                  egl::Image *image)
>+                                                  GLeglImageOES image)
> {
>     if (!context->getExtensions().eglImage)
>     {
>-        context->handleError(InvalidOperation());
>+        context->validationError(GL_INVALID_OPERATION, kExtensionNotEnabled);
>         return false;
>     }
> 
>@@ -3311,23 +3429,22 @@ bool ValidateEGLImageTargetRenderbufferStorageOES(Context *context,
>             break;
> 
>         default:
>-            ANGLE_VALIDATION_ERR(context, InvalidEnum(), InvalidRenderbufferTarget);
>+            context->validationError(GL_INVALID_ENUM, kInvalidRenderbufferTarget);
>             return false;
>     }
> 
>-    ASSERT(context->getCurrentDisplay());
>-    if (!context->getCurrentDisplay()->isValidImage(image))
>+    egl::Image *imageObject = static_cast<egl::Image *>(image);
>+
>+    ASSERT(context->getDisplay());
>+    if (!context->getDisplay()->isValidImage(imageObject))
>     {
>-        context->handleError(InvalidValue() << "EGL image is not valid.");
>+        context->validationError(GL_INVALID_VALUE, kInvalidEGLImage);
>         return false;
>     }
> 
>-    const TextureCaps &textureCaps =
>-        context->getTextureCaps().get(image->getFormat().info->sizedInternalFormat);
>-    if (!textureCaps.renderable)
>+    if (!imageObject->isRenderable(context))
>     {
>-        context->handleError(InvalidOperation()
>-                             << "EGL image internal format is not supported as a renderbuffer.");
>+        context->validationError(GL_INVALID_OPERATION, kEGLImageRenderbufferFormatNotSupported);
>         return false;
>     }
> 
>@@ -3340,7 +3457,7 @@ bool ValidateBindVertexArrayBase(Context *context, GLuint array)
>     {
>         // The default VAO should always exist
>         ASSERT(array != 0);
>-        context->handleError(InvalidOperation());
>+        context->validationError(GL_INVALID_OPERATION, kInvalidVertexArray);
>         return false;
>     }
> 
>@@ -3363,16 +3480,14 @@ bool ValidateProgramBinaryBase(Context *context,
>     if (std::find(programBinaryFormats.begin(), programBinaryFormats.end(), binaryFormat) ==
>         programBinaryFormats.end())
>     {
>-        context->handleError(InvalidEnum() << "Program binary format is not valid.");
>+        context->validationError(GL_INVALID_ENUM, kInvalidProgramBinaryFormat);
>         return false;
>     }
> 
>     if (context->hasActiveTransformFeedback(program))
>     {
>         // ES 3.0.4 section 2.15 page 91
>-        context->handleError(InvalidOperation() << "Cannot change program binary while program "
>-                                                   "is associated with an active transform "
>-                                                   "feedback object.");
>+        context->validationError(GL_INVALID_OPERATION, kTransformFeedbackProgramBinary);
>         return false;
>     }
> 
>@@ -3394,35 +3509,35 @@ bool ValidateGetProgramBinaryBase(Context *context,
> 
>     if (!programObject->isLinked())
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidOperation(), ProgramNotLinked);
>+        context->validationError(GL_INVALID_OPERATION, kProgramNotLinked);
>         return false;
>     }
> 
>     if (context->getCaps().programBinaryFormats.empty())
>     {
>-        context->handleError(InvalidOperation() << "No program binary formats supported.");
>+        context->validationError(GL_INVALID_OPERATION, kNoProgramBinaryFormats);
>         return false;
>     }
> 
>     return true;
> }
> 
>-bool ValidateDrawBuffersBase(ValidationContext *context, GLsizei n, const GLenum *bufs)
>+bool ValidateDrawBuffersBase(Context *context, GLsizei n, const GLenum *bufs)
> {
>     // INVALID_VALUE is generated if n is negative or greater than value of MAX_DRAW_BUFFERS
>     if (n < 0)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidValue(), NegativeCount);
>+        context->validationError(GL_INVALID_VALUE, kNegativeCount);
>         return false;
>     }
>     if (static_cast<GLuint>(n) > context->getCaps().maxDrawBuffers)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidValue(), IndexExceedsMaxDrawBuffer);
>+        context->validationError(GL_INVALID_VALUE, kIndexExceedsMaxDrawBuffer);
>         return false;
>     }
> 
>-    ASSERT(context->getGLState().getDrawFramebuffer());
>-    GLuint frameBufferId      = context->getGLState().getDrawFramebuffer()->id();
>+    ASSERT(context->getState().getDrawFramebuffer());
>+    GLuint frameBufferId      = context->getState().getDrawFramebuffer()->id();
>     GLuint maxColorAttachment = GL_COLOR_ATTACHMENT0_EXT + context->getCaps().maxColorAttachments;
> 
>     // This should come first before the check for the default frame buffer
>@@ -3441,13 +3556,12 @@ bool ValidateDrawBuffersBase(ValidationContext *context, GLsizei n, const GLenum
>             // was changed to GL_INVALID_ENUM in 3.1, which dEQP also expects.
>             // 3.1 is still a bit ambiguous about the error, but future specs are
>             // expected to clarify that GL_INVALID_ENUM is the correct error.
>-            context->handleError(InvalidEnum() << "Invalid buffer value");
>+            context->validationError(GL_INVALID_ENUM, kInvalidDrawBuffer);
>             return false;
>         }
>         else if (bufs[colorAttachment] >= maxColorAttachment)
>         {
>-            context->handleError(InvalidOperation()
>-                                 << "Buffer value is greater than MAX_DRAW_BUFFERS");
>+            context->validationError(GL_INVALID_OPERATION, kExceedsMaxColorAttachments);
>             return false;
>         }
>         else if (bufs[colorAttachment] != GL_NONE && bufs[colorAttachment] != attachment &&
>@@ -3455,8 +3569,7 @@ bool ValidateDrawBuffersBase(ValidationContext *context, GLsizei n, const GLenum
>         {
>             // INVALID_OPERATION-GL is bound to buffer and ith argument
>             // is not COLOR_ATTACHMENTi or NONE
>-            context->handleError(InvalidOperation()
>-                                 << "Ith value does not match COLOR_ATTACHMENTi or NONE");
>+            context->validationError(GL_INVALID_OPERATION, kInvalidDrawBufferValue);
>             return false;
>         }
>     }
>@@ -3467,16 +3580,13 @@ bool ValidateDrawBuffersBase(ValidationContext *context, GLsizei n, const GLenum
>     {
>         if (n != 1)
>         {
>-            context->handleError(InvalidOperation()
>-                                 << "n must be 1 when GL is bound to the default framebuffer");
>+            context->validationError(GL_INVALID_OPERATION, kInvalidDrawBufferCountForDefault);
>             return false;
>         }
> 
>         if (bufs[0] != GL_NONE && bufs[0] != GL_BACK)
>         {
>-            context->handleError(
>-                InvalidOperation()
>-                << "Only NONE or BACK are valid values when drawing to the default framebuffer");
>+            context->validationError(GL_INVALID_OPERATION, kDefaultFramebufferInvalidDrawBuffer);
>             return false;
>         }
>     }
>@@ -3495,17 +3605,9 @@ bool ValidateGetBufferPointervBase(Context *context,
>         *length = 0;
>     }
> 
>-    if (context->getClientMajorVersion() < 3 && !context->getExtensions().mapBuffer)
>-    {
>-        context->handleError(
>-            InvalidOperation()
>-            << "Context does not support OpenGL ES 3.0 or GL_OES_mapbuffer is not enabled.");
>-        return false;
>-    }
>-
>-    if (!ValidBufferType(context, target))
>+    if (!context->isValidBufferBinding(target))
>     {
>-        context->handleError(InvalidEnum() << "Buffer target not valid");
>+        context->validationError(GL_INVALID_ENUM, kInvalidBufferTypes);
>         return false;
>     }
> 
>@@ -3515,17 +3617,16 @@ bool ValidateGetBufferPointervBase(Context *context,
>             break;
> 
>         default:
>-            ANGLE_VALIDATION_ERR(context, InvalidEnum(), EnumNotSupported);
>+            context->validationError(GL_INVALID_ENUM, kEnumNotSupported);
>             return false;
>     }
> 
>     // GLES 3.0 section 2.10.1: "Attempts to attempts to modify or query buffer object state for a
>     // target bound to zero generate an INVALID_OPERATION error."
>     // GLES 3.1 section 6.6 explicitly specifies this error.
>-    if (context->getGLState().getTargetBuffer(target) == nullptr)
>+    if (context->getState().getTargetBuffer(target) == nullptr)
>     {
>-        context->handleError(InvalidOperation()
>-                             << "Can not get pointer for reserved buffer name zero.");
>+        context->validationError(GL_INVALID_OPERATION, kBufferPointerNotAvailable);
>         return false;
>     }
> 
>@@ -3539,17 +3640,17 @@ bool ValidateGetBufferPointervBase(Context *context,
> 
> bool ValidateUnmapBufferBase(Context *context, BufferBinding target)
> {
>-    if (!ValidBufferType(context, target))
>+    if (!context->isValidBufferBinding(target))
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidEnum(), InvalidBufferTypes);
>+        context->validationError(GL_INVALID_ENUM, kInvalidBufferTypes);
>         return false;
>     }
> 
>-    Buffer *buffer = context->getGLState().getTargetBuffer(target);
>+    Buffer *buffer = context->getState().getTargetBuffer(target);
> 
>     if (buffer == nullptr || !buffer->isMapped())
>     {
>-        context->handleError(InvalidOperation() << "Buffer not mapped.");
>+        context->validationError(GL_INVALID_OPERATION, kBufferNotMapped);
>         return false;
>     }
> 
>@@ -3562,29 +3663,29 @@ bool ValidateMapBufferRangeBase(Context *context,
>                                 GLsizeiptr length,
>                                 GLbitfield access)
> {
>-    if (!ValidBufferType(context, target))
>+    if (!context->isValidBufferBinding(target))
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidEnum(), InvalidBufferTypes);
>+        context->validationError(GL_INVALID_ENUM, kInvalidBufferTypes);
>         return false;
>     }
> 
>     if (offset < 0)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidValue(), NegativeOffset);
>+        context->validationError(GL_INVALID_VALUE, kNegativeOffset);
>         return false;
>     }
> 
>     if (length < 0)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidValue(), NegativeLength);
>+        context->validationError(GL_INVALID_VALUE, kNegativeLength);
>         return false;
>     }
> 
>-    Buffer *buffer = context->getGLState().getTargetBuffer(target);
>+    Buffer *buffer = context->getState().getTargetBuffer(target);
> 
>     if (!buffer)
>     {
>-        context->handleError(InvalidOperation() << "Attempted to map buffer object zero.");
>+        context->validationError(GL_INVALID_OPERATION, kBufferNotMappable);
>         return false;
>     }
> 
>@@ -3594,7 +3695,7 @@ bool ValidateMapBufferRangeBase(Context *context,
> 
>     if (!checkedSize.IsValid() || checkedSize.ValueOrDie() > static_cast<size_t>(buffer->getSize()))
>     {
>-        context->handleError(InvalidValue() << "Mapped range does not fit into buffer dimensions.");
>+        context->validationError(GL_INVALID_VALUE, kMapOutOfRange);
>         return false;
>     }
> 
>@@ -3605,28 +3706,26 @@ bool ValidateMapBufferRangeBase(Context *context,
> 
>     if (access & ~(allAccessBits))
>     {
>-        context->handleError(InvalidValue()
>-                             << "Invalid access bits: 0x" << std::hex << std::uppercase << access);
>+        context->validationError(GL_INVALID_VALUE, kInvalidAccessBits);
>         return false;
>     }
> 
>     if (length == 0)
>     {
>-        context->handleError(InvalidOperation() << "Buffer mapping length is zero.");
>+        context->validationError(GL_INVALID_OPERATION, kLengthZero);
>         return false;
>     }
> 
>     if (buffer->isMapped())
>     {
>-        context->handleError(InvalidOperation() << "Buffer is already mapped.");
>+        context->validationError(GL_INVALID_OPERATION, kBufferAlreadyMapped);
>         return false;
>     }
> 
>     // Check for invalid bit combinations
>     if ((access & (GL_MAP_READ_BIT | GL_MAP_WRITE_BIT)) == 0)
>     {
>-        context->handleError(InvalidOperation()
>-                             << "Need to map buffer for either reading or writing.");
>+        context->validationError(GL_INVALID_OPERATION, kInvalidAccessBitsReadWrite);
>         return false;
>     }
> 
>@@ -3635,17 +3734,13 @@ bool ValidateMapBufferRangeBase(Context *context,
> 
>     if ((access & GL_MAP_READ_BIT) != 0 && (access & writeOnlyBits) != 0)
>     {
>-        context->handleError(InvalidOperation()
>-                             << "Invalid access bits when mapping buffer for reading: 0x"
>-                             << std::hex << std::uppercase << access);
>+        context->validationError(GL_INVALID_OPERATION, kInvalidAccessBitsRead);
>         return false;
>     }
> 
>     if ((access & GL_MAP_WRITE_BIT) == 0 && (access & GL_MAP_FLUSH_EXPLICIT_BIT) != 0)
>     {
>-        context->handleError(
>-            InvalidOperation()
>-            << "The explicit flushing bit may only be set if the buffer is mapped for writing.");
>+        context->validationError(GL_INVALID_OPERATION, kInvalidAccessBitsFlush);
>         return false;
>     }
> 
>@@ -3659,34 +3754,33 @@ bool ValidateFlushMappedBufferRangeBase(Context *context,
> {
>     if (offset < 0)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidValue(), NegativeOffset);
>+        context->validationError(GL_INVALID_VALUE, kNegativeOffset);
>         return false;
>     }
> 
>     if (length < 0)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidValue(), NegativeLength);
>+        context->validationError(GL_INVALID_VALUE, kNegativeLength);
>         return false;
>     }
> 
>-    if (!ValidBufferType(context, target))
>+    if (!context->isValidBufferBinding(target))
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidEnum(), InvalidBufferTypes);
>+        context->validationError(GL_INVALID_ENUM, kInvalidBufferTypes);
>         return false;
>     }
> 
>-    Buffer *buffer = context->getGLState().getTargetBuffer(target);
>+    Buffer *buffer = context->getState().getTargetBuffer(target);
> 
>     if (buffer == nullptr)
>     {
>-        context->handleError(InvalidOperation() << "Attempted to flush buffer object zero.");
>+        context->validationError(GL_INVALID_OPERATION, kInvalidFlushZero);
>         return false;
>     }
> 
>     if (!buffer->isMapped() || (buffer->getAccessFlags() & GL_MAP_FLUSH_EXPLICIT_BIT) == 0)
>     {
>-        context->handleError(InvalidOperation()
>-                             << "Attempted to flush a buffer not mapped for explicit flushing.");
>+        context->validationError(GL_INVALID_OPERATION, kInvalidFlushTarget);
>         return false;
>     }
> 
>@@ -3697,8 +3791,7 @@ bool ValidateFlushMappedBufferRangeBase(Context *context,
>     if (!checkedSize.IsValid() ||
>         checkedSize.ValueOrDie() > static_cast<size_t>(buffer->getMapLength()))
>     {
>-        context->handleError(InvalidValue()
>-                             << "Flushed range does not fit into buffer mapping dimensions.");
>+        context->validationError(GL_INVALID_VALUE, kInvalidFlushOutOfRange);
>         return false;
>     }
> 
>@@ -3709,43 +3802,41 @@ bool ValidateGenOrDelete(Context *context, GLint n)
> {
>     if (n < 0)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidValue(), NegativeCount);
>+        context->validationError(GL_INVALID_VALUE, kNegativeCount);
>         return false;
>     }
>     return true;
> }
> 
>-bool ValidateRobustEntryPoint(ValidationContext *context, GLsizei bufSize)
>+bool ValidateRobustEntryPoint(Context *context, GLsizei bufSize)
> {
>     if (!context->getExtensions().robustClientMemory)
>     {
>-        context->handleError(InvalidOperation()
>-                             << "GL_ANGLE_robust_client_memory is not available.");
>+        context->validationError(GL_INVALID_OPERATION, kExtensionNotEnabled);
>         return false;
>     }
> 
>     if (bufSize < 0)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidValue(), NegativeBufferSize);
>+        context->validationError(GL_INVALID_VALUE, kNegativeBufferSize);
>         return false;
>     }
> 
>     return true;
> }
> 
>-bool ValidateRobustBufferSize(ValidationContext *context, GLsizei bufSize, GLsizei numParams)
>+bool ValidateRobustBufferSize(Context *context, GLsizei bufSize, GLsizei numParams)
> {
>     if (bufSize < numParams)
>     {
>-        context->handleError(InvalidOperation() << numParams << " parameters are required but "
>-                                                << bufSize << " were provided.");
>+        context->validationError(GL_INVALID_OPERATION, kInsufficientParams);
>         return false;
>     }
> 
>     return true;
> }
> 
>-bool ValidateGetFramebufferAttachmentParameterivBase(ValidationContext *context,
>+bool ValidateGetFramebufferAttachmentParameterivBase(Context *context,
>                                                      GLenum target,
>                                                      GLenum attachment,
>                                                      GLenum pname,
>@@ -3753,7 +3844,7 @@ bool ValidateGetFramebufferAttachmentParameterivBase(ValidationContext *context,
> {
>     if (!ValidFramebufferTarget(context, target))
>     {
>-        context->handleError(InvalidEnum());
>+        context->validationError(GL_INVALID_ENUM, kInvalidFramebufferTarget);
>         return false;
>     }
> 
>@@ -3767,13 +3858,11 @@ bool ValidateGetFramebufferAttachmentParameterivBase(ValidationContext *context,
>         case GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE:
>             break;
> 
>-        case GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_NUM_VIEWS_ANGLE:
>-        case GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_MULTIVIEW_LAYOUT_ANGLE:
>-        case GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_BASE_VIEW_INDEX_ANGLE:
>-        case GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_VIEWPORT_OFFSETS_ANGLE:
>-            if (clientVersion < 3 || !context->getExtensions().multiview)
>+        case GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_NUM_VIEWS_OVR:
>+        case GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_BASE_VIEW_INDEX_OVR:
>+            if (clientVersion < 3 || !context->getExtensions().multiview2)
>             {
>-                ANGLE_VALIDATION_ERR(context, InvalidEnum(), EnumNotSupported);
>+                context->validationError(GL_INVALID_ENUM, kEnumNotSupported);
>                 return false;
>             }
>             break;
>@@ -3781,7 +3870,7 @@ bool ValidateGetFramebufferAttachmentParameterivBase(ValidationContext *context,
>         case GL_FRAMEBUFFER_ATTACHMENT_COLOR_ENCODING:
>             if (clientVersion < 3 && !context->getExtensions().sRGB)
>             {
>-                context->handleError(InvalidEnum());
>+                context->validationError(GL_INVALID_ENUM, kEnumNotSupported);
>                 return false;
>             }
>             break;
>@@ -3796,13 +3885,21 @@ bool ValidateGetFramebufferAttachmentParameterivBase(ValidationContext *context,
>         case GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER:
>             if (clientVersion < 3)
>             {
>-                context->handleError(InvalidEnum());
>+                context->validationError(GL_INVALID_ENUM, kES3Required);
>+                return false;
>+            }
>+            break;
>+
>+        case GL_FRAMEBUFFER_ATTACHMENT_LAYERED_EXT:
>+            if (!context->getExtensions().geometryShader)
>+            {
>+                context->validationError(GL_INVALID_ENUM, kGeometryShaderExtensionNotEnabled);
>                 return false;
>             }
>             break;
> 
>         default:
>-            context->handleError(InvalidEnum());
>+            context->validationError(GL_INVALID_ENUM, kInvalidPname);
>             return false;
>     }
> 
>@@ -3814,7 +3911,7 @@ bool ValidateGetFramebufferAttachmentParameterivBase(ValidationContext *context,
>         case GL_STENCIL:
>             if (clientVersion < 3)
>             {
>-                ANGLE_VALIDATION_ERR(context, InvalidEnum(), InvalidAttachment);
>+                context->validationError(GL_INVALID_ENUM, kInvalidAttachment);
>                 return false;
>             }
>             break;
>@@ -3822,7 +3919,7 @@ bool ValidateGetFramebufferAttachmentParameterivBase(ValidationContext *context,
>         case GL_DEPTH_STENCIL_ATTACHMENT:
>             if (clientVersion < 3 && !context->isWebGL1())
>             {
>-                ANGLE_VALIDATION_ERR(context, InvalidEnum(), InvalidAttachment);
>+                context->validationError(GL_INVALID_ENUM, kInvalidAttachment);
>                 return false;
>             }
>             break;
>@@ -3837,20 +3934,20 @@ bool ValidateGetFramebufferAttachmentParameterivBase(ValidationContext *context,
>                 attachment < GL_COLOR_ATTACHMENT0_EXT ||
>                 (attachment - GL_COLOR_ATTACHMENT0_EXT) >= context->getCaps().maxColorAttachments)
>             {
>-                ANGLE_VALIDATION_ERR(context, InvalidEnum(), InvalidAttachment);
>+                context->validationError(GL_INVALID_ENUM, kInvalidAttachment);
>                 return false;
>             }
>             break;
>     }
> 
>-    const Framebuffer *framebuffer = context->getGLState().getTargetFramebuffer(target);
>+    const Framebuffer *framebuffer = context->getState().getTargetFramebuffer(target);
>     ASSERT(framebuffer);
> 
>     if (framebuffer->id() == 0)
>     {
>         if (clientVersion < 3)
>         {
>-            ANGLE_VALIDATION_ERR(context, InvalidOperation(), DefaultFramebufferTarget);
>+            context->validationError(GL_INVALID_OPERATION, kDefaultFramebufferTarget);
>             return false;
>         }
> 
>@@ -3862,7 +3959,7 @@ bool ValidateGetFramebufferAttachmentParameterivBase(ValidationContext *context,
>                 break;
> 
>             default:
>-                ANGLE_VALIDATION_ERR(context, InvalidOperation(), InvalidAttachment);
>+                context->validationError(GL_INVALID_OPERATION, kInvalidAttachment);
>                 return false;
>         }
>     }
>@@ -3883,19 +3980,19 @@ bool ValidateGetFramebufferAttachmentParameterivBase(ValidationContext *context,
>                 case GL_DEPTH_STENCIL_ATTACHMENT:
>                     if (!framebuffer->hasValidDepthStencil() && !context->isWebGL1())
>                     {
>-                        context->handleError(InvalidOperation());
>+                        context->validationError(GL_INVALID_OPERATION, kInvalidAttachment);
>                         return false;
>                     }
>                     break;
> 
>                 default:
>-                    ANGLE_VALIDATION_ERR(context, InvalidOperation(), InvalidAttachment);
>+                    context->validationError(GL_INVALID_OPERATION, kInvalidAttachment);
>                     return false;
>             }
>         }
>     }
> 
>-    const FramebufferAttachment *attachmentObject = framebuffer->getAttachment(attachment);
>+    const FramebufferAttachment *attachmentObject = framebuffer->getAttachment(context, attachment);
>     if (attachmentObject)
>     {
>         ASSERT(attachmentObject->type() == GL_RENDERBUFFER ||
>@@ -3908,7 +4005,7 @@ bool ValidateGetFramebufferAttachmentParameterivBase(ValidationContext *context,
>                 if (attachmentObject->type() != GL_RENDERBUFFER &&
>                     attachmentObject->type() != GL_TEXTURE)
>                 {
>-                    ANGLE_VALIDATION_ERR(context, InvalidEnum(), FramebufferIncompleteAttachment);
>+                    context->validationError(GL_INVALID_ENUM, kFramebufferIncompleteAttachment);
>                     return false;
>                 }
>                 break;
>@@ -3916,7 +4013,7 @@ bool ValidateGetFramebufferAttachmentParameterivBase(ValidationContext *context,
>             case GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL:
>                 if (attachmentObject->type() != GL_TEXTURE)
>                 {
>-                    ANGLE_VALIDATION_ERR(context, InvalidEnum(), FramebufferIncompleteAttachment);
>+                    context->validationError(GL_INVALID_ENUM, kFramebufferIncompleteAttachment);
>                     return false;
>                 }
>                 break;
>@@ -3924,7 +4021,7 @@ bool ValidateGetFramebufferAttachmentParameterivBase(ValidationContext *context,
>             case GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE:
>                 if (attachmentObject->type() != GL_TEXTURE)
>                 {
>-                    ANGLE_VALIDATION_ERR(context, InvalidEnum(), FramebufferIncompleteAttachment);
>+                    context->validationError(GL_INVALID_ENUM, kFramebufferIncompleteAttachment);
>                     return false;
>                 }
>                 break;
>@@ -3932,7 +4029,7 @@ bool ValidateGetFramebufferAttachmentParameterivBase(ValidationContext *context,
>             case GL_FRAMEBUFFER_ATTACHMENT_COMPONENT_TYPE:
>                 if (attachment == GL_DEPTH_STENCIL_ATTACHMENT)
>                 {
>-                    ANGLE_VALIDATION_ERR(context, InvalidOperation(), InvalidAttachment);
>+                    context->validationError(GL_INVALID_OPERATION, kInvalidAttachment);
>                     return false;
>                 }
>                 break;
>@@ -3940,7 +4037,7 @@ bool ValidateGetFramebufferAttachmentParameterivBase(ValidationContext *context,
>             case GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER:
>                 if (attachmentObject->type() != GL_TEXTURE)
>                 {
>-                    ANGLE_VALIDATION_ERR(context, InvalidEnum(), FramebufferIncompleteAttachment);
>+                    context->validationError(GL_INVALID_ENUM, kFramebufferIncompleteAttachment);
>                     return false;
>                 }
>                 break;
>@@ -3966,8 +4063,8 @@ bool ValidateGetFramebufferAttachmentParameterivBase(ValidationContext *context,
>             case GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME:
>                 if (clientVersion < 3)
>                 {
>-                    ANGLE_VALIDATION_ERR(context, InvalidEnum(),
>-                                         InvalidFramebufferAttachmentParameter);
>+                    context->validationError(GL_INVALID_ENUM,
>+                                             kInvalidFramebufferAttachmentParameter);
>                     return false;
>                 }
>                 break;
>@@ -3975,14 +4072,14 @@ bool ValidateGetFramebufferAttachmentParameterivBase(ValidationContext *context,
>             default:
>                 if (clientVersion < 3)
>                 {
>-                    ANGLE_VALIDATION_ERR(context, InvalidEnum(),
>-                                         InvalidFramebufferAttachmentParameter);
>+                    context->validationError(GL_INVALID_ENUM,
>+                                             kInvalidFramebufferAttachmentParameter);
>                     return false;
>                 }
>                 else
>                 {
>-                    ANGLE_VALIDATION_ERR(context, InvalidOperation(),
>-                                         InvalidFramebufferAttachmentParameter);
>+                    context->validationError(GL_INVALID_OPERATION,
>+                                             kInvalidFramebufferAttachmentParameter);
>                     return false;
>                 }
>         }
>@@ -3990,50 +4087,43 @@ bool ValidateGetFramebufferAttachmentParameterivBase(ValidationContext *context,
> 
>     if (numParams)
>     {
>-        if (pname == GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_VIEWPORT_OFFSETS_ANGLE)
>-        {
>-            // Only when the viewport offsets are queried we can have a varying number of output
>-            // parameters.
>-            const int numViews = attachmentObject ? attachmentObject->getNumViews() : 1;
>-            *numParams         = numViews * 2;
>-        }
>-        else
>-        {
>-            // For all other queries we can have only one output parameter.
>-            *numParams = 1;
>-        }
>+        *numParams = 1;
>     }
> 
>     return true;
> }
> 
>-bool ValidateGetFramebufferAttachmentParameterivRobustANGLE(ValidationContext *context,
>+bool ValidateGetFramebufferAttachmentParameterivRobustANGLE(Context *context,
>                                                             GLenum target,
>                                                             GLenum attachment,
>                                                             GLenum pname,
>                                                             GLsizei bufSize,
>-                                                            GLsizei *numParams)
>+                                                            GLsizei *length,
>+                                                            GLint *params)
> {
>     if (!ValidateRobustEntryPoint(context, bufSize))
>     {
>         return false;
>     }
> 
>+    GLsizei numParams = 0;
>     if (!ValidateGetFramebufferAttachmentParameterivBase(context, target, attachment, pname,
>-                                                         numParams))
>+                                                         &numParams))
>     {
>         return false;
>     }
> 
>-    if (!ValidateRobustBufferSize(context, bufSize, *numParams))
>+    if (!ValidateRobustBufferSize(context, bufSize, numParams))
>     {
>         return false;
>     }
> 
>+    SetRobustLengthParam(length, numParams);
>+
>     return true;
> }
> 
>-bool ValidateGetBufferParameterivRobustANGLE(ValidationContext *context,
>+bool ValidateGetBufferParameterivRobustANGLE(Context *context,
>                                              BufferBinding target,
>                                              GLenum pname,
>                                              GLsizei bufSize,
>@@ -4045,48 +4135,52 @@ bool ValidateGetBufferParameterivRobustANGLE(ValidationContext *context,
>         return false;
>     }
> 
>-    if (!ValidateGetBufferParameterBase(context, target, pname, false, length))
>+    GLsizei numParams = 0;
>+
>+    if (!ValidateGetBufferParameterBase(context, target, pname, false, &numParams))
>     {
>         return false;
>     }
> 
>-    if (!ValidateRobustBufferSize(context, bufSize, *length))
>+    if (!ValidateRobustBufferSize(context, bufSize, numParams))
>     {
>         return false;
>     }
> 
>+    SetRobustLengthParam(length, numParams);
>     return true;
> }
> 
>-bool ValidateGetBufferParameteri64vRobustANGLE(ValidationContext *context,
>+bool ValidateGetBufferParameteri64vRobustANGLE(Context *context,
>                                                BufferBinding target,
>                                                GLenum pname,
>                                                GLsizei bufSize,
>                                                GLsizei *length,
>                                                GLint64 *params)
> {
>+    GLsizei numParams = 0;
>+
>     if (!ValidateRobustEntryPoint(context, bufSize))
>     {
>         return false;
>     }
> 
>-    if (!ValidateGetBufferParameterBase(context, target, pname, false, length))
>+    if (!ValidateGetBufferParameterBase(context, target, pname, false, &numParams))
>     {
>         return false;
>     }
> 
>-    if (!ValidateRobustBufferSize(context, bufSize, *length))
>+    if (!ValidateRobustBufferSize(context, bufSize, numParams))
>     {
>         return false;
>     }
> 
>+    SetRobustLengthParam(length, numParams);
>+
>     return true;
> }
> 
>-bool ValidateGetProgramivBase(ValidationContext *context,
>-                              GLuint program,
>-                              GLenum pname,
>-                              GLsizei *numParams)
>+bool ValidateGetProgramivBase(Context *context, GLuint program, GLenum pname, GLsizei *numParams)
> {
>     // Currently, all GetProgramiv queries return 1 parameter
>     if (numParams)
>@@ -4094,7 +4188,26 @@ bool ValidateGetProgramivBase(ValidationContext *context,
>         *numParams = 1;
>     }
> 
>-    Program *programObject = GetValidProgram(context, program);
>+    if (context->isContextLost())
>+    {
>+        context->validationError(GL_CONTEXT_LOST, kContextLost);
>+
>+        if (context->getExtensions().parallelShaderCompile && pname == GL_COMPLETION_STATUS_KHR)
>+        {
>+            // Generate an error but still return true, the context still needs to return a
>+            // value in this case.
>+            return true;
>+        }
>+        else
>+        {
>+            return false;
>+        }
>+    }
>+
>+    // Special case for GL_COMPLETION_STATUS_KHR: don't resolve the link. Otherwise resolve it now.
>+    Program *programObject = (pname == GL_COMPLETION_STATUS_KHR)
>+                                 ? GetValidProgramNoResolve(context, program)
>+                                 : GetValidProgram(context, program);
>     if (!programObject)
>     {
>         return false;
>@@ -4116,9 +4229,7 @@ bool ValidateGetProgramivBase(ValidationContext *context,
>         case GL_PROGRAM_BINARY_LENGTH:
>             if (context->getClientMajorVersion() < 3 && !context->getExtensions().getProgramBinary)
>             {
>-                context->handleError(InvalidEnum() << "Querying GL_PROGRAM_BINARY_LENGTH "
>-                                                      "requires GL_OES_get_program_binary or "
>-                                                      "ES 3.0.");
>+                context->validationError(GL_INVALID_ENUM, kEnumNotSupported);
>                 return false;
>             }
>             break;
>@@ -4131,23 +4242,80 @@ bool ValidateGetProgramivBase(ValidationContext *context,
>         case GL_PROGRAM_BINARY_RETRIEVABLE_HINT:
>             if (context->getClientMajorVersion() < 3)
>             {
>-                ANGLE_VALIDATION_ERR(context, InvalidEnum(), ES3Required);
>+                context->validationError(GL_INVALID_ENUM, kEnumRequiresGLES30);
>                 return false;
>             }
>             break;
> 
>         case GL_PROGRAM_SEPARABLE:
>-        case GL_COMPUTE_WORK_GROUP_SIZE:
>         case GL_ACTIVE_ATOMIC_COUNTER_BUFFERS:
>             if (context->getClientVersion() < Version(3, 1))
>             {
>-                ANGLE_VALIDATION_ERR(context, InvalidEnum(), ES31Required);
>+                context->validationError(GL_INVALID_ENUM, kEnumRequiresGLES31);
>+                return false;
>+            }
>+            break;
>+
>+        case GL_COMPUTE_WORK_GROUP_SIZE:
>+            if (context->getClientVersion() < Version(3, 1))
>+            {
>+                context->validationError(GL_INVALID_ENUM, kEnumRequiresGLES31);
>+                return false;
>+            }
>+
>+            // [OpenGL ES 3.1] Chapter 7.12 Page 122
>+            // An INVALID_OPERATION error is generated if COMPUTE_WORK_GROUP_SIZE is queried for a
>+            // program which has not been linked successfully, or which does not contain objects to
>+            // form a compute shader.
>+            if (!programObject->isLinked())
>+            {
>+                context->validationError(GL_INVALID_OPERATION, kProgramNotLinked);
>+                return false;
>+            }
>+            if (!programObject->hasLinkedShaderStage(ShaderType::Compute))
>+            {
>+                context->validationError(GL_INVALID_OPERATION, kNoActiveComputeShaderStage);
>+                return false;
>+            }
>+            break;
>+
>+        case GL_GEOMETRY_LINKED_INPUT_TYPE_EXT:
>+        case GL_GEOMETRY_LINKED_OUTPUT_TYPE_EXT:
>+        case GL_GEOMETRY_LINKED_VERTICES_OUT_EXT:
>+        case GL_GEOMETRY_SHADER_INVOCATIONS_EXT:
>+            if (!context->getExtensions().geometryShader)
>+            {
>+                context->validationError(GL_INVALID_ENUM, kGeometryShaderExtensionNotEnabled);
>+                return false;
>+            }
>+
>+            // [EXT_geometry_shader] Chapter 7.12
>+            // An INVALID_OPERATION error is generated if GEOMETRY_LINKED_VERTICES_OUT_EXT,
>+            // GEOMETRY_LINKED_INPUT_TYPE_EXT, GEOMETRY_LINKED_OUTPUT_TYPE_EXT, or
>+            // GEOMETRY_SHADER_INVOCATIONS_EXT are queried for a program which has not been linked
>+            // successfully, or which does not contain objects to form a geometry shader.
>+            if (!programObject->isLinked())
>+            {
>+                context->validationError(GL_INVALID_OPERATION, kProgramNotLinked);
>+                return false;
>+            }
>+            if (!programObject->hasLinkedShaderStage(ShaderType::Geometry))
>+            {
>+                context->validationError(GL_INVALID_OPERATION, kNoActiveGeometryShaderStage);
>+                return false;
>+            }
>+            break;
>+
>+        case GL_COMPLETION_STATUS_KHR:
>+            if (!context->getExtensions().parallelShaderCompile)
>+            {
>+                context->validationError(GL_INVALID_OPERATION, kExtensionNotEnabled);
>                 return false;
>             }
>             break;
> 
>         default:
>-            ANGLE_VALIDATION_ERR(context, InvalidEnum(), EnumNotSupported);
>+            context->validationError(GL_INVALID_ENUM, kEnumNotSupported);
>             return false;
>     }
> 
>@@ -4158,23 +4326,28 @@ bool ValidateGetProgramivRobustANGLE(Context *context,
>                                      GLuint program,
>                                      GLenum pname,
>                                      GLsizei bufSize,
>-                                     GLsizei *numParams)
>+                                     GLsizei *length,
>+                                     GLint *params)
> {
>     if (!ValidateRobustEntryPoint(context, bufSize))
>     {
>         return false;
>     }
> 
>-    if (!ValidateGetProgramivBase(context, program, pname, numParams))
>+    GLsizei numParams = 0;
>+
>+    if (!ValidateGetProgramivBase(context, program, pname, &numParams))
>     {
>         return false;
>     }
> 
>-    if (!ValidateRobustBufferSize(context, bufSize, *numParams))
>+    if (!ValidateRobustBufferSize(context, bufSize, numParams))
>     {
>         return false;
>     }
> 
>+    SetRobustLengthParam(length, numParams);
>+
>     return true;
> }
> 
>@@ -4190,16 +4363,20 @@ bool ValidateGetRenderbufferParameterivRobustANGLE(Context *context,
>         return false;
>     }
> 
>-    if (!ValidateGetRenderbufferParameterivBase(context, target, pname, length))
>+    GLsizei numParams = 0;
>+
>+    if (!ValidateGetRenderbufferParameterivBase(context, target, pname, &numParams))
>     {
>         return false;
>     }
> 
>-    if (!ValidateRobustBufferSize(context, bufSize, *length))
>+    if (!ValidateRobustBufferSize(context, bufSize, numParams))
>     {
>         return false;
>     }
> 
>+    SetRobustLengthParam(length, numParams);
>+
>     return true;
> }
> 
>@@ -4215,21 +4392,25 @@ bool ValidateGetShaderivRobustANGLE(Context *context,
>         return false;
>     }
> 
>-    if (!ValidateGetShaderivBase(context, shader, pname, length))
>+    GLsizei numParams = 0;
>+
>+    if (!ValidateGetShaderivBase(context, shader, pname, &numParams))
>     {
>         return false;
>     }
> 
>-    if (!ValidateRobustBufferSize(context, bufSize, *length))
>+    if (!ValidateRobustBufferSize(context, bufSize, numParams))
>     {
>         return false;
>     }
> 
>+    SetRobustLengthParam(length, numParams);
>+
>     return true;
> }
> 
> bool ValidateGetTexParameterfvRobustANGLE(Context *context,
>-                                          GLenum target,
>+                                          TextureType target,
>                                           GLenum pname,
>                                           GLsizei bufSize,
>                                           GLsizei *length,
>@@ -4240,46 +4421,74 @@ bool ValidateGetTexParameterfvRobustANGLE(Context *context,
>         return false;
>     }
> 
>-    if (!ValidateGetTexParameterBase(context, target, pname, length))
>+    GLsizei numParams = 0;
>+
>+    if (!ValidateGetTexParameterBase(context, target, pname, &numParams))
>     {
>         return false;
>     }
> 
>-    if (!ValidateRobustBufferSize(context, bufSize, *length))
>+    if (!ValidateRobustBufferSize(context, bufSize, numParams))
>     {
>         return false;
>     }
> 
>+    SetRobustLengthParam(length, numParams);
>+
>     return true;
> }
> 
> bool ValidateGetTexParameterivRobustANGLE(Context *context,
>-                                          GLenum target,
>+                                          TextureType target,
>                                           GLenum pname,
>                                           GLsizei bufSize,
>                                           GLsizei *length,
>                                           GLint *params)
> {
>+
>     if (!ValidateRobustEntryPoint(context, bufSize))
>     {
>         return false;
>     }
>-
>-    if (!ValidateGetTexParameterBase(context, target, pname, length))
>+    GLsizei numParams = 0;
>+    if (!ValidateGetTexParameterBase(context, target, pname, &numParams))
>     {
>         return false;
>     }
> 
>-    if (!ValidateRobustBufferSize(context, bufSize, *length))
>+    if (!ValidateRobustBufferSize(context, bufSize, numParams))
>     {
>         return false;
>     }
> 
>+    SetRobustLengthParam(length, numParams);
>     return true;
> }
> 
>+bool ValidateGetTexParameterIivRobustANGLE(Context *context,
>+                                           TextureType target,
>+                                           GLenum pname,
>+                                           GLsizei bufSize,
>+                                           GLsizei *length,
>+                                           GLint *params)
>+{
>+    UNIMPLEMENTED();
>+    return false;
>+}
>+
>+bool ValidateGetTexParameterIuivRobustANGLE(Context *context,
>+                                            TextureType target,
>+                                            GLenum pname,
>+                                            GLsizei bufSize,
>+                                            GLsizei *length,
>+                                            GLuint *params)
>+{
>+    UNIMPLEMENTED();
>+    return false;
>+}
>+
> bool ValidateTexParameterfvRobustANGLE(Context *context,
>-                                       GLenum target,
>+                                       TextureType target,
>                                        GLenum pname,
>                                        GLsizei bufSize,
>                                        const GLfloat *params)
>@@ -4289,11 +4498,11 @@ bool ValidateTexParameterfvRobustANGLE(Context *context,
>         return false;
>     }
> 
>-    return ValidateTexParameterBase(context, target, pname, bufSize, params);
>+    return ValidateTexParameterBase(context, target, pname, bufSize, true, params);
> }
> 
> bool ValidateTexParameterivRobustANGLE(Context *context,
>-                                       GLenum target,
>+                                       TextureType target,
>                                        GLenum pname,
>                                        GLsizei bufSize,
>                                        const GLint *params)
>@@ -4303,13 +4512,33 @@ bool ValidateTexParameterivRobustANGLE(Context *context,
>         return false;
>     }
> 
>-    return ValidateTexParameterBase(context, target, pname, bufSize, params);
>+    return ValidateTexParameterBase(context, target, pname, bufSize, true, params);
>+}
>+
>+bool ValidateTexParameterIivRobustANGLE(Context *context,
>+                                        TextureType target,
>+                                        GLenum pname,
>+                                        GLsizei bufSize,
>+                                        const GLint *params)
>+{
>+    UNIMPLEMENTED();
>+    return false;
>+}
>+
>+bool ValidateTexParameterIuivRobustANGLE(Context *context,
>+                                         TextureType target,
>+                                         GLenum pname,
>+                                         GLsizei bufSize,
>+                                         const GLuint *params)
>+{
>+    UNIMPLEMENTED();
>+    return false;
> }
> 
> bool ValidateGetSamplerParameterfvRobustANGLE(Context *context,
>                                               GLuint sampler,
>                                               GLenum pname,
>-                                              GLuint bufSize,
>+                                              GLsizei bufSize,
>                                               GLsizei *length,
>                                               GLfloat *params)
> {
>@@ -4318,23 +4547,26 @@ bool ValidateGetSamplerParameterfvRobustANGLE(Context *context,
>         return false;
>     }
> 
>-    if (!ValidateGetSamplerParameterBase(context, sampler, pname, length))
>+    GLsizei numParams = 0;
>+
>+    if (!ValidateGetSamplerParameterBase(context, sampler, pname, &numParams))
>     {
>         return false;
>     }
> 
>-    if (!ValidateRobustBufferSize(context, bufSize, *length))
>+    if (!ValidateRobustBufferSize(context, bufSize, numParams))
>     {
>         return false;
>     }
> 
>+    SetRobustLengthParam(length, numParams);
>     return true;
> }
> 
> bool ValidateGetSamplerParameterivRobustANGLE(Context *context,
>                                               GLuint sampler,
>                                               GLenum pname,
>-                                              GLuint bufSize,
>+                                              GLsizei bufSize,
>                                               GLsizei *length,
>                                               GLint *params)
> {
>@@ -4343,19 +4575,44 @@ bool ValidateGetSamplerParameterivRobustANGLE(Context *context,
>         return false;
>     }
> 
>-    if (!ValidateGetSamplerParameterBase(context, sampler, pname, length))
>+    GLsizei numParams = 0;
>+
>+    if (!ValidateGetSamplerParameterBase(context, sampler, pname, &numParams))
>     {
>         return false;
>     }
> 
>-    if (!ValidateRobustBufferSize(context, bufSize, *length))
>+    if (!ValidateRobustBufferSize(context, bufSize, numParams))
>     {
>         return false;
>     }
> 
>+    SetRobustLengthParam(length, numParams);
>     return true;
> }
> 
>+bool ValidateGetSamplerParameterIivRobustANGLE(Context *context,
>+                                               GLuint sampler,
>+                                               GLenum pname,
>+                                               GLsizei bufSize,
>+                                               GLsizei *length,
>+                                               GLint *params)
>+{
>+    UNIMPLEMENTED();
>+    return false;
>+}
>+
>+bool ValidateGetSamplerParameterIuivRobustANGLE(Context *context,
>+                                                GLuint sampler,
>+                                                GLenum pname,
>+                                                GLsizei bufSize,
>+                                                GLsizei *length,
>+                                                GLuint *params)
>+{
>+    UNIMPLEMENTED();
>+    return false;
>+}
>+
> bool ValidateSamplerParameterfvRobustANGLE(Context *context,
>                                            GLuint sampler,
>                                            GLenum pname,
>@@ -4367,7 +4624,7 @@ bool ValidateSamplerParameterfvRobustANGLE(Context *context,
>         return false;
>     }
> 
>-    return ValidateSamplerParameterBase(context, sampler, pname, bufSize, params);
>+    return ValidateSamplerParameterBase(context, sampler, pname, bufSize, true, params);
> }
> 
> bool ValidateSamplerParameterivRobustANGLE(Context *context,
>@@ -4381,7 +4638,27 @@ bool ValidateSamplerParameterivRobustANGLE(Context *context,
>         return false;
>     }
> 
>-    return ValidateSamplerParameterBase(context, sampler, pname, bufSize, params);
>+    return ValidateSamplerParameterBase(context, sampler, pname, bufSize, true, params);
>+}
>+
>+bool ValidateSamplerParameterIivRobustANGLE(Context *context,
>+                                            GLuint sampler,
>+                                            GLenum pname,
>+                                            GLsizei bufSize,
>+                                            const GLint *param)
>+{
>+    UNIMPLEMENTED();
>+    return false;
>+}
>+
>+bool ValidateSamplerParameterIuivRobustANGLE(Context *context,
>+                                             GLuint sampler,
>+                                             GLenum pname,
>+                                             GLsizei bufSize,
>+                                             const GLuint *param)
>+{
>+    UNIMPLEMENTED();
>+    return false;
> }
> 
> bool ValidateGetVertexAttribfvRobustANGLE(Context *context,
>@@ -4396,16 +4673,19 @@ bool ValidateGetVertexAttribfvRobustANGLE(Context *context,
>         return false;
>     }
> 
>-    if (!ValidateGetVertexAttribBase(context, index, pname, length, false, false))
>+    GLsizei writeLength = 0;
>+
>+    if (!ValidateGetVertexAttribBase(context, index, pname, &writeLength, false, false))
>     {
>         return false;
>     }
> 
>-    if (!ValidateRobustBufferSize(context, bufSize, *length))
>+    if (!ValidateRobustBufferSize(context, bufSize, writeLength))
>     {
>         return false;
>     }
> 
>+    SetRobustLengthParam(length, writeLength);
>     return true;
> }
> 
>@@ -4421,16 +4701,20 @@ bool ValidateGetVertexAttribivRobustANGLE(Context *context,
>         return false;
>     }
> 
>-    if (!ValidateGetVertexAttribBase(context, index, pname, length, false, false))
>+    GLsizei writeLength = 0;
>+
>+    if (!ValidateGetVertexAttribBase(context, index, pname, &writeLength, false, false))
>     {
>         return false;
>     }
> 
>-    if (!ValidateRobustBufferSize(context, bufSize, *length))
>+    if (!ValidateRobustBufferSize(context, bufSize, writeLength))
>     {
>         return false;
>     }
> 
>+    SetRobustLengthParam(length, writeLength);
>+
>     return true;
> }
> 
>@@ -4446,16 +4730,20 @@ bool ValidateGetVertexAttribPointervRobustANGLE(Context *context,
>         return false;
>     }
> 
>-    if (!ValidateGetVertexAttribBase(context, index, pname, length, true, false))
>+    GLsizei writeLength = 0;
>+
>+    if (!ValidateGetVertexAttribBase(context, index, pname, &writeLength, true, false))
>     {
>         return false;
>     }
> 
>-    if (!ValidateRobustBufferSize(context, bufSize, *length))
>+    if (!ValidateRobustBufferSize(context, bufSize, writeLength))
>     {
>         return false;
>     }
> 
>+    SetRobustLengthParam(length, writeLength);
>+
>     return true;
> }
> 
>@@ -4471,16 +4759,20 @@ bool ValidateGetVertexAttribIivRobustANGLE(Context *context,
>         return false;
>     }
> 
>-    if (!ValidateGetVertexAttribBase(context, index, pname, length, false, true))
>+    GLsizei writeLength = 0;
>+
>+    if (!ValidateGetVertexAttribBase(context, index, pname, &writeLength, false, true))
>     {
>         return false;
>     }
> 
>-    if (!ValidateRobustBufferSize(context, bufSize, *length))
>+    if (!ValidateRobustBufferSize(context, bufSize, writeLength))
>     {
>         return false;
>     }
> 
>+    SetRobustLengthParam(length, writeLength);
>+
>     return true;
> }
> 
>@@ -4496,16 +4788,20 @@ bool ValidateGetVertexAttribIuivRobustANGLE(Context *context,
>         return false;
>     }
> 
>-    if (!ValidateGetVertexAttribBase(context, index, pname, length, false, true))
>+    GLsizei writeLength = 0;
>+
>+    if (!ValidateGetVertexAttribBase(context, index, pname, &writeLength, false, true))
>     {
>         return false;
>     }
> 
>-    if (!ValidateRobustBufferSize(context, bufSize, *length))
>+    if (!ValidateRobustBufferSize(context, bufSize, writeLength))
>     {
>         return false;
>     }
> 
>+    SetRobustLengthParam(length, writeLength);
>+
>     return true;
> }
> 
>@@ -4522,20 +4818,25 @@ bool ValidateGetActiveUniformBlockivRobustANGLE(Context *context,
>         return false;
>     }
> 
>-    if (!ValidateGetActiveUniformBlockivBase(context, program, uniformBlockIndex, pname, length))
>+    GLsizei writeLength = 0;
>+
>+    if (!ValidateGetActiveUniformBlockivBase(context, program, uniformBlockIndex, pname,
>+                                             &writeLength))
>     {
>         return false;
>     }
> 
>-    if (!ValidateRobustBufferSize(context, bufSize, *length))
>+    if (!ValidateRobustBufferSize(context, bufSize, writeLength))
>     {
>         return false;
>     }
> 
>+    SetRobustLengthParam(length, writeLength);
>+
>     return true;
> }
> 
>-bool ValidateGetInternalFormativRobustANGLE(Context *context,
>+bool ValidateGetInternalformativRobustANGLE(Context *context,
>                                             GLenum target,
>                                             GLenum internalformat,
>                                             GLenum pname,
>@@ -4548,105 +4849,20 @@ bool ValidateGetInternalFormativRobustANGLE(Context *context,
>         return false;
>     }
> 
>-    if (!ValidateGetInternalFormativBase(context, target, internalformat, pname, bufSize, length))
>-    {
>-        return false;
>-    }
>-
>-    if (!ValidateRobustBufferSize(context, bufSize, *length))
>-    {
>-        return false;
>-    }
>-
>-    return true;
>-}
>+    GLsizei numParams = 0;
> 
>-bool ValidateVertexFormatBase(ValidationContext *context,
>-                              GLuint attribIndex,
>-                              GLint size,
>-                              GLenum type,
>-                              GLboolean pureInteger)
>-{
>-    const Caps &caps = context->getCaps();
>-    if (attribIndex >= caps.maxVertexAttributes)
>+    if (!ValidateGetInternalFormativBase(context, target, internalformat, pname, bufSize,
>+                                         &numParams))
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidValue(), IndexExceedsMaxVertexAttribute);
>         return false;
>     }
> 
>-    if (size < 1 || size > 4)
>+    if (!ValidateRobustBufferSize(context, bufSize, numParams))
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidValue(), InvalidVertexAttrSize);
>         return false;
>     }
> 
>-    switch (type)
>-    {
>-        case GL_BYTE:
>-        case GL_UNSIGNED_BYTE:
>-        case GL_SHORT:
>-        case GL_UNSIGNED_SHORT:
>-            break;
>-
>-        case GL_INT:
>-        case GL_UNSIGNED_INT:
>-            if (context->getClientMajorVersion() < 3)
>-            {
>-                context->handleError(InvalidEnum()
>-                                     << "Vertex type not supported before OpenGL ES 3.0.");
>-                return false;
>-            }
>-            break;
>-
>-        case GL_FIXED:
>-        case GL_FLOAT:
>-            if (pureInteger)
>-            {
>-                ANGLE_VALIDATION_ERR(context, InvalidEnum(), InvalidTypePureInt);
>-                return false;
>-            }
>-            break;
>-
>-        case GL_HALF_FLOAT:
>-            if (context->getClientMajorVersion() < 3)
>-            {
>-                context->handleError(InvalidEnum()
>-                                     << "Vertex type not supported before OpenGL ES 3.0.");
>-                return false;
>-            }
>-            if (pureInteger)
>-            {
>-                ANGLE_VALIDATION_ERR(context, InvalidEnum(), InvalidTypePureInt);
>-                return false;
>-            }
>-            break;
>-
>-        case GL_INT_2_10_10_10_REV:
>-        case GL_UNSIGNED_INT_2_10_10_10_REV:
>-            if (context->getClientMajorVersion() < 3)
>-            {
>-                context->handleError(InvalidEnum()
>-                                     << "Vertex type not supported before OpenGL ES 3.0.");
>-                return false;
>-            }
>-            if (pureInteger)
>-            {
>-                ANGLE_VALIDATION_ERR(context, InvalidEnum(), InvalidTypePureInt);
>-                return false;
>-            }
>-            if (size != 4)
>-            {
>-                context->handleError(InvalidOperation() << "Type is INT_2_10_10_10_REV or "
>-                                                           "UNSIGNED_INT_2_10_10_10_REV and "
>-                                                           "size is not 4.");
>-                return false;
>-            }
>-            break;
>-
>-        default:
>-            ANGLE_VALIDATION_ERR(context, InvalidEnum(), InvalidType);
>-            return false;
>-    }
>+    SetRobustLengthParam(length, numParams);
> 
>     return true;
> }
>@@ -4655,22 +4871,20 @@ bool ValidateVertexFormatBase(ValidationContext *context,
> // In the WebGL 2 API, trying to perform a clear when there is a mismatch between the type of the
> // specified clear value and the type of a buffer that is being cleared generates an
> // INVALID_OPERATION error instead of producing undefined results
>-bool ValidateWebGLFramebufferAttachmentClearType(ValidationContext *context,
>+bool ValidateWebGLFramebufferAttachmentClearType(Context *context,
>                                                  GLint drawbuffer,
>                                                  const GLenum *validComponentTypes,
>                                                  size_t validComponentTypeCount)
> {
>     const FramebufferAttachment *attachment =
>-        context->getGLState().getDrawFramebuffer()->getDrawBuffer(drawbuffer);
>+        context->getState().getDrawFramebuffer()->getDrawBuffer(drawbuffer);
>     if (attachment)
>     {
>         GLenum componentType = attachment->getFormat().info->componentType;
>         const GLenum *end    = validComponentTypes + validComponentTypeCount;
>         if (std::find(validComponentTypes, end, componentType) == end)
>         {
>-            context->handleError(
>-                InvalidOperation()
>-                << "No defined conversion between clear value and attachment format.");
>+            context->validationError(GL_INVALID_OPERATION, kNoDefinedClearConversion);
>             return false;
>         }
>     }
>@@ -4678,28 +4892,25 @@ bool ValidateWebGLFramebufferAttachmentClearType(ValidationContext *context,
>     return true;
> }
> 
>-bool ValidateRobustCompressedTexImageBase(ValidationContext *context,
>-                                          GLsizei imageSize,
>-                                          GLsizei dataSize)
>+bool ValidateRobustCompressedTexImageBase(Context *context, GLsizei imageSize, GLsizei dataSize)
> {
>     if (!ValidateRobustEntryPoint(context, dataSize))
>     {
>         return false;
>     }
> 
>-    gl::Buffer *pixelUnpackBuffer =
>-        context->getGLState().getTargetBuffer(BufferBinding::PixelUnpack);
>+    Buffer *pixelUnpackBuffer = context->getState().getTargetBuffer(BufferBinding::PixelUnpack);
>     if (pixelUnpackBuffer == nullptr)
>     {
>         if (dataSize < imageSize)
>         {
>-            context->handleError(InvalidOperation() << "dataSize must be at least " << imageSize);
>+            context->validationError(GL_INVALID_OPERATION, kCompressedDataSizeTooSmall);
>         }
>     }
>     return true;
> }
> 
>-bool ValidateGetBufferParameterBase(ValidationContext *context,
>+bool ValidateGetBufferParameterBase(Context *context,
>                                     BufferBinding target,
>                                     GLenum pname,
>                                     bool pointerVersion,
>@@ -4710,17 +4921,17 @@ bool ValidateGetBufferParameterBase(ValidationContext *context,
>         *numParams = 0;
>     }
> 
>-    if (!ValidBufferType(context, target))
>+    if (!context->isValidBufferBinding(target))
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidEnum(), InvalidBufferTypes);
>+        context->validationError(GL_INVALID_ENUM, kInvalidBufferTypes);
>         return false;
>     }
> 
>-    const Buffer *buffer = context->getGLState().getTargetBuffer(target);
>+    const Buffer *buffer = context->getState().getTargetBuffer(target);
>     if (!buffer)
>     {
>         // A null buffer means that "0" is bound to the requested buffer target
>-        ANGLE_VALIDATION_ERR(context, InvalidOperation(), BufferNotBound);
>+        context->validationError(GL_INVALID_OPERATION, kBufferNotBound);
>         return false;
>     }
> 
>@@ -4735,8 +4946,7 @@ bool ValidateGetBufferParameterBase(ValidationContext *context,
>         case GL_BUFFER_ACCESS_OES:
>             if (!extensions.mapBuffer)
>             {
>-                context->handleError(InvalidEnum()
>-                                     << "pname requires OpenGL ES 3.0 or GL_OES_mapbuffer.");
>+                context->validationError(GL_INVALID_ENUM, kEnumNotSupported);
>                 return false;
>             }
>             break;
>@@ -4746,9 +4956,7 @@ bool ValidateGetBufferParameterBase(ValidationContext *context,
>             if (context->getClientMajorVersion() < 3 && !extensions.mapBuffer &&
>                 !extensions.mapBufferRange)
>             {
>-                context->handleError(InvalidEnum() << "pname requires OpenGL ES 3.0, "
>-                                                      "GL_OES_mapbuffer or "
>-                                                      "GL_EXT_map_buffer_range.");
>+                context->validationError(GL_INVALID_ENUM, kEnumNotSupported);
>                 return false;
>             }
>             break;
>@@ -4756,9 +4964,7 @@ bool ValidateGetBufferParameterBase(ValidationContext *context,
>         case GL_BUFFER_MAP_POINTER:
>             if (!pointerVersion)
>             {
>-                context->handleError(
>-                    InvalidEnum()
>-                    << "GL_BUFFER_MAP_POINTER can only be queried with GetBufferPointerv.");
>+                context->validationError(GL_INVALID_ENUM, kInvalidMapPointerQuery);
>                 return false;
>             }
>             break;
>@@ -4768,14 +4974,21 @@ bool ValidateGetBufferParameterBase(ValidationContext *context,
>         case GL_BUFFER_MAP_LENGTH:
>             if (context->getClientMajorVersion() < 3 && !extensions.mapBufferRange)
>             {
>-                context->handleError(InvalidEnum()
>-                                     << "pname requires OpenGL ES 3.0 or GL_EXT_map_buffer_range.");
>+                context->validationError(GL_INVALID_ENUM, kEnumNotSupported);
>+                return false;
>+            }
>+            break;
>+
>+        case GL_MEMORY_SIZE_ANGLE:
>+            if (!context->getExtensions().memorySize)
>+            {
>+                context->validationError(GL_INVALID_ENUM, kExtensionNotEnabled);
>                 return false;
>             }
>             break;
> 
>         default:
>-            ANGLE_VALIDATION_ERR(context, InvalidEnum(), EnumNotSupported);
>+            context->validationError(GL_INVALID_ENUM, kEnumNotSupported);
>             return false;
>     }
> 
>@@ -4800,14 +5013,14 @@ bool ValidateGetRenderbufferParameterivBase(Context *context,
> 
>     if (target != GL_RENDERBUFFER)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidEnum(), InvalidRenderbufferTarget);
>+        context->validationError(GL_INVALID_ENUM, kInvalidRenderbufferTarget);
>         return false;
>     }
> 
>-    Renderbuffer *renderbuffer = context->getGLState().getCurrentRenderbuffer();
>+    Renderbuffer *renderbuffer = context->getState().getCurrentRenderbuffer();
>     if (renderbuffer == nullptr)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidOperation(), RenderbufferNotBound);
>+        context->validationError(GL_INVALID_OPERATION, kRenderbufferNotBound);
>         return false;
>     }
> 
>@@ -4827,13 +5040,21 @@ bool ValidateGetRenderbufferParameterivBase(Context *context,
>         case GL_RENDERBUFFER_SAMPLES_ANGLE:
>             if (!context->getExtensions().framebufferMultisample)
>             {
>-                ANGLE_VALIDATION_ERR(context, InvalidEnum(), ExtensionNotEnabled);
>+                context->validationError(GL_INVALID_ENUM, kExtensionNotEnabled);
>+                return false;
>+            }
>+            break;
>+
>+        case GL_MEMORY_SIZE_ANGLE:
>+            if (!context->getExtensions().memorySize)
>+            {
>+                context->validationError(GL_INVALID_ENUM, kExtensionNotEnabled);
>                 return false;
>             }
>             break;
> 
>         default:
>-            ANGLE_VALIDATION_ERR(context, InvalidEnum(), EnumNotSupported);
>+            context->validationError(GL_INVALID_ENUM, kEnumNotSupported);
>             return false;
>     }
> 
>@@ -4851,6 +5072,22 @@ bool ValidateGetShaderivBase(Context *context, GLuint shader, GLenum pname, GLsi
>         *length = 0;
>     }
> 
>+    if (context->isContextLost())
>+    {
>+        context->validationError(GL_CONTEXT_LOST, kContextLost);
>+
>+        if (context->getExtensions().parallelShaderCompile && pname == GL_COMPLETION_STATUS_KHR)
>+        {
>+            // Generate an error but still return true, the context still needs to return a
>+            // value in this case.
>+            return true;
>+        }
>+        else
>+        {
>+            return false;
>+        }
>+    }
>+
>     if (GetValidShader(context, shader) == nullptr)
>     {
>         return false;
>@@ -4868,13 +5105,21 @@ bool ValidateGetShaderivBase(Context *context, GLuint shader, GLenum pname, GLsi
>         case GL_TRANSLATED_SHADER_SOURCE_LENGTH_ANGLE:
>             if (!context->getExtensions().translatedShaderSource)
>             {
>-                ANGLE_VALIDATION_ERR(context, InvalidEnum(), ExtensionNotEnabled);
>+                context->validationError(GL_INVALID_ENUM, kExtensionNotEnabled);
>+                return false;
>+            }
>+            break;
>+
>+        case GL_COMPLETION_STATUS_KHR:
>+            if (!context->getExtensions().parallelShaderCompile)
>+            {
>+                context->validationError(GL_INVALID_OPERATION, kExtensionNotEnabled);
>                 return false;
>             }
>             break;
> 
>         default:
>-            ANGLE_VALIDATION_ERR(context, InvalidEnum(), EnumNotSupported);
>+            context->validationError(GL_INVALID_ENUM, kEnumNotSupported);
>             return false;
>     }
> 
>@@ -4885,7 +5130,10 @@ bool ValidateGetShaderivBase(Context *context, GLuint shader, GLenum pname, GLsi
>     return true;
> }
> 
>-bool ValidateGetTexParameterBase(Context *context, GLenum target, GLenum pname, GLsizei *length)
>+bool ValidateGetTexParameterBase(Context *context,
>+                                 TextureType target,
>+                                 GLenum pname,
>+                                 GLsizei *length)
> {
>     if (length)
>     {
>@@ -4894,14 +5142,20 @@ bool ValidateGetTexParameterBase(Context *context, GLenum target, GLenum pname,
> 
>     if (!ValidTextureTarget(context, target) && !ValidTextureExternalTarget(context, target))
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidEnum(), InvalidTextureTarget);
>+        context->validationError(GL_INVALID_ENUM, kInvalidTextureTarget);
>         return false;
>     }
> 
>-    if (context->getTargetTexture(target) == nullptr)
>+    if (context->getTextureByType(target) == nullptr)
>     {
>         // Should only be possible for external textures
>-        ANGLE_VALIDATION_ERR(context, InvalidEnum(), TextureNotBound);
>+        context->validationError(GL_INVALID_ENUM, kTextureNotBound);
>+        return false;
>+    }
>+
>+    if (context->getClientMajorVersion() == 1 && !IsValidGLES1TextureParameter(pname))
>+    {
>+        context->validationError(GL_INVALID_ENUM, kEnumNotSupported);
>         return false;
>     }
> 
>@@ -4916,15 +5170,14 @@ bool ValidateGetTexParameterBase(Context *context, GLenum target, GLenum pname,
>         case GL_TEXTURE_USAGE_ANGLE:
>             if (!context->getExtensions().textureUsage)
>             {
>-                ANGLE_VALIDATION_ERR(context, InvalidEnum(), ExtensionNotEnabled);
>+                context->validationError(GL_INVALID_ENUM, kEnumNotSupported);
>                 return false;
>             }
>             break;
> 
>         case GL_TEXTURE_MAX_ANISOTROPY_EXT:
>-            if (!context->getExtensions().textureFilterAnisotropic)
>+            if (!ValidateTextureMaxAnisotropyExtensionEnabled(context))
>             {
>-                ANGLE_VALIDATION_ERR(context, InvalidEnum(), ExtensionNotEnabled);
>                 return false;
>             }
>             break;
>@@ -4932,7 +5185,7 @@ bool ValidateGetTexParameterBase(Context *context, GLenum target, GLenum pname,
>         case GL_TEXTURE_IMMUTABLE_FORMAT:
>             if (context->getClientMajorVersion() < 3 && !context->getExtensions().textureStorage)
>             {
>-                ANGLE_VALIDATION_ERR(context, InvalidEnum(), ExtensionNotEnabled);
>+                context->validationError(GL_INVALID_ENUM, kEnumNotSupported);
>                 return false;
>             }
>             break;
>@@ -4951,27 +5204,62 @@ bool ValidateGetTexParameterBase(Context *context, GLenum target, GLenum pname,
>         case GL_TEXTURE_COMPARE_FUNC:
>             if (context->getClientMajorVersion() < 3)
>             {
>-                context->handleError(InvalidEnum() << "pname requires OpenGL ES 3.0.");
>+                context->validationError(GL_INVALID_ENUM, kEnumRequiresGLES30);
>+                return false;
>+            }
>+            break;
>+
>+        case GL_TEXTURE_SRGB_DECODE_EXT:
>+            if (!context->getExtensions().textureSRGBDecode)
>+            {
>+                context->validationError(GL_INVALID_ENUM, kEnumNotSupported);
>+                return false;
>+            }
>+            break;
>+
>+        case GL_DEPTH_STENCIL_TEXTURE_MODE:
>+            if (context->getClientVersion() < Version(3, 1))
>+            {
>+                context->validationError(GL_INVALID_ENUM, kEnumRequiresGLES31);
>+                return false;
>+            }
>+            break;
>+
>+        case GL_GENERATE_MIPMAP:
>+        case GL_TEXTURE_CROP_RECT_OES:
>+            // TODO(lfy@google.com): Restrict to GL_OES_draw_texture
>+            // after GL_OES_draw_texture functionality implemented
>+            if (context->getClientMajorVersion() > 1)
>+            {
>+                context->validationError(GL_INVALID_ENUM, kGLES1Only);
>+                return false;
>+            }
>+            break;
>+
>+        case GL_MEMORY_SIZE_ANGLE:
>+            if (!context->getExtensions().memorySize)
>+            {
>+                context->validationError(GL_INVALID_ENUM, kEnumNotSupported);
>                 return false;
>             }
>             break;
> 
>-        case GL_TEXTURE_SRGB_DECODE_EXT:
>-            if (!context->getExtensions().textureSRGBDecode)
>+        case GL_TEXTURE_BORDER_COLOR:
>+            if (!context->getExtensions().textureBorderClamp)
>             {
>-                context->handleError(InvalidEnum() << "GL_EXT_texture_sRGB_decode is not enabled.");
>+                context->validationError(GL_INVALID_ENUM, kExtensionNotEnabled);
>                 return false;
>             }
>             break;
> 
>         default:
>-            ANGLE_VALIDATION_ERR(context, InvalidEnum(), EnumNotSupported);
>+            context->validationError(GL_INVALID_ENUM, kEnumNotSupported);
>             return false;
>     }
> 
>     if (length)
>     {
>-        *length = 1;
>+        *length = GetTexParameterCount(pname);
>     }
>     return true;
> }
>@@ -4990,13 +5278,13 @@ bool ValidateGetVertexAttribBase(Context *context,
> 
>     if (pureIntegerEntryPoint && context->getClientMajorVersion() < 3)
>     {
>-        context->handleError(InvalidOperation() << "Context does not support OpenGL ES 3.0.");
>+        context->validationError(GL_INVALID_OPERATION, kES3Required);
>         return false;
>     }
> 
>     if (index >= context->getCaps().maxVertexAttributes)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidValue(), IndexExceedsMaxVertexAttribute);
>+        context->validationError(GL_INVALID_VALUE, kIndexExceedsMaxVertexAttribute);
>         return false;
>     }
> 
>@@ -5004,7 +5292,7 @@ bool ValidateGetVertexAttribBase(Context *context,
>     {
>         if (pname != GL_VERTEX_ATTRIB_ARRAY_POINTER)
>         {
>-            ANGLE_VALIDATION_ERR(context, InvalidEnum(), EnumNotSupported);
>+            context->validationError(GL_INVALID_ENUM, kEnumNotSupported);
>             return false;
>         }
>     }
>@@ -5026,11 +5314,9 @@ bool ValidateGetVertexAttribBase(Context *context,
>                     GL_VERTEX_ATTRIB_ARRAY_DIVISOR == GL_VERTEX_ATTRIB_ARRAY_DIVISOR_ANGLE,
>                     "ANGLE extension enums not equal to GL enums.");
>                 if (context->getClientMajorVersion() < 3 &&
>-                    !context->getExtensions().instancedArrays)
>+                    !context->getExtensions().instancedArraysAny())
>                 {
>-                    context->handleError(InvalidEnum() << "GL_VERTEX_ATTRIB_ARRAY_DIVISOR "
>-                                                          "requires OpenGL ES 3.0 or "
>-                                                          "GL_ANGLE_instanced_arrays.");
>+                    context->validationError(GL_INVALID_ENUM, kEnumNotSupported);
>                     return false;
>                 }
>                 break;
>@@ -5038,8 +5324,7 @@ bool ValidateGetVertexAttribBase(Context *context,
>             case GL_VERTEX_ATTRIB_ARRAY_INTEGER:
>                 if (context->getClientMajorVersion() < 3)
>                 {
>-                    context->handleError(
>-                        InvalidEnum() << "GL_VERTEX_ATTRIB_ARRAY_INTEGER requires OpenGL ES 3.0.");
>+                    context->validationError(GL_INVALID_ENUM, kEnumNotSupported);
>                     return false;
>                 }
>                 break;
>@@ -5048,14 +5333,13 @@ bool ValidateGetVertexAttribBase(Context *context,
>             case GL_VERTEX_ATTRIB_RELATIVE_OFFSET:
>                 if (context->getClientVersion() < ES_3_1)
>                 {
>-                    context->handleError(InvalidEnum()
>-                                         << "Vertex Attrib Bindings require OpenGL ES 3.1.");
>+                    context->validationError(GL_INVALID_ENUM, kEnumRequiresGLES31);
>                     return false;
>                 }
>                 break;
> 
>             default:
>-                ANGLE_VALIDATION_ERR(context, InvalidEnum(), EnumNotSupported);
>+                context->validationError(GL_INVALID_ENUM, kEnumNotSupported);
>                 return false;
>         }
>     }
>@@ -5103,30 +5387,28 @@ bool ValidateReadPixelsBase(Context *context,
> 
>     if (width < 0 || height < 0)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidValue(), NegativeSize);
>+        context->validationError(GL_INVALID_VALUE, kNegativeSize);
>         return false;
>     }
> 
>-    Framebuffer *readFramebuffer = context->getGLState().getReadFramebuffer();
>+    Framebuffer *readFramebuffer = context->getState().getReadFramebuffer();
> 
>-    if (readFramebuffer->checkStatus(context) != GL_FRAMEBUFFER_COMPLETE)
>+    if (!ValidateFramebufferComplete(context, readFramebuffer))
>     {
>-        context->handleError(InvalidFramebufferOperation());
>         return false;
>     }
> 
>-    if (readFramebuffer->id() != 0 && readFramebuffer->getSamples(context) != 0)
>+    if (readFramebuffer->id() != 0 && !ValidateFramebufferNotMultisampled(context, readFramebuffer))
>     {
>-        context->handleError(InvalidOperation());
>         return false;
>     }
> 
>-    const Framebuffer *framebuffer = context->getGLState().getReadFramebuffer();
>+    Framebuffer *framebuffer = context->getState().getReadFramebuffer();
>     ASSERT(framebuffer);
> 
>     if (framebuffer->getReadBufferState() == GL_NONE)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidOperation(), ReadBufferNone);
>+        context->validationError(GL_INVALID_OPERATION, kReadBufferNone);
>         return false;
>     }
> 
>@@ -5137,17 +5419,16 @@ bool ValidateReadPixelsBase(Context *context,
>     // situation is an application error that would lead to a crash in ANGLE.
>     if (readBuffer == nullptr)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidOperation(), MissingReadAttachment);
>+        context->validationError(GL_INVALID_OPERATION, kMissingReadAttachment);
>         return false;
>     }
> 
>-    // ANGLE_multiview, Revision 1:
>-    // ReadPixels generates an INVALID_FRAMEBUFFER_OPERATION error if the multi-view layout of the
>-    // current read framebuffer is not NONE.
>-    if (readBuffer->getMultiviewLayout() != GL_NONE)
>+    // OVR_multiview2, Revision 1:
>+    // ReadPixels generates an INVALID_FRAMEBUFFER_OPERATION error if
>+    // the number of views in the current read framebuffer is more than one.
>+    if (framebuffer->readDisallowedByMultiview())
>     {
>-        context->handleError(InvalidFramebufferOperation()
>-                             << "Attempting to read from a multi-view framebuffer.");
>+        context->validationError(GL_INVALID_FRAMEBUFFER_OPERATION, kMultiviewReadFramebuffer);
>         return false;
>     }
> 
>@@ -5162,19 +5443,23 @@ bool ValidateReadPixelsBase(Context *context,
>         // dEQP/WebGL.
>         if (!ValidReadPixelsFormatEnum(context, format))
>         {
>-            ANGLE_VALIDATION_ERR(context, InvalidEnum(), InvalidFormat);
>+            context->validationError(GL_INVALID_ENUM, kInvalidFormat);
>             return false;
>         }
> 
>         if (!ValidReadPixelsTypeEnum(context, type))
>         {
>-            ANGLE_VALIDATION_ERR(context, InvalidEnum(), InvalidType);
>+            context->validationError(GL_INVALID_ENUM, kInvalidType);
>             return false;
>         }
>     }
> 
>-    GLenum currentFormat        = framebuffer->getImplementationColorReadFormat(context);
>-    GLenum currentType          = framebuffer->getImplementationColorReadType(context);
>+    GLenum currentFormat = GL_NONE;
>+    ANGLE_VALIDATION_TRY(framebuffer->getImplementationColorReadFormat(context, &currentFormat));
>+
>+    GLenum currentType = GL_NONE;
>+    ANGLE_VALIDATION_TRY(framebuffer->getImplementationColorReadType(context, &currentType));
>+
>     GLenum currentComponentType = readBuffer->getFormat().info->componentType;
> 
>     bool validFormatTypeCombination =
>@@ -5182,38 +5467,43 @@ bool ValidateReadPixelsBase(Context *context,
> 
>     if (!(currentFormat == format && currentType == type) && !validFormatTypeCombination)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidOperation(), MismatchedTypeAndFormat);
>+        context->validationError(GL_INVALID_OPERATION, kMismatchedTypeAndFormat);
>         return false;
>     }
> 
>     // Check for pixel pack buffer related API errors
>-    gl::Buffer *pixelPackBuffer = context->getGLState().getTargetBuffer(BufferBinding::PixelPack);
>+    Buffer *pixelPackBuffer = context->getState().getTargetBuffer(BufferBinding::PixelPack);
>     if (pixelPackBuffer != nullptr && pixelPackBuffer->isMapped())
>     {
>         // ...the buffer object's data store is currently mapped.
>-        context->handleError(InvalidOperation() << "Pixel pack buffer is mapped.");
>+        context->validationError(GL_INVALID_OPERATION, kBufferMapped);
>+        return false;
>+    }
>+    if (context->getExtensions().webglCompatibility && pixelPackBuffer != nullptr &&
>+        pixelPackBuffer->isBoundForTransformFeedbackAndOtherUse())
>+    {
>+        context->validationError(GL_INVALID_OPERATION, kPixelPackBufferBoundForTransformFeedback);
>         return false;
>     }
> 
>     // ..  the data would be packed to the buffer object such that the memory writes required
>     // would exceed the data store size.
>     const InternalFormat &formatInfo = GetInternalFormatInfo(format, type);
>-    const gl::Extents size(width, height, 1);
>-    const auto &pack = context->getGLState().getPackState();
>+    const Extents size(width, height, 1);
>+    const auto &pack = context->getState().getPackState();
> 
>-    auto endByteOrErr = formatInfo.computePackUnpackEndByte(type, size, pack, false);
>-    if (endByteOrErr.isError())
>+    GLuint endByte = 0;
>+    if (!formatInfo.computePackUnpackEndByte(type, size, pack, false, &endByte))
>     {
>-        context->handleError(endByteOrErr.getError());
>+        context->validationError(GL_INVALID_OPERATION, kIntegerOverflow);
>         return false;
>     }
> 
>-    size_t endByte = endByteOrErr.getResult();
>     if (bufSize >= 0)
>     {
>         if (pixelPackBuffer == nullptr && static_cast<size_t>(bufSize) < endByte)
>         {
>-            ANGLE_VALIDATION_ERR(context, InvalidOperation(), InsufficientBufferSize);
>+            context->validationError(GL_INVALID_OPERATION, kInsufficientBufferSize);
>             return false;
>         }
>     }
>@@ -5227,7 +5517,7 @@ bool ValidateReadPixelsBase(Context *context,
>         if (checkedEndByte.ValueOrDie() > static_cast<size_t>(pixelPackBuffer->getSize()))
>         {
>             // Overflow past the end of the buffer
>-            ANGLE_VALIDATION_ERR(context, InvalidOperation(), ParamOverflow);
>+            context->validationError(GL_INVALID_OPERATION, kParamOverflow);
>             return false;
>         }
>     }
>@@ -5236,14 +5526,14 @@ bool ValidateReadPixelsBase(Context *context,
>     {
>         if (endByte > static_cast<size_t>(std::numeric_limits<GLsizei>::max()))
>         {
>-            ANGLE_VALIDATION_ERR(context, InvalidOperation(), IntegerOverflow);
>+            context->validationError(GL_INVALID_OPERATION, kIntegerOverflow);
>             return false;
>         }
> 
>         *length = static_cast<GLsizei>(endByte);
>     }
> 
>-    auto getClippedExtent = [](GLint start, GLsizei length, int bufferSize) {
>+    auto getClippedExtent = [](GLint start, GLsizei length, int bufferSize, GLsizei *outExtent) {
>         angle::CheckedNumeric<int> clippedExtent(length);
>         if (start < 0)
>         {
>@@ -5251,8 +5541,14 @@ bool ValidateReadPixelsBase(Context *context,
>             clippedExtent += start;
>         }
> 
>-        const int readExtent = start + length;
>-        if (readExtent > bufferSize)
>+        angle::CheckedNumeric<int> readExtent = start;
>+        readExtent += length;
>+        if (!readExtent.IsValid())
>+        {
>+            return false;
>+        }
>+
>+        if (readExtent.ValueOrDie() > bufferSize)
>         {
>             // Subtract the region to the right of the read buffer
>             clippedExtent -= (readExtent - bufferSize);
>@@ -5260,20 +5556,35 @@ bool ValidateReadPixelsBase(Context *context,
> 
>         if (!clippedExtent.IsValid())
>         {
>-            return 0;
>+            return false;
>         }
> 
>-        return std::max(clippedExtent.ValueOrDie(), 0);
>+        *outExtent = std::max(clippedExtent.ValueOrDie(), 0);
>+        return true;
>     };
> 
>+    GLsizei writtenColumns = 0;
>+    if (!getClippedExtent(x, width, readBuffer->getSize().width, &writtenColumns))
>+    {
>+        context->validationError(GL_INVALID_OPERATION, kIntegerOverflow);
>+        return false;
>+    }
>+
>+    GLsizei writtenRows = 0;
>+    if (!getClippedExtent(y, height, readBuffer->getSize().height, &writtenRows))
>+    {
>+        context->validationError(GL_INVALID_OPERATION, kIntegerOverflow);
>+        return false;
>+    }
>+
>     if (columns != nullptr)
>     {
>-        *columns = getClippedExtent(x, width, readBuffer->getSize().width);
>+        *columns = writtenColumns;
>     }
> 
>     if (rows != nullptr)
>     {
>-        *rows = getClippedExtent(y, height, readBuffer->getSize().height);
>+        *rows = writtenRows;
>     }
> 
>     return true;
>@@ -5281,28 +5592,35 @@ bool ValidateReadPixelsBase(Context *context,
> 
> template <typename ParamType>
> bool ValidateTexParameterBase(Context *context,
>-                              GLenum target,
>+                              TextureType target,
>                               GLenum pname,
>                               GLsizei bufSize,
>+                              bool vectorParams,
>                               const ParamType *params)
> {
>     if (!ValidTextureTarget(context, target) && !ValidTextureExternalTarget(context, target))
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidEnum(), InvalidTextureTarget);
>+        context->validationError(GL_INVALID_ENUM, kInvalidTextureTarget);
>         return false;
>     }
> 
>-    if (context->getTargetTexture(target) == nullptr)
>+    if (context->getTextureByType(target) == nullptr)
>     {
>         // Should only be possible for external textures
>-        ANGLE_VALIDATION_ERR(context, InvalidEnum(), TextureNotBound);
>+        context->validationError(GL_INVALID_ENUM, kTextureNotBound);
>         return false;
>     }
> 
>-    const GLsizei minBufSize = 1;
>+    const GLsizei minBufSize = GetTexParameterCount(pname);
>     if (bufSize >= 0 && bufSize < minBufSize)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidOperation(), InsufficientBufferSize);
>+        context->validationError(GL_INVALID_OPERATION, kInsufficientBufferSize);
>+        return false;
>+    }
>+
>+    if (context->getClientMajorVersion() == 1 && !IsValidGLES1TextureParameter(pname))
>+    {
>+        context->validationError(GL_INVALID_ENUM, kEnumNotSupported);
>         return false;
>     }
> 
>@@ -5321,24 +5639,29 @@ bool ValidateTexParameterBase(Context *context,
>         case GL_TEXTURE_MAX_LOD:
>             if (context->getClientMajorVersion() < 3)
>             {
>-                ANGLE_VALIDATION_ERR(context, InvalidEnum(), ES3Required);
>+                context->validationError(GL_INVALID_ENUM, kES3Required);
>                 return false;
>             }
>-            if (target == GL_TEXTURE_EXTERNAL_OES &&
>-                !context->getExtensions().eglImageExternalEssl3)
>+            if (target == TextureType::External && !context->getExtensions().eglImageExternalEssl3)
>             {
>-                context->handleError(InvalidEnum() << "ES3 texture parameters are not "
>-                                                      "available without "
>-                                                      "GL_OES_EGL_image_external_essl3.");
>+                context->validationError(GL_INVALID_ENUM, kEnumNotSupported);
>                 return false;
>             }
>             break;
> 
>+        case GL_GENERATE_MIPMAP:
>+        case GL_TEXTURE_CROP_RECT_OES:
>+            if (context->getClientMajorVersion() > 1)
>+            {
>+                context->validationError(GL_INVALID_ENUM, kGLES1Only);
>+                return false;
>+            }
>+            break;
>         default:
>             break;
>     }
> 
>-    if (target == GL_TEXTURE_2D_MULTISAMPLE)
>+    if (target == TextureType::_2DMultisample || target == TextureType::_2DMultisampleArray)
>     {
>         switch (pname)
>         {
>@@ -5351,8 +5674,8 @@ bool ValidateTexParameterBase(Context *context,
>             case GL_TEXTURE_MAX_LOD:
>             case GL_TEXTURE_COMPARE_MODE:
>             case GL_TEXTURE_COMPARE_FUNC:
>-                context->handleError(InvalidEnum()
>-                                     << "Invalid parameter for 2D multisampled textures.");
>+            case GL_TEXTURE_BORDER_COLOR:
>+                context->validationError(GL_INVALID_ENUM, kInvalidPname);
>                 return false;
>         }
>     }
>@@ -5362,26 +5685,26 @@ bool ValidateTexParameterBase(Context *context,
>         case GL_TEXTURE_WRAP_S:
>         case GL_TEXTURE_WRAP_T:
>         case GL_TEXTURE_WRAP_R:
>+        {
>+            bool restrictedWrapModes =
>+                target == TextureType::External || target == TextureType::Rectangle;
>+            if (!ValidateTextureWrapModeValue(context, params, restrictedWrapModes))
>             {
>-                bool restrictedWrapModes =
>-                    target == GL_TEXTURE_EXTERNAL_OES || target == GL_TEXTURE_RECTANGLE_ANGLE;
>-                if (!ValidateTextureWrapModeValue(context, params, restrictedWrapModes))
>-                {
>-                    return false;
>-                }
>+                return false;
>             }
>-            break;
>+        }
>+        break;
> 
>         case GL_TEXTURE_MIN_FILTER:
>+        {
>+            bool restrictedMinFilter =
>+                target == TextureType::External || target == TextureType::Rectangle;
>+            if (!ValidateTextureMinFilterValue(context, params, restrictedMinFilter))
>             {
>-                bool restrictedMinFilter =
>-                    target == GL_TEXTURE_EXTERNAL_OES || target == GL_TEXTURE_RECTANGLE_ANGLE;
>-                if (!ValidateTextureMinFilterValue(context, params, restrictedMinFilter))
>-                {
>-                    return false;
>-                }
>+                return false;
>             }
>-            break;
>+        }
>+        break;
> 
>         case GL_TEXTURE_MAG_FILTER:
>             if (!ValidateTextureMagFilterValue(context, params))
>@@ -5393,7 +5716,7 @@ bool ValidateTexParameterBase(Context *context,
>         case GL_TEXTURE_USAGE_ANGLE:
>             if (!context->getExtensions().textureUsage)
>             {
>-                ANGLE_VALIDATION_ERR(context, InvalidEnum(), EnumNotSupported);
>+                context->validationError(GL_INVALID_ENUM, kEnumNotSupported);
>                 return false;
>             }
> 
>@@ -5404,25 +5727,21 @@ bool ValidateTexParameterBase(Context *context,
>                     break;
> 
>                 default:
>-                    ANGLE_VALIDATION_ERR(context, InvalidEnum(), EnumNotSupported);
>+                    context->validationError(GL_INVALID_ENUM, kEnumNotSupported);
>                     return false;
>             }
>             break;
> 
>         case GL_TEXTURE_MAX_ANISOTROPY_EXT:
>-            if (!context->getExtensions().textureFilterAnisotropic)
>-            {
>-                context->handleError(InvalidEnum() << "GL_EXT_texture_anisotropic is not enabled.");
>-                return false;
>-            }
>-
>-            // we assume the parameter passed to this validation method is truncated, not rounded
>-            if (params[0] < 1)
>+        {
>+            GLfloat paramValue = static_cast<GLfloat>(params[0]);
>+            if (!ValidateTextureMaxAnisotropyValue(context, paramValue))
>             {
>-                context->handleError(InvalidValue() << "Max anisotropy must be at least 1.");
>                 return false;
>             }
>-            break;
>+            ASSERT(static_cast<ParamType>(paramValue) == params[0]);
>+        }
>+        break;
> 
>         case GL_TEXTURE_MIN_LOD:
>         case GL_TEXTURE_MAX_LOD:
>@@ -5458,7 +5777,7 @@ bool ValidateTexParameterBase(Context *context,
>                     break;
> 
>                 default:
>-                    ANGLE_VALIDATION_ERR(context, InvalidEnum(), EnumNotSupported);
>+                    context->validationError(GL_INVALID_ENUM, kEnumNotSupported);
>                     return false;
>             }
>             break;
>@@ -5466,25 +5785,24 @@ bool ValidateTexParameterBase(Context *context,
>         case GL_TEXTURE_BASE_LEVEL:
>             if (ConvertToGLint(params[0]) < 0)
>             {
>-                context->handleError(InvalidValue() << "Base level must be at least 0.");
>+                context->validationError(GL_INVALID_VALUE, kBaseLevelNegative);
>                 return false;
>             }
>-            if (target == GL_TEXTURE_EXTERNAL_OES && static_cast<GLuint>(params[0]) != 0)
>+            if (target == TextureType::External && static_cast<GLuint>(params[0]) != 0)
>             {
>-                context->handleError(InvalidOperation()
>-                                     << "Base level must be 0 for external textures.");
>+                context->validationError(GL_INVALID_OPERATION, kBaseLevelNonZero);
>                 return false;
>             }
>-            if (target == GL_TEXTURE_2D_MULTISAMPLE && static_cast<GLuint>(params[0]) != 0)
>+            if ((target == TextureType::_2DMultisample ||
>+                 target == TextureType::_2DMultisampleArray) &&
>+                static_cast<GLuint>(params[0]) != 0)
>             {
>-                context->handleError(InvalidOperation()
>-                                     << "Base level must be 0 for multisampled textures.");
>+                context->validationError(GL_INVALID_OPERATION, kBaseLevelNonZero);
>                 return false;
>             }
>-            if (target == GL_TEXTURE_RECTANGLE_ANGLE && static_cast<GLuint>(params[0]) != 0)
>+            if (target == TextureType::Rectangle && static_cast<GLuint>(params[0]) != 0)
>             {
>-                context->handleError(InvalidOperation()
>-                                     << "Base level must be 0 for rectangle textures.");
>+                context->validationError(GL_INVALID_OPERATION, kBaseLevelNonZero);
>                 return false;
>             }
>             break;
>@@ -5492,7 +5810,7 @@ bool ValidateTexParameterBase(Context *context,
>         case GL_TEXTURE_MAX_LEVEL:
>             if (ConvertToGLint(params[0]) < 0)
>             {
>-                ANGLE_VALIDATION_ERR(context, InvalidValue(), InvalidMipLevel);
>+                context->validationError(GL_INVALID_VALUE, kInvalidMipLevel);
>                 return false;
>             }
>             break;
>@@ -5500,7 +5818,7 @@ bool ValidateTexParameterBase(Context *context,
>         case GL_DEPTH_STENCIL_TEXTURE_MODE:
>             if (context->getClientVersion() < Version(3, 1))
>             {
>-                ANGLE_VALIDATION_ERR(context, InvalidEnum(), EnumRequiresGLES31);
>+                context->validationError(GL_INVALID_ENUM, kEnumRequiresGLES31);
>                 return false;
>             }
>             switch (ConvertToGLenum(params[0]))
>@@ -5510,7 +5828,7 @@ bool ValidateTexParameterBase(Context *context,
>                     break;
> 
>                 default:
>-                    ANGLE_VALIDATION_ERR(context, InvalidEnum(), EnumNotSupported);
>+                    context->validationError(GL_INVALID_ENUM, kEnumNotSupported);
>                     return false;
>             }
>             break;
>@@ -5522,22 +5840,72 @@ bool ValidateTexParameterBase(Context *context,
>             }
>             break;
> 
>+        case GL_GENERATE_MIPMAP:
>+            if (context->getClientMajorVersion() > 1)
>+            {
>+                context->validationError(GL_INVALID_ENUM, kGLES1Only);
>+                return false;
>+            }
>+            break;
>+
>+        case GL_TEXTURE_CROP_RECT_OES:
>+            if (context->getClientMajorVersion() > 1)
>+            {
>+                context->validationError(GL_INVALID_ENUM, kGLES1Only);
>+                return false;
>+            }
>+            if (!vectorParams)
>+            {
>+                context->validationError(GL_INVALID_OPERATION, kInsufficientBufferSize);
>+                return false;
>+            }
>+            break;
>+
>+        case GL_TEXTURE_BORDER_COLOR:
>+            if (!context->getExtensions().textureBorderClamp)
>+            {
>+                context->validationError(GL_INVALID_ENUM, kExtensionNotEnabled);
>+                return false;
>+            }
>+            if (!vectorParams)
>+            {
>+                context->validationError(GL_INVALID_ENUM, kInsufficientBufferSize);
>+                return false;
>+            }
>+            break;
>+
>         default:
>-            ANGLE_VALIDATION_ERR(context, InvalidEnum(), EnumNotSupported);
>+            context->validationError(GL_INVALID_ENUM, kEnumNotSupported);
>             return false;
>     }
> 
>     return true;
> }
> 
>-template bool ValidateTexParameterBase(Context *, GLenum, GLenum, GLsizei, const GLfloat *);
>-template bool ValidateTexParameterBase(Context *, GLenum, GLenum, GLsizei, const GLint *);
>-
>-bool ValidateVertexAttribIndex(ValidationContext *context, GLuint index)
>+template bool ValidateTexParameterBase(Context *,
>+                                       TextureType,
>+                                       GLenum,
>+                                       GLsizei,
>+                                       bool,
>+                                       const GLfloat *);
>+template bool ValidateTexParameterBase(Context *,
>+                                       TextureType,
>+                                       GLenum,
>+                                       GLsizei,
>+                                       bool,
>+                                       const GLint *);
>+template bool ValidateTexParameterBase(Context *,
>+                                       TextureType,
>+                                       GLenum,
>+                                       GLsizei,
>+                                       bool,
>+                                       const GLuint *);
>+
>+bool ValidateVertexAttribIndex(Context *context, GLuint index)
> {
>     if (index >= MAX_VERTEX_ATTRIBS)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidValue(), IndexExceedsMaxVertexAttribute);
>+        context->validationError(GL_INVALID_VALUE, kIndexExceedsMaxVertexAttribute);
>         return false;
>     }
> 
>@@ -5557,7 +5925,7 @@ bool ValidateGetActiveUniformBlockivBase(Context *context,
> 
>     if (context->getClientMajorVersion() < 3)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidOperation(), ES3Required);
>+        context->validationError(GL_INVALID_OPERATION, kES3Required);
>         return false;
>     }
> 
>@@ -5569,8 +5937,7 @@ bool ValidateGetActiveUniformBlockivBase(Context *context,
> 
>     if (uniformBlockIndex >= programObject->getActiveUniformBlockCount())
>     {
>-        context->handleError(InvalidValue()
>-                             << "uniformBlockIndex exceeds active uniform block count.");
>+        context->validationError(GL_INVALID_VALUE, kIndexExceedsActiveUniformBlockCount);
>         return false;
>     }
> 
>@@ -5586,7 +5953,7 @@ bool ValidateGetActiveUniformBlockivBase(Context *context,
>             break;
> 
>         default:
>-            ANGLE_VALIDATION_ERR(context, InvalidEnum(), EnumNotSupported);
>+            context->validationError(GL_INVALID_ENUM, kEnumNotSupported);
>             return false;
>     }
> 
>@@ -5612,24 +5979,25 @@ bool ValidateSamplerParameterBase(Context *context,
>                                   GLuint sampler,
>                                   GLenum pname,
>                                   GLsizei bufSize,
>+                                  bool vectorParams,
>                                   ParamType *params)
> {
>     if (context->getClientMajorVersion() < 3)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidOperation(), ES3Required);
>+        context->validationError(GL_INVALID_OPERATION, kES3Required);
>         return false;
>     }
> 
>     if (!context->isSampler(sampler))
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidOperation(), InvalidSampler);
>+        context->validationError(GL_INVALID_OPERATION, kInvalidSampler);
>         return false;
>     }
> 
>-    const GLsizei minBufSize = 1;
>+    const GLsizei minBufSize = GetSamplerParameterCount(pname);
>     if (bufSize >= 0 && bufSize < minBufSize)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidOperation(), InsufficientBufferSize);
>+        context->validationError(GL_INVALID_OPERATION, kInsufficientBufferSize);
>         return false;
>     }
> 
>@@ -5684,16 +6052,45 @@ bool ValidateSamplerParameterBase(Context *context,
>             }
>             break;
> 
>+        case GL_TEXTURE_MAX_ANISOTROPY_EXT:
>+        {
>+            GLfloat paramValue = static_cast<GLfloat>(params[0]);
>+            if (!ValidateTextureMaxAnisotropyValue(context, paramValue))
>+            {
>+                return false;
>+            }
>+        }
>+        break;
>+
>+        case GL_TEXTURE_BORDER_COLOR:
>+            if (!context->getExtensions().textureBorderClamp)
>+            {
>+                context->validationError(GL_INVALID_ENUM, kExtensionNotEnabled);
>+                return false;
>+            }
>+            if (!vectorParams)
>+            {
>+                context->validationError(GL_INVALID_ENUM, kInsufficientBufferSize);
>+                return false;
>+            }
>+            break;
>+
>         default:
>-            ANGLE_VALIDATION_ERR(context, InvalidEnum(), EnumNotSupported);
>+            context->validationError(GL_INVALID_ENUM, kEnumNotSupported);
>             return false;
>     }
> 
>     return true;
> }
> 
>-template bool ValidateSamplerParameterBase(Context *, GLuint, GLenum, GLsizei, GLfloat *);
>-template bool ValidateSamplerParameterBase(Context *, GLuint, GLenum, GLsizei, GLint *);
>+template bool ValidateSamplerParameterBase(Context *, GLuint, GLenum, GLsizei, bool, GLfloat *);
>+template bool ValidateSamplerParameterBase(Context *, GLuint, GLenum, GLsizei, bool, GLint *);
>+template bool ValidateSamplerParameterBase(Context *,
>+                                           GLuint,
>+                                           GLenum,
>+                                           GLsizei,
>+                                           bool,
>+                                           const GLuint *);
> 
> bool ValidateGetSamplerParameterBase(Context *context,
>                                      GLuint sampler,
>@@ -5707,13 +6104,13 @@ bool ValidateGetSamplerParameterBase(Context *context,
> 
>     if (context->getClientMajorVersion() < 3)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidOperation(), ES3Required);
>+        context->validationError(GL_INVALID_OPERATION, kES3Required);
>         return false;
>     }
> 
>     if (!context->isSampler(sampler))
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidOperation(), InvalidSampler);
>+        context->validationError(GL_INVALID_OPERATION, kInvalidSampler);
>         return false;
>     }
> 
>@@ -5730,22 +6127,37 @@ bool ValidateGetSamplerParameterBase(Context *context,
>         case GL_TEXTURE_COMPARE_FUNC:
>             break;
> 
>+        case GL_TEXTURE_MAX_ANISOTROPY_EXT:
>+            if (!ValidateTextureMaxAnisotropyExtensionEnabled(context))
>+            {
>+                return false;
>+            }
>+            break;
>+
>         case GL_TEXTURE_SRGB_DECODE_EXT:
>             if (!context->getExtensions().textureSRGBDecode)
>             {
>-                context->handleError(InvalidEnum() << "GL_EXT_texture_sRGB_decode is not enabled.");
>+                context->validationError(GL_INVALID_ENUM, kEnumNotSupported);
>+                return false;
>+            }
>+            break;
>+
>+        case GL_TEXTURE_BORDER_COLOR:
>+            if (!context->getExtensions().textureBorderClamp)
>+            {
>+                context->validationError(GL_INVALID_ENUM, kExtensionNotEnabled);
>                 return false;
>             }
>             break;
> 
>         default:
>-            ANGLE_VALIDATION_ERR(context, InvalidEnum(), EnumNotSupported);
>+            context->validationError(GL_INVALID_ENUM, kEnumNotSupported);
>             return false;
>     }
> 
>     if (length)
>     {
>-        *length = 1;
>+        *length = GetSamplerParameterCount(pname);
>     }
>     return true;
> }
>@@ -5764,14 +6176,14 @@ bool ValidateGetInternalFormativBase(Context *context,
> 
>     if (context->getClientMajorVersion() < 3)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidOperation(), ES3Required);
>+        context->validationError(GL_INVALID_OPERATION, kES3Required);
>         return false;
>     }
> 
>     const TextureCaps &formatCaps = context->getTextureCaps().get(internalformat);
>-    if (!formatCaps.renderable)
>+    if (!formatCaps.renderbuffer)
>     {
>-        context->handleError(InvalidEnum() << "Internal format is not renderable.");
>+        context->validationError(GL_INVALID_ENUM, kFormatNotRenderable);
>         return false;
>     }
> 
>@@ -5781,22 +6193,29 @@ bool ValidateGetInternalFormativBase(Context *context,
>             break;
> 
>         case GL_TEXTURE_2D_MULTISAMPLE:
>-            if (context->getClientVersion() < ES_3_1)
>+            if (context->getClientVersion() < ES_3_1 &&
>+                !context->getExtensions().textureMultisample)
>             {
>-                context->handleError(InvalidOperation()
>-                                     << "Texture target requires at least OpenGL ES 3.1.");
>+                context->validationError(GL_INVALID_ENUM,
>+                                         kMultisampleTextureExtensionOrES31Required);
>+                return false;
>+            }
>+            break;
>+        case GL_TEXTURE_2D_MULTISAMPLE_ARRAY_OES:
>+            if (!context->getExtensions().textureStorageMultisample2DArray)
>+            {
>+                context->validationError(GL_INVALID_ENUM, kMultisampleArrayExtensionRequired);
>                 return false;
>             }
>             break;
>-
>         default:
>-            ANGLE_VALIDATION_ERR(context, InvalidEnum(), InvalidTarget);
>+            context->validationError(GL_INVALID_ENUM, kInvalidTarget);
>             return false;
>     }
> 
>     if (bufSize < 0)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidValue(), InsufficientBufferSize);
>+        context->validationError(GL_INVALID_VALUE, kInsufficientBufferSize);
>         return false;
>     }
> 
>@@ -5812,7 +6231,7 @@ bool ValidateGetInternalFormativBase(Context *context,
>             break;
> 
>         default:
>-            ANGLE_VALIDATION_ERR(context, InvalidEnum(), EnumNotSupported);
>+            context->validationError(GL_INVALID_ENUM, kEnumNotSupported);
>             return false;
>     }
> 
>@@ -5825,4 +6244,258 @@ bool ValidateGetInternalFormativBase(Context *context,
>     return true;
> }
> 
>+bool ValidateFramebufferNotMultisampled(Context *context, Framebuffer *framebuffer)
>+{
>+    if (framebuffer->getSamples(context) != 0)
>+    {
>+        context->validationError(GL_INVALID_OPERATION, kInvalidMultisampledFramebufferOperation);
>+        return false;
>+    }
>+    return true;
>+}
>+
>+bool ValidateMultitextureUnit(Context *context, GLenum texture)
>+{
>+    if (texture < GL_TEXTURE0 || texture >= GL_TEXTURE0 + context->getCaps().maxMultitextureUnits)
>+    {
>+        context->validationError(GL_INVALID_ENUM, kInvalidMultitextureUnit);
>+        return false;
>+    }
>+    return true;
>+}
>+
>+bool ValidateTexStorageMultisample(Context *context,
>+                                   TextureType target,
>+                                   GLsizei samples,
>+                                   GLint internalFormat,
>+                                   GLsizei width,
>+                                   GLsizei height)
>+{
>+    const Caps &caps = context->getCaps();
>+    if (static_cast<GLuint>(width) > caps.max2DTextureSize ||
>+        static_cast<GLuint>(height) > caps.max2DTextureSize)
>+    {
>+        context->validationError(GL_INVALID_VALUE, kTextureWidthOrHeightOutOfRange);
>+        return false;
>+    }
>+
>+    if (samples == 0)
>+    {
>+        context->validationError(GL_INVALID_VALUE, kSamplesZero);
>+        return false;
>+    }
>+
>+    const TextureCaps &formatCaps = context->getTextureCaps().get(internalFormat);
>+    if (!formatCaps.textureAttachment)
>+    {
>+        context->validationError(GL_INVALID_ENUM, kRenderableInternalFormat);
>+        return false;
>+    }
>+
>+    // The ES3.1 spec(section 8.8) states that an INVALID_ENUM error is generated if internalformat
>+    // is one of the unsized base internalformats listed in table 8.11.
>+    const InternalFormat &formatInfo = GetSizedInternalFormatInfo(internalFormat);
>+    if (formatInfo.internalFormat == GL_NONE)
>+    {
>+        context->validationError(GL_INVALID_ENUM, kUnsizedInternalFormatUnsupported);
>+        return false;
>+    }
>+
>+    if (static_cast<GLuint>(samples) > formatCaps.getMaxSamples())
>+    {
>+        context->validationError(GL_INVALID_OPERATION, kSamplesOutOfRange);
>+        return false;
>+    }
>+
>+    Texture *texture = context->getTextureByType(target);
>+    if (!texture || texture->id() == 0)
>+    {
>+        context->validationError(GL_INVALID_OPERATION, kZeroBoundToTarget);
>+        return false;
>+    }
>+
>+    if (texture->getImmutableFormat())
>+    {
>+        context->validationError(GL_INVALID_OPERATION, kImmutableTextureBound);
>+        return false;
>+    }
>+    return true;
>+}
>+
>+bool ValidateTexStorage2DMultisampleBase(Context *context,
>+                                         TextureType target,
>+                                         GLsizei samples,
>+                                         GLint internalFormat,
>+                                         GLsizei width,
>+                                         GLsizei height)
>+{
>+    if (target != TextureType::_2DMultisample)
>+    {
>+        context->validationError(GL_INVALID_ENUM, kInvalidTarget);
>+        return false;
>+    }
>+
>+    if (width < 1 || height < 1)
>+    {
>+        context->validationError(GL_INVALID_VALUE, kTextureSizeTooSmall);
>+        return false;
>+    }
>+
>+    return ValidateTexStorageMultisample(context, target, samples, internalFormat, width, height);
>+}
>+
>+bool ValidateGetTexLevelParameterBase(Context *context,
>+                                      TextureTarget target,
>+                                      GLint level,
>+                                      GLenum pname,
>+                                      GLsizei *length)
>+{
>+
>+    if (length)
>+    {
>+        *length = 0;
>+    }
>+
>+    TextureType type = TextureTargetToType(target);
>+
>+    if (!ValidTexLevelDestinationTarget(context, type))
>+    {
>+        context->validationError(GL_INVALID_ENUM, kInvalidTextureTarget);
>+        return false;
>+    }
>+
>+    if (context->getTextureByType(type) == nullptr)
>+    {
>+        context->validationError(GL_INVALID_ENUM, kTextureNotBound);
>+        return false;
>+    }
>+
>+    if (!ValidMipLevel(context, type, level))
>+    {
>+        context->validationError(GL_INVALID_VALUE, kInvalidMipLevel);
>+        return false;
>+    }
>+
>+    switch (pname)
>+    {
>+        case GL_TEXTURE_RED_TYPE:
>+        case GL_TEXTURE_GREEN_TYPE:
>+        case GL_TEXTURE_BLUE_TYPE:
>+        case GL_TEXTURE_ALPHA_TYPE:
>+        case GL_TEXTURE_DEPTH_TYPE:
>+            break;
>+        case GL_TEXTURE_RED_SIZE:
>+        case GL_TEXTURE_GREEN_SIZE:
>+        case GL_TEXTURE_BLUE_SIZE:
>+        case GL_TEXTURE_ALPHA_SIZE:
>+        case GL_TEXTURE_DEPTH_SIZE:
>+        case GL_TEXTURE_STENCIL_SIZE:
>+        case GL_TEXTURE_SHARED_SIZE:
>+            break;
>+        case GL_TEXTURE_INTERNAL_FORMAT:
>+        case GL_TEXTURE_WIDTH:
>+        case GL_TEXTURE_HEIGHT:
>+        case GL_TEXTURE_DEPTH:
>+            break;
>+        case GL_TEXTURE_SAMPLES:
>+        case GL_TEXTURE_FIXED_SAMPLE_LOCATIONS:
>+            break;
>+        case GL_TEXTURE_COMPRESSED:
>+            break;
>+        default:
>+            context->validationError(GL_INVALID_ENUM, kInvalidPname);
>+            return false;
>+    }
>+
>+    if (length)
>+    {
>+        *length = 1;
>+    }
>+    return true;
>+}
>+
>+bool ValidateGetMultisamplefvBase(Context *context, GLenum pname, GLuint index, GLfloat *val)
>+{
>+    if (pname != GL_SAMPLE_POSITION)
>+    {
>+        context->validationError(GL_INVALID_ENUM, kInvalidPname);
>+        return false;
>+    }
>+
>+    Framebuffer *framebuffer = context->getState().getDrawFramebuffer();
>+    GLint samples            = framebuffer->getSamples(context);
>+
>+    if (index >= static_cast<GLuint>(samples))
>+    {
>+        context->validationError(GL_INVALID_VALUE, kIndexExceedsSamples);
>+        return false;
>+    }
>+
>+    return true;
>+}
>+
>+bool ValidateSampleMaskiBase(Context *context, GLuint maskNumber, GLbitfield mask)
>+{
>+    if (maskNumber >= context->getCaps().maxSampleMaskWords)
>+    {
>+        context->validationError(GL_INVALID_VALUE, kInvalidSampleMaskNumber);
>+        return false;
>+    }
>+
>+    return true;
>+}
>+
>+void RecordDrawAttribsError(Context *context)
>+{
>+    // An overflow can happen when adding the offset. Check against a special constant.
>+    if (context->getStateCache().getNonInstancedVertexElementLimit() ==
>+            VertexAttribute::kIntegerOverflow ||
>+        context->getStateCache().getInstancedVertexElementLimit() ==
>+            VertexAttribute::kIntegerOverflow)
>+    {
>+        context->validationError(GL_INVALID_OPERATION, kIntegerOverflow);
>+    }
>+    else
>+    {
>+        // [OpenGL ES 3.0.2] section 2.9.4 page 40:
>+        // We can return INVALID_OPERATION if our buffer does not have enough backing data.
>+        context->validationError(GL_INVALID_OPERATION, kInsufficientVertexBufferSize);
>+    }
>+}
>+
>+bool ValidateLoseContextCHROMIUM(Context *context,
>+                                 GraphicsResetStatus current,
>+                                 GraphicsResetStatus other)
>+{
>+    if (!context->getExtensions().loseContextCHROMIUM)
>+    {
>+        context->validationError(GL_INVALID_OPERATION, kExtensionNotEnabled);
>+        return false;
>+    }
>+
>+    switch (current)
>+    {
>+        case GraphicsResetStatus::GuiltyContextReset:
>+        case GraphicsResetStatus::InnocentContextReset:
>+        case GraphicsResetStatus::UnknownContextReset:
>+            break;
>+
>+        default:
>+            context->validationError(GL_INVALID_ENUM, kInvalidResetStatus);
>+    }
>+
>+    switch (other)
>+    {
>+        case GraphicsResetStatus::GuiltyContextReset:
>+        case GraphicsResetStatus::InnocentContextReset:
>+        case GraphicsResetStatus::UnknownContextReset:
>+            break;
>+
>+        default:
>+            context->validationError(GL_INVALID_ENUM, kInvalidResetStatus);
>+    }
>+
>+    return true;
>+}
>+
> }  // namespace gl
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/validationES.h b/Source/ThirdParty/ANGLE/src/libANGLE/validationES.h
>index e29432b8c33..2d1cf1e4f10 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/validationES.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/validationES.h
>@@ -9,8 +9,13 @@
> #ifndef LIBANGLE_VALIDATION_ES_H_
> #define LIBANGLE_VALIDATION_ES_H_
> 
>+#include "common/PackedEnums.h"
> #include "common/mathutil.h"
>-#include "libANGLE/PackedGLEnums.h"
>+#include "common/utilities.h"
>+#include "libANGLE/Context.h"
>+#include "libANGLE/ErrorStrings.h"
>+#include "libANGLE/Framebuffer.h"
>+#include "libANGLE/VertexArray.h"
> 
> #include <GLES2/gl2.h>
> #include <GLES3/gl3.h>
>@@ -20,41 +25,41 @@ namespace egl
> {
> class Display;
> class Image;
>-}
>+}  // namespace egl
> 
> namespace gl
> {
> class Context;
> struct Format;
>+class Framebuffer;
> struct LinkedUniform;
> class Program;
> class Shader;
>-class ValidationContext;
>-
>-bool ValidTextureTarget(const ValidationContext *context, GLenum target);
>-bool ValidTexture2DTarget(const ValidationContext *context, GLenum target);
>-bool ValidTexture3DTarget(const ValidationContext *context, GLenum target);
>-bool ValidTextureExternalTarget(const ValidationContext *context, GLenum target);
>-bool ValidTexture2DDestinationTarget(const ValidationContext *context, GLenum target);
>-bool ValidTexture3DDestinationTarget(const ValidationContext *context, GLenum target);
>-bool ValidTexLevelDestinationTarget(const ValidationContext *context, GLenum target);
>-bool ValidFramebufferTarget(const ValidationContext *context, GLenum target);
>-bool ValidBufferType(const ValidationContext *context, BufferBinding target);
>-bool ValidBufferParameter(const ValidationContext *context, GLenum pname, GLsizei *numParams);
>-bool ValidMipLevel(const ValidationContext *context, GLenum target, GLint level);
>-bool ValidImageSizeParameters(ValidationContext *context,
>-                              GLenum target,
>+
>+void SetRobustLengthParam(GLsizei *length, GLsizei value);
>+bool IsETC2EACFormat(const GLenum format);
>+bool ValidTextureTarget(const Context *context, TextureType type);
>+bool ValidTexture2DTarget(const Context *context, TextureType type);
>+bool ValidTexture3DTarget(const Context *context, TextureType target);
>+bool ValidTextureExternalTarget(const Context *context, TextureType target);
>+bool ValidTexture2DDestinationTarget(const Context *context, TextureTarget target);
>+bool ValidTexture3DDestinationTarget(const Context *context, TextureTarget target);
>+bool ValidTexLevelDestinationTarget(const Context *context, TextureType type);
>+bool ValidFramebufferTarget(const Context *context, GLenum target);
>+bool ValidMipLevel(const Context *context, TextureType type, GLint level);
>+bool ValidImageSizeParameters(Context *context,
>+                              TextureType target,
>                               GLint level,
>                               GLsizei width,
>                               GLsizei height,
>                               GLsizei depth,
>                               bool isSubImage);
>-bool ValidCompressedImageSize(const ValidationContext *context,
>+bool ValidCompressedImageSize(const Context *context,
>                               GLenum internalFormat,
>                               GLint level,
>                               GLsizei width,
>                               GLsizei height);
>-bool ValidCompressedSubImageSize(const ValidationContext *context,
>+bool ValidCompressedSubImageSize(const Context *context,
>                                  GLenum internalFormat,
>                                  GLint xoffset,
>                                  GLint yoffset,
>@@ -62,8 +67,8 @@ bool ValidCompressedSubImageSize(const ValidationContext *context,
>                                  GLsizei height,
>                                  size_t textureWidth,
>                                  size_t textureHeight);
>-bool ValidImageDataSize(ValidationContext *context,
>-                        GLenum textureTarget,
>+bool ValidImageDataSize(Context *context,
>+                        TextureType texType,
>                         GLsizei width,
>                         GLsizei height,
>                         GLsizei depth,
>@@ -72,10 +77,10 @@ bool ValidImageDataSize(ValidationContext *context,
>                         const void *pixels,
>                         GLsizei imageSize);
> 
>-bool ValidQueryType(const Context *context, GLenum queryType);
>+bool ValidQueryType(const Context *context, QueryType queryType);
> 
>-bool ValidateWebGLVertexAttribPointer(ValidationContext *context,
>-                                      GLenum type,
>+bool ValidateWebGLVertexAttribPointer(Context *context,
>+                                      VertexAttribType type,
>                                       GLboolean normalized,
>                                       GLsizei stride,
>                                       const void *ptr,
>@@ -84,15 +89,15 @@ bool ValidateWebGLVertexAttribPointer(ValidationContext *context,
> // Returns valid program if id is a valid program name
> // Errors INVALID_OPERATION if valid shader is given and returns NULL
> // Errors INVALID_VALUE otherwise and returns NULL
>-Program *GetValidProgram(ValidationContext *context, GLuint id);
>+Program *GetValidProgram(Context *context, GLuint id);
> 
> // Returns valid shader if id is a valid shader name
> // Errors INVALID_OPERATION if valid program is given and returns NULL
> // Errors INVALID_VALUE otherwise and returns NULL
>-Shader *GetValidShader(ValidationContext *context, GLuint id);
>+Shader *GetValidShader(Context *context, GLuint id);
> 
> bool ValidateAttachmentTarget(Context *context, GLenum attachment);
>-bool ValidateRenderbufferStorageParametersBase(ValidationContext *context,
>+bool ValidateRenderbufferStorageParametersBase(Context *context,
>                                                GLenum target,
>                                                GLsizei samples,
>                                                GLenum internalformat,
>@@ -104,7 +109,7 @@ bool ValidateFramebufferRenderbufferParameters(Context *context,
>                                                GLenum renderbuffertarget,
>                                                GLuint renderbuffer);
> 
>-bool ValidateBlitFramebufferParameters(ValidationContext *context,
>+bool ValidateBlitFramebufferParameters(Context *context,
>                                        GLint srcX0,
>                                        GLint srcY0,
>                                        GLint srcX1,
>@@ -165,23 +170,20 @@ bool ValidateReadnPixelsRobustANGLE(Context *context,
> bool ValidateGenQueriesEXT(gl::Context *context, GLsizei n, GLuint *ids);
> bool ValidateDeleteQueriesEXT(gl::Context *context, GLsizei n, const GLuint *ids);
> bool ValidateIsQueryEXT(gl::Context *context, GLuint id);
>-bool ValidateBeginQueryBase(Context *context, GLenum target, GLuint id);
>-bool ValidateBeginQueryEXT(Context *context, GLenum target, GLuint id);
>-bool ValidateEndQueryBase(Context *context, GLenum target);
>-bool ValidateEndQueryEXT(Context *context, GLenum target);
>-bool ValidateQueryCounterEXT(Context *context, GLuint id, GLenum target);
>-bool ValidateGetQueryivBase(Context *context, GLenum target, GLenum pname, GLsizei *numParams);
>-bool ValidateGetQueryivEXT(Context *context, GLenum target, GLenum pname, GLint *params);
>+bool ValidateBeginQueryBase(Context *context, QueryType target, GLuint id);
>+bool ValidateBeginQueryEXT(Context *context, QueryType target, GLuint id);
>+bool ValidateEndQueryBase(Context *context, QueryType target);
>+bool ValidateEndQueryEXT(Context *context, QueryType target);
>+bool ValidateQueryCounterEXT(Context *context, GLuint id, QueryType target);
>+bool ValidateGetQueryivBase(Context *context, QueryType target, GLenum pname, GLsizei *numParams);
>+bool ValidateGetQueryivEXT(Context *context, QueryType target, GLenum pname, GLint *params);
> bool ValidateGetQueryivRobustANGLE(Context *context,
>-                                   GLenum target,
>+                                   QueryType target,
>                                    GLenum pname,
>                                    GLsizei bufSize,
>                                    GLsizei *length,
>                                    GLint *params);
>-bool ValidateGetQueryObjectValueBase(Context *context,
>-                                     GLenum target,
>-                                     GLenum pname,
>-                                     GLsizei *numParams);
>+bool ValidateGetQueryObjectValueBase(Context *context, GLuint id, GLenum pname, GLsizei *numParams);
> bool ValidateGetQueryObjectivEXT(Context *context, GLuint id, GLenum pname, GLint *params);
> bool ValidateGetQueryObjectivRobustANGLE(Context *context,
>                                          GLuint id,
>@@ -211,37 +213,67 @@ bool ValidateGetQueryObjectui64vRobustANGLE(Context *context,
>                                             GLsizei *length,
>                                             GLuint64 *params);
> 
>-bool ValidateUniformCommonBase(ValidationContext *context,
>+bool ValidateUniformCommonBase(Context *context,
>                                gl::Program *program,
>                                GLint location,
>                                GLsizei count,
>                                const LinkedUniform **uniformOut);
>-bool ValidateUniform1ivValue(ValidationContext *context,
>+bool ValidateUniform1ivValue(Context *context,
>                              GLenum uniformType,
>                              GLsizei count,
>                              const GLint *value);
>-bool ValidateUniformValue(ValidationContext *context, GLenum valueType, GLenum uniformType);
>-bool ValidateUniformMatrixValue(ValidationContext *context, GLenum valueType, GLenum uniformType);
>-bool ValidateUniform(ValidationContext *context, GLenum uniformType, GLint location, GLsizei count);
>-bool ValidateUniformMatrix(ValidationContext *context,
>+
>+ANGLE_INLINE bool ValidateUniformValue(Context *context, GLenum valueType, GLenum uniformType)
>+{
>+    // Check that the value type is compatible with uniform type.
>+    // Do the cheaper test first, for a little extra speed.
>+    if (valueType != uniformType && VariableBoolVectorType(valueType) != uniformType)
>+    {
>+        context->validationError(GL_INVALID_OPERATION, err::kUniformSizeMismatch);
>+        return false;
>+    }
>+    return true;
>+}
>+
>+bool ValidateUniformMatrixValue(Context *context, GLenum valueType, GLenum uniformType);
>+bool ValidateUniform(Context *context, GLenum uniformType, GLint location, GLsizei count);
>+bool ValidateUniformMatrix(Context *context,
>                            GLenum matrixType,
>                            GLint location,
>                            GLsizei count,
>                            GLboolean transpose);
>-
>-bool ValidateStateQuery(ValidationContext *context,
>+bool ValidateGetBooleanvRobustANGLE(Context *context,
>+                                    GLenum pname,
>+                                    GLsizei bufSize,
>+                                    GLsizei *length,
>+                                    GLboolean *params);
>+bool ValidateGetFloatvRobustANGLE(Context *context,
>+                                  GLenum pname,
>+                                  GLsizei bufSize,
>+                                  GLsizei *length,
>+                                  GLfloat *params);
>+bool ValidateStateQuery(Context *context,
>                         GLenum pname,
>                         GLenum *nativeType,
>                         unsigned int *numParams);
>-
>-bool ValidateRobustStateQuery(ValidationContext *context,
>+bool ValidateGetIntegervRobustANGLE(Context *context,
>+                                    GLenum pname,
>+                                    GLsizei bufSize,
>+                                    GLsizei *length,
>+                                    GLint *data);
>+bool ValidateGetInteger64vRobustANGLE(Context *context,
>+                                      GLenum pname,
>+                                      GLsizei bufSize,
>+                                      GLsizei *length,
>+                                      GLint64 *data);
>+bool ValidateRobustStateQuery(Context *context,
>                               GLenum pname,
>                               GLsizei bufSize,
>                               GLenum *nativeType,
>                               unsigned int *numParams);
> 
>-bool ValidateCopyTexImageParametersBase(ValidationContext *context,
>-                                        GLenum target,
>+bool ValidateCopyTexImageParametersBase(Context *context,
>+                                        TextureTarget target,
>                                         GLint level,
>                                         GLenum internalformat,
>                                         bool isSubImage,
>@@ -255,43 +287,71 @@ bool ValidateCopyTexImageParametersBase(ValidationContext *context,
>                                         GLint border,
>                                         Format *textureFormatOut);
> 
>-bool ValidateDrawBase(ValidationContext *context, GLenum mode, GLsizei count);
>-bool ValidateDrawArraysCommon(ValidationContext *context,
>-                              GLenum mode,
>-                              GLint first,
>-                              GLsizei count,
>-                              GLsizei primcount);
>+void RecordDrawModeError(Context *context, PrimitiveMode mode);
>+const char *ValidateDrawElementsStates(Context *context);
>+
>+ANGLE_INLINE bool ValidateDrawBase(Context *context, PrimitiveMode mode)
>+{
>+    if (!context->getStateCache().isValidDrawMode(mode))
>+    {
>+        RecordDrawModeError(context, mode);
>+        return false;
>+    }
>+
>+    intptr_t drawStatesError = context->getStateCache().getBasicDrawStatesError(context);
>+    if (drawStatesError)
>+    {
>+        const char *errorMessage = reinterpret_cast<const char *>(drawStatesError);
>+
>+        // All errors from ValidateDrawStates should return INVALID_OPERATION except Framebuffer
>+        // Incomplete.
>+        GLenum errorCode =
>+            (errorMessage == err::kDrawFramebufferIncomplete ? GL_INVALID_FRAMEBUFFER_OPERATION
>+                                                             : GL_INVALID_OPERATION);
>+        context->validationError(errorCode, errorMessage);
>+        return false;
>+    }
>+
>+    return true;
>+}
>+
> bool ValidateDrawArraysInstancedBase(Context *context,
>-                                     GLenum mode,
>+                                     PrimitiveMode mode,
>                                      GLint first,
>                                      GLsizei count,
>                                      GLsizei primcount);
> bool ValidateDrawArraysInstancedANGLE(Context *context,
>-                                      GLenum mode,
>+                                      PrimitiveMode mode,
>                                       GLint first,
>                                       GLsizei count,
>                                       GLsizei primcount);
>-
>-bool ValidateDrawElementsBase(ValidationContext *context, GLenum type);
>-bool ValidateDrawElementsCommon(ValidationContext *context,
>-                                GLenum mode,
>-                                GLsizei count,
>-                                GLenum type,
>-                                const void *indices,
>-                                GLsizei primcount);
>-
>-bool ValidateDrawElementsInstancedCommon(ValidationContext *context,
>-                                         GLenum mode,
>-                                         GLsizei count,
>-                                         GLenum type,
>-                                         const void *indices,
>-                                         GLsizei primcount);
>+bool ValidateDrawArraysInstancedEXT(Context *context,
>+                                    PrimitiveMode mode,
>+                                    GLint first,
>+                                    GLsizei count,
>+                                    GLsizei primcount);
>+
>+bool ValidateDrawElementsInstancedBase(Context *context,
>+                                       PrimitiveMode mode,
>+                                       GLsizei count,
>+                                       DrawElementsType type,
>+                                       const void *indices,
>+                                       GLsizei primcount);
> bool ValidateDrawElementsInstancedANGLE(Context *context,
>-                                        GLenum mode,
>+                                        PrimitiveMode mode,
>                                         GLsizei count,
>-                                        GLenum type,
>+                                        DrawElementsType type,
>                                         const void *indices,
>                                         GLsizei primcount);
>+bool ValidateDrawElementsInstancedEXT(Context *context,
>+                                      PrimitiveMode mode,
>+                                      GLsizei count,
>+                                      DrawElementsType type,
>+                                      const void *indices,
>+                                      GLsizei primcount);
>+
>+bool ValidateDrawInstancedANGLE(Context *context);
>+bool ValidateDrawInstancedEXT(Context *context);
> 
> bool ValidateFramebufferTextureBase(Context *context,
>                                     GLenum target,
>@@ -305,11 +365,29 @@ bool ValidateGetnUniformfvEXT(Context *context,
>                               GLint location,
>                               GLsizei bufSize,
>                               GLfloat *params);
>+bool ValidateGetnUniformfvRobustANGLE(Context *context,
>+                                      GLuint program,
>+                                      GLint location,
>+                                      GLsizei bufSize,
>+                                      GLsizei *length,
>+                                      GLfloat *params);
> bool ValidateGetnUniformivEXT(Context *context,
>                               GLuint program,
>                               GLint location,
>                               GLsizei bufSize,
>                               GLint *params);
>+bool ValidateGetnUniformivRobustANGLE(Context *context,
>+                                      GLuint program,
>+                                      GLint location,
>+                                      GLsizei bufSize,
>+                                      GLsizei *length,
>+                                      GLint *params);
>+bool ValidateGetnUniformuivRobustANGLE(Context *context,
>+                                       GLuint program,
>+                                       GLint location,
>+                                       GLsizei bufSize,
>+                                       GLsizei *length,
>+                                       GLuint *params);
> bool ValidateGetUniformfvRobustANGLE(Context *context,
>                                      GLuint program,
>                                      GLint location,
>@@ -339,11 +417,11 @@ bool ValidateInsertEventMarkerEXT(Context *context, GLsizei length, const char *
> bool ValidatePushGroupMarkerEXT(Context *context, GLsizei length, const char *marker);
> 
> bool ValidateEGLImageTargetTexture2DOES(Context *context,
>-                                        GLenum target,
>-                                        egl::Image *image);
>+                                        gl::TextureType type,
>+                                        GLeglImageOES image);
> bool ValidateEGLImageTargetRenderbufferStorageOES(Context *context,
>                                                   GLenum target,
>-                                                  egl::Image *image);
>+                                                  GLeglImageOES image);
> 
> bool ValidateBindVertexArrayBase(Context *context, GLuint array);
> 
>@@ -359,7 +437,7 @@ bool ValidateGetProgramBinaryBase(Context *context,
>                                   GLenum *binaryFormat,
>                                   void *binary);
> 
>-bool ValidateDrawBuffersBase(ValidationContext *context, GLsizei n, const GLenum *bufs);
>+bool ValidateDrawBuffersBase(Context *context, GLsizei n, const GLenum *bufs);
> 
> bool ValidateGetBufferPointervBase(Context *context,
>                                    BufferBinding target,
>@@ -379,123 +457,42 @@ bool ValidateFlushMappedBufferRangeBase(Context *context,
> 
> bool ValidateGenOrDelete(Context *context, GLint n);
> 
>-bool ValidateRobustEntryPoint(ValidationContext *context, GLsizei bufSize);
>-bool ValidateRobustBufferSize(ValidationContext *context, GLsizei bufSize, GLsizei numParams);
>+bool ValidateRobustEntryPoint(Context *context, GLsizei bufSize);
>+bool ValidateRobustBufferSize(Context *context, GLsizei bufSize, GLsizei numParams);
> 
>-bool ValidateGetFramebufferAttachmentParameterivBase(ValidationContext *context,
>+bool ValidateGetFramebufferAttachmentParameterivBase(Context *context,
>                                                      GLenum target,
>                                                      GLenum attachment,
>                                                      GLenum pname,
>                                                      GLsizei *numParams);
>-bool ValidateGetFramebufferAttachmentParameterivRobustANGLE(ValidationContext *context,
>-                                                            GLenum target,
>-                                                            GLenum attachment,
>-                                                            GLenum pname,
>-                                                            GLsizei bufSize,
>-                                                            GLsizei *numParams);
>-
>-bool ValidateGetBufferParameterBase(ValidationContext *context,
>+
>+bool ValidateGetBufferParameterBase(Context *context,
>                                     BufferBinding target,
>                                     GLenum pname,
>                                     bool pointerVersion,
>                                     GLsizei *numParams);
>-bool ValidateGetBufferParameterivRobustANGLE(ValidationContext *context,
>-                                             BufferBinding target,
>-                                             GLenum pname,
>-                                             GLsizei bufSize,
>-                                             GLsizei *length,
>-                                             GLint *params);
>-
>-bool ValidateGetBufferParameteri64vRobustANGLE(ValidationContext *context,
>-                                               BufferBinding target,
>-                                               GLenum pname,
>-                                               GLsizei bufSize,
>-                                               GLsizei *length,
>-                                               GLint64 *params);
>-
>-bool ValidateGetProgramivBase(ValidationContext *context,
>-                              GLuint program,
>-                              GLenum pname,
>-                              GLsizei *numParams);
>-bool ValidateGetProgramivRobustANGLE(Context *context,
>-                                     GLuint program,
>-                                     GLenum pname,
>-                                     GLsizei bufSize,
>-                                     GLsizei *numParams);
>+
>+bool ValidateGetProgramivBase(Context *context, GLuint program, GLenum pname, GLsizei *numParams);
> 
> bool ValidateGetRenderbufferParameterivBase(Context *context,
>                                             GLenum target,
>                                             GLenum pname,
>                                             GLsizei *length);
>-bool ValidateGetRenderbufferParameterivRobustANGLE(Context *context,
>-                                                   GLenum target,
>-                                                   GLenum pname,
>-                                                   GLsizei bufSize,
>-                                                   GLsizei *length,
>-                                                   GLint *params);
> 
> bool ValidateGetShaderivBase(Context *context, GLuint shader, GLenum pname, GLsizei *length);
>-bool ValidateGetShaderivRobustANGLE(Context *context,
>-                                    GLuint shader,
>-                                    GLenum pname,
>-                                    GLsizei bufSize,
>-                                    GLsizei *length,
>-                                    GLint *params);
> 
>-bool ValidateGetTexParameterBase(Context *context, GLenum target, GLenum pname, GLsizei *length);
>-bool ValidateGetTexParameterfvRobustANGLE(Context *context,
>-                                          GLenum target,
>-                                          GLenum pname,
>-                                          GLsizei bufSize,
>-                                          GLsizei *length,
>-                                          GLfloat *params);
>-bool ValidateGetTexParameterivRobustANGLE(Context *context,
>-                                          GLenum target,
>-                                          GLenum pname,
>-                                          GLsizei bufSize,
>-                                          GLsizei *length,
>-                                          GLint *params);
>+bool ValidateGetTexParameterBase(Context *context,
>+                                 TextureType target,
>+                                 GLenum pname,
>+                                 GLsizei *length);
> 
> template <typename ParamType>
> bool ValidateTexParameterBase(Context *context,
>-                              GLenum target,
>+                              TextureType target,
>                               GLenum pname,
>                               GLsizei bufSize,
>+                              bool vectorParams,
>                               const ParamType *params);
>-bool ValidateTexParameterfvRobustANGLE(Context *context,
>-                                       GLenum target,
>-                                       GLenum pname,
>-                                       GLsizei bufSize,
>-                                       const GLfloat *params);
>-bool ValidateTexParameterivRobustANGLE(Context *context,
>-                                       GLenum target,
>-                                       GLenum pname,
>-                                       GLsizei bufSize,
>-                                       const GLint *params);
>-
>-bool ValidateGetSamplerParameterfvRobustANGLE(Context *context,
>-                                              GLuint sampler,
>-                                              GLenum pname,
>-                                              GLuint bufSize,
>-                                              GLsizei *length,
>-                                              GLfloat *params);
>-bool ValidateGetSamplerParameterivRobustANGLE(Context *context,
>-                                              GLuint sampler,
>-                                              GLenum pname,
>-                                              GLuint bufSize,
>-                                              GLsizei *length,
>-                                              GLint *params);
>-
>-bool ValidateSamplerParameterfvRobustANGLE(Context *context,
>-                                           GLuint sampler,
>-                                           GLenum pname,
>-                                           GLsizei bufSize,
>-                                           const GLfloat *params);
>-bool ValidateSamplerParameterivRobustANGLE(Context *context,
>-                                           GLuint sampler,
>-                                           GLenum pname,
>-                                           GLsizei bufSize,
>-                                           const GLint *params);
> 
> bool ValidateGetVertexAttribBase(Context *context,
>                                  GLuint index,
>@@ -503,73 +500,71 @@ bool ValidateGetVertexAttribBase(Context *context,
>                                  GLsizei *length,
>                                  bool pointer,
>                                  bool pureIntegerEntryPoint);
>-bool ValidateGetVertexAttribfvRobustANGLE(Context *context,
>-                                          GLuint index,
>-                                          GLenum pname,
>-                                          GLsizei bufSize,
>-                                          GLsizei *length,
>-                                          GLfloat *params);
> 
>-bool ValidateGetVertexAttribivRobustANGLE(Context *context,
>-                                          GLuint index,
>-                                          GLenum pname,
>-                                          GLsizei bufSize,
>-                                          GLsizei *length,
>-                                          GLint *params);
>-
>-bool ValidateGetVertexAttribPointervRobustANGLE(Context *context,
>-                                                GLuint index,
>-                                                GLenum pname,
>-                                                GLsizei bufSize,
>-                                                GLsizei *length,
>-                                                void **pointer);
>-
>-bool ValidateGetVertexAttribIivRobustANGLE(Context *context,
>-                                           GLuint index,
>-                                           GLenum pname,
>-                                           GLsizei bufSize,
>-                                           GLsizei *length,
>-                                           GLint *params);
>+ANGLE_INLINE bool ValidateVertexFormat(Context *context,
>+                                       GLuint index,
>+                                       GLint size,
>+                                       VertexAttribTypeCase validation)
>+{
>+    const Caps &caps = context->getCaps();
>+    if (index >= caps.maxVertexAttributes)
>+    {
>+        context->validationError(GL_INVALID_VALUE, err::kIndexExceedsMaxVertexAttribute);
>+        return false;
>+    }
>+
>+    switch (validation)
>+    {
>+        case VertexAttribTypeCase::Invalid:
>+            context->validationError(GL_INVALID_ENUM, err::kInvalidType);
>+            return false;
>+        case VertexAttribTypeCase::Valid:
>+            if (size < 1 || size > 4)
>+            {
>+                context->validationError(GL_INVALID_VALUE, err::kInvalidVertexAttrSize);
>+                return false;
>+            }
>+            break;
>+        case VertexAttribTypeCase::ValidSize4Only:
>+            if (size != 4)
>+            {
>+                context->validationError(GL_INVALID_OPERATION,
>+                                         err::kInvalidVertexAttribSize2101010);
>+                return false;
>+            }
>+            break;
>+    }
>+
>+    return true;
>+}
> 
>-bool ValidateGetVertexAttribIuivRobustANGLE(Context *context,
>+// Note: These byte, short, and int types are all converted to float for the shader.
>+ANGLE_INLINE bool ValidateFloatVertexFormat(Context *context,
>                                             GLuint index,
>-                                            GLenum pname,
>-                                            GLsizei bufSize,
>-                                            GLsizei *length,
>-                                            GLuint *params);
>-
>-bool ValidateGetActiveUniformBlockivRobustANGLE(Context *context,
>-                                                GLuint program,
>-                                                GLuint uniformBlockIndex,
>-                                                GLenum pname,
>-                                                GLsizei bufSize,
>-                                                GLsizei *length,
>-                                                GLint *params);
>-
>-bool ValidateGetInternalFormativRobustANGLE(Context *context,
>-                                            GLenum target,
>-                                            GLenum internalformat,
>-                                            GLenum pname,
>-                                            GLsizei bufSize,
>-                                            GLsizei *length,
>-                                            GLint *params);
>+                                            GLint size,
>+                                            VertexAttribType type)
>+{
>+    return ValidateVertexFormat(context, index, size,
>+                                context->getStateCache().getVertexAttribTypeValidation(type));
>+}
> 
>-bool ValidateVertexFormatBase(ValidationContext *context,
>-                              GLuint attribIndex,
>-                              GLint size,
>-                              GLenum type,
>-                              GLboolean pureInteger);
>+ANGLE_INLINE bool ValidateIntegerVertexFormat(Context *context,
>+                                              GLuint index,
>+                                              GLint size,
>+                                              VertexAttribType type)
>+{
>+    return ValidateVertexFormat(
>+        context, index, size, context->getStateCache().getIntegerVertexAttribTypeValidation(type));
>+}
> 
>-bool ValidateWebGLFramebufferAttachmentClearType(ValidationContext *context,
>+bool ValidateWebGLFramebufferAttachmentClearType(Context *context,
>                                                  GLint drawbuffer,
>                                                  const GLenum *validComponentTypes,
>                                                  size_t validComponentTypeCount);
> 
>-bool ValidateRobustCompressedTexImageBase(ValidationContext *context,
>-                                          GLsizei imageSize,
>-                                          GLsizei dataSize);
>+bool ValidateRobustCompressedTexImageBase(Context *context, GLsizei imageSize, GLsizei dataSize);
> 
>-bool ValidateVertexAttribIndex(ValidationContext *context, GLuint index);
>+bool ValidateVertexAttribIndex(Context *context, GLuint index);
> 
> bool ValidateGetActiveUniformBlockivBase(Context *context,
>                                          GLuint program,
>@@ -587,6 +582,7 @@ bool ValidateSamplerParameterBase(Context *context,
>                                   GLuint sampler,
>                                   GLenum pname,
>                                   GLsizei bufSize,
>+                                  bool vectorParams,
>                                   ParamType *params);
> 
> bool ValidateGetInternalFormativBase(Context *context,
>@@ -596,6 +592,360 @@ bool ValidateGetInternalFormativBase(Context *context,
>                                      GLsizei bufSize,
>                                      GLsizei *numParams);
> 
>+bool ValidateFramebufferNotMultisampled(Context *context, Framebuffer *framebuffer);
>+
>+bool ValidateMultitextureUnit(Context *context, GLenum texture);
>+
>+bool ValidateTransformFeedbackPrimitiveMode(const Context *context,
>+                                            PrimitiveMode transformFeedbackPrimitiveMode,
>+                                            PrimitiveMode renderPrimitiveMode);
>+
>+// Common validation for 2D and 3D variants of TexStorage*Multisample.
>+bool ValidateTexStorageMultisample(Context *context,
>+                                   TextureType target,
>+                                   GLsizei samples,
>+                                   GLint internalFormat,
>+                                   GLsizei width,
>+                                   GLsizei height);
>+
>+bool ValidateTexStorage2DMultisampleBase(Context *context,
>+                                         TextureType target,
>+                                         GLsizei samples,
>+                                         GLint internalFormat,
>+                                         GLsizei width,
>+                                         GLsizei height);
>+
>+bool ValidateGetTexLevelParameterBase(Context *context,
>+                                      TextureTarget target,
>+                                      GLint level,
>+                                      GLenum pname,
>+                                      GLsizei *length);
>+
>+bool ValidateMapBufferBase(Context *context, BufferBinding target);
>+bool ValidateIndexedStateQuery(Context *context, GLenum pname, GLuint index, GLsizei *length);
>+bool ValidateES3TexImage2DParameters(Context *context,
>+                                     TextureTarget target,
>+                                     GLint level,
>+                                     GLenum internalformat,
>+                                     bool isCompressed,
>+                                     bool isSubImage,
>+                                     GLint xoffset,
>+                                     GLint yoffset,
>+                                     GLint zoffset,
>+                                     GLsizei width,
>+                                     GLsizei height,
>+                                     GLsizei depth,
>+                                     GLint border,
>+                                     GLenum format,
>+                                     GLenum type,
>+                                     GLsizei imageSize,
>+                                     const void *pixels);
>+bool ValidateES3CopyTexImage2DParameters(Context *context,
>+                                         TextureTarget target,
>+                                         GLint level,
>+                                         GLenum internalformat,
>+                                         bool isSubImage,
>+                                         GLint xoffset,
>+                                         GLint yoffset,
>+                                         GLint zoffset,
>+                                         GLint x,
>+                                         GLint y,
>+                                         GLsizei width,
>+                                         GLsizei height,
>+                                         GLint border);
>+bool ValidateES3TexStorage2DParameters(Context *context,
>+                                       TextureType target,
>+                                       GLsizei levels,
>+                                       GLenum internalformat,
>+                                       GLsizei width,
>+                                       GLsizei height,
>+                                       GLsizei depth);
>+bool ValidateES3TexStorage3DParameters(Context *context,
>+                                       TextureType target,
>+                                       GLsizei levels,
>+                                       GLenum internalformat,
>+                                       GLsizei width,
>+                                       GLsizei height,
>+                                       GLsizei depth);
>+
>+bool ValidateGetMultisamplefvBase(Context *context, GLenum pname, GLuint index, GLfloat *val);
>+bool ValidateSampleMaskiBase(Context *context, GLuint maskNumber, GLbitfield mask);
>+
>+// Utility macro for handling implementation methods inside Validation.
>+#define ANGLE_HANDLE_VALIDATION_ERR(X) \
>+    (void)(X);                         \
>+    return false
>+#define ANGLE_VALIDATION_TRY(EXPR) ANGLE_TRY_TEMPLATE(EXPR, ANGLE_HANDLE_VALIDATION_ERR)
>+
>+// We should check with Khronos if returning INVALID_FRAMEBUFFER_OPERATION is OK when querying
>+// implementation format info for incomplete framebuffers. It seems like these queries are
>+// incongruent with the other errors.
>+// Inlined for speed.
>+template <GLenum ErrorCode = GL_INVALID_FRAMEBUFFER_OPERATION>
>+ANGLE_INLINE bool ValidateFramebufferComplete(Context *context, Framebuffer *framebuffer)
>+{
>+    if (!framebuffer->isComplete(context))
>+    {
>+        context->validationError(ErrorCode, err::kFramebufferIncomplete);
>+        return false;
>+    }
>+
>+    return true;
>+}
>+
>+const char *ValidateDrawStates(Context *context);
>+
>+void RecordDrawAttribsError(Context *context);
>+
>+ANGLE_INLINE bool ValidateDrawAttribs(Context *context, int64_t maxVertex)
>+{
>+    if (maxVertex > context->getStateCache().getNonInstancedVertexElementLimit())
>+    {
>+        RecordDrawAttribsError(context);
>+        return false;
>+    }
>+
>+    return true;
>+}
>+
>+ANGLE_INLINE bool ValidateDrawArraysAttribs(Context *context, GLint first, GLsizei count)
>+{
>+    if (!context->isBufferAccessValidationEnabled())
>+    {
>+        return true;
>+    }
>+
>+    // Check the computation of maxVertex doesn't overflow.
>+    // - first < 0 has been checked as an error condition.
>+    // - if count <= 0, skip validating no-op draw calls.
>+    // From this we know maxVertex will be positive, and only need to check if it overflows GLint.
>+    ASSERT(first >= 0);
>+    ASSERT(count > 0);
>+    int64_t maxVertex = static_cast<int64_t>(first) + static_cast<int64_t>(count) - 1;
>+    if (maxVertex > static_cast<int64_t>(std::numeric_limits<GLint>::max()))
>+    {
>+        context->validationError(GL_INVALID_OPERATION, err::kIntegerOverflow);
>+        return false;
>+    }
>+
>+    return ValidateDrawAttribs(context, maxVertex);
>+}
>+
>+ANGLE_INLINE bool ValidateDrawInstancedAttribs(Context *context, GLint primcount)
>+{
>+    if (!context->isBufferAccessValidationEnabled())
>+    {
>+        return true;
>+    }
>+
>+    if ((primcount - 1) > context->getStateCache().getInstancedVertexElementLimit())
>+    {
>+        RecordDrawAttribsError(context);
>+        return false;
>+    }
>+
>+    return true;
>+}
>+
>+ANGLE_INLINE bool ValidateDrawArraysCommon(Context *context,
>+                                           PrimitiveMode mode,
>+                                           GLint first,
>+                                           GLsizei count,
>+                                           GLsizei primcount)
>+{
>+    if (first < 0)
>+    {
>+        context->validationError(GL_INVALID_VALUE, err::kNegativeStart);
>+        return false;
>+    }
>+
>+    if (count <= 0)
>+    {
>+        if (count < 0)
>+        {
>+            context->validationError(GL_INVALID_VALUE, err::kNegativeCount);
>+            return false;
>+        }
>+
>+        // Early exit.
>+        return ValidateDrawBase(context, mode);
>+    }
>+
>+    if (!ValidateDrawBase(context, mode))
>+    {
>+        return false;
>+    }
>+
>+    if (context->getStateCache().isTransformFeedbackActiveUnpaused())
>+    {
>+        const State &state                      = context->getState();
>+        TransformFeedback *curTransformFeedback = state.getCurrentTransformFeedback();
>+        if (!curTransformFeedback->checkBufferSpaceForDraw(count, primcount))
>+        {
>+            context->validationError(GL_INVALID_OPERATION, err::kTransformFeedbackBufferTooSmall);
>+            return false;
>+        }
>+    }
>+
>+    return ValidateDrawArraysAttribs(context, first, count);
>+}
>+
>+ANGLE_INLINE bool ValidateDrawElementsBase(Context *context,
>+                                           PrimitiveMode mode,
>+                                           DrawElementsType type)
>+{
>+    if (!context->getStateCache().isValidDrawElementsType(type))
>+    {
>+        if (type == DrawElementsType::UnsignedInt)
>+        {
>+            context->validationError(GL_INVALID_ENUM, err::kTypeNotUnsignedShortByte);
>+            return false;
>+        }
>+
>+        ASSERT(type == DrawElementsType::InvalidEnum);
>+        context->validationError(GL_INVALID_ENUM, err::kEnumNotSupported);
>+        return false;
>+    }
>+
>+    intptr_t drawElementsError = context->getStateCache().getBasicDrawElementsError(context);
>+    if (drawElementsError)
>+    {
>+        // All errors from ValidateDrawElementsStates return INVALID_OPERATION.
>+        const char *errorMessage = reinterpret_cast<const char *>(drawElementsError);
>+        context->validationError(GL_INVALID_OPERATION, errorMessage);
>+        return false;
>+    }
>+
>+    // Note that we are missing overflow checks for active transform feedback buffers.
>+    return true;
>+}
>+
>+ANGLE_INLINE bool ValidateDrawElementsCommon(Context *context,
>+                                             PrimitiveMode mode,
>+                                             GLsizei count,
>+                                             DrawElementsType type,
>+                                             const void *indices,
>+                                             GLsizei primcount)
>+{
>+    if (!ValidateDrawElementsBase(context, mode, type))
>+    {
>+        return false;
>+    }
>+
>+    ASSERT(isPow2(GetDrawElementsTypeSize(type)) && GetDrawElementsTypeSize(type) > 0);
>+
>+    if (context->getExtensions().webglCompatibility)
>+    {
>+        GLuint typeBytes = GetDrawElementsTypeSize(type);
>+
>+        if ((reinterpret_cast<uintptr_t>(indices) & static_cast<uintptr_t>(typeBytes - 1)) != 0)
>+        {
>+            // [WebGL 1.0] Section 6.4 Buffer Offset and Stride Requirements
>+            // The offset arguments to drawElements and [...], must be a multiple of the size of the
>+            // data type passed to the call, or an INVALID_OPERATION error is generated.
>+            context->validationError(GL_INVALID_OPERATION, err::kOffsetMustBeMultipleOfType);
>+            return false;
>+        }
>+
>+        // [WebGL 1.0] Section 6.4 Buffer Offset and Stride Requirements
>+        // In addition the offset argument to drawElements must be non-negative or an INVALID_VALUE
>+        // error is generated.
>+        if (reinterpret_cast<intptr_t>(indices) < 0)
>+        {
>+            context->validationError(GL_INVALID_VALUE, err::kNegativeOffset);
>+            return false;
>+        }
>+    }
>+
>+    if (count <= 0)
>+    {
>+        if (count < 0)
>+        {
>+            context->validationError(GL_INVALID_VALUE, err::kNegativeCount);
>+            return false;
>+        }
>+
>+        // Early exit.
>+        return ValidateDrawBase(context, mode);
>+    }
>+
>+    if (!ValidateDrawBase(context, mode))
>+    {
>+        return false;
>+    }
>+
>+    const State &state         = context->getState();
>+    const VertexArray *vao     = state.getVertexArray();
>+    Buffer *elementArrayBuffer = vao->getElementArrayBuffer();
>+
>+    if (!elementArrayBuffer)
>+    {
>+        if (!indices)
>+        {
>+            // This is an application error that would normally result in a crash, but we catch
>+            // it and return an error
>+            context->validationError(GL_INVALID_OPERATION, err::kElementArrayNoBufferOrPointer);
>+            return false;
>+        }
>+    }
>+    else
>+    {
>+        // The max possible type size is 8 and count is on 32 bits so doing the multiplication
>+        // in a 64 bit integer is safe. Also we are guaranteed that here count > 0.
>+        static_assert(std::is_same<int, GLsizei>::value, "GLsizei isn't the expected type");
>+        constexpr uint64_t kMaxTypeSize = 8;
>+        constexpr uint64_t kIntMax      = std::numeric_limits<int>::max();
>+        constexpr uint64_t kUint64Max   = std::numeric_limits<uint64_t>::max();
>+        static_assert(kIntMax < kUint64Max / kMaxTypeSize, "");
>+
>+        uint64_t elementCount = static_cast<uint64_t>(count);
>+        ASSERT(elementCount > 0 && GetDrawElementsTypeSize(type) <= kMaxTypeSize);
>+
>+        // Doing the multiplication here is overflow-safe
>+        uint64_t elementDataSizeNoOffset = elementCount << GetDrawElementsTypeShift(type);
>+
>+        // The offset can be any value, check for overflows
>+        uint64_t offset = static_cast<uint64_t>(reinterpret_cast<uintptr_t>(indices));
>+        uint64_t elementDataSizeWithOffset = elementDataSizeNoOffset + offset;
>+        if (elementDataSizeWithOffset < elementDataSizeNoOffset)
>+        {
>+            context->validationError(GL_INVALID_OPERATION, err::kIntegerOverflow);
>+            return false;
>+        }
>+
>+        if (elementDataSizeWithOffset > static_cast<uint64_t>(elementArrayBuffer->getSize()))
>+        {
>+            context->validationError(GL_INVALID_OPERATION, err::kInsufficientBufferSize);
>+            return false;
>+        }
>+    }
>+
>+    if (context->isBufferAccessValidationEnabled() && primcount > 0)
>+    {
>+        // Use the parameter buffer to retrieve and cache the index range.
>+        IndexRange indexRange{IndexRange::Undefined()};
>+        ANGLE_VALIDATION_TRY(vao->getIndexRange(context, type, count, indices, &indexRange));
>+
>+        // If we use an index greater than our maximum supported index range, return an error.
>+        // The ES3 spec does not specify behaviour here, it is undefined, but ANGLE should
>+        // always return an error if possible here.
>+        if (static_cast<GLuint64>(indexRange.end) >= context->getCaps().maxElementIndex)
>+        {
>+            context->validationError(GL_INVALID_OPERATION, err::kExceedsMaxElement);
>+            return false;
>+        }
>+
>+        if (!ValidateDrawAttribs(context, static_cast<GLint>(indexRange.end)))
>+        {
>+            return false;
>+        }
>+
>+        // No op if there are no real indices in the index data (all are primitive restart).
>+        return (indexRange.vertexIndexCount > 0);
>+    }
>+
>+    return true;
>+}
> }  // namespace gl
> 
> #endif  // LIBANGLE_VALIDATION_ES_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/validationES1.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/validationES1.cpp
>new file mode 100644
>index 00000000000..57b8b88aa98
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/validationES1.cpp
>@@ -0,0 +1,1631 @@
>+//
>+// Copyright (c) 2018 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+
>+// validationES1.cpp: Validation functions for OpenGL ES 1.0 entry point parameters
>+
>+#include "libANGLE/validationES1_autogen.h"
>+
>+#include "common/debug.h"
>+#include "libANGLE/Context.h"
>+#include "libANGLE/ErrorStrings.h"
>+#include "libANGLE/GLES1State.h"
>+#include "libANGLE/queryconversions.h"
>+#include "libANGLE/queryutils.h"
>+#include "libANGLE/validationES.h"
>+
>+#define ANGLE_VALIDATE_IS_GLES1(context)                                \
>+    do                                                                  \
>+    {                                                                   \
>+        if (context->getClientMajorVersion() > 1)                       \
>+        {                                                               \
>+            context->validationError(GL_INVALID_OPERATION, kGLES1Only); \
>+            return false;                                               \
>+        }                                                               \
>+    } while (0)
>+
>+namespace gl
>+{
>+using namespace err;
>+
>+bool ValidateAlphaFuncCommon(Context *context, AlphaTestFunc func)
>+{
>+    switch (func)
>+    {
>+        case AlphaTestFunc::AlwaysPass:
>+        case AlphaTestFunc::Equal:
>+        case AlphaTestFunc::Gequal:
>+        case AlphaTestFunc::Greater:
>+        case AlphaTestFunc::Lequal:
>+        case AlphaTestFunc::Less:
>+        case AlphaTestFunc::Never:
>+        case AlphaTestFunc::NotEqual:
>+            return true;
>+        default:
>+            context->validationError(GL_INVALID_ENUM, kEnumNotSupported);
>+            return false;
>+    }
>+}
>+
>+bool ValidateClientStateCommon(Context *context, ClientVertexArrayType arrayType)
>+{
>+    ANGLE_VALIDATE_IS_GLES1(context);
>+    switch (arrayType)
>+    {
>+        case ClientVertexArrayType::Vertex:
>+        case ClientVertexArrayType::Normal:
>+        case ClientVertexArrayType::Color:
>+        case ClientVertexArrayType::TextureCoord:
>+            return true;
>+        case ClientVertexArrayType::PointSize:
>+            if (!context->getExtensions().pointSizeArray)
>+            {
>+                context->validationError(GL_INVALID_ENUM, kPointSizeArrayExtensionNotEnabled);
>+                return false;
>+            }
>+            return true;
>+        default:
>+            context->validationError(GL_INVALID_ENUM, kInvalidClientState);
>+            return false;
>+    }
>+}
>+
>+bool ValidateBuiltinVertexAttributeCommon(Context *context,
>+                                          ClientVertexArrayType arrayType,
>+                                          GLint size,
>+                                          VertexAttribType type,
>+                                          GLsizei stride,
>+                                          const void *pointer)
>+{
>+    ANGLE_VALIDATE_IS_GLES1(context);
>+
>+    if (stride < 0)
>+    {
>+        context->validationError(GL_INVALID_VALUE, kInvalidVertexPointerStride);
>+        return false;
>+    }
>+
>+    int minSize = 1;
>+    int maxSize = 4;
>+
>+    switch (arrayType)
>+    {
>+        case ClientVertexArrayType::Vertex:
>+        case ClientVertexArrayType::TextureCoord:
>+            minSize = 2;
>+            maxSize = 4;
>+            break;
>+        case ClientVertexArrayType::Normal:
>+            minSize = 3;
>+            maxSize = 3;
>+            break;
>+        case ClientVertexArrayType::Color:
>+            minSize = 4;
>+            maxSize = 4;
>+            break;
>+        case ClientVertexArrayType::PointSize:
>+            if (!context->getExtensions().pointSizeArray)
>+            {
>+                context->validationError(GL_INVALID_ENUM, kPointSizeArrayExtensionNotEnabled);
>+                return false;
>+            }
>+
>+            minSize = 1;
>+            maxSize = 1;
>+            break;
>+        default:
>+            UNREACHABLE();
>+            return false;
>+    }
>+
>+    if (size < minSize || size > maxSize)
>+    {
>+        context->validationError(GL_INVALID_VALUE, kInvalidVertexPointerSize);
>+        return false;
>+    }
>+
>+    switch (type)
>+    {
>+        case VertexAttribType::Byte:
>+            if (arrayType == ClientVertexArrayType::PointSize)
>+            {
>+                context->validationError(GL_INVALID_ENUM, kInvalidVertexPointerType);
>+                return false;
>+            }
>+            break;
>+        case VertexAttribType::Short:
>+            if (arrayType == ClientVertexArrayType::PointSize ||
>+                arrayType == ClientVertexArrayType::Color)
>+            {
>+                context->validationError(GL_INVALID_ENUM, kInvalidVertexPointerType);
>+                return false;
>+            }
>+            break;
>+        case VertexAttribType::Fixed:
>+        case VertexAttribType::Float:
>+            break;
>+        default:
>+            context->validationError(GL_INVALID_ENUM, kInvalidVertexPointerType);
>+            return false;
>+    }
>+
>+    return true;
>+}
>+
>+bool ValidateLightCaps(Context *context, GLenum light)
>+{
>+    if (light < GL_LIGHT0 || light >= GL_LIGHT0 + context->getCaps().maxLights)
>+    {
>+        context->validationError(GL_INVALID_ENUM, kInvalidLight);
>+        return false;
>+    }
>+
>+    return true;
>+}
>+
>+bool ValidateLightCommon(Context *context,
>+                         GLenum light,
>+                         LightParameter pname,
>+                         const GLfloat *params)
>+{
>+
>+    ANGLE_VALIDATE_IS_GLES1(context);
>+
>+    if (!ValidateLightCaps(context, light))
>+    {
>+        return false;
>+    }
>+
>+    switch (pname)
>+    {
>+        case LightParameter::Ambient:
>+        case LightParameter::Diffuse:
>+        case LightParameter::Specular:
>+        case LightParameter::Position:
>+        case LightParameter::SpotDirection:
>+            return true;
>+        case LightParameter::SpotExponent:
>+            if (params[0] < 0.0f || params[0] > 128.0f)
>+            {
>+                context->validationError(GL_INVALID_VALUE, kLightParameterOutOfRange);
>+                return false;
>+            }
>+            return true;
>+        case LightParameter::SpotCutoff:
>+            if (params[0] == 180.0f)
>+            {
>+                return true;
>+            }
>+            if (params[0] < 0.0f || params[0] > 90.0f)
>+            {
>+                context->validationError(GL_INVALID_VALUE, kLightParameterOutOfRange);
>+                return false;
>+            }
>+            return true;
>+        case LightParameter::ConstantAttenuation:
>+        case LightParameter::LinearAttenuation:
>+        case LightParameter::QuadraticAttenuation:
>+            if (params[0] < 0.0f)
>+            {
>+                context->validationError(GL_INVALID_VALUE, kLightParameterOutOfRange);
>+                return false;
>+            }
>+            return true;
>+        default:
>+            context->validationError(GL_INVALID_ENUM, kInvalidLightParameter);
>+            return false;
>+    }
>+}
>+
>+bool ValidateLightSingleComponent(Context *context,
>+                                  GLenum light,
>+                                  LightParameter pname,
>+                                  GLfloat param)
>+{
>+    if (!ValidateLightCommon(context, light, pname, &param))
>+    {
>+        return false;
>+    }
>+
>+    if (GetLightParameterCount(pname) > 1)
>+    {
>+        context->validationError(GL_INVALID_ENUM, kInvalidLightParameter);
>+        return false;
>+    }
>+
>+    return true;
>+}
>+
>+bool ValidateMaterialCommon(Context *context,
>+                            GLenum face,
>+                            MaterialParameter pname,
>+                            const GLfloat *params)
>+{
>+    switch (pname)
>+    {
>+        case MaterialParameter::Ambient:
>+        case MaterialParameter::Diffuse:
>+        case MaterialParameter::Specular:
>+        case MaterialParameter::Emission:
>+            return true;
>+        case MaterialParameter::Shininess:
>+            if (params[0] < 0.0f || params[0] > 128.0f)
>+            {
>+                context->validationError(GL_INVALID_VALUE, kMaterialParameterOutOfRange);
>+                return false;
>+            }
>+            return true;
>+        default:
>+            context->validationError(GL_INVALID_ENUM, kInvalidMaterialParameter);
>+            return false;
>+    }
>+}
>+
>+bool ValidateMaterialSetting(Context *context,
>+                             GLenum face,
>+                             MaterialParameter pname,
>+                             const GLfloat *params)
>+{
>+    ANGLE_VALIDATE_IS_GLES1(context);
>+
>+    if (face != GL_FRONT_AND_BACK)
>+    {
>+        context->validationError(GL_INVALID_ENUM, kInvalidMaterialFace);
>+        return false;
>+    }
>+
>+    return ValidateMaterialCommon(context, face, pname, params);
>+}
>+
>+bool ValidateMaterialQuery(Context *context, GLenum face, MaterialParameter pname)
>+{
>+    ANGLE_VALIDATE_IS_GLES1(context);
>+
>+    if (face != GL_FRONT && face != GL_BACK)
>+    {
>+        context->validationError(GL_INVALID_ENUM, kInvalidMaterialFace);
>+        return false;
>+    }
>+
>+    GLfloat dummyParams[4] = {0.0f, 0.0f, 0.0f, 0.0f};
>+
>+    return ValidateMaterialCommon(context, face, pname, dummyParams);
>+}
>+
>+bool ValidateMaterialSingleComponent(Context *context,
>+                                     GLenum face,
>+                                     MaterialParameter pname,
>+                                     GLfloat param)
>+{
>+    if (!ValidateMaterialSetting(context, face, pname, &param))
>+    {
>+        return false;
>+    }
>+
>+    if (GetMaterialParameterCount(pname) > 1)
>+    {
>+        context->validationError(GL_INVALID_ENUM, kInvalidMaterialParameter);
>+        return false;
>+    }
>+
>+    return true;
>+}
>+
>+bool ValidateLightModelCommon(Context *context, GLenum pname)
>+{
>+    ANGLE_VALIDATE_IS_GLES1(context);
>+    switch (pname)
>+    {
>+        case GL_LIGHT_MODEL_AMBIENT:
>+        case GL_LIGHT_MODEL_TWO_SIDE:
>+            return true;
>+        default:
>+            context->validationError(GL_INVALID_ENUM, kInvalidLightModelParameter);
>+            return false;
>+    }
>+}
>+
>+bool ValidateLightModelSingleComponent(Context *context, GLenum pname)
>+{
>+    if (!ValidateLightModelCommon(context, pname))
>+    {
>+        return false;
>+    }
>+
>+    switch (pname)
>+    {
>+        case GL_LIGHT_MODEL_TWO_SIDE:
>+            return true;
>+        default:
>+            context->validationError(GL_INVALID_ENUM, kInvalidLightModelParameter);
>+            return false;
>+    }
>+}
>+
>+bool ValidateClipPlaneCommon(Context *context, GLenum plane)
>+{
>+    ANGLE_VALIDATE_IS_GLES1(context);
>+
>+    if (plane < GL_CLIP_PLANE0 || plane >= GL_CLIP_PLANE0 + context->getCaps().maxClipPlanes)
>+    {
>+        context->validationError(GL_INVALID_ENUM, kInvalidClipPlane);
>+        return false;
>+    }
>+
>+    return true;
>+}
>+
>+bool ValidateFogCommon(Context *context, GLenum pname, const GLfloat *params)
>+{
>+    ANGLE_VALIDATE_IS_GLES1(context);
>+
>+    switch (pname)
>+    {
>+        case GL_FOG_MODE:
>+        {
>+            GLenum modeParam = static_cast<GLenum>(params[0]);
>+            switch (modeParam)
>+            {
>+                case GL_EXP:
>+                case GL_EXP2:
>+                case GL_LINEAR:
>+                    return true;
>+                default:
>+                    context->validationError(GL_INVALID_VALUE, kInvalidFogMode);
>+                    return false;
>+            }
>+        }
>+        break;
>+        case GL_FOG_START:
>+        case GL_FOG_END:
>+        case GL_FOG_COLOR:
>+            break;
>+        case GL_FOG_DENSITY:
>+            if (params[0] < 0.0f)
>+            {
>+                context->validationError(GL_INVALID_VALUE, kInvalidFogDensity);
>+                return false;
>+            }
>+            break;
>+        default:
>+            context->validationError(GL_INVALID_ENUM, kInvalidFogParameter);
>+            return false;
>+    }
>+    return true;
>+}
>+
>+bool ValidateTexEnvCommon(Context *context,
>+                          TextureEnvTarget target,
>+                          TextureEnvParameter pname,
>+                          const GLfloat *params)
>+{
>+    ANGLE_VALIDATE_IS_GLES1(context);
>+
>+    switch (target)
>+    {
>+        case TextureEnvTarget::Env:
>+            switch (pname)
>+            {
>+                case TextureEnvParameter::Mode:
>+                {
>+                    TextureEnvMode mode = FromGLenum<TextureEnvMode>(ConvertToGLenum(params[0]));
>+                    switch (mode)
>+                    {
>+                        case TextureEnvMode::Add:
>+                        case TextureEnvMode::Blend:
>+                        case TextureEnvMode::Combine:
>+                        case TextureEnvMode::Decal:
>+                        case TextureEnvMode::Modulate:
>+                        case TextureEnvMode::Replace:
>+                            break;
>+                        default:
>+                            context->validationError(GL_INVALID_VALUE, kInvalidTextureEnvMode);
>+                            return false;
>+                    }
>+                    break;
>+                }
>+                case TextureEnvParameter::CombineRgb:
>+                case TextureEnvParameter::CombineAlpha:
>+                {
>+                    TextureCombine combine = FromGLenum<TextureCombine>(ConvertToGLenum(params[0]));
>+                    switch (combine)
>+                    {
>+                        case TextureCombine::Add:
>+                        case TextureCombine::AddSigned:
>+                        case TextureCombine::Interpolate:
>+                        case TextureCombine::Modulate:
>+                        case TextureCombine::Replace:
>+                        case TextureCombine::Subtract:
>+                            break;
>+                        case TextureCombine::Dot3Rgb:
>+                        case TextureCombine::Dot3Rgba:
>+                            if (pname == TextureEnvParameter::CombineAlpha)
>+                            {
>+                                context->validationError(GL_INVALID_VALUE, kInvalidTextureCombine);
>+                                return false;
>+                            }
>+                            break;
>+                        default:
>+                            context->validationError(GL_INVALID_VALUE, kInvalidTextureCombine);
>+                            return false;
>+                    }
>+                    break;
>+                }
>+                case TextureEnvParameter::Src0Rgb:
>+                case TextureEnvParameter::Src1Rgb:
>+                case TextureEnvParameter::Src2Rgb:
>+                case TextureEnvParameter::Src0Alpha:
>+                case TextureEnvParameter::Src1Alpha:
>+                case TextureEnvParameter::Src2Alpha:
>+                {
>+                    TextureSrc combine = FromGLenum<TextureSrc>(ConvertToGLenum(params[0]));
>+                    switch (combine)
>+                    {
>+                        case TextureSrc::Constant:
>+                        case TextureSrc::Previous:
>+                        case TextureSrc::PrimaryColor:
>+                        case TextureSrc::Texture:
>+                            break;
>+                        default:
>+                            context->validationError(GL_INVALID_VALUE, kInvalidTextureCombineSrc);
>+                            return false;
>+                    }
>+                    break;
>+                }
>+                case TextureEnvParameter::Op0Rgb:
>+                case TextureEnvParameter::Op1Rgb:
>+                case TextureEnvParameter::Op2Rgb:
>+                case TextureEnvParameter::Op0Alpha:
>+                case TextureEnvParameter::Op1Alpha:
>+                case TextureEnvParameter::Op2Alpha:
>+                {
>+                    TextureOp operand = FromGLenum<TextureOp>(ConvertToGLenum(params[0]));
>+                    switch (operand)
>+                    {
>+                        case TextureOp::SrcAlpha:
>+                        case TextureOp::OneMinusSrcAlpha:
>+                            break;
>+                        case TextureOp::SrcColor:
>+                        case TextureOp::OneMinusSrcColor:
>+                            if (pname == TextureEnvParameter::Op0Alpha ||
>+                                pname == TextureEnvParameter::Op1Alpha ||
>+                                pname == TextureEnvParameter::Op2Alpha)
>+                            {
>+                                context->validationError(GL_INVALID_VALUE, kInvalidTextureCombine);
>+                                return false;
>+                            }
>+                            break;
>+                        default:
>+                            context->validationError(GL_INVALID_VALUE, kInvalidTextureCombineOp);
>+                            return false;
>+                    }
>+                    break;
>+                }
>+                case TextureEnvParameter::RgbScale:
>+                case TextureEnvParameter::AlphaScale:
>+                    if (params[0] != 1.0f && params[0] != 2.0f && params[0] != 4.0f)
>+                    {
>+                        context->validationError(GL_INVALID_VALUE, kInvalidTextureEnvScale);
>+                        return false;
>+                    }
>+                    break;
>+                case TextureEnvParameter::Color:
>+                    break;
>+                default:
>+                    context->validationError(GL_INVALID_ENUM, kInvalidTextureEnvParameter);
>+                    return false;
>+            }
>+            break;
>+        case TextureEnvTarget::PointSprite:
>+            if (!context->getExtensions().pointSprite)
>+            {
>+                context->validationError(GL_INVALID_ENUM, kInvalidTextureEnvTarget);
>+                return false;
>+            }
>+            switch (pname)
>+            {
>+                case TextureEnvParameter::PointCoordReplace:
>+                    break;
>+                default:
>+                    context->validationError(GL_INVALID_ENUM, kInvalidTextureEnvParameter);
>+                    return false;
>+            }
>+            break;
>+        default:
>+            context->validationError(GL_INVALID_ENUM, kInvalidTextureEnvTarget);
>+            return false;
>+    }
>+    return true;
>+}
>+
>+bool ValidateGetTexEnvCommon(Context *context, TextureEnvTarget target, TextureEnvParameter pname)
>+{
>+    GLfloat dummy[4] = {};
>+    switch (pname)
>+    {
>+        case TextureEnvParameter::Mode:
>+            ConvertPackedEnum(TextureEnvMode::Add, dummy);
>+            break;
>+        case TextureEnvParameter::CombineRgb:
>+        case TextureEnvParameter::CombineAlpha:
>+            ConvertPackedEnum(TextureCombine::Add, dummy);
>+            break;
>+        case TextureEnvParameter::Src0Rgb:
>+        case TextureEnvParameter::Src1Rgb:
>+        case TextureEnvParameter::Src2Rgb:
>+        case TextureEnvParameter::Src0Alpha:
>+        case TextureEnvParameter::Src1Alpha:
>+        case TextureEnvParameter::Src2Alpha:
>+            ConvertPackedEnum(TextureSrc::Constant, dummy);
>+            break;
>+        case TextureEnvParameter::Op0Rgb:
>+        case TextureEnvParameter::Op1Rgb:
>+        case TextureEnvParameter::Op2Rgb:
>+        case TextureEnvParameter::Op0Alpha:
>+        case TextureEnvParameter::Op1Alpha:
>+        case TextureEnvParameter::Op2Alpha:
>+            ConvertPackedEnum(TextureOp::SrcAlpha, dummy);
>+            break;
>+        case TextureEnvParameter::RgbScale:
>+        case TextureEnvParameter::AlphaScale:
>+        case TextureEnvParameter::PointCoordReplace:
>+            dummy[0] = 1.0f;
>+            break;
>+        default:
>+            break;
>+    }
>+
>+    return ValidateTexEnvCommon(context, target, pname, dummy);
>+}
>+
>+bool ValidatePointParameterCommon(Context *context, PointParameter pname, const GLfloat *params)
>+{
>+    ANGLE_VALIDATE_IS_GLES1(context);
>+
>+    switch (pname)
>+    {
>+        case PointParameter::PointSizeMin:
>+        case PointParameter::PointSizeMax:
>+        case PointParameter::PointFadeThresholdSize:
>+        case PointParameter::PointDistanceAttenuation:
>+            for (unsigned int i = 0; i < GetPointParameterCount(pname); i++)
>+            {
>+                if (params[i] < 0.0f)
>+                {
>+                    context->validationError(GL_INVALID_VALUE, kInvalidPointParameterValue);
>+                    return false;
>+                }
>+            }
>+            break;
>+        default:
>+            context->validationError(GL_INVALID_ENUM, kInvalidPointParameter);
>+            return false;
>+    }
>+
>+    return true;
>+}
>+
>+bool ValidatePointSizeCommon(Context *context, GLfloat size)
>+{
>+    ANGLE_VALIDATE_IS_GLES1(context);
>+
>+    if (size <= 0.0f)
>+    {
>+        context->validationError(GL_INVALID_VALUE, kInvalidPointSizeValue);
>+        return false;
>+    }
>+
>+    return true;
>+}
>+
>+bool ValidateDrawTexCommon(Context *context, float width, float height)
>+{
>+    ANGLE_VALIDATE_IS_GLES1(context);
>+
>+    if (width <= 0.0f || height <= 0.0f)
>+    {
>+        context->validationError(GL_INVALID_VALUE, kNonPositiveDrawTextureDimension);
>+        return false;
>+    }
>+
>+    return true;
>+}
>+
>+}  // namespace gl
>+
>+namespace gl
>+{
>+
>+bool ValidateAlphaFunc(Context *context, AlphaTestFunc func, GLfloat ref)
>+{
>+    ANGLE_VALIDATE_IS_GLES1(context);
>+    return ValidateAlphaFuncCommon(context, func);
>+}
>+
>+bool ValidateAlphaFuncx(Context *context, AlphaTestFunc func, GLfixed ref)
>+{
>+    ANGLE_VALIDATE_IS_GLES1(context);
>+    return ValidateAlphaFuncCommon(context, func);
>+}
>+
>+bool ValidateClearColorx(Context *context, GLfixed red, GLfixed green, GLfixed blue, GLfixed alpha)
>+{
>+    UNIMPLEMENTED();
>+    return true;
>+}
>+
>+bool ValidateClearDepthx(Context *context, GLfixed depth)
>+{
>+    UNIMPLEMENTED();
>+    return true;
>+}
>+
>+bool ValidateClientActiveTexture(Context *context, GLenum texture)
>+{
>+    ANGLE_VALIDATE_IS_GLES1(context);
>+    return ValidateMultitextureUnit(context, texture);
>+}
>+
>+bool ValidateClipPlanef(Context *context, GLenum plane, const GLfloat *eqn)
>+{
>+    return ValidateClipPlaneCommon(context, plane);
>+}
>+
>+bool ValidateClipPlanex(Context *context, GLenum plane, const GLfixed *equation)
>+{
>+    return ValidateClipPlaneCommon(context, plane);
>+}
>+
>+bool ValidateColor4f(Context *context, GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha)
>+{
>+    ANGLE_VALIDATE_IS_GLES1(context);
>+    return true;
>+}
>+
>+bool ValidateColor4ub(Context *context, GLubyte red, GLubyte green, GLubyte blue, GLubyte alpha)
>+{
>+    ANGLE_VALIDATE_IS_GLES1(context);
>+    return true;
>+}
>+
>+bool ValidateColor4x(Context *context, GLfixed red, GLfixed green, GLfixed blue, GLfixed alpha)
>+{
>+    ANGLE_VALIDATE_IS_GLES1(context);
>+    return true;
>+}
>+
>+bool ValidateColorPointer(Context *context,
>+                          GLint size,
>+                          VertexAttribType type,
>+                          GLsizei stride,
>+                          const void *pointer)
>+{
>+    return ValidateBuiltinVertexAttributeCommon(context, ClientVertexArrayType::Color, size, type,
>+                                                stride, pointer);
>+}
>+
>+bool ValidateCullFace(Context *context, GLenum mode)
>+{
>+    UNIMPLEMENTED();
>+    return true;
>+}
>+
>+bool ValidateDepthRangex(Context *context, GLfixed n, GLfixed f)
>+{
>+    UNIMPLEMENTED();
>+    return true;
>+}
>+
>+bool ValidateDisableClientState(Context *context, ClientVertexArrayType arrayType)
>+{
>+    return ValidateClientStateCommon(context, arrayType);
>+}
>+
>+bool ValidateEnableClientState(Context *context, ClientVertexArrayType arrayType)
>+{
>+    return ValidateClientStateCommon(context, arrayType);
>+}
>+
>+bool ValidateFogf(Context *context, GLenum pname, GLfloat param)
>+{
>+    return ValidateFogCommon(context, pname, &param);
>+}
>+
>+bool ValidateFogfv(Context *context, GLenum pname, const GLfloat *params)
>+{
>+    return ValidateFogCommon(context, pname, params);
>+}
>+
>+bool ValidateFogx(Context *context, GLenum pname, GLfixed param)
>+{
>+    GLfloat asFloat = FixedToFloat(param);
>+    return ValidateFogCommon(context, pname, &asFloat);
>+}
>+
>+bool ValidateFogxv(Context *context, GLenum pname, const GLfixed *params)
>+{
>+    unsigned int paramCount = GetFogParameterCount(pname);
>+    GLfloat paramsf[4]      = {};
>+
>+    for (unsigned int i = 0; i < paramCount; i++)
>+    {
>+        paramsf[i] = FixedToFloat(params[i]);
>+    }
>+
>+    return ValidateFogCommon(context, pname, paramsf);
>+}
>+
>+bool ValidateFrustumf(Context *context,
>+                      GLfloat l,
>+                      GLfloat r,
>+                      GLfloat b,
>+                      GLfloat t,
>+                      GLfloat n,
>+                      GLfloat f)
>+{
>+    ANGLE_VALIDATE_IS_GLES1(context);
>+    if (l == r || b == t || n == f || n <= 0.0f || f <= 0.0f)
>+    {
>+        context->validationError(GL_INVALID_VALUE, kInvalidProjectionMatrix);
>+    }
>+    return true;
>+}
>+
>+bool ValidateFrustumx(Context *context,
>+                      GLfixed l,
>+                      GLfixed r,
>+                      GLfixed b,
>+                      GLfixed t,
>+                      GLfixed n,
>+                      GLfixed f)
>+{
>+    ANGLE_VALIDATE_IS_GLES1(context);
>+    if (l == r || b == t || n == f || n <= 0 || f <= 0)
>+    {
>+        context->validationError(GL_INVALID_VALUE, kInvalidProjectionMatrix);
>+    }
>+    return true;
>+}
>+
>+bool ValidateGetBufferParameteriv(Context *context, GLenum target, GLenum pname, GLint *params)
>+{
>+    UNIMPLEMENTED();
>+    return true;
>+}
>+
>+bool ValidateGetClipPlanef(Context *context, GLenum plane, GLfloat *equation)
>+{
>+    return ValidateClipPlaneCommon(context, plane);
>+}
>+
>+bool ValidateGetClipPlanex(Context *context, GLenum plane, GLfixed *equation)
>+{
>+    return ValidateClipPlaneCommon(context, plane);
>+}
>+
>+bool ValidateGetFixedv(Context *context, GLenum pname, GLfixed *params)
>+{
>+    UNIMPLEMENTED();
>+    return true;
>+}
>+
>+bool ValidateGetLightfv(Context *context, GLenum light, LightParameter pname, GLfloat *params)
>+{
>+    GLfloat dummyParams[4] = {0.0f, 0.0f, 0.0f, 0.0f};
>+    return ValidateLightCommon(context, light, pname, dummyParams);
>+}
>+
>+bool ValidateGetLightxv(Context *context, GLenum light, LightParameter pname, GLfixed *params)
>+{
>+    GLfloat dummyParams[4] = {0.0f, 0.0f, 0.0f, 0.0f};
>+    return ValidateLightCommon(context, light, pname, dummyParams);
>+}
>+
>+bool ValidateGetMaterialfv(Context *context, GLenum face, MaterialParameter pname, GLfloat *params)
>+{
>+    return ValidateMaterialQuery(context, face, pname);
>+}
>+
>+bool ValidateGetMaterialxv(Context *context, GLenum face, MaterialParameter pname, GLfixed *params)
>+{
>+    return ValidateMaterialQuery(context, face, pname);
>+}
>+
>+bool ValidateGetPointerv(Context *context, GLenum pname, void **params)
>+{
>+    ANGLE_VALIDATE_IS_GLES1(context);
>+    switch (pname)
>+    {
>+        case GL_VERTEX_ARRAY_POINTER:
>+        case GL_NORMAL_ARRAY_POINTER:
>+        case GL_COLOR_ARRAY_POINTER:
>+        case GL_TEXTURE_COORD_ARRAY_POINTER:
>+        case GL_POINT_SIZE_ARRAY_POINTER_OES:
>+            return true;
>+        default:
>+            context->validationError(GL_INVALID_ENUM, kInvalidPointerQuery);
>+            return false;
>+    }
>+}
>+
>+bool ValidateGetTexEnvfv(Context *context,
>+                         TextureEnvTarget target,
>+                         TextureEnvParameter pname,
>+                         GLfloat *params)
>+{
>+    return ValidateGetTexEnvCommon(context, target, pname);
>+}
>+
>+bool ValidateGetTexEnviv(Context *context,
>+                         TextureEnvTarget target,
>+                         TextureEnvParameter pname,
>+                         GLint *params)
>+{
>+    return ValidateGetTexEnvCommon(context, target, pname);
>+}
>+
>+bool ValidateGetTexEnvxv(Context *context,
>+                         TextureEnvTarget target,
>+                         TextureEnvParameter pname,
>+                         GLfixed *params)
>+{
>+    return ValidateGetTexEnvCommon(context, target, pname);
>+}
>+
>+bool ValidateGetTexParameterxv(Context *context, TextureType target, GLenum pname, GLfixed *params)
>+{
>+    ANGLE_VALIDATE_IS_GLES1(context);
>+
>+    if (!ValidateGetTexParameterBase(context, target, pname, nullptr))
>+    {
>+        return false;
>+    }
>+
>+    return true;
>+}
>+
>+bool ValidateLightModelf(Context *context, GLenum pname, GLfloat param)
>+{
>+    return ValidateLightModelSingleComponent(context, pname);
>+}
>+
>+bool ValidateLightModelfv(Context *context, GLenum pname, const GLfloat *params)
>+{
>+    return ValidateLightModelCommon(context, pname);
>+}
>+
>+bool ValidateLightModelx(Context *context, GLenum pname, GLfixed param)
>+{
>+    return ValidateLightModelSingleComponent(context, pname);
>+}
>+
>+bool ValidateLightModelxv(Context *context, GLenum pname, const GLfixed *param)
>+{
>+    return ValidateLightModelCommon(context, pname);
>+}
>+
>+bool ValidateLightf(Context *context, GLenum light, LightParameter pname, GLfloat param)
>+{
>+    return ValidateLightSingleComponent(context, light, pname, param);
>+}
>+
>+bool ValidateLightfv(Context *context, GLenum light, LightParameter pname, const GLfloat *params)
>+{
>+    return ValidateLightCommon(context, light, pname, params);
>+}
>+
>+bool ValidateLightx(Context *context, GLenum light, LightParameter pname, GLfixed param)
>+{
>+    return ValidateLightSingleComponent(context, light, pname, FixedToFloat(param));
>+}
>+
>+bool ValidateLightxv(Context *context, GLenum light, LightParameter pname, const GLfixed *params)
>+{
>+    GLfloat paramsf[4];
>+    for (unsigned int i = 0; i < GetLightParameterCount(pname); i++)
>+    {
>+        paramsf[i] = FixedToFloat(params[i]);
>+    }
>+
>+    return ValidateLightCommon(context, light, pname, paramsf);
>+}
>+
>+bool ValidateLineWidthx(Context *context, GLfixed width)
>+{
>+    UNIMPLEMENTED();
>+    return true;
>+}
>+
>+bool ValidateLoadIdentity(Context *context)
>+{
>+    ANGLE_VALIDATE_IS_GLES1(context);
>+    return true;
>+}
>+
>+bool ValidateLoadMatrixf(Context *context, const GLfloat *m)
>+{
>+    ANGLE_VALIDATE_IS_GLES1(context);
>+    return true;
>+}
>+
>+bool ValidateLoadMatrixx(Context *context, const GLfixed *m)
>+{
>+    ANGLE_VALIDATE_IS_GLES1(context);
>+    return true;
>+}
>+
>+bool ValidateLogicOp(Context *context, LogicalOperation opcode)
>+{
>+    ANGLE_VALIDATE_IS_GLES1(context);
>+    switch (opcode)
>+    {
>+        case LogicalOperation::And:
>+        case LogicalOperation::AndInverted:
>+        case LogicalOperation::AndReverse:
>+        case LogicalOperation::Clear:
>+        case LogicalOperation::Copy:
>+        case LogicalOperation::CopyInverted:
>+        case LogicalOperation::Equiv:
>+        case LogicalOperation::Invert:
>+        case LogicalOperation::Nand:
>+        case LogicalOperation::Noop:
>+        case LogicalOperation::Nor:
>+        case LogicalOperation::Or:
>+        case LogicalOperation::OrInverted:
>+        case LogicalOperation::OrReverse:
>+        case LogicalOperation::Set:
>+        case LogicalOperation::Xor:
>+            return true;
>+        default:
>+            context->validationError(GL_INVALID_ENUM, kInvalidLogicOp);
>+            return false;
>+    }
>+}
>+
>+bool ValidateMaterialf(Context *context, GLenum face, MaterialParameter pname, GLfloat param)
>+{
>+    return ValidateMaterialSingleComponent(context, face, pname, param);
>+}
>+
>+bool ValidateMaterialfv(Context *context,
>+                        GLenum face,
>+                        MaterialParameter pname,
>+                        const GLfloat *params)
>+{
>+    return ValidateMaterialSetting(context, face, pname, params);
>+}
>+
>+bool ValidateMaterialx(Context *context, GLenum face, MaterialParameter pname, GLfixed param)
>+{
>+    return ValidateMaterialSingleComponent(context, face, pname, FixedToFloat(param));
>+}
>+
>+bool ValidateMaterialxv(Context *context,
>+                        GLenum face,
>+                        MaterialParameter pname,
>+                        const GLfixed *params)
>+{
>+    GLfloat paramsf[4];
>+
>+    for (unsigned int i = 0; i < GetMaterialParameterCount(pname); i++)
>+    {
>+        paramsf[i] = FixedToFloat(params[i]);
>+    }
>+
>+    return ValidateMaterialSetting(context, face, pname, paramsf);
>+}
>+
>+bool ValidateMatrixMode(Context *context, MatrixType mode)
>+{
>+    ANGLE_VALIDATE_IS_GLES1(context);
>+    switch (mode)
>+    {
>+        case MatrixType::Projection:
>+        case MatrixType::Modelview:
>+        case MatrixType::Texture:
>+            return true;
>+        default:
>+            context->validationError(GL_INVALID_ENUM, kInvalidMatrixMode);
>+            return false;
>+    }
>+}
>+
>+bool ValidateMultMatrixf(Context *context, const GLfloat *m)
>+{
>+    ANGLE_VALIDATE_IS_GLES1(context);
>+    return true;
>+}
>+
>+bool ValidateMultMatrixx(Context *context, const GLfixed *m)
>+{
>+    ANGLE_VALIDATE_IS_GLES1(context);
>+    return true;
>+}
>+
>+bool ValidateMultiTexCoord4f(Context *context,
>+                             GLenum target,
>+                             GLfloat s,
>+                             GLfloat t,
>+                             GLfloat r,
>+                             GLfloat q)
>+{
>+    ANGLE_VALIDATE_IS_GLES1(context);
>+    return ValidateMultitextureUnit(context, target);
>+}
>+
>+bool ValidateMultiTexCoord4x(Context *context,
>+                             GLenum target,
>+                             GLfixed s,
>+                             GLfixed t,
>+                             GLfixed r,
>+                             GLfixed q)
>+{
>+    ANGLE_VALIDATE_IS_GLES1(context);
>+    return ValidateMultitextureUnit(context, target);
>+}
>+
>+bool ValidateNormal3f(Context *context, GLfloat nx, GLfloat ny, GLfloat nz)
>+{
>+    ANGLE_VALIDATE_IS_GLES1(context);
>+    return true;
>+}
>+
>+bool ValidateNormal3x(Context *context, GLfixed nx, GLfixed ny, GLfixed nz)
>+{
>+    ANGLE_VALIDATE_IS_GLES1(context);
>+    return true;
>+}
>+
>+bool ValidateNormalPointer(Context *context,
>+                           VertexAttribType type,
>+                           GLsizei stride,
>+                           const void *pointer)
>+{
>+    return ValidateBuiltinVertexAttributeCommon(context, ClientVertexArrayType::Normal, 3, type,
>+                                                stride, pointer);
>+}
>+
>+bool ValidateOrthof(Context *context,
>+                    GLfloat l,
>+                    GLfloat r,
>+                    GLfloat b,
>+                    GLfloat t,
>+                    GLfloat n,
>+                    GLfloat f)
>+{
>+    ANGLE_VALIDATE_IS_GLES1(context);
>+    if (l == r || b == t || n == f || n <= 0.0f || f <= 0.0f)
>+    {
>+        context->validationError(GL_INVALID_VALUE, kInvalidProjectionMatrix);
>+    }
>+    return true;
>+}
>+
>+bool ValidateOrthox(Context *context,
>+                    GLfixed l,
>+                    GLfixed r,
>+                    GLfixed b,
>+                    GLfixed t,
>+                    GLfixed n,
>+                    GLfixed f)
>+{
>+    ANGLE_VALIDATE_IS_GLES1(context);
>+    if (l == r || b == t || n == f || n <= 0 || f <= 0)
>+    {
>+        context->validationError(GL_INVALID_VALUE, kInvalidProjectionMatrix);
>+    }
>+    return true;
>+}
>+
>+bool ValidatePointParameterf(Context *context, PointParameter pname, GLfloat param)
>+{
>+    unsigned int paramCount = GetPointParameterCount(pname);
>+    if (paramCount != 1)
>+    {
>+        context->validationError(GL_INVALID_ENUM, kInvalidPointParameter);
>+        return false;
>+    }
>+
>+    return ValidatePointParameterCommon(context, pname, &param);
>+}
>+
>+bool ValidatePointParameterfv(Context *context, PointParameter pname, const GLfloat *params)
>+{
>+    return ValidatePointParameterCommon(context, pname, params);
>+}
>+
>+bool ValidatePointParameterx(Context *context, PointParameter pname, GLfixed param)
>+{
>+    unsigned int paramCount = GetPointParameterCount(pname);
>+    if (paramCount != 1)
>+    {
>+        context->validationError(GL_INVALID_ENUM, kInvalidPointParameter);
>+        return false;
>+    }
>+
>+    GLfloat paramf = FixedToFloat(param);
>+    return ValidatePointParameterCommon(context, pname, &paramf);
>+}
>+
>+bool ValidatePointParameterxv(Context *context, PointParameter pname, const GLfixed *params)
>+{
>+    GLfloat paramsf[4] = {};
>+    for (unsigned int i = 0; i < GetPointParameterCount(pname); i++)
>+    {
>+        paramsf[i] = FixedToFloat(params[i]);
>+    }
>+    return ValidatePointParameterCommon(context, pname, paramsf);
>+}
>+
>+bool ValidatePointSize(Context *context, GLfloat size)
>+{
>+    return ValidatePointSizeCommon(context, size);
>+}
>+
>+bool ValidatePointSizex(Context *context, GLfixed size)
>+{
>+    return ValidatePointSizeCommon(context, FixedToFloat(size));
>+}
>+
>+bool ValidatePolygonOffsetx(Context *context, GLfixed factor, GLfixed units)
>+{
>+    UNIMPLEMENTED();
>+    return true;
>+}
>+
>+bool ValidatePopMatrix(Context *context)
>+{
>+    ANGLE_VALIDATE_IS_GLES1(context);
>+    const auto &stack = context->getState().gles1().currentMatrixStack();
>+    if (stack.size() == 1)
>+    {
>+        context->validationError(GL_STACK_UNDERFLOW, kMatrixStackUnderflow);
>+        return false;
>+    }
>+    return true;
>+}
>+
>+bool ValidatePushMatrix(Context *context)
>+{
>+    ANGLE_VALIDATE_IS_GLES1(context);
>+    const auto &stack = context->getState().gles1().currentMatrixStack();
>+    if (stack.size() == stack.max_size())
>+    {
>+        context->validationError(GL_STACK_OVERFLOW, kMatrixStackOverflow);
>+        return false;
>+    }
>+    return true;
>+}
>+
>+bool ValidateRotatef(Context *context, GLfloat angle, GLfloat x, GLfloat y, GLfloat z)
>+{
>+    ANGLE_VALIDATE_IS_GLES1(context);
>+    return true;
>+}
>+
>+bool ValidateRotatex(Context *context, GLfixed angle, GLfixed x, GLfixed y, GLfixed z)
>+{
>+    ANGLE_VALIDATE_IS_GLES1(context);
>+    return true;
>+}
>+
>+bool ValidateSampleCoveragex(Context *context, GLclampx value, GLboolean invert)
>+{
>+    UNIMPLEMENTED();
>+    return true;
>+}
>+
>+bool ValidateScalef(Context *context, GLfloat x, GLfloat y, GLfloat z)
>+{
>+    ANGLE_VALIDATE_IS_GLES1(context);
>+    return true;
>+}
>+
>+bool ValidateScalex(Context *context, GLfixed x, GLfixed y, GLfixed z)
>+{
>+    ANGLE_VALIDATE_IS_GLES1(context);
>+    return true;
>+}
>+
>+bool ValidateShadeModel(Context *context, ShadingModel mode)
>+{
>+    ANGLE_VALIDATE_IS_GLES1(context);
>+    switch (mode)
>+    {
>+        case ShadingModel::Flat:
>+        case ShadingModel::Smooth:
>+            return true;
>+        default:
>+            context->validationError(GL_INVALID_ENUM, kInvalidShadingModel);
>+            return false;
>+    }
>+}
>+
>+bool ValidateTexCoordPointer(Context *context,
>+                             GLint size,
>+                             VertexAttribType type,
>+                             GLsizei stride,
>+                             const void *pointer)
>+{
>+    return ValidateBuiltinVertexAttributeCommon(context, ClientVertexArrayType::TextureCoord, size,
>+                                                type, stride, pointer);
>+}
>+
>+bool ValidateTexEnvf(Context *context,
>+                     TextureEnvTarget target,
>+                     TextureEnvParameter pname,
>+                     GLfloat param)
>+{
>+    return ValidateTexEnvCommon(context, target, pname, &param);
>+}
>+
>+bool ValidateTexEnvfv(Context *context,
>+                      TextureEnvTarget target,
>+                      TextureEnvParameter pname,
>+                      const GLfloat *params)
>+{
>+    return ValidateTexEnvCommon(context, target, pname, params);
>+}
>+
>+bool ValidateTexEnvi(Context *context,
>+                     TextureEnvTarget target,
>+                     TextureEnvParameter pname,
>+                     GLint param)
>+{
>+    GLfloat paramf = static_cast<GLfloat>(param);
>+    return ValidateTexEnvCommon(context, target, pname, &paramf);
>+}
>+
>+bool ValidateTexEnviv(Context *context,
>+                      TextureEnvTarget target,
>+                      TextureEnvParameter pname,
>+                      const GLint *params)
>+{
>+    GLfloat paramsf[4];
>+    for (unsigned int i = 0; i < GetTextureEnvParameterCount(pname); i++)
>+    {
>+        paramsf[i] = static_cast<GLfloat>(params[i]);
>+    }
>+    return ValidateTexEnvCommon(context, target, pname, paramsf);
>+}
>+
>+bool ValidateTexEnvx(Context *context,
>+                     TextureEnvTarget target,
>+                     TextureEnvParameter pname,
>+                     GLfixed param)
>+{
>+    GLfloat paramf = static_cast<GLfloat>(param);
>+    return ValidateTexEnvCommon(context, target, pname, &paramf);
>+}
>+
>+bool ValidateTexEnvxv(Context *context,
>+                      TextureEnvTarget target,
>+                      TextureEnvParameter pname,
>+                      const GLfixed *params)
>+{
>+    GLfloat paramsf[4];
>+    for (unsigned int i = 0; i < GetTextureEnvParameterCount(pname); i++)
>+    {
>+        paramsf[i] = static_cast<GLfloat>(params[i]);
>+    }
>+    return ValidateTexEnvCommon(context, target, pname, paramsf);
>+}
>+
>+bool ValidateTexParameterx(Context *context, TextureType target, GLenum pname, GLfixed param)
>+{
>+    ANGLE_VALIDATE_IS_GLES1(context);
>+    GLfloat paramf = FixedToFloat(param);
>+    return ValidateTexParameterBase(context, target, pname, -1, false, &paramf);
>+}
>+
>+bool ValidateTexParameterxv(Context *context,
>+                            TextureType target,
>+                            GLenum pname,
>+                            const GLfixed *params)
>+{
>+    ANGLE_VALIDATE_IS_GLES1(context);
>+    GLfloat paramsf[4] = {};
>+    for (unsigned int i = 0; i < GetTexParameterCount(pname); i++)
>+    {
>+        paramsf[i] = FixedToFloat(params[i]);
>+    }
>+    return ValidateTexParameterBase(context, target, pname, -1, true, paramsf);
>+}
>+
>+bool ValidateTranslatef(Context *context, GLfloat x, GLfloat y, GLfloat z)
>+{
>+    ANGLE_VALIDATE_IS_GLES1(context);
>+    return true;
>+}
>+
>+bool ValidateTranslatex(Context *context, GLfixed x, GLfixed y, GLfixed z)
>+{
>+    ANGLE_VALIDATE_IS_GLES1(context);
>+    return true;
>+}
>+
>+bool ValidateVertexPointer(Context *context,
>+                           GLint size,
>+                           VertexAttribType type,
>+                           GLsizei stride,
>+                           const void *pointer)
>+{
>+    return ValidateBuiltinVertexAttributeCommon(context, ClientVertexArrayType::Vertex, size, type,
>+                                                stride, pointer);
>+}
>+
>+bool ValidateDrawTexfOES(Context *context,
>+                         GLfloat x,
>+                         GLfloat y,
>+                         GLfloat z,
>+                         GLfloat width,
>+                         GLfloat height)
>+{
>+    return ValidateDrawTexCommon(context, width, height);
>+}
>+
>+bool ValidateDrawTexfvOES(Context *context, const GLfloat *coords)
>+{
>+    return ValidateDrawTexCommon(context, coords[3], coords[4]);
>+}
>+
>+bool ValidateDrawTexiOES(Context *context, GLint x, GLint y, GLint z, GLint width, GLint height)
>+{
>+    return ValidateDrawTexCommon(context, static_cast<GLfloat>(width),
>+                                 static_cast<GLfloat>(height));
>+}
>+
>+bool ValidateDrawTexivOES(Context *context, const GLint *coords)
>+{
>+    return ValidateDrawTexCommon(context, static_cast<GLfloat>(coords[3]),
>+                                 static_cast<GLfloat>(coords[4]));
>+}
>+
>+bool ValidateDrawTexsOES(Context *context,
>+                         GLshort x,
>+                         GLshort y,
>+                         GLshort z,
>+                         GLshort width,
>+                         GLshort height)
>+{
>+    return ValidateDrawTexCommon(context, static_cast<GLfloat>(width),
>+                                 static_cast<GLfloat>(height));
>+}
>+
>+bool ValidateDrawTexsvOES(Context *context, const GLshort *coords)
>+{
>+    return ValidateDrawTexCommon(context, static_cast<GLfloat>(coords[3]),
>+                                 static_cast<GLfloat>(coords[4]));
>+}
>+
>+bool ValidateDrawTexxOES(Context *context,
>+                         GLfixed x,
>+                         GLfixed y,
>+                         GLfixed z,
>+                         GLfixed width,
>+                         GLfixed height)
>+{
>+    return ValidateDrawTexCommon(context, FixedToFloat(width), FixedToFloat(height));
>+}
>+
>+bool ValidateDrawTexxvOES(Context *context, const GLfixed *coords)
>+{
>+    return ValidateDrawTexCommon(context, FixedToFloat(coords[3]), FixedToFloat(coords[4]));
>+}
>+
>+bool ValidateCurrentPaletteMatrixOES(Context *context, GLuint matrixpaletteindex)
>+{
>+    UNIMPLEMENTED();
>+    return true;
>+}
>+
>+bool ValidateLoadPaletteFromModelViewMatrixOES(Context *context)
>+{
>+    UNIMPLEMENTED();
>+    return true;
>+}
>+
>+bool ValidateMatrixIndexPointerOES(Context *context,
>+                                   GLint size,
>+                                   GLenum type,
>+                                   GLsizei stride,
>+                                   const void *pointer)
>+{
>+    UNIMPLEMENTED();
>+    return true;
>+}
>+
>+bool ValidateWeightPointerOES(Context *context,
>+                              GLint size,
>+                              GLenum type,
>+                              GLsizei stride,
>+                              const void *pointer)
>+{
>+    UNIMPLEMENTED();
>+    return true;
>+}
>+
>+bool ValidatePointSizePointerOES(Context *context,
>+                                 VertexAttribType type,
>+                                 GLsizei stride,
>+                                 const void *pointer)
>+{
>+    return ValidateBuiltinVertexAttributeCommon(context, ClientVertexArrayType::PointSize, 1, type,
>+                                                stride, pointer);
>+}
>+
>+bool ValidateQueryMatrixxOES(Context *context, GLfixed *mantissa, GLint *exponent)
>+{
>+    UNIMPLEMENTED();
>+    return true;
>+}
>+
>+bool ValidateGenFramebuffersOES(Context *context, GLsizei n, GLuint *framebuffers)
>+{
>+    UNIMPLEMENTED();
>+    return true;
>+}
>+
>+bool ValidateDeleteFramebuffersOES(Context *context, GLsizei n, const GLuint *framebuffers)
>+{
>+    UNIMPLEMENTED();
>+    return true;
>+}
>+
>+bool ValidateGenRenderbuffersOES(Context *context, GLsizei n, GLuint *renderbuffers)
>+{
>+    UNIMPLEMENTED();
>+    return true;
>+}
>+
>+bool ValidateDeleteRenderbuffersOES(Context *context, GLsizei n, const GLuint *renderbuffers)
>+{
>+    UNIMPLEMENTED();
>+    return true;
>+}
>+
>+bool ValidateBindFramebufferOES(Context *context, GLenum target, GLuint framebuffer)
>+{
>+    UNIMPLEMENTED();
>+    return true;
>+}
>+
>+bool ValidateBindRenderbufferOES(Context *context, GLenum target, GLuint renderbuffer)
>+{
>+    UNIMPLEMENTED();
>+    return true;
>+}
>+
>+bool ValidateCheckFramebufferStatusOES(Context *context, GLenum target)
>+{
>+    UNIMPLEMENTED();
>+    return true;
>+}
>+
>+bool ValidateFramebufferRenderbufferOES(Context *context,
>+                                        GLenum target,
>+                                        GLenum attachment,
>+                                        GLenum rbtarget,
>+                                        GLuint renderbuffer)
>+{
>+    UNIMPLEMENTED();
>+    return true;
>+}
>+
>+bool ValidateFramebufferTexture2DOES(Context *context,
>+                                     GLenum target,
>+                                     GLenum attachment,
>+                                     TextureTarget textarget,
>+                                     GLuint texture,
>+                                     GLint level)
>+{
>+    UNIMPLEMENTED();
>+    return true;
>+}
>+
>+bool ValidateGenerateMipmapOES(Context *context, TextureType target)
>+{
>+    UNIMPLEMENTED();
>+    return true;
>+}
>+
>+bool ValidateGetFramebufferAttachmentParameterivOES(Context *context,
>+                                                    GLenum target,
>+                                                    GLenum attachment,
>+                                                    GLenum pname,
>+                                                    GLint *params)
>+{
>+    UNIMPLEMENTED();
>+    return true;
>+}
>+
>+bool ValidateGetRenderbufferParameterivOES(Context *context,
>+                                           GLenum target,
>+                                           GLenum pname,
>+                                           GLint *params)
>+{
>+    UNIMPLEMENTED();
>+    return true;
>+}
>+
>+bool ValidateIsFramebufferOES(Context *context, GLuint framebuffer)
>+{
>+    UNIMPLEMENTED();
>+    return true;
>+}
>+
>+bool ValidateIsRenderbufferOES(Context *context, GLuint renderbuffer)
>+{
>+    UNIMPLEMENTED();
>+    return true;
>+}
>+
>+bool ValidateRenderbufferStorageOES(Context *context,
>+                                    GLenum target,
>+                                    GLenum internalformat,
>+                                    GLsizei width,
>+                                    GLsizei height)
>+{
>+    UNIMPLEMENTED();
>+    return true;
>+}
>+
>+// GL_OES_texture_cube_map
>+
>+bool ValidateGetTexGenfvOES(Context *context, GLenum coord, GLenum pname, GLfloat *params)
>+{
>+    UNIMPLEMENTED();
>+    return true;
>+}
>+
>+bool ValidateGetTexGenivOES(Context *context, GLenum coord, GLenum pname, int *params)
>+{
>+    UNIMPLEMENTED();
>+    return true;
>+}
>+
>+bool ValidateGetTexGenxvOES(Context *context, GLenum coord, GLenum pname, GLfixed *params)
>+{
>+    UNIMPLEMENTED();
>+    return true;
>+}
>+
>+bool ValidateTexGenfvOES(Context *context, GLenum coord, GLenum pname, const GLfloat *params)
>+{
>+    UNIMPLEMENTED();
>+    return true;
>+}
>+
>+bool ValidateTexGenivOES(Context *context, GLenum coord, GLenum pname, const GLint *param)
>+{
>+    UNIMPLEMENTED();
>+    return true;
>+}
>+
>+bool ValidateTexGenxvOES(Context *context, GLenum coord, GLenum pname, const GLint *param)
>+{
>+    UNIMPLEMENTED();
>+    return true;
>+}
>+
>+bool ValidateTexGenfOES(Context *context, GLenum coord, GLenum pname, GLfloat param)
>+{
>+    UNIMPLEMENTED();
>+    return true;
>+}
>+
>+bool ValidateTexGeniOES(Context *context, GLenum coord, GLenum pname, GLint param)
>+{
>+    UNIMPLEMENTED();
>+    return true;
>+}
>+
>+bool ValidateTexGenxOES(Context *context, GLenum coord, GLenum pname, GLfixed param)
>+{
>+    UNIMPLEMENTED();
>+    return true;
>+}
>+
>+}  // namespace gl
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/validationES1.h b/Source/ThirdParty/ANGLE/src/libANGLE/validationES1.h
>new file mode 100644
>index 00000000000..e2e62484007
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/validationES1.h
>@@ -0,0 +1,20 @@
>+//
>+// Copyright 2018 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// validationES1.h:
>+//  Inlined validation functions for OpenGL ES 1.0 entry points.
>+
>+#ifndef LIBANGLE_VALIDATION_ES1_H_
>+#define LIBANGLE_VALIDATION_ES1_H_
>+
>+#include "libANGLE/ErrorStrings.h"
>+#include "libANGLE/validationES1_autogen.h"
>+
>+namespace gl
>+{
>+// Nothing here yet.
>+}  // namespace gl
>+
>+#endif  // LIBANGLE_VALIDATION_ES1_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/validationES1_autogen.h b/Source/ThirdParty/ANGLE/src/libANGLE/validationES1_autogen.h
>new file mode 100644
>index 00000000000..432332659f1
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/validationES1_autogen.h
>@@ -0,0 +1,214 @@
>+// GENERATED FILE - DO NOT EDIT.
>+// Generated by generate_entry_points.py using data from gl.xml and gl_angle_ext.xml.
>+//
>+// Copyright 2019 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// validationES1_autogen.h:
>+//   Validation functions for the OpenGL ES 1.0 entry points.
>+
>+#ifndef LIBANGLE_VALIDATION_ES1_AUTOGEN_H_
>+#define LIBANGLE_VALIDATION_ES1_AUTOGEN_H_
>+
>+#include "common/PackedEnums.h"
>+
>+namespace gl
>+{
>+class Context;
>+
>+bool ValidateAlphaFunc(Context *context, AlphaTestFunc funcPacked, GLfloat ref);
>+bool ValidateAlphaFuncx(Context *context, AlphaTestFunc funcPacked, GLfixed ref);
>+bool ValidateClearColorx(Context *context, GLfixed red, GLfixed green, GLfixed blue, GLfixed alpha);
>+bool ValidateClearDepthx(Context *context, GLfixed depth);
>+bool ValidateClientActiveTexture(Context *context, GLenum texture);
>+bool ValidateClipPlanef(Context *context, GLenum p, const GLfloat *eqn);
>+bool ValidateClipPlanex(Context *context, GLenum plane, const GLfixed *equation);
>+bool ValidateColor4f(Context *context, GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha);
>+bool ValidateColor4ub(Context *context, GLubyte red, GLubyte green, GLubyte blue, GLubyte alpha);
>+bool ValidateColor4x(Context *context, GLfixed red, GLfixed green, GLfixed blue, GLfixed alpha);
>+bool ValidateColorPointer(Context *context,
>+                          GLint size,
>+                          VertexAttribType typePacked,
>+                          GLsizei stride,
>+                          const void *pointer);
>+bool ValidateDepthRangex(Context *context, GLfixed n, GLfixed f);
>+bool ValidateDisableClientState(Context *context, ClientVertexArrayType arrayPacked);
>+bool ValidateEnableClientState(Context *context, ClientVertexArrayType arrayPacked);
>+bool ValidateFogf(Context *context, GLenum pname, GLfloat param);
>+bool ValidateFogfv(Context *context, GLenum pname, const GLfloat *params);
>+bool ValidateFogx(Context *context, GLenum pname, GLfixed param);
>+bool ValidateFogxv(Context *context, GLenum pname, const GLfixed *param);
>+bool ValidateFrustumf(Context *context,
>+                      GLfloat l,
>+                      GLfloat r,
>+                      GLfloat b,
>+                      GLfloat t,
>+                      GLfloat n,
>+                      GLfloat f);
>+bool ValidateFrustumx(Context *context,
>+                      GLfixed l,
>+                      GLfixed r,
>+                      GLfixed b,
>+                      GLfixed t,
>+                      GLfixed n,
>+                      GLfixed f);
>+bool ValidateGetClipPlanef(Context *context, GLenum plane, GLfloat *equation);
>+bool ValidateGetClipPlanex(Context *context, GLenum plane, GLfixed *equation);
>+bool ValidateGetFixedv(Context *context, GLenum pname, GLfixed *params);
>+bool ValidateGetLightfv(Context *context,
>+                        GLenum light,
>+                        LightParameter pnamePacked,
>+                        GLfloat *params);
>+bool ValidateGetLightxv(Context *context,
>+                        GLenum light,
>+                        LightParameter pnamePacked,
>+                        GLfixed *params);
>+bool ValidateGetMaterialfv(Context *context,
>+                           GLenum face,
>+                           MaterialParameter pnamePacked,
>+                           GLfloat *params);
>+bool ValidateGetMaterialxv(Context *context,
>+                           GLenum face,
>+                           MaterialParameter pnamePacked,
>+                           GLfixed *params);
>+bool ValidateGetPointerv(Context *context, GLenum pname, void **params);
>+bool ValidateGetTexEnvfv(Context *context,
>+                         TextureEnvTarget targetPacked,
>+                         TextureEnvParameter pnamePacked,
>+                         GLfloat *params);
>+bool ValidateGetTexEnviv(Context *context,
>+                         TextureEnvTarget targetPacked,
>+                         TextureEnvParameter pnamePacked,
>+                         GLint *params);
>+bool ValidateGetTexEnvxv(Context *context,
>+                         TextureEnvTarget targetPacked,
>+                         TextureEnvParameter pnamePacked,
>+                         GLfixed *params);
>+bool ValidateGetTexParameterxv(Context *context,
>+                               TextureType targetPacked,
>+                               GLenum pname,
>+                               GLfixed *params);
>+bool ValidateLightModelf(Context *context, GLenum pname, GLfloat param);
>+bool ValidateLightModelfv(Context *context, GLenum pname, const GLfloat *params);
>+bool ValidateLightModelx(Context *context, GLenum pname, GLfixed param);
>+bool ValidateLightModelxv(Context *context, GLenum pname, const GLfixed *param);
>+bool ValidateLightf(Context *context, GLenum light, LightParameter pnamePacked, GLfloat param);
>+bool ValidateLightfv(Context *context,
>+                     GLenum light,
>+                     LightParameter pnamePacked,
>+                     const GLfloat *params);
>+bool ValidateLightx(Context *context, GLenum light, LightParameter pnamePacked, GLfixed param);
>+bool ValidateLightxv(Context *context,
>+                     GLenum light,
>+                     LightParameter pnamePacked,
>+                     const GLfixed *params);
>+bool ValidateLineWidthx(Context *context, GLfixed width);
>+bool ValidateLoadIdentity(Context *context);
>+bool ValidateLoadMatrixf(Context *context, const GLfloat *m);
>+bool ValidateLoadMatrixx(Context *context, const GLfixed *m);
>+bool ValidateLogicOp(Context *context, LogicalOperation opcodePacked);
>+bool ValidateMaterialf(Context *context, GLenum face, MaterialParameter pnamePacked, GLfloat param);
>+bool ValidateMaterialfv(Context *context,
>+                        GLenum face,
>+                        MaterialParameter pnamePacked,
>+                        const GLfloat *params);
>+bool ValidateMaterialx(Context *context, GLenum face, MaterialParameter pnamePacked, GLfixed param);
>+bool ValidateMaterialxv(Context *context,
>+                        GLenum face,
>+                        MaterialParameter pnamePacked,
>+                        const GLfixed *param);
>+bool ValidateMatrixMode(Context *context, MatrixType modePacked);
>+bool ValidateMultMatrixf(Context *context, const GLfloat *m);
>+bool ValidateMultMatrixx(Context *context, const GLfixed *m);
>+bool ValidateMultiTexCoord4f(Context *context,
>+                             GLenum target,
>+                             GLfloat s,
>+                             GLfloat t,
>+                             GLfloat r,
>+                             GLfloat q);
>+bool ValidateMultiTexCoord4x(Context *context,
>+                             GLenum texture,
>+                             GLfixed s,
>+                             GLfixed t,
>+                             GLfixed r,
>+                             GLfixed q);
>+bool ValidateNormal3f(Context *context, GLfloat nx, GLfloat ny, GLfloat nz);
>+bool ValidateNormal3x(Context *context, GLfixed nx, GLfixed ny, GLfixed nz);
>+bool ValidateNormalPointer(Context *context,
>+                           VertexAttribType typePacked,
>+                           GLsizei stride,
>+                           const void *pointer);
>+bool ValidateOrthof(Context *context,
>+                    GLfloat l,
>+                    GLfloat r,
>+                    GLfloat b,
>+                    GLfloat t,
>+                    GLfloat n,
>+                    GLfloat f);
>+bool ValidateOrthox(Context *context,
>+                    GLfixed l,
>+                    GLfixed r,
>+                    GLfixed b,
>+                    GLfixed t,
>+                    GLfixed n,
>+                    GLfixed f);
>+bool ValidatePointParameterf(Context *context, PointParameter pnamePacked, GLfloat param);
>+bool ValidatePointParameterfv(Context *context, PointParameter pnamePacked, const GLfloat *params);
>+bool ValidatePointParameterx(Context *context, PointParameter pnamePacked, GLfixed param);
>+bool ValidatePointParameterxv(Context *context, PointParameter pnamePacked, const GLfixed *params);
>+bool ValidatePointSize(Context *context, GLfloat size);
>+bool ValidatePointSizex(Context *context, GLfixed size);
>+bool ValidatePolygonOffsetx(Context *context, GLfixed factor, GLfixed units);
>+bool ValidatePopMatrix(Context *context);
>+bool ValidatePushMatrix(Context *context);
>+bool ValidateRotatef(Context *context, GLfloat angle, GLfloat x, GLfloat y, GLfloat z);
>+bool ValidateRotatex(Context *context, GLfixed angle, GLfixed x, GLfixed y, GLfixed z);
>+bool ValidateSampleCoveragex(Context *context, GLclampx value, GLboolean invert);
>+bool ValidateScalef(Context *context, GLfloat x, GLfloat y, GLfloat z);
>+bool ValidateScalex(Context *context, GLfixed x, GLfixed y, GLfixed z);
>+bool ValidateShadeModel(Context *context, ShadingModel modePacked);
>+bool ValidateTexCoordPointer(Context *context,
>+                             GLint size,
>+                             VertexAttribType typePacked,
>+                             GLsizei stride,
>+                             const void *pointer);
>+bool ValidateTexEnvf(Context *context,
>+                     TextureEnvTarget targetPacked,
>+                     TextureEnvParameter pnamePacked,
>+                     GLfloat param);
>+bool ValidateTexEnvfv(Context *context,
>+                      TextureEnvTarget targetPacked,
>+                      TextureEnvParameter pnamePacked,
>+                      const GLfloat *params);
>+bool ValidateTexEnvi(Context *context,
>+                     TextureEnvTarget targetPacked,
>+                     TextureEnvParameter pnamePacked,
>+                     GLint param);
>+bool ValidateTexEnviv(Context *context,
>+                      TextureEnvTarget targetPacked,
>+                      TextureEnvParameter pnamePacked,
>+                      const GLint *params);
>+bool ValidateTexEnvx(Context *context,
>+                     TextureEnvTarget targetPacked,
>+                     TextureEnvParameter pnamePacked,
>+                     GLfixed param);
>+bool ValidateTexEnvxv(Context *context,
>+                      TextureEnvTarget targetPacked,
>+                      TextureEnvParameter pnamePacked,
>+                      const GLfixed *params);
>+bool ValidateTexParameterx(Context *context, TextureType targetPacked, GLenum pname, GLfixed param);
>+bool ValidateTexParameterxv(Context *context,
>+                            TextureType targetPacked,
>+                            GLenum pname,
>+                            const GLfixed *params);
>+bool ValidateTranslatef(Context *context, GLfloat x, GLfloat y, GLfloat z);
>+bool ValidateTranslatex(Context *context, GLfixed x, GLfixed y, GLfixed z);
>+bool ValidateVertexPointer(Context *context,
>+                           GLint size,
>+                           VertexAttribType typePacked,
>+                           GLsizei stride,
>+                           const void *pointer);
>+}  // namespace gl
>+
>+#endif  // LIBANGLE_VALIDATION_ES1_AUTOGEN_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/validationES2.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/validationES2.cpp
>index 5e505aa6073..254db5b9d39 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/validationES2.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/validationES2.cpp
>@@ -6,7 +6,7 @@
> 
> // validationES2.cpp: Validation functions for OpenGL ES 2.0 entry point parameters
> 
>-#include "libANGLE/validationES2.h"
>+#include "libANGLE/validationES2_autogen.h"
> 
> #include <cstdint>
> 
>@@ -15,6 +15,7 @@
> #include "common/utilities.h"
> #include "libANGLE/Context.h"
> #include "libANGLE/ErrorStrings.h"
>+#include "libANGLE/Fence.h"
> #include "libANGLE/Framebuffer.h"
> #include "libANGLE/FramebufferAttachment.h"
> #include "libANGLE/Renderbuffer.h"
>@@ -24,10 +25,12 @@
> #include "libANGLE/VertexArray.h"
> #include "libANGLE/formatutils.h"
> #include "libANGLE/validationES.h"
>-#include "libANGLE/validationES3.h"
>+#include "libANGLE/validationES2.h"
>+#include "libANGLE/validationES3_autogen.h"
> 
> namespace gl
> {
>+using namespace err;
> 
> namespace
> {
>@@ -53,9 +56,9 @@ bool IsPartialBlit(gl::Context *context,
>         return true;
>     }
> 
>-    if (context->getGLState().isScissorTestEnabled())
>+    if (context->getState().isScissorTestEnabled())
>     {
>-        const Rectangle &scissor = context->getGLState().getScissor();
>+        const Rectangle &scissor = context->getState().getScissor();
>         return scissor.x > 0 || scissor.y > 0 || scissor.width < writeSize.width ||
>                scissor.height < writeSize.height;
>     }
>@@ -74,9 +77,9 @@ bool ValidatePathInstances(gl::Context *context,
>     for (GLsizei i = 0; i < numPaths; ++i)
>     {
>         const GLuint pathName = array[i] + pathBase;
>-        if (context->hasPath(pathName) && !context->hasPathData(pathName))
>+        if (context->isPathGenerated(pathName) && !context->isPath(pathName))
>         {
>-            ANGLE_VALIDATION_ERR(context, InvalidOperation(), NoSuchPath);
>+            context->validationError(GL_INVALID_OPERATION, kNoSuchPath);
>             return false;
>         }
>     }
>@@ -93,25 +96,25 @@ bool ValidateInstancedPathParameters(gl::Context *context,
> {
>     if (!context->getExtensions().pathRendering)
>     {
>-        context->handleError(InvalidOperation() << "GL_CHROMIUM_path_rendering is not available.");
>+        context->validationError(GL_INVALID_OPERATION, kExtensionNotEnabled);
>         return false;
>     }
> 
>     if (paths == nullptr)
>     {
>-        context->handleError(InvalidValue() << "No path name array.");
>+        context->validationError(GL_INVALID_VALUE, kInvalidPathNameArray);
>         return false;
>     }
> 
>     if (numPaths < 0)
>     {
>-        context->handleError(InvalidValue() << "Invalid (negative) numPaths.");
>+        context->validationError(GL_INVALID_VALUE, kInvalidPathNumPaths);
>         return false;
>     }
> 
>     if (!angle::IsValueInRangeForNumericType<std::uint32_t>(numPaths))
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidOperation(), IntegerOverflow);
>+        context->validationError(GL_INVALID_OPERATION, kIntegerOverflow);
>         return false;
>     }
> 
>@@ -157,7 +160,7 @@ bool ValidateInstancedPathParameters(gl::Context *context,
>             break;
> 
>         default:
>-            context->handleError(InvalidEnum() << "Invalid path name type.");
>+            context->validationError(GL_INVALID_ENUM, kInvalidPathNameType);
>             return false;
>     }
> 
>@@ -185,12 +188,12 @@ bool ValidateInstancedPathParameters(gl::Context *context,
>             componentCount = 12;
>             break;
>         default:
>-            context->handleError(InvalidEnum() << "Invalid transformation.");
>+            context->validationError(GL_INVALID_ENUM, kInvalidTransformation);
>             return false;
>     }
>     if (componentCount != 0 && transformValues == nullptr)
>     {
>-        context->handleError(InvalidValue() << "No transform array given.");
>+        context->validationError(GL_INVALID_VALUE, kNoTransformArray);
>         return false;
>     }
> 
>@@ -199,7 +202,7 @@ bool ValidateInstancedPathParameters(gl::Context *context,
>     checkedSize += (numPaths * sizeof(GLfloat) * componentCount);
>     if (!checkedSize.IsValid())
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidOperation(), IntegerOverflow);
>+        context->validationError(GL_INVALID_OPERATION, kIntegerOverflow);
>         return false;
>     }
> 
>@@ -287,39 +290,40 @@ bool IsValidCopyTextureDestinationFormatType(Context *context, GLint internalFor
> {
>     if (!IsValidCopyTextureDestinationInternalFormatEnum(internalFormat))
>     {
>+        context->validationError(GL_INVALID_OPERATION, kInvalidInternalFormat);
>         return false;
>     }
> 
>     if (!ValidES3FormatCombination(GetUnsizedFormat(internalFormat), type, internalFormat))
>     {
>-        context->handleError(InvalidOperation()
>-                             << "Invalid combination of type and internalFormat.");
>+        context->validationError(GL_INVALID_OPERATION, kMismatchedTypeAndFormat);
>         return false;
>     }
> 
>     const InternalFormat &internalFormatInfo = GetInternalFormatInfo(internalFormat, type);
>     if (!internalFormatInfo.textureSupport(context->getClientVersion(), context->getExtensions()))
>     {
>+        context->validationError(GL_INVALID_OPERATION, kInvalidInternalFormat);
>         return false;
>     }
> 
>     return true;
> }
> 
>-bool IsValidCopyTextureDestinationTargetEnum(Context *context, GLenum target)
>+bool IsValidCopyTextureDestinationTargetEnum(Context *context, TextureTarget target)
> {
>     switch (target)
>     {
>-        case GL_TEXTURE_2D:
>-        case GL_TEXTURE_CUBE_MAP_POSITIVE_X:
>-        case GL_TEXTURE_CUBE_MAP_NEGATIVE_X:
>-        case GL_TEXTURE_CUBE_MAP_POSITIVE_Y:
>-        case GL_TEXTURE_CUBE_MAP_NEGATIVE_Y:
>-        case GL_TEXTURE_CUBE_MAP_POSITIVE_Z:
>-        case GL_TEXTURE_CUBE_MAP_NEGATIVE_Z:
>+        case TextureTarget::_2D:
>+        case TextureTarget::CubeMapNegativeX:
>+        case TextureTarget::CubeMapNegativeY:
>+        case TextureTarget::CubeMapNegativeZ:
>+        case TextureTarget::CubeMapPositiveX:
>+        case TextureTarget::CubeMapPositiveY:
>+        case TextureTarget::CubeMapPositiveZ:
>             return true;
> 
>-        case GL_TEXTURE_RECTANGLE_ANGLE:
>+        case TextureTarget::Rectangle:
>             return context->getExtensions().textureRectangle;
> 
>         default:
>@@ -327,38 +331,31 @@ bool IsValidCopyTextureDestinationTargetEnum(Context *context, GLenum target)
>     }
> }
> 
>-bool IsValidCopyTextureDestinationTarget(Context *context, GLenum textureType, GLenum target)
>+bool IsValidCopyTextureDestinationTarget(Context *context,
>+                                         TextureType textureType,
>+                                         TextureTarget target)
> {
>-    if (IsCubeMapTextureTarget(target))
>-    {
>-        return textureType == GL_TEXTURE_CUBE_MAP;
>-    }
>-    else
>-    {
>-        return textureType == target;
>-    }
>+    return TextureTargetToType(target) == textureType;
> }
> 
>-bool IsValidCopyTextureSourceTarget(Context *context, GLenum target)
>+bool IsValidCopyTextureSourceTarget(Context *context, TextureType type)
> {
>-    switch (target)
>+    switch (type)
>     {
>-        case GL_TEXTURE_2D:
>+        case TextureType::_2D:
>             return true;
>-        case GL_TEXTURE_RECTANGLE_ANGLE:
>+        case TextureType::Rectangle:
>             return context->getExtensions().textureRectangle;
>-
>-        // TODO(geofflang): accept GL_TEXTURE_EXTERNAL_OES if the texture_external extension is
>-        // supported
>-
>+        case TextureType::External:
>+            return context->getExtensions().eglImageExternal;
>         default:
>             return false;
>     }
> }
> 
>-bool IsValidCopyTextureSourceLevel(Context *context, GLenum target, GLint level)
>+bool IsValidCopyTextureSourceLevel(Context *context, TextureType type, GLint level)
> {
>-    if (!ValidMipLevel(context, target, level))
>+    if (!ValidMipLevel(context, type, level))
>     {
>         return false;
>     }
>@@ -372,44 +369,39 @@ bool IsValidCopyTextureSourceLevel(Context *context, GLenum target, GLint level)
> }
> 
> bool IsValidCopyTextureDestinationLevel(Context *context,
>-                                        GLenum target,
>+                                        TextureType type,
>                                         GLint level,
>                                         GLsizei width,
>-                                        GLsizei height)
>+                                        GLsizei height,
>+                                        bool isSubImage)
> {
>-    if (!ValidMipLevel(context, target, level))
>+    if (!ValidMipLevel(context, type, level))
>     {
>         return false;
>     }
> 
>-    const Caps &caps = context->getCaps();
>-    if (target == GL_TEXTURE_2D)
>-    {
>-        if (static_cast<GLuint>(width) > (caps.max2DTextureSize >> level) ||
>-            static_cast<GLuint>(height) > (caps.max2DTextureSize >> level))
>-        {
>-            return false;
>-        }
>-    }
>-    else if (target == GL_TEXTURE_RECTANGLE_ANGLE)
>+    if (!ValidImageSizeParameters(context, type, level, width, height, 1, isSubImage))
>     {
>-        ASSERT(level == 0);
>-        if (static_cast<GLuint>(width) > caps.maxRectangleTextureSize ||
>-            static_cast<GLuint>(height) > caps.maxRectangleTextureSize)
>-        {
>-            return false;
>-        }
>+        return false;
>     }
>-    else if (IsCubeMapTextureTarget(target))
>+
>+    const Caps &caps = context->getCaps();
>+    switch (type)
>     {
>-        if (static_cast<GLuint>(width) > (caps.maxCubeMapTextureSize >> level) ||
>-            static_cast<GLuint>(height) > (caps.maxCubeMapTextureSize >> level))
>-        {
>-            return false;
>-        }
>+        case TextureType::_2D:
>+            return static_cast<GLuint>(width) <= (caps.max2DTextureSize >> level) &&
>+                   static_cast<GLuint>(height) <= (caps.max2DTextureSize >> level);
>+        case TextureType::Rectangle:
>+            ASSERT(level == 0);
>+            return static_cast<GLuint>(width) <= (caps.max2DTextureSize >> level) &&
>+                   static_cast<GLuint>(height) <= (caps.max2DTextureSize >> level);
>+
>+        case TextureType::CubeMap:
>+            return static_cast<GLuint>(width) <= (caps.maxCubeMapTextureSize >> level) &&
>+                   static_cast<GLuint>(height) <= (caps.maxCubeMapTextureSize >> level);
>+        default:
>+            return true;
>     }
>-
>-    return true;
> }
> 
> bool IsValidStencilFunc(GLenum func)
>@@ -464,8 +456,8 @@ bool IsValidStencilOp(GLenum op)
>     }
> }
> 
>-bool ValidateES2CopyTexImageParameters(ValidationContext *context,
>-                                       GLenum target,
>+bool ValidateES2CopyTexImageParameters(Context *context,
>+                                       TextureTarget target,
>                                        GLint level,
>                                        GLenum internalformat,
>                                        bool isSubImage,
>@@ -479,13 +471,14 @@ bool ValidateES2CopyTexImageParameters(ValidationContext *context,
> {
>     if (!ValidTexture2DDestinationTarget(context, target))
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidEnum(), InvalidTextureTarget);
>+        context->validationError(GL_INVALID_ENUM, kInvalidTextureTarget);
>         return false;
>     }
> 
>-    if (!ValidImageSizeParameters(context, target, level, width, height, 1, isSubImage))
>+    TextureType texType = TextureTargetToType(target);
>+    if (!ValidImageSizeParameters(context, texType, level, width, height, 1, isSubImage))
>     {
>-        context->handleError(InvalidValue() << "Invalid texture dimensions.");
>+        // Error is already handled.
>         return false;
>     }
> 
>@@ -497,7 +490,7 @@ bool ValidateES2CopyTexImageParameters(ValidationContext *context,
>         return false;
>     }
> 
>-    const gl::Framebuffer *framebuffer = context->getGLState().getReadFramebuffer();
>+    const gl::Framebuffer *framebuffer = context->getState().getReadFramebuffer();
>     GLenum colorbufferFormat =
>         framebuffer->getReadColorbuffer()->getFormat().info->sizedInternalFormat;
>     const auto &formatInfo = *textureFormat.info;
>@@ -512,7 +505,7 @@ bool ValidateES2CopyTexImageParameters(ValidationContext *context,
>                     colorbufferFormat != GL_RGB5_A1 && colorbufferFormat != GL_RGBA8_OES &&
>                     colorbufferFormat != GL_BGRA8_EXT && colorbufferFormat != GL_BGR5_A1_ANGLEX)
>                 {
>-                    ANGLE_VALIDATION_ERR(context, InvalidOperation(), InvalidFormat);
>+                    context->validationError(GL_INVALID_OPERATION, kInvalidFormat);
>                     return false;
>                 }
>                 break;
>@@ -523,7 +516,7 @@ bool ValidateES2CopyTexImageParameters(ValidationContext *context,
>                     colorbufferFormat != GL_RGBA8_OES && colorbufferFormat != GL_BGRA8_EXT &&
>                     colorbufferFormat != GL_BGR5_A1_ANGLEX)
>                 {
>-                    ANGLE_VALIDATION_ERR(context, InvalidOperation(), InvalidFormat);
>+                    context->validationError(GL_INVALID_OPERATION, kInvalidFormat);
>                     return false;
>                 }
>                 break;
>@@ -536,7 +529,7 @@ bool ValidateES2CopyTexImageParameters(ValidationContext *context,
>                     colorbufferFormat != GL_RGBA32F && colorbufferFormat != GL_BGRA8_EXT &&
>                     colorbufferFormat != GL_BGR5_A1_ANGLEX)
>                 {
>-                    ANGLE_VALIDATION_ERR(context, InvalidOperation(), InvalidFormat);
>+                    context->validationError(GL_INVALID_OPERATION, kInvalidFormat);
>                     return false;
>                 }
>                 break;
>@@ -548,7 +541,7 @@ bool ValidateES2CopyTexImageParameters(ValidationContext *context,
>                     colorbufferFormat != GL_RGBA32F && colorbufferFormat != GL_BGRA8_EXT &&
>                     colorbufferFormat != GL_BGR5_A1_ANGLEX)
>                 {
>-                    ANGLE_VALIDATION_ERR(context, InvalidOperation(), InvalidFormat);
>+                    context->validationError(GL_INVALID_OPERATION, kInvalidFormat);
>                     return false;
>                 }
>                 break;
>@@ -559,7 +552,7 @@ bool ValidateES2CopyTexImageParameters(ValidationContext *context,
>                     colorbufferFormat != GL_RGBA32F && colorbufferFormat != GL_BGRA8_EXT &&
>                     colorbufferFormat != GL_BGR5_A1_ANGLEX)
>                 {
>-                    ANGLE_VALIDATION_ERR(context, InvalidOperation(), InvalidFormat);
>+                    context->validationError(GL_INVALID_OPERATION, kInvalidFormat);
>                     return false;
>                 }
>                 break;
>@@ -569,7 +562,7 @@ bool ValidateES2CopyTexImageParameters(ValidationContext *context,
>                     colorbufferFormat != GL_RGBA8_OES && colorbufferFormat != GL_RGBA32F &&
>                     colorbufferFormat != GL_BGRA8_EXT && colorbufferFormat != GL_BGR5_A1_ANGLEX)
>                 {
>-                    ANGLE_VALIDATION_ERR(context, InvalidOperation(), InvalidFormat);
>+                    context->validationError(GL_INVALID_OPERATION, kInvalidFormat);
>                     return false;
>                 }
>                 break;
>@@ -583,20 +576,24 @@ bool ValidateES2CopyTexImageParameters(ValidationContext *context,
>             case GL_COMPRESSED_SRGB8_LOSSY_DECODE_ETC2_ANGLE:
>             case GL_COMPRESSED_RGB8_PUNCHTHROUGH_ALPHA1_LOSSY_DECODE_ETC2_ANGLE:
>             case GL_COMPRESSED_SRGB8_PUNCHTHROUGH_ALPHA1_LOSSY_DECODE_ETC2_ANGLE:
>-                ANGLE_VALIDATION_ERR(context, InvalidOperation(), InvalidFormat);
>+            case GL_COMPRESSED_RGBA_BPTC_UNORM_EXT:
>+            case GL_COMPRESSED_SRGB_ALPHA_BPTC_UNORM_EXT:
>+            case GL_COMPRESSED_RGB_BPTC_SIGNED_FLOAT_EXT:
>+            case GL_COMPRESSED_RGB_BPTC_UNSIGNED_FLOAT_EXT:
>+                context->validationError(GL_INVALID_OPERATION, kInvalidFormat);
>                 return false;
>             case GL_DEPTH_COMPONENT:
>             case GL_DEPTH_STENCIL_OES:
>-                ANGLE_VALIDATION_ERR(context, InvalidOperation(), InvalidFormat);
>+                context->validationError(GL_INVALID_OPERATION, kInvalidFormat);
>                 return false;
>             default:
>-                ANGLE_VALIDATION_ERR(context, InvalidOperation(), InvalidFormat);
>+                context->validationError(GL_INVALID_OPERATION, kInvalidFormat);
>                 return false;
>         }
> 
>         if (formatInfo.type == GL_FLOAT && !context->getExtensions().textureFloat)
>         {
>-            ANGLE_VALIDATION_ERR(context, InvalidOperation(), InvalidFormat);
>+            context->validationError(GL_INVALID_OPERATION, kInvalidFormat);
>             return false;
>         }
>     }
>@@ -609,7 +606,7 @@ bool ValidateES2CopyTexImageParameters(ValidationContext *context,
>                     colorbufferFormat != GL_RGB5_A1 && colorbufferFormat != GL_BGRA8_EXT &&
>                     colorbufferFormat != GL_RGBA8_OES && colorbufferFormat != GL_BGR5_A1_ANGLEX)
>                 {
>-                    ANGLE_VALIDATION_ERR(context, InvalidOperation(), InvalidFormat);
>+                    context->validationError(GL_INVALID_OPERATION, kInvalidFormat);
>                     return false;
>                 }
>                 break;
>@@ -620,7 +617,7 @@ bool ValidateES2CopyTexImageParameters(ValidationContext *context,
>                     colorbufferFormat != GL_BGRA8_EXT && colorbufferFormat != GL_RGBA8_OES &&
>                     colorbufferFormat != GL_BGR5_A1_ANGLEX)
>                 {
>-                    ANGLE_VALIDATION_ERR(context, InvalidOperation(), InvalidFormat);
>+                    context->validationError(GL_INVALID_OPERATION, kInvalidFormat);
>                     return false;
>                 }
>                 break;
>@@ -631,7 +628,7 @@ bool ValidateES2CopyTexImageParameters(ValidationContext *context,
>                     colorbufferFormat != GL_BGRA8_EXT && colorbufferFormat != GL_RGBA8_OES &&
>                     colorbufferFormat != GL_BGR5_A1_ANGLEX)
>                 {
>-                    ANGLE_VALIDATION_ERR(context, InvalidOperation(), InvalidFormat);
>+                    context->validationError(GL_INVALID_OPERATION, kInvalidFormat);
>                     return false;
>                 }
>                 break;
>@@ -641,7 +638,7 @@ bool ValidateES2CopyTexImageParameters(ValidationContext *context,
>                     colorbufferFormat != GL_RGB5_A1 && colorbufferFormat != GL_BGRA8_EXT &&
>                     colorbufferFormat != GL_RGBA8_OES && colorbufferFormat != GL_BGR5_A1_ANGLEX)
>                 {
>-                    ANGLE_VALIDATION_ERR(context, InvalidOperation(), InvalidFormat);
>+                    context->validationError(GL_INVALID_OPERATION, kInvalidFormat);
>                     return false;
>                 }
>                 break;
>@@ -651,7 +648,7 @@ bool ValidateES2CopyTexImageParameters(ValidationContext *context,
>                     colorbufferFormat != GL_BGRA8_EXT && colorbufferFormat != GL_RGBA8_OES &&
>                     colorbufferFormat != GL_BGR5_A1_ANGLEX)
>                 {
>-                    ANGLE_VALIDATION_ERR(context, InvalidOperation(), InvalidFormat);
>+                    context->validationError(GL_INVALID_OPERATION, kInvalidFormat);
>                     return false;
>                 }
>                 break;
>@@ -661,7 +658,7 @@ bool ValidateES2CopyTexImageParameters(ValidationContext *context,
>                     colorbufferFormat != GL_BGRA8_EXT && colorbufferFormat != GL_RGBA8_OES &&
>                     colorbufferFormat != GL_BGR5_A1_ANGLEX)
>                 {
>-                    ANGLE_VALIDATION_ERR(context, InvalidOperation(), InvalidFormat);
>+                    context->validationError(GL_INVALID_OPERATION, kInvalidFormat);
>                     return false;
>                 }
>                 break;
>@@ -669,48 +666,48 @@ bool ValidateES2CopyTexImageParameters(ValidationContext *context,
>             case GL_COMPRESSED_RGBA_S3TC_DXT1_EXT:
>                 if (context->getExtensions().textureCompressionDXT1)
>                 {
>-                    ANGLE_VALIDATION_ERR(context, InvalidOperation(), InvalidFormat);
>+                    context->validationError(GL_INVALID_OPERATION, kInvalidFormat);
>                     return false;
>                 }
>                 else
>                 {
>-                    ANGLE_VALIDATION_ERR(context, InvalidEnum(), EnumNotSupported);
>+                    context->validationError(GL_INVALID_ENUM, kEnumNotSupported);
>                     return false;
>                 }
>                 break;
>             case GL_COMPRESSED_RGBA_S3TC_DXT3_ANGLE:
>                 if (context->getExtensions().textureCompressionDXT3)
>                 {
>-                    ANGLE_VALIDATION_ERR(context, InvalidOperation(), InvalidFormat);
>+                    context->validationError(GL_INVALID_OPERATION, kInvalidFormat);
>                     return false;
>                 }
>                 else
>                 {
>-                    ANGLE_VALIDATION_ERR(context, InvalidEnum(), EnumNotSupported);
>+                    context->validationError(GL_INVALID_ENUM, kEnumNotSupported);
>                     return false;
>                 }
>                 break;
>             case GL_COMPRESSED_RGBA_S3TC_DXT5_ANGLE:
>                 if (context->getExtensions().textureCompressionDXT5)
>                 {
>-                    ANGLE_VALIDATION_ERR(context, InvalidOperation(), InvalidFormat);
>+                    context->validationError(GL_INVALID_OPERATION, kInvalidFormat);
>                     return false;
>                 }
>                 else
>                 {
>-                    ANGLE_VALIDATION_ERR(context, InvalidEnum(), EnumNotSupported);
>+                    context->validationError(GL_INVALID_ENUM, kEnumNotSupported);
>                     return false;
>                 }
>                 break;
>             case GL_ETC1_RGB8_OES:
>                 if (context->getExtensions().compressedETC1RGB8Texture)
>                 {
>-                    context->handleError(InvalidOperation());
>+                    context->validationError(GL_INVALID_OPERATION, kInvalidFormat);
>                     return false;
>                 }
>                 else
>                 {
>-                    context->handleError(InvalidEnum());
>+                    context->validationError(GL_INVALID_ENUM, kEnumNotSupported);
>                     return false;
>                 }
>                 break;
>@@ -721,14 +718,12 @@ bool ValidateES2CopyTexImageParameters(ValidationContext *context,
>             case GL_COMPRESSED_SRGB8_PUNCHTHROUGH_ALPHA1_LOSSY_DECODE_ETC2_ANGLE:
>                 if (context->getExtensions().lossyETCDecode)
>                 {
>-                    context->handleError(InvalidOperation()
>-                                         << "ETC lossy decode formats can't be copied to.");
>+                    context->validationError(GL_INVALID_OPERATION, kInvalidFormat);
>                     return false;
>                 }
>                 else
>                 {
>-                    context->handleError(InvalidEnum()
>-                                         << "ANGLE_lossy_etc_decode extension is not supported.");
>+                    context->validationError(GL_INVALID_ENUM, kEnumNotSupported);
>                     return false;
>                 }
>                 break;
>@@ -739,16 +734,16 @@ bool ValidateES2CopyTexImageParameters(ValidationContext *context,
>             case GL_DEPTH24_STENCIL8_OES:
>                 if (context->getExtensions().depthTextures)
>                 {
>-                    context->handleError(InvalidOperation());
>+                    context->validationError(GL_INVALID_OPERATION, kInvalidFormat);
>                     return false;
>                 }
>                 else
>                 {
>-                    context->handleError(InvalidEnum());
>+                    context->validationError(GL_INVALID_ENUM, kEnumNotSupported);
>                     return false;
>                 }
>             default:
>-                context->handleError(InvalidEnum());
>+                context->validationError(GL_INVALID_ENUM, kEnumNotSupported);
>                 return false;
>         }
>     }
>@@ -800,6 +795,45 @@ bool ValidCap(const Context *context, GLenum cap, bool queryOnly)
>         case GL_ROBUST_RESOURCE_INITIALIZATION_ANGLE:
>             return queryOnly && context->getExtensions().robustResourceInitialization;
> 
>+        // GLES1 emulation: GLES1-specific caps
>+        case GL_ALPHA_TEST:
>+        case GL_VERTEX_ARRAY:
>+        case GL_NORMAL_ARRAY:
>+        case GL_COLOR_ARRAY:
>+        case GL_TEXTURE_COORD_ARRAY:
>+        case GL_TEXTURE_2D:
>+        case GL_LIGHTING:
>+        case GL_LIGHT0:
>+        case GL_LIGHT1:
>+        case GL_LIGHT2:
>+        case GL_LIGHT3:
>+        case GL_LIGHT4:
>+        case GL_LIGHT5:
>+        case GL_LIGHT6:
>+        case GL_LIGHT7:
>+        case GL_NORMALIZE:
>+        case GL_RESCALE_NORMAL:
>+        case GL_COLOR_MATERIAL:
>+        case GL_CLIP_PLANE0:
>+        case GL_CLIP_PLANE1:
>+        case GL_CLIP_PLANE2:
>+        case GL_CLIP_PLANE3:
>+        case GL_CLIP_PLANE4:
>+        case GL_CLIP_PLANE5:
>+        case GL_FOG:
>+        case GL_POINT_SMOOTH:
>+        case GL_LINE_SMOOTH:
>+        case GL_COLOR_LOGIC_OP:
>+            return context->getClientVersion() < Version(2, 0);
>+        case GL_POINT_SIZE_ARRAY_OES:
>+            return context->getClientVersion() < Version(2, 0) &&
>+                   context->getExtensions().pointSizeArray;
>+        case GL_TEXTURE_CUBE_MAP:
>+            return context->getClientVersion() < Version(2, 0) &&
>+                   context->getExtensions().textureCubeMap;
>+        case GL_POINT_SPRITE_OES:
>+            return context->getClientVersion() < Version(2, 0) &&
>+                   context->getExtensions().pointSprite;
>         default:
>             return false;
>     }
>@@ -962,7 +996,7 @@ bool IsValidESSLShaderSourceString(const char *str, size_t len, bool lineContinu
>     return true;
> }
> 
>-bool ValidateWebGLNamePrefix(ValidationContext *context, const GLchar *name)
>+bool ValidateWebGLNamePrefix(Context *context, const GLchar *name)
> {
>     ASSERT(context->isWebGL());
> 
>@@ -970,14 +1004,14 @@ bool ValidateWebGLNamePrefix(ValidationContext *context, const GLchar *name)
>     // Identifiers starting with "webgl_" and "_webgl_" are reserved for use by WebGL.
>     if (strncmp(name, "webgl_", 6) == 0 || strncmp(name, "_webgl_", 7) == 0)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidOperation(), WebglBindAttribLocationReservedPrefix);
>+        context->validationError(GL_INVALID_OPERATION, kWebglBindAttribLocationReservedPrefix);
>         return false;
>     }
> 
>     return true;
> }
> 
>-bool ValidateWebGLNameLength(ValidationContext *context, size_t length)
>+bool ValidateWebGLNameLength(Context *context, size_t length)
> {
>     ASSERT(context->isWebGL());
> 
>@@ -986,7 +1020,7 @@ bool ValidateWebGLNameLength(ValidationContext *context, size_t length)
>         // WebGL 1.0 [Section 6.21] Maxmimum Uniform and Attribute Location Lengths
>         // WebGL imposes a limit of 256 characters on the lengths of uniform and attribute
>         // locations.
>-        ANGLE_VALIDATION_ERR(context, InvalidValue(), WebglNameLengthLimitExceeded);
>+        context->validationError(GL_INVALID_VALUE, kWebglNameLengthLimitExceeded);
> 
>         return false;
>     }
>@@ -994,17 +1028,93 @@ bool ValidateWebGLNameLength(ValidationContext *context, size_t length)
>     {
>         // WebGL 2.0 [Section 4.3.2] WebGL 2.0 imposes a limit of 1024 characters on the lengths of
>         // uniform and attribute locations.
>-        ANGLE_VALIDATION_ERR(context, InvalidValue(), Webgl2NameLengthLimitExceeded);
>+        context->validationError(GL_INVALID_VALUE, kWebgl2NameLengthLimitExceeded);
>+        return false;
>+    }
>+
>+    return true;
>+}
>+
>+bool ValidateMatrixMode(Context *context, GLenum matrixMode)
>+{
>+    if (!context->getExtensions().pathRendering)
>+    {
>+        context->validationError(GL_INVALID_OPERATION, kExtensionNotEnabled);
>         return false;
>     }
> 
>+    if (matrixMode != GL_PATH_MODELVIEW_CHROMIUM && matrixMode != GL_PATH_PROJECTION_CHROMIUM)
>+    {
>+        context->validationError(GL_INVALID_ENUM, kInvalidMatrixMode);
>+        return false;
>+    }
>     return true;
> }
> 
>+bool ValidBlendFunc(const Context *context, GLenum val)
>+{
>+    const gl::Extensions &ext = context->getExtensions();
>+
>+    // these are always valid for src and dst.
>+    switch (val)
>+    {
>+        case GL_ZERO:
>+        case GL_ONE:
>+        case GL_SRC_COLOR:
>+        case GL_ONE_MINUS_SRC_COLOR:
>+        case GL_DST_COLOR:
>+        case GL_ONE_MINUS_DST_COLOR:
>+        case GL_SRC_ALPHA:
>+        case GL_ONE_MINUS_SRC_ALPHA:
>+        case GL_DST_ALPHA:
>+        case GL_ONE_MINUS_DST_ALPHA:
>+        case GL_CONSTANT_COLOR:
>+        case GL_ONE_MINUS_CONSTANT_COLOR:
>+        case GL_CONSTANT_ALPHA:
>+        case GL_ONE_MINUS_CONSTANT_ALPHA:
>+            return true;
>+
>+        // EXT_blend_func_extended.
>+        case GL_SRC1_COLOR_EXT:
>+        case GL_SRC1_ALPHA_EXT:
>+        case GL_ONE_MINUS_SRC1_COLOR_EXT:
>+        case GL_ONE_MINUS_SRC1_ALPHA_EXT:
>+        case GL_SRC_ALPHA_SATURATE_EXT:
>+            return ext.blendFuncExtended;
>+
>+        default:
>+            return false;
>+    }
>+}
>+
>+bool ValidSrcBlendFunc(const Context *context, GLenum val)
>+{
>+    if (ValidBlendFunc(context, val))
>+        return true;
>+
>+    if (val == GL_SRC_ALPHA_SATURATE)
>+        return true;
>+
>+    return false;
>+}
>+
>+bool ValidDstBlendFunc(const Context *context, GLenum val)
>+{
>+    if (ValidBlendFunc(context, val))
>+        return true;
>+
>+    if (val == GL_SRC_ALPHA_SATURATE)
>+    {
>+        if (context->getClientMajorVersion() >= 3)
>+            return true;
>+    }
>+
>+    return false;
>+}
> }  // anonymous namespace
> 
> bool ValidateES2TexImageParameters(Context *context,
>-                                   GLenum target,
>+                                   TextureTarget target,
>                                    GLint level,
>                                    GLenum internalformat,
>                                    bool isCompressed,
>@@ -1021,229 +1131,138 @@ bool ValidateES2TexImageParameters(Context *context,
> {
>     if (!ValidTexture2DDestinationTarget(context, target))
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidEnum(), InvalidTextureTarget);
>+        context->validationError(GL_INVALID_ENUM, kInvalidTextureTarget);
>         return false;
>     }
> 
>-    if (!ValidImageSizeParameters(context, target, level, width, height, 1, isSubImage))
>+    TextureType texType = TextureTargetToType(target);
>+    if (!ValidImageSizeParameters(context, texType, level, width, height, 1, isSubImage))
>     {
>-        context->handleError(InvalidValue());
>+        // Error already handled.
>         return false;
>     }
> 
>-    if (!ValidMipLevel(context, target, level))
>+    if (!ValidMipLevel(context, texType, level))
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidValue(), InvalidMipLevel);
>+        context->validationError(GL_INVALID_VALUE, kInvalidMipLevel);
>         return false;
>     }
> 
>     if (xoffset < 0 || std::numeric_limits<GLsizei>::max() - xoffset < width ||
>         std::numeric_limits<GLsizei>::max() - yoffset < height)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidValue(), ResourceMaxTextureSize);
>-        return false;
>-    }
>-
>-    // From GL_CHROMIUM_color_buffer_float_rgb[a]:
>-    // GL_RGB[A] / GL_RGB[A]32F becomes an allowable format / internalformat parameter pair for
>-    // TexImage2D. The restriction in section 3.7.1 of the OpenGL ES 2.0 spec that the
>-    // internalformat parameter and format parameter of TexImage2D must match is lifted for this
>-    // case.
>-    bool nonEqualFormatsAllowed =
>-        (internalformat == GL_RGB32F && context->getExtensions().colorBufferFloatRGB) ||
>-        (internalformat == GL_RGBA32F && context->getExtensions().colorBufferFloatRGBA);
>-
>-    if (!isSubImage && !isCompressed && internalformat != format && !nonEqualFormatsAllowed)
>-    {
>-        context->handleError(InvalidOperation());
>+        context->validationError(GL_INVALID_VALUE, kResourceMaxTextureSize);
>         return false;
>     }
> 
>     const gl::Caps &caps = context->getCaps();
> 
>-    if (target == GL_TEXTURE_2D)
>-    {
>-        if (static_cast<GLuint>(width) > (caps.max2DTextureSize >> level) ||
>-            static_cast<GLuint>(height) > (caps.max2DTextureSize >> level))
>-        {
>-            context->handleError(InvalidValue());
>-            return false;
>-        }
>-    }
>-    else if (target == GL_TEXTURE_RECTANGLE_ANGLE)
>-    {
>-        ASSERT(level == 0);
>-        if (static_cast<GLuint>(width) > caps.maxRectangleTextureSize ||
>-            static_cast<GLuint>(height) > caps.maxRectangleTextureSize)
>-        {
>-            context->handleError(InvalidValue());
>-            return false;
>-        }
>-        if (isCompressed)
>-        {
>-            context->handleError(InvalidEnum()
>-                                 << "Rectangle texture cannot have a compressed format.");
>-            return false;
>-        }
>-    }
>-    else if (IsCubeMapTextureTarget(target))
>-    {
>-        if (!isSubImage && width != height)
>-        {
>-            ANGLE_VALIDATION_ERR(context, InvalidValue(), CubemapFacesEqualDimensions);
>-            return false;
>-        }
>-
>-        if (static_cast<GLuint>(width) > (caps.maxCubeMapTextureSize >> level) ||
>-            static_cast<GLuint>(height) > (caps.maxCubeMapTextureSize >> level))
>-        {
>-            context->handleError(InvalidValue());
>-            return false;
>-        }
>-    }
>-    else
>-    {
>-        context->handleError(InvalidEnum());
>-        return false;
>-    }
>-
>-    gl::Texture *texture =
>-        context->getTargetTexture(IsCubeMapTextureTarget(target) ? GL_TEXTURE_CUBE_MAP : target);
>-    if (!texture)
>+    switch (texType)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidOperation(), BufferNotBound);
>-        return false;
>-    }
>+        case TextureType::_2D:
>+            if (static_cast<GLuint>(width) > (caps.max2DTextureSize >> level) ||
>+                static_cast<GLuint>(height) > (caps.max2DTextureSize >> level))
>+            {
>+                context->validationError(GL_INVALID_VALUE, kResourceMaxTextureSize);
>+                return false;
>+            }
>+            break;
> 
>-    if (isSubImage)
>-    {
>-        const InternalFormat &textureInternalFormat = *texture->getFormat(target, level).info;
>-        if (textureInternalFormat.internalFormat == GL_NONE)
>-        {
>-            context->handleError(InvalidOperation() << "Texture level does not exist.");
>-            return false;
>-        }
>+        case TextureType::Rectangle:
>+            ASSERT(level == 0);
>+            if (static_cast<GLuint>(width) > caps.maxRectangleTextureSize ||
>+                static_cast<GLuint>(height) > caps.maxRectangleTextureSize)
>+            {
>+                context->validationError(GL_INVALID_VALUE, kResourceMaxTextureSize);
>+                return false;
>+            }
>+            if (isCompressed)
>+            {
>+                context->validationError(GL_INVALID_ENUM, kRectangleTextureCompressed);
>+                return false;
>+            }
>+            break;
> 
>-        if (format != GL_NONE)
>-        {
>-            if (GetInternalFormatInfo(format, type).sizedInternalFormat !=
>-                textureInternalFormat.sizedInternalFormat)
>+        case TextureType::CubeMap:
>+            if (!isSubImage && width != height)
>             {
>-                ANGLE_VALIDATION_ERR(context, InvalidOperation(), TypeMismatch);
>+                context->validationError(GL_INVALID_VALUE, kCubemapFacesEqualDimensions);
>                 return false;
>             }
>-        }
> 
>-        if (static_cast<size_t>(xoffset + width) > texture->getWidth(target, level) ||
>-            static_cast<size_t>(yoffset + height) > texture->getHeight(target, level))
>-        {
>-            context->handleError(InvalidValue());
>-            return false;
>-        }
>+            if (static_cast<GLuint>(width) > (caps.maxCubeMapTextureSize >> level) ||
>+                static_cast<GLuint>(height) > (caps.maxCubeMapTextureSize >> level))
>+            {
>+                context->validationError(GL_INVALID_VALUE, kResourceMaxTextureSize);
>+                return false;
>+            }
>+            break;
> 
>-        if (width > 0 && height > 0 && pixels == nullptr &&
>-            context->getGLState().getTargetBuffer(gl::BufferBinding::PixelUnpack) == nullptr)
>-        {
>-            ANGLE_VALIDATION_ERR(context, InvalidValue(), PixelDataNull);
>+        default:
>+            context->validationError(GL_INVALID_ENUM, kInvalidTextureTarget);
>             return false;
>-        }
>     }
>-    else
>+
>+    gl::Texture *texture = context->getTextureByType(texType);
>+    if (!texture)
>     {
>-        if (texture->getImmutableFormat())
>-        {
>-            context->handleError(InvalidOperation());
>-            return false;
>-        }
>+        context->validationError(GL_INVALID_OPERATION, kBufferNotBound);
>+        return false;
>     }
> 
>     // Verify zero border
>     if (border != 0)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidValue(), InvalidBorder);
>+        context->validationError(GL_INVALID_VALUE, kInvalidBorder);
>         return false;
>     }
> 
>+    bool nonEqualFormatsAllowed = false;
>+
>     if (isCompressed)
>     {
>         GLenum actualInternalFormat =
>             isSubImage ? texture->getFormat(target, level).info->sizedInternalFormat
>                        : internalformat;
>-        switch (actualInternalFormat)
>+
>+        const InternalFormat &internalFormatInfo = GetSizedInternalFormatInfo(actualInternalFormat);
>+
>+        if (!internalFormatInfo.compressed)
>         {
>-            case GL_COMPRESSED_RGB_S3TC_DXT1_EXT:
>-            case GL_COMPRESSED_RGBA_S3TC_DXT1_EXT:
>-                if (!context->getExtensions().textureCompressionDXT1)
>-                {
>-                    ANGLE_VALIDATION_ERR(context, InvalidEnum(), InvalidInternalFormat);
>-                    return false;
>-                }
>-                break;
>-            case GL_COMPRESSED_RGBA_S3TC_DXT3_ANGLE:
>-                if (!context->getExtensions().textureCompressionDXT3)
>-                {
>-                    ANGLE_VALIDATION_ERR(context, InvalidEnum(), InvalidInternalFormat);
>-                    return false;
>-                }
>-                break;
>-            case GL_COMPRESSED_RGBA_S3TC_DXT5_ANGLE:
>-                if (!context->getExtensions().textureCompressionDXT5)
>-                {
>-                    ANGLE_VALIDATION_ERR(context, InvalidEnum(), InvalidInternalFormat);
>-                    return false;
>-                }
>-                break;
>-            case GL_COMPRESSED_SRGB_S3TC_DXT1_EXT:
>-            case GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT1_EXT:
>-            case GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT3_EXT:
>-            case GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT5_EXT:
>-                if (!context->getExtensions().textureCompressionS3TCsRGB)
>-                {
>-                    ANGLE_VALIDATION_ERR(context, InvalidEnum(), InvalidInternalFormat);
>-                    return false;
>-                }
>-                break;
>-            case GL_ETC1_RGB8_OES:
>-                if (!context->getExtensions().compressedETC1RGB8Texture)
>-                {
>-                    ANGLE_VALIDATION_ERR(context, InvalidEnum(), InvalidInternalFormat);
>-                    return false;
>-                }
>-                if (isSubImage)
>-                {
>-                    ANGLE_VALIDATION_ERR(context, InvalidOperation(), InvalidInternalFormat);
>-                    return false;
>-                }
>-                break;
>-            case GL_ETC1_RGB8_LOSSY_DECODE_ANGLE:
>-            case GL_COMPRESSED_RGB8_LOSSY_DECODE_ETC2_ANGLE:
>-            case GL_COMPRESSED_SRGB8_LOSSY_DECODE_ETC2_ANGLE:
>-            case GL_COMPRESSED_RGB8_PUNCHTHROUGH_ALPHA1_LOSSY_DECODE_ETC2_ANGLE:
>-            case GL_COMPRESSED_SRGB8_PUNCHTHROUGH_ALPHA1_LOSSY_DECODE_ETC2_ANGLE:
>-                if (!context->getExtensions().lossyETCDecode)
>-                {
>-                    ANGLE_VALIDATION_ERR(context, InvalidEnum(), InvalidInternalFormat);
>-                    return false;
>-                }
>-                break;
>-            default:
>-                ANGLE_VALIDATION_ERR(context, InvalidEnum(), InvalidInternalFormat);
>-                return false;
>+            context->validationError(GL_INVALID_ENUM, kInvalidInternalFormat);
>+            return false;
>+        }
>+
>+        if (!internalFormatInfo.textureSupport(context->getClientVersion(),
>+                                               context->getExtensions()))
>+        {
>+            context->validationError(GL_INVALID_ENUM, kInvalidInternalFormat);
>+            return false;
>         }
> 
>         if (isSubImage)
>         {
>+            // From the OES_compressed_ETC1_RGB8_texture spec:
>+            // INVALID_OPERATION is generated by CompressedTexSubImage2D, TexSubImage2D, or
>+            // CopyTexSubImage2D if the texture image <level> bound to <target> has internal format
>+            // ETC1_RGB8_OES.
>+            if (actualInternalFormat == GL_ETC1_RGB8_OES)
>+            {
>+                context->validationError(GL_INVALID_OPERATION, kInvalidInternalFormat);
>+                return false;
>+            }
>+
>             if (!ValidCompressedSubImageSize(context, actualInternalFormat, xoffset, yoffset, width,
>                                              height, texture->getWidth(target, level),
>                                              texture->getHeight(target, level)))
>             {
>-                context->handleError(InvalidOperation() << "Invalid compressed format dimension.");
>+                context->validationError(GL_INVALID_OPERATION, kInvalidCompressedImageSize);
>                 return false;
>             }
> 
>             if (format != actualInternalFormat)
>             {
>-                ANGLE_VALIDATION_ERR(context, InvalidOperation(), InvalidFormat);
>+                context->validationError(GL_INVALID_OPERATION, kInvalidFormat);
>                 return false;
>             }
>         }
>@@ -1251,7 +1270,7 @@ bool ValidateES2TexImageParameters(Context *context,
>         {
>             if (!ValidCompressedImageSize(context, actualInternalFormat, level, width, height))
>             {
>-                context->handleError(InvalidOperation() << "Invalid compressed format dimension.");
>+                context->validationError(GL_INVALID_OPERATION, kInvalidCompressedImageSize);
>                 return false;
>             }
>         }
>@@ -1272,7 +1291,7 @@ bool ValidateES2TexImageParameters(Context *context,
>             case GL_FLOAT:
>                 break;
>             default:
>-                ANGLE_VALIDATION_ERR(context, InvalidEnum(), InvalidType);
>+                context->validationError(GL_INVALID_ENUM, kInvalidType);
>                 return false;
>         }
> 
>@@ -1291,7 +1310,7 @@ bool ValidateES2TexImageParameters(Context *context,
>                     case GL_HALF_FLOAT_OES:
>                         break;
>                     default:
>-                        ANGLE_VALIDATION_ERR(context, InvalidOperation(), MismatchedTypeAndFormat);
>+                        context->validationError(GL_INVALID_OPERATION, kMismatchedTypeAndFormat);
>                         return false;
>                 }
>                 break;
>@@ -1299,7 +1318,7 @@ bool ValidateES2TexImageParameters(Context *context,
>             case GL_RG:
>                 if (!context->getExtensions().textureRG)
>                 {
>-                    context->handleError(InvalidEnum());
>+                    context->validationError(GL_INVALID_ENUM, kEnumNotSupported);
>                     return false;
>                 }
>                 switch (type)
>@@ -1310,12 +1329,12 @@ bool ValidateES2TexImageParameters(Context *context,
>                     case GL_HALF_FLOAT_OES:
>                         if (!context->getExtensions().textureFloat)
>                         {
>-                            context->handleError(InvalidEnum());
>+                            context->validationError(GL_INVALID_ENUM, kEnumNotSupported);
>                             return false;
>                         }
>                         break;
>                     default:
>-                        ANGLE_VALIDATION_ERR(context, InvalidOperation(), MismatchedTypeAndFormat);
>+                        context->validationError(GL_INVALID_OPERATION, kMismatchedTypeAndFormat);
>                         return false;
>                 }
>                 break;
>@@ -1328,7 +1347,7 @@ bool ValidateES2TexImageParameters(Context *context,
>                     case GL_HALF_FLOAT_OES:
>                         break;
>                     default:
>-                        ANGLE_VALIDATION_ERR(context, InvalidOperation(), MismatchedTypeAndFormat);
>+                        context->validationError(GL_INVALID_OPERATION, kMismatchedTypeAndFormat);
>                         return false;
>                 }
>                 break;
>@@ -1342,14 +1361,14 @@ bool ValidateES2TexImageParameters(Context *context,
>                     case GL_HALF_FLOAT_OES:
>                         break;
>                     default:
>-                        ANGLE_VALIDATION_ERR(context, InvalidOperation(), MismatchedTypeAndFormat);
>+                        context->validationError(GL_INVALID_OPERATION, kMismatchedTypeAndFormat);
>                         return false;
>                 }
>                 break;
>             case GL_BGRA_EXT:
>                 if (!context->getExtensions().textureFormatBGRA8888)
>                 {
>-                    context->handleError(InvalidEnum());
>+                    context->validationError(GL_INVALID_ENUM, kEnumNotSupported);
>                     return false;
>                 }
>                 switch (type)
>@@ -1357,7 +1376,7 @@ bool ValidateES2TexImageParameters(Context *context,
>                     case GL_UNSIGNED_BYTE:
>                         break;
>                     default:
>-                        ANGLE_VALIDATION_ERR(context, InvalidOperation(), MismatchedTypeAndFormat);
>+                        context->validationError(GL_INVALID_OPERATION, kMismatchedTypeAndFormat);
>                         return false;
>                 }
>                 break;
>@@ -1365,7 +1384,7 @@ bool ValidateES2TexImageParameters(Context *context,
>             case GL_SRGB_ALPHA_EXT:
>                 if (!context->getExtensions().sRGB)
>                 {
>-                    context->handleError(InvalidEnum());
>+                    context->validationError(GL_INVALID_ENUM, kEnumNotSupported);
>                     return false;
>                 }
>                 switch (type)
>@@ -1373,7 +1392,7 @@ bool ValidateES2TexImageParameters(Context *context,
>                     case GL_UNSIGNED_BYTE:
>                         break;
>                     default:
>-                        ANGLE_VALIDATION_ERR(context, InvalidOperation(), MismatchedTypeAndFormat);
>+                        context->validationError(GL_INVALID_OPERATION, kMismatchedTypeAndFormat);
>                         return false;
>                 }
>                 break;
>@@ -1390,7 +1409,7 @@ bool ValidateES2TexImageParameters(Context *context,
>                     case GL_UNSIGNED_INT:
>                         break;
>                     default:
>-                        ANGLE_VALIDATION_ERR(context, InvalidOperation(), MismatchedTypeAndFormat);
>+                        context->validationError(GL_INVALID_OPERATION, kMismatchedTypeAndFormat);
>                         return false;
>                 }
>                 break;
>@@ -1400,12 +1419,12 @@ bool ValidateES2TexImageParameters(Context *context,
>                     case GL_UNSIGNED_INT_24_8_OES:
>                         break;
>                     default:
>-                        ANGLE_VALIDATION_ERR(context, InvalidOperation(), MismatchedTypeAndFormat);
>+                        context->validationError(GL_INVALID_OPERATION, kMismatchedTypeAndFormat);
>                         return false;
>                 }
>                 break;
>             default:
>-                context->handleError(InvalidEnum());
>+                context->validationError(GL_INVALID_ENUM, kEnumNotSupported);
>                 return false;
>         }
> 
>@@ -1415,48 +1434,48 @@ bool ValidateES2TexImageParameters(Context *context,
>             case GL_COMPRESSED_RGBA_S3TC_DXT1_EXT:
>                 if (context->getExtensions().textureCompressionDXT1)
>                 {
>-                    context->handleError(InvalidOperation());
>+                    context->validationError(GL_INVALID_OPERATION, kInvalidFormat);
>                     return false;
>                 }
>                 else
>                 {
>-                    context->handleError(InvalidEnum());
>+                    context->validationError(GL_INVALID_ENUM, kEnumNotSupported);
>                     return false;
>                 }
>                 break;
>             case GL_COMPRESSED_RGBA_S3TC_DXT3_ANGLE:
>                 if (context->getExtensions().textureCompressionDXT3)
>                 {
>-                    context->handleError(InvalidOperation());
>+                    context->validationError(GL_INVALID_OPERATION, kInvalidFormat);
>                     return false;
>                 }
>                 else
>                 {
>-                    context->handleError(InvalidEnum());
>+                    context->validationError(GL_INVALID_ENUM, kEnumNotSupported);
>                     return false;
>                 }
>                 break;
>             case GL_COMPRESSED_RGBA_S3TC_DXT5_ANGLE:
>                 if (context->getExtensions().textureCompressionDXT5)
>                 {
>-                    context->handleError(InvalidOperation());
>+                    context->validationError(GL_INVALID_OPERATION, kInvalidFormat);
>                     return false;
>                 }
>                 else
>                 {
>-                    context->handleError(InvalidEnum());
>+                    context->validationError(GL_INVALID_ENUM, kEnumNotSupported);
>                     return false;
>                 }
>                 break;
>             case GL_ETC1_RGB8_OES:
>                 if (context->getExtensions().compressedETC1RGB8Texture)
>                 {
>-                    context->handleError(InvalidOperation());
>+                    context->validationError(GL_INVALID_OPERATION, kInvalidFormat);
>                     return false;
>                 }
>                 else
>                 {
>-                    context->handleError(InvalidEnum());
>+                    context->validationError(GL_INVALID_ENUM, kEnumNotSupported);
>                     return false;
>                 }
>                 break;
>@@ -1467,14 +1486,12 @@ bool ValidateES2TexImageParameters(Context *context,
>             case GL_COMPRESSED_SRGB8_PUNCHTHROUGH_ALPHA1_LOSSY_DECODE_ETC2_ANGLE:
>                 if (context->getExtensions().lossyETCDecode)
>                 {
>-                    context->handleError(InvalidOperation()
>-                                         << "ETC lossy decode formats can't work with this type.");
>+                    context->validationError(GL_INVALID_OPERATION, kInvalidFormat);
>                     return false;
>                 }
>                 else
>                 {
>-                    context->handleError(InvalidEnum()
>-                                         << "ANGLE_lossy_etc_decode extension is not supported.");
>+                    context->validationError(GL_INVALID_ENUM, kEnumNotSupported);
>                     return false;
>                 }
>                 break;
>@@ -1482,24 +1499,24 @@ bool ValidateES2TexImageParameters(Context *context,
>             case GL_DEPTH_STENCIL_OES:
>                 if (!context->getExtensions().depthTextures)
>                 {
>-                    context->handleError(InvalidValue());
>+                    context->validationError(GL_INVALID_ENUM, kEnumNotSupported);
>                     return false;
>                 }
>-                if (target != GL_TEXTURE_2D)
>+                if (target != TextureTarget::_2D)
>                 {
>-                    ANGLE_VALIDATION_ERR(context, InvalidOperation(), MismatchedTargetAndFormat);
>+                    context->validationError(GL_INVALID_OPERATION, kMismatchedTargetAndFormat);
>                     return false;
>                 }
>                 // OES_depth_texture supports loading depth data and multiple levels,
>                 // but ANGLE_depth_texture does not
>                 if (pixels != nullptr)
>                 {
>-                    ANGLE_VALIDATION_ERR(context, InvalidOperation(), PixelDataNotNull);
>+                    context->validationError(GL_INVALID_OPERATION, kPixelDataNotNull);
>                     return false;
>                 }
>                 if (level != 0)
>                 {
>-                    ANGLE_VALIDATION_ERR(context, InvalidOperation(), LevelNotZero);
>+                    context->validationError(GL_INVALID_OPERATION, kLevelNotZero);
>                     return false;
>                 }
>                 break;
>@@ -1511,22 +1528,31 @@ bool ValidateES2TexImageParameters(Context *context,
>         {
>             switch (internalformat)
>             {
>+                // Core ES 2.0 formats
>+                case GL_ALPHA:
>+                case GL_LUMINANCE:
>+                case GL_LUMINANCE_ALPHA:
>+                case GL_RGB:
>+                case GL_RGBA:
>+                    break;
>+
>                 case GL_RGBA32F:
>                     if (!context->getExtensions().colorBufferFloatRGBA)
>                     {
>-                        context->handleError(InvalidValue()
>-                                             << "Sized GL_RGBA32F internal format requires "
>-                                                "GL_CHROMIUM_color_buffer_float_rgba");
>+                        context->validationError(GL_INVALID_ENUM, kInvalidFormat);
>                         return false;
>                     }
>+
>+                    nonEqualFormatsAllowed = true;
>+
>                     if (type != GL_FLOAT)
>                     {
>-                        ANGLE_VALIDATION_ERR(context, InvalidOperation(), MismatchedTypeAndFormat);
>+                        context->validationError(GL_INVALID_OPERATION, kMismatchedTypeAndFormat);
>                         return false;
>                     }
>                     if (format != GL_RGBA)
>                     {
>-                        ANGLE_VALIDATION_ERR(context, InvalidOperation(), MismatchedTypeAndFormat);
>+                        context->validationError(GL_INVALID_OPERATION, kMismatchedTypeAndFormat);
>                         return false;
>                     }
>                     break;
>@@ -1534,92 +1560,183 @@ bool ValidateES2TexImageParameters(Context *context,
>                 case GL_RGB32F:
>                     if (!context->getExtensions().colorBufferFloatRGB)
>                     {
>-                        context->handleError(InvalidValue()
>-                                             << "Sized GL_RGB32F internal format requires "
>-                                                "GL_CHROMIUM_color_buffer_float_rgb");
>+                        context->validationError(GL_INVALID_ENUM, kInvalidFormat);
>                         return false;
>                     }
>+
>+                    nonEqualFormatsAllowed = true;
>+
>                     if (type != GL_FLOAT)
>                     {
>-                        ANGLE_VALIDATION_ERR(context, InvalidOperation(), MismatchedTypeAndFormat);
>+                        context->validationError(GL_INVALID_OPERATION, kMismatchedTypeAndFormat);
>                         return false;
>                     }
>                     if (format != GL_RGB)
>                     {
>-                        ANGLE_VALIDATION_ERR(context, InvalidOperation(), MismatchedTypeAndFormat);
>+                        context->validationError(GL_INVALID_OPERATION, kMismatchedTypeAndFormat);
>                         return false;
>                     }
>                     break;
> 
>-                default:
>+                case GL_BGRA_EXT:
>+                    if (!context->getExtensions().textureFormatBGRA8888)
>+                    {
>+                        context->validationError(GL_INVALID_ENUM, kInvalidFormat);
>+                        return false;
>+                    }
>                     break;
>-            }
>-        }
> 
>-        if (type == GL_FLOAT)
>-        {
>-            if (!context->getExtensions().textureFloat)
>-            {
>-                context->handleError(InvalidEnum());
>-                return false;
>-            }
>-        }
>-        else if (type == GL_HALF_FLOAT_OES)
>-        {
>-            if (!context->getExtensions().textureHalfFloat)
>-            {
>-                context->handleError(InvalidEnum());
>-                return false;
>-            }
>-        }
>+                case GL_DEPTH_COMPONENT:
>+                case GL_DEPTH_STENCIL:
>+                    if (!context->getExtensions().depthTextures)
>+                    {
>+                        context->validationError(GL_INVALID_ENUM, kInvalidFormat);
>+                        return false;
>+                    }
>+                    break;
>+
>+                case GL_RED:
>+                case GL_RG:
>+                    if (!context->getExtensions().textureRG)
>+                    {
>+                        context->validationError(GL_INVALID_ENUM, kInvalidFormat);
>+                        return false;
>+                    }
>+                    break;
>+
>+                case GL_SRGB_EXT:
>+                case GL_SRGB_ALPHA_EXT:
>+                    if (!context->getExtensions().sRGB)
>+                    {
>+                        context->validationError(GL_INVALID_ENUM, kEnumNotSupported);
>+                        return false;
>+                    }
>+                    break;
>+
>+                default:
>+                    context->validationError(GL_INVALID_VALUE, kInvalidInternalFormat);
>+                    return false;
>+            }
>+        }
>+
>+        if (type == GL_FLOAT)
>+        {
>+            if (!context->getExtensions().textureFloat)
>+            {
>+                context->validationError(GL_INVALID_ENUM, kEnumNotSupported);
>+                return false;
>+            }
>+        }
>+        else if (type == GL_HALF_FLOAT_OES)
>+        {
>+            if (!context->getExtensions().textureHalfFloat)
>+            {
>+                context->validationError(GL_INVALID_ENUM, kEnumNotSupported);
>+                return false;
>+            }
>+        }
>     }
> 
>-    GLenum sizeCheckFormat = isSubImage ? format : internalformat;
>-    if (!ValidImageDataSize(context, target, width, height, 1, sizeCheckFormat, type, pixels,
>-                            imageSize))
>+    if (isSubImage)
>+    {
>+        const InternalFormat &textureInternalFormat = *texture->getFormat(target, level).info;
>+        if (textureInternalFormat.internalFormat == GL_NONE)
>+        {
>+            context->validationError(GL_INVALID_OPERATION, kInvalidTextureLevel);
>+            return false;
>+        }
>+
>+        if (format != textureInternalFormat.format)
>+        {
>+            context->validationError(GL_INVALID_OPERATION, err::kTextureFormatMismatch);
>+            return false;
>+        }
>+
>+        if (context->getExtensions().webglCompatibility)
>+        {
>+            if (GetInternalFormatInfo(format, type).sizedInternalFormat !=
>+                textureInternalFormat.sizedInternalFormat)
>+            {
>+                context->validationError(GL_INVALID_OPERATION, kTextureTypeMismatch);
>+                return false;
>+            }
>+        }
>+
>+        if (static_cast<size_t>(xoffset + width) > texture->getWidth(target, level) ||
>+            static_cast<size_t>(yoffset + height) > texture->getHeight(target, level))
>+        {
>+            context->validationError(GL_INVALID_VALUE, kOffsetOverflow);
>+            return false;
>+        }
>+
>+        if (width > 0 && height > 0 && pixels == nullptr &&
>+            context->getState().getTargetBuffer(BufferBinding::PixelUnpack) == nullptr)
>+        {
>+            context->validationError(GL_INVALID_VALUE, kPixelDataNull);
>+            return false;
>+        }
>+    }
>+    else
>+    {
>+        if (texture->getImmutableFormat())
>+        {
>+            context->validationError(GL_INVALID_OPERATION, kTextureIsImmutable);
>+            return false;
>+        }
>+    }
>+
>+    // From GL_CHROMIUM_color_buffer_float_rgb[a]:
>+    // GL_RGB[A] / GL_RGB[A]32F becomes an allowable format / internalformat parameter pair for
>+    // TexImage2D. The restriction in section 3.7.1 of the OpenGL ES 2.0 spec that the
>+    // internalformat parameter and format parameter of TexImage2D must match is lifted for this
>+    // case.
>+    if (!isSubImage && !isCompressed && internalformat != format && !nonEqualFormatsAllowed)
>     {
>+        context->validationError(GL_INVALID_OPERATION, kInvalidFormatCombination);
>         return false;
>     }
> 
>-    return true;
>+    GLenum sizeCheckFormat = isSubImage ? format : internalformat;
>+    return ValidImageDataSize(context, texType, width, height, 1, sizeCheckFormat, type, pixels,
>+                              imageSize);
> }
> 
> bool ValidateES2TexStorageParameters(Context *context,
>-                                     GLenum target,
>+                                     TextureType target,
>                                      GLsizei levels,
>                                      GLenum internalformat,
>                                      GLsizei width,
>                                      GLsizei height)
> {
>-    if (target != GL_TEXTURE_2D && target != GL_TEXTURE_CUBE_MAP &&
>-        target != GL_TEXTURE_RECTANGLE_ANGLE)
>+    if (target != TextureType::_2D && target != TextureType::CubeMap &&
>+        target != TextureType::Rectangle)
>     {
>-        context->handleError(InvalidEnum());
>+        context->validationError(GL_INVALID_ENUM, kInvalidTextureTarget);
>         return false;
>     }
> 
>     if (width < 1 || height < 1 || levels < 1)
>     {
>-        context->handleError(InvalidValue());
>+        context->validationError(GL_INVALID_VALUE, kTextureSizeTooSmall);
>         return false;
>     }
> 
>-    if (target == GL_TEXTURE_CUBE_MAP && width != height)
>+    if (target == TextureType::CubeMap && width != height)
>     {
>-        context->handleError(InvalidValue());
>+        context->validationError(GL_INVALID_VALUE, kCubemapFacesEqualDimensions);
>         return false;
>     }
> 
>     if (levels != 1 && levels != gl::log2(std::max(width, height)) + 1)
>     {
>-        context->handleError(InvalidOperation());
>+        context->validationError(GL_INVALID_OPERATION, kInvalidMipLevels);
>         return false;
>     }
> 
>     const gl::InternalFormat &formatInfo = gl::GetSizedInternalFormatInfo(internalformat);
>     if (formatInfo.format == GL_NONE || formatInfo.type == GL_NONE)
>     {
>-        context->handleError(InvalidEnum());
>+        context->validationError(GL_INVALID_ENUM, kInvalidFormat);
>         return false;
>     }
> 
>@@ -1627,38 +1744,43 @@ bool ValidateES2TexStorageParameters(Context *context,
> 
>     switch (target)
>     {
>-        case GL_TEXTURE_2D:
>+        case TextureType::_2D:
>             if (static_cast<GLuint>(width) > caps.max2DTextureSize ||
>                 static_cast<GLuint>(height) > caps.max2DTextureSize)
>             {
>-                context->handleError(InvalidValue());
>+                context->validationError(GL_INVALID_VALUE, kResourceMaxTextureSize);
>                 return false;
>             }
>             break;
>-        case GL_TEXTURE_RECTANGLE_ANGLE:
>+        case TextureType::Rectangle:
>+            if (levels != 1)
>+            {
>+                context->validationError(GL_INVALID_VALUE, kInvalidMipLevel);
>+                return false;
>+            }
>+
>             if (static_cast<GLuint>(width) > caps.maxRectangleTextureSize ||
>-                static_cast<GLuint>(height) > caps.maxRectangleTextureSize || levels != 1)
>+                static_cast<GLuint>(height) > caps.maxRectangleTextureSize)
>             {
>-                context->handleError(InvalidValue());
>+                context->validationError(GL_INVALID_VALUE, kResourceMaxTextureSize);
>                 return false;
>             }
>             if (formatInfo.compressed)
>             {
>-                context->handleError(InvalidEnum()
>-                                     << "Rectangle texture cannot have a compressed format.");
>+                context->validationError(GL_INVALID_ENUM, kRectangleTextureCompressed);
>                 return false;
>             }
>             break;
>-        case GL_TEXTURE_CUBE_MAP:
>+        case TextureType::CubeMap:
>             if (static_cast<GLuint>(width) > caps.maxCubeMapTextureSize ||
>                 static_cast<GLuint>(height) > caps.maxCubeMapTextureSize)
>             {
>-                context->handleError(InvalidValue());
>+                context->validationError(GL_INVALID_VALUE, kResourceMaxTextureSize);
>                 return false;
>             }
>             break;
>         default:
>-            context->handleError(InvalidEnum());
>+            context->validationError(GL_INVALID_ENUM, kEnumNotSupported);
>             return false;
>     }
> 
>@@ -1666,7 +1788,7 @@ bool ValidateES2TexStorageParameters(Context *context,
>     {
>         if (!gl::isPow2(width) || !gl::isPow2(height))
>         {
>-            context->handleError(InvalidOperation());
>+            context->validationError(GL_INVALID_OPERATION, kDimensionsMustBePow2);
>             return false;
>         }
>     }
>@@ -1677,28 +1799,28 @@ bool ValidateES2TexStorageParameters(Context *context,
>         case GL_COMPRESSED_RGBA_S3TC_DXT1_EXT:
>             if (!context->getExtensions().textureCompressionDXT1)
>             {
>-                context->handleError(InvalidEnum());
>+                context->validationError(GL_INVALID_ENUM, kEnumNotSupported);
>                 return false;
>             }
>             break;
>         case GL_COMPRESSED_RGBA_S3TC_DXT3_ANGLE:
>             if (!context->getExtensions().textureCompressionDXT3)
>             {
>-                context->handleError(InvalidEnum());
>+                context->validationError(GL_INVALID_ENUM, kEnumNotSupported);
>                 return false;
>             }
>             break;
>         case GL_COMPRESSED_RGBA_S3TC_DXT5_ANGLE:
>             if (!context->getExtensions().textureCompressionDXT5)
>             {
>-                context->handleError(InvalidEnum());
>+                context->validationError(GL_INVALID_ENUM, kEnumNotSupported);
>                 return false;
>             }
>             break;
>         case GL_ETC1_RGB8_OES:
>             if (!context->getExtensions().compressedETC1RGB8Texture)
>             {
>-                context->handleError(InvalidEnum());
>+                context->validationError(GL_INVALID_ENUM, kEnumNotSupported);
>                 return false;
>             }
>             break;
>@@ -1709,8 +1831,7 @@ bool ValidateES2TexStorageParameters(Context *context,
>         case GL_COMPRESSED_SRGB8_PUNCHTHROUGH_ALPHA1_LOSSY_DECODE_ETC2_ANGLE:
>             if (!context->getExtensions().lossyETCDecode)
>             {
>-                context->handleError(InvalidEnum()
>-                                     << "ANGLE_lossy_etc_decode extension is not supported.");
>+                context->validationError(GL_INVALID_ENUM, kEnumNotSupported);
>                 return false;
>             }
>             break;
>@@ -1721,7 +1842,7 @@ bool ValidateES2TexStorageParameters(Context *context,
>         case GL_LUMINANCE_ALPHA32F_EXT:
>             if (!context->getExtensions().textureFloat)
>             {
>-                context->handleError(InvalidEnum());
>+                context->validationError(GL_INVALID_ENUM, kEnumNotSupported);
>                 return false;
>             }
>             break;
>@@ -1732,7 +1853,7 @@ bool ValidateES2TexStorageParameters(Context *context,
>         case GL_LUMINANCE_ALPHA16F_EXT:
>             if (!context->getExtensions().textureHalfFloat)
>             {
>-                context->handleError(InvalidEnum());
>+                context->validationError(GL_INVALID_ENUM, kEnumNotSupported);
>                 return false;
>             }
>             break;
>@@ -1740,7 +1861,7 @@ bool ValidateES2TexStorageParameters(Context *context,
>         case GL_RG8_EXT:
>             if (!context->getExtensions().textureRG)
>             {
>-                context->handleError(InvalidEnum());
>+                context->validationError(GL_INVALID_ENUM, kEnumNotSupported);
>                 return false;
>             }
>             break;
>@@ -1748,7 +1869,7 @@ bool ValidateES2TexStorageParameters(Context *context,
>         case GL_RG16F_EXT:
>             if (!context->getExtensions().textureRG || !context->getExtensions().textureHalfFloat)
>             {
>-                context->handleError(InvalidEnum());
>+                context->validationError(GL_INVALID_ENUM, kEnumNotSupported);
>                 return false;
>             }
>             break;
>@@ -1756,7 +1877,7 @@ bool ValidateES2TexStorageParameters(Context *context,
>         case GL_RG32F_EXT:
>             if (!context->getExtensions().textureRG || !context->getExtensions().textureFloat)
>             {
>-                context->handleError(InvalidEnum());
>+                context->validationError(GL_INVALID_ENUM, kEnumNotSupported);
>                 return false;
>             }
>             break;
>@@ -1765,18 +1886,18 @@ bool ValidateES2TexStorageParameters(Context *context,
>         case GL_DEPTH24_STENCIL8_OES:
>             if (!context->getExtensions().depthTextures)
>             {
>-                context->handleError(InvalidEnum());
>+                context->validationError(GL_INVALID_ENUM, kEnumNotSupported);
>                 return false;
>             }
>-            if (target != GL_TEXTURE_2D)
>+            if (target != TextureType::_2D)
>             {
>-                context->handleError(InvalidOperation());
>+                context->validationError(GL_INVALID_OPERATION, kInvalidTextureTarget);
>                 return false;
>             }
>             // ANGLE_depth_texture only supports 1-level textures
>             if (levels != 1)
>             {
>-                context->handleError(InvalidOperation());
>+                context->validationError(GL_INVALID_OPERATION, kInvalidMipLevels);
>                 return false;
>             }
>             break;
>@@ -1784,16 +1905,16 @@ bool ValidateES2TexStorageParameters(Context *context,
>             break;
>     }
> 
>-    gl::Texture *texture = context->getTargetTexture(target);
>+    gl::Texture *texture = context->getTextureByType(target);
>     if (!texture || texture->id() == 0)
>     {
>-        context->handleError(InvalidOperation());
>+        context->validationError(GL_INVALID_OPERATION, kMissingTexture);
>         return false;
>     }
> 
>     if (texture->getImmutableFormat())
>     {
>-        context->handleError(InvalidOperation());
>+        context->validationError(GL_INVALID_OPERATION, kTextureIsImmutable);
>         return false;
>     }
> 
>@@ -1807,7 +1928,7 @@ bool ValidateDiscardFramebufferEXT(Context *context,
> {
>     if (!context->getExtensions().discardFramebuffer)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidOperation(), ExtensionNotEnabled);
>+        context->validationError(GL_INVALID_OPERATION, kExtensionNotEnabled);
>         return false;
>     }
> 
>@@ -1817,10 +1938,10 @@ bool ValidateDiscardFramebufferEXT(Context *context,
>     {
>         case GL_FRAMEBUFFER:
>             defaultFramebuffer =
>-                (context->getGLState().getTargetFramebuffer(GL_FRAMEBUFFER)->id() == 0);
>+                (context->getState().getTargetFramebuffer(GL_FRAMEBUFFER)->id() == 0);
>             break;
>         default:
>-            ANGLE_VALIDATION_ERR(context, InvalidEnum(), InvalidFramebufferTarget);
>+            context->validationError(GL_INVALID_ENUM, kInvalidFramebufferTarget);
>             return false;
>     }
> 
>@@ -1832,7 +1953,7 @@ bool ValidateBindVertexArrayOES(Context *context, GLuint array)
> {
>     if (!context->getExtensions().vertexArrayObject)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidOperation(), ExtensionNotEnabled);
>+        context->validationError(GL_INVALID_OPERATION, kExtensionNotEnabled);
>         return false;
>     }
> 
>@@ -1843,7 +1964,7 @@ bool ValidateDeleteVertexArraysOES(Context *context, GLsizei n, const GLuint *ar
> {
>     if (!context->getExtensions().vertexArrayObject)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidOperation(), ExtensionNotEnabled);
>+        context->validationError(GL_INVALID_OPERATION, kExtensionNotEnabled);
>         return false;
>     }
> 
>@@ -1854,7 +1975,7 @@ bool ValidateGenVertexArraysOES(Context *context, GLsizei n, GLuint *arrays)
> {
>     if (!context->getExtensions().vertexArrayObject)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidOperation(), ExtensionNotEnabled);
>+        context->validationError(GL_INVALID_OPERATION, kExtensionNotEnabled);
>         return false;
>     }
> 
>@@ -1865,7 +1986,7 @@ bool ValidateIsVertexArrayOES(Context *context, GLuint array)
> {
>     if (!context->getExtensions().vertexArrayObject)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidOperation(), ExtensionNotEnabled);
>+        context->validationError(GL_INVALID_OPERATION, kExtensionNotEnabled);
>         return false;
>     }
> 
>@@ -1880,7 +2001,7 @@ bool ValidateProgramBinaryOES(Context *context,
> {
>     if (!context->getExtensions().getProgramBinary)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidOperation(), ExtensionNotEnabled);
>+        context->validationError(GL_INVALID_OPERATION, kExtensionNotEnabled);
>         return false;
>     }
> 
>@@ -1896,7 +2017,7 @@ bool ValidateGetProgramBinaryOES(Context *context,
> {
>     if (!context->getExtensions().getProgramBinary)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidOperation(), ExtensionNotEnabled);
>+        context->validationError(GL_INVALID_OPERATION, kExtensionNotEnabled);
>         return false;
>     }
> 
>@@ -1968,25 +2089,25 @@ bool ValidateDebugMessageControlKHR(Context *context,
> {
>     if (!context->getExtensions().debug)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidOperation(), ExtensionNotEnabled);
>+        context->validationError(GL_INVALID_OPERATION, kExtensionNotEnabled);
>         return false;
>     }
> 
>     if (!ValidDebugSource(source, false) && source != GL_DONT_CARE)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidEnum(), InvalidDebugSource);
>+        context->validationError(GL_INVALID_ENUM, kInvalidDebugSource);
>         return false;
>     }
> 
>     if (!ValidDebugType(type) && type != GL_DONT_CARE)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidEnum(), InvalidDebugType);
>+        context->validationError(GL_INVALID_ENUM, kInvalidDebugType);
>         return false;
>     }
> 
>     if (!ValidDebugSeverity(severity) && severity != GL_DONT_CARE)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidEnum(), InvalidDebugSeverity);
>+        context->validationError(GL_INVALID_ENUM, kInvalidDebugSeverity);
>         return false;
>     }
> 
>@@ -1994,17 +2115,13 @@ bool ValidateDebugMessageControlKHR(Context *context,
>     {
>         if (source == GL_DONT_CARE || type == GL_DONT_CARE)
>         {
>-            context->handleError(
>-                InvalidOperation()
>-                << "If count is greater than zero, source and severity cannot be GL_DONT_CARE.");
>+            context->validationError(GL_INVALID_OPERATION, kInvalidDebugSourceType);
>             return false;
>         }
> 
>         if (severity != GL_DONT_CARE)
>         {
>-            context->handleError(
>-                InvalidOperation()
>-                << "If count is greater than zero, severity must be GL_DONT_CARE.");
>+            context->validationError(GL_INVALID_OPERATION, kInvalidDebugSeverity);
>             return false;
>         }
>     }
>@@ -2022,11 +2139,11 @@ bool ValidateDebugMessageInsertKHR(Context *context,
> {
>     if (!context->getExtensions().debug)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidOperation(), ExtensionNotEnabled);
>+        context->validationError(GL_INVALID_OPERATION, kExtensionNotEnabled);
>         return false;
>     }
> 
>-    if (!context->getGLState().getDebug().isOutputEnabled())
>+    if (!context->getState().getDebug().isOutputEnabled())
>     {
>         // If the DEBUG_OUTPUT state is disabled calls to DebugMessageInsert are discarded and do
>         // not generate an error.
>@@ -2035,27 +2152,26 @@ bool ValidateDebugMessageInsertKHR(Context *context,
> 
>     if (!ValidDebugSeverity(severity))
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidEnum(), InvalidDebugSource);
>+        context->validationError(GL_INVALID_ENUM, kInvalidDebugSource);
>         return false;
>     }
> 
>     if (!ValidDebugType(type))
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidEnum(), InvalidDebugType);
>+        context->validationError(GL_INVALID_ENUM, kInvalidDebugType);
>         return false;
>     }
> 
>     if (!ValidDebugSource(source, true))
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidEnum(), InvalidDebugSource);
>+        context->validationError(GL_INVALID_ENUM, kInvalidDebugSource);
>         return false;
>     }
> 
>     size_t messageLength = (length < 0) ? strlen(buf) : length;
>     if (messageLength > context->getExtensions().maxDebugMessageLength)
>     {
>-        context->handleError(InvalidValue()
>-                             << "Message length is larger than GL_MAX_DEBUG_MESSAGE_LENGTH.");
>+        context->validationError(GL_INVALID_VALUE, kExceedsMaxDebugMessageLength);
>         return false;
>     }
> 
>@@ -2068,7 +2184,7 @@ bool ValidateDebugMessageCallbackKHR(Context *context,
> {
>     if (!context->getExtensions().debug)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidOperation(), ExtensionNotEnabled);
>+        context->validationError(GL_INVALID_OPERATION, kExtensionNotEnabled);
>         return false;
>     }
> 
>@@ -2087,13 +2203,13 @@ bool ValidateGetDebugMessageLogKHR(Context *context,
> {
>     if (!context->getExtensions().debug)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidOperation(), ExtensionNotEnabled);
>+        context->validationError(GL_INVALID_OPERATION, kExtensionNotEnabled);
>         return false;
>     }
> 
>     if (bufSize < 0 && messageLog != nullptr)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidValue(), NegativeBufferSize);
>+        context->validationError(GL_INVALID_VALUE, kNegativeBufferSize);
>         return false;
>     }
> 
>@@ -2108,30 +2224,27 @@ bool ValidatePushDebugGroupKHR(Context *context,
> {
>     if (!context->getExtensions().debug)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidOperation(), ExtensionNotEnabled);
>+        context->validationError(GL_INVALID_OPERATION, kExtensionNotEnabled);
>         return false;
>     }
> 
>     if (!ValidDebugSource(source, true))
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidEnum(), InvalidDebugSource);
>+        context->validationError(GL_INVALID_ENUM, kInvalidDebugSource);
>         return false;
>     }
> 
>     size_t messageLength = (length < 0) ? strlen(message) : length;
>     if (messageLength > context->getExtensions().maxDebugMessageLength)
>     {
>-        context->handleError(InvalidValue()
>-                             << "Message length is larger than GL_MAX_DEBUG_MESSAGE_LENGTH.");
>+        context->validationError(GL_INVALID_VALUE, kExceedsMaxDebugMessageLength);
>         return false;
>     }
> 
>-    size_t currentStackSize = context->getGLState().getDebug().getGroupStackDepth();
>+    size_t currentStackSize = context->getState().getDebug().getGroupStackDepth();
>     if (currentStackSize >= context->getExtensions().maxDebugGroupStackDepth)
>     {
>-        context
>-            ->handleError(StackOverflow()
>-                          << "Cannot push more than GL_MAX_DEBUG_GROUP_STACK_DEPTH debug groups.");
>+        context->validationError(GL_STACK_OVERFLOW, kExceedsMaxDebugGroupStackDepth);
>         return false;
>     }
> 
>@@ -2142,14 +2255,14 @@ bool ValidatePopDebugGroupKHR(Context *context)
> {
>     if (!context->getExtensions().debug)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidOperation(), ExtensionNotEnabled);
>+        context->validationError(GL_INVALID_OPERATION, kExtensionNotEnabled);
>         return false;
>     }
> 
>-    size_t currentStackSize = context->getGLState().getDebug().getGroupStackDepth();
>+    size_t currentStackSize = context->getState().getDebug().getGroupStackDepth();
>     if (currentStackSize <= 1)
>     {
>-        context->handleError(StackUnderflow() << "Cannot pop the default debug group.");
>+        context->validationError(GL_STACK_UNDERFLOW, kCannotPopDefaultDebugGroup);
>         return false;
>     }
> 
>@@ -2163,7 +2276,7 @@ static bool ValidateObjectIdentifierAndName(Context *context, GLenum identifier,
>         case GL_BUFFER:
>             if (context->getBuffer(name) == nullptr)
>             {
>-                context->handleError(InvalidValue() << "name is not a valid buffer.");
>+                context->validationError(GL_INVALID_VALUE, kInvalidBufferName);
>                 return false;
>             }
>             return true;
>@@ -2171,15 +2284,15 @@ static bool ValidateObjectIdentifierAndName(Context *context, GLenum identifier,
>         case GL_SHADER:
>             if (context->getShader(name) == nullptr)
>             {
>-                context->handleError(InvalidValue() << "name is not a valid shader.");
>+                context->validationError(GL_INVALID_VALUE, kInvalidShaderName);
>                 return false;
>             }
>             return true;
> 
>         case GL_PROGRAM:
>-            if (context->getProgram(name) == nullptr)
>+            if (context->getProgramNoResolveLink(name) == nullptr)
>             {
>-                context->handleError(InvalidValue() << "name is not a valid program.");
>+                context->validationError(GL_INVALID_VALUE, kInvalidProgramName);
>                 return false;
>             }
>             return true;
>@@ -2187,7 +2300,7 @@ static bool ValidateObjectIdentifierAndName(Context *context, GLenum identifier,
>         case GL_VERTEX_ARRAY:
>             if (context->getVertexArray(name) == nullptr)
>             {
>-                context->handleError(InvalidValue() << "name is not a valid vertex array.");
>+                context->validationError(GL_INVALID_VALUE, kInvalidVertexArrayName);
>                 return false;
>             }
>             return true;
>@@ -2195,7 +2308,7 @@ static bool ValidateObjectIdentifierAndName(Context *context, GLenum identifier,
>         case GL_QUERY:
>             if (context->getQuery(name) == nullptr)
>             {
>-                context->handleError(InvalidValue() << "name is not a valid query.");
>+                context->validationError(GL_INVALID_VALUE, kInvalidQueryName);
>                 return false;
>             }
>             return true;
>@@ -2203,7 +2316,7 @@ static bool ValidateObjectIdentifierAndName(Context *context, GLenum identifier,
>         case GL_TRANSFORM_FEEDBACK:
>             if (context->getTransformFeedback(name) == nullptr)
>             {
>-                context->handleError(InvalidValue() << "name is not a valid transform feedback.");
>+                context->validationError(GL_INVALID_VALUE, kInvalidTransformFeedbackName);
>                 return false;
>             }
>             return true;
>@@ -2211,7 +2324,7 @@ static bool ValidateObjectIdentifierAndName(Context *context, GLenum identifier,
>         case GL_SAMPLER:
>             if (context->getSampler(name) == nullptr)
>             {
>-                context->handleError(InvalidValue() << "name is not a valid sampler.");
>+                context->validationError(GL_INVALID_VALUE, kInvalidSamplerName);
>                 return false;
>             }
>             return true;
>@@ -2219,7 +2332,7 @@ static bool ValidateObjectIdentifierAndName(Context *context, GLenum identifier,
>         case GL_TEXTURE:
>             if (context->getTexture(name) == nullptr)
>             {
>-                context->handleError(InvalidValue() << "name is not a valid texture.");
>+                context->validationError(GL_INVALID_VALUE, kInvalidTextureName);
>                 return false;
>             }
>             return true;
>@@ -2227,7 +2340,7 @@ static bool ValidateObjectIdentifierAndName(Context *context, GLenum identifier,
>         case GL_RENDERBUFFER:
>             if (context->getRenderbuffer(name) == nullptr)
>             {
>-                context->handleError(InvalidValue() << "name is not a valid renderbuffer.");
>+                context->validationError(GL_INVALID_VALUE, kInvalidRenderbufferName);
>                 return false;
>             }
>             return true;
>@@ -2235,13 +2348,13 @@ static bool ValidateObjectIdentifierAndName(Context *context, GLenum identifier,
>         case GL_FRAMEBUFFER:
>             if (context->getFramebuffer(name) == nullptr)
>             {
>-                context->handleError(InvalidValue() << "name is not a valid framebuffer.");
>+                context->validationError(GL_INVALID_VALUE, kInvalidFramebufferName);
>                 return false;
>             }
>             return true;
> 
>         default:
>-            context->handleError(InvalidEnum() << "Invalid identifier.");
>+            context->validationError(GL_INVALID_ENUM, kInvalidIndentifier);
>             return false;
>     }
> }
>@@ -2264,7 +2377,7 @@ static bool ValidateLabelLength(Context *context, GLsizei length, const GLchar *
> 
>     if (labelLength > context->getExtensions().maxLabelLength)
>     {
>-        context->handleError(InvalidValue() << "Label length is larger than GL_MAX_LABEL_LENGTH.");
>+        context->validationError(GL_INVALID_VALUE, kExceedsMaxLabelLength);
>         return false;
>     }
> 
>@@ -2279,7 +2392,7 @@ bool ValidateObjectLabelKHR(Context *context,
> {
>     if (!context->getExtensions().debug)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidOperation(), ExtensionNotEnabled);
>+        context->validationError(GL_INVALID_OPERATION, kExtensionNotEnabled);
>         return false;
>     }
> 
>@@ -2305,13 +2418,13 @@ bool ValidateGetObjectLabelKHR(Context *context,
> {
>     if (!context->getExtensions().debug)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidOperation(), ExtensionNotEnabled);
>+        context->validationError(GL_INVALID_OPERATION, kExtensionNotEnabled);
>         return false;
>     }
> 
>     if (bufSize < 0)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidValue(), NegativeBufferSize);
>+        context->validationError(GL_INVALID_VALUE, kNegativeBufferSize);
>         return false;
>     }
> 
>@@ -2327,7 +2440,7 @@ static bool ValidateObjectPtrName(Context *context, const void *ptr)
> {
>     if (context->getSync(reinterpret_cast<GLsync>(const_cast<void *>(ptr))) == nullptr)
>     {
>-        context->handleError(InvalidValue() << "name is not a valid sync.");
>+        context->validationError(GL_INVALID_VALUE, kInvalidSyncPointer);
>         return false;
>     }
> 
>@@ -2341,7 +2454,7 @@ bool ValidateObjectPtrLabelKHR(Context *context,
> {
>     if (!context->getExtensions().debug)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidOperation(), ExtensionNotEnabled);
>+        context->validationError(GL_INVALID_OPERATION, kExtensionNotEnabled);
>         return false;
>     }
> 
>@@ -2366,13 +2479,13 @@ bool ValidateGetObjectPtrLabelKHR(Context *context,
> {
>     if (!context->getExtensions().debug)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidOperation(), ExtensionNotEnabled);
>+        context->validationError(GL_INVALID_OPERATION, kExtensionNotEnabled);
>         return false;
>     }
> 
>     if (bufSize < 0)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidValue(), NegativeBufferSize);
>+        context->validationError(GL_INVALID_VALUE, kNegativeBufferSize);
>         return false;
>     }
> 
>@@ -2388,7 +2501,7 @@ bool ValidateGetPointervKHR(Context *context, GLenum pname, void **params)
> {
>     if (!context->getExtensions().debug)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidOperation(), ExtensionNotEnabled);
>+        context->validationError(GL_INVALID_OPERATION, kExtensionNotEnabled);
>         return false;
>     }
> 
>@@ -2400,13 +2513,23 @@ bool ValidateGetPointervKHR(Context *context, GLenum pname, void **params)
>             break;
> 
>         default:
>-            ANGLE_VALIDATION_ERR(context, InvalidEnum(), EnumNotSupported);
>+            context->validationError(GL_INVALID_ENUM, kEnumNotSupported);
>             return false;
>     }
> 
>     return true;
> }
> 
>+bool ValidateGetPointervRobustANGLERobustANGLE(Context *context,
>+                                               GLenum pname,
>+                                               GLsizei bufSize,
>+                                               GLsizei *length,
>+                                               void **params)
>+{
>+    UNIMPLEMENTED();
>+    return false;
>+}
>+
> bool ValidateBlitFramebufferANGLE(Context *context,
>                                   GLint srcX0,
>                                   GLint srcY0,
>@@ -2421,27 +2544,25 @@ bool ValidateBlitFramebufferANGLE(Context *context,
> {
>     if (!context->getExtensions().framebufferBlit)
>     {
>-        context->handleError(InvalidOperation() << "Blit extension not available.");
>+        context->validationError(GL_INVALID_OPERATION, kBlitExtensionNotAvailable);
>         return false;
>     }
> 
>     if (srcX1 - srcX0 != dstX1 - dstX0 || srcY1 - srcY0 != dstY1 - dstY0)
>     {
>         // TODO(jmadill): Determine if this should be available on other implementations.
>-        context->handleError(InvalidOperation() << "Scaling and flipping in "
>-                                                   "BlitFramebufferANGLE not supported by this "
>-                                                   "implementation.");
>+        context->validationError(GL_INVALID_OPERATION, kBlitExtensionScaleOrFlip);
>         return false;
>     }
> 
>     if (filter == GL_LINEAR)
>     {
>-        context->handleError(InvalidEnum() << "Linear blit not supported in this extension");
>+        context->validationError(GL_INVALID_ENUM, kBlitExtensionLinear);
>         return false;
>     }
> 
>-    Framebuffer *readFramebuffer = context->getGLState().getReadFramebuffer();
>-    Framebuffer *drawFramebuffer = context->getGLState().getDrawFramebuffer();
>+    Framebuffer *readFramebuffer = context->getState().getReadFramebuffer();
>+    Framebuffer *drawFramebuffer = context->getState().getDrawFramebuffer();
> 
>     if (mask & GL_COLOR_BUFFER_BIT)
>     {
>@@ -2451,11 +2572,12 @@ bool ValidateBlitFramebufferANGLE(Context *context,
>         if (readColorAttachment && drawColorAttachment)
>         {
>             if (!(readColorAttachment->type() == GL_TEXTURE &&
>-                  readColorAttachment->getTextureImageIndex().type == GL_TEXTURE_2D) &&
>+                  readColorAttachment->getTextureImageIndex().getType() == TextureType::_2D) &&
>                 readColorAttachment->type() != GL_RENDERBUFFER &&
>                 readColorAttachment->type() != GL_FRAMEBUFFER_DEFAULT)
>             {
>-                context->handleError(InvalidOperation());
>+                context->validationError(GL_INVALID_OPERATION,
>+                                         kBlitExtensionFromInvalidAttachmentType);
>                 return false;
>             }
> 
>@@ -2467,11 +2589,12 @@ bool ValidateBlitFramebufferANGLE(Context *context,
>                 if (attachment)
>                 {
>                     if (!(attachment->type() == GL_TEXTURE &&
>-                          attachment->getTextureImageIndex().type == GL_TEXTURE_2D) &&
>+                          attachment->getTextureImageIndex().getType() == TextureType::_2D) &&
>                         attachment->type() != GL_RENDERBUFFER &&
>                         attachment->type() != GL_FRAMEBUFFER_DEFAULT)
>                     {
>-                        context->handleError(InvalidOperation());
>+                        context->validationError(GL_INVALID_OPERATION,
>+                                                 kBlitExtensionToInvalidAttachmentType);
>                         return false;
>                     }
> 
>@@ -2479,17 +2602,20 @@ bool ValidateBlitFramebufferANGLE(Context *context,
>                     if (!Format::EquivalentForBlit(attachment->getFormat(),
>                                                    readColorAttachment->getFormat()))
>                     {
>-                        context->handleError(InvalidOperation());
>+                        context->validationError(GL_INVALID_OPERATION,
>+                                                 kBlitExtensionFormatMismatch);
>                         return false;
>                     }
>                 }
>             }
> 
>-            if (readFramebuffer->getSamples(context) != 0 &&
>+            GLint samples = readFramebuffer->getSamples(context);
>+            if (samples != 0 &&
>                 IsPartialBlit(context, readColorAttachment, drawColorAttachment, srcX0, srcY0,
>                               srcX1, srcY1, dstX0, dstY0, dstX1, dstY1))
>             {
>-                context->handleError(InvalidOperation());
>+                context->validationError(GL_INVALID_OPERATION,
>+                                         kBlitExtensionMultisampledWholeBufferBlit);
>                 return false;
>             }
>         }
>@@ -2502,9 +2628,9 @@ bool ValidateBlitFramebufferANGLE(Context *context,
>         if (mask & masks[i])
>         {
>             const FramebufferAttachment *readBuffer =
>-                readFramebuffer->getAttachment(attachments[i]);
>+                readFramebuffer->getAttachment(context, attachments[i]);
>             const FramebufferAttachment *drawBuffer =
>-                drawFramebuffer->getAttachment(attachments[i]);
>+                drawFramebuffer->getAttachment(context, attachments[i]);
> 
>             if (readBuffer && drawBuffer)
>             {
>@@ -2512,15 +2638,15 @@ bool ValidateBlitFramebufferANGLE(Context *context,
>                                   dstX0, dstY0, dstX1, dstY1))
>                 {
>                     // only whole-buffer copies are permitted
>-                    context->handleError(InvalidOperation() << "Only whole-buffer depth and "
>-                                                               "stencil blits are supported by "
>-                                                               "this extension.");
>+                    context->validationError(GL_INVALID_OPERATION,
>+                                             kBlitExtensionDepthStencilWholeBufferBlit);
>                     return false;
>                 }
> 
>                 if (readBuffer->getSamples() != 0 || drawBuffer->getSamples() != 0)
>                 {
>-                    context->handleError(InvalidOperation());
>+                    context->validationError(GL_INVALID_OPERATION,
>+                                             kBlitExtensionMultisampledDepthOrStencil);
>                     return false;
>                 }
>             }
>@@ -2531,22 +2657,23 @@ bool ValidateBlitFramebufferANGLE(Context *context,
>                                              dstX1, dstY1, mask, filter);
> }
> 
>-bool ValidateClear(ValidationContext *context, GLbitfield mask)
>+bool ValidateClear(Context *context, GLbitfield mask)
> {
>-    Framebuffer *fbo = context->getGLState().getDrawFramebuffer();
>-    if (fbo->checkStatus(context) != GL_FRAMEBUFFER_COMPLETE)
>+    Framebuffer *fbo             = context->getState().getDrawFramebuffer();
>+    const Extensions &extensions = context->getExtensions();
>+
>+    if (!ValidateFramebufferComplete(context, fbo))
>     {
>-        context->handleError(InvalidFramebufferOperation());
>         return false;
>     }
> 
>     if ((mask & ~(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT)) != 0)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidValue(), InvalidClearMask);
>+        context->validationError(GL_INVALID_VALUE, kInvalidClearMask);
>         return false;
>     }
> 
>-    if (context->getExtensions().webglCompatibility && (mask & GL_COLOR_BUFFER_BIT) != 0)
>+    if (extensions.webglCompatibility && (mask & GL_COLOR_BUFFER_BIT) != 0)
>     {
>         constexpr GLenum validComponentTypes[] = {GL_FLOAT, GL_UNSIGNED_NORMALIZED,
>                                                   GL_SIGNED_NORMALIZED};
>@@ -2562,14 +2689,25 @@ bool ValidateClear(ValidationContext *context, GLbitfield mask)
>         }
>     }
> 
>+    if (extensions.multiview2 && extensions.disjointTimerQuery)
>+    {
>+        const State &state       = context->getState();
>+        Framebuffer *framebuffer = state.getDrawFramebuffer();
>+        if (framebuffer->getNumViews() > 1 && state.isQueryActive(QueryType::TimeElapsed))
>+        {
>+            context->validationError(GL_INVALID_OPERATION, kMultiviewTimerQuery);
>+            return false;
>+        }
>+    }
>+
>     return true;
> }
> 
>-bool ValidateDrawBuffersEXT(ValidationContext *context, GLsizei n, const GLenum *bufs)
>+bool ValidateDrawBuffersEXT(Context *context, GLsizei n, const GLenum *bufs)
> {
>     if (!context->getExtensions().drawBuffers)
>     {
>-        context->handleError(InvalidOperation() << "Extension not supported.");
>+        context->validationError(GL_INVALID_OPERATION, kExtensionNotEnabled);
>         return false;
>     }
> 
>@@ -2577,7 +2715,7 @@ bool ValidateDrawBuffersEXT(ValidationContext *context, GLsizei n, const GLenum
> }
> 
> bool ValidateTexImage2D(Context *context,
>-                        GLenum target,
>+                        TextureTarget target,
>                         GLint level,
>                         GLint internalformat,
>                         GLsizei width,
>@@ -2599,17 +2737,17 @@ bool ValidateTexImage2D(Context *context,
>                                            pixels);
> }
> 
>-bool ValidateTexImage2DRobust(Context *context,
>-                              GLenum target,
>-                              GLint level,
>-                              GLint internalformat,
>-                              GLsizei width,
>-                              GLsizei height,
>-                              GLint border,
>-                              GLenum format,
>-                              GLenum type,
>-                              GLsizei bufSize,
>-                              const void *pixels)
>+bool ValidateTexImage2DRobustANGLE(Context *context,
>+                                   TextureTarget target,
>+                                   GLint level,
>+                                   GLint internalformat,
>+                                   GLsizei width,
>+                                   GLsizei height,
>+                                   GLint border,
>+                                   GLenum format,
>+                                   GLenum type,
>+                                   GLsizei bufSize,
>+                                   const void *pixels)
> {
>     if (!ValidateRobustEntryPoint(context, bufSize))
>     {
>@@ -2630,7 +2768,7 @@ bool ValidateTexImage2DRobust(Context *context,
> }
> 
> bool ValidateTexSubImage2D(Context *context,
>-                           GLenum target,
>+                           TextureTarget target,
>                            GLint level,
>                            GLint xoffset,
>                            GLint yoffset,
>@@ -2654,7 +2792,7 @@ bool ValidateTexSubImage2D(Context *context,
> }
> 
> bool ValidateTexSubImage2DRobustANGLE(Context *context,
>-                                      GLenum target,
>+                                      TextureTarget target,
>                                       GLint level,
>                                       GLint xoffset,
>                                       GLint yoffset,
>@@ -2684,7 +2822,7 @@ bool ValidateTexSubImage2DRobustANGLE(Context *context,
> }
> 
> bool ValidateCompressedTexImage2D(Context *context,
>-                                  GLenum target,
>+                                  TextureTarget target,
>                                   GLint level,
>                                   GLenum internalformat,
>                                   GLsizei width,
>@@ -2713,22 +2851,23 @@ bool ValidateCompressedTexImage2D(Context *context,
>     }
> 
>     const InternalFormat &formatInfo = GetSizedInternalFormatInfo(internalformat);
>-    auto blockSizeOrErr = formatInfo.computeCompressedImageSize(gl::Extents(width, height, 1));
>-    if (blockSizeOrErr.isError())
>+
>+    GLuint blockSize = 0;
>+    if (!formatInfo.computeCompressedImageSize(gl::Extents(width, height, 1), &blockSize))
>     {
>-        context->handleError(blockSizeOrErr.getError());
>+        context->validationError(GL_INVALID_OPERATION, kIntegerOverflow);
>         return false;
>     }
> 
>-    if (imageSize < 0 || static_cast<GLuint>(imageSize) != blockSizeOrErr.getResult())
>+    if (imageSize < 0 || static_cast<GLuint>(imageSize) != blockSize)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidValue(), CompressedTextureDimensionsMustMatchData);
>+        context->validationError(GL_INVALID_VALUE, kCompressedTextureDimensionsMustMatchData);
>         return false;
>     }
> 
>-    if (target == GL_TEXTURE_RECTANGLE_ANGLE)
>+    if (target == TextureTarget::Rectangle)
>     {
>-        context->handleError(InvalidEnum() << "Rectangle texture cannot have a compressed format.");
>+        context->validationError(GL_INVALID_ENUM, kRectangleTextureCompressed);
>         return false;
>     }
> 
>@@ -2736,7 +2875,7 @@ bool ValidateCompressedTexImage2D(Context *context,
> }
> 
> bool ValidateCompressedTexImage2DRobustANGLE(Context *context,
>-                                             GLenum target,
>+                                             TextureTarget target,
>                                              GLint level,
>                                              GLenum internalformat,
>                                              GLsizei width,
>@@ -2754,8 +2893,9 @@ bool ValidateCompressedTexImage2DRobustANGLE(Context *context,
>     return ValidateCompressedTexImage2D(context, target, level, internalformat, width, height,
>                                         border, imageSize, data);
> }
>+
> bool ValidateCompressedTexSubImage2DRobustANGLE(Context *context,
>-                                                GLenum target,
>+                                                TextureTarget target,
>                                                 GLint level,
>                                                 GLint xoffset,
>                                                 GLint yoffset,
>@@ -2776,7 +2916,7 @@ bool ValidateCompressedTexSubImage2DRobustANGLE(Context *context,
> }
> 
> bool ValidateCompressedTexSubImage2D(Context *context,
>-                                     GLenum target,
>+                                     TextureTarget target,
>                                      GLint level,
>                                      GLint xoffset,
>                                      GLint yoffset,
>@@ -2806,16 +2946,16 @@ bool ValidateCompressedTexSubImage2D(Context *context,
>     }
> 
>     const InternalFormat &formatInfo = GetSizedInternalFormatInfo(format);
>-    auto blockSizeOrErr = formatInfo.computeCompressedImageSize(gl::Extents(width, height, 1));
>-    if (blockSizeOrErr.isError())
>+    GLuint blockSize                 = 0;
>+    if (!formatInfo.computeCompressedImageSize(gl::Extents(width, height, 1), &blockSize))
>     {
>-        context->handleError(blockSizeOrErr.getError());
>+        context->validationError(GL_INVALID_OPERATION, kIntegerOverflow);
>         return false;
>     }
> 
>-    if (imageSize < 0 || static_cast<GLuint>(imageSize) != blockSizeOrErr.getResult())
>+    if (imageSize < 0 || static_cast<GLuint>(imageSize) != blockSize)
>     {
>-        context->handleError(InvalidValue());
>+        context->validationError(GL_INVALID_VALUE, kInvalidCompressedImageSize);
>         return false;
>     }
> 
>@@ -2827,6 +2967,12 @@ bool ValidateGetBufferPointervOES(Context *context,
>                                   GLenum pname,
>                                   void **params)
> {
>+    if (!context->getExtensions().mapBuffer)
>+    {
>+        context->validationError(GL_INVALID_OPERATION, kExtensionNotEnabled);
>+        return false;
>+    }
>+
>     return ValidateGetBufferPointervBase(context, target, pname, nullptr, params);
> }
> 
>@@ -2834,33 +2980,33 @@ bool ValidateMapBufferOES(Context *context, BufferBinding target, GLenum access)
> {
>     if (!context->getExtensions().mapBuffer)
>     {
>-        context->handleError(InvalidOperation() << "Map buffer extension not available.");
>+        context->validationError(GL_INVALID_OPERATION, kExtensionNotEnabled);
>         return false;
>     }
> 
>-    if (!ValidBufferType(context, target))
>+    if (!context->isValidBufferBinding(target))
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidEnum(), InvalidBufferTypes);
>+        context->validationError(GL_INVALID_ENUM, kInvalidBufferTypes);
>         return false;
>     }
> 
>-    Buffer *buffer = context->getGLState().getTargetBuffer(target);
>+    Buffer *buffer = context->getState().getTargetBuffer(target);
> 
>     if (buffer == nullptr)
>     {
>-        context->handleError(InvalidOperation() << "Attempted to map buffer object zero.");
>+        context->validationError(GL_INVALID_OPERATION, kBufferNotMappable);
>         return false;
>     }
> 
>     if (access != GL_WRITE_ONLY_OES)
>     {
>-        context->handleError(InvalidEnum() << "Non-write buffer mapping not supported.");
>+        context->validationError(GL_INVALID_ENUM, kInvalidAccessBits);
>         return false;
>     }
> 
>     if (buffer->isMapped())
>     {
>-        context->handleError(InvalidOperation() << "Buffer is already mapped.");
>+        context->validationError(GL_INVALID_OPERATION, kBufferAlreadyMapped);
>         return false;
>     }
> 
>@@ -2871,7 +3017,7 @@ bool ValidateUnmapBufferOES(Context *context, BufferBinding target)
> {
>     if (!context->getExtensions().mapBuffer)
>     {
>-        context->handleError(InvalidOperation() << "Map buffer extension not available.");
>+        context->validationError(GL_INVALID_OPERATION, kExtensionNotEnabled);
>         return false;
>     }
> 
>@@ -2886,233 +3032,445 @@ bool ValidateMapBufferRangeEXT(Context *context,
> {
>     if (!context->getExtensions().mapBufferRange)
>     {
>-        context->handleError(InvalidOperation() << "Map buffer range extension not available.");
>+        context->validationError(GL_INVALID_OPERATION, kExtensionNotEnabled);
>         return false;
>     }
> 
>     return ValidateMapBufferRangeBase(context, target, offset, length, access);
> }
> 
>-bool ValidateMapBufferBase(Context *context, BufferBinding target)
>+bool ValidateBufferStorageMemEXT(Context *context,
>+                                 TextureType target,
>+                                 GLsizeiptr size,
>+                                 GLuint memory,
>+                                 GLuint64 offset)
> {
>-    Buffer *buffer = context->getGLState().getTargetBuffer(target);
>-    ASSERT(buffer != nullptr);
>-
>-    // Check if this buffer is currently being used as a transform feedback output buffer
>-    TransformFeedback *transformFeedback = context->getGLState().getCurrentTransformFeedback();
>-    if (transformFeedback != nullptr && transformFeedback->isActive())
>+    if (!context->getExtensions().memoryObject)
>     {
>-        for (size_t i = 0; i < transformFeedback->getIndexedBufferCount(); i++)
>-        {
>-            const auto &transformFeedbackBuffer = transformFeedback->getIndexedBuffer(i);
>-            if (transformFeedbackBuffer.get() == buffer)
>-            {
>-                context->handleError(InvalidOperation()
>-                                     << "Buffer is currently bound for transform feedback.");
>-                return false;
>-            }
>-        }
>+        context->validationError(GL_INVALID_OPERATION, kExtensionNotEnabled);
>+        return false;
>     }
> 
>-    return true;
>+    UNIMPLEMENTED();
>+    return false;
> }
> 
>-bool ValidateFlushMappedBufferRangeEXT(Context *context,
>-                                       BufferBinding target,
>-                                       GLintptr offset,
>-                                       GLsizeiptr length)
>+bool ValidateCreateMemoryObjectsEXT(Context *context, GLsizei n, GLuint *memoryObjects)
> {
>-    if (!context->getExtensions().mapBufferRange)
>+    if (!context->getExtensions().memoryObject)
>     {
>-        context->handleError(InvalidOperation() << "Map buffer range extension not available.");
>+        context->validationError(GL_INVALID_OPERATION, kExtensionNotEnabled);
>         return false;
>     }
> 
>-    return ValidateFlushMappedBufferRangeBase(context, target, offset, length);
>+    return ValidateGenOrDelete(context, n);
> }
> 
>-bool ValidateBindTexture(Context *context, GLenum target, GLuint texture)
>+bool ValidateDeleteMemoryObjectsEXT(Context *context, GLsizei n, const GLuint *memoryObjects)
> {
>-    Texture *textureObject = context->getTexture(texture);
>-    if (textureObject && textureObject->getTarget() != target && texture != 0)
>+    if (!context->getExtensions().memoryObject)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidOperation(), TypeMismatch);
>+        context->validationError(GL_INVALID_OPERATION, kExtensionNotEnabled);
>         return false;
>     }
> 
>-    if (!context->getGLState().isBindGeneratesResourceEnabled() &&
>-        !context->isTextureGenerated(texture))
>+    return ValidateGenOrDelete(context, n);
>+}
>+
>+bool ValidateGetMemoryObjectParameterivEXT(Context *context,
>+                                           GLuint memoryObject,
>+                                           GLenum pname,
>+                                           GLint *params)
>+{
>+    if (!context->getExtensions().memoryObject)
>     {
>-        context->handleError(InvalidOperation() << "Texture was not generated");
>+        context->validationError(GL_INVALID_OPERATION, kExtensionNotEnabled);
>         return false;
>     }
> 
>-    switch (target)
>-    {
>-        case GL_TEXTURE_2D:
>-        case GL_TEXTURE_CUBE_MAP:
>-            break;
>-
>-        case GL_TEXTURE_RECTANGLE_ANGLE:
>-            if (!context->getExtensions().textureRectangle)
>-            {
>-                context->handleError(InvalidEnum()
>-                                     << "Context does not support GL_ANGLE_texture_rectangle");
>-                return false;
>-            }
>-            break;
>-
>-        case GL_TEXTURE_3D:
>-        case GL_TEXTURE_2D_ARRAY:
>-            if (context->getClientMajorVersion() < 3)
>-            {
>-                ANGLE_VALIDATION_ERR(context, InvalidEnum(), ES3Required);
>-                return false;
>-            }
>-            break;
>-
>-        case GL_TEXTURE_2D_MULTISAMPLE:
>-            if (context->getClientVersion() < Version(3, 1))
>-            {
>-                ANGLE_VALIDATION_ERR(context, InvalidEnum(), ES31Required);
>-                return false;
>-            }
>-            break;
>+    UNIMPLEMENTED();
>+    return false;
>+}
> 
>-        case GL_TEXTURE_EXTERNAL_OES:
>-            if (!context->getExtensions().eglImageExternal &&
>-                !context->getExtensions().eglStreamConsumerExternal)
>-            {
>-                context->handleError(InvalidEnum() << "External texture extension not enabled");
>-                return false;
>-            }
>-            break;
>-        default:
>-            ANGLE_VALIDATION_ERR(context, InvalidEnum(), InvalidTextureTarget);
>-            return false;
>+bool ValidateGetUnsignedBytevEXT(Context *context, GLenum pname, GLubyte *data)
>+{
>+    if (!context->getExtensions().memoryObject && !context->getExtensions().semaphore)
>+    {
>+        context->validationError(GL_INVALID_OPERATION, kExtensionNotEnabled);
>+        return false;
>     }
> 
>-    return true;
>+    UNIMPLEMENTED();
>+    return false;
> }
> 
>-bool ValidateBindUniformLocationCHROMIUM(Context *context,
>-                                         GLuint program,
>-                                         GLint location,
>-                                         const GLchar *name)
>+bool ValidateGetUnsignedBytei_vEXT(Context *context, GLenum target, GLuint index, GLubyte *data)
> {
>-    if (!context->getExtensions().bindUniformLocation)
>+    if (!context->getExtensions().memoryObject && !context->getExtensions().semaphore)
>     {
>-        context->handleError(InvalidOperation()
>-                             << "GL_CHROMIUM_bind_uniform_location is not available.");
>+        context->validationError(GL_INVALID_OPERATION, kExtensionNotEnabled);
>         return false;
>     }
> 
>-    Program *programObject = GetValidProgram(context, program);
>-    if (!programObject)
>+    UNIMPLEMENTED();
>+    return false;
>+}
>+
>+bool ValidateIsMemoryObjectEXT(Context *context, GLuint memoryObject)
>+{
>+    if (!context->getExtensions().memoryObject)
>     {
>+        context->validationError(GL_INVALID_OPERATION, kExtensionNotEnabled);
>         return false;
>     }
> 
>-    if (location < 0)
>+    return true;
>+}
>+
>+bool ValidateMemoryObjectParameterivEXT(Context *context,
>+                                        GLuint memoryObject,
>+                                        GLenum pname,
>+                                        const GLint *params)
>+{
>+    if (!context->getExtensions().memoryObject)
>     {
>-        context->handleError(InvalidValue() << "Location cannot be less than 0.");
>+        context->validationError(GL_INVALID_OPERATION, kExtensionNotEnabled);
>         return false;
>     }
> 
>-    const Caps &caps = context->getCaps();
>-    if (static_cast<size_t>(location) >=
>-        (caps.maxVertexUniformVectors + caps.maxFragmentUniformVectors) * 4)
>+    UNIMPLEMENTED();
>+    return false;
>+}
>+
>+bool ValidateTexStorageMem2DEXT(Context *context,
>+                                TextureType target,
>+                                GLsizei levels,
>+                                GLenum internalFormat,
>+                                GLsizei width,
>+                                GLsizei height,
>+                                GLuint memory,
>+                                GLuint64 offset)
>+{
>+    if (!context->getExtensions().memoryObject)
>     {
>-        context->handleError(InvalidValue() << "Location must be less than "
>-                                               "(MAX_VERTEX_UNIFORM_VECTORS + "
>-                                               "MAX_FRAGMENT_UNIFORM_VECTORS) * 4");
>+        context->validationError(GL_INVALID_OPERATION, kExtensionNotEnabled);
>         return false;
>     }
> 
>-    // The WebGL spec (section 6.20) disallows strings containing invalid ESSL characters for
>-    // shader-related entry points
>-    if (context->getExtensions().webglCompatibility && !IsValidESSLString(name, strlen(name)))
>+    if (context->getClientMajorVersion() < 3)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidValue(), InvalidNameCharacters);
>-        return false;
>+        return ValidateES2TexStorageParameters(context, target, levels, internalFormat, width,
>+                                               height);
>     }
> 
>-    if (strncmp(name, "gl_", 3) == 0)
>+    ASSERT(context->getClientMajorVersion() >= 3);
>+    return ValidateES3TexStorage2DParameters(context, target, levels, internalFormat, width, height,
>+                                             1);
>+}
>+
>+bool ValidateTexStorageMem3DEXT(Context *context,
>+                                TextureType target,
>+                                GLsizei levels,
>+                                GLenum internalFormat,
>+                                GLsizei width,
>+                                GLsizei height,
>+                                GLsizei depth,
>+                                GLuint memory,
>+                                GLuint64 offset)
>+{
>+    if (!context->getExtensions().memoryObject)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidValue(), NameBeginsWithGL);
>+        context->validationError(GL_INVALID_OPERATION, kExtensionNotEnabled);
>         return false;
>     }
> 
>-    return true;
>+    UNIMPLEMENTED();
>+    return false;
> }
> 
>-bool ValidateCoverageModulationCHROMIUM(Context *context, GLenum components)
>+bool ValidateImportMemoryFdEXT(Context *context,
>+                               GLuint memory,
>+                               GLuint64 size,
>+                               HandleType handleType,
>+                               GLint fd)
> {
>-    if (!context->getExtensions().framebufferMixedSamples)
>+    if (!context->getExtensions().memoryObjectFd)
>     {
>-        context->handleError(InvalidOperation()
>-                             << "GL_CHROMIUM_framebuffer_mixed_samples is not available.");
>+        context->validationError(GL_INVALID_OPERATION, kExtensionNotEnabled);
>         return false;
>     }
>-    switch (components)
>+
>+    switch (handleType)
>     {
>-        case GL_RGB:
>-        case GL_RGBA:
>-        case GL_ALPHA:
>-        case GL_NONE:
>+        case HandleType::OpaqueFd:
>             break;
>         default:
>-            context->handleError(
>-                InvalidEnum()
>-                << "GLenum components is not one of GL_RGB, GL_RGBA, GL_ALPHA or GL_NONE.");
>+            context->validationError(GL_INVALID_ENUM, kInvalidHandleType);
>             return false;
>     }
> 
>     return true;
> }
> 
>-// CHROMIUM_path_rendering
>-
>-bool ValidateMatrix(Context *context, GLenum matrixMode, const GLfloat *matrix)
>+bool ValidateDeleteSemaphoresEXT(Context *context, GLsizei n, const GLuint *semaphores)
> {
>-    if (!context->getExtensions().pathRendering)
>+    if (!context->getExtensions().semaphore)
>     {
>-        context->handleError(InvalidOperation() << "GL_CHROMIUM_path_rendering is not available.");
>+        context->validationError(GL_INVALID_OPERATION, kExtensionNotEnabled);
>         return false;
>     }
>-    if (matrixMode != GL_PATH_MODELVIEW_CHROMIUM && matrixMode != GL_PATH_PROJECTION_CHROMIUM)
>+
>+    UNIMPLEMENTED();
>+    return false;
>+}
>+
>+bool ValidateGenSemaphoresEXT(Context *context, GLsizei n, GLuint *semaphores)
>+{
>+    if (!context->getExtensions().semaphore)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidEnum(), InvalidMatrixMode);
>+        context->validationError(GL_INVALID_OPERATION, kExtensionNotEnabled);
>         return false;
>     }
>-    if (matrix == nullptr)
>+
>+    UNIMPLEMENTED();
>+    return false;
>+}
>+
>+bool ValidateGetSemaphoreParameterui64vEXT(Context *context,
>+                                           GLuint semaphore,
>+                                           GLenum pname,
>+                                           GLuint64 *params)
>+{
>+    if (!context->getExtensions().semaphore)
>     {
>-        context->handleError(InvalidOperation() << "Invalid matrix.");
>+        context->validationError(GL_INVALID_OPERATION, kExtensionNotEnabled);
>         return false;
>     }
>-    return true;
>+
>+    UNIMPLEMENTED();
>+    return false;
> }
> 
>-bool ValidateMatrixMode(Context *context, GLenum matrixMode)
>+bool ValidateIsSemaphoreEXT(Context *context, GLuint semaphore)
> {
>-    if (!context->getExtensions().pathRendering)
>+    if (!context->getExtensions().semaphore)
>     {
>-        context->handleError(InvalidOperation() << "GL_CHROMIUM_path_rendering is not available.");
>+        context->validationError(GL_INVALID_OPERATION, kExtensionNotEnabled);
>         return false;
>     }
>-    if (matrixMode != GL_PATH_MODELVIEW_CHROMIUM && matrixMode != GL_PATH_PROJECTION_CHROMIUM)
>+
>+    UNIMPLEMENTED();
>+    return false;
>+}
>+
>+bool ValidateSemaphoreParameterui64vEXT(Context *context,
>+                                        GLuint semaphore,
>+                                        GLenum pname,
>+                                        const GLuint64 *params)
>+{
>+    if (!context->getExtensions().semaphore)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidEnum(), InvalidMatrixMode);
>+        context->validationError(GL_INVALID_OPERATION, kExtensionNotEnabled);
>         return false;
>     }
>-    return true;
>+
>+    UNIMPLEMENTED();
>+    return false;
> }
> 
>-bool ValidateGenPaths(Context *context, GLsizei range)
>+bool ValidateSignalSemaphoreEXT(Context *context,
>+                                GLuint semaphore,
>+                                GLuint numBufferBarriers,
>+                                const GLuint *buffers,
>+                                GLuint numTextureBarriers,
>+                                const GLuint *textures,
>+                                const GLenum *dstLayouts)
> {
>-    if (!context->getExtensions().pathRendering)
>+    if (!context->getExtensions().semaphore)
>     {
>-        context->handleError(InvalidOperation() << "GL_CHROMIUM_path_rendering is not available.");
>+        context->validationError(GL_INVALID_OPERATION, kExtensionNotEnabled);
>+        return false;
>+    }
>+
>+    UNIMPLEMENTED();
>+    return false;
>+}
>+
>+bool ValidateWaitSemaphoreEXT(Context *context,
>+                              GLuint semaphore,
>+                              GLuint numBufferBarriers,
>+                              const GLuint *buffers,
>+                              GLuint numTextureBarriers,
>+                              const GLuint *textures,
>+                              const GLenum *srcLayouts)
>+{
>+    if (!context->getExtensions().semaphore)
>+    {
>+        context->validationError(GL_INVALID_OPERATION, kExtensionNotEnabled);
>+        return false;
>+    }
>+
>+    UNIMPLEMENTED();
>+    return false;
>+}
>+
>+bool ValidateImportSemaphoreFdEXT(Context *context,
>+                                  GLuint semaphore,
>+                                  HandleType handleType,
>+                                  GLint fd)
>+{
>+    if (!context->getExtensions().semaphoreFd)
>+    {
>+        context->validationError(GL_INVALID_OPERATION, kExtensionNotEnabled);
>+        return false;
>+    }
>+
>+    UNIMPLEMENTED();
>+    return false;
>+}
>+
>+bool ValidateMapBufferBase(Context *context, BufferBinding target)
>+{
>+    Buffer *buffer = context->getState().getTargetBuffer(target);
>+    ASSERT(buffer != nullptr);
>+
>+    // Check if this buffer is currently being used as a transform feedback output buffer
>+    TransformFeedback *transformFeedback = context->getState().getCurrentTransformFeedback();
>+    if (transformFeedback != nullptr && transformFeedback->isActive())
>+    {
>+        for (size_t i = 0; i < transformFeedback->getIndexedBufferCount(); i++)
>+        {
>+            const auto &transformFeedbackBuffer = transformFeedback->getIndexedBuffer(i);
>+            if (transformFeedbackBuffer.get() == buffer)
>+            {
>+                context->validationError(GL_INVALID_OPERATION, kBufferBoundForTransformFeedback);
>+                return false;
>+            }
>+        }
>+    }
>+
>+    if (context->getExtensions().webglCompatibility &&
>+        buffer->isBoundForTransformFeedbackAndOtherUse())
>+    {
>+        context->validationError(GL_INVALID_OPERATION, kBufferBoundForTransformFeedback);
>+        return false;
>+    }
>+
>+    return true;
>+}
>+
>+bool ValidateFlushMappedBufferRangeEXT(Context *context,
>+                                       BufferBinding target,
>+                                       GLintptr offset,
>+                                       GLsizeiptr length)
>+{
>+    if (!context->getExtensions().mapBufferRange)
>+    {
>+        context->validationError(GL_INVALID_OPERATION, kExtensionNotEnabled);
>+        return false;
>+    }
>+
>+    return ValidateFlushMappedBufferRangeBase(context, target, offset, length);
>+}
>+
>+bool ValidateBindUniformLocationCHROMIUM(Context *context,
>+                                         GLuint program,
>+                                         GLint location,
>+                                         const GLchar *name)
>+{
>+    if (!context->getExtensions().bindUniformLocation)
>+    {
>+        context->validationError(GL_INVALID_OPERATION, kExtensionNotEnabled);
>+        return false;
>+    }
>+
>+    Program *programObject = GetValidProgram(context, program);
>+    if (!programObject)
>+    {
>+        return false;
>+    }
>+
>+    if (location < 0)
>+    {
>+        context->validationError(GL_INVALID_VALUE, kNegativeLocation);
>+        return false;
>+    }
>+
>+    const Caps &caps = context->getCaps();
>+    if (static_cast<size_t>(location) >=
>+        (caps.maxVertexUniformVectors + caps.maxFragmentUniformVectors) * 4)
>+    {
>+        context->validationError(GL_INVALID_VALUE, kInvalidBindUniformLocation);
>+        return false;
>+    }
>+
>+    // The WebGL spec (section 6.20) disallows strings containing invalid ESSL characters for
>+    // shader-related entry points
>+    if (context->getExtensions().webglCompatibility && !IsValidESSLString(name, strlen(name)))
>+    {
>+        context->validationError(GL_INVALID_VALUE, kInvalidNameCharacters);
>+        return false;
>+    }
>+
>+    if (strncmp(name, "gl_", 3) == 0)
>+    {
>+        context->validationError(GL_INVALID_VALUE, kNameBeginsWithGL);
>+        return false;
>+    }
>+
>+    return true;
>+}
>+
>+bool ValidateCoverageModulationCHROMIUM(Context *context, GLenum components)
>+{
>+    if (!context->getExtensions().framebufferMixedSamples)
>+    {
>+        context->validationError(GL_INVALID_OPERATION, kExtensionNotEnabled);
>+        return false;
>+    }
>+    switch (components)
>+    {
>+        case GL_RGB:
>+        case GL_RGBA:
>+        case GL_ALPHA:
>+        case GL_NONE:
>+            break;
>+        default:
>+            context->validationError(GL_INVALID_ENUM, kInvalidCoverageComponents);
>+            return false;
>+    }
>+
>+    return true;
>+}
>+
>+// CHROMIUM_path_rendering
>+
>+bool ValidateMatrixLoadfCHROMIUM(Context *context, GLenum matrixMode, const GLfloat *matrix)
>+{
>+    if (!ValidateMatrixMode(context, matrixMode))
>+    {
>+        return false;
>+    }
>+
>+    if (matrix == nullptr)
>+    {
>+        context->validationError(GL_INVALID_OPERATION, kInvalidPathMatrix);
>+        return false;
>+    }
>+
>+    return true;
>+}
>+
>+bool ValidateMatrixLoadIdentityCHROMIUM(Context *context, GLenum matrixMode)
>+{
>+    return ValidateMatrixMode(context, matrixMode);
>+}
>+
>+bool ValidateGenPathsCHROMIUM(Context *context, GLsizei range)
>+{
>+    if (!context->getExtensions().pathRendering)
>+    {
>+        context->validationError(GL_INVALID_OPERATION, kExtensionNotEnabled);
>         return false;
>     }
> 
>@@ -3120,24 +3478,24 @@ bool ValidateGenPaths(Context *context, GLsizei range)
>     // we add stricter semantic check here and require a non zero positive range.
>     if (range <= 0)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidValue(), InvalidRange);
>+        context->validationError(GL_INVALID_VALUE, kInvalidRange);
>         return false;
>     }
> 
>     if (!angle::IsValueInRangeForNumericType<std::uint32_t>(range))
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidOperation(), IntegerOverflow);
>+        context->validationError(GL_INVALID_OPERATION, kIntegerOverflow);
>         return false;
>     }
> 
>     return true;
> }
> 
>-bool ValidateDeletePaths(Context *context, GLuint path, GLsizei range)
>+bool ValidateDeletePathsCHROMIUM(Context *context, GLuint path, GLsizei range)
> {
>     if (!context->getExtensions().pathRendering)
>     {
>-        context->handleError(InvalidOperation() << "GL_CHROMIUM_path_rendering is not available.");
>+        context->validationError(GL_INVALID_OPERATION, kExtensionNotEnabled);
>         return false;
>     }
> 
>@@ -3145,7 +3503,7 @@ bool ValidateDeletePaths(Context *context, GLuint path, GLsizei range)
>     // we add stricter semantic check here and require a non zero positive range.
>     if (range <= 0)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidValue(), InvalidRange);
>+        context->validationError(GL_INVALID_VALUE, kInvalidRange);
>         return false;
>     }
> 
>@@ -3154,55 +3512,55 @@ bool ValidateDeletePaths(Context *context, GLuint path, GLsizei range)
> 
>     if (!angle::IsValueInRangeForNumericType<std::uint32_t>(range) || !checkedRange.IsValid())
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidOperation(), IntegerOverflow);
>+        context->validationError(GL_INVALID_OPERATION, kIntegerOverflow);
>         return false;
>     }
>     return true;
> }
> 
>-bool ValidatePathCommands(Context *context,
>-                          GLuint path,
>-                          GLsizei numCommands,
>-                          const GLubyte *commands,
>-                          GLsizei numCoords,
>-                          GLenum coordType,
>-                          const void *coords)
>+bool ValidatePathCommandsCHROMIUM(Context *context,
>+                                  GLuint path,
>+                                  GLsizei numCommands,
>+                                  const GLubyte *commands,
>+                                  GLsizei numCoords,
>+                                  GLenum coordType,
>+                                  const void *coords)
> {
>     if (!context->getExtensions().pathRendering)
>     {
>-        context->handleError(InvalidOperation() << "GL_CHROMIUM_path_rendering is not available.");
>+        context->validationError(GL_INVALID_OPERATION, kExtensionNotEnabled);
>         return false;
>     }
>-    if (!context->hasPath(path))
>+    if (!context->isPathGenerated(path))
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidOperation(), NoSuchPath);
>+        context->validationError(GL_INVALID_OPERATION, kNoSuchPath);
>         return false;
>     }
> 
>     if (numCommands < 0)
>     {
>-        context->handleError(InvalidValue() << "Invalid number of commands.");
>+        context->validationError(GL_INVALID_VALUE, kInvalidPathNumCommands);
>         return false;
>     }
>     else if (numCommands > 0)
>     {
>         if (!commands)
>         {
>-            context->handleError(InvalidValue() << "No commands array given.");
>+            context->validationError(GL_INVALID_VALUE, kInvalidPathCommandsArray);
>             return false;
>         }
>     }
> 
>     if (numCoords < 0)
>     {
>-        context->handleError(InvalidValue() << "Invalid number of coordinates.");
>+        context->validationError(GL_INVALID_VALUE, kInvalidPathNumCoords);
>         return false;
>     }
>     else if (numCoords > 0)
>     {
>         if (!coords)
>         {
>-            context->handleError(InvalidValue() << "No coordinate array given.");
>+            context->validationError(GL_INVALID_VALUE, kInvalidPathNumCoordsArray);
>             return false;
>         }
>     }
>@@ -3231,7 +3589,7 @@ bool ValidatePathCommands(Context *context,
>             break;
> 
>         default:
>-            context->handleError(InvalidEnum() << "Invalid coordinate type.");
>+            context->validationError(GL_INVALID_ENUM, kInvalidPathCoordinateType);
>             return false;
>     }
> 
>@@ -3239,7 +3597,7 @@ bool ValidatePathCommands(Context *context,
>     checkedSize += (coordTypeSize * numCoords);
>     if (!checkedSize.IsValid())
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidOperation(), IntegerOverflow);
>+        context->validationError(GL_INVALID_OPERATION, kIntegerOverflow);
>         return false;
>     }
> 
>@@ -3268,29 +3626,30 @@ bool ValidatePathCommands(Context *context,
>                 expectedNumCoords += 5;
>                 break;
>             default:
>-                context->handleError(InvalidEnum() << "Invalid command.");
>+                context->validationError(GL_INVALID_ENUM, kInvalidPathCommand);
>                 return false;
>         }
>     }
>+
>     if (expectedNumCoords != numCoords)
>     {
>-        context->handleError(InvalidValue() << "Invalid number of coordinates.");
>+        context->validationError(GL_INVALID_VALUE, kInvalidPathNumCoords);
>         return false;
>     }
> 
>     return true;
> }
> 
>-bool ValidateSetPathParameter(Context *context, GLuint path, GLenum pname, GLfloat value)
>+bool ValidatePathParameterfCHROMIUM(Context *context, GLuint path, GLenum pname, GLfloat value)
> {
>     if (!context->getExtensions().pathRendering)
>     {
>-        context->handleError(InvalidOperation() << "GL_CHROMIUM_path_rendering is not available.");
>+        context->validationError(GL_INVALID_OPERATION, kExtensionNotEnabled);
>         return false;
>     }
>-    if (!context->hasPath(path))
>+    if (!context->isPathGenerated(path))
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidOperation(), NoSuchPath);
>+        context->validationError(GL_INVALID_OPERATION, kNoSuchPath);
>         return false;
>     }
> 
>@@ -3299,7 +3658,7 @@ bool ValidateSetPathParameter(Context *context, GLuint path, GLenum pname, GLflo
>         case GL_PATH_STROKE_WIDTH_CHROMIUM:
>             if (value < 0.0f)
>             {
>-                context->handleError(InvalidValue() << "Invalid stroke width.");
>+                context->validationError(GL_INVALID_VALUE, kInvalidPathStrokeWidth);
>                 return false;
>             }
>             break;
>@@ -3311,7 +3670,7 @@ bool ValidateSetPathParameter(Context *context, GLuint path, GLenum pname, GLflo
>                 case GL_ROUND_CHROMIUM:
>                     break;
>                 default:
>-                    context->handleError(InvalidEnum() << "Invalid end caps.");
>+                    context->validationError(GL_INVALID_ENUM, kInvalidPathEndCaps);
>                     return false;
>             }
>             break;
>@@ -3323,13 +3682,14 @@ bool ValidateSetPathParameter(Context *context, GLuint path, GLenum pname, GLflo
>                 case GL_ROUND_CHROMIUM:
>                     break;
>                 default:
>-                    context->handleError(InvalidEnum() << "Invalid join style.");
>+                    context->validationError(GL_INVALID_ENUM, kInvalidPathJoinStyle);
>                     return false;
>             }
>+            break;
>         case GL_PATH_MITER_LIMIT_CHROMIUM:
>             if (value < 0.0f)
>             {
>-                context->handleError(InvalidValue() << "Invalid miter limit.");
>+                context->validationError(GL_INVALID_VALUE, kInvalidPathMiterLimit);
>                 return false;
>             }
>             break;
>@@ -3339,28 +3699,35 @@ bool ValidateSetPathParameter(Context *context, GLuint path, GLenum pname, GLflo
>             break;
> 
>         default:
>-            context->handleError(InvalidEnum() << "Invalid path parameter.");
>+            context->validationError(GL_INVALID_ENUM, kInvalidPathParameter);
>             return false;
>     }
>     return true;
> }
> 
>-bool ValidateGetPathParameter(Context *context, GLuint path, GLenum pname, GLfloat *value)
>+bool ValidatePathParameteriCHROMIUM(Context *context, GLuint path, GLenum pname, GLint value)
>+{
>+    // TODO(jmadill): Use proper clamping cast.
>+    return ValidatePathParameterfCHROMIUM(context, path, pname, static_cast<GLfloat>(value));
>+}
>+
>+bool ValidateGetPathParameterfvCHROMIUM(Context *context, GLuint path, GLenum pname, GLfloat *value)
> {
>     if (!context->getExtensions().pathRendering)
>     {
>-        context->handleError(InvalidOperation() << "GL_CHROMIUM_path_rendering is not available.");
>+        context->validationError(GL_INVALID_OPERATION, kExtensionNotEnabled);
>         return false;
>     }
> 
>-    if (!context->hasPath(path))
>+    if (!context->isPathGenerated(path))
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidOperation(), NoSuchPath);
>+        context->validationError(GL_INVALID_OPERATION, kNoSuchPath);
>         return false;
>     }
>+
>     if (!value)
>     {
>-        context->handleError(InvalidValue() << "No value array.");
>+        context->validationError(GL_INVALID_VALUE, kInvalidPathValueArray);
>         return false;
>     }
> 
>@@ -3374,18 +3741,24 @@ bool ValidateGetPathParameter(Context *context, GLuint path, GLenum pname, GLflo
>             break;
> 
>         default:
>-            context->handleError(InvalidEnum() << "Invalid path parameter.");
>+            context->validationError(GL_INVALID_ENUM, kInvalidPathParameter);
>             return false;
>     }
> 
>     return true;
> }
> 
>-bool ValidatePathStencilFunc(Context *context, GLenum func, GLint ref, GLuint mask)
>+bool ValidateGetPathParameterivCHROMIUM(Context *context, GLuint path, GLenum pname, GLint *value)
>+{
>+    return ValidateGetPathParameterfvCHROMIUM(context, path, pname,
>+                                              reinterpret_cast<GLfloat *>(value));
>+}
>+
>+bool ValidatePathStencilFuncCHROMIUM(Context *context, GLenum func, GLint ref, GLuint mask)
> {
>     if (!context->getExtensions().pathRendering)
>     {
>-        context->handleError(InvalidOperation() << "GL_CHROMIUM_path_rendering is not available.");
>+        context->validationError(GL_INVALID_OPERATION, kExtensionNotEnabled);
>         return false;
>     }
> 
>@@ -3401,7 +3774,7 @@ bool ValidatePathStencilFunc(Context *context, GLenum func, GLint ref, GLuint ma
>         case GL_NOTEQUAL:
>             break;
>         default:
>-            ANGLE_VALIDATION_ERR(context, InvalidEnum(), InvalidStencil);
>+            context->validationError(GL_INVALID_ENUM, kInvalidStencil);
>             return false;
>     }
> 
>@@ -3414,16 +3787,16 @@ bool ValidatePathStencilFunc(Context *context, GLenum func, GLint ref, GLuint ma
> // However if the path object exists but has not been specified any
> // commands then an error is generated.
> 
>-bool ValidateStencilFillPath(Context *context, GLuint path, GLenum fillMode, GLuint mask)
>+bool ValidateStencilFillPathCHROMIUM(Context *context, GLuint path, GLenum fillMode, GLuint mask)
> {
>     if (!context->getExtensions().pathRendering)
>     {
>-        context->handleError(InvalidOperation() << "GL_CHROMIUM_path_rendering is not available.");
>+        context->validationError(GL_INVALID_OPERATION, kExtensionNotEnabled);
>         return false;
>     }
>-    if (context->hasPath(path) && !context->hasPathData(path))
>+    if (context->isPathGenerated(path) && !context->isPath(path))
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidOperation(), NoSuchPath);
>+        context->validationError(GL_INVALID_OPERATION, kNoSuchPath);
>         return false;
>     }
> 
>@@ -3433,45 +3806,46 @@ bool ValidateStencilFillPath(Context *context, GLuint path, GLenum fillMode, GLu
>         case GL_COUNT_DOWN_CHROMIUM:
>             break;
>         default:
>-            ANGLE_VALIDATION_ERR(context, InvalidEnum(), InvalidFillMode);
>+            context->validationError(GL_INVALID_ENUM, kInvalidFillMode);
>             return false;
>     }
> 
>     if (!isPow2(mask + 1))
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidValue(), InvalidStencilBitMask);
>+        context->validationError(GL_INVALID_VALUE, kInvalidStencilBitMask);
>         return false;
>     }
> 
>     return true;
> }
> 
>-bool ValidateStencilStrokePath(Context *context, GLuint path, GLint reference, GLuint mask)
>+bool ValidateStencilStrokePathCHROMIUM(Context *context, GLuint path, GLint reference, GLuint mask)
> {
>     if (!context->getExtensions().pathRendering)
>     {
>-        context->handleError(InvalidOperation() << "GL_CHROMIUM_path_rendering is not available.");
>+        context->validationError(GL_INVALID_OPERATION, kExtensionNotEnabled);
>         return false;
>     }
>-    if (context->hasPath(path) && !context->hasPathData(path))
>+
>+    if (context->isPathGenerated(path) && !context->isPath(path))
>     {
>-        context->handleError(InvalidOperation() << "No such path or path has no data.");
>+        context->validationError(GL_INVALID_OPERATION, kNoPathOrNoPathData);
>         return false;
>     }
> 
>     return true;
> }
> 
>-bool ValidateCoverPath(Context *context, GLuint path, GLenum coverMode)
>+bool ValidateCoverPathCHROMIUM(Context *context, GLuint path, GLenum coverMode)
> {
>     if (!context->getExtensions().pathRendering)
>     {
>-        context->handleError(InvalidOperation() << "GL_CHROMIUM_path_rendering is not available.");
>+        context->validationError(GL_INVALID_OPERATION, kExtensionNotEnabled);
>         return false;
>     }
>-    if (context->hasPath(path) && !context->hasPathData(path))
>+    if (context->isPathGenerated(path) && !context->isPath(path))
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidOperation(), NoSuchPath);
>+        context->validationError(GL_INVALID_OPERATION, kNoSuchPath);
>         return false;
>     }
> 
>@@ -3481,50 +3855,60 @@ bool ValidateCoverPath(Context *context, GLuint path, GLenum coverMode)
>         case GL_BOUNDING_BOX_CHROMIUM:
>             break;
>         default:
>-            ANGLE_VALIDATION_ERR(context, InvalidEnum(), InvalidCoverMode);
>+            context->validationError(GL_INVALID_ENUM, kInvalidCoverMode);
>             return false;
>     }
>     return true;
> }
> 
>-bool ValidateStencilThenCoverFillPath(Context *context,
>-                                      GLuint path,
>-                                      GLenum fillMode,
>-                                      GLuint mask,
>-                                      GLenum coverMode)
>+bool ValidateCoverFillPathCHROMIUM(Context *context, GLuint path, GLenum coverMode)
>+{
>+    return ValidateCoverPathCHROMIUM(context, path, coverMode);
>+}
>+
>+bool ValidateCoverStrokePathCHROMIUM(Context *context, GLuint path, GLenum coverMode)
> {
>-    return ValidateStencilFillPath(context, path, fillMode, mask) &&
>-           ValidateCoverPath(context, path, coverMode);
>+    return ValidateCoverPathCHROMIUM(context, path, coverMode);
> }
> 
>-bool ValidateStencilThenCoverStrokePath(Context *context,
>-                                        GLuint path,
>-                                        GLint reference,
>-                                        GLuint mask,
>-                                        GLenum coverMode)
>+bool ValidateStencilThenCoverFillPathCHROMIUM(Context *context,
>+                                              GLuint path,
>+                                              GLenum fillMode,
>+                                              GLuint mask,
>+                                              GLenum coverMode)
> {
>-    return ValidateStencilStrokePath(context, path, reference, mask) &&
>-           ValidateCoverPath(context, path, coverMode);
>+    return ValidateStencilFillPathCHROMIUM(context, path, fillMode, mask) &&
>+           ValidateCoverPathCHROMIUM(context, path, coverMode);
> }
> 
>-bool ValidateIsPath(Context *context)
>+bool ValidateStencilThenCoverStrokePathCHROMIUM(Context *context,
>+                                                GLuint path,
>+                                                GLint reference,
>+                                                GLuint mask,
>+                                                GLenum coverMode)
>+{
>+    return ValidateStencilStrokePathCHROMIUM(context, path, reference, mask) &&
>+           ValidateCoverPathCHROMIUM(context, path, coverMode);
>+}
>+
>+bool ValidateIsPathCHROMIUM(Context *context, GLuint path)
> {
>     if (!context->getExtensions().pathRendering)
>     {
>-        context->handleError(InvalidOperation() << "GL_CHROMIUM_path_rendering is not available.");
>+        context->validationError(GL_INVALID_OPERATION, kExtensionNotEnabled);
>         return false;
>     }
>     return true;
> }
> 
>-bool ValidateCoverFillPathInstanced(Context *context,
>-                                    GLsizei numPaths,
>-                                    GLenum pathNameType,
>-                                    const void *paths,
>-                                    GLuint pathBase,
>-                                    GLenum coverMode,
>-                                    GLenum transformType,
>-                                    const GLfloat *transformValues)
>+bool ValidateCoverFillPathInstancedCHROMIUM(Context *context,
>+                                            GLsizei numPaths,
>+                                            GLenum pathNameType,
>+                                            const void *paths,
>+                                            GLuint pathBase,
>+                                            GLenum coverMode,
>+                                            GLenum transformType,
>+                                            const GLfloat *transformValues)
> {
>     if (!ValidateInstancedPathParameters(context, numPaths, pathNameType, paths, pathBase,
>                                          transformType, transformValues))
>@@ -3537,21 +3921,21 @@ bool ValidateCoverFillPathInstanced(Context *context,
>         case GL_BOUNDING_BOX_OF_BOUNDING_BOXES_CHROMIUM:
>             break;
>         default:
>-            ANGLE_VALIDATION_ERR(context, InvalidEnum(), InvalidCoverMode);
>+            context->validationError(GL_INVALID_ENUM, kInvalidCoverMode);
>             return false;
>     }
> 
>     return true;
> }
> 
>-bool ValidateCoverStrokePathInstanced(Context *context,
>-                                      GLsizei numPaths,
>-                                      GLenum pathNameType,
>-                                      const void *paths,
>-                                      GLuint pathBase,
>-                                      GLenum coverMode,
>-                                      GLenum transformType,
>-                                      const GLfloat *transformValues)
>+bool ValidateCoverStrokePathInstancedCHROMIUM(Context *context,
>+                                              GLsizei numPaths,
>+                                              GLenum pathNameType,
>+                                              const void *paths,
>+                                              GLuint pathBase,
>+                                              GLenum coverMode,
>+                                              GLenum transformType,
>+                                              const GLfloat *transformValues)
> {
>     if (!ValidateInstancedPathParameters(context, numPaths, pathNameType, paths, pathBase,
>                                          transformType, transformValues))
>@@ -3564,22 +3948,22 @@ bool ValidateCoverStrokePathInstanced(Context *context,
>         case GL_BOUNDING_BOX_OF_BOUNDING_BOXES_CHROMIUM:
>             break;
>         default:
>-            ANGLE_VALIDATION_ERR(context, InvalidEnum(), InvalidCoverMode);
>+            context->validationError(GL_INVALID_ENUM, kInvalidCoverMode);
>             return false;
>     }
> 
>     return true;
> }
> 
>-bool ValidateStencilFillPathInstanced(Context *context,
>-                                      GLsizei numPaths,
>-                                      GLenum pathNameType,
>-                                      const void *paths,
>-                                      GLuint pathBase,
>-                                      GLenum fillMode,
>-                                      GLuint mask,
>-                                      GLenum transformType,
>-                                      const GLfloat *transformValues)
>+bool ValidateStencilFillPathInstancedCHROMIUM(Context *context,
>+                                              GLsizei numPaths,
>+                                              GLenum pathNameType,
>+                                              const void *paths,
>+                                              GLuint pathBase,
>+                                              GLenum fillMode,
>+                                              GLuint mask,
>+                                              GLenum transformType,
>+                                              const GLfloat *transformValues)
> {
> 
>     if (!ValidateInstancedPathParameters(context, numPaths, pathNameType, paths, pathBase,
>@@ -3592,26 +3976,26 @@ bool ValidateStencilFillPathInstanced(Context *context,
>         case GL_COUNT_DOWN_CHROMIUM:
>             break;
>         default:
>-            ANGLE_VALIDATION_ERR(context, InvalidEnum(), InvalidFillMode);
>+            context->validationError(GL_INVALID_ENUM, kInvalidFillMode);
>             return false;
>     }
>     if (!isPow2(mask + 1))
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidValue(), InvalidStencilBitMask);
>+        context->validationError(GL_INVALID_VALUE, kInvalidStencilBitMask);
>         return false;
>     }
>     return true;
> }
> 
>-bool ValidateStencilStrokePathInstanced(Context *context,
>-                                        GLsizei numPaths,
>-                                        GLenum pathNameType,
>-                                        const void *paths,
>-                                        GLuint pathBase,
>-                                        GLint reference,
>-                                        GLuint mask,
>-                                        GLenum transformType,
>-                                        const GLfloat *transformValues)
>+bool ValidateStencilStrokePathInstancedCHROMIUM(Context *context,
>+                                                GLsizei numPaths,
>+                                                GLenum pathNameType,
>+                                                const void *paths,
>+                                                GLuint pathBase,
>+                                                GLint reference,
>+                                                GLuint mask,
>+                                                GLenum transformType,
>+                                                const GLfloat *transformValues)
> {
>     if (!ValidateInstancedPathParameters(context, numPaths, pathNameType, paths, pathBase,
>                                          transformType, transformValues))
>@@ -3622,16 +4006,16 @@ bool ValidateStencilStrokePathInstanced(Context *context,
>     return true;
> }
> 
>-bool ValidateStencilThenCoverFillPathInstanced(Context *context,
>-                                               GLsizei numPaths,
>-                                               GLenum pathNameType,
>-                                               const void *paths,
>-                                               GLuint pathBase,
>-                                               GLenum fillMode,
>-                                               GLuint mask,
>-                                               GLenum coverMode,
>-                                               GLenum transformType,
>-                                               const GLfloat *transformValues)
>+bool ValidateStencilThenCoverFillPathInstancedCHROMIUM(Context *context,
>+                                                       GLsizei numPaths,
>+                                                       GLenum pathNameType,
>+                                                       const void *paths,
>+                                                       GLuint pathBase,
>+                                                       GLenum fillMode,
>+                                                       GLuint mask,
>+                                                       GLenum coverMode,
>+                                                       GLenum transformType,
>+                                                       const GLfloat *transformValues)
> {
>     if (!ValidateInstancedPathParameters(context, numPaths, pathNameType, paths, pathBase,
>                                          transformType, transformValues))
>@@ -3644,7 +4028,7 @@ bool ValidateStencilThenCoverFillPathInstanced(Context *context,
>         case GL_BOUNDING_BOX_OF_BOUNDING_BOXES_CHROMIUM:
>             break;
>         default:
>-            ANGLE_VALIDATION_ERR(context, InvalidEnum(), InvalidCoverMode);
>+            context->validationError(GL_INVALID_ENUM, kInvalidCoverMode);
>             return false;
>     }
> 
>@@ -3654,28 +4038,28 @@ bool ValidateStencilThenCoverFillPathInstanced(Context *context,
>         case GL_COUNT_DOWN_CHROMIUM:
>             break;
>         default:
>-            ANGLE_VALIDATION_ERR(context, InvalidEnum(), InvalidFillMode);
>+            context->validationError(GL_INVALID_ENUM, kInvalidFillMode);
>             return false;
>     }
>     if (!isPow2(mask + 1))
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidValue(), InvalidStencilBitMask);
>+        context->validationError(GL_INVALID_VALUE, kInvalidStencilBitMask);
>         return false;
>     }
> 
>     return true;
> }
> 
>-bool ValidateStencilThenCoverStrokePathInstanced(Context *context,
>-                                                 GLsizei numPaths,
>-                                                 GLenum pathNameType,
>-                                                 const void *paths,
>-                                                 GLuint pathBase,
>-                                                 GLint reference,
>-                                                 GLuint mask,
>-                                                 GLenum coverMode,
>-                                                 GLenum transformType,
>-                                                 const GLfloat *transformValues)
>+bool ValidateStencilThenCoverStrokePathInstancedCHROMIUM(Context *context,
>+                                                         GLsizei numPaths,
>+                                                         GLenum pathNameType,
>+                                                         const void *paths,
>+                                                         GLuint pathBase,
>+                                                         GLint reference,
>+                                                         GLuint mask,
>+                                                         GLenum coverMode,
>+                                                         GLenum transformType,
>+                                                         const GLfloat *transformValues)
> {
>     if (!ValidateInstancedPathParameters(context, numPaths, pathNameType, paths, pathBase,
>                                          transformType, transformValues))
>@@ -3688,76 +4072,76 @@ bool ValidateStencilThenCoverStrokePathInstanced(Context *context,
>         case GL_BOUNDING_BOX_OF_BOUNDING_BOXES_CHROMIUM:
>             break;
>         default:
>-            ANGLE_VALIDATION_ERR(context, InvalidEnum(), InvalidCoverMode);
>+            context->validationError(GL_INVALID_ENUM, kInvalidCoverMode);
>             return false;
>     }
> 
>     return true;
> }
> 
>-bool ValidateBindFragmentInputLocation(Context *context,
>-                                       GLuint program,
>-                                       GLint location,
>-                                       const GLchar *name)
>+bool ValidateBindFragmentInputLocationCHROMIUM(Context *context,
>+                                               GLuint program,
>+                                               GLint location,
>+                                               const GLchar *name)
> {
>     if (!context->getExtensions().pathRendering)
>     {
>-        context->handleError(InvalidOperation() << "GL_CHROMIUM_path_rendering is not available.");
>+        context->validationError(GL_INVALID_OPERATION, kExtensionNotEnabled);
>         return false;
>     }
> 
>     const GLint MaxLocation = context->getCaps().maxVaryingVectors * 4;
>     if (location >= MaxLocation)
>     {
>-        context->handleError(InvalidValue() << "Location exceeds max varying.");
>+        context->validationError(GL_INVALID_VALUE, kInvalidVaryingLocation);
>         return false;
>     }
> 
>-    const auto *programObject = context->getProgram(program);
>+    const auto *programObject = context->getProgramNoResolveLink(program);
>     if (!programObject)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidOperation(), ProgramNotBound);
>+        context->validationError(GL_INVALID_OPERATION, kProgramNotBound);
>         return false;
>     }
> 
>     if (!name)
>     {
>-        context->handleError(InvalidValue() << "No name given.");
>+        context->validationError(GL_INVALID_VALUE, kMissingName);
>         return false;
>     }
> 
>     if (angle::BeginsWith(name, "gl_"))
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidOperation(), NameBeginsWithGL);
>+        context->validationError(GL_INVALID_OPERATION, kNameBeginsWithGL);
>         return false;
>     }
> 
>     return true;
> }
> 
>-bool ValidateProgramPathFragmentInputGen(Context *context,
>-                                         GLuint program,
>-                                         GLint location,
>-                                         GLenum genMode,
>-                                         GLint components,
>-                                         const GLfloat *coeffs)
>+bool ValidateProgramPathFragmentInputGenCHROMIUM(Context *context,
>+                                                 GLuint program,
>+                                                 GLint location,
>+                                                 GLenum genMode,
>+                                                 GLint components,
>+                                                 const GLfloat *coeffs)
> {
>     if (!context->getExtensions().pathRendering)
>     {
>-        context->handleError(InvalidOperation() << "GL_CHROMIUM_path_rendering is not available.");
>+        context->validationError(GL_INVALID_OPERATION, kExtensionNotEnabled);
>         return false;
>     }
> 
>-    const auto *programObject = context->getProgram(program);
>+    const auto *programObject = context->getProgramResolveLink(program);
>     if (!programObject || programObject->isFlaggedForDeletion())
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidOperation(), ProgramDoesNotExist);
>+        context->validationError(GL_INVALID_OPERATION, kProgramDoesNotExist);
>         return false;
>     }
> 
>     if (!programObject->isLinked())
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidOperation(), ProgramNotLinked);
>+        context->validationError(GL_INVALID_OPERATION, kProgramNotLinked);
>         return false;
>     }
> 
>@@ -3766,7 +4150,7 @@ bool ValidateProgramPathFragmentInputGen(Context *context,
>         case GL_NONE:
>             if (components != 0)
>             {
>-                context->handleError(InvalidValue() << "Invalid components.");
>+                context->validationError(GL_INVALID_VALUE, kInvalidComponents);
>                 return false;
>             }
>             break;
>@@ -3776,18 +4160,18 @@ bool ValidateProgramPathFragmentInputGen(Context *context,
>         case GL_CONSTANT_CHROMIUM:
>             if (components < 1 || components > 4)
>             {
>-                context->handleError(InvalidValue() << "Invalid components.");
>+                context->validationError(GL_INVALID_VALUE, kInvalidComponents);
>                 return false;
>             }
>             if (!coeffs)
>             {
>-                context->handleError(InvalidValue() << "No coefficients array given.");
>+                context->validationError(GL_INVALID_VALUE, kInvalidPathCoefficientsArray);
>                 return false;
>             }
>             break;
> 
>         default:
>-            context->handleError(InvalidEnum() << "Invalid gen mode.");
>+            context->validationError(GL_INVALID_ENUM, kInvalidPathGenMode);
>             return false;
>     }
> 
>@@ -3796,11 +4180,11 @@ bool ValidateProgramPathFragmentInputGen(Context *context,
>     if (location == -1)
>         return true;
> 
>-    const auto &binding = programObject->getFragmentInputBindingInfo(context, location);
>+    const auto &binding = programObject->getFragmentInputBindingInfo(location);
> 
>     if (!binding.valid)
>     {
>-        context->handleError(InvalidOperation() << "No such binding.");
>+        context->validationError(GL_INVALID_OPERATION, kInvalidFragmentInputBinding);
>         return false;
>     }
> 
>@@ -3822,14 +4206,12 @@ bool ValidateProgramPathFragmentInputGen(Context *context,
>                 expectedComponents = 4;
>                 break;
>             default:
>-                context->handleError(
>-                    InvalidOperation()
>-                    << "Fragment input type is not a floating point scalar or vector.");
>+                context->validationError(GL_INVALID_OPERATION, kFragmentInputTypeNotFloatingPoint);
>                 return false;
>         }
>         if (expectedComponents != components && genMode != GL_NONE)
>         {
>-            context->handleError(InvalidOperation() << "Unexpected number of components");
>+            context->validationError(GL_INVALID_OPERATION, kInvalidPathComponents);
>             return false;
>         }
>     }
>@@ -3839,7 +4221,7 @@ bool ValidateProgramPathFragmentInputGen(Context *context,
> bool ValidateCopyTextureCHROMIUM(Context *context,
>                                  GLuint sourceId,
>                                  GLint sourceLevel,
>-                                 GLenum destTarget,
>+                                 TextureTarget destTarget,
>                                  GLuint destId,
>                                  GLint destLevel,
>                                  GLint internalFormat,
>@@ -3850,30 +4232,30 @@ bool ValidateCopyTextureCHROMIUM(Context *context,
> {
>     if (!context->getExtensions().copyTexture)
>     {
>-        context->handleError(InvalidOperation()
>-                             << "GL_CHROMIUM_copy_texture extension not available.");
>+        context->validationError(GL_INVALID_OPERATION, kExtensionNotEnabled);
>         return false;
>     }
> 
>     const Texture *source = context->getTexture(sourceId);
>     if (source == nullptr)
>     {
>-        context->handleError(InvalidValue() << "Source texture is not a valid texture object.");
>+        context->validationError(GL_INVALID_VALUE, kInvalidSourceTexture);
>         return false;
>     }
> 
>-    if (!IsValidCopyTextureSourceTarget(context, source->getTarget()))
>+    if (!IsValidCopyTextureSourceTarget(context, source->getType()))
>     {
>-        context->handleError(InvalidValue() << "Source texture a valid texture type.");
>+        context->validationError(GL_INVALID_OPERATION, kInvalidInternalFormat);
>         return false;
>     }
> 
>-    GLenum sourceTarget = source->getTarget();
>-    ASSERT(sourceTarget != GL_TEXTURE_CUBE_MAP);
>+    TextureType sourceType = source->getType();
>+    ASSERT(sourceType != TextureType::CubeMap);
>+    TextureTarget sourceTarget = NonCubeTextureTypeToTarget(sourceType);
> 
>-    if (!IsValidCopyTextureSourceLevel(context, source->getTarget(), sourceLevel))
>+    if (!IsValidCopyTextureSourceLevel(context, sourceType, sourceLevel))
>     {
>-        context->handleError(InvalidValue() << "Source texture level is not valid.");
>+        context->validationError(GL_INVALID_VALUE, kInvalidSourceTextureLevel);
>         return false;
>     }
> 
>@@ -3881,60 +4263,57 @@ bool ValidateCopyTextureCHROMIUM(Context *context,
>     GLsizei sourceHeight = static_cast<GLsizei>(source->getHeight(sourceTarget, sourceLevel));
>     if (sourceWidth == 0 || sourceHeight == 0)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidOperation(), InvalidInternalFormat);
>+        context->validationError(GL_INVALID_OPERATION, kInvalidInternalFormat);
>         return false;
>     }
> 
>     const InternalFormat &sourceFormat = *source->getFormat(sourceTarget, sourceLevel).info;
>     if (!IsValidCopyTextureSourceInternalFormatEnum(sourceFormat.internalFormat))
>     {
>-        context->handleError(InvalidOperation() << "Source texture internal format is invalid.");
>+        context->validationError(GL_INVALID_OPERATION, kInvalidSourceTextureInternalFormat);
>         return false;
>     }
> 
>     if (!IsValidCopyTextureDestinationTargetEnum(context, destTarget))
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidEnum(), InvalidTextureTarget);
>+        context->validationError(GL_INVALID_ENUM, kInvalidTextureTarget);
>         return false;
>     }
> 
>     const Texture *dest = context->getTexture(destId);
>     if (dest == nullptr)
>     {
>-        context->handleError(InvalidValue()
>-                             << "Destination texture is not a valid texture object.");
>+        context->validationError(GL_INVALID_VALUE, kInvalidDestinationTexture);
>         return false;
>     }
> 
>-    if (!IsValidCopyTextureDestinationTarget(context, dest->getTarget(), destTarget))
>+    if (!IsValidCopyTextureDestinationTarget(context, dest->getType(), destTarget))
>     {
>-        context->handleError(InvalidValue() << "Destination texture a valid texture type.");
>+        context->validationError(GL_INVALID_VALUE, kInvalidDestinationTextureType);
>         return false;
>     }
> 
>-    if (!IsValidCopyTextureDestinationLevel(context, destTarget, destLevel, sourceWidth,
>-                                            sourceHeight))
>+    if (!IsValidCopyTextureDestinationLevel(context, dest->getType(), destLevel, sourceWidth,
>+                                            sourceHeight, false))
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidValue(), InvalidMipLevel);
>+        context->validationError(GL_INVALID_VALUE, kInvalidMipLevel);
>         return false;
>     }
> 
>     if (!IsValidCopyTextureDestinationFormatType(context, internalFormat, destType))
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidOperation(), MismatchedTypeAndFormat);
>         return false;
>     }
> 
>-    if (IsCubeMapTextureTarget(destTarget) && sourceWidth != sourceHeight)
>+    if (dest->getType() == TextureType::CubeMap && sourceWidth != sourceHeight)
>     {
>-        context->handleError(
>-            InvalidValue() << "Destination width and height must be equal for cube map textures.");
>+        context->validationError(GL_INVALID_VALUE, kCubemapFacesEqualDimensions);
>         return false;
>     }
> 
>     if (dest->getImmutableFormat())
>     {
>-        context->handleError(InvalidOperation() << "Destination texture is immutable.");
>+        context->validationError(GL_INVALID_OPERATION, kDestinationImmutable);
>         return false;
>     }
> 
>@@ -3944,7 +4323,7 @@ bool ValidateCopyTextureCHROMIUM(Context *context,
> bool ValidateCopySubTextureCHROMIUM(Context *context,
>                                     GLuint sourceId,
>                                     GLint sourceLevel,
>-                                    GLenum destTarget,
>+                                    TextureTarget destTarget,
>                                     GLuint destId,
>                                     GLint destLevel,
>                                     GLint xoffset,
>@@ -3959,119 +4338,115 @@ bool ValidateCopySubTextureCHROMIUM(Context *context,
> {
>     if (!context->getExtensions().copyTexture)
>     {
>-        context->handleError(InvalidOperation()
>-                             << "GL_CHROMIUM_copy_texture extension not available.");
>+        context->validationError(GL_INVALID_OPERATION, kExtensionNotEnabled);
>         return false;
>     }
> 
>     const Texture *source = context->getTexture(sourceId);
>     if (source == nullptr)
>     {
>-        context->handleError(InvalidValue() << "Source texture is not a valid texture object.");
>+        context->validationError(GL_INVALID_VALUE, kInvalidSourceTexture);
>         return false;
>     }
> 
>-    if (!IsValidCopyTextureSourceTarget(context, source->getTarget()))
>+    if (!IsValidCopyTextureSourceTarget(context, source->getType()))
>     {
>-        context->handleError(InvalidValue() << "Source texture a valid texture type.");
>+        context->validationError(GL_INVALID_VALUE, kInvalidSourceTextureType);
>         return false;
>     }
> 
>-    GLenum sourceTarget = source->getTarget();
>-    ASSERT(sourceTarget != GL_TEXTURE_CUBE_MAP);
>+    TextureType sourceType = source->getType();
>+    ASSERT(sourceType != TextureType::CubeMap);
>+    TextureTarget sourceTarget = NonCubeTextureTypeToTarget(sourceType);
> 
>-    if (!IsValidCopyTextureSourceLevel(context, source->getTarget(), sourceLevel))
>+    if (!IsValidCopyTextureSourceLevel(context, sourceType, sourceLevel))
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidValue(), InvalidMipLevel);
>+        context->validationError(GL_INVALID_VALUE, kInvalidMipLevel);
>         return false;
>     }
> 
>     if (source->getWidth(sourceTarget, sourceLevel) == 0 ||
>         source->getHeight(sourceTarget, sourceLevel) == 0)
>     {
>-        context->handleError(InvalidValue()
>-                             << "The source level of the source texture must be defined.");
>+        context->validationError(GL_INVALID_VALUE, kInvalidSourceTextureLevel);
>         return false;
>     }
> 
>     if (x < 0 || y < 0)
>     {
>-        context->handleError(InvalidValue() << "x and y cannot be negative.");
>+        context->validationError(GL_INVALID_VALUE, kNegativeOffset);
>         return false;
>     }
> 
>     if (width < 0 || height < 0)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidValue(), NegativeSize);
>+        context->validationError(GL_INVALID_VALUE, kNegativeSize);
>         return false;
>     }
> 
>     if (static_cast<size_t>(x + width) > source->getWidth(sourceTarget, sourceLevel) ||
>         static_cast<size_t>(y + height) > source->getHeight(sourceTarget, sourceLevel))
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidValue(), SourceTextureTooSmall);
>+        context->validationError(GL_INVALID_VALUE, kSourceTextureTooSmall);
>         return false;
>     }
> 
>     const Format &sourceFormat = source->getFormat(sourceTarget, sourceLevel);
>     if (!IsValidCopySubTextureSourceInternalFormat(sourceFormat.info->internalFormat))
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidOperation(), InvalidInternalFormat);
>+        context->validationError(GL_INVALID_OPERATION, kInvalidInternalFormat);
>         return false;
>     }
> 
>     if (!IsValidCopyTextureDestinationTargetEnum(context, destTarget))
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidEnum(), InvalidTextureTarget);
>+        context->validationError(GL_INVALID_ENUM, kInvalidTextureTarget);
>         return false;
>     }
> 
>     const Texture *dest = context->getTexture(destId);
>     if (dest == nullptr)
>     {
>-        context->handleError(InvalidValue()
>-                             << "Destination texture is not a valid texture object.");
>+        context->validationError(GL_INVALID_VALUE, kInvalidDestinationTexture);
>         return false;
>     }
> 
>-    if (!IsValidCopyTextureDestinationTarget(context, dest->getTarget(), destTarget))
>+    if (!IsValidCopyTextureDestinationTarget(context, dest->getType(), destTarget))
>     {
>-        context->handleError(InvalidValue() << "Destination texture a valid texture type.");
>+        context->validationError(GL_INVALID_VALUE, kInvalidDestinationTextureType);
>         return false;
>     }
> 
>-    if (!IsValidCopyTextureDestinationLevel(context, destTarget, destLevel, width, height))
>+    if (!IsValidCopyTextureDestinationLevel(context, dest->getType(), destLevel, width, height,
>+                                            true))
>     {
>-        context->handleError(InvalidValue() << "Destination texture level is not valid.");
>+        context->validationError(GL_INVALID_VALUE, kInvalidMipLevel);
>         return false;
>     }
> 
>     if (dest->getWidth(destTarget, destLevel) == 0 || dest->getHeight(destTarget, destLevel) == 0)
>     {
>-        context
>-            ->handleError(InvalidOperation()
>-                          << "The destination level of the destination texture must be defined.");
>+        context->validationError(GL_INVALID_OPERATION, kDestinationLevelNotDefined);
>         return false;
>     }
> 
>     const InternalFormat &destFormat = *dest->getFormat(destTarget, destLevel).info;
>     if (!IsValidCopySubTextureDestionationInternalFormat(destFormat.internalFormat))
>     {
>-        context->handleError(InvalidOperation()
>-                             << "Destination internal format and type combination is not valid.");
>+        context->validationError(GL_INVALID_OPERATION, kInvalidFormatCombination);
>         return false;
>     }
> 
>     if (xoffset < 0 || yoffset < 0)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidValue(), NegativeOffset);
>+        context->validationError(GL_INVALID_VALUE, kNegativeOffset);
>         return false;
>     }
> 
>     if (static_cast<size_t>(xoffset + width) > dest->getWidth(destTarget, destLevel) ||
>         static_cast<size_t>(yoffset + height) > dest->getHeight(destTarget, destLevel))
>     {
>-        context->handleError(InvalidValue() << "Destination texture not large enough to copy to.");
>+        context->validationError(GL_INVALID_VALUE, kOffsetOverflow);
>         return false;
>     }
> 
>@@ -4082,94 +4457,91 @@ bool ValidateCompressedCopyTextureCHROMIUM(Context *context, GLuint sourceId, GL
> {
>     if (!context->getExtensions().copyCompressedTexture)
>     {
>-        context->handleError(InvalidOperation()
>-                             << "GL_CHROMIUM_copy_compressed_texture extension not available.");
>+        context->validationError(GL_INVALID_OPERATION, kExtensionNotEnabled);
>         return false;
>     }
> 
>     const gl::Texture *source = context->getTexture(sourceId);
>     if (source == nullptr)
>     {
>-        context->handleError(InvalidValue() << "Source texture is not a valid texture object.");
>+        context->validationError(GL_INVALID_VALUE, kInvalidSourceTexture);
>         return false;
>     }
> 
>-    if (source->getTarget() != GL_TEXTURE_2D)
>+    if (source->getType() != TextureType::_2D)
>     {
>-        context->handleError(InvalidValue() << "Source texture must be of type GL_TEXTURE_2D.");
>+        context->validationError(GL_INVALID_VALUE, kInvalidSourceTextureType);
>         return false;
>     }
> 
>-    if (source->getWidth(GL_TEXTURE_2D, 0) == 0 || source->getHeight(GL_TEXTURE_2D, 0) == 0)
>+    if (source->getWidth(TextureTarget::_2D, 0) == 0 ||
>+        source->getHeight(TextureTarget::_2D, 0) == 0)
>     {
>-        context->handleError(InvalidValue() << "Source texture must level 0 defined.");
>+        context->validationError(GL_INVALID_VALUE, kSourceTextureLevelZeroDefined);
>         return false;
>     }
> 
>-    const gl::Format &sourceFormat = source->getFormat(GL_TEXTURE_2D, 0);
>+    const gl::Format &sourceFormat = source->getFormat(TextureTarget::_2D, 0);
>     if (!sourceFormat.info->compressed)
>     {
>-        context->handleError(InvalidOperation()
>-                             << "Source texture must have a compressed internal format.");
>+        context->validationError(GL_INVALID_OPERATION, kSourceTextureMustBeCompressed);
>         return false;
>     }
> 
>     const gl::Texture *dest = context->getTexture(destId);
>     if (dest == nullptr)
>     {
>-        context->handleError(InvalidValue()
>-                             << "Destination texture is not a valid texture object.");
>+        context->validationError(GL_INVALID_VALUE, kInvalidDestinationTexture);
>         return false;
>     }
> 
>-    if (dest->getTarget() != GL_TEXTURE_2D)
>+    if (dest->getType() != TextureType::_2D)
>     {
>-        context->handleError(InvalidValue()
>-                             << "Destination texture must be of type GL_TEXTURE_2D.");
>+        context->validationError(GL_INVALID_VALUE, kInvalidDestinationTextureType);
>         return false;
>     }
> 
>     if (dest->getImmutableFormat())
>     {
>-        context->handleError(InvalidOperation() << "Destination cannot be immutable.");
>+        context->validationError(GL_INVALID_OPERATION, kDestinationImmutable);
>         return false;
>     }
> 
>     return true;
> }
> 
>-bool ValidateCreateShader(Context *context, GLenum type)
>+bool ValidateCreateShader(Context *context, ShaderType type)
> {
>     switch (type)
>     {
>-        case GL_VERTEX_SHADER:
>-        case GL_FRAGMENT_SHADER:
>+        case ShaderType::Vertex:
>+        case ShaderType::Fragment:
>             break;
> 
>-        case GL_COMPUTE_SHADER:
>+        case ShaderType::Compute:
>             if (context->getClientVersion() < Version(3, 1))
>             {
>-                ANGLE_VALIDATION_ERR(context, InvalidEnum(), ES31Required);
>+                context->validationError(GL_INVALID_ENUM, kES31Required);
>                 return false;
>             }
>             break;
> 
>-        case GL_GEOMETRY_SHADER_EXT:
>+        case ShaderType::Geometry:
>             if (!context->getExtensions().geometryShader)
>             {
>-                ANGLE_VALIDATION_ERR(context, InvalidEnum(), InvalidShaderType);
>+                context->validationError(GL_INVALID_ENUM, kInvalidShaderType);
>                 return false;
>             }
>             break;
>         default:
>-            ANGLE_VALIDATION_ERR(context, InvalidEnum(), InvalidShaderType);
>+            context->validationError(GL_INVALID_ENUM, kInvalidShaderType);
>             return false;
>     }
> 
>     return true;
> }
> 
>-bool ValidateBufferData(ValidationContext *context,
>+bool ValidateBufferData(Context *context,
>                         BufferBinding target,
>                         GLsizeiptr size,
>                         const void *data,
>@@ -4177,7 +4549,7 @@ bool ValidateBufferData(ValidationContext *context,
> {
>     if (size < 0)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidValue(), NegativeSize);
>+        context->validationError(GL_INVALID_VALUE, kNegativeSize);
>         return false;
>     }
> 
>@@ -4196,34 +4568,41 @@ bool ValidateBufferData(ValidationContext *context,
>         case BufferUsage::DynamicCopy:
>             if (context->getClientMajorVersion() < 3)
>             {
>-                ANGLE_VALIDATION_ERR(context, InvalidEnum(), InvalidBufferUsage);
>+                context->validationError(GL_INVALID_ENUM, kInvalidBufferUsage);
>                 return false;
>             }
>             break;
> 
>         default:
>-            ANGLE_VALIDATION_ERR(context, InvalidEnum(), InvalidBufferUsage);
>+            context->validationError(GL_INVALID_ENUM, kInvalidBufferUsage);
>             return false;
>     }
> 
>-    if (!ValidBufferType(context, target))
>+    if (!context->isValidBufferBinding(target))
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidEnum(), InvalidBufferTypes);
>+        context->validationError(GL_INVALID_ENUM, kInvalidBufferTypes);
>         return false;
>     }
> 
>-    Buffer *buffer = context->getGLState().getTargetBuffer(target);
>+    Buffer *buffer = context->getState().getTargetBuffer(target);
> 
>     if (!buffer)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidOperation(), BufferNotBound);
>+        context->validationError(GL_INVALID_OPERATION, kBufferNotBound);
>+        return false;
>+    }
>+
>+    if (context->getExtensions().webglCompatibility &&
>+        buffer->isBoundForTransformFeedbackAndOtherUse())
>+    {
>+        context->validationError(GL_INVALID_OPERATION, kBufferBoundForTransformFeedback);
>         return false;
>     }
> 
>     return true;
> }
> 
>-bool ValidateBufferSubData(ValidationContext *context,
>+bool ValidateBufferSubData(Context *context,
>                            BufferBinding target,
>                            GLintptr offset,
>                            GLsizeiptr size,
>@@ -4231,33 +4610,40 @@ bool ValidateBufferSubData(ValidationContext *context,
> {
>     if (size < 0)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidValue(), NegativeSize);
>+        context->validationError(GL_INVALID_VALUE, kNegativeSize);
>         return false;
>     }
> 
>     if (offset < 0)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidValue(), NegativeOffset);
>+        context->validationError(GL_INVALID_VALUE, kNegativeOffset);
>         return false;
>     }
> 
>-    if (!ValidBufferType(context, target))
>+    if (!context->isValidBufferBinding(target))
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidEnum(), InvalidBufferTypes);
>+        context->validationError(GL_INVALID_ENUM, kInvalidBufferTypes);
>         return false;
>     }
> 
>-    Buffer *buffer = context->getGLState().getTargetBuffer(target);
>+    Buffer *buffer = context->getState().getTargetBuffer(target);
> 
>     if (!buffer)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidOperation(), BufferNotBound);
>+        context->validationError(GL_INVALID_OPERATION, kBufferNotBound);
>         return false;
>     }
> 
>     if (buffer->isMapped())
>     {
>-        context->handleError(InvalidOperation());
>+        context->validationError(GL_INVALID_OPERATION, kBufferMapped);
>+        return false;
>+    }
>+
>+    if (context->getExtensions().webglCompatibility &&
>+        buffer->isBoundForTransformFeedbackAndOtherUse())
>+    {
>+        context->validationError(GL_INVALID_OPERATION, kBufferBoundForTransformFeedback);
>         return false;
>     }
> 
>@@ -4266,13 +4652,13 @@ bool ValidateBufferSubData(ValidationContext *context,
>     checkedSize += offset;
>     if (!checkedSize.IsValid())
>     {
>-        context->handleError(OutOfMemory());
>+        context->validationError(GL_INVALID_VALUE, kParamOverflow);
>         return false;
>     }
> 
>     if (size + offset > buffer->getSize())
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidValue(), InsufficientBufferSize);
>+        context->validationError(GL_INVALID_VALUE, kInsufficientBufferSize);
>         return false;
>     }
> 
>@@ -4283,32 +4669,37 @@ bool ValidateRequestExtensionANGLE(Context *context, const GLchar *name)
> {
>     if (!context->getExtensions().requestExtension)
>     {
>-        context->handleError(InvalidOperation() << "GL_ANGLE_request_extension is not available.");
>+        context->validationError(GL_INVALID_OPERATION, kExtensionNotEnabled);
>         return false;
>     }
> 
>     if (!context->isExtensionRequestable(name))
>     {
>-        context->handleError(InvalidOperation() << "Extension " << name << " is not requestable.");
>+        context->validationError(GL_INVALID_OPERATION, kExtensionNotRequestable);
>         return false;
>     }
> 
>     return true;
> }
> 
>-bool ValidateActiveTexture(ValidationContext *context, GLenum texture)
>+bool ValidateActiveTexture(Context *context, GLenum texture)
> {
>+    if (context->getClientMajorVersion() < 2)
>+    {
>+        return ValidateMultitextureUnit(context, texture);
>+    }
>+
>     if (texture < GL_TEXTURE0 ||
>         texture > GL_TEXTURE0 + context->getCaps().maxCombinedTextureImageUnits - 1)
>     {
>-        context->handleError(InvalidEnum());
>+        context->validationError(GL_INVALID_ENUM, kInvalidCombinedImageUnit);
>         return false;
>     }
> 
>     return true;
> }
> 
>-bool ValidateAttachShader(ValidationContext *context, GLuint program, GLuint shader)
>+bool ValidateAttachShader(Context *context, GLuint program, GLuint shader)
> {
>     Program *programObject = GetValidProgram(context, program);
>     if (!programObject)
>@@ -4322,66 +4713,26 @@ bool ValidateAttachShader(ValidationContext *context, GLuint program, GLuint sha
>         return false;
>     }
> 
>-    switch (shaderObject->getType())
>+    if (programObject->getAttachedShader(shaderObject->getType()))
>     {
>-        case GL_VERTEX_SHADER:
>-        {
>-            if (programObject->getAttachedVertexShader())
>-            {
>-                ANGLE_VALIDATION_ERR(context, InvalidOperation(), ShaderAttachmentHasShader);
>-                return false;
>-            }
>-            break;
>-        }
>-        case GL_FRAGMENT_SHADER:
>-        {
>-            if (programObject->getAttachedFragmentShader())
>-            {
>-                ANGLE_VALIDATION_ERR(context, InvalidOperation(), ShaderAttachmentHasShader);
>-                return false;
>-            }
>-            break;
>-        }
>-        case GL_COMPUTE_SHADER:
>-        {
>-            if (programObject->getAttachedComputeShader())
>-            {
>-                ANGLE_VALIDATION_ERR(context, InvalidOperation(), ShaderAttachmentHasShader);
>-                return false;
>-            }
>-            break;
>-        }
>-        case GL_GEOMETRY_SHADER_EXT:
>-        {
>-            if (programObject->getAttachedGeometryShader())
>-            {
>-                ANGLE_VALIDATION_ERR(context, InvalidOperation(), ShaderAttachmentHasShader);
>-                return false;
>-            }
>-            break;
>-        }
>-        default:
>-            UNREACHABLE();
>-            break;
>+        context->validationError(GL_INVALID_OPERATION, kShaderAttachmentHasShader);
>+        return false;
>     }
> 
>     return true;
> }
> 
>-bool ValidateBindAttribLocation(ValidationContext *context,
>-                                GLuint program,
>-                                GLuint index,
>-                                const GLchar *name)
>+bool ValidateBindAttribLocation(Context *context, GLuint program, GLuint index, const GLchar *name)
> {
>     if (index >= MAX_VERTEX_ATTRIBS)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidValue(), IndexExceedsMaxVertexAttribute);
>+        context->validationError(GL_INVALID_VALUE, kIndexExceedsMaxVertexAttribute);
>         return false;
>     }
> 
>     if (strncmp(name, "gl_", 3) == 0)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidOperation(), NameBeginsWithGL);
>+        context->validationError(GL_INVALID_OPERATION, kNameBeginsWithGL);
>         return false;
>     }
> 
>@@ -4393,7 +4744,7 @@ bool ValidateBindAttribLocation(ValidationContext *context,
>         {
>             // The WebGL spec (section 6.20) disallows strings containing invalid ESSL characters
>             // for shader-related entry points
>-            ANGLE_VALIDATION_ERR(context, InvalidValue(), InvalidNameCharacters);
>+            context->validationError(GL_INVALID_VALUE, kInvalidNameCharacters);
>             return false;
>         }
> 
>@@ -4406,61 +4757,43 @@ bool ValidateBindAttribLocation(ValidationContext *context,
>     return GetValidProgram(context, program) != nullptr;
> }
> 
>-bool ValidateBindBuffer(ValidationContext *context, BufferBinding target, GLuint buffer)
>-{
>-    if (!ValidBufferType(context, target))
>-    {
>-        ANGLE_VALIDATION_ERR(context, InvalidEnum(), InvalidBufferTypes);
>-        return false;
>-    }
>-
>-    if (!context->getGLState().isBindGeneratesResourceEnabled() &&
>-        !context->isBufferGenerated(buffer))
>-    {
>-        ANGLE_VALIDATION_ERR(context, InvalidOperation(), ObjectNotGenerated);
>-        return false;
>-    }
>-
>-    return true;
>-}
>-
>-bool ValidateBindFramebuffer(ValidationContext *context, GLenum target, GLuint framebuffer)
>+bool ValidateBindFramebuffer(Context *context, GLenum target, GLuint framebuffer)
> {
>     if (!ValidFramebufferTarget(context, target))
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidEnum(), InvalidFramebufferTarget);
>+        context->validationError(GL_INVALID_ENUM, kInvalidFramebufferTarget);
>         return false;
>     }
> 
>-    if (!context->getGLState().isBindGeneratesResourceEnabled() &&
>+    if (!context->getState().isBindGeneratesResourceEnabled() &&
>         !context->isFramebufferGenerated(framebuffer))
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidOperation(), ObjectNotGenerated);
>+        context->validationError(GL_INVALID_OPERATION, kObjectNotGenerated);
>         return false;
>     }
> 
>     return true;
> }
> 
>-bool ValidateBindRenderbuffer(ValidationContext *context, GLenum target, GLuint renderbuffer)
>+bool ValidateBindRenderbuffer(Context *context, GLenum target, GLuint renderbuffer)
> {
>     if (target != GL_RENDERBUFFER)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidEnum(), InvalidRenderbufferTarget);
>+        context->validationError(GL_INVALID_ENUM, kInvalidRenderbufferTarget);
>         return false;
>     }
> 
>-    if (!context->getGLState().isBindGeneratesResourceEnabled() &&
>+    if (!context->getState().isBindGeneratesResourceEnabled() &&
>         !context->isRenderbufferGenerated(renderbuffer))
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidOperation(), ObjectNotGenerated);
>+        context->validationError(GL_INVALID_OPERATION, kObjectNotGenerated);
>         return false;
>     }
> 
>     return true;
> }
> 
>-static bool ValidBlendEquationMode(const ValidationContext *context, GLenum mode)
>+static bool ValidBlendEquationMode(const Context *context, GLenum mode)
> {
>     switch (mode)
>     {
>@@ -4478,129 +4811,71 @@ static bool ValidBlendEquationMode(const ValidationContext *context, GLenum mode
>     }
> }
> 
>-bool ValidateBlendColor(ValidationContext *context,
>-                        GLfloat red,
>-                        GLfloat green,
>-                        GLfloat blue,
>-                        GLfloat alpha)
>+bool ValidateBlendColor(Context *context, GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha)
> {
>     return true;
> }
> 
>-bool ValidateBlendEquation(ValidationContext *context, GLenum mode)
>+bool ValidateBlendEquation(Context *context, GLenum mode)
> {
>     if (!ValidBlendEquationMode(context, mode))
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidEnum(), InvalidBlendEquation);
>+        context->validationError(GL_INVALID_ENUM, kInvalidBlendEquation);
>         return false;
>     }
> 
>     return true;
> }
> 
>-bool ValidateBlendEquationSeparate(ValidationContext *context, GLenum modeRGB, GLenum modeAlpha)
>+bool ValidateBlendEquationSeparate(Context *context, GLenum modeRGB, GLenum modeAlpha)
> {
>     if (!ValidBlendEquationMode(context, modeRGB))
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidEnum(), InvalidBlendEquation);
>+        context->validationError(GL_INVALID_ENUM, kInvalidBlendEquation);
>         return false;
>     }
> 
>     if (!ValidBlendEquationMode(context, modeAlpha))
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidEnum(), InvalidBlendEquation);
>+        context->validationError(GL_INVALID_ENUM, kInvalidBlendEquation);
>         return false;
>     }
> 
>     return true;
> }
> 
>-bool ValidateBlendFunc(ValidationContext *context, GLenum sfactor, GLenum dfactor)
>+bool ValidateBlendFunc(Context *context, GLenum sfactor, GLenum dfactor)
> {
>     return ValidateBlendFuncSeparate(context, sfactor, dfactor, sfactor, dfactor);
> }
> 
>-static bool ValidSrcBlendFunc(GLenum srcBlend)
>+bool ValidateBlendFuncSeparate(Context *context,
>+                               GLenum srcRGB,
>+                               GLenum dstRGB,
>+                               GLenum srcAlpha,
>+                               GLenum dstAlpha)
> {
>-    switch (srcBlend)
>+    if (!ValidSrcBlendFunc(context, srcRGB))
>     {
>-        case GL_ZERO:
>-        case GL_ONE:
>-        case GL_SRC_COLOR:
>-        case GL_ONE_MINUS_SRC_COLOR:
>-        case GL_DST_COLOR:
>-        case GL_ONE_MINUS_DST_COLOR:
>-        case GL_SRC_ALPHA:
>-        case GL_ONE_MINUS_SRC_ALPHA:
>-        case GL_DST_ALPHA:
>-        case GL_ONE_MINUS_DST_ALPHA:
>-        case GL_CONSTANT_COLOR:
>-        case GL_ONE_MINUS_CONSTANT_COLOR:
>-        case GL_CONSTANT_ALPHA:
>-        case GL_ONE_MINUS_CONSTANT_ALPHA:
>-        case GL_SRC_ALPHA_SATURATE:
>-            return true;
>+        context->validationError(GL_INVALID_ENUM, kInvalidBlendFunction);
>+        return false;
>+    }
> 
>-        default:
>-            return false;
>+    if (!ValidDstBlendFunc(context, dstRGB))
>+    {
>+        context->validationError(GL_INVALID_ENUM, kInvalidBlendFunction);
>+        return false;
>     }
>-}
> 
>-static bool ValidDstBlendFunc(GLenum dstBlend, GLint contextMajorVersion)
>-{
>-    switch (dstBlend)
>+    if (!ValidSrcBlendFunc(context, srcAlpha))
>     {
>-        case GL_ZERO:
>-        case GL_ONE:
>-        case GL_SRC_COLOR:
>-        case GL_ONE_MINUS_SRC_COLOR:
>-        case GL_DST_COLOR:
>-        case GL_ONE_MINUS_DST_COLOR:
>-        case GL_SRC_ALPHA:
>-        case GL_ONE_MINUS_SRC_ALPHA:
>-        case GL_DST_ALPHA:
>-        case GL_ONE_MINUS_DST_ALPHA:
>-        case GL_CONSTANT_COLOR:
>-        case GL_ONE_MINUS_CONSTANT_COLOR:
>-        case GL_CONSTANT_ALPHA:
>-        case GL_ONE_MINUS_CONSTANT_ALPHA:
>-            return true;
>-
>-        case GL_SRC_ALPHA_SATURATE:
>-            return (contextMajorVersion >= 3);
>-
>-        default:
>-            return false;
>-    }
>-}
>-
>-bool ValidateBlendFuncSeparate(ValidationContext *context,
>-                               GLenum srcRGB,
>-                               GLenum dstRGB,
>-                               GLenum srcAlpha,
>-                               GLenum dstAlpha)
>-{
>-    if (!ValidSrcBlendFunc(srcRGB))
>-    {
>-        ANGLE_VALIDATION_ERR(context, InvalidEnum(), InvalidBlendFunction);
>-        return false;
>-    }
>-
>-    if (!ValidDstBlendFunc(dstRGB, context->getClientMajorVersion()))
>-    {
>-        ANGLE_VALIDATION_ERR(context, InvalidEnum(), InvalidBlendFunction);
>+        context->validationError(GL_INVALID_ENUM, kInvalidBlendFunction);
>         return false;
>     }
> 
>-    if (!ValidSrcBlendFunc(srcAlpha))
>+    if (!ValidDstBlendFunc(context, dstAlpha))
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidEnum(), InvalidBlendFunction);
>-        return false;
>-    }
>-
>-    if (!ValidDstBlendFunc(dstAlpha, context->getClientMajorVersion()))
>-    {
>-        ANGLE_VALIDATION_ERR(context, InvalidEnum(), InvalidBlendFunction);
>+        context->validationError(GL_INVALID_ENUM, kInvalidBlendFunction);
>         return false;
>     }
> 
>@@ -4617,20 +4892,14 @@ bool ValidateBlendFuncSeparate(ValidationContext *context,
> 
>         if (constantColorUsed && constantAlphaUsed)
>         {
>-            const char *msg;
>             if (context->getExtensions().webglCompatibility)
>             {
>-                msg = kErrorInvalidConstantColor;
>-            }
>-            else
>-            {
>-                msg =
>-                    "Simultaneous use of GL_CONSTANT_ALPHA/GL_ONE_MINUS_CONSTANT_ALPHA and "
>-                    "GL_CONSTANT_COLOR/GL_ONE_MINUS_CONSTANT_COLOR not supported by this "
>-                    "implementation.";
>-                ERR() << msg;
>+                context->validationError(GL_INVALID_OPERATION, kInvalidConstantColor);
>+                return false;
>             }
>-            context->handleError(InvalidOperation() << msg);
>+
>+            WARN() << kConstantColorAlphaLimitation;
>+            context->validationError(GL_INVALID_OPERATION, kConstantColorAlphaLimitation);
>             return false;
>         }
>     }
>@@ -4652,113 +4921,42 @@ bool ValidateGetString(Context *context, GLenum name)
>         case GL_REQUESTABLE_EXTENSIONS_ANGLE:
>             if (!context->getExtensions().requestExtension)
>             {
>-                ANGLE_VALIDATION_ERR(context, InvalidEnum(), InvalidName);
>+                context->validationError(GL_INVALID_ENUM, kInvalidName);
>                 return false;
>             }
>             break;
> 
>         default:
>-            ANGLE_VALIDATION_ERR(context, InvalidEnum(), InvalidName);
>+            context->validationError(GL_INVALID_ENUM, kInvalidName);
>             return false;
>     }
> 
>     return true;
> }
> 
>-bool ValidateLineWidth(ValidationContext *context, GLfloat width)
>+bool ValidateLineWidth(Context *context, GLfloat width)
> {
>     if (width <= 0.0f || isNaN(width))
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidValue(), InvalidWidth);
>-        return false;
>-    }
>-
>-    return true;
>-}
>-
>-bool ValidateVertexAttribPointer(ValidationContext *context,
>-                                 GLuint index,
>-                                 GLint size,
>-                                 GLenum type,
>-                                 GLboolean normalized,
>-                                 GLsizei stride,
>-                                 const void *ptr)
>-{
>-    if (!ValidateVertexFormatBase(context, index, size, type, false))
>-    {
>-        return false;
>-    }
>-
>-    if (stride < 0)
>-    {
>-        ANGLE_VALIDATION_ERR(context, InvalidValue(), NegativeStride);
>-        return false;
>-    }
>-
>-    const Caps &caps = context->getCaps();
>-    if (context->getClientVersion() >= ES_3_1)
>-    {
>-        if (stride > caps.maxVertexAttribStride)
>-        {
>-            context->handleError(InvalidValue()
>-                                 << "stride cannot be greater than MAX_VERTEX_ATTRIB_STRIDE.");
>-            return false;
>-        }
>-
>-        if (index >= caps.maxVertexAttribBindings)
>-        {
>-            context->handleError(InvalidValue()
>-                                 << "index must be smaller than MAX_VERTEX_ATTRIB_BINDINGS.");
>-            return false;
>-        }
>-    }
>-
>-    // [OpenGL ES 3.0.2] Section 2.8 page 24:
>-    // An INVALID_OPERATION error is generated when a non-zero vertex array object
>-    // is bound, zero is bound to the ARRAY_BUFFER buffer object binding point,
>-    // and the pointer argument is not NULL.
>-    bool nullBufferAllowed = context->getGLState().areClientArraysEnabled() &&
>-                             context->getGLState().getVertexArray()->id() == 0;
>-    if (!nullBufferAllowed && context->getGLState().getTargetBuffer(BufferBinding::Array) == 0 &&
>-        ptr != nullptr)
>-    {
>-        context
>-            ->handleError(InvalidOperation()
>-                          << "Client data cannot be used with a non-default vertex array object.");
>+        context->validationError(GL_INVALID_VALUE, kInvalidWidth);
>         return false;
>     }
> 
>-    if (context->getExtensions().webglCompatibility)
>-    {
>-        // WebGL 1.0 [Section 6.14] Fixed point support
>-        // The WebGL API does not support the GL_FIXED data type.
>-        if (type == GL_FIXED)
>-        {
>-            context->handleError(InvalidEnum() << "GL_FIXED is not supported in WebGL.");
>-            return false;
>-        }
>-
>-        if (!ValidateWebGLVertexAttribPointer(context, type, normalized, stride, ptr, false))
>-        {
>-            return false;
>-        }
>-    }
>-
>     return true;
> }
> 
>-bool ValidateDepthRangef(ValidationContext *context, GLfloat zNear, GLfloat zFar)
>+bool ValidateDepthRangef(Context *context, GLfloat zNear, GLfloat zFar)
> {
>     if (context->getExtensions().webglCompatibility && zNear > zFar)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidOperation(), InvalidDepthRange);
>+        context->validationError(GL_INVALID_OPERATION, kInvalidDepthRange);
>         return false;
>     }
> 
>     return true;
> }
> 
>-bool ValidateRenderbufferStorage(ValidationContext *context,
>+bool ValidateRenderbufferStorage(Context *context,
>                                  GLenum target,
>                                  GLenum internalformat,
>                                  GLsizei width,
>@@ -4768,7 +4966,7 @@ bool ValidateRenderbufferStorage(ValidationContext *context,
>                                                      height);
> }
> 
>-bool ValidateRenderbufferStorageMultisampleANGLE(ValidationContext *context,
>+bool ValidateRenderbufferStorageMultisampleANGLE(Context *context,
>                                                  GLenum target,
>                                                  GLsizei samples,
>                                                  GLenum internalformat,
>@@ -4777,17 +4975,16 @@ bool ValidateRenderbufferStorageMultisampleANGLE(ValidationContext *context,
> {
>     if (!context->getExtensions().framebufferMultisample)
>     {
>-        context->handleError(InvalidOperation()
>-                             << "GL_ANGLE_framebuffer_multisample not available");
>+        context->validationError(GL_INVALID_OPERATION, kExtensionNotEnabled);
>         return false;
>     }
> 
>     // ANGLE_framebuffer_multisample states that the value of samples must be less than or equal
>-    // to MAX_SAMPLES_ANGLE (Context::getCaps().maxSamples) otherwise GL_INVALID_OPERATION is
>+    // to MAX_SAMPLES_ANGLE (Context::getCaps().maxSamples) otherwise GL_INVALID_VALUE is
>     // generated.
>     if (static_cast<GLuint>(samples) > context->getCaps().maxSamples)
>     {
>-        context->handleError(InvalidValue());
>+        context->validationError(GL_INVALID_VALUE, kSamplesOutOfRange);
>         return false;
>     }
> 
>@@ -4800,7 +4997,7 @@ bool ValidateRenderbufferStorageMultisampleANGLE(ValidationContext *context,
>         const TextureCaps &formatCaps = context->getTextureCaps().get(internalformat);
>         if (static_cast<GLuint>(samples) > formatCaps.getMaxSamples())
>         {
>-            context->handleError(OutOfMemory());
>+            context->validationError(GL_OUT_OF_MEMORY, kSamplesOutOfRange);
>             return false;
>         }
>     }
>@@ -4809,37 +5006,33 @@ bool ValidateRenderbufferStorageMultisampleANGLE(ValidationContext *context,
>                                                      width, height);
> }
> 
>-bool ValidateCheckFramebufferStatus(ValidationContext *context, GLenum target)
>+bool ValidateCheckFramebufferStatus(Context *context, GLenum target)
> {
>     if (!ValidFramebufferTarget(context, target))
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidEnum(), InvalidFramebufferTarget);
>+        context->validationError(GL_INVALID_ENUM, kInvalidFramebufferTarget);
>         return false;
>     }
> 
>     return true;
> }
> 
>-bool ValidateClearColor(ValidationContext *context,
>-                        GLfloat red,
>-                        GLfloat green,
>-                        GLfloat blue,
>-                        GLfloat alpha)
>+bool ValidateClearColor(Context *context, GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha)
> {
>     return true;
> }
> 
>-bool ValidateClearDepthf(ValidationContext *context, GLfloat depth)
>+bool ValidateClearDepthf(Context *context, GLfloat depth)
> {
>     return true;
> }
> 
>-bool ValidateClearStencil(ValidationContext *context, GLint s)
>+bool ValidateClearStencil(Context *context, GLint s)
> {
>     return true;
> }
> 
>-bool ValidateColorMask(ValidationContext *context,
>+bool ValidateColorMask(Context *context,
>                        GLboolean red,
>                        GLboolean green,
>                        GLboolean blue,
>@@ -4848,17 +5041,17 @@ bool ValidateColorMask(ValidationContext *context,
>     return true;
> }
> 
>-bool ValidateCompileShader(ValidationContext *context, GLuint shader)
>+bool ValidateCompileShader(Context *context, GLuint shader)
> {
>     return true;
> }
> 
>-bool ValidateCreateProgram(ValidationContext *context)
>+bool ValidateCreateProgram(Context *context)
> {
>     return true;
> }
> 
>-bool ValidateCullFace(ValidationContext *context, CullFaceMode mode)
>+bool ValidateCullFace(Context *context, CullFaceMode mode)
> {
>     switch (mode)
>     {
>@@ -4868,30 +5061,30 @@ bool ValidateCullFace(ValidationContext *context, CullFaceMode mode)
>             break;
> 
>         default:
>-            ANGLE_VALIDATION_ERR(context, InvalidEnum(), InvalidCullMode);
>+            context->validationError(GL_INVALID_ENUM, kInvalidCullMode);
>             return false;
>     }
> 
>     return true;
> }
> 
>-bool ValidateDeleteProgram(ValidationContext *context, GLuint program)
>+bool ValidateDeleteProgram(Context *context, GLuint program)
> {
>     if (program == 0)
>     {
>         return false;
>     }
> 
>-    if (!context->getProgram(program))
>+    if (!context->getProgramResolveLink(program))
>     {
>         if (context->getShader(program))
>         {
>-            ANGLE_VALIDATION_ERR(context, InvalidOperation(), ExpectedProgramName);
>+            context->validationError(GL_INVALID_OPERATION, kExpectedProgramName);
>             return false;
>         }
>         else
>         {
>-            ANGLE_VALIDATION_ERR(context, InvalidValue(), InvalidProgramName);
>+            context->validationError(GL_INVALID_VALUE, kInvalidProgramName);
>             return false;
>         }
>     }
>@@ -4899,7 +5092,7 @@ bool ValidateDeleteProgram(ValidationContext *context, GLuint program)
>     return true;
> }
> 
>-bool ValidateDeleteShader(ValidationContext *context, GLuint shader)
>+bool ValidateDeleteShader(Context *context, GLuint shader)
> {
>     if (shader == 0)
>     {
>@@ -4908,14 +5101,14 @@ bool ValidateDeleteShader(ValidationContext *context, GLuint shader)
> 
>     if (!context->getShader(shader))
>     {
>-        if (context->getProgram(shader))
>+        if (context->getProgramResolveLink(shader))
>         {
>-            ANGLE_VALIDATION_ERR(context, InvalidOperation(), InvalidShaderName);
>+            context->validationError(GL_INVALID_OPERATION, kInvalidShaderName);
>             return false;
>         }
>         else
>         {
>-            ANGLE_VALIDATION_ERR(context, InvalidValue(), ExpectedShaderName);
>+            context->validationError(GL_INVALID_VALUE, kExpectedShaderName);
>             return false;
>         }
>     }
>@@ -4923,7 +5116,7 @@ bool ValidateDeleteShader(ValidationContext *context, GLuint shader)
>     return true;
> }
> 
>-bool ValidateDepthFunc(ValidationContext *context, GLenum func)
>+bool ValidateDepthFunc(Context *context, GLenum func)
> {
>     switch (func)
>     {
>@@ -4938,19 +5131,19 @@ bool ValidateDepthFunc(ValidationContext *context, GLenum func)
>             break;
> 
>         default:
>-            ANGLE_VALIDATION_ERR(context, InvalidEnum(), EnumNotSupported);
>+            context->validationError(GL_INVALID_ENUM, kEnumNotSupported);
>             return false;
>     }
> 
>     return true;
> }
> 
>-bool ValidateDepthMask(ValidationContext *context, GLboolean flag)
>+bool ValidateDepthMask(Context *context, GLboolean flag)
> {
>     return true;
> }
> 
>-bool ValidateDetachShader(ValidationContext *context, GLuint program, GLuint shader)
>+bool ValidateDetachShader(Context *context, GLuint program, GLuint shader)
> {
>     Program *programObject = GetValidProgram(context, program);
>     if (!programObject)
>@@ -4964,77 +5157,49 @@ bool ValidateDetachShader(ValidationContext *context, GLuint program, GLuint sha
>         return false;
>     }
> 
>-    const Shader *attachedShader = nullptr;
>-
>-    switch (shaderObject->getType())
>-    {
>-        case GL_VERTEX_SHADER:
>-        {
>-            attachedShader = programObject->getAttachedVertexShader();
>-            break;
>-        }
>-        case GL_FRAGMENT_SHADER:
>-        {
>-            attachedShader = programObject->getAttachedFragmentShader();
>-            break;
>-        }
>-        case GL_COMPUTE_SHADER:
>-        {
>-            attachedShader = programObject->getAttachedComputeShader();
>-            break;
>-        }
>-        case GL_GEOMETRY_SHADER_EXT:
>-        {
>-            attachedShader = programObject->getAttachedGeometryShader();
>-            break;
>-        }
>-        default:
>-            UNREACHABLE();
>-            return false;
>-    }
>-
>+    const Shader *attachedShader = programObject->getAttachedShader(shaderObject->getType());
>     if (attachedShader != shaderObject)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidOperation(), ShaderToDetachMustBeAttached);
>+        context->validationError(GL_INVALID_OPERATION, kShaderToDetachMustBeAttached);
>         return false;
>     }
> 
>     return true;
> }
> 
>-bool ValidateDisableVertexAttribArray(ValidationContext *context, GLuint index)
>+bool ValidateDisableVertexAttribArray(Context *context, GLuint index)
> {
>     if (index >= MAX_VERTEX_ATTRIBS)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidValue(), IndexExceedsMaxVertexAttribute);
>+        context->validationError(GL_INVALID_VALUE, kIndexExceedsMaxVertexAttribute);
>         return false;
>     }
> 
>     return true;
> }
> 
>-bool ValidateEnableVertexAttribArray(ValidationContext *context, GLuint index)
>+bool ValidateEnableVertexAttribArray(Context *context, GLuint index)
> {
>     if (index >= MAX_VERTEX_ATTRIBS)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidValue(), IndexExceedsMaxVertexAttribute);
>+        context->validationError(GL_INVALID_VALUE, kIndexExceedsMaxVertexAttribute);
>         return false;
>     }
> 
>     return true;
> }
> 
>-bool ValidateFinish(ValidationContext *context)
>+bool ValidateFinish(Context *context)
> {
>     return true;
> }
> 
>-bool ValidateFlush(ValidationContext *context)
>+bool ValidateFlush(Context *context)
> {
>     return true;
> }
> 
>-bool ValidateFrontFace(ValidationContext *context, GLenum mode)
>+bool ValidateFrontFace(Context *context, GLenum mode)
> {
>     switch (mode)
>     {
>@@ -5042,14 +5207,14 @@ bool ValidateFrontFace(ValidationContext *context, GLenum mode)
>         case GL_CCW:
>             break;
>         default:
>-            ANGLE_VALIDATION_ERR(context, InvalidEnum(), EnumNotSupported);
>+            context->validationError(GL_INVALID_ENUM, kEnumNotSupported);
>             return false;
>     }
> 
>     return true;
> }
> 
>-bool ValidateGetActiveAttrib(ValidationContext *context,
>+bool ValidateGetActiveAttrib(Context *context,
>                              GLuint program,
>                              GLuint index,
>                              GLsizei bufsize,
>@@ -5060,7 +5225,7 @@ bool ValidateGetActiveAttrib(ValidationContext *context,
> {
>     if (bufsize < 0)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidValue(), NegativeBufferSize);
>+        context->validationError(GL_INVALID_VALUE, kNegativeBufferSize);
>         return false;
>     }
> 
>@@ -5073,14 +5238,14 @@ bool ValidateGetActiveAttrib(ValidationContext *context,
> 
>     if (index >= static_cast<GLuint>(programObject->getActiveAttributeCount()))
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidValue(), IndexExceedsMaxActiveUniform);
>+        context->validationError(GL_INVALID_VALUE, kIndexExceedsMaxActiveUniform);
>         return false;
>     }
> 
>     return true;
> }
> 
>-bool ValidateGetActiveUniform(ValidationContext *context,
>+bool ValidateGetActiveUniform(Context *context,
>                               GLuint program,
>                               GLuint index,
>                               GLsizei bufsize,
>@@ -5091,7 +5256,7 @@ bool ValidateGetActiveUniform(ValidationContext *context,
> {
>     if (bufsize < 0)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidValue(), NegativeBufferSize);
>+        context->validationError(GL_INVALID_VALUE, kNegativeBufferSize);
>         return false;
>     }
> 
>@@ -5104,14 +5269,14 @@ bool ValidateGetActiveUniform(ValidationContext *context,
> 
>     if (index >= static_cast<GLuint>(programObject->getActiveUniformCount()))
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidValue(), IndexExceedsMaxActiveUniform);
>+        context->validationError(GL_INVALID_VALUE, kIndexExceedsMaxActiveUniform);
>         return false;
>     }
> 
>     return true;
> }
> 
>-bool ValidateGetAttachedShaders(ValidationContext *context,
>+bool ValidateGetAttachedShaders(Context *context,
>                                 GLuint program,
>                                 GLsizei maxcount,
>                                 GLsizei *count,
>@@ -5119,7 +5284,7 @@ bool ValidateGetAttachedShaders(ValidationContext *context,
> {
>     if (maxcount < 0)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidValue(), NegativeMaxCount);
>+        context->validationError(GL_INVALID_VALUE, kNegativeMaxCount);
>         return false;
>     }
> 
>@@ -5133,13 +5298,13 @@ bool ValidateGetAttachedShaders(ValidationContext *context,
>     return true;
> }
> 
>-bool ValidateGetAttribLocation(ValidationContext *context, GLuint program, const GLchar *name)
>+bool ValidateGetAttribLocation(Context *context, GLuint program, const GLchar *name)
> {
>     // The WebGL spec (section 6.20) disallows strings containing invalid ESSL characters for
>     // shader-related entry points
>     if (context->getExtensions().webglCompatibility && !IsValidESSLString(name, strlen(name)))
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidValue(), InvalidNameCharacters);
>+        context->validationError(GL_INVALID_VALUE, kInvalidNameCharacters);
>         return false;
>     }
> 
>@@ -5147,46 +5312,46 @@ bool ValidateGetAttribLocation(ValidationContext *context, GLuint program, const
> 
>     if (!programObject)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidOperation(), ProgramNotBound);
>+        context->validationError(GL_INVALID_OPERATION, kProgramNotBound);
>         return false;
>     }
> 
>     if (!programObject->isLinked())
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidOperation(), ProgramNotLinked);
>+        context->validationError(GL_INVALID_OPERATION, kProgramNotLinked);
>         return false;
>     }
> 
>     return true;
> }
> 
>-bool ValidateGetBooleanv(ValidationContext *context, GLenum pname, GLboolean *params)
>+bool ValidateGetBooleanv(Context *context, GLenum pname, GLboolean *params)
> {
>     GLenum nativeType;
>     unsigned int numParams = 0;
>     return ValidateStateQuery(context, pname, &nativeType, &numParams);
> }
> 
>-bool ValidateGetError(ValidationContext *context)
>+bool ValidateGetError(Context *context)
> {
>     return true;
> }
> 
>-bool ValidateGetFloatv(ValidationContext *context, GLenum pname, GLfloat *params)
>+bool ValidateGetFloatv(Context *context, GLenum pname, GLfloat *params)
> {
>     GLenum nativeType;
>     unsigned int numParams = 0;
>     return ValidateStateQuery(context, pname, &nativeType, &numParams);
> }
> 
>-bool ValidateGetIntegerv(ValidationContext *context, GLenum pname, GLint *params)
>+bool ValidateGetIntegerv(Context *context, GLenum pname, GLint *params)
> {
>     GLenum nativeType;
>     unsigned int numParams = 0;
>     return ValidateStateQuery(context, pname, &nativeType, &numParams);
> }
> 
>-bool ValidateGetProgramInfoLog(ValidationContext *context,
>+bool ValidateGetProgramInfoLog(Context *context,
>                                GLuint program,
>                                GLsizei bufsize,
>                                GLsizei *length,
>@@ -5194,7 +5359,7 @@ bool ValidateGetProgramInfoLog(ValidationContext *context,
> {
>     if (bufsize < 0)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidValue(), NegativeBufferSize);
>+        context->validationError(GL_INVALID_VALUE, kNegativeBufferSize);
>         return false;
>     }
> 
>@@ -5207,7 +5372,7 @@ bool ValidateGetProgramInfoLog(ValidationContext *context,
>     return true;
> }
> 
>-bool ValidateGetShaderInfoLog(ValidationContext *context,
>+bool ValidateGetShaderInfoLog(Context *context,
>                               GLuint shader,
>                               GLsizei bufsize,
>                               GLsizei *length,
>@@ -5215,7 +5380,7 @@ bool ValidateGetShaderInfoLog(ValidationContext *context,
> {
>     if (bufsize < 0)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidValue(), NegativeBufferSize);
>+        context->validationError(GL_INVALID_VALUE, kNegativeBufferSize);
>         return false;
>     }
> 
>@@ -5228,7 +5393,7 @@ bool ValidateGetShaderInfoLog(ValidationContext *context,
>     return true;
> }
> 
>-bool ValidateGetShaderPrecisionFormat(ValidationContext *context,
>+bool ValidateGetShaderPrecisionFormat(Context *context,
>                                       GLenum shadertype,
>                                       GLenum precisiontype,
>                                       GLint *range,
>@@ -5240,11 +5405,10 @@ bool ValidateGetShaderPrecisionFormat(ValidationContext *context,
>         case GL_FRAGMENT_SHADER:
>             break;
>         case GL_COMPUTE_SHADER:
>-            context->handleError(InvalidOperation()
>-                                 << "compute shader precision not yet implemented.");
>+            context->validationError(GL_INVALID_OPERATION, kUnimplementedComputeShaderPrecision);
>             return false;
>         default:
>-            ANGLE_VALIDATION_ERR(context, InvalidEnum(), InvalidShaderType);
>+            context->validationError(GL_INVALID_ENUM, kInvalidShaderType);
>             return false;
>     }
> 
>@@ -5259,14 +5423,14 @@ bool ValidateGetShaderPrecisionFormat(ValidationContext *context,
>             break;
> 
>         default:
>-            ANGLE_VALIDATION_ERR(context, InvalidEnum(), InvalidPrecision);
>+            context->validationError(GL_INVALID_ENUM, kInvalidPrecision);
>             return false;
>     }
> 
>     return true;
> }
> 
>-bool ValidateGetShaderSource(ValidationContext *context,
>+bool ValidateGetShaderSource(Context *context,
>                              GLuint shader,
>                              GLsizei bufsize,
>                              GLsizei *length,
>@@ -5274,7 +5438,7 @@ bool ValidateGetShaderSource(ValidationContext *context,
> {
>     if (bufsize < 0)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidValue(), NegativeBufferSize);
>+        context->validationError(GL_INVALID_VALUE, kNegativeBufferSize);
>         return false;
>     }
> 
>@@ -5287,7 +5451,7 @@ bool ValidateGetShaderSource(ValidationContext *context,
>     return true;
> }
> 
>-bool ValidateGetUniformLocation(ValidationContext *context, GLuint program, const GLchar *name)
>+bool ValidateGetUniformLocation(Context *context, GLuint program, const GLchar *name)
> {
>     if (strstr(name, "gl_") == name)
>     {
>@@ -5298,7 +5462,7 @@ bool ValidateGetUniformLocation(ValidationContext *context, GLuint program, cons
>     // shader-related entry points
>     if (context->getExtensions().webglCompatibility && !IsValidESSLString(name, strlen(name)))
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidValue(), InvalidNameCharacters);
>+        context->validationError(GL_INVALID_VALUE, kInvalidNameCharacters);
>         return false;
>     }
> 
>@@ -5311,14 +5475,14 @@ bool ValidateGetUniformLocation(ValidationContext *context, GLuint program, cons
> 
>     if (!programObject->isLinked())
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidOperation(), ProgramNotLinked);
>+        context->validationError(GL_INVALID_OPERATION, kProgramNotLinked);
>         return false;
>     }
> 
>     return true;
> }
> 
>-bool ValidateHint(ValidationContext *context, GLenum target, GLenum mode)
>+bool ValidateHint(Context *context, GLenum target, GLenum mode)
> {
>     switch (mode)
>     {
>@@ -5328,7 +5492,7 @@ bool ValidateHint(ValidationContext *context, GLenum target, GLenum mode)
>             break;
> 
>         default:
>-            ANGLE_VALIDATION_ERR(context, InvalidEnum(), EnumNotSupported);
>+            context->validationError(GL_INVALID_ENUM, kEnumNotSupported);
>             return false;
>     }
> 
>@@ -5341,50 +5505,61 @@ bool ValidateHint(ValidationContext *context, GLenum target, GLenum mode)
>             if (context->getClientVersion() < ES_3_0 &&
>                 !context->getExtensions().standardDerivatives)
>             {
>-                context->handleError(InvalidEnum() << "hint requires OES_standard_derivatives.");
>+                context->validationError(GL_INVALID_ENUM, kEnumNotSupported);
>+                return false;
>+            }
>+            break;
>+
>+        case GL_PERSPECTIVE_CORRECTION_HINT:
>+        case GL_POINT_SMOOTH_HINT:
>+        case GL_LINE_SMOOTH_HINT:
>+        case GL_FOG_HINT:
>+            if (context->getClientMajorVersion() >= 2)
>+            {
>+                context->validationError(GL_INVALID_ENUM, kEnumNotSupported);
>                 return false;
>             }
>             break;
> 
>         default:
>-            ANGLE_VALIDATION_ERR(context, InvalidEnum(), EnumNotSupported);
>+            context->validationError(GL_INVALID_ENUM, kEnumNotSupported);
>             return false;
>     }
> 
>     return true;
> }
> 
>-bool ValidateIsBuffer(ValidationContext *context, GLuint buffer)
>+bool ValidateIsBuffer(Context *context, GLuint buffer)
> {
>     return true;
> }
> 
>-bool ValidateIsFramebuffer(ValidationContext *context, GLuint framebuffer)
>+bool ValidateIsFramebuffer(Context *context, GLuint framebuffer)
> {
>     return true;
> }
> 
>-bool ValidateIsProgram(ValidationContext *context, GLuint program)
>+bool ValidateIsProgram(Context *context, GLuint program)
> {
>     return true;
> }
> 
>-bool ValidateIsRenderbuffer(ValidationContext *context, GLuint renderbuffer)
>+bool ValidateIsRenderbuffer(Context *context, GLuint renderbuffer)
> {
>     return true;
> }
> 
>-bool ValidateIsShader(ValidationContext *context, GLuint shader)
>+bool ValidateIsShader(Context *context, GLuint shader)
> {
>     return true;
> }
> 
>-bool ValidateIsTexture(ValidationContext *context, GLuint texture)
>+bool ValidateIsTexture(Context *context, GLuint texture)
> {
>     return true;
> }
> 
>-bool ValidatePixelStorei(ValidationContext *context, GLenum pname, GLint param)
>+bool ValidatePixelStorei(Context *context, GLenum pname, GLint param)
> {
>     if (context->getClientMajorVersion() < 3)
>     {
>@@ -5392,7 +5567,7 @@ bool ValidatePixelStorei(ValidationContext *context, GLenum pname, GLint param)
>         {
>             case GL_UNPACK_IMAGE_HEIGHT:
>             case GL_UNPACK_SKIP_IMAGES:
>-                context->handleError(InvalidEnum());
>+                context->validationError(GL_INVALID_ENUM, kInvalidPname);
>                 return false;
> 
>             case GL_UNPACK_ROW_LENGTH:
>@@ -5400,7 +5575,7 @@ bool ValidatePixelStorei(ValidationContext *context, GLenum pname, GLint param)
>             case GL_UNPACK_SKIP_PIXELS:
>                 if (!context->getExtensions().unpackSubimage)
>                 {
>-                    context->handleError(InvalidEnum());
>+                    context->validationError(GL_INVALID_ENUM, kInvalidPname);
>                     return false;
>                 }
>                 break;
>@@ -5410,7 +5585,7 @@ bool ValidatePixelStorei(ValidationContext *context, GLenum pname, GLint param)
>             case GL_PACK_SKIP_PIXELS:
>                 if (!context->getExtensions().packSubimage)
>                 {
>-                    context->handleError(InvalidEnum());
>+                    context->validationError(GL_INVALID_ENUM, kInvalidPname);
>                     return false;
>                 }
>                 break;
>@@ -5419,7 +5594,7 @@ bool ValidatePixelStorei(ValidationContext *context, GLenum pname, GLint param)
> 
>     if (param < 0)
>     {
>-        context->handleError(InvalidValue() << "Cannot use negative values in PixelStorei");
>+        context->validationError(GL_INVALID_VALUE, kNegativeParam);
>         return false;
>     }
> 
>@@ -5428,7 +5603,7 @@ bool ValidatePixelStorei(ValidationContext *context, GLenum pname, GLint param)
>         case GL_UNPACK_ALIGNMENT:
>             if (param != 1 && param != 2 && param != 4 && param != 8)
>             {
>-                ANGLE_VALIDATION_ERR(context, InvalidValue(), InvalidUnpackAlignment);
>+                context->validationError(GL_INVALID_VALUE, kInvalidUnpackAlignment);
>                 return false;
>             }
>             break;
>@@ -5436,7 +5611,7 @@ bool ValidatePixelStorei(ValidationContext *context, GLenum pname, GLint param)
>         case GL_PACK_ALIGNMENT:
>             if (param != 1 && param != 2 && param != 4 && param != 8)
>             {
>-                ANGLE_VALIDATION_ERR(context, InvalidValue(), InvalidUnpackAlignment);
>+                context->validationError(GL_INVALID_VALUE, kInvalidUnpackAlignment);
>                 return false;
>             }
>             break;
>@@ -5444,7 +5619,7 @@ bool ValidatePixelStorei(ValidationContext *context, GLenum pname, GLint param)
>         case GL_PACK_REVERSE_ROW_ORDER_ANGLE:
>             if (!context->getExtensions().packReverseRowOrder)
>             {
>-                ANGLE_VALIDATION_ERR(context, InvalidEnum(), EnumNotSupported);
>+                context->validationError(GL_INVALID_ENUM, kEnumNotSupported);
>             }
>             break;
> 
>@@ -5459,40 +5634,40 @@ bool ValidatePixelStorei(ValidationContext *context, GLenum pname, GLint param)
>             break;
> 
>         default:
>-            ANGLE_VALIDATION_ERR(context, InvalidEnum(), EnumNotSupported);
>+            context->validationError(GL_INVALID_ENUM, kEnumNotSupported);
>             return false;
>     }
> 
>     return true;
> }
> 
>-bool ValidatePolygonOffset(ValidationContext *context, GLfloat factor, GLfloat units)
>+bool ValidatePolygonOffset(Context *context, GLfloat factor, GLfloat units)
> {
>     return true;
> }
> 
>-bool ValidateReleaseShaderCompiler(ValidationContext *context)
>+bool ValidateReleaseShaderCompiler(Context *context)
> {
>     return true;
> }
> 
>-bool ValidateSampleCoverage(ValidationContext *context, GLfloat value, GLboolean invert)
>+bool ValidateSampleCoverage(Context *context, GLfloat value, GLboolean invert)
> {
>     return true;
> }
> 
>-bool ValidateScissor(ValidationContext *context, GLint x, GLint y, GLsizei width, GLsizei height)
>+bool ValidateScissor(Context *context, GLint x, GLint y, GLsizei width, GLsizei height)
> {
>     if (width < 0 || height < 0)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidValue(), NegativeSize);
>+        context->validationError(GL_INVALID_VALUE, kNegativeSize);
>         return false;
>     }
> 
>     return true;
> }
> 
>-bool ValidateShaderBinary(ValidationContext *context,
>+bool ValidateShaderBinary(Context *context,
>                           GLsizei n,
>                           const GLuint *shaders,
>                           GLenum binaryformat,
>@@ -5503,14 +5678,14 @@ bool ValidateShaderBinary(ValidationContext *context,
>     if (std::find(shaderBinaryFormats.begin(), shaderBinaryFormats.end(), binaryformat) ==
>         shaderBinaryFormats.end())
>     {
>-        context->handleError(InvalidEnum() << "Invalid shader binary format.");
>+        context->validationError(GL_INVALID_ENUM, kInvalidShaderBinaryFormat);
>         return false;
>     }
> 
>     return true;
> }
> 
>-bool ValidateShaderSource(ValidationContext *context,
>+bool ValidateShaderSource(Context *context,
>                           GLuint shader,
>                           GLsizei count,
>                           const GLchar *const *string,
>@@ -5518,7 +5693,7 @@ bool ValidateShaderSource(ValidationContext *context,
> {
>     if (count < 0)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidValue(), NegativeCount);
>+        context->validationError(GL_INVALID_VALUE, kNegativeCount);
>         return false;
>     }
> 
>@@ -5535,7 +5710,7 @@ bool ValidateShaderSource(ValidationContext *context,
>             if (!IsValidESSLShaderSourceString(string[i], len,
>                                                context->getClientVersion() >= ES_3_0))
>             {
>-                ANGLE_VALIDATION_ERR(context, InvalidValue(), ShaderSourceInvalidCharacters);
>+                context->validationError(GL_INVALID_VALUE, kShaderSourceInvalidCharacters);
>                 return false;
>             }
>         }
>@@ -5550,78 +5725,74 @@ bool ValidateShaderSource(ValidationContext *context,
>     return true;
> }
> 
>-bool ValidateStencilFunc(ValidationContext *context, GLenum func, GLint ref, GLuint mask)
>+bool ValidateStencilFunc(Context *context, GLenum func, GLint ref, GLuint mask)
> {
>     if (!IsValidStencilFunc(func))
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidEnum(), InvalidStencil);
>+        context->validationError(GL_INVALID_ENUM, kInvalidStencil);
>         return false;
>     }
> 
>     return true;
> }
> 
>-bool ValidateStencilFuncSeparate(ValidationContext *context,
>-                                 GLenum face,
>-                                 GLenum func,
>-                                 GLint ref,
>-                                 GLuint mask)
>+bool ValidateStencilFuncSeparate(Context *context, GLenum face, GLenum func, GLint ref, GLuint mask)
> {
>     if (!IsValidStencilFace(face))
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidEnum(), InvalidStencil);
>+        context->validationError(GL_INVALID_ENUM, kInvalidStencil);
>         return false;
>     }
> 
>     if (!IsValidStencilFunc(func))
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidEnum(), InvalidStencil);
>+        context->validationError(GL_INVALID_ENUM, kInvalidStencil);
>         return false;
>     }
> 
>     return true;
> }
> 
>-bool ValidateStencilMask(ValidationContext *context, GLuint mask)
>+bool ValidateStencilMask(Context *context, GLuint mask)
> {
>     return true;
> }
> 
>-bool ValidateStencilMaskSeparate(ValidationContext *context, GLenum face, GLuint mask)
>+bool ValidateStencilMaskSeparate(Context *context, GLenum face, GLuint mask)
> {
>     if (!IsValidStencilFace(face))
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidEnum(), InvalidStencil);
>+        context->validationError(GL_INVALID_ENUM, kInvalidStencil);
>         return false;
>     }
> 
>     return true;
> }
> 
>-bool ValidateStencilOp(ValidationContext *context, GLenum fail, GLenum zfail, GLenum zpass)
>+bool ValidateStencilOp(Context *context, GLenum fail, GLenum zfail, GLenum zpass)
> {
>     if (!IsValidStencilOp(fail))
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidEnum(), InvalidStencil);
>+        context->validationError(GL_INVALID_ENUM, kInvalidStencil);
>         return false;
>     }
> 
>     if (!IsValidStencilOp(zfail))
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidEnum(), InvalidStencil);
>+        context->validationError(GL_INVALID_ENUM, kInvalidStencil);
>         return false;
>     }
> 
>     if (!IsValidStencilOp(zpass))
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidEnum(), InvalidStencil);
>+        context->validationError(GL_INVALID_ENUM, kInvalidStencil);
>         return false;
>     }
> 
>     return true;
> }
> 
>-bool ValidateStencilOpSeparate(ValidationContext *context,
>+bool ValidateStencilOpSeparate(Context *context,
>                                GLenum face,
>                                GLenum fail,
>                                GLenum zfail,
>@@ -5629,99 +5800,84 @@ bool ValidateStencilOpSeparate(ValidationContext *context,
> {
>     if (!IsValidStencilFace(face))
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidEnum(), InvalidStencil);
>+        context->validationError(GL_INVALID_ENUM, kInvalidStencil);
>         return false;
>     }
> 
>     return ValidateStencilOp(context, fail, zfail, zpass);
> }
> 
>-bool ValidateUniform1f(ValidationContext *context, GLint location, GLfloat x)
>+bool ValidateUniform1f(Context *context, GLint location, GLfloat x)
> {
>     return ValidateUniform(context, GL_FLOAT, location, 1);
> }
> 
>-bool ValidateUniform1fv(ValidationContext *context, GLint location, GLsizei count, const GLfloat *v)
>+bool ValidateUniform1fv(Context *context, GLint location, GLsizei count, const GLfloat *v)
> {
>     return ValidateUniform(context, GL_FLOAT, location, count);
> }
> 
>-bool ValidateUniform1i(ValidationContext *context, GLint location, GLint x)
>+bool ValidateUniform1i(Context *context, GLint location, GLint x)
> {
>     return ValidateUniform1iv(context, location, 1, &x);
> }
> 
>-bool ValidateUniform2f(ValidationContext *context, GLint location, GLfloat x, GLfloat y)
>-{
>-    return ValidateUniform(context, GL_FLOAT_VEC2, location, 1);
>-}
>-
>-bool ValidateUniform2fv(ValidationContext *context, GLint location, GLsizei count, const GLfloat *v)
>+bool ValidateUniform2fv(Context *context, GLint location, GLsizei count, const GLfloat *v)
> {
>     return ValidateUniform(context, GL_FLOAT_VEC2, location, count);
> }
> 
>-bool ValidateUniform2i(ValidationContext *context, GLint location, GLint x, GLint y)
>+bool ValidateUniform2i(Context *context, GLint location, GLint x, GLint y)
> {
>     return ValidateUniform(context, GL_INT_VEC2, location, 1);
> }
> 
>-bool ValidateUniform2iv(ValidationContext *context, GLint location, GLsizei count, const GLint *v)
>+bool ValidateUniform2iv(Context *context, GLint location, GLsizei count, const GLint *v)
> {
>     return ValidateUniform(context, GL_INT_VEC2, location, count);
> }
> 
>-bool ValidateUniform3f(ValidationContext *context, GLint location, GLfloat x, GLfloat y, GLfloat z)
>+bool ValidateUniform3f(Context *context, GLint location, GLfloat x, GLfloat y, GLfloat z)
> {
>     return ValidateUniform(context, GL_FLOAT_VEC3, location, 1);
> }
> 
>-bool ValidateUniform3fv(ValidationContext *context, GLint location, GLsizei count, const GLfloat *v)
>+bool ValidateUniform3fv(Context *context, GLint location, GLsizei count, const GLfloat *v)
> {
>     return ValidateUniform(context, GL_FLOAT_VEC3, location, count);
> }
> 
>-bool ValidateUniform3i(ValidationContext *context, GLint location, GLint x, GLint y, GLint z)
>+bool ValidateUniform3i(Context *context, GLint location, GLint x, GLint y, GLint z)
> {
>     return ValidateUniform(context, GL_INT_VEC3, location, 1);
> }
> 
>-bool ValidateUniform3iv(ValidationContext *context, GLint location, GLsizei count, const GLint *v)
>+bool ValidateUniform3iv(Context *context, GLint location, GLsizei count, const GLint *v)
> {
>     return ValidateUniform(context, GL_INT_VEC3, location, count);
> }
> 
>-bool ValidateUniform4f(ValidationContext *context,
>-                       GLint location,
>-                       GLfloat x,
>-                       GLfloat y,
>-                       GLfloat z,
>-                       GLfloat w)
>+bool ValidateUniform4f(Context *context, GLint location, GLfloat x, GLfloat y, GLfloat z, GLfloat w)
> {
>     return ValidateUniform(context, GL_FLOAT_VEC4, location, 1);
> }
> 
>-bool ValidateUniform4fv(ValidationContext *context, GLint location, GLsizei count, const GLfloat *v)
>+bool ValidateUniform4fv(Context *context, GLint location, GLsizei count, const GLfloat *v)
> {
>     return ValidateUniform(context, GL_FLOAT_VEC4, location, count);
> }
> 
>-bool ValidateUniform4i(ValidationContext *context,
>-                       GLint location,
>-                       GLint x,
>-                       GLint y,
>-                       GLint z,
>-                       GLint w)
>+bool ValidateUniform4i(Context *context, GLint location, GLint x, GLint y, GLint z, GLint w)
> {
>     return ValidateUniform(context, GL_INT_VEC4, location, 1);
> }
> 
>-bool ValidateUniform4iv(ValidationContext *context, GLint location, GLsizei count, const GLint *v)
>+bool ValidateUniform4iv(Context *context, GLint location, GLsizei count, const GLint *v)
> {
>     return ValidateUniform(context, GL_INT_VEC4, location, count);
> }
> 
>-bool ValidateUniformMatrix2fv(ValidationContext *context,
>+bool ValidateUniformMatrix2fv(Context *context,
>                               GLint location,
>                               GLsizei count,
>                               GLboolean transpose,
>@@ -5730,7 +5886,7 @@ bool ValidateUniformMatrix2fv(ValidationContext *context,
>     return ValidateUniformMatrix(context, GL_FLOAT_MAT2, location, count, transpose);
> }
> 
>-bool ValidateUniformMatrix3fv(ValidationContext *context,
>+bool ValidateUniformMatrix3fv(Context *context,
>                               GLint location,
>                               GLsizei count,
>                               GLboolean transpose,
>@@ -5739,7 +5895,7 @@ bool ValidateUniformMatrix3fv(ValidationContext *context,
>     return ValidateUniformMatrix(context, GL_FLOAT_MAT3, location, count, transpose);
> }
> 
>-bool ValidateUniformMatrix4fv(ValidationContext *context,
>+bool ValidateUniformMatrix4fv(Context *context,
>                               GLint location,
>                               GLsizei count,
>                               GLboolean transpose,
>@@ -5748,7 +5904,7 @@ bool ValidateUniformMatrix4fv(ValidationContext *context,
>     return ValidateUniformMatrix(context, GL_FLOAT_MAT4, location, count, transpose);
> }
> 
>-bool ValidateValidateProgram(ValidationContext *context, GLuint program)
>+bool ValidateValidateProgram(Context *context, GLuint program)
> {
>     Program *programObject = GetValidProgram(context, program);
> 
>@@ -5760,41 +5916,37 @@ bool ValidateValidateProgram(ValidationContext *context, GLuint program)
>     return true;
> }
> 
>-bool ValidateVertexAttrib1f(ValidationContext *context, GLuint index, GLfloat x)
>+bool ValidateVertexAttrib1f(Context *context, GLuint index, GLfloat x)
> {
>     return ValidateVertexAttribIndex(context, index);
> }
> 
>-bool ValidateVertexAttrib1fv(ValidationContext *context, GLuint index, const GLfloat *values)
>+bool ValidateVertexAttrib1fv(Context *context, GLuint index, const GLfloat *values)
> {
>     return ValidateVertexAttribIndex(context, index);
> }
> 
>-bool ValidateVertexAttrib2f(ValidationContext *context, GLuint index, GLfloat x, GLfloat y)
>+bool ValidateVertexAttrib2f(Context *context, GLuint index, GLfloat x, GLfloat y)
> {
>     return ValidateVertexAttribIndex(context, index);
> }
> 
>-bool ValidateVertexAttrib2fv(ValidationContext *context, GLuint index, const GLfloat *values)
>+bool ValidateVertexAttrib2fv(Context *context, GLuint index, const GLfloat *values)
> {
>     return ValidateVertexAttribIndex(context, index);
> }
> 
>-bool ValidateVertexAttrib3f(ValidationContext *context,
>-                            GLuint index,
>-                            GLfloat x,
>-                            GLfloat y,
>-                            GLfloat z)
>+bool ValidateVertexAttrib3f(Context *context, GLuint index, GLfloat x, GLfloat y, GLfloat z)
> {
>     return ValidateVertexAttribIndex(context, index);
> }
> 
>-bool ValidateVertexAttrib3fv(ValidationContext *context, GLuint index, const GLfloat *values)
>+bool ValidateVertexAttrib3fv(Context *context, GLuint index, const GLfloat *values)
> {
>     return ValidateVertexAttribIndex(context, index);
> }
> 
>-bool ValidateVertexAttrib4f(ValidationContext *context,
>+bool ValidateVertexAttrib4f(Context *context,
>                             GLuint index,
>                             GLfloat x,
>                             GLfloat y,
>@@ -5804,37 +5956,23 @@ bool ValidateVertexAttrib4f(ValidationContext *context,
>     return ValidateVertexAttribIndex(context, index);
> }
> 
>-bool ValidateVertexAttrib4fv(ValidationContext *context, GLuint index, const GLfloat *values)
>+bool ValidateVertexAttrib4fv(Context *context, GLuint index, const GLfloat *values)
> {
>     return ValidateVertexAttribIndex(context, index);
> }
> 
>-bool ValidateViewport(ValidationContext *context, GLint x, GLint y, GLsizei width, GLsizei height)
>+bool ValidateViewport(Context *context, GLint x, GLint y, GLsizei width, GLsizei height)
> {
>     if (width < 0 || height < 0)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidValue(), ViewportNegativeSize);
>+        context->validationError(GL_INVALID_VALUE, kViewportNegativeSize);
>         return false;
>     }
> 
>     return true;
> }
> 
>-bool ValidateDrawArrays(ValidationContext *context, GLenum mode, GLint first, GLsizei count)
>-{
>-    return ValidateDrawArraysCommon(context, mode, first, count, 1);
>-}
>-
>-bool ValidateDrawElements(ValidationContext *context,
>-                          GLenum mode,
>-                          GLsizei count,
>-                          GLenum type,
>-                          const void *indices)
>-{
>-    return ValidateDrawElementsCommon(context, mode, count, type, indices, 1);
>-}
>-
>-bool ValidateGetFramebufferAttachmentParameteriv(ValidationContext *context,
>+bool ValidateGetFramebufferAttachmentParameteriv(Context *context,
>                                                  GLenum target,
>                                                  GLenum attachment,
>                                                  GLenum pname,
>@@ -5844,13 +5982,13 @@ bool ValidateGetFramebufferAttachmentParameteriv(ValidationContext *context,
>                                                            nullptr);
> }
> 
>-bool ValidateGetProgramiv(ValidationContext *context, GLuint program, GLenum pname, GLint *params)
>+bool ValidateGetProgramiv(Context *context, GLuint program, GLenum pname, GLint *params)
> {
>     return ValidateGetProgramivBase(context, program, pname, nullptr);
> }
> 
>-bool ValidateCopyTexImage2D(ValidationContext *context,
>-                            GLenum target,
>+bool ValidateCopyTexImage2D(Context *context,
>+                            TextureTarget target,
>                             GLint level,
>                             GLenum internalformat,
>                             GLint x,
>@@ -5871,7 +6009,7 @@ bool ValidateCopyTexImage2D(ValidationContext *context,
> }
> 
> bool ValidateCopyTexSubImage2D(Context *context,
>-                               GLenum target,
>+                               TextureTarget target,
>                                GLint level,
>                                GLint xoffset,
>                                GLint yoffset,
>@@ -5914,7 +6052,7 @@ bool ValidateDisable(Context *context, GLenum cap)
> {
>     if (!ValidCap(context, cap, false))
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidEnum(), EnumNotSupported);
>+        context->validationError(GL_INVALID_ENUM, kEnumNotSupported);
>         return false;
>     }
> 
>@@ -5925,19 +6063,18 @@ bool ValidateEnable(Context *context, GLenum cap)
> {
>     if (!ValidCap(context, cap, false))
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidEnum(), EnumNotSupported);
>+        context->validationError(GL_INVALID_ENUM, kEnumNotSupported);
>         return false;
>     }
> 
>     if (context->getLimitations().noSampleAlphaToCoverageSupport &&
>         cap == GL_SAMPLE_ALPHA_TO_COVERAGE)
>     {
>-        const char *errorMessage = "Current renderer doesn't support alpha-to-coverage";
>-        context->handleError(InvalidOperation() << errorMessage);
>+        context->validationError(GL_INVALID_OPERATION, kNoSampleAlphaToCoveragesLimitation);
> 
>         // We also output an error message to the debugger window if tracing is active, so that
>         // developers can see the error message.
>-        ERR() << errorMessage;
>+        ERR() << kNoSampleAlphaToCoveragesLimitation;
>         return false;
>     }
> 
>@@ -5952,13 +6089,13 @@ bool ValidateFramebufferRenderbuffer(Context *context,
> {
>     if (!ValidFramebufferTarget(context, target))
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidEnum(), InvalidFramebufferTarget);
>+        context->validationError(GL_INVALID_ENUM, kInvalidFramebufferTarget);
>         return false;
>     }
> 
>     if (renderbuffertarget != GL_RENDERBUFFER && renderbuffer != 0)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidEnum(), InvalidRenderbufferTarget);
>+        context->validationError(GL_INVALID_ENUM, kInvalidRenderbufferTarget);
>         return false;
>     }
> 
>@@ -5969,7 +6106,7 @@ bool ValidateFramebufferRenderbuffer(Context *context,
> bool ValidateFramebufferTexture2D(Context *context,
>                                   GLenum target,
>                                   GLenum attachment,
>-                                  GLenum textarget,
>+                                  TextureTarget textarget,
>                                   GLuint texture,
>                                   GLint level)
> {
>@@ -5978,7 +6115,7 @@ bool ValidateFramebufferTexture2D(Context *context,
>     if (context->getClientMajorVersion() < 3 && !context->getExtensions().fboRenderMipmap &&
>         level != 0)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidValue(), InvalidFramebufferTextureLevel);
>+        context->validationError(GL_INVALID_VALUE, kInvalidFramebufferTextureLevel);
>         return false;
>     }
> 
>@@ -5996,91 +6133,83 @@ bool ValidateFramebufferTexture2D(Context *context,
> 
>         switch (textarget)
>         {
>-            case GL_TEXTURE_2D:
>+            case TextureTarget::_2D:
>             {
>                 if (level > gl::log2(caps.max2DTextureSize))
>                 {
>-                    context->handleError(InvalidValue());
>+                    context->validationError(GL_INVALID_VALUE, kInvalidMipLevel);
>                     return false;
>                 }
>-                if (tex->getTarget() != GL_TEXTURE_2D)
>+                if (tex->getType() != TextureType::_2D)
>                 {
>-                    ANGLE_VALIDATION_ERR(context, InvalidOperation(), InvalidTextureTarget);
>+                    context->validationError(GL_INVALID_OPERATION, kInvalidTextureTarget);
>                     return false;
>                 }
>             }
>             break;
> 
>-            case GL_TEXTURE_RECTANGLE_ANGLE:
>+            case TextureTarget::Rectangle:
>             {
>                 if (level != 0)
>                 {
>-                    context->handleError(InvalidValue());
>+                    context->validationError(GL_INVALID_VALUE, kInvalidMipLevel);
>                     return false;
>                 }
>-                if (tex->getTarget() != GL_TEXTURE_RECTANGLE_ANGLE)
>+                if (tex->getType() != TextureType::Rectangle)
>                 {
>-                    context->handleError(InvalidOperation()
>-                                         << "Textarget must match the texture target type.");
>+                    context->validationError(GL_INVALID_OPERATION, kTextureTargetMismatch);
>                     return false;
>                 }
>             }
>             break;
> 
>-            case GL_TEXTURE_CUBE_MAP_POSITIVE_X:
>-            case GL_TEXTURE_CUBE_MAP_NEGATIVE_X:
>-            case GL_TEXTURE_CUBE_MAP_POSITIVE_Y:
>-            case GL_TEXTURE_CUBE_MAP_NEGATIVE_Y:
>-            case GL_TEXTURE_CUBE_MAP_POSITIVE_Z:
>-            case GL_TEXTURE_CUBE_MAP_NEGATIVE_Z:
>+            case TextureTarget::CubeMapNegativeX:
>+            case TextureTarget::CubeMapNegativeY:
>+            case TextureTarget::CubeMapNegativeZ:
>+            case TextureTarget::CubeMapPositiveX:
>+            case TextureTarget::CubeMapPositiveY:
>+            case TextureTarget::CubeMapPositiveZ:
>             {
>                 if (level > gl::log2(caps.maxCubeMapTextureSize))
>                 {
>-                    context->handleError(InvalidValue());
>+                    context->validationError(GL_INVALID_VALUE, kInvalidMipLevel);
>                     return false;
>                 }
>-                if (tex->getTarget() != GL_TEXTURE_CUBE_MAP)
>+                if (tex->getType() != TextureType::CubeMap)
>                 {
>-                    context->handleError(InvalidOperation()
>-                                         << "Textarget must match the texture target type.");
>+                    context->validationError(GL_INVALID_OPERATION, kTextureTargetMismatch);
>                     return false;
>                 }
>             }
>             break;
> 
>-            case GL_TEXTURE_2D_MULTISAMPLE:
>+            case TextureTarget::_2DMultisample:
>             {
>-                if (context->getClientVersion() < ES_3_1)
>+                if (context->getClientVersion() < ES_3_1 &&
>+                    !context->getExtensions().textureMultisample)
>                 {
>-                    ANGLE_VALIDATION_ERR(context, InvalidOperation(), ES31Required);
>+                    context->validationError(GL_INVALID_OPERATION,
>+                                             kMultisampleTextureExtensionOrES31Required);
>                     return false;
>                 }
> 
>                 if (level != 0)
>                 {
>-                    ANGLE_VALIDATION_ERR(context, InvalidValue(), LevelNotZero);
>+                    context->validationError(GL_INVALID_VALUE, kLevelNotZero);
>                     return false;
>                 }
>-                if (tex->getTarget() != GL_TEXTURE_2D_MULTISAMPLE)
>+                if (tex->getType() != TextureType::_2DMultisample)
>                 {
>-                    context->handleError(InvalidOperation()
>-                                         << "Textarget must match the texture target type.");
>+                    context->validationError(GL_INVALID_OPERATION, kTextureTargetMismatch);
>                     return false;
>                 }
>             }
>             break;
> 
>             default:
>-                ANGLE_VALIDATION_ERR(context, InvalidEnum(), InvalidTextureTarget);
>+                context->validationError(GL_INVALID_ENUM, kInvalidTextureTarget);
>                 return false;
>         }
>-
>-        const Format &format = tex->getFormat(textarget, level);
>-        if (format.info->compressed)
>-        {
>-            context->handleError(InvalidOperation());
>-            return false;
>-        }
>     }
> 
>     return true;
>@@ -6106,19 +6235,19 @@ bool ValidateGenTextures(Context *context, GLint n, GLuint *)
>     return ValidateGenOrDelete(context, n);
> }
> 
>-bool ValidateGenerateMipmap(Context *context, GLenum target)
>+bool ValidateGenerateMipmap(Context *context, TextureType target)
> {
>     if (!ValidTextureTarget(context, target))
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidEnum(), InvalidTextureTarget);
>+        context->validationError(GL_INVALID_ENUM, kInvalidTextureTarget);
>         return false;
>     }
> 
>-    Texture *texture = context->getTargetTexture(target);
>+    Texture *texture = context->getTextureByType(target);
> 
>     if (texture == nullptr)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidOperation(), TextureNotBound);
>+        context->validationError(GL_INVALID_OPERATION, kTextureNotBound);
>         return false;
>     }
> 
>@@ -6128,16 +6257,18 @@ bool ValidateGenerateMipmap(Context *context, GLenum target)
>     // that out-of-range base level has a non-color-renderable / non-texture-filterable format.
>     if (effectiveBaseLevel >= gl::IMPLEMENTATION_MAX_TEXTURE_LEVELS)
>     {
>-        context->handleError(InvalidOperation());
>+        context->validationError(GL_INVALID_OPERATION, kBaseLevelOutOfRange);
>         return false;
>     }
> 
>-    GLenum baseTarget  = (target == GL_TEXTURE_CUBE_MAP) ? GL_TEXTURE_CUBE_MAP_POSITIVE_X : target;
>+    TextureTarget baseTarget = (target == TextureType::CubeMap)
>+                                   ? TextureTarget::CubeMapPositiveX
>+                                   : NonCubeTextureTypeToTarget(target);
>     const auto &format = *(texture->getFormat(baseTarget, effectiveBaseLevel).info);
>     if (format.sizedInternalFormat == GL_NONE || format.compressed || format.depthBits > 0 ||
>         format.stencilBits > 0)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidOperation(), GenerateMipmapNotAllowed);
>+        context->validationError(GL_INVALID_OPERATION, kGenerateMipmapNotAllowed);
>         return false;
>     }
> 
>@@ -6145,10 +6276,10 @@ bool ValidateGenerateMipmap(Context *context, GLenum target)
>     bool formatUnsized = !format.sized;
>     bool formatColorRenderableAndFilterable =
>         format.filterSupport(context->getClientVersion(), context->getExtensions()) &&
>-        format.renderSupport(context->getClientVersion(), context->getExtensions());
>+        format.textureAttachmentSupport(context->getClientVersion(), context->getExtensions());
>     if (!formatUnsized && !formatColorRenderableAndFilterable)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidOperation(), GenerateMipmapNotAllowed);
>+        context->validationError(GL_INVALID_OPERATION, kGenerateMipmapNotAllowed);
>         return false;
>     }
> 
>@@ -6156,17 +6287,15 @@ bool ValidateGenerateMipmap(Context *context, GLenum target)
>     // generation
>     if (format.colorEncoding == GL_SRGB && format.format == GL_RGB)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidOperation(), GenerateMipmapNotAllowed);
>+        context->validationError(GL_INVALID_OPERATION, kGenerateMipmapNotAllowed);
>         return false;
>     }
> 
>-    // ES3 and WebGL grant mipmap generation for sRGBA (with alpha) textures but GL_EXT_sRGB does
>-    // not.
>-    bool supportsSRGBMipmapGeneration =
>-        context->getClientVersion() >= ES_3_0 || context->getExtensions().webglCompatibility;
>-    if (!supportsSRGBMipmapGeneration && format.colorEncoding == GL_SRGB)
>+    // According to the OpenGL extension spec EXT_sRGB.txt, EXT_SRGB is based on ES 2.0 and
>+    // generateMipmap is not allowed if texture format is SRGB_EXT or SRGB_ALPHA_EXT.
>+    if (context->getClientVersion() < Version(3, 0) && format.colorEncoding == GL_SRGB)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidOperation(), GenerateMipmapNotAllowed);
>+        context->validationError(GL_INVALID_OPERATION, kGenerateMipmapNotAllowed);
>         return false;
>     }
> 
>@@ -6175,23 +6304,31 @@ bool ValidateGenerateMipmap(Context *context, GLenum target)
>         (!isPow2(static_cast<int>(texture->getWidth(baseTarget, 0))) ||
>          !isPow2(static_cast<int>(texture->getHeight(baseTarget, 0)))))
>     {
>-        ASSERT(target == GL_TEXTURE_2D || target == GL_TEXTURE_RECTANGLE_ANGLE ||
>-               target == GL_TEXTURE_CUBE_MAP);
>-        ANGLE_VALIDATION_ERR(context, InvalidOperation(), TextureNotPow2);
>+        ASSERT(target == TextureType::_2D || target == TextureType::Rectangle ||
>+               target == TextureType::CubeMap);
>+        context->validationError(GL_INVALID_OPERATION, kTextureNotPow2);
>         return false;
>     }
> 
>     // Cube completeness check
>-    if (target == GL_TEXTURE_CUBE_MAP && !texture->getTextureState().isCubeComplete())
>+    if (target == TextureType::CubeMap && !texture->getTextureState().isCubeComplete())
>+    {
>+        context->validationError(GL_INVALID_OPERATION, kCubemapIncomplete);
>+        return false;
>+    }
>+
>+    if (context->getExtensions().webglCompatibility &&
>+        (texture->getWidth(baseTarget, effectiveBaseLevel) == 0 ||
>+         texture->getHeight(baseTarget, effectiveBaseLevel) == 0))
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidOperation(), CubemapIncomplete);
>+        context->validationError(GL_INVALID_OPERATION, kGenerateMipmapZeroSize);
>         return false;
>     }
> 
>     return true;
> }
> 
>-bool ValidateGetBufferParameteriv(ValidationContext *context,
>+bool ValidateGetBufferParameteriv(Context *context,
>                                   BufferBinding target,
>                                   GLenum pname,
>                                   GLint *params)
>@@ -6212,16 +6349,42 @@ bool ValidateGetShaderiv(Context *context, GLuint shader, GLenum pname, GLint *p
>     return ValidateGetShaderivBase(context, shader, pname, nullptr);
> }
> 
>-bool ValidateGetTexParameterfv(Context *context, GLenum target, GLenum pname, GLfloat *params)
>+bool ValidateGetTexParameterfv(Context *context, TextureType target, GLenum pname, GLfloat *params)
> {
>     return ValidateGetTexParameterBase(context, target, pname, nullptr);
> }
> 
>-bool ValidateGetTexParameteriv(Context *context, GLenum target, GLenum pname, GLint *params)
>+bool ValidateGetTexParameteriv(Context *context, TextureType target, GLenum pname, GLint *params)
> {
>     return ValidateGetTexParameterBase(context, target, pname, nullptr);
> }
> 
>+bool ValidateGetTexParameterIivOES(Context *context,
>+                                   TextureType target,
>+                                   GLenum pname,
>+                                   GLint *params)
>+{
>+    if (context->getClientMajorVersion() < 3)
>+    {
>+        context->validationError(GL_INVALID_OPERATION, kES3Required);
>+        return false;
>+    }
>+    return ValidateGetTexParameterBase(context, target, pname, nullptr);
>+}
>+
>+bool ValidateGetTexParameterIuivOES(Context *context,
>+                                    TextureType target,
>+                                    GLenum pname,
>+                                    GLuint *params)
>+{
>+    if (context->getClientMajorVersion() < 3)
>+    {
>+        context->validationError(GL_INVALID_OPERATION, kES3Required);
>+        return false;
>+    }
>+    return ValidateGetTexParameterBase(context, target, pname, nullptr);
>+}
>+
> bool ValidateGetUniformfv(Context *context, GLuint program, GLint location, GLfloat *params)
> {
>     return ValidateGetUniformBase(context, program, location);
>@@ -6251,7 +6414,7 @@ bool ValidateIsEnabled(Context *context, GLenum cap)
> {
>     if (!ValidCap(context, cap, true))
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidEnum(), EnumNotSupported);
>+        context->validationError(GL_INVALID_ENUM, kEnumNotSupported);
>         return false;
>     }
> 
>@@ -6263,9 +6426,7 @@ bool ValidateLinkProgram(Context *context, GLuint program)
>     if (context->hasActiveTransformFeedback(program))
>     {
>         // ES 3.0.4 section 2.15 page 91
>-        context->handleError(InvalidOperation() << "Cannot link program while program is "
>-                                                   "associated with an active transform "
>-                                                   "feedback object.");
>+        context->validationError(GL_INVALID_OPERATION, kTransformFeedbackActiveDuringLink);
>         return false;
>     }
> 
>@@ -6291,61 +6452,532 @@ bool ValidateReadPixels(Context *context,
>                                   nullptr, pixels);
> }
> 
>-bool ValidateTexParameterf(Context *context, GLenum target, GLenum pname, GLfloat param)
>+bool ValidateTexParameterf(Context *context, TextureType target, GLenum pname, GLfloat param)
> {
>-    return ValidateTexParameterBase(context, target, pname, -1, &param);
>+    return ValidateTexParameterBase(context, target, pname, -1, false, &param);
> }
> 
>-bool ValidateTexParameterfv(Context *context, GLenum target, GLenum pname, const GLfloat *params)
>+bool ValidateTexParameterfv(Context *context,
>+                            TextureType target,
>+                            GLenum pname,
>+                            const GLfloat *params)
> {
>-    return ValidateTexParameterBase(context, target, pname, -1, params);
>+    return ValidateTexParameterBase(context, target, pname, -1, true, params);
> }
> 
>-bool ValidateTexParameteri(Context *context, GLenum target, GLenum pname, GLint param)
>+bool ValidateTexParameteri(Context *context, TextureType target, GLenum pname, GLint param)
> {
>-    return ValidateTexParameterBase(context, target, pname, -1, &param);
>+    return ValidateTexParameterBase(context, target, pname, -1, false, &param);
> }
> 
>-bool ValidateTexParameteriv(Context *context, GLenum target, GLenum pname, const GLint *params)
>+bool ValidateTexParameteriv(Context *context, TextureType target, GLenum pname, const GLint *params)
> {
>-    return ValidateTexParameterBase(context, target, pname, -1, params);
>+    return ValidateTexParameterBase(context, target, pname, -1, true, params);
>+}
>+
>+bool ValidateTexParameterIivOES(Context *context,
>+                                TextureType target,
>+                                GLenum pname,
>+                                const GLint *params)
>+{
>+    if (context->getClientMajorVersion() < 3)
>+    {
>+        context->validationError(GL_INVALID_OPERATION, kES3Required);
>+        return false;
>+    }
>+    return ValidateTexParameterBase(context, target, pname, -1, true, params);
>+}
>+
>+bool ValidateTexParameterIuivOES(Context *context,
>+                                 TextureType target,
>+                                 GLenum pname,
>+                                 const GLuint *params)
>+{
>+    if (context->getClientMajorVersion() < 3)
>+    {
>+        context->validationError(GL_INVALID_OPERATION, kES3Required);
>+        return false;
>+    }
>+    return ValidateTexParameterBase(context, target, pname, -1, true, params);
> }
> 
> bool ValidateUseProgram(Context *context, GLuint program)
> {
>     if (program != 0)
>     {
>-        Program *programObject = context->getProgram(program);
>+        Program *programObject = context->getProgramResolveLink(program);
>         if (!programObject)
>         {
>             // ES 3.1.0 section 7.3 page 72
>             if (context->getShader(program))
>             {
>-                ANGLE_VALIDATION_ERR(context, InvalidOperation(), ExpectedProgramName);
>+                context->validationError(GL_INVALID_OPERATION, kExpectedProgramName);
>                 return false;
>             }
>             else
>             {
>-                ANGLE_VALIDATION_ERR(context, InvalidValue(), InvalidProgramName);
>+                context->validationError(GL_INVALID_VALUE, kInvalidProgramName);
>                 return false;
>             }
>         }
>         if (!programObject->isLinked())
>         {
>-            ANGLE_VALIDATION_ERR(context, InvalidOperation(), ProgramNotLinked);
>+            context->validationError(GL_INVALID_OPERATION, kProgramNotLinked);
>             return false;
>         }
>     }
>-    if (context->getGLState().isTransformFeedbackActiveUnpaused())
>+    if (context->getState().isTransformFeedbackActiveUnpaused())
>     {
>         // ES 3.0.4 section 2.15 page 91
>-        context
>-            ->handleError(InvalidOperation()
>-                          << "Cannot change active program while transform feedback is unpaused.");
>+        context->validationError(GL_INVALID_OPERATION, kTransformFeedbackUseProgram);
>+        return false;
>+    }
>+
>+    return true;
>+}
>+
>+bool ValidateDeleteFencesNV(Context *context, GLsizei n, const GLuint *fences)
>+{
>+    if (!context->getExtensions().fence)
>+    {
>+        context->validationError(GL_INVALID_OPERATION, kNVFenceNotSupported);
>+        return false;
>+    }
>+
>+    if (n < 0)
>+    {
>+        context->validationError(GL_INVALID_VALUE, kNegativeCount);
>+        return false;
>+    }
>+
>+    return true;
>+}
>+
>+bool ValidateFinishFenceNV(Context *context, GLuint fence)
>+{
>+    if (!context->getExtensions().fence)
>+    {
>+        context->validationError(GL_INVALID_OPERATION, kNVFenceNotSupported);
>+        return false;
>+    }
>+
>+    FenceNV *fenceObject = context->getFenceNV(fence);
>+
>+    if (fenceObject == nullptr)
>+    {
>+        context->validationError(GL_INVALID_OPERATION, kInvalidFence);
>+        return false;
>+    }
>+
>+    if (!fenceObject->isSet())
>+    {
>+        context->validationError(GL_INVALID_OPERATION, kInvalidFenceState);
>+        return false;
>+    }
>+
>+    return true;
>+}
>+
>+bool ValidateGenFencesNV(Context *context, GLsizei n, GLuint *fences)
>+{
>+    if (!context->getExtensions().fence)
>+    {
>+        context->validationError(GL_INVALID_OPERATION, kNVFenceNotSupported);
>+        return false;
>+    }
>+
>+    if (n < 0)
>+    {
>+        context->validationError(GL_INVALID_VALUE, kNegativeCount);
>         return false;
>     }
> 
>     return true;
> }
> 
>+bool ValidateGetFenceivNV(Context *context, GLuint fence, GLenum pname, GLint *params)
>+{
>+    if (!context->getExtensions().fence)
>+    {
>+        context->validationError(GL_INVALID_OPERATION, kNVFenceNotSupported);
>+        return false;
>+    }
>+
>+    FenceNV *fenceObject = context->getFenceNV(fence);
>+
>+    if (fenceObject == nullptr)
>+    {
>+        context->validationError(GL_INVALID_OPERATION, kInvalidFence);
>+        return false;
>+    }
>+
>+    if (!fenceObject->isSet())
>+    {
>+        context->validationError(GL_INVALID_OPERATION, kInvalidFenceState);
>+        return false;
>+    }
>+
>+    switch (pname)
>+    {
>+        case GL_FENCE_STATUS_NV:
>+        case GL_FENCE_CONDITION_NV:
>+            break;
>+
>+        default:
>+            context->validationError(GL_INVALID_ENUM, kInvalidPname);
>+            return false;
>+    }
>+
>+    return true;
>+}
>+
>+bool ValidateGetGraphicsResetStatusEXT(Context *context)
>+{
>+    if (!context->getExtensions().robustness)
>+    {
>+        context->validationError(GL_INVALID_OPERATION, kExtensionNotEnabled);
>+        return false;
>+    }
>+
>+    return true;
>+}
>+
>+bool ValidateGetTranslatedShaderSourceANGLE(Context *context,
>+                                            GLuint shader,
>+                                            GLsizei bufsize,
>+                                            GLsizei *length,
>+                                            GLchar *source)
>+{
>+    if (!context->getExtensions().translatedShaderSource)
>+    {
>+        context->validationError(GL_INVALID_OPERATION, kExtensionNotEnabled);
>+        return false;
>+    }
>+
>+    if (bufsize < 0)
>+    {
>+        context->validationError(GL_INVALID_VALUE, kNegativeBufferSize);
>+        return false;
>+    }
>+
>+    Shader *shaderObject = context->getShader(shader);
>+
>+    if (!shaderObject)
>+    {
>+        context->validationError(GL_INVALID_OPERATION, kInvalidShaderName);
>+        return false;
>+    }
>+
>+    return true;
>+}
>+
>+bool ValidateIsFenceNV(Context *context, GLuint fence)
>+{
>+    if (!context->getExtensions().fence)
>+    {
>+        context->validationError(GL_INVALID_OPERATION, kNVFenceNotSupported);
>+        return false;
>+    }
>+
>+    return true;
>+}
>+
>+bool ValidateSetFenceNV(Context *context, GLuint fence, GLenum condition)
>+{
>+    if (!context->getExtensions().fence)
>+    {
>+        context->validationError(GL_INVALID_OPERATION, kNVFenceNotSupported);
>+        return false;
>+    }
>+
>+    if (condition != GL_ALL_COMPLETED_NV)
>+    {
>+        context->validationError(GL_INVALID_ENUM, kInvalidFenceCondition);
>+        return false;
>+    }
>+
>+    FenceNV *fenceObject = context->getFenceNV(fence);
>+
>+    if (fenceObject == nullptr)
>+    {
>+        context->validationError(GL_INVALID_OPERATION, kInvalidFence);
>+        return false;
>+    }
>+
>+    return true;
>+}
>+
>+bool ValidateTestFenceNV(Context *context, GLuint fence)
>+{
>+    if (!context->getExtensions().fence)
>+    {
>+        context->validationError(GL_INVALID_OPERATION, kNVFenceNotSupported);
>+        return false;
>+    }
>+
>+    FenceNV *fenceObject = context->getFenceNV(fence);
>+
>+    if (fenceObject == nullptr)
>+    {
>+        context->validationError(GL_INVALID_OPERATION, kInvalidFence);
>+        return false;
>+    }
>+
>+    if (fenceObject->isSet() != GL_TRUE)
>+    {
>+        context->validationError(GL_INVALID_OPERATION, kInvalidFenceState);
>+        return false;
>+    }
>+
>+    return true;
>+}
>+
>+bool ValidateTexStorage2DEXT(Context *context,
>+                             TextureType type,
>+                             GLsizei levels,
>+                             GLenum internalformat,
>+                             GLsizei width,
>+                             GLsizei height)
>+{
>+    if (!context->getExtensions().textureStorage)
>+    {
>+        context->validationError(GL_INVALID_OPERATION, kExtensionNotEnabled);
>+        return false;
>+    }
>+
>+    if (context->getClientMajorVersion() < 3)
>+    {
>+        return ValidateES2TexStorageParameters(context, type, levels, internalformat, width,
>+                                               height);
>+    }
>+
>+    ASSERT(context->getClientMajorVersion() >= 3);
>+    return ValidateES3TexStorage2DParameters(context, type, levels, internalformat, width, height,
>+                                             1);
>+}
>+
>+bool ValidateVertexAttribDivisorANGLE(Context *context, GLuint index, GLuint divisor)
>+{
>+    if (!context->getExtensions().instancedArraysANGLE)
>+    {
>+        context->validationError(GL_INVALID_OPERATION, kExtensionNotEnabled);
>+        return false;
>+    }
>+
>+    if (index >= MAX_VERTEX_ATTRIBS)
>+    {
>+        context->validationError(GL_INVALID_VALUE, kIndexExceedsMaxVertexAttribute);
>+        return false;
>+    }
>+
>+    if (context->getLimitations().attributeZeroRequiresZeroDivisorInEXT)
>+    {
>+        if (index == 0 && divisor != 0)
>+        {
>+            context->validationError(GL_INVALID_OPERATION, kAttributeZeroRequiresDivisorLimitation);
>+
>+            // We also output an error message to the debugger window if tracing is active, so
>+            // that developers can see the error message.
>+            ERR() << kAttributeZeroRequiresDivisorLimitation;
>+            return false;
>+        }
>+    }
>+
>+    return true;
>+}
>+
>+bool ValidateVertexAttribDivisorEXT(Context *context, GLuint index, GLuint divisor)
>+{
>+    if (!context->getExtensions().instancedArraysEXT)
>+    {
>+        context->validationError(GL_INVALID_OPERATION, kExtensionNotEnabled);
>+        return false;
>+    }
>+
>+    if (index >= MAX_VERTEX_ATTRIBS)
>+    {
>+        context->validationError(GL_INVALID_VALUE, kIndexExceedsMaxVertexAttribute);
>+        return false;
>+    }
>+
>+    return true;
>+}
>+
>+bool ValidateTexImage3DOES(Context *context,
>+                           GLenum target,
>+                           GLint level,
>+                           GLenum internalformat,
>+                           GLsizei width,
>+                           GLsizei height,
>+                           GLsizei depth,
>+                           GLint border,
>+                           GLenum format,
>+                           GLenum type,
>+                           const void *pixels)
>+{
>+    UNIMPLEMENTED();  // FIXME
>+    return false;
>+}
>+
>+bool ValidatePopGroupMarkerEXT(Context *context)
>+{
>+    if (!context->getExtensions().debugMarker)
>+    {
>+        // The debug marker calls should not set error state
>+        // However, it seems reasonable to set an error state if the extension is not enabled
>+        context->validationError(GL_INVALID_OPERATION, kExtensionNotEnabled);
>+        return false;
>+    }
>+
>+    return true;
>+}
>+
>+bool ValidateTexStorage1DEXT(Context *context,
>+                             GLenum target,
>+                             GLsizei levels,
>+                             GLenum internalformat,
>+                             GLsizei width)
>+{
>+    UNIMPLEMENTED();
>+    context->validationError(GL_INVALID_OPERATION, kExtensionNotEnabled);
>+    return false;
>+}
>+
>+bool ValidateTexStorage3DEXT(Context *context,
>+                             TextureType target,
>+                             GLsizei levels,
>+                             GLenum internalformat,
>+                             GLsizei width,
>+                             GLsizei height,
>+                             GLsizei depth)
>+{
>+    if (!context->getExtensions().textureStorage)
>+    {
>+        context->validationError(GL_INVALID_OPERATION, kExtensionNotEnabled);
>+        return false;
>+    }
>+
>+    if (context->getClientMajorVersion() < 3)
>+    {
>+        context->validationError(GL_INVALID_OPERATION, kExtensionNotEnabled);
>+        return false;
>+    }
>+
>+    return ValidateES3TexStorage3DParameters(context, target, levels, internalformat, width, height,
>+                                             depth);
>+}
>+
>+bool ValidateMaxShaderCompilerThreadsKHR(Context *context, GLuint count)
>+{
>+    if (!context->getExtensions().parallelShaderCompile)
>+    {
>+        context->validationError(GL_INVALID_OPERATION, kExtensionNotEnabled);
>+        return false;
>+    }
>+    return true;
>+}
>+
>+bool ValidateMultiDrawArraysANGLE(Context *context,
>+                                  PrimitiveMode mode,
>+                                  const GLint *firsts,
>+                                  const GLsizei *counts,
>+                                  GLsizei drawcount)
>+{
>+    if (!context->getExtensions().multiDraw)
>+    {
>+        context->validationError(GL_INVALID_OPERATION, kExtensionNotEnabled);
>+        return false;
>+    }
>+    for (GLsizei drawID = 0; drawID < drawcount; ++drawID)
>+    {
>+        if (!ValidateDrawArrays(context, mode, firsts[drawID], counts[drawID]))
>+        {
>+            return false;
>+        }
>+    }
>+    return true;
>+}
>+
>+bool ValidateMultiDrawElementsANGLE(Context *context,
>+                                    PrimitiveMode mode,
>+                                    const GLsizei *counts,
>+                                    DrawElementsType type,
>+                                    const GLvoid *const *indices,
>+                                    GLsizei drawcount)
>+{
>+    if (!context->getExtensions().multiDraw)
>+    {
>+        context->validationError(GL_INVALID_OPERATION, kExtensionNotEnabled);
>+        return false;
>+    }
>+    for (GLsizei drawID = 0; drawID < drawcount; ++drawID)
>+    {
>+        if (!ValidateDrawElements(context, mode, counts[drawID], type, indices[drawID]))
>+        {
>+            return false;
>+        }
>+    }
>+    return true;
>+}
>+
>+bool ValidateProvokingVertexANGLE(Context *context, ProvokingVertex modePacked)
>+{
>+    if (!context->getExtensions().provokingVertex)
>+    {
>+        context->validationError(GL_INVALID_OPERATION, kExtensionNotEnabled);
>+        return false;
>+    }
>+
>+    switch (modePacked)
>+    {
>+        case ProvokingVertex::FirstVertexConvention:
>+        case ProvokingVertex::LastVertexConvention:
>+            break;
>+        default:
>+            context->validationError(GL_INVALID_ENUM, kInvalidProvokingVertex);
>+            return false;
>+    }
>+
>+    return true;
>+}
>+
>+void RecordBindTextureTypeError(Context *context, TextureType target)
>+{
>+    ASSERT(!context->getStateCache().isValidBindTextureType(target));
>+
>+    switch (target)
>+    {
>+        case TextureType::Rectangle:
>+            ASSERT(!context->getExtensions().textureRectangle);
>+            context->validationError(GL_INVALID_ENUM, kTextureRectangleNotSupported);
>+            break;
>+
>+        case TextureType::_3D:
>+        case TextureType::_2DArray:
>+            ASSERT(context->getClientMajorVersion() < 3);
>+            context->validationError(GL_INVALID_ENUM, kES3Required);
>+            break;
>+
>+        case TextureType::_2DMultisample:
>+            ASSERT(context->getClientVersion() < Version(3, 1) &&
>+                   !context->getExtensions().textureMultisample);
>+            context->validationError(GL_INVALID_ENUM, kMultisampleTextureExtensionOrES31Required);
>+            break;
>+
>+        case TextureType::_2DMultisampleArray:
>+            ASSERT(!context->getExtensions().textureStorageMultisample2DArray);
>+            context->validationError(GL_INVALID_ENUM, kMultisampleArrayExtensionRequired);
>+            break;
>+
>+        case TextureType::External:
>+            ASSERT(!context->getExtensions().eglImageExternal &&
>+                   !context->getExtensions().eglStreamConsumerExternal);
>+            context->validationError(GL_INVALID_ENUM, kExternalTextureNotSupported);
>+            break;
>+
>+        default:
>+            context->validationError(GL_INVALID_ENUM, kInvalidTextureTarget);
>+    }
>+}
>+
> }  // namespace gl
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/validationES2.h b/Source/ThirdParty/ANGLE/src/libANGLE/validationES2.h
>index 5dc09176a1e..138aaae5b31 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/validationES2.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/validationES2.h
>@@ -1,687 +1,158 @@
> //
>-// Copyright (c) 2013 The ANGLE Project Authors. All rights reserved.
>+// Copyright 2018 The ANGLE Project Authors. All rights reserved.
> // Use of this source code is governed by a BSD-style license that can be
> // found in the LICENSE file.
> //
>-
>-// validationES2.h: Validation functions for OpenGL ES 2.0 entry point parameters
>+// validationES2.h:
>+//  Inlined validation functions for OpenGL ES 2.0 entry points.
> 
> #ifndef LIBANGLE_VALIDATION_ES2_H_
> #define LIBANGLE_VALIDATION_ES2_H_
> 
>-#include "libANGLE/PackedGLEnums.h"
>-
>-#include <GLES2/gl2.h>
>-#include <GLES2/gl2ext.h>
>+#include "libANGLE/ErrorStrings.h"
>+#include "libANGLE/validationES.h"
>+#include "libANGLE/validationES2_autogen.h"
> 
> namespace gl
> {
>-class Context;
>-class ValidationContext;
>-
>-bool ValidateES2TexStorageParameters(Context *context,
>-                                     GLenum target,
>-                                     GLsizei levels,
>-                                     GLenum internalformat,
>-                                     GLsizei width,
>-                                     GLsizei height);
>-
>-bool ValidateDiscardFramebufferEXT(Context *context,
>-                                   GLenum target,
>-                                   GLsizei numAttachments,
>-                                   const GLenum *attachments);
>-
>-bool ValidateDrawBuffersEXT(ValidationContext *context, GLsizei n, const GLenum *bufs);
>-
>-bool ValidateBindVertexArrayOES(Context *context, GLuint array);
>-bool ValidateDeleteVertexArraysOES(Context *context, GLsizei n, const GLuint *arrays);
>-bool ValidateGenVertexArraysOES(Context *context, GLsizei n, GLuint *arrays);
>-bool ValidateIsVertexArrayOES(Context *context, GLuint array);
>-
>-bool ValidateProgramBinaryOES(Context *context,
>-                              GLuint program,
>-                              GLenum binaryFormat,
>-                              const void *binary,
>-                              GLint length);
>-bool ValidateGetProgramBinaryOES(Context *context,
>-                                 GLuint program,
>-                                 GLsizei bufSize,
>-                                 GLsizei *length,
>-                                 GLenum *binaryFormat,
>-                                 void *binary);
>-
>-// GL_KHR_debug
>-bool ValidateDebugMessageControlKHR(Context *context,
>-                                    GLenum source,
>-                                    GLenum type,
>-                                    GLenum severity,
>-                                    GLsizei count,
>-                                    const GLuint *ids,
>-                                    GLboolean enabled);
>-bool ValidateDebugMessageInsertKHR(Context *context,
>-                                   GLenum source,
>-                                   GLenum type,
>-                                   GLuint id,
>-                                   GLenum severity,
>-                                   GLsizei length,
>-                                   const GLchar *buf);
>-bool ValidateDebugMessageCallbackKHR(Context *context,
>-                                     GLDEBUGPROCKHR callback,
>-                                     const void *userParam);
>-bool ValidateGetDebugMessageLogKHR(Context *context,
>-                                   GLuint count,
>-                                   GLsizei bufSize,
>-                                   GLenum *sources,
>-                                   GLenum *types,
>-                                   GLuint *ids,
>-                                   GLenum *severities,
>-                                   GLsizei *lengths,
>-                                   GLchar *messageLog);
>-bool ValidatePushDebugGroupKHR(Context *context,
>-                               GLenum source,
>-                               GLuint id,
>-                               GLsizei length,
>-                               const GLchar *message);
>-bool ValidatePopDebugGroupKHR(Context *context);
>-bool ValidateObjectLabelKHR(Context *context,
>-                            GLenum identifier,
>-                            GLuint name,
>-                            GLsizei length,
>-                            const GLchar *label);
>-bool ValidateGetObjectLabelKHR(Context *context,
>-                               GLenum identifier,
>-                               GLuint name,
>-                               GLsizei bufSize,
>-                               GLsizei *length,
>-                               GLchar *label);
>-bool ValidateObjectPtrLabelKHR(Context *context,
>-                               const void *ptr,
>-                               GLsizei length,
>-                               const GLchar *label);
>-bool ValidateGetObjectPtrLabelKHR(Context *context,
>-                                  const void *ptr,
>-                                  GLsizei bufSize,
>-                                  GLsizei *length,
>-                                  GLchar *label);
>-bool ValidateGetPointervKHR(Context *context, GLenum pname, void **params);
>-bool ValidateBlitFramebufferANGLE(Context *context,
>-                                  GLint srcX0,
>-                                  GLint srcY0,
>-                                  GLint srcX1,
>-                                  GLint srcY1,
>-                                  GLint dstX0,
>-                                  GLint dstY0,
>-                                  GLint dstX1,
>-                                  GLint dstY1,
>-                                  GLbitfield mask,
>-                                  GLenum filter);
>-
>-bool ValidateClear(ValidationContext *context, GLbitfield mask);
>-bool ValidateTexImage2D(Context *context,
>-                        GLenum target,
>-                        GLint level,
>-                        GLint internalformat,
>-                        GLsizei width,
>-                        GLsizei height,
>-                        GLint border,
>-                        GLenum format,
>-                        GLenum type,
>-                        const void *pixels);
>-bool ValidateTexImage2DRobust(Context *context,
>-                              GLenum target,
>-                              GLint level,
>-                              GLint internalformat,
>-                              GLsizei width,
>-                              GLsizei height,
>-                              GLint border,
>-                              GLenum format,
>-                              GLenum type,
>-                              GLsizei bufSize,
>-                              const void *pixels);
>-bool ValidateTexSubImage2D(Context *context,
>-                           GLenum target,
>-                           GLint level,
>-                           GLint xoffset,
>-                           GLint yoffset,
>-                           GLsizei width,
>-                           GLsizei height,
>-                           GLenum format,
>-                           GLenum type,
>-                           const void *pixels);
>-bool ValidateTexSubImage2DRobustANGLE(Context *context,
>-                                      GLenum target,
>-                                      GLint level,
>-                                      GLint xoffset,
>-                                      GLint yoffset,
>-                                      GLsizei width,
>-                                      GLsizei height,
>-                                      GLenum format,
>-                                      GLenum type,
>-                                      GLsizei bufSize,
>-                                      const void *pixels);
>-bool ValidateCompressedTexImage2D(Context *context,
>-                                  GLenum target,
>-                                  GLint level,
>-                                  GLenum internalformat,
>-                                  GLsizei width,
>-                                  GLsizei height,
>-                                  GLint border,
>-                                  GLsizei imageSize,
>-                                  const void *data);
>-bool ValidateCompressedTexSubImage2D(Context *context,
>-                                     GLenum target,
>-                                     GLint level,
>-                                     GLint xoffset,
>-                                     GLint yoffset,
>-                                     GLsizei width,
>-                                     GLsizei height,
>-                                     GLenum format,
>-                                     GLsizei imageSize,
>-                                     const void *data);
>-bool ValidateCompressedTexImage2DRobustANGLE(Context *context,
>-                                             GLenum target,
>-                                             GLint level,
>-                                             GLenum internalformat,
>-                                             GLsizei width,
>-                                             GLsizei height,
>-                                             GLint border,
>-                                             GLsizei imageSize,
>-                                             GLsizei dataSize,
>-                                             const void *data);
>-bool ValidateCompressedTexSubImage2DRobustANGLE(Context *context,
>-                                                GLenum target,
>-                                                GLint level,
>-                                                GLint xoffset,
>-                                                GLint yoffset,
>-                                                GLsizei width,
>-                                                GLsizei height,
>-                                                GLenum format,
>-                                                GLsizei imageSize,
>-                                                GLsizei dataSize,
>-                                                const void *data);
>-
>-bool ValidateBindTexture(Context *context, GLenum target, GLuint texture);
>-
>-bool ValidateGetBufferPointervOES(Context *context,
>-                                  BufferBinding target,
>-                                  GLenum pname,
>-                                  void **params);
>-bool ValidateMapBufferOES(Context *context, BufferBinding target, GLenum access);
>-bool ValidateUnmapBufferOES(Context *context, BufferBinding target);
>-bool ValidateMapBufferRangeEXT(Context *context,
>-                               BufferBinding target,
>-                               GLintptr offset,
>-                               GLsizeiptr length,
>-                               GLbitfield access);
>-bool ValidateMapBufferBase(Context *context, BufferBinding target);
>-bool ValidateFlushMappedBufferRangeEXT(Context *context,
>-                                       BufferBinding target,
>-                                       GLintptr offset,
>-                                       GLsizeiptr length);
>-
>-bool ValidateBindUniformLocationCHROMIUM(Context *context,
>-                                         GLuint program,
>-                                         GLint location,
>-                                         const GLchar *name);
>-
>-bool ValidateCoverageModulationCHROMIUM(Context *context, GLenum components);
>-
>-// CHROMIUM_path_rendering
>-bool ValidateMatrix(Context *context, GLenum matrixMode, const GLfloat *matrix);
>-bool ValidateMatrixMode(Context *context, GLenum matrixMode);
>-bool ValidateGenPaths(Context *context, GLsizei range);
>-bool ValidateDeletePaths(Context *context, GLuint first, GLsizei range);
>-bool ValidatePathCommands(Context *context,
>-                          GLuint path,
>-                          GLsizei numCommands,
>-                          const GLubyte *commands,
>-                          GLsizei numCoords,
>-                          GLenum coordType,
>-                          const void *coords);
>-bool ValidateSetPathParameter(Context *context, GLuint path, GLenum pname, GLfloat value);
>-bool ValidateGetPathParameter(Context *context, GLuint path, GLenum pname, GLfloat *value);
>-bool ValidatePathStencilFunc(Context *context, GLenum func, GLint ref, GLuint mask);
>-bool ValidateStencilFillPath(Context *context, GLuint path, GLenum fillMode, GLuint mask);
>-bool ValidateStencilStrokePath(Context *context, GLuint path, GLint reference, GLuint mask);
>-bool ValidateCoverPath(Context *context, GLuint path, GLenum coverMode);
>-bool ValidateStencilThenCoverFillPath(Context *context,
>-                                      GLuint path,
>-                                      GLenum fillMode,
>-                                      GLuint mask,
>-                                      GLenum coverMode);
>-bool ValidateStencilThenCoverStrokePath(Context *context,
>-                                        GLuint path,
>-                                        GLint reference,
>-                                        GLuint mask,
>-                                        GLenum coverMode);
>-bool ValidateIsPath(Context *context);
>-bool ValidateCoverFillPathInstanced(Context *context,
>-                                    GLsizei numPaths,
>-                                    GLenum pathNameType,
>-                                    const void *paths,
>-                                    GLuint pathBase,
>-                                    GLenum coverMode,
>-                                    GLenum transformType,
>-                                    const GLfloat *transformValues);
>-bool ValidateCoverStrokePathInstanced(Context *context,
>-                                      GLsizei numPaths,
>-                                      GLenum pathNameType,
>-                                      const void *paths,
>-                                      GLuint pathBase,
>-                                      GLenum coverMode,
>-                                      GLenum transformType,
>-                                      const GLfloat *transformValues);
>-bool ValidateStencilFillPathInstanced(Context *context,
>-                                      GLsizei numPaths,
>-                                      GLenum pathNameType,
>-                                      const void *paths,
>-                                      GLuint pathBAse,
>-                                      GLenum fillMode,
>-                                      GLuint mask,
>-                                      GLenum transformType,
>-                                      const GLfloat *transformValues);
>-bool ValidateStencilStrokePathInstanced(Context *context,
>-                                        GLsizei numPaths,
>-                                        GLenum pathNameType,
>-                                        const void *paths,
>-                                        GLuint pathBase,
>-                                        GLint reference,
>-                                        GLuint mask,
>-                                        GLenum transformType,
>-                                        const GLfloat *transformValues);
>-bool ValidateStencilThenCoverFillPathInstanced(Context *context,
>-                                               GLsizei numPaths,
>-                                               GLenum pathNameType,
>-                                               const void *paths,
>-                                               GLuint pathBase,
>-                                               GLenum fillMode,
>-                                               GLuint mask,
>-                                               GLenum coverMode,
>-                                               GLenum transformType,
>-                                               const GLfloat *transformValues);
>-bool ValidateStencilThenCoverStrokePathInstanced(Context *context,
>-                                                 GLsizei numPaths,
>-                                                 GLenum pathNameType,
>-                                                 const void *paths,
>-                                                 GLuint pathBase,
>-                                                 GLint reference,
>-                                                 GLuint mask,
>-                                                 GLenum coverMode,
>-                                                 GLenum transformType,
>-                                                 const GLfloat *transformValues);
>-bool ValidateBindFragmentInputLocation(Context *context,
>-                                       GLuint program,
>-                                       GLint location,
>-                                       const GLchar *name);
>-bool ValidateProgramPathFragmentInputGen(Context *context,
>-                                         GLuint program,
>-                                         GLint location,
>-                                         GLenum genMode,
>-                                         GLint components,
>-                                         const GLfloat *coeffs);
>-
>-bool ValidateCopyTextureCHROMIUM(Context *context,
>-                                 GLuint sourceId,
>-                                 GLint sourceLevel,
>-                                 GLenum destTarget,
>-                                 GLuint destId,
>-                                 GLint destLevel,
>-                                 GLint internalFormat,
>-                                 GLenum destType,
>-                                 GLboolean unpackFlipY,
>-                                 GLboolean unpackPremultiplyAlpha,
>-                                 GLboolean unpackUnmultiplyAlpha);
>-bool ValidateCopySubTextureCHROMIUM(Context *context,
>-                                    GLuint sourceId,
>-                                    GLint sourceLevel,
>-                                    GLenum destTarget,
>-                                    GLuint destId,
>-                                    GLint destLevel,
>-                                    GLint xoffset,
>-                                    GLint yoffset,
>-                                    GLint x,
>-                                    GLint y,
>-                                    GLsizei width,
>-                                    GLsizei height,
>-                                    GLboolean unpackFlipY,
>-                                    GLboolean unpackPremultiplyAlpha,
>-                                    GLboolean unpackUnmultiplyAlpha);
>-bool ValidateCompressedCopyTextureCHROMIUM(Context *context, GLuint sourceId, GLuint destId);
>-
>-bool ValidateCreateShader(Context *context, GLenum type);
>-bool ValidateBufferData(ValidationContext *context,
>-                        BufferBinding target,
>-                        GLsizeiptr size,
>-                        const void *data,
>-                        BufferUsage usage);
>-bool ValidateBufferSubData(ValidationContext *context,
>-                           BufferBinding target,
>-                           GLintptr offset,
>-                           GLsizeiptr size,
>-                           const void *data);
>-
>-bool ValidateRequestExtensionANGLE(Context *context, const GLchar *name);
>-
>-bool ValidateActiveTexture(ValidationContext *context, GLenum texture);
>-bool ValidateAttachShader(ValidationContext *context, GLuint program, GLuint shader);
>-bool ValidateBindAttribLocation(ValidationContext *context,
>-                                GLuint program,
>-                                GLuint index,
>-                                const GLchar *name);
>-bool ValidateBindBuffer(ValidationContext *context, BufferBinding target, GLuint buffer);
>-bool ValidateBindFramebuffer(ValidationContext *context, GLenum target, GLuint framebuffer);
>-bool ValidateBindRenderbuffer(ValidationContext *context, GLenum target, GLuint renderbuffer);
>-bool ValidateBlendColor(ValidationContext *context,
>-                        GLclampf red,
>-                        GLclampf green,
>-                        GLclampf blue,
>-                        GLclampf alpha);
>-bool ValidateBlendEquation(ValidationContext *context, GLenum mode);
>-bool ValidateBlendEquationSeparate(ValidationContext *context, GLenum modeRGB, GLenum modeAlpha);
>-bool ValidateBlendFunc(ValidationContext *context, GLenum sfactor, GLenum dfactor);
>-bool ValidateBlendFuncSeparate(ValidationContext *context,
>-                               GLenum srcRGB,
>-                               GLenum dstRGB,
>-                               GLenum srcAlpha,
>-                               GLenum dstAlpha);
>-
>-bool ValidateGetString(Context *context, GLenum name);
>-bool ValidateLineWidth(ValidationContext *context, GLfloat width);
>-bool ValidateVertexAttribPointer(ValidationContext *context,
>-                                 GLuint index,
>-                                 GLint size,
>-                                 GLenum type,
>-                                 GLboolean normalized,
>-                                 GLsizei stride,
>-                                 const void *ptr);
>-
>-bool ValidateDepthRangef(ValidationContext *context, GLclampf zNear, GLclampf zFar);
>-bool ValidateRenderbufferStorage(ValidationContext *context,
>-                                 GLenum target,
>-                                 GLenum internalformat,
>-                                 GLsizei width,
>-                                 GLsizei height);
>-bool ValidateRenderbufferStorageMultisampleANGLE(ValidationContext *context,
>-                                                 GLenum target,
>-                                                 GLsizei samples,
>-                                                 GLenum internalformat,
>-                                                 GLsizei width,
>-                                                 GLsizei height);
>-
>-bool ValidateCheckFramebufferStatus(ValidationContext *context, GLenum target);
>-bool ValidateClearColor(ValidationContext *context,
>-                        GLclampf red,
>-                        GLclampf green,
>-                        GLclampf blue,
>-                        GLclampf alpha);
>-bool ValidateClearDepthf(ValidationContext *context, GLclampf depth);
>-bool ValidateClearStencil(ValidationContext *context, GLint s);
>-bool ValidateColorMask(ValidationContext *context,
>-                       GLboolean red,
>-                       GLboolean green,
>-                       GLboolean blue,
>-                       GLboolean alpha);
>-bool ValidateCompileShader(ValidationContext *context, GLuint shader);
>-bool ValidateCreateProgram(ValidationContext *context);
>-bool ValidateCullFace(ValidationContext *context, CullFaceMode mode);
>-bool ValidateDeleteProgram(ValidationContext *context, GLuint program);
>-bool ValidateDeleteShader(ValidationContext *context, GLuint shader);
>-bool ValidateDepthFunc(ValidationContext *context, GLenum func);
>-bool ValidateDepthMask(ValidationContext *context, GLboolean flag);
>-bool ValidateDetachShader(ValidationContext *context, GLuint program, GLuint shader);
>-bool ValidateDisableVertexAttribArray(ValidationContext *context, GLuint index);
>-bool ValidateEnableVertexAttribArray(ValidationContext *context, GLuint index);
>-bool ValidateFinish(ValidationContext *context);
>-bool ValidateFlush(ValidationContext *context);
>-bool ValidateFrontFace(ValidationContext *context, GLenum mode);
>-bool ValidateGetActiveAttrib(ValidationContext *context,
>-                             GLuint program,
>-                             GLuint index,
>-                             GLsizei bufsize,
>-                             GLsizei *length,
>-                             GLint *size,
>-                             GLenum *type,
>-                             GLchar *name);
>-bool ValidateGetActiveUniform(ValidationContext *context,
>-                              GLuint program,
>-                              GLuint index,
>-                              GLsizei bufsize,
>-                              GLsizei *length,
>-                              GLint *size,
>-                              GLenum *type,
>-                              GLchar *name);
>-bool ValidateGetAttachedShaders(ValidationContext *context,
>-                                GLuint program,
>-                                GLsizei maxcount,
>-                                GLsizei *count,
>-                                GLuint *shaders);
>-bool ValidateGetAttribLocation(ValidationContext *context, GLuint program, const GLchar *name);
>-bool ValidateGetBooleanv(ValidationContext *context, GLenum pname, GLboolean *params);
>-bool ValidateGetError(ValidationContext *context);
>-bool ValidateGetFloatv(ValidationContext *context, GLenum pname, GLfloat *params);
>-bool ValidateGetIntegerv(ValidationContext *context, GLenum pname, GLint *params);
>-bool ValidateGetProgramInfoLog(ValidationContext *context,
>-                               GLuint program,
>-                               GLsizei bufsize,
>-                               GLsizei *length,
>-                               GLchar *infolog);
>-bool ValidateGetShaderInfoLog(ValidationContext *context,
>-                              GLuint shader,
>-                              GLsizei bufsize,
>-                              GLsizei *length,
>-                              GLchar *infolog);
>-bool ValidateGetShaderPrecisionFormat(ValidationContext *context,
>-                                      GLenum shadertype,
>-                                      GLenum precisiontype,
>-                                      GLint *range,
>-                                      GLint *precision);
>-bool ValidateGetShaderSource(ValidationContext *context,
>-                             GLuint shader,
>-                             GLsizei bufsize,
>-                             GLsizei *length,
>-                             GLchar *source);
>-bool ValidateGetUniformLocation(ValidationContext *context, GLuint program, const GLchar *name);
>-bool ValidateHint(ValidationContext *context, GLenum target, GLenum mode);
>-bool ValidateIsBuffer(ValidationContext *context, GLuint buffer);
>-bool ValidateIsFramebuffer(ValidationContext *context, GLuint framebuffer);
>-bool ValidateIsProgram(ValidationContext *context, GLuint program);
>-bool ValidateIsRenderbuffer(ValidationContext *context, GLuint renderbuffer);
>-bool ValidateIsShader(ValidationContext *context, GLuint shader);
>-bool ValidateIsTexture(ValidationContext *context, GLuint texture);
>-bool ValidatePixelStorei(ValidationContext *context, GLenum pname, GLint param);
>-bool ValidatePolygonOffset(ValidationContext *context, GLfloat factor, GLfloat units);
>-bool ValidateReleaseShaderCompiler(ValidationContext *context);
>-bool ValidateSampleCoverage(ValidationContext *context, GLclampf value, GLboolean invert);
>-bool ValidateScissor(ValidationContext *context, GLint x, GLint y, GLsizei width, GLsizei height);
>-bool ValidateShaderBinary(ValidationContext *context,
>-                          GLsizei n,
>-                          const GLuint *shaders,
>-                          GLenum binaryformat,
>-                          const void *binary,
>-                          GLsizei length);
>-bool ValidateShaderSource(ValidationContext *context,
>-                          GLuint shader,
>-                          GLsizei count,
>-                          const GLchar *const *string,
>-                          const GLint *length);
>-bool ValidateStencilFunc(ValidationContext *context, GLenum func, GLint ref, GLuint mask);
>-bool ValidateStencilFuncSeparate(ValidationContext *context,
>-                                 GLenum face,
>-                                 GLenum func,
>-                                 GLint ref,
>-                                 GLuint mask);
>-bool ValidateStencilMask(ValidationContext *context, GLuint mask);
>-bool ValidateStencilMaskSeparate(ValidationContext *context, GLenum face, GLuint mask);
>-bool ValidateStencilOp(ValidationContext *context, GLenum fail, GLenum zfail, GLenum zpass);
>-bool ValidateStencilOpSeparate(ValidationContext *context,
>-                               GLenum face,
>-                               GLenum fail,
>-                               GLenum zfail,
>-                               GLenum zpass);
>-bool ValidateUniform1f(ValidationContext *context, GLint location, GLfloat x);
>-bool ValidateUniform1fv(ValidationContext *context,
>-                        GLint location,
>-                        GLsizei count,
>-                        const GLfloat *v);
>-bool ValidateUniform1i(ValidationContext *context, GLint location, GLint x);
>-bool ValidateUniform2f(ValidationContext *context, GLint location, GLfloat x, GLfloat y);
>-bool ValidateUniform2fv(ValidationContext *context,
>-                        GLint location,
>-                        GLsizei count,
>-                        const GLfloat *v);
>-bool ValidateUniform2i(ValidationContext *context, GLint location, GLint x, GLint y);
>-bool ValidateUniform2iv(ValidationContext *context, GLint location, GLsizei count, const GLint *v);
>-bool ValidateUniform3f(ValidationContext *context, GLint location, GLfloat x, GLfloat y, GLfloat z);
>-bool ValidateUniform3fv(ValidationContext *context,
>-                        GLint location,
>-                        GLsizei count,
>-                        const GLfloat *v);
>-bool ValidateUniform3i(ValidationContext *context, GLint location, GLint x, GLint y, GLint z);
>-bool ValidateUniform3iv(ValidationContext *context, GLint location, GLsizei count, const GLint *v);
>-bool ValidateUniform4f(ValidationContext *context,
>-                       GLint location,
>-                       GLfloat x,
>-                       GLfloat y,
>-                       GLfloat z,
>-                       GLfloat w);
>-bool ValidateUniform4fv(ValidationContext *context,
>-                        GLint location,
>-                        GLsizei count,
>-                        const GLfloat *v);
>-bool ValidateUniform4i(ValidationContext *context,
>-                       GLint location,
>-                       GLint x,
>-                       GLint y,
>-                       GLint z,
>-                       GLint w);
>-bool ValidateUniform4iv(ValidationContext *context, GLint location, GLsizei count, const GLint *v);
>-bool ValidateUniformMatrix2fv(ValidationContext *context,
>-                              GLint location,
>-                              GLsizei count,
>-                              GLboolean transpose,
>-                              const GLfloat *value);
>-bool ValidateUniformMatrix3fv(ValidationContext *context,
>-                              GLint location,
>-                              GLsizei count,
>-                              GLboolean transpose,
>-                              const GLfloat *value);
>-bool ValidateUniformMatrix4fv(ValidationContext *context,
>-                              GLint location,
>-                              GLsizei count,
>-                              GLboolean transpose,
>-                              const GLfloat *value);
>-bool ValidateValidateProgram(ValidationContext *context, GLuint program);
>-bool ValidateVertexAttrib1f(ValidationContext *context, GLuint index, GLfloat x);
>-bool ValidateVertexAttrib1fv(ValidationContext *context, GLuint index, const GLfloat *values);
>-bool ValidateVertexAttrib2f(ValidationContext *context, GLuint index, GLfloat x, GLfloat y);
>-bool ValidateVertexAttrib2fv(ValidationContext *context, GLuint index, const GLfloat *values);
>-bool ValidateVertexAttrib3f(ValidationContext *context,
>-                            GLuint index,
>-                            GLfloat x,
>-                            GLfloat y,
>-                            GLfloat z);
>-bool ValidateVertexAttrib3fv(ValidationContext *context, GLuint index, const GLfloat *values);
>-bool ValidateVertexAttrib4f(ValidationContext *context,
>-                            GLuint index,
>-                            GLfloat x,
>-                            GLfloat y,
>-                            GLfloat z,
>-                            GLfloat w);
>-bool ValidateVertexAttrib4fv(ValidationContext *context, GLuint index, const GLfloat *values);
>-bool ValidateViewport(ValidationContext *context, GLint x, GLint y, GLsizei width, GLsizei height);
>-bool ValidateDrawElements(ValidationContext *context,
>-                          GLenum mode,
>-                          GLsizei count,
>-                          GLenum type,
>-                          const void *indices);
>-
>-bool ValidateDrawArrays(ValidationContext *context, GLenum mode, GLint first, GLsizei count);
>-
>-bool ValidateGetFramebufferAttachmentParameteriv(ValidationContext *context,
>-                                                 GLenum target,
>-                                                 GLenum attachment,
>-                                                 GLenum pname,
>-                                                 GLint *params);
>-bool ValidateGetProgramiv(ValidationContext *context, GLuint program, GLenum pname, GLint *params);
>-
>-bool ValidateCopyTexImage2D(ValidationContext *context,
>-                            GLenum target,
>-                            GLint level,
>-                            GLenum internalformat,
>-                            GLint x,
>-                            GLint y,
>-                            GLsizei width,
>-                            GLsizei height,
>-                            GLint border);
>-
>-bool ValidateCopyTexSubImage2D(Context *context,
>-                               GLenum target,
>-                               GLint level,
>-                               GLint xoffset,
>-                               GLint yoffset,
>-                               GLint x,
>-                               GLint y,
>-                               GLsizei width,
>-                               GLsizei height);
>+ANGLE_INLINE bool ValidateDrawArrays(Context *context,
>+                                     PrimitiveMode mode,
>+                                     GLint first,
>+                                     GLsizei count)
>+{
>+    return ValidateDrawArraysCommon(context, mode, first, count, 1);
>+}
> 
>-bool ValidateDeleteBuffers(Context *context, GLint n, const GLuint *buffers);
>-bool ValidateDeleteFramebuffers(Context *context, GLint n, const GLuint *framebuffers);
>-bool ValidateDeleteRenderbuffers(Context *context, GLint n, const GLuint *renderbuffers);
>-bool ValidateDeleteTextures(Context *context, GLint n, const GLuint *textures);
>-bool ValidateDisable(Context *context, GLenum cap);
>-bool ValidateEnable(Context *context, GLenum cap);
>-bool ValidateFramebufferRenderbuffer(Context *context,
>-                                     GLenum target,
>-                                     GLenum attachment,
>-                                     GLenum renderbuffertarget,
>-                                     GLuint renderbuffer);
>-bool ValidateFramebufferTexture2D(Context *context,
>-                                  GLenum target,
>-                                  GLenum attachment,
>-                                  GLenum textarget,
>-                                  GLuint texture,
>-                                  GLint level);
>-bool ValidateGenBuffers(Context *context, GLint n, GLuint *buffers);
>-bool ValidateGenerateMipmap(Context *context, GLenum target);
>-bool ValidateGenFramebuffers(Context *context, GLint n, GLuint *framebuffers);
>-bool ValidateGenRenderbuffers(Context *context, GLint n, GLuint *renderbuffers);
>-bool ValidateGenTextures(Context *context, GLint n, GLuint *textures);
>-bool ValidateGetBufferParameteriv(ValidationContext *context,
>-                                  BufferBinding target,
>-                                  GLenum pname,
>-                                  GLint *params);
>-bool ValidateGetRenderbufferParameteriv(Context *context,
>-                                        GLenum target,
>-                                        GLenum pname,
>-                                        GLint *params);
>-bool ValidateGetShaderiv(Context *context, GLuint shader, GLenum pname, GLint *params);
>-bool ValidateGetTexParameterfv(Context *context, GLenum target, GLenum pname, GLfloat *params);
>-bool ValidateGetTexParameteriv(Context *context, GLenum target, GLenum pname, GLint *params);
>-bool ValidateGetUniformfv(Context *context, GLuint program, GLint location, GLfloat *params);
>-bool ValidateGetUniformiv(Context *context, GLuint program, GLint location, GLint *params);
>-bool ValidateGetVertexAttribfv(Context *context, GLuint index, GLenum pname, GLfloat *params);
>-bool ValidateGetVertexAttribiv(Context *context, GLuint index, GLenum pname, GLint *params);
>-bool ValidateGetVertexAttribPointerv(Context *context, GLuint index, GLenum pname, void **pointer);
>-bool ValidateIsEnabled(Context *context, GLenum cap);
>-bool ValidateLinkProgram(Context *context, GLuint program);
>-bool ValidateReadPixels(Context *context,
>-                        GLint x,
>-                        GLint y,
>-                        GLsizei width,
>-                        GLsizei height,
>-                        GLenum format,
>-                        GLenum type,
>-                        void *pixels);
>-bool ValidateTexParameterf(Context *context, GLenum target, GLenum pname, GLfloat param);
>-bool ValidateTexParameterfv(Context *context, GLenum target, GLenum pname, const GLfloat *params);
>-bool ValidateTexParameteri(Context *context, GLenum target, GLenum pname, GLint param);
>-bool ValidateTexParameteriv(Context *context, GLenum target, GLenum pname, const GLint *params);
>-bool ValidateUniform1iv(ValidationContext *context,
>-                        GLint location,
>-                        GLsizei count,
>-                        const GLint *value);
>-bool ValidateUseProgram(Context *context, GLuint program);
>+ANGLE_INLINE bool ValidateUniform2f(Context *context, GLint location, GLfloat x, GLfloat y)
>+{
>+    return ValidateUniform(context, GL_FLOAT_VEC2, location, 1);
>+}
> 
>+ANGLE_INLINE bool ValidateBindBuffer(Context *context, BufferBinding target, GLuint buffer)
>+{
>+    if (!context->isValidBufferBinding(target))
>+    {
>+        context->validationError(GL_INVALID_ENUM, err::kInvalidBufferTypes);
>+        return false;
>+    }
>+
>+    if (!context->getState().isBindGeneratesResourceEnabled() &&
>+        !context->isBufferGenerated(buffer))
>+    {
>+        context->validationError(GL_INVALID_OPERATION, err::kObjectNotGenerated);
>+        return false;
>+    }
>+
>+    return true;
>+}
>+
>+ANGLE_INLINE bool ValidateDrawElements(Context *context,
>+                                       PrimitiveMode mode,
>+                                       GLsizei count,
>+                                       DrawElementsType type,
>+                                       const void *indices)
>+{
>+    return ValidateDrawElementsCommon(context, mode, count, type, indices, 1);
>+}
>+
>+ANGLE_INLINE bool ValidateVertexAttribPointer(Context *context,
>+                                              GLuint index,
>+                                              GLint size,
>+                                              VertexAttribType type,
>+                                              GLboolean normalized,
>+                                              GLsizei stride,
>+                                              const void *ptr)
>+{
>+    if (!ValidateFloatVertexFormat(context, index, size, type))
>+    {
>+        return false;
>+    }
>+
>+    if (stride < 0)
>+    {
>+        context->validationError(GL_INVALID_VALUE, err::kNegativeStride);
>+        return false;
>+    }
>+
>+    if (context->getClientVersion() >= ES_3_1)
>+    {
>+        const Caps &caps = context->getCaps();
>+        if (stride > caps.maxVertexAttribStride)
>+        {
>+            context->validationError(GL_INVALID_VALUE, err::kExceedsMaxVertexAttribStride);
>+            return false;
>+        }
>+
>+        if (index >= caps.maxVertexAttribBindings)
>+        {
>+            context->validationError(GL_INVALID_VALUE, err::kExceedsMaxVertexAttribBindings);
>+            return false;
>+        }
>+    }
>+
>+    // [OpenGL ES 3.0.2] Section 2.8 page 24:
>+    // An INVALID_OPERATION error is generated when a non-zero vertex array object
>+    // is bound, zero is bound to the ARRAY_BUFFER buffer object binding point,
>+    // and the pointer argument is not NULL.
>+    bool nullBufferAllowed = context->getState().areClientArraysEnabled() &&
>+                             context->getState().getVertexArray()->id() == 0;
>+    if (!nullBufferAllowed && context->getState().getTargetBuffer(BufferBinding::Array) == 0 &&
>+        ptr != nullptr)
>+    {
>+        context->validationError(GL_INVALID_OPERATION, err::kClientDataInVertexArray);
>+        return false;
>+    }
>+
>+    if (context->getExtensions().webglCompatibility)
>+    {
>+        // WebGL 1.0 [Section 6.14] Fixed point support
>+        // The WebGL API does not support the GL_FIXED data type.
>+        if (type == VertexAttribType::Fixed)
>+        {
>+            context->validationError(GL_INVALID_ENUM, err::kFixedNotInWebGL);
>+            return false;
>+        }
>+
>+        if (!ValidateWebGLVertexAttribPointer(context, type, normalized, stride, ptr, false))
>+        {
>+            return false;
>+        }
>+    }
>+
>+    return true;
>+}
>+
>+void RecordBindTextureTypeError(Context *context, TextureType target);
>+
>+ANGLE_INLINE bool ValidateBindTexture(Context *context, TextureType target, GLuint texture)
>+{
>+    if (!context->getStateCache().isValidBindTextureType(target))
>+    {
>+        RecordBindTextureTypeError(context, target);
>+        return false;
>+    }
>+
>+    if (texture == 0)
>+    {
>+        return true;
>+    }
>+
>+    Texture *textureObject = context->getTexture(texture);
>+    if (textureObject && textureObject->getType() != target)
>+    {
>+        context->validationError(GL_INVALID_OPERATION, err::kTextureTargetMismatch);
>+        return false;
>+    }
>+
>+    if (!context->getState().isBindGeneratesResourceEnabled() &&
>+        !context->isTextureGenerated(texture))
>+    {
>+        context->validationError(GL_INVALID_OPERATION, err::kObjectNotGenerated);
>+        return false;
>+    }
>+
>+    return true;
>+}
> }  // namespace gl
> 
> #endif  // LIBANGLE_VALIDATION_ES2_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/validationES2_autogen.h b/Source/ThirdParty/ANGLE/src/libANGLE/validationES2_autogen.h
>new file mode 100644
>index 00000000000..b2fa1184a18
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/validationES2_autogen.h
>@@ -0,0 +1,356 @@
>+// GENERATED FILE - DO NOT EDIT.
>+// Generated by generate_entry_points.py using data from gl.xml and gl_angle_ext.xml.
>+//
>+// Copyright 2019 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// validationES2_autogen.h:
>+//   Validation functions for the OpenGL ES 2.0 entry points.
>+
>+#ifndef LIBANGLE_VALIDATION_ES2_AUTOGEN_H_
>+#define LIBANGLE_VALIDATION_ES2_AUTOGEN_H_
>+
>+#include "common/PackedEnums.h"
>+
>+namespace gl
>+{
>+class Context;
>+
>+bool ValidateActiveTexture(Context *context, GLenum texture);
>+bool ValidateAttachShader(Context *context, GLuint program, GLuint shader);
>+bool ValidateBindAttribLocation(Context *context, GLuint program, GLuint index, const GLchar *name);
>+bool ValidateBindBuffer(Context *context, BufferBinding targetPacked, GLuint buffer);
>+bool ValidateBindFramebuffer(Context *context, GLenum target, GLuint framebuffer);
>+bool ValidateBindRenderbuffer(Context *context, GLenum target, GLuint renderbuffer);
>+bool ValidateBindTexture(Context *context, TextureType targetPacked, GLuint texture);
>+bool ValidateBlendColor(Context *context, GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha);
>+bool ValidateBlendEquation(Context *context, GLenum mode);
>+bool ValidateBlendEquationSeparate(Context *context, GLenum modeRGB, GLenum modeAlpha);
>+bool ValidateBlendFunc(Context *context, GLenum sfactor, GLenum dfactor);
>+bool ValidateBlendFuncSeparate(Context *context,
>+                               GLenum sfactorRGB,
>+                               GLenum dfactorRGB,
>+                               GLenum sfactorAlpha,
>+                               GLenum dfactorAlpha);
>+bool ValidateBufferData(Context *context,
>+                        BufferBinding targetPacked,
>+                        GLsizeiptr size,
>+                        const void *data,
>+                        BufferUsage usagePacked);
>+bool ValidateBufferSubData(Context *context,
>+                           BufferBinding targetPacked,
>+                           GLintptr offset,
>+                           GLsizeiptr size,
>+                           const void *data);
>+bool ValidateCheckFramebufferStatus(Context *context, GLenum target);
>+bool ValidateClear(Context *context, GLbitfield mask);
>+bool ValidateClearColor(Context *context, GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha);
>+bool ValidateClearDepthf(Context *context, GLfloat d);
>+bool ValidateClearStencil(Context *context, GLint s);
>+bool ValidateColorMask(Context *context,
>+                       GLboolean red,
>+                       GLboolean green,
>+                       GLboolean blue,
>+                       GLboolean alpha);
>+bool ValidateCompileShader(Context *context, GLuint shader);
>+bool ValidateCompressedTexImage2D(Context *context,
>+                                  TextureTarget targetPacked,
>+                                  GLint level,
>+                                  GLenum internalformat,
>+                                  GLsizei width,
>+                                  GLsizei height,
>+                                  GLint border,
>+                                  GLsizei imageSize,
>+                                  const void *data);
>+bool ValidateCompressedTexSubImage2D(Context *context,
>+                                     TextureTarget targetPacked,
>+                                     GLint level,
>+                                     GLint xoffset,
>+                                     GLint yoffset,
>+                                     GLsizei width,
>+                                     GLsizei height,
>+                                     GLenum format,
>+                                     GLsizei imageSize,
>+                                     const void *data);
>+bool ValidateCopyTexImage2D(Context *context,
>+                            TextureTarget targetPacked,
>+                            GLint level,
>+                            GLenum internalformat,
>+                            GLint x,
>+                            GLint y,
>+                            GLsizei width,
>+                            GLsizei height,
>+                            GLint border);
>+bool ValidateCopyTexSubImage2D(Context *context,
>+                               TextureTarget targetPacked,
>+                               GLint level,
>+                               GLint xoffset,
>+                               GLint yoffset,
>+                               GLint x,
>+                               GLint y,
>+                               GLsizei width,
>+                               GLsizei height);
>+bool ValidateCreateProgram(Context *context);
>+bool ValidateCreateShader(Context *context, ShaderType typePacked);
>+bool ValidateCullFace(Context *context, CullFaceMode modePacked);
>+bool ValidateDeleteBuffers(Context *context, GLsizei n, const GLuint *buffers);
>+bool ValidateDeleteFramebuffers(Context *context, GLsizei n, const GLuint *framebuffers);
>+bool ValidateDeleteProgram(Context *context, GLuint program);
>+bool ValidateDeleteRenderbuffers(Context *context, GLsizei n, const GLuint *renderbuffers);
>+bool ValidateDeleteShader(Context *context, GLuint shader);
>+bool ValidateDeleteTextures(Context *context, GLsizei n, const GLuint *textures);
>+bool ValidateDepthFunc(Context *context, GLenum func);
>+bool ValidateDepthMask(Context *context, GLboolean flag);
>+bool ValidateDepthRangef(Context *context, GLfloat n, GLfloat f);
>+bool ValidateDetachShader(Context *context, GLuint program, GLuint shader);
>+bool ValidateDisable(Context *context, GLenum cap);
>+bool ValidateDisableVertexAttribArray(Context *context, GLuint index);
>+bool ValidateDrawArrays(Context *context, PrimitiveMode modePacked, GLint first, GLsizei count);
>+bool ValidateDrawElements(Context *context,
>+                          PrimitiveMode modePacked,
>+                          GLsizei count,
>+                          DrawElementsType typePacked,
>+                          const void *indices);
>+bool ValidateEnable(Context *context, GLenum cap);
>+bool ValidateEnableVertexAttribArray(Context *context, GLuint index);
>+bool ValidateFinish(Context *context);
>+bool ValidateFlush(Context *context);
>+bool ValidateFramebufferRenderbuffer(Context *context,
>+                                     GLenum target,
>+                                     GLenum attachment,
>+                                     GLenum renderbuffertarget,
>+                                     GLuint renderbuffer);
>+bool ValidateFramebufferTexture2D(Context *context,
>+                                  GLenum target,
>+                                  GLenum attachment,
>+                                  TextureTarget textargetPacked,
>+                                  GLuint texture,
>+                                  GLint level);
>+bool ValidateFrontFace(Context *context, GLenum mode);
>+bool ValidateGenBuffers(Context *context, GLsizei n, GLuint *buffers);
>+bool ValidateGenFramebuffers(Context *context, GLsizei n, GLuint *framebuffers);
>+bool ValidateGenRenderbuffers(Context *context, GLsizei n, GLuint *renderbuffers);
>+bool ValidateGenTextures(Context *context, GLsizei n, GLuint *textures);
>+bool ValidateGenerateMipmap(Context *context, TextureType targetPacked);
>+bool ValidateGetActiveAttrib(Context *context,
>+                             GLuint program,
>+                             GLuint index,
>+                             GLsizei bufSize,
>+                             GLsizei *length,
>+                             GLint *size,
>+                             GLenum *type,
>+                             GLchar *name);
>+bool ValidateGetActiveUniform(Context *context,
>+                              GLuint program,
>+                              GLuint index,
>+                              GLsizei bufSize,
>+                              GLsizei *length,
>+                              GLint *size,
>+                              GLenum *type,
>+                              GLchar *name);
>+bool ValidateGetAttachedShaders(Context *context,
>+                                GLuint program,
>+                                GLsizei maxCount,
>+                                GLsizei *count,
>+                                GLuint *shaders);
>+bool ValidateGetAttribLocation(Context *context, GLuint program, const GLchar *name);
>+bool ValidateGetBooleanv(Context *context, GLenum pname, GLboolean *data);
>+bool ValidateGetBufferParameteriv(Context *context,
>+                                  BufferBinding targetPacked,
>+                                  GLenum pname,
>+                                  GLint *params);
>+bool ValidateGetError(Context *context);
>+bool ValidateGetFloatv(Context *context, GLenum pname, GLfloat *data);
>+bool ValidateGetFramebufferAttachmentParameteriv(Context *context,
>+                                                 GLenum target,
>+                                                 GLenum attachment,
>+                                                 GLenum pname,
>+                                                 GLint *params);
>+bool ValidateGetIntegerv(Context *context, GLenum pname, GLint *data);
>+bool ValidateGetProgramInfoLog(Context *context,
>+                               GLuint program,
>+                               GLsizei bufSize,
>+                               GLsizei *length,
>+                               GLchar *infoLog);
>+bool ValidateGetProgramiv(Context *context, GLuint program, GLenum pname, GLint *params);
>+bool ValidateGetRenderbufferParameteriv(Context *context,
>+                                        GLenum target,
>+                                        GLenum pname,
>+                                        GLint *params);
>+bool ValidateGetShaderInfoLog(Context *context,
>+                              GLuint shader,
>+                              GLsizei bufSize,
>+                              GLsizei *length,
>+                              GLchar *infoLog);
>+bool ValidateGetShaderPrecisionFormat(Context *context,
>+                                      GLenum shadertype,
>+                                      GLenum precisiontype,
>+                                      GLint *range,
>+                                      GLint *precision);
>+bool ValidateGetShaderSource(Context *context,
>+                             GLuint shader,
>+                             GLsizei bufSize,
>+                             GLsizei *length,
>+                             GLchar *source);
>+bool ValidateGetShaderiv(Context *context, GLuint shader, GLenum pname, GLint *params);
>+bool ValidateGetString(Context *context, GLenum name);
>+bool ValidateGetTexParameterfv(Context *context,
>+                               TextureType targetPacked,
>+                               GLenum pname,
>+                               GLfloat *params);
>+bool ValidateGetTexParameteriv(Context *context,
>+                               TextureType targetPacked,
>+                               GLenum pname,
>+                               GLint *params);
>+bool ValidateGetUniformLocation(Context *context, GLuint program, const GLchar *name);
>+bool ValidateGetUniformfv(Context *context, GLuint program, GLint location, GLfloat *params);
>+bool ValidateGetUniformiv(Context *context, GLuint program, GLint location, GLint *params);
>+bool ValidateGetVertexAttribPointerv(Context *context, GLuint index, GLenum pname, void **pointer);
>+bool ValidateGetVertexAttribfv(Context *context, GLuint index, GLenum pname, GLfloat *params);
>+bool ValidateGetVertexAttribiv(Context *context, GLuint index, GLenum pname, GLint *params);
>+bool ValidateHint(Context *context, GLenum target, GLenum mode);
>+bool ValidateIsBuffer(Context *context, GLuint buffer);
>+bool ValidateIsEnabled(Context *context, GLenum cap);
>+bool ValidateIsFramebuffer(Context *context, GLuint framebuffer);
>+bool ValidateIsProgram(Context *context, GLuint program);
>+bool ValidateIsRenderbuffer(Context *context, GLuint renderbuffer);
>+bool ValidateIsShader(Context *context, GLuint shader);
>+bool ValidateIsTexture(Context *context, GLuint texture);
>+bool ValidateLineWidth(Context *context, GLfloat width);
>+bool ValidateLinkProgram(Context *context, GLuint program);
>+bool ValidatePixelStorei(Context *context, GLenum pname, GLint param);
>+bool ValidatePolygonOffset(Context *context, GLfloat factor, GLfloat units);
>+bool ValidateReadPixels(Context *context,
>+                        GLint x,
>+                        GLint y,
>+                        GLsizei width,
>+                        GLsizei height,
>+                        GLenum format,
>+                        GLenum type,
>+                        void *pixels);
>+bool ValidateReleaseShaderCompiler(Context *context);
>+bool ValidateRenderbufferStorage(Context *context,
>+                                 GLenum target,
>+                                 GLenum internalformat,
>+                                 GLsizei width,
>+                                 GLsizei height);
>+bool ValidateSampleCoverage(Context *context, GLfloat value, GLboolean invert);
>+bool ValidateScissor(Context *context, GLint x, GLint y, GLsizei width, GLsizei height);
>+bool ValidateShaderBinary(Context *context,
>+                          GLsizei count,
>+                          const GLuint *shaders,
>+                          GLenum binaryformat,
>+                          const void *binary,
>+                          GLsizei length);
>+bool ValidateShaderSource(Context *context,
>+                          GLuint shader,
>+                          GLsizei count,
>+                          const GLchar *const *string,
>+                          const GLint *length);
>+bool ValidateStencilFunc(Context *context, GLenum func, GLint ref, GLuint mask);
>+bool ValidateStencilFuncSeparate(Context *context,
>+                                 GLenum face,
>+                                 GLenum func,
>+                                 GLint ref,
>+                                 GLuint mask);
>+bool ValidateStencilMask(Context *context, GLuint mask);
>+bool ValidateStencilMaskSeparate(Context *context, GLenum face, GLuint mask);
>+bool ValidateStencilOp(Context *context, GLenum fail, GLenum zfail, GLenum zpass);
>+bool ValidateStencilOpSeparate(Context *context,
>+                               GLenum face,
>+                               GLenum sfail,
>+                               GLenum dpfail,
>+                               GLenum dppass);
>+bool ValidateTexImage2D(Context *context,
>+                        TextureTarget targetPacked,
>+                        GLint level,
>+                        GLint internalformat,
>+                        GLsizei width,
>+                        GLsizei height,
>+                        GLint border,
>+                        GLenum format,
>+                        GLenum type,
>+                        const void *pixels);
>+bool ValidateTexParameterf(Context *context, TextureType targetPacked, GLenum pname, GLfloat param);
>+bool ValidateTexParameterfv(Context *context,
>+                            TextureType targetPacked,
>+                            GLenum pname,
>+                            const GLfloat *params);
>+bool ValidateTexParameteri(Context *context, TextureType targetPacked, GLenum pname, GLint param);
>+bool ValidateTexParameteriv(Context *context,
>+                            TextureType targetPacked,
>+                            GLenum pname,
>+                            const GLint *params);
>+bool ValidateTexSubImage2D(Context *context,
>+                           TextureTarget targetPacked,
>+                           GLint level,
>+                           GLint xoffset,
>+                           GLint yoffset,
>+                           GLsizei width,
>+                           GLsizei height,
>+                           GLenum format,
>+                           GLenum type,
>+                           const void *pixels);
>+bool ValidateUniform1f(Context *context, GLint location, GLfloat v0);
>+bool ValidateUniform1fv(Context *context, GLint location, GLsizei count, const GLfloat *value);
>+bool ValidateUniform1i(Context *context, GLint location, GLint v0);
>+bool ValidateUniform1iv(Context *context, GLint location, GLsizei count, const GLint *value);
>+bool ValidateUniform2f(Context *context, GLint location, GLfloat v0, GLfloat v1);
>+bool ValidateUniform2fv(Context *context, GLint location, GLsizei count, const GLfloat *value);
>+bool ValidateUniform2i(Context *context, GLint location, GLint v0, GLint v1);
>+bool ValidateUniform2iv(Context *context, GLint location, GLsizei count, const GLint *value);
>+bool ValidateUniform3f(Context *context, GLint location, GLfloat v0, GLfloat v1, GLfloat v2);
>+bool ValidateUniform3fv(Context *context, GLint location, GLsizei count, const GLfloat *value);
>+bool ValidateUniform3i(Context *context, GLint location, GLint v0, GLint v1, GLint v2);
>+bool ValidateUniform3iv(Context *context, GLint location, GLsizei count, const GLint *value);
>+bool ValidateUniform4f(Context *context,
>+                       GLint location,
>+                       GLfloat v0,
>+                       GLfloat v1,
>+                       GLfloat v2,
>+                       GLfloat v3);
>+bool ValidateUniform4fv(Context *context, GLint location, GLsizei count, const GLfloat *value);
>+bool ValidateUniform4i(Context *context, GLint location, GLint v0, GLint v1, GLint v2, GLint v3);
>+bool ValidateUniform4iv(Context *context, GLint location, GLsizei count, const GLint *value);
>+bool ValidateUniformMatrix2fv(Context *context,
>+                              GLint location,
>+                              GLsizei count,
>+                              GLboolean transpose,
>+                              const GLfloat *value);
>+bool ValidateUniformMatrix3fv(Context *context,
>+                              GLint location,
>+                              GLsizei count,
>+                              GLboolean transpose,
>+                              const GLfloat *value);
>+bool ValidateUniformMatrix4fv(Context *context,
>+                              GLint location,
>+                              GLsizei count,
>+                              GLboolean transpose,
>+                              const GLfloat *value);
>+bool ValidateUseProgram(Context *context, GLuint program);
>+bool ValidateValidateProgram(Context *context, GLuint program);
>+bool ValidateVertexAttrib1f(Context *context, GLuint index, GLfloat x);
>+bool ValidateVertexAttrib1fv(Context *context, GLuint index, const GLfloat *v);
>+bool ValidateVertexAttrib2f(Context *context, GLuint index, GLfloat x, GLfloat y);
>+bool ValidateVertexAttrib2fv(Context *context, GLuint index, const GLfloat *v);
>+bool ValidateVertexAttrib3f(Context *context, GLuint index, GLfloat x, GLfloat y, GLfloat z);
>+bool ValidateVertexAttrib3fv(Context *context, GLuint index, const GLfloat *v);
>+bool ValidateVertexAttrib4f(Context *context,
>+                            GLuint index,
>+                            GLfloat x,
>+                            GLfloat y,
>+                            GLfloat z,
>+                            GLfloat w);
>+bool ValidateVertexAttrib4fv(Context *context, GLuint index, const GLfloat *v);
>+bool ValidateVertexAttribPointer(Context *context,
>+                                 GLuint index,
>+                                 GLint size,
>+                                 VertexAttribType typePacked,
>+                                 GLboolean normalized,
>+                                 GLsizei stride,
>+                                 const void *pointer);
>+bool ValidateViewport(Context *context, GLint x, GLint y, GLsizei width, GLsizei height);
>+}  // namespace gl
>+
>+#endif  // LIBANGLE_VALIDATION_ES2_AUTOGEN_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/validationES3.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/validationES3.cpp
>index 1aadfc876e0..1acb5784394 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/validationES3.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/validationES3.cpp
>@@ -6,7 +6,7 @@
> 
> // validationES3.cpp: Validation functions for OpenGL ES 3.0 entry point parameters
> 
>-#include "libANGLE/validationES3.h"
>+#include "libANGLE/validationES3_autogen.h"
> 
> #include "anglebase/numerics/safe_conversions.h"
> #include "common/mathutil.h"
>@@ -17,6 +17,7 @@
> #include "libANGLE/FramebufferAttachment.h"
> #include "libANGLE/Renderbuffer.h"
> #include "libANGLE/Texture.h"
>+#include "libANGLE/VertexArray.h"
> #include "libANGLE/formatutils.h"
> #include "libANGLE/validationES.h"
> 
>@@ -24,6 +25,7 @@ using namespace angle;
> 
> namespace gl
> {
>+using namespace err;
> 
> namespace
> {
>@@ -34,9 +36,9 @@ bool ValidateFramebufferTextureMultiviewBaseANGLE(Context *context,
>                                                   GLint level,
>                                                   GLsizei numViews)
> {
>-    if (!context->getExtensions().multiview)
>+    if (!context->getExtensions().multiview2)
>     {
>-        context->handleError(InvalidOperation() << "ANGLE_multiview is not available.");
>+        context->validationError(GL_INVALID_OPERATION, kMultiviewNotAvailable);
>         return false;
>     }
> 
>@@ -47,15 +49,14 @@ bool ValidateFramebufferTextureMultiviewBaseANGLE(Context *context,
> 
>     if (texture != 0 && numViews < 1)
>     {
>-        context->handleError(InvalidValue() << "numViews cannot be less than 1.");
>+        context->validationError(GL_INVALID_VALUE, kMultiviewViewsTooSmall);
>         return false;
>     }
> 
>     const Extensions &extensions = context->getExtensions();
>     if (static_cast<GLuint>(numViews) > extensions.maxViews)
>     {
>-        context->handleError(InvalidValue()
>-                             << "numViews cannot be greater than GL_MAX_VIEWS_ANGLE.");
>+        context->validationError(GL_INVALID_VALUE, kMultiviewViewsTooLarge);
>         return false;
>     }
> 
>@@ -66,17 +67,17 @@ bool ValidateFramebufferTextureMultiviewLevelAndFormat(Context *context,
>                                                        Texture *texture,
>                                                        GLint level)
> {
>-    GLenum texTarget = texture->getTarget();
>-    if (!ValidMipLevel(context, texTarget, level))
>+    TextureType type = texture->getType();
>+    if (!ValidMipLevel(context, type, level))
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidValue(), InvalidMipLevel);
>+        context->validationError(GL_INVALID_VALUE, kInvalidMipLevel);
>         return false;
>     }
> 
>-    const auto &format = texture->getFormat(texTarget, level);
>+    const auto &format = texture->getFormat(NonCubeTextureTypeToTarget(type), level);
>     if (format.info->compressed)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidOperation(), CompressedTexturesNotAttachable);
>+        context->validationError(GL_INVALID_OPERATION, kCompressedTexturesNotAttachable);
>         return false;
>     }
>     return true;
>@@ -86,7 +87,7 @@ bool ValidateUniformES3(Context *context, GLenum uniformType, GLint location, GL
> {
>     if (context->getClientMajorVersion() < 3)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidOperation(), ES3Required);
>+        context->validationError(GL_INVALID_OPERATION, kES3Required);
>         return false;
>     }
> 
>@@ -102,7 +103,7 @@ bool ValidateUniformMatrixES3(Context *context,
>     // Check for ES3 uniform entry points
>     if (context->getClientMajorVersion() < 3)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidOperation(), ES3Required);
>+        context->validationError(GL_INVALID_OPERATION, kES3Required);
>         return false;
>     }
> 
>@@ -113,7 +114,7 @@ bool ValidateGenOrDeleteES3(Context *context, GLint n)
> {
>     if (context->getClientMajorVersion() < 3)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidOperation(), ES3Required);
>+        context->validationError(GL_INVALID_OPERATION, kES3Required);
>         return false;
>     }
>     return ValidateGenOrDelete(context, n);
>@@ -123,21 +124,142 @@ bool ValidateGenOrDeleteCountES3(Context *context, GLint count)
> {
>     if (context->getClientMajorVersion() < 3)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidOperation(), ES3Required);
>+        context->validationError(GL_INVALID_OPERATION, kES3Required);
>         return false;
>     }
>     if (count < 0)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidValue(), NegativeCount);
>+        context->validationError(GL_INVALID_VALUE, kNegativeCount);
>         return false;
>     }
>     return true;
> }
> 
>+bool ValidateCopyTexture3DCommon(Context *context,
>+                                 const Texture *source,
>+                                 GLint sourceLevel,
>+                                 GLint srcInternalFormat,
>+                                 const Texture *dest,
>+                                 GLint destLevel,
>+                                 GLint internalFormat,
>+                                 TextureTarget destTarget)
>+{
>+    if (context->getClientMajorVersion() < 3)
>+    {
>+        context->validationError(GL_INVALID_OPERATION, kES3Required);
>+        return false;
>+    }
>+
>+    if (!context->getExtensions().copyTexture3d)
>+    {
>+        context->validationError(GL_INVALID_OPERATION, kANGLECopyTexture3DUnavailable);
>+        return false;
>+    }
>+
>+    if (!ValidTexture3DTarget(context, source->getType()))
>+    {
>+        context->validationError(GL_INVALID_ENUM, kInvalidTextureTarget);
>+        return false;
>+    }
>+
>+    // Table 1.1 from the ANGLE_copy_texture_3d spec
>+    switch (GetUnsizedFormat(srcInternalFormat))
>+    {
>+        case GL_ALPHA:
>+        case GL_LUMINANCE:
>+        case GL_LUMINANCE_ALPHA:
>+        case GL_RED:
>+        case GL_RED_INTEGER:
>+        case GL_RG:
>+        case GL_RG_INTEGER:
>+        case GL_RGB:
>+        case GL_RGB_INTEGER:
>+        case GL_RGBA:
>+        case GL_RGBA_INTEGER:
>+        case GL_DEPTH_COMPONENT:
>+        case GL_DEPTH_STENCIL:
>+            break;
>+        default:
>+            context->validationError(GL_INVALID_OPERATION, kInvalidInternalFormat);
>+            return false;
>+    }
>+
>+    if (!ValidTexture3DTarget(context, TextureTargetToType(destTarget)))
>+    {
>+        context->validationError(GL_INVALID_ENUM, kInvalidTextureTarget);
>+        return false;
>+    }
>+
>+    // Table 1.0 from the ANGLE_copy_texture_3d spec
>+    switch (internalFormat)
>+    {
>+        case GL_RGB:
>+        case GL_RGBA:
>+        case GL_LUMINANCE:
>+        case GL_LUMINANCE_ALPHA:
>+        case GL_ALPHA:
>+        case GL_R8:
>+        case GL_R8_SNORM:
>+        case GL_R16F:
>+        case GL_R32F:
>+        case GL_R8UI:
>+        case GL_R8I:
>+        case GL_R16UI:
>+        case GL_R16I:
>+        case GL_R32UI:
>+        case GL_R32I:
>+        case GL_RG:
>+        case GL_RG8:
>+        case GL_RG8_SNORM:
>+        case GL_RG16F:
>+        case GL_RG32F:
>+        case GL_RG8UI:
>+        case GL_RG8I:
>+        case GL_RG16UI:
>+        case GL_RG16I:
>+        case GL_RG32UI:
>+        case GL_RG32I:
>+        case GL_RGB8:
>+        case GL_SRGB8:
>+        case GL_RGB565:
>+        case GL_RGB8_SNORM:
>+        case GL_R11F_G11F_B10F:
>+        case GL_RGB9_E5:
>+        case GL_RGB16F:
>+        case GL_RGB32F:
>+        case GL_RGB8UI:
>+        case GL_RGB8I:
>+        case GL_RGB16UI:
>+        case GL_RGB16I:
>+        case GL_RGB32UI:
>+        case GL_RGB32I:
>+        case GL_RGBA8:
>+        case GL_SRGB8_ALPHA8:
>+        case GL_RGBA8_SNORM:
>+        case GL_RGB5_A1:
>+        case GL_RGBA4:
>+        case GL_RGB10_A2:
>+        case GL_RGBA16F:
>+        case GL_RGBA32F:
>+        case GL_RGBA8UI:
>+        case GL_RGBA8I:
>+        case GL_RGB10_A2UI:
>+        case GL_RGBA16UI:
>+        case GL_RGBA16I:
>+        case GL_RGBA32I:
>+        case GL_RGBA32UI:
>+            break;
>+        default:
>+            context->validationError(GL_INVALID_OPERATION, kInvalidInternalFormat);
>+            return false;
>+    }
>+
>+    return true;
>+}
> }  // anonymous namespace
> 
> static bool ValidateTexImageFormatCombination(gl::Context *context,
>-                                              GLenum target,
>+                                              TextureType target,
>                                               GLenum internalFormat,
>                                               GLenum format,
>                                               GLenum type)
>@@ -146,13 +268,13 @@ static bool ValidateTexImageFormatCombination(gl::Context *context,
>     // The type and format are valid if any supported internal format has that type and format
>     if (!ValidES3Format(format))
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidEnum(), InvalidFormat);
>+        context->validationError(GL_INVALID_ENUM, kInvalidFormat);
>         return false;
>     }
> 
>     if (!ValidES3Type(type))
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidEnum(), InvalidType);
>+        context->validationError(GL_INVALID_ENUM, kInvalidType);
>         return false;
>     }
> 
>@@ -162,7 +284,7 @@ static bool ValidateTexImageFormatCombination(gl::Context *context,
>     // the validation codepaths for glTexImage2D/3D, we record a GL_INVALID_VALUE error.
>     if (!ValidES3InternalFormat(internalFormat))
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidValue(), InvalidInternalFormat);
>+        context->validationError(GL_INVALID_VALUE, kInvalidInternalFormat);
>         return false;
>     }
> 
>@@ -171,26 +293,23 @@ static bool ValidateTexImageFormatCombination(gl::Context *context,
>     // texture image specification commands only if target is TEXTURE_2D, TEXTURE_2D_ARRAY, or
>     // TEXTURE_CUBE_MAP.Using these formats in conjunction with any other target will result in an
>     // INVALID_OPERATION error.
>-    if (target == GL_TEXTURE_3D && (format == GL_DEPTH_COMPONENT || format == GL_DEPTH_STENCIL))
>+    if (target == TextureType::_3D && (format == GL_DEPTH_COMPONENT || format == GL_DEPTH_STENCIL))
>     {
>-        context->handleError(InvalidOperation() << "Format cannot be GL_DEPTH_COMPONENT or "
>-                                                   "GL_DEPTH_STENCIL if target is "
>-                                                   "GL_TEXTURE_3D");
>+        context->validationError(GL_INVALID_OPERATION, k3DDepthStencil);
>         return false;
>     }
> 
>     // Check if this is a valid format combination to load texture data
>     if (!ValidES3FormatCombination(format, type, internalFormat))
>     {
>-        context->handleError(InvalidOperation()
>-                             << "Invalid combination of format, type and internalFormat.");
>+        context->validationError(GL_INVALID_OPERATION, kInvalidFormatCombination);
>         return false;
>     }
> 
>     const gl::InternalFormat &formatInfo = gl::GetInternalFormatInfo(internalFormat, type);
>     if (!formatInfo.textureSupport(context->getClientVersion(), context->getExtensions()))
>     {
>-        context->handleError(InvalidOperation() << "Unsupported internal format.");
>+        context->validationError(GL_INVALID_OPERATION, kInvalidInternalFormat);
>         return false;
>     }
> 
>@@ -198,7 +317,7 @@ static bool ValidateTexImageFormatCombination(gl::Context *context,
> }
> 
> bool ValidateES3TexImageParametersBase(Context *context,
>-                                       GLenum target,
>+                                       TextureTarget target,
>                                        GLint level,
>                                        GLenum internalformat,
>                                        bool isCompressed,
>@@ -215,113 +334,113 @@ bool ValidateES3TexImageParametersBase(Context *context,
>                                        GLsizei imageSize,
>                                        const void *pixels)
> {
>+    TextureType texType = TextureTargetToType(target);
>+
>     // Validate image size
>-    if (!ValidImageSizeParameters(context, target, level, width, height, depth, isSubImage))
>+    if (!ValidImageSizeParameters(context, texType, level, width, height, depth, isSubImage))
>     {
>-        context->handleError(InvalidValue());
>+        // Error already processed.
>         return false;
>     }
> 
>     // Verify zero border
>     if (border != 0)
>     {
>-        context->handleError(InvalidValue());
>+        context->validationError(GL_INVALID_VALUE, kInvalidBorder);
>+        return false;
>+    }
>+
>+    if (xoffset < 0 || yoffset < 0 || zoffset < 0)
>+    {
>+        context->validationError(GL_INVALID_VALUE, kNegativeOffset);
>         return false;
>     }
> 
>-    if (xoffset < 0 || yoffset < 0 || zoffset < 0 ||
>-        std::numeric_limits<GLsizei>::max() - xoffset < width ||
>+    if (std::numeric_limits<GLsizei>::max() - xoffset < width ||
>         std::numeric_limits<GLsizei>::max() - yoffset < height ||
>         std::numeric_limits<GLsizei>::max() - zoffset < depth)
>     {
>-        context->handleError(InvalidValue());
>+        context->validationError(GL_INVALID_VALUE, kOffsetOverflow);
>         return false;
>     }
> 
>     const gl::Caps &caps = context->getCaps();
> 
>-    switch (target)
>+    switch (texType)
>     {
>-        case GL_TEXTURE_2D:
>+        case TextureType::_2D:
>             if (static_cast<GLuint>(width) > (caps.max2DTextureSize >> level) ||
>                 static_cast<GLuint>(height) > (caps.max2DTextureSize >> level))
>             {
>-                context->handleError(InvalidValue());
>+                context->validationError(GL_INVALID_VALUE, kResourceMaxTextureSize);
>                 return false;
>             }
>             break;
> 
>-        case GL_TEXTURE_RECTANGLE_ANGLE:
>+        case TextureType::Rectangle:
>             ASSERT(level == 0);
>             if (static_cast<GLuint>(width) > caps.maxRectangleTextureSize ||
>                 static_cast<GLuint>(height) > caps.maxRectangleTextureSize)
>             {
>-                context->handleError(InvalidValue());
>+                context->validationError(GL_INVALID_VALUE, kResourceMaxTextureSize);
>                 return false;
>             }
>             if (isCompressed)
>             {
>-                context->handleError(InvalidEnum()
>-                                     << "Rectangle texture cannot have a compressed format.");
>+                context->validationError(GL_INVALID_ENUM, kRectangleTextureCompressed);
>                 return false;
>             }
>             break;
> 
>-        case GL_TEXTURE_CUBE_MAP_POSITIVE_X:
>-        case GL_TEXTURE_CUBE_MAP_NEGATIVE_X:
>-        case GL_TEXTURE_CUBE_MAP_POSITIVE_Y:
>-        case GL_TEXTURE_CUBE_MAP_NEGATIVE_Y:
>-        case GL_TEXTURE_CUBE_MAP_POSITIVE_Z:
>-        case GL_TEXTURE_CUBE_MAP_NEGATIVE_Z:
>+        case TextureType::CubeMap:
>             if (!isSubImage && width != height)
>             {
>-                context->handleError(InvalidValue());
>+                context->validationError(GL_INVALID_VALUE, kCubemapFacesEqualDimensions);
>                 return false;
>             }
> 
>             if (static_cast<GLuint>(width) > (caps.maxCubeMapTextureSize >> level))
>             {
>-                context->handleError(InvalidValue());
>+                context->validationError(GL_INVALID_VALUE, kResourceMaxTextureSize);
>                 return false;
>             }
>             break;
> 
>-        case GL_TEXTURE_3D:
>+        case TextureType::_3D:
>             if (static_cast<GLuint>(width) > (caps.max3DTextureSize >> level) ||
>                 static_cast<GLuint>(height) > (caps.max3DTextureSize >> level) ||
>                 static_cast<GLuint>(depth) > (caps.max3DTextureSize >> level))
>             {
>-                context->handleError(InvalidValue());
>+                context->validationError(GL_INVALID_VALUE, kResourceMaxTextureSize);
>                 return false;
>             }
>             break;
> 
>-        case GL_TEXTURE_2D_ARRAY:
>+        case TextureType::_2DArray:
>             if (static_cast<GLuint>(width) > (caps.max2DTextureSize >> level) ||
>                 static_cast<GLuint>(height) > (caps.max2DTextureSize >> level) ||
>                 static_cast<GLuint>(depth) > caps.maxArrayTextureLayers)
>             {
>-                context->handleError(InvalidValue());
>+                context->validationError(GL_INVALID_VALUE, kResourceMaxTextureSize);
>                 return false;
>             }
>             break;
> 
>         default:
>-            context->handleError(InvalidEnum());
>+            context->validationError(GL_INVALID_ENUM, kEnumNotSupported);
>             return false;
>     }
> 
>-    gl::Texture *texture =
>-        context->getTargetTexture(IsCubeMapTextureTarget(target) ? GL_TEXTURE_CUBE_MAP : target);
>+    gl::Texture *texture = context->getTextureByType(texType);
>     if (!texture)
>     {
>-        context->handleError(InvalidOperation());
>+        context->validationError(GL_INVALID_OPERATION, kMissingTexture);
>         return false;
>     }
> 
>     if (texture->getImmutableFormat() && !isSubImage)
>     {
>-        context->handleError(InvalidOperation());
>+        context->validationError(GL_INVALID_OPERATION, kTextureIsImmutable);
>         return false;
>     }
> 
>@@ -330,7 +449,7 @@ bool ValidateES3TexImageParametersBase(Context *context,
>         isSubImage ? texture->getFormat(target, level).info->internalFormat : internalformat;
>     if (isSubImage && actualInternalFormat == GL_NONE)
>     {
>-        context->handleError(InvalidOperation() << "Texture level does not exist.");
>+        context->validationError(GL_INVALID_OPERATION, kInvalidMipLevel);
>         return false;
>     }
> 
>@@ -341,8 +460,7 @@ bool ValidateES3TexImageParametersBase(Context *context,
>     {
>         if (!actualFormatInfo.compressed)
>         {
>-            context->handleError(
>-                InvalidEnum() << "internalformat is not a supported compressed internal format.");
>+            context->validationError(GL_INVALID_ENUM, kCompressedMismatch);
>             return false;
>         }
> 
>@@ -352,20 +470,19 @@ bool ValidateES3TexImageParametersBase(Context *context,
>                     context, actualFormatInfo.internalFormat, xoffset, yoffset, width, height,
>                     texture->getWidth(target, level), texture->getHeight(target, level)))
>             {
>-                context->handleError(InvalidOperation() << "Invalid compressed format dimension.");
>+                context->validationError(GL_INVALID_OPERATION, kInvalidCompressedImageSize);
>                 return false;
>             }
> 
>             if (format != actualInternalFormat)
>             {
>-                context->handleError(InvalidOperation()
>-                                     << "Format must match the internal format of the texture.");
>+                context->validationError(GL_INVALID_OPERATION, kMismatchedFormat);
>                 return false;
>             }
> 
>             if (actualInternalFormat == GL_ETC1_RGB8_OES)
>             {
>-                ANGLE_VALIDATION_ERR(context, InvalidOperation(), InvalidInternalFormat);
>+                context->validationError(GL_INVALID_OPERATION, kInvalidInternalFormat);
>                 return false;
>             }
>         }
>@@ -373,26 +490,27 @@ bool ValidateES3TexImageParametersBase(Context *context,
>         {
>             if (!ValidCompressedImageSize(context, actualInternalFormat, level, width, height))
>             {
>-                context->handleError(InvalidOperation() << "Invalid compressed format dimension.");
>+                context->validationError(GL_INVALID_OPERATION, kInvalidCompressedImageSize);
>                 return false;
>             }
>         }
> 
>         if (!actualFormatInfo.textureSupport(context->getClientVersion(), context->getExtensions()))
>         {
>-            context->handleError(InvalidEnum());
>+            context->validationError(GL_INVALID_ENUM, kInvalidFormat);
>             return false;
>         }
> 
>-        if (target == GL_TEXTURE_3D)
>+        if (texType == TextureType::_3D)
>         {
>-            context->handleError(InvalidOperation());
>+            context->validationError(GL_INVALID_OPERATION, kInvalidTextureTarget);
>             return false;
>         }
>     }
>     else
>     {
>-        if (!ValidateTexImageFormatCombination(context, target, actualInternalFormat, format, type))
>+        if (!ValidateTexImageFormatCombination(context, texType, actualInternalFormat, format,
>+                                               type))
>         {
>             return false;
>         }
>@@ -403,13 +521,13 @@ bool ValidateES3TexImageParametersBase(Context *context,
>     {
>         if (isCompressed != actualFormatInfo.compressed)
>         {
>-            context->handleError(InvalidOperation());
>+            context->validationError(GL_INVALID_OPERATION, kCompressedMismatch);
>             return false;
>         }
> 
>         if (xoffset < 0 || yoffset < 0 || zoffset < 0)
>         {
>-            context->handleError(InvalidValue());
>+            context->validationError(GL_INVALID_VALUE, kNegativeOffset);
>             return false;
>         }
> 
>@@ -417,7 +535,7 @@ bool ValidateES3TexImageParametersBase(Context *context,
>             std::numeric_limits<GLsizei>::max() - yoffset < height ||
>             std::numeric_limits<GLsizei>::max() - zoffset < depth)
>         {
>-            context->handleError(InvalidValue());
>+            context->validationError(GL_INVALID_VALUE, kOffsetOverflow);
>             return false;
>         }
> 
>@@ -425,28 +543,27 @@ bool ValidateES3TexImageParametersBase(Context *context,
>             static_cast<size_t>(yoffset + height) > texture->getHeight(target, level) ||
>             static_cast<size_t>(zoffset + depth) > texture->getDepth(target, level))
>         {
>-            context->handleError(InvalidValue());
>+            context->validationError(GL_INVALID_VALUE, kOffsetOverflow);
>             return false;
>         }
> 
>         if (width > 0 && height > 0 && depth > 0 && pixels == nullptr &&
>-            context->getGLState().getTargetBuffer(gl::BufferBinding::PixelUnpack) == nullptr)
>+            context->getState().getTargetBuffer(gl::BufferBinding::PixelUnpack) == nullptr)
>         {
>-            ANGLE_VALIDATION_ERR(context, InvalidValue(), PixelDataNull);
>+            context->validationError(GL_INVALID_VALUE, kPixelDataNull);
>             return false;
>         }
>     }
> 
>     GLenum sizeCheckFormat = isSubImage ? format : internalformat;
>-    if (!ValidImageDataSize(context, target, width, height, depth, sizeCheckFormat, type, pixels,
>+    if (!ValidImageDataSize(context, texType, width, height, depth, sizeCheckFormat, type, pixels,
>                             imageSize))
>     {
>         return false;
>     }
> 
>     // Check for pixel unpack buffer related API errors
>-    gl::Buffer *pixelUnpackBuffer =
>-        context->getGLState().getTargetBuffer(BufferBinding::PixelUnpack);
>+    gl::Buffer *pixelUnpackBuffer = context->getState().getTargetBuffer(BufferBinding::PixelUnpack);
>     if (pixelUnpackBuffer != nullptr)
>     {
>         // ...data is not evenly divisible into the number of bytes needed to store in memory a
>@@ -459,8 +576,7 @@ bool ValidateES3TexImageParametersBase(Context *context,
> 
>             if ((offset % dataBytesPerPixel) != 0)
>             {
>-                context->handleError(InvalidOperation()
>-                                     << "Reads would overflow the pixel unpack buffer.");
>+                context->validationError(GL_INVALID_OPERATION, kDataTypeNotAligned);
>                 return false;
>             }
>         }
>@@ -468,7 +584,7 @@ bool ValidateES3TexImageParametersBase(Context *context,
>         // ...the buffer object's data store is currently mapped.
>         if (pixelUnpackBuffer->isMapped())
>         {
>-            context->handleError(InvalidOperation() << "Pixel unpack buffer is mapped.");
>+            context->validationError(GL_INVALID_OPERATION, kBufferMapped);
>             return false;
>         }
>     }
>@@ -477,7 +593,7 @@ bool ValidateES3TexImageParametersBase(Context *context,
> }
> 
> bool ValidateES3TexImage2DParameters(Context *context,
>-                                     GLenum target,
>+                                     TextureTarget target,
>                                      GLint level,
>                                      GLenum internalformat,
>                                      bool isCompressed,
>@@ -496,7 +612,7 @@ bool ValidateES3TexImage2DParameters(Context *context,
> {
>     if (!ValidTexture2DDestinationTarget(context, target))
>     {
>-        context->handleError(InvalidEnum());
>+        context->validationError(GL_INVALID_ENUM, kInvalidTextureTarget);
>         return false;
>     }
> 
>@@ -506,7 +622,7 @@ bool ValidateES3TexImage2DParameters(Context *context,
> }
> 
> bool ValidateES3TexImage3DParameters(Context *context,
>-                                     GLenum target,
>+                                     TextureTarget target,
>                                      GLint level,
>                                      GLenum internalformat,
>                                      bool isCompressed,
>@@ -525,7 +641,14 @@ bool ValidateES3TexImage3DParameters(Context *context,
> {
>     if (!ValidTexture3DDestinationTarget(context, target))
>     {
>-        context->handleError(InvalidEnum());
>+        context->validationError(GL_INVALID_ENUM, kInvalidTextureTarget);
>+        return false;
>+    }
>+
>+    if (IsETC2EACFormat(format) && target != TextureTarget::_2DArray)
>+    {
>+        // ES 3.1, Section 8.7, page 169.
>+        context->validationError(GL_INVALID_OPERATION, kInternalFormatRequiresTexture2DArray);
>         return false;
>     }
> 
>@@ -776,8 +899,8 @@ static bool IsValidES3CopyTexImageCombination(const InternalFormat &textureForma
>                   // conversion between these formats.
> }
> 
>-bool ValidateES3CopyTexImageParametersBase(ValidationContext *context,
>-                                           GLenum target,
>+bool ValidateES3CopyTexImageParametersBase(Context *context,
>+                                           TextureTarget target,
>                                            GLint level,
>                                            GLenum internalformat,
>                                            bool isSubImage,
>@@ -799,30 +922,36 @@ bool ValidateES3CopyTexImageParametersBase(ValidationContext *context,
>     }
>     ASSERT(textureFormat.valid() || !isSubImage);
> 
>-    const auto &state            = context->getGLState();
>+    const auto &state            = context->getState();
>     gl::Framebuffer *framebuffer = state.getReadFramebuffer();
>     GLuint readFramebufferID     = framebuffer->id();
> 
>-    if (framebuffer->checkStatus(context) != GL_FRAMEBUFFER_COMPLETE)
>+    if (!ValidateFramebufferComplete(context, framebuffer))
>     {
>-        context->handleError(InvalidFramebufferOperation());
>         return false;
>     }
> 
>-    if (readFramebufferID != 0 && framebuffer->getSamples(context) != 0)
>+    if (readFramebufferID != 0 && !ValidateFramebufferNotMultisampled(context, framebuffer))
>     {
>-        context->handleError(InvalidOperation());
>         return false;
>     }
> 
>     const FramebufferAttachment *source = framebuffer->getReadColorbuffer();
> 
>+    // According to ES 3.x spec, if the internalformat of the texture
>+    // is RGB9_E5 and copy to such a texture, generate INVALID_OPERATION.
>+    if (textureFormat.info->internalFormat == GL_RGB9_E5)
>+    {
>+        context->validationError(GL_INVALID_OPERATION, kInvalidFormat);
>+        return false;
>+    }
>+
>     if (isSubImage)
>     {
>         if (!IsValidES3CopyTexImageCombination(*textureFormat.info, *source->getFormat().info,
>                                                readFramebufferID))
>         {
>-            context->handleError(InvalidOperation());
>+            context->validationError(GL_INVALID_OPERATION, kInvalidCopyCombination);
>             return false;
>         }
>     }
>@@ -833,7 +962,7 @@ bool ValidateES3CopyTexImageParametersBase(ValidationContext *context,
>         const InternalFormat &copyFormat = GetInternalFormatInfo(internalformat, GL_UNSIGNED_BYTE);
>         if (!IsValidES3CopyTexImageCombination(copyFormat, framebufferFormat, readFramebufferID))
>         {
>-            context->handleError(InvalidOperation());
>+            context->validationError(GL_INVALID_OPERATION, kInvalidCopyCombination);
>             return false;
>         }
>     }
>@@ -842,8 +971,8 @@ bool ValidateES3CopyTexImageParametersBase(ValidationContext *context,
>     return (width > 0 && height > 0);
> }
> 
>-bool ValidateES3CopyTexImage2DParameters(ValidationContext *context,
>-                                         GLenum target,
>+bool ValidateES3CopyTexImage2DParameters(Context *context,
>+                                         TextureTarget target,
>                                          GLint level,
>                                          GLenum internalformat,
>                                          bool isSubImage,
>@@ -858,7 +987,7 @@ bool ValidateES3CopyTexImage2DParameters(ValidationContext *context,
> {
>     if (!ValidTexture2DDestinationTarget(context, target))
>     {
>-        context->handleError(InvalidEnum());
>+        context->validationError(GL_INVALID_ENUM, kInvalidTextureTarget);
>         return false;
>     }
> 
>@@ -867,8 +996,8 @@ bool ValidateES3CopyTexImage2DParameters(ValidationContext *context,
>                                                  border);
> }
> 
>-bool ValidateES3CopyTexImage3DParameters(ValidationContext *context,
>-                                         GLenum target,
>+bool ValidateES3CopyTexImage3DParameters(Context *context,
>+                                         TextureTarget target,
>                                          GLint level,
>                                          GLenum internalformat,
>                                          bool isSubImage,
>@@ -883,7 +1012,7 @@ bool ValidateES3CopyTexImage3DParameters(ValidationContext *context,
> {
>     if (!ValidTexture3DDestinationTarget(context, target))
>     {
>-        context->handleError(InvalidEnum());
>+        context->validationError(GL_INVALID_ENUM, kInvalidTextureTarget);
>         return false;
>     }
> 
>@@ -893,7 +1022,7 @@ bool ValidateES3CopyTexImage3DParameters(ValidationContext *context,
> }
> 
> bool ValidateES3TexStorageParametersBase(Context *context,
>-                                         GLenum target,
>+                                         TextureType target,
>                                          GLsizei levels,
>                                          GLenum internalformat,
>                                          GLsizei width,
>@@ -902,19 +1031,19 @@ bool ValidateES3TexStorageParametersBase(Context *context,
> {
>     if (width < 1 || height < 1 || depth < 1 || levels < 1)
>     {
>-        context->handleError(InvalidValue());
>+        context->validationError(GL_INVALID_VALUE, kTextureSizeTooSmall);
>         return false;
>     }
> 
>     GLsizei maxDim = std::max(width, height);
>-    if (target != GL_TEXTURE_2D_ARRAY)
>+    if (target != TextureType::_2DArray)
>     {
>         maxDim = std::max(maxDim, depth);
>     }
> 
>     if (levels > gl::log2(maxDim) + 1)
>     {
>-        context->handleError(InvalidOperation());
>+        context->validationError(GL_INVALID_OPERATION, kInvalidMipLevels);
>         return false;
>     }
> 
>@@ -922,63 +1051,69 @@ bool ValidateES3TexStorageParametersBase(Context *context,
> 
>     switch (target)
>     {
>-        case GL_TEXTURE_2D:
>+        case TextureType::_2D:
>         {
>             if (static_cast<GLuint>(width) > caps.max2DTextureSize ||
>                 static_cast<GLuint>(height) > caps.max2DTextureSize)
>             {
>-                context->handleError(InvalidValue());
>+                context->validationError(GL_INVALID_VALUE, kResourceMaxTextureSize);
>                 return false;
>             }
>         }
>         break;
> 
>-        case GL_TEXTURE_RECTANGLE_ANGLE:
>+        case TextureType::Rectangle:
>         {
>+            if (levels != 1)
>+            {
>+                context->validationError(GL_INVALID_VALUE, kInvalidMipLevels);
>+                return false;
>+            }
>+
>             if (static_cast<GLuint>(width) > caps.maxRectangleTextureSize ||
>-                static_cast<GLuint>(height) > caps.maxRectangleTextureSize || levels != 1)
>+                static_cast<GLuint>(height) > caps.maxRectangleTextureSize)
>             {
>-                context->handleError(InvalidValue());
>+                context->validationError(GL_INVALID_VALUE, kResourceMaxTextureSize);
>                 return false;
>             }
>         }
>         break;
> 
>-        case GL_TEXTURE_CUBE_MAP:
>+        case TextureType::CubeMap:
>         {
>             if (width != height)
>             {
>-                context->handleError(InvalidValue());
>+                context->validationError(GL_INVALID_VALUE, kCubemapFacesEqualDimensions);
>                 return false;
>             }
> 
>             if (static_cast<GLuint>(width) > caps.maxCubeMapTextureSize)
>             {
>-                context->handleError(InvalidValue());
>+                context->validationError(GL_INVALID_VALUE, kResourceMaxTextureSize);
>                 return false;
>             }
>         }
>         break;
> 
>-        case GL_TEXTURE_3D:
>+        case TextureType::_3D:
>         {
>             if (static_cast<GLuint>(width) > caps.max3DTextureSize ||
>                 static_cast<GLuint>(height) > caps.max3DTextureSize ||
>                 static_cast<GLuint>(depth) > caps.max3DTextureSize)
>             {
>-                context->handleError(InvalidValue());
>+                context->validationError(GL_INVALID_VALUE, kResourceMaxTextureSize);
>                 return false;
>             }
>         }
>         break;
> 
>-        case GL_TEXTURE_2D_ARRAY:
>+        case TextureType::_2DArray:
>         {
>             if (static_cast<GLuint>(width) > caps.max2DTextureSize ||
>                 static_cast<GLuint>(height) > caps.max2DTextureSize ||
>                 static_cast<GLuint>(depth) > caps.maxArrayTextureLayers)
>             {
>-                context->handleError(InvalidValue());
>+                context->validationError(GL_INVALID_VALUE, kResourceMaxTextureSize);
>                 return false;
>             }
>         }
>@@ -989,35 +1124,35 @@ bool ValidateES3TexStorageParametersBase(Context *context,
>             return false;
>     }
> 
>-    gl::Texture *texture = context->getTargetTexture(target);
>+    gl::Texture *texture = context->getTextureByType(target);
>     if (!texture || texture->id() == 0)
>     {
>-        context->handleError(InvalidOperation());
>+        context->validationError(GL_INVALID_OPERATION, kMissingTexture);
>         return false;
>     }
> 
>     if (texture->getImmutableFormat())
>     {
>-        context->handleError(InvalidOperation());
>+        context->validationError(GL_INVALID_OPERATION, kTextureIsImmutable);
>         return false;
>     }
> 
>     const gl::InternalFormat &formatInfo = gl::GetSizedInternalFormatInfo(internalformat);
>     if (!formatInfo.textureSupport(context->getClientVersion(), context->getExtensions()))
>     {
>-        context->handleError(InvalidEnum());
>+        context->validationError(GL_INVALID_ENUM, kInvalidFormat);
>         return false;
>     }
> 
>     if (!formatInfo.sized)
>     {
>-        context->handleError(InvalidEnum());
>+        context->validationError(GL_INVALID_ENUM, kInvalidFormat);
>         return false;
>     }
> 
>-    if (formatInfo.compressed && target == GL_TEXTURE_RECTANGLE_ANGLE)
>+    if (formatInfo.compressed && target == TextureType::Rectangle)
>     {
>-        context->handleError(InvalidEnum() << "Rectangle texture cannot have a compressed format.");
>+        context->validationError(GL_INVALID_ENUM, kRectangleTextureCompressed);
>         return false;
>     }
> 
>@@ -1025,7 +1160,7 @@ bool ValidateES3TexStorageParametersBase(Context *context,
> }
> 
> bool ValidateES3TexStorage2DParameters(Context *context,
>-                                       GLenum target,
>+                                       TextureType target,
>                                        GLsizei levels,
>                                        GLenum internalformat,
>                                        GLsizei width,
>@@ -1034,7 +1169,7 @@ bool ValidateES3TexStorage2DParameters(Context *context,
> {
>     if (!ValidTexture2DTarget(context, target))
>     {
>-        context->handleError(InvalidEnum());
>+        context->validationError(GL_INVALID_ENUM, kInvalidTextureTarget);
>         return false;
>     }
> 
>@@ -1043,7 +1178,7 @@ bool ValidateES3TexStorage2DParameters(Context *context,
> }
> 
> bool ValidateES3TexStorage3DParameters(Context *context,
>-                                       GLenum target,
>+                                       TextureType target,
>                                        GLsizei levels,
>                                        GLenum internalformat,
>                                        GLsizei width,
>@@ -1052,7 +1187,7 @@ bool ValidateES3TexStorage3DParameters(Context *context,
> {
>     if (!ValidTexture3DTarget(context, target))
>     {
>-        context->handleError(InvalidEnum());
>+        context->validationError(GL_INVALID_ENUM, kInvalidTextureTarget);
>         return false;
>     }
> 
>@@ -1060,33 +1195,33 @@ bool ValidateES3TexStorage3DParameters(Context *context,
>                                                height, depth);
> }
> 
>-bool ValidateBeginQuery(gl::Context *context, GLenum target, GLuint id)
>+bool ValidateBeginQuery(gl::Context *context, QueryType target, GLuint id)
> {
>     if (context->getClientMajorVersion() < 3)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidOperation(), ES3Required);
>+        context->validationError(GL_INVALID_OPERATION, kES3Required);
>         return false;
>     }
> 
>     return ValidateBeginQueryBase(context, target, id);
> }
> 
>-bool ValidateEndQuery(gl::Context *context, GLenum target)
>+bool ValidateEndQuery(gl::Context *context, QueryType target)
> {
>     if (context->getClientMajorVersion() < 3)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidOperation(), ES3Required);
>+        context->validationError(GL_INVALID_OPERATION, kES3Required);
>         return false;
>     }
> 
>     return ValidateEndQueryBase(context, target);
> }
> 
>-bool ValidateGetQueryiv(Context *context, GLenum target, GLenum pname, GLint *params)
>+bool ValidateGetQueryiv(Context *context, QueryType target, GLenum pname, GLint *params)
> {
>     if (context->getClientMajorVersion() < 3)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidOperation(), ES3Required);
>+        context->validationError(GL_INVALID_OPERATION, kES3Required);
>         return false;
>     }
> 
>@@ -1097,7 +1232,7 @@ bool ValidateGetQueryObjectuiv(Context *context, GLuint id, GLenum pname, GLuint
> {
>     if (context->getClientMajorVersion() < 3)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidOperation(), ES3Required);
>+        context->validationError(GL_INVALID_OPERATION, kES3Required);
>         return false;
>     }
> 
>@@ -1113,7 +1248,7 @@ bool ValidateFramebufferTextureLayer(Context *context,
> {
>     if (context->getClientMajorVersion() < 3)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidOperation(), ES3Required);
>+        context->validationError(GL_INVALID_OPERATION, kES3Required);
>         return false;
>     }
> 
>@@ -1127,56 +1262,73 @@ bool ValidateFramebufferTextureLayer(Context *context,
>     {
>         if (layer < 0)
>         {
>-            context->handleError(InvalidValue());
>+            context->validationError(GL_INVALID_VALUE, kNegativeLayer);
>             return false;
>         }
> 
>         gl::Texture *tex = context->getTexture(texture);
>         ASSERT(tex);
> 
>-        switch (tex->getTarget())
>+        switch (tex->getType())
>         {
>-            case GL_TEXTURE_2D_ARRAY:
>+            case TextureType::_2DArray:
>             {
>                 if (level > gl::log2(caps.max2DTextureSize))
>                 {
>-                    context->handleError(InvalidValue());
>+                    context->validationError(GL_INVALID_VALUE, kFramebufferTextureInvalidMipLevel);
>                     return false;
>                 }
> 
>                 if (static_cast<GLuint>(layer) >= caps.maxArrayTextureLayers)
>                 {
>-                    context->handleError(InvalidValue());
>+                    context->validationError(GL_INVALID_VALUE, kFramebufferTextureInvalidLayer);
>                     return false;
>                 }
>             }
>             break;
> 
>-            case GL_TEXTURE_3D:
>+            case TextureType::_3D:
>             {
>                 if (level > gl::log2(caps.max3DTextureSize))
>                 {
>-                    context->handleError(InvalidValue());
>+                    context->validationError(GL_INVALID_VALUE, kFramebufferTextureInvalidMipLevel);
>                     return false;
>                 }
> 
>                 if (static_cast<GLuint>(layer) >= caps.max3DTextureSize)
>                 {
>-                    context->handleError(InvalidValue());
>+                    context->validationError(GL_INVALID_VALUE, kFramebufferTextureInvalidLayer);
>+                    return false;
>+                }
>+            }
>+            break;
>+
>+            case TextureType::_2DMultisampleArray:
>+            {
>+                if (level != 0)
>+                {
>+                    context->validationError(GL_INVALID_VALUE, kFramebufferTextureInvalidMipLevel);
>+                    return false;
>+                }
>+
>+                if (static_cast<GLuint>(layer) >= caps.maxArrayTextureLayers)
>+                {
>+                    context->validationError(GL_INVALID_VALUE, kFramebufferTextureInvalidLayer);
>                     return false;
>                 }
>             }
>             break;
> 
>             default:
>-                context->handleError(InvalidOperation());
>+                context->validationError(GL_INVALID_OPERATION,
>+                                         kFramebufferTextureLayerIncorrectTextureType);
>                 return false;
>         }
> 
>-        const auto &format = tex->getFormat(tex->getTarget(), level);
>+        const auto &format = tex->getFormat(NonCubeTextureTypeToTarget(tex->getType()), level);
>         if (format.info->compressed)
>         {
>-            context->handleError(InvalidOperation());
>+            context->validationError(GL_INVALID_OPERATION, kCompressedTexturesNotAttachable);
>             return false;
>         }
>     }
>@@ -1191,7 +1343,7 @@ bool ValidateInvalidateFramebuffer(Context *context,
> {
>     if (context->getClientMajorVersion() < 3)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidOperation(), ES3Required);
>+        context->validationError(GL_INVALID_OPERATION, kES3Required);
>         return false;
>     }
> 
>@@ -1201,13 +1353,13 @@ bool ValidateInvalidateFramebuffer(Context *context,
>     {
>         case GL_DRAW_FRAMEBUFFER:
>         case GL_FRAMEBUFFER:
>-            defaultFramebuffer = context->getGLState().getDrawFramebuffer()->id() == 0;
>+            defaultFramebuffer = context->getState().getDrawFramebuffer()->id() == 0;
>             break;
>         case GL_READ_FRAMEBUFFER:
>-            defaultFramebuffer = context->getGLState().getReadFramebuffer()->id() == 0;
>+            defaultFramebuffer = context->getState().getReadFramebuffer()->id() == 0;
>             break;
>         default:
>-            ANGLE_VALIDATION_ERR(context, InvalidEnum(), InvalidFramebufferTarget);
>+            context->validationError(GL_INVALID_ENUM, kInvalidFramebufferTarget);
>             return false;
>     }
> 
>@@ -1224,20 +1376,25 @@ bool ValidateInvalidateSubFramebuffer(Context *context,
>                                       GLsizei width,
>                                       GLsizei height)
> {
>+    if (width < 0 || height < 0)
>+    {
>+        context->validationError(GL_INVALID_VALUE, kNegativeSize);
>+        return false;
>+    }
>+
>     return ValidateInvalidateFramebuffer(context, target, numAttachments, attachments);
> }
> 
>-bool ValidateClearBuffer(ValidationContext *context)
>+bool ValidateClearBuffer(Context *context)
> {
>     if (context->getClientMajorVersion() < 3)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidOperation(), ES3Required);
>+        context->validationError(GL_INVALID_OPERATION, kES3Required);
>         return false;
>     }
> 
>-    if (context->getGLState().getDrawFramebuffer()->checkStatus(context) != GL_FRAMEBUFFER_COMPLETE)
>+    if (!ValidateFramebufferComplete(context, context->getState().getDrawFramebuffer()))
>     {
>-        context->handleError(InvalidFramebufferOperation());
>         return false;
>     }
> 
>@@ -1245,22 +1402,22 @@ bool ValidateClearBuffer(ValidationContext *context)
> }
> 
> bool ValidateDrawRangeElements(Context *context,
>-                               GLenum mode,
>+                               PrimitiveMode mode,
>                                GLuint start,
>                                GLuint end,
>                                GLsizei count,
>-                               GLenum type,
>+                               DrawElementsType type,
>                                const void *indices)
> {
>     if (context->getClientMajorVersion() < 3)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidOperation(), ES3Required);
>+        context->validationError(GL_INVALID_OPERATION, kES3Required);
>         return false;
>     }
> 
>     if (end < start)
>     {
>-        context->handleError(InvalidValue() << "end < start");
>+        context->validationError(GL_INVALID_VALUE, kInvalidElementRange);
>         return false;
>     }
> 
>@@ -1269,19 +1426,21 @@ bool ValidateDrawRangeElements(Context *context,
>         return false;
>     }
> 
>-    // Use the parameter buffer to retrieve and cache the index range.
>-    const auto &params        = context->getParams<HasIndexRange>();
>-    const auto &indexRangeOpt = params.getIndexRange();
>-    if (!indexRangeOpt.valid())
>+    // Skip range checks for no-op calls.
>+    if (count <= 0)
>     {
>-        // Unexpected error.
>-        return false;
>+        return true;
>     }
> 
>-    if (indexRangeOpt.value().end > end || indexRangeOpt.value().start < start)
>+    // Note that resolving the index range is a bit slow. We should probably optimize this.
>+    IndexRange indexRange;
>+    ANGLE_VALIDATION_TRY(context->getState().getVertexArray()->getIndexRange(context, type, count,
>+                                                                             indices, &indexRange));
>+
>+    if (indexRange.end > end || indexRange.start < start)
>     {
>         // GL spec says that behavior in this case is undefined - generating an error is fine.
>-        context->handleError(InvalidOperation() << "Indices are out of the start, end range.");
>+        context->validationError(GL_INVALID_OPERATION, kExceedsElementRange);
>         return false;
>     }
>     return true;
>@@ -1291,7 +1450,7 @@ bool ValidateGetUniformuiv(Context *context, GLuint program, GLint location, GLu
> {
>     if (context->getClientMajorVersion() < 3)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidOperation(), ES3Required);
>+        context->validationError(GL_INVALID_OPERATION, kES3Required);
>         return false;
>     }
> 
>@@ -1302,15 +1461,15 @@ bool ValidateReadBuffer(Context *context, GLenum src)
> {
>     if (context->getClientMajorVersion() < 3)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidOperation(), ES3Required);
>+        context->validationError(GL_INVALID_OPERATION, kES3Required);
>         return false;
>     }
> 
>-    const Framebuffer *readFBO = context->getGLState().getReadFramebuffer();
>+    const Framebuffer *readFBO = context->getState().getReadFramebuffer();
> 
>     if (readFBO == nullptr)
>     {
>-        context->handleError(InvalidOperation() << "No active read framebuffer.");
>+        context->validationError(GL_INVALID_OPERATION, kNoReadFramebuffer);
>         return false;
>     }
> 
>@@ -1321,7 +1480,7 @@ bool ValidateReadBuffer(Context *context, GLenum src)
> 
>     if (src != GL_BACK && (src < GL_COLOR_ATTACHMENT0 || src > GL_COLOR_ATTACHMENT31))
>     {
>-        context->handleError(InvalidEnum() << "Unknown enum for 'src' in ReadBuffer");
>+        context->validationError(GL_INVALID_ENUM, kInvalidReadBuffer);
>         return false;
>     }
> 
>@@ -1329,9 +1488,7 @@ bool ValidateReadBuffer(Context *context, GLenum src)
>     {
>         if (src != GL_BACK)
>         {
>-            context->handleError(
>-                InvalidOperation()
>-                << "'src' must be GL_NONE or GL_BACK when reading from the default framebuffer.");
>+            context->validationError(GL_INVALID_OPERATION, kInvalidDefaultReadBuffer);
>             return false;
>         }
>     }
>@@ -1341,7 +1498,7 @@ bool ValidateReadBuffer(Context *context, GLenum src)
> 
>         if (drawBuffer >= context->getCaps().maxDrawBuffers)
>         {
>-            context->handleError(InvalidOperation() << "'src' is greater than MAX_DRAW_BUFFERS.");
>+            context->validationError(GL_INVALID_OPERATION, kExceedsMaxDrawBuffers);
>             return false;
>         }
>     }
>@@ -1350,7 +1507,7 @@ bool ValidateReadBuffer(Context *context, GLenum src)
> }
> 
> bool ValidateCompressedTexImage3D(Context *context,
>-                                  GLenum target,
>+                                  TextureTarget target,
>                                   GLint level,
>                                   GLenum internalformat,
>                                   GLsizei width,
>@@ -1362,46 +1519,48 @@ bool ValidateCompressedTexImage3D(Context *context,
> {
>     if (context->getClientMajorVersion() < 3)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidOperation(), ES3Required);
>+        context->validationError(GL_INVALID_OPERATION, kES3Required);
>         return false;
>     }
> 
>-    if (!ValidTextureTarget(context, target))
>+    if (!ValidTextureTarget(context, TextureTargetToType(target)))
>     {
>-        context->handleError(InvalidEnum());
>+        context->validationError(GL_INVALID_ENUM, kInvalidTextureTarget);
>         return false;
>     }
> 
>     // Validate image size
>-    if (!ValidImageSizeParameters(context, target, level, width, height, depth, false))
>+    if (!ValidImageSizeParameters(context, TextureTargetToType(target), level, width, height, depth,
>+                                  false))
>     {
>-        context->handleError(InvalidValue());
>+        // Error already generated.
>         return false;
>     }
> 
>     const InternalFormat &formatInfo = GetSizedInternalFormatInfo(internalformat);
>     if (!formatInfo.compressed)
>     {
>-        context->handleError(InvalidEnum() << "Not a valid compressed texture format");
>+        context->validationError(GL_INVALID_ENUM, kInvalidCompressedFormat);
>         return false;
>     }
> 
>-    auto blockSizeOrErr = formatInfo.computeCompressedImageSize(gl::Extents(width, height, depth));
>-    if (blockSizeOrErr.isError())
>+    GLuint blockSize = 0;
>+    if (!formatInfo.computeCompressedImageSize(gl::Extents(width, height, depth), &blockSize))
>     {
>-        context->handleError(InvalidValue());
>+        context->validationError(GL_INVALID_VALUE, kIntegerOverflow);
>         return false;
>     }
>-    if (imageSize < 0 || static_cast<GLuint>(imageSize) != blockSizeOrErr.getResult())
>+
>+    if (imageSize < 0 || static_cast<GLuint>(imageSize) != blockSize)
>     {
>-        context->handleError(InvalidValue());
>+        context->validationError(GL_INVALID_VALUE, kInvalidCompressedImageSize);
>         return false;
>     }
> 
>     // 3D texture target validation
>-    if (target != GL_TEXTURE_3D && target != GL_TEXTURE_2D_ARRAY)
>+    if (target != TextureTarget::_3D && target != TextureTarget::_2DArray)
>     {
>-        context->handleError(InvalidEnum() << "Must specify a valid 3D texture destination target");
>+        context->validationError(GL_INVALID_ENUM, kInvalidTextureTarget);
>         return false;
>     }
> 
>@@ -1417,7 +1576,7 @@ bool ValidateCompressedTexImage3D(Context *context,
> }
> 
> bool ValidateCompressedTexImage3DRobustANGLE(Context *context,
>-                                             GLenum target,
>+                                             TextureTarget target,
>                                              GLint level,
>                                              GLenum internalformat,
>                                              GLsizei width,
>@@ -1441,7 +1600,7 @@ bool ValidateBindVertexArray(Context *context, GLuint array)
> {
>     if (context->getClientMajorVersion() < 3)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidOperation(), ES3Required);
>+        context->validationError(GL_INVALID_OPERATION, kES3Required);
>         return false;
>     }
> 
>@@ -1452,7 +1611,7 @@ bool ValidateIsVertexArray(Context *context, GLuint array)
> {
>     if (context->getClientMajorVersion() < 3)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidOperation(), ES3Required);
>+        context->validationError(GL_INVALID_OPERATION, kES3Required);
>         return false;
>     }
> 
>@@ -1468,20 +1627,20 @@ static bool ValidateBindBufferCommon(Context *context,
> {
>     if (context->getClientMajorVersion() < 3)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidOperation(), ES3Required);
>+        context->validationError(GL_INVALID_OPERATION, kES3Required);
>         return false;
>     }
> 
>     if (buffer != 0 && offset < 0)
>     {
>-        context->handleError(InvalidValue() << "buffer is non-zero and offset is negative.");
>+        context->validationError(GL_INVALID_VALUE, kNegativeOffset);
>         return false;
>     }
> 
>-    if (!context->getGLState().isBindGeneratesResourceEnabled() &&
>+    if (!context->getState().isBindGeneratesResourceEnabled() &&
>         !context->isBufferGenerated(buffer))
>     {
>-        context->handleError(InvalidOperation() << "Buffer was not generated.");
>+        context->validationError(GL_INVALID_OPERATION, kObjectNotGenerated);
>         return false;
>     }
> 
>@@ -1492,24 +1651,21 @@ static bool ValidateBindBufferCommon(Context *context,
>         {
>             if (index >= caps.maxTransformFeedbackSeparateAttributes)
>             {
>-                context->handleError(InvalidValue() << "index is greater than or equal to the "
>-                                                       "number of TRANSFORM_FEEDBACK_BUFFER "
>-                                                       "indexed binding points.");
>+                context->validationError(GL_INVALID_VALUE,
>+                                         kIndexExceedsTransformFeedbackBufferBindings);
>                 return false;
>             }
>             if (buffer != 0 && ((offset % 4) != 0 || (size % 4) != 0))
>             {
>-                context->handleError(InvalidValue() << "offset and size must be multiple of 4.");
>+                context->validationError(GL_INVALID_VALUE, kOffsetAndSizeAlignment);
>                 return false;
>             }
> 
>             TransformFeedback *curTransformFeedback =
>-                context->getGLState().getCurrentTransformFeedback();
>+                context->getState().getCurrentTransformFeedback();
>             if (curTransformFeedback && curTransformFeedback->isActive())
>             {
>-                context->handleError(InvalidOperation()
>-                                     << "target is TRANSFORM_FEEDBACK_BUFFER and transform "
>-                                        "feedback is currently active.");
>+                context->validationError(GL_INVALID_OPERATION, kTransformFeedbackTargetActive);
>                 return false;
>             }
>             break;
>@@ -1518,17 +1674,14 @@ static bool ValidateBindBufferCommon(Context *context,
>         {
>             if (index >= caps.maxUniformBufferBindings)
>             {
>-                context->handleError(InvalidValue() << "index is greater than or equal to the "
>-                                                       "number of UNIFORM_BUFFER indexed "
>-                                                       "binding points.");
>+                context->validationError(GL_INVALID_VALUE, kIndexExceedsMaxUniformBufferBindings);
>                 return false;
>             }
> 
>+            ASSERT(caps.uniformBufferOffsetAlignment);
>             if (buffer != 0 && (offset % caps.uniformBufferOffsetAlignment) != 0)
>             {
>-                context->handleError(
>-                    InvalidValue()
>-                    << "offset must be multiple of value of UNIFORM_BUFFER_OFFSET_ALIGNMENT.");
>+                context->validationError(GL_INVALID_VALUE, kUniformBufferOffsetAlignment);
>                 return false;
>             }
>             break;
>@@ -1537,20 +1690,18 @@ static bool ValidateBindBufferCommon(Context *context,
>         {
>             if (context->getClientVersion() < ES_3_1)
>             {
>-                context->handleError(InvalidEnum()
>-                                     << "ATOMIC_COUNTER_BUFFER is not supported before GLES 3.1");
>+                context->validationError(GL_INVALID_ENUM, kEnumRequiresGLES31);
>                 return false;
>             }
>             if (index >= caps.maxAtomicCounterBufferBindings)
>             {
>-                context->handleError(InvalidValue() << "index is greater than or equal to the "
>-                                                       "number of ATOMIC_COUNTER_BUFFER "
>-                                                       "indexed binding points.");
>+                context->validationError(GL_INVALID_VALUE,
>+                                         kIndexExceedsMaxAtomicCounterBufferBindings);
>                 return false;
>             }
>             if (buffer != 0 && (offset % 4) != 0)
>             {
>-                context->handleError(InvalidValue() << "offset must be a multiple of 4.");
>+                context->validationError(GL_INVALID_VALUE, kOffsetAlignment);
>                 return false;
>             }
>             break;
>@@ -1559,28 +1710,24 @@ static bool ValidateBindBufferCommon(Context *context,
>         {
>             if (context->getClientVersion() < ES_3_1)
>             {
>-                context->handleError(InvalidEnum()
>-                                     << "SHADER_STORAGE_BUFFER is not supported in GLES3.");
>+                context->validationError(GL_INVALID_ENUM, kEnumRequiresGLES31);
>                 return false;
>             }
>             if (index >= caps.maxShaderStorageBufferBindings)
>             {
>-                context->handleError(InvalidValue() << "index is greater than or equal to the "
>-                                                       "number of SHADER_STORAGE_BUFFER "
>-                                                       "indexed binding points.");
>+                context->validationError(GL_INVALID_VALUE, kExceedsMaxShaderStorageBufferBindings);
>                 return false;
>             }
>+            ASSERT(caps.shaderStorageBufferOffsetAlignment);
>             if (buffer != 0 && (offset % caps.shaderStorageBufferOffsetAlignment) != 0)
>             {
>-                context->handleError(InvalidValue() << "offset must be multiple of value of "
>-                                                       "SHADER_STORAGE_BUFFER_OFFSET_"
>-                                                       "ALIGNMENT.");
>+                context->validationError(GL_INVALID_VALUE, kShaderStorageBufferOffsetAlignment);
>                 return false;
>             }
>             break;
>         }
>         default:
>-            context->handleError(InvalidEnum() << "the target is not supported.");
>+            context->validationError(GL_INVALID_ENUM, kEnumNotSupported);
>             return false;
>     }
> 
>@@ -1601,8 +1748,7 @@ bool ValidateBindBufferRange(Context *context,
> {
>     if (buffer != 0 && size <= 0)
>     {
>-        context->handleError(InvalidValue()
>-                             << "buffer is non-zero and size is less than or equal to zero.");
>+        context->validationError(GL_INVALID_VALUE, kInvalidBindBufferSize);
>         return false;
>     }
>     return ValidateBindBufferCommon(context, target, index, buffer, offset, size);
>@@ -1616,7 +1762,7 @@ bool ValidateProgramBinary(Context *context,
> {
>     if (context->getClientMajorVersion() < 3)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidOperation(), ES3Required);
>+        context->validationError(GL_INVALID_OPERATION, kES3Required);
>         return false;
>     }
> 
>@@ -1632,7 +1778,7 @@ bool ValidateGetProgramBinary(Context *context,
> {
>     if (context->getClientMajorVersion() < 3)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidOperation(), ES3Required);
>+        context->validationError(GL_INVALID_OPERATION, kES3Required);
>         return false;
>     }
> 
>@@ -1643,7 +1789,7 @@ bool ValidateProgramParameteri(Context *context, GLuint program, GLenum pname, G
> {
>     if (context->getClientMajorVersion() < 3)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidOperation(), ES3Required);
>+        context->validationError(GL_INVALID_OPERATION, kES3Required);
>         return false;
>     }
> 
>@@ -1657,8 +1803,7 @@ bool ValidateProgramParameteri(Context *context, GLuint program, GLenum pname, G
>         case GL_PROGRAM_BINARY_RETRIEVABLE_HINT:
>             if (value != GL_FALSE && value != GL_TRUE)
>             {
>-                context->handleError(InvalidValue()
>-                                     << "Invalid value, expected GL_FALSE or GL_TRUE: " << value);
>+                context->validationError(GL_INVALID_VALUE, kInvalidBooleanValue);
>                 return false;
>             }
>             break;
>@@ -1666,22 +1811,19 @@ bool ValidateProgramParameteri(Context *context, GLuint program, GLenum pname, G
>         case GL_PROGRAM_SEPARABLE:
>             if (context->getClientVersion() < ES_3_1)
>             {
>-                context->handleError(InvalidEnum()
>-                                     << "PROGRAM_SEPARABLE is not supported before GLES 3.1");
>+                context->validationError(GL_INVALID_ENUM, kES31Required);
>                 return false;
>             }
> 
>             if (value != GL_FALSE && value != GL_TRUE)
>             {
>-                context->handleError(InvalidValue()
>-                                     << "Invalid value, expected GL_FALSE or GL_TRUE: " << value);
>+                context->validationError(GL_INVALID_VALUE, kInvalidBooleanValue);
>                 return false;
>             }
>             break;
> 
>         default:
>-            context->handleError(InvalidEnum()
>-                                 << "Invalid pname: 0x" << std::hex << std::uppercase << pname);
>+            context->validationError(GL_INVALID_ENUM, kInvalidPname);
>             return false;
>     }
> 
>@@ -1702,7 +1844,7 @@ bool ValidateBlitFramebuffer(Context *context,
> {
>     if (context->getClientMajorVersion() < 3)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidOperation(), ES3Required);
>+        context->validationError(GL_INVALID_OPERATION, kES3Required);
>         return false;
>     }
> 
>@@ -1710,10 +1852,7 @@ bool ValidateBlitFramebuffer(Context *context,
>                                              dstX1, dstY1, mask, filter);
> }
> 
>-bool ValidateClearBufferiv(ValidationContext *context,
>-                           GLenum buffer,
>-                           GLint drawbuffer,
>-                           const GLint *value)
>+bool ValidateClearBufferiv(Context *context, GLenum buffer, GLint drawbuffer, const GLint *value)
> {
>     switch (buffer)
>     {
>@@ -1721,7 +1860,7 @@ bool ValidateClearBufferiv(ValidationContext *context,
>             if (drawbuffer < 0 ||
>                 static_cast<GLuint>(drawbuffer) >= context->getCaps().maxDrawBuffers)
>             {
>-                context->handleError(InvalidValue());
>+                context->validationError(GL_INVALID_VALUE, kIndexExceedsMaxDrawBuffer);
>                 return false;
>             }
>             if (context->getExtensions().webglCompatibility)
>@@ -1738,23 +1877,20 @@ bool ValidateClearBufferiv(ValidationContext *context,
>         case GL_STENCIL:
>             if (drawbuffer != 0)
>             {
>-                context->handleError(InvalidValue());
>+                context->validationError(GL_INVALID_VALUE, kInvalidDepthStencilDrawBuffer);
>                 return false;
>             }
>             break;
> 
>         default:
>-            context->handleError(InvalidEnum());
>+            context->validationError(GL_INVALID_ENUM, kEnumNotSupported);
>             return false;
>     }
> 
>     return ValidateClearBuffer(context);
> }
> 
>-bool ValidateClearBufferuiv(ValidationContext *context,
>-                            GLenum buffer,
>-                            GLint drawbuffer,
>-                            const GLuint *value)
>+bool ValidateClearBufferuiv(Context *context, GLenum buffer, GLint drawbuffer, const GLuint *value)
> {
>     switch (buffer)
>     {
>@@ -1762,7 +1898,7 @@ bool ValidateClearBufferuiv(ValidationContext *context,
>             if (drawbuffer < 0 ||
>                 static_cast<GLuint>(drawbuffer) >= context->getCaps().maxDrawBuffers)
>             {
>-                context->handleError(InvalidValue());
>+                context->validationError(GL_INVALID_VALUE, kIndexExceedsMaxDrawBuffer);
>                 return false;
>             }
>             if (context->getExtensions().webglCompatibility)
>@@ -1777,17 +1913,14 @@ bool ValidateClearBufferuiv(ValidationContext *context,
>             break;
> 
>         default:
>-            context->handleError(InvalidEnum());
>+            context->validationError(GL_INVALID_ENUM, kEnumNotSupported);
>             return false;
>     }
> 
>     return ValidateClearBuffer(context);
> }
> 
>-bool ValidateClearBufferfv(ValidationContext *context,
>-                           GLenum buffer,
>-                           GLint drawbuffer,
>-                           const GLfloat *value)
>+bool ValidateClearBufferfv(Context *context, GLenum buffer, GLint drawbuffer, const GLfloat *value)
> {
>     switch (buffer)
>     {
>@@ -1795,7 +1928,7 @@ bool ValidateClearBufferfv(ValidationContext *context,
>             if (drawbuffer < 0 ||
>                 static_cast<GLuint>(drawbuffer) >= context->getCaps().maxDrawBuffers)
>             {
>-                context->handleError(InvalidValue());
>+                context->validationError(GL_INVALID_VALUE, kIndexExceedsMaxDrawBuffer);
>                 return false;
>             }
>             if (context->getExtensions().webglCompatibility)
>@@ -1813,20 +1946,20 @@ bool ValidateClearBufferfv(ValidationContext *context,
>         case GL_DEPTH:
>             if (drawbuffer != 0)
>             {
>-                context->handleError(InvalidValue());
>+                context->validationError(GL_INVALID_VALUE, kInvalidDepthStencilDrawBuffer);
>                 return false;
>             }
>             break;
> 
>         default:
>-            context->handleError(InvalidEnum());
>+            context->validationError(GL_INVALID_ENUM, kEnumNotSupported);
>             return false;
>     }
> 
>     return ValidateClearBuffer(context);
> }
> 
>-bool ValidateClearBufferfi(ValidationContext *context,
>+bool ValidateClearBufferfi(Context *context,
>                            GLenum buffer,
>                            GLint drawbuffer,
>                            GLfloat depth,
>@@ -1837,24 +1970,24 @@ bool ValidateClearBufferfi(ValidationContext *context,
>         case GL_DEPTH_STENCIL:
>             if (drawbuffer != 0)
>             {
>-                context->handleError(InvalidValue());
>+                context->validationError(GL_INVALID_VALUE, kInvalidDepthStencilDrawBuffer);
>                 return false;
>             }
>             break;
> 
>         default:
>-            context->handleError(InvalidEnum());
>+            context->validationError(GL_INVALID_ENUM, kEnumNotSupported);
>             return false;
>     }
> 
>     return ValidateClearBuffer(context);
> }
> 
>-bool ValidateDrawBuffers(ValidationContext *context, GLsizei n, const GLenum *bufs)
>+bool ValidateDrawBuffers(Context *context, GLsizei n, const GLenum *bufs)
> {
>     if (context->getClientMajorVersion() < 3)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidOperation(), ES3Required);
>+        context->validationError(GL_INVALID_OPERATION, kES3Required);
>         return false;
>     }
> 
>@@ -1862,7 +1995,7 @@ bool ValidateDrawBuffers(ValidationContext *context, GLsizei n, const GLenum *bu
> }
> 
> bool ValidateCopyTexSubImage3D(Context *context,
>-                               GLenum target,
>+                               TextureTarget target,
>                                GLint level,
>                                GLint xoffset,
>                                GLint yoffset,
>@@ -1874,7 +2007,7 @@ bool ValidateCopyTexSubImage3D(Context *context,
> {
>     if (context->getClientMajorVersion() < 3)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidOperation(), ES3Required);
>+        context->validationError(GL_INVALID_OPERATION, kES3Required);
>         return false;
>     }
> 
>@@ -1882,8 +2015,159 @@ bool ValidateCopyTexSubImage3D(Context *context,
>                                                yoffset, zoffset, x, y, width, height, 0);
> }
> 
>+bool ValidateCopyTexture3DANGLE(Context *context,
>+                                GLuint sourceId,
>+                                GLint sourceLevel,
>+                                TextureTarget destTarget,
>+                                GLuint destId,
>+                                GLint destLevel,
>+                                GLint internalFormat,
>+                                GLenum destType,
>+                                GLboolean unpackFlipY,
>+                                GLboolean unpackPremultiplyAlpha,
>+                                GLboolean unpackUnmultiplyAlpha)
>+{
>+    const Texture *source = context->getTexture(sourceId);
>+    if (source == nullptr)
>+    {
>+        context->validationError(GL_INVALID_VALUE, kInvalidSourceTexture);
>+        return false;
>+    }
>+
>+    TextureType sourceType = source->getType();
>+    ASSERT(sourceType != TextureType::CubeMap);
>+    TextureTarget sourceTarget = NonCubeTextureTypeToTarget(sourceType);
>+    const Format &sourceFormat = source->getFormat(sourceTarget, sourceLevel);
>+
>+    const Texture *dest = context->getTexture(destId);
>+    if (dest == nullptr)
>+    {
>+        context->validationError(GL_INVALID_VALUE, kInvalidDestinationTexture);
>+        return false;
>+    }
>+
>+    if (!ValidateCopyTexture3DCommon(context, source, sourceLevel,
>+                                     sourceFormat.info->internalFormat, dest, destLevel,
>+                                     internalFormat, destTarget))
>+    {
>+        return false;
>+    }
>+
>+    if (!ValidMipLevel(context, source->getType(), sourceLevel))
>+    {
>+        context->validationError(GL_INVALID_VALUE, kInvalidSourceTextureLevel);
>+        return false;
>+    }
>+
>+    GLsizei sourceWidth  = static_cast<GLsizei>(source->getWidth(sourceTarget, sourceLevel));
>+    GLsizei sourceHeight = static_cast<GLsizei>(source->getHeight(sourceTarget, sourceLevel));
>+    if (sourceWidth == 0 || sourceHeight == 0)
>+    {
>+        context->validationError(GL_INVALID_OPERATION, kInvalidSourceTextureSize);
>+        return false;
>+    }
>+
>+    if (dest->getImmutableFormat())
>+    {
>+        context->validationError(GL_INVALID_OPERATION, kDestinationImmutable);
>+        return false;
>+    }
>+
>+    return true;
>+}
>+
>+bool ValidateCopySubTexture3DANGLE(Context *context,
>+                                   GLuint sourceId,
>+                                   GLint sourceLevel,
>+                                   TextureTarget destTarget,
>+                                   GLuint destId,
>+                                   GLint destLevel,
>+                                   GLint xoffset,
>+                                   GLint yoffset,
>+                                   GLint zoffset,
>+                                   GLint x,
>+                                   GLint y,
>+                                   GLint z,
>+                                   GLsizei width,
>+                                   GLsizei height,
>+                                   GLsizei depth,
>+                                   GLboolean unpackFlipY,
>+                                   GLboolean unpackPremultiplyAlpha,
>+                                   GLboolean unpackUnmultiplyAlpha)
>+{
>+    const Texture *source = context->getTexture(sourceId);
>+    if (source == nullptr)
>+    {
>+        context->validationError(GL_INVALID_VALUE, kInvalidSourceTexture);
>+        return false;
>+    }
>+
>+    TextureType sourceType = source->getType();
>+    ASSERT(sourceType != TextureType::CubeMap);
>+    TextureTarget sourceTarget = NonCubeTextureTypeToTarget(sourceType);
>+    const Format &sourceFormat = source->getFormat(sourceTarget, sourceLevel);
>+
>+    const Texture *dest = context->getTexture(destId);
>+    if (dest == nullptr)
>+    {
>+        context->validationError(GL_INVALID_VALUE, kInvalidDestinationTexture);
>+        return false;
>+    }
>+
>+    const InternalFormat &destFormat = *dest->getFormat(destTarget, destLevel).info;
>+
>+    if (!ValidateCopyTexture3DCommon(context, source, sourceLevel,
>+                                     sourceFormat.info->internalFormat, dest, destLevel,
>+                                     destFormat.internalFormat, destTarget))
>+    {
>+        return false;
>+    }
>+
>+    if (x < 0 || y < 0 || z < 0)
>+    {
>+        context->validationError(GL_INVALID_VALUE, kNegativeXYZ);
>+        return false;
>+    }
>+
>+    if (width < 0 || height < 0 || depth < 0)
>+    {
>+        context->validationError(GL_INVALID_VALUE, kNegativeHeightWidthDepth);
>+        return false;
>+    }
>+
>+    if (static_cast<size_t>(x + width) > source->getWidth(sourceTarget, sourceLevel) ||
>+        static_cast<size_t>(y + height) > source->getHeight(sourceTarget, sourceLevel) ||
>+        static_cast<size_t>(z + depth) > source->getDepth(sourceTarget, sourceLevel))
>+    {
>+        context->validationError(GL_INVALID_VALUE, kSourceTextureTooSmall);
>+        return false;
>+    }
>+
>+    if (TextureTargetToType(destTarget) != dest->getType())
>+    {
>+        context->validationError(GL_INVALID_VALUE, kInvalidDestinationTextureType);
>+        return false;
>+    }
>+
>+    if (xoffset < 0 || yoffset < 0 || zoffset < 0)
>+    {
>+        context->validationError(GL_INVALID_VALUE, kNegativeOffset);
>+        return false;
>+    }
>+
>+    if (static_cast<size_t>(xoffset + width) > dest->getWidth(destTarget, destLevel) ||
>+        static_cast<size_t>(yoffset + height) > dest->getHeight(destTarget, destLevel) ||
>+        static_cast<size_t>(zoffset + depth) > dest->getDepth(destTarget, destLevel))
>+    {
>+        context->validationError(GL_INVALID_VALUE, kDestinationTextureTooSmall);
>+        return false;
>+    }
>+
>+    return true;
>+}
>+
> bool ValidateTexImage3D(Context *context,
>-                        GLenum target,
>+                        TextureTarget target,
>                         GLint level,
>                         GLint internalformat,
>                         GLsizei width,
>@@ -1896,7 +2180,7 @@ bool ValidateTexImage3D(Context *context,
> {
>     if (context->getClientMajorVersion() < 3)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidOperation(), ES3Required);
>+        context->validationError(GL_INVALID_OPERATION, kES3Required);
>         return false;
>     }
> 
>@@ -1906,7 +2190,7 @@ bool ValidateTexImage3D(Context *context,
> }
> 
> bool ValidateTexImage3DRobustANGLE(Context *context,
>-                                   GLenum target,
>+                                   TextureTarget target,
>                                    GLint level,
>                                    GLint internalformat,
>                                    GLsizei width,
>@@ -1920,7 +2204,7 @@ bool ValidateTexImage3DRobustANGLE(Context *context,
> {
>     if (context->getClientMajorVersion() < 3)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidOperation(), ES3Required);
>+        context->validationError(GL_INVALID_OPERATION, kES3Required);
>         return false;
>     }
> 
>@@ -1935,7 +2219,7 @@ bool ValidateTexImage3DRobustANGLE(Context *context,
> }
> 
> bool ValidateTexSubImage3D(Context *context,
>-                           GLenum target,
>+                           TextureTarget target,
>                            GLint level,
>                            GLint xoffset,
>                            GLint yoffset,
>@@ -1949,7 +2233,7 @@ bool ValidateTexSubImage3D(Context *context,
> {
>     if (context->getClientMajorVersion() < 3)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidOperation(), ES3Required);
>+        context->validationError(GL_INVALID_OPERATION, kES3Required);
>         return false;
>     }
> 
>@@ -1959,7 +2243,7 @@ bool ValidateTexSubImage3D(Context *context,
> }
> 
> bool ValidateTexSubImage3DRobustANGLE(Context *context,
>-                                      GLenum target,
>+                                      TextureTarget target,
>                                       GLint level,
>                                       GLint xoffset,
>                                       GLint yoffset,
>@@ -1974,7 +2258,7 @@ bool ValidateTexSubImage3DRobustANGLE(Context *context,
> {
>     if (context->getClientMajorVersion() < 3)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidOperation(), ES3Required);
>+        context->validationError(GL_INVALID_OPERATION, kES3Required);
>         return false;
>     }
> 
>@@ -1989,7 +2273,7 @@ bool ValidateTexSubImage3DRobustANGLE(Context *context,
> }
> 
> bool ValidateCompressedTexSubImage3D(Context *context,
>-                                     GLenum target,
>+                                     TextureTarget target,
>                                      GLint level,
>                                      GLint xoffset,
>                                      GLint yoffset,
>@@ -2003,41 +2287,48 @@ bool ValidateCompressedTexSubImage3D(Context *context,
> {
>     if (context->getClientMajorVersion() < 3)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidOperation(), ES3Required);
>+        context->validationError(GL_INVALID_OPERATION, kES3Required);
>         return false;
>     }
> 
>     const InternalFormat &formatInfo = GetSizedInternalFormatInfo(format);
>     if (!formatInfo.compressed)
>     {
>-        context->handleError(InvalidEnum() << "Not a valid compressed texture format");
>+        context->validationError(GL_INVALID_ENUM, kInvalidCompressedFormat);
>+        return false;
>+    }
>+
>+    GLuint blockSize = 0;
>+    if (!formatInfo.computeCompressedImageSize(gl::Extents(width, height, depth), &blockSize))
>+    {
>+        context->validationError(GL_INVALID_OPERATION, kIntegerOverflow);
>         return false;
>     }
> 
>-    auto blockSizeOrErr = formatInfo.computeCompressedImageSize(gl::Extents(width, height, depth));
>-    if (blockSizeOrErr.isError())
>+    if (imageSize < 0 || static_cast<GLuint>(imageSize) != blockSize)
>     {
>-        context->handleError(blockSizeOrErr.getError());
>+        context->validationError(GL_INVALID_VALUE, kInvalidCompressedImageSize);
>         return false;
>     }
>-    if (imageSize < 0 || static_cast<GLuint>(imageSize) != blockSizeOrErr.getResult())
>+
>+    if (!ValidateES3TexImage3DParameters(context, target, level, GL_NONE, true, true, xoffset,
>+                                         yoffset, zoffset, width, height, depth, 0, format, GL_NONE,
>+                                         -1, data))
>     {
>-        context->handleError(InvalidValue());
>         return false;
>     }
> 
>     if (!data)
>     {
>-        context->handleError(InvalidValue());
>+        context->validationError(GL_INVALID_VALUE, kPixelDataNull);
>         return false;
>     }
> 
>-    return ValidateES3TexImage3DParameters(context, target, level, GL_NONE, true, true, xoffset,
>-                                           yoffset, zoffset, width, height, depth, 0, format,
>-                                           GL_NONE, -1, data);
>+    return true;
> }
>+
> bool ValidateCompressedTexSubImage3DRobustANGLE(Context *context,
>-                                                GLenum target,
>+                                                TextureTarget target,
>                                                 GLint level,
>                                                 GLint xoffset,
>                                                 GLint yoffset,
>@@ -2096,8 +2387,7 @@ bool ValidateDeleteTransformFeedbacks(Context *context, GLint n, const GLuint *i
>         if (transformFeedback != nullptr && transformFeedback->isActive())
>         {
>             // ES 3.0.4 section 2.15.1 page 86
>-            context->handleError(InvalidOperation()
>-                                 << "Attempt to delete active transform feedback.");
>+            context->validationError(GL_INVALID_OPERATION, kTransformFeedbackActiveDelete);
>             return false;
>         }
>     }
>@@ -2114,55 +2404,66 @@ bool ValidateDeleteVertexArrays(Context *context, GLint n, const GLuint *)
>     return ValidateGenOrDeleteES3(context, n);
> }
> 
>-bool ValidateBeginTransformFeedback(Context *context, GLenum primitiveMode)
>+bool ValidateBeginTransformFeedback(Context *context, PrimitiveMode primitiveMode)
> {
>     if (context->getClientMajorVersion() < 3)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidOperation(), ES3Required);
>+        context->validationError(GL_INVALID_OPERATION, kES3Required);
>         return false;
>     }
>     switch (primitiveMode)
>     {
>-        case GL_TRIANGLES:
>-        case GL_LINES:
>-        case GL_POINTS:
>+        case PrimitiveMode::Triangles:
>+        case PrimitiveMode::Lines:
>+        case PrimitiveMode::Points:
>             break;
> 
>         default:
>-            context->handleError(InvalidEnum() << "Invalid primitive mode.");
>+            context->validationError(GL_INVALID_ENUM, kInvalidPrimitiveMode);
>             return false;
>     }
> 
>-    TransformFeedback *transformFeedback = context->getGLState().getCurrentTransformFeedback();
>+    TransformFeedback *transformFeedback = context->getState().getCurrentTransformFeedback();
>     ASSERT(transformFeedback != nullptr);
> 
>     if (transformFeedback->isActive())
>     {
>-        context->handleError(InvalidOperation() << "Transform feedback is already active.");
>+        context->validationError(GL_INVALID_OPERATION, kTransfomFeedbackAlreadyActive);
>         return false;
>     }
> 
>     for (size_t i = 0; i < transformFeedback->getIndexedBufferCount(); i++)
>     {
>         const auto &buffer = transformFeedback->getIndexedBuffer(i);
>-        if (buffer.get() && buffer->isMapped())
>+        if (buffer.get())
>         {
>-            context->handleError(InvalidOperation() << "Transform feedback has a mapped buffer.");
>-            return false;
>+            if (buffer->isMapped())
>+            {
>+                context->validationError(GL_INVALID_OPERATION, kBufferMapped);
>+                return false;
>+            }
>+            if ((context->getLimitations().noDoubleBoundTransformFeedbackBuffers ||
>+                 context->getExtensions().webglCompatibility) &&
>+                buffer->isDoubleBoundForTransformFeedback())
>+            {
>+                context->validationError(GL_INVALID_OPERATION,
>+                                         kTransformFeedbackBufferMultipleOutputs);
>+                return false;
>+            }
>         }
>     }
> 
>-    Program *program = context->getGLState().getProgram();
>+    Program *program = context->getState().getLinkedProgram(context);
> 
>     if (!program)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidOperation(), ProgramNotBound);
>+        context->validationError(GL_INVALID_OPERATION, kProgramNotBound);
>         return false;
>     }
> 
>     if (program->getTransformFeedbackVaryingCount() == 0)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidOperation(), NoTransformFeedbackOutputVariables);
>+        context->validationError(GL_INVALID_OPERATION, kNoTransformFeedbackOutputVariables);
>         return false;
>     }
> 
>@@ -2171,6 +2472,12 @@ bool ValidateBeginTransformFeedback(Context *context, GLenum primitiveMode)
> 
> bool ValidateGetBufferPointerv(Context *context, BufferBinding target, GLenum pname, void **params)
> {
>+    if (context->getClientMajorVersion() < 3)
>+    {
>+        context->validationError(GL_INVALID_OPERATION, kES3Required);
>+        return false;
>+    }
>+
>     return ValidateGetBufferPointervBase(context, target, pname, nullptr, params);
> }
> 
>@@ -2186,16 +2493,26 @@ bool ValidateGetBufferPointervRobustANGLE(Context *context,
>         return false;
>     }
> 
>-    if (!ValidateGetBufferPointervBase(context, target, pname, length, params))
>+    GLsizei numParams = 0;
>+
>+    if (context->getClientMajorVersion() < 3 && !context->getExtensions().mapBuffer)
>     {
>+        context->validationError(GL_INVALID_OPERATION, kExtensionNotEnabled);
>         return false;
>     }
> 
>-    if (!ValidateRobustBufferSize(context, bufSize, *length))
>+    if (!ValidateGetBufferPointervBase(context, target, pname, &numParams, params))
>     {
>         return false;
>     }
> 
>+    if (!ValidateRobustBufferSize(context, bufSize, numParams))
>+    {
>+        return false;
>+    }
>+
>+    SetRobustLengthParam(length, numParams);
>+
>     return true;
> }
> 
>@@ -2203,7 +2520,7 @@ bool ValidateUnmapBuffer(Context *context, BufferBinding target)
> {
>     if (context->getClientMajorVersion() < 3)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidOperation(), ES3Required);
>+        context->validationError(GL_INVALID_OPERATION, kES3Required);
>         return false;
>     }
> 
>@@ -2218,7 +2535,7 @@ bool ValidateMapBufferRange(Context *context,
> {
>     if (context->getClientMajorVersion() < 3)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidOperation(), ES3Required);
>+        context->validationError(GL_INVALID_OPERATION, kES3Required);
>         return false;
>     }
> 
>@@ -2232,17 +2549,14 @@ bool ValidateFlushMappedBufferRange(Context *context,
> {
>     if (context->getClientMajorVersion() < 3)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidOperation(), ES3Required);
>+        context->validationError(GL_INVALID_OPERATION, kES3Required);
>         return false;
>     }
> 
>     return ValidateFlushMappedBufferRangeBase(context, target, offset, length);
> }
> 
>-bool ValidateIndexedStateQuery(ValidationContext *context,
>-                               GLenum pname,
>-                               GLuint index,
>-                               GLsizei *length)
>+bool ValidateIndexedStateQuery(Context *context, GLenum pname, GLuint index, GLsizei *length)
> {
>     if (length)
>     {
>@@ -2253,7 +2567,7 @@ bool ValidateIndexedStateQuery(ValidationContext *context,
>     unsigned int numParams;
>     if (!context->getIndexedQueryParameterInfo(pname, &nativeType, &numParams))
>     {
>-        context->handleError(InvalidEnum());
>+        context->validationError(GL_INVALID_ENUM, kInvalidPname);
>         return false;
>     }
> 
>@@ -2265,7 +2579,8 @@ bool ValidateIndexedStateQuery(ValidationContext *context,
>         case GL_TRANSFORM_FEEDBACK_BUFFER_BINDING:
>             if (index >= caps.maxTransformFeedbackSeparateAttributes)
>             {
>-                context->handleError(InvalidValue());
>+                context->validationError(GL_INVALID_VALUE,
>+                                         kIndexExceedsMaxTransformFeedbackAttribs);
>                 return false;
>             }
>             break;
>@@ -2275,7 +2590,7 @@ bool ValidateIndexedStateQuery(ValidationContext *context,
>         case GL_UNIFORM_BUFFER_BINDING:
>             if (index >= caps.maxUniformBufferBindings)
>             {
>-                context->handleError(InvalidValue());
>+                context->validationError(GL_INVALID_VALUE, kIndexExceedsMaxUniformBufferBindings);
>                 return false;
>             }
>             break;
>@@ -2284,7 +2599,7 @@ bool ValidateIndexedStateQuery(ValidationContext *context,
>         case GL_MAX_COMPUTE_WORK_GROUP_COUNT:
>             if (index >= 3u)
>             {
>-                context->handleError(InvalidValue());
>+                context->validationError(GL_INVALID_VALUE, kIndexExceedsMaxWorkgroupDimensions);
>                 return false;
>             }
>             break;
>@@ -2294,16 +2609,13 @@ bool ValidateIndexedStateQuery(ValidationContext *context,
>         case GL_ATOMIC_COUNTER_BUFFER_BINDING:
>             if (context->getClientVersion() < ES_3_1)
>             {
>-                context->handleError(
>-                    InvalidEnum()
>-                    << "Atomic Counter buffers are not supported in this version of GL");
>+                context->validationError(GL_INVALID_ENUM, kEnumRequiresGLES31);
>                 return false;
>             }
>             if (index >= caps.maxAtomicCounterBufferBindings)
>             {
>-                context->handleError(
>-                    InvalidValue()
>-                    << "index is outside the valid range for GL_ATOMIC_COUNTER_BUFFER_BINDING");
>+                context->validationError(GL_INVALID_VALUE,
>+                                         kIndexExceedsMaxAtomicCounterBufferBindings);
>                 return false;
>             }
>             break;
>@@ -2313,16 +2625,12 @@ bool ValidateIndexedStateQuery(ValidationContext *context,
>         case GL_SHADER_STORAGE_BUFFER_BINDING:
>             if (context->getClientVersion() < ES_3_1)
>             {
>-                context->handleError(
>-                    InvalidEnum()
>-                    << "Shader storage buffers are not supported in this version of GL");
>+                context->validationError(GL_INVALID_ENUM, kEnumRequiresGLES31);
>                 return false;
>             }
>             if (index >= caps.maxShaderStorageBufferBindings)
>             {
>-                context->handleError(
>-                    InvalidValue()
>-                    << "index is outside the valid range for GL_SHADER_STORAGE_BUFFER_BINDING");
>+                context->validationError(GL_INVALID_VALUE, kExceedsMaxShaderStorageBufferBindings);
>                 return false;
>             }
>             break;
>@@ -2333,33 +2641,46 @@ bool ValidateIndexedStateQuery(ValidationContext *context,
>         case GL_VERTEX_BINDING_STRIDE:
>             if (context->getClientVersion() < ES_3_1)
>             {
>-                context->handleError(
>-                    InvalidEnum()
>-                    << "Vertex Attrib Bindings are not supported in this version of GL");
>+                context->validationError(GL_INVALID_ENUM, kEnumRequiresGLES31);
>                 return false;
>             }
>             if (index >= caps.maxVertexAttribBindings)
>             {
>-                context->handleError(
>-                    InvalidValue()
>-                    << "bindingindex must be smaller than MAX_VERTEX_ATTRIB_BINDINGS.");
>+                context->validationError(GL_INVALID_VALUE, kExceedsMaxVertexAttribBindings);
>                 return false;
>             }
>             break;
>         case GL_SAMPLE_MASK_VALUE:
>             if (context->getClientVersion() < ES_3_1)
>             {
>-                ANGLE_VALIDATION_ERR(context, InvalidEnum(), EnumRequiresGLES31);
>+                context->validationError(GL_INVALID_ENUM, kEnumRequiresGLES31);
>                 return false;
>             }
>             if (index >= caps.maxSampleMaskWords)
>             {
>-                ANGLE_VALIDATION_ERR(context, InvalidValue(), InvalidSampleMaskNumber);
>+                context->validationError(GL_INVALID_VALUE, kInvalidSampleMaskNumber);
>+                return false;
>+            }
>+            break;
>+        case GL_IMAGE_BINDING_NAME:
>+        case GL_IMAGE_BINDING_LEVEL:
>+        case GL_IMAGE_BINDING_LAYERED:
>+        case GL_IMAGE_BINDING_LAYER:
>+        case GL_IMAGE_BINDING_ACCESS:
>+        case GL_IMAGE_BINDING_FORMAT:
>+            if (context->getClientVersion() < ES_3_1)
>+            {
>+                context->validationError(GL_INVALID_ENUM, kEnumRequiresGLES31);
>+                return false;
>+            }
>+            if (index >= caps.maxImageUnits)
>+            {
>+                context->validationError(GL_INVALID_VALUE, kExceedsMaxImageUnits);
>                 return false;
>             }
>             break;
>         default:
>-            context->handleError(InvalidEnum());
>+            context->validationError(GL_INVALID_ENUM, kEnumNotSupported);
>             return false;
>     }
> 
>@@ -2371,17 +2692,17 @@ bool ValidateIndexedStateQuery(ValidationContext *context,
>     return true;
> }
> 
>-bool ValidateGetIntegeri_v(ValidationContext *context, GLenum target, GLuint index, GLint *data)
>+bool ValidateGetIntegeri_v(Context *context, GLenum target, GLuint index, GLint *data)
> {
>     if (context->getClientVersion() < ES_3_0)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidOperation(), ES3Required);
>+        context->validationError(GL_INVALID_OPERATION, kES3Required);
>         return false;
>     }
>     return ValidateIndexedStateQuery(context, target, index, nullptr);
> }
> 
>-bool ValidateGetIntegeri_vRobustANGLE(ValidationContext *context,
>+bool ValidateGetIntegeri_vRobustANGLE(Context *context,
>                                       GLenum target,
>                                       GLuint index,
>                                       GLsizei bufSize,
>@@ -2390,7 +2711,7 @@ bool ValidateGetIntegeri_vRobustANGLE(ValidationContext *context,
> {
>     if (context->getClientVersion() < ES_3_0)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidOperation(), ES3Required);
>+        context->validationError(GL_INVALID_OPERATION, kES3Required);
>         return false;
>     }
> 
>@@ -2399,30 +2720,34 @@ bool ValidateGetIntegeri_vRobustANGLE(ValidationContext *context,
>         return false;
>     }
> 
>-    if (!ValidateIndexedStateQuery(context, target, index, length))
>+    GLsizei numParams = 0;
>+
>+    if (!ValidateIndexedStateQuery(context, target, index, &numParams))
>     {
>         return false;
>     }
> 
>-    if (!ValidateRobustBufferSize(context, bufSize, *length))
>+    if (!ValidateRobustBufferSize(context, bufSize, numParams))
>     {
>         return false;
>     }
> 
>+    SetRobustLengthParam(length, numParams);
>+
>     return true;
> }
> 
>-bool ValidateGetInteger64i_v(ValidationContext *context, GLenum target, GLuint index, GLint64 *data)
>+bool ValidateGetInteger64i_v(Context *context, GLenum target, GLuint index, GLint64 *data)
> {
>     if (context->getClientVersion() < ES_3_0)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidOperation(), ES3Required);
>+        context->validationError(GL_INVALID_OPERATION, kES3Required);
>         return false;
>     }
>     return ValidateIndexedStateQuery(context, target, index, nullptr);
> }
> 
>-bool ValidateGetInteger64i_vRobustANGLE(ValidationContext *context,
>+bool ValidateGetInteger64i_vRobustANGLE(Context *context,
>                                         GLenum target,
>                                         GLuint index,
>                                         GLsizei bufSize,
>@@ -2431,7 +2756,7 @@ bool ValidateGetInteger64i_vRobustANGLE(ValidationContext *context,
> {
>     if (context->getClientVersion() < ES_3_0)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidOperation(), ES3Required);
>+        context->validationError(GL_INVALID_OPERATION, kES3Required);
>         return false;
>     }
> 
>@@ -2440,20 +2765,24 @@ bool ValidateGetInteger64i_vRobustANGLE(ValidationContext *context,
>         return false;
>     }
> 
>-    if (!ValidateIndexedStateQuery(context, target, index, length))
>+    GLsizei numParams = 0;
>+
>+    if (!ValidateIndexedStateQuery(context, target, index, &numParams))
>     {
>         return false;
>     }
> 
>-    if (!ValidateRobustBufferSize(context, bufSize, *length))
>+    if (!ValidateRobustBufferSize(context, bufSize, numParams))
>     {
>         return false;
>     }
> 
>+    SetRobustLengthParam(length, numParams);
>+
>     return true;
> }
> 
>-bool ValidateCopyBufferSubData(ValidationContext *context,
>+bool ValidateCopyBufferSubData(Context *context,
>                                BufferBinding readTarget,
>                                BufferBinding writeTarget,
>                                GLintptr readOffset,
>@@ -2462,30 +2791,37 @@ bool ValidateCopyBufferSubData(ValidationContext *context,
> {
>     if (context->getClientMajorVersion() < 3)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidOperation(), ES3Required);
>+        context->validationError(GL_INVALID_OPERATION, kES3Required);
>         return false;
>     }
> 
>-    if (!ValidBufferType(context, readTarget) || !ValidBufferType(context, writeTarget))
>+    if (!context->isValidBufferBinding(readTarget) || !context->isValidBufferBinding(writeTarget))
>     {
>-        context->handleError(InvalidEnum() << "Invalid buffer target");
>+        context->validationError(GL_INVALID_ENUM, kInvalidBufferTypes);
>         return false;
>     }
> 
>-    Buffer *readBuffer  = context->getGLState().getTargetBuffer(readTarget);
>-    Buffer *writeBuffer = context->getGLState().getTargetBuffer(writeTarget);
>+    Buffer *readBuffer  = context->getState().getTargetBuffer(readTarget);
>+    Buffer *writeBuffer = context->getState().getTargetBuffer(writeTarget);
> 
>     if (!readBuffer || !writeBuffer)
>     {
>-        context->handleError(InvalidOperation() << "No buffer bound to target");
>+        context->validationError(GL_INVALID_OPERATION, kBufferNotBound);
>         return false;
>     }
> 
>     // Verify that readBuffer and writeBuffer are not currently mapped
>     if (readBuffer->isMapped() || writeBuffer->isMapped())
>     {
>-        context->handleError(InvalidOperation()
>-                             << "Cannot call CopyBufferSubData on a mapped buffer");
>+        context->validationError(GL_INVALID_OPERATION, kBufferMapped);
>+        return false;
>+    }
>+
>+    if (context->getExtensions().webglCompatibility &&
>+        (readBuffer->isBoundForTransformFeedbackAndOtherUse() ||
>+         writeBuffer->isBoundForTransformFeedbackAndOtherUse()))
>+    {
>+        context->validationError(GL_INVALID_OPERATION, kBufferBoundForTransformFeedback);
>         return false;
>     }
> 
>@@ -2500,21 +2836,26 @@ bool ValidateCopyBufferSubData(ValidationContext *context,
>         !IsValueInRangeForNumericType<GLintptr>(readBuffer->getSize()) ||
>         !IsValueInRangeForNumericType<GLintptr>(writeBuffer->getSize()))
>     {
>-        context->handleError(InvalidValue() << "Integer overflow when validating copy offsets.");
>+        context->validationError(GL_INVALID_VALUE, kIntegerOverflow);
>         return false;
>     }
> 
>-    if (readOffset < 0 || writeOffset < 0 || size < 0)
>+    if (readOffset < 0 || writeOffset < 0)
>     {
>-        context->handleError(InvalidValue()
>-                             << "readOffset, writeOffset and size must all be non-negative");
>+        context->validationError(GL_INVALID_VALUE, kNegativeOffset);
>+        return false;
>+    }
>+
>+    if (size < 0)
>+    {
>+        context->validationError(GL_INVALID_VALUE, kNegativeSize);
>         return false;
>     }
> 
>     if (checkedReadSum.ValueOrDie() > readBuffer->getSize() ||
>         checkedWriteSum.ValueOrDie() > writeBuffer->getSize())
>     {
>-        context->handleError(InvalidValue() << "Buffer offset overflow in CopyBufferSubData");
>+        context->validationError(GL_INVALID_VALUE, kBufferOffsetOverflow);
>         return false;
>     }
> 
>@@ -2525,14 +2866,13 @@ bool ValidateCopyBufferSubData(ValidationContext *context,
>         {
>             // This shold not be possible.
>             UNREACHABLE();
>-            context->handleError(InvalidValue()
>-                                 << "Integer overflow when validating same buffer copy.");
>+            context->validationError(GL_INVALID_VALUE, kIntegerOverflow);
>             return false;
>         }
> 
>         if (checkedOffsetDiff.ValueOrDie() < size)
>         {
>-            context->handleError(InvalidValue());
>+            context->validationError(GL_INVALID_VALUE, kCopyAlias);
>             return false;
>         }
>     }
>@@ -2544,7 +2884,7 @@ bool ValidateGetStringi(Context *context, GLenum name, GLuint index)
> {
>     if (context->getClientMajorVersion() < 3)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidOperation(), ES3Required);
>+        context->validationError(GL_INVALID_OPERATION, kES3Required);
>         return false;
>     }
> 
>@@ -2553,8 +2893,7 @@ bool ValidateGetStringi(Context *context, GLenum name, GLuint index)
>         case GL_EXTENSIONS:
>             if (index >= context->getExtensionStringCount())
>             {
>-                context->handleError(InvalidValue()
>-                                     << "index must be less than the number of extension strings.");
>+                context->validationError(GL_INVALID_VALUE, kExceedsNumExtensions);
>                 return false;
>             }
>             break;
>@@ -2562,27 +2901,25 @@ bool ValidateGetStringi(Context *context, GLenum name, GLuint index)
>         case GL_REQUESTABLE_EXTENSIONS_ANGLE:
>             if (!context->getExtensions().requestExtension)
>             {
>-                ANGLE_VALIDATION_ERR(context, InvalidEnum(), InvalidName);
>+                context->validationError(GL_INVALID_ENUM, kInvalidName);
>                 return false;
>             }
>             if (index >= context->getRequestableExtensionStringCount())
>             {
>-                context->handleError(
>-                    InvalidValue()
>-                    << "index must be less than the number of requestable extension strings.");
>+                context->validationError(GL_INVALID_VALUE, kExceedsNumRequestableExtensions);
>                 return false;
>             }
>             break;
> 
>         default:
>-            ANGLE_VALIDATION_ERR(context, InvalidEnum(), InvalidName);
>+            context->validationError(GL_INVALID_ENUM, kInvalidName);
>             return false;
>     }
> 
>     return true;
> }
> 
>-bool ValidateRenderbufferStorageMultisample(ValidationContext *context,
>+bool ValidateRenderbufferStorageMultisample(Context *context,
>                                             GLenum target,
>                                             GLsizei samples,
>                                             GLenum internalformat,
>@@ -2591,7 +2928,7 @@ bool ValidateRenderbufferStorageMultisample(ValidationContext *context,
> {
>     if (context->getClientMajorVersion() < 3)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidOperation(), ES3Required);
>+        context->validationError(GL_INVALID_OPERATION, kES3Required);
>         return false;
>     }
> 
>@@ -2602,49 +2939,51 @@ bool ValidateRenderbufferStorageMultisample(ValidationContext *context,
>     }
> 
>     // The ES3 spec(section 4.4.2) states that the internal format must be sized and not an integer
>-    // format if samples is greater than zero.
>+    // format if samples is greater than zero. In ES3.1(section 9.2.5), it can support integer
>+    // multisample renderbuffer, but the samples should not be greater than MAX_INTEGER_SAMPLES.
>     const gl::InternalFormat &formatInfo = gl::GetSizedInternalFormatInfo(internalformat);
>-    if ((formatInfo.componentType == GL_UNSIGNED_INT || formatInfo.componentType == GL_INT) &&
>-        samples > 0)
>+    if ((formatInfo.componentType == GL_UNSIGNED_INT || formatInfo.componentType == GL_INT))
>     {
>-        context->handleError(InvalidOperation());
>-        return false;
>+        if ((samples > 0 && context->getClientVersion() == ES_3_0) ||
>+            static_cast<GLuint>(samples) > context->getCaps().maxIntegerSamples)
>+        {
>+            context->validationError(GL_INVALID_OPERATION, kSamplesOutOfRange);
>+            return false;
>+        }
>     }
> 
>     // The behavior is different than the ANGLE version, which would generate a GL_OUT_OF_MEMORY.
>     const TextureCaps &formatCaps = context->getTextureCaps().get(internalformat);
>     if (static_cast<GLuint>(samples) > formatCaps.getMaxSamples())
>     {
>-        context->handleError(
>-            InvalidOperation()
>-            << "Samples must not be greater than maximum supported value for the format.");
>+        context->validationError(GL_INVALID_OPERATION, kSamplesOutOfRange);
>         return false;
>     }
> 
>     return true;
> }
> 
>-bool ValidateVertexAttribIPointer(ValidationContext *context,
>+bool ValidateVertexAttribIPointer(Context *context,
>                                   GLuint index,
>                                   GLint size,
>-                                  GLenum type,
>+                                  VertexAttribType type,
>                                   GLsizei stride,
>                                   const void *pointer)
> {
>     if (context->getClientMajorVersion() < 3)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidOperation(), ES3Required);
>+        context->validationError(GL_INVALID_OPERATION, kES3Required);
>         return false;
>     }
> 
>-    if (!ValidateVertexFormatBase(context, index, size, type, true))
>+    if (!ValidateIntegerVertexFormat(context, index, size, type))
>     {
>         return false;
>     }
> 
>     if (stride < 0)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidValue(), NegativeStride);
>+        context->validationError(GL_INVALID_VALUE, kNegativeStride);
>         return false;
>     }
> 
>@@ -2653,8 +2992,7 @@ bool ValidateVertexAttribIPointer(ValidationContext *context,
>     {
>         if (stride > caps.maxVertexAttribStride)
>         {
>-            context->handleError(InvalidValue()
>-                                 << "stride cannot be greater than MAX_VERTEX_ATTRIB_STRIDE.");
>+            context->validationError(GL_INVALID_VALUE, kExceedsMaxVertexAttribStride);
>             return false;
>         }
> 
>@@ -2663,8 +3001,7 @@ bool ValidateVertexAttribIPointer(ValidationContext *context,
>         // validation should be inherited.
>         if (index >= caps.maxVertexAttribBindings)
>         {
>-            context->handleError(InvalidValue()
>-                                 << "index must be smaller than MAX_VERTEX_ATTRIB_BINDINGS.");
>+            context->validationError(GL_INVALID_VALUE, kExceedsMaxVertexAttribBindings);
>             return false;
>         }
>     }
>@@ -2673,12 +3010,10 @@ bool ValidateVertexAttribIPointer(ValidationContext *context,
>     // An INVALID_OPERATION error is generated when a non-zero vertex array object
>     // is bound, zero is bound to the ARRAY_BUFFER buffer object binding point,
>     // and the pointer argument is not NULL.
>-    if (context->getGLState().getVertexArrayId() != 0 &&
>-        context->getGLState().getTargetBuffer(BufferBinding::Array) == 0 && pointer != nullptr)
>+    if (context->getState().getVertexArrayId() != 0 &&
>+        context->getState().getTargetBuffer(BufferBinding::Array) == 0 && pointer != nullptr)
>     {
>-        context
>-            ->handleError(InvalidOperation()
>-                          << "Client data cannot be used with a non-default vertex array object.");
>+        context->validationError(GL_INVALID_OPERATION, kClientDataInVertexArray);
>         return false;
>     }
> 
>@@ -2702,20 +3037,36 @@ bool ValidateGetSynciv(Context *context,
> {
>     if (context->getClientMajorVersion() < 3)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidOperation(), ES3Required);
>+        context->validationError(GL_INVALID_OPERATION, kES3Required);
>         return false;
>     }
> 
>     if (bufSize < 0)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidValue(), NegativeBufferSize);
>+        context->validationError(GL_INVALID_VALUE, kNegativeBufferSize);
>         return false;
>     }
> 
>+    if (context->isContextLost())
>+    {
>+        context->validationError(GL_CONTEXT_LOST, kContextLost);
>+
>+        if (pname == GL_SYNC_STATUS)
>+        {
>+            // Generate an error but still return true, the context still needs to return a
>+            // value in this case.
>+            return true;
>+        }
>+        else
>+        {
>+            return false;
>+        }
>+    }
>+
>     Sync *syncObject = context->getSync(sync);
>     if (!syncObject)
>     {
>-        context->handleError(InvalidValue() << "Invalid sync object.");
>+        context->validationError(GL_INVALID_VALUE, kSyncMissing);
>         return false;
>     }
> 
>@@ -2728,91 +3079,107 @@ bool ValidateGetSynciv(Context *context,
>             break;
> 
>         default:
>-            ANGLE_VALIDATION_ERR(context, InvalidEnum(), InvalidPname);
>+            context->validationError(GL_INVALID_ENUM, kInvalidPname);
>             return false;
>     }
> 
>     return true;
> }
> 
>-bool ValidateDrawElementsInstanced(ValidationContext *context,
>-                                   GLenum mode,
>+bool ValidateDrawElementsInstanced(Context *context,
>+                                   PrimitiveMode mode,
>                                    GLsizei count,
>-                                   GLenum type,
>+                                   DrawElementsType type,
>                                    const void *indices,
>                                    GLsizei instanceCount)
> {
>     if (context->getClientMajorVersion() < 3)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidOperation(), ES3Required);
>+        context->validationError(GL_INVALID_OPERATION, kES3Required);
>         return false;
>     }
> 
>-    return ValidateDrawElementsInstancedCommon(context, mode, count, type, indices, instanceCount);
>+    return ValidateDrawElementsInstancedBase(context, mode, count, type, indices, instanceCount);
> }
> 
>-bool ValidateFramebufferTextureMultiviewLayeredANGLE(Context *context,
>-                                                     GLenum target,
>-                                                     GLenum attachment,
>-                                                     GLuint texture,
>-                                                     GLint level,
>-                                                     GLint baseViewIndex,
>-                                                     GLsizei numViews)
>+bool ValidateMultiDrawArraysInstancedANGLE(Context *context,
>+                                           PrimitiveMode mode,
>+                                           const GLint *firsts,
>+                                           const GLsizei *counts,
>+                                           const GLsizei *instanceCounts,
>+                                           GLsizei drawcount)
> {
>-
>-    if (!ValidateFramebufferTextureMultiviewBaseANGLE(context, target, attachment, texture, level,
>-                                                      numViews))
>+    if (!context->getExtensions().multiDraw)
>     {
>+        context->validationError(GL_INVALID_OPERATION, kExtensionNotEnabled);
>         return false;
>     }
>-
>-    if (texture != 0)
>+    if (context->getClientMajorVersion() < 3)
>     {
>-        if (baseViewIndex < 0)
>+        if (!context->getExtensions().instancedArraysAny())
>         {
>-            context->handleError(InvalidValue() << "baseViewIndex cannot be less than 0.");
>+            context->validationError(GL_INVALID_OPERATION, kExtensionNotEnabled);
>             return false;
>         }
>-
>-        Texture *tex = context->getTexture(texture);
>-        ASSERT(tex);
>-
>-        switch (tex->getTarget())
>+        if (!ValidateDrawInstancedANGLE(context))
>         {
>-            case GL_TEXTURE_2D_ARRAY:
>-            {
>-                const Caps &caps = context->getCaps();
>-                if (static_cast<GLuint>(baseViewIndex + numViews) > caps.maxArrayTextureLayers)
>-                {
>-                    context->handleError(InvalidValue() << "baseViewIndex+numViews cannot be "
>-                                                           "greater than "
>-                                                           "GL_MAX_ARRAY_TEXTURE_LAYERS.");
>-                    return false;
>-                }
>-            }
>-            break;
>-            default:
>-                context->handleError(InvalidOperation()
>-                                     << "Texture's target must be GL_TEXTURE_2D_ARRAY.");
>-                return false;
>+            return false;
>         }
>-
>-        if (!ValidateFramebufferTextureMultiviewLevelAndFormat(context, tex, level))
>+    }
>+    for (GLsizei drawID = 0; drawID < drawcount; ++drawID)
>+    {
>+        if (!ValidateDrawArraysInstancedBase(context, mode, firsts[drawID], counts[drawID],
>+                                             instanceCounts[drawID]))
>         {
>             return false;
>         }
>     }
>+    return true;
>+}
> 
>+bool ValidateMultiDrawElementsInstancedANGLE(Context *context,
>+                                             PrimitiveMode mode,
>+                                             const GLsizei *counts,
>+                                             DrawElementsType type,
>+                                             const GLvoid *const *indices,
>+                                             const GLsizei *instanceCounts,
>+                                             GLsizei drawcount)
>+{
>+    if (!context->getExtensions().multiDraw)
>+    {
>+        context->validationError(GL_INVALID_OPERATION, kExtensionNotEnabled);
>+        return false;
>+    }
>+    if (context->getClientMajorVersion() < 3)
>+    {
>+        if (!context->getExtensions().instancedArraysAny())
>+        {
>+            context->validationError(GL_INVALID_OPERATION, kExtensionNotEnabled);
>+            return false;
>+        }
>+        if (!ValidateDrawInstancedANGLE(context))
>+        {
>+            return false;
>+        }
>+    }
>+    for (GLsizei drawID = 0; drawID < drawcount; ++drawID)
>+    {
>+        if (!ValidateDrawElementsInstancedBase(context, mode, counts[drawID], type, indices[drawID],
>+                                               instanceCounts[drawID]))
>+        {
>+            return false;
>+        }
>+    }
>     return true;
> }
> 
>-bool ValidateFramebufferTextureMultiviewSideBySideANGLE(Context *context,
>-                                                        GLenum target,
>-                                                        GLenum attachment,
>-                                                        GLuint texture,
>-                                                        GLint level,
>-                                                        GLsizei numViews,
>-                                                        const GLint *viewportOffsets)
>+bool ValidateFramebufferTextureMultiviewOVR(Context *context,
>+                                            GLenum target,
>+                                            GLenum attachment,
>+                                            GLuint texture,
>+                                            GLint level,
>+                                            GLint baseViewIndex,
>+                                            GLsizei numViews)
> {
>     if (!ValidateFramebufferTextureMultiviewBaseANGLE(context, target, attachment, texture, level,
>                                                       numViews))
>@@ -2822,27 +3189,40 @@ bool ValidateFramebufferTextureMultiviewSideBySideANGLE(Context *context,
> 
>     if (texture != 0)
>     {
>-        const GLsizei numViewportOffsetValues = numViews * 2;
>-        for (GLsizei i = 0; i < numViewportOffsetValues; ++i)
>+        if (baseViewIndex < 0)
>         {
>-            if (viewportOffsets[i] < 0)
>-            {
>-                context->handleError(InvalidValue()
>-                                     << "viewportOffsets cannot contain negative values.");
>-                return false;
>-            }
>+            context->validationError(GL_INVALID_VALUE, kNegativeBaseViewIndex);
>+            return false;
>         }
> 
>         Texture *tex = context->getTexture(texture);
>         ASSERT(tex);
> 
>-        switch (tex->getTarget())
>+        switch (tex->getType())
>         {
>-            case GL_TEXTURE_2D:
>+            case TextureType::_2DArray:
>+            case TextureType::_2DMultisampleArray:
>+            {
>+                if (tex->getType() == TextureType::_2DMultisampleArray)
>+                {
>+                    if (!context->getExtensions().multiviewMultisample)
>+                    {
>+                        context->validationError(GL_INVALID_OPERATION, kInvalidTextureType);
>+                        return false;
>+                    }
>+                }
>+
>+                const Caps &caps = context->getCaps();
>+                if (static_cast<GLuint>(baseViewIndex + numViews) > caps.maxArrayTextureLayers)
>+                {
>+                    context->validationError(GL_INVALID_VALUE, kViewsExceedMaxArrayLayers);
>+                    return false;
>+                }
>+
>                 break;
>+            }
>             default:
>-                context->handleError(InvalidOperation()
>-                                     << "Texture's target must be GL_TEXTURE_2D.");
>+                context->validationError(GL_INVALID_OPERATION, kInvalidTextureType);
>                 return false;
>         }
> 
>@@ -2904,7 +3284,7 @@ bool ValidateIsQuery(Context *context, GLuint id)
> {
>     if (context->getClientMajorVersion() < 3)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidOperation(), ES3Required);
>+        context->validationError(GL_INVALID_OPERATION, kES3Required);
>         return false;
>     }
> 
>@@ -2969,16 +3349,16 @@ bool ValidateEndTransformFeedback(Context *context)
> {
>     if (context->getClientMajorVersion() < 3)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidOperation(), ES3Required);
>+        context->validationError(GL_INVALID_OPERATION, kES3Required);
>         return false;
>     }
> 
>-    TransformFeedback *transformFeedback = context->getGLState().getCurrentTransformFeedback();
>+    TransformFeedback *transformFeedback = context->getState().getCurrentTransformFeedback();
>     ASSERT(transformFeedback != nullptr);
> 
>     if (!transformFeedback->isActive())
>     {
>-        context->handleError(InvalidOperation());
>+        context->validationError(GL_INVALID_OPERATION, kTransformFeedbackNotActive);
>         return false;
>     }
> 
>@@ -2993,13 +3373,13 @@ bool ValidateTransformFeedbackVaryings(Context *context,
> {
>     if (context->getClientMajorVersion() < 3)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidOperation(), ES3Required);
>+        context->validationError(GL_INVALID_OPERATION, kES3Required);
>         return false;
>     }
> 
>     if (count < 0)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidValue(), NegativeCount);
>+        context->validationError(GL_INVALID_VALUE, kNegativeCount);
>         return false;
>     }
> 
>@@ -3012,13 +3392,13 @@ bool ValidateTransformFeedbackVaryings(Context *context,
>             const Caps &caps = context->getCaps();
>             if (static_cast<GLuint>(count) > caps.maxTransformFeedbackSeparateAttributes)
>             {
>-                context->handleError(InvalidValue());
>+                context->validationError(GL_INVALID_VALUE, kInvalidTransformFeedbackAttribsCount);
>                 return false;
>             }
>             break;
>         }
>         default:
>-            context->handleError(InvalidEnum());
>+            context->validationError(GL_INVALID_ENUM, kEnumNotSupported);
>             return false;
>     }
> 
>@@ -3042,13 +3422,13 @@ bool ValidateGetTransformFeedbackVarying(Context *context,
> {
>     if (context->getClientMajorVersion() < 3)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidOperation(), ES3Required);
>+        context->validationError(GL_INVALID_OPERATION, kES3Required);
>         return false;
>     }
> 
>     if (bufSize < 0)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidValue(), NegativeBufferSize);
>+        context->validationError(GL_INVALID_VALUE, kNegativeBufferSize);
>         return false;
>     }
> 
>@@ -3060,7 +3440,7 @@ bool ValidateGetTransformFeedbackVarying(Context *context,
> 
>     if (index >= static_cast<GLuint>(programObject->getTransformFeedbackVaryingCount()))
>     {
>-        context->handleError(InvalidValue());
>+        context->validationError(GL_INVALID_VALUE, kTransformFeedbackVaryingIndexOutOfRange);
>         return false;
>     }
> 
>@@ -3071,7 +3451,7 @@ bool ValidateBindTransformFeedback(Context *context, GLenum target, GLuint id)
> {
>     if (context->getClientMajorVersion() < 3)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidOperation(), ES3Required);
>+        context->validationError(GL_INVALID_OPERATION, kES3Required);
>         return false;
>     }
> 
>@@ -3082,11 +3462,11 @@ bool ValidateBindTransformFeedback(Context *context, GLenum target, GLuint id)
>             // Cannot bind a transform feedback object if the current one is started and not
>             // paused (3.0.2 pg 85 section 2.14.1)
>             TransformFeedback *curTransformFeedback =
>-                context->getGLState().getCurrentTransformFeedback();
>+                context->getState().getCurrentTransformFeedback();
>             if (curTransformFeedback && curTransformFeedback->isActive() &&
>                 !curTransformFeedback->isPaused())
>             {
>-                context->handleError(InvalidOperation());
>+                context->validationError(GL_INVALID_OPERATION, kTransformFeedbackNotPaused);
>                 return false;
>             }
> 
>@@ -3094,14 +3474,14 @@ bool ValidateBindTransformFeedback(Context *context, GLenum target, GLuint id)
>             // 2.14.1)
>             if (!context->isTransformFeedbackGenerated(id))
>             {
>-                ANGLE_VALIDATION_ERR(context, InvalidOperation(), TransformFeedbackDoesNotExist);
>+                context->validationError(GL_INVALID_OPERATION, kTransformFeedbackDoesNotExist);
>                 return false;
>             }
>         }
>         break;
> 
>         default:
>-            context->handleError(InvalidEnum());
>+            context->validationError(GL_INVALID_ENUM, kEnumNotSupported);
>             return false;
>     }
> 
>@@ -3112,7 +3492,7 @@ bool ValidateIsTransformFeedback(Context *context, GLuint id)
> {
>     if (context->getClientMajorVersion() < 3)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidOperation(), ES3Required);
>+        context->validationError(GL_INVALID_OPERATION, kES3Required);
>         return false;
>     }
> 
>@@ -3123,17 +3503,23 @@ bool ValidatePauseTransformFeedback(Context *context)
> {
>     if (context->getClientMajorVersion() < 3)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidOperation(), ES3Required);
>+        context->validationError(GL_INVALID_OPERATION, kES3Required);
>         return false;
>     }
> 
>-    TransformFeedback *transformFeedback = context->getGLState().getCurrentTransformFeedback();
>+    TransformFeedback *transformFeedback = context->getState().getCurrentTransformFeedback();
>     ASSERT(transformFeedback != nullptr);
> 
>     // Current transform feedback must be active and not paused in order to pause (3.0.2 pg 86)
>-    if (!transformFeedback->isActive() || transformFeedback->isPaused())
>+    if (!transformFeedback->isActive())
>     {
>-        context->handleError(InvalidOperation());
>+        context->validationError(GL_INVALID_OPERATION, kTransformFeedbackNotActive);
>+        return false;
>+    }
>+
>+    if (transformFeedback->isPaused())
>+    {
>+        context->validationError(GL_INVALID_OPERATION, kTransformFeedbackPaused);
>         return false;
>     }
> 
>@@ -3144,17 +3530,23 @@ bool ValidateResumeTransformFeedback(Context *context)
> {
>     if (context->getClientMajorVersion() < 3)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidOperation(), ES3Required);
>+        context->validationError(GL_INVALID_OPERATION, kES3Required);
>         return false;
>     }
> 
>-    TransformFeedback *transformFeedback = context->getGLState().getCurrentTransformFeedback();
>+    TransformFeedback *transformFeedback = context->getState().getCurrentTransformFeedback();
>     ASSERT(transformFeedback != nullptr);
> 
>     // Current transform feedback must be active and paused in order to resume (3.0.2 pg 86)
>-    if (!transformFeedback->isActive() || !transformFeedback->isPaused())
>+    if (!transformFeedback->isActive())
>+    {
>+        context->validationError(GL_INVALID_OPERATION, kTransformFeedbackNotActive);
>+        return false;
>+    }
>+
>+    if (!transformFeedback->isPaused())
>     {
>-        context->handleError(InvalidOperation());
>+        context->validationError(GL_INVALID_OPERATION, kTransformFeedbackNotPaused);
>         return false;
>     }
> 
>@@ -3165,7 +3557,7 @@ bool ValidateVertexAttribI4i(Context *context, GLuint index, GLint x, GLint y, G
> {
>     if (context->getClientMajorVersion() < 3)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidOperation(), ES3Required);
>+        context->validationError(GL_INVALID_OPERATION, kES3Required);
>         return false;
>     }
> 
>@@ -3181,7 +3573,7 @@ bool ValidateVertexAttribI4ui(Context *context,
> {
>     if (context->getClientMajorVersion() < 3)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidOperation(), ES3Required);
>+        context->validationError(GL_INVALID_OPERATION, kES3Required);
>         return false;
>     }
> 
>@@ -3192,7 +3584,7 @@ bool ValidateVertexAttribI4iv(Context *context, GLuint index, const GLint *v)
> {
>     if (context->getClientMajorVersion() < 3)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidOperation(), ES3Required);
>+        context->validationError(GL_INVALID_OPERATION, kES3Required);
>         return false;
>     }
> 
>@@ -3203,7 +3595,7 @@ bool ValidateVertexAttribI4uiv(Context *context, GLuint index, const GLuint *v)
> {
>     if (context->getClientMajorVersion() < 3)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidOperation(), ES3Required);
>+        context->validationError(GL_INVALID_OPERATION, kES3Required);
>         return false;
>     }
> 
>@@ -3214,7 +3606,7 @@ bool ValidateGetFragDataLocation(Context *context, GLuint program, const GLchar
> {
>     if (context->getClientMajorVersion() < 3)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidOperation(), ES3Required);
>+        context->validationError(GL_INVALID_OPERATION, kES3Required);
>         return false;
>     }
> 
>@@ -3226,7 +3618,7 @@ bool ValidateGetFragDataLocation(Context *context, GLuint program, const GLchar
> 
>     if (!programObject->isLinked())
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidOperation(), ProgramNotLinked);
>+        context->validationError(GL_INVALID_OPERATION, kProgramNotLinked);
>         return false;
>     }
> 
>@@ -3241,13 +3633,13 @@ bool ValidateGetUniformIndices(Context *context,
> {
>     if (context->getClientMajorVersion() < 3)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidOperation(), ES3Required);
>+        context->validationError(GL_INVALID_OPERATION, kES3Required);
>         return false;
>     }
> 
>     if (uniformCount < 0)
>     {
>-        context->handleError(InvalidValue());
>+        context->validationError(GL_INVALID_VALUE, kNegativeCount);
>         return false;
>     }
> 
>@@ -3269,13 +3661,13 @@ bool ValidateGetActiveUniformsiv(Context *context,
> {
>     if (context->getClientMajorVersion() < 3)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidOperation(), ES3Required);
>+        context->validationError(GL_INVALID_OPERATION, kES3Required);
>         return false;
>     }
> 
>     if (uniformCount < 0)
>     {
>-        context->handleError(InvalidValue());
>+        context->validationError(GL_INVALID_VALUE, kNegativeCount);
>         return false;
>     }
> 
>@@ -3289,7 +3681,14 @@ bool ValidateGetActiveUniformsiv(Context *context,
>     {
>         case GL_UNIFORM_TYPE:
>         case GL_UNIFORM_SIZE:
>+            break;
>         case GL_UNIFORM_NAME_LENGTH:
>+            if (context->getExtensions().webglCompatibility)
>+            {
>+                context->validationError(GL_INVALID_ENUM, kEnumNotSupported);
>+                return false;
>+            }
>+            break;
>         case GL_UNIFORM_BLOCK_INDEX:
>         case GL_UNIFORM_OFFSET:
>         case GL_UNIFORM_ARRAY_STRIDE:
>@@ -3298,13 +3697,13 @@ bool ValidateGetActiveUniformsiv(Context *context,
>             break;
> 
>         default:
>-            context->handleError(InvalidEnum());
>+            context->validationError(GL_INVALID_ENUM, kEnumNotSupported);
>             return false;
>     }
> 
>     if (uniformCount > programObject->getActiveUniformCount())
>     {
>-        context->handleError(InvalidValue());
>+        context->validationError(GL_INVALID_VALUE, kIndexExceedsMaxActiveUniform);
>         return false;
>     }
> 
>@@ -3314,7 +3713,7 @@ bool ValidateGetActiveUniformsiv(Context *context,
> 
>         if (index >= static_cast<GLuint>(programObject->getActiveUniformCount()))
>         {
>-            context->handleError(InvalidValue());
>+            context->validationError(GL_INVALID_VALUE, kIndexExceedsMaxActiveUniform);
>             return false;
>         }
>     }
>@@ -3326,7 +3725,7 @@ bool ValidateGetUniformBlockIndex(Context *context, GLuint program, const GLchar
> {
>     if (context->getClientMajorVersion() < 3)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidOperation(), ES3Required);
>+        context->validationError(GL_INVALID_OPERATION, kES3Required);
>         return false;
>     }
> 
>@@ -3357,7 +3756,7 @@ bool ValidateGetActiveUniformBlockName(Context *context,
> {
>     if (context->getClientMajorVersion() < 3)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidOperation(), ES3Required);
>+        context->validationError(GL_INVALID_OPERATION, kES3Required);
>         return false;
>     }
> 
>@@ -3369,7 +3768,7 @@ bool ValidateGetActiveUniformBlockName(Context *context,
> 
>     if (uniformBlockIndex >= programObject->getActiveUniformBlockCount())
>     {
>-        context->handleError(InvalidValue());
>+        context->validationError(GL_INVALID_VALUE, kIndexExceedsMaxActiveUniformBlock);
>         return false;
>     }
> 
>@@ -3383,13 +3782,13 @@ bool ValidateUniformBlockBinding(Context *context,
> {
>     if (context->getClientMajorVersion() < 3)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidOperation(), ES3Required);
>+        context->validationError(GL_INVALID_OPERATION, kES3Required);
>         return false;
>     }
> 
>     if (uniformBlockBinding >= context->getCaps().maxUniformBufferBindings)
>     {
>-        context->handleError(InvalidValue());
>+        context->validationError(GL_INVALID_VALUE, kIndexExceedsMaxUniformBufferBindings);
>         return false;
>     }
> 
>@@ -3402,7 +3801,7 @@ bool ValidateUniformBlockBinding(Context *context,
>     // if never linked, there won't be any uniform blocks
>     if (uniformBlockIndex >= programObject->getActiveUniformBlockCount())
>     {
>-        context->handleError(InvalidValue());
>+        context->validationError(GL_INVALID_VALUE, kIndexExceedsMaxUniformBufferBindings);
>         return false;
>     }
> 
>@@ -3410,14 +3809,14 @@ bool ValidateUniformBlockBinding(Context *context,
> }
> 
> bool ValidateDrawArraysInstanced(Context *context,
>-                                 GLenum mode,
>+                                 PrimitiveMode mode,
>                                  GLint first,
>                                  GLsizei count,
>                                  GLsizei primcount)
> {
>     if (context->getClientMajorVersion() < 3)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidOperation(), ES3Required);
>+        context->validationError(GL_INVALID_OPERATION, kES3Required);
>         return false;
>     }
> 
>@@ -3428,19 +3827,19 @@ bool ValidateFenceSync(Context *context, GLenum condition, GLbitfield flags)
> {
>     if (context->getClientMajorVersion() < 3)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidOperation(), ES3Required);
>+        context->validationError(GL_INVALID_OPERATION, kES3Required);
>         return false;
>     }
> 
>     if (condition != GL_SYNC_GPU_COMMANDS_COMPLETE)
>     {
>-        context->handleError(InvalidEnum());
>+        context->validationError(GL_INVALID_ENUM, kInvalidFenceCondition);
>         return false;
>     }
> 
>     if (flags != 0)
>     {
>-        context->handleError(InvalidValue());
>+        context->validationError(GL_INVALID_VALUE, kInvalidFlags);
>         return false;
>     }
> 
>@@ -3451,7 +3850,7 @@ bool ValidateIsSync(Context *context, GLsync sync)
> {
>     if (context->getClientMajorVersion() < 3)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidOperation(), ES3Required);
>+        context->validationError(GL_INVALID_OPERATION, kES3Required);
>         return false;
>     }
> 
>@@ -3462,13 +3861,13 @@ bool ValidateDeleteSync(Context *context, GLsync sync)
> {
>     if (context->getClientMajorVersion() < 3)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidOperation(), ES3Required);
>+        context->validationError(GL_INVALID_OPERATION, kES3Required);
>         return false;
>     }
> 
>     if (sync != static_cast<GLsync>(0) && !context->getSync(sync))
>     {
>-        context->handleError(InvalidValue());
>+        context->validationError(GL_INVALID_VALUE, kSyncMissing);
>         return false;
>     }
> 
>@@ -3479,20 +3878,20 @@ bool ValidateClientWaitSync(Context *context, GLsync sync, GLbitfield flags, GLu
> {
>     if (context->getClientMajorVersion() < 3)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidOperation(), ES3Required);
>+        context->validationError(GL_INVALID_OPERATION, kES3Required);
>         return false;
>     }
> 
>     if ((flags & ~(GL_SYNC_FLUSH_COMMANDS_BIT)) != 0)
>     {
>-        context->handleError(InvalidValue());
>+        context->validationError(GL_INVALID_VALUE, kInvalidFlags);
>         return false;
>     }
> 
>     Sync *clientWaitSync = context->getSync(sync);
>     if (!clientWaitSync)
>     {
>-        context->handleError(InvalidValue());
>+        context->validationError(GL_INVALID_VALUE, kSyncMissing);
>         return false;
>     }
> 
>@@ -3503,26 +3902,26 @@ bool ValidateWaitSync(Context *context, GLsync sync, GLbitfield flags, GLuint64
> {
>     if (context->getClientMajorVersion() < 3)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidOperation(), ES3Required);
>+        context->validationError(GL_INVALID_OPERATION, kES3Required);
>         return false;
>     }
> 
>     if (flags != 0)
>     {
>-        context->handleError(InvalidValue());
>+        context->validationError(GL_INVALID_VALUE, kInvalidFlags);
>         return false;
>     }
> 
>     if (timeout != GL_TIMEOUT_IGNORED)
>     {
>-        context->handleError(InvalidValue());
>+        context->validationError(GL_INVALID_VALUE, kInvalidTimeout);
>         return false;
>     }
> 
>     Sync *waitSync = context->getSync(sync);
>     if (!waitSync)
>     {
>-        context->handleError(InvalidValue());
>+        context->validationError(GL_INVALID_VALUE, kSyncMissing);
>         return false;
>     }
> 
>@@ -3533,7 +3932,7 @@ bool ValidateGetInteger64v(Context *context, GLenum pname, GLint64 *params)
> {
>     if (context->getClientMajorVersion() < 3)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidOperation(), ES3Required);
>+        context->validationError(GL_INVALID_OPERATION, kES3Required);
>         return false;
>     }
> 
>@@ -3551,7 +3950,7 @@ bool ValidateIsSampler(Context *context, GLuint sampler)
> {
>     if (context->getClientMajorVersion() < 3)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidOperation(), ES3Required);
>+        context->validationError(GL_INVALID_OPERATION, kES3Required);
>         return false;
>     }
> 
>@@ -3562,19 +3961,19 @@ bool ValidateBindSampler(Context *context, GLuint unit, GLuint sampler)
> {
>     if (context->getClientMajorVersion() < 3)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidOperation(), ES3Required);
>+        context->validationError(GL_INVALID_OPERATION, kES3Required);
>         return false;
>     }
> 
>     if (sampler != 0 && !context->isSampler(sampler))
>     {
>-        context->handleError(InvalidOperation());
>+        context->validationError(GL_INVALID_OPERATION, kInvalidSampler);
>         return false;
>     }
> 
>     if (unit >= context->getCaps().maxCombinedTextureImageUnits)
>     {
>-        context->handleError(InvalidValue());
>+        context->validationError(GL_INVALID_VALUE, kInvalidCombinedImageUnit);
>         return false;
>     }
> 
>@@ -3585,7 +3984,7 @@ bool ValidateVertexAttribDivisor(Context *context, GLuint index, GLuint divisor)
> {
>     if (context->getClientMajorVersion() < 3)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidOperation(), ES3Required);
>+        context->validationError(GL_INVALID_OPERATION, kES3Required);
>         return false;
>     }
> 
>@@ -3593,7 +3992,7 @@ bool ValidateVertexAttribDivisor(Context *context, GLuint index, GLuint divisor)
> }
> 
> bool ValidateTexStorage2D(Context *context,
>-                          GLenum target,
>+                          TextureType target,
>                           GLsizei levels,
>                           GLenum internalformat,
>                           GLsizei width,
>@@ -3601,7 +4000,7 @@ bool ValidateTexStorage2D(Context *context,
> {
>     if (context->getClientMajorVersion() < 3)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidOperation(), ES3Required);
>+        context->validationError(GL_INVALID_OPERATION, kES3Required);
>         return false;
>     }
> 
>@@ -3615,7 +4014,7 @@ bool ValidateTexStorage2D(Context *context,
> }
> 
> bool ValidateTexStorage3D(Context *context,
>-                          GLenum target,
>+                          TextureType target,
>                           GLsizei levels,
>                           GLenum internalformat,
>                           GLsizei width,
>@@ -3624,7 +4023,7 @@ bool ValidateTexStorage3D(Context *context,
> {
>     if (context->getClientMajorVersion() < 3)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidOperation(), ES3Required);
>+        context->validationError(GL_INVALID_OPERATION, kES3Required);
>         return false;
>     }
> 
>@@ -3637,7 +4036,7 @@ bool ValidateTexStorage3D(Context *context,
>     return true;
> }
> 
>-bool ValidateGetBufferParameteri64v(ValidationContext *context,
>+bool ValidateGetBufferParameteri64v(Context *context,
>                                     BufferBinding target,
>                                     GLenum pname,
>                                     GLint64 *params)
>@@ -3655,9 +4054,35 @@ bool ValidateGetSamplerParameteriv(Context *context, GLuint sampler, GLenum pnam
>     return ValidateGetSamplerParameterBase(context, sampler, pname, nullptr);
> }
> 
>+bool ValidateGetSamplerParameterIivOES(Context *context,
>+                                       GLuint sampler,
>+                                       GLenum pname,
>+                                       GLint *params)
>+{
>+    if (context->getClientMajorVersion() < 3)
>+    {
>+        context->validationError(GL_INVALID_OPERATION, kES3Required);
>+        return false;
>+    }
>+    return ValidateGetSamplerParameterBase(context, sampler, pname, nullptr);
>+}
>+
>+bool ValidateGetSamplerParameterIuivOES(Context *context,
>+                                        GLuint sampler,
>+                                        GLenum pname,
>+                                        GLuint *params)
>+{
>+    if (context->getClientMajorVersion() < 3)
>+    {
>+        context->validationError(GL_INVALID_OPERATION, kES3Required);
>+        return false;
>+    }
>+    return ValidateGetSamplerParameterBase(context, sampler, pname, nullptr);
>+}
>+
> bool ValidateSamplerParameterf(Context *context, GLuint sampler, GLenum pname, GLfloat param)
> {
>-    return ValidateSamplerParameterBase(context, sampler, pname, -1, &param);
>+    return ValidateSamplerParameterBase(context, sampler, pname, -1, false, &param);
> }
> 
> bool ValidateSamplerParameterfv(Context *context,
>@@ -3665,17 +4090,43 @@ bool ValidateSamplerParameterfv(Context *context,
>                                 GLenum pname,
>                                 const GLfloat *params)
> {
>-    return ValidateSamplerParameterBase(context, sampler, pname, -1, params);
>+    return ValidateSamplerParameterBase(context, sampler, pname, -1, true, params);
> }
> 
> bool ValidateSamplerParameteri(Context *context, GLuint sampler, GLenum pname, GLint param)
> {
>-    return ValidateSamplerParameterBase(context, sampler, pname, -1, &param);
>+    return ValidateSamplerParameterBase(context, sampler, pname, -1, false, &param);
> }
> 
> bool ValidateSamplerParameteriv(Context *context, GLuint sampler, GLenum pname, const GLint *params)
> {
>-    return ValidateSamplerParameterBase(context, sampler, pname, -1, params);
>+    return ValidateSamplerParameterBase(context, sampler, pname, -1, true, params);
>+}
>+
>+bool ValidateSamplerParameterIivOES(Context *context,
>+                                    GLuint sampler,
>+                                    GLenum pname,
>+                                    const GLint *params)
>+{
>+    if (context->getClientMajorVersion() < 3)
>+    {
>+        context->validationError(GL_INVALID_OPERATION, kES3Required);
>+        return false;
>+    }
>+    return ValidateSamplerParameterBase(context, sampler, pname, -1, true, params);
>+}
>+
>+bool ValidateSamplerParameterIuivOES(Context *context,
>+                                     GLuint sampler,
>+                                     GLenum pname,
>+                                     const GLuint *params)
>+{
>+    if (context->getClientMajorVersion() < 3)
>+    {
>+        context->validationError(GL_INVALID_OPERATION, kES3Required);
>+        return false;
>+    }
>+    return ValidateSamplerParameterBase(context, sampler, pname, -1, true, params);
> }
> 
> bool ValidateGetVertexAttribIiv(Context *context, GLuint index, GLenum pname, GLint *params)
>@@ -3699,4 +4150,155 @@ bool ValidateGetInternalformativ(Context *context,
>                                            nullptr);
> }
> 
>+bool ValidateBindFragDataLocationIndexedEXT(Context *context,
>+                                            GLuint program,
>+                                            GLuint colorNumber,
>+                                            GLuint index,
>+                                            const char *name)
>+{
>+    if (!context->getExtensions().blendFuncExtended)
>+    {
>+        context->validationError(GL_INVALID_OPERATION, kExtensionNotEnabled);
>+        return false;
>+    }
>+    if (context->getClientMajorVersion() < 3)
>+    {
>+        context->validationError(GL_INVALID_OPERATION, kES3Required);
>+        return false;
>+    }
>+    if (index < 0 || index > 1)
>+    {
>+        // This error is not explicitly specified but the spec does say that "<index> may be zero or
>+        // one to specify that the color be used as either the first or second color input to the
>+        // blend equation, respectively"
>+        context->validationError(GL_INVALID_VALUE, kFragDataBindingIndexOutOfRange);
>+        return false;
>+    }
>+    if (index == 1)
>+    {
>+        if (colorNumber >= context->getExtensions().maxDualSourceDrawBuffers)
>+        {
>+            context->validationError(GL_INVALID_VALUE,
>+                                     kColorNumberGreaterThanMaxDualSourceDrawBuffers);
>+            return false;
>+        }
>+    }
>+    else
>+    {
>+        if (colorNumber >= context->getCaps().maxDrawBuffers)
>+        {
>+            context->validationError(GL_INVALID_VALUE, kColorNumberGreaterThanMaxDrawBuffers);
>+            return false;
>+        }
>+    }
>+    Program *programObject = GetValidProgram(context, program);
>+    if (!programObject)
>+    {
>+        return false;
>+    }
>+    return true;
>+}
>+
>+bool ValidateBindFragDataLocationEXT(Context *context,
>+                                     GLuint program,
>+                                     GLuint colorNumber,
>+                                     const char *name)
>+{
>+    return ValidateBindFragDataLocationIndexedEXT(context, program, colorNumber, 0u, name);
>+}
>+
>+bool ValidateGetFragDataIndexEXT(Context *context, GLuint program, const char *name)
>+{
>+    if (!context->getExtensions().blendFuncExtended)
>+    {
>+        context->validationError(GL_INVALID_OPERATION, kExtensionNotEnabled);
>+        return false;
>+    }
>+    if (context->getClientMajorVersion() < 3)
>+    {
>+        context->validationError(GL_INVALID_OPERATION, kES3Required);
>+        return false;
>+    }
>+    Program *programObject = GetValidProgram(context, program);
>+    if (!programObject)
>+    {
>+        return false;
>+    }
>+    if (!programObject->isLinked())
>+    {
>+        context->validationError(GL_INVALID_OPERATION, kProgramNotLinked);
>+        return false;
>+    }
>+    return true;
>+}
>+
>+bool ValidateTexStorage2DMultisampleANGLE(Context *context,
>+                                          TextureType target,
>+                                          GLsizei samples,
>+                                          GLenum internalFormat,
>+                                          GLsizei width,
>+                                          GLsizei height,
>+                                          GLboolean fixedSampleLocations)
>+{
>+    if (!context->getExtensions().textureMultisample)
>+    {
>+        context->validationError(GL_INVALID_OPERATION, kMultisampleTextureExtensionOrES31Required);
>+        return false;
>+    }
>+
>+    return ValidateTexStorage2DMultisampleBase(context, target, samples, internalFormat, width,
>+                                               height);
>+}
>+
>+bool ValidateGetTexLevelParameterfvANGLE(Context *context,
>+                                         TextureTarget target,
>+                                         GLint level,
>+                                         GLenum pname,
>+                                         GLfloat *params)
>+{
>+    if (!context->getExtensions().textureMultisample)
>+    {
>+        context->validationError(GL_INVALID_OPERATION, kMultisampleTextureExtensionOrES31Required);
>+        return false;
>+    }
>+
>+    return ValidateGetTexLevelParameterBase(context, target, level, pname, nullptr);
>+}
>+
>+bool ValidateGetTexLevelParameterivANGLE(Context *context,
>+                                         TextureTarget target,
>+                                         GLint level,
>+                                         GLenum pname,
>+                                         GLint *params)
>+{
>+    if (!context->getExtensions().textureMultisample)
>+    {
>+        context->validationError(GL_INVALID_OPERATION, kMultisampleTextureExtensionOrES31Required);
>+        return false;
>+    }
>+
>+    return ValidateGetTexLevelParameterBase(context, target, level, pname, nullptr);
>+}
>+
>+bool ValidateGetMultisamplefvANGLE(Context *context, GLenum pname, GLuint index, GLfloat *val)
>+{
>+    if (!context->getExtensions().textureMultisample)
>+    {
>+        context->validationError(GL_INVALID_OPERATION, kMultisampleTextureExtensionOrES31Required);
>+        return false;
>+    }
>+
>+    return ValidateGetMultisamplefvBase(context, pname, index, val);
>+}
>+
>+bool ValidateSampleMaskiANGLE(Context *context, GLuint maskNumber, GLbitfield mask)
>+{
>+    if (!context->getExtensions().textureMultisample)
>+    {
>+        context->validationError(GL_INVALID_OPERATION, kMultisampleTextureExtensionOrES31Required);
>+        return false;
>+    }
>+
>+    return ValidateSampleMaskiBase(context, maskNumber, mask);
>+}
> }  // namespace gl
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/validationES3.h b/Source/ThirdParty/ANGLE/src/libANGLE/validationES3.h
>index 631b1ca43a1..40d274e5d0b 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/validationES3.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/validationES3.h
>@@ -1,614 +1,20 @@
> //
>-// Copyright (c) 2013 The ANGLE Project Authors. All rights reserved.
>+// Copyright 2018 The ANGLE Project Authors. All rights reserved.
> // Use of this source code is governed by a BSD-style license that can be
> // found in the LICENSE file.
> //
>-
>-// validationES3.h: Validation functions for OpenGL ES 3.0 entry point parameters
>+// validationES3.h:
>+//  Inlined validation functions for OpenGL ES 3.0 entry points.
> 
> #ifndef LIBANGLE_VALIDATION_ES3_H_
> #define LIBANGLE_VALIDATION_ES3_H_
> 
>-#include "libANGLE/PackedGLEnums.h"
>-
>-#include <GLES3/gl3.h>
>+#include "libANGLE/ErrorStrings.h"
>+#include "libANGLE/validationES3_autogen.h"
> 
> namespace gl
> {
>-class Context;
>-struct IndexRange;
>-class ValidationContext;
>-
>-bool ValidateES3TexImageParametersBase(ValidationContext *context,
>-                                       GLenum target,
>-                                       GLint level,
>-                                       GLenum internalformat,
>-                                       bool isCompressed,
>-                                       bool isSubImage,
>-                                       GLint xoffset,
>-                                       GLint yoffset,
>-                                       GLint zoffset,
>-                                       GLsizei width,
>-                                       GLsizei height,
>-                                       GLsizei depth,
>-                                       GLint border,
>-                                       GLenum format,
>-                                       GLenum type,
>-                                       GLsizei imageSize,
>-                                       const void *pixels);
>-
>-bool ValidateES3TexStorageParameters(Context *context,
>-                                     GLenum target,
>-                                     GLsizei levels,
>-                                     GLenum internalformat,
>-                                     GLsizei width,
>-                                     GLsizei height,
>-                                     GLsizei depth);
>-
>-bool ValidateES3TexImage2DParameters(Context *context,
>-                                     GLenum target,
>-                                     GLint level,
>-                                     GLenum internalformat,
>-                                     bool isCompressed,
>-                                     bool isSubImage,
>-                                     GLint xoffset,
>-                                     GLint yoffset,
>-                                     GLint zoffset,
>-                                     GLsizei width,
>-                                     GLsizei height,
>-                                     GLsizei depth,
>-                                     GLint border,
>-                                     GLenum format,
>-                                     GLenum type,
>-                                     GLsizei imageSize,
>-                                     const void *pixels);
>-
>-bool ValidateES3TexImage3DParameters(Context *context,
>-                                     GLenum target,
>-                                     GLint level,
>-                                     GLenum internalformat,
>-                                     bool isCompressed,
>-                                     bool isSubImage,
>-                                     GLint xoffset,
>-                                     GLint yoffset,
>-                                     GLint zoffset,
>-                                     GLsizei width,
>-                                     GLsizei height,
>-                                     GLsizei depth,
>-                                     GLint border,
>-                                     GLenum format,
>-                                     GLenum type,
>-                                     GLsizei bufSize,
>-                                     const void *pixels);
>-
>-bool ValidateES3CopyTexImageParametersBase(ValidationContext *context,
>-                                           GLenum target,
>-                                           GLint level,
>-                                           GLenum internalformat,
>-                                           bool isSubImage,
>-                                           GLint xoffset,
>-                                           GLint yoffset,
>-                                           GLint zoffset,
>-                                           GLint x,
>-                                           GLint y,
>-                                           GLsizei width,
>-                                           GLsizei height,
>-                                           GLint border);
>-
>-bool ValidateES3CopyTexImage2DParameters(ValidationContext *context,
>-                                         GLenum target,
>-                                         GLint level,
>-                                         GLenum internalformat,
>-                                         bool isSubImage,
>-                                         GLint xoffset,
>-                                         GLint yoffset,
>-                                         GLint zoffset,
>-                                         GLint x,
>-                                         GLint y,
>-                                         GLsizei width,
>-                                         GLsizei height,
>-                                         GLint border);
>-
>-bool ValidateES3CopyTexImage3DParameters(ValidationContext *context,
>-                                         GLenum target,
>-                                         GLint level,
>-                                         GLenum internalformat,
>-                                         bool isSubImage,
>-                                         GLint xoffset,
>-                                         GLint yoffset,
>-                                         GLint zoffset,
>-                                         GLint x,
>-                                         GLint y,
>-                                         GLsizei width,
>-                                         GLsizei height,
>-                                         GLint border);
>-
>-bool ValidateES3TexStorageParametersBase(Context *context,
>-                                         GLenum target,
>-                                         GLsizei levels,
>-                                         GLenum internalformat,
>-                                         GLsizei width,
>-                                         GLsizei height,
>-                                         GLsizei depth);
>-
>-bool ValidateES3TexStorage2DParameters(Context *context,
>-                                       GLenum target,
>-                                       GLsizei levels,
>-                                       GLenum internalformat,
>-                                       GLsizei width,
>-                                       GLsizei height,
>-                                       GLsizei depth);
>-
>-bool ValidateES3TexStorage3DParameters(Context *context,
>-                                       GLenum target,
>-                                       GLsizei levels,
>-                                       GLenum internalformat,
>-                                       GLsizei width,
>-                                       GLsizei height,
>-                                       GLsizei depth);
>-
>-bool ValidateBeginQuery(Context *context, GLenum target, GLuint id);
>-
>-bool ValidateEndQuery(Context *context, GLenum target);
>-
>-bool ValidateGetQueryiv(Context *context, GLenum target, GLenum pname, GLint *params);
>-
>-bool ValidateGetQueryObjectuiv(Context *context, GLuint id, GLenum pname, GLuint *params);
>-
>-bool ValidateFramebufferTextureLayer(Context *context,
>-                                     GLenum target,
>-                                     GLenum attachment,
>-                                     GLuint texture,
>-                                     GLint level,
>-                                     GLint layer);
>-
>-bool ValidateInvalidateFramebuffer(Context *context,
>-                                   GLenum target,
>-                                   GLsizei numAttachments,
>-                                   const GLenum *attachments);
>-
>-bool ValidateInvalidateSubFramebuffer(Context *context,
>-                                      GLenum target,
>-                                      GLsizei numAttachments,
>-                                      const GLenum *attachments,
>-                                      GLint x,
>-                                      GLint y,
>-                                      GLsizei width,
>-                                      GLsizei height);
>-
>-bool ValidateClearBuffer(ValidationContext *context);
>-
>-bool ValidateDrawRangeElements(Context *context,
>-                               GLenum mode,
>-                               GLuint start,
>-                               GLuint end,
>-                               GLsizei count,
>-                               GLenum type,
>-                               const void *indices);
>-
>-bool ValidateGetUniformuiv(Context *context, GLuint program, GLint location, GLuint *params);
>-
>-bool ValidateReadBuffer(Context *context, GLenum mode);
>-
>-bool ValidateCompressedTexImage3D(Context *context,
>-                                  GLenum target,
>-                                  GLint level,
>-                                  GLenum internalformat,
>-                                  GLsizei width,
>-                                  GLsizei height,
>-                                  GLsizei depth,
>-                                  GLint border,
>-                                  GLsizei imageSize,
>-                                  const void *data);
>-bool ValidateCompressedTexImage3DRobustANGLE(Context *context,
>-                                             GLenum target,
>-                                             GLint level,
>-                                             GLenum internalformat,
>-                                             GLsizei width,
>-                                             GLsizei height,
>-                                             GLsizei depth,
>-                                             GLint border,
>-                                             GLsizei imageSize,
>-                                             GLsizei dataSize,
>-                                             const void *data);
>-
>-bool ValidateBindVertexArray(Context *context, GLuint array);
>-bool ValidateIsVertexArray(Context *context, GLuint array);
>-
>-bool ValidateBindBufferBase(Context *context, BufferBinding target, GLuint index, GLuint buffer);
>-bool ValidateBindBufferRange(Context *context,
>-                             BufferBinding target,
>-                             GLuint index,
>-                             GLuint buffer,
>-                             GLintptr offset,
>-                             GLsizeiptr size);
>-
>-bool ValidateProgramBinary(Context *context,
>-                           GLuint program,
>-                           GLenum binaryFormat,
>-                           const void *binary,
>-                           GLint length);
>-bool ValidateGetProgramBinary(Context *context,
>-                              GLuint program,
>-                              GLsizei bufSize,
>-                              GLsizei *length,
>-                              GLenum *binaryFormat,
>-                              void *binary);
>-bool ValidateProgramParameteri(Context *context, GLuint program, GLenum pname, GLint value);
>-bool ValidateBlitFramebuffer(Context *context,
>-                             GLint srcX0,
>-                             GLint srcY0,
>-                             GLint srcX1,
>-                             GLint srcY1,
>-                             GLint dstX0,
>-                             GLint dstY0,
>-                             GLint dstX1,
>-                             GLint dstY1,
>-                             GLbitfield mask,
>-                             GLenum filter);
>-bool ValidateClearBufferiv(ValidationContext *context,
>-                           GLenum buffer,
>-                           GLint drawbuffer,
>-                           const GLint *value);
>-bool ValidateClearBufferuiv(ValidationContext *context,
>-                            GLenum buffer,
>-                            GLint drawbuffer,
>-                            const GLuint *value);
>-bool ValidateClearBufferfv(ValidationContext *context,
>-                           GLenum buffer,
>-                           GLint drawbuffer,
>-                           const GLfloat *value);
>-bool ValidateClearBufferfi(ValidationContext *context,
>-                           GLenum buffer,
>-                           GLint drawbuffer,
>-                           GLfloat depth,
>-                           GLint stencil);
>-bool ValidateDrawBuffers(ValidationContext *context, GLsizei n, const GLenum *bufs);
>-bool ValidateCopyTexSubImage3D(Context *context,
>-                               GLenum target,
>-                               GLint level,
>-                               GLint xoffset,
>-                               GLint yoffset,
>-                               GLint zoffset,
>-                               GLint x,
>-                               GLint y,
>-                               GLsizei width,
>-                               GLsizei height);
>-bool ValidateTexImage3D(Context *context,
>-                        GLenum target,
>-                        GLint level,
>-                        GLint internalformat,
>-                        GLsizei width,
>-                        GLsizei height,
>-                        GLsizei depth,
>-                        GLint border,
>-                        GLenum format,
>-                        GLenum type,
>-                        const void *pixels);
>-bool ValidateTexImage3DRobustANGLE(Context *context,
>-                                   GLenum target,
>-                                   GLint level,
>-                                   GLint internalformat,
>-                                   GLsizei width,
>-                                   GLsizei height,
>-                                   GLsizei depth,
>-                                   GLint border,
>-                                   GLenum format,
>-                                   GLenum type,
>-                                   GLsizei bufSize,
>-                                   const void *pixels);
>-bool ValidateTexSubImage3D(Context *context,
>-                           GLenum target,
>-                           GLint level,
>-                           GLint xoffset,
>-                           GLint yoffset,
>-                           GLint zoffset,
>-                           GLsizei width,
>-                           GLsizei height,
>-                           GLsizei depth,
>-                           GLenum format,
>-                           GLenum type,
>-                           const void *pixels);
>-bool ValidateTexSubImage3DRobustANGLE(Context *context,
>-                                      GLenum target,
>-                                      GLint level,
>-                                      GLint xoffset,
>-                                      GLint yoffset,
>-                                      GLint zoffset,
>-                                      GLsizei width,
>-                                      GLsizei height,
>-                                      GLsizei depth,
>-                                      GLenum format,
>-                                      GLenum type,
>-                                      GLsizei bufSize,
>-                                      const void *pixels);
>-bool ValidateCompressedTexSubImage3D(Context *context,
>-                                     GLenum target,
>-                                     GLint level,
>-                                     GLint xoffset,
>-                                     GLint yoffset,
>-                                     GLint zoffset,
>-                                     GLsizei width,
>-                                     GLsizei height,
>-                                     GLsizei depth,
>-                                     GLenum format,
>-                                     GLsizei imageSize,
>-                                     const void *data);
>-bool ValidateCompressedTexSubImage3DRobustANGLE(Context *context,
>-                                                GLenum target,
>-                                                GLint level,
>-                                                GLint xoffset,
>-                                                GLint yoffset,
>-                                                GLint zoffset,
>-                                                GLsizei width,
>-                                                GLsizei height,
>-                                                GLsizei depth,
>-                                                GLenum format,
>-                                                GLsizei imageSize,
>-                                                GLsizei dataSize,
>-                                                const void *data);
>-
>-bool ValidateGenQueries(Context *context, GLint n, GLuint *ids);
>-bool ValidateDeleteQueries(Context *context, GLint n, const GLuint *ids);
>-bool ValidateGenSamplers(Context *context, GLint count, GLuint *samplers);
>-bool ValidateDeleteSamplers(Context *context, GLint count, const GLuint *samplers);
>-bool ValidateGenTransformFeedbacks(Context *context, GLint n, GLuint *ids);
>-bool ValidateDeleteTransformFeedbacks(Context *context, GLint n, const GLuint *ids);
>-bool ValidateGenVertexArrays(Context *context, GLint n, GLuint *arrays);
>-bool ValidateDeleteVertexArrays(Context *context, GLint n, const GLuint *arrays);
>-
>-bool ValidateBeginTransformFeedback(Context *context, GLenum primitiveMode);
>-
>-bool ValidateGetBufferPointerv(Context *context, BufferBinding target, GLenum pname, void **params);
>-bool ValidateGetBufferPointervRobustANGLE(Context *context,
>-                                          BufferBinding target,
>-                                          GLenum pname,
>-                                          GLsizei bufSize,
>-                                          GLsizei *length,
>-                                          void **params);
>-bool ValidateUnmapBuffer(Context *context, BufferBinding target);
>-bool ValidateMapBufferRange(Context *context,
>-                            BufferBinding target,
>-                            GLintptr offset,
>-                            GLsizeiptr length,
>-                            GLbitfield access);
>-bool ValidateFlushMappedBufferRange(Context *context,
>-                                    BufferBinding target,
>-                                    GLintptr offset,
>-                                    GLsizeiptr length);
>-
>-bool ValidateIndexedStateQuery(ValidationContext *context,
>-                               GLenum pname,
>-                               GLuint index,
>-                               GLsizei *length);
>-bool ValidateGetIntegeri_v(ValidationContext *context, GLenum target, GLuint index, GLint *data);
>-bool ValidateGetIntegeri_vRobustANGLE(ValidationContext *context,
>-                                      GLenum target,
>-                                      GLuint index,
>-                                      GLsizei bufSize,
>-                                      GLsizei *length,
>-                                      GLint *data);
>-bool ValidateGetInteger64i_v(ValidationContext *context,
>-                             GLenum target,
>-                             GLuint index,
>-                             GLint64 *data);
>-bool ValidateGetInteger64i_vRobustANGLE(ValidationContext *context,
>-                                        GLenum target,
>-                                        GLuint index,
>-                                        GLsizei bufSize,
>-                                        GLsizei *length,
>-                                        GLint64 *data);
>-
>-bool ValidateCopyBufferSubData(ValidationContext *context,
>-                               BufferBinding readTarget,
>-                               BufferBinding writeTarget,
>-                               GLintptr readOffset,
>-                               GLintptr writeOffset,
>-                               GLsizeiptr size);
>-
>-bool ValidateGetStringi(Context *context, GLenum name, GLuint index);
>-bool ValidateRenderbufferStorageMultisample(ValidationContext *context,
>-                                            GLenum target,
>-                                            GLsizei samples,
>-                                            GLenum internalformat,
>-                                            GLsizei width,
>-                                            GLsizei height);
>-
>-bool ValidateVertexAttribIPointer(ValidationContext *context,
>-                                  GLuint index,
>-                                  GLint size,
>-                                  GLenum type,
>-                                  GLsizei stride,
>-                                  const void *pointer);
>-
>-bool ValidateGetSynciv(Context *context,
>-                       GLsync sync,
>-                       GLenum pname,
>-                       GLsizei bufSize,
>-                       GLsizei *length,
>-                       GLint *values);
>-
>-bool ValidateDrawElementsInstanced(ValidationContext *context,
>-                                   GLenum mode,
>-                                   GLsizei count,
>-                                   GLenum type,
>-                                   const void *indices,
>-                                   GLsizei instanceCount);
>-
>-bool ValidateFramebufferTextureMultiviewLayeredANGLE(Context *context,
>-                                                     GLenum target,
>-                                                     GLenum attachment,
>-                                                     GLuint texture,
>-                                                     GLint level,
>-                                                     GLint baseViewIndex,
>-                                                     GLsizei numViews);
>-
>-bool ValidateFramebufferTextureMultiviewSideBySideANGLE(Context *context,
>-                                                        GLenum target,
>-                                                        GLenum attachment,
>-                                                        GLuint texture,
>-                                                        GLint level,
>-                                                        GLsizei numViews,
>-                                                        const GLint *viewportOffsets);
>-
>-bool ValidateIsQuery(Context *context, GLuint id);
>-
>-bool ValidateUniform1ui(Context *context, GLint location, GLuint v0);
>-bool ValidateUniform2ui(Context *context, GLint location, GLuint v0, GLuint v1);
>-bool ValidateUniform3ui(Context *context, GLint location, GLuint v0, GLuint v1, GLuint v2);
>-bool ValidateUniform4ui(Context *context,
>-                        GLint location,
>-                        GLuint v0,
>-                        GLuint v1,
>-                        GLuint v2,
>-                        GLuint v3);
>-
>-bool ValidateUniform1uiv(Context *context, GLint location, GLsizei count, const GLuint *value);
>-bool ValidateUniform2uiv(Context *context, GLint location, GLsizei count, const GLuint *value);
>-bool ValidateUniform3uiv(Context *context, GLint location, GLsizei count, const GLuint *value);
>-bool ValidateUniform4uiv(Context *context, GLint location, GLsizei count, const GLuint *value);
>-
>-bool ValidateUniformMatrix2x3fv(Context *context,
>-                                GLint location,
>-                                GLsizei count,
>-                                GLboolean transpose,
>-                                const GLfloat *value);
>-bool ValidateUniformMatrix3x2fv(Context *context,
>-                                GLint location,
>-                                GLsizei count,
>-                                GLboolean transpose,
>-                                const GLfloat *value);
>-bool ValidateUniformMatrix2x4fv(Context *context,
>-                                GLint location,
>-                                GLsizei count,
>-                                GLboolean transpose,
>-                                const GLfloat *value);
>-bool ValidateUniformMatrix4x2fv(Context *context,
>-                                GLint location,
>-                                GLsizei count,
>-                                GLboolean transpose,
>-                                const GLfloat *value);
>-bool ValidateUniformMatrix3x4fv(Context *context,
>-                                GLint location,
>-                                GLsizei count,
>-                                GLboolean transpose,
>-                                const GLfloat *value);
>-bool ValidateUniformMatrix4x3fv(Context *context,
>-                                GLint location,
>-                                GLsizei count,
>-                                GLboolean transpose,
>-                                const GLfloat *value);
>-
>-bool ValidateEndTransformFeedback(Context *context);
>-bool ValidateTransformFeedbackVaryings(Context *context,
>-                                       GLuint program,
>-                                       GLsizei count,
>-                                       const GLchar *const *varyings,
>-                                       GLenum bufferMode);
>-bool ValidateGetTransformFeedbackVarying(Context *context,
>-                                         GLuint program,
>-                                         GLuint index,
>-                                         GLsizei bufSize,
>-                                         GLsizei *length,
>-                                         GLsizei *size,
>-                                         GLenum *type,
>-                                         GLchar *name);
>-bool ValidateBindTransformFeedback(Context *context, GLenum target, GLuint id);
>-bool ValidateIsTransformFeedback(Context *context, GLuint id);
>-bool ValidatePauseTransformFeedback(Context *context);
>-bool ValidateResumeTransformFeedback(Context *context);
>-bool ValidateVertexAttribI4i(Context *context, GLuint index, GLint x, GLint y, GLint z, GLint w);
>-bool ValidateVertexAttribI4ui(Context *context,
>-                              GLuint index,
>-                              GLuint x,
>-                              GLuint y,
>-                              GLuint z,
>-                              GLuint w);
>-bool ValidateVertexAttribI4iv(Context *context, GLuint index, const GLint *v);
>-bool ValidateVertexAttribI4uiv(Context *context, GLuint index, const GLuint *v);
>-bool ValidateGetFragDataLocation(Context *context, GLuint program, const GLchar *name);
>-bool ValidateGetUniformIndices(Context *context,
>-                               GLuint program,
>-                               GLsizei uniformCount,
>-                               const GLchar *const *uniformNames,
>-                               GLuint *uniformIndices);
>-bool ValidateGetActiveUniformsiv(Context *context,
>-                                 GLuint program,
>-                                 GLsizei uniformCount,
>-                                 const GLuint *uniformIndices,
>-                                 GLenum pname,
>-                                 GLint *params);
>-bool ValidateGetUniformBlockIndex(Context *context, GLuint program, const GLchar *uniformBlockName);
>-bool ValidateGetActiveUniformBlockiv(Context *context,
>-                                     GLuint program,
>-                                     GLuint uniformBlockIndex,
>-                                     GLenum pname,
>-                                     GLint *params);
>-bool ValidateGetActiveUniformBlockName(Context *context,
>-                                       GLuint program,
>-                                       GLuint uniformBlockIndex,
>-                                       GLsizei bufSize,
>-                                       GLsizei *length,
>-                                       GLchar *uniformBlockName);
>-bool ValidateUniformBlockBinding(Context *context,
>-                                 GLuint program,
>-                                 GLuint uniformBlockIndex,
>-                                 GLuint uniformBlockBinding);
>-bool ValidateDrawArraysInstanced(Context *context,
>-                                 GLenum mode,
>-                                 GLint first,
>-                                 GLsizei count,
>-                                 GLsizei primcount);
>-
>-bool ValidateFenceSync(Context *context, GLenum condition, GLbitfield flags);
>-bool ValidateIsSync(Context *context, GLsync sync);
>-bool ValidateDeleteSync(Context *context, GLsync sync);
>-bool ValidateClientWaitSync(Context *context, GLsync sync, GLbitfield flags, GLuint64 timeout);
>-bool ValidateWaitSync(Context *context, GLsync sync, GLbitfield flags, GLuint64 timeout);
>-bool ValidateGetInteger64v(Context *context, GLenum pname, GLint64 *params);
>-
>-bool ValidateIsSampler(Context *context, GLuint sampler);
>-bool ValidateBindSampler(Context *context, GLuint unit, GLuint sampler);
>-bool ValidateVertexAttribDivisor(Context *context, GLuint index, GLuint divisor);
>-bool ValidateTexStorage2D(Context *context,
>-                          GLenum target,
>-                          GLsizei levels,
>-                          GLenum internalformat,
>-                          GLsizei width,
>-                          GLsizei height);
>-bool ValidateTexStorage3D(Context *context,
>-                          GLenum target,
>-                          GLsizei levels,
>-                          GLenum internalformat,
>-                          GLsizei width,
>-                          GLsizei height,
>-                          GLsizei depth);
>-
>-bool ValidateGetVertexAttribIiv(Context *context, GLuint index, GLenum pname, GLint *params);
>-bool ValidateGetVertexAttribIuiv(Context *context, GLuint index, GLenum pname, GLuint *params);
>-bool ValidateGetBufferParameteri64v(ValidationContext *context,
>-                                    BufferBinding target,
>-                                    GLenum pname,
>-                                    GLint64 *params);
>-bool ValidateSamplerParameteri(Context *context, GLuint sampler, GLenum pname, GLint param);
>-bool ValidateSamplerParameteriv(Context *context,
>-                                GLuint sampler,
>-                                GLenum pname,
>-                                const GLint *params);
>-bool ValidateSamplerParameterf(Context *context, GLuint sampler, GLenum pname, GLfloat param);
>-bool ValidateSamplerParameterfv(Context *context,
>-                                GLuint sampler,
>-                                GLenum pname,
>-                                const GLfloat *params);
>-bool ValidateGetSamplerParameteriv(Context *context, GLuint sampler, GLenum pname, GLint *params);
>-bool ValidateGetSamplerParameterfv(Context *context, GLuint sampler, GLenum pname, GLfloat *params);
>-bool ValidateGetInternalformativ(Context *context,
>-                                 GLenum target,
>-                                 GLenum internalformat,
>-                                 GLenum pname,
>-                                 GLsizei bufSize,
>-                                 GLint *params);
>-
>+// Nothing here yet.
> }  // namespace gl
> 
> #endif  // LIBANGLE_VALIDATION_ES3_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/validationES31.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/validationES31.cpp
>index b1bdccacf7e..fc55e31cd53 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/validationES31.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/validationES31.cpp
>@@ -6,15 +6,15 @@
> 
> // validationES31.cpp: Validation functions for OpenGL ES 3.1 entry point parameters
> 
>-#include "libANGLE/validationES31.h"
>+#include "libANGLE/validationES31_autogen.h"
> 
> #include "libANGLE/Context.h"
> #include "libANGLE/ErrorStrings.h"
> #include "libANGLE/Framebuffer.h"
> #include "libANGLE/VertexArray.h"
> #include "libANGLE/validationES.h"
>-#include "libANGLE/validationES2.h"
>-#include "libANGLE/validationES3.h"
>+#include "libANGLE/validationES2_autogen.h"
>+#include "libANGLE/validationES3_autogen.h"
> 
> #include "common/utilities.h"
> 
>@@ -22,6 +22,7 @@ using namespace angle;
> 
> namespace gl
> {
>+using namespace err;
> 
> namespace
> {
>@@ -62,8 +63,9 @@ bool ValidateProgramInterface(GLenum programInterface)
>             ValidateNamedProgramInterface(programInterface));
> }
> 
>-bool ValidateProgramResourceProperty(GLenum prop)
>+bool ValidateProgramResourceProperty(const Context *context, GLenum prop)
> {
>+    ASSERT(context);
>     switch (prop)
>     {
>         case GL_ACTIVE_VARIABLES:
>@@ -97,6 +99,12 @@ bool ValidateProgramResourceProperty(GLenum prop)
>         case GL_TYPE:
>             return true;
> 
>+        case GL_REFERENCED_BY_GEOMETRY_SHADER_EXT:
>+            return context->getExtensions().geometryShader;
>+
>+        case GL_LOCATION_INDEX_EXT:
>+            return context->getExtensions().blendFuncExtended;
>+
>         default:
>             return false;
>     }
>@@ -179,6 +187,12 @@ bool ValidateProgramResourcePropertyByInterface(GLenum prop, GLenum programInter
>             return ValidateLocationProgramInterface(programInterface);
>         }
> 
>+        case GL_LOCATION_INDEX_EXT:
>+        {
>+            // EXT_blend_func_extended
>+            return (programInterface == GL_PROGRAM_OUTPUT);
>+        }
>+
>         case GL_NAME_LENGTH:
>         {
>             return ValidateNamedProgramInterface(programInterface);
>@@ -199,6 +213,7 @@ bool ValidateProgramResourcePropertyByInterface(GLenum prop, GLenum programInter
>         case GL_REFERENCED_BY_VERTEX_SHADER:
>         case GL_REFERENCED_BY_FRAGMENT_SHADER:
>         case GL_REFERENCED_BY_COMPUTE_SHADER:
>+        case GL_REFERENCED_BY_GEOMETRY_SHADER_EXT:
>         {
>             switch (programInterface)
>             {
>@@ -272,10 +287,8 @@ bool ValidateProgramResourceIndex(const Program *programObject,
>         case GL_ATOMIC_COUNTER_BUFFER:
>             return (index < programObject->getActiveAtomicCounterBufferCount());
> 
>-        // TODO(jie.a.chen@intel.com): more interfaces.
>         case GL_TRANSFORM_FEEDBACK_VARYING:
>-            UNIMPLEMENTED();
>-            return false;
>+            return (index < static_cast<GLuint>(programObject->getTransformFeedbackVaryingCount()));
> 
>         default:
>             UNREACHABLE();
>@@ -283,7 +296,7 @@ bool ValidateProgramResourceIndex(const Program *programObject,
>     }
> }
> 
>-bool ValidateProgramUniform(gl::Context *context,
>+bool ValidateProgramUniform(Context *context,
>                             GLenum valueType,
>                             GLuint program,
>                             GLint location,
>@@ -292,17 +305,17 @@ bool ValidateProgramUniform(gl::Context *context,
>     // Check for ES31 program uniform entry points
>     if (context->getClientVersion() < Version(3, 1))
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidOperation(), ES31Required);
>+        context->validationError(GL_INVALID_OPERATION, kES31Required);
>         return false;
>     }
> 
>     const LinkedUniform *uniform = nullptr;
>-    gl::Program *programObject   = GetValidProgram(context, program);
>+    Program *programObject       = GetValidProgram(context, program);
>     return ValidateUniformCommonBase(context, programObject, location, count, &uniform) &&
>            ValidateUniformValue(context, valueType, uniform->type);
> }
> 
>-bool ValidateProgramUniformMatrix(gl::Context *context,
>+bool ValidateProgramUniformMatrix(Context *context,
>                                   GLenum valueType,
>                                   GLuint program,
>                                   GLint location,
>@@ -312,47 +325,40 @@ bool ValidateProgramUniformMatrix(gl::Context *context,
>     // Check for ES31 program uniform entry points
>     if (context->getClientVersion() < Version(3, 1))
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidOperation(), ES31Required);
>+        context->validationError(GL_INVALID_OPERATION, kES31Required);
>         return false;
>     }
> 
>     const LinkedUniform *uniform = nullptr;
>-    gl::Program *programObject   = GetValidProgram(context, program);
>+    Program *programObject       = GetValidProgram(context, program);
>     return ValidateUniformCommonBase(context, programObject, location, count, &uniform) &&
>            ValidateUniformMatrixValue(context, valueType, uniform->type);
> }
> 
>-bool ValidateVertexAttribFormatCommon(ValidationContext *context,
>-                                      GLuint attribIndex,
>-                                      GLint size,
>-                                      GLenum type,
>-                                      GLuint relativeOffset,
>-                                      GLboolean pureInteger)
>+bool ValidateVertexAttribFormatCommon(Context *context, GLuint relativeOffset)
> {
>     if (context->getClientVersion() < ES_3_1)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidOperation(), ES31Required);
>+        context->validationError(GL_INVALID_OPERATION, kES31Required);
>         return false;
>     }
> 
>     const Caps &caps = context->getCaps();
>     if (relativeOffset > static_cast<GLuint>(caps.maxVertexAttribRelativeOffset))
>     {
>-        context->handleError(
>-            InvalidValue()
>-            << "relativeOffset cannot be greater than MAX_VERTEX_ATTRIB_RELATIVE_OFFSET.");
>+        context->validationError(GL_INVALID_VALUE, kRelativeOffsetTooLarge);
>         return false;
>     }
> 
>     // [OpenGL ES 3.1] Section 10.3.1 page 243:
>     // An INVALID_OPERATION error is generated if the default vertex array object is bound.
>-    if (context->getGLState().getVertexArrayId() == 0)
>+    if (context->getState().getVertexArrayId() == 0)
>     {
>-        context->handleError(InvalidOperation() << "Default vertex array object is bound.");
>+        context->validationError(GL_INVALID_OPERATION, kDefaultVertexArray);
>         return false;
>     }
> 
>-    return ValidateVertexFormatBase(context, attribIndex, size, type, pureInteger);
>+    return true;
> }
> 
> }  // anonymous namespace
>@@ -361,7 +367,7 @@ bool ValidateGetBooleani_v(Context *context, GLenum target, GLuint index, GLbool
> {
>     if (context->getClientVersion() < ES_3_1)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidOperation(), ES31Required);
>+        context->validationError(GL_INVALID_OPERATION, kES31Required);
>         return false;
>     }
> 
>@@ -382,7 +388,7 @@ bool ValidateGetBooleani_vRobustANGLE(Context *context,
> {
>     if (context->getClientVersion() < ES_3_1)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidOperation(), ES31Required);
>+        context->validationError(GL_INVALID_OPERATION, kES31Required);
>         return false;
>     }
> 
>@@ -391,47 +397,50 @@ bool ValidateGetBooleani_vRobustANGLE(Context *context,
>         return false;
>     }
> 
>-    if (!ValidateIndexedStateQuery(context, target, index, length))
>+    GLsizei numParams = 0;
>+
>+    if (!ValidateIndexedStateQuery(context, target, index, &numParams))
>     {
>         return false;
>     }
> 
>-    if (!ValidateRobustBufferSize(context, bufSize, *length))
>+    if (!ValidateRobustBufferSize(context, bufSize, numParams))
>     {
>         return false;
>     }
> 
>+    SetRobustLengthParam(length, numParams);
>     return true;
> }
> 
>-bool ValidateDrawIndirectBase(Context *context, GLenum mode, const void *indirect)
>+bool ValidateDrawIndirectBase(Context *context, PrimitiveMode mode, const void *indirect)
> {
>     if (context->getClientVersion() < ES_3_1)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidOperation(), ES31Required);
>+        context->validationError(GL_INVALID_OPERATION, kES31Required);
>         return false;
>     }
> 
>     // Here the third parameter 1 is only to pass the count validation.
>-    if (!ValidateDrawBase(context, mode, 1))
>+    if (!ValidateDrawBase(context, mode))
>     {
>         return false;
>     }
> 
>-    const State &state = context->getGLState();
>+    const State &state = context->getState();
> 
>     // An INVALID_OPERATION error is generated if zero is bound to VERTEX_ARRAY_BINDING,
>     // DRAW_INDIRECT_BUFFER or to any enabled vertex array.
>     if (!state.getVertexArrayId())
>     {
>-        context->handleError(InvalidOperation() << "zero is bound to VERTEX_ARRAY_BINDING");
>+        context->validationError(GL_INVALID_OPERATION, kDefaultVertexArray);
>         return false;
>     }
> 
>-    gl::Buffer *drawIndirectBuffer = state.getTargetBuffer(BufferBinding::DrawIndirect);
>+    Buffer *drawIndirectBuffer = state.getTargetBuffer(BufferBinding::DrawIndirect);
>     if (!drawIndirectBuffer)
>     {
>-        context->handleError(InvalidOperation() << "zero is bound to DRAW_INDIRECT_BUFFER");
>+        context->validationError(GL_INVALID_OPERATION, kDrawIndirectBufferNotBound);
>         return false;
>     }
> 
>@@ -440,44 +449,45 @@ bool ValidateDrawIndirectBase(Context *context, GLenum mode, const void *indirec
>     GLint64 offset = reinterpret_cast<GLint64>(indirect);
>     if ((static_cast<GLuint>(offset) % sizeof(GLuint)) != 0)
>     {
>-        context->handleError(
>-            InvalidValue()
>-            << "indirect is not a multiple of the size, in basic machine units, of uint");
>-        return false;
>-    }
>-
>-    // ANGLE_multiview spec, revision 1:
>-    // An INVALID_OPERATION is generated by DrawArraysIndirect and DrawElementsIndirect if the
>-    // number of views in the draw framebuffer is greater than 1.
>-    const Framebuffer *drawFramebuffer = context->getGLState().getDrawFramebuffer();
>-    ASSERT(drawFramebuffer != nullptr);
>-    if (drawFramebuffer->getNumViews() > 1)
>-    {
>-        context->handleError(
>-            InvalidOperation()
>-            << "The number of views in the active draw framebuffer is greater than 1.");
>+        context->validationError(GL_INVALID_VALUE, kInvalidIndirectOffset);
>         return false;
>     }
> 
>     return true;
> }
> 
>-bool ValidateDrawArraysIndirect(Context *context, GLenum mode, const void *indirect)
>+bool ValidateDrawArraysIndirect(Context *context, PrimitiveMode mode, const void *indirect)
> {
>-    const State &state                          = context->getGLState();
>-    gl::TransformFeedback *curTransformFeedback = state.getCurrentTransformFeedback();
>+    const State &state                      = context->getState();
>+    TransformFeedback *curTransformFeedback = state.getCurrentTransformFeedback();
>     if (curTransformFeedback && curTransformFeedback->isActive() &&
>         !curTransformFeedback->isPaused())
>     {
>-        // An INVALID_OPERATION error is generated if transform feedback is active and not paused.
>-        context->handleError(InvalidOperation() << "transform feedback is active and not paused.");
>-        return false;
>+        // EXT_geometry_shader allows transform feedback to work with all draw commands.
>+        // [EXT_geometry_shader] Section 12.1, "Transform Feedback"
>+        if (context->getExtensions().geometryShader)
>+        {
>+            if (!ValidateTransformFeedbackPrimitiveMode(
>+                    context, curTransformFeedback->getPrimitiveMode(), mode))
>+            {
>+                context->validationError(GL_INVALID_OPERATION, kInvalidDrawModeTransformFeedback);
>+                return false;
>+            }
>+        }
>+        else
>+        {
>+            // An INVALID_OPERATION error is generated if transform feedback is active and not
>+            // paused.
>+            context->validationError(GL_INVALID_OPERATION,
>+                                     kUnsupportedDrawModeForTransformFeedback);
>+            return false;
>+        }
>     }
> 
>     if (!ValidateDrawIndirectBase(context, mode, indirect))
>         return false;
> 
>-    gl::Buffer *drawIndirectBuffer = state.getTargetBuffer(BufferBinding::DrawIndirect);
>+    Buffer *drawIndirectBuffer = state.getTargetBuffer(BufferBinding::DrawIndirect);
>     CheckedNumeric<size_t> checkedOffset(reinterpret_cast<size_t>(indirect));
>     // In OpenGL ES3.1 spec, session 10.5, it defines the struct of DrawArraysIndirectCommand
>     // which's size is 4 * sizeof(uint).
>@@ -485,33 +495,36 @@ bool ValidateDrawArraysIndirect(Context *context, GLenum mode, const void *indir
>     if (!checkedSum.IsValid() ||
>         checkedSum.ValueOrDie() > static_cast<size_t>(drawIndirectBuffer->getSize()))
>     {
>-        context->handleError(
>-            InvalidOperation()
>-            << "the  command  would source data beyond the end of the buffer object.");
>+        context->validationError(GL_INVALID_OPERATION, kParamOverflow);
>         return false;
>     }
> 
>     return true;
> }
> 
>-bool ValidateDrawElementsIndirect(Context *context, GLenum mode, GLenum type, const void *indirect)
>+bool ValidateDrawElementsIndirect(Context *context,
>+                                  PrimitiveMode mode,
>+                                  DrawElementsType type,
>+                                  const void *indirect)
> {
>-    if (!ValidateDrawElementsBase(context, type))
>+    if (!ValidateDrawElementsBase(context, mode, type))
>+    {
>         return false;
>+    }
> 
>-    const State &state             = context->getGLState();
>-    const VertexArray *vao         = state.getVertexArray();
>-    gl::Buffer *elementArrayBuffer = vao->getElementArrayBuffer().get();
>+    const State &state         = context->getState();
>+    const VertexArray *vao     = state.getVertexArray();
>+    Buffer *elementArrayBuffer = vao->getElementArrayBuffer();
>     if (!elementArrayBuffer)
>     {
>-        context->handleError(InvalidOperation() << "zero is bound to ELEMENT_ARRAY_BUFFER");
>+        context->validationError(GL_INVALID_OPERATION, kMustHaveElementArrayBinding);
>         return false;
>     }
> 
>     if (!ValidateDrawIndirectBase(context, mode, indirect))
>         return false;
> 
>-    gl::Buffer *drawIndirectBuffer = state.getTargetBuffer(BufferBinding::DrawIndirect);
>+    Buffer *drawIndirectBuffer = state.getTargetBuffer(BufferBinding::DrawIndirect);
>     CheckedNumeric<size_t> checkedOffset(reinterpret_cast<size_t>(indirect));
>     // In OpenGL ES3.1 spec, session 10.5, it defines the struct of DrawElementsIndirectCommand
>     // which's size is 5 * sizeof(uint).
>@@ -519,9 +532,7 @@ bool ValidateDrawElementsIndirect(Context *context, GLenum mode, GLenum type, co
>     if (!checkedSum.IsValid() ||
>         checkedSum.ValueOrDie() > static_cast<size_t>(drawIndirectBuffer->getSize()))
>     {
>-        context->handleError(
>-            InvalidOperation()
>-            << "the  command  would source data beyond the end of the buffer object.");
>+        context->validationError(GL_INVALID_OPERATION, kParamOverflow);
>         return false;
>     }
> 
>@@ -647,12 +658,12 @@ bool ValidateProgramUniform1iv(Context *context,
>     // Check for ES31 program uniform entry points
>     if (context->getClientVersion() < Version(3, 1))
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidOperation(), ES31Required);
>+        context->validationError(GL_INVALID_OPERATION, kES31Required);
>         return false;
>     }
> 
>     const LinkedUniform *uniform = nullptr;
>-    gl::Program *programObject   = GetValidProgram(context, program);
>+    Program *programObject       = GetValidProgram(context, program);
>     return ValidateUniformCommonBase(context, programObject, location, count, &uniform) &&
>            ValidateUniform1ivValue(context, uniform->type, count, value);
> }
>@@ -855,221 +866,131 @@ bool ValidateProgramUniformMatrix4x3fv(Context *context,
>                                         transpose);
> }
> 
>-bool ValidateGetTexLevelParameterBase(Context *context,
>-                                      GLenum target,
>-                                      GLint level,
>-                                      GLenum pname,
>-                                      GLsizei *length)
>+bool ValidateGetTexLevelParameterfv(Context *context,
>+                                    TextureTarget target,
>+                                    GLint level,
>+                                    GLenum pname,
>+                                    GLfloat *params)
> {
>     if (context->getClientVersion() < ES_3_1)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidOperation(), ES31Required);
>-        return false;
>-    }
>-
>-    if (length)
>-    {
>-        *length = 0;
>-    }
>-
>-    if (!ValidTexLevelDestinationTarget(context, target))
>-    {
>-        ANGLE_VALIDATION_ERR(context, InvalidEnum(), InvalidTextureTarget);
>-        return false;
>-    }
>-
>-    if (context->getTargetTexture(IsCubeMapTextureTarget(target) ? GL_TEXTURE_CUBE_MAP : target) ==
>-        nullptr)
>-    {
>-        context->handleError(InvalidEnum() << "No texture bound.");
>+        context->validationError(GL_INVALID_OPERATION, kES31Required);
>         return false;
>     }
> 
>-    if (!ValidMipLevel(context, target, level))
>-    {
>-        context->handleError(InvalidValue());
>-        return false;
>-    }
>-
>-    switch (pname)
>-    {
>-        case GL_TEXTURE_RED_TYPE:
>-        case GL_TEXTURE_GREEN_TYPE:
>-        case GL_TEXTURE_BLUE_TYPE:
>-        case GL_TEXTURE_ALPHA_TYPE:
>-        case GL_TEXTURE_DEPTH_TYPE:
>-            break;
>-        case GL_TEXTURE_RED_SIZE:
>-        case GL_TEXTURE_GREEN_SIZE:
>-        case GL_TEXTURE_BLUE_SIZE:
>-        case GL_TEXTURE_ALPHA_SIZE:
>-        case GL_TEXTURE_DEPTH_SIZE:
>-        case GL_TEXTURE_STENCIL_SIZE:
>-        case GL_TEXTURE_SHARED_SIZE:
>-            break;
>-        case GL_TEXTURE_INTERNAL_FORMAT:
>-        case GL_TEXTURE_WIDTH:
>-        case GL_TEXTURE_HEIGHT:
>-        case GL_TEXTURE_DEPTH:
>-            break;
>-        case GL_TEXTURE_SAMPLES:
>-        case GL_TEXTURE_FIXED_SAMPLE_LOCATIONS:
>-            break;
>-        case GL_TEXTURE_COMPRESSED:
>-            break;
>-        default:
>-            ANGLE_VALIDATION_ERR(context, InvalidEnum(), InvalidPname);
>-            return false;
>-    }
>-
>-    if (length)
>-    {
>-        *length = 1;
>-    }
>-    return true;
>+    return ValidateGetTexLevelParameterBase(context, target, level, pname, nullptr);
> }
> 
>-bool ValidateGetTexLevelParameterfv(Context *context,
>-                                    GLenum target,
>-                                    GLint level,
>-                                    GLenum pname,
>-                                    GLfloat *params)
>+bool ValidateGetTexLevelParameterfvRobustANGLE(Context *context,
>+                                               TextureTarget target,
>+                                               GLint level,
>+                                               GLenum pname,
>+                                               GLsizei bufSize,
>+                                               GLsizei *length,
>+                                               GLfloat *params)
> {
>-    return ValidateGetTexLevelParameterBase(context, target, level, pname, nullptr);
>+    UNIMPLEMENTED();
>+    return false;
> }
> 
> bool ValidateGetTexLevelParameteriv(Context *context,
>-                                    GLenum target,
>+                                    TextureTarget target,
>                                     GLint level,
>                                     GLenum pname,
>                                     GLint *params)
> {
>+    if (context->getClientVersion() < ES_3_1)
>+    {
>+        context->validationError(GL_INVALID_OPERATION, kES31Required);
>+        return false;
>+    }
>+
>     return ValidateGetTexLevelParameterBase(context, target, level, pname, nullptr);
> }
> 
>+bool ValidateGetTexLevelParameterivRobustANGLE(Context *context,
>+                                               TextureTarget target,
>+                                               GLint level,
>+                                               GLenum pname,
>+                                               GLsizei bufSize,
>+                                               GLsizei *length,
>+                                               GLint *params)
>+{
>+    UNIMPLEMENTED();
>+    return false;
>+}
>+
> bool ValidateTexStorage2DMultisample(Context *context,
>-                                     GLenum target,
>+                                     TextureType target,
>                                      GLsizei samples,
>-                                     GLint internalFormat,
>+                                     GLenum internalFormat,
>                                      GLsizei width,
>                                      GLsizei height,
>                                      GLboolean fixedSampleLocations)
> {
>     if (context->getClientVersion() < ES_3_1)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidOperation(), ES31Required);
>-        return false;
>-    }
>-
>-    if (target != GL_TEXTURE_2D_MULTISAMPLE)
>-    {
>-        context->handleError(InvalidEnum() << "Target must be TEXTURE_2D_MULTISAMPLE.");
>-        return false;
>-    }
>-
>-    if (width < 1 || height < 1)
>-    {
>-        ANGLE_VALIDATION_ERR(context, InvalidValue(), NegativeSize);
>-        return false;
>-    }
>-
>-    const Caps &caps = context->getCaps();
>-    if (static_cast<GLuint>(width) > caps.max2DTextureSize ||
>-        static_cast<GLuint>(height) > caps.max2DTextureSize)
>-    {
>-        context
>-            ->handleError(InvalidValue()
>-                          << "Width and height must be less than or equal to GL_MAX_TEXTURE_SIZE.");
>-        return false;
>-    }
>-
>-    if (samples == 0)
>-    {
>-        context->handleError(InvalidValue() << "Samples may not be zero.");
>-        return false;
>-    }
>-
>-    const TextureCaps &formatCaps = context->getTextureCaps().get(internalFormat);
>-    if (!formatCaps.renderable)
>-    {
>-        context->handleError(InvalidEnum() << "SizedInternalformat must be color-renderable, "
>-                                              "depth-renderable, or stencil-renderable.");
>-        return false;
>-    }
>-
>-    // The ES3.1 spec(section 8.8) states that an INVALID_ENUM error is generated if internalformat
>-    // is one of the unsized base internalformats listed in table 8.11.
>-    const InternalFormat &formatInfo = GetSizedInternalFormatInfo(internalFormat);
>-    if (formatInfo.internalFormat == GL_NONE)
>-    {
>-        context->handleError(
>-            InvalidEnum()
>-            << "Internalformat is one of the unsupported unsized base internalformats.");
>-        return false;
>-    }
>-
>-    if (static_cast<GLuint>(samples) > formatCaps.getMaxSamples())
>-    {
>-        context->handleError(
>-            InvalidOperation()
>-            << "Samples must not be greater than maximum supported value for the format.");
>+        context->validationError(GL_INVALID_OPERATION, kES31Required);
>         return false;
>     }
> 
>-    Texture *texture = context->getTargetTexture(target);
>-    if (!texture || texture->id() == 0)
>-    {
>-        context->handleError(InvalidOperation() << "Zero is bound to target.");
>-        return false;
>-    }
>+    return ValidateTexStorage2DMultisampleBase(context, target, samples, internalFormat, width,
>+                                               height);
>+}
> 
>-    if (texture->getImmutableFormat())
>+bool ValidateTexStorageMem2DMultisampleEXT(Context *context,
>+                                           TextureType target,
>+                                           GLsizei samples,
>+                                           GLenum internalFormat,
>+                                           GLsizei width,
>+                                           GLsizei height,
>+                                           GLboolean fixedSampleLocations,
>+                                           GLuint memory,
>+                                           GLuint64 offset)
>+{
>+    if (!context->getExtensions().memoryObject)
>     {
>-        context->handleError(InvalidOperation() << "The value of TEXTURE_IMMUTABLE_FORMAT for "
>-                                                   "the texture currently bound to target on "
>-                                                   "the active texture unit is true.");
>+        context->validationError(GL_INVALID_OPERATION, kExtensionNotEnabled);
>         return false;
>     }
> 
>-    return true;
>+    UNIMPLEMENTED();
>+    return false;
> }
> 
> bool ValidateGetMultisamplefv(Context *context, GLenum pname, GLuint index, GLfloat *val)
> {
>     if (context->getClientVersion() < ES_3_1)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidOperation(), ES31Required);
>+        context->validationError(GL_INVALID_OPERATION, kES31Required);
>         return false;
>     }
> 
>-    if (pname != GL_SAMPLE_POSITION)
>-    {
>-        context->handleError(InvalidEnum() << "Pname must be SAMPLE_POSITION.");
>-        return false;
>-    }
>-
>-    Framebuffer *framebuffer = context->getGLState().getDrawFramebuffer();
>-
>-    if (index >= static_cast<GLuint>(framebuffer->getSamples(context)))
>-    {
>-        context->handleError(InvalidValue() << "Index must be less than the value of SAMPLES.");
>-        return false;
>-    }
>+    return ValidateGetMultisamplefvBase(context, pname, index, val);
>+}
> 
>-    return true;
>+bool ValidateGetMultisamplefvRobustANGLE(Context *context,
>+                                         GLenum pname,
>+                                         GLuint index,
>+                                         GLsizei bufSize,
>+                                         GLsizei *length,
>+                                         GLfloat *val)
>+{
>+    UNIMPLEMENTED();
>+    return false;
> }
> 
> bool ValidateFramebufferParameteri(Context *context, GLenum target, GLenum pname, GLint param)
> {
>     if (context->getClientVersion() < ES_3_1)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidOperation(), ES31Required);
>+        context->validationError(GL_INVALID_OPERATION, kES31Required);
>         return false;
>     }
> 
>     if (!ValidFramebufferTarget(context, target))
>     {
>-        context->handleError(InvalidEnum() << "Invalid framebuffer target.");
>+        context->validationError(GL_INVALID_ENUM, kInvalidFramebufferTarget);
>         return false;
>     }
> 
>@@ -1080,9 +1001,7 @@ bool ValidateFramebufferParameteri(Context *context, GLenum target, GLenum pname
>             GLint maxWidth = context->getCaps().maxFramebufferWidth;
>             if (param < 0 || param > maxWidth)
>             {
>-                context->handleError(
>-                    InvalidValue()
>-                    << "Params less than 0 or greater than GL_MAX_FRAMEBUFFER_WIDTH.");
>+                context->validationError(GL_INVALID_VALUE, kExceedsFramebufferWidth);
>                 return false;
>             }
>             break;
>@@ -1092,9 +1011,7 @@ bool ValidateFramebufferParameteri(Context *context, GLenum target, GLenum pname
>             GLint maxHeight = context->getCaps().maxFramebufferHeight;
>             if (param < 0 || param > maxHeight)
>             {
>-                context->handleError(
>-                    InvalidValue()
>-                    << "Params less than 0 or greater than GL_MAX_FRAMEBUFFER_HEIGHT.");
>+                context->validationError(GL_INVALID_VALUE, kExceedsFramebufferHeight);
>                 return false;
>             }
>             break;
>@@ -1104,9 +1021,7 @@ bool ValidateFramebufferParameteri(Context *context, GLenum target, GLenum pname
>             GLint maxSamples = context->getCaps().maxFramebufferSamples;
>             if (param < 0 || param > maxSamples)
>             {
>-                context->handleError(
>-                    InvalidValue()
>-                    << "Params less than 0 or greater than GL_MAX_FRAMEBUFFER_SAMPLES.");
>+                context->validationError(GL_INVALID_VALUE, kExceedsFramebufferSamples);
>                 return false;
>             }
>             break;
>@@ -1115,18 +1030,33 @@ bool ValidateFramebufferParameteri(Context *context, GLenum target, GLenum pname
>         {
>             break;
>         }
>+        case GL_FRAMEBUFFER_DEFAULT_LAYERS_EXT:
>+        {
>+            if (!context->getExtensions().geometryShader)
>+            {
>+                context->validationError(GL_INVALID_ENUM, kGeometryShaderExtensionNotEnabled);
>+                return false;
>+            }
>+            GLint maxLayers = context->getCaps().maxFramebufferLayers;
>+            if (param < 0 || param > maxLayers)
>+            {
>+                context->validationError(GL_INVALID_VALUE, kInvalidFramebufferLayer);
>+                return false;
>+            }
>+            break;
>+        }
>         default:
>         {
>-            ANGLE_VALIDATION_ERR(context, InvalidEnum(), InvalidPname);
>+            context->validationError(GL_INVALID_ENUM, kInvalidPname);
>             return false;
>         }
>     }
> 
>-    const Framebuffer *framebuffer = context->getGLState().getTargetFramebuffer(target);
>+    const Framebuffer *framebuffer = context->getState().getTargetFramebuffer(target);
>     ASSERT(framebuffer);
>     if (framebuffer->id() == 0)
>     {
>-        context->handleError(InvalidOperation() << "Default framebuffer is bound to target.");
>+        context->validationError(GL_INVALID_OPERATION, kDefaultFramebuffer);
>         return false;
>     }
>     return true;
>@@ -1136,13 +1066,13 @@ bool ValidateGetFramebufferParameteriv(Context *context, GLenum target, GLenum p
> {
>     if (context->getClientVersion() < ES_3_1)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidOperation(), ES31Required);
>+        context->validationError(GL_INVALID_OPERATION, kES31Required);
>         return false;
>     }
> 
>     if (!ValidFramebufferTarget(context, target))
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidEnum(), InvalidFramebufferTarget);
>+        context->validationError(GL_INVALID_ENUM, kInvalidFramebufferTarget);
>         return false;
>     }
> 
>@@ -1153,22 +1083,40 @@ bool ValidateGetFramebufferParameteriv(Context *context, GLenum target, GLenum p
>         case GL_FRAMEBUFFER_DEFAULT_SAMPLES:
>         case GL_FRAMEBUFFER_DEFAULT_FIXED_SAMPLE_LOCATIONS:
>             break;
>+        case GL_FRAMEBUFFER_DEFAULT_LAYERS_EXT:
>+            if (!context->getExtensions().geometryShader)
>+            {
>+                context->validationError(GL_INVALID_ENUM, kGeometryShaderExtensionNotEnabled);
>+                return false;
>+            }
>+            break;
>         default:
>-            ANGLE_VALIDATION_ERR(context, InvalidEnum(), InvalidPname);
>+            context->validationError(GL_INVALID_ENUM, kInvalidPname);
>             return false;
>     }
> 
>-    const Framebuffer *framebuffer = context->getGLState().getTargetFramebuffer(target);
>+    const Framebuffer *framebuffer = context->getState().getTargetFramebuffer(target);
>     ASSERT(framebuffer);
> 
>     if (framebuffer->id() == 0)
>     {
>-        context->handleError(InvalidOperation() << "Default framebuffer is bound to target.");
>+        context->validationError(GL_INVALID_OPERATION, kDefaultFramebuffer);
>         return false;
>     }
>     return true;
> }
> 
>+bool ValidateGetFramebufferParameterivRobustANGLE(Context *context,
>+                                                  GLenum target,
>+                                                  GLenum pname,
>+                                                  GLsizei bufSize,
>+                                                  GLsizei *length,
>+                                                  GLint *params)
>+{
>+    UNIMPLEMENTED();
>+    return false;
>+}
>+
> bool ValidateGetProgramResourceIndex(Context *context,
>                                      GLuint program,
>                                      GLenum programInterface,
>@@ -1176,7 +1124,7 @@ bool ValidateGetProgramResourceIndex(Context *context,
> {
>     if (context->getClientVersion() < ES_3_1)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidOperation(), ES31Required);
>+        context->validationError(GL_INVALID_OPERATION, kES31Required);
>         return false;
>     }
> 
>@@ -1188,15 +1136,14 @@ bool ValidateGetProgramResourceIndex(Context *context,
> 
>     if (!ValidateNamedProgramInterface(programInterface))
>     {
>-        context->handleError(InvalidEnum() << "Invalid program interface: 0x" << std::hex
>-                                           << std::uppercase << programInterface);
>+        context->validationError(GL_INVALID_ENUM, kInvalidProgramInterface);
>         return false;
>     }
> 
>     return true;
> }
> 
>-bool ValidateBindVertexBuffer(ValidationContext *context,
>+bool ValidateBindVertexBuffer(Context *context,
>                               GLuint bindingIndex,
>                               GLuint buffer,
>                               GLintptr offset,
>@@ -1204,124 +1151,127 @@ bool ValidateBindVertexBuffer(ValidationContext *context,
> {
>     if (context->getClientVersion() < ES_3_1)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidOperation(), ES31Required);
>+        context->validationError(GL_INVALID_OPERATION, kES31Required);
>         return false;
>     }
> 
>     if (!context->isBufferGenerated(buffer))
>     {
>-        context->handleError(InvalidOperation() << "Buffer is not generated.");
>+        context->validationError(GL_INVALID_OPERATION, kObjectNotGenerated);
>         return false;
>     }
> 
>     const Caps &caps = context->getCaps();
>     if (bindingIndex >= caps.maxVertexAttribBindings)
>     {
>-        context->handleError(InvalidValue()
>-                             << "bindingindex must be smaller than MAX_VERTEX_ATTRIB_BINDINGS.");
>+        context->validationError(GL_INVALID_VALUE, kExceedsMaxVertexAttribBindings);
>         return false;
>     }
> 
>     if (offset < 0)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidValue(), NegativeOffset);
>+        context->validationError(GL_INVALID_VALUE, kNegativeOffset);
>         return false;
>     }
> 
>     if (stride < 0 || stride > caps.maxVertexAttribStride)
>     {
>-        context->handleError(InvalidValue()
>-                             << "stride must be between 0 and MAX_VERTEX_ATTRIB_STRIDE.");
>+        context->validationError(GL_INVALID_VALUE, kExceedsMaxVertexAttribStride);
>         return false;
>     }
> 
>     // [OpenGL ES 3.1] Section 10.3.1 page 244:
>     // An INVALID_OPERATION error is generated if the default vertex array object is bound.
>-    if (context->getGLState().getVertexArrayId() == 0)
>+    if (context->getState().getVertexArrayId() == 0)
>     {
>-        context->handleError(InvalidOperation() << "Default vertex array buffer is bound.");
>+        context->validationError(GL_INVALID_OPERATION, kDefaultVertexArray);
>         return false;
>     }
> 
>     return true;
> }
> 
>-bool ValidateVertexBindingDivisor(ValidationContext *context, GLuint bindingIndex, GLuint divisor)
>+bool ValidateVertexBindingDivisor(Context *context, GLuint bindingIndex, GLuint divisor)
> {
>     if (context->getClientVersion() < ES_3_1)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidOperation(), ES31Required);
>+        context->validationError(GL_INVALID_OPERATION, kES31Required);
>         return false;
>     }
> 
>     const Caps &caps = context->getCaps();
>     if (bindingIndex >= caps.maxVertexAttribBindings)
>     {
>-        context->handleError(InvalidValue()
>-                             << "bindingindex must be smaller than MAX_VERTEX_ATTRIB_BINDINGS.");
>+        context->validationError(GL_INVALID_VALUE, kExceedsMaxVertexAttribBindings);
>         return false;
>     }
> 
>     // [OpenGL ES 3.1] Section 10.3.1 page 243:
>     // An INVALID_OPERATION error is generated if the default vertex array object is bound.
>-    if (context->getGLState().getVertexArrayId() == 0)
>+    if (context->getState().getVertexArrayId() == 0)
>     {
>-        context->handleError(InvalidOperation() << "Default vertex array object is bound.");
>+        context->validationError(GL_INVALID_OPERATION, kDefaultVertexArray);
>         return false;
>     }
> 
>     return true;
> }
> 
>-bool ValidateVertexAttribFormat(ValidationContext *context,
>+bool ValidateVertexAttribFormat(Context *context,
>                                 GLuint attribindex,
>                                 GLint size,
>-                                GLenum type,
>+                                VertexAttribType type,
>                                 GLboolean normalized,
>                                 GLuint relativeoffset)
> {
>-    return ValidateVertexAttribFormatCommon(context, attribindex, size, type, relativeoffset,
>-                                            false);
>+    if (!ValidateVertexAttribFormatCommon(context, relativeoffset))
>+    {
>+        return false;
>+    }
>+
>+    return ValidateFloatVertexFormat(context, attribindex, size, type);
> }
> 
>-bool ValidateVertexAttribIFormat(ValidationContext *context,
>+bool ValidateVertexAttribIFormat(Context *context,
>                                  GLuint attribindex,
>                                  GLint size,
>-                                 GLenum type,
>+                                 VertexAttribType type,
>                                  GLuint relativeoffset)
> {
>-    return ValidateVertexAttribFormatCommon(context, attribindex, size, type, relativeoffset, true);
>+    if (!ValidateVertexAttribFormatCommon(context, relativeoffset))
>+    {
>+        return false;
>+    }
>+
>+    return ValidateIntegerVertexFormat(context, attribindex, size, type);
> }
> 
>-bool ValidateVertexAttribBinding(ValidationContext *context,
>-                                 GLuint attribIndex,
>-                                 GLuint bindingIndex)
>+bool ValidateVertexAttribBinding(Context *context, GLuint attribIndex, GLuint bindingIndex)
> {
>     if (context->getClientVersion() < ES_3_1)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidOperation(), ES31Required);
>+        context->validationError(GL_INVALID_OPERATION, kES31Required);
>         return false;
>     }
> 
>     // [OpenGL ES 3.1] Section 10.3.1 page 243:
>     // An INVALID_OPERATION error is generated if the default vertex array object is bound.
>-    if (context->getGLState().getVertexArrayId() == 0)
>+    if (context->getState().getVertexArrayId() == 0)
>     {
>-        context->handleError(InvalidOperation() << "Default vertex array object is bound.");
>+        context->validationError(GL_INVALID_OPERATION, kDefaultVertexArray);
>         return false;
>     }
> 
>     const Caps &caps = context->getCaps();
>     if (attribIndex >= caps.maxVertexAttributes)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidValue(), IndexExceedsMaxVertexAttribute);
>+        context->validationError(GL_INVALID_VALUE, kIndexExceedsMaxVertexAttribute);
>         return false;
>     }
> 
>     if (bindingIndex >= caps.maxVertexAttribBindings)
>     {
>-        context->handleError(InvalidValue()
>-                             << "bindingindex must be smaller than MAX_VERTEX_ATTRIB_BINDINGS");
>+        context->validationError(GL_INVALID_VALUE, kExceedsMaxVertexAttribBindings);
>         return false;
>     }
> 
>@@ -1338,7 +1288,7 @@ bool ValidateGetProgramResourceName(Context *context,
> {
>     if (context->getClientVersion() < ES_3_1)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidOperation(), ES31Required);
>+        context->validationError(GL_INVALID_OPERATION, kES31Required);
>         return false;
>     }
> 
>@@ -1350,20 +1300,19 @@ bool ValidateGetProgramResourceName(Context *context,
> 
>     if (!ValidateNamedProgramInterface(programInterface))
>     {
>-        context->handleError(InvalidEnum() << "Invalid program interface: 0x" << std::hex
>-                                           << std::uppercase << programInterface);
>+        context->validationError(GL_INVALID_ENUM, kInvalidProgramInterface);
>         return false;
>     }
> 
>     if (!ValidateProgramResourceIndex(programObject, programInterface, index))
>     {
>-        context->handleError(InvalidValue() << "Invalid index: " << index);
>+        context->validationError(GL_INVALID_VALUE, kInvalidProgramResourceIndex);
>         return false;
>     }
> 
>     if (bufSize < 0)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidValue(), NegativeBufferSize);
>+        context->validationError(GL_INVALID_VALUE, kNegativeBufferSize);
>         return false;
>     }
> 
>@@ -1377,48 +1326,33 @@ bool ValidateDispatchCompute(Context *context,
> {
>     if (context->getClientVersion() < ES_3_1)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidOperation(), ES31Required);
>+        context->validationError(GL_INVALID_OPERATION, kES31Required);
>         return false;
>     }
> 
>-    const State &state = context->getGLState();
>-    Program *program   = state.getProgram();
>-
>-    if (program == nullptr)
>-    {
>-        context->handleError(InvalidOperation()
>-                             << "No active program object for the compute shader stage.");
>-        return false;
>-    }
>+    const State &state = context->getState();
>+    Program *program   = state.getLinkedProgram(context);
> 
>-    if (!program->isLinked() || !program->hasLinkedComputeShader())
>+    if (program == nullptr || !program->hasLinkedShaderStage(ShaderType::Compute))
>     {
>-        context->handleError(
>-            InvalidOperation()
>-            << "Program has not been successfully linked, or program contains no compute shaders.");
>+        context->validationError(GL_INVALID_OPERATION, kNoActiveProgramWithComputeShader);
>         return false;
>     }
> 
>     const Caps &caps = context->getCaps();
>     if (numGroupsX > caps.maxComputeWorkGroupCount[0])
>     {
>-        context->handleError(
>-            InvalidValue() << "num_groups_x cannot be greater than MAX_COMPUTE_WORK_GROUP_COUNT[0]="
>-                           << caps.maxComputeWorkGroupCount[0]);
>+        context->validationError(GL_INVALID_VALUE, kExceedsComputeWorkGroupCountX);
>         return false;
>     }
>     if (numGroupsY > caps.maxComputeWorkGroupCount[1])
>     {
>-        context->handleError(
>-            InvalidValue() << "num_groups_y cannot be greater than MAX_COMPUTE_WORK_GROUP_COUNT[1]="
>-                           << caps.maxComputeWorkGroupCount[1]);
>+        context->validationError(GL_INVALID_VALUE, kExceedsComputeWorkGroupCountY);
>         return false;
>     }
>     if (numGroupsZ > caps.maxComputeWorkGroupCount[2])
>     {
>-        context->handleError(
>-            InvalidValue() << "num_groups_z cannot be greater than MAX_COMPUTE_WORK_GROUP_COUNT[2]="
>-                           << caps.maxComputeWorkGroupCount[2]);
>+        context->validationError(GL_INVALID_VALUE, kExceedsComputeWorkGroupCountZ);
>         return false;
>     }
> 
>@@ -1427,8 +1361,50 @@ bool ValidateDispatchCompute(Context *context,
> 
> bool ValidateDispatchComputeIndirect(Context *context, GLintptr indirect)
> {
>-    UNIMPLEMENTED();
>-    return false;
>+    if (context->getClientVersion() < ES_3_1)
>+    {
>+        context->validationError(GL_INVALID_OPERATION, kES31Required);
>+        return false;
>+    }
>+
>+    const State &state = context->getState();
>+    Program *program   = state.getLinkedProgram(context);
>+
>+    if (program == nullptr || !program->hasLinkedShaderStage(ShaderType::Compute))
>+    {
>+        context->validationError(GL_INVALID_OPERATION, kNoActiveProgramWithComputeShader);
>+        return false;
>+    }
>+
>+    if (indirect < 0)
>+    {
>+        context->validationError(GL_INVALID_VALUE, kNegativeOffset);
>+        return false;
>+    }
>+
>+    if ((indirect & (sizeof(GLuint) - 1)) != 0)
>+    {
>+        context->validationError(GL_INVALID_VALUE, kOffsetMustBeMultipleOfUint);
>+        return false;
>+    }
>+
>+    Buffer *dispatchIndirectBuffer = state.getTargetBuffer(BufferBinding::DispatchIndirect);
>+    if (!dispatchIndirectBuffer)
>+    {
>+        context->validationError(GL_INVALID_OPERATION, kDispatchIndirectBufferNotBound);
>+        return false;
>+    }
>+
>+    CheckedNumeric<GLuint64> checkedOffset(static_cast<GLuint64>(indirect));
>+    auto checkedSum = checkedOffset + static_cast<GLuint64>(3 * sizeof(GLuint));
>+    if (!checkedSum.IsValid() ||
>+        checkedSum.ValueOrDie() > static_cast<GLuint64>(dispatchIndirectBuffer->getSize()))
>+    {
>+        context->validationError(GL_INVALID_OPERATION, kInsufficientBufferSize);
>+        return false;
>+    }
>+
>+    return true;
> }
> 
> bool ValidateBindImageTexture(Context *context,
>@@ -1443,27 +1419,25 @@ bool ValidateBindImageTexture(Context *context,
>     GLuint maxImageUnits = context->getCaps().maxImageUnits;
>     if (unit >= maxImageUnits)
>     {
>-        context->handleError(InvalidValue()
>-                             << "unit cannot be greater than or equal than MAX_IMAGE_UNITS = "
>-                             << maxImageUnits);
>+        context->validationError(GL_INVALID_VALUE, kExceedsMaxImageUnits);
>         return false;
>     }
> 
>     if (level < 0)
>     {
>-        context->handleError(InvalidValue() << "level is negative.");
>+        context->validationError(GL_INVALID_VALUE, kNegativeLevel);
>         return false;
>     }
> 
>     if (layer < 0)
>     {
>-        context->handleError(InvalidValue() << "layer is negative.");
>+        context->validationError(GL_INVALID_VALUE, kNegativeLayer);
>         return false;
>     }
> 
>     if (access != GL_READ_ONLY && access != GL_WRITE_ONLY && access != GL_READ_WRITE)
>     {
>-        context->handleError(InvalidEnum() << "access is not one of the supported tokens.");
>+        context->validationError(GL_INVALID_ENUM, kInvalidImageAccess);
>         return false;
>     }
> 
>@@ -1484,8 +1458,7 @@ bool ValidateBindImageTexture(Context *context,
>         case GL_RGBA8_SNORM:
>             break;
>         default:
>-            context->handleError(InvalidValue()
>-                                 << "format is not one of supported image unit formats.");
>+            context->validationError(GL_INVALID_VALUE, kInvalidImageFormat);
>             return false;
>     }
> 
>@@ -1495,15 +1468,13 @@ bool ValidateBindImageTexture(Context *context,
> 
>         if (tex == nullptr)
>         {
>-            context->handleError(InvalidValue()
>-                                 << "texture is not the name of an existing texture object.");
>+            context->validationError(GL_INVALID_VALUE, kMissingTextureName);
>             return false;
>         }
> 
>         if (!tex->getImmutableFormat())
>         {
>-            context->handleError(InvalidOperation()
>-                                 << "texture is not the name of an immutable texture object.");
>+            context->validationError(GL_INVALID_OPERATION, kTextureIsNotImmutable);
>             return false;
>         }
>     }
>@@ -1518,7 +1489,7 @@ bool ValidateGetProgramResourceLocation(Context *context,
> {
>     if (context->getClientVersion() < ES_3_1)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidOperation(), ES31Required);
>+        context->validationError(GL_INVALID_OPERATION, kES31Required);
>         return false;
>     }
> 
>@@ -1530,13 +1501,13 @@ bool ValidateGetProgramResourceLocation(Context *context,
> 
>     if (!programObject->isLinked())
>     {
>-        context->handleError(InvalidOperation() << "Program is not successfully linked.");
>+        context->validationError(GL_INVALID_OPERATION, kProgramNotLinked);
>         return false;
>     }
> 
>     if (!ValidateLocationProgramInterface(programInterface))
>     {
>-        context->handleError(InvalidEnum() << "Invalid program interface.");
>+        context->validationError(GL_INVALID_ENUM, kInvalidProgramInterface);
>         return false;
>     }
>     return true;
>@@ -1554,7 +1525,7 @@ bool ValidateGetProgramResourceiv(Context *context,
> {
>     if (context->getClientVersion() < ES_3_1)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidOperation(), ES31Required);
>+        context->validationError(GL_INVALID_OPERATION, kES31Required);
>         return false;
>     }
> 
>@@ -1565,34 +1536,34 @@ bool ValidateGetProgramResourceiv(Context *context,
>     }
>     if (!ValidateProgramInterface(programInterface))
>     {
>-        context->handleError(InvalidEnum() << "Invalid program interface.");
>+        context->validationError(GL_INVALID_ENUM, kInvalidProgramInterface);
>         return false;
>     }
>     if (propCount <= 0)
>     {
>-        context->handleError(InvalidValue() << "Invalid propCount.");
>+        context->validationError(GL_INVALID_VALUE, kInvalidPropCount);
>         return false;
>     }
>     if (bufSize < 0)
>     {
>-        context->handleError(InvalidValue() << "Invalid bufSize.");
>+        context->validationError(GL_INVALID_VALUE, kNegativeBufSize);
>         return false;
>     }
>     if (!ValidateProgramResourceIndex(programObject, programInterface, index))
>     {
>-        context->handleError(InvalidValue() << "Invalid index: " << index);
>+        context->validationError(GL_INVALID_VALUE, kInvalidProgramResourceIndex);
>         return false;
>     }
>     for (GLsizei i = 0; i < propCount; i++)
>     {
>-        if (!ValidateProgramResourceProperty(props[i]))
>+        if (!ValidateProgramResourceProperty(context, props[i]))
>         {
>-            context->handleError(InvalidEnum() << "Invalid prop.");
>+            context->validationError(GL_INVALID_ENUM, kInvalidProgramResourceProperty);
>             return false;
>         }
>         if (!ValidateProgramResourcePropertyByInterface(props[i], programInterface))
>         {
>-            context->handleError(InvalidOperation() << "Not an allowed prop for interface");
>+            context->validationError(GL_INVALID_OPERATION, kInvalidPropertyForProgramInterface);
>             return false;
>         }
>     }
>@@ -1607,7 +1578,7 @@ bool ValidateGetProgramInterfaceiv(Context *context,
> {
>     if (context->getClientVersion() < ES_3_1)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidOperation(), ES31Required);
>+        context->validationError(GL_INVALID_OPERATION, kES31Required);
>         return false;
>     }
> 
>@@ -1619,7 +1590,7 @@ bool ValidateGetProgramInterfaceiv(Context *context,
> 
>     if (!ValidateProgramInterface(programInterface))
>     {
>-        context->handleError(InvalidEnum() << "Invalid program interface.");
>+        context->validationError(GL_INVALID_ENUM, kInvalidProgramInterface);
>         return false;
>     }
> 
>@@ -1631,14 +1602,13 @@ bool ValidateGetProgramInterfaceiv(Context *context,
>             break;
> 
>         default:
>-            context->handleError(InvalidEnum() << "Unknown property of program interface.");
>+            context->validationError(GL_INVALID_ENUM, kInvalidPname);
>             return false;
>     }
> 
>     if (pname == GL_MAX_NAME_LENGTH && programInterface == GL_ATOMIC_COUNTER_BUFFER)
>     {
>-        context->handleError(InvalidOperation()
>-                             << "Active atomic counter resources are not assigned name strings.");
>+        context->validationError(GL_INVALID_OPERATION, kAtomicCounterResourceName);
>         return false;
>     }
> 
>@@ -1652,9 +1622,7 @@ bool ValidateGetProgramInterfaceiv(Context *context,
>                 break;
> 
>             default:
>-                context->handleError(
>-                    InvalidOperation()
>-                    << "MAX_NUM_ACTIVE_VARIABLES requires a buffer or block interface.");
>+                context->validationError(GL_INVALID_OPERATION, kMaxActiveVariablesInterface);
>                 return false;
>         }
>     }
>@@ -1662,11 +1630,23 @@ bool ValidateGetProgramInterfaceiv(Context *context,
>     return true;
> }
> 
>+bool ValidateGetProgramInterfaceivRobustANGLE(Context *context,
>+                                              GLuint program,
>+                                              GLenum programInterface,
>+                                              GLenum pname,
>+                                              GLsizei bufSize,
>+                                              GLsizei *length,
>+                                              GLint *params)
>+{
>+    UNIMPLEMENTED();
>+    return false;
>+}
>+
> static bool ValidateGenOrDeleteES31(Context *context, GLint n)
> {
>     if (context->getClientVersion() < ES_3_1)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidOperation(), ES31Required);
>+        context->validationError(GL_INVALID_OPERATION, kES31Required);
>         return false;
>     }
> 
>@@ -1687,13 +1667,13 @@ bool ValidateBindProgramPipeline(Context *context, GLuint pipeline)
> {
>     if (context->getClientVersion() < ES_3_1)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidOperation(), ES31Required);
>+        context->validationError(GL_INVALID_OPERATION, kES31Required);
>         return false;
>     }
> 
>     if (!context->isProgramPipelineGenerated(pipeline))
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidOperation(), ObjectNotGenerated);
>+        context->validationError(GL_INVALID_OPERATION, kObjectNotGenerated);
>         return false;
>     }
> 
>@@ -1704,7 +1684,7 @@ bool ValidateIsProgramPipeline(Context *context, GLuint pipeline)
> {
>     if (context->getClientVersion() < ES_3_1)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidOperation(), ES31Required);
>+        context->validationError(GL_INVALID_OPERATION, kES31Required);
>         return false;
>     }
> 
>@@ -1724,7 +1704,7 @@ bool ValidateActiveShaderProgram(Context *context, GLuint pipeline, GLuint progr
> }
> 
> bool ValidateCreateShaderProgramv(Context *context,
>-                                  GLenum type,
>+                                  ShaderType type,
>                                   GLsizei count,
>                                   const GLchar *const *strings)
> {
>@@ -1756,30 +1736,199 @@ bool ValidateGetProgramPipelineInfoLog(Context *context,
> 
> bool ValidateMemoryBarrier(Context *context, GLbitfield barriers)
> {
>-    UNIMPLEMENTED();
>-    return false;
>+    if (context->getClientVersion() < ES_3_1)
>+    {
>+        context->validationError(GL_INVALID_OPERATION, kES31Required);
>+        return false;
>+    }
>+
>+    if (barriers == GL_ALL_BARRIER_BITS)
>+    {
>+        return true;
>+    }
>+
>+    GLbitfield supported_barrier_bits =
>+        GL_VERTEX_ATTRIB_ARRAY_BARRIER_BIT | GL_ELEMENT_ARRAY_BARRIER_BIT | GL_UNIFORM_BARRIER_BIT |
>+        GL_TEXTURE_FETCH_BARRIER_BIT | GL_SHADER_IMAGE_ACCESS_BARRIER_BIT | GL_COMMAND_BARRIER_BIT |
>+        GL_PIXEL_BUFFER_BARRIER_BIT | GL_TEXTURE_UPDATE_BARRIER_BIT | GL_BUFFER_UPDATE_BARRIER_BIT |
>+        GL_FRAMEBUFFER_BARRIER_BIT | GL_TRANSFORM_FEEDBACK_BARRIER_BIT |
>+        GL_ATOMIC_COUNTER_BARRIER_BIT | GL_SHADER_STORAGE_BARRIER_BIT;
>+    if (barriers == 0 || (barriers & ~supported_barrier_bits) != 0)
>+    {
>+        context->validationError(GL_INVALID_VALUE, kInvalidMemoryBarrierBit);
>+        return false;
>+    }
>+
>+    return true;
> }
> 
> bool ValidateMemoryBarrierByRegion(Context *context, GLbitfield barriers)
> {
>-    UNIMPLEMENTED();
>-    return false;
>+    if (context->getClientVersion() < ES_3_1)
>+    {
>+        context->validationError(GL_INVALID_OPERATION, kES31Required);
>+        return false;
>+    }
>+
>+    if (barriers == GL_ALL_BARRIER_BITS)
>+    {
>+        return true;
>+    }
>+
>+    GLbitfield supported_barrier_bits = GL_ATOMIC_COUNTER_BARRIER_BIT | GL_FRAMEBUFFER_BARRIER_BIT |
>+                                        GL_SHADER_IMAGE_ACCESS_BARRIER_BIT |
>+                                        GL_SHADER_STORAGE_BARRIER_BIT |
>+                                        GL_TEXTURE_FETCH_BARRIER_BIT | GL_UNIFORM_BARRIER_BIT;
>+    if (barriers == 0 || (barriers & ~supported_barrier_bits) != 0)
>+    {
>+        context->validationError(GL_INVALID_VALUE, kInvalidMemoryBarrierBit);
>+        return false;
>+    }
>+
>+    return true;
> }
> 
> bool ValidateSampleMaski(Context *context, GLuint maskNumber, GLbitfield mask)
> {
>     if (context->getClientVersion() < ES_3_1)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidOperation(), ES31Required);
>+        context->validationError(GL_INVALID_OPERATION, kES31Required);
>+        return false;
>+    }
>+
>+    return ValidateSampleMaskiBase(context, maskNumber, mask);
>+}
>+
>+bool ValidateFramebufferTextureEXT(Context *context,
>+                                   GLenum target,
>+                                   GLenum attachment,
>+                                   GLuint texture,
>+                                   GLint level)
>+{
>+    if (!context->getExtensions().geometryShader)
>+    {
>+        context->validationError(GL_INVALID_OPERATION, kGeometryShaderExtensionNotEnabled);
>+        return false;
>+    }
>+
>+    if (texture != 0)
>+    {
>+        gl::Texture *tex = context->getTexture(texture);
>+
>+        // [EXT_geometry_shader] Section 9.2.8 "Attaching Texture Images to a Framebuffer"
>+        // An INVALID_VALUE error is generated if <texture> is not the name of a texture object.
>+        // We put this validation before ValidateFramebufferTextureBase because it is an
>+        // INVALID_OPERATION error for both FramebufferTexture2D and FramebufferTextureLayer:
>+        // [OpenGL ES 3.1] Chapter 9.2.8 (FramebufferTexture2D)
>+        // An INVALID_OPERATION error is generated if texture is not zero, and does not name an
>+        // existing texture object of type matching textarget.
>+        // [OpenGL ES 3.1 Chapter 9.2.8 (FramebufferTextureLayer)
>+        // An INVALID_OPERATION error is generated if texture is non-zero and is not the name of a
>+        // three-dimensional or two-dimensional array texture.
>+        if (tex == nullptr)
>+        {
>+            context->validationError(GL_INVALID_VALUE, kInvalidTextureName);
>+            return false;
>+        }
>+
>+        if (!ValidMipLevel(context, tex->getType(), level))
>+        {
>+            context->validationError(GL_INVALID_VALUE, kInvalidMipLevel);
>+            return false;
>+        }
>+    }
>+
>+    if (!ValidateFramebufferTextureBase(context, target, attachment, texture, level))
>+    {
>         return false;
>     }
> 
>-    if (maskNumber >= context->getCaps().maxSampleMaskWords)
>+    return true;
>+}
>+
>+// GL_OES_texture_storage_multisample_2d_array
>+bool ValidateTexStorage3DMultisampleOES(Context *context,
>+                                        TextureType target,
>+                                        GLsizei samples,
>+                                        GLenum sizedinternalformat,
>+                                        GLsizei width,
>+                                        GLsizei height,
>+                                        GLsizei depth,
>+                                        GLboolean fixedsamplelocations)
>+{
>+    if (!context->getExtensions().textureStorageMultisample2DArray)
>     {
>-        ANGLE_VALIDATION_ERR(context, InvalidValue(), InvalidSampleMaskNumber);
>+        context->validationError(GL_INVALID_ENUM, kMultisampleArrayExtensionRequired);
>         return false;
>     }
> 
>+    if (target != TextureType::_2DMultisampleArray)
>+    {
>+        context->validationError(GL_INVALID_ENUM, kTargetMustBeTexture2DMultisampleArrayOES);
>+        return false;
>+    }
>+
>+    if (width < 1 || height < 1 || depth < 1)
>+    {
>+        context->validationError(GL_INVALID_VALUE, kNegativeSize);
>+        return false;
>+    }
>+
>+    return ValidateTexStorageMultisample(context, target, samples, sizedinternalformat, width,
>+                                         height);
>+}
>+
>+bool ValidateTexStorageMem3DMultisampleEXT(Context *context,
>+                                           TextureType target,
>+                                           GLsizei samples,
>+                                           GLenum internalFormat,
>+                                           GLsizei width,
>+                                           GLsizei height,
>+                                           GLsizei depth,
>+                                           GLboolean fixedSampleLocations,
>+                                           GLuint memory,
>+                                           GLuint64 offset)
>+{
>+    if (!context->getExtensions().memoryObject)
>+    {
>+        context->validationError(GL_INVALID_OPERATION, kExtensionNotEnabled);
>+        return false;
>+    }
>+
>+    UNIMPLEMENTED();
>+    return false;
>+}
>+
>+bool ValidateGetProgramResourceLocationIndexEXT(Context *context,
>+                                                GLuint program,
>+                                                GLenum programInterface,
>+                                                const char *name)
>+{
>+    if (!context->getExtensions().blendFuncExtended)
>+    {
>+        context->validationError(GL_INVALID_OPERATION, kExtensionNotEnabled);
>+        return false;
>+    }
>+    if (context->getClientVersion() < ES_3_1)
>+    {
>+        context->validationError(GL_INVALID_OPERATION, kES31Required);
>+        return false;
>+    }
>+    if (programInterface != GL_PROGRAM_OUTPUT)
>+    {
>+        context->validationError(GL_INVALID_ENUM, kProgramInterfaceMustBeProgramOutput);
>+        return false;
>+    }
>+    Program *programObject = GetValidProgram(context, program);
>+    if (!programObject)
>+    {
>+        return false;
>+    }
>+    if (!programObject->isLinked())
>+    {
>+        context->validationError(GL_INVALID_OPERATION, kProgramNotLinked);
>+        return false;
>+    }
>     return true;
> }
> 
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/validationES31.h b/Source/ThirdParty/ANGLE/src/libANGLE/validationES31.h
>index a0b76a5bcb1..0c07ea88a1e 100644
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/validationES31.h
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/validationES31.h
>@@ -1,325 +1,20 @@
> //
>-// Copyright (c) 2016 The ANGLE Project Authors. All rights reserved.
>+// Copyright 2018 The ANGLE Project Authors. All rights reserved.
> // Use of this source code is governed by a BSD-style license that can be
> // found in the LICENSE file.
> //
>-
>-// validationES31.h: Validation functions for OpenGL ES 3.1 entry point parameters
>+// validationES31.h:
>+//  Inlined validation functions for OpenGL ES 3.1 entry points.
> 
> #ifndef LIBANGLE_VALIDATION_ES31_H_
> #define LIBANGLE_VALIDATION_ES31_H_
> 
>-#include <GLES3/gl31.h>
>+#include "libANGLE/ErrorStrings.h"
>+#include "libANGLE/validationES31_autogen.h"
> 
> namespace gl
> {
>-class Context;
>-class ValidationContext;
>-
>-bool ValidateGetBooleani_v(Context *context, GLenum target, GLuint index, GLboolean *data);
>-bool ValidateGetBooleani_vRobustANGLE(Context *context,
>-                                      GLenum target,
>-                                      GLuint index,
>-                                      GLsizei bufSize,
>-                                      GLsizei *length,
>-                                      GLboolean *data);
>-
>-bool ValidateGetTexLevelParameterfv(Context *context,
>-                                    GLenum target,
>-                                    GLint level,
>-                                    GLenum pname,
>-                                    GLfloat *params);
>-bool ValidateGetTexLevelParameteriv(Context *context,
>-                                    GLenum target,
>-                                    GLint level,
>-                                    GLenum pname,
>-                                    GLint *param);
>-
>-bool ValidateTexStorage2DMultisample(Context *context,
>-                                     GLenum target,
>-                                     GLsizei samples,
>-                                     GLint internalFormat,
>-                                     GLsizei width,
>-                                     GLsizei height,
>-                                     GLboolean fixedSampleLocations);
>-bool ValidateGetMultisamplefv(Context *context, GLenum pname, GLuint index, GLfloat *val);
>-
>-bool ValidateDrawIndirectBase(Context *context, GLenum mode, const void *indirect);
>-bool ValidateDrawArraysIndirect(Context *context, GLenum mode, const void *indirect);
>-bool ValidateDrawElementsIndirect(Context *context, GLenum mode, GLenum type, const void *indirect);
>-
>-bool ValidateProgramUniform1i(Context *context, GLuint program, GLint location, GLint v0);
>-bool ValidateProgramUniform2i(Context *context, GLuint program, GLint location, GLint v0, GLint v1);
>-bool ValidateProgramUniform3i(Context *context,
>-                              GLuint program,
>-                              GLint location,
>-                              GLint v0,
>-                              GLint v1,
>-                              GLint v2);
>-bool ValidateProgramUniform4i(Context *context,
>-                              GLuint program,
>-                              GLint location,
>-                              GLint v0,
>-                              GLint v1,
>-                              GLint v2,
>-                              GLint v3);
>-bool ValidateProgramUniform1ui(Context *context, GLuint program, GLint location, GLuint v0);
>-bool ValidateProgramUniform2ui(Context *context,
>-                               GLuint program,
>-                               GLint location,
>-                               GLuint v0,
>-                               GLuint v1);
>-bool ValidateProgramUniform3ui(Context *context,
>-                               GLuint program,
>-                               GLint location,
>-                               GLuint v0,
>-                               GLuint v1,
>-                               GLuint v2);
>-bool ValidateProgramUniform4ui(Context *context,
>-                               GLuint program,
>-                               GLint location,
>-                               GLuint v0,
>-                               GLuint v1,
>-                               GLuint v2,
>-                               GLuint v3);
>-bool ValidateProgramUniform1f(Context *context, GLuint program, GLint location, GLfloat v0);
>-bool ValidateProgramUniform2f(Context *context,
>-                              GLuint program,
>-                              GLint location,
>-                              GLfloat v0,
>-                              GLfloat v1);
>-bool ValidateProgramUniform3f(Context *context,
>-                              GLuint program,
>-                              GLint location,
>-                              GLfloat v0,
>-                              GLfloat v1,
>-                              GLfloat v2);
>-bool ValidateProgramUniform4f(Context *context,
>-                              GLuint program,
>-                              GLint location,
>-                              GLfloat v0,
>-                              GLfloat v1,
>-                              GLfloat v2,
>-                              GLfloat v3);
>-
>-bool ValidateProgramUniform1iv(Context *context,
>-                               GLuint program,
>-                               GLint location,
>-                               GLsizei count,
>-                               const GLint *value);
>-bool ValidateProgramUniform2iv(Context *context,
>-                               GLuint program,
>-                               GLint location,
>-                               GLsizei count,
>-                               const GLint *value);
>-bool ValidateProgramUniform3iv(Context *context,
>-                               GLuint program,
>-                               GLint location,
>-                               GLsizei count,
>-                               const GLint *value);
>-bool ValidateProgramUniform4iv(Context *context,
>-                               GLuint program,
>-                               GLint location,
>-                               GLsizei count,
>-                               const GLint *value);
>-bool ValidateProgramUniform1uiv(Context *context,
>-                                GLuint program,
>-                                GLint location,
>-                                GLsizei count,
>-                                const GLuint *value);
>-bool ValidateProgramUniform2uiv(Context *context,
>-                                GLuint program,
>-                                GLint location,
>-                                GLsizei count,
>-                                const GLuint *value);
>-bool ValidateProgramUniform3uiv(Context *context,
>-                                GLuint program,
>-                                GLint location,
>-                                GLsizei count,
>-                                const GLuint *value);
>-bool ValidateProgramUniform4uiv(Context *context,
>-                                GLuint program,
>-                                GLint location,
>-                                GLsizei count,
>-                                const GLuint *value);
>-bool ValidateProgramUniform1fv(Context *context,
>-                               GLuint program,
>-                               GLint location,
>-                               GLsizei count,
>-                               const GLfloat *value);
>-bool ValidateProgramUniform2fv(Context *context,
>-                               GLuint program,
>-                               GLint location,
>-                               GLsizei count,
>-                               const GLfloat *value);
>-bool ValidateProgramUniform3fv(Context *context,
>-                               GLuint program,
>-                               GLint location,
>-                               GLsizei count,
>-                               const GLfloat *value);
>-bool ValidateProgramUniform4fv(Context *context,
>-                               GLuint program,
>-                               GLint location,
>-                               GLsizei count,
>-                               const GLfloat *value);
>-bool ValidateProgramUniformMatrix2fv(Context *context,
>-                                     GLuint program,
>-                                     GLint location,
>-                                     GLsizei count,
>-                                     GLboolean transpose,
>-                                     const GLfloat *value);
>-bool ValidateProgramUniformMatrix2fv(Context *context,
>-                                     GLuint program,
>-                                     GLint location,
>-                                     GLsizei count,
>-                                     GLboolean transpose,
>-                                     const GLfloat *value);
>-bool ValidateProgramUniformMatrix3fv(Context *context,
>-                                     GLuint program,
>-                                     GLint location,
>-                                     GLsizei count,
>-                                     GLboolean transpose,
>-                                     const GLfloat *value);
>-bool ValidateProgramUniformMatrix4fv(Context *context,
>-                                     GLuint program,
>-                                     GLint location,
>-                                     GLsizei count,
>-                                     GLboolean transpose,
>-                                     const GLfloat *value);
>-bool ValidateProgramUniformMatrix2x3fv(Context *context,
>-                                       GLuint program,
>-                                       GLint location,
>-                                       GLsizei count,
>-                                       GLboolean transpose,
>-                                       const GLfloat *value);
>-bool ValidateProgramUniformMatrix3x2fv(Context *context,
>-                                       GLuint program,
>-                                       GLint location,
>-                                       GLsizei count,
>-                                       GLboolean transpose,
>-                                       const GLfloat *value);
>-bool ValidateProgramUniformMatrix2x4fv(Context *context,
>-                                       GLuint program,
>-                                       GLint location,
>-                                       GLsizei count,
>-                                       GLboolean transpose,
>-                                       const GLfloat *value);
>-bool ValidateProgramUniformMatrix4x2fv(Context *context,
>-                                       GLuint program,
>-                                       GLint location,
>-                                       GLsizei count,
>-                                       GLboolean transpose,
>-                                       const GLfloat *value);
>-bool ValidateProgramUniformMatrix3x4fv(Context *context,
>-                                       GLuint program,
>-                                       GLint location,
>-                                       GLsizei count,
>-                                       GLboolean transpose,
>-                                       const GLfloat *value);
>-bool ValidateProgramUniformMatrix4x3fv(Context *context,
>-                                       GLuint program,
>-                                       GLint location,
>-                                       GLsizei count,
>-                                       GLboolean transpose,
>-                                       const GLfloat *value);
>-
>-bool ValidateFramebufferParameteri(Context *context, GLenum target, GLenum pname, GLint param);
>-bool ValidateGetFramebufferParameteriv(Context *context,
>-                                       GLenum target,
>-                                       GLenum pname,
>-                                       GLint *params);
>-
>-bool ValidateGetProgramResourceIndex(Context *context,
>-                                     GLuint program,
>-                                     GLenum programInterface,
>-                                     const GLchar *name);
>-bool ValidateGetProgramResourceName(Context *context,
>-                                    GLuint program,
>-                                    GLenum programInterface,
>-                                    GLuint index,
>-                                    GLsizei bufSize,
>-                                    GLsizei *length,
>-                                    GLchar *name);
>-bool ValidateGetProgramResourceLocation(Context *context,
>-                                        GLuint program,
>-                                        GLenum programInterface,
>-                                        const GLchar *name);
>-
>-bool ValidateGetProgramResourceiv(Context *context,
>-                                  GLuint program,
>-                                  GLenum programInterface,
>-                                  GLuint index,
>-                                  GLsizei propCount,
>-                                  const GLenum *props,
>-                                  GLsizei bufSize,
>-                                  GLsizei *length,
>-                                  GLint *params);
>-
>-bool ValidateGetProgramInterfaceiv(Context *context,
>-                                   GLuint program,
>-                                   GLenum programInterface,
>-                                   GLenum pname,
>-                                   GLint *params);
>-
>-bool ValidateBindVertexBuffer(ValidationContext *context,
>-                              GLuint bindingIndex,
>-                              GLuint buffer,
>-                              GLintptr offset,
>-                              GLsizei stride);
>-bool ValidateVertexAttribFormat(ValidationContext *context,
>-                                GLuint attribindex,
>-                                GLint size,
>-                                GLenum type,
>-                                GLboolean normalized,
>-                                GLuint relativeoffset);
>-bool ValidateVertexAttribIFormat(ValidationContext *context,
>-                                 GLuint attribindex,
>-                                 GLint size,
>-                                 GLenum type,
>-                                 GLuint relativeoffset);
>-bool ValidateVertexAttribBinding(ValidationContext *context,
>-                                 GLuint attribIndex,
>-                                 GLuint bindingIndex);
>-bool ValidateVertexBindingDivisor(ValidationContext *context, GLuint bindingIndex, GLuint divisor);
>-
>-bool ValidateDispatchCompute(Context *context,
>-                             GLuint numGroupsX,
>-                             GLuint numGroupsY,
>-                             GLuint numGroupsZ);
>-bool ValidateDispatchComputeIndirect(Context *context, GLintptr indirect);
>-
>-bool ValidateBindImageTexture(Context *context,
>-                              GLuint unit,
>-                              GLuint texture,
>-                              GLint level,
>-                              GLboolean layered,
>-                              GLint layer,
>-                              GLenum access,
>-                              GLenum format);
>-
>-bool ValidateGenProgramPipelines(Context *context, GLint n, GLuint *pipelines);
>-bool ValidateDeleteProgramPipelines(Context *context, GLint n, const GLuint *pipelines);
>-bool ValidateBindProgramPipeline(Context *context, GLuint pipeline);
>-bool ValidateIsProgramPipeline(Context *context, GLuint pipeline);
>-bool ValidateUseProgramStages(Context *context, GLuint pipeline, GLbitfield stages, GLuint program);
>-bool ValidateActiveShaderProgram(Context *context, GLuint pipeline, GLuint program);
>-bool ValidateCreateShaderProgramv(Context *context,
>-                                  GLenum type,
>-                                  GLsizei count,
>-                                  const GLchar *const *strings);
>-bool ValidateGetProgramPipelineiv(Context *context, GLuint pipeline, GLenum pname, GLint *params);
>-bool ValidateValidateProgramPipeline(Context *context, GLuint pipeline);
>-bool ValidateGetProgramPipelineInfoLog(Context *context,
>-                                       GLuint pipeline,
>-                                       GLsizei bufSize,
>-                                       GLsizei *length,
>-                                       GLchar *infoLog);
>-
>-bool ValidateMemoryBarrier(Context *context, GLbitfield barriers);
>-bool ValidateMemoryBarrierByRegion(Context *context, GLbitfield barriers);
>-
>-bool ValidateSampleMaski(Context *context, GLuint maskNumber, GLbitfield mask);
>-
>+// Nothing here yet.
> }  // namespace gl
> 
> #endif  // LIBANGLE_VALIDATION_ES31_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/validationES31_autogen.h b/Source/ThirdParty/ANGLE/src/libANGLE/validationES31_autogen.h
>new file mode 100644
>index 00000000000..5f01b27ea42
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/validationES31_autogen.h
>@@ -0,0 +1,298 @@
>+// GENERATED FILE - DO NOT EDIT.
>+// Generated by generate_entry_points.py using data from gl.xml and gl_angle_ext.xml.
>+//
>+// Copyright 2019 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// validationES31_autogen.h:
>+//   Validation functions for the OpenGL ES 3.1 entry points.
>+
>+#ifndef LIBANGLE_VALIDATION_ES31_AUTOGEN_H_
>+#define LIBANGLE_VALIDATION_ES31_AUTOGEN_H_
>+
>+#include "common/PackedEnums.h"
>+
>+namespace gl
>+{
>+class Context;
>+
>+bool ValidateActiveShaderProgram(Context *context, GLuint pipeline, GLuint program);
>+bool ValidateBindImageTexture(Context *context,
>+                              GLuint unit,
>+                              GLuint texture,
>+                              GLint level,
>+                              GLboolean layered,
>+                              GLint layer,
>+                              GLenum access,
>+                              GLenum format);
>+bool ValidateBindProgramPipeline(Context *context, GLuint pipeline);
>+bool ValidateBindVertexBuffer(Context *context,
>+                              GLuint bindingindex,
>+                              GLuint buffer,
>+                              GLintptr offset,
>+                              GLsizei stride);
>+bool ValidateCreateShaderProgramv(Context *context,
>+                                  ShaderType typePacked,
>+                                  GLsizei count,
>+                                  const GLchar *const *strings);
>+bool ValidateDeleteProgramPipelines(Context *context, GLsizei n, const GLuint *pipelines);
>+bool ValidateDispatchCompute(Context *context,
>+                             GLuint num_groups_x,
>+                             GLuint num_groups_y,
>+                             GLuint num_groups_z);
>+bool ValidateDispatchComputeIndirect(Context *context, GLintptr indirect);
>+bool ValidateDrawArraysIndirect(Context *context, PrimitiveMode modePacked, const void *indirect);
>+bool ValidateDrawElementsIndirect(Context *context,
>+                                  PrimitiveMode modePacked,
>+                                  DrawElementsType typePacked,
>+                                  const void *indirect);
>+bool ValidateFramebufferParameteri(Context *context, GLenum target, GLenum pname, GLint param);
>+bool ValidateGenProgramPipelines(Context *context, GLsizei n, GLuint *pipelines);
>+bool ValidateGetBooleani_v(Context *context, GLenum target, GLuint index, GLboolean *data);
>+bool ValidateGetFramebufferParameteriv(Context *context,
>+                                       GLenum target,
>+                                       GLenum pname,
>+                                       GLint *params);
>+bool ValidateGetMultisamplefv(Context *context, GLenum pname, GLuint index, GLfloat *val);
>+bool ValidateGetProgramInterfaceiv(Context *context,
>+                                   GLuint program,
>+                                   GLenum programInterface,
>+                                   GLenum pname,
>+                                   GLint *params);
>+bool ValidateGetProgramPipelineInfoLog(Context *context,
>+                                       GLuint pipeline,
>+                                       GLsizei bufSize,
>+                                       GLsizei *length,
>+                                       GLchar *infoLog);
>+bool ValidateGetProgramPipelineiv(Context *context, GLuint pipeline, GLenum pname, GLint *params);
>+bool ValidateGetProgramResourceIndex(Context *context,
>+                                     GLuint program,
>+                                     GLenum programInterface,
>+                                     const GLchar *name);
>+bool ValidateGetProgramResourceLocation(Context *context,
>+                                        GLuint program,
>+                                        GLenum programInterface,
>+                                        const GLchar *name);
>+bool ValidateGetProgramResourceName(Context *context,
>+                                    GLuint program,
>+                                    GLenum programInterface,
>+                                    GLuint index,
>+                                    GLsizei bufSize,
>+                                    GLsizei *length,
>+                                    GLchar *name);
>+bool ValidateGetProgramResourceiv(Context *context,
>+                                  GLuint program,
>+                                  GLenum programInterface,
>+                                  GLuint index,
>+                                  GLsizei propCount,
>+                                  const GLenum *props,
>+                                  GLsizei bufSize,
>+                                  GLsizei *length,
>+                                  GLint *params);
>+bool ValidateGetTexLevelParameterfv(Context *context,
>+                                    TextureTarget targetPacked,
>+                                    GLint level,
>+                                    GLenum pname,
>+                                    GLfloat *params);
>+bool ValidateGetTexLevelParameteriv(Context *context,
>+                                    TextureTarget targetPacked,
>+                                    GLint level,
>+                                    GLenum pname,
>+                                    GLint *params);
>+bool ValidateIsProgramPipeline(Context *context, GLuint pipeline);
>+bool ValidateMemoryBarrier(Context *context, GLbitfield barriers);
>+bool ValidateMemoryBarrierByRegion(Context *context, GLbitfield barriers);
>+bool ValidateProgramUniform1f(Context *context, GLuint program, GLint location, GLfloat v0);
>+bool ValidateProgramUniform1fv(Context *context,
>+                               GLuint program,
>+                               GLint location,
>+                               GLsizei count,
>+                               const GLfloat *value);
>+bool ValidateProgramUniform1i(Context *context, GLuint program, GLint location, GLint v0);
>+bool ValidateProgramUniform1iv(Context *context,
>+                               GLuint program,
>+                               GLint location,
>+                               GLsizei count,
>+                               const GLint *value);
>+bool ValidateProgramUniform1ui(Context *context, GLuint program, GLint location, GLuint v0);
>+bool ValidateProgramUniform1uiv(Context *context,
>+                                GLuint program,
>+                                GLint location,
>+                                GLsizei count,
>+                                const GLuint *value);
>+bool ValidateProgramUniform2f(Context *context,
>+                              GLuint program,
>+                              GLint location,
>+                              GLfloat v0,
>+                              GLfloat v1);
>+bool ValidateProgramUniform2fv(Context *context,
>+                               GLuint program,
>+                               GLint location,
>+                               GLsizei count,
>+                               const GLfloat *value);
>+bool ValidateProgramUniform2i(Context *context, GLuint program, GLint location, GLint v0, GLint v1);
>+bool ValidateProgramUniform2iv(Context *context,
>+                               GLuint program,
>+                               GLint location,
>+                               GLsizei count,
>+                               const GLint *value);
>+bool ValidateProgramUniform2ui(Context *context,
>+                               GLuint program,
>+                               GLint location,
>+                               GLuint v0,
>+                               GLuint v1);
>+bool ValidateProgramUniform2uiv(Context *context,
>+                                GLuint program,
>+                                GLint location,
>+                                GLsizei count,
>+                                const GLuint *value);
>+bool ValidateProgramUniform3f(Context *context,
>+                              GLuint program,
>+                              GLint location,
>+                              GLfloat v0,
>+                              GLfloat v1,
>+                              GLfloat v2);
>+bool ValidateProgramUniform3fv(Context *context,
>+                               GLuint program,
>+                               GLint location,
>+                               GLsizei count,
>+                               const GLfloat *value);
>+bool ValidateProgramUniform3i(Context *context,
>+                              GLuint program,
>+                              GLint location,
>+                              GLint v0,
>+                              GLint v1,
>+                              GLint v2);
>+bool ValidateProgramUniform3iv(Context *context,
>+                               GLuint program,
>+                               GLint location,
>+                               GLsizei count,
>+                               const GLint *value);
>+bool ValidateProgramUniform3ui(Context *context,
>+                               GLuint program,
>+                               GLint location,
>+                               GLuint v0,
>+                               GLuint v1,
>+                               GLuint v2);
>+bool ValidateProgramUniform3uiv(Context *context,
>+                                GLuint program,
>+                                GLint location,
>+                                GLsizei count,
>+                                const GLuint *value);
>+bool ValidateProgramUniform4f(Context *context,
>+                              GLuint program,
>+                              GLint location,
>+                              GLfloat v0,
>+                              GLfloat v1,
>+                              GLfloat v2,
>+                              GLfloat v3);
>+bool ValidateProgramUniform4fv(Context *context,
>+                               GLuint program,
>+                               GLint location,
>+                               GLsizei count,
>+                               const GLfloat *value);
>+bool ValidateProgramUniform4i(Context *context,
>+                              GLuint program,
>+                              GLint location,
>+                              GLint v0,
>+                              GLint v1,
>+                              GLint v2,
>+                              GLint v3);
>+bool ValidateProgramUniform4iv(Context *context,
>+                               GLuint program,
>+                               GLint location,
>+                               GLsizei count,
>+                               const GLint *value);
>+bool ValidateProgramUniform4ui(Context *context,
>+                               GLuint program,
>+                               GLint location,
>+                               GLuint v0,
>+                               GLuint v1,
>+                               GLuint v2,
>+                               GLuint v3);
>+bool ValidateProgramUniform4uiv(Context *context,
>+                                GLuint program,
>+                                GLint location,
>+                                GLsizei count,
>+                                const GLuint *value);
>+bool ValidateProgramUniformMatrix2fv(Context *context,
>+                                     GLuint program,
>+                                     GLint location,
>+                                     GLsizei count,
>+                                     GLboolean transpose,
>+                                     const GLfloat *value);
>+bool ValidateProgramUniformMatrix2x3fv(Context *context,
>+                                       GLuint program,
>+                                       GLint location,
>+                                       GLsizei count,
>+                                       GLboolean transpose,
>+                                       const GLfloat *value);
>+bool ValidateProgramUniformMatrix2x4fv(Context *context,
>+                                       GLuint program,
>+                                       GLint location,
>+                                       GLsizei count,
>+                                       GLboolean transpose,
>+                                       const GLfloat *value);
>+bool ValidateProgramUniformMatrix3fv(Context *context,
>+                                     GLuint program,
>+                                     GLint location,
>+                                     GLsizei count,
>+                                     GLboolean transpose,
>+                                     const GLfloat *value);
>+bool ValidateProgramUniformMatrix3x2fv(Context *context,
>+                                       GLuint program,
>+                                       GLint location,
>+                                       GLsizei count,
>+                                       GLboolean transpose,
>+                                       const GLfloat *value);
>+bool ValidateProgramUniformMatrix3x4fv(Context *context,
>+                                       GLuint program,
>+                                       GLint location,
>+                                       GLsizei count,
>+                                       GLboolean transpose,
>+                                       const GLfloat *value);
>+bool ValidateProgramUniformMatrix4fv(Context *context,
>+                                     GLuint program,
>+                                     GLint location,
>+                                     GLsizei count,
>+                                     GLboolean transpose,
>+                                     const GLfloat *value);
>+bool ValidateProgramUniformMatrix4x2fv(Context *context,
>+                                       GLuint program,
>+                                       GLint location,
>+                                       GLsizei count,
>+                                       GLboolean transpose,
>+                                       const GLfloat *value);
>+bool ValidateProgramUniformMatrix4x3fv(Context *context,
>+                                       GLuint program,
>+                                       GLint location,
>+                                       GLsizei count,
>+                                       GLboolean transpose,
>+                                       const GLfloat *value);
>+bool ValidateSampleMaski(Context *context, GLuint maskNumber, GLbitfield mask);
>+bool ValidateTexStorage2DMultisample(Context *context,
>+                                     TextureType targetPacked,
>+                                     GLsizei samples,
>+                                     GLenum internalformat,
>+                                     GLsizei width,
>+                                     GLsizei height,
>+                                     GLboolean fixedsamplelocations);
>+bool ValidateUseProgramStages(Context *context, GLuint pipeline, GLbitfield stages, GLuint program);
>+bool ValidateValidateProgramPipeline(Context *context, GLuint pipeline);
>+bool ValidateVertexAttribBinding(Context *context, GLuint attribindex, GLuint bindingindex);
>+bool ValidateVertexAttribFormat(Context *context,
>+                                GLuint attribindex,
>+                                GLint size,
>+                                VertexAttribType typePacked,
>+                                GLboolean normalized,
>+                                GLuint relativeoffset);
>+bool ValidateVertexAttribIFormat(Context *context,
>+                                 GLuint attribindex,
>+                                 GLint size,
>+                                 VertexAttribType typePacked,
>+                                 GLuint relativeoffset);
>+bool ValidateVertexBindingDivisor(Context *context, GLuint bindingindex, GLuint divisor);
>+}  // namespace gl
>+
>+#endif  // LIBANGLE_VALIDATION_ES31_AUTOGEN_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/validationES3_autogen.h b/Source/ThirdParty/ANGLE/src/libANGLE/validationES3_autogen.h
>new file mode 100644
>index 00000000000..89836ccc9fe
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/validationES3_autogen.h
>@@ -0,0 +1,355 @@
>+// GENERATED FILE - DO NOT EDIT.
>+// Generated by generate_entry_points.py using data from gl.xml and gl_angle_ext.xml.
>+//
>+// Copyright 2019 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// validationES3_autogen.h:
>+//   Validation functions for the OpenGL ES 3.0 entry points.
>+
>+#ifndef LIBANGLE_VALIDATION_ES3_AUTOGEN_H_
>+#define LIBANGLE_VALIDATION_ES3_AUTOGEN_H_
>+
>+#include "common/PackedEnums.h"
>+
>+namespace gl
>+{
>+class Context;
>+
>+bool ValidateBeginQuery(Context *context, QueryType targetPacked, GLuint id);
>+bool ValidateBeginTransformFeedback(Context *context, PrimitiveMode primitiveModePacked);
>+bool ValidateBindBufferBase(Context *context,
>+                            BufferBinding targetPacked,
>+                            GLuint index,
>+                            GLuint buffer);
>+bool ValidateBindBufferRange(Context *context,
>+                             BufferBinding targetPacked,
>+                             GLuint index,
>+                             GLuint buffer,
>+                             GLintptr offset,
>+                             GLsizeiptr size);
>+bool ValidateBindSampler(Context *context, GLuint unit, GLuint sampler);
>+bool ValidateBindTransformFeedback(Context *context, GLenum target, GLuint id);
>+bool ValidateBindVertexArray(Context *context, GLuint array);
>+bool ValidateBlitFramebuffer(Context *context,
>+                             GLint srcX0,
>+                             GLint srcY0,
>+                             GLint srcX1,
>+                             GLint srcY1,
>+                             GLint dstX0,
>+                             GLint dstY0,
>+                             GLint dstX1,
>+                             GLint dstY1,
>+                             GLbitfield mask,
>+                             GLenum filter);
>+bool ValidateClearBufferfi(Context *context,
>+                           GLenum buffer,
>+                           GLint drawbuffer,
>+                           GLfloat depth,
>+                           GLint stencil);
>+bool ValidateClearBufferfv(Context *context, GLenum buffer, GLint drawbuffer, const GLfloat *value);
>+bool ValidateClearBufferiv(Context *context, GLenum buffer, GLint drawbuffer, const GLint *value);
>+bool ValidateClearBufferuiv(Context *context, GLenum buffer, GLint drawbuffer, const GLuint *value);
>+bool ValidateClientWaitSync(Context *context, GLsync sync, GLbitfield flags, GLuint64 timeout);
>+bool ValidateCompressedTexImage3D(Context *context,
>+                                  TextureTarget targetPacked,
>+                                  GLint level,
>+                                  GLenum internalformat,
>+                                  GLsizei width,
>+                                  GLsizei height,
>+                                  GLsizei depth,
>+                                  GLint border,
>+                                  GLsizei imageSize,
>+                                  const void *data);
>+bool ValidateCompressedTexSubImage3D(Context *context,
>+                                     TextureTarget targetPacked,
>+                                     GLint level,
>+                                     GLint xoffset,
>+                                     GLint yoffset,
>+                                     GLint zoffset,
>+                                     GLsizei width,
>+                                     GLsizei height,
>+                                     GLsizei depth,
>+                                     GLenum format,
>+                                     GLsizei imageSize,
>+                                     const void *data);
>+bool ValidateCopyBufferSubData(Context *context,
>+                               BufferBinding readTargetPacked,
>+                               BufferBinding writeTargetPacked,
>+                               GLintptr readOffset,
>+                               GLintptr writeOffset,
>+                               GLsizeiptr size);
>+bool ValidateCopyTexSubImage3D(Context *context,
>+                               TextureTarget targetPacked,
>+                               GLint level,
>+                               GLint xoffset,
>+                               GLint yoffset,
>+                               GLint zoffset,
>+                               GLint x,
>+                               GLint y,
>+                               GLsizei width,
>+                               GLsizei height);
>+bool ValidateDeleteQueries(Context *context, GLsizei n, const GLuint *ids);
>+bool ValidateDeleteSamplers(Context *context, GLsizei count, const GLuint *samplers);
>+bool ValidateDeleteSync(Context *context, GLsync sync);
>+bool ValidateDeleteTransformFeedbacks(Context *context, GLsizei n, const GLuint *ids);
>+bool ValidateDeleteVertexArrays(Context *context, GLsizei n, const GLuint *arrays);
>+bool ValidateDrawArraysInstanced(Context *context,
>+                                 PrimitiveMode modePacked,
>+                                 GLint first,
>+                                 GLsizei count,
>+                                 GLsizei instancecount);
>+bool ValidateDrawBuffers(Context *context, GLsizei n, const GLenum *bufs);
>+bool ValidateDrawElementsInstanced(Context *context,
>+                                   PrimitiveMode modePacked,
>+                                   GLsizei count,
>+                                   DrawElementsType typePacked,
>+                                   const void *indices,
>+                                   GLsizei instancecount);
>+bool ValidateDrawRangeElements(Context *context,
>+                               PrimitiveMode modePacked,
>+                               GLuint start,
>+                               GLuint end,
>+                               GLsizei count,
>+                               DrawElementsType typePacked,
>+                               const void *indices);
>+bool ValidateEndQuery(Context *context, QueryType targetPacked);
>+bool ValidateEndTransformFeedback(Context *context);
>+bool ValidateFenceSync(Context *context, GLenum condition, GLbitfield flags);
>+bool ValidateFlushMappedBufferRange(Context *context,
>+                                    BufferBinding targetPacked,
>+                                    GLintptr offset,
>+                                    GLsizeiptr length);
>+bool ValidateFramebufferTextureLayer(Context *context,
>+                                     GLenum target,
>+                                     GLenum attachment,
>+                                     GLuint texture,
>+                                     GLint level,
>+                                     GLint layer);
>+bool ValidateGenQueries(Context *context, GLsizei n, GLuint *ids);
>+bool ValidateGenSamplers(Context *context, GLsizei count, GLuint *samplers);
>+bool ValidateGenTransformFeedbacks(Context *context, GLsizei n, GLuint *ids);
>+bool ValidateGenVertexArrays(Context *context, GLsizei n, GLuint *arrays);
>+bool ValidateGetActiveUniformBlockName(Context *context,
>+                                       GLuint program,
>+                                       GLuint uniformBlockIndex,
>+                                       GLsizei bufSize,
>+                                       GLsizei *length,
>+                                       GLchar *uniformBlockName);
>+bool ValidateGetActiveUniformBlockiv(Context *context,
>+                                     GLuint program,
>+                                     GLuint uniformBlockIndex,
>+                                     GLenum pname,
>+                                     GLint *params);
>+bool ValidateGetActiveUniformsiv(Context *context,
>+                                 GLuint program,
>+                                 GLsizei uniformCount,
>+                                 const GLuint *uniformIndices,
>+                                 GLenum pname,
>+                                 GLint *params);
>+bool ValidateGetBufferParameteri64v(Context *context,
>+                                    BufferBinding targetPacked,
>+                                    GLenum pname,
>+                                    GLint64 *params);
>+bool ValidateGetBufferPointerv(Context *context,
>+                               BufferBinding targetPacked,
>+                               GLenum pname,
>+                               void **params);
>+bool ValidateGetFragDataLocation(Context *context, GLuint program, const GLchar *name);
>+bool ValidateGetInteger64i_v(Context *context, GLenum target, GLuint index, GLint64 *data);
>+bool ValidateGetInteger64v(Context *context, GLenum pname, GLint64 *data);
>+bool ValidateGetIntegeri_v(Context *context, GLenum target, GLuint index, GLint *data);
>+bool ValidateGetInternalformativ(Context *context,
>+                                 GLenum target,
>+                                 GLenum internalformat,
>+                                 GLenum pname,
>+                                 GLsizei bufSize,
>+                                 GLint *params);
>+bool ValidateGetProgramBinary(Context *context,
>+                              GLuint program,
>+                              GLsizei bufSize,
>+                              GLsizei *length,
>+                              GLenum *binaryFormat,
>+                              void *binary);
>+bool ValidateGetQueryObjectuiv(Context *context, GLuint id, GLenum pname, GLuint *params);
>+bool ValidateGetQueryiv(Context *context, QueryType targetPacked, GLenum pname, GLint *params);
>+bool ValidateGetSamplerParameterfv(Context *context, GLuint sampler, GLenum pname, GLfloat *params);
>+bool ValidateGetSamplerParameteriv(Context *context, GLuint sampler, GLenum pname, GLint *params);
>+bool ValidateGetStringi(Context *context, GLenum name, GLuint index);
>+bool ValidateGetSynciv(Context *context,
>+                       GLsync sync,
>+                       GLenum pname,
>+                       GLsizei bufSize,
>+                       GLsizei *length,
>+                       GLint *values);
>+bool ValidateGetTransformFeedbackVarying(Context *context,
>+                                         GLuint program,
>+                                         GLuint index,
>+                                         GLsizei bufSize,
>+                                         GLsizei *length,
>+                                         GLsizei *size,
>+                                         GLenum *type,
>+                                         GLchar *name);
>+bool ValidateGetUniformBlockIndex(Context *context, GLuint program, const GLchar *uniformBlockName);
>+bool ValidateGetUniformIndices(Context *context,
>+                               GLuint program,
>+                               GLsizei uniformCount,
>+                               const GLchar *const *uniformNames,
>+                               GLuint *uniformIndices);
>+bool ValidateGetUniformuiv(Context *context, GLuint program, GLint location, GLuint *params);
>+bool ValidateGetVertexAttribIiv(Context *context, GLuint index, GLenum pname, GLint *params);
>+bool ValidateGetVertexAttribIuiv(Context *context, GLuint index, GLenum pname, GLuint *params);
>+bool ValidateInvalidateFramebuffer(Context *context,
>+                                   GLenum target,
>+                                   GLsizei numAttachments,
>+                                   const GLenum *attachments);
>+bool ValidateInvalidateSubFramebuffer(Context *context,
>+                                      GLenum target,
>+                                      GLsizei numAttachments,
>+                                      const GLenum *attachments,
>+                                      GLint x,
>+                                      GLint y,
>+                                      GLsizei width,
>+                                      GLsizei height);
>+bool ValidateIsQuery(Context *context, GLuint id);
>+bool ValidateIsSampler(Context *context, GLuint sampler);
>+bool ValidateIsSync(Context *context, GLsync sync);
>+bool ValidateIsTransformFeedback(Context *context, GLuint id);
>+bool ValidateIsVertexArray(Context *context, GLuint array);
>+bool ValidateMapBufferRange(Context *context,
>+                            BufferBinding targetPacked,
>+                            GLintptr offset,
>+                            GLsizeiptr length,
>+                            GLbitfield access);
>+bool ValidatePauseTransformFeedback(Context *context);
>+bool ValidateProgramBinary(Context *context,
>+                           GLuint program,
>+                           GLenum binaryFormat,
>+                           const void *binary,
>+                           GLsizei length);
>+bool ValidateProgramParameteri(Context *context, GLuint program, GLenum pname, GLint value);
>+bool ValidateReadBuffer(Context *context, GLenum src);
>+bool ValidateRenderbufferStorageMultisample(Context *context,
>+                                            GLenum target,
>+                                            GLsizei samples,
>+                                            GLenum internalformat,
>+                                            GLsizei width,
>+                                            GLsizei height);
>+bool ValidateResumeTransformFeedback(Context *context);
>+bool ValidateSamplerParameterf(Context *context, GLuint sampler, GLenum pname, GLfloat param);
>+bool ValidateSamplerParameterfv(Context *context,
>+                                GLuint sampler,
>+                                GLenum pname,
>+                                const GLfloat *param);
>+bool ValidateSamplerParameteri(Context *context, GLuint sampler, GLenum pname, GLint param);
>+bool ValidateSamplerParameteriv(Context *context, GLuint sampler, GLenum pname, const GLint *param);
>+bool ValidateTexImage3D(Context *context,
>+                        TextureTarget targetPacked,
>+                        GLint level,
>+                        GLint internalformat,
>+                        GLsizei width,
>+                        GLsizei height,
>+                        GLsizei depth,
>+                        GLint border,
>+                        GLenum format,
>+                        GLenum type,
>+                        const void *pixels);
>+bool ValidateTexStorage2D(Context *context,
>+                          TextureType targetPacked,
>+                          GLsizei levels,
>+                          GLenum internalformat,
>+                          GLsizei width,
>+                          GLsizei height);
>+bool ValidateTexStorage3D(Context *context,
>+                          TextureType targetPacked,
>+                          GLsizei levels,
>+                          GLenum internalformat,
>+                          GLsizei width,
>+                          GLsizei height,
>+                          GLsizei depth);
>+bool ValidateTexSubImage3D(Context *context,
>+                           TextureTarget targetPacked,
>+                           GLint level,
>+                           GLint xoffset,
>+                           GLint yoffset,
>+                           GLint zoffset,
>+                           GLsizei width,
>+                           GLsizei height,
>+                           GLsizei depth,
>+                           GLenum format,
>+                           GLenum type,
>+                           const void *pixels);
>+bool ValidateTransformFeedbackVaryings(Context *context,
>+                                       GLuint program,
>+                                       GLsizei count,
>+                                       const GLchar *const *varyings,
>+                                       GLenum bufferMode);
>+bool ValidateUniform1ui(Context *context, GLint location, GLuint v0);
>+bool ValidateUniform1uiv(Context *context, GLint location, GLsizei count, const GLuint *value);
>+bool ValidateUniform2ui(Context *context, GLint location, GLuint v0, GLuint v1);
>+bool ValidateUniform2uiv(Context *context, GLint location, GLsizei count, const GLuint *value);
>+bool ValidateUniform3ui(Context *context, GLint location, GLuint v0, GLuint v1, GLuint v2);
>+bool ValidateUniform3uiv(Context *context, GLint location, GLsizei count, const GLuint *value);
>+bool ValidateUniform4ui(Context *context,
>+                        GLint location,
>+                        GLuint v0,
>+                        GLuint v1,
>+                        GLuint v2,
>+                        GLuint v3);
>+bool ValidateUniform4uiv(Context *context, GLint location, GLsizei count, const GLuint *value);
>+bool ValidateUniformBlockBinding(Context *context,
>+                                 GLuint program,
>+                                 GLuint uniformBlockIndex,
>+                                 GLuint uniformBlockBinding);
>+bool ValidateUniformMatrix2x3fv(Context *context,
>+                                GLint location,
>+                                GLsizei count,
>+                                GLboolean transpose,
>+                                const GLfloat *value);
>+bool ValidateUniformMatrix2x4fv(Context *context,
>+                                GLint location,
>+                                GLsizei count,
>+                                GLboolean transpose,
>+                                const GLfloat *value);
>+bool ValidateUniformMatrix3x2fv(Context *context,
>+                                GLint location,
>+                                GLsizei count,
>+                                GLboolean transpose,
>+                                const GLfloat *value);
>+bool ValidateUniformMatrix3x4fv(Context *context,
>+                                GLint location,
>+                                GLsizei count,
>+                                GLboolean transpose,
>+                                const GLfloat *value);
>+bool ValidateUniformMatrix4x2fv(Context *context,
>+                                GLint location,
>+                                GLsizei count,
>+                                GLboolean transpose,
>+                                const GLfloat *value);
>+bool ValidateUniformMatrix4x3fv(Context *context,
>+                                GLint location,
>+                                GLsizei count,
>+                                GLboolean transpose,
>+                                const GLfloat *value);
>+bool ValidateUnmapBuffer(Context *context, BufferBinding targetPacked);
>+bool ValidateVertexAttribDivisor(Context *context, GLuint index, GLuint divisor);
>+bool ValidateVertexAttribI4i(Context *context, GLuint index, GLint x, GLint y, GLint z, GLint w);
>+bool ValidateVertexAttribI4iv(Context *context, GLuint index, const GLint *v);
>+bool ValidateVertexAttribI4ui(Context *context,
>+                              GLuint index,
>+                              GLuint x,
>+                              GLuint y,
>+                              GLuint z,
>+                              GLuint w);
>+bool ValidateVertexAttribI4uiv(Context *context, GLuint index, const GLuint *v);
>+bool ValidateVertexAttribIPointer(Context *context,
>+                                  GLuint index,
>+                                  GLint size,
>+                                  VertexAttribType typePacked,
>+                                  GLsizei stride,
>+                                  const void *pointer);
>+bool ValidateWaitSync(Context *context, GLsync sync, GLbitfield flags, GLuint64 timeout);
>+}  // namespace gl
>+
>+#endif  // LIBANGLE_VALIDATION_ES3_AUTOGEN_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/validationESEXT.h b/Source/ThirdParty/ANGLE/src/libANGLE/validationESEXT.h
>new file mode 100644
>index 00000000000..b22ed4e379e
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/validationESEXT.h
>@@ -0,0 +1,20 @@
>+//
>+// Copyright 2018 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// validationESEXT.h:
>+//  Inlined validation functions for OpenGL ES extension entry points.
>+
>+#ifndef LIBANGLE_VALIDATION_ESEXT_H_
>+#define LIBANGLE_VALIDATION_ESEXT_H_
>+
>+#include "libANGLE/ErrorStrings.h"
>+#include "libANGLE/validationESEXT_autogen.h"
>+
>+namespace gl
>+{
>+// Nothing here yet.
>+}  // namespace gl
>+
>+#endif  // LIBANGLE_VALIDATION_ESEXT_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/validationESEXT_autogen.h b/Source/ThirdParty/ANGLE/src/libANGLE/validationESEXT_autogen.h
>new file mode 100644
>index 00000000000..84c0efa8967
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libANGLE/validationESEXT_autogen.h
>@@ -0,0 +1,1195 @@
>+// GENERATED FILE - DO NOT EDIT.
>+// Generated by generate_entry_points.py using data from gl.xml and gl_angle_ext.xml.
>+//
>+// Copyright 2019 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// validationESEXT_autogen.h:
>+//   Validation functions for the OpenGL ES extension entry points.
>+
>+#ifndef LIBANGLE_VALIDATION_ESEXT_AUTOGEN_H_
>+#define LIBANGLE_VALIDATION_ESEXT_AUTOGEN_H_
>+
>+#include "common/PackedEnums.h"
>+
>+namespace gl
>+{
>+class Context;
>+
>+// GL_ANGLE_copy_texture_3d
>+bool ValidateCopyTexture3DANGLE(Context *context,
>+                                GLuint sourceId,
>+                                GLint sourceLevel,
>+                                TextureTarget destTargetPacked,
>+                                GLuint destId,
>+                                GLint destLevel,
>+                                GLint internalFormat,
>+                                GLenum destType,
>+                                GLboolean unpackFlipY,
>+                                GLboolean unpackPremultiplyAlpha,
>+                                GLboolean unpackUnmultiplyAlpha);
>+bool ValidateCopySubTexture3DANGLE(Context *context,
>+                                   GLuint sourceId,
>+                                   GLint sourceLevel,
>+                                   TextureTarget destTargetPacked,
>+                                   GLuint destId,
>+                                   GLint destLevel,
>+                                   GLint xoffset,
>+                                   GLint yoffset,
>+                                   GLint zoffset,
>+                                   GLint x,
>+                                   GLint y,
>+                                   GLint z,
>+                                   GLint width,
>+                                   GLint height,
>+                                   GLint depth,
>+                                   GLboolean unpackFlipY,
>+                                   GLboolean unpackPremultiplyAlpha,
>+                                   GLboolean unpackUnmultiplyAlpha);
>+
>+// GL_ANGLE_framebuffer_blit
>+bool ValidateBlitFramebufferANGLE(Context *context,
>+                                  GLint srcX0,
>+                                  GLint srcY0,
>+                                  GLint srcX1,
>+                                  GLint srcY1,
>+                                  GLint dstX0,
>+                                  GLint dstY0,
>+                                  GLint dstX1,
>+                                  GLint dstY1,
>+                                  GLbitfield mask,
>+                                  GLenum filter);
>+
>+// GL_ANGLE_framebuffer_multisample
>+bool ValidateRenderbufferStorageMultisampleANGLE(Context *context,
>+                                                 GLenum target,
>+                                                 GLsizei samples,
>+                                                 GLenum internalformat,
>+                                                 GLsizei width,
>+                                                 GLsizei height);
>+
>+// GL_ANGLE_instanced_arrays
>+bool ValidateDrawArraysInstancedANGLE(Context *context,
>+                                      PrimitiveMode modePacked,
>+                                      GLint first,
>+                                      GLsizei count,
>+                                      GLsizei primcount);
>+bool ValidateDrawElementsInstancedANGLE(Context *context,
>+                                        PrimitiveMode modePacked,
>+                                        GLsizei count,
>+                                        DrawElementsType typePacked,
>+                                        const void *indices,
>+                                        GLsizei primcount);
>+bool ValidateVertexAttribDivisorANGLE(Context *context, GLuint index, GLuint divisor);
>+
>+// GL_ANGLE_multi_draw
>+bool ValidateMultiDrawArraysANGLE(Context *context,
>+                                  PrimitiveMode modePacked,
>+                                  const GLint *firsts,
>+                                  const GLsizei *counts,
>+                                  GLsizei drawcount);
>+bool ValidateMultiDrawArraysInstancedANGLE(Context *context,
>+                                           PrimitiveMode modePacked,
>+                                           const GLint *firsts,
>+                                           const GLsizei *counts,
>+                                           const GLsizei *instanceCounts,
>+                                           GLsizei drawcount);
>+bool ValidateMultiDrawElementsANGLE(Context *context,
>+                                    PrimitiveMode modePacked,
>+                                    const GLsizei *counts,
>+                                    DrawElementsType typePacked,
>+                                    const GLvoid *const *indices,
>+                                    GLsizei drawcount);
>+bool ValidateMultiDrawElementsInstancedANGLE(Context *context,
>+                                             PrimitiveMode modePacked,
>+                                             const GLsizei *counts,
>+                                             DrawElementsType typePacked,
>+                                             const GLvoid *const *indices,
>+                                             const GLsizei *instanceCounts,
>+                                             GLsizei drawcount);
>+
>+// GL_ANGLE_provoking_vertex
>+bool ValidateProvokingVertexANGLE(Context *context, ProvokingVertex modePacked);
>+
>+// GL_ANGLE_request_extension
>+bool ValidateRequestExtensionANGLE(Context *context, const GLchar *name);
>+
>+// GL_ANGLE_robust_client_memory
>+bool ValidateGetBooleanvRobustANGLE(Context *context,
>+                                    GLenum pname,
>+                                    GLsizei bufSize,
>+                                    GLsizei *length,
>+                                    GLboolean *params);
>+bool ValidateGetBufferParameterivRobustANGLE(Context *context,
>+                                             BufferBinding targetPacked,
>+                                             GLenum pname,
>+                                             GLsizei bufSize,
>+                                             GLsizei *length,
>+                                             GLint *params);
>+bool ValidateGetFloatvRobustANGLE(Context *context,
>+                                  GLenum pname,
>+                                  GLsizei bufSize,
>+                                  GLsizei *length,
>+                                  GLfloat *params);
>+bool ValidateGetFramebufferAttachmentParameterivRobustANGLE(Context *context,
>+                                                            GLenum target,
>+                                                            GLenum attachment,
>+                                                            GLenum pname,
>+                                                            GLsizei bufSize,
>+                                                            GLsizei *length,
>+                                                            GLint *params);
>+bool ValidateGetIntegervRobustANGLE(Context *context,
>+                                    GLenum pname,
>+                                    GLsizei bufSize,
>+                                    GLsizei *length,
>+                                    GLint *data);
>+bool ValidateGetProgramivRobustANGLE(Context *context,
>+                                     GLuint program,
>+                                     GLenum pname,
>+                                     GLsizei bufSize,
>+                                     GLsizei *length,
>+                                     GLint *params);
>+bool ValidateGetRenderbufferParameterivRobustANGLE(Context *context,
>+                                                   GLenum target,
>+                                                   GLenum pname,
>+                                                   GLsizei bufSize,
>+                                                   GLsizei *length,
>+                                                   GLint *params);
>+bool ValidateGetShaderivRobustANGLE(Context *context,
>+                                    GLuint shader,
>+                                    GLenum pname,
>+                                    GLsizei bufSize,
>+                                    GLsizei *length,
>+                                    GLint *params);
>+bool ValidateGetTexParameterfvRobustANGLE(Context *context,
>+                                          TextureType targetPacked,
>+                                          GLenum pname,
>+                                          GLsizei bufSize,
>+                                          GLsizei *length,
>+                                          GLfloat *params);
>+bool ValidateGetTexParameterivRobustANGLE(Context *context,
>+                                          TextureType targetPacked,
>+                                          GLenum pname,
>+                                          GLsizei bufSize,
>+                                          GLsizei *length,
>+                                          GLint *params);
>+bool ValidateGetUniformfvRobustANGLE(Context *context,
>+                                     GLuint program,
>+                                     GLint location,
>+                                     GLsizei bufSize,
>+                                     GLsizei *length,
>+                                     GLfloat *params);
>+bool ValidateGetUniformivRobustANGLE(Context *context,
>+                                     GLuint program,
>+                                     GLint location,
>+                                     GLsizei bufSize,
>+                                     GLsizei *length,
>+                                     GLint *params);
>+bool ValidateGetVertexAttribfvRobustANGLE(Context *context,
>+                                          GLuint index,
>+                                          GLenum pname,
>+                                          GLsizei bufSize,
>+                                          GLsizei *length,
>+                                          GLfloat *params);
>+bool ValidateGetVertexAttribivRobustANGLE(Context *context,
>+                                          GLuint index,
>+                                          GLenum pname,
>+                                          GLsizei bufSize,
>+                                          GLsizei *length,
>+                                          GLint *params);
>+bool ValidateGetVertexAttribPointervRobustANGLE(Context *context,
>+                                                GLuint index,
>+                                                GLenum pname,
>+                                                GLsizei bufSize,
>+                                                GLsizei *length,
>+                                                void **pointer);
>+bool ValidateReadPixelsRobustANGLE(Context *context,
>+                                   GLint x,
>+                                   GLint y,
>+                                   GLsizei width,
>+                                   GLsizei height,
>+                                   GLenum format,
>+                                   GLenum type,
>+                                   GLsizei bufSize,
>+                                   GLsizei *length,
>+                                   GLsizei *columns,
>+                                   GLsizei *rows,
>+                                   void *pixels);
>+bool ValidateTexImage2DRobustANGLE(Context *context,
>+                                   TextureTarget targetPacked,
>+                                   GLint level,
>+                                   GLint internalformat,
>+                                   GLsizei width,
>+                                   GLsizei height,
>+                                   GLint border,
>+                                   GLenum format,
>+                                   GLenum type,
>+                                   GLsizei bufSize,
>+                                   const void *pixels);
>+bool ValidateTexParameterfvRobustANGLE(Context *context,
>+                                       TextureType targetPacked,
>+                                       GLenum pname,
>+                                       GLsizei bufSize,
>+                                       const GLfloat *params);
>+bool ValidateTexParameterivRobustANGLE(Context *context,
>+                                       TextureType targetPacked,
>+                                       GLenum pname,
>+                                       GLsizei bufSize,
>+                                       const GLint *params);
>+bool ValidateTexSubImage2DRobustANGLE(Context *context,
>+                                      TextureTarget targetPacked,
>+                                      GLint level,
>+                                      GLint xoffset,
>+                                      GLint yoffset,
>+                                      GLsizei width,
>+                                      GLsizei height,
>+                                      GLenum format,
>+                                      GLenum type,
>+                                      GLsizei bufSize,
>+                                      const void *pixels);
>+bool ValidateTexImage3DRobustANGLE(Context *context,
>+                                   TextureTarget targetPacked,
>+                                   GLint level,
>+                                   GLint internalformat,
>+                                   GLsizei width,
>+                                   GLsizei height,
>+                                   GLsizei depth,
>+                                   GLint border,
>+                                   GLenum format,
>+                                   GLenum type,
>+                                   GLsizei bufSize,
>+                                   const void *pixels);
>+bool ValidateTexSubImage3DRobustANGLE(Context *context,
>+                                      TextureTarget targetPacked,
>+                                      GLint level,
>+                                      GLint xoffset,
>+                                      GLint yoffset,
>+                                      GLint zoffset,
>+                                      GLsizei width,
>+                                      GLsizei height,
>+                                      GLsizei depth,
>+                                      GLenum format,
>+                                      GLenum type,
>+                                      GLsizei bufSize,
>+                                      const void *pixels);
>+bool ValidateCompressedTexImage2DRobustANGLE(Context *context,
>+                                             TextureTarget targetPacked,
>+                                             GLint level,
>+                                             GLenum internalformat,
>+                                             GLsizei width,
>+                                             GLsizei height,
>+                                             GLint border,
>+                                             GLsizei imageSize,
>+                                             GLsizei dataSize,
>+                                             const GLvoid *data);
>+bool ValidateCompressedTexSubImage2DRobustANGLE(Context *context,
>+                                                TextureTarget targetPacked,
>+                                                GLint level,
>+                                                GLsizei xoffset,
>+                                                GLsizei yoffset,
>+                                                GLsizei width,
>+                                                GLsizei height,
>+                                                GLenum format,
>+                                                GLsizei imageSize,
>+                                                GLsizei dataSize,
>+                                                const GLvoid *data);
>+bool ValidateCompressedTexImage3DRobustANGLE(Context *context,
>+                                             TextureTarget targetPacked,
>+                                             GLint level,
>+                                             GLenum internalformat,
>+                                             GLsizei width,
>+                                             GLsizei height,
>+                                             GLsizei depth,
>+                                             GLint border,
>+                                             GLsizei imageSize,
>+                                             GLsizei dataSize,
>+                                             const GLvoid *data);
>+bool ValidateCompressedTexSubImage3DRobustANGLE(Context *context,
>+                                                TextureTarget targetPacked,
>+                                                GLint level,
>+                                                GLint xoffset,
>+                                                GLint yoffset,
>+                                                GLint zoffset,
>+                                                GLsizei width,
>+                                                GLsizei height,
>+                                                GLsizei depth,
>+                                                GLenum format,
>+                                                GLsizei imageSize,
>+                                                GLsizei dataSize,
>+                                                const GLvoid *data);
>+bool ValidateGetQueryivRobustANGLE(Context *context,
>+                                   QueryType targetPacked,
>+                                   GLenum pname,
>+                                   GLsizei bufSize,
>+                                   GLsizei *length,
>+                                   GLint *params);
>+bool ValidateGetQueryObjectuivRobustANGLE(Context *context,
>+                                          GLuint id,
>+                                          GLenum pname,
>+                                          GLsizei bufSize,
>+                                          GLsizei *length,
>+                                          GLuint *params);
>+bool ValidateGetBufferPointervRobustANGLE(Context *context,
>+                                          BufferBinding targetPacked,
>+                                          GLenum pname,
>+                                          GLsizei bufSize,
>+                                          GLsizei *length,
>+                                          void **params);
>+bool ValidateGetIntegeri_vRobustANGLE(Context *context,
>+                                      GLenum target,
>+                                      GLuint index,
>+                                      GLsizei bufSize,
>+                                      GLsizei *length,
>+                                      GLint *data);
>+bool ValidateGetInternalformativRobustANGLE(Context *context,
>+                                            GLenum target,
>+                                            GLenum internalformat,
>+                                            GLenum pname,
>+                                            GLsizei bufSize,
>+                                            GLsizei *length,
>+                                            GLint *params);
>+bool ValidateGetVertexAttribIivRobustANGLE(Context *context,
>+                                           GLuint index,
>+                                           GLenum pname,
>+                                           GLsizei bufSize,
>+                                           GLsizei *length,
>+                                           GLint *params);
>+bool ValidateGetVertexAttribIuivRobustANGLE(Context *context,
>+                                            GLuint index,
>+                                            GLenum pname,
>+                                            GLsizei bufSize,
>+                                            GLsizei *length,
>+                                            GLuint *params);
>+bool ValidateGetUniformuivRobustANGLE(Context *context,
>+                                      GLuint program,
>+                                      GLint location,
>+                                      GLsizei bufSize,
>+                                      GLsizei *length,
>+                                      GLuint *params);
>+bool ValidateGetActiveUniformBlockivRobustANGLE(Context *context,
>+                                                GLuint program,
>+                                                GLuint uniformBlockIndex,
>+                                                GLenum pname,
>+                                                GLsizei bufSize,
>+                                                GLsizei *length,
>+                                                GLint *params);
>+bool ValidateGetInteger64vRobustANGLE(Context *context,
>+                                      GLenum pname,
>+                                      GLsizei bufSize,
>+                                      GLsizei *length,
>+                                      GLint64 *data);
>+bool ValidateGetInteger64i_vRobustANGLE(Context *context,
>+                                        GLenum target,
>+                                        GLuint index,
>+                                        GLsizei bufSize,
>+                                        GLsizei *length,
>+                                        GLint64 *data);
>+bool ValidateGetBufferParameteri64vRobustANGLE(Context *context,
>+                                               BufferBinding targetPacked,
>+                                               GLenum pname,
>+                                               GLsizei bufSize,
>+                                               GLsizei *length,
>+                                               GLint64 *params);
>+bool ValidateSamplerParameterivRobustANGLE(Context *context,
>+                                           GLuint sampler,
>+                                           GLuint pname,
>+                                           GLsizei bufSize,
>+                                           const GLint *param);
>+bool ValidateSamplerParameterfvRobustANGLE(Context *context,
>+                                           GLuint sampler,
>+                                           GLenum pname,
>+                                           GLsizei bufSize,
>+                                           const GLfloat *param);
>+bool ValidateGetSamplerParameterivRobustANGLE(Context *context,
>+                                              GLuint sampler,
>+                                              GLenum pname,
>+                                              GLsizei bufSize,
>+                                              GLsizei *length,
>+                                              GLint *params);
>+bool ValidateGetSamplerParameterfvRobustANGLE(Context *context,
>+                                              GLuint sampler,
>+                                              GLenum pname,
>+                                              GLsizei bufSize,
>+                                              GLsizei *length,
>+                                              GLfloat *params);
>+bool ValidateGetFramebufferParameterivRobustANGLE(Context *context,
>+                                                  GLuint sampler,
>+                                                  GLenum pname,
>+                                                  GLsizei bufSize,
>+                                                  GLsizei *length,
>+                                                  GLint *params);
>+bool ValidateGetProgramInterfaceivRobustANGLE(Context *context,
>+                                              GLuint program,
>+                                              GLenum programInterface,
>+                                              GLenum pname,
>+                                              GLsizei bufSize,
>+                                              GLsizei *length,
>+                                              GLint *params);
>+bool ValidateGetBooleani_vRobustANGLE(Context *context,
>+                                      GLenum target,
>+                                      GLuint index,
>+                                      GLsizei bufSize,
>+                                      GLsizei *length,
>+                                      GLboolean *data);
>+bool ValidateGetMultisamplefvRobustANGLE(Context *context,
>+                                         GLenum pname,
>+                                         GLuint index,
>+                                         GLsizei bufSize,
>+                                         GLsizei *length,
>+                                         GLfloat *val);
>+bool ValidateGetTexLevelParameterivRobustANGLE(Context *context,
>+                                               TextureTarget targetPacked,
>+                                               GLint level,
>+                                               GLenum pname,
>+                                               GLsizei bufSize,
>+                                               GLsizei *length,
>+                                               GLint *params);
>+bool ValidateGetTexLevelParameterfvRobustANGLE(Context *context,
>+                                               TextureTarget targetPacked,
>+                                               GLint level,
>+                                               GLenum pname,
>+                                               GLsizei bufSize,
>+                                               GLsizei *length,
>+                                               GLfloat *params);
>+bool ValidateGetPointervRobustANGLERobustANGLE(Context *context,
>+                                               GLenum pname,
>+                                               GLsizei bufSize,
>+                                               GLsizei *length,
>+                                               void **params);
>+bool ValidateReadnPixelsRobustANGLE(Context *context,
>+                                    GLint x,
>+                                    GLint y,
>+                                    GLsizei width,
>+                                    GLsizei height,
>+                                    GLenum format,
>+                                    GLenum type,
>+                                    GLsizei bufSize,
>+                                    GLsizei *length,
>+                                    GLsizei *columns,
>+                                    GLsizei *rows,
>+                                    void *data);
>+bool ValidateGetnUniformfvRobustANGLE(Context *context,
>+                                      GLuint program,
>+                                      GLint location,
>+                                      GLsizei bufSize,
>+                                      GLsizei *length,
>+                                      GLfloat *params);
>+bool ValidateGetnUniformivRobustANGLE(Context *context,
>+                                      GLuint program,
>+                                      GLint location,
>+                                      GLsizei bufSize,
>+                                      GLsizei *length,
>+                                      GLint *params);
>+bool ValidateGetnUniformuivRobustANGLE(Context *context,
>+                                       GLuint program,
>+                                       GLint location,
>+                                       GLsizei bufSize,
>+                                       GLsizei *length,
>+                                       GLuint *params);
>+bool ValidateTexParameterIivRobustANGLE(Context *context,
>+                                        TextureType targetPacked,
>+                                        GLenum pname,
>+                                        GLsizei bufSize,
>+                                        const GLint *params);
>+bool ValidateTexParameterIuivRobustANGLE(Context *context,
>+                                         TextureType targetPacked,
>+                                         GLenum pname,
>+                                         GLsizei bufSize,
>+                                         const GLuint *params);
>+bool ValidateGetTexParameterIivRobustANGLE(Context *context,
>+                                           TextureType targetPacked,
>+                                           GLenum pname,
>+                                           GLsizei bufSize,
>+                                           GLsizei *length,
>+                                           GLint *params);
>+bool ValidateGetTexParameterIuivRobustANGLE(Context *context,
>+                                            TextureType targetPacked,
>+                                            GLenum pname,
>+                                            GLsizei bufSize,
>+                                            GLsizei *length,
>+                                            GLuint *params);
>+bool ValidateSamplerParameterIivRobustANGLE(Context *context,
>+                                            GLuint sampler,
>+                                            GLenum pname,
>+                                            GLsizei bufSize,
>+                                            const GLint *param);
>+bool ValidateSamplerParameterIuivRobustANGLE(Context *context,
>+                                             GLuint sampler,
>+                                             GLenum pname,
>+                                             GLsizei bufSize,
>+                                             const GLuint *param);
>+bool ValidateGetSamplerParameterIivRobustANGLE(Context *context,
>+                                               GLuint sampler,
>+                                               GLenum pname,
>+                                               GLsizei bufSize,
>+                                               GLsizei *length,
>+                                               GLint *params);
>+bool ValidateGetSamplerParameterIuivRobustANGLE(Context *context,
>+                                                GLuint sampler,
>+                                                GLenum pname,
>+                                                GLsizei bufSize,
>+                                                GLsizei *length,
>+                                                GLuint *params);
>+bool ValidateGetQueryObjectivRobustANGLE(Context *context,
>+                                         GLuint id,
>+                                         GLenum pname,
>+                                         GLsizei bufSize,
>+                                         GLsizei *length,
>+                                         GLint *params);
>+bool ValidateGetQueryObjecti64vRobustANGLE(Context *context,
>+                                           GLuint id,
>+                                           GLenum pname,
>+                                           GLsizei bufSize,
>+                                           GLsizei *length,
>+                                           GLint64 *params);
>+bool ValidateGetQueryObjectui64vRobustANGLE(Context *context,
>+                                            GLuint id,
>+                                            GLenum pname,
>+                                            GLsizei bufSize,
>+                                            GLsizei *length,
>+                                            GLuint64 *params);
>+
>+// GL_ANGLE_texture_multisample
>+bool ValidateTexStorage2DMultisampleANGLE(Context *context,
>+                                          TextureType targetPacked,
>+                                          GLsizei samples,
>+                                          GLenum internalformat,
>+                                          GLsizei width,
>+                                          GLsizei height,
>+                                          GLboolean fixedsamplelocations);
>+bool ValidateGetTexLevelParameterivANGLE(Context *context,
>+                                         TextureTarget targetPacked,
>+                                         GLint level,
>+                                         GLenum pname,
>+                                         GLint *params);
>+bool ValidateGetTexLevelParameterfvANGLE(Context *context,
>+                                         TextureTarget targetPacked,
>+                                         GLint level,
>+                                         GLenum pname,
>+                                         GLfloat *params);
>+bool ValidateGetMultisamplefvANGLE(Context *context, GLenum pname, GLuint index, GLfloat *val);
>+bool ValidateSampleMaskiANGLE(Context *context, GLuint maskNumber, GLbitfield mask);
>+
>+// GL_ANGLE_translated_shader_source
>+bool ValidateGetTranslatedShaderSourceANGLE(Context *context,
>+                                            GLuint shader,
>+                                            GLsizei bufsize,
>+                                            GLsizei *length,
>+                                            GLchar *source);
>+
>+// GL_CHROMIUM_bind_uniform_location
>+bool ValidateBindUniformLocationCHROMIUM(Context *context,
>+                                         GLuint program,
>+                                         GLint location,
>+                                         const GLchar *name);
>+
>+// GL_CHROMIUM_copy_compressed_texture
>+bool ValidateCompressedCopyTextureCHROMIUM(Context *context, GLuint sourceId, GLuint destId);
>+
>+// GL_CHROMIUM_copy_texture
>+bool ValidateCopyTextureCHROMIUM(Context *context,
>+                                 GLuint sourceId,
>+                                 GLint sourceLevel,
>+                                 TextureTarget destTargetPacked,
>+                                 GLuint destId,
>+                                 GLint destLevel,
>+                                 GLint internalFormat,
>+                                 GLenum destType,
>+                                 GLboolean unpackFlipY,
>+                                 GLboolean unpackPremultiplyAlpha,
>+                                 GLboolean unpackUnmultiplyAlpha);
>+bool ValidateCopySubTextureCHROMIUM(Context *context,
>+                                    GLuint sourceId,
>+                                    GLint sourceLevel,
>+                                    TextureTarget destTargetPacked,
>+                                    GLuint destId,
>+                                    GLint destLevel,
>+                                    GLint xoffset,
>+                                    GLint yoffset,
>+                                    GLint x,
>+                                    GLint y,
>+                                    GLint width,
>+                                    GLint height,
>+                                    GLboolean unpackFlipY,
>+                                    GLboolean unpackPremultiplyAlpha,
>+                                    GLboolean unpackUnmultiplyAlpha);
>+
>+// GL_CHROMIUM_framebuffer_mixed_samples
>+bool ValidateCoverageModulationCHROMIUM(Context *context, GLenum components);
>+bool ValidateMatrixLoadfCHROMIUM(Context *context, GLenum matrixMode, const GLfloat *matrix);
>+bool ValidateMatrixLoadIdentityCHROMIUM(Context *context, GLenum matrixMode);
>+
>+// GL_CHROMIUM_lose_context
>+bool ValidateLoseContextCHROMIUM(Context *context,
>+                                 GraphicsResetStatus currentPacked,
>+                                 GraphicsResetStatus otherPacked);
>+
>+// GL_CHROMIUM_path_rendering
>+bool ValidateGenPathsCHROMIUM(Context *context, GLsizei range);
>+bool ValidateDeletePathsCHROMIUM(Context *context, GLuint first, GLsizei range);
>+bool ValidateIsPathCHROMIUM(Context *context, GLuint path);
>+bool ValidatePathCommandsCHROMIUM(Context *context,
>+                                  GLuint path,
>+                                  GLsizei numCommands,
>+                                  const GLubyte *commands,
>+                                  GLsizei numCoords,
>+                                  GLenum coordType,
>+                                  const void *coords);
>+bool ValidatePathParameterfCHROMIUM(Context *context, GLuint path, GLenum pname, GLfloat value);
>+bool ValidatePathParameteriCHROMIUM(Context *context, GLuint path, GLenum pname, GLint value);
>+bool ValidateGetPathParameterfvCHROMIUM(Context *context,
>+                                        GLuint path,
>+                                        GLenum pname,
>+                                        GLfloat *value);
>+bool ValidateGetPathParameterivCHROMIUM(Context *context, GLuint path, GLenum pname, GLint *value);
>+bool ValidatePathStencilFuncCHROMIUM(Context *context, GLenum func, GLint ref, GLuint mask);
>+bool ValidateStencilFillPathCHROMIUM(Context *context, GLuint path, GLenum fillMode, GLuint mask);
>+bool ValidateStencilStrokePathCHROMIUM(Context *context, GLuint path, GLint reference, GLuint mask);
>+bool ValidateCoverFillPathCHROMIUM(Context *context, GLuint path, GLenum coverMode);
>+bool ValidateCoverStrokePathCHROMIUM(Context *context, GLuint path, GLenum coverMode);
>+bool ValidateStencilThenCoverFillPathCHROMIUM(Context *context,
>+                                              GLuint path,
>+                                              GLenum fillMode,
>+                                              GLuint mask,
>+                                              GLenum coverMode);
>+bool ValidateStencilThenCoverStrokePathCHROMIUM(Context *context,
>+                                                GLuint path,
>+                                                GLint reference,
>+                                                GLuint mask,
>+                                                GLenum coverMode);
>+bool ValidateCoverFillPathInstancedCHROMIUM(Context *context,
>+                                            GLsizei numPath,
>+                                            GLenum pathNameType,
>+                                            const void *paths,
>+                                            GLuint pathBase,
>+                                            GLenum coverMode,
>+                                            GLenum transformType,
>+                                            const GLfloat *transformValues);
>+bool ValidateCoverStrokePathInstancedCHROMIUM(Context *context,
>+                                              GLsizei numPath,
>+                                              GLenum pathNameType,
>+                                              const void *paths,
>+                                              GLuint pathBase,
>+                                              GLenum coverMode,
>+                                              GLenum transformType,
>+                                              const GLfloat *transformValues);
>+bool ValidateStencilStrokePathInstancedCHROMIUM(Context *context,
>+                                                GLsizei numPath,
>+                                                GLenum pathNameType,
>+                                                const void *paths,
>+                                                GLuint pathBase,
>+                                                GLint reference,
>+                                                GLuint mask,
>+                                                GLenum transformType,
>+                                                const GLfloat *transformValues);
>+bool ValidateStencilFillPathInstancedCHROMIUM(Context *context,
>+                                              GLsizei numPaths,
>+                                              GLenum pathNameType,
>+                                              const void *paths,
>+                                              GLuint pathBase,
>+                                              GLenum fillMode,
>+                                              GLuint mask,
>+                                              GLenum transformType,
>+                                              const GLfloat *transformValues);
>+bool ValidateStencilThenCoverFillPathInstancedCHROMIUM(Context *context,
>+                                                       GLsizei numPaths,
>+                                                       GLenum pathNameType,
>+                                                       const void *paths,
>+                                                       GLuint pathBase,
>+                                                       GLenum fillMode,
>+                                                       GLuint mask,
>+                                                       GLenum coverMode,
>+                                                       GLenum transformType,
>+                                                       const GLfloat *transformValues);
>+bool ValidateStencilThenCoverStrokePathInstancedCHROMIUM(Context *context,
>+                                                         GLsizei numPaths,
>+                                                         GLenum pathNameType,
>+                                                         const void *paths,
>+                                                         GLuint pathBase,
>+                                                         GLint reference,
>+                                                         GLuint mask,
>+                                                         GLenum coverMode,
>+                                                         GLenum transformType,
>+                                                         const GLfloat *transformValues);
>+bool ValidateBindFragmentInputLocationCHROMIUM(Context *context,
>+                                               GLuint programs,
>+                                               GLint location,
>+                                               const GLchar *name);
>+bool ValidateProgramPathFragmentInputGenCHROMIUM(Context *context,
>+                                                 GLuint program,
>+                                                 GLint location,
>+                                                 GLenum genMode,
>+                                                 GLint components,
>+                                                 const GLfloat *coeffs);
>+
>+// GL_EXT_blend_func_extended
>+bool ValidateBindFragDataLocationEXT(Context *context,
>+                                     GLuint program,
>+                                     GLuint color,
>+                                     const GLchar *name);
>+bool ValidateBindFragDataLocationIndexedEXT(Context *context,
>+                                            GLuint program,
>+                                            GLuint colorNumber,
>+                                            GLuint index,
>+                                            const GLchar *name);
>+bool ValidateGetFragDataIndexEXT(Context *context, GLuint program, const GLchar *name);
>+bool ValidateGetProgramResourceLocationIndexEXT(Context *context,
>+                                                GLuint program,
>+                                                GLenum programInterface,
>+                                                const GLchar *name);
>+
>+// GL_EXT_debug_marker
>+bool ValidateInsertEventMarkerEXT(Context *context, GLsizei length, const GLchar *marker);
>+bool ValidatePopGroupMarkerEXT(Context *context);
>+bool ValidatePushGroupMarkerEXT(Context *context, GLsizei length, const GLchar *marker);
>+
>+// GL_EXT_discard_framebuffer
>+bool ValidateDiscardFramebufferEXT(Context *context,
>+                                   GLenum target,
>+                                   GLsizei numAttachments,
>+                                   const GLenum *attachments);
>+
>+// GL_EXT_disjoint_timer_query
>+bool ValidateBeginQueryEXT(Context *context, QueryType targetPacked, GLuint id);
>+bool ValidateDeleteQueriesEXT(Context *context, GLsizei n, const GLuint *ids);
>+bool ValidateEndQueryEXT(Context *context, QueryType targetPacked);
>+bool ValidateGenQueriesEXT(Context *context, GLsizei n, GLuint *ids);
>+bool ValidateGetQueryObjecti64vEXT(Context *context, GLuint id, GLenum pname, GLint64 *params);
>+bool ValidateGetQueryObjectivEXT(Context *context, GLuint id, GLenum pname, GLint *params);
>+bool ValidateGetQueryObjectui64vEXT(Context *context, GLuint id, GLenum pname, GLuint64 *params);
>+bool ValidateGetQueryObjectuivEXT(Context *context, GLuint id, GLenum pname, GLuint *params);
>+bool ValidateGetQueryivEXT(Context *context, QueryType targetPacked, GLenum pname, GLint *params);
>+bool ValidateIsQueryEXT(Context *context, GLuint id);
>+bool ValidateQueryCounterEXT(Context *context, GLuint id, QueryType targetPacked);
>+
>+// GL_EXT_draw_buffers
>+bool ValidateDrawBuffersEXT(Context *context, GLsizei n, const GLenum *bufs);
>+
>+// GL_EXT_geometry_shader
>+bool ValidateFramebufferTextureEXT(Context *context,
>+                                   GLenum target,
>+                                   GLenum attachment,
>+                                   GLuint texture,
>+                                   GLint level);
>+
>+// GL_EXT_instanced_arrays
>+bool ValidateDrawArraysInstancedEXT(Context *context,
>+                                    PrimitiveMode modePacked,
>+                                    GLint start,
>+                                    GLsizei count,
>+                                    GLsizei primcount);
>+bool ValidateDrawElementsInstancedEXT(Context *context,
>+                                      PrimitiveMode modePacked,
>+                                      GLsizei count,
>+                                      DrawElementsType typePacked,
>+                                      const void *indices,
>+                                      GLsizei primcount);
>+bool ValidateVertexAttribDivisorEXT(Context *context, GLuint index, GLuint divisor);
>+
>+// GL_EXT_map_buffer_range
>+bool ValidateFlushMappedBufferRangeEXT(Context *context,
>+                                       BufferBinding targetPacked,
>+                                       GLintptr offset,
>+                                       GLsizeiptr length);
>+bool ValidateMapBufferRangeEXT(Context *context,
>+                               BufferBinding targetPacked,
>+                               GLintptr offset,
>+                               GLsizeiptr length,
>+                               GLbitfield access);
>+
>+// GL_EXT_memory_object
>+bool ValidateBufferStorageMemEXT(Context *context,
>+                                 TextureType targetPacked,
>+                                 GLsizeiptr size,
>+                                 GLuint memory,
>+                                 GLuint64 offset);
>+bool ValidateCreateMemoryObjectsEXT(Context *context, GLsizei n, GLuint *memoryObjects);
>+bool ValidateDeleteMemoryObjectsEXT(Context *context, GLsizei n, const GLuint *memoryObjects);
>+bool ValidateGetMemoryObjectParameterivEXT(Context *context,
>+                                           GLuint memoryObject,
>+                                           GLenum pname,
>+                                           GLint *params);
>+bool ValidateGetUnsignedBytevEXT(Context *context, GLenum pname, GLubyte *data);
>+bool ValidateGetUnsignedBytei_vEXT(Context *context, GLenum target, GLuint index, GLubyte *data);
>+bool ValidateIsMemoryObjectEXT(Context *context, GLuint memoryObject);
>+bool ValidateMemoryObjectParameterivEXT(Context *context,
>+                                        GLuint memoryObject,
>+                                        GLenum pname,
>+                                        const GLint *params);
>+bool ValidateTexStorageMem2DEXT(Context *context,
>+                                TextureType targetPacked,
>+                                GLsizei levels,
>+                                GLenum internalFormat,
>+                                GLsizei width,
>+                                GLsizei height,
>+                                GLuint memory,
>+                                GLuint64 offset);
>+bool ValidateTexStorageMem2DMultisampleEXT(Context *context,
>+                                           TextureType targetPacked,
>+                                           GLsizei samples,
>+                                           GLenum internalFormat,
>+                                           GLsizei width,
>+                                           GLsizei height,
>+                                           GLboolean fixedSampleLocations,
>+                                           GLuint memory,
>+                                           GLuint64 offset);
>+bool ValidateTexStorageMem3DEXT(Context *context,
>+                                TextureType targetPacked,
>+                                GLsizei levels,
>+                                GLenum internalFormat,
>+                                GLsizei width,
>+                                GLsizei height,
>+                                GLsizei depth,
>+                                GLuint memory,
>+                                GLuint64 offset);
>+bool ValidateTexStorageMem3DMultisampleEXT(Context *context,
>+                                           TextureType targetPacked,
>+                                           GLsizei samples,
>+                                           GLenum internalFormat,
>+                                           GLsizei width,
>+                                           GLsizei height,
>+                                           GLsizei depth,
>+                                           GLboolean fixedSampleLocations,
>+                                           GLuint memory,
>+                                           GLuint64 offset);
>+
>+// GL_EXT_memory_object_fd
>+bool ValidateImportMemoryFdEXT(Context *context,
>+                               GLuint memory,
>+                               GLuint64 size,
>+                               HandleType handleTypePacked,
>+                               GLint fd);
>+
>+// GL_EXT_occlusion_query_boolean
>+
>+// GL_EXT_robustness
>+bool ValidateGetGraphicsResetStatusEXT(Context *context);
>+bool ValidateGetnUniformfvEXT(Context *context,
>+                              GLuint program,
>+                              GLint location,
>+                              GLsizei bufSize,
>+                              GLfloat *params);
>+bool ValidateGetnUniformivEXT(Context *context,
>+                              GLuint program,
>+                              GLint location,
>+                              GLsizei bufSize,
>+                              GLint *params);
>+bool ValidateReadnPixelsEXT(Context *context,
>+                            GLint x,
>+                            GLint y,
>+                            GLsizei width,
>+                            GLsizei height,
>+                            GLenum format,
>+                            GLenum type,
>+                            GLsizei bufSize,
>+                            void *data);
>+
>+// GL_EXT_semaphore
>+bool ValidateDeleteSemaphoresEXT(Context *context, GLsizei n, const GLuint *semaphores);
>+bool ValidateGenSemaphoresEXT(Context *context, GLsizei n, GLuint *semaphores);
>+bool ValidateGetSemaphoreParameterui64vEXT(Context *context,
>+                                           GLuint semaphore,
>+                                           GLenum pname,
>+                                           GLuint64 *params);
>+bool ValidateIsSemaphoreEXT(Context *context, GLuint semaphore);
>+bool ValidateSemaphoreParameterui64vEXT(Context *context,
>+                                        GLuint semaphore,
>+                                        GLenum pname,
>+                                        const GLuint64 *params);
>+bool ValidateSignalSemaphoreEXT(Context *context,
>+                                GLuint semaphore,
>+                                GLuint numBufferBarriers,
>+                                const GLuint *buffers,
>+                                GLuint numTextureBarriers,
>+                                const GLuint *textures,
>+                                const GLenum *dstLayouts);
>+bool ValidateWaitSemaphoreEXT(Context *context,
>+                              GLuint semaphore,
>+                              GLuint numBufferBarriers,
>+                              const GLuint *buffers,
>+                              GLuint numTextureBarriers,
>+                              const GLuint *textures,
>+                              const GLenum *srcLayouts);
>+
>+// GL_EXT_semaphore_fd
>+bool ValidateImportSemaphoreFdEXT(Context *context,
>+                                  GLuint semaphore,
>+                                  HandleType handleTypePacked,
>+                                  GLint fd);
>+
>+// GL_EXT_texture_storage
>+bool ValidateTexStorage1DEXT(Context *context,
>+                             GLenum target,
>+                             GLsizei levels,
>+                             GLenum internalformat,
>+                             GLsizei width);
>+bool ValidateTexStorage2DEXT(Context *context,
>+                             TextureType targetPacked,
>+                             GLsizei levels,
>+                             GLenum internalformat,
>+                             GLsizei width,
>+                             GLsizei height);
>+bool ValidateTexStorage3DEXT(Context *context,
>+                             TextureType targetPacked,
>+                             GLsizei levels,
>+                             GLenum internalformat,
>+                             GLsizei width,
>+                             GLsizei height,
>+                             GLsizei depth);
>+
>+// GL_KHR_debug
>+bool ValidateDebugMessageCallbackKHR(Context *context,
>+                                     GLDEBUGPROCKHR callback,
>+                                     const void *userParam);
>+bool ValidateDebugMessageControlKHR(Context *context,
>+                                    GLenum source,
>+                                    GLenum type,
>+                                    GLenum severity,
>+                                    GLsizei count,
>+                                    const GLuint *ids,
>+                                    GLboolean enabled);
>+bool ValidateDebugMessageInsertKHR(Context *context,
>+                                   GLenum source,
>+                                   GLenum type,
>+                                   GLuint id,
>+                                   GLenum severity,
>+                                   GLsizei length,
>+                                   const GLchar *buf);
>+bool ValidateGetDebugMessageLogKHR(Context *context,
>+                                   GLuint count,
>+                                   GLsizei bufSize,
>+                                   GLenum *sources,
>+                                   GLenum *types,
>+                                   GLuint *ids,
>+                                   GLenum *severities,
>+                                   GLsizei *lengths,
>+                                   GLchar *messageLog);
>+bool ValidateGetObjectLabelKHR(Context *context,
>+                               GLenum identifier,
>+                               GLuint name,
>+                               GLsizei bufSize,
>+                               GLsizei *length,
>+                               GLchar *label);
>+bool ValidateGetObjectPtrLabelKHR(Context *context,
>+                                  const void *ptr,
>+                                  GLsizei bufSize,
>+                                  GLsizei *length,
>+                                  GLchar *label);
>+bool ValidateGetPointervKHR(Context *context, GLenum pname, void **params);
>+bool ValidateObjectLabelKHR(Context *context,
>+                            GLenum identifier,
>+                            GLuint name,
>+                            GLsizei length,
>+                            const GLchar *label);
>+bool ValidateObjectPtrLabelKHR(Context *context,
>+                               const void *ptr,
>+                               GLsizei length,
>+                               const GLchar *label);
>+bool ValidatePopDebugGroupKHR(Context *context);
>+bool ValidatePushDebugGroupKHR(Context *context,
>+                               GLenum source,
>+                               GLuint id,
>+                               GLsizei length,
>+                               const GLchar *message);
>+
>+// GL_KHR_parallel_shader_compile
>+bool ValidateMaxShaderCompilerThreadsKHR(Context *context, GLuint count);
>+
>+// GL_NV_fence
>+bool ValidateDeleteFencesNV(Context *context, GLsizei n, const GLuint *fences);
>+bool ValidateFinishFenceNV(Context *context, GLuint fence);
>+bool ValidateGenFencesNV(Context *context, GLsizei n, GLuint *fences);
>+bool ValidateGetFenceivNV(Context *context, GLuint fence, GLenum pname, GLint *params);
>+bool ValidateIsFenceNV(Context *context, GLuint fence);
>+bool ValidateSetFenceNV(Context *context, GLuint fence, GLenum condition);
>+bool ValidateTestFenceNV(Context *context, GLuint fence);
>+
>+// GL_OES_EGL_image
>+bool ValidateEGLImageTargetRenderbufferStorageOES(Context *context,
>+                                                  GLenum target,
>+                                                  GLeglImageOES image);
>+bool ValidateEGLImageTargetTexture2DOES(Context *context,
>+                                        TextureType targetPacked,
>+                                        GLeglImageOES image);
>+
>+// GL_OES_draw_texture
>+bool ValidateDrawTexfOES(Context *context,
>+                         GLfloat x,
>+                         GLfloat y,
>+                         GLfloat z,
>+                         GLfloat width,
>+                         GLfloat height);
>+bool ValidateDrawTexfvOES(Context *context, const GLfloat *coords);
>+bool ValidateDrawTexiOES(Context *context, GLint x, GLint y, GLint z, GLint width, GLint height);
>+bool ValidateDrawTexivOES(Context *context, const GLint *coords);
>+bool ValidateDrawTexsOES(Context *context,
>+                         GLshort x,
>+                         GLshort y,
>+                         GLshort z,
>+                         GLshort width,
>+                         GLshort height);
>+bool ValidateDrawTexsvOES(Context *context, const GLshort *coords);
>+bool ValidateDrawTexxOES(Context *context,
>+                         GLfixed x,
>+                         GLfixed y,
>+                         GLfixed z,
>+                         GLfixed width,
>+                         GLfixed height);
>+bool ValidateDrawTexxvOES(Context *context, const GLfixed *coords);
>+
>+// GL_OES_framebuffer_object
>+bool ValidateBindFramebufferOES(Context *context, GLenum target, GLuint framebuffer);
>+bool ValidateBindRenderbufferOES(Context *context, GLenum target, GLuint renderbuffer);
>+bool ValidateCheckFramebufferStatusOES(Context *context, GLenum target);
>+bool ValidateDeleteFramebuffersOES(Context *context, GLsizei n, const GLuint *framebuffers);
>+bool ValidateDeleteRenderbuffersOES(Context *context, GLsizei n, const GLuint *renderbuffers);
>+bool ValidateFramebufferRenderbufferOES(Context *context,
>+                                        GLenum target,
>+                                        GLenum attachment,
>+                                        GLenum renderbuffertarget,
>+                                        GLuint renderbuffer);
>+bool ValidateFramebufferTexture2DOES(Context *context,
>+                                     GLenum target,
>+                                     GLenum attachment,
>+                                     TextureTarget textargetPacked,
>+                                     GLuint texture,
>+                                     GLint level);
>+bool ValidateGenFramebuffersOES(Context *context, GLsizei n, GLuint *framebuffers);
>+bool ValidateGenRenderbuffersOES(Context *context, GLsizei n, GLuint *renderbuffers);
>+bool ValidateGenerateMipmapOES(Context *context, TextureType targetPacked);
>+bool ValidateGetFramebufferAttachmentParameterivOES(Context *context,
>+                                                    GLenum target,
>+                                                    GLenum attachment,
>+                                                    GLenum pname,
>+                                                    GLint *params);
>+bool ValidateGetRenderbufferParameterivOES(Context *context,
>+                                           GLenum target,
>+                                           GLenum pname,
>+                                           GLint *params);
>+bool ValidateIsFramebufferOES(Context *context, GLuint framebuffer);
>+bool ValidateIsRenderbufferOES(Context *context, GLuint renderbuffer);
>+bool ValidateRenderbufferStorageOES(Context *context,
>+                                    GLenum target,
>+                                    GLenum internalformat,
>+                                    GLsizei width,
>+                                    GLsizei height);
>+
>+// GL_OES_get_program_binary
>+bool ValidateGetProgramBinaryOES(Context *context,
>+                                 GLuint program,
>+                                 GLsizei bufSize,
>+                                 GLsizei *length,
>+                                 GLenum *binaryFormat,
>+                                 void *binary);
>+bool ValidateProgramBinaryOES(Context *context,
>+                              GLuint program,
>+                              GLenum binaryFormat,
>+                              const void *binary,
>+                              GLint length);
>+
>+// GL_OES_mapbuffer
>+bool ValidateGetBufferPointervOES(Context *context,
>+                                  BufferBinding targetPacked,
>+                                  GLenum pname,
>+                                  void **params);
>+bool ValidateMapBufferOES(Context *context, BufferBinding targetPacked, GLenum access);
>+bool ValidateUnmapBufferOES(Context *context, BufferBinding targetPacked);
>+
>+// GL_OES_matrix_palette
>+bool ValidateCurrentPaletteMatrixOES(Context *context, GLuint matrixpaletteindex);
>+bool ValidateLoadPaletteFromModelViewMatrixOES(Context *context);
>+bool ValidateMatrixIndexPointerOES(Context *context,
>+                                   GLint size,
>+                                   GLenum type,
>+                                   GLsizei stride,
>+                                   const void *pointer);
>+bool ValidateWeightPointerOES(Context *context,
>+                              GLint size,
>+                              GLenum type,
>+                              GLsizei stride,
>+                              const void *pointer);
>+
>+// GL_OES_point_size_array
>+bool ValidatePointSizePointerOES(Context *context,
>+                                 VertexAttribType typePacked,
>+                                 GLsizei stride,
>+                                 const void *pointer);
>+
>+// GL_OES_query_matrix
>+bool ValidateQueryMatrixxOES(Context *context, GLfixed *mantissa, GLint *exponent);
>+
>+// GL_OES_texture_border_clamp
>+bool ValidateGetSamplerParameterIivOES(Context *context,
>+                                       GLuint sampler,
>+                                       GLenum pname,
>+                                       GLint *params);
>+bool ValidateGetSamplerParameterIuivOES(Context *context,
>+                                        GLuint sampler,
>+                                        GLenum pname,
>+                                        GLuint *params);
>+bool ValidateGetTexParameterIivOES(Context *context,
>+                                   TextureType targetPacked,
>+                                   GLenum pname,
>+                                   GLint *params);
>+bool ValidateGetTexParameterIuivOES(Context *context,
>+                                    TextureType targetPacked,
>+                                    GLenum pname,
>+                                    GLuint *params);
>+bool ValidateSamplerParameterIivOES(Context *context,
>+                                    GLuint sampler,
>+                                    GLenum pname,
>+                                    const GLint *param);
>+bool ValidateSamplerParameterIuivOES(Context *context,
>+                                     GLuint sampler,
>+                                     GLenum pname,
>+                                     const GLuint *param);
>+bool ValidateTexParameterIivOES(Context *context,
>+                                TextureType targetPacked,
>+                                GLenum pname,
>+                                const GLint *params);
>+bool ValidateTexParameterIuivOES(Context *context,
>+                                 TextureType targetPacked,
>+                                 GLenum pname,
>+                                 const GLuint *params);
>+
>+// GL_OES_texture_cube_map
>+bool ValidateGetTexGenfvOES(Context *context, GLenum coord, GLenum pname, GLfloat *params);
>+bool ValidateGetTexGenivOES(Context *context, GLenum coord, GLenum pname, GLint *params);
>+bool ValidateGetTexGenxvOES(Context *context, GLenum coord, GLenum pname, GLfixed *params);
>+bool ValidateTexGenfOES(Context *context, GLenum coord, GLenum pname, GLfloat param);
>+bool ValidateTexGenfvOES(Context *context, GLenum coord, GLenum pname, const GLfloat *params);
>+bool ValidateTexGeniOES(Context *context, GLenum coord, GLenum pname, GLint param);
>+bool ValidateTexGenivOES(Context *context, GLenum coord, GLenum pname, const GLint *params);
>+bool ValidateTexGenxOES(Context *context, GLenum coord, GLenum pname, GLfixed param);
>+bool ValidateTexGenxvOES(Context *context, GLenum coord, GLenum pname, const GLfixed *params);
>+
>+// GL_OES_texture_storage_multisample_2d_array
>+bool ValidateTexStorage3DMultisampleOES(Context *context,
>+                                        TextureType targetPacked,
>+                                        GLsizei samples,
>+                                        GLenum internalformat,
>+                                        GLsizei width,
>+                                        GLsizei height,
>+                                        GLsizei depth,
>+                                        GLboolean fixedsamplelocations);
>+
>+// GL_OES_vertex_array_object
>+bool ValidateBindVertexArrayOES(Context *context, GLuint array);
>+bool ValidateDeleteVertexArraysOES(Context *context, GLsizei n, const GLuint *arrays);
>+bool ValidateGenVertexArraysOES(Context *context, GLsizei n, GLuint *arrays);
>+bool ValidateIsVertexArrayOES(Context *context, GLuint array);
>+
>+// GL_OVR_multiview
>+bool ValidateFramebufferTextureMultiviewOVR(Context *context,
>+                                            GLenum target,
>+                                            GLenum attachment,
>+                                            GLuint texture,
>+                                            GLint level,
>+                                            GLint baseViewIndex,
>+                                            GLsizei numViews);
>+
>+// GL_OVR_multiview2
>+}  // namespace gl
>+
>+#endif  // LIBANGLE_VALIDATION_ESEXT_AUTOGEN_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/validationES_unittest.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/validationES_unittest.cpp
>deleted file mode 100644
>index e5a6fa09dad..00000000000
>--- a/Source/ThirdParty/ANGLE/src/libANGLE/validationES_unittest.cpp
>+++ /dev/null
>@@ -1,137 +0,0 @@
>-//
>-// Copyright 2015 The ANGLE Project Authors. All rights reserved.
>-// Use of this source code is governed by a BSD-style license that can be
>-// found in the LICENSE file.
>-//
>-// validationES unit tests:
>-//   Unit tests for general ES validation functions.
>-//
>-
>-#include <gmock/gmock.h>
>-#include <gtest/gtest.h>
>-
>-#include "libANGLE/ContextState.h"
>-#include "libANGLE/ErrorStrings.h"
>-#include "libANGLE/VaryingPacking.h"
>-#include "libANGLE/renderer/FramebufferImpl_mock.h"
>-#include "libANGLE/renderer/ProgramImpl_mock.h"
>-#include "libANGLE/renderer/TextureImpl_mock.h"
>-#include "libANGLE/validationES.h"
>-#include "tests/angle_unittests_utils.h"
>-
>-using namespace gl;
>-using namespace rx;
>-using testing::_;
>-using testing::NiceMock;
>-using testing::Return;
>-
>-namespace
>-{
>-
>-class MockValidationContext : public ValidationContext
>-{
>-  public:
>-    MockValidationContext(const ValidationContext *shareContext,
>-                          TextureManager *shareTextures,
>-                          const Version &version,
>-                          State *state,
>-                          const Caps &caps,
>-                          const TextureCapsMap &textureCaps,
>-                          const Extensions &extensions,
>-                          const Limitations &limitations,
>-                          bool skipValidation)
>-        : ValidationContext(shareContext,
>-                            shareTextures,
>-                            version,
>-                            state,
>-                            caps,
>-                            textureCaps,
>-                            extensions,
>-                            limitations,
>-                            skipValidation)
>-    {
>-    }
>-
>-    MOCK_METHOD1(handleError, void(const Error &));
>-};
>-
>-// Test that ANGLE generates an INVALID_OPERATION when validating index data that uses a value
>-// larger than MAX_ELEMENT_INDEX and robust access is not enabled. Not specified in the GLES 3 spec,
>-// it's undefined behaviour, but we want a test to ensure we maintain this behaviour. TODO(jmadill):
>-// Re-enable when framebuffer sync state doesn't happen in validation. Also broken because of change
>-// of api of the state initialize method.
>-TEST(ValidationESTest, DISABLED_DrawElementsWithMaxIndexGivesError)
>-{
>-    auto framebufferImpl = MakeFramebufferMock();
>-    auto programImpl     = MakeProgramMock();
>-
>-    // TODO(jmadill): Generalize some of this code so we can re-use it for other tests.
>-    NiceMock<MockGLFactory> mockFactory;
>-    EXPECT_CALL(mockFactory, createFramebuffer(_)).WillOnce(Return(framebufferImpl));
>-    EXPECT_CALL(mockFactory, createProgram(_)).WillOnce(Return(programImpl));
>-    EXPECT_CALL(mockFactory, createVertexArray(_)).WillOnce(Return(nullptr));
>-
>-    State state;
>-    Caps caps;
>-    TextureCapsMap textureCaps;
>-    Extensions extensions;
>-    Limitations limitations;
>-
>-    // Set some basic caps.
>-    caps.maxElementIndex     = 100;
>-    caps.maxDrawBuffers      = 1;
>-    caps.maxColorAttachments = 1;
>-    state.initialize(nullptr, false, true, true, false, false);
>-
>-    NiceMock<MockTextureImpl> *textureImpl = new NiceMock<MockTextureImpl>();
>-    EXPECT_CALL(mockFactory, createTexture(_)).WillOnce(Return(textureImpl));
>-    EXPECT_CALL(*textureImpl, setStorage(_, _, _, _, _)).WillOnce(Return(gl::NoError()));
>-    EXPECT_CALL(*textureImpl, destructor()).Times(1).RetiresOnSaturation();
>-
>-    Texture *texture = new Texture(&mockFactory, 0, GL_TEXTURE_2D);
>-    texture->addRef();
>-    EXPECT_FALSE(
>-        texture->setStorage(nullptr, GL_TEXTURE_2D, 1, GL_RGBA8, Extents(1, 1, 0)).isError());
>-
>-    VertexArray *vertexArray = new VertexArray(&mockFactory, 0, 1, 1);
>-    Framebuffer *framebuffer = new Framebuffer(caps, &mockFactory, 1);
>-    framebuffer->setAttachment(nullptr, GL_FRAMEBUFFER_DEFAULT, GL_BACK, ImageIndex::Make2D(0),
>-                               texture);
>-
>-    Program *program = new Program(&mockFactory, nullptr, 1);
>-
>-    state.setVertexArrayBinding(vertexArray);
>-    state.setDrawFramebufferBinding(framebuffer);
>-    state.setProgram(nullptr, program);
>-
>-    NiceMock<MockValidationContext> testContext(nullptr, nullptr, Version(3, 0), &state, caps,
>-                                                textureCaps, extensions, limitations, false);
>-
>-    // Set the expectation for the validation error here.
>-
>-    Error expectedError(gl::InvalidOperation() << kErrorExceedsMaxElement);
>-    EXPECT_CALL(testContext, handleError(expectedError)).Times(1);
>-
>-    // Call once with maximum index, and once with an excessive index.
>-    GLuint indexData[] = {0, 1, static_cast<GLuint>(caps.maxElementIndex - 1),
>-                          3, 4, static_cast<GLuint>(caps.maxElementIndex)};
>-    EXPECT_TRUE(
>-        ValidateDrawElementsCommon(&testContext, GL_TRIANGLES, 3, GL_UNSIGNED_INT, indexData, 1));
>-    if (!testContext.getExtensions().robustBufferAccessBehavior)
>-    {
>-        EXPECT_FALSE(ValidateDrawElementsCommon(&testContext, GL_TRIANGLES, 6, GL_UNSIGNED_INT,
>-                                                indexData, 2));
>-    }
>-
>-    texture->release(nullptr);
>-
>-    state.setVertexArrayBinding(nullptr);
>-    state.setDrawFramebufferBinding(nullptr);
>-    state.setProgram(nullptr, nullptr);
>-
>-    vertexArray->onDestroy(nullptr);
>-    framebuffer->onDestroy(nullptr);
>-    program->onDestroy(nullptr);
>-}
>-
>-}  // anonymous namespace
>diff --git a/Source/ThirdParty/ANGLE/src/libEGL.gypi b/Source/ThirdParty/ANGLE/src/libEGL.gypi
>deleted file mode 100644
>index fdce4ba2b11..00000000000
>--- a/Source/ThirdParty/ANGLE/src/libEGL.gypi
>+++ /dev/null
>@@ -1,90 +0,0 @@
>-# Copyright (c) 2013 The ANGLE Project Authors. All rights reserved.
>-# Use of this source code is governed by a BSD-style license that can be
>-# found in the LICENSE file.
>-
>-{
>-    # Everything below this is duplicated in the GN build. If you change
>-    # anything also change angle/BUILD.gn
>-    'targets':
>-    [
>-        {
>-            'target_name': 'libEGL',
>-            'type': '<(angle_gl_library_type)',
>-            'dependencies':
>-            [
>-                'libGLESv2',
>-            ],
>-            'includes':
>-            [
>-                '../gyp/common_defines.gypi',
>-            ],
>-            'include_dirs':
>-            [
>-                '.',
>-                '../include',
>-            ],
>-            'sources':
>-            [
>-                '<@(libegl_sources)',
>-            ],
>-            'conditions':
>-            [
>-                ['angle_build_winrt==1',
>-                {
>-                    'msvs_requires_importlibrary' : 'true',
>-                }],
>-                ['OS=="win"', {
>-                    'defines':
>-                    [
>-                        'EGLAPI=',
>-                    ],
>-                }, {
>-                    'defines':
>-                    [
>-                        'EGLAPI=__attribute__((visibility("default")))',
>-                    ],
>-                }],
>-                ['OS == "mac"',
>-                {
>-                    'xcode_settings':
>-                    {
>-                        'DYLIB_INSTALL_NAME_BASE': '@rpath',
>-                    },
>-                }],
>-            ],
>-        },
>-
>-        {
>-            'target_name': 'libEGL_static',
>-            'type': 'static_library',
>-            'dependencies':
>-            [
>-                'libGLESv2_static',
>-            ],
>-            'includes':
>-            [
>-                '../gyp/common_defines.gypi',
>-            ],
>-            'include_dirs':
>-            [
>-                '.',
>-                '../include',
>-            ],
>-            'sources':
>-            [
>-                '<@(libegl_sources)',
>-            ],
>-            'defines':
>-            [
>-                'EGLAPI=',
>-            ],
>-            'direct_dependent_settings':
>-            {
>-                'defines':
>-                [
>-                    'EGLAPI=',
>-                ],
>-            },
>-        },
>-    ],
>-}
>diff --git a/Source/ThirdParty/ANGLE/src/libEGL/egl_loader_autogen.cpp b/Source/ThirdParty/ANGLE/src/libEGL/egl_loader_autogen.cpp
>new file mode 100644
>index 00000000000..ee08f8cc00d
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libEGL/egl_loader_autogen.cpp
>@@ -0,0 +1,249 @@
>+// GENERATED FILE - DO NOT EDIT.
>+// Generated by generate_loader.py using data from egl.xml and egl_angle_ext.xml.
>+//
>+// Copyright 2019 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// egl_loader_autogen.cpp:
>+//   Simple EGL function loader.
>+
>+#include "egl_loader_autogen.h"
>+
>+PFNEGLCHOOSECONFIGPROC EGL_ChooseConfig;
>+PFNEGLCOPYBUFFERSPROC EGL_CopyBuffers;
>+PFNEGLCREATECONTEXTPROC EGL_CreateContext;
>+PFNEGLCREATEPBUFFERSURFACEPROC EGL_CreatePbufferSurface;
>+PFNEGLCREATEPIXMAPSURFACEPROC EGL_CreatePixmapSurface;
>+PFNEGLCREATEWINDOWSURFACEPROC EGL_CreateWindowSurface;
>+PFNEGLDESTROYCONTEXTPROC EGL_DestroyContext;
>+PFNEGLDESTROYSURFACEPROC EGL_DestroySurface;
>+PFNEGLGETCONFIGATTRIBPROC EGL_GetConfigAttrib;
>+PFNEGLGETCONFIGSPROC EGL_GetConfigs;
>+PFNEGLGETCURRENTDISPLAYPROC EGL_GetCurrentDisplay;
>+PFNEGLGETCURRENTSURFACEPROC EGL_GetCurrentSurface;
>+PFNEGLGETDISPLAYPROC EGL_GetDisplay;
>+PFNEGLGETERRORPROC EGL_GetError;
>+PFNEGLGETPROCADDRESSPROC EGL_GetProcAddress;
>+PFNEGLINITIALIZEPROC EGL_Initialize;
>+PFNEGLMAKECURRENTPROC EGL_MakeCurrent;
>+PFNEGLQUERYCONTEXTPROC EGL_QueryContext;
>+PFNEGLQUERYSTRINGPROC EGL_QueryString;
>+PFNEGLQUERYSURFACEPROC EGL_QuerySurface;
>+PFNEGLSWAPBUFFERSPROC EGL_SwapBuffers;
>+PFNEGLTERMINATEPROC EGL_Terminate;
>+PFNEGLWAITGLPROC EGL_WaitGL;
>+PFNEGLWAITNATIVEPROC EGL_WaitNative;
>+PFNEGLBINDTEXIMAGEPROC EGL_BindTexImage;
>+PFNEGLRELEASETEXIMAGEPROC EGL_ReleaseTexImage;
>+PFNEGLSURFACEATTRIBPROC EGL_SurfaceAttrib;
>+PFNEGLSWAPINTERVALPROC EGL_SwapInterval;
>+PFNEGLBINDAPIPROC EGL_BindAPI;
>+PFNEGLQUERYAPIPROC EGL_QueryAPI;
>+PFNEGLCREATEPBUFFERFROMCLIENTBUFFERPROC EGL_CreatePbufferFromClientBuffer;
>+PFNEGLRELEASETHREADPROC EGL_ReleaseThread;
>+PFNEGLWAITCLIENTPROC EGL_WaitClient;
>+PFNEGLGETCURRENTCONTEXTPROC EGL_GetCurrentContext;
>+PFNEGLCREATESYNCPROC EGL_CreateSync;
>+PFNEGLDESTROYSYNCPROC EGL_DestroySync;
>+PFNEGLCLIENTWAITSYNCPROC EGL_ClientWaitSync;
>+PFNEGLGETSYNCATTRIBPROC EGL_GetSyncAttrib;
>+PFNEGLCREATEIMAGEPROC EGL_CreateImage;
>+PFNEGLDESTROYIMAGEPROC EGL_DestroyImage;
>+PFNEGLGETPLATFORMDISPLAYPROC EGL_GetPlatformDisplay;
>+PFNEGLCREATEPLATFORMWINDOWSURFACEPROC EGL_CreatePlatformWindowSurface;
>+PFNEGLCREATEPLATFORMPIXMAPSURFACEPROC EGL_CreatePlatformPixmapSurface;
>+PFNEGLWAITSYNCPROC EGL_WaitSync;
>+PFNEGLSETBLOBCACHEFUNCSANDROIDPROC EGL_SetBlobCacheFuncsANDROID;
>+PFNEGLGETCOMPOSITORTIMINGANDROIDPROC EGL_GetCompositorTimingANDROID;
>+PFNEGLGETCOMPOSITORTIMINGSUPPORTEDANDROIDPROC EGL_GetCompositorTimingSupportedANDROID;
>+PFNEGLGETFRAMETIMESTAMPSUPPORTEDANDROIDPROC EGL_GetFrameTimestampSupportedANDROID;
>+PFNEGLGETFRAMETIMESTAMPSANDROIDPROC EGL_GetFrameTimestampsANDROID;
>+PFNEGLGETNEXTFRAMEIDANDROIDPROC EGL_GetNextFrameIdANDROID;
>+PFNEGLPRESENTATIONTIMEANDROIDPROC EGL_PresentationTimeANDROID;
>+PFNEGLCREATEDEVICEANGLEPROC EGL_CreateDeviceANGLE;
>+PFNEGLRELEASEDEVICEANGLEPROC EGL_ReleaseDeviceANGLE;
>+PFNEGLPROGRAMCACHEGETATTRIBANGLEPROC EGL_ProgramCacheGetAttribANGLE;
>+PFNEGLPROGRAMCACHEPOPULATEANGLEPROC EGL_ProgramCachePopulateANGLE;
>+PFNEGLPROGRAMCACHEQUERYANGLEPROC EGL_ProgramCacheQueryANGLE;
>+PFNEGLPROGRAMCACHERESIZEANGLEPROC EGL_ProgramCacheResizeANGLE;
>+PFNEGLQUERYSURFACEPOINTERANGLEPROC EGL_QuerySurfacePointerANGLE;
>+PFNEGLCREATESTREAMPRODUCERD3DTEXTUREANGLEPROC EGL_CreateStreamProducerD3DTextureANGLE;
>+PFNEGLSTREAMPOSTD3DTEXTUREANGLEPROC EGL_StreamPostD3DTextureANGLE;
>+PFNEGLGETSYNCVALUESCHROMIUMPROC EGL_GetSyncValuesCHROMIUM;
>+PFNEGLQUERYDEVICEATTRIBEXTPROC EGL_QueryDeviceAttribEXT;
>+PFNEGLQUERYDEVICESTRINGEXTPROC EGL_QueryDeviceStringEXT;
>+PFNEGLQUERYDISPLAYATTRIBEXTPROC EGL_QueryDisplayAttribEXT;
>+PFNEGLCREATEPLATFORMPIXMAPSURFACEEXTPROC EGL_CreatePlatformPixmapSurfaceEXT;
>+PFNEGLCREATEPLATFORMWINDOWSURFACEEXTPROC EGL_CreatePlatformWindowSurfaceEXT;
>+PFNEGLGETPLATFORMDISPLAYEXTPROC EGL_GetPlatformDisplayEXT;
>+PFNEGLDEBUGMESSAGECONTROLKHRPROC EGL_DebugMessageControlKHR;
>+PFNEGLLABELOBJECTKHRPROC EGL_LabelObjectKHR;
>+PFNEGLQUERYDEBUGKHRPROC EGL_QueryDebugKHR;
>+PFNEGLCLIENTWAITSYNCKHRPROC EGL_ClientWaitSyncKHR;
>+PFNEGLCREATESYNCKHRPROC EGL_CreateSyncKHR;
>+PFNEGLDESTROYSYNCKHRPROC EGL_DestroySyncKHR;
>+PFNEGLGETSYNCATTRIBKHRPROC EGL_GetSyncAttribKHR;
>+PFNEGLCREATEIMAGEKHRPROC EGL_CreateImageKHR;
>+PFNEGLDESTROYIMAGEKHRPROC EGL_DestroyImageKHR;
>+PFNEGLCREATESTREAMKHRPROC EGL_CreateStreamKHR;
>+PFNEGLDESTROYSTREAMKHRPROC EGL_DestroyStreamKHR;
>+PFNEGLQUERYSTREAMKHRPROC EGL_QueryStreamKHR;
>+PFNEGLQUERYSTREAMU64KHRPROC EGL_QueryStreamu64KHR;
>+PFNEGLSTREAMATTRIBKHRPROC EGL_StreamAttribKHR;
>+PFNEGLSTREAMCONSUMERACQUIREKHRPROC EGL_StreamConsumerAcquireKHR;
>+PFNEGLSTREAMCONSUMERGLTEXTUREEXTERNALKHRPROC EGL_StreamConsumerGLTextureExternalKHR;
>+PFNEGLSTREAMCONSUMERRELEASEKHRPROC EGL_StreamConsumerReleaseKHR;
>+PFNEGLSWAPBUFFERSWITHDAMAGEKHRPROC EGL_SwapBuffersWithDamageKHR;
>+PFNEGLWAITSYNCKHRPROC EGL_WaitSyncKHR;
>+PFNEGLPOSTSUBBUFFERNVPROC EGL_PostSubBufferNV;
>+PFNEGLSTREAMCONSUMERGLTEXTUREEXTERNALATTRIBSNVPROC EGL_StreamConsumerGLTextureExternalAttribsNV;
>+
>+namespace angle
>+{
>+void LoadEGL(LoadProc loadProc)
>+{
>+    EGL_ChooseConfig  = reinterpret_cast<PFNEGLCHOOSECONFIGPROC>(loadProc("EGL_ChooseConfig"));
>+    EGL_CopyBuffers   = reinterpret_cast<PFNEGLCOPYBUFFERSPROC>(loadProc("EGL_CopyBuffers"));
>+    EGL_CreateContext = reinterpret_cast<PFNEGLCREATECONTEXTPROC>(loadProc("EGL_CreateContext"));
>+    EGL_CreatePbufferSurface =
>+        reinterpret_cast<PFNEGLCREATEPBUFFERSURFACEPROC>(loadProc("EGL_CreatePbufferSurface"));
>+    EGL_CreatePixmapSurface =
>+        reinterpret_cast<PFNEGLCREATEPIXMAPSURFACEPROC>(loadProc("EGL_CreatePixmapSurface"));
>+    EGL_CreateWindowSurface =
>+        reinterpret_cast<PFNEGLCREATEWINDOWSURFACEPROC>(loadProc("EGL_CreateWindowSurface"));
>+    EGL_DestroyContext = reinterpret_cast<PFNEGLDESTROYCONTEXTPROC>(loadProc("EGL_DestroyContext"));
>+    EGL_DestroySurface = reinterpret_cast<PFNEGLDESTROYSURFACEPROC>(loadProc("EGL_DestroySurface"));
>+    EGL_GetConfigAttrib =
>+        reinterpret_cast<PFNEGLGETCONFIGATTRIBPROC>(loadProc("EGL_GetConfigAttrib"));
>+    EGL_GetConfigs = reinterpret_cast<PFNEGLGETCONFIGSPROC>(loadProc("EGL_GetConfigs"));
>+    EGL_GetCurrentDisplay =
>+        reinterpret_cast<PFNEGLGETCURRENTDISPLAYPROC>(loadProc("EGL_GetCurrentDisplay"));
>+    EGL_GetCurrentSurface =
>+        reinterpret_cast<PFNEGLGETCURRENTSURFACEPROC>(loadProc("EGL_GetCurrentSurface"));
>+    EGL_GetDisplay     = reinterpret_cast<PFNEGLGETDISPLAYPROC>(loadProc("EGL_GetDisplay"));
>+    EGL_GetError       = reinterpret_cast<PFNEGLGETERRORPROC>(loadProc("EGL_GetError"));
>+    EGL_GetProcAddress = reinterpret_cast<PFNEGLGETPROCADDRESSPROC>(loadProc("EGL_GetProcAddress"));
>+    EGL_Initialize     = reinterpret_cast<PFNEGLINITIALIZEPROC>(loadProc("EGL_Initialize"));
>+    EGL_MakeCurrent    = reinterpret_cast<PFNEGLMAKECURRENTPROC>(loadProc("EGL_MakeCurrent"));
>+    EGL_QueryContext   = reinterpret_cast<PFNEGLQUERYCONTEXTPROC>(loadProc("EGL_QueryContext"));
>+    EGL_QueryString    = reinterpret_cast<PFNEGLQUERYSTRINGPROC>(loadProc("EGL_QueryString"));
>+    EGL_QuerySurface   = reinterpret_cast<PFNEGLQUERYSURFACEPROC>(loadProc("EGL_QuerySurface"));
>+    EGL_SwapBuffers    = reinterpret_cast<PFNEGLSWAPBUFFERSPROC>(loadProc("EGL_SwapBuffers"));
>+    EGL_Terminate      = reinterpret_cast<PFNEGLTERMINATEPROC>(loadProc("EGL_Terminate"));
>+    EGL_WaitGL         = reinterpret_cast<PFNEGLWAITGLPROC>(loadProc("EGL_WaitGL"));
>+    EGL_WaitNative     = reinterpret_cast<PFNEGLWAITNATIVEPROC>(loadProc("EGL_WaitNative"));
>+    EGL_BindTexImage   = reinterpret_cast<PFNEGLBINDTEXIMAGEPROC>(loadProc("EGL_BindTexImage"));
>+    EGL_ReleaseTexImage =
>+        reinterpret_cast<PFNEGLRELEASETEXIMAGEPROC>(loadProc("EGL_ReleaseTexImage"));
>+    EGL_SurfaceAttrib = reinterpret_cast<PFNEGLSURFACEATTRIBPROC>(loadProc("EGL_SurfaceAttrib"));
>+    EGL_SwapInterval  = reinterpret_cast<PFNEGLSWAPINTERVALPROC>(loadProc("EGL_SwapInterval"));
>+    EGL_BindAPI       = reinterpret_cast<PFNEGLBINDAPIPROC>(loadProc("EGL_BindAPI"));
>+    EGL_QueryAPI      = reinterpret_cast<PFNEGLQUERYAPIPROC>(loadProc("EGL_QueryAPI"));
>+    EGL_CreatePbufferFromClientBuffer = reinterpret_cast<PFNEGLCREATEPBUFFERFROMCLIENTBUFFERPROC>(
>+        loadProc("EGL_CreatePbufferFromClientBuffer"));
>+    EGL_ReleaseThread = reinterpret_cast<PFNEGLRELEASETHREADPROC>(loadProc("EGL_ReleaseThread"));
>+    EGL_WaitClient    = reinterpret_cast<PFNEGLWAITCLIENTPROC>(loadProc("EGL_WaitClient"));
>+    EGL_GetCurrentContext =
>+        reinterpret_cast<PFNEGLGETCURRENTCONTEXTPROC>(loadProc("EGL_GetCurrentContext"));
>+    EGL_CreateSync     = reinterpret_cast<PFNEGLCREATESYNCPROC>(loadProc("EGL_CreateSync"));
>+    EGL_DestroySync    = reinterpret_cast<PFNEGLDESTROYSYNCPROC>(loadProc("EGL_DestroySync"));
>+    EGL_ClientWaitSync = reinterpret_cast<PFNEGLCLIENTWAITSYNCPROC>(loadProc("EGL_ClientWaitSync"));
>+    EGL_GetSyncAttrib  = reinterpret_cast<PFNEGLGETSYNCATTRIBPROC>(loadProc("EGL_GetSyncAttrib"));
>+    EGL_CreateImage    = reinterpret_cast<PFNEGLCREATEIMAGEPROC>(loadProc("EGL_CreateImage"));
>+    EGL_DestroyImage   = reinterpret_cast<PFNEGLDESTROYIMAGEPROC>(loadProc("EGL_DestroyImage"));
>+    EGL_GetPlatformDisplay =
>+        reinterpret_cast<PFNEGLGETPLATFORMDISPLAYPROC>(loadProc("EGL_GetPlatformDisplay"));
>+    EGL_CreatePlatformWindowSurface = reinterpret_cast<PFNEGLCREATEPLATFORMWINDOWSURFACEPROC>(
>+        loadProc("EGL_CreatePlatformWindowSurface"));
>+    EGL_CreatePlatformPixmapSurface = reinterpret_cast<PFNEGLCREATEPLATFORMPIXMAPSURFACEPROC>(
>+        loadProc("EGL_CreatePlatformPixmapSurface"));
>+    EGL_WaitSync                 = reinterpret_cast<PFNEGLWAITSYNCPROC>(loadProc("EGL_WaitSync"));
>+    EGL_SetBlobCacheFuncsANDROID = reinterpret_cast<PFNEGLSETBLOBCACHEFUNCSANDROIDPROC>(
>+        loadProc("EGL_SetBlobCacheFuncsANDROID"));
>+    EGL_GetCompositorTimingANDROID = reinterpret_cast<PFNEGLGETCOMPOSITORTIMINGANDROIDPROC>(
>+        loadProc("EGL_GetCompositorTimingANDROID"));
>+    EGL_GetCompositorTimingSupportedANDROID =
>+        reinterpret_cast<PFNEGLGETCOMPOSITORTIMINGSUPPORTEDANDROIDPROC>(
>+            loadProc("EGL_GetCompositorTimingSupportedANDROID"));
>+    EGL_GetFrameTimestampSupportedANDROID =
>+        reinterpret_cast<PFNEGLGETFRAMETIMESTAMPSUPPORTEDANDROIDPROC>(
>+            loadProc("EGL_GetFrameTimestampSupportedANDROID"));
>+    EGL_GetFrameTimestampsANDROID = reinterpret_cast<PFNEGLGETFRAMETIMESTAMPSANDROIDPROC>(
>+        loadProc("EGL_GetFrameTimestampsANDROID"));
>+    EGL_GetNextFrameIdANDROID =
>+        reinterpret_cast<PFNEGLGETNEXTFRAMEIDANDROIDPROC>(loadProc("EGL_GetNextFrameIdANDROID"));
>+    EGL_PresentationTimeANDROID = reinterpret_cast<PFNEGLPRESENTATIONTIMEANDROIDPROC>(
>+        loadProc("EGL_PresentationTimeANDROID"));
>+    EGL_CreateDeviceANGLE =
>+        reinterpret_cast<PFNEGLCREATEDEVICEANGLEPROC>(loadProc("EGL_CreateDeviceANGLE"));
>+    EGL_ReleaseDeviceANGLE =
>+        reinterpret_cast<PFNEGLRELEASEDEVICEANGLEPROC>(loadProc("EGL_ReleaseDeviceANGLE"));
>+    EGL_ProgramCacheGetAttribANGLE = reinterpret_cast<PFNEGLPROGRAMCACHEGETATTRIBANGLEPROC>(
>+        loadProc("EGL_ProgramCacheGetAttribANGLE"));
>+    EGL_ProgramCachePopulateANGLE = reinterpret_cast<PFNEGLPROGRAMCACHEPOPULATEANGLEPROC>(
>+        loadProc("EGL_ProgramCachePopulateANGLE"));
>+    EGL_ProgramCacheQueryANGLE =
>+        reinterpret_cast<PFNEGLPROGRAMCACHEQUERYANGLEPROC>(loadProc("EGL_ProgramCacheQueryANGLE"));
>+    EGL_ProgramCacheResizeANGLE = reinterpret_cast<PFNEGLPROGRAMCACHERESIZEANGLEPROC>(
>+        loadProc("EGL_ProgramCacheResizeANGLE"));
>+    EGL_QuerySurfacePointerANGLE = reinterpret_cast<PFNEGLQUERYSURFACEPOINTERANGLEPROC>(
>+        loadProc("EGL_QuerySurfacePointerANGLE"));
>+    EGL_CreateStreamProducerD3DTextureANGLE =
>+        reinterpret_cast<PFNEGLCREATESTREAMPRODUCERD3DTEXTUREANGLEPROC>(
>+            loadProc("EGL_CreateStreamProducerD3DTextureANGLE"));
>+    EGL_StreamPostD3DTextureANGLE = reinterpret_cast<PFNEGLSTREAMPOSTD3DTEXTUREANGLEPROC>(
>+        loadProc("EGL_StreamPostD3DTextureANGLE"));
>+    EGL_GetSyncValuesCHROMIUM =
>+        reinterpret_cast<PFNEGLGETSYNCVALUESCHROMIUMPROC>(loadProc("EGL_GetSyncValuesCHROMIUM"));
>+    EGL_QueryDeviceAttribEXT =
>+        reinterpret_cast<PFNEGLQUERYDEVICEATTRIBEXTPROC>(loadProc("EGL_QueryDeviceAttribEXT"));
>+    EGL_QueryDeviceStringEXT =
>+        reinterpret_cast<PFNEGLQUERYDEVICESTRINGEXTPROC>(loadProc("EGL_QueryDeviceStringEXT"));
>+    EGL_QueryDisplayAttribEXT =
>+        reinterpret_cast<PFNEGLQUERYDISPLAYATTRIBEXTPROC>(loadProc("EGL_QueryDisplayAttribEXT"));
>+    EGL_CreatePlatformPixmapSurfaceEXT = reinterpret_cast<PFNEGLCREATEPLATFORMPIXMAPSURFACEEXTPROC>(
>+        loadProc("EGL_CreatePlatformPixmapSurfaceEXT"));
>+    EGL_CreatePlatformWindowSurfaceEXT = reinterpret_cast<PFNEGLCREATEPLATFORMWINDOWSURFACEEXTPROC>(
>+        loadProc("EGL_CreatePlatformWindowSurfaceEXT"));
>+    EGL_GetPlatformDisplayEXT =
>+        reinterpret_cast<PFNEGLGETPLATFORMDISPLAYEXTPROC>(loadProc("EGL_GetPlatformDisplayEXT"));
>+    EGL_DebugMessageControlKHR =
>+        reinterpret_cast<PFNEGLDEBUGMESSAGECONTROLKHRPROC>(loadProc("EGL_DebugMessageControlKHR"));
>+    EGL_LabelObjectKHR = reinterpret_cast<PFNEGLLABELOBJECTKHRPROC>(loadProc("EGL_LabelObjectKHR"));
>+    EGL_QueryDebugKHR  = reinterpret_cast<PFNEGLQUERYDEBUGKHRPROC>(loadProc("EGL_QueryDebugKHR"));
>+    EGL_ClientWaitSyncKHR =
>+        reinterpret_cast<PFNEGLCLIENTWAITSYNCKHRPROC>(loadProc("EGL_ClientWaitSyncKHR"));
>+    EGL_CreateSyncKHR  = reinterpret_cast<PFNEGLCREATESYNCKHRPROC>(loadProc("EGL_CreateSyncKHR"));
>+    EGL_DestroySyncKHR = reinterpret_cast<PFNEGLDESTROYSYNCKHRPROC>(loadProc("EGL_DestroySyncKHR"));
>+    EGL_GetSyncAttribKHR =
>+        reinterpret_cast<PFNEGLGETSYNCATTRIBKHRPROC>(loadProc("EGL_GetSyncAttribKHR"));
>+    EGL_CreateImageKHR = reinterpret_cast<PFNEGLCREATEIMAGEKHRPROC>(loadProc("EGL_CreateImageKHR"));
>+    EGL_DestroyImageKHR =
>+        reinterpret_cast<PFNEGLDESTROYIMAGEKHRPROC>(loadProc("EGL_DestroyImageKHR"));
>+    EGL_CreateStreamKHR =
>+        reinterpret_cast<PFNEGLCREATESTREAMKHRPROC>(loadProc("EGL_CreateStreamKHR"));
>+    EGL_DestroyStreamKHR =
>+        reinterpret_cast<PFNEGLDESTROYSTREAMKHRPROC>(loadProc("EGL_DestroyStreamKHR"));
>+    EGL_QueryStreamKHR = reinterpret_cast<PFNEGLQUERYSTREAMKHRPROC>(loadProc("EGL_QueryStreamKHR"));
>+    EGL_QueryStreamu64KHR =
>+        reinterpret_cast<PFNEGLQUERYSTREAMU64KHRPROC>(loadProc("EGL_QueryStreamu64KHR"));
>+    EGL_StreamAttribKHR =
>+        reinterpret_cast<PFNEGLSTREAMATTRIBKHRPROC>(loadProc("EGL_StreamAttribKHR"));
>+    EGL_StreamConsumerAcquireKHR = reinterpret_cast<PFNEGLSTREAMCONSUMERACQUIREKHRPROC>(
>+        loadProc("EGL_StreamConsumerAcquireKHR"));
>+    EGL_StreamConsumerGLTextureExternalKHR =
>+        reinterpret_cast<PFNEGLSTREAMCONSUMERGLTEXTUREEXTERNALKHRPROC>(
>+            loadProc("EGL_StreamConsumerGLTextureExternalKHR"));
>+    EGL_StreamConsumerReleaseKHR = reinterpret_cast<PFNEGLSTREAMCONSUMERRELEASEKHRPROC>(
>+        loadProc("EGL_StreamConsumerReleaseKHR"));
>+    EGL_SwapBuffersWithDamageKHR = reinterpret_cast<PFNEGLSWAPBUFFERSWITHDAMAGEKHRPROC>(
>+        loadProc("EGL_SwapBuffersWithDamageKHR"));
>+    EGL_WaitSyncKHR = reinterpret_cast<PFNEGLWAITSYNCKHRPROC>(loadProc("EGL_WaitSyncKHR"));
>+    EGL_PostSubBufferNV =
>+        reinterpret_cast<PFNEGLPOSTSUBBUFFERNVPROC>(loadProc("EGL_PostSubBufferNV"));
>+    EGL_StreamConsumerGLTextureExternalAttribsNV =
>+        reinterpret_cast<PFNEGLSTREAMCONSUMERGLTEXTUREEXTERNALATTRIBSNVPROC>(
>+            loadProc("EGL_StreamConsumerGLTextureExternalAttribsNV"));
>+}
>+}  // namespace angle
>diff --git a/Source/ThirdParty/ANGLE/src/libEGL/egl_loader_autogen.h b/Source/ThirdParty/ANGLE/src/libEGL/egl_loader_autogen.h
>new file mode 100644
>index 00000000000..ae4a427c6fe
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libEGL/egl_loader_autogen.h
>@@ -0,0 +1,114 @@
>+// GENERATED FILE - DO NOT EDIT.
>+// Generated by generate_loader.py using data from egl.xml and egl_angle_ext.xml.
>+//
>+// Copyright 2019 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// egl_loader_autogen.h:
>+//   Simple EGL function loader.
>+
>+#ifndef LIBEGL_EGL_LOADER_AUTOGEN_H_
>+#define LIBEGL_EGL_LOADER_AUTOGEN_H_
>+
>+#include <EGL/egl.h>
>+#include <EGL/eglext.h>
>+
>+extern PFNEGLCHOOSECONFIGPROC EGL_ChooseConfig;
>+extern PFNEGLCOPYBUFFERSPROC EGL_CopyBuffers;
>+extern PFNEGLCREATECONTEXTPROC EGL_CreateContext;
>+extern PFNEGLCREATEPBUFFERSURFACEPROC EGL_CreatePbufferSurface;
>+extern PFNEGLCREATEPIXMAPSURFACEPROC EGL_CreatePixmapSurface;
>+extern PFNEGLCREATEWINDOWSURFACEPROC EGL_CreateWindowSurface;
>+extern PFNEGLDESTROYCONTEXTPROC EGL_DestroyContext;
>+extern PFNEGLDESTROYSURFACEPROC EGL_DestroySurface;
>+extern PFNEGLGETCONFIGATTRIBPROC EGL_GetConfigAttrib;
>+extern PFNEGLGETCONFIGSPROC EGL_GetConfigs;
>+extern PFNEGLGETCURRENTDISPLAYPROC EGL_GetCurrentDisplay;
>+extern PFNEGLGETCURRENTSURFACEPROC EGL_GetCurrentSurface;
>+extern PFNEGLGETDISPLAYPROC EGL_GetDisplay;
>+extern PFNEGLGETERRORPROC EGL_GetError;
>+extern PFNEGLGETPROCADDRESSPROC EGL_GetProcAddress;
>+extern PFNEGLINITIALIZEPROC EGL_Initialize;
>+extern PFNEGLMAKECURRENTPROC EGL_MakeCurrent;
>+extern PFNEGLQUERYCONTEXTPROC EGL_QueryContext;
>+extern PFNEGLQUERYSTRINGPROC EGL_QueryString;
>+extern PFNEGLQUERYSURFACEPROC EGL_QuerySurface;
>+extern PFNEGLSWAPBUFFERSPROC EGL_SwapBuffers;
>+extern PFNEGLTERMINATEPROC EGL_Terminate;
>+extern PFNEGLWAITGLPROC EGL_WaitGL;
>+extern PFNEGLWAITNATIVEPROC EGL_WaitNative;
>+extern PFNEGLBINDTEXIMAGEPROC EGL_BindTexImage;
>+extern PFNEGLRELEASETEXIMAGEPROC EGL_ReleaseTexImage;
>+extern PFNEGLSURFACEATTRIBPROC EGL_SurfaceAttrib;
>+extern PFNEGLSWAPINTERVALPROC EGL_SwapInterval;
>+extern PFNEGLBINDAPIPROC EGL_BindAPI;
>+extern PFNEGLQUERYAPIPROC EGL_QueryAPI;
>+extern PFNEGLCREATEPBUFFERFROMCLIENTBUFFERPROC EGL_CreatePbufferFromClientBuffer;
>+extern PFNEGLRELEASETHREADPROC EGL_ReleaseThread;
>+extern PFNEGLWAITCLIENTPROC EGL_WaitClient;
>+extern PFNEGLGETCURRENTCONTEXTPROC EGL_GetCurrentContext;
>+extern PFNEGLCREATESYNCPROC EGL_CreateSync;
>+extern PFNEGLDESTROYSYNCPROC EGL_DestroySync;
>+extern PFNEGLCLIENTWAITSYNCPROC EGL_ClientWaitSync;
>+extern PFNEGLGETSYNCATTRIBPROC EGL_GetSyncAttrib;
>+extern PFNEGLCREATEIMAGEPROC EGL_CreateImage;
>+extern PFNEGLDESTROYIMAGEPROC EGL_DestroyImage;
>+extern PFNEGLGETPLATFORMDISPLAYPROC EGL_GetPlatformDisplay;
>+extern PFNEGLCREATEPLATFORMWINDOWSURFACEPROC EGL_CreatePlatformWindowSurface;
>+extern PFNEGLCREATEPLATFORMPIXMAPSURFACEPROC EGL_CreatePlatformPixmapSurface;
>+extern PFNEGLWAITSYNCPROC EGL_WaitSync;
>+extern PFNEGLSETBLOBCACHEFUNCSANDROIDPROC EGL_SetBlobCacheFuncsANDROID;
>+extern PFNEGLGETCOMPOSITORTIMINGANDROIDPROC EGL_GetCompositorTimingANDROID;
>+extern PFNEGLGETCOMPOSITORTIMINGSUPPORTEDANDROIDPROC EGL_GetCompositorTimingSupportedANDROID;
>+extern PFNEGLGETFRAMETIMESTAMPSUPPORTEDANDROIDPROC EGL_GetFrameTimestampSupportedANDROID;
>+extern PFNEGLGETFRAMETIMESTAMPSANDROIDPROC EGL_GetFrameTimestampsANDROID;
>+extern PFNEGLGETNEXTFRAMEIDANDROIDPROC EGL_GetNextFrameIdANDROID;
>+extern PFNEGLPRESENTATIONTIMEANDROIDPROC EGL_PresentationTimeANDROID;
>+extern PFNEGLCREATEDEVICEANGLEPROC EGL_CreateDeviceANGLE;
>+extern PFNEGLRELEASEDEVICEANGLEPROC EGL_ReleaseDeviceANGLE;
>+extern PFNEGLPROGRAMCACHEGETATTRIBANGLEPROC EGL_ProgramCacheGetAttribANGLE;
>+extern PFNEGLPROGRAMCACHEPOPULATEANGLEPROC EGL_ProgramCachePopulateANGLE;
>+extern PFNEGLPROGRAMCACHEQUERYANGLEPROC EGL_ProgramCacheQueryANGLE;
>+extern PFNEGLPROGRAMCACHERESIZEANGLEPROC EGL_ProgramCacheResizeANGLE;
>+extern PFNEGLQUERYSURFACEPOINTERANGLEPROC EGL_QuerySurfacePointerANGLE;
>+extern PFNEGLCREATESTREAMPRODUCERD3DTEXTUREANGLEPROC EGL_CreateStreamProducerD3DTextureANGLE;
>+extern PFNEGLSTREAMPOSTD3DTEXTUREANGLEPROC EGL_StreamPostD3DTextureANGLE;
>+extern PFNEGLGETSYNCVALUESCHROMIUMPROC EGL_GetSyncValuesCHROMIUM;
>+extern PFNEGLQUERYDEVICEATTRIBEXTPROC EGL_QueryDeviceAttribEXT;
>+extern PFNEGLQUERYDEVICESTRINGEXTPROC EGL_QueryDeviceStringEXT;
>+extern PFNEGLQUERYDISPLAYATTRIBEXTPROC EGL_QueryDisplayAttribEXT;
>+extern PFNEGLCREATEPLATFORMPIXMAPSURFACEEXTPROC EGL_CreatePlatformPixmapSurfaceEXT;
>+extern PFNEGLCREATEPLATFORMWINDOWSURFACEEXTPROC EGL_CreatePlatformWindowSurfaceEXT;
>+extern PFNEGLGETPLATFORMDISPLAYEXTPROC EGL_GetPlatformDisplayEXT;
>+extern PFNEGLDEBUGMESSAGECONTROLKHRPROC EGL_DebugMessageControlKHR;
>+extern PFNEGLLABELOBJECTKHRPROC EGL_LabelObjectKHR;
>+extern PFNEGLQUERYDEBUGKHRPROC EGL_QueryDebugKHR;
>+extern PFNEGLCLIENTWAITSYNCKHRPROC EGL_ClientWaitSyncKHR;
>+extern PFNEGLCREATESYNCKHRPROC EGL_CreateSyncKHR;
>+extern PFNEGLDESTROYSYNCKHRPROC EGL_DestroySyncKHR;
>+extern PFNEGLGETSYNCATTRIBKHRPROC EGL_GetSyncAttribKHR;
>+extern PFNEGLCREATEIMAGEKHRPROC EGL_CreateImageKHR;
>+extern PFNEGLDESTROYIMAGEKHRPROC EGL_DestroyImageKHR;
>+extern PFNEGLCREATESTREAMKHRPROC EGL_CreateStreamKHR;
>+extern PFNEGLDESTROYSTREAMKHRPROC EGL_DestroyStreamKHR;
>+extern PFNEGLQUERYSTREAMKHRPROC EGL_QueryStreamKHR;
>+extern PFNEGLQUERYSTREAMU64KHRPROC EGL_QueryStreamu64KHR;
>+extern PFNEGLSTREAMATTRIBKHRPROC EGL_StreamAttribKHR;
>+extern PFNEGLSTREAMCONSUMERACQUIREKHRPROC EGL_StreamConsumerAcquireKHR;
>+extern PFNEGLSTREAMCONSUMERGLTEXTUREEXTERNALKHRPROC EGL_StreamConsumerGLTextureExternalKHR;
>+extern PFNEGLSTREAMCONSUMERRELEASEKHRPROC EGL_StreamConsumerReleaseKHR;
>+extern PFNEGLSWAPBUFFERSWITHDAMAGEKHRPROC EGL_SwapBuffersWithDamageKHR;
>+extern PFNEGLWAITSYNCKHRPROC EGL_WaitSyncKHR;
>+extern PFNEGLPOSTSUBBUFFERNVPROC EGL_PostSubBufferNV;
>+extern PFNEGLSTREAMCONSUMERGLTEXTUREEXTERNALATTRIBSNVPROC
>+    EGL_StreamConsumerGLTextureExternalAttribsNV;
>+
>+namespace angle
>+{
>+using GenericProc = void (*)();
>+using LoadProc    = GenericProc(KHRONOS_APIENTRY *)(const char *);
>+void LoadEGL(LoadProc loadProc);
>+}  // namespace angle
>+
>+#endif  // LIBEGL_EGL_LOADER_AUTOGEN_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libEGL/libEGL.cpp b/Source/ThirdParty/ANGLE/src/libEGL/libEGL.cpp
>index efe0b0c1244..b48bc0f7ea5 100644
>--- a/Source/ThirdParty/ANGLE/src/libEGL/libEGL.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libEGL/libEGL.cpp
>@@ -6,255 +6,427 @@
> 
> // libEGL.cpp: Implements the exported EGL functions.
> 
>-#include "libGLESv2/entry_points_egl.h"
>-#include "libGLESv2/entry_points_egl_ext.h"
>+#include "common/system_utils.h"
> 
>-extern "C"
>+#include <memory>
>+
>+#if defined(ANGLE_USE_EGL_LOADER)
>+#    include "libEGL/egl_loader_autogen.h"
>+#else
>+#    include "libGLESv2/entry_points_egl.h"
>+#    include "libGLESv2/entry_points_egl_ext.h"
>+#endif  // defined(ANGLE_USE_EGL_LOADER)
>+
>+namespace
>+{
>+#if defined(ANGLE_USE_EGL_LOADER)
>+bool gLoaded = false;
>+std::unique_ptr<angle::Library> gEntryPointsLib;
>+
>+angle::GenericProc KHRONOS_APIENTRY GlobalLoad(const char *symbol)
>+{
>+    return reinterpret_cast<angle::GenericProc>(gEntryPointsLib->getSymbol(symbol));
>+}
>+
>+void EnsureEGLLoaded()
> {
>+    if (gLoaded)
>+        return;
>+
>+    gEntryPointsLib.reset(angle::OpenSharedLibrary(ANGLE_GLESV2_LIBRARY_NAME));
>+    angle::LoadEGL(GlobalLoad);
>+    if (!EGL_GetPlatformDisplay)
>+    {
>+        fprintf(stderr, "Error loading EGL entry points.\n");
>+    }
>+    else
>+    {
>+        gLoaded = true;
>+    }
>+}
>+#else
>+void EnsureEGLLoaded() {}
>+#endif  // defined(ANGLE_USE_EGL_LOADER)
>+}  // anonymous namespace
> 
>-EGLBoolean EGLAPIENTRY eglChooseConfig(EGLDisplay dpy, const EGLint *attrib_list, EGLConfig *configs, EGLint config_size, EGLint *num_config)
>+extern "C" {
>+
>+EGLBoolean EGLAPIENTRY eglChooseConfig(EGLDisplay dpy,
>+                                       const EGLint *attrib_list,
>+                                       EGLConfig *configs,
>+                                       EGLint config_size,
>+                                       EGLint *num_config)
> {
>-    return egl::ChooseConfig(dpy, attrib_list, configs, config_size, num_config);
>+    EnsureEGLLoaded();
>+    return EGL_ChooseConfig(dpy, attrib_list, configs, config_size, num_config);
> }
> 
>-EGLBoolean EGLAPIENTRY eglCopyBuffers(EGLDisplay dpy, EGLSurface surface, EGLNativePixmapType target)
>+EGLBoolean EGLAPIENTRY eglCopyBuffers(EGLDisplay dpy,
>+                                      EGLSurface surface,
>+                                      EGLNativePixmapType target)
> {
>-    return egl::CopyBuffers(dpy, surface, target);
>+    EnsureEGLLoaded();
>+    return EGL_CopyBuffers(dpy, surface, target);
> }
> 
>-EGLContext EGLAPIENTRY eglCreateContext(EGLDisplay dpy, EGLConfig config, EGLContext share_context, const EGLint *attrib_list)
>+EGLContext EGLAPIENTRY eglCreateContext(EGLDisplay dpy,
>+                                        EGLConfig config,
>+                                        EGLContext share_context,
>+                                        const EGLint *attrib_list)
> {
>-    return egl::CreateContext(dpy, config, share_context, attrib_list);
>+    EnsureEGLLoaded();
>+    return EGL_CreateContext(dpy, config, share_context, attrib_list);
> }
> 
>-EGLSurface EGLAPIENTRY eglCreatePbufferSurface(EGLDisplay dpy, EGLConfig config, const EGLint *attrib_list)
>+EGLSurface EGLAPIENTRY eglCreatePbufferSurface(EGLDisplay dpy,
>+                                               EGLConfig config,
>+                                               const EGLint *attrib_list)
> {
>-    return egl::CreatePbufferSurface(dpy, config, attrib_list);
>+    EnsureEGLLoaded();
>+    return EGL_CreatePbufferSurface(dpy, config, attrib_list);
> }
> 
>-EGLSurface EGLAPIENTRY eglCreatePixmapSurface(EGLDisplay dpy, EGLConfig config, EGLNativePixmapType pixmap, const EGLint *attrib_list)
>+EGLSurface EGLAPIENTRY eglCreatePixmapSurface(EGLDisplay dpy,
>+                                              EGLConfig config,
>+                                              EGLNativePixmapType pixmap,
>+                                              const EGLint *attrib_list)
> {
>-    return egl::CreatePixmapSurface(dpy, config, pixmap, attrib_list);
>+    EnsureEGLLoaded();
>+    return EGL_CreatePixmapSurface(dpy, config, pixmap, attrib_list);
> }
> 
>-EGLSurface EGLAPIENTRY eglCreateWindowSurface(EGLDisplay dpy, EGLConfig config, EGLNativeWindowType win, const EGLint *attrib_list)
>+EGLSurface EGLAPIENTRY eglCreateWindowSurface(EGLDisplay dpy,
>+                                              EGLConfig config,
>+                                              EGLNativeWindowType win,
>+                                              const EGLint *attrib_list)
> {
>-    return egl::CreateWindowSurface(dpy, config, win, attrib_list);
>+    EnsureEGLLoaded();
>+    return EGL_CreateWindowSurface(dpy, config, win, attrib_list);
> }
> 
> EGLBoolean EGLAPIENTRY eglDestroyContext(EGLDisplay dpy, EGLContext ctx)
> {
>-    return egl::DestroyContext(dpy, ctx);
>+    EnsureEGLLoaded();
>+    return EGL_DestroyContext(dpy, ctx);
> }
> 
> EGLBoolean EGLAPIENTRY eglDestroySurface(EGLDisplay dpy, EGLSurface surface)
> {
>-    return egl::DestroySurface(dpy, surface);
>+    EnsureEGLLoaded();
>+    return EGL_DestroySurface(dpy, surface);
> }
> 
>-EGLBoolean EGLAPIENTRY eglGetConfigAttrib(EGLDisplay dpy, EGLConfig config, EGLint attribute, EGLint *value)
>+EGLBoolean EGLAPIENTRY eglGetConfigAttrib(EGLDisplay dpy,
>+                                          EGLConfig config,
>+                                          EGLint attribute,
>+                                          EGLint *value)
> {
>-    return egl::GetConfigAttrib(dpy, config, attribute, value);
>+    EnsureEGLLoaded();
>+    return EGL_GetConfigAttrib(dpy, config, attribute, value);
> }
> 
>-EGLBoolean EGLAPIENTRY eglGetConfigs(EGLDisplay dpy, EGLConfig *configs, EGLint config_size, EGLint *num_config)
>+EGLBoolean EGLAPIENTRY eglGetConfigs(EGLDisplay dpy,
>+                                     EGLConfig *configs,
>+                                     EGLint config_size,
>+                                     EGLint *num_config)
> {
>-    return egl::GetConfigs(dpy, configs, config_size, num_config);
>+    EnsureEGLLoaded();
>+    return EGL_GetConfigs(dpy, configs, config_size, num_config);
> }
> 
> EGLDisplay EGLAPIENTRY eglGetCurrentDisplay(void)
> {
>-    return egl::GetCurrentDisplay();
>+    EnsureEGLLoaded();
>+    return EGL_GetCurrentDisplay();
> }
> 
> EGLSurface EGLAPIENTRY eglGetCurrentSurface(EGLint readdraw)
> {
>-    return egl::GetCurrentSurface(readdraw);
>+    EnsureEGLLoaded();
>+    return EGL_GetCurrentSurface(readdraw);
> }
> 
> EGLDisplay EGLAPIENTRY eglGetDisplay(EGLNativeDisplayType display_id)
> {
>-    return egl::GetDisplay(display_id);
>+    EnsureEGLLoaded();
>+    return EGL_GetDisplay(display_id);
> }
> 
> EGLint EGLAPIENTRY eglGetError(void)
> {
>-    return egl::GetError();
>+    EnsureEGLLoaded();
>+    return EGL_GetError();
> }
> 
> EGLBoolean EGLAPIENTRY eglInitialize(EGLDisplay dpy, EGLint *major, EGLint *minor)
> {
>-    return egl::Initialize(dpy, major, minor);
>+    EnsureEGLLoaded();
>+    return EGL_Initialize(dpy, major, minor);
> }
> 
>-EGLBoolean EGLAPIENTRY eglMakeCurrent(EGLDisplay dpy, EGLSurface draw, EGLSurface read, EGLContext ctx)
>+EGLBoolean EGLAPIENTRY eglMakeCurrent(EGLDisplay dpy,
>+                                      EGLSurface draw,
>+                                      EGLSurface read,
>+                                      EGLContext ctx)
> {
>-    return egl::MakeCurrent(dpy, draw, read, ctx);
>+    EnsureEGLLoaded();
>+    return EGL_MakeCurrent(dpy, draw, read, ctx);
> }
> 
>-EGLBoolean EGLAPIENTRY eglQueryContext(EGLDisplay dpy, EGLContext ctx, EGLint attribute, EGLint *value)
>+EGLBoolean EGLAPIENTRY eglQueryContext(EGLDisplay dpy,
>+                                       EGLContext ctx,
>+                                       EGLint attribute,
>+                                       EGLint *value)
> {
>-    return egl::QueryContext(dpy, ctx, attribute, value);
>+    EnsureEGLLoaded();
>+    return EGL_QueryContext(dpy, ctx, attribute, value);
> }
> 
>-const char* EGLAPIENTRY eglQueryString(EGLDisplay dpy, EGLint name)
>+const char *EGLAPIENTRY eglQueryString(EGLDisplay dpy, EGLint name)
> {
>-    return egl::QueryString(dpy, name);
>+    EnsureEGLLoaded();
>+    return EGL_QueryString(dpy, name);
> }
> 
>-EGLBoolean EGLAPIENTRY eglQuerySurface(EGLDisplay dpy, EGLSurface surface, EGLint attribute, EGLint *value)
>+EGLBoolean EGLAPIENTRY eglQuerySurface(EGLDisplay dpy,
>+                                       EGLSurface surface,
>+                                       EGLint attribute,
>+                                       EGLint *value)
> {
>-    return egl::QuerySurface(dpy, surface, attribute, value);
>+    EnsureEGLLoaded();
>+    return EGL_QuerySurface(dpy, surface, attribute, value);
> }
> 
> EGLBoolean EGLAPIENTRY eglSwapBuffers(EGLDisplay dpy, EGLSurface surface)
> {
>-    return egl::SwapBuffers(dpy, surface);
>+    EnsureEGLLoaded();
>+    return EGL_SwapBuffers(dpy, surface);
> }
> 
> EGLBoolean EGLAPIENTRY eglTerminate(EGLDisplay dpy)
> {
>-    return egl::Terminate(dpy);
>+    EnsureEGLLoaded();
>+    return EGL_Terminate(dpy);
> }
> 
> EGLBoolean EGLAPIENTRY eglWaitGL(void)
> {
>-    return egl::WaitGL();
>+    EnsureEGLLoaded();
>+    return EGL_WaitGL();
> }
> 
> EGLBoolean EGLAPIENTRY eglWaitNative(EGLint engine)
> {
>-    return egl::WaitNative(engine);
>+    EnsureEGLLoaded();
>+    return EGL_WaitNative(engine);
> }
> 
> EGLBoolean EGLAPIENTRY eglBindTexImage(EGLDisplay dpy, EGLSurface surface, EGLint buffer)
> {
>-    return egl::BindTexImage(dpy, surface, buffer);
>+    EnsureEGLLoaded();
>+    return EGL_BindTexImage(dpy, surface, buffer);
> }
> 
> EGLBoolean EGLAPIENTRY eglReleaseTexImage(EGLDisplay dpy, EGLSurface surface, EGLint buffer)
> {
>-    return egl::ReleaseTexImage(dpy, surface, buffer);
>+    EnsureEGLLoaded();
>+    return EGL_ReleaseTexImage(dpy, surface, buffer);
> }
> 
>-EGLBoolean EGLAPIENTRY eglSurfaceAttrib(EGLDisplay dpy, EGLSurface surface, EGLint attribute, EGLint value)
>+EGLBoolean EGLAPIENTRY eglSurfaceAttrib(EGLDisplay dpy,
>+                                        EGLSurface surface,
>+                                        EGLint attribute,
>+                                        EGLint value)
> {
>-    return egl::SurfaceAttrib(dpy, surface, attribute, value);
>+    EnsureEGLLoaded();
>+    return EGL_SurfaceAttrib(dpy, surface, attribute, value);
> }
> 
> EGLBoolean EGLAPIENTRY eglSwapInterval(EGLDisplay dpy, EGLint interval)
> {
>-    return egl::SwapInterval(dpy, interval);
>+    EnsureEGLLoaded();
>+    return EGL_SwapInterval(dpy, interval);
> }
> 
> EGLBoolean EGLAPIENTRY eglBindAPI(EGLenum api)
> {
>-    return egl::BindAPI(api);
>+    EnsureEGLLoaded();
>+    return EGL_BindAPI(api);
> }
> 
> EGLenum EGLAPIENTRY eglQueryAPI(void)
> {
>-    return egl::QueryAPI();
>+    EnsureEGLLoaded();
>+    return EGL_QueryAPI();
> }
> 
>-EGLSurface EGLAPIENTRY eglCreatePbufferFromClientBuffer(EGLDisplay dpy, EGLenum buftype, EGLClientBuffer buffer, EGLConfig config, const EGLint *attrib_list)
>+EGLSurface EGLAPIENTRY eglCreatePbufferFromClientBuffer(EGLDisplay dpy,
>+                                                        EGLenum buftype,
>+                                                        EGLClientBuffer buffer,
>+                                                        EGLConfig config,
>+                                                        const EGLint *attrib_list)
> {
>-    return egl::CreatePbufferFromClientBuffer(dpy, buftype, buffer, config, attrib_list);
>+    EnsureEGLLoaded();
>+    return EGL_CreatePbufferFromClientBuffer(dpy, buftype, buffer, config, attrib_list);
> }
> 
> EGLBoolean EGLAPIENTRY eglReleaseThread(void)
> {
>-    return egl::ReleaseThread();
>+    EnsureEGLLoaded();
>+    return EGL_ReleaseThread();
> }
> 
> EGLBoolean EGLAPIENTRY eglWaitClient(void)
> {
>-    return egl::WaitClient();
>+    EnsureEGLLoaded();
>+    return EGL_WaitClient();
> }
> 
> EGLContext EGLAPIENTRY eglGetCurrentContext(void)
> {
>-    return egl::GetCurrentContext();
>+    EnsureEGLLoaded();
>+    return EGL_GetCurrentContext();
> }
> 
> EGLSync EGLAPIENTRY eglCreateSync(EGLDisplay dpy, EGLenum type, const EGLAttrib *attrib_list)
> {
>-    return egl::CreateSync(dpy, type, attrib_list);
>+    EnsureEGLLoaded();
>+    return EGL_CreateSync(dpy, type, attrib_list);
> }
> 
> EGLBoolean EGLAPIENTRY eglDestroySync(EGLDisplay dpy, EGLSync sync)
> {
>-    return egl::DestroySync(dpy, sync);
>+    EnsureEGLLoaded();
>+    return EGL_DestroySync(dpy, sync);
> }
> 
> EGLint EGLAPIENTRY eglClientWaitSync(EGLDisplay dpy, EGLSync sync, EGLint flags, EGLTime timeout)
> {
>-    return egl::ClientWaitSync(dpy, sync, flags, timeout);
>+    EnsureEGLLoaded();
>+    return EGL_ClientWaitSync(dpy, sync, flags, timeout);
> }
> 
>-EGLBoolean EGLAPIENTRY eglGetSyncAttrib(EGLDisplay dpy, EGLSync sync, EGLint attribute, EGLAttrib *value)
>+EGLBoolean EGLAPIENTRY eglGetSyncAttrib(EGLDisplay dpy,
>+                                        EGLSync sync,
>+                                        EGLint attribute,
>+                                        EGLAttrib *value)
> {
>-    return egl::GetSyncAttrib(dpy, sync, attribute, value);
>+    EnsureEGLLoaded();
>+    return EGL_GetSyncAttrib(dpy, sync, attribute, value);
> }
> 
>-EGLImage EGLAPIENTRY eglCreateImage(EGLDisplay dpy, EGLContext ctx, EGLenum target, EGLClientBuffer buffer, const EGLAttrib *attrib_list)
>+EGLImage EGLAPIENTRY eglCreateImage(EGLDisplay dpy,
>+                                    EGLContext ctx,
>+                                    EGLenum target,
>+                                    EGLClientBuffer buffer,
>+                                    const EGLAttrib *attrib_list)
> {
>-    return egl::CreateImage(dpy, ctx, target, buffer, attrib_list);
>+    EnsureEGLLoaded();
>+    return EGL_CreateImage(dpy, ctx, target, buffer, attrib_list);
> }
> 
> EGLBoolean EGLAPIENTRY eglDestroyImage(EGLDisplay dpy, EGLImage image)
> {
>-    return egl::DestroyImage(dpy, image);
>+    EnsureEGLLoaded();
>+    return EGL_DestroyImage(dpy, image);
> }
> 
>-EGLDisplay EGLAPIENTRY eglGetPlatformDisplay(EGLenum platform, void *native_display, const EGLAttrib *attrib_list)
>+EGLDisplay EGLAPIENTRY eglGetPlatformDisplay(EGLenum platform,
>+                                             void *native_display,
>+                                             const EGLAttrib *attrib_list)
> {
>-    return egl::GetPlatformDisplay(platform, native_display, attrib_list);
>+    EnsureEGLLoaded();
>+    return EGL_GetPlatformDisplay(platform, native_display, attrib_list);
> }
> 
>-EGLSurface EGLAPIENTRY eglCreatePlatformWindowSurface(EGLDisplay dpy, EGLConfig config, void *native_window, const EGLAttrib *attrib_list)
>+EGLSurface EGLAPIENTRY eglCreatePlatformWindowSurface(EGLDisplay dpy,
>+                                                      EGLConfig config,
>+                                                      void *native_window,
>+                                                      const EGLAttrib *attrib_list)
> {
>-    return egl::CreatePlatformWindowSurface(dpy, config, native_window, attrib_list);
>+    EnsureEGLLoaded();
>+    return EGL_CreatePlatformWindowSurface(dpy, config, native_window, attrib_list);
> }
> 
>-EGLSurface EGLAPIENTRY eglCreatePlatformPixmapSurface(EGLDisplay dpy, EGLConfig config, void *native_pixmap, const EGLAttrib *attrib_list)
>+EGLSurface EGLAPIENTRY eglCreatePlatformPixmapSurface(EGLDisplay dpy,
>+                                                      EGLConfig config,
>+                                                      void *native_pixmap,
>+                                                      const EGLAttrib *attrib_list)
> {
>-    return egl::CreatePlatformPixmapSurface(dpy, config, native_pixmap, attrib_list);
>+    EnsureEGLLoaded();
>+    return EGL_CreatePlatformPixmapSurface(dpy, config, native_pixmap, attrib_list);
> }
> 
> EGLBoolean EGLAPIENTRY eglWaitSync(EGLDisplay dpy, EGLSync sync, EGLint flags)
> {
>-    return egl::WaitSync(dpy, sync, flags);
>+    EnsureEGLLoaded();
>+    return EGL_WaitSync(dpy, sync, flags);
>+}
>+
>+EGLBoolean EGLAPIENTRY eglQuerySurfacePointerANGLE(EGLDisplay dpy,
>+                                                   EGLSurface surface,
>+                                                   EGLint attribute,
>+                                                   void **value)
>+{
>+    EnsureEGLLoaded();
>+    return EGL_QuerySurfacePointerANGLE(dpy, surface, attribute, value);
>+}
>+
>+EGLBoolean EGLAPIENTRY eglPostSubBufferNV(EGLDisplay dpy,
>+                                          EGLSurface surface,
>+                                          EGLint x,
>+                                          EGLint y,
>+                                          EGLint width,
>+                                          EGLint height)
>+{
>+    EnsureEGLLoaded();
>+    return EGL_PostSubBufferNV(dpy, surface, x, y, width, height);
> }
> 
>-EGLBoolean EGLAPIENTRY eglQuerySurfacePointerANGLE(EGLDisplay dpy, EGLSurface surface, EGLint attribute, void **value)
>+EGLDisplay EGLAPIENTRY eglGetPlatformDisplayEXT(EGLenum platform,
>+                                                void *native_display,
>+                                                const EGLint *attrib_list)
> {
>-    return egl::QuerySurfacePointerANGLE(dpy, surface, attribute, value);
>+    EnsureEGLLoaded();
>+    return EGL_GetPlatformDisplayEXT(platform, native_display, attrib_list);
> }
> 
>-EGLBoolean EGLAPIENTRY eglPostSubBufferNV(EGLDisplay dpy, EGLSurface surface, EGLint x, EGLint y, EGLint width, EGLint height)
>+EGLSurface EGLAPIENTRY eglCreatePlatformWindowSurfaceEXT(EGLDisplay dpy,
>+                                                         EGLConfig config,
>+                                                         void *native_window,
>+                                                         const EGLint *attrib_list)
> {
>-    return egl::PostSubBufferNV(dpy, surface, x, y, width, height);
>+    EnsureEGLLoaded();
>+    return EGL_CreatePlatformWindowSurfaceEXT(dpy, config, native_window, attrib_list);
> }
> 
>-EGLDisplay EGLAPIENTRY eglGetPlatformDisplayEXT(EGLenum platform, void *native_display, const EGLint *attrib_list)
>+EGLSurface EGLAPIENTRY eglCreatePlatformPixmapSurfaceEXT(EGLDisplay dpy,
>+                                                         EGLConfig config,
>+                                                         void *native_pixmap,
>+                                                         const EGLint *attrib_list)
> {
>-    return egl::GetPlatformDisplayEXT(platform, native_display, attrib_list);
>+    EnsureEGLLoaded();
>+    return EGL_CreatePlatformPixmapSurfaceEXT(dpy, config, native_pixmap, attrib_list);
> }
> 
> EGLBoolean EGLAPIENTRY eglQueryDisplayAttribEXT(EGLDisplay dpy, EGLint attribute, EGLAttrib *value)
> {
>-    return egl::QueryDisplayAttribEXT(dpy, attribute, value);
>+    EnsureEGLLoaded();
>+    return EGL_QueryDisplayAttribEXT(dpy, attribute, value);
> }
> 
>-EGLBoolean EGLAPIENTRY eglQueryDeviceAttribEXT(EGLDeviceEXT device, EGLint attribute, EGLAttrib *value)
>+EGLBoolean EGLAPIENTRY eglQueryDeviceAttribEXT(EGLDeviceEXT device,
>+                                               EGLint attribute,
>+                                               EGLAttrib *value)
> {
>-    return egl::QueryDeviceAttribEXT(device, attribute, value);
>+    EnsureEGLLoaded();
>+    return EGL_QueryDeviceAttribEXT(device, attribute, value);
> }
> 
>-const char * EGLAPIENTRY eglQueryDeviceStringEXT(EGLDeviceEXT device, EGLint name)
>+const char *EGLAPIENTRY eglQueryDeviceStringEXT(EGLDeviceEXT device, EGLint name)
> {
>-    return egl::QueryDeviceStringEXT(device, name);
>+    EnsureEGLLoaded();
>+    return EGL_QueryDeviceStringEXT(device, name);
> }
> 
> EGLImageKHR EGLAPIENTRY eglCreateImageKHR(EGLDisplay dpy,
>@@ -263,39 +435,46 @@ EGLImageKHR EGLAPIENTRY eglCreateImageKHR(EGLDisplay dpy,
>                                           EGLClientBuffer buffer,
>                                           const EGLint *attrib_list)
> {
>-    return egl::CreateImageKHR(dpy, ctx, target, buffer, attrib_list);
>+    EnsureEGLLoaded();
>+    return EGL_CreateImageKHR(dpy, ctx, target, buffer, attrib_list);
> }
> 
> EGLBoolean EGLAPIENTRY eglDestroyImageKHR(EGLDisplay dpy, EGLImageKHR image)
> {
>-    return egl::DestroyImageKHR(dpy, image);
>+    EnsureEGLLoaded();
>+    return EGL_DestroyImageKHR(dpy, image);
> }
> 
> EGLDeviceEXT EGLAPIENTRY eglCreateDeviceANGLE(EGLint device_type,
>                                               void *native_device,
>                                               const EGLAttrib *attrib_list)
> {
>-    return egl::CreateDeviceANGLE(device_type, native_device, attrib_list);
>+    EnsureEGLLoaded();
>+    return EGL_CreateDeviceANGLE(device_type, native_device, attrib_list);
> }
> 
> EGLBoolean EGLAPIENTRY eglReleaseDeviceANGLE(EGLDeviceEXT device)
> {
>-    return egl::ReleaseDeviceANGLE(device);
>+    EnsureEGLLoaded();
>+    return EGL_ReleaseDeviceANGLE(device);
> }
> 
> __eglMustCastToProperFunctionPointerType EGLAPIENTRY eglGetProcAddress(const char *procname)
> {
>-    return egl::GetProcAddress(procname);
>+    EnsureEGLLoaded();
>+    return EGL_GetProcAddress(procname);
> }
> 
> EGLStreamKHR EGLAPIENTRY eglCreateStreamKHR(EGLDisplay dpy, const EGLint *attrib_list)
> {
>-    return egl::CreateStreamKHR(dpy, attrib_list);
>+    EnsureEGLLoaded();
>+    return EGL_CreateStreamKHR(dpy, attrib_list);
> }
> 
> EGLBoolean EGLAPIENTRY eglDestroyStreamKHR(EGLDisplay dpy, EGLStreamKHR stream)
> {
>-    return egl::DestroyStreamKHR(dpy, stream);
>+    EnsureEGLLoaded();
>+    return EGL_DestroyStreamKHR(dpy, stream);
> }
> 
> EGLBoolean EGLAPIENTRY eglStreamAttribKHR(EGLDisplay dpy,
>@@ -303,7 +482,8 @@ EGLBoolean EGLAPIENTRY eglStreamAttribKHR(EGLDisplay dpy,
>                                           EGLenum attribute,
>                                           EGLint value)
> {
>-    return egl::StreamAttribKHR(dpy, stream, attribute, value);
>+    EnsureEGLLoaded();
>+    return EGL_StreamAttribKHR(dpy, stream, attribute, value);
> }
> 
> EGLBoolean EGLAPIENTRY eglQueryStreamKHR(EGLDisplay dpy,
>@@ -311,7 +491,8 @@ EGLBoolean EGLAPIENTRY eglQueryStreamKHR(EGLDisplay dpy,
>                                          EGLenum attribute,
>                                          EGLint *value)
> {
>-    return egl::QueryStreamKHR(dpy, stream, attribute, value);
>+    EnsureEGLLoaded();
>+    return EGL_QueryStreamKHR(dpy, stream, attribute, value);
> }
> 
> EGLBoolean EGLAPIENTRY eglQueryStreamu64KHR(EGLDisplay dpy,
>@@ -319,44 +500,51 @@ EGLBoolean EGLAPIENTRY eglQueryStreamu64KHR(EGLDisplay dpy,
>                                             EGLenum attribute,
>                                             EGLuint64KHR *value)
> {
>-    return egl::QueryStreamu64KHR(dpy, stream, attribute, value);
>+    EnsureEGLLoaded();
>+    return EGL_QueryStreamu64KHR(dpy, stream, attribute, value);
> }
> 
> EGLBoolean EGLAPIENTRY eglStreamConsumerGLTextureExternalKHR(EGLDisplay dpy, EGLStreamKHR stream)
> {
>-    return egl::StreamConsumerGLTextureExternalKHR(dpy, stream);
>+    EnsureEGLLoaded();
>+    return EGL_StreamConsumerGLTextureExternalKHR(dpy, stream);
> }
> 
> EGLBoolean EGLAPIENTRY eglStreamConsumerAcquireKHR(EGLDisplay dpy, EGLStreamKHR stream)
> {
>-    return egl::StreamConsumerAcquireKHR(dpy, stream);
>+    EnsureEGLLoaded();
>+    return EGL_StreamConsumerAcquireKHR(dpy, stream);
> }
> 
> EGLBoolean EGLAPIENTRY eglStreamConsumerReleaseKHR(EGLDisplay dpy, EGLStreamKHR stream)
> {
>-    return egl::StreamConsumerReleaseKHR(dpy, stream);
>+    EnsureEGLLoaded();
>+    return EGL_StreamConsumerReleaseKHR(dpy, stream);
> }
> 
> EGLBoolean EGLAPIENTRY eglStreamConsumerGLTextureExternalAttribsNV(EGLDisplay dpy,
>                                                                    EGLStreamKHR stream,
>-                                                                   EGLAttrib *attrib_list)
>+                                                                   const EGLAttrib *attrib_list)
> {
>-    return egl::StreamConsumerGLTextureExternalAttribsNV(dpy, stream, attrib_list);
>+    EnsureEGLLoaded();
>+    return EGL_StreamConsumerGLTextureExternalAttribsNV(dpy, stream, attrib_list);
> }
> 
>-EGLBoolean EGLAPIENTRY eglCreateStreamProducerD3DTextureNV12ANGLE(EGLDisplay dpy,
>-                                                                  EGLStreamKHR stream,
>-                                                                  const EGLAttrib *attrib_list)
>+EGLBoolean EGLAPIENTRY eglCreateStreamProducerD3DTextureANGLE(EGLDisplay dpy,
>+                                                              EGLStreamKHR stream,
>+                                                              const EGLAttrib *attrib_list)
> {
>-    return egl::CreateStreamProducerD3DTextureNV12ANGLE(dpy, stream, attrib_list);
>+    EnsureEGLLoaded();
>+    return EGL_CreateStreamProducerD3DTextureANGLE(dpy, stream, attrib_list);
> }
> 
>-EGLBoolean EGLAPIENTRY eglStreamPostD3DTextureNV12ANGLE(EGLDisplay dpy,
>-                                                        EGLStreamKHR stream,
>-                                                        void *texture,
>-                                                        const EGLAttrib *attrib_list)
>+EGLBoolean EGLAPIENTRY eglStreamPostD3DTextureANGLE(EGLDisplay dpy,
>+                                                    EGLStreamKHR stream,
>+                                                    void *texture,
>+                                                    const EGLAttrib *attrib_list)
> {
>-    return egl::StreamPostD3DTextureNV12ANGLE(dpy, stream, texture, attrib_list);
>+    EnsureEGLLoaded();
>+    return EGL_StreamPostD3DTextureANGLE(dpy, stream, texture, attrib_list);
> }
> 
> EGLBoolean EGLAPIENTRY eglGetSyncValuesCHROMIUM(EGLDisplay dpy,
>@@ -365,20 +553,31 @@ EGLBoolean EGLAPIENTRY eglGetSyncValuesCHROMIUM(EGLDisplay dpy,
>                                                 EGLuint64KHR *msc,
>                                                 EGLuint64KHR *sbc)
> {
>-    return egl::GetSyncValuesCHROMIUM(dpy, surface, ust, msc, sbc);
>+    EnsureEGLLoaded();
>+    return EGL_GetSyncValuesCHROMIUM(dpy, surface, ust, msc, sbc);
> }
> 
>-EGLBoolean EGLAPIENTRY eglSwapBuffersWithDamageEXT(EGLDisplay dpy,
>+EGLBoolean EGLAPIENTRY eglSwapBuffersWithDamageKHR(EGLDisplay dpy,
>                                                    EGLSurface surface,
>                                                    EGLint *rects,
>                                                    EGLint n_rects)
> {
>-    return egl::SwapBuffersWithDamageEXT(dpy, surface, rects, n_rects);
>+    EnsureEGLLoaded();
>+    return EGL_SwapBuffersWithDamageKHR(dpy, surface, rects, n_rects);
>+}
>+
>+EGLBoolean EGLAPIENTRY eglPresentationTimeANDROID(EGLDisplay dpy,
>+                                                  EGLSurface surface,
>+                                                  EGLnsecsANDROID time)
>+{
>+    EnsureEGLLoaded();
>+    return EGL_PresentationTimeANDROID(dpy, surface, time);
> }
> 
> EGLint EGLAPIENTRY eglProgramCacheGetAttribANGLE(EGLDisplay dpy, EGLenum attrib)
> {
>-    return egl::ProgramCacheGetAttribANGLE(dpy, attrib);
>+    EnsureEGLLoaded();
>+    return EGL_ProgramCacheGetAttribANGLE(dpy, attrib);
> }
> 
> void EGLAPIENTRY eglProgramCacheQueryANGLE(EGLDisplay dpy,
>@@ -388,7 +587,7 @@ void EGLAPIENTRY eglProgramCacheQueryANGLE(EGLDisplay dpy,
>                                            void *binary,
>                                            EGLint *binarysize)
> {
>-    egl::ProgramCacheQueryANGLE(dpy, index, key, keysize, binary, binarysize);
>+    EGL_ProgramCacheQueryANGLE(dpy, index, key, keysize, binary, binarysize);
> }
> 
> void EGLAPIENTRY eglProgramCachePopulateANGLE(EGLDisplay dpy,
>@@ -397,12 +596,86 @@ void EGLAPIENTRY eglProgramCachePopulateANGLE(EGLDisplay dpy,
>                                               const void *binary,
>                                               EGLint binarysize)
> {
>-    egl::ProgramCachePopulateANGLE(dpy, key, keysize, binary, binarysize);
>+    EGL_ProgramCachePopulateANGLE(dpy, key, keysize, binary, binarysize);
> }
> 
> EGLint EGLAPIENTRY eglProgramCacheResizeANGLE(EGLDisplay dpy, EGLint limit, EGLenum mode)
> {
>-    return egl::ProgramCacheResizeANGLE(dpy, limit, mode);
>+    EnsureEGLLoaded();
>+    return EGL_ProgramCacheResizeANGLE(dpy, limit, mode);
>+}
>+
>+EGLint EGLAPIENTRY eglDebugMessageControlKHR(EGLDEBUGPROCKHR callback, const EGLAttrib *attrib_list)
>+{
>+    EnsureEGLLoaded();
>+    return EGL_DebugMessageControlKHR(callback, attrib_list);
> }
> 
>+EGLBoolean EGLAPIENTRY eglQueryDebugKHR(EGLint attribute, EGLAttrib *value)
>+{
>+    EnsureEGLLoaded();
>+    return EGL_QueryDebugKHR(attribute, value);
>+}
>+
>+EGLint EGLAPIENTRY eglLabelObjectKHR(EGLDisplay dpy,
>+                                     EGLenum objectType,
>+                                     EGLObjectKHR object,
>+                                     EGLLabelKHR label)
>+{
>+    EnsureEGLLoaded();
>+    return EGL_LabelObjectKHR(dpy, objectType, object, label);
>+}
>+
>+void EGLAPIENTRY eglSetBlobCacheFuncsANDROID(EGLDisplay dpy,
>+                                             EGLSetBlobFuncANDROID set,
>+                                             EGLGetBlobFuncANDROID get)
>+{
>+    EnsureEGLLoaded();
>+    return EGL_SetBlobCacheFuncsANDROID(dpy, set, get);
>+}
>+
>+EGLBoolean EGLAPIENTRY eglGetCompositorTimingSupportedANDROID(EGLDisplay dpy,
>+                                                              EGLSurface surface,
>+                                                              EGLint name)
>+{
>+    EnsureEGLLoaded();
>+    return EGL_GetCompositorTimingSupportedANDROID(dpy, surface, name);
>+}
>+
>+EGLBoolean EGLAPIENTRY eglGetCompositorTimingANDROID(EGLDisplay dpy,
>+                                                     EGLSurface surface,
>+                                                     EGLint numTimestamps,
>+                                                     const EGLint *names,
>+                                                     EGLnsecsANDROID *values)
>+{
>+    EnsureEGLLoaded();
>+    return EGL_GetCompositorTimingANDROID(dpy, surface, numTimestamps, names, values);
>+}
>+
>+EGLBoolean EGLAPIENTRY eglGetNextFrameIdANDROID(EGLDisplay dpy,
>+                                                EGLSurface surface,
>+                                                EGLuint64KHR *frameId)
>+{
>+    EnsureEGLLoaded();
>+    return EGL_GetNextFrameIdANDROID(dpy, surface, frameId);
>+}
>+
>+EGLBoolean EGLAPIENTRY eglGetFrameTimestampSupportedANDROID(EGLDisplay dpy,
>+                                                            EGLSurface surface,
>+                                                            EGLint timestamp)
>+{
>+    EnsureEGLLoaded();
>+    return EGL_GetFrameTimestampSupportedANDROID(dpy, surface, timestamp);
>+}
>+
>+EGLBoolean EGLAPIENTRY eglGetFrameTimestampsANDROID(EGLDisplay dpy,
>+                                                    EGLSurface surface,
>+                                                    EGLuint64KHR frameId,
>+                                                    EGLint numTimestamps,
>+                                                    const EGLint *timestamps,
>+                                                    EGLnsecsANDROID *values)
>+{
>+    EnsureEGLLoaded();
>+    return EGL_GetFrameTimestampsANDROID(dpy, surface, frameId, numTimestamps, timestamps, values);
>+}
> }  // extern "C"
>diff --git a/Source/ThirdParty/ANGLE/src/libEGL/libEGL.def b/Source/ThirdParty/ANGLE/src/libEGL/libEGL.def
>index e68d27295e0..053bfbfed83 100644
>--- a/Source/ThirdParty/ANGLE/src/libEGL/libEGL.def
>+++ b/Source/ThirdParty/ANGLE/src/libEGL/libEGL.def
>@@ -55,14 +55,21 @@ EXPORTS
>     eglStreamConsumerAcquireKHR                 @61
>     eglStreamConsumerReleaseKHR                 @62
>     eglStreamConsumerGLTextureExternalAttribsNV @63
>-    eglCreateStreamProducerD3DTextureNV12ANGLE  @64
>-    eglStreamPostD3DTextureNV12ANGLE            @65
>+    eglCreateStreamProducerD3DTextureANGLE      @64
>+    eglStreamPostD3DTextureANGLE                @65
>     eglGetSyncValuesCHROMIUM                    @66
>-    eglSwapBuffersWithDamageEXT                 @67
>+    eglSwapBuffersWithDamageKHR                 @67
>     eglProgramCacheGetAttribANGLE               @68
>     eglProgramCachePopulateANGLE                @69
>     eglProgramCacheQueryANGLE                   @70
>     eglProgramCacheResizeANGLE                  @71
>+    eglCreatePlatformWindowSurfaceEXT           @72
>+    eglCreatePlatformPixmapSurfaceEXT           @73
>+    eglPresentationTimeANDROID                  @74
>+    eglDebugMessageControlKHR                   @75
>+    eglQueryDebugKHR                            @76
>+    eglLabelObjectKHR                           @77
>+    eglSetBlobCacheFuncsANDROID                 @78
> 
>     ; 1.5 entry points
>     eglCreateSync                               @38
>diff --git a/Source/ThirdParty/ANGLE/src/libEGL/resource.h b/Source/ThirdParty/ANGLE/src/libEGL/resource.h
>index 3921f4c0774..018d085c02c 100644
>--- a/Source/ThirdParty/ANGLE/src/libEGL/resource.h
>+++ b/Source/ThirdParty/ANGLE/src/libEGL/resource.h
>@@ -3,12 +3,12 @@
> // Used by libEGL.rc
> 
> // Next default values for new objects
>-// 
>+//
> #ifdef APSTUDIO_INVOKED
>-#ifndef APSTUDIO_READONLY_SYMBOLS
>-#define _APS_NEXT_RESOURCE_VALUE        101
>-#define _APS_NEXT_COMMAND_VALUE         40001
>-#define _APS_NEXT_CONTROL_VALUE         1001
>-#define _APS_NEXT_SYMED_VALUE           101
>-#endif
>+#    ifndef APSTUDIO_READONLY_SYMBOLS
>+#        define _APS_NEXT_RESOURCE_VALUE 101
>+#        define _APS_NEXT_COMMAND_VALUE 40001
>+#        define _APS_NEXT_CONTROL_VALUE 1001
>+#        define _APS_NEXT_SYMED_VALUE 101
>+#    endif
> #endif
>diff --git a/Source/ThirdParty/ANGLE/src/libGLESv1_CM/libGLESv1_CM.cpp b/Source/ThirdParty/ANGLE/src/libGLESv1_CM/libGLESv1_CM.cpp
>new file mode 100644
>index 00000000000..cfa8b7542fb
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libGLESv1_CM/libGLESv1_CM.cpp
>@@ -0,0 +1,868 @@
>+//
>+// Copyright (c) 2018 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+
>+// libGLESv1_CM.cpp: Implements the exported OpenGL ES 1.0 functions.
>+
>+#include "angle_gl.h"
>+
>+#include "libGLESv2/entry_points_gles_1_0_autogen.h"
>+#include "libGLESv2/entry_points_gles_2_0_autogen.h"
>+#include "libGLESv2/entry_points_gles_ext_autogen.h"
>+
>+extern "C" {
>+
>+void GL_APIENTRY glAlphaFunc(GLenum func, GLfloat ref)
>+{
>+    return gl::AlphaFunc(func, ref);
>+}
>+
>+void GL_APIENTRY glClearColor(GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha)
>+{
>+    return gl::ClearColor(red, green, blue, alpha);
>+}
>+
>+void GL_APIENTRY glClearDepthf(GLfloat d)
>+{
>+    return gl::ClearDepthf(d);
>+}
>+
>+void GL_APIENTRY glClipPlanef(GLenum p, const GLfloat *eqn)
>+{
>+    return gl::ClipPlanef(p, eqn);
>+}
>+
>+void GL_APIENTRY glColor4f(GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha)
>+{
>+    return gl::Color4f(red, green, blue, alpha);
>+}
>+
>+void GL_APIENTRY glDepthRangef(GLfloat n, GLfloat f)
>+{
>+    return gl::DepthRangef(n, f);
>+}
>+
>+void GL_APIENTRY glFogf(GLenum pname, GLfloat param)
>+{
>+    return gl::Fogf(pname, param);
>+}
>+
>+void GL_APIENTRY glFogfv(GLenum pname, const GLfloat *params)
>+{
>+    return gl::Fogfv(pname, params);
>+}
>+
>+void GL_APIENTRY glFrustumf(GLfloat l, GLfloat r, GLfloat b, GLfloat t, GLfloat n, GLfloat f)
>+{
>+    return gl::Frustumf(l, r, b, t, n, f);
>+}
>+
>+void GL_APIENTRY glGetClipPlanef(GLenum plane, GLfloat *equation)
>+{
>+    return gl::GetClipPlanef(plane, equation);
>+}
>+
>+void GL_APIENTRY glGetFloatv(GLenum pname, GLfloat *data)
>+{
>+    return gl::GetFloatv(pname, data);
>+}
>+
>+void GL_APIENTRY glGetLightfv(GLenum light, GLenum pname, GLfloat *params)
>+{
>+    return gl::GetLightfv(light, pname, params);
>+}
>+
>+void GL_APIENTRY glGetMaterialfv(GLenum face, GLenum pname, GLfloat *params)
>+{
>+    return gl::GetMaterialfv(face, pname, params);
>+}
>+
>+void GL_APIENTRY glGetTexEnvfv(GLenum target, GLenum pname, GLfloat *params)
>+{
>+    return gl::GetTexEnvfv(target, pname, params);
>+}
>+
>+void GL_APIENTRY glGetTexParameterfv(GLenum target, GLenum pname, GLfloat *params)
>+{
>+    return gl::GetTexParameterfv(target, pname, params);
>+}
>+
>+void GL_APIENTRY glLightModelf(GLenum pname, GLfloat param)
>+{
>+    return gl::LightModelf(pname, param);
>+}
>+
>+void GL_APIENTRY glLightModelfv(GLenum pname, const GLfloat *params)
>+{
>+    return gl::LightModelfv(pname, params);
>+}
>+
>+void GL_APIENTRY glLightf(GLenum light, GLenum pname, GLfloat param)
>+{
>+    return gl::Lightf(light, pname, param);
>+}
>+
>+void GL_APIENTRY glLightfv(GLenum light, GLenum pname, const GLfloat *params)
>+{
>+    return gl::Lightfv(light, pname, params);
>+}
>+
>+void GL_APIENTRY glLineWidth(GLfloat width)
>+{
>+    return gl::LineWidth(width);
>+}
>+
>+void GL_APIENTRY glLoadMatrixf(const GLfloat *m)
>+{
>+    return gl::LoadMatrixf(m);
>+}
>+
>+void GL_APIENTRY glMaterialf(GLenum face, GLenum pname, GLfloat param)
>+{
>+    return gl::Materialf(face, pname, param);
>+}
>+
>+void GL_APIENTRY glMaterialfv(GLenum face, GLenum pname, const GLfloat *params)
>+{
>+    return gl::Materialfv(face, pname, params);
>+}
>+
>+void GL_APIENTRY glMultMatrixf(const GLfloat *m)
>+{
>+    return gl::MultMatrixf(m);
>+}
>+
>+void GL_APIENTRY glMultiTexCoord4f(GLenum target, GLfloat s, GLfloat t, GLfloat r, GLfloat q)
>+{
>+    return gl::MultiTexCoord4f(target, s, t, r, q);
>+}
>+
>+void GL_APIENTRY glNormal3f(GLfloat nx, GLfloat ny, GLfloat nz)
>+{
>+    return gl::Normal3f(nx, ny, nz);
>+}
>+
>+void GL_APIENTRY glOrthof(GLfloat l, GLfloat r, GLfloat b, GLfloat t, GLfloat n, GLfloat f)
>+{
>+    return gl::Orthof(l, r, b, t, n, f);
>+}
>+
>+void GL_APIENTRY glPointParameterf(GLenum pname, GLfloat param)
>+{
>+    return gl::PointParameterf(pname, param);
>+}
>+
>+void GL_APIENTRY glPointParameterfv(GLenum pname, const GLfloat *params)
>+{
>+    return gl::PointParameterfv(pname, params);
>+}
>+
>+void GL_APIENTRY glPointSize(GLfloat size)
>+{
>+    return gl::PointSize(size);
>+}
>+
>+void GL_APIENTRY glPolygonOffset(GLfloat factor, GLfloat units)
>+{
>+    return gl::PolygonOffset(factor, units);
>+}
>+
>+void GL_APIENTRY glRotatef(GLfloat angle, GLfloat x, GLfloat y, GLfloat z)
>+{
>+    return gl::Rotatef(angle, x, y, z);
>+}
>+
>+void GL_APIENTRY glScalef(GLfloat x, GLfloat y, GLfloat z)
>+{
>+    return gl::Scalef(x, y, z);
>+}
>+
>+void GL_APIENTRY glTexEnvf(GLenum target, GLenum pname, GLfloat param)
>+{
>+    return gl::TexEnvf(target, pname, param);
>+}
>+
>+void GL_APIENTRY glTexEnvfv(GLenum target, GLenum pname, const GLfloat *params)
>+{
>+    return gl::TexEnvfv(target, pname, params);
>+}
>+
>+void GL_APIENTRY glTexParameterf(GLenum target, GLenum pname, GLfloat param)
>+{
>+    return gl::TexParameterf(target, pname, param);
>+}
>+
>+void GL_APIENTRY glTexParameterfv(GLenum target, GLenum pname, const GLfloat *params)
>+{
>+    return gl::TexParameterfv(target, pname, params);
>+}
>+
>+void GL_APIENTRY glTranslatef(GLfloat x, GLfloat y, GLfloat z)
>+{
>+    return gl::Translatef(x, y, z);
>+}
>+
>+void GL_APIENTRY glActiveTexture(GLenum texture)
>+{
>+    return gl::ActiveTexture(texture);
>+}
>+
>+void GL_APIENTRY glAlphaFuncx(GLenum func, GLfixed ref)
>+{
>+    return gl::AlphaFuncx(func, ref);
>+}
>+
>+void GL_APIENTRY glBindBuffer(GLenum target, GLuint buffer)
>+{
>+    return gl::BindBuffer(target, buffer);
>+}
>+
>+void GL_APIENTRY glBindTexture(GLenum target, GLuint texture)
>+{
>+    return gl::BindTexture(target, texture);
>+}
>+
>+void GL_APIENTRY glBlendFunc(GLenum sfactor, GLenum dfactor)
>+{
>+    return gl::BlendFunc(sfactor, dfactor);
>+}
>+
>+void GL_APIENTRY glBufferData(GLenum target, GLsizeiptr size, const void *data, GLenum usage)
>+{
>+    return gl::BufferData(target, size, data, usage);
>+}
>+
>+void GL_APIENTRY glBufferSubData(GLenum target, GLintptr offset, GLsizeiptr size, const void *data)
>+{
>+    return gl::BufferSubData(target, offset, size, data);
>+}
>+
>+void GL_APIENTRY glClear(GLbitfield mask)
>+{
>+    return gl::Clear(mask);
>+}
>+
>+void GL_APIENTRY glClearColorx(GLfixed red, GLfixed green, GLfixed blue, GLfixed alpha)
>+{
>+    return gl::ClearColorx(red, green, blue, alpha);
>+}
>+
>+void GL_APIENTRY glClearDepthx(GLfixed depth)
>+{
>+    return gl::ClearDepthx(depth);
>+}
>+
>+void GL_APIENTRY glClearStencil(GLint s)
>+{
>+    return gl::ClearStencil(s);
>+}
>+
>+void GL_APIENTRY glClientActiveTexture(GLenum texture)
>+{
>+    return gl::ClientActiveTexture(texture);
>+}
>+
>+void GL_APIENTRY glClipPlanex(GLenum plane, const GLfixed *equation)
>+{
>+    return gl::ClipPlanex(plane, equation);
>+}
>+
>+void GL_APIENTRY glColor4ub(GLubyte red, GLubyte green, GLubyte blue, GLubyte alpha)
>+{
>+    return gl::Color4ub(red, green, blue, alpha);
>+}
>+
>+void GL_APIENTRY glColor4x(GLfixed red, GLfixed green, GLfixed blue, GLfixed alpha)
>+{
>+    return gl::Color4x(red, green, blue, alpha);
>+}
>+
>+void GL_APIENTRY glColorMask(GLboolean red, GLboolean green, GLboolean blue, GLboolean alpha)
>+{
>+    return gl::ColorMask(red, green, blue, alpha);
>+}
>+
>+void GL_APIENTRY glColorPointer(GLint size, GLenum type, GLsizei stride, const void *pointer)
>+{
>+    return gl::ColorPointer(size, type, stride, pointer);
>+}
>+
>+void GL_APIENTRY glCompressedTexImage2D(GLenum target,
>+                                        GLint level,
>+                                        GLenum internalformat,
>+                                        GLsizei width,
>+                                        GLsizei height,
>+                                        GLint border,
>+                                        GLsizei imageSize,
>+                                        const void *data)
>+{
>+    return gl::CompressedTexImage2D(target, level, internalformat, width, height, border, imageSize,
>+                                    data);
>+}
>+
>+void GL_APIENTRY glCompressedTexSubImage2D(GLenum target,
>+                                           GLint level,
>+                                           GLint xoffset,
>+                                           GLint yoffset,
>+                                           GLsizei width,
>+                                           GLsizei height,
>+                                           GLenum format,
>+                                           GLsizei imageSize,
>+                                           const void *data)
>+{
>+    return gl::CompressedTexSubImage2D(target, level, xoffset, yoffset, width, height, format,
>+                                       imageSize, data);
>+}
>+
>+void GL_APIENTRY glCopyTexImage2D(GLenum target,
>+                                  GLint level,
>+                                  GLenum internalformat,
>+                                  GLint x,
>+                                  GLint y,
>+                                  GLsizei width,
>+                                  GLsizei height,
>+                                  GLint border)
>+{
>+    return gl::CopyTexImage2D(target, level, internalformat, x, y, width, height, border);
>+}
>+
>+void GL_APIENTRY glCopyTexSubImage2D(GLenum target,
>+                                     GLint level,
>+                                     GLint xoffset,
>+                                     GLint yoffset,
>+                                     GLint x,
>+                                     GLint y,
>+                                     GLsizei width,
>+                                     GLsizei height)
>+{
>+    return gl::CopyTexSubImage2D(target, level, xoffset, yoffset, x, y, width, height);
>+}
>+
>+void GL_APIENTRY glCullFace(GLenum mode)
>+{
>+    return gl::CullFace(mode);
>+}
>+
>+void GL_APIENTRY glDeleteBuffers(GLsizei n, const GLuint *buffers)
>+{
>+    return gl::DeleteBuffers(n, buffers);
>+}
>+
>+void GL_APIENTRY glDeleteTextures(GLsizei n, const GLuint *textures)
>+{
>+    return gl::DeleteTextures(n, textures);
>+}
>+
>+void GL_APIENTRY glDepthFunc(GLenum func)
>+{
>+    return gl::DepthFunc(func);
>+}
>+
>+void GL_APIENTRY glDepthMask(GLboolean flag)
>+{
>+    return gl::DepthMask(flag);
>+}
>+
>+void GL_APIENTRY glDepthRangex(GLfixed n, GLfixed f)
>+{
>+    return gl::DepthRangex(n, f);
>+}
>+
>+void GL_APIENTRY glDisable(GLenum cap)
>+{
>+    return gl::Disable(cap);
>+}
>+
>+void GL_APIENTRY glDisableClientState(GLenum array)
>+{
>+    return gl::DisableClientState(array);
>+}
>+
>+void GL_APIENTRY glDrawArrays(GLenum mode, GLint first, GLsizei count)
>+{
>+    return gl::DrawArrays(mode, first, count);
>+}
>+
>+void GL_APIENTRY glDrawElements(GLenum mode, GLsizei count, GLenum type, const void *indices)
>+{
>+    return gl::DrawElements(mode, count, type, indices);
>+}
>+
>+void GL_APIENTRY glEnable(GLenum cap)
>+{
>+    return gl::Enable(cap);
>+}
>+
>+void GL_APIENTRY glEnableClientState(GLenum array)
>+{
>+    return gl::EnableClientState(array);
>+}
>+
>+void GL_APIENTRY glFinish(void)
>+{
>+    return gl::Finish();
>+}
>+
>+void GL_APIENTRY glFlush(void)
>+{
>+    return gl::Flush();
>+}
>+
>+void GL_APIENTRY glFogx(GLenum pname, GLfixed param)
>+{
>+    return gl::Fogx(pname, param);
>+}
>+
>+void GL_APIENTRY glFogxv(GLenum pname, const GLfixed *param)
>+{
>+    return gl::Fogxv(pname, param);
>+}
>+
>+void GL_APIENTRY glFrontFace(GLenum mode)
>+{
>+    return gl::FrontFace(mode);
>+}
>+
>+void GL_APIENTRY glFrustumx(GLfixed l, GLfixed r, GLfixed b, GLfixed t, GLfixed n, GLfixed f)
>+{
>+    return gl::Frustumx(l, r, b, t, n, f);
>+}
>+
>+void GL_APIENTRY glGetBooleanv(GLenum pname, GLboolean *data)
>+{
>+    return gl::GetBooleanv(pname, data);
>+}
>+
>+void GL_APIENTRY glGetBufferParameteriv(GLenum target, GLenum pname, GLint *params)
>+{
>+    return gl::GetBufferParameteriv(target, pname, params);
>+}
>+
>+void GL_APIENTRY glGetClipPlanex(GLenum plane, GLfixed *equation)
>+{
>+    return gl::GetClipPlanex(plane, equation);
>+}
>+
>+void GL_APIENTRY glGenBuffers(GLsizei n, GLuint *buffers)
>+{
>+    return gl::GenBuffers(n, buffers);
>+}
>+
>+void GL_APIENTRY glGenTextures(GLsizei n, GLuint *textures)
>+{
>+    return gl::GenTextures(n, textures);
>+}
>+
>+GLenum GL_APIENTRY glGetError(void)
>+{
>+    return gl::GetError();
>+}
>+
>+void GL_APIENTRY glGetFixedv(GLenum pname, GLfixed *params)
>+{
>+    return gl::GetFixedv(pname, params);
>+}
>+
>+void GL_APIENTRY glGetIntegerv(GLenum pname, GLint *data)
>+{
>+    return gl::GetIntegerv(pname, data);
>+}
>+
>+void GL_APIENTRY glGetLightxv(GLenum light, GLenum pname, GLfixed *params)
>+{
>+    return gl::GetLightxv(light, pname, params);
>+}
>+
>+void GL_APIENTRY glGetMaterialxv(GLenum face, GLenum pname, GLfixed *params)
>+{
>+    return gl::GetMaterialxv(face, pname, params);
>+}
>+
>+void GL_APIENTRY glGetPointerv(GLenum pname, void **params)
>+{
>+    return gl::GetPointerv(pname, params);
>+}
>+
>+const GLubyte *GL_APIENTRY glGetString(GLenum name)
>+{
>+    return gl::GetString(name);
>+}
>+
>+void GL_APIENTRY glGetTexEnviv(GLenum target, GLenum pname, GLint *params)
>+{
>+    return gl::GetTexEnviv(target, pname, params);
>+}
>+
>+void GL_APIENTRY glGetTexEnvxv(GLenum target, GLenum pname, GLfixed *params)
>+{
>+    return gl::GetTexEnvxv(target, pname, params);
>+}
>+
>+void GL_APIENTRY glGetTexParameteriv(GLenum target, GLenum pname, GLint *params)
>+{
>+    return gl::GetTexParameteriv(target, pname, params);
>+}
>+
>+void GL_APIENTRY glGetTexParameterxv(GLenum target, GLenum pname, GLfixed *params)
>+{
>+    return gl::GetTexParameterxv(target, pname, params);
>+}
>+
>+void GL_APIENTRY glHint(GLenum target, GLenum mode)
>+{
>+    return gl::Hint(target, mode);
>+}
>+
>+GLboolean GL_APIENTRY glIsBuffer(GLuint buffer)
>+{
>+    return gl::IsBuffer(buffer);
>+}
>+
>+GLboolean GL_APIENTRY glIsEnabled(GLenum cap)
>+{
>+    return gl::IsEnabled(cap);
>+}
>+
>+GLboolean GL_APIENTRY glIsTexture(GLuint texture)
>+{
>+    return gl::IsTexture(texture);
>+}
>+
>+void GL_APIENTRY glLightModelx(GLenum pname, GLfixed param)
>+{
>+    return gl::LightModelx(pname, param);
>+}
>+
>+void GL_APIENTRY glLightModelxv(GLenum pname, const GLfixed *param)
>+{
>+    return gl::LightModelxv(pname, param);
>+}
>+
>+void GL_APIENTRY glLightx(GLenum light, GLenum pname, GLfixed param)
>+{
>+    return gl::Lightx(light, pname, param);
>+}
>+
>+void GL_APIENTRY glLightxv(GLenum light, GLenum pname, const GLfixed *params)
>+{
>+    return gl::Lightxv(light, pname, params);
>+}
>+
>+void GL_APIENTRY glLineWidthx(GLfixed width)
>+{
>+    return gl::LineWidthx(width);
>+}
>+
>+void GL_APIENTRY glLoadIdentity(void)
>+{
>+    return gl::LoadIdentity();
>+}
>+
>+void GL_APIENTRY glLoadMatrixx(const GLfixed *m)
>+{
>+    return gl::LoadMatrixx(m);
>+}
>+
>+void GL_APIENTRY glLogicOp(GLenum opcode)
>+{
>+    return gl::LogicOp(opcode);
>+}
>+
>+void GL_APIENTRY glMaterialx(GLenum face, GLenum pname, GLfixed param)
>+{
>+    return gl::Materialx(face, pname, param);
>+}
>+
>+void GL_APIENTRY glMaterialxv(GLenum face, GLenum pname, const GLfixed *param)
>+{
>+    return gl::Materialxv(face, pname, param);
>+}
>+
>+void GL_APIENTRY glMatrixMode(GLenum mode)
>+{
>+    return gl::MatrixMode(mode);
>+}
>+
>+void GL_APIENTRY glMultMatrixx(const GLfixed *m)
>+{
>+    return gl::MultMatrixx(m);
>+}
>+
>+void GL_APIENTRY glMultiTexCoord4x(GLenum texture, GLfixed s, GLfixed t, GLfixed r, GLfixed q)
>+{
>+    return gl::MultiTexCoord4x(texture, s, t, r, q);
>+}
>+
>+void GL_APIENTRY glNormal3x(GLfixed nx, GLfixed ny, GLfixed nz)
>+{
>+    return gl::Normal3x(nx, ny, nz);
>+}
>+
>+void GL_APIENTRY glNormalPointer(GLenum type, GLsizei stride, const void *pointer)
>+{
>+    return gl::NormalPointer(type, stride, pointer);
>+}
>+
>+void GL_APIENTRY glOrthox(GLfixed l, GLfixed r, GLfixed b, GLfixed t, GLfixed n, GLfixed f)
>+{
>+    return gl::Orthox(l, r, b, t, n, f);
>+}
>+
>+void GL_APIENTRY glPixelStorei(GLenum pname, GLint param)
>+{
>+    return gl::PixelStorei(pname, param);
>+}
>+
>+void GL_APIENTRY glPointParameterx(GLenum pname, GLfixed param)
>+{
>+    return gl::PointParameterx(pname, param);
>+}
>+
>+void GL_APIENTRY glPointParameterxv(GLenum pname, const GLfixed *params)
>+{
>+    return gl::PointParameterxv(pname, params);
>+}
>+
>+void GL_APIENTRY glPointSizex(GLfixed size)
>+{
>+    return gl::PointSizex(size);
>+}
>+
>+void GL_APIENTRY glPolygonOffsetx(GLfixed factor, GLfixed units)
>+{
>+    return gl::PolygonOffsetx(factor, units);
>+}
>+
>+void GL_APIENTRY glPopMatrix(void)
>+{
>+    return gl::PopMatrix();
>+}
>+
>+void GL_APIENTRY glPushMatrix(void)
>+{
>+    return gl::PushMatrix();
>+}
>+
>+void GL_APIENTRY glReadPixels(GLint x,
>+                              GLint y,
>+                              GLsizei width,
>+                              GLsizei height,
>+                              GLenum format,
>+                              GLenum type,
>+                              void *pixels)
>+{
>+    return gl::ReadPixels(x, y, width, height, format, type, pixels);
>+}
>+
>+void GL_APIENTRY glRotatex(GLfixed angle, GLfixed x, GLfixed y, GLfixed z)
>+{
>+    return gl::Rotatex(angle, x, y, z);
>+}
>+
>+void GL_APIENTRY glSampleCoverage(GLfloat value, GLboolean invert)
>+{
>+    return gl::SampleCoverage(value, invert);
>+}
>+
>+void GL_APIENTRY glSampleCoveragex(GLclampx value, GLboolean invert)
>+{
>+    return gl::SampleCoveragex(value, invert);
>+}
>+
>+void GL_APIENTRY glScalex(GLfixed x, GLfixed y, GLfixed z)
>+{
>+    return gl::Scalex(x, y, z);
>+}
>+
>+void GL_APIENTRY glScissor(GLint x, GLint y, GLsizei width, GLsizei height)
>+{
>+    return gl::Scissor(x, y, width, height);
>+}
>+
>+void GL_APIENTRY glShadeModel(GLenum mode)
>+{
>+    return gl::ShadeModel(mode);
>+}
>+
>+void GL_APIENTRY glStencilFunc(GLenum func, GLint ref, GLuint mask)
>+{
>+    return gl::StencilFunc(func, ref, mask);
>+}
>+
>+void GL_APIENTRY glStencilMask(GLuint mask)
>+{
>+    return gl::StencilMask(mask);
>+}
>+
>+void GL_APIENTRY glStencilOp(GLenum fail, GLenum zfail, GLenum zpass)
>+{
>+    return gl::StencilOp(fail, zfail, zpass);
>+}
>+
>+void GL_APIENTRY glTexCoordPointer(GLint size, GLenum type, GLsizei stride, const void *pointer)
>+{
>+    return gl::TexCoordPointer(size, type, stride, pointer);
>+}
>+
>+void GL_APIENTRY glTexEnvi(GLenum target, GLenum pname, GLint param)
>+{
>+    return gl::TexEnvi(target, pname, param);
>+}
>+
>+void GL_APIENTRY glTexEnvx(GLenum target, GLenum pname, GLfixed param)
>+{
>+    return gl::TexEnvx(target, pname, param);
>+}
>+
>+void GL_APIENTRY glTexEnviv(GLenum target, GLenum pname, const GLint *params)
>+{
>+    return gl::TexEnviv(target, pname, params);
>+}
>+
>+void GL_APIENTRY glTexEnvxv(GLenum target, GLenum pname, const GLfixed *params)
>+{
>+    return gl::TexEnvxv(target, pname, params);
>+}
>+
>+void GL_APIENTRY glTexImage2D(GLenum target,
>+                              GLint level,
>+                              GLint internalformat,
>+                              GLsizei width,
>+                              GLsizei height,
>+                              GLint border,
>+                              GLenum format,
>+                              GLenum type,
>+                              const void *pixels)
>+{
>+    return gl::TexImage2D(target, level, internalformat, width, height, border, format, type,
>+                          pixels);
>+}
>+
>+void GL_APIENTRY glTexParameteri(GLenum target, GLenum pname, GLint param)
>+{
>+    return gl::TexParameteri(target, pname, param);
>+}
>+
>+void GL_APIENTRY glTexParameterx(GLenum target, GLenum pname, GLfixed param)
>+{
>+    return gl::TexParameterx(target, pname, param);
>+}
>+
>+void GL_APIENTRY glTexParameteriv(GLenum target, GLenum pname, const GLint *params)
>+{
>+    return gl::TexParameteriv(target, pname, params);
>+}
>+
>+void GL_APIENTRY glTexParameterxv(GLenum target, GLenum pname, const GLfixed *params)
>+{
>+    return gl::TexParameterxv(target, pname, params);
>+}
>+
>+void GL_APIENTRY glTexSubImage2D(GLenum target,
>+                                 GLint level,
>+                                 GLint xoffset,
>+                                 GLint yoffset,
>+                                 GLsizei width,
>+                                 GLsizei height,
>+                                 GLenum format,
>+                                 GLenum type,
>+                                 const void *pixels)
>+{
>+    return gl::TexSubImage2D(target, level, xoffset, yoffset, width, height, format, type, pixels);
>+}
>+
>+void GL_APIENTRY glTranslatex(GLfixed x, GLfixed y, GLfixed z)
>+{
>+    return gl::Translatex(x, y, z);
>+}
>+
>+void GL_APIENTRY glVertexPointer(GLint size, GLenum type, GLsizei stride, const void *pointer)
>+{
>+    return gl::VertexPointer(size, type, stride, pointer);
>+}
>+
>+void GL_APIENTRY glViewport(GLint x, GLint y, GLsizei width, GLsizei height)
>+{
>+    return gl::Viewport(x, y, width, height);
>+}
>+
>+// GL_OES_draw_texture
>+void GL_APIENTRY glDrawTexfOES(GLfloat x, GLfloat y, GLfloat z, GLfloat width, GLfloat height)
>+{
>+    return gl::DrawTexfOES(x, y, z, width, height);
>+}
>+
>+void GL_APIENTRY glDrawTexfvOES(const GLfloat *coords)
>+{
>+    return gl::DrawTexfvOES(coords);
>+}
>+
>+void GL_APIENTRY glDrawTexiOES(GLint x, GLint y, GLint z, GLint width, GLint height)
>+{
>+    return gl::DrawTexiOES(x, y, z, width, height);
>+}
>+
>+void GL_APIENTRY glDrawTexivOES(const GLint *coords)
>+{
>+    return gl::DrawTexivOES(coords);
>+}
>+
>+void GL_APIENTRY glDrawTexsOES(GLshort x, GLshort y, GLshort z, GLshort width, GLshort height)
>+{
>+    return gl::DrawTexsOES(x, y, z, width, height);
>+}
>+
>+void GL_APIENTRY glDrawTexsvOES(const GLshort *coords)
>+{
>+    return gl::DrawTexsvOES(coords);
>+}
>+
>+void GL_APIENTRY glDrawTexxOES(GLfixed x, GLfixed y, GLfixed z, GLfixed width, GLfixed height)
>+{
>+    return gl::DrawTexxOES(x, y, z, width, height);
>+}
>+
>+void GL_APIENTRY glDrawTexxvOES(const GLfixed *coords)
>+{
>+    return gl::DrawTexxvOES(coords);
>+}
>+
>+// GL_OES_matrix_palette
>+void GL_APIENTRY glCurrentPaletteMatrixOES(GLuint matrixpaletteindex)
>+{
>+    return gl::CurrentPaletteMatrixOES(matrixpaletteindex);
>+}
>+
>+void GL_APIENTRY glLoadPaletteFromModelViewMatrixOES()
>+{
>+    return gl::LoadPaletteFromModelViewMatrixOES();
>+}
>+
>+void GL_APIENTRY glMatrixIndexPointerOES(GLint size,
>+                                         GLenum type,
>+                                         GLsizei stride,
>+                                         const void *pointer)
>+{
>+    return gl::MatrixIndexPointerOES(size, type, stride, pointer);
>+}
>+
>+void GL_APIENTRY glWeightPointerOES(GLint size, GLenum type, GLsizei stride, const void *pointer)
>+{
>+    return gl::WeightPointerOES(size, type, stride, pointer);
>+}
>+
>+// GL_OES_point_size_array
>+void GL_APIENTRY glPointSizePointerOES(GLenum type, GLsizei stride, const void *pointer)
>+{
>+    return gl::PointSizePointerOES(type, stride, pointer);
>+}
>+
>+// GL_OES_query_matrix
>+GLbitfield GL_APIENTRY glQueryMatrixxOES(GLfixed *mantissa, GLint *exponent)
>+{
>+    return gl::QueryMatrixxOES(mantissa, exponent);
>+}
>+
>+}  // extern "C"
>diff --git a/Source/ThirdParty/ANGLE/src/libGLESv1_CM/libGLESv1_CM.def b/Source/ThirdParty/ANGLE/src/libGLESv1_CM/libGLESv1_CM.def
>new file mode 100644
>index 00000000000..f8732baa347
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libGLESv1_CM/libGLESv1_CM.def
>@@ -0,0 +1,168 @@
>+LIBRARY libGLESv1_CM
>+EXPORTS
>+    glAlphaFunc @1
>+    glClearColor @2
>+    glClearDepthf @3
>+    glClipPlanef @4
>+    glColor4f @5
>+    glDepthRangef @6
>+    glFogf @7
>+    glFogfv @8
>+    glFrustumf @9
>+    glGetClipPlanef @10
>+    glGetFloatv @11
>+    glGetLightfv @12
>+    glGetMaterialfv @13
>+    glGetTexEnvfv @14
>+    glGetTexParameterfv @15
>+    glLightModelf @16
>+    glLightModelfv @17
>+    glLightf @18
>+    glLightfv @19
>+    glLineWidth @20
>+    glLoadMatrixf @21
>+    glMaterialf @22
>+    glMaterialfv @23
>+    glMultMatrixf @24
>+    glMultiTexCoord4f @25
>+    glNormal3f @26
>+    glOrthof @27
>+    glPointParameterf @28
>+    glPointParameterfv @29
>+    glPointSize @30
>+    glPolygonOffset @31
>+    glRotatef @32
>+    glScalef @33
>+    glTexEnvf @34
>+    glTexEnvfv @35
>+    glTexParameterf @36
>+    glTexParameterfv @37
>+    glTranslatef @38
>+    glActiveTexture @39
>+    glAlphaFuncx @40
>+    glBindBuffer @41
>+    glBindTexture @42
>+    glBlendFunc @43
>+    glBufferData @44
>+    glBufferSubData @45
>+    glClear @46
>+    glClearColorx @47
>+    glClearDepthx @48
>+    glClearStencil @49
>+    glClientActiveTexture @50
>+    glClipPlanex @51
>+    glColor4ub @52
>+    glColor4x @53
>+    glColorMask @54
>+    glColorPointer @55
>+    glCompressedTexImage2D @56
>+    glCompressedTexSubImage2D @57
>+    glCopyTexImage2D @58
>+    glCopyTexSubImage2D @59
>+    glCullFace @60
>+    glDeleteBuffers @61
>+    glDeleteTextures @62
>+    glDepthFunc @63
>+    glDepthMask @64
>+    glDepthRangex @65
>+    glDisable @66
>+    glDisableClientState @67
>+    glDrawArrays @68
>+    glDrawElements @69
>+    glEnable @70
>+    glEnableClientState @71
>+    glFinish @72
>+    glFlush @73
>+    glFogx @74
>+    glFogxv @75
>+    glFrontFace @76
>+    glFrustumx @77
>+    glGetBooleanv @78
>+    glGetBufferParameteriv @79
>+    glGetClipPlanex @80
>+    glGenBuffers @81
>+    glGenTextures @82
>+    glGetError @83
>+    glGetFixedv @84
>+    glGetIntegerv @85
>+    glGetLightxv @86
>+    glGetMaterialxv @87
>+    glGetPointerv @88
>+    glGetString @89
>+    glGetTexEnviv @90
>+    glGetTexEnvxv @91
>+    glGetTexParameteriv @92
>+    glGetTexParameterxv @93
>+    glHint @94
>+    glIsBuffer @95
>+    glIsEnabled @96
>+    glIsTexture @97
>+    glLightModelx @98
>+    glLightModelxv @99
>+    glLightx @100
>+    glLightxv @101
>+    glLineWidthx @102
>+    glLoadIdentity @103
>+    glLoadMatrixx @104
>+    glLogicOp @105
>+    glMaterialx @106
>+    glMaterialxv @107
>+    glMatrixMode @108
>+    glMultMatrixx @109
>+    glMultiTexCoord4x @110
>+    glNormal3x @111
>+    glNormalPointer @112
>+    glOrthox @113
>+    glPixelStorei @114
>+    glPointParameterx @115
>+    glPointParameterxv @116
>+    glPointSizex @117
>+    glPolygonOffsetx @118
>+    glPopMatrix @119
>+    glPushMatrix @120
>+    glReadPixels @121
>+    glRotatex @122
>+    glSampleCoverage @123
>+    glSampleCoveragex @124
>+    glScalex @125
>+    glScissor @126
>+    glShadeModel @127
>+    glStencilFunc @128
>+    glStencilMask @129
>+    glStencilOp @130
>+    glTexCoordPointer @131
>+    glTexEnvi @132
>+    glTexEnvx @133
>+    glTexEnviv @134
>+    glTexEnvxv @135
>+    glTexImage2D @136
>+    glTexParameteri @137
>+    glTexParameterx @138
>+    glTexParameteriv @139
>+    glTexParameterxv @140
>+    glTexSubImage2D @141
>+    glTranslatex @142
>+    glVertexPointer @143
>+    glViewport @144
>+
>+    ; GL_OES_draw_texture
>+    glDrawTexfOES @145
>+    glDrawTexfvOES @146
>+    glDrawTexiOES @147
>+    glDrawTexivOES @148
>+    glDrawTexsOES @149
>+    glDrawTexsvOES @150
>+    glDrawTexxOES @151
>+    glDrawTexxvOES @152
>+
>+    ; GL_OES_matrix_palette
>+    glCurrentPaletteMatrixOES @153
>+    glLoadPaletteFromModelViewMatrixOES @154
>+    glMatrixIndexPointerOES @155
>+    glWeightPointerOES @156
>+
>+    ; GL_OES_point_size_array
>+    glPointSizePointerOES @157
>+
>+    ; GL_OES_query_matrix
>+    glQueryMatrixxOES @158
>diff --git a/Source/ThirdParty/ANGLE/src/libGLESv1_CM/libGLESv1_CM.rc b/Source/ThirdParty/ANGLE/src/libGLESv1_CM/libGLESv1_CM.rc
>new file mode 100644
>index 00000000000..1a96f850461
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libGLESv1_CM/libGLESv1_CM.rc
>@@ -0,0 +1,103 @@
>+// Microsoft Visual C++ generated resource script.
>+//
>+#include "resource.h"
>+
>+#define APSTUDIO_READONLY_SYMBOLS
>+/////////////////////////////////////////////////////////////////////////////
>+//
>+// Generated from the TEXTINCLUDE 2 resource.
>+//
>+#include <windows.h>
>+#include "../common/version.h"
>+
>+/////////////////////////////////////////////////////////////////////////////
>+#undef APSTUDIO_READONLY_SYMBOLS
>+
>+/////////////////////////////////////////////////////////////////////////////
>+// English (U.S.) resources
>+
>+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
>+#ifdef _WIN32
>+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
>+#pragma code_page(1252)
>+#endif //_WIN32
>+
>+#ifdef APSTUDIO_INVOKED
>+/////////////////////////////////////////////////////////////////////////////
>+//
>+// TEXTINCLUDE
>+//
>+
>+1 TEXTINCLUDE
>+BEGIN
>+    "resource.h\0"
>+END
>+
>+2 TEXTINCLUDE
>+BEGIN
>+    "#include ""afxres.h""\r\n"
>+    "#include ""../common/version.h""\0"
>+END
>+
>+3 TEXTINCLUDE
>+BEGIN
>+    "\r\n"
>+    "\0"
>+END
>+
>+#endif    // APSTUDIO_INVOKED
>+
>+
>+/////////////////////////////////////////////////////////////////////////////
>+//
>+// Version
>+//
>+
>+VS_VERSION_INFO VERSIONINFO
>+ FILEVERSION ANGLE_MAJOR_VERSION,ANGLE_MINOR_VERSION,ANGLE_REVISION,0
>+ PRODUCTVERSION ANGLE_MAJOR_VERSION,ANGLE_MINOR_VERSION,ANGLE_REVISION,0
>+ FILEFLAGSMASK 0x17L
>+#ifdef _DEBUG
>+ FILEFLAGS 0x1L
>+#else
>+ FILEFLAGS 0x0L
>+#endif
>+ FILEOS 0x4L
>+ FILETYPE 0x2L
>+ FILESUBTYPE 0x0L
>+BEGIN
>+    BLOCK "StringFileInfo"
>+    BEGIN
>+        BLOCK "040904b0"
>+        BEGIN
>+            VALUE "FileDescription", "ANGLE libGLESv1_CM Dynamic Link Library"
>+            VALUE "FileVersion", ANGLE_VERSION_STRING
>+            VALUE "InternalName", "libGLESv1_CM"
>+            VALUE "LegalCopyright", "Copyright (C) 2015 Google Inc."
>+            VALUE "OriginalFilename", "libGLESv1_CM.dll"
>+            VALUE "PrivateBuild", ANGLE_VERSION_STRING
>+            VALUE "ProductName", "ANGLE libGLESv1_CM Dynamic Link Library"
>+            VALUE "ProductVersion", ANGLE_VERSION_STRING
>+            VALUE "Comments", "Build Date: " ANGLE_COMMIT_DATE
>+        END
>+    END
>+    BLOCK "VarFileInfo"
>+    BEGIN
>+        VALUE "Translation", 0x409, 1200
>+    END
>+END
>+
>+#endif    // English (U.S.) resources
>+/////////////////////////////////////////////////////////////////////////////
>+
>+
>+
>+#ifndef APSTUDIO_INVOKED
>+/////////////////////////////////////////////////////////////////////////////
>+//
>+// Generated from the TEXTINCLUDE 3 resource.
>+//
>+
>+
>+/////////////////////////////////////////////////////////////////////////////
>+#endif    // not APSTUDIO_INVOKED
>diff --git a/Source/ThirdParty/ANGLE/src/libGLESv1_CM/resource.h b/Source/ThirdParty/ANGLE/src/libGLESv1_CM/resource.h
>new file mode 100644
>index 00000000000..dfe4379093d
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libGLESv1_CM/resource.h
>@@ -0,0 +1,14 @@
>+//{{NO_DEPENDENCIES}}
>+// Microsoft Visual C++ generated include file.
>+// Used by libGLESv1_CM.rc
>+
>+// Next default values for new objects
>+//
>+#ifdef APSTUDIO_INVOKED
>+#    ifndef APSTUDIO_READONLY_SYMBOLS
>+#        define _APS_NEXT_RESOURCE_VALUE 101
>+#        define _APS_NEXT_COMMAND_VALUE 40001
>+#        define _APS_NEXT_CONTROL_VALUE 1001
>+#        define _APS_NEXT_SYMED_VALUE 101
>+#    endif
>+#endif
>diff --git a/Source/ThirdParty/ANGLE/src/libGLESv2.gni b/Source/ThirdParty/ANGLE/src/libGLESv2.gni
>new file mode 100644
>index 00000000000..4b97c594823
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libGLESv2.gni
>@@ -0,0 +1,949 @@
>+# Copyright (c) 2013 The ANGLE Project Authors. All rights reserved.
>+# Use of this source code is governed by a BSD-style license that can be
>+# found in the LICENSE file.
>+
>+libangle_common_sources = [
>+  "src/common/Color.h",
>+  "src/common/Color.inl",
>+  "src/common/FastVector.h",
>+  "src/common/FixedVector.h",
>+  "src/common/Float16ToFloat32.cpp",
>+  "src/common/MemoryBuffer.cpp",
>+  "src/common/MemoryBuffer.h",
>+  "src/common/Optional.h",
>+  "src/common/PackedEGLEnums_autogen.cpp",
>+  "src/common/PackedEGLEnums_autogen.h",
>+  "src/common/PackedEnums.cpp",
>+  "src/common/PackedEnums.h",
>+  "src/common/PackedGLEnums_autogen.cpp",
>+  "src/common/PackedGLEnums_autogen.h",
>+  "src/common/PoolAlloc.cpp",
>+  "src/common/PoolAlloc.h",
>+  "src/common/aligned_memory.cpp",
>+  "src/common/aligned_memory.h",
>+  "src/common/angleutils.cpp",
>+  "src/common/angleutils.h",
>+  "src/common/bitset_utils.h",
>+  "src/common/debug.cpp",
>+  "src/common/debug.h",
>+  "src/common/hash_utils.h",
>+  "src/common/mathutil.cpp",
>+  "src/common/mathutil.h",
>+  "src/common/matrix_utils.cpp",
>+  "src/common/matrix_utils.h",
>+  "src/common/platform.h",
>+  "src/common/string_utils.cpp",
>+  "src/common/string_utils.h",
>+  "src/common/third_party/base/anglebase/base_export.h",
>+  "src/common/third_party/base/anglebase/containers/mru_cache.h",
>+  "src/common/third_party/base/anglebase/logging.h",
>+  "src/common/third_party/base/anglebase/macros.h",
>+  "src/common/third_party/base/anglebase/numerics/safe_conversions.h",
>+  "src/common/third_party/base/anglebase/numerics/safe_conversions_impl.h",
>+  "src/common/third_party/base/anglebase/numerics/safe_math.h",
>+  "src/common/third_party/base/anglebase/numerics/safe_math_impl.h",
>+  "src/common/third_party/base/anglebase/sha1.cc",
>+  "src/common/third_party/base/anglebase/sha1.h",
>+  "src/common/third_party/base/anglebase/sys_byteorder.h",
>+  "src/common/third_party/smhasher/src/PMurHash.cpp",
>+  "src/common/third_party/smhasher/src/PMurHash.h",
>+  "src/common/tls.cpp",
>+  "src/common/tls.h",
>+  "src/common/uniform_type_info_autogen.cpp",
>+  "src/common/utilities.cpp",
>+  "src/common/utilities.h",
>+  "src/common/vector_utils.h",
>+]
>+
>+xxhash_sources = [
>+  "src/common/third_party/xxhash/xxhash.c",
>+  "src/common/third_party/xxhash/xxhash.h",
>+]
>+
>+angle_system_utils_sources = [
>+  "src/common/Optional.h",
>+  "src/common/angleutils.h",
>+  "src/common/platform.h",
>+  "src/common/system_utils.cpp",
>+  "src/common/system_utils.h",
>+]
>+
>+if (is_linux || is_android || is_fuchsia) {
>+  angle_system_utils_sources += [
>+    "src/common/system_utils_linux.cpp",
>+    "src/common/system_utils_posix.cpp",
>+  ]
>+}
>+
>+if (is_mac) {
>+  angle_system_utils_sources += [
>+    "src/common/system_utils_mac.cpp",
>+    "src/common/system_utils_posix.cpp",
>+  ]
>+}
>+
>+if (is_win) {
>+  angle_system_utils_sources += [ "src/common/system_utils_win.cpp" ]
>+}
>+
>+if (is_android) {
>+  angle_system_utils_sources += [
>+    "src/common/android_util.cpp",
>+    "src/common/android_util.h",
>+  ]
>+}
>+
>+libangle_image_util_sources = [
>+  "src/image_util/copyimage.cpp",
>+  "src/image_util/copyimage.h",
>+  "src/image_util/copyimage.inl",
>+  "src/image_util/generatemip.h",
>+  "src/image_util/generatemip.inl",
>+  "src/image_util/imageformats.cpp",
>+  "src/image_util/imageformats.h",
>+  "src/image_util/loadimage.cpp",
>+  "src/image_util/loadimage.h",
>+  "src/image_util/loadimage.inl",
>+  "src/image_util/loadimage_etc.cpp",
>+]
>+
>+libangle_gpu_info_util_sources = [
>+  "src/gpu_info_util/SystemInfo.cpp",
>+  "src/gpu_info_util/SystemInfo.h",
>+  "src/gpu_info_util/SystemInfo_internal.h",
>+]
>+
>+libangle_gpu_info_util_win_sources = [ "src/gpu_info_util/SystemInfo_win.cpp" ]
>+
>+libangle_gpu_info_util_linux_sources =
>+    [ "src/gpu_info_util/SystemInfo_linux.cpp" ]
>+
>+libangle_gpu_info_util_libpci_sources =
>+    [ "src/gpu_info_util/SystemInfo_libpci.cpp" ]
>+
>+libangle_gpu_info_util_x11_sources = [ "src/gpu_info_util/SystemInfo_x11.cpp" ]
>+
>+libangle_gpu_info_util_mac_sources = [ "src/gpu_info_util/SystemInfo_mac.mm" ]
>+
>+libangle_includes = [
>+  "include/angle_gl.h",
>+  "include/export.h",
>+  "include/EGL/egl.h",
>+  "include/EGL/eglext.h",
>+  "include/EGL/eglext_angle.h",
>+  "include/EGL/eglplatform.h",
>+  "include/GLES/gl.h",
>+  "include/GLES/glplatform.h",
>+  "include/GLES/glext.h",
>+  "include/GLES/glext_angle.h",
>+  "include/GLES/glext_explicit_context_autogen.inc",
>+  "include/GLES2/gl2.h",
>+  "include/GLES2/gl2ext.h",
>+  "include/GLES2/gl2ext_angle.h",
>+  "include/GLES2/gl2ext_explicit_context_autogen.inc",
>+  "include/GLES2/gl2platform.h",
>+  "include/GLES3/gl3.h",
>+  "include/GLES3/gl3ext_explicit_context_autogen.inc",
>+  "include/GLES3/gl3platform.h",
>+  "include/GLES3/gl31.h",
>+  "include/GLES3/gl31ext_explicit_context_autogen.inc",
>+  "include/GLES3/gl32.h",
>+  "include/GLSLANG/ShaderLang.h",
>+  "include/GLSLANG/ShaderVars.h",
>+  "include/KHR/khrplatform.h",
>+  "include/WGL/wgl.h",
>+  "include/platform/FeaturesVk.h",
>+  "include/platform/Platform.h",
>+  "include/platform/WorkaroundsD3D.h",
>+]
>+
>+libangle_sources = [
>+  "src/common/event_tracer.cpp",
>+  "src/common/event_tracer.h",
>+  "src/libANGLE/AttributeMap.cpp",
>+  "src/libANGLE/AttributeMap.h",
>+  "src/libANGLE/BinaryStream.h",
>+  "src/libANGLE/BlobCache.cpp",
>+  "src/libANGLE/BlobCache.h",
>+  "src/libANGLE/Buffer.cpp",
>+  "src/libANGLE/Buffer.h",
>+  "src/libANGLE/Caps.cpp",
>+  "src/libANGLE/Caps.h",
>+  "src/libANGLE/Compiler.cpp",
>+  "src/libANGLE/Compiler.h",
>+  "src/libANGLE/Config.cpp",
>+  "src/libANGLE/Config.h",
>+  "src/libANGLE/Constants.h",
>+  "src/libANGLE/Context.cpp",
>+  "src/libANGLE/Context_gles_1_0.cpp",
>+  "src/libANGLE/Context_gles_1_0_autogen.h",
>+  "src/libANGLE/Context.h",
>+  "src/libANGLE/Debug.cpp",
>+  "src/libANGLE/Debug.h",
>+  "src/libANGLE/Device.cpp",
>+  "src/libANGLE/Device.h",
>+  "src/libANGLE/Display.cpp",
>+  "src/libANGLE/Display.h",
>+  "src/libANGLE/EGLSync.cpp",
>+  "src/libANGLE/EGLSync.h",
>+  "src/libANGLE/Error.cpp",
>+  "src/libANGLE/Error.h",
>+  "src/libANGLE/Error.inl",
>+  "src/libANGLE/ErrorStrings.h",
>+  "src/libANGLE/Fence.cpp",
>+  "src/libANGLE/Fence.h",
>+  "src/libANGLE/Framebuffer.cpp",
>+  "src/libANGLE/Framebuffer.h",
>+  "src/libANGLE/FramebufferAttachment.cpp",
>+  "src/libANGLE/FramebufferAttachment.h",
>+  "src/libANGLE/GLES1Renderer.cpp",
>+  "src/libANGLE/GLES1Renderer.h",
>+  "src/libANGLE/GLES1Shaders.inc",
>+  "src/libANGLE/GLES1State.cpp",
>+  "src/libANGLE/GLES1State.h",
>+  "src/libANGLE/HandleAllocator.cpp",
>+  "src/libANGLE/HandleAllocator.h",
>+  "src/libANGLE/HandleRangeAllocator.h",
>+  "src/libANGLE/HandleRangeAllocator.cpp",
>+  "src/libANGLE/Image.h",
>+  "src/libANGLE/Image.cpp",
>+  "src/libANGLE/ImageIndex.h",
>+  "src/libANGLE/ImageIndex.cpp",
>+  "src/libANGLE/IndexRangeCache.cpp",
>+  "src/libANGLE/IndexRangeCache.h",
>+  "src/libANGLE/LoggingAnnotator.cpp",
>+  "src/libANGLE/LoggingAnnotator.h",
>+  "src/libANGLE/MemoryObject.cpp",
>+  "src/libANGLE/MemoryObject.h",
>+  "src/libANGLE/MemoryProgramCache.cpp",
>+  "src/libANGLE/MemoryProgramCache.h",
>+  "src/libANGLE/Observer.cpp",
>+  "src/libANGLE/Observer.h",
>+  "src/libANGLE/Path.h",
>+  "src/libANGLE/Path.cpp",
>+  "src/libANGLE/Platform.cpp",
>+  "src/libANGLE/Program.cpp",
>+  "src/libANGLE/Program.h",
>+  "src/libANGLE/ProgramLinkedResources.cpp",
>+  "src/libANGLE/ProgramLinkedResources.h",
>+  "src/libANGLE/ProgramPipeline.cpp",
>+  "src/libANGLE/ProgramPipeline.h",
>+  "src/libANGLE/Query.cpp",
>+  "src/libANGLE/Query.h",
>+  "src/libANGLE/RefCountObject.h",
>+  "src/libANGLE/Renderbuffer.cpp",
>+  "src/libANGLE/Renderbuffer.h",
>+  "src/libANGLE/ResourceManager.cpp",
>+  "src/libANGLE/ResourceManager.h",
>+  "src/libANGLE/ResourceMap.h",
>+  "src/libANGLE/Sampler.cpp",
>+  "src/libANGLE/Sampler.h",
>+  "src/libANGLE/Shader.cpp",
>+  "src/libANGLE/Shader.h",
>+  "src/libANGLE/SizedMRUCache.h",
>+  "src/libANGLE/State.cpp",
>+  "src/libANGLE/State.h",
>+  "src/libANGLE/Stream.cpp",
>+  "src/libANGLE/Stream.h",
>+  "src/libANGLE/Surface.cpp",
>+  "src/libANGLE/Surface.h",
>+  "src/libANGLE/Texture.cpp",
>+  "src/libANGLE/Texture.h",
>+  "src/libANGLE/Thread.cpp",
>+  "src/libANGLE/Thread.h",
>+  "src/libANGLE/TransformFeedback.cpp",
>+  "src/libANGLE/TransformFeedback.h",
>+  "src/libANGLE/Uniform.cpp",
>+  "src/libANGLE/Uniform.h",
>+  "src/libANGLE/VaryingPacking.cpp",
>+  "src/libANGLE/VaryingPacking.h",
>+  "src/libANGLE/Version.h",
>+  "src/libANGLE/Version.inl",
>+  "src/libANGLE/VertexArray.cpp",
>+  "src/libANGLE/VertexArray.h",
>+  "src/libANGLE/VertexAttribute.cpp",
>+  "src/libANGLE/VertexAttribute.h",
>+  "src/libANGLE/VertexAttribute.inl",
>+  "src/libANGLE/Workarounds.h",
>+  "src/libANGLE/WorkerThread.cpp",
>+  "src/libANGLE/WorkerThread.h",
>+  "src/libANGLE/angletypes.cpp",
>+  "src/libANGLE/angletypes.h",
>+  "src/libANGLE/angletypes.inl",
>+  "src/libANGLE/es3_copy_conversion_table_autogen.cpp",
>+  "src/libANGLE/features.h",
>+  "src/libANGLE/format_map_autogen.cpp",
>+  "src/libANGLE/formatutils.cpp",
>+  "src/libANGLE/formatutils.h",
>+  "src/libANGLE/histogram_macros.h",
>+  "src/libANGLE/queryconversions.cpp",
>+  "src/libANGLE/queryconversions.h",
>+  "src/libANGLE/queryutils.cpp",
>+  "src/libANGLE/queryutils.h",
>+  "src/libANGLE/renderer/BufferImpl.h",
>+  "src/libANGLE/renderer/CompilerImpl.h",
>+  "src/libANGLE/renderer/ContextImpl.cpp",
>+  "src/libANGLE/renderer/ContextImpl.h",
>+  "src/libANGLE/renderer/driver_utils.cpp",
>+  "src/libANGLE/renderer/driver_utils.h",
>+  "src/libANGLE/renderer/DeviceImpl.cpp",
>+  "src/libANGLE/renderer/DeviceImpl.h",
>+  "src/libANGLE/renderer/DisplayImpl.cpp",
>+  "src/libANGLE/renderer/DisplayImpl.h",
>+  "src/libANGLE/renderer/EGLImplFactory.h",
>+  "src/libANGLE/renderer/EGLSyncImpl.h",
>+  "src/libANGLE/renderer/FenceNVImpl.h",
>+  "src/libANGLE/renderer/FormatID_autogen.h",
>+  "src/libANGLE/renderer/Format_table_autogen.cpp",
>+  "src/libANGLE/renderer/Format.h",
>+  "src/libANGLE/renderer/FramebufferAttachmentObjectImpl.h",
>+  "src/libANGLE/renderer/FramebufferImpl.h",
>+  "src/libANGLE/renderer/GLImplFactory.h",
>+  "src/libANGLE/renderer/ImageImpl.h",
>+  "src/libANGLE/renderer/MemoryObjectImpl.h",
>+  "src/libANGLE/renderer/PathImpl.h",
>+  "src/libANGLE/renderer/ProgramImpl.h",
>+  "src/libANGLE/renderer/ProgramPipelineImpl.h",
>+  "src/libANGLE/renderer/QueryImpl.cpp",
>+  "src/libANGLE/renderer/QueryImpl.h",
>+  "src/libANGLE/renderer/RenderbufferImpl.h",
>+  "src/libANGLE/renderer/RenderTargetCache.h",
>+  "src/libANGLE/renderer/SamplerImpl.h",
>+  "src/libANGLE/renderer/ShaderImpl.cpp",
>+  "src/libANGLE/renderer/ShaderImpl.h",
>+  "src/libANGLE/renderer/StreamProducerImpl.h",
>+  "src/libANGLE/renderer/SurfaceImpl.cpp",
>+  "src/libANGLE/renderer/SurfaceImpl.h",
>+  "src/libANGLE/renderer/SyncImpl.h",
>+  "src/libANGLE/renderer/TextureImpl.cpp",
>+  "src/libANGLE/renderer/TextureImpl.h",
>+  "src/libANGLE/renderer/TransformFeedbackImpl.h",
>+  "src/libANGLE/renderer/VertexArrayImpl.h",
>+  "src/libANGLE/renderer/copyvertex.h",
>+  "src/libANGLE/renderer/copyvertex.inc.h",
>+  "src/libANGLE/renderer/load_functions_table.h",
>+  "src/libANGLE/renderer/load_functions_table_autogen.cpp",
>+  "src/libANGLE/renderer/renderer_utils.cpp",
>+  "src/libANGLE/renderer/renderer_utils.h",
>+  "src/libANGLE/validationEGL.cpp",
>+  "src/libANGLE/validationEGL.h",
>+  "src/libANGLE/validationES.cpp",
>+  "src/libANGLE/validationES.h",
>+  "src/libANGLE/validationES1.cpp",
>+  "src/libANGLE/validationES1_autogen.h",
>+  "src/libANGLE/validationES1.h",
>+  "src/libANGLE/validationES2.cpp",
>+  "src/libANGLE/validationES2_autogen.h",
>+  "src/libANGLE/validationES2.h",
>+  "src/libANGLE/validationES3.cpp",
>+  "src/libANGLE/validationES31.cpp",
>+  "src/libANGLE/validationES31_autogen.h",
>+  "src/libANGLE/validationES31.h",
>+  "src/libANGLE/validationES3_autogen.h",
>+  "src/libANGLE/validationES3.h",
>+  "src/libANGLE/validationESEXT_autogen.h",
>+  "src/libANGLE/validationESEXT.h",
>+  "src/third_party/trace_event/trace_event.h",
>+]
>+
>+libangle_d3d_shared_sources = [
>+  "src/libANGLE/renderer/d3d/BufferD3D.cpp",
>+  "src/libANGLE/renderer/d3d/BufferD3D.h",
>+  "src/libANGLE/renderer/d3d/CompilerD3D.cpp",
>+  "src/libANGLE/renderer/d3d/CompilerD3D.h",
>+  "src/libANGLE/renderer/d3d/ContextD3D.h",
>+  "src/libANGLE/renderer/d3d/DeviceD3D.cpp",
>+  "src/libANGLE/renderer/d3d/DeviceD3D.h",
>+  "src/libANGLE/renderer/d3d/DisplayD3D.cpp",
>+  "src/libANGLE/renderer/d3d/DisplayD3D.h",
>+  "src/libANGLE/renderer/d3d/DynamicHLSL.cpp",
>+  "src/libANGLE/renderer/d3d/DynamicHLSL.h",
>+  "src/libANGLE/renderer/d3d/DynamicImage2DHLSL.cpp",
>+  "src/libANGLE/renderer/d3d/DynamicImage2DHLSL.h",
>+  "src/libANGLE/renderer/d3d/EGLImageD3D.cpp",
>+  "src/libANGLE/renderer/d3d/EGLImageD3D.h",
>+  "src/libANGLE/renderer/d3d/formatutilsD3D.h",
>+  "src/libANGLE/renderer/d3d/FramebufferD3D.cpp",
>+  "src/libANGLE/renderer/d3d/FramebufferD3D.h",
>+  "src/libANGLE/renderer/d3d/HLSLCompiler.cpp",
>+  "src/libANGLE/renderer/d3d/HLSLCompiler.h",
>+  "src/libANGLE/renderer/d3d/ImageD3D.cpp",
>+  "src/libANGLE/renderer/d3d/ImageD3D.h",
>+  "src/libANGLE/renderer/d3d/IndexBuffer.cpp",
>+  "src/libANGLE/renderer/d3d/IndexBuffer.h",
>+  "src/libANGLE/renderer/d3d/IndexDataManager.cpp",
>+  "src/libANGLE/renderer/d3d/IndexDataManager.h",
>+  "src/libANGLE/renderer/d3d/NativeWindowD3D.cpp",
>+  "src/libANGLE/renderer/d3d/NativeWindowD3D.h",
>+  "src/libANGLE/renderer/d3d/ProgramD3D.cpp",
>+  "src/libANGLE/renderer/d3d/ProgramD3D.h",
>+  "src/libANGLE/renderer/d3d/RenderbufferD3D.cpp",
>+  "src/libANGLE/renderer/d3d/RenderbufferD3D.h",
>+  "src/libANGLE/renderer/d3d/RendererD3D.cpp",
>+  "src/libANGLE/renderer/d3d/RendererD3D.h",
>+  "src/libANGLE/renderer/d3d/RenderTargetD3D.h",
>+  "src/libANGLE/renderer/d3d/RenderTargetD3D.cpp",
>+  "src/libANGLE/renderer/d3d/SamplerD3D.h",
>+  "src/libANGLE/renderer/d3d/ShaderD3D.cpp",
>+  "src/libANGLE/renderer/d3d/ShaderD3D.h",
>+  "src/libANGLE/renderer/d3d/ShaderExecutableD3D.cpp",
>+  "src/libANGLE/renderer/d3d/ShaderExecutableD3D.h",
>+  "src/libANGLE/renderer/d3d/SurfaceD3D.cpp",
>+  "src/libANGLE/renderer/d3d/SurfaceD3D.h",
>+  "src/libANGLE/renderer/d3d/SwapChainD3D.cpp",
>+  "src/libANGLE/renderer/d3d/SwapChainD3D.h",
>+  "src/libANGLE/renderer/d3d/TextureD3D.cpp",
>+  "src/libANGLE/renderer/d3d/TextureD3D.h",
>+  "src/libANGLE/renderer/d3d/TextureStorage.h",
>+  "src/libANGLE/renderer/d3d/VertexBuffer.cpp",
>+  "src/libANGLE/renderer/d3d/VertexBuffer.h",
>+  "src/libANGLE/renderer/d3d/VertexDataManager.cpp",
>+  "src/libANGLE/renderer/d3d/VertexDataManager.h",
>+]
>+
>+libangle_d3d9_sources = [
>+  "src/libANGLE/renderer/d3d/d3d9/Blit9.cpp",
>+  "src/libANGLE/renderer/d3d/d3d9/Blit9.h",
>+  "src/libANGLE/renderer/d3d/d3d9/Buffer9.cpp",
>+  "src/libANGLE/renderer/d3d/d3d9/Buffer9.h",
>+  "src/libANGLE/renderer/d3d/d3d9/Context9.cpp",
>+  "src/libANGLE/renderer/d3d/d3d9/Context9.h",
>+  "src/libANGLE/renderer/d3d/d3d9/DebugAnnotator9.cpp",
>+  "src/libANGLE/renderer/d3d/d3d9/DebugAnnotator9.h",
>+  "src/libANGLE/renderer/d3d/d3d9/Fence9.cpp",
>+  "src/libANGLE/renderer/d3d/d3d9/Fence9.h",
>+  "src/libANGLE/renderer/d3d/d3d9/formatutils9.cpp",
>+  "src/libANGLE/renderer/d3d/d3d9/formatutils9.h",
>+  "src/libANGLE/renderer/d3d/d3d9/Framebuffer9.cpp",
>+  "src/libANGLE/renderer/d3d/d3d9/Framebuffer9.h",
>+  "src/libANGLE/renderer/d3d/d3d9/Image9.cpp",
>+  "src/libANGLE/renderer/d3d/d3d9/Image9.h",
>+  "src/libANGLE/renderer/d3d/d3d9/IndexBuffer9.cpp",
>+  "src/libANGLE/renderer/d3d/d3d9/IndexBuffer9.h",
>+  "src/libANGLE/renderer/d3d/d3d9/NativeWindow9.cpp",
>+  "src/libANGLE/renderer/d3d/d3d9/NativeWindow9.h",
>+  "src/libANGLE/renderer/d3d/d3d9/Query9.cpp",
>+  "src/libANGLE/renderer/d3d/d3d9/Query9.h",
>+  "src/libANGLE/renderer/d3d/d3d9/Renderer9.cpp",
>+  "src/libANGLE/renderer/d3d/d3d9/Renderer9.h",
>+  "src/libANGLE/renderer/d3d/d3d9/renderer9_utils.cpp",
>+  "src/libANGLE/renderer/d3d/d3d9/renderer9_utils.h",
>+  "src/libANGLE/renderer/d3d/d3d9/RenderTarget9.cpp",
>+  "src/libANGLE/renderer/d3d/d3d9/RenderTarget9.h",
>+  "src/libANGLE/renderer/d3d/d3d9/ShaderCache.h",
>+  "src/libANGLE/renderer/d3d/d3d9/ShaderExecutable9.cpp",
>+  "src/libANGLE/renderer/d3d/d3d9/ShaderExecutable9.h",
>+  "src/libANGLE/renderer/d3d/d3d9/shaders/compiled/componentmaskps.h",
>+  "src/libANGLE/renderer/d3d/d3d9/shaders/compiled/componentmaskpremultps.h",
>+  "src/libANGLE/renderer/d3d/d3d9/shaders/compiled/componentmaskunmultps.h",
>+  "src/libANGLE/renderer/d3d/d3d9/shaders/compiled/luminanceps.h",
>+  "src/libANGLE/renderer/d3d/d3d9/shaders/compiled/luminancepremultps.h",
>+  "src/libANGLE/renderer/d3d/d3d9/shaders/compiled/luminanceunmultps.h",
>+  "src/libANGLE/renderer/d3d/d3d9/shaders/compiled/passthroughps.h",
>+  "src/libANGLE/renderer/d3d/d3d9/shaders/compiled/standardvs.h",
>+  "src/libANGLE/renderer/d3d/d3d9/StateManager9.cpp",
>+  "src/libANGLE/renderer/d3d/d3d9/StateManager9.h",
>+  "src/libANGLE/renderer/d3d/d3d9/SwapChain9.cpp",
>+  "src/libANGLE/renderer/d3d/d3d9/SwapChain9.h",
>+  "src/libANGLE/renderer/d3d/d3d9/TextureStorage9.cpp",
>+  "src/libANGLE/renderer/d3d/d3d9/TextureStorage9.h",
>+  "src/libANGLE/renderer/d3d/d3d9/VertexArray9.h",
>+  "src/libANGLE/renderer/d3d/d3d9/VertexBuffer9.cpp",
>+  "src/libANGLE/renderer/d3d/d3d9/VertexBuffer9.h",
>+  "src/libANGLE/renderer/d3d/d3d9/vertexconversion.h",
>+  "src/libANGLE/renderer/d3d/d3d9/VertexDeclarationCache.cpp",
>+  "src/libANGLE/renderer/d3d/d3d9/VertexDeclarationCache.h",
>+]
>+
>+libangle_d3d11_sources = [
>+  "src/libANGLE/renderer/d3d/d3d11/Blit11.cpp",
>+  "src/libANGLE/renderer/d3d/d3d11/Blit11.h",
>+  "src/libANGLE/renderer/d3d/d3d11/Blit11Helper_autogen.inc",
>+  "src/libANGLE/renderer/d3d/d3d11/Buffer11.cpp",
>+  "src/libANGLE/renderer/d3d/d3d11/Buffer11.h",
>+  "src/libANGLE/renderer/d3d/d3d11/Clear11.cpp",
>+  "src/libANGLE/renderer/d3d/d3d11/Clear11.h",
>+  "src/libANGLE/renderer/d3d/d3d11/Context11.cpp",
>+  "src/libANGLE/renderer/d3d/d3d11/Context11.h",
>+  "src/libANGLE/renderer/d3d/d3d11/DebugAnnotator11.cpp",
>+  "src/libANGLE/renderer/d3d/d3d11/DebugAnnotator11.h",
>+  "src/libANGLE/renderer/d3d/d3d11/dxgi_format_map_autogen.cpp",
>+  "src/libANGLE/renderer/d3d/d3d11/dxgi_support_table_autogen.cpp",
>+  "src/libANGLE/renderer/d3d/d3d11/dxgi_support_table.h",
>+  "src/libANGLE/renderer/d3d/d3d11/Fence11.cpp",
>+  "src/libANGLE/renderer/d3d/d3d11/Fence11.h",
>+  "src/libANGLE/renderer/d3d/d3d11/formatutils11.cpp",
>+  "src/libANGLE/renderer/d3d/d3d11/formatutils11.h",
>+  "src/libANGLE/renderer/d3d/d3d11/Framebuffer11.cpp",
>+  "src/libANGLE/renderer/d3d/d3d11/Framebuffer11.h",
>+  "src/libANGLE/renderer/d3d/d3d11/Image11.cpp",
>+  "src/libANGLE/renderer/d3d/d3d11/Image11.h",
>+  "src/libANGLE/renderer/d3d/d3d11/IndexBuffer11.cpp",
>+  "src/libANGLE/renderer/d3d/d3d11/IndexBuffer11.h",
>+  "src/libANGLE/renderer/d3d/d3d11/InputLayoutCache.cpp",
>+  "src/libANGLE/renderer/d3d/d3d11/InputLayoutCache.h",
>+  "src/libANGLE/renderer/d3d/d3d11/NativeWindow11.h",
>+  "src/libANGLE/renderer/d3d/d3d11/PixelTransfer11.cpp",
>+  "src/libANGLE/renderer/d3d/d3d11/PixelTransfer11.h",
>+  "src/libANGLE/renderer/d3d/d3d11/Program11.cpp",
>+  "src/libANGLE/renderer/d3d/d3d11/Program11.h",
>+  "src/libANGLE/renderer/d3d/d3d11/ProgramPipeline11.cpp",
>+  "src/libANGLE/renderer/d3d/d3d11/ProgramPipeline11.h",
>+  "src/libANGLE/renderer/d3d/d3d11/Query11.cpp",
>+  "src/libANGLE/renderer/d3d/d3d11/Query11.h",
>+  "src/libANGLE/renderer/d3d/d3d11/Renderer11.cpp",
>+  "src/libANGLE/renderer/d3d/d3d11/Renderer11.h",
>+  "src/libANGLE/renderer/d3d/d3d11/renderer11_utils.cpp",
>+  "src/libANGLE/renderer/d3d/d3d11/renderer11_utils.h",
>+  "src/libANGLE/renderer/d3d/d3d11/RenderStateCache.cpp",
>+  "src/libANGLE/renderer/d3d/d3d11/RenderStateCache.h",
>+  "src/libANGLE/renderer/d3d/d3d11/RenderTarget11.cpp",
>+  "src/libANGLE/renderer/d3d/d3d11/RenderTarget11.h",
>+  "src/libANGLE/renderer/d3d/d3d11/ResourceManager11.cpp",
>+  "src/libANGLE/renderer/d3d/d3d11/ResourceManager11.h",
>+  "src/libANGLE/renderer/d3d/d3d11/ShaderExecutable11.cpp",
>+  "src/libANGLE/renderer/d3d/d3d11/ShaderExecutable11.h",
>+  "src/libANGLE/renderer/d3d/d3d11/shaders/compiled/buffertotexture11_gs.h",
>+  "src/libANGLE/renderer/d3d/d3d11/shaders/compiled/buffertotexture11_ps_4f.h",
>+  "src/libANGLE/renderer/d3d/d3d11/shaders/compiled/buffertotexture11_ps_4i.h",
>+  "src/libANGLE/renderer/d3d/d3d11/shaders/compiled/buffertotexture11_ps_4ui.h",
>+  "src/libANGLE/renderer/d3d/d3d11/shaders/compiled/buffertotexture11_vs.h",
>+  "src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clear11_fl9vs.h",
>+  "src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clear11multiviewgs.h",
>+  "src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clear11multiviewvs.h",
>+  "src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clear11vs.h",
>+  "src/libANGLE/renderer/d3d/d3d11/shaders/compiled/cleardepth11ps.h",
>+  "src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearfloat11_fl9ps.h",
>+  "src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearfloat11ps1.h",
>+  "src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearfloat11ps2.h",
>+  "src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearfloat11ps3.h",
>+  "src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearfloat11ps4.h",
>+  "src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearfloat11ps5.h",
>+  "src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearfloat11ps6.h",
>+  "src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearfloat11ps7.h",
>+  "src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearfloat11ps8.h",
>+  "src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearsint11ps1.h",
>+  "src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearsint11ps2.h",
>+  "src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearsint11ps3.h",
>+  "src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearsint11ps4.h",
>+  "src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearsint11ps5.h",
>+  "src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearsint11ps6.h",
>+  "src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearsint11ps7.h",
>+  "src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearsint11ps8.h",
>+  "src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearuint11ps1.h",
>+  "src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearuint11ps2.h",
>+  "src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearuint11ps3.h",
>+  "src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearuint11ps4.h",
>+  "src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearuint11ps5.h",
>+  "src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearuint11ps6.h",
>+  "src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearuint11ps7.h",
>+  "src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearuint11ps8.h",
>+  "src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthrough2d11vs.h",
>+  "src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthrough3d11gs.h",
>+  "src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthrough3d11vs.h",
>+  "src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughdepth2d11ps.h",
>+  "src/libANGLE/renderer/d3d/d3d11/shaders/compiled/resolvecolor2dps.h",
>+  "src/libANGLE/renderer/d3d/d3d11/shaders/compiled/resolvedepth11_ps.h",
>+  "src/libANGLE/renderer/d3d/d3d11/shaders/compiled/resolvedepthstencil11_ps.h",
>+  "src/libANGLE/renderer/d3d/d3d11/shaders/compiled/resolvedepthstencil11_vs.h",
>+  "src/libANGLE/renderer/d3d/d3d11/shaders/compiled/resolvestencil11_ps.h",
>+  "src/libANGLE/renderer/d3d/d3d11/shaders/compiled/swizzlef2darrayps.h",
>+  "src/libANGLE/renderer/d3d/d3d11/shaders/compiled/swizzlef2dps.h",
>+  "src/libANGLE/renderer/d3d/d3d11/shaders/compiled/swizzlef3dps.h",
>+  "src/libANGLE/renderer/d3d/d3d11/shaders/compiled/swizzlei2darrayps.h",
>+  "src/libANGLE/renderer/d3d/d3d11/shaders/compiled/swizzlei2dps.h",
>+  "src/libANGLE/renderer/d3d/d3d11/shaders/compiled/swizzlei3dps.h",
>+  "src/libANGLE/renderer/d3d/d3d11/shaders/compiled/swizzleui2darrayps.h",
>+  "src/libANGLE/renderer/d3d/d3d11/shaders/compiled/swizzleui2dps.h",
>+  "src/libANGLE/renderer/d3d/d3d11/shaders/compiled/swizzleui3dps.h",
>+  "src/libANGLE/renderer/d3d/d3d11/StateManager11.cpp",
>+  "src/libANGLE/renderer/d3d/d3d11/StateManager11.h",
>+  "src/libANGLE/renderer/d3d/d3d11/StreamProducerD3DTexture.cpp",
>+  "src/libANGLE/renderer/d3d/d3d11/StreamProducerD3DTexture.h",
>+  "src/libANGLE/renderer/d3d/d3d11/SwapChain11.cpp",
>+  "src/libANGLE/renderer/d3d/d3d11/SwapChain11.h",
>+  "src/libANGLE/renderer/d3d/d3d11/texture_format_table.cpp",
>+  "src/libANGLE/renderer/d3d/d3d11/texture_format_table.h",
>+  "src/libANGLE/renderer/d3d/d3d11/texture_format_table_autogen.cpp",
>+  "src/libANGLE/renderer/d3d/d3d11/texture_format_table_utils.h",
>+  "src/libANGLE/renderer/d3d/d3d11/TextureStorage11.cpp",
>+  "src/libANGLE/renderer/d3d/d3d11/TextureStorage11.h",
>+  "src/libANGLE/renderer/d3d/d3d11/TransformFeedback11.cpp",
>+  "src/libANGLE/renderer/d3d/d3d11/TransformFeedback11.h",
>+  "src/libANGLE/renderer/d3d/d3d11/Trim11.cpp",
>+  "src/libANGLE/renderer/d3d/d3d11/Trim11.h",
>+  "src/libANGLE/renderer/d3d/d3d11/VertexArray11.cpp",
>+  "src/libANGLE/renderer/d3d/d3d11/VertexArray11.h",
>+  "src/libANGLE/renderer/d3d/d3d11/VertexBuffer11.cpp",
>+  "src/libANGLE/renderer/d3d/d3d11/VertexBuffer11.h",
>+]
>+
>+libangle_d3d11_win32_sources = [
>+  "src/libANGLE/renderer/d3d/d3d11/win32/NativeWindow11Win32.cpp",
>+  "src/libANGLE/renderer/d3d/d3d11/win32/NativeWindow11Win32.h",
>+  "src/libANGLE/renderer/d3d/d3d11/converged/CompositorNativeWindow11.cpp",
>+  "src/libANGLE/renderer/d3d/d3d11/converged/CompositorNativeWindow11.h",
>+  "src/third_party/systeminfo/SystemInfo.cpp",
>+  "src/third_party/systeminfo/SystemInfo.h",
>+]
>+
>+libangle_d3d11_winrt_sources = [
>+  "src/libANGLE/renderer/d3d/d3d11/winrt/CoreWindowNativeWindow.cpp",
>+  "src/libANGLE/renderer/d3d/d3d11/winrt/CoreWindowNativeWindow.h",
>+  "src/libANGLE/renderer/d3d/d3d11/winrt/InspectableNativeWindow.cpp",
>+  "src/libANGLE/renderer/d3d/d3d11/winrt/InspectableNativeWindow.h",
>+  "src/libANGLE/renderer/d3d/d3d11/winrt/NativeWindow11WinRT.cpp",
>+  "src/libANGLE/renderer/d3d/d3d11/winrt/NativeWindow11WinRT.h",
>+  "src/libANGLE/renderer/d3d/d3d11/winrt/SwapChainPanelNativeWindow.cpp",
>+  "src/libANGLE/renderer/d3d/d3d11/winrt/SwapChainPanelNativeWindow.h",
>+]
>+
>+libangle_gl_sources = [
>+  "src/libANGLE/renderer/gl/BlitGL.cpp",
>+  "src/libANGLE/renderer/gl/BlitGL.h",
>+  "src/libANGLE/renderer/gl/BufferGL.cpp",
>+  "src/libANGLE/renderer/gl/BufferGL.h",
>+  "src/libANGLE/renderer/gl/ClearMultiviewGL.cpp",
>+  "src/libANGLE/renderer/gl/ClearMultiviewGL.h",
>+  "src/libANGLE/renderer/gl/CompilerGL.cpp",
>+  "src/libANGLE/renderer/gl/CompilerGL.h",
>+  "src/libANGLE/renderer/gl/ContextGL.cpp",
>+  "src/libANGLE/renderer/gl/ContextGL.h",
>+  "src/libANGLE/renderer/gl/DispatchTableGL_autogen.cpp",
>+  "src/libANGLE/renderer/gl/DispatchTableGL_autogen.h",
>+  "src/libANGLE/renderer/gl/DisplayGL.cpp",
>+  "src/libANGLE/renderer/gl/DisplayGL.h",
>+  "src/libANGLE/renderer/gl/FenceNVGL.cpp",
>+  "src/libANGLE/renderer/gl/FenceNVGL.h",
>+  "src/libANGLE/renderer/gl/FramebufferGL.cpp",
>+  "src/libANGLE/renderer/gl/FramebufferGL.h",
>+  "src/libANGLE/renderer/gl/FunctionsGL.cpp",
>+  "src/libANGLE/renderer/gl/FunctionsGL.h",
>+  "src/libANGLE/renderer/gl/ImageGL.cpp",
>+  "src/libANGLE/renderer/gl/ImageGL.h",
>+  "src/libANGLE/renderer/gl/PathGL.h",
>+  "src/libANGLE/renderer/gl/PathGL.cpp",
>+  "src/libANGLE/renderer/gl/ProgramGL.cpp",
>+  "src/libANGLE/renderer/gl/ProgramGL.h",
>+  "src/libANGLE/renderer/gl/ProgramPipelineGL.cpp",
>+  "src/libANGLE/renderer/gl/ProgramPipelineGL.h",
>+  "src/libANGLE/renderer/gl/QueryGL.cpp",
>+  "src/libANGLE/renderer/gl/QueryGL.h",
>+  "src/libANGLE/renderer/gl/RenderbufferGL.cpp",
>+  "src/libANGLE/renderer/gl/RenderbufferGL.h",
>+  "src/libANGLE/renderer/gl/RendererGL.cpp",
>+  "src/libANGLE/renderer/gl/RendererGL.h",
>+  "src/libANGLE/renderer/gl/SamplerGL.cpp",
>+  "src/libANGLE/renderer/gl/SamplerGL.h",
>+  "src/libANGLE/renderer/gl/ShaderGL.cpp",
>+  "src/libANGLE/renderer/gl/ShaderGL.h",
>+  "src/libANGLE/renderer/gl/StateManagerGL.cpp",
>+  "src/libANGLE/renderer/gl/StateManagerGL.h",
>+  "src/libANGLE/renderer/gl/SurfaceGL.cpp",
>+  "src/libANGLE/renderer/gl/SurfaceGL.h",
>+  "src/libANGLE/renderer/gl/SyncGL.cpp",
>+  "src/libANGLE/renderer/gl/SyncGL.h",
>+  "src/libANGLE/renderer/gl/TextureGL.cpp",
>+  "src/libANGLE/renderer/gl/TextureGL.h",
>+  "src/libANGLE/renderer/gl/TransformFeedbackGL.cpp",
>+  "src/libANGLE/renderer/gl/TransformFeedbackGL.h",
>+  "src/libANGLE/renderer/gl/VertexArrayGL.cpp",
>+  "src/libANGLE/renderer/gl/VertexArrayGL.h",
>+  "src/libANGLE/renderer/gl/WorkaroundsGL.h",
>+  "src/libANGLE/renderer/gl/formatutilsgl.cpp",
>+  "src/libANGLE/renderer/gl/formatutilsgl.h",
>+  "src/libANGLE/renderer/gl/functionsgl_enums.h",
>+  "src/libANGLE/renderer/gl/functionsgl_typedefs.h",
>+  "src/libANGLE/renderer/gl/renderergl_utils.cpp",
>+  "src/libANGLE/renderer/gl/renderergl_utils.h",
>+]
>+
>+libangle_gl_null_sources = [
>+  "src/libANGLE/renderer/gl/null_functions.cpp",
>+  "src/libANGLE/renderer/gl/null_functions.h",
>+]
>+
>+libangle_gl_wgl_sources = [
>+  "src/libANGLE/renderer/gl/wgl/ContextWGL.cpp",
>+  "src/libANGLE/renderer/gl/wgl/ContextWGL.h",
>+  "src/libANGLE/renderer/gl/wgl/D3DTextureSurfaceWGL.cpp",
>+  "src/libANGLE/renderer/gl/wgl/D3DTextureSurfaceWGL.h",
>+  "src/libANGLE/renderer/gl/wgl/DisplayWGL.cpp",
>+  "src/libANGLE/renderer/gl/wgl/DisplayWGL.h",
>+  "src/libANGLE/renderer/gl/wgl/DXGISwapChainWindowSurfaceWGL.cpp",
>+  "src/libANGLE/renderer/gl/wgl/DXGISwapChainWindowSurfaceWGL.h",
>+  "src/libANGLE/renderer/gl/wgl/FunctionsWGL.cpp",
>+  "src/libANGLE/renderer/gl/wgl/FunctionsWGL.h",
>+  "src/libANGLE/renderer/gl/wgl/PbufferSurfaceWGL.cpp",
>+  "src/libANGLE/renderer/gl/wgl/PbufferSurfaceWGL.h",
>+  "src/libANGLE/renderer/gl/wgl/RendererWGL.cpp",
>+  "src/libANGLE/renderer/gl/wgl/RendererWGL.h",
>+  "src/libANGLE/renderer/gl/wgl/SurfaceWGL.h",
>+  "src/libANGLE/renderer/gl/wgl/WindowSurfaceWGL.cpp",
>+  "src/libANGLE/renderer/gl/wgl/WindowSurfaceWGL.h",
>+  "src/libANGLE/renderer/gl/wgl/functionswgl_typedefs.h",
>+  "src/libANGLE/renderer/gl/wgl/wgl_utils.cpp",
>+  "src/libANGLE/renderer/gl/wgl/wgl_utils.h",
>+  "src/third_party/khronos/GL/wglext.h",
>+]
>+
>+libangle_gl_glx_sources = [
>+  "src/libANGLE/renderer/gl/glx/DisplayGLX.cpp",
>+  "src/libANGLE/renderer/gl/glx/DisplayGLX.h",
>+  "src/libANGLE/renderer/gl/glx/FunctionsGLX.cpp",
>+  "src/libANGLE/renderer/gl/glx/FunctionsGLX.h",
>+  "src/libANGLE/renderer/gl/glx/RendererGLX.h",
>+  "src/libANGLE/renderer/gl/glx/RendererGLX.cpp",
>+  "src/libANGLE/renderer/gl/glx/PbufferSurfaceGLX.cpp",
>+  "src/libANGLE/renderer/gl/glx/PbufferSurfaceGLX.h",
>+  "src/libANGLE/renderer/gl/glx/SurfaceGLX.h",
>+  "src/libANGLE/renderer/gl/glx/WindowSurfaceGLX.cpp",
>+  "src/libANGLE/renderer/gl/glx/WindowSurfaceGLX.h",
>+  "src/libANGLE/renderer/gl/glx/functionsglx_typedefs.h",
>+  "src/libANGLE/renderer/gl/glx/platform_glx.h",
>+]
>+
>+libangle_gl_egl_sources = [
>+  "src/libANGLE/renderer/gl/egl/ContextEGL.cpp",
>+  "src/libANGLE/renderer/gl/egl/ContextEGL.h",
>+  "src/libANGLE/renderer/gl/egl/DisplayEGL.cpp",
>+  "src/libANGLE/renderer/gl/egl/DisplayEGL.h",
>+  "src/libANGLE/renderer/gl/egl/ExternalImageSiblingEGL.h",
>+  "src/libANGLE/renderer/gl/egl/egl_utils.cpp",
>+  "src/libANGLE/renderer/gl/egl/egl_utils.h",
>+  "src/libANGLE/renderer/gl/egl/FunctionsEGL.cpp",
>+  "src/libANGLE/renderer/gl/egl/FunctionsEGL.h",
>+  "src/libANGLE/renderer/gl/egl/ImageEGL.cpp",
>+  "src/libANGLE/renderer/gl/egl/ImageEGL.h",
>+  "src/libANGLE/renderer/gl/egl/functionsegl_typedefs.h",
>+  "src/libANGLE/renderer/gl/egl/PbufferSurfaceEGL.cpp",
>+  "src/libANGLE/renderer/gl/egl/PbufferSurfaceEGL.h",
>+  "src/libANGLE/renderer/gl/egl/RendererEGL.cpp",
>+  "src/libANGLE/renderer/gl/egl/RendererEGL.h",
>+  "src/libANGLE/renderer/gl/egl/SurfaceEGL.cpp",
>+  "src/libANGLE/renderer/gl/egl/SurfaceEGL.h",
>+  "src/libANGLE/renderer/gl/egl/SyncEGL.cpp",
>+  "src/libANGLE/renderer/gl/egl/SyncEGL.h",
>+  "src/libANGLE/renderer/gl/egl/WindowSurfaceEGL.cpp",
>+  "src/libANGLE/renderer/gl/egl/WindowSurfaceEGL.h",
>+]
>+libangle_gl_egl_dl_sources = [
>+  "src/libANGLE/renderer/gl/egl/FunctionsEGLDL.cpp",
>+  "src/libANGLE/renderer/gl/egl/FunctionsEGLDL.h",
>+]
>+
>+libangle_gl_ozone_sources = [
>+  "src/libANGLE/renderer/gl/egl/ozone/DisplayOzone.cpp",
>+  "src/libANGLE/renderer/gl/egl/ozone/DisplayOzone.h",
>+  "src/libANGLE/renderer/gl/egl/ozone/SurfaceOzone.cpp",
>+  "src/libANGLE/renderer/gl/egl/ozone/SurfaceOzone.h",
>+]
>+
>+libangle_gl_egl_android_sources = [
>+  "src/libANGLE/renderer/gl/egl/android/DisplayAndroid.cpp",
>+  "src/libANGLE/renderer/gl/egl/android/DisplayAndroid.h",
>+  "src/libANGLE/renderer/gl/egl/android/NativeBufferImageSiblingAndroid.cpp",
>+  "src/libANGLE/renderer/gl/egl/android/NativeBufferImageSiblingAndroid.h",
>+]
>+
>+libangle_gl_cgl_sources = [
>+  "src/libANGLE/renderer/gl/cgl/ContextCGL.cpp",
>+  "src/libANGLE/renderer/gl/cgl/ContextCGL.h",
>+  "src/libANGLE/renderer/gl/cgl/DisplayCGL.mm",
>+  "src/libANGLE/renderer/gl/cgl/DisplayCGL.h",
>+  "src/libANGLE/renderer/gl/cgl/IOSurfaceSurfaceCGL.mm",
>+  "src/libANGLE/renderer/gl/cgl/IOSurfaceSurfaceCGL.h",
>+  "src/libANGLE/renderer/gl/cgl/RendererCGL.mm",
>+  "src/libANGLE/renderer/gl/cgl/RendererCGL.h",
>+  "src/libANGLE/renderer/gl/cgl/PbufferSurfaceCGL.mm",
>+  "src/libANGLE/renderer/gl/cgl/PbufferSurfaceCGL.h",
>+  "src/libANGLE/renderer/gl/cgl/WindowSurfaceCGL.mm",
>+  "src/libANGLE/renderer/gl/cgl/WindowSurfaceCGL.h",
>+]
>+
>+libangle_vulkan_sources = [
>+  "src/libANGLE/renderer/vulkan/BufferVk.cpp",
>+  "src/libANGLE/renderer/vulkan/BufferVk.h",
>+  "src/libANGLE/renderer/vulkan/CommandGraph.cpp",
>+  "src/libANGLE/renderer/vulkan/CommandGraph.h",
>+  "src/libANGLE/renderer/vulkan/CompilerVk.cpp",
>+  "src/libANGLE/renderer/vulkan/CompilerVk.h",
>+  "src/libANGLE/renderer/vulkan/ContextVk.cpp",
>+  "src/libANGLE/renderer/vulkan/ContextVk.h",
>+  "src/libANGLE/renderer/vulkan/DeviceVk.cpp",
>+  "src/libANGLE/renderer/vulkan/DeviceVk.h",
>+  "src/libANGLE/renderer/vulkan/DisplayVk.cpp",
>+  "src/libANGLE/renderer/vulkan/DisplayVk.h",
>+  "src/libANGLE/renderer/vulkan/FenceNVVk.cpp",
>+  "src/libANGLE/renderer/vulkan/FenceNVVk.h",
>+  "src/libANGLE/renderer/vulkan/FramebufferVk.cpp",
>+  "src/libANGLE/renderer/vulkan/FramebufferVk.h",
>+  "src/libANGLE/renderer/vulkan/GlslangWrapper.cpp",
>+  "src/libANGLE/renderer/vulkan/GlslangWrapper.h",
>+  "src/libANGLE/renderer/vulkan/ImageVk.cpp",
>+  "src/libANGLE/renderer/vulkan/ImageVk.h",
>+  "src/libANGLE/renderer/vulkan/MemoryObjectVk.cpp",
>+  "src/libANGLE/renderer/vulkan/MemoryObjectVk.h",
>+  "src/libANGLE/renderer/vulkan/ProgramVk.cpp",
>+  "src/libANGLE/renderer/vulkan/ProgramVk.h",
>+  "src/libANGLE/renderer/vulkan/ProgramPipelineVk.cpp",
>+  "src/libANGLE/renderer/vulkan/ProgramPipelineVk.h",
>+  "src/libANGLE/renderer/vulkan/QueryVk.cpp",
>+  "src/libANGLE/renderer/vulkan/QueryVk.h",
>+  "src/libANGLE/renderer/vulkan/RenderbufferVk.cpp",
>+  "src/libANGLE/renderer/vulkan/RenderbufferVk.h",
>+  "src/libANGLE/renderer/vulkan/RendererVk.cpp",
>+  "src/libANGLE/renderer/vulkan/RendererVk.h",
>+  "src/libANGLE/renderer/vulkan/RenderTargetVk.cpp",
>+  "src/libANGLE/renderer/vulkan/RenderTargetVk.h",
>+  "src/libANGLE/renderer/vulkan/SamplerVk.cpp",
>+  "src/libANGLE/renderer/vulkan/SamplerVk.h",
>+  "src/libANGLE/renderer/vulkan/SecondaryCommandBuffer.cpp",
>+  "src/libANGLE/renderer/vulkan/SecondaryCommandBuffer.h",
>+  "src/libANGLE/renderer/vulkan/ShaderVk.cpp",
>+  "src/libANGLE/renderer/vulkan/ShaderVk.h",
>+  "src/libANGLE/renderer/vulkan/SurfaceVk.cpp",
>+  "src/libANGLE/renderer/vulkan/SurfaceVk.h",
>+  "src/libANGLE/renderer/vulkan/SyncVk.cpp",
>+  "src/libANGLE/renderer/vulkan/SyncVk.h",
>+  "src/libANGLE/renderer/vulkan/TextureVk.cpp",
>+  "src/libANGLE/renderer/vulkan/TextureVk.h",
>+  "src/libANGLE/renderer/vulkan/TransformFeedbackVk.cpp",
>+  "src/libANGLE/renderer/vulkan/TransformFeedbackVk.h",
>+  "src/libANGLE/renderer/vulkan/UtilsVk.cpp",
>+  "src/libANGLE/renderer/vulkan/UtilsVk.h",
>+  "src/libANGLE/renderer/vulkan/VertexArrayVk.cpp",
>+  "src/libANGLE/renderer/vulkan/VertexArrayVk.h",
>+  "src/libANGLE/renderer/vulkan/vk_cache_utils.cpp",
>+  "src/libANGLE/renderer/vulkan/vk_cache_utils.h",
>+  "src/libANGLE/renderer/vulkan/vk_caps_utils.cpp",
>+  "src/libANGLE/renderer/vulkan/vk_caps_utils.h",
>+  "src/libANGLE/renderer/vulkan/vk_format_table_autogen.cpp",
>+  "src/libANGLE/renderer/vulkan/vk_format_utils.h",
>+  "src/libANGLE/renderer/vulkan/vk_format_utils.cpp",
>+  "src/libANGLE/renderer/vulkan/vk_helpers.cpp",
>+  "src/libANGLE/renderer/vulkan/vk_helpers.h",
>+  "src/libANGLE/renderer/vulkan/vk_internal_shaders_autogen.h",
>+  "src/libANGLE/renderer/vulkan/vk_internal_shaders_autogen.cpp",
>+  "src/libANGLE/renderer/vulkan/vk_mandatory_format_support_table_autogen.cpp",
>+  "src/libANGLE/renderer/vulkan/vk_utils.cpp",
>+  "src/libANGLE/renderer/vulkan/vk_utils.h",
>+  "src/libANGLE/renderer/vulkan/vk_wrapper.h",
>+]
>+
>+libangle_vulkan_android_sources = [
>+  "src/libANGLE/renderer/vulkan/android/DisplayVkAndroid.cpp",
>+  "src/libANGLE/renderer/vulkan/android/DisplayVkAndroid.h",
>+  "src/libANGLE/renderer/vulkan/android/HardwareBufferImageSiblingVkAndroid.cpp",
>+  "src/libANGLE/renderer/vulkan/android/HardwareBufferImageSiblingVkAndroid.h",
>+  "src/libANGLE/renderer/vulkan/android/WindowSurfaceVkAndroid.cpp",
>+  "src/libANGLE/renderer/vulkan/android/WindowSurfaceVkAndroid.h",
>+]
>+
>+libangle_vulkan_win32_sources = [
>+  "src/libANGLE/renderer/vulkan/win32/DisplayVkWin32.cpp",
>+  "src/libANGLE/renderer/vulkan/win32/DisplayVkWin32.h",
>+  "src/libANGLE/renderer/vulkan/win32/WindowSurfaceVkWin32.cpp",
>+  "src/libANGLE/renderer/vulkan/win32/WindowSurfaceVkWin32.h",
>+]
>+
>+libangle_vulkan_xcb_sources = [
>+  "src/libANGLE/renderer/vulkan/xcb/DisplayVkXcb.cpp",
>+  "src/libANGLE/renderer/vulkan/xcb/DisplayVkXcb.h",
>+  "src/libANGLE/renderer/vulkan/xcb/WindowSurfaceVkXcb.cpp",
>+  "src/libANGLE/renderer/vulkan/xcb/WindowSurfaceVkXcb.h",
>+]
>+
>+libangle_vulkan_fuchsia_sources = [
>+  "src/libANGLE/renderer/vulkan/fuchsia/DisplayVkFuchsia.cpp",
>+  "src/libANGLE/renderer/vulkan/fuchsia/DisplayVkFuchsia.h",
>+  "src/libANGLE/renderer/vulkan/fuchsia/WindowSurfaceVkFuchsia.cpp",
>+  "src/libANGLE/renderer/vulkan/fuchsia/WindowSurfaceVkFuchsia.h",
>+]
>+
>+libangle_null_sources = [
>+  "src/libANGLE/renderer/null/BufferNULL.cpp",
>+  "src/libANGLE/renderer/null/BufferNULL.h",
>+  "src/libANGLE/renderer/null/CompilerNULL.cpp",
>+  "src/libANGLE/renderer/null/CompilerNULL.h",
>+  "src/libANGLE/renderer/null/ContextNULL.cpp",
>+  "src/libANGLE/renderer/null/ContextNULL.h",
>+  "src/libANGLE/renderer/null/DeviceNULL.cpp",
>+  "src/libANGLE/renderer/null/DeviceNULL.h",
>+  "src/libANGLE/renderer/null/DisplayNULL.cpp",
>+  "src/libANGLE/renderer/null/DisplayNULL.h",
>+  "src/libANGLE/renderer/null/FenceNVNULL.cpp",
>+  "src/libANGLE/renderer/null/FenceNVNULL.h",
>+  "src/libANGLE/renderer/null/FramebufferNULL.cpp",
>+  "src/libANGLE/renderer/null/FramebufferNULL.h",
>+  "src/libANGLE/renderer/null/ImageNULL.cpp",
>+  "src/libANGLE/renderer/null/ImageNULL.h",
>+  "src/libANGLE/renderer/null/PathNULL.cpp",
>+  "src/libANGLE/renderer/null/PathNULL.h",
>+  "src/libANGLE/renderer/null/ProgramNULL.cpp",
>+  "src/libANGLE/renderer/null/ProgramNULL.h",
>+  "src/libANGLE/renderer/null/ProgramPipelineNULL.cpp",
>+  "src/libANGLE/renderer/null/ProgramPipelineNULL.h",
>+  "src/libANGLE/renderer/null/QueryNULL.cpp",
>+  "src/libANGLE/renderer/null/QueryNULL.h",
>+  "src/libANGLE/renderer/null/RenderbufferNULL.cpp",
>+  "src/libANGLE/renderer/null/RenderbufferNULL.h",
>+  "src/libANGLE/renderer/null/SamplerNULL.cpp",
>+  "src/libANGLE/renderer/null/SamplerNULL.h",
>+  "src/libANGLE/renderer/null/ShaderNULL.cpp",
>+  "src/libANGLE/renderer/null/ShaderNULL.h",
>+  "src/libANGLE/renderer/null/SurfaceNULL.cpp",
>+  "src/libANGLE/renderer/null/SurfaceNULL.h",
>+  "src/libANGLE/renderer/null/SyncNULL.cpp",
>+  "src/libANGLE/renderer/null/SyncNULL.h",
>+  "src/libANGLE/renderer/null/TextureNULL.cpp",
>+  "src/libANGLE/renderer/null/TextureNULL.h",
>+  "src/libANGLE/renderer/null/TransformFeedbackNULL.cpp",
>+  "src/libANGLE/renderer/null/TransformFeedbackNULL.h",
>+  "src/libANGLE/renderer/null/VertexArrayNULL.cpp",
>+  "src/libANGLE/renderer/null/VertexArrayNULL.h",
>+]
>+
>+libglesv2_sources = [
>+  "src/common/angleutils.h",
>+  "src/common/debug.h",
>+  "src/libGLESv2/entry_points_egl.cpp",
>+  "src/libGLESv2/entry_points_egl.h",
>+  "src/libGLESv2/entry_points_egl_ext.cpp",
>+  "src/libGLESv2/entry_points_egl_ext.h",
>+  "src/libGLESv2/entry_points_enum_autogen.h",
>+  "src/libGLESv2/entry_points_gles_1_0_autogen.cpp",
>+  "src/libGLESv2/entry_points_gles_1_0_autogen.h",
>+  "src/libGLESv2/entry_points_gles_2_0_autogen.cpp",
>+  "src/libGLESv2/entry_points_gles_2_0_autogen.h",
>+  "src/libGLESv2/entry_points_gles_3_0_autogen.cpp",
>+  "src/libGLESv2/entry_points_gles_3_0_autogen.h",
>+  "src/libGLESv2/entry_points_gles_3_1_autogen.cpp",
>+  "src/libGLESv2/entry_points_gles_3_1_autogen.h",
>+  "src/libGLESv2/entry_points_gles_ext_autogen.cpp",
>+  "src/libGLESv2/entry_points_gles_ext_autogen.h",
>+  "src/libGLESv2/entry_points_utils.h",
>+  "src/libGLESv2/global_state.cpp",
>+  "src/libGLESv2/global_state.h",
>+  "src/libGLESv2/libGLESv2_autogen.cpp",
>+  "src/libGLESv2/libGLESv2.rc",
>+  "src/libGLESv2/proc_table.h",
>+  "src/libGLESv2/proc_table_autogen.cpp",
>+  "src/libGLESv2/resource.h",
>+]
>+
>+libglesv1_cm_sources = [
>+  "src/libGLESv1_CM/libGLESv1_CM.cpp",
>+  "src/libGLESv1_CM/libGLESv1_CM.def",
>+  "src/libGLESv1_CM/libGLESv1_CM.rc",
>+  "src/libGLESv1_CM/resource.h",
>+]
>+
>+libegl_sources = [
>+  "src/libEGL/libEGL.cpp",
>+  "src/libEGL/libEGL.rc",
>+  "src/libEGL/resource.h",
>+  "src/libGLESv2/entry_points_egl.h",
>+  "src/libGLESv2/entry_points_egl_ext.h",
>+  "src/libEGL/egl_loader_autogen.h",
>+]
>diff --git a/Source/ThirdParty/ANGLE/src/libGLESv2.gypi b/Source/ThirdParty/ANGLE/src/libGLESv2.gypi
>deleted file mode 100644
>index ec44f8202cc..00000000000
>--- a/Source/ThirdParty/ANGLE/src/libGLESv2.gypi
>+++ /dev/null
>@@ -1,1285 +0,0 @@
>-# Copyright (c) 2013 The ANGLE Project Authors. All rights reserved.
>-# Use of this source code is governed by a BSD-style license that can be
>-# found in the LICENSE file.
>-
>-{
>-    'variables':
>-    {
>-        # These file lists are shared with the GN build.
>-        'libangle_common_sources':
>-        [
>-            'common/Color.h',
>-            'common/Color.inl',
>-            'common/Float16ToFloat32.cpp',
>-            'common/MemoryBuffer.cpp',
>-            'common/MemoryBuffer.h',
>-            'common/Optional.h',
>-            'common/angleutils.cpp',
>-            'common/angleutils.h',
>-            'common/bitset_utils.h',
>-            'common/debug.cpp',
>-            'common/debug.h',
>-            'common/mathutil.cpp',
>-            'common/mathutil.h',
>-            'common/matrix_utils.h',
>-            'common/platform.h',
>-            'common/string_utils.cpp',
>-            'common/string_utils.h',
>-            'common/third_party/base/anglebase/base_export.h',
>-            'common/third_party/base/anglebase/containers/mru_cache.h',
>-            'common/third_party/base/anglebase/logging.h',
>-            'common/third_party/base/anglebase/macros.h',
>-            'common/third_party/base/anglebase/numerics/safe_conversions.h',
>-            'common/third_party/base/anglebase/numerics/safe_conversions_impl.h',
>-            'common/third_party/base/anglebase/numerics/safe_math.h',
>-            'common/third_party/base/anglebase/numerics/safe_math_impl.h',
>-            'common/third_party/base/anglebase/sha1.cc',
>-            'common/third_party/base/anglebase/sha1.h',
>-            'common/third_party/base/anglebase/sys_byteorder.h',
>-            'common/third_party/smhasher/src/PMurHash.cpp',
>-            'common/third_party/smhasher/src/PMurHash.h',
>-            'common/tls.cpp',
>-            'common/tls.h',
>-            'common/uniform_type_info_autogen.cpp',
>-            'common/utilities.cpp',
>-            'common/utilities.h',
>-            'common/vector_utils.h',
>-            'common/version.h',
>-        ],
>-        'libangle_common_linux_sources':
>-        [
>-            'common/system_utils_linux.cpp',
>-        ],
>-        'libangle_common_mac_sources':
>-        [
>-            'common/system_utils_mac.cpp',
>-        ],
>-        'libangle_common_win_sources':
>-        [
>-            'common/system_utils_win.cpp',
>-        ],
>-        'libangle_image_util_sources':
>-        [
>-            'image_util/copyimage.cpp',
>-            'image_util/copyimage.h',
>-            'image_util/copyimage.inl',
>-            'image_util/generatemip.h',
>-            'image_util/generatemip.inl',
>-            'image_util/imageformats.cpp',
>-            'image_util/imageformats.h',
>-            'image_util/loadimage.cpp',
>-            'image_util/loadimage.h',
>-            'image_util/loadimage.inl',
>-            'image_util/loadimage_etc.cpp',
>-        ],
>-        'libangle_gpu_info_util_sources':
>-        [
>-            'gpu_info_util/SystemInfo.cpp',
>-            'gpu_info_util/SystemInfo.h',
>-            'gpu_info_util/SystemInfo_internal.h',
>-        ],
>-        'libangle_gpu_info_util_win_sources':
>-        [
>-            'gpu_info_util/SystemInfo_win.cpp',
>-        ],
>-        'libangle_gpu_info_util_linux_sources':
>-        [
>-            'gpu_info_util/SystemInfo_linux.cpp',
>-        ],
>-        'libangle_gpu_info_util_libpci_sources':
>-        [
>-            'gpu_info_util/SystemInfo_libpci.cpp',
>-        ],
>-        'libangle_gpu_info_util_x11_sources':
>-        [
>-            'gpu_info_util/SystemInfo_x11.cpp',
>-        ],
>-        'libangle_gpu_info_util_mac_sources':
>-        [
>-            'gpu_info_util/SystemInfo_mac.mm',
>-        ],
>-        'libangle_includes':
>-        [
>-            '../include/angle_gl.h',
>-            '../include/export.h',
>-            '../include/EGL/egl.h',
>-            '../include/EGL/eglext.h',
>-            '../include/EGL/eglext_angle.h',
>-            '../include/EGL/eglplatform.h',
>-            '../include/GLES2/gl2.h',
>-            '../include/GLES2/gl2ext.h',
>-            '../include/GLES2/gl2ext_angle.h',
>-            '../include/GLES2/gl2platform.h',
>-            '../include/GLES3/gl3.h',
>-            '../include/GLES3/gl3platform.h',
>-            '../include/GLES3/gl31.h',
>-            '../include/GLES3/gl32.h',
>-            '../include/GLSLANG/ShaderLang.h',
>-            '../include/GLSLANG/ShaderVars.h',
>-            '../include/KHR/khrplatform.h',
>-            '../include/platform/Platform.h',
>-            '../include/platform/WorkaroundsD3D.h',
>-        ],
>-        'libangle_sources':
>-        [
>-            'common/event_tracer.cpp',
>-            'common/event_tracer.h',
>-            'libANGLE/AttributeMap.cpp',
>-            'libANGLE/AttributeMap.h',
>-            'libANGLE/BinaryStream.h',
>-            'libANGLE/Buffer.cpp',
>-            'libANGLE/Buffer.h',
>-            'libANGLE/Caps.cpp',
>-            'libANGLE/Caps.h',
>-            'libANGLE/Compiler.cpp',
>-            'libANGLE/Compiler.h',
>-            'libANGLE/Config.cpp',
>-            'libANGLE/Config.h',
>-            'libANGLE/Constants.h',
>-            'libANGLE/Context.cpp',
>-            'libANGLE/Context.h',
>-            'libANGLE/ContextState.cpp',
>-            'libANGLE/ContextState.h',
>-            'libANGLE/Debug.cpp',
>-            'libANGLE/Debug.h',
>-            'libANGLE/Device.cpp',
>-            'libANGLE/Device.h',
>-            'libANGLE/Display.cpp',
>-            'libANGLE/Display.h',
>-            'libANGLE/Error.cpp',
>-            'libANGLE/Error.h',
>-            'libANGLE/Error.inl',
>-            'libANGLE/Fence.cpp',
>-            'libANGLE/Fence.h',
>-            'libANGLE/Framebuffer.cpp',
>-            'libANGLE/Framebuffer.h',
>-            'libANGLE/FramebufferAttachment.cpp',
>-            'libANGLE/FramebufferAttachment.h',
>-            'libANGLE/HandleAllocator.cpp',
>-            'libANGLE/HandleAllocator.h',
>-            'libANGLE/HandleRangeAllocator.h',
>-            'libANGLE/HandleRangeAllocator.cpp',
>-            'libANGLE/Image.h',
>-            'libANGLE/Image.cpp',
>-            'libANGLE/ImageIndex.h',
>-            'libANGLE/ImageIndex.cpp',
>-            'libANGLE/IndexRangeCache.cpp',
>-            'libANGLE/IndexRangeCache.h',
>-            'libANGLE/LoggingAnnotator.cpp',
>-            'libANGLE/LoggingAnnotator.h',
>-            'libANGLE/MemoryProgramCache.cpp',
>-            'libANGLE/MemoryProgramCache.h',
>-            'libANGLE/PackedGLEnums.h',
>-            'libANGLE/PackedGLEnums_autogen.cpp',
>-            'libANGLE/PackedGLEnums_autogen.h',
>-            'libANGLE/Path.h',
>-            'libANGLE/Path.cpp',
>-            'libANGLE/Platform.cpp',
>-            'libANGLE/Program.cpp',
>-            'libANGLE/Program.h',
>-            'libANGLE/ProgramLinkedResources.cpp',
>-            'libANGLE/ProgramLinkedResources.h',
>-            'libANGLE/ProgramPipeline.cpp',
>-            'libANGLE/ProgramPipeline.h',
>-            'libANGLE/Query.cpp',
>-            'libANGLE/Query.h',
>-            'libANGLE/RefCountObject.h',
>-            'libANGLE/Renderbuffer.cpp',
>-            'libANGLE/Renderbuffer.h',
>-            'libANGLE/ResourceManager.cpp',
>-            'libANGLE/ResourceManager.h',
>-            'libANGLE/ResourceMap.h',
>-            'libANGLE/Sampler.cpp',
>-            'libANGLE/Sampler.h',
>-            'libANGLE/Shader.cpp',
>-            'libANGLE/Shader.h',
>-            'libANGLE/SizedMRUCache.h',
>-            'libANGLE/State.cpp',
>-            'libANGLE/State.h',
>-            'libANGLE/Stream.cpp',
>-            'libANGLE/Stream.h',
>-            'libANGLE/Surface.cpp',
>-            'libANGLE/Surface.h',
>-            'libANGLE/Texture.cpp',
>-            'libANGLE/Texture.h',
>-            'libANGLE/Thread.cpp',
>-            'libANGLE/Thread.h',
>-            'libANGLE/TransformFeedback.cpp',
>-            'libANGLE/TransformFeedback.h',
>-            'libANGLE/Uniform.cpp',
>-            'libANGLE/Uniform.h',
>-            'libANGLE/VaryingPacking.cpp',
>-            'libANGLE/VaryingPacking.h',
>-            'libANGLE/Version.h',
>-            'libANGLE/Version.inl',
>-            'libANGLE/VertexArray.cpp',
>-            'libANGLE/VertexArray.h',
>-            'libANGLE/VertexAttribute.cpp',
>-            'libANGLE/VertexAttribute.h',
>-            'libANGLE/VertexAttribute.inl',
>-            'libANGLE/WorkerThread.cpp',
>-            'libANGLE/WorkerThread.h',
>-            'libANGLE/angletypes.cpp',
>-            'libANGLE/angletypes.h',
>-            'libANGLE/angletypes.inl',
>-            'libANGLE/entry_points_enum_autogen.h',
>-            'libANGLE/es3_copy_conversion_table_autogen.cpp',
>-            'libANGLE/features.h',
>-            'libANGLE/format_map_autogen.cpp',
>-            'libANGLE/formatutils.cpp',
>-            'libANGLE/formatutils.h',
>-            'libANGLE/histogram_macros.h',
>-            'libANGLE/params.cpp',
>-            'libANGLE/params.h',
>-            'libANGLE/queryconversions.cpp',
>-            'libANGLE/queryconversions.h',
>-            'libANGLE/queryutils.cpp',
>-            'libANGLE/queryutils.h',
>-            'libANGLE/renderer/BufferImpl.h',
>-            'libANGLE/renderer/CompilerImpl.h',
>-            'libANGLE/renderer/ContextImpl.cpp',
>-            'libANGLE/renderer/ContextImpl.h',
>-            'libANGLE/renderer/driver_utils.cpp',
>-            'libANGLE/renderer/driver_utils.h',
>-            'libANGLE/renderer/DeviceImpl.cpp',
>-            'libANGLE/renderer/DeviceImpl.h',
>-            'libANGLE/renderer/DisplayImpl.cpp',
>-            'libANGLE/renderer/DisplayImpl.h',
>-            'libANGLE/renderer/EGLImplFactory.h',
>-            'libANGLE/renderer/FenceNVImpl.h',
>-            'libANGLE/renderer/Format_ID_autogen.inl',
>-            'libANGLE/renderer/Format_table_autogen.cpp',
>-            'libANGLE/renderer/Format.h',
>-            'libANGLE/renderer/FramebufferAttachmentObjectImpl.h',
>-            'libANGLE/renderer/FramebufferImpl.h',
>-            'libANGLE/renderer/GLImplFactory.h',
>-            'libANGLE/renderer/ImageImpl.h',
>-            'libANGLE/renderer/ProgramImpl.h',
>-            'libANGLE/renderer/ProgramPipelineImpl.h',
>-            'libANGLE/renderer/QueryImpl.h',
>-            'libANGLE/renderer/RenderbufferImpl.h',
>-            'libANGLE/renderer/SamplerImpl.h',
>-            'libANGLE/renderer/ShaderImpl.h',
>-            'libANGLE/renderer/StreamProducerImpl.h',
>-            'libANGLE/renderer/SurfaceImpl.cpp',
>-            'libANGLE/renderer/SurfaceImpl.h',
>-            'libANGLE/renderer/SyncImpl.h',
>-            'libANGLE/renderer/TextureImpl.cpp',
>-            'libANGLE/renderer/TextureImpl.h',
>-            'libANGLE/renderer/TransformFeedbackImpl.h',
>-            'libANGLE/renderer/VertexArrayImpl.h',
>-            'libANGLE/renderer/load_functions_table.h',
>-            'libANGLE/renderer/load_functions_table_autogen.cpp',
>-            'libANGLE/renderer/renderer_utils.cpp',
>-            'libANGLE/renderer/renderer_utils.h',
>-            'libANGLE/signal_utils.h',
>-            'libANGLE/validationEGL.cpp',
>-            'libANGLE/validationEGL.h',
>-            'libANGLE/validationES.cpp',
>-            'libANGLE/validationES.h',
>-            'libANGLE/validationES2.cpp',
>-            'libANGLE/validationES2.h',
>-            'libANGLE/validationES3.cpp',
>-            'libANGLE/validationES3.h',
>-            'libANGLE/validationES31.cpp',
>-            'libANGLE/validationES31.h',
>-            'third_party/trace_event/trace_event.h',
>-        ],
>-        'libangle_d3d_shared_sources':
>-        [
>-            'libANGLE/renderer/d3d/BufferD3D.cpp',
>-            'libANGLE/renderer/d3d/BufferD3D.h',
>-            'libANGLE/renderer/d3d/CompilerD3D.cpp',
>-            'libANGLE/renderer/d3d/CompilerD3D.h',
>-            'libANGLE/renderer/d3d/DeviceD3D.cpp',
>-            'libANGLE/renderer/d3d/DeviceD3D.h',
>-            'libANGLE/renderer/d3d/DisplayD3D.cpp',
>-            'libANGLE/renderer/d3d/DisplayD3D.h',
>-            'libANGLE/renderer/d3d/DynamicHLSL.cpp',
>-            'libANGLE/renderer/d3d/DynamicHLSL.h',
>-            'libANGLE/renderer/d3d/EGLImageD3D.cpp',
>-            'libANGLE/renderer/d3d/EGLImageD3D.h',
>-            'libANGLE/renderer/d3d/formatutilsD3D.h',
>-            'libANGLE/renderer/d3d/FramebufferD3D.cpp',
>-            'libANGLE/renderer/d3d/FramebufferD3D.h',
>-            'libANGLE/renderer/d3d/HLSLCompiler.cpp',
>-            'libANGLE/renderer/d3d/HLSLCompiler.h',
>-            'libANGLE/renderer/d3d/ImageD3D.cpp',
>-            'libANGLE/renderer/d3d/ImageD3D.h',
>-            'libANGLE/renderer/d3d/IndexBuffer.cpp',
>-            'libANGLE/renderer/d3d/IndexBuffer.h',
>-            'libANGLE/renderer/d3d/IndexDataManager.cpp',
>-            'libANGLE/renderer/d3d/IndexDataManager.h',
>-            'libANGLE/renderer/d3d/NativeWindowD3D.cpp',
>-            'libANGLE/renderer/d3d/NativeWindowD3D.h',
>-            'libANGLE/renderer/d3d/ProgramD3D.cpp',
>-            'libANGLE/renderer/d3d/ProgramD3D.h',
>-            'libANGLE/renderer/d3d/RenderbufferD3D.cpp',
>-            'libANGLE/renderer/d3d/RenderbufferD3D.h',
>-            'libANGLE/renderer/d3d/RendererD3D.cpp',
>-            'libANGLE/renderer/d3d/RendererD3D.h',
>-            'libANGLE/renderer/d3d/RenderTargetD3D.h',
>-            'libANGLE/renderer/d3d/RenderTargetD3D.cpp',
>-            'libANGLE/renderer/d3d/SamplerD3D.h',
>-            'libANGLE/renderer/d3d/ShaderD3D.cpp',
>-            'libANGLE/renderer/d3d/ShaderD3D.h',
>-            'libANGLE/renderer/d3d/ShaderExecutableD3D.cpp',
>-            'libANGLE/renderer/d3d/ShaderExecutableD3D.h',
>-            'libANGLE/renderer/d3d/SurfaceD3D.cpp',
>-            'libANGLE/renderer/d3d/SurfaceD3D.h',
>-            'libANGLE/renderer/d3d/SwapChainD3D.cpp',
>-            'libANGLE/renderer/d3d/SwapChainD3D.h',
>-            'libANGLE/renderer/d3d/TextureD3D.cpp',
>-            'libANGLE/renderer/d3d/TextureD3D.h',
>-            'libANGLE/renderer/d3d/TextureStorage.h',
>-            'libANGLE/renderer/d3d/VertexBuffer.cpp',
>-            'libANGLE/renderer/d3d/VertexBuffer.h',
>-            'libANGLE/renderer/d3d/VertexDataManager.cpp',
>-            'libANGLE/renderer/d3d/VertexDataManager.h',
>-        ],
>-        'libangle_d3d9_sources':
>-        [
>-            'libANGLE/renderer/d3d/d3d9/Blit9.cpp',
>-            'libANGLE/renderer/d3d/d3d9/Blit9.h',
>-            'libANGLE/renderer/d3d/d3d9/Buffer9.cpp',
>-            'libANGLE/renderer/d3d/d3d9/Buffer9.h',
>-            'libANGLE/renderer/d3d/d3d9/Context9.cpp',
>-            'libANGLE/renderer/d3d/d3d9/Context9.h',
>-            'libANGLE/renderer/d3d/d3d9/DebugAnnotator9.cpp',
>-            'libANGLE/renderer/d3d/d3d9/DebugAnnotator9.h',
>-            'libANGLE/renderer/d3d/d3d9/Fence9.cpp',
>-            'libANGLE/renderer/d3d/d3d9/Fence9.h',
>-            'libANGLE/renderer/d3d/d3d9/formatutils9.cpp',
>-            'libANGLE/renderer/d3d/d3d9/formatutils9.h',
>-            'libANGLE/renderer/d3d/d3d9/Framebuffer9.cpp',
>-            'libANGLE/renderer/d3d/d3d9/Framebuffer9.h',
>-            'libANGLE/renderer/d3d/d3d9/Image9.cpp',
>-            'libANGLE/renderer/d3d/d3d9/Image9.h',
>-            'libANGLE/renderer/d3d/d3d9/IndexBuffer9.cpp',
>-            'libANGLE/renderer/d3d/d3d9/IndexBuffer9.h',
>-            'libANGLE/renderer/d3d/d3d9/NativeWindow9.cpp',
>-            'libANGLE/renderer/d3d/d3d9/NativeWindow9.h',
>-            'libANGLE/renderer/d3d/d3d9/Query9.cpp',
>-            'libANGLE/renderer/d3d/d3d9/Query9.h',
>-            'libANGLE/renderer/d3d/d3d9/Renderer9.cpp',
>-            'libANGLE/renderer/d3d/d3d9/Renderer9.h',
>-            'libANGLE/renderer/d3d/d3d9/renderer9_utils.cpp',
>-            'libANGLE/renderer/d3d/d3d9/renderer9_utils.h',
>-            'libANGLE/renderer/d3d/d3d9/RenderTarget9.cpp',
>-            'libANGLE/renderer/d3d/d3d9/RenderTarget9.h',
>-            'libANGLE/renderer/d3d/d3d9/ShaderCache.h',
>-            'libANGLE/renderer/d3d/d3d9/ShaderExecutable9.cpp',
>-            'libANGLE/renderer/d3d/d3d9/ShaderExecutable9.h',
>-            'libANGLE/renderer/d3d/d3d9/shaders/compiled/componentmaskps.h',
>-            'libANGLE/renderer/d3d/d3d9/shaders/compiled/componentmaskpremultps.h',
>-            'libANGLE/renderer/d3d/d3d9/shaders/compiled/componentmaskunmultps.h',
>-            'libANGLE/renderer/d3d/d3d9/shaders/compiled/luminanceps.h',
>-            'libANGLE/renderer/d3d/d3d9/shaders/compiled/luminancepremultps.h',
>-            'libANGLE/renderer/d3d/d3d9/shaders/compiled/luminanceunmultps.h',
>-            'libANGLE/renderer/d3d/d3d9/shaders/compiled/passthroughps.h',
>-            'libANGLE/renderer/d3d/d3d9/shaders/compiled/standardvs.h',
>-            'libANGLE/renderer/d3d/d3d9/StateManager9.cpp',
>-            'libANGLE/renderer/d3d/d3d9/StateManager9.h',
>-            'libANGLE/renderer/d3d/d3d9/SwapChain9.cpp',
>-            'libANGLE/renderer/d3d/d3d9/SwapChain9.h',
>-            'libANGLE/renderer/d3d/d3d9/TextureStorage9.cpp',
>-            'libANGLE/renderer/d3d/d3d9/TextureStorage9.h',
>-            'libANGLE/renderer/d3d/d3d9/VertexArray9.h',
>-            'libANGLE/renderer/d3d/d3d9/VertexBuffer9.cpp',
>-            'libANGLE/renderer/d3d/d3d9/VertexBuffer9.h',
>-            'libANGLE/renderer/d3d/d3d9/vertexconversion.h',
>-            'libANGLE/renderer/d3d/d3d9/VertexDeclarationCache.cpp',
>-            'libANGLE/renderer/d3d/d3d9/VertexDeclarationCache.h',
>-        ],
>-        'libangle_d3d11_sources':
>-        [
>-            'libANGLE/renderer/d3d/d3d11/Blit11.cpp',
>-            'libANGLE/renderer/d3d/d3d11/Blit11.h',
>-            'libANGLE/renderer/d3d/d3d11/Buffer11.cpp',
>-            'libANGLE/renderer/d3d/d3d11/Buffer11.h',
>-            'libANGLE/renderer/d3d/d3d11/Clear11.cpp',
>-            'libANGLE/renderer/d3d/d3d11/Clear11.h',
>-            'libANGLE/renderer/d3d/d3d11/Context11.cpp',
>-            'libANGLE/renderer/d3d/d3d11/Context11.h',
>-            'libANGLE/renderer/d3d/d3d11/copyvertex.h',
>-            'libANGLE/renderer/d3d/d3d11/copyvertex.inl',
>-            'libANGLE/renderer/d3d/d3d11/DebugAnnotator11.cpp',
>-            'libANGLE/renderer/d3d/d3d11/DebugAnnotator11.h',
>-            'libANGLE/renderer/d3d/d3d11/dxgi_format_map_autogen.cpp',
>-            'libANGLE/renderer/d3d/d3d11/dxgi_support_table.cpp',
>-            'libANGLE/renderer/d3d/d3d11/dxgi_support_table.h',
>-            'libANGLE/renderer/d3d/d3d11/Fence11.cpp',
>-            'libANGLE/renderer/d3d/d3d11/Fence11.h',
>-            'libANGLE/renderer/d3d/d3d11/formatutils11.cpp',
>-            'libANGLE/renderer/d3d/d3d11/formatutils11.h',
>-            'libANGLE/renderer/d3d/d3d11/Framebuffer11.cpp',
>-            'libANGLE/renderer/d3d/d3d11/Framebuffer11.h',
>-            'libANGLE/renderer/d3d/d3d11/Image11.cpp',
>-            'libANGLE/renderer/d3d/d3d11/Image11.h',
>-            'libANGLE/renderer/d3d/d3d11/IndexBuffer11.cpp',
>-            'libANGLE/renderer/d3d/d3d11/IndexBuffer11.h',
>-            'libANGLE/renderer/d3d/d3d11/InputLayoutCache.cpp',
>-            'libANGLE/renderer/d3d/d3d11/InputLayoutCache.h',
>-            'libANGLE/renderer/d3d/d3d11/NativeWindow11.h',
>-            'libANGLE/renderer/d3d/d3d11/PixelTransfer11.cpp',
>-            'libANGLE/renderer/d3d/d3d11/PixelTransfer11.h',
>-            'libANGLE/renderer/d3d/d3d11/ProgramPipeline11.cpp',
>-            'libANGLE/renderer/d3d/d3d11/ProgramPipeline11.h',
>-            'libANGLE/renderer/d3d/d3d11/Query11.cpp',
>-            'libANGLE/renderer/d3d/d3d11/Query11.h',
>-            'libANGLE/renderer/d3d/d3d11/Renderer11.cpp',
>-            'libANGLE/renderer/d3d/d3d11/Renderer11.h',
>-            'libANGLE/renderer/d3d/d3d11/ResourceManager11.cpp',
>-            'libANGLE/renderer/d3d/d3d11/ResourceManager11.h',
>-            'libANGLE/renderer/d3d/d3d11/renderer11_utils.cpp',
>-            'libANGLE/renderer/d3d/d3d11/renderer11_utils.h',
>-            'libANGLE/renderer/d3d/d3d11/RenderStateCache.cpp',
>-            'libANGLE/renderer/d3d/d3d11/RenderStateCache.h',
>-            'libANGLE/renderer/d3d/d3d11/RenderTarget11.cpp',
>-            'libANGLE/renderer/d3d/d3d11/RenderTarget11.h',
>-            'libANGLE/renderer/d3d/d3d11/ShaderExecutable11.cpp',
>-            'libANGLE/renderer/d3d/d3d11/ShaderExecutable11.h',
>-            'libANGLE/renderer/d3d/d3d11/shaders/compiled/buffertotexture11_gs.h',
>-            'libANGLE/renderer/d3d/d3d11/shaders/compiled/buffertotexture11_ps_4f.h',
>-            'libANGLE/renderer/d3d/d3d11/shaders/compiled/buffertotexture11_ps_4i.h',
>-            'libANGLE/renderer/d3d/d3d11/shaders/compiled/buffertotexture11_ps_4ui.h',
>-            'libANGLE/renderer/d3d/d3d11/shaders/compiled/buffertotexture11_vs.h',
>-            'libANGLE/renderer/d3d/d3d11/shaders/compiled/clear11_fl9vs.h',
>-            'libANGLE/renderer/d3d/d3d11/shaders/compiled/clear11vs.h',
>-            'libANGLE/renderer/d3d/d3d11/shaders/compiled/cleardepth11ps.h',
>-            'libANGLE/renderer/d3d/d3d11/shaders/compiled/clearfloat11_fl9ps.h',
>-            'libANGLE/renderer/d3d/d3d11/shaders/compiled/clearfloat11ps1.h',
>-            'libANGLE/renderer/d3d/d3d11/shaders/compiled/clearfloat11ps2.h',
>-            'libANGLE/renderer/d3d/d3d11/shaders/compiled/clearfloat11ps3.h',
>-            'libANGLE/renderer/d3d/d3d11/shaders/compiled/clearfloat11ps4.h',
>-            'libANGLE/renderer/d3d/d3d11/shaders/compiled/clearfloat11ps5.h',
>-            'libANGLE/renderer/d3d/d3d11/shaders/compiled/clearfloat11ps6.h',
>-            'libANGLE/renderer/d3d/d3d11/shaders/compiled/clearfloat11ps7.h',
>-            'libANGLE/renderer/d3d/d3d11/shaders/compiled/clearfloat11ps8.h',
>-            'libANGLE/renderer/d3d/d3d11/shaders/compiled/clearsint11ps1.h',
>-            'libANGLE/renderer/d3d/d3d11/shaders/compiled/clearsint11ps2.h',
>-            'libANGLE/renderer/d3d/d3d11/shaders/compiled/clearsint11ps3.h',
>-            'libANGLE/renderer/d3d/d3d11/shaders/compiled/clearsint11ps4.h',
>-            'libANGLE/renderer/d3d/d3d11/shaders/compiled/clearsint11ps5.h',
>-            'libANGLE/renderer/d3d/d3d11/shaders/compiled/clearsint11ps6.h',
>-            'libANGLE/renderer/d3d/d3d11/shaders/compiled/clearsint11ps7.h',
>-            'libANGLE/renderer/d3d/d3d11/shaders/compiled/clearsint11ps8.h',
>-            'libANGLE/renderer/d3d/d3d11/shaders/compiled/clearuint11ps1.h',
>-            'libANGLE/renderer/d3d/d3d11/shaders/compiled/clearuint11ps2.h',
>-            'libANGLE/renderer/d3d/d3d11/shaders/compiled/clearuint11ps3.h',
>-            'libANGLE/renderer/d3d/d3d11/shaders/compiled/clearuint11ps4.h',
>-            'libANGLE/renderer/d3d/d3d11/shaders/compiled/clearuint11ps5.h',
>-            'libANGLE/renderer/d3d/d3d11/shaders/compiled/clearuint11ps6.h',
>-            'libANGLE/renderer/d3d/d3d11/shaders/compiled/clearuint11ps7.h',
>-            'libANGLE/renderer/d3d/d3d11/shaders/compiled/clearuint11ps8.h',
>-            'libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_pm_rgba_ps.h',
>-            'libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_um_rgba_ps.h',
>-            'libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_pm_rgb_ps.h',
>-            'libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_um_rgb_ps.h',
>-            'libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftou_pm_rgba_ps.h',
>-            'libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftou_pt_rgba_ps.h',
>-            'libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftou_um_rgba_ps.h',
>-            'libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftou_pm_rgb_ps.h',
>-            'libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftou_pt_rgb_ps.h',
>-            'libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftou_um_rgb_ps.h',
>-            'libANGLE/renderer/d3d/d3d11/shaders/compiled/passthrough2d11vs.h',
>-            'libANGLE/renderer/d3d/d3d11/shaders/compiled/passthrough3d11gs.h',
>-            'libANGLE/renderer/d3d/d3d11/shaders/compiled/passthrough3d11vs.h',
>-            'libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughdepth2d11ps.h',
>-            'libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughlum2d11ps.h',
>-            'libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughlum3d11ps.h',
>-            'libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughlumalpha2d11ps.h',
>-            'libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughlumalpha3d11ps.h',
>-            'libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughr2d11ps.h',
>-            'libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughr2di11ps.h',
>-            'libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughr2dui11ps.h',
>-            'libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughr3d11ps.h',
>-            'libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughr3di11ps.h',
>-            'libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughr3dui11ps.h',
>-            'libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrg2d11ps.h',
>-            'libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrg2di11ps.h',
>-            'libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrg2dui11ps.h',
>-            'libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrg3d11ps.h',
>-            'libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrg3di11ps.h',
>-            'libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrg3dui11ps.h',
>-            'libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgb2d11ps.h',
>-            'libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgb2di11ps.h',
>-            'libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgb2dui11ps.h',
>-            'libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgb3d11ps.h',
>-            'libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgb3di11ps.h',
>-            'libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgb3dui11ps.h',
>-            'libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgba2d11ps.h',
>-            'libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgba2di11ps.h',
>-            'libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgba2dui11ps.h',
>-            'libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgba3d11ps.h',
>-            'libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgba3di11ps.h',
>-            'libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgba3dui11ps.h',
>-            'libANGLE/renderer/d3d/d3d11/shaders/compiled/swizzlef2darrayps.h',
>-            'libANGLE/renderer/d3d/d3d11/shaders/compiled/swizzlef2dps.h',
>-            'libANGLE/renderer/d3d/d3d11/shaders/compiled/swizzlef3dps.h',
>-            'libANGLE/renderer/d3d/d3d11/shaders/compiled/swizzlei2darrayps.h',
>-            'libANGLE/renderer/d3d/d3d11/shaders/compiled/swizzlei2dps.h',
>-            'libANGLE/renderer/d3d/d3d11/shaders/compiled/swizzlei3dps.h',
>-            'libANGLE/renderer/d3d/d3d11/shaders/compiled/swizzleui2darrayps.h',
>-            'libANGLE/renderer/d3d/d3d11/shaders/compiled/swizzleui2dps.h',
>-            'libANGLE/renderer/d3d/d3d11/shaders/compiled/swizzleui3dps.h',
>-            'libANGLE/renderer/d3d/d3d11/StateManager11.cpp',
>-            'libANGLE/renderer/d3d/d3d11/StateManager11.h',
>-            'libANGLE/renderer/d3d/d3d11/StreamProducerNV12.cpp',
>-            'libANGLE/renderer/d3d/d3d11/StreamProducerNV12.h',
>-            'libANGLE/renderer/d3d/d3d11/SwapChain11.cpp',
>-            'libANGLE/renderer/d3d/d3d11/SwapChain11.h',
>-            'libANGLE/renderer/d3d/d3d11/TextureStorage11.cpp',
>-            'libANGLE/renderer/d3d/d3d11/TextureStorage11.h',
>-            'libANGLE/renderer/d3d/d3d11/TransformFeedback11.cpp',
>-            'libANGLE/renderer/d3d/d3d11/TransformFeedback11.h',
>-            'libANGLE/renderer/d3d/d3d11/Trim11.cpp',
>-            'libANGLE/renderer/d3d/d3d11/Trim11.h',
>-            'libANGLE/renderer/d3d/d3d11/texture_format_table_autogen.cpp',
>-            'libANGLE/renderer/d3d/d3d11/texture_format_table_utils.h',
>-            'libANGLE/renderer/d3d/d3d11/texture_format_table.cpp',
>-            'libANGLE/renderer/d3d/d3d11/texture_format_table.h',
>-            'libANGLE/renderer/d3d/d3d11/VertexArray11.cpp',
>-            'libANGLE/renderer/d3d/d3d11/VertexArray11.h',
>-            'libANGLE/renderer/d3d/d3d11/VertexBuffer11.cpp',
>-            'libANGLE/renderer/d3d/d3d11/VertexBuffer11.h',
>-        ],
>-        'libangle_d3d11_win32_sources':
>-        [
>-            'libANGLE/renderer/d3d/d3d11/win32/NativeWindow11Win32.cpp',
>-            'libANGLE/renderer/d3d/d3d11/win32/NativeWindow11Win32.h',
>-            'third_party/systeminfo/SystemInfo.cpp',
>-            'third_party/systeminfo/SystemInfo.h',
>-        ],
>-        'libangle_d3d11_winrt_sources':
>-        [
>-            'libANGLE/renderer/d3d/d3d11/winrt/CoreWindowNativeWindow.cpp',
>-            'libANGLE/renderer/d3d/d3d11/winrt/CoreWindowNativeWindow.h',
>-            'libANGLE/renderer/d3d/d3d11/winrt/InspectableNativeWindow.cpp',
>-            'libANGLE/renderer/d3d/d3d11/winrt/InspectableNativeWindow.h',
>-            'libANGLE/renderer/d3d/d3d11/winrt/NativeWindow11WinRT.cpp',
>-            'libANGLE/renderer/d3d/d3d11/winrt/NativeWindow11WinRT.h',
>-            'libANGLE/renderer/d3d/d3d11/winrt/SwapChainPanelNativeWindow.cpp',
>-            'libANGLE/renderer/d3d/d3d11/winrt/SwapChainPanelNativeWindow.h',
>-        ],
>-        'libangle_gl_sources':
>-        [
>-            'libANGLE/renderer/gl/BlitGL.cpp',
>-            'libANGLE/renderer/gl/BlitGL.h',
>-            'libANGLE/renderer/gl/BufferGL.cpp',
>-            'libANGLE/renderer/gl/BufferGL.h',
>-            'libANGLE/renderer/gl/ClearMultiviewGL.cpp',
>-            'libANGLE/renderer/gl/ClearMultiviewGL.h',
>-            'libANGLE/renderer/gl/CompilerGL.cpp',
>-            'libANGLE/renderer/gl/CompilerGL.h',
>-            'libANGLE/renderer/gl/ContextGL.cpp',
>-            'libANGLE/renderer/gl/ContextGL.h',
>-            'libANGLE/renderer/gl/DispatchTableGL_autogen.cpp',
>-            'libANGLE/renderer/gl/DispatchTableGL_autogen.h',
>-            'libANGLE/renderer/gl/DisplayGL.cpp',
>-            'libANGLE/renderer/gl/DisplayGL.h',
>-            'libANGLE/renderer/gl/FenceNVGL.cpp',
>-            'libANGLE/renderer/gl/FenceNVGL.h',
>-            'libANGLE/renderer/gl/FramebufferGL.cpp',
>-            'libANGLE/renderer/gl/FramebufferGL.h',
>-            'libANGLE/renderer/gl/FunctionsGL.cpp',
>-            'libANGLE/renderer/gl/FunctionsGL.h',
>-            'libANGLE/renderer/gl/PathGL.h',
>-            'libANGLE/renderer/gl/PathGL.cpp',
>-            'libANGLE/renderer/gl/ProgramGL.cpp',
>-            'libANGLE/renderer/gl/ProgramGL.h',
>-            'libANGLE/renderer/gl/ProgramPipelineGL.cpp',
>-            'libANGLE/renderer/gl/ProgramPipelineGL.h',
>-            'libANGLE/renderer/gl/QueryGL.cpp',
>-            'libANGLE/renderer/gl/QueryGL.h',
>-            'libANGLE/renderer/gl/RenderbufferGL.cpp',
>-            'libANGLE/renderer/gl/RenderbufferGL.h',
>-            'libANGLE/renderer/gl/RendererGL.cpp',
>-            'libANGLE/renderer/gl/RendererGL.h',
>-            'libANGLE/renderer/gl/SamplerGL.cpp',
>-            'libANGLE/renderer/gl/SamplerGL.h',
>-            'libANGLE/renderer/gl/ShaderGL.cpp',
>-            'libANGLE/renderer/gl/ShaderGL.h',
>-            'libANGLE/renderer/gl/StateManagerGL.cpp',
>-            'libANGLE/renderer/gl/StateManagerGL.h',
>-            'libANGLE/renderer/gl/SurfaceGL.cpp',
>-            'libANGLE/renderer/gl/SurfaceGL.h',
>-            'libANGLE/renderer/gl/SyncGL.cpp',
>-            'libANGLE/renderer/gl/SyncGL.h',
>-            'libANGLE/renderer/gl/TextureGL.cpp',
>-            'libANGLE/renderer/gl/TextureGL.h',
>-            'libANGLE/renderer/gl/TransformFeedbackGL.cpp',
>-            'libANGLE/renderer/gl/TransformFeedbackGL.h',
>-            'libANGLE/renderer/gl/VertexArrayGL.cpp',
>-            'libANGLE/renderer/gl/VertexArrayGL.h',
>-            'libANGLE/renderer/gl/WorkaroundsGL.h',
>-            'libANGLE/renderer/gl/formatutilsgl.cpp',
>-            'libANGLE/renderer/gl/formatutilsgl.h',
>-            'libANGLE/renderer/gl/functionsgl_enums.h',
>-            'libANGLE/renderer/gl/functionsgl_typedefs.h',
>-            'libANGLE/renderer/gl/renderergl_utils.cpp',
>-            'libANGLE/renderer/gl/renderergl_utils.h',
>-        ],
>-        'libangle_gl_null_sources':
>-        [
>-            'libANGLE/renderer/gl/null_functions.cpp',
>-            'libANGLE/renderer/gl/null_functions.h',
>-        ],
>-        'libangle_gl_wgl_sources':
>-        [
>-            'libANGLE/renderer/gl/wgl/D3DTextureSurfaceWGL.cpp',
>-            'libANGLE/renderer/gl/wgl/D3DTextureSurfaceWGL.h',
>-            'libANGLE/renderer/gl/wgl/DisplayWGL.cpp',
>-            'libANGLE/renderer/gl/wgl/DisplayWGL.h',
>-            'libANGLE/renderer/gl/wgl/DXGISwapChainWindowSurfaceWGL.cpp',
>-            'libANGLE/renderer/gl/wgl/DXGISwapChainWindowSurfaceWGL.h',
>-            'libANGLE/renderer/gl/wgl/FunctionsWGL.cpp',
>-            'libANGLE/renderer/gl/wgl/FunctionsWGL.h',
>-            'libANGLE/renderer/gl/wgl/PbufferSurfaceWGL.cpp',
>-            'libANGLE/renderer/gl/wgl/PbufferSurfaceWGL.h',
>-            'libANGLE/renderer/gl/wgl/SurfaceWGL.h',
>-            'libANGLE/renderer/gl/wgl/WindowSurfaceWGL.cpp',
>-            'libANGLE/renderer/gl/wgl/WindowSurfaceWGL.h',
>-            'libANGLE/renderer/gl/wgl/functionswgl_typedefs.h',
>-            'libANGLE/renderer/gl/wgl/wgl_utils.cpp',
>-            'libANGLE/renderer/gl/wgl/wgl_utils.h',
>-            'third_party/khronos/GL/wglext.h',
>-        ],
>-        'libangle_gl_glx_sources':
>-        [
>-            'libANGLE/renderer/gl/glx/DisplayGLX.cpp',
>-            'libANGLE/renderer/gl/glx/DisplayGLX.h',
>-            'libANGLE/renderer/gl/glx/FunctionsGLX.cpp',
>-            'libANGLE/renderer/gl/glx/FunctionsGLX.h',
>-            'libANGLE/renderer/gl/glx/PbufferSurfaceGLX.cpp',
>-            'libANGLE/renderer/gl/glx/PbufferSurfaceGLX.h',
>-            'libANGLE/renderer/gl/glx/SurfaceGLX.h',
>-            'libANGLE/renderer/gl/glx/WindowSurfaceGLX.cpp',
>-            'libANGLE/renderer/gl/glx/WindowSurfaceGLX.h',
>-            'libANGLE/renderer/gl/glx/functionsglx_typedefs.h',
>-            'libANGLE/renderer/gl/glx/platform_glx.h',
>-        ],
>-        'libangle_gl_egl_sources':
>-        [
>-            'libANGLE/renderer/gl/egl/DisplayEGL.cpp',
>-            'libANGLE/renderer/gl/egl/DisplayEGL.h',
>-            'libANGLE/renderer/gl/egl/egl_utils.cpp',
>-            'libANGLE/renderer/gl/egl/egl_utils.h',
>-            'libANGLE/renderer/gl/egl/FunctionsEGL.cpp',
>-            'libANGLE/renderer/gl/egl/FunctionsEGL.h',
>-            'libANGLE/renderer/gl/egl/functionsegl_typedefs.h',
>-            'libANGLE/renderer/gl/egl/PbufferSurfaceEGL.cpp',
>-            'libANGLE/renderer/gl/egl/PbufferSurfaceEGL.h',
>-            'libANGLE/renderer/gl/egl/SurfaceEGL.cpp',
>-            'libANGLE/renderer/gl/egl/SurfaceEGL.h',
>-            'libANGLE/renderer/gl/egl/WindowSurfaceEGL.cpp',
>-            'libANGLE/renderer/gl/egl/WindowSurfaceEGL.h',
>-        ],
>-        'libangle_gl_egl_dl_sources':
>-        [
>-            'libANGLE/renderer/gl/egl/FunctionsEGLDL.cpp',
>-            'libANGLE/renderer/gl/egl/FunctionsEGLDL.h',
>-        ],
>-        'libangle_gl_ozone_sources':
>-        [
>-            'libANGLE/renderer/gl/egl/ozone/DisplayOzone.cpp',
>-            'libANGLE/renderer/gl/egl/ozone/DisplayOzone.h',
>-            'libANGLE/renderer/gl/egl/ozone/SurfaceOzone.cpp',
>-            'libANGLE/renderer/gl/egl/ozone/SurfaceOzone.h',
>-        ],
>-        'libangle_gl_egl_android_sources':
>-        [
>-            'libANGLE/renderer/gl/egl/android/DisplayAndroid.cpp',
>-            'libANGLE/renderer/gl/egl/android/DisplayAndroid.h',
>-        ],
>-        'libangle_gl_cgl_sources':
>-        [
>-            'libANGLE/renderer/gl/cgl/DisplayCGL.mm',
>-            'libANGLE/renderer/gl/cgl/DisplayCGL.h',
>-            'libANGLE/renderer/gl/cgl/PbufferSurfaceCGL.mm',
>-            'libANGLE/renderer/gl/cgl/PbufferSurfaceCGL.h',
>-            'libANGLE/renderer/gl/cgl/WindowSurfaceCGL.mm',
>-            'libANGLE/renderer/gl/cgl/WindowSurfaceCGL.h',
>-        ],
>-        'libangle_vulkan_sources':
>-        [
>-            'libANGLE/renderer/vulkan/BufferVk.cpp',
>-            'libANGLE/renderer/vulkan/BufferVk.h',
>-            'libANGLE/renderer/vulkan/CompilerVk.cpp',
>-            'libANGLE/renderer/vulkan/CompilerVk.h',
>-            'libANGLE/renderer/vulkan/ContextVk.cpp',
>-            'libANGLE/renderer/vulkan/ContextVk.h',
>-            'libANGLE/renderer/vulkan/DeviceVk.cpp',
>-            'libANGLE/renderer/vulkan/DeviceVk.h',
>-            'libANGLE/renderer/vulkan/DisplayVk.cpp',
>-            'libANGLE/renderer/vulkan/DisplayVk.h',
>-            'libANGLE/renderer/vulkan/FenceNVVk.cpp',
>-            'libANGLE/renderer/vulkan/FenceNVVk.h',
>-            'libANGLE/renderer/vulkan/FramebufferVk.cpp',
>-            'libANGLE/renderer/vulkan/FramebufferVk.h',
>-            'libANGLE/renderer/vulkan/GlslangWrapper.cpp',
>-            'libANGLE/renderer/vulkan/GlslangWrapper.h',
>-            'libANGLE/renderer/vulkan/ImageVk.cpp',
>-            'libANGLE/renderer/vulkan/ImageVk.h',
>-            'libANGLE/renderer/vulkan/ProgramVk.cpp',
>-            'libANGLE/renderer/vulkan/ProgramVk.h',
>-            'libANGLE/renderer/vulkan/ProgramPipelineVk.cpp',
>-            'libANGLE/renderer/vulkan/ProgramPipelineVk.h',
>-            'libANGLE/renderer/vulkan/QueryVk.cpp',
>-            'libANGLE/renderer/vulkan/QueryVk.h',
>-            'libANGLE/renderer/vulkan/RenderbufferVk.cpp',
>-            'libANGLE/renderer/vulkan/RenderbufferVk.h',
>-            'libANGLE/renderer/vulkan/RendererVk.cpp',
>-            'libANGLE/renderer/vulkan/RendererVk.h',
>-            'libANGLE/renderer/vulkan/RenderTargetVk.cpp',
>-            'libANGLE/renderer/vulkan/RenderTargetVk.h',
>-            'libANGLE/renderer/vulkan/SamplerVk.cpp',
>-            'libANGLE/renderer/vulkan/SamplerVk.h',
>-            'libANGLE/renderer/vulkan/ShaderVk.cpp',
>-            'libANGLE/renderer/vulkan/ShaderVk.h',
>-            'libANGLE/renderer/vulkan/SurfaceVk.cpp',
>-            'libANGLE/renderer/vulkan/SurfaceVk.h',
>-            'libANGLE/renderer/vulkan/SyncVk.cpp',
>-            'libANGLE/renderer/vulkan/SyncVk.h',
>-            'libANGLE/renderer/vulkan/TextureVk.cpp',
>-            'libANGLE/renderer/vulkan/TextureVk.h',
>-            'libANGLE/renderer/vulkan/TransformFeedbackVk.cpp',
>-            'libANGLE/renderer/vulkan/TransformFeedbackVk.h',
>-            'libANGLE/renderer/vulkan/VertexArrayVk.cpp',
>-            'libANGLE/renderer/vulkan/VertexArrayVk.h',
>-            'libANGLE/renderer/vulkan/formatutilsvk.h',
>-            'libANGLE/renderer/vulkan/formatutilsvk.cpp',
>-            'libANGLE/renderer/vulkan/renderervk_utils.cpp',
>-            'libANGLE/renderer/vulkan/renderervk_utils.h',
>-            'libANGLE/renderer/vulkan/vk_format_table_autogen.cpp',
>-        ],
>-        'libangle_vulkan_win32_sources':
>-        [
>-            'libANGLE/renderer/vulkan/win32/DisplayVkWin32.cpp',
>-            'libANGLE/renderer/vulkan/win32/DisplayVkWin32.h',
>-            'libANGLE/renderer/vulkan/win32/WindowSurfaceVkWin32.cpp',
>-            'libANGLE/renderer/vulkan/win32/WindowSurfaceVkWin32.h',
>-        ],
>-        'libangle_vulkan_xcb_sources':
>-        [
>-            'libANGLE/renderer/vulkan/xcb/DisplayVkXcb.cpp',
>-            'libANGLE/renderer/vulkan/xcb/DisplayVkXcb.h',
>-            'libANGLE/renderer/vulkan/xcb/WindowSurfaceVkXcb.cpp',
>-            'libANGLE/renderer/vulkan/xcb/WindowSurfaceVkXcb.h',
>-        ],
>-        'libangle_null_sources':
>-        [
>-            'libANGLE/renderer/null/BufferNULL.cpp',
>-            'libANGLE/renderer/null/BufferNULL.h',
>-            'libANGLE/renderer/null/CompilerNULL.cpp',
>-            'libANGLE/renderer/null/CompilerNULL.h',
>-            'libANGLE/renderer/null/ContextNULL.cpp',
>-            'libANGLE/renderer/null/ContextNULL.h',
>-            'libANGLE/renderer/null/DeviceNULL.cpp',
>-            'libANGLE/renderer/null/DeviceNULL.h',
>-            'libANGLE/renderer/null/DisplayNULL.cpp',
>-            'libANGLE/renderer/null/DisplayNULL.h',
>-            'libANGLE/renderer/null/FenceNVNULL.cpp',
>-            'libANGLE/renderer/null/FenceNVNULL.h',
>-            'libANGLE/renderer/null/FramebufferNULL.cpp',
>-            'libANGLE/renderer/null/FramebufferNULL.h',
>-            'libANGLE/renderer/null/ImageNULL.cpp',
>-            'libANGLE/renderer/null/ImageNULL.h',
>-            'libANGLE/renderer/null/PathNULL.cpp',
>-            'libANGLE/renderer/null/PathNULL.h',
>-            'libANGLE/renderer/null/ProgramNULL.cpp',
>-            'libANGLE/renderer/null/ProgramNULL.h',
>-            'libANGLE/renderer/null/ProgramPipelineNULL.cpp',
>-            'libANGLE/renderer/null/ProgramPipelineNULL.h',
>-            'libANGLE/renderer/null/QueryNULL.cpp',
>-            'libANGLE/renderer/null/QueryNULL.h',
>-            'libANGLE/renderer/null/RenderbufferNULL.cpp',
>-            'libANGLE/renderer/null/RenderbufferNULL.h',
>-            'libANGLE/renderer/null/SamplerNULL.cpp',
>-            'libANGLE/renderer/null/SamplerNULL.h',
>-            'libANGLE/renderer/null/ShaderNULL.cpp',
>-            'libANGLE/renderer/null/ShaderNULL.h',
>-            'libANGLE/renderer/null/SurfaceNULL.cpp',
>-            'libANGLE/renderer/null/SurfaceNULL.h',
>-            'libANGLE/renderer/null/SyncNULL.cpp',
>-            'libANGLE/renderer/null/SyncNULL.h',
>-            'libANGLE/renderer/null/TextureNULL.cpp',
>-            'libANGLE/renderer/null/TextureNULL.h',
>-            'libANGLE/renderer/null/TransformFeedbackNULL.cpp',
>-            'libANGLE/renderer/null/TransformFeedbackNULL.h',
>-            'libANGLE/renderer/null/VertexArrayNULL.cpp',
>-            'libANGLE/renderer/null/VertexArrayNULL.h',
>-        ],
>-        'libglesv2_sources':
>-        [
>-            'common/angleutils.h',
>-            'common/debug.h',
>-            'libGLESv2/entry_points_egl.cpp',
>-            'libGLESv2/entry_points_egl.h',
>-            'libGLESv2/entry_points_egl_ext.cpp',
>-            'libGLESv2/entry_points_egl_ext.h',
>-            'libGLESv2/entry_points_gles_2_0_autogen.cpp',
>-            'libGLESv2/entry_points_gles_2_0_autogen.h',
>-            'libGLESv2/entry_points_gles_2_0_ext.cpp',
>-            'libGLESv2/entry_points_gles_2_0_ext.h',
>-            'libGLESv2/entry_points_gles_3_0_autogen.cpp',
>-            'libGLESv2/entry_points_gles_3_0_autogen.h',
>-            'libGLESv2/entry_points_gles_3_1_autogen.cpp',
>-            'libGLESv2/entry_points_gles_3_1_autogen.h',
>-            'libGLESv2/global_state.cpp',
>-            'libGLESv2/global_state.h',
>-            'libGLESv2/libGLESv2.cpp',
>-            'libGLESv2/libGLESv2.def',
>-            'libGLESv2/libGLESv2.rc',
>-            'libGLESv2/proc_table.h',
>-            'libGLESv2/proc_table_autogen.cpp',
>-            'libGLESv2/resource.h',
>-        ],
>-        'libegl_sources':
>-        [
>-            'libEGL/libEGL.cpp',
>-            'libEGL/libEGL.def',
>-            'libEGL/libEGL.rc',
>-            'libEGL/resource.h',
>-        ],
>-    },
>-    # Everything below this is duplicated in the GN build. If you change
>-    # anything also change angle/BUILD.gn
>-    'targets':
>-    [
>-        {
>-            # This target includes the right ANGLE defines for common/platform.h for D3D11.
>-            # It also links against the right libs. This is useful for the tests, which
>-            # have special D3D11 code for Debug runtime error message handling.
>-            'target_name': 'libANGLE_d3d11_config',
>-            'type': 'none',
>-            'conditions':
>-            [
>-                ['angle_enable_d3d11==1',
>-                {
>-                    'link_settings':
>-                    {
>-                        'msvs_settings':
>-                        {
>-                            'VCLinkerTool':
>-                            {
>-                                'conditions':
>-                                [
>-                                    ['angle_build_winrt==0',
>-                                    {
>-                                        'AdditionalDependencies':
>-                                        [
>-                                            'dxguid.lib',
>-                                        ],
>-                                    }],
>-                                    ['angle_build_winrt==1',
>-                                    {
>-                                        'AdditionalDependencies':
>-                                        [
>-                                            'dxguid.lib',
>-                                            'd3d11.lib',
>-                                            'd3dcompiler.lib',
>-                                        ],
>-                                    }],
>-                                ],
>-                            }
>-                        },
>-                    },
>-                }],
>-            ],
>-        },
>-
>-        {
>-            'target_name': 'libANGLE_renderer_config',
>-            'type': 'none',
>-            'direct_dependent_settings':
>-            {
>-                'conditions':
>-                [
>-                    ['angle_enable_d3d11==1',
>-                    {
>-                        'defines':
>-                        [
>-                            'ANGLE_ENABLE_D3D11',
>-                        ],
>-                    }],
>-                    ['angle_enable_d3d9==1',
>-                    {
>-                        'defines':
>-                        [
>-                            'ANGLE_ENABLE_D3D9',
>-                        ],
>-                    }],
>-                    ['angle_enable_gl==1',
>-                    {
>-                        'defines':
>-                        [
>-                            'ANGLE_ENABLE_OPENGL',
>-                        ],
>-                    }],
>-                    ['angle_enable_gl_null==1',
>-                    {
>-                        'defines':
>-                        [
>-                            'ANGLE_ENABLE_OPENGL_NULL',
>-                        ],
>-                    }],
>-                    ['angle_enable_vulkan==1',
>-                    {
>-                        'defines':
>-                        [
>-                            'ANGLE_ENABLE_VULKAN',
>-                        ],
>-                    }],
>-                    ['angle_enable_null==1',
>-                    {
>-                        'defines':
>-                        [
>-                            'ANGLE_ENABLE_NULL',
>-                        ],
>-                    }],
>-                ],
>-            },
>-        },
>-
>-        {
>-            'target_name': 'libANGLE',
>-            'type': 'static_library',
>-            'dependencies':
>-            [
>-                'translator',
>-                'commit_id',
>-                'angle_common',
>-                'angle_image_util',
>-                'angle_gpu_info_util',
>-                'libANGLE_d3d11_config',
>-                'libANGLE_renderer_config',
>-            ],
>-            'includes': [ '../gyp/common_defines.gypi', ],
>-            'include_dirs':
>-            [
>-                '.',
>-                '../include',
>-                'third_party/khronos',
>-            ],
>-            'sources':
>-            [
>-                '<@(libangle_sources)',
>-                '<@(libangle_includes)',
>-            ],
>-            'defines':
>-            [
>-                'LIBANGLE_IMPLEMENTATION',
>-            ],
>-            'msvs_disabled_warnings':
>-            [
>-                4577, # 'noexcept' used with no exception handling mode specified; termination on exception is not guaranteed.
>-            ],
>-            'export_dependent_settings':
>-            [
>-                'angle_common',
>-                'libANGLE_d3d11_config',
>-                'libANGLE_renderer_config',
>-            ],
>-            'direct_dependent_settings':
>-            {
>-                'include_dirs':
>-                [
>-                    '<(angle_path)/src',
>-                    '<(angle_path)/include',
>-                ],
>-                'defines':
>-                [
>-                    'LIBANGLE_IMPLEMENTATION',
>-                    'GL_GLEXT_PROTOTYPES',
>-                    'ANGLE_PRELOADED_D3DCOMPILER_MODULE_NAMES={ "d3dcompiler_47.dll", "d3dcompiler_46.dll", "d3dcompiler_43.dll" }',
>-                ],
>-                'conditions':
>-                [
>-                    ['OS=="win"', {
>-                        'defines':
>-                        [
>-                            'GL_APICALL=',
>-                        ],
>-                    }, {
>-                        'defines':
>-                        [
>-                            'GL_APICALL=__attribute__((visibility("default")))',
>-                        ],
>-                    }],
>-                    ['OS == "mac"',
>-                    {
>-                        'xcode_settings':
>-                        {
>-                            'DYLIB_INSTALL_NAME_BASE': '@rpath',
>-                        },
>-                    }],
>-                    ['angle_enable_gl==1',
>-                    {
>-                        'conditions':
>-                        [
>-                            ['angle_use_glx==1',
>-                            {
>-                                'defines':
>-                                [
>-                                    'ANGLE_USE_X11',
>-                                ],
>-                            }],
>-                        ],
>-                    }],
>-                ],
>-            },
>-            'conditions':
>-            [
>-                ['angle_enable_d3d9==1 or angle_enable_d3d11==1',
>-                {
>-                    'sources':
>-                    [
>-                        '<@(libangle_d3d_shared_sources)',
>-                    ],
>-                }],
>-                ['angle_enable_d3d9==1',
>-                {
>-                    'sources':
>-                    [
>-                        '<@(libangle_d3d9_sources)',
>-                    ],
>-                    'link_settings':
>-                    {
>-                        'msvs_settings':
>-                        {
>-                            'VCLinkerTool':
>-                            {
>-                                'AdditionalDependencies':
>-                                [
>-                                    'd3d9.lib',
>-                                ]
>-                            }
>-                        },
>-                    },
>-                }],
>-                ['angle_enable_d3d11==1',
>-                {
>-                    'sources':
>-                    [
>-                        '<@(libangle_d3d11_sources)',
>-                    ],
>-                    'conditions':
>-                    [
>-                        ['angle_build_winrt==1',
>-                        {
>-                            'sources':
>-                            [
>-                                '<@(libangle_d3d11_winrt_sources)',
>-                            ],
>-                        },
>-                        { # win32
>-                            'sources':
>-                            [
>-                                '<@(libangle_d3d11_win32_sources)',
>-                            ],
>-                        }],
>-                    ],
>-                }],
>-                ['angle_enable_gl==1',
>-                {
>-                    'sources':
>-                    [
>-                        '<@(libangle_gl_sources)',
>-                    ],
>-                    'conditions':
>-                    [
>-                        ['angle_enable_gl_null==1',
>-                        {
>-                            'sources':
>-                            [
>-                                '<@(libangle_gl_null_sources)',
>-                            ],
>-                        }],
>-                        ['OS=="win"',
>-                        {
>-                            'sources':
>-                            [
>-                                '<@(libangle_gl_wgl_sources)',
>-                            ],
>-                        }],
>-                        ['angle_use_glx==1',
>-                        {
>-                            'defines':
>-                            [
>-                                'ANGLE_USE_X11',
>-                            ],
>-                            'sources':
>-                            [
>-                                '<@(libangle_gl_glx_sources)',
>-                            ],
>-                            'link_settings': {
>-                                'ldflags': [
>-                                    '<!@(<(pkg-config) --libs-only-L --libs-only-other x11 xi xext xcb)',
>-                                ],
>-                                'libraries': [
>-                                    '<!@(<(pkg-config) --libs-only-l x11 xi xext xcb) -ldl',
>-                                ],
>-                            },
>-                        }],
>-                        ['use_ozone==1',
>-                        {
>-                            'defines':
>-                            [
>-                                'ANGLE_USE_OZONE',
>-                            ],
>-                            'sources':
>-                            [
>-                                '<@(libangle_gl_egl_sources)',
>-                                '<@(libangle_gl_egl_dl_sources)',
>-                                '<@(libangle_gl_ozone_sources)',
>-                            ],
>-                            'cflags':
>-                            [
>-                                '<!@(<(pkg-config) --cflags libdrm gbm)',
>-                            ],
>-                            'link_settings': {
>-                                'ldflags': [
>-                                    '<!@(<(pkg-config) --libs-only-L --libs-only-other libdrm gbm)',
>-                                ],
>-                                'libraries': [
>-                                    '<!@(<(pkg-config) --libs-only-l libdrm gbm) -ldl',
>-                                ],
>-                            },
>-                        }],
>-                        ['angle_link_glx==1',
>-                        {
>-                            'link_settings':
>-                            {
>-                                'libraries':
>-                                [
>-                                    '-lGL',
>-                                ],
>-                            },
>-                            'defines':
>-                            [
>-                                'ANGLE_LINK_GLX',
>-                            ],
>-                        }],
>-                        ['OS=="mac"',
>-                        {
>-                            'sources':
>-                            [
>-                                '<@(libangle_gl_cgl_sources)',
>-                            ],
>-                            'link_settings':
>-                            {
>-                                'libraries':
>-                                [
>-                                    '$(SDKROOT)/System/Library/Frameworks/Cocoa.framework',
>-                                    '$(SDKROOT)/System/Library/Frameworks/IOSurface.framework',
>-                                    '$(SDKROOT)/System/Library/Frameworks/OpenGL.framework',
>-                                    '$(SDKROOT)/System/Library/Frameworks/QuartzCore.framework',
>-                                ],
>-                            },
>-                            'all_dependent_settings':
>-                            {
>-                                'xcode_settings': {
>-                                    'LD_RUNPATH_SEARCH_PATHS': ['@executable_path/.'],
>-                                },
>-                            }
>-                        }],
>-                    ],
>-                }],
>-                ['angle_enable_vulkan==1',
>-                {
>-                    'sources':
>-                    [
>-                        '<@(libangle_vulkan_sources)',
>-                    ],
>-                    'conditions':
>-                    [
>-                        ['OS=="win"',
>-                        {
>-                            'sources':
>-                            [
>-                                '<@(libangle_vulkan_win32_sources)',
>-                            ],
>-                        }],
>-                        ['OS=="linux"',
>-                        {
>-                            'sources':
>-                            [
>-                                '<@(libangle_vulkan_xcb_sources)',
>-                            ],
>-                        }],
>-                    ],
>-                    'dependencies':
>-                    [
>-                        'angle_vulkan',
>-                    ],
>-                    'export_dependent_settings':
>-                    [
>-                        'angle_vulkan',
>-                    ],
>-                }],
>-                ['angle_enable_null==1',
>-                {
>-                    'sources':
>-                    [
>-                        '<@(libangle_null_sources)',
>-                    ],
>-                }],
>-                ['angle_build_winrt==0 and OS=="win"',
>-                {
>-                    'dependencies':
>-                    [
>-                        'copy_compiler_dll'
>-                    ],
>-                }],
>-                ['angle_build_winrt==1',
>-                {
>-                    'msvs_requires_importlibrary' : 'true',
>-                }],
>-            ],
>-        },
>-        {
>-            'target_name': 'libGLESv2',
>-            'type': '<(angle_gl_library_type)',
>-            'dependencies': [ 'libANGLE', 'angle_common' ],
>-            'includes': [ '../gyp/common_defines.gypi', ],
>-            'sources':
>-            [
>-                '<@(libglesv2_sources)',
>-            ],
>-            'defines':
>-            [
>-                'LIBGLESV2_IMPLEMENTATION',
>-            ],
>-            'conditions':
>-            [
>-                ['angle_build_winrt==1',
>-                {
>-                    'msvs_requires_importlibrary' : 'true',
>-                }],
>-            ],
>-        },
>-
>-        {
>-            'target_name': 'libGLESv2_static',
>-            'type': 'static_library',
>-            'dependencies': [ 'libANGLE', 'angle_common' ],
>-            'export_dependent_settings':
>-            [
>-                'libANGLE',
>-            ],
>-            'includes': [ '../gyp/common_defines.gypi', ],
>-            'sources':
>-            [
>-                '<@(libglesv2_sources)',
>-            ],
>-            'conditions':
>-            [
>-                ['angle_build_winrt==1',
>-                {
>-                    'msvs_requires_importlibrary' : 'true',
>-                }],
>-            ],
>-        },
>-    ],
>-}
>diff --git a/Source/ThirdParty/ANGLE/src/libGLESv2/entry_points_egl.cpp b/Source/ThirdParty/ANGLE/src/libGLESv2/entry_points_egl.cpp
>index 97546ee9000..c921bdae1fc 100644
>--- a/Source/ThirdParty/ANGLE/src/libGLESv2/entry_points_egl.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libGLESv2/entry_points_egl.cpp
>@@ -9,9 +9,11 @@
> #include "libGLESv2/entry_points_egl.h"
> 
> #include "common/debug.h"
>+#include "common/utilities.h"
> #include "common/version.h"
> #include "libANGLE/Context.h"
> #include "libANGLE/Display.h"
>+#include "libANGLE/EGLSync.h"
> #include "libANGLE/Surface.h"
> #include "libANGLE/Texture.h"
> #include "libANGLE/Thread.h"
>@@ -20,10 +22,7 @@
> #include "libGLESv2/global_state.h"
> #include "libGLESv2/proc_table.h"
> 
>-#include <EGL/eglext.h>
>-
>-namespace egl
>-{
>+using namespace egl;
> 
> namespace
> {
>@@ -49,98 +48,84 @@ void ClipConfigs(const std::vector<const Config *> &filteredConfigs,
>     }
>     *num_config = result_size;
> }
>-
> }  // anonymous namespace
> 
>+extern "C" {
> // EGL 1.0
>-EGLint EGLAPIENTRY GetError(void)
>+EGLint EGLAPIENTRY EGL_GetError(void)
> {
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>     EVENT("()");
>-    Thread *thread = GetCurrentThread();
>+    Thread *thread = egl::GetCurrentThread();
> 
>     EGLint error = thread->getError();
>-    thread->setError(NoError());
>+    thread->setSuccess();
>     return error;
> }
> 
>-EGLDisplay EGLAPIENTRY GetDisplay(EGLNativeDisplayType display_id)
>+EGLDisplay EGLAPIENTRY EGL_GetDisplay(EGLNativeDisplayType display_id)
> {
>-    EVENT("(EGLNativeDisplayType display_id = 0x%0.8p)", display_id);
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(EGLNativeDisplayType display_id = 0x%016" PRIxPTR ")", (uintptr_t)display_id);
> 
>-    return Display::GetDisplayFromNativeDisplay(display_id, AttributeMap());
>+    return egl::Display::GetDisplayFromNativeDisplay(display_id, AttributeMap());
> }
> 
>-EGLBoolean EGLAPIENTRY Initialize(EGLDisplay dpy, EGLint *major, EGLint *minor)
>+EGLBoolean EGLAPIENTRY EGL_Initialize(EGLDisplay dpy, EGLint *major, EGLint *minor)
> {
>-    EVENT("(EGLDisplay dpy = 0x%0.8p, EGLint *major = 0x%0.8p, EGLint *minor = 0x%0.8p)", dpy,
>-          major, minor);
>-    Thread *thread = GetCurrentThread();
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(EGLDisplay dpy = 0x%016" PRIxPTR ", EGLint *major = 0x%016" PRIxPTR
>+          ", EGLint *minor = 0x%016" PRIxPTR ")",
>+          (uintptr_t)dpy, (uintptr_t)major, (uintptr_t)minor);
>+    Thread *thread = egl::GetCurrentThread();
> 
>-    Display *display = static_cast<Display *>(dpy);
>-    if (dpy == EGL_NO_DISPLAY || !Display::isValidDisplay(display))
>-    {
>-        thread->setError(EglBadDisplay());
>-        return EGL_FALSE;
>-    }
>+    egl::Display *display = static_cast<egl::Display *>(dpy);
>+    ANGLE_EGL_TRY_RETURN(thread, ValidateInitialize(display), "eglInitialize",
>+                         GetDisplayIfValid(display), EGL_FALSE);
> 
>-    Error error = display->initialize();
>-    if (error.isError())
>-    {
>-        thread->setError(error);
>-        return EGL_FALSE;
>-    }
>+    ANGLE_EGL_TRY_RETURN(thread, display->initialize(), "eglInitialize", GetDisplayIfValid(display),
>+                         EGL_FALSE);
> 
>     if (major)
>         *major = 1;
>     if (minor)
>         *minor = 4;
> 
>-    thread->setError(NoError());
>+    thread->setSuccess();
>     return EGL_TRUE;
> }
> 
>-EGLBoolean EGLAPIENTRY Terminate(EGLDisplay dpy)
>+EGLBoolean EGLAPIENTRY EGL_Terminate(EGLDisplay dpy)
> {
>-    EVENT("(EGLDisplay dpy = 0x%0.8p)", dpy);
>-    Thread *thread = GetCurrentThread();
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(EGLDisplay dpy = 0x%016" PRIxPTR ")", (uintptr_t)dpy);
>+    Thread *thread = egl::GetCurrentThread();
> 
>-    Display *display = static_cast<Display *>(dpy);
>-    if (dpy == EGL_NO_DISPLAY || !Display::isValidDisplay(display))
>-    {
>-        thread->setError(EglBadDisplay());
>-        return EGL_FALSE;
>-    }
>-
>-    if (display->isValidContext(thread->getContext()))
>-    {
>-        thread->setCurrent(nullptr);
>-    }
>+    egl::Display *display = static_cast<egl::Display *>(dpy);
>+    ANGLE_EGL_TRY_RETURN(thread, ValidateTerminate(display), "eglTerminate",
>+                         GetDisplayIfValid(display), EGL_FALSE);
> 
>-    Error error = display->terminate();
>-    if (error.isError())
>-    {
>-        thread->setError(error);
>-        return EGL_FALSE;
>-    }
>+    ANGLE_EGL_TRY_RETURN(thread, display->makeCurrent(thread, nullptr, nullptr, nullptr),
>+                         "eglTerminate", GetDisplayIfValid(display), EGL_FALSE);
>+    SetContextCurrent(thread, nullptr);
>+    ANGLE_EGL_TRY_RETURN(thread, display->terminate(thread), "eglTerminate",
>+                         GetDisplayIfValid(display), EGL_FALSE);
> 
>-    thread->setError(NoError());
>+    thread->setSuccess();
>     return EGL_TRUE;
> }
> 
>-const char *EGLAPIENTRY QueryString(EGLDisplay dpy, EGLint name)
>+const char *EGLAPIENTRY EGL_QueryString(EGLDisplay dpy, EGLint name)
> {
>-    EVENT("(EGLDisplay dpy = 0x%0.8p, EGLint name = %d)", dpy, name);
>-    Thread *thread = GetCurrentThread();
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(EGLDisplay dpy = 0x%016" PRIxPTR ", EGLint name = %d)", (uintptr_t)dpy, name);
>+    Thread *thread = egl::GetCurrentThread();
> 
>-    Display *display = static_cast<Display *>(dpy);
>+    egl::Display *display = static_cast<egl::Display *>(dpy);
>     if (!(display == EGL_NO_DISPLAY && name == EGL_EXTENSIONS))
>     {
>-        Error error = ValidateDisplay(display);
>-        if (error.isError())
>-        {
>-            thread->setError(error);
>-            return nullptr;
>-        }
>+        ANGLE_EGL_TRY_RETURN(thread, ValidateDisplay(display), "eglQueryString",
>+                             GetDisplayIfValid(display), nullptr);
>     }
> 
>     const char *result;
>@@ -152,7 +137,7 @@ const char *EGLAPIENTRY QueryString(EGLDisplay dpy, EGLint name)
>         case EGL_EXTENSIONS:
>             if (display == EGL_NO_DISPLAY)
>             {
>-                result = Display::GetClientExtensionString().c_str();
>+                result = egl::Display::GetClientExtensionString().c_str();
>             }
>             else
>             {
>@@ -166,719 +151,544 @@ const char *EGLAPIENTRY QueryString(EGLDisplay dpy, EGLint name)
>             result = "1.4 (ANGLE " ANGLE_VERSION_STRING ")";
>             break;
>         default:
>-            thread->setError(EglBadParameter());
>+            thread->setError(EglBadParameter(), GetDebug(), "eglQueryString",
>+                             GetDisplayIfValid(display));
>             return nullptr;
>     }
> 
>-    thread->setError(NoError());
>+    thread->setSuccess();
>     return result;
> }
> 
>-EGLBoolean EGLAPIENTRY GetConfigs(EGLDisplay dpy,
>-                                  EGLConfig *configs,
>-                                  EGLint config_size,
>-                                  EGLint *num_config)
>+EGLBoolean EGLAPIENTRY EGL_GetConfigs(EGLDisplay dpy,
>+                                      EGLConfig *configs,
>+                                      EGLint config_size,
>+                                      EGLint *num_config)
> {
>-    EVENT(
>-        "(EGLDisplay dpy = 0x%0.8p, EGLConfig *configs = 0x%0.8p, "
>-        "EGLint config_size = %d, EGLint *num_config = 0x%0.8p)",
>-        dpy, configs, config_size, num_config);
>-    Thread *thread = GetCurrentThread();
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(EGLDisplay dpy = 0x%016" PRIxPTR ", EGLConfig *configs = 0x%016" PRIxPTR
>+          ", "
>+          "EGLint config_size = %d, EGLint *num_config = 0x%016" PRIxPTR ")",
>+          (uintptr_t)dpy, (uintptr_t)configs, config_size, (uintptr_t)num_config);
>+    Thread *thread = egl::GetCurrentThread();
> 
>-    Display *display = static_cast<Display *>(dpy);
>+    egl::Display *display = static_cast<egl::Display *>(dpy);
> 
>-    Error error = ValidateGetConfigs(display, config_size, num_config);
>-    if (error.isError())
>-    {
>-        thread->setError(error);
>-        return EGL_FALSE;
>-    }
>+    ANGLE_EGL_TRY_RETURN(thread, ValidateGetConfigs(display, config_size, num_config),
>+                         "eglGetConfigs", GetDisplayIfValid(display), EGL_FALSE);
> 
>     ClipConfigs(display->getConfigs(AttributeMap()), configs, config_size, num_config);
> 
>-    thread->setError(NoError());
>+    thread->setSuccess();
>     return EGL_TRUE;
> }
> 
>-EGLBoolean EGLAPIENTRY ChooseConfig(EGLDisplay dpy,
>-                                    const EGLint *attrib_list,
>-                                    EGLConfig *configs,
>-                                    EGLint config_size,
>-                                    EGLint *num_config)
>+EGLBoolean EGLAPIENTRY EGL_ChooseConfig(EGLDisplay dpy,
>+                                        const EGLint *attrib_list,
>+                                        EGLConfig *configs,
>+                                        EGLint config_size,
>+                                        EGLint *num_config)
> {
>-    EVENT(
>-        "(EGLDisplay dpy = 0x%0.8p, const EGLint *attrib_list = 0x%0.8p, "
>-        "EGLConfig *configs = 0x%0.8p, EGLint config_size = %d, EGLint *num_config = 0x%0.8p)",
>-        dpy, attrib_list, configs, config_size, num_config);
>-    Thread *thread = GetCurrentThread();
>-
>-    Display *display       = static_cast<Display *>(dpy);
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(EGLDisplay dpy = 0x%016" PRIxPTR ", const EGLint *attrib_list = 0x%016" PRIxPTR
>+          ", "
>+          "EGLConfig *configs = 0x%016" PRIxPTR
>+          ", EGLint config_size = %d, EGLint *num_config = 0x%016" PRIxPTR ")",
>+          (uintptr_t)dpy, (uintptr_t)attrib_list, (uintptr_t)configs, config_size,
>+          (uintptr_t)num_config);
>+    Thread *thread = egl::GetCurrentThread();
>+
>+    egl::Display *display  = static_cast<egl::Display *>(dpy);
>     AttributeMap attribMap = AttributeMap::CreateFromIntArray(attrib_list);
> 
>-    Error error = ValidateChooseConfig(display, attribMap, config_size, num_config);
>-    if (error.isError())
>-    {
>-        thread->setError(error);
>-        return EGL_FALSE;
>-    }
>+    ANGLE_EGL_TRY_RETURN(thread, ValidateChooseConfig(display, attribMap, config_size, num_config),
>+                         "eglChooseConfig", GetDisplayIfValid(display), EGL_FALSE);
> 
>-    ClipConfigs(display->getConfigs(attribMap), configs, config_size, num_config);
>+    ClipConfigs(display->chooseConfig(attribMap), configs, config_size, num_config);
> 
>-    thread->setError(NoError());
>+    thread->setSuccess();
>     return EGL_TRUE;
> }
> 
>-EGLBoolean EGLAPIENTRY GetConfigAttrib(EGLDisplay dpy,
>-                                       EGLConfig config,
>-                                       EGLint attribute,
>-                                       EGLint *value)
>+EGLBoolean EGLAPIENTRY EGL_GetConfigAttrib(EGLDisplay dpy,
>+                                           EGLConfig config,
>+                                           EGLint attribute,
>+                                           EGLint *value)
> {
>-    EVENT(
>-        "(EGLDisplay dpy = 0x%0.8p, EGLConfig config = 0x%0.8p, EGLint attribute = %d, EGLint "
>-        "*value = 0x%0.8p)",
>-        dpy, config, attribute, value);
>-    Thread *thread = GetCurrentThread();
>-
>-    Display *display      = static_cast<Display *>(dpy);
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(EGLDisplay dpy = 0x%016" PRIxPTR ", EGLConfig config = 0x%016" PRIxPTR
>+          ", EGLint attribute = %d, EGLint "
>+          "*value = 0x%016" PRIxPTR ")",
>+          (uintptr_t)dpy, (uintptr_t)config, attribute, (uintptr_t)value);
>+    Thread *thread = egl::GetCurrentThread();
>+
>+    egl::Display *display = static_cast<egl::Display *>(dpy);
>     Config *configuration = static_cast<Config *>(config);
> 
>-    Error error = ValidateGetConfigAttrib(display, configuration, attribute);
>-    if (error.isError())
>-    {
>-        thread->setError(error);
>-        return EGL_FALSE;
>-    }
>+    ANGLE_EGL_TRY_RETURN(thread, ValidateGetConfigAttrib(display, configuration, attribute),
>+                         "eglGetConfigAttrib", GetDisplayIfValid(display), EGL_FALSE);
> 
>     QueryConfigAttrib(configuration, attribute, value);
> 
>-    thread->setError(NoError());
>+    thread->setSuccess();
>     return EGL_TRUE;
> }
> 
>-EGLSurface EGLAPIENTRY CreateWindowSurface(EGLDisplay dpy,
>-                                           EGLConfig config,
>-                                           EGLNativeWindowType win,
>-                                           const EGLint *attrib_list)
>+EGLSurface EGLAPIENTRY EGL_CreateWindowSurface(EGLDisplay dpy,
>+                                               EGLConfig config,
>+                                               EGLNativeWindowType win,
>+                                               const EGLint *attrib_list)
> {
>-    EVENT(
>-        "(EGLDisplay dpy = 0x%0.8p, EGLConfig config = 0x%0.8p, EGLNativeWindowType win = 0x%0.8p, "
>-        "const EGLint *attrib_list = 0x%0.8p)",
>-        dpy, config, win, attrib_list);
>-    Thread *thread = GetCurrentThread();
>-
>-    Display *display        = static_cast<Display *>(dpy);
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(EGLDisplay dpy = 0x%016" PRIxPTR ", EGLConfig config = 0x%016" PRIxPTR
>+          ", EGLNativeWindowType win = 0x%016" PRIxPTR
>+          ", "
>+          "const EGLint *attrib_list = 0x%016" PRIxPTR ")",
>+          (uintptr_t)dpy, (uintptr_t)config, (uintptr_t)win, (uintptr_t)attrib_list);
>+    Thread *thread = egl::GetCurrentThread();
>+
>+    egl::Display *display   = static_cast<egl::Display *>(dpy);
>     Config *configuration   = static_cast<Config *>(config);
>     AttributeMap attributes = AttributeMap::CreateFromIntArray(attrib_list);
> 
>-    Error error = ValidateCreateWindowSurface(display, configuration, win, attributes);
>-    if (error.isError())
>-    {
>-        thread->setError(error);
>-        return EGL_NO_SURFACE;
>-    }
>+    ANGLE_EGL_TRY_RETURN(thread,
>+                         ValidateCreateWindowSurface(display, configuration, win, attributes),
>+                         "eglCreateWindowSurface", GetDisplayIfValid(display), EGL_NO_SURFACE);
> 
>     egl::Surface *surface = nullptr;
>-    error                 = display->createWindowSurface(configuration, win, attributes, &surface);
>-    if (error.isError())
>-    {
>-        thread->setError(error);
>-        return EGL_NO_SURFACE;
>-    }
>+    ANGLE_EGL_TRY_RETURN(thread,
>+                         display->createWindowSurface(configuration, win, attributes, &surface),
>+                         "eglCreateWindowSurface", GetDisplayIfValid(display), EGL_NO_SURFACE);
> 
>     return static_cast<EGLSurface>(surface);
> }
> 
>-EGLSurface EGLAPIENTRY CreatePbufferSurface(EGLDisplay dpy,
>-                                            EGLConfig config,
>-                                            const EGLint *attrib_list)
>+EGLSurface EGLAPIENTRY EGL_CreatePbufferSurface(EGLDisplay dpy,
>+                                                EGLConfig config,
>+                                                const EGLint *attrib_list)
> {
>-    EVENT(
>-        "(EGLDisplay dpy = 0x%0.8p, EGLConfig config = 0x%0.8p, const EGLint *attrib_list = "
>-        "0x%0.8p)",
>-        dpy, config, attrib_list);
>-    Thread *thread = GetCurrentThread();
>-
>-    Display *display        = static_cast<Display *>(dpy);
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(EGLDisplay dpy = 0x%016" PRIxPTR ", EGLConfig config = 0x%016" PRIxPTR
>+          ", const EGLint *attrib_list = "
>+          "0x%016" PRIxPTR ")",
>+          (uintptr_t)dpy, (uintptr_t)config, (uintptr_t)attrib_list);
>+    Thread *thread = egl::GetCurrentThread();
>+
>+    egl::Display *display   = static_cast<egl::Display *>(dpy);
>     Config *configuration   = static_cast<Config *>(config);
>     AttributeMap attributes = AttributeMap::CreateFromIntArray(attrib_list);
> 
>-    Error error = ValidateCreatePbufferSurface(display, configuration, attributes);
>-    if (error.isError())
>-    {
>-        thread->setError(error);
>-        return EGL_NO_SURFACE;
>-    }
>+    ANGLE_EGL_TRY_RETURN(thread, ValidateCreatePbufferSurface(display, configuration, attributes),
>+                         "eglCreatePbufferSurface", GetDisplayIfValid(display), EGL_NO_SURFACE);
> 
>     egl::Surface *surface = nullptr;
>-    error                 = display->createPbufferSurface(configuration, attributes, &surface);
>-    if (error.isError())
>-    {
>-        thread->setError(error);
>-        return EGL_NO_SURFACE;
>-    }
>+    ANGLE_EGL_TRY_RETURN(thread, display->createPbufferSurface(configuration, attributes, &surface),
>+                         "eglCreatePbufferSurface", GetDisplayIfValid(display), EGL_NO_SURFACE);
> 
>     return static_cast<EGLSurface>(surface);
> }
> 
>-EGLSurface EGLAPIENTRY CreatePixmapSurface(EGLDisplay dpy,
>-                                           EGLConfig config,
>-                                           EGLNativePixmapType pixmap,
>-                                           const EGLint *attrib_list)
>+EGLSurface EGLAPIENTRY EGL_CreatePixmapSurface(EGLDisplay dpy,
>+                                               EGLConfig config,
>+                                               EGLNativePixmapType pixmap,
>+                                               const EGLint *attrib_list)
> {
>-    EVENT(
>-        "(EGLDisplay dpy = 0x%0.8p, EGLConfig config = 0x%0.8p, EGLNativePixmapType pixmap = "
>-        "0x%0.8p, "
>-        "const EGLint *attrib_list = 0x%0.8p)",
>-        dpy, config, pixmap, attrib_list);
>-    Thread *thread = GetCurrentThread();
>-
>-    Display *display      = static_cast<Display *>(dpy);
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(EGLDisplay dpy = 0x%016" PRIxPTR ", EGLConfig config = 0x%016" PRIxPTR
>+          ", EGLNativePixmapType pixmap = "
>+          "0x%016" PRIxPTR
>+          ", "
>+          "const EGLint *attrib_list = 0x%016" PRIxPTR ")",
>+          (uintptr_t)dpy, (uintptr_t)config, (uintptr_t)pixmap, (uintptr_t)attrib_list);
>+    Thread *thread = egl::GetCurrentThread();
>+
>+    egl::Display *display = static_cast<egl::Display *>(dpy);
>     Config *configuration = static_cast<Config *>(config);
> 
>-    Error error = ValidateConfig(display, configuration);
>-    if (error.isError())
>-    {
>-        thread->setError(error);
>-        return EGL_NO_SURFACE;
>-    }
>+    ANGLE_EGL_TRY_RETURN(thread, ValidateConfig(display, configuration), "eglCreatePixmapSurface",
>+                         GetDisplayIfValid(display), EGL_NO_SURFACE);
> 
>     UNIMPLEMENTED();  // FIXME
> 
>-    thread->setError(NoError());
>+    thread->setSuccess();
>     return EGL_NO_SURFACE;
> }
> 
>-EGLBoolean EGLAPIENTRY DestroySurface(EGLDisplay dpy, EGLSurface surface)
>+EGLBoolean EGLAPIENTRY EGL_DestroySurface(EGLDisplay dpy, EGLSurface surface)
> {
>-    EVENT("(EGLDisplay dpy = 0x%0.8p, EGLSurface surface = 0x%0.8p)", dpy, surface);
>-    Thread *thread = GetCurrentThread();
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(EGLDisplay dpy = 0x%016" PRIxPTR ", EGLSurface surface = 0x%016" PRIxPTR ")",
>+          (uintptr_t)dpy, (uintptr_t)surface);
>+    Thread *thread = egl::GetCurrentThread();
> 
>-    Display *display    = static_cast<Display *>(dpy);
>-    Surface *eglSurface = static_cast<Surface *>(surface);
>+    egl::Display *display = static_cast<egl::Display *>(dpy);
>+    Surface *eglSurface   = static_cast<Surface *>(surface);
> 
>-    Error error = ValidateSurface(display, eglSurface);
>-    if (error.isError())
>-    {
>-        thread->setError(error);
>-        return EGL_FALSE;
>-    }
>+    ANGLE_EGL_TRY_RETURN(thread, ValidateDestroySurface(display, eglSurface, surface),
>+                         "eglDestroySurface", GetSurfaceIfValid(display, eglSurface), EGL_FALSE);
> 
>-    if (surface == EGL_NO_SURFACE)
>-    {
>-        thread->setError(EglBadSurface());
>-        return EGL_FALSE;
>-    }
>+    ANGLE_EGL_TRY_RETURN(thread, display->destroySurface(eglSurface), "eglDestroySurface",
>+                         GetSurfaceIfValid(display, eglSurface), EGL_FALSE);
> 
>-    error = display->destroySurface(reinterpret_cast<Surface *>(surface));
>-    if (error.isError())
>-    {
>-        thread->setError(error);
>-        return EGL_FALSE;
>-    }
>-
>-    thread->setError(NoError());
>+    thread->setSuccess();
>     return EGL_TRUE;
> }
> 
>-EGLBoolean EGLAPIENTRY QuerySurface(EGLDisplay dpy,
>-                                    EGLSurface surface,
>-                                    EGLint attribute,
>-                                    EGLint *value)
>+EGLBoolean EGLAPIENTRY EGL_QuerySurface(EGLDisplay dpy,
>+                                        EGLSurface surface,
>+                                        EGLint attribute,
>+                                        EGLint *value)
> {
>-    EVENT(
>-        "(EGLDisplay dpy = 0x%0.8p, EGLSurface surface = 0x%0.8p, EGLint attribute = %d, EGLint "
>-        "*value = 0x%0.8p)",
>-        dpy, surface, attribute, value);
>-    Thread *thread = GetCurrentThread();
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(EGLDisplay dpy = 0x%016" PRIxPTR ", EGLSurface surface = 0x%016" PRIxPTR
>+          ", EGLint attribute = %d, EGLint "
>+          "*value = 0x%016" PRIxPTR ")",
>+          (uintptr_t)dpy, (uintptr_t)surface, attribute, (uintptr_t)value);
>+    Thread *thread = egl::GetCurrentThread();
> 
>-    const Display *display    = static_cast<const Display *>(dpy);
>-    const Surface *eglSurface = static_cast<const Surface *>(surface);
>+    const egl::Display *display = static_cast<const egl::Display *>(dpy);
>+    const Surface *eglSurface   = static_cast<const Surface *>(surface);
> 
>-    Error error = ValidateQuerySurface(display, eglSurface, attribute, value);
>-    if (error.isError())
>-    {
>-        thread->setError(error);
>-        return EGL_FALSE;
>-    }
>+    ANGLE_EGL_TRY_RETURN(thread, ValidateQuerySurface(display, eglSurface, attribute, value),
>+                         "eglQuerySurface", GetSurfaceIfValid(display, eglSurface), EGL_FALSE);
> 
>     QuerySurfaceAttrib(eglSurface, attribute, value);
> 
>-    thread->setError(NoError());
>+    thread->setSuccess();
>     return EGL_TRUE;
> }
> 
>-EGLContext EGLAPIENTRY CreateContext(EGLDisplay dpy,
>-                                     EGLConfig config,
>-                                     EGLContext share_context,
>-                                     const EGLint *attrib_list)
>+EGLContext EGLAPIENTRY EGL_CreateContext(EGLDisplay dpy,
>+                                         EGLConfig config,
>+                                         EGLContext share_context,
>+                                         const EGLint *attrib_list)
> {
>-    EVENT(
>-        "(EGLDisplay dpy = 0x%0.8p, EGLConfig config = 0x%0.8p, EGLContext share_context = "
>-        "0x%0.8p, "
>-        "const EGLint *attrib_list = 0x%0.8p)",
>-        dpy, config, share_context, attrib_list);
>-    Thread *thread = GetCurrentThread();
>-
>-    Display *display             = static_cast<Display *>(dpy);
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(EGLDisplay dpy = 0x%016" PRIxPTR ", EGLConfig config = 0x%016" PRIxPTR
>+          ", EGLContext share_context = "
>+          "0x%016" PRIxPTR
>+          ", "
>+          "const EGLint *attrib_list = 0x%016" PRIxPTR ")",
>+          (uintptr_t)dpy, (uintptr_t)config, (uintptr_t)share_context, (uintptr_t)attrib_list);
>+    Thread *thread = egl::GetCurrentThread();
>+
>+    egl::Display *display        = static_cast<egl::Display *>(dpy);
>     Config *configuration        = static_cast<Config *>(config);
>     gl::Context *sharedGLContext = static_cast<gl::Context *>(share_context);
>     AttributeMap attributes      = AttributeMap::CreateFromIntArray(attrib_list);
> 
>-    Error error = ValidateCreateContext(display, configuration, sharedGLContext, attributes);
>-    if (error.isError())
>-    {
>-        thread->setError(error);
>-        return EGL_NO_CONTEXT;
>-    }
>+    ANGLE_EGL_TRY_RETURN(thread,
>+                         ValidateCreateContext(display, configuration, sharedGLContext, attributes),
>+                         "eglCreateContext", GetDisplayIfValid(display), EGL_NO_CONTEXT);
> 
>     gl::Context *context = nullptr;
>-    error = display->createContext(configuration, sharedGLContext, attributes, &context);
>-    if (error.isError())
>-    {
>-        thread->setError(error);
>-        return EGL_NO_CONTEXT;
>-    }
>+    ANGLE_EGL_TRY_RETURN(
>+        thread, display->createContext(configuration, sharedGLContext, attributes, &context),
>+        "eglCreateContext", GetDisplayIfValid(display), EGL_NO_CONTEXT);
> 
>-    thread->setError(NoError());
>+    thread->setSuccess();
>     return static_cast<EGLContext>(context);
> }
> 
>-EGLBoolean EGLAPIENTRY DestroyContext(EGLDisplay dpy, EGLContext ctx)
>+EGLBoolean EGLAPIENTRY EGL_DestroyContext(EGLDisplay dpy, EGLContext ctx)
> {
>-    EVENT("(EGLDisplay dpy = 0x%0.8p, EGLContext ctx = 0x%0.8p)", dpy, ctx);
>-    Thread *thread = GetCurrentThread();
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(EGLDisplay dpy = 0x%016" PRIxPTR ", EGLContext ctx = 0x%016" PRIxPTR ")",
>+          (uintptr_t)dpy, (uintptr_t)ctx);
>+    Thread *thread = egl::GetCurrentThread();
> 
>-    Display *display     = static_cast<Display *>(dpy);
>-    gl::Context *context = static_cast<gl::Context *>(ctx);
>+    egl::Display *display = static_cast<egl::Display *>(dpy);
>+    gl::Context *context  = static_cast<gl::Context *>(ctx);
> 
>-    Error error = ValidateContext(display, context);
>-    if (error.isError())
>-    {
>-        thread->setError(error);
>-        return EGL_FALSE;
>-    }
>+    ANGLE_EGL_TRY_RETURN(thread, ValidateDestroyContext(display, context, ctx), "eglDestroyContext",
>+                         GetContextIfValid(display, context), EGL_FALSE);
> 
>-    if (ctx == EGL_NO_CONTEXT)
>-    {
>-        thread->setError(EglBadContext());
>-        return EGL_FALSE;
>-    }
>+    bool contextWasCurrent = context == thread->getContext();
> 
>-    if (context == thread->getContext())
>-    {
>-        thread->setCurrent(nullptr);
>-    }
>+    ANGLE_EGL_TRY_RETURN(thread, display->destroyContext(thread, context), "eglDestroyContext",
>+                         GetContextIfValid(display, context), EGL_FALSE);
> 
>-    error = display->destroyContext(context);
>-    if (error.isError())
>+    if (contextWasCurrent)
>     {
>-        thread->setError(error);
>-        return EGL_FALSE;
>+        SetContextCurrent(thread, nullptr);
>     }
> 
>-    thread->setError(NoError());
>+    thread->setSuccess();
>     return EGL_TRUE;
> }
> 
>-EGLBoolean EGLAPIENTRY MakeCurrent(EGLDisplay dpy, EGLSurface draw, EGLSurface read, EGLContext ctx)
>+EGLBoolean EGLAPIENTRY EGL_MakeCurrent(EGLDisplay dpy,
>+                                       EGLSurface draw,
>+                                       EGLSurface read,
>+                                       EGLContext ctx)
> {
>-    EVENT(
>-        "(EGLDisplay dpy = 0x%0.8p, EGLSurface draw = 0x%0.8p, EGLSurface read = 0x%0.8p, "
>-        "EGLContext ctx = 0x%0.8p)",
>-        dpy, draw, read, ctx);
>-    Thread *thread = GetCurrentThread();
>-
>-    Display *display     = static_cast<Display *>(dpy);
>-    gl::Context *context = static_cast<gl::Context *>(ctx);
>-
>-    Error error = ValidateMakeCurrent(display, draw, read, context);
>-    if (error.isError())
>-    {
>-        thread->setError(error);
>-        return EGL_FALSE;
>-    }
>-
>-    Surface *readSurface   = static_cast<Surface *>(read);
>-    Surface *drawSurface   = static_cast<Surface *>(draw);
>-    Error makeCurrentError = display->makeCurrent(drawSurface, readSurface, context);
>-    if (makeCurrentError.isError())
>-    {
>-        thread->setError(makeCurrentError);
>-        return EGL_FALSE;
>-    }
>-
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(EGLDisplay dpy = 0x%016" PRIxPTR ", EGLSurface draw = 0x%016" PRIxPTR
>+          ", EGLSurface read = 0x%016" PRIxPTR
>+          ", "
>+          "EGLContext ctx = 0x%016" PRIxPTR ")",
>+          (uintptr_t)dpy, (uintptr_t)draw, (uintptr_t)read, (uintptr_t)ctx);
>+    Thread *thread = egl::GetCurrentThread();
>+
>+    egl::Display *display = static_cast<egl::Display *>(dpy);
>+    Surface *drawSurface  = static_cast<Surface *>(draw);
>+    Surface *readSurface  = static_cast<Surface *>(read);
>+    gl::Context *context  = static_cast<gl::Context *>(ctx);
>+
>+    ANGLE_EGL_TRY_RETURN(thread, ValidateMakeCurrent(display, drawSurface, readSurface, context),
>+                         "eglMakeCurrent", GetContextIfValid(display, context), EGL_FALSE);
>+
>+    Surface *previousDraw        = thread->getCurrentDrawSurface();
>+    Surface *previousRead        = thread->getCurrentReadSurface();
>     gl::Context *previousContext = thread->getContext();
>-    thread->setCurrent(context);
> 
>-    // Release the surface from the previously-current context, to allow
>-    // destroyed surfaces to delete themselves.
>-    if (previousContext != nullptr && context != previousContext)
>+    // Only call makeCurrent if the context or surfaces have changed.
>+    if (previousDraw != drawSurface || previousRead != readSurface || previousContext != context)
>     {
>-        auto err = previousContext->releaseSurface(display);
>-        if (err.isError())
>-        {
>-            thread->setError(err);
>-            return EGL_FALSE;
>-        }
>+        ANGLE_EGL_TRY_RETURN(thread,
>+                             display->makeCurrent(thread, drawSurface, readSurface, context),
>+                             "eglMakeCurrent", GetContextIfValid(display, context), EGL_FALSE);
>+
>+        SetContextCurrent(thread, context);
>     }
> 
>-    thread->setError(NoError());
>+    thread->setSuccess();
>     return EGL_TRUE;
> }
> 
>-EGLSurface EGLAPIENTRY GetCurrentSurface(EGLint readdraw)
>+EGLSurface EGLAPIENTRY EGL_GetCurrentSurface(EGLint readdraw)
> {
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>     EVENT("(EGLint readdraw = %d)", readdraw);
>-    Thread *thread = GetCurrentThread();
>+    Thread *thread = egl::GetCurrentThread();
> 
>     if (readdraw == EGL_READ)
>     {
>-        thread->setError(NoError());
>+        thread->setSuccess();
>         return thread->getCurrentReadSurface();
>     }
>     else if (readdraw == EGL_DRAW)
>     {
>-        thread->setError(NoError());
>+        thread->setSuccess();
>         return thread->getCurrentDrawSurface();
>     }
>     else
>     {
>-        thread->setError(EglBadParameter());
>+        thread->setError(EglBadParameter(), GetDebug(), "eglGetCurrentSurface", nullptr);
>         return EGL_NO_SURFACE;
>     }
> }
> 
>-EGLDisplay EGLAPIENTRY GetCurrentDisplay(void)
>+EGLDisplay EGLAPIENTRY EGL_GetCurrentDisplay(void)
> {
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>     EVENT("()");
>-    Thread *thread = GetCurrentThread();
>+    Thread *thread = egl::GetCurrentThread();
> 
>-    thread->setError(NoError());
>+    thread->setSuccess();
>     if (thread->getContext() != nullptr)
>     {
>-        return thread->getContext()->getCurrentDisplay();
>+        return thread->getContext()->getDisplay();
>     }
>     return EGL_NO_DISPLAY;
> }
> 
>-EGLBoolean EGLAPIENTRY QueryContext(EGLDisplay dpy, EGLContext ctx, EGLint attribute, EGLint *value)
>+EGLBoolean EGLAPIENTRY EGL_QueryContext(EGLDisplay dpy,
>+                                        EGLContext ctx,
>+                                        EGLint attribute,
>+                                        EGLint *value)
> {
>-    EVENT(
>-        "(EGLDisplay dpy = 0x%0.8p, EGLContext ctx = 0x%0.8p, EGLint attribute = %d, EGLint *value "
>-        "= 0x%0.8p)",
>-        dpy, ctx, attribute, value);
>-    Thread *thread = GetCurrentThread();
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(EGLDisplay dpy = 0x%016" PRIxPTR ", EGLContext ctx = 0x%016" PRIxPTR
>+          ", EGLint attribute = %d, EGLint *value "
>+          "= 0x%016" PRIxPTR ")",
>+          (uintptr_t)dpy, (uintptr_t)ctx, attribute, (uintptr_t)value);
>+    Thread *thread = egl::GetCurrentThread();
> 
>-    Display *display     = static_cast<Display *>(dpy);
>-    gl::Context *context = static_cast<gl::Context *>(ctx);
>+    egl::Display *display = static_cast<egl::Display *>(dpy);
>+    gl::Context *context  = static_cast<gl::Context *>(ctx);
> 
>-    Error error = ValidateQueryContext(display, context, attribute, value);
>-    if (error.isError())
>-    {
>-        thread->setError(error);
>-        return EGL_FALSE;
>-    }
>+    ANGLE_EGL_TRY_RETURN(thread, ValidateQueryContext(display, context, attribute, value),
>+                         "eglQueryContext", GetContextIfValid(display, context), EGL_FALSE);
> 
>     QueryContextAttrib(context, attribute, value);
> 
>-    thread->setError(NoError());
>+    thread->setSuccess();
>     return EGL_TRUE;
> }
> 
>-EGLBoolean EGLAPIENTRY WaitGL(void)
>+EGLBoolean EGLAPIENTRY EGL_WaitGL(void)
> {
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>     EVENT("()");
>-    Thread *thread = GetCurrentThread();
>+    Thread *thread = egl::GetCurrentThread();
> 
>-    Display *display = thread->getCurrentDisplay();
>+    egl::Display *display = thread->getDisplay();
> 
>-    Error error = ValidateDisplay(display);
>-    if (error.isError())
>-    {
>-        thread->setError(error);
>-        return EGL_FALSE;
>-    }
>+    ANGLE_EGL_TRY_RETURN(thread, ValidateDisplay(display), "eglWaitGL", GetDisplayIfValid(display),
>+                         EGL_FALSE);
> 
>     // eglWaitGL like calling eglWaitClient with the OpenGL ES API bound. Since we only implement
>     // OpenGL ES we can do the call directly.
>-    error = display->waitClient(thread->getContext());
>-    if (error.isError())
>-    {
>-        thread->setError(error);
>-        return EGL_FALSE;
>-    }
>+    ANGLE_EGL_TRY_RETURN(thread, display->waitClient(thread->getContext()), "eglWaitGL",
>+                         GetDisplayIfValid(display), EGL_FALSE);
> 
>-    thread->setError(NoError());
>+    thread->setSuccess();
>     return EGL_TRUE;
> }
> 
>-EGLBoolean EGLAPIENTRY WaitNative(EGLint engine)
>+EGLBoolean EGLAPIENTRY EGL_WaitNative(EGLint engine)
> {
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>     EVENT("(EGLint engine = %d)", engine);
>-    Thread *thread = GetCurrentThread();
>+    Thread *thread = egl::GetCurrentThread();
> 
>-    Display *display = thread->getCurrentDisplay();
>+    egl::Display *display = thread->getDisplay();
> 
>-    Error error = ValidateDisplay(display);
>-    if (error.isError())
>-    {
>-        thread->setError(error);
>-        return EGL_FALSE;
>-    }
>+    ANGLE_EGL_TRY_RETURN(thread, ValidateWaitNative(display, engine), "eglWaitNative",
>+                         GetThreadIfValid(thread), EGL_FALSE);
> 
>-    if (engine != EGL_CORE_NATIVE_ENGINE)
>-    {
>-        thread->setError(EglBadParameter() << "the 'engine' parameter has an unrecognized value");
>-    }
>-
>-    error = display->waitNative(thread->getContext(), engine);
>-    if (error.isError())
>-    {
>-        thread->setError(error);
>-        return EGL_FALSE;
>-    }
>+    ANGLE_EGL_TRY_RETURN(thread, display->waitNative(thread->getContext(), engine), "eglWaitNative",
>+                         GetThreadIfValid(thread), EGL_FALSE);
> 
>-    thread->setError(NoError());
>+    thread->setSuccess();
>     return EGL_TRUE;
> }
> 
>-EGLBoolean EGLAPIENTRY SwapBuffers(EGLDisplay dpy, EGLSurface surface)
>+EGLBoolean EGLAPIENTRY EGL_SwapBuffers(EGLDisplay dpy, EGLSurface surface)
> {
>-    EVENT("(EGLDisplay dpy = 0x%0.8p, EGLSurface surface = 0x%0.8p)", dpy, surface);
>-    Thread *thread = GetCurrentThread();
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(EGLDisplay dpy = 0x%016" PRIxPTR ", EGLSurface surface = 0x%016" PRIxPTR ")",
>+          (uintptr_t)dpy, (uintptr_t)surface);
>+    Thread *thread = egl::GetCurrentThread();
> 
>-    Display *display    = static_cast<Display *>(dpy);
>-    Surface *eglSurface = (Surface *)surface;
>+    egl::Display *display = static_cast<egl::Display *>(dpy);
>+    Surface *eglSurface   = (Surface *)surface;
> 
>-    Error error = ValidateSurface(display, eglSurface);
>-    if (error.isError())
>-    {
>-        thread->setError(error);
>-        return EGL_FALSE;
>-    }
>-
>-    if (display->testDeviceLost())
>-    {
>-        thread->setError(EglContextLost());
>-        return EGL_FALSE;
>-    }
>-
>-    if (surface == EGL_NO_SURFACE)
>-    {
>-        thread->setError(EglBadSurface());
>-        return EGL_FALSE;
>-    }
>-
>-    if (!thread->getContext() || thread->getCurrentDrawSurface() != eglSurface)
>-    {
>-        thread->setError(EglBadSurface());
>-        return EGL_FALSE;
>-    }
>+    ANGLE_EGL_TRY_RETURN(thread, ValidateSwapBuffers(thread, display, eglSurface), "eglSwapBuffers",
>+                         GetSurfaceIfValid(display, eglSurface), EGL_FALSE);
> 
>-    error = eglSurface->swap(thread->getContext());
>-    if (error.isError())
>-    {
>-        thread->setError(error);
>-        return EGL_FALSE;
>-    }
>+    ANGLE_EGL_TRY_RETURN(thread, eglSurface->swap(thread->getContext()), "eglSwapBuffers",
>+                         GetSurfaceIfValid(display, eglSurface), EGL_FALSE);
> 
>-    thread->setError(NoError());
>+    thread->setSuccess();
>     return EGL_TRUE;
> }
> 
>-EGLBoolean EGLAPIENTRY CopyBuffers(EGLDisplay dpy, EGLSurface surface, EGLNativePixmapType target)
>+EGLBoolean EGLAPIENTRY EGL_CopyBuffers(EGLDisplay dpy,
>+                                       EGLSurface surface,
>+                                       EGLNativePixmapType target)
> {
>-    EVENT(
>-        "(EGLDisplay dpy = 0x%0.8p, EGLSurface surface = 0x%0.8p, EGLNativePixmapType target = "
>-        "0x%0.8p)",
>-        dpy, surface, target);
>-    Thread *thread = GetCurrentThread();
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(EGLDisplay dpy = 0x%016" PRIxPTR ", EGLSurface surface = 0x%016" PRIxPTR
>+          ", EGLNativePixmapType target = "
>+          "0x%016" PRIxPTR ")",
>+          (uintptr_t)dpy, (uintptr_t)surface, (uintptr_t)target);
>+    Thread *thread = egl::GetCurrentThread();
> 
>-    Display *display    = static_cast<Display *>(dpy);
>-    Surface *eglSurface = static_cast<Surface *>(surface);
>+    egl::Display *display = static_cast<egl::Display *>(dpy);
>+    Surface *eglSurface   = static_cast<Surface *>(surface);
> 
>-    Error error = ValidateSurface(display, eglSurface);
>-    if (error.isError())
>-    {
>-        thread->setError(error);
>-        return EGL_FALSE;
>-    }
>-
>-    if (display->testDeviceLost())
>-    {
>-        thread->setError(EglContextLost());
>-        return EGL_FALSE;
>-    }
>+    ANGLE_EGL_TRY_RETURN(thread, ValidateCopyBuffers(display, eglSurface), "eglCopyBuffers",
>+                         GetSurfaceIfValid(display, eglSurface), EGL_FALSE);
> 
>     UNIMPLEMENTED();  // FIXME
> 
>-    thread->setError(NoError());
>+    thread->setSuccess();
>     return 0;
> }
> 
> // EGL 1.1
>-EGLBoolean EGLAPIENTRY BindTexImage(EGLDisplay dpy, EGLSurface surface, EGLint buffer)
>+EGLBoolean EGLAPIENTRY EGL_BindTexImage(EGLDisplay dpy, EGLSurface surface, EGLint buffer)
> {
>-    EVENT("(EGLDisplay dpy = 0x%0.8p, EGLSurface surface = 0x%0.8p, EGLint buffer = %d)", dpy,
>-          surface, buffer);
>-    Thread *thread = GetCurrentThread();
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(EGLDisplay dpy = 0x%016" PRIxPTR ", EGLSurface surface = 0x%016" PRIxPTR
>+          ", EGLint buffer = %d)",
>+          (uintptr_t)dpy, (uintptr_t)surface, buffer);
>+    Thread *thread = egl::GetCurrentThread();
> 
>-    Display *display    = static_cast<Display *>(dpy);
>-    Surface *eglSurface = static_cast<Surface *>(surface);
>+    egl::Display *display      = static_cast<egl::Display *>(dpy);
>+    Surface *eglSurface        = static_cast<Surface *>(surface);
>+    gl::Context *context       = thread->getContext();
>+    gl::Texture *textureObject = nullptr;
> 
>-    Error error = ValidateSurface(display, eglSurface);
>-    if (error.isError())
>-    {
>-        thread->setError(error);
>-        return EGL_FALSE;
>-    }
>-
>-    if (buffer != EGL_BACK_BUFFER)
>-    {
>-        thread->setError(EglBadParameter());
>-        return EGL_FALSE;
>-    }
>-
>-    if (surface == EGL_NO_SURFACE || eglSurface->getType() == EGL_WINDOW_BIT)
>-    {
>-        thread->setError(EglBadSurface());
>-        return EGL_FALSE;
>-    }
>+    ANGLE_EGL_TRY_RETURN(
>+        thread, ValidateBindTexImage(display, eglSurface, surface, buffer, context, &textureObject),
>+        "eglBindTexImage", GetSurfaceIfValid(display, eglSurface), EGL_FALSE);
> 
>-    if (eglSurface->getBoundTexture())
>-    {
>-        thread->setError(EglBadAccess());
>-        return EGL_FALSE;
>-    }
>-
>-    if (eglSurface->getTextureFormat() == EGL_NO_TEXTURE)
>-    {
>-        thread->setError(EglBadMatch());
>-        return EGL_FALSE;
>-    }
>-
>-    gl::Context *context = thread->getContext();
>     if (context)
>     {
>-        gl::Texture *textureObject = context->getTargetTexture(GL_TEXTURE_2D);
>-        ASSERT(textureObject != nullptr);
>-
>-        if (textureObject->getImmutableFormat())
>-        {
>-            thread->setError(EglBadMatch());
>-            return EGL_FALSE;
>-        }
>-
>-        error = eglSurface->bindTexImage(context, textureObject, buffer);
>-        if (error.isError())
>-        {
>-            thread->setError(error);
>-            return EGL_FALSE;
>-        }
>+        ANGLE_EGL_TRY_RETURN(thread, eglSurface->bindTexImage(context, textureObject, buffer),
>+                             "eglBindTexImage", GetSurfaceIfValid(display, eglSurface), EGL_FALSE);
>     }
> 
>-    thread->setError(NoError());
>+    thread->setSuccess();
>     return EGL_TRUE;
> }
> 
>-EGLBoolean EGLAPIENTRY SurfaceAttrib(EGLDisplay dpy,
>-                                     EGLSurface surface,
>-                                     EGLint attribute,
>-                                     EGLint value)
>+EGLBoolean EGLAPIENTRY EGL_SurfaceAttrib(EGLDisplay dpy,
>+                                         EGLSurface surface,
>+                                         EGLint attribute,
>+                                         EGLint value)
> {
>-    EVENT(
>-        "(EGLDisplay dpy = 0x%0.8p, EGLSurface surface = 0x%0.8p, EGLint attribute = %d, EGLint "
>-        "value = %d)",
>-        dpy, surface, attribute, value);
>-    Thread *thread = GetCurrentThread();
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(EGLDisplay dpy = 0x%016" PRIxPTR ", EGLSurface surface = 0x%016" PRIxPTR
>+          ", EGLint attribute = %d, EGLint "
>+          "value = %d)",
>+          (uintptr_t)dpy, (uintptr_t)surface, attribute, value);
>+    Thread *thread = egl::GetCurrentThread();
> 
>-    Display *display    = static_cast<Display *>(dpy);
>-    Surface *eglSurface = static_cast<Surface *>(surface);
>+    egl::Display *display = static_cast<egl::Display *>(dpy);
>+    Surface *eglSurface   = static_cast<Surface *>(surface);
> 
>-    Error error = ValidateSurfaceAttrib(display, eglSurface, attribute, value);
>-    if (error.isError())
>-    {
>-        thread->setError(error);
>-        return EGL_FALSE;
>-    }
>+    ANGLE_EGL_TRY_RETURN(thread, ValidateSurfaceAttrib(display, eglSurface, attribute, value),
>+                         "eglSurfaceAttrib", GetSurfaceIfValid(display, eglSurface), EGL_FALSE);
> 
>     SetSurfaceAttrib(eglSurface, attribute, value);
> 
>-    thread->setError(NoError());
>+    thread->setSuccess();
>     return EGL_TRUE;
> }
> 
>-EGLBoolean EGLAPIENTRY ReleaseTexImage(EGLDisplay dpy, EGLSurface surface, EGLint buffer)
>+EGLBoolean EGLAPIENTRY EGL_ReleaseTexImage(EGLDisplay dpy, EGLSurface surface, EGLint buffer)
> {
>-    EVENT("(EGLDisplay dpy = 0x%0.8p, EGLSurface surface = 0x%0.8p, EGLint buffer = %d)", dpy,
>-          surface, buffer);
>-    Thread *thread = GetCurrentThread();
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(EGLDisplay dpy = 0x%016" PRIxPTR ", EGLSurface surface = 0x%016" PRIxPTR
>+          ", EGLint buffer = %d)",
>+          (uintptr_t)dpy, (uintptr_t)surface, buffer);
>+    Thread *thread = egl::GetCurrentThread();
> 
>-    Display *display    = static_cast<Display *>(dpy);
>-    Surface *eglSurface = static_cast<Surface *>(surface);
>+    egl::Display *display = static_cast<egl::Display *>(dpy);
>+    Surface *eglSurface   = static_cast<Surface *>(surface);
> 
>-    Error error = ValidateSurface(display, eglSurface);
>-    if (error.isError())
>-    {
>-        thread->setError(error);
>-        return EGL_FALSE;
>-    }
>-
>-    if (buffer != EGL_BACK_BUFFER)
>-    {
>-        thread->setError(EglBadParameter());
>-        return EGL_FALSE;
>-    }
>-
>-    if (surface == EGL_NO_SURFACE || eglSurface->getType() == EGL_WINDOW_BIT)
>-    {
>-        thread->setError(EglBadSurface());
>-        return EGL_FALSE;
>-    }
>-
>-    if (eglSurface->getTextureFormat() == EGL_NO_TEXTURE)
>-    {
>-        thread->setError(EglBadMatch());
>-        return EGL_FALSE;
>-    }
>+    ANGLE_EGL_TRY_RETURN(thread, ValidateReleaseTexImage(display, eglSurface, surface, buffer),
>+                         "eglReleaseTexImage", GetSurfaceIfValid(display, eglSurface), EGL_FALSE);
> 
>     gl::Texture *texture = eglSurface->getBoundTexture();
> 
>     if (texture)
>     {
>-        error = eglSurface->releaseTexImage(thread->getContext(), buffer);
>-        if (error.isError())
>-        {
>-            thread->setError(error);
>-            return EGL_FALSE;
>-        }
>+        ANGLE_EGL_TRY_RETURN(thread, eglSurface->releaseTexImage(thread->getContext(), buffer),
>+                             "eglReleaseTexImage", GetSurfaceIfValid(display, eglSurface),
>+                             EGL_FALSE);
>     }
> 
>-    thread->setError(NoError());
>+    thread->setSuccess();
>     return EGL_TRUE;
> }
> 
>-EGLBoolean EGLAPIENTRY SwapInterval(EGLDisplay dpy, EGLint interval)
>+EGLBoolean EGLAPIENTRY EGL_SwapInterval(EGLDisplay dpy, EGLint interval)
> {
>-    EVENT("(EGLDisplay dpy = 0x%0.8p, EGLint interval = %d)", dpy, interval);
>-    Thread *thread = GetCurrentThread();
>-
>-    Display *display = static_cast<Display *>(dpy);
>-
>-    Error error = ValidateDisplay(display);
>-    if (error.isError())
>-    {
>-        thread->setError(error);
>-        return EGL_FALSE;
>-    }
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(EGLDisplay dpy = 0x%016" PRIxPTR ", EGLint interval = %d)", (uintptr_t)dpy, interval);
>+    Thread *thread       = egl::GetCurrentThread();
>+    gl::Context *context = thread->getContext();
> 
>+    egl::Display *display = static_cast<egl::Display *>(dpy);
>     Surface *draw_surface = static_cast<Surface *>(thread->getCurrentDrawSurface());
> 
>-    if (draw_surface == nullptr)
>-    {
>-        thread->setError(EglBadSurface());
>-        return EGL_FALSE;
>-    }
>+    ANGLE_EGL_TRY_RETURN(thread, ValidateSwapInterval(display, draw_surface, context),
>+                         "eglSwapInterval", GetDisplayIfValid(display), EGL_FALSE);
> 
>     const egl::Config *surfaceConfig = draw_surface->getConfig();
>     EGLint clampedInterval           = std::min(std::max(interval, surfaceConfig->minSwapInterval),
>@@ -886,235 +696,290 @@ EGLBoolean EGLAPIENTRY SwapInterval(EGLDisplay dpy, EGLint interval)
> 
>     draw_surface->setSwapInterval(clampedInterval);
> 
>-    thread->setError(NoError());
>+    thread->setSuccess();
>     return EGL_TRUE;
> }
> 
> // EGL 1.2
>-EGLBoolean EGLAPIENTRY BindAPI(EGLenum api)
>+EGLBoolean EGLAPIENTRY EGL_BindAPI(EGLenum api)
> {
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>     EVENT("(EGLenum api = 0x%X)", api);
>-    Thread *thread = GetCurrentThread();
>+    Thread *thread = egl::GetCurrentThread();
> 
>-    switch (api)
>-    {
>-        case EGL_OPENGL_API:
>-        case EGL_OPENVG_API:
>-            thread->setError(EglBadParameter());
>-            return EGL_FALSE;  // Not supported by this implementation
>-        case EGL_OPENGL_ES_API:
>-            break;
>-        default:
>-            thread->setError(EglBadParameter());
>-            return EGL_FALSE;
>-    }
>+    ANGLE_EGL_TRY_RETURN(thread, ValidateBindAPI(api), "eglBindAPI", GetThreadIfValid(thread),
>+                         EGL_FALSE);
> 
>     thread->setAPI(api);
> 
>-    thread->setError(NoError());
>+    thread->setSuccess();
>     return EGL_TRUE;
> }
> 
>-EGLenum EGLAPIENTRY QueryAPI(void)
>+EGLenum EGLAPIENTRY EGL_QueryAPI(void)
> {
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>     EVENT("()");
>-    Thread *thread = GetCurrentThread();
>+    Thread *thread = egl::GetCurrentThread();
> 
>     EGLenum API = thread->getAPI();
> 
>-    thread->setError(NoError());
>+    thread->setSuccess();
>     return API;
> }
> 
>-EGLSurface EGLAPIENTRY CreatePbufferFromClientBuffer(EGLDisplay dpy,
>-                                                     EGLenum buftype,
>-                                                     EGLClientBuffer buffer,
>-                                                     EGLConfig config,
>-                                                     const EGLint *attrib_list)
>+EGLSurface EGLAPIENTRY EGL_CreatePbufferFromClientBuffer(EGLDisplay dpy,
>+                                                         EGLenum buftype,
>+                                                         EGLClientBuffer buffer,
>+                                                         EGLConfig config,
>+                                                         const EGLint *attrib_list)
> {
>-    EVENT(
>-        "(EGLDisplay dpy = 0x%0.8p, EGLenum buftype = 0x%X, EGLClientBuffer buffer = 0x%0.8p, "
>-        "EGLConfig config = 0x%0.8p, const EGLint *attrib_list = 0x%0.8p)",
>-        dpy, buftype, buffer, config, attrib_list);
>-    Thread *thread = GetCurrentThread();
>-
>-    Display *display        = static_cast<Display *>(dpy);
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(EGLDisplay dpy = 0x%016" PRIxPTR
>+          ", EGLenum buftype = 0x%X, EGLClientBuffer buffer = 0x%016" PRIxPTR
>+          ", "
>+          "EGLConfig config = 0x%016" PRIxPTR ", const EGLint *attrib_list = 0x%016" PRIxPTR ")",
>+          (uintptr_t)dpy, buftype, (uintptr_t)buffer, (uintptr_t)config, (uintptr_t)attrib_list);
>+    Thread *thread = egl::GetCurrentThread();
>+
>+    egl::Display *display   = static_cast<egl::Display *>(dpy);
>     Config *configuration   = static_cast<Config *>(config);
>     AttributeMap attributes = AttributeMap::CreateFromIntArray(attrib_list);
> 
>-    Error error =
>-        ValidateCreatePbufferFromClientBuffer(display, buftype, buffer, configuration, attributes);
>-    if (error.isError())
>-    {
>-        thread->setError(error);
>-        return EGL_NO_SURFACE;
>-    }
>+    ANGLE_EGL_TRY_RETURN(
>+        thread,
>+        ValidateCreatePbufferFromClientBuffer(display, buftype, buffer, configuration, attributes),
>+        "eglCreatePbufferFromClientBuffer", GetDisplayIfValid(display), EGL_NO_SURFACE);
> 
>     egl::Surface *surface = nullptr;
>-    error = display->createPbufferFromClientBuffer(configuration, buftype, buffer, attributes,
>-                                                   &surface);
>-    if (error.isError())
>-    {
>-        thread->setError(error);
>-        return EGL_NO_SURFACE;
>-    }
>+    ANGLE_EGL_TRY_RETURN(thread,
>+                         display->createPbufferFromClientBuffer(configuration, buftype, buffer,
>+                                                                attributes, &surface),
>+                         "eglCreatePbufferFromClientBuffer", GetDisplayIfValid(display),
>+                         EGL_NO_SURFACE);
> 
>     return static_cast<EGLSurface>(surface);
> }
> 
>-EGLBoolean EGLAPIENTRY ReleaseThread(void)
>+EGLBoolean EGLAPIENTRY EGL_ReleaseThread(void)
> {
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>     EVENT("()");
>-    Thread *thread = GetCurrentThread();
>+    Thread *thread = egl::GetCurrentThread();
>+
>+    Surface *previousDraw         = thread->getCurrentDrawSurface();
>+    Surface *previousRead         = thread->getCurrentReadSurface();
>+    gl::Context *previousContext  = thread->getContext();
>+    egl::Display *previousDisplay = thread->getDisplay();
> 
>-    MakeCurrent(EGL_NO_DISPLAY, EGL_NO_CONTEXT, EGL_NO_SURFACE, EGL_NO_SURFACE);
>+    // Only call makeCurrent if the context or surfaces have changed.
>+    if (previousDraw != EGL_NO_SURFACE || previousRead != EGL_NO_SURFACE ||
>+        previousContext != EGL_NO_CONTEXT)
>+    {
>+        if (previousDisplay != EGL_NO_DISPLAY)
>+        {
>+            ANGLE_EGL_TRY_RETURN(thread,
>+                                 previousDisplay->makeCurrent(thread, nullptr, nullptr, nullptr),
>+                                 "eglReleaseThread", nullptr, EGL_FALSE);
>+        }
> 
>-    thread->setError(NoError());
>+        SetContextCurrent(thread, nullptr);
>+    }
>+
>+    thread->setSuccess();
>     return EGL_TRUE;
> }
> 
>-EGLBoolean EGLAPIENTRY WaitClient(void)
>+EGLBoolean EGLAPIENTRY EGL_WaitClient(void)
> {
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>     EVENT("()");
>-    Thread *thread = GetCurrentThread();
>+    Thread *thread = egl::GetCurrentThread();
> 
>-    Display *display = thread->getCurrentDisplay();
>+    egl::Display *display = thread->getDisplay();
>+    gl::Context *context  = thread->getContext();
> 
>-    Error error = ValidateDisplay(display);
>-    if (error.isError())
>-    {
>-        thread->setError(error);
>-        return EGL_FALSE;
>-    }
>+    ANGLE_EGL_TRY_RETURN(thread, ValidateDisplay(display), "eglWaitClient",
>+                         GetContextIfValid(display, context), EGL_FALSE);
> 
>-    error = display->waitClient(thread->getContext());
>-    if (error.isError())
>-    {
>-        thread->setError(error);
>-        return EGL_FALSE;
>-    }
>+    ANGLE_EGL_TRY_RETURN(thread, display->waitClient(context), "eglWaitClient",
>+                         GetContextIfValid(display, context), EGL_FALSE);
> 
>-    thread->setError(NoError());
>+    thread->setSuccess();
>     return EGL_TRUE;
> }
> 
> // EGL 1.4
>-EGLContext EGLAPIENTRY GetCurrentContext(void)
>+EGLContext EGLAPIENTRY EGL_GetCurrentContext(void)
> {
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>     EVENT("()");
>-    Thread *thread = GetCurrentThread();
>+    Thread *thread = egl::GetCurrentThread();
> 
>     gl::Context *context = thread->getContext();
> 
>-    thread->setError(NoError());
>+    thread->setSuccess();
>     return static_cast<EGLContext>(context);
> }
> 
> // EGL 1.5
>-EGLSync EGLAPIENTRY CreateSync(EGLDisplay dpy, EGLenum type, const EGLAttrib *attrib_list)
>+EGLSync EGLAPIENTRY EGL_CreateSync(EGLDisplay dpy, EGLenum type, const EGLAttrib *attrib_list)
> {
>-    EVENT("(EGLDisplay dpy = 0x%0.8p, EGLenum type = 0x%X, const EGLint* attrib_list = 0x%0.8p)",
>-          dpy, type, attrib_list);
>-    Thread *thread = GetCurrentThread();
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(EGLDisplay dpy = 0x%016" PRIxPTR
>+          ", EGLenum type = 0x%X, const EGLint* attrib_list = 0x%016" PRIxPTR ")",
>+          (uintptr_t)dpy, type, (uintptr_t)attrib_list);
> 
>-    UNIMPLEMENTED();
>-    thread->setError(EglBadDisplay() << "eglCreateSync unimplemented.");
>-    return EGL_NO_SYNC;
>+    Thread *thread        = egl::GetCurrentThread();
>+    egl::Display *display = static_cast<egl::Display *>(dpy);
>+    AttributeMap attributes = AttributeMap::CreateFromAttribArray(attrib_list);
>+
>+    gl::Context *currentContext  = thread->getContext();
>+    egl::Display *currentDisplay = currentContext ? currentContext->getDisplay() : nullptr;
>+
>+    ANGLE_EGL_TRY_RETURN(
>+        thread, ValidateCreateSyncKHR(display, type, attributes, currentDisplay, currentContext),
>+        "eglCreateSync", GetDisplayIfValid(display), EGL_NO_SYNC);
>+
>+    egl::Sync *syncObject = nullptr;
>+    ANGLE_EGL_TRY_RETURN(thread, display->createSync(currentContext, type, attributes, &syncObject),
>+                         "eglCreateSync", GetDisplayIfValid(display), EGL_NO_SYNC);
>+
>+    thread->setSuccess();
>+    return static_cast<EGLSync>(syncObject);
> }
> 
>-EGLBoolean EGLAPIENTRY DestroySync(EGLDisplay dpy, EGLSync sync)
>+EGLBoolean EGLAPIENTRY EGL_DestroySync(EGLDisplay dpy, EGLSync sync)
> {
>-    EVENT("(EGLDisplay dpy = 0x%0.8p, EGLSync sync = 0x%0.8p)", dpy, sync);
>-    Thread *thread = GetCurrentThread();
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(EGLDisplay dpy = 0x%016" PRIxPTR ", EGLSync sync = 0x%016" PRIxPTR ")", (uintptr_t)dpy,
>+          (uintptr_t)sync);
> 
>-    UNIMPLEMENTED();
>-    thread->setError(EglBadDisplay() << "eglDestroySync unimplemented.");
>-    return EGL_FALSE;
>+    Thread *thread        = egl::GetCurrentThread();
>+    egl::Display *display = static_cast<egl::Display *>(dpy);
>+    egl::Sync *syncObject = static_cast<Sync *>(sync);
>+
>+    ANGLE_EGL_TRY_RETURN(thread, ValidateDestroySync(display, syncObject), "eglDestroySync",
>+                         GetDisplayIfValid(display), EGL_FALSE);
>+
>+    display->destroySync(syncObject);
>+
>+    thread->setSuccess();
>+    return EGL_TRUE;
> }
> 
>-EGLint EGLAPIENTRY ClientWaitSync(EGLDisplay dpy, EGLSync sync, EGLint flags, EGLTime timeout)
>+EGLint EGLAPIENTRY EGL_ClientWaitSync(EGLDisplay dpy, EGLSync sync, EGLint flags, EGLTime timeout)
> {
>-    EVENT(
>-        "(EGLDisplay dpy = 0x%0.8p, EGLSync sync = 0x%0.8p, EGLint flags = 0x%X, EGLTime timeout = "
>-        "%d)",
>-        dpy, sync, flags, timeout);
>-    Thread *thread = GetCurrentThread();
>-
>-    UNIMPLEMENTED();
>-    thread->setError(EglBadDisplay() << "eglClientWaitSync unimplemented.");
>-    return 0;
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(EGLDisplay dpy = 0x%016" PRIxPTR ", EGLSync sync = 0x%016" PRIxPTR
>+          ", EGLint flags = 0x%X, EGLTime timeout = "
>+          "%llu)",
>+          (uintptr_t)dpy, (uintptr_t)sync, flags, static_cast<unsigned long long>(timeout));
>+
>+    Thread *thread        = egl::GetCurrentThread();
>+    egl::Display *display = static_cast<egl::Display *>(dpy);
>+    egl::Sync *syncObject = static_cast<Sync *>(sync);
>+
>+    ANGLE_EGL_TRY_RETURN(thread, ValidateClientWaitSync(display, syncObject, flags, timeout),
>+                         "eglClientWaitSync", GetDisplayIfValid(display), EGL_FALSE);
>+
>+    gl::Context *currentContext = thread->getContext();
>+    EGLint syncStatus = EGL_FALSE;
>+    ANGLE_EGL_TRY_RETURN(
>+        thread, syncObject->clientWait(display, currentContext, flags, timeout, &syncStatus),
>+        "eglClientWaitSync", GetDisplayIfValid(display), EGL_FALSE);
>+
>+    thread->setSuccess();
>+    return syncStatus;
> }
> 
>-EGLBoolean EGLAPIENTRY GetSyncAttrib(EGLDisplay dpy,
>-                                     EGLSync sync,
>-                                     EGLint attribute,
>-                                     EGLAttrib *value)
>+EGLBoolean EGLAPIENTRY EGL_GetSyncAttrib(EGLDisplay dpy,
>+                                         EGLSync sync,
>+                                         EGLint attribute,
>+                                         EGLAttrib *value)
> {
>-    EVENT(
>-        "(EGLDisplay dpy = 0x%0.8p, EGLSync sync = 0x%0.8p, EGLint attribute = 0x%X, EGLAttrib "
>-        "*value = 0x%0.8p)",
>-        dpy, sync, attribute, value);
>-    Thread *thread = GetCurrentThread();
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(EGLDisplay dpy = 0x%016" PRIxPTR ", EGLSync sync = 0x%016" PRIxPTR
>+          ", EGLint attribute = 0x%X, EGLAttrib "
>+          "*value = 0x%016" PRIxPTR ")",
>+          (uintptr_t)dpy, (uintptr_t)sync, attribute, (uintptr_t)value);
> 
>-    UNIMPLEMENTED();
>-    thread->setError(EglBadDisplay() << "eglSyncAttrib unimplemented.");
>-    return EGL_FALSE;
>+    Thread *thread        = egl::GetCurrentThread();
>+    egl::Display *display = static_cast<egl::Display *>(dpy);
>+    egl::Sync *syncObject = static_cast<Sync *>(sync);
>+
>+    ANGLE_EGL_TRY_RETURN(thread, ValidateGetSyncAttrib(display, syncObject, attribute, value),
>+                         "eglGetSyncAttrib", GetDisplayIfValid(display), EGL_FALSE);
>+
>+    EGLint valueExt;
>+    ANGLE_EGL_TRY_RETURN(thread, GetSyncAttrib(display, syncObject, attribute, &valueExt),
>+                         "eglGetSyncAttrib", GetDisplayIfValid(display), EGL_FALSE);
>+    *value = valueExt;
>+
>+    thread->setSuccess();
>+    return EGL_TRUE;
> }
> 
>-EGLImage EGLAPIENTRY CreateImage(EGLDisplay dpy,
>-                                 EGLContext ctx,
>-                                 EGLenum target,
>-                                 EGLClientBuffer buffer,
>-                                 const EGLAttrib *attrib_list)
>+EGLImage EGLAPIENTRY EGL_CreateImage(EGLDisplay dpy,
>+                                     EGLContext ctx,
>+                                     EGLenum target,
>+                                     EGLClientBuffer buffer,
>+                                     const EGLAttrib *attrib_list)
> {
>-    EVENT(
>-        "(EGLDisplay dpy = 0x%0.8p, EGLContext ctx = 0x%0.8p, EGLenum target = 0x%X, "
>-        "EGLClientBuffer buffer = 0x%0.8p, const EGLAttrib *attrib_list = 0x%0.8p)",
>-        dpy, ctx, target, buffer, attrib_list);
>-    Thread *thread = GetCurrentThread();
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(EGLDisplay dpy = 0x%016" PRIxPTR ", EGLContext ctx = 0x%016" PRIxPTR
>+          ", EGLenum target = 0x%X, "
>+          "EGLClientBuffer buffer = 0x%016" PRIxPTR
>+          ", const EGLAttrib *attrib_list = 0x%016" PRIxPTR ")",
>+          (uintptr_t)dpy, (uintptr_t)ctx, target, (uintptr_t)buffer, (uintptr_t)attrib_list);
>+    Thread *thread        = egl::GetCurrentThread();
>+    egl::Display *display = static_cast<egl::Display *>(dpy);
> 
>     UNIMPLEMENTED();
>-    thread->setError(EglBadDisplay() << "eglCreateImage unimplemented.");
>+    thread->setError(EglBadDisplay() << "eglCreateImage unimplemented.", GetDebug(),
>+                     "eglCreateImage", GetDisplayIfValid(display));
>     return EGL_NO_IMAGE;
> }
> 
>-EGLBoolean EGLAPIENTRY DestroyImage(EGLDisplay dpy, EGLImage image)
>+EGLBoolean EGLAPIENTRY EGL_DestroyImage(EGLDisplay dpy, EGLImage image)
> {
>-    EVENT("(EGLDisplay dpy = 0x%0.8p, EGLImage image = 0x%0.8p)", dpy, image);
>-    Thread *thread = GetCurrentThread();
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(EGLDisplay dpy = 0x%016" PRIxPTR ", EGLImage image = 0x%016" PRIxPTR ")",
>+          (uintptr_t)dpy, (uintptr_t)image);
>+    Thread *thread        = egl::GetCurrentThread();
>+    egl::Display *display = static_cast<egl::Display *>(dpy);
>+    Image *eglImage       = static_cast<Image *>(image);
> 
>     UNIMPLEMENTED();
>-    thread->setError(EglBadDisplay() << "eglDestroyImage unimplemented.");
>+    thread->setError(EglBadDisplay() << "eglDestroyImage unimplemented.", GetDebug(),
>+                     "eglDestroyImage", GetImageIfValid(display, eglImage));
>     return EGL_FALSE;
> }
> 
>-EGLDisplay EGLAPIENTRY GetPlatformDisplay(EGLenum platform,
>-                                          void *native_display,
>-                                          const EGLAttrib *attrib_list)
>+EGLDisplay EGLAPIENTRY EGL_GetPlatformDisplay(EGLenum platform,
>+                                              void *native_display,
>+                                              const EGLAttrib *attrib_list)
> {
>-    EVENT(
>-        "(EGLenum platform = %d, void* native_display = 0x%0.8p, const EGLint* attrib_list = "
>-        "0x%0.8p)",
>-        platform, native_display, attrib_list);
>-    Thread *thread = GetCurrentThread();
>-
>-    Error err = ValidateGetPlatformDisplay(platform, native_display, attrib_list);
>-    thread->setError(err);
>-    if (err.isError())
>-    {
>-        return EGL_NO_DISPLAY;
>-    }
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(EGLenum platform = %d, void* native_display = 0x%016" PRIxPTR
>+          ", const EGLint* attrib_list = "
>+          "0x%016" PRIxPTR ")",
>+          platform, (uintptr_t)native_display, (uintptr_t)attrib_list);
>+    Thread *thread = egl::GetCurrentThread();
>+
>+    ANGLE_EGL_TRY_RETURN(thread, ValidateGetPlatformDisplay(platform, native_display, attrib_list),
>+                         "eglGetPlatformDisplay", GetThreadIfValid(thread), EGL_NO_DISPLAY);
> 
>     const auto &attribMap = AttributeMap::CreateFromAttribArray(attrib_list);
>     if (platform == EGL_PLATFORM_ANGLE_ANGLE)
>     {
>-        return Display::GetDisplayFromNativeDisplay(
>+        return egl::Display::GetDisplayFromNativeDisplay(
>             gl::bitCast<EGLNativeDisplayType>(native_display), attribMap);
>     }
>     else if (platform == EGL_PLATFORM_DEVICE_EXT)
>     {
>-        Device *eglDevice = reinterpret_cast<Device *>(native_display);
>-        return Display::GetDisplayFromDevice(eglDevice, attribMap);
>+        Device *eglDevice = static_cast<Device *>(native_display);
>+        return egl::Display::GetDisplayFromDevice(eglDevice, attribMap);
>     }
>     else
>     {
>@@ -1123,58 +988,79 @@ EGLDisplay EGLAPIENTRY GetPlatformDisplay(EGLenum platform,
>     }
> }
> 
>-EGLSurface EGLAPIENTRY CreatePlatformWindowSurface(EGLDisplay dpy,
>-                                                   EGLConfig config,
>-                                                   void *native_window,
>-                                                   const EGLAttrib *attrib_list)
>+EGLSurface EGLAPIENTRY EGL_CreatePlatformWindowSurface(EGLDisplay dpy,
>+                                                       EGLConfig config,
>+                                                       void *native_window,
>+                                                       const EGLAttrib *attrib_list)
> {
>-    EVENT(
>-        "(EGLDisplay dpy = 0x%0.8p, EGLConfig config = 0x%0.8p, void* native_window = 0x%0.8p, "
>-        "const EGLint* attrib_list = 0x%0.8p)",
>-        dpy, config, native_window, attrib_list);
>-    Thread *thread = GetCurrentThread();
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(EGLDisplay dpy = 0x%016" PRIxPTR ", EGLConfig config = 0x%016" PRIxPTR
>+          ", void* native_window = 0x%016" PRIxPTR
>+          ", "
>+          "const EGLint* attrib_list = 0x%016" PRIxPTR ")",
>+          (uintptr_t)dpy, (uintptr_t)config, (uintptr_t)native_window, (uintptr_t)attrib_list);
>+    Thread *thread        = egl::GetCurrentThread();
>+    egl::Display *display = static_cast<egl::Display *>(dpy);
> 
>     UNIMPLEMENTED();
>-    thread->setError(EglBadDisplay() << "eglCreatePlatformWindowSurface unimplemented.");
>+    thread->setError(EglBadDisplay() << "eglCreatePlatformWindowSurface unimplemented.", GetDebug(),
>+                     "eglCreatePlatformWindowSurface", GetDisplayIfValid(display));
>     return EGL_NO_SURFACE;
> }
> 
>-EGLSurface EGLAPIENTRY CreatePlatformPixmapSurface(EGLDisplay dpy,
>-                                                   EGLConfig config,
>-                                                   void *native_pixmap,
>-                                                   const EGLAttrib *attrib_list)
>+EGLSurface EGLAPIENTRY EGL_CreatePlatformPixmapSurface(EGLDisplay dpy,
>+                                                       EGLConfig config,
>+                                                       void *native_pixmap,
>+                                                       const EGLAttrib *attrib_list)
> {
>-    EVENT(
>-        "(EGLDisplay dpy = 0x%0.8p, EGLConfig config = 0x%0.8p, void* native_pixmap = 0x%0.8p, "
>-        "const EGLint* attrib_list = 0x%0.8p)",
>-        dpy, config, native_pixmap, attrib_list);
>-    Thread *thread = GetCurrentThread();
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(EGLDisplay dpy = 0x%016" PRIxPTR ", EGLConfig config = 0x%016" PRIxPTR
>+          ", void* native_pixmap = 0x%016" PRIxPTR
>+          ", "
>+          "const EGLint* attrib_list = 0x%016" PRIxPTR ")",
>+          (uintptr_t)dpy, (uintptr_t)config, (uintptr_t)native_pixmap, (uintptr_t)attrib_list);
>+    Thread *thread        = egl::GetCurrentThread();
>+    egl::Display *display = static_cast<egl::Display *>(dpy);
> 
>     UNIMPLEMENTED();
>-    thread->setError(EglBadDisplay() << "eglCreatePlatformPixmapSurface unimplemented.");
>+    thread->setError(EglBadDisplay() << "eglCreatePlatformPixmapSurface unimplemented.", GetDebug(),
>+                     "eglCreatePlatformPixmapSurface", GetDisplayIfValid(display));
>     return EGL_NO_SURFACE;
> }
> 
>-EGLBoolean EGLAPIENTRY WaitSync(EGLDisplay dpy, EGLSync sync, EGLint flags)
>+EGLBoolean EGLAPIENTRY EGL_WaitSync(EGLDisplay dpy, EGLSync sync, EGLint flags)
> {
>-    EVENT("(EGLDisplay dpy = 0x%0.8p, EGLSync sync = 0x%0.8p, EGLint flags = 0x%X)", dpy, sync,
>-          flags);
>-    Thread *thread = GetCurrentThread();
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(EGLDisplay dpy =0x%016" PRIxPTR "p, EGLSync sync = 0x%016" PRIxPTR
>+          ", EGLint flags = 0x%X)",
>+          (uintptr_t)dpy, (uintptr_t)sync, flags);
> 
>-    UNIMPLEMENTED();
>-    thread->setError(EglBadDisplay() << "eglWaitSync unimplemented.");
>-    return EGL_FALSE;
>+    Thread *thread        = egl::GetCurrentThread();
>+    egl::Display *display = static_cast<egl::Display *>(dpy);
>+    gl::Context *context  = thread->getContext();
>+    egl::Sync *syncObject = static_cast<Sync *>(sync);
>+
>+    ANGLE_EGL_TRY_RETURN(thread, ValidateWaitSync(display, context, syncObject, flags),
>+                         "eglWaitSync", GetDisplayIfValid(display), EGL_FALSE);
>+
>+    gl::Context *currentContext = thread->getContext();
>+    ANGLE_EGL_TRY_RETURN(thread, syncObject->serverWait(display, currentContext, flags),
>+                         "eglWaitSync", GetDisplayIfValid(display), EGL_FALSE);
>+
>+    thread->setSuccess();
>+    return EGL_TRUE;
> }
> 
>-__eglMustCastToProperFunctionPointerType EGLAPIENTRY GetProcAddress(const char *procname)
>+__eglMustCastToProperFunctionPointerType EGLAPIENTRY EGL_GetProcAddress(const char *procname)
> {
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>     EVENT("(const char *procname = \"%s\")", procname);
>-    Thread *thread = GetCurrentThread();
>+    Thread *thread = egl::GetCurrentThread();
> 
>     ProcEntry *entry =
>         std::lower_bound(&g_procTable[0], &g_procTable[g_numProcs], procname, CompareProc);
> 
>-    thread->setError(NoError());
>+    thread->setSuccess();
> 
>     if (entry == &g_procTable[g_numProcs] || strcmp(entry->first, procname) != 0)
>     {
>@@ -1183,4 +1069,4 @@ __eglMustCastToProperFunctionPointerType EGLAPIENTRY GetProcAddress(const char *
> 
>     return entry->second;
> }
>-}
>+}  // extern "C"
>diff --git a/Source/ThirdParty/ANGLE/src/libGLESv2/entry_points_egl.h b/Source/ThirdParty/ANGLE/src/libGLESv2/entry_points_egl.h
>index 259a2096840..85a86ddc964 100644
>--- a/Source/ThirdParty/ANGLE/src/libGLESv2/entry_points_egl.h
>+++ b/Source/ThirdParty/ANGLE/src/libGLESv2/entry_points_egl.h
>@@ -12,63 +12,125 @@
> #include <EGL/egl.h>
> #include <export.h>
> 
>-namespace egl
>-{
>+extern "C" {
> 
> // EGL 1.0
>-ANGLE_EXPORT EGLBoolean EGLAPIENTRY ChooseConfig(EGLDisplay dpy, const EGLint *attrib_list, EGLConfig *configs, EGLint config_size, EGLint *num_config);
>-ANGLE_EXPORT EGLBoolean EGLAPIENTRY CopyBuffers(EGLDisplay dpy, EGLSurface surface, EGLNativePixmapType target);
>-ANGLE_EXPORT EGLContext EGLAPIENTRY CreateContext(EGLDisplay dpy, EGLConfig config, EGLContext share_context, const EGLint *attrib_list);
>-ANGLE_EXPORT EGLSurface EGLAPIENTRY CreatePbufferSurface(EGLDisplay dpy, EGLConfig config, const EGLint *attrib_list);
>-ANGLE_EXPORT EGLSurface EGLAPIENTRY CreatePixmapSurface(EGLDisplay dpy, EGLConfig config, EGLNativePixmapType pixmap, const EGLint *attrib_list);
>-ANGLE_EXPORT EGLSurface EGLAPIENTRY CreateWindowSurface(EGLDisplay dpy, EGLConfig config, EGLNativeWindowType win, const EGLint *attrib_list);
>-ANGLE_EXPORT EGLBoolean EGLAPIENTRY DestroyContext(EGLDisplay dpy, EGLContext ctx);
>-ANGLE_EXPORT EGLBoolean EGLAPIENTRY DestroySurface(EGLDisplay dpy, EGLSurface surface);
>-ANGLE_EXPORT EGLBoolean EGLAPIENTRY GetConfigAttrib(EGLDisplay dpy, EGLConfig config, EGLint attribute, EGLint *value);
>-ANGLE_EXPORT EGLBoolean EGLAPIENTRY GetConfigs(EGLDisplay dpy, EGLConfig *configs, EGLint config_size, EGLint *num_config);
>-ANGLE_EXPORT EGLDisplay EGLAPIENTRY GetCurrentDisplay(void);
>-ANGLE_EXPORT EGLSurface EGLAPIENTRY GetCurrentSurface(EGLint readdraw);
>-ANGLE_EXPORT EGLDisplay EGLAPIENTRY GetDisplay(EGLNativeDisplayType display_id);
>-ANGLE_EXPORT EGLint EGLAPIENTRY GetError(void);
>-ANGLE_EXPORT __eglMustCastToProperFunctionPointerType EGLAPIENTRY GetProcAddress(const char *procname);
>-ANGLE_EXPORT EGLBoolean EGLAPIENTRY Initialize(EGLDisplay dpy, EGLint *major, EGLint *minor);
>-ANGLE_EXPORT EGLBoolean EGLAPIENTRY MakeCurrent(EGLDisplay dpy, EGLSurface draw, EGLSurface read, EGLContext ctx);
>-ANGLE_EXPORT EGLBoolean EGLAPIENTRY QueryContext(EGLDisplay dpy, EGLContext ctx, EGLint attribute, EGLint *value);
>-ANGLE_EXPORT const char *EGLAPIENTRY QueryString(EGLDisplay dpy, EGLint name);
>-ANGLE_EXPORT EGLBoolean EGLAPIENTRY QuerySurface(EGLDisplay dpy, EGLSurface surface, EGLint attribute, EGLint *value);
>-ANGLE_EXPORT EGLBoolean EGLAPIENTRY SwapBuffers(EGLDisplay dpy, EGLSurface surface);
>-ANGLE_EXPORT EGLBoolean EGLAPIENTRY Terminate(EGLDisplay dpy);
>-ANGLE_EXPORT EGLBoolean EGLAPIENTRY WaitGL(void);
>-ANGLE_EXPORT EGLBoolean EGLAPIENTRY WaitNative(EGLint engine);
>+ANGLE_EXPORT EGLBoolean EGLAPIENTRY EGL_ChooseConfig(EGLDisplay dpy,
>+                                                     const EGLint *attrib_list,
>+                                                     EGLConfig *configs,
>+                                                     EGLint config_size,
>+                                                     EGLint *num_config);
>+ANGLE_EXPORT EGLBoolean EGLAPIENTRY EGL_CopyBuffers(EGLDisplay dpy,
>+                                                    EGLSurface surface,
>+                                                    EGLNativePixmapType target);
>+ANGLE_EXPORT EGLContext EGLAPIENTRY EGL_CreateContext(EGLDisplay dpy,
>+                                                      EGLConfig config,
>+                                                      EGLContext share_context,
>+                                                      const EGLint *attrib_list);
>+ANGLE_EXPORT EGLSurface EGLAPIENTRY EGL_CreatePbufferSurface(EGLDisplay dpy,
>+                                                             EGLConfig config,
>+                                                             const EGLint *attrib_list);
>+ANGLE_EXPORT EGLSurface EGLAPIENTRY EGL_CreatePixmapSurface(EGLDisplay dpy,
>+                                                            EGLConfig config,
>+                                                            EGLNativePixmapType pixmap,
>+                                                            const EGLint *attrib_list);
>+ANGLE_EXPORT EGLSurface EGLAPIENTRY EGL_CreateWindowSurface(EGLDisplay dpy,
>+                                                            EGLConfig config,
>+                                                            EGLNativeWindowType win,
>+                                                            const EGLint *attrib_list);
>+ANGLE_EXPORT EGLBoolean EGLAPIENTRY EGL_DestroyContext(EGLDisplay dpy, EGLContext ctx);
>+ANGLE_EXPORT EGLBoolean EGLAPIENTRY EGL_DestroySurface(EGLDisplay dpy, EGLSurface surface);
>+ANGLE_EXPORT EGLBoolean EGLAPIENTRY EGL_GetConfigAttrib(EGLDisplay dpy,
>+                                                        EGLConfig config,
>+                                                        EGLint attribute,
>+                                                        EGLint *value);
>+ANGLE_EXPORT EGLBoolean EGLAPIENTRY EGL_GetConfigs(EGLDisplay dpy,
>+                                                   EGLConfig *configs,
>+                                                   EGLint config_size,
>+                                                   EGLint *num_config);
>+ANGLE_EXPORT EGLDisplay EGLAPIENTRY EGL_GetCurrentDisplay(void);
>+ANGLE_EXPORT EGLSurface EGLAPIENTRY EGL_GetCurrentSurface(EGLint readdraw);
>+ANGLE_EXPORT EGLDisplay EGLAPIENTRY EGL_GetDisplay(EGLNativeDisplayType display_id);
>+ANGLE_EXPORT EGLint EGLAPIENTRY EGL_GetError(void);
>+ANGLE_EXPORT __eglMustCastToProperFunctionPointerType EGLAPIENTRY
>+EGL_GetProcAddress(const char *procname);
>+ANGLE_EXPORT EGLBoolean EGLAPIENTRY EGL_Initialize(EGLDisplay dpy, EGLint *major, EGLint *minor);
>+ANGLE_EXPORT EGLBoolean EGLAPIENTRY EGL_MakeCurrent(EGLDisplay dpy,
>+                                                    EGLSurface draw,
>+                                                    EGLSurface read,
>+                                                    EGLContext ctx);
>+ANGLE_EXPORT EGLBoolean EGLAPIENTRY EGL_QueryContext(EGLDisplay dpy,
>+                                                     EGLContext ctx,
>+                                                     EGLint attribute,
>+                                                     EGLint *value);
>+ANGLE_EXPORT const char *EGLAPIENTRY EGL_QueryString(EGLDisplay dpy, EGLint name);
>+ANGLE_EXPORT EGLBoolean EGLAPIENTRY EGL_QuerySurface(EGLDisplay dpy,
>+                                                     EGLSurface surface,
>+                                                     EGLint attribute,
>+                                                     EGLint *value);
>+ANGLE_EXPORT EGLBoolean EGLAPIENTRY EGL_SwapBuffers(EGLDisplay dpy, EGLSurface surface);
>+ANGLE_EXPORT EGLBoolean EGLAPIENTRY EGL_Terminate(EGLDisplay dpy);
>+ANGLE_EXPORT EGLBoolean EGLAPIENTRY EGL_WaitGL(void);
>+ANGLE_EXPORT EGLBoolean EGLAPIENTRY EGL_WaitNative(EGLint engine);
> 
> // EGL 1.1
>-ANGLE_EXPORT EGLBoolean EGLAPIENTRY BindTexImage(EGLDisplay dpy, EGLSurface surface, EGLint buffer);
>-ANGLE_EXPORT EGLBoolean EGLAPIENTRY ReleaseTexImage(EGLDisplay dpy, EGLSurface surface, EGLint buffer);
>-ANGLE_EXPORT EGLBoolean EGLAPIENTRY SurfaceAttrib(EGLDisplay dpy, EGLSurface surface, EGLint attribute, EGLint value);
>-ANGLE_EXPORT EGLBoolean EGLAPIENTRY SwapInterval(EGLDisplay dpy, EGLint interval);
>+ANGLE_EXPORT EGLBoolean EGLAPIENTRY EGL_BindTexImage(EGLDisplay dpy,
>+                                                     EGLSurface surface,
>+                                                     EGLint buffer);
>+ANGLE_EXPORT EGLBoolean EGLAPIENTRY EGL_ReleaseTexImage(EGLDisplay dpy,
>+                                                        EGLSurface surface,
>+                                                        EGLint buffer);
>+ANGLE_EXPORT EGLBoolean EGLAPIENTRY EGL_SurfaceAttrib(EGLDisplay dpy,
>+                                                      EGLSurface surface,
>+                                                      EGLint attribute,
>+                                                      EGLint value);
>+ANGLE_EXPORT EGLBoolean EGLAPIENTRY EGL_SwapInterval(EGLDisplay dpy, EGLint interval);
> 
> // EGL 1.2
>-ANGLE_EXPORT EGLBoolean EGLAPIENTRY BindAPI(EGLenum api);
>-ANGLE_EXPORT EGLenum EGLAPIENTRY QueryAPI(void);
>-ANGLE_EXPORT EGLSurface EGLAPIENTRY CreatePbufferFromClientBuffer(EGLDisplay dpy, EGLenum buftype, EGLClientBuffer buffer, EGLConfig config, const EGLint *attrib_list);
>-ANGLE_EXPORT EGLBoolean EGLAPIENTRY ReleaseThread(void);
>-ANGLE_EXPORT EGLBoolean EGLAPIENTRY WaitClient(void);
>+ANGLE_EXPORT EGLBoolean EGLAPIENTRY EGL_BindAPI(EGLenum api);
>+ANGLE_EXPORT EGLenum EGLAPIENTRY EGL_QueryAPI(void);
>+ANGLE_EXPORT EGLSurface EGLAPIENTRY EGL_CreatePbufferFromClientBuffer(EGLDisplay dpy,
>+                                                                      EGLenum buftype,
>+                                                                      EGLClientBuffer buffer,
>+                                                                      EGLConfig config,
>+                                                                      const EGLint *attrib_list);
>+ANGLE_EXPORT EGLBoolean EGLAPIENTRY EGL_ReleaseThread(void);
>+ANGLE_EXPORT EGLBoolean EGLAPIENTRY EGL_WaitClient(void);
> 
> // EGL 1.4
>-ANGLE_EXPORT EGLContext EGLAPIENTRY GetCurrentContext(void);
>+ANGLE_EXPORT EGLContext EGLAPIENTRY EGL_GetCurrentContext(void);
> 
> // EGL 1.5
>-ANGLE_EXPORT EGLSync EGLAPIENTRY CreateSync(EGLDisplay dpy, EGLenum type, const EGLAttrib *attrib_list);
>-ANGLE_EXPORT EGLBoolean EGLAPIENTRY DestroySync(EGLDisplay dpy, EGLSync sync);
>-ANGLE_EXPORT EGLint EGLAPIENTRY ClientWaitSync(EGLDisplay dpy, EGLSync sync, EGLint flags, EGLTime timeout);
>-ANGLE_EXPORT EGLBoolean EGLAPIENTRY GetSyncAttrib(EGLDisplay dpy, EGLSync sync, EGLint attribute, EGLAttrib *value);
>-ANGLE_EXPORT EGLImage EGLAPIENTRY CreateImage(EGLDisplay dpy, EGLContext ctx, EGLenum target, EGLClientBuffer buffer, const EGLAttrib *attrib_list);
>-ANGLE_EXPORT EGLBoolean EGLAPIENTRY DestroyImage(EGLDisplay dpy, EGLImage image);
>-ANGLE_EXPORT EGLDisplay EGLAPIENTRY GetPlatformDisplay(EGLenum platform, void *native_display, const EGLAttrib *attrib_list);
>-ANGLE_EXPORT EGLSurface EGLAPIENTRY CreatePlatformWindowSurface(EGLDisplay dpy, EGLConfig config, void *native_window, const EGLAttrib *attrib_list);
>-ANGLE_EXPORT EGLSurface EGLAPIENTRY CreatePlatformPixmapSurface(EGLDisplay dpy, EGLConfig config, void *native_pixmap, const EGLAttrib *attrib_list);
>-ANGLE_EXPORT EGLBoolean EGLAPIENTRY WaitSync(EGLDisplay dpy, EGLSync sync, EGLint flags);
>+ANGLE_EXPORT EGLSync EGLAPIENTRY EGL_CreateSync(EGLDisplay dpy,
>+                                                EGLenum type,
>+                                                const EGLAttrib *attrib_list);
>+ANGLE_EXPORT EGLBoolean EGLAPIENTRY EGL_DestroySync(EGLDisplay dpy, EGLSync sync);
>+ANGLE_EXPORT EGLint EGLAPIENTRY EGL_ClientWaitSync(EGLDisplay dpy,
>+                                                   EGLSync sync,
>+                                                   EGLint flags,
>+                                                   EGLTime timeout);
>+ANGLE_EXPORT EGLBoolean EGLAPIENTRY EGL_GetSyncAttrib(EGLDisplay dpy,
>+                                                      EGLSync sync,
>+                                                      EGLint attribute,
>+                                                      EGLAttrib *value);
>+ANGLE_EXPORT EGLImage EGLAPIENTRY EGL_CreateImage(EGLDisplay dpy,
>+                                                  EGLContext ctx,
>+                                                  EGLenum target,
>+                                                  EGLClientBuffer buffer,
>+                                                  const EGLAttrib *attrib_list);
>+ANGLE_EXPORT EGLBoolean EGLAPIENTRY EGL_DestroyImage(EGLDisplay dpy, EGLImage image);
>+ANGLE_EXPORT EGLDisplay EGLAPIENTRY EGL_GetPlatformDisplay(EGLenum platform,
>+                                                           void *native_display,
>+                                                           const EGLAttrib *attrib_list);
>+ANGLE_EXPORT EGLSurface EGLAPIENTRY EGL_CreatePlatformWindowSurface(EGLDisplay dpy,
>+                                                                    EGLConfig config,
>+                                                                    void *native_window,
>+                                                                    const EGLAttrib *attrib_list);
>+ANGLE_EXPORT EGLSurface EGLAPIENTRY EGL_CreatePlatformPixmapSurface(EGLDisplay dpy,
>+                                                                    EGLConfig config,
>+                                                                    void *native_pixmap,
>+                                                                    const EGLAttrib *attrib_list);
>+ANGLE_EXPORT EGLBoolean EGLAPIENTRY EGL_WaitSync(EGLDisplay dpy, EGLSync sync, EGLint flags);
>+}  // extern "C"
> 
>-}
>-
>-#endif // LIBGLESV2_ENTRYPOINTSEGL_H_
>+#endif  // LIBGLESV2_ENTRYPOINTSEGL_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libGLESv2/entry_points_egl_ext.cpp b/Source/ThirdParty/ANGLE/src/libGLESv2/entry_points_egl_ext.cpp
>index b8638179201..a8e442a59f7 100644
>--- a/Source/ThirdParty/ANGLE/src/libGLESv2/entry_points_egl_ext.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libGLESv2/entry_points_egl_ext.cpp
>@@ -7,116 +7,147 @@
> // entry_points_ext.cpp : Implements the EGL extension entry points.
> 
> #include "libGLESv2/entry_points_egl_ext.h"
>-#include "libGLESv2/global_state.h"
> 
>+#include "common/debug.h"
> #include "libANGLE/Context.h"
>-#include "libANGLE/Display.h"
> #include "libANGLE/Device.h"
>-#include "libANGLE/Surface.h"
>+#include "libANGLE/Display.h"
>+#include "libANGLE/EGLSync.h"
> #include "libANGLE/Stream.h"
>+#include "libANGLE/Surface.h"
> #include "libANGLE/Thread.h"
>+#include "libANGLE/queryutils.h"
> #include "libANGLE/validationEGL.h"
>+#include "libGLESv2/global_state.h"
> 
>-#include "common/debug.h"
>+using namespace egl;
> 
>-namespace egl
>-{
>+extern "C" {
> 
> // EGL_ANGLE_query_surface_pointer
>-EGLBoolean EGLAPIENTRY QuerySurfacePointerANGLE(EGLDisplay dpy, EGLSurface surface, EGLint attribute, void **value)
>+EGLBoolean EGLAPIENTRY EGL_QuerySurfacePointerANGLE(EGLDisplay dpy,
>+                                                    EGLSurface surface,
>+                                                    EGLint attribute,
>+                                                    void **value)
> {
>-    EVENT("(EGLDisplay dpy = 0x%0.8p, EGLSurface surface = 0x%0.8p, EGLint attribute = %d, void **value = 0x%0.8p)",
>-          dpy, surface, attribute, value);
>-    Thread *thread = GetCurrentThread();
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(EGLDisplay dpy = 0x%016" PRIxPTR ", EGLSurface surface = 0x%016" PRIxPTR
>+          ", EGLint attribute = %d, void "
>+          "**value = 0x%016" PRIxPTR ")",
>+          (uintptr_t)dpy, (uintptr_t)surface, attribute, (uintptr_t)value);
>+    Thread *thread = egl::GetCurrentThread();
> 
>-    Display *display = static_cast<Display*>(dpy);
>-    Surface *eglSurface = static_cast<Surface*>(surface);
>+    egl::Display *display = static_cast<egl::Display *>(dpy);
>+    Surface *eglSurface   = static_cast<Surface *>(surface);
> 
>     Error error = ValidateSurface(display, eglSurface);
>     if (error.isError())
>     {
>-        thread->setError(error);
>+        thread->setError(error, GetDebug(), "eglQuerySurfacePointerANGLE",
>+                         GetSurfaceIfValid(display, eglSurface));
>         return EGL_FALSE;
>     }
> 
>     if (!display->getExtensions().querySurfacePointer)
>     {
>-        thread->setError(NoError());
>+        thread->setSuccess();
>         return EGL_FALSE;
>     }
> 
>     if (surface == EGL_NO_SURFACE)
>     {
>-        thread->setError(EglBadSurface());
>+        thread->setError(EglBadSurface(), GetDebug(), "eglQuerySurfacePointerANGLE",
>+                         GetSurfaceIfValid(display, eglSurface));
>         return EGL_FALSE;
>     }
> 
>     // validate the attribute parameter
>     switch (attribute)
>     {
>-      case EGL_D3D_TEXTURE_2D_SHARE_HANDLE_ANGLE:
>-        if (!display->getExtensions().surfaceD3DTexture2DShareHandle)
>-        {
>-            thread->setError(EglBadAttribute());
>-            return EGL_FALSE;
>-        }
>-        break;
>-      case EGL_DXGI_KEYED_MUTEX_ANGLE:
>-        if (!display->getExtensions().keyedMutex)
>-        {
>-            thread->setError(EglBadAttribute());
>+        case EGL_D3D_TEXTURE_2D_SHARE_HANDLE_ANGLE:
>+            if (!display->getExtensions().surfaceD3DTexture2DShareHandle)
>+            {
>+                thread->setError(EglBadAttribute(), GetDebug(), "eglQuerySurfacePointerANGLE",
>+                                 GetSurfaceIfValid(display, eglSurface));
>+                return EGL_FALSE;
>+            }
>+            break;
>+        case EGL_DXGI_KEYED_MUTEX_ANGLE:
>+            if (!display->getExtensions().keyedMutex)
>+            {
>+                thread->setError(EglBadAttribute(), GetDebug(), "eglQuerySurfacePointerANGLE",
>+                                 GetSurfaceIfValid(display, eglSurface));
>+                return EGL_FALSE;
>+            }
>+            break;
>+        default:
>+            thread->setError(EglBadAttribute(), GetDebug(), "eglQuerySurfacePointerANGLE",
>+                             GetSurfaceIfValid(display, eglSurface));
>             return EGL_FALSE;
>-        }
>-        break;
>-      default:
>-          thread->setError(EglBadAttribute());
>-          return EGL_FALSE;
>     }
> 
>     error = eglSurface->querySurfacePointerANGLE(attribute, value);
>-    thread->setError(error);
>-    return (error.isError() ? EGL_FALSE : EGL_TRUE);
>-}
>+    if (error.isError())
>+    {
>+        thread->setError(error, GetDebug(), "eglQuerySurfacePointerANGLE",
>+                         GetSurfaceIfValid(display, eglSurface));
>+        return EGL_FALSE;
>+    }
> 
>+    thread->setSuccess();
>+    return EGL_TRUE;
>+}
> 
> // EGL_NV_post_sub_buffer
>-EGLBoolean EGLAPIENTRY PostSubBufferNV(EGLDisplay dpy, EGLSurface surface, EGLint x, EGLint y, EGLint width, EGLint height)
>+EGLBoolean EGLAPIENTRY EGL_PostSubBufferNV(EGLDisplay dpy,
>+                                           EGLSurface surface,
>+                                           EGLint x,
>+                                           EGLint y,
>+                                           EGLint width,
>+                                           EGLint height)
> {
>-    EVENT("(EGLDisplay dpy = 0x%0.8p, EGLSurface surface = 0x%0.8p, EGLint x = %d, EGLint y = %d, EGLint width = %d, EGLint height = %d)", dpy, surface, x, y, width, height);
>-    Thread *thread = GetCurrentThread();
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(EGLDisplay dpy = 0x%016" PRIxPTR ", EGLSurface surface = 0x%016" PRIxPTR
>+          ", EGLint x = %d, EGLint y = %d, "
>+          "EGLint width = %d, EGLint height = %d)",
>+          (uintptr_t)dpy, (uintptr_t)surface, x, y, width, height);
>+    Thread *thread        = egl::GetCurrentThread();
>+    egl::Display *display = static_cast<egl::Display *>(dpy);
>+    Surface *eglSurface   = static_cast<Surface *>(surface);
> 
>     if (x < 0 || y < 0 || width < 0 || height < 0)
>     {
>-        thread->setError(EglBadParameter());
>+        thread->setError(EglBadParameter(), GetDebug(), "eglPostSubBufferNV",
>+                         GetSurfaceIfValid(display, eglSurface));
>         return EGL_FALSE;
>     }
> 
>-    Display *display = static_cast<Display*>(dpy);
>-    Surface *eglSurface = static_cast<Surface*>(surface);
>-
>     Error error = ValidateSurface(display, eglSurface);
>     if (error.isError())
>     {
>-        thread->setError(error);
>+        thread->setError(error, GetDebug(), "eglPostSubBufferNV",
>+                         GetSurfaceIfValid(display, eglSurface));
>         return EGL_FALSE;
>     }
> 
>     if (display->testDeviceLost())
>     {
>-        thread->setError(EglContextLost());
>+        thread->setError(EglContextLost(), GetDebug(), "eglPostSubBufferNV",
>+                         GetSurfaceIfValid(display, eglSurface));
>         return EGL_FALSE;
>     }
> 
>     if (surface == EGL_NO_SURFACE)
>     {
>-        thread->setError(EglBadSurface());
>+        thread->setError(EglBadSurface(), GetDebug(), "eglPostSubBufferNV",
>+                         GetSurfaceIfValid(display, eglSurface));
>         return EGL_FALSE;
>     }
> 
>     if (!display->getExtensions().postSubBuffer)
>     {
>         // Spec is not clear about how this should be handled.
>-        thread->setError(NoError());
>+        thread->setSuccess();
>         return EGL_TRUE;
>     }
> 
>@@ -124,23 +155,29 @@ EGLBoolean EGLAPIENTRY PostSubBufferNV(EGLDisplay dpy, EGLSurface surface, EGLin
>     error = eglSurface->postSubBuffer(thread->getContext(), x, y, width, height);
>     if (error.isError())
>     {
>-        thread->setError(error);
>+        thread->setError(error, GetDebug(), "eglPostSubBufferNV",
>+                         GetSurfaceIfValid(display, eglSurface));
>         return EGL_FALSE;
>     }
> 
>-    thread->setError(NoError());
>+    thread->setSuccess();
>     return EGL_TRUE;
> }
> 
> // EGL_EXT_platform_base
>-EGLDisplay EGLAPIENTRY GetPlatformDisplayEXT(EGLenum platform, void *native_display, const EGLint *attrib_list)
>+EGLDisplay EGLAPIENTRY EGL_GetPlatformDisplayEXT(EGLenum platform,
>+                                                 void *native_display,
>+                                                 const EGLint *attrib_list)
> {
>-    EVENT("(EGLenum platform = %d, void* native_display = 0x%0.8p, const EGLint* attrib_list = 0x%0.8p)",
>-          platform, native_display, attrib_list);
>-    Thread *thread = GetCurrentThread();
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(EGLenum platform = %d, void* native_display = 0x%016" PRIxPTR
>+          ", const EGLint* attrib_list = "
>+          "0x%016" PRIxPTR ")",
>+          platform, (uintptr_t)native_display, (uintptr_t)attrib_list);
>+    Thread *thread = egl::GetCurrentThread();
> 
>     Error err = ValidateGetPlatformDisplayEXT(platform, native_display, attrib_list);
>-    thread->setError(err);
>+    thread->setError(err, GetDebug(), "eglGetPlatformDisplayEXT", GetThreadIfValid(thread));
>     if (err.isError())
>     {
>         return EGL_NO_DISPLAY;
>@@ -149,13 +186,13 @@ EGLDisplay EGLAPIENTRY GetPlatformDisplayEXT(EGLenum platform, void *native_disp
>     const auto &attribMap = AttributeMap::CreateFromIntArray(attrib_list);
>     if (platform == EGL_PLATFORM_ANGLE_ANGLE)
>     {
>-        return Display::GetDisplayFromNativeDisplay(
>+        return egl::Display::GetDisplayFromNativeDisplay(
>             gl::bitCast<EGLNativeDisplayType>(native_display), attribMap);
>     }
>     else if (platform == EGL_PLATFORM_DEVICE_EXT)
>     {
>-        Device *eglDevice = reinterpret_cast<Device *>(native_display);
>-        return Display::GetDisplayFromDevice(eglDevice, attribMap);
>+        Device *eglDevice = static_cast<Device *>(native_display);
>+        return egl::Display::GetDisplayFromDevice(eglDevice, attribMap);
>     }
>     else
>     {
>@@ -164,141 +201,217 @@ EGLDisplay EGLAPIENTRY GetPlatformDisplayEXT(EGLenum platform, void *native_disp
>     }
> }
> 
>+EGLSurface EGLAPIENTRY EGL_CreatePlatformWindowSurfaceEXT(EGLDisplay dpy,
>+                                                          EGLConfig config,
>+                                                          void *native_window,
>+                                                          const EGLint *attrib_list)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(EGLDisplay dpy = 0x%016" PRIxPTR ", EGLConfig config = 0x%016" PRIxPTR
>+          ", void *native_window = 0x%016" PRIxPTR
>+          ", "
>+          "const EGLint *attrib_list = 0x%016" PRIxPTR ")",
>+          (uintptr_t)dpy, (uintptr_t)config, (uintptr_t)native_window, (uintptr_t)attrib_list);
>+    Thread *thread = egl::GetCurrentThread();
>+
>+    egl::Display *display   = static_cast<egl::Display *>(dpy);
>+    Config *configuration   = static_cast<Config *>(config);
>+    AttributeMap attributes = AttributeMap::CreateFromIntArray(attrib_list);
>+
>+    ANGLE_EGL_TRY_RETURN(
>+        thread,
>+        ValidateCreatePlatformWindowSurfaceEXT(display, configuration, native_window, attributes),
>+        "eglCreatePlatformWindowSurfaceEXT", GetDisplayIfValid(display), EGL_NO_SURFACE);
>+
>+    thread->setError(EglBadDisplay() << "CreatePlatformWindowSurfaceEXT unimplemented.", GetDebug(),
>+                     "eglCreatePlatformWindowSurfaceEXT", GetDisplayIfValid(display));
>+    return EGL_NO_SURFACE;
>+}
>+
>+EGLSurface EGLAPIENTRY EGL_CreatePlatformPixmapSurfaceEXT(EGLDisplay dpy,
>+                                                          EGLConfig config,
>+                                                          void *native_pixmap,
>+                                                          const EGLint *attrib_list)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(EGLDisplay dpy = 0x%016" PRIxPTR ", EGLConfig config = 0x%016" PRIxPTR
>+          ", void *native_pixmap = 0x%016" PRIxPTR
>+          ", "
>+          "const EGLint *attrib_list = 0x%016" PRIxPTR ")",
>+          (uintptr_t)dpy, (uintptr_t)config, (uintptr_t)native_pixmap, (uintptr_t)attrib_list);
>+    Thread *thread = egl::GetCurrentThread();
>+
>+    egl::Display *display   = static_cast<egl::Display *>(dpy);
>+    Config *configuration   = static_cast<Config *>(config);
>+    AttributeMap attributes = AttributeMap::CreateFromIntArray(attrib_list);
>+
>+    ANGLE_EGL_TRY_RETURN(
>+        thread,
>+        ValidateCreatePlatformPixmapSurfaceEXT(display, configuration, native_pixmap, attributes),
>+        "eglCreatePlatformPixmapSurfaceEXT", GetDisplayIfValid(display), EGL_NO_SURFACE);
>+
>+    thread->setError(EglBadDisplay() << "CreatePlatformPixmapSurfaceEXT unimplemented.", GetDebug(),
>+                     "eglCreatePlatformPixmapSurfaceEXT", GetDisplayIfValid(display));
>+    return EGL_NO_SURFACE;
>+}
>+
> // EGL_EXT_device_query
>-EGLBoolean EGLAPIENTRY QueryDeviceAttribEXT(EGLDeviceEXT device, EGLint attribute, EGLAttrib *value)
>+EGLBoolean EGLAPIENTRY EGL_QueryDeviceAttribEXT(EGLDeviceEXT device,
>+                                                EGLint attribute,
>+                                                EGLAttrib *value)
> {
>-    EVENT("(EGLDeviceEXT device = 0x%0.8p, EGLint attribute = %d, EGLAttrib *value = 0x%0.8p)",
>-          device, attribute, value);
>-    Thread *thread = GetCurrentThread();
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(EGLDeviceEXT device = 0x%016" PRIxPTR
>+          ", EGLint attribute = %d, EGLAttrib *value = 0x%016" PRIxPTR ")",
>+          (uintptr_t)device, attribute, (uintptr_t)value);
>+    Thread *thread = egl::GetCurrentThread();
> 
>-    Device *dev = static_cast<Device*>(device);
>-    if (dev == EGL_NO_DEVICE_EXT || !Device::IsValidDevice(dev))
>+    Device *dev = static_cast<Device *>(device);
>+
>+    Error error = ValidateDevice(dev);
>+    if (error.isError())
>     {
>-        thread->setError(EglBadAccess());
>+        thread->setError(error, GetDebug(), "eglQueryDeviceAttribEXT", GetDeviceIfValid(dev));
>         return EGL_FALSE;
>     }
> 
>     // If the device was created by (and is owned by) a display, and that display doesn't support
>     // device querying, then this call should fail
>-    Display *owningDisplay = dev->getOwningDisplay();
>+    egl::Display *owningDisplay = dev->getOwningDisplay();
>     if (owningDisplay != nullptr && !owningDisplay->getExtensions().deviceQuery)
>     {
>         thread->setError(EglBadAccess() << "Device wasn't created using eglCreateDeviceANGLE, "
>-                                           "and the Display that created it doesn't support "
>-                                           "device querying");
>+                                           "and the egl::Display that created it doesn't support "
>+                                           "device querying",
>+                         GetDebug(), "eglQueryDeviceAttribEXT", GetDeviceIfValid(dev));
>         return EGL_FALSE;
>     }
> 
>-    Error error(NoError());
>-
>     // validate the attribute parameter
>     switch (attribute)
>     {
>-      case EGL_D3D11_DEVICE_ANGLE:
>-      case EGL_D3D9_DEVICE_ANGLE:
>-        if (!dev->getExtensions().deviceD3D || dev->getType() != attribute)
>-        {
>-            thread->setError(EglBadAttribute());
>+        case EGL_D3D11_DEVICE_ANGLE:
>+        case EGL_D3D9_DEVICE_ANGLE:
>+            if (!dev->getExtensions().deviceD3D || dev->getType() != attribute)
>+            {
>+                thread->setError(EglBadAttribute(), GetDebug(), "eglQueryDeviceAttribEXT",
>+                                 GetDeviceIfValid(dev));
>+                return EGL_FALSE;
>+            }
>+            error = dev->getDevice(value);
>+            if (error.isError())
>+            {
>+                thread->setError(error, GetDebug(), "eglQueryDeviceAttribEXT",
>+                                 GetDeviceIfValid(dev));
>+                return EGL_FALSE;
>+            }
>+            break;
>+        default:
>+            thread->setError(EglBadAttribute(), GetDebug(), "eglQueryDeviceAttribEXT",
>+                             GetDeviceIfValid(dev));
>             return EGL_FALSE;
>-        }
>-        error = dev->getDevice(value);
>-        break;
>-      default:
>-          thread->setError(EglBadAttribute());
>-          return EGL_FALSE;
>     }
> 
>-    thread->setError(error);
>-    return (error.isError() ? EGL_FALSE : EGL_TRUE);
>+    thread->setSuccess();
>+    return EGL_TRUE;
> }
> 
> // EGL_EXT_device_query
>-const char * EGLAPIENTRY QueryDeviceStringEXT(EGLDeviceEXT device, EGLint name)
>+const char *EGLAPIENTRY EGL_QueryDeviceStringEXT(EGLDeviceEXT device, EGLint name)
> {
>-    EVENT("(EGLDeviceEXT device = 0x%0.8p, EGLint name = %d)",
>-          device, name);
>-    Thread *thread = GetCurrentThread();
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(EGLDeviceEXT device = 0x%016" PRIxPTR ", EGLint name = %d)", (uintptr_t)device, name);
>+    Thread *thread = egl::GetCurrentThread();
>+
>+    Device *dev = static_cast<Device *>(device);
> 
>-    Device *dev = static_cast<Device*>(device);
>-    if (dev == EGL_NO_DEVICE_EXT || !Device::IsValidDevice(dev))
>+    Error error = ValidateDevice(dev);
>+    if (error.isError())
>     {
>-        thread->setError(EglBadDevice());
>-        return nullptr;
>+        thread->setError(error, GetDebug(), "eglQueryDeviceStringEXT", GetDeviceIfValid(dev));
>+        return EGL_FALSE;
>     }
> 
>     const char *result;
>     switch (name)
>     {
>-      case EGL_EXTENSIONS:
>-        result = dev->getExtensionString().c_str();
>-        break;
>-      default:
>-          thread->setError(EglBadDevice());
>-          return nullptr;
>+        case EGL_EXTENSIONS:
>+            result = dev->getExtensionString().c_str();
>+            break;
>+        default:
>+            thread->setError(EglBadDevice(), GetDebug(), "eglQueryDeviceStringEXT",
>+                             GetDeviceIfValid(dev));
>+            return nullptr;
>     }
> 
>-    thread->setError(NoError());
>+    thread->setSuccess();
>     return result;
> }
> 
> // EGL_EXT_device_query
>-EGLBoolean EGLAPIENTRY QueryDisplayAttribEXT(EGLDisplay dpy, EGLint attribute, EGLAttrib *value)
>+EGLBoolean EGLAPIENTRY EGL_QueryDisplayAttribEXT(EGLDisplay dpy, EGLint attribute, EGLAttrib *value)
> {
>-    EVENT("(EGLDisplay dpy = 0x%0.8p, EGLint attribute = %d, EGLAttrib *value = 0x%0.8p)",
>-          dpy, attribute, value);
>-    Thread *thread = GetCurrentThread();
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(EGLDisplay dpy = 0x%016" PRIxPTR
>+          ", EGLint attribute = %d, EGLAttrib *value = 0x%016" PRIxPTR ")",
>+          (uintptr_t)dpy, attribute, (uintptr_t)value);
>+    Thread *thread = egl::GetCurrentThread();
> 
>-    Display *display = static_cast<Display*>(dpy);
>+    egl::Display *display = static_cast<egl::Display *>(dpy);
> 
>     Error error = ValidateDisplay(display);
>     if (error.isError())
>     {
>-        thread->setError(error);
>+        thread->setError(error, GetDebug(), "eglQueryDisplayAttribEXT", GetDisplayIfValid(display));
>         return EGL_FALSE;
>     }
> 
>     if (!display->getExtensions().deviceQuery)
>     {
>-        thread->setError(EglBadAccess());
>+        thread->setError(EglBadAccess(), GetDebug(), "eglQueryDisplayAttribEXT",
>+                         GetDisplayIfValid(display));
>         return EGL_FALSE;
>     }
> 
>     // validate the attribute parameter
>     switch (attribute)
>     {
>-      case EGL_DEVICE_EXT:
>-        *value = reinterpret_cast<EGLAttrib>(display->getDevice());
>-        break;
>+        case EGL_DEVICE_EXT:
>+            *value = reinterpret_cast<EGLAttrib>(display->getDevice());
>+            break;
> 
>-      default:
>-          thread->setError(EglBadAttribute());
>-          return EGL_FALSE;
>+        default:
>+            thread->setError(EglBadAttribute(), GetDebug(), "eglQueryDisplayAttribEXT",
>+                             GetDisplayIfValid(display));
>+            return EGL_FALSE;
>     }
> 
>-    thread->setError(error);
>-    return (error.isError() ? EGL_FALSE : EGL_TRUE);
>+    thread->setSuccess();
>+    return EGL_TRUE;
> }
> 
>-ANGLE_EXPORT EGLImageKHR EGLAPIENTRY CreateImageKHR(EGLDisplay dpy,
>-                                                    EGLContext ctx,
>-                                                    EGLenum target,
>-                                                    EGLClientBuffer buffer,
>-                                                    const EGLint *attrib_list)
>+ANGLE_EXPORT EGLImageKHR EGLAPIENTRY EGL_CreateImageKHR(EGLDisplay dpy,
>+                                                        EGLContext ctx,
>+                                                        EGLenum target,
>+                                                        EGLClientBuffer buffer,
>+                                                        const EGLint *attrib_list)
> {
>-    EVENT(
>-        "(EGLDisplay dpy = 0x%0.8p, EGLContext ctx = 0x%0.8p, EGLenum target = 0x%X, "
>-        "EGLClientBuffer buffer = 0x%0.8p, const EGLAttrib *attrib_list = 0x%0.8p)",
>-        dpy, ctx, target, buffer, attrib_list);
>-    Thread *thread = GetCurrentThread();
>-
>-    Display *display     = static_cast<Display *>(dpy);
>-    gl::Context *context = static_cast<gl::Context *>(ctx);
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(EGLDisplay dpy = 0x%016" PRIxPTR ", EGLContext ctx = 0x%016" PRIxPTR
>+          ", EGLenum target = 0x%X, "
>+          "EGLClientBuffer buffer = 0x%016" PRIxPTR
>+          ", const EGLAttrib *attrib_list = 0x%016" PRIxPTR ")",
>+          (uintptr_t)dpy, (uintptr_t)ctx, target, (uintptr_t)buffer, (uintptr_t)attrib_list);
>+    Thread *thread = egl::GetCurrentThread();
>+
>+    egl::Display *display   = static_cast<egl::Display *>(dpy);
>+    gl::Context *context    = static_cast<gl::Context *>(ctx);
>     AttributeMap attributes = AttributeMap::CreateFromIntArray(attrib_list);
> 
>     Error error = ValidateCreateImageKHR(display, context, target, buffer, attributes);
>     if (error.isError())
>     {
>-        thread->setError(error);
>+        thread->setError(error, GetDebug(), "eglCreateImageKHR", GetDisplayIfValid(display));
>         return EGL_NO_IMAGE;
>     }
> 
>@@ -306,94 +419,104 @@ ANGLE_EXPORT EGLImageKHR EGLAPIENTRY CreateImageKHR(EGLDisplay dpy,
>     error        = display->createImage(context, target, buffer, attributes, &image);
>     if (error.isError())
>     {
>-        thread->setError(error);
>+        thread->setError(error, GetDebug(), "eglCreateImageKHR", GetDisplayIfValid(display));
>         return EGL_NO_IMAGE;
>     }
> 
>+    thread->setSuccess();
>     return static_cast<EGLImage>(image);
> }
> 
>-ANGLE_EXPORT EGLBoolean EGLAPIENTRY DestroyImageKHR(EGLDisplay dpy, EGLImageKHR image)
>+ANGLE_EXPORT EGLBoolean EGLAPIENTRY EGL_DestroyImageKHR(EGLDisplay dpy, EGLImageKHR image)
> {
>-    EVENT("(EGLDisplay dpy = 0x%0.8p, EGLImage image = 0x%0.8p)", dpy, image);
>-    Thread *thread = GetCurrentThread();
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(EGLDisplay dpy = 0x%016" PRIxPTR ", EGLImage image = 0x%016" PRIxPTR ")",
>+          (uintptr_t)dpy, (uintptr_t)image);
>+    Thread *thread = egl::GetCurrentThread();
> 
>-    Display *display = static_cast<Display *>(dpy);
>-    Image *img       = static_cast<Image *>(image);
>+    egl::Display *display = static_cast<egl::Display *>(dpy);
>+    Image *img            = static_cast<Image *>(image);
> 
>     Error error = ValidateDestroyImageKHR(display, img);
>     if (error.isError())
>     {
>-        thread->setError(error);
>+        thread->setError(error, GetDebug(), "eglDestroyImageKHR", GetImageIfValid(display, img));
>         return EGL_FALSE;
>     }
> 
>     display->destroyImage(img);
> 
>+    thread->setSuccess();
>     return EGL_TRUE;
> }
> 
>-ANGLE_EXPORT EGLDeviceEXT EGLAPIENTRY CreateDeviceANGLE(EGLint device_type,
>-                                                        void *native_device,
>-                                                        const EGLAttrib *attrib_list)
>+ANGLE_EXPORT EGLDeviceEXT EGLAPIENTRY EGL_CreateDeviceANGLE(EGLint device_type,
>+                                                            void *native_device,
>+                                                            const EGLAttrib *attrib_list)
> {
>-    EVENT(
>-        "(EGLint device_type = %d, void* native_device = 0x%0.8p, const EGLAttrib* attrib_list = "
>-        "0x%0.8p)",
>-        device_type, native_device, attrib_list);
>-    Thread *thread = GetCurrentThread();
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(EGLint device_type = %d, void* native_device = 0x%016" PRIxPTR
>+          ", const EGLAttrib* attrib_list = "
>+          "0x%016" PRIxPTR ")",
>+          device_type, (uintptr_t)native_device, (uintptr_t)attrib_list);
>+    Thread *thread = egl::GetCurrentThread();
> 
>     Error error = ValidateCreateDeviceANGLE(device_type, native_device, attrib_list);
>     if (error.isError())
>     {
>-        thread->setError(error);
>+        thread->setError(error, GetDebug(), "eglCreateDeviceANGLE", GetThreadIfValid(thread));
>         return EGL_NO_DEVICE_EXT;
>     }
> 
>     Device *device = nullptr;
>-    error = Device::CreateDevice(native_device, device_type, &device);
>+    error          = Device::CreateDevice(device_type, native_device, &device);
>     if (error.isError())
>     {
>         ASSERT(device == nullptr);
>-        thread->setError(error);
>+        thread->setError(error, GetDebug(), "eglCreateDeviceANGLE", GetThreadIfValid(thread));
>         return EGL_NO_DEVICE_EXT;
>     }
> 
>+    thread->setSuccess();
>     return device;
> }
> 
>-ANGLE_EXPORT EGLBoolean EGLAPIENTRY ReleaseDeviceANGLE(EGLDeviceEXT device)
>+ANGLE_EXPORT EGLBoolean EGLAPIENTRY EGL_ReleaseDeviceANGLE(EGLDeviceEXT device)
> {
>-    EVENT("(EGLDeviceEXT device = 0x%0.8p)", device);
>-    Thread *thread = GetCurrentThread();
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(EGLDeviceEXT device = 0x%016" PRIxPTR ")", (uintptr_t)device);
>+    Thread *thread = egl::GetCurrentThread();
> 
>     Device *dev = static_cast<Device *>(device);
> 
>     Error error = ValidateReleaseDeviceANGLE(dev);
>     if (error.isError())
>     {
>-        thread->setError(error);
>+        thread->setError(error, GetDebug(), "eglReleaseDeviceANGLE", GetDeviceIfValid(dev));
>         return EGL_FALSE;
>     }
> 
>     SafeDelete(dev);
> 
>+    thread->setSuccess();
>     return EGL_TRUE;
> }
> 
> // EGL_KHR_stream
>-EGLStreamKHR EGLAPIENTRY CreateStreamKHR(EGLDisplay dpy, const EGLint *attrib_list)
>+EGLStreamKHR EGLAPIENTRY EGL_CreateStreamKHR(EGLDisplay dpy, const EGLint *attrib_list)
> {
>-    EVENT("(EGLDisplay dpy = 0x%0.8p, const EGLAttrib* attrib_list = 0x%0.8p)", dpy, attrib_list);
>-    Thread *thread = GetCurrentThread();
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(EGLDisplay dpy = 0x%016" PRIxPTR ", const EGLAttrib* attrib_list = 0x%016" PRIxPTR ")",
>+          (uintptr_t)dpy, (uintptr_t)attrib_list);
>+    Thread *thread = egl::GetCurrentThread();
> 
>-    Display *display = static_cast<Display *>(dpy);
>+    egl::Display *display   = static_cast<egl::Display *>(dpy);
>     AttributeMap attributes = AttributeMap::CreateFromIntArray(attrib_list);
> 
>     Error error = ValidateCreateStreamKHR(display, attributes);
>     if (error.isError())
>     {
>-        thread->setError(error);
>+        thread->setError(error, GetDebug(), "eglCreateStreamKHR", GetDisplayIfValid(display));
>         return EGL_NO_STREAM_KHR;
>     }
> 
>@@ -401,52 +524,58 @@ EGLStreamKHR EGLAPIENTRY CreateStreamKHR(EGLDisplay dpy, const EGLint *attrib_li
>     error = display->createStream(attributes, &stream);
>     if (error.isError())
>     {
>-        thread->setError(error);
>+        thread->setError(error, GetDebug(), "eglCreateStreamKHR", GetDisplayIfValid(display));
>         return EGL_NO_STREAM_KHR;
>     }
> 
>-    thread->setError(error);
>+    thread->setSuccess();
>     return static_cast<EGLStreamKHR>(stream);
> }
> 
>-EGLBoolean EGLAPIENTRY DestroyStreamKHR(EGLDisplay dpy, EGLStreamKHR stream)
>+EGLBoolean EGLAPIENTRY EGL_DestroyStreamKHR(EGLDisplay dpy, EGLStreamKHR stream)
> {
>-    EVENT("(EGLDisplay dpy = 0x%0.8p, EGLStreamKHR = 0x%0.8p)", dpy, stream);
>-    Thread *thread = GetCurrentThread();
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(EGLDisplay dpy = 0x%016" PRIxPTR ", EGLStreamKHR = 0x%016" PRIxPTR ")", (uintptr_t)dpy,
>+          (uintptr_t)stream);
>+    Thread *thread = egl::GetCurrentThread();
> 
>-    Display *display     = static_cast<Display *>(dpy);
>-    Stream *streamObject = static_cast<Stream *>(stream);
>+    egl::Display *display = static_cast<egl::Display *>(dpy);
>+    Stream *streamObject  = static_cast<Stream *>(stream);
> 
>     Error error = ValidateDestroyStreamKHR(display, streamObject);
>     if (error.isError())
>     {
>-        thread->setError(error);
>+        thread->setError(error, GetDebug(), "eglDestroyStreamKHR",
>+                         GetStreamIfValid(display, streamObject));
>         return EGL_FALSE;
>     }
> 
>     display->destroyStream(streamObject);
>-    thread->setError(error);
>+
>+    thread->setSuccess();
>     return EGL_TRUE;
> }
> 
>-EGLBoolean EGLAPIENTRY StreamAttribKHR(EGLDisplay dpy,
>-                                       EGLStreamKHR stream,
>-                                       EGLenum attribute,
>-                                       EGLint value)
>+EGLBoolean EGLAPIENTRY EGL_StreamAttribKHR(EGLDisplay dpy,
>+                                           EGLStreamKHR stream,
>+                                           EGLenum attribute,
>+                                           EGLint value)
> {
>-    EVENT(
>-        "(EGLDisplay dpy = 0x%0.8p, EGLStreamKHR stream = 0x%0.8p, EGLenum attribute = 0x%X, "
>-        "EGLint value = 0x%X)",
>-        dpy, stream, attribute, value);
>-    Thread *thread = GetCurrentThread();
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(EGLDisplay dpy = 0x%016" PRIxPTR ", EGLStreamKHR stream = 0x%016" PRIxPTR
>+          ", EGLenum attribute = 0x%X, "
>+          "EGLint value = 0x%X)",
>+          (uintptr_t)dpy, (uintptr_t)stream, attribute, value);
>+    Thread *thread = egl::GetCurrentThread();
> 
>-    Display *display     = static_cast<Display *>(dpy);
>-    Stream *streamObject = static_cast<Stream *>(stream);
>+    egl::Display *display = static_cast<egl::Display *>(dpy);
>+    Stream *streamObject  = static_cast<Stream *>(stream);
> 
>     Error error = ValidateStreamAttribKHR(display, streamObject, attribute, value);
>     if (error.isError())
>     {
>-        thread->setError(error);
>+        thread->setError(error, GetDebug(), "eglStreamAttribKHR",
>+                         GetStreamIfValid(display, streamObject));
>         return EGL_FALSE;
>     }
> 
>@@ -462,28 +591,30 @@ EGLBoolean EGLAPIENTRY StreamAttribKHR(EGLDisplay dpy,
>             UNREACHABLE();
>     }
> 
>-    thread->setError(error);
>+    thread->setSuccess();
>     return EGL_TRUE;
> }
> 
>-EGLBoolean EGLAPIENTRY QueryStreamKHR(EGLDisplay dpy,
>-                                      EGLStreamKHR stream,
>-                                      EGLenum attribute,
>-                                      EGLint *value)
>+EGLBoolean EGLAPIENTRY EGL_QueryStreamKHR(EGLDisplay dpy,
>+                                          EGLStreamKHR stream,
>+                                          EGLenum attribute,
>+                                          EGLint *value)
> {
>-    EVENT(
>-        "(EGLDisplay dpy = 0x%0.8p, EGLStreamKHR stream = 0x%0.8p, EGLenum attribute = 0x%X, "
>-        "EGLint value = 0x%0.8p)",
>-        dpy, stream, attribute, value);
>-    Thread *thread = GetCurrentThread();
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(EGLDisplay dpy = 0x%016" PRIxPTR ", EGLStreamKHR stream = 0x%016" PRIxPTR
>+          ", EGLenum attribute = 0x%X, "
>+          "EGLint value = 0x%016" PRIxPTR ")",
>+          (uintptr_t)dpy, (uintptr_t)stream, attribute, (uintptr_t)value);
>+    Thread *thread = egl::GetCurrentThread();
> 
>-    Display *display     = static_cast<Display *>(dpy);
>-    Stream *streamObject = static_cast<Stream *>(stream);
>+    egl::Display *display = static_cast<egl::Display *>(dpy);
>+    Stream *streamObject  = static_cast<Stream *>(stream);
> 
>     Error error = ValidateQueryStreamKHR(display, streamObject, attribute, value);
>     if (error.isError())
>     {
>-        thread->setError(error);
>+        thread->setError(error, GetDebug(), "eglQueryStreamKHR",
>+                         GetStreamIfValid(display, streamObject));
>         return EGL_FALSE;
>     }
> 
>@@ -502,28 +633,30 @@ EGLBoolean EGLAPIENTRY QueryStreamKHR(EGLDisplay dpy,
>             UNREACHABLE();
>     }
> 
>-    thread->setError(error);
>+    thread->setSuccess();
>     return EGL_TRUE;
> }
> 
>-EGLBoolean EGLAPIENTRY QueryStreamu64KHR(EGLDisplay dpy,
>-                                         EGLStreamKHR stream,
>-                                         EGLenum attribute,
>-                                         EGLuint64KHR *value)
>+EGLBoolean EGLAPIENTRY EGL_QueryStreamu64KHR(EGLDisplay dpy,
>+                                             EGLStreamKHR stream,
>+                                             EGLenum attribute,
>+                                             EGLuint64KHR *value)
> {
>-    EVENT(
>-        "(EGLDisplay dpy = 0x%0.8p, EGLStreamKHR stream = 0x%0.8p, EGLenum attribute = 0x%X, "
>-        "EGLuint64KHR value = 0x%0.8p)",
>-        dpy, stream, attribute, value);
>-    Thread *thread = GetCurrentThread();
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(EGLDisplay dpy = 0x%016" PRIxPTR ", EGLStreamKHR stream = 0x%016" PRIxPTR
>+          ", EGLenum attribute = 0x%X, "
>+          "EGLuint64KHR value = 0x%016" PRIxPTR ")",
>+          (uintptr_t)dpy, (uintptr_t)stream, attribute, (uintptr_t)value);
>+    Thread *thread = egl::GetCurrentThread();
> 
>-    Display *display     = static_cast<Display *>(dpy);
>-    Stream *streamObject = static_cast<Stream *>(stream);
>+    egl::Display *display = static_cast<egl::Display *>(dpy);
>+    Stream *streamObject  = static_cast<Stream *>(stream);
> 
>     Error error = ValidateQueryStreamu64KHR(display, streamObject, attribute, value);
>     if (error.isError())
>     {
>-        thread->setError(error);
>+        thread->setError(error, GetDebug(), "eglQueryStreamu64KHR",
>+                         GetStreamIfValid(display, streamObject));
>         return EGL_FALSE;
>     }
> 
>@@ -539,101 +672,114 @@ EGLBoolean EGLAPIENTRY QueryStreamu64KHR(EGLDisplay dpy,
>             UNREACHABLE();
>     }
> 
>-    thread->setError(error);
>+    thread->setSuccess();
>     return EGL_TRUE;
> }
> 
>-EGLBoolean EGLAPIENTRY StreamConsumerGLTextureExternalKHR(EGLDisplay dpy, EGLStreamKHR stream)
>+EGLBoolean EGLAPIENTRY EGL_StreamConsumerGLTextureExternalKHR(EGLDisplay dpy, EGLStreamKHR stream)
> {
>-    EVENT("(EGLDisplay dpy = 0x%0.8p, EGLStreamKHR = 0x%0.8p)", dpy, stream);
>-    Thread *thread = GetCurrentThread();
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(EGLDisplay dpy = 0x%016" PRIxPTR ", EGLStreamKHR = 0x%016" PRIxPTR ")", (uintptr_t)dpy,
>+          (uintptr_t)stream);
>+    Thread *thread = egl::GetCurrentThread();
> 
>-    Display *display     = static_cast<Display *>(dpy);
>-    Stream *streamObject = static_cast<Stream *>(stream);
>-    gl::Context *context = gl::GetValidGlobalContext();
>+    egl::Display *display = static_cast<egl::Display *>(dpy);
>+    Stream *streamObject  = static_cast<Stream *>(stream);
>+    gl::Context *context  = gl::GetValidGlobalContext();
> 
>     Error error = ValidateStreamConsumerGLTextureExternalKHR(display, context, streamObject);
>     if (error.isError())
>     {
>-        thread->setError(error);
>+        thread->setError(error, GetDebug(), "eglStreamConsumerGLTextureExternalKHR",
>+                         GetStreamIfValid(display, streamObject));
>         return EGL_FALSE;
>     }
> 
>     error = streamObject->createConsumerGLTextureExternal(AttributeMap(), context);
>     if (error.isError())
>     {
>-        thread->setError(error);
>+        thread->setError(error, GetDebug(), "eglStreamConsumerGLTextureExternalKHR",
>+                         GetStreamIfValid(display, streamObject));
>         return EGL_FALSE;
>     }
> 
>-    thread->setError(error);
>+    thread->setSuccess();
>     return EGL_TRUE;
> }
> 
>-EGLBoolean EGLAPIENTRY StreamConsumerAcquireKHR(EGLDisplay dpy, EGLStreamKHR stream)
>+EGLBoolean EGLAPIENTRY EGL_StreamConsumerAcquireKHR(EGLDisplay dpy, EGLStreamKHR stream)
> {
>-    EVENT("(EGLDisplay dpy = 0x%0.8p, EGLStreamKHR = 0x%0.8p)", dpy, stream);
>-    Thread *thread = GetCurrentThread();
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(EGLDisplay dpy = 0x%016" PRIxPTR ", EGLStreamKHR = 0x%016" PRIxPTR ")", (uintptr_t)dpy,
>+          (uintptr_t)stream);
>+    Thread *thread = egl::GetCurrentThread();
> 
>-    Display *display     = static_cast<Display *>(dpy);
>-    Stream *streamObject = static_cast<Stream *>(stream);
>-    gl::Context *context = gl::GetValidGlobalContext();
>+    egl::Display *display = static_cast<egl::Display *>(dpy);
>+    Stream *streamObject  = static_cast<Stream *>(stream);
>+    gl::Context *context  = gl::GetValidGlobalContext();
> 
>     Error error = ValidateStreamConsumerAcquireKHR(display, context, streamObject);
>     if (error.isError())
>     {
>-        thread->setError(error);
>+        thread->setError(error, GetDebug(), "eglStreamConsumerAcquireKHR",
>+                         GetStreamIfValid(display, streamObject));
>         return EGL_FALSE;
>     }
> 
>     error = streamObject->consumerAcquire(context);
>     if (error.isError())
>     {
>-        thread->setError(error);
>+        thread->setError(error, GetDebug(), "eglStreamConsumerAcquireKHR",
>+                         GetStreamIfValid(display, streamObject));
>         return EGL_FALSE;
>     }
> 
>-    thread->setError(error);
>+    thread->setSuccess();
>     return EGL_TRUE;
> }
> 
>-EGLBoolean EGLAPIENTRY StreamConsumerReleaseKHR(EGLDisplay dpy, EGLStreamKHR stream)
>+EGLBoolean EGLAPIENTRY EGL_StreamConsumerReleaseKHR(EGLDisplay dpy, EGLStreamKHR stream)
> {
>-    EVENT("(EGLDisplay dpy = 0x%0.8p, EGLStreamKHR = 0x%0.8p)", dpy, stream);
>-    Thread *thread = GetCurrentThread();
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(EGLDisplay dpy = 0x%016" PRIxPTR ", EGLStreamKHR = 0x%016" PRIxPTR ")", (uintptr_t)dpy,
>+          (uintptr_t)stream);
>+    Thread *thread = egl::GetCurrentThread();
> 
>-    Display *display     = static_cast<Display *>(dpy);
>-    Stream *streamObject = static_cast<Stream *>(stream);
>-    gl::Context *context = gl::GetValidGlobalContext();
>+    egl::Display *display = static_cast<egl::Display *>(dpy);
>+    Stream *streamObject  = static_cast<Stream *>(stream);
>+    gl::Context *context  = gl::GetValidGlobalContext();
> 
>     Error error = ValidateStreamConsumerReleaseKHR(display, context, streamObject);
>     if (error.isError())
>     {
>-        thread->setError(error);
>+        thread->setError(error, GetDebug(), "eglSStreamConsumerReleaseKHR",
>+                         GetStreamIfValid(display, streamObject));
>         return EGL_FALSE;
>     }
> 
>     error = streamObject->consumerRelease(context);
>     if (error.isError())
>     {
>-        thread->setError(error);
>+        thread->setError(error, GetDebug(), "eglStreamConsumerReleaseKHR",
>+                         GetStreamIfValid(display, streamObject));
>         return EGL_FALSE;
>     }
> 
>-    thread->setError(error);
>+    thread->setSuccess();
>     return EGL_TRUE;
> }
> 
>-EGLBoolean EGLAPIENTRY StreamConsumerGLTextureExternalAttribsNV(EGLDisplay dpy,
>-                                                                EGLStreamKHR stream,
>-                                                                const EGLAttrib *attrib_list)
>+EGLBoolean EGLAPIENTRY EGL_StreamConsumerGLTextureExternalAttribsNV(EGLDisplay dpy,
>+                                                                    EGLStreamKHR stream,
>+                                                                    const EGLAttrib *attrib_list)
> {
>-    EVENT(
>-        "(EGLDisplay dpy = 0x%0.8p, EGLStreamKHR stream = 0x%0.8p, EGLAttrib attrib_list = 0x%0.8p",
>-        dpy, stream, attrib_list);
>-    Thread *thread = GetCurrentThread();
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(EGLDisplay dpy = 0x%016" PRIxPTR ", EGLStreamKHR stream = 0x%016" PRIxPTR
>+          ", EGLAttrib attrib_list = 0x%016" PRIxPTR "",
>+          (uintptr_t)dpy, (uintptr_t)stream, (uintptr_t)attrib_list);
>+    Thread *thread = egl::GetCurrentThread();
> 
>-    Display *display        = static_cast<Display *>(dpy);
>+    egl::Display *display   = static_cast<egl::Display *>(dpy);
>     Stream *streamObject    = static_cast<Stream *>(stream);
>     gl::Context *context    = gl::GetValidGlobalContext();
>     AttributeMap attributes = AttributeMap::CreateFromAttribArray(attrib_list);
>@@ -642,213 +788,632 @@ EGLBoolean EGLAPIENTRY StreamConsumerGLTextureExternalAttribsNV(EGLDisplay dpy,
>                                                                    attributes);
>     if (error.isError())
>     {
>-        thread->setError(error);
>+        thread->setError(error, GetDebug(), "eglStreamConsumerGLTextureExternalAttribsNV",
>+                         GetStreamIfValid(display, streamObject));
>         return EGL_FALSE;
>     }
> 
>     error = streamObject->createConsumerGLTextureExternal(attributes, context);
>     if (error.isError())
>     {
>-        thread->setError(error);
>+        thread->setError(error, GetDebug(), "eglStreamConsumerGLTextureExternalAttribsNV",
>+                         GetStreamIfValid(display, streamObject));
>         return EGL_FALSE;
>     }
> 
>-    thread->setError(error);
>+    thread->setSuccess();
>     return EGL_TRUE;
> }
> 
>-EGLBoolean EGLAPIENTRY CreateStreamProducerD3DTextureNV12ANGLE(EGLDisplay dpy,
>+EGLBoolean EGLAPIENTRY EGL_CreateStreamProducerD3DTextureANGLE(EGLDisplay dpy,
>                                                                EGLStreamKHR stream,
>                                                                const EGLAttrib *attrib_list)
> {
>-    EVENT(
>-        "(EGLDisplay dpy = 0x%0.8p, EGLStreamKHR stream = 0x%0.8p, EGLAttrib attrib_list = 0x%0.8p",
>-        dpy, stream, attrib_list);
>-    Thread *thread = GetCurrentThread();
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(EGLDisplay dpy = 0x%016" PRIxPTR ", EGLStreamKHR stream = 0x%016" PRIxPTR
>+          ", EGLAttrib attrib_list = 0x%016" PRIxPTR "",
>+          (uintptr_t)dpy, (uintptr_t)stream, (uintptr_t)attrib_list);
>+    Thread *thread = egl::GetCurrentThread();
> 
>-    Display *display        = static_cast<Display *>(dpy);
>+    egl::Display *display   = static_cast<egl::Display *>(dpy);
>     Stream *streamObject    = static_cast<Stream *>(stream);
>     AttributeMap attributes = AttributeMap::CreateFromAttribArray(attrib_list);
> 
>-    Error error =
>-        ValidateCreateStreamProducerD3DTextureNV12ANGLE(display, streamObject, attributes);
>+    Error error = ValidateCreateStreamProducerD3DTextureANGLE(display, streamObject, attributes);
>     if (error.isError())
>     {
>-        thread->setError(error);
>+        thread->setError(error, GetDebug(), "eglCreateStreamProducerD3DTextureANGLE",
>+                         GetStreamIfValid(display, streamObject));
>         return EGL_FALSE;
>     }
> 
>-    error = streamObject->createProducerD3D11TextureNV12(attributes);
>+    error = streamObject->createProducerD3D11Texture(attributes);
>     if (error.isError())
>     {
>-        thread->setError(error);
>+        thread->setError(error, GetDebug(), "eglCreateStreamProducerD3DTextureANGLE",
>+                         GetStreamIfValid(display, streamObject));
>         return EGL_FALSE;
>     }
> 
>-    thread->setError(error);
>+    thread->setSuccess();
>     return EGL_TRUE;
> }
> 
>-EGLBoolean EGLAPIENTRY StreamPostD3DTextureNV12ANGLE(EGLDisplay dpy,
>+EGLBoolean EGLAPIENTRY EGL_StreamPostD3DTextureANGLE(EGLDisplay dpy,
>                                                      EGLStreamKHR stream,
>                                                      void *texture,
>                                                      const EGLAttrib *attrib_list)
> {
>-    EVENT(
>-        "(EGLDisplay dpy = 0x%0.8p, EGLStreamKHR stream = 0x%0.8p, void* texture = 0x%0.8p, "
>-        "EGLAttrib attrib_list = 0x%0.8p",
>-        dpy, stream, texture, attrib_list);
>-    Thread *thread = GetCurrentThread();
>-
>-    Display *display        = static_cast<Display *>(dpy);
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(EGLDisplay dpy = 0x%016" PRIxPTR ", EGLStreamKHR stream = 0x%016" PRIxPTR
>+          ", void* texture = 0x%016" PRIxPTR
>+          ", "
>+          "EGLAttrib attrib_list = 0x%016" PRIxPTR "",
>+          (uintptr_t)dpy, (uintptr_t)stream, (uintptr_t)texture, (uintptr_t)attrib_list);
>+    Thread *thread = egl::GetCurrentThread();
>+
>+    egl::Display *display   = static_cast<egl::Display *>(dpy);
>     Stream *streamObject    = static_cast<Stream *>(stream);
>     AttributeMap attributes = AttributeMap::CreateFromAttribArray(attrib_list);
> 
>-    Error error = ValidateStreamPostD3DTextureNV12ANGLE(display, streamObject, texture, attributes);
>+    Error error = ValidateStreamPostD3DTextureANGLE(display, streamObject, texture, attributes);
>     if (error.isError())
>     {
>-        thread->setError(error);
>+        thread->setError(error, GetDebug(), "eglStreamPostD3DTextureANGLE",
>+                         GetStreamIfValid(display, streamObject));
>         return EGL_FALSE;
>     }
> 
>-    error = streamObject->postD3D11NV12Texture(texture, attributes);
>+    error = streamObject->postD3D11Texture(texture, attributes);
>     if (error.isError())
>     {
>-        thread->setError(error);
>+        thread->setError(error, GetDebug(), "eglStreamPostD3DTextureANGLE",
>+                         GetStreamIfValid(display, streamObject));
>         return EGL_FALSE;
>     }
> 
>-    thread->setError(error);
>+    thread->setSuccess();
>+    return EGL_TRUE;
>+}
>+
>+// EGL_KHR_fence_sync
>+ANGLE_EXPORT EGLSync EGLAPIENTRY EGL_CreateSyncKHR(EGLDisplay dpy,
>+                                                   EGLenum type,
>+                                                   const EGLint *attrib_list)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(EGLDisplay dpy = 0x%016" PRIxPTR
>+          ", EGLenum type = 0x%X, const EGLint* attrib_list = 0x%016" PRIxPTR ")",
>+          (uintptr_t)dpy, type, (uintptr_t)attrib_list);
>+
>+    Thread *thread          = egl::GetCurrentThread();
>+    egl::Display *display   = static_cast<egl::Display *>(dpy);
>+    AttributeMap attributes = AttributeMap::CreateFromIntArray(attrib_list);
>+
>+    gl::Context *currentContext  = thread->getContext();
>+    egl::Display *currentDisplay = currentContext ? currentContext->getDisplay() : nullptr;
>+
>+    ANGLE_EGL_TRY_RETURN(
>+        thread, ValidateCreateSyncKHR(display, type, attributes, currentDisplay, currentContext),
>+        "eglCreateSync", GetDisplayIfValid(display), EGL_NO_SYNC);
>+
>+    egl::Sync *syncObject = nullptr;
>+    ANGLE_EGL_TRY_RETURN(thread, display->createSync(currentContext, type, attributes, &syncObject),
>+                         "eglCreateSync", GetDisplayIfValid(display), EGL_NO_SYNC);
>+
>+    thread->setSuccess();
>+    return static_cast<EGLSync>(syncObject);
>+}
>+
>+ANGLE_EXPORT EGLBoolean EGLAPIENTRY EGL_DestroySyncKHR(EGLDisplay dpy, EGLSync sync)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(EGLDisplay dpy = 0x%016" PRIxPTR ", EGLSync sync = 0x%016" PRIxPTR ")", (uintptr_t)dpy,
>+          (uintptr_t)sync);
>+
>+    Thread *thread        = egl::GetCurrentThread();
>+    egl::Display *display = static_cast<egl::Display *>(dpy);
>+    egl::Sync *syncObject = static_cast<Sync *>(sync);
>+
>+    ANGLE_EGL_TRY_RETURN(thread, ValidateDestroySync(display, syncObject), "eglDestroySync",
>+                         GetDisplayIfValid(display), EGL_FALSE);
>+
>+    display->destroySync(syncObject);
>+
>+    thread->setSuccess();
>+    return EGL_TRUE;
>+}
>+
>+ANGLE_EXPORT EGLint EGLAPIENTRY EGL_ClientWaitSyncKHR(EGLDisplay dpy,
>+                                                      EGLSync sync,
>+                                                      EGLint flags,
>+                                                      EGLTime timeout)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(EGLDisplay dpy = 0x%016" PRIxPTR ", EGLSync sync = 0x%016" PRIxPTR
>+          ", EGLint flags = 0x%X, EGLTime timeout = "
>+          "%llu)",
>+          (uintptr_t)dpy, (uintptr_t)sync, flags, static_cast<unsigned long long>(timeout));
>+
>+    Thread *thread        = egl::GetCurrentThread();
>+    egl::Display *display = static_cast<egl::Display *>(dpy);
>+    egl::Sync *syncObject = static_cast<Sync *>(sync);
>+
>+    ANGLE_EGL_TRY_RETURN(thread, ValidateClientWaitSync(display, syncObject, flags, timeout),
>+                         "eglClientWaitSync", GetDisplayIfValid(display), EGL_FALSE);
>+
>+    gl::Context *currentContext = thread->getContext();
>+    EGLint syncStatus = EGL_FALSE;
>+    ANGLE_EGL_TRY_RETURN(
>+        thread, syncObject->clientWait(display, currentContext, flags, timeout, &syncStatus),
>+        "eglClientWaitSync", GetDisplayIfValid(display), EGL_FALSE);
>+
>+    thread->setSuccess();
>+    return syncStatus;
>+}
>+
>+ANGLE_EXPORT EGLBoolean EGLAPIENTRY EGL_GetSyncAttribKHR(EGLDisplay dpy,
>+                                                         EGLSync sync,
>+                                                         EGLint attribute,
>+                                                         EGLint *value)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(EGLDisplay dpy = 0x%016" PRIxPTR ", EGLSync sync = 0x%016" PRIxPTR
>+          ", EGLint attribute = 0x%X, EGLAttrib "
>+          "*value = 0x%016" PRIxPTR ")",
>+          (uintptr_t)dpy, (uintptr_t)sync, attribute, (uintptr_t)value);
>+
>+    Thread *thread        = egl::GetCurrentThread();
>+    egl::Display *display = static_cast<egl::Display *>(dpy);
>+    egl::Sync *syncObject = static_cast<Sync *>(sync);
>+
>+    ANGLE_EGL_TRY_RETURN(thread, ValidateGetSyncAttribKHR(display, syncObject, attribute, value),
>+                         "eglGetSyncAttrib", GetDisplayIfValid(display), EGL_FALSE);
>+
>+    ANGLE_EGL_TRY_RETURN(thread, GetSyncAttrib(display, syncObject, attribute, value),
>+                         "eglGetSyncAttrib", GetDisplayIfValid(display), EGL_FALSE);
>+
>+    thread->setSuccess();
>     return EGL_TRUE;
> }
> 
>-EGLBoolean EGLAPIENTRY GetSyncValuesCHROMIUM(EGLDisplay dpy,
>-                                             EGLSurface surface,
>-                                             EGLuint64KHR *ust,
>-                                             EGLuint64KHR *msc,
>-                                             EGLuint64KHR *sbc)
>+// EGL_KHR_wait_sync
>+ANGLE_EXPORT EGLBoolean EGLAPIENTRY EGL_WaitSyncKHR(EGLDisplay dpy, EGLSync sync, EGLint flags)
> {
>-    EVENT(
>-        "(EGLDisplay dpy = 0x%0.8p, EGLSurface surface = 0x%0.8p, EGLuint64KHR* ust = 0x%0.8p, "
>-        "EGLuint64KHR* msc = 0x%0.8p, EGLuint64KHR* sbc = 0x%0.8p",
>-        dpy, surface, ust, msc, sbc);
>-    Thread *thread = GetCurrentThread();
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(EGLDisplay dpy =0x%016" PRIxPTR "p, EGLSync sync = 0x%016" PRIxPTR
>+          ", EGLint flags = 0x%X)",
>+          (uintptr_t)dpy, (uintptr_t)sync, flags);
>+
>+    Thread *thread        = egl::GetCurrentThread();
>+    egl::Display *display = static_cast<egl::Display *>(dpy);
>+    gl::Context *context  = thread->getContext();
>+    egl::Sync *syncObject = static_cast<Sync *>(sync);
>+
>+    ANGLE_EGL_TRY_RETURN(thread, ValidateWaitSync(display, context, syncObject, flags),
>+                         "eglWaitSync", GetDisplayIfValid(display), EGL_FALSE);
> 
>-    Display *display    = static_cast<Display *>(dpy);
>-    Surface *eglSurface = static_cast<Surface *>(surface);
>+    gl::Context *currentContext = thread->getContext();
>+    ANGLE_EGL_TRY_RETURN(thread, syncObject->serverWait(display, currentContext, flags),
>+                         "eglWaitSync", GetDisplayIfValid(display), EGL_FALSE);
>+
>+    thread->setSuccess();
>+    return EGL_TRUE;
>+}
>+
>+EGLBoolean EGLAPIENTRY EGL_GetSyncValuesCHROMIUM(EGLDisplay dpy,
>+                                                 EGLSurface surface,
>+                                                 EGLuint64KHR *ust,
>+                                                 EGLuint64KHR *msc,
>+                                                 EGLuint64KHR *sbc)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(EGLDisplay dpy = 0x%016" PRIxPTR ", EGLSurface surface = 0x%016" PRIxPTR
>+          ", EGLuint64KHR* ust = 0x%016" PRIxPTR
>+          ", "
>+          "EGLuint64KHR* msc = 0x%016" PRIxPTR ", EGLuint64KHR* sbc = 0x%016" PRIxPTR "",
>+          (uintptr_t)dpy, (uintptr_t)surface, (uintptr_t)ust, (uintptr_t)msc, (uintptr_t)sbc);
>+    Thread *thread = egl::GetCurrentThread();
>+
>+    egl::Display *display = static_cast<egl::Display *>(dpy);
>+    Surface *eglSurface   = static_cast<Surface *>(surface);
> 
>     Error error = ValidateGetSyncValuesCHROMIUM(display, eglSurface, ust, msc, sbc);
>     if (error.isError())
>     {
>-        thread->setError(error);
>+        thread->setError(error, GetDebug(), "eglGetSyncValuesCHROMIUM",
>+                         GetSurfaceIfValid(display, eglSurface));
>         return EGL_FALSE;
>     }
> 
>     error = eglSurface->getSyncValues(ust, msc, sbc);
>     if (error.isError())
>     {
>-        thread->setError(error);
>+        thread->setError(error, GetDebug(), "eglGetSyncValuesCHROMIUM",
>+                         GetSurfaceIfValid(display, eglSurface));
>         return EGL_FALSE;
>     }
> 
>-    thread->setError(error);
>+    thread->setSuccess();
>     return EGL_TRUE;
> }
> 
>-ANGLE_EXPORT EGLBoolean SwapBuffersWithDamageEXT(EGLDisplay dpy,
>-                                                 EGLSurface surface,
>-                                                 EGLint *rects,
>-                                                 EGLint n_rects)
>+EGLBoolean EGLAPIENTRY EGL_SwapBuffersWithDamageKHR(EGLDisplay dpy,
>+                                                    EGLSurface surface,
>+                                                    EGLint *rects,
>+                                                    EGLint n_rects)
> {
>-    EVENT(
>-        "(EGLDisplay dpy = 0x%0.8p, EGLSurface surface = 0x%0.8p, EGLint *rects = 0x%0.8p, EGLint "
>-        "n_rects = %d)",
>-        dpy, surface, rects, n_rects);
>-    Thread *thread = GetCurrentThread();
>-
>-    Display *display    = static_cast<Display *>(dpy);
>-    Surface *eglSurface = static_cast<Surface *>(surface);
>-
>-    Error error = ValidateSwapBuffersWithDamageEXT(display, eglSurface, rects, n_rects);
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(EGLDisplay dpy = 0x%016" PRIxPTR ", EGLSurface surface = 0x%016" PRIxPTR
>+          ", EGLint *rects = 0x%016" PRIxPTR
>+          ", EGLint "
>+          "n_rects = %d)",
>+          (uintptr_t)dpy, (uintptr_t)surface, (uintptr_t)rects, n_rects);
>+    Thread *thread = egl::GetCurrentThread();
>+
>+    egl::Display *display = static_cast<egl::Display *>(dpy);
>+    Surface *eglSurface   = static_cast<Surface *>(surface);
>+
>+    Error error = ValidateSwapBuffersWithDamageKHR(display, eglSurface, rects, n_rects);
>     if (error.isError())
>     {
>-        thread->setError(error);
>+        thread->setError(error, GetDebug(), "eglSwapBuffersWithDamageEXT",
>+                         GetSurfaceIfValid(display, eglSurface));
>         return EGL_FALSE;
>     }
> 
>     error = eglSurface->swapWithDamage(thread->getContext(), rects, n_rects);
>     if (error.isError())
>     {
>-        thread->setError(error);
>+        thread->setError(error, GetDebug(), "eglSwapBuffersWithDamageEXT",
>+                         GetSurfaceIfValid(display, eglSurface));
>         return EGL_FALSE;
>     }
> 
>+    thread->setSuccess();
>     return EGL_TRUE;
> }
> 
>-EGLint EGLAPIENTRY ProgramCacheGetAttribANGLE(EGLDisplay dpy, EGLenum attrib)
>+EGLBoolean EGLAPIENTRY EGL_PresentationTimeANDROID(EGLDisplay dpy,
>+                                                   EGLSurface surface,
>+                                                   EGLnsecsANDROID time)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(EGLDisplay dpy = 0x%016" PRIxPTR ", EGLSurface surface = 0x%016" PRIxPTR
>+          ", EGLnsecsANDROID time = %llu)",
>+          (uintptr_t)dpy, (uintptr_t)surface, static_cast<unsigned long long>(time));
>+    Thread *thread = egl::GetCurrentThread();
>+
>+    egl::Display *display = static_cast<egl::Display *>(dpy);
>+    Surface *eglSurface   = static_cast<Surface *>(surface);
>+
>+    ANGLE_EGL_TRY_RETURN(thread, ValidatePresentationTimeANDROID(display, eglSurface, time),
>+                         "eglPresentationTimeANDROID", GetSurfaceIfValid(display, eglSurface),
>+                         EGL_FALSE);
>+    ANGLE_EGL_TRY_RETURN(thread, eglSurface->setPresentationTime(time),
>+                         "eglPresentationTimeANDROID", GetSurfaceIfValid(display, eglSurface),
>+                         EGL_FALSE);
>+
>+    return EGL_TRUE;
>+}
>+
>+ANGLE_EXPORT void EGLAPIENTRY EGL_SetBlobCacheFuncsANDROID(EGLDisplay dpy,
>+                                                           EGLSetBlobFuncANDROID set,
>+                                                           EGLGetBlobFuncANDROID get)
>+{
>+    EVENT("(EGLDisplay dpy = 0x%016" PRIxPTR ", EGLSetBlobFuncANDROID set = 0x%016" PRIxPTR
>+          ", EGLGetBlobFuncANDROID get "
>+          "= 0x%016" PRIxPTR ")",
>+          (uintptr_t)dpy, (uintptr_t)set, (uintptr_t)get);
>+    Thread *thread = egl::GetCurrentThread();
>+
>+    egl::Display *display = static_cast<egl::Display *>(dpy);
>+
>+    ANGLE_EGL_TRY(thread, ValidateSetBlobCacheANDROID(display, set, get),
>+                  "eglSetBlobCacheFuncsANDROID", GetDisplayIfValid(display));
>+
>+    thread->setSuccess();
>+    display->setBlobCacheFuncs(set, get);
>+}
>+
>+EGLint EGLAPIENTRY EGL_ProgramCacheGetAttribANGLE(EGLDisplay dpy, EGLenum attrib)
> {
>-    EVENT("(EGLDisplay dpy = 0x%0.8p, EGLenum attrib = 0x%X)", dpy, attrib);
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(EGLDisplay dpy = 0x%016" PRIxPTR ", EGLenum attrib = 0x%X)", (uintptr_t)dpy, attrib);
> 
>-    Display *display = static_cast<Display *>(dpy);
>-    Thread *thread   = GetCurrentThread();
>+    egl::Display *display = static_cast<egl::Display *>(dpy);
>+    Thread *thread        = egl::GetCurrentThread();
> 
>-    ANGLE_EGL_TRY_RETURN(thread, ValidateProgramCacheGetAttribANGLE(display, attrib), 0);
>+    ANGLE_EGL_TRY_RETURN(thread, ValidateProgramCacheGetAttribANGLE(display, attrib),
>+                         "eglProgramCacheGetAttribANGLE", GetDisplayIfValid(display), 0);
> 
>+    thread->setSuccess();
>     return display->programCacheGetAttrib(attrib);
> }
> 
>-void EGLAPIENTRY ProgramCacheQueryANGLE(EGLDisplay dpy,
>-                                        EGLint index,
>-                                        void *key,
>-                                        EGLint *keysize,
>-                                        void *binary,
>-                                        EGLint *binarysize)
>+void EGLAPIENTRY EGL_ProgramCacheQueryANGLE(EGLDisplay dpy,
>+                                            EGLint index,
>+                                            void *key,
>+                                            EGLint *keysize,
>+                                            void *binary,
>+                                            EGLint *binarysize)
> {
>-    EVENT(
>-        "(EGLDisplay dpy = 0x%0.8p, EGLint index = %d, void *key = 0x%0.8p, EGLint *keysize = "
>-        "0x%0.8p, void *binary = 0x%0.8p, EGLint *size = 0x%0.8p)",
>-        dpy, index, key, keysize, binary, binarysize);
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(EGLDisplay dpy = 0x%016" PRIxPTR ", EGLint index = %d, void *key = 0x%016" PRIxPTR
>+          ", EGLint *keysize = "
>+          "0x%016" PRIxPTR ", void *binary = 0x%016" PRIxPTR ", EGLint *size = 0x%016" PRIxPTR ")",
>+          (uintptr_t)dpy, index, (uintptr_t)key, (uintptr_t)keysize, (uintptr_t)binary,
>+          (uintptr_t)binarysize);
> 
>-    Display *display = static_cast<Display *>(dpy);
>-    Thread *thread   = GetCurrentThread();
>+    egl::Display *display = static_cast<egl::Display *>(dpy);
>+    Thread *thread        = egl::GetCurrentThread();
> 
>     ANGLE_EGL_TRY(thread,
>-                  ValidateProgramCacheQueryANGLE(display, index, key, keysize, binary, binarysize));
>+                  ValidateProgramCacheQueryANGLE(display, index, key, keysize, binary, binarysize),
>+                  "eglProgramCacheQueryANGLE", GetDisplayIfValid(display));
>+
>+    ANGLE_EGL_TRY(thread, display->programCacheQuery(index, key, keysize, binary, binarysize),
>+                  "eglProgramCacheQueryANGLE", GetDisplayIfValid(display));
> 
>-    ANGLE_EGL_TRY(thread, display->programCacheQuery(index, key, keysize, binary, binarysize));
>+    thread->setSuccess();
> }
> 
>-void EGLAPIENTRY ProgramCachePopulateANGLE(EGLDisplay dpy,
>-                                           const void *key,
>-                                           EGLint keysize,
>-                                           const void *binary,
>-                                           EGLint binarysize)
>+void EGLAPIENTRY EGL_ProgramCachePopulateANGLE(EGLDisplay dpy,
>+                                               const void *key,
>+                                               EGLint keysize,
>+                                               const void *binary,
>+                                               EGLint binarysize)
> {
>-    EVENT(
>-        "(EGLDisplay dpy = 0x%0.8p, void *key = 0x%0.8p, EGLint keysize = %d, void *binary = "
>-        "0x%0.8p, EGLint *size = 0x%0.8p)",
>-        dpy, key, keysize, binary, binarysize);
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(EGLDisplay dpy = 0x%016" PRIxPTR ", void *key = 0x%016" PRIxPTR
>+          ", EGLint keysize = %d, void *binary = "
>+          "0x%016" PRIxPTR ", EGLint size = %d)",
>+          (uintptr_t)dpy, (uintptr_t)key, keysize, (uintptr_t)binary, binarysize);
> 
>-    Display *display = static_cast<Display *>(dpy);
>-    Thread *thread   = GetCurrentThread();
>+    egl::Display *display = static_cast<egl::Display *>(dpy);
>+    Thread *thread        = egl::GetCurrentThread();
> 
>     ANGLE_EGL_TRY(thread,
>-                  ValidateProgramCachePopulateANGLE(display, key, keysize, binary, binarysize));
>+                  ValidateProgramCachePopulateANGLE(display, key, keysize, binary, binarysize),
>+                  "eglProgramCachePopulateANGLE", GetDisplayIfValid(display));
> 
>-    ANGLE_EGL_TRY(thread, display->programCachePopulate(key, keysize, binary, binarysize));
>+    ANGLE_EGL_TRY(thread, display->programCachePopulate(key, keysize, binary, binarysize),
>+                  "eglProgramCachePopulateANGLE", GetDisplayIfValid(display));
>+
>+    thread->setSuccess();
> }
> 
>-EGLint EGLAPIENTRY ProgramCacheResizeANGLE(EGLDisplay dpy, EGLint limit, EGLenum mode)
>+EGLint EGLAPIENTRY EGL_ProgramCacheResizeANGLE(EGLDisplay dpy, EGLint limit, EGLenum mode)
> {
>-    EVENT("(EGLDisplay dpy = 0x%0.8p, EGLint limit = %d, EGLenum mode = 0x%X)", dpy, limit, mode);
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(EGLDisplay dpy = 0x%016" PRIxPTR ", EGLint limit = %d, EGLenum mode = 0x%X)",
>+          (uintptr_t)dpy, limit, mode);
> 
>-    Display *display = static_cast<Display *>(dpy);
>-    Thread *thread   = GetCurrentThread();
>+    egl::Display *display = static_cast<egl::Display *>(dpy);
>+    Thread *thread        = egl::GetCurrentThread();
> 
>-    ANGLE_EGL_TRY_RETURN(thread, ValidateProgramCacheResizeANGLE(display, limit, mode), 0);
>+    ANGLE_EGL_TRY_RETURN(thread, ValidateProgramCacheResizeANGLE(display, limit, mode),
>+                         "eglProgramCacheResizeANGLE", GetDisplayIfValid(display), 0);
> 
>+    thread->setSuccess();
>     return display->programCacheResize(limit, mode);
> }
> 
>-}  // namespace egl
>+EGLint EGLAPIENTRY EGL_DebugMessageControlKHR(EGLDEBUGPROCKHR callback,
>+                                              const EGLAttrib *attrib_list)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(EGLDEBUGPROCKHR callback = 0x%016" PRIxPTR ", EGLAttrib attrib_list = 0x%016" PRIxPTR
>+          ")",
>+          (uintptr_t)callback, (uintptr_t)attrib_list);
>+
>+    Thread *thread = egl::GetCurrentThread();
>+
>+    AttributeMap attributes = AttributeMap::CreateFromAttribArray(attrib_list);
>+
>+    Error error = ValidateDebugMessageControlKHR(callback, attributes);
>+    if (error.isError())
>+    {
>+        thread->setError(error, GetDebug(), "eglDebugMessageControlKHR", nullptr);
>+        return error.getCode();
>+    }
>+
>+    Debug *debug = GetDebug();
>+    debug->setCallback(callback, attributes);
>+
>+    thread->setSuccess();
>+    return EGL_SUCCESS;
>+}
>+
>+EGLBoolean EGLAPIENTRY EGL_QueryDebugKHR(EGLint attribute, EGLAttrib *value)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(EGLint attribute = 0x%X, EGLAttrib* value = 0x%016" PRIxPTR ")", attribute,
>+          (uintptr_t)value);
>+
>+    Thread *thread = egl::GetCurrentThread();
>+
>+    Error error = ValidateQueryDebugKHR(attribute, value);
>+    if (error.isError())
>+    {
>+        thread->setError(error, GetDebug(), "eglQueryDebugKHR", nullptr);
>+        return EGL_FALSE;
>+    }
>+
>+    Debug *debug = GetDebug();
>+    switch (attribute)
>+    {
>+        case EGL_DEBUG_MSG_CRITICAL_KHR:
>+        case EGL_DEBUG_MSG_ERROR_KHR:
>+        case EGL_DEBUG_MSG_WARN_KHR:
>+        case EGL_DEBUG_MSG_INFO_KHR:
>+            *value = debug->isMessageTypeEnabled(FromEGLenum<MessageType>(attribute)) ? EGL_TRUE
>+                                                                                      : EGL_FALSE;
>+            break;
>+        case EGL_DEBUG_CALLBACK_KHR:
>+            *value = reinterpret_cast<EGLAttrib>(debug->getCallback());
>+            break;
>+
>+        default:
>+            UNREACHABLE();
>+    }
>+
>+    thread->setSuccess();
>+    return EGL_TRUE;
>+}
>+
>+EGLint EGLAPIENTRY EGL_LabelObjectKHR(EGLDisplay dpy,
>+                                      EGLenum objectType,
>+                                      EGLObjectKHR object,
>+                                      EGLLabelKHR label)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(EGLDisplay dpy = 0x%016" PRIxPTR
>+          ", EGLenum objectType = 0x%X, EGLObjectKHR object = 0x%016" PRIxPTR
>+          ", "
>+          "EGLLabelKHR label = 0x%016" PRIxPTR ")",
>+          (uintptr_t)dpy, objectType, (uintptr_t)object, (uintptr_t)label);
>+
>+    egl::Display *display = static_cast<egl::Display *>(dpy);
>+    Thread *thread        = egl::GetCurrentThread();
>+
>+    ObjectType objectTypePacked = FromEGLenum<ObjectType>(objectType);
>+    Error error = ValidateLabelObjectKHR(thread, display, objectTypePacked, object, label);
>+    if (error.isError())
>+    {
>+        thread->setError(error, GetDebug(), "eglLabelObjectKHR",
>+                         GetLabeledObjectIfValid(thread, display, objectTypePacked, object));
>+        return error.getCode();
>+    }
>+
>+    LabeledObject *labeledObject =
>+        GetLabeledObjectIfValid(thread, display, objectTypePacked, object);
>+    ASSERT(labeledObject != nullptr);
>+    labeledObject->setLabel(label);
>+
>+    thread->setSuccess();
>+    return EGL_SUCCESS;
>+}
>+
>+ANGLE_EXPORT EGLBoolean EGLAPIENTRY EGL_GetCompositorTimingSupportedANDROID(EGLDisplay dpy,
>+                                                                            EGLSurface surface,
>+                                                                            EGLint name)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(EGLDisplay dpy = 0x%016" PRIxPTR ", EGLSurface surface = 0x%016" PRIxPTR
>+          ", EGLint name = 0x%X)",
>+          (uintptr_t)dpy, (uintptr_t)surface, name);
>+
>+    egl::Display *display = static_cast<egl::Display *>(dpy);
>+    Surface *eglSurface   = static_cast<Surface *>(surface);
>+    Thread *thread        = egl::GetCurrentThread();
>+
>+    CompositorTiming nameInternal = FromEGLenum<CompositorTiming>(name);
>+
>+    ANGLE_EGL_TRY_RETURN(
>+        thread, ValidateGetCompositorTimingSupportedANDROID(display, eglSurface, nameInternal),
>+        "eglQueryTimestampSupportedANDROID", GetSurfaceIfValid(display, eglSurface), EGL_FALSE);
>+    return eglSurface->getSupportedCompositorTimings().test(nameInternal);
>+}
>+
>+ANGLE_EXPORT EGLBoolean EGLAPIENTRY EGL_GetCompositorTimingANDROID(EGLDisplay dpy,
>+                                                                   EGLSurface surface,
>+                                                                   EGLint numTimestamps,
>+                                                                   const EGLint *names,
>+                                                                   EGLnsecsANDROID *values)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(EGLDisplay dpy = 0x%016" PRIxPTR ", EGLSurface surface = 0x%016" PRIxPTR
>+          ", EGLint numTimestamps = %d, const EGLint *names = 0x%016" PRIxPTR
>+          ", EGLnsecsANDROID *values = 0x%016" PRIxPTR ")",
>+          (uintptr_t)dpy, (uintptr_t)surface, numTimestamps, (uintptr_t)names, (uintptr_t)values);
>+
>+    egl::Display *display = static_cast<egl::Display *>(dpy);
>+    Surface *eglSurface   = static_cast<Surface *>(surface);
>+    Thread *thread        = egl::GetCurrentThread();
>+
>+    ANGLE_EGL_TRY_RETURN(
>+        thread,
>+        ValidateGetCompositorTimingANDROID(display, eglSurface, numTimestamps, names, values),
>+        "eglGetCompositorTimingANDROIDD", GetSurfaceIfValid(display, eglSurface), EGL_FALSE);
>+    ANGLE_EGL_TRY_RETURN(thread, eglSurface->getCompositorTiming(numTimestamps, names, values),
>+                         "eglGetCompositorTimingANDROIDD", GetSurfaceIfValid(display, eglSurface),
>+                         EGL_FALSE);
>+
>+    return EGL_TRUE;
>+}
>+
>+ANGLE_EXPORT EGLBoolean EGLAPIENTRY EGL_GetNextFrameIdANDROID(EGLDisplay dpy,
>+                                                              EGLSurface surface,
>+                                                              EGLuint64KHR *frameId)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(EGLDisplay dpy = 0x%016" PRIxPTR ", EGLSurface surface = 0x%016" PRIxPTR
>+          ", EGLuint64KHR *frameId = 0x%016" PRIxPTR ")",
>+          (uintptr_t)dpy, (uintptr_t)surface, (uintptr_t)frameId);
>+
>+    egl::Display *display = static_cast<egl::Display *>(dpy);
>+    Surface *eglSurface   = static_cast<Surface *>(surface);
>+    Thread *thread        = egl::GetCurrentThread();
>+
>+    ANGLE_EGL_TRY_RETURN(thread, ValidateGetNextFrameIdANDROID(display, eglSurface, frameId),
>+                         "eglGetNextFrameIdANDROID", GetSurfaceIfValid(display, eglSurface),
>+                         EGL_FALSE);
>+    ANGLE_EGL_TRY_RETURN(thread, eglSurface->getNextFrameId(frameId), "eglGetNextFrameIdANDROID",
>+                         GetSurfaceIfValid(display, eglSurface), EGL_FALSE);
>+
>+    return EGL_TRUE;
>+}
>+
>+ANGLE_EXPORT EGLBoolean EGLAPIENTRY EGL_GetFrameTimestampSupportedANDROID(EGLDisplay dpy,
>+                                                                          EGLSurface surface,
>+                                                                          EGLint timestamp)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(EGLDisplay dpy = 0x%016" PRIxPTR ", EGLSurface surface = 0x%016" PRIxPTR
>+          ", EGLint timestamp = 0x%X)",
>+          (uintptr_t)dpy, (uintptr_t)surface, timestamp);
>+
>+    egl::Display *display = static_cast<egl::Display *>(dpy);
>+    Surface *eglSurface   = static_cast<Surface *>(surface);
>+    Thread *thread        = egl::GetCurrentThread();
>+
>+    Timestamp timestampInternal = FromEGLenum<Timestamp>(timestamp);
>+
>+    ANGLE_EGL_TRY_RETURN(
>+        thread, ValidateGetFrameTimestampSupportedANDROID(display, eglSurface, timestampInternal),
>+        "eglQueryTimestampSupportedANDROID", GetSurfaceIfValid(display, eglSurface), EGL_FALSE);
>+    return eglSurface->getSupportedTimestamps().test(timestampInternal);
>+}
>+
>+ANGLE_EXPORT EGLBoolean EGLAPIENTRY EGL_GetFrameTimestampsANDROID(EGLDisplay dpy,
>+                                                                  EGLSurface surface,
>+                                                                  EGLuint64KHR frameId,
>+                                                                  EGLint numTimestamps,
>+                                                                  const EGLint *timestamps,
>+                                                                  EGLnsecsANDROID *values)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(EGLDisplay dpy = 0x%016" PRIxPTR ", EGLSurface surface = 0x%016" PRIxPTR
>+          ", EGLuint64KHR frameId = %llu, EGLint numTimestamps = %d, const EGLint *timestamps = "
>+          "0x%016" PRIxPTR ", EGLnsecsANDROID *values = 0x%016" PRIxPTR ")",
>+          (uintptr_t)dpy, (uintptr_t)surface, (unsigned long long)frameId, numTimestamps,
>+          (uintptr_t)timestamps, (uintptr_t)values);
>+
>+    egl::Display *display = static_cast<egl::Display *>(dpy);
>+    Surface *eglSurface   = static_cast<Surface *>(surface);
>+    Thread *thread        = egl::GetCurrentThread();
>+
>+    ANGLE_EGL_TRY_RETURN(thread,
>+                         ValidateGetFrameTimestampsANDROID(display, eglSurface, frameId,
>+                                                           numTimestamps, timestamps, values),
>+                         "eglGetFrameTimestampsANDROID", GetSurfaceIfValid(display, eglSurface),
>+                         EGL_FALSE);
>+    ANGLE_EGL_TRY_RETURN(
>+        thread, eglSurface->getFrameTimestamps(frameId, numTimestamps, timestamps, values),
>+        "eglGetFrameTimestampsANDROID", GetSurfaceIfValid(display, eglSurface), EGL_FALSE);
>+
>+    return EGL_TRUE;
>+}
>+
>+}  // extern "C"
>diff --git a/Source/ThirdParty/ANGLE/src/libGLESv2/entry_points_egl_ext.h b/Source/ThirdParty/ANGLE/src/libGLESv2/entry_points_egl_ext.h
>index 3cde6ec9c65..3c64b2906a0 100644
>--- a/Source/ThirdParty/ANGLE/src/libGLESv2/entry_points_egl_ext.h
>+++ b/Source/ThirdParty/ANGLE/src/libGLESv2/entry_points_egl_ext.h
>@@ -13,101 +13,191 @@
> #include <EGL/eglext.h>
> #include <export.h>
> 
>-namespace egl
>-{
>+extern "C" {
> 
> // EGL_ANGLE_query_surface_pointer
>-ANGLE_EXPORT EGLBoolean EGLAPIENTRY QuerySurfacePointerANGLE(EGLDisplay dpy, EGLSurface surface, EGLint attribute, void **value);
>+ANGLE_EXPORT EGLBoolean EGLAPIENTRY EGL_QuerySurfacePointerANGLE(EGLDisplay dpy,
>+                                                                 EGLSurface surface,
>+                                                                 EGLint attribute,
>+                                                                 void **value);
> 
> // EGL_NV_post_sub_buffer
>-ANGLE_EXPORT EGLBoolean EGLAPIENTRY PostSubBufferNV(EGLDisplay dpy, EGLSurface surface, EGLint x, EGLint y, EGLint width, EGLint height);
>+ANGLE_EXPORT EGLBoolean EGLAPIENTRY EGL_PostSubBufferNV(EGLDisplay dpy,
>+                                                        EGLSurface surface,
>+                                                        EGLint x,
>+                                                        EGLint y,
>+                                                        EGLint width,
>+                                                        EGLint height);
> 
> // EGL_EXT_platform_base
>-ANGLE_EXPORT EGLDisplay EGLAPIENTRY GetPlatformDisplayEXT(EGLenum platform, void *native_display, const EGLint *attrib_list);
>+ANGLE_EXPORT EGLDisplay EGLAPIENTRY EGL_GetPlatformDisplayEXT(EGLenum platform,
>+                                                              void *native_display,
>+                                                              const EGLint *attrib_list);
>+ANGLE_EXPORT EGLSurface EGLAPIENTRY EGL_CreatePlatformWindowSurfaceEXT(EGLDisplay dpy,
>+                                                                       EGLConfig config,
>+                                                                       void *native_window,
>+                                                                       const EGLint *attrib_list);
>+ANGLE_EXPORT EGLSurface EGLAPIENTRY EGL_CreatePlatformPixmapSurfaceEXT(EGLDisplay dpy,
>+                                                                       EGLConfig config,
>+                                                                       void *native_pixmap,
>+                                                                       const EGLint *attrib_list);
> 
> // EGL_EXT_device_query
>-ANGLE_EXPORT EGLBoolean EGLAPIENTRY QueryDisplayAttribEXT(EGLDisplay dpy, EGLint attribute, EGLAttrib *value);
>-ANGLE_EXPORT EGLBoolean EGLAPIENTRY QueryDeviceAttribEXT(EGLDeviceEXT device, EGLint attribute, EGLAttrib *value);
>-ANGLE_EXPORT const char * EGLAPIENTRY QueryDeviceStringEXT(EGLDeviceEXT device, EGLint name);
>+ANGLE_EXPORT EGLBoolean EGLAPIENTRY EGL_QueryDisplayAttribEXT(EGLDisplay dpy,
>+                                                              EGLint attribute,
>+                                                              EGLAttrib *value);
>+ANGLE_EXPORT EGLBoolean EGLAPIENTRY EGL_QueryDeviceAttribEXT(EGLDeviceEXT device,
>+                                                             EGLint attribute,
>+                                                             EGLAttrib *value);
>+ANGLE_EXPORT const char *EGLAPIENTRY EGL_QueryDeviceStringEXT(EGLDeviceEXT device, EGLint name);
> 
> // EGL_KHR_image_base/EGL_KHR_image
>-ANGLE_EXPORT EGLImageKHR EGLAPIENTRY CreateImageKHR(EGLDisplay dpy,
>-                                                    EGLContext ctx,
>-                                                    EGLenum target,
>-                                                    EGLClientBuffer buffer,
>-                                                    const EGLint *attrib_list);
>-ANGLE_EXPORT EGLBoolean EGLAPIENTRY DestroyImageKHR(EGLDisplay dpy, EGLImageKHR image);
>-
>-// EGL_EXT_device_creation
>-ANGLE_EXPORT EGLDeviceEXT EGLAPIENTRY CreateDeviceANGLE(EGLint device_type,
>-                                                        void *native_device,
>-                                                        const EGLAttrib *attrib_list);
>-ANGLE_EXPORT EGLBoolean EGLAPIENTRY ReleaseDeviceANGLE(EGLDeviceEXT device);
>+ANGLE_EXPORT EGLImageKHR EGLAPIENTRY EGL_CreateImageKHR(EGLDisplay dpy,
>+                                                        EGLContext ctx,
>+                                                        EGLenum target,
>+                                                        EGLClientBuffer buffer,
>+                                                        const EGLint *attrib_list);
>+ANGLE_EXPORT EGLBoolean EGLAPIENTRY EGL_DestroyImageKHR(EGLDisplay dpy, EGLImageKHR image);
>+
>+// EGL_ANGLE_device_creation
>+ANGLE_EXPORT EGLDeviceEXT EGLAPIENTRY EGL_CreateDeviceANGLE(EGLint device_type,
>+                                                            void *native_device,
>+                                                            const EGLAttrib *attrib_list);
>+ANGLE_EXPORT EGLBoolean EGLAPIENTRY EGL_ReleaseDeviceANGLE(EGLDeviceEXT device);
> 
> // EGL_KHR_stream
>-ANGLE_EXPORT EGLStreamKHR EGLAPIENTRY CreateStreamKHR(EGLDisplay dpy, const EGLint *attrib_list);
>-ANGLE_EXPORT EGLBoolean EGLAPIENTRY DestroyStreamKHR(EGLDisplay dpy, EGLStreamKHR stream);
>-ANGLE_EXPORT EGLBoolean EGLAPIENTRY StreamAttribKHR(EGLDisplay dpy,
>-                                                    EGLStreamKHR stream,
>-                                                    EGLenum attribute,
>-                                                    EGLint value);
>-ANGLE_EXPORT EGLBoolean EGLAPIENTRY QueryStreamKHR(EGLDisplay dpy,
>-                                                   EGLStreamKHR stream,
>-                                                   EGLenum attribute,
>-                                                   EGLint *value);
>-ANGLE_EXPORT EGLBoolean EGLAPIENTRY QueryStreamu64KHR(EGLDisplay dpy,
>-                                                      EGLStreamKHR stream,
>-                                                      EGLenum attribute,
>-                                                      EGLuint64KHR *value);
>+ANGLE_EXPORT EGLStreamKHR EGLAPIENTRY EGL_CreateStreamKHR(EGLDisplay dpy,
>+                                                          const EGLint *attrib_list);
>+ANGLE_EXPORT EGLBoolean EGLAPIENTRY EGL_DestroyStreamKHR(EGLDisplay dpy, EGLStreamKHR stream);
>+ANGLE_EXPORT EGLBoolean EGLAPIENTRY EGL_StreamAttribKHR(EGLDisplay dpy,
>+                                                        EGLStreamKHR stream,
>+                                                        EGLenum attribute,
>+                                                        EGLint value);
>+ANGLE_EXPORT EGLBoolean EGLAPIENTRY EGL_QueryStreamKHR(EGLDisplay dpy,
>+                                                       EGLStreamKHR stream,
>+                                                       EGLenum attribute,
>+                                                       EGLint *value);
>+ANGLE_EXPORT EGLBoolean EGLAPIENTRY EGL_QueryStreamu64KHR(EGLDisplay dpy,
>+                                                          EGLStreamKHR stream,
>+                                                          EGLenum attribute,
>+                                                          EGLuint64KHR *value);
> 
> // EGL_KHR_stream_consumer_gltexture
>-ANGLE_EXPORT EGLBoolean EGLAPIENTRY StreamConsumerGLTextureExternalKHR(EGLDisplay dpy,
>-                                                                       EGLStreamKHR stream);
>-ANGLE_EXPORT EGLBoolean EGLAPIENTRY StreamConsumerAcquireKHR(EGLDisplay dpy, EGLStreamKHR stream);
>-ANGLE_EXPORT EGLBoolean EGLAPIENTRY StreamConsumerReleaseKHR(EGLDisplay dpy, EGLStreamKHR stream);
>+ANGLE_EXPORT EGLBoolean EGLAPIENTRY EGL_StreamConsumerGLTextureExternalKHR(EGLDisplay dpy,
>+                                                                           EGLStreamKHR stream);
>+ANGLE_EXPORT EGLBoolean EGLAPIENTRY EGL_StreamConsumerAcquireKHR(EGLDisplay dpy,
>+                                                                 EGLStreamKHR stream);
>+ANGLE_EXPORT EGLBoolean EGLAPIENTRY EGL_StreamConsumerReleaseKHR(EGLDisplay dpy,
>+                                                                 EGLStreamKHR stream);
> ANGLE_EXPORT EGLBoolean EGLAPIENTRY
>-StreamConsumerGLTextureExternalAttribsNV(EGLDisplay dpy,
>-                                         EGLStreamKHR stream,
>-                                         const EGLAttrib *attrib_list);
>+EGL_StreamConsumerGLTextureExternalAttribsNV(EGLDisplay dpy,
>+                                             EGLStreamKHR stream,
>+                                             const EGLAttrib *attrib_list);
> 
>-// EGL_ANGLE_stream_producer_d3d_texture_nv12
>+// EGL_ANGLE_stream_producer_d3d_texture
> ANGLE_EXPORT EGLBoolean EGLAPIENTRY
>-CreateStreamProducerD3DTextureNV12ANGLE(EGLDisplay dpy,
>+EGL_CreateStreamProducerD3DTextureANGLE(EGLDisplay dpy,
>                                         EGLStreamKHR stream,
>                                         const EGLAttrib *attrib_list);
>-ANGLE_EXPORT EGLBoolean EGLAPIENTRY StreamPostD3DTextureNV12ANGLE(EGLDisplay dpy,
>+ANGLE_EXPORT EGLBoolean EGLAPIENTRY EGL_StreamPostD3DTextureANGLE(EGLDisplay dpy,
>                                                                   EGLStreamKHR stream,
>                                                                   void *texture,
>                                                                   const EGLAttrib *attrib_list);
> 
>-// EGL_CHROMIUM_get_sync_values
>-ANGLE_EXPORT EGLBoolean EGLAPIENTRY GetSyncValuesCHROMIUM(EGLDisplay dpy,
>-                                                          EGLSurface surface,
>-                                                          EGLuint64KHR *ust,
>-                                                          EGLuint64KHR *msc,
>-                                                          EGLuint64KHR *sbc);
>-
>-// EGL_EXT_swap_buffers_with_damage
>-ANGLE_EXPORT EGLBoolean SwapBuffersWithDamageEXT(EGLDisplay dpy,
>-                                                 EGLSurface surface,
>-                                                 EGLint *rects,
>-                                                 EGLint n_rects);
>+// EGL_KHR_fence_sync
>+ANGLE_EXPORT EGLSync EGLAPIENTRY EGL_CreateSyncKHR(EGLDisplay dpy,
>+                                                   EGLenum type,
>+                                                   const EGLint *attrib_list);
>+ANGLE_EXPORT EGLBoolean EGLAPIENTRY EGL_DestroySyncKHR(EGLDisplay dpy, EGLSync sync);
>+ANGLE_EXPORT EGLint EGLAPIENTRY EGL_ClientWaitSyncKHR(EGLDisplay dpy,
>+                                                      EGLSync sync,
>+                                                      EGLint flags,
>+                                                      EGLTime timeout);
>+ANGLE_EXPORT EGLBoolean EGLAPIENTRY EGL_GetSyncAttribKHR(EGLDisplay dpy,
>+                                                         EGLSync sync,
>+                                                         EGLint attribute,
>+                                                         EGLint *value);
>+
>+// EGL_KHR_wait_sync
>+ANGLE_EXPORT EGLBoolean EGLAPIENTRY EGL_WaitSyncKHR(EGLDisplay dpy, EGLSync sync, EGLint flags);
> 
>-//
>-ANGLE_EXPORT EGLint EGLAPIENTRY ProgramCacheGetAttribANGLE(EGLDisplay dpy, EGLenum attrib);
>-ANGLE_EXPORT void EGLAPIENTRY ProgramCacheQueryANGLE(EGLDisplay dpy,
>-                                                     EGLint index,
>-                                                     void *key,
>-                                                     EGLint *keysize,
>-                                                     void *binary,
>-                                                     EGLint *binarysize);
>-ANGLE_EXPORT void EGLAPIENTRY ProgramCachePopulateANGLE(EGLDisplay dpy,
>-                                                        const void *key,
>-                                                        EGLint keysize,
>-                                                        const void *binary,
>-                                                        EGLint binarysize);
>-ANGLE_EXPORT EGLint EGLAPIENTRY ProgramCacheResizeANGLE(EGLDisplay dpy, EGLint limit, EGLenum mode);
>-
>-}  // namespace egl
>-
>-#endif // LIBGLESV2_ENTRYPOINTSEGLEXT_H_
>+// EGL_CHROMIUM_get_sync_values
>+ANGLE_EXPORT EGLBoolean EGLAPIENTRY EGL_GetSyncValuesCHROMIUM(EGLDisplay dpy,
>+                                                              EGLSurface surface,
>+                                                              EGLuint64KHR *ust,
>+                                                              EGLuint64KHR *msc,
>+                                                              EGLuint64KHR *sbc);
>+
>+// EGL_KHR_swap_buffers_with_damage
>+ANGLE_EXPORT EGLBoolean EGLAPIENTRY EGL_SwapBuffersWithDamageKHR(EGLDisplay dpy,
>+                                                                 EGLSurface surface,
>+                                                                 EGLint *rects,
>+                                                                 EGLint n_rects);
>+
>+// EGL_ANDROID_presentation_time
>+ANGLE_EXPORT EGLBoolean EGLAPIENTRY EGL_PresentationTimeANDROID(EGLDisplay dpy,
>+                                                                EGLSurface surface,
>+                                                                EGLnsecsANDROID time);
>+
>+// EGL_ANDRIOD_blob_cache
>+ANGLE_EXPORT void EGLAPIENTRY EGL_SetBlobCacheFuncsANDROID(EGLDisplay dpy,
>+                                                           EGLSetBlobFuncANDROID set,
>+                                                           EGLGetBlobFuncANDROID get);
>+
>+// EGL_ANGLE_program_cache_control
>+ANGLE_EXPORT EGLint EGLAPIENTRY EGL_ProgramCacheGetAttribANGLE(EGLDisplay dpy, EGLenum attrib);
>+ANGLE_EXPORT void EGLAPIENTRY EGL_ProgramCacheQueryANGLE(EGLDisplay dpy,
>+                                                         EGLint index,
>+                                                         void *key,
>+                                                         EGLint *keysize,
>+                                                         void *binary,
>+                                                         EGLint *binarysize);
>+ANGLE_EXPORT void EGLAPIENTRY EGL_ProgramCachePopulateANGLE(EGLDisplay dpy,
>+                                                            const void *key,
>+                                                            EGLint keysize,
>+                                                            const void *binary,
>+                                                            EGLint binarysize);
>+ANGLE_EXPORT EGLint EGLAPIENTRY EGL_ProgramCacheResizeANGLE(EGLDisplay dpy,
>+                                                            EGLint limit,
>+                                                            EGLenum mode);
>+
>+// EGL_KHR_debug
>+ANGLE_EXPORT EGLint EGLAPIENTRY EGL_DebugMessageControlKHR(EGLDEBUGPROCKHR callback,
>+                                                           const EGLAttrib *attrib_list);
>+
>+ANGLE_EXPORT EGLBoolean EGLAPIENTRY EGL_QueryDebugKHR(EGLint attribute, EGLAttrib *value);
>+
>+ANGLE_EXPORT EGLint EGLAPIENTRY EGL_LabelObjectKHR(EGLDisplay display,
>+                                                   EGLenum objectType,
>+                                                   EGLObjectKHR object,
>+                                                   EGLLabelKHR label);
>+
>+// ANDROID_get_frame_timestamps
>+ANGLE_EXPORT EGLBoolean EGLAPIENTRY EGL_GetCompositorTimingSupportedANDROID(EGLDisplay dpy,
>+                                                                            EGLSurface surface,
>+                                                                            EGLint name);
>+
>+ANGLE_EXPORT EGLBoolean EGLAPIENTRY EGL_GetCompositorTimingANDROID(EGLDisplay dpy,
>+                                                                   EGLSurface surface,
>+                                                                   EGLint numTimestamps,
>+                                                                   const EGLint *names,
>+                                                                   EGLnsecsANDROID *values);
>+
>+ANGLE_EXPORT EGLBoolean EGLAPIENTRY EGL_GetNextFrameIdANDROID(EGLDisplay dpy,
>+                                                              EGLSurface surface,
>+                                                              EGLuint64KHR *frameId);
>+
>+ANGLE_EXPORT EGLBoolean EGLAPIENTRY EGL_GetFrameTimestampSupportedANDROID(EGLDisplay dpy,
>+                                                                          EGLSurface surface,
>+                                                                          EGLint timestamp);
>+
>+ANGLE_EXPORT EGLBoolean EGLAPIENTRY EGL_GetFrameTimestampsANDROID(EGLDisplay dpy,
>+                                                                  EGLSurface surface,
>+                                                                  EGLuint64KHR frameId,
>+                                                                  EGLint numTimestamps,
>+                                                                  const EGLint *timestamps,
>+                                                                  EGLnsecsANDROID *values);
>+
>+}  // extern "C"
>+
>+#endif  // LIBGLESV2_ENTRYPOINTSEGLEXT_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libGLESv2/entry_points_enum_autogen.h b/Source/ThirdParty/ANGLE/src/libGLESv2/entry_points_enum_autogen.h
>new file mode 100644
>index 00000000000..5dc34fe4fc9
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libGLESv2/entry_points_enum_autogen.h
>@@ -0,0 +1,667 @@
>+// GENERATED FILE - DO NOT EDIT.
>+// Generated by generate_entry_points.py using data from gl.xml and gl_angle_ext.xml.
>+//
>+// Copyright 2019 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// entry_points_enum_autogen.h:
>+//   Defines the GLES entry points enumeration.
>+
>+#ifndef LIBGLESV2_ENTRYPOINTSENUM_AUTOGEN_H_
>+#define LIBGLESV2_ENTRYPOINTSENUM_AUTOGEN_H_
>+
>+namespace gl
>+{
>+enum class EntryPoint
>+{
>+    Invalid,
>+    ActiveShaderProgram,
>+    ActiveTexture,
>+    AlphaFunc,
>+    AlphaFuncx,
>+    AttachShader,
>+    BeginQuery,
>+    BeginQueryEXT,
>+    BeginTransformFeedback,
>+    BindAttribLocation,
>+    BindBuffer,
>+    BindBufferBase,
>+    BindBufferRange,
>+    BindFragDataLocationEXT,
>+    BindFragDataLocationIndexedEXT,
>+    BindFragmentInputLocationCHROMIUM,
>+    BindFramebuffer,
>+    BindFramebufferOES,
>+    BindImageTexture,
>+    BindProgramPipeline,
>+    BindRenderbuffer,
>+    BindRenderbufferOES,
>+    BindSampler,
>+    BindTexture,
>+    BindTransformFeedback,
>+    BindUniformLocationCHROMIUM,
>+    BindVertexArray,
>+    BindVertexArrayOES,
>+    BindVertexBuffer,
>+    BlendColor,
>+    BlendEquation,
>+    BlendEquationSeparate,
>+    BlendFunc,
>+    BlendFuncSeparate,
>+    BlitFramebuffer,
>+    BlitFramebufferANGLE,
>+    BufferData,
>+    BufferStorageMemEXT,
>+    BufferSubData,
>+    CheckFramebufferStatus,
>+    CheckFramebufferStatusOES,
>+    Clear,
>+    ClearBufferfi,
>+    ClearBufferfv,
>+    ClearBufferiv,
>+    ClearBufferuiv,
>+    ClearColor,
>+    ClearColorx,
>+    ClearDepthf,
>+    ClearDepthx,
>+    ClearStencil,
>+    ClientActiveTexture,
>+    ClientWaitSync,
>+    ClipPlanef,
>+    ClipPlanex,
>+    Color4f,
>+    Color4ub,
>+    Color4x,
>+    ColorMask,
>+    ColorPointer,
>+    CompileShader,
>+    CompressedCopyTextureCHROMIUM,
>+    CompressedTexImage2D,
>+    CompressedTexImage2DRobustANGLE,
>+    CompressedTexImage3D,
>+    CompressedTexImage3DRobustANGLE,
>+    CompressedTexSubImage2D,
>+    CompressedTexSubImage2DRobustANGLE,
>+    CompressedTexSubImage3D,
>+    CompressedTexSubImage3DRobustANGLE,
>+    CopyBufferSubData,
>+    CopySubTexture3DANGLE,
>+    CopySubTextureCHROMIUM,
>+    CopyTexImage2D,
>+    CopyTexSubImage2D,
>+    CopyTexSubImage3D,
>+    CopyTexture3DANGLE,
>+    CopyTextureCHROMIUM,
>+    CoverFillPathCHROMIUM,
>+    CoverFillPathInstancedCHROMIUM,
>+    CoverStrokePathCHROMIUM,
>+    CoverStrokePathInstancedCHROMIUM,
>+    CoverageModulationCHROMIUM,
>+    CreateMemoryObjectsEXT,
>+    CreateProgram,
>+    CreateShader,
>+    CreateShaderProgramv,
>+    CullFace,
>+    CurrentPaletteMatrixOES,
>+    DebugMessageCallbackKHR,
>+    DebugMessageControlKHR,
>+    DebugMessageInsertKHR,
>+    DeleteBuffers,
>+    DeleteFencesNV,
>+    DeleteFramebuffers,
>+    DeleteFramebuffersOES,
>+    DeleteMemoryObjectsEXT,
>+    DeletePathsCHROMIUM,
>+    DeleteProgram,
>+    DeleteProgramPipelines,
>+    DeleteQueries,
>+    DeleteQueriesEXT,
>+    DeleteRenderbuffers,
>+    DeleteRenderbuffersOES,
>+    DeleteSamplers,
>+    DeleteSemaphoresEXT,
>+    DeleteShader,
>+    DeleteSync,
>+    DeleteTextures,
>+    DeleteTransformFeedbacks,
>+    DeleteVertexArrays,
>+    DeleteVertexArraysOES,
>+    DepthFunc,
>+    DepthMask,
>+    DepthRangef,
>+    DepthRangex,
>+    DetachShader,
>+    Disable,
>+    DisableClientState,
>+    DisableVertexAttribArray,
>+    DiscardFramebufferEXT,
>+    DispatchCompute,
>+    DispatchComputeIndirect,
>+    DrawArrays,
>+    DrawArraysIndirect,
>+    DrawArraysInstanced,
>+    DrawArraysInstancedANGLE,
>+    DrawArraysInstancedEXT,
>+    DrawBuffers,
>+    DrawBuffersEXT,
>+    DrawElements,
>+    DrawElementsIndirect,
>+    DrawElementsInstanced,
>+    DrawElementsInstancedANGLE,
>+    DrawElementsInstancedEXT,
>+    DrawRangeElements,
>+    DrawTexfOES,
>+    DrawTexfvOES,
>+    DrawTexiOES,
>+    DrawTexivOES,
>+    DrawTexsOES,
>+    DrawTexsvOES,
>+    DrawTexxOES,
>+    DrawTexxvOES,
>+    EGLImageTargetRenderbufferStorageOES,
>+    EGLImageTargetTexture2DOES,
>+    Enable,
>+    EnableClientState,
>+    EnableVertexAttribArray,
>+    EndQuery,
>+    EndQueryEXT,
>+    EndTransformFeedback,
>+    FenceSync,
>+    Finish,
>+    FinishFenceNV,
>+    Flush,
>+    FlushMappedBufferRange,
>+    FlushMappedBufferRangeEXT,
>+    Fogf,
>+    Fogfv,
>+    Fogx,
>+    Fogxv,
>+    FramebufferParameteri,
>+    FramebufferRenderbuffer,
>+    FramebufferRenderbufferOES,
>+    FramebufferTexture2D,
>+    FramebufferTexture2DOES,
>+    FramebufferTextureEXT,
>+    FramebufferTextureLayer,
>+    FramebufferTextureMultiviewOVR,
>+    FrontFace,
>+    Frustumf,
>+    Frustumx,
>+    GenBuffers,
>+    GenFencesNV,
>+    GenFramebuffers,
>+    GenFramebuffersOES,
>+    GenPathsCHROMIUM,
>+    GenProgramPipelines,
>+    GenQueries,
>+    GenQueriesEXT,
>+    GenRenderbuffers,
>+    GenRenderbuffersOES,
>+    GenSamplers,
>+    GenSemaphoresEXT,
>+    GenTextures,
>+    GenTransformFeedbacks,
>+    GenVertexArrays,
>+    GenVertexArraysOES,
>+    GenerateMipmap,
>+    GenerateMipmapOES,
>+    GetActiveAttrib,
>+    GetActiveUniform,
>+    GetActiveUniformBlockName,
>+    GetActiveUniformBlockiv,
>+    GetActiveUniformBlockivRobustANGLE,
>+    GetActiveUniformsiv,
>+    GetAttachedShaders,
>+    GetAttribLocation,
>+    GetBooleani_v,
>+    GetBooleani_vRobustANGLE,
>+    GetBooleanv,
>+    GetBooleanvRobustANGLE,
>+    GetBufferParameteri64v,
>+    GetBufferParameteri64vRobustANGLE,
>+    GetBufferParameteriv,
>+    GetBufferParameterivRobustANGLE,
>+    GetBufferPointerv,
>+    GetBufferPointervOES,
>+    GetBufferPointervRobustANGLE,
>+    GetClipPlanef,
>+    GetClipPlanex,
>+    GetDebugMessageLogKHR,
>+    GetError,
>+    GetFenceivNV,
>+    GetFixedv,
>+    GetFloatv,
>+    GetFloatvRobustANGLE,
>+    GetFragDataIndexEXT,
>+    GetFragDataLocation,
>+    GetFramebufferAttachmentParameteriv,
>+    GetFramebufferAttachmentParameterivOES,
>+    GetFramebufferAttachmentParameterivRobustANGLE,
>+    GetFramebufferParameteriv,
>+    GetFramebufferParameterivRobustANGLE,
>+    GetGraphicsResetStatusEXT,
>+    GetInteger64i_v,
>+    GetInteger64i_vRobustANGLE,
>+    GetInteger64v,
>+    GetInteger64vRobustANGLE,
>+    GetIntegeri_v,
>+    GetIntegeri_vRobustANGLE,
>+    GetIntegerv,
>+    GetIntegervRobustANGLE,
>+    GetInternalformativ,
>+    GetInternalformativRobustANGLE,
>+    GetLightfv,
>+    GetLightxv,
>+    GetMaterialfv,
>+    GetMaterialxv,
>+    GetMemoryObjectParameterivEXT,
>+    GetMultisamplefv,
>+    GetMultisamplefvANGLE,
>+    GetMultisamplefvRobustANGLE,
>+    GetObjectLabelKHR,
>+    GetObjectPtrLabelKHR,
>+    GetPathParameterfvCHROMIUM,
>+    GetPathParameterivCHROMIUM,
>+    GetPointerv,
>+    GetPointervKHR,
>+    GetPointervRobustANGLERobustANGLE,
>+    GetProgramBinary,
>+    GetProgramBinaryOES,
>+    GetProgramInfoLog,
>+    GetProgramInterfaceiv,
>+    GetProgramInterfaceivRobustANGLE,
>+    GetProgramPipelineInfoLog,
>+    GetProgramPipelineiv,
>+    GetProgramResourceIndex,
>+    GetProgramResourceLocation,
>+    GetProgramResourceLocationIndexEXT,
>+    GetProgramResourceName,
>+    GetProgramResourceiv,
>+    GetProgramiv,
>+    GetProgramivRobustANGLE,
>+    GetQueryObjecti64vEXT,
>+    GetQueryObjecti64vRobustANGLE,
>+    GetQueryObjectivEXT,
>+    GetQueryObjectivRobustANGLE,
>+    GetQueryObjectui64vEXT,
>+    GetQueryObjectui64vRobustANGLE,
>+    GetQueryObjectuiv,
>+    GetQueryObjectuivEXT,
>+    GetQueryObjectuivRobustANGLE,
>+    GetQueryiv,
>+    GetQueryivEXT,
>+    GetQueryivRobustANGLE,
>+    GetRenderbufferParameteriv,
>+    GetRenderbufferParameterivOES,
>+    GetRenderbufferParameterivRobustANGLE,
>+    GetSamplerParameterIivOES,
>+    GetSamplerParameterIivRobustANGLE,
>+    GetSamplerParameterIuivOES,
>+    GetSamplerParameterIuivRobustANGLE,
>+    GetSamplerParameterfv,
>+    GetSamplerParameterfvRobustANGLE,
>+    GetSamplerParameteriv,
>+    GetSamplerParameterivRobustANGLE,
>+    GetSemaphoreParameterui64vEXT,
>+    GetShaderInfoLog,
>+    GetShaderPrecisionFormat,
>+    GetShaderSource,
>+    GetShaderiv,
>+    GetShaderivRobustANGLE,
>+    GetString,
>+    GetStringi,
>+    GetSynciv,
>+    GetTexEnvfv,
>+    GetTexEnviv,
>+    GetTexEnvxv,
>+    GetTexGenfvOES,
>+    GetTexGenivOES,
>+    GetTexGenxvOES,
>+    GetTexLevelParameterfv,
>+    GetTexLevelParameterfvANGLE,
>+    GetTexLevelParameterfvRobustANGLE,
>+    GetTexLevelParameteriv,
>+    GetTexLevelParameterivANGLE,
>+    GetTexLevelParameterivRobustANGLE,
>+    GetTexParameterIivOES,
>+    GetTexParameterIivRobustANGLE,
>+    GetTexParameterIuivOES,
>+    GetTexParameterIuivRobustANGLE,
>+    GetTexParameterfv,
>+    GetTexParameterfvRobustANGLE,
>+    GetTexParameteriv,
>+    GetTexParameterivRobustANGLE,
>+    GetTexParameterxv,
>+    GetTransformFeedbackVarying,
>+    GetTranslatedShaderSourceANGLE,
>+    GetUniformBlockIndex,
>+    GetUniformIndices,
>+    GetUniformLocation,
>+    GetUniformfv,
>+    GetUniformfvRobustANGLE,
>+    GetUniformiv,
>+    GetUniformivRobustANGLE,
>+    GetUniformuiv,
>+    GetUniformuivRobustANGLE,
>+    GetUnsignedBytei_vEXT,
>+    GetUnsignedBytevEXT,
>+    GetVertexAttribIiv,
>+    GetVertexAttribIivRobustANGLE,
>+    GetVertexAttribIuiv,
>+    GetVertexAttribIuivRobustANGLE,
>+    GetVertexAttribPointerv,
>+    GetVertexAttribPointervRobustANGLE,
>+    GetVertexAttribfv,
>+    GetVertexAttribfvRobustANGLE,
>+    GetVertexAttribiv,
>+    GetVertexAttribivRobustANGLE,
>+    GetnUniformfvEXT,
>+    GetnUniformfvRobustANGLE,
>+    GetnUniformivEXT,
>+    GetnUniformivRobustANGLE,
>+    GetnUniformuivRobustANGLE,
>+    Hint,
>+    ImportMemoryFdEXT,
>+    ImportSemaphoreFdEXT,
>+    InsertEventMarkerEXT,
>+    InvalidateFramebuffer,
>+    InvalidateSubFramebuffer,
>+    IsBuffer,
>+    IsEnabled,
>+    IsFenceNV,
>+    IsFramebuffer,
>+    IsFramebufferOES,
>+    IsMemoryObjectEXT,
>+    IsPathCHROMIUM,
>+    IsProgram,
>+    IsProgramPipeline,
>+    IsQuery,
>+    IsQueryEXT,
>+    IsRenderbuffer,
>+    IsRenderbufferOES,
>+    IsSampler,
>+    IsSemaphoreEXT,
>+    IsShader,
>+    IsSync,
>+    IsTexture,
>+    IsTransformFeedback,
>+    IsVertexArray,
>+    IsVertexArrayOES,
>+    LightModelf,
>+    LightModelfv,
>+    LightModelx,
>+    LightModelxv,
>+    Lightf,
>+    Lightfv,
>+    Lightx,
>+    Lightxv,
>+    LineWidth,
>+    LineWidthx,
>+    LinkProgram,
>+    LoadIdentity,
>+    LoadMatrixf,
>+    LoadMatrixx,
>+    LoadPaletteFromModelViewMatrixOES,
>+    LogicOp,
>+    LoseContextCHROMIUM,
>+    MapBufferOES,
>+    MapBufferRange,
>+    MapBufferRangeEXT,
>+    Materialf,
>+    Materialfv,
>+    Materialx,
>+    Materialxv,
>+    MatrixIndexPointerOES,
>+    MatrixLoadIdentityCHROMIUM,
>+    MatrixLoadfCHROMIUM,
>+    MatrixMode,
>+    MaxShaderCompilerThreadsKHR,
>+    MemoryBarrier,
>+    MemoryBarrierByRegion,
>+    MemoryObjectParameterivEXT,
>+    MultMatrixf,
>+    MultMatrixx,
>+    MultiDrawArraysANGLE,
>+    MultiDrawArraysInstancedANGLE,
>+    MultiDrawElementsANGLE,
>+    MultiDrawElementsInstancedANGLE,
>+    MultiTexCoord4f,
>+    MultiTexCoord4x,
>+    Normal3f,
>+    Normal3x,
>+    NormalPointer,
>+    ObjectLabelKHR,
>+    ObjectPtrLabelKHR,
>+    Orthof,
>+    Orthox,
>+    PathCommandsCHROMIUM,
>+    PathParameterfCHROMIUM,
>+    PathParameteriCHROMIUM,
>+    PathStencilFuncCHROMIUM,
>+    PauseTransformFeedback,
>+    PixelStorei,
>+    PointParameterf,
>+    PointParameterfv,
>+    PointParameterx,
>+    PointParameterxv,
>+    PointSize,
>+    PointSizePointerOES,
>+    PointSizex,
>+    PolygonOffset,
>+    PolygonOffsetx,
>+    PopDebugGroupKHR,
>+    PopGroupMarkerEXT,
>+    PopMatrix,
>+    ProgramBinary,
>+    ProgramBinaryOES,
>+    ProgramParameteri,
>+    ProgramPathFragmentInputGenCHROMIUM,
>+    ProgramUniform1f,
>+    ProgramUniform1fv,
>+    ProgramUniform1i,
>+    ProgramUniform1iv,
>+    ProgramUniform1ui,
>+    ProgramUniform1uiv,
>+    ProgramUniform2f,
>+    ProgramUniform2fv,
>+    ProgramUniform2i,
>+    ProgramUniform2iv,
>+    ProgramUniform2ui,
>+    ProgramUniform2uiv,
>+    ProgramUniform3f,
>+    ProgramUniform3fv,
>+    ProgramUniform3i,
>+    ProgramUniform3iv,
>+    ProgramUniform3ui,
>+    ProgramUniform3uiv,
>+    ProgramUniform4f,
>+    ProgramUniform4fv,
>+    ProgramUniform4i,
>+    ProgramUniform4iv,
>+    ProgramUniform4ui,
>+    ProgramUniform4uiv,
>+    ProgramUniformMatrix2fv,
>+    ProgramUniformMatrix2x3fv,
>+    ProgramUniformMatrix2x4fv,
>+    ProgramUniformMatrix3fv,
>+    ProgramUniformMatrix3x2fv,
>+    ProgramUniformMatrix3x4fv,
>+    ProgramUniformMatrix4fv,
>+    ProgramUniformMatrix4x2fv,
>+    ProgramUniformMatrix4x3fv,
>+    ProvokingVertexANGLE,
>+    PushDebugGroupKHR,
>+    PushGroupMarkerEXT,
>+    PushMatrix,
>+    QueryCounterEXT,
>+    QueryMatrixxOES,
>+    ReadBuffer,
>+    ReadPixels,
>+    ReadPixelsRobustANGLE,
>+    ReadnPixelsEXT,
>+    ReadnPixelsRobustANGLE,
>+    ReleaseShaderCompiler,
>+    RenderbufferStorage,
>+    RenderbufferStorageMultisample,
>+    RenderbufferStorageMultisampleANGLE,
>+    RenderbufferStorageOES,
>+    RequestExtensionANGLE,
>+    ResumeTransformFeedback,
>+    Rotatef,
>+    Rotatex,
>+    SampleCoverage,
>+    SampleCoveragex,
>+    SampleMaski,
>+    SampleMaskiANGLE,
>+    SamplerParameterIivOES,
>+    SamplerParameterIivRobustANGLE,
>+    SamplerParameterIuivOES,
>+    SamplerParameterIuivRobustANGLE,
>+    SamplerParameterf,
>+    SamplerParameterfv,
>+    SamplerParameterfvRobustANGLE,
>+    SamplerParameteri,
>+    SamplerParameteriv,
>+    SamplerParameterivRobustANGLE,
>+    Scalef,
>+    Scalex,
>+    Scissor,
>+    SemaphoreParameterui64vEXT,
>+    SetFenceNV,
>+    ShadeModel,
>+    ShaderBinary,
>+    ShaderSource,
>+    SignalSemaphoreEXT,
>+    StencilFillPathCHROMIUM,
>+    StencilFillPathInstancedCHROMIUM,
>+    StencilFunc,
>+    StencilFuncSeparate,
>+    StencilMask,
>+    StencilMaskSeparate,
>+    StencilOp,
>+    StencilOpSeparate,
>+    StencilStrokePathCHROMIUM,
>+    StencilStrokePathInstancedCHROMIUM,
>+    StencilThenCoverFillPathCHROMIUM,
>+    StencilThenCoverFillPathInstancedCHROMIUM,
>+    StencilThenCoverStrokePathCHROMIUM,
>+    StencilThenCoverStrokePathInstancedCHROMIUM,
>+    TestFenceNV,
>+    TexCoordPointer,
>+    TexEnvf,
>+    TexEnvfv,
>+    TexEnvi,
>+    TexEnviv,
>+    TexEnvx,
>+    TexEnvxv,
>+    TexGenfOES,
>+    TexGenfvOES,
>+    TexGeniOES,
>+    TexGenivOES,
>+    TexGenxOES,
>+    TexGenxvOES,
>+    TexImage2D,
>+    TexImage2DRobustANGLE,
>+    TexImage3D,
>+    TexImage3DRobustANGLE,
>+    TexParameterIivOES,
>+    TexParameterIivRobustANGLE,
>+    TexParameterIuivOES,
>+    TexParameterIuivRobustANGLE,
>+    TexParameterf,
>+    TexParameterfv,
>+    TexParameterfvRobustANGLE,
>+    TexParameteri,
>+    TexParameteriv,
>+    TexParameterivRobustANGLE,
>+    TexParameterx,
>+    TexParameterxv,
>+    TexStorage1DEXT,
>+    TexStorage2D,
>+    TexStorage2DEXT,
>+    TexStorage2DMultisample,
>+    TexStorage2DMultisampleANGLE,
>+    TexStorage3D,
>+    TexStorage3DEXT,
>+    TexStorage3DMultisampleOES,
>+    TexStorageMem2DEXT,
>+    TexStorageMem2DMultisampleEXT,
>+    TexStorageMem3DEXT,
>+    TexStorageMem3DMultisampleEXT,
>+    TexSubImage2D,
>+    TexSubImage2DRobustANGLE,
>+    TexSubImage3D,
>+    TexSubImage3DRobustANGLE,
>+    TransformFeedbackVaryings,
>+    Translatef,
>+    Translatex,
>+    Uniform1f,
>+    Uniform1fv,
>+    Uniform1i,
>+    Uniform1iv,
>+    Uniform1ui,
>+    Uniform1uiv,
>+    Uniform2f,
>+    Uniform2fv,
>+    Uniform2i,
>+    Uniform2iv,
>+    Uniform2ui,
>+    Uniform2uiv,
>+    Uniform3f,
>+    Uniform3fv,
>+    Uniform3i,
>+    Uniform3iv,
>+    Uniform3ui,
>+    Uniform3uiv,
>+    Uniform4f,
>+    Uniform4fv,
>+    Uniform4i,
>+    Uniform4iv,
>+    Uniform4ui,
>+    Uniform4uiv,
>+    UniformBlockBinding,
>+    UniformMatrix2fv,
>+    UniformMatrix2x3fv,
>+    UniformMatrix2x4fv,
>+    UniformMatrix3fv,
>+    UniformMatrix3x2fv,
>+    UniformMatrix3x4fv,
>+    UniformMatrix4fv,
>+    UniformMatrix4x2fv,
>+    UniformMatrix4x3fv,
>+    UnmapBuffer,
>+    UnmapBufferOES,
>+    UseProgram,
>+    UseProgramStages,
>+    ValidateProgram,
>+    ValidateProgramPipeline,
>+    VertexAttrib1f,
>+    VertexAttrib1fv,
>+    VertexAttrib2f,
>+    VertexAttrib2fv,
>+    VertexAttrib3f,
>+    VertexAttrib3fv,
>+    VertexAttrib4f,
>+    VertexAttrib4fv,
>+    VertexAttribBinding,
>+    VertexAttribDivisor,
>+    VertexAttribDivisorANGLE,
>+    VertexAttribDivisorEXT,
>+    VertexAttribFormat,
>+    VertexAttribI4i,
>+    VertexAttribI4iv,
>+    VertexAttribI4ui,
>+    VertexAttribI4uiv,
>+    VertexAttribIFormat,
>+    VertexAttribIPointer,
>+    VertexAttribPointer,
>+    VertexBindingDivisor,
>+    VertexPointer,
>+    Viewport,
>+    WaitSemaphoreEXT,
>+    WaitSync,
>+    WeightPointerOES
>+};
>+}  // namespace gl
>+#endif  // LIBGLESV2_ENTRY_POINTS_ENUM_AUTOGEN_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libGLESv2/entry_points_gles_1_0_autogen.cpp b/Source/ThirdParty/ANGLE/src/libGLESv2/entry_points_gles_1_0_autogen.cpp
>new file mode 100644
>index 00000000000..3c35af91134
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libGLESv2/entry_points_gles_1_0_autogen.cpp
>@@ -0,0 +1,1428 @@
>+// GENERATED FILE - DO NOT EDIT.
>+// Generated by generate_entry_points.py using data from gl.xml.
>+//
>+// Copyright 2019 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// entry_points_gles_1_0_autogen.cpp:
>+//   Defines the GLES 1.0 entry points.
>+
>+#include "libGLESv2/entry_points_gles_1_0_autogen.h"
>+
>+#include "libANGLE/Context.h"
>+#include "libANGLE/Context.inl.h"
>+#include "libANGLE/validationES1.h"
>+#include "libGLESv2/entry_points_utils.h"
>+#include "libGLESv2/global_state.h"
>+
>+namespace gl
>+{
>+void GL_APIENTRY AlphaFunc(GLenum func, GLfloat ref)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum func = 0x%X, GLfloat ref = %f)", func, ref);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        AlphaTestFunc funcPacked = FromGLenum<AlphaTestFunc>(func);
>+        if (context->skipValidation() || ValidateAlphaFunc(context, funcPacked, ref))
>+        {
>+            context->alphaFunc(funcPacked, ref);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY AlphaFuncx(GLenum func, GLfixed ref)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum func = 0x%X, GLfixed ref = 0x%X)", func, ref);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        AlphaTestFunc funcPacked = FromGLenum<AlphaTestFunc>(func);
>+        if (context->skipValidation() || ValidateAlphaFuncx(context, funcPacked, ref))
>+        {
>+            context->alphaFuncx(funcPacked, ref);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY ClearColorx(GLfixed red, GLfixed green, GLfixed blue, GLfixed alpha)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLfixed red = 0x%X, GLfixed green = 0x%X, GLfixed blue = 0x%X, GLfixed alpha = 0x%X)",
>+          red, green, blue, alpha);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        if (context->skipValidation() || ValidateClearColorx(context, red, green, blue, alpha))
>+        {
>+            context->clearColorx(red, green, blue, alpha);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY ClearDepthx(GLfixed depth)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLfixed depth = 0x%X)", depth);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        if (context->skipValidation() || ValidateClearDepthx(context, depth))
>+        {
>+            context->clearDepthx(depth);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY ClientActiveTexture(GLenum texture)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum texture = 0x%X)", texture);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        if (context->skipValidation() || ValidateClientActiveTexture(context, texture))
>+        {
>+            context->clientActiveTexture(texture);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY ClipPlanef(GLenum p, const GLfloat *eqn)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum p = 0x%X, const GLfloat *eqn = 0x%016" PRIxPTR ")", p, (uintptr_t)eqn);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        if (context->skipValidation() || ValidateClipPlanef(context, p, eqn))
>+        {
>+            context->clipPlanef(p, eqn);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY ClipPlanex(GLenum plane, const GLfixed *equation)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum plane = 0x%X, const GLfixed *equation = 0x%016" PRIxPTR ")", plane,
>+          (uintptr_t)equation);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        if (context->skipValidation() || ValidateClipPlanex(context, plane, equation))
>+        {
>+            context->clipPlanex(plane, equation);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY Color4f(GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLfloat red = %f, GLfloat green = %f, GLfloat blue = %f, GLfloat alpha = %f)", red,
>+          green, blue, alpha);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        if (context->skipValidation() || ValidateColor4f(context, red, green, blue, alpha))
>+        {
>+            context->color4f(red, green, blue, alpha);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY Color4ub(GLubyte red, GLubyte green, GLubyte blue, GLubyte alpha)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLubyte red = %d, GLubyte green = %d, GLubyte blue = %d, GLubyte alpha = %d)", red,
>+          green, blue, alpha);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        if (context->skipValidation() || ValidateColor4ub(context, red, green, blue, alpha))
>+        {
>+            context->color4ub(red, green, blue, alpha);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY Color4x(GLfixed red, GLfixed green, GLfixed blue, GLfixed alpha)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLfixed red = 0x%X, GLfixed green = 0x%X, GLfixed blue = 0x%X, GLfixed alpha = 0x%X)",
>+          red, green, blue, alpha);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        if (context->skipValidation() || ValidateColor4x(context, red, green, blue, alpha))
>+        {
>+            context->color4x(red, green, blue, alpha);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY ColorPointer(GLint size, GLenum type, GLsizei stride, const void *pointer)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLint size = %d, GLenum type = 0x%X, GLsizei stride = %d, const void *pointer = "
>+        "0x%016" PRIxPTR ")",
>+        size, type, stride, (uintptr_t)pointer);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        VertexAttribType typePacked = FromGLenum<VertexAttribType>(type);
>+        if (context->skipValidation() ||
>+            ValidateColorPointer(context, size, typePacked, stride, pointer))
>+        {
>+            context->colorPointer(size, typePacked, stride, pointer);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY DepthRangex(GLfixed n, GLfixed f)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLfixed n = 0x%X, GLfixed f = 0x%X)", n, f);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        if (context->skipValidation() || ValidateDepthRangex(context, n, f))
>+        {
>+            context->depthRangex(n, f);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY DisableClientState(GLenum array)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum array = 0x%X)", array);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        ClientVertexArrayType arrayPacked = FromGLenum<ClientVertexArrayType>(array);
>+        if (context->skipValidation() || ValidateDisableClientState(context, arrayPacked))
>+        {
>+            context->disableClientState(arrayPacked);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY EnableClientState(GLenum array)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum array = 0x%X)", array);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        ClientVertexArrayType arrayPacked = FromGLenum<ClientVertexArrayType>(array);
>+        if (context->skipValidation() || ValidateEnableClientState(context, arrayPacked))
>+        {
>+            context->enableClientState(arrayPacked);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY Fogf(GLenum pname, GLfloat param)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum pname = 0x%X, GLfloat param = %f)", pname, param);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        if (context->skipValidation() || ValidateFogf(context, pname, param))
>+        {
>+            context->fogf(pname, param);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY Fogfv(GLenum pname, const GLfloat *params)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum pname = 0x%X, const GLfloat *params = 0x%016" PRIxPTR ")", pname,
>+          (uintptr_t)params);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        if (context->skipValidation() || ValidateFogfv(context, pname, params))
>+        {
>+            context->fogfv(pname, params);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY Fogx(GLenum pname, GLfixed param)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum pname = 0x%X, GLfixed param = 0x%X)", pname, param);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        if (context->skipValidation() || ValidateFogx(context, pname, param))
>+        {
>+            context->fogx(pname, param);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY Fogxv(GLenum pname, const GLfixed *param)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum pname = 0x%X, const GLfixed *param = 0x%016" PRIxPTR ")", pname,
>+          (uintptr_t)param);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        if (context->skipValidation() || ValidateFogxv(context, pname, param))
>+        {
>+            context->fogxv(pname, param);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY Frustumf(GLfloat l, GLfloat r, GLfloat b, GLfloat t, GLfloat n, GLfloat f)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLfloat l = %f, GLfloat r = %f, GLfloat b = %f, GLfloat t = %f, GLfloat n = %f, GLfloat "
>+        "f = %f)",
>+        l, r, b, t, n, f);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        if (context->skipValidation() || ValidateFrustumf(context, l, r, b, t, n, f))
>+        {
>+            context->frustumf(l, r, b, t, n, f);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY Frustumx(GLfixed l, GLfixed r, GLfixed b, GLfixed t, GLfixed n, GLfixed f)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLfixed l = 0x%X, GLfixed r = 0x%X, GLfixed b = 0x%X, GLfixed t = 0x%X, GLfixed n = "
>+        "0x%X, GLfixed f = 0x%X)",
>+        l, r, b, t, n, f);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        if (context->skipValidation() || ValidateFrustumx(context, l, r, b, t, n, f))
>+        {
>+            context->frustumx(l, r, b, t, n, f);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY GetClipPlanef(GLenum plane, GLfloat *equation)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum plane = 0x%X, GLfloat *equation = 0x%016" PRIxPTR ")", plane,
>+          (uintptr_t)equation);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        if (context->skipValidation() || ValidateGetClipPlanef(context, plane, equation))
>+        {
>+            context->getClipPlanef(plane, equation);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY GetClipPlanex(GLenum plane, GLfixed *equation)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum plane = 0x%X, GLfixed *equation = 0x%016" PRIxPTR ")", plane,
>+          (uintptr_t)equation);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        if (context->skipValidation() || ValidateGetClipPlanex(context, plane, equation))
>+        {
>+            context->getClipPlanex(plane, equation);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY GetFixedv(GLenum pname, GLfixed *params)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum pname = 0x%X, GLfixed *params = 0x%016" PRIxPTR ")", pname, (uintptr_t)params);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        if (context->skipValidation() || ValidateGetFixedv(context, pname, params))
>+        {
>+            context->getFixedv(pname, params);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY GetLightfv(GLenum light, GLenum pname, GLfloat *params)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum light = 0x%X, GLenum pname = 0x%X, GLfloat *params = 0x%016" PRIxPTR ")", light,
>+          pname, (uintptr_t)params);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        LightParameter pnamePacked = FromGLenum<LightParameter>(pname);
>+        if (context->skipValidation() || ValidateGetLightfv(context, light, pnamePacked, params))
>+        {
>+            context->getLightfv(light, pnamePacked, params);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY GetLightxv(GLenum light, GLenum pname, GLfixed *params)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum light = 0x%X, GLenum pname = 0x%X, GLfixed *params = 0x%016" PRIxPTR ")", light,
>+          pname, (uintptr_t)params);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        LightParameter pnamePacked = FromGLenum<LightParameter>(pname);
>+        if (context->skipValidation() || ValidateGetLightxv(context, light, pnamePacked, params))
>+        {
>+            context->getLightxv(light, pnamePacked, params);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY GetMaterialfv(GLenum face, GLenum pname, GLfloat *params)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum face = 0x%X, GLenum pname = 0x%X, GLfloat *params = 0x%016" PRIxPTR ")", face,
>+          pname, (uintptr_t)params);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        MaterialParameter pnamePacked = FromGLenum<MaterialParameter>(pname);
>+        if (context->skipValidation() || ValidateGetMaterialfv(context, face, pnamePacked, params))
>+        {
>+            context->getMaterialfv(face, pnamePacked, params);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY GetMaterialxv(GLenum face, GLenum pname, GLfixed *params)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum face = 0x%X, GLenum pname = 0x%X, GLfixed *params = 0x%016" PRIxPTR ")", face,
>+          pname, (uintptr_t)params);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        MaterialParameter pnamePacked = FromGLenum<MaterialParameter>(pname);
>+        if (context->skipValidation() || ValidateGetMaterialxv(context, face, pnamePacked, params))
>+        {
>+            context->getMaterialxv(face, pnamePacked, params);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY GetPointerv(GLenum pname, void **params)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum pname = 0x%X, void **params = 0x%016" PRIxPTR ")", pname, (uintptr_t)params);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        if (context->skipValidation() || ValidateGetPointerv(context, pname, params))
>+        {
>+            context->getPointerv(pname, params);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY GetTexEnvfv(GLenum target, GLenum pname, GLfloat *params)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum target = 0x%X, GLenum pname = 0x%X, GLfloat *params = 0x%016" PRIxPTR ")",
>+          target, pname, (uintptr_t)params);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        TextureEnvTarget targetPacked   = FromGLenum<TextureEnvTarget>(target);
>+        TextureEnvParameter pnamePacked = FromGLenum<TextureEnvParameter>(pname);
>+        if (context->skipValidation() ||
>+            ValidateGetTexEnvfv(context, targetPacked, pnamePacked, params))
>+        {
>+            context->getTexEnvfv(targetPacked, pnamePacked, params);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY GetTexEnviv(GLenum target, GLenum pname, GLint *params)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum target = 0x%X, GLenum pname = 0x%X, GLint *params = 0x%016" PRIxPTR ")", target,
>+          pname, (uintptr_t)params);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        TextureEnvTarget targetPacked   = FromGLenum<TextureEnvTarget>(target);
>+        TextureEnvParameter pnamePacked = FromGLenum<TextureEnvParameter>(pname);
>+        if (context->skipValidation() ||
>+            ValidateGetTexEnviv(context, targetPacked, pnamePacked, params))
>+        {
>+            context->getTexEnviv(targetPacked, pnamePacked, params);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY GetTexEnvxv(GLenum target, GLenum pname, GLfixed *params)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum target = 0x%X, GLenum pname = 0x%X, GLfixed *params = 0x%016" PRIxPTR ")",
>+          target, pname, (uintptr_t)params);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        TextureEnvTarget targetPacked   = FromGLenum<TextureEnvTarget>(target);
>+        TextureEnvParameter pnamePacked = FromGLenum<TextureEnvParameter>(pname);
>+        if (context->skipValidation() ||
>+            ValidateGetTexEnvxv(context, targetPacked, pnamePacked, params))
>+        {
>+            context->getTexEnvxv(targetPacked, pnamePacked, params);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY GetTexParameterxv(GLenum target, GLenum pname, GLfixed *params)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum target = 0x%X, GLenum pname = 0x%X, GLfixed *params = 0x%016" PRIxPTR ")",
>+          target, pname, (uintptr_t)params);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        TextureType targetPacked = FromGLenum<TextureType>(target);
>+        if (context->skipValidation() ||
>+            ValidateGetTexParameterxv(context, targetPacked, pname, params))
>+        {
>+            context->getTexParameterxv(targetPacked, pname, params);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY LightModelf(GLenum pname, GLfloat param)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum pname = 0x%X, GLfloat param = %f)", pname, param);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        if (context->skipValidation() || ValidateLightModelf(context, pname, param))
>+        {
>+            context->lightModelf(pname, param);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY LightModelfv(GLenum pname, const GLfloat *params)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum pname = 0x%X, const GLfloat *params = 0x%016" PRIxPTR ")", pname,
>+          (uintptr_t)params);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        if (context->skipValidation() || ValidateLightModelfv(context, pname, params))
>+        {
>+            context->lightModelfv(pname, params);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY LightModelx(GLenum pname, GLfixed param)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum pname = 0x%X, GLfixed param = 0x%X)", pname, param);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        if (context->skipValidation() || ValidateLightModelx(context, pname, param))
>+        {
>+            context->lightModelx(pname, param);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY LightModelxv(GLenum pname, const GLfixed *param)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum pname = 0x%X, const GLfixed *param = 0x%016" PRIxPTR ")", pname,
>+          (uintptr_t)param);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        if (context->skipValidation() || ValidateLightModelxv(context, pname, param))
>+        {
>+            context->lightModelxv(pname, param);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY Lightf(GLenum light, GLenum pname, GLfloat param)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum light = 0x%X, GLenum pname = 0x%X, GLfloat param = %f)", light, pname, param);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        LightParameter pnamePacked = FromGLenum<LightParameter>(pname);
>+        if (context->skipValidation() || ValidateLightf(context, light, pnamePacked, param))
>+        {
>+            context->lightf(light, pnamePacked, param);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY Lightfv(GLenum light, GLenum pname, const GLfloat *params)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum light = 0x%X, GLenum pname = 0x%X, const GLfloat *params = 0x%016" PRIxPTR ")",
>+          light, pname, (uintptr_t)params);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        LightParameter pnamePacked = FromGLenum<LightParameter>(pname);
>+        if (context->skipValidation() || ValidateLightfv(context, light, pnamePacked, params))
>+        {
>+            context->lightfv(light, pnamePacked, params);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY Lightx(GLenum light, GLenum pname, GLfixed param)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum light = 0x%X, GLenum pname = 0x%X, GLfixed param = 0x%X)", light, pname, param);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        LightParameter pnamePacked = FromGLenum<LightParameter>(pname);
>+        if (context->skipValidation() || ValidateLightx(context, light, pnamePacked, param))
>+        {
>+            context->lightx(light, pnamePacked, param);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY Lightxv(GLenum light, GLenum pname, const GLfixed *params)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum light = 0x%X, GLenum pname = 0x%X, const GLfixed *params = 0x%016" PRIxPTR ")",
>+          light, pname, (uintptr_t)params);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        LightParameter pnamePacked = FromGLenum<LightParameter>(pname);
>+        if (context->skipValidation() || ValidateLightxv(context, light, pnamePacked, params))
>+        {
>+            context->lightxv(light, pnamePacked, params);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY LineWidthx(GLfixed width)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLfixed width = 0x%X)", width);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        if (context->skipValidation() || ValidateLineWidthx(context, width))
>+        {
>+            context->lineWidthx(width);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY LoadIdentity()
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("()");
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        if (context->skipValidation() || ValidateLoadIdentity(context))
>+        {
>+            context->loadIdentity();
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY LoadMatrixf(const GLfloat *m)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(const GLfloat *m = 0x%016" PRIxPTR ")", (uintptr_t)m);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        if (context->skipValidation() || ValidateLoadMatrixf(context, m))
>+        {
>+            context->loadMatrixf(m);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY LoadMatrixx(const GLfixed *m)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(const GLfixed *m = 0x%016" PRIxPTR ")", (uintptr_t)m);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        if (context->skipValidation() || ValidateLoadMatrixx(context, m))
>+        {
>+            context->loadMatrixx(m);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY LogicOp(GLenum opcode)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum opcode = 0x%X)", opcode);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        LogicalOperation opcodePacked = FromGLenum<LogicalOperation>(opcode);
>+        if (context->skipValidation() || ValidateLogicOp(context, opcodePacked))
>+        {
>+            context->logicOp(opcodePacked);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY Materialf(GLenum face, GLenum pname, GLfloat param)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum face = 0x%X, GLenum pname = 0x%X, GLfloat param = %f)", face, pname, param);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        MaterialParameter pnamePacked = FromGLenum<MaterialParameter>(pname);
>+        if (context->skipValidation() || ValidateMaterialf(context, face, pnamePacked, param))
>+        {
>+            context->materialf(face, pnamePacked, param);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY Materialfv(GLenum face, GLenum pname, const GLfloat *params)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum face = 0x%X, GLenum pname = 0x%X, const GLfloat *params = 0x%016" PRIxPTR ")",
>+          face, pname, (uintptr_t)params);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        MaterialParameter pnamePacked = FromGLenum<MaterialParameter>(pname);
>+        if (context->skipValidation() || ValidateMaterialfv(context, face, pnamePacked, params))
>+        {
>+            context->materialfv(face, pnamePacked, params);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY Materialx(GLenum face, GLenum pname, GLfixed param)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum face = 0x%X, GLenum pname = 0x%X, GLfixed param = 0x%X)", face, pname, param);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        MaterialParameter pnamePacked = FromGLenum<MaterialParameter>(pname);
>+        if (context->skipValidation() || ValidateMaterialx(context, face, pnamePacked, param))
>+        {
>+            context->materialx(face, pnamePacked, param);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY Materialxv(GLenum face, GLenum pname, const GLfixed *param)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum face = 0x%X, GLenum pname = 0x%X, const GLfixed *param = 0x%016" PRIxPTR ")",
>+          face, pname, (uintptr_t)param);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        MaterialParameter pnamePacked = FromGLenum<MaterialParameter>(pname);
>+        if (context->skipValidation() || ValidateMaterialxv(context, face, pnamePacked, param))
>+        {
>+            context->materialxv(face, pnamePacked, param);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY MatrixMode(GLenum mode)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum mode = 0x%X)", mode);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        MatrixType modePacked = FromGLenum<MatrixType>(mode);
>+        if (context->skipValidation() || ValidateMatrixMode(context, modePacked))
>+        {
>+            context->matrixMode(modePacked);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY MultMatrixf(const GLfloat *m)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(const GLfloat *m = 0x%016" PRIxPTR ")", (uintptr_t)m);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        if (context->skipValidation() || ValidateMultMatrixf(context, m))
>+        {
>+            context->multMatrixf(m);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY MultMatrixx(const GLfixed *m)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(const GLfixed *m = 0x%016" PRIxPTR ")", (uintptr_t)m);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        if (context->skipValidation() || ValidateMultMatrixx(context, m))
>+        {
>+            context->multMatrixx(m);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY MultiTexCoord4f(GLenum target, GLfloat s, GLfloat t, GLfloat r, GLfloat q)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum target = 0x%X, GLfloat s = %f, GLfloat t = %f, GLfloat r = %f, GLfloat q = %f)",
>+          target, s, t, r, q);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        if (context->skipValidation() || ValidateMultiTexCoord4f(context, target, s, t, r, q))
>+        {
>+            context->multiTexCoord4f(target, s, t, r, q);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY MultiTexCoord4x(GLenum texture, GLfixed s, GLfixed t, GLfixed r, GLfixed q)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLenum texture = 0x%X, GLfixed s = 0x%X, GLfixed t = 0x%X, GLfixed r = 0x%X, GLfixed q = "
>+        "0x%X)",
>+        texture, s, t, r, q);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        if (context->skipValidation() || ValidateMultiTexCoord4x(context, texture, s, t, r, q))
>+        {
>+            context->multiTexCoord4x(texture, s, t, r, q);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY Normal3f(GLfloat nx, GLfloat ny, GLfloat nz)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLfloat nx = %f, GLfloat ny = %f, GLfloat nz = %f)", nx, ny, nz);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        if (context->skipValidation() || ValidateNormal3f(context, nx, ny, nz))
>+        {
>+            context->normal3f(nx, ny, nz);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY Normal3x(GLfixed nx, GLfixed ny, GLfixed nz)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLfixed nx = 0x%X, GLfixed ny = 0x%X, GLfixed nz = 0x%X)", nx, ny, nz);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        if (context->skipValidation() || ValidateNormal3x(context, nx, ny, nz))
>+        {
>+            context->normal3x(nx, ny, nz);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY NormalPointer(GLenum type, GLsizei stride, const void *pointer)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum type = 0x%X, GLsizei stride = %d, const void *pointer = 0x%016" PRIxPTR ")",
>+          type, stride, (uintptr_t)pointer);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        VertexAttribType typePacked = FromGLenum<VertexAttribType>(type);
>+        if (context->skipValidation() ||
>+            ValidateNormalPointer(context, typePacked, stride, pointer))
>+        {
>+            context->normalPointer(typePacked, stride, pointer);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY Orthof(GLfloat l, GLfloat r, GLfloat b, GLfloat t, GLfloat n, GLfloat f)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLfloat l = %f, GLfloat r = %f, GLfloat b = %f, GLfloat t = %f, GLfloat n = %f, GLfloat "
>+        "f = %f)",
>+        l, r, b, t, n, f);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        if (context->skipValidation() || ValidateOrthof(context, l, r, b, t, n, f))
>+        {
>+            context->orthof(l, r, b, t, n, f);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY Orthox(GLfixed l, GLfixed r, GLfixed b, GLfixed t, GLfixed n, GLfixed f)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLfixed l = 0x%X, GLfixed r = 0x%X, GLfixed b = 0x%X, GLfixed t = 0x%X, GLfixed n = "
>+        "0x%X, GLfixed f = 0x%X)",
>+        l, r, b, t, n, f);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        if (context->skipValidation() || ValidateOrthox(context, l, r, b, t, n, f))
>+        {
>+            context->orthox(l, r, b, t, n, f);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY PointParameterf(GLenum pname, GLfloat param)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum pname = 0x%X, GLfloat param = %f)", pname, param);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        PointParameter pnamePacked = FromGLenum<PointParameter>(pname);
>+        if (context->skipValidation() || ValidatePointParameterf(context, pnamePacked, param))
>+        {
>+            context->pointParameterf(pnamePacked, param);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY PointParameterfv(GLenum pname, const GLfloat *params)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum pname = 0x%X, const GLfloat *params = 0x%016" PRIxPTR ")", pname,
>+          (uintptr_t)params);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        PointParameter pnamePacked = FromGLenum<PointParameter>(pname);
>+        if (context->skipValidation() || ValidatePointParameterfv(context, pnamePacked, params))
>+        {
>+            context->pointParameterfv(pnamePacked, params);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY PointParameterx(GLenum pname, GLfixed param)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum pname = 0x%X, GLfixed param = 0x%X)", pname, param);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        PointParameter pnamePacked = FromGLenum<PointParameter>(pname);
>+        if (context->skipValidation() || ValidatePointParameterx(context, pnamePacked, param))
>+        {
>+            context->pointParameterx(pnamePacked, param);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY PointParameterxv(GLenum pname, const GLfixed *params)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum pname = 0x%X, const GLfixed *params = 0x%016" PRIxPTR ")", pname,
>+          (uintptr_t)params);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        PointParameter pnamePacked = FromGLenum<PointParameter>(pname);
>+        if (context->skipValidation() || ValidatePointParameterxv(context, pnamePacked, params))
>+        {
>+            context->pointParameterxv(pnamePacked, params);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY PointSize(GLfloat size)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLfloat size = %f)", size);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        if (context->skipValidation() || ValidatePointSize(context, size))
>+        {
>+            context->pointSize(size);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY PointSizex(GLfixed size)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLfixed size = 0x%X)", size);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        if (context->skipValidation() || ValidatePointSizex(context, size))
>+        {
>+            context->pointSizex(size);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY PolygonOffsetx(GLfixed factor, GLfixed units)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLfixed factor = 0x%X, GLfixed units = 0x%X)", factor, units);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        if (context->skipValidation() || ValidatePolygonOffsetx(context, factor, units))
>+        {
>+            context->polygonOffsetx(factor, units);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY PopMatrix()
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("()");
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        if (context->skipValidation() || ValidatePopMatrix(context))
>+        {
>+            context->popMatrix();
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY PushMatrix()
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("()");
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        if (context->skipValidation() || ValidatePushMatrix(context))
>+        {
>+            context->pushMatrix();
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY Rotatef(GLfloat angle, GLfloat x, GLfloat y, GLfloat z)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLfloat angle = %f, GLfloat x = %f, GLfloat y = %f, GLfloat z = %f)", angle, x, y, z);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        if (context->skipValidation() || ValidateRotatef(context, angle, x, y, z))
>+        {
>+            context->rotatef(angle, x, y, z);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY Rotatex(GLfixed angle, GLfixed x, GLfixed y, GLfixed z)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLfixed angle = 0x%X, GLfixed x = 0x%X, GLfixed y = 0x%X, GLfixed z = 0x%X)", angle, x,
>+          y, z);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        if (context->skipValidation() || ValidateRotatex(context, angle, x, y, z))
>+        {
>+            context->rotatex(angle, x, y, z);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY SampleCoveragex(GLclampx value, GLboolean invert)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLclampx value = 0x%X, GLboolean invert = %u)", value, invert);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        if (context->skipValidation() || ValidateSampleCoveragex(context, value, invert))
>+        {
>+            context->sampleCoveragex(value, invert);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY Scalef(GLfloat x, GLfloat y, GLfloat z)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLfloat x = %f, GLfloat y = %f, GLfloat z = %f)", x, y, z);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        if (context->skipValidation() || ValidateScalef(context, x, y, z))
>+        {
>+            context->scalef(x, y, z);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY Scalex(GLfixed x, GLfixed y, GLfixed z)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLfixed x = 0x%X, GLfixed y = 0x%X, GLfixed z = 0x%X)", x, y, z);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        if (context->skipValidation() || ValidateScalex(context, x, y, z))
>+        {
>+            context->scalex(x, y, z);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY ShadeModel(GLenum mode)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum mode = 0x%X)", mode);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        ShadingModel modePacked = FromGLenum<ShadingModel>(mode);
>+        if (context->skipValidation() || ValidateShadeModel(context, modePacked))
>+        {
>+            context->shadeModel(modePacked);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY TexCoordPointer(GLint size, GLenum type, GLsizei stride, const void *pointer)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLint size = %d, GLenum type = 0x%X, GLsizei stride = %d, const void *pointer = "
>+        "0x%016" PRIxPTR ")",
>+        size, type, stride, (uintptr_t)pointer);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        VertexAttribType typePacked = FromGLenum<VertexAttribType>(type);
>+        if (context->skipValidation() ||
>+            ValidateTexCoordPointer(context, size, typePacked, stride, pointer))
>+        {
>+            context->texCoordPointer(size, typePacked, stride, pointer);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY TexEnvf(GLenum target, GLenum pname, GLfloat param)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum target = 0x%X, GLenum pname = 0x%X, GLfloat param = %f)", target, pname, param);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        TextureEnvTarget targetPacked   = FromGLenum<TextureEnvTarget>(target);
>+        TextureEnvParameter pnamePacked = FromGLenum<TextureEnvParameter>(pname);
>+        if (context->skipValidation() || ValidateTexEnvf(context, targetPacked, pnamePacked, param))
>+        {
>+            context->texEnvf(targetPacked, pnamePacked, param);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY TexEnvfv(GLenum target, GLenum pname, const GLfloat *params)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum target = 0x%X, GLenum pname = 0x%X, const GLfloat *params = 0x%016" PRIxPTR ")",
>+          target, pname, (uintptr_t)params);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        TextureEnvTarget targetPacked   = FromGLenum<TextureEnvTarget>(target);
>+        TextureEnvParameter pnamePacked = FromGLenum<TextureEnvParameter>(pname);
>+        if (context->skipValidation() ||
>+            ValidateTexEnvfv(context, targetPacked, pnamePacked, params))
>+        {
>+            context->texEnvfv(targetPacked, pnamePacked, params);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY TexEnvi(GLenum target, GLenum pname, GLint param)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum target = 0x%X, GLenum pname = 0x%X, GLint param = %d)", target, pname, param);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        TextureEnvTarget targetPacked   = FromGLenum<TextureEnvTarget>(target);
>+        TextureEnvParameter pnamePacked = FromGLenum<TextureEnvParameter>(pname);
>+        if (context->skipValidation() || ValidateTexEnvi(context, targetPacked, pnamePacked, param))
>+        {
>+            context->texEnvi(targetPacked, pnamePacked, param);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY TexEnviv(GLenum target, GLenum pname, const GLint *params)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum target = 0x%X, GLenum pname = 0x%X, const GLint *params = 0x%016" PRIxPTR ")",
>+          target, pname, (uintptr_t)params);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        TextureEnvTarget targetPacked   = FromGLenum<TextureEnvTarget>(target);
>+        TextureEnvParameter pnamePacked = FromGLenum<TextureEnvParameter>(pname);
>+        if (context->skipValidation() ||
>+            ValidateTexEnviv(context, targetPacked, pnamePacked, params))
>+        {
>+            context->texEnviv(targetPacked, pnamePacked, params);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY TexEnvx(GLenum target, GLenum pname, GLfixed param)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum target = 0x%X, GLenum pname = 0x%X, GLfixed param = 0x%X)", target, pname,
>+          param);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        TextureEnvTarget targetPacked   = FromGLenum<TextureEnvTarget>(target);
>+        TextureEnvParameter pnamePacked = FromGLenum<TextureEnvParameter>(pname);
>+        if (context->skipValidation() || ValidateTexEnvx(context, targetPacked, pnamePacked, param))
>+        {
>+            context->texEnvx(targetPacked, pnamePacked, param);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY TexEnvxv(GLenum target, GLenum pname, const GLfixed *params)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum target = 0x%X, GLenum pname = 0x%X, const GLfixed *params = 0x%016" PRIxPTR ")",
>+          target, pname, (uintptr_t)params);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        TextureEnvTarget targetPacked   = FromGLenum<TextureEnvTarget>(target);
>+        TextureEnvParameter pnamePacked = FromGLenum<TextureEnvParameter>(pname);
>+        if (context->skipValidation() ||
>+            ValidateTexEnvxv(context, targetPacked, pnamePacked, params))
>+        {
>+            context->texEnvxv(targetPacked, pnamePacked, params);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY TexParameterx(GLenum target, GLenum pname, GLfixed param)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum target = 0x%X, GLenum pname = 0x%X, GLfixed param = 0x%X)", target, pname,
>+          param);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        TextureType targetPacked = FromGLenum<TextureType>(target);
>+        if (context->skipValidation() || ValidateTexParameterx(context, targetPacked, pname, param))
>+        {
>+            context->texParameterx(targetPacked, pname, param);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY TexParameterxv(GLenum target, GLenum pname, const GLfixed *params)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum target = 0x%X, GLenum pname = 0x%X, const GLfixed *params = 0x%016" PRIxPTR ")",
>+          target, pname, (uintptr_t)params);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        TextureType targetPacked = FromGLenum<TextureType>(target);
>+        if (context->skipValidation() ||
>+            ValidateTexParameterxv(context, targetPacked, pname, params))
>+        {
>+            context->texParameterxv(targetPacked, pname, params);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY Translatef(GLfloat x, GLfloat y, GLfloat z)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLfloat x = %f, GLfloat y = %f, GLfloat z = %f)", x, y, z);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        if (context->skipValidation() || ValidateTranslatef(context, x, y, z))
>+        {
>+            context->translatef(x, y, z);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY Translatex(GLfixed x, GLfixed y, GLfixed z)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLfixed x = 0x%X, GLfixed y = 0x%X, GLfixed z = 0x%X)", x, y, z);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        if (context->skipValidation() || ValidateTranslatex(context, x, y, z))
>+        {
>+            context->translatex(x, y, z);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY VertexPointer(GLint size, GLenum type, GLsizei stride, const void *pointer)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLint size = %d, GLenum type = 0x%X, GLsizei stride = %d, const void *pointer = "
>+        "0x%016" PRIxPTR ")",
>+        size, type, stride, (uintptr_t)pointer);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        VertexAttribType typePacked = FromGLenum<VertexAttribType>(type);
>+        if (context->skipValidation() ||
>+            ValidateVertexPointer(context, size, typePacked, stride, pointer))
>+        {
>+            context->vertexPointer(size, typePacked, stride, pointer);
>+        }
>+    }
>+}
>+}  // namespace gl
>diff --git a/Source/ThirdParty/ANGLE/src/libGLESv2/entry_points_gles_1_0_autogen.h b/Source/ThirdParty/ANGLE/src/libGLESv2/entry_points_gles_1_0_autogen.h
>new file mode 100644
>index 00000000000..ba098f51b97
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libGLESv2/entry_points_gles_1_0_autogen.h
>@@ -0,0 +1,122 @@
>+// GENERATED FILE - DO NOT EDIT.
>+// Generated by generate_entry_points.py using data from gl.xml.
>+//
>+// Copyright 2019 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// entry_points_gles_1_0_autogen.h:
>+//   Defines the GLES 1.0 entry points.
>+
>+#ifndef LIBGLESV2_ENTRY_POINTS_GLES_1_0_AUTOGEN_H_
>+#define LIBGLESV2_ENTRY_POINTS_GLES_1_0_AUTOGEN_H_
>+
>+#include <GLES/gl.h>
>+#include <export.h>
>+
>+namespace gl
>+{
>+ANGLE_EXPORT void GL_APIENTRY AlphaFunc(GLenum func, GLfloat ref);
>+ANGLE_EXPORT void GL_APIENTRY AlphaFuncx(GLenum func, GLfixed ref);
>+ANGLE_EXPORT void GL_APIENTRY ClearColorx(GLfixed red, GLfixed green, GLfixed blue, GLfixed alpha);
>+ANGLE_EXPORT void GL_APIENTRY ClearDepthx(GLfixed depth);
>+ANGLE_EXPORT void GL_APIENTRY ClientActiveTexture(GLenum texture);
>+ANGLE_EXPORT void GL_APIENTRY ClipPlanef(GLenum p, const GLfloat *eqn);
>+ANGLE_EXPORT void GL_APIENTRY ClipPlanex(GLenum plane, const GLfixed *equation);
>+ANGLE_EXPORT void GL_APIENTRY Color4f(GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha);
>+ANGLE_EXPORT void GL_APIENTRY Color4ub(GLubyte red, GLubyte green, GLubyte blue, GLubyte alpha);
>+ANGLE_EXPORT void GL_APIENTRY Color4x(GLfixed red, GLfixed green, GLfixed blue, GLfixed alpha);
>+ANGLE_EXPORT void GL_APIENTRY ColorPointer(GLint size,
>+                                           GLenum type,
>+                                           GLsizei stride,
>+                                           const void *pointer);
>+ANGLE_EXPORT void GL_APIENTRY DepthRangex(GLfixed n, GLfixed f);
>+ANGLE_EXPORT void GL_APIENTRY DisableClientState(GLenum array);
>+ANGLE_EXPORT void GL_APIENTRY EnableClientState(GLenum array);
>+ANGLE_EXPORT void GL_APIENTRY Fogf(GLenum pname, GLfloat param);
>+ANGLE_EXPORT void GL_APIENTRY Fogfv(GLenum pname, const GLfloat *params);
>+ANGLE_EXPORT void GL_APIENTRY Fogx(GLenum pname, GLfixed param);
>+ANGLE_EXPORT void GL_APIENTRY Fogxv(GLenum pname, const GLfixed *param);
>+ANGLE_EXPORT void GL_APIENTRY
>+Frustumf(GLfloat l, GLfloat r, GLfloat b, GLfloat t, GLfloat n, GLfloat f);
>+ANGLE_EXPORT void GL_APIENTRY
>+Frustumx(GLfixed l, GLfixed r, GLfixed b, GLfixed t, GLfixed n, GLfixed f);
>+ANGLE_EXPORT void GL_APIENTRY GetClipPlanef(GLenum plane, GLfloat *equation);
>+ANGLE_EXPORT void GL_APIENTRY GetClipPlanex(GLenum plane, GLfixed *equation);
>+ANGLE_EXPORT void GL_APIENTRY GetFixedv(GLenum pname, GLfixed *params);
>+ANGLE_EXPORT void GL_APIENTRY GetLightfv(GLenum light, GLenum pname, GLfloat *params);
>+ANGLE_EXPORT void GL_APIENTRY GetLightxv(GLenum light, GLenum pname, GLfixed *params);
>+ANGLE_EXPORT void GL_APIENTRY GetMaterialfv(GLenum face, GLenum pname, GLfloat *params);
>+ANGLE_EXPORT void GL_APIENTRY GetMaterialxv(GLenum face, GLenum pname, GLfixed *params);
>+ANGLE_EXPORT void GL_APIENTRY GetPointerv(GLenum pname, void **params);
>+ANGLE_EXPORT void GL_APIENTRY GetTexEnvfv(GLenum target, GLenum pname, GLfloat *params);
>+ANGLE_EXPORT void GL_APIENTRY GetTexEnviv(GLenum target, GLenum pname, GLint *params);
>+ANGLE_EXPORT void GL_APIENTRY GetTexEnvxv(GLenum target, GLenum pname, GLfixed *params);
>+ANGLE_EXPORT void GL_APIENTRY GetTexParameterxv(GLenum target, GLenum pname, GLfixed *params);
>+ANGLE_EXPORT void GL_APIENTRY LightModelf(GLenum pname, GLfloat param);
>+ANGLE_EXPORT void GL_APIENTRY LightModelfv(GLenum pname, const GLfloat *params);
>+ANGLE_EXPORT void GL_APIENTRY LightModelx(GLenum pname, GLfixed param);
>+ANGLE_EXPORT void GL_APIENTRY LightModelxv(GLenum pname, const GLfixed *param);
>+ANGLE_EXPORT void GL_APIENTRY Lightf(GLenum light, GLenum pname, GLfloat param);
>+ANGLE_EXPORT void GL_APIENTRY Lightfv(GLenum light, GLenum pname, const GLfloat *params);
>+ANGLE_EXPORT void GL_APIENTRY Lightx(GLenum light, GLenum pname, GLfixed param);
>+ANGLE_EXPORT void GL_APIENTRY Lightxv(GLenum light, GLenum pname, const GLfixed *params);
>+ANGLE_EXPORT void GL_APIENTRY LineWidthx(GLfixed width);
>+ANGLE_EXPORT void GL_APIENTRY LoadIdentity();
>+ANGLE_EXPORT void GL_APIENTRY LoadMatrixf(const GLfloat *m);
>+ANGLE_EXPORT void GL_APIENTRY LoadMatrixx(const GLfixed *m);
>+ANGLE_EXPORT void GL_APIENTRY LogicOp(GLenum opcode);
>+ANGLE_EXPORT void GL_APIENTRY Materialf(GLenum face, GLenum pname, GLfloat param);
>+ANGLE_EXPORT void GL_APIENTRY Materialfv(GLenum face, GLenum pname, const GLfloat *params);
>+ANGLE_EXPORT void GL_APIENTRY Materialx(GLenum face, GLenum pname, GLfixed param);
>+ANGLE_EXPORT void GL_APIENTRY Materialxv(GLenum face, GLenum pname, const GLfixed *param);
>+ANGLE_EXPORT void GL_APIENTRY MatrixMode(GLenum mode);
>+ANGLE_EXPORT void GL_APIENTRY MultMatrixf(const GLfloat *m);
>+ANGLE_EXPORT void GL_APIENTRY MultMatrixx(const GLfixed *m);
>+ANGLE_EXPORT void GL_APIENTRY
>+MultiTexCoord4f(GLenum target, GLfloat s, GLfloat t, GLfloat r, GLfloat q);
>+ANGLE_EXPORT void GL_APIENTRY
>+MultiTexCoord4x(GLenum texture, GLfixed s, GLfixed t, GLfixed r, GLfixed q);
>+ANGLE_EXPORT void GL_APIENTRY Normal3f(GLfloat nx, GLfloat ny, GLfloat nz);
>+ANGLE_EXPORT void GL_APIENTRY Normal3x(GLfixed nx, GLfixed ny, GLfixed nz);
>+ANGLE_EXPORT void GL_APIENTRY NormalPointer(GLenum type, GLsizei stride, const void *pointer);
>+ANGLE_EXPORT void GL_APIENTRY
>+Orthof(GLfloat l, GLfloat r, GLfloat b, GLfloat t, GLfloat n, GLfloat f);
>+ANGLE_EXPORT void GL_APIENTRY
>+Orthox(GLfixed l, GLfixed r, GLfixed b, GLfixed t, GLfixed n, GLfixed f);
>+ANGLE_EXPORT void GL_APIENTRY PointParameterf(GLenum pname, GLfloat param);
>+ANGLE_EXPORT void GL_APIENTRY PointParameterfv(GLenum pname, const GLfloat *params);
>+ANGLE_EXPORT void GL_APIENTRY PointParameterx(GLenum pname, GLfixed param);
>+ANGLE_EXPORT void GL_APIENTRY PointParameterxv(GLenum pname, const GLfixed *params);
>+ANGLE_EXPORT void GL_APIENTRY PointSize(GLfloat size);
>+ANGLE_EXPORT void GL_APIENTRY PointSizex(GLfixed size);
>+ANGLE_EXPORT void GL_APIENTRY PolygonOffsetx(GLfixed factor, GLfixed units);
>+ANGLE_EXPORT void GL_APIENTRY PopMatrix();
>+ANGLE_EXPORT void GL_APIENTRY PushMatrix();
>+ANGLE_EXPORT void GL_APIENTRY Rotatef(GLfloat angle, GLfloat x, GLfloat y, GLfloat z);
>+ANGLE_EXPORT void GL_APIENTRY Rotatex(GLfixed angle, GLfixed x, GLfixed y, GLfixed z);
>+ANGLE_EXPORT void GL_APIENTRY SampleCoveragex(GLclampx value, GLboolean invert);
>+ANGLE_EXPORT void GL_APIENTRY Scalef(GLfloat x, GLfloat y, GLfloat z);
>+ANGLE_EXPORT void GL_APIENTRY Scalex(GLfixed x, GLfixed y, GLfixed z);
>+ANGLE_EXPORT void GL_APIENTRY ShadeModel(GLenum mode);
>+ANGLE_EXPORT void GL_APIENTRY TexCoordPointer(GLint size,
>+                                              GLenum type,
>+                                              GLsizei stride,
>+                                              const void *pointer);
>+ANGLE_EXPORT void GL_APIENTRY TexEnvf(GLenum target, GLenum pname, GLfloat param);
>+ANGLE_EXPORT void GL_APIENTRY TexEnvfv(GLenum target, GLenum pname, const GLfloat *params);
>+ANGLE_EXPORT void GL_APIENTRY TexEnvi(GLenum target, GLenum pname, GLint param);
>+ANGLE_EXPORT void GL_APIENTRY TexEnviv(GLenum target, GLenum pname, const GLint *params);
>+ANGLE_EXPORT void GL_APIENTRY TexEnvx(GLenum target, GLenum pname, GLfixed param);
>+ANGLE_EXPORT void GL_APIENTRY TexEnvxv(GLenum target, GLenum pname, const GLfixed *params);
>+ANGLE_EXPORT void GL_APIENTRY TexParameterx(GLenum target, GLenum pname, GLfixed param);
>+ANGLE_EXPORT void GL_APIENTRY TexParameterxv(GLenum target, GLenum pname, const GLfixed *params);
>+ANGLE_EXPORT void GL_APIENTRY Translatef(GLfloat x, GLfloat y, GLfloat z);
>+ANGLE_EXPORT void GL_APIENTRY Translatex(GLfixed x, GLfixed y, GLfixed z);
>+ANGLE_EXPORT void GL_APIENTRY VertexPointer(GLint size,
>+                                            GLenum type,
>+                                            GLsizei stride,
>+                                            const void *pointer);
>+}  // namespace gl
>+
>+#endif  // LIBGLESV2_ENTRY_POINTS_GLES_1_0_AUTOGEN_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libGLESv2/entry_points_gles_2_0_autogen.cpp b/Source/ThirdParty/ANGLE/src/libGLESv2/entry_points_gles_2_0_autogen.cpp
>index ae0e9444065..a4439fd1e8e 100644
>--- a/Source/ThirdParty/ANGLE/src/libGLESv2/entry_points_gles_2_0_autogen.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libGLESv2/entry_points_gles_2_0_autogen.cpp
>@@ -1,28 +1,31 @@
> // GENERATED FILE - DO NOT EDIT.
> // Generated by generate_entry_points.py using data from gl.xml.
> //
>-// Copyright 2017 The ANGLE Project Authors. All rights reserved.
>+// Copyright 2019 The ANGLE Project Authors. All rights reserved.
> // Use of this source code is governed by a BSD-style license that can be
> // found in the LICENSE file.
> //
> // entry_points_gles_2_0_autogen.cpp:
> //   Defines the GLES 2.0 entry points.
> 
>+#include "libGLESv2/entry_points_gles_2_0_autogen.h"
>+
> #include "libANGLE/Context.h"
>+#include "libANGLE/Context.inl.h"
> #include "libANGLE/validationES2.h"
>+#include "libGLESv2/entry_points_utils.h"
> #include "libGLESv2/global_state.h"
> 
> namespace gl
> {
> void GL_APIENTRY ActiveTexture(GLenum texture)
> {
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>     EVENT("(GLenum texture = 0x%X)", texture);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::ActiveTexture>(texture);
>-
>         if (context->skipValidation() || ValidateActiveTexture(context, texture))
>         {
>             context->activeTexture(texture);
>@@ -32,13 +35,12 @@ void GL_APIENTRY ActiveTexture(GLenum texture)
> 
> void GL_APIENTRY AttachShader(GLuint program, GLuint shader)
> {
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>     EVENT("(GLuint program = %u, GLuint shader = %u)", program, shader);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::AttachShader>(program, shader);
>-
>         if (context->skipValidation() || ValidateAttachShader(context, program, shader))
>         {
>             context->attachShader(program, shader);
>@@ -48,14 +50,13 @@ void GL_APIENTRY AttachShader(GLuint program, GLuint shader)
> 
> void GL_APIENTRY BindAttribLocation(GLuint program, GLuint index, const GLchar *name)
> {
>-    EVENT("(GLuint program = %u, GLuint index = %u, const GLchar *name = 0x%0.8p)", program, index,
>-          name);
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint program = %u, GLuint index = %u, const GLchar *name = 0x%016" PRIxPTR ")",
>+          program, index, (uintptr_t)name);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::BindAttribLocation>(program, index, name);
>-
>         if (context->skipValidation() || ValidateBindAttribLocation(context, program, index, name))
>         {
>             context->bindAttribLocation(program, index, name);
>@@ -65,14 +66,13 @@ void GL_APIENTRY BindAttribLocation(GLuint program, GLuint index, const GLchar *
> 
> void GL_APIENTRY BindBuffer(GLenum target, GLuint buffer)
> {
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>     EVENT("(GLenum target = 0x%X, GLuint buffer = %u)", target, buffer);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>         BufferBinding targetPacked = FromGLenum<BufferBinding>(target);
>-        context->gatherParams<EntryPoint::BindBuffer>(targetPacked, buffer);
>-
>         if (context->skipValidation() || ValidateBindBuffer(context, targetPacked, buffer))
>         {
>             context->bindBuffer(targetPacked, buffer);
>@@ -82,13 +82,12 @@ void GL_APIENTRY BindBuffer(GLenum target, GLuint buffer)
> 
> void GL_APIENTRY BindFramebuffer(GLenum target, GLuint framebuffer)
> {
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>     EVENT("(GLenum target = 0x%X, GLuint framebuffer = %u)", target, framebuffer);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::BindFramebuffer>(target, framebuffer);
>-
>         if (context->skipValidation() || ValidateBindFramebuffer(context, target, framebuffer))
>         {
>             context->bindFramebuffer(target, framebuffer);
>@@ -98,13 +97,12 @@ void GL_APIENTRY BindFramebuffer(GLenum target, GLuint framebuffer)
> 
> void GL_APIENTRY BindRenderbuffer(GLenum target, GLuint renderbuffer)
> {
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>     EVENT("(GLenum target = 0x%X, GLuint renderbuffer = %u)", target, renderbuffer);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::BindRenderbuffer>(target, renderbuffer);
>-
>         if (context->skipValidation() || ValidateBindRenderbuffer(context, target, renderbuffer))
>         {
>             context->bindRenderbuffer(target, renderbuffer);
>@@ -114,30 +112,29 @@ void GL_APIENTRY BindRenderbuffer(GLenum target, GLuint renderbuffer)
> 
> void GL_APIENTRY BindTexture(GLenum target, GLuint texture)
> {
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>     EVENT("(GLenum target = 0x%X, GLuint texture = %u)", target, texture);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::BindTexture>(target, texture);
>-
>-        if (context->skipValidation() || ValidateBindTexture(context, target, texture))
>+        TextureType targetPacked = FromGLenum<TextureType>(target);
>+        if (context->skipValidation() || ValidateBindTexture(context, targetPacked, texture))
>         {
>-            context->bindTexture(target, texture);
>+            context->bindTexture(targetPacked, texture);
>         }
>     }
> }
> 
> void GL_APIENTRY BlendColor(GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha)
> {
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>     EVENT("(GLfloat red = %f, GLfloat green = %f, GLfloat blue = %f, GLfloat alpha = %f)", red,
>           green, blue, alpha);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::BlendColor>(red, green, blue, alpha);
>-
>         if (context->skipValidation() || ValidateBlendColor(context, red, green, blue, alpha))
>         {
>             context->blendColor(red, green, blue, alpha);
>@@ -147,13 +144,12 @@ void GL_APIENTRY BlendColor(GLfloat red, GLfloat green, GLfloat blue, GLfloat al
> 
> void GL_APIENTRY BlendEquation(GLenum mode)
> {
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>     EVENT("(GLenum mode = 0x%X)", mode);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::BlendEquation>(mode);
>-
>         if (context->skipValidation() || ValidateBlendEquation(context, mode))
>         {
>             context->blendEquation(mode);
>@@ -163,13 +159,12 @@ void GL_APIENTRY BlendEquation(GLenum mode)
> 
> void GL_APIENTRY BlendEquationSeparate(GLenum modeRGB, GLenum modeAlpha)
> {
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>     EVENT("(GLenum modeRGB = 0x%X, GLenum modeAlpha = 0x%X)", modeRGB, modeAlpha);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::BlendEquationSeparate>(modeRGB, modeAlpha);
>-
>         if (context->skipValidation() || ValidateBlendEquationSeparate(context, modeRGB, modeAlpha))
>         {
>             context->blendEquationSeparate(modeRGB, modeAlpha);
>@@ -179,13 +174,12 @@ void GL_APIENTRY BlendEquationSeparate(GLenum modeRGB, GLenum modeAlpha)
> 
> void GL_APIENTRY BlendFunc(GLenum sfactor, GLenum dfactor)
> {
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>     EVENT("(GLenum sfactor = 0x%X, GLenum dfactor = 0x%X)", sfactor, dfactor);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::BlendFunc>(sfactor, dfactor);
>-
>         if (context->skipValidation() || ValidateBlendFunc(context, sfactor, dfactor))
>         {
>             context->blendFunc(sfactor, dfactor);
>@@ -198,6 +192,7 @@ void GL_APIENTRY BlendFuncSeparate(GLenum sfactorRGB,
>                                    GLenum sfactorAlpha,
>                                    GLenum dfactorAlpha)
> {
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>     EVENT(
>         "(GLenum sfactorRGB = 0x%X, GLenum dfactorRGB = 0x%X, GLenum sfactorAlpha = 0x%X, GLenum "
>         "dfactorAlpha = 0x%X)",
>@@ -206,9 +201,6 @@ void GL_APIENTRY BlendFuncSeparate(GLenum sfactorRGB,
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::BlendFuncSeparate>(sfactorRGB, dfactorRGB, sfactorAlpha,
>-                                                             dfactorAlpha);
>-
>         if (context->skipValidation() ||
>             ValidateBlendFuncSeparate(context, sfactorRGB, dfactorRGB, sfactorAlpha, dfactorAlpha))
>         {
>@@ -219,18 +211,16 @@ void GL_APIENTRY BlendFuncSeparate(GLenum sfactorRGB,
> 
> void GL_APIENTRY BufferData(GLenum target, GLsizeiptr size, const void *data, GLenum usage)
> {
>-    EVENT(
>-        "(GLenum target = 0x%X, GLsizeiptr size = %d, const void *data = 0x%0.8p, GLenum usage = "
>-        "0x%X)",
>-        target, size, data, usage);
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum target = 0x%X, GLsizeiptr size = %llu, const void *data = 0x%016" PRIxPTR
>+          ", GLenum usage = 0x%X)",
>+          target, static_cast<unsigned long long>(size), (uintptr_t)data, usage);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>         BufferBinding targetPacked = FromGLenum<BufferBinding>(target);
>-        BufferUsage usagePacked = FromGLenum<BufferUsage>(usage);
>-        context->gatherParams<EntryPoint::BufferData>(targetPacked, size, data, usagePacked);
>-
>+        BufferUsage usagePacked    = FromGLenum<BufferUsage>(usage);
>         if (context->skipValidation() ||
>             ValidateBufferData(context, targetPacked, size, data, usagePacked))
>         {
>@@ -241,17 +231,17 @@ void GL_APIENTRY BufferData(GLenum target, GLsizeiptr size, const void *data, GL
> 
> void GL_APIENTRY BufferSubData(GLenum target, GLintptr offset, GLsizeiptr size, const void *data)
> {
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>     EVENT(
>-        "(GLenum target = 0x%X, GLintptr offset = %d, GLsizeiptr size = %d, const void *data = "
>-        "0x%0.8p)",
>-        target, offset, size, data);
>+        "(GLenum target = 0x%X, GLintptr offset = %llu, GLsizeiptr size = %llu, const void *data = "
>+        "0x%016" PRIxPTR ")",
>+        target, static_cast<unsigned long long>(offset), static_cast<unsigned long long>(size),
>+        (uintptr_t)data);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>         BufferBinding targetPacked = FromGLenum<BufferBinding>(target);
>-        context->gatherParams<EntryPoint::BufferSubData>(targetPacked, offset, size, data);
>-
>         if (context->skipValidation() ||
>             ValidateBufferSubData(context, targetPacked, offset, size, data))
>         {
>@@ -262,13 +252,12 @@ void GL_APIENTRY BufferSubData(GLenum target, GLintptr offset, GLsizeiptr size,
> 
> GLenum GL_APIENTRY CheckFramebufferStatus(GLenum target)
> {
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>     EVENT("(GLenum target = 0x%X)", target);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::CheckFramebufferStatus>(target);
>-
>         if (context->skipValidation() || ValidateCheckFramebufferStatus(context, target))
>         {
>             return context->checkFramebufferStatus(target);
>@@ -280,13 +269,12 @@ GLenum GL_APIENTRY CheckFramebufferStatus(GLenum target)
> 
> void GL_APIENTRY Clear(GLbitfield mask)
> {
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>     EVENT("(GLbitfield mask = 0x%X)", mask);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::Clear>(mask);
>-
>         if (context->skipValidation() || ValidateClear(context, mask))
>         {
>             context->clear(mask);
>@@ -296,14 +284,13 @@ void GL_APIENTRY Clear(GLbitfield mask)
> 
> void GL_APIENTRY ClearColor(GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha)
> {
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>     EVENT("(GLfloat red = %f, GLfloat green = %f, GLfloat blue = %f, GLfloat alpha = %f)", red,
>           green, blue, alpha);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::ClearColor>(red, green, blue, alpha);
>-
>         if (context->skipValidation() || ValidateClearColor(context, red, green, blue, alpha))
>         {
>             context->clearColor(red, green, blue, alpha);
>@@ -313,13 +300,12 @@ void GL_APIENTRY ClearColor(GLfloat red, GLfloat green, GLfloat blue, GLfloat al
> 
> void GL_APIENTRY ClearDepthf(GLfloat d)
> {
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>     EVENT("(GLfloat d = %f)", d);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::ClearDepthf>(d);
>-
>         if (context->skipValidation() || ValidateClearDepthf(context, d))
>         {
>             context->clearDepthf(d);
>@@ -329,13 +315,12 @@ void GL_APIENTRY ClearDepthf(GLfloat d)
> 
> void GL_APIENTRY ClearStencil(GLint s)
> {
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>     EVENT("(GLint s = %d)", s);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::ClearStencil>(s);
>-
>         if (context->skipValidation() || ValidateClearStencil(context, s))
>         {
>             context->clearStencil(s);
>@@ -345,14 +330,13 @@ void GL_APIENTRY ClearStencil(GLint s)
> 
> void GL_APIENTRY ColorMask(GLboolean red, GLboolean green, GLboolean blue, GLboolean alpha)
> {
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>     EVENT("(GLboolean red = %u, GLboolean green = %u, GLboolean blue = %u, GLboolean alpha = %u)",
>           red, green, blue, alpha);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::ColorMask>(red, green, blue, alpha);
>-
>         if (context->skipValidation() || ValidateColorMask(context, red, green, blue, alpha))
>         {
>             context->colorMask(red, green, blue, alpha);
>@@ -362,13 +346,12 @@ void GL_APIENTRY ColorMask(GLboolean red, GLboolean green, GLboolean blue, GLboo
> 
> void GL_APIENTRY CompileShader(GLuint shader)
> {
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>     EVENT("(GLuint shader = %u)", shader);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::CompileShader>(shader);
>-
>         if (context->skipValidation() || ValidateCompileShader(context, shader))
>         {
>             context->compileShader(shader);
>@@ -385,24 +368,23 @@ void GL_APIENTRY CompressedTexImage2D(GLenum target,
>                                       GLsizei imageSize,
>                                       const void *data)
> {
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>     EVENT(
>         "(GLenum target = 0x%X, GLint level = %d, GLenum internalformat = 0x%X, GLsizei width = "
>         "%d, GLsizei height = %d, GLint border = %d, GLsizei imageSize = %d, const void *data = "
>-        "0x%0.8p)",
>-        target, level, internalformat, width, height, border, imageSize, data);
>+        "0x%016" PRIxPTR ")",
>+        target, level, internalformat, width, height, border, imageSize, (uintptr_t)data);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::CompressedTexImage2D>(
>-            target, level, internalformat, width, height, border, imageSize, data);
>-
>+        TextureTarget targetPacked = FromGLenum<TextureTarget>(target);
>         if (context->skipValidation() ||
>-            ValidateCompressedTexImage2D(context, target, level, internalformat, width, height,
>-                                         border, imageSize, data))
>+            ValidateCompressedTexImage2D(context, targetPacked, level, internalformat, width,
>+                                         height, border, imageSize, data))
>         {
>-            context->compressedTexImage2D(target, level, internalformat, width, height, border,
>-                                          imageSize, data);
>+            context->compressedTexImage2D(targetPacked, level, internalformat, width, height,
>+                                          border, imageSize, data);
>         }
>     }
> }
>@@ -417,24 +399,23 @@ void GL_APIENTRY CompressedTexSubImage2D(GLenum target,
>                                          GLsizei imageSize,
>                                          const void *data)
> {
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>     EVENT(
>         "(GLenum target = 0x%X, GLint level = %d, GLint xoffset = %d, GLint yoffset = %d, GLsizei "
>         "width = %d, GLsizei height = %d, GLenum format = 0x%X, GLsizei imageSize = %d, const void "
>-        "*data = 0x%0.8p)",
>-        target, level, xoffset, yoffset, width, height, format, imageSize, data);
>+        "*data = 0x%016" PRIxPTR ")",
>+        target, level, xoffset, yoffset, width, height, format, imageSize, (uintptr_t)data);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::CompressedTexSubImage2D>(
>-            target, level, xoffset, yoffset, width, height, format, imageSize, data);
>-
>+        TextureTarget targetPacked = FromGLenum<TextureTarget>(target);
>         if (context->skipValidation() ||
>-            ValidateCompressedTexSubImage2D(context, target, level, xoffset, yoffset, width, height,
>-                                            format, imageSize, data))
>+            ValidateCompressedTexSubImage2D(context, targetPacked, level, xoffset, yoffset, width,
>+                                            height, format, imageSize, data))
>         {
>-            context->compressedTexSubImage2D(target, level, xoffset, yoffset, width, height, format,
>-                                             imageSize, data);
>+            context->compressedTexSubImage2D(targetPacked, level, xoffset, yoffset, width, height,
>+                                             format, imageSize, data);
>         }
>     }
> }
>@@ -448,6 +429,7 @@ void GL_APIENTRY CopyTexImage2D(GLenum target,
>                                 GLsizei height,
>                                 GLint border)
> {
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>     EVENT(
>         "(GLenum target = 0x%X, GLint level = %d, GLenum internalformat = 0x%X, GLint x = %d, "
>         "GLint y = %d, GLsizei width = %d, GLsizei height = %d, GLint border = %d)",
>@@ -456,14 +438,13 @@ void GL_APIENTRY CopyTexImage2D(GLenum target,
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::CopyTexImage2D>(target, level, internalformat, x, y,
>-                                                          width, height, border);
>-
>+        TextureTarget targetPacked = FromGLenum<TextureTarget>(target);
>         if (context->skipValidation() ||
>-            ValidateCopyTexImage2D(context, target, level, internalformat, x, y, width, height,
>-                                   border))
>+            ValidateCopyTexImage2D(context, targetPacked, level, internalformat, x, y, width,
>+                                   height, border))
>         {
>-            context->copyTexImage2D(target, level, internalformat, x, y, width, height, border);
>+            context->copyTexImage2D(targetPacked, level, internalformat, x, y, width, height,
>+                                    border);
>         }
>     }
> }
>@@ -477,6 +458,7 @@ void GL_APIENTRY CopyTexSubImage2D(GLenum target,
>                                    GLsizei width,
>                                    GLsizei height)
> {
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>     EVENT(
>         "(GLenum target = 0x%X, GLint level = %d, GLint xoffset = %d, GLint yoffset = %d, GLint x "
>         "= %d, GLint y = %d, GLsizei width = %d, GLsizei height = %d)",
>@@ -485,26 +467,24 @@ void GL_APIENTRY CopyTexSubImage2D(GLenum target,
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::CopyTexSubImage2D>(target, level, xoffset, yoffset, x, y,
>-                                                             width, height);
>-
>-        if (context->skipValidation() || ValidateCopyTexSubImage2D(context, target, level, xoffset,
>-                                                                   yoffset, x, y, width, height))
>+        TextureTarget targetPacked = FromGLenum<TextureTarget>(target);
>+        if (context->skipValidation() ||
>+            ValidateCopyTexSubImage2D(context, targetPacked, level, xoffset, yoffset, x, y, width,
>+                                      height))
>         {
>-            context->copyTexSubImage2D(target, level, xoffset, yoffset, x, y, width, height);
>+            context->copyTexSubImage2D(targetPacked, level, xoffset, yoffset, x, y, width, height);
>         }
>     }
> }
> 
> GLuint GL_APIENTRY CreateProgram()
> {
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>     EVENT("()");
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::CreateProgram>();
>-
>         if (context->skipValidation() || ValidateCreateProgram(context))
>         {
>             return context->createProgram();
>@@ -516,16 +496,16 @@ GLuint GL_APIENTRY CreateProgram()
> 
> GLuint GL_APIENTRY CreateShader(GLenum type)
> {
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>     EVENT("(GLenum type = 0x%X)", type);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::CreateShader>(type);
>-
>-        if (context->skipValidation() || ValidateCreateShader(context, type))
>+        ShaderType typePacked = FromGLenum<ShaderType>(type);
>+        if (context->skipValidation() || ValidateCreateShader(context, typePacked))
>         {
>-            return context->createShader(type);
>+            return context->createShader(typePacked);
>         }
>     }
> 
>@@ -534,14 +514,13 @@ GLuint GL_APIENTRY CreateShader(GLenum type)
> 
> void GL_APIENTRY CullFace(GLenum mode)
> {
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>     EVENT("(GLenum mode = 0x%X)", mode);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>         CullFaceMode modePacked = FromGLenum<CullFaceMode>(mode);
>-        context->gatherParams<EntryPoint::CullFace>(modePacked);
>-
>         if (context->skipValidation() || ValidateCullFace(context, modePacked))
>         {
>             context->cullFace(modePacked);
>@@ -551,13 +530,12 @@ void GL_APIENTRY CullFace(GLenum mode)
> 
> void GL_APIENTRY DeleteBuffers(GLsizei n, const GLuint *buffers)
> {
>-    EVENT("(GLsizei n = %d, const GLuint *buffers = 0x%0.8p)", n, buffers);
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLsizei n = %d, const GLuint *buffers = 0x%016" PRIxPTR ")", n, (uintptr_t)buffers);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::DeleteBuffers>(n, buffers);
>-
>         if (context->skipValidation() || ValidateDeleteBuffers(context, n, buffers))
>         {
>             context->deleteBuffers(n, buffers);
>@@ -567,13 +545,13 @@ void GL_APIENTRY DeleteBuffers(GLsizei n, const GLuint *buffers)
> 
> void GL_APIENTRY DeleteFramebuffers(GLsizei n, const GLuint *framebuffers)
> {
>-    EVENT("(GLsizei n = %d, const GLuint *framebuffers = 0x%0.8p)", n, framebuffers);
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLsizei n = %d, const GLuint *framebuffers = 0x%016" PRIxPTR ")", n,
>+          (uintptr_t)framebuffers);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::DeleteFramebuffers>(n, framebuffers);
>-
>         if (context->skipValidation() || ValidateDeleteFramebuffers(context, n, framebuffers))
>         {
>             context->deleteFramebuffers(n, framebuffers);
>@@ -583,13 +561,12 @@ void GL_APIENTRY DeleteFramebuffers(GLsizei n, const GLuint *framebuffers)
> 
> void GL_APIENTRY DeleteProgram(GLuint program)
> {
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>     EVENT("(GLuint program = %u)", program);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::DeleteProgram>(program);
>-
>         if (context->skipValidation() || ValidateDeleteProgram(context, program))
>         {
>             context->deleteProgram(program);
>@@ -599,13 +576,13 @@ void GL_APIENTRY DeleteProgram(GLuint program)
> 
> void GL_APIENTRY DeleteRenderbuffers(GLsizei n, const GLuint *renderbuffers)
> {
>-    EVENT("(GLsizei n = %d, const GLuint *renderbuffers = 0x%0.8p)", n, renderbuffers);
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLsizei n = %d, const GLuint *renderbuffers = 0x%016" PRIxPTR ")", n,
>+          (uintptr_t)renderbuffers);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::DeleteRenderbuffers>(n, renderbuffers);
>-
>         if (context->skipValidation() || ValidateDeleteRenderbuffers(context, n, renderbuffers))
>         {
>             context->deleteRenderbuffers(n, renderbuffers);
>@@ -615,13 +592,12 @@ void GL_APIENTRY DeleteRenderbuffers(GLsizei n, const GLuint *renderbuffers)
> 
> void GL_APIENTRY DeleteShader(GLuint shader)
> {
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>     EVENT("(GLuint shader = %u)", shader);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::DeleteShader>(shader);
>-
>         if (context->skipValidation() || ValidateDeleteShader(context, shader))
>         {
>             context->deleteShader(shader);
>@@ -631,13 +607,12 @@ void GL_APIENTRY DeleteShader(GLuint shader)
> 
> void GL_APIENTRY DeleteTextures(GLsizei n, const GLuint *textures)
> {
>-    EVENT("(GLsizei n = %d, const GLuint *textures = 0x%0.8p)", n, textures);
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLsizei n = %d, const GLuint *textures = 0x%016" PRIxPTR ")", n, (uintptr_t)textures);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::DeleteTextures>(n, textures);
>-
>         if (context->skipValidation() || ValidateDeleteTextures(context, n, textures))
>         {
>             context->deleteTextures(n, textures);
>@@ -647,13 +622,12 @@ void GL_APIENTRY DeleteTextures(GLsizei n, const GLuint *textures)
> 
> void GL_APIENTRY DepthFunc(GLenum func)
> {
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>     EVENT("(GLenum func = 0x%X)", func);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::DepthFunc>(func);
>-
>         if (context->skipValidation() || ValidateDepthFunc(context, func))
>         {
>             context->depthFunc(func);
>@@ -663,13 +637,12 @@ void GL_APIENTRY DepthFunc(GLenum func)
> 
> void GL_APIENTRY DepthMask(GLboolean flag)
> {
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>     EVENT("(GLboolean flag = %u)", flag);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::DepthMask>(flag);
>-
>         if (context->skipValidation() || ValidateDepthMask(context, flag))
>         {
>             context->depthMask(flag);
>@@ -679,13 +652,12 @@ void GL_APIENTRY DepthMask(GLboolean flag)
> 
> void GL_APIENTRY DepthRangef(GLfloat n, GLfloat f)
> {
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>     EVENT("(GLfloat n = %f, GLfloat f = %f)", n, f);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::DepthRangef>(n, f);
>-
>         if (context->skipValidation() || ValidateDepthRangef(context, n, f))
>         {
>             context->depthRangef(n, f);
>@@ -695,13 +667,12 @@ void GL_APIENTRY DepthRangef(GLfloat n, GLfloat f)
> 
> void GL_APIENTRY DetachShader(GLuint program, GLuint shader)
> {
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>     EVENT("(GLuint program = %u, GLuint shader = %u)", program, shader);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::DetachShader>(program, shader);
>-
>         if (context->skipValidation() || ValidateDetachShader(context, program, shader))
>         {
>             context->detachShader(program, shader);
>@@ -711,13 +682,12 @@ void GL_APIENTRY DetachShader(GLuint program, GLuint shader)
> 
> void GL_APIENTRY Disable(GLenum cap)
> {
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>     EVENT("(GLenum cap = 0x%X)", cap);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::Disable>(cap);
>-
>         if (context->skipValidation() || ValidateDisable(context, cap))
>         {
>             context->disable(cap);
>@@ -727,13 +697,12 @@ void GL_APIENTRY Disable(GLenum cap)
> 
> void GL_APIENTRY DisableVertexAttribArray(GLuint index)
> {
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>     EVENT("(GLuint index = %u)", index);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::DisableVertexAttribArray>(index);
>-
>         if (context->skipValidation() || ValidateDisableVertexAttribArray(context, index))
>         {
>             context->disableVertexAttribArray(index);
>@@ -743,48 +712,49 @@ void GL_APIENTRY DisableVertexAttribArray(GLuint index)
> 
> void GL_APIENTRY DrawArrays(GLenum mode, GLint first, GLsizei count)
> {
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>     EVENT("(GLenum mode = 0x%X, GLint first = %d, GLsizei count = %d)", mode, first, count);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::DrawArrays>(mode, first, count);
>-
>-        if (context->skipValidation() || ValidateDrawArrays(context, mode, first, count))
>+        PrimitiveMode modePacked = FromGLenum<PrimitiveMode>(mode);
>+        if (context->skipValidation() || ValidateDrawArrays(context, modePacked, first, count))
>         {
>-            context->drawArrays(mode, first, count);
>+            context->drawArrays(modePacked, first, count);
>         }
>     }
> }
> 
> void GL_APIENTRY DrawElements(GLenum mode, GLsizei count, GLenum type, const void *indices)
> {
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>     EVENT(
>         "(GLenum mode = 0x%X, GLsizei count = %d, GLenum type = 0x%X, const void *indices = "
>-        "0x%0.8p)",
>-        mode, count, type, indices);
>+        "0x%016" PRIxPTR ")",
>+        mode, count, type, (uintptr_t)indices);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::DrawElements>(mode, count, type, indices);
>-
>-        if (context->skipValidation() || ValidateDrawElements(context, mode, count, type, indices))
>+        PrimitiveMode modePacked    = FromGLenum<PrimitiveMode>(mode);
>+        DrawElementsType typePacked = FromGLenum<DrawElementsType>(type);
>+        if (context->skipValidation() ||
>+            ValidateDrawElements(context, modePacked, count, typePacked, indices))
>         {
>-            context->drawElements(mode, count, type, indices);
>+            context->drawElements(modePacked, count, typePacked, indices);
>         }
>     }
> }
> 
> void GL_APIENTRY Enable(GLenum cap)
> {
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>     EVENT("(GLenum cap = 0x%X)", cap);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::Enable>(cap);
>-
>         if (context->skipValidation() || ValidateEnable(context, cap))
>         {
>             context->enable(cap);
>@@ -794,13 +764,12 @@ void GL_APIENTRY Enable(GLenum cap)
> 
> void GL_APIENTRY EnableVertexAttribArray(GLuint index)
> {
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>     EVENT("(GLuint index = %u)", index);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::EnableVertexAttribArray>(index);
>-
>         if (context->skipValidation() || ValidateEnableVertexAttribArray(context, index))
>         {
>             context->enableVertexAttribArray(index);
>@@ -810,13 +779,12 @@ void GL_APIENTRY EnableVertexAttribArray(GLuint index)
> 
> void GL_APIENTRY Finish()
> {
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>     EVENT("()");
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::Finish>();
>-
>         if (context->skipValidation() || ValidateFinish(context))
>         {
>             context->finish();
>@@ -826,13 +794,12 @@ void GL_APIENTRY Finish()
> 
> void GL_APIENTRY Flush()
> {
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>     EVENT("()");
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::Flush>();
>-
>         if (context->skipValidation() || ValidateFlush(context))
>         {
>             context->flush();
>@@ -845,6 +812,7 @@ void GL_APIENTRY FramebufferRenderbuffer(GLenum target,
>                                          GLenum renderbuffertarget,
>                                          GLuint renderbuffer)
> {
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>     EVENT(
>         "(GLenum target = 0x%X, GLenum attachment = 0x%X, GLenum renderbuffertarget = 0x%X, GLuint "
>         "renderbuffer = %u)",
>@@ -853,9 +821,6 @@ void GL_APIENTRY FramebufferRenderbuffer(GLenum target,
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::FramebufferRenderbuffer>(
>-            target, attachment, renderbuffertarget, renderbuffer);
>-
>         if (context->skipValidation() ||
>             ValidateFramebufferRenderbuffer(context, target, attachment, renderbuffertarget,
>                                             renderbuffer))
>@@ -871,6 +836,7 @@ void GL_APIENTRY FramebufferTexture2D(GLenum target,
>                                       GLuint texture,
>                                       GLint level)
> {
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>     EVENT(
>         "(GLenum target = 0x%X, GLenum attachment = 0x%X, GLenum textarget = 0x%X, GLuint texture "
>         "= %u, GLint level = %d)",
>@@ -879,26 +845,24 @@ void GL_APIENTRY FramebufferTexture2D(GLenum target,
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::FramebufferTexture2D>(target, attachment, textarget,
>-                                                                texture, level);
>-
>+        TextureTarget textargetPacked = FromGLenum<TextureTarget>(textarget);
>         if (context->skipValidation() ||
>-            ValidateFramebufferTexture2D(context, target, attachment, textarget, texture, level))
>+            ValidateFramebufferTexture2D(context, target, attachment, textargetPacked, texture,
>+                                         level))
>         {
>-            context->framebufferTexture2D(target, attachment, textarget, texture, level);
>+            context->framebufferTexture2D(target, attachment, textargetPacked, texture, level);
>         }
>     }
> }
> 
> void GL_APIENTRY FrontFace(GLenum mode)
> {
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>     EVENT("(GLenum mode = 0x%X)", mode);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::FrontFace>(mode);
>-
>         if (context->skipValidation() || ValidateFrontFace(context, mode))
>         {
>             context->frontFace(mode);
>@@ -908,13 +872,12 @@ void GL_APIENTRY FrontFace(GLenum mode)
> 
> void GL_APIENTRY GenBuffers(GLsizei n, GLuint *buffers)
> {
>-    EVENT("(GLsizei n = %d, GLuint *buffers = 0x%0.8p)", n, buffers);
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLsizei n = %d, GLuint *buffers = 0x%016" PRIxPTR ")", n, (uintptr_t)buffers);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::GenBuffers>(n, buffers);
>-
>         if (context->skipValidation() || ValidateGenBuffers(context, n, buffers))
>         {
>             context->genBuffers(n, buffers);
>@@ -922,66 +885,64 @@ void GL_APIENTRY GenBuffers(GLsizei n, GLuint *buffers)
>     }
> }
> 
>-void GL_APIENTRY GenerateMipmap(GLenum target)
>+void GL_APIENTRY GenFramebuffers(GLsizei n, GLuint *framebuffers)
> {
>-    EVENT("(GLenum target = 0x%X)", target);
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLsizei n = %d, GLuint *framebuffers = 0x%016" PRIxPTR ")", n, (uintptr_t)framebuffers);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::GenerateMipmap>(target);
>-
>-        if (context->skipValidation() || ValidateGenerateMipmap(context, target))
>+        if (context->skipValidation() || ValidateGenFramebuffers(context, n, framebuffers))
>         {
>-            context->generateMipmap(target);
>+            context->genFramebuffers(n, framebuffers);
>         }
>     }
> }
> 
>-void GL_APIENTRY GenFramebuffers(GLsizei n, GLuint *framebuffers)
>+void GL_APIENTRY GenRenderbuffers(GLsizei n, GLuint *renderbuffers)
> {
>-    EVENT("(GLsizei n = %d, GLuint *framebuffers = 0x%0.8p)", n, framebuffers);
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLsizei n = %d, GLuint *renderbuffers = 0x%016" PRIxPTR ")", n,
>+          (uintptr_t)renderbuffers);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::GenFramebuffers>(n, framebuffers);
>-
>-        if (context->skipValidation() || ValidateGenFramebuffers(context, n, framebuffers))
>+        if (context->skipValidation() || ValidateGenRenderbuffers(context, n, renderbuffers))
>         {
>-            context->genFramebuffers(n, framebuffers);
>+            context->genRenderbuffers(n, renderbuffers);
>         }
>     }
> }
> 
>-void GL_APIENTRY GenRenderbuffers(GLsizei n, GLuint *renderbuffers)
>+void GL_APIENTRY GenTextures(GLsizei n, GLuint *textures)
> {
>-    EVENT("(GLsizei n = %d, GLuint *renderbuffers = 0x%0.8p)", n, renderbuffers);
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLsizei n = %d, GLuint *textures = 0x%016" PRIxPTR ")", n, (uintptr_t)textures);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::GenRenderbuffers>(n, renderbuffers);
>-
>-        if (context->skipValidation() || ValidateGenRenderbuffers(context, n, renderbuffers))
>+        if (context->skipValidation() || ValidateGenTextures(context, n, textures))
>         {
>-            context->genRenderbuffers(n, renderbuffers);
>+            context->genTextures(n, textures);
>         }
>     }
> }
> 
>-void GL_APIENTRY GenTextures(GLsizei n, GLuint *textures)
>+void GL_APIENTRY GenerateMipmap(GLenum target)
> {
>-    EVENT("(GLsizei n = %d, GLuint *textures = 0x%0.8p)", n, textures);
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum target = 0x%X)", target);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::GenTextures>(n, textures);
>-
>-        if (context->skipValidation() || ValidateGenTextures(context, n, textures))
>+        TextureType targetPacked = FromGLenum<TextureType>(target);
>+        if (context->skipValidation() || ValidateGenerateMipmap(context, targetPacked))
>         {
>-            context->genTextures(n, textures);
>+            context->generateMipmap(targetPacked);
>         }
>     }
> }
>@@ -994,17 +955,17 @@ void GL_APIENTRY GetActiveAttrib(GLuint program,
>                                  GLenum *type,
>                                  GLchar *name)
> {
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>     EVENT(
>-        "(GLuint program = %u, GLuint index = %u, GLsizei bufSize = %d, GLsizei *length = 0x%0.8p, "
>-        "GLint *size = 0x%0.8p, GLenum *type = 0x%0.8p, GLchar *name = 0x%0.8p)",
>-        program, index, bufSize, length, size, type, name);
>+        "(GLuint program = %u, GLuint index = %u, GLsizei bufSize = %d, GLsizei *length = "
>+        "0x%016" PRIxPTR ", GLint *size = 0x%016" PRIxPTR ", GLenum *type = 0x%016" PRIxPTR
>+        ", GLchar *name = 0x%016" PRIxPTR ")",
>+        program, index, bufSize, (uintptr_t)length, (uintptr_t)size, (uintptr_t)type,
>+        (uintptr_t)name);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::GetActiveAttrib>(program, index, bufSize, length, size,
>-                                                           type, name);
>-
>         if (context->skipValidation() ||
>             ValidateGetActiveAttrib(context, program, index, bufSize, length, size, type, name))
>         {
>@@ -1021,17 +982,17 @@ void GL_APIENTRY GetActiveUniform(GLuint program,
>                                   GLenum *type,
>                                   GLchar *name)
> {
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>     EVENT(
>-        "(GLuint program = %u, GLuint index = %u, GLsizei bufSize = %d, GLsizei *length = 0x%0.8p, "
>-        "GLint *size = 0x%0.8p, GLenum *type = 0x%0.8p, GLchar *name = 0x%0.8p)",
>-        program, index, bufSize, length, size, type, name);
>+        "(GLuint program = %u, GLuint index = %u, GLsizei bufSize = %d, GLsizei *length = "
>+        "0x%016" PRIxPTR ", GLint *size = 0x%016" PRIxPTR ", GLenum *type = 0x%016" PRIxPTR
>+        ", GLchar *name = 0x%016" PRIxPTR ")",
>+        program, index, bufSize, (uintptr_t)length, (uintptr_t)size, (uintptr_t)type,
>+        (uintptr_t)name);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::GetActiveUniform>(program, index, bufSize, length, size,
>-                                                            type, name);
>-
>         if (context->skipValidation() ||
>             ValidateGetActiveUniform(context, program, index, bufSize, length, size, type, name))
>         {
>@@ -1045,16 +1006,14 @@ void GL_APIENTRY GetAttachedShaders(GLuint program,
>                                     GLsizei *count,
>                                     GLuint *shaders)
> {
>-    EVENT(
>-        "(GLuint program = %u, GLsizei maxCount = %d, GLsizei *count = 0x%0.8p, GLuint *shaders = "
>-        "0x%0.8p)",
>-        program, maxCount, count, shaders);
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint program = %u, GLsizei maxCount = %d, GLsizei *count = 0x%016" PRIxPTR
>+          ", GLuint *shaders = 0x%016" PRIxPTR ")",
>+          program, maxCount, (uintptr_t)count, (uintptr_t)shaders);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::GetAttachedShaders>(program, maxCount, count, shaders);
>-
>         if (context->skipValidation() ||
>             ValidateGetAttachedShaders(context, program, maxCount, count, shaders))
>         {
>@@ -1065,13 +1024,13 @@ void GL_APIENTRY GetAttachedShaders(GLuint program,
> 
> GLint GL_APIENTRY GetAttribLocation(GLuint program, const GLchar *name)
> {
>-    EVENT("(GLuint program = %u, const GLchar *name = 0x%0.8p)", program, name);
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint program = %u, const GLchar *name = 0x%016" PRIxPTR ")", program,
>+          (uintptr_t)name);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::GetAttribLocation>(program, name);
>-
>         if (context->skipValidation() || ValidateGetAttribLocation(context, program, name))
>         {
>             return context->getAttribLocation(program, name);
>@@ -1083,13 +1042,12 @@ GLint GL_APIENTRY GetAttribLocation(GLuint program, const GLchar *name)
> 
> void GL_APIENTRY GetBooleanv(GLenum pname, GLboolean *data)
> {
>-    EVENT("(GLenum pname = 0x%X, GLboolean *data = 0x%0.8p)", pname, data);
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum pname = 0x%X, GLboolean *data = 0x%016" PRIxPTR ")", pname, (uintptr_t)data);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::GetBooleanv>(pname, data);
>-
>         if (context->skipValidation() || ValidateGetBooleanv(context, pname, data))
>         {
>             context->getBooleanv(pname, data);
>@@ -1099,15 +1057,14 @@ void GL_APIENTRY GetBooleanv(GLenum pname, GLboolean *data)
> 
> void GL_APIENTRY GetBufferParameteriv(GLenum target, GLenum pname, GLint *params)
> {
>-    EVENT("(GLenum target = 0x%X, GLenum pname = 0x%X, GLint *params = 0x%0.8p)", target, pname,
>-          params);
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum target = 0x%X, GLenum pname = 0x%X, GLint *params = 0x%016" PRIxPTR ")", target,
>+          pname, (uintptr_t)params);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>         BufferBinding targetPacked = FromGLenum<BufferBinding>(target);
>-        context->gatherParams<EntryPoint::GetBufferParameteriv>(targetPacked, pname, params);
>-
>         if (context->skipValidation() ||
>             ValidateGetBufferParameteriv(context, targetPacked, pname, params))
>         {
>@@ -1118,13 +1075,12 @@ void GL_APIENTRY GetBufferParameteriv(GLenum target, GLenum pname, GLint *params
> 
> GLenum GL_APIENTRY GetError()
> {
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>     EVENT("()");
> 
>     Context *context = GetGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::GetError>();
>-
>         if (context->skipValidation() || ValidateGetError(context))
>         {
>             return context->getError();
>@@ -1136,13 +1092,12 @@ GLenum GL_APIENTRY GetError()
> 
> void GL_APIENTRY GetFloatv(GLenum pname, GLfloat *data)
> {
>-    EVENT("(GLenum pname = 0x%X, GLfloat *data = 0x%0.8p)", pname, data);
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum pname = 0x%X, GLfloat *data = 0x%016" PRIxPTR ")", pname, (uintptr_t)data);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::GetFloatv>(pname, data);
>-
>         if (context->skipValidation() || ValidateGetFloatv(context, pname, data))
>         {
>             context->getFloatv(pname, data);
>@@ -1155,17 +1110,15 @@ void GL_APIENTRY GetFramebufferAttachmentParameteriv(GLenum target,
>                                                      GLenum pname,
>                                                      GLint *params)
> {
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>     EVENT(
>         "(GLenum target = 0x%X, GLenum attachment = 0x%X, GLenum pname = 0x%X, GLint *params = "
>-        "0x%0.8p)",
>-        target, attachment, pname, params);
>+        "0x%016" PRIxPTR ")",
>+        target, attachment, pname, (uintptr_t)params);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::GetFramebufferAttachmentParameteriv>(target, attachment,
>-                                                                               pname, params);
>-
>         if (context->skipValidation() ||
>             ValidateGetFramebufferAttachmentParameteriv(context, target, attachment, pname, params))
>         {
>@@ -1176,13 +1129,12 @@ void GL_APIENTRY GetFramebufferAttachmentParameteriv(GLenum target,
> 
> void GL_APIENTRY GetIntegerv(GLenum pname, GLint *data)
> {
>-    EVENT("(GLenum pname = 0x%X, GLint *data = 0x%0.8p)", pname, data);
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum pname = 0x%X, GLint *data = 0x%016" PRIxPTR ")", pname, (uintptr_t)data);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::GetIntegerv>(pname, data);
>-
>         if (context->skipValidation() || ValidateGetIntegerv(context, pname, data))
>         {
>             context->getIntegerv(pname, data);
>@@ -1190,38 +1142,19 @@ void GL_APIENTRY GetIntegerv(GLenum pname, GLint *data)
>     }
> }
> 
>-void GL_APIENTRY GetProgramiv(GLuint program, GLenum pname, GLint *params)
>-{
>-    EVENT("(GLuint program = %u, GLenum pname = 0x%X, GLint *params = 0x%0.8p)", program, pname,
>-          params);
>-
>-    Context *context = GetValidGlobalContext();
>-    if (context)
>-    {
>-        context->gatherParams<EntryPoint::GetProgramiv>(program, pname, params);
>-
>-        if (context->skipValidation() || ValidateGetProgramiv(context, program, pname, params))
>-        {
>-            context->getProgramiv(program, pname, params);
>-        }
>-    }
>-}
>-
> void GL_APIENTRY GetProgramInfoLog(GLuint program,
>                                    GLsizei bufSize,
>                                    GLsizei *length,
>                                    GLchar *infoLog)
> {
>-    EVENT(
>-        "(GLuint program = %u, GLsizei bufSize = %d, GLsizei *length = 0x%0.8p, GLchar *infoLog = "
>-        "0x%0.8p)",
>-        program, bufSize, length, infoLog);
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint program = %u, GLsizei bufSize = %d, GLsizei *length = 0x%016" PRIxPTR
>+          ", GLchar *infoLog = 0x%016" PRIxPTR ")",
>+          program, bufSize, (uintptr_t)length, (uintptr_t)infoLog);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::GetProgramInfoLog>(program, bufSize, length, infoLog);
>-
>         if (context->skipValidation() ||
>             ValidateGetProgramInfoLog(context, program, bufSize, length, infoLog))
>         {
>@@ -1230,53 +1163,49 @@ void GL_APIENTRY GetProgramInfoLog(GLuint program,
>     }
> }
> 
>-void GL_APIENTRY GetRenderbufferParameteriv(GLenum target, GLenum pname, GLint *params)
>+void GL_APIENTRY GetProgramiv(GLuint program, GLenum pname, GLint *params)
> {
>-    EVENT("(GLenum target = 0x%X, GLenum pname = 0x%X, GLint *params = 0x%0.8p)", target, pname,
>-          params);
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint program = %u, GLenum pname = 0x%X, GLint *params = 0x%016" PRIxPTR ")", program,
>+          pname, (uintptr_t)params);
> 
>-    Context *context = GetValidGlobalContext();
>+    Context *context = GetGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::GetRenderbufferParameteriv>(target, pname, params);
>-
>-        if (context->skipValidation() ||
>-            ValidateGetRenderbufferParameteriv(context, target, pname, params))
>+        if (context->skipValidation() || ValidateGetProgramiv(context, program, pname, params))
>         {
>-            context->getRenderbufferParameteriv(target, pname, params);
>+            context->getProgramiv(program, pname, params);
>         }
>     }
> }
> 
>-void GL_APIENTRY GetShaderiv(GLuint shader, GLenum pname, GLint *params)
>+void GL_APIENTRY GetRenderbufferParameteriv(GLenum target, GLenum pname, GLint *params)
> {
>-    EVENT("(GLuint shader = %u, GLenum pname = 0x%X, GLint *params = 0x%0.8p)", shader, pname,
>-          params);
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum target = 0x%X, GLenum pname = 0x%X, GLint *params = 0x%016" PRIxPTR ")", target,
>+          pname, (uintptr_t)params);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::GetShaderiv>(shader, pname, params);
>-
>-        if (context->skipValidation() || ValidateGetShaderiv(context, shader, pname, params))
>+        if (context->skipValidation() ||
>+            ValidateGetRenderbufferParameteriv(context, target, pname, params))
>         {
>-            context->getShaderiv(shader, pname, params);
>+            context->getRenderbufferParameteriv(target, pname, params);
>         }
>     }
> }
> 
> void GL_APIENTRY GetShaderInfoLog(GLuint shader, GLsizei bufSize, GLsizei *length, GLchar *infoLog)
> {
>-    EVENT(
>-        "(GLuint shader = %u, GLsizei bufSize = %d, GLsizei *length = 0x%0.8p, GLchar *infoLog = "
>-        "0x%0.8p)",
>-        shader, bufSize, length, infoLog);
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint shader = %u, GLsizei bufSize = %d, GLsizei *length = 0x%016" PRIxPTR
>+          ", GLchar *infoLog = 0x%016" PRIxPTR ")",
>+          shader, bufSize, (uintptr_t)length, (uintptr_t)infoLog);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::GetShaderInfoLog>(shader, bufSize, length, infoLog);
>-
>         if (context->skipValidation() ||
>             ValidateGetShaderInfoLog(context, shader, bufSize, length, infoLog))
>         {
>@@ -1290,17 +1219,14 @@ void GL_APIENTRY GetShaderPrecisionFormat(GLenum shadertype,
>                                           GLint *range,
>                                           GLint *precision)
> {
>-    EVENT(
>-        "(GLenum shadertype = 0x%X, GLenum precisiontype = 0x%X, GLint *range = 0x%0.8p, GLint "
>-        "*precision = 0x%0.8p)",
>-        shadertype, precisiontype, range, precision);
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum shadertype = 0x%X, GLenum precisiontype = 0x%X, GLint *range = 0x%016" PRIxPTR
>+          ", GLint *precision = 0x%016" PRIxPTR ")",
>+          shadertype, precisiontype, (uintptr_t)range, (uintptr_t)precision);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::GetShaderPrecisionFormat>(shadertype, precisiontype,
>-                                                                    range, precision);
>-
>         if (context->skipValidation() ||
>             ValidateGetShaderPrecisionFormat(context, shadertype, precisiontype, range, precision))
>         {
>@@ -1311,16 +1237,14 @@ void GL_APIENTRY GetShaderPrecisionFormat(GLenum shadertype,
> 
> void GL_APIENTRY GetShaderSource(GLuint shader, GLsizei bufSize, GLsizei *length, GLchar *source)
> {
>-    EVENT(
>-        "(GLuint shader = %u, GLsizei bufSize = %d, GLsizei *length = 0x%0.8p, GLchar *source = "
>-        "0x%0.8p)",
>-        shader, bufSize, length, source);
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint shader = %u, GLsizei bufSize = %d, GLsizei *length = 0x%016" PRIxPTR
>+          ", GLchar *source = 0x%016" PRIxPTR ")",
>+          shader, bufSize, (uintptr_t)length, (uintptr_t)source);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::GetShaderSource>(shader, bufSize, length, source);
>-
>         if (context->skipValidation() ||
>             ValidateGetShaderSource(context, shader, bufSize, length, source))
>         {
>@@ -1329,15 +1253,30 @@ void GL_APIENTRY GetShaderSource(GLuint shader, GLsizei bufSize, GLsizei *length
>     }
> }
> 
>+void GL_APIENTRY GetShaderiv(GLuint shader, GLenum pname, GLint *params)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint shader = %u, GLenum pname = 0x%X, GLint *params = 0x%016" PRIxPTR ")", shader,
>+          pname, (uintptr_t)params);
>+
>+    Context *context = GetGlobalContext();
>+    if (context)
>+    {
>+        if (context->skipValidation() || ValidateGetShaderiv(context, shader, pname, params))
>+        {
>+            context->getShaderiv(shader, pname, params);
>+        }
>+    }
>+}
>+
> const GLubyte *GL_APIENTRY GetString(GLenum name)
> {
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>     EVENT("(GLenum name = 0x%X)", name);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::GetString>(name);
>-
>         if (context->skipValidation() || ValidateGetString(context, name))
>         {
>             return context->getString(name);
>@@ -1349,48 +1288,67 @@ const GLubyte *GL_APIENTRY GetString(GLenum name)
> 
> void GL_APIENTRY GetTexParameterfv(GLenum target, GLenum pname, GLfloat *params)
> {
>-    EVENT("(GLenum target = 0x%X, GLenum pname = 0x%X, GLfloat *params = 0x%0.8p)", target, pname,
>-          params);
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum target = 0x%X, GLenum pname = 0x%X, GLfloat *params = 0x%016" PRIxPTR ")",
>+          target, pname, (uintptr_t)params);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::GetTexParameterfv>(target, pname, params);
>-
>-        if (context->skipValidation() || ValidateGetTexParameterfv(context, target, pname, params))
>+        TextureType targetPacked = FromGLenum<TextureType>(target);
>+        if (context->skipValidation() ||
>+            ValidateGetTexParameterfv(context, targetPacked, pname, params))
>         {
>-            context->getTexParameterfv(target, pname, params);
>+            context->getTexParameterfv(targetPacked, pname, params);
>         }
>     }
> }
> 
> void GL_APIENTRY GetTexParameteriv(GLenum target, GLenum pname, GLint *params)
> {
>-    EVENT("(GLenum target = 0x%X, GLenum pname = 0x%X, GLint *params = 0x%0.8p)", target, pname,
>-          params);
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum target = 0x%X, GLenum pname = 0x%X, GLint *params = 0x%016" PRIxPTR ")", target,
>+          pname, (uintptr_t)params);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::GetTexParameteriv>(target, pname, params);
>+        TextureType targetPacked = FromGLenum<TextureType>(target);
>+        if (context->skipValidation() ||
>+            ValidateGetTexParameteriv(context, targetPacked, pname, params))
>+        {
>+            context->getTexParameteriv(targetPacked, pname, params);
>+        }
>+    }
>+}
>+
>+GLint GL_APIENTRY GetUniformLocation(GLuint program, const GLchar *name)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint program = %u, const GLchar *name = 0x%016" PRIxPTR ")", program,
>+          (uintptr_t)name);
> 
>-        if (context->skipValidation() || ValidateGetTexParameteriv(context, target, pname, params))
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        if (context->skipValidation() || ValidateGetUniformLocation(context, program, name))
>         {
>-            context->getTexParameteriv(target, pname, params);
>+            return context->getUniformLocation(program, name);
>         }
>     }
>+
>+    return GetDefaultReturnValue<EntryPoint::GetUniformLocation, GLint>();
> }
> 
> void GL_APIENTRY GetUniformfv(GLuint program, GLint location, GLfloat *params)
> {
>-    EVENT("(GLuint program = %u, GLint location = %d, GLfloat *params = 0x%0.8p)", program,
>-          location, params);
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint program = %u, GLint location = %d, GLfloat *params = 0x%016" PRIxPTR ")",
>+          program, location, (uintptr_t)params);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::GetUniformfv>(program, location, params);
>-
>         if (context->skipValidation() || ValidateGetUniformfv(context, program, location, params))
>         {
>             context->getUniformfv(program, location, params);
>@@ -1400,14 +1358,13 @@ void GL_APIENTRY GetUniformfv(GLuint program, GLint location, GLfloat *params)
> 
> void GL_APIENTRY GetUniformiv(GLuint program, GLint location, GLint *params)
> {
>-    EVENT("(GLuint program = %u, GLint location = %d, GLint *params = 0x%0.8p)", program, location,
>-          params);
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint program = %u, GLint location = %d, GLint *params = 0x%016" PRIxPTR ")", program,
>+          location, (uintptr_t)params);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::GetUniformiv>(program, location, params);
>-
>         if (context->skipValidation() || ValidateGetUniformiv(context, program, location, params))
>         {
>             context->getUniformiv(program, location, params);
>@@ -1415,34 +1372,32 @@ void GL_APIENTRY GetUniformiv(GLuint program, GLint location, GLint *params)
>     }
> }
> 
>-GLint GL_APIENTRY GetUniformLocation(GLuint program, const GLchar *name)
>+void GL_APIENTRY GetVertexAttribPointerv(GLuint index, GLenum pname, void **pointer)
> {
>-    EVENT("(GLuint program = %u, const GLchar *name = 0x%0.8p)", program, name);
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint index = %u, GLenum pname = 0x%X, void **pointer = 0x%016" PRIxPTR ")", index,
>+          pname, (uintptr_t)pointer);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::GetUniformLocation>(program, name);
>-
>-        if (context->skipValidation() || ValidateGetUniformLocation(context, program, name))
>+        if (context->skipValidation() ||
>+            ValidateGetVertexAttribPointerv(context, index, pname, pointer))
>         {
>-            return context->getUniformLocation(program, name);
>+            context->getVertexAttribPointerv(index, pname, pointer);
>         }
>     }
>-
>-    return GetDefaultReturnValue<EntryPoint::GetUniformLocation, GLint>();
> }
> 
> void GL_APIENTRY GetVertexAttribfv(GLuint index, GLenum pname, GLfloat *params)
> {
>-    EVENT("(GLuint index = %u, GLenum pname = 0x%X, GLfloat *params = 0x%0.8p)", index, pname,
>-          params);
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint index = %u, GLenum pname = 0x%X, GLfloat *params = 0x%016" PRIxPTR ")", index,
>+          pname, (uintptr_t)params);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::GetVertexAttribfv>(index, pname, params);
>-
>         if (context->skipValidation() || ValidateGetVertexAttribfv(context, index, pname, params))
>         {
>             context->getVertexAttribfv(index, pname, params);
>@@ -1452,14 +1407,13 @@ void GL_APIENTRY GetVertexAttribfv(GLuint index, GLenum pname, GLfloat *params)
> 
> void GL_APIENTRY GetVertexAttribiv(GLuint index, GLenum pname, GLint *params)
> {
>-    EVENT("(GLuint index = %u, GLenum pname = 0x%X, GLint *params = 0x%0.8p)", index, pname,
>-          params);
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint index = %u, GLenum pname = 0x%X, GLint *params = 0x%016" PRIxPTR ")", index,
>+          pname, (uintptr_t)params);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::GetVertexAttribiv>(index, pname, params);
>-
>         if (context->skipValidation() || ValidateGetVertexAttribiv(context, index, pname, params))
>         {
>             context->getVertexAttribiv(index, pname, params);
>@@ -1467,33 +1421,14 @@ void GL_APIENTRY GetVertexAttribiv(GLuint index, GLenum pname, GLint *params)
>     }
> }
> 
>-void GL_APIENTRY GetVertexAttribPointerv(GLuint index, GLenum pname, void **pointer)
>-{
>-    EVENT("(GLuint index = %u, GLenum pname = 0x%X, void **pointer = 0x%0.8p)", index, pname,
>-          pointer);
>-
>-    Context *context = GetValidGlobalContext();
>-    if (context)
>-    {
>-        context->gatherParams<EntryPoint::GetVertexAttribPointerv>(index, pname, pointer);
>-
>-        if (context->skipValidation() ||
>-            ValidateGetVertexAttribPointerv(context, index, pname, pointer))
>-        {
>-            context->getVertexAttribPointerv(index, pname, pointer);
>-        }
>-    }
>-}
>-
> void GL_APIENTRY Hint(GLenum target, GLenum mode)
> {
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>     EVENT("(GLenum target = 0x%X, GLenum mode = 0x%X)", target, mode);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::Hint>(target, mode);
>-
>         if (context->skipValidation() || ValidateHint(context, target, mode))
>         {
>             context->hint(target, mode);
>@@ -1503,13 +1438,12 @@ void GL_APIENTRY Hint(GLenum target, GLenum mode)
> 
> GLboolean GL_APIENTRY IsBuffer(GLuint buffer)
> {
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>     EVENT("(GLuint buffer = %u)", buffer);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::IsBuffer>(buffer);
>-
>         if (context->skipValidation() || ValidateIsBuffer(context, buffer))
>         {
>             return context->isBuffer(buffer);
>@@ -1521,13 +1455,12 @@ GLboolean GL_APIENTRY IsBuffer(GLuint buffer)
> 
> GLboolean GL_APIENTRY IsEnabled(GLenum cap)
> {
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>     EVENT("(GLenum cap = 0x%X)", cap);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::IsEnabled>(cap);
>-
>         if (context->skipValidation() || ValidateIsEnabled(context, cap))
>         {
>             return context->isEnabled(cap);
>@@ -1539,13 +1472,12 @@ GLboolean GL_APIENTRY IsEnabled(GLenum cap)
> 
> GLboolean GL_APIENTRY IsFramebuffer(GLuint framebuffer)
> {
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>     EVENT("(GLuint framebuffer = %u)", framebuffer);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::IsFramebuffer>(framebuffer);
>-
>         if (context->skipValidation() || ValidateIsFramebuffer(context, framebuffer))
>         {
>             return context->isFramebuffer(framebuffer);
>@@ -1557,13 +1489,12 @@ GLboolean GL_APIENTRY IsFramebuffer(GLuint framebuffer)
> 
> GLboolean GL_APIENTRY IsProgram(GLuint program)
> {
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>     EVENT("(GLuint program = %u)", program);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::IsProgram>(program);
>-
>         if (context->skipValidation() || ValidateIsProgram(context, program))
>         {
>             return context->isProgram(program);
>@@ -1575,13 +1506,12 @@ GLboolean GL_APIENTRY IsProgram(GLuint program)
> 
> GLboolean GL_APIENTRY IsRenderbuffer(GLuint renderbuffer)
> {
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>     EVENT("(GLuint renderbuffer = %u)", renderbuffer);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::IsRenderbuffer>(renderbuffer);
>-
>         if (context->skipValidation() || ValidateIsRenderbuffer(context, renderbuffer))
>         {
>             return context->isRenderbuffer(renderbuffer);
>@@ -1593,13 +1523,12 @@ GLboolean GL_APIENTRY IsRenderbuffer(GLuint renderbuffer)
> 
> GLboolean GL_APIENTRY IsShader(GLuint shader)
> {
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>     EVENT("(GLuint shader = %u)", shader);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::IsShader>(shader);
>-
>         if (context->skipValidation() || ValidateIsShader(context, shader))
>         {
>             return context->isShader(shader);
>@@ -1611,13 +1540,12 @@ GLboolean GL_APIENTRY IsShader(GLuint shader)
> 
> GLboolean GL_APIENTRY IsTexture(GLuint texture)
> {
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>     EVENT("(GLuint texture = %u)", texture);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::IsTexture>(texture);
>-
>         if (context->skipValidation() || ValidateIsTexture(context, texture))
>         {
>             return context->isTexture(texture);
>@@ -1629,13 +1557,12 @@ GLboolean GL_APIENTRY IsTexture(GLuint texture)
> 
> void GL_APIENTRY LineWidth(GLfloat width)
> {
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>     EVENT("(GLfloat width = %f)", width);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::LineWidth>(width);
>-
>         if (context->skipValidation() || ValidateLineWidth(context, width))
>         {
>             context->lineWidth(width);
>@@ -1645,13 +1572,12 @@ void GL_APIENTRY LineWidth(GLfloat width)
> 
> void GL_APIENTRY LinkProgram(GLuint program)
> {
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>     EVENT("(GLuint program = %u)", program);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::LinkProgram>(program);
>-
>         if (context->skipValidation() || ValidateLinkProgram(context, program))
>         {
>             context->linkProgram(program);
>@@ -1661,13 +1587,12 @@ void GL_APIENTRY LinkProgram(GLuint program)
> 
> void GL_APIENTRY PixelStorei(GLenum pname, GLint param)
> {
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>     EVENT("(GLenum pname = 0x%X, GLint param = %d)", pname, param);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::PixelStorei>(pname, param);
>-
>         if (context->skipValidation() || ValidatePixelStorei(context, pname, param))
>         {
>             context->pixelStorei(pname, param);
>@@ -1677,13 +1602,12 @@ void GL_APIENTRY PixelStorei(GLenum pname, GLint param)
> 
> void GL_APIENTRY PolygonOffset(GLfloat factor, GLfloat units)
> {
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>     EVENT("(GLfloat factor = %f, GLfloat units = %f)", factor, units);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::PolygonOffset>(factor, units);
>-
>         if (context->skipValidation() || ValidatePolygonOffset(context, factor, units))
>         {
>             context->polygonOffset(factor, units);
>@@ -1699,16 +1623,15 @@ void GL_APIENTRY ReadPixels(GLint x,
>                             GLenum type,
>                             void *pixels)
> {
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>     EVENT(
>         "(GLint x = %d, GLint y = %d, GLsizei width = %d, GLsizei height = %d, GLenum format = "
>-        "0x%X, GLenum type = 0x%X, void *pixels = 0x%0.8p)",
>-        x, y, width, height, format, type, pixels);
>+        "0x%X, GLenum type = 0x%X, void *pixels = 0x%016" PRIxPTR ")",
>+        x, y, width, height, format, type, (uintptr_t)pixels);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::ReadPixels>(x, y, width, height, format, type, pixels);
>-
>         if (context->skipValidation() ||
>             ValidateReadPixels(context, x, y, width, height, format, type, pixels))
>         {
>@@ -1719,13 +1642,12 @@ void GL_APIENTRY ReadPixels(GLint x,
> 
> void GL_APIENTRY ReleaseShaderCompiler()
> {
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>     EVENT("()");
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::ReleaseShaderCompiler>();
>-
>         if (context->skipValidation() || ValidateReleaseShaderCompiler(context))
>         {
>             context->releaseShaderCompiler();
>@@ -1738,6 +1660,7 @@ void GL_APIENTRY RenderbufferStorage(GLenum target,
>                                      GLsizei width,
>                                      GLsizei height)
> {
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>     EVENT(
>         "(GLenum target = 0x%X, GLenum internalformat = 0x%X, GLsizei width = %d, GLsizei height = "
>         "%d)",
>@@ -1746,9 +1669,6 @@ void GL_APIENTRY RenderbufferStorage(GLenum target,
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::RenderbufferStorage>(target, internalformat, width,
>-                                                               height);
>-
>         if (context->skipValidation() ||
>             ValidateRenderbufferStorage(context, target, internalformat, width, height))
>         {
>@@ -1759,13 +1679,12 @@ void GL_APIENTRY RenderbufferStorage(GLenum target,
> 
> void GL_APIENTRY SampleCoverage(GLfloat value, GLboolean invert)
> {
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>     EVENT("(GLfloat value = %f, GLboolean invert = %u)", value, invert);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::SampleCoverage>(value, invert);
>-
>         if (context->skipValidation() || ValidateSampleCoverage(context, value, invert))
>         {
>             context->sampleCoverage(value, invert);
>@@ -1775,14 +1694,13 @@ void GL_APIENTRY SampleCoverage(GLfloat value, GLboolean invert)
> 
> void GL_APIENTRY Scissor(GLint x, GLint y, GLsizei width, GLsizei height)
> {
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>     EVENT("(GLint x = %d, GLint y = %d, GLsizei width = %d, GLsizei height = %d)", x, y, width,
>           height);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::Scissor>(x, y, width, height);
>-
>         if (context->skipValidation() || ValidateScissor(context, x, y, width, height))
>         {
>             context->scissor(x, y, width, height);
>@@ -1796,17 +1714,15 @@ void GL_APIENTRY ShaderBinary(GLsizei count,
>                               const void *binary,
>                               GLsizei length)
> {
>-    EVENT(
>-        "(GLsizei count = %d, const GLuint *shaders = 0x%0.8p, GLenum binaryformat = 0x%X, const "
>-        "void *binary = 0x%0.8p, GLsizei length = %d)",
>-        count, shaders, binaryformat, binary, length);
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLsizei count = %d, const GLuint *shaders = 0x%016" PRIxPTR
>+          ", GLenum binaryformat = 0x%X, const void *binary = 0x%016" PRIxPTR
>+          ", GLsizei length = %d)",
>+          count, (uintptr_t)shaders, binaryformat, (uintptr_t)binary, length);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::ShaderBinary>(count, shaders, binaryformat, binary,
>-                                                        length);
>-
>         if (context->skipValidation() ||
>             ValidateShaderBinary(context, count, shaders, binaryformat, binary, length))
>         {
>@@ -1820,16 +1736,14 @@ void GL_APIENTRY ShaderSource(GLuint shader,
>                               const GLchar *const *string,
>                               const GLint *length)
> {
>-    EVENT(
>-        "(GLuint shader = %u, GLsizei count = %d, const GLchar *const*string = 0x%0.8p, const "
>-        "GLint *length = 0x%0.8p)",
>-        shader, count, string, length);
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint shader = %u, GLsizei count = %d, const GLchar *const*string = 0x%016" PRIxPTR
>+          ", const GLint *length = 0x%016" PRIxPTR ")",
>+          shader, count, (uintptr_t)string, (uintptr_t)length);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::ShaderSource>(shader, count, string, length);
>-
>         if (context->skipValidation() ||
>             ValidateShaderSource(context, shader, count, string, length))
>         {
>@@ -1840,13 +1754,12 @@ void GL_APIENTRY ShaderSource(GLuint shader,
> 
> void GL_APIENTRY StencilFunc(GLenum func, GLint ref, GLuint mask)
> {
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>     EVENT("(GLenum func = 0x%X, GLint ref = %d, GLuint mask = %u)", func, ref, mask);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::StencilFunc>(func, ref, mask);
>-
>         if (context->skipValidation() || ValidateStencilFunc(context, func, ref, mask))
>         {
>             context->stencilFunc(func, ref, mask);
>@@ -1856,14 +1769,13 @@ void GL_APIENTRY StencilFunc(GLenum func, GLint ref, GLuint mask)
> 
> void GL_APIENTRY StencilFuncSeparate(GLenum face, GLenum func, GLint ref, GLuint mask)
> {
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>     EVENT("(GLenum face = 0x%X, GLenum func = 0x%X, GLint ref = %d, GLuint mask = %u)", face, func,
>           ref, mask);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::StencilFuncSeparate>(face, func, ref, mask);
>-
>         if (context->skipValidation() ||
>             ValidateStencilFuncSeparate(context, face, func, ref, mask))
>         {
>@@ -1874,13 +1786,12 @@ void GL_APIENTRY StencilFuncSeparate(GLenum face, GLenum func, GLint ref, GLuint
> 
> void GL_APIENTRY StencilMask(GLuint mask)
> {
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>     EVENT("(GLuint mask = %u)", mask);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::StencilMask>(mask);
>-
>         if (context->skipValidation() || ValidateStencilMask(context, mask))
>         {
>             context->stencilMask(mask);
>@@ -1890,13 +1801,12 @@ void GL_APIENTRY StencilMask(GLuint mask)
> 
> void GL_APIENTRY StencilMaskSeparate(GLenum face, GLuint mask)
> {
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>     EVENT("(GLenum face = 0x%X, GLuint mask = %u)", face, mask);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::StencilMaskSeparate>(face, mask);
>-
>         if (context->skipValidation() || ValidateStencilMaskSeparate(context, face, mask))
>         {
>             context->stencilMaskSeparate(face, mask);
>@@ -1906,13 +1816,12 @@ void GL_APIENTRY StencilMaskSeparate(GLenum face, GLuint mask)
> 
> void GL_APIENTRY StencilOp(GLenum fail, GLenum zfail, GLenum zpass)
> {
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>     EVENT("(GLenum fail = 0x%X, GLenum zfail = 0x%X, GLenum zpass = 0x%X)", fail, zfail, zpass);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::StencilOp>(fail, zfail, zpass);
>-
>         if (context->skipValidation() || ValidateStencilOp(context, fail, zfail, zpass))
>         {
>             context->stencilOp(fail, zfail, zpass);
>@@ -1922,14 +1831,13 @@ void GL_APIENTRY StencilOp(GLenum fail, GLenum zfail, GLenum zpass)
> 
> void GL_APIENTRY StencilOpSeparate(GLenum face, GLenum sfail, GLenum dpfail, GLenum dppass)
> {
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>     EVENT("(GLenum face = 0x%X, GLenum sfail = 0x%X, GLenum dpfail = 0x%X, GLenum dppass = 0x%X)",
>           face, sfail, dpfail, dppass);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::StencilOpSeparate>(face, sfail, dpfail, dppass);
>-
>         if (context->skipValidation() ||
>             ValidateStencilOpSeparate(context, face, sfail, dpfail, dppass))
>         {
>@@ -1948,90 +1856,91 @@ void GL_APIENTRY TexImage2D(GLenum target,
>                             GLenum type,
>                             const void *pixels)
> {
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>     EVENT(
>         "(GLenum target = 0x%X, GLint level = %d, GLint internalformat = %d, GLsizei width = %d, "
>         "GLsizei height = %d, GLint border = %d, GLenum format = 0x%X, GLenum type = 0x%X, const "
>-        "void *pixels = 0x%0.8p)",
>-        target, level, internalformat, width, height, border, format, type, pixels);
>+        "void *pixels = 0x%016" PRIxPTR ")",
>+        target, level, internalformat, width, height, border, format, type, (uintptr_t)pixels);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::TexImage2D>(target, level, internalformat, width, height,
>-                                                      border, format, type, pixels);
>-
>+        TextureTarget targetPacked = FromGLenum<TextureTarget>(target);
>         if (context->skipValidation() ||
>-            ValidateTexImage2D(context, target, level, internalformat, width, height, border,
>+            ValidateTexImage2D(context, targetPacked, level, internalformat, width, height, border,
>                                format, type, pixels))
>         {
>-            context->texImage2D(target, level, internalformat, width, height, border, format, type,
>-                                pixels);
>+            context->texImage2D(targetPacked, level, internalformat, width, height, border, format,
>+                                type, pixels);
>         }
>     }
> }
> 
> void GL_APIENTRY TexParameterf(GLenum target, GLenum pname, GLfloat param)
> {
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>     EVENT("(GLenum target = 0x%X, GLenum pname = 0x%X, GLfloat param = %f)", target, pname, param);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::TexParameterf>(target, pname, param);
>-
>-        if (context->skipValidation() || ValidateTexParameterf(context, target, pname, param))
>+        TextureType targetPacked = FromGLenum<TextureType>(target);
>+        if (context->skipValidation() || ValidateTexParameterf(context, targetPacked, pname, param))
>         {
>-            context->texParameterf(target, pname, param);
>+            context->texParameterf(targetPacked, pname, param);
>         }
>     }
> }
> 
> void GL_APIENTRY TexParameterfv(GLenum target, GLenum pname, const GLfloat *params)
> {
>-    EVENT("(GLenum target = 0x%X, GLenum pname = 0x%X, const GLfloat *params = 0x%0.8p)", target,
>-          pname, params);
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum target = 0x%X, GLenum pname = 0x%X, const GLfloat *params = 0x%016" PRIxPTR ")",
>+          target, pname, (uintptr_t)params);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::TexParameterfv>(target, pname, params);
>-
>-        if (context->skipValidation() || ValidateTexParameterfv(context, target, pname, params))
>+        TextureType targetPacked = FromGLenum<TextureType>(target);
>+        if (context->skipValidation() ||
>+            ValidateTexParameterfv(context, targetPacked, pname, params))
>         {
>-            context->texParameterfv(target, pname, params);
>+            context->texParameterfv(targetPacked, pname, params);
>         }
>     }
> }
> 
> void GL_APIENTRY TexParameteri(GLenum target, GLenum pname, GLint param)
> {
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>     EVENT("(GLenum target = 0x%X, GLenum pname = 0x%X, GLint param = %d)", target, pname, param);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::TexParameteri>(target, pname, param);
>-
>-        if (context->skipValidation() || ValidateTexParameteri(context, target, pname, param))
>+        TextureType targetPacked = FromGLenum<TextureType>(target);
>+        if (context->skipValidation() || ValidateTexParameteri(context, targetPacked, pname, param))
>         {
>-            context->texParameteri(target, pname, param);
>+            context->texParameteri(targetPacked, pname, param);
>         }
>     }
> }
> 
> void GL_APIENTRY TexParameteriv(GLenum target, GLenum pname, const GLint *params)
> {
>-    EVENT("(GLenum target = 0x%X, GLenum pname = 0x%X, const GLint *params = 0x%0.8p)", target,
>-          pname, params);
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum target = 0x%X, GLenum pname = 0x%X, const GLint *params = 0x%016" PRIxPTR ")",
>+          target, pname, (uintptr_t)params);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::TexParameteriv>(target, pname, params);
>-
>-        if (context->skipValidation() || ValidateTexParameteriv(context, target, pname, params))
>+        TextureType targetPacked = FromGLenum<TextureType>(target);
>+        if (context->skipValidation() ||
>+            ValidateTexParameteriv(context, targetPacked, pname, params))
>         {
>-            context->texParameteriv(target, pname, params);
>+            context->texParameteriv(targetPacked, pname, params);
>         }
>     }
> }
>@@ -2046,37 +1955,35 @@ void GL_APIENTRY TexSubImage2D(GLenum target,
>                                GLenum type,
>                                const void *pixels)
> {
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>     EVENT(
>         "(GLenum target = 0x%X, GLint level = %d, GLint xoffset = %d, GLint yoffset = %d, GLsizei "
>         "width = %d, GLsizei height = %d, GLenum format = 0x%X, GLenum type = 0x%X, const void "
>-        "*pixels = 0x%0.8p)",
>-        target, level, xoffset, yoffset, width, height, format, type, pixels);
>+        "*pixels = 0x%016" PRIxPTR ")",
>+        target, level, xoffset, yoffset, width, height, format, type, (uintptr_t)pixels);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::TexSubImage2D>(target, level, xoffset, yoffset, width,
>-                                                         height, format, type, pixels);
>-
>+        TextureTarget targetPacked = FromGLenum<TextureTarget>(target);
>         if (context->skipValidation() ||
>-            ValidateTexSubImage2D(context, target, level, xoffset, yoffset, width, height, format,
>-                                  type, pixels))
>+            ValidateTexSubImage2D(context, targetPacked, level, xoffset, yoffset, width, height,
>+                                  format, type, pixels))
>         {
>-            context->texSubImage2D(target, level, xoffset, yoffset, width, height, format, type,
>-                                   pixels);
>+            context->texSubImage2D(targetPacked, level, xoffset, yoffset, width, height, format,
>+                                   type, pixels);
>         }
>     }
> }
> 
> void GL_APIENTRY Uniform1f(GLint location, GLfloat v0)
> {
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>     EVENT("(GLint location = %d, GLfloat v0 = %f)", location, v0);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::Uniform1f>(location, v0);
>-
>         if (context->skipValidation() || ValidateUniform1f(context, location, v0))
>         {
>             context->uniform1f(location, v0);
>@@ -2086,14 +1993,13 @@ void GL_APIENTRY Uniform1f(GLint location, GLfloat v0)
> 
> void GL_APIENTRY Uniform1fv(GLint location, GLsizei count, const GLfloat *value)
> {
>-    EVENT("(GLint location = %d, GLsizei count = %d, const GLfloat *value = 0x%0.8p)", location,
>-          count, value);
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLint location = %d, GLsizei count = %d, const GLfloat *value = 0x%016" PRIxPTR ")",
>+          location, count, (uintptr_t)value);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::Uniform1fv>(location, count, value);
>-
>         if (context->skipValidation() || ValidateUniform1fv(context, location, count, value))
>         {
>             context->uniform1fv(location, count, value);
>@@ -2103,13 +2009,12 @@ void GL_APIENTRY Uniform1fv(GLint location, GLsizei count, const GLfloat *value)
> 
> void GL_APIENTRY Uniform1i(GLint location, GLint v0)
> {
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>     EVENT("(GLint location = %d, GLint v0 = %d)", location, v0);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::Uniform1i>(location, v0);
>-
>         if (context->skipValidation() || ValidateUniform1i(context, location, v0))
>         {
>             context->uniform1i(location, v0);
>@@ -2119,14 +2024,13 @@ void GL_APIENTRY Uniform1i(GLint location, GLint v0)
> 
> void GL_APIENTRY Uniform1iv(GLint location, GLsizei count, const GLint *value)
> {
>-    EVENT("(GLint location = %d, GLsizei count = %d, const GLint *value = 0x%0.8p)", location,
>-          count, value);
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLint location = %d, GLsizei count = %d, const GLint *value = 0x%016" PRIxPTR ")",
>+          location, count, (uintptr_t)value);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::Uniform1iv>(location, count, value);
>-
>         if (context->skipValidation() || ValidateUniform1iv(context, location, count, value))
>         {
>             context->uniform1iv(location, count, value);
>@@ -2136,13 +2040,12 @@ void GL_APIENTRY Uniform1iv(GLint location, GLsizei count, const GLint *value)
> 
> void GL_APIENTRY Uniform2f(GLint location, GLfloat v0, GLfloat v1)
> {
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>     EVENT("(GLint location = %d, GLfloat v0 = %f, GLfloat v1 = %f)", location, v0, v1);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::Uniform2f>(location, v0, v1);
>-
>         if (context->skipValidation() || ValidateUniform2f(context, location, v0, v1))
>         {
>             context->uniform2f(location, v0, v1);
>@@ -2152,14 +2055,13 @@ void GL_APIENTRY Uniform2f(GLint location, GLfloat v0, GLfloat v1)
> 
> void GL_APIENTRY Uniform2fv(GLint location, GLsizei count, const GLfloat *value)
> {
>-    EVENT("(GLint location = %d, GLsizei count = %d, const GLfloat *value = 0x%0.8p)", location,
>-          count, value);
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLint location = %d, GLsizei count = %d, const GLfloat *value = 0x%016" PRIxPTR ")",
>+          location, count, (uintptr_t)value);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::Uniform2fv>(location, count, value);
>-
>         if (context->skipValidation() || ValidateUniform2fv(context, location, count, value))
>         {
>             context->uniform2fv(location, count, value);
>@@ -2169,13 +2071,12 @@ void GL_APIENTRY Uniform2fv(GLint location, GLsizei count, const GLfloat *value)
> 
> void GL_APIENTRY Uniform2i(GLint location, GLint v0, GLint v1)
> {
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>     EVENT("(GLint location = %d, GLint v0 = %d, GLint v1 = %d)", location, v0, v1);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::Uniform2i>(location, v0, v1);
>-
>         if (context->skipValidation() || ValidateUniform2i(context, location, v0, v1))
>         {
>             context->uniform2i(location, v0, v1);
>@@ -2185,14 +2086,13 @@ void GL_APIENTRY Uniform2i(GLint location, GLint v0, GLint v1)
> 
> void GL_APIENTRY Uniform2iv(GLint location, GLsizei count, const GLint *value)
> {
>-    EVENT("(GLint location = %d, GLsizei count = %d, const GLint *value = 0x%0.8p)", location,
>-          count, value);
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLint location = %d, GLsizei count = %d, const GLint *value = 0x%016" PRIxPTR ")",
>+          location, count, (uintptr_t)value);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::Uniform2iv>(location, count, value);
>-
>         if (context->skipValidation() || ValidateUniform2iv(context, location, count, value))
>         {
>             context->uniform2iv(location, count, value);
>@@ -2202,14 +2102,13 @@ void GL_APIENTRY Uniform2iv(GLint location, GLsizei count, const GLint *value)
> 
> void GL_APIENTRY Uniform3f(GLint location, GLfloat v0, GLfloat v1, GLfloat v2)
> {
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>     EVENT("(GLint location = %d, GLfloat v0 = %f, GLfloat v1 = %f, GLfloat v2 = %f)", location, v0,
>           v1, v2);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::Uniform3f>(location, v0, v1, v2);
>-
>         if (context->skipValidation() || ValidateUniform3f(context, location, v0, v1, v2))
>         {
>             context->uniform3f(location, v0, v1, v2);
>@@ -2219,14 +2118,13 @@ void GL_APIENTRY Uniform3f(GLint location, GLfloat v0, GLfloat v1, GLfloat v2)
> 
> void GL_APIENTRY Uniform3fv(GLint location, GLsizei count, const GLfloat *value)
> {
>-    EVENT("(GLint location = %d, GLsizei count = %d, const GLfloat *value = 0x%0.8p)", location,
>-          count, value);
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLint location = %d, GLsizei count = %d, const GLfloat *value = 0x%016" PRIxPTR ")",
>+          location, count, (uintptr_t)value);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::Uniform3fv>(location, count, value);
>-
>         if (context->skipValidation() || ValidateUniform3fv(context, location, count, value))
>         {
>             context->uniform3fv(location, count, value);
>@@ -2236,14 +2134,13 @@ void GL_APIENTRY Uniform3fv(GLint location, GLsizei count, const GLfloat *value)
> 
> void GL_APIENTRY Uniform3i(GLint location, GLint v0, GLint v1, GLint v2)
> {
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>     EVENT("(GLint location = %d, GLint v0 = %d, GLint v1 = %d, GLint v2 = %d)", location, v0, v1,
>           v2);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::Uniform3i>(location, v0, v1, v2);
>-
>         if (context->skipValidation() || ValidateUniform3i(context, location, v0, v1, v2))
>         {
>             context->uniform3i(location, v0, v1, v2);
>@@ -2253,14 +2150,13 @@ void GL_APIENTRY Uniform3i(GLint location, GLint v0, GLint v1, GLint v2)
> 
> void GL_APIENTRY Uniform3iv(GLint location, GLsizei count, const GLint *value)
> {
>-    EVENT("(GLint location = %d, GLsizei count = %d, const GLint *value = 0x%0.8p)", location,
>-          count, value);
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLint location = %d, GLsizei count = %d, const GLint *value = 0x%016" PRIxPTR ")",
>+          location, count, (uintptr_t)value);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::Uniform3iv>(location, count, value);
>-
>         if (context->skipValidation() || ValidateUniform3iv(context, location, count, value))
>         {
>             context->uniform3iv(location, count, value);
>@@ -2270,6 +2166,7 @@ void GL_APIENTRY Uniform3iv(GLint location, GLsizei count, const GLint *value)
> 
> void GL_APIENTRY Uniform4f(GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3)
> {
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>     EVENT(
>         "(GLint location = %d, GLfloat v0 = %f, GLfloat v1 = %f, GLfloat v2 = %f, GLfloat v3 = %f)",
>         location, v0, v1, v2, v3);
>@@ -2277,8 +2174,6 @@ void GL_APIENTRY Uniform4f(GLint location, GLfloat v0, GLfloat v1, GLfloat v2, G
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::Uniform4f>(location, v0, v1, v2, v3);
>-
>         if (context->skipValidation() || ValidateUniform4f(context, location, v0, v1, v2, v3))
>         {
>             context->uniform4f(location, v0, v1, v2, v3);
>@@ -2288,14 +2183,13 @@ void GL_APIENTRY Uniform4f(GLint location, GLfloat v0, GLfloat v1, GLfloat v2, G
> 
> void GL_APIENTRY Uniform4fv(GLint location, GLsizei count, const GLfloat *value)
> {
>-    EVENT("(GLint location = %d, GLsizei count = %d, const GLfloat *value = 0x%0.8p)", location,
>-          count, value);
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLint location = %d, GLsizei count = %d, const GLfloat *value = 0x%016" PRIxPTR ")",
>+          location, count, (uintptr_t)value);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::Uniform4fv>(location, count, value);
>-
>         if (context->skipValidation() || ValidateUniform4fv(context, location, count, value))
>         {
>             context->uniform4fv(location, count, value);
>@@ -2305,14 +2199,13 @@ void GL_APIENTRY Uniform4fv(GLint location, GLsizei count, const GLfloat *value)
> 
> void GL_APIENTRY Uniform4i(GLint location, GLint v0, GLint v1, GLint v2, GLint v3)
> {
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>     EVENT("(GLint location = %d, GLint v0 = %d, GLint v1 = %d, GLint v2 = %d, GLint v3 = %d)",
>           location, v0, v1, v2, v3);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::Uniform4i>(location, v0, v1, v2, v3);
>-
>         if (context->skipValidation() || ValidateUniform4i(context, location, v0, v1, v2, v3))
>         {
>             context->uniform4i(location, v0, v1, v2, v3);
>@@ -2322,14 +2215,13 @@ void GL_APIENTRY Uniform4i(GLint location, GLint v0, GLint v1, GLint v2, GLint v
> 
> void GL_APIENTRY Uniform4iv(GLint location, GLsizei count, const GLint *value)
> {
>-    EVENT("(GLint location = %d, GLsizei count = %d, const GLint *value = 0x%0.8p)", location,
>-          count, value);
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLint location = %d, GLsizei count = %d, const GLint *value = 0x%016" PRIxPTR ")",
>+          location, count, (uintptr_t)value);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::Uniform4iv>(location, count, value);
>-
>         if (context->skipValidation() || ValidateUniform4iv(context, location, count, value))
>         {
>             context->uniform4iv(location, count, value);
>@@ -2342,16 +2234,15 @@ void GL_APIENTRY UniformMatrix2fv(GLint location,
>                                   GLboolean transpose,
>                                   const GLfloat *value)
> {
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>     EVENT(
>         "(GLint location = %d, GLsizei count = %d, GLboolean transpose = %u, const GLfloat *value "
>-        "= 0x%0.8p)",
>-        location, count, transpose, value);
>+        "= 0x%016" PRIxPTR ")",
>+        location, count, transpose, (uintptr_t)value);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::UniformMatrix2fv>(location, count, transpose, value);
>-
>         if (context->skipValidation() ||
>             ValidateUniformMatrix2fv(context, location, count, transpose, value))
>         {
>@@ -2365,16 +2256,15 @@ void GL_APIENTRY UniformMatrix3fv(GLint location,
>                                   GLboolean transpose,
>                                   const GLfloat *value)
> {
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>     EVENT(
>         "(GLint location = %d, GLsizei count = %d, GLboolean transpose = %u, const GLfloat *value "
>-        "= 0x%0.8p)",
>-        location, count, transpose, value);
>+        "= 0x%016" PRIxPTR ")",
>+        location, count, transpose, (uintptr_t)value);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::UniformMatrix3fv>(location, count, transpose, value);
>-
>         if (context->skipValidation() ||
>             ValidateUniformMatrix3fv(context, location, count, transpose, value))
>         {
>@@ -2388,16 +2278,15 @@ void GL_APIENTRY UniformMatrix4fv(GLint location,
>                                   GLboolean transpose,
>                                   const GLfloat *value)
> {
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>     EVENT(
>         "(GLint location = %d, GLsizei count = %d, GLboolean transpose = %u, const GLfloat *value "
>-        "= 0x%0.8p)",
>-        location, count, transpose, value);
>+        "= 0x%016" PRIxPTR ")",
>+        location, count, transpose, (uintptr_t)value);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::UniformMatrix4fv>(location, count, transpose, value);
>-
>         if (context->skipValidation() ||
>             ValidateUniformMatrix4fv(context, location, count, transpose, value))
>         {
>@@ -2408,13 +2297,12 @@ void GL_APIENTRY UniformMatrix4fv(GLint location,
> 
> void GL_APIENTRY UseProgram(GLuint program)
> {
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>     EVENT("(GLuint program = %u)", program);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::UseProgram>(program);
>-
>         if (context->skipValidation() || ValidateUseProgram(context, program))
>         {
>             context->useProgram(program);
>@@ -2424,13 +2312,12 @@ void GL_APIENTRY UseProgram(GLuint program)
> 
> void GL_APIENTRY ValidateProgram(GLuint program)
> {
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>     EVENT("(GLuint program = %u)", program);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::ValidateProgram>(program);
>-
>         if (context->skipValidation() || ValidateValidateProgram(context, program))
>         {
>             context->validateProgram(program);
>@@ -2440,13 +2327,12 @@ void GL_APIENTRY ValidateProgram(GLuint program)
> 
> void GL_APIENTRY VertexAttrib1f(GLuint index, GLfloat x)
> {
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>     EVENT("(GLuint index = %u, GLfloat x = %f)", index, x);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::VertexAttrib1f>(index, x);
>-
>         if (context->skipValidation() || ValidateVertexAttrib1f(context, index, x))
>         {
>             context->vertexAttrib1f(index, x);
>@@ -2456,13 +2342,12 @@ void GL_APIENTRY VertexAttrib1f(GLuint index, GLfloat x)
> 
> void GL_APIENTRY VertexAttrib1fv(GLuint index, const GLfloat *v)
> {
>-    EVENT("(GLuint index = %u, const GLfloat *v = 0x%0.8p)", index, v);
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint index = %u, const GLfloat *v = 0x%016" PRIxPTR ")", index, (uintptr_t)v);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::VertexAttrib1fv>(index, v);
>-
>         if (context->skipValidation() || ValidateVertexAttrib1fv(context, index, v))
>         {
>             context->vertexAttrib1fv(index, v);
>@@ -2472,13 +2357,12 @@ void GL_APIENTRY VertexAttrib1fv(GLuint index, const GLfloat *v)
> 
> void GL_APIENTRY VertexAttrib2f(GLuint index, GLfloat x, GLfloat y)
> {
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>     EVENT("(GLuint index = %u, GLfloat x = %f, GLfloat y = %f)", index, x, y);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::VertexAttrib2f>(index, x, y);
>-
>         if (context->skipValidation() || ValidateVertexAttrib2f(context, index, x, y))
>         {
>             context->vertexAttrib2f(index, x, y);
>@@ -2488,13 +2372,12 @@ void GL_APIENTRY VertexAttrib2f(GLuint index, GLfloat x, GLfloat y)
> 
> void GL_APIENTRY VertexAttrib2fv(GLuint index, const GLfloat *v)
> {
>-    EVENT("(GLuint index = %u, const GLfloat *v = 0x%0.8p)", index, v);
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint index = %u, const GLfloat *v = 0x%016" PRIxPTR ")", index, (uintptr_t)v);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::VertexAttrib2fv>(index, v);
>-
>         if (context->skipValidation() || ValidateVertexAttrib2fv(context, index, v))
>         {
>             context->vertexAttrib2fv(index, v);
>@@ -2504,13 +2387,12 @@ void GL_APIENTRY VertexAttrib2fv(GLuint index, const GLfloat *v)
> 
> void GL_APIENTRY VertexAttrib3f(GLuint index, GLfloat x, GLfloat y, GLfloat z)
> {
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>     EVENT("(GLuint index = %u, GLfloat x = %f, GLfloat y = %f, GLfloat z = %f)", index, x, y, z);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::VertexAttrib3f>(index, x, y, z);
>-
>         if (context->skipValidation() || ValidateVertexAttrib3f(context, index, x, y, z))
>         {
>             context->vertexAttrib3f(index, x, y, z);
>@@ -2520,13 +2402,12 @@ void GL_APIENTRY VertexAttrib3f(GLuint index, GLfloat x, GLfloat y, GLfloat z)
> 
> void GL_APIENTRY VertexAttrib3fv(GLuint index, const GLfloat *v)
> {
>-    EVENT("(GLuint index = %u, const GLfloat *v = 0x%0.8p)", index, v);
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint index = %u, const GLfloat *v = 0x%016" PRIxPTR ")", index, (uintptr_t)v);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::VertexAttrib3fv>(index, v);
>-
>         if (context->skipValidation() || ValidateVertexAttrib3fv(context, index, v))
>         {
>             context->vertexAttrib3fv(index, v);
>@@ -2536,14 +2417,13 @@ void GL_APIENTRY VertexAttrib3fv(GLuint index, const GLfloat *v)
> 
> void GL_APIENTRY VertexAttrib4f(GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w)
> {
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>     EVENT("(GLuint index = %u, GLfloat x = %f, GLfloat y = %f, GLfloat z = %f, GLfloat w = %f)",
>           index, x, y, z, w);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::VertexAttrib4f>(index, x, y, z, w);
>-
>         if (context->skipValidation() || ValidateVertexAttrib4f(context, index, x, y, z, w))
>         {
>             context->vertexAttrib4f(index, x, y, z, w);
>@@ -2553,13 +2433,12 @@ void GL_APIENTRY VertexAttrib4f(GLuint index, GLfloat x, GLfloat y, GLfloat z, G
> 
> void GL_APIENTRY VertexAttrib4fv(GLuint index, const GLfloat *v)
> {
>-    EVENT("(GLuint index = %u, const GLfloat *v = 0x%0.8p)", index, v);
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint index = %u, const GLfloat *v = 0x%016" PRIxPTR ")", index, (uintptr_t)v);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::VertexAttrib4fv>(index, v);
>-
>         if (context->skipValidation() || ValidateVertexAttrib4fv(context, index, v))
>         {
>             context->vertexAttrib4fv(index, v);
>@@ -2574,35 +2453,34 @@ void GL_APIENTRY VertexAttribPointer(GLuint index,
>                                      GLsizei stride,
>                                      const void *pointer)
> {
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>     EVENT(
>         "(GLuint index = %u, GLint size = %d, GLenum type = 0x%X, GLboolean normalized = %u, "
>-        "GLsizei stride = %d, const void *pointer = 0x%0.8p)",
>-        index, size, type, normalized, stride, pointer);
>+        "GLsizei stride = %d, const void *pointer = 0x%016" PRIxPTR ")",
>+        index, size, type, normalized, stride, (uintptr_t)pointer);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::VertexAttribPointer>(index, size, type, normalized,
>-                                                               stride, pointer);
>-
>+        VertexAttribType typePacked = FromGLenum<VertexAttribType>(type);
>         if (context->skipValidation() ||
>-            ValidateVertexAttribPointer(context, index, size, type, normalized, stride, pointer))
>+            ValidateVertexAttribPointer(context, index, size, typePacked, normalized, stride,
>+                                        pointer))
>         {
>-            context->vertexAttribPointer(index, size, type, normalized, stride, pointer);
>+            context->vertexAttribPointer(index, size, typePacked, normalized, stride, pointer);
>         }
>     }
> }
> 
> void GL_APIENTRY Viewport(GLint x, GLint y, GLsizei width, GLsizei height)
> {
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>     EVENT("(GLint x = %d, GLint y = %d, GLsizei width = %d, GLsizei height = %d)", x, y, width,
>           height);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::Viewport>(x, y, width, height);
>-
>         if (context->skipValidation() || ValidateViewport(context, x, y, width, height))
>         {
>             context->viewport(x, y, width, height);
>diff --git a/Source/ThirdParty/ANGLE/src/libGLESv2/entry_points_gles_2_0_autogen.h b/Source/ThirdParty/ANGLE/src/libGLESv2/entry_points_gles_2_0_autogen.h
>index 7735b46fa41..4b2a0f53cb3 100644
>--- a/Source/ThirdParty/ANGLE/src/libGLESv2/entry_points_gles_2_0_autogen.h
>+++ b/Source/ThirdParty/ANGLE/src/libGLESv2/entry_points_gles_2_0_autogen.h
>@@ -1,15 +1,15 @@
> // GENERATED FILE - DO NOT EDIT.
> // Generated by generate_entry_points.py using data from gl.xml.
> //
>-// Copyright 2017 The ANGLE Project Authors. All rights reserved.
>+// Copyright 2019 The ANGLE Project Authors. All rights reserved.
> // Use of this source code is governed by a BSD-style license that can be
> // found in the LICENSE file.
> //
> // entry_points_gles_2_0_autogen.h:
> //   Defines the GLES 2.0 entry points.
> 
>-#ifndef LIBGLESV2_ENTRYPOINTSGLES20_AUTOGEN_H_
>-#define LIBGLESV2_ENTRYPOINTSGLES20_AUTOGEN_H_
>+#ifndef LIBGLESV2_ENTRY_POINTS_GLES_2_0_AUTOGEN_H_
>+#define LIBGLESV2_ENTRY_POINTS_GLES_2_0_AUTOGEN_H_
> 
> #include <GLES2/gl2.h>
> #include <export.h>
>@@ -117,10 +117,10 @@ ANGLE_EXPORT void GL_APIENTRY FramebufferTexture2D(GLenum target,
>                                                    GLint level);
> ANGLE_EXPORT void GL_APIENTRY FrontFace(GLenum mode);
> ANGLE_EXPORT void GL_APIENTRY GenBuffers(GLsizei n, GLuint *buffers);
>-ANGLE_EXPORT void GL_APIENTRY GenerateMipmap(GLenum target);
> ANGLE_EXPORT void GL_APIENTRY GenFramebuffers(GLsizei n, GLuint *framebuffers);
> ANGLE_EXPORT void GL_APIENTRY GenRenderbuffers(GLsizei n, GLuint *renderbuffers);
> ANGLE_EXPORT void GL_APIENTRY GenTextures(GLsizei n, GLuint *textures);
>+ANGLE_EXPORT void GL_APIENTRY GenerateMipmap(GLenum target);
> ANGLE_EXPORT void GL_APIENTRY GetActiveAttrib(GLuint program,
>                                               GLuint index,
>                                               GLsizei bufSize,
>@@ -149,15 +149,14 @@ ANGLE_EXPORT void GL_APIENTRY GetFramebufferAttachmentParameteriv(GLenum target,
>                                                                   GLenum pname,
>                                                                   GLint *params);
> ANGLE_EXPORT void GL_APIENTRY GetIntegerv(GLenum pname, GLint *data);
>-ANGLE_EXPORT void GL_APIENTRY GetProgramiv(GLuint program, GLenum pname, GLint *params);
> ANGLE_EXPORT void GL_APIENTRY GetProgramInfoLog(GLuint program,
>                                                 GLsizei bufSize,
>                                                 GLsizei *length,
>                                                 GLchar *infoLog);
>+ANGLE_EXPORT void GL_APIENTRY GetProgramiv(GLuint program, GLenum pname, GLint *params);
> ANGLE_EXPORT void GL_APIENTRY GetRenderbufferParameteriv(GLenum target,
>                                                          GLenum pname,
>                                                          GLint *params);
>-ANGLE_EXPORT void GL_APIENTRY GetShaderiv(GLuint shader, GLenum pname, GLint *params);
> ANGLE_EXPORT void GL_APIENTRY GetShaderInfoLog(GLuint shader,
>                                                GLsizei bufSize,
>                                                GLsizei *length,
>@@ -170,15 +169,16 @@ ANGLE_EXPORT void GL_APIENTRY GetShaderSource(GLuint shader,
>                                               GLsizei bufSize,
>                                               GLsizei *length,
>                                               GLchar *source);
>+ANGLE_EXPORT void GL_APIENTRY GetShaderiv(GLuint shader, GLenum pname, GLint *params);
> ANGLE_EXPORT const GLubyte *GL_APIENTRY GetString(GLenum name);
> ANGLE_EXPORT void GL_APIENTRY GetTexParameterfv(GLenum target, GLenum pname, GLfloat *params);
> ANGLE_EXPORT void GL_APIENTRY GetTexParameteriv(GLenum target, GLenum pname, GLint *params);
>+ANGLE_EXPORT GLint GL_APIENTRY GetUniformLocation(GLuint program, const GLchar *name);
> ANGLE_EXPORT void GL_APIENTRY GetUniformfv(GLuint program, GLint location, GLfloat *params);
> ANGLE_EXPORT void GL_APIENTRY GetUniformiv(GLuint program, GLint location, GLint *params);
>-ANGLE_EXPORT GLint GL_APIENTRY GetUniformLocation(GLuint program, const GLchar *name);
>+ANGLE_EXPORT void GL_APIENTRY GetVertexAttribPointerv(GLuint index, GLenum pname, void **pointer);
> ANGLE_EXPORT void GL_APIENTRY GetVertexAttribfv(GLuint index, GLenum pname, GLfloat *params);
> ANGLE_EXPORT void GL_APIENTRY GetVertexAttribiv(GLuint index, GLenum pname, GLint *params);
>-ANGLE_EXPORT void GL_APIENTRY GetVertexAttribPointerv(GLuint index, GLenum pname, void **pointer);
> ANGLE_EXPORT void GL_APIENTRY Hint(GLenum target, GLenum mode);
> ANGLE_EXPORT GLboolean GL_APIENTRY IsBuffer(GLuint buffer);
> ANGLE_EXPORT GLboolean GL_APIENTRY IsEnabled(GLenum cap);
>@@ -294,4 +294,4 @@ ANGLE_EXPORT void GL_APIENTRY VertexAttribPointer(GLuint index,
> ANGLE_EXPORT void GL_APIENTRY Viewport(GLint x, GLint y, GLsizei width, GLsizei height);
> }  // namespace gl
> 
>-#endif  // LIBGLESV2_ENTRYPOINTSGLES20_AUTOGEN_H_
>+#endif  // LIBGLESV2_ENTRY_POINTS_GLES_2_0_AUTOGEN_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libGLESv2/entry_points_gles_2_0_ext.cpp b/Source/ThirdParty/ANGLE/src/libGLESv2/entry_points_gles_2_0_ext.cpp
>deleted file mode 100644
>index d4459ec287a..00000000000
>--- a/Source/ThirdParty/ANGLE/src/libGLESv2/entry_points_gles_2_0_ext.cpp
>+++ /dev/null
>@@ -1,3558 +0,0 @@
>-//
>-// Copyright(c) 2014 The ANGLE Project Authors. All rights reserved.
>-// Use of this source code is governed by a BSD-style license that can be
>-// found in the LICENSE file.
>-//
>-
>-// entry_points_gles_2_0_ext.cpp : Implements the GLES 2.0 extension entry points.
>-
>-#include "libGLESv2/entry_points_gles_2_0_ext.h"
>-#include "libGLESv2/global_state.h"
>-
>-#include "libANGLE/Buffer.h"
>-#include "libANGLE/Context.h"
>-#include "libANGLE/Error.h"
>-#include "libANGLE/ErrorStrings.h"
>-#include "libANGLE/Fence.h"
>-#include "libANGLE/Framebuffer.h"
>-#include "libANGLE/Query.h"
>-#include "libANGLE/Shader.h"
>-#include "libANGLE/Thread.h"
>-#include "libANGLE/VertexArray.h"
>-#include "libANGLE/queryconversions.h"
>-#include "libANGLE/queryutils.h"
>-
>-#include "libANGLE/validationES.h"
>-#include "libANGLE/validationES2.h"
>-#include "libANGLE/validationES3.h"
>-#include "libANGLE/validationES31.h"
>-
>-#include "common/debug.h"
>-#include "common/utilities.h"
>-
>-namespace gl
>-{
>-
>-namespace
>-{
>-
>-void SetRobustLengthParam(GLsizei *length, GLsizei value)
>-{
>-    if (length)
>-    {
>-        *length = value;
>-    }
>-}
>-
>-}  // anonymous namespace
>-
>-void GL_APIENTRY GenQueriesEXT(GLsizei n, GLuint *ids)
>-{
>-    EVENT("(GLsizei n = %d, GLuint* ids = 0x%0.8p)", n, ids);
>-
>-    Context *context = GetValidGlobalContext();
>-    if (context)
>-    {
>-        if (!context->skipValidation() && !ValidateGenQueriesEXT(context, n, ids))
>-        {
>-            return;
>-        }
>-
>-        context->genQueries(n, ids);
>-    }
>-}
>-
>-void GL_APIENTRY DeleteQueriesEXT(GLsizei n, const GLuint *ids)
>-{
>-    EVENT("(GLsizei n = %d, const GLuint *ids = 0x%0.8p)", n, ids);
>-
>-    Context *context = GetValidGlobalContext();
>-    if (context)
>-    {
>-        if (!context->skipValidation() && !ValidateDeleteQueriesEXT(context, n, ids))
>-        {
>-            return;
>-        }
>-
>-        context->deleteQueries(n, ids);
>-    }
>-}
>-
>-GLboolean GL_APIENTRY IsQueryEXT(GLuint id)
>-{
>-    EVENT("(GLuint id = %d)", id);
>-
>-    Context *context = GetValidGlobalContext();
>-    if (context)
>-    {
>-        if (!context->skipValidation() && !ValidateIsQueryEXT(context, id))
>-        {
>-            return GL_FALSE;
>-        }
>-
>-        return context->isQuery(id);
>-    }
>-
>-    return GL_FALSE;
>-}
>-
>-void GL_APIENTRY BeginQueryEXT(GLenum target, GLuint id)
>-{
>-    EVENT("(GLenum target = 0x%X, GLuint %d)", target, id);
>-
>-    Context *context = GetValidGlobalContext();
>-    if (context)
>-    {
>-        if (!context->skipValidation() && !ValidateBeginQueryEXT(context, target, id))
>-        {
>-            return;
>-        }
>-
>-        context->beginQuery(target, id);
>-    }
>-}
>-
>-void GL_APIENTRY EndQueryEXT(GLenum target)
>-{
>-    EVENT("GLenum target = 0x%X)", target);
>-
>-    Context *context = GetValidGlobalContext();
>-    if (context)
>-    {
>-        if (!context->skipValidation() && !ValidateEndQueryEXT(context, target))
>-        {
>-            return;
>-        }
>-
>-        context->endQuery(target);
>-    }
>-}
>-
>-void GL_APIENTRY QueryCounterEXT(GLuint id, GLenum target)
>-{
>-    EVENT("GLuint id = %d, GLenum target = 0x%X)", id, target);
>-
>-    Context *context = GetValidGlobalContext();
>-    if (context)
>-    {
>-        if (!context->skipValidation() && !ValidateQueryCounterEXT(context, id, target))
>-        {
>-            return;
>-        }
>-
>-        context->queryCounter(id, target);
>-    }
>-}
>-
>-void GL_APIENTRY GetQueryivEXT(GLenum target, GLenum pname, GLint *params)
>-{
>-    EVENT("GLenum target = 0x%X, GLenum pname = 0x%X, GLint *params = 0x%0.8p)", target, pname,
>-          params);
>-
>-    Context *context = GetValidGlobalContext();
>-    if (context)
>-    {
>-        if (!ValidateGetQueryivEXT(context, target, pname, params))
>-        {
>-            return;
>-        }
>-
>-        context->getQueryiv(target, pname, params);
>-    }
>-}
>-
>-void GL_APIENTRY GetQueryObjectivEXT(GLuint id, GLenum pname, GLint *params)
>-{
>-    EVENT("(GLuint id = %d, GLenum pname = 0x%X, GLuint *params = 0x%0.8p)", id, pname, params);
>-
>-    Context *context = GetValidGlobalContext();
>-    if (context)
>-    {
>-        if (!ValidateGetQueryObjectivEXT(context, id, pname, params))
>-        {
>-            return;
>-        }
>-
>-        context->getQueryObjectiv(id, pname, params);
>-    }
>-}
>-
>-void GL_APIENTRY GetQueryObjectuivEXT(GLuint id, GLenum pname, GLuint *params)
>-{
>-    EVENT("(GLuint id = %d, GLenum pname = 0x%X, GLuint *params = 0x%0.8p)", id, pname, params);
>-
>-    Context *context = GetValidGlobalContext();
>-    if (context)
>-    {
>-        if (!ValidateGetQueryObjectuivEXT(context, id, pname, params))
>-        {
>-            return;
>-        }
>-
>-        context->getQueryObjectuiv(id, pname, params);
>-    }
>-}
>-
>-void GL_APIENTRY GetQueryObjecti64vEXT(GLuint id, GLenum pname, GLint64 *params)
>-{
>-    EVENT("(GLuint id = %d, GLenum pname = 0x%X, GLuint *params = 0x%0.16p)", id, pname, params);
>-
>-    Context *context = GetValidGlobalContext();
>-    if (context)
>-    {
>-        if (!ValidateGetQueryObjecti64vEXT(context, id, pname, params))
>-        {
>-            return;
>-        }
>-
>-        context->getQueryObjecti64v(id, pname, params);
>-    }
>-}
>-
>-void GL_APIENTRY GetQueryObjectui64vEXT(GLuint id, GLenum pname, GLuint64 *params)
>-{
>-    EVENT("(GLuint id = %d, GLenum pname = 0x%X, GLuint *params = 0x%0.16p)", id, pname, params);
>-
>-    Context *context = GetValidGlobalContext();
>-    if (context)
>-    {
>-        if (!ValidateGetQueryObjectui64vEXT(context, id, pname, params))
>-        {
>-            return;
>-        }
>-
>-        context->getQueryObjectui64v(id, pname, params);
>-    }
>-}
>-
>-void GL_APIENTRY DeleteFencesNV(GLsizei n, const GLuint *fences)
>-{
>-    EVENT("(GLsizei n = %d, const GLuint* fences = 0x%0.8p)", n, fences);
>-
>-    Context *context = GetValidGlobalContext();
>-    if (context)
>-    {
>-        if (n < 0)
>-        {
>-            context->handleError(InvalidValue());
>-            return;
>-        }
>-
>-        for (int i = 0; i < n; i++)
>-        {
>-            context->deleteFenceNV(fences[i]);
>-        }
>-    }
>-}
>-
>-void GL_APIENTRY DrawArraysInstancedANGLE(GLenum mode,
>-                                          GLint first,
>-                                          GLsizei count,
>-                                          GLsizei primcount)
>-{
>-    EVENT("(GLenum mode = 0x%X, GLint first = %d, GLsizei count = %d, GLsizei primcount = %d)",
>-          mode, first, count, primcount);
>-
>-    Context *context = GetValidGlobalContext();
>-    if (context)
>-    {
>-        if (!ValidateDrawArraysInstancedANGLE(context, mode, first, count, primcount))
>-        {
>-            return;
>-        }
>-
>-        context->drawArraysInstanced(mode, first, count, primcount);
>-    }
>-}
>-
>-void GL_APIENTRY DrawElementsInstancedANGLE(GLenum mode,
>-                                            GLsizei count,
>-                                            GLenum type,
>-                                            const void *indices,
>-                                            GLsizei primcount)
>-{
>-    EVENT(
>-        "(GLenum mode = 0x%X, GLsizei count = %d, GLenum type = 0x%X, const void* indices = "
>-        "0x%0.8p, GLsizei primcount = %d)",
>-        mode, count, type, indices, primcount);
>-
>-    Context *context = GetValidGlobalContext();
>-    if (context)
>-    {
>-        context->gatherParams<EntryPoint::DrawElementsInstancedANGLE>(mode, count, type, indices,
>-                                                                      primcount);
>-
>-        if (!context->skipValidation() &&
>-            !ValidateDrawElementsInstancedANGLE(context, mode, count, type, indices, primcount))
>-        {
>-            return;
>-        }
>-
>-        context->drawElementsInstanced(mode, count, type, indices, primcount);
>-    }
>-}
>-
>-void GL_APIENTRY FinishFenceNV(GLuint fence)
>-{
>-    EVENT("(GLuint fence = %d)", fence);
>-
>-    Context *context = GetValidGlobalContext();
>-    if (context)
>-    {
>-        FenceNV *fenceObject = context->getFenceNV(fence);
>-
>-        if (fenceObject == nullptr)
>-        {
>-            context->handleError(InvalidOperation());
>-            return;
>-        }
>-
>-        if (fenceObject->isSet() != GL_TRUE)
>-        {
>-            context->handleError(InvalidOperation());
>-            return;
>-        }
>-
>-        context->handleError(fenceObject->finish());
>-    }
>-}
>-
>-void GL_APIENTRY GenFencesNV(GLsizei n, GLuint *fences)
>-{
>-    EVENT("(GLsizei n = %d, GLuint* fences = 0x%0.8p)", n, fences);
>-
>-    Context *context = GetValidGlobalContext();
>-    if (context)
>-    {
>-        if (n < 0)
>-        {
>-            context->handleError(InvalidValue());
>-            return;
>-        }
>-
>-        for (int i = 0; i < n; i++)
>-        {
>-            fences[i] = context->createFenceNV();
>-        }
>-    }
>-}
>-
>-void GL_APIENTRY GetFenceivNV(GLuint fence, GLenum pname, GLint *params)
>-{
>-    EVENT("(GLuint fence = %d, GLenum pname = 0x%X, GLint *params = 0x%0.8p)", fence, pname,
>-          params);
>-
>-    Context *context = GetValidGlobalContext();
>-    if (context)
>-    {
>-        FenceNV *fenceObject = context->getFenceNV(fence);
>-
>-        if (fenceObject == nullptr)
>-        {
>-            context->handleError(InvalidOperation());
>-            return;
>-        }
>-
>-        if (fenceObject->isSet() != GL_TRUE)
>-        {
>-            context->handleError(InvalidOperation());
>-            return;
>-        }
>-
>-        switch (pname)
>-        {
>-            case GL_FENCE_STATUS_NV:
>-            {
>-                // GL_NV_fence spec:
>-                // Once the status of a fence has been finished (via FinishFenceNV) or tested and
>-                // the returned status is TRUE (via either TestFenceNV or GetFenceivNV querying the
>-                // FENCE_STATUS_NV), the status remains TRUE until the next SetFenceNV of the fence.
>-                GLboolean status = GL_TRUE;
>-                if (fenceObject->getStatus() != GL_TRUE)
>-                {
>-                    Error error = fenceObject->test(&status);
>-                    if (error.isError())
>-                    {
>-                        context->handleError(error);
>-                        return;
>-                    }
>-                }
>-                *params = status;
>-                break;
>-            }
>-
>-            case GL_FENCE_CONDITION_NV:
>-            {
>-                *params = static_cast<GLint>(fenceObject->getCondition());
>-                break;
>-            }
>-
>-            default:
>-            {
>-                context->handleError(InvalidEnum());
>-                return;
>-            }
>-        }
>-    }
>-}
>-
>-GLenum GL_APIENTRY GetGraphicsResetStatusEXT(void)
>-{
>-    EVENT("()");
>-
>-    Context *context = GetGlobalContext();
>-
>-    if (context)
>-    {
>-        return context->getResetStatus();
>-    }
>-
>-    return GL_NO_ERROR;
>-}
>-
>-void GL_APIENTRY GetTranslatedShaderSourceANGLE(GLuint shader,
>-                                                GLsizei bufsize,
>-                                                GLsizei *length,
>-                                                GLchar *source)
>-{
>-    EVENT(
>-        "(GLuint shader = %d, GLsizei bufsize = %d, GLsizei* length = 0x%0.8p, GLchar* source = "
>-        "0x%0.8p)",
>-        shader, bufsize, length, source);
>-
>-    Context *context = GetValidGlobalContext();
>-    if (context)
>-    {
>-        if (bufsize < 0)
>-        {
>-            context->handleError(InvalidValue());
>-            return;
>-        }
>-
>-        Shader *shaderObject = context->getShader(shader);
>-
>-        if (!shaderObject)
>-        {
>-            context->handleError(InvalidOperation());
>-            return;
>-        }
>-
>-        shaderObject->getTranslatedSourceWithDebugInfo(context, bufsize, length, source);
>-    }
>-}
>-
>-void GL_APIENTRY GetnUniformfvEXT(GLuint program, GLint location, GLsizei bufSize, GLfloat *params)
>-{
>-    EVENT(
>-        "(GLuint program = %d, GLint location = %d, GLsizei bufSize = %d, GLfloat* params = "
>-        "0x%0.8p)",
>-        program, location, bufSize, params);
>-
>-    Context *context = GetValidGlobalContext();
>-    if (context)
>-    {
>-        if (!ValidateGetnUniformfvEXT(context, program, location, bufSize, params))
>-        {
>-            return;
>-        }
>-
>-        Program *programObject = context->getProgram(program);
>-        ASSERT(programObject);
>-
>-        programObject->getUniformfv(context, location, params);
>-    }
>-}
>-
>-void GL_APIENTRY GetnUniformivEXT(GLuint program, GLint location, GLsizei bufSize, GLint *params)
>-{
>-    EVENT(
>-        "(GLuint program = %d, GLint location = %d, GLsizei bufSize = %d, GLint* params = 0x%0.8p)",
>-        program, location, bufSize, params);
>-
>-    Context *context = GetValidGlobalContext();
>-    if (context)
>-    {
>-        if (!ValidateGetnUniformivEXT(context, program, location, bufSize, params))
>-        {
>-            return;
>-        }
>-
>-        Program *programObject = context->getProgram(program);
>-        ASSERT(programObject);
>-
>-        programObject->getUniformiv(context, location, params);
>-    }
>-}
>-
>-GLboolean GL_APIENTRY IsFenceNV(GLuint fence)
>-{
>-    EVENT("(GLuint fence = %d)", fence);
>-
>-    Context *context = GetValidGlobalContext();
>-    if (context)
>-    {
>-        FenceNV *fenceObject = context->getFenceNV(fence);
>-
>-        if (fenceObject == nullptr)
>-        {
>-            return GL_FALSE;
>-        }
>-
>-        // GL_NV_fence spec:
>-        // A name returned by GenFencesNV, but not yet set via SetFenceNV, is not the name of an
>-        // existing fence.
>-        return fenceObject->isSet();
>-    }
>-
>-    return GL_FALSE;
>-}
>-
>-void GL_APIENTRY ReadnPixelsEXT(GLint x,
>-                                GLint y,
>-                                GLsizei width,
>-                                GLsizei height,
>-                                GLenum format,
>-                                GLenum type,
>-                                GLsizei bufSize,
>-                                void *data)
>-{
>-    EVENT(
>-        "(GLint x = %d, GLint y = %d, GLsizei width = %d, GLsizei height = %d, "
>-        "GLenum format = 0x%X, GLenum type = 0x%X, GLsizei bufSize = 0x%d, void *data = 0x%0.8p)",
>-        x, y, width, height, format, type, bufSize, data);
>-
>-    Context *context = GetValidGlobalContext();
>-    if (context)
>-    {
>-        if (!context->skipValidation() &&
>-            !ValidateReadnPixelsEXT(context, x, y, width, height, format, type, bufSize, data))
>-        {
>-            return;
>-        }
>-
>-        context->readPixels(x, y, width, height, format, type, data);
>-    }
>-}
>-
>-void GL_APIENTRY RenderbufferStorageMultisampleANGLE(GLenum target,
>-                                                     GLsizei samples,
>-                                                     GLenum internalformat,
>-                                                     GLsizei width,
>-                                                     GLsizei height)
>-{
>-    EVENT(
>-        "(GLenum target = 0x%X, GLsizei samples = %d, GLenum internalformat = 0x%X, GLsizei width "
>-        "= %d, GLsizei height = %d)",
>-        target, samples, internalformat, width, height);
>-
>-    Context *context = GetValidGlobalContext();
>-    if (context)
>-    {
>-        if (!context->skipValidation() &&
>-            !ValidateRenderbufferStorageMultisampleANGLE(context, target, samples, internalformat,
>-                                                         width, height))
>-        {
>-            return;
>-        }
>-
>-        context->renderbufferStorageMultisample(target, samples, internalformat, width, height);
>-    }
>-}
>-
>-void GL_APIENTRY SetFenceNV(GLuint fence, GLenum condition)
>-{
>-    EVENT("(GLuint fence = %d, GLenum condition = 0x%X)", fence, condition);
>-
>-    Context *context = GetValidGlobalContext();
>-    if (context)
>-    {
>-        if (condition != GL_ALL_COMPLETED_NV)
>-        {
>-            context->handleError(InvalidEnum());
>-            return;
>-        }
>-
>-        FenceNV *fenceObject = context->getFenceNV(fence);
>-
>-        if (fenceObject == nullptr)
>-        {
>-            context->handleError(InvalidOperation());
>-            return;
>-        }
>-
>-        Error error = fenceObject->set(condition);
>-        if (error.isError())
>-        {
>-            context->handleError(error);
>-            return;
>-        }
>-    }
>-}
>-
>-GLboolean GL_APIENTRY TestFenceNV(GLuint fence)
>-{
>-    EVENT("(GLuint fence = %d)", fence);
>-
>-    Context *context = GetValidGlobalContext();
>-    if (context)
>-    {
>-        FenceNV *fenceObject = context->getFenceNV(fence);
>-
>-        if (fenceObject == nullptr)
>-        {
>-            context->handleError(InvalidOperation());
>-            return GL_TRUE;
>-        }
>-
>-        if (fenceObject->isSet() != GL_TRUE)
>-        {
>-            context->handleError(InvalidOperation());
>-            return GL_TRUE;
>-        }
>-
>-        GLboolean result;
>-        Error error = fenceObject->test(&result);
>-        if (error.isError())
>-        {
>-            context->handleError(error);
>-            return GL_TRUE;
>-        }
>-
>-        return result;
>-    }
>-
>-    return GL_TRUE;
>-}
>-
>-void GL_APIENTRY
>-TexStorage2DEXT(GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height)
>-{
>-    EVENT(
>-        "(GLenum target = 0x%X, GLsizei levels = %d, GLenum internalformat = 0x%X, GLsizei width = "
>-        "%d, GLsizei height = %d)",
>-        target, levels, internalformat, width, height);
>-
>-    Context *context = GetValidGlobalContext();
>-    if (context)
>-    {
>-        if (!context->getExtensions().textureStorage)
>-        {
>-            context->handleError(InvalidOperation());
>-            return;
>-        }
>-
>-        if (context->getClientMajorVersion() < 3 &&
>-            !ValidateES2TexStorageParameters(context, target, levels, internalformat, width,
>-                                             height))
>-        {
>-            return;
>-        }
>-
>-        if (context->getClientMajorVersion() >= 3 &&
>-            !ValidateES3TexStorage2DParameters(context, target, levels, internalformat, width,
>-                                               height, 1))
>-        {
>-            return;
>-        }
>-
>-        context->texStorage2D(target, levels, internalformat, width, height);
>-    }
>-}
>-
>-void GL_APIENTRY VertexAttribDivisorANGLE(GLuint index, GLuint divisor)
>-{
>-    EVENT("(GLuint index = %d, GLuint divisor = %d)", index, divisor);
>-
>-    Context *context = GetValidGlobalContext();
>-    if (context)
>-    {
>-        if (!context->getExtensions().instancedArrays)
>-        {
>-            ANGLE_VALIDATION_ERR(context, InvalidOperation(), ExtensionNotEnabled);
>-            return;
>-        }
>-
>-        if (index >= MAX_VERTEX_ATTRIBS)
>-        {
>-            context->handleError(InvalidValue());
>-            return;
>-        }
>-
>-        if (context->getLimitations().attributeZeroRequiresZeroDivisorInEXT)
>-        {
>-            if (index == 0 && divisor != 0)
>-            {
>-                const char *errorMessage =
>-                    "The current context doesn't support setting a non-zero divisor on the "
>-                    "attribute with index zero. "
>-                    "Please reorder the attributes in your vertex shader so that attribute zero "
>-                    "can have a zero divisor.";
>-                context->handleError(InvalidOperation() << errorMessage);
>-
>-                // We also output an error message to the debugger window if tracing is active, so
>-                // that developers can see the error message.
>-                ERR() << errorMessage;
>-
>-                return;
>-            }
>-        }
>-
>-        context->vertexAttribDivisor(index, divisor);
>-    }
>-}
>-
>-void GL_APIENTRY BlitFramebufferANGLE(GLint srcX0,
>-                                      GLint srcY0,
>-                                      GLint srcX1,
>-                                      GLint srcY1,
>-                                      GLint dstX0,
>-                                      GLint dstY0,
>-                                      GLint dstX1,
>-                                      GLint dstY1,
>-                                      GLbitfield mask,
>-                                      GLenum filter)
>-{
>-    EVENT(
>-        "(GLint srcX0 = %d, GLint srcY0 = %d, GLint srcX1 = %d, GLint srcY1 = %d, "
>-        "GLint dstX0 = %d, GLint dstY0 = %d, GLint dstX1 = %d, GLint dstY1 = %d, "
>-        "GLbitfield mask = 0x%X, GLenum filter = 0x%X)",
>-        srcX0, srcY0, srcX1, srcX1, dstX0, dstY0, dstX1, dstY1, mask, filter);
>-
>-    Context *context = GetValidGlobalContext();
>-    if (context)
>-    {
>-        if (!context->skipValidation() &&
>-            !ValidateBlitFramebufferANGLE(context, srcX0, srcY0, srcX1, srcY1, dstX0, dstY0, dstX1,
>-                                          dstY1, mask, filter))
>-        {
>-            return;
>-        }
>-
>-        context->blitFramebuffer(srcX0, srcY0, srcX1, srcY1, dstX0, dstY0, dstX1, dstY1, mask,
>-                                 filter);
>-    }
>-}
>-
>-void GL_APIENTRY DiscardFramebufferEXT(GLenum target,
>-                                       GLsizei numAttachments,
>-                                       const GLenum *attachments)
>-{
>-    EVENT("(GLenum target = 0x%X, GLsizei numAttachments = %d, attachments = 0x%0.8p)", target,
>-          numAttachments, attachments);
>-
>-    Context *context = GetValidGlobalContext();
>-    if (context)
>-    {
>-        if (!context->skipValidation() &&
>-            !ValidateDiscardFramebufferEXT(context, target, numAttachments, attachments))
>-        {
>-            return;
>-        }
>-
>-        context->discardFramebuffer(target, numAttachments, attachments);
>-    }
>-}
>-
>-void GL_APIENTRY TexImage3DOES(GLenum target,
>-                               GLint level,
>-                               GLenum internalformat,
>-                               GLsizei width,
>-                               GLsizei height,
>-                               GLsizei depth,
>-                               GLint border,
>-                               GLenum format,
>-                               GLenum type,
>-                               const void *pixels)
>-{
>-    EVENT(
>-        "(GLenum target = 0x%X, GLint level = %d, GLenum internalformat = 0x%X, "
>-        "GLsizei width = %d, GLsizei height = %d, GLsizei depth = %d, GLint border = %d, "
>-        "GLenum format = 0x%X, GLenum type = 0x%x, const void* pixels = 0x%0.8p)",
>-        target, level, internalformat, width, height, depth, border, format, type, pixels);
>-
>-    UNIMPLEMENTED();  // FIXME
>-}
>-
>-void GL_APIENTRY GetProgramBinaryOES(GLuint program,
>-                                     GLsizei bufSize,
>-                                     GLsizei *length,
>-                                     GLenum *binaryFormat,
>-                                     void *binary)
>-{
>-    EVENT(
>-        "(GLenum program = 0x%X, bufSize = %d, length = 0x%0.8p, binaryFormat = 0x%0.8p, binary = "
>-        "0x%0.8p)",
>-        program, bufSize, length, binaryFormat, binary);
>-
>-    Context *context = GetValidGlobalContext();
>-    if (context)
>-    {
>-        if (!context->skipValidation() &&
>-            !ValidateGetProgramBinaryOES(context, program, bufSize, length, binaryFormat, binary))
>-        {
>-            return;
>-        }
>-
>-        context->getProgramBinary(program, bufSize, length, binaryFormat, binary);
>-    }
>-}
>-
>-void GL_APIENTRY ProgramBinaryOES(GLuint program,
>-                                  GLenum binaryFormat,
>-                                  const void *binary,
>-                                  GLint length)
>-{
>-    EVENT("(GLenum program = 0x%X, binaryFormat = 0x%x, binary = 0x%0.8p, length = %d)", program,
>-          binaryFormat, binary, length);
>-
>-    Context *context = GetValidGlobalContext();
>-    if (context)
>-    {
>-        if (!context->skipValidation() &&
>-            !ValidateProgramBinaryOES(context, program, binaryFormat, binary, length))
>-        {
>-            return;
>-        }
>-
>-        context->programBinary(program, binaryFormat, binary, length);
>-    }
>-}
>-
>-void GL_APIENTRY DrawBuffersEXT(GLsizei n, const GLenum *bufs)
>-{
>-    EVENT("(GLenum n = %d, bufs = 0x%0.8p)", n, bufs);
>-
>-    Context *context = GetValidGlobalContext();
>-    if (context)
>-    {
>-        if (!context->skipValidation() && !ValidateDrawBuffersEXT(context, n, bufs))
>-        {
>-            return;
>-        }
>-
>-        context->drawBuffers(n, bufs);
>-    }
>-}
>-
>-void GL_APIENTRY GetBufferPointervOES(GLenum target, GLenum pname, void **params)
>-{
>-    EVENT("(GLenum target = 0x%X, GLenum pname = 0x%X, void** params = 0x%0.8p)", target, pname,
>-          params);
>-
>-    Context *context = GetValidGlobalContext();
>-    if (context)
>-    {
>-        BufferBinding targetPacked = FromGLenum<BufferBinding>(target);
>-
>-        if (!context->skipValidation() &&
>-            !ValidateGetBufferPointervOES(context, targetPacked, pname, params))
>-        {
>-            return;
>-        }
>-
>-        context->getBufferPointerv(targetPacked, pname, params);
>-    }
>-}
>-
>-void *GL_APIENTRY MapBufferOES(GLenum target, GLenum access)
>-{
>-    EVENT("(GLenum target = 0x%X, GLbitfield access = 0x%X)", target, access);
>-
>-    Context *context = GetValidGlobalContext();
>-    if (context)
>-    {
>-        BufferBinding targetPacked = FromGLenum<BufferBinding>(target);
>-
>-        if (!context->skipValidation() && !ValidateMapBufferOES(context, targetPacked, access))
>-        {
>-            return nullptr;
>-        }
>-
>-        return context->mapBuffer(targetPacked, access);
>-    }
>-
>-    return nullptr;
>-}
>-
>-GLboolean GL_APIENTRY UnmapBufferOES(GLenum target)
>-{
>-    EVENT("(GLenum target = 0x%X)", target);
>-
>-    Context *context = GetValidGlobalContext();
>-    if (context)
>-    {
>-        BufferBinding targetPacked = FromGLenum<BufferBinding>(target);
>-
>-        if (!context->skipValidation() && !ValidateUnmapBufferOES(context, targetPacked))
>-        {
>-            return GL_FALSE;
>-        }
>-
>-        return context->unmapBuffer(targetPacked);
>-    }
>-
>-    return GL_FALSE;
>-}
>-
>-void *GL_APIENTRY MapBufferRangeEXT(GLenum target,
>-                                    GLintptr offset,
>-                                    GLsizeiptr length,
>-                                    GLbitfield access)
>-{
>-    EVENT(
>-        "(GLenum target = 0x%X, GLintptr offset = %d, GLsizeiptr length = %d, GLbitfield access = "
>-        "0x%X)",
>-        target, offset, length, access);
>-
>-    Context *context = GetValidGlobalContext();
>-    if (context)
>-    {
>-        BufferBinding targetPacked = FromGLenum<BufferBinding>(target);
>-
>-        if (!context->skipValidation() &&
>-            !ValidateMapBufferRangeEXT(context, targetPacked, offset, length, access))
>-        {
>-            return nullptr;
>-        }
>-
>-        return context->mapBufferRange(targetPacked, offset, length, access);
>-    }
>-
>-    return nullptr;
>-}
>-
>-void GL_APIENTRY FlushMappedBufferRangeEXT(GLenum target, GLintptr offset, GLsizeiptr length)
>-{
>-    EVENT("(GLenum target = 0x%X, GLintptr offset = %d, GLsizeiptr length = %d)", target, offset,
>-          length);
>-
>-    Context *context = GetValidGlobalContext();
>-    if (context)
>-    {
>-        BufferBinding targetPacked = FromGLenum<BufferBinding>(target);
>-
>-        if (!context->skipValidation() &&
>-            !ValidateFlushMappedBufferRangeEXT(context, targetPacked, offset, length))
>-        {
>-            return;
>-        }
>-
>-        context->flushMappedBufferRange(targetPacked, offset, length);
>-    }
>-}
>-
>-void GL_APIENTRY InsertEventMarkerEXT(GLsizei length, const char *marker)
>-{
>-    // Don't run an EVENT() macro on the EXT_debug_marker entry points.
>-    // It can interfere with the debug events being set by the caller.
>-
>-    Context *context = GetValidGlobalContext();
>-    if (context)
>-    {
>-        if (!context->getExtensions().debugMarker)
>-        {
>-            // The debug marker calls should not set error state
>-            // However, it seems reasonable to set an error state if the extension is not enabled
>-            context->handleError(InvalidOperation() << "Extension not enabled");
>-            return;
>-        }
>-
>-        if (!ValidateInsertEventMarkerEXT(context, length, marker))
>-        {
>-            return;
>-        }
>-
>-        context->insertEventMarker(length, marker);
>-    }
>-}
>-
>-void GL_APIENTRY PushGroupMarkerEXT(GLsizei length, const char *marker)
>-{
>-    // Don't run an EVENT() macro on the EXT_debug_marker entry points.
>-    // It can interfere with the debug events being set by the caller.
>-
>-    Context *context = GetValidGlobalContext();
>-    if (context)
>-    {
>-        if (!context->getExtensions().debugMarker)
>-        {
>-            // The debug marker calls should not set error state
>-            // However, it seems reasonable to set an error state if the extension is not enabled
>-            context->handleError(InvalidOperation() << "Extension not enabled");
>-            return;
>-        }
>-
>-        if (!ValidatePushGroupMarkerEXT(context, length, marker))
>-        {
>-            return;
>-        }
>-
>-        if (marker == nullptr)
>-        {
>-            // From the EXT_debug_marker spec,
>-            // "If <marker> is null then an empty string is pushed on the stack."
>-            context->pushGroupMarker(length, "");
>-        }
>-        else
>-        {
>-            context->pushGroupMarker(length, marker);
>-        }
>-    }
>-}
>-
>-void GL_APIENTRY PopGroupMarkerEXT()
>-{
>-    // Don't run an EVENT() macro on the EXT_debug_marker entry points.
>-    // It can interfere with the debug events being set by the caller.
>-
>-    Context *context = GetValidGlobalContext();
>-    if (context)
>-    {
>-        if (!context->getExtensions().debugMarker)
>-        {
>-            // The debug marker calls should not set error state
>-            // However, it seems reasonable to set an error state if the extension is not enabled
>-            context->handleError(InvalidOperation() << "Extension not enabled");
>-            return;
>-        }
>-
>-        context->popGroupMarker();
>-    }
>-}
>-
>-ANGLE_EXPORT void GL_APIENTRY EGLImageTargetTexture2DOES(GLenum target, GLeglImageOES image)
>-{
>-    EVENT("(GLenum target = 0x%X, GLeglImageOES image = 0x%0.8p)", target, image);
>-
>-    Context *context = GetValidGlobalContext();
>-    if (context)
>-    {
>-        egl::Image *imageObject = reinterpret_cast<egl::Image *>(image);
>-        if (!ValidateEGLImageTargetTexture2DOES(context, target, imageObject))
>-        {
>-            return;
>-        }
>-
>-        Texture *texture = context->getTargetTexture(target);
>-        Error error      = texture->setEGLImageTarget(context, target, imageObject);
>-        if (error.isError())
>-        {
>-            context->handleError(error);
>-            return;
>-        }
>-    }
>-}
>-
>-ANGLE_EXPORT void GL_APIENTRY EGLImageTargetRenderbufferStorageOES(GLenum target,
>-                                                                   GLeglImageOES image)
>-{
>-    EVENT("(GLenum target = 0x%X, GLeglImageOES image = 0x%0.8p)", target, image);
>-
>-    Context *context = GetValidGlobalContext();
>-    if (context)
>-    {
>-        egl::Image *imageObject = reinterpret_cast<egl::Image *>(image);
>-        if (!ValidateEGLImageTargetRenderbufferStorageOES(context, target, imageObject))
>-        {
>-            return;
>-        }
>-
>-        Renderbuffer *renderbuffer = context->getGLState().getCurrentRenderbuffer();
>-        Error error                = renderbuffer->setStorageEGLImageTarget(context, imageObject);
>-        if (error.isError())
>-        {
>-            context->handleError(error);
>-            return;
>-        }
>-    }
>-}
>-
>-void GL_APIENTRY BindVertexArrayOES(GLuint array)
>-{
>-    EVENT("(GLuint array = %u)", array);
>-
>-    Context *context = GetValidGlobalContext();
>-    if (context)
>-    {
>-        if (!context->skipValidation() && !ValidateBindVertexArrayOES(context, array))
>-        {
>-            return;
>-        }
>-
>-        context->bindVertexArray(array);
>-    }
>-}
>-
>-void GL_APIENTRY DeleteVertexArraysOES(GLsizei n, const GLuint *arrays)
>-{
>-    EVENT("(GLsizei n = %d, const GLuint* arrays = 0x%0.8p)", n, arrays);
>-
>-    Context *context = GetValidGlobalContext();
>-    if (context)
>-    {
>-        if (!context->skipValidation() && !ValidateDeleteVertexArraysOES(context, n, arrays))
>-        {
>-            return;
>-        }
>-
>-        context->deleteVertexArrays(n, arrays);
>-    }
>-}
>-
>-void GL_APIENTRY GenVertexArraysOES(GLsizei n, GLuint *arrays)
>-{
>-    EVENT("(GLsizei n = %d, GLuint* arrays = 0x%0.8p)", n, arrays);
>-
>-    Context *context = GetValidGlobalContext();
>-    if (context)
>-    {
>-        if (!context->skipValidation() && !ValidateGenVertexArraysOES(context, n, arrays))
>-        {
>-            return;
>-        }
>-
>-        context->genVertexArrays(n, arrays);
>-    }
>-}
>-
>-GLboolean GL_APIENTRY IsVertexArrayOES(GLuint array)
>-{
>-    EVENT("(GLuint array = %u)", array);
>-
>-    Context *context = GetValidGlobalContext();
>-    if (context)
>-    {
>-        if (!context->skipValidation() && !ValidateIsVertexArrayOES(context, array))
>-        {
>-            return GL_FALSE;
>-        }
>-
>-        return context->isVertexArray(array);
>-    }
>-
>-    return GL_FALSE;
>-}
>-
>-void GL_APIENTRY DebugMessageControlKHR(GLenum source,
>-                                        GLenum type,
>-                                        GLenum severity,
>-                                        GLsizei count,
>-                                        const GLuint *ids,
>-                                        GLboolean enabled)
>-{
>-    EVENT(
>-        "(GLenum source = 0x%X, GLenum type = 0x%X, GLenum severity = 0x%X, GLsizei count = %d, "
>-        "GLint *ids = 0x%0.8p, GLboolean enabled = %d)",
>-        source, type, severity, count, ids, enabled);
>-
>-    Context *context = GetValidGlobalContext();
>-    if (context)
>-    {
>-        if (!ValidateDebugMessageControlKHR(context, source, type, severity, count, ids, enabled))
>-        {
>-            return;
>-        }
>-
>-        context->debugMessageControl(source, type, severity, count, ids, enabled);
>-    }
>-}
>-
>-void GL_APIENTRY DebugMessageInsertKHR(GLenum source,
>-                                       GLenum type,
>-                                       GLuint id,
>-                                       GLenum severity,
>-                                       GLsizei length,
>-                                       const GLchar *buf)
>-{
>-    EVENT(
>-        "(GLenum source = 0x%X, GLenum type = 0x%X, GLint id = %d, GLenum severity = 0x%X, GLsizei "
>-        "length = %d, const GLchar *buf = 0x%0.8p)",
>-        source, type, id, severity, length, buf);
>-
>-    Context *context = GetValidGlobalContext();
>-    if (context)
>-    {
>-        if (!ValidateDebugMessageInsertKHR(context, source, type, id, severity, length, buf))
>-        {
>-            return;
>-        }
>-
>-        context->debugMessageInsert(source, type, id, severity, length, buf);
>-    }
>-}
>-
>-void GL_APIENTRY DebugMessageCallbackKHR(GLDEBUGPROCKHR callback, const void *userParam)
>-{
>-    EVENT("(GLDEBUGPROCKHR callback = 0x%0.8p, const void *userParam = 0x%0.8p)", callback,
>-          userParam);
>-
>-    Context *context = GetValidGlobalContext();
>-    if (context)
>-    {
>-        if (!ValidateDebugMessageCallbackKHR(context, callback, userParam))
>-        {
>-            return;
>-        }
>-
>-        context->debugMessageCallback(callback, userParam);
>-    }
>-}
>-
>-GLuint GL_APIENTRY GetDebugMessageLogKHR(GLuint count,
>-                                         GLsizei bufSize,
>-                                         GLenum *sources,
>-                                         GLenum *types,
>-                                         GLuint *ids,
>-                                         GLenum *severities,
>-                                         GLsizei *lengths,
>-                                         GLchar *messageLog)
>-{
>-    EVENT(
>-        "(GLsizei count = %d, GLsizei bufSize = %d, GLenum *sources, GLenum *types = 0x%0.8p, "
>-        "GLuint *ids = 0x%0.8p, GLenum *severities = 0x%0.8p, GLsizei *lengths = 0x%0.8p, GLchar "
>-        "*messageLog = 0x%0.8p)",
>-        count, bufSize, sources, types, ids, severities, lengths, messageLog);
>-
>-    Context *context = GetValidGlobalContext();
>-    if (context)
>-    {
>-        if (!ValidateGetDebugMessageLogKHR(context, count, bufSize, sources, types, ids, severities,
>-                                           lengths, messageLog))
>-        {
>-            return 0;
>-        }
>-
>-        return context->getDebugMessageLog(count, bufSize, sources, types, ids, severities, lengths,
>-                                           messageLog);
>-    }
>-
>-    return 0;
>-}
>-
>-void GL_APIENTRY PushDebugGroupKHR(GLenum source, GLuint id, GLsizei length, const GLchar *message)
>-{
>-    EVENT(
>-        "(GLenum source = 0x%X, GLuint id = 0x%X, GLsizei length = %d, const GLchar *message = "
>-        "0x%0.8p)",
>-        source, id, length, message);
>-
>-    Context *context = GetValidGlobalContext();
>-    if (context)
>-    {
>-        if (!ValidatePushDebugGroupKHR(context, source, id, length, message))
>-        {
>-            return;
>-        }
>-
>-        std::string msg(message, (length > 0) ? static_cast<size_t>(length) : strlen(message));
>-        context->pushDebugGroup(source, id, length, message);
>-    }
>-}
>-
>-void GL_APIENTRY PopDebugGroupKHR(void)
>-{
>-    EVENT("()");
>-
>-    Context *context = GetValidGlobalContext();
>-    if (context)
>-    {
>-        if (!ValidatePopDebugGroupKHR(context))
>-        {
>-            return;
>-        }
>-
>-        context->popDebugGroup();
>-    }
>-}
>-
>-void GL_APIENTRY ObjectLabelKHR(GLenum identifier, GLuint name, GLsizei length, const GLchar *label)
>-{
>-    EVENT(
>-        "(GLenum identifier = 0x%X, GLuint name = %u, GLsizei length = %d, const GLchar *label = "
>-        "0x%0.8p)",
>-        identifier, name, length, label);
>-
>-    Context *context = GetValidGlobalContext();
>-    if (context)
>-    {
>-        if (!ValidateObjectLabelKHR(context, identifier, name, length, label))
>-        {
>-            return;
>-        }
>-
>-        context->objectLabel(identifier, name, length, label);
>-    }
>-}
>-
>-void GL_APIENTRY
>-GetObjectLabelKHR(GLenum identifier, GLuint name, GLsizei bufSize, GLsizei *length, GLchar *label)
>-{
>-    EVENT(
>-        "(GLenum identifier = 0x%X, GLuint name = %u, GLsizei bufSize = %d, GLsizei *length = "
>-        "0x%0.8p, GLchar *label = 0x%0.8p)",
>-        identifier, name, bufSize, length, label);
>-
>-    Context *context = GetValidGlobalContext();
>-    if (context)
>-    {
>-        if (!ValidateGetObjectLabelKHR(context, identifier, name, bufSize, length, label))
>-        {
>-            return;
>-        }
>-
>-        context->getObjectLabel(identifier, name, bufSize, length, label);
>-    }
>-}
>-
>-void GL_APIENTRY ObjectPtrLabelKHR(const void *ptr, GLsizei length, const GLchar *label)
>-{
>-    EVENT("(const void *ptr = 0x%0.8p, GLsizei length = %d, const GLchar *label = 0x%0.8p)", ptr,
>-          length, label);
>-
>-    Context *context = GetValidGlobalContext();
>-    if (context)
>-    {
>-        if (!ValidateObjectPtrLabelKHR(context, ptr, length, label))
>-        {
>-            return;
>-        }
>-
>-        context->objectPtrLabel(ptr, length, label);
>-    }
>-}
>-
>-void GL_APIENTRY GetObjectPtrLabelKHR(const void *ptr,
>-                                      GLsizei bufSize,
>-                                      GLsizei *length,
>-                                      GLchar *label)
>-{
>-    EVENT(
>-        "(const void *ptr = 0x%0.8p, GLsizei bufSize = %d, GLsizei *length = 0x%0.8p, GLchar "
>-        "*label = 0x%0.8p)",
>-        ptr, bufSize, length, label);
>-
>-    Context *context = GetValidGlobalContext();
>-    if (context)
>-    {
>-        if (!ValidateGetObjectPtrLabelKHR(context, ptr, bufSize, length, label))
>-        {
>-            return;
>-        }
>-
>-        context->getObjectPtrLabel(ptr, bufSize, length, label);
>-    }
>-}
>-
>-void GL_APIENTRY GetPointervKHR(GLenum pname, void **params)
>-{
>-    EVENT("(GLenum pname = 0x%X, void **params = 0x%0.8p)", pname, params);
>-
>-    Context *context = GetValidGlobalContext();
>-    if (context)
>-    {
>-        if (!ValidateGetPointervKHR(context, pname, params))
>-        {
>-            return;
>-        }
>-
>-        context->getPointerv(pname, params);
>-    }
>-}
>-
>-ANGLE_EXPORT void GL_APIENTRY BindUniformLocationCHROMIUM(GLuint program,
>-                                                          GLint location,
>-                                                          const GLchar *name)
>-{
>-    EVENT("(GLuint program = %u, GLint location = %d, const GLchar *name = 0x%0.8p)", program,
>-          location, name);
>-
>-    Context *context = GetValidGlobalContext();
>-    if (context)
>-    {
>-        if (!ValidateBindUniformLocationCHROMIUM(context, program, location, name))
>-        {
>-            return;
>-        }
>-
>-        context->bindUniformLocation(program, location, name);
>-    }
>-}
>-
>-ANGLE_EXPORT void GL_APIENTRY CoverageModulationCHROMIUM(GLenum components)
>-{
>-    EVENT("(GLenum components = %u)", components);
>-
>-    Context *context = GetValidGlobalContext();
>-    if (context)
>-    {
>-        if (!ValidateCoverageModulationCHROMIUM(context, components))
>-        {
>-            return;
>-        }
>-        context->setCoverageModulation(components);
>-    }
>-}
>-
>-// CHROMIUM_path_rendering
>-ANGLE_EXPORT void GL_APIENTRY MatrixLoadfCHROMIUM(GLenum matrixMode, const GLfloat *matrix)
>-{
>-    EVENT("(GLenum matrixMode = %u)", matrixMode);
>-
>-    Context *context = GetValidGlobalContext();
>-    if (context)
>-    {
>-        if (!context->skipValidation() && !ValidateMatrix(context, matrixMode, matrix))
>-        {
>-            return;
>-        }
>-        context->loadPathRenderingMatrix(matrixMode, matrix);
>-    }
>-}
>-
>-ANGLE_EXPORT void GL_APIENTRY MatrixLoadIdentityCHROMIUM(GLenum matrixMode)
>-{
>-    EVENT("(GLenum matrixMode = %u)", matrixMode);
>-
>-    Context *context = GetValidGlobalContext();
>-    if (context)
>-    {
>-        if (!context->skipValidation() && !ValidateMatrixMode(context, matrixMode))
>-        {
>-            return;
>-        }
>-        context->loadPathRenderingIdentityMatrix(matrixMode);
>-    }
>-}
>-
>-ANGLE_EXPORT GLuint GL_APIENTRY GenPathsCHROMIUM(GLsizei range)
>-{
>-    EVENT("(GLsizei range = %d)", range);
>-
>-    Context *context = GetValidGlobalContext();
>-    if (context)
>-    {
>-        if (!context->skipValidation() && !ValidateGenPaths(context, range))
>-        {
>-            return 0;
>-        }
>-        return context->createPaths(range);
>-    }
>-    return 0;
>-}
>-
>-ANGLE_EXPORT void GL_APIENTRY DeletePathsCHROMIUM(GLuint first, GLsizei range)
>-{
>-    EVENT("(GLuint first = %u, GLsizei range = %d)", first, range);
>-
>-    Context *context = GetValidGlobalContext();
>-    if (context)
>-    {
>-        if (!context->skipValidation() && !ValidateDeletePaths(context, first, range))
>-        {
>-            return;
>-        }
>-        context->deletePaths(first, range);
>-    }
>-}
>-
>-ANGLE_EXPORT GLboolean GL_APIENTRY IsPathCHROMIUM(GLuint path)
>-{
>-    EVENT("(GLuint path = %u)", path);
>-
>-    Context *context = GetValidGlobalContext();
>-    if (context)
>-    {
>-        if (!context->skipValidation() && !ValidateIsPath(context))
>-        {
>-            return GL_FALSE;
>-        }
>-        return context->hasPathData(path);
>-    }
>-    return GL_FALSE;
>-}
>-
>-ANGLE_EXPORT void GL_APIENTRY PathCommandsCHROMIUM(GLuint path,
>-                                                   GLsizei numCommands,
>-                                                   const GLubyte *commands,
>-                                                   GLsizei numCoords,
>-                                                   GLenum coordType,
>-                                                   const void *coords)
>-{
>-    EVENT(
>-        "(GLuint path = %u, GLsizei numCommands = %d, commands = %p, "
>-        "GLsizei numCoords = %d, GLenum coordType = %u, void* coords = %p)",
>-        path, numCommands, commands, numCoords, coordType, coords);
>-
>-    Context *context = GetValidGlobalContext();
>-    if (context)
>-    {
>-        if (!context->skipValidation())
>-        {
>-            if (!ValidatePathCommands(context, path, numCommands, commands, numCoords, coordType,
>-                                      coords))
>-            {
>-                return;
>-            }
>-        }
>-        context->setPathCommands(path, numCommands, commands, numCoords, coordType, coords);
>-    }
>-}
>-
>-ANGLE_EXPORT void GL_APIENTRY PathParameterfCHROMIUM(GLuint path, GLenum pname, GLfloat value)
>-{
>-    EVENT("(GLuint path = %u, GLenum pname = %u, GLfloat value = %f)", path, pname, value);
>-
>-    Context *context = GetValidGlobalContext();
>-    if (context)
>-    {
>-        if (!context->skipValidation() && !ValidateSetPathParameter(context, path, pname, value))
>-        {
>-            return;
>-        }
>-        context->setPathParameterf(path, pname, value);
>-    }
>-}
>-
>-ANGLE_EXPORT void GL_APIENTRY PathParameteriCHROMIUM(GLuint path, GLenum pname, GLint value)
>-{
>-    PathParameterfCHROMIUM(path, pname, static_cast<GLfloat>(value));
>-}
>-
>-ANGLE_EXPORT void GL_APIENTRY GetPathParameterfCHROMIUM(GLuint path, GLenum pname, GLfloat *value)
>-{
>-    EVENT("(GLuint path = %u, GLenum pname = %u)", path, pname);
>-
>-    Context *context = GetValidGlobalContext();
>-    if (context)
>-    {
>-        if (!context->skipValidation() && !ValidateGetPathParameter(context, path, pname, value))
>-        {
>-            return;
>-        }
>-        context->getPathParameterfv(path, pname, value);
>-    }
>-}
>-
>-ANGLE_EXPORT void GL_APIENTRY GetPathParameteriCHROMIUM(GLuint path, GLenum pname, GLint *value)
>-{
>-    GLfloat val = 0.0f;
>-    GetPathParameterfCHROMIUM(path, pname, value != nullptr ? &val : nullptr);
>-    if (value)
>-        *value = static_cast<GLint>(val);
>-}
>-
>-ANGLE_EXPORT void GL_APIENTRY PathStencilFuncCHROMIUM(GLenum func, GLint ref, GLuint mask)
>-{
>-    EVENT("(GLenum func = %u, GLint ref = %d, GLuint mask = %u)", func, ref, mask);
>-
>-    Context *context = GetValidGlobalContext();
>-    if (context)
>-    {
>-        if (!context->skipValidation() && !ValidatePathStencilFunc(context, func, ref, mask))
>-        {
>-            return;
>-        }
>-        context->setPathStencilFunc(func, ref, mask);
>-    }
>-}
>-
>-ANGLE_EXPORT void GL_APIENTRY StencilFillPathCHROMIUM(GLuint path, GLenum fillMode, GLuint mask)
>-{
>-    EVENT("(GLuint path = %u, GLenum fillMode = %u, GLuint mask = %u)", path, fillMode, mask);
>-
>-    Context *context = GetValidGlobalContext();
>-    if (context)
>-    {
>-        if (!context->skipValidation() && !ValidateStencilFillPath(context, path, fillMode, mask))
>-        {
>-            return;
>-        }
>-        context->stencilFillPath(path, fillMode, mask);
>-    }
>-}
>-
>-ANGLE_EXPORT void GL_APIENTRY StencilStrokePathCHROMIUM(GLuint path, GLint reference, GLuint mask)
>-{
>-    EVENT("(GLuint path = %u, GLint ference = %d, GLuint mask = %u)", path, reference, mask);
>-
>-    Context *context = GetValidGlobalContext();
>-    if (context)
>-    {
>-        if (!context->skipValidation() &&
>-            !ValidateStencilStrokePath(context, path, reference, mask))
>-        {
>-            return;
>-        }
>-        context->stencilStrokePath(path, reference, mask);
>-    }
>-}
>-
>-ANGLE_EXPORT void GL_APIENTRY CoverFillPathCHROMIUM(GLuint path, GLenum coverMode)
>-{
>-    EVENT("(GLuint path = %u, GLenum coverMode = %u)", path, coverMode);
>-
>-    Context *context = GetValidGlobalContext();
>-    if (context)
>-    {
>-        if (!context->skipValidation() && !ValidateCoverPath(context, path, coverMode))
>-        {
>-            return;
>-        }
>-        context->coverFillPath(path, coverMode);
>-    }
>-}
>-
>-ANGLE_EXPORT void GL_APIENTRY CoverStrokePathCHROMIUM(GLuint path, GLenum coverMode)
>-{
>-    EVENT("(GLuint path = %u, GLenum coverMode = %u)", path, coverMode);
>-
>-    Context *context = GetValidGlobalContext();
>-    if (context)
>-    {
>-        if (!context->skipValidation() && !ValidateCoverPath(context, path, coverMode))
>-        {
>-            return;
>-        }
>-        context->coverStrokePath(path, coverMode);
>-    }
>-}
>-
>-ANGLE_EXPORT void GL_APIENTRY StencilThenCoverFillPathCHROMIUM(GLuint path,
>-                                                               GLenum fillMode,
>-                                                               GLuint mask,
>-                                                               GLenum coverMode)
>-{
>-    EVENT("(GLuint path = %u, GLenum fillMode = %u, GLuint mask = %u, GLenum coverMode = %u)", path,
>-          fillMode, mask, coverMode);
>-
>-    Context *context = GetValidGlobalContext();
>-    if (context)
>-    {
>-        if (!context->skipValidation() &&
>-            !ValidateStencilThenCoverFillPath(context, path, fillMode, mask, coverMode))
>-        {
>-            return;
>-        }
>-        context->stencilThenCoverFillPath(path, fillMode, mask, coverMode);
>-    }
>-}
>-
>-ANGLE_EXPORT void GL_APIENTRY StencilThenCoverStrokePathCHROMIUM(GLuint path,
>-                                                                 GLint reference,
>-                                                                 GLuint mask,
>-                                                                 GLenum coverMode)
>-{
>-    EVENT("(GLuint path = %u, GLint reference = %d, GLuint mask = %u, GLenum coverMode = %u)", path,
>-          reference, mask, coverMode);
>-
>-    Context *context = GetValidGlobalContext();
>-    if (context)
>-    {
>-        if (!context->skipValidation() &&
>-            !ValidateStencilThenCoverStrokePath(context, path, reference, mask, coverMode))
>-        {
>-            return;
>-        }
>-        context->stencilThenCoverStrokePath(path, reference, mask, coverMode);
>-    }
>-}
>-
>-ANGLE_EXPORT void GL_APIENTRY CoverFillPathInstancedCHROMIUM(GLsizei numPaths,
>-                                                             GLenum pathNameType,
>-                                                             const void *paths,
>-                                                             GLuint pathBase,
>-                                                             GLenum coverMode,
>-                                                             GLenum transformType,
>-                                                             const GLfloat *transformValues)
>-{
>-    EVENT(
>-        "(GLsizei numPaths = %d, GLenum pathNameType = %u, const void *paths = %p "
>-        "GLuint pathBase = %u, GLenum coverMode = %u, GLenum transformType = %u "
>-        "const GLfloat *transformValues = %p)",
>-        numPaths, pathNameType, paths, pathBase, coverMode, transformType, transformValues);
>-
>-    Context *context = GetValidGlobalContext();
>-    if (context)
>-    {
>-        if (!context->skipValidation() &&
>-            !ValidateCoverFillPathInstanced(context, numPaths, pathNameType, paths, pathBase,
>-                                            coverMode, transformType, transformValues))
>-        {
>-            return;
>-        }
>-        context->coverFillPathInstanced(numPaths, pathNameType, paths, pathBase, coverMode,
>-                                        transformType, transformValues);
>-    }
>-}
>-
>-ANGLE_EXPORT void GL_APIENTRY CoverStrokePathInstancedCHROMIUM(GLsizei numPaths,
>-                                                               GLenum pathNameType,
>-                                                               const void *paths,
>-                                                               GLuint pathBase,
>-                                                               GLenum coverMode,
>-                                                               GLenum transformType,
>-                                                               const GLfloat *transformValues)
>-{
>-    EVENT(
>-        "(GLsizei numPaths = %d, GLenum pathNameType = %u, const void *paths = %p "
>-        "GLuint pathBase = %u, GLenum coverMode = %u, GLenum transformType = %u "
>-        "const GLfloat *transformValues = %p)",
>-        numPaths, pathNameType, paths, pathBase, coverMode, transformType, transformValues);
>-
>-    Context *context = GetValidGlobalContext();
>-    if (context)
>-    {
>-        if (!context->skipValidation() &&
>-            !ValidateCoverStrokePathInstanced(context, numPaths, pathNameType, paths, pathBase,
>-                                              coverMode, transformType, transformValues))
>-        {
>-            return;
>-        }
>-        context->coverStrokePathInstanced(numPaths, pathNameType, paths, pathBase, coverMode,
>-                                          transformType, transformValues);
>-    }
>-}
>-
>-ANGLE_EXPORT void GL_APIENTRY StencilStrokePathInstancedCHROMIUM(GLsizei numPaths,
>-                                                                 GLenum pathNameType,
>-                                                                 const void *paths,
>-                                                                 GLuint pathBase,
>-                                                                 GLint reference,
>-                                                                 GLuint mask,
>-                                                                 GLenum transformType,
>-                                                                 const GLfloat *transformValues)
>-{
>-    EVENT(
>-        "(GLsizei numPaths = %u, GLenum pathNameType = %u, const void *paths = %p "
>-        "GLuint pathBase = %u, GLint reference = %d GLuint mask = %u GLenum transformType = %u "
>-        "const GLfloat *transformValues = %p)",
>-        numPaths, pathNameType, paths, pathBase, reference, mask, transformType, transformValues);
>-
>-    Context *context = GetValidGlobalContext();
>-    if (context)
>-    {
>-        if (!context->skipValidation() &&
>-            !ValidateStencilStrokePathInstanced(context, numPaths, pathNameType, paths, pathBase,
>-                                                reference, mask, transformType, transformValues))
>-        {
>-            return;
>-        }
>-        context->stencilStrokePathInstanced(numPaths, pathNameType, paths, pathBase, reference,
>-                                            mask, transformType, transformValues);
>-    }
>-}
>-
>-ANGLE_EXPORT void GL_APIENTRY StencilFillPathInstancedCHROMIUM(GLsizei numPaths,
>-                                                               GLenum pathNameType,
>-                                                               const void *paths,
>-                                                               GLuint pathBase,
>-                                                               GLenum fillMode,
>-                                                               GLuint mask,
>-                                                               GLenum transformType,
>-                                                               const GLfloat *transformValues)
>-{
>-    EVENT(
>-        "(GLsizei numPaths = %u, GLenum pathNameType = %u const void *paths = %p "
>-        "GLuint pathBase = %u, GLenum fillMode = %u, GLuint mask = %u, GLenum transformType = %u "
>-        "const GLfloat *transformValues = %p)",
>-        numPaths, pathNameType, paths, pathBase, fillMode, mask, transformType, transformValues);
>-
>-    Context *context = GetValidGlobalContext();
>-    if (context)
>-    {
>-        if (!context->skipValidation() &&
>-            !ValidateStencilFillPathInstanced(context, numPaths, pathNameType, paths, pathBase,
>-                                              fillMode, mask, transformType, transformValues))
>-        {
>-            return;
>-        }
>-        context->stencilFillPathInstanced(numPaths, pathNameType, paths, pathBase, fillMode, mask,
>-                                          transformType, transformValues);
>-    }
>-}
>-
>-ANGLE_EXPORT void GL_APIENTRY
>-StencilThenCoverFillPathInstancedCHROMIUM(GLsizei numPaths,
>-                                          GLenum pathNameType,
>-                                          const void *paths,
>-                                          GLuint pathBase,
>-                                          GLenum fillMode,
>-                                          GLuint mask,
>-                                          GLenum coverMode,
>-                                          GLenum transformType,
>-                                          const GLfloat *transformValues)
>-{
>-    EVENT(
>-        "(GLsizei numPaths = %u, GLenum pathNameType = %u const void *paths = %p "
>-        "GLuint pathBase = %u, GLenum coverMode = %u, GLuint mask = %u, GLenum transformType = %u "
>-        "const GLfloat *transformValues = %p)",
>-        numPaths, pathNameType, paths, pathBase, coverMode, mask, transformType, transformValues);
>-
>-    Context *context = GetValidGlobalContext();
>-    if (context)
>-    {
>-        if (!context->skipValidation() &&
>-            !ValidateStencilThenCoverFillPathInstanced(context, numPaths, pathNameType, paths,
>-                                                       pathBase, fillMode, mask, coverMode,
>-                                                       transformType, transformValues))
>-        {
>-            return;
>-        }
>-        context->stencilThenCoverFillPathInstanced(numPaths, pathNameType, paths, pathBase,
>-                                                   fillMode, mask, coverMode, transformType,
>-                                                   transformValues);
>-    }
>-}
>-
>-ANGLE_EXPORT void GL_APIENTRY
>-StencilThenCoverStrokePathInstancedCHROMIUM(GLsizei numPaths,
>-                                            GLenum pathNameType,
>-                                            const void *paths,
>-                                            GLuint pathBase,
>-                                            GLint reference,
>-                                            GLuint mask,
>-                                            GLenum coverMode,
>-                                            GLenum transformType,
>-                                            const GLfloat *transformValues)
>-{
>-    EVENT(
>-        "(GLsizei numPaths = %u, GLenum pathNameType = %u, const void *paths = %p "
>-        "GLuint pathBase = %u GLenum coverMode = %u GLint reference = %d GLuint mask = %u GLenum "
>-        "transformType = %u "
>-        "const GLfloat *transformValues = %p)",
>-        numPaths, pathNameType, paths, pathBase, coverMode, reference, mask, transformType,
>-        transformValues);
>-
>-    Context *context = GetValidGlobalContext();
>-    if (context)
>-    {
>-        if (!context->skipValidation() &&
>-            !ValidateStencilThenCoverStrokePathInstanced(context, numPaths, pathNameType, paths,
>-                                                         pathBase, reference, mask, coverMode,
>-                                                         transformType, transformValues))
>-        {
>-            return;
>-        }
>-        context->stencilThenCoverStrokePathInstanced(numPaths, pathNameType, paths, pathBase,
>-                                                     reference, mask, coverMode, transformType,
>-                                                     transformValues);
>-    }
>-}
>-
>-ANGLE_EXPORT void GL_APIENTRY BindFragmentInputLocationCHROMIUM(GLuint program,
>-                                                                GLint location,
>-                                                                const GLchar *name)
>-{
>-    EVENT("(GLuint program = %u, GLint location = %d, const GLchar *name = %p)", program, location,
>-          name);
>-
>-    Context *context = GetValidGlobalContext();
>-    if (context)
>-    {
>-        if (!context->skipValidation() &&
>-            !ValidateBindFragmentInputLocation(context, program, location, name))
>-        {
>-            return;
>-        }
>-        context->bindFragmentInputLocation(program, location, name);
>-    }
>-}
>-
>-ANGLE_EXPORT void GL_APIENTRY ProgramPathFragmentInputGenCHROMIUM(GLuint program,
>-                                                                  GLint location,
>-                                                                  GLenum genMode,
>-                                                                  GLint components,
>-                                                                  const GLfloat *coeffs)
>-{
>-    EVENT(
>-        "(GLuint program = %u, GLint location %d, GLenum genMode = %u, GLint components = %d, "
>-        "const GLfloat * coeffs = %p)",
>-        program, location, genMode, components, coeffs);
>-
>-    Context *context = GetValidGlobalContext();
>-    if (context)
>-    {
>-        if (!context->skipValidation() &&
>-            !ValidateProgramPathFragmentInputGen(context, program, location, genMode, components,
>-                                                 coeffs))
>-        {
>-            return;
>-        }
>-        context->programPathFragmentInputGen(program, location, genMode, components, coeffs);
>-    }
>-}
>-
>-ANGLE_EXPORT void GL_APIENTRY CopyTextureCHROMIUM(GLuint sourceId,
>-                                                  GLint sourceLevel,
>-                                                  GLenum destTarget,
>-                                                  GLuint destId,
>-                                                  GLint destLevel,
>-                                                  GLint internalFormat,
>-                                                  GLenum destType,
>-                                                  GLboolean unpackFlipY,
>-                                                  GLboolean unpackPremultiplyAlpha,
>-                                                  GLboolean unpackUnmultiplyAlpha)
>-{
>-    EVENT(
>-        "(GLuint sourceId = %u, GLint sourceLevel = %d, GLenum destTarget = 0x%X, GLuint destId = "
>-        "%u, GLint destLevel = %d, GLint internalFormat = 0x%X, GLenum destType = "
>-        "0x%X, GLboolean unpackFlipY = %u, GLboolean unpackPremultiplyAlpha = %u, GLboolean "
>-        "unpackUnmultiplyAlpha = %u)",
>-        sourceId, sourceLevel, destTarget, destId, destLevel, internalFormat, destType, unpackFlipY,
>-        unpackPremultiplyAlpha, unpackUnmultiplyAlpha);
>-
>-    Context *context = GetValidGlobalContext();
>-    if (context)
>-    {
>-        if (!context->skipValidation() &&
>-            !ValidateCopyTextureCHROMIUM(context, sourceId, sourceLevel, destTarget, destId,
>-                                         destLevel, internalFormat, destType, unpackFlipY,
>-                                         unpackPremultiplyAlpha, unpackUnmultiplyAlpha))
>-        {
>-            return;
>-        }
>-
>-        context->copyTextureCHROMIUM(sourceId, sourceLevel, destTarget, destId, destLevel,
>-                                     internalFormat, destType, unpackFlipY, unpackPremultiplyAlpha,
>-                                     unpackUnmultiplyAlpha);
>-    }
>-}
>-
>-ANGLE_EXPORT void GL_APIENTRY CopySubTextureCHROMIUM(GLuint sourceId,
>-                                                     GLint sourceLevel,
>-                                                     GLenum destTarget,
>-                                                     GLuint destId,
>-                                                     GLint destLevel,
>-                                                     GLint xoffset,
>-                                                     GLint yoffset,
>-                                                     GLint x,
>-                                                     GLint y,
>-                                                     GLsizei width,
>-                                                     GLsizei height,
>-                                                     GLboolean unpackFlipY,
>-                                                     GLboolean unpackPremultiplyAlpha,
>-                                                     GLboolean unpackUnmultiplyAlpha)
>-{
>-    EVENT(
>-        "(GLuint sourceId = %u, GLint sourceLevel = %d, GLenum destTarget = 0x%X, GLuint destId = "
>-        "%u, GLint destLevel = %d, GLint xoffset = "
>-        "%d, GLint yoffset = %d, GLint x = %d, GLint y = %d, GLsizei width = %d, GLsizei height = "
>-        "%d, GLboolean unpackPremultiplyAlpha = %u, GLboolean unpackUnmultiplyAlpha = %u)",
>-        sourceId, sourceLevel, destTarget, destId, destLevel, xoffset, yoffset, x, y, width, height,
>-        unpackFlipY, unpackPremultiplyAlpha, unpackUnmultiplyAlpha);
>-
>-    Context *context = GetValidGlobalContext();
>-    if (context)
>-    {
>-        if (!context->skipValidation() &&
>-            !ValidateCopySubTextureCHROMIUM(
>-                context, sourceId, sourceLevel, destTarget, destId, destLevel, xoffset, yoffset, x,
>-                y, width, height, unpackFlipY, unpackPremultiplyAlpha, unpackUnmultiplyAlpha))
>-        {
>-            return;
>-        }
>-
>-        context->copySubTextureCHROMIUM(sourceId, sourceLevel, destTarget, destId, destLevel,
>-                                        xoffset, yoffset, x, y, width, height, unpackFlipY,
>-                                        unpackPremultiplyAlpha, unpackUnmultiplyAlpha);
>-    }
>-}
>-
>-ANGLE_EXPORT void GL_APIENTRY CompressedCopyTextureCHROMIUM(GLuint sourceId, GLuint destId)
>-{
>-    EVENT("(GLuint sourceId = %u, GLuint destId = %u)", sourceId, destId);
>-
>-    Context *context = GetValidGlobalContext();
>-    if (context)
>-    {
>-        if (!context->skipValidation() &&
>-            !ValidateCompressedCopyTextureCHROMIUM(context, sourceId, destId))
>-        {
>-            return;
>-        }
>-
>-        context->compressedCopyTextureCHROMIUM(sourceId, destId);
>-    }
>-}
>-
>-ANGLE_EXPORT void GL_APIENTRY RequestExtensionANGLE(const GLchar *name)
>-{
>-    EVENT("(const GLchar *name = %p)", name);
>-
>-    Context *context = GetValidGlobalContext();
>-    if (context)
>-    {
>-        if (!context->skipValidation() && !ValidateRequestExtensionANGLE(context, name))
>-        {
>-            return;
>-        }
>-
>-        context->requestExtension(name);
>-    }
>-}
>-
>-ANGLE_EXPORT void GL_APIENTRY GetBooleanvRobustANGLE(GLenum pname,
>-                                                     GLsizei bufSize,
>-                                                     GLsizei *length,
>-                                                     GLboolean *params)
>-{
>-    EVENT(
>-        "(GLenum pname = 0x%X, GLsizei bufsize = %d, GLsizei* length = 0x%0.8p, GLboolean* params "
>-        "= 0x%0.8p)",
>-        pname, bufSize, length, params);
>-
>-    Context *context = GetValidGlobalContext();
>-    if (context)
>-    {
>-        GLenum nativeType;
>-        unsigned int numParams = 0;
>-        if (!ValidateRobustStateQuery(context, pname, bufSize, &nativeType, &numParams))
>-        {
>-            return;
>-        }
>-
>-        context->getBooleanv(pname, params);
>-        SetRobustLengthParam(length, numParams);
>-    }
>-}
>-
>-ANGLE_EXPORT void GL_APIENTRY GetBufferParameterivRobustANGLE(GLenum target,
>-                                                              GLenum pname,
>-                                                              GLsizei bufSize,
>-                                                              GLsizei *length,
>-                                                              GLint *params)
>-{
>-    EVENT("(GLenum target = 0x%X, GLenum pname = 0x%X, GLint* params = 0x%0.8p)", target, pname,
>-          params);
>-
>-    Context *context = GetValidGlobalContext();
>-    if (context)
>-    {
>-        BufferBinding targetPacked = FromGLenum<BufferBinding>(target);
>-
>-        GLsizei numParams = 0;
>-        if (!ValidateGetBufferParameterivRobustANGLE(context, targetPacked, pname, bufSize,
>-                                                     &numParams, params))
>-        {
>-            return;
>-        }
>-
>-        Buffer *buffer = context->getGLState().getTargetBuffer(targetPacked);
>-        QueryBufferParameteriv(buffer, pname, params);
>-        SetRobustLengthParam(length, numParams);
>-    }
>-}
>-
>-ANGLE_EXPORT void GL_APIENTRY GetFloatvRobustANGLE(GLenum pname,
>-                                                   GLsizei bufSize,
>-                                                   GLsizei *length,
>-                                                   GLfloat *params)
>-{
>-    EVENT(
>-        "(GLenum pname = 0x%X, GLsizei bufsize = %d, GLsizei* length = 0x%0.8p, GLfloat* params = "
>-        "0x%0.8p)",
>-        pname, bufSize, length, params);
>-
>-    Context *context = GetValidGlobalContext();
>-    if (context)
>-    {
>-        GLenum nativeType;
>-        unsigned int numParams = 0;
>-        if (!ValidateRobustStateQuery(context, pname, bufSize, &nativeType, &numParams))
>-        {
>-            return;
>-        }
>-
>-        context->getFloatv(pname, params);
>-        SetRobustLengthParam(length, numParams);
>-    }
>-}
>-
>-ANGLE_EXPORT void GL_APIENTRY GetFramebufferAttachmentParameterivRobustANGLE(GLenum target,
>-                                                                             GLenum attachment,
>-                                                                             GLenum pname,
>-                                                                             GLsizei bufSize,
>-                                                                             GLsizei *length,
>-                                                                             GLint *params)
>-{
>-    EVENT(
>-        "(GLenum target = 0x%X, GLenum attachment = 0x%X, GLenum pname = 0x%X,  GLsizei bufsize = "
>-        "%d, GLsizei* length = 0x%0.8p, GLint* params = 0x%0.8p)",
>-        target, attachment, pname, bufSize, length, params);
>-
>-    Context *context = GetValidGlobalContext();
>-    if (context)
>-    {
>-        GLsizei numParams = 0;
>-        if (!ValidateGetFramebufferAttachmentParameterivRobustANGLE(context, target, attachment,
>-                                                                    pname, bufSize, &numParams))
>-        {
>-            return;
>-        }
>-
>-        const Framebuffer *framebuffer = context->getGLState().getTargetFramebuffer(target);
>-        QueryFramebufferAttachmentParameteriv(framebuffer, attachment, pname, params);
>-        SetRobustLengthParam(length, numParams);
>-    }
>-}
>-
>-ANGLE_EXPORT void GL_APIENTRY GetIntegervRobustANGLE(GLenum pname,
>-                                                     GLsizei bufSize,
>-                                                     GLsizei *length,
>-                                                     GLint *data)
>-{
>-    EVENT(
>-        "(GLenum pname = 0x%X, GLsizei bufsize = %d, GLsizei* length = 0x%0.8p, GLint* params = "
>-        "0x%0.8p)",
>-        pname, bufSize, length, data);
>-
>-    Context *context = GetValidGlobalContext();
>-    if (context)
>-    {
>-        GLenum nativeType;
>-        unsigned int numParams = 0;
>-        if (!ValidateRobustStateQuery(context, pname, bufSize, &nativeType, &numParams))
>-        {
>-            return;
>-        }
>-
>-        context->getIntegerv(pname, data);
>-        SetRobustLengthParam(length, numParams);
>-    }
>-}
>-
>-ANGLE_EXPORT void GL_APIENTRY GetProgramivRobustANGLE(GLuint program,
>-                                                      GLenum pname,
>-                                                      GLsizei bufSize,
>-                                                      GLsizei *length,
>-                                                      GLint *params)
>-{
>-    EVENT(
>-        "(GLuint program = %d, GLenum pname = %d, GLsizei bufsize = %d, GLsizei* length = 0x%0.8p, "
>-        "GLint* params = 0x%0.8p)",
>-        program, pname, bufSize, length, params);
>-
>-    Context *context = GetValidGlobalContext();
>-    if (context)
>-    {
>-        GLsizei numParams = 0;
>-        if (!ValidateGetProgramivRobustANGLE(context, program, pname, bufSize, &numParams))
>-        {
>-            return;
>-        }
>-
>-        Program *programObject = context->getProgram(program);
>-        QueryProgramiv(context, programObject, pname, params);
>-        SetRobustLengthParam(length, numParams);
>-    }
>-}
>-
>-ANGLE_EXPORT void GL_APIENTRY GetRenderbufferParameterivRobustANGLE(GLenum target,
>-                                                                    GLenum pname,
>-                                                                    GLsizei bufSize,
>-                                                                    GLsizei *length,
>-                                                                    GLint *params)
>-{
>-    EVENT(
>-        "(GLenum target = 0x%X, GLenum pname = 0x%X, GLsizei bufsize = %d, GLsizei* length = "
>-        "0x%0.8p, GLint* params = 0x%0.8p)",
>-        target, pname, bufSize, length, params);
>-
>-    Context *context = GetValidGlobalContext();
>-    if (context)
>-    {
>-        GLsizei numParams = 0;
>-        if (!ValidateGetRenderbufferParameterivRobustANGLE(context, target, pname, bufSize,
>-                                                           &numParams, params))
>-        {
>-            return;
>-        }
>-
>-        Renderbuffer *renderbuffer = context->getGLState().getCurrentRenderbuffer();
>-        QueryRenderbufferiv(context, renderbuffer, pname, params);
>-        SetRobustLengthParam(length, numParams);
>-    }
>-}
>-
>-ANGLE_EXPORT void GL_APIENTRY
>-GetShaderivRobustANGLE(GLuint shader, GLenum pname, GLsizei bufSize, GLsizei *length, GLint *params)
>-{
>-    EVENT(
>-        "(GLuint shader = %d, GLenum pname = %d, GLsizei bufsize = %d, GLsizei* length = 0x%0.8p, "
>-        "GLint* params = 0x%0.8p)",
>-        shader, pname, bufSize, length, params);
>-
>-    Context *context = GetValidGlobalContext();
>-    if (context)
>-    {
>-        GLsizei numParams = 0;
>-        if (!ValidateGetShaderivRobustANGLE(context, shader, pname, bufSize, &numParams, params))
>-        {
>-            return;
>-        }
>-
>-        Shader *shaderObject = context->getShader(shader);
>-        QueryShaderiv(context, shaderObject, pname, params);
>-        SetRobustLengthParam(length, numParams);
>-    }
>-}
>-
>-ANGLE_EXPORT void GL_APIENTRY GetTexParameterfvRobustANGLE(GLenum target,
>-                                                           GLenum pname,
>-                                                           GLsizei bufSize,
>-                                                           GLsizei *length,
>-                                                           GLfloat *params)
>-{
>-    EVENT(
>-        "(GLenum target = 0x%X, GLenum pname = 0x%X, GLsizei bufsize = %d, GLsizei* length = "
>-        "0x%0.8p, GLfloat* params = 0x%0.8p)",
>-        target, pname, bufSize, length, params);
>-
>-    Context *context = GetValidGlobalContext();
>-    if (context)
>-    {
>-        GLsizei numParams = 0;
>-        if (!ValidateGetTexParameterfvRobustANGLE(context, target, pname, bufSize, &numParams,
>-                                                  params))
>-        {
>-            return;
>-        }
>-
>-        Texture *texture = context->getTargetTexture(target);
>-        QueryTexParameterfv(texture, pname, params);
>-        SetRobustLengthParam(length, numParams);
>-    }
>-}
>-
>-ANGLE_EXPORT void GL_APIENTRY GetTexParameterivRobustANGLE(GLenum target,
>-                                                           GLenum pname,
>-                                                           GLsizei bufSize,
>-                                                           GLsizei *length,
>-                                                           GLint *params)
>-{
>-    EVENT(
>-        "(GLenum target = 0x%X, GLenum pname = 0x%X, GLsizei bufsize = %d, GLsizei* length = "
>-        "0x%0.8p, GLfloat* params = 0x%0.8p)",
>-        target, pname, bufSize, length, params);
>-
>-    Context *context = GetValidGlobalContext();
>-    if (context)
>-    {
>-        GLsizei numParams = 0;
>-        if (!ValidateGetTexParameterivRobustANGLE(context, target, pname, bufSize, &numParams,
>-                                                  params))
>-        {
>-            return;
>-        }
>-
>-        Texture *texture = context->getTargetTexture(target);
>-        QueryTexParameteriv(texture, pname, params);
>-        SetRobustLengthParam(length, numParams);
>-    }
>-}
>-
>-ANGLE_EXPORT void GL_APIENTRY GetUniformfvRobustANGLE(GLuint program,
>-                                                      GLint location,
>-                                                      GLsizei bufSize,
>-                                                      GLsizei *length,
>-                                                      GLfloat *params)
>-{
>-    EVENT(
>-        "(GLuint program = %d, GLint location = %d, GLsizei bufsize = %d, GLsizei* length = "
>-        "0x%0.8p, GLfloat* params = 0x%0.8p)",
>-        program, location, bufSize, length, params);
>-
>-    Context *context = GetValidGlobalContext();
>-    if (context)
>-    {
>-        GLsizei writeLength = 0;
>-        if (!ValidateGetUniformfvRobustANGLE(context, program, location, bufSize, &writeLength,
>-                                             params))
>-        {
>-            return;
>-        }
>-
>-        Program *programObject = context->getProgram(program);
>-        ASSERT(programObject);
>-
>-        programObject->getUniformfv(context, location, params);
>-        SetRobustLengthParam(length, writeLength);
>-    }
>-}
>-
>-ANGLE_EXPORT void GL_APIENTRY GetUniformivRobustANGLE(GLuint program,
>-                                                      GLint location,
>-                                                      GLsizei bufSize,
>-                                                      GLsizei *length,
>-                                                      GLint *params)
>-{
>-    EVENT(
>-        "(GLuint program = %d, GLint location = %d, GLsizei bufsize = %d, GLsizei* length = "
>-        "0x%0.8p, GLint* params = 0x%0.8p)",
>-        program, location, bufSize, length, params);
>-
>-    Context *context = GetValidGlobalContext();
>-    if (context)
>-    {
>-        GLsizei writeLength = 0;
>-        if (!ValidateGetUniformivRobustANGLE(context, program, location, bufSize, &writeLength,
>-                                             params))
>-        {
>-            return;
>-        }
>-
>-        Program *programObject = context->getProgram(program);
>-        ASSERT(programObject);
>-
>-        programObject->getUniformiv(context, location, params);
>-        SetRobustLengthParam(length, writeLength);
>-    }
>-}
>-
>-ANGLE_EXPORT void GL_APIENTRY GetVertexAttribfvRobustANGLE(GLuint index,
>-                                                           GLenum pname,
>-                                                           GLsizei bufSize,
>-                                                           GLsizei *length,
>-                                                           GLfloat *params)
>-{
>-    EVENT(
>-        "(GLuint index = %d, GLenum pname = 0x%X, GLsizei bufsize = %d, GLsizei* length = 0x%0.8p, "
>-        "GLfloat* params = 0x%0.8p)",
>-        index, pname, bufSize, length, params);
>-
>-    Context *context = GetValidGlobalContext();
>-    if (context)
>-    {
>-        GLsizei writeLength = 0;
>-        if (!ValidateGetVertexAttribfvRobustANGLE(context, index, pname, bufSize, &writeLength,
>-                                                  params))
>-        {
>-            return;
>-        }
>-
>-        context->getVertexAttribfv(index, pname, params);
>-        SetRobustLengthParam(length, writeLength);
>-    }
>-}
>-
>-ANGLE_EXPORT void GL_APIENTRY GetVertexAttribivRobustANGLE(GLuint index,
>-                                                           GLenum pname,
>-                                                           GLsizei bufSize,
>-                                                           GLsizei *length,
>-                                                           GLint *params)
>-{
>-    EVENT(
>-        "(GLuint index = %d, GLenum pname = 0x%X, GLsizei bufsize = %d, GLsizei* length = 0x%0.8p, "
>-        "GLint* params = 0x%0.8p)",
>-        index, pname, bufSize, length, params);
>-
>-    Context *context = GetValidGlobalContext();
>-    if (context)
>-    {
>-        GLsizei writeLength = 0;
>-        if (!ValidateGetVertexAttribivRobustANGLE(context, index, pname, bufSize, &writeLength,
>-                                                  params))
>-        {
>-            return;
>-        }
>-
>-        context->getVertexAttribiv(index, pname, params);
>-        SetRobustLengthParam(length, writeLength);
>-    }
>-}
>-
>-ANGLE_EXPORT void GL_APIENTRY GetVertexAttribPointervRobustANGLE(GLuint index,
>-                                                                 GLenum pname,
>-                                                                 GLsizei bufSize,
>-                                                                 GLsizei *length,
>-                                                                 void **pointer)
>-{
>-    EVENT(
>-        "(GLuint index = %d, GLenum pname = 0x%X, GLsizei bufsize = %d, GLsizei* length = 0x%0.8p, "
>-        "void** pointer = 0x%0.8p)",
>-        index, pname, bufSize, length, pointer);
>-
>-    Context *context = GetValidGlobalContext();
>-    if (context)
>-    {
>-        GLsizei writeLength = 0;
>-        if (!ValidateGetVertexAttribPointervRobustANGLE(context, index, pname, bufSize,
>-                                                        &writeLength, pointer))
>-        {
>-            return;
>-        }
>-
>-        context->getVertexAttribPointerv(index, pname, pointer);
>-        SetRobustLengthParam(length, writeLength);
>-    }
>-}
>-
>-ANGLE_EXPORT void GL_APIENTRY ReadPixelsRobustANGLE(GLint x,
>-                                                    GLint y,
>-                                                    GLsizei width,
>-                                                    GLsizei height,
>-                                                    GLenum format,
>-                                                    GLenum type,
>-                                                    GLsizei bufSize,
>-                                                    GLsizei *length,
>-                                                    GLsizei *columns,
>-                                                    GLsizei *rows,
>-                                                    void *pixels)
>-{
>-    EVENT(
>-        "(GLint x = %d, GLint y = %d, GLsizei width = %d, GLsizei height = %d, "
>-        "GLenum format = 0x%X, GLenum type = 0x%X, GLsizei bufsize = %d, GLsizei* length = "
>-        "0x%0.8p, GLsizei* columns = 0x%0.8p, GLsizei* rows = 0x%0.8p, void* pixels = 0x%0.8p)",
>-        x, y, width, height, format, type, bufSize, length, columns, rows, pixels);
>-
>-    Context *context = GetValidGlobalContext();
>-    if (context)
>-    {
>-        GLsizei writeLength  = 0;
>-        GLsizei writeColumns = 0;
>-        GLsizei writeRows    = 0;
>-        if (!ValidateReadPixelsRobustANGLE(context, x, y, width, height, format, type, bufSize,
>-                                           &writeLength, &writeColumns, &writeRows, pixels))
>-        {
>-            return;
>-        }
>-
>-        context->readPixels(x, y, width, height, format, type, pixels);
>-
>-        SetRobustLengthParam(length, writeLength);
>-        SetRobustLengthParam(columns, writeColumns);
>-        SetRobustLengthParam(rows, writeRows);
>-    }
>-}
>-
>-ANGLE_EXPORT void GL_APIENTRY TexImage2DRobustANGLE(GLenum target,
>-                                                    GLint level,
>-                                                    GLint internalformat,
>-                                                    GLsizei width,
>-                                                    GLsizei height,
>-                                                    GLint border,
>-                                                    GLenum format,
>-                                                    GLenum type,
>-                                                    GLsizei bufSize,
>-                                                    const void *pixels)
>-{
>-    EVENT(
>-        "(GLenum target = 0x%X, GLint level = %d, GLint internalformat = %d, GLsizei width = %d, "
>-        "GLsizei height = %d, GLint border = %d, GLenum format = 0x%X, GLenum type = 0x%X, GLsizei "
>-        "bufSize = %d, const void* pixels = 0x%0.8p)",
>-        target, level, internalformat, width, height, border, format, type, bufSize, pixels);
>-
>-    Context *context = GetValidGlobalContext();
>-    if (context)
>-    {
>-        if (!ValidateTexImage2DRobust(context, target, level, internalformat, width, height, border,
>-                                      format, type, bufSize, pixels))
>-        {
>-            return;
>-        }
>-
>-        context->texImage2D(target, level, internalformat, width, height, border, format, type,
>-                            pixels);
>-    }
>-}
>-
>-ANGLE_EXPORT void GL_APIENTRY TexParameterfvRobustANGLE(GLenum target,
>-                                                        GLenum pname,
>-                                                        GLsizei bufSize,
>-                                                        const GLfloat *params)
>-{
>-    EVENT(
>-        "(GLenum target = 0x%X, GLenum pname = 0x%X, GLsizei bufsize = %d, GLfloat* params = "
>-        "0x%0.8p)",
>-        target, pname, bufSize, params);
>-
>-    Context *context = GetValidGlobalContext();
>-    if (context)
>-    {
>-        if (!ValidateTexParameterfvRobustANGLE(context, target, pname, bufSize, params))
>-        {
>-            return;
>-        }
>-
>-        Texture *texture = context->getTargetTexture(target);
>-        SetTexParameterfv(context, texture, pname, params);
>-    }
>-}
>-
>-ANGLE_EXPORT void GL_APIENTRY TexParameterivRobustANGLE(GLenum target,
>-                                                        GLenum pname,
>-                                                        GLsizei bufSize,
>-                                                        const GLint *params)
>-{
>-    EVENT(
>-        "(GLenum target = 0x%X, GLenum pname = 0x%X, GLsizei bufsize = %d, GLfloat* params = "
>-        "0x%0.8p)",
>-        target, pname, bufSize, params);
>-
>-    Context *context = GetValidGlobalContext();
>-    if (context)
>-    {
>-        if (!ValidateTexParameterivRobustANGLE(context, target, pname, bufSize, params))
>-        {
>-            return;
>-        }
>-
>-        Texture *texture = context->getTargetTexture(target);
>-        SetTexParameteriv(context, texture, pname, params);
>-    }
>-}
>-
>-ANGLE_EXPORT void GL_APIENTRY TexSubImage2DRobustANGLE(GLenum target,
>-                                                       GLint level,
>-                                                       GLint xoffset,
>-                                                       GLint yoffset,
>-                                                       GLsizei width,
>-                                                       GLsizei height,
>-                                                       GLenum format,
>-                                                       GLenum type,
>-                                                       GLsizei bufSize,
>-                                                       const void *pixels)
>-{
>-    EVENT(
>-        "(GLenum target = 0x%X, GLint level = %d, GLint xoffset = %d, GLint yoffset = %d, "
>-        "GLsizei width = %d, GLsizei height = %d, GLenum format = 0x%X, GLenum type = 0x%X, "
>-        "GLsizei bufsize = %d, const void* pixels = 0x%0.8p)",
>-        target, level, xoffset, yoffset, width, height, format, type, bufSize, pixels);
>-
>-    Context *context = GetValidGlobalContext();
>-    if (context)
>-    {
>-        if (!ValidateTexSubImage2DRobustANGLE(context, target, level, xoffset, yoffset, width,
>-                                              height, format, type, bufSize, pixels))
>-        {
>-            return;
>-        }
>-
>-        context->texSubImage2D(target, level, xoffset, yoffset, width, height, format, type,
>-                               pixels);
>-    }
>-}
>-
>-ANGLE_EXPORT void GL_APIENTRY TexImage3DRobustANGLE(GLenum target,
>-                                                    GLint level,
>-                                                    GLint internalformat,
>-                                                    GLsizei width,
>-                                                    GLsizei height,
>-                                                    GLsizei depth,
>-                                                    GLint border,
>-                                                    GLenum format,
>-                                                    GLenum type,
>-                                                    GLsizei bufSize,
>-                                                    const void *pixels)
>-{
>-    EVENT(
>-        "(GLenum target = 0x%X, GLint level = %d, GLint internalformat = %d, GLsizei width = %d, "
>-        "GLsizei height = %d, GLsizei depth = %d, GLint border = %d, GLenum format = 0x%X, "
>-        "GLenum type = 0x%X, GLsizei bufsize = %d, const void* pixels = 0x%0.8p)",
>-        target, level, internalformat, width, height, depth, border, format, type, bufSize, pixels);
>-
>-    Context *context = GetValidGlobalContext();
>-    if (context)
>-    {
>-        if (!ValidateTexImage3DRobustANGLE(context, target, level, internalformat, width, height,
>-                                           depth, border, format, type, bufSize, pixels))
>-        {
>-            return;
>-        }
>-
>-        context->texImage3D(target, level, internalformat, width, height, depth, border, format,
>-                            type, pixels);
>-    }
>-}
>-
>-ANGLE_EXPORT void GL_APIENTRY TexSubImage3DRobustANGLE(GLenum target,
>-                                                       GLint level,
>-                                                       GLint xoffset,
>-                                                       GLint yoffset,
>-                                                       GLint zoffset,
>-                                                       GLsizei width,
>-                                                       GLsizei height,
>-                                                       GLsizei depth,
>-                                                       GLenum format,
>-                                                       GLenum type,
>-                                                       GLsizei bufSize,
>-                                                       const void *pixels)
>-{
>-    EVENT(
>-        "(GLenum target = 0x%X, GLint level = %d, GLint xoffset = %d, GLint yoffset = %d, "
>-        "GLint zoffset = %d, GLsizei width = %d, GLsizei height = %d, GLsizei depth = %d, "
>-        "GLenum format = 0x%X, GLenum type = 0x%X, GLsizei bufsize = %d, const void* pixels = "
>-        "0x%0.8p)",
>-        target, level, xoffset, yoffset, zoffset, width, height, depth, format, type, bufSize,
>-        pixels);
>-
>-    Context *context = GetValidGlobalContext();
>-    if (context)
>-    {
>-        if (!ValidateTexSubImage3DRobustANGLE(context, target, level, xoffset, yoffset, zoffset,
>-                                              width, height, depth, format, type, bufSize, pixels))
>-        {
>-            return;
>-        }
>-
>-        context->texSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth,
>-                               format, type, pixels);
>-    }
>-}
>-
>-void GL_APIENTRY CompressedTexImage2DRobustANGLE(GLenum target,
>-                                                 GLint level,
>-                                                 GLenum internalformat,
>-                                                 GLsizei width,
>-                                                 GLsizei height,
>-                                                 GLint border,
>-                                                 GLsizei imageSize,
>-                                                 GLsizei dataSize,
>-                                                 const GLvoid *data)
>-{
>-    EVENT(
>-        "(GLenum target = 0x%X, GLint level = %d, GLenum internalformat = 0x%X, GLsizei width = "
>-        "%d, "
>-        "GLsizei height = %d, GLint border = %d, GLsizei imageSize = %d, GLsizei dataSize = %d, "
>-        "const GLvoid* data = 0x%0.8p)",
>-        target, level, internalformat, width, height, border, imageSize, dataSize, data);
>-
>-    Context *context = GetValidGlobalContext();
>-    if (context)
>-    {
>-        if (!context->skipValidation() &&
>-            !ValidateCompressedTexImage2DRobustANGLE(context, target, level, internalformat, width,
>-                                                     height, border, imageSize, dataSize, data))
>-        {
>-            return;
>-        }
>-
>-        context->compressedTexImage2D(target, level, internalformat, width, height, border,
>-                                      imageSize, data);
>-    }
>-}
>-
>-void GL_APIENTRY CompressedTexSubImage2DRobustANGLE(GLenum target,
>-                                                    GLint level,
>-                                                    GLint xoffset,
>-                                                    GLint yoffset,
>-                                                    GLsizei width,
>-                                                    GLsizei height,
>-                                                    GLenum format,
>-                                                    GLsizei imageSize,
>-                                                    GLsizei dataSize,
>-                                                    const GLvoid *data)
>-{
>-    EVENT(
>-        "(GLenum target = 0x%X, GLint level = %d, GLint xoffset = %d, GLint yoffset = %d, "
>-        "GLsizei width = %d, GLsizei height = %d, GLenum format = 0x%X, "
>-        "GLsizei imageSize = %d, GLsizei dataSize = %d, const GLvoid* data = 0x%0.8p)",
>-        target, level, xoffset, yoffset, width, height, format, imageSize, dataSize, data);
>-
>-    Context *context = GetValidGlobalContext();
>-    if (context)
>-    {
>-        if (!context->skipValidation() && !ValidateCompressedTexSubImage2DRobustANGLE(
>-                                              context, target, level, xoffset, yoffset, width,
>-                                              height, format, imageSize, dataSize, data))
>-        {
>-            return;
>-        }
>-
>-        context->compressedTexSubImage2D(target, level, xoffset, yoffset, width, height, format,
>-                                         imageSize, data);
>-    }
>-}
>-
>-void GL_APIENTRY CompressedTexImage3DRobustANGLE(GLenum target,
>-                                                 GLint level,
>-                                                 GLenum internalformat,
>-                                                 GLsizei width,
>-                                                 GLsizei height,
>-                                                 GLsizei depth,
>-                                                 GLint border,
>-                                                 GLsizei imageSize,
>-                                                 GLsizei dataSize,
>-                                                 const GLvoid *data)
>-{
>-    EVENT(
>-        "(GLenum target = 0x%X, GLint level = %d, GLenum internalformat = 0x%X, GLsizei width = "
>-        "%d, "
>-        "GLsizei height = %d, GLsizei depth = %d, GLint border = %d, GLsizei imageSize = %d, "
>-        "GLsizei dataSize = %d, const GLvoid* data = 0x%0.8p)",
>-        target, level, internalformat, width, height, depth, border, imageSize, dataSize, data);
>-
>-    Context *context = GetValidGlobalContext();
>-    if (context)
>-    {
>-        if (!context->skipValidation() && !ValidateCompressedTexImage3DRobustANGLE(
>-                                              context, target, level, internalformat, width, height,
>-                                              depth, border, imageSize, dataSize, data))
>-        {
>-            return;
>-        }
>-
>-        context->compressedTexImage3D(target, level, internalformat, width, height, depth, border,
>-                                      imageSize, data);
>-    }
>-}
>-
>-void GL_APIENTRY CompressedTexSubImage3DRobustANGLE(GLenum target,
>-                                                    GLint level,
>-                                                    GLint xoffset,
>-                                                    GLint yoffset,
>-                                                    GLint zoffset,
>-                                                    GLsizei width,
>-                                                    GLsizei height,
>-                                                    GLsizei depth,
>-                                                    GLenum format,
>-                                                    GLsizei imageSize,
>-                                                    GLsizei dataSize,
>-                                                    const GLvoid *data)
>-{
>-    EVENT(
>-        "(GLenum target = 0x%X, GLint level = %d, GLint xoffset = %d, GLint yoffset = %d, "
>-        "GLint zoffset = %d, GLsizei width = %d, GLsizei height = %d, GLsizei depth = %d, "
>-        "GLenum format = 0x%X, GLsizei imageSize = %d, GLsizei dataSize = %d, const GLvoid* data = "
>-        "0x%0.8p)",
>-        target, level, xoffset, yoffset, zoffset, width, height, depth, format, imageSize, dataSize,
>-        data);
>-
>-    Context *context = GetValidGlobalContext();
>-    if (context)
>-    {
>-        if (!context->skipValidation() &&
>-            !ValidateCompressedTexSubImage3DRobustANGLE(context, target, level, xoffset, yoffset,
>-                                                        zoffset, width, height, depth, format,
>-                                                        imageSize, dataSize, data))
>-        {
>-            return;
>-        }
>-
>-        context->compressedTexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height,
>-                                         depth, format, imageSize, data);
>-    }
>-}
>-
>-ANGLE_EXPORT void GL_APIENTRY
>-GetQueryivRobustANGLE(GLenum target, GLenum pname, GLsizei bufSize, GLsizei *length, GLint *params)
>-{
>-    EVENT(
>-        "(GLenum target = 0x%X, GLenum pname = 0x%X, GLsizei bufsize = %d, GLsizei* length = "
>-        "0x%0.8p, GLint* params = 0x%0.8p)",
>-        target, pname, bufSize, length, params);
>-
>-    Context *context = GetValidGlobalContext();
>-    if (context)
>-    {
>-        GLsizei numParams = 0;
>-        if (!ValidateGetQueryivRobustANGLE(context, target, pname, bufSize, &numParams, params))
>-        {
>-            return;
>-        }
>-
>-        context->getQueryiv(target, pname, params);
>-        SetRobustLengthParam(length, numParams);
>-    }
>-}
>-
>-ANGLE_EXPORT void GL_APIENTRY GetQueryObjectuivRobustANGLE(GLuint id,
>-                                                           GLenum pname,
>-                                                           GLsizei bufSize,
>-                                                           GLsizei *length,
>-                                                           GLuint *params)
>-{
>-    EVENT(
>-        "(GLuint id = %u, GLenum pname = 0x%X, GLsizei bufsize = %d, GLsizei* length = 0x%0.8p, "
>-        "GLint* params = 0x%0.8p)",
>-        id, pname, bufSize, length, params);
>-
>-    Context *context = GetValidGlobalContext();
>-    if (context)
>-    {
>-        GLsizei numParams = 0;
>-        if (!ValidateGetQueryObjectuivRobustANGLE(context, id, pname, bufSize, &numParams, params))
>-        {
>-            return;
>-        }
>-
>-        context->getQueryObjectuiv(id, pname, params);
>-        SetRobustLengthParam(length, numParams);
>-    }
>-}
>-
>-ANGLE_EXPORT void GL_APIENTRY GetBufferPointervRobustANGLE(GLenum target,
>-                                                           GLenum pname,
>-                                                           GLsizei bufSize,
>-                                                           GLsizei *length,
>-                                                           void **params)
>-{
>-    EVENT(
>-        "(GLenum target = 0x%X, GLenum pname = 0x%X,  GLsizei bufsize = %d, GLsizei* length = "
>-        "0x%0.8p, void** params = 0x%0.8p)",
>-        target, pname, bufSize, length, params);
>-
>-    Context *context = GetValidGlobalContext();
>-    if (context)
>-    {
>-        BufferBinding targetPacked = FromGLenum<BufferBinding>(target);
>-
>-        GLsizei numParams = 0;
>-        if (!ValidateGetBufferPointervRobustANGLE(context, targetPacked, pname, bufSize, &numParams,
>-                                                  params))
>-        {
>-            return;
>-        }
>-
>-        context->getBufferPointerv(targetPacked, pname, params);
>-        SetRobustLengthParam(length, numParams);
>-    }
>-}
>-
>-ANGLE_EXPORT void GL_APIENTRY
>-GetIntegeri_vRobustANGLE(GLenum target, GLuint index, GLsizei bufSize, GLsizei *length, GLint *data)
>-{
>-    EVENT(
>-        "(GLenum target = 0x%X, GLuint index = %u, GLsizei bufsize = %d, GLsizei* length = "
>-        "0x%0.8p, GLint* data = 0x%0.8p)",
>-        target, index, bufSize, length, data);
>-
>-    Context *context = GetValidGlobalContext();
>-    if (context)
>-    {
>-        GLsizei numParams = 0;
>-        if (!ValidateGetIntegeri_vRobustANGLE(context, target, index, bufSize, &numParams, data))
>-        {
>-            return;
>-        }
>-
>-        context->getIntegeri_v(target, index, data);
>-        SetRobustLengthParam(length, numParams);
>-    }
>-}
>-
>-ANGLE_EXPORT void GL_APIENTRY GetInternalformativRobustANGLE(GLenum target,
>-                                                             GLenum internalformat,
>-                                                             GLenum pname,
>-                                                             GLsizei bufSize,
>-                                                             GLsizei *length,
>-                                                             GLint *params)
>-{
>-    EVENT(
>-        "(GLenum target = 0x%X, GLenum internalformat = 0x%X, GLenum pname = 0x%X, GLsizei bufSize "
>-        "= %d, GLsizei* length = 0x%0.8p, GLint* params = 0x%0.8p)",
>-        target, internalformat, pname, bufSize, length, params);
>-
>-    Context *context = GetValidGlobalContext();
>-    if (context)
>-    {
>-        GLsizei numParams = 0;
>-        if (!ValidateGetInternalFormativRobustANGLE(context, target, internalformat, pname, bufSize,
>-                                                    &numParams, params))
>-        {
>-            return;
>-        }
>-
>-        const TextureCaps &formatCaps = context->getTextureCaps().get(internalformat);
>-        QueryInternalFormativ(formatCaps, pname, bufSize, params);
>-        SetRobustLengthParam(length, numParams);
>-    }
>-}
>-
>-ANGLE_EXPORT void GL_APIENTRY GetVertexAttribIivRobustANGLE(GLuint index,
>-                                                            GLenum pname,
>-                                                            GLsizei bufSize,
>-                                                            GLsizei *length,
>-                                                            GLint *params)
>-{
>-    EVENT(
>-        "(GLuint index = %u, GLenum pname = 0x%X, GLsizei bufsize = %d, GLsizei* length = 0x%0.8p, "
>-        "GLint* params = 0x%0.8p)",
>-        index, pname, bufSize, length, params);
>-
>-    Context *context = GetValidGlobalContext();
>-    if (context)
>-    {
>-        GLsizei writeLength = 0;
>-        if (!ValidateGetVertexAttribIivRobustANGLE(context, index, pname, bufSize, &writeLength,
>-                                                   params))
>-        {
>-            return;
>-        }
>-
>-        context->getVertexAttribIiv(index, pname, params);
>-        SetRobustLengthParam(length, writeLength);
>-    }
>-}
>-
>-ANGLE_EXPORT void GL_APIENTRY GetVertexAttribIuivRobustANGLE(GLuint index,
>-                                                             GLenum pname,
>-                                                             GLsizei bufSize,
>-                                                             GLsizei *length,
>-                                                             GLuint *params)
>-{
>-    EVENT(
>-        "(GLuint index = %u, GLenum pname = 0x%X, GLsizei bufsize = %d, GLsizei* length = 0x%0.8p, "
>-        "GLuint* params = 0x%0.8p)",
>-        index, pname, bufSize, length, params);
>-
>-    Context *context = GetValidGlobalContext();
>-    if (context)
>-    {
>-        GLsizei writeLength = 0;
>-        if (!ValidateGetVertexAttribIuivRobustANGLE(context, index, pname, bufSize, &writeLength,
>-                                                    params))
>-        {
>-            return;
>-        }
>-
>-        context->getVertexAttribIuiv(index, pname, params);
>-        SetRobustLengthParam(length, writeLength);
>-    }
>-}
>-
>-ANGLE_EXPORT void GL_APIENTRY GetUniformuivRobustANGLE(GLuint program,
>-                                                       GLint location,
>-                                                       GLsizei bufSize,
>-                                                       GLsizei *length,
>-                                                       GLuint *params)
>-{
>-    EVENT(
>-        "(GLuint program = %u, GLint location = %d, GLsizei bufsize = %d, GLsizei* length = "
>-        "0x%0.8p, GLuint* params = 0x%0.8p)",
>-        program, location, bufSize, length, params);
>-
>-    Context *context = GetValidGlobalContext();
>-    if (context)
>-    {
>-        GLsizei writeLength = 0;
>-        if (!ValidateGetUniformuivRobustANGLE(context, program, location, bufSize, &writeLength,
>-                                              params))
>-        {
>-            return;
>-        }
>-
>-        Program *programObject = context->getProgram(program);
>-        ASSERT(programObject);
>-
>-        programObject->getUniformuiv(context, location, params);
>-        SetRobustLengthParam(length, writeLength);
>-    }
>-}
>-
>-ANGLE_EXPORT void GL_APIENTRY GetActiveUniformBlockivRobustANGLE(GLuint program,
>-                                                                 GLuint uniformBlockIndex,
>-                                                                 GLenum pname,
>-                                                                 GLsizei bufSize,
>-                                                                 GLsizei *length,
>-                                                                 GLint *params)
>-{
>-    EVENT(
>-        "(GLuint program = %u, GLuint uniformBlockIndex = %u, GLenum pname = 0x%X, GLsizei bufsize "
>-        "= %d, GLsizei* length = 0x%0.8p, GLint* params = 0x%0.8p)",
>-        program, uniformBlockIndex, pname, bufSize, length, params);
>-
>-    Context *context = GetValidGlobalContext();
>-    if (context)
>-    {
>-        GLsizei writeLength = 0;
>-        if (!ValidateGetActiveUniformBlockivRobustANGLE(context, program, uniformBlockIndex, pname,
>-                                                        bufSize, &writeLength, params))
>-        {
>-            return;
>-        }
>-
>-        const Program *programObject = context->getProgram(program);
>-        QueryActiveUniformBlockiv(programObject, uniformBlockIndex, pname, params);
>-        SetRobustLengthParam(length, writeLength);
>-    }
>-}
>-
>-ANGLE_EXPORT void GL_APIENTRY GetInteger64vRobustANGLE(GLenum pname,
>-                                                       GLsizei bufSize,
>-                                                       GLsizei *length,
>-                                                       GLint64 *data)
>-{
>-    EVENT(
>-        "(GLenum pname = 0x%X, GLsizei bufsize = %d, GLsizei* length = 0x%0.8p, GLint64* params = "
>-        "0x%0.8p)",
>-        pname, bufSize, length, data);
>-
>-    Context *context = GetValidGlobalContext();
>-    if (context)
>-    {
>-        GLenum nativeType;
>-        unsigned int numParams = 0;
>-        if (!ValidateRobustStateQuery(context, pname, bufSize, &nativeType, &numParams))
>-        {
>-            return;
>-        }
>-
>-        if (nativeType == GL_INT_64_ANGLEX)
>-        {
>-            context->getInteger64v(pname, data);
>-        }
>-        else
>-        {
>-            CastStateValues(context, nativeType, pname, numParams, data);
>-        }
>-        SetRobustLengthParam(length, numParams);
>-    }
>-}
>-
>-ANGLE_EXPORT void GL_APIENTRY GetInteger64i_vRobustANGLE(GLenum target,
>-                                                         GLuint index,
>-                                                         GLsizei bufSize,
>-                                                         GLsizei *length,
>-                                                         GLint64 *data)
>-{
>-    EVENT(
>-        "(GLenum target = 0x%X, GLuint index = %u, GLsizei bufsize = %d, GLsizei* length = "
>-        "0x%0.8p, GLint64* data = 0x%0.8p)",
>-        target, index, bufSize, length, data);
>-
>-    Context *context = GetValidGlobalContext();
>-    if (context)
>-    {
>-        GLsizei numParams = 0;
>-        if (!ValidateGetInteger64i_vRobustANGLE(context, target, index, bufSize, &numParams, data))
>-        {
>-            return;
>-        }
>-
>-        context->getInteger64i_v(target, index, data);
>-        SetRobustLengthParam(length, numParams);
>-    }
>-}
>-
>-ANGLE_EXPORT void GL_APIENTRY GetBufferParameteri64vRobustANGLE(GLenum target,
>-                                                                GLenum pname,
>-                                                                GLsizei bufSize,
>-                                                                GLsizei *length,
>-                                                                GLint64 *params)
>-{
>-    EVENT("(GLenum target = 0x%X, GLenum pname = 0x%X, GLint64* params = 0x%0.8p)", target, pname,
>-          bufSize, length, params);
>-
>-    Context *context = GetValidGlobalContext();
>-    if (context)
>-    {
>-        BufferBinding targetPacked = FromGLenum<BufferBinding>(target);
>-
>-        GLsizei numParams = 0;
>-        if (!ValidateGetBufferParameteri64vRobustANGLE(context, targetPacked, pname, bufSize,
>-                                                       &numParams, params))
>-        {
>-            return;
>-        }
>-
>-        Buffer *buffer = context->getGLState().getTargetBuffer(targetPacked);
>-        QueryBufferParameteri64v(buffer, pname, params);
>-        SetRobustLengthParam(length, numParams);
>-    }
>-}
>-
>-ANGLE_EXPORT void GL_APIENTRY SamplerParameterivRobustANGLE(GLuint sampler,
>-                                                            GLenum pname,
>-                                                            GLsizei bufSize,
>-                                                            const GLint *param)
>-{
>-    EVENT(
>-        "(GLuint sampler = %u, GLenum pname = 0x%X, GLsizei bufsize = %d, const GLint* params = "
>-        "0x%0.8p)",
>-        sampler, pname, bufSize, param);
>-
>-    Context *context = GetValidGlobalContext();
>-    if (context)
>-    {
>-        if (!ValidateSamplerParameterivRobustANGLE(context, sampler, pname, bufSize, param))
>-        {
>-            return;
>-        }
>-
>-        context->samplerParameteriv(sampler, pname, param);
>-    }
>-}
>-
>-ANGLE_EXPORT void GL_APIENTRY SamplerParameterfvRobustANGLE(GLuint sampler,
>-                                                            GLenum pname,
>-                                                            GLsizei bufSize,
>-                                                            const GLfloat *param)
>-{
>-    EVENT(
>-        "(GLuint sampler = %u, GLenum pname = 0x%X, GLsizei bufsize = %d, const GLfloat* params = "
>-        "0x%0.8p)",
>-        sampler, pname, bufSize, param);
>-
>-    Context *context = GetValidGlobalContext();
>-    if (context)
>-    {
>-        if (!ValidateSamplerParameterfvRobustANGLE(context, sampler, pname, bufSize, param))
>-        {
>-            return;
>-        }
>-
>-        context->samplerParameterfv(sampler, pname, param);
>-    }
>-}
>-
>-ANGLE_EXPORT void GL_APIENTRY GetSamplerParameterivRobustANGLE(GLuint sampler,
>-                                                               GLenum pname,
>-                                                               GLsizei bufSize,
>-                                                               GLsizei *length,
>-                                                               GLint *params)
>-{
>-    EVENT(
>-        "(GLuint sampler = %u, GLenum pname = 0x%X, GLsizei bufsize = %d, GLsizei* length = "
>-        "0x%0.8p, GLint* params = 0x%0.8p)",
>-        sampler, pname, bufSize, length, params);
>-
>-    Context *context = GetValidGlobalContext();
>-    if (context)
>-    {
>-        GLsizei numParams = 0;
>-        if (!ValidateGetSamplerParameterivRobustANGLE(context, sampler, pname, bufSize, &numParams,
>-                                                      params))
>-        {
>-            return;
>-        }
>-
>-        context->getSamplerParameteriv(sampler, pname, params);
>-        SetRobustLengthParam(length, numParams);
>-    }
>-}
>-
>-ANGLE_EXPORT void GL_APIENTRY GetSamplerParameterfvRobustANGLE(GLuint sampler,
>-                                                               GLenum pname,
>-                                                               GLsizei bufSize,
>-                                                               GLsizei *length,
>-                                                               GLfloat *params)
>-{
>-    EVENT(
>-        "(GLuint sample = %ur, GLenum pname = 0x%X, GLsizei bufsize = %d, GLsizei* length = "
>-        "0x%0.8p, GLfloat* params = 0x%0.8p)",
>-        sampler, pname, bufSize, length, params);
>-
>-    Context *context = GetValidGlobalContext();
>-    if (context)
>-    {
>-        GLsizei numParams = 0;
>-        if (!ValidateGetSamplerParameterfvRobustANGLE(context, sampler, pname, bufSize, &numParams,
>-                                                      params))
>-        {
>-            return;
>-        }
>-
>-        context->getSamplerParameterfv(sampler, pname, params);
>-        SetRobustLengthParam(length, numParams);
>-    }
>-}
>-
>-ANGLE_EXPORT void GL_APIENTRY GetFramebufferParameterivRobustANGLE(GLenum target,
>-                                                                   GLenum pname,
>-                                                                   GLsizei bufSize,
>-                                                                   GLsizei *length,
>-                                                                   GLint *params)
>-{
>-    EVENT(
>-        "(GLenum target = 0x%X, GLenum pname = 0x%X, GLsizei bufsize = %d, GLsizei* length = "
>-        "0x%0.8p, GLint* params = 0x%0.8p)",
>-        target, pname, bufSize, length, params);
>-    UNIMPLEMENTED();
>-}
>-
>-ANGLE_EXPORT void GL_APIENTRY GetProgramInterfaceivRobustANGLE(GLuint program,
>-                                                               GLenum programInterface,
>-                                                               GLenum pname,
>-                                                               GLsizei bufSize,
>-                                                               GLsizei *length,
>-                                                               GLint *params)
>-{
>-    EVENT(
>-        "(GLuint program = %u, GLenum programInterface = 0x%X, GLenum pname = 0x%X, GLsizei "
>-        "bufsize = %d, GLsizei* length = 0x%0.8p, GLint* params = 0x%0.8p)",
>-        program, programInterface, pname, bufSize, length, params);
>-    UNIMPLEMENTED();
>-}
>-
>-ANGLE_EXPORT void GL_APIENTRY GetBooleani_vRobustANGLE(GLenum target,
>-                                                       GLuint index,
>-                                                       GLsizei bufSize,
>-                                                       GLsizei *length,
>-                                                       GLboolean *data)
>-{
>-    EVENT(
>-        "(GLenum target = 0x%X, GLuint index = %u, GLsizei bufsize = %d, GLsizei* length = "
>-        "0x%0.8p, GLboolean* data = 0x%0.8p)",
>-        target, index, bufSize, length, data);
>-    Context *context = GetValidGlobalContext();
>-    if (context)
>-    {
>-        GLsizei numParams = 0;
>-        if (!ValidateGetBooleani_vRobustANGLE(context, target, index, bufSize, &numParams, data))
>-        {
>-            return;
>-        }
>-
>-        context->getBooleani_v(target, index, data);
>-        SetRobustLengthParam(length, numParams);
>-    }
>-}
>-
>-ANGLE_EXPORT void GL_APIENTRY GetMultisamplefvRobustANGLE(GLenum pname,
>-                                                          GLuint index,
>-                                                          GLsizei bufSize,
>-                                                          GLsizei *length,
>-                                                          GLfloat *val)
>-{
>-    EVENT(
>-        "(GLenum pname = 0x%X, GLuint index = %u, GLsizei bufsize = %d, GLsizei* length = 0x%0.8p, "
>-        "GLfloat* val = 0x%0.8p)",
>-        pname, index, bufSize, length, val);
>-    UNIMPLEMENTED();
>-}
>-
>-ANGLE_EXPORT void GL_APIENTRY GetTexLevelParameterivRobustANGLE(GLenum target,
>-                                                                GLint level,
>-                                                                GLenum pname,
>-                                                                GLsizei bufSize,
>-                                                                GLsizei *length,
>-                                                                GLint *params)
>-{
>-    EVENT(
>-        "(GLenum target = 0x%X, GLint level = %d, GLenum pname = 0x%X, GLsizei bufsize = %d, "
>-        "GLsizei* length = 0x%0.8p, GLint* params = 0x%0.8p)",
>-        target, level, pname, bufSize, length, params);
>-    UNIMPLEMENTED();
>-}
>-
>-ANGLE_EXPORT void GL_APIENTRY GetTexLevelParameterfvRobustANGLE(GLenum target,
>-                                                                GLint level,
>-                                                                GLenum pname,
>-                                                                GLsizei bufSize,
>-                                                                GLsizei *length,
>-                                                                GLfloat *params)
>-{
>-    EVENT(
>-        "(GLenum target = 0x%X, GLint level = %d, GLenum pname = 0x%X, GLsizei bufsize = %d, "
>-        "GLsizei* length = 0x%0.8p, GLfloat* params = 0x%0.8p)",
>-        target, level, pname, bufSize, length, params);
>-    UNIMPLEMENTED();
>-}
>-
>-ANGLE_EXPORT void GL_APIENTRY GetPointervRobustANGLERobustANGLE(GLenum pname,
>-                                                                GLsizei bufSize,
>-                                                                GLsizei *length,
>-                                                                void **params)
>-{
>-    EVENT(
>-        "(GLenum pname = 0x%X, GLsizei bufsize = %d, GLsizei* length = 0x%0.8p, void **params = "
>-        "0x%0.8p)",
>-        pname, bufSize, length, params);
>-    UNIMPLEMENTED();
>-}
>-
>-ANGLE_EXPORT void GL_APIENTRY ReadnPixelsRobustANGLE(GLint x,
>-                                                     GLint y,
>-                                                     GLsizei width,
>-                                                     GLsizei height,
>-                                                     GLenum format,
>-                                                     GLenum type,
>-                                                     GLsizei bufSize,
>-                                                     GLsizei *length,
>-                                                     GLsizei *columns,
>-                                                     GLsizei *rows,
>-                                                     void *data)
>-{
>-    EVENT(
>-        "(GLint x = %d, GLint y = %d, GLsizei width = %d, GLsizei height = %d, "
>-        "GLenum format = 0x%X, GLenum type = 0x%X, GLsizei bufsize = %d, GLsizei* length = "
>-        "0x%0.8p, GLsizei* columns = 0x%0.8p, GLsizei* rows = 0x%0.8p, void *data = 0x%0.8p)",
>-        x, y, width, height, format, type, bufSize, length, columns, rows, data);
>-
>-    Context *context = GetValidGlobalContext();
>-    if (context)
>-    {
>-        GLsizei writeLength  = 0;
>-        GLsizei writeColumns = 0;
>-        GLsizei writeRows    = 0;
>-        if (!ValidateReadnPixelsRobustANGLE(context, x, y, width, height, format, type, bufSize,
>-                                            &writeLength, &writeColumns, &writeRows, data))
>-        {
>-            return;
>-        }
>-
>-        context->readPixels(x, y, width, height, format, type, data);
>-
>-        SetRobustLengthParam(length, writeLength);
>-        SetRobustLengthParam(columns, writeColumns);
>-        SetRobustLengthParam(rows, writeRows);
>-    }
>-}
>-
>-ANGLE_EXPORT void GL_APIENTRY GetnUniformfvRobustANGLE(GLuint program,
>-                                                       GLint location,
>-                                                       GLsizei bufSize,
>-                                                       GLsizei *length,
>-                                                       GLfloat *params)
>-{
>-    EVENT(
>-        "(GLuint program = %d, GLint location = %d, GLsizei bufsize = %d, GLsizei* length = "
>-        "0x%0.8p, GLfloat* params = 0x%0.8p)",
>-        program, location, bufSize, length, params);
>-    UNIMPLEMENTED();
>-}
>-
>-ANGLE_EXPORT void GL_APIENTRY GetnUniformivRobustANGLE(GLuint program,
>-                                                       GLint location,
>-                                                       GLsizei bufSize,
>-                                                       GLsizei *length,
>-                                                       GLint *params)
>-{
>-    EVENT(
>-        "(GLuint program = %d, GLint location = %d, GLsizei bufsize = %d, GLsizei* length = "
>-        "0x%0.8p, GLint* params = 0x%0.8p)",
>-        program, location, bufSize, length, params);
>-    UNIMPLEMENTED();
>-}
>-
>-ANGLE_EXPORT void GL_APIENTRY GetnUniformuivRobustANGLE(GLuint program,
>-                                                        GLint location,
>-                                                        GLsizei bufSize,
>-                                                        GLsizei *length,
>-                                                        GLuint *params)
>-{
>-    EVENT(
>-        "(GLuint program = %u, GLint location = %d, GLsizei bufsize = %d, GLsizei* length = "
>-        "0x%0.8p, GLuint* params = 0x%0.8p)",
>-        program, location, bufSize, length, params);
>-    UNIMPLEMENTED();
>-}
>-
>-ANGLE_EXPORT void GL_APIENTRY TexParameterIivRobustANGLE(GLenum target,
>-                                                         GLenum pname,
>-                                                         GLsizei bufSize,
>-                                                         const GLint *params)
>-{
>-    EVENT(
>-        "(GLenum target = 0x%X, GLenum pname = 0x%X, GLsizei bufsize = %d, const GLint *params = "
>-        "0x%0.8p)",
>-        target, pname, bufSize, params);
>-    UNIMPLEMENTED();
>-}
>-
>-ANGLE_EXPORT void GL_APIENTRY TexParameterIuivRobustANGLE(GLenum target,
>-                                                          GLenum pname,
>-                                                          GLsizei bufSize,
>-                                                          const GLuint *params)
>-{
>-    EVENT(
>-        "(GLenum target = 0x%X, GLenum pname = 0x%X, GLsizei bufsize = %d, const GLuint *params = "
>-        "0x%0.8p)",
>-        target, pname, bufSize, params);
>-    UNIMPLEMENTED();
>-}
>-
>-ANGLE_EXPORT void GL_APIENTRY GetTexParameterIivRobustANGLE(GLenum target,
>-                                                            GLenum pname,
>-                                                            GLsizei bufSize,
>-                                                            GLsizei *length,
>-                                                            GLint *params)
>-{
>-    EVENT(
>-        "(GLenum target = 0x%X, GLenum pname = 0x%X, GLsizei bufsize = %d, GLsizei* length = "
>-        "0x%0.8p, GLint *params = 0x%0.8p)",
>-        target, pname, bufSize, length, params);
>-    UNIMPLEMENTED();
>-}
>-
>-ANGLE_EXPORT void GL_APIENTRY GetTexParameterIuivRobustANGLE(GLenum target,
>-                                                             GLenum pname,
>-                                                             GLsizei bufSize,
>-                                                             GLsizei *length,
>-                                                             GLuint *params)
>-{
>-    EVENT(
>-        "(GLenum target = 0x%X, GLenum pname = 0x%X, GLsizei bufsize = %d, GLsizei* length = "
>-        "0x%0.8p, GLuint *params = 0x%0.8p)",
>-        target, pname, bufSize, length, params);
>-    UNIMPLEMENTED();
>-}
>-
>-ANGLE_EXPORT void GL_APIENTRY SamplerParameterIivRobustANGLE(GLuint sampler,
>-                                                             GLenum pname,
>-                                                             GLsizei bufSize,
>-                                                             const GLint *param)
>-{
>-    EVENT(
>-        "(GLuint sampler = %d, GLenum pname = 0x%X, GLsizei bufsize = %d, const GLint *param = "
>-        "0x%0.8p)",
>-        sampler, pname, bufSize, param);
>-    UNIMPLEMENTED();
>-}
>-
>-ANGLE_EXPORT void GL_APIENTRY SamplerParameterIuivRobustANGLE(GLuint sampler,
>-                                                              GLenum pname,
>-                                                              GLsizei bufSize,
>-                                                              const GLuint *param)
>-{
>-    EVENT(
>-        "(GLuint sampler = %d, GLenum pname = 0x%X, GLsizei bufsize = %d, const GLuint *param = "
>-        "0x%0.8p)",
>-        sampler, pname, bufSize, param);
>-    UNIMPLEMENTED();
>-}
>-
>-ANGLE_EXPORT void GL_APIENTRY GetSamplerParameterIivRobustANGLE(GLuint sampler,
>-                                                                GLenum pname,
>-                                                                GLsizei bufSize,
>-                                                                GLsizei *length,
>-                                                                GLint *params)
>-{
>-    EVENT(
>-        "(GLuint sampler = %d, GLenum pname = 0x%X, GLsizei bufsize = %d, GLsizei* length = "
>-        "0x%0.8p, GLint *params = 0x%0.8p)",
>-        sampler, pname, bufSize, length, params);
>-    UNIMPLEMENTED();
>-}
>-
>-ANGLE_EXPORT void GL_APIENTRY GetSamplerParameterIuivRobustANGLE(GLuint sampler,
>-                                                                 GLenum pname,
>-                                                                 GLsizei bufSize,
>-                                                                 GLsizei *length,
>-                                                                 GLuint *params)
>-{
>-    EVENT(
>-        "(GLuint sampler = %d, GLenum pname = 0x%X, GLsizei bufsize = %d, GLsizei* length = "
>-        "0x%0.8p, GLuint *params = 0x%0.8p)",
>-        sampler, pname, bufSize, length, params);
>-    UNIMPLEMENTED();
>-}
>-
>-ANGLE_EXPORT void GL_APIENTRY GetQueryObjectivRobustANGLE(GLuint id,
>-                                                          GLenum pname,
>-                                                          GLsizei bufSize,
>-                                                          GLsizei *length,
>-                                                          GLint *params)
>-{
>-    EVENT(
>-        "(GLuint id = %d, GLenum pname = 0x%X, GLsizei bufsize = %d, GLsizei* length = 0x%0.8p, "
>-        "GLuint *params = 0x%0.8p)",
>-        id, pname, bufSize, length, params);
>-
>-    Context *context = GetValidGlobalContext();
>-    if (context)
>-    {
>-        GLsizei numParams = 0;
>-        if (!ValidateGetQueryObjectivRobustANGLE(context, id, pname, bufSize, &numParams, params))
>-        {
>-            return;
>-        }
>-
>-        context->getQueryObjectiv(id, pname, params);
>-        SetRobustLengthParam(length, numParams);
>-    }
>-}
>-
>-ANGLE_EXPORT void GL_APIENTRY GetQueryObjecti64vRobustANGLE(GLuint id,
>-                                                            GLenum pname,
>-                                                            GLsizei bufSize,
>-                                                            GLsizei *length,
>-                                                            GLint64 *params)
>-{
>-    EVENT(
>-        "(GLuint id = %d, GLenum pname = 0x%X, GLsizei bufsize = %d, GLsizei* length = 0x%0.8p, "
>-        "GLint64 *params = 0x%0.8p)",
>-        id, pname, bufSize, length, params);
>-
>-    Context *context = GetValidGlobalContext();
>-    if (context)
>-    {
>-        GLsizei numParams = 0;
>-        if (!ValidateGetQueryObjecti64vRobustANGLE(context, id, pname, bufSize, &numParams, params))
>-        {
>-            return;
>-        }
>-
>-        context->getQueryObjecti64v(id, pname, params);
>-        SetRobustLengthParam(length, numParams);
>-    }
>-}
>-
>-ANGLE_EXPORT void GL_APIENTRY GetQueryObjectui64vRobustANGLE(GLuint id,
>-                                                             GLenum pname,
>-                                                             GLsizei bufSize,
>-                                                             GLsizei *length,
>-                                                             GLuint64 *params)
>-{
>-    EVENT(
>-        "(GLuint id = %d, GLenum pname = 0x%X, GLsizei bufsize = %d, GLsizei* length = 0x%0.8p, "
>-        "GLuint64 *params = 0x%0.8p)",
>-        id, pname, bufSize, length, params);
>-
>-    Context *context = GetValidGlobalContext();
>-    if (context)
>-    {
>-        GLsizei numParams = 0;
>-        if (!ValidateGetQueryObjectui64vRobustANGLE(context, id, pname, bufSize, &numParams,
>-                                                    params))
>-        {
>-            return;
>-        }
>-
>-        context->getQueryObjectui64v(id, pname, params);
>-        SetRobustLengthParam(length, numParams);
>-    }
>-}
>-
>-GL_APICALL void GL_APIENTRY FramebufferTextureMultiviewLayeredANGLE(GLenum target,
>-                                                                    GLenum attachment,
>-                                                                    GLuint texture,
>-                                                                    GLint level,
>-                                                                    GLint baseViewIndex,
>-                                                                    GLsizei numViews)
>-{
>-    EVENT(
>-        "(GLenum target = 0x%X, GLenum attachment = 0x%X, GLuint texture = %u, GLint level = %d, "
>-        "GLint baseViewIndex = %d, GLsizei numViews = %d)",
>-        target, attachment, texture, level, baseViewIndex, numViews);
>-    Context *context = GetValidGlobalContext();
>-    if (context)
>-    {
>-        if (!context->skipValidation() &&
>-            !ValidateFramebufferTextureMultiviewLayeredANGLE(context, target, attachment, texture,
>-                                                             level, baseViewIndex, numViews))
>-        {
>-            return;
>-        }
>-        context->framebufferTextureMultiviewLayeredANGLE(target, attachment, texture, level,
>-                                                         baseViewIndex, numViews);
>-    }
>-}
>-
>-GL_APICALL void GL_APIENTRY FramebufferTextureMultiviewSideBySideANGLE(GLenum target,
>-                                                                       GLenum attachment,
>-                                                                       GLuint texture,
>-                                                                       GLint level,
>-                                                                       GLsizei numViews,
>-                                                                       const GLint *viewportOffsets)
>-{
>-    EVENT(
>-        "(GLenum target = 0x%X, GLenum attachment = 0x%X, GLuint texture = %u, GLint level = %d, "
>-        "GLsizei numViews = %d, GLsizei* viewportOffsets = 0x%0.8p)",
>-        target, attachment, texture, level, numViews, viewportOffsets);
>-    Context *context = GetValidGlobalContext();
>-    if (context)
>-    {
>-        if (!context->skipValidation() &&
>-            !ValidateFramebufferTextureMultiviewSideBySideANGLE(
>-                context, target, attachment, texture, level, numViews, viewportOffsets))
>-        {
>-            return;
>-        }
>-        context->framebufferTextureMultiviewSideBySideANGLE(target, attachment, texture, level,
>-                                                            numViews, viewportOffsets);
>-    }
>-}
>-
>-}  // gl
>diff --git a/Source/ThirdParty/ANGLE/src/libGLESv2/entry_points_gles_2_0_ext.h b/Source/ThirdParty/ANGLE/src/libGLESv2/entry_points_gles_2_0_ext.h
>deleted file mode 100644
>index 2a3fa607cff..00000000000
>--- a/Source/ThirdParty/ANGLE/src/libGLESv2/entry_points_gles_2_0_ext.h
>+++ /dev/null
>@@ -1,717 +0,0 @@
>-//
>-// Copyright(c) 2014 The ANGLE Project Authors. All rights reserved.
>-// Use of this source code is governed by a BSD-style license that can be
>-// found in the LICENSE file.
>-//
>-
>-// entry_points_gles_2_0_ext.h : Defines the GLES 2.0 extension entry points.
>-
>-#ifndef LIBGLESV2_ENTRYPOINTGLES20EXT_H_
>-#define LIBGLESV2_ENTRYPOINTGLES20EXT_H_
>-
>-#include <GLES2/gl2.h>
>-#include <GLES2/gl2ext.h>
>-#include <export.h>
>-
>-namespace gl
>-{
>-
>-// GL_ANGLE_framebuffer_blit
>-ANGLE_EXPORT void GL_APIENTRY BlitFramebufferANGLE(GLint srcX0,
>-                                                   GLint srcY0,
>-                                                   GLint srcX1,
>-                                                   GLint srcY1,
>-                                                   GLint dstX0,
>-                                                   GLint dstY0,
>-                                                   GLint dstX1,
>-                                                   GLint dstY1,
>-                                                   GLbitfield mask,
>-                                                   GLenum filter);
>-
>-// GL_ANGLE_framebuffer_multisample
>-ANGLE_EXPORT void GL_APIENTRY RenderbufferStorageMultisampleANGLE(GLenum target,
>-                                                                  GLsizei samples,
>-                                                                  GLenum internalformat,
>-                                                                  GLsizei width,
>-                                                                  GLsizei height);
>-
>-// GL_EXT_discard_framebuffer
>-ANGLE_EXPORT void GL_APIENTRY DiscardFramebufferEXT(GLenum target,
>-                                                    GLsizei numAttachments,
>-                                                    const GLenum *attachments);
>-
>-// GL_NV_fence
>-ANGLE_EXPORT void GL_APIENTRY DeleteFencesNV(GLsizei n, const GLuint *fences);
>-ANGLE_EXPORT void GL_APIENTRY GenFencesNV(GLsizei n, GLuint *fences);
>-ANGLE_EXPORT GLboolean GL_APIENTRY IsFenceNV(GLuint fence);
>-ANGLE_EXPORT GLboolean GL_APIENTRY TestFenceNV(GLuint fence);
>-ANGLE_EXPORT void GL_APIENTRY GetFenceivNV(GLuint fence, GLenum pname, GLint *params);
>-ANGLE_EXPORT void GL_APIENTRY FinishFenceNV(GLuint fence);
>-ANGLE_EXPORT void GL_APIENTRY SetFenceNV(GLuint fence, GLenum condition);
>-
>-// GL_ANGLE_translated_shader_source
>-ANGLE_EXPORT void GL_APIENTRY GetTranslatedShaderSourceANGLE(GLuint shader,
>-                                                             GLsizei bufsize,
>-                                                             GLsizei *length,
>-                                                             GLchar *source);
>-
>-// GL_EXT_texture_storage
>-ANGLE_EXPORT void GL_APIENTRY TexStorage2DEXT(GLenum target,
>-                                              GLsizei levels,
>-                                              GLenum internalformat,
>-                                              GLsizei width,
>-                                              GLsizei height);
>-
>-// GL_EXT_robustness
>-ANGLE_EXPORT GLenum GL_APIENTRY GetGraphicsResetStatusEXT(void);
>-ANGLE_EXPORT void GL_APIENTRY ReadnPixelsEXT(GLint x,
>-                                             GLint y,
>-                                             GLsizei width,
>-                                             GLsizei height,
>-                                             GLenum format,
>-                                             GLenum type,
>-                                             GLsizei bufSize,
>-                                             void *data);
>-ANGLE_EXPORT void GL_APIENTRY GetnUniformfvEXT(GLuint program,
>-                                               GLint location,
>-                                               GLsizei bufSize,
>-                                               float *params);
>-ANGLE_EXPORT void GL_APIENTRY GetnUniformivEXT(GLuint program,
>-                                               GLint location,
>-                                               GLsizei bufSize,
>-                                               GLint *params);
>-
>-// GL_EXT_occlusion_query_boolean
>-ANGLE_EXPORT void GL_APIENTRY GenQueriesEXT(GLsizei n, GLuint *ids);
>-ANGLE_EXPORT void GL_APIENTRY DeleteQueriesEXT(GLsizei n, const GLuint *ids);
>-ANGLE_EXPORT GLboolean GL_APIENTRY IsQueryEXT(GLuint id);
>-ANGLE_EXPORT void GL_APIENTRY BeginQueryEXT(GLenum target, GLuint id);
>-ANGLE_EXPORT void GL_APIENTRY EndQueryEXT(GLenum target);
>-ANGLE_EXPORT void GL_APIENTRY GetQueryivEXT(GLenum target, GLenum pname, GLint *params);
>-ANGLE_EXPORT void GL_APIENTRY GetQueryObjectuivEXT(GLuint id, GLenum pname, GLuint *params);
>-
>-// GL_EXT_disjoint_timer_query
>-ANGLE_EXPORT void GL_APIENTRY QueryCounterEXT(GLuint id, GLenum target);
>-ANGLE_EXPORT void GL_APIENTRY GetQueryObjectivEXT(GLuint id, GLenum pname, GLint *params);
>-ANGLE_EXPORT void GL_APIENTRY GetQueryObjecti64vEXT(GLuint id, GLenum pname, GLint64 *params);
>-ANGLE_EXPORT void GL_APIENTRY GetQueryObjectui64vEXT(GLuint id, GLenum pname, GLuint64 *params);
>-
>-// GL_EXT_draw_buffers
>-ANGLE_EXPORT void GL_APIENTRY DrawBuffersEXT(GLsizei n, const GLenum *bufs);
>-
>-// GL_ANGLE_instanced_arrays
>-ANGLE_EXPORT void GL_APIENTRY DrawArraysInstancedANGLE(GLenum mode,
>-                                                       GLint first,
>-                                                       GLsizei count,
>-                                                       GLsizei primcount);
>-ANGLE_EXPORT void GL_APIENTRY DrawElementsInstancedANGLE(GLenum mode,
>-                                                         GLsizei count,
>-                                                         GLenum type,
>-                                                         const void *indices,
>-                                                         GLsizei primcount);
>-ANGLE_EXPORT void GL_APIENTRY VertexAttribDivisorANGLE(GLuint index, GLuint divisor);
>-
>-// GL_OES_get_program_binary
>-ANGLE_EXPORT void GL_APIENTRY GetProgramBinaryOES(GLuint program,
>-                                                  GLsizei bufSize,
>-                                                  GLsizei *length,
>-                                                  GLenum *binaryFormat,
>-                                                  void *binary);
>-ANGLE_EXPORT void GL_APIENTRY ProgramBinaryOES(GLuint program,
>-                                               GLenum binaryFormat,
>-                                               const void *binary,
>-                                               GLint length);
>-
>-// GL_OES_mapbuffer
>-ANGLE_EXPORT void *GL_APIENTRY MapBufferOES(GLenum target, GLenum access);
>-ANGLE_EXPORT GLboolean GL_APIENTRY UnmapBufferOES(GLenum target);
>-ANGLE_EXPORT void GL_APIENTRY GetBufferPointervOES(GLenum target, GLenum pname, void **params);
>-
>-// GL_EXT_map_buffer_range
>-ANGLE_EXPORT void *GL_APIENTRY MapBufferRangeEXT(GLenum target,
>-                                                 GLintptr offset,
>-                                                 GLsizeiptr length,
>-                                                 GLbitfield access);
>-ANGLE_EXPORT void GL_APIENTRY FlushMappedBufferRangeEXT(GLenum target,
>-                                                        GLintptr offset,
>-                                                        GLsizeiptr length);
>-
>-// GL_EXT_debug_marker
>-ANGLE_EXPORT void GL_APIENTRY InsertEventMarkerEXT(GLsizei length, const char *marker);
>-ANGLE_EXPORT void GL_APIENTRY PushGroupMarkerEXT(GLsizei length, const char *marker);
>-ANGLE_EXPORT void GL_APIENTRY PopGroupMarkerEXT();
>-
>-// GL_OES_EGL_image
>-ANGLE_EXPORT void GL_APIENTRY EGLImageTargetTexture2DOES(GLenum target, GLeglImageOES image);
>-ANGLE_EXPORT void GL_APIENTRY EGLImageTargetRenderbufferStorageOES(GLenum target,
>-                                                                   GLeglImageOES image);
>-
>-// GL_OES_vertex_array_object
>-ANGLE_EXPORT void GL_APIENTRY BindVertexArrayOES(GLuint array);
>-ANGLE_EXPORT void GL_APIENTRY DeleteVertexArraysOES(GLsizei n, const GLuint *arrays);
>-ANGLE_EXPORT void GL_APIENTRY GenVertexArraysOES(GLsizei n, GLuint *arrays);
>-ANGLE_EXPORT GLboolean GL_APIENTRY IsVertexArrayOES(GLuint array);
>-
>-// GL_KHR_debug
>-ANGLE_EXPORT void GL_APIENTRY DebugMessageControlKHR(GLenum source,
>-                                                     GLenum type,
>-                                                     GLenum severity,
>-                                                     GLsizei count,
>-                                                     const GLuint *ids,
>-                                                     GLboolean enabled);
>-ANGLE_EXPORT void GL_APIENTRY DebugMessageInsertKHR(GLenum source,
>-                                                    GLenum type,
>-                                                    GLuint id,
>-                                                    GLenum severity,
>-                                                    GLsizei length,
>-                                                    const GLchar *buf);
>-ANGLE_EXPORT void GL_APIENTRY DebugMessageCallbackKHR(GLDEBUGPROCKHR callback,
>-                                                      const void *userParam);
>-ANGLE_EXPORT GLuint GL_APIENTRY GetDebugMessageLogKHR(GLuint count,
>-                                                      GLsizei bufSize,
>-                                                      GLenum *sources,
>-                                                      GLenum *types,
>-                                                      GLuint *ids,
>-                                                      GLenum *severities,
>-                                                      GLsizei *lengths,
>-                                                      GLchar *messageLog);
>-ANGLE_EXPORT void GL_APIENTRY PushDebugGroupKHR(GLenum source,
>-                                                GLuint id,
>-                                                GLsizei length,
>-                                                const GLchar *message);
>-ANGLE_EXPORT void GL_APIENTRY PopDebugGroupKHR(void);
>-ANGLE_EXPORT void GL_APIENTRY ObjectLabelKHR(GLenum identifier,
>-                                             GLuint name,
>-                                             GLsizei length,
>-                                             const GLchar *label);
>-ANGLE_EXPORT void GL_APIENTRY
>-GetObjectLabelKHR(GLenum identifier, GLuint name, GLsizei bufSize, GLsizei *length, GLchar *label);
>-ANGLE_EXPORT void GL_APIENTRY ObjectPtrLabelKHR(const void *ptr,
>-                                                GLsizei length,
>-                                                const GLchar *label);
>-ANGLE_EXPORT void GL_APIENTRY GetObjectPtrLabelKHR(const void *ptr,
>-                                                   GLsizei bufSize,
>-                                                   GLsizei *length,
>-                                                   GLchar *label);
>-ANGLE_EXPORT void GL_APIENTRY GetPointervKHR(GLenum pname, void **params);
>-
>-// GL_CHROMIUM_bind_uniform_location
>-ANGLE_EXPORT void GL_APIENTRY BindUniformLocationCHROMIUM(GLuint program,
>-                                                          GLint location,
>-                                                          const GLchar *name);
>-
>-// GL_CHROMIUM_framebuffer_mixed_samples
>-ANGLE_EXPORT void GL_APIENTRY MatrixLoadfCHROMIUM(GLenum matrixMode, const GLfloat *matrix);
>-ANGLE_EXPORT void GL_APIENTRY MatrixLoadIdentityCHROMIUM(GLenum matrixMode);
>-
>-ANGLE_EXPORT void GL_APIENTRY CoverageModulationCHROMIUM(GLenum components);
>-
>-// GL_CHROMIUM_path_rendering
>-ANGLE_EXPORT GLuint GL_APIENTRY GenPathsCHROMIUM(GLsizei chromium);
>-ANGLE_EXPORT void GL_APIENTRY DeletePathsCHROMIUM(GLuint first, GLsizei range);
>-ANGLE_EXPORT GLboolean GL_APIENTRY IsPathCHROMIUM(GLuint path);
>-ANGLE_EXPORT void GL_APIENTRY PathCommandsCHROMIUM(GLuint path,
>-                                                   GLsizei numCommands,
>-                                                   const GLubyte *commands,
>-                                                   GLsizei numCoords,
>-                                                   GLenum coordType,
>-                                                   const void *coords);
>-ANGLE_EXPORT void GL_APIENTRY PathParameterfCHROMIUM(GLuint path, GLenum pname, GLfloat value);
>-ANGLE_EXPORT void GL_APIENTRY PathParameteriCHROMIUM(GLuint path, GLenum pname, GLint value);
>-ANGLE_EXPORT void GL_APIENTRY GetPathParameterfCHROMIUM(GLuint path, GLenum pname, GLfloat *value);
>-ANGLE_EXPORT void GL_APIENTRY GetPathParameteriCHROMIUM(GLuint path, GLenum pname, GLint *value);
>-ANGLE_EXPORT void GL_APIENTRY PathStencilFuncCHROMIUM(GLenum func, GLint ref, GLuint mask);
>-ANGLE_EXPORT void GL_APIENTRY StencilFillPathCHROMIUM(GLuint path, GLenum fillMode, GLuint mask);
>-ANGLE_EXPORT void GL_APIENTRY StencilStrokePathCHROMIUM(GLuint path, GLint reference, GLuint mask);
>-ANGLE_EXPORT void GL_APIENTRY CoverFillPathCHROMIUM(GLuint path, GLenum coverMode);
>-ANGLE_EXPORT void GL_APIENTRY CoverStrokePathCHROMIUM(GLuint path, GLenum coverMode);
>-ANGLE_EXPORT void GL_APIENTRY StencilThenCoverFillPathCHROMIUM(GLuint path,
>-                                                               GLenum fillMode,
>-                                                               GLuint mask,
>-                                                               GLenum coverMode);
>-ANGLE_EXPORT void GL_APIENTRY StencilThenCoverStrokePathCHROMIUM(GLuint path,
>-                                                                 GLint reference,
>-                                                                 GLuint mask,
>-                                                                 GLenum coverMode);
>-ANGLE_EXPORT void GL_APIENTRY CoverFillPathInstancedCHROMIUM(GLsizei numPaths,
>-                                                             GLenum pathNameType,
>-                                                             const void *paths,
>-                                                             GLuint pathBase,
>-                                                             GLenum coverMode,
>-                                                             GLenum transformType,
>-                                                             const GLfloat *transformValues);
>-ANGLE_EXPORT void GL_APIENTRY CoverStrokePathInstancedCHROMIUM(GLsizei numPaths,
>-                                                               GLenum pathNameType,
>-                                                               const void *paths,
>-                                                               GLuint pathBase,
>-                                                               GLenum coverMode,
>-                                                               GLenum transformType,
>-                                                               const GLfloat *transformValues);
>-ANGLE_EXPORT void GL_APIENTRY StencilFillPathInstancedCHROMIUM(GLsizei numPaths,
>-                                                               GLenum pathNameType,
>-                                                               const void *paths,
>-                                                               GLuint pathBAse,
>-                                                               GLenum fillMode,
>-                                                               GLuint mask,
>-                                                               GLenum transformType,
>-                                                               const GLfloat *transformValues);
>-ANGLE_EXPORT void GL_APIENTRY StencilStrokePathInstancedCHROMIUM(GLsizei numPaths,
>-                                                                 GLenum pathNameType,
>-                                                                 const void *paths,
>-                                                                 GLuint pathBase,
>-                                                                 GLint reference,
>-                                                                 GLuint mask,
>-                                                                 GLenum transformType,
>-                                                                 const GLfloat *transformValues);
>-ANGLE_EXPORT void GL_APIENTRY
>-StencilThenCoverFillPathInstancedCHROMIUM(GLsizei numPaths,
>-                                          GLenum pathNameType,
>-                                          const void *paths,
>-                                          GLuint pathBase,
>-                                          GLenum fillMode,
>-                                          GLuint mask,
>-                                          GLenum coverMode,
>-                                          GLenum transformType,
>-                                          const GLfloat *transformValues);
>-ANGLE_EXPORT void GL_APIENTRY
>-StencilThenCoverStrokePathInstancedCHROMIUM(GLsizei numPaths,
>-                                            GLenum pathNameType,
>-                                            const void *paths,
>-                                            GLuint pathBase,
>-                                            GLint reference,
>-                                            GLuint mask,
>-                                            GLenum coverMode,
>-                                            GLenum transformType,
>-                                            const GLfloat *transformValues);
>-ANGLE_EXPORT void GL_APIENTRY BindFragmentInputLocationCHROMIUM(GLuint program,
>-                                                                GLint location,
>-                                                                const GLchar *name);
>-ANGLE_EXPORT void GL_APIENTRY ProgramPathFragmentInputGenCHROMIUM(GLuint program,
>-                                                                  GLint location,
>-                                                                  GLenum genMode,
>-                                                                  GLint components,
>-                                                                  const GLfloat *coeffs);
>-
>-// GL_CHROMIUM_copy_texture
>-ANGLE_EXPORT void GL_APIENTRY CopyTextureCHROMIUM(GLuint sourceId,
>-                                                  GLint sourceLevel,
>-                                                  GLenum destTarget,
>-                                                  GLuint destId,
>-                                                  GLint destLevel,
>-                                                  GLint internalFormat,
>-                                                  GLenum destType,
>-                                                  GLboolean unpackFlipY,
>-                                                  GLboolean unpackPremultiplyAlpha,
>-                                                  GLboolean unpackUnmultiplyAlpha);
>-
>-ANGLE_EXPORT void GL_APIENTRY CopySubTextureCHROMIUM(GLuint sourceId,
>-                                                     GLint sourceLevel,
>-                                                     GLenum destTarget,
>-                                                     GLuint destId,
>-                                                     GLint destLevel,
>-                                                     GLint xoffset,
>-                                                     GLint yoffset,
>-                                                     GLint x,
>-                                                     GLint y,
>-                                                     GLsizei width,
>-                                                     GLsizei height,
>-                                                     GLboolean unpackFlipY,
>-                                                     GLboolean unpackPremultiplyAlpha,
>-                                                     GLboolean unpackUnmultiplyAlpha);
>-
>-// GL_CHROMIUM_copy_compressed_texture
>-ANGLE_EXPORT void GL_APIENTRY CompressedCopyTextureCHROMIUM(GLuint sourceId, GLuint destId);
>-
>-// GL_ANGLE_request_extension
>-ANGLE_EXPORT void GL_APIENTRY RequestExtensionANGLE(const GLchar *name);
>-
>-// GL_ANGLE_robust_client_memory
>-ANGLE_EXPORT void GL_APIENTRY GetBooleanvRobustANGLE(GLenum pname,
>-                                                     GLsizei bufSize,
>-                                                     GLsizei *length,
>-                                                     GLboolean *data);
>-ANGLE_EXPORT void GL_APIENTRY GetBufferParameterivRobustANGLE(GLenum target,
>-                                                              GLenum pname,
>-                                                              GLsizei bufSize,
>-                                                              GLsizei *length,
>-                                                              GLint *params);
>-ANGLE_EXPORT void GL_APIENTRY GetFloatvRobustANGLE(GLenum pname,
>-                                                   GLsizei bufSize,
>-                                                   GLsizei *length,
>-                                                   GLfloat *data);
>-ANGLE_EXPORT void GL_APIENTRY GetFramebufferAttachmentParameterivRobustANGLE(GLenum target,
>-                                                                             GLenum attachment,
>-                                                                             GLenum pname,
>-                                                                             GLsizei bufSize,
>-                                                                             GLsizei *length,
>-                                                                             GLint *params);
>-ANGLE_EXPORT void GL_APIENTRY GetIntegervRobustANGLE(GLenum pname,
>-                                                     GLsizei bufSize,
>-                                                     GLsizei *length,
>-                                                     GLint *data);
>-ANGLE_EXPORT void GL_APIENTRY GetProgramivRobustANGLE(GLuint program,
>-                                                      GLenum pname,
>-                                                      GLsizei bufSize,
>-                                                      GLsizei *length,
>-                                                      GLint *params);
>-ANGLE_EXPORT void GL_APIENTRY GetRenderbufferParameterivRobustANGLE(GLenum target,
>-                                                                    GLenum pname,
>-                                                                    GLsizei bufSize,
>-                                                                    GLsizei *length,
>-                                                                    GLint *params);
>-ANGLE_EXPORT void GL_APIENTRY GetShaderivRobustANGLE(GLuint shader,
>-                                                     GLenum pname,
>-                                                     GLsizei bufSize,
>-                                                     GLsizei *length,
>-                                                     GLint *params);
>-ANGLE_EXPORT void GL_APIENTRY GetTexParameterfvRobustANGLE(GLenum target,
>-                                                           GLenum pname,
>-                                                           GLsizei bufSize,
>-                                                           GLsizei *length,
>-                                                           GLfloat *params);
>-ANGLE_EXPORT void GL_APIENTRY GetTexParameterivRobustANGLE(GLenum target,
>-                                                           GLenum pname,
>-                                                           GLsizei bufSize,
>-                                                           GLsizei *length,
>-                                                           GLint *params);
>-ANGLE_EXPORT void GL_APIENTRY GetUniformfvRobustANGLE(GLuint program,
>-                                                      GLint location,
>-                                                      GLsizei bufSize,
>-                                                      GLsizei *length,
>-                                                      GLfloat *params);
>-ANGLE_EXPORT void GL_APIENTRY GetUniformivRobustANGLE(GLuint program,
>-                                                      GLint location,
>-                                                      GLsizei bufSize,
>-                                                      GLsizei *length,
>-                                                      GLint *params);
>-ANGLE_EXPORT void GL_APIENTRY GetVertexAttribfvRobustANGLE(GLuint index,
>-                                                           GLenum pname,
>-                                                           GLsizei bufSize,
>-                                                           GLsizei *length,
>-                                                           GLfloat *params);
>-ANGLE_EXPORT void GL_APIENTRY GetVertexAttribivRobustANGLE(GLuint index,
>-                                                           GLenum pname,
>-                                                           GLsizei bufSize,
>-                                                           GLsizei *length,
>-                                                           GLint *params);
>-ANGLE_EXPORT void GL_APIENTRY GetVertexAttribPointervRobustANGLE(GLuint index,
>-                                                                 GLenum pname,
>-                                                                 GLsizei bufSize,
>-                                                                 GLsizei *length,
>-                                                                 void **pointer);
>-ANGLE_EXPORT void GL_APIENTRY ReadPixelsRobustANGLE(GLint x,
>-                                                    GLint y,
>-                                                    GLsizei width,
>-                                                    GLsizei height,
>-                                                    GLenum format,
>-                                                    GLenum type,
>-                                                    GLsizei bufSize,
>-                                                    GLsizei *length,
>-                                                    GLsizei *columns,
>-                                                    GLsizei *rows,
>-                                                    void *pixels);
>-ANGLE_EXPORT void GL_APIENTRY TexImage2DRobustANGLE(GLenum target,
>-                                                    GLint level,
>-                                                    GLint internalformat,
>-                                                    GLsizei width,
>-                                                    GLsizei height,
>-                                                    GLint border,
>-                                                    GLenum format,
>-                                                    GLenum type,
>-                                                    GLsizei bufSize,
>-                                                    const void *pixels);
>-ANGLE_EXPORT void GL_APIENTRY TexParameterfvRobustANGLE(GLenum target,
>-                                                        GLenum pname,
>-                                                        GLsizei bufSize,
>-                                                        const GLfloat *params);
>-ANGLE_EXPORT void GL_APIENTRY TexParameterivRobustANGLE(GLenum target,
>-                                                        GLenum pname,
>-                                                        GLsizei bufSize,
>-                                                        const GLint *params);
>-ANGLE_EXPORT void GL_APIENTRY TexSubImage2DRobustANGLE(GLenum target,
>-                                                       GLint level,
>-                                                       GLint xoffset,
>-                                                       GLint yoffset,
>-                                                       GLsizei width,
>-                                                       GLsizei height,
>-                                                       GLenum format,
>-                                                       GLenum type,
>-                                                       GLsizei bufSize,
>-                                                       const void *pixels);
>-
>-ANGLE_EXPORT void GL_APIENTRY TexImage3DRobustANGLE(GLenum target,
>-                                                    GLint level,
>-                                                    GLint internalformat,
>-                                                    GLsizei width,
>-                                                    GLsizei height,
>-                                                    GLsizei depth,
>-                                                    GLint border,
>-                                                    GLenum format,
>-                                                    GLenum type,
>-                                                    GLsizei bufSize,
>-                                                    const void *pixels);
>-ANGLE_EXPORT void GL_APIENTRY TexSubImage3DRobustANGLE(GLenum target,
>-                                                       GLint level,
>-                                                       GLint xoffset,
>-                                                       GLint yoffset,
>-                                                       GLint zoffset,
>-                                                       GLsizei width,
>-                                                       GLsizei height,
>-                                                       GLsizei depth,
>-                                                       GLenum format,
>-                                                       GLenum type,
>-                                                       GLsizei bufSize,
>-                                                       const void *pixels);
>-
>-ANGLE_EXPORT void GL_APIENTRY CompressedTexImage2DRobustANGLE(GLenum target,
>-                                                              GLint level,
>-                                                              GLenum internalformat,
>-                                                              GLsizei width,
>-                                                              GLsizei height,
>-                                                              GLint border,
>-                                                              GLsizei imageSize,
>-                                                              GLsizei dataSize,
>-                                                              const GLvoid *data);
>-ANGLE_EXPORT void GL_APIENTRY CompressedTexSubImage2DRobustANGLE(GLenum target,
>-                                                                 GLint level,
>-                                                                 GLint xoffset,
>-                                                                 GLint yoffset,
>-                                                                 GLsizei width,
>-                                                                 GLsizei height,
>-                                                                 GLenum format,
>-                                                                 GLsizei imageSize,
>-                                                                 GLsizei dataSize,
>-                                                                 const GLvoid *data);
>-ANGLE_EXPORT void GL_APIENTRY CompressedTexImage3DRobustANGLE(GLenum target,
>-                                                              GLint level,
>-                                                              GLenum internalformat,
>-                                                              GLsizei width,
>-                                                              GLsizei height,
>-                                                              GLsizei depth,
>-                                                              GLint border,
>-                                                              GLsizei imageSize,
>-                                                              GLsizei dataSize,
>-                                                              const GLvoid *data);
>-ANGLE_EXPORT void GL_APIENTRY CompressedTexSubImage3DRobustANGLE(GLenum target,
>-                                                                 GLint level,
>-                                                                 GLint xoffset,
>-                                                                 GLint yoffset,
>-                                                                 GLint zoffset,
>-                                                                 GLsizei width,
>-                                                                 GLsizei height,
>-                                                                 GLsizei depth,
>-                                                                 GLenum format,
>-                                                                 GLsizei imageSize,
>-                                                                 GLsizei dataSize,
>-                                                                 const GLvoid *data);
>-
>-ANGLE_EXPORT void GL_APIENTRY
>-GetQueryivRobustANGLE(GLenum target, GLenum pname, GLsizei bufSize, GLsizei *length, GLint *params);
>-ANGLE_EXPORT void GL_APIENTRY GetQueryObjectuivRobustANGLE(GLuint id,
>-                                                           GLenum pname,
>-                                                           GLsizei bufSize,
>-                                                           GLsizei *length,
>-                                                           GLuint *params);
>-ANGLE_EXPORT void GL_APIENTRY GetBufferPointervRobustANGLE(GLenum target,
>-                                                           GLenum pname,
>-                                                           GLsizei bufSize,
>-                                                           GLsizei *length,
>-                                                           void **params);
>-ANGLE_EXPORT void GL_APIENTRY GetIntegeri_vRobustANGLE(GLenum target,
>-                                                       GLuint index,
>-                                                       GLsizei bufSize,
>-                                                       GLsizei *length,
>-                                                       GLint *data);
>-ANGLE_EXPORT void GL_APIENTRY GetInternalformativRobustANGLE(GLenum target,
>-                                                             GLenum internalformat,
>-                                                             GLenum pname,
>-                                                             GLsizei bufSize,
>-                                                             GLsizei *length,
>-                                                             GLint *params);
>-ANGLE_EXPORT void GL_APIENTRY GetVertexAttribIivRobustANGLE(GLuint index,
>-                                                            GLenum pname,
>-                                                            GLsizei bufSize,
>-                                                            GLsizei *length,
>-                                                            GLint *params);
>-ANGLE_EXPORT void GL_APIENTRY GetVertexAttribIuivRobustANGLE(GLuint index,
>-                                                             GLenum pname,
>-                                                             GLsizei bufSize,
>-                                                             GLsizei *length,
>-                                                             GLuint *params);
>-ANGLE_EXPORT void GL_APIENTRY GetUniformuivRobustANGLE(GLuint program,
>-                                                       GLint location,
>-                                                       GLsizei bufSize,
>-                                                       GLsizei *length,
>-                                                       GLuint *params);
>-ANGLE_EXPORT void GL_APIENTRY GetActiveUniformBlockivRobustANGLE(GLuint program,
>-                                                                 GLuint uniformBlockIndex,
>-                                                                 GLenum pname,
>-                                                                 GLsizei bufSize,
>-                                                                 GLsizei *length,
>-                                                                 GLint *params);
>-ANGLE_EXPORT void GL_APIENTRY GetInteger64vRobustANGLE(GLenum pname,
>-                                                       GLsizei bufSize,
>-                                                       GLsizei *length,
>-                                                       GLint64 *data);
>-ANGLE_EXPORT void GL_APIENTRY GetInteger64i_vRobustANGLE(GLenum target,
>-                                                         GLuint index,
>-                                                         GLsizei bufSize,
>-                                                         GLsizei *length,
>-                                                         GLint64 *data);
>-ANGLE_EXPORT void GL_APIENTRY GetBufferParameteri64vRobustANGLE(GLenum target,
>-                                                                GLenum pname,
>-                                                                GLsizei bufSize,
>-                                                                GLsizei *length,
>-                                                                GLint64 *params);
>-ANGLE_EXPORT void GL_APIENTRY SamplerParameterivRobustANGLE(GLuint sampler,
>-                                                            GLenum pname,
>-                                                            GLsizei bufSize,
>-                                                            const GLint *param);
>-ANGLE_EXPORT void GL_APIENTRY SamplerParameterfvRobustANGLE(GLuint sampler,
>-                                                            GLenum pname,
>-                                                            GLsizei bufSize,
>-                                                            const GLfloat *param);
>-ANGLE_EXPORT void GL_APIENTRY GetSamplerParameterivRobustANGLE(GLuint sampler,
>-                                                               GLenum pname,
>-                                                               GLsizei bufSize,
>-                                                               GLsizei *length,
>-                                                               GLint *params);
>-ANGLE_EXPORT void GL_APIENTRY GetSamplerParameterfvRobustANGLE(GLuint sampler,
>-                                                               GLenum pname,
>-                                                               GLsizei bufSize,
>-                                                               GLsizei *length,
>-                                                               GLfloat *params);
>-
>-ANGLE_EXPORT void GL_APIENTRY GetFramebufferParameterivRobustANGLE(GLenum target,
>-                                                                   GLenum pname,
>-                                                                   GLsizei bufSize,
>-                                                                   GLsizei *length,
>-                                                                   GLint *params);
>-ANGLE_EXPORT void GL_APIENTRY GetProgramInterfaceivRobustANGLE(GLuint program,
>-                                                               GLenum programInterface,
>-                                                               GLenum pname,
>-                                                               GLsizei bufSize,
>-                                                               GLsizei *length,
>-                                                               GLint *params);
>-ANGLE_EXPORT void GL_APIENTRY GetBooleani_vRobustANGLE(GLenum target,
>-                                                       GLuint index,
>-                                                       GLsizei bufSize,
>-                                                       GLsizei *length,
>-                                                       GLboolean *data);
>-ANGLE_EXPORT void GL_APIENTRY GetMultisamplefvRobustANGLE(GLenum pname,
>-                                                          GLuint index,
>-                                                          GLsizei bufSize,
>-                                                          GLsizei *length,
>-                                                          GLfloat *val);
>-ANGLE_EXPORT void GL_APIENTRY GetTexLevelParameterivRobustANGLE(GLenum target,
>-                                                                GLint level,
>-                                                                GLenum pname,
>-                                                                GLsizei bufSize,
>-                                                                GLsizei *length,
>-                                                                GLint *params);
>-ANGLE_EXPORT void GL_APIENTRY GetTexLevelParameterfvRobustANGLE(GLenum target,
>-                                                                GLint level,
>-                                                                GLenum pname,
>-                                                                GLsizei bufSize,
>-                                                                GLsizei *length,
>-                                                                GLfloat *params);
>-
>-ANGLE_EXPORT void GL_APIENTRY GetPointervRobustANGLERobustANGLE(GLenum pname,
>-                                                                GLsizei bufSize,
>-                                                                GLsizei *length,
>-                                                                void **params);
>-ANGLE_EXPORT void GL_APIENTRY ReadnPixelsRobustANGLE(GLint x,
>-                                                     GLint y,
>-                                                     GLsizei width,
>-                                                     GLsizei height,
>-                                                     GLenum format,
>-                                                     GLenum type,
>-                                                     GLsizei bufSize,
>-                                                     GLsizei *length,
>-                                                     GLsizei *columns,
>-                                                     GLsizei *rows,
>-                                                     void *data);
>-ANGLE_EXPORT void GL_APIENTRY GetnUniformfvRobustANGLE(GLuint program,
>-                                                       GLint location,
>-                                                       GLsizei bufSize,
>-                                                       GLsizei *length,
>-                                                       GLfloat *params);
>-ANGLE_EXPORT void GL_APIENTRY GetnUniformivRobustANGLE(GLuint program,
>-                                                       GLint location,
>-                                                       GLsizei bufSize,
>-                                                       GLsizei *length,
>-                                                       GLint *params);
>-ANGLE_EXPORT void GL_APIENTRY GetnUniformuivRobustANGLE(GLuint program,
>-                                                        GLint location,
>-                                                        GLsizei bufSize,
>-                                                        GLsizei *length,
>-                                                        GLuint *params);
>-ANGLE_EXPORT void GL_APIENTRY TexParameterIivRobustANGLE(GLenum target,
>-                                                         GLenum pname,
>-                                                         GLsizei bufSize,
>-                                                         const GLint *params);
>-ANGLE_EXPORT void GL_APIENTRY TexParameterIuivRobustANGLE(GLenum target,
>-                                                          GLenum pname,
>-                                                          GLsizei bufSize,
>-                                                          const GLuint *params);
>-ANGLE_EXPORT void GL_APIENTRY GetTexParameterIivRobustANGLE(GLenum target,
>-                                                            GLenum pname,
>-                                                            GLsizei bufSize,
>-                                                            GLsizei *length,
>-                                                            GLint *params);
>-ANGLE_EXPORT void GL_APIENTRY GetTexParameterIuivRobustANGLE(GLenum target,
>-                                                             GLenum pname,
>-                                                             GLsizei bufSize,
>-                                                             GLsizei *length,
>-                                                             GLuint *params);
>-ANGLE_EXPORT void GL_APIENTRY SamplerParameterIivRobustANGLE(GLuint sampler,
>-                                                             GLenum pname,
>-                                                             GLsizei bufSize,
>-                                                             const GLint *param);
>-ANGLE_EXPORT void GL_APIENTRY SamplerParameterIuivRobustANGLE(GLuint sampler,
>-                                                              GLenum pname,
>-                                                              GLsizei bufSize,
>-                                                              const GLuint *param);
>-ANGLE_EXPORT void GL_APIENTRY GetSamplerParameterIivRobustANGLE(GLuint sampler,
>-                                                                GLenum pname,
>-                                                                GLsizei bufSize,
>-                                                                GLsizei *length,
>-                                                                GLint *params);
>-ANGLE_EXPORT void GL_APIENTRY GetSamplerParameterIuivRobustANGLE(GLuint sampler,
>-                                                                 GLenum pname,
>-                                                                 GLsizei bufSize,
>-                                                                 GLsizei *length,
>-                                                                 GLuint *params);
>-ANGLE_EXPORT void GL_APIENTRY GetQueryObjectivRobustANGLE(GLuint id,
>-                                                          GLenum pname,
>-                                                          GLsizei bufSize,
>-                                                          GLsizei *length,
>-                                                          GLint *params);
>-ANGLE_EXPORT void GL_APIENTRY GetQueryObjecti64vRobustANGLE(GLuint id,
>-                                                            GLenum pname,
>-                                                            GLsizei bufSize,
>-                                                            GLsizei *length,
>-                                                            GLint64 *params);
>-ANGLE_EXPORT void GL_APIENTRY GetQueryObjectui64vRobustANGLE(GLuint id,
>-                                                             GLenum pname,
>-                                                             GLsizei bufSize,
>-                                                             GLsizei *length,
>-                                                             GLuint64 *params);
>-
>-// GL_ANGLE_multiview
>-ANGLE_EXPORT void GL_APIENTRY FramebufferTextureMultiviewLayeredANGLE(GLenum target,
>-                                                                      GLenum attachment,
>-                                                                      GLuint texture,
>-                                                                      GLint level,
>-                                                                      GLint baseViewIndex,
>-                                                                      GLsizei numViews);
>-ANGLE_EXPORT void GL_APIENTRY
>-FramebufferTextureMultiviewSideBySideANGLE(GLenum target,
>-                                           GLenum attachment,
>-                                           GLuint texture,
>-                                           GLint level,
>-                                           GLsizei numViews,
>-                                           const GLint *viewportOffsets);
>-}  // namespace gl
>-
>-#endif  // LIBGLESV2_ENTRYPOINTGLES20EXT_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libGLESv2/entry_points_gles_3_0_autogen.cpp b/Source/ThirdParty/ANGLE/src/libGLESv2/entry_points_gles_3_0_autogen.cpp
>index 439f920bab2..0c7a696c99b 100644
>--- a/Source/ThirdParty/ANGLE/src/libGLESv2/entry_points_gles_3_0_autogen.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libGLESv2/entry_points_gles_3_0_autogen.cpp
>@@ -1,2083 +1,1986 @@
> // GENERATED FILE - DO NOT EDIT.
> // Generated by generate_entry_points.py using data from gl.xml.
> //
>-// Copyright 2017 The ANGLE Project Authors. All rights reserved.
>+// Copyright 2019 The ANGLE Project Authors. All rights reserved.
> // Use of this source code is governed by a BSD-style license that can be
> // found in the LICENSE file.
> //
> // entry_points_gles_3_0_autogen.cpp:
> //   Defines the GLES 3.0 entry points.
> 
>+#include "libGLESv2/entry_points_gles_3_0_autogen.h"
>+
> #include "libANGLE/Context.h"
>+#include "libANGLE/Context.inl.h"
> #include "libANGLE/validationES3.h"
>+#include "libGLESv2/entry_points_utils.h"
> #include "libGLESv2/global_state.h"
> 
> namespace gl
> {
>-void GL_APIENTRY ReadBuffer(GLenum src)
>+void GL_APIENTRY BeginQuery(GLenum target, GLuint id)
> {
>-    EVENT("(GLenum src = 0x%X)", src);
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum target = 0x%X, GLuint id = %u)", target, id);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::ReadBuffer>(src);
>-
>-        if (context->skipValidation() || ValidateReadBuffer(context, src))
>+        QueryType targetPacked = FromGLenum<QueryType>(target);
>+        if (context->skipValidation() || ValidateBeginQuery(context, targetPacked, id))
>         {
>-            context->readBuffer(src);
>+            context->beginQuery(targetPacked, id);
>         }
>     }
> }
> 
>-void GL_APIENTRY DrawRangeElements(GLenum mode,
>-                                   GLuint start,
>-                                   GLuint end,
>-                                   GLsizei count,
>-                                   GLenum type,
>-                                   const void *indices)
>+void GL_APIENTRY BeginTransformFeedback(GLenum primitiveMode)
> {
>-    EVENT(
>-        "(GLenum mode = 0x%X, GLuint start = %u, GLuint end = %u, GLsizei count = %d, GLenum type "
>-        "= 0x%X, const void *indices = 0x%0.8p)",
>-        mode, start, end, count, type, indices);
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum primitiveMode = 0x%X)", primitiveMode);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::DrawRangeElements>(mode, start, end, count, type,
>-                                                             indices);
>-
>+        PrimitiveMode primitiveModePacked = FromGLenum<PrimitiveMode>(primitiveMode);
>         if (context->skipValidation() ||
>-            ValidateDrawRangeElements(context, mode, start, end, count, type, indices))
>+            ValidateBeginTransformFeedback(context, primitiveModePacked))
>         {
>-            context->drawRangeElements(mode, start, end, count, type, indices);
>+            context->beginTransformFeedback(primitiveModePacked);
>         }
>     }
> }
> 
>-void GL_APIENTRY TexImage3D(GLenum target,
>-                            GLint level,
>-                            GLint internalformat,
>-                            GLsizei width,
>-                            GLsizei height,
>-                            GLsizei depth,
>-                            GLint border,
>-                            GLenum format,
>-                            GLenum type,
>-                            const void *pixels)
>+void GL_APIENTRY BindBufferBase(GLenum target, GLuint index, GLuint buffer)
> {
>-    EVENT(
>-        "(GLenum target = 0x%X, GLint level = %d, GLint internalformat = %d, GLsizei width = %d, "
>-        "GLsizei height = %d, GLsizei depth = %d, GLint border = %d, GLenum format = 0x%X, GLenum "
>-        "type = 0x%X, const void *pixels = 0x%0.8p)",
>-        target, level, internalformat, width, height, depth, border, format, type, pixels);
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum target = 0x%X, GLuint index = %u, GLuint buffer = %u)", target, index, buffer);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::TexImage3D>(target, level, internalformat, width, height,
>-                                                      depth, border, format, type, pixels);
>-
>+        BufferBinding targetPacked = FromGLenum<BufferBinding>(target);
>         if (context->skipValidation() ||
>-            ValidateTexImage3D(context, target, level, internalformat, width, height, depth, border,
>-                               format, type, pixels))
>+            ValidateBindBufferBase(context, targetPacked, index, buffer))
>         {
>-            context->texImage3D(target, level, internalformat, width, height, depth, border, format,
>-                                type, pixels);
>+            context->bindBufferBase(targetPacked, index, buffer);
>         }
>     }
> }
> 
>-void GL_APIENTRY TexSubImage3D(GLenum target,
>-                               GLint level,
>-                               GLint xoffset,
>-                               GLint yoffset,
>-                               GLint zoffset,
>-                               GLsizei width,
>-                               GLsizei height,
>-                               GLsizei depth,
>-                               GLenum format,
>-                               GLenum type,
>-                               const void *pixels)
>+void GL_APIENTRY
>+BindBufferRange(GLenum target, GLuint index, GLuint buffer, GLintptr offset, GLsizeiptr size)
> {
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>     EVENT(
>-        "(GLenum target = 0x%X, GLint level = %d, GLint xoffset = %d, GLint yoffset = %d, GLint "
>-        "zoffset = %d, GLsizei width = %d, GLsizei height = %d, GLsizei depth = %d, GLenum format "
>-        "= 0x%X, GLenum type = 0x%X, const void *pixels = 0x%0.8p)",
>-        target, level, xoffset, yoffset, zoffset, width, height, depth, format, type, pixels);
>+        "(GLenum target = 0x%X, GLuint index = %u, GLuint buffer = %u, GLintptr offset = %llu, "
>+        "GLsizeiptr size = %llu)",
>+        target, index, buffer, static_cast<unsigned long long>(offset),
>+        static_cast<unsigned long long>(size));
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::TexSubImage3D>(
>-            target, level, xoffset, yoffset, zoffset, width, height, depth, format, type, pixels);
>-
>+        BufferBinding targetPacked = FromGLenum<BufferBinding>(target);
>         if (context->skipValidation() ||
>-            ValidateTexSubImage3D(context, target, level, xoffset, yoffset, zoffset, width, height,
>-                                  depth, format, type, pixels))
>+            ValidateBindBufferRange(context, targetPacked, index, buffer, offset, size))
>         {
>-            context->texSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth,
>-                                   format, type, pixels);
>+            context->bindBufferRange(targetPacked, index, buffer, offset, size);
>         }
>     }
> }
> 
>-void GL_APIENTRY CopyTexSubImage3D(GLenum target,
>-                                   GLint level,
>-                                   GLint xoffset,
>-                                   GLint yoffset,
>-                                   GLint zoffset,
>-                                   GLint x,
>-                                   GLint y,
>-                                   GLsizei width,
>-                                   GLsizei height)
>+void GL_APIENTRY BindSampler(GLuint unit, GLuint sampler)
> {
>-    EVENT(
>-        "(GLenum target = 0x%X, GLint level = %d, GLint xoffset = %d, GLint yoffset = %d, GLint "
>-        "zoffset = %d, GLint x = %d, GLint y = %d, GLsizei width = %d, GLsizei height = %d)",
>-        target, level, xoffset, yoffset, zoffset, x, y, width, height);
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint unit = %u, GLuint sampler = %u)", unit, sampler);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::CopyTexSubImage3D>(target, level, xoffset, yoffset,
>-                                                             zoffset, x, y, width, height);
>-
>-        if (context->skipValidation() ||
>-            ValidateCopyTexSubImage3D(context, target, level, xoffset, yoffset, zoffset, x, y,
>-                                      width, height))
>+        if (context->skipValidation() || ValidateBindSampler(context, unit, sampler))
>         {
>-            context->copyTexSubImage3D(target, level, xoffset, yoffset, zoffset, x, y, width,
>-                                       height);
>+            context->bindSampler(unit, sampler);
>         }
>     }
> }
> 
>-void GL_APIENTRY CompressedTexImage3D(GLenum target,
>-                                      GLint level,
>-                                      GLenum internalformat,
>-                                      GLsizei width,
>-                                      GLsizei height,
>-                                      GLsizei depth,
>-                                      GLint border,
>-                                      GLsizei imageSize,
>-                                      const void *data)
>+void GL_APIENTRY BindTransformFeedback(GLenum target, GLuint id)
> {
>-    EVENT(
>-        "(GLenum target = 0x%X, GLint level = %d, GLenum internalformat = 0x%X, GLsizei width = "
>-        "%d, GLsizei height = %d, GLsizei depth = %d, GLint border = %d, GLsizei imageSize = %d, "
>-        "const void *data = 0x%0.8p)",
>-        target, level, internalformat, width, height, depth, border, imageSize, data);
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum target = 0x%X, GLuint id = %u)", target, id);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::CompressedTexImage3D>(
>-            target, level, internalformat, width, height, depth, border, imageSize, data);
>-
>-        if (context->skipValidation() ||
>-            ValidateCompressedTexImage3D(context, target, level, internalformat, width, height,
>-                                         depth, border, imageSize, data))
>+        if (context->skipValidation() || ValidateBindTransformFeedback(context, target, id))
>         {
>-            context->compressedTexImage3D(target, level, internalformat, width, height, depth,
>-                                          border, imageSize, data);
>+            context->bindTransformFeedback(target, id);
>         }
>     }
> }
> 
>-void GL_APIENTRY CompressedTexSubImage3D(GLenum target,
>-                                         GLint level,
>-                                         GLint xoffset,
>-                                         GLint yoffset,
>-                                         GLint zoffset,
>-                                         GLsizei width,
>-                                         GLsizei height,
>-                                         GLsizei depth,
>-                                         GLenum format,
>-                                         GLsizei imageSize,
>-                                         const void *data)
>+void GL_APIENTRY BindVertexArray(GLuint array)
> {
>-    EVENT(
>-        "(GLenum target = 0x%X, GLint level = %d, GLint xoffset = %d, GLint yoffset = %d, GLint "
>-        "zoffset = %d, GLsizei width = %d, GLsizei height = %d, GLsizei depth = %d, GLenum format "
>-        "= 0x%X, GLsizei imageSize = %d, const void *data = 0x%0.8p)",
>-        target, level, xoffset, yoffset, zoffset, width, height, depth, format, imageSize, data);
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint array = %u)", array);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::CompressedTexSubImage3D>(target, level, xoffset, yoffset,
>-                                                                   zoffset, width, height, depth,
>-                                                                   format, imageSize, data);
>-
>-        if (context->skipValidation() ||
>-            ValidateCompressedTexSubImage3D(context, target, level, xoffset, yoffset, zoffset,
>-                                            width, height, depth, format, imageSize, data))
>+        if (context->skipValidation() || ValidateBindVertexArray(context, array))
>         {
>-            context->compressedTexSubImage3D(target, level, xoffset, yoffset, zoffset, width,
>-                                             height, depth, format, imageSize, data);
>+            context->bindVertexArray(array);
>         }
>     }
> }
> 
>-void GL_APIENTRY GenQueries(GLsizei n, GLuint *ids)
>+void GL_APIENTRY BlitFramebuffer(GLint srcX0,
>+                                 GLint srcY0,
>+                                 GLint srcX1,
>+                                 GLint srcY1,
>+                                 GLint dstX0,
>+                                 GLint dstY0,
>+                                 GLint dstX1,
>+                                 GLint dstY1,
>+                                 GLbitfield mask,
>+                                 GLenum filter)
> {
>-    EVENT("(GLsizei n = %d, GLuint *ids = 0x%0.8p)", n, ids);
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLint srcX0 = %d, GLint srcY0 = %d, GLint srcX1 = %d, GLint srcY1 = %d, GLint dstX0 = "
>+        "%d, GLint dstY0 = %d, GLint dstX1 = %d, GLint dstY1 = %d, GLbitfield mask = 0x%X, GLenum "
>+        "filter = 0x%X)",
>+        srcX0, srcY0, srcX1, srcY1, dstX0, dstY0, dstX1, dstY1, mask, filter);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::GenQueries>(n, ids);
>-
>-        if (context->skipValidation() || ValidateGenQueries(context, n, ids))
>+        if (context->skipValidation() ||
>+            ValidateBlitFramebuffer(context, srcX0, srcY0, srcX1, srcY1, dstX0, dstY0, dstX1, dstY1,
>+                                    mask, filter))
>         {
>-            context->genQueries(n, ids);
>+            context->blitFramebuffer(srcX0, srcY0, srcX1, srcY1, dstX0, dstY0, dstX1, dstY1, mask,
>+                                     filter);
>         }
>     }
> }
> 
>-void GL_APIENTRY DeleteQueries(GLsizei n, const GLuint *ids)
>+void GL_APIENTRY ClearBufferfi(GLenum buffer, GLint drawbuffer, GLfloat depth, GLint stencil)
> {
>-    EVENT("(GLsizei n = %d, const GLuint *ids = 0x%0.8p)", n, ids);
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum buffer = 0x%X, GLint drawbuffer = %d, GLfloat depth = %f, GLint stencil = %d)",
>+          buffer, drawbuffer, depth, stencil);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::DeleteQueries>(n, ids);
>-
>-        if (context->skipValidation() || ValidateDeleteQueries(context, n, ids))
>+        if (context->skipValidation() ||
>+            ValidateClearBufferfi(context, buffer, drawbuffer, depth, stencil))
>         {
>-            context->deleteQueries(n, ids);
>+            context->clearBufferfi(buffer, drawbuffer, depth, stencil);
>         }
>     }
> }
> 
>-GLboolean GL_APIENTRY IsQuery(GLuint id)
>+void GL_APIENTRY ClearBufferfv(GLenum buffer, GLint drawbuffer, const GLfloat *value)
> {
>-    EVENT("(GLuint id = %u)", id);
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum buffer = 0x%X, GLint drawbuffer = %d, const GLfloat *value = 0x%016" PRIxPTR ")",
>+          buffer, drawbuffer, (uintptr_t)value);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::IsQuery>(id);
>-
>-        if (context->skipValidation() || ValidateIsQuery(context, id))
>+        if (context->skipValidation() || ValidateClearBufferfv(context, buffer, drawbuffer, value))
>         {
>-            return context->isQuery(id);
>+            context->clearBufferfv(buffer, drawbuffer, value);
>         }
>     }
>-
>-    return GetDefaultReturnValue<EntryPoint::IsQuery, GLboolean>();
> }
> 
>-void GL_APIENTRY BeginQuery(GLenum target, GLuint id)
>+void GL_APIENTRY ClearBufferiv(GLenum buffer, GLint drawbuffer, const GLint *value)
> {
>-    EVENT("(GLenum target = 0x%X, GLuint id = %u)", target, id);
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum buffer = 0x%X, GLint drawbuffer = %d, const GLint *value = 0x%016" PRIxPTR ")",
>+          buffer, drawbuffer, (uintptr_t)value);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::BeginQuery>(target, id);
>-
>-        if (context->skipValidation() || ValidateBeginQuery(context, target, id))
>+        if (context->skipValidation() || ValidateClearBufferiv(context, buffer, drawbuffer, value))
>         {
>-            context->beginQuery(target, id);
>+            context->clearBufferiv(buffer, drawbuffer, value);
>         }
>     }
> }
> 
>-void GL_APIENTRY EndQuery(GLenum target)
>+void GL_APIENTRY ClearBufferuiv(GLenum buffer, GLint drawbuffer, const GLuint *value)
> {
>-    EVENT("(GLenum target = 0x%X)", target);
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum buffer = 0x%X, GLint drawbuffer = %d, const GLuint *value = 0x%016" PRIxPTR ")",
>+          buffer, drawbuffer, (uintptr_t)value);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::EndQuery>(target);
>-
>-        if (context->skipValidation() || ValidateEndQuery(context, target))
>+        if (context->skipValidation() || ValidateClearBufferuiv(context, buffer, drawbuffer, value))
>         {
>-            context->endQuery(target);
>+            context->clearBufferuiv(buffer, drawbuffer, value);
>         }
>     }
> }
> 
>-void GL_APIENTRY GetQueryiv(GLenum target, GLenum pname, GLint *params)
>+GLenum GL_APIENTRY ClientWaitSync(GLsync sync, GLbitfield flags, GLuint64 timeout)
> {
>-    EVENT("(GLenum target = 0x%X, GLenum pname = 0x%X, GLint *params = 0x%0.8p)", target, pname,
>-          params);
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLsync sync = 0x%016" PRIxPTR ", GLbitfield flags = 0x%X, GLuint64 timeout = %llu)",
>+          (uintptr_t)sync, flags, static_cast<unsigned long long>(timeout));
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::GetQueryiv>(target, pname, params);
>-
>-        if (context->skipValidation() || ValidateGetQueryiv(context, target, pname, params))
>+        if (context->skipValidation() || ValidateClientWaitSync(context, sync, flags, timeout))
>         {
>-            context->getQueryiv(target, pname, params);
>+            return context->clientWaitSync(sync, flags, timeout);
>         }
>     }
>+
>+    return GetDefaultReturnValue<EntryPoint::ClientWaitSync, GLenum>();
> }
> 
>-void GL_APIENTRY GetQueryObjectuiv(GLuint id, GLenum pname, GLuint *params)
>+void GL_APIENTRY CompressedTexImage3D(GLenum target,
>+                                      GLint level,
>+                                      GLenum internalformat,
>+                                      GLsizei width,
>+                                      GLsizei height,
>+                                      GLsizei depth,
>+                                      GLint border,
>+                                      GLsizei imageSize,
>+                                      const void *data)
> {
>-    EVENT("(GLuint id = %u, GLenum pname = 0x%X, GLuint *params = 0x%0.8p)", id, pname, params);
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLenum target = 0x%X, GLint level = %d, GLenum internalformat = 0x%X, GLsizei width = "
>+        "%d, GLsizei height = %d, GLsizei depth = %d, GLint border = %d, GLsizei imageSize = %d, "
>+        "const void *data = 0x%016" PRIxPTR ")",
>+        target, level, internalformat, width, height, depth, border, imageSize, (uintptr_t)data);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::GetQueryObjectuiv>(id, pname, params);
>-
>-        if (context->skipValidation() || ValidateGetQueryObjectuiv(context, id, pname, params))
>+        TextureTarget targetPacked = FromGLenum<TextureTarget>(target);
>+        if (context->skipValidation() ||
>+            ValidateCompressedTexImage3D(context, targetPacked, level, internalformat, width,
>+                                         height, depth, border, imageSize, data))
>         {
>-            context->getQueryObjectuiv(id, pname, params);
>+            context->compressedTexImage3D(targetPacked, level, internalformat, width, height, depth,
>+                                          border, imageSize, data);
>         }
>     }
> }
> 
>-GLboolean GL_APIENTRY UnmapBuffer(GLenum target)
>+void GL_APIENTRY CompressedTexSubImage3D(GLenum target,
>+                                         GLint level,
>+                                         GLint xoffset,
>+                                         GLint yoffset,
>+                                         GLint zoffset,
>+                                         GLsizei width,
>+                                         GLsizei height,
>+                                         GLsizei depth,
>+                                         GLenum format,
>+                                         GLsizei imageSize,
>+                                         const void *data)
> {
>-    EVENT("(GLenum target = 0x%X)", target);
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLenum target = 0x%X, GLint level = %d, GLint xoffset = %d, GLint yoffset = %d, GLint "
>+        "zoffset = %d, GLsizei width = %d, GLsizei height = %d, GLsizei depth = %d, GLenum format "
>+        "= 0x%X, GLsizei imageSize = %d, const void *data = 0x%016" PRIxPTR ")",
>+        target, level, xoffset, yoffset, zoffset, width, height, depth, format, imageSize,
>+        (uintptr_t)data);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        BufferBinding targetPacked = FromGLenum<BufferBinding>(target);
>-        context->gatherParams<EntryPoint::UnmapBuffer>(targetPacked);
>-
>-        if (context->skipValidation() || ValidateUnmapBuffer(context, targetPacked))
>+        TextureTarget targetPacked = FromGLenum<TextureTarget>(target);
>+        if (context->skipValidation() ||
>+            ValidateCompressedTexSubImage3D(context, targetPacked, level, xoffset, yoffset, zoffset,
>+                                            width, height, depth, format, imageSize, data))
>         {
>-            return context->unmapBuffer(targetPacked);
>+            context->compressedTexSubImage3D(targetPacked, level, xoffset, yoffset, zoffset, width,
>+                                             height, depth, format, imageSize, data);
>         }
>     }
>-
>-    return GetDefaultReturnValue<EntryPoint::UnmapBuffer, GLboolean>();
> }
> 
>-void GL_APIENTRY GetBufferPointerv(GLenum target, GLenum pname, void **params)
>+void GL_APIENTRY CopyBufferSubData(GLenum readTarget,
>+                                   GLenum writeTarget,
>+                                   GLintptr readOffset,
>+                                   GLintptr writeOffset,
>+                                   GLsizeiptr size)
> {
>-    EVENT("(GLenum target = 0x%X, GLenum pname = 0x%X, void **params = 0x%0.8p)", target, pname,
>-          params);
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLenum readTarget = 0x%X, GLenum writeTarget = 0x%X, GLintptr readOffset = %llu, "
>+        "GLintptr writeOffset = %llu, GLsizeiptr size = %llu)",
>+        readTarget, writeTarget, static_cast<unsigned long long>(readOffset),
>+        static_cast<unsigned long long>(writeOffset), static_cast<unsigned long long>(size));
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        BufferBinding targetPacked = FromGLenum<BufferBinding>(target);
>-        context->gatherParams<EntryPoint::GetBufferPointerv>(targetPacked, pname, params);
>-
>+        BufferBinding readTargetPacked  = FromGLenum<BufferBinding>(readTarget);
>+        BufferBinding writeTargetPacked = FromGLenum<BufferBinding>(writeTarget);
>         if (context->skipValidation() ||
>-            ValidateGetBufferPointerv(context, targetPacked, pname, params))
>+            ValidateCopyBufferSubData(context, readTargetPacked, writeTargetPacked, readOffset,
>+                                      writeOffset, size))
>         {
>-            context->getBufferPointerv(targetPacked, pname, params);
>+            context->copyBufferSubData(readTargetPacked, writeTargetPacked, readOffset, writeOffset,
>+                                       size);
>         }
>     }
> }
> 
>-void GL_APIENTRY DrawBuffers(GLsizei n, const GLenum *bufs)
>+void GL_APIENTRY CopyTexSubImage3D(GLenum target,
>+                                   GLint level,
>+                                   GLint xoffset,
>+                                   GLint yoffset,
>+                                   GLint zoffset,
>+                                   GLint x,
>+                                   GLint y,
>+                                   GLsizei width,
>+                                   GLsizei height)
> {
>-    EVENT("(GLsizei n = %d, const GLenum *bufs = 0x%0.8p)", n, bufs);
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLenum target = 0x%X, GLint level = %d, GLint xoffset = %d, GLint yoffset = %d, GLint "
>+        "zoffset = %d, GLint x = %d, GLint y = %d, GLsizei width = %d, GLsizei height = %d)",
>+        target, level, xoffset, yoffset, zoffset, x, y, width, height);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::DrawBuffers>(n, bufs);
>-
>-        if (context->skipValidation() || ValidateDrawBuffers(context, n, bufs))
>+        TextureTarget targetPacked = FromGLenum<TextureTarget>(target);
>+        if (context->skipValidation() ||
>+            ValidateCopyTexSubImage3D(context, targetPacked, level, xoffset, yoffset, zoffset, x, y,
>+                                      width, height))
>         {
>-            context->drawBuffers(n, bufs);
>+            context->copyTexSubImage3D(targetPacked, level, xoffset, yoffset, zoffset, x, y, width,
>+                                       height);
>         }
>     }
> }
> 
>-void GL_APIENTRY UniformMatrix2x3fv(GLint location,
>-                                    GLsizei count,
>-                                    GLboolean transpose,
>-                                    const GLfloat *value)
>+void GL_APIENTRY DeleteQueries(GLsizei n, const GLuint *ids)
> {
>-    EVENT(
>-        "(GLint location = %d, GLsizei count = %d, GLboolean transpose = %u, const GLfloat *value "
>-        "= 0x%0.8p)",
>-        location, count, transpose, value);
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLsizei n = %d, const GLuint *ids = 0x%016" PRIxPTR ")", n, (uintptr_t)ids);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::UniformMatrix2x3fv>(location, count, transpose, value);
>-
>-        if (context->skipValidation() ||
>-            ValidateUniformMatrix2x3fv(context, location, count, transpose, value))
>+        if (context->skipValidation() || ValidateDeleteQueries(context, n, ids))
>         {
>-            context->uniformMatrix2x3fv(location, count, transpose, value);
>+            context->deleteQueries(n, ids);
>         }
>     }
> }
> 
>-void GL_APIENTRY UniformMatrix3x2fv(GLint location,
>-                                    GLsizei count,
>-                                    GLboolean transpose,
>-                                    const GLfloat *value)
>+void GL_APIENTRY DeleteSamplers(GLsizei count, const GLuint *samplers)
> {
>-    EVENT(
>-        "(GLint location = %d, GLsizei count = %d, GLboolean transpose = %u, const GLfloat *value "
>-        "= 0x%0.8p)",
>-        location, count, transpose, value);
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLsizei count = %d, const GLuint *samplers = 0x%016" PRIxPTR ")", count,
>+          (uintptr_t)samplers);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::UniformMatrix3x2fv>(location, count, transpose, value);
>-
>-        if (context->skipValidation() ||
>-            ValidateUniformMatrix3x2fv(context, location, count, transpose, value))
>+        if (context->skipValidation() || ValidateDeleteSamplers(context, count, samplers))
>         {
>-            context->uniformMatrix3x2fv(location, count, transpose, value);
>+            context->deleteSamplers(count, samplers);
>         }
>     }
>-}
>-
>-void GL_APIENTRY UniformMatrix2x4fv(GLint location,
>-                                    GLsizei count,
>-                                    GLboolean transpose,
>-                                    const GLfloat *value)
>+}
>+
>+void GL_APIENTRY DeleteSync(GLsync sync)
> {
>-    EVENT(
>-        "(GLint location = %d, GLsizei count = %d, GLboolean transpose = %u, const GLfloat *value "
>-        "= 0x%0.8p)",
>-        location, count, transpose, value);
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLsync sync = 0x%016" PRIxPTR ")", (uintptr_t)sync);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::UniformMatrix2x4fv>(location, count, transpose, value);
>-
>-        if (context->skipValidation() ||
>-            ValidateUniformMatrix2x4fv(context, location, count, transpose, value))
>+        if (context->skipValidation() || ValidateDeleteSync(context, sync))
>         {
>-            context->uniformMatrix2x4fv(location, count, transpose, value);
>+            context->deleteSync(sync);
>         }
>     }
> }
> 
>-void GL_APIENTRY UniformMatrix4x2fv(GLint location,
>-                                    GLsizei count,
>-                                    GLboolean transpose,
>-                                    const GLfloat *value)
>+void GL_APIENTRY DeleteTransformFeedbacks(GLsizei n, const GLuint *ids)
> {
>-    EVENT(
>-        "(GLint location = %d, GLsizei count = %d, GLboolean transpose = %u, const GLfloat *value "
>-        "= 0x%0.8p)",
>-        location, count, transpose, value);
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLsizei n = %d, const GLuint *ids = 0x%016" PRIxPTR ")", n, (uintptr_t)ids);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::UniformMatrix4x2fv>(location, count, transpose, value);
>-
>-        if (context->skipValidation() ||
>-            ValidateUniformMatrix4x2fv(context, location, count, transpose, value))
>+        if (context->skipValidation() || ValidateDeleteTransformFeedbacks(context, n, ids))
>         {
>-            context->uniformMatrix4x2fv(location, count, transpose, value);
>+            context->deleteTransformFeedbacks(n, ids);
>         }
>     }
> }
> 
>-void GL_APIENTRY UniformMatrix3x4fv(GLint location,
>-                                    GLsizei count,
>-                                    GLboolean transpose,
>-                                    const GLfloat *value)
>+void GL_APIENTRY DeleteVertexArrays(GLsizei n, const GLuint *arrays)
> {
>-    EVENT(
>-        "(GLint location = %d, GLsizei count = %d, GLboolean transpose = %u, const GLfloat *value "
>-        "= 0x%0.8p)",
>-        location, count, transpose, value);
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLsizei n = %d, const GLuint *arrays = 0x%016" PRIxPTR ")", n, (uintptr_t)arrays);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::UniformMatrix3x4fv>(location, count, transpose, value);
>-
>-        if (context->skipValidation() ||
>-            ValidateUniformMatrix3x4fv(context, location, count, transpose, value))
>+        if (context->skipValidation() || ValidateDeleteVertexArrays(context, n, arrays))
>         {
>-            context->uniformMatrix3x4fv(location, count, transpose, value);
>+            context->deleteVertexArrays(n, arrays);
>         }
>     }
> }
> 
>-void GL_APIENTRY UniformMatrix4x3fv(GLint location,
>-                                    GLsizei count,
>-                                    GLboolean transpose,
>-                                    const GLfloat *value)
>+void GL_APIENTRY DrawArraysInstanced(GLenum mode, GLint first, GLsizei count, GLsizei instancecount)
> {
>-    EVENT(
>-        "(GLint location = %d, GLsizei count = %d, GLboolean transpose = %u, const GLfloat *value "
>-        "= 0x%0.8p)",
>-        location, count, transpose, value);
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum mode = 0x%X, GLint first = %d, GLsizei count = %d, GLsizei instancecount = %d)",
>+          mode, first, count, instancecount);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::UniformMatrix4x3fv>(location, count, transpose, value);
>-
>+        PrimitiveMode modePacked = FromGLenum<PrimitiveMode>(mode);
>         if (context->skipValidation() ||
>-            ValidateUniformMatrix4x3fv(context, location, count, transpose, value))
>+            ValidateDrawArraysInstanced(context, modePacked, first, count, instancecount))
>         {
>-            context->uniformMatrix4x3fv(location, count, transpose, value);
>+            context->drawArraysInstanced(modePacked, first, count, instancecount);
>         }
>     }
> }
> 
>-void GL_APIENTRY BlitFramebuffer(GLint srcX0,
>-                                 GLint srcY0,
>-                                 GLint srcX1,
>-                                 GLint srcY1,
>-                                 GLint dstX0,
>-                                 GLint dstY0,
>-                                 GLint dstX1,
>-                                 GLint dstY1,
>-                                 GLbitfield mask,
>-                                 GLenum filter)
>+void GL_APIENTRY DrawBuffers(GLsizei n, const GLenum *bufs)
> {
>-    EVENT(
>-        "(GLint srcX0 = %d, GLint srcY0 = %d, GLint srcX1 = %d, GLint srcY1 = %d, GLint dstX0 = "
>-        "%d, GLint dstY0 = %d, GLint dstX1 = %d, GLint dstY1 = %d, GLbitfield mask = 0x%X, GLenum "
>-        "filter = 0x%X)",
>-        srcX0, srcY0, srcX1, srcY1, dstX0, dstY0, dstX1, dstY1, mask, filter);
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLsizei n = %d, const GLenum *bufs = 0x%016" PRIxPTR ")", n, (uintptr_t)bufs);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::BlitFramebuffer>(srcX0, srcY0, srcX1, srcY1, dstX0, dstY0,
>-                                                           dstX1, dstY1, mask, filter);
>-
>-        if (context->skipValidation() ||
>-            ValidateBlitFramebuffer(context, srcX0, srcY0, srcX1, srcY1, dstX0, dstY0, dstX1, dstY1,
>-                                    mask, filter))
>+        if (context->skipValidation() || ValidateDrawBuffers(context, n, bufs))
>         {
>-            context->blitFramebuffer(srcX0, srcY0, srcX1, srcY1, dstX0, dstY0, dstX1, dstY1, mask,
>-                                     filter);
>+            context->drawBuffers(n, bufs);
>         }
>     }
> }
> 
>-void GL_APIENTRY RenderbufferStorageMultisample(GLenum target,
>-                                                GLsizei samples,
>-                                                GLenum internalformat,
>-                                                GLsizei width,
>-                                                GLsizei height)
>+void GL_APIENTRY DrawElementsInstanced(GLenum mode,
>+                                       GLsizei count,
>+                                       GLenum type,
>+                                       const void *indices,
>+                                       GLsizei instancecount)
> {
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>     EVENT(
>-        "(GLenum target = 0x%X, GLsizei samples = %d, GLenum internalformat = 0x%X, GLsizei width "
>-        "= %d, GLsizei height = %d)",
>-        target, samples, internalformat, width, height);
>+        "(GLenum mode = 0x%X, GLsizei count = %d, GLenum type = 0x%X, const void *indices = "
>+        "0x%016" PRIxPTR ", GLsizei instancecount = %d)",
>+        mode, count, type, (uintptr_t)indices, instancecount);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::RenderbufferStorageMultisample>(
>-            target, samples, internalformat, width, height);
>-
>+        PrimitiveMode modePacked    = FromGLenum<PrimitiveMode>(mode);
>+        DrawElementsType typePacked = FromGLenum<DrawElementsType>(type);
>         if (context->skipValidation() ||
>-            ValidateRenderbufferStorageMultisample(context, target, samples, internalformat, width,
>-                                                   height))
>+            ValidateDrawElementsInstanced(context, modePacked, count, typePacked, indices,
>+                                          instancecount))
>         {
>-            context->renderbufferStorageMultisample(target, samples, internalformat, width, height);
>+            context->drawElementsInstanced(modePacked, count, typePacked, indices, instancecount);
>         }
>     }
> }
> 
>-void GL_APIENTRY
>-FramebufferTextureLayer(GLenum target, GLenum attachment, GLuint texture, GLint level, GLint layer)
>+void GL_APIENTRY DrawRangeElements(GLenum mode,
>+                                   GLuint start,
>+                                   GLuint end,
>+                                   GLsizei count,
>+                                   GLenum type,
>+                                   const void *indices)
> {
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>     EVENT(
>-        "(GLenum target = 0x%X, GLenum attachment = 0x%X, GLuint texture = %u, GLint level = %d, "
>-        "GLint layer = %d)",
>-        target, attachment, texture, level, layer);
>+        "(GLenum mode = 0x%X, GLuint start = %u, GLuint end = %u, GLsizei count = %d, GLenum type "
>+        "= 0x%X, const void *indices = 0x%016" PRIxPTR ")",
>+        mode, start, end, count, type, (uintptr_t)indices);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::FramebufferTextureLayer>(target, attachment, texture,
>-                                                                   level, layer);
>-
>+        PrimitiveMode modePacked    = FromGLenum<PrimitiveMode>(mode);
>+        DrawElementsType typePacked = FromGLenum<DrawElementsType>(type);
>         if (context->skipValidation() ||
>-            ValidateFramebufferTextureLayer(context, target, attachment, texture, level, layer))
>+            ValidateDrawRangeElements(context, modePacked, start, end, count, typePacked, indices))
>         {
>-            context->framebufferTextureLayer(target, attachment, texture, level, layer);
>+            context->drawRangeElements(modePacked, start, end, count, typePacked, indices);
>         }
>     }
> }
> 
>-void *GL_APIENTRY MapBufferRange(GLenum target,
>-                                 GLintptr offset,
>-                                 GLsizeiptr length,
>-                                 GLbitfield access)
>+void GL_APIENTRY EndQuery(GLenum target)
> {
>-    EVENT(
>-        "(GLenum target = 0x%X, GLintptr offset = %d, GLsizeiptr length = %d, GLbitfield access = "
>-        "0x%X)",
>-        target, offset, length, access);
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum target = 0x%X)", target);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        BufferBinding targetPacked = FromGLenum<BufferBinding>(target);
>-        context->gatherParams<EntryPoint::MapBufferRange>(targetPacked, offset, length, access);
>-
>-        if (context->skipValidation() ||
>-            ValidateMapBufferRange(context, targetPacked, offset, length, access))
>+        QueryType targetPacked = FromGLenum<QueryType>(target);
>+        if (context->skipValidation() || ValidateEndQuery(context, targetPacked))
>         {
>-            return context->mapBufferRange(targetPacked, offset, length, access);
>+            context->endQuery(targetPacked);
>         }
>     }
>-
>-    return GetDefaultReturnValue<EntryPoint::MapBufferRange, void *>();
> }
> 
>-void GL_APIENTRY FlushMappedBufferRange(GLenum target, GLintptr offset, GLsizeiptr length)
>+void GL_APIENTRY EndTransformFeedback()
> {
>-    EVENT("(GLenum target = 0x%X, GLintptr offset = %d, GLsizeiptr length = %d)", target, offset,
>-          length);
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("()");
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        BufferBinding targetPacked = FromGLenum<BufferBinding>(target);
>-        context->gatherParams<EntryPoint::FlushMappedBufferRange>(targetPacked, offset, length);
>-
>-        if (context->skipValidation() ||
>-            ValidateFlushMappedBufferRange(context, targetPacked, offset, length))
>+        if (context->skipValidation() || ValidateEndTransformFeedback(context))
>         {
>-            context->flushMappedBufferRange(targetPacked, offset, length);
>+            context->endTransformFeedback();
>         }
>     }
> }
> 
>-void GL_APIENTRY BindVertexArray(GLuint array)
>+GLsync GL_APIENTRY FenceSync(GLenum condition, GLbitfield flags)
> {
>-    EVENT("(GLuint array = %u)", array);
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum condition = 0x%X, GLbitfield flags = 0x%X)", condition, flags);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::BindVertexArray>(array);
>-
>-        if (context->skipValidation() || ValidateBindVertexArray(context, array))
>+        if (context->skipValidation() || ValidateFenceSync(context, condition, flags))
>         {
>-            context->bindVertexArray(array);
>+            return context->fenceSync(condition, flags);
>         }
>     }
>+
>+    return GetDefaultReturnValue<EntryPoint::FenceSync, GLsync>();
> }
> 
>-void GL_APIENTRY DeleteVertexArrays(GLsizei n, const GLuint *arrays)
>+void GL_APIENTRY FlushMappedBufferRange(GLenum target, GLintptr offset, GLsizeiptr length)
> {
>-    EVENT("(GLsizei n = %d, const GLuint *arrays = 0x%0.8p)", n, arrays);
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum target = 0x%X, GLintptr offset = %llu, GLsizeiptr length = %llu)", target,
>+          static_cast<unsigned long long>(offset), static_cast<unsigned long long>(length));
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::DeleteVertexArrays>(n, arrays);
>-
>-        if (context->skipValidation() || ValidateDeleteVertexArrays(context, n, arrays))
>+        BufferBinding targetPacked = FromGLenum<BufferBinding>(target);
>+        if (context->skipValidation() ||
>+            ValidateFlushMappedBufferRange(context, targetPacked, offset, length))
>         {
>-            context->deleteVertexArrays(n, arrays);
>+            context->flushMappedBufferRange(targetPacked, offset, length);
>         }
>     }
> }
> 
>-void GL_APIENTRY GenVertexArrays(GLsizei n, GLuint *arrays)
>+void GL_APIENTRY
>+FramebufferTextureLayer(GLenum target, GLenum attachment, GLuint texture, GLint level, GLint layer)
> {
>-    EVENT("(GLsizei n = %d, GLuint *arrays = 0x%0.8p)", n, arrays);
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLenum target = 0x%X, GLenum attachment = 0x%X, GLuint texture = %u, GLint level = %d, "
>+        "GLint layer = %d)",
>+        target, attachment, texture, level, layer);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::GenVertexArrays>(n, arrays);
>-
>-        if (context->skipValidation() || ValidateGenVertexArrays(context, n, arrays))
>+        if (context->skipValidation() ||
>+            ValidateFramebufferTextureLayer(context, target, attachment, texture, level, layer))
>         {
>-            context->genVertexArrays(n, arrays);
>+            context->framebufferTextureLayer(target, attachment, texture, level, layer);
>         }
>     }
> }
> 
>-GLboolean GL_APIENTRY IsVertexArray(GLuint array)
>+void GL_APIENTRY GenQueries(GLsizei n, GLuint *ids)
> {
>-    EVENT("(GLuint array = %u)", array);
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLsizei n = %d, GLuint *ids = 0x%016" PRIxPTR ")", n, (uintptr_t)ids);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::IsVertexArray>(array);
>-
>-        if (context->skipValidation() || ValidateIsVertexArray(context, array))
>+        if (context->skipValidation() || ValidateGenQueries(context, n, ids))
>         {
>-            return context->isVertexArray(array);
>+            context->genQueries(n, ids);
>         }
>     }
>-
>-    return GetDefaultReturnValue<EntryPoint::IsVertexArray, GLboolean>();
> }
> 
>-void GL_APIENTRY GetIntegeri_v(GLenum target, GLuint index, GLint *data)
>+void GL_APIENTRY GenSamplers(GLsizei count, GLuint *samplers)
> {
>-    EVENT("(GLenum target = 0x%X, GLuint index = %u, GLint *data = 0x%0.8p)", target, index, data);
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLsizei count = %d, GLuint *samplers = 0x%016" PRIxPTR ")", count, (uintptr_t)samplers);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::GetIntegeri_v>(target, index, data);
>-
>-        if (context->skipValidation() || ValidateGetIntegeri_v(context, target, index, data))
>+        if (context->skipValidation() || ValidateGenSamplers(context, count, samplers))
>         {
>-            context->getIntegeri_v(target, index, data);
>+            context->genSamplers(count, samplers);
>         }
>     }
> }
> 
>-void GL_APIENTRY BeginTransformFeedback(GLenum primitiveMode)
>+void GL_APIENTRY GenTransformFeedbacks(GLsizei n, GLuint *ids)
> {
>-    EVENT("(GLenum primitiveMode = 0x%X)", primitiveMode);
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLsizei n = %d, GLuint *ids = 0x%016" PRIxPTR ")", n, (uintptr_t)ids);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::BeginTransformFeedback>(primitiveMode);
>-
>-        if (context->skipValidation() || ValidateBeginTransformFeedback(context, primitiveMode))
>+        if (context->skipValidation() || ValidateGenTransformFeedbacks(context, n, ids))
>         {
>-            context->beginTransformFeedback(primitiveMode);
>+            context->genTransformFeedbacks(n, ids);
>         }
>     }
> }
> 
>-void GL_APIENTRY EndTransformFeedback()
>+void GL_APIENTRY GenVertexArrays(GLsizei n, GLuint *arrays)
> {
>-    EVENT("()");
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLsizei n = %d, GLuint *arrays = 0x%016" PRIxPTR ")", n, (uintptr_t)arrays);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::EndTransformFeedback>();
>-
>-        if (context->skipValidation() || ValidateEndTransformFeedback(context))
>+        if (context->skipValidation() || ValidateGenVertexArrays(context, n, arrays))
>         {
>-            context->endTransformFeedback();
>+            context->genVertexArrays(n, arrays);
>         }
>     }
> }
> 
>-void GL_APIENTRY
>-BindBufferRange(GLenum target, GLuint index, GLuint buffer, GLintptr offset, GLsizeiptr size)
>+void GL_APIENTRY GetActiveUniformBlockName(GLuint program,
>+                                           GLuint uniformBlockIndex,
>+                                           GLsizei bufSize,
>+                                           GLsizei *length,
>+                                           GLchar *uniformBlockName)
> {
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>     EVENT(
>-        "(GLenum target = 0x%X, GLuint index = %u, GLuint buffer = %u, GLintptr offset = %d, "
>-        "GLsizeiptr size = %d)",
>-        target, index, buffer, offset, size);
>+        "(GLuint program = %u, GLuint uniformBlockIndex = %u, GLsizei bufSize = %d, GLsizei "
>+        "*length = 0x%016" PRIxPTR ", GLchar *uniformBlockName = 0x%016" PRIxPTR ")",
>+        program, uniformBlockIndex, bufSize, (uintptr_t)length, (uintptr_t)uniformBlockName);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        BufferBinding targetPacked = FromGLenum<BufferBinding>(target);
>-        context->gatherParams<EntryPoint::BindBufferRange>(targetPacked, index, buffer, offset,
>-                                                           size);
>-
>         if (context->skipValidation() ||
>-            ValidateBindBufferRange(context, targetPacked, index, buffer, offset, size))
>+            ValidateGetActiveUniformBlockName(context, program, uniformBlockIndex, bufSize, length,
>+                                              uniformBlockName))
>         {
>-            context->bindBufferRange(targetPacked, index, buffer, offset, size);
>+            context->getActiveUniformBlockName(program, uniformBlockIndex, bufSize, length,
>+                                               uniformBlockName);
>         }
>     }
> }
> 
>-void GL_APIENTRY BindBufferBase(GLenum target, GLuint index, GLuint buffer)
>+void GL_APIENTRY GetActiveUniformBlockiv(GLuint program,
>+                                         GLuint uniformBlockIndex,
>+                                         GLenum pname,
>+                                         GLint *params)
> {
>-    EVENT("(GLenum target = 0x%X, GLuint index = %u, GLuint buffer = %u)", target, index, buffer);
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLuint program = %u, GLuint uniformBlockIndex = %u, GLenum pname = 0x%X, GLint *params = "
>+        "0x%016" PRIxPTR ")",
>+        program, uniformBlockIndex, pname, (uintptr_t)params);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        BufferBinding targetPacked = FromGLenum<BufferBinding>(target);
>-        context->gatherParams<EntryPoint::BindBufferBase>(targetPacked, index, buffer);
>-
>         if (context->skipValidation() ||
>-            ValidateBindBufferBase(context, targetPacked, index, buffer))
>+            ValidateGetActiveUniformBlockiv(context, program, uniformBlockIndex, pname, params))
>         {
>-            context->bindBufferBase(targetPacked, index, buffer);
>+            context->getActiveUniformBlockiv(program, uniformBlockIndex, pname, params);
>         }
>     }
> }
> 
>-void GL_APIENTRY TransformFeedbackVaryings(GLuint program,
>-                                           GLsizei count,
>-                                           const GLchar *const *varyings,
>-                                           GLenum bufferMode)
>+void GL_APIENTRY GetActiveUniformsiv(GLuint program,
>+                                     GLsizei uniformCount,
>+                                     const GLuint *uniformIndices,
>+                                     GLenum pname,
>+                                     GLint *params)
> {
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>     EVENT(
>-        "(GLuint program = %u, GLsizei count = %d, const GLchar *const*varyings = 0x%0.8p, GLenum "
>-        "bufferMode = 0x%X)",
>-        program, count, varyings, bufferMode);
>+        "(GLuint program = %u, GLsizei uniformCount = %d, const GLuint *uniformIndices = "
>+        "0x%016" PRIxPTR ", GLenum pname = 0x%X, GLint *params = 0x%016" PRIxPTR ")",
>+        program, uniformCount, (uintptr_t)uniformIndices, pname, (uintptr_t)params);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::TransformFeedbackVaryings>(program, count, varyings,
>-                                                                     bufferMode);
>-
>-        if (context->skipValidation() ||
>-            ValidateTransformFeedbackVaryings(context, program, count, varyings, bufferMode))
>+        if (context->skipValidation() || ValidateGetActiveUniformsiv(context, program, uniformCount,
>+                                                                     uniformIndices, pname, params))
>         {
>-            context->transformFeedbackVaryings(program, count, varyings, bufferMode);
>+            context->getActiveUniformsiv(program, uniformCount, uniformIndices, pname, params);
>         }
>     }
> }
> 
>-void GL_APIENTRY GetTransformFeedbackVarying(GLuint program,
>-                                             GLuint index,
>-                                             GLsizei bufSize,
>-                                             GLsizei *length,
>-                                             GLsizei *size,
>-                                             GLenum *type,
>-                                             GLchar *name)
>+void GL_APIENTRY GetBufferParameteri64v(GLenum target, GLenum pname, GLint64 *params)
> {
>-    EVENT(
>-        "(GLuint program = %u, GLuint index = %u, GLsizei bufSize = %d, GLsizei *length = 0x%0.8p, "
>-        "GLsizei *size = 0x%0.8p, GLenum *type = 0x%0.8p, GLchar *name = 0x%0.8p)",
>-        program, index, bufSize, length, size, type, name);
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum target = 0x%X, GLenum pname = 0x%X, GLint64 *params = 0x%016" PRIxPTR ")",
>+          target, pname, (uintptr_t)params);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::GetTransformFeedbackVarying>(program, index, bufSize,
>-                                                                       length, size, type, name);
>-
>+        BufferBinding targetPacked = FromGLenum<BufferBinding>(target);
>         if (context->skipValidation() ||
>-            ValidateGetTransformFeedbackVarying(context, program, index, bufSize, length, size,
>-                                                type, name))
>+            ValidateGetBufferParameteri64v(context, targetPacked, pname, params))
>         {
>-            context->getTransformFeedbackVarying(program, index, bufSize, length, size, type, name);
>+            context->getBufferParameteri64v(targetPacked, pname, params);
>         }
>     }
> }
> 
>-void GL_APIENTRY
>-VertexAttribIPointer(GLuint index, GLint size, GLenum type, GLsizei stride, const void *pointer)
>+void GL_APIENTRY GetBufferPointerv(GLenum target, GLenum pname, void **params)
> {
>-    EVENT(
>-        "(GLuint index = %u, GLint size = %d, GLenum type = 0x%X, GLsizei stride = %d, const void "
>-        "*pointer = 0x%0.8p)",
>-        index, size, type, stride, pointer);
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum target = 0x%X, GLenum pname = 0x%X, void **params = 0x%016" PRIxPTR ")", target,
>+          pname, (uintptr_t)params);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::VertexAttribIPointer>(index, size, type, stride, pointer);
>-
>+        BufferBinding targetPacked = FromGLenum<BufferBinding>(target);
>         if (context->skipValidation() ||
>-            ValidateVertexAttribIPointer(context, index, size, type, stride, pointer))
>+            ValidateGetBufferPointerv(context, targetPacked, pname, params))
>         {
>-            context->vertexAttribIPointer(index, size, type, stride, pointer);
>+            context->getBufferPointerv(targetPacked, pname, params);
>         }
>     }
> }
> 
>-void GL_APIENTRY GetVertexAttribIiv(GLuint index, GLenum pname, GLint *params)
>+GLint GL_APIENTRY GetFragDataLocation(GLuint program, const GLchar *name)
> {
>-    EVENT("(GLuint index = %u, GLenum pname = 0x%X, GLint *params = 0x%0.8p)", index, pname,
>-          params);
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint program = %u, const GLchar *name = 0x%016" PRIxPTR ")", program,
>+          (uintptr_t)name);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::GetVertexAttribIiv>(index, pname, params);
>-
>-        if (context->skipValidation() || ValidateGetVertexAttribIiv(context, index, pname, params))
>+        if (context->skipValidation() || ValidateGetFragDataLocation(context, program, name))
>         {
>-            context->getVertexAttribIiv(index, pname, params);
>+            return context->getFragDataLocation(program, name);
>         }
>     }
>+
>+    return GetDefaultReturnValue<EntryPoint::GetFragDataLocation, GLint>();
> }
> 
>-void GL_APIENTRY GetVertexAttribIuiv(GLuint index, GLenum pname, GLuint *params)
>+void GL_APIENTRY GetInteger64i_v(GLenum target, GLuint index, GLint64 *data)
> {
>-    EVENT("(GLuint index = %u, GLenum pname = 0x%X, GLuint *params = 0x%0.8p)", index, pname,
>-          params);
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum target = 0x%X, GLuint index = %u, GLint64 *data = 0x%016" PRIxPTR ")", target,
>+          index, (uintptr_t)data);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::GetVertexAttribIuiv>(index, pname, params);
>-
>-        if (context->skipValidation() || ValidateGetVertexAttribIuiv(context, index, pname, params))
>+        if (context->skipValidation() || ValidateGetInteger64i_v(context, target, index, data))
>         {
>-            context->getVertexAttribIuiv(index, pname, params);
>+            context->getInteger64i_v(target, index, data);
>         }
>     }
> }
> 
>-void GL_APIENTRY VertexAttribI4i(GLuint index, GLint x, GLint y, GLint z, GLint w)
>+void GL_APIENTRY GetInteger64v(GLenum pname, GLint64 *data)
> {
>-    EVENT("(GLuint index = %u, GLint x = %d, GLint y = %d, GLint z = %d, GLint w = %d)", index, x,
>-          y, z, w);
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum pname = 0x%X, GLint64 *data = 0x%016" PRIxPTR ")", pname, (uintptr_t)data);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::VertexAttribI4i>(index, x, y, z, w);
>-
>-        if (context->skipValidation() || ValidateVertexAttribI4i(context, index, x, y, z, w))
>+        if (context->skipValidation() || ValidateGetInteger64v(context, pname, data))
>         {
>-            context->vertexAttribI4i(index, x, y, z, w);
>+            context->getInteger64v(pname, data);
>         }
>     }
> }
> 
>-void GL_APIENTRY VertexAttribI4ui(GLuint index, GLuint x, GLuint y, GLuint z, GLuint w)
>+void GL_APIENTRY GetIntegeri_v(GLenum target, GLuint index, GLint *data)
> {
>-    EVENT("(GLuint index = %u, GLuint x = %u, GLuint y = %u, GLuint z = %u, GLuint w = %u)", index,
>-          x, y, z, w);
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum target = 0x%X, GLuint index = %u, GLint *data = 0x%016" PRIxPTR ")", target,
>+          index, (uintptr_t)data);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::VertexAttribI4ui>(index, x, y, z, w);
>-
>-        if (context->skipValidation() || ValidateVertexAttribI4ui(context, index, x, y, z, w))
>+        if (context->skipValidation() || ValidateGetIntegeri_v(context, target, index, data))
>         {
>-            context->vertexAttribI4ui(index, x, y, z, w);
>+            context->getIntegeri_v(target, index, data);
>         }
>     }
> }
> 
>-void GL_APIENTRY VertexAttribI4iv(GLuint index, const GLint *v)
>+void GL_APIENTRY GetInternalformativ(GLenum target,
>+                                     GLenum internalformat,
>+                                     GLenum pname,
>+                                     GLsizei bufSize,
>+                                     GLint *params)
> {
>-    EVENT("(GLuint index = %u, const GLint *v = 0x%0.8p)", index, v);
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLenum target = 0x%X, GLenum internalformat = 0x%X, GLenum pname = 0x%X, GLsizei bufSize "
>+        "= %d, GLint *params = 0x%016" PRIxPTR ")",
>+        target, internalformat, pname, bufSize, (uintptr_t)params);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::VertexAttribI4iv>(index, v);
>-
>-        if (context->skipValidation() || ValidateVertexAttribI4iv(context, index, v))
>+        if (context->skipValidation() ||
>+            ValidateGetInternalformativ(context, target, internalformat, pname, bufSize, params))
>         {
>-            context->vertexAttribI4iv(index, v);
>+            context->getInternalformativ(target, internalformat, pname, bufSize, params);
>         }
>     }
> }
> 
>-void GL_APIENTRY VertexAttribI4uiv(GLuint index, const GLuint *v)
>+void GL_APIENTRY GetProgramBinary(GLuint program,
>+                                  GLsizei bufSize,
>+                                  GLsizei *length,
>+                                  GLenum *binaryFormat,
>+                                  void *binary)
> {
>-    EVENT("(GLuint index = %u, const GLuint *v = 0x%0.8p)", index, v);
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint program = %u, GLsizei bufSize = %d, GLsizei *length = 0x%016" PRIxPTR
>+          ", GLenum *binaryFormat = 0x%016" PRIxPTR ", void *binary = 0x%016" PRIxPTR ")",
>+          program, bufSize, (uintptr_t)length, (uintptr_t)binaryFormat, (uintptr_t)binary);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::VertexAttribI4uiv>(index, v);
>-
>-        if (context->skipValidation() || ValidateVertexAttribI4uiv(context, index, v))
>+        if (context->skipValidation() ||
>+            ValidateGetProgramBinary(context, program, bufSize, length, binaryFormat, binary))
>         {
>-            context->vertexAttribI4uiv(index, v);
>+            context->getProgramBinary(program, bufSize, length, binaryFormat, binary);
>         }
>     }
> }
> 
>-void GL_APIENTRY GetUniformuiv(GLuint program, GLint location, GLuint *params)
>+void GL_APIENTRY GetQueryObjectuiv(GLuint id, GLenum pname, GLuint *params)
> {
>-    EVENT("(GLuint program = %u, GLint location = %d, GLuint *params = 0x%0.8p)", program, location,
>-          params);
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint id = %u, GLenum pname = 0x%X, GLuint *params = 0x%016" PRIxPTR ")", id, pname,
>+          (uintptr_t)params);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::GetUniformuiv>(program, location, params);
>-
>-        if (context->skipValidation() || ValidateGetUniformuiv(context, program, location, params))
>+        if (context->skipValidation() || ValidateGetQueryObjectuiv(context, id, pname, params))
>         {
>-            context->getUniformuiv(program, location, params);
>+            context->getQueryObjectuiv(id, pname, params);
>         }
>     }
> }
> 
>-GLint GL_APIENTRY GetFragDataLocation(GLuint program, const GLchar *name)
>+void GL_APIENTRY GetQueryiv(GLenum target, GLenum pname, GLint *params)
> {
>-    EVENT("(GLuint program = %u, const GLchar *name = 0x%0.8p)", program, name);
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum target = 0x%X, GLenum pname = 0x%X, GLint *params = 0x%016" PRIxPTR ")", target,
>+          pname, (uintptr_t)params);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::GetFragDataLocation>(program, name);
>-
>-        if (context->skipValidation() || ValidateGetFragDataLocation(context, program, name))
>+        QueryType targetPacked = FromGLenum<QueryType>(target);
>+        if (context->skipValidation() || ValidateGetQueryiv(context, targetPacked, pname, params))
>         {
>-            return context->getFragDataLocation(program, name);
>+            context->getQueryiv(targetPacked, pname, params);
>         }
>     }
>-
>-    return GetDefaultReturnValue<EntryPoint::GetFragDataLocation, GLint>();
> }
> 
>-void GL_APIENTRY Uniform1ui(GLint location, GLuint v0)
>+void GL_APIENTRY GetSamplerParameterfv(GLuint sampler, GLenum pname, GLfloat *params)
> {
>-    EVENT("(GLint location = %d, GLuint v0 = %u)", location, v0);
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint sampler = %u, GLenum pname = 0x%X, GLfloat *params = 0x%016" PRIxPTR ")",
>+          sampler, pname, (uintptr_t)params);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::Uniform1ui>(location, v0);
>-
>-        if (context->skipValidation() || ValidateUniform1ui(context, location, v0))
>+        if (context->skipValidation() ||
>+            ValidateGetSamplerParameterfv(context, sampler, pname, params))
>         {
>-            context->uniform1ui(location, v0);
>+            context->getSamplerParameterfv(sampler, pname, params);
>         }
>     }
> }
> 
>-void GL_APIENTRY Uniform2ui(GLint location, GLuint v0, GLuint v1)
>+void GL_APIENTRY GetSamplerParameteriv(GLuint sampler, GLenum pname, GLint *params)
> {
>-    EVENT("(GLint location = %d, GLuint v0 = %u, GLuint v1 = %u)", location, v0, v1);
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint sampler = %u, GLenum pname = 0x%X, GLint *params = 0x%016" PRIxPTR ")", sampler,
>+          pname, (uintptr_t)params);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::Uniform2ui>(location, v0, v1);
>-
>-        if (context->skipValidation() || ValidateUniform2ui(context, location, v0, v1))
>+        if (context->skipValidation() ||
>+            ValidateGetSamplerParameteriv(context, sampler, pname, params))
>         {
>-            context->uniform2ui(location, v0, v1);
>+            context->getSamplerParameteriv(sampler, pname, params);
>         }
>     }
> }
> 
>-void GL_APIENTRY Uniform3ui(GLint location, GLuint v0, GLuint v1, GLuint v2)
>+const GLubyte *GL_APIENTRY GetStringi(GLenum name, GLuint index)
> {
>-    EVENT("(GLint location = %d, GLuint v0 = %u, GLuint v1 = %u, GLuint v2 = %u)", location, v0, v1,
>-          v2);
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum name = 0x%X, GLuint index = %u)", name, index);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::Uniform3ui>(location, v0, v1, v2);
>-
>-        if (context->skipValidation() || ValidateUniform3ui(context, location, v0, v1, v2))
>+        if (context->skipValidation() || ValidateGetStringi(context, name, index))
>         {
>-            context->uniform3ui(location, v0, v1, v2);
>+            return context->getStringi(name, index);
>         }
>     }
>+
>+    return GetDefaultReturnValue<EntryPoint::GetStringi, const GLubyte *>();
> }
> 
>-void GL_APIENTRY Uniform4ui(GLint location, GLuint v0, GLuint v1, GLuint v2, GLuint v3)
>+void GL_APIENTRY
>+GetSynciv(GLsync sync, GLenum pname, GLsizei bufSize, GLsizei *length, GLint *values)
> {
>-    EVENT("(GLint location = %d, GLuint v0 = %u, GLuint v1 = %u, GLuint v2 = %u, GLuint v3 = %u)",
>-          location, v0, v1, v2, v3);
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLsync sync = 0x%016" PRIxPTR
>+          ", GLenum pname = 0x%X, GLsizei bufSize = %d, GLsizei *length = 0x%016" PRIxPTR
>+          ", GLint *values = 0x%016" PRIxPTR ")",
>+          (uintptr_t)sync, pname, bufSize, (uintptr_t)length, (uintptr_t)values);
> 
>-    Context *context = GetValidGlobalContext();
>+    Context *context = GetGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::Uniform4ui>(location, v0, v1, v2, v3);
>-
>-        if (context->skipValidation() || ValidateUniform4ui(context, location, v0, v1, v2, v3))
>+        if (context->skipValidation() ||
>+            ValidateGetSynciv(context, sync, pname, bufSize, length, values))
>         {
>-            context->uniform4ui(location, v0, v1, v2, v3);
>+            context->getSynciv(sync, pname, bufSize, length, values);
>         }
>     }
> }
> 
>-void GL_APIENTRY Uniform1uiv(GLint location, GLsizei count, const GLuint *value)
>+void GL_APIENTRY GetTransformFeedbackVarying(GLuint program,
>+                                             GLuint index,
>+                                             GLsizei bufSize,
>+                                             GLsizei *length,
>+                                             GLsizei *size,
>+                                             GLenum *type,
>+                                             GLchar *name)
> {
>-    EVENT("(GLint location = %d, GLsizei count = %d, const GLuint *value = 0x%0.8p)", location,
>-          count, value);
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLuint program = %u, GLuint index = %u, GLsizei bufSize = %d, GLsizei *length = "
>+        "0x%016" PRIxPTR ", GLsizei *size = 0x%016" PRIxPTR ", GLenum *type = 0x%016" PRIxPTR
>+        ", GLchar *name = 0x%016" PRIxPTR ")",
>+        program, index, bufSize, (uintptr_t)length, (uintptr_t)size, (uintptr_t)type,
>+        (uintptr_t)name);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::Uniform1uiv>(location, count, value);
>-
>-        if (context->skipValidation() || ValidateUniform1uiv(context, location, count, value))
>+        if (context->skipValidation() ||
>+            ValidateGetTransformFeedbackVarying(context, program, index, bufSize, length, size,
>+                                                type, name))
>         {
>-            context->uniform1uiv(location, count, value);
>+            context->getTransformFeedbackVarying(program, index, bufSize, length, size, type, name);
>         }
>     }
> }
> 
>-void GL_APIENTRY Uniform2uiv(GLint location, GLsizei count, const GLuint *value)
>+GLuint GL_APIENTRY GetUniformBlockIndex(GLuint program, const GLchar *uniformBlockName)
> {
>-    EVENT("(GLint location = %d, GLsizei count = %d, const GLuint *value = 0x%0.8p)", location,
>-          count, value);
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint program = %u, const GLchar *uniformBlockName = 0x%016" PRIxPTR ")", program,
>+          (uintptr_t)uniformBlockName);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::Uniform2uiv>(location, count, value);
>-
>-        if (context->skipValidation() || ValidateUniform2uiv(context, location, count, value))
>+        if (context->skipValidation() ||
>+            ValidateGetUniformBlockIndex(context, program, uniformBlockName))
>         {
>-            context->uniform2uiv(location, count, value);
>+            return context->getUniformBlockIndex(program, uniformBlockName);
>         }
>     }
>+
>+    return GetDefaultReturnValue<EntryPoint::GetUniformBlockIndex, GLuint>();
> }
> 
>-void GL_APIENTRY Uniform3uiv(GLint location, GLsizei count, const GLuint *value)
>+void GL_APIENTRY GetUniformIndices(GLuint program,
>+                                   GLsizei uniformCount,
>+                                   const GLchar *const *uniformNames,
>+                                   GLuint *uniformIndices)
> {
>-    EVENT("(GLint location = %d, GLsizei count = %d, const GLuint *value = 0x%0.8p)", location,
>-          count, value);
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLuint program = %u, GLsizei uniformCount = %d, const GLchar *const*uniformNames = "
>+        "0x%016" PRIxPTR ", GLuint *uniformIndices = 0x%016" PRIxPTR ")",
>+        program, uniformCount, (uintptr_t)uniformNames, (uintptr_t)uniformIndices);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::Uniform3uiv>(location, count, value);
>-
>-        if (context->skipValidation() || ValidateUniform3uiv(context, location, count, value))
>+        if (context->skipValidation() ||
>+            ValidateGetUniformIndices(context, program, uniformCount, uniformNames, uniformIndices))
>         {
>-            context->uniform3uiv(location, count, value);
>+            context->getUniformIndices(program, uniformCount, uniformNames, uniformIndices);
>         }
>     }
> }
> 
>-void GL_APIENTRY Uniform4uiv(GLint location, GLsizei count, const GLuint *value)
>+void GL_APIENTRY GetUniformuiv(GLuint program, GLint location, GLuint *params)
> {
>-    EVENT("(GLint location = %d, GLsizei count = %d, const GLuint *value = 0x%0.8p)", location,
>-          count, value);
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint program = %u, GLint location = %d, GLuint *params = 0x%016" PRIxPTR ")", program,
>+          location, (uintptr_t)params);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::Uniform4uiv>(location, count, value);
>-
>-        if (context->skipValidation() || ValidateUniform4uiv(context, location, count, value))
>+        if (context->skipValidation() || ValidateGetUniformuiv(context, program, location, params))
>         {
>-            context->uniform4uiv(location, count, value);
>+            context->getUniformuiv(program, location, params);
>         }
>     }
> }
> 
>-void GL_APIENTRY ClearBufferiv(GLenum buffer, GLint drawbuffer, const GLint *value)
>+void GL_APIENTRY GetVertexAttribIiv(GLuint index, GLenum pname, GLint *params)
> {
>-    EVENT("(GLenum buffer = 0x%X, GLint drawbuffer = %d, const GLint *value = 0x%0.8p)", buffer,
>-          drawbuffer, value);
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint index = %u, GLenum pname = 0x%X, GLint *params = 0x%016" PRIxPTR ")", index,
>+          pname, (uintptr_t)params);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::ClearBufferiv>(buffer, drawbuffer, value);
>-
>-        if (context->skipValidation() || ValidateClearBufferiv(context, buffer, drawbuffer, value))
>+        if (context->skipValidation() || ValidateGetVertexAttribIiv(context, index, pname, params))
>         {
>-            context->clearBufferiv(buffer, drawbuffer, value);
>+            context->getVertexAttribIiv(index, pname, params);
>         }
>     }
> }
> 
>-void GL_APIENTRY ClearBufferuiv(GLenum buffer, GLint drawbuffer, const GLuint *value)
>+void GL_APIENTRY GetVertexAttribIuiv(GLuint index, GLenum pname, GLuint *params)
> {
>-    EVENT("(GLenum buffer = 0x%X, GLint drawbuffer = %d, const GLuint *value = 0x%0.8p)", buffer,
>-          drawbuffer, value);
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint index = %u, GLenum pname = 0x%X, GLuint *params = 0x%016" PRIxPTR ")", index,
>+          pname, (uintptr_t)params);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::ClearBufferuiv>(buffer, drawbuffer, value);
>-
>-        if (context->skipValidation() || ValidateClearBufferuiv(context, buffer, drawbuffer, value))
>+        if (context->skipValidation() || ValidateGetVertexAttribIuiv(context, index, pname, params))
>         {
>-            context->clearBufferuiv(buffer, drawbuffer, value);
>+            context->getVertexAttribIuiv(index, pname, params);
>         }
>     }
> }
> 
>-void GL_APIENTRY ClearBufferfv(GLenum buffer, GLint drawbuffer, const GLfloat *value)
>+void GL_APIENTRY InvalidateFramebuffer(GLenum target,
>+                                       GLsizei numAttachments,
>+                                       const GLenum *attachments)
> {
>-    EVENT("(GLenum buffer = 0x%X, GLint drawbuffer = %d, const GLfloat *value = 0x%0.8p)", buffer,
>-          drawbuffer, value);
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLenum target = 0x%X, GLsizei numAttachments = %d, const GLenum *attachments = "
>+        "0x%016" PRIxPTR ")",
>+        target, numAttachments, (uintptr_t)attachments);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::ClearBufferfv>(buffer, drawbuffer, value);
>-
>-        if (context->skipValidation() || ValidateClearBufferfv(context, buffer, drawbuffer, value))
>+        if (context->skipValidation() ||
>+            ValidateInvalidateFramebuffer(context, target, numAttachments, attachments))
>         {
>-            context->clearBufferfv(buffer, drawbuffer, value);
>+            context->invalidateFramebuffer(target, numAttachments, attachments);
>         }
>     }
> }
> 
>-void GL_APIENTRY ClearBufferfi(GLenum buffer, GLint drawbuffer, GLfloat depth, GLint stencil)
>+void GL_APIENTRY InvalidateSubFramebuffer(GLenum target,
>+                                          GLsizei numAttachments,
>+                                          const GLenum *attachments,
>+                                          GLint x,
>+                                          GLint y,
>+                                          GLsizei width,
>+                                          GLsizei height)
> {
>-    EVENT("(GLenum buffer = 0x%X, GLint drawbuffer = %d, GLfloat depth = %f, GLint stencil = %d)",
>-          buffer, drawbuffer, depth, stencil);
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLenum target = 0x%X, GLsizei numAttachments = %d, const GLenum *attachments = "
>+        "0x%016" PRIxPTR ", GLint x = %d, GLint y = %d, GLsizei width = %d, GLsizei height = %d)",
>+        target, numAttachments, (uintptr_t)attachments, x, y, width, height);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::ClearBufferfi>(buffer, drawbuffer, depth, stencil);
>-
>         if (context->skipValidation() ||
>-            ValidateClearBufferfi(context, buffer, drawbuffer, depth, stencil))
>+            ValidateInvalidateSubFramebuffer(context, target, numAttachments, attachments, x, y,
>+                                             width, height))
>         {
>-            context->clearBufferfi(buffer, drawbuffer, depth, stencil);
>+            context->invalidateSubFramebuffer(target, numAttachments, attachments, x, y, width,
>+                                              height);
>         }
>     }
> }
> 
>-const GLubyte *GL_APIENTRY GetStringi(GLenum name, GLuint index)
>+GLboolean GL_APIENTRY IsQuery(GLuint id)
> {
>-    EVENT("(GLenum name = 0x%X, GLuint index = %u)", name, index);
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint id = %u)", id);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::GetStringi>(name, index);
>-
>-        if (context->skipValidation() || ValidateGetStringi(context, name, index))
>+        if (context->skipValidation() || ValidateIsQuery(context, id))
>         {
>-            return context->getStringi(name, index);
>+            return context->isQuery(id);
>         }
>     }
> 
>-    return GetDefaultReturnValue<EntryPoint::GetStringi, const GLubyte *>();
>+    return GetDefaultReturnValue<EntryPoint::IsQuery, GLboolean>();
> }
> 
>-void GL_APIENTRY CopyBufferSubData(GLenum readTarget,
>-                                   GLenum writeTarget,
>-                                   GLintptr readOffset,
>-                                   GLintptr writeOffset,
>-                                   GLsizeiptr size)
>+GLboolean GL_APIENTRY IsSampler(GLuint sampler)
> {
>-    EVENT(
>-        "(GLenum readTarget = 0x%X, GLenum writeTarget = 0x%X, GLintptr readOffset = %d, GLintptr "
>-        "writeOffset = %d, GLsizeiptr size = %d)",
>-        readTarget, writeTarget, readOffset, writeOffset, size);
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint sampler = %u)", sampler);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        BufferBinding readTargetPacked  = FromGLenum<BufferBinding>(readTarget);
>-        BufferBinding writeTargetPacked = FromGLenum<BufferBinding>(writeTarget);
>-        context->gatherParams<EntryPoint::CopyBufferSubData>(readTargetPacked, writeTargetPacked,
>-                                                             readOffset, writeOffset, size);
>-
>-        if (context->skipValidation() ||
>-            ValidateCopyBufferSubData(context, readTargetPacked, writeTargetPacked, readOffset,
>-                                      writeOffset, size))
>+        if (context->skipValidation() || ValidateIsSampler(context, sampler))
>         {
>-            context->copyBufferSubData(readTargetPacked, writeTargetPacked, readOffset, writeOffset,
>-                                       size);
>+            return context->isSampler(sampler);
>         }
>     }
>+
>+    return GetDefaultReturnValue<EntryPoint::IsSampler, GLboolean>();
> }
> 
>-void GL_APIENTRY GetUniformIndices(GLuint program,
>-                                   GLsizei uniformCount,
>-                                   const GLchar *const *uniformNames,
>-                                   GLuint *uniformIndices)
>+GLboolean GL_APIENTRY IsSync(GLsync sync)
> {
>-    EVENT(
>-        "(GLuint program = %u, GLsizei uniformCount = %d, const GLchar *const*uniformNames = "
>-        "0x%0.8p, GLuint *uniformIndices = 0x%0.8p)",
>-        program, uniformCount, uniformNames, uniformIndices);
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLsync sync = 0x%016" PRIxPTR ")", (uintptr_t)sync);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::GetUniformIndices>(program, uniformCount, uniformNames,
>-                                                             uniformIndices);
>-
>-        if (context->skipValidation() ||
>-            ValidateGetUniformIndices(context, program, uniformCount, uniformNames, uniformIndices))
>+        if (context->skipValidation() || ValidateIsSync(context, sync))
>         {
>-            context->getUniformIndices(program, uniformCount, uniformNames, uniformIndices);
>+            return context->isSync(sync);
>         }
>     }
>+
>+    return GetDefaultReturnValue<EntryPoint::IsSync, GLboolean>();
> }
> 
>-void GL_APIENTRY GetActiveUniformsiv(GLuint program,
>-                                     GLsizei uniformCount,
>-                                     const GLuint *uniformIndices,
>-                                     GLenum pname,
>-                                     GLint *params)
>+GLboolean GL_APIENTRY IsTransformFeedback(GLuint id)
> {
>-    EVENT(
>-        "(GLuint program = %u, GLsizei uniformCount = %d, const GLuint *uniformIndices = 0x%0.8p, "
>-        "GLenum pname = 0x%X, GLint *params = 0x%0.8p)",
>-        program, uniformCount, uniformIndices, pname, params);
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint id = %u)", id);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::GetActiveUniformsiv>(program, uniformCount,
>-                                                               uniformIndices, pname, params);
>-
>-        if (context->skipValidation() || ValidateGetActiveUniformsiv(context, program, uniformCount,
>-                                                                     uniformIndices, pname, params))
>+        if (context->skipValidation() || ValidateIsTransformFeedback(context, id))
>         {
>-            context->getActiveUniformsiv(program, uniformCount, uniformIndices, pname, params);
>+            return context->isTransformFeedback(id);
>         }
>     }
>+
>+    return GetDefaultReturnValue<EntryPoint::IsTransformFeedback, GLboolean>();
> }
> 
>-GLuint GL_APIENTRY GetUniformBlockIndex(GLuint program, const GLchar *uniformBlockName)
>+GLboolean GL_APIENTRY IsVertexArray(GLuint array)
> {
>-    EVENT("(GLuint program = %u, const GLchar *uniformBlockName = 0x%0.8p)", program,
>-          uniformBlockName);
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint array = %u)", array);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::GetUniformBlockIndex>(program, uniformBlockName);
>-
>-        if (context->skipValidation() ||
>-            ValidateGetUniformBlockIndex(context, program, uniformBlockName))
>+        if (context->skipValidation() || ValidateIsVertexArray(context, array))
>         {
>-            return context->getUniformBlockIndex(program, uniformBlockName);
>+            return context->isVertexArray(array);
>         }
>     }
> 
>-    return GetDefaultReturnValue<EntryPoint::GetUniformBlockIndex, GLuint>();
>+    return GetDefaultReturnValue<EntryPoint::IsVertexArray, GLboolean>();
> }
> 
>-void GL_APIENTRY GetActiveUniformBlockiv(GLuint program,
>-                                         GLuint uniformBlockIndex,
>-                                         GLenum pname,
>-                                         GLint *params)
>+void *GL_APIENTRY MapBufferRange(GLenum target,
>+                                 GLintptr offset,
>+                                 GLsizeiptr length,
>+                                 GLbitfield access)
> {
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>     EVENT(
>-        "(GLuint program = %u, GLuint uniformBlockIndex = %u, GLenum pname = 0x%X, GLint *params = "
>-        "0x%0.8p)",
>-        program, uniformBlockIndex, pname, params);
>+        "(GLenum target = 0x%X, GLintptr offset = %llu, GLsizeiptr length = %llu, GLbitfield "
>+        "access = 0x%X)",
>+        target, static_cast<unsigned long long>(offset), static_cast<unsigned long long>(length),
>+        access);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::GetActiveUniformBlockiv>(program, uniformBlockIndex,
>-                                                                   pname, params);
>-
>+        BufferBinding targetPacked = FromGLenum<BufferBinding>(target);
>         if (context->skipValidation() ||
>-            ValidateGetActiveUniformBlockiv(context, program, uniformBlockIndex, pname, params))
>+            ValidateMapBufferRange(context, targetPacked, offset, length, access))
>         {
>-            context->getActiveUniformBlockiv(program, uniformBlockIndex, pname, params);
>+            return context->mapBufferRange(targetPacked, offset, length, access);
>         }
>     }
>+
>+    return GetDefaultReturnValue<EntryPoint::MapBufferRange, void *>();
> }
> 
>-void GL_APIENTRY GetActiveUniformBlockName(GLuint program,
>-                                           GLuint uniformBlockIndex,
>-                                           GLsizei bufSize,
>-                                           GLsizei *length,
>-                                           GLchar *uniformBlockName)
>+void GL_APIENTRY PauseTransformFeedback()
> {
>-    EVENT(
>-        "(GLuint program = %u, GLuint uniformBlockIndex = %u, GLsizei bufSize = %d, GLsizei "
>-        "*length = 0x%0.8p, GLchar *uniformBlockName = 0x%0.8p)",
>-        program, uniformBlockIndex, bufSize, length, uniformBlockName);
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("()");
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::GetActiveUniformBlockName>(
>-            program, uniformBlockIndex, bufSize, length, uniformBlockName);
>-
>-        if (context->skipValidation() ||
>-            ValidateGetActiveUniformBlockName(context, program, uniformBlockIndex, bufSize, length,
>-                                              uniformBlockName))
>+        if (context->skipValidation() || ValidatePauseTransformFeedback(context))
>         {
>-            context->getActiveUniformBlockName(program, uniformBlockIndex, bufSize, length,
>-                                               uniformBlockName);
>+            context->pauseTransformFeedback();
>         }
>     }
> }
> 
>-void GL_APIENTRY UniformBlockBinding(GLuint program,
>-                                     GLuint uniformBlockIndex,
>-                                     GLuint uniformBlockBinding)
>+void GL_APIENTRY ProgramBinary(GLuint program,
>+                               GLenum binaryFormat,
>+                               const void *binary,
>+                               GLsizei length)
> {
>-    EVENT("(GLuint program = %u, GLuint uniformBlockIndex = %u, GLuint uniformBlockBinding = %u)",
>-          program, uniformBlockIndex, uniformBlockBinding);
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint program = %u, GLenum binaryFormat = 0x%X, const void *binary = 0x%016" PRIxPTR
>+          ", GLsizei length = %d)",
>+          program, binaryFormat, (uintptr_t)binary, length);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::UniformBlockBinding>(program, uniformBlockIndex,
>-                                                               uniformBlockBinding);
>-
>         if (context->skipValidation() ||
>-            ValidateUniformBlockBinding(context, program, uniformBlockIndex, uniformBlockBinding))
>+            ValidateProgramBinary(context, program, binaryFormat, binary, length))
>         {
>-            context->uniformBlockBinding(program, uniformBlockIndex, uniformBlockBinding);
>+            context->programBinary(program, binaryFormat, binary, length);
>         }
>     }
> }
> 
>-void GL_APIENTRY DrawArraysInstanced(GLenum mode, GLint first, GLsizei count, GLsizei instancecount)
>+void GL_APIENTRY ProgramParameteri(GLuint program, GLenum pname, GLint value)
> {
>-    EVENT("(GLenum mode = 0x%X, GLint first = %d, GLsizei count = %d, GLsizei instancecount = %d)",
>-          mode, first, count, instancecount);
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint program = %u, GLenum pname = 0x%X, GLint value = %d)", program, pname, value);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::DrawArraysInstanced>(mode, first, count, instancecount);
>-
>-        if (context->skipValidation() ||
>-            ValidateDrawArraysInstanced(context, mode, first, count, instancecount))
>+        if (context->skipValidation() || ValidateProgramParameteri(context, program, pname, value))
>         {
>-            context->drawArraysInstanced(mode, first, count, instancecount);
>+            context->programParameteri(program, pname, value);
>         }
>     }
> }
> 
>-void GL_APIENTRY DrawElementsInstanced(GLenum mode,
>-                                       GLsizei count,
>-                                       GLenum type,
>-                                       const void *indices,
>-                                       GLsizei instancecount)
>+void GL_APIENTRY ReadBuffer(GLenum src)
> {
>-    EVENT(
>-        "(GLenum mode = 0x%X, GLsizei count = %d, GLenum type = 0x%X, const void *indices = "
>-        "0x%0.8p, GLsizei instancecount = %d)",
>-        mode, count, type, indices, instancecount);
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum src = 0x%X)", src);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::DrawElementsInstanced>(mode, count, type, indices,
>-                                                                 instancecount);
>-
>-        if (context->skipValidation() ||
>-            ValidateDrawElementsInstanced(context, mode, count, type, indices, instancecount))
>+        if (context->skipValidation() || ValidateReadBuffer(context, src))
>         {
>-            context->drawElementsInstanced(mode, count, type, indices, instancecount);
>+            context->readBuffer(src);
>         }
>     }
> }
> 
>-GLsync GL_APIENTRY FenceSync(GLenum condition, GLbitfield flags)
>+void GL_APIENTRY RenderbufferStorageMultisample(GLenum target,
>+                                                GLsizei samples,
>+                                                GLenum internalformat,
>+                                                GLsizei width,
>+                                                GLsizei height)
> {
>-    EVENT("(GLenum condition = 0x%X, GLbitfield flags = 0x%X)", condition, flags);
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLenum target = 0x%X, GLsizei samples = %d, GLenum internalformat = 0x%X, GLsizei width "
>+        "= %d, GLsizei height = %d)",
>+        target, samples, internalformat, width, height);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::FenceSync>(condition, flags);
>-
>-        if (context->skipValidation() || ValidateFenceSync(context, condition, flags))
>+        if (context->skipValidation() ||
>+            ValidateRenderbufferStorageMultisample(context, target, samples, internalformat, width,
>+                                                   height))
>         {
>-            return context->fenceSync(condition, flags);
>+            context->renderbufferStorageMultisample(target, samples, internalformat, width, height);
>         }
>     }
>-
>-    return GetDefaultReturnValue<EntryPoint::FenceSync, GLsync>();
> }
> 
>-GLboolean GL_APIENTRY IsSync(GLsync sync)
>+void GL_APIENTRY ResumeTransformFeedback()
> {
>-    EVENT("(GLsync sync = 0x%0.8p)", sync);
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("()");
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::IsSync>(sync);
>-
>-        if (context->skipValidation() || ValidateIsSync(context, sync))
>+        if (context->skipValidation() || ValidateResumeTransformFeedback(context))
>         {
>-            return context->isSync(sync);
>+            context->resumeTransformFeedback();
>         }
>     }
>-
>-    return GetDefaultReturnValue<EntryPoint::IsSync, GLboolean>();
> }
> 
>-void GL_APIENTRY DeleteSync(GLsync sync)
>+void GL_APIENTRY SamplerParameterf(GLuint sampler, GLenum pname, GLfloat param)
> {
>-    EVENT("(GLsync sync = 0x%0.8p)", sync);
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint sampler = %u, GLenum pname = 0x%X, GLfloat param = %f)", sampler, pname, param);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::DeleteSync>(sync);
>-
>-        if (context->skipValidation() || ValidateDeleteSync(context, sync))
>+        if (context->skipValidation() || ValidateSamplerParameterf(context, sampler, pname, param))
>         {
>-            context->deleteSync(sync);
>+            context->samplerParameterf(sampler, pname, param);
>         }
>     }
> }
> 
>-GLenum GL_APIENTRY ClientWaitSync(GLsync sync, GLbitfield flags, GLuint64 timeout)
>+void GL_APIENTRY SamplerParameterfv(GLuint sampler, GLenum pname, const GLfloat *param)
> {
>-    EVENT("(GLsync sync = 0x%0.8p, GLbitfield flags = 0x%X, GLuint64 timeout = %llu)", sync, flags,
>-          timeout);
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint sampler = %u, GLenum pname = 0x%X, const GLfloat *param = 0x%016" PRIxPTR ")",
>+          sampler, pname, (uintptr_t)param);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::ClientWaitSync>(sync, flags, timeout);
>-
>-        if (context->skipValidation() || ValidateClientWaitSync(context, sync, flags, timeout))
>+        if (context->skipValidation() || ValidateSamplerParameterfv(context, sampler, pname, param))
>         {
>-            return context->clientWaitSync(sync, flags, timeout);
>+            context->samplerParameterfv(sampler, pname, param);
>         }
>     }
>-
>-    return GetDefaultReturnValue<EntryPoint::ClientWaitSync, GLenum>();
> }
> 
>-void GL_APIENTRY WaitSync(GLsync sync, GLbitfield flags, GLuint64 timeout)
>+void GL_APIENTRY SamplerParameteri(GLuint sampler, GLenum pname, GLint param)
> {
>-    EVENT("(GLsync sync = 0x%0.8p, GLbitfield flags = 0x%X, GLuint64 timeout = %llu)", sync, flags,
>-          timeout);
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint sampler = %u, GLenum pname = 0x%X, GLint param = %d)", sampler, pname, param);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::WaitSync>(sync, flags, timeout);
>-
>-        if (context->skipValidation() || ValidateWaitSync(context, sync, flags, timeout))
>+        if (context->skipValidation() || ValidateSamplerParameteri(context, sampler, pname, param))
>         {
>-            context->waitSync(sync, flags, timeout);
>+            context->samplerParameteri(sampler, pname, param);
>         }
>     }
> }
> 
>-void GL_APIENTRY GetInteger64v(GLenum pname, GLint64 *data)
>+void GL_APIENTRY SamplerParameteriv(GLuint sampler, GLenum pname, const GLint *param)
> {
>-    EVENT("(GLenum pname = 0x%X, GLint64 *data = 0x%0.8p)", pname, data);
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint sampler = %u, GLenum pname = 0x%X, const GLint *param = 0x%016" PRIxPTR ")",
>+          sampler, pname, (uintptr_t)param);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::GetInteger64v>(pname, data);
>-
>-        if (context->skipValidation() || ValidateGetInteger64v(context, pname, data))
>+        if (context->skipValidation() || ValidateSamplerParameteriv(context, sampler, pname, param))
>         {
>-            context->getInteger64v(pname, data);
>+            context->samplerParameteriv(sampler, pname, param);
>         }
>     }
> }
> 
>-void GL_APIENTRY
>-GetSynciv(GLsync sync, GLenum pname, GLsizei bufSize, GLsizei *length, GLint *values)
>+void GL_APIENTRY TexImage3D(GLenum target,
>+                            GLint level,
>+                            GLint internalformat,
>+                            GLsizei width,
>+                            GLsizei height,
>+                            GLsizei depth,
>+                            GLint border,
>+                            GLenum format,
>+                            GLenum type,
>+                            const void *pixels)
> {
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>     EVENT(
>-        "(GLsync sync = 0x%0.8p, GLenum pname = 0x%X, GLsizei bufSize = %d, GLsizei *length = "
>-        "0x%0.8p, GLint *values = 0x%0.8p)",
>-        sync, pname, bufSize, length, values);
>+        "(GLenum target = 0x%X, GLint level = %d, GLint internalformat = %d, GLsizei width = %d, "
>+        "GLsizei height = %d, GLsizei depth = %d, GLint border = %d, GLenum format = 0x%X, GLenum "
>+        "type = 0x%X, const void *pixels = 0x%016" PRIxPTR ")",
>+        target, level, internalformat, width, height, depth, border, format, type,
>+        (uintptr_t)pixels);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::GetSynciv>(sync, pname, bufSize, length, values);
>-
>+        TextureTarget targetPacked = FromGLenum<TextureTarget>(target);
>         if (context->skipValidation() ||
>-            ValidateGetSynciv(context, sync, pname, bufSize, length, values))
>+            ValidateTexImage3D(context, targetPacked, level, internalformat, width, height, depth,
>+                               border, format, type, pixels))
>         {
>-            context->getSynciv(sync, pname, bufSize, length, values);
>+            context->texImage3D(targetPacked, level, internalformat, width, height, depth, border,
>+                                format, type, pixels);
>         }
>     }
> }
> 
>-void GL_APIENTRY GetInteger64i_v(GLenum target, GLuint index, GLint64 *data)
>+void GL_APIENTRY
>+TexStorage2D(GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height)
> {
>-    EVENT("(GLenum target = 0x%X, GLuint index = %u, GLint64 *data = 0x%0.8p)", target, index,
>-          data);
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLenum target = 0x%X, GLsizei levels = %d, GLenum internalformat = 0x%X, GLsizei width = "
>+        "%d, GLsizei height = %d)",
>+        target, levels, internalformat, width, height);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::GetInteger64i_v>(target, index, data);
>-
>-        if (context->skipValidation() || ValidateGetInteger64i_v(context, target, index, data))
>+        TextureType targetPacked = FromGLenum<TextureType>(target);
>+        if (context->skipValidation() ||
>+            ValidateTexStorage2D(context, targetPacked, levels, internalformat, width, height))
>         {
>-            context->getInteger64i_v(target, index, data);
>+            context->texStorage2D(targetPacked, levels, internalformat, width, height);
>         }
>     }
> }
> 
>-void GL_APIENTRY GetBufferParameteri64v(GLenum target, GLenum pname, GLint64 *params)
>+void GL_APIENTRY TexStorage3D(GLenum target,
>+                              GLsizei levels,
>+                              GLenum internalformat,
>+                              GLsizei width,
>+                              GLsizei height,
>+                              GLsizei depth)
> {
>-    EVENT("(GLenum target = 0x%X, GLenum pname = 0x%X, GLint64 *params = 0x%0.8p)", target, pname,
>-          params);
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLenum target = 0x%X, GLsizei levels = %d, GLenum internalformat = 0x%X, GLsizei width = "
>+        "%d, GLsizei height = %d, GLsizei depth = %d)",
>+        target, levels, internalformat, width, height, depth);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        BufferBinding targetPacked = FromGLenum<BufferBinding>(target);
>-        context->gatherParams<EntryPoint::GetBufferParameteri64v>(targetPacked, pname, params);
>-
>-        if (context->skipValidation() ||
>-            ValidateGetBufferParameteri64v(context, targetPacked, pname, params))
>+        TextureType targetPacked = FromGLenum<TextureType>(target);
>+        if (context->skipValidation() || ValidateTexStorage3D(context, targetPacked, levels,
>+                                                              internalformat, width, height, depth))
>         {
>-            context->getBufferParameteri64v(targetPacked, pname, params);
>+            context->texStorage3D(targetPacked, levels, internalformat, width, height, depth);
>         }
>     }
> }
> 
>-void GL_APIENTRY GenSamplers(GLsizei count, GLuint *samplers)
>+void GL_APIENTRY TexSubImage3D(GLenum target,
>+                               GLint level,
>+                               GLint xoffset,
>+                               GLint yoffset,
>+                               GLint zoffset,
>+                               GLsizei width,
>+                               GLsizei height,
>+                               GLsizei depth,
>+                               GLenum format,
>+                               GLenum type,
>+                               const void *pixels)
> {
>-    EVENT("(GLsizei count = %d, GLuint *samplers = 0x%0.8p)", count, samplers);
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLenum target = 0x%X, GLint level = %d, GLint xoffset = %d, GLint yoffset = %d, GLint "
>+        "zoffset = %d, GLsizei width = %d, GLsizei height = %d, GLsizei depth = %d, GLenum format "
>+        "= 0x%X, GLenum type = 0x%X, const void *pixels = 0x%016" PRIxPTR ")",
>+        target, level, xoffset, yoffset, zoffset, width, height, depth, format, type,
>+        (uintptr_t)pixels);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::GenSamplers>(count, samplers);
>-
>-        if (context->skipValidation() || ValidateGenSamplers(context, count, samplers))
>+        TextureTarget targetPacked = FromGLenum<TextureTarget>(target);
>+        if (context->skipValidation() ||
>+            ValidateTexSubImage3D(context, targetPacked, level, xoffset, yoffset, zoffset, width,
>+                                  height, depth, format, type, pixels))
>         {
>-            context->genSamplers(count, samplers);
>+            context->texSubImage3D(targetPacked, level, xoffset, yoffset, zoffset, width, height,
>+                                   depth, format, type, pixels);
>         }
>     }
> }
> 
>-void GL_APIENTRY DeleteSamplers(GLsizei count, const GLuint *samplers)
>+void GL_APIENTRY TransformFeedbackVaryings(GLuint program,
>+                                           GLsizei count,
>+                                           const GLchar *const *varyings,
>+                                           GLenum bufferMode)
> {
>-    EVENT("(GLsizei count = %d, const GLuint *samplers = 0x%0.8p)", count, samplers);
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint program = %u, GLsizei count = %d, const GLchar *const*varyings = 0x%016" PRIxPTR
>+          ", GLenum bufferMode = 0x%X)",
>+          program, count, (uintptr_t)varyings, bufferMode);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::DeleteSamplers>(count, samplers);
>-
>-        if (context->skipValidation() || ValidateDeleteSamplers(context, count, samplers))
>+        if (context->skipValidation() ||
>+            ValidateTransformFeedbackVaryings(context, program, count, varyings, bufferMode))
>         {
>-            context->deleteSamplers(count, samplers);
>+            context->transformFeedbackVaryings(program, count, varyings, bufferMode);
>         }
>     }
> }
> 
>-GLboolean GL_APIENTRY IsSampler(GLuint sampler)
>+void GL_APIENTRY Uniform1ui(GLint location, GLuint v0)
> {
>-    EVENT("(GLuint sampler = %u)", sampler);
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLint location = %d, GLuint v0 = %u)", location, v0);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::IsSampler>(sampler);
>-
>-        if (context->skipValidation() || ValidateIsSampler(context, sampler))
>+        if (context->skipValidation() || ValidateUniform1ui(context, location, v0))
>         {
>-            return context->isSampler(sampler);
>+            context->uniform1ui(location, v0);
>         }
>     }
>-
>-    return GetDefaultReturnValue<EntryPoint::IsSampler, GLboolean>();
> }
> 
>-void GL_APIENTRY BindSampler(GLuint unit, GLuint sampler)
>+void GL_APIENTRY Uniform1uiv(GLint location, GLsizei count, const GLuint *value)
> {
>-    EVENT("(GLuint unit = %u, GLuint sampler = %u)", unit, sampler);
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLint location = %d, GLsizei count = %d, const GLuint *value = 0x%016" PRIxPTR ")",
>+          location, count, (uintptr_t)value);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::BindSampler>(unit, sampler);
>-
>-        if (context->skipValidation() || ValidateBindSampler(context, unit, sampler))
>+        if (context->skipValidation() || ValidateUniform1uiv(context, location, count, value))
>         {
>-            context->bindSampler(unit, sampler);
>+            context->uniform1uiv(location, count, value);
>         }
>     }
> }
> 
>-void GL_APIENTRY SamplerParameteri(GLuint sampler, GLenum pname, GLint param)
>+void GL_APIENTRY Uniform2ui(GLint location, GLuint v0, GLuint v1)
> {
>-    EVENT("(GLuint sampler = %u, GLenum pname = 0x%X, GLint param = %d)", sampler, pname, param);
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLint location = %d, GLuint v0 = %u, GLuint v1 = %u)", location, v0, v1);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::SamplerParameteri>(sampler, pname, param);
>-
>-        if (context->skipValidation() || ValidateSamplerParameteri(context, sampler, pname, param))
>+        if (context->skipValidation() || ValidateUniform2ui(context, location, v0, v1))
>         {
>-            context->samplerParameteri(sampler, pname, param);
>+            context->uniform2ui(location, v0, v1);
>         }
>     }
> }
> 
>-void GL_APIENTRY SamplerParameteriv(GLuint sampler, GLenum pname, const GLint *param)
>+void GL_APIENTRY Uniform2uiv(GLint location, GLsizei count, const GLuint *value)
> {
>-    EVENT("(GLuint sampler = %u, GLenum pname = 0x%X, const GLint *param = 0x%0.8p)", sampler,
>-          pname, param);
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLint location = %d, GLsizei count = %d, const GLuint *value = 0x%016" PRIxPTR ")",
>+          location, count, (uintptr_t)value);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::SamplerParameteriv>(sampler, pname, param);
>-
>-        if (context->skipValidation() || ValidateSamplerParameteriv(context, sampler, pname, param))
>+        if (context->skipValidation() || ValidateUniform2uiv(context, location, count, value))
>         {
>-            context->samplerParameteriv(sampler, pname, param);
>+            context->uniform2uiv(location, count, value);
>         }
>     }
> }
> 
>-void GL_APIENTRY SamplerParameterf(GLuint sampler, GLenum pname, GLfloat param)
>+void GL_APIENTRY Uniform3ui(GLint location, GLuint v0, GLuint v1, GLuint v2)
> {
>-    EVENT("(GLuint sampler = %u, GLenum pname = 0x%X, GLfloat param = %f)", sampler, pname, param);
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLint location = %d, GLuint v0 = %u, GLuint v1 = %u, GLuint v2 = %u)", location, v0, v1,
>+          v2);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::SamplerParameterf>(sampler, pname, param);
>-
>-        if (context->skipValidation() || ValidateSamplerParameterf(context, sampler, pname, param))
>+        if (context->skipValidation() || ValidateUniform3ui(context, location, v0, v1, v2))
>         {
>-            context->samplerParameterf(sampler, pname, param);
>+            context->uniform3ui(location, v0, v1, v2);
>         }
>     }
> }
> 
>-void GL_APIENTRY SamplerParameterfv(GLuint sampler, GLenum pname, const GLfloat *param)
>+void GL_APIENTRY Uniform3uiv(GLint location, GLsizei count, const GLuint *value)
> {
>-    EVENT("(GLuint sampler = %u, GLenum pname = 0x%X, const GLfloat *param = 0x%0.8p)", sampler,
>-          pname, param);
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLint location = %d, GLsizei count = %d, const GLuint *value = 0x%016" PRIxPTR ")",
>+          location, count, (uintptr_t)value);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::SamplerParameterfv>(sampler, pname, param);
>-
>-        if (context->skipValidation() || ValidateSamplerParameterfv(context, sampler, pname, param))
>+        if (context->skipValidation() || ValidateUniform3uiv(context, location, count, value))
>         {
>-            context->samplerParameterfv(sampler, pname, param);
>+            context->uniform3uiv(location, count, value);
>         }
>     }
> }
> 
>-void GL_APIENTRY GetSamplerParameteriv(GLuint sampler, GLenum pname, GLint *params)
>+void GL_APIENTRY Uniform4ui(GLint location, GLuint v0, GLuint v1, GLuint v2, GLuint v3)
> {
>-    EVENT("(GLuint sampler = %u, GLenum pname = 0x%X, GLint *params = 0x%0.8p)", sampler, pname,
>-          params);
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLint location = %d, GLuint v0 = %u, GLuint v1 = %u, GLuint v2 = %u, GLuint v3 = %u)",
>+          location, v0, v1, v2, v3);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::GetSamplerParameteriv>(sampler, pname, params);
>-
>-        if (context->skipValidation() ||
>-            ValidateGetSamplerParameteriv(context, sampler, pname, params))
>+        if (context->skipValidation() || ValidateUniform4ui(context, location, v0, v1, v2, v3))
>         {
>-            context->getSamplerParameteriv(sampler, pname, params);
>+            context->uniform4ui(location, v0, v1, v2, v3);
>         }
>     }
> }
> 
>-void GL_APIENTRY GetSamplerParameterfv(GLuint sampler, GLenum pname, GLfloat *params)
>+void GL_APIENTRY Uniform4uiv(GLint location, GLsizei count, const GLuint *value)
> {
>-    EVENT("(GLuint sampler = %u, GLenum pname = 0x%X, GLfloat *params = 0x%0.8p)", sampler, pname,
>-          params);
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLint location = %d, GLsizei count = %d, const GLuint *value = 0x%016" PRIxPTR ")",
>+          location, count, (uintptr_t)value);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::GetSamplerParameterfv>(sampler, pname, params);
>-
>-        if (context->skipValidation() ||
>-            ValidateGetSamplerParameterfv(context, sampler, pname, params))
>+        if (context->skipValidation() || ValidateUniform4uiv(context, location, count, value))
>         {
>-            context->getSamplerParameterfv(sampler, pname, params);
>+            context->uniform4uiv(location, count, value);
>         }
>     }
> }
> 
>-void GL_APIENTRY VertexAttribDivisor(GLuint index, GLuint divisor)
>+void GL_APIENTRY UniformBlockBinding(GLuint program,
>+                                     GLuint uniformBlockIndex,
>+                                     GLuint uniformBlockBinding)
> {
>-    EVENT("(GLuint index = %u, GLuint divisor = %u)", index, divisor);
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint program = %u, GLuint uniformBlockIndex = %u, GLuint uniformBlockBinding = %u)",
>+          program, uniformBlockIndex, uniformBlockBinding);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::VertexAttribDivisor>(index, divisor);
>-
>-        if (context->skipValidation() || ValidateVertexAttribDivisor(context, index, divisor))
>+        if (context->skipValidation() ||
>+            ValidateUniformBlockBinding(context, program, uniformBlockIndex, uniformBlockBinding))
>         {
>-            context->vertexAttribDivisor(index, divisor);
>+            context->uniformBlockBinding(program, uniformBlockIndex, uniformBlockBinding);
>         }
>     }
> }
> 
>-void GL_APIENTRY BindTransformFeedback(GLenum target, GLuint id)
>+void GL_APIENTRY UniformMatrix2x3fv(GLint location,
>+                                    GLsizei count,
>+                                    GLboolean transpose,
>+                                    const GLfloat *value)
> {
>-    EVENT("(GLenum target = 0x%X, GLuint id = %u)", target, id);
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLint location = %d, GLsizei count = %d, GLboolean transpose = %u, const GLfloat *value "
>+        "= 0x%016" PRIxPTR ")",
>+        location, count, transpose, (uintptr_t)value);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::BindTransformFeedback>(target, id);
>-
>-        if (context->skipValidation() || ValidateBindTransformFeedback(context, target, id))
>+        if (context->skipValidation() ||
>+            ValidateUniformMatrix2x3fv(context, location, count, transpose, value))
>         {
>-            context->bindTransformFeedback(target, id);
>+            context->uniformMatrix2x3fv(location, count, transpose, value);
>         }
>     }
> }
> 
>-void GL_APIENTRY DeleteTransformFeedbacks(GLsizei n, const GLuint *ids)
>+void GL_APIENTRY UniformMatrix2x4fv(GLint location,
>+                                    GLsizei count,
>+                                    GLboolean transpose,
>+                                    const GLfloat *value)
> {
>-    EVENT("(GLsizei n = %d, const GLuint *ids = 0x%0.8p)", n, ids);
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLint location = %d, GLsizei count = %d, GLboolean transpose = %u, const GLfloat *value "
>+        "= 0x%016" PRIxPTR ")",
>+        location, count, transpose, (uintptr_t)value);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::DeleteTransformFeedbacks>(n, ids);
>-
>-        if (context->skipValidation() || ValidateDeleteTransformFeedbacks(context, n, ids))
>+        if (context->skipValidation() ||
>+            ValidateUniformMatrix2x4fv(context, location, count, transpose, value))
>         {
>-            context->deleteTransformFeedbacks(n, ids);
>+            context->uniformMatrix2x4fv(location, count, transpose, value);
>         }
>     }
> }
> 
>-void GL_APIENTRY GenTransformFeedbacks(GLsizei n, GLuint *ids)
>+void GL_APIENTRY UniformMatrix3x2fv(GLint location,
>+                                    GLsizei count,
>+                                    GLboolean transpose,
>+                                    const GLfloat *value)
> {
>-    EVENT("(GLsizei n = %d, GLuint *ids = 0x%0.8p)", n, ids);
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLint location = %d, GLsizei count = %d, GLboolean transpose = %u, const GLfloat *value "
>+        "= 0x%016" PRIxPTR ")",
>+        location, count, transpose, (uintptr_t)value);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::GenTransformFeedbacks>(n, ids);
>-
>-        if (context->skipValidation() || ValidateGenTransformFeedbacks(context, n, ids))
>+        if (context->skipValidation() ||
>+            ValidateUniformMatrix3x2fv(context, location, count, transpose, value))
>         {
>-            context->genTransformFeedbacks(n, ids);
>+            context->uniformMatrix3x2fv(location, count, transpose, value);
>         }
>     }
> }
> 
>-GLboolean GL_APIENTRY IsTransformFeedback(GLuint id)
>+void GL_APIENTRY UniformMatrix3x4fv(GLint location,
>+                                    GLsizei count,
>+                                    GLboolean transpose,
>+                                    const GLfloat *value)
> {
>-    EVENT("(GLuint id = %u)", id);
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLint location = %d, GLsizei count = %d, GLboolean transpose = %u, const GLfloat *value "
>+        "= 0x%016" PRIxPTR ")",
>+        location, count, transpose, (uintptr_t)value);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::IsTransformFeedback>(id);
>-
>-        if (context->skipValidation() || ValidateIsTransformFeedback(context, id))
>+        if (context->skipValidation() ||
>+            ValidateUniformMatrix3x4fv(context, location, count, transpose, value))
>         {
>-            return context->isTransformFeedback(id);
>+            context->uniformMatrix3x4fv(location, count, transpose, value);
>         }
>     }
>-
>-    return GetDefaultReturnValue<EntryPoint::IsTransformFeedback, GLboolean>();
> }
> 
>-void GL_APIENTRY PauseTransformFeedback()
>+void GL_APIENTRY UniformMatrix4x2fv(GLint location,
>+                                    GLsizei count,
>+                                    GLboolean transpose,
>+                                    const GLfloat *value)
> {
>-    EVENT("()");
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLint location = %d, GLsizei count = %d, GLboolean transpose = %u, const GLfloat *value "
>+        "= 0x%016" PRIxPTR ")",
>+        location, count, transpose, (uintptr_t)value);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::PauseTransformFeedback>();
>-
>-        if (context->skipValidation() || ValidatePauseTransformFeedback(context))
>+        if (context->skipValidation() ||
>+            ValidateUniformMatrix4x2fv(context, location, count, transpose, value))
>         {
>-            context->pauseTransformFeedback();
>+            context->uniformMatrix4x2fv(location, count, transpose, value);
>         }
>     }
> }
> 
>-void GL_APIENTRY ResumeTransformFeedback()
>+void GL_APIENTRY UniformMatrix4x3fv(GLint location,
>+                                    GLsizei count,
>+                                    GLboolean transpose,
>+                                    const GLfloat *value)
> {
>-    EVENT("()");
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLint location = %d, GLsizei count = %d, GLboolean transpose = %u, const GLfloat *value "
>+        "= 0x%016" PRIxPTR ")",
>+        location, count, transpose, (uintptr_t)value);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::ResumeTransformFeedback>();
>-
>-        if (context->skipValidation() || ValidateResumeTransformFeedback(context))
>+        if (context->skipValidation() ||
>+            ValidateUniformMatrix4x3fv(context, location, count, transpose, value))
>         {
>-            context->resumeTransformFeedback();
>+            context->uniformMatrix4x3fv(location, count, transpose, value);
>         }
>     }
> }
> 
>-void GL_APIENTRY GetProgramBinary(GLuint program,
>-                                  GLsizei bufSize,
>-                                  GLsizei *length,
>-                                  GLenum *binaryFormat,
>-                                  void *binary)
>+GLboolean GL_APIENTRY UnmapBuffer(GLenum target)
> {
>-    EVENT(
>-        "(GLuint program = %u, GLsizei bufSize = %d, GLsizei *length = 0x%0.8p, GLenum "
>-        "*binaryFormat = 0x%0.8p, void *binary = 0x%0.8p)",
>-        program, bufSize, length, binaryFormat, binary);
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum target = 0x%X)", target);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::GetProgramBinary>(program, bufSize, length, binaryFormat,
>-                                                            binary);
>-
>-        if (context->skipValidation() ||
>-            ValidateGetProgramBinary(context, program, bufSize, length, binaryFormat, binary))
>+        BufferBinding targetPacked = FromGLenum<BufferBinding>(target);
>+        if (context->skipValidation() || ValidateUnmapBuffer(context, targetPacked))
>         {
>-            context->getProgramBinary(program, bufSize, length, binaryFormat, binary);
>+            return context->unmapBuffer(targetPacked);
>         }
>     }
>+
>+    return GetDefaultReturnValue<EntryPoint::UnmapBuffer, GLboolean>();
> }
> 
>-void GL_APIENTRY ProgramBinary(GLuint program,
>-                               GLenum binaryFormat,
>-                               const void *binary,
>-                               GLsizei length)
>+void GL_APIENTRY VertexAttribDivisor(GLuint index, GLuint divisor)
> {
>-    EVENT(
>-        "(GLuint program = %u, GLenum binaryFormat = 0x%X, const void *binary = 0x%0.8p, GLsizei "
>-        "length = %d)",
>-        program, binaryFormat, binary, length);
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint index = %u, GLuint divisor = %u)", index, divisor);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::ProgramBinary>(program, binaryFormat, binary, length);
>-
>-        if (context->skipValidation() ||
>-            ValidateProgramBinary(context, program, binaryFormat, binary, length))
>+        if (context->skipValidation() || ValidateVertexAttribDivisor(context, index, divisor))
>         {
>-            context->programBinary(program, binaryFormat, binary, length);
>+            context->vertexAttribDivisor(index, divisor);
>         }
>     }
> }
> 
>-void GL_APIENTRY ProgramParameteri(GLuint program, GLenum pname, GLint value)
>+void GL_APIENTRY VertexAttribI4i(GLuint index, GLint x, GLint y, GLint z, GLint w)
> {
>-    EVENT("(GLuint program = %u, GLenum pname = 0x%X, GLint value = %d)", program, pname, value);
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint index = %u, GLint x = %d, GLint y = %d, GLint z = %d, GLint w = %d)", index, x,
>+          y, z, w);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::ProgramParameteri>(program, pname, value);
>-
>-        if (context->skipValidation() || ValidateProgramParameteri(context, program, pname, value))
>+        if (context->skipValidation() || ValidateVertexAttribI4i(context, index, x, y, z, w))
>         {
>-            context->programParameteri(program, pname, value);
>+            context->vertexAttribI4i(index, x, y, z, w);
>         }
>     }
> }
> 
>-void GL_APIENTRY InvalidateFramebuffer(GLenum target,
>-                                       GLsizei numAttachments,
>-                                       const GLenum *attachments)
>+void GL_APIENTRY VertexAttribI4iv(GLuint index, const GLint *v)
> {
>-    EVENT(
>-        "(GLenum target = 0x%X, GLsizei numAttachments = %d, const GLenum *attachments = 0x%0.8p)",
>-        target, numAttachments, attachments);
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint index = %u, const GLint *v = 0x%016" PRIxPTR ")", index, (uintptr_t)v);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::InvalidateFramebuffer>(target, numAttachments,
>-                                                                 attachments);
>-
>-        if (context->skipValidation() ||
>-            ValidateInvalidateFramebuffer(context, target, numAttachments, attachments))
>+        if (context->skipValidation() || ValidateVertexAttribI4iv(context, index, v))
>         {
>-            context->invalidateFramebuffer(target, numAttachments, attachments);
>+            context->vertexAttribI4iv(index, v);
>         }
>     }
> }
> 
>-void GL_APIENTRY InvalidateSubFramebuffer(GLenum target,
>-                                          GLsizei numAttachments,
>-                                          const GLenum *attachments,
>-                                          GLint x,
>-                                          GLint y,
>-                                          GLsizei width,
>-                                          GLsizei height)
>+void GL_APIENTRY VertexAttribI4ui(GLuint index, GLuint x, GLuint y, GLuint z, GLuint w)
> {
>-    EVENT(
>-        "(GLenum target = 0x%X, GLsizei numAttachments = %d, const GLenum *attachments = 0x%0.8p, "
>-        "GLint x = %d, GLint y = %d, GLsizei width = %d, GLsizei height = %d)",
>-        target, numAttachments, attachments, x, y, width, height);
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint index = %u, GLuint x = %u, GLuint y = %u, GLuint z = %u, GLuint w = %u)", index,
>+          x, y, z, w);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::InvalidateSubFramebuffer>(
>-            target, numAttachments, attachments, x, y, width, height);
>-
>-        if (context->skipValidation() ||
>-            ValidateInvalidateSubFramebuffer(context, target, numAttachments, attachments, x, y,
>-                                             width, height))
>+        if (context->skipValidation() || ValidateVertexAttribI4ui(context, index, x, y, z, w))
>         {
>-            context->invalidateSubFramebuffer(target, numAttachments, attachments, x, y, width,
>-                                              height);
>+            context->vertexAttribI4ui(index, x, y, z, w);
>         }
>     }
> }
> 
>-void GL_APIENTRY
>-TexStorage2D(GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height)
>+void GL_APIENTRY VertexAttribI4uiv(GLuint index, const GLuint *v)
> {
>-    EVENT(
>-        "(GLenum target = 0x%X, GLsizei levels = %d, GLenum internalformat = 0x%X, GLsizei width = "
>-        "%d, GLsizei height = %d)",
>-        target, levels, internalformat, width, height);
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint index = %u, const GLuint *v = 0x%016" PRIxPTR ")", index, (uintptr_t)v);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::TexStorage2D>(target, levels, internalformat, width,
>-                                                        height);
>-
>-        if (context->skipValidation() ||
>-            ValidateTexStorage2D(context, target, levels, internalformat, width, height))
>+        if (context->skipValidation() || ValidateVertexAttribI4uiv(context, index, v))
>         {
>-            context->texStorage2D(target, levels, internalformat, width, height);
>+            context->vertexAttribI4uiv(index, v);
>         }
>     }
> }
> 
>-void GL_APIENTRY TexStorage3D(GLenum target,
>-                              GLsizei levels,
>-                              GLenum internalformat,
>-                              GLsizei width,
>-                              GLsizei height,
>-                              GLsizei depth)
>+void GL_APIENTRY
>+VertexAttribIPointer(GLuint index, GLint size, GLenum type, GLsizei stride, const void *pointer)
> {
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>     EVENT(
>-        "(GLenum target = 0x%X, GLsizei levels = %d, GLenum internalformat = 0x%X, GLsizei width = "
>-        "%d, GLsizei height = %d, GLsizei depth = %d)",
>-        target, levels, internalformat, width, height, depth);
>+        "(GLuint index = %u, GLint size = %d, GLenum type = 0x%X, GLsizei stride = %d, const void "
>+        "*pointer = 0x%016" PRIxPTR ")",
>+        index, size, type, stride, (uintptr_t)pointer);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::TexStorage3D>(target, levels, internalformat, width,
>-                                                        height, depth);
>-
>+        VertexAttribType typePacked = FromGLenum<VertexAttribType>(type);
>         if (context->skipValidation() ||
>-            ValidateTexStorage3D(context, target, levels, internalformat, width, height, depth))
>+            ValidateVertexAttribIPointer(context, index, size, typePacked, stride, pointer))
>         {
>-            context->texStorage3D(target, levels, internalformat, width, height, depth);
>+            context->vertexAttribIPointer(index, size, typePacked, stride, pointer);
>         }
>     }
> }
> 
>-void GL_APIENTRY GetInternalformativ(GLenum target,
>-                                     GLenum internalformat,
>-                                     GLenum pname,
>-                                     GLsizei bufSize,
>-                                     GLint *params)
>+void GL_APIENTRY WaitSync(GLsync sync, GLbitfield flags, GLuint64 timeout)
> {
>-    EVENT(
>-        "(GLenum target = 0x%X, GLenum internalformat = 0x%X, GLenum pname = 0x%X, GLsizei bufSize "
>-        "= %d, GLint *params = 0x%0.8p)",
>-        target, internalformat, pname, bufSize, params);
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLsync sync = 0x%016" PRIxPTR ", GLbitfield flags = 0x%X, GLuint64 timeout = %llu)",
>+          (uintptr_t)sync, flags, static_cast<unsigned long long>(timeout));
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::GetInternalformativ>(target, internalformat, pname,
>-                                                               bufSize, params);
>-
>-        if (context->skipValidation() ||
>-            ValidateGetInternalformativ(context, target, internalformat, pname, bufSize, params))
>+        if (context->skipValidation() || ValidateWaitSync(context, sync, flags, timeout))
>         {
>-            context->getInternalformativ(target, internalformat, pname, bufSize, params);
>+            context->waitSync(sync, flags, timeout);
>         }
>     }
> }
>diff --git a/Source/ThirdParty/ANGLE/src/libGLESv2/entry_points_gles_3_0_autogen.h b/Source/ThirdParty/ANGLE/src/libGLESv2/entry_points_gles_3_0_autogen.h
>index e93dde96ed0..6c12fa80baa 100644
>--- a/Source/ThirdParty/ANGLE/src/libGLESv2/entry_points_gles_3_0_autogen.h
>+++ b/Source/ThirdParty/ANGLE/src/libGLESv2/entry_points_gles_3_0_autogen.h
>@@ -1,58 +1,47 @@
> // GENERATED FILE - DO NOT EDIT.
> // Generated by generate_entry_points.py using data from gl.xml.
> //
>-// Copyright 2017 The ANGLE Project Authors. All rights reserved.
>+// Copyright 2019 The ANGLE Project Authors. All rights reserved.
> // Use of this source code is governed by a BSD-style license that can be
> // found in the LICENSE file.
> //
> // entry_points_gles_3_0_autogen.h:
> //   Defines the GLES 3.0 entry points.
> 
>-#ifndef LIBGLESV2_ENTRYPOINTSGLES30_AUTOGEN_H_
>-#define LIBGLESV2_ENTRYPOINTSGLES30_AUTOGEN_H_
>+#ifndef LIBGLESV2_ENTRY_POINTS_GLES_3_0_AUTOGEN_H_
>+#define LIBGLESV2_ENTRY_POINTS_GLES_3_0_AUTOGEN_H_
> 
> #include <GLES3/gl3.h>
> #include <export.h>
> 
> namespace gl
> {
>-ANGLE_EXPORT void GL_APIENTRY ReadBuffer(GLenum src);
>-ANGLE_EXPORT void GL_APIENTRY DrawRangeElements(GLenum mode,
>-                                                GLuint start,
>-                                                GLuint end,
>-                                                GLsizei count,
>-                                                GLenum type,
>-                                                const void *indices);
>-ANGLE_EXPORT void GL_APIENTRY TexImage3D(GLenum target,
>-                                         GLint level,
>-                                         GLint internalformat,
>-                                         GLsizei width,
>-                                         GLsizei height,
>-                                         GLsizei depth,
>-                                         GLint border,
>-                                         GLenum format,
>-                                         GLenum type,
>-                                         const void *pixels);
>-ANGLE_EXPORT void GL_APIENTRY TexSubImage3D(GLenum target,
>-                                            GLint level,
>-                                            GLint xoffset,
>-                                            GLint yoffset,
>-                                            GLint zoffset,
>-                                            GLsizei width,
>-                                            GLsizei height,
>-                                            GLsizei depth,
>-                                            GLenum format,
>-                                            GLenum type,
>-                                            const void *pixels);
>-ANGLE_EXPORT void GL_APIENTRY CopyTexSubImage3D(GLenum target,
>-                                                GLint level,
>-                                                GLint xoffset,
>-                                                GLint yoffset,
>-                                                GLint zoffset,
>-                                                GLint x,
>-                                                GLint y,
>-                                                GLsizei width,
>-                                                GLsizei height);
>+ANGLE_EXPORT void GL_APIENTRY BeginQuery(GLenum target, GLuint id);
>+ANGLE_EXPORT void GL_APIENTRY BeginTransformFeedback(GLenum primitiveMode);
>+ANGLE_EXPORT void GL_APIENTRY BindBufferBase(GLenum target, GLuint index, GLuint buffer);
>+ANGLE_EXPORT void GL_APIENTRY
>+BindBufferRange(GLenum target, GLuint index, GLuint buffer, GLintptr offset, GLsizeiptr size);
>+ANGLE_EXPORT void GL_APIENTRY BindSampler(GLuint unit, GLuint sampler);
>+ANGLE_EXPORT void GL_APIENTRY BindTransformFeedback(GLenum target, GLuint id);
>+ANGLE_EXPORT void GL_APIENTRY BindVertexArray(GLuint array);
>+ANGLE_EXPORT void GL_APIENTRY BlitFramebuffer(GLint srcX0,
>+                                              GLint srcY0,
>+                                              GLint srcX1,
>+                                              GLint srcY1,
>+                                              GLint dstX0,
>+                                              GLint dstY0,
>+                                              GLint dstX1,
>+                                              GLint dstY1,
>+                                              GLbitfield mask,
>+                                              GLenum filter);
>+ANGLE_EXPORT void GL_APIENTRY ClearBufferfi(GLenum buffer,
>+                                            GLint drawbuffer,
>+                                            GLfloat depth,
>+                                            GLint stencil);
>+ANGLE_EXPORT void GL_APIENTRY ClearBufferfv(GLenum buffer, GLint drawbuffer, const GLfloat *value);
>+ANGLE_EXPORT void GL_APIENTRY ClearBufferiv(GLenum buffer, GLint drawbuffer, const GLint *value);
>+ANGLE_EXPORT void GL_APIENTRY ClearBufferuiv(GLenum buffer, GLint drawbuffer, const GLuint *value);
>+ANGLE_EXPORT GLenum GL_APIENTRY ClientWaitSync(GLsync sync, GLbitfield flags, GLuint64 timeout);
> ANGLE_EXPORT void GL_APIENTRY CompressedTexImage3D(GLenum target,
>                                                    GLint level,
>                                                    GLenum internalformat,
>@@ -73,189 +62,106 @@ ANGLE_EXPORT void GL_APIENTRY CompressedTexSubImage3D(GLenum target,
>                                                       GLenum format,
>                                                       GLsizei imageSize,
>                                                       const void *data);
>-ANGLE_EXPORT void GL_APIENTRY GenQueries(GLsizei n, GLuint *ids);
>-ANGLE_EXPORT void GL_APIENTRY DeleteQueries(GLsizei n, const GLuint *ids);
>-ANGLE_EXPORT GLboolean GL_APIENTRY IsQuery(GLuint id);
>-ANGLE_EXPORT void GL_APIENTRY BeginQuery(GLenum target, GLuint id);
>-ANGLE_EXPORT void GL_APIENTRY EndQuery(GLenum target);
>-ANGLE_EXPORT void GL_APIENTRY GetQueryiv(GLenum target, GLenum pname, GLint *params);
>-ANGLE_EXPORT void GL_APIENTRY GetQueryObjectuiv(GLuint id, GLenum pname, GLuint *params);
>-ANGLE_EXPORT GLboolean GL_APIENTRY UnmapBuffer(GLenum target);
>-ANGLE_EXPORT void GL_APIENTRY GetBufferPointerv(GLenum target, GLenum pname, void **params);
>-ANGLE_EXPORT void GL_APIENTRY DrawBuffers(GLsizei n, const GLenum *bufs);
>-ANGLE_EXPORT void GL_APIENTRY UniformMatrix2x3fv(GLint location,
>-                                                 GLsizei count,
>-                                                 GLboolean transpose,
>-                                                 const GLfloat *value);
>-ANGLE_EXPORT void GL_APIENTRY UniformMatrix3x2fv(GLint location,
>-                                                 GLsizei count,
>-                                                 GLboolean transpose,
>-                                                 const GLfloat *value);
>-ANGLE_EXPORT void GL_APIENTRY UniformMatrix2x4fv(GLint location,
>-                                                 GLsizei count,
>-                                                 GLboolean transpose,
>-                                                 const GLfloat *value);
>-ANGLE_EXPORT void GL_APIENTRY UniformMatrix4x2fv(GLint location,
>-                                                 GLsizei count,
>-                                                 GLboolean transpose,
>-                                                 const GLfloat *value);
>-ANGLE_EXPORT void GL_APIENTRY UniformMatrix3x4fv(GLint location,
>-                                                 GLsizei count,
>-                                                 GLboolean transpose,
>-                                                 const GLfloat *value);
>-ANGLE_EXPORT void GL_APIENTRY UniformMatrix4x3fv(GLint location,
>-                                                 GLsizei count,
>-                                                 GLboolean transpose,
>-                                                 const GLfloat *value);
>-ANGLE_EXPORT void GL_APIENTRY BlitFramebuffer(GLint srcX0,
>-                                              GLint srcY0,
>-                                              GLint srcX1,
>-                                              GLint srcY1,
>-                                              GLint dstX0,
>-                                              GLint dstY0,
>-                                              GLint dstX1,
>-                                              GLint dstY1,
>-                                              GLbitfield mask,
>-                                              GLenum filter);
>-ANGLE_EXPORT void GL_APIENTRY RenderbufferStorageMultisample(GLenum target,
>-                                                             GLsizei samples,
>-                                                             GLenum internalformat,
>-                                                             GLsizei width,
>-                                                             GLsizei height);
>-ANGLE_EXPORT void GL_APIENTRY
>-FramebufferTextureLayer(GLenum target, GLenum attachment, GLuint texture, GLint level, GLint layer);
>-ANGLE_EXPORT void *GL_APIENTRY MapBufferRange(GLenum target,
>-                                              GLintptr offset,
>-                                              GLsizeiptr length,
>-                                              GLbitfield access);
>-ANGLE_EXPORT void GL_APIENTRY FlushMappedBufferRange(GLenum target,
>-                                                     GLintptr offset,
>-                                                     GLsizeiptr length);
>-ANGLE_EXPORT void GL_APIENTRY BindVertexArray(GLuint array);
>-ANGLE_EXPORT void GL_APIENTRY DeleteVertexArrays(GLsizei n, const GLuint *arrays);
>-ANGLE_EXPORT void GL_APIENTRY GenVertexArrays(GLsizei n, GLuint *arrays);
>-ANGLE_EXPORT GLboolean GL_APIENTRY IsVertexArray(GLuint array);
>-ANGLE_EXPORT void GL_APIENTRY GetIntegeri_v(GLenum target, GLuint index, GLint *data);
>-ANGLE_EXPORT void GL_APIENTRY BeginTransformFeedback(GLenum primitiveMode);
>-ANGLE_EXPORT void GL_APIENTRY EndTransformFeedback();
>-ANGLE_EXPORT void GL_APIENTRY
>-BindBufferRange(GLenum target, GLuint index, GLuint buffer, GLintptr offset, GLsizeiptr size);
>-ANGLE_EXPORT void GL_APIENTRY BindBufferBase(GLenum target, GLuint index, GLuint buffer);
>-ANGLE_EXPORT void GL_APIENTRY TransformFeedbackVaryings(GLuint program,
>-                                                        GLsizei count,
>-                                                        const GLchar *const *varyings,
>-                                                        GLenum bufferMode);
>-ANGLE_EXPORT void GL_APIENTRY GetTransformFeedbackVarying(GLuint program,
>-                                                          GLuint index,
>-                                                          GLsizei bufSize,
>-                                                          GLsizei *length,
>-                                                          GLsizei *size,
>-                                                          GLenum *type,
>-                                                          GLchar *name);
>-ANGLE_EXPORT void GL_APIENTRY
>-VertexAttribIPointer(GLuint index, GLint size, GLenum type, GLsizei stride, const void *pointer);
>-ANGLE_EXPORT void GL_APIENTRY GetVertexAttribIiv(GLuint index, GLenum pname, GLint *params);
>-ANGLE_EXPORT void GL_APIENTRY GetVertexAttribIuiv(GLuint index, GLenum pname, GLuint *params);
>-ANGLE_EXPORT void GL_APIENTRY VertexAttribI4i(GLuint index, GLint x, GLint y, GLint z, GLint w);
>-ANGLE_EXPORT void GL_APIENTRY
>-VertexAttribI4ui(GLuint index, GLuint x, GLuint y, GLuint z, GLuint w);
>-ANGLE_EXPORT void GL_APIENTRY VertexAttribI4iv(GLuint index, const GLint *v);
>-ANGLE_EXPORT void GL_APIENTRY VertexAttribI4uiv(GLuint index, const GLuint *v);
>-ANGLE_EXPORT void GL_APIENTRY GetUniformuiv(GLuint program, GLint location, GLuint *params);
>-ANGLE_EXPORT GLint GL_APIENTRY GetFragDataLocation(GLuint program, const GLchar *name);
>-ANGLE_EXPORT void GL_APIENTRY Uniform1ui(GLint location, GLuint v0);
>-ANGLE_EXPORT void GL_APIENTRY Uniform2ui(GLint location, GLuint v0, GLuint v1);
>-ANGLE_EXPORT void GL_APIENTRY Uniform3ui(GLint location, GLuint v0, GLuint v1, GLuint v2);
>-ANGLE_EXPORT void GL_APIENTRY
>-Uniform4ui(GLint location, GLuint v0, GLuint v1, GLuint v2, GLuint v3);
>-ANGLE_EXPORT void GL_APIENTRY Uniform1uiv(GLint location, GLsizei count, const GLuint *value);
>-ANGLE_EXPORT void GL_APIENTRY Uniform2uiv(GLint location, GLsizei count, const GLuint *value);
>-ANGLE_EXPORT void GL_APIENTRY Uniform3uiv(GLint location, GLsizei count, const GLuint *value);
>-ANGLE_EXPORT void GL_APIENTRY Uniform4uiv(GLint location, GLsizei count, const GLuint *value);
>-ANGLE_EXPORT void GL_APIENTRY ClearBufferiv(GLenum buffer, GLint drawbuffer, const GLint *value);
>-ANGLE_EXPORT void GL_APIENTRY ClearBufferuiv(GLenum buffer, GLint drawbuffer, const GLuint *value);
>-ANGLE_EXPORT void GL_APIENTRY ClearBufferfv(GLenum buffer, GLint drawbuffer, const GLfloat *value);
>-ANGLE_EXPORT void GL_APIENTRY ClearBufferfi(GLenum buffer,
>-                                            GLint drawbuffer,
>-                                            GLfloat depth,
>-                                            GLint stencil);
>-ANGLE_EXPORT const GLubyte *GL_APIENTRY GetStringi(GLenum name, GLuint index);
> ANGLE_EXPORT void GL_APIENTRY CopyBufferSubData(GLenum readTarget,
>                                                 GLenum writeTarget,
>                                                 GLintptr readOffset,
>                                                 GLintptr writeOffset,
>                                                 GLsizeiptr size);
>-ANGLE_EXPORT void GL_APIENTRY GetUniformIndices(GLuint program,
>-                                                GLsizei uniformCount,
>-                                                const GLchar *const *uniformNames,
>-                                                GLuint *uniformIndices);
>-ANGLE_EXPORT void GL_APIENTRY GetActiveUniformsiv(GLuint program,
>-                                                  GLsizei uniformCount,
>-                                                  const GLuint *uniformIndices,
>-                                                  GLenum pname,
>-                                                  GLint *params);
>-ANGLE_EXPORT GLuint GL_APIENTRY GetUniformBlockIndex(GLuint program,
>-                                                     const GLchar *uniformBlockName);
>-ANGLE_EXPORT void GL_APIENTRY GetActiveUniformBlockiv(GLuint program,
>-                                                      GLuint uniformBlockIndex,
>-                                                      GLenum pname,
>-                                                      GLint *params);
>-ANGLE_EXPORT void GL_APIENTRY GetActiveUniformBlockName(GLuint program,
>-                                                        GLuint uniformBlockIndex,
>-                                                        GLsizei bufSize,
>-                                                        GLsizei *length,
>-                                                        GLchar *uniformBlockName);
>-ANGLE_EXPORT void GL_APIENTRY UniformBlockBinding(GLuint program,
>-                                                  GLuint uniformBlockIndex,
>-                                                  GLuint uniformBlockBinding);
>+ANGLE_EXPORT void GL_APIENTRY CopyTexSubImage3D(GLenum target,
>+                                                GLint level,
>+                                                GLint xoffset,
>+                                                GLint yoffset,
>+                                                GLint zoffset,
>+                                                GLint x,
>+                                                GLint y,
>+                                                GLsizei width,
>+                                                GLsizei height);
>+ANGLE_EXPORT void GL_APIENTRY DeleteQueries(GLsizei n, const GLuint *ids);
>+ANGLE_EXPORT void GL_APIENTRY DeleteSamplers(GLsizei count, const GLuint *samplers);
>+ANGLE_EXPORT void GL_APIENTRY DeleteSync(GLsync sync);
>+ANGLE_EXPORT void GL_APIENTRY DeleteTransformFeedbacks(GLsizei n, const GLuint *ids);
>+ANGLE_EXPORT void GL_APIENTRY DeleteVertexArrays(GLsizei n, const GLuint *arrays);
> ANGLE_EXPORT void GL_APIENTRY DrawArraysInstanced(GLenum mode,
>                                                   GLint first,
>                                                   GLsizei count,
>                                                   GLsizei instancecount);
>+ANGLE_EXPORT void GL_APIENTRY DrawBuffers(GLsizei n, const GLenum *bufs);
> ANGLE_EXPORT void GL_APIENTRY DrawElementsInstanced(GLenum mode,
>                                                     GLsizei count,
>                                                     GLenum type,
>                                                     const void *indices,
>                                                     GLsizei instancecount);
>+ANGLE_EXPORT void GL_APIENTRY DrawRangeElements(GLenum mode,
>+                                                GLuint start,
>+                                                GLuint end,
>+                                                GLsizei count,
>+                                                GLenum type,
>+                                                const void *indices);
>+ANGLE_EXPORT void GL_APIENTRY EndQuery(GLenum target);
>+ANGLE_EXPORT void GL_APIENTRY EndTransformFeedback();
> ANGLE_EXPORT GLsync GL_APIENTRY FenceSync(GLenum condition, GLbitfield flags);
>-ANGLE_EXPORT GLboolean GL_APIENTRY IsSync(GLsync sync);
>-ANGLE_EXPORT void GL_APIENTRY DeleteSync(GLsync sync);
>-ANGLE_EXPORT GLenum GL_APIENTRY ClientWaitSync(GLsync sync, GLbitfield flags, GLuint64 timeout);
>-ANGLE_EXPORT void GL_APIENTRY WaitSync(GLsync sync, GLbitfield flags, GLuint64 timeout);
>-ANGLE_EXPORT void GL_APIENTRY GetInteger64v(GLenum pname, GLint64 *data);
>+ANGLE_EXPORT void GL_APIENTRY FlushMappedBufferRange(GLenum target,
>+                                                     GLintptr offset,
>+                                                     GLsizeiptr length);
> ANGLE_EXPORT void GL_APIENTRY
>-GetSynciv(GLsync sync, GLenum pname, GLsizei bufSize, GLsizei *length, GLint *values);
>-ANGLE_EXPORT void GL_APIENTRY GetInteger64i_v(GLenum target, GLuint index, GLint64 *data);
>-ANGLE_EXPORT void GL_APIENTRY GetBufferParameteri64v(GLenum target, GLenum pname, GLint64 *params);
>+FramebufferTextureLayer(GLenum target, GLenum attachment, GLuint texture, GLint level, GLint layer);
>+ANGLE_EXPORT void GL_APIENTRY GenQueries(GLsizei n, GLuint *ids);
> ANGLE_EXPORT void GL_APIENTRY GenSamplers(GLsizei count, GLuint *samplers);
>-ANGLE_EXPORT void GL_APIENTRY DeleteSamplers(GLsizei count, const GLuint *samplers);
>-ANGLE_EXPORT GLboolean GL_APIENTRY IsSampler(GLuint sampler);
>-ANGLE_EXPORT void GL_APIENTRY BindSampler(GLuint unit, GLuint sampler);
>-ANGLE_EXPORT void GL_APIENTRY SamplerParameteri(GLuint sampler, GLenum pname, GLint param);
>-ANGLE_EXPORT void GL_APIENTRY SamplerParameteriv(GLuint sampler, GLenum pname, const GLint *param);
>-ANGLE_EXPORT void GL_APIENTRY SamplerParameterf(GLuint sampler, GLenum pname, GLfloat param);
>-ANGLE_EXPORT void GL_APIENTRY SamplerParameterfv(GLuint sampler,
>-                                                 GLenum pname,
>-                                                 const GLfloat *param);
>-ANGLE_EXPORT void GL_APIENTRY GetSamplerParameteriv(GLuint sampler, GLenum pname, GLint *params);
>-ANGLE_EXPORT void GL_APIENTRY GetSamplerParameterfv(GLuint sampler, GLenum pname, GLfloat *params);
>-ANGLE_EXPORT void GL_APIENTRY VertexAttribDivisor(GLuint index, GLuint divisor);
>-ANGLE_EXPORT void GL_APIENTRY BindTransformFeedback(GLenum target, GLuint id);
>-ANGLE_EXPORT void GL_APIENTRY DeleteTransformFeedbacks(GLsizei n, const GLuint *ids);
> ANGLE_EXPORT void GL_APIENTRY GenTransformFeedbacks(GLsizei n, GLuint *ids);
>-ANGLE_EXPORT GLboolean GL_APIENTRY IsTransformFeedback(GLuint id);
>-ANGLE_EXPORT void GL_APIENTRY PauseTransformFeedback();
>-ANGLE_EXPORT void GL_APIENTRY ResumeTransformFeedback();
>+ANGLE_EXPORT void GL_APIENTRY GenVertexArrays(GLsizei n, GLuint *arrays);
>+ANGLE_EXPORT void GL_APIENTRY GetActiveUniformBlockName(GLuint program,
>+                                                        GLuint uniformBlockIndex,
>+                                                        GLsizei bufSize,
>+                                                        GLsizei *length,
>+                                                        GLchar *uniformBlockName);
>+ANGLE_EXPORT void GL_APIENTRY GetActiveUniformBlockiv(GLuint program,
>+                                                      GLuint uniformBlockIndex,
>+                                                      GLenum pname,
>+                                                      GLint *params);
>+ANGLE_EXPORT void GL_APIENTRY GetActiveUniformsiv(GLuint program,
>+                                                  GLsizei uniformCount,
>+                                                  const GLuint *uniformIndices,
>+                                                  GLenum pname,
>+                                                  GLint *params);
>+ANGLE_EXPORT void GL_APIENTRY GetBufferParameteri64v(GLenum target, GLenum pname, GLint64 *params);
>+ANGLE_EXPORT void GL_APIENTRY GetBufferPointerv(GLenum target, GLenum pname, void **params);
>+ANGLE_EXPORT GLint GL_APIENTRY GetFragDataLocation(GLuint program, const GLchar *name);
>+ANGLE_EXPORT void GL_APIENTRY GetInteger64i_v(GLenum target, GLuint index, GLint64 *data);
>+ANGLE_EXPORT void GL_APIENTRY GetInteger64v(GLenum pname, GLint64 *data);
>+ANGLE_EXPORT void GL_APIENTRY GetIntegeri_v(GLenum target, GLuint index, GLint *data);
>+ANGLE_EXPORT void GL_APIENTRY GetInternalformativ(GLenum target,
>+                                                  GLenum internalformat,
>+                                                  GLenum pname,
>+                                                  GLsizei bufSize,
>+                                                  GLint *params);
> ANGLE_EXPORT void GL_APIENTRY GetProgramBinary(GLuint program,
>                                                GLsizei bufSize,
>                                                GLsizei *length,
>                                                GLenum *binaryFormat,
>                                                void *binary);
>-ANGLE_EXPORT void GL_APIENTRY ProgramBinary(GLuint program,
>-                                            GLenum binaryFormat,
>-                                            const void *binary,
>-                                            GLsizei length);
>-ANGLE_EXPORT void GL_APIENTRY ProgramParameteri(GLuint program, GLenum pname, GLint value);
>+ANGLE_EXPORT void GL_APIENTRY GetQueryObjectuiv(GLuint id, GLenum pname, GLuint *params);
>+ANGLE_EXPORT void GL_APIENTRY GetQueryiv(GLenum target, GLenum pname, GLint *params);
>+ANGLE_EXPORT void GL_APIENTRY GetSamplerParameterfv(GLuint sampler, GLenum pname, GLfloat *params);
>+ANGLE_EXPORT void GL_APIENTRY GetSamplerParameteriv(GLuint sampler, GLenum pname, GLint *params);
>+ANGLE_EXPORT const GLubyte *GL_APIENTRY GetStringi(GLenum name, GLuint index);
>+ANGLE_EXPORT void GL_APIENTRY
>+GetSynciv(GLsync sync, GLenum pname, GLsizei bufSize, GLsizei *length, GLint *values);
>+ANGLE_EXPORT void GL_APIENTRY GetTransformFeedbackVarying(GLuint program,
>+                                                          GLuint index,
>+                                                          GLsizei bufSize,
>+                                                          GLsizei *length,
>+                                                          GLsizei *size,
>+                                                          GLenum *type,
>+                                                          GLchar *name);
>+ANGLE_EXPORT GLuint GL_APIENTRY GetUniformBlockIndex(GLuint program,
>+                                                     const GLchar *uniformBlockName);
>+ANGLE_EXPORT void GL_APIENTRY GetUniformIndices(GLuint program,
>+                                                GLsizei uniformCount,
>+                                                const GLchar *const *uniformNames,
>+                                                GLuint *uniformIndices);
>+ANGLE_EXPORT void GL_APIENTRY GetUniformuiv(GLuint program, GLint location, GLuint *params);
>+ANGLE_EXPORT void GL_APIENTRY GetVertexAttribIiv(GLuint index, GLenum pname, GLint *params);
>+ANGLE_EXPORT void GL_APIENTRY GetVertexAttribIuiv(GLuint index, GLenum pname, GLuint *params);
> ANGLE_EXPORT void GL_APIENTRY InvalidateFramebuffer(GLenum target,
>                                                     GLsizei numAttachments,
>                                                     const GLenum *attachments);
>@@ -266,6 +172,44 @@ ANGLE_EXPORT void GL_APIENTRY InvalidateSubFramebuffer(GLenum target,
>                                                        GLint y,
>                                                        GLsizei width,
>                                                        GLsizei height);
>+ANGLE_EXPORT GLboolean GL_APIENTRY IsQuery(GLuint id);
>+ANGLE_EXPORT GLboolean GL_APIENTRY IsSampler(GLuint sampler);
>+ANGLE_EXPORT GLboolean GL_APIENTRY IsSync(GLsync sync);
>+ANGLE_EXPORT GLboolean GL_APIENTRY IsTransformFeedback(GLuint id);
>+ANGLE_EXPORT GLboolean GL_APIENTRY IsVertexArray(GLuint array);
>+ANGLE_EXPORT void *GL_APIENTRY MapBufferRange(GLenum target,
>+                                              GLintptr offset,
>+                                              GLsizeiptr length,
>+                                              GLbitfield access);
>+ANGLE_EXPORT void GL_APIENTRY PauseTransformFeedback();
>+ANGLE_EXPORT void GL_APIENTRY ProgramBinary(GLuint program,
>+                                            GLenum binaryFormat,
>+                                            const void *binary,
>+                                            GLsizei length);
>+ANGLE_EXPORT void GL_APIENTRY ProgramParameteri(GLuint program, GLenum pname, GLint value);
>+ANGLE_EXPORT void GL_APIENTRY ReadBuffer(GLenum src);
>+ANGLE_EXPORT void GL_APIENTRY RenderbufferStorageMultisample(GLenum target,
>+                                                             GLsizei samples,
>+                                                             GLenum internalformat,
>+                                                             GLsizei width,
>+                                                             GLsizei height);
>+ANGLE_EXPORT void GL_APIENTRY ResumeTransformFeedback();
>+ANGLE_EXPORT void GL_APIENTRY SamplerParameterf(GLuint sampler, GLenum pname, GLfloat param);
>+ANGLE_EXPORT void GL_APIENTRY SamplerParameterfv(GLuint sampler,
>+                                                 GLenum pname,
>+                                                 const GLfloat *param);
>+ANGLE_EXPORT void GL_APIENTRY SamplerParameteri(GLuint sampler, GLenum pname, GLint param);
>+ANGLE_EXPORT void GL_APIENTRY SamplerParameteriv(GLuint sampler, GLenum pname, const GLint *param);
>+ANGLE_EXPORT void GL_APIENTRY TexImage3D(GLenum target,
>+                                         GLint level,
>+                                         GLint internalformat,
>+                                         GLsizei width,
>+                                         GLsizei height,
>+                                         GLsizei depth,
>+                                         GLint border,
>+                                         GLenum format,
>+                                         GLenum type,
>+                                         const void *pixels);
> ANGLE_EXPORT void GL_APIENTRY
> TexStorage2D(GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height);
> ANGLE_EXPORT void GL_APIENTRY TexStorage3D(GLenum target,
>@@ -274,11 +218,67 @@ ANGLE_EXPORT void GL_APIENTRY TexStorage3D(GLenum target,
>                                            GLsizei width,
>                                            GLsizei height,
>                                            GLsizei depth);
>-ANGLE_EXPORT void GL_APIENTRY GetInternalformativ(GLenum target,
>-                                                  GLenum internalformat,
>-                                                  GLenum pname,
>-                                                  GLsizei bufSize,
>-                                                  GLint *params);
>+ANGLE_EXPORT void GL_APIENTRY TexSubImage3D(GLenum target,
>+                                            GLint level,
>+                                            GLint xoffset,
>+                                            GLint yoffset,
>+                                            GLint zoffset,
>+                                            GLsizei width,
>+                                            GLsizei height,
>+                                            GLsizei depth,
>+                                            GLenum format,
>+                                            GLenum type,
>+                                            const void *pixels);
>+ANGLE_EXPORT void GL_APIENTRY TransformFeedbackVaryings(GLuint program,
>+                                                        GLsizei count,
>+                                                        const GLchar *const *varyings,
>+                                                        GLenum bufferMode);
>+ANGLE_EXPORT void GL_APIENTRY Uniform1ui(GLint location, GLuint v0);
>+ANGLE_EXPORT void GL_APIENTRY Uniform1uiv(GLint location, GLsizei count, const GLuint *value);
>+ANGLE_EXPORT void GL_APIENTRY Uniform2ui(GLint location, GLuint v0, GLuint v1);
>+ANGLE_EXPORT void GL_APIENTRY Uniform2uiv(GLint location, GLsizei count, const GLuint *value);
>+ANGLE_EXPORT void GL_APIENTRY Uniform3ui(GLint location, GLuint v0, GLuint v1, GLuint v2);
>+ANGLE_EXPORT void GL_APIENTRY Uniform3uiv(GLint location, GLsizei count, const GLuint *value);
>+ANGLE_EXPORT void GL_APIENTRY
>+Uniform4ui(GLint location, GLuint v0, GLuint v1, GLuint v2, GLuint v3);
>+ANGLE_EXPORT void GL_APIENTRY Uniform4uiv(GLint location, GLsizei count, const GLuint *value);
>+ANGLE_EXPORT void GL_APIENTRY UniformBlockBinding(GLuint program,
>+                                                  GLuint uniformBlockIndex,
>+                                                  GLuint uniformBlockBinding);
>+ANGLE_EXPORT void GL_APIENTRY UniformMatrix2x3fv(GLint location,
>+                                                 GLsizei count,
>+                                                 GLboolean transpose,
>+                                                 const GLfloat *value);
>+ANGLE_EXPORT void GL_APIENTRY UniformMatrix2x4fv(GLint location,
>+                                                 GLsizei count,
>+                                                 GLboolean transpose,
>+                                                 const GLfloat *value);
>+ANGLE_EXPORT void GL_APIENTRY UniformMatrix3x2fv(GLint location,
>+                                                 GLsizei count,
>+                                                 GLboolean transpose,
>+                                                 const GLfloat *value);
>+ANGLE_EXPORT void GL_APIENTRY UniformMatrix3x4fv(GLint location,
>+                                                 GLsizei count,
>+                                                 GLboolean transpose,
>+                                                 const GLfloat *value);
>+ANGLE_EXPORT void GL_APIENTRY UniformMatrix4x2fv(GLint location,
>+                                                 GLsizei count,
>+                                                 GLboolean transpose,
>+                                                 const GLfloat *value);
>+ANGLE_EXPORT void GL_APIENTRY UniformMatrix4x3fv(GLint location,
>+                                                 GLsizei count,
>+                                                 GLboolean transpose,
>+                                                 const GLfloat *value);
>+ANGLE_EXPORT GLboolean GL_APIENTRY UnmapBuffer(GLenum target);
>+ANGLE_EXPORT void GL_APIENTRY VertexAttribDivisor(GLuint index, GLuint divisor);
>+ANGLE_EXPORT void GL_APIENTRY VertexAttribI4i(GLuint index, GLint x, GLint y, GLint z, GLint w);
>+ANGLE_EXPORT void GL_APIENTRY VertexAttribI4iv(GLuint index, const GLint *v);
>+ANGLE_EXPORT void GL_APIENTRY
>+VertexAttribI4ui(GLuint index, GLuint x, GLuint y, GLuint z, GLuint w);
>+ANGLE_EXPORT void GL_APIENTRY VertexAttribI4uiv(GLuint index, const GLuint *v);
>+ANGLE_EXPORT void GL_APIENTRY
>+VertexAttribIPointer(GLuint index, GLint size, GLenum type, GLsizei stride, const void *pointer);
>+ANGLE_EXPORT void GL_APIENTRY WaitSync(GLsync sync, GLbitfield flags, GLuint64 timeout);
> }  // namespace gl
> 
>-#endif  // LIBGLESV2_ENTRYPOINTSGLES30_AUTOGEN_H_
>+#endif  // LIBGLESV2_ENTRY_POINTS_GLES_3_0_AUTOGEN_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libGLESv2/entry_points_gles_3_1_autogen.cpp b/Source/ThirdParty/ANGLE/src/libGLESv2/entry_points_gles_3_1_autogen.cpp
>index 5d836872d6d..fb8ce6d52d2 100644
>--- a/Source/ThirdParty/ANGLE/src/libGLESv2/entry_points_gles_3_1_autogen.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libGLESv2/entry_points_gles_3_1_autogen.cpp
>@@ -1,563 +1,654 @@
> // GENERATED FILE - DO NOT EDIT.
> // Generated by generate_entry_points.py using data from gl.xml.
> //
>-// Copyright 2017 The ANGLE Project Authors. All rights reserved.
>+// Copyright 2019 The ANGLE Project Authors. All rights reserved.
> // Use of this source code is governed by a BSD-style license that can be
> // found in the LICENSE file.
> //
> // entry_points_gles_3_1_autogen.cpp:
> //   Defines the GLES 3.1 entry points.
> 
>+#include "libGLESv2/entry_points_gles_3_1_autogen.h"
>+
> #include "libANGLE/Context.h"
>+#include "libANGLE/Context.inl.h"
> #include "libANGLE/validationES31.h"
>+#include "libGLESv2/entry_points_utils.h"
> #include "libGLESv2/global_state.h"
> 
> namespace gl
> {
>-void GL_APIENTRY DispatchCompute(GLuint num_groups_x, GLuint num_groups_y, GLuint num_groups_z)
>+void GL_APIENTRY ActiveShaderProgram(GLuint pipeline, GLuint program)
> {
>-    EVENT("(GLuint num_groups_x = %u, GLuint num_groups_y = %u, GLuint num_groups_z = %u)",
>-          num_groups_x, num_groups_y, num_groups_z);
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint pipeline = %u, GLuint program = %u)", pipeline, program);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::DispatchCompute>(num_groups_x, num_groups_y,
>-                                                           num_groups_z);
>-
>-        if (context->skipValidation() ||
>-            ValidateDispatchCompute(context, num_groups_x, num_groups_y, num_groups_z))
>+        if (context->skipValidation() || ValidateActiveShaderProgram(context, pipeline, program))
>         {
>-            context->dispatchCompute(num_groups_x, num_groups_y, num_groups_z);
>+            context->activeShaderProgram(pipeline, program);
>         }
>     }
> }
> 
>-void GL_APIENTRY DispatchComputeIndirect(GLintptr indirect)
>+void GL_APIENTRY BindImageTexture(GLuint unit,
>+                                  GLuint texture,
>+                                  GLint level,
>+                                  GLboolean layered,
>+                                  GLint layer,
>+                                  GLenum access,
>+                                  GLenum format)
> {
>-    EVENT("(GLintptr indirect = %d)", indirect);
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLuint unit = %u, GLuint texture = %u, GLint level = %d, GLboolean layered = %u, GLint "
>+        "layer = %d, GLenum access = 0x%X, GLenum format = 0x%X)",
>+        unit, texture, level, layered, layer, access, format);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::DispatchComputeIndirect>(indirect);
>-
>-        if (context->skipValidation() || ValidateDispatchComputeIndirect(context, indirect))
>+        if (context->skipValidation() ||
>+            ValidateBindImageTexture(context, unit, texture, level, layered, layer, access, format))
>         {
>-            context->dispatchComputeIndirect(indirect);
>+            context->bindImageTexture(unit, texture, level, layered, layer, access, format);
>         }
>     }
> }
> 
>-void GL_APIENTRY DrawArraysIndirect(GLenum mode, const void *indirect)
>+void GL_APIENTRY BindProgramPipeline(GLuint pipeline)
> {
>-    EVENT("(GLenum mode = 0x%X, const void *indirect = 0x%0.8p)", mode, indirect);
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint pipeline = %u)", pipeline);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::DrawArraysIndirect>(mode, indirect);
>-
>-        if (context->skipValidation() || ValidateDrawArraysIndirect(context, mode, indirect))
>+        if (context->skipValidation() || ValidateBindProgramPipeline(context, pipeline))
>         {
>-            context->drawArraysIndirect(mode, indirect);
>+            context->bindProgramPipeline(pipeline);
>         }
>     }
> }
> 
>-void GL_APIENTRY DrawElementsIndirect(GLenum mode, GLenum type, const void *indirect)
>+void GL_APIENTRY BindVertexBuffer(GLuint bindingindex,
>+                                  GLuint buffer,
>+                                  GLintptr offset,
>+                                  GLsizei stride)
> {
>-    EVENT("(GLenum mode = 0x%X, GLenum type = 0x%X, const void *indirect = 0x%0.8p)", mode, type,
>-          indirect);
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLuint bindingindex = %u, GLuint buffer = %u, GLintptr offset = %llu, GLsizei stride = "
>+        "%d)",
>+        bindingindex, buffer, static_cast<unsigned long long>(offset), stride);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::DrawElementsIndirect>(mode, type, indirect);
>-
>         if (context->skipValidation() ||
>-            ValidateDrawElementsIndirect(context, mode, type, indirect))
>+            ValidateBindVertexBuffer(context, bindingindex, buffer, offset, stride))
>         {
>-            context->drawElementsIndirect(mode, type, indirect);
>+            context->bindVertexBuffer(bindingindex, buffer, offset, stride);
>         }
>     }
> }
> 
>-void GL_APIENTRY FramebufferParameteri(GLenum target, GLenum pname, GLint param)
>+GLuint GL_APIENTRY CreateShaderProgramv(GLenum type, GLsizei count, const GLchar *const *strings)
> {
>-    EVENT("(GLenum target = 0x%X, GLenum pname = 0x%X, GLint param = %d)", target, pname, param);
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum type = 0x%X, GLsizei count = %d, const GLchar *const*strings = 0x%016" PRIxPTR
>+          ")",
>+          type, count, (uintptr_t)strings);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::FramebufferParameteri>(target, pname, param);
>-
>+        ShaderType typePacked = FromGLenum<ShaderType>(type);
>         if (context->skipValidation() ||
>-            ValidateFramebufferParameteri(context, target, pname, param))
>+            ValidateCreateShaderProgramv(context, typePacked, count, strings))
>         {
>-            context->framebufferParameteri(target, pname, param);
>+            return context->createShaderProgramv(typePacked, count, strings);
>         }
>     }
>+
>+    return GetDefaultReturnValue<EntryPoint::CreateShaderProgramv, GLuint>();
> }
> 
>-void GL_APIENTRY GetFramebufferParameteriv(GLenum target, GLenum pname, GLint *params)
>+void GL_APIENTRY DeleteProgramPipelines(GLsizei n, const GLuint *pipelines)
> {
>-    EVENT("(GLenum target = 0x%X, GLenum pname = 0x%X, GLint *params = 0x%0.8p)", target, pname,
>-          params);
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLsizei n = %d, const GLuint *pipelines = 0x%016" PRIxPTR ")", n, (uintptr_t)pipelines);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::GetFramebufferParameteriv>(target, pname, params);
>-
>-        if (context->skipValidation() ||
>-            ValidateGetFramebufferParameteriv(context, target, pname, params))
>+        if (context->skipValidation() || ValidateDeleteProgramPipelines(context, n, pipelines))
>         {
>-            context->getFramebufferParameteriv(target, pname, params);
>+            context->deleteProgramPipelines(n, pipelines);
>         }
>     }
> }
> 
>-void GL_APIENTRY GetProgramInterfaceiv(GLuint program,
>-                                       GLenum programInterface,
>-                                       GLenum pname,
>-                                       GLint *params)
>+void GL_APIENTRY DispatchCompute(GLuint num_groups_x, GLuint num_groups_y, GLuint num_groups_z)
> {
>-    EVENT(
>-        "(GLuint program = %u, GLenum programInterface = 0x%X, GLenum pname = 0x%X, GLint *params "
>-        "= 0x%0.8p)",
>-        program, programInterface, pname, params);
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint num_groups_x = %u, GLuint num_groups_y = %u, GLuint num_groups_z = %u)",
>+          num_groups_x, num_groups_y, num_groups_z);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::GetProgramInterfaceiv>(program, programInterface, pname,
>-                                                                 params);
>-
>         if (context->skipValidation() ||
>-            ValidateGetProgramInterfaceiv(context, program, programInterface, pname, params))
>+            ValidateDispatchCompute(context, num_groups_x, num_groups_y, num_groups_z))
>         {
>-            context->getProgramInterfaceiv(program, programInterface, pname, params);
>+            context->dispatchCompute(num_groups_x, num_groups_y, num_groups_z);
>         }
>     }
> }
> 
>-GLuint GL_APIENTRY GetProgramResourceIndex(GLuint program,
>-                                           GLenum programInterface,
>-                                           const GLchar *name)
>+void GL_APIENTRY DispatchComputeIndirect(GLintptr indirect)
> {
>-    EVENT("(GLuint program = %u, GLenum programInterface = 0x%X, const GLchar *name = 0x%0.8p)",
>-          program, programInterface, name);
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLintptr indirect = %llu)", static_cast<unsigned long long>(indirect));
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::GetProgramResourceIndex>(program, programInterface, name);
>-
>-        if (context->skipValidation() ||
>-            ValidateGetProgramResourceIndex(context, program, programInterface, name))
>+        if (context->skipValidation() || ValidateDispatchComputeIndirect(context, indirect))
>         {
>-            return context->getProgramResourceIndex(program, programInterface, name);
>+            context->dispatchComputeIndirect(indirect);
>         }
>     }
>-
>-    return GetDefaultReturnValue<EntryPoint::GetProgramResourceIndex, GLuint>();
> }
> 
>-void GL_APIENTRY GetProgramResourceName(GLuint program,
>-                                        GLenum programInterface,
>-                                        GLuint index,
>-                                        GLsizei bufSize,
>-                                        GLsizei *length,
>-                                        GLchar *name)
>+void GL_APIENTRY DrawArraysIndirect(GLenum mode, const void *indirect)
> {
>-    EVENT(
>-        "(GLuint program = %u, GLenum programInterface = 0x%X, GLuint index = %u, GLsizei bufSize "
>-        "= %d, GLsizei *length = 0x%0.8p, GLchar *name = 0x%0.8p)",
>-        program, programInterface, index, bufSize, length, name);
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum mode = 0x%X, const void *indirect = 0x%016" PRIxPTR ")", mode,
>+          (uintptr_t)indirect);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::GetProgramResourceName>(program, programInterface, index,
>-                                                                  bufSize, length, name);
>-
>-        if (context->skipValidation() ||
>-            ValidateGetProgramResourceName(context, program, programInterface, index, bufSize,
>-                                           length, name))
>+        PrimitiveMode modePacked = FromGLenum<PrimitiveMode>(mode);
>+        if (context->skipValidation() || ValidateDrawArraysIndirect(context, modePacked, indirect))
>         {
>-            context->getProgramResourceName(program, programInterface, index, bufSize, length,
>-                                            name);
>+            context->drawArraysIndirect(modePacked, indirect);
>         }
>     }
> }
> 
>-void GL_APIENTRY GetProgramResourceiv(GLuint program,
>-                                      GLenum programInterface,
>-                                      GLuint index,
>-                                      GLsizei propCount,
>-                                      const GLenum *props,
>-                                      GLsizei bufSize,
>-                                      GLsizei *length,
>-                                      GLint *params)
>+void GL_APIENTRY DrawElementsIndirect(GLenum mode, GLenum type, const void *indirect)
> {
>-    EVENT(
>-        "(GLuint program = %u, GLenum programInterface = 0x%X, GLuint index = %u, GLsizei "
>-        "propCount = %d, const GLenum *props = 0x%0.8p, GLsizei bufSize = %d, GLsizei *length = "
>-        "0x%0.8p, GLint *params = 0x%0.8p)",
>-        program, programInterface, index, propCount, props, bufSize, length, params);
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum mode = 0x%X, GLenum type = 0x%X, const void *indirect = 0x%016" PRIxPTR ")",
>+          mode, type, (uintptr_t)indirect);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::GetProgramResourceiv>(
>-            program, programInterface, index, propCount, props, bufSize, length, params);
>-
>+        PrimitiveMode modePacked    = FromGLenum<PrimitiveMode>(mode);
>+        DrawElementsType typePacked = FromGLenum<DrawElementsType>(type);
>         if (context->skipValidation() ||
>-            ValidateGetProgramResourceiv(context, program, programInterface, index, propCount,
>-                                         props, bufSize, length, params))
>+            ValidateDrawElementsIndirect(context, modePacked, typePacked, indirect))
>         {
>-            context->getProgramResourceiv(program, programInterface, index, propCount, props,
>-                                          bufSize, length, params);
>+            context->drawElementsIndirect(modePacked, typePacked, indirect);
>         }
>     }
> }
> 
>-GLint GL_APIENTRY GetProgramResourceLocation(GLuint program,
>-                                             GLenum programInterface,
>-                                             const GLchar *name)
>+void GL_APIENTRY FramebufferParameteri(GLenum target, GLenum pname, GLint param)
> {
>-    EVENT("(GLuint program = %u, GLenum programInterface = 0x%X, const GLchar *name = 0x%0.8p)",
>-          program, programInterface, name);
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum target = 0x%X, GLenum pname = 0x%X, GLint param = %d)", target, pname, param);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::GetProgramResourceLocation>(program, programInterface,
>-                                                                      name);
>-
>         if (context->skipValidation() ||
>-            ValidateGetProgramResourceLocation(context, program, programInterface, name))
>+            ValidateFramebufferParameteri(context, target, pname, param))
>         {
>-            return context->getProgramResourceLocation(program, programInterface, name);
>+            context->framebufferParameteri(target, pname, param);
>         }
>     }
>+}
> 
>-    return GetDefaultReturnValue<EntryPoint::GetProgramResourceLocation, GLint>();
>+void GL_APIENTRY GenProgramPipelines(GLsizei n, GLuint *pipelines)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLsizei n = %d, GLuint *pipelines = 0x%016" PRIxPTR ")", n, (uintptr_t)pipelines);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        if (context->skipValidation() || ValidateGenProgramPipelines(context, n, pipelines))
>+        {
>+            context->genProgramPipelines(n, pipelines);
>+        }
>+    }
> }
> 
>-void GL_APIENTRY UseProgramStages(GLuint pipeline, GLbitfield stages, GLuint program)
>+void GL_APIENTRY GetBooleani_v(GLenum target, GLuint index, GLboolean *data)
> {
>-    EVENT("(GLuint pipeline = %u, GLbitfield stages = 0x%X, GLuint program = %u)", pipeline, stages,
>-          program);
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum target = 0x%X, GLuint index = %u, GLboolean *data = 0x%016" PRIxPTR ")", target,
>+          index, (uintptr_t)data);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::UseProgramStages>(pipeline, stages, program);
>+        if (context->skipValidation() || ValidateGetBooleani_v(context, target, index, data))
>+        {
>+            context->getBooleani_v(target, index, data);
>+        }
>+    }
>+}
> 
>+void GL_APIENTRY GetFramebufferParameteriv(GLenum target, GLenum pname, GLint *params)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum target = 0x%X, GLenum pname = 0x%X, GLint *params = 0x%016" PRIxPTR ")", target,
>+          pname, (uintptr_t)params);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>         if (context->skipValidation() ||
>-            ValidateUseProgramStages(context, pipeline, stages, program))
>+            ValidateGetFramebufferParameteriv(context, target, pname, params))
>         {
>-            context->useProgramStages(pipeline, stages, program);
>+            context->getFramebufferParameteriv(target, pname, params);
>         }
>     }
> }
> 
>-void GL_APIENTRY ActiveShaderProgram(GLuint pipeline, GLuint program)
>+void GL_APIENTRY GetMultisamplefv(GLenum pname, GLuint index, GLfloat *val)
> {
>-    EVENT("(GLuint pipeline = %u, GLuint program = %u)", pipeline, program);
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum pname = 0x%X, GLuint index = %u, GLfloat *val = 0x%016" PRIxPTR ")", pname,
>+          index, (uintptr_t)val);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::ActiveShaderProgram>(pipeline, program);
>-
>-        if (context->skipValidation() || ValidateActiveShaderProgram(context, pipeline, program))
>+        if (context->skipValidation() || ValidateGetMultisamplefv(context, pname, index, val))
>         {
>-            context->activeShaderProgram(pipeline, program);
>+            context->getMultisamplefv(pname, index, val);
>         }
>     }
> }
> 
>-GLuint GL_APIENTRY CreateShaderProgramv(GLenum type, GLsizei count, const GLchar *const *strings)
>+void GL_APIENTRY GetProgramInterfaceiv(GLuint program,
>+                                       GLenum programInterface,
>+                                       GLenum pname,
>+                                       GLint *params)
> {
>-    EVENT("(GLenum type = 0x%X, GLsizei count = %d, const GLchar *const*strings = 0x%0.8p)", type,
>-          count, strings);
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLuint program = %u, GLenum programInterface = 0x%X, GLenum pname = 0x%X, GLint *params "
>+        "= 0x%016" PRIxPTR ")",
>+        program, programInterface, pname, (uintptr_t)params);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::CreateShaderProgramv>(type, count, strings);
>-
>         if (context->skipValidation() ||
>-            ValidateCreateShaderProgramv(context, type, count, strings))
>+            ValidateGetProgramInterfaceiv(context, program, programInterface, pname, params))
>         {
>-            return context->createShaderProgramv(type, count, strings);
>+            context->getProgramInterfaceiv(program, programInterface, pname, params);
>         }
>     }
>-
>-    return GetDefaultReturnValue<EntryPoint::CreateShaderProgramv, GLuint>();
> }
> 
>-void GL_APIENTRY BindProgramPipeline(GLuint pipeline)
>+void GL_APIENTRY GetProgramPipelineInfoLog(GLuint pipeline,
>+                                           GLsizei bufSize,
>+                                           GLsizei *length,
>+                                           GLchar *infoLog)
> {
>-    EVENT("(GLuint pipeline = %u)", pipeline);
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint pipeline = %u, GLsizei bufSize = %d, GLsizei *length = 0x%016" PRIxPTR
>+          ", GLchar *infoLog = 0x%016" PRIxPTR ")",
>+          pipeline, bufSize, (uintptr_t)length, (uintptr_t)infoLog);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::BindProgramPipeline>(pipeline);
>-
>-        if (context->skipValidation() || ValidateBindProgramPipeline(context, pipeline))
>+        if (context->skipValidation() ||
>+            ValidateGetProgramPipelineInfoLog(context, pipeline, bufSize, length, infoLog))
>         {
>-            context->bindProgramPipeline(pipeline);
>+            context->getProgramPipelineInfoLog(pipeline, bufSize, length, infoLog);
>         }
>     }
> }
> 
>-void GL_APIENTRY DeleteProgramPipelines(GLsizei n, const GLuint *pipelines)
>+void GL_APIENTRY GetProgramPipelineiv(GLuint pipeline, GLenum pname, GLint *params)
> {
>-    EVENT("(GLsizei n = %d, const GLuint *pipelines = 0x%0.8p)", n, pipelines);
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint pipeline = %u, GLenum pname = 0x%X, GLint *params = 0x%016" PRIxPTR ")",
>+          pipeline, pname, (uintptr_t)params);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::DeleteProgramPipelines>(n, pipelines);
>-
>-        if (context->skipValidation() || ValidateDeleteProgramPipelines(context, n, pipelines))
>+        if (context->skipValidation() ||
>+            ValidateGetProgramPipelineiv(context, pipeline, pname, params))
>         {
>-            context->deleteProgramPipelines(n, pipelines);
>+            context->getProgramPipelineiv(pipeline, pname, params);
>         }
>     }
> }
> 
>-void GL_APIENTRY GenProgramPipelines(GLsizei n, GLuint *pipelines)
>+GLuint GL_APIENTRY GetProgramResourceIndex(GLuint program,
>+                                           GLenum programInterface,
>+                                           const GLchar *name)
> {
>-    EVENT("(GLsizei n = %d, GLuint *pipelines = 0x%0.8p)", n, pipelines);
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLuint program = %u, GLenum programInterface = 0x%X, const GLchar *name = 0x%016" PRIxPTR
>+        ")",
>+        program, programInterface, (uintptr_t)name);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::GenProgramPipelines>(n, pipelines);
>-
>-        if (context->skipValidation() || ValidateGenProgramPipelines(context, n, pipelines))
>+        if (context->skipValidation() ||
>+            ValidateGetProgramResourceIndex(context, program, programInterface, name))
>         {
>-            context->genProgramPipelines(n, pipelines);
>+            return context->getProgramResourceIndex(program, programInterface, name);
>         }
>     }
>+
>+    return GetDefaultReturnValue<EntryPoint::GetProgramResourceIndex, GLuint>();
> }
> 
>-GLboolean GL_APIENTRY IsProgramPipeline(GLuint pipeline)
>+GLint GL_APIENTRY GetProgramResourceLocation(GLuint program,
>+                                             GLenum programInterface,
>+                                             const GLchar *name)
> {
>-    EVENT("(GLuint pipeline = %u)", pipeline);
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLuint program = %u, GLenum programInterface = 0x%X, const GLchar *name = 0x%016" PRIxPTR
>+        ")",
>+        program, programInterface, (uintptr_t)name);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::IsProgramPipeline>(pipeline);
>-
>-        if (context->skipValidation() || ValidateIsProgramPipeline(context, pipeline))
>+        if (context->skipValidation() ||
>+            ValidateGetProgramResourceLocation(context, program, programInterface, name))
>         {
>-            return context->isProgramPipeline(pipeline);
>+            return context->getProgramResourceLocation(program, programInterface, name);
>         }
>     }
> 
>-    return GetDefaultReturnValue<EntryPoint::IsProgramPipeline, GLboolean>();
>+    return GetDefaultReturnValue<EntryPoint::GetProgramResourceLocation, GLint>();
> }
> 
>-void GL_APIENTRY GetProgramPipelineiv(GLuint pipeline, GLenum pname, GLint *params)
>+void GL_APIENTRY GetProgramResourceName(GLuint program,
>+                                        GLenum programInterface,
>+                                        GLuint index,
>+                                        GLsizei bufSize,
>+                                        GLsizei *length,
>+                                        GLchar *name)
> {
>-    EVENT("(GLuint pipeline = %u, GLenum pname = 0x%X, GLint *params = 0x%0.8p)", pipeline, pname,
>-          params);
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLuint program = %u, GLenum programInterface = 0x%X, GLuint index = %u, GLsizei bufSize "
>+        "= %d, GLsizei *length = 0x%016" PRIxPTR ", GLchar *name = 0x%016" PRIxPTR ")",
>+        program, programInterface, index, bufSize, (uintptr_t)length, (uintptr_t)name);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::GetProgramPipelineiv>(pipeline, pname, params);
>-
>         if (context->skipValidation() ||
>-            ValidateGetProgramPipelineiv(context, pipeline, pname, params))
>+            ValidateGetProgramResourceName(context, program, programInterface, index, bufSize,
>+                                           length, name))
>         {
>-            context->getProgramPipelineiv(pipeline, pname, params);
>+            context->getProgramResourceName(program, programInterface, index, bufSize, length,
>+                                            name);
>         }
>     }
> }
> 
>-void GL_APIENTRY ProgramUniform1i(GLuint program, GLint location, GLint v0)
>+void GL_APIENTRY GetProgramResourceiv(GLuint program,
>+                                      GLenum programInterface,
>+                                      GLuint index,
>+                                      GLsizei propCount,
>+                                      const GLenum *props,
>+                                      GLsizei bufSize,
>+                                      GLsizei *length,
>+                                      GLint *params)
> {
>-    EVENT("(GLuint program = %u, GLint location = %d, GLint v0 = %d)", program, location, v0);
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLuint program = %u, GLenum programInterface = 0x%X, GLuint index = %u, GLsizei "
>+        "propCount = %d, const GLenum *props = 0x%016" PRIxPTR
>+        ", GLsizei bufSize = %d, GLsizei *length = 0x%016" PRIxPTR
>+        ", GLint *params = 0x%016" PRIxPTR ")",
>+        program, programInterface, index, propCount, (uintptr_t)props, bufSize, (uintptr_t)length,
>+        (uintptr_t)params);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::ProgramUniform1i>(program, location, v0);
>-
>-        if (context->skipValidation() || ValidateProgramUniform1i(context, program, location, v0))
>+        if (context->skipValidation() ||
>+            ValidateGetProgramResourceiv(context, program, programInterface, index, propCount,
>+                                         props, bufSize, length, params))
>         {
>-            context->programUniform1i(program, location, v0);
>+            context->getProgramResourceiv(program, programInterface, index, propCount, props,
>+                                          bufSize, length, params);
>         }
>     }
> }
> 
>-void GL_APIENTRY ProgramUniform2i(GLuint program, GLint location, GLint v0, GLint v1)
>+void GL_APIENTRY GetTexLevelParameterfv(GLenum target, GLint level, GLenum pname, GLfloat *params)
> {
>-    EVENT("(GLuint program = %u, GLint location = %d, GLint v0 = %d, GLint v1 = %d)", program,
>-          location, v0, v1);
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLenum target = 0x%X, GLint level = %d, GLenum pname = 0x%X, GLfloat *params = "
>+        "0x%016" PRIxPTR ")",
>+        target, level, pname, (uintptr_t)params);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::ProgramUniform2i>(program, location, v0, v1);
>+        TextureTarget targetPacked = FromGLenum<TextureTarget>(target);
>+        if (context->skipValidation() ||
>+            ValidateGetTexLevelParameterfv(context, targetPacked, level, pname, params))
>+        {
>+            context->getTexLevelParameterfv(targetPacked, level, pname, params);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY GetTexLevelParameteriv(GLenum target, GLint level, GLenum pname, GLint *params)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLenum target = 0x%X, GLint level = %d, GLenum pname = 0x%X, GLint *params = "
>+        "0x%016" PRIxPTR ")",
>+        target, level, pname, (uintptr_t)params);
> 
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        TextureTarget targetPacked = FromGLenum<TextureTarget>(target);
>         if (context->skipValidation() ||
>-            ValidateProgramUniform2i(context, program, location, v0, v1))
>+            ValidateGetTexLevelParameteriv(context, targetPacked, level, pname, params))
>         {
>-            context->programUniform2i(program, location, v0, v1);
>+            context->getTexLevelParameteriv(targetPacked, level, pname, params);
>         }
>     }
> }
> 
>-void GL_APIENTRY ProgramUniform3i(GLuint program, GLint location, GLint v0, GLint v1, GLint v2)
>+GLboolean GL_APIENTRY IsProgramPipeline(GLuint pipeline)
> {
>-    EVENT("(GLuint program = %u, GLint location = %d, GLint v0 = %d, GLint v1 = %d, GLint v2 = %d)",
>-          program, location, v0, v1, v2);
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint pipeline = %u)", pipeline);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::ProgramUniform3i>(program, location, v0, v1, v2);
>+        if (context->skipValidation() || ValidateIsProgramPipeline(context, pipeline))
>+        {
>+            return context->isProgramPipeline(pipeline);
>+        }
>+    }
> 
>-        if (context->skipValidation() ||
>-            ValidateProgramUniform3i(context, program, location, v0, v1, v2))
>+    return GetDefaultReturnValue<EntryPoint::IsProgramPipeline, GLboolean>();
>+}
>+
>+void GL_APIENTRY MemoryBarrier(GLbitfield barriers)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLbitfield barriers = 0x%X)", barriers);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        if (context->skipValidation() || ValidateMemoryBarrier(context, barriers))
>         {
>-            context->programUniform3i(program, location, v0, v1, v2);
>+            context->memoryBarrier(barriers);
>         }
>     }
> }
> 
>-void GL_APIENTRY
>-ProgramUniform4i(GLuint program, GLint location, GLint v0, GLint v1, GLint v2, GLint v3)
>+void GL_APIENTRY MemoryBarrierByRegion(GLbitfield barriers)
> {
>-    EVENT(
>-        "(GLuint program = %u, GLint location = %d, GLint v0 = %d, GLint v1 = %d, GLint v2 = %d, "
>-        "GLint v3 = %d)",
>-        program, location, v0, v1, v2, v3);
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLbitfield barriers = 0x%X)", barriers);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::ProgramUniform4i>(program, location, v0, v1, v2, v3);
>+        if (context->skipValidation() || ValidateMemoryBarrierByRegion(context, barriers))
>+        {
>+            context->memoryBarrierByRegion(barriers);
>+        }
>+    }
>+}
> 
>-        if (context->skipValidation() ||
>-            ValidateProgramUniform4i(context, program, location, v0, v1, v2, v3))
>+void GL_APIENTRY ProgramUniform1f(GLuint program, GLint location, GLfloat v0)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint program = %u, GLint location = %d, GLfloat v0 = %f)", program, location, v0);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        if (context->skipValidation() || ValidateProgramUniform1f(context, program, location, v0))
>         {
>-            context->programUniform4i(program, location, v0, v1, v2, v3);
>+            context->programUniform1f(program, location, v0);
>         }
>     }
> }
> 
>-void GL_APIENTRY ProgramUniform1ui(GLuint program, GLint location, GLuint v0)
>+void GL_APIENTRY ProgramUniform1fv(GLuint program,
>+                                   GLint location,
>+                                   GLsizei count,
>+                                   const GLfloat *value)
> {
>-    EVENT("(GLuint program = %u, GLint location = %d, GLuint v0 = %u)", program, location, v0);
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLuint program = %u, GLint location = %d, GLsizei count = %d, const GLfloat *value = "
>+        "0x%016" PRIxPTR ")",
>+        program, location, count, (uintptr_t)value);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::ProgramUniform1ui>(program, location, v0);
>-
>-        if (context->skipValidation() || ValidateProgramUniform1ui(context, program, location, v0))
>+        if (context->skipValidation() ||
>+            ValidateProgramUniform1fv(context, program, location, count, value))
>         {
>-            context->programUniform1ui(program, location, v0);
>+            context->programUniform1fv(program, location, count, value);
>         }
>     }
> }
> 
>-void GL_APIENTRY ProgramUniform2ui(GLuint program, GLint location, GLuint v0, GLuint v1)
>+void GL_APIENTRY ProgramUniform1i(GLuint program, GLint location, GLint v0)
> {
>-    EVENT("(GLuint program = %u, GLint location = %d, GLuint v0 = %u, GLuint v1 = %u)", program,
>-          location, v0, v1);
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint program = %u, GLint location = %d, GLint v0 = %d)", program, location, v0);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::ProgramUniform2ui>(program, location, v0, v1);
>-
>-        if (context->skipValidation() ||
>-            ValidateProgramUniform2ui(context, program, location, v0, v1))
>+        if (context->skipValidation() || ValidateProgramUniform1i(context, program, location, v0))
>         {
>-            context->programUniform2ui(program, location, v0, v1);
>+            context->programUniform1i(program, location, v0);
>         }
>     }
> }
> 
>-void GL_APIENTRY ProgramUniform3ui(GLuint program, GLint location, GLuint v0, GLuint v1, GLuint v2)
>+void GL_APIENTRY ProgramUniform1iv(GLuint program,
>+                                   GLint location,
>+                                   GLsizei count,
>+                                   const GLint *value)
> {
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>     EVENT(
>-        "(GLuint program = %u, GLint location = %d, GLuint v0 = %u, GLuint v1 = %u, GLuint v2 = "
>-        "%u)",
>-        program, location, v0, v1, v2);
>+        "(GLuint program = %u, GLint location = %d, GLsizei count = %d, const GLint *value = "
>+        "0x%016" PRIxPTR ")",
>+        program, location, count, (uintptr_t)value);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::ProgramUniform3ui>(program, location, v0, v1, v2);
>-
>         if (context->skipValidation() ||
>-            ValidateProgramUniform3ui(context, program, location, v0, v1, v2))
>+            ValidateProgramUniform1iv(context, program, location, count, value))
>         {
>-            context->programUniform3ui(program, location, v0, v1, v2);
>+            context->programUniform1iv(program, location, count, value);
>         }
>     }
> }
> 
>-void GL_APIENTRY
>-ProgramUniform4ui(GLuint program, GLint location, GLuint v0, GLuint v1, GLuint v2, GLuint v3)
>+void GL_APIENTRY ProgramUniform1ui(GLuint program, GLint location, GLuint v0)
> {
>-    EVENT(
>-        "(GLuint program = %u, GLint location = %d, GLuint v0 = %u, GLuint v1 = %u, GLuint v2 = "
>-        "%u, GLuint v3 = %u)",
>-        program, location, v0, v1, v2, v3);
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint program = %u, GLint location = %d, GLuint v0 = %u)", program, location, v0);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::ProgramUniform4ui>(program, location, v0, v1, v2, v3);
>-
>-        if (context->skipValidation() ||
>-            ValidateProgramUniform4ui(context, program, location, v0, v1, v2, v3))
>+        if (context->skipValidation() || ValidateProgramUniform1ui(context, program, location, v0))
>         {
>-            context->programUniform4ui(program, location, v0, v1, v2, v3);
>+            context->programUniform1ui(program, location, v0);
>         }
>     }
> }
> 
>-void GL_APIENTRY ProgramUniform1f(GLuint program, GLint location, GLfloat v0)
>+void GL_APIENTRY ProgramUniform1uiv(GLuint program,
>+                                    GLint location,
>+                                    GLsizei count,
>+                                    const GLuint *value)
> {
>-    EVENT("(GLuint program = %u, GLint location = %d, GLfloat v0 = %f)", program, location, v0);
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLuint program = %u, GLint location = %d, GLsizei count = %d, const GLuint *value = "
>+        "0x%016" PRIxPTR ")",
>+        program, location, count, (uintptr_t)value);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::ProgramUniform1f>(program, location, v0);
>-
>-        if (context->skipValidation() || ValidateProgramUniform1f(context, program, location, v0))
>+        if (context->skipValidation() ||
>+            ValidateProgramUniform1uiv(context, program, location, count, value))
>         {
>-            context->programUniform1f(program, location, v0);
>+            context->programUniform1uiv(program, location, count, value);
>         }
>     }
> }
> 
> void GL_APIENTRY ProgramUniform2f(GLuint program, GLint location, GLfloat v0, GLfloat v1)
> {
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>     EVENT("(GLuint program = %u, GLint location = %d, GLfloat v0 = %f, GLfloat v1 = %f)", program,
>           location, v0, v1);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::ProgramUniform2f>(program, location, v0, v1);
>-
>         if (context->skipValidation() ||
>             ValidateProgramUniform2f(context, program, location, v0, v1))
>         {
>@@ -566,395 +657,373 @@ void GL_APIENTRY ProgramUniform2f(GLuint program, GLint location, GLfloat v0, GL
>     }
> }
> 
>-void GL_APIENTRY
>-ProgramUniform3f(GLuint program, GLint location, GLfloat v0, GLfloat v1, GLfloat v2)
>+void GL_APIENTRY ProgramUniform2fv(GLuint program,
>+                                   GLint location,
>+                                   GLsizei count,
>+                                   const GLfloat *value)
> {
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>     EVENT(
>-        "(GLuint program = %u, GLint location = %d, GLfloat v0 = %f, GLfloat v1 = %f, GLfloat v2 = "
>-        "%f)",
>-        program, location, v0, v1, v2);
>+        "(GLuint program = %u, GLint location = %d, GLsizei count = %d, const GLfloat *value = "
>+        "0x%016" PRIxPTR ")",
>+        program, location, count, (uintptr_t)value);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::ProgramUniform3f>(program, location, v0, v1, v2);
>-
>         if (context->skipValidation() ||
>-            ValidateProgramUniform3f(context, program, location, v0, v1, v2))
>+            ValidateProgramUniform2fv(context, program, location, count, value))
>         {
>-            context->programUniform3f(program, location, v0, v1, v2);
>+            context->programUniform2fv(program, location, count, value);
>         }
>     }
> }
> 
>-void GL_APIENTRY
>-ProgramUniform4f(GLuint program, GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3)
>+void GL_APIENTRY ProgramUniform2i(GLuint program, GLint location, GLint v0, GLint v1)
> {
>-    EVENT(
>-        "(GLuint program = %u, GLint location = %d, GLfloat v0 = %f, GLfloat v1 = %f, GLfloat v2 = "
>-        "%f, GLfloat v3 = %f)",
>-        program, location, v0, v1, v2, v3);
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint program = %u, GLint location = %d, GLint v0 = %d, GLint v1 = %d)", program,
>+          location, v0, v1);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::ProgramUniform4f>(program, location, v0, v1, v2, v3);
>-
>         if (context->skipValidation() ||
>-            ValidateProgramUniform4f(context, program, location, v0, v1, v2, v3))
>+            ValidateProgramUniform2i(context, program, location, v0, v1))
>         {
>-            context->programUniform4f(program, location, v0, v1, v2, v3);
>+            context->programUniform2i(program, location, v0, v1);
>         }
>     }
> }
> 
>-void GL_APIENTRY ProgramUniform1iv(GLuint program,
>+void GL_APIENTRY ProgramUniform2iv(GLuint program,
>                                    GLint location,
>                                    GLsizei count,
>                                    const GLint *value)
> {
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>     EVENT(
>         "(GLuint program = %u, GLint location = %d, GLsizei count = %d, const GLint *value = "
>-        "0x%0.8p)",
>-        program, location, count, value);
>+        "0x%016" PRIxPTR ")",
>+        program, location, count, (uintptr_t)value);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::ProgramUniform1iv>(program, location, count, value);
>+        if (context->skipValidation() ||
>+            ValidateProgramUniform2iv(context, program, location, count, value))
>+        {
>+            context->programUniform2iv(program, location, count, value);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY ProgramUniform2ui(GLuint program, GLint location, GLuint v0, GLuint v1)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint program = %u, GLint location = %d, GLuint v0 = %u, GLuint v1 = %u)", program,
>+          location, v0, v1);
> 
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>         if (context->skipValidation() ||
>-            ValidateProgramUniform1iv(context, program, location, count, value))
>+            ValidateProgramUniform2ui(context, program, location, v0, v1))
>         {
>-            context->programUniform1iv(program, location, count, value);
>+            context->programUniform2ui(program, location, v0, v1);
>         }
>     }
> }
> 
>-void GL_APIENTRY ProgramUniform2iv(GLuint program,
>-                                   GLint location,
>-                                   GLsizei count,
>-                                   const GLint *value)
>+void GL_APIENTRY ProgramUniform2uiv(GLuint program,
>+                                    GLint location,
>+                                    GLsizei count,
>+                                    const GLuint *value)
> {
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>     EVENT(
>-        "(GLuint program = %u, GLint location = %d, GLsizei count = %d, const GLint *value = "
>-        "0x%0.8p)",
>-        program, location, count, value);
>+        "(GLuint program = %u, GLint location = %d, GLsizei count = %d, const GLuint *value = "
>+        "0x%016" PRIxPTR ")",
>+        program, location, count, (uintptr_t)value);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::ProgramUniform2iv>(program, location, count, value);
>-
>         if (context->skipValidation() ||
>-            ValidateProgramUniform2iv(context, program, location, count, value))
>+            ValidateProgramUniform2uiv(context, program, location, count, value))
>         {
>-            context->programUniform2iv(program, location, count, value);
>+            context->programUniform2uiv(program, location, count, value);
>         }
>     }
> }
> 
>-void GL_APIENTRY ProgramUniform3iv(GLuint program,
>-                                   GLint location,
>-                                   GLsizei count,
>-                                   const GLint *value)
>+void GL_APIENTRY
>+ProgramUniform3f(GLuint program, GLint location, GLfloat v0, GLfloat v1, GLfloat v2)
> {
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>     EVENT(
>-        "(GLuint program = %u, GLint location = %d, GLsizei count = %d, const GLint *value = "
>-        "0x%0.8p)",
>-        program, location, count, value);
>+        "(GLuint program = %u, GLint location = %d, GLfloat v0 = %f, GLfloat v1 = %f, GLfloat v2 = "
>+        "%f)",
>+        program, location, v0, v1, v2);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::ProgramUniform3iv>(program, location, count, value);
>-
>         if (context->skipValidation() ||
>-            ValidateProgramUniform3iv(context, program, location, count, value))
>+            ValidateProgramUniform3f(context, program, location, v0, v1, v2))
>         {
>-            context->programUniform3iv(program, location, count, value);
>+            context->programUniform3f(program, location, v0, v1, v2);
>         }
>     }
> }
> 
>-void GL_APIENTRY ProgramUniform4iv(GLuint program,
>+void GL_APIENTRY ProgramUniform3fv(GLuint program,
>                                    GLint location,
>                                    GLsizei count,
>-                                   const GLint *value)
>+                                   const GLfloat *value)
> {
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>     EVENT(
>-        "(GLuint program = %u, GLint location = %d, GLsizei count = %d, const GLint *value = "
>-        "0x%0.8p)",
>-        program, location, count, value);
>+        "(GLuint program = %u, GLint location = %d, GLsizei count = %d, const GLfloat *value = "
>+        "0x%016" PRIxPTR ")",
>+        program, location, count, (uintptr_t)value);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::ProgramUniform4iv>(program, location, count, value);
>-
>         if (context->skipValidation() ||
>-            ValidateProgramUniform4iv(context, program, location, count, value))
>+            ValidateProgramUniform3fv(context, program, location, count, value))
>         {
>-            context->programUniform4iv(program, location, count, value);
>+            context->programUniform3fv(program, location, count, value);
>         }
>     }
> }
> 
>-void GL_APIENTRY ProgramUniform1uiv(GLuint program,
>-                                    GLint location,
>-                                    GLsizei count,
>-                                    const GLuint *value)
>+void GL_APIENTRY ProgramUniform3i(GLuint program, GLint location, GLint v0, GLint v1, GLint v2)
> {
>-    EVENT(
>-        "(GLuint program = %u, GLint location = %d, GLsizei count = %d, const GLuint *value = "
>-        "0x%0.8p)",
>-        program, location, count, value);
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint program = %u, GLint location = %d, GLint v0 = %d, GLint v1 = %d, GLint v2 = %d)",
>+          program, location, v0, v1, v2);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::ProgramUniform1uiv>(program, location, count, value);
>-
>         if (context->skipValidation() ||
>-            ValidateProgramUniform1uiv(context, program, location, count, value))
>+            ValidateProgramUniform3i(context, program, location, v0, v1, v2))
>         {
>-            context->programUniform1uiv(program, location, count, value);
>+            context->programUniform3i(program, location, v0, v1, v2);
>         }
>     }
> }
> 
>-void GL_APIENTRY ProgramUniform2uiv(GLuint program,
>-                                    GLint location,
>-                                    GLsizei count,
>-                                    const GLuint *value)
>+void GL_APIENTRY ProgramUniform3iv(GLuint program,
>+                                   GLint location,
>+                                   GLsizei count,
>+                                   const GLint *value)
> {
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>     EVENT(
>-        "(GLuint program = %u, GLint location = %d, GLsizei count = %d, const GLuint *value = "
>-        "0x%0.8p)",
>-        program, location, count, value);
>+        "(GLuint program = %u, GLint location = %d, GLsizei count = %d, const GLint *value = "
>+        "0x%016" PRIxPTR ")",
>+        program, location, count, (uintptr_t)value);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::ProgramUniform2uiv>(program, location, count, value);
>-
>         if (context->skipValidation() ||
>-            ValidateProgramUniform2uiv(context, program, location, count, value))
>+            ValidateProgramUniform3iv(context, program, location, count, value))
>         {
>-            context->programUniform2uiv(program, location, count, value);
>+            context->programUniform3iv(program, location, count, value);
>         }
>     }
> }
> 
>-void GL_APIENTRY ProgramUniform3uiv(GLuint program,
>-                                    GLint location,
>-                                    GLsizei count,
>-                                    const GLuint *value)
>+void GL_APIENTRY ProgramUniform3ui(GLuint program, GLint location, GLuint v0, GLuint v1, GLuint v2)
> {
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>     EVENT(
>-        "(GLuint program = %u, GLint location = %d, GLsizei count = %d, const GLuint *value = "
>-        "0x%0.8p)",
>-        program, location, count, value);
>+        "(GLuint program = %u, GLint location = %d, GLuint v0 = %u, GLuint v1 = %u, GLuint v2 = "
>+        "%u)",
>+        program, location, v0, v1, v2);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::ProgramUniform3uiv>(program, location, count, value);
>-
>         if (context->skipValidation() ||
>-            ValidateProgramUniform3uiv(context, program, location, count, value))
>+            ValidateProgramUniform3ui(context, program, location, v0, v1, v2))
>         {
>-            context->programUniform3uiv(program, location, count, value);
>+            context->programUniform3ui(program, location, v0, v1, v2);
>         }
>     }
> }
> 
>-void GL_APIENTRY ProgramUniform4uiv(GLuint program,
>+void GL_APIENTRY ProgramUniform3uiv(GLuint program,
>                                     GLint location,
>                                     GLsizei count,
>                                     const GLuint *value)
> {
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>     EVENT(
>         "(GLuint program = %u, GLint location = %d, GLsizei count = %d, const GLuint *value = "
>-        "0x%0.8p)",
>-        program, location, count, value);
>+        "0x%016" PRIxPTR ")",
>+        program, location, count, (uintptr_t)value);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::ProgramUniform4uiv>(program, location, count, value);
>-
>         if (context->skipValidation() ||
>-            ValidateProgramUniform4uiv(context, program, location, count, value))
>+            ValidateProgramUniform3uiv(context, program, location, count, value))
>         {
>-            context->programUniform4uiv(program, location, count, value);
>+            context->programUniform3uiv(program, location, count, value);
>         }
>     }
> }
> 
>-void GL_APIENTRY ProgramUniform1fv(GLuint program,
>-                                   GLint location,
>-                                   GLsizei count,
>-                                   const GLfloat *value)
>+void GL_APIENTRY
>+ProgramUniform4f(GLuint program, GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3)
> {
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>     EVENT(
>-        "(GLuint program = %u, GLint location = %d, GLsizei count = %d, const GLfloat *value = "
>-        "0x%0.8p)",
>-        program, location, count, value);
>+        "(GLuint program = %u, GLint location = %d, GLfloat v0 = %f, GLfloat v1 = %f, GLfloat v2 = "
>+        "%f, GLfloat v3 = %f)",
>+        program, location, v0, v1, v2, v3);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::ProgramUniform1fv>(program, location, count, value);
>-
>         if (context->skipValidation() ||
>-            ValidateProgramUniform1fv(context, program, location, count, value))
>+            ValidateProgramUniform4f(context, program, location, v0, v1, v2, v3))
>         {
>-            context->programUniform1fv(program, location, count, value);
>+            context->programUniform4f(program, location, v0, v1, v2, v3);
>         }
>     }
> }
> 
>-void GL_APIENTRY ProgramUniform2fv(GLuint program,
>+void GL_APIENTRY ProgramUniform4fv(GLuint program,
>                                    GLint location,
>                                    GLsizei count,
>                                    const GLfloat *value)
> {
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>     EVENT(
>         "(GLuint program = %u, GLint location = %d, GLsizei count = %d, const GLfloat *value = "
>-        "0x%0.8p)",
>-        program, location, count, value);
>+        "0x%016" PRIxPTR ")",
>+        program, location, count, (uintptr_t)value);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::ProgramUniform2fv>(program, location, count, value);
>-
>         if (context->skipValidation() ||
>-            ValidateProgramUniform2fv(context, program, location, count, value))
>+            ValidateProgramUniform4fv(context, program, location, count, value))
>         {
>-            context->programUniform2fv(program, location, count, value);
>+            context->programUniform4fv(program, location, count, value);
>         }
>     }
> }
> 
>-void GL_APIENTRY ProgramUniform3fv(GLuint program,
>-                                   GLint location,
>-                                   GLsizei count,
>-                                   const GLfloat *value)
>+void GL_APIENTRY
>+ProgramUniform4i(GLuint program, GLint location, GLint v0, GLint v1, GLint v2, GLint v3)
> {
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>     EVENT(
>-        "(GLuint program = %u, GLint location = %d, GLsizei count = %d, const GLfloat *value = "
>-        "0x%0.8p)",
>-        program, location, count, value);
>+        "(GLuint program = %u, GLint location = %d, GLint v0 = %d, GLint v1 = %d, GLint v2 = %d, "
>+        "GLint v3 = %d)",
>+        program, location, v0, v1, v2, v3);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::ProgramUniform3fv>(program, location, count, value);
>-
>         if (context->skipValidation() ||
>-            ValidateProgramUniform3fv(context, program, location, count, value))
>+            ValidateProgramUniform4i(context, program, location, v0, v1, v2, v3))
>         {
>-            context->programUniform3fv(program, location, count, value);
>+            context->programUniform4i(program, location, v0, v1, v2, v3);
>         }
>     }
> }
> 
>-void GL_APIENTRY ProgramUniform4fv(GLuint program,
>+void GL_APIENTRY ProgramUniform4iv(GLuint program,
>                                    GLint location,
>                                    GLsizei count,
>-                                   const GLfloat *value)
>+                                   const GLint *value)
> {
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>     EVENT(
>-        "(GLuint program = %u, GLint location = %d, GLsizei count = %d, const GLfloat *value = "
>-        "0x%0.8p)",
>-        program, location, count, value);
>+        "(GLuint program = %u, GLint location = %d, GLsizei count = %d, const GLint *value = "
>+        "0x%016" PRIxPTR ")",
>+        program, location, count, (uintptr_t)value);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::ProgramUniform4fv>(program, location, count, value);
>-
>         if (context->skipValidation() ||
>-            ValidateProgramUniform4fv(context, program, location, count, value))
>+            ValidateProgramUniform4iv(context, program, location, count, value))
>         {
>-            context->programUniform4fv(program, location, count, value);
>+            context->programUniform4iv(program, location, count, value);
>         }
>     }
> }
> 
>-void GL_APIENTRY ProgramUniformMatrix2fv(GLuint program,
>-                                         GLint location,
>-                                         GLsizei count,
>-                                         GLboolean transpose,
>-                                         const GLfloat *value)
>+void GL_APIENTRY
>+ProgramUniform4ui(GLuint program, GLint location, GLuint v0, GLuint v1, GLuint v2, GLuint v3)
> {
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>     EVENT(
>-        "(GLuint program = %u, GLint location = %d, GLsizei count = %d, GLboolean transpose = %u, "
>-        "const GLfloat *value = 0x%0.8p)",
>-        program, location, count, transpose, value);
>+        "(GLuint program = %u, GLint location = %d, GLuint v0 = %u, GLuint v1 = %u, GLuint v2 = "
>+        "%u, GLuint v3 = %u)",
>+        program, location, v0, v1, v2, v3);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::ProgramUniformMatrix2fv>(program, location, count,
>-                                                                   transpose, value);
>-
>         if (context->skipValidation() ||
>-            ValidateProgramUniformMatrix2fv(context, program, location, count, transpose, value))
>+            ValidateProgramUniform4ui(context, program, location, v0, v1, v2, v3))
>         {
>-            context->programUniformMatrix2fv(program, location, count, transpose, value);
>+            context->programUniform4ui(program, location, v0, v1, v2, v3);
>         }
>     }
> }
> 
>-void GL_APIENTRY ProgramUniformMatrix3fv(GLuint program,
>-                                         GLint location,
>-                                         GLsizei count,
>-                                         GLboolean transpose,
>-                                         const GLfloat *value)
>+void GL_APIENTRY ProgramUniform4uiv(GLuint program,
>+                                    GLint location,
>+                                    GLsizei count,
>+                                    const GLuint *value)
> {
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>     EVENT(
>-        "(GLuint program = %u, GLint location = %d, GLsizei count = %d, GLboolean transpose = %u, "
>-        "const GLfloat *value = 0x%0.8p)",
>-        program, location, count, transpose, value);
>+        "(GLuint program = %u, GLint location = %d, GLsizei count = %d, const GLuint *value = "
>+        "0x%016" PRIxPTR ")",
>+        program, location, count, (uintptr_t)value);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::ProgramUniformMatrix3fv>(program, location, count,
>-                                                                   transpose, value);
>-
>         if (context->skipValidation() ||
>-            ValidateProgramUniformMatrix3fv(context, program, location, count, transpose, value))
>+            ValidateProgramUniform4uiv(context, program, location, count, value))
>         {
>-            context->programUniformMatrix3fv(program, location, count, transpose, value);
>+            context->programUniform4uiv(program, location, count, value);
>         }
>     }
> }
> 
>-void GL_APIENTRY ProgramUniformMatrix4fv(GLuint program,
>+void GL_APIENTRY ProgramUniformMatrix2fv(GLuint program,
>                                          GLint location,
>                                          GLsizei count,
>                                          GLboolean transpose,
>                                          const GLfloat *value)
> {
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>     EVENT(
>         "(GLuint program = %u, GLint location = %d, GLsizei count = %d, GLboolean transpose = %u, "
>-        "const GLfloat *value = 0x%0.8p)",
>-        program, location, count, transpose, value);
>+        "const GLfloat *value = 0x%016" PRIxPTR ")",
>+        program, location, count, transpose, (uintptr_t)value);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::ProgramUniformMatrix4fv>(program, location, count,
>-                                                                   transpose, value);
>-
>         if (context->skipValidation() ||
>-            ValidateProgramUniformMatrix4fv(context, program, location, count, transpose, value))
>+            ValidateProgramUniformMatrix2fv(context, program, location, count, transpose, value))
>         {
>-            context->programUniformMatrix4fv(program, location, count, transpose, value);
>+            context->programUniformMatrix2fv(program, location, count, transpose, value);
>         }
>     }
> }
>@@ -965,17 +1034,15 @@ void GL_APIENTRY ProgramUniformMatrix2x3fv(GLuint program,
>                                            GLboolean transpose,
>                                            const GLfloat *value)
> {
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>     EVENT(
>         "(GLuint program = %u, GLint location = %d, GLsizei count = %d, GLboolean transpose = %u, "
>-        "const GLfloat *value = 0x%0.8p)",
>-        program, location, count, transpose, value);
>+        "const GLfloat *value = 0x%016" PRIxPTR ")",
>+        program, location, count, transpose, (uintptr_t)value);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::ProgramUniformMatrix2x3fv>(program, location, count,
>-                                                                     transpose, value);
>-
>         if (context->skipValidation() ||
>             ValidateProgramUniformMatrix2x3fv(context, program, location, count, transpose, value))
>         {
>@@ -984,77 +1051,71 @@ void GL_APIENTRY ProgramUniformMatrix2x3fv(GLuint program,
>     }
> }
> 
>-void GL_APIENTRY ProgramUniformMatrix3x2fv(GLuint program,
>+void GL_APIENTRY ProgramUniformMatrix2x4fv(GLuint program,
>                                            GLint location,
>                                            GLsizei count,
>                                            GLboolean transpose,
>                                            const GLfloat *value)
> {
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>     EVENT(
>         "(GLuint program = %u, GLint location = %d, GLsizei count = %d, GLboolean transpose = %u, "
>-        "const GLfloat *value = 0x%0.8p)",
>-        program, location, count, transpose, value);
>+        "const GLfloat *value = 0x%016" PRIxPTR ")",
>+        program, location, count, transpose, (uintptr_t)value);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::ProgramUniformMatrix3x2fv>(program, location, count,
>-                                                                     transpose, value);
>-
>         if (context->skipValidation() ||
>-            ValidateProgramUniformMatrix3x2fv(context, program, location, count, transpose, value))
>+            ValidateProgramUniformMatrix2x4fv(context, program, location, count, transpose, value))
>         {
>-            context->programUniformMatrix3x2fv(program, location, count, transpose, value);
>+            context->programUniformMatrix2x4fv(program, location, count, transpose, value);
>         }
>     }
> }
> 
>-void GL_APIENTRY ProgramUniformMatrix2x4fv(GLuint program,
>-                                           GLint location,
>-                                           GLsizei count,
>-                                           GLboolean transpose,
>-                                           const GLfloat *value)
>+void GL_APIENTRY ProgramUniformMatrix3fv(GLuint program,
>+                                         GLint location,
>+                                         GLsizei count,
>+                                         GLboolean transpose,
>+                                         const GLfloat *value)
> {
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>     EVENT(
>         "(GLuint program = %u, GLint location = %d, GLsizei count = %d, GLboolean transpose = %u, "
>-        "const GLfloat *value = 0x%0.8p)",
>-        program, location, count, transpose, value);
>+        "const GLfloat *value = 0x%016" PRIxPTR ")",
>+        program, location, count, transpose, (uintptr_t)value);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::ProgramUniformMatrix2x4fv>(program, location, count,
>-                                                                     transpose, value);
>-
>         if (context->skipValidation() ||
>-            ValidateProgramUniformMatrix2x4fv(context, program, location, count, transpose, value))
>+            ValidateProgramUniformMatrix3fv(context, program, location, count, transpose, value))
>         {
>-            context->programUniformMatrix2x4fv(program, location, count, transpose, value);
>+            context->programUniformMatrix3fv(program, location, count, transpose, value);
>         }
>     }
> }
> 
>-void GL_APIENTRY ProgramUniformMatrix4x2fv(GLuint program,
>+void GL_APIENTRY ProgramUniformMatrix3x2fv(GLuint program,
>                                            GLint location,
>                                            GLsizei count,
>                                            GLboolean transpose,
>                                            const GLfloat *value)
> {
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>     EVENT(
>         "(GLuint program = %u, GLint location = %d, GLsizei count = %d, GLboolean transpose = %u, "
>-        "const GLfloat *value = 0x%0.8p)",
>-        program, location, count, transpose, value);
>+        "const GLfloat *value = 0x%016" PRIxPTR ")",
>+        program, location, count, transpose, (uintptr_t)value);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::ProgramUniformMatrix4x2fv>(program, location, count,
>-                                                                     transpose, value);
>-
>         if (context->skipValidation() ||
>-            ValidateProgramUniformMatrix4x2fv(context, program, location, count, transpose, value))
>+            ValidateProgramUniformMatrix3x2fv(context, program, location, count, transpose, value))
>         {
>-            context->programUniformMatrix4x2fv(program, location, count, transpose, value);
>+            context->programUniformMatrix3x2fv(program, location, count, transpose, value);
>         }
>     }
> }
>@@ -1065,17 +1126,15 @@ void GL_APIENTRY ProgramUniformMatrix3x4fv(GLuint program,
>                                            GLboolean transpose,
>                                            const GLfloat *value)
> {
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>     EVENT(
>         "(GLuint program = %u, GLint location = %d, GLsizei count = %d, GLboolean transpose = %u, "
>-        "const GLfloat *value = 0x%0.8p)",
>-        program, location, count, transpose, value);
>+        "const GLfloat *value = 0x%016" PRIxPTR ")",
>+        program, location, count, transpose, (uintptr_t)value);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::ProgramUniformMatrix3x4fv>(program, location, count,
>-                                                                     transpose, value);
>-
>         if (context->skipValidation() ||
>             ValidateProgramUniformMatrix3x4fv(context, program, location, count, transpose, value))
>         {
>@@ -1084,143 +1143,86 @@ void GL_APIENTRY ProgramUniformMatrix3x4fv(GLuint program,
>     }
> }
> 
>-void GL_APIENTRY ProgramUniformMatrix4x3fv(GLuint program,
>-                                           GLint location,
>-                                           GLsizei count,
>-                                           GLboolean transpose,
>-                                           const GLfloat *value)
>+void GL_APIENTRY ProgramUniformMatrix4fv(GLuint program,
>+                                         GLint location,
>+                                         GLsizei count,
>+                                         GLboolean transpose,
>+                                         const GLfloat *value)
> {
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>     EVENT(
>         "(GLuint program = %u, GLint location = %d, GLsizei count = %d, GLboolean transpose = %u, "
>-        "const GLfloat *value = 0x%0.8p)",
>-        program, location, count, transpose, value);
>+        "const GLfloat *value = 0x%016" PRIxPTR ")",
>+        program, location, count, transpose, (uintptr_t)value);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::ProgramUniformMatrix4x3fv>(program, location, count,
>-                                                                     transpose, value);
>-
>         if (context->skipValidation() ||
>-            ValidateProgramUniformMatrix4x3fv(context, program, location, count, transpose, value))
>-        {
>-            context->programUniformMatrix4x3fv(program, location, count, transpose, value);
>-        }
>-    }
>-}
>-
>-void GL_APIENTRY ValidateProgramPipeline(GLuint pipeline)
>-{
>-    EVENT("(GLuint pipeline = %u)", pipeline);
>-
>-    Context *context = GetValidGlobalContext();
>-    if (context)
>-    {
>-        context->gatherParams<EntryPoint::ValidateProgramPipeline>(pipeline);
>-
>-        if (context->skipValidation() || ValidateValidateProgramPipeline(context, pipeline))
>+            ValidateProgramUniformMatrix4fv(context, program, location, count, transpose, value))
>         {
>-            context->validateProgramPipeline(pipeline);
>+            context->programUniformMatrix4fv(program, location, count, transpose, value);
>         }
>     }
> }
> 
>-void GL_APIENTRY GetProgramPipelineInfoLog(GLuint pipeline,
>-                                           GLsizei bufSize,
>-                                           GLsizei *length,
>-                                           GLchar *infoLog)
>+void GL_APIENTRY ProgramUniformMatrix4x2fv(GLuint program,
>+                                           GLint location,
>+                                           GLsizei count,
>+                                           GLboolean transpose,
>+                                           const GLfloat *value)
> {
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>     EVENT(
>-        "(GLuint pipeline = %u, GLsizei bufSize = %d, GLsizei *length = 0x%0.8p, GLchar *infoLog = "
>-        "0x%0.8p)",
>-        pipeline, bufSize, length, infoLog);
>+        "(GLuint program = %u, GLint location = %d, GLsizei count = %d, GLboolean transpose = %u, "
>+        "const GLfloat *value = 0x%016" PRIxPTR ")",
>+        program, location, count, transpose, (uintptr_t)value);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::GetProgramPipelineInfoLog>(pipeline, bufSize, length,
>-                                                                     infoLog);
>-
>         if (context->skipValidation() ||
>-            ValidateGetProgramPipelineInfoLog(context, pipeline, bufSize, length, infoLog))
>+            ValidateProgramUniformMatrix4x2fv(context, program, location, count, transpose, value))
>         {
>-            context->getProgramPipelineInfoLog(pipeline, bufSize, length, infoLog);
>+            context->programUniformMatrix4x2fv(program, location, count, transpose, value);
>         }
>     }
> }
> 
>-void GL_APIENTRY BindImageTexture(GLuint unit,
>-                                  GLuint texture,
>-                                  GLint level,
>-                                  GLboolean layered,
>-                                  GLint layer,
>-                                  GLenum access,
>-                                  GLenum format)
>+void GL_APIENTRY ProgramUniformMatrix4x3fv(GLuint program,
>+                                           GLint location,
>+                                           GLsizei count,
>+                                           GLboolean transpose,
>+                                           const GLfloat *value)
> {
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>     EVENT(
>-        "(GLuint unit = %u, GLuint texture = %u, GLint level = %d, GLboolean layered = %u, GLint "
>-        "layer = %d, GLenum access = 0x%X, GLenum format = 0x%X)",
>-        unit, texture, level, layered, layer, access, format);
>+        "(GLuint program = %u, GLint location = %d, GLsizei count = %d, GLboolean transpose = %u, "
>+        "const GLfloat *value = 0x%016" PRIxPTR ")",
>+        program, location, count, transpose, (uintptr_t)value);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::BindImageTexture>(unit, texture, level, layered, layer,
>-                                                            access, format);
>-
>         if (context->skipValidation() ||
>-            ValidateBindImageTexture(context, unit, texture, level, layered, layer, access, format))
>-        {
>-            context->bindImageTexture(unit, texture, level, layered, layer, access, format);
>-        }
>-    }
>-}
>-
>-void GL_APIENTRY GetBooleani_v(GLenum target, GLuint index, GLboolean *data)
>-{
>-    EVENT("(GLenum target = 0x%X, GLuint index = %u, GLboolean *data = 0x%0.8p)", target, index,
>-          data);
>-
>-    Context *context = GetValidGlobalContext();
>-    if (context)
>-    {
>-        context->gatherParams<EntryPoint::GetBooleani_v>(target, index, data);
>-
>-        if (context->skipValidation() || ValidateGetBooleani_v(context, target, index, data))
>-        {
>-            context->getBooleani_v(target, index, data);
>-        }
>-    }
>-}
>-
>-void GL_APIENTRY MemoryBarrier(GLbitfield barriers)
>-{
>-    EVENT("(GLbitfield barriers = 0x%X)", barriers);
>-
>-    Context *context = GetValidGlobalContext();
>-    if (context)
>-    {
>-        context->gatherParams<EntryPoint::MemoryBarrier>(barriers);
>-
>-        if (context->skipValidation() || ValidateMemoryBarrier(context, barriers))
>+            ValidateProgramUniformMatrix4x3fv(context, program, location, count, transpose, value))
>         {
>-            context->memoryBarrier(barriers);
>+            context->programUniformMatrix4x3fv(program, location, count, transpose, value);
>         }
>     }
> }
> 
>-void GL_APIENTRY MemoryBarrierByRegion(GLbitfield barriers)
>+void GL_APIENTRY SampleMaski(GLuint maskNumber, GLbitfield mask)
> {
>-    EVENT("(GLbitfield barriers = 0x%X)", barriers);
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint maskNumber = %u, GLbitfield mask = 0x%X)", maskNumber, mask);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::MemoryBarrierByRegion>(barriers);
>-
>-        if (context->skipValidation() || ValidateMemoryBarrierByRegion(context, barriers))
>+        if (context->skipValidation() || ValidateSampleMaski(context, maskNumber, mask))
>         {
>-            context->memoryBarrierByRegion(barriers);
>+            context->sampleMaski(maskNumber, mask);
>         }
>     }
> }
>@@ -1232,6 +1234,7 @@ void GL_APIENTRY TexStorage2DMultisample(GLenum target,
>                                          GLsizei height,
>                                          GLboolean fixedsamplelocations)
> {
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>     EVENT(
>         "(GLenum target = 0x%X, GLsizei samples = %d, GLenum internalformat = 0x%X, GLsizei width "
>         "= %d, GLsizei height = %d, GLboolean fixedsamplelocations = %u)",
>@@ -1240,106 +1243,61 @@ void GL_APIENTRY TexStorage2DMultisample(GLenum target,
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::TexStorage2DMultisample>(
>-            target, samples, internalformat, width, height, fixedsamplelocations);
>-
>+        TextureType targetPacked = FromGLenum<TextureType>(target);
>         if (context->skipValidation() ||
>-            ValidateTexStorage2DMultisample(context, target, samples, internalformat, width, height,
>-                                            fixedsamplelocations))
>+            ValidateTexStorage2DMultisample(context, targetPacked, samples, internalformat, width,
>+                                            height, fixedsamplelocations))
>         {
>-            context->texStorage2DMultisample(target, samples, internalformat, width, height,
>+            context->texStorage2DMultisample(targetPacked, samples, internalformat, width, height,
>                                              fixedsamplelocations);
>         }
>     }
> }
> 
>-void GL_APIENTRY GetMultisamplefv(GLenum pname, GLuint index, GLfloat *val)
>-{
>-    EVENT("(GLenum pname = 0x%X, GLuint index = %u, GLfloat *val = 0x%0.8p)", pname, index, val);
>-
>-    Context *context = GetValidGlobalContext();
>-    if (context)
>-    {
>-        context->gatherParams<EntryPoint::GetMultisamplefv>(pname, index, val);
>-
>-        if (context->skipValidation() || ValidateGetMultisamplefv(context, pname, index, val))
>-        {
>-            context->getMultisamplefv(pname, index, val);
>-        }
>-    }
>-}
>-
>-void GL_APIENTRY SampleMaski(GLuint maskNumber, GLbitfield mask)
>-{
>-    EVENT("(GLuint maskNumber = %u, GLbitfield mask = 0x%X)", maskNumber, mask);
>-
>-    Context *context = GetValidGlobalContext();
>-    if (context)
>-    {
>-        context->gatherParams<EntryPoint::SampleMaski>(maskNumber, mask);
>-
>-        if (context->skipValidation() || ValidateSampleMaski(context, maskNumber, mask))
>-        {
>-            context->sampleMaski(maskNumber, mask);
>-        }
>-    }
>-}
>-
>-void GL_APIENTRY GetTexLevelParameteriv(GLenum target, GLint level, GLenum pname, GLint *params)
>+void GL_APIENTRY UseProgramStages(GLuint pipeline, GLbitfield stages, GLuint program)
> {
>-    EVENT("(GLenum target = 0x%X, GLint level = %d, GLenum pname = 0x%X, GLint *params = 0x%0.8p)",
>-          target, level, pname, params);
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint pipeline = %u, GLbitfield stages = 0x%X, GLuint program = %u)", pipeline, stages,
>+          program);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::GetTexLevelParameteriv>(target, level, pname, params);
>-
>         if (context->skipValidation() ||
>-            ValidateGetTexLevelParameteriv(context, target, level, pname, params))
>+            ValidateUseProgramStages(context, pipeline, stages, program))
>         {
>-            context->getTexLevelParameteriv(target, level, pname, params);
>+            context->useProgramStages(pipeline, stages, program);
>         }
>     }
> }
> 
>-void GL_APIENTRY GetTexLevelParameterfv(GLenum target, GLint level, GLenum pname, GLfloat *params)
>+void GL_APIENTRY ValidateProgramPipeline(GLuint pipeline)
> {
>-    EVENT(
>-        "(GLenum target = 0x%X, GLint level = %d, GLenum pname = 0x%X, GLfloat *params = 0x%0.8p)",
>-        target, level, pname, params);
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint pipeline = %u)", pipeline);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::GetTexLevelParameterfv>(target, level, pname, params);
>-
>-        if (context->skipValidation() ||
>-            ValidateGetTexLevelParameterfv(context, target, level, pname, params))
>+        if (context->skipValidation() || ValidateValidateProgramPipeline(context, pipeline))
>         {
>-            context->getTexLevelParameterfv(target, level, pname, params);
>+            context->validateProgramPipeline(pipeline);
>         }
>     }
> }
> 
>-void GL_APIENTRY BindVertexBuffer(GLuint bindingindex,
>-                                  GLuint buffer,
>-                                  GLintptr offset,
>-                                  GLsizei stride)
>+void GL_APIENTRY VertexAttribBinding(GLuint attribindex, GLuint bindingindex)
> {
>-    EVENT(
>-        "(GLuint bindingindex = %u, GLuint buffer = %u, GLintptr offset = %d, GLsizei stride = %d)",
>-        bindingindex, buffer, offset, stride);
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint attribindex = %u, GLuint bindingindex = %u)", attribindex, bindingindex);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::BindVertexBuffer>(bindingindex, buffer, offset, stride);
>-
>         if (context->skipValidation() ||
>-            ValidateBindVertexBuffer(context, bindingindex, buffer, offset, stride))
>+            ValidateVertexAttribBinding(context, attribindex, bindingindex))
>         {
>-            context->bindVertexBuffer(bindingindex, buffer, offset, stride);
>+            context->vertexAttribBinding(attribindex, bindingindex);
>         }
>     }
> }
>@@ -1350,6 +1308,7 @@ void GL_APIENTRY VertexAttribFormat(GLuint attribindex,
>                                     GLboolean normalized,
>                                     GLuint relativeoffset)
> {
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>     EVENT(
>         "(GLuint attribindex = %u, GLint size = %d, GLenum type = 0x%X, GLboolean normalized = %u, "
>         "GLuint relativeoffset = %u)",
>@@ -1358,14 +1317,12 @@ void GL_APIENTRY VertexAttribFormat(GLuint attribindex,
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::VertexAttribFormat>(attribindex, size, type, normalized,
>-                                                              relativeoffset);
>-
>+        VertexAttribType typePacked = FromGLenum<VertexAttribType>(type);
>         if (context->skipValidation() ||
>-            ValidateVertexAttribFormat(context, attribindex, size, type, normalized,
>+            ValidateVertexAttribFormat(context, attribindex, size, typePacked, normalized,
>                                        relativeoffset))
>         {
>-            context->vertexAttribFormat(attribindex, size, type, normalized, relativeoffset);
>+            context->vertexAttribFormat(attribindex, size, typePacked, normalized, relativeoffset);
>         }
>     }
> }
>@@ -1375,6 +1332,7 @@ void GL_APIENTRY VertexAttribIFormat(GLuint attribindex,
>                                      GLenum type,
>                                      GLuint relativeoffset)
> {
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>     EVENT(
>         "(GLuint attribindex = %u, GLint size = %d, GLenum type = 0x%X, GLuint relativeoffset = "
>         "%u)",
>@@ -1383,43 +1341,23 @@ void GL_APIENTRY VertexAttribIFormat(GLuint attribindex,
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::VertexAttribIFormat>(attribindex, size, type,
>-                                                               relativeoffset);
>-
>-        if (context->skipValidation() ||
>-            ValidateVertexAttribIFormat(context, attribindex, size, type, relativeoffset))
>-        {
>-            context->vertexAttribIFormat(attribindex, size, type, relativeoffset);
>-        }
>-    }
>-}
>-
>-void GL_APIENTRY VertexAttribBinding(GLuint attribindex, GLuint bindingindex)
>-{
>-    EVENT("(GLuint attribindex = %u, GLuint bindingindex = %u)", attribindex, bindingindex);
>-
>-    Context *context = GetValidGlobalContext();
>-    if (context)
>-    {
>-        context->gatherParams<EntryPoint::VertexAttribBinding>(attribindex, bindingindex);
>-
>+        VertexAttribType typePacked = FromGLenum<VertexAttribType>(type);
>         if (context->skipValidation() ||
>-            ValidateVertexAttribBinding(context, attribindex, bindingindex))
>+            ValidateVertexAttribIFormat(context, attribindex, size, typePacked, relativeoffset))
>         {
>-            context->vertexAttribBinding(attribindex, bindingindex);
>+            context->vertexAttribIFormat(attribindex, size, typePacked, relativeoffset);
>         }
>     }
> }
> 
> void GL_APIENTRY VertexBindingDivisor(GLuint bindingindex, GLuint divisor)
> {
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>     EVENT("(GLuint bindingindex = %u, GLuint divisor = %u)", bindingindex, divisor);
> 
>     Context *context = GetValidGlobalContext();
>     if (context)
>     {
>-        context->gatherParams<EntryPoint::VertexBindingDivisor>(bindingindex, divisor);
>-
>         if (context->skipValidation() ||
>             ValidateVertexBindingDivisor(context, bindingindex, divisor))
>         {
>diff --git a/Source/ThirdParty/ANGLE/src/libGLESv2/entry_points_gles_3_1_autogen.h b/Source/ThirdParty/ANGLE/src/libGLESv2/entry_points_gles_3_1_autogen.h
>index e11d5a10bfe..bdb49051337 100644
>--- a/Source/ThirdParty/ANGLE/src/libGLESv2/entry_points_gles_3_1_autogen.h
>+++ b/Source/ThirdParty/ANGLE/src/libGLESv2/entry_points_gles_3_1_autogen.h
>@@ -1,23 +1,39 @@
> // GENERATED FILE - DO NOT EDIT.
> // Generated by generate_entry_points.py using data from gl.xml.
> //
>-// Copyright 2017 The ANGLE Project Authors. All rights reserved.
>+// Copyright 2019 The ANGLE Project Authors. All rights reserved.
> // Use of this source code is governed by a BSD-style license that can be
> // found in the LICENSE file.
> //
> // entry_points_gles_3_1_autogen.h:
> //   Defines the GLES 3.1 entry points.
> 
>-#ifndef LIBGLESV2_ENTRYPOINTSGLES31_AUTOGEN_H_
>-#define LIBGLESV2_ENTRYPOINTSGLES31_AUTOGEN_H_
>+#ifndef LIBGLESV2_ENTRY_POINTS_GLES_3_1_AUTOGEN_H_
>+#define LIBGLESV2_ENTRY_POINTS_GLES_3_1_AUTOGEN_H_
> 
> #include <GLES3/gl31.h>
> #include <export.h>
>-
> #include "common/platform.h"
> 
> namespace gl
> {
>+ANGLE_EXPORT void GL_APIENTRY ActiveShaderProgram(GLuint pipeline, GLuint program);
>+ANGLE_EXPORT void GL_APIENTRY BindImageTexture(GLuint unit,
>+                                               GLuint texture,
>+                                               GLint level,
>+                                               GLboolean layered,
>+                                               GLint layer,
>+                                               GLenum access,
>+                                               GLenum format);
>+ANGLE_EXPORT void GL_APIENTRY BindProgramPipeline(GLuint pipeline);
>+ANGLE_EXPORT void GL_APIENTRY BindVertexBuffer(GLuint bindingindex,
>+                                               GLuint buffer,
>+                                               GLintptr offset,
>+                                               GLsizei stride);
>+ANGLE_EXPORT GLuint GL_APIENTRY CreateShaderProgramv(GLenum type,
>+                                                     GLsizei count,
>+                                                     const GLchar *const *strings);
>+ANGLE_EXPORT void GL_APIENTRY DeleteProgramPipelines(GLsizei n, const GLuint *pipelines);
> ANGLE_EXPORT void GL_APIENTRY DispatchCompute(GLuint num_groups_x,
>                                               GLuint num_groups_y,
>                                               GLuint num_groups_z);
>@@ -25,14 +41,25 @@ ANGLE_EXPORT void GL_APIENTRY DispatchComputeIndirect(GLintptr indirect);
> ANGLE_EXPORT void GL_APIENTRY DrawArraysIndirect(GLenum mode, const void *indirect);
> ANGLE_EXPORT void GL_APIENTRY DrawElementsIndirect(GLenum mode, GLenum type, const void *indirect);
> ANGLE_EXPORT void GL_APIENTRY FramebufferParameteri(GLenum target, GLenum pname, GLint param);
>+ANGLE_EXPORT void GL_APIENTRY GenProgramPipelines(GLsizei n, GLuint *pipelines);
>+ANGLE_EXPORT void GL_APIENTRY GetBooleani_v(GLenum target, GLuint index, GLboolean *data);
> ANGLE_EXPORT void GL_APIENTRY GetFramebufferParameteriv(GLenum target, GLenum pname, GLint *params);
>+ANGLE_EXPORT void GL_APIENTRY GetMultisamplefv(GLenum pname, GLuint index, GLfloat *val);
> ANGLE_EXPORT void GL_APIENTRY GetProgramInterfaceiv(GLuint program,
>                                                     GLenum programInterface,
>                                                     GLenum pname,
>                                                     GLint *params);
>+ANGLE_EXPORT void GL_APIENTRY GetProgramPipelineInfoLog(GLuint pipeline,
>+                                                        GLsizei bufSize,
>+                                                        GLsizei *length,
>+                                                        GLchar *infoLog);
>+ANGLE_EXPORT void GL_APIENTRY GetProgramPipelineiv(GLuint pipeline, GLenum pname, GLint *params);
> ANGLE_EXPORT GLuint GL_APIENTRY GetProgramResourceIndex(GLuint program,
>                                                         GLenum programInterface,
>                                                         const GLchar *name);
>+ANGLE_EXPORT GLint GL_APIENTRY GetProgramResourceLocation(GLuint program,
>+                                                          GLenum programInterface,
>+                                                          const GLchar *name);
> ANGLE_EXPORT void GL_APIENTRY GetProgramResourceName(GLuint program,
>                                                      GLenum programInterface,
>                                                      GLuint index,
>@@ -47,127 +74,125 @@ ANGLE_EXPORT void GL_APIENTRY GetProgramResourceiv(GLuint program,
>                                                    GLsizei bufSize,
>                                                    GLsizei *length,
>                                                    GLint *params);
>-ANGLE_EXPORT GLint GL_APIENTRY GetProgramResourceLocation(GLuint program,
>-                                                          GLenum programInterface,
>-                                                          const GLchar *name);
>-ANGLE_EXPORT void GL_APIENTRY UseProgramStages(GLuint pipeline, GLbitfield stages, GLuint program);
>-ANGLE_EXPORT void GL_APIENTRY ActiveShaderProgram(GLuint pipeline, GLuint program);
>-ANGLE_EXPORT GLuint GL_APIENTRY CreateShaderProgramv(GLenum type,
>-                                                     GLsizei count,
>-                                                     const GLchar *const *strings);
>-ANGLE_EXPORT void GL_APIENTRY BindProgramPipeline(GLuint pipeline);
>-ANGLE_EXPORT void GL_APIENTRY DeleteProgramPipelines(GLsizei n, const GLuint *pipelines);
>-ANGLE_EXPORT void GL_APIENTRY GenProgramPipelines(GLsizei n, GLuint *pipelines);
>+ANGLE_EXPORT void GL_APIENTRY GetTexLevelParameterfv(GLenum target,
>+                                                     GLint level,
>+                                                     GLenum pname,
>+                                                     GLfloat *params);
>+ANGLE_EXPORT void GL_APIENTRY GetTexLevelParameteriv(GLenum target,
>+                                                     GLint level,
>+                                                     GLenum pname,
>+                                                     GLint *params);
> ANGLE_EXPORT GLboolean GL_APIENTRY IsProgramPipeline(GLuint pipeline);
>-ANGLE_EXPORT void GL_APIENTRY GetProgramPipelineiv(GLuint pipeline, GLenum pname, GLint *params);
>+ANGLE_EXPORT void GL_APIENTRY MemoryBarrier(GLbitfield barriers);
>+ANGLE_EXPORT void GL_APIENTRY MemoryBarrierByRegion(GLbitfield barriers);
>+ANGLE_EXPORT void GL_APIENTRY ProgramUniform1f(GLuint program, GLint location, GLfloat v0);
>+ANGLE_EXPORT void GL_APIENTRY ProgramUniform1fv(GLuint program,
>+                                                GLint location,
>+                                                GLsizei count,
>+                                                const GLfloat *value);
> ANGLE_EXPORT void GL_APIENTRY ProgramUniform1i(GLuint program, GLint location, GLint v0);
>-ANGLE_EXPORT void GL_APIENTRY ProgramUniform2i(GLuint program, GLint location, GLint v0, GLint v1);
>-ANGLE_EXPORT void GL_APIENTRY
>-ProgramUniform3i(GLuint program, GLint location, GLint v0, GLint v1, GLint v2);
>-ANGLE_EXPORT void GL_APIENTRY
>-ProgramUniform4i(GLuint program, GLint location, GLint v0, GLint v1, GLint v2, GLint v3);
>-ANGLE_EXPORT void GL_APIENTRY ProgramUniform1ui(GLuint program, GLint location, GLuint v0);
>-ANGLE_EXPORT void GL_APIENTRY ProgramUniform2ui(GLuint program,
>+ANGLE_EXPORT void GL_APIENTRY ProgramUniform1iv(GLuint program,
>                                                 GLint location,
>-                                                GLuint v0,
>-                                                GLuint v1);
>-ANGLE_EXPORT void GL_APIENTRY
>-ProgramUniform3ui(GLuint program, GLint location, GLuint v0, GLuint v1, GLuint v2);
>-ANGLE_EXPORT void GL_APIENTRY
>-ProgramUniform4ui(GLuint program, GLint location, GLuint v0, GLuint v1, GLuint v2, GLuint v3);
>-ANGLE_EXPORT void GL_APIENTRY ProgramUniform1f(GLuint program, GLint location, GLfloat v0);
>+                                                GLsizei count,
>+                                                const GLint *value);
>+ANGLE_EXPORT void GL_APIENTRY ProgramUniform1ui(GLuint program, GLint location, GLuint v0);
>+ANGLE_EXPORT void GL_APIENTRY ProgramUniform1uiv(GLuint program,
>+                                                 GLint location,
>+                                                 GLsizei count,
>+                                                 const GLuint *value);
> ANGLE_EXPORT void GL_APIENTRY ProgramUniform2f(GLuint program,
>                                                GLint location,
>                                                GLfloat v0,
>                                                GLfloat v1);
>-ANGLE_EXPORT void GL_APIENTRY
>-ProgramUniform3f(GLuint program, GLint location, GLfloat v0, GLfloat v1, GLfloat v2);
>-ANGLE_EXPORT void GL_APIENTRY
>-ProgramUniform4f(GLuint program, GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3);
>-ANGLE_EXPORT void GL_APIENTRY ProgramUniform1iv(GLuint program,
>+ANGLE_EXPORT void GL_APIENTRY ProgramUniform2fv(GLuint program,
>                                                 GLint location,
>                                                 GLsizei count,
>-                                                const GLint *value);
>+                                                const GLfloat *value);
>+ANGLE_EXPORT void GL_APIENTRY ProgramUniform2i(GLuint program, GLint location, GLint v0, GLint v1);
> ANGLE_EXPORT void GL_APIENTRY ProgramUniform2iv(GLuint program,
>                                                 GLint location,
>                                                 GLsizei count,
>                                                 const GLint *value);
>-ANGLE_EXPORT void GL_APIENTRY ProgramUniform3iv(GLuint program,
>-                                                GLint location,
>-                                                GLsizei count,
>-                                                const GLint *value);
>-ANGLE_EXPORT void GL_APIENTRY ProgramUniform4iv(GLuint program,
>+ANGLE_EXPORT void GL_APIENTRY ProgramUniform2ui(GLuint program,
>                                                 GLint location,
>-                                                GLsizei count,
>-                                                const GLint *value);
>-ANGLE_EXPORT void GL_APIENTRY ProgramUniform1uiv(GLuint program,
>-                                                 GLint location,
>-                                                 GLsizei count,
>-                                                 const GLuint *value);
>+                                                GLuint v0,
>+                                                GLuint v1);
> ANGLE_EXPORT void GL_APIENTRY ProgramUniform2uiv(GLuint program,
>                                                  GLint location,
>                                                  GLsizei count,
>                                                  const GLuint *value);
>-ANGLE_EXPORT void GL_APIENTRY ProgramUniform3uiv(GLuint program,
>-                                                 GLint location,
>-                                                 GLsizei count,
>-                                                 const GLuint *value);
>-ANGLE_EXPORT void GL_APIENTRY ProgramUniform4uiv(GLuint program,
>-                                                 GLint location,
>-                                                 GLsizei count,
>-                                                 const GLuint *value);
>-ANGLE_EXPORT void GL_APIENTRY ProgramUniform1fv(GLuint program,
>+ANGLE_EXPORT void GL_APIENTRY
>+ProgramUniform3f(GLuint program, GLint location, GLfloat v0, GLfloat v1, GLfloat v2);
>+ANGLE_EXPORT void GL_APIENTRY ProgramUniform3fv(GLuint program,
>                                                 GLint location,
>                                                 GLsizei count,
>                                                 const GLfloat *value);
>-ANGLE_EXPORT void GL_APIENTRY ProgramUniform2fv(GLuint program,
>+ANGLE_EXPORT void GL_APIENTRY
>+ProgramUniform3i(GLuint program, GLint location, GLint v0, GLint v1, GLint v2);
>+ANGLE_EXPORT void GL_APIENTRY ProgramUniform3iv(GLuint program,
>                                                 GLint location,
>                                                 GLsizei count,
>-                                                const GLfloat *value);
>-ANGLE_EXPORT void GL_APIENTRY ProgramUniform3fv(GLuint program,
>+                                                const GLint *value);
>+ANGLE_EXPORT void GL_APIENTRY
>+ProgramUniform3ui(GLuint program, GLint location, GLuint v0, GLuint v1, GLuint v2);
>+ANGLE_EXPORT void GL_APIENTRY ProgramUniform3uiv(GLuint program,
>+                                                 GLint location,
>+                                                 GLsizei count,
>+                                                 const GLuint *value);
>+ANGLE_EXPORT void GL_APIENTRY
>+ProgramUniform4f(GLuint program, GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3);
>+ANGLE_EXPORT void GL_APIENTRY ProgramUniform4fv(GLuint program,
>                                                 GLint location,
>                                                 GLsizei count,
>                                                 const GLfloat *value);
>-ANGLE_EXPORT void GL_APIENTRY ProgramUniform4fv(GLuint program,
>+ANGLE_EXPORT void GL_APIENTRY
>+ProgramUniform4i(GLuint program, GLint location, GLint v0, GLint v1, GLint v2, GLint v3);
>+ANGLE_EXPORT void GL_APIENTRY ProgramUniform4iv(GLuint program,
>                                                 GLint location,
>                                                 GLsizei count,
>-                                                const GLfloat *value);
>+                                                const GLint *value);
>+ANGLE_EXPORT void GL_APIENTRY
>+ProgramUniform4ui(GLuint program, GLint location, GLuint v0, GLuint v1, GLuint v2, GLuint v3);
>+ANGLE_EXPORT void GL_APIENTRY ProgramUniform4uiv(GLuint program,
>+                                                 GLint location,
>+                                                 GLsizei count,
>+                                                 const GLuint *value);
> ANGLE_EXPORT void GL_APIENTRY ProgramUniformMatrix2fv(GLuint program,
>                                                       GLint location,
>                                                       GLsizei count,
>                                                       GLboolean transpose,
>                                                       const GLfloat *value);
>-ANGLE_EXPORT void GL_APIENTRY ProgramUniformMatrix3fv(GLuint program,
>-                                                      GLint location,
>-                                                      GLsizei count,
>-                                                      GLboolean transpose,
>-                                                      const GLfloat *value);
>-ANGLE_EXPORT void GL_APIENTRY ProgramUniformMatrix4fv(GLuint program,
>-                                                      GLint location,
>-                                                      GLsizei count,
>-                                                      GLboolean transpose,
>-                                                      const GLfloat *value);
> ANGLE_EXPORT void GL_APIENTRY ProgramUniformMatrix2x3fv(GLuint program,
>                                                         GLint location,
>                                                         GLsizei count,
>                                                         GLboolean transpose,
>                                                         const GLfloat *value);
>-ANGLE_EXPORT void GL_APIENTRY ProgramUniformMatrix3x2fv(GLuint program,
>+ANGLE_EXPORT void GL_APIENTRY ProgramUniformMatrix2x4fv(GLuint program,
>                                                         GLint location,
>                                                         GLsizei count,
>                                                         GLboolean transpose,
>                                                         const GLfloat *value);
>-ANGLE_EXPORT void GL_APIENTRY ProgramUniformMatrix2x4fv(GLuint program,
>+ANGLE_EXPORT void GL_APIENTRY ProgramUniformMatrix3fv(GLuint program,
>+                                                      GLint location,
>+                                                      GLsizei count,
>+                                                      GLboolean transpose,
>+                                                      const GLfloat *value);
>+ANGLE_EXPORT void GL_APIENTRY ProgramUniformMatrix3x2fv(GLuint program,
>                                                         GLint location,
>                                                         GLsizei count,
>                                                         GLboolean transpose,
>                                                         const GLfloat *value);
>-ANGLE_EXPORT void GL_APIENTRY ProgramUniformMatrix4x2fv(GLuint program,
>+ANGLE_EXPORT void GL_APIENTRY ProgramUniformMatrix3x4fv(GLuint program,
>                                                         GLint location,
>                                                         GLsizei count,
>                                                         GLboolean transpose,
>                                                         const GLfloat *value);
>-ANGLE_EXPORT void GL_APIENTRY ProgramUniformMatrix3x4fv(GLuint program,
>+ANGLE_EXPORT void GL_APIENTRY ProgramUniformMatrix4fv(GLuint program,
>+                                                      GLint location,
>+                                                      GLsizei count,
>+                                                      GLboolean transpose,
>+                                                      const GLfloat *value);
>+ANGLE_EXPORT void GL_APIENTRY ProgramUniformMatrix4x2fv(GLuint program,
>                                                         GLint location,
>                                                         GLsizei count,
>                                                         GLboolean transpose,
>@@ -177,41 +202,16 @@ ANGLE_EXPORT void GL_APIENTRY ProgramUniformMatrix4x3fv(GLuint program,
>                                                         GLsizei count,
>                                                         GLboolean transpose,
>                                                         const GLfloat *value);
>-ANGLE_EXPORT void GL_APIENTRY ValidateProgramPipeline(GLuint pipeline);
>-ANGLE_EXPORT void GL_APIENTRY GetProgramPipelineInfoLog(GLuint pipeline,
>-                                                        GLsizei bufSize,
>-                                                        GLsizei *length,
>-                                                        GLchar *infoLog);
>-ANGLE_EXPORT void GL_APIENTRY BindImageTexture(GLuint unit,
>-                                               GLuint texture,
>-                                               GLint level,
>-                                               GLboolean layered,
>-                                               GLint layer,
>-                                               GLenum access,
>-                                               GLenum format);
>-ANGLE_EXPORT void GL_APIENTRY GetBooleani_v(GLenum target, GLuint index, GLboolean *data);
>-ANGLE_EXPORT void GL_APIENTRY MemoryBarrier(GLbitfield barriers);
>-ANGLE_EXPORT void GL_APIENTRY MemoryBarrierByRegion(GLbitfield barriers);
>+ANGLE_EXPORT void GL_APIENTRY SampleMaski(GLuint maskNumber, GLbitfield mask);
> ANGLE_EXPORT void GL_APIENTRY TexStorage2DMultisample(GLenum target,
>                                                       GLsizei samples,
>                                                       GLenum internalformat,
>                                                       GLsizei width,
>                                                       GLsizei height,
>                                                       GLboolean fixedsamplelocations);
>-ANGLE_EXPORT void GL_APIENTRY GetMultisamplefv(GLenum pname, GLuint index, GLfloat *val);
>-ANGLE_EXPORT void GL_APIENTRY SampleMaski(GLuint maskNumber, GLbitfield mask);
>-ANGLE_EXPORT void GL_APIENTRY GetTexLevelParameteriv(GLenum target,
>-                                                     GLint level,
>-                                                     GLenum pname,
>-                                                     GLint *params);
>-ANGLE_EXPORT void GL_APIENTRY GetTexLevelParameterfv(GLenum target,
>-                                                     GLint level,
>-                                                     GLenum pname,
>-                                                     GLfloat *params);
>-ANGLE_EXPORT void GL_APIENTRY BindVertexBuffer(GLuint bindingindex,
>-                                               GLuint buffer,
>-                                               GLintptr offset,
>-                                               GLsizei stride);
>+ANGLE_EXPORT void GL_APIENTRY UseProgramStages(GLuint pipeline, GLbitfield stages, GLuint program);
>+ANGLE_EXPORT void GL_APIENTRY ValidateProgramPipeline(GLuint pipeline);
>+ANGLE_EXPORT void GL_APIENTRY VertexAttribBinding(GLuint attribindex, GLuint bindingindex);
> ANGLE_EXPORT void GL_APIENTRY VertexAttribFormat(GLuint attribindex,
>                                                  GLint size,
>                                                  GLenum type,
>@@ -221,8 +221,7 @@ ANGLE_EXPORT void GL_APIENTRY VertexAttribIFormat(GLuint attribindex,
>                                                   GLint size,
>                                                   GLenum type,
>                                                   GLuint relativeoffset);
>-ANGLE_EXPORT void GL_APIENTRY VertexAttribBinding(GLuint attribindex, GLuint bindingindex);
> ANGLE_EXPORT void GL_APIENTRY VertexBindingDivisor(GLuint bindingindex, GLuint divisor);
> }  // namespace gl
> 
>-#endif  // LIBGLESV2_ENTRYPOINTSGLES31_AUTOGEN_H_
>+#endif  // LIBGLESV2_ENTRY_POINTS_GLES_3_1_AUTOGEN_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libGLESv2/entry_points_gles_ext_autogen.cpp b/Source/ThirdParty/ANGLE/src/libGLESv2/entry_points_gles_ext_autogen.cpp
>new file mode 100644
>index 00000000000..d2b11261622
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libGLESv2/entry_points_gles_ext_autogen.cpp
>@@ -0,0 +1,19063 @@
>+// GENERATED FILE - DO NOT EDIT.
>+// Generated by generate_entry_points.py using data from gl.xml and gl_angle_ext.xml.
>+//
>+// Copyright 2019 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// entry_points_gles_ext_autogen.cpp:
>+//   Defines the GLES extension entry points.
>+
>+#include "libGLESv2/entry_points_gles_ext_autogen.h"
>+
>+#include "libANGLE/Context.h"
>+#include "libANGLE/Context.inl.h"
>+#include "libANGLE/validationESEXT.h"
>+#include "libGLESv2/entry_points_utils.h"
>+#include "libGLESv2/global_state.h"
>+
>+#include "libANGLE/validationES1.h"
>+#include "libANGLE/validationES2.h"
>+#include "libANGLE/validationES3.h"
>+#include "libANGLE/validationES31.h"
>+
>+namespace gl
>+{
>+
>+// GL_ANGLE_copy_texture_3d
>+void GL_APIENTRY CopyTexture3DANGLE(GLuint sourceId,
>+                                    GLint sourceLevel,
>+                                    GLenum destTarget,
>+                                    GLuint destId,
>+                                    GLint destLevel,
>+                                    GLint internalFormat,
>+                                    GLenum destType,
>+                                    GLboolean unpackFlipY,
>+                                    GLboolean unpackPremultiplyAlpha,
>+                                    GLboolean unpackUnmultiplyAlpha)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLuint sourceId = %u, GLint sourceLevel = %d, GLenum destTarget = 0x%X, GLuint destId = "
>+        "%u, GLint destLevel = %d, GLint internalFormat = %d, GLenum destType = 0x%X, GLboolean "
>+        "unpackFlipY = %u, GLboolean unpackPremultiplyAlpha = %u, GLboolean unpackUnmultiplyAlpha "
>+        "= %u)",
>+        sourceId, sourceLevel, destTarget, destId, destLevel, internalFormat, destType, unpackFlipY,
>+        unpackPremultiplyAlpha, unpackUnmultiplyAlpha);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        TextureTarget destTargetPacked = FromGLenum<TextureTarget>(destTarget);
>+        if (context->skipValidation() ||
>+            ValidateCopyTexture3DANGLE(context, sourceId, sourceLevel, destTargetPacked, destId,
>+                                       destLevel, internalFormat, destType, unpackFlipY,
>+                                       unpackPremultiplyAlpha, unpackUnmultiplyAlpha))
>+        {
>+            context->copyTexture3D(sourceId, sourceLevel, destTargetPacked, destId, destLevel,
>+                                   internalFormat, destType, unpackFlipY, unpackPremultiplyAlpha,
>+                                   unpackUnmultiplyAlpha);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY CopySubTexture3DANGLE(GLuint sourceId,
>+                                       GLint sourceLevel,
>+                                       GLenum destTarget,
>+                                       GLuint destId,
>+                                       GLint destLevel,
>+                                       GLint xoffset,
>+                                       GLint yoffset,
>+                                       GLint zoffset,
>+                                       GLint x,
>+                                       GLint y,
>+                                       GLint z,
>+                                       GLint width,
>+                                       GLint height,
>+                                       GLint depth,
>+                                       GLboolean unpackFlipY,
>+                                       GLboolean unpackPremultiplyAlpha,
>+                                       GLboolean unpackUnmultiplyAlpha)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLuint sourceId = %u, GLint sourceLevel = %d, GLenum destTarget = 0x%X, GLuint destId = "
>+        "%u, GLint destLevel = %d, GLint xoffset = %d, GLint yoffset = %d, GLint zoffset = %d, "
>+        "GLint x = %d, GLint y = %d, GLint z = %d, GLint width = %d, GLint height = %d, GLint "
>+        "depth = %d, GLboolean unpackFlipY = %u, GLboolean unpackPremultiplyAlpha = %u, GLboolean "
>+        "unpackUnmultiplyAlpha = %u)",
>+        sourceId, sourceLevel, destTarget, destId, destLevel, xoffset, yoffset, zoffset, x, y, z,
>+        width, height, depth, unpackFlipY, unpackPremultiplyAlpha, unpackUnmultiplyAlpha);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        TextureTarget destTargetPacked = FromGLenum<TextureTarget>(destTarget);
>+        if (context->skipValidation() ||
>+            ValidateCopySubTexture3DANGLE(context, sourceId, sourceLevel, destTargetPacked, destId,
>+                                          destLevel, xoffset, yoffset, zoffset, x, y, z, width,
>+                                          height, depth, unpackFlipY, unpackPremultiplyAlpha,
>+                                          unpackUnmultiplyAlpha))
>+        {
>+            context->copySubTexture3D(sourceId, sourceLevel, destTargetPacked, destId, destLevel,
>+                                      xoffset, yoffset, zoffset, x, y, z, width, height, depth,
>+                                      unpackFlipY, unpackPremultiplyAlpha, unpackUnmultiplyAlpha);
>+        }
>+    }
>+}
>+
>+// GL_ANGLE_framebuffer_blit
>+void GL_APIENTRY BlitFramebufferANGLE(GLint srcX0,
>+                                      GLint srcY0,
>+                                      GLint srcX1,
>+                                      GLint srcY1,
>+                                      GLint dstX0,
>+                                      GLint dstY0,
>+                                      GLint dstX1,
>+                                      GLint dstY1,
>+                                      GLbitfield mask,
>+                                      GLenum filter)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLint srcX0 = %d, GLint srcY0 = %d, GLint srcX1 = %d, GLint srcY1 = %d, GLint dstX0 = "
>+        "%d, GLint dstY0 = %d, GLint dstX1 = %d, GLint dstY1 = %d, GLbitfield mask = 0x%X, GLenum "
>+        "filter = 0x%X)",
>+        srcX0, srcY0, srcX1, srcY1, dstX0, dstY0, dstX1, dstY1, mask, filter);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        if (context->skipValidation() ||
>+            ValidateBlitFramebufferANGLE(context, srcX0, srcY0, srcX1, srcY1, dstX0, dstY0, dstX1,
>+                                         dstY1, mask, filter))
>+        {
>+            context->blitFramebuffer(srcX0, srcY0, srcX1, srcY1, dstX0, dstY0, dstX1, dstY1, mask,
>+                                     filter);
>+        }
>+    }
>+}
>+
>+// GL_ANGLE_framebuffer_multisample
>+void GL_APIENTRY RenderbufferStorageMultisampleANGLE(GLenum target,
>+                                                     GLsizei samples,
>+                                                     GLenum internalformat,
>+                                                     GLsizei width,
>+                                                     GLsizei height)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLenum target = 0x%X, GLsizei samples = %d, GLenum internalformat = 0x%X, GLsizei width "
>+        "= %d, GLsizei height = %d)",
>+        target, samples, internalformat, width, height);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        if (context->skipValidation() ||
>+            ValidateRenderbufferStorageMultisampleANGLE(context, target, samples, internalformat,
>+                                                        width, height))
>+        {
>+            context->renderbufferStorageMultisample(target, samples, internalformat, width, height);
>+        }
>+    }
>+}
>+
>+// GL_ANGLE_instanced_arrays
>+void GL_APIENTRY DrawArraysInstancedANGLE(GLenum mode,
>+                                          GLint first,
>+                                          GLsizei count,
>+                                          GLsizei primcount)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum mode = 0x%X, GLint first = %d, GLsizei count = %d, GLsizei primcount = %d)",
>+          mode, first, count, primcount);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        PrimitiveMode modePacked = FromGLenum<PrimitiveMode>(mode);
>+        if (context->skipValidation() ||
>+            ValidateDrawArraysInstancedANGLE(context, modePacked, first, count, primcount))
>+        {
>+            context->drawArraysInstanced(modePacked, first, count, primcount);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY DrawElementsInstancedANGLE(GLenum mode,
>+                                            GLsizei count,
>+                                            GLenum type,
>+                                            const void *indices,
>+                                            GLsizei primcount)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLenum mode = 0x%X, GLsizei count = %d, GLenum type = 0x%X, const void *indices = "
>+        "0x%016" PRIxPTR ", GLsizei primcount = %d)",
>+        mode, count, type, (uintptr_t)indices, primcount);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        PrimitiveMode modePacked    = FromGLenum<PrimitiveMode>(mode);
>+        DrawElementsType typePacked = FromGLenum<DrawElementsType>(type);
>+        if (context->skipValidation() ||
>+            ValidateDrawElementsInstancedANGLE(context, modePacked, count, typePacked, indices,
>+                                               primcount))
>+        {
>+            context->drawElementsInstanced(modePacked, count, typePacked, indices, primcount);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY VertexAttribDivisorANGLE(GLuint index, GLuint divisor)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint index = %u, GLuint divisor = %u)", index, divisor);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        if (context->skipValidation() || ValidateVertexAttribDivisorANGLE(context, index, divisor))
>+        {
>+            context->vertexAttribDivisor(index, divisor);
>+        }
>+    }
>+}
>+
>+// GL_ANGLE_multi_draw
>+void GL_APIENTRY MultiDrawArraysANGLE(GLenum mode,
>+                                      const GLint *firsts,
>+                                      const GLsizei *counts,
>+                                      GLsizei drawcount)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum mode = 0x%X, const GLint *firsts = 0x%016" PRIxPTR
>+          ", const GLsizei *counts = 0x%016" PRIxPTR ", GLsizei drawcount = %d)",
>+          mode, (uintptr_t)firsts, (uintptr_t)counts, drawcount);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        PrimitiveMode modePacked = FromGLenum<PrimitiveMode>(mode);
>+        if (context->skipValidation() ||
>+            ValidateMultiDrawArraysANGLE(context, modePacked, firsts, counts, drawcount))
>+        {
>+            context->multiDrawArrays(modePacked, firsts, counts, drawcount);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY MultiDrawArraysInstancedANGLE(GLenum mode,
>+                                               const GLint *firsts,
>+                                               const GLsizei *counts,
>+                                               const GLsizei *instanceCounts,
>+                                               GLsizei drawcount)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum mode = 0x%X, const GLint *firsts = 0x%016" PRIxPTR
>+          ", const GLsizei *counts = 0x%016" PRIxPTR
>+          ", const GLsizei *instanceCounts = 0x%016" PRIxPTR ", GLsizei drawcount = %d)",
>+          mode, (uintptr_t)firsts, (uintptr_t)counts, (uintptr_t)instanceCounts, drawcount);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        PrimitiveMode modePacked = FromGLenum<PrimitiveMode>(mode);
>+        if (context->skipValidation() ||
>+            ValidateMultiDrawArraysInstancedANGLE(context, modePacked, firsts, counts,
>+                                                  instanceCounts, drawcount))
>+        {
>+            context->multiDrawArraysInstanced(modePacked, firsts, counts, instanceCounts,
>+                                              drawcount);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY MultiDrawElementsANGLE(GLenum mode,
>+                                        const GLsizei *counts,
>+                                        GLenum type,
>+                                        const GLvoid *const *indices,
>+                                        GLsizei drawcount)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum mode = 0x%X, const GLsizei *counts = 0x%016" PRIxPTR
>+          ", GLenum type = 0x%X, const GLvoid *const*indices = 0x%016" PRIxPTR
>+          ", GLsizei drawcount = %d)",
>+          mode, (uintptr_t)counts, type, (uintptr_t)indices, drawcount);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        PrimitiveMode modePacked    = FromGLenum<PrimitiveMode>(mode);
>+        DrawElementsType typePacked = FromGLenum<DrawElementsType>(type);
>+        if (context->skipValidation() ||
>+            ValidateMultiDrawElementsANGLE(context, modePacked, counts, typePacked, indices,
>+                                           drawcount))
>+        {
>+            context->multiDrawElements(modePacked, counts, typePacked, indices, drawcount);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY MultiDrawElementsInstancedANGLE(GLenum mode,
>+                                                 const GLsizei *counts,
>+                                                 GLenum type,
>+                                                 const GLvoid *const *indices,
>+                                                 const GLsizei *instanceCounts,
>+                                                 GLsizei drawcount)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum mode = 0x%X, const GLsizei *counts = 0x%016" PRIxPTR
>+          ", GLenum type = 0x%X, const GLvoid *const*indices = 0x%016" PRIxPTR
>+          ", const GLsizei*instanceCounts = 0x%016" PRIxPTR ", GLsizei drawcount = %d)",
>+          mode, (uintptr_t)counts, type, (uintptr_t)indices, (uintptr_t)instanceCounts, drawcount);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        PrimitiveMode modePacked    = FromGLenum<PrimitiveMode>(mode);
>+        DrawElementsType typePacked = FromGLenum<DrawElementsType>(type);
>+        if (context->skipValidation() ||
>+            ValidateMultiDrawElementsInstancedANGLE(context, modePacked, counts, typePacked,
>+                                                    indices, instanceCounts, drawcount))
>+        {
>+            context->multiDrawElementsInstanced(modePacked, counts, typePacked, indices,
>+                                                instanceCounts, drawcount);
>+        }
>+    }
>+}
>+
>+// GL_ANGLE_provoking_vertex
>+void GL_APIENTRY ProvokingVertexANGLE(GLenum mode)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum mode = 0x%X)", mode);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        ProvokingVertex modePacked = FromGLenum<ProvokingVertex>(mode);
>+        if (context->skipValidation() || ValidateProvokingVertexANGLE(context, modePacked))
>+        {
>+            context->provokingVertex(modePacked);
>+        }
>+    }
>+}
>+
>+// GL_ANGLE_request_extension
>+void GL_APIENTRY RequestExtensionANGLE(const GLchar *name)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(const GLchar * name = 0x%016" PRIxPTR ")", (uintptr_t)name);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        if (context->skipValidation() || ValidateRequestExtensionANGLE(context, name))
>+        {
>+            context->requestExtension(name);
>+        }
>+    }
>+}
>+
>+// GL_ANGLE_robust_client_memory
>+void GL_APIENTRY GetBooleanvRobustANGLE(GLenum pname,
>+                                        GLsizei bufSize,
>+                                        GLsizei *length,
>+                                        GLboolean *params)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum pname = 0x%X, GLsizei bufSize = %d, GLsizei * length = 0x%016" PRIxPTR
>+          ", GLboolean * params = 0x%016" PRIxPTR ")",
>+          pname, bufSize, (uintptr_t)length, (uintptr_t)params);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        if (context->skipValidation() ||
>+            ValidateGetBooleanvRobustANGLE(context, pname, bufSize, length, params))
>+        {
>+            context->getBooleanvRobust(pname, bufSize, length, params);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY GetBufferParameterivRobustANGLE(GLenum target,
>+                                                 GLenum pname,
>+                                                 GLsizei bufSize,
>+                                                 GLsizei *length,
>+                                                 GLint *params)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLenum target = 0x%X, GLenum pname = 0x%X, GLsizei bufSize = %d, GLsizei * length = "
>+        "0x%016" PRIxPTR ", GLint * params = 0x%016" PRIxPTR ")",
>+        target, pname, bufSize, (uintptr_t)length, (uintptr_t)params);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        BufferBinding targetPacked = FromGLenum<BufferBinding>(target);
>+        if (context->skipValidation() || ValidateGetBufferParameterivRobustANGLE(
>+                                             context, targetPacked, pname, bufSize, length, params))
>+        {
>+            context->getBufferParameterivRobust(targetPacked, pname, bufSize, length, params);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY GetFloatvRobustANGLE(GLenum pname,
>+                                      GLsizei bufSize,
>+                                      GLsizei *length,
>+                                      GLfloat *params)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum pname = 0x%X, GLsizei bufSize = %d, GLsizei * length = 0x%016" PRIxPTR
>+          ", GLfloat * params = 0x%016" PRIxPTR ")",
>+          pname, bufSize, (uintptr_t)length, (uintptr_t)params);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        if (context->skipValidation() ||
>+            ValidateGetFloatvRobustANGLE(context, pname, bufSize, length, params))
>+        {
>+            context->getFloatvRobust(pname, bufSize, length, params);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY GetFramebufferAttachmentParameterivRobustANGLE(GLenum target,
>+                                                                GLenum attachment,
>+                                                                GLenum pname,
>+                                                                GLsizei bufSize,
>+                                                                GLsizei *length,
>+                                                                GLint *params)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLenum target = 0x%X, GLenum attachment = 0x%X, GLenum pname = 0x%X, GLsizei bufSize = "
>+        "%d, GLsizei * length = 0x%016" PRIxPTR ", GLint * params = 0x%016" PRIxPTR ")",
>+        target, attachment, pname, bufSize, (uintptr_t)length, (uintptr_t)params);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        if (context->skipValidation() ||
>+            ValidateGetFramebufferAttachmentParameterivRobustANGLE(context, target, attachment,
>+                                                                   pname, bufSize, length, params))
>+        {
>+            context->getFramebufferAttachmentParameterivRobust(target, attachment, pname, bufSize,
>+                                                               length, params);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY GetIntegervRobustANGLE(GLenum pname, GLsizei bufSize, GLsizei *length, GLint *data)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum pname = 0x%X, GLsizei bufSize = %d, GLsizei * length = 0x%016" PRIxPTR
>+          ", GLint * data = 0x%016" PRIxPTR ")",
>+          pname, bufSize, (uintptr_t)length, (uintptr_t)data);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        if (context->skipValidation() ||
>+            ValidateGetIntegervRobustANGLE(context, pname, bufSize, length, data))
>+        {
>+            context->getIntegervRobust(pname, bufSize, length, data);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY GetProgramivRobustANGLE(GLuint program,
>+                                         GLenum pname,
>+                                         GLsizei bufSize,
>+                                         GLsizei *length,
>+                                         GLint *params)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLuint program = %u, GLenum pname = 0x%X, GLsizei bufSize = %d, GLsizei * length = "
>+        "0x%016" PRIxPTR ", GLint * params = 0x%016" PRIxPTR ")",
>+        program, pname, bufSize, (uintptr_t)length, (uintptr_t)params);
>+
>+    Context *context = GetGlobalContext();
>+    if (context)
>+    {
>+        if (context->skipValidation() ||
>+            ValidateGetProgramivRobustANGLE(context, program, pname, bufSize, length, params))
>+        {
>+            context->getProgramivRobust(program, pname, bufSize, length, params);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY GetRenderbufferParameterivRobustANGLE(GLenum target,
>+                                                       GLenum pname,
>+                                                       GLsizei bufSize,
>+                                                       GLsizei *length,
>+                                                       GLint *params)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLenum target = 0x%X, GLenum pname = 0x%X, GLsizei bufSize = %d, GLsizei * length = "
>+        "0x%016" PRIxPTR ", GLint * params = 0x%016" PRIxPTR ")",
>+        target, pname, bufSize, (uintptr_t)length, (uintptr_t)params);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        if (context->skipValidation() || ValidateGetRenderbufferParameterivRobustANGLE(
>+                                             context, target, pname, bufSize, length, params))
>+        {
>+            context->getRenderbufferParameterivRobust(target, pname, bufSize, length, params);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY
>+GetShaderivRobustANGLE(GLuint shader, GLenum pname, GLsizei bufSize, GLsizei *length, GLint *params)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLuint shader = %u, GLenum pname = 0x%X, GLsizei bufSize = %d, GLsizei * length = "
>+        "0x%016" PRIxPTR ", GLint * params = 0x%016" PRIxPTR ")",
>+        shader, pname, bufSize, (uintptr_t)length, (uintptr_t)params);
>+
>+    Context *context = GetGlobalContext();
>+    if (context)
>+    {
>+        if (context->skipValidation() ||
>+            ValidateGetShaderivRobustANGLE(context, shader, pname, bufSize, length, params))
>+        {
>+            context->getShaderivRobust(shader, pname, bufSize, length, params);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY GetTexParameterfvRobustANGLE(GLenum target,
>+                                              GLenum pname,
>+                                              GLsizei bufSize,
>+                                              GLsizei *length,
>+                                              GLfloat *params)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLenum target = 0x%X, GLenum pname = 0x%X, GLsizei bufSize = %d, GLsizei * length = "
>+        "0x%016" PRIxPTR ", GLfloat * params = 0x%016" PRIxPTR ")",
>+        target, pname, bufSize, (uintptr_t)length, (uintptr_t)params);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        TextureType targetPacked = FromGLenum<TextureType>(target);
>+        if (context->skipValidation() || ValidateGetTexParameterfvRobustANGLE(
>+                                             context, targetPacked, pname, bufSize, length, params))
>+        {
>+            context->getTexParameterfvRobust(targetPacked, pname, bufSize, length, params);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY GetTexParameterivRobustANGLE(GLenum target,
>+                                              GLenum pname,
>+                                              GLsizei bufSize,
>+                                              GLsizei *length,
>+                                              GLint *params)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLenum target = 0x%X, GLenum pname = 0x%X, GLsizei bufSize = %d, GLsizei * length = "
>+        "0x%016" PRIxPTR ", GLint * params = 0x%016" PRIxPTR ")",
>+        target, pname, bufSize, (uintptr_t)length, (uintptr_t)params);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        TextureType targetPacked = FromGLenum<TextureType>(target);
>+        if (context->skipValidation() || ValidateGetTexParameterivRobustANGLE(
>+                                             context, targetPacked, pname, bufSize, length, params))
>+        {
>+            context->getTexParameterivRobust(targetPacked, pname, bufSize, length, params);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY GetUniformfvRobustANGLE(GLuint program,
>+                                         GLint location,
>+                                         GLsizei bufSize,
>+                                         GLsizei *length,
>+                                         GLfloat *params)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLuint program = %u, GLint location = %d, GLsizei bufSize = %d, GLsizei * length = "
>+        "0x%016" PRIxPTR ", GLfloat * params = 0x%016" PRIxPTR ")",
>+        program, location, bufSize, (uintptr_t)length, (uintptr_t)params);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        if (context->skipValidation() ||
>+            ValidateGetUniformfvRobustANGLE(context, program, location, bufSize, length, params))
>+        {
>+            context->getUniformfvRobust(program, location, bufSize, length, params);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY GetUniformivRobustANGLE(GLuint program,
>+                                         GLint location,
>+                                         GLsizei bufSize,
>+                                         GLsizei *length,
>+                                         GLint *params)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLuint program = %u, GLint location = %d, GLsizei bufSize = %d, GLsizei * length = "
>+        "0x%016" PRIxPTR ", GLint * params = 0x%016" PRIxPTR ")",
>+        program, location, bufSize, (uintptr_t)length, (uintptr_t)params);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        if (context->skipValidation() ||
>+            ValidateGetUniformivRobustANGLE(context, program, location, bufSize, length, params))
>+        {
>+            context->getUniformivRobust(program, location, bufSize, length, params);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY GetVertexAttribfvRobustANGLE(GLuint index,
>+                                              GLenum pname,
>+                                              GLsizei bufSize,
>+                                              GLsizei *length,
>+                                              GLfloat *params)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLuint index = %u, GLenum pname = 0x%X, GLsizei bufSize = %d, GLsizei * length = "
>+        "0x%016" PRIxPTR ", GLfloat * params = 0x%016" PRIxPTR ")",
>+        index, pname, bufSize, (uintptr_t)length, (uintptr_t)params);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        if (context->skipValidation() ||
>+            ValidateGetVertexAttribfvRobustANGLE(context, index, pname, bufSize, length, params))
>+        {
>+            context->getVertexAttribfvRobust(index, pname, bufSize, length, params);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY GetVertexAttribivRobustANGLE(GLuint index,
>+                                              GLenum pname,
>+                                              GLsizei bufSize,
>+                                              GLsizei *length,
>+                                              GLint *params)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLuint index = %u, GLenum pname = 0x%X, GLsizei bufSize = %d, GLsizei * length = "
>+        "0x%016" PRIxPTR ", GLint * params = 0x%016" PRIxPTR ")",
>+        index, pname, bufSize, (uintptr_t)length, (uintptr_t)params);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        if (context->skipValidation() ||
>+            ValidateGetVertexAttribivRobustANGLE(context, index, pname, bufSize, length, params))
>+        {
>+            context->getVertexAttribivRobust(index, pname, bufSize, length, params);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY GetVertexAttribPointervRobustANGLE(GLuint index,
>+                                                    GLenum pname,
>+                                                    GLsizei bufSize,
>+                                                    GLsizei *length,
>+                                                    void **pointer)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLuint index = %u, GLenum pname = 0x%X, GLsizei bufSize = %d, GLsizei * length = "
>+        "0x%016" PRIxPTR ", void ** pointer = 0x%016" PRIxPTR ")",
>+        index, pname, bufSize, (uintptr_t)length, (uintptr_t)pointer);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        if (context->skipValidation() || ValidateGetVertexAttribPointervRobustANGLE(
>+                                             context, index, pname, bufSize, length, pointer))
>+        {
>+            context->getVertexAttribPointervRobust(index, pname, bufSize, length, pointer);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY ReadPixelsRobustANGLE(GLint x,
>+                                       GLint y,
>+                                       GLsizei width,
>+                                       GLsizei height,
>+                                       GLenum format,
>+                                       GLenum type,
>+                                       GLsizei bufSize,
>+                                       GLsizei *length,
>+                                       GLsizei *columns,
>+                                       GLsizei *rows,
>+                                       void *pixels)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLint x = %d, GLint y = %d, GLsizei width = %d, GLsizei height = %d, GLenum format = "
>+        "0x%X, GLenum type = 0x%X, GLsizei bufSize = %d, GLsizei * length = 0x%016" PRIxPTR
>+        ", GLsizei * columns = 0x%016" PRIxPTR ", GLsizei * rows = 0x%016" PRIxPTR
>+        ", void * pixels = 0x%016" PRIxPTR ")",
>+        x, y, width, height, format, type, bufSize, (uintptr_t)length, (uintptr_t)columns,
>+        (uintptr_t)rows, (uintptr_t)pixels);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        if (context->skipValidation() ||
>+            ValidateReadPixelsRobustANGLE(context, x, y, width, height, format, type, bufSize,
>+                                          length, columns, rows, pixels))
>+        {
>+            context->readPixelsRobust(x, y, width, height, format, type, bufSize, length, columns,
>+                                      rows, pixels);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY TexImage2DRobustANGLE(GLenum target,
>+                                       GLint level,
>+                                       GLint internalformat,
>+                                       GLsizei width,
>+                                       GLsizei height,
>+                                       GLint border,
>+                                       GLenum format,
>+                                       GLenum type,
>+                                       GLsizei bufSize,
>+                                       const void *pixels)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLenum target = 0x%X, GLint level = %d, GLint internalformat = %d, GLsizei width = %d, "
>+        "GLsizei height = %d, GLint border = %d, GLenum format = 0x%X, GLenum type = 0x%X, GLsizei "
>+        "bufSize = %d, const void * pixels = 0x%016" PRIxPTR ")",
>+        target, level, internalformat, width, height, border, format, type, bufSize,
>+        (uintptr_t)pixels);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        TextureTarget targetPacked = FromGLenum<TextureTarget>(target);
>+        if (context->skipValidation() ||
>+            ValidateTexImage2DRobustANGLE(context, targetPacked, level, internalformat, width,
>+                                          height, border, format, type, bufSize, pixels))
>+        {
>+            context->texImage2DRobust(targetPacked, level, internalformat, width, height, border,
>+                                      format, type, bufSize, pixels);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY TexParameterfvRobustANGLE(GLenum target,
>+                                           GLenum pname,
>+                                           GLsizei bufSize,
>+                                           const GLfloat *params)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLenum target = 0x%X, GLenum pname = 0x%X, GLsizei bufSize = %d, const GLfloat * params "
>+        "= 0x%016" PRIxPTR ")",
>+        target, pname, bufSize, (uintptr_t)params);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        TextureType targetPacked = FromGLenum<TextureType>(target);
>+        if (context->skipValidation() ||
>+            ValidateTexParameterfvRobustANGLE(context, targetPacked, pname, bufSize, params))
>+        {
>+            context->texParameterfvRobust(targetPacked, pname, bufSize, params);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY TexParameterivRobustANGLE(GLenum target,
>+                                           GLenum pname,
>+                                           GLsizei bufSize,
>+                                           const GLint *params)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLenum target = 0x%X, GLenum pname = 0x%X, GLsizei bufSize = %d, const GLint * params = "
>+        "0x%016" PRIxPTR ")",
>+        target, pname, bufSize, (uintptr_t)params);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        TextureType targetPacked = FromGLenum<TextureType>(target);
>+        if (context->skipValidation() ||
>+            ValidateTexParameterivRobustANGLE(context, targetPacked, pname, bufSize, params))
>+        {
>+            context->texParameterivRobust(targetPacked, pname, bufSize, params);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY TexSubImage2DRobustANGLE(GLenum target,
>+                                          GLint level,
>+                                          GLint xoffset,
>+                                          GLint yoffset,
>+                                          GLsizei width,
>+                                          GLsizei height,
>+                                          GLenum format,
>+                                          GLenum type,
>+                                          GLsizei bufSize,
>+                                          const void *pixels)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLenum target = 0x%X, GLint level = %d, GLint xoffset = %d, GLint yoffset = %d, GLsizei "
>+        "width = %d, GLsizei height = %d, GLenum format = 0x%X, GLenum type = 0x%X, GLsizei "
>+        "bufSize = %d, const void * pixels = 0x%016" PRIxPTR ")",
>+        target, level, xoffset, yoffset, width, height, format, type, bufSize, (uintptr_t)pixels);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        TextureTarget targetPacked = FromGLenum<TextureTarget>(target);
>+        if (context->skipValidation() ||
>+            ValidateTexSubImage2DRobustANGLE(context, targetPacked, level, xoffset, yoffset, width,
>+                                             height, format, type, bufSize, pixels))
>+        {
>+            context->texSubImage2DRobust(targetPacked, level, xoffset, yoffset, width, height,
>+                                         format, type, bufSize, pixels);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY TexImage3DRobustANGLE(GLenum target,
>+                                       GLint level,
>+                                       GLint internalformat,
>+                                       GLsizei width,
>+                                       GLsizei height,
>+                                       GLsizei depth,
>+                                       GLint border,
>+                                       GLenum format,
>+                                       GLenum type,
>+                                       GLsizei bufSize,
>+                                       const void *pixels)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLenum target = 0x%X, GLint level = %d, GLint internalformat = %d, GLsizei width = %d, "
>+        "GLsizei height = %d, GLsizei depth = %d, GLint border = %d, GLenum format = 0x%X, GLenum "
>+        "type = 0x%X, GLsizei bufSize = %d, const void * pixels = 0x%016" PRIxPTR ")",
>+        target, level, internalformat, width, height, depth, border, format, type, bufSize,
>+        (uintptr_t)pixels);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        TextureTarget targetPacked = FromGLenum<TextureTarget>(target);
>+        if (context->skipValidation() ||
>+            ValidateTexImage3DRobustANGLE(context, targetPacked, level, internalformat, width,
>+                                          height, depth, border, format, type, bufSize, pixels))
>+        {
>+            context->texImage3DRobust(targetPacked, level, internalformat, width, height, depth,
>+                                      border, format, type, bufSize, pixels);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY TexSubImage3DRobustANGLE(GLenum target,
>+                                          GLint level,
>+                                          GLint xoffset,
>+                                          GLint yoffset,
>+                                          GLint zoffset,
>+                                          GLsizei width,
>+                                          GLsizei height,
>+                                          GLsizei depth,
>+                                          GLenum format,
>+                                          GLenum type,
>+                                          GLsizei bufSize,
>+                                          const void *pixels)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLenum target = 0x%X, GLint level = %d, GLint xoffset = %d, GLint yoffset = %d, GLint "
>+        "zoffset = %d, GLsizei width = %d, GLsizei height = %d, GLsizei depth = %d, GLenum format "
>+        "= 0x%X, GLenum type = 0x%X, GLsizei bufSize = %d, const void * pixels = 0x%016" PRIxPTR
>+        ")",
>+        target, level, xoffset, yoffset, zoffset, width, height, depth, format, type, bufSize,
>+        (uintptr_t)pixels);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        TextureTarget targetPacked = FromGLenum<TextureTarget>(target);
>+        if (context->skipValidation() ||
>+            ValidateTexSubImage3DRobustANGLE(context, targetPacked, level, xoffset, yoffset,
>+                                             zoffset, width, height, depth, format, type, bufSize,
>+                                             pixels))
>+        {
>+            context->texSubImage3DRobust(targetPacked, level, xoffset, yoffset, zoffset, width,
>+                                         height, depth, format, type, bufSize, pixels);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY CompressedTexImage2DRobustANGLE(GLenum target,
>+                                                 GLint level,
>+                                                 GLenum internalformat,
>+                                                 GLsizei width,
>+                                                 GLsizei height,
>+                                                 GLint border,
>+                                                 GLsizei imageSize,
>+                                                 GLsizei dataSize,
>+                                                 const GLvoid *data)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLenum target = 0x%X, GLint level = %d, GLenum internalformat = 0x%X, GLsizei width = "
>+        "%d, GLsizei height = %d, GLint border = %d, GLsizei imageSize = %d, GLsizei dataSize = "
>+        "%d, const GLvoid * data = 0x%016" PRIxPTR ")",
>+        target, level, internalformat, width, height, border, imageSize, dataSize, (uintptr_t)data);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        TextureTarget targetPacked = FromGLenum<TextureTarget>(target);
>+        if (context->skipValidation() || ValidateCompressedTexImage2DRobustANGLE(
>+                                             context, targetPacked, level, internalformat, width,
>+                                             height, border, imageSize, dataSize, data))
>+        {
>+            context->compressedTexImage2DRobust(targetPacked, level, internalformat, width, height,
>+                                                border, imageSize, dataSize, data);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY CompressedTexSubImage2DRobustANGLE(GLenum target,
>+                                                    GLint level,
>+                                                    GLsizei xoffset,
>+                                                    GLsizei yoffset,
>+                                                    GLsizei width,
>+                                                    GLsizei height,
>+                                                    GLenum format,
>+                                                    GLsizei imageSize,
>+                                                    GLsizei dataSize,
>+                                                    const GLvoid *data)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLenum target = 0x%X, GLint level = %d, GLsizei xoffset = %d, GLsizei yoffset = %d, "
>+        "GLsizei width = %d, GLsizei height = %d, GLenum format = 0x%X, GLsizei imageSize = %d, "
>+        "GLsizei dataSize = %d, const GLvoid * data = 0x%016" PRIxPTR ")",
>+        target, level, xoffset, yoffset, width, height, format, imageSize, dataSize,
>+        (uintptr_t)data);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        TextureTarget targetPacked = FromGLenum<TextureTarget>(target);
>+        if (context->skipValidation() || ValidateCompressedTexSubImage2DRobustANGLE(
>+                                             context, targetPacked, level, xoffset, yoffset, width,
>+                                             height, format, imageSize, dataSize, data))
>+        {
>+            context->compressedTexSubImage2DRobust(targetPacked, level, xoffset, yoffset, width,
>+                                                   height, format, imageSize, dataSize, data);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY CompressedTexImage3DRobustANGLE(GLenum target,
>+                                                 GLint level,
>+                                                 GLenum internalformat,
>+                                                 GLsizei width,
>+                                                 GLsizei height,
>+                                                 GLsizei depth,
>+                                                 GLint border,
>+                                                 GLsizei imageSize,
>+                                                 GLsizei dataSize,
>+                                                 const GLvoid *data)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLenum target = 0x%X, GLint level = %d, GLenum internalformat = 0x%X, GLsizei width = "
>+        "%d, GLsizei height = %d, GLsizei depth = %d, GLint border = %d, GLsizei imageSize = %d, "
>+        "GLsizei dataSize = %d, const GLvoid * data = 0x%016" PRIxPTR ")",
>+        target, level, internalformat, width, height, depth, border, imageSize, dataSize,
>+        (uintptr_t)data);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        TextureTarget targetPacked = FromGLenum<TextureTarget>(target);
>+        if (context->skipValidation() || ValidateCompressedTexImage3DRobustANGLE(
>+                                             context, targetPacked, level, internalformat, width,
>+                                             height, depth, border, imageSize, dataSize, data))
>+        {
>+            context->compressedTexImage3DRobust(targetPacked, level, internalformat, width, height,
>+                                                depth, border, imageSize, dataSize, data);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY CompressedTexSubImage3DRobustANGLE(GLenum target,
>+                                                    GLint level,
>+                                                    GLint xoffset,
>+                                                    GLint yoffset,
>+                                                    GLint zoffset,
>+                                                    GLsizei width,
>+                                                    GLsizei height,
>+                                                    GLsizei depth,
>+                                                    GLenum format,
>+                                                    GLsizei imageSize,
>+                                                    GLsizei dataSize,
>+                                                    const GLvoid *data)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLenum target = 0x%X, GLint level = %d, GLint xoffset = %d, GLint yoffset = %d, GLint "
>+        "zoffset = %d, GLsizei width = %d, GLsizei height = %d, GLsizei depth = %d, GLenum format "
>+        "= 0x%X, GLsizei imageSize = %d, GLsizei dataSize = %d, const GLvoid * data = "
>+        "0x%016" PRIxPTR ")",
>+        target, level, xoffset, yoffset, zoffset, width, height, depth, format, imageSize, dataSize,
>+        (uintptr_t)data);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        TextureTarget targetPacked = FromGLenum<TextureTarget>(target);
>+        if (context->skipValidation() ||
>+            ValidateCompressedTexSubImage3DRobustANGLE(context, targetPacked, level, xoffset,
>+                                                       yoffset, zoffset, width, height, depth,
>+                                                       format, imageSize, dataSize, data))
>+        {
>+            context->compressedTexSubImage3DRobust(targetPacked, level, xoffset, yoffset, zoffset,
>+                                                   width, height, depth, format, imageSize,
>+                                                   dataSize, data);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY
>+GetQueryivRobustANGLE(GLenum target, GLenum pname, GLsizei bufSize, GLsizei *length, GLint *params)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLenum target = 0x%X, GLenum pname = 0x%X, GLsizei bufSize = %d, GLsizei * length = "
>+        "0x%016" PRIxPTR ", GLint * params = 0x%016" PRIxPTR ")",
>+        target, pname, bufSize, (uintptr_t)length, (uintptr_t)params);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        QueryType targetPacked = FromGLenum<QueryType>(target);
>+        if (context->skipValidation() ||
>+            ValidateGetQueryivRobustANGLE(context, targetPacked, pname, bufSize, length, params))
>+        {
>+            context->getQueryivRobust(targetPacked, pname, bufSize, length, params);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY GetQueryObjectuivRobustANGLE(GLuint id,
>+                                              GLenum pname,
>+                                              GLsizei bufSize,
>+                                              GLsizei *length,
>+                                              GLuint *params)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLuint id = %u, GLenum pname = 0x%X, GLsizei bufSize = %d, GLsizei * length = "
>+        "0x%016" PRIxPTR ", GLuint * params = 0x%016" PRIxPTR ")",
>+        id, pname, bufSize, (uintptr_t)length, (uintptr_t)params);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        if (context->skipValidation() ||
>+            ValidateGetQueryObjectuivRobustANGLE(context, id, pname, bufSize, length, params))
>+        {
>+            context->getQueryObjectuivRobust(id, pname, bufSize, length, params);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY GetBufferPointervRobustANGLE(GLenum target,
>+                                              GLenum pname,
>+                                              GLsizei bufSize,
>+                                              GLsizei *length,
>+                                              void **params)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLenum target = 0x%X, GLenum pname = 0x%X, GLsizei bufSize = %d, GLsizei * length = "
>+        "0x%016" PRIxPTR ", void ** params = 0x%016" PRIxPTR ")",
>+        target, pname, bufSize, (uintptr_t)length, (uintptr_t)params);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        BufferBinding targetPacked = FromGLenum<BufferBinding>(target);
>+        if (context->skipValidation() || ValidateGetBufferPointervRobustANGLE(
>+                                             context, targetPacked, pname, bufSize, length, params))
>+        {
>+            context->getBufferPointervRobust(targetPacked, pname, bufSize, length, params);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY
>+GetIntegeri_vRobustANGLE(GLenum target, GLuint index, GLsizei bufSize, GLsizei *length, GLint *data)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLenum target = 0x%X, GLuint index = %u, GLsizei bufSize = %d, GLsizei * length = "
>+        "0x%016" PRIxPTR ", GLint * data = 0x%016" PRIxPTR ")",
>+        target, index, bufSize, (uintptr_t)length, (uintptr_t)data);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        if (context->skipValidation() ||
>+            ValidateGetIntegeri_vRobustANGLE(context, target, index, bufSize, length, data))
>+        {
>+            context->getIntegeri_vRobust(target, index, bufSize, length, data);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY GetInternalformativRobustANGLE(GLenum target,
>+                                                GLenum internalformat,
>+                                                GLenum pname,
>+                                                GLsizei bufSize,
>+                                                GLsizei *length,
>+                                                GLint *params)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLenum target = 0x%X, GLenum internalformat = 0x%X, GLenum pname = 0x%X, GLsizei bufSize "
>+        "= %d, GLsizei * length = 0x%016" PRIxPTR ", GLint * params = 0x%016" PRIxPTR ")",
>+        target, internalformat, pname, bufSize, (uintptr_t)length, (uintptr_t)params);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        if (context->skipValidation() ||
>+            ValidateGetInternalformativRobustANGLE(context, target, internalformat, pname, bufSize,
>+                                                   length, params))
>+        {
>+            context->getInternalformativRobust(target, internalformat, pname, bufSize, length,
>+                                               params);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY GetVertexAttribIivRobustANGLE(GLuint index,
>+                                               GLenum pname,
>+                                               GLsizei bufSize,
>+                                               GLsizei *length,
>+                                               GLint *params)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLuint index = %u, GLenum pname = 0x%X, GLsizei bufSize = %d, GLsizei * length = "
>+        "0x%016" PRIxPTR ", GLint * params = 0x%016" PRIxPTR ")",
>+        index, pname, bufSize, (uintptr_t)length, (uintptr_t)params);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        if (context->skipValidation() ||
>+            ValidateGetVertexAttribIivRobustANGLE(context, index, pname, bufSize, length, params))
>+        {
>+            context->getVertexAttribIivRobust(index, pname, bufSize, length, params);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY GetVertexAttribIuivRobustANGLE(GLuint index,
>+                                                GLenum pname,
>+                                                GLsizei bufSize,
>+                                                GLsizei *length,
>+                                                GLuint *params)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLuint index = %u, GLenum pname = 0x%X, GLsizei bufSize = %d, GLsizei * length = "
>+        "0x%016" PRIxPTR ", GLuint * params = 0x%016" PRIxPTR ")",
>+        index, pname, bufSize, (uintptr_t)length, (uintptr_t)params);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        if (context->skipValidation() ||
>+            ValidateGetVertexAttribIuivRobustANGLE(context, index, pname, bufSize, length, params))
>+        {
>+            context->getVertexAttribIuivRobust(index, pname, bufSize, length, params);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY GetUniformuivRobustANGLE(GLuint program,
>+                                          GLint location,
>+                                          GLsizei bufSize,
>+                                          GLsizei *length,
>+                                          GLuint *params)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLuint program = %u, GLint location = %d, GLsizei bufSize = %d, GLsizei * length = "
>+        "0x%016" PRIxPTR ", GLuint * params = 0x%016" PRIxPTR ")",
>+        program, location, bufSize, (uintptr_t)length, (uintptr_t)params);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        if (context->skipValidation() ||
>+            ValidateGetUniformuivRobustANGLE(context, program, location, bufSize, length, params))
>+        {
>+            context->getUniformuivRobust(program, location, bufSize, length, params);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY GetActiveUniformBlockivRobustANGLE(GLuint program,
>+                                                    GLuint uniformBlockIndex,
>+                                                    GLenum pname,
>+                                                    GLsizei bufSize,
>+                                                    GLsizei *length,
>+                                                    GLint *params)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLuint program = %u, GLuint uniformBlockIndex = %u, GLenum pname = 0x%X, GLsizei bufSize "
>+        "= %d, GLsizei * length = 0x%016" PRIxPTR ", GLint * params = 0x%016" PRIxPTR ")",
>+        program, uniformBlockIndex, pname, bufSize, (uintptr_t)length, (uintptr_t)params);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        if (context->skipValidation() ||
>+            ValidateGetActiveUniformBlockivRobustANGLE(context, program, uniformBlockIndex, pname,
>+                                                       bufSize, length, params))
>+        {
>+            context->getActiveUniformBlockivRobust(program, uniformBlockIndex, pname, bufSize,
>+                                                   length, params);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY GetInteger64vRobustANGLE(GLenum pname,
>+                                          GLsizei bufSize,
>+                                          GLsizei *length,
>+                                          GLint64 *data)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum pname = 0x%X, GLsizei bufSize = %d, GLsizei * length = 0x%016" PRIxPTR
>+          ", GLint64 * data = 0x%016" PRIxPTR ")",
>+          pname, bufSize, (uintptr_t)length, (uintptr_t)data);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        if (context->skipValidation() ||
>+            ValidateGetInteger64vRobustANGLE(context, pname, bufSize, length, data))
>+        {
>+            context->getInteger64vRobust(pname, bufSize, length, data);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY GetInteger64i_vRobustANGLE(GLenum target,
>+                                            GLuint index,
>+                                            GLsizei bufSize,
>+                                            GLsizei *length,
>+                                            GLint64 *data)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLenum target = 0x%X, GLuint index = %u, GLsizei bufSize = %d, GLsizei * length = "
>+        "0x%016" PRIxPTR ", GLint64 * data = 0x%016" PRIxPTR ")",
>+        target, index, bufSize, (uintptr_t)length, (uintptr_t)data);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        if (context->skipValidation() ||
>+            ValidateGetInteger64i_vRobustANGLE(context, target, index, bufSize, length, data))
>+        {
>+            context->getInteger64i_vRobust(target, index, bufSize, length, data);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY GetBufferParameteri64vRobustANGLE(GLenum target,
>+                                                   GLenum pname,
>+                                                   GLsizei bufSize,
>+                                                   GLsizei *length,
>+                                                   GLint64 *params)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLenum target = 0x%X, GLenum pname = 0x%X, GLsizei bufSize = %d, GLsizei * length = "
>+        "0x%016" PRIxPTR ", GLint64 * params = 0x%016" PRIxPTR ")",
>+        target, pname, bufSize, (uintptr_t)length, (uintptr_t)params);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        BufferBinding targetPacked = FromGLenum<BufferBinding>(target);
>+        if (context->skipValidation() || ValidateGetBufferParameteri64vRobustANGLE(
>+                                             context, targetPacked, pname, bufSize, length, params))
>+        {
>+            context->getBufferParameteri64vRobust(targetPacked, pname, bufSize, length, params);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY SamplerParameterivRobustANGLE(GLuint sampler,
>+                                               GLuint pname,
>+                                               GLsizei bufSize,
>+                                               const GLint *param)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLuint sampler = %u, GLuint pname = %u, GLsizei bufSize = %d, const GLint * param = "
>+        "0x%016" PRIxPTR ")",
>+        sampler, pname, bufSize, (uintptr_t)param);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        if (context->skipValidation() ||
>+            ValidateSamplerParameterivRobustANGLE(context, sampler, pname, bufSize, param))
>+        {
>+            context->samplerParameterivRobust(sampler, pname, bufSize, param);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY SamplerParameterfvRobustANGLE(GLuint sampler,
>+                                               GLenum pname,
>+                                               GLsizei bufSize,
>+                                               const GLfloat *param)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLuint sampler = %u, GLenum pname = 0x%X, GLsizei bufSize = %d, const GLfloat * param = "
>+        "0x%016" PRIxPTR ")",
>+        sampler, pname, bufSize, (uintptr_t)param);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        if (context->skipValidation() ||
>+            ValidateSamplerParameterfvRobustANGLE(context, sampler, pname, bufSize, param))
>+        {
>+            context->samplerParameterfvRobust(sampler, pname, bufSize, param);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY GetSamplerParameterivRobustANGLE(GLuint sampler,
>+                                                  GLenum pname,
>+                                                  GLsizei bufSize,
>+                                                  GLsizei *length,
>+                                                  GLint *params)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLuint sampler = %u, GLenum pname = 0x%X, GLsizei bufSize = %d, GLsizei * length = "
>+        "0x%016" PRIxPTR ", GLint * params = 0x%016" PRIxPTR ")",
>+        sampler, pname, bufSize, (uintptr_t)length, (uintptr_t)params);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        if (context->skipValidation() || ValidateGetSamplerParameterivRobustANGLE(
>+                                             context, sampler, pname, bufSize, length, params))
>+        {
>+            context->getSamplerParameterivRobust(sampler, pname, bufSize, length, params);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY GetSamplerParameterfvRobustANGLE(GLuint sampler,
>+                                                  GLenum pname,
>+                                                  GLsizei bufSize,
>+                                                  GLsizei *length,
>+                                                  GLfloat *params)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLuint sampler = %u, GLenum pname = 0x%X, GLsizei bufSize = %d, GLsizei * length = "
>+        "0x%016" PRIxPTR ", GLfloat * params = 0x%016" PRIxPTR ")",
>+        sampler, pname, bufSize, (uintptr_t)length, (uintptr_t)params);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        if (context->skipValidation() || ValidateGetSamplerParameterfvRobustANGLE(
>+                                             context, sampler, pname, bufSize, length, params))
>+        {
>+            context->getSamplerParameterfvRobust(sampler, pname, bufSize, length, params);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY GetFramebufferParameterivRobustANGLE(GLuint sampler,
>+                                                      GLenum pname,
>+                                                      GLsizei bufSize,
>+                                                      GLsizei *length,
>+                                                      GLint *params)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLuint sampler = %u, GLenum pname = 0x%X, GLsizei bufSize = %d, GLsizei * length = "
>+        "0x%016" PRIxPTR ", GLint * params = 0x%016" PRIxPTR ")",
>+        sampler, pname, bufSize, (uintptr_t)length, (uintptr_t)params);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        if (context->skipValidation() || ValidateGetFramebufferParameterivRobustANGLE(
>+                                             context, sampler, pname, bufSize, length, params))
>+        {
>+            context->getFramebufferParameterivRobust(sampler, pname, bufSize, length, params);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY GetProgramInterfaceivRobustANGLE(GLuint program,
>+                                                  GLenum programInterface,
>+                                                  GLenum pname,
>+                                                  GLsizei bufSize,
>+                                                  GLsizei *length,
>+                                                  GLint *params)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLuint program = %u, GLenum programInterface = 0x%X, GLenum pname = 0x%X, GLsizei "
>+        "bufSize = %d, GLsizei * length = 0x%016" PRIxPTR ", GLint * params = 0x%016" PRIxPTR ")",
>+        program, programInterface, pname, bufSize, (uintptr_t)length, (uintptr_t)params);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        if (context->skipValidation() ||
>+            ValidateGetProgramInterfaceivRobustANGLE(context, program, programInterface, pname,
>+                                                     bufSize, length, params))
>+        {
>+            context->getProgramInterfaceivRobust(program, programInterface, pname, bufSize, length,
>+                                                 params);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY GetBooleani_vRobustANGLE(GLenum target,
>+                                          GLuint index,
>+                                          GLsizei bufSize,
>+                                          GLsizei *length,
>+                                          GLboolean *data)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLenum target = 0x%X, GLuint index = %u, GLsizei bufSize = %d, GLsizei * length = "
>+        "0x%016" PRIxPTR ", GLboolean * data = 0x%016" PRIxPTR ")",
>+        target, index, bufSize, (uintptr_t)length, (uintptr_t)data);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        if (context->skipValidation() ||
>+            ValidateGetBooleani_vRobustANGLE(context, target, index, bufSize, length, data))
>+        {
>+            context->getBooleani_vRobust(target, index, bufSize, length, data);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY GetMultisamplefvRobustANGLE(GLenum pname,
>+                                             GLuint index,
>+                                             GLsizei bufSize,
>+                                             GLsizei *length,
>+                                             GLfloat *val)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLenum pname = 0x%X, GLuint index = %u, GLsizei bufSize = %d, GLsizei * length = "
>+        "0x%016" PRIxPTR ", GLfloat * val = 0x%016" PRIxPTR ")",
>+        pname, index, bufSize, (uintptr_t)length, (uintptr_t)val);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        if (context->skipValidation() ||
>+            ValidateGetMultisamplefvRobustANGLE(context, pname, index, bufSize, length, val))
>+        {
>+            context->getMultisamplefvRobust(pname, index, bufSize, length, val);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY GetTexLevelParameterivRobustANGLE(GLenum target,
>+                                                   GLint level,
>+                                                   GLenum pname,
>+                                                   GLsizei bufSize,
>+                                                   GLsizei *length,
>+                                                   GLint *params)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLenum target = 0x%X, GLint level = %d, GLenum pname = 0x%X, GLsizei bufSize = %d, "
>+        "GLsizei * length = 0x%016" PRIxPTR ", GLint * params = 0x%016" PRIxPTR ")",
>+        target, level, pname, bufSize, (uintptr_t)length, (uintptr_t)params);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        TextureTarget targetPacked = FromGLenum<TextureTarget>(target);
>+        if (context->skipValidation() ||
>+            ValidateGetTexLevelParameterivRobustANGLE(context, targetPacked, level, pname, bufSize,
>+                                                      length, params))
>+        {
>+            context->getTexLevelParameterivRobust(targetPacked, level, pname, bufSize, length,
>+                                                  params);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY GetTexLevelParameterfvRobustANGLE(GLenum target,
>+                                                   GLint level,
>+                                                   GLenum pname,
>+                                                   GLsizei bufSize,
>+                                                   GLsizei *length,
>+                                                   GLfloat *params)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLenum target = 0x%X, GLint level = %d, GLenum pname = 0x%X, GLsizei bufSize = %d, "
>+        "GLsizei * length = 0x%016" PRIxPTR ", GLfloat * params = 0x%016" PRIxPTR ")",
>+        target, level, pname, bufSize, (uintptr_t)length, (uintptr_t)params);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        TextureTarget targetPacked = FromGLenum<TextureTarget>(target);
>+        if (context->skipValidation() ||
>+            ValidateGetTexLevelParameterfvRobustANGLE(context, targetPacked, level, pname, bufSize,
>+                                                      length, params))
>+        {
>+            context->getTexLevelParameterfvRobust(targetPacked, level, pname, bufSize, length,
>+                                                  params);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY GetPointervRobustANGLERobustANGLE(GLenum pname,
>+                                                   GLsizei bufSize,
>+                                                   GLsizei *length,
>+                                                   void **params)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum pname = 0x%X, GLsizei bufSize = %d, GLsizei * length = 0x%016" PRIxPTR
>+          ", void ** params = 0x%016" PRIxPTR ")",
>+          pname, bufSize, (uintptr_t)length, (uintptr_t)params);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        if (context->skipValidation() ||
>+            ValidateGetPointervRobustANGLERobustANGLE(context, pname, bufSize, length, params))
>+        {
>+            context->getPointervRobustANGLERobust(pname, bufSize, length, params);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY ReadnPixelsRobustANGLE(GLint x,
>+                                        GLint y,
>+                                        GLsizei width,
>+                                        GLsizei height,
>+                                        GLenum format,
>+                                        GLenum type,
>+                                        GLsizei bufSize,
>+                                        GLsizei *length,
>+                                        GLsizei *columns,
>+                                        GLsizei *rows,
>+                                        void *data)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLint x = %d, GLint y = %d, GLsizei width = %d, GLsizei height = %d, GLenum format = "
>+        "0x%X, GLenum type = 0x%X, GLsizei bufSize = %d, GLsizei * length = 0x%016" PRIxPTR
>+        ", GLsizei * columns = 0x%016" PRIxPTR ", GLsizei * rows = 0x%016" PRIxPTR
>+        ", void * data = 0x%016" PRIxPTR ")",
>+        x, y, width, height, format, type, bufSize, (uintptr_t)length, (uintptr_t)columns,
>+        (uintptr_t)rows, (uintptr_t)data);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        if (context->skipValidation() ||
>+            ValidateReadnPixelsRobustANGLE(context, x, y, width, height, format, type, bufSize,
>+                                           length, columns, rows, data))
>+        {
>+            context->readnPixelsRobust(x, y, width, height, format, type, bufSize, length, columns,
>+                                       rows, data);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY GetnUniformfvRobustANGLE(GLuint program,
>+                                          GLint location,
>+                                          GLsizei bufSize,
>+                                          GLsizei *length,
>+                                          GLfloat *params)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLuint program = %u, GLint location = %d, GLsizei bufSize = %d, GLsizei * length = "
>+        "0x%016" PRIxPTR ", GLfloat * params = 0x%016" PRIxPTR ")",
>+        program, location, bufSize, (uintptr_t)length, (uintptr_t)params);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        if (context->skipValidation() ||
>+            ValidateGetnUniformfvRobustANGLE(context, program, location, bufSize, length, params))
>+        {
>+            context->getnUniformfvRobust(program, location, bufSize, length, params);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY GetnUniformivRobustANGLE(GLuint program,
>+                                          GLint location,
>+                                          GLsizei bufSize,
>+                                          GLsizei *length,
>+                                          GLint *params)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLuint program = %u, GLint location = %d, GLsizei bufSize = %d, GLsizei * length = "
>+        "0x%016" PRIxPTR ", GLint * params = 0x%016" PRIxPTR ")",
>+        program, location, bufSize, (uintptr_t)length, (uintptr_t)params);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        if (context->skipValidation() ||
>+            ValidateGetnUniformivRobustANGLE(context, program, location, bufSize, length, params))
>+        {
>+            context->getnUniformivRobust(program, location, bufSize, length, params);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY GetnUniformuivRobustANGLE(GLuint program,
>+                                           GLint location,
>+                                           GLsizei bufSize,
>+                                           GLsizei *length,
>+                                           GLuint *params)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLuint program = %u, GLint location = %d, GLsizei bufSize = %d, GLsizei * length = "
>+        "0x%016" PRIxPTR ", GLuint * params = 0x%016" PRIxPTR ")",
>+        program, location, bufSize, (uintptr_t)length, (uintptr_t)params);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        if (context->skipValidation() ||
>+            ValidateGetnUniformuivRobustANGLE(context, program, location, bufSize, length, params))
>+        {
>+            context->getnUniformuivRobust(program, location, bufSize, length, params);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY TexParameterIivRobustANGLE(GLenum target,
>+                                            GLenum pname,
>+                                            GLsizei bufSize,
>+                                            const GLint *params)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLenum target = 0x%X, GLenum pname = 0x%X, GLsizei bufSize = %d, const GLint * params = "
>+        "0x%016" PRIxPTR ")",
>+        target, pname, bufSize, (uintptr_t)params);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        TextureType targetPacked = FromGLenum<TextureType>(target);
>+        if (context->skipValidation() ||
>+            ValidateTexParameterIivRobustANGLE(context, targetPacked, pname, bufSize, params))
>+        {
>+            context->texParameterIivRobust(targetPacked, pname, bufSize, params);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY TexParameterIuivRobustANGLE(GLenum target,
>+                                             GLenum pname,
>+                                             GLsizei bufSize,
>+                                             const GLuint *params)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLenum target = 0x%X, GLenum pname = 0x%X, GLsizei bufSize = %d, const GLuint * params = "
>+        "0x%016" PRIxPTR ")",
>+        target, pname, bufSize, (uintptr_t)params);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        TextureType targetPacked = FromGLenum<TextureType>(target);
>+        if (context->skipValidation() ||
>+            ValidateTexParameterIuivRobustANGLE(context, targetPacked, pname, bufSize, params))
>+        {
>+            context->texParameterIuivRobust(targetPacked, pname, bufSize, params);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY GetTexParameterIivRobustANGLE(GLenum target,
>+                                               GLenum pname,
>+                                               GLsizei bufSize,
>+                                               GLsizei *length,
>+                                               GLint *params)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLenum target = 0x%X, GLenum pname = 0x%X, GLsizei bufSize = %d, GLsizei * length = "
>+        "0x%016" PRIxPTR ", GLint * params = 0x%016" PRIxPTR ")",
>+        target, pname, bufSize, (uintptr_t)length, (uintptr_t)params);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        TextureType targetPacked = FromGLenum<TextureType>(target);
>+        if (context->skipValidation() || ValidateGetTexParameterIivRobustANGLE(
>+                                             context, targetPacked, pname, bufSize, length, params))
>+        {
>+            context->getTexParameterIivRobust(targetPacked, pname, bufSize, length, params);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY GetTexParameterIuivRobustANGLE(GLenum target,
>+                                                GLenum pname,
>+                                                GLsizei bufSize,
>+                                                GLsizei *length,
>+                                                GLuint *params)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLenum target = 0x%X, GLenum pname = 0x%X, GLsizei bufSize = %d, GLsizei * length = "
>+        "0x%016" PRIxPTR ", GLuint * params = 0x%016" PRIxPTR ")",
>+        target, pname, bufSize, (uintptr_t)length, (uintptr_t)params);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        TextureType targetPacked = FromGLenum<TextureType>(target);
>+        if (context->skipValidation() || ValidateGetTexParameterIuivRobustANGLE(
>+                                             context, targetPacked, pname, bufSize, length, params))
>+        {
>+            context->getTexParameterIuivRobust(targetPacked, pname, bufSize, length, params);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY SamplerParameterIivRobustANGLE(GLuint sampler,
>+                                                GLenum pname,
>+                                                GLsizei bufSize,
>+                                                const GLint *param)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLuint sampler = %u, GLenum pname = 0x%X, GLsizei bufSize = %d, const GLint * param = "
>+        "0x%016" PRIxPTR ")",
>+        sampler, pname, bufSize, (uintptr_t)param);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        if (context->skipValidation() ||
>+            ValidateSamplerParameterIivRobustANGLE(context, sampler, pname, bufSize, param))
>+        {
>+            context->samplerParameterIivRobust(sampler, pname, bufSize, param);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY SamplerParameterIuivRobustANGLE(GLuint sampler,
>+                                                 GLenum pname,
>+                                                 GLsizei bufSize,
>+                                                 const GLuint *param)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLuint sampler = %u, GLenum pname = 0x%X, GLsizei bufSize = %d, const GLuint * param = "
>+        "0x%016" PRIxPTR ")",
>+        sampler, pname, bufSize, (uintptr_t)param);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        if (context->skipValidation() ||
>+            ValidateSamplerParameterIuivRobustANGLE(context, sampler, pname, bufSize, param))
>+        {
>+            context->samplerParameterIuivRobust(sampler, pname, bufSize, param);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY GetSamplerParameterIivRobustANGLE(GLuint sampler,
>+                                                   GLenum pname,
>+                                                   GLsizei bufSize,
>+                                                   GLsizei *length,
>+                                                   GLint *params)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLuint sampler = %u, GLenum pname = 0x%X, GLsizei bufSize = %d, GLsizei * length = "
>+        "0x%016" PRIxPTR ", GLint * params = 0x%016" PRIxPTR ")",
>+        sampler, pname, bufSize, (uintptr_t)length, (uintptr_t)params);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        if (context->skipValidation() || ValidateGetSamplerParameterIivRobustANGLE(
>+                                             context, sampler, pname, bufSize, length, params))
>+        {
>+            context->getSamplerParameterIivRobust(sampler, pname, bufSize, length, params);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY GetSamplerParameterIuivRobustANGLE(GLuint sampler,
>+                                                    GLenum pname,
>+                                                    GLsizei bufSize,
>+                                                    GLsizei *length,
>+                                                    GLuint *params)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLuint sampler = %u, GLenum pname = 0x%X, GLsizei bufSize = %d, GLsizei * length = "
>+        "0x%016" PRIxPTR ", GLuint * params = 0x%016" PRIxPTR ")",
>+        sampler, pname, bufSize, (uintptr_t)length, (uintptr_t)params);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        if (context->skipValidation() || ValidateGetSamplerParameterIuivRobustANGLE(
>+                                             context, sampler, pname, bufSize, length, params))
>+        {
>+            context->getSamplerParameterIuivRobust(sampler, pname, bufSize, length, params);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY GetQueryObjectivRobustANGLE(GLuint id,
>+                                             GLenum pname,
>+                                             GLsizei bufSize,
>+                                             GLsizei *length,
>+                                             GLint *params)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLuint id = %u, GLenum pname = 0x%X, GLsizei bufSize = %d, GLsizei * length = "
>+        "0x%016" PRIxPTR ", GLint * params = 0x%016" PRIxPTR ")",
>+        id, pname, bufSize, (uintptr_t)length, (uintptr_t)params);
>+
>+    Context *context = GetGlobalContext();
>+    if (context)
>+    {
>+        if (context->skipValidation() ||
>+            ValidateGetQueryObjectivRobustANGLE(context, id, pname, bufSize, length, params))
>+        {
>+            context->getQueryObjectivRobust(id, pname, bufSize, length, params);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY GetQueryObjecti64vRobustANGLE(GLuint id,
>+                                               GLenum pname,
>+                                               GLsizei bufSize,
>+                                               GLsizei *length,
>+                                               GLint64 *params)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLuint id = %u, GLenum pname = 0x%X, GLsizei bufSize = %d, GLsizei * length = "
>+        "0x%016" PRIxPTR ", GLint64 * params = 0x%016" PRIxPTR ")",
>+        id, pname, bufSize, (uintptr_t)length, (uintptr_t)params);
>+
>+    Context *context = GetGlobalContext();
>+    if (context)
>+    {
>+        if (context->skipValidation() ||
>+            ValidateGetQueryObjecti64vRobustANGLE(context, id, pname, bufSize, length, params))
>+        {
>+            context->getQueryObjecti64vRobust(id, pname, bufSize, length, params);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY GetQueryObjectui64vRobustANGLE(GLuint id,
>+                                                GLenum pname,
>+                                                GLsizei bufSize,
>+                                                GLsizei *length,
>+                                                GLuint64 *params)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLuint id = %u, GLenum pname = 0x%X, GLsizei bufSize = %d, GLsizei * length = "
>+        "0x%016" PRIxPTR ", GLuint64 * params = 0x%016" PRIxPTR ")",
>+        id, pname, bufSize, (uintptr_t)length, (uintptr_t)params);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        if (context->skipValidation() ||
>+            ValidateGetQueryObjectui64vRobustANGLE(context, id, pname, bufSize, length, params))
>+        {
>+            context->getQueryObjectui64vRobust(id, pname, bufSize, length, params);
>+        }
>+    }
>+}
>+
>+// GL_ANGLE_texture_multisample
>+void GL_APIENTRY TexStorage2DMultisampleANGLE(GLenum target,
>+                                              GLsizei samples,
>+                                              GLenum internalformat,
>+                                              GLsizei width,
>+                                              GLsizei height,
>+                                              GLboolean fixedsamplelocations)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLenum target = 0x%X, GLsizei samples = %d, GLenum internalformat = 0x%X, GLsizei width "
>+        "= %d, GLsizei height = %d, GLboolean fixedsamplelocations = %u)",
>+        target, samples, internalformat, width, height, fixedsamplelocations);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        TextureType targetPacked = FromGLenum<TextureType>(target);
>+        if (context->skipValidation() ||
>+            ValidateTexStorage2DMultisampleANGLE(context, targetPacked, samples, internalformat,
>+                                                 width, height, fixedsamplelocations))
>+        {
>+            context->texStorage2DMultisample(targetPacked, samples, internalformat, width, height,
>+                                             fixedsamplelocations);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY GetTexLevelParameterivANGLE(GLenum target,
>+                                             GLint level,
>+                                             GLenum pname,
>+                                             GLint *params)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLenum target = 0x%X, GLint level = %d, GLenum pname = 0x%X, GLint * params = "
>+        "0x%016" PRIxPTR ")",
>+        target, level, pname, (uintptr_t)params);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        TextureTarget targetPacked = FromGLenum<TextureTarget>(target);
>+        if (context->skipValidation() ||
>+            ValidateGetTexLevelParameterivANGLE(context, targetPacked, level, pname, params))
>+        {
>+            context->getTexLevelParameteriv(targetPacked, level, pname, params);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY GetTexLevelParameterfvANGLE(GLenum target,
>+                                             GLint level,
>+                                             GLenum pname,
>+                                             GLfloat *params)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLenum target = 0x%X, GLint level = %d, GLenum pname = 0x%X, GLfloat * params = "
>+        "0x%016" PRIxPTR ")",
>+        target, level, pname, (uintptr_t)params);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        TextureTarget targetPacked = FromGLenum<TextureTarget>(target);
>+        if (context->skipValidation() ||
>+            ValidateGetTexLevelParameterfvANGLE(context, targetPacked, level, pname, params))
>+        {
>+            context->getTexLevelParameterfv(targetPacked, level, pname, params);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY GetMultisamplefvANGLE(GLenum pname, GLuint index, GLfloat *val)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum pname = 0x%X, GLuint index = %u, GLfloat * val = 0x%016" PRIxPTR ")", pname,
>+          index, (uintptr_t)val);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        if (context->skipValidation() || ValidateGetMultisamplefvANGLE(context, pname, index, val))
>+        {
>+            context->getMultisamplefv(pname, index, val);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY SampleMaskiANGLE(GLuint maskNumber, GLbitfield mask)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint maskNumber = %u, GLbitfield mask = 0x%X)", maskNumber, mask);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        if (context->skipValidation() || ValidateSampleMaskiANGLE(context, maskNumber, mask))
>+        {
>+            context->sampleMaski(maskNumber, mask);
>+        }
>+    }
>+}
>+
>+// GL_ANGLE_translated_shader_source
>+void GL_APIENTRY GetTranslatedShaderSourceANGLE(GLuint shader,
>+                                                GLsizei bufsize,
>+                                                GLsizei *length,
>+                                                GLchar *source)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint shader = %u, GLsizei bufsize = %d, GLsizei *length = 0x%016" PRIxPTR
>+          ", GLchar *source = 0x%016" PRIxPTR ")",
>+          shader, bufsize, (uintptr_t)length, (uintptr_t)source);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        if (context->skipValidation() ||
>+            ValidateGetTranslatedShaderSourceANGLE(context, shader, bufsize, length, source))
>+        {
>+            context->getTranslatedShaderSource(shader, bufsize, length, source);
>+        }
>+    }
>+}
>+
>+// GL_CHROMIUM_bind_uniform_location
>+void GL_APIENTRY BindUniformLocationCHROMIUM(GLuint program, GLint location, const GLchar *name)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint program = %u, GLint location = %d, const GLchar* name = 0x%016" PRIxPTR ")",
>+          program, location, (uintptr_t)name);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        if (context->skipValidation() ||
>+            ValidateBindUniformLocationCHROMIUM(context, program, location, name))
>+        {
>+            context->bindUniformLocation(program, location, name);
>+        }
>+    }
>+}
>+
>+// GL_CHROMIUM_copy_compressed_texture
>+void GL_APIENTRY CompressedCopyTextureCHROMIUM(GLuint sourceId, GLuint destId)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint sourceId = %u, GLuint destId = %u)", sourceId, destId);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        if (context->skipValidation() ||
>+            ValidateCompressedCopyTextureCHROMIUM(context, sourceId, destId))
>+        {
>+            context->compressedCopyTexture(sourceId, destId);
>+        }
>+    }
>+}
>+
>+// GL_CHROMIUM_copy_texture
>+void GL_APIENTRY CopyTextureCHROMIUM(GLuint sourceId,
>+                                     GLint sourceLevel,
>+                                     GLenum destTarget,
>+                                     GLuint destId,
>+                                     GLint destLevel,
>+                                     GLint internalFormat,
>+                                     GLenum destType,
>+                                     GLboolean unpackFlipY,
>+                                     GLboolean unpackPremultiplyAlpha,
>+                                     GLboolean unpackUnmultiplyAlpha)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLuint sourceId = %u, GLint sourceLevel = %d, GLenum destTarget = 0x%X, GLuint destId = "
>+        "%u, GLint destLevel = %d, GLint internalFormat = %d, GLenum destType = 0x%X, GLboolean "
>+        "unpackFlipY = %u, GLboolean unpackPremultiplyAlpha = %u, GLboolean unpackUnmultiplyAlpha "
>+        "= %u)",
>+        sourceId, sourceLevel, destTarget, destId, destLevel, internalFormat, destType, unpackFlipY,
>+        unpackPremultiplyAlpha, unpackUnmultiplyAlpha);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        TextureTarget destTargetPacked = FromGLenum<TextureTarget>(destTarget);
>+        if (context->skipValidation() ||
>+            ValidateCopyTextureCHROMIUM(context, sourceId, sourceLevel, destTargetPacked, destId,
>+                                        destLevel, internalFormat, destType, unpackFlipY,
>+                                        unpackPremultiplyAlpha, unpackUnmultiplyAlpha))
>+        {
>+            context->copyTexture(sourceId, sourceLevel, destTargetPacked, destId, destLevel,
>+                                 internalFormat, destType, unpackFlipY, unpackPremultiplyAlpha,
>+                                 unpackUnmultiplyAlpha);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY CopySubTextureCHROMIUM(GLuint sourceId,
>+                                        GLint sourceLevel,
>+                                        GLenum destTarget,
>+                                        GLuint destId,
>+                                        GLint destLevel,
>+                                        GLint xoffset,
>+                                        GLint yoffset,
>+                                        GLint x,
>+                                        GLint y,
>+                                        GLint width,
>+                                        GLint height,
>+                                        GLboolean unpackFlipY,
>+                                        GLboolean unpackPremultiplyAlpha,
>+                                        GLboolean unpackUnmultiplyAlpha)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLuint sourceId = %u, GLint sourceLevel = %d, GLenum destTarget = 0x%X, GLuint destId = "
>+        "%u, GLint destLevel = %d, GLint xoffset = %d, GLint yoffset = %d, GLint x = %d, GLint y = "
>+        "%d, GLint width = %d, GLint height = %d, GLboolean unpackFlipY = %u, GLboolean "
>+        "unpackPremultiplyAlpha = %u, GLboolean unpackUnmultiplyAlpha = %u)",
>+        sourceId, sourceLevel, destTarget, destId, destLevel, xoffset, yoffset, x, y, width, height,
>+        unpackFlipY, unpackPremultiplyAlpha, unpackUnmultiplyAlpha);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        TextureTarget destTargetPacked = FromGLenum<TextureTarget>(destTarget);
>+        if (context->skipValidation() ||
>+            ValidateCopySubTextureCHROMIUM(context, sourceId, sourceLevel, destTargetPacked, destId,
>+                                           destLevel, xoffset, yoffset, x, y, width, height,
>+                                           unpackFlipY, unpackPremultiplyAlpha,
>+                                           unpackUnmultiplyAlpha))
>+        {
>+            context->copySubTexture(sourceId, sourceLevel, destTargetPacked, destId, destLevel,
>+                                    xoffset, yoffset, x, y, width, height, unpackFlipY,
>+                                    unpackPremultiplyAlpha, unpackUnmultiplyAlpha);
>+        }
>+    }
>+}
>+
>+// GL_CHROMIUM_framebuffer_mixed_samples
>+void GL_APIENTRY CoverageModulationCHROMIUM(GLenum components)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum components = 0x%X)", components);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        if (context->skipValidation() || ValidateCoverageModulationCHROMIUM(context, components))
>+        {
>+            context->coverageModulation(components);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY MatrixLoadfCHROMIUM(GLenum matrixMode, const GLfloat *matrix)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum matrixMode = 0x%X, const GLfloat * matrix = 0x%016" PRIxPTR ")", matrixMode,
>+          (uintptr_t)matrix);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        if (context->skipValidation() || ValidateMatrixLoadfCHROMIUM(context, matrixMode, matrix))
>+        {
>+            context->matrixLoadf(matrixMode, matrix);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY MatrixLoadIdentityCHROMIUM(GLenum matrixMode)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum matrixMode = 0x%X)", matrixMode);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        if (context->skipValidation() || ValidateMatrixLoadIdentityCHROMIUM(context, matrixMode))
>+        {
>+            context->matrixLoadIdentity(matrixMode);
>+        }
>+    }
>+}
>+
>+// GL_CHROMIUM_lose_context
>+void GL_APIENTRY LoseContextCHROMIUM(GLenum current, GLenum other)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum current = 0x%X, GLenum other = 0x%X)", current, other);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        GraphicsResetStatus currentPacked = FromGLenum<GraphicsResetStatus>(current);
>+        GraphicsResetStatus otherPacked   = FromGLenum<GraphicsResetStatus>(other);
>+        if (context->skipValidation() ||
>+            ValidateLoseContextCHROMIUM(context, currentPacked, otherPacked))
>+        {
>+            context->loseContext(currentPacked, otherPacked);
>+        }
>+    }
>+}
>+
>+// GL_CHROMIUM_path_rendering
>+GLuint GL_APIENTRY GenPathsCHROMIUM(GLsizei range)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLsizei range = %d)", range);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        if (context->skipValidation() || ValidateGenPathsCHROMIUM(context, range))
>+        {
>+            return context->genPaths(range);
>+        }
>+    }
>+
>+    return GetDefaultReturnValue<EntryPoint::GenPathsCHROMIUM, GLuint>();
>+}
>+
>+void GL_APIENTRY DeletePathsCHROMIUM(GLuint first, GLsizei range)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint first = %u, GLsizei range = %d)", first, range);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        if (context->skipValidation() || ValidateDeletePathsCHROMIUM(context, first, range))
>+        {
>+            context->deletePaths(first, range);
>+        }
>+    }
>+}
>+
>+GLboolean GL_APIENTRY IsPathCHROMIUM(GLuint path)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint path = %u)", path);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        if (context->skipValidation() || ValidateIsPathCHROMIUM(context, path))
>+        {
>+            return context->isPath(path);
>+        }
>+    }
>+
>+    return GetDefaultReturnValue<EntryPoint::IsPathCHROMIUM, GLboolean>();
>+}
>+
>+void GL_APIENTRY PathCommandsCHROMIUM(GLuint path,
>+                                      GLsizei numCommands,
>+                                      const GLubyte *commands,
>+                                      GLsizei numCoords,
>+                                      GLenum coordType,
>+                                      const void *coords)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint path = %u, GLsizei numCommands = %d, const GLubyte * commands = 0x%016" PRIxPTR
>+          ", GLsizei numCoords = %d, GLenum coordType = 0x%X, const void* coords = 0x%016" PRIxPTR
>+          ")",
>+          path, numCommands, (uintptr_t)commands, numCoords, coordType, (uintptr_t)coords);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        if (context->skipValidation() ||
>+            ValidatePathCommandsCHROMIUM(context, path, numCommands, commands, numCoords, coordType,
>+                                         coords))
>+        {
>+            context->pathCommands(path, numCommands, commands, numCoords, coordType, coords);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY PathParameterfCHROMIUM(GLuint path, GLenum pname, GLfloat value)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint path = %u, GLenum pname = 0x%X, GLfloat value = %f)", path, pname, value);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        if (context->skipValidation() ||
>+            ValidatePathParameterfCHROMIUM(context, path, pname, value))
>+        {
>+            context->pathParameterf(path, pname, value);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY PathParameteriCHROMIUM(GLuint path, GLenum pname, GLint value)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint path = %u, GLenum pname = 0x%X, GLint value = %d)", path, pname, value);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        if (context->skipValidation() ||
>+            ValidatePathParameteriCHROMIUM(context, path, pname, value))
>+        {
>+            context->pathParameteri(path, pname, value);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY GetPathParameterfvCHROMIUM(GLuint path, GLenum pname, GLfloat *value)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint path = %u, GLenum pname = 0x%X, GLfloat * value = 0x%016" PRIxPTR ")", path,
>+          pname, (uintptr_t)value);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        if (context->skipValidation() ||
>+            ValidateGetPathParameterfvCHROMIUM(context, path, pname, value))
>+        {
>+            context->getPathParameterfv(path, pname, value);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY GetPathParameterivCHROMIUM(GLuint path, GLenum pname, GLint *value)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint path = %u, GLenum pname = 0x%X, GLint * value = 0x%016" PRIxPTR ")", path, pname,
>+          (uintptr_t)value);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        if (context->skipValidation() ||
>+            ValidateGetPathParameterivCHROMIUM(context, path, pname, value))
>+        {
>+            context->getPathParameteriv(path, pname, value);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY PathStencilFuncCHROMIUM(GLenum func, GLint ref, GLuint mask)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum func = 0x%X, GLint ref = %d, GLuint mask = %u)", func, ref, mask);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        if (context->skipValidation() || ValidatePathStencilFuncCHROMIUM(context, func, ref, mask))
>+        {
>+            context->pathStencilFunc(func, ref, mask);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY StencilFillPathCHROMIUM(GLuint path, GLenum fillMode, GLuint mask)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint path = %u, GLenum fillMode = 0x%X, GLuint mask = %u)", path, fillMode, mask);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        if (context->skipValidation() ||
>+            ValidateStencilFillPathCHROMIUM(context, path, fillMode, mask))
>+        {
>+            context->stencilFillPath(path, fillMode, mask);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY StencilStrokePathCHROMIUM(GLuint path, GLint reference, GLuint mask)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint path = %u, GLint reference = %d, GLuint mask = %u)", path, reference, mask);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        if (context->skipValidation() ||
>+            ValidateStencilStrokePathCHROMIUM(context, path, reference, mask))
>+        {
>+            context->stencilStrokePath(path, reference, mask);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY CoverFillPathCHROMIUM(GLuint path, GLenum coverMode)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint path = %u, GLenum coverMode = 0x%X)", path, coverMode);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        if (context->skipValidation() || ValidateCoverFillPathCHROMIUM(context, path, coverMode))
>+        {
>+            context->coverFillPath(path, coverMode);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY CoverStrokePathCHROMIUM(GLuint path, GLenum coverMode)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint path = %u, GLenum coverMode = 0x%X)", path, coverMode);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        if (context->skipValidation() || ValidateCoverStrokePathCHROMIUM(context, path, coverMode))
>+        {
>+            context->coverStrokePath(path, coverMode);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY StencilThenCoverFillPathCHROMIUM(GLuint path,
>+                                                  GLenum fillMode,
>+                                                  GLuint mask,
>+                                                  GLenum coverMode)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint path = %u, GLenum fillMode = 0x%X, GLuint mask = %u, GLenum coverMode = 0x%X)",
>+          path, fillMode, mask, coverMode);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        if (context->skipValidation() ||
>+            ValidateStencilThenCoverFillPathCHROMIUM(context, path, fillMode, mask, coverMode))
>+        {
>+            context->stencilThenCoverFillPath(path, fillMode, mask, coverMode);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY StencilThenCoverStrokePathCHROMIUM(GLuint path,
>+                                                    GLint reference,
>+                                                    GLuint mask,
>+                                                    GLenum coverMode)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint path = %u, GLint reference = %d, GLuint mask = %u, GLenum coverMode = 0x%X)",
>+          path, reference, mask, coverMode);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        if (context->skipValidation() ||
>+            ValidateStencilThenCoverStrokePathCHROMIUM(context, path, reference, mask, coverMode))
>+        {
>+            context->stencilThenCoverStrokePath(path, reference, mask, coverMode);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY CoverFillPathInstancedCHROMIUM(GLsizei numPath,
>+                                                GLenum pathNameType,
>+                                                const void *paths,
>+                                                GLuint pathBase,
>+                                                GLenum coverMode,
>+                                                GLenum transformType,
>+                                                const GLfloat *transformValues)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLsizei numPath = %d, GLenum pathNameType = 0x%X, const void * paths = 0x%016" PRIxPTR
>+          ", GLuint pathBase = %u, GLenum coverMode = 0x%X, GLenum transformType = 0x%X, const "
>+          "GLfloat * transformValues = 0x%016" PRIxPTR ")",
>+          numPath, pathNameType, (uintptr_t)paths, pathBase, coverMode, transformType,
>+          (uintptr_t)transformValues);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        if (context->skipValidation() ||
>+            ValidateCoverFillPathInstancedCHROMIUM(context, numPath, pathNameType, paths, pathBase,
>+                                                   coverMode, transformType, transformValues))
>+        {
>+            context->coverFillPathInstanced(numPath, pathNameType, paths, pathBase, coverMode,
>+                                            transformType, transformValues);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY CoverStrokePathInstancedCHROMIUM(GLsizei numPath,
>+                                                  GLenum pathNameType,
>+                                                  const void *paths,
>+                                                  GLuint pathBase,
>+                                                  GLenum coverMode,
>+                                                  GLenum transformType,
>+                                                  const GLfloat *transformValues)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLsizei numPath = %d, GLenum pathNameType = 0x%X, const void * paths = 0x%016" PRIxPTR
>+          ", GLuint pathBase = %u, GLenum coverMode = 0x%X, GLenum transformType = 0x%X, const "
>+          "GLfloat * transformValues = 0x%016" PRIxPTR ")",
>+          numPath, pathNameType, (uintptr_t)paths, pathBase, coverMode, transformType,
>+          (uintptr_t)transformValues);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        if (context->skipValidation() || ValidateCoverStrokePathInstancedCHROMIUM(
>+                                             context, numPath, pathNameType, paths, pathBase,
>+                                             coverMode, transformType, transformValues))
>+        {
>+            context->coverStrokePathInstanced(numPath, pathNameType, paths, pathBase, coverMode,
>+                                              transformType, transformValues);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY StencilStrokePathInstancedCHROMIUM(GLsizei numPath,
>+                                                    GLenum pathNameType,
>+                                                    const void *paths,
>+                                                    GLuint pathBase,
>+                                                    GLint reference,
>+                                                    GLuint mask,
>+                                                    GLenum transformType,
>+                                                    const GLfloat *transformValues)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLsizei numPath = %d, GLenum pathNameType = 0x%X, const void * paths = 0x%016" PRIxPTR
>+          ", GLuint pathBase = %u, GLint reference = %d, GLuint mask = %u, GLenum transformType = "
>+          "0x%X, const GLfloat * transformValues = 0x%016" PRIxPTR ")",
>+          numPath, pathNameType, (uintptr_t)paths, pathBase, reference, mask, transformType,
>+          (uintptr_t)transformValues);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        if (context->skipValidation() || ValidateStencilStrokePathInstancedCHROMIUM(
>+                                             context, numPath, pathNameType, paths, pathBase,
>+                                             reference, mask, transformType, transformValues))
>+        {
>+            context->stencilStrokePathInstanced(numPath, pathNameType, paths, pathBase, reference,
>+                                                mask, transformType, transformValues);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY StencilFillPathInstancedCHROMIUM(GLsizei numPaths,
>+                                                  GLenum pathNameType,
>+                                                  const void *paths,
>+                                                  GLuint pathBase,
>+                                                  GLenum fillMode,
>+                                                  GLuint mask,
>+                                                  GLenum transformType,
>+                                                  const GLfloat *transformValues)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLsizei numPaths = %d, GLenum pathNameType = 0x%X, const void * paths = 0x%016" PRIxPTR
>+          ", GLuint pathBase = %u, GLenum fillMode = 0x%X, GLuint mask = %u, GLenum transformType "
>+          "= 0x%X, const GLfloat * transformValues = 0x%016" PRIxPTR ")",
>+          numPaths, pathNameType, (uintptr_t)paths, pathBase, fillMode, mask, transformType,
>+          (uintptr_t)transformValues);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        if (context->skipValidation() || ValidateStencilFillPathInstancedCHROMIUM(
>+                                             context, numPaths, pathNameType, paths, pathBase,
>+                                             fillMode, mask, transformType, transformValues))
>+        {
>+            context->stencilFillPathInstanced(numPaths, pathNameType, paths, pathBase, fillMode,
>+                                              mask, transformType, transformValues);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY StencilThenCoverFillPathInstancedCHROMIUM(GLsizei numPaths,
>+                                                           GLenum pathNameType,
>+                                                           const void *paths,
>+                                                           GLuint pathBase,
>+                                                           GLenum fillMode,
>+                                                           GLuint mask,
>+                                                           GLenum coverMode,
>+                                                           GLenum transformType,
>+                                                           const GLfloat *transformValues)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLsizei numPaths = %d, GLenum pathNameType = 0x%X, const void * paths = 0x%016" PRIxPTR
>+          ", GLuint pathBase = %u, GLenum fillMode = 0x%X, GLuint mask = %u, GLenum coverMode = "
>+          "0x%X, GLenum transformType = 0x%X, const GLfloat * transformValues = 0x%016" PRIxPTR ")",
>+          numPaths, pathNameType, (uintptr_t)paths, pathBase, fillMode, mask, coverMode,
>+          transformType, (uintptr_t)transformValues);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        if (context->skipValidation() ||
>+            ValidateStencilThenCoverFillPathInstancedCHROMIUM(
>+                context, numPaths, pathNameType, paths, pathBase, fillMode, mask, coverMode,
>+                transformType, transformValues))
>+        {
>+            context->stencilThenCoverFillPathInstanced(numPaths, pathNameType, paths, pathBase,
>+                                                       fillMode, mask, coverMode, transformType,
>+                                                       transformValues);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY StencilThenCoverStrokePathInstancedCHROMIUM(GLsizei numPaths,
>+                                                             GLenum pathNameType,
>+                                                             const void *paths,
>+                                                             GLuint pathBase,
>+                                                             GLint reference,
>+                                                             GLuint mask,
>+                                                             GLenum coverMode,
>+                                                             GLenum transformType,
>+                                                             const GLfloat *transformValues)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLsizei numPaths = %d, GLenum pathNameType = 0x%X, const void * paths = 0x%016" PRIxPTR
>+          ", GLuint pathBase = %u, GLint reference = %d, GLuint mask = %u, GLenum coverMode = "
>+          "0x%X, GLenum transformType = 0x%X, const GLfloat * transformValues = 0x%016" PRIxPTR ")",
>+          numPaths, pathNameType, (uintptr_t)paths, pathBase, reference, mask, coverMode,
>+          transformType, (uintptr_t)transformValues);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        if (context->skipValidation() ||
>+            ValidateStencilThenCoverStrokePathInstancedCHROMIUM(
>+                context, numPaths, pathNameType, paths, pathBase, reference, mask, coverMode,
>+                transformType, transformValues))
>+        {
>+            context->stencilThenCoverStrokePathInstanced(numPaths, pathNameType, paths, pathBase,
>+                                                         reference, mask, coverMode, transformType,
>+                                                         transformValues);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY BindFragmentInputLocationCHROMIUM(GLuint programs,
>+                                                   GLint location,
>+                                                   const GLchar *name)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint programs = %u, GLint location = %d, const GLchar * name = 0x%016" PRIxPTR ")",
>+          programs, location, (uintptr_t)name);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        if (context->skipValidation() ||
>+            ValidateBindFragmentInputLocationCHROMIUM(context, programs, location, name))
>+        {
>+            context->bindFragmentInputLocation(programs, location, name);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY ProgramPathFragmentInputGenCHROMIUM(GLuint program,
>+                                                     GLint location,
>+                                                     GLenum genMode,
>+                                                     GLint components,
>+                                                     const GLfloat *coeffs)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLuint program = %u, GLint location = %d, GLenum genMode = 0x%X, GLint components = %d, "
>+        "const GLfloat * coeffs = 0x%016" PRIxPTR ")",
>+        program, location, genMode, components, (uintptr_t)coeffs);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        if (context->skipValidation() ||
>+            ValidateProgramPathFragmentInputGenCHROMIUM(context, program, location, genMode,
>+                                                        components, coeffs))
>+        {
>+            context->programPathFragmentInputGen(program, location, genMode, components, coeffs);
>+        }
>+    }
>+}
>+
>+// GL_EXT_blend_func_extended
>+void GL_APIENTRY BindFragDataLocationEXT(GLuint program, GLuint color, const GLchar *name)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint program = %u, GLuint color = %u, const GLchar *name = 0x%016" PRIxPTR ")",
>+          program, color, (uintptr_t)name);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        if (context->skipValidation() ||
>+            ValidateBindFragDataLocationEXT(context, program, color, name))
>+        {
>+            context->bindFragDataLocation(program, color, name);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY BindFragDataLocationIndexedEXT(GLuint program,
>+                                                GLuint colorNumber,
>+                                                GLuint index,
>+                                                const GLchar *name)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLuint program = %u, GLuint colorNumber = %u, GLuint index = %u, const GLchar *name = "
>+        "0x%016" PRIxPTR ")",
>+        program, colorNumber, index, (uintptr_t)name);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        if (context->skipValidation() ||
>+            ValidateBindFragDataLocationIndexedEXT(context, program, colorNumber, index, name))
>+        {
>+            context->bindFragDataLocationIndexed(program, colorNumber, index, name);
>+        }
>+    }
>+}
>+
>+GLint GL_APIENTRY GetFragDataIndexEXT(GLuint program, const GLchar *name)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint program = %u, const GLchar *name = 0x%016" PRIxPTR ")", program,
>+          (uintptr_t)name);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        if (context->skipValidation() || ValidateGetFragDataIndexEXT(context, program, name))
>+        {
>+            return context->getFragDataIndex(program, name);
>+        }
>+    }
>+
>+    return GetDefaultReturnValue<EntryPoint::GetFragDataIndexEXT, GLint>();
>+}
>+
>+GLint GL_APIENTRY GetProgramResourceLocationIndexEXT(GLuint program,
>+                                                     GLenum programInterface,
>+                                                     const GLchar *name)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLuint program = %u, GLenum programInterface = 0x%X, const GLchar *name = 0x%016" PRIxPTR
>+        ")",
>+        program, programInterface, (uintptr_t)name);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        if (context->skipValidation() ||
>+            ValidateGetProgramResourceLocationIndexEXT(context, program, programInterface, name))
>+        {
>+            return context->getProgramResourceLocationIndex(program, programInterface, name);
>+        }
>+    }
>+
>+    return GetDefaultReturnValue<EntryPoint::GetProgramResourceLocationIndexEXT, GLint>();
>+}
>+
>+// GL_EXT_debug_marker
>+void GL_APIENTRY InsertEventMarkerEXT(GLsizei length, const GLchar *marker)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    // Don't run an EVENT() macro on the EXT_debug_marker entry points.
>+    // It can interfere with the debug events being set by the caller.
>+    // EVENT("(GLsizei length = %d, const GLchar *marker = 0x%016" PRIxPTR ")", length,
>+    // (uintptr_t)marker);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        if (context->skipValidation() || ValidateInsertEventMarkerEXT(context, length, marker))
>+        {
>+            context->insertEventMarker(length, marker);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY PopGroupMarkerEXT()
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    // Don't run an EVENT() macro on the EXT_debug_marker entry points.
>+    // It can interfere with the debug events being set by the caller.
>+    // EVENT("()");
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        if (context->skipValidation() || ValidatePopGroupMarkerEXT(context))
>+        {
>+            context->popGroupMarker();
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY PushGroupMarkerEXT(GLsizei length, const GLchar *marker)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    // Don't run an EVENT() macro on the EXT_debug_marker entry points.
>+    // It can interfere with the debug events being set by the caller.
>+    // EVENT("(GLsizei length = %d, const GLchar *marker = 0x%016" PRIxPTR ")", length,
>+    // (uintptr_t)marker);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        if (context->skipValidation() || ValidatePushGroupMarkerEXT(context, length, marker))
>+        {
>+            context->pushGroupMarker(length, marker);
>+        }
>+    }
>+}
>+
>+// GL_EXT_discard_framebuffer
>+void GL_APIENTRY DiscardFramebufferEXT(GLenum target,
>+                                       GLsizei numAttachments,
>+                                       const GLenum *attachments)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLenum target = 0x%X, GLsizei numAttachments = %d, const GLenum *attachments = "
>+        "0x%016" PRIxPTR ")",
>+        target, numAttachments, (uintptr_t)attachments);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        if (context->skipValidation() ||
>+            ValidateDiscardFramebufferEXT(context, target, numAttachments, attachments))
>+        {
>+            context->discardFramebuffer(target, numAttachments, attachments);
>+        }
>+    }
>+}
>+
>+// GL_EXT_disjoint_timer_query
>+void GL_APIENTRY BeginQueryEXT(GLenum target, GLuint id)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum target = 0x%X, GLuint id = %u)", target, id);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        QueryType targetPacked = FromGLenum<QueryType>(target);
>+        if (context->skipValidation() || ValidateBeginQueryEXT(context, targetPacked, id))
>+        {
>+            context->beginQuery(targetPacked, id);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY DeleteQueriesEXT(GLsizei n, const GLuint *ids)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLsizei n = %d, const GLuint *ids = 0x%016" PRIxPTR ")", n, (uintptr_t)ids);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        if (context->skipValidation() || ValidateDeleteQueriesEXT(context, n, ids))
>+        {
>+            context->deleteQueries(n, ids);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY EndQueryEXT(GLenum target)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum target = 0x%X)", target);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        QueryType targetPacked = FromGLenum<QueryType>(target);
>+        if (context->skipValidation() || ValidateEndQueryEXT(context, targetPacked))
>+        {
>+            context->endQuery(targetPacked);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY GenQueriesEXT(GLsizei n, GLuint *ids)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLsizei n = %d, GLuint *ids = 0x%016" PRIxPTR ")", n, (uintptr_t)ids);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        if (context->skipValidation() || ValidateGenQueriesEXT(context, n, ids))
>+        {
>+            context->genQueries(n, ids);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY GetQueryObjecti64vEXT(GLuint id, GLenum pname, GLint64 *params)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint id = %u, GLenum pname = 0x%X, GLint64 *params = 0x%016" PRIxPTR ")", id, pname,
>+          (uintptr_t)params);
>+
>+    Context *context = GetGlobalContext();
>+    if (context)
>+    {
>+        if (context->skipValidation() || ValidateGetQueryObjecti64vEXT(context, id, pname, params))
>+        {
>+            context->getQueryObjecti64v(id, pname, params);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY GetQueryObjectivEXT(GLuint id, GLenum pname, GLint *params)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint id = %u, GLenum pname = 0x%X, GLint *params = 0x%016" PRIxPTR ")", id, pname,
>+          (uintptr_t)params);
>+
>+    Context *context = GetGlobalContext();
>+    if (context)
>+    {
>+        if (context->skipValidation() || ValidateGetQueryObjectivEXT(context, id, pname, params))
>+        {
>+            context->getQueryObjectiv(id, pname, params);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY GetQueryObjectui64vEXT(GLuint id, GLenum pname, GLuint64 *params)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint id = %u, GLenum pname = 0x%X, GLuint64 *params = 0x%016" PRIxPTR ")", id, pname,
>+          (uintptr_t)params);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        if (context->skipValidation() || ValidateGetQueryObjectui64vEXT(context, id, pname, params))
>+        {
>+            context->getQueryObjectui64v(id, pname, params);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY GetQueryObjectuivEXT(GLuint id, GLenum pname, GLuint *params)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint id = %u, GLenum pname = 0x%X, GLuint *params = 0x%016" PRIxPTR ")", id, pname,
>+          (uintptr_t)params);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        if (context->skipValidation() || ValidateGetQueryObjectuivEXT(context, id, pname, params))
>+        {
>+            context->getQueryObjectuiv(id, pname, params);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY GetQueryivEXT(GLenum target, GLenum pname, GLint *params)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum target = 0x%X, GLenum pname = 0x%X, GLint *params = 0x%016" PRIxPTR ")", target,
>+          pname, (uintptr_t)params);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        QueryType targetPacked = FromGLenum<QueryType>(target);
>+        if (context->skipValidation() ||
>+            ValidateGetQueryivEXT(context, targetPacked, pname, params))
>+        {
>+            context->getQueryiv(targetPacked, pname, params);
>+        }
>+    }
>+}
>+
>+GLboolean GL_APIENTRY IsQueryEXT(GLuint id)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint id = %u)", id);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        if (context->skipValidation() || ValidateIsQueryEXT(context, id))
>+        {
>+            return context->isQuery(id);
>+        }
>+    }
>+
>+    return GetDefaultReturnValue<EntryPoint::IsQueryEXT, GLboolean>();
>+}
>+
>+void GL_APIENTRY QueryCounterEXT(GLuint id, GLenum target)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint id = %u, GLenum target = 0x%X)", id, target);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        QueryType targetPacked = FromGLenum<QueryType>(target);
>+        if (context->skipValidation() || ValidateQueryCounterEXT(context, id, targetPacked))
>+        {
>+            context->queryCounter(id, targetPacked);
>+        }
>+    }
>+}
>+
>+// GL_EXT_draw_buffers
>+void GL_APIENTRY DrawBuffersEXT(GLsizei n, const GLenum *bufs)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLsizei n = %d, const GLenum *bufs = 0x%016" PRIxPTR ")", n, (uintptr_t)bufs);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        if (context->skipValidation() || ValidateDrawBuffersEXT(context, n, bufs))
>+        {
>+            context->drawBuffers(n, bufs);
>+        }
>+    }
>+}
>+
>+// GL_EXT_geometry_shader
>+void GL_APIENTRY FramebufferTextureEXT(GLenum target,
>+                                       GLenum attachment,
>+                                       GLuint texture,
>+                                       GLint level)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum target = 0x%X, GLenum attachment = 0x%X, GLuint texture = %u, GLint level = %d)",
>+          target, attachment, texture, level);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        if (context->skipValidation() ||
>+            ValidateFramebufferTextureEXT(context, target, attachment, texture, level))
>+        {
>+            context->framebufferTexture(target, attachment, texture, level);
>+        }
>+    }
>+}
>+
>+// GL_EXT_instanced_arrays
>+void GL_APIENTRY DrawArraysInstancedEXT(GLenum mode, GLint start, GLsizei count, GLsizei primcount)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum mode = 0x%X, GLint start = %d, GLsizei count = %d, GLsizei primcount = %d)",
>+          mode, start, count, primcount);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        PrimitiveMode modePacked = FromGLenum<PrimitiveMode>(mode);
>+        if (context->skipValidation() ||
>+            ValidateDrawArraysInstancedEXT(context, modePacked, start, count, primcount))
>+        {
>+            context->drawArraysInstanced(modePacked, start, count, primcount);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY DrawElementsInstancedEXT(GLenum mode,
>+                                          GLsizei count,
>+                                          GLenum type,
>+                                          const void *indices,
>+                                          GLsizei primcount)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLenum mode = 0x%X, GLsizei count = %d, GLenum type = 0x%X, const void *indices = "
>+        "0x%016" PRIxPTR ", GLsizei primcount = %d)",
>+        mode, count, type, (uintptr_t)indices, primcount);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        PrimitiveMode modePacked    = FromGLenum<PrimitiveMode>(mode);
>+        DrawElementsType typePacked = FromGLenum<DrawElementsType>(type);
>+        if (context->skipValidation() ||
>+            ValidateDrawElementsInstancedEXT(context, modePacked, count, typePacked, indices,
>+                                             primcount))
>+        {
>+            context->drawElementsInstanced(modePacked, count, typePacked, indices, primcount);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY VertexAttribDivisorEXT(GLuint index, GLuint divisor)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint index = %u, GLuint divisor = %u)", index, divisor);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        if (context->skipValidation() || ValidateVertexAttribDivisorEXT(context, index, divisor))
>+        {
>+            context->vertexAttribDivisor(index, divisor);
>+        }
>+    }
>+}
>+
>+// GL_EXT_map_buffer_range
>+void GL_APIENTRY FlushMappedBufferRangeEXT(GLenum target, GLintptr offset, GLsizeiptr length)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum target = 0x%X, GLintptr offset = %llu, GLsizeiptr length = %llu)", target,
>+          static_cast<unsigned long long>(offset), static_cast<unsigned long long>(length));
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        BufferBinding targetPacked = FromGLenum<BufferBinding>(target);
>+        if (context->skipValidation() ||
>+            ValidateFlushMappedBufferRangeEXT(context, targetPacked, offset, length))
>+        {
>+            context->flushMappedBufferRange(targetPacked, offset, length);
>+        }
>+    }
>+}
>+
>+void *GL_APIENTRY MapBufferRangeEXT(GLenum target,
>+                                    GLintptr offset,
>+                                    GLsizeiptr length,
>+                                    GLbitfield access)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLenum target = 0x%X, GLintptr offset = %llu, GLsizeiptr length = %llu, GLbitfield "
>+        "access = 0x%X)",
>+        target, static_cast<unsigned long long>(offset), static_cast<unsigned long long>(length),
>+        access);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        BufferBinding targetPacked = FromGLenum<BufferBinding>(target);
>+        if (context->skipValidation() ||
>+            ValidateMapBufferRangeEXT(context, targetPacked, offset, length, access))
>+        {
>+            return context->mapBufferRange(targetPacked, offset, length, access);
>+        }
>+    }
>+
>+    return GetDefaultReturnValue<EntryPoint::MapBufferRangeEXT, void *>();
>+}
>+
>+// GL_EXT_memory_object
>+void GL_APIENTRY BufferStorageMemEXT(GLenum target, GLsizeiptr size, GLuint memory, GLuint64 offset)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLenum target = 0x%X, GLsizeiptr size = %llu, GLuint memory = %u, GLuint64 offset = "
>+        "%llu)",
>+        target, static_cast<unsigned long long>(size), memory,
>+        static_cast<unsigned long long>(offset));
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        TextureType targetPacked = FromGLenum<TextureType>(target);
>+        if (context->skipValidation() ||
>+            ValidateBufferStorageMemEXT(context, targetPacked, size, memory, offset))
>+        {
>+            context->bufferStorageMem(targetPacked, size, memory, offset);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY CreateMemoryObjectsEXT(GLsizei n, GLuint *memoryObjects)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLsizei n = %d, GLuint *memoryObjects = 0x%016" PRIxPTR ")", n,
>+          (uintptr_t)memoryObjects);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        if (context->skipValidation() || ValidateCreateMemoryObjectsEXT(context, n, memoryObjects))
>+        {
>+            context->createMemoryObjects(n, memoryObjects);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY DeleteMemoryObjectsEXT(GLsizei n, const GLuint *memoryObjects)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLsizei n = %d, const GLuint *memoryObjects = 0x%016" PRIxPTR ")", n,
>+          (uintptr_t)memoryObjects);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        if (context->skipValidation() || ValidateDeleteMemoryObjectsEXT(context, n, memoryObjects))
>+        {
>+            context->deleteMemoryObjects(n, memoryObjects);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY GetMemoryObjectParameterivEXT(GLuint memoryObject, GLenum pname, GLint *params)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint memoryObject = %u, GLenum pname = 0x%X, GLint *params = 0x%016" PRIxPTR ")",
>+          memoryObject, pname, (uintptr_t)params);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        if (context->skipValidation() ||
>+            ValidateGetMemoryObjectParameterivEXT(context, memoryObject, pname, params))
>+        {
>+            context->getMemoryObjectParameteriv(memoryObject, pname, params);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY GetUnsignedBytevEXT(GLenum pname, GLubyte *data)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum pname = 0x%X, GLubyte *data = 0x%016" PRIxPTR ")", pname, (uintptr_t)data);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        if (context->skipValidation() || ValidateGetUnsignedBytevEXT(context, pname, data))
>+        {
>+            context->getUnsignedBytev(pname, data);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY GetUnsignedBytei_vEXT(GLenum target, GLuint index, GLubyte *data)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum target = 0x%X, GLuint index = %u, GLubyte *data = 0x%016" PRIxPTR ")", target,
>+          index, (uintptr_t)data);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        if (context->skipValidation() ||
>+            ValidateGetUnsignedBytei_vEXT(context, target, index, data))
>+        {
>+            context->getUnsignedBytei_v(target, index, data);
>+        }
>+    }
>+}
>+
>+GLboolean GL_APIENTRY IsMemoryObjectEXT(GLuint memoryObject)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint memoryObject = %u)", memoryObject);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        if (context->skipValidation() || ValidateIsMemoryObjectEXT(context, memoryObject))
>+        {
>+            return context->isMemoryObject(memoryObject);
>+        }
>+    }
>+
>+    return GetDefaultReturnValue<EntryPoint::IsMemoryObjectEXT, GLboolean>();
>+}
>+
>+void GL_APIENTRY MemoryObjectParameterivEXT(GLuint memoryObject, GLenum pname, const GLint *params)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint memoryObject = %u, GLenum pname = 0x%X, const GLint *params = 0x%016" PRIxPTR
>+          ")",
>+          memoryObject, pname, (uintptr_t)params);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        if (context->skipValidation() ||
>+            ValidateMemoryObjectParameterivEXT(context, memoryObject, pname, params))
>+        {
>+            context->memoryObjectParameteriv(memoryObject, pname, params);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY TexStorageMem2DEXT(GLenum target,
>+                                    GLsizei levels,
>+                                    GLenum internalFormat,
>+                                    GLsizei width,
>+                                    GLsizei height,
>+                                    GLuint memory,
>+                                    GLuint64 offset)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLenum target = 0x%X, GLsizei levels = %d, GLenum internalFormat = 0x%X, GLsizei width = "
>+        "%d, GLsizei height = %d, GLuint memory = %u, GLuint64 offset = %llu)",
>+        target, levels, internalFormat, width, height, memory,
>+        static_cast<unsigned long long>(offset));
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        TextureType targetPacked = FromGLenum<TextureType>(target);
>+        if (context->skipValidation() ||
>+            ValidateTexStorageMem2DEXT(context, targetPacked, levels, internalFormat, width, height,
>+                                       memory, offset))
>+        {
>+            context->texStorageMem2D(targetPacked, levels, internalFormat, width, height, memory,
>+                                     offset);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY TexStorageMem2DMultisampleEXT(GLenum target,
>+                                               GLsizei samples,
>+                                               GLenum internalFormat,
>+                                               GLsizei width,
>+                                               GLsizei height,
>+                                               GLboolean fixedSampleLocations,
>+                                               GLuint memory,
>+                                               GLuint64 offset)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLenum target = 0x%X, GLsizei samples = %d, GLenum internalFormat = 0x%X, GLsizei width "
>+        "= %d, GLsizei height = %d, GLboolean fixedSampleLocations = %u, GLuint memory = %u, "
>+        "GLuint64 offset = %llu)",
>+        target, samples, internalFormat, width, height, fixedSampleLocations, memory,
>+        static_cast<unsigned long long>(offset));
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        TextureType targetPacked = FromGLenum<TextureType>(target);
>+        if (context->skipValidation() || ValidateTexStorageMem2DMultisampleEXT(
>+                                             context, targetPacked, samples, internalFormat, width,
>+                                             height, fixedSampleLocations, memory, offset))
>+        {
>+            context->texStorageMem2DMultisample(targetPacked, samples, internalFormat, width,
>+                                                height, fixedSampleLocations, memory, offset);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY TexStorageMem3DEXT(GLenum target,
>+                                    GLsizei levels,
>+                                    GLenum internalFormat,
>+                                    GLsizei width,
>+                                    GLsizei height,
>+                                    GLsizei depth,
>+                                    GLuint memory,
>+                                    GLuint64 offset)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLenum target = 0x%X, GLsizei levels = %d, GLenum internalFormat = 0x%X, GLsizei width = "
>+        "%d, GLsizei height = %d, GLsizei depth = %d, GLuint memory = %u, GLuint64 offset = %llu)",
>+        target, levels, internalFormat, width, height, depth, memory,
>+        static_cast<unsigned long long>(offset));
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        TextureType targetPacked = FromGLenum<TextureType>(target);
>+        if (context->skipValidation() ||
>+            ValidateTexStorageMem3DEXT(context, targetPacked, levels, internalFormat, width, height,
>+                                       depth, memory, offset))
>+        {
>+            context->texStorageMem3D(targetPacked, levels, internalFormat, width, height, depth,
>+                                     memory, offset);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY TexStorageMem3DMultisampleEXT(GLenum target,
>+                                               GLsizei samples,
>+                                               GLenum internalFormat,
>+                                               GLsizei width,
>+                                               GLsizei height,
>+                                               GLsizei depth,
>+                                               GLboolean fixedSampleLocations,
>+                                               GLuint memory,
>+                                               GLuint64 offset)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLenum target = 0x%X, GLsizei samples = %d, GLenum internalFormat = 0x%X, GLsizei width "
>+        "= %d, GLsizei height = %d, GLsizei depth = %d, GLboolean fixedSampleLocations = %u, "
>+        "GLuint memory = %u, GLuint64 offset = %llu)",
>+        target, samples, internalFormat, width, height, depth, fixedSampleLocations, memory,
>+        static_cast<unsigned long long>(offset));
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        TextureType targetPacked = FromGLenum<TextureType>(target);
>+        if (context->skipValidation() || ValidateTexStorageMem3DMultisampleEXT(
>+                                             context, targetPacked, samples, internalFormat, width,
>+                                             height, depth, fixedSampleLocations, memory, offset))
>+        {
>+            context->texStorageMem3DMultisample(targetPacked, samples, internalFormat, width,
>+                                                height, depth, fixedSampleLocations, memory,
>+                                                offset);
>+        }
>+    }
>+}
>+
>+// GL_EXT_memory_object_fd
>+void GL_APIENTRY ImportMemoryFdEXT(GLuint memory, GLuint64 size, GLenum handleType, GLint fd)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint memory = %u, GLuint64 size = %llu, GLenum handleType = 0x%X, GLint fd = %d)",
>+          memory, static_cast<unsigned long long>(size), handleType, fd);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        HandleType handleTypePacked = FromGLenum<HandleType>(handleType);
>+        if (context->skipValidation() ||
>+            ValidateImportMemoryFdEXT(context, memory, size, handleTypePacked, fd))
>+        {
>+            context->importMemoryFd(memory, size, handleTypePacked, fd);
>+        }
>+    }
>+}
>+
>+// GL_EXT_occlusion_query_boolean
>+// BeginQueryEXT is already defined.
>+
>+// DeleteQueriesEXT is already defined.
>+
>+// EndQueryEXT is already defined.
>+
>+// GenQueriesEXT is already defined.
>+
>+// GetQueryObjectuivEXT is already defined.
>+
>+// GetQueryivEXT is already defined.
>+
>+// IsQueryEXT is already defined.
>+
>+// GL_EXT_robustness
>+GLenum GL_APIENTRY GetGraphicsResetStatusEXT()
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("()");
>+
>+    Context *context = GetGlobalContext();
>+    if (context)
>+    {
>+        if (context->skipValidation() || ValidateGetGraphicsResetStatusEXT(context))
>+        {
>+            return context->getGraphicsResetStatus();
>+        }
>+    }
>+
>+    return GetDefaultReturnValue<EntryPoint::GetGraphicsResetStatusEXT, GLenum>();
>+}
>+
>+void GL_APIENTRY GetnUniformfvEXT(GLuint program, GLint location, GLsizei bufSize, GLfloat *params)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLuint program = %u, GLint location = %d, GLsizei bufSize = %d, GLfloat *params = "
>+        "0x%016" PRIxPTR ")",
>+        program, location, bufSize, (uintptr_t)params);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        if (context->skipValidation() ||
>+            ValidateGetnUniformfvEXT(context, program, location, bufSize, params))
>+        {
>+            context->getnUniformfv(program, location, bufSize, params);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY GetnUniformivEXT(GLuint program, GLint location, GLsizei bufSize, GLint *params)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLuint program = %u, GLint location = %d, GLsizei bufSize = %d, GLint *params = "
>+        "0x%016" PRIxPTR ")",
>+        program, location, bufSize, (uintptr_t)params);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        if (context->skipValidation() ||
>+            ValidateGetnUniformivEXT(context, program, location, bufSize, params))
>+        {
>+            context->getnUniformiv(program, location, bufSize, params);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY ReadnPixelsEXT(GLint x,
>+                                GLint y,
>+                                GLsizei width,
>+                                GLsizei height,
>+                                GLenum format,
>+                                GLenum type,
>+                                GLsizei bufSize,
>+                                void *data)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLint x = %d, GLint y = %d, GLsizei width = %d, GLsizei height = %d, GLenum format = "
>+        "0x%X, GLenum type = 0x%X, GLsizei bufSize = %d, void *data = 0x%016" PRIxPTR ")",
>+        x, y, width, height, format, type, bufSize, (uintptr_t)data);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        if (context->skipValidation() ||
>+            ValidateReadnPixelsEXT(context, x, y, width, height, format, type, bufSize, data))
>+        {
>+            context->readnPixels(x, y, width, height, format, type, bufSize, data);
>+        }
>+    }
>+}
>+
>+// GL_EXT_semaphore
>+void GL_APIENTRY DeleteSemaphoresEXT(GLsizei n, const GLuint *semaphores)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLsizei n = %d, const GLuint *semaphores = 0x%016" PRIxPTR ")", n,
>+          (uintptr_t)semaphores);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        if (context->skipValidation() || ValidateDeleteSemaphoresEXT(context, n, semaphores))
>+        {
>+            context->deleteSemaphores(n, semaphores);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY GenSemaphoresEXT(GLsizei n, GLuint *semaphores)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLsizei n = %d, GLuint *semaphores = 0x%016" PRIxPTR ")", n, (uintptr_t)semaphores);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        if (context->skipValidation() || ValidateGenSemaphoresEXT(context, n, semaphores))
>+        {
>+            context->genSemaphores(n, semaphores);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY GetSemaphoreParameterui64vEXT(GLuint semaphore, GLenum pname, GLuint64 *params)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint semaphore = %u, GLenum pname = 0x%X, GLuint64 *params = 0x%016" PRIxPTR ")",
>+          semaphore, pname, (uintptr_t)params);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        if (context->skipValidation() ||
>+            ValidateGetSemaphoreParameterui64vEXT(context, semaphore, pname, params))
>+        {
>+            context->getSemaphoreParameterui64v(semaphore, pname, params);
>+        }
>+    }
>+}
>+
>+GLboolean GL_APIENTRY IsSemaphoreEXT(GLuint semaphore)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint semaphore = %u)", semaphore);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        if (context->skipValidation() || ValidateIsSemaphoreEXT(context, semaphore))
>+        {
>+            return context->isSemaphore(semaphore);
>+        }
>+    }
>+
>+    return GetDefaultReturnValue<EntryPoint::IsSemaphoreEXT, GLboolean>();
>+}
>+
>+void GL_APIENTRY SemaphoreParameterui64vEXT(GLuint semaphore, GLenum pname, const GLuint64 *params)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint semaphore = %u, GLenum pname = 0x%X, const GLuint64 *params = 0x%016" PRIxPTR
>+          ")",
>+          semaphore, pname, (uintptr_t)params);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        if (context->skipValidation() ||
>+            ValidateSemaphoreParameterui64vEXT(context, semaphore, pname, params))
>+        {
>+            context->semaphoreParameterui64v(semaphore, pname, params);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY SignalSemaphoreEXT(GLuint semaphore,
>+                                    GLuint numBufferBarriers,
>+                                    const GLuint *buffers,
>+                                    GLuint numTextureBarriers,
>+                                    const GLuint *textures,
>+                                    const GLenum *dstLayouts)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLuint semaphore = %u, GLuint numBufferBarriers = %u, const GLuint *buffers = "
>+        "0x%016" PRIxPTR ", GLuint numTextureBarriers = %u, const GLuint *textures = 0x%016" PRIxPTR
>+        ", const GLenum *dstLayouts = 0x%016" PRIxPTR ")",
>+        semaphore, numBufferBarriers, (uintptr_t)buffers, numTextureBarriers, (uintptr_t)textures,
>+        (uintptr_t)dstLayouts);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        if (context->skipValidation() ||
>+            ValidateSignalSemaphoreEXT(context, semaphore, numBufferBarriers, buffers,
>+                                       numTextureBarriers, textures, dstLayouts))
>+        {
>+            context->signalSemaphore(semaphore, numBufferBarriers, buffers, numTextureBarriers,
>+                                     textures, dstLayouts);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY WaitSemaphoreEXT(GLuint semaphore,
>+                                  GLuint numBufferBarriers,
>+                                  const GLuint *buffers,
>+                                  GLuint numTextureBarriers,
>+                                  const GLuint *textures,
>+                                  const GLenum *srcLayouts)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLuint semaphore = %u, GLuint numBufferBarriers = %u, const GLuint *buffers = "
>+        "0x%016" PRIxPTR ", GLuint numTextureBarriers = %u, const GLuint *textures = 0x%016" PRIxPTR
>+        ", const GLenum *srcLayouts = 0x%016" PRIxPTR ")",
>+        semaphore, numBufferBarriers, (uintptr_t)buffers, numTextureBarriers, (uintptr_t)textures,
>+        (uintptr_t)srcLayouts);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        if (context->skipValidation() ||
>+            ValidateWaitSemaphoreEXT(context, semaphore, numBufferBarriers, buffers,
>+                                     numTextureBarriers, textures, srcLayouts))
>+        {
>+            context->waitSemaphore(semaphore, numBufferBarriers, buffers, numTextureBarriers,
>+                                   textures, srcLayouts);
>+        }
>+    }
>+}
>+
>+// GetUnsignedBytei_vEXT is already defined.
>+
>+// GetUnsignedBytevEXT is already defined.
>+
>+// GL_EXT_semaphore_fd
>+void GL_APIENTRY ImportSemaphoreFdEXT(GLuint semaphore, GLenum handleType, GLint fd)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint semaphore = %u, GLenum handleType = 0x%X, GLint fd = %d)", semaphore, handleType,
>+          fd);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        HandleType handleTypePacked = FromGLenum<HandleType>(handleType);
>+        if (context->skipValidation() ||
>+            ValidateImportSemaphoreFdEXT(context, semaphore, handleTypePacked, fd))
>+        {
>+            context->importSemaphoreFd(semaphore, handleTypePacked, fd);
>+        }
>+    }
>+}
>+
>+// GL_EXT_texture_storage
>+void GL_APIENTRY TexStorage1DEXT(GLenum target,
>+                                 GLsizei levels,
>+                                 GLenum internalformat,
>+                                 GLsizei width)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLenum target = 0x%X, GLsizei levels = %d, GLenum internalformat = 0x%X, GLsizei width = "
>+        "%d)",
>+        target, levels, internalformat, width);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        if (context->skipValidation() ||
>+            ValidateTexStorage1DEXT(context, target, levels, internalformat, width))
>+        {
>+            context->texStorage1D(target, levels, internalformat, width);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY
>+TexStorage2DEXT(GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLenum target = 0x%X, GLsizei levels = %d, GLenum internalformat = 0x%X, GLsizei width = "
>+        "%d, GLsizei height = %d)",
>+        target, levels, internalformat, width, height);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        TextureType targetPacked = FromGLenum<TextureType>(target);
>+        if (context->skipValidation() ||
>+            ValidateTexStorage2DEXT(context, targetPacked, levels, internalformat, width, height))
>+        {
>+            context->texStorage2D(targetPacked, levels, internalformat, width, height);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY TexStorage3DEXT(GLenum target,
>+                                 GLsizei levels,
>+                                 GLenum internalformat,
>+                                 GLsizei width,
>+                                 GLsizei height,
>+                                 GLsizei depth)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLenum target = 0x%X, GLsizei levels = %d, GLenum internalformat = 0x%X, GLsizei width = "
>+        "%d, GLsizei height = %d, GLsizei depth = %d)",
>+        target, levels, internalformat, width, height, depth);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        TextureType targetPacked = FromGLenum<TextureType>(target);
>+        if (context->skipValidation() ||
>+            ValidateTexStorage3DEXT(context, targetPacked, levels, internalformat, width, height,
>+                                    depth))
>+        {
>+            context->texStorage3D(targetPacked, levels, internalformat, width, height, depth);
>+        }
>+    }
>+}
>+
>+// GL_KHR_debug
>+void GL_APIENTRY DebugMessageCallbackKHR(GLDEBUGPROCKHR callback, const void *userParam)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLDEBUGPROCKHR callback = 0x%016" PRIxPTR ", const void *userParam = 0x%016" PRIxPTR
>+          ")",
>+          (uintptr_t)callback, (uintptr_t)userParam);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        if (context->skipValidation() ||
>+            ValidateDebugMessageCallbackKHR(context, callback, userParam))
>+        {
>+            context->debugMessageCallback(callback, userParam);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY DebugMessageControlKHR(GLenum source,
>+                                        GLenum type,
>+                                        GLenum severity,
>+                                        GLsizei count,
>+                                        const GLuint *ids,
>+                                        GLboolean enabled)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLenum source = 0x%X, GLenum type = 0x%X, GLenum severity = 0x%X, GLsizei count = %d, "
>+        "const GLuint *ids = 0x%016" PRIxPTR ", GLboolean enabled = %u)",
>+        source, type, severity, count, (uintptr_t)ids, enabled);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        if (context->skipValidation() ||
>+            ValidateDebugMessageControlKHR(context, source, type, severity, count, ids, enabled))
>+        {
>+            context->debugMessageControl(source, type, severity, count, ids, enabled);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY DebugMessageInsertKHR(GLenum source,
>+                                       GLenum type,
>+                                       GLuint id,
>+                                       GLenum severity,
>+                                       GLsizei length,
>+                                       const GLchar *buf)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLenum source = 0x%X, GLenum type = 0x%X, GLuint id = %u, GLenum severity = 0x%X, "
>+        "GLsizei length = %d, const GLchar *buf = 0x%016" PRIxPTR ")",
>+        source, type, id, severity, length, (uintptr_t)buf);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        if (context->skipValidation() ||
>+            ValidateDebugMessageInsertKHR(context, source, type, id, severity, length, buf))
>+        {
>+            context->debugMessageInsert(source, type, id, severity, length, buf);
>+        }
>+    }
>+}
>+
>+GLuint GL_APIENTRY GetDebugMessageLogKHR(GLuint count,
>+                                         GLsizei bufSize,
>+                                         GLenum *sources,
>+                                         GLenum *types,
>+                                         GLuint *ids,
>+                                         GLenum *severities,
>+                                         GLsizei *lengths,
>+                                         GLchar *messageLog)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint count = %u, GLsizei bufSize = %d, GLenum *sources = 0x%016" PRIxPTR
>+          ", GLenum *types = 0x%016" PRIxPTR ", GLuint *ids = 0x%016" PRIxPTR
>+          ", GLenum *severities = 0x%016" PRIxPTR ", GLsizei *lengths = 0x%016" PRIxPTR
>+          ", GLchar *messageLog = 0x%016" PRIxPTR ")",
>+          count, bufSize, (uintptr_t)sources, (uintptr_t)types, (uintptr_t)ids,
>+          (uintptr_t)severities, (uintptr_t)lengths, (uintptr_t)messageLog);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        if (context->skipValidation() ||
>+            ValidateGetDebugMessageLogKHR(context, count, bufSize, sources, types, ids, severities,
>+                                          lengths, messageLog))
>+        {
>+            return context->getDebugMessageLog(count, bufSize, sources, types, ids, severities,
>+                                               lengths, messageLog);
>+        }
>+    }
>+
>+    return GetDefaultReturnValue<EntryPoint::GetDebugMessageLogKHR, GLuint>();
>+}
>+
>+void GL_APIENTRY
>+GetObjectLabelKHR(GLenum identifier, GLuint name, GLsizei bufSize, GLsizei *length, GLchar *label)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLenum identifier = 0x%X, GLuint name = %u, GLsizei bufSize = %d, GLsizei *length = "
>+        "0x%016" PRIxPTR ", GLchar *label = 0x%016" PRIxPTR ")",
>+        identifier, name, bufSize, (uintptr_t)length, (uintptr_t)label);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        if (context->skipValidation() ||
>+            ValidateGetObjectLabelKHR(context, identifier, name, bufSize, length, label))
>+        {
>+            context->getObjectLabel(identifier, name, bufSize, length, label);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY GetObjectPtrLabelKHR(const void *ptr,
>+                                      GLsizei bufSize,
>+                                      GLsizei *length,
>+                                      GLchar *label)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(const void *ptr = 0x%016" PRIxPTR
>+          ", GLsizei bufSize = %d, GLsizei *length = 0x%016" PRIxPTR
>+          ", GLchar *label = 0x%016" PRIxPTR ")",
>+          (uintptr_t)ptr, bufSize, (uintptr_t)length, (uintptr_t)label);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        if (context->skipValidation() ||
>+            ValidateGetObjectPtrLabelKHR(context, ptr, bufSize, length, label))
>+        {
>+            context->getObjectPtrLabel(ptr, bufSize, length, label);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY GetPointervKHR(GLenum pname, void **params)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum pname = 0x%X, void **params = 0x%016" PRIxPTR ")", pname, (uintptr_t)params);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        if (context->skipValidation() || ValidateGetPointervKHR(context, pname, params))
>+        {
>+            context->getPointerv(pname, params);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY ObjectLabelKHR(GLenum identifier, GLuint name, GLsizei length, const GLchar *label)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLenum identifier = 0x%X, GLuint name = %u, GLsizei length = %d, const GLchar *label = "
>+        "0x%016" PRIxPTR ")",
>+        identifier, name, length, (uintptr_t)label);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        if (context->skipValidation() ||
>+            ValidateObjectLabelKHR(context, identifier, name, length, label))
>+        {
>+            context->objectLabel(identifier, name, length, label);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY ObjectPtrLabelKHR(const void *ptr, GLsizei length, const GLchar *label)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(const void *ptr = 0x%016" PRIxPTR
>+          ", GLsizei length = %d, const GLchar *label = 0x%016" PRIxPTR ")",
>+          (uintptr_t)ptr, length, (uintptr_t)label);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        if (context->skipValidation() || ValidateObjectPtrLabelKHR(context, ptr, length, label))
>+        {
>+            context->objectPtrLabel(ptr, length, label);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY PopDebugGroupKHR()
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("()");
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        if (context->skipValidation() || ValidatePopDebugGroupKHR(context))
>+        {
>+            context->popDebugGroup();
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY PushDebugGroupKHR(GLenum source, GLuint id, GLsizei length, const GLchar *message)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLenum source = 0x%X, GLuint id = %u, GLsizei length = %d, const GLchar *message = "
>+        "0x%016" PRIxPTR ")",
>+        source, id, length, (uintptr_t)message);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        if (context->skipValidation() ||
>+            ValidatePushDebugGroupKHR(context, source, id, length, message))
>+        {
>+            context->pushDebugGroup(source, id, length, message);
>+        }
>+    }
>+}
>+
>+// GL_KHR_parallel_shader_compile
>+void GL_APIENTRY MaxShaderCompilerThreadsKHR(GLuint count)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint count = %u)", count);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        if (context->skipValidation() || ValidateMaxShaderCompilerThreadsKHR(context, count))
>+        {
>+            context->maxShaderCompilerThreads(count);
>+        }
>+    }
>+}
>+
>+// GL_NV_fence
>+void GL_APIENTRY DeleteFencesNV(GLsizei n, const GLuint *fences)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLsizei n = %d, const GLuint *fences = 0x%016" PRIxPTR ")", n, (uintptr_t)fences);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        if (context->skipValidation() || ValidateDeleteFencesNV(context, n, fences))
>+        {
>+            context->deleteFencesNV(n, fences);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY FinishFenceNV(GLuint fence)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint fence = %u)", fence);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        if (context->skipValidation() || ValidateFinishFenceNV(context, fence))
>+        {
>+            context->finishFenceNV(fence);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY GenFencesNV(GLsizei n, GLuint *fences)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLsizei n = %d, GLuint *fences = 0x%016" PRIxPTR ")", n, (uintptr_t)fences);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        if (context->skipValidation() || ValidateGenFencesNV(context, n, fences))
>+        {
>+            context->genFencesNV(n, fences);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY GetFenceivNV(GLuint fence, GLenum pname, GLint *params)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint fence = %u, GLenum pname = 0x%X, GLint *params = 0x%016" PRIxPTR ")", fence,
>+          pname, (uintptr_t)params);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        if (context->skipValidation() || ValidateGetFenceivNV(context, fence, pname, params))
>+        {
>+            context->getFenceivNV(fence, pname, params);
>+        }
>+    }
>+}
>+
>+GLboolean GL_APIENTRY IsFenceNV(GLuint fence)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint fence = %u)", fence);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        if (context->skipValidation() || ValidateIsFenceNV(context, fence))
>+        {
>+            return context->isFenceNV(fence);
>+        }
>+    }
>+
>+    return GetDefaultReturnValue<EntryPoint::IsFenceNV, GLboolean>();
>+}
>+
>+void GL_APIENTRY SetFenceNV(GLuint fence, GLenum condition)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint fence = %u, GLenum condition = 0x%X)", fence, condition);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        if (context->skipValidation() || ValidateSetFenceNV(context, fence, condition))
>+        {
>+            context->setFenceNV(fence, condition);
>+        }
>+    }
>+}
>+
>+GLboolean GL_APIENTRY TestFenceNV(GLuint fence)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint fence = %u)", fence);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        if (context->skipValidation() || ValidateTestFenceNV(context, fence))
>+        {
>+            return context->testFenceNV(fence);
>+        }
>+    }
>+
>+    return GetDefaultReturnValue<EntryPoint::TestFenceNV, GLboolean>();
>+}
>+
>+// GL_OES_EGL_image
>+void GL_APIENTRY EGLImageTargetRenderbufferStorageOES(GLenum target, GLeglImageOES image)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum target = 0x%X, GLeglImageOES image = 0x%016" PRIxPTR ")", target,
>+          (uintptr_t)image);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        if (context->skipValidation() ||
>+            ValidateEGLImageTargetRenderbufferStorageOES(context, target, image))
>+        {
>+            context->eGLImageTargetRenderbufferStorage(target, image);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY EGLImageTargetTexture2DOES(GLenum target, GLeglImageOES image)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum target = 0x%X, GLeglImageOES image = 0x%016" PRIxPTR ")", target,
>+          (uintptr_t)image);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        TextureType targetPacked = FromGLenum<TextureType>(target);
>+        if (context->skipValidation() ||
>+            ValidateEGLImageTargetTexture2DOES(context, targetPacked, image))
>+        {
>+            context->eGLImageTargetTexture2D(targetPacked, image);
>+        }
>+    }
>+}
>+
>+// GL_OES_draw_texture
>+void GL_APIENTRY DrawTexfOES(GLfloat x, GLfloat y, GLfloat z, GLfloat width, GLfloat height)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLfloat x = %f, GLfloat y = %f, GLfloat z = %f, GLfloat width = %f, GLfloat height = %f)",
>+        x, y, z, width, height);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        if (context->skipValidation() || ValidateDrawTexfOES(context, x, y, z, width, height))
>+        {
>+            context->drawTexf(x, y, z, width, height);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY DrawTexfvOES(const GLfloat *coords)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(const GLfloat *coords = 0x%016" PRIxPTR ")", (uintptr_t)coords);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        if (context->skipValidation() || ValidateDrawTexfvOES(context, coords))
>+        {
>+            context->drawTexfv(coords);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY DrawTexiOES(GLint x, GLint y, GLint z, GLint width, GLint height)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLint x = %d, GLint y = %d, GLint z = %d, GLint width = %d, GLint height = %d)", x, y,
>+          z, width, height);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        if (context->skipValidation() || ValidateDrawTexiOES(context, x, y, z, width, height))
>+        {
>+            context->drawTexi(x, y, z, width, height);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY DrawTexivOES(const GLint *coords)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(const GLint *coords = 0x%016" PRIxPTR ")", (uintptr_t)coords);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        if (context->skipValidation() || ValidateDrawTexivOES(context, coords))
>+        {
>+            context->drawTexiv(coords);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY DrawTexsOES(GLshort x, GLshort y, GLshort z, GLshort width, GLshort height)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLshort x = %d, GLshort y = %d, GLshort z = %d, GLshort width = %d, GLshort height = %d)",
>+        x, y, z, width, height);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        if (context->skipValidation() || ValidateDrawTexsOES(context, x, y, z, width, height))
>+        {
>+            context->drawTexs(x, y, z, width, height);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY DrawTexsvOES(const GLshort *coords)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(const GLshort *coords = 0x%016" PRIxPTR ")", (uintptr_t)coords);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        if (context->skipValidation() || ValidateDrawTexsvOES(context, coords))
>+        {
>+            context->drawTexsv(coords);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY DrawTexxOES(GLfixed x, GLfixed y, GLfixed z, GLfixed width, GLfixed height)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLfixed x = 0x%X, GLfixed y = 0x%X, GLfixed z = 0x%X, GLfixed width = 0x%X, GLfixed "
>+        "height = 0x%X)",
>+        x, y, z, width, height);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        if (context->skipValidation() || ValidateDrawTexxOES(context, x, y, z, width, height))
>+        {
>+            context->drawTexx(x, y, z, width, height);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY DrawTexxvOES(const GLfixed *coords)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(const GLfixed *coords = 0x%016" PRIxPTR ")", (uintptr_t)coords);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        if (context->skipValidation() || ValidateDrawTexxvOES(context, coords))
>+        {
>+            context->drawTexxv(coords);
>+        }
>+    }
>+}
>+
>+// GL_OES_framebuffer_object
>+void GL_APIENTRY BindFramebufferOES(GLenum target, GLuint framebuffer)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum target = 0x%X, GLuint framebuffer = %u)", target, framebuffer);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        if (context->skipValidation() || ValidateBindFramebufferOES(context, target, framebuffer))
>+        {
>+            context->bindFramebuffer(target, framebuffer);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY BindRenderbufferOES(GLenum target, GLuint renderbuffer)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum target = 0x%X, GLuint renderbuffer = %u)", target, renderbuffer);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        if (context->skipValidation() || ValidateBindRenderbufferOES(context, target, renderbuffer))
>+        {
>+            context->bindRenderbuffer(target, renderbuffer);
>+        }
>+    }
>+}
>+
>+GLenum GL_APIENTRY CheckFramebufferStatusOES(GLenum target)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum target = 0x%X)", target);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        if (context->skipValidation() || ValidateCheckFramebufferStatusOES(context, target))
>+        {
>+            return context->checkFramebufferStatus(target);
>+        }
>+    }
>+
>+    return GetDefaultReturnValue<EntryPoint::CheckFramebufferStatusOES, GLenum>();
>+}
>+
>+void GL_APIENTRY DeleteFramebuffersOES(GLsizei n, const GLuint *framebuffers)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLsizei n = %d, const GLuint *framebuffers = 0x%016" PRIxPTR ")", n,
>+          (uintptr_t)framebuffers);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        if (context->skipValidation() || ValidateDeleteFramebuffersOES(context, n, framebuffers))
>+        {
>+            context->deleteFramebuffers(n, framebuffers);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY DeleteRenderbuffersOES(GLsizei n, const GLuint *renderbuffers)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLsizei n = %d, const GLuint *renderbuffers = 0x%016" PRIxPTR ")", n,
>+          (uintptr_t)renderbuffers);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        if (context->skipValidation() || ValidateDeleteRenderbuffersOES(context, n, renderbuffers))
>+        {
>+            context->deleteRenderbuffers(n, renderbuffers);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY FramebufferRenderbufferOES(GLenum target,
>+                                            GLenum attachment,
>+                                            GLenum renderbuffertarget,
>+                                            GLuint renderbuffer)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLenum target = 0x%X, GLenum attachment = 0x%X, GLenum renderbuffertarget = 0x%X, GLuint "
>+        "renderbuffer = %u)",
>+        target, attachment, renderbuffertarget, renderbuffer);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        if (context->skipValidation() ||
>+            ValidateFramebufferRenderbufferOES(context, target, attachment, renderbuffertarget,
>+                                               renderbuffer))
>+        {
>+            context->framebufferRenderbuffer(target, attachment, renderbuffertarget, renderbuffer);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY FramebufferTexture2DOES(GLenum target,
>+                                         GLenum attachment,
>+                                         GLenum textarget,
>+                                         GLuint texture,
>+                                         GLint level)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLenum target = 0x%X, GLenum attachment = 0x%X, GLenum textarget = 0x%X, GLuint texture "
>+        "= %u, GLint level = %d)",
>+        target, attachment, textarget, texture, level);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        TextureTarget textargetPacked = FromGLenum<TextureTarget>(textarget);
>+        if (context->skipValidation() ||
>+            ValidateFramebufferTexture2DOES(context, target, attachment, textargetPacked, texture,
>+                                            level))
>+        {
>+            context->framebufferTexture2D(target, attachment, textargetPacked, texture, level);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY GenFramebuffersOES(GLsizei n, GLuint *framebuffers)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLsizei n = %d, GLuint *framebuffers = 0x%016" PRIxPTR ")", n, (uintptr_t)framebuffers);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        if (context->skipValidation() || ValidateGenFramebuffersOES(context, n, framebuffers))
>+        {
>+            context->genFramebuffers(n, framebuffers);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY GenRenderbuffersOES(GLsizei n, GLuint *renderbuffers)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLsizei n = %d, GLuint *renderbuffers = 0x%016" PRIxPTR ")", n,
>+          (uintptr_t)renderbuffers);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        if (context->skipValidation() || ValidateGenRenderbuffersOES(context, n, renderbuffers))
>+        {
>+            context->genRenderbuffers(n, renderbuffers);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY GenerateMipmapOES(GLenum target)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum target = 0x%X)", target);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        TextureType targetPacked = FromGLenum<TextureType>(target);
>+        if (context->skipValidation() || ValidateGenerateMipmapOES(context, targetPacked))
>+        {
>+            context->generateMipmap(targetPacked);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY GetFramebufferAttachmentParameterivOES(GLenum target,
>+                                                        GLenum attachment,
>+                                                        GLenum pname,
>+                                                        GLint *params)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLenum target = 0x%X, GLenum attachment = 0x%X, GLenum pname = 0x%X, GLint *params = "
>+        "0x%016" PRIxPTR ")",
>+        target, attachment, pname, (uintptr_t)params);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        if (context->skipValidation() || ValidateGetFramebufferAttachmentParameterivOES(
>+                                             context, target, attachment, pname, params))
>+        {
>+            context->getFramebufferAttachmentParameteriv(target, attachment, pname, params);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY GetRenderbufferParameterivOES(GLenum target, GLenum pname, GLint *params)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum target = 0x%X, GLenum pname = 0x%X, GLint *params = 0x%016" PRIxPTR ")", target,
>+          pname, (uintptr_t)params);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        if (context->skipValidation() ||
>+            ValidateGetRenderbufferParameterivOES(context, target, pname, params))
>+        {
>+            context->getRenderbufferParameteriv(target, pname, params);
>+        }
>+    }
>+}
>+
>+GLboolean GL_APIENTRY IsFramebufferOES(GLuint framebuffer)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint framebuffer = %u)", framebuffer);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        if (context->skipValidation() || ValidateIsFramebufferOES(context, framebuffer))
>+        {
>+            return context->isFramebuffer(framebuffer);
>+        }
>+    }
>+
>+    return GetDefaultReturnValue<EntryPoint::IsFramebufferOES, GLboolean>();
>+}
>+
>+GLboolean GL_APIENTRY IsRenderbufferOES(GLuint renderbuffer)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint renderbuffer = %u)", renderbuffer);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        if (context->skipValidation() || ValidateIsRenderbufferOES(context, renderbuffer))
>+        {
>+            return context->isRenderbuffer(renderbuffer);
>+        }
>+    }
>+
>+    return GetDefaultReturnValue<EntryPoint::IsRenderbufferOES, GLboolean>();
>+}
>+
>+void GL_APIENTRY RenderbufferStorageOES(GLenum target,
>+                                        GLenum internalformat,
>+                                        GLsizei width,
>+                                        GLsizei height)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLenum target = 0x%X, GLenum internalformat = 0x%X, GLsizei width = %d, GLsizei height = "
>+        "%d)",
>+        target, internalformat, width, height);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        if (context->skipValidation() ||
>+            ValidateRenderbufferStorageOES(context, target, internalformat, width, height))
>+        {
>+            context->renderbufferStorage(target, internalformat, width, height);
>+        }
>+    }
>+}
>+
>+// GL_OES_get_program_binary
>+void GL_APIENTRY GetProgramBinaryOES(GLuint program,
>+                                     GLsizei bufSize,
>+                                     GLsizei *length,
>+                                     GLenum *binaryFormat,
>+                                     void *binary)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint program = %u, GLsizei bufSize = %d, GLsizei *length = 0x%016" PRIxPTR
>+          ", GLenum *binaryFormat = 0x%016" PRIxPTR ", void *binary = 0x%016" PRIxPTR ")",
>+          program, bufSize, (uintptr_t)length, (uintptr_t)binaryFormat, (uintptr_t)binary);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        if (context->skipValidation() ||
>+            ValidateGetProgramBinaryOES(context, program, bufSize, length, binaryFormat, binary))
>+        {
>+            context->getProgramBinary(program, bufSize, length, binaryFormat, binary);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY ProgramBinaryOES(GLuint program,
>+                                  GLenum binaryFormat,
>+                                  const void *binary,
>+                                  GLint length)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint program = %u, GLenum binaryFormat = 0x%X, const void *binary = 0x%016" PRIxPTR
>+          ", GLint length = %d)",
>+          program, binaryFormat, (uintptr_t)binary, length);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        if (context->skipValidation() ||
>+            ValidateProgramBinaryOES(context, program, binaryFormat, binary, length))
>+        {
>+            context->programBinary(program, binaryFormat, binary, length);
>+        }
>+    }
>+}
>+
>+// GL_OES_mapbuffer
>+void GL_APIENTRY GetBufferPointervOES(GLenum target, GLenum pname, void **params)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum target = 0x%X, GLenum pname = 0x%X, void **params = 0x%016" PRIxPTR ")", target,
>+          pname, (uintptr_t)params);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        BufferBinding targetPacked = FromGLenum<BufferBinding>(target);
>+        if (context->skipValidation() ||
>+            ValidateGetBufferPointervOES(context, targetPacked, pname, params))
>+        {
>+            context->getBufferPointerv(targetPacked, pname, params);
>+        }
>+    }
>+}
>+
>+void *GL_APIENTRY MapBufferOES(GLenum target, GLenum access)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum target = 0x%X, GLenum access = 0x%X)", target, access);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        BufferBinding targetPacked = FromGLenum<BufferBinding>(target);
>+        if (context->skipValidation() || ValidateMapBufferOES(context, targetPacked, access))
>+        {
>+            return context->mapBuffer(targetPacked, access);
>+        }
>+    }
>+
>+    return GetDefaultReturnValue<EntryPoint::MapBufferOES, void *>();
>+}
>+
>+GLboolean GL_APIENTRY UnmapBufferOES(GLenum target)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum target = 0x%X)", target);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        BufferBinding targetPacked = FromGLenum<BufferBinding>(target);
>+        if (context->skipValidation() || ValidateUnmapBufferOES(context, targetPacked))
>+        {
>+            return context->unmapBuffer(targetPacked);
>+        }
>+    }
>+
>+    return GetDefaultReturnValue<EntryPoint::UnmapBufferOES, GLboolean>();
>+}
>+
>+// GL_OES_matrix_palette
>+void GL_APIENTRY CurrentPaletteMatrixOES(GLuint matrixpaletteindex)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint matrixpaletteindex = %u)", matrixpaletteindex);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        if (context->skipValidation() ||
>+            ValidateCurrentPaletteMatrixOES(context, matrixpaletteindex))
>+        {
>+            context->currentPaletteMatrix(matrixpaletteindex);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY LoadPaletteFromModelViewMatrixOES()
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("()");
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        if (context->skipValidation() || ValidateLoadPaletteFromModelViewMatrixOES(context))
>+        {
>+            context->loadPaletteFromModelViewMatrix();
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY MatrixIndexPointerOES(GLint size, GLenum type, GLsizei stride, const void *pointer)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLint size = %d, GLenum type = 0x%X, GLsizei stride = %d, const void *pointer = "
>+        "0x%016" PRIxPTR ")",
>+        size, type, stride, (uintptr_t)pointer);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        if (context->skipValidation() ||
>+            ValidateMatrixIndexPointerOES(context, size, type, stride, pointer))
>+        {
>+            context->matrixIndexPointer(size, type, stride, pointer);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY WeightPointerOES(GLint size, GLenum type, GLsizei stride, const void *pointer)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLint size = %d, GLenum type = 0x%X, GLsizei stride = %d, const void *pointer = "
>+        "0x%016" PRIxPTR ")",
>+        size, type, stride, (uintptr_t)pointer);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        if (context->skipValidation() ||
>+            ValidateWeightPointerOES(context, size, type, stride, pointer))
>+        {
>+            context->weightPointer(size, type, stride, pointer);
>+        }
>+    }
>+}
>+
>+// GL_OES_point_size_array
>+void GL_APIENTRY PointSizePointerOES(GLenum type, GLsizei stride, const void *pointer)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum type = 0x%X, GLsizei stride = %d, const void *pointer = 0x%016" PRIxPTR ")",
>+          type, stride, (uintptr_t)pointer);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        VertexAttribType typePacked = FromGLenum<VertexAttribType>(type);
>+        if (context->skipValidation() ||
>+            ValidatePointSizePointerOES(context, typePacked, stride, pointer))
>+        {
>+            context->pointSizePointer(typePacked, stride, pointer);
>+        }
>+    }
>+}
>+
>+// GL_OES_query_matrix
>+GLbitfield GL_APIENTRY QueryMatrixxOES(GLfixed *mantissa, GLint *exponent)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLfixed *mantissa = 0x%016" PRIxPTR ", GLint *exponent = 0x%016" PRIxPTR ")",
>+          (uintptr_t)mantissa, (uintptr_t)exponent);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        if (context->skipValidation() || ValidateQueryMatrixxOES(context, mantissa, exponent))
>+        {
>+            return context->queryMatrixx(mantissa, exponent);
>+        }
>+    }
>+
>+    return GetDefaultReturnValue<EntryPoint::QueryMatrixxOES, GLbitfield>();
>+}
>+
>+// GL_OES_texture_border_clamp
>+void GL_APIENTRY GetSamplerParameterIivOES(GLuint sampler, GLenum pname, GLint *params)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint sampler = %u, GLenum pname = 0x%X, GLint *params = 0x%016" PRIxPTR ")", sampler,
>+          pname, (uintptr_t)params);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        if (context->skipValidation() ||
>+            ValidateGetSamplerParameterIivOES(context, sampler, pname, params))
>+        {
>+            context->getSamplerParameterIiv(sampler, pname, params);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY GetSamplerParameterIuivOES(GLuint sampler, GLenum pname, GLuint *params)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint sampler = %u, GLenum pname = 0x%X, GLuint *params = 0x%016" PRIxPTR ")", sampler,
>+          pname, (uintptr_t)params);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        if (context->skipValidation() ||
>+            ValidateGetSamplerParameterIuivOES(context, sampler, pname, params))
>+        {
>+            context->getSamplerParameterIuiv(sampler, pname, params);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY GetTexParameterIivOES(GLenum target, GLenum pname, GLint *params)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum target = 0x%X, GLenum pname = 0x%X, GLint *params = 0x%016" PRIxPTR ")", target,
>+          pname, (uintptr_t)params);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        TextureType targetPacked = FromGLenum<TextureType>(target);
>+        if (context->skipValidation() ||
>+            ValidateGetTexParameterIivOES(context, targetPacked, pname, params))
>+        {
>+            context->getTexParameterIiv(targetPacked, pname, params);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY GetTexParameterIuivOES(GLenum target, GLenum pname, GLuint *params)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum target = 0x%X, GLenum pname = 0x%X, GLuint *params = 0x%016" PRIxPTR ")", target,
>+          pname, (uintptr_t)params);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        TextureType targetPacked = FromGLenum<TextureType>(target);
>+        if (context->skipValidation() ||
>+            ValidateGetTexParameterIuivOES(context, targetPacked, pname, params))
>+        {
>+            context->getTexParameterIuiv(targetPacked, pname, params);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY SamplerParameterIivOES(GLuint sampler, GLenum pname, const GLint *param)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint sampler = %u, GLenum pname = 0x%X, const GLint *param = 0x%016" PRIxPTR ")",
>+          sampler, pname, (uintptr_t)param);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        if (context->skipValidation() ||
>+            ValidateSamplerParameterIivOES(context, sampler, pname, param))
>+        {
>+            context->samplerParameterIiv(sampler, pname, param);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY SamplerParameterIuivOES(GLuint sampler, GLenum pname, const GLuint *param)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint sampler = %u, GLenum pname = 0x%X, const GLuint *param = 0x%016" PRIxPTR ")",
>+          sampler, pname, (uintptr_t)param);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        if (context->skipValidation() ||
>+            ValidateSamplerParameterIuivOES(context, sampler, pname, param))
>+        {
>+            context->samplerParameterIuiv(sampler, pname, param);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY TexParameterIivOES(GLenum target, GLenum pname, const GLint *params)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum target = 0x%X, GLenum pname = 0x%X, const GLint *params = 0x%016" PRIxPTR ")",
>+          target, pname, (uintptr_t)params);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        TextureType targetPacked = FromGLenum<TextureType>(target);
>+        if (context->skipValidation() ||
>+            ValidateTexParameterIivOES(context, targetPacked, pname, params))
>+        {
>+            context->texParameterIiv(targetPacked, pname, params);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY TexParameterIuivOES(GLenum target, GLenum pname, const GLuint *params)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum target = 0x%X, GLenum pname = 0x%X, const GLuint *params = 0x%016" PRIxPTR ")",
>+          target, pname, (uintptr_t)params);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        TextureType targetPacked = FromGLenum<TextureType>(target);
>+        if (context->skipValidation() ||
>+            ValidateTexParameterIuivOES(context, targetPacked, pname, params))
>+        {
>+            context->texParameterIuiv(targetPacked, pname, params);
>+        }
>+    }
>+}
>+
>+// GL_OES_texture_cube_map
>+void GL_APIENTRY GetTexGenfvOES(GLenum coord, GLenum pname, GLfloat *params)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum coord = 0x%X, GLenum pname = 0x%X, GLfloat *params = 0x%016" PRIxPTR ")", coord,
>+          pname, (uintptr_t)params);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        if (context->skipValidation() || ValidateGetTexGenfvOES(context, coord, pname, params))
>+        {
>+            context->getTexGenfv(coord, pname, params);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY GetTexGenivOES(GLenum coord, GLenum pname, GLint *params)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum coord = 0x%X, GLenum pname = 0x%X, GLint *params = 0x%016" PRIxPTR ")", coord,
>+          pname, (uintptr_t)params);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        if (context->skipValidation() || ValidateGetTexGenivOES(context, coord, pname, params))
>+        {
>+            context->getTexGeniv(coord, pname, params);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY GetTexGenxvOES(GLenum coord, GLenum pname, GLfixed *params)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum coord = 0x%X, GLenum pname = 0x%X, GLfixed *params = 0x%016" PRIxPTR ")", coord,
>+          pname, (uintptr_t)params);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        if (context->skipValidation() || ValidateGetTexGenxvOES(context, coord, pname, params))
>+        {
>+            context->getTexGenxv(coord, pname, params);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY TexGenfOES(GLenum coord, GLenum pname, GLfloat param)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum coord = 0x%X, GLenum pname = 0x%X, GLfloat param = %f)", coord, pname, param);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        if (context->skipValidation() || ValidateTexGenfOES(context, coord, pname, param))
>+        {
>+            context->texGenf(coord, pname, param);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY TexGenfvOES(GLenum coord, GLenum pname, const GLfloat *params)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum coord = 0x%X, GLenum pname = 0x%X, const GLfloat *params = 0x%016" PRIxPTR ")",
>+          coord, pname, (uintptr_t)params);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        if (context->skipValidation() || ValidateTexGenfvOES(context, coord, pname, params))
>+        {
>+            context->texGenfv(coord, pname, params);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY TexGeniOES(GLenum coord, GLenum pname, GLint param)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum coord = 0x%X, GLenum pname = 0x%X, GLint param = %d)", coord, pname, param);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        if (context->skipValidation() || ValidateTexGeniOES(context, coord, pname, param))
>+        {
>+            context->texGeni(coord, pname, param);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY TexGenivOES(GLenum coord, GLenum pname, const GLint *params)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum coord = 0x%X, GLenum pname = 0x%X, const GLint *params = 0x%016" PRIxPTR ")",
>+          coord, pname, (uintptr_t)params);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        if (context->skipValidation() || ValidateTexGenivOES(context, coord, pname, params))
>+        {
>+            context->texGeniv(coord, pname, params);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY TexGenxOES(GLenum coord, GLenum pname, GLfixed param)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum coord = 0x%X, GLenum pname = 0x%X, GLfixed param = 0x%X)", coord, pname, param);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        if (context->skipValidation() || ValidateTexGenxOES(context, coord, pname, param))
>+        {
>+            context->texGenx(coord, pname, param);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY TexGenxvOES(GLenum coord, GLenum pname, const GLfixed *params)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum coord = 0x%X, GLenum pname = 0x%X, const GLfixed *params = 0x%016" PRIxPTR ")",
>+          coord, pname, (uintptr_t)params);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        if (context->skipValidation() || ValidateTexGenxvOES(context, coord, pname, params))
>+        {
>+            context->texGenxv(coord, pname, params);
>+        }
>+    }
>+}
>+
>+// GL_OES_texture_storage_multisample_2d_array
>+void GL_APIENTRY TexStorage3DMultisampleOES(GLenum target,
>+                                            GLsizei samples,
>+                                            GLenum internalformat,
>+                                            GLsizei width,
>+                                            GLsizei height,
>+                                            GLsizei depth,
>+                                            GLboolean fixedsamplelocations)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLenum target = 0x%X, GLsizei samples = %d, GLenum internalformat = 0x%X, GLsizei width "
>+        "= %d, GLsizei height = %d, GLsizei depth = %d, GLboolean fixedsamplelocations = %u)",
>+        target, samples, internalformat, width, height, depth, fixedsamplelocations);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        TextureType targetPacked = FromGLenum<TextureType>(target);
>+        if (context->skipValidation() ||
>+            ValidateTexStorage3DMultisampleOES(context, targetPacked, samples, internalformat,
>+                                               width, height, depth, fixedsamplelocations))
>+        {
>+            context->texStorage3DMultisample(targetPacked, samples, internalformat, width, height,
>+                                             depth, fixedsamplelocations);
>+        }
>+    }
>+}
>+
>+// GL_OES_vertex_array_object
>+void GL_APIENTRY BindVertexArrayOES(GLuint array)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint array = %u)", array);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        if (context->skipValidation() || ValidateBindVertexArrayOES(context, array))
>+        {
>+            context->bindVertexArray(array);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY DeleteVertexArraysOES(GLsizei n, const GLuint *arrays)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLsizei n = %d, const GLuint *arrays = 0x%016" PRIxPTR ")", n, (uintptr_t)arrays);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        if (context->skipValidation() || ValidateDeleteVertexArraysOES(context, n, arrays))
>+        {
>+            context->deleteVertexArrays(n, arrays);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY GenVertexArraysOES(GLsizei n, GLuint *arrays)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLsizei n = %d, GLuint *arrays = 0x%016" PRIxPTR ")", n, (uintptr_t)arrays);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        if (context->skipValidation() || ValidateGenVertexArraysOES(context, n, arrays))
>+        {
>+            context->genVertexArrays(n, arrays);
>+        }
>+    }
>+}
>+
>+GLboolean GL_APIENTRY IsVertexArrayOES(GLuint array)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint array = %u)", array);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        if (context->skipValidation() || ValidateIsVertexArrayOES(context, array))
>+        {
>+            return context->isVertexArray(array);
>+        }
>+    }
>+
>+    return GetDefaultReturnValue<EntryPoint::IsVertexArrayOES, GLboolean>();
>+}
>+
>+// GL_OVR_multiview
>+void GL_APIENTRY FramebufferTextureMultiviewOVR(GLenum target,
>+                                                GLenum attachment,
>+                                                GLuint texture,
>+                                                GLint level,
>+                                                GLint baseViewIndex,
>+                                                GLsizei numViews)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLenum target = 0x%X, GLenum attachment = 0x%X, GLuint texture = %u, GLint level = %d, "
>+        "GLint baseViewIndex = %d, GLsizei numViews = %d)",
>+        target, attachment, texture, level, baseViewIndex, numViews);
>+
>+    Context *context = GetValidGlobalContext();
>+    if (context)
>+    {
>+        if (context->skipValidation() ||
>+            ValidateFramebufferTextureMultiviewOVR(context, target, attachment, texture, level,
>+                                                   baseViewIndex, numViews))
>+        {
>+            context->framebufferTextureMultiview(target, attachment, texture, level, baseViewIndex,
>+                                                 numViews);
>+        }
>+    }
>+}
>+
>+// GL_OVR_multiview2
>+
>+// EGL_ANGLE_explicit_context
>+void GL_APIENTRY ActiveShaderProgramContextANGLE(GLeglContext ctx, GLuint pipeline, GLuint program)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint pipeline = %u, GLuint program = %u)", pipeline, program);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateActiveShaderProgram(context, pipeline, program))
>+        {
>+            context->activeShaderProgram(pipeline, program);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY ActiveTextureContextANGLE(GLeglContext ctx, GLenum texture)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum texture = 0x%X)", texture);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateActiveTexture(context, texture))
>+        {
>+            context->activeTexture(texture);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY AlphaFuncContextANGLE(GLeglContext ctx, GLenum func, GLfloat ref)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum func = 0x%X, GLfloat ref = %f)", func, ref);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        AlphaTestFunc funcPacked = FromGLenum<AlphaTestFunc>(func);
>+        if (context->skipValidation() || ValidateAlphaFunc(context, funcPacked, ref))
>+        {
>+            context->alphaFunc(funcPacked, ref);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY AlphaFuncxContextANGLE(GLeglContext ctx, GLenum func, GLfixed ref)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum func = 0x%X, GLfixed ref = 0x%X)", func, ref);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        AlphaTestFunc funcPacked = FromGLenum<AlphaTestFunc>(func);
>+        if (context->skipValidation() || ValidateAlphaFuncx(context, funcPacked, ref))
>+        {
>+            context->alphaFuncx(funcPacked, ref);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY AttachShaderContextANGLE(GLeglContext ctx, GLuint program, GLuint shader)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint program = %u, GLuint shader = %u)", program, shader);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateAttachShader(context, program, shader))
>+        {
>+            context->attachShader(program, shader);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY BeginQueryContextANGLE(GLeglContext ctx, GLenum target, GLuint id)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum target = 0x%X, GLuint id = %u)", target, id);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        QueryType targetPacked = FromGLenum<QueryType>(target);
>+        if (context->skipValidation() || ValidateBeginQuery(context, targetPacked, id))
>+        {
>+            context->beginQuery(targetPacked, id);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY BeginQueryEXTContextANGLE(GLeglContext ctx, GLenum target, GLuint id)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum target = 0x%X, GLuint id = %u)", target, id);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        QueryType targetPacked = FromGLenum<QueryType>(target);
>+        if (context->skipValidation() || ValidateBeginQueryEXT(context, targetPacked, id))
>+        {
>+            context->beginQuery(targetPacked, id);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY BeginTransformFeedbackContextANGLE(GLeglContext ctx, GLenum primitiveMode)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum primitiveMode = 0x%X)", primitiveMode);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        PrimitiveMode primitiveModePacked = FromGLenum<PrimitiveMode>(primitiveMode);
>+        if (context->skipValidation() ||
>+            ValidateBeginTransformFeedback(context, primitiveModePacked))
>+        {
>+            context->beginTransformFeedback(primitiveModePacked);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY BindAttribLocationContextANGLE(GLeglContext ctx,
>+                                                GLuint program,
>+                                                GLuint index,
>+                                                const GLchar *name)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint program = %u, GLuint index = %u, const GLchar *name = 0x%016" PRIxPTR ")",
>+          program, index, (uintptr_t)name);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateBindAttribLocation(context, program, index, name))
>+        {
>+            context->bindAttribLocation(program, index, name);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY BindBufferContextANGLE(GLeglContext ctx, GLenum target, GLuint buffer)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum target = 0x%X, GLuint buffer = %u)", target, buffer);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        BufferBinding targetPacked = FromGLenum<BufferBinding>(target);
>+        if (context->skipValidation() || ValidateBindBuffer(context, targetPacked, buffer))
>+        {
>+            context->bindBuffer(targetPacked, buffer);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY BindBufferBaseContextANGLE(GLeglContext ctx,
>+                                            GLenum target,
>+                                            GLuint index,
>+                                            GLuint buffer)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum target = 0x%X, GLuint index = %u, GLuint buffer = %u)", target, index, buffer);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        BufferBinding targetPacked = FromGLenum<BufferBinding>(target);
>+        if (context->skipValidation() ||
>+            ValidateBindBufferBase(context, targetPacked, index, buffer))
>+        {
>+            context->bindBufferBase(targetPacked, index, buffer);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY BindBufferRangeContextANGLE(GLeglContext ctx,
>+                                             GLenum target,
>+                                             GLuint index,
>+                                             GLuint buffer,
>+                                             GLintptr offset,
>+                                             GLsizeiptr size)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLenum target = 0x%X, GLuint index = %u, GLuint buffer = %u, GLintptr offset = %llu, "
>+        "GLsizeiptr size = %llu)",
>+        target, index, buffer, static_cast<unsigned long long>(offset),
>+        static_cast<unsigned long long>(size));
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        BufferBinding targetPacked = FromGLenum<BufferBinding>(target);
>+        if (context->skipValidation() ||
>+            ValidateBindBufferRange(context, targetPacked, index, buffer, offset, size))
>+        {
>+            context->bindBufferRange(targetPacked, index, buffer, offset, size);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY BindFragDataLocationEXTContextANGLE(GLeglContext ctx,
>+                                                     GLuint program,
>+                                                     GLuint color,
>+                                                     const GLchar *name)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint program = %u, GLuint color = %u, const GLchar *name = 0x%016" PRIxPTR ")",
>+          program, color, (uintptr_t)name);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() ||
>+            ValidateBindFragDataLocationEXT(context, program, color, name))
>+        {
>+            context->bindFragDataLocation(program, color, name);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY BindFragDataLocationIndexedEXTContextANGLE(GLeglContext ctx,
>+                                                            GLuint program,
>+                                                            GLuint colorNumber,
>+                                                            GLuint index,
>+                                                            const GLchar *name)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLuint program = %u, GLuint colorNumber = %u, GLuint index = %u, const GLchar *name = "
>+        "0x%016" PRIxPTR ")",
>+        program, colorNumber, index, (uintptr_t)name);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() ||
>+            ValidateBindFragDataLocationIndexedEXT(context, program, colorNumber, index, name))
>+        {
>+            context->bindFragDataLocationIndexed(program, colorNumber, index, name);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY BindFramebufferContextANGLE(GLeglContext ctx, GLenum target, GLuint framebuffer)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum target = 0x%X, GLuint framebuffer = %u)", target, framebuffer);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateBindFramebuffer(context, target, framebuffer))
>+        {
>+            context->bindFramebuffer(target, framebuffer);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY BindFramebufferOESContextANGLE(GLeglContext ctx, GLenum target, GLuint framebuffer)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum target = 0x%X, GLuint framebuffer = %u)", target, framebuffer);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateBindFramebufferOES(context, target, framebuffer))
>+        {
>+            context->bindFramebuffer(target, framebuffer);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY BindImageTextureContextANGLE(GLeglContext ctx,
>+                                              GLuint unit,
>+                                              GLuint texture,
>+                                              GLint level,
>+                                              GLboolean layered,
>+                                              GLint layer,
>+                                              GLenum access,
>+                                              GLenum format)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLuint unit = %u, GLuint texture = %u, GLint level = %d, GLboolean layered = %u, GLint "
>+        "layer = %d, GLenum access = 0x%X, GLenum format = 0x%X)",
>+        unit, texture, level, layered, layer, access, format);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() ||
>+            ValidateBindImageTexture(context, unit, texture, level, layered, layer, access, format))
>+        {
>+            context->bindImageTexture(unit, texture, level, layered, layer, access, format);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY BindProgramPipelineContextANGLE(GLeglContext ctx, GLuint pipeline)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint pipeline = %u)", pipeline);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateBindProgramPipeline(context, pipeline))
>+        {
>+            context->bindProgramPipeline(pipeline);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY BindRenderbufferContextANGLE(GLeglContext ctx, GLenum target, GLuint renderbuffer)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum target = 0x%X, GLuint renderbuffer = %u)", target, renderbuffer);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateBindRenderbuffer(context, target, renderbuffer))
>+        {
>+            context->bindRenderbuffer(target, renderbuffer);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY BindRenderbufferOESContextANGLE(GLeglContext ctx,
>+                                                 GLenum target,
>+                                                 GLuint renderbuffer)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum target = 0x%X, GLuint renderbuffer = %u)", target, renderbuffer);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateBindRenderbufferOES(context, target, renderbuffer))
>+        {
>+            context->bindRenderbuffer(target, renderbuffer);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY BindSamplerContextANGLE(GLeglContext ctx, GLuint unit, GLuint sampler)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint unit = %u, GLuint sampler = %u)", unit, sampler);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateBindSampler(context, unit, sampler))
>+        {
>+            context->bindSampler(unit, sampler);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY BindTextureContextANGLE(GLeglContext ctx, GLenum target, GLuint texture)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum target = 0x%X, GLuint texture = %u)", target, texture);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        TextureType targetPacked = FromGLenum<TextureType>(target);
>+        if (context->skipValidation() || ValidateBindTexture(context, targetPacked, texture))
>+        {
>+            context->bindTexture(targetPacked, texture);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY BindTransformFeedbackContextANGLE(GLeglContext ctx, GLenum target, GLuint id)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum target = 0x%X, GLuint id = %u)", target, id);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateBindTransformFeedback(context, target, id))
>+        {
>+            context->bindTransformFeedback(target, id);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY BindVertexArrayContextANGLE(GLeglContext ctx, GLuint array)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint array = %u)", array);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateBindVertexArray(context, array))
>+        {
>+            context->bindVertexArray(array);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY BindVertexArrayOESContextANGLE(GLeglContext ctx, GLuint array)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint array = %u)", array);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateBindVertexArrayOES(context, array))
>+        {
>+            context->bindVertexArray(array);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY BindVertexBufferContextANGLE(GLeglContext ctx,
>+                                              GLuint bindingindex,
>+                                              GLuint buffer,
>+                                              GLintptr offset,
>+                                              GLsizei stride)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLuint bindingindex = %u, GLuint buffer = %u, GLintptr offset = %llu, GLsizei stride = "
>+        "%d)",
>+        bindingindex, buffer, static_cast<unsigned long long>(offset), stride);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() ||
>+            ValidateBindVertexBuffer(context, bindingindex, buffer, offset, stride))
>+        {
>+            context->bindVertexBuffer(bindingindex, buffer, offset, stride);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY
>+BlendColorContextANGLE(GLeglContext ctx, GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLfloat red = %f, GLfloat green = %f, GLfloat blue = %f, GLfloat alpha = %f)", red,
>+          green, blue, alpha);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateBlendColor(context, red, green, blue, alpha))
>+        {
>+            context->blendColor(red, green, blue, alpha);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY BlendEquationContextANGLE(GLeglContext ctx, GLenum mode)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum mode = 0x%X)", mode);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateBlendEquation(context, mode))
>+        {
>+            context->blendEquation(mode);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY BlendEquationSeparateContextANGLE(GLeglContext ctx,
>+                                                   GLenum modeRGB,
>+                                                   GLenum modeAlpha)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum modeRGB = 0x%X, GLenum modeAlpha = 0x%X)", modeRGB, modeAlpha);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateBlendEquationSeparate(context, modeRGB, modeAlpha))
>+        {
>+            context->blendEquationSeparate(modeRGB, modeAlpha);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY BlendFuncContextANGLE(GLeglContext ctx, GLenum sfactor, GLenum dfactor)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum sfactor = 0x%X, GLenum dfactor = 0x%X)", sfactor, dfactor);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateBlendFunc(context, sfactor, dfactor))
>+        {
>+            context->blendFunc(sfactor, dfactor);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY BlendFuncSeparateContextANGLE(GLeglContext ctx,
>+                                               GLenum sfactorRGB,
>+                                               GLenum dfactorRGB,
>+                                               GLenum sfactorAlpha,
>+                                               GLenum dfactorAlpha)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLenum sfactorRGB = 0x%X, GLenum dfactorRGB = 0x%X, GLenum sfactorAlpha = 0x%X, GLenum "
>+        "dfactorAlpha = 0x%X)",
>+        sfactorRGB, dfactorRGB, sfactorAlpha, dfactorAlpha);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() ||
>+            ValidateBlendFuncSeparate(context, sfactorRGB, dfactorRGB, sfactorAlpha, dfactorAlpha))
>+        {
>+            context->blendFuncSeparate(sfactorRGB, dfactorRGB, sfactorAlpha, dfactorAlpha);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY BlitFramebufferContextANGLE(GLeglContext ctx,
>+                                             GLint srcX0,
>+                                             GLint srcY0,
>+                                             GLint srcX1,
>+                                             GLint srcY1,
>+                                             GLint dstX0,
>+                                             GLint dstY0,
>+                                             GLint dstX1,
>+                                             GLint dstY1,
>+                                             GLbitfield mask,
>+                                             GLenum filter)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLint srcX0 = %d, GLint srcY0 = %d, GLint srcX1 = %d, GLint srcY1 = %d, GLint dstX0 = "
>+        "%d, GLint dstY0 = %d, GLint dstX1 = %d, GLint dstY1 = %d, GLbitfield mask = 0x%X, GLenum "
>+        "filter = 0x%X)",
>+        srcX0, srcY0, srcX1, srcY1, dstX0, dstY0, dstX1, dstY1, mask, filter);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() ||
>+            ValidateBlitFramebuffer(context, srcX0, srcY0, srcX1, srcY1, dstX0, dstY0, dstX1, dstY1,
>+                                    mask, filter))
>+        {
>+            context->blitFramebuffer(srcX0, srcY0, srcX1, srcY1, dstX0, dstY0, dstX1, dstY1, mask,
>+                                     filter);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY BlitFramebufferANGLEContextANGLE(GLeglContext ctx,
>+                                                  GLint srcX0,
>+                                                  GLint srcY0,
>+                                                  GLint srcX1,
>+                                                  GLint srcY1,
>+                                                  GLint dstX0,
>+                                                  GLint dstY0,
>+                                                  GLint dstX1,
>+                                                  GLint dstY1,
>+                                                  GLbitfield mask,
>+                                                  GLenum filter)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLint srcX0 = %d, GLint srcY0 = %d, GLint srcX1 = %d, GLint srcY1 = %d, GLint dstX0 = "
>+        "%d, GLint dstY0 = %d, GLint dstX1 = %d, GLint dstY1 = %d, GLbitfield mask = 0x%X, GLenum "
>+        "filter = 0x%X)",
>+        srcX0, srcY0, srcX1, srcY1, dstX0, dstY0, dstX1, dstY1, mask, filter);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() ||
>+            ValidateBlitFramebufferANGLE(context, srcX0, srcY0, srcX1, srcY1, dstX0, dstY0, dstX1,
>+                                         dstY1, mask, filter))
>+        {
>+            context->blitFramebuffer(srcX0, srcY0, srcX1, srcY1, dstX0, dstY0, dstX1, dstY1, mask,
>+                                     filter);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY BufferDataContextANGLE(GLeglContext ctx,
>+                                        GLenum target,
>+                                        GLsizeiptr size,
>+                                        const void *data,
>+                                        GLenum usage)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum target = 0x%X, GLsizeiptr size = %llu, const void *data = 0x%016" PRIxPTR
>+          ", GLenum usage = 0x%X)",
>+          target, static_cast<unsigned long long>(size), (uintptr_t)data, usage);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        BufferBinding targetPacked = FromGLenum<BufferBinding>(target);
>+        BufferUsage usagePacked    = FromGLenum<BufferUsage>(usage);
>+        if (context->skipValidation() ||
>+            ValidateBufferData(context, targetPacked, size, data, usagePacked))
>+        {
>+            context->bufferData(targetPacked, size, data, usagePacked);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY BufferStorageMemEXTContextANGLE(GLeglContext ctx,
>+                                                 GLenum target,
>+                                                 GLsizeiptr size,
>+                                                 GLuint memory,
>+                                                 GLuint64 offset)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLenum target = 0x%X, GLsizeiptr size = %llu, GLuint memory = %u, GLuint64 offset = "
>+        "%llu)",
>+        target, static_cast<unsigned long long>(size), memory,
>+        static_cast<unsigned long long>(offset));
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        TextureType targetPacked = FromGLenum<TextureType>(target);
>+        if (context->skipValidation() ||
>+            ValidateBufferStorageMemEXT(context, targetPacked, size, memory, offset))
>+        {
>+            context->bufferStorageMem(targetPacked, size, memory, offset);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY BufferSubDataContextANGLE(GLeglContext ctx,
>+                                           GLenum target,
>+                                           GLintptr offset,
>+                                           GLsizeiptr size,
>+                                           const void *data)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLenum target = 0x%X, GLintptr offset = %llu, GLsizeiptr size = %llu, const void *data = "
>+        "0x%016" PRIxPTR ")",
>+        target, static_cast<unsigned long long>(offset), static_cast<unsigned long long>(size),
>+        (uintptr_t)data);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        BufferBinding targetPacked = FromGLenum<BufferBinding>(target);
>+        if (context->skipValidation() ||
>+            ValidateBufferSubData(context, targetPacked, offset, size, data))
>+        {
>+            context->bufferSubData(targetPacked, offset, size, data);
>+        }
>+    }
>+}
>+
>+GLenum GL_APIENTRY CheckFramebufferStatusContextANGLE(GLeglContext ctx, GLenum target)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum target = 0x%X)", target);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateCheckFramebufferStatus(context, target))
>+        {
>+            return context->checkFramebufferStatus(target);
>+        }
>+    }
>+
>+    return GetDefaultReturnValue<EntryPoint::CheckFramebufferStatus, GLenum>();
>+}
>+
>+GLenum GL_APIENTRY CheckFramebufferStatusOESContextANGLE(GLeglContext ctx, GLenum target)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum target = 0x%X)", target);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateCheckFramebufferStatusOES(context, target))
>+        {
>+            return context->checkFramebufferStatus(target);
>+        }
>+    }
>+
>+    return GetDefaultReturnValue<EntryPoint::CheckFramebufferStatusOES, GLenum>();
>+}
>+
>+void GL_APIENTRY ClearContextANGLE(GLeglContext ctx, GLbitfield mask)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLbitfield mask = 0x%X)", mask);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateClear(context, mask))
>+        {
>+            context->clear(mask);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY ClearBufferfiContextANGLE(GLeglContext ctx,
>+                                           GLenum buffer,
>+                                           GLint drawbuffer,
>+                                           GLfloat depth,
>+                                           GLint stencil)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum buffer = 0x%X, GLint drawbuffer = %d, GLfloat depth = %f, GLint stencil = %d)",
>+          buffer, drawbuffer, depth, stencil);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() ||
>+            ValidateClearBufferfi(context, buffer, drawbuffer, depth, stencil))
>+        {
>+            context->clearBufferfi(buffer, drawbuffer, depth, stencil);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY ClearBufferfvContextANGLE(GLeglContext ctx,
>+                                           GLenum buffer,
>+                                           GLint drawbuffer,
>+                                           const GLfloat *value)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum buffer = 0x%X, GLint drawbuffer = %d, const GLfloat *value = 0x%016" PRIxPTR ")",
>+          buffer, drawbuffer, (uintptr_t)value);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateClearBufferfv(context, buffer, drawbuffer, value))
>+        {
>+            context->clearBufferfv(buffer, drawbuffer, value);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY ClearBufferivContextANGLE(GLeglContext ctx,
>+                                           GLenum buffer,
>+                                           GLint drawbuffer,
>+                                           const GLint *value)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum buffer = 0x%X, GLint drawbuffer = %d, const GLint *value = 0x%016" PRIxPTR ")",
>+          buffer, drawbuffer, (uintptr_t)value);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateClearBufferiv(context, buffer, drawbuffer, value))
>+        {
>+            context->clearBufferiv(buffer, drawbuffer, value);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY ClearBufferuivContextANGLE(GLeglContext ctx,
>+                                            GLenum buffer,
>+                                            GLint drawbuffer,
>+                                            const GLuint *value)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum buffer = 0x%X, GLint drawbuffer = %d, const GLuint *value = 0x%016" PRIxPTR ")",
>+          buffer, drawbuffer, (uintptr_t)value);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateClearBufferuiv(context, buffer, drawbuffer, value))
>+        {
>+            context->clearBufferuiv(buffer, drawbuffer, value);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY
>+ClearColorContextANGLE(GLeglContext ctx, GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLfloat red = %f, GLfloat green = %f, GLfloat blue = %f, GLfloat alpha = %f)", red,
>+          green, blue, alpha);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateClearColor(context, red, green, blue, alpha))
>+        {
>+            context->clearColor(red, green, blue, alpha);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY
>+ClearColorxContextANGLE(GLeglContext ctx, GLfixed red, GLfixed green, GLfixed blue, GLfixed alpha)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLfixed red = 0x%X, GLfixed green = 0x%X, GLfixed blue = 0x%X, GLfixed alpha = 0x%X)",
>+          red, green, blue, alpha);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateClearColorx(context, red, green, blue, alpha))
>+        {
>+            context->clearColorx(red, green, blue, alpha);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY ClearDepthfContextANGLE(GLeglContext ctx, GLfloat d)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLfloat d = %f)", d);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateClearDepthf(context, d))
>+        {
>+            context->clearDepthf(d);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY ClearDepthxContextANGLE(GLeglContext ctx, GLfixed depth)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLfixed depth = 0x%X)", depth);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateClearDepthx(context, depth))
>+        {
>+            context->clearDepthx(depth);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY ClearStencilContextANGLE(GLeglContext ctx, GLint s)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLint s = %d)", s);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateClearStencil(context, s))
>+        {
>+            context->clearStencil(s);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY ClientActiveTextureContextANGLE(GLeglContext ctx, GLenum texture)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum texture = 0x%X)", texture);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateClientActiveTexture(context, texture))
>+        {
>+            context->clientActiveTexture(texture);
>+        }
>+    }
>+}
>+
>+GLenum GL_APIENTRY ClientWaitSyncContextANGLE(GLeglContext ctx,
>+                                              GLsync sync,
>+                                              GLbitfield flags,
>+                                              GLuint64 timeout)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLsync sync = 0x%016" PRIxPTR ", GLbitfield flags = 0x%X, GLuint64 timeout = %llu)",
>+          (uintptr_t)sync, flags, static_cast<unsigned long long>(timeout));
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateClientWaitSync(context, sync, flags, timeout))
>+        {
>+            return context->clientWaitSync(sync, flags, timeout);
>+        }
>+    }
>+
>+    return GetDefaultReturnValue<EntryPoint::ClientWaitSync, GLenum>();
>+}
>+
>+void GL_APIENTRY ClipPlanefContextANGLE(GLeglContext ctx, GLenum p, const GLfloat *eqn)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum p = 0x%X, const GLfloat *eqn = 0x%016" PRIxPTR ")", p, (uintptr_t)eqn);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateClipPlanef(context, p, eqn))
>+        {
>+            context->clipPlanef(p, eqn);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY ClipPlanexContextANGLE(GLeglContext ctx, GLenum plane, const GLfixed *equation)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum plane = 0x%X, const GLfixed *equation = 0x%016" PRIxPTR ")", plane,
>+          (uintptr_t)equation);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateClipPlanex(context, plane, equation))
>+        {
>+            context->clipPlanex(plane, equation);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY
>+Color4fContextANGLE(GLeglContext ctx, GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLfloat red = %f, GLfloat green = %f, GLfloat blue = %f, GLfloat alpha = %f)", red,
>+          green, blue, alpha);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateColor4f(context, red, green, blue, alpha))
>+        {
>+            context->color4f(red, green, blue, alpha);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY
>+Color4ubContextANGLE(GLeglContext ctx, GLubyte red, GLubyte green, GLubyte blue, GLubyte alpha)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLubyte red = %d, GLubyte green = %d, GLubyte blue = %d, GLubyte alpha = %d)", red,
>+          green, blue, alpha);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateColor4ub(context, red, green, blue, alpha))
>+        {
>+            context->color4ub(red, green, blue, alpha);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY
>+Color4xContextANGLE(GLeglContext ctx, GLfixed red, GLfixed green, GLfixed blue, GLfixed alpha)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLfixed red = 0x%X, GLfixed green = 0x%X, GLfixed blue = 0x%X, GLfixed alpha = 0x%X)",
>+          red, green, blue, alpha);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateColor4x(context, red, green, blue, alpha))
>+        {
>+            context->color4x(red, green, blue, alpha);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY ColorMaskContextANGLE(GLeglContext ctx,
>+                                       GLboolean red,
>+                                       GLboolean green,
>+                                       GLboolean blue,
>+                                       GLboolean alpha)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLboolean red = %u, GLboolean green = %u, GLboolean blue = %u, GLboolean alpha = %u)",
>+          red, green, blue, alpha);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateColorMask(context, red, green, blue, alpha))
>+        {
>+            context->colorMask(red, green, blue, alpha);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY ColorPointerContextANGLE(GLeglContext ctx,
>+                                          GLint size,
>+                                          GLenum type,
>+                                          GLsizei stride,
>+                                          const void *pointer)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLint size = %d, GLenum type = 0x%X, GLsizei stride = %d, const void *pointer = "
>+        "0x%016" PRIxPTR ")",
>+        size, type, stride, (uintptr_t)pointer);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        VertexAttribType typePacked = FromGLenum<VertexAttribType>(type);
>+        if (context->skipValidation() ||
>+            ValidateColorPointer(context, size, typePacked, stride, pointer))
>+        {
>+            context->colorPointer(size, typePacked, stride, pointer);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY CompileShaderContextANGLE(GLeglContext ctx, GLuint shader)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint shader = %u)", shader);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateCompileShader(context, shader))
>+        {
>+            context->compileShader(shader);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY CompressedTexImage2DContextANGLE(GLeglContext ctx,
>+                                                  GLenum target,
>+                                                  GLint level,
>+                                                  GLenum internalformat,
>+                                                  GLsizei width,
>+                                                  GLsizei height,
>+                                                  GLint border,
>+                                                  GLsizei imageSize,
>+                                                  const void *data)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLenum target = 0x%X, GLint level = %d, GLenum internalformat = 0x%X, GLsizei width = "
>+        "%d, GLsizei height = %d, GLint border = %d, GLsizei imageSize = %d, const void *data = "
>+        "0x%016" PRIxPTR ")",
>+        target, level, internalformat, width, height, border, imageSize, (uintptr_t)data);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        TextureTarget targetPacked = FromGLenum<TextureTarget>(target);
>+        if (context->skipValidation() ||
>+            ValidateCompressedTexImage2D(context, targetPacked, level, internalformat, width,
>+                                         height, border, imageSize, data))
>+        {
>+            context->compressedTexImage2D(targetPacked, level, internalformat, width, height,
>+                                          border, imageSize, data);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY CompressedTexImage3DContextANGLE(GLeglContext ctx,
>+                                                  GLenum target,
>+                                                  GLint level,
>+                                                  GLenum internalformat,
>+                                                  GLsizei width,
>+                                                  GLsizei height,
>+                                                  GLsizei depth,
>+                                                  GLint border,
>+                                                  GLsizei imageSize,
>+                                                  const void *data)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLenum target = 0x%X, GLint level = %d, GLenum internalformat = 0x%X, GLsizei width = "
>+        "%d, GLsizei height = %d, GLsizei depth = %d, GLint border = %d, GLsizei imageSize = %d, "
>+        "const void *data = 0x%016" PRIxPTR ")",
>+        target, level, internalformat, width, height, depth, border, imageSize, (uintptr_t)data);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        TextureTarget targetPacked = FromGLenum<TextureTarget>(target);
>+        if (context->skipValidation() ||
>+            ValidateCompressedTexImage3D(context, targetPacked, level, internalformat, width,
>+                                         height, depth, border, imageSize, data))
>+        {
>+            context->compressedTexImage3D(targetPacked, level, internalformat, width, height, depth,
>+                                          border, imageSize, data);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY CompressedTexSubImage2DContextANGLE(GLeglContext ctx,
>+                                                     GLenum target,
>+                                                     GLint level,
>+                                                     GLint xoffset,
>+                                                     GLint yoffset,
>+                                                     GLsizei width,
>+                                                     GLsizei height,
>+                                                     GLenum format,
>+                                                     GLsizei imageSize,
>+                                                     const void *data)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLenum target = 0x%X, GLint level = %d, GLint xoffset = %d, GLint yoffset = %d, GLsizei "
>+        "width = %d, GLsizei height = %d, GLenum format = 0x%X, GLsizei imageSize = %d, const void "
>+        "*data = 0x%016" PRIxPTR ")",
>+        target, level, xoffset, yoffset, width, height, format, imageSize, (uintptr_t)data);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        TextureTarget targetPacked = FromGLenum<TextureTarget>(target);
>+        if (context->skipValidation() ||
>+            ValidateCompressedTexSubImage2D(context, targetPacked, level, xoffset, yoffset, width,
>+                                            height, format, imageSize, data))
>+        {
>+            context->compressedTexSubImage2D(targetPacked, level, xoffset, yoffset, width, height,
>+                                             format, imageSize, data);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY CompressedTexSubImage3DContextANGLE(GLeglContext ctx,
>+                                                     GLenum target,
>+                                                     GLint level,
>+                                                     GLint xoffset,
>+                                                     GLint yoffset,
>+                                                     GLint zoffset,
>+                                                     GLsizei width,
>+                                                     GLsizei height,
>+                                                     GLsizei depth,
>+                                                     GLenum format,
>+                                                     GLsizei imageSize,
>+                                                     const void *data)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLenum target = 0x%X, GLint level = %d, GLint xoffset = %d, GLint yoffset = %d, GLint "
>+        "zoffset = %d, GLsizei width = %d, GLsizei height = %d, GLsizei depth = %d, GLenum format "
>+        "= 0x%X, GLsizei imageSize = %d, const void *data = 0x%016" PRIxPTR ")",
>+        target, level, xoffset, yoffset, zoffset, width, height, depth, format, imageSize,
>+        (uintptr_t)data);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        TextureTarget targetPacked = FromGLenum<TextureTarget>(target);
>+        if (context->skipValidation() ||
>+            ValidateCompressedTexSubImage3D(context, targetPacked, level, xoffset, yoffset, zoffset,
>+                                            width, height, depth, format, imageSize, data))
>+        {
>+            context->compressedTexSubImage3D(targetPacked, level, xoffset, yoffset, zoffset, width,
>+                                             height, depth, format, imageSize, data);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY CopyBufferSubDataContextANGLE(GLeglContext ctx,
>+                                               GLenum readTarget,
>+                                               GLenum writeTarget,
>+                                               GLintptr readOffset,
>+                                               GLintptr writeOffset,
>+                                               GLsizeiptr size)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLenum readTarget = 0x%X, GLenum writeTarget = 0x%X, GLintptr readOffset = %llu, "
>+        "GLintptr writeOffset = %llu, GLsizeiptr size = %llu)",
>+        readTarget, writeTarget, static_cast<unsigned long long>(readOffset),
>+        static_cast<unsigned long long>(writeOffset), static_cast<unsigned long long>(size));
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        BufferBinding readTargetPacked  = FromGLenum<BufferBinding>(readTarget);
>+        BufferBinding writeTargetPacked = FromGLenum<BufferBinding>(writeTarget);
>+        if (context->skipValidation() ||
>+            ValidateCopyBufferSubData(context, readTargetPacked, writeTargetPacked, readOffset,
>+                                      writeOffset, size))
>+        {
>+            context->copyBufferSubData(readTargetPacked, writeTargetPacked, readOffset, writeOffset,
>+                                       size);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY CopyTexImage2DContextANGLE(GLeglContext ctx,
>+                                            GLenum target,
>+                                            GLint level,
>+                                            GLenum internalformat,
>+                                            GLint x,
>+                                            GLint y,
>+                                            GLsizei width,
>+                                            GLsizei height,
>+                                            GLint border)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLenum target = 0x%X, GLint level = %d, GLenum internalformat = 0x%X, GLint x = %d, "
>+        "GLint y = %d, GLsizei width = %d, GLsizei height = %d, GLint border = %d)",
>+        target, level, internalformat, x, y, width, height, border);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        TextureTarget targetPacked = FromGLenum<TextureTarget>(target);
>+        if (context->skipValidation() ||
>+            ValidateCopyTexImage2D(context, targetPacked, level, internalformat, x, y, width,
>+                                   height, border))
>+        {
>+            context->copyTexImage2D(targetPacked, level, internalformat, x, y, width, height,
>+                                    border);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY CopyTexSubImage2DContextANGLE(GLeglContext ctx,
>+                                               GLenum target,
>+                                               GLint level,
>+                                               GLint xoffset,
>+                                               GLint yoffset,
>+                                               GLint x,
>+                                               GLint y,
>+                                               GLsizei width,
>+                                               GLsizei height)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLenum target = 0x%X, GLint level = %d, GLint xoffset = %d, GLint yoffset = %d, GLint x "
>+        "= %d, GLint y = %d, GLsizei width = %d, GLsizei height = %d)",
>+        target, level, xoffset, yoffset, x, y, width, height);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        TextureTarget targetPacked = FromGLenum<TextureTarget>(target);
>+        if (context->skipValidation() ||
>+            ValidateCopyTexSubImage2D(context, targetPacked, level, xoffset, yoffset, x, y, width,
>+                                      height))
>+        {
>+            context->copyTexSubImage2D(targetPacked, level, xoffset, yoffset, x, y, width, height);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY CopyTexSubImage3DContextANGLE(GLeglContext ctx,
>+                                               GLenum target,
>+                                               GLint level,
>+                                               GLint xoffset,
>+                                               GLint yoffset,
>+                                               GLint zoffset,
>+                                               GLint x,
>+                                               GLint y,
>+                                               GLsizei width,
>+                                               GLsizei height)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLenum target = 0x%X, GLint level = %d, GLint xoffset = %d, GLint yoffset = %d, GLint "
>+        "zoffset = %d, GLint x = %d, GLint y = %d, GLsizei width = %d, GLsizei height = %d)",
>+        target, level, xoffset, yoffset, zoffset, x, y, width, height);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        TextureTarget targetPacked = FromGLenum<TextureTarget>(target);
>+        if (context->skipValidation() ||
>+            ValidateCopyTexSubImage3D(context, targetPacked, level, xoffset, yoffset, zoffset, x, y,
>+                                      width, height))
>+        {
>+            context->copyTexSubImage3D(targetPacked, level, xoffset, yoffset, zoffset, x, y, width,
>+                                       height);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY CreateMemoryObjectsEXTContextANGLE(GLeglContext ctx,
>+                                                    GLsizei n,
>+                                                    GLuint *memoryObjects)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLsizei n = %d, GLuint *memoryObjects = 0x%016" PRIxPTR ")", n,
>+          (uintptr_t)memoryObjects);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateCreateMemoryObjectsEXT(context, n, memoryObjects))
>+        {
>+            context->createMemoryObjects(n, memoryObjects);
>+        }
>+    }
>+}
>+
>+GLuint GL_APIENTRY CreateProgramContextANGLE(GLeglContext ctx)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("()");
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateCreateProgram(context))
>+        {
>+            return context->createProgram();
>+        }
>+    }
>+
>+    return GetDefaultReturnValue<EntryPoint::CreateProgram, GLuint>();
>+}
>+
>+GLuint GL_APIENTRY CreateShaderContextANGLE(GLeglContext ctx, GLenum type)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum type = 0x%X)", type);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        ShaderType typePacked = FromGLenum<ShaderType>(type);
>+        if (context->skipValidation() || ValidateCreateShader(context, typePacked))
>+        {
>+            return context->createShader(typePacked);
>+        }
>+    }
>+
>+    return GetDefaultReturnValue<EntryPoint::CreateShader, GLuint>();
>+}
>+
>+GLuint GL_APIENTRY CreateShaderProgramvContextANGLE(GLeglContext ctx,
>+                                                    GLenum type,
>+                                                    GLsizei count,
>+                                                    const GLchar *const *strings)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum type = 0x%X, GLsizei count = %d, const GLchar *const*strings = 0x%016" PRIxPTR
>+          ")",
>+          type, count, (uintptr_t)strings);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        ShaderType typePacked = FromGLenum<ShaderType>(type);
>+        if (context->skipValidation() ||
>+            ValidateCreateShaderProgramv(context, typePacked, count, strings))
>+        {
>+            return context->createShaderProgramv(typePacked, count, strings);
>+        }
>+    }
>+
>+    return GetDefaultReturnValue<EntryPoint::CreateShaderProgramv, GLuint>();
>+}
>+
>+void GL_APIENTRY CullFaceContextANGLE(GLeglContext ctx, GLenum mode)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum mode = 0x%X)", mode);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        CullFaceMode modePacked = FromGLenum<CullFaceMode>(mode);
>+        if (context->skipValidation() || ValidateCullFace(context, modePacked))
>+        {
>+            context->cullFace(modePacked);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY CurrentPaletteMatrixOESContextANGLE(GLeglContext ctx, GLuint matrixpaletteindex)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint matrixpaletteindex = %u)", matrixpaletteindex);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() ||
>+            ValidateCurrentPaletteMatrixOES(context, matrixpaletteindex))
>+        {
>+            context->currentPaletteMatrix(matrixpaletteindex);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY DebugMessageCallbackKHRContextANGLE(GLeglContext ctx,
>+                                                     GLDEBUGPROCKHR callback,
>+                                                     const void *userParam)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLDEBUGPROCKHR callback = 0x%016" PRIxPTR ", const void *userParam = 0x%016" PRIxPTR
>+          ")",
>+          (uintptr_t)callback, (uintptr_t)userParam);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() ||
>+            ValidateDebugMessageCallbackKHR(context, callback, userParam))
>+        {
>+            context->debugMessageCallback(callback, userParam);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY DebugMessageControlKHRContextANGLE(GLeglContext ctx,
>+                                                    GLenum source,
>+                                                    GLenum type,
>+                                                    GLenum severity,
>+                                                    GLsizei count,
>+                                                    const GLuint *ids,
>+                                                    GLboolean enabled)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLenum source = 0x%X, GLenum type = 0x%X, GLenum severity = 0x%X, GLsizei count = %d, "
>+        "const GLuint *ids = 0x%016" PRIxPTR ", GLboolean enabled = %u)",
>+        source, type, severity, count, (uintptr_t)ids, enabled);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() ||
>+            ValidateDebugMessageControlKHR(context, source, type, severity, count, ids, enabled))
>+        {
>+            context->debugMessageControl(source, type, severity, count, ids, enabled);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY DebugMessageInsertKHRContextANGLE(GLeglContext ctx,
>+                                                   GLenum source,
>+                                                   GLenum type,
>+                                                   GLuint id,
>+                                                   GLenum severity,
>+                                                   GLsizei length,
>+                                                   const GLchar *buf)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLenum source = 0x%X, GLenum type = 0x%X, GLuint id = %u, GLenum severity = 0x%X, "
>+        "GLsizei length = %d, const GLchar *buf = 0x%016" PRIxPTR ")",
>+        source, type, id, severity, length, (uintptr_t)buf);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() ||
>+            ValidateDebugMessageInsertKHR(context, source, type, id, severity, length, buf))
>+        {
>+            context->debugMessageInsert(source, type, id, severity, length, buf);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY DeleteBuffersContextANGLE(GLeglContext ctx, GLsizei n, const GLuint *buffers)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLsizei n = %d, const GLuint *buffers = 0x%016" PRIxPTR ")", n, (uintptr_t)buffers);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateDeleteBuffers(context, n, buffers))
>+        {
>+            context->deleteBuffers(n, buffers);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY DeleteFencesNVContextANGLE(GLeglContext ctx, GLsizei n, const GLuint *fences)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLsizei n = %d, const GLuint *fences = 0x%016" PRIxPTR ")", n, (uintptr_t)fences);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateDeleteFencesNV(context, n, fences))
>+        {
>+            context->deleteFencesNV(n, fences);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY DeleteFramebuffersContextANGLE(GLeglContext ctx,
>+                                                GLsizei n,
>+                                                const GLuint *framebuffers)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLsizei n = %d, const GLuint *framebuffers = 0x%016" PRIxPTR ")", n,
>+          (uintptr_t)framebuffers);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateDeleteFramebuffers(context, n, framebuffers))
>+        {
>+            context->deleteFramebuffers(n, framebuffers);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY DeleteFramebuffersOESContextANGLE(GLeglContext ctx,
>+                                                   GLsizei n,
>+                                                   const GLuint *framebuffers)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLsizei n = %d, const GLuint *framebuffers = 0x%016" PRIxPTR ")", n,
>+          (uintptr_t)framebuffers);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateDeleteFramebuffersOES(context, n, framebuffers))
>+        {
>+            context->deleteFramebuffers(n, framebuffers);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY DeleteMemoryObjectsEXTContextANGLE(GLeglContext ctx,
>+                                                    GLsizei n,
>+                                                    const GLuint *memoryObjects)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLsizei n = %d, const GLuint *memoryObjects = 0x%016" PRIxPTR ")", n,
>+          (uintptr_t)memoryObjects);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateDeleteMemoryObjectsEXT(context, n, memoryObjects))
>+        {
>+            context->deleteMemoryObjects(n, memoryObjects);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY DeleteProgramContextANGLE(GLeglContext ctx, GLuint program)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint program = %u)", program);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateDeleteProgram(context, program))
>+        {
>+            context->deleteProgram(program);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY DeleteProgramPipelinesContextANGLE(GLeglContext ctx,
>+                                                    GLsizei n,
>+                                                    const GLuint *pipelines)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLsizei n = %d, const GLuint *pipelines = 0x%016" PRIxPTR ")", n, (uintptr_t)pipelines);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateDeleteProgramPipelines(context, n, pipelines))
>+        {
>+            context->deleteProgramPipelines(n, pipelines);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY DeleteQueriesContextANGLE(GLeglContext ctx, GLsizei n, const GLuint *ids)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLsizei n = %d, const GLuint *ids = 0x%016" PRIxPTR ")", n, (uintptr_t)ids);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateDeleteQueries(context, n, ids))
>+        {
>+            context->deleteQueries(n, ids);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY DeleteQueriesEXTContextANGLE(GLeglContext ctx, GLsizei n, const GLuint *ids)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLsizei n = %d, const GLuint *ids = 0x%016" PRIxPTR ")", n, (uintptr_t)ids);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateDeleteQueriesEXT(context, n, ids))
>+        {
>+            context->deleteQueries(n, ids);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY DeleteRenderbuffersContextANGLE(GLeglContext ctx,
>+                                                 GLsizei n,
>+                                                 const GLuint *renderbuffers)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLsizei n = %d, const GLuint *renderbuffers = 0x%016" PRIxPTR ")", n,
>+          (uintptr_t)renderbuffers);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateDeleteRenderbuffers(context, n, renderbuffers))
>+        {
>+            context->deleteRenderbuffers(n, renderbuffers);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY DeleteRenderbuffersOESContextANGLE(GLeglContext ctx,
>+                                                    GLsizei n,
>+                                                    const GLuint *renderbuffers)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLsizei n = %d, const GLuint *renderbuffers = 0x%016" PRIxPTR ")", n,
>+          (uintptr_t)renderbuffers);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateDeleteRenderbuffersOES(context, n, renderbuffers))
>+        {
>+            context->deleteRenderbuffers(n, renderbuffers);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY DeleteSamplersContextANGLE(GLeglContext ctx, GLsizei count, const GLuint *samplers)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLsizei count = %d, const GLuint *samplers = 0x%016" PRIxPTR ")", count,
>+          (uintptr_t)samplers);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateDeleteSamplers(context, count, samplers))
>+        {
>+            context->deleteSamplers(count, samplers);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY DeleteSemaphoresEXTContextANGLE(GLeglContext ctx,
>+                                                 GLsizei n,
>+                                                 const GLuint *semaphores)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLsizei n = %d, const GLuint *semaphores = 0x%016" PRIxPTR ")", n,
>+          (uintptr_t)semaphores);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateDeleteSemaphoresEXT(context, n, semaphores))
>+        {
>+            context->deleteSemaphores(n, semaphores);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY DeleteShaderContextANGLE(GLeglContext ctx, GLuint shader)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint shader = %u)", shader);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateDeleteShader(context, shader))
>+        {
>+            context->deleteShader(shader);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY DeleteSyncContextANGLE(GLeglContext ctx, GLsync sync)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLsync sync = 0x%016" PRIxPTR ")", (uintptr_t)sync);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateDeleteSync(context, sync))
>+        {
>+            context->deleteSync(sync);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY DeleteTexturesContextANGLE(GLeglContext ctx, GLsizei n, const GLuint *textures)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLsizei n = %d, const GLuint *textures = 0x%016" PRIxPTR ")", n, (uintptr_t)textures);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateDeleteTextures(context, n, textures))
>+        {
>+            context->deleteTextures(n, textures);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY DeleteTransformFeedbacksContextANGLE(GLeglContext ctx,
>+                                                      GLsizei n,
>+                                                      const GLuint *ids)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLsizei n = %d, const GLuint *ids = 0x%016" PRIxPTR ")", n, (uintptr_t)ids);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateDeleteTransformFeedbacks(context, n, ids))
>+        {
>+            context->deleteTransformFeedbacks(n, ids);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY DeleteVertexArraysContextANGLE(GLeglContext ctx, GLsizei n, const GLuint *arrays)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLsizei n = %d, const GLuint *arrays = 0x%016" PRIxPTR ")", n, (uintptr_t)arrays);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateDeleteVertexArrays(context, n, arrays))
>+        {
>+            context->deleteVertexArrays(n, arrays);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY DeleteVertexArraysOESContextANGLE(GLeglContext ctx,
>+                                                   GLsizei n,
>+                                                   const GLuint *arrays)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLsizei n = %d, const GLuint *arrays = 0x%016" PRIxPTR ")", n, (uintptr_t)arrays);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateDeleteVertexArraysOES(context, n, arrays))
>+        {
>+            context->deleteVertexArrays(n, arrays);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY DepthFuncContextANGLE(GLeglContext ctx, GLenum func)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum func = 0x%X)", func);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateDepthFunc(context, func))
>+        {
>+            context->depthFunc(func);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY DepthMaskContextANGLE(GLeglContext ctx, GLboolean flag)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLboolean flag = %u)", flag);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateDepthMask(context, flag))
>+        {
>+            context->depthMask(flag);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY DepthRangefContextANGLE(GLeglContext ctx, GLfloat n, GLfloat f)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLfloat n = %f, GLfloat f = %f)", n, f);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateDepthRangef(context, n, f))
>+        {
>+            context->depthRangef(n, f);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY DepthRangexContextANGLE(GLeglContext ctx, GLfixed n, GLfixed f)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLfixed n = 0x%X, GLfixed f = 0x%X)", n, f);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateDepthRangex(context, n, f))
>+        {
>+            context->depthRangex(n, f);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY DetachShaderContextANGLE(GLeglContext ctx, GLuint program, GLuint shader)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint program = %u, GLuint shader = %u)", program, shader);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateDetachShader(context, program, shader))
>+        {
>+            context->detachShader(program, shader);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY DisableContextANGLE(GLeglContext ctx, GLenum cap)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum cap = 0x%X)", cap);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateDisable(context, cap))
>+        {
>+            context->disable(cap);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY DisableClientStateContextANGLE(GLeglContext ctx, GLenum array)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum array = 0x%X)", array);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        ClientVertexArrayType arrayPacked = FromGLenum<ClientVertexArrayType>(array);
>+        if (context->skipValidation() || ValidateDisableClientState(context, arrayPacked))
>+        {
>+            context->disableClientState(arrayPacked);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY DisableVertexAttribArrayContextANGLE(GLeglContext ctx, GLuint index)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint index = %u)", index);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateDisableVertexAttribArray(context, index))
>+        {
>+            context->disableVertexAttribArray(index);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY DiscardFramebufferEXTContextANGLE(GLeglContext ctx,
>+                                                   GLenum target,
>+                                                   GLsizei numAttachments,
>+                                                   const GLenum *attachments)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLenum target = 0x%X, GLsizei numAttachments = %d, const GLenum *attachments = "
>+        "0x%016" PRIxPTR ")",
>+        target, numAttachments, (uintptr_t)attachments);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() ||
>+            ValidateDiscardFramebufferEXT(context, target, numAttachments, attachments))
>+        {
>+            context->discardFramebuffer(target, numAttachments, attachments);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY DispatchComputeContextANGLE(GLeglContext ctx,
>+                                             GLuint num_groups_x,
>+                                             GLuint num_groups_y,
>+                                             GLuint num_groups_z)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint num_groups_x = %u, GLuint num_groups_y = %u, GLuint num_groups_z = %u)",
>+          num_groups_x, num_groups_y, num_groups_z);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() ||
>+            ValidateDispatchCompute(context, num_groups_x, num_groups_y, num_groups_z))
>+        {
>+            context->dispatchCompute(num_groups_x, num_groups_y, num_groups_z);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY DispatchComputeIndirectContextANGLE(GLeglContext ctx, GLintptr indirect)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLintptr indirect = %llu)", static_cast<unsigned long long>(indirect));
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateDispatchComputeIndirect(context, indirect))
>+        {
>+            context->dispatchComputeIndirect(indirect);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY DrawArraysContextANGLE(GLeglContext ctx, GLenum mode, GLint first, GLsizei count)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum mode = 0x%X, GLint first = %d, GLsizei count = %d)", mode, first, count);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        PrimitiveMode modePacked = FromGLenum<PrimitiveMode>(mode);
>+        if (context->skipValidation() || ValidateDrawArrays(context, modePacked, first, count))
>+        {
>+            context->drawArrays(modePacked, first, count);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY DrawArraysIndirectContextANGLE(GLeglContext ctx, GLenum mode, const void *indirect)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum mode = 0x%X, const void *indirect = 0x%016" PRIxPTR ")", mode,
>+          (uintptr_t)indirect);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        PrimitiveMode modePacked = FromGLenum<PrimitiveMode>(mode);
>+        if (context->skipValidation() || ValidateDrawArraysIndirect(context, modePacked, indirect))
>+        {
>+            context->drawArraysIndirect(modePacked, indirect);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY DrawArraysInstancedContextANGLE(GLeglContext ctx,
>+                                                 GLenum mode,
>+                                                 GLint first,
>+                                                 GLsizei count,
>+                                                 GLsizei instancecount)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum mode = 0x%X, GLint first = %d, GLsizei count = %d, GLsizei instancecount = %d)",
>+          mode, first, count, instancecount);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        PrimitiveMode modePacked = FromGLenum<PrimitiveMode>(mode);
>+        if (context->skipValidation() ||
>+            ValidateDrawArraysInstanced(context, modePacked, first, count, instancecount))
>+        {
>+            context->drawArraysInstanced(modePacked, first, count, instancecount);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY DrawArraysInstancedANGLEContextANGLE(GLeglContext ctx,
>+                                                      GLenum mode,
>+                                                      GLint first,
>+                                                      GLsizei count,
>+                                                      GLsizei primcount)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum mode = 0x%X, GLint first = %d, GLsizei count = %d, GLsizei primcount = %d)",
>+          mode, first, count, primcount);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        PrimitiveMode modePacked = FromGLenum<PrimitiveMode>(mode);
>+        if (context->skipValidation() ||
>+            ValidateDrawArraysInstancedANGLE(context, modePacked, first, count, primcount))
>+        {
>+            context->drawArraysInstanced(modePacked, first, count, primcount);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY DrawArraysInstancedEXTContextANGLE(GLeglContext ctx,
>+                                                    GLenum mode,
>+                                                    GLint start,
>+                                                    GLsizei count,
>+                                                    GLsizei primcount)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum mode = 0x%X, GLint start = %d, GLsizei count = %d, GLsizei primcount = %d)",
>+          mode, start, count, primcount);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        PrimitiveMode modePacked = FromGLenum<PrimitiveMode>(mode);
>+        if (context->skipValidation() ||
>+            ValidateDrawArraysInstancedEXT(context, modePacked, start, count, primcount))
>+        {
>+            context->drawArraysInstanced(modePacked, start, count, primcount);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY DrawBuffersContextANGLE(GLeglContext ctx, GLsizei n, const GLenum *bufs)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLsizei n = %d, const GLenum *bufs = 0x%016" PRIxPTR ")", n, (uintptr_t)bufs);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateDrawBuffers(context, n, bufs))
>+        {
>+            context->drawBuffers(n, bufs);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY DrawBuffersEXTContextANGLE(GLeglContext ctx, GLsizei n, const GLenum *bufs)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLsizei n = %d, const GLenum *bufs = 0x%016" PRIxPTR ")", n, (uintptr_t)bufs);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateDrawBuffersEXT(context, n, bufs))
>+        {
>+            context->drawBuffers(n, bufs);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY DrawElementsContextANGLE(GLeglContext ctx,
>+                                          GLenum mode,
>+                                          GLsizei count,
>+                                          GLenum type,
>+                                          const void *indices)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLenum mode = 0x%X, GLsizei count = %d, GLenum type = 0x%X, const void *indices = "
>+        "0x%016" PRIxPTR ")",
>+        mode, count, type, (uintptr_t)indices);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        PrimitiveMode modePacked    = FromGLenum<PrimitiveMode>(mode);
>+        DrawElementsType typePacked = FromGLenum<DrawElementsType>(type);
>+        if (context->skipValidation() ||
>+            ValidateDrawElements(context, modePacked, count, typePacked, indices))
>+        {
>+            context->drawElements(modePacked, count, typePacked, indices);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY DrawElementsIndirectContextANGLE(GLeglContext ctx,
>+                                                  GLenum mode,
>+                                                  GLenum type,
>+                                                  const void *indirect)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum mode = 0x%X, GLenum type = 0x%X, const void *indirect = 0x%016" PRIxPTR ")",
>+          mode, type, (uintptr_t)indirect);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        PrimitiveMode modePacked    = FromGLenum<PrimitiveMode>(mode);
>+        DrawElementsType typePacked = FromGLenum<DrawElementsType>(type);
>+        if (context->skipValidation() ||
>+            ValidateDrawElementsIndirect(context, modePacked, typePacked, indirect))
>+        {
>+            context->drawElementsIndirect(modePacked, typePacked, indirect);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY DrawElementsInstancedContextANGLE(GLeglContext ctx,
>+                                                   GLenum mode,
>+                                                   GLsizei count,
>+                                                   GLenum type,
>+                                                   const void *indices,
>+                                                   GLsizei instancecount)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLenum mode = 0x%X, GLsizei count = %d, GLenum type = 0x%X, const void *indices = "
>+        "0x%016" PRIxPTR ", GLsizei instancecount = %d)",
>+        mode, count, type, (uintptr_t)indices, instancecount);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        PrimitiveMode modePacked    = FromGLenum<PrimitiveMode>(mode);
>+        DrawElementsType typePacked = FromGLenum<DrawElementsType>(type);
>+        if (context->skipValidation() ||
>+            ValidateDrawElementsInstanced(context, modePacked, count, typePacked, indices,
>+                                          instancecount))
>+        {
>+            context->drawElementsInstanced(modePacked, count, typePacked, indices, instancecount);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY DrawElementsInstancedANGLEContextANGLE(GLeglContext ctx,
>+                                                        GLenum mode,
>+                                                        GLsizei count,
>+                                                        GLenum type,
>+                                                        const void *indices,
>+                                                        GLsizei primcount)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLenum mode = 0x%X, GLsizei count = %d, GLenum type = 0x%X, const void *indices = "
>+        "0x%016" PRIxPTR ", GLsizei primcount = %d)",
>+        mode, count, type, (uintptr_t)indices, primcount);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        PrimitiveMode modePacked    = FromGLenum<PrimitiveMode>(mode);
>+        DrawElementsType typePacked = FromGLenum<DrawElementsType>(type);
>+        if (context->skipValidation() ||
>+            ValidateDrawElementsInstancedANGLE(context, modePacked, count, typePacked, indices,
>+                                               primcount))
>+        {
>+            context->drawElementsInstanced(modePacked, count, typePacked, indices, primcount);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY DrawElementsInstancedEXTContextANGLE(GLeglContext ctx,
>+                                                      GLenum mode,
>+                                                      GLsizei count,
>+                                                      GLenum type,
>+                                                      const void *indices,
>+                                                      GLsizei primcount)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLenum mode = 0x%X, GLsizei count = %d, GLenum type = 0x%X, const void *indices = "
>+        "0x%016" PRIxPTR ", GLsizei primcount = %d)",
>+        mode, count, type, (uintptr_t)indices, primcount);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        PrimitiveMode modePacked    = FromGLenum<PrimitiveMode>(mode);
>+        DrawElementsType typePacked = FromGLenum<DrawElementsType>(type);
>+        if (context->skipValidation() ||
>+            ValidateDrawElementsInstancedEXT(context, modePacked, count, typePacked, indices,
>+                                             primcount))
>+        {
>+            context->drawElementsInstanced(modePacked, count, typePacked, indices, primcount);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY DrawRangeElementsContextANGLE(GLeglContext ctx,
>+                                               GLenum mode,
>+                                               GLuint start,
>+                                               GLuint end,
>+                                               GLsizei count,
>+                                               GLenum type,
>+                                               const void *indices)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLenum mode = 0x%X, GLuint start = %u, GLuint end = %u, GLsizei count = %d, GLenum type "
>+        "= 0x%X, const void *indices = 0x%016" PRIxPTR ")",
>+        mode, start, end, count, type, (uintptr_t)indices);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        PrimitiveMode modePacked    = FromGLenum<PrimitiveMode>(mode);
>+        DrawElementsType typePacked = FromGLenum<DrawElementsType>(type);
>+        if (context->skipValidation() ||
>+            ValidateDrawRangeElements(context, modePacked, start, end, count, typePacked, indices))
>+        {
>+            context->drawRangeElements(modePacked, start, end, count, typePacked, indices);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY DrawTexfOESContextANGLE(GLeglContext ctx,
>+                                         GLfloat x,
>+                                         GLfloat y,
>+                                         GLfloat z,
>+                                         GLfloat width,
>+                                         GLfloat height)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLfloat x = %f, GLfloat y = %f, GLfloat z = %f, GLfloat width = %f, GLfloat height = %f)",
>+        x, y, z, width, height);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateDrawTexfOES(context, x, y, z, width, height))
>+        {
>+            context->drawTexf(x, y, z, width, height);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY DrawTexfvOESContextANGLE(GLeglContext ctx, const GLfloat *coords)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(const GLfloat *coords = 0x%016" PRIxPTR ")", (uintptr_t)coords);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateDrawTexfvOES(context, coords))
>+        {
>+            context->drawTexfv(coords);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY
>+DrawTexiOESContextANGLE(GLeglContext ctx, GLint x, GLint y, GLint z, GLint width, GLint height)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLint x = %d, GLint y = %d, GLint z = %d, GLint width = %d, GLint height = %d)", x, y,
>+          z, width, height);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateDrawTexiOES(context, x, y, z, width, height))
>+        {
>+            context->drawTexi(x, y, z, width, height);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY DrawTexivOESContextANGLE(GLeglContext ctx, const GLint *coords)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(const GLint *coords = 0x%016" PRIxPTR ")", (uintptr_t)coords);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateDrawTexivOES(context, coords))
>+        {
>+            context->drawTexiv(coords);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY DrawTexsOESContextANGLE(GLeglContext ctx,
>+                                         GLshort x,
>+                                         GLshort y,
>+                                         GLshort z,
>+                                         GLshort width,
>+                                         GLshort height)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLshort x = %d, GLshort y = %d, GLshort z = %d, GLshort width = %d, GLshort height = %d)",
>+        x, y, z, width, height);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateDrawTexsOES(context, x, y, z, width, height))
>+        {
>+            context->drawTexs(x, y, z, width, height);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY DrawTexsvOESContextANGLE(GLeglContext ctx, const GLshort *coords)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(const GLshort *coords = 0x%016" PRIxPTR ")", (uintptr_t)coords);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateDrawTexsvOES(context, coords))
>+        {
>+            context->drawTexsv(coords);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY DrawTexxOESContextANGLE(GLeglContext ctx,
>+                                         GLfixed x,
>+                                         GLfixed y,
>+                                         GLfixed z,
>+                                         GLfixed width,
>+                                         GLfixed height)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLfixed x = 0x%X, GLfixed y = 0x%X, GLfixed z = 0x%X, GLfixed width = 0x%X, GLfixed "
>+        "height = 0x%X)",
>+        x, y, z, width, height);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateDrawTexxOES(context, x, y, z, width, height))
>+        {
>+            context->drawTexx(x, y, z, width, height);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY DrawTexxvOESContextANGLE(GLeglContext ctx, const GLfixed *coords)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(const GLfixed *coords = 0x%016" PRIxPTR ")", (uintptr_t)coords);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateDrawTexxvOES(context, coords))
>+        {
>+            context->drawTexxv(coords);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY EGLImageTargetRenderbufferStorageOESContextANGLE(GLeglContext ctx,
>+                                                                  GLenum target,
>+                                                                  GLeglImageOES image)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum target = 0x%X, GLeglImageOES image = 0x%016" PRIxPTR ")", target,
>+          (uintptr_t)image);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() ||
>+            ValidateEGLImageTargetRenderbufferStorageOES(context, target, image))
>+        {
>+            context->eGLImageTargetRenderbufferStorage(target, image);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY EGLImageTargetTexture2DOESContextANGLE(GLeglContext ctx,
>+                                                        GLenum target,
>+                                                        GLeglImageOES image)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum target = 0x%X, GLeglImageOES image = 0x%016" PRIxPTR ")", target,
>+          (uintptr_t)image);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        TextureType targetPacked = FromGLenum<TextureType>(target);
>+        if (context->skipValidation() ||
>+            ValidateEGLImageTargetTexture2DOES(context, targetPacked, image))
>+        {
>+            context->eGLImageTargetTexture2D(targetPacked, image);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY EnableContextANGLE(GLeglContext ctx, GLenum cap)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum cap = 0x%X)", cap);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateEnable(context, cap))
>+        {
>+            context->enable(cap);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY EnableClientStateContextANGLE(GLeglContext ctx, GLenum array)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum array = 0x%X)", array);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        ClientVertexArrayType arrayPacked = FromGLenum<ClientVertexArrayType>(array);
>+        if (context->skipValidation() || ValidateEnableClientState(context, arrayPacked))
>+        {
>+            context->enableClientState(arrayPacked);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY EnableVertexAttribArrayContextANGLE(GLeglContext ctx, GLuint index)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint index = %u)", index);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateEnableVertexAttribArray(context, index))
>+        {
>+            context->enableVertexAttribArray(index);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY EndQueryContextANGLE(GLeglContext ctx, GLenum target)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum target = 0x%X)", target);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        QueryType targetPacked = FromGLenum<QueryType>(target);
>+        if (context->skipValidation() || ValidateEndQuery(context, targetPacked))
>+        {
>+            context->endQuery(targetPacked);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY EndQueryEXTContextANGLE(GLeglContext ctx, GLenum target)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum target = 0x%X)", target);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        QueryType targetPacked = FromGLenum<QueryType>(target);
>+        if (context->skipValidation() || ValidateEndQueryEXT(context, targetPacked))
>+        {
>+            context->endQuery(targetPacked);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY EndTransformFeedbackContextANGLE(GLeglContext ctx)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("()");
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateEndTransformFeedback(context))
>+        {
>+            context->endTransformFeedback();
>+        }
>+    }
>+}
>+
>+GLsync GL_APIENTRY FenceSyncContextANGLE(GLeglContext ctx, GLenum condition, GLbitfield flags)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum condition = 0x%X, GLbitfield flags = 0x%X)", condition, flags);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateFenceSync(context, condition, flags))
>+        {
>+            return context->fenceSync(condition, flags);
>+        }
>+    }
>+
>+    return GetDefaultReturnValue<EntryPoint::FenceSync, GLsync>();
>+}
>+
>+void GL_APIENTRY FinishContextANGLE(GLeglContext ctx)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("()");
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateFinish(context))
>+        {
>+            context->finish();
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY FinishFenceNVContextANGLE(GLeglContext ctx, GLuint fence)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint fence = %u)", fence);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateFinishFenceNV(context, fence))
>+        {
>+            context->finishFenceNV(fence);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY FlushContextANGLE(GLeglContext ctx)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("()");
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateFlush(context))
>+        {
>+            context->flush();
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY FlushMappedBufferRangeContextANGLE(GLeglContext ctx,
>+                                                    GLenum target,
>+                                                    GLintptr offset,
>+                                                    GLsizeiptr length)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum target = 0x%X, GLintptr offset = %llu, GLsizeiptr length = %llu)", target,
>+          static_cast<unsigned long long>(offset), static_cast<unsigned long long>(length));
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        BufferBinding targetPacked = FromGLenum<BufferBinding>(target);
>+        if (context->skipValidation() ||
>+            ValidateFlushMappedBufferRange(context, targetPacked, offset, length))
>+        {
>+            context->flushMappedBufferRange(targetPacked, offset, length);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY FlushMappedBufferRangeEXTContextANGLE(GLeglContext ctx,
>+                                                       GLenum target,
>+                                                       GLintptr offset,
>+                                                       GLsizeiptr length)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum target = 0x%X, GLintptr offset = %llu, GLsizeiptr length = %llu)", target,
>+          static_cast<unsigned long long>(offset), static_cast<unsigned long long>(length));
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        BufferBinding targetPacked = FromGLenum<BufferBinding>(target);
>+        if (context->skipValidation() ||
>+            ValidateFlushMappedBufferRangeEXT(context, targetPacked, offset, length))
>+        {
>+            context->flushMappedBufferRange(targetPacked, offset, length);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY FogfContextANGLE(GLeglContext ctx, GLenum pname, GLfloat param)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum pname = 0x%X, GLfloat param = %f)", pname, param);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateFogf(context, pname, param))
>+        {
>+            context->fogf(pname, param);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY FogfvContextANGLE(GLeglContext ctx, GLenum pname, const GLfloat *params)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum pname = 0x%X, const GLfloat *params = 0x%016" PRIxPTR ")", pname,
>+          (uintptr_t)params);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateFogfv(context, pname, params))
>+        {
>+            context->fogfv(pname, params);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY FogxContextANGLE(GLeglContext ctx, GLenum pname, GLfixed param)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum pname = 0x%X, GLfixed param = 0x%X)", pname, param);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateFogx(context, pname, param))
>+        {
>+            context->fogx(pname, param);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY FogxvContextANGLE(GLeglContext ctx, GLenum pname, const GLfixed *param)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum pname = 0x%X, const GLfixed *param = 0x%016" PRIxPTR ")", pname,
>+          (uintptr_t)param);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateFogxv(context, pname, param))
>+        {
>+            context->fogxv(pname, param);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY FramebufferParameteriContextANGLE(GLeglContext ctx,
>+                                                   GLenum target,
>+                                                   GLenum pname,
>+                                                   GLint param)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum target = 0x%X, GLenum pname = 0x%X, GLint param = %d)", target, pname, param);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() ||
>+            ValidateFramebufferParameteri(context, target, pname, param))
>+        {
>+            context->framebufferParameteri(target, pname, param);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY FramebufferRenderbufferContextANGLE(GLeglContext ctx,
>+                                                     GLenum target,
>+                                                     GLenum attachment,
>+                                                     GLenum renderbuffertarget,
>+                                                     GLuint renderbuffer)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLenum target = 0x%X, GLenum attachment = 0x%X, GLenum renderbuffertarget = 0x%X, GLuint "
>+        "renderbuffer = %u)",
>+        target, attachment, renderbuffertarget, renderbuffer);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() ||
>+            ValidateFramebufferRenderbuffer(context, target, attachment, renderbuffertarget,
>+                                            renderbuffer))
>+        {
>+            context->framebufferRenderbuffer(target, attachment, renderbuffertarget, renderbuffer);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY FramebufferRenderbufferOESContextANGLE(GLeglContext ctx,
>+                                                        GLenum target,
>+                                                        GLenum attachment,
>+                                                        GLenum renderbuffertarget,
>+                                                        GLuint renderbuffer)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLenum target = 0x%X, GLenum attachment = 0x%X, GLenum renderbuffertarget = 0x%X, GLuint "
>+        "renderbuffer = %u)",
>+        target, attachment, renderbuffertarget, renderbuffer);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() ||
>+            ValidateFramebufferRenderbufferOES(context, target, attachment, renderbuffertarget,
>+                                               renderbuffer))
>+        {
>+            context->framebufferRenderbuffer(target, attachment, renderbuffertarget, renderbuffer);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY FramebufferTexture2DContextANGLE(GLeglContext ctx,
>+                                                  GLenum target,
>+                                                  GLenum attachment,
>+                                                  GLenum textarget,
>+                                                  GLuint texture,
>+                                                  GLint level)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLenum target = 0x%X, GLenum attachment = 0x%X, GLenum textarget = 0x%X, GLuint texture "
>+        "= %u, GLint level = %d)",
>+        target, attachment, textarget, texture, level);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        TextureTarget textargetPacked = FromGLenum<TextureTarget>(textarget);
>+        if (context->skipValidation() ||
>+            ValidateFramebufferTexture2D(context, target, attachment, textargetPacked, texture,
>+                                         level))
>+        {
>+            context->framebufferTexture2D(target, attachment, textargetPacked, texture, level);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY FramebufferTexture2DOESContextANGLE(GLeglContext ctx,
>+                                                     GLenum target,
>+                                                     GLenum attachment,
>+                                                     GLenum textarget,
>+                                                     GLuint texture,
>+                                                     GLint level)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLenum target = 0x%X, GLenum attachment = 0x%X, GLenum textarget = 0x%X, GLuint texture "
>+        "= %u, GLint level = %d)",
>+        target, attachment, textarget, texture, level);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        TextureTarget textargetPacked = FromGLenum<TextureTarget>(textarget);
>+        if (context->skipValidation() ||
>+            ValidateFramebufferTexture2DOES(context, target, attachment, textargetPacked, texture,
>+                                            level))
>+        {
>+            context->framebufferTexture2D(target, attachment, textargetPacked, texture, level);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY FramebufferTextureEXTContextANGLE(GLeglContext ctx,
>+                                                   GLenum target,
>+                                                   GLenum attachment,
>+                                                   GLuint texture,
>+                                                   GLint level)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum target = 0x%X, GLenum attachment = 0x%X, GLuint texture = %u, GLint level = %d)",
>+          target, attachment, texture, level);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() ||
>+            ValidateFramebufferTextureEXT(context, target, attachment, texture, level))
>+        {
>+            context->framebufferTexture(target, attachment, texture, level);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY FramebufferTextureLayerContextANGLE(GLeglContext ctx,
>+                                                     GLenum target,
>+                                                     GLenum attachment,
>+                                                     GLuint texture,
>+                                                     GLint level,
>+                                                     GLint layer)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLenum target = 0x%X, GLenum attachment = 0x%X, GLuint texture = %u, GLint level = %d, "
>+        "GLint layer = %d)",
>+        target, attachment, texture, level, layer);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() ||
>+            ValidateFramebufferTextureLayer(context, target, attachment, texture, level, layer))
>+        {
>+            context->framebufferTextureLayer(target, attachment, texture, level, layer);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY FramebufferTextureMultiviewOVRContextANGLE(GLeglContext ctx,
>+                                                            GLenum target,
>+                                                            GLenum attachment,
>+                                                            GLuint texture,
>+                                                            GLint level,
>+                                                            GLint baseViewIndex,
>+                                                            GLsizei numViews)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLenum target = 0x%X, GLenum attachment = 0x%X, GLuint texture = %u, GLint level = %d, "
>+        "GLint baseViewIndex = %d, GLsizei numViews = %d)",
>+        target, attachment, texture, level, baseViewIndex, numViews);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() ||
>+            ValidateFramebufferTextureMultiviewOVR(context, target, attachment, texture, level,
>+                                                   baseViewIndex, numViews))
>+        {
>+            context->framebufferTextureMultiview(target, attachment, texture, level, baseViewIndex,
>+                                                 numViews);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY FrontFaceContextANGLE(GLeglContext ctx, GLenum mode)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum mode = 0x%X)", mode);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateFrontFace(context, mode))
>+        {
>+            context->frontFace(mode);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY FrustumfContextANGLE(GLeglContext ctx,
>+                                      GLfloat l,
>+                                      GLfloat r,
>+                                      GLfloat b,
>+                                      GLfloat t,
>+                                      GLfloat n,
>+                                      GLfloat f)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLfloat l = %f, GLfloat r = %f, GLfloat b = %f, GLfloat t = %f, GLfloat n = %f, GLfloat "
>+        "f = %f)",
>+        l, r, b, t, n, f);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateFrustumf(context, l, r, b, t, n, f))
>+        {
>+            context->frustumf(l, r, b, t, n, f);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY FrustumxContextANGLE(GLeglContext ctx,
>+                                      GLfixed l,
>+                                      GLfixed r,
>+                                      GLfixed b,
>+                                      GLfixed t,
>+                                      GLfixed n,
>+                                      GLfixed f)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLfixed l = 0x%X, GLfixed r = 0x%X, GLfixed b = 0x%X, GLfixed t = 0x%X, GLfixed n = "
>+        "0x%X, GLfixed f = 0x%X)",
>+        l, r, b, t, n, f);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateFrustumx(context, l, r, b, t, n, f))
>+        {
>+            context->frustumx(l, r, b, t, n, f);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY GenBuffersContextANGLE(GLeglContext ctx, GLsizei n, GLuint *buffers)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLsizei n = %d, GLuint *buffers = 0x%016" PRIxPTR ")", n, (uintptr_t)buffers);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateGenBuffers(context, n, buffers))
>+        {
>+            context->genBuffers(n, buffers);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY GenFencesNVContextANGLE(GLeglContext ctx, GLsizei n, GLuint *fences)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLsizei n = %d, GLuint *fences = 0x%016" PRIxPTR ")", n, (uintptr_t)fences);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateGenFencesNV(context, n, fences))
>+        {
>+            context->genFencesNV(n, fences);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY GenFramebuffersContextANGLE(GLeglContext ctx, GLsizei n, GLuint *framebuffers)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLsizei n = %d, GLuint *framebuffers = 0x%016" PRIxPTR ")", n, (uintptr_t)framebuffers);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateGenFramebuffers(context, n, framebuffers))
>+        {
>+            context->genFramebuffers(n, framebuffers);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY GenFramebuffersOESContextANGLE(GLeglContext ctx, GLsizei n, GLuint *framebuffers)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLsizei n = %d, GLuint *framebuffers = 0x%016" PRIxPTR ")", n, (uintptr_t)framebuffers);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateGenFramebuffersOES(context, n, framebuffers))
>+        {
>+            context->genFramebuffers(n, framebuffers);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY GenProgramPipelinesContextANGLE(GLeglContext ctx, GLsizei n, GLuint *pipelines)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLsizei n = %d, GLuint *pipelines = 0x%016" PRIxPTR ")", n, (uintptr_t)pipelines);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateGenProgramPipelines(context, n, pipelines))
>+        {
>+            context->genProgramPipelines(n, pipelines);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY GenQueriesContextANGLE(GLeglContext ctx, GLsizei n, GLuint *ids)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLsizei n = %d, GLuint *ids = 0x%016" PRIxPTR ")", n, (uintptr_t)ids);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateGenQueries(context, n, ids))
>+        {
>+            context->genQueries(n, ids);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY GenQueriesEXTContextANGLE(GLeglContext ctx, GLsizei n, GLuint *ids)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLsizei n = %d, GLuint *ids = 0x%016" PRIxPTR ")", n, (uintptr_t)ids);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateGenQueriesEXT(context, n, ids))
>+        {
>+            context->genQueries(n, ids);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY GenRenderbuffersContextANGLE(GLeglContext ctx, GLsizei n, GLuint *renderbuffers)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLsizei n = %d, GLuint *renderbuffers = 0x%016" PRIxPTR ")", n,
>+          (uintptr_t)renderbuffers);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateGenRenderbuffers(context, n, renderbuffers))
>+        {
>+            context->genRenderbuffers(n, renderbuffers);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY GenRenderbuffersOESContextANGLE(GLeglContext ctx, GLsizei n, GLuint *renderbuffers)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLsizei n = %d, GLuint *renderbuffers = 0x%016" PRIxPTR ")", n,
>+          (uintptr_t)renderbuffers);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateGenRenderbuffersOES(context, n, renderbuffers))
>+        {
>+            context->genRenderbuffers(n, renderbuffers);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY GenSamplersContextANGLE(GLeglContext ctx, GLsizei count, GLuint *samplers)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLsizei count = %d, GLuint *samplers = 0x%016" PRIxPTR ")", count, (uintptr_t)samplers);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateGenSamplers(context, count, samplers))
>+        {
>+            context->genSamplers(count, samplers);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY GenSemaphoresEXTContextANGLE(GLeglContext ctx, GLsizei n, GLuint *semaphores)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLsizei n = %d, GLuint *semaphores = 0x%016" PRIxPTR ")", n, (uintptr_t)semaphores);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateGenSemaphoresEXT(context, n, semaphores))
>+        {
>+            context->genSemaphores(n, semaphores);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY GenTexturesContextANGLE(GLeglContext ctx, GLsizei n, GLuint *textures)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLsizei n = %d, GLuint *textures = 0x%016" PRIxPTR ")", n, (uintptr_t)textures);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateGenTextures(context, n, textures))
>+        {
>+            context->genTextures(n, textures);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY GenTransformFeedbacksContextANGLE(GLeglContext ctx, GLsizei n, GLuint *ids)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLsizei n = %d, GLuint *ids = 0x%016" PRIxPTR ")", n, (uintptr_t)ids);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateGenTransformFeedbacks(context, n, ids))
>+        {
>+            context->genTransformFeedbacks(n, ids);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY GenVertexArraysContextANGLE(GLeglContext ctx, GLsizei n, GLuint *arrays)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLsizei n = %d, GLuint *arrays = 0x%016" PRIxPTR ")", n, (uintptr_t)arrays);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateGenVertexArrays(context, n, arrays))
>+        {
>+            context->genVertexArrays(n, arrays);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY GenVertexArraysOESContextANGLE(GLeglContext ctx, GLsizei n, GLuint *arrays)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLsizei n = %d, GLuint *arrays = 0x%016" PRIxPTR ")", n, (uintptr_t)arrays);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateGenVertexArraysOES(context, n, arrays))
>+        {
>+            context->genVertexArrays(n, arrays);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY GenerateMipmapContextANGLE(GLeglContext ctx, GLenum target)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum target = 0x%X)", target);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        TextureType targetPacked = FromGLenum<TextureType>(target);
>+        if (context->skipValidation() || ValidateGenerateMipmap(context, targetPacked))
>+        {
>+            context->generateMipmap(targetPacked);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY GenerateMipmapOESContextANGLE(GLeglContext ctx, GLenum target)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum target = 0x%X)", target);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        TextureType targetPacked = FromGLenum<TextureType>(target);
>+        if (context->skipValidation() || ValidateGenerateMipmapOES(context, targetPacked))
>+        {
>+            context->generateMipmap(targetPacked);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY GetActiveAttribContextANGLE(GLeglContext ctx,
>+                                             GLuint program,
>+                                             GLuint index,
>+                                             GLsizei bufSize,
>+                                             GLsizei *length,
>+                                             GLint *size,
>+                                             GLenum *type,
>+                                             GLchar *name)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLuint program = %u, GLuint index = %u, GLsizei bufSize = %d, GLsizei *length = "
>+        "0x%016" PRIxPTR ", GLint *size = 0x%016" PRIxPTR ", GLenum *type = 0x%016" PRIxPTR
>+        ", GLchar *name = 0x%016" PRIxPTR ")",
>+        program, index, bufSize, (uintptr_t)length, (uintptr_t)size, (uintptr_t)type,
>+        (uintptr_t)name);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() ||
>+            ValidateGetActiveAttrib(context, program, index, bufSize, length, size, type, name))
>+        {
>+            context->getActiveAttrib(program, index, bufSize, length, size, type, name);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY GetActiveUniformContextANGLE(GLeglContext ctx,
>+                                              GLuint program,
>+                                              GLuint index,
>+                                              GLsizei bufSize,
>+                                              GLsizei *length,
>+                                              GLint *size,
>+                                              GLenum *type,
>+                                              GLchar *name)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLuint program = %u, GLuint index = %u, GLsizei bufSize = %d, GLsizei *length = "
>+        "0x%016" PRIxPTR ", GLint *size = 0x%016" PRIxPTR ", GLenum *type = 0x%016" PRIxPTR
>+        ", GLchar *name = 0x%016" PRIxPTR ")",
>+        program, index, bufSize, (uintptr_t)length, (uintptr_t)size, (uintptr_t)type,
>+        (uintptr_t)name);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() ||
>+            ValidateGetActiveUniform(context, program, index, bufSize, length, size, type, name))
>+        {
>+            context->getActiveUniform(program, index, bufSize, length, size, type, name);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY GetActiveUniformBlockNameContextANGLE(GLeglContext ctx,
>+                                                       GLuint program,
>+                                                       GLuint uniformBlockIndex,
>+                                                       GLsizei bufSize,
>+                                                       GLsizei *length,
>+                                                       GLchar *uniformBlockName)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLuint program = %u, GLuint uniformBlockIndex = %u, GLsizei bufSize = %d, GLsizei "
>+        "*length = 0x%016" PRIxPTR ", GLchar *uniformBlockName = 0x%016" PRIxPTR ")",
>+        program, uniformBlockIndex, bufSize, (uintptr_t)length, (uintptr_t)uniformBlockName);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() ||
>+            ValidateGetActiveUniformBlockName(context, program, uniformBlockIndex, bufSize, length,
>+                                              uniformBlockName))
>+        {
>+            context->getActiveUniformBlockName(program, uniformBlockIndex, bufSize, length,
>+                                               uniformBlockName);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY GetActiveUniformBlockivContextANGLE(GLeglContext ctx,
>+                                                     GLuint program,
>+                                                     GLuint uniformBlockIndex,
>+                                                     GLenum pname,
>+                                                     GLint *params)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLuint program = %u, GLuint uniformBlockIndex = %u, GLenum pname = 0x%X, GLint *params = "
>+        "0x%016" PRIxPTR ")",
>+        program, uniformBlockIndex, pname, (uintptr_t)params);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() ||
>+            ValidateGetActiveUniformBlockiv(context, program, uniformBlockIndex, pname, params))
>+        {
>+            context->getActiveUniformBlockiv(program, uniformBlockIndex, pname, params);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY GetActiveUniformsivContextANGLE(GLeglContext ctx,
>+                                                 GLuint program,
>+                                                 GLsizei uniformCount,
>+                                                 const GLuint *uniformIndices,
>+                                                 GLenum pname,
>+                                                 GLint *params)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLuint program = %u, GLsizei uniformCount = %d, const GLuint *uniformIndices = "
>+        "0x%016" PRIxPTR ", GLenum pname = 0x%X, GLint *params = 0x%016" PRIxPTR ")",
>+        program, uniformCount, (uintptr_t)uniformIndices, pname, (uintptr_t)params);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateGetActiveUniformsiv(context, program, uniformCount,
>+                                                                     uniformIndices, pname, params))
>+        {
>+            context->getActiveUniformsiv(program, uniformCount, uniformIndices, pname, params);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY GetAttachedShadersContextANGLE(GLeglContext ctx,
>+                                                GLuint program,
>+                                                GLsizei maxCount,
>+                                                GLsizei *count,
>+                                                GLuint *shaders)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint program = %u, GLsizei maxCount = %d, GLsizei *count = 0x%016" PRIxPTR
>+          ", GLuint *shaders = 0x%016" PRIxPTR ")",
>+          program, maxCount, (uintptr_t)count, (uintptr_t)shaders);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() ||
>+            ValidateGetAttachedShaders(context, program, maxCount, count, shaders))
>+        {
>+            context->getAttachedShaders(program, maxCount, count, shaders);
>+        }
>+    }
>+}
>+
>+GLint GL_APIENTRY GetAttribLocationContextANGLE(GLeglContext ctx,
>+                                                GLuint program,
>+                                                const GLchar *name)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint program = %u, const GLchar *name = 0x%016" PRIxPTR ")", program,
>+          (uintptr_t)name);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateGetAttribLocation(context, program, name))
>+        {
>+            return context->getAttribLocation(program, name);
>+        }
>+    }
>+
>+    return GetDefaultReturnValue<EntryPoint::GetAttribLocation, GLint>();
>+}
>+
>+void GL_APIENTRY GetBooleani_vContextANGLE(GLeglContext ctx,
>+                                           GLenum target,
>+                                           GLuint index,
>+                                           GLboolean *data)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum target = 0x%X, GLuint index = %u, GLboolean *data = 0x%016" PRIxPTR ")", target,
>+          index, (uintptr_t)data);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateGetBooleani_v(context, target, index, data))
>+        {
>+            context->getBooleani_v(target, index, data);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY GetBooleanvContextANGLE(GLeglContext ctx, GLenum pname, GLboolean *data)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum pname = 0x%X, GLboolean *data = 0x%016" PRIxPTR ")", pname, (uintptr_t)data);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateGetBooleanv(context, pname, data))
>+        {
>+            context->getBooleanv(pname, data);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY GetBufferParameteri64vContextANGLE(GLeglContext ctx,
>+                                                    GLenum target,
>+                                                    GLenum pname,
>+                                                    GLint64 *params)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum target = 0x%X, GLenum pname = 0x%X, GLint64 *params = 0x%016" PRIxPTR ")",
>+          target, pname, (uintptr_t)params);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        BufferBinding targetPacked = FromGLenum<BufferBinding>(target);
>+        if (context->skipValidation() ||
>+            ValidateGetBufferParameteri64v(context, targetPacked, pname, params))
>+        {
>+            context->getBufferParameteri64v(targetPacked, pname, params);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY GetBufferParameterivContextANGLE(GLeglContext ctx,
>+                                                  GLenum target,
>+                                                  GLenum pname,
>+                                                  GLint *params)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum target = 0x%X, GLenum pname = 0x%X, GLint *params = 0x%016" PRIxPTR ")", target,
>+          pname, (uintptr_t)params);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        BufferBinding targetPacked = FromGLenum<BufferBinding>(target);
>+        if (context->skipValidation() ||
>+            ValidateGetBufferParameteriv(context, targetPacked, pname, params))
>+        {
>+            context->getBufferParameteriv(targetPacked, pname, params);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY GetBufferPointervContextANGLE(GLeglContext ctx,
>+                                               GLenum target,
>+                                               GLenum pname,
>+                                               void **params)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum target = 0x%X, GLenum pname = 0x%X, void **params = 0x%016" PRIxPTR ")", target,
>+          pname, (uintptr_t)params);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        BufferBinding targetPacked = FromGLenum<BufferBinding>(target);
>+        if (context->skipValidation() ||
>+            ValidateGetBufferPointerv(context, targetPacked, pname, params))
>+        {
>+            context->getBufferPointerv(targetPacked, pname, params);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY GetBufferPointervOESContextANGLE(GLeglContext ctx,
>+                                                  GLenum target,
>+                                                  GLenum pname,
>+                                                  void **params)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum target = 0x%X, GLenum pname = 0x%X, void **params = 0x%016" PRIxPTR ")", target,
>+          pname, (uintptr_t)params);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        BufferBinding targetPacked = FromGLenum<BufferBinding>(target);
>+        if (context->skipValidation() ||
>+            ValidateGetBufferPointervOES(context, targetPacked, pname, params))
>+        {
>+            context->getBufferPointerv(targetPacked, pname, params);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY GetClipPlanefContextANGLE(GLeglContext ctx, GLenum plane, GLfloat *equation)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum plane = 0x%X, GLfloat *equation = 0x%016" PRIxPTR ")", plane,
>+          (uintptr_t)equation);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateGetClipPlanef(context, plane, equation))
>+        {
>+            context->getClipPlanef(plane, equation);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY GetClipPlanexContextANGLE(GLeglContext ctx, GLenum plane, GLfixed *equation)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum plane = 0x%X, GLfixed *equation = 0x%016" PRIxPTR ")", plane,
>+          (uintptr_t)equation);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateGetClipPlanex(context, plane, equation))
>+        {
>+            context->getClipPlanex(plane, equation);
>+        }
>+    }
>+}
>+
>+GLuint GL_APIENTRY GetDebugMessageLogKHRContextANGLE(GLeglContext ctx,
>+                                                     GLuint count,
>+                                                     GLsizei bufSize,
>+                                                     GLenum *sources,
>+                                                     GLenum *types,
>+                                                     GLuint *ids,
>+                                                     GLenum *severities,
>+                                                     GLsizei *lengths,
>+                                                     GLchar *messageLog)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint count = %u, GLsizei bufSize = %d, GLenum *sources = 0x%016" PRIxPTR
>+          ", GLenum *types = 0x%016" PRIxPTR ", GLuint *ids = 0x%016" PRIxPTR
>+          ", GLenum *severities = 0x%016" PRIxPTR ", GLsizei *lengths = 0x%016" PRIxPTR
>+          ", GLchar *messageLog = 0x%016" PRIxPTR ")",
>+          count, bufSize, (uintptr_t)sources, (uintptr_t)types, (uintptr_t)ids,
>+          (uintptr_t)severities, (uintptr_t)lengths, (uintptr_t)messageLog);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() ||
>+            ValidateGetDebugMessageLogKHR(context, count, bufSize, sources, types, ids, severities,
>+                                          lengths, messageLog))
>+        {
>+            return context->getDebugMessageLog(count, bufSize, sources, types, ids, severities,
>+                                               lengths, messageLog);
>+        }
>+    }
>+
>+    return GetDefaultReturnValue<EntryPoint::GetDebugMessageLogKHR, GLuint>();
>+}
>+
>+GLenum GL_APIENTRY GetErrorContextANGLE(GLeglContext ctx)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("()");
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateGetError(context))
>+        {
>+            return context->getError();
>+        }
>+    }
>+
>+    return GetDefaultReturnValue<EntryPoint::GetError, GLenum>();
>+}
>+
>+void GL_APIENTRY GetFenceivNVContextANGLE(GLeglContext ctx,
>+                                          GLuint fence,
>+                                          GLenum pname,
>+                                          GLint *params)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint fence = %u, GLenum pname = 0x%X, GLint *params = 0x%016" PRIxPTR ")", fence,
>+          pname, (uintptr_t)params);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateGetFenceivNV(context, fence, pname, params))
>+        {
>+            context->getFenceivNV(fence, pname, params);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY GetFixedvContextANGLE(GLeglContext ctx, GLenum pname, GLfixed *params)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum pname = 0x%X, GLfixed *params = 0x%016" PRIxPTR ")", pname, (uintptr_t)params);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateGetFixedv(context, pname, params))
>+        {
>+            context->getFixedv(pname, params);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY GetFloatvContextANGLE(GLeglContext ctx, GLenum pname, GLfloat *data)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum pname = 0x%X, GLfloat *data = 0x%016" PRIxPTR ")", pname, (uintptr_t)data);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateGetFloatv(context, pname, data))
>+        {
>+            context->getFloatv(pname, data);
>+        }
>+    }
>+}
>+
>+GLint GL_APIENTRY GetFragDataIndexEXTContextANGLE(GLeglContext ctx,
>+                                                  GLuint program,
>+                                                  const GLchar *name)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint program = %u, const GLchar *name = 0x%016" PRIxPTR ")", program,
>+          (uintptr_t)name);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateGetFragDataIndexEXT(context, program, name))
>+        {
>+            return context->getFragDataIndex(program, name);
>+        }
>+    }
>+
>+    return GetDefaultReturnValue<EntryPoint::GetFragDataIndexEXT, GLint>();
>+}
>+
>+GLint GL_APIENTRY GetFragDataLocationContextANGLE(GLeglContext ctx,
>+                                                  GLuint program,
>+                                                  const GLchar *name)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint program = %u, const GLchar *name = 0x%016" PRIxPTR ")", program,
>+          (uintptr_t)name);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateGetFragDataLocation(context, program, name))
>+        {
>+            return context->getFragDataLocation(program, name);
>+        }
>+    }
>+
>+    return GetDefaultReturnValue<EntryPoint::GetFragDataLocation, GLint>();
>+}
>+
>+void GL_APIENTRY GetFramebufferAttachmentParameterivContextANGLE(GLeglContext ctx,
>+                                                                 GLenum target,
>+                                                                 GLenum attachment,
>+                                                                 GLenum pname,
>+                                                                 GLint *params)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLenum target = 0x%X, GLenum attachment = 0x%X, GLenum pname = 0x%X, GLint *params = "
>+        "0x%016" PRIxPTR ")",
>+        target, attachment, pname, (uintptr_t)params);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() ||
>+            ValidateGetFramebufferAttachmentParameteriv(context, target, attachment, pname, params))
>+        {
>+            context->getFramebufferAttachmentParameteriv(target, attachment, pname, params);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY GetFramebufferAttachmentParameterivOESContextANGLE(GLeglContext ctx,
>+                                                                    GLenum target,
>+                                                                    GLenum attachment,
>+                                                                    GLenum pname,
>+                                                                    GLint *params)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLenum target = 0x%X, GLenum attachment = 0x%X, GLenum pname = 0x%X, GLint *params = "
>+        "0x%016" PRIxPTR ")",
>+        target, attachment, pname, (uintptr_t)params);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateGetFramebufferAttachmentParameterivOES(
>+                                             context, target, attachment, pname, params))
>+        {
>+            context->getFramebufferAttachmentParameteriv(target, attachment, pname, params);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY GetFramebufferParameterivContextANGLE(GLeglContext ctx,
>+                                                       GLenum target,
>+                                                       GLenum pname,
>+                                                       GLint *params)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum target = 0x%X, GLenum pname = 0x%X, GLint *params = 0x%016" PRIxPTR ")", target,
>+          pname, (uintptr_t)params);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() ||
>+            ValidateGetFramebufferParameteriv(context, target, pname, params))
>+        {
>+            context->getFramebufferParameteriv(target, pname, params);
>+        }
>+    }
>+}
>+
>+GLenum GL_APIENTRY GetGraphicsResetStatusEXTContextANGLE(GLeglContext ctx)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("()");
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateGetGraphicsResetStatusEXT(context))
>+        {
>+            return context->getGraphicsResetStatus();
>+        }
>+    }
>+
>+    return GetDefaultReturnValue<EntryPoint::GetGraphicsResetStatusEXT, GLenum>();
>+}
>+
>+void GL_APIENTRY GetInteger64i_vContextANGLE(GLeglContext ctx,
>+                                             GLenum target,
>+                                             GLuint index,
>+                                             GLint64 *data)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum target = 0x%X, GLuint index = %u, GLint64 *data = 0x%016" PRIxPTR ")", target,
>+          index, (uintptr_t)data);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateGetInteger64i_v(context, target, index, data))
>+        {
>+            context->getInteger64i_v(target, index, data);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY GetInteger64vContextANGLE(GLeglContext ctx, GLenum pname, GLint64 *data)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum pname = 0x%X, GLint64 *data = 0x%016" PRIxPTR ")", pname, (uintptr_t)data);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateGetInteger64v(context, pname, data))
>+        {
>+            context->getInteger64v(pname, data);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY GetIntegeri_vContextANGLE(GLeglContext ctx,
>+                                           GLenum target,
>+                                           GLuint index,
>+                                           GLint *data)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum target = 0x%X, GLuint index = %u, GLint *data = 0x%016" PRIxPTR ")", target,
>+          index, (uintptr_t)data);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateGetIntegeri_v(context, target, index, data))
>+        {
>+            context->getIntegeri_v(target, index, data);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY GetIntegervContextANGLE(GLeglContext ctx, GLenum pname, GLint *data)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum pname = 0x%X, GLint *data = 0x%016" PRIxPTR ")", pname, (uintptr_t)data);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateGetIntegerv(context, pname, data))
>+        {
>+            context->getIntegerv(pname, data);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY GetInternalformativContextANGLE(GLeglContext ctx,
>+                                                 GLenum target,
>+                                                 GLenum internalformat,
>+                                                 GLenum pname,
>+                                                 GLsizei bufSize,
>+                                                 GLint *params)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLenum target = 0x%X, GLenum internalformat = 0x%X, GLenum pname = 0x%X, GLsizei bufSize "
>+        "= %d, GLint *params = 0x%016" PRIxPTR ")",
>+        target, internalformat, pname, bufSize, (uintptr_t)params);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() ||
>+            ValidateGetInternalformativ(context, target, internalformat, pname, bufSize, params))
>+        {
>+            context->getInternalformativ(target, internalformat, pname, bufSize, params);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY GetLightfvContextANGLE(GLeglContext ctx,
>+                                        GLenum light,
>+                                        GLenum pname,
>+                                        GLfloat *params)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum light = 0x%X, GLenum pname = 0x%X, GLfloat *params = 0x%016" PRIxPTR ")", light,
>+          pname, (uintptr_t)params);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        LightParameter pnamePacked = FromGLenum<LightParameter>(pname);
>+        if (context->skipValidation() || ValidateGetLightfv(context, light, pnamePacked, params))
>+        {
>+            context->getLightfv(light, pnamePacked, params);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY GetLightxvContextANGLE(GLeglContext ctx,
>+                                        GLenum light,
>+                                        GLenum pname,
>+                                        GLfixed *params)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum light = 0x%X, GLenum pname = 0x%X, GLfixed *params = 0x%016" PRIxPTR ")", light,
>+          pname, (uintptr_t)params);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        LightParameter pnamePacked = FromGLenum<LightParameter>(pname);
>+        if (context->skipValidation() || ValidateGetLightxv(context, light, pnamePacked, params))
>+        {
>+            context->getLightxv(light, pnamePacked, params);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY GetMaterialfvContextANGLE(GLeglContext ctx,
>+                                           GLenum face,
>+                                           GLenum pname,
>+                                           GLfloat *params)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum face = 0x%X, GLenum pname = 0x%X, GLfloat *params = 0x%016" PRIxPTR ")", face,
>+          pname, (uintptr_t)params);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        MaterialParameter pnamePacked = FromGLenum<MaterialParameter>(pname);
>+        if (context->skipValidation() || ValidateGetMaterialfv(context, face, pnamePacked, params))
>+        {
>+            context->getMaterialfv(face, pnamePacked, params);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY GetMaterialxvContextANGLE(GLeglContext ctx,
>+                                           GLenum face,
>+                                           GLenum pname,
>+                                           GLfixed *params)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum face = 0x%X, GLenum pname = 0x%X, GLfixed *params = 0x%016" PRIxPTR ")", face,
>+          pname, (uintptr_t)params);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        MaterialParameter pnamePacked = FromGLenum<MaterialParameter>(pname);
>+        if (context->skipValidation() || ValidateGetMaterialxv(context, face, pnamePacked, params))
>+        {
>+            context->getMaterialxv(face, pnamePacked, params);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY GetMemoryObjectParameterivEXTContextANGLE(GLeglContext ctx,
>+                                                           GLuint memoryObject,
>+                                                           GLenum pname,
>+                                                           GLint *params)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint memoryObject = %u, GLenum pname = 0x%X, GLint *params = 0x%016" PRIxPTR ")",
>+          memoryObject, pname, (uintptr_t)params);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() ||
>+            ValidateGetMemoryObjectParameterivEXT(context, memoryObject, pname, params))
>+        {
>+            context->getMemoryObjectParameteriv(memoryObject, pname, params);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY GetMultisamplefvContextANGLE(GLeglContext ctx,
>+                                              GLenum pname,
>+                                              GLuint index,
>+                                              GLfloat *val)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum pname = 0x%X, GLuint index = %u, GLfloat *val = 0x%016" PRIxPTR ")", pname,
>+          index, (uintptr_t)val);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateGetMultisamplefv(context, pname, index, val))
>+        {
>+            context->getMultisamplefv(pname, index, val);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY GetObjectLabelKHRContextANGLE(GLeglContext ctx,
>+                                               GLenum identifier,
>+                                               GLuint name,
>+                                               GLsizei bufSize,
>+                                               GLsizei *length,
>+                                               GLchar *label)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLenum identifier = 0x%X, GLuint name = %u, GLsizei bufSize = %d, GLsizei *length = "
>+        "0x%016" PRIxPTR ", GLchar *label = 0x%016" PRIxPTR ")",
>+        identifier, name, bufSize, (uintptr_t)length, (uintptr_t)label);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() ||
>+            ValidateGetObjectLabelKHR(context, identifier, name, bufSize, length, label))
>+        {
>+            context->getObjectLabel(identifier, name, bufSize, length, label);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY GetObjectPtrLabelKHRContextANGLE(GLeglContext ctx,
>+                                                  const void *ptr,
>+                                                  GLsizei bufSize,
>+                                                  GLsizei *length,
>+                                                  GLchar *label)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(const void *ptr = 0x%016" PRIxPTR
>+          ", GLsizei bufSize = %d, GLsizei *length = 0x%016" PRIxPTR
>+          ", GLchar *label = 0x%016" PRIxPTR ")",
>+          (uintptr_t)ptr, bufSize, (uintptr_t)length, (uintptr_t)label);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() ||
>+            ValidateGetObjectPtrLabelKHR(context, ptr, bufSize, length, label))
>+        {
>+            context->getObjectPtrLabel(ptr, bufSize, length, label);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY GetPointervContextANGLE(GLeglContext ctx, GLenum pname, void **params)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum pname = 0x%X, void **params = 0x%016" PRIxPTR ")", pname, (uintptr_t)params);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateGetPointerv(context, pname, params))
>+        {
>+            context->getPointerv(pname, params);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY GetPointervKHRContextANGLE(GLeglContext ctx, GLenum pname, void **params)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum pname = 0x%X, void **params = 0x%016" PRIxPTR ")", pname, (uintptr_t)params);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateGetPointervKHR(context, pname, params))
>+        {
>+            context->getPointerv(pname, params);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY GetProgramBinaryContextANGLE(GLeglContext ctx,
>+                                              GLuint program,
>+                                              GLsizei bufSize,
>+                                              GLsizei *length,
>+                                              GLenum *binaryFormat,
>+                                              void *binary)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint program = %u, GLsizei bufSize = %d, GLsizei *length = 0x%016" PRIxPTR
>+          ", GLenum *binaryFormat = 0x%016" PRIxPTR ", void *binary = 0x%016" PRIxPTR ")",
>+          program, bufSize, (uintptr_t)length, (uintptr_t)binaryFormat, (uintptr_t)binary);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() ||
>+            ValidateGetProgramBinary(context, program, bufSize, length, binaryFormat, binary))
>+        {
>+            context->getProgramBinary(program, bufSize, length, binaryFormat, binary);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY GetProgramBinaryOESContextANGLE(GLeglContext ctx,
>+                                                 GLuint program,
>+                                                 GLsizei bufSize,
>+                                                 GLsizei *length,
>+                                                 GLenum *binaryFormat,
>+                                                 void *binary)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint program = %u, GLsizei bufSize = %d, GLsizei *length = 0x%016" PRIxPTR
>+          ", GLenum *binaryFormat = 0x%016" PRIxPTR ", void *binary = 0x%016" PRIxPTR ")",
>+          program, bufSize, (uintptr_t)length, (uintptr_t)binaryFormat, (uintptr_t)binary);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() ||
>+            ValidateGetProgramBinaryOES(context, program, bufSize, length, binaryFormat, binary))
>+        {
>+            context->getProgramBinary(program, bufSize, length, binaryFormat, binary);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY GetProgramInfoLogContextANGLE(GLeglContext ctx,
>+                                               GLuint program,
>+                                               GLsizei bufSize,
>+                                               GLsizei *length,
>+                                               GLchar *infoLog)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint program = %u, GLsizei bufSize = %d, GLsizei *length = 0x%016" PRIxPTR
>+          ", GLchar *infoLog = 0x%016" PRIxPTR ")",
>+          program, bufSize, (uintptr_t)length, (uintptr_t)infoLog);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() ||
>+            ValidateGetProgramInfoLog(context, program, bufSize, length, infoLog))
>+        {
>+            context->getProgramInfoLog(program, bufSize, length, infoLog);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY GetProgramInterfaceivContextANGLE(GLeglContext ctx,
>+                                                   GLuint program,
>+                                                   GLenum programInterface,
>+                                                   GLenum pname,
>+                                                   GLint *params)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLuint program = %u, GLenum programInterface = 0x%X, GLenum pname = 0x%X, GLint *params "
>+        "= 0x%016" PRIxPTR ")",
>+        program, programInterface, pname, (uintptr_t)params);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() ||
>+            ValidateGetProgramInterfaceiv(context, program, programInterface, pname, params))
>+        {
>+            context->getProgramInterfaceiv(program, programInterface, pname, params);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY GetProgramPipelineInfoLogContextANGLE(GLeglContext ctx,
>+                                                       GLuint pipeline,
>+                                                       GLsizei bufSize,
>+                                                       GLsizei *length,
>+                                                       GLchar *infoLog)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint pipeline = %u, GLsizei bufSize = %d, GLsizei *length = 0x%016" PRIxPTR
>+          ", GLchar *infoLog = 0x%016" PRIxPTR ")",
>+          pipeline, bufSize, (uintptr_t)length, (uintptr_t)infoLog);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() ||
>+            ValidateGetProgramPipelineInfoLog(context, pipeline, bufSize, length, infoLog))
>+        {
>+            context->getProgramPipelineInfoLog(pipeline, bufSize, length, infoLog);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY GetProgramPipelineivContextANGLE(GLeglContext ctx,
>+                                                  GLuint pipeline,
>+                                                  GLenum pname,
>+                                                  GLint *params)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint pipeline = %u, GLenum pname = 0x%X, GLint *params = 0x%016" PRIxPTR ")",
>+          pipeline, pname, (uintptr_t)params);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() ||
>+            ValidateGetProgramPipelineiv(context, pipeline, pname, params))
>+        {
>+            context->getProgramPipelineiv(pipeline, pname, params);
>+        }
>+    }
>+}
>+
>+GLuint GL_APIENTRY GetProgramResourceIndexContextANGLE(GLeglContext ctx,
>+                                                       GLuint program,
>+                                                       GLenum programInterface,
>+                                                       const GLchar *name)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLuint program = %u, GLenum programInterface = 0x%X, const GLchar *name = 0x%016" PRIxPTR
>+        ")",
>+        program, programInterface, (uintptr_t)name);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() ||
>+            ValidateGetProgramResourceIndex(context, program, programInterface, name))
>+        {
>+            return context->getProgramResourceIndex(program, programInterface, name);
>+        }
>+    }
>+
>+    return GetDefaultReturnValue<EntryPoint::GetProgramResourceIndex, GLuint>();
>+}
>+
>+GLint GL_APIENTRY GetProgramResourceLocationContextANGLE(GLeglContext ctx,
>+                                                         GLuint program,
>+                                                         GLenum programInterface,
>+                                                         const GLchar *name)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLuint program = %u, GLenum programInterface = 0x%X, const GLchar *name = 0x%016" PRIxPTR
>+        ")",
>+        program, programInterface, (uintptr_t)name);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() ||
>+            ValidateGetProgramResourceLocation(context, program, programInterface, name))
>+        {
>+            return context->getProgramResourceLocation(program, programInterface, name);
>+        }
>+    }
>+
>+    return GetDefaultReturnValue<EntryPoint::GetProgramResourceLocation, GLint>();
>+}
>+
>+GLint GL_APIENTRY GetProgramResourceLocationIndexEXTContextANGLE(GLeglContext ctx,
>+                                                                 GLuint program,
>+                                                                 GLenum programInterface,
>+                                                                 const GLchar *name)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLuint program = %u, GLenum programInterface = 0x%X, const GLchar *name = 0x%016" PRIxPTR
>+        ")",
>+        program, programInterface, (uintptr_t)name);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() ||
>+            ValidateGetProgramResourceLocationIndexEXT(context, program, programInterface, name))
>+        {
>+            return context->getProgramResourceLocationIndex(program, programInterface, name);
>+        }
>+    }
>+
>+    return GetDefaultReturnValue<EntryPoint::GetProgramResourceLocationIndexEXT, GLint>();
>+}
>+
>+void GL_APIENTRY GetProgramResourceNameContextANGLE(GLeglContext ctx,
>+                                                    GLuint program,
>+                                                    GLenum programInterface,
>+                                                    GLuint index,
>+                                                    GLsizei bufSize,
>+                                                    GLsizei *length,
>+                                                    GLchar *name)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLuint program = %u, GLenum programInterface = 0x%X, GLuint index = %u, GLsizei bufSize "
>+        "= %d, GLsizei *length = 0x%016" PRIxPTR ", GLchar *name = 0x%016" PRIxPTR ")",
>+        program, programInterface, index, bufSize, (uintptr_t)length, (uintptr_t)name);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() ||
>+            ValidateGetProgramResourceName(context, program, programInterface, index, bufSize,
>+                                           length, name))
>+        {
>+            context->getProgramResourceName(program, programInterface, index, bufSize, length,
>+                                            name);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY GetProgramResourceivContextANGLE(GLeglContext ctx,
>+                                                  GLuint program,
>+                                                  GLenum programInterface,
>+                                                  GLuint index,
>+                                                  GLsizei propCount,
>+                                                  const GLenum *props,
>+                                                  GLsizei bufSize,
>+                                                  GLsizei *length,
>+                                                  GLint *params)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLuint program = %u, GLenum programInterface = 0x%X, GLuint index = %u, GLsizei "
>+        "propCount = %d, const GLenum *props = 0x%016" PRIxPTR
>+        ", GLsizei bufSize = %d, GLsizei *length = 0x%016" PRIxPTR
>+        ", GLint *params = 0x%016" PRIxPTR ")",
>+        program, programInterface, index, propCount, (uintptr_t)props, bufSize, (uintptr_t)length,
>+        (uintptr_t)params);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() ||
>+            ValidateGetProgramResourceiv(context, program, programInterface, index, propCount,
>+                                         props, bufSize, length, params))
>+        {
>+            context->getProgramResourceiv(program, programInterface, index, propCount, props,
>+                                          bufSize, length, params);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY GetProgramivContextANGLE(GLeglContext ctx,
>+                                          GLuint program,
>+                                          GLenum pname,
>+                                          GLint *params)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint program = %u, GLenum pname = 0x%X, GLint *params = 0x%016" PRIxPTR ")", program,
>+          pname, (uintptr_t)params);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateGetProgramiv(context, program, pname, params))
>+        {
>+            context->getProgramiv(program, pname, params);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY GetQueryObjecti64vEXTContextANGLE(GLeglContext ctx,
>+                                                   GLuint id,
>+                                                   GLenum pname,
>+                                                   GLint64 *params)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint id = %u, GLenum pname = 0x%X, GLint64 *params = 0x%016" PRIxPTR ")", id, pname,
>+          (uintptr_t)params);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateGetQueryObjecti64vEXT(context, id, pname, params))
>+        {
>+            context->getQueryObjecti64v(id, pname, params);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY GetQueryObjectivEXTContextANGLE(GLeglContext ctx,
>+                                                 GLuint id,
>+                                                 GLenum pname,
>+                                                 GLint *params)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint id = %u, GLenum pname = 0x%X, GLint *params = 0x%016" PRIxPTR ")", id, pname,
>+          (uintptr_t)params);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateGetQueryObjectivEXT(context, id, pname, params))
>+        {
>+            context->getQueryObjectiv(id, pname, params);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY GetQueryObjectui64vEXTContextANGLE(GLeglContext ctx,
>+                                                    GLuint id,
>+                                                    GLenum pname,
>+                                                    GLuint64 *params)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint id = %u, GLenum pname = 0x%X, GLuint64 *params = 0x%016" PRIxPTR ")", id, pname,
>+          (uintptr_t)params);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateGetQueryObjectui64vEXT(context, id, pname, params))
>+        {
>+            context->getQueryObjectui64v(id, pname, params);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY GetQueryObjectuivContextANGLE(GLeglContext ctx,
>+                                               GLuint id,
>+                                               GLenum pname,
>+                                               GLuint *params)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint id = %u, GLenum pname = 0x%X, GLuint *params = 0x%016" PRIxPTR ")", id, pname,
>+          (uintptr_t)params);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateGetQueryObjectuiv(context, id, pname, params))
>+        {
>+            context->getQueryObjectuiv(id, pname, params);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY GetQueryObjectuivEXTContextANGLE(GLeglContext ctx,
>+                                                  GLuint id,
>+                                                  GLenum pname,
>+                                                  GLuint *params)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint id = %u, GLenum pname = 0x%X, GLuint *params = 0x%016" PRIxPTR ")", id, pname,
>+          (uintptr_t)params);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateGetQueryObjectuivEXT(context, id, pname, params))
>+        {
>+            context->getQueryObjectuiv(id, pname, params);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY GetQueryivContextANGLE(GLeglContext ctx,
>+                                        GLenum target,
>+                                        GLenum pname,
>+                                        GLint *params)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum target = 0x%X, GLenum pname = 0x%X, GLint *params = 0x%016" PRIxPTR ")", target,
>+          pname, (uintptr_t)params);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        QueryType targetPacked = FromGLenum<QueryType>(target);
>+        if (context->skipValidation() || ValidateGetQueryiv(context, targetPacked, pname, params))
>+        {
>+            context->getQueryiv(targetPacked, pname, params);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY GetQueryivEXTContextANGLE(GLeglContext ctx,
>+                                           GLenum target,
>+                                           GLenum pname,
>+                                           GLint *params)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum target = 0x%X, GLenum pname = 0x%X, GLint *params = 0x%016" PRIxPTR ")", target,
>+          pname, (uintptr_t)params);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        QueryType targetPacked = FromGLenum<QueryType>(target);
>+        if (context->skipValidation() ||
>+            ValidateGetQueryivEXT(context, targetPacked, pname, params))
>+        {
>+            context->getQueryiv(targetPacked, pname, params);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY GetRenderbufferParameterivContextANGLE(GLeglContext ctx,
>+                                                        GLenum target,
>+                                                        GLenum pname,
>+                                                        GLint *params)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum target = 0x%X, GLenum pname = 0x%X, GLint *params = 0x%016" PRIxPTR ")", target,
>+          pname, (uintptr_t)params);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() ||
>+            ValidateGetRenderbufferParameteriv(context, target, pname, params))
>+        {
>+            context->getRenderbufferParameteriv(target, pname, params);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY GetRenderbufferParameterivOESContextANGLE(GLeglContext ctx,
>+                                                           GLenum target,
>+                                                           GLenum pname,
>+                                                           GLint *params)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum target = 0x%X, GLenum pname = 0x%X, GLint *params = 0x%016" PRIxPTR ")", target,
>+          pname, (uintptr_t)params);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() ||
>+            ValidateGetRenderbufferParameterivOES(context, target, pname, params))
>+        {
>+            context->getRenderbufferParameteriv(target, pname, params);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY GetSamplerParameterIivOESContextANGLE(GLeglContext ctx,
>+                                                       GLuint sampler,
>+                                                       GLenum pname,
>+                                                       GLint *params)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint sampler = %u, GLenum pname = 0x%X, GLint *params = 0x%016" PRIxPTR ")", sampler,
>+          pname, (uintptr_t)params);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() ||
>+            ValidateGetSamplerParameterIivOES(context, sampler, pname, params))
>+        {
>+            context->getSamplerParameterIiv(sampler, pname, params);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY GetSamplerParameterIuivOESContextANGLE(GLeglContext ctx,
>+                                                        GLuint sampler,
>+                                                        GLenum pname,
>+                                                        GLuint *params)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint sampler = %u, GLenum pname = 0x%X, GLuint *params = 0x%016" PRIxPTR ")", sampler,
>+          pname, (uintptr_t)params);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() ||
>+            ValidateGetSamplerParameterIuivOES(context, sampler, pname, params))
>+        {
>+            context->getSamplerParameterIuiv(sampler, pname, params);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY GetSamplerParameterfvContextANGLE(GLeglContext ctx,
>+                                                   GLuint sampler,
>+                                                   GLenum pname,
>+                                                   GLfloat *params)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint sampler = %u, GLenum pname = 0x%X, GLfloat *params = 0x%016" PRIxPTR ")",
>+          sampler, pname, (uintptr_t)params);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() ||
>+            ValidateGetSamplerParameterfv(context, sampler, pname, params))
>+        {
>+            context->getSamplerParameterfv(sampler, pname, params);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY GetSamplerParameterivContextANGLE(GLeglContext ctx,
>+                                                   GLuint sampler,
>+                                                   GLenum pname,
>+                                                   GLint *params)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint sampler = %u, GLenum pname = 0x%X, GLint *params = 0x%016" PRIxPTR ")", sampler,
>+          pname, (uintptr_t)params);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() ||
>+            ValidateGetSamplerParameteriv(context, sampler, pname, params))
>+        {
>+            context->getSamplerParameteriv(sampler, pname, params);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY GetSemaphoreParameterui64vEXTContextANGLE(GLeglContext ctx,
>+                                                           GLuint semaphore,
>+                                                           GLenum pname,
>+                                                           GLuint64 *params)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint semaphore = %u, GLenum pname = 0x%X, GLuint64 *params = 0x%016" PRIxPTR ")",
>+          semaphore, pname, (uintptr_t)params);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() ||
>+            ValidateGetSemaphoreParameterui64vEXT(context, semaphore, pname, params))
>+        {
>+            context->getSemaphoreParameterui64v(semaphore, pname, params);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY GetShaderInfoLogContextANGLE(GLeglContext ctx,
>+                                              GLuint shader,
>+                                              GLsizei bufSize,
>+                                              GLsizei *length,
>+                                              GLchar *infoLog)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint shader = %u, GLsizei bufSize = %d, GLsizei *length = 0x%016" PRIxPTR
>+          ", GLchar *infoLog = 0x%016" PRIxPTR ")",
>+          shader, bufSize, (uintptr_t)length, (uintptr_t)infoLog);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() ||
>+            ValidateGetShaderInfoLog(context, shader, bufSize, length, infoLog))
>+        {
>+            context->getShaderInfoLog(shader, bufSize, length, infoLog);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY GetShaderPrecisionFormatContextANGLE(GLeglContext ctx,
>+                                                      GLenum shadertype,
>+                                                      GLenum precisiontype,
>+                                                      GLint *range,
>+                                                      GLint *precision)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum shadertype = 0x%X, GLenum precisiontype = 0x%X, GLint *range = 0x%016" PRIxPTR
>+          ", GLint *precision = 0x%016" PRIxPTR ")",
>+          shadertype, precisiontype, (uintptr_t)range, (uintptr_t)precision);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() ||
>+            ValidateGetShaderPrecisionFormat(context, shadertype, precisiontype, range, precision))
>+        {
>+            context->getShaderPrecisionFormat(shadertype, precisiontype, range, precision);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY GetShaderSourceContextANGLE(GLeglContext ctx,
>+                                             GLuint shader,
>+                                             GLsizei bufSize,
>+                                             GLsizei *length,
>+                                             GLchar *source)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint shader = %u, GLsizei bufSize = %d, GLsizei *length = 0x%016" PRIxPTR
>+          ", GLchar *source = 0x%016" PRIxPTR ")",
>+          shader, bufSize, (uintptr_t)length, (uintptr_t)source);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() ||
>+            ValidateGetShaderSource(context, shader, bufSize, length, source))
>+        {
>+            context->getShaderSource(shader, bufSize, length, source);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY GetShaderivContextANGLE(GLeglContext ctx,
>+                                         GLuint shader,
>+                                         GLenum pname,
>+                                         GLint *params)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint shader = %u, GLenum pname = 0x%X, GLint *params = 0x%016" PRIxPTR ")", shader,
>+          pname, (uintptr_t)params);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateGetShaderiv(context, shader, pname, params))
>+        {
>+            context->getShaderiv(shader, pname, params);
>+        }
>+    }
>+}
>+
>+const GLubyte *GL_APIENTRY GetStringContextANGLE(GLeglContext ctx, GLenum name)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum name = 0x%X)", name);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateGetString(context, name))
>+        {
>+            return context->getString(name);
>+        }
>+    }
>+
>+    return GetDefaultReturnValue<EntryPoint::GetString, const GLubyte *>();
>+}
>+
>+const GLubyte *GL_APIENTRY GetStringiContextANGLE(GLeglContext ctx, GLenum name, GLuint index)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum name = 0x%X, GLuint index = %u)", name, index);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateGetStringi(context, name, index))
>+        {
>+            return context->getStringi(name, index);
>+        }
>+    }
>+
>+    return GetDefaultReturnValue<EntryPoint::GetStringi, const GLubyte *>();
>+}
>+
>+void GL_APIENTRY GetSyncivContextANGLE(GLeglContext ctx,
>+                                       GLsync sync,
>+                                       GLenum pname,
>+                                       GLsizei bufSize,
>+                                       GLsizei *length,
>+                                       GLint *values)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLsync sync = 0x%016" PRIxPTR
>+          ", GLenum pname = 0x%X, GLsizei bufSize = %d, GLsizei *length = 0x%016" PRIxPTR
>+          ", GLint *values = 0x%016" PRIxPTR ")",
>+          (uintptr_t)sync, pname, bufSize, (uintptr_t)length, (uintptr_t)values);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() ||
>+            ValidateGetSynciv(context, sync, pname, bufSize, length, values))
>+        {
>+            context->getSynciv(sync, pname, bufSize, length, values);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY GetTexEnvfvContextANGLE(GLeglContext ctx,
>+                                         GLenum target,
>+                                         GLenum pname,
>+                                         GLfloat *params)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum target = 0x%X, GLenum pname = 0x%X, GLfloat *params = 0x%016" PRIxPTR ")",
>+          target, pname, (uintptr_t)params);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        TextureEnvTarget targetPacked   = FromGLenum<TextureEnvTarget>(target);
>+        TextureEnvParameter pnamePacked = FromGLenum<TextureEnvParameter>(pname);
>+        if (context->skipValidation() ||
>+            ValidateGetTexEnvfv(context, targetPacked, pnamePacked, params))
>+        {
>+            context->getTexEnvfv(targetPacked, pnamePacked, params);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY GetTexEnvivContextANGLE(GLeglContext ctx,
>+                                         GLenum target,
>+                                         GLenum pname,
>+                                         GLint *params)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum target = 0x%X, GLenum pname = 0x%X, GLint *params = 0x%016" PRIxPTR ")", target,
>+          pname, (uintptr_t)params);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        TextureEnvTarget targetPacked   = FromGLenum<TextureEnvTarget>(target);
>+        TextureEnvParameter pnamePacked = FromGLenum<TextureEnvParameter>(pname);
>+        if (context->skipValidation() ||
>+            ValidateGetTexEnviv(context, targetPacked, pnamePacked, params))
>+        {
>+            context->getTexEnviv(targetPacked, pnamePacked, params);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY GetTexEnvxvContextANGLE(GLeglContext ctx,
>+                                         GLenum target,
>+                                         GLenum pname,
>+                                         GLfixed *params)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum target = 0x%X, GLenum pname = 0x%X, GLfixed *params = 0x%016" PRIxPTR ")",
>+          target, pname, (uintptr_t)params);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        TextureEnvTarget targetPacked   = FromGLenum<TextureEnvTarget>(target);
>+        TextureEnvParameter pnamePacked = FromGLenum<TextureEnvParameter>(pname);
>+        if (context->skipValidation() ||
>+            ValidateGetTexEnvxv(context, targetPacked, pnamePacked, params))
>+        {
>+            context->getTexEnvxv(targetPacked, pnamePacked, params);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY GetTexGenfvOESContextANGLE(GLeglContext ctx,
>+                                            GLenum coord,
>+                                            GLenum pname,
>+                                            GLfloat *params)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum coord = 0x%X, GLenum pname = 0x%X, GLfloat *params = 0x%016" PRIxPTR ")", coord,
>+          pname, (uintptr_t)params);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateGetTexGenfvOES(context, coord, pname, params))
>+        {
>+            context->getTexGenfv(coord, pname, params);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY GetTexGenivOESContextANGLE(GLeglContext ctx,
>+                                            GLenum coord,
>+                                            GLenum pname,
>+                                            GLint *params)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum coord = 0x%X, GLenum pname = 0x%X, GLint *params = 0x%016" PRIxPTR ")", coord,
>+          pname, (uintptr_t)params);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateGetTexGenivOES(context, coord, pname, params))
>+        {
>+            context->getTexGeniv(coord, pname, params);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY GetTexGenxvOESContextANGLE(GLeglContext ctx,
>+                                            GLenum coord,
>+                                            GLenum pname,
>+                                            GLfixed *params)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum coord = 0x%X, GLenum pname = 0x%X, GLfixed *params = 0x%016" PRIxPTR ")", coord,
>+          pname, (uintptr_t)params);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateGetTexGenxvOES(context, coord, pname, params))
>+        {
>+            context->getTexGenxv(coord, pname, params);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY GetTexLevelParameterfvContextANGLE(GLeglContext ctx,
>+                                                    GLenum target,
>+                                                    GLint level,
>+                                                    GLenum pname,
>+                                                    GLfloat *params)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLenum target = 0x%X, GLint level = %d, GLenum pname = 0x%X, GLfloat *params = "
>+        "0x%016" PRIxPTR ")",
>+        target, level, pname, (uintptr_t)params);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        TextureTarget targetPacked = FromGLenum<TextureTarget>(target);
>+        if (context->skipValidation() ||
>+            ValidateGetTexLevelParameterfv(context, targetPacked, level, pname, params))
>+        {
>+            context->getTexLevelParameterfv(targetPacked, level, pname, params);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY GetTexLevelParameterivContextANGLE(GLeglContext ctx,
>+                                                    GLenum target,
>+                                                    GLint level,
>+                                                    GLenum pname,
>+                                                    GLint *params)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLenum target = 0x%X, GLint level = %d, GLenum pname = 0x%X, GLint *params = "
>+        "0x%016" PRIxPTR ")",
>+        target, level, pname, (uintptr_t)params);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        TextureTarget targetPacked = FromGLenum<TextureTarget>(target);
>+        if (context->skipValidation() ||
>+            ValidateGetTexLevelParameteriv(context, targetPacked, level, pname, params))
>+        {
>+            context->getTexLevelParameteriv(targetPacked, level, pname, params);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY GetTexParameterIivOESContextANGLE(GLeglContext ctx,
>+                                                   GLenum target,
>+                                                   GLenum pname,
>+                                                   GLint *params)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum target = 0x%X, GLenum pname = 0x%X, GLint *params = 0x%016" PRIxPTR ")", target,
>+          pname, (uintptr_t)params);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        TextureType targetPacked = FromGLenum<TextureType>(target);
>+        if (context->skipValidation() ||
>+            ValidateGetTexParameterIivOES(context, targetPacked, pname, params))
>+        {
>+            context->getTexParameterIiv(targetPacked, pname, params);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY GetTexParameterIuivOESContextANGLE(GLeglContext ctx,
>+                                                    GLenum target,
>+                                                    GLenum pname,
>+                                                    GLuint *params)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum target = 0x%X, GLenum pname = 0x%X, GLuint *params = 0x%016" PRIxPTR ")", target,
>+          pname, (uintptr_t)params);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        TextureType targetPacked = FromGLenum<TextureType>(target);
>+        if (context->skipValidation() ||
>+            ValidateGetTexParameterIuivOES(context, targetPacked, pname, params))
>+        {
>+            context->getTexParameterIuiv(targetPacked, pname, params);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY GetTexParameterfvContextANGLE(GLeglContext ctx,
>+                                               GLenum target,
>+                                               GLenum pname,
>+                                               GLfloat *params)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum target = 0x%X, GLenum pname = 0x%X, GLfloat *params = 0x%016" PRIxPTR ")",
>+          target, pname, (uintptr_t)params);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        TextureType targetPacked = FromGLenum<TextureType>(target);
>+        if (context->skipValidation() ||
>+            ValidateGetTexParameterfv(context, targetPacked, pname, params))
>+        {
>+            context->getTexParameterfv(targetPacked, pname, params);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY GetTexParameterivContextANGLE(GLeglContext ctx,
>+                                               GLenum target,
>+                                               GLenum pname,
>+                                               GLint *params)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum target = 0x%X, GLenum pname = 0x%X, GLint *params = 0x%016" PRIxPTR ")", target,
>+          pname, (uintptr_t)params);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        TextureType targetPacked = FromGLenum<TextureType>(target);
>+        if (context->skipValidation() ||
>+            ValidateGetTexParameteriv(context, targetPacked, pname, params))
>+        {
>+            context->getTexParameteriv(targetPacked, pname, params);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY GetTexParameterxvContextANGLE(GLeglContext ctx,
>+                                               GLenum target,
>+                                               GLenum pname,
>+                                               GLfixed *params)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum target = 0x%X, GLenum pname = 0x%X, GLfixed *params = 0x%016" PRIxPTR ")",
>+          target, pname, (uintptr_t)params);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        TextureType targetPacked = FromGLenum<TextureType>(target);
>+        if (context->skipValidation() ||
>+            ValidateGetTexParameterxv(context, targetPacked, pname, params))
>+        {
>+            context->getTexParameterxv(targetPacked, pname, params);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY GetTransformFeedbackVaryingContextANGLE(GLeglContext ctx,
>+                                                         GLuint program,
>+                                                         GLuint index,
>+                                                         GLsizei bufSize,
>+                                                         GLsizei *length,
>+                                                         GLsizei *size,
>+                                                         GLenum *type,
>+                                                         GLchar *name)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLuint program = %u, GLuint index = %u, GLsizei bufSize = %d, GLsizei *length = "
>+        "0x%016" PRIxPTR ", GLsizei *size = 0x%016" PRIxPTR ", GLenum *type = 0x%016" PRIxPTR
>+        ", GLchar *name = 0x%016" PRIxPTR ")",
>+        program, index, bufSize, (uintptr_t)length, (uintptr_t)size, (uintptr_t)type,
>+        (uintptr_t)name);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() ||
>+            ValidateGetTransformFeedbackVarying(context, program, index, bufSize, length, size,
>+                                                type, name))
>+        {
>+            context->getTransformFeedbackVarying(program, index, bufSize, length, size, type, name);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY GetTranslatedShaderSourceANGLEContextANGLE(GLeglContext ctx,
>+                                                            GLuint shader,
>+                                                            GLsizei bufsize,
>+                                                            GLsizei *length,
>+                                                            GLchar *source)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint shader = %u, GLsizei bufsize = %d, GLsizei *length = 0x%016" PRIxPTR
>+          ", GLchar *source = 0x%016" PRIxPTR ")",
>+          shader, bufsize, (uintptr_t)length, (uintptr_t)source);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() ||
>+            ValidateGetTranslatedShaderSourceANGLE(context, shader, bufsize, length, source))
>+        {
>+            context->getTranslatedShaderSource(shader, bufsize, length, source);
>+        }
>+    }
>+}
>+
>+GLuint GL_APIENTRY GetUniformBlockIndexContextANGLE(GLeglContext ctx,
>+                                                    GLuint program,
>+                                                    const GLchar *uniformBlockName)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint program = %u, const GLchar *uniformBlockName = 0x%016" PRIxPTR ")", program,
>+          (uintptr_t)uniformBlockName);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() ||
>+            ValidateGetUniformBlockIndex(context, program, uniformBlockName))
>+        {
>+            return context->getUniformBlockIndex(program, uniformBlockName);
>+        }
>+    }
>+
>+    return GetDefaultReturnValue<EntryPoint::GetUniformBlockIndex, GLuint>();
>+}
>+
>+void GL_APIENTRY GetUniformIndicesContextANGLE(GLeglContext ctx,
>+                                               GLuint program,
>+                                               GLsizei uniformCount,
>+                                               const GLchar *const *uniformNames,
>+                                               GLuint *uniformIndices)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLuint program = %u, GLsizei uniformCount = %d, const GLchar *const*uniformNames = "
>+        "0x%016" PRIxPTR ", GLuint *uniformIndices = 0x%016" PRIxPTR ")",
>+        program, uniformCount, (uintptr_t)uniformNames, (uintptr_t)uniformIndices);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() ||
>+            ValidateGetUniformIndices(context, program, uniformCount, uniformNames, uniformIndices))
>+        {
>+            context->getUniformIndices(program, uniformCount, uniformNames, uniformIndices);
>+        }
>+    }
>+}
>+
>+GLint GL_APIENTRY GetUniformLocationContextANGLE(GLeglContext ctx,
>+                                                 GLuint program,
>+                                                 const GLchar *name)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint program = %u, const GLchar *name = 0x%016" PRIxPTR ")", program,
>+          (uintptr_t)name);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateGetUniformLocation(context, program, name))
>+        {
>+            return context->getUniformLocation(program, name);
>+        }
>+    }
>+
>+    return GetDefaultReturnValue<EntryPoint::GetUniformLocation, GLint>();
>+}
>+
>+void GL_APIENTRY GetUniformfvContextANGLE(GLeglContext ctx,
>+                                          GLuint program,
>+                                          GLint location,
>+                                          GLfloat *params)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint program = %u, GLint location = %d, GLfloat *params = 0x%016" PRIxPTR ")",
>+          program, location, (uintptr_t)params);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateGetUniformfv(context, program, location, params))
>+        {
>+            context->getUniformfv(program, location, params);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY GetUniformivContextANGLE(GLeglContext ctx,
>+                                          GLuint program,
>+                                          GLint location,
>+                                          GLint *params)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint program = %u, GLint location = %d, GLint *params = 0x%016" PRIxPTR ")", program,
>+          location, (uintptr_t)params);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateGetUniformiv(context, program, location, params))
>+        {
>+            context->getUniformiv(program, location, params);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY GetUniformuivContextANGLE(GLeglContext ctx,
>+                                           GLuint program,
>+                                           GLint location,
>+                                           GLuint *params)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint program = %u, GLint location = %d, GLuint *params = 0x%016" PRIxPTR ")", program,
>+          location, (uintptr_t)params);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateGetUniformuiv(context, program, location, params))
>+        {
>+            context->getUniformuiv(program, location, params);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY GetUnsignedBytevEXTContextANGLE(GLeglContext ctx, GLenum pname, GLubyte *data)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum pname = 0x%X, GLubyte *data = 0x%016" PRIxPTR ")", pname, (uintptr_t)data);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateGetUnsignedBytevEXT(context, pname, data))
>+        {
>+            context->getUnsignedBytev(pname, data);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY GetUnsignedBytei_vEXTContextANGLE(GLeglContext ctx,
>+                                                   GLenum target,
>+                                                   GLuint index,
>+                                                   GLubyte *data)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum target = 0x%X, GLuint index = %u, GLubyte *data = 0x%016" PRIxPTR ")", target,
>+          index, (uintptr_t)data);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() ||
>+            ValidateGetUnsignedBytei_vEXT(context, target, index, data))
>+        {
>+            context->getUnsignedBytei_v(target, index, data);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY GetVertexAttribIivContextANGLE(GLeglContext ctx,
>+                                                GLuint index,
>+                                                GLenum pname,
>+                                                GLint *params)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint index = %u, GLenum pname = 0x%X, GLint *params = 0x%016" PRIxPTR ")", index,
>+          pname, (uintptr_t)params);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateGetVertexAttribIiv(context, index, pname, params))
>+        {
>+            context->getVertexAttribIiv(index, pname, params);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY GetVertexAttribIuivContextANGLE(GLeglContext ctx,
>+                                                 GLuint index,
>+                                                 GLenum pname,
>+                                                 GLuint *params)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint index = %u, GLenum pname = 0x%X, GLuint *params = 0x%016" PRIxPTR ")", index,
>+          pname, (uintptr_t)params);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateGetVertexAttribIuiv(context, index, pname, params))
>+        {
>+            context->getVertexAttribIuiv(index, pname, params);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY GetVertexAttribPointervContextANGLE(GLeglContext ctx,
>+                                                     GLuint index,
>+                                                     GLenum pname,
>+                                                     void **pointer)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint index = %u, GLenum pname = 0x%X, void **pointer = 0x%016" PRIxPTR ")", index,
>+          pname, (uintptr_t)pointer);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() ||
>+            ValidateGetVertexAttribPointerv(context, index, pname, pointer))
>+        {
>+            context->getVertexAttribPointerv(index, pname, pointer);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY GetVertexAttribfvContextANGLE(GLeglContext ctx,
>+                                               GLuint index,
>+                                               GLenum pname,
>+                                               GLfloat *params)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint index = %u, GLenum pname = 0x%X, GLfloat *params = 0x%016" PRIxPTR ")", index,
>+          pname, (uintptr_t)params);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateGetVertexAttribfv(context, index, pname, params))
>+        {
>+            context->getVertexAttribfv(index, pname, params);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY GetVertexAttribivContextANGLE(GLeglContext ctx,
>+                                               GLuint index,
>+                                               GLenum pname,
>+                                               GLint *params)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint index = %u, GLenum pname = 0x%X, GLint *params = 0x%016" PRIxPTR ")", index,
>+          pname, (uintptr_t)params);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateGetVertexAttribiv(context, index, pname, params))
>+        {
>+            context->getVertexAttribiv(index, pname, params);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY GetnUniformfvEXTContextANGLE(GLeglContext ctx,
>+                                              GLuint program,
>+                                              GLint location,
>+                                              GLsizei bufSize,
>+                                              GLfloat *params)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLuint program = %u, GLint location = %d, GLsizei bufSize = %d, GLfloat *params = "
>+        "0x%016" PRIxPTR ")",
>+        program, location, bufSize, (uintptr_t)params);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() ||
>+            ValidateGetnUniformfvEXT(context, program, location, bufSize, params))
>+        {
>+            context->getnUniformfv(program, location, bufSize, params);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY GetnUniformivEXTContextANGLE(GLeglContext ctx,
>+                                              GLuint program,
>+                                              GLint location,
>+                                              GLsizei bufSize,
>+                                              GLint *params)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLuint program = %u, GLint location = %d, GLsizei bufSize = %d, GLint *params = "
>+        "0x%016" PRIxPTR ")",
>+        program, location, bufSize, (uintptr_t)params);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() ||
>+            ValidateGetnUniformivEXT(context, program, location, bufSize, params))
>+        {
>+            context->getnUniformiv(program, location, bufSize, params);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY HintContextANGLE(GLeglContext ctx, GLenum target, GLenum mode)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum target = 0x%X, GLenum mode = 0x%X)", target, mode);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateHint(context, target, mode))
>+        {
>+            context->hint(target, mode);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY ImportMemoryFdEXTContextANGLE(GLeglContext ctx,
>+                                               GLuint memory,
>+                                               GLuint64 size,
>+                                               GLenum handleType,
>+                                               GLint fd)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint memory = %u, GLuint64 size = %llu, GLenum handleType = 0x%X, GLint fd = %d)",
>+          memory, static_cast<unsigned long long>(size), handleType, fd);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        HandleType handleTypePacked = FromGLenum<HandleType>(handleType);
>+        if (context->skipValidation() ||
>+            ValidateImportMemoryFdEXT(context, memory, size, handleTypePacked, fd))
>+        {
>+            context->importMemoryFd(memory, size, handleTypePacked, fd);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY ImportSemaphoreFdEXTContextANGLE(GLeglContext ctx,
>+                                                  GLuint semaphore,
>+                                                  GLenum handleType,
>+                                                  GLint fd)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint semaphore = %u, GLenum handleType = 0x%X, GLint fd = %d)", semaphore, handleType,
>+          fd);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        HandleType handleTypePacked = FromGLenum<HandleType>(handleType);
>+        if (context->skipValidation() ||
>+            ValidateImportSemaphoreFdEXT(context, semaphore, handleTypePacked, fd))
>+        {
>+            context->importSemaphoreFd(semaphore, handleTypePacked, fd);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY InsertEventMarkerEXTContextANGLE(GLeglContext ctx,
>+                                                  GLsizei length,
>+                                                  const GLchar *marker)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    // Don't run an EVENT() macro on the EXT_debug_marker entry points.
>+    // It can interfere with the debug events being set by the caller.
>+    // EVENT("(GLsizei length = %d, const GLchar *marker = 0x%016" PRIxPTR ")", length,
>+    // (uintptr_t)marker);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateInsertEventMarkerEXT(context, length, marker))
>+        {
>+            context->insertEventMarker(length, marker);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY InvalidateFramebufferContextANGLE(GLeglContext ctx,
>+                                                   GLenum target,
>+                                                   GLsizei numAttachments,
>+                                                   const GLenum *attachments)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLenum target = 0x%X, GLsizei numAttachments = %d, const GLenum *attachments = "
>+        "0x%016" PRIxPTR ")",
>+        target, numAttachments, (uintptr_t)attachments);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() ||
>+            ValidateInvalidateFramebuffer(context, target, numAttachments, attachments))
>+        {
>+            context->invalidateFramebuffer(target, numAttachments, attachments);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY InvalidateSubFramebufferContextANGLE(GLeglContext ctx,
>+                                                      GLenum target,
>+                                                      GLsizei numAttachments,
>+                                                      const GLenum *attachments,
>+                                                      GLint x,
>+                                                      GLint y,
>+                                                      GLsizei width,
>+                                                      GLsizei height)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLenum target = 0x%X, GLsizei numAttachments = %d, const GLenum *attachments = "
>+        "0x%016" PRIxPTR ", GLint x = %d, GLint y = %d, GLsizei width = %d, GLsizei height = %d)",
>+        target, numAttachments, (uintptr_t)attachments, x, y, width, height);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() ||
>+            ValidateInvalidateSubFramebuffer(context, target, numAttachments, attachments, x, y,
>+                                             width, height))
>+        {
>+            context->invalidateSubFramebuffer(target, numAttachments, attachments, x, y, width,
>+                                              height);
>+        }
>+    }
>+}
>+
>+GLboolean GL_APIENTRY IsBufferContextANGLE(GLeglContext ctx, GLuint buffer)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint buffer = %u)", buffer);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateIsBuffer(context, buffer))
>+        {
>+            return context->isBuffer(buffer);
>+        }
>+    }
>+
>+    return GetDefaultReturnValue<EntryPoint::IsBuffer, GLboolean>();
>+}
>+
>+GLboolean GL_APIENTRY IsEnabledContextANGLE(GLeglContext ctx, GLenum cap)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum cap = 0x%X)", cap);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateIsEnabled(context, cap))
>+        {
>+            return context->isEnabled(cap);
>+        }
>+    }
>+
>+    return GetDefaultReturnValue<EntryPoint::IsEnabled, GLboolean>();
>+}
>+
>+GLboolean GL_APIENTRY IsFenceNVContextANGLE(GLeglContext ctx, GLuint fence)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint fence = %u)", fence);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateIsFenceNV(context, fence))
>+        {
>+            return context->isFenceNV(fence);
>+        }
>+    }
>+
>+    return GetDefaultReturnValue<EntryPoint::IsFenceNV, GLboolean>();
>+}
>+
>+GLboolean GL_APIENTRY IsFramebufferContextANGLE(GLeglContext ctx, GLuint framebuffer)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint framebuffer = %u)", framebuffer);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateIsFramebuffer(context, framebuffer))
>+        {
>+            return context->isFramebuffer(framebuffer);
>+        }
>+    }
>+
>+    return GetDefaultReturnValue<EntryPoint::IsFramebuffer, GLboolean>();
>+}
>+
>+GLboolean GL_APIENTRY IsFramebufferOESContextANGLE(GLeglContext ctx, GLuint framebuffer)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint framebuffer = %u)", framebuffer);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateIsFramebufferOES(context, framebuffer))
>+        {
>+            return context->isFramebuffer(framebuffer);
>+        }
>+    }
>+
>+    return GetDefaultReturnValue<EntryPoint::IsFramebufferOES, GLboolean>();
>+}
>+
>+GLboolean GL_APIENTRY IsMemoryObjectEXTContextANGLE(GLeglContext ctx, GLuint memoryObject)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint memoryObject = %u)", memoryObject);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateIsMemoryObjectEXT(context, memoryObject))
>+        {
>+            return context->isMemoryObject(memoryObject);
>+        }
>+    }
>+
>+    return GetDefaultReturnValue<EntryPoint::IsMemoryObjectEXT, GLboolean>();
>+}
>+
>+GLboolean GL_APIENTRY IsProgramContextANGLE(GLeglContext ctx, GLuint program)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint program = %u)", program);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateIsProgram(context, program))
>+        {
>+            return context->isProgram(program);
>+        }
>+    }
>+
>+    return GetDefaultReturnValue<EntryPoint::IsProgram, GLboolean>();
>+}
>+
>+GLboolean GL_APIENTRY IsProgramPipelineContextANGLE(GLeglContext ctx, GLuint pipeline)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint pipeline = %u)", pipeline);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateIsProgramPipeline(context, pipeline))
>+        {
>+            return context->isProgramPipeline(pipeline);
>+        }
>+    }
>+
>+    return GetDefaultReturnValue<EntryPoint::IsProgramPipeline, GLboolean>();
>+}
>+
>+GLboolean GL_APIENTRY IsQueryContextANGLE(GLeglContext ctx, GLuint id)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint id = %u)", id);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateIsQuery(context, id))
>+        {
>+            return context->isQuery(id);
>+        }
>+    }
>+
>+    return GetDefaultReturnValue<EntryPoint::IsQuery, GLboolean>();
>+}
>+
>+GLboolean GL_APIENTRY IsQueryEXTContextANGLE(GLeglContext ctx, GLuint id)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint id = %u)", id);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateIsQueryEXT(context, id))
>+        {
>+            return context->isQuery(id);
>+        }
>+    }
>+
>+    return GetDefaultReturnValue<EntryPoint::IsQueryEXT, GLboolean>();
>+}
>+
>+GLboolean GL_APIENTRY IsRenderbufferContextANGLE(GLeglContext ctx, GLuint renderbuffer)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint renderbuffer = %u)", renderbuffer);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateIsRenderbuffer(context, renderbuffer))
>+        {
>+            return context->isRenderbuffer(renderbuffer);
>+        }
>+    }
>+
>+    return GetDefaultReturnValue<EntryPoint::IsRenderbuffer, GLboolean>();
>+}
>+
>+GLboolean GL_APIENTRY IsRenderbufferOESContextANGLE(GLeglContext ctx, GLuint renderbuffer)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint renderbuffer = %u)", renderbuffer);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateIsRenderbufferOES(context, renderbuffer))
>+        {
>+            return context->isRenderbuffer(renderbuffer);
>+        }
>+    }
>+
>+    return GetDefaultReturnValue<EntryPoint::IsRenderbufferOES, GLboolean>();
>+}
>+
>+GLboolean GL_APIENTRY IsSemaphoreEXTContextANGLE(GLeglContext ctx, GLuint semaphore)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint semaphore = %u)", semaphore);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateIsSemaphoreEXT(context, semaphore))
>+        {
>+            return context->isSemaphore(semaphore);
>+        }
>+    }
>+
>+    return GetDefaultReturnValue<EntryPoint::IsSemaphoreEXT, GLboolean>();
>+}
>+
>+GLboolean GL_APIENTRY IsSamplerContextANGLE(GLeglContext ctx, GLuint sampler)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint sampler = %u)", sampler);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateIsSampler(context, sampler))
>+        {
>+            return context->isSampler(sampler);
>+        }
>+    }
>+
>+    return GetDefaultReturnValue<EntryPoint::IsSampler, GLboolean>();
>+}
>+
>+GLboolean GL_APIENTRY IsShaderContextANGLE(GLeglContext ctx, GLuint shader)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint shader = %u)", shader);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateIsShader(context, shader))
>+        {
>+            return context->isShader(shader);
>+        }
>+    }
>+
>+    return GetDefaultReturnValue<EntryPoint::IsShader, GLboolean>();
>+}
>+
>+GLboolean GL_APIENTRY IsSyncContextANGLE(GLeglContext ctx, GLsync sync)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLsync sync = 0x%016" PRIxPTR ")", (uintptr_t)sync);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateIsSync(context, sync))
>+        {
>+            return context->isSync(sync);
>+        }
>+    }
>+
>+    return GetDefaultReturnValue<EntryPoint::IsSync, GLboolean>();
>+}
>+
>+GLboolean GL_APIENTRY IsTextureContextANGLE(GLeglContext ctx, GLuint texture)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint texture = %u)", texture);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateIsTexture(context, texture))
>+        {
>+            return context->isTexture(texture);
>+        }
>+    }
>+
>+    return GetDefaultReturnValue<EntryPoint::IsTexture, GLboolean>();
>+}
>+
>+GLboolean GL_APIENTRY IsTransformFeedbackContextANGLE(GLeglContext ctx, GLuint id)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint id = %u)", id);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateIsTransformFeedback(context, id))
>+        {
>+            return context->isTransformFeedback(id);
>+        }
>+    }
>+
>+    return GetDefaultReturnValue<EntryPoint::IsTransformFeedback, GLboolean>();
>+}
>+
>+GLboolean GL_APIENTRY IsVertexArrayContextANGLE(GLeglContext ctx, GLuint array)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint array = %u)", array);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateIsVertexArray(context, array))
>+        {
>+            return context->isVertexArray(array);
>+        }
>+    }
>+
>+    return GetDefaultReturnValue<EntryPoint::IsVertexArray, GLboolean>();
>+}
>+
>+GLboolean GL_APIENTRY IsVertexArrayOESContextANGLE(GLeglContext ctx, GLuint array)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint array = %u)", array);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateIsVertexArrayOES(context, array))
>+        {
>+            return context->isVertexArray(array);
>+        }
>+    }
>+
>+    return GetDefaultReturnValue<EntryPoint::IsVertexArrayOES, GLboolean>();
>+}
>+
>+void GL_APIENTRY LightModelfContextANGLE(GLeglContext ctx, GLenum pname, GLfloat param)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum pname = 0x%X, GLfloat param = %f)", pname, param);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateLightModelf(context, pname, param))
>+        {
>+            context->lightModelf(pname, param);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY LightModelfvContextANGLE(GLeglContext ctx, GLenum pname, const GLfloat *params)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum pname = 0x%X, const GLfloat *params = 0x%016" PRIxPTR ")", pname,
>+          (uintptr_t)params);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateLightModelfv(context, pname, params))
>+        {
>+            context->lightModelfv(pname, params);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY LightModelxContextANGLE(GLeglContext ctx, GLenum pname, GLfixed param)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum pname = 0x%X, GLfixed param = 0x%X)", pname, param);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateLightModelx(context, pname, param))
>+        {
>+            context->lightModelx(pname, param);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY LightModelxvContextANGLE(GLeglContext ctx, GLenum pname, const GLfixed *param)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum pname = 0x%X, const GLfixed *param = 0x%016" PRIxPTR ")", pname,
>+          (uintptr_t)param);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateLightModelxv(context, pname, param))
>+        {
>+            context->lightModelxv(pname, param);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY LightfContextANGLE(GLeglContext ctx, GLenum light, GLenum pname, GLfloat param)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum light = 0x%X, GLenum pname = 0x%X, GLfloat param = %f)", light, pname, param);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        LightParameter pnamePacked = FromGLenum<LightParameter>(pname);
>+        if (context->skipValidation() || ValidateLightf(context, light, pnamePacked, param))
>+        {
>+            context->lightf(light, pnamePacked, param);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY LightfvContextANGLE(GLeglContext ctx,
>+                                     GLenum light,
>+                                     GLenum pname,
>+                                     const GLfloat *params)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum light = 0x%X, GLenum pname = 0x%X, const GLfloat *params = 0x%016" PRIxPTR ")",
>+          light, pname, (uintptr_t)params);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        LightParameter pnamePacked = FromGLenum<LightParameter>(pname);
>+        if (context->skipValidation() || ValidateLightfv(context, light, pnamePacked, params))
>+        {
>+            context->lightfv(light, pnamePacked, params);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY LightxContextANGLE(GLeglContext ctx, GLenum light, GLenum pname, GLfixed param)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum light = 0x%X, GLenum pname = 0x%X, GLfixed param = 0x%X)", light, pname, param);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        LightParameter pnamePacked = FromGLenum<LightParameter>(pname);
>+        if (context->skipValidation() || ValidateLightx(context, light, pnamePacked, param))
>+        {
>+            context->lightx(light, pnamePacked, param);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY LightxvContextANGLE(GLeglContext ctx,
>+                                     GLenum light,
>+                                     GLenum pname,
>+                                     const GLfixed *params)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum light = 0x%X, GLenum pname = 0x%X, const GLfixed *params = 0x%016" PRIxPTR ")",
>+          light, pname, (uintptr_t)params);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        LightParameter pnamePacked = FromGLenum<LightParameter>(pname);
>+        if (context->skipValidation() || ValidateLightxv(context, light, pnamePacked, params))
>+        {
>+            context->lightxv(light, pnamePacked, params);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY LineWidthContextANGLE(GLeglContext ctx, GLfloat width)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLfloat width = %f)", width);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateLineWidth(context, width))
>+        {
>+            context->lineWidth(width);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY LineWidthxContextANGLE(GLeglContext ctx, GLfixed width)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLfixed width = 0x%X)", width);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateLineWidthx(context, width))
>+        {
>+            context->lineWidthx(width);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY LinkProgramContextANGLE(GLeglContext ctx, GLuint program)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint program = %u)", program);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateLinkProgram(context, program))
>+        {
>+            context->linkProgram(program);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY LoadIdentityContextANGLE(GLeglContext ctx)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("()");
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateLoadIdentity(context))
>+        {
>+            context->loadIdentity();
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY LoadMatrixfContextANGLE(GLeglContext ctx, const GLfloat *m)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(const GLfloat *m = 0x%016" PRIxPTR ")", (uintptr_t)m);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateLoadMatrixf(context, m))
>+        {
>+            context->loadMatrixf(m);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY LoadMatrixxContextANGLE(GLeglContext ctx, const GLfixed *m)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(const GLfixed *m = 0x%016" PRIxPTR ")", (uintptr_t)m);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateLoadMatrixx(context, m))
>+        {
>+            context->loadMatrixx(m);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY LoadPaletteFromModelViewMatrixOESContextANGLE(GLeglContext ctx)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("()");
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateLoadPaletteFromModelViewMatrixOES(context))
>+        {
>+            context->loadPaletteFromModelViewMatrix();
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY LogicOpContextANGLE(GLeglContext ctx, GLenum opcode)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum opcode = 0x%X)", opcode);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        LogicalOperation opcodePacked = FromGLenum<LogicalOperation>(opcode);
>+        if (context->skipValidation() || ValidateLogicOp(context, opcodePacked))
>+        {
>+            context->logicOp(opcodePacked);
>+        }
>+    }
>+}
>+
>+void *GL_APIENTRY MapBufferOESContextANGLE(GLeglContext ctx, GLenum target, GLenum access)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum target = 0x%X, GLenum access = 0x%X)", target, access);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        BufferBinding targetPacked = FromGLenum<BufferBinding>(target);
>+        if (context->skipValidation() || ValidateMapBufferOES(context, targetPacked, access))
>+        {
>+            return context->mapBuffer(targetPacked, access);
>+        }
>+    }
>+
>+    return GetDefaultReturnValue<EntryPoint::MapBufferOES, void *>();
>+}
>+
>+void *GL_APIENTRY MapBufferRangeContextANGLE(GLeglContext ctx,
>+                                             GLenum target,
>+                                             GLintptr offset,
>+                                             GLsizeiptr length,
>+                                             GLbitfield access)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLenum target = 0x%X, GLintptr offset = %llu, GLsizeiptr length = %llu, GLbitfield "
>+        "access = 0x%X)",
>+        target, static_cast<unsigned long long>(offset), static_cast<unsigned long long>(length),
>+        access);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        BufferBinding targetPacked = FromGLenum<BufferBinding>(target);
>+        if (context->skipValidation() ||
>+            ValidateMapBufferRange(context, targetPacked, offset, length, access))
>+        {
>+            return context->mapBufferRange(targetPacked, offset, length, access);
>+        }
>+    }
>+
>+    return GetDefaultReturnValue<EntryPoint::MapBufferRange, void *>();
>+}
>+
>+void *GL_APIENTRY MapBufferRangeEXTContextANGLE(GLeglContext ctx,
>+                                                GLenum target,
>+                                                GLintptr offset,
>+                                                GLsizeiptr length,
>+                                                GLbitfield access)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLenum target = 0x%X, GLintptr offset = %llu, GLsizeiptr length = %llu, GLbitfield "
>+        "access = 0x%X)",
>+        target, static_cast<unsigned long long>(offset), static_cast<unsigned long long>(length),
>+        access);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        BufferBinding targetPacked = FromGLenum<BufferBinding>(target);
>+        if (context->skipValidation() ||
>+            ValidateMapBufferRangeEXT(context, targetPacked, offset, length, access))
>+        {
>+            return context->mapBufferRange(targetPacked, offset, length, access);
>+        }
>+    }
>+
>+    return GetDefaultReturnValue<EntryPoint::MapBufferRangeEXT, void *>();
>+}
>+
>+void GL_APIENTRY MaterialfContextANGLE(GLeglContext ctx, GLenum face, GLenum pname, GLfloat param)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum face = 0x%X, GLenum pname = 0x%X, GLfloat param = %f)", face, pname, param);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        MaterialParameter pnamePacked = FromGLenum<MaterialParameter>(pname);
>+        if (context->skipValidation() || ValidateMaterialf(context, face, pnamePacked, param))
>+        {
>+            context->materialf(face, pnamePacked, param);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY MaterialfvContextANGLE(GLeglContext ctx,
>+                                        GLenum face,
>+                                        GLenum pname,
>+                                        const GLfloat *params)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum face = 0x%X, GLenum pname = 0x%X, const GLfloat *params = 0x%016" PRIxPTR ")",
>+          face, pname, (uintptr_t)params);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        MaterialParameter pnamePacked = FromGLenum<MaterialParameter>(pname);
>+        if (context->skipValidation() || ValidateMaterialfv(context, face, pnamePacked, params))
>+        {
>+            context->materialfv(face, pnamePacked, params);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY MaterialxContextANGLE(GLeglContext ctx, GLenum face, GLenum pname, GLfixed param)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum face = 0x%X, GLenum pname = 0x%X, GLfixed param = 0x%X)", face, pname, param);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        MaterialParameter pnamePacked = FromGLenum<MaterialParameter>(pname);
>+        if (context->skipValidation() || ValidateMaterialx(context, face, pnamePacked, param))
>+        {
>+            context->materialx(face, pnamePacked, param);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY MaterialxvContextANGLE(GLeglContext ctx,
>+                                        GLenum face,
>+                                        GLenum pname,
>+                                        const GLfixed *param)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum face = 0x%X, GLenum pname = 0x%X, const GLfixed *param = 0x%016" PRIxPTR ")",
>+          face, pname, (uintptr_t)param);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        MaterialParameter pnamePacked = FromGLenum<MaterialParameter>(pname);
>+        if (context->skipValidation() || ValidateMaterialxv(context, face, pnamePacked, param))
>+        {
>+            context->materialxv(face, pnamePacked, param);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY MatrixIndexPointerOESContextANGLE(GLeglContext ctx,
>+                                                   GLint size,
>+                                                   GLenum type,
>+                                                   GLsizei stride,
>+                                                   const void *pointer)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLint size = %d, GLenum type = 0x%X, GLsizei stride = %d, const void *pointer = "
>+        "0x%016" PRIxPTR ")",
>+        size, type, stride, (uintptr_t)pointer);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() ||
>+            ValidateMatrixIndexPointerOES(context, size, type, stride, pointer))
>+        {
>+            context->matrixIndexPointer(size, type, stride, pointer);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY MatrixModeContextANGLE(GLeglContext ctx, GLenum mode)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum mode = 0x%X)", mode);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        MatrixType modePacked = FromGLenum<MatrixType>(mode);
>+        if (context->skipValidation() || ValidateMatrixMode(context, modePacked))
>+        {
>+            context->matrixMode(modePacked);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY MaxShaderCompilerThreadsKHRContextANGLE(GLeglContext ctx, GLuint count)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint count = %u)", count);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateMaxShaderCompilerThreadsKHR(context, count))
>+        {
>+            context->maxShaderCompilerThreads(count);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY MemoryBarrierContextANGLE(GLeglContext ctx, GLbitfield barriers)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLbitfield barriers = 0x%X)", barriers);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateMemoryBarrier(context, barriers))
>+        {
>+            context->memoryBarrier(barriers);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY MemoryBarrierByRegionContextANGLE(GLeglContext ctx, GLbitfield barriers)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLbitfield barriers = 0x%X)", barriers);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateMemoryBarrierByRegion(context, barriers))
>+        {
>+            context->memoryBarrierByRegion(barriers);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY MemoryObjectParameterivEXTContextANGLE(GLeglContext ctx,
>+                                                        GLuint memoryObject,
>+                                                        GLenum pname,
>+                                                        const GLint *params)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint memoryObject = %u, GLenum pname = 0x%X, const GLint *params = 0x%016" PRIxPTR
>+          ")",
>+          memoryObject, pname, (uintptr_t)params);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() ||
>+            ValidateMemoryObjectParameterivEXT(context, memoryObject, pname, params))
>+        {
>+            context->memoryObjectParameteriv(memoryObject, pname, params);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY MultMatrixfContextANGLE(GLeglContext ctx, const GLfloat *m)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(const GLfloat *m = 0x%016" PRIxPTR ")", (uintptr_t)m);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateMultMatrixf(context, m))
>+        {
>+            context->multMatrixf(m);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY MultMatrixxContextANGLE(GLeglContext ctx, const GLfixed *m)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(const GLfixed *m = 0x%016" PRIxPTR ")", (uintptr_t)m);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateMultMatrixx(context, m))
>+        {
>+            context->multMatrixx(m);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY MultiTexCoord4fContextANGLE(GLeglContext ctx,
>+                                             GLenum target,
>+                                             GLfloat s,
>+                                             GLfloat t,
>+                                             GLfloat r,
>+                                             GLfloat q)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum target = 0x%X, GLfloat s = %f, GLfloat t = %f, GLfloat r = %f, GLfloat q = %f)",
>+          target, s, t, r, q);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateMultiTexCoord4f(context, target, s, t, r, q))
>+        {
>+            context->multiTexCoord4f(target, s, t, r, q);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY MultiTexCoord4xContextANGLE(GLeglContext ctx,
>+                                             GLenum texture,
>+                                             GLfixed s,
>+                                             GLfixed t,
>+                                             GLfixed r,
>+                                             GLfixed q)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLenum texture = 0x%X, GLfixed s = 0x%X, GLfixed t = 0x%X, GLfixed r = 0x%X, GLfixed q = "
>+        "0x%X)",
>+        texture, s, t, r, q);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateMultiTexCoord4x(context, texture, s, t, r, q))
>+        {
>+            context->multiTexCoord4x(texture, s, t, r, q);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY Normal3fContextANGLE(GLeglContext ctx, GLfloat nx, GLfloat ny, GLfloat nz)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLfloat nx = %f, GLfloat ny = %f, GLfloat nz = %f)", nx, ny, nz);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateNormal3f(context, nx, ny, nz))
>+        {
>+            context->normal3f(nx, ny, nz);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY Normal3xContextANGLE(GLeglContext ctx, GLfixed nx, GLfixed ny, GLfixed nz)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLfixed nx = 0x%X, GLfixed ny = 0x%X, GLfixed nz = 0x%X)", nx, ny, nz);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateNormal3x(context, nx, ny, nz))
>+        {
>+            context->normal3x(nx, ny, nz);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY NormalPointerContextANGLE(GLeglContext ctx,
>+                                           GLenum type,
>+                                           GLsizei stride,
>+                                           const void *pointer)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum type = 0x%X, GLsizei stride = %d, const void *pointer = 0x%016" PRIxPTR ")",
>+          type, stride, (uintptr_t)pointer);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        VertexAttribType typePacked = FromGLenum<VertexAttribType>(type);
>+        if (context->skipValidation() ||
>+            ValidateNormalPointer(context, typePacked, stride, pointer))
>+        {
>+            context->normalPointer(typePacked, stride, pointer);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY ObjectLabelKHRContextANGLE(GLeglContext ctx,
>+                                            GLenum identifier,
>+                                            GLuint name,
>+                                            GLsizei length,
>+                                            const GLchar *label)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLenum identifier = 0x%X, GLuint name = %u, GLsizei length = %d, const GLchar *label = "
>+        "0x%016" PRIxPTR ")",
>+        identifier, name, length, (uintptr_t)label);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() ||
>+            ValidateObjectLabelKHR(context, identifier, name, length, label))
>+        {
>+            context->objectLabel(identifier, name, length, label);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY ObjectPtrLabelKHRContextANGLE(GLeglContext ctx,
>+                                               const void *ptr,
>+                                               GLsizei length,
>+                                               const GLchar *label)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(const void *ptr = 0x%016" PRIxPTR
>+          ", GLsizei length = %d, const GLchar *label = 0x%016" PRIxPTR ")",
>+          (uintptr_t)ptr, length, (uintptr_t)label);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateObjectPtrLabelKHR(context, ptr, length, label))
>+        {
>+            context->objectPtrLabel(ptr, length, label);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY OrthofContextANGLE(GLeglContext ctx,
>+                                    GLfloat l,
>+                                    GLfloat r,
>+                                    GLfloat b,
>+                                    GLfloat t,
>+                                    GLfloat n,
>+                                    GLfloat f)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLfloat l = %f, GLfloat r = %f, GLfloat b = %f, GLfloat t = %f, GLfloat n = %f, GLfloat "
>+        "f = %f)",
>+        l, r, b, t, n, f);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateOrthof(context, l, r, b, t, n, f))
>+        {
>+            context->orthof(l, r, b, t, n, f);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY OrthoxContextANGLE(GLeglContext ctx,
>+                                    GLfixed l,
>+                                    GLfixed r,
>+                                    GLfixed b,
>+                                    GLfixed t,
>+                                    GLfixed n,
>+                                    GLfixed f)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLfixed l = 0x%X, GLfixed r = 0x%X, GLfixed b = 0x%X, GLfixed t = 0x%X, GLfixed n = "
>+        "0x%X, GLfixed f = 0x%X)",
>+        l, r, b, t, n, f);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateOrthox(context, l, r, b, t, n, f))
>+        {
>+            context->orthox(l, r, b, t, n, f);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY PauseTransformFeedbackContextANGLE(GLeglContext ctx)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("()");
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidatePauseTransformFeedback(context))
>+        {
>+            context->pauseTransformFeedback();
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY PixelStoreiContextANGLE(GLeglContext ctx, GLenum pname, GLint param)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum pname = 0x%X, GLint param = %d)", pname, param);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidatePixelStorei(context, pname, param))
>+        {
>+            context->pixelStorei(pname, param);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY PointParameterfContextANGLE(GLeglContext ctx, GLenum pname, GLfloat param)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum pname = 0x%X, GLfloat param = %f)", pname, param);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        PointParameter pnamePacked = FromGLenum<PointParameter>(pname);
>+        if (context->skipValidation() || ValidatePointParameterf(context, pnamePacked, param))
>+        {
>+            context->pointParameterf(pnamePacked, param);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY PointParameterfvContextANGLE(GLeglContext ctx, GLenum pname, const GLfloat *params)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum pname = 0x%X, const GLfloat *params = 0x%016" PRIxPTR ")", pname,
>+          (uintptr_t)params);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        PointParameter pnamePacked = FromGLenum<PointParameter>(pname);
>+        if (context->skipValidation() || ValidatePointParameterfv(context, pnamePacked, params))
>+        {
>+            context->pointParameterfv(pnamePacked, params);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY PointParameterxContextANGLE(GLeglContext ctx, GLenum pname, GLfixed param)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum pname = 0x%X, GLfixed param = 0x%X)", pname, param);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        PointParameter pnamePacked = FromGLenum<PointParameter>(pname);
>+        if (context->skipValidation() || ValidatePointParameterx(context, pnamePacked, param))
>+        {
>+            context->pointParameterx(pnamePacked, param);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY PointParameterxvContextANGLE(GLeglContext ctx, GLenum pname, const GLfixed *params)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum pname = 0x%X, const GLfixed *params = 0x%016" PRIxPTR ")", pname,
>+          (uintptr_t)params);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        PointParameter pnamePacked = FromGLenum<PointParameter>(pname);
>+        if (context->skipValidation() || ValidatePointParameterxv(context, pnamePacked, params))
>+        {
>+            context->pointParameterxv(pnamePacked, params);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY PointSizeContextANGLE(GLeglContext ctx, GLfloat size)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLfloat size = %f)", size);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidatePointSize(context, size))
>+        {
>+            context->pointSize(size);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY PointSizePointerOESContextANGLE(GLeglContext ctx,
>+                                                 GLenum type,
>+                                                 GLsizei stride,
>+                                                 const void *pointer)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum type = 0x%X, GLsizei stride = %d, const void *pointer = 0x%016" PRIxPTR ")",
>+          type, stride, (uintptr_t)pointer);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        VertexAttribType typePacked = FromGLenum<VertexAttribType>(type);
>+        if (context->skipValidation() ||
>+            ValidatePointSizePointerOES(context, typePacked, stride, pointer))
>+        {
>+            context->pointSizePointer(typePacked, stride, pointer);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY PointSizexContextANGLE(GLeglContext ctx, GLfixed size)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLfixed size = 0x%X)", size);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidatePointSizex(context, size))
>+        {
>+            context->pointSizex(size);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY PolygonOffsetContextANGLE(GLeglContext ctx, GLfloat factor, GLfloat units)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLfloat factor = %f, GLfloat units = %f)", factor, units);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidatePolygonOffset(context, factor, units))
>+        {
>+            context->polygonOffset(factor, units);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY PolygonOffsetxContextANGLE(GLeglContext ctx, GLfixed factor, GLfixed units)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLfixed factor = 0x%X, GLfixed units = 0x%X)", factor, units);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidatePolygonOffsetx(context, factor, units))
>+        {
>+            context->polygonOffsetx(factor, units);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY PopDebugGroupKHRContextANGLE(GLeglContext ctx)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("()");
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidatePopDebugGroupKHR(context))
>+        {
>+            context->popDebugGroup();
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY PopGroupMarkerEXTContextANGLE(GLeglContext ctx)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    // Don't run an EVENT() macro on the EXT_debug_marker entry points.
>+    // It can interfere with the debug events being set by the caller.
>+    // EVENT("()");
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidatePopGroupMarkerEXT(context))
>+        {
>+            context->popGroupMarker();
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY PopMatrixContextANGLE(GLeglContext ctx)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("()");
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidatePopMatrix(context))
>+        {
>+            context->popMatrix();
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY ProgramBinaryContextANGLE(GLeglContext ctx,
>+                                           GLuint program,
>+                                           GLenum binaryFormat,
>+                                           const void *binary,
>+                                           GLsizei length)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint program = %u, GLenum binaryFormat = 0x%X, const void *binary = 0x%016" PRIxPTR
>+          ", GLsizei length = %d)",
>+          program, binaryFormat, (uintptr_t)binary, length);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() ||
>+            ValidateProgramBinary(context, program, binaryFormat, binary, length))
>+        {
>+            context->programBinary(program, binaryFormat, binary, length);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY ProgramBinaryOESContextANGLE(GLeglContext ctx,
>+                                              GLuint program,
>+                                              GLenum binaryFormat,
>+                                              const void *binary,
>+                                              GLint length)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint program = %u, GLenum binaryFormat = 0x%X, const void *binary = 0x%016" PRIxPTR
>+          ", GLint length = %d)",
>+          program, binaryFormat, (uintptr_t)binary, length);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() ||
>+            ValidateProgramBinaryOES(context, program, binaryFormat, binary, length))
>+        {
>+            context->programBinary(program, binaryFormat, binary, length);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY ProgramParameteriContextANGLE(GLeglContext ctx,
>+                                               GLuint program,
>+                                               GLenum pname,
>+                                               GLint value)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint program = %u, GLenum pname = 0x%X, GLint value = %d)", program, pname, value);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateProgramParameteri(context, program, pname, value))
>+        {
>+            context->programParameteri(program, pname, value);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY ProgramUniform1fContextANGLE(GLeglContext ctx,
>+                                              GLuint program,
>+                                              GLint location,
>+                                              GLfloat v0)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint program = %u, GLint location = %d, GLfloat v0 = %f)", program, location, v0);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateProgramUniform1f(context, program, location, v0))
>+        {
>+            context->programUniform1f(program, location, v0);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY ProgramUniform1fvContextANGLE(GLeglContext ctx,
>+                                               GLuint program,
>+                                               GLint location,
>+                                               GLsizei count,
>+                                               const GLfloat *value)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLuint program = %u, GLint location = %d, GLsizei count = %d, const GLfloat *value = "
>+        "0x%016" PRIxPTR ")",
>+        program, location, count, (uintptr_t)value);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() ||
>+            ValidateProgramUniform1fv(context, program, location, count, value))
>+        {
>+            context->programUniform1fv(program, location, count, value);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY ProgramUniform1iContextANGLE(GLeglContext ctx,
>+                                              GLuint program,
>+                                              GLint location,
>+                                              GLint v0)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint program = %u, GLint location = %d, GLint v0 = %d)", program, location, v0);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateProgramUniform1i(context, program, location, v0))
>+        {
>+            context->programUniform1i(program, location, v0);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY ProgramUniform1ivContextANGLE(GLeglContext ctx,
>+                                               GLuint program,
>+                                               GLint location,
>+                                               GLsizei count,
>+                                               const GLint *value)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLuint program = %u, GLint location = %d, GLsizei count = %d, const GLint *value = "
>+        "0x%016" PRIxPTR ")",
>+        program, location, count, (uintptr_t)value);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() ||
>+            ValidateProgramUniform1iv(context, program, location, count, value))
>+        {
>+            context->programUniform1iv(program, location, count, value);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY ProgramUniform1uiContextANGLE(GLeglContext ctx,
>+                                               GLuint program,
>+                                               GLint location,
>+                                               GLuint v0)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint program = %u, GLint location = %d, GLuint v0 = %u)", program, location, v0);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateProgramUniform1ui(context, program, location, v0))
>+        {
>+            context->programUniform1ui(program, location, v0);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY ProgramUniform1uivContextANGLE(GLeglContext ctx,
>+                                                GLuint program,
>+                                                GLint location,
>+                                                GLsizei count,
>+                                                const GLuint *value)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLuint program = %u, GLint location = %d, GLsizei count = %d, const GLuint *value = "
>+        "0x%016" PRIxPTR ")",
>+        program, location, count, (uintptr_t)value);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() ||
>+            ValidateProgramUniform1uiv(context, program, location, count, value))
>+        {
>+            context->programUniform1uiv(program, location, count, value);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY ProgramUniform2fContextANGLE(GLeglContext ctx,
>+                                              GLuint program,
>+                                              GLint location,
>+                                              GLfloat v0,
>+                                              GLfloat v1)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint program = %u, GLint location = %d, GLfloat v0 = %f, GLfloat v1 = %f)", program,
>+          location, v0, v1);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() ||
>+            ValidateProgramUniform2f(context, program, location, v0, v1))
>+        {
>+            context->programUniform2f(program, location, v0, v1);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY ProgramUniform2fvContextANGLE(GLeglContext ctx,
>+                                               GLuint program,
>+                                               GLint location,
>+                                               GLsizei count,
>+                                               const GLfloat *value)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLuint program = %u, GLint location = %d, GLsizei count = %d, const GLfloat *value = "
>+        "0x%016" PRIxPTR ")",
>+        program, location, count, (uintptr_t)value);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() ||
>+            ValidateProgramUniform2fv(context, program, location, count, value))
>+        {
>+            context->programUniform2fv(program, location, count, value);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY
>+ProgramUniform2iContextANGLE(GLeglContext ctx, GLuint program, GLint location, GLint v0, GLint v1)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint program = %u, GLint location = %d, GLint v0 = %d, GLint v1 = %d)", program,
>+          location, v0, v1);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() ||
>+            ValidateProgramUniform2i(context, program, location, v0, v1))
>+        {
>+            context->programUniform2i(program, location, v0, v1);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY ProgramUniform2ivContextANGLE(GLeglContext ctx,
>+                                               GLuint program,
>+                                               GLint location,
>+                                               GLsizei count,
>+                                               const GLint *value)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLuint program = %u, GLint location = %d, GLsizei count = %d, const GLint *value = "
>+        "0x%016" PRIxPTR ")",
>+        program, location, count, (uintptr_t)value);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() ||
>+            ValidateProgramUniform2iv(context, program, location, count, value))
>+        {
>+            context->programUniform2iv(program, location, count, value);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY ProgramUniform2uiContextANGLE(GLeglContext ctx,
>+                                               GLuint program,
>+                                               GLint location,
>+                                               GLuint v0,
>+                                               GLuint v1)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint program = %u, GLint location = %d, GLuint v0 = %u, GLuint v1 = %u)", program,
>+          location, v0, v1);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() ||
>+            ValidateProgramUniform2ui(context, program, location, v0, v1))
>+        {
>+            context->programUniform2ui(program, location, v0, v1);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY ProgramUniform2uivContextANGLE(GLeglContext ctx,
>+                                                GLuint program,
>+                                                GLint location,
>+                                                GLsizei count,
>+                                                const GLuint *value)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLuint program = %u, GLint location = %d, GLsizei count = %d, const GLuint *value = "
>+        "0x%016" PRIxPTR ")",
>+        program, location, count, (uintptr_t)value);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() ||
>+            ValidateProgramUniform2uiv(context, program, location, count, value))
>+        {
>+            context->programUniform2uiv(program, location, count, value);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY ProgramUniform3fContextANGLE(GLeglContext ctx,
>+                                              GLuint program,
>+                                              GLint location,
>+                                              GLfloat v0,
>+                                              GLfloat v1,
>+                                              GLfloat v2)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLuint program = %u, GLint location = %d, GLfloat v0 = %f, GLfloat v1 = %f, GLfloat v2 = "
>+        "%f)",
>+        program, location, v0, v1, v2);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() ||
>+            ValidateProgramUniform3f(context, program, location, v0, v1, v2))
>+        {
>+            context->programUniform3f(program, location, v0, v1, v2);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY ProgramUniform3fvContextANGLE(GLeglContext ctx,
>+                                               GLuint program,
>+                                               GLint location,
>+                                               GLsizei count,
>+                                               const GLfloat *value)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLuint program = %u, GLint location = %d, GLsizei count = %d, const GLfloat *value = "
>+        "0x%016" PRIxPTR ")",
>+        program, location, count, (uintptr_t)value);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() ||
>+            ValidateProgramUniform3fv(context, program, location, count, value))
>+        {
>+            context->programUniform3fv(program, location, count, value);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY ProgramUniform3iContextANGLE(GLeglContext ctx,
>+                                              GLuint program,
>+                                              GLint location,
>+                                              GLint v0,
>+                                              GLint v1,
>+                                              GLint v2)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint program = %u, GLint location = %d, GLint v0 = %d, GLint v1 = %d, GLint v2 = %d)",
>+          program, location, v0, v1, v2);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() ||
>+            ValidateProgramUniform3i(context, program, location, v0, v1, v2))
>+        {
>+            context->programUniform3i(program, location, v0, v1, v2);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY ProgramUniform3ivContextANGLE(GLeglContext ctx,
>+                                               GLuint program,
>+                                               GLint location,
>+                                               GLsizei count,
>+                                               const GLint *value)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLuint program = %u, GLint location = %d, GLsizei count = %d, const GLint *value = "
>+        "0x%016" PRIxPTR ")",
>+        program, location, count, (uintptr_t)value);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() ||
>+            ValidateProgramUniform3iv(context, program, location, count, value))
>+        {
>+            context->programUniform3iv(program, location, count, value);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY ProgramUniform3uiContextANGLE(GLeglContext ctx,
>+                                               GLuint program,
>+                                               GLint location,
>+                                               GLuint v0,
>+                                               GLuint v1,
>+                                               GLuint v2)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLuint program = %u, GLint location = %d, GLuint v0 = %u, GLuint v1 = %u, GLuint v2 = "
>+        "%u)",
>+        program, location, v0, v1, v2);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() ||
>+            ValidateProgramUniform3ui(context, program, location, v0, v1, v2))
>+        {
>+            context->programUniform3ui(program, location, v0, v1, v2);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY ProgramUniform3uivContextANGLE(GLeglContext ctx,
>+                                                GLuint program,
>+                                                GLint location,
>+                                                GLsizei count,
>+                                                const GLuint *value)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLuint program = %u, GLint location = %d, GLsizei count = %d, const GLuint *value = "
>+        "0x%016" PRIxPTR ")",
>+        program, location, count, (uintptr_t)value);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() ||
>+            ValidateProgramUniform3uiv(context, program, location, count, value))
>+        {
>+            context->programUniform3uiv(program, location, count, value);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY ProgramUniform4fContextANGLE(GLeglContext ctx,
>+                                              GLuint program,
>+                                              GLint location,
>+                                              GLfloat v0,
>+                                              GLfloat v1,
>+                                              GLfloat v2,
>+                                              GLfloat v3)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLuint program = %u, GLint location = %d, GLfloat v0 = %f, GLfloat v1 = %f, GLfloat v2 = "
>+        "%f, GLfloat v3 = %f)",
>+        program, location, v0, v1, v2, v3);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() ||
>+            ValidateProgramUniform4f(context, program, location, v0, v1, v2, v3))
>+        {
>+            context->programUniform4f(program, location, v0, v1, v2, v3);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY ProgramUniform4fvContextANGLE(GLeglContext ctx,
>+                                               GLuint program,
>+                                               GLint location,
>+                                               GLsizei count,
>+                                               const GLfloat *value)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLuint program = %u, GLint location = %d, GLsizei count = %d, const GLfloat *value = "
>+        "0x%016" PRIxPTR ")",
>+        program, location, count, (uintptr_t)value);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() ||
>+            ValidateProgramUniform4fv(context, program, location, count, value))
>+        {
>+            context->programUniform4fv(program, location, count, value);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY ProgramUniform4iContextANGLE(GLeglContext ctx,
>+                                              GLuint program,
>+                                              GLint location,
>+                                              GLint v0,
>+                                              GLint v1,
>+                                              GLint v2,
>+                                              GLint v3)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLuint program = %u, GLint location = %d, GLint v0 = %d, GLint v1 = %d, GLint v2 = %d, "
>+        "GLint v3 = %d)",
>+        program, location, v0, v1, v2, v3);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() ||
>+            ValidateProgramUniform4i(context, program, location, v0, v1, v2, v3))
>+        {
>+            context->programUniform4i(program, location, v0, v1, v2, v3);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY ProgramUniform4ivContextANGLE(GLeglContext ctx,
>+                                               GLuint program,
>+                                               GLint location,
>+                                               GLsizei count,
>+                                               const GLint *value)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLuint program = %u, GLint location = %d, GLsizei count = %d, const GLint *value = "
>+        "0x%016" PRIxPTR ")",
>+        program, location, count, (uintptr_t)value);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() ||
>+            ValidateProgramUniform4iv(context, program, location, count, value))
>+        {
>+            context->programUniform4iv(program, location, count, value);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY ProgramUniform4uiContextANGLE(GLeglContext ctx,
>+                                               GLuint program,
>+                                               GLint location,
>+                                               GLuint v0,
>+                                               GLuint v1,
>+                                               GLuint v2,
>+                                               GLuint v3)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLuint program = %u, GLint location = %d, GLuint v0 = %u, GLuint v1 = %u, GLuint v2 = "
>+        "%u, GLuint v3 = %u)",
>+        program, location, v0, v1, v2, v3);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() ||
>+            ValidateProgramUniform4ui(context, program, location, v0, v1, v2, v3))
>+        {
>+            context->programUniform4ui(program, location, v0, v1, v2, v3);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY ProgramUniform4uivContextANGLE(GLeglContext ctx,
>+                                                GLuint program,
>+                                                GLint location,
>+                                                GLsizei count,
>+                                                const GLuint *value)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLuint program = %u, GLint location = %d, GLsizei count = %d, const GLuint *value = "
>+        "0x%016" PRIxPTR ")",
>+        program, location, count, (uintptr_t)value);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() ||
>+            ValidateProgramUniform4uiv(context, program, location, count, value))
>+        {
>+            context->programUniform4uiv(program, location, count, value);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY ProgramUniformMatrix2fvContextANGLE(GLeglContext ctx,
>+                                                     GLuint program,
>+                                                     GLint location,
>+                                                     GLsizei count,
>+                                                     GLboolean transpose,
>+                                                     const GLfloat *value)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLuint program = %u, GLint location = %d, GLsizei count = %d, GLboolean transpose = %u, "
>+        "const GLfloat *value = 0x%016" PRIxPTR ")",
>+        program, location, count, transpose, (uintptr_t)value);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() ||
>+            ValidateProgramUniformMatrix2fv(context, program, location, count, transpose, value))
>+        {
>+            context->programUniformMatrix2fv(program, location, count, transpose, value);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY ProgramUniformMatrix2x3fvContextANGLE(GLeglContext ctx,
>+                                                       GLuint program,
>+                                                       GLint location,
>+                                                       GLsizei count,
>+                                                       GLboolean transpose,
>+                                                       const GLfloat *value)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLuint program = %u, GLint location = %d, GLsizei count = %d, GLboolean transpose = %u, "
>+        "const GLfloat *value = 0x%016" PRIxPTR ")",
>+        program, location, count, transpose, (uintptr_t)value);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() ||
>+            ValidateProgramUniformMatrix2x3fv(context, program, location, count, transpose, value))
>+        {
>+            context->programUniformMatrix2x3fv(program, location, count, transpose, value);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY ProgramUniformMatrix2x4fvContextANGLE(GLeglContext ctx,
>+                                                       GLuint program,
>+                                                       GLint location,
>+                                                       GLsizei count,
>+                                                       GLboolean transpose,
>+                                                       const GLfloat *value)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLuint program = %u, GLint location = %d, GLsizei count = %d, GLboolean transpose = %u, "
>+        "const GLfloat *value = 0x%016" PRIxPTR ")",
>+        program, location, count, transpose, (uintptr_t)value);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() ||
>+            ValidateProgramUniformMatrix2x4fv(context, program, location, count, transpose, value))
>+        {
>+            context->programUniformMatrix2x4fv(program, location, count, transpose, value);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY ProgramUniformMatrix3fvContextANGLE(GLeglContext ctx,
>+                                                     GLuint program,
>+                                                     GLint location,
>+                                                     GLsizei count,
>+                                                     GLboolean transpose,
>+                                                     const GLfloat *value)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLuint program = %u, GLint location = %d, GLsizei count = %d, GLboolean transpose = %u, "
>+        "const GLfloat *value = 0x%016" PRIxPTR ")",
>+        program, location, count, transpose, (uintptr_t)value);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() ||
>+            ValidateProgramUniformMatrix3fv(context, program, location, count, transpose, value))
>+        {
>+            context->programUniformMatrix3fv(program, location, count, transpose, value);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY ProgramUniformMatrix3x2fvContextANGLE(GLeglContext ctx,
>+                                                       GLuint program,
>+                                                       GLint location,
>+                                                       GLsizei count,
>+                                                       GLboolean transpose,
>+                                                       const GLfloat *value)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLuint program = %u, GLint location = %d, GLsizei count = %d, GLboolean transpose = %u, "
>+        "const GLfloat *value = 0x%016" PRIxPTR ")",
>+        program, location, count, transpose, (uintptr_t)value);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() ||
>+            ValidateProgramUniformMatrix3x2fv(context, program, location, count, transpose, value))
>+        {
>+            context->programUniformMatrix3x2fv(program, location, count, transpose, value);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY ProgramUniformMatrix3x4fvContextANGLE(GLeglContext ctx,
>+                                                       GLuint program,
>+                                                       GLint location,
>+                                                       GLsizei count,
>+                                                       GLboolean transpose,
>+                                                       const GLfloat *value)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLuint program = %u, GLint location = %d, GLsizei count = %d, GLboolean transpose = %u, "
>+        "const GLfloat *value = 0x%016" PRIxPTR ")",
>+        program, location, count, transpose, (uintptr_t)value);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() ||
>+            ValidateProgramUniformMatrix3x4fv(context, program, location, count, transpose, value))
>+        {
>+            context->programUniformMatrix3x4fv(program, location, count, transpose, value);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY ProgramUniformMatrix4fvContextANGLE(GLeglContext ctx,
>+                                                     GLuint program,
>+                                                     GLint location,
>+                                                     GLsizei count,
>+                                                     GLboolean transpose,
>+                                                     const GLfloat *value)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLuint program = %u, GLint location = %d, GLsizei count = %d, GLboolean transpose = %u, "
>+        "const GLfloat *value = 0x%016" PRIxPTR ")",
>+        program, location, count, transpose, (uintptr_t)value);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() ||
>+            ValidateProgramUniformMatrix4fv(context, program, location, count, transpose, value))
>+        {
>+            context->programUniformMatrix4fv(program, location, count, transpose, value);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY ProgramUniformMatrix4x2fvContextANGLE(GLeglContext ctx,
>+                                                       GLuint program,
>+                                                       GLint location,
>+                                                       GLsizei count,
>+                                                       GLboolean transpose,
>+                                                       const GLfloat *value)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLuint program = %u, GLint location = %d, GLsizei count = %d, GLboolean transpose = %u, "
>+        "const GLfloat *value = 0x%016" PRIxPTR ")",
>+        program, location, count, transpose, (uintptr_t)value);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() ||
>+            ValidateProgramUniformMatrix4x2fv(context, program, location, count, transpose, value))
>+        {
>+            context->programUniformMatrix4x2fv(program, location, count, transpose, value);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY ProgramUniformMatrix4x3fvContextANGLE(GLeglContext ctx,
>+                                                       GLuint program,
>+                                                       GLint location,
>+                                                       GLsizei count,
>+                                                       GLboolean transpose,
>+                                                       const GLfloat *value)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLuint program = %u, GLint location = %d, GLsizei count = %d, GLboolean transpose = %u, "
>+        "const GLfloat *value = 0x%016" PRIxPTR ")",
>+        program, location, count, transpose, (uintptr_t)value);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() ||
>+            ValidateProgramUniformMatrix4x3fv(context, program, location, count, transpose, value))
>+        {
>+            context->programUniformMatrix4x3fv(program, location, count, transpose, value);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY PushDebugGroupKHRContextANGLE(GLeglContext ctx,
>+                                               GLenum source,
>+                                               GLuint id,
>+                                               GLsizei length,
>+                                               const GLchar *message)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLenum source = 0x%X, GLuint id = %u, GLsizei length = %d, const GLchar *message = "
>+        "0x%016" PRIxPTR ")",
>+        source, id, length, (uintptr_t)message);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() ||
>+            ValidatePushDebugGroupKHR(context, source, id, length, message))
>+        {
>+            context->pushDebugGroup(source, id, length, message);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY PushGroupMarkerEXTContextANGLE(GLeglContext ctx,
>+                                                GLsizei length,
>+                                                const GLchar *marker)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    // Don't run an EVENT() macro on the EXT_debug_marker entry points.
>+    // It can interfere with the debug events being set by the caller.
>+    // EVENT("(GLsizei length = %d, const GLchar *marker = 0x%016" PRIxPTR ")", length,
>+    // (uintptr_t)marker);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidatePushGroupMarkerEXT(context, length, marker))
>+        {
>+            context->pushGroupMarker(length, marker);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY PushMatrixContextANGLE(GLeglContext ctx)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("()");
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidatePushMatrix(context))
>+        {
>+            context->pushMatrix();
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY QueryCounterEXTContextANGLE(GLeglContext ctx, GLuint id, GLenum target)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint id = %u, GLenum target = 0x%X)", id, target);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        QueryType targetPacked = FromGLenum<QueryType>(target);
>+        if (context->skipValidation() || ValidateQueryCounterEXT(context, id, targetPacked))
>+        {
>+            context->queryCounter(id, targetPacked);
>+        }
>+    }
>+}
>+
>+GLbitfield GL_APIENTRY QueryMatrixxOESContextANGLE(GLeglContext ctx,
>+                                                   GLfixed *mantissa,
>+                                                   GLint *exponent)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLfixed *mantissa = 0x%016" PRIxPTR ", GLint *exponent = 0x%016" PRIxPTR ")",
>+          (uintptr_t)mantissa, (uintptr_t)exponent);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateQueryMatrixxOES(context, mantissa, exponent))
>+        {
>+            return context->queryMatrixx(mantissa, exponent);
>+        }
>+    }
>+
>+    return GetDefaultReturnValue<EntryPoint::QueryMatrixxOES, GLbitfield>();
>+}
>+
>+void GL_APIENTRY ReadBufferContextANGLE(GLeglContext ctx, GLenum src)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum src = 0x%X)", src);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateReadBuffer(context, src))
>+        {
>+            context->readBuffer(src);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY ReadPixelsContextANGLE(GLeglContext ctx,
>+                                        GLint x,
>+                                        GLint y,
>+                                        GLsizei width,
>+                                        GLsizei height,
>+                                        GLenum format,
>+                                        GLenum type,
>+                                        void *pixels)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLint x = %d, GLint y = %d, GLsizei width = %d, GLsizei height = %d, GLenum format = "
>+        "0x%X, GLenum type = 0x%X, void *pixels = 0x%016" PRIxPTR ")",
>+        x, y, width, height, format, type, (uintptr_t)pixels);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() ||
>+            ValidateReadPixels(context, x, y, width, height, format, type, pixels))
>+        {
>+            context->readPixels(x, y, width, height, format, type, pixels);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY ReadnPixelsEXTContextANGLE(GLeglContext ctx,
>+                                            GLint x,
>+                                            GLint y,
>+                                            GLsizei width,
>+                                            GLsizei height,
>+                                            GLenum format,
>+                                            GLenum type,
>+                                            GLsizei bufSize,
>+                                            void *data)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLint x = %d, GLint y = %d, GLsizei width = %d, GLsizei height = %d, GLenum format = "
>+        "0x%X, GLenum type = 0x%X, GLsizei bufSize = %d, void *data = 0x%016" PRIxPTR ")",
>+        x, y, width, height, format, type, bufSize, (uintptr_t)data);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() ||
>+            ValidateReadnPixelsEXT(context, x, y, width, height, format, type, bufSize, data))
>+        {
>+            context->readnPixels(x, y, width, height, format, type, bufSize, data);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY ReleaseShaderCompilerContextANGLE(GLeglContext ctx)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("()");
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateReleaseShaderCompiler(context))
>+        {
>+            context->releaseShaderCompiler();
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY RenderbufferStorageContextANGLE(GLeglContext ctx,
>+                                                 GLenum target,
>+                                                 GLenum internalformat,
>+                                                 GLsizei width,
>+                                                 GLsizei height)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLenum target = 0x%X, GLenum internalformat = 0x%X, GLsizei width = %d, GLsizei height = "
>+        "%d)",
>+        target, internalformat, width, height);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() ||
>+            ValidateRenderbufferStorage(context, target, internalformat, width, height))
>+        {
>+            context->renderbufferStorage(target, internalformat, width, height);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY RenderbufferStorageMultisampleContextANGLE(GLeglContext ctx,
>+                                                            GLenum target,
>+                                                            GLsizei samples,
>+                                                            GLenum internalformat,
>+                                                            GLsizei width,
>+                                                            GLsizei height)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLenum target = 0x%X, GLsizei samples = %d, GLenum internalformat = 0x%X, GLsizei width "
>+        "= %d, GLsizei height = %d)",
>+        target, samples, internalformat, width, height);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() ||
>+            ValidateRenderbufferStorageMultisample(context, target, samples, internalformat, width,
>+                                                   height))
>+        {
>+            context->renderbufferStorageMultisample(target, samples, internalformat, width, height);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY RenderbufferStorageMultisampleANGLEContextANGLE(GLeglContext ctx,
>+                                                                 GLenum target,
>+                                                                 GLsizei samples,
>+                                                                 GLenum internalformat,
>+                                                                 GLsizei width,
>+                                                                 GLsizei height)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLenum target = 0x%X, GLsizei samples = %d, GLenum internalformat = 0x%X, GLsizei width "
>+        "= %d, GLsizei height = %d)",
>+        target, samples, internalformat, width, height);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() ||
>+            ValidateRenderbufferStorageMultisampleANGLE(context, target, samples, internalformat,
>+                                                        width, height))
>+        {
>+            context->renderbufferStorageMultisample(target, samples, internalformat, width, height);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY RenderbufferStorageOESContextANGLE(GLeglContext ctx,
>+                                                    GLenum target,
>+                                                    GLenum internalformat,
>+                                                    GLsizei width,
>+                                                    GLsizei height)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLenum target = 0x%X, GLenum internalformat = 0x%X, GLsizei width = %d, GLsizei height = "
>+        "%d)",
>+        target, internalformat, width, height);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() ||
>+            ValidateRenderbufferStorageOES(context, target, internalformat, width, height))
>+        {
>+            context->renderbufferStorage(target, internalformat, width, height);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY ResumeTransformFeedbackContextANGLE(GLeglContext ctx)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("()");
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateResumeTransformFeedback(context))
>+        {
>+            context->resumeTransformFeedback();
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY
>+RotatefContextANGLE(GLeglContext ctx, GLfloat angle, GLfloat x, GLfloat y, GLfloat z)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLfloat angle = %f, GLfloat x = %f, GLfloat y = %f, GLfloat z = %f)", angle, x, y, z);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateRotatef(context, angle, x, y, z))
>+        {
>+            context->rotatef(angle, x, y, z);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY
>+RotatexContextANGLE(GLeglContext ctx, GLfixed angle, GLfixed x, GLfixed y, GLfixed z)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLfixed angle = 0x%X, GLfixed x = 0x%X, GLfixed y = 0x%X, GLfixed z = 0x%X)", angle, x,
>+          y, z);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateRotatex(context, angle, x, y, z))
>+        {
>+            context->rotatex(angle, x, y, z);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY SampleCoverageContextANGLE(GLeglContext ctx, GLfloat value, GLboolean invert)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLfloat value = %f, GLboolean invert = %u)", value, invert);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateSampleCoverage(context, value, invert))
>+        {
>+            context->sampleCoverage(value, invert);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY SampleCoveragexContextANGLE(GLeglContext ctx, GLclampx value, GLboolean invert)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLclampx value = 0x%X, GLboolean invert = %u)", value, invert);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateSampleCoveragex(context, value, invert))
>+        {
>+            context->sampleCoveragex(value, invert);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY SampleMaskiContextANGLE(GLeglContext ctx, GLuint maskNumber, GLbitfield mask)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint maskNumber = %u, GLbitfield mask = 0x%X)", maskNumber, mask);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateSampleMaski(context, maskNumber, mask))
>+        {
>+            context->sampleMaski(maskNumber, mask);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY SamplerParameterIivOESContextANGLE(GLeglContext ctx,
>+                                                    GLuint sampler,
>+                                                    GLenum pname,
>+                                                    const GLint *param)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint sampler = %u, GLenum pname = 0x%X, const GLint *param = 0x%016" PRIxPTR ")",
>+          sampler, pname, (uintptr_t)param);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() ||
>+            ValidateSamplerParameterIivOES(context, sampler, pname, param))
>+        {
>+            context->samplerParameterIiv(sampler, pname, param);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY SamplerParameterIuivOESContextANGLE(GLeglContext ctx,
>+                                                     GLuint sampler,
>+                                                     GLenum pname,
>+                                                     const GLuint *param)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint sampler = %u, GLenum pname = 0x%X, const GLuint *param = 0x%016" PRIxPTR ")",
>+          sampler, pname, (uintptr_t)param);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() ||
>+            ValidateSamplerParameterIuivOES(context, sampler, pname, param))
>+        {
>+            context->samplerParameterIuiv(sampler, pname, param);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY SamplerParameterfContextANGLE(GLeglContext ctx,
>+                                               GLuint sampler,
>+                                               GLenum pname,
>+                                               GLfloat param)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint sampler = %u, GLenum pname = 0x%X, GLfloat param = %f)", sampler, pname, param);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateSamplerParameterf(context, sampler, pname, param))
>+        {
>+            context->samplerParameterf(sampler, pname, param);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY SamplerParameterfvContextANGLE(GLeglContext ctx,
>+                                                GLuint sampler,
>+                                                GLenum pname,
>+                                                const GLfloat *param)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint sampler = %u, GLenum pname = 0x%X, const GLfloat *param = 0x%016" PRIxPTR ")",
>+          sampler, pname, (uintptr_t)param);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateSamplerParameterfv(context, sampler, pname, param))
>+        {
>+            context->samplerParameterfv(sampler, pname, param);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY SamplerParameteriContextANGLE(GLeglContext ctx,
>+                                               GLuint sampler,
>+                                               GLenum pname,
>+                                               GLint param)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint sampler = %u, GLenum pname = 0x%X, GLint param = %d)", sampler, pname, param);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateSamplerParameteri(context, sampler, pname, param))
>+        {
>+            context->samplerParameteri(sampler, pname, param);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY SamplerParameterivContextANGLE(GLeglContext ctx,
>+                                                GLuint sampler,
>+                                                GLenum pname,
>+                                                const GLint *param)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint sampler = %u, GLenum pname = 0x%X, const GLint *param = 0x%016" PRIxPTR ")",
>+          sampler, pname, (uintptr_t)param);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateSamplerParameteriv(context, sampler, pname, param))
>+        {
>+            context->samplerParameteriv(sampler, pname, param);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY ScalefContextANGLE(GLeglContext ctx, GLfloat x, GLfloat y, GLfloat z)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLfloat x = %f, GLfloat y = %f, GLfloat z = %f)", x, y, z);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateScalef(context, x, y, z))
>+        {
>+            context->scalef(x, y, z);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY ScalexContextANGLE(GLeglContext ctx, GLfixed x, GLfixed y, GLfixed z)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLfixed x = 0x%X, GLfixed y = 0x%X, GLfixed z = 0x%X)", x, y, z);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateScalex(context, x, y, z))
>+        {
>+            context->scalex(x, y, z);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY
>+ScissorContextANGLE(GLeglContext ctx, GLint x, GLint y, GLsizei width, GLsizei height)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLint x = %d, GLint y = %d, GLsizei width = %d, GLsizei height = %d)", x, y, width,
>+          height);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateScissor(context, x, y, width, height))
>+        {
>+            context->scissor(x, y, width, height);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY SemaphoreParameterui64vEXTContextANGLE(GLeglContext ctx,
>+                                                        GLuint semaphore,
>+                                                        GLenum pname,
>+                                                        const GLuint64 *params)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint semaphore = %u, GLenum pname = 0x%X, const GLuint64 *params = 0x%016" PRIxPTR
>+          ")",
>+          semaphore, pname, (uintptr_t)params);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() ||
>+            ValidateSemaphoreParameterui64vEXT(context, semaphore, pname, params))
>+        {
>+            context->semaphoreParameterui64v(semaphore, pname, params);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY SetFenceNVContextANGLE(GLeglContext ctx, GLuint fence, GLenum condition)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint fence = %u, GLenum condition = 0x%X)", fence, condition);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateSetFenceNV(context, fence, condition))
>+        {
>+            context->setFenceNV(fence, condition);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY ShadeModelContextANGLE(GLeglContext ctx, GLenum mode)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum mode = 0x%X)", mode);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        ShadingModel modePacked = FromGLenum<ShadingModel>(mode);
>+        if (context->skipValidation() || ValidateShadeModel(context, modePacked))
>+        {
>+            context->shadeModel(modePacked);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY ShaderBinaryContextANGLE(GLeglContext ctx,
>+                                          GLsizei count,
>+                                          const GLuint *shaders,
>+                                          GLenum binaryformat,
>+                                          const void *binary,
>+                                          GLsizei length)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLsizei count = %d, const GLuint *shaders = 0x%016" PRIxPTR
>+          ", GLenum binaryformat = 0x%X, const void *binary = 0x%016" PRIxPTR
>+          ", GLsizei length = %d)",
>+          count, (uintptr_t)shaders, binaryformat, (uintptr_t)binary, length);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() ||
>+            ValidateShaderBinary(context, count, shaders, binaryformat, binary, length))
>+        {
>+            context->shaderBinary(count, shaders, binaryformat, binary, length);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY ShaderSourceContextANGLE(GLeglContext ctx,
>+                                          GLuint shader,
>+                                          GLsizei count,
>+                                          const GLchar *const *string,
>+                                          const GLint *length)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint shader = %u, GLsizei count = %d, const GLchar *const*string = 0x%016" PRIxPTR
>+          ", const GLint *length = 0x%016" PRIxPTR ")",
>+          shader, count, (uintptr_t)string, (uintptr_t)length);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() ||
>+            ValidateShaderSource(context, shader, count, string, length))
>+        {
>+            context->shaderSource(shader, count, string, length);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY SignalSemaphoreEXTContextANGLE(GLeglContext ctx,
>+                                                GLuint semaphore,
>+                                                GLuint numBufferBarriers,
>+                                                const GLuint *buffers,
>+                                                GLuint numTextureBarriers,
>+                                                const GLuint *textures,
>+                                                const GLenum *dstLayouts)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLuint semaphore = %u, GLuint numBufferBarriers = %u, const GLuint *buffers = "
>+        "0x%016" PRIxPTR ", GLuint numTextureBarriers = %u, const GLuint *textures = 0x%016" PRIxPTR
>+        ", const GLenum *dstLayouts = 0x%016" PRIxPTR ")",
>+        semaphore, numBufferBarriers, (uintptr_t)buffers, numTextureBarriers, (uintptr_t)textures,
>+        (uintptr_t)dstLayouts);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() ||
>+            ValidateSignalSemaphoreEXT(context, semaphore, numBufferBarriers, buffers,
>+                                       numTextureBarriers, textures, dstLayouts))
>+        {
>+            context->signalSemaphore(semaphore, numBufferBarriers, buffers, numTextureBarriers,
>+                                     textures, dstLayouts);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY StencilFuncContextANGLE(GLeglContext ctx, GLenum func, GLint ref, GLuint mask)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum func = 0x%X, GLint ref = %d, GLuint mask = %u)", func, ref, mask);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateStencilFunc(context, func, ref, mask))
>+        {
>+            context->stencilFunc(func, ref, mask);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY
>+StencilFuncSeparateContextANGLE(GLeglContext ctx, GLenum face, GLenum func, GLint ref, GLuint mask)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum face = 0x%X, GLenum func = 0x%X, GLint ref = %d, GLuint mask = %u)", face, func,
>+          ref, mask);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() ||
>+            ValidateStencilFuncSeparate(context, face, func, ref, mask))
>+        {
>+            context->stencilFuncSeparate(face, func, ref, mask);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY StencilMaskContextANGLE(GLeglContext ctx, GLuint mask)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint mask = %u)", mask);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateStencilMask(context, mask))
>+        {
>+            context->stencilMask(mask);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY StencilMaskSeparateContextANGLE(GLeglContext ctx, GLenum face, GLuint mask)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum face = 0x%X, GLuint mask = %u)", face, mask);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateStencilMaskSeparate(context, face, mask))
>+        {
>+            context->stencilMaskSeparate(face, mask);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY StencilOpContextANGLE(GLeglContext ctx, GLenum fail, GLenum zfail, GLenum zpass)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum fail = 0x%X, GLenum zfail = 0x%X, GLenum zpass = 0x%X)", fail, zfail, zpass);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateStencilOp(context, fail, zfail, zpass))
>+        {
>+            context->stencilOp(fail, zfail, zpass);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY StencilOpSeparateContextANGLE(GLeglContext ctx,
>+                                               GLenum face,
>+                                               GLenum sfail,
>+                                               GLenum dpfail,
>+                                               GLenum dppass)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum face = 0x%X, GLenum sfail = 0x%X, GLenum dpfail = 0x%X, GLenum dppass = 0x%X)",
>+          face, sfail, dpfail, dppass);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() ||
>+            ValidateStencilOpSeparate(context, face, sfail, dpfail, dppass))
>+        {
>+            context->stencilOpSeparate(face, sfail, dpfail, dppass);
>+        }
>+    }
>+}
>+
>+GLboolean GL_APIENTRY TestFenceNVContextANGLE(GLeglContext ctx, GLuint fence)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint fence = %u)", fence);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateTestFenceNV(context, fence))
>+        {
>+            return context->testFenceNV(fence);
>+        }
>+    }
>+
>+    return GetDefaultReturnValue<EntryPoint::TestFenceNV, GLboolean>();
>+}
>+
>+void GL_APIENTRY TexCoordPointerContextANGLE(GLeglContext ctx,
>+                                             GLint size,
>+                                             GLenum type,
>+                                             GLsizei stride,
>+                                             const void *pointer)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLint size = %d, GLenum type = 0x%X, GLsizei stride = %d, const void *pointer = "
>+        "0x%016" PRIxPTR ")",
>+        size, type, stride, (uintptr_t)pointer);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        VertexAttribType typePacked = FromGLenum<VertexAttribType>(type);
>+        if (context->skipValidation() ||
>+            ValidateTexCoordPointer(context, size, typePacked, stride, pointer))
>+        {
>+            context->texCoordPointer(size, typePacked, stride, pointer);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY TexEnvfContextANGLE(GLeglContext ctx, GLenum target, GLenum pname, GLfloat param)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum target = 0x%X, GLenum pname = 0x%X, GLfloat param = %f)", target, pname, param);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        TextureEnvTarget targetPacked   = FromGLenum<TextureEnvTarget>(target);
>+        TextureEnvParameter pnamePacked = FromGLenum<TextureEnvParameter>(pname);
>+        if (context->skipValidation() || ValidateTexEnvf(context, targetPacked, pnamePacked, param))
>+        {
>+            context->texEnvf(targetPacked, pnamePacked, param);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY TexEnvfvContextANGLE(GLeglContext ctx,
>+                                      GLenum target,
>+                                      GLenum pname,
>+                                      const GLfloat *params)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum target = 0x%X, GLenum pname = 0x%X, const GLfloat *params = 0x%016" PRIxPTR ")",
>+          target, pname, (uintptr_t)params);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        TextureEnvTarget targetPacked   = FromGLenum<TextureEnvTarget>(target);
>+        TextureEnvParameter pnamePacked = FromGLenum<TextureEnvParameter>(pname);
>+        if (context->skipValidation() ||
>+            ValidateTexEnvfv(context, targetPacked, pnamePacked, params))
>+        {
>+            context->texEnvfv(targetPacked, pnamePacked, params);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY TexEnviContextANGLE(GLeglContext ctx, GLenum target, GLenum pname, GLint param)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum target = 0x%X, GLenum pname = 0x%X, GLint param = %d)", target, pname, param);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        TextureEnvTarget targetPacked   = FromGLenum<TextureEnvTarget>(target);
>+        TextureEnvParameter pnamePacked = FromGLenum<TextureEnvParameter>(pname);
>+        if (context->skipValidation() || ValidateTexEnvi(context, targetPacked, pnamePacked, param))
>+        {
>+            context->texEnvi(targetPacked, pnamePacked, param);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY TexEnvivContextANGLE(GLeglContext ctx,
>+                                      GLenum target,
>+                                      GLenum pname,
>+                                      const GLint *params)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum target = 0x%X, GLenum pname = 0x%X, const GLint *params = 0x%016" PRIxPTR ")",
>+          target, pname, (uintptr_t)params);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        TextureEnvTarget targetPacked   = FromGLenum<TextureEnvTarget>(target);
>+        TextureEnvParameter pnamePacked = FromGLenum<TextureEnvParameter>(pname);
>+        if (context->skipValidation() ||
>+            ValidateTexEnviv(context, targetPacked, pnamePacked, params))
>+        {
>+            context->texEnviv(targetPacked, pnamePacked, params);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY TexEnvxContextANGLE(GLeglContext ctx, GLenum target, GLenum pname, GLfixed param)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum target = 0x%X, GLenum pname = 0x%X, GLfixed param = 0x%X)", target, pname,
>+          param);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        TextureEnvTarget targetPacked   = FromGLenum<TextureEnvTarget>(target);
>+        TextureEnvParameter pnamePacked = FromGLenum<TextureEnvParameter>(pname);
>+        if (context->skipValidation() || ValidateTexEnvx(context, targetPacked, pnamePacked, param))
>+        {
>+            context->texEnvx(targetPacked, pnamePacked, param);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY TexEnvxvContextANGLE(GLeglContext ctx,
>+                                      GLenum target,
>+                                      GLenum pname,
>+                                      const GLfixed *params)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum target = 0x%X, GLenum pname = 0x%X, const GLfixed *params = 0x%016" PRIxPTR ")",
>+          target, pname, (uintptr_t)params);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        TextureEnvTarget targetPacked   = FromGLenum<TextureEnvTarget>(target);
>+        TextureEnvParameter pnamePacked = FromGLenum<TextureEnvParameter>(pname);
>+        if (context->skipValidation() ||
>+            ValidateTexEnvxv(context, targetPacked, pnamePacked, params))
>+        {
>+            context->texEnvxv(targetPacked, pnamePacked, params);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY TexGenfOESContextANGLE(GLeglContext ctx, GLenum coord, GLenum pname, GLfloat param)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum coord = 0x%X, GLenum pname = 0x%X, GLfloat param = %f)", coord, pname, param);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateTexGenfOES(context, coord, pname, param))
>+        {
>+            context->texGenf(coord, pname, param);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY TexGenfvOESContextANGLE(GLeglContext ctx,
>+                                         GLenum coord,
>+                                         GLenum pname,
>+                                         const GLfloat *params)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum coord = 0x%X, GLenum pname = 0x%X, const GLfloat *params = 0x%016" PRIxPTR ")",
>+          coord, pname, (uintptr_t)params);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateTexGenfvOES(context, coord, pname, params))
>+        {
>+            context->texGenfv(coord, pname, params);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY TexGeniOESContextANGLE(GLeglContext ctx, GLenum coord, GLenum pname, GLint param)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum coord = 0x%X, GLenum pname = 0x%X, GLint param = %d)", coord, pname, param);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateTexGeniOES(context, coord, pname, param))
>+        {
>+            context->texGeni(coord, pname, param);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY TexGenivOESContextANGLE(GLeglContext ctx,
>+                                         GLenum coord,
>+                                         GLenum pname,
>+                                         const GLint *params)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum coord = 0x%X, GLenum pname = 0x%X, const GLint *params = 0x%016" PRIxPTR ")",
>+          coord, pname, (uintptr_t)params);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateTexGenivOES(context, coord, pname, params))
>+        {
>+            context->texGeniv(coord, pname, params);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY TexGenxOESContextANGLE(GLeglContext ctx, GLenum coord, GLenum pname, GLfixed param)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum coord = 0x%X, GLenum pname = 0x%X, GLfixed param = 0x%X)", coord, pname, param);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateTexGenxOES(context, coord, pname, param))
>+        {
>+            context->texGenx(coord, pname, param);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY TexGenxvOESContextANGLE(GLeglContext ctx,
>+                                         GLenum coord,
>+                                         GLenum pname,
>+                                         const GLfixed *params)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum coord = 0x%X, GLenum pname = 0x%X, const GLfixed *params = 0x%016" PRIxPTR ")",
>+          coord, pname, (uintptr_t)params);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateTexGenxvOES(context, coord, pname, params))
>+        {
>+            context->texGenxv(coord, pname, params);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY TexImage2DContextANGLE(GLeglContext ctx,
>+                                        GLenum target,
>+                                        GLint level,
>+                                        GLint internalformat,
>+                                        GLsizei width,
>+                                        GLsizei height,
>+                                        GLint border,
>+                                        GLenum format,
>+                                        GLenum type,
>+                                        const void *pixels)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLenum target = 0x%X, GLint level = %d, GLint internalformat = %d, GLsizei width = %d, "
>+        "GLsizei height = %d, GLint border = %d, GLenum format = 0x%X, GLenum type = 0x%X, const "
>+        "void *pixels = 0x%016" PRIxPTR ")",
>+        target, level, internalformat, width, height, border, format, type, (uintptr_t)pixels);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        TextureTarget targetPacked = FromGLenum<TextureTarget>(target);
>+        if (context->skipValidation() ||
>+            ValidateTexImage2D(context, targetPacked, level, internalformat, width, height, border,
>+                               format, type, pixels))
>+        {
>+            context->texImage2D(targetPacked, level, internalformat, width, height, border, format,
>+                                type, pixels);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY TexImage3DContextANGLE(GLeglContext ctx,
>+                                        GLenum target,
>+                                        GLint level,
>+                                        GLint internalformat,
>+                                        GLsizei width,
>+                                        GLsizei height,
>+                                        GLsizei depth,
>+                                        GLint border,
>+                                        GLenum format,
>+                                        GLenum type,
>+                                        const void *pixels)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLenum target = 0x%X, GLint level = %d, GLint internalformat = %d, GLsizei width = %d, "
>+        "GLsizei height = %d, GLsizei depth = %d, GLint border = %d, GLenum format = 0x%X, GLenum "
>+        "type = 0x%X, const void *pixels = 0x%016" PRIxPTR ")",
>+        target, level, internalformat, width, height, depth, border, format, type,
>+        (uintptr_t)pixels);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        TextureTarget targetPacked = FromGLenum<TextureTarget>(target);
>+        if (context->skipValidation() ||
>+            ValidateTexImage3D(context, targetPacked, level, internalformat, width, height, depth,
>+                               border, format, type, pixels))
>+        {
>+            context->texImage3D(targetPacked, level, internalformat, width, height, depth, border,
>+                                format, type, pixels);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY TexParameterIivOESContextANGLE(GLeglContext ctx,
>+                                                GLenum target,
>+                                                GLenum pname,
>+                                                const GLint *params)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum target = 0x%X, GLenum pname = 0x%X, const GLint *params = 0x%016" PRIxPTR ")",
>+          target, pname, (uintptr_t)params);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        TextureType targetPacked = FromGLenum<TextureType>(target);
>+        if (context->skipValidation() ||
>+            ValidateTexParameterIivOES(context, targetPacked, pname, params))
>+        {
>+            context->texParameterIiv(targetPacked, pname, params);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY TexParameterIuivOESContextANGLE(GLeglContext ctx,
>+                                                 GLenum target,
>+                                                 GLenum pname,
>+                                                 const GLuint *params)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum target = 0x%X, GLenum pname = 0x%X, const GLuint *params = 0x%016" PRIxPTR ")",
>+          target, pname, (uintptr_t)params);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        TextureType targetPacked = FromGLenum<TextureType>(target);
>+        if (context->skipValidation() ||
>+            ValidateTexParameterIuivOES(context, targetPacked, pname, params))
>+        {
>+            context->texParameterIuiv(targetPacked, pname, params);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY TexParameterfContextANGLE(GLeglContext ctx,
>+                                           GLenum target,
>+                                           GLenum pname,
>+                                           GLfloat param)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum target = 0x%X, GLenum pname = 0x%X, GLfloat param = %f)", target, pname, param);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        TextureType targetPacked = FromGLenum<TextureType>(target);
>+        if (context->skipValidation() || ValidateTexParameterf(context, targetPacked, pname, param))
>+        {
>+            context->texParameterf(targetPacked, pname, param);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY TexParameterfvContextANGLE(GLeglContext ctx,
>+                                            GLenum target,
>+                                            GLenum pname,
>+                                            const GLfloat *params)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum target = 0x%X, GLenum pname = 0x%X, const GLfloat *params = 0x%016" PRIxPTR ")",
>+          target, pname, (uintptr_t)params);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        TextureType targetPacked = FromGLenum<TextureType>(target);
>+        if (context->skipValidation() ||
>+            ValidateTexParameterfv(context, targetPacked, pname, params))
>+        {
>+            context->texParameterfv(targetPacked, pname, params);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY TexParameteriContextANGLE(GLeglContext ctx,
>+                                           GLenum target,
>+                                           GLenum pname,
>+                                           GLint param)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum target = 0x%X, GLenum pname = 0x%X, GLint param = %d)", target, pname, param);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        TextureType targetPacked = FromGLenum<TextureType>(target);
>+        if (context->skipValidation() || ValidateTexParameteri(context, targetPacked, pname, param))
>+        {
>+            context->texParameteri(targetPacked, pname, param);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY TexParameterivContextANGLE(GLeglContext ctx,
>+                                            GLenum target,
>+                                            GLenum pname,
>+                                            const GLint *params)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum target = 0x%X, GLenum pname = 0x%X, const GLint *params = 0x%016" PRIxPTR ")",
>+          target, pname, (uintptr_t)params);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        TextureType targetPacked = FromGLenum<TextureType>(target);
>+        if (context->skipValidation() ||
>+            ValidateTexParameteriv(context, targetPacked, pname, params))
>+        {
>+            context->texParameteriv(targetPacked, pname, params);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY TexParameterxContextANGLE(GLeglContext ctx,
>+                                           GLenum target,
>+                                           GLenum pname,
>+                                           GLfixed param)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum target = 0x%X, GLenum pname = 0x%X, GLfixed param = 0x%X)", target, pname,
>+          param);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        TextureType targetPacked = FromGLenum<TextureType>(target);
>+        if (context->skipValidation() || ValidateTexParameterx(context, targetPacked, pname, param))
>+        {
>+            context->texParameterx(targetPacked, pname, param);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY TexParameterxvContextANGLE(GLeglContext ctx,
>+                                            GLenum target,
>+                                            GLenum pname,
>+                                            const GLfixed *params)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum target = 0x%X, GLenum pname = 0x%X, const GLfixed *params = 0x%016" PRIxPTR ")",
>+          target, pname, (uintptr_t)params);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        TextureType targetPacked = FromGLenum<TextureType>(target);
>+        if (context->skipValidation() ||
>+            ValidateTexParameterxv(context, targetPacked, pname, params))
>+        {
>+            context->texParameterxv(targetPacked, pname, params);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY TexStorage1DEXTContextANGLE(GLeglContext ctx,
>+                                             GLenum target,
>+                                             GLsizei levels,
>+                                             GLenum internalformat,
>+                                             GLsizei width)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLenum target = 0x%X, GLsizei levels = %d, GLenum internalformat = 0x%X, GLsizei width = "
>+        "%d)",
>+        target, levels, internalformat, width);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() ||
>+            ValidateTexStorage1DEXT(context, target, levels, internalformat, width))
>+        {
>+            context->texStorage1D(target, levels, internalformat, width);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY TexStorage2DContextANGLE(GLeglContext ctx,
>+                                          GLenum target,
>+                                          GLsizei levels,
>+                                          GLenum internalformat,
>+                                          GLsizei width,
>+                                          GLsizei height)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLenum target = 0x%X, GLsizei levels = %d, GLenum internalformat = 0x%X, GLsizei width = "
>+        "%d, GLsizei height = %d)",
>+        target, levels, internalformat, width, height);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        TextureType targetPacked = FromGLenum<TextureType>(target);
>+        if (context->skipValidation() ||
>+            ValidateTexStorage2D(context, targetPacked, levels, internalformat, width, height))
>+        {
>+            context->texStorage2D(targetPacked, levels, internalformat, width, height);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY TexStorage2DEXTContextANGLE(GLeglContext ctx,
>+                                             GLenum target,
>+                                             GLsizei levels,
>+                                             GLenum internalformat,
>+                                             GLsizei width,
>+                                             GLsizei height)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLenum target = 0x%X, GLsizei levels = %d, GLenum internalformat = 0x%X, GLsizei width = "
>+        "%d, GLsizei height = %d)",
>+        target, levels, internalformat, width, height);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        TextureType targetPacked = FromGLenum<TextureType>(target);
>+        if (context->skipValidation() ||
>+            ValidateTexStorage2DEXT(context, targetPacked, levels, internalformat, width, height))
>+        {
>+            context->texStorage2D(targetPacked, levels, internalformat, width, height);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY TexStorage2DMultisampleContextANGLE(GLeglContext ctx,
>+                                                     GLenum target,
>+                                                     GLsizei samples,
>+                                                     GLenum internalformat,
>+                                                     GLsizei width,
>+                                                     GLsizei height,
>+                                                     GLboolean fixedsamplelocations)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLenum target = 0x%X, GLsizei samples = %d, GLenum internalformat = 0x%X, GLsizei width "
>+        "= %d, GLsizei height = %d, GLboolean fixedsamplelocations = %u)",
>+        target, samples, internalformat, width, height, fixedsamplelocations);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        TextureType targetPacked = FromGLenum<TextureType>(target);
>+        if (context->skipValidation() ||
>+            ValidateTexStorage2DMultisample(context, targetPacked, samples, internalformat, width,
>+                                            height, fixedsamplelocations))
>+        {
>+            context->texStorage2DMultisample(targetPacked, samples, internalformat, width, height,
>+                                             fixedsamplelocations);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY TexStorage3DContextANGLE(GLeglContext ctx,
>+                                          GLenum target,
>+                                          GLsizei levels,
>+                                          GLenum internalformat,
>+                                          GLsizei width,
>+                                          GLsizei height,
>+                                          GLsizei depth)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLenum target = 0x%X, GLsizei levels = %d, GLenum internalformat = 0x%X, GLsizei width = "
>+        "%d, GLsizei height = %d, GLsizei depth = %d)",
>+        target, levels, internalformat, width, height, depth);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        TextureType targetPacked = FromGLenum<TextureType>(target);
>+        if (context->skipValidation() || ValidateTexStorage3D(context, targetPacked, levels,
>+                                                              internalformat, width, height, depth))
>+        {
>+            context->texStorage3D(targetPacked, levels, internalformat, width, height, depth);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY TexStorage3DEXTContextANGLE(GLeglContext ctx,
>+                                             GLenum target,
>+                                             GLsizei levels,
>+                                             GLenum internalformat,
>+                                             GLsizei width,
>+                                             GLsizei height,
>+                                             GLsizei depth)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLenum target = 0x%X, GLsizei levels = %d, GLenum internalformat = 0x%X, GLsizei width = "
>+        "%d, GLsizei height = %d, GLsizei depth = %d)",
>+        target, levels, internalformat, width, height, depth);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        TextureType targetPacked = FromGLenum<TextureType>(target);
>+        if (context->skipValidation() ||
>+            ValidateTexStorage3DEXT(context, targetPacked, levels, internalformat, width, height,
>+                                    depth))
>+        {
>+            context->texStorage3D(targetPacked, levels, internalformat, width, height, depth);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY TexStorage3DMultisampleOESContextANGLE(GLeglContext ctx,
>+                                                        GLenum target,
>+                                                        GLsizei samples,
>+                                                        GLenum internalformat,
>+                                                        GLsizei width,
>+                                                        GLsizei height,
>+                                                        GLsizei depth,
>+                                                        GLboolean fixedsamplelocations)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLenum target = 0x%X, GLsizei samples = %d, GLenum internalformat = 0x%X, GLsizei width "
>+        "= %d, GLsizei height = %d, GLsizei depth = %d, GLboolean fixedsamplelocations = %u)",
>+        target, samples, internalformat, width, height, depth, fixedsamplelocations);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        TextureType targetPacked = FromGLenum<TextureType>(target);
>+        if (context->skipValidation() ||
>+            ValidateTexStorage3DMultisampleOES(context, targetPacked, samples, internalformat,
>+                                               width, height, depth, fixedsamplelocations))
>+        {
>+            context->texStorage3DMultisample(targetPacked, samples, internalformat, width, height,
>+                                             depth, fixedsamplelocations);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY TexStorageMem2DEXTContextANGLE(GLeglContext ctx,
>+                                                GLenum target,
>+                                                GLsizei levels,
>+                                                GLenum internalFormat,
>+                                                GLsizei width,
>+                                                GLsizei height,
>+                                                GLuint memory,
>+                                                GLuint64 offset)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLenum target = 0x%X, GLsizei levels = %d, GLenum internalFormat = 0x%X, GLsizei width = "
>+        "%d, GLsizei height = %d, GLuint memory = %u, GLuint64 offset = %llu)",
>+        target, levels, internalFormat, width, height, memory,
>+        static_cast<unsigned long long>(offset));
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        TextureType targetPacked = FromGLenum<TextureType>(target);
>+        if (context->skipValidation() ||
>+            ValidateTexStorageMem2DEXT(context, targetPacked, levels, internalFormat, width, height,
>+                                       memory, offset))
>+        {
>+            context->texStorageMem2D(targetPacked, levels, internalFormat, width, height, memory,
>+                                     offset);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY TexStorageMem2DMultisampleEXTContextANGLE(GLeglContext ctx,
>+                                                           GLenum target,
>+                                                           GLsizei samples,
>+                                                           GLenum internalFormat,
>+                                                           GLsizei width,
>+                                                           GLsizei height,
>+                                                           GLboolean fixedSampleLocations,
>+                                                           GLuint memory,
>+                                                           GLuint64 offset)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLenum target = 0x%X, GLsizei samples = %d, GLenum internalFormat = 0x%X, GLsizei width "
>+        "= %d, GLsizei height = %d, GLboolean fixedSampleLocations = %u, GLuint memory = %u, "
>+        "GLuint64 offset = %llu)",
>+        target, samples, internalFormat, width, height, fixedSampleLocations, memory,
>+        static_cast<unsigned long long>(offset));
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        TextureType targetPacked = FromGLenum<TextureType>(target);
>+        if (context->skipValidation() || ValidateTexStorageMem2DMultisampleEXT(
>+                                             context, targetPacked, samples, internalFormat, width,
>+                                             height, fixedSampleLocations, memory, offset))
>+        {
>+            context->texStorageMem2DMultisample(targetPacked, samples, internalFormat, width,
>+                                                height, fixedSampleLocations, memory, offset);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY TexStorageMem3DEXTContextANGLE(GLeglContext ctx,
>+                                                GLenum target,
>+                                                GLsizei levels,
>+                                                GLenum internalFormat,
>+                                                GLsizei width,
>+                                                GLsizei height,
>+                                                GLsizei depth,
>+                                                GLuint memory,
>+                                                GLuint64 offset)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLenum target = 0x%X, GLsizei levels = %d, GLenum internalFormat = 0x%X, GLsizei width = "
>+        "%d, GLsizei height = %d, GLsizei depth = %d, GLuint memory = %u, GLuint64 offset = %llu)",
>+        target, levels, internalFormat, width, height, depth, memory,
>+        static_cast<unsigned long long>(offset));
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        TextureType targetPacked = FromGLenum<TextureType>(target);
>+        if (context->skipValidation() ||
>+            ValidateTexStorageMem3DEXT(context, targetPacked, levels, internalFormat, width, height,
>+                                       depth, memory, offset))
>+        {
>+            context->texStorageMem3D(targetPacked, levels, internalFormat, width, height, depth,
>+                                     memory, offset);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY TexStorageMem3DMultisampleEXTContextANGLE(GLeglContext ctx,
>+                                                           GLenum target,
>+                                                           GLsizei samples,
>+                                                           GLenum internalFormat,
>+                                                           GLsizei width,
>+                                                           GLsizei height,
>+                                                           GLsizei depth,
>+                                                           GLboolean fixedSampleLocations,
>+                                                           GLuint memory,
>+                                                           GLuint64 offset)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLenum target = 0x%X, GLsizei samples = %d, GLenum internalFormat = 0x%X, GLsizei width "
>+        "= %d, GLsizei height = %d, GLsizei depth = %d, GLboolean fixedSampleLocations = %u, "
>+        "GLuint memory = %u, GLuint64 offset = %llu)",
>+        target, samples, internalFormat, width, height, depth, fixedSampleLocations, memory,
>+        static_cast<unsigned long long>(offset));
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        TextureType targetPacked = FromGLenum<TextureType>(target);
>+        if (context->skipValidation() || ValidateTexStorageMem3DMultisampleEXT(
>+                                             context, targetPacked, samples, internalFormat, width,
>+                                             height, depth, fixedSampleLocations, memory, offset))
>+        {
>+            context->texStorageMem3DMultisample(targetPacked, samples, internalFormat, width,
>+                                                height, depth, fixedSampleLocations, memory,
>+                                                offset);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY TexSubImage2DContextANGLE(GLeglContext ctx,
>+                                           GLenum target,
>+                                           GLint level,
>+                                           GLint xoffset,
>+                                           GLint yoffset,
>+                                           GLsizei width,
>+                                           GLsizei height,
>+                                           GLenum format,
>+                                           GLenum type,
>+                                           const void *pixels)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLenum target = 0x%X, GLint level = %d, GLint xoffset = %d, GLint yoffset = %d, GLsizei "
>+        "width = %d, GLsizei height = %d, GLenum format = 0x%X, GLenum type = 0x%X, const void "
>+        "*pixels = 0x%016" PRIxPTR ")",
>+        target, level, xoffset, yoffset, width, height, format, type, (uintptr_t)pixels);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        TextureTarget targetPacked = FromGLenum<TextureTarget>(target);
>+        if (context->skipValidation() ||
>+            ValidateTexSubImage2D(context, targetPacked, level, xoffset, yoffset, width, height,
>+                                  format, type, pixels))
>+        {
>+            context->texSubImage2D(targetPacked, level, xoffset, yoffset, width, height, format,
>+                                   type, pixels);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY TexSubImage3DContextANGLE(GLeglContext ctx,
>+                                           GLenum target,
>+                                           GLint level,
>+                                           GLint xoffset,
>+                                           GLint yoffset,
>+                                           GLint zoffset,
>+                                           GLsizei width,
>+                                           GLsizei height,
>+                                           GLsizei depth,
>+                                           GLenum format,
>+                                           GLenum type,
>+                                           const void *pixels)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLenum target = 0x%X, GLint level = %d, GLint xoffset = %d, GLint yoffset = %d, GLint "
>+        "zoffset = %d, GLsizei width = %d, GLsizei height = %d, GLsizei depth = %d, GLenum format "
>+        "= 0x%X, GLenum type = 0x%X, const void *pixels = 0x%016" PRIxPTR ")",
>+        target, level, xoffset, yoffset, zoffset, width, height, depth, format, type,
>+        (uintptr_t)pixels);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        TextureTarget targetPacked = FromGLenum<TextureTarget>(target);
>+        if (context->skipValidation() ||
>+            ValidateTexSubImage3D(context, targetPacked, level, xoffset, yoffset, zoffset, width,
>+                                  height, depth, format, type, pixels))
>+        {
>+            context->texSubImage3D(targetPacked, level, xoffset, yoffset, zoffset, width, height,
>+                                   depth, format, type, pixels);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY TransformFeedbackVaryingsContextANGLE(GLeglContext ctx,
>+                                                       GLuint program,
>+                                                       GLsizei count,
>+                                                       const GLchar *const *varyings,
>+                                                       GLenum bufferMode)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint program = %u, GLsizei count = %d, const GLchar *const*varyings = 0x%016" PRIxPTR
>+          ", GLenum bufferMode = 0x%X)",
>+          program, count, (uintptr_t)varyings, bufferMode);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() ||
>+            ValidateTransformFeedbackVaryings(context, program, count, varyings, bufferMode))
>+        {
>+            context->transformFeedbackVaryings(program, count, varyings, bufferMode);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY TranslatefContextANGLE(GLeglContext ctx, GLfloat x, GLfloat y, GLfloat z)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLfloat x = %f, GLfloat y = %f, GLfloat z = %f)", x, y, z);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateTranslatef(context, x, y, z))
>+        {
>+            context->translatef(x, y, z);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY TranslatexContextANGLE(GLeglContext ctx, GLfixed x, GLfixed y, GLfixed z)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLfixed x = 0x%X, GLfixed y = 0x%X, GLfixed z = 0x%X)", x, y, z);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateTranslatex(context, x, y, z))
>+        {
>+            context->translatex(x, y, z);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY Uniform1fContextANGLE(GLeglContext ctx, GLint location, GLfloat v0)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLint location = %d, GLfloat v0 = %f)", location, v0);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateUniform1f(context, location, v0))
>+        {
>+            context->uniform1f(location, v0);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY Uniform1fvContextANGLE(GLeglContext ctx,
>+                                        GLint location,
>+                                        GLsizei count,
>+                                        const GLfloat *value)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLint location = %d, GLsizei count = %d, const GLfloat *value = 0x%016" PRIxPTR ")",
>+          location, count, (uintptr_t)value);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateUniform1fv(context, location, count, value))
>+        {
>+            context->uniform1fv(location, count, value);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY Uniform1iContextANGLE(GLeglContext ctx, GLint location, GLint v0)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLint location = %d, GLint v0 = %d)", location, v0);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateUniform1i(context, location, v0))
>+        {
>+            context->uniform1i(location, v0);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY Uniform1ivContextANGLE(GLeglContext ctx,
>+                                        GLint location,
>+                                        GLsizei count,
>+                                        const GLint *value)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLint location = %d, GLsizei count = %d, const GLint *value = 0x%016" PRIxPTR ")",
>+          location, count, (uintptr_t)value);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateUniform1iv(context, location, count, value))
>+        {
>+            context->uniform1iv(location, count, value);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY Uniform1uiContextANGLE(GLeglContext ctx, GLint location, GLuint v0)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLint location = %d, GLuint v0 = %u)", location, v0);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateUniform1ui(context, location, v0))
>+        {
>+            context->uniform1ui(location, v0);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY Uniform1uivContextANGLE(GLeglContext ctx,
>+                                         GLint location,
>+                                         GLsizei count,
>+                                         const GLuint *value)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLint location = %d, GLsizei count = %d, const GLuint *value = 0x%016" PRIxPTR ")",
>+          location, count, (uintptr_t)value);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateUniform1uiv(context, location, count, value))
>+        {
>+            context->uniform1uiv(location, count, value);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY Uniform2fContextANGLE(GLeglContext ctx, GLint location, GLfloat v0, GLfloat v1)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLint location = %d, GLfloat v0 = %f, GLfloat v1 = %f)", location, v0, v1);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateUniform2f(context, location, v0, v1))
>+        {
>+            context->uniform2f(location, v0, v1);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY Uniform2fvContextANGLE(GLeglContext ctx,
>+                                        GLint location,
>+                                        GLsizei count,
>+                                        const GLfloat *value)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLint location = %d, GLsizei count = %d, const GLfloat *value = 0x%016" PRIxPTR ")",
>+          location, count, (uintptr_t)value);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateUniform2fv(context, location, count, value))
>+        {
>+            context->uniform2fv(location, count, value);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY Uniform2iContextANGLE(GLeglContext ctx, GLint location, GLint v0, GLint v1)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLint location = %d, GLint v0 = %d, GLint v1 = %d)", location, v0, v1);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateUniform2i(context, location, v0, v1))
>+        {
>+            context->uniform2i(location, v0, v1);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY Uniform2ivContextANGLE(GLeglContext ctx,
>+                                        GLint location,
>+                                        GLsizei count,
>+                                        const GLint *value)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLint location = %d, GLsizei count = %d, const GLint *value = 0x%016" PRIxPTR ")",
>+          location, count, (uintptr_t)value);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateUniform2iv(context, location, count, value))
>+        {
>+            context->uniform2iv(location, count, value);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY Uniform2uiContextANGLE(GLeglContext ctx, GLint location, GLuint v0, GLuint v1)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLint location = %d, GLuint v0 = %u, GLuint v1 = %u)", location, v0, v1);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateUniform2ui(context, location, v0, v1))
>+        {
>+            context->uniform2ui(location, v0, v1);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY Uniform2uivContextANGLE(GLeglContext ctx,
>+                                         GLint location,
>+                                         GLsizei count,
>+                                         const GLuint *value)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLint location = %d, GLsizei count = %d, const GLuint *value = 0x%016" PRIxPTR ")",
>+          location, count, (uintptr_t)value);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateUniform2uiv(context, location, count, value))
>+        {
>+            context->uniform2uiv(location, count, value);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY
>+Uniform3fContextANGLE(GLeglContext ctx, GLint location, GLfloat v0, GLfloat v1, GLfloat v2)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLint location = %d, GLfloat v0 = %f, GLfloat v1 = %f, GLfloat v2 = %f)", location, v0,
>+          v1, v2);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateUniform3f(context, location, v0, v1, v2))
>+        {
>+            context->uniform3f(location, v0, v1, v2);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY Uniform3fvContextANGLE(GLeglContext ctx,
>+                                        GLint location,
>+                                        GLsizei count,
>+                                        const GLfloat *value)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLint location = %d, GLsizei count = %d, const GLfloat *value = 0x%016" PRIxPTR ")",
>+          location, count, (uintptr_t)value);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateUniform3fv(context, location, count, value))
>+        {
>+            context->uniform3fv(location, count, value);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY
>+Uniform3iContextANGLE(GLeglContext ctx, GLint location, GLint v0, GLint v1, GLint v2)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLint location = %d, GLint v0 = %d, GLint v1 = %d, GLint v2 = %d)", location, v0, v1,
>+          v2);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateUniform3i(context, location, v0, v1, v2))
>+        {
>+            context->uniform3i(location, v0, v1, v2);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY Uniform3ivContextANGLE(GLeglContext ctx,
>+                                        GLint location,
>+                                        GLsizei count,
>+                                        const GLint *value)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLint location = %d, GLsizei count = %d, const GLint *value = 0x%016" PRIxPTR ")",
>+          location, count, (uintptr_t)value);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateUniform3iv(context, location, count, value))
>+        {
>+            context->uniform3iv(location, count, value);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY
>+Uniform3uiContextANGLE(GLeglContext ctx, GLint location, GLuint v0, GLuint v1, GLuint v2)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLint location = %d, GLuint v0 = %u, GLuint v1 = %u, GLuint v2 = %u)", location, v0, v1,
>+          v2);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateUniform3ui(context, location, v0, v1, v2))
>+        {
>+            context->uniform3ui(location, v0, v1, v2);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY Uniform3uivContextANGLE(GLeglContext ctx,
>+                                         GLint location,
>+                                         GLsizei count,
>+                                         const GLuint *value)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLint location = %d, GLsizei count = %d, const GLuint *value = 0x%016" PRIxPTR ")",
>+          location, count, (uintptr_t)value);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateUniform3uiv(context, location, count, value))
>+        {
>+            context->uniform3uiv(location, count, value);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY Uniform4fContextANGLE(GLeglContext ctx,
>+                                       GLint location,
>+                                       GLfloat v0,
>+                                       GLfloat v1,
>+                                       GLfloat v2,
>+                                       GLfloat v3)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLint location = %d, GLfloat v0 = %f, GLfloat v1 = %f, GLfloat v2 = %f, GLfloat v3 = %f)",
>+        location, v0, v1, v2, v3);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateUniform4f(context, location, v0, v1, v2, v3))
>+        {
>+            context->uniform4f(location, v0, v1, v2, v3);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY Uniform4fvContextANGLE(GLeglContext ctx,
>+                                        GLint location,
>+                                        GLsizei count,
>+                                        const GLfloat *value)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLint location = %d, GLsizei count = %d, const GLfloat *value = 0x%016" PRIxPTR ")",
>+          location, count, (uintptr_t)value);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateUniform4fv(context, location, count, value))
>+        {
>+            context->uniform4fv(location, count, value);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY
>+Uniform4iContextANGLE(GLeglContext ctx, GLint location, GLint v0, GLint v1, GLint v2, GLint v3)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLint location = %d, GLint v0 = %d, GLint v1 = %d, GLint v2 = %d, GLint v3 = %d)",
>+          location, v0, v1, v2, v3);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateUniform4i(context, location, v0, v1, v2, v3))
>+        {
>+            context->uniform4i(location, v0, v1, v2, v3);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY Uniform4ivContextANGLE(GLeglContext ctx,
>+                                        GLint location,
>+                                        GLsizei count,
>+                                        const GLint *value)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLint location = %d, GLsizei count = %d, const GLint *value = 0x%016" PRIxPTR ")",
>+          location, count, (uintptr_t)value);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateUniform4iv(context, location, count, value))
>+        {
>+            context->uniform4iv(location, count, value);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY
>+Uniform4uiContextANGLE(GLeglContext ctx, GLint location, GLuint v0, GLuint v1, GLuint v2, GLuint v3)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLint location = %d, GLuint v0 = %u, GLuint v1 = %u, GLuint v2 = %u, GLuint v3 = %u)",
>+          location, v0, v1, v2, v3);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateUniform4ui(context, location, v0, v1, v2, v3))
>+        {
>+            context->uniform4ui(location, v0, v1, v2, v3);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY Uniform4uivContextANGLE(GLeglContext ctx,
>+                                         GLint location,
>+                                         GLsizei count,
>+                                         const GLuint *value)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLint location = %d, GLsizei count = %d, const GLuint *value = 0x%016" PRIxPTR ")",
>+          location, count, (uintptr_t)value);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateUniform4uiv(context, location, count, value))
>+        {
>+            context->uniform4uiv(location, count, value);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY UniformBlockBindingContextANGLE(GLeglContext ctx,
>+                                                 GLuint program,
>+                                                 GLuint uniformBlockIndex,
>+                                                 GLuint uniformBlockBinding)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint program = %u, GLuint uniformBlockIndex = %u, GLuint uniformBlockBinding = %u)",
>+          program, uniformBlockIndex, uniformBlockBinding);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() ||
>+            ValidateUniformBlockBinding(context, program, uniformBlockIndex, uniformBlockBinding))
>+        {
>+            context->uniformBlockBinding(program, uniformBlockIndex, uniformBlockBinding);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY UniformMatrix2fvContextANGLE(GLeglContext ctx,
>+                                              GLint location,
>+                                              GLsizei count,
>+                                              GLboolean transpose,
>+                                              const GLfloat *value)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLint location = %d, GLsizei count = %d, GLboolean transpose = %u, const GLfloat *value "
>+        "= 0x%016" PRIxPTR ")",
>+        location, count, transpose, (uintptr_t)value);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() ||
>+            ValidateUniformMatrix2fv(context, location, count, transpose, value))
>+        {
>+            context->uniformMatrix2fv(location, count, transpose, value);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY UniformMatrix2x3fvContextANGLE(GLeglContext ctx,
>+                                                GLint location,
>+                                                GLsizei count,
>+                                                GLboolean transpose,
>+                                                const GLfloat *value)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLint location = %d, GLsizei count = %d, GLboolean transpose = %u, const GLfloat *value "
>+        "= 0x%016" PRIxPTR ")",
>+        location, count, transpose, (uintptr_t)value);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() ||
>+            ValidateUniformMatrix2x3fv(context, location, count, transpose, value))
>+        {
>+            context->uniformMatrix2x3fv(location, count, transpose, value);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY UniformMatrix2x4fvContextANGLE(GLeglContext ctx,
>+                                                GLint location,
>+                                                GLsizei count,
>+                                                GLboolean transpose,
>+                                                const GLfloat *value)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLint location = %d, GLsizei count = %d, GLboolean transpose = %u, const GLfloat *value "
>+        "= 0x%016" PRIxPTR ")",
>+        location, count, transpose, (uintptr_t)value);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() ||
>+            ValidateUniformMatrix2x4fv(context, location, count, transpose, value))
>+        {
>+            context->uniformMatrix2x4fv(location, count, transpose, value);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY UniformMatrix3fvContextANGLE(GLeglContext ctx,
>+                                              GLint location,
>+                                              GLsizei count,
>+                                              GLboolean transpose,
>+                                              const GLfloat *value)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLint location = %d, GLsizei count = %d, GLboolean transpose = %u, const GLfloat *value "
>+        "= 0x%016" PRIxPTR ")",
>+        location, count, transpose, (uintptr_t)value);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() ||
>+            ValidateUniformMatrix3fv(context, location, count, transpose, value))
>+        {
>+            context->uniformMatrix3fv(location, count, transpose, value);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY UniformMatrix3x2fvContextANGLE(GLeglContext ctx,
>+                                                GLint location,
>+                                                GLsizei count,
>+                                                GLboolean transpose,
>+                                                const GLfloat *value)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLint location = %d, GLsizei count = %d, GLboolean transpose = %u, const GLfloat *value "
>+        "= 0x%016" PRIxPTR ")",
>+        location, count, transpose, (uintptr_t)value);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() ||
>+            ValidateUniformMatrix3x2fv(context, location, count, transpose, value))
>+        {
>+            context->uniformMatrix3x2fv(location, count, transpose, value);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY UniformMatrix3x4fvContextANGLE(GLeglContext ctx,
>+                                                GLint location,
>+                                                GLsizei count,
>+                                                GLboolean transpose,
>+                                                const GLfloat *value)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLint location = %d, GLsizei count = %d, GLboolean transpose = %u, const GLfloat *value "
>+        "= 0x%016" PRIxPTR ")",
>+        location, count, transpose, (uintptr_t)value);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() ||
>+            ValidateUniformMatrix3x4fv(context, location, count, transpose, value))
>+        {
>+            context->uniformMatrix3x4fv(location, count, transpose, value);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY UniformMatrix4fvContextANGLE(GLeglContext ctx,
>+                                              GLint location,
>+                                              GLsizei count,
>+                                              GLboolean transpose,
>+                                              const GLfloat *value)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLint location = %d, GLsizei count = %d, GLboolean transpose = %u, const GLfloat *value "
>+        "= 0x%016" PRIxPTR ")",
>+        location, count, transpose, (uintptr_t)value);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() ||
>+            ValidateUniformMatrix4fv(context, location, count, transpose, value))
>+        {
>+            context->uniformMatrix4fv(location, count, transpose, value);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY UniformMatrix4x2fvContextANGLE(GLeglContext ctx,
>+                                                GLint location,
>+                                                GLsizei count,
>+                                                GLboolean transpose,
>+                                                const GLfloat *value)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLint location = %d, GLsizei count = %d, GLboolean transpose = %u, const GLfloat *value "
>+        "= 0x%016" PRIxPTR ")",
>+        location, count, transpose, (uintptr_t)value);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() ||
>+            ValidateUniformMatrix4x2fv(context, location, count, transpose, value))
>+        {
>+            context->uniformMatrix4x2fv(location, count, transpose, value);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY UniformMatrix4x3fvContextANGLE(GLeglContext ctx,
>+                                                GLint location,
>+                                                GLsizei count,
>+                                                GLboolean transpose,
>+                                                const GLfloat *value)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLint location = %d, GLsizei count = %d, GLboolean transpose = %u, const GLfloat *value "
>+        "= 0x%016" PRIxPTR ")",
>+        location, count, transpose, (uintptr_t)value);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() ||
>+            ValidateUniformMatrix4x3fv(context, location, count, transpose, value))
>+        {
>+            context->uniformMatrix4x3fv(location, count, transpose, value);
>+        }
>+    }
>+}
>+
>+GLboolean GL_APIENTRY UnmapBufferContextANGLE(GLeglContext ctx, GLenum target)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum target = 0x%X)", target);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        BufferBinding targetPacked = FromGLenum<BufferBinding>(target);
>+        if (context->skipValidation() || ValidateUnmapBuffer(context, targetPacked))
>+        {
>+            return context->unmapBuffer(targetPacked);
>+        }
>+    }
>+
>+    return GetDefaultReturnValue<EntryPoint::UnmapBuffer, GLboolean>();
>+}
>+
>+GLboolean GL_APIENTRY UnmapBufferOESContextANGLE(GLeglContext ctx, GLenum target)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum target = 0x%X)", target);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        BufferBinding targetPacked = FromGLenum<BufferBinding>(target);
>+        if (context->skipValidation() || ValidateUnmapBufferOES(context, targetPacked))
>+        {
>+            return context->unmapBuffer(targetPacked);
>+        }
>+    }
>+
>+    return GetDefaultReturnValue<EntryPoint::UnmapBufferOES, GLboolean>();
>+}
>+
>+void GL_APIENTRY UseProgramContextANGLE(GLeglContext ctx, GLuint program)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint program = %u)", program);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateUseProgram(context, program))
>+        {
>+            context->useProgram(program);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY UseProgramStagesContextANGLE(GLeglContext ctx,
>+                                              GLuint pipeline,
>+                                              GLbitfield stages,
>+                                              GLuint program)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint pipeline = %u, GLbitfield stages = 0x%X, GLuint program = %u)", pipeline, stages,
>+          program);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() ||
>+            ValidateUseProgramStages(context, pipeline, stages, program))
>+        {
>+            context->useProgramStages(pipeline, stages, program);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY ValidateProgramContextANGLE(GLeglContext ctx, GLuint program)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint program = %u)", program);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateValidateProgram(context, program))
>+        {
>+            context->validateProgram(program);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY ValidateProgramPipelineContextANGLE(GLeglContext ctx, GLuint pipeline)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint pipeline = %u)", pipeline);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateValidateProgramPipeline(context, pipeline))
>+        {
>+            context->validateProgramPipeline(pipeline);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY VertexAttrib1fContextANGLE(GLeglContext ctx, GLuint index, GLfloat x)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint index = %u, GLfloat x = %f)", index, x);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateVertexAttrib1f(context, index, x))
>+        {
>+            context->vertexAttrib1f(index, x);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY VertexAttrib1fvContextANGLE(GLeglContext ctx, GLuint index, const GLfloat *v)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint index = %u, const GLfloat *v = 0x%016" PRIxPTR ")", index, (uintptr_t)v);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateVertexAttrib1fv(context, index, v))
>+        {
>+            context->vertexAttrib1fv(index, v);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY VertexAttrib2fContextANGLE(GLeglContext ctx, GLuint index, GLfloat x, GLfloat y)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint index = %u, GLfloat x = %f, GLfloat y = %f)", index, x, y);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateVertexAttrib2f(context, index, x, y))
>+        {
>+            context->vertexAttrib2f(index, x, y);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY VertexAttrib2fvContextANGLE(GLeglContext ctx, GLuint index, const GLfloat *v)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint index = %u, const GLfloat *v = 0x%016" PRIxPTR ")", index, (uintptr_t)v);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateVertexAttrib2fv(context, index, v))
>+        {
>+            context->vertexAttrib2fv(index, v);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY
>+VertexAttrib3fContextANGLE(GLeglContext ctx, GLuint index, GLfloat x, GLfloat y, GLfloat z)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint index = %u, GLfloat x = %f, GLfloat y = %f, GLfloat z = %f)", index, x, y, z);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateVertexAttrib3f(context, index, x, y, z))
>+        {
>+            context->vertexAttrib3f(index, x, y, z);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY VertexAttrib3fvContextANGLE(GLeglContext ctx, GLuint index, const GLfloat *v)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint index = %u, const GLfloat *v = 0x%016" PRIxPTR ")", index, (uintptr_t)v);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateVertexAttrib3fv(context, index, v))
>+        {
>+            context->vertexAttrib3fv(index, v);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY VertexAttrib4fContextANGLE(GLeglContext ctx,
>+                                            GLuint index,
>+                                            GLfloat x,
>+                                            GLfloat y,
>+                                            GLfloat z,
>+                                            GLfloat w)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint index = %u, GLfloat x = %f, GLfloat y = %f, GLfloat z = %f, GLfloat w = %f)",
>+          index, x, y, z, w);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateVertexAttrib4f(context, index, x, y, z, w))
>+        {
>+            context->vertexAttrib4f(index, x, y, z, w);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY VertexAttrib4fvContextANGLE(GLeglContext ctx, GLuint index, const GLfloat *v)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint index = %u, const GLfloat *v = 0x%016" PRIxPTR ")", index, (uintptr_t)v);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateVertexAttrib4fv(context, index, v))
>+        {
>+            context->vertexAttrib4fv(index, v);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY VertexAttribBindingContextANGLE(GLeglContext ctx,
>+                                                 GLuint attribindex,
>+                                                 GLuint bindingindex)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint attribindex = %u, GLuint bindingindex = %u)", attribindex, bindingindex);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() ||
>+            ValidateVertexAttribBinding(context, attribindex, bindingindex))
>+        {
>+            context->vertexAttribBinding(attribindex, bindingindex);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY VertexAttribDivisorContextANGLE(GLeglContext ctx, GLuint index, GLuint divisor)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint index = %u, GLuint divisor = %u)", index, divisor);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateVertexAttribDivisor(context, index, divisor))
>+        {
>+            context->vertexAttribDivisor(index, divisor);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY VertexAttribDivisorANGLEContextANGLE(GLeglContext ctx,
>+                                                      GLuint index,
>+                                                      GLuint divisor)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint index = %u, GLuint divisor = %u)", index, divisor);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateVertexAttribDivisorANGLE(context, index, divisor))
>+        {
>+            context->vertexAttribDivisor(index, divisor);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY VertexAttribDivisorEXTContextANGLE(GLeglContext ctx, GLuint index, GLuint divisor)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint index = %u, GLuint divisor = %u)", index, divisor);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateVertexAttribDivisorEXT(context, index, divisor))
>+        {
>+            context->vertexAttribDivisor(index, divisor);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY VertexAttribFormatContextANGLE(GLeglContext ctx,
>+                                                GLuint attribindex,
>+                                                GLint size,
>+                                                GLenum type,
>+                                                GLboolean normalized,
>+                                                GLuint relativeoffset)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLuint attribindex = %u, GLint size = %d, GLenum type = 0x%X, GLboolean normalized = %u, "
>+        "GLuint relativeoffset = %u)",
>+        attribindex, size, type, normalized, relativeoffset);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        VertexAttribType typePacked = FromGLenum<VertexAttribType>(type);
>+        if (context->skipValidation() ||
>+            ValidateVertexAttribFormat(context, attribindex, size, typePacked, normalized,
>+                                       relativeoffset))
>+        {
>+            context->vertexAttribFormat(attribindex, size, typePacked, normalized, relativeoffset);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY
>+VertexAttribI4iContextANGLE(GLeglContext ctx, GLuint index, GLint x, GLint y, GLint z, GLint w)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint index = %u, GLint x = %d, GLint y = %d, GLint z = %d, GLint w = %d)", index, x,
>+          y, z, w);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateVertexAttribI4i(context, index, x, y, z, w))
>+        {
>+            context->vertexAttribI4i(index, x, y, z, w);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY VertexAttribI4ivContextANGLE(GLeglContext ctx, GLuint index, const GLint *v)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint index = %u, const GLint *v = 0x%016" PRIxPTR ")", index, (uintptr_t)v);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateVertexAttribI4iv(context, index, v))
>+        {
>+            context->vertexAttribI4iv(index, v);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY
>+VertexAttribI4uiContextANGLE(GLeglContext ctx, GLuint index, GLuint x, GLuint y, GLuint z, GLuint w)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint index = %u, GLuint x = %u, GLuint y = %u, GLuint z = %u, GLuint w = %u)", index,
>+          x, y, z, w);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateVertexAttribI4ui(context, index, x, y, z, w))
>+        {
>+            context->vertexAttribI4ui(index, x, y, z, w);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY VertexAttribI4uivContextANGLE(GLeglContext ctx, GLuint index, const GLuint *v)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint index = %u, const GLuint *v = 0x%016" PRIxPTR ")", index, (uintptr_t)v);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateVertexAttribI4uiv(context, index, v))
>+        {
>+            context->vertexAttribI4uiv(index, v);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY VertexAttribIFormatContextANGLE(GLeglContext ctx,
>+                                                 GLuint attribindex,
>+                                                 GLint size,
>+                                                 GLenum type,
>+                                                 GLuint relativeoffset)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLuint attribindex = %u, GLint size = %d, GLenum type = 0x%X, GLuint relativeoffset = "
>+        "%u)",
>+        attribindex, size, type, relativeoffset);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        VertexAttribType typePacked = FromGLenum<VertexAttribType>(type);
>+        if (context->skipValidation() ||
>+            ValidateVertexAttribIFormat(context, attribindex, size, typePacked, relativeoffset))
>+        {
>+            context->vertexAttribIFormat(attribindex, size, typePacked, relativeoffset);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY VertexAttribIPointerContextANGLE(GLeglContext ctx,
>+                                                  GLuint index,
>+                                                  GLint size,
>+                                                  GLenum type,
>+                                                  GLsizei stride,
>+                                                  const void *pointer)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLuint index = %u, GLint size = %d, GLenum type = 0x%X, GLsizei stride = %d, const void "
>+        "*pointer = 0x%016" PRIxPTR ")",
>+        index, size, type, stride, (uintptr_t)pointer);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        VertexAttribType typePacked = FromGLenum<VertexAttribType>(type);
>+        if (context->skipValidation() ||
>+            ValidateVertexAttribIPointer(context, index, size, typePacked, stride, pointer))
>+        {
>+            context->vertexAttribIPointer(index, size, typePacked, stride, pointer);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY VertexAttribPointerContextANGLE(GLeglContext ctx,
>+                                                 GLuint index,
>+                                                 GLint size,
>+                                                 GLenum type,
>+                                                 GLboolean normalized,
>+                                                 GLsizei stride,
>+                                                 const void *pointer)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLuint index = %u, GLint size = %d, GLenum type = 0x%X, GLboolean normalized = %u, "
>+        "GLsizei stride = %d, const void *pointer = 0x%016" PRIxPTR ")",
>+        index, size, type, normalized, stride, (uintptr_t)pointer);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        VertexAttribType typePacked = FromGLenum<VertexAttribType>(type);
>+        if (context->skipValidation() ||
>+            ValidateVertexAttribPointer(context, index, size, typePacked, normalized, stride,
>+                                        pointer))
>+        {
>+            context->vertexAttribPointer(index, size, typePacked, normalized, stride, pointer);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY VertexBindingDivisorContextANGLE(GLeglContext ctx,
>+                                                  GLuint bindingindex,
>+                                                  GLuint divisor)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint bindingindex = %u, GLuint divisor = %u)", bindingindex, divisor);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() ||
>+            ValidateVertexBindingDivisor(context, bindingindex, divisor))
>+        {
>+            context->vertexBindingDivisor(bindingindex, divisor);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY VertexPointerContextANGLE(GLeglContext ctx,
>+                                           GLint size,
>+                                           GLenum type,
>+                                           GLsizei stride,
>+                                           const void *pointer)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLint size = %d, GLenum type = 0x%X, GLsizei stride = %d, const void *pointer = "
>+        "0x%016" PRIxPTR ")",
>+        size, type, stride, (uintptr_t)pointer);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        VertexAttribType typePacked = FromGLenum<VertexAttribType>(type);
>+        if (context->skipValidation() ||
>+            ValidateVertexPointer(context, size, typePacked, stride, pointer))
>+        {
>+            context->vertexPointer(size, typePacked, stride, pointer);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY
>+ViewportContextANGLE(GLeglContext ctx, GLint x, GLint y, GLsizei width, GLsizei height)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLint x = %d, GLint y = %d, GLsizei width = %d, GLsizei height = %d)", x, y, width,
>+          height);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateViewport(context, x, y, width, height))
>+        {
>+            context->viewport(x, y, width, height);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY WaitSemaphoreEXTContextANGLE(GLeglContext ctx,
>+                                              GLuint semaphore,
>+                                              GLuint numBufferBarriers,
>+                                              const GLuint *buffers,
>+                                              GLuint numTextureBarriers,
>+                                              const GLuint *textures,
>+                                              const GLenum *srcLayouts)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLuint semaphore = %u, GLuint numBufferBarriers = %u, const GLuint *buffers = "
>+        "0x%016" PRIxPTR ", GLuint numTextureBarriers = %u, const GLuint *textures = 0x%016" PRIxPTR
>+        ", const GLenum *srcLayouts = 0x%016" PRIxPTR ")",
>+        semaphore, numBufferBarriers, (uintptr_t)buffers, numTextureBarriers, (uintptr_t)textures,
>+        (uintptr_t)srcLayouts);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() ||
>+            ValidateWaitSemaphoreEXT(context, semaphore, numBufferBarriers, buffers,
>+                                     numTextureBarriers, textures, srcLayouts))
>+        {
>+            context->waitSemaphore(semaphore, numBufferBarriers, buffers, numTextureBarriers,
>+                                   textures, srcLayouts);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY WaitSyncContextANGLE(GLeglContext ctx,
>+                                      GLsync sync,
>+                                      GLbitfield flags,
>+                                      GLuint64 timeout)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLsync sync = 0x%016" PRIxPTR ", GLbitfield flags = 0x%X, GLuint64 timeout = %llu)",
>+          (uintptr_t)sync, flags, static_cast<unsigned long long>(timeout));
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateWaitSync(context, sync, flags, timeout))
>+        {
>+            context->waitSync(sync, flags, timeout);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY WeightPointerOESContextANGLE(GLeglContext ctx,
>+                                              GLint size,
>+                                              GLenum type,
>+                                              GLsizei stride,
>+                                              const void *pointer)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLint size = %d, GLenum type = 0x%X, GLsizei stride = %d, const void *pointer = "
>+        "0x%016" PRIxPTR ")",
>+        size, type, stride, (uintptr_t)pointer);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() ||
>+            ValidateWeightPointerOES(context, size, type, stride, pointer))
>+        {
>+            context->weightPointer(size, type, stride, pointer);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY BindUniformLocationCHROMIUMContextANGLE(GLeglContext ctx,
>+                                                         GLuint program,
>+                                                         GLint location,
>+                                                         const GLchar *name)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint program = %u, GLint location = %d, const GLchar* name = 0x%016" PRIxPTR ")",
>+          program, location, (uintptr_t)name);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() ||
>+            ValidateBindUniformLocationCHROMIUM(context, program, location, name))
>+        {
>+            context->bindUniformLocation(program, location, name);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY CoverageModulationCHROMIUMContextANGLE(GLeglContext ctx, GLenum components)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum components = 0x%X)", components);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateCoverageModulationCHROMIUM(context, components))
>+        {
>+            context->coverageModulation(components);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY MatrixLoadfCHROMIUMContextANGLE(GLeglContext ctx,
>+                                                 GLenum matrixMode,
>+                                                 const GLfloat *matrix)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum matrixMode = 0x%X, const GLfloat * matrix = 0x%016" PRIxPTR ")", matrixMode,
>+          (uintptr_t)matrix);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateMatrixLoadfCHROMIUM(context, matrixMode, matrix))
>+        {
>+            context->matrixLoadf(matrixMode, matrix);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY MatrixLoadIdentityCHROMIUMContextANGLE(GLeglContext ctx, GLenum matrixMode)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum matrixMode = 0x%X)", matrixMode);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateMatrixLoadIdentityCHROMIUM(context, matrixMode))
>+        {
>+            context->matrixLoadIdentity(matrixMode);
>+        }
>+    }
>+}
>+
>+GLuint GL_APIENTRY GenPathsCHROMIUMContextANGLE(GLeglContext ctx, GLsizei range)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLsizei range = %d)", range);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateGenPathsCHROMIUM(context, range))
>+        {
>+            return context->genPaths(range);
>+        }
>+    }
>+
>+    return GetDefaultReturnValue<EntryPoint::GenPathsCHROMIUM, GLuint>();
>+}
>+
>+void GL_APIENTRY DeletePathsCHROMIUMContextANGLE(GLeglContext ctx, GLuint first, GLsizei range)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint first = %u, GLsizei range = %d)", first, range);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateDeletePathsCHROMIUM(context, first, range))
>+        {
>+            context->deletePaths(first, range);
>+        }
>+    }
>+}
>+
>+GLboolean GL_APIENTRY IsPathCHROMIUMContextANGLE(GLeglContext ctx, GLuint path)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint path = %u)", path);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateIsPathCHROMIUM(context, path))
>+        {
>+            return context->isPath(path);
>+        }
>+    }
>+
>+    return GetDefaultReturnValue<EntryPoint::IsPathCHROMIUM, GLboolean>();
>+}
>+
>+void GL_APIENTRY PathCommandsCHROMIUMContextANGLE(GLeglContext ctx,
>+                                                  GLuint path,
>+                                                  GLsizei numCommands,
>+                                                  const GLubyte *commands,
>+                                                  GLsizei numCoords,
>+                                                  GLenum coordType,
>+                                                  const void *coords)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint path = %u, GLsizei numCommands = %d, const GLubyte * commands = 0x%016" PRIxPTR
>+          ", GLsizei numCoords = %d, GLenum coordType = 0x%X, const void* coords = 0x%016" PRIxPTR
>+          ")",
>+          path, numCommands, (uintptr_t)commands, numCoords, coordType, (uintptr_t)coords);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() ||
>+            ValidatePathCommandsCHROMIUM(context, path, numCommands, commands, numCoords, coordType,
>+                                         coords))
>+        {
>+            context->pathCommands(path, numCommands, commands, numCoords, coordType, coords);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY PathParameterfCHROMIUMContextANGLE(GLeglContext ctx,
>+                                                    GLuint path,
>+                                                    GLenum pname,
>+                                                    GLfloat value)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint path = %u, GLenum pname = 0x%X, GLfloat value = %f)", path, pname, value);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() ||
>+            ValidatePathParameterfCHROMIUM(context, path, pname, value))
>+        {
>+            context->pathParameterf(path, pname, value);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY PathParameteriCHROMIUMContextANGLE(GLeglContext ctx,
>+                                                    GLuint path,
>+                                                    GLenum pname,
>+                                                    GLint value)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint path = %u, GLenum pname = 0x%X, GLint value = %d)", path, pname, value);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() ||
>+            ValidatePathParameteriCHROMIUM(context, path, pname, value))
>+        {
>+            context->pathParameteri(path, pname, value);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY GetPathParameterfvCHROMIUMContextANGLE(GLeglContext ctx,
>+                                                        GLuint path,
>+                                                        GLenum pname,
>+                                                        GLfloat *value)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint path = %u, GLenum pname = 0x%X, GLfloat * value = 0x%016" PRIxPTR ")", path,
>+          pname, (uintptr_t)value);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() ||
>+            ValidateGetPathParameterfvCHROMIUM(context, path, pname, value))
>+        {
>+            context->getPathParameterfv(path, pname, value);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY GetPathParameterivCHROMIUMContextANGLE(GLeglContext ctx,
>+                                                        GLuint path,
>+                                                        GLenum pname,
>+                                                        GLint *value)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint path = %u, GLenum pname = 0x%X, GLint * value = 0x%016" PRIxPTR ")", path, pname,
>+          (uintptr_t)value);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() ||
>+            ValidateGetPathParameterivCHROMIUM(context, path, pname, value))
>+        {
>+            context->getPathParameteriv(path, pname, value);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY PathStencilFuncCHROMIUMContextANGLE(GLeglContext ctx,
>+                                                     GLenum func,
>+                                                     GLint ref,
>+                                                     GLuint mask)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum func = 0x%X, GLint ref = %d, GLuint mask = %u)", func, ref, mask);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidatePathStencilFuncCHROMIUM(context, func, ref, mask))
>+        {
>+            context->pathStencilFunc(func, ref, mask);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY StencilFillPathCHROMIUMContextANGLE(GLeglContext ctx,
>+                                                     GLuint path,
>+                                                     GLenum fillMode,
>+                                                     GLuint mask)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint path = %u, GLenum fillMode = 0x%X, GLuint mask = %u)", path, fillMode, mask);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() ||
>+            ValidateStencilFillPathCHROMIUM(context, path, fillMode, mask))
>+        {
>+            context->stencilFillPath(path, fillMode, mask);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY StencilStrokePathCHROMIUMContextANGLE(GLeglContext ctx,
>+                                                       GLuint path,
>+                                                       GLint reference,
>+                                                       GLuint mask)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint path = %u, GLint reference = %d, GLuint mask = %u)", path, reference, mask);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() ||
>+            ValidateStencilStrokePathCHROMIUM(context, path, reference, mask))
>+        {
>+            context->stencilStrokePath(path, reference, mask);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY CoverFillPathCHROMIUMContextANGLE(GLeglContext ctx, GLuint path, GLenum coverMode)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint path = %u, GLenum coverMode = 0x%X)", path, coverMode);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateCoverFillPathCHROMIUM(context, path, coverMode))
>+        {
>+            context->coverFillPath(path, coverMode);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY CoverStrokePathCHROMIUMContextANGLE(GLeglContext ctx,
>+                                                     GLuint path,
>+                                                     GLenum coverMode)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint path = %u, GLenum coverMode = 0x%X)", path, coverMode);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateCoverStrokePathCHROMIUM(context, path, coverMode))
>+        {
>+            context->coverStrokePath(path, coverMode);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY StencilThenCoverFillPathCHROMIUMContextANGLE(GLeglContext ctx,
>+                                                              GLuint path,
>+                                                              GLenum fillMode,
>+                                                              GLuint mask,
>+                                                              GLenum coverMode)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint path = %u, GLenum fillMode = 0x%X, GLuint mask = %u, GLenum coverMode = 0x%X)",
>+          path, fillMode, mask, coverMode);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() ||
>+            ValidateStencilThenCoverFillPathCHROMIUM(context, path, fillMode, mask, coverMode))
>+        {
>+            context->stencilThenCoverFillPath(path, fillMode, mask, coverMode);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY StencilThenCoverStrokePathCHROMIUMContextANGLE(GLeglContext ctx,
>+                                                                GLuint path,
>+                                                                GLint reference,
>+                                                                GLuint mask,
>+                                                                GLenum coverMode)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint path = %u, GLint reference = %d, GLuint mask = %u, GLenum coverMode = 0x%X)",
>+          path, reference, mask, coverMode);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() ||
>+            ValidateStencilThenCoverStrokePathCHROMIUM(context, path, reference, mask, coverMode))
>+        {
>+            context->stencilThenCoverStrokePath(path, reference, mask, coverMode);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY CoverFillPathInstancedCHROMIUMContextANGLE(GLeglContext ctx,
>+                                                            GLsizei numPath,
>+                                                            GLenum pathNameType,
>+                                                            const void *paths,
>+                                                            GLuint pathBase,
>+                                                            GLenum coverMode,
>+                                                            GLenum transformType,
>+                                                            const GLfloat *transformValues)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLsizei numPath = %d, GLenum pathNameType = 0x%X, const void * paths = 0x%016" PRIxPTR
>+          ", GLuint pathBase = %u, GLenum coverMode = 0x%X, GLenum transformType = 0x%X, const "
>+          "GLfloat * transformValues = 0x%016" PRIxPTR ")",
>+          numPath, pathNameType, (uintptr_t)paths, pathBase, coverMode, transformType,
>+          (uintptr_t)transformValues);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() ||
>+            ValidateCoverFillPathInstancedCHROMIUM(context, numPath, pathNameType, paths, pathBase,
>+                                                   coverMode, transformType, transformValues))
>+        {
>+            context->coverFillPathInstanced(numPath, pathNameType, paths, pathBase, coverMode,
>+                                            transformType, transformValues);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY CoverStrokePathInstancedCHROMIUMContextANGLE(GLeglContext ctx,
>+                                                              GLsizei numPath,
>+                                                              GLenum pathNameType,
>+                                                              const void *paths,
>+                                                              GLuint pathBase,
>+                                                              GLenum coverMode,
>+                                                              GLenum transformType,
>+                                                              const GLfloat *transformValues)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLsizei numPath = %d, GLenum pathNameType = 0x%X, const void * paths = 0x%016" PRIxPTR
>+          ", GLuint pathBase = %u, GLenum coverMode = 0x%X, GLenum transformType = 0x%X, const "
>+          "GLfloat * transformValues = 0x%016" PRIxPTR ")",
>+          numPath, pathNameType, (uintptr_t)paths, pathBase, coverMode, transformType,
>+          (uintptr_t)transformValues);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateCoverStrokePathInstancedCHROMIUM(
>+                                             context, numPath, pathNameType, paths, pathBase,
>+                                             coverMode, transformType, transformValues))
>+        {
>+            context->coverStrokePathInstanced(numPath, pathNameType, paths, pathBase, coverMode,
>+                                              transformType, transformValues);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY StencilStrokePathInstancedCHROMIUMContextANGLE(GLeglContext ctx,
>+                                                                GLsizei numPath,
>+                                                                GLenum pathNameType,
>+                                                                const void *paths,
>+                                                                GLuint pathBase,
>+                                                                GLint reference,
>+                                                                GLuint mask,
>+                                                                GLenum transformType,
>+                                                                const GLfloat *transformValues)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLsizei numPath = %d, GLenum pathNameType = 0x%X, const void * paths = 0x%016" PRIxPTR
>+          ", GLuint pathBase = %u, GLint reference = %d, GLuint mask = %u, GLenum transformType = "
>+          "0x%X, const GLfloat * transformValues = 0x%016" PRIxPTR ")",
>+          numPath, pathNameType, (uintptr_t)paths, pathBase, reference, mask, transformType,
>+          (uintptr_t)transformValues);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateStencilStrokePathInstancedCHROMIUM(
>+                                             context, numPath, pathNameType, paths, pathBase,
>+                                             reference, mask, transformType, transformValues))
>+        {
>+            context->stencilStrokePathInstanced(numPath, pathNameType, paths, pathBase, reference,
>+                                                mask, transformType, transformValues);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY StencilFillPathInstancedCHROMIUMContextANGLE(GLeglContext ctx,
>+                                                              GLsizei numPaths,
>+                                                              GLenum pathNameType,
>+                                                              const void *paths,
>+                                                              GLuint pathBase,
>+                                                              GLenum fillMode,
>+                                                              GLuint mask,
>+                                                              GLenum transformType,
>+                                                              const GLfloat *transformValues)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLsizei numPaths = %d, GLenum pathNameType = 0x%X, const void * paths = 0x%016" PRIxPTR
>+          ", GLuint pathBase = %u, GLenum fillMode = 0x%X, GLuint mask = %u, GLenum transformType "
>+          "= 0x%X, const GLfloat * transformValues = 0x%016" PRIxPTR ")",
>+          numPaths, pathNameType, (uintptr_t)paths, pathBase, fillMode, mask, transformType,
>+          (uintptr_t)transformValues);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateStencilFillPathInstancedCHROMIUM(
>+                                             context, numPaths, pathNameType, paths, pathBase,
>+                                             fillMode, mask, transformType, transformValues))
>+        {
>+            context->stencilFillPathInstanced(numPaths, pathNameType, paths, pathBase, fillMode,
>+                                              mask, transformType, transformValues);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY
>+StencilThenCoverFillPathInstancedCHROMIUMContextANGLE(GLeglContext ctx,
>+                                                      GLsizei numPaths,
>+                                                      GLenum pathNameType,
>+                                                      const void *paths,
>+                                                      GLuint pathBase,
>+                                                      GLenum fillMode,
>+                                                      GLuint mask,
>+                                                      GLenum coverMode,
>+                                                      GLenum transformType,
>+                                                      const GLfloat *transformValues)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLsizei numPaths = %d, GLenum pathNameType = 0x%X, const void * paths = 0x%016" PRIxPTR
>+          ", GLuint pathBase = %u, GLenum fillMode = 0x%X, GLuint mask = %u, GLenum coverMode = "
>+          "0x%X, GLenum transformType = 0x%X, const GLfloat * transformValues = 0x%016" PRIxPTR ")",
>+          numPaths, pathNameType, (uintptr_t)paths, pathBase, fillMode, mask, coverMode,
>+          transformType, (uintptr_t)transformValues);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() ||
>+            ValidateStencilThenCoverFillPathInstancedCHROMIUM(
>+                context, numPaths, pathNameType, paths, pathBase, fillMode, mask, coverMode,
>+                transformType, transformValues))
>+        {
>+            context->stencilThenCoverFillPathInstanced(numPaths, pathNameType, paths, pathBase,
>+                                                       fillMode, mask, coverMode, transformType,
>+                                                       transformValues);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY
>+StencilThenCoverStrokePathInstancedCHROMIUMContextANGLE(GLeglContext ctx,
>+                                                        GLsizei numPaths,
>+                                                        GLenum pathNameType,
>+                                                        const void *paths,
>+                                                        GLuint pathBase,
>+                                                        GLint reference,
>+                                                        GLuint mask,
>+                                                        GLenum coverMode,
>+                                                        GLenum transformType,
>+                                                        const GLfloat *transformValues)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLsizei numPaths = %d, GLenum pathNameType = 0x%X, const void * paths = 0x%016" PRIxPTR
>+          ", GLuint pathBase = %u, GLint reference = %d, GLuint mask = %u, GLenum coverMode = "
>+          "0x%X, GLenum transformType = 0x%X, const GLfloat * transformValues = 0x%016" PRIxPTR ")",
>+          numPaths, pathNameType, (uintptr_t)paths, pathBase, reference, mask, coverMode,
>+          transformType, (uintptr_t)transformValues);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() ||
>+            ValidateStencilThenCoverStrokePathInstancedCHROMIUM(
>+                context, numPaths, pathNameType, paths, pathBase, reference, mask, coverMode,
>+                transformType, transformValues))
>+        {
>+            context->stencilThenCoverStrokePathInstanced(numPaths, pathNameType, paths, pathBase,
>+                                                         reference, mask, coverMode, transformType,
>+                                                         transformValues);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY BindFragmentInputLocationCHROMIUMContextANGLE(GLeglContext ctx,
>+                                                               GLuint programs,
>+                                                               GLint location,
>+                                                               const GLchar *name)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint programs = %u, GLint location = %d, const GLchar * name = 0x%016" PRIxPTR ")",
>+          programs, location, (uintptr_t)name);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() ||
>+            ValidateBindFragmentInputLocationCHROMIUM(context, programs, location, name))
>+        {
>+            context->bindFragmentInputLocation(programs, location, name);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY ProgramPathFragmentInputGenCHROMIUMContextANGLE(GLeglContext ctx,
>+                                                                 GLuint program,
>+                                                                 GLint location,
>+                                                                 GLenum genMode,
>+                                                                 GLint components,
>+                                                                 const GLfloat *coeffs)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLuint program = %u, GLint location = %d, GLenum genMode = 0x%X, GLint components = %d, "
>+        "const GLfloat * coeffs = 0x%016" PRIxPTR ")",
>+        program, location, genMode, components, (uintptr_t)coeffs);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() ||
>+            ValidateProgramPathFragmentInputGenCHROMIUM(context, program, location, genMode,
>+                                                        components, coeffs))
>+        {
>+            context->programPathFragmentInputGen(program, location, genMode, components, coeffs);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY CopyTextureCHROMIUMContextANGLE(GLeglContext ctx,
>+                                                 GLuint sourceId,
>+                                                 GLint sourceLevel,
>+                                                 GLenum destTarget,
>+                                                 GLuint destId,
>+                                                 GLint destLevel,
>+                                                 GLint internalFormat,
>+                                                 GLenum destType,
>+                                                 GLboolean unpackFlipY,
>+                                                 GLboolean unpackPremultiplyAlpha,
>+                                                 GLboolean unpackUnmultiplyAlpha)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLuint sourceId = %u, GLint sourceLevel = %d, GLenum destTarget = 0x%X, GLuint destId = "
>+        "%u, GLint destLevel = %d, GLint internalFormat = %d, GLenum destType = 0x%X, GLboolean "
>+        "unpackFlipY = %u, GLboolean unpackPremultiplyAlpha = %u, GLboolean unpackUnmultiplyAlpha "
>+        "= %u)",
>+        sourceId, sourceLevel, destTarget, destId, destLevel, internalFormat, destType, unpackFlipY,
>+        unpackPremultiplyAlpha, unpackUnmultiplyAlpha);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        TextureTarget destTargetPacked = FromGLenum<TextureTarget>(destTarget);
>+        if (context->skipValidation() ||
>+            ValidateCopyTextureCHROMIUM(context, sourceId, sourceLevel, destTargetPacked, destId,
>+                                        destLevel, internalFormat, destType, unpackFlipY,
>+                                        unpackPremultiplyAlpha, unpackUnmultiplyAlpha))
>+        {
>+            context->copyTexture(sourceId, sourceLevel, destTargetPacked, destId, destLevel,
>+                                 internalFormat, destType, unpackFlipY, unpackPremultiplyAlpha,
>+                                 unpackUnmultiplyAlpha);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY CopySubTextureCHROMIUMContextANGLE(GLeglContext ctx,
>+                                                    GLuint sourceId,
>+                                                    GLint sourceLevel,
>+                                                    GLenum destTarget,
>+                                                    GLuint destId,
>+                                                    GLint destLevel,
>+                                                    GLint xoffset,
>+                                                    GLint yoffset,
>+                                                    GLint x,
>+                                                    GLint y,
>+                                                    GLint width,
>+                                                    GLint height,
>+                                                    GLboolean unpackFlipY,
>+                                                    GLboolean unpackPremultiplyAlpha,
>+                                                    GLboolean unpackUnmultiplyAlpha)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLuint sourceId = %u, GLint sourceLevel = %d, GLenum destTarget = 0x%X, GLuint destId = "
>+        "%u, GLint destLevel = %d, GLint xoffset = %d, GLint yoffset = %d, GLint x = %d, GLint y = "
>+        "%d, GLint width = %d, GLint height = %d, GLboolean unpackFlipY = %u, GLboolean "
>+        "unpackPremultiplyAlpha = %u, GLboolean unpackUnmultiplyAlpha = %u)",
>+        sourceId, sourceLevel, destTarget, destId, destLevel, xoffset, yoffset, x, y, width, height,
>+        unpackFlipY, unpackPremultiplyAlpha, unpackUnmultiplyAlpha);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        TextureTarget destTargetPacked = FromGLenum<TextureTarget>(destTarget);
>+        if (context->skipValidation() ||
>+            ValidateCopySubTextureCHROMIUM(context, sourceId, sourceLevel, destTargetPacked, destId,
>+                                           destLevel, xoffset, yoffset, x, y, width, height,
>+                                           unpackFlipY, unpackPremultiplyAlpha,
>+                                           unpackUnmultiplyAlpha))
>+        {
>+            context->copySubTexture(sourceId, sourceLevel, destTargetPacked, destId, destLevel,
>+                                    xoffset, yoffset, x, y, width, height, unpackFlipY,
>+                                    unpackPremultiplyAlpha, unpackUnmultiplyAlpha);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY CompressedCopyTextureCHROMIUMContextANGLE(GLeglContext ctx,
>+                                                           GLuint sourceId,
>+                                                           GLuint destId)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint sourceId = %u, GLuint destId = %u)", sourceId, destId);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() ||
>+            ValidateCompressedCopyTextureCHROMIUM(context, sourceId, destId))
>+        {
>+            context->compressedCopyTexture(sourceId, destId);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY RequestExtensionANGLEContextANGLE(GLeglContext ctx, const GLchar *name)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(const GLchar * name = 0x%016" PRIxPTR ")", (uintptr_t)name);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateRequestExtensionANGLE(context, name))
>+        {
>+            context->requestExtension(name);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY GetBooleanvRobustANGLEContextANGLE(GLeglContext ctx,
>+                                                    GLenum pname,
>+                                                    GLsizei bufSize,
>+                                                    GLsizei *length,
>+                                                    GLboolean *params)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum pname = 0x%X, GLsizei bufSize = %d, GLsizei * length = 0x%016" PRIxPTR
>+          ", GLboolean * params = 0x%016" PRIxPTR ")",
>+          pname, bufSize, (uintptr_t)length, (uintptr_t)params);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() ||
>+            ValidateGetBooleanvRobustANGLE(context, pname, bufSize, length, params))
>+        {
>+            context->getBooleanvRobust(pname, bufSize, length, params);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY GetBufferParameterivRobustANGLEContextANGLE(GLeglContext ctx,
>+                                                             GLenum target,
>+                                                             GLenum pname,
>+                                                             GLsizei bufSize,
>+                                                             GLsizei *length,
>+                                                             GLint *params)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLenum target = 0x%X, GLenum pname = 0x%X, GLsizei bufSize = %d, GLsizei * length = "
>+        "0x%016" PRIxPTR ", GLint * params = 0x%016" PRIxPTR ")",
>+        target, pname, bufSize, (uintptr_t)length, (uintptr_t)params);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        BufferBinding targetPacked = FromGLenum<BufferBinding>(target);
>+        if (context->skipValidation() || ValidateGetBufferParameterivRobustANGLE(
>+                                             context, targetPacked, pname, bufSize, length, params))
>+        {
>+            context->getBufferParameterivRobust(targetPacked, pname, bufSize, length, params);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY GetFloatvRobustANGLEContextANGLE(GLeglContext ctx,
>+                                                  GLenum pname,
>+                                                  GLsizei bufSize,
>+                                                  GLsizei *length,
>+                                                  GLfloat *params)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum pname = 0x%X, GLsizei bufSize = %d, GLsizei * length = 0x%016" PRIxPTR
>+          ", GLfloat * params = 0x%016" PRIxPTR ")",
>+          pname, bufSize, (uintptr_t)length, (uintptr_t)params);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() ||
>+            ValidateGetFloatvRobustANGLE(context, pname, bufSize, length, params))
>+        {
>+            context->getFloatvRobust(pname, bufSize, length, params);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY GetFramebufferAttachmentParameterivRobustANGLEContextANGLE(GLeglContext ctx,
>+                                                                            GLenum target,
>+                                                                            GLenum attachment,
>+                                                                            GLenum pname,
>+                                                                            GLsizei bufSize,
>+                                                                            GLsizei *length,
>+                                                                            GLint *params)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLenum target = 0x%X, GLenum attachment = 0x%X, GLenum pname = 0x%X, GLsizei bufSize = "
>+        "%d, GLsizei * length = 0x%016" PRIxPTR ", GLint * params = 0x%016" PRIxPTR ")",
>+        target, attachment, pname, bufSize, (uintptr_t)length, (uintptr_t)params);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() ||
>+            ValidateGetFramebufferAttachmentParameterivRobustANGLE(context, target, attachment,
>+                                                                   pname, bufSize, length, params))
>+        {
>+            context->getFramebufferAttachmentParameterivRobust(target, attachment, pname, bufSize,
>+                                                               length, params);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY GetIntegervRobustANGLEContextANGLE(GLeglContext ctx,
>+                                                    GLenum pname,
>+                                                    GLsizei bufSize,
>+                                                    GLsizei *length,
>+                                                    GLint *data)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum pname = 0x%X, GLsizei bufSize = %d, GLsizei * length = 0x%016" PRIxPTR
>+          ", GLint * data = 0x%016" PRIxPTR ")",
>+          pname, bufSize, (uintptr_t)length, (uintptr_t)data);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() ||
>+            ValidateGetIntegervRobustANGLE(context, pname, bufSize, length, data))
>+        {
>+            context->getIntegervRobust(pname, bufSize, length, data);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY GetProgramivRobustANGLEContextANGLE(GLeglContext ctx,
>+                                                     GLuint program,
>+                                                     GLenum pname,
>+                                                     GLsizei bufSize,
>+                                                     GLsizei *length,
>+                                                     GLint *params)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLuint program = %u, GLenum pname = 0x%X, GLsizei bufSize = %d, GLsizei * length = "
>+        "0x%016" PRIxPTR ", GLint * params = 0x%016" PRIxPTR ")",
>+        program, pname, bufSize, (uintptr_t)length, (uintptr_t)params);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() ||
>+            ValidateGetProgramivRobustANGLE(context, program, pname, bufSize, length, params))
>+        {
>+            context->getProgramivRobust(program, pname, bufSize, length, params);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY GetRenderbufferParameterivRobustANGLEContextANGLE(GLeglContext ctx,
>+                                                                   GLenum target,
>+                                                                   GLenum pname,
>+                                                                   GLsizei bufSize,
>+                                                                   GLsizei *length,
>+                                                                   GLint *params)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLenum target = 0x%X, GLenum pname = 0x%X, GLsizei bufSize = %d, GLsizei * length = "
>+        "0x%016" PRIxPTR ", GLint * params = 0x%016" PRIxPTR ")",
>+        target, pname, bufSize, (uintptr_t)length, (uintptr_t)params);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateGetRenderbufferParameterivRobustANGLE(
>+                                             context, target, pname, bufSize, length, params))
>+        {
>+            context->getRenderbufferParameterivRobust(target, pname, bufSize, length, params);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY GetShaderivRobustANGLEContextANGLE(GLeglContext ctx,
>+                                                    GLuint shader,
>+                                                    GLenum pname,
>+                                                    GLsizei bufSize,
>+                                                    GLsizei *length,
>+                                                    GLint *params)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLuint shader = %u, GLenum pname = 0x%X, GLsizei bufSize = %d, GLsizei * length = "
>+        "0x%016" PRIxPTR ", GLint * params = 0x%016" PRIxPTR ")",
>+        shader, pname, bufSize, (uintptr_t)length, (uintptr_t)params);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() ||
>+            ValidateGetShaderivRobustANGLE(context, shader, pname, bufSize, length, params))
>+        {
>+            context->getShaderivRobust(shader, pname, bufSize, length, params);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY GetTexParameterfvRobustANGLEContextANGLE(GLeglContext ctx,
>+                                                          GLenum target,
>+                                                          GLenum pname,
>+                                                          GLsizei bufSize,
>+                                                          GLsizei *length,
>+                                                          GLfloat *params)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLenum target = 0x%X, GLenum pname = 0x%X, GLsizei bufSize = %d, GLsizei * length = "
>+        "0x%016" PRIxPTR ", GLfloat * params = 0x%016" PRIxPTR ")",
>+        target, pname, bufSize, (uintptr_t)length, (uintptr_t)params);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        TextureType targetPacked = FromGLenum<TextureType>(target);
>+        if (context->skipValidation() || ValidateGetTexParameterfvRobustANGLE(
>+                                             context, targetPacked, pname, bufSize, length, params))
>+        {
>+            context->getTexParameterfvRobust(targetPacked, pname, bufSize, length, params);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY GetTexParameterivRobustANGLEContextANGLE(GLeglContext ctx,
>+                                                          GLenum target,
>+                                                          GLenum pname,
>+                                                          GLsizei bufSize,
>+                                                          GLsizei *length,
>+                                                          GLint *params)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLenum target = 0x%X, GLenum pname = 0x%X, GLsizei bufSize = %d, GLsizei * length = "
>+        "0x%016" PRIxPTR ", GLint * params = 0x%016" PRIxPTR ")",
>+        target, pname, bufSize, (uintptr_t)length, (uintptr_t)params);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        TextureType targetPacked = FromGLenum<TextureType>(target);
>+        if (context->skipValidation() || ValidateGetTexParameterivRobustANGLE(
>+                                             context, targetPacked, pname, bufSize, length, params))
>+        {
>+            context->getTexParameterivRobust(targetPacked, pname, bufSize, length, params);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY GetUniformfvRobustANGLEContextANGLE(GLeglContext ctx,
>+                                                     GLuint program,
>+                                                     GLint location,
>+                                                     GLsizei bufSize,
>+                                                     GLsizei *length,
>+                                                     GLfloat *params)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLuint program = %u, GLint location = %d, GLsizei bufSize = %d, GLsizei * length = "
>+        "0x%016" PRIxPTR ", GLfloat * params = 0x%016" PRIxPTR ")",
>+        program, location, bufSize, (uintptr_t)length, (uintptr_t)params);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() ||
>+            ValidateGetUniformfvRobustANGLE(context, program, location, bufSize, length, params))
>+        {
>+            context->getUniformfvRobust(program, location, bufSize, length, params);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY GetUniformivRobustANGLEContextANGLE(GLeglContext ctx,
>+                                                     GLuint program,
>+                                                     GLint location,
>+                                                     GLsizei bufSize,
>+                                                     GLsizei *length,
>+                                                     GLint *params)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLuint program = %u, GLint location = %d, GLsizei bufSize = %d, GLsizei * length = "
>+        "0x%016" PRIxPTR ", GLint * params = 0x%016" PRIxPTR ")",
>+        program, location, bufSize, (uintptr_t)length, (uintptr_t)params);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() ||
>+            ValidateGetUniformivRobustANGLE(context, program, location, bufSize, length, params))
>+        {
>+            context->getUniformivRobust(program, location, bufSize, length, params);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY GetVertexAttribfvRobustANGLEContextANGLE(GLeglContext ctx,
>+                                                          GLuint index,
>+                                                          GLenum pname,
>+                                                          GLsizei bufSize,
>+                                                          GLsizei *length,
>+                                                          GLfloat *params)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLuint index = %u, GLenum pname = 0x%X, GLsizei bufSize = %d, GLsizei * length = "
>+        "0x%016" PRIxPTR ", GLfloat * params = 0x%016" PRIxPTR ")",
>+        index, pname, bufSize, (uintptr_t)length, (uintptr_t)params);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() ||
>+            ValidateGetVertexAttribfvRobustANGLE(context, index, pname, bufSize, length, params))
>+        {
>+            context->getVertexAttribfvRobust(index, pname, bufSize, length, params);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY GetVertexAttribivRobustANGLEContextANGLE(GLeglContext ctx,
>+                                                          GLuint index,
>+                                                          GLenum pname,
>+                                                          GLsizei bufSize,
>+                                                          GLsizei *length,
>+                                                          GLint *params)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLuint index = %u, GLenum pname = 0x%X, GLsizei bufSize = %d, GLsizei * length = "
>+        "0x%016" PRIxPTR ", GLint * params = 0x%016" PRIxPTR ")",
>+        index, pname, bufSize, (uintptr_t)length, (uintptr_t)params);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() ||
>+            ValidateGetVertexAttribivRobustANGLE(context, index, pname, bufSize, length, params))
>+        {
>+            context->getVertexAttribivRobust(index, pname, bufSize, length, params);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY GetVertexAttribPointervRobustANGLEContextANGLE(GLeglContext ctx,
>+                                                                GLuint index,
>+                                                                GLenum pname,
>+                                                                GLsizei bufSize,
>+                                                                GLsizei *length,
>+                                                                void **pointer)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLuint index = %u, GLenum pname = 0x%X, GLsizei bufSize = %d, GLsizei * length = "
>+        "0x%016" PRIxPTR ", void ** pointer = 0x%016" PRIxPTR ")",
>+        index, pname, bufSize, (uintptr_t)length, (uintptr_t)pointer);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateGetVertexAttribPointervRobustANGLE(
>+                                             context, index, pname, bufSize, length, pointer))
>+        {
>+            context->getVertexAttribPointervRobust(index, pname, bufSize, length, pointer);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY ReadPixelsRobustANGLEContextANGLE(GLeglContext ctx,
>+                                                   GLint x,
>+                                                   GLint y,
>+                                                   GLsizei width,
>+                                                   GLsizei height,
>+                                                   GLenum format,
>+                                                   GLenum type,
>+                                                   GLsizei bufSize,
>+                                                   GLsizei *length,
>+                                                   GLsizei *columns,
>+                                                   GLsizei *rows,
>+                                                   void *pixels)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLint x = %d, GLint y = %d, GLsizei width = %d, GLsizei height = %d, GLenum format = "
>+        "0x%X, GLenum type = 0x%X, GLsizei bufSize = %d, GLsizei * length = 0x%016" PRIxPTR
>+        ", GLsizei * columns = 0x%016" PRIxPTR ", GLsizei * rows = 0x%016" PRIxPTR
>+        ", void * pixels = 0x%016" PRIxPTR ")",
>+        x, y, width, height, format, type, bufSize, (uintptr_t)length, (uintptr_t)columns,
>+        (uintptr_t)rows, (uintptr_t)pixels);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() ||
>+            ValidateReadPixelsRobustANGLE(context, x, y, width, height, format, type, bufSize,
>+                                          length, columns, rows, pixels))
>+        {
>+            context->readPixelsRobust(x, y, width, height, format, type, bufSize, length, columns,
>+                                      rows, pixels);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY TexImage2DRobustANGLEContextANGLE(GLeglContext ctx,
>+                                                   GLenum target,
>+                                                   GLint level,
>+                                                   GLint internalformat,
>+                                                   GLsizei width,
>+                                                   GLsizei height,
>+                                                   GLint border,
>+                                                   GLenum format,
>+                                                   GLenum type,
>+                                                   GLsizei bufSize,
>+                                                   const void *pixels)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLenum target = 0x%X, GLint level = %d, GLint internalformat = %d, GLsizei width = %d, "
>+        "GLsizei height = %d, GLint border = %d, GLenum format = 0x%X, GLenum type = 0x%X, GLsizei "
>+        "bufSize = %d, const void * pixels = 0x%016" PRIxPTR ")",
>+        target, level, internalformat, width, height, border, format, type, bufSize,
>+        (uintptr_t)pixels);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        TextureTarget targetPacked = FromGLenum<TextureTarget>(target);
>+        if (context->skipValidation() ||
>+            ValidateTexImage2DRobustANGLE(context, targetPacked, level, internalformat, width,
>+                                          height, border, format, type, bufSize, pixels))
>+        {
>+            context->texImage2DRobust(targetPacked, level, internalformat, width, height, border,
>+                                      format, type, bufSize, pixels);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY TexParameterfvRobustANGLEContextANGLE(GLeglContext ctx,
>+                                                       GLenum target,
>+                                                       GLenum pname,
>+                                                       GLsizei bufSize,
>+                                                       const GLfloat *params)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLenum target = 0x%X, GLenum pname = 0x%X, GLsizei bufSize = %d, const GLfloat * params "
>+        "= 0x%016" PRIxPTR ")",
>+        target, pname, bufSize, (uintptr_t)params);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        TextureType targetPacked = FromGLenum<TextureType>(target);
>+        if (context->skipValidation() ||
>+            ValidateTexParameterfvRobustANGLE(context, targetPacked, pname, bufSize, params))
>+        {
>+            context->texParameterfvRobust(targetPacked, pname, bufSize, params);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY TexParameterivRobustANGLEContextANGLE(GLeglContext ctx,
>+                                                       GLenum target,
>+                                                       GLenum pname,
>+                                                       GLsizei bufSize,
>+                                                       const GLint *params)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLenum target = 0x%X, GLenum pname = 0x%X, GLsizei bufSize = %d, const GLint * params = "
>+        "0x%016" PRIxPTR ")",
>+        target, pname, bufSize, (uintptr_t)params);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        TextureType targetPacked = FromGLenum<TextureType>(target);
>+        if (context->skipValidation() ||
>+            ValidateTexParameterivRobustANGLE(context, targetPacked, pname, bufSize, params))
>+        {
>+            context->texParameterivRobust(targetPacked, pname, bufSize, params);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY TexSubImage2DRobustANGLEContextANGLE(GLeglContext ctx,
>+                                                      GLenum target,
>+                                                      GLint level,
>+                                                      GLint xoffset,
>+                                                      GLint yoffset,
>+                                                      GLsizei width,
>+                                                      GLsizei height,
>+                                                      GLenum format,
>+                                                      GLenum type,
>+                                                      GLsizei bufSize,
>+                                                      const void *pixels)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLenum target = 0x%X, GLint level = %d, GLint xoffset = %d, GLint yoffset = %d, GLsizei "
>+        "width = %d, GLsizei height = %d, GLenum format = 0x%X, GLenum type = 0x%X, GLsizei "
>+        "bufSize = %d, const void * pixels = 0x%016" PRIxPTR ")",
>+        target, level, xoffset, yoffset, width, height, format, type, bufSize, (uintptr_t)pixels);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        TextureTarget targetPacked = FromGLenum<TextureTarget>(target);
>+        if (context->skipValidation() ||
>+            ValidateTexSubImage2DRobustANGLE(context, targetPacked, level, xoffset, yoffset, width,
>+                                             height, format, type, bufSize, pixels))
>+        {
>+            context->texSubImage2DRobust(targetPacked, level, xoffset, yoffset, width, height,
>+                                         format, type, bufSize, pixels);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY TexImage3DRobustANGLEContextANGLE(GLeglContext ctx,
>+                                                   GLenum target,
>+                                                   GLint level,
>+                                                   GLint internalformat,
>+                                                   GLsizei width,
>+                                                   GLsizei height,
>+                                                   GLsizei depth,
>+                                                   GLint border,
>+                                                   GLenum format,
>+                                                   GLenum type,
>+                                                   GLsizei bufSize,
>+                                                   const void *pixels)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLenum target = 0x%X, GLint level = %d, GLint internalformat = %d, GLsizei width = %d, "
>+        "GLsizei height = %d, GLsizei depth = %d, GLint border = %d, GLenum format = 0x%X, GLenum "
>+        "type = 0x%X, GLsizei bufSize = %d, const void * pixels = 0x%016" PRIxPTR ")",
>+        target, level, internalformat, width, height, depth, border, format, type, bufSize,
>+        (uintptr_t)pixels);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        TextureTarget targetPacked = FromGLenum<TextureTarget>(target);
>+        if (context->skipValidation() ||
>+            ValidateTexImage3DRobustANGLE(context, targetPacked, level, internalformat, width,
>+                                          height, depth, border, format, type, bufSize, pixels))
>+        {
>+            context->texImage3DRobust(targetPacked, level, internalformat, width, height, depth,
>+                                      border, format, type, bufSize, pixels);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY TexSubImage3DRobustANGLEContextANGLE(GLeglContext ctx,
>+                                                      GLenum target,
>+                                                      GLint level,
>+                                                      GLint xoffset,
>+                                                      GLint yoffset,
>+                                                      GLint zoffset,
>+                                                      GLsizei width,
>+                                                      GLsizei height,
>+                                                      GLsizei depth,
>+                                                      GLenum format,
>+                                                      GLenum type,
>+                                                      GLsizei bufSize,
>+                                                      const void *pixels)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLenum target = 0x%X, GLint level = %d, GLint xoffset = %d, GLint yoffset = %d, GLint "
>+        "zoffset = %d, GLsizei width = %d, GLsizei height = %d, GLsizei depth = %d, GLenum format "
>+        "= 0x%X, GLenum type = 0x%X, GLsizei bufSize = %d, const void * pixels = 0x%016" PRIxPTR
>+        ")",
>+        target, level, xoffset, yoffset, zoffset, width, height, depth, format, type, bufSize,
>+        (uintptr_t)pixels);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        TextureTarget targetPacked = FromGLenum<TextureTarget>(target);
>+        if (context->skipValidation() ||
>+            ValidateTexSubImage3DRobustANGLE(context, targetPacked, level, xoffset, yoffset,
>+                                             zoffset, width, height, depth, format, type, bufSize,
>+                                             pixels))
>+        {
>+            context->texSubImage3DRobust(targetPacked, level, xoffset, yoffset, zoffset, width,
>+                                         height, depth, format, type, bufSize, pixels);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY CompressedTexImage2DRobustANGLEContextANGLE(GLeglContext ctx,
>+                                                             GLenum target,
>+                                                             GLint level,
>+                                                             GLenum internalformat,
>+                                                             GLsizei width,
>+                                                             GLsizei height,
>+                                                             GLint border,
>+                                                             GLsizei imageSize,
>+                                                             GLsizei dataSize,
>+                                                             const GLvoid *data)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLenum target = 0x%X, GLint level = %d, GLenum internalformat = 0x%X, GLsizei width = "
>+        "%d, GLsizei height = %d, GLint border = %d, GLsizei imageSize = %d, GLsizei dataSize = "
>+        "%d, const GLvoid * data = 0x%016" PRIxPTR ")",
>+        target, level, internalformat, width, height, border, imageSize, dataSize, (uintptr_t)data);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        TextureTarget targetPacked = FromGLenum<TextureTarget>(target);
>+        if (context->skipValidation() || ValidateCompressedTexImage2DRobustANGLE(
>+                                             context, targetPacked, level, internalformat, width,
>+                                             height, border, imageSize, dataSize, data))
>+        {
>+            context->compressedTexImage2DRobust(targetPacked, level, internalformat, width, height,
>+                                                border, imageSize, dataSize, data);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY CompressedTexSubImage2DRobustANGLEContextANGLE(GLeglContext ctx,
>+                                                                GLenum target,
>+                                                                GLint level,
>+                                                                GLsizei xoffset,
>+                                                                GLsizei yoffset,
>+                                                                GLsizei width,
>+                                                                GLsizei height,
>+                                                                GLenum format,
>+                                                                GLsizei imageSize,
>+                                                                GLsizei dataSize,
>+                                                                const GLvoid *data)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLenum target = 0x%X, GLint level = %d, GLsizei xoffset = %d, GLsizei yoffset = %d, "
>+        "GLsizei width = %d, GLsizei height = %d, GLenum format = 0x%X, GLsizei imageSize = %d, "
>+        "GLsizei dataSize = %d, const GLvoid * data = 0x%016" PRIxPTR ")",
>+        target, level, xoffset, yoffset, width, height, format, imageSize, dataSize,
>+        (uintptr_t)data);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        TextureTarget targetPacked = FromGLenum<TextureTarget>(target);
>+        if (context->skipValidation() || ValidateCompressedTexSubImage2DRobustANGLE(
>+                                             context, targetPacked, level, xoffset, yoffset, width,
>+                                             height, format, imageSize, dataSize, data))
>+        {
>+            context->compressedTexSubImage2DRobust(targetPacked, level, xoffset, yoffset, width,
>+                                                   height, format, imageSize, dataSize, data);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY CompressedTexImage3DRobustANGLEContextANGLE(GLeglContext ctx,
>+                                                             GLenum target,
>+                                                             GLint level,
>+                                                             GLenum internalformat,
>+                                                             GLsizei width,
>+                                                             GLsizei height,
>+                                                             GLsizei depth,
>+                                                             GLint border,
>+                                                             GLsizei imageSize,
>+                                                             GLsizei dataSize,
>+                                                             const GLvoid *data)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLenum target = 0x%X, GLint level = %d, GLenum internalformat = 0x%X, GLsizei width = "
>+        "%d, GLsizei height = %d, GLsizei depth = %d, GLint border = %d, GLsizei imageSize = %d, "
>+        "GLsizei dataSize = %d, const GLvoid * data = 0x%016" PRIxPTR ")",
>+        target, level, internalformat, width, height, depth, border, imageSize, dataSize,
>+        (uintptr_t)data);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        TextureTarget targetPacked = FromGLenum<TextureTarget>(target);
>+        if (context->skipValidation() || ValidateCompressedTexImage3DRobustANGLE(
>+                                             context, targetPacked, level, internalformat, width,
>+                                             height, depth, border, imageSize, dataSize, data))
>+        {
>+            context->compressedTexImage3DRobust(targetPacked, level, internalformat, width, height,
>+                                                depth, border, imageSize, dataSize, data);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY CompressedTexSubImage3DRobustANGLEContextANGLE(GLeglContext ctx,
>+                                                                GLenum target,
>+                                                                GLint level,
>+                                                                GLint xoffset,
>+                                                                GLint yoffset,
>+                                                                GLint zoffset,
>+                                                                GLsizei width,
>+                                                                GLsizei height,
>+                                                                GLsizei depth,
>+                                                                GLenum format,
>+                                                                GLsizei imageSize,
>+                                                                GLsizei dataSize,
>+                                                                const GLvoid *data)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLenum target = 0x%X, GLint level = %d, GLint xoffset = %d, GLint yoffset = %d, GLint "
>+        "zoffset = %d, GLsizei width = %d, GLsizei height = %d, GLsizei depth = %d, GLenum format "
>+        "= 0x%X, GLsizei imageSize = %d, GLsizei dataSize = %d, const GLvoid * data = "
>+        "0x%016" PRIxPTR ")",
>+        target, level, xoffset, yoffset, zoffset, width, height, depth, format, imageSize, dataSize,
>+        (uintptr_t)data);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        TextureTarget targetPacked = FromGLenum<TextureTarget>(target);
>+        if (context->skipValidation() ||
>+            ValidateCompressedTexSubImage3DRobustANGLE(context, targetPacked, level, xoffset,
>+                                                       yoffset, zoffset, width, height, depth,
>+                                                       format, imageSize, dataSize, data))
>+        {
>+            context->compressedTexSubImage3DRobust(targetPacked, level, xoffset, yoffset, zoffset,
>+                                                   width, height, depth, format, imageSize,
>+                                                   dataSize, data);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY GetQueryivRobustANGLEContextANGLE(GLeglContext ctx,
>+                                                   GLenum target,
>+                                                   GLenum pname,
>+                                                   GLsizei bufSize,
>+                                                   GLsizei *length,
>+                                                   GLint *params)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLenum target = 0x%X, GLenum pname = 0x%X, GLsizei bufSize = %d, GLsizei * length = "
>+        "0x%016" PRIxPTR ", GLint * params = 0x%016" PRIxPTR ")",
>+        target, pname, bufSize, (uintptr_t)length, (uintptr_t)params);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        QueryType targetPacked = FromGLenum<QueryType>(target);
>+        if (context->skipValidation() ||
>+            ValidateGetQueryivRobustANGLE(context, targetPacked, pname, bufSize, length, params))
>+        {
>+            context->getQueryivRobust(targetPacked, pname, bufSize, length, params);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY GetQueryObjectuivRobustANGLEContextANGLE(GLeglContext ctx,
>+                                                          GLuint id,
>+                                                          GLenum pname,
>+                                                          GLsizei bufSize,
>+                                                          GLsizei *length,
>+                                                          GLuint *params)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLuint id = %u, GLenum pname = 0x%X, GLsizei bufSize = %d, GLsizei * length = "
>+        "0x%016" PRIxPTR ", GLuint * params = 0x%016" PRIxPTR ")",
>+        id, pname, bufSize, (uintptr_t)length, (uintptr_t)params);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() ||
>+            ValidateGetQueryObjectuivRobustANGLE(context, id, pname, bufSize, length, params))
>+        {
>+            context->getQueryObjectuivRobust(id, pname, bufSize, length, params);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY GetBufferPointervRobustANGLEContextANGLE(GLeglContext ctx,
>+                                                          GLenum target,
>+                                                          GLenum pname,
>+                                                          GLsizei bufSize,
>+                                                          GLsizei *length,
>+                                                          void **params)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLenum target = 0x%X, GLenum pname = 0x%X, GLsizei bufSize = %d, GLsizei * length = "
>+        "0x%016" PRIxPTR ", void ** params = 0x%016" PRIxPTR ")",
>+        target, pname, bufSize, (uintptr_t)length, (uintptr_t)params);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        BufferBinding targetPacked = FromGLenum<BufferBinding>(target);
>+        if (context->skipValidation() || ValidateGetBufferPointervRobustANGLE(
>+                                             context, targetPacked, pname, bufSize, length, params))
>+        {
>+            context->getBufferPointervRobust(targetPacked, pname, bufSize, length, params);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY GetIntegeri_vRobustANGLEContextANGLE(GLeglContext ctx,
>+                                                      GLenum target,
>+                                                      GLuint index,
>+                                                      GLsizei bufSize,
>+                                                      GLsizei *length,
>+                                                      GLint *data)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLenum target = 0x%X, GLuint index = %u, GLsizei bufSize = %d, GLsizei * length = "
>+        "0x%016" PRIxPTR ", GLint * data = 0x%016" PRIxPTR ")",
>+        target, index, bufSize, (uintptr_t)length, (uintptr_t)data);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() ||
>+            ValidateGetIntegeri_vRobustANGLE(context, target, index, bufSize, length, data))
>+        {
>+            context->getIntegeri_vRobust(target, index, bufSize, length, data);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY GetInternalformativRobustANGLEContextANGLE(GLeglContext ctx,
>+                                                            GLenum target,
>+                                                            GLenum internalformat,
>+                                                            GLenum pname,
>+                                                            GLsizei bufSize,
>+                                                            GLsizei *length,
>+                                                            GLint *params)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLenum target = 0x%X, GLenum internalformat = 0x%X, GLenum pname = 0x%X, GLsizei bufSize "
>+        "= %d, GLsizei * length = 0x%016" PRIxPTR ", GLint * params = 0x%016" PRIxPTR ")",
>+        target, internalformat, pname, bufSize, (uintptr_t)length, (uintptr_t)params);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() ||
>+            ValidateGetInternalformativRobustANGLE(context, target, internalformat, pname, bufSize,
>+                                                   length, params))
>+        {
>+            context->getInternalformativRobust(target, internalformat, pname, bufSize, length,
>+                                               params);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY GetVertexAttribIivRobustANGLEContextANGLE(GLeglContext ctx,
>+                                                           GLuint index,
>+                                                           GLenum pname,
>+                                                           GLsizei bufSize,
>+                                                           GLsizei *length,
>+                                                           GLint *params)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLuint index = %u, GLenum pname = 0x%X, GLsizei bufSize = %d, GLsizei * length = "
>+        "0x%016" PRIxPTR ", GLint * params = 0x%016" PRIxPTR ")",
>+        index, pname, bufSize, (uintptr_t)length, (uintptr_t)params);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() ||
>+            ValidateGetVertexAttribIivRobustANGLE(context, index, pname, bufSize, length, params))
>+        {
>+            context->getVertexAttribIivRobust(index, pname, bufSize, length, params);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY GetVertexAttribIuivRobustANGLEContextANGLE(GLeglContext ctx,
>+                                                            GLuint index,
>+                                                            GLenum pname,
>+                                                            GLsizei bufSize,
>+                                                            GLsizei *length,
>+                                                            GLuint *params)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLuint index = %u, GLenum pname = 0x%X, GLsizei bufSize = %d, GLsizei * length = "
>+        "0x%016" PRIxPTR ", GLuint * params = 0x%016" PRIxPTR ")",
>+        index, pname, bufSize, (uintptr_t)length, (uintptr_t)params);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() ||
>+            ValidateGetVertexAttribIuivRobustANGLE(context, index, pname, bufSize, length, params))
>+        {
>+            context->getVertexAttribIuivRobust(index, pname, bufSize, length, params);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY GetUniformuivRobustANGLEContextANGLE(GLeglContext ctx,
>+                                                      GLuint program,
>+                                                      GLint location,
>+                                                      GLsizei bufSize,
>+                                                      GLsizei *length,
>+                                                      GLuint *params)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLuint program = %u, GLint location = %d, GLsizei bufSize = %d, GLsizei * length = "
>+        "0x%016" PRIxPTR ", GLuint * params = 0x%016" PRIxPTR ")",
>+        program, location, bufSize, (uintptr_t)length, (uintptr_t)params);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() ||
>+            ValidateGetUniformuivRobustANGLE(context, program, location, bufSize, length, params))
>+        {
>+            context->getUniformuivRobust(program, location, bufSize, length, params);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY GetActiveUniformBlockivRobustANGLEContextANGLE(GLeglContext ctx,
>+                                                                GLuint program,
>+                                                                GLuint uniformBlockIndex,
>+                                                                GLenum pname,
>+                                                                GLsizei bufSize,
>+                                                                GLsizei *length,
>+                                                                GLint *params)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLuint program = %u, GLuint uniformBlockIndex = %u, GLenum pname = 0x%X, GLsizei bufSize "
>+        "= %d, GLsizei * length = 0x%016" PRIxPTR ", GLint * params = 0x%016" PRIxPTR ")",
>+        program, uniformBlockIndex, pname, bufSize, (uintptr_t)length, (uintptr_t)params);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() ||
>+            ValidateGetActiveUniformBlockivRobustANGLE(context, program, uniformBlockIndex, pname,
>+                                                       bufSize, length, params))
>+        {
>+            context->getActiveUniformBlockivRobust(program, uniformBlockIndex, pname, bufSize,
>+                                                   length, params);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY GetInteger64vRobustANGLEContextANGLE(GLeglContext ctx,
>+                                                      GLenum pname,
>+                                                      GLsizei bufSize,
>+                                                      GLsizei *length,
>+                                                      GLint64 *data)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum pname = 0x%X, GLsizei bufSize = %d, GLsizei * length = 0x%016" PRIxPTR
>+          ", GLint64 * data = 0x%016" PRIxPTR ")",
>+          pname, bufSize, (uintptr_t)length, (uintptr_t)data);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() ||
>+            ValidateGetInteger64vRobustANGLE(context, pname, bufSize, length, data))
>+        {
>+            context->getInteger64vRobust(pname, bufSize, length, data);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY GetInteger64i_vRobustANGLEContextANGLE(GLeglContext ctx,
>+                                                        GLenum target,
>+                                                        GLuint index,
>+                                                        GLsizei bufSize,
>+                                                        GLsizei *length,
>+                                                        GLint64 *data)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLenum target = 0x%X, GLuint index = %u, GLsizei bufSize = %d, GLsizei * length = "
>+        "0x%016" PRIxPTR ", GLint64 * data = 0x%016" PRIxPTR ")",
>+        target, index, bufSize, (uintptr_t)length, (uintptr_t)data);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() ||
>+            ValidateGetInteger64i_vRobustANGLE(context, target, index, bufSize, length, data))
>+        {
>+            context->getInteger64i_vRobust(target, index, bufSize, length, data);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY GetBufferParameteri64vRobustANGLEContextANGLE(GLeglContext ctx,
>+                                                               GLenum target,
>+                                                               GLenum pname,
>+                                                               GLsizei bufSize,
>+                                                               GLsizei *length,
>+                                                               GLint64 *params)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLenum target = 0x%X, GLenum pname = 0x%X, GLsizei bufSize = %d, GLsizei * length = "
>+        "0x%016" PRIxPTR ", GLint64 * params = 0x%016" PRIxPTR ")",
>+        target, pname, bufSize, (uintptr_t)length, (uintptr_t)params);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        BufferBinding targetPacked = FromGLenum<BufferBinding>(target);
>+        if (context->skipValidation() || ValidateGetBufferParameteri64vRobustANGLE(
>+                                             context, targetPacked, pname, bufSize, length, params))
>+        {
>+            context->getBufferParameteri64vRobust(targetPacked, pname, bufSize, length, params);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY SamplerParameterivRobustANGLEContextANGLE(GLeglContext ctx,
>+                                                           GLuint sampler,
>+                                                           GLuint pname,
>+                                                           GLsizei bufSize,
>+                                                           const GLint *param)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLuint sampler = %u, GLuint pname = %u, GLsizei bufSize = %d, const GLint * param = "
>+        "0x%016" PRIxPTR ")",
>+        sampler, pname, bufSize, (uintptr_t)param);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() ||
>+            ValidateSamplerParameterivRobustANGLE(context, sampler, pname, bufSize, param))
>+        {
>+            context->samplerParameterivRobust(sampler, pname, bufSize, param);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY SamplerParameterfvRobustANGLEContextANGLE(GLeglContext ctx,
>+                                                           GLuint sampler,
>+                                                           GLenum pname,
>+                                                           GLsizei bufSize,
>+                                                           const GLfloat *param)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLuint sampler = %u, GLenum pname = 0x%X, GLsizei bufSize = %d, const GLfloat * param = "
>+        "0x%016" PRIxPTR ")",
>+        sampler, pname, bufSize, (uintptr_t)param);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() ||
>+            ValidateSamplerParameterfvRobustANGLE(context, sampler, pname, bufSize, param))
>+        {
>+            context->samplerParameterfvRobust(sampler, pname, bufSize, param);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY GetSamplerParameterivRobustANGLEContextANGLE(GLeglContext ctx,
>+                                                              GLuint sampler,
>+                                                              GLenum pname,
>+                                                              GLsizei bufSize,
>+                                                              GLsizei *length,
>+                                                              GLint *params)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLuint sampler = %u, GLenum pname = 0x%X, GLsizei bufSize = %d, GLsizei * length = "
>+        "0x%016" PRIxPTR ", GLint * params = 0x%016" PRIxPTR ")",
>+        sampler, pname, bufSize, (uintptr_t)length, (uintptr_t)params);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateGetSamplerParameterivRobustANGLE(
>+                                             context, sampler, pname, bufSize, length, params))
>+        {
>+            context->getSamplerParameterivRobust(sampler, pname, bufSize, length, params);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY GetSamplerParameterfvRobustANGLEContextANGLE(GLeglContext ctx,
>+                                                              GLuint sampler,
>+                                                              GLenum pname,
>+                                                              GLsizei bufSize,
>+                                                              GLsizei *length,
>+                                                              GLfloat *params)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLuint sampler = %u, GLenum pname = 0x%X, GLsizei bufSize = %d, GLsizei * length = "
>+        "0x%016" PRIxPTR ", GLfloat * params = 0x%016" PRIxPTR ")",
>+        sampler, pname, bufSize, (uintptr_t)length, (uintptr_t)params);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateGetSamplerParameterfvRobustANGLE(
>+                                             context, sampler, pname, bufSize, length, params))
>+        {
>+            context->getSamplerParameterfvRobust(sampler, pname, bufSize, length, params);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY GetFramebufferParameterivRobustANGLEContextANGLE(GLeglContext ctx,
>+                                                                  GLuint sampler,
>+                                                                  GLenum pname,
>+                                                                  GLsizei bufSize,
>+                                                                  GLsizei *length,
>+                                                                  GLint *params)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLuint sampler = %u, GLenum pname = 0x%X, GLsizei bufSize = %d, GLsizei * length = "
>+        "0x%016" PRIxPTR ", GLint * params = 0x%016" PRIxPTR ")",
>+        sampler, pname, bufSize, (uintptr_t)length, (uintptr_t)params);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateGetFramebufferParameterivRobustANGLE(
>+                                             context, sampler, pname, bufSize, length, params))
>+        {
>+            context->getFramebufferParameterivRobust(sampler, pname, bufSize, length, params);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY GetProgramInterfaceivRobustANGLEContextANGLE(GLeglContext ctx,
>+                                                              GLuint program,
>+                                                              GLenum programInterface,
>+                                                              GLenum pname,
>+                                                              GLsizei bufSize,
>+                                                              GLsizei *length,
>+                                                              GLint *params)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLuint program = %u, GLenum programInterface = 0x%X, GLenum pname = 0x%X, GLsizei "
>+        "bufSize = %d, GLsizei * length = 0x%016" PRIxPTR ", GLint * params = 0x%016" PRIxPTR ")",
>+        program, programInterface, pname, bufSize, (uintptr_t)length, (uintptr_t)params);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() ||
>+            ValidateGetProgramInterfaceivRobustANGLE(context, program, programInterface, pname,
>+                                                     bufSize, length, params))
>+        {
>+            context->getProgramInterfaceivRobust(program, programInterface, pname, bufSize, length,
>+                                                 params);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY GetBooleani_vRobustANGLEContextANGLE(GLeglContext ctx,
>+                                                      GLenum target,
>+                                                      GLuint index,
>+                                                      GLsizei bufSize,
>+                                                      GLsizei *length,
>+                                                      GLboolean *data)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLenum target = 0x%X, GLuint index = %u, GLsizei bufSize = %d, GLsizei * length = "
>+        "0x%016" PRIxPTR ", GLboolean * data = 0x%016" PRIxPTR ")",
>+        target, index, bufSize, (uintptr_t)length, (uintptr_t)data);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() ||
>+            ValidateGetBooleani_vRobustANGLE(context, target, index, bufSize, length, data))
>+        {
>+            context->getBooleani_vRobust(target, index, bufSize, length, data);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY GetMultisamplefvRobustANGLEContextANGLE(GLeglContext ctx,
>+                                                         GLenum pname,
>+                                                         GLuint index,
>+                                                         GLsizei bufSize,
>+                                                         GLsizei *length,
>+                                                         GLfloat *val)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLenum pname = 0x%X, GLuint index = %u, GLsizei bufSize = %d, GLsizei * length = "
>+        "0x%016" PRIxPTR ", GLfloat * val = 0x%016" PRIxPTR ")",
>+        pname, index, bufSize, (uintptr_t)length, (uintptr_t)val);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() ||
>+            ValidateGetMultisamplefvRobustANGLE(context, pname, index, bufSize, length, val))
>+        {
>+            context->getMultisamplefvRobust(pname, index, bufSize, length, val);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY GetTexLevelParameterivRobustANGLEContextANGLE(GLeglContext ctx,
>+                                                               GLenum target,
>+                                                               GLint level,
>+                                                               GLenum pname,
>+                                                               GLsizei bufSize,
>+                                                               GLsizei *length,
>+                                                               GLint *params)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLenum target = 0x%X, GLint level = %d, GLenum pname = 0x%X, GLsizei bufSize = %d, "
>+        "GLsizei * length = 0x%016" PRIxPTR ", GLint * params = 0x%016" PRIxPTR ")",
>+        target, level, pname, bufSize, (uintptr_t)length, (uintptr_t)params);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        TextureTarget targetPacked = FromGLenum<TextureTarget>(target);
>+        if (context->skipValidation() ||
>+            ValidateGetTexLevelParameterivRobustANGLE(context, targetPacked, level, pname, bufSize,
>+                                                      length, params))
>+        {
>+            context->getTexLevelParameterivRobust(targetPacked, level, pname, bufSize, length,
>+                                                  params);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY GetTexLevelParameterfvRobustANGLEContextANGLE(GLeglContext ctx,
>+                                                               GLenum target,
>+                                                               GLint level,
>+                                                               GLenum pname,
>+                                                               GLsizei bufSize,
>+                                                               GLsizei *length,
>+                                                               GLfloat *params)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLenum target = 0x%X, GLint level = %d, GLenum pname = 0x%X, GLsizei bufSize = %d, "
>+        "GLsizei * length = 0x%016" PRIxPTR ", GLfloat * params = 0x%016" PRIxPTR ")",
>+        target, level, pname, bufSize, (uintptr_t)length, (uintptr_t)params);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        TextureTarget targetPacked = FromGLenum<TextureTarget>(target);
>+        if (context->skipValidation() ||
>+            ValidateGetTexLevelParameterfvRobustANGLE(context, targetPacked, level, pname, bufSize,
>+                                                      length, params))
>+        {
>+            context->getTexLevelParameterfvRobust(targetPacked, level, pname, bufSize, length,
>+                                                  params);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY GetPointervRobustANGLERobustANGLEContextANGLE(GLeglContext ctx,
>+                                                               GLenum pname,
>+                                                               GLsizei bufSize,
>+                                                               GLsizei *length,
>+                                                               void **params)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum pname = 0x%X, GLsizei bufSize = %d, GLsizei * length = 0x%016" PRIxPTR
>+          ", void ** params = 0x%016" PRIxPTR ")",
>+          pname, bufSize, (uintptr_t)length, (uintptr_t)params);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() ||
>+            ValidateGetPointervRobustANGLERobustANGLE(context, pname, bufSize, length, params))
>+        {
>+            context->getPointervRobustANGLERobust(pname, bufSize, length, params);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY ReadnPixelsRobustANGLEContextANGLE(GLeglContext ctx,
>+                                                    GLint x,
>+                                                    GLint y,
>+                                                    GLsizei width,
>+                                                    GLsizei height,
>+                                                    GLenum format,
>+                                                    GLenum type,
>+                                                    GLsizei bufSize,
>+                                                    GLsizei *length,
>+                                                    GLsizei *columns,
>+                                                    GLsizei *rows,
>+                                                    void *data)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLint x = %d, GLint y = %d, GLsizei width = %d, GLsizei height = %d, GLenum format = "
>+        "0x%X, GLenum type = 0x%X, GLsizei bufSize = %d, GLsizei * length = 0x%016" PRIxPTR
>+        ", GLsizei * columns = 0x%016" PRIxPTR ", GLsizei * rows = 0x%016" PRIxPTR
>+        ", void * data = 0x%016" PRIxPTR ")",
>+        x, y, width, height, format, type, bufSize, (uintptr_t)length, (uintptr_t)columns,
>+        (uintptr_t)rows, (uintptr_t)data);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() ||
>+            ValidateReadnPixelsRobustANGLE(context, x, y, width, height, format, type, bufSize,
>+                                           length, columns, rows, data))
>+        {
>+            context->readnPixelsRobust(x, y, width, height, format, type, bufSize, length, columns,
>+                                       rows, data);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY GetnUniformfvRobustANGLEContextANGLE(GLeglContext ctx,
>+                                                      GLuint program,
>+                                                      GLint location,
>+                                                      GLsizei bufSize,
>+                                                      GLsizei *length,
>+                                                      GLfloat *params)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLuint program = %u, GLint location = %d, GLsizei bufSize = %d, GLsizei * length = "
>+        "0x%016" PRIxPTR ", GLfloat * params = 0x%016" PRIxPTR ")",
>+        program, location, bufSize, (uintptr_t)length, (uintptr_t)params);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() ||
>+            ValidateGetnUniformfvRobustANGLE(context, program, location, bufSize, length, params))
>+        {
>+            context->getnUniformfvRobust(program, location, bufSize, length, params);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY GetnUniformivRobustANGLEContextANGLE(GLeglContext ctx,
>+                                                      GLuint program,
>+                                                      GLint location,
>+                                                      GLsizei bufSize,
>+                                                      GLsizei *length,
>+                                                      GLint *params)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLuint program = %u, GLint location = %d, GLsizei bufSize = %d, GLsizei * length = "
>+        "0x%016" PRIxPTR ", GLint * params = 0x%016" PRIxPTR ")",
>+        program, location, bufSize, (uintptr_t)length, (uintptr_t)params);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() ||
>+            ValidateGetnUniformivRobustANGLE(context, program, location, bufSize, length, params))
>+        {
>+            context->getnUniformivRobust(program, location, bufSize, length, params);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY GetnUniformuivRobustANGLEContextANGLE(GLeglContext ctx,
>+                                                       GLuint program,
>+                                                       GLint location,
>+                                                       GLsizei bufSize,
>+                                                       GLsizei *length,
>+                                                       GLuint *params)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLuint program = %u, GLint location = %d, GLsizei bufSize = %d, GLsizei * length = "
>+        "0x%016" PRIxPTR ", GLuint * params = 0x%016" PRIxPTR ")",
>+        program, location, bufSize, (uintptr_t)length, (uintptr_t)params);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() ||
>+            ValidateGetnUniformuivRobustANGLE(context, program, location, bufSize, length, params))
>+        {
>+            context->getnUniformuivRobust(program, location, bufSize, length, params);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY TexParameterIivRobustANGLEContextANGLE(GLeglContext ctx,
>+                                                        GLenum target,
>+                                                        GLenum pname,
>+                                                        GLsizei bufSize,
>+                                                        const GLint *params)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLenum target = 0x%X, GLenum pname = 0x%X, GLsizei bufSize = %d, const GLint * params = "
>+        "0x%016" PRIxPTR ")",
>+        target, pname, bufSize, (uintptr_t)params);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        TextureType targetPacked = FromGLenum<TextureType>(target);
>+        if (context->skipValidation() ||
>+            ValidateTexParameterIivRobustANGLE(context, targetPacked, pname, bufSize, params))
>+        {
>+            context->texParameterIivRobust(targetPacked, pname, bufSize, params);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY TexParameterIuivRobustANGLEContextANGLE(GLeglContext ctx,
>+                                                         GLenum target,
>+                                                         GLenum pname,
>+                                                         GLsizei bufSize,
>+                                                         const GLuint *params)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLenum target = 0x%X, GLenum pname = 0x%X, GLsizei bufSize = %d, const GLuint * params = "
>+        "0x%016" PRIxPTR ")",
>+        target, pname, bufSize, (uintptr_t)params);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        TextureType targetPacked = FromGLenum<TextureType>(target);
>+        if (context->skipValidation() ||
>+            ValidateTexParameterIuivRobustANGLE(context, targetPacked, pname, bufSize, params))
>+        {
>+            context->texParameterIuivRobust(targetPacked, pname, bufSize, params);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY GetTexParameterIivRobustANGLEContextANGLE(GLeglContext ctx,
>+                                                           GLenum target,
>+                                                           GLenum pname,
>+                                                           GLsizei bufSize,
>+                                                           GLsizei *length,
>+                                                           GLint *params)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLenum target = 0x%X, GLenum pname = 0x%X, GLsizei bufSize = %d, GLsizei * length = "
>+        "0x%016" PRIxPTR ", GLint * params = 0x%016" PRIxPTR ")",
>+        target, pname, bufSize, (uintptr_t)length, (uintptr_t)params);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        TextureType targetPacked = FromGLenum<TextureType>(target);
>+        if (context->skipValidation() || ValidateGetTexParameterIivRobustANGLE(
>+                                             context, targetPacked, pname, bufSize, length, params))
>+        {
>+            context->getTexParameterIivRobust(targetPacked, pname, bufSize, length, params);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY GetTexParameterIuivRobustANGLEContextANGLE(GLeglContext ctx,
>+                                                            GLenum target,
>+                                                            GLenum pname,
>+                                                            GLsizei bufSize,
>+                                                            GLsizei *length,
>+                                                            GLuint *params)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLenum target = 0x%X, GLenum pname = 0x%X, GLsizei bufSize = %d, GLsizei * length = "
>+        "0x%016" PRIxPTR ", GLuint * params = 0x%016" PRIxPTR ")",
>+        target, pname, bufSize, (uintptr_t)length, (uintptr_t)params);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        TextureType targetPacked = FromGLenum<TextureType>(target);
>+        if (context->skipValidation() || ValidateGetTexParameterIuivRobustANGLE(
>+                                             context, targetPacked, pname, bufSize, length, params))
>+        {
>+            context->getTexParameterIuivRobust(targetPacked, pname, bufSize, length, params);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY SamplerParameterIivRobustANGLEContextANGLE(GLeglContext ctx,
>+                                                            GLuint sampler,
>+                                                            GLenum pname,
>+                                                            GLsizei bufSize,
>+                                                            const GLint *param)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLuint sampler = %u, GLenum pname = 0x%X, GLsizei bufSize = %d, const GLint * param = "
>+        "0x%016" PRIxPTR ")",
>+        sampler, pname, bufSize, (uintptr_t)param);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() ||
>+            ValidateSamplerParameterIivRobustANGLE(context, sampler, pname, bufSize, param))
>+        {
>+            context->samplerParameterIivRobust(sampler, pname, bufSize, param);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY SamplerParameterIuivRobustANGLEContextANGLE(GLeglContext ctx,
>+                                                             GLuint sampler,
>+                                                             GLenum pname,
>+                                                             GLsizei bufSize,
>+                                                             const GLuint *param)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLuint sampler = %u, GLenum pname = 0x%X, GLsizei bufSize = %d, const GLuint * param = "
>+        "0x%016" PRIxPTR ")",
>+        sampler, pname, bufSize, (uintptr_t)param);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() ||
>+            ValidateSamplerParameterIuivRobustANGLE(context, sampler, pname, bufSize, param))
>+        {
>+            context->samplerParameterIuivRobust(sampler, pname, bufSize, param);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY GetSamplerParameterIivRobustANGLEContextANGLE(GLeglContext ctx,
>+                                                               GLuint sampler,
>+                                                               GLenum pname,
>+                                                               GLsizei bufSize,
>+                                                               GLsizei *length,
>+                                                               GLint *params)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLuint sampler = %u, GLenum pname = 0x%X, GLsizei bufSize = %d, GLsizei * length = "
>+        "0x%016" PRIxPTR ", GLint * params = 0x%016" PRIxPTR ")",
>+        sampler, pname, bufSize, (uintptr_t)length, (uintptr_t)params);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateGetSamplerParameterIivRobustANGLE(
>+                                             context, sampler, pname, bufSize, length, params))
>+        {
>+            context->getSamplerParameterIivRobust(sampler, pname, bufSize, length, params);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY GetSamplerParameterIuivRobustANGLEContextANGLE(GLeglContext ctx,
>+                                                                GLuint sampler,
>+                                                                GLenum pname,
>+                                                                GLsizei bufSize,
>+                                                                GLsizei *length,
>+                                                                GLuint *params)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLuint sampler = %u, GLenum pname = 0x%X, GLsizei bufSize = %d, GLsizei * length = "
>+        "0x%016" PRIxPTR ", GLuint * params = 0x%016" PRIxPTR ")",
>+        sampler, pname, bufSize, (uintptr_t)length, (uintptr_t)params);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateGetSamplerParameterIuivRobustANGLE(
>+                                             context, sampler, pname, bufSize, length, params))
>+        {
>+            context->getSamplerParameterIuivRobust(sampler, pname, bufSize, length, params);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY GetQueryObjectivRobustANGLEContextANGLE(GLeglContext ctx,
>+                                                         GLuint id,
>+                                                         GLenum pname,
>+                                                         GLsizei bufSize,
>+                                                         GLsizei *length,
>+                                                         GLint *params)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLuint id = %u, GLenum pname = 0x%X, GLsizei bufSize = %d, GLsizei * length = "
>+        "0x%016" PRIxPTR ", GLint * params = 0x%016" PRIxPTR ")",
>+        id, pname, bufSize, (uintptr_t)length, (uintptr_t)params);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() ||
>+            ValidateGetQueryObjectivRobustANGLE(context, id, pname, bufSize, length, params))
>+        {
>+            context->getQueryObjectivRobust(id, pname, bufSize, length, params);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY GetQueryObjecti64vRobustANGLEContextANGLE(GLeglContext ctx,
>+                                                           GLuint id,
>+                                                           GLenum pname,
>+                                                           GLsizei bufSize,
>+                                                           GLsizei *length,
>+                                                           GLint64 *params)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLuint id = %u, GLenum pname = 0x%X, GLsizei bufSize = %d, GLsizei * length = "
>+        "0x%016" PRIxPTR ", GLint64 * params = 0x%016" PRIxPTR ")",
>+        id, pname, bufSize, (uintptr_t)length, (uintptr_t)params);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() ||
>+            ValidateGetQueryObjecti64vRobustANGLE(context, id, pname, bufSize, length, params))
>+        {
>+            context->getQueryObjecti64vRobust(id, pname, bufSize, length, params);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY GetQueryObjectui64vRobustANGLEContextANGLE(GLeglContext ctx,
>+                                                            GLuint id,
>+                                                            GLenum pname,
>+                                                            GLsizei bufSize,
>+                                                            GLsizei *length,
>+                                                            GLuint64 *params)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLuint id = %u, GLenum pname = 0x%X, GLsizei bufSize = %d, GLsizei * length = "
>+        "0x%016" PRIxPTR ", GLuint64 * params = 0x%016" PRIxPTR ")",
>+        id, pname, bufSize, (uintptr_t)length, (uintptr_t)params);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() ||
>+            ValidateGetQueryObjectui64vRobustANGLE(context, id, pname, bufSize, length, params))
>+        {
>+            context->getQueryObjectui64vRobust(id, pname, bufSize, length, params);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY CopyTexture3DANGLEContextANGLE(GLeglContext ctx,
>+                                                GLuint sourceId,
>+                                                GLint sourceLevel,
>+                                                GLenum destTarget,
>+                                                GLuint destId,
>+                                                GLint destLevel,
>+                                                GLint internalFormat,
>+                                                GLenum destType,
>+                                                GLboolean unpackFlipY,
>+                                                GLboolean unpackPremultiplyAlpha,
>+                                                GLboolean unpackUnmultiplyAlpha)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLuint sourceId = %u, GLint sourceLevel = %d, GLenum destTarget = 0x%X, GLuint destId = "
>+        "%u, GLint destLevel = %d, GLint internalFormat = %d, GLenum destType = 0x%X, GLboolean "
>+        "unpackFlipY = %u, GLboolean unpackPremultiplyAlpha = %u, GLboolean unpackUnmultiplyAlpha "
>+        "= %u)",
>+        sourceId, sourceLevel, destTarget, destId, destLevel, internalFormat, destType, unpackFlipY,
>+        unpackPremultiplyAlpha, unpackUnmultiplyAlpha);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        TextureTarget destTargetPacked = FromGLenum<TextureTarget>(destTarget);
>+        if (context->skipValidation() ||
>+            ValidateCopyTexture3DANGLE(context, sourceId, sourceLevel, destTargetPacked, destId,
>+                                       destLevel, internalFormat, destType, unpackFlipY,
>+                                       unpackPremultiplyAlpha, unpackUnmultiplyAlpha))
>+        {
>+            context->copyTexture3D(sourceId, sourceLevel, destTargetPacked, destId, destLevel,
>+                                   internalFormat, destType, unpackFlipY, unpackPremultiplyAlpha,
>+                                   unpackUnmultiplyAlpha);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY CopySubTexture3DANGLEContextANGLE(GLeglContext ctx,
>+                                                   GLuint sourceId,
>+                                                   GLint sourceLevel,
>+                                                   GLenum destTarget,
>+                                                   GLuint destId,
>+                                                   GLint destLevel,
>+                                                   GLint xoffset,
>+                                                   GLint yoffset,
>+                                                   GLint zoffset,
>+                                                   GLint x,
>+                                                   GLint y,
>+                                                   GLint z,
>+                                                   GLint width,
>+                                                   GLint height,
>+                                                   GLint depth,
>+                                                   GLboolean unpackFlipY,
>+                                                   GLboolean unpackPremultiplyAlpha,
>+                                                   GLboolean unpackUnmultiplyAlpha)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLuint sourceId = %u, GLint sourceLevel = %d, GLenum destTarget = 0x%X, GLuint destId = "
>+        "%u, GLint destLevel = %d, GLint xoffset = %d, GLint yoffset = %d, GLint zoffset = %d, "
>+        "GLint x = %d, GLint y = %d, GLint z = %d, GLint width = %d, GLint height = %d, GLint "
>+        "depth = %d, GLboolean unpackFlipY = %u, GLboolean unpackPremultiplyAlpha = %u, GLboolean "
>+        "unpackUnmultiplyAlpha = %u)",
>+        sourceId, sourceLevel, destTarget, destId, destLevel, xoffset, yoffset, zoffset, x, y, z,
>+        width, height, depth, unpackFlipY, unpackPremultiplyAlpha, unpackUnmultiplyAlpha);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        TextureTarget destTargetPacked = FromGLenum<TextureTarget>(destTarget);
>+        if (context->skipValidation() ||
>+            ValidateCopySubTexture3DANGLE(context, sourceId, sourceLevel, destTargetPacked, destId,
>+                                          destLevel, xoffset, yoffset, zoffset, x, y, z, width,
>+                                          height, depth, unpackFlipY, unpackPremultiplyAlpha,
>+                                          unpackUnmultiplyAlpha))
>+        {
>+            context->copySubTexture3D(sourceId, sourceLevel, destTargetPacked, destId, destLevel,
>+                                      xoffset, yoffset, zoffset, x, y, z, width, height, depth,
>+                                      unpackFlipY, unpackPremultiplyAlpha, unpackUnmultiplyAlpha);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY TexStorage2DMultisampleANGLEContextANGLE(GLeglContext ctx,
>+                                                          GLenum target,
>+                                                          GLsizei samples,
>+                                                          GLenum internalformat,
>+                                                          GLsizei width,
>+                                                          GLsizei height,
>+                                                          GLboolean fixedsamplelocations)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLenum target = 0x%X, GLsizei samples = %d, GLenum internalformat = 0x%X, GLsizei width "
>+        "= %d, GLsizei height = %d, GLboolean fixedsamplelocations = %u)",
>+        target, samples, internalformat, width, height, fixedsamplelocations);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        TextureType targetPacked = FromGLenum<TextureType>(target);
>+        if (context->skipValidation() ||
>+            ValidateTexStorage2DMultisampleANGLE(context, targetPacked, samples, internalformat,
>+                                                 width, height, fixedsamplelocations))
>+        {
>+            context->texStorage2DMultisample(targetPacked, samples, internalformat, width, height,
>+                                             fixedsamplelocations);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY GetTexLevelParameterivANGLEContextANGLE(GLeglContext ctx,
>+                                                         GLenum target,
>+                                                         GLint level,
>+                                                         GLenum pname,
>+                                                         GLint *params)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLenum target = 0x%X, GLint level = %d, GLenum pname = 0x%X, GLint * params = "
>+        "0x%016" PRIxPTR ")",
>+        target, level, pname, (uintptr_t)params);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        TextureTarget targetPacked = FromGLenum<TextureTarget>(target);
>+        if (context->skipValidation() ||
>+            ValidateGetTexLevelParameterivANGLE(context, targetPacked, level, pname, params))
>+        {
>+            context->getTexLevelParameteriv(targetPacked, level, pname, params);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY GetTexLevelParameterfvANGLEContextANGLE(GLeglContext ctx,
>+                                                         GLenum target,
>+                                                         GLint level,
>+                                                         GLenum pname,
>+                                                         GLfloat *params)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT(
>+        "(GLenum target = 0x%X, GLint level = %d, GLenum pname = 0x%X, GLfloat * params = "
>+        "0x%016" PRIxPTR ")",
>+        target, level, pname, (uintptr_t)params);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        TextureTarget targetPacked = FromGLenum<TextureTarget>(target);
>+        if (context->skipValidation() ||
>+            ValidateGetTexLevelParameterfvANGLE(context, targetPacked, level, pname, params))
>+        {
>+            context->getTexLevelParameterfv(targetPacked, level, pname, params);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY MultiDrawArraysANGLEContextANGLE(GLeglContext ctx,
>+                                                  GLenum mode,
>+                                                  const GLint *firsts,
>+                                                  const GLsizei *counts,
>+                                                  GLsizei drawcount)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum mode = 0x%X, const GLint *firsts = 0x%016" PRIxPTR
>+          ", const GLsizei *counts = 0x%016" PRIxPTR ", GLsizei drawcount = %d)",
>+          mode, (uintptr_t)firsts, (uintptr_t)counts, drawcount);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        PrimitiveMode modePacked = FromGLenum<PrimitiveMode>(mode);
>+        if (context->skipValidation() ||
>+            ValidateMultiDrawArraysANGLE(context, modePacked, firsts, counts, drawcount))
>+        {
>+            context->multiDrawArrays(modePacked, firsts, counts, drawcount);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY MultiDrawArraysInstancedANGLEContextANGLE(GLeglContext ctx,
>+                                                           GLenum mode,
>+                                                           const GLint *firsts,
>+                                                           const GLsizei *counts,
>+                                                           const GLsizei *instanceCounts,
>+                                                           GLsizei drawcount)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum mode = 0x%X, const GLint *firsts = 0x%016" PRIxPTR
>+          ", const GLsizei *counts = 0x%016" PRIxPTR
>+          ", const GLsizei *instanceCounts = 0x%016" PRIxPTR ", GLsizei drawcount = %d)",
>+          mode, (uintptr_t)firsts, (uintptr_t)counts, (uintptr_t)instanceCounts, drawcount);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        PrimitiveMode modePacked = FromGLenum<PrimitiveMode>(mode);
>+        if (context->skipValidation() ||
>+            ValidateMultiDrawArraysInstancedANGLE(context, modePacked, firsts, counts,
>+                                                  instanceCounts, drawcount))
>+        {
>+            context->multiDrawArraysInstanced(modePacked, firsts, counts, instanceCounts,
>+                                              drawcount);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY MultiDrawElementsANGLEContextANGLE(GLeglContext ctx,
>+                                                    GLenum mode,
>+                                                    const GLsizei *counts,
>+                                                    GLenum type,
>+                                                    const GLvoid *const *indices,
>+                                                    GLsizei drawcount)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum mode = 0x%X, const GLsizei *counts = 0x%016" PRIxPTR
>+          ", GLenum type = 0x%X, const GLvoid *const*indices = 0x%016" PRIxPTR
>+          ", GLsizei drawcount = %d)",
>+          mode, (uintptr_t)counts, type, (uintptr_t)indices, drawcount);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        PrimitiveMode modePacked    = FromGLenum<PrimitiveMode>(mode);
>+        DrawElementsType typePacked = FromGLenum<DrawElementsType>(type);
>+        if (context->skipValidation() ||
>+            ValidateMultiDrawElementsANGLE(context, modePacked, counts, typePacked, indices,
>+                                           drawcount))
>+        {
>+            context->multiDrawElements(modePacked, counts, typePacked, indices, drawcount);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY MultiDrawElementsInstancedANGLEContextANGLE(GLeglContext ctx,
>+                                                             GLenum mode,
>+                                                             const GLsizei *counts,
>+                                                             GLenum type,
>+                                                             const GLvoid *const *indices,
>+                                                             const GLsizei *instanceCounts,
>+                                                             GLsizei drawcount)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum mode = 0x%X, const GLsizei *counts = 0x%016" PRIxPTR
>+          ", GLenum type = 0x%X, const GLvoid *const*indices = 0x%016" PRIxPTR
>+          ", const GLsizei*instanceCounts = 0x%016" PRIxPTR ", GLsizei drawcount = %d)",
>+          mode, (uintptr_t)counts, type, (uintptr_t)indices, (uintptr_t)instanceCounts, drawcount);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        PrimitiveMode modePacked    = FromGLenum<PrimitiveMode>(mode);
>+        DrawElementsType typePacked = FromGLenum<DrawElementsType>(type);
>+        if (context->skipValidation() ||
>+            ValidateMultiDrawElementsInstancedANGLE(context, modePacked, counts, typePacked,
>+                                                    indices, instanceCounts, drawcount))
>+        {
>+            context->multiDrawElementsInstanced(modePacked, counts, typePacked, indices,
>+                                                instanceCounts, drawcount);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY GetMultisamplefvANGLEContextANGLE(GLeglContext ctx,
>+                                                   GLenum pname,
>+                                                   GLuint index,
>+                                                   GLfloat *val)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum pname = 0x%X, GLuint index = %u, GLfloat * val = 0x%016" PRIxPTR ")", pname,
>+          index, (uintptr_t)val);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateGetMultisamplefvANGLE(context, pname, index, val))
>+        {
>+            context->getMultisamplefv(pname, index, val);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY SampleMaskiANGLEContextANGLE(GLeglContext ctx, GLuint maskNumber, GLbitfield mask)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLuint maskNumber = %u, GLbitfield mask = 0x%X)", maskNumber, mask);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        if (context->skipValidation() || ValidateSampleMaskiANGLE(context, maskNumber, mask))
>+        {
>+            context->sampleMaski(maskNumber, mask);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY ProvokingVertexANGLEContextANGLE(GLeglContext ctx, GLenum mode)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum mode = 0x%X)", mode);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        ProvokingVertex modePacked = FromGLenum<ProvokingVertex>(mode);
>+        if (context->skipValidation() || ValidateProvokingVertexANGLE(context, modePacked))
>+        {
>+            context->provokingVertex(modePacked);
>+        }
>+    }
>+}
>+
>+void GL_APIENTRY LoseContextCHROMIUMContextANGLE(GLeglContext ctx, GLenum current, GLenum other)
>+{
>+    ANGLE_SCOPED_GLOBAL_LOCK();
>+    EVENT("(GLenum current = 0x%X, GLenum other = 0x%X)", current, other);
>+
>+    Context *context = static_cast<gl::Context *>(ctx);
>+    if (context)
>+    {
>+        ASSERT(context == GetValidGlobalContext());
>+        GraphicsResetStatus currentPacked = FromGLenum<GraphicsResetStatus>(current);
>+        GraphicsResetStatus otherPacked   = FromGLenum<GraphicsResetStatus>(other);
>+        if (context->skipValidation() ||
>+            ValidateLoseContextCHROMIUM(context, currentPacked, otherPacked))
>+        {
>+            context->loseContext(currentPacked, otherPacked);
>+        }
>+    }
>+}
>+}  // namespace gl
>diff --git a/Source/ThirdParty/ANGLE/src/libGLESv2/entry_points_gles_ext_autogen.h b/Source/ThirdParty/ANGLE/src/libGLESv2/entry_points_gles_ext_autogen.h
>new file mode 100644
>index 00000000000..530a89c74a1
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libGLESv2/entry_points_gles_ext_autogen.h
>@@ -0,0 +1,3733 @@
>+// GENERATED FILE - DO NOT EDIT.
>+// Generated by generate_entry_points.py using data from gl.xml and gl_angle_ext.xml.
>+//
>+// Copyright 2019 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// entry_points_gles_ext_autogen.h:
>+//   Defines the GLES extension entry points.
>+
>+#ifndef LIBGLESV2_ENTRY_POINTS_GLES_EXT_AUTOGEN_H_
>+#define LIBGLESV2_ENTRY_POINTS_GLES_EXT_AUTOGEN_H_
>+
>+#include <GLES/gl.h>
>+#include <GLES/glext.h>
>+#include <GLES2/gl2.h>
>+#include <GLES2/gl2ext.h>
>+#include <export.h>
>+
>+namespace gl
>+{
>+
>+// GL_ANGLE_copy_texture_3d
>+ANGLE_EXPORT void GL_APIENTRY CopyTexture3DANGLE(GLuint sourceId,
>+                                                 GLint sourceLevel,
>+                                                 GLenum destTarget,
>+                                                 GLuint destId,
>+                                                 GLint destLevel,
>+                                                 GLint internalFormat,
>+                                                 GLenum destType,
>+                                                 GLboolean unpackFlipY,
>+                                                 GLboolean unpackPremultiplyAlpha,
>+                                                 GLboolean unpackUnmultiplyAlpha);
>+ANGLE_EXPORT void GL_APIENTRY CopySubTexture3DANGLE(GLuint sourceId,
>+                                                    GLint sourceLevel,
>+                                                    GLenum destTarget,
>+                                                    GLuint destId,
>+                                                    GLint destLevel,
>+                                                    GLint xoffset,
>+                                                    GLint yoffset,
>+                                                    GLint zoffset,
>+                                                    GLint x,
>+                                                    GLint y,
>+                                                    GLint z,
>+                                                    GLint width,
>+                                                    GLint height,
>+                                                    GLint depth,
>+                                                    GLboolean unpackFlipY,
>+                                                    GLboolean unpackPremultiplyAlpha,
>+                                                    GLboolean unpackUnmultiplyAlpha);
>+
>+// GL_ANGLE_framebuffer_blit
>+ANGLE_EXPORT void GL_APIENTRY BlitFramebufferANGLE(GLint srcX0,
>+                                                   GLint srcY0,
>+                                                   GLint srcX1,
>+                                                   GLint srcY1,
>+                                                   GLint dstX0,
>+                                                   GLint dstY0,
>+                                                   GLint dstX1,
>+                                                   GLint dstY1,
>+                                                   GLbitfield mask,
>+                                                   GLenum filter);
>+
>+// GL_ANGLE_framebuffer_multisample
>+ANGLE_EXPORT void GL_APIENTRY RenderbufferStorageMultisampleANGLE(GLenum target,
>+                                                                  GLsizei samples,
>+                                                                  GLenum internalformat,
>+                                                                  GLsizei width,
>+                                                                  GLsizei height);
>+
>+// GL_ANGLE_instanced_arrays
>+ANGLE_EXPORT void GL_APIENTRY DrawArraysInstancedANGLE(GLenum mode,
>+                                                       GLint first,
>+                                                       GLsizei count,
>+                                                       GLsizei primcount);
>+ANGLE_EXPORT void GL_APIENTRY DrawElementsInstancedANGLE(GLenum mode,
>+                                                         GLsizei count,
>+                                                         GLenum type,
>+                                                         const void *indices,
>+                                                         GLsizei primcount);
>+ANGLE_EXPORT void GL_APIENTRY VertexAttribDivisorANGLE(GLuint index, GLuint divisor);
>+
>+// GL_ANGLE_multi_draw
>+ANGLE_EXPORT void GL_APIENTRY MultiDrawArraysANGLE(GLenum mode,
>+                                                   const GLint *firsts,
>+                                                   const GLsizei *counts,
>+                                                   GLsizei drawcount);
>+ANGLE_EXPORT void GL_APIENTRY MultiDrawArraysInstancedANGLE(GLenum mode,
>+                                                            const GLint *firsts,
>+                                                            const GLsizei *counts,
>+                                                            const GLsizei *instanceCounts,
>+                                                            GLsizei drawcount);
>+ANGLE_EXPORT void GL_APIENTRY MultiDrawElementsANGLE(GLenum mode,
>+                                                     const GLsizei *counts,
>+                                                     GLenum type,
>+                                                     const GLvoid *const *indices,
>+                                                     GLsizei drawcount);
>+ANGLE_EXPORT void GL_APIENTRY MultiDrawElementsInstancedANGLE(GLenum mode,
>+                                                              const GLsizei *counts,
>+                                                              GLenum type,
>+                                                              const GLvoid *const *indices,
>+                                                              const GLsizei *instanceCounts,
>+                                                              GLsizei drawcount);
>+
>+// GL_ANGLE_provoking_vertex
>+ANGLE_EXPORT void GL_APIENTRY ProvokingVertexANGLE(GLenum mode);
>+
>+// GL_ANGLE_request_extension
>+ANGLE_EXPORT void GL_APIENTRY RequestExtensionANGLE(const GLchar *name);
>+
>+// GL_ANGLE_robust_client_memory
>+ANGLE_EXPORT void GL_APIENTRY GetBooleanvRobustANGLE(GLenum pname,
>+                                                     GLsizei bufSize,
>+                                                     GLsizei *length,
>+                                                     GLboolean *params);
>+ANGLE_EXPORT void GL_APIENTRY GetBufferParameterivRobustANGLE(GLenum target,
>+                                                              GLenum pname,
>+                                                              GLsizei bufSize,
>+                                                              GLsizei *length,
>+                                                              GLint *params);
>+ANGLE_EXPORT void GL_APIENTRY GetFloatvRobustANGLE(GLenum pname,
>+                                                   GLsizei bufSize,
>+                                                   GLsizei *length,
>+                                                   GLfloat *params);
>+ANGLE_EXPORT void GL_APIENTRY GetFramebufferAttachmentParameterivRobustANGLE(GLenum target,
>+                                                                             GLenum attachment,
>+                                                                             GLenum pname,
>+                                                                             GLsizei bufSize,
>+                                                                             GLsizei *length,
>+                                                                             GLint *params);
>+ANGLE_EXPORT void GL_APIENTRY GetIntegervRobustANGLE(GLenum pname,
>+                                                     GLsizei bufSize,
>+                                                     GLsizei *length,
>+                                                     GLint *data);
>+ANGLE_EXPORT void GL_APIENTRY GetProgramivRobustANGLE(GLuint program,
>+                                                      GLenum pname,
>+                                                      GLsizei bufSize,
>+                                                      GLsizei *length,
>+                                                      GLint *params);
>+ANGLE_EXPORT void GL_APIENTRY GetRenderbufferParameterivRobustANGLE(GLenum target,
>+                                                                    GLenum pname,
>+                                                                    GLsizei bufSize,
>+                                                                    GLsizei *length,
>+                                                                    GLint *params);
>+ANGLE_EXPORT void GL_APIENTRY GetShaderivRobustANGLE(GLuint shader,
>+                                                     GLenum pname,
>+                                                     GLsizei bufSize,
>+                                                     GLsizei *length,
>+                                                     GLint *params);
>+ANGLE_EXPORT void GL_APIENTRY GetTexParameterfvRobustANGLE(GLenum target,
>+                                                           GLenum pname,
>+                                                           GLsizei bufSize,
>+                                                           GLsizei *length,
>+                                                           GLfloat *params);
>+ANGLE_EXPORT void GL_APIENTRY GetTexParameterivRobustANGLE(GLenum target,
>+                                                           GLenum pname,
>+                                                           GLsizei bufSize,
>+                                                           GLsizei *length,
>+                                                           GLint *params);
>+ANGLE_EXPORT void GL_APIENTRY GetUniformfvRobustANGLE(GLuint program,
>+                                                      GLint location,
>+                                                      GLsizei bufSize,
>+                                                      GLsizei *length,
>+                                                      GLfloat *params);
>+ANGLE_EXPORT void GL_APIENTRY GetUniformivRobustANGLE(GLuint program,
>+                                                      GLint location,
>+                                                      GLsizei bufSize,
>+                                                      GLsizei *length,
>+                                                      GLint *params);
>+ANGLE_EXPORT void GL_APIENTRY GetVertexAttribfvRobustANGLE(GLuint index,
>+                                                           GLenum pname,
>+                                                           GLsizei bufSize,
>+                                                           GLsizei *length,
>+                                                           GLfloat *params);
>+ANGLE_EXPORT void GL_APIENTRY GetVertexAttribivRobustANGLE(GLuint index,
>+                                                           GLenum pname,
>+                                                           GLsizei bufSize,
>+                                                           GLsizei *length,
>+                                                           GLint *params);
>+ANGLE_EXPORT void GL_APIENTRY GetVertexAttribPointervRobustANGLE(GLuint index,
>+                                                                 GLenum pname,
>+                                                                 GLsizei bufSize,
>+                                                                 GLsizei *length,
>+                                                                 void **pointer);
>+ANGLE_EXPORT void GL_APIENTRY ReadPixelsRobustANGLE(GLint x,
>+                                                    GLint y,
>+                                                    GLsizei width,
>+                                                    GLsizei height,
>+                                                    GLenum format,
>+                                                    GLenum type,
>+                                                    GLsizei bufSize,
>+                                                    GLsizei *length,
>+                                                    GLsizei *columns,
>+                                                    GLsizei *rows,
>+                                                    void *pixels);
>+ANGLE_EXPORT void GL_APIENTRY TexImage2DRobustANGLE(GLenum target,
>+                                                    GLint level,
>+                                                    GLint internalformat,
>+                                                    GLsizei width,
>+                                                    GLsizei height,
>+                                                    GLint border,
>+                                                    GLenum format,
>+                                                    GLenum type,
>+                                                    GLsizei bufSize,
>+                                                    const void *pixels);
>+ANGLE_EXPORT void GL_APIENTRY TexParameterfvRobustANGLE(GLenum target,
>+                                                        GLenum pname,
>+                                                        GLsizei bufSize,
>+                                                        const GLfloat *params);
>+ANGLE_EXPORT void GL_APIENTRY TexParameterivRobustANGLE(GLenum target,
>+                                                        GLenum pname,
>+                                                        GLsizei bufSize,
>+                                                        const GLint *params);
>+ANGLE_EXPORT void GL_APIENTRY TexSubImage2DRobustANGLE(GLenum target,
>+                                                       GLint level,
>+                                                       GLint xoffset,
>+                                                       GLint yoffset,
>+                                                       GLsizei width,
>+                                                       GLsizei height,
>+                                                       GLenum format,
>+                                                       GLenum type,
>+                                                       GLsizei bufSize,
>+                                                       const void *pixels);
>+ANGLE_EXPORT void GL_APIENTRY TexImage3DRobustANGLE(GLenum target,
>+                                                    GLint level,
>+                                                    GLint internalformat,
>+                                                    GLsizei width,
>+                                                    GLsizei height,
>+                                                    GLsizei depth,
>+                                                    GLint border,
>+                                                    GLenum format,
>+                                                    GLenum type,
>+                                                    GLsizei bufSize,
>+                                                    const void *pixels);
>+ANGLE_EXPORT void GL_APIENTRY TexSubImage3DRobustANGLE(GLenum target,
>+                                                       GLint level,
>+                                                       GLint xoffset,
>+                                                       GLint yoffset,
>+                                                       GLint zoffset,
>+                                                       GLsizei width,
>+                                                       GLsizei height,
>+                                                       GLsizei depth,
>+                                                       GLenum format,
>+                                                       GLenum type,
>+                                                       GLsizei bufSize,
>+                                                       const void *pixels);
>+ANGLE_EXPORT void GL_APIENTRY CompressedTexImage2DRobustANGLE(GLenum target,
>+                                                              GLint level,
>+                                                              GLenum internalformat,
>+                                                              GLsizei width,
>+                                                              GLsizei height,
>+                                                              GLint border,
>+                                                              GLsizei imageSize,
>+                                                              GLsizei dataSize,
>+                                                              const GLvoid *data);
>+ANGLE_EXPORT void GL_APIENTRY CompressedTexSubImage2DRobustANGLE(GLenum target,
>+                                                                 GLint level,
>+                                                                 GLsizei xoffset,
>+                                                                 GLsizei yoffset,
>+                                                                 GLsizei width,
>+                                                                 GLsizei height,
>+                                                                 GLenum format,
>+                                                                 GLsizei imageSize,
>+                                                                 GLsizei dataSize,
>+                                                                 const GLvoid *data);
>+ANGLE_EXPORT void GL_APIENTRY CompressedTexImage3DRobustANGLE(GLenum target,
>+                                                              GLint level,
>+                                                              GLenum internalformat,
>+                                                              GLsizei width,
>+                                                              GLsizei height,
>+                                                              GLsizei depth,
>+                                                              GLint border,
>+                                                              GLsizei imageSize,
>+                                                              GLsizei dataSize,
>+                                                              const GLvoid *data);
>+ANGLE_EXPORT void GL_APIENTRY CompressedTexSubImage3DRobustANGLE(GLenum target,
>+                                                                 GLint level,
>+                                                                 GLint xoffset,
>+                                                                 GLint yoffset,
>+                                                                 GLint zoffset,
>+                                                                 GLsizei width,
>+                                                                 GLsizei height,
>+                                                                 GLsizei depth,
>+                                                                 GLenum format,
>+                                                                 GLsizei imageSize,
>+                                                                 GLsizei dataSize,
>+                                                                 const GLvoid *data);
>+ANGLE_EXPORT void GL_APIENTRY
>+GetQueryivRobustANGLE(GLenum target, GLenum pname, GLsizei bufSize, GLsizei *length, GLint *params);
>+ANGLE_EXPORT void GL_APIENTRY GetQueryObjectuivRobustANGLE(GLuint id,
>+                                                           GLenum pname,
>+                                                           GLsizei bufSize,
>+                                                           GLsizei *length,
>+                                                           GLuint *params);
>+ANGLE_EXPORT void GL_APIENTRY GetBufferPointervRobustANGLE(GLenum target,
>+                                                           GLenum pname,
>+                                                           GLsizei bufSize,
>+                                                           GLsizei *length,
>+                                                           void **params);
>+ANGLE_EXPORT void GL_APIENTRY GetIntegeri_vRobustANGLE(GLenum target,
>+                                                       GLuint index,
>+                                                       GLsizei bufSize,
>+                                                       GLsizei *length,
>+                                                       GLint *data);
>+ANGLE_EXPORT void GL_APIENTRY GetInternalformativRobustANGLE(GLenum target,
>+                                                             GLenum internalformat,
>+                                                             GLenum pname,
>+                                                             GLsizei bufSize,
>+                                                             GLsizei *length,
>+                                                             GLint *params);
>+ANGLE_EXPORT void GL_APIENTRY GetVertexAttribIivRobustANGLE(GLuint index,
>+                                                            GLenum pname,
>+                                                            GLsizei bufSize,
>+                                                            GLsizei *length,
>+                                                            GLint *params);
>+ANGLE_EXPORT void GL_APIENTRY GetVertexAttribIuivRobustANGLE(GLuint index,
>+                                                             GLenum pname,
>+                                                             GLsizei bufSize,
>+                                                             GLsizei *length,
>+                                                             GLuint *params);
>+ANGLE_EXPORT void GL_APIENTRY GetUniformuivRobustANGLE(GLuint program,
>+                                                       GLint location,
>+                                                       GLsizei bufSize,
>+                                                       GLsizei *length,
>+                                                       GLuint *params);
>+ANGLE_EXPORT void GL_APIENTRY GetActiveUniformBlockivRobustANGLE(GLuint program,
>+                                                                 GLuint uniformBlockIndex,
>+                                                                 GLenum pname,
>+                                                                 GLsizei bufSize,
>+                                                                 GLsizei *length,
>+                                                                 GLint *params);
>+ANGLE_EXPORT void GL_APIENTRY GetInteger64vRobustANGLE(GLenum pname,
>+                                                       GLsizei bufSize,
>+                                                       GLsizei *length,
>+                                                       GLint64 *data);
>+ANGLE_EXPORT void GL_APIENTRY GetInteger64i_vRobustANGLE(GLenum target,
>+                                                         GLuint index,
>+                                                         GLsizei bufSize,
>+                                                         GLsizei *length,
>+                                                         GLint64 *data);
>+ANGLE_EXPORT void GL_APIENTRY GetBufferParameteri64vRobustANGLE(GLenum target,
>+                                                                GLenum pname,
>+                                                                GLsizei bufSize,
>+                                                                GLsizei *length,
>+                                                                GLint64 *params);
>+ANGLE_EXPORT void GL_APIENTRY SamplerParameterivRobustANGLE(GLuint sampler,
>+                                                            GLuint pname,
>+                                                            GLsizei bufSize,
>+                                                            const GLint *param);
>+ANGLE_EXPORT void GL_APIENTRY SamplerParameterfvRobustANGLE(GLuint sampler,
>+                                                            GLenum pname,
>+                                                            GLsizei bufSize,
>+                                                            const GLfloat *param);
>+ANGLE_EXPORT void GL_APIENTRY GetSamplerParameterivRobustANGLE(GLuint sampler,
>+                                                               GLenum pname,
>+                                                               GLsizei bufSize,
>+                                                               GLsizei *length,
>+                                                               GLint *params);
>+ANGLE_EXPORT void GL_APIENTRY GetSamplerParameterfvRobustANGLE(GLuint sampler,
>+                                                               GLenum pname,
>+                                                               GLsizei bufSize,
>+                                                               GLsizei *length,
>+                                                               GLfloat *params);
>+ANGLE_EXPORT void GL_APIENTRY GetFramebufferParameterivRobustANGLE(GLuint sampler,
>+                                                                   GLenum pname,
>+                                                                   GLsizei bufSize,
>+                                                                   GLsizei *length,
>+                                                                   GLint *params);
>+ANGLE_EXPORT void GL_APIENTRY GetProgramInterfaceivRobustANGLE(GLuint program,
>+                                                               GLenum programInterface,
>+                                                               GLenum pname,
>+                                                               GLsizei bufSize,
>+                                                               GLsizei *length,
>+                                                               GLint *params);
>+ANGLE_EXPORT void GL_APIENTRY GetBooleani_vRobustANGLE(GLenum target,
>+                                                       GLuint index,
>+                                                       GLsizei bufSize,
>+                                                       GLsizei *length,
>+                                                       GLboolean *data);
>+ANGLE_EXPORT void GL_APIENTRY GetMultisamplefvRobustANGLE(GLenum pname,
>+                                                          GLuint index,
>+                                                          GLsizei bufSize,
>+                                                          GLsizei *length,
>+                                                          GLfloat *val);
>+ANGLE_EXPORT void GL_APIENTRY GetTexLevelParameterivRobustANGLE(GLenum target,
>+                                                                GLint level,
>+                                                                GLenum pname,
>+                                                                GLsizei bufSize,
>+                                                                GLsizei *length,
>+                                                                GLint *params);
>+ANGLE_EXPORT void GL_APIENTRY GetTexLevelParameterfvRobustANGLE(GLenum target,
>+                                                                GLint level,
>+                                                                GLenum pname,
>+                                                                GLsizei bufSize,
>+                                                                GLsizei *length,
>+                                                                GLfloat *params);
>+ANGLE_EXPORT void GL_APIENTRY GetPointervRobustANGLERobustANGLE(GLenum pname,
>+                                                                GLsizei bufSize,
>+                                                                GLsizei *length,
>+                                                                void **params);
>+ANGLE_EXPORT void GL_APIENTRY ReadnPixelsRobustANGLE(GLint x,
>+                                                     GLint y,
>+                                                     GLsizei width,
>+                                                     GLsizei height,
>+                                                     GLenum format,
>+                                                     GLenum type,
>+                                                     GLsizei bufSize,
>+                                                     GLsizei *length,
>+                                                     GLsizei *columns,
>+                                                     GLsizei *rows,
>+                                                     void *data);
>+ANGLE_EXPORT void GL_APIENTRY GetnUniformfvRobustANGLE(GLuint program,
>+                                                       GLint location,
>+                                                       GLsizei bufSize,
>+                                                       GLsizei *length,
>+                                                       GLfloat *params);
>+ANGLE_EXPORT void GL_APIENTRY GetnUniformivRobustANGLE(GLuint program,
>+                                                       GLint location,
>+                                                       GLsizei bufSize,
>+                                                       GLsizei *length,
>+                                                       GLint *params);
>+ANGLE_EXPORT void GL_APIENTRY GetnUniformuivRobustANGLE(GLuint program,
>+                                                        GLint location,
>+                                                        GLsizei bufSize,
>+                                                        GLsizei *length,
>+                                                        GLuint *params);
>+ANGLE_EXPORT void GL_APIENTRY TexParameterIivRobustANGLE(GLenum target,
>+                                                         GLenum pname,
>+                                                         GLsizei bufSize,
>+                                                         const GLint *params);
>+ANGLE_EXPORT void GL_APIENTRY TexParameterIuivRobustANGLE(GLenum target,
>+                                                          GLenum pname,
>+                                                          GLsizei bufSize,
>+                                                          const GLuint *params);
>+ANGLE_EXPORT void GL_APIENTRY GetTexParameterIivRobustANGLE(GLenum target,
>+                                                            GLenum pname,
>+                                                            GLsizei bufSize,
>+                                                            GLsizei *length,
>+                                                            GLint *params);
>+ANGLE_EXPORT void GL_APIENTRY GetTexParameterIuivRobustANGLE(GLenum target,
>+                                                             GLenum pname,
>+                                                             GLsizei bufSize,
>+                                                             GLsizei *length,
>+                                                             GLuint *params);
>+ANGLE_EXPORT void GL_APIENTRY SamplerParameterIivRobustANGLE(GLuint sampler,
>+                                                             GLenum pname,
>+                                                             GLsizei bufSize,
>+                                                             const GLint *param);
>+ANGLE_EXPORT void GL_APIENTRY SamplerParameterIuivRobustANGLE(GLuint sampler,
>+                                                              GLenum pname,
>+                                                              GLsizei bufSize,
>+                                                              const GLuint *param);
>+ANGLE_EXPORT void GL_APIENTRY GetSamplerParameterIivRobustANGLE(GLuint sampler,
>+                                                                GLenum pname,
>+                                                                GLsizei bufSize,
>+                                                                GLsizei *length,
>+                                                                GLint *params);
>+ANGLE_EXPORT void GL_APIENTRY GetSamplerParameterIuivRobustANGLE(GLuint sampler,
>+                                                                 GLenum pname,
>+                                                                 GLsizei bufSize,
>+                                                                 GLsizei *length,
>+                                                                 GLuint *params);
>+ANGLE_EXPORT void GL_APIENTRY GetQueryObjectivRobustANGLE(GLuint id,
>+                                                          GLenum pname,
>+                                                          GLsizei bufSize,
>+                                                          GLsizei *length,
>+                                                          GLint *params);
>+ANGLE_EXPORT void GL_APIENTRY GetQueryObjecti64vRobustANGLE(GLuint id,
>+                                                            GLenum pname,
>+                                                            GLsizei bufSize,
>+                                                            GLsizei *length,
>+                                                            GLint64 *params);
>+ANGLE_EXPORT void GL_APIENTRY GetQueryObjectui64vRobustANGLE(GLuint id,
>+                                                             GLenum pname,
>+                                                             GLsizei bufSize,
>+                                                             GLsizei *length,
>+                                                             GLuint64 *params);
>+
>+// GL_ANGLE_texture_multisample
>+ANGLE_EXPORT void GL_APIENTRY TexStorage2DMultisampleANGLE(GLenum target,
>+                                                           GLsizei samples,
>+                                                           GLenum internalformat,
>+                                                           GLsizei width,
>+                                                           GLsizei height,
>+                                                           GLboolean fixedsamplelocations);
>+ANGLE_EXPORT void GL_APIENTRY GetTexLevelParameterivANGLE(GLenum target,
>+                                                          GLint level,
>+                                                          GLenum pname,
>+                                                          GLint *params);
>+ANGLE_EXPORT void GL_APIENTRY GetTexLevelParameterfvANGLE(GLenum target,
>+                                                          GLint level,
>+                                                          GLenum pname,
>+                                                          GLfloat *params);
>+ANGLE_EXPORT void GL_APIENTRY GetMultisamplefvANGLE(GLenum pname, GLuint index, GLfloat *val);
>+ANGLE_EXPORT void GL_APIENTRY SampleMaskiANGLE(GLuint maskNumber, GLbitfield mask);
>+
>+// GL_ANGLE_translated_shader_source
>+ANGLE_EXPORT void GL_APIENTRY GetTranslatedShaderSourceANGLE(GLuint shader,
>+                                                             GLsizei bufsize,
>+                                                             GLsizei *length,
>+                                                             GLchar *source);
>+
>+// GL_CHROMIUM_bind_uniform_location
>+ANGLE_EXPORT void GL_APIENTRY BindUniformLocationCHROMIUM(GLuint program,
>+                                                          GLint location,
>+                                                          const GLchar *name);
>+
>+// GL_CHROMIUM_copy_compressed_texture
>+ANGLE_EXPORT void GL_APIENTRY CompressedCopyTextureCHROMIUM(GLuint sourceId, GLuint destId);
>+
>+// GL_CHROMIUM_copy_texture
>+ANGLE_EXPORT void GL_APIENTRY CopyTextureCHROMIUM(GLuint sourceId,
>+                                                  GLint sourceLevel,
>+                                                  GLenum destTarget,
>+                                                  GLuint destId,
>+                                                  GLint destLevel,
>+                                                  GLint internalFormat,
>+                                                  GLenum destType,
>+                                                  GLboolean unpackFlipY,
>+                                                  GLboolean unpackPremultiplyAlpha,
>+                                                  GLboolean unpackUnmultiplyAlpha);
>+ANGLE_EXPORT void GL_APIENTRY CopySubTextureCHROMIUM(GLuint sourceId,
>+                                                     GLint sourceLevel,
>+                                                     GLenum destTarget,
>+                                                     GLuint destId,
>+                                                     GLint destLevel,
>+                                                     GLint xoffset,
>+                                                     GLint yoffset,
>+                                                     GLint x,
>+                                                     GLint y,
>+                                                     GLint width,
>+                                                     GLint height,
>+                                                     GLboolean unpackFlipY,
>+                                                     GLboolean unpackPremultiplyAlpha,
>+                                                     GLboolean unpackUnmultiplyAlpha);
>+
>+// GL_CHROMIUM_framebuffer_mixed_samples
>+ANGLE_EXPORT void GL_APIENTRY CoverageModulationCHROMIUM(GLenum components);
>+ANGLE_EXPORT void GL_APIENTRY MatrixLoadfCHROMIUM(GLenum matrixMode, const GLfloat *matrix);
>+ANGLE_EXPORT void GL_APIENTRY MatrixLoadIdentityCHROMIUM(GLenum matrixMode);
>+
>+// GL_CHROMIUM_lose_context
>+ANGLE_EXPORT void GL_APIENTRY LoseContextCHROMIUM(GLenum current, GLenum other);
>+
>+// GL_CHROMIUM_path_rendering
>+ANGLE_EXPORT GLuint GL_APIENTRY GenPathsCHROMIUM(GLsizei range);
>+ANGLE_EXPORT void GL_APIENTRY DeletePathsCHROMIUM(GLuint first, GLsizei range);
>+ANGLE_EXPORT GLboolean GL_APIENTRY IsPathCHROMIUM(GLuint path);
>+ANGLE_EXPORT void GL_APIENTRY PathCommandsCHROMIUM(GLuint path,
>+                                                   GLsizei numCommands,
>+                                                   const GLubyte *commands,
>+                                                   GLsizei numCoords,
>+                                                   GLenum coordType,
>+                                                   const void *coords);
>+ANGLE_EXPORT void GL_APIENTRY PathParameterfCHROMIUM(GLuint path, GLenum pname, GLfloat value);
>+ANGLE_EXPORT void GL_APIENTRY PathParameteriCHROMIUM(GLuint path, GLenum pname, GLint value);
>+ANGLE_EXPORT void GL_APIENTRY GetPathParameterfvCHROMIUM(GLuint path, GLenum pname, GLfloat *value);
>+ANGLE_EXPORT void GL_APIENTRY GetPathParameterivCHROMIUM(GLuint path, GLenum pname, GLint *value);
>+ANGLE_EXPORT void GL_APIENTRY PathStencilFuncCHROMIUM(GLenum func, GLint ref, GLuint mask);
>+ANGLE_EXPORT void GL_APIENTRY StencilFillPathCHROMIUM(GLuint path, GLenum fillMode, GLuint mask);
>+ANGLE_EXPORT void GL_APIENTRY StencilStrokePathCHROMIUM(GLuint path, GLint reference, GLuint mask);
>+ANGLE_EXPORT void GL_APIENTRY CoverFillPathCHROMIUM(GLuint path, GLenum coverMode);
>+ANGLE_EXPORT void GL_APIENTRY CoverStrokePathCHROMIUM(GLuint path, GLenum coverMode);
>+ANGLE_EXPORT void GL_APIENTRY StencilThenCoverFillPathCHROMIUM(GLuint path,
>+                                                               GLenum fillMode,
>+                                                               GLuint mask,
>+                                                               GLenum coverMode);
>+ANGLE_EXPORT void GL_APIENTRY StencilThenCoverStrokePathCHROMIUM(GLuint path,
>+                                                                 GLint reference,
>+                                                                 GLuint mask,
>+                                                                 GLenum coverMode);
>+ANGLE_EXPORT void GL_APIENTRY CoverFillPathInstancedCHROMIUM(GLsizei numPath,
>+                                                             GLenum pathNameType,
>+                                                             const void *paths,
>+                                                             GLuint pathBase,
>+                                                             GLenum coverMode,
>+                                                             GLenum transformType,
>+                                                             const GLfloat *transformValues);
>+ANGLE_EXPORT void GL_APIENTRY CoverStrokePathInstancedCHROMIUM(GLsizei numPath,
>+                                                               GLenum pathNameType,
>+                                                               const void *paths,
>+                                                               GLuint pathBase,
>+                                                               GLenum coverMode,
>+                                                               GLenum transformType,
>+                                                               const GLfloat *transformValues);
>+ANGLE_EXPORT void GL_APIENTRY StencilStrokePathInstancedCHROMIUM(GLsizei numPath,
>+                                                                 GLenum pathNameType,
>+                                                                 const void *paths,
>+                                                                 GLuint pathBase,
>+                                                                 GLint reference,
>+                                                                 GLuint mask,
>+                                                                 GLenum transformType,
>+                                                                 const GLfloat *transformValues);
>+ANGLE_EXPORT void GL_APIENTRY StencilFillPathInstancedCHROMIUM(GLsizei numPaths,
>+                                                               GLenum pathNameType,
>+                                                               const void *paths,
>+                                                               GLuint pathBase,
>+                                                               GLenum fillMode,
>+                                                               GLuint mask,
>+                                                               GLenum transformType,
>+                                                               const GLfloat *transformValues);
>+ANGLE_EXPORT void GL_APIENTRY
>+StencilThenCoverFillPathInstancedCHROMIUM(GLsizei numPaths,
>+                                          GLenum pathNameType,
>+                                          const void *paths,
>+                                          GLuint pathBase,
>+                                          GLenum fillMode,
>+                                          GLuint mask,
>+                                          GLenum coverMode,
>+                                          GLenum transformType,
>+                                          const GLfloat *transformValues);
>+ANGLE_EXPORT void GL_APIENTRY
>+StencilThenCoverStrokePathInstancedCHROMIUM(GLsizei numPaths,
>+                                            GLenum pathNameType,
>+                                            const void *paths,
>+                                            GLuint pathBase,
>+                                            GLint reference,
>+                                            GLuint mask,
>+                                            GLenum coverMode,
>+                                            GLenum transformType,
>+                                            const GLfloat *transformValues);
>+ANGLE_EXPORT void GL_APIENTRY BindFragmentInputLocationCHROMIUM(GLuint programs,
>+                                                                GLint location,
>+                                                                const GLchar *name);
>+ANGLE_EXPORT void GL_APIENTRY ProgramPathFragmentInputGenCHROMIUM(GLuint program,
>+                                                                  GLint location,
>+                                                                  GLenum genMode,
>+                                                                  GLint components,
>+                                                                  const GLfloat *coeffs);
>+
>+// GL_EXT_blend_func_extended
>+ANGLE_EXPORT void GL_APIENTRY BindFragDataLocationEXT(GLuint program,
>+                                                      GLuint color,
>+                                                      const GLchar *name);
>+ANGLE_EXPORT void GL_APIENTRY BindFragDataLocationIndexedEXT(GLuint program,
>+                                                             GLuint colorNumber,
>+                                                             GLuint index,
>+                                                             const GLchar *name);
>+ANGLE_EXPORT GLint GL_APIENTRY GetFragDataIndexEXT(GLuint program, const GLchar *name);
>+ANGLE_EXPORT GLint GL_APIENTRY GetProgramResourceLocationIndexEXT(GLuint program,
>+                                                                  GLenum programInterface,
>+                                                                  const GLchar *name);
>+
>+// GL_EXT_debug_marker
>+ANGLE_EXPORT void GL_APIENTRY InsertEventMarkerEXT(GLsizei length, const GLchar *marker);
>+ANGLE_EXPORT void GL_APIENTRY PopGroupMarkerEXT();
>+ANGLE_EXPORT void GL_APIENTRY PushGroupMarkerEXT(GLsizei length, const GLchar *marker);
>+
>+// GL_EXT_discard_framebuffer
>+ANGLE_EXPORT void GL_APIENTRY DiscardFramebufferEXT(GLenum target,
>+                                                    GLsizei numAttachments,
>+                                                    const GLenum *attachments);
>+
>+// GL_EXT_disjoint_timer_query
>+ANGLE_EXPORT void GL_APIENTRY BeginQueryEXT(GLenum target, GLuint id);
>+ANGLE_EXPORT void GL_APIENTRY DeleteQueriesEXT(GLsizei n, const GLuint *ids);
>+ANGLE_EXPORT void GL_APIENTRY EndQueryEXT(GLenum target);
>+ANGLE_EXPORT void GL_APIENTRY GenQueriesEXT(GLsizei n, GLuint *ids);
>+ANGLE_EXPORT void GL_APIENTRY GetQueryObjecti64vEXT(GLuint id, GLenum pname, GLint64 *params);
>+ANGLE_EXPORT void GL_APIENTRY GetQueryObjectivEXT(GLuint id, GLenum pname, GLint *params);
>+ANGLE_EXPORT void GL_APIENTRY GetQueryObjectui64vEXT(GLuint id, GLenum pname, GLuint64 *params);
>+ANGLE_EXPORT void GL_APIENTRY GetQueryObjectuivEXT(GLuint id, GLenum pname, GLuint *params);
>+ANGLE_EXPORT void GL_APIENTRY GetQueryivEXT(GLenum target, GLenum pname, GLint *params);
>+ANGLE_EXPORT GLboolean GL_APIENTRY IsQueryEXT(GLuint id);
>+ANGLE_EXPORT void GL_APIENTRY QueryCounterEXT(GLuint id, GLenum target);
>+
>+// GL_EXT_draw_buffers
>+ANGLE_EXPORT void GL_APIENTRY DrawBuffersEXT(GLsizei n, const GLenum *bufs);
>+
>+// GL_EXT_geometry_shader
>+ANGLE_EXPORT void GL_APIENTRY FramebufferTextureEXT(GLenum target,
>+                                                    GLenum attachment,
>+                                                    GLuint texture,
>+                                                    GLint level);
>+
>+// GL_EXT_instanced_arrays
>+ANGLE_EXPORT void GL_APIENTRY DrawArraysInstancedEXT(GLenum mode,
>+                                                     GLint start,
>+                                                     GLsizei count,
>+                                                     GLsizei primcount);
>+ANGLE_EXPORT void GL_APIENTRY DrawElementsInstancedEXT(GLenum mode,
>+                                                       GLsizei count,
>+                                                       GLenum type,
>+                                                       const void *indices,
>+                                                       GLsizei primcount);
>+ANGLE_EXPORT void GL_APIENTRY VertexAttribDivisorEXT(GLuint index, GLuint divisor);
>+
>+// GL_EXT_map_buffer_range
>+ANGLE_EXPORT void GL_APIENTRY FlushMappedBufferRangeEXT(GLenum target,
>+                                                        GLintptr offset,
>+                                                        GLsizeiptr length);
>+ANGLE_EXPORT void *GL_APIENTRY MapBufferRangeEXT(GLenum target,
>+                                                 GLintptr offset,
>+                                                 GLsizeiptr length,
>+                                                 GLbitfield access);
>+
>+// GL_EXT_memory_object
>+ANGLE_EXPORT void GL_APIENTRY BufferStorageMemEXT(GLenum target,
>+                                                  GLsizeiptr size,
>+                                                  GLuint memory,
>+                                                  GLuint64 offset);
>+ANGLE_EXPORT void GL_APIENTRY CreateMemoryObjectsEXT(GLsizei n, GLuint *memoryObjects);
>+ANGLE_EXPORT void GL_APIENTRY DeleteMemoryObjectsEXT(GLsizei n, const GLuint *memoryObjects);
>+ANGLE_EXPORT void GL_APIENTRY GetMemoryObjectParameterivEXT(GLuint memoryObject,
>+                                                            GLenum pname,
>+                                                            GLint *params);
>+ANGLE_EXPORT void GL_APIENTRY GetUnsignedBytevEXT(GLenum pname, GLubyte *data);
>+ANGLE_EXPORT void GL_APIENTRY GetUnsignedBytei_vEXT(GLenum target, GLuint index, GLubyte *data);
>+ANGLE_EXPORT GLboolean GL_APIENTRY IsMemoryObjectEXT(GLuint memoryObject);
>+ANGLE_EXPORT void GL_APIENTRY MemoryObjectParameterivEXT(GLuint memoryObject,
>+                                                         GLenum pname,
>+                                                         const GLint *params);
>+ANGLE_EXPORT void GL_APIENTRY TexStorageMem2DEXT(GLenum target,
>+                                                 GLsizei levels,
>+                                                 GLenum internalFormat,
>+                                                 GLsizei width,
>+                                                 GLsizei height,
>+                                                 GLuint memory,
>+                                                 GLuint64 offset);
>+ANGLE_EXPORT void GL_APIENTRY TexStorageMem2DMultisampleEXT(GLenum target,
>+                                                            GLsizei samples,
>+                                                            GLenum internalFormat,
>+                                                            GLsizei width,
>+                                                            GLsizei height,
>+                                                            GLboolean fixedSampleLocations,
>+                                                            GLuint memory,
>+                                                            GLuint64 offset);
>+ANGLE_EXPORT void GL_APIENTRY TexStorageMem3DEXT(GLenum target,
>+                                                 GLsizei levels,
>+                                                 GLenum internalFormat,
>+                                                 GLsizei width,
>+                                                 GLsizei height,
>+                                                 GLsizei depth,
>+                                                 GLuint memory,
>+                                                 GLuint64 offset);
>+ANGLE_EXPORT void GL_APIENTRY TexStorageMem3DMultisampleEXT(GLenum target,
>+                                                            GLsizei samples,
>+                                                            GLenum internalFormat,
>+                                                            GLsizei width,
>+                                                            GLsizei height,
>+                                                            GLsizei depth,
>+                                                            GLboolean fixedSampleLocations,
>+                                                            GLuint memory,
>+                                                            GLuint64 offset);
>+
>+// GL_EXT_memory_object_fd
>+ANGLE_EXPORT void GL_APIENTRY ImportMemoryFdEXT(GLuint memory,
>+                                                GLuint64 size,
>+                                                GLenum handleType,
>+                                                GLint fd);
>+
>+// GL_EXT_occlusion_query_boolean
>+
>+// GL_EXT_robustness
>+ANGLE_EXPORT GLenum GL_APIENTRY GetGraphicsResetStatusEXT();
>+ANGLE_EXPORT void GL_APIENTRY GetnUniformfvEXT(GLuint program,
>+                                               GLint location,
>+                                               GLsizei bufSize,
>+                                               GLfloat *params);
>+ANGLE_EXPORT void GL_APIENTRY GetnUniformivEXT(GLuint program,
>+                                               GLint location,
>+                                               GLsizei bufSize,
>+                                               GLint *params);
>+ANGLE_EXPORT void GL_APIENTRY ReadnPixelsEXT(GLint x,
>+                                             GLint y,
>+                                             GLsizei width,
>+                                             GLsizei height,
>+                                             GLenum format,
>+                                             GLenum type,
>+                                             GLsizei bufSize,
>+                                             void *data);
>+
>+// GL_EXT_semaphore
>+ANGLE_EXPORT void GL_APIENTRY DeleteSemaphoresEXT(GLsizei n, const GLuint *semaphores);
>+ANGLE_EXPORT void GL_APIENTRY GenSemaphoresEXT(GLsizei n, GLuint *semaphores);
>+ANGLE_EXPORT void GL_APIENTRY GetSemaphoreParameterui64vEXT(GLuint semaphore,
>+                                                            GLenum pname,
>+                                                            GLuint64 *params);
>+ANGLE_EXPORT GLboolean GL_APIENTRY IsSemaphoreEXT(GLuint semaphore);
>+ANGLE_EXPORT void GL_APIENTRY SemaphoreParameterui64vEXT(GLuint semaphore,
>+                                                         GLenum pname,
>+                                                         const GLuint64 *params);
>+ANGLE_EXPORT void GL_APIENTRY SignalSemaphoreEXT(GLuint semaphore,
>+                                                 GLuint numBufferBarriers,
>+                                                 const GLuint *buffers,
>+                                                 GLuint numTextureBarriers,
>+                                                 const GLuint *textures,
>+                                                 const GLenum *dstLayouts);
>+ANGLE_EXPORT void GL_APIENTRY WaitSemaphoreEXT(GLuint semaphore,
>+                                               GLuint numBufferBarriers,
>+                                               const GLuint *buffers,
>+                                               GLuint numTextureBarriers,
>+                                               const GLuint *textures,
>+                                               const GLenum *srcLayouts);
>+
>+// GL_EXT_semaphore_fd
>+ANGLE_EXPORT void GL_APIENTRY ImportSemaphoreFdEXT(GLuint semaphore, GLenum handleType, GLint fd);
>+
>+// GL_EXT_texture_storage
>+ANGLE_EXPORT void GL_APIENTRY TexStorage1DEXT(GLenum target,
>+                                              GLsizei levels,
>+                                              GLenum internalformat,
>+                                              GLsizei width);
>+ANGLE_EXPORT void GL_APIENTRY TexStorage2DEXT(GLenum target,
>+                                              GLsizei levels,
>+                                              GLenum internalformat,
>+                                              GLsizei width,
>+                                              GLsizei height);
>+ANGLE_EXPORT void GL_APIENTRY TexStorage3DEXT(GLenum target,
>+                                              GLsizei levels,
>+                                              GLenum internalformat,
>+                                              GLsizei width,
>+                                              GLsizei height,
>+                                              GLsizei depth);
>+
>+// GL_KHR_debug
>+ANGLE_EXPORT void GL_APIENTRY DebugMessageCallbackKHR(GLDEBUGPROCKHR callback,
>+                                                      const void *userParam);
>+ANGLE_EXPORT void GL_APIENTRY DebugMessageControlKHR(GLenum source,
>+                                                     GLenum type,
>+                                                     GLenum severity,
>+                                                     GLsizei count,
>+                                                     const GLuint *ids,
>+                                                     GLboolean enabled);
>+ANGLE_EXPORT void GL_APIENTRY DebugMessageInsertKHR(GLenum source,
>+                                                    GLenum type,
>+                                                    GLuint id,
>+                                                    GLenum severity,
>+                                                    GLsizei length,
>+                                                    const GLchar *buf);
>+ANGLE_EXPORT GLuint GL_APIENTRY GetDebugMessageLogKHR(GLuint count,
>+                                                      GLsizei bufSize,
>+                                                      GLenum *sources,
>+                                                      GLenum *types,
>+                                                      GLuint *ids,
>+                                                      GLenum *severities,
>+                                                      GLsizei *lengths,
>+                                                      GLchar *messageLog);
>+ANGLE_EXPORT void GL_APIENTRY
>+GetObjectLabelKHR(GLenum identifier, GLuint name, GLsizei bufSize, GLsizei *length, GLchar *label);
>+ANGLE_EXPORT void GL_APIENTRY GetObjectPtrLabelKHR(const void *ptr,
>+                                                   GLsizei bufSize,
>+                                                   GLsizei *length,
>+                                                   GLchar *label);
>+ANGLE_EXPORT void GL_APIENTRY GetPointervKHR(GLenum pname, void **params);
>+ANGLE_EXPORT void GL_APIENTRY ObjectLabelKHR(GLenum identifier,
>+                                             GLuint name,
>+                                             GLsizei length,
>+                                             const GLchar *label);
>+ANGLE_EXPORT void GL_APIENTRY ObjectPtrLabelKHR(const void *ptr,
>+                                                GLsizei length,
>+                                                const GLchar *label);
>+ANGLE_EXPORT void GL_APIENTRY PopDebugGroupKHR();
>+ANGLE_EXPORT void GL_APIENTRY PushDebugGroupKHR(GLenum source,
>+                                                GLuint id,
>+                                                GLsizei length,
>+                                                const GLchar *message);
>+
>+// GL_KHR_parallel_shader_compile
>+ANGLE_EXPORT void GL_APIENTRY MaxShaderCompilerThreadsKHR(GLuint count);
>+
>+// GL_NV_fence
>+ANGLE_EXPORT void GL_APIENTRY DeleteFencesNV(GLsizei n, const GLuint *fences);
>+ANGLE_EXPORT void GL_APIENTRY FinishFenceNV(GLuint fence);
>+ANGLE_EXPORT void GL_APIENTRY GenFencesNV(GLsizei n, GLuint *fences);
>+ANGLE_EXPORT void GL_APIENTRY GetFenceivNV(GLuint fence, GLenum pname, GLint *params);
>+ANGLE_EXPORT GLboolean GL_APIENTRY IsFenceNV(GLuint fence);
>+ANGLE_EXPORT void GL_APIENTRY SetFenceNV(GLuint fence, GLenum condition);
>+ANGLE_EXPORT GLboolean GL_APIENTRY TestFenceNV(GLuint fence);
>+
>+// GL_OES_EGL_image
>+ANGLE_EXPORT void GL_APIENTRY EGLImageTargetRenderbufferStorageOES(GLenum target,
>+                                                                   GLeglImageOES image);
>+ANGLE_EXPORT void GL_APIENTRY EGLImageTargetTexture2DOES(GLenum target, GLeglImageOES image);
>+
>+// GL_OES_draw_texture
>+ANGLE_EXPORT void GL_APIENTRY
>+DrawTexfOES(GLfloat x, GLfloat y, GLfloat z, GLfloat width, GLfloat height);
>+ANGLE_EXPORT void GL_APIENTRY DrawTexfvOES(const GLfloat *coords);
>+ANGLE_EXPORT void GL_APIENTRY DrawTexiOES(GLint x, GLint y, GLint z, GLint width, GLint height);
>+ANGLE_EXPORT void GL_APIENTRY DrawTexivOES(const GLint *coords);
>+ANGLE_EXPORT void GL_APIENTRY
>+DrawTexsOES(GLshort x, GLshort y, GLshort z, GLshort width, GLshort height);
>+ANGLE_EXPORT void GL_APIENTRY DrawTexsvOES(const GLshort *coords);
>+ANGLE_EXPORT void GL_APIENTRY
>+DrawTexxOES(GLfixed x, GLfixed y, GLfixed z, GLfixed width, GLfixed height);
>+ANGLE_EXPORT void GL_APIENTRY DrawTexxvOES(const GLfixed *coords);
>+
>+// GL_OES_framebuffer_object
>+ANGLE_EXPORT void GL_APIENTRY BindFramebufferOES(GLenum target, GLuint framebuffer);
>+ANGLE_EXPORT void GL_APIENTRY BindRenderbufferOES(GLenum target, GLuint renderbuffer);
>+ANGLE_EXPORT GLenum GL_APIENTRY CheckFramebufferStatusOES(GLenum target);
>+ANGLE_EXPORT void GL_APIENTRY DeleteFramebuffersOES(GLsizei n, const GLuint *framebuffers);
>+ANGLE_EXPORT void GL_APIENTRY DeleteRenderbuffersOES(GLsizei n, const GLuint *renderbuffers);
>+ANGLE_EXPORT void GL_APIENTRY FramebufferRenderbufferOES(GLenum target,
>+                                                         GLenum attachment,
>+                                                         GLenum renderbuffertarget,
>+                                                         GLuint renderbuffer);
>+ANGLE_EXPORT void GL_APIENTRY FramebufferTexture2DOES(GLenum target,
>+                                                      GLenum attachment,
>+                                                      GLenum textarget,
>+                                                      GLuint texture,
>+                                                      GLint level);
>+ANGLE_EXPORT void GL_APIENTRY GenFramebuffersOES(GLsizei n, GLuint *framebuffers);
>+ANGLE_EXPORT void GL_APIENTRY GenRenderbuffersOES(GLsizei n, GLuint *renderbuffers);
>+ANGLE_EXPORT void GL_APIENTRY GenerateMipmapOES(GLenum target);
>+ANGLE_EXPORT void GL_APIENTRY GetFramebufferAttachmentParameterivOES(GLenum target,
>+                                                                     GLenum attachment,
>+                                                                     GLenum pname,
>+                                                                     GLint *params);
>+ANGLE_EXPORT void GL_APIENTRY GetRenderbufferParameterivOES(GLenum target,
>+                                                            GLenum pname,
>+                                                            GLint *params);
>+ANGLE_EXPORT GLboolean GL_APIENTRY IsFramebufferOES(GLuint framebuffer);
>+ANGLE_EXPORT GLboolean GL_APIENTRY IsRenderbufferOES(GLuint renderbuffer);
>+ANGLE_EXPORT void GL_APIENTRY RenderbufferStorageOES(GLenum target,
>+                                                     GLenum internalformat,
>+                                                     GLsizei width,
>+                                                     GLsizei height);
>+
>+// GL_OES_get_program_binary
>+ANGLE_EXPORT void GL_APIENTRY GetProgramBinaryOES(GLuint program,
>+                                                  GLsizei bufSize,
>+                                                  GLsizei *length,
>+                                                  GLenum *binaryFormat,
>+                                                  void *binary);
>+ANGLE_EXPORT void GL_APIENTRY ProgramBinaryOES(GLuint program,
>+                                               GLenum binaryFormat,
>+                                               const void *binary,
>+                                               GLint length);
>+
>+// GL_OES_mapbuffer
>+ANGLE_EXPORT void GL_APIENTRY GetBufferPointervOES(GLenum target, GLenum pname, void **params);
>+ANGLE_EXPORT void *GL_APIENTRY MapBufferOES(GLenum target, GLenum access);
>+ANGLE_EXPORT GLboolean GL_APIENTRY UnmapBufferOES(GLenum target);
>+
>+// GL_OES_matrix_palette
>+ANGLE_EXPORT void GL_APIENTRY CurrentPaletteMatrixOES(GLuint matrixpaletteindex);
>+ANGLE_EXPORT void GL_APIENTRY LoadPaletteFromModelViewMatrixOES();
>+ANGLE_EXPORT void GL_APIENTRY MatrixIndexPointerOES(GLint size,
>+                                                    GLenum type,
>+                                                    GLsizei stride,
>+                                                    const void *pointer);
>+ANGLE_EXPORT void GL_APIENTRY WeightPointerOES(GLint size,
>+                                               GLenum type,
>+                                               GLsizei stride,
>+                                               const void *pointer);
>+
>+// GL_OES_point_size_array
>+ANGLE_EXPORT void GL_APIENTRY PointSizePointerOES(GLenum type, GLsizei stride, const void *pointer);
>+
>+// GL_OES_query_matrix
>+ANGLE_EXPORT GLbitfield GL_APIENTRY QueryMatrixxOES(GLfixed *mantissa, GLint *exponent);
>+
>+// GL_OES_texture_border_clamp
>+ANGLE_EXPORT void GL_APIENTRY GetSamplerParameterIivOES(GLuint sampler,
>+                                                        GLenum pname,
>+                                                        GLint *params);
>+ANGLE_EXPORT void GL_APIENTRY GetSamplerParameterIuivOES(GLuint sampler,
>+                                                         GLenum pname,
>+                                                         GLuint *params);
>+ANGLE_EXPORT void GL_APIENTRY GetTexParameterIivOES(GLenum target, GLenum pname, GLint *params);
>+ANGLE_EXPORT void GL_APIENTRY GetTexParameterIuivOES(GLenum target, GLenum pname, GLuint *params);
>+ANGLE_EXPORT void GL_APIENTRY SamplerParameterIivOES(GLuint sampler,
>+                                                     GLenum pname,
>+                                                     const GLint *param);
>+ANGLE_EXPORT void GL_APIENTRY SamplerParameterIuivOES(GLuint sampler,
>+                                                      GLenum pname,
>+                                                      const GLuint *param);
>+ANGLE_EXPORT void GL_APIENTRY TexParameterIivOES(GLenum target, GLenum pname, const GLint *params);
>+ANGLE_EXPORT void GL_APIENTRY TexParameterIuivOES(GLenum target,
>+                                                  GLenum pname,
>+                                                  const GLuint *params);
>+
>+// GL_OES_texture_cube_map
>+ANGLE_EXPORT void GL_APIENTRY GetTexGenfvOES(GLenum coord, GLenum pname, GLfloat *params);
>+ANGLE_EXPORT void GL_APIENTRY GetTexGenivOES(GLenum coord, GLenum pname, GLint *params);
>+ANGLE_EXPORT void GL_APIENTRY GetTexGenxvOES(GLenum coord, GLenum pname, GLfixed *params);
>+ANGLE_EXPORT void GL_APIENTRY TexGenfOES(GLenum coord, GLenum pname, GLfloat param);
>+ANGLE_EXPORT void GL_APIENTRY TexGenfvOES(GLenum coord, GLenum pname, const GLfloat *params);
>+ANGLE_EXPORT void GL_APIENTRY TexGeniOES(GLenum coord, GLenum pname, GLint param);
>+ANGLE_EXPORT void GL_APIENTRY TexGenivOES(GLenum coord, GLenum pname, const GLint *params);
>+ANGLE_EXPORT void GL_APIENTRY TexGenxOES(GLenum coord, GLenum pname, GLfixed param);
>+ANGLE_EXPORT void GL_APIENTRY TexGenxvOES(GLenum coord, GLenum pname, const GLfixed *params);
>+
>+// GL_OES_texture_storage_multisample_2d_array
>+ANGLE_EXPORT void GL_APIENTRY TexStorage3DMultisampleOES(GLenum target,
>+                                                         GLsizei samples,
>+                                                         GLenum internalformat,
>+                                                         GLsizei width,
>+                                                         GLsizei height,
>+                                                         GLsizei depth,
>+                                                         GLboolean fixedsamplelocations);
>+
>+// GL_OES_vertex_array_object
>+ANGLE_EXPORT void GL_APIENTRY BindVertexArrayOES(GLuint array);
>+ANGLE_EXPORT void GL_APIENTRY DeleteVertexArraysOES(GLsizei n, const GLuint *arrays);
>+ANGLE_EXPORT void GL_APIENTRY GenVertexArraysOES(GLsizei n, GLuint *arrays);
>+ANGLE_EXPORT GLboolean GL_APIENTRY IsVertexArrayOES(GLuint array);
>+
>+// GL_OVR_multiview
>+ANGLE_EXPORT void GL_APIENTRY FramebufferTextureMultiviewOVR(GLenum target,
>+                                                             GLenum attachment,
>+                                                             GLuint texture,
>+                                                             GLint level,
>+                                                             GLint baseViewIndex,
>+                                                             GLsizei numViews);
>+
>+// GL_OVR_multiview2
>+
>+// EGL_ANGLE_explicit_context
>+ANGLE_EXPORT void GL_APIENTRY ActiveShaderProgramContextANGLE(GLeglContext ctx,
>+                                                              GLuint pipeline,
>+                                                              GLuint program);
>+ANGLE_EXPORT void GL_APIENTRY ActiveTextureContextANGLE(GLeglContext ctx, GLenum texture);
>+ANGLE_EXPORT void GL_APIENTRY AlphaFuncContextANGLE(GLeglContext ctx, GLenum func, GLfloat ref);
>+ANGLE_EXPORT void GL_APIENTRY AlphaFuncxContextANGLE(GLeglContext ctx, GLenum func, GLfixed ref);
>+ANGLE_EXPORT void GL_APIENTRY AttachShaderContextANGLE(GLeglContext ctx,
>+                                                       GLuint program,
>+                                                       GLuint shader);
>+ANGLE_EXPORT void GL_APIENTRY BeginQueryContextANGLE(GLeglContext ctx, GLenum target, GLuint id);
>+ANGLE_EXPORT void GL_APIENTRY BeginQueryEXTContextANGLE(GLeglContext ctx, GLenum target, GLuint id);
>+ANGLE_EXPORT void GL_APIENTRY BeginTransformFeedbackContextANGLE(GLeglContext ctx,
>+                                                                 GLenum primitiveMode);
>+ANGLE_EXPORT void GL_APIENTRY BindAttribLocationContextANGLE(GLeglContext ctx,
>+                                                             GLuint program,
>+                                                             GLuint index,
>+                                                             const GLchar *name);
>+ANGLE_EXPORT void GL_APIENTRY BindBufferContextANGLE(GLeglContext ctx,
>+                                                     GLenum target,
>+                                                     GLuint buffer);
>+ANGLE_EXPORT void GL_APIENTRY BindBufferBaseContextANGLE(GLeglContext ctx,
>+                                                         GLenum target,
>+                                                         GLuint index,
>+                                                         GLuint buffer);
>+ANGLE_EXPORT void GL_APIENTRY BindBufferRangeContextANGLE(GLeglContext ctx,
>+                                                          GLenum target,
>+                                                          GLuint index,
>+                                                          GLuint buffer,
>+                                                          GLintptr offset,
>+                                                          GLsizeiptr size);
>+ANGLE_EXPORT void GL_APIENTRY BindFragDataLocationEXTContextANGLE(GLeglContext ctx,
>+                                                                  GLuint program,
>+                                                                  GLuint color,
>+                                                                  const GLchar *name);
>+ANGLE_EXPORT void GL_APIENTRY BindFragDataLocationIndexedEXTContextANGLE(GLeglContext ctx,
>+                                                                         GLuint program,
>+                                                                         GLuint colorNumber,
>+                                                                         GLuint index,
>+                                                                         const GLchar *name);
>+ANGLE_EXPORT void GL_APIENTRY BindFramebufferContextANGLE(GLeglContext ctx,
>+                                                          GLenum target,
>+                                                          GLuint framebuffer);
>+ANGLE_EXPORT void GL_APIENTRY BindFramebufferOESContextANGLE(GLeglContext ctx,
>+                                                             GLenum target,
>+                                                             GLuint framebuffer);
>+ANGLE_EXPORT void GL_APIENTRY BindImageTextureContextANGLE(GLeglContext ctx,
>+                                                           GLuint unit,
>+                                                           GLuint texture,
>+                                                           GLint level,
>+                                                           GLboolean layered,
>+                                                           GLint layer,
>+                                                           GLenum access,
>+                                                           GLenum format);
>+ANGLE_EXPORT void GL_APIENTRY BindProgramPipelineContextANGLE(GLeglContext ctx, GLuint pipeline);
>+ANGLE_EXPORT void GL_APIENTRY BindRenderbufferContextANGLE(GLeglContext ctx,
>+                                                           GLenum target,
>+                                                           GLuint renderbuffer);
>+ANGLE_EXPORT void GL_APIENTRY BindRenderbufferOESContextANGLE(GLeglContext ctx,
>+                                                              GLenum target,
>+                                                              GLuint renderbuffer);
>+ANGLE_EXPORT void GL_APIENTRY BindSamplerContextANGLE(GLeglContext ctx,
>+                                                      GLuint unit,
>+                                                      GLuint sampler);
>+ANGLE_EXPORT void GL_APIENTRY BindTextureContextANGLE(GLeglContext ctx,
>+                                                      GLenum target,
>+                                                      GLuint texture);
>+ANGLE_EXPORT void GL_APIENTRY BindTransformFeedbackContextANGLE(GLeglContext ctx,
>+                                                                GLenum target,
>+                                                                GLuint id);
>+ANGLE_EXPORT void GL_APIENTRY BindVertexArrayContextANGLE(GLeglContext ctx, GLuint array);
>+ANGLE_EXPORT void GL_APIENTRY BindVertexArrayOESContextANGLE(GLeglContext ctx, GLuint array);
>+ANGLE_EXPORT void GL_APIENTRY BindVertexBufferContextANGLE(GLeglContext ctx,
>+                                                           GLuint bindingindex,
>+                                                           GLuint buffer,
>+                                                           GLintptr offset,
>+                                                           GLsizei stride);
>+ANGLE_EXPORT void GL_APIENTRY
>+BlendColorContextANGLE(GLeglContext ctx, GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha);
>+ANGLE_EXPORT void GL_APIENTRY BlendEquationContextANGLE(GLeglContext ctx, GLenum mode);
>+ANGLE_EXPORT void GL_APIENTRY BlendEquationSeparateContextANGLE(GLeglContext ctx,
>+                                                                GLenum modeRGB,
>+                                                                GLenum modeAlpha);
>+ANGLE_EXPORT void GL_APIENTRY BlendFuncContextANGLE(GLeglContext ctx,
>+                                                    GLenum sfactor,
>+                                                    GLenum dfactor);
>+ANGLE_EXPORT void GL_APIENTRY BlendFuncSeparateContextANGLE(GLeglContext ctx,
>+                                                            GLenum sfactorRGB,
>+                                                            GLenum dfactorRGB,
>+                                                            GLenum sfactorAlpha,
>+                                                            GLenum dfactorAlpha);
>+ANGLE_EXPORT void GL_APIENTRY BlitFramebufferContextANGLE(GLeglContext ctx,
>+                                                          GLint srcX0,
>+                                                          GLint srcY0,
>+                                                          GLint srcX1,
>+                                                          GLint srcY1,
>+                                                          GLint dstX0,
>+                                                          GLint dstY0,
>+                                                          GLint dstX1,
>+                                                          GLint dstY1,
>+                                                          GLbitfield mask,
>+                                                          GLenum filter);
>+ANGLE_EXPORT void GL_APIENTRY BlitFramebufferANGLEContextANGLE(GLeglContext ctx,
>+                                                               GLint srcX0,
>+                                                               GLint srcY0,
>+                                                               GLint srcX1,
>+                                                               GLint srcY1,
>+                                                               GLint dstX0,
>+                                                               GLint dstY0,
>+                                                               GLint dstX1,
>+                                                               GLint dstY1,
>+                                                               GLbitfield mask,
>+                                                               GLenum filter);
>+ANGLE_EXPORT void GL_APIENTRY BufferDataContextANGLE(GLeglContext ctx,
>+                                                     GLenum target,
>+                                                     GLsizeiptr size,
>+                                                     const void *data,
>+                                                     GLenum usage);
>+ANGLE_EXPORT void GL_APIENTRY BufferStorageMemEXTContextANGLE(GLeglContext ctx,
>+                                                              GLenum target,
>+                                                              GLsizeiptr size,
>+                                                              GLuint memory,
>+                                                              GLuint64 offset);
>+ANGLE_EXPORT void GL_APIENTRY BufferSubDataContextANGLE(GLeglContext ctx,
>+                                                        GLenum target,
>+                                                        GLintptr offset,
>+                                                        GLsizeiptr size,
>+                                                        const void *data);
>+ANGLE_EXPORT GLenum GL_APIENTRY CheckFramebufferStatusContextANGLE(GLeglContext ctx, GLenum target);
>+ANGLE_EXPORT GLenum GL_APIENTRY CheckFramebufferStatusOESContextANGLE(GLeglContext ctx,
>+                                                                      GLenum target);
>+ANGLE_EXPORT void GL_APIENTRY ClearContextANGLE(GLeglContext ctx, GLbitfield mask);
>+ANGLE_EXPORT void GL_APIENTRY ClearBufferfiContextANGLE(GLeglContext ctx,
>+                                                        GLenum buffer,
>+                                                        GLint drawbuffer,
>+                                                        GLfloat depth,
>+                                                        GLint stencil);
>+ANGLE_EXPORT void GL_APIENTRY ClearBufferfvContextANGLE(GLeglContext ctx,
>+                                                        GLenum buffer,
>+                                                        GLint drawbuffer,
>+                                                        const GLfloat *value);
>+ANGLE_EXPORT void GL_APIENTRY ClearBufferivContextANGLE(GLeglContext ctx,
>+                                                        GLenum buffer,
>+                                                        GLint drawbuffer,
>+                                                        const GLint *value);
>+ANGLE_EXPORT void GL_APIENTRY ClearBufferuivContextANGLE(GLeglContext ctx,
>+                                                         GLenum buffer,
>+                                                         GLint drawbuffer,
>+                                                         const GLuint *value);
>+ANGLE_EXPORT void GL_APIENTRY
>+ClearColorContextANGLE(GLeglContext ctx, GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha);
>+ANGLE_EXPORT void GL_APIENTRY
>+ClearColorxContextANGLE(GLeglContext ctx, GLfixed red, GLfixed green, GLfixed blue, GLfixed alpha);
>+ANGLE_EXPORT void GL_APIENTRY ClearDepthfContextANGLE(GLeglContext ctx, GLfloat d);
>+ANGLE_EXPORT void GL_APIENTRY ClearDepthxContextANGLE(GLeglContext ctx, GLfixed depth);
>+ANGLE_EXPORT void GL_APIENTRY ClearStencilContextANGLE(GLeglContext ctx, GLint s);
>+ANGLE_EXPORT void GL_APIENTRY ClientActiveTextureContextANGLE(GLeglContext ctx, GLenum texture);
>+ANGLE_EXPORT GLenum GL_APIENTRY ClientWaitSyncContextANGLE(GLeglContext ctx,
>+                                                           GLsync sync,
>+                                                           GLbitfield flags,
>+                                                           GLuint64 timeout);
>+ANGLE_EXPORT void GL_APIENTRY ClipPlanefContextANGLE(GLeglContext ctx,
>+                                                     GLenum p,
>+                                                     const GLfloat *eqn);
>+ANGLE_EXPORT void GL_APIENTRY ClipPlanexContextANGLE(GLeglContext ctx,
>+                                                     GLenum plane,
>+                                                     const GLfixed *equation);
>+ANGLE_EXPORT void GL_APIENTRY
>+Color4fContextANGLE(GLeglContext ctx, GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha);
>+ANGLE_EXPORT void GL_APIENTRY
>+Color4ubContextANGLE(GLeglContext ctx, GLubyte red, GLubyte green, GLubyte blue, GLubyte alpha);
>+ANGLE_EXPORT void GL_APIENTRY
>+Color4xContextANGLE(GLeglContext ctx, GLfixed red, GLfixed green, GLfixed blue, GLfixed alpha);
>+ANGLE_EXPORT void GL_APIENTRY ColorMaskContextANGLE(GLeglContext ctx,
>+                                                    GLboolean red,
>+                                                    GLboolean green,
>+                                                    GLboolean blue,
>+                                                    GLboolean alpha);
>+ANGLE_EXPORT void GL_APIENTRY ColorPointerContextANGLE(GLeglContext ctx,
>+                                                       GLint size,
>+                                                       GLenum type,
>+                                                       GLsizei stride,
>+                                                       const void *pointer);
>+ANGLE_EXPORT void GL_APIENTRY CompileShaderContextANGLE(GLeglContext ctx, GLuint shader);
>+ANGLE_EXPORT void GL_APIENTRY CompressedTexImage2DContextANGLE(GLeglContext ctx,
>+                                                               GLenum target,
>+                                                               GLint level,
>+                                                               GLenum internalformat,
>+                                                               GLsizei width,
>+                                                               GLsizei height,
>+                                                               GLint border,
>+                                                               GLsizei imageSize,
>+                                                               const void *data);
>+ANGLE_EXPORT void GL_APIENTRY CompressedTexImage3DContextANGLE(GLeglContext ctx,
>+                                                               GLenum target,
>+                                                               GLint level,
>+                                                               GLenum internalformat,
>+                                                               GLsizei width,
>+                                                               GLsizei height,
>+                                                               GLsizei depth,
>+                                                               GLint border,
>+                                                               GLsizei imageSize,
>+                                                               const void *data);
>+ANGLE_EXPORT void GL_APIENTRY CompressedTexSubImage2DContextANGLE(GLeglContext ctx,
>+                                                                  GLenum target,
>+                                                                  GLint level,
>+                                                                  GLint xoffset,
>+                                                                  GLint yoffset,
>+                                                                  GLsizei width,
>+                                                                  GLsizei height,
>+                                                                  GLenum format,
>+                                                                  GLsizei imageSize,
>+                                                                  const void *data);
>+ANGLE_EXPORT void GL_APIENTRY CompressedTexSubImage3DContextANGLE(GLeglContext ctx,
>+                                                                  GLenum target,
>+                                                                  GLint level,
>+                                                                  GLint xoffset,
>+                                                                  GLint yoffset,
>+                                                                  GLint zoffset,
>+                                                                  GLsizei width,
>+                                                                  GLsizei height,
>+                                                                  GLsizei depth,
>+                                                                  GLenum format,
>+                                                                  GLsizei imageSize,
>+                                                                  const void *data);
>+ANGLE_EXPORT void GL_APIENTRY CopyBufferSubDataContextANGLE(GLeglContext ctx,
>+                                                            GLenum readTarget,
>+                                                            GLenum writeTarget,
>+                                                            GLintptr readOffset,
>+                                                            GLintptr writeOffset,
>+                                                            GLsizeiptr size);
>+ANGLE_EXPORT void GL_APIENTRY CopyTexImage2DContextANGLE(GLeglContext ctx,
>+                                                         GLenum target,
>+                                                         GLint level,
>+                                                         GLenum internalformat,
>+                                                         GLint x,
>+                                                         GLint y,
>+                                                         GLsizei width,
>+                                                         GLsizei height,
>+                                                         GLint border);
>+ANGLE_EXPORT void GL_APIENTRY CopyTexSubImage2DContextANGLE(GLeglContext ctx,
>+                                                            GLenum target,
>+                                                            GLint level,
>+                                                            GLint xoffset,
>+                                                            GLint yoffset,
>+                                                            GLint x,
>+                                                            GLint y,
>+                                                            GLsizei width,
>+                                                            GLsizei height);
>+ANGLE_EXPORT void GL_APIENTRY CopyTexSubImage3DContextANGLE(GLeglContext ctx,
>+                                                            GLenum target,
>+                                                            GLint level,
>+                                                            GLint xoffset,
>+                                                            GLint yoffset,
>+                                                            GLint zoffset,
>+                                                            GLint x,
>+                                                            GLint y,
>+                                                            GLsizei width,
>+                                                            GLsizei height);
>+ANGLE_EXPORT void GL_APIENTRY CreateMemoryObjectsEXTContextANGLE(GLeglContext ctx,
>+                                                                 GLsizei n,
>+                                                                 GLuint *memoryObjects);
>+ANGLE_EXPORT GLuint GL_APIENTRY CreateProgramContextANGLE(GLeglContext ctx);
>+ANGLE_EXPORT GLuint GL_APIENTRY CreateShaderContextANGLE(GLeglContext ctx, GLenum type);
>+ANGLE_EXPORT GLuint GL_APIENTRY CreateShaderProgramvContextANGLE(GLeglContext ctx,
>+                                                                 GLenum type,
>+                                                                 GLsizei count,
>+                                                                 const GLchar *const *strings);
>+ANGLE_EXPORT void GL_APIENTRY CullFaceContextANGLE(GLeglContext ctx, GLenum mode);
>+ANGLE_EXPORT void GL_APIENTRY CurrentPaletteMatrixOESContextANGLE(GLeglContext ctx,
>+                                                                  GLuint matrixpaletteindex);
>+ANGLE_EXPORT void GL_APIENTRY DebugMessageCallbackKHRContextANGLE(GLeglContext ctx,
>+                                                                  GLDEBUGPROCKHR callback,
>+                                                                  const void *userParam);
>+ANGLE_EXPORT void GL_APIENTRY DebugMessageControlKHRContextANGLE(GLeglContext ctx,
>+                                                                 GLenum source,
>+                                                                 GLenum type,
>+                                                                 GLenum severity,
>+                                                                 GLsizei count,
>+                                                                 const GLuint *ids,
>+                                                                 GLboolean enabled);
>+ANGLE_EXPORT void GL_APIENTRY DebugMessageInsertKHRContextANGLE(GLeglContext ctx,
>+                                                                GLenum source,
>+                                                                GLenum type,
>+                                                                GLuint id,
>+                                                                GLenum severity,
>+                                                                GLsizei length,
>+                                                                const GLchar *buf);
>+ANGLE_EXPORT void GL_APIENTRY DeleteBuffersContextANGLE(GLeglContext ctx,
>+                                                        GLsizei n,
>+                                                        const GLuint *buffers);
>+ANGLE_EXPORT void GL_APIENTRY DeleteFencesNVContextANGLE(GLeglContext ctx,
>+                                                         GLsizei n,
>+                                                         const GLuint *fences);
>+ANGLE_EXPORT void GL_APIENTRY DeleteFramebuffersContextANGLE(GLeglContext ctx,
>+                                                             GLsizei n,
>+                                                             const GLuint *framebuffers);
>+ANGLE_EXPORT void GL_APIENTRY DeleteFramebuffersOESContextANGLE(GLeglContext ctx,
>+                                                                GLsizei n,
>+                                                                const GLuint *framebuffers);
>+ANGLE_EXPORT void GL_APIENTRY DeleteMemoryObjectsEXTContextANGLE(GLeglContext ctx,
>+                                                                 GLsizei n,
>+                                                                 const GLuint *memoryObjects);
>+ANGLE_EXPORT void GL_APIENTRY DeleteProgramContextANGLE(GLeglContext ctx, GLuint program);
>+ANGLE_EXPORT void GL_APIENTRY DeleteProgramPipelinesContextANGLE(GLeglContext ctx,
>+                                                                 GLsizei n,
>+                                                                 const GLuint *pipelines);
>+ANGLE_EXPORT void GL_APIENTRY DeleteQueriesContextANGLE(GLeglContext ctx,
>+                                                        GLsizei n,
>+                                                        const GLuint *ids);
>+ANGLE_EXPORT void GL_APIENTRY DeleteQueriesEXTContextANGLE(GLeglContext ctx,
>+                                                           GLsizei n,
>+                                                           const GLuint *ids);
>+ANGLE_EXPORT void GL_APIENTRY DeleteRenderbuffersContextANGLE(GLeglContext ctx,
>+                                                              GLsizei n,
>+                                                              const GLuint *renderbuffers);
>+ANGLE_EXPORT void GL_APIENTRY DeleteRenderbuffersOESContextANGLE(GLeglContext ctx,
>+                                                                 GLsizei n,
>+                                                                 const GLuint *renderbuffers);
>+ANGLE_EXPORT void GL_APIENTRY DeleteSamplersContextANGLE(GLeglContext ctx,
>+                                                         GLsizei count,
>+                                                         const GLuint *samplers);
>+ANGLE_EXPORT void GL_APIENTRY DeleteSemaphoresEXTContextANGLE(GLeglContext ctx,
>+                                                              GLsizei n,
>+                                                              const GLuint *semaphores);
>+ANGLE_EXPORT void GL_APIENTRY DeleteShaderContextANGLE(GLeglContext ctx, GLuint shader);
>+ANGLE_EXPORT void GL_APIENTRY DeleteSyncContextANGLE(GLeglContext ctx, GLsync sync);
>+ANGLE_EXPORT void GL_APIENTRY DeleteTexturesContextANGLE(GLeglContext ctx,
>+                                                         GLsizei n,
>+                                                         const GLuint *textures);
>+ANGLE_EXPORT void GL_APIENTRY DeleteTransformFeedbacksContextANGLE(GLeglContext ctx,
>+                                                                   GLsizei n,
>+                                                                   const GLuint *ids);
>+ANGLE_EXPORT void GL_APIENTRY DeleteVertexArraysContextANGLE(GLeglContext ctx,
>+                                                             GLsizei n,
>+                                                             const GLuint *arrays);
>+ANGLE_EXPORT void GL_APIENTRY DeleteVertexArraysOESContextANGLE(GLeglContext ctx,
>+                                                                GLsizei n,
>+                                                                const GLuint *arrays);
>+ANGLE_EXPORT void GL_APIENTRY DepthFuncContextANGLE(GLeglContext ctx, GLenum func);
>+ANGLE_EXPORT void GL_APIENTRY DepthMaskContextANGLE(GLeglContext ctx, GLboolean flag);
>+ANGLE_EXPORT void GL_APIENTRY DepthRangefContextANGLE(GLeglContext ctx, GLfloat n, GLfloat f);
>+ANGLE_EXPORT void GL_APIENTRY DepthRangexContextANGLE(GLeglContext ctx, GLfixed n, GLfixed f);
>+ANGLE_EXPORT void GL_APIENTRY DetachShaderContextANGLE(GLeglContext ctx,
>+                                                       GLuint program,
>+                                                       GLuint shader);
>+ANGLE_EXPORT void GL_APIENTRY DisableContextANGLE(GLeglContext ctx, GLenum cap);
>+ANGLE_EXPORT void GL_APIENTRY DisableClientStateContextANGLE(GLeglContext ctx, GLenum array);
>+ANGLE_EXPORT void GL_APIENTRY DisableVertexAttribArrayContextANGLE(GLeglContext ctx, GLuint index);
>+ANGLE_EXPORT void GL_APIENTRY DiscardFramebufferEXTContextANGLE(GLeglContext ctx,
>+                                                                GLenum target,
>+                                                                GLsizei numAttachments,
>+                                                                const GLenum *attachments);
>+ANGLE_EXPORT void GL_APIENTRY DispatchComputeContextANGLE(GLeglContext ctx,
>+                                                          GLuint num_groups_x,
>+                                                          GLuint num_groups_y,
>+                                                          GLuint num_groups_z);
>+ANGLE_EXPORT void GL_APIENTRY DispatchComputeIndirectContextANGLE(GLeglContext ctx,
>+                                                                  GLintptr indirect);
>+ANGLE_EXPORT void GL_APIENTRY DrawArraysContextANGLE(GLeglContext ctx,
>+                                                     GLenum mode,
>+                                                     GLint first,
>+                                                     GLsizei count);
>+ANGLE_EXPORT void GL_APIENTRY DrawArraysIndirectContextANGLE(GLeglContext ctx,
>+                                                             GLenum mode,
>+                                                             const void *indirect);
>+ANGLE_EXPORT void GL_APIENTRY DrawArraysInstancedContextANGLE(GLeglContext ctx,
>+                                                              GLenum mode,
>+                                                              GLint first,
>+                                                              GLsizei count,
>+                                                              GLsizei instancecount);
>+ANGLE_EXPORT void GL_APIENTRY DrawArraysInstancedANGLEContextANGLE(GLeglContext ctx,
>+                                                                   GLenum mode,
>+                                                                   GLint first,
>+                                                                   GLsizei count,
>+                                                                   GLsizei primcount);
>+ANGLE_EXPORT void GL_APIENTRY DrawArraysInstancedEXTContextANGLE(GLeglContext ctx,
>+                                                                 GLenum mode,
>+                                                                 GLint start,
>+                                                                 GLsizei count,
>+                                                                 GLsizei primcount);
>+ANGLE_EXPORT void GL_APIENTRY DrawBuffersContextANGLE(GLeglContext ctx,
>+                                                      GLsizei n,
>+                                                      const GLenum *bufs);
>+ANGLE_EXPORT void GL_APIENTRY DrawBuffersEXTContextANGLE(GLeglContext ctx,
>+                                                         GLsizei n,
>+                                                         const GLenum *bufs);
>+ANGLE_EXPORT void GL_APIENTRY DrawElementsContextANGLE(GLeglContext ctx,
>+                                                       GLenum mode,
>+                                                       GLsizei count,
>+                                                       GLenum type,
>+                                                       const void *indices);
>+ANGLE_EXPORT void GL_APIENTRY DrawElementsIndirectContextANGLE(GLeglContext ctx,
>+                                                               GLenum mode,
>+                                                               GLenum type,
>+                                                               const void *indirect);
>+ANGLE_EXPORT void GL_APIENTRY DrawElementsInstancedContextANGLE(GLeglContext ctx,
>+                                                                GLenum mode,
>+                                                                GLsizei count,
>+                                                                GLenum type,
>+                                                                const void *indices,
>+                                                                GLsizei instancecount);
>+ANGLE_EXPORT void GL_APIENTRY DrawElementsInstancedANGLEContextANGLE(GLeglContext ctx,
>+                                                                     GLenum mode,
>+                                                                     GLsizei count,
>+                                                                     GLenum type,
>+                                                                     const void *indices,
>+                                                                     GLsizei primcount);
>+ANGLE_EXPORT void GL_APIENTRY DrawElementsInstancedEXTContextANGLE(GLeglContext ctx,
>+                                                                   GLenum mode,
>+                                                                   GLsizei count,
>+                                                                   GLenum type,
>+                                                                   const void *indices,
>+                                                                   GLsizei primcount);
>+ANGLE_EXPORT void GL_APIENTRY DrawRangeElementsContextANGLE(GLeglContext ctx,
>+                                                            GLenum mode,
>+                                                            GLuint start,
>+                                                            GLuint end,
>+                                                            GLsizei count,
>+                                                            GLenum type,
>+                                                            const void *indices);
>+ANGLE_EXPORT void GL_APIENTRY DrawTexfOESContextANGLE(GLeglContext ctx,
>+                                                      GLfloat x,
>+                                                      GLfloat y,
>+                                                      GLfloat z,
>+                                                      GLfloat width,
>+                                                      GLfloat height);
>+ANGLE_EXPORT void GL_APIENTRY DrawTexfvOESContextANGLE(GLeglContext ctx, const GLfloat *coords);
>+ANGLE_EXPORT void GL_APIENTRY
>+DrawTexiOESContextANGLE(GLeglContext ctx, GLint x, GLint y, GLint z, GLint width, GLint height);
>+ANGLE_EXPORT void GL_APIENTRY DrawTexivOESContextANGLE(GLeglContext ctx, const GLint *coords);
>+ANGLE_EXPORT void GL_APIENTRY DrawTexsOESContextANGLE(GLeglContext ctx,
>+                                                      GLshort x,
>+                                                      GLshort y,
>+                                                      GLshort z,
>+                                                      GLshort width,
>+                                                      GLshort height);
>+ANGLE_EXPORT void GL_APIENTRY DrawTexsvOESContextANGLE(GLeglContext ctx, const GLshort *coords);
>+ANGLE_EXPORT void GL_APIENTRY DrawTexxOESContextANGLE(GLeglContext ctx,
>+                                                      GLfixed x,
>+                                                      GLfixed y,
>+                                                      GLfixed z,
>+                                                      GLfixed width,
>+                                                      GLfixed height);
>+ANGLE_EXPORT void GL_APIENTRY DrawTexxvOESContextANGLE(GLeglContext ctx, const GLfixed *coords);
>+ANGLE_EXPORT void GL_APIENTRY EGLImageTargetRenderbufferStorageOESContextANGLE(GLeglContext ctx,
>+                                                                               GLenum target,
>+                                                                               GLeglImageOES image);
>+ANGLE_EXPORT void GL_APIENTRY EGLImageTargetTexture2DOESContextANGLE(GLeglContext ctx,
>+                                                                     GLenum target,
>+                                                                     GLeglImageOES image);
>+ANGLE_EXPORT void GL_APIENTRY EnableContextANGLE(GLeglContext ctx, GLenum cap);
>+ANGLE_EXPORT void GL_APIENTRY EnableClientStateContextANGLE(GLeglContext ctx, GLenum array);
>+ANGLE_EXPORT void GL_APIENTRY EnableVertexAttribArrayContextANGLE(GLeglContext ctx, GLuint index);
>+ANGLE_EXPORT void GL_APIENTRY EndQueryContextANGLE(GLeglContext ctx, GLenum target);
>+ANGLE_EXPORT void GL_APIENTRY EndQueryEXTContextANGLE(GLeglContext ctx, GLenum target);
>+ANGLE_EXPORT void GL_APIENTRY EndTransformFeedbackContextANGLE(GLeglContext ctx);
>+ANGLE_EXPORT GLsync GL_APIENTRY FenceSyncContextANGLE(GLeglContext ctx,
>+                                                      GLenum condition,
>+                                                      GLbitfield flags);
>+ANGLE_EXPORT void GL_APIENTRY FinishContextANGLE(GLeglContext ctx);
>+ANGLE_EXPORT void GL_APIENTRY FinishFenceNVContextANGLE(GLeglContext ctx, GLuint fence);
>+ANGLE_EXPORT void GL_APIENTRY FlushContextANGLE(GLeglContext ctx);
>+ANGLE_EXPORT void GL_APIENTRY FlushMappedBufferRangeContextANGLE(GLeglContext ctx,
>+                                                                 GLenum target,
>+                                                                 GLintptr offset,
>+                                                                 GLsizeiptr length);
>+ANGLE_EXPORT void GL_APIENTRY FlushMappedBufferRangeEXTContextANGLE(GLeglContext ctx,
>+                                                                    GLenum target,
>+                                                                    GLintptr offset,
>+                                                                    GLsizeiptr length);
>+ANGLE_EXPORT void GL_APIENTRY FogfContextANGLE(GLeglContext ctx, GLenum pname, GLfloat param);
>+ANGLE_EXPORT void GL_APIENTRY FogfvContextANGLE(GLeglContext ctx,
>+                                                GLenum pname,
>+                                                const GLfloat *params);
>+ANGLE_EXPORT void GL_APIENTRY FogxContextANGLE(GLeglContext ctx, GLenum pname, GLfixed param);
>+ANGLE_EXPORT void GL_APIENTRY FogxvContextANGLE(GLeglContext ctx,
>+                                                GLenum pname,
>+                                                const GLfixed *param);
>+ANGLE_EXPORT void GL_APIENTRY FramebufferParameteriContextANGLE(GLeglContext ctx,
>+                                                                GLenum target,
>+                                                                GLenum pname,
>+                                                                GLint param);
>+ANGLE_EXPORT void GL_APIENTRY FramebufferRenderbufferContextANGLE(GLeglContext ctx,
>+                                                                  GLenum target,
>+                                                                  GLenum attachment,
>+                                                                  GLenum renderbuffertarget,
>+                                                                  GLuint renderbuffer);
>+ANGLE_EXPORT void GL_APIENTRY FramebufferRenderbufferOESContextANGLE(GLeglContext ctx,
>+                                                                     GLenum target,
>+                                                                     GLenum attachment,
>+                                                                     GLenum renderbuffertarget,
>+                                                                     GLuint renderbuffer);
>+ANGLE_EXPORT void GL_APIENTRY FramebufferTexture2DContextANGLE(GLeglContext ctx,
>+                                                               GLenum target,
>+                                                               GLenum attachment,
>+                                                               GLenum textarget,
>+                                                               GLuint texture,
>+                                                               GLint level);
>+ANGLE_EXPORT void GL_APIENTRY FramebufferTexture2DOESContextANGLE(GLeglContext ctx,
>+                                                                  GLenum target,
>+                                                                  GLenum attachment,
>+                                                                  GLenum textarget,
>+                                                                  GLuint texture,
>+                                                                  GLint level);
>+ANGLE_EXPORT void GL_APIENTRY FramebufferTextureEXTContextANGLE(GLeglContext ctx,
>+                                                                GLenum target,
>+                                                                GLenum attachment,
>+                                                                GLuint texture,
>+                                                                GLint level);
>+ANGLE_EXPORT void GL_APIENTRY FramebufferTextureLayerContextANGLE(GLeglContext ctx,
>+                                                                  GLenum target,
>+                                                                  GLenum attachment,
>+                                                                  GLuint texture,
>+                                                                  GLint level,
>+                                                                  GLint layer);
>+ANGLE_EXPORT void GL_APIENTRY FramebufferTextureMultiviewOVRContextANGLE(GLeglContext ctx,
>+                                                                         GLenum target,
>+                                                                         GLenum attachment,
>+                                                                         GLuint texture,
>+                                                                         GLint level,
>+                                                                         GLint baseViewIndex,
>+                                                                         GLsizei numViews);
>+ANGLE_EXPORT void GL_APIENTRY FrontFaceContextANGLE(GLeglContext ctx, GLenum mode);
>+ANGLE_EXPORT void GL_APIENTRY FrustumfContextANGLE(GLeglContext ctx,
>+                                                   GLfloat l,
>+                                                   GLfloat r,
>+                                                   GLfloat b,
>+                                                   GLfloat t,
>+                                                   GLfloat n,
>+                                                   GLfloat f);
>+ANGLE_EXPORT void GL_APIENTRY FrustumxContextANGLE(GLeglContext ctx,
>+                                                   GLfixed l,
>+                                                   GLfixed r,
>+                                                   GLfixed b,
>+                                                   GLfixed t,
>+                                                   GLfixed n,
>+                                                   GLfixed f);
>+ANGLE_EXPORT void GL_APIENTRY GenBuffersContextANGLE(GLeglContext ctx, GLsizei n, GLuint *buffers);
>+ANGLE_EXPORT void GL_APIENTRY GenFencesNVContextANGLE(GLeglContext ctx, GLsizei n, GLuint *fences);
>+ANGLE_EXPORT void GL_APIENTRY GenFramebuffersContextANGLE(GLeglContext ctx,
>+                                                          GLsizei n,
>+                                                          GLuint *framebuffers);
>+ANGLE_EXPORT void GL_APIENTRY GenFramebuffersOESContextANGLE(GLeglContext ctx,
>+                                                             GLsizei n,
>+                                                             GLuint *framebuffers);
>+ANGLE_EXPORT void GL_APIENTRY GenProgramPipelinesContextANGLE(GLeglContext ctx,
>+                                                              GLsizei n,
>+                                                              GLuint *pipelines);
>+ANGLE_EXPORT void GL_APIENTRY GenQueriesContextANGLE(GLeglContext ctx, GLsizei n, GLuint *ids);
>+ANGLE_EXPORT void GL_APIENTRY GenQueriesEXTContextANGLE(GLeglContext ctx, GLsizei n, GLuint *ids);
>+ANGLE_EXPORT void GL_APIENTRY GenRenderbuffersContextANGLE(GLeglContext ctx,
>+                                                           GLsizei n,
>+                                                           GLuint *renderbuffers);
>+ANGLE_EXPORT void GL_APIENTRY GenRenderbuffersOESContextANGLE(GLeglContext ctx,
>+                                                              GLsizei n,
>+                                                              GLuint *renderbuffers);
>+ANGLE_EXPORT void GL_APIENTRY GenSamplersContextANGLE(GLeglContext ctx,
>+                                                      GLsizei count,
>+                                                      GLuint *samplers);
>+ANGLE_EXPORT void GL_APIENTRY GenSemaphoresEXTContextANGLE(GLeglContext ctx,
>+                                                           GLsizei n,
>+                                                           GLuint *semaphores);
>+ANGLE_EXPORT void GL_APIENTRY GenTexturesContextANGLE(GLeglContext ctx,
>+                                                      GLsizei n,
>+                                                      GLuint *textures);
>+ANGLE_EXPORT void GL_APIENTRY GenTransformFeedbacksContextANGLE(GLeglContext ctx,
>+                                                                GLsizei n,
>+                                                                GLuint *ids);
>+ANGLE_EXPORT void GL_APIENTRY GenVertexArraysContextANGLE(GLeglContext ctx,
>+                                                          GLsizei n,
>+                                                          GLuint *arrays);
>+ANGLE_EXPORT void GL_APIENTRY GenVertexArraysOESContextANGLE(GLeglContext ctx,
>+                                                             GLsizei n,
>+                                                             GLuint *arrays);
>+ANGLE_EXPORT void GL_APIENTRY GenerateMipmapContextANGLE(GLeglContext ctx, GLenum target);
>+ANGLE_EXPORT void GL_APIENTRY GenerateMipmapOESContextANGLE(GLeglContext ctx, GLenum target);
>+ANGLE_EXPORT void GL_APIENTRY GetActiveAttribContextANGLE(GLeglContext ctx,
>+                                                          GLuint program,
>+                                                          GLuint index,
>+                                                          GLsizei bufSize,
>+                                                          GLsizei *length,
>+                                                          GLint *size,
>+                                                          GLenum *type,
>+                                                          GLchar *name);
>+ANGLE_EXPORT void GL_APIENTRY GetActiveUniformContextANGLE(GLeglContext ctx,
>+                                                           GLuint program,
>+                                                           GLuint index,
>+                                                           GLsizei bufSize,
>+                                                           GLsizei *length,
>+                                                           GLint *size,
>+                                                           GLenum *type,
>+                                                           GLchar *name);
>+ANGLE_EXPORT void GL_APIENTRY GetActiveUniformBlockNameContextANGLE(GLeglContext ctx,
>+                                                                    GLuint program,
>+                                                                    GLuint uniformBlockIndex,
>+                                                                    GLsizei bufSize,
>+                                                                    GLsizei *length,
>+                                                                    GLchar *uniformBlockName);
>+ANGLE_EXPORT void GL_APIENTRY GetActiveUniformBlockivContextANGLE(GLeglContext ctx,
>+                                                                  GLuint program,
>+                                                                  GLuint uniformBlockIndex,
>+                                                                  GLenum pname,
>+                                                                  GLint *params);
>+ANGLE_EXPORT void GL_APIENTRY GetActiveUniformsivContextANGLE(GLeglContext ctx,
>+                                                              GLuint program,
>+                                                              GLsizei uniformCount,
>+                                                              const GLuint *uniformIndices,
>+                                                              GLenum pname,
>+                                                              GLint *params);
>+ANGLE_EXPORT void GL_APIENTRY GetAttachedShadersContextANGLE(GLeglContext ctx,
>+                                                             GLuint program,
>+                                                             GLsizei maxCount,
>+                                                             GLsizei *count,
>+                                                             GLuint *shaders);
>+ANGLE_EXPORT GLint GL_APIENTRY GetAttribLocationContextANGLE(GLeglContext ctx,
>+                                                             GLuint program,
>+                                                             const GLchar *name);
>+ANGLE_EXPORT void GL_APIENTRY GetBooleani_vContextANGLE(GLeglContext ctx,
>+                                                        GLenum target,
>+                                                        GLuint index,
>+                                                        GLboolean *data);
>+ANGLE_EXPORT void GL_APIENTRY GetBooleanvContextANGLE(GLeglContext ctx,
>+                                                      GLenum pname,
>+                                                      GLboolean *data);
>+ANGLE_EXPORT void GL_APIENTRY GetBufferParameteri64vContextANGLE(GLeglContext ctx,
>+                                                                 GLenum target,
>+                                                                 GLenum pname,
>+                                                                 GLint64 *params);
>+ANGLE_EXPORT void GL_APIENTRY GetBufferParameterivContextANGLE(GLeglContext ctx,
>+                                                               GLenum target,
>+                                                               GLenum pname,
>+                                                               GLint *params);
>+ANGLE_EXPORT void GL_APIENTRY GetBufferPointervContextANGLE(GLeglContext ctx,
>+                                                            GLenum target,
>+                                                            GLenum pname,
>+                                                            void **params);
>+ANGLE_EXPORT void GL_APIENTRY GetBufferPointervOESContextANGLE(GLeglContext ctx,
>+                                                               GLenum target,
>+                                                               GLenum pname,
>+                                                               void **params);
>+ANGLE_EXPORT void GL_APIENTRY GetClipPlanefContextANGLE(GLeglContext ctx,
>+                                                        GLenum plane,
>+                                                        GLfloat *equation);
>+ANGLE_EXPORT void GL_APIENTRY GetClipPlanexContextANGLE(GLeglContext ctx,
>+                                                        GLenum plane,
>+                                                        GLfixed *equation);
>+ANGLE_EXPORT GLuint GL_APIENTRY GetDebugMessageLogKHRContextANGLE(GLeglContext ctx,
>+                                                                  GLuint count,
>+                                                                  GLsizei bufSize,
>+                                                                  GLenum *sources,
>+                                                                  GLenum *types,
>+                                                                  GLuint *ids,
>+                                                                  GLenum *severities,
>+                                                                  GLsizei *lengths,
>+                                                                  GLchar *messageLog);
>+ANGLE_EXPORT GLenum GL_APIENTRY GetErrorContextANGLE(GLeglContext ctx);
>+ANGLE_EXPORT void GL_APIENTRY GetFenceivNVContextANGLE(GLeglContext ctx,
>+                                                       GLuint fence,
>+                                                       GLenum pname,
>+                                                       GLint *params);
>+ANGLE_EXPORT void GL_APIENTRY GetFixedvContextANGLE(GLeglContext ctx,
>+                                                    GLenum pname,
>+                                                    GLfixed *params);
>+ANGLE_EXPORT void GL_APIENTRY GetFloatvContextANGLE(GLeglContext ctx, GLenum pname, GLfloat *data);
>+ANGLE_EXPORT GLint GL_APIENTRY GetFragDataIndexEXTContextANGLE(GLeglContext ctx,
>+                                                               GLuint program,
>+                                                               const GLchar *name);
>+ANGLE_EXPORT GLint GL_APIENTRY GetFragDataLocationContextANGLE(GLeglContext ctx,
>+                                                               GLuint program,
>+                                                               const GLchar *name);
>+ANGLE_EXPORT void GL_APIENTRY GetFramebufferAttachmentParameterivContextANGLE(GLeglContext ctx,
>+                                                                              GLenum target,
>+                                                                              GLenum attachment,
>+                                                                              GLenum pname,
>+                                                                              GLint *params);
>+ANGLE_EXPORT void GL_APIENTRY GetFramebufferAttachmentParameterivOESContextANGLE(GLeglContext ctx,
>+                                                                                 GLenum target,
>+                                                                                 GLenum attachment,
>+                                                                                 GLenum pname,
>+                                                                                 GLint *params);
>+ANGLE_EXPORT void GL_APIENTRY GetFramebufferParameterivContextANGLE(GLeglContext ctx,
>+                                                                    GLenum target,
>+                                                                    GLenum pname,
>+                                                                    GLint *params);
>+ANGLE_EXPORT GLenum GL_APIENTRY GetGraphicsResetStatusEXTContextANGLE(GLeglContext ctx);
>+ANGLE_EXPORT void GL_APIENTRY GetInteger64i_vContextANGLE(GLeglContext ctx,
>+                                                          GLenum target,
>+                                                          GLuint index,
>+                                                          GLint64 *data);
>+ANGLE_EXPORT void GL_APIENTRY GetInteger64vContextANGLE(GLeglContext ctx,
>+                                                        GLenum pname,
>+                                                        GLint64 *data);
>+ANGLE_EXPORT void GL_APIENTRY GetIntegeri_vContextANGLE(GLeglContext ctx,
>+                                                        GLenum target,
>+                                                        GLuint index,
>+                                                        GLint *data);
>+ANGLE_EXPORT void GL_APIENTRY GetIntegervContextANGLE(GLeglContext ctx, GLenum pname, GLint *data);
>+ANGLE_EXPORT void GL_APIENTRY GetInternalformativContextANGLE(GLeglContext ctx,
>+                                                              GLenum target,
>+                                                              GLenum internalformat,
>+                                                              GLenum pname,
>+                                                              GLsizei bufSize,
>+                                                              GLint *params);
>+ANGLE_EXPORT void GL_APIENTRY GetLightfvContextANGLE(GLeglContext ctx,
>+                                                     GLenum light,
>+                                                     GLenum pname,
>+                                                     GLfloat *params);
>+ANGLE_EXPORT void GL_APIENTRY GetLightxvContextANGLE(GLeglContext ctx,
>+                                                     GLenum light,
>+                                                     GLenum pname,
>+                                                     GLfixed *params);
>+ANGLE_EXPORT void GL_APIENTRY GetMaterialfvContextANGLE(GLeglContext ctx,
>+                                                        GLenum face,
>+                                                        GLenum pname,
>+                                                        GLfloat *params);
>+ANGLE_EXPORT void GL_APIENTRY GetMaterialxvContextANGLE(GLeglContext ctx,
>+                                                        GLenum face,
>+                                                        GLenum pname,
>+                                                        GLfixed *params);
>+ANGLE_EXPORT void GL_APIENTRY GetMemoryObjectParameterivEXTContextANGLE(GLeglContext ctx,
>+                                                                        GLuint memoryObject,
>+                                                                        GLenum pname,
>+                                                                        GLint *params);
>+ANGLE_EXPORT void GL_APIENTRY GetMultisamplefvContextANGLE(GLeglContext ctx,
>+                                                           GLenum pname,
>+                                                           GLuint index,
>+                                                           GLfloat *val);
>+ANGLE_EXPORT void GL_APIENTRY GetObjectLabelKHRContextANGLE(GLeglContext ctx,
>+                                                            GLenum identifier,
>+                                                            GLuint name,
>+                                                            GLsizei bufSize,
>+                                                            GLsizei *length,
>+                                                            GLchar *label);
>+ANGLE_EXPORT void GL_APIENTRY GetObjectPtrLabelKHRContextANGLE(GLeglContext ctx,
>+                                                               const void *ptr,
>+                                                               GLsizei bufSize,
>+                                                               GLsizei *length,
>+                                                               GLchar *label);
>+ANGLE_EXPORT void GL_APIENTRY GetPointervContextANGLE(GLeglContext ctx,
>+                                                      GLenum pname,
>+                                                      void **params);
>+ANGLE_EXPORT void GL_APIENTRY GetPointervKHRContextANGLE(GLeglContext ctx,
>+                                                         GLenum pname,
>+                                                         void **params);
>+ANGLE_EXPORT void GL_APIENTRY GetProgramBinaryContextANGLE(GLeglContext ctx,
>+                                                           GLuint program,
>+                                                           GLsizei bufSize,
>+                                                           GLsizei *length,
>+                                                           GLenum *binaryFormat,
>+                                                           void *binary);
>+ANGLE_EXPORT void GL_APIENTRY GetProgramBinaryOESContextANGLE(GLeglContext ctx,
>+                                                              GLuint program,
>+                                                              GLsizei bufSize,
>+                                                              GLsizei *length,
>+                                                              GLenum *binaryFormat,
>+                                                              void *binary);
>+ANGLE_EXPORT void GL_APIENTRY GetProgramInfoLogContextANGLE(GLeglContext ctx,
>+                                                            GLuint program,
>+                                                            GLsizei bufSize,
>+                                                            GLsizei *length,
>+                                                            GLchar *infoLog);
>+ANGLE_EXPORT void GL_APIENTRY GetProgramInterfaceivContextANGLE(GLeglContext ctx,
>+                                                                GLuint program,
>+                                                                GLenum programInterface,
>+                                                                GLenum pname,
>+                                                                GLint *params);
>+ANGLE_EXPORT void GL_APIENTRY GetProgramPipelineInfoLogContextANGLE(GLeglContext ctx,
>+                                                                    GLuint pipeline,
>+                                                                    GLsizei bufSize,
>+                                                                    GLsizei *length,
>+                                                                    GLchar *infoLog);
>+ANGLE_EXPORT void GL_APIENTRY GetProgramPipelineivContextANGLE(GLeglContext ctx,
>+                                                               GLuint pipeline,
>+                                                               GLenum pname,
>+                                                               GLint *params);
>+ANGLE_EXPORT GLuint GL_APIENTRY GetProgramResourceIndexContextANGLE(GLeglContext ctx,
>+                                                                    GLuint program,
>+                                                                    GLenum programInterface,
>+                                                                    const GLchar *name);
>+ANGLE_EXPORT GLint GL_APIENTRY GetProgramResourceLocationContextANGLE(GLeglContext ctx,
>+                                                                      GLuint program,
>+                                                                      GLenum programInterface,
>+                                                                      const GLchar *name);
>+ANGLE_EXPORT GLint GL_APIENTRY
>+GetProgramResourceLocationIndexEXTContextANGLE(GLeglContext ctx,
>+                                               GLuint program,
>+                                               GLenum programInterface,
>+                                               const GLchar *name);
>+ANGLE_EXPORT void GL_APIENTRY GetProgramResourceNameContextANGLE(GLeglContext ctx,
>+                                                                 GLuint program,
>+                                                                 GLenum programInterface,
>+                                                                 GLuint index,
>+                                                                 GLsizei bufSize,
>+                                                                 GLsizei *length,
>+                                                                 GLchar *name);
>+ANGLE_EXPORT void GL_APIENTRY GetProgramResourceivContextANGLE(GLeglContext ctx,
>+                                                               GLuint program,
>+                                                               GLenum programInterface,
>+                                                               GLuint index,
>+                                                               GLsizei propCount,
>+                                                               const GLenum *props,
>+                                                               GLsizei bufSize,
>+                                                               GLsizei *length,
>+                                                               GLint *params);
>+ANGLE_EXPORT void GL_APIENTRY GetProgramivContextANGLE(GLeglContext ctx,
>+                                                       GLuint program,
>+                                                       GLenum pname,
>+                                                       GLint *params);
>+ANGLE_EXPORT void GL_APIENTRY GetQueryObjecti64vEXTContextANGLE(GLeglContext ctx,
>+                                                                GLuint id,
>+                                                                GLenum pname,
>+                                                                GLint64 *params);
>+ANGLE_EXPORT void GL_APIENTRY GetQueryObjectivEXTContextANGLE(GLeglContext ctx,
>+                                                              GLuint id,
>+                                                              GLenum pname,
>+                                                              GLint *params);
>+ANGLE_EXPORT void GL_APIENTRY GetQueryObjectui64vEXTContextANGLE(GLeglContext ctx,
>+                                                                 GLuint id,
>+                                                                 GLenum pname,
>+                                                                 GLuint64 *params);
>+ANGLE_EXPORT void GL_APIENTRY GetQueryObjectuivContextANGLE(GLeglContext ctx,
>+                                                            GLuint id,
>+                                                            GLenum pname,
>+                                                            GLuint *params);
>+ANGLE_EXPORT void GL_APIENTRY GetQueryObjectuivEXTContextANGLE(GLeglContext ctx,
>+                                                               GLuint id,
>+                                                               GLenum pname,
>+                                                               GLuint *params);
>+ANGLE_EXPORT void GL_APIENTRY GetQueryivContextANGLE(GLeglContext ctx,
>+                                                     GLenum target,
>+                                                     GLenum pname,
>+                                                     GLint *params);
>+ANGLE_EXPORT void GL_APIENTRY GetQueryivEXTContextANGLE(GLeglContext ctx,
>+                                                        GLenum target,
>+                                                        GLenum pname,
>+                                                        GLint *params);
>+ANGLE_EXPORT void GL_APIENTRY GetRenderbufferParameterivContextANGLE(GLeglContext ctx,
>+                                                                     GLenum target,
>+                                                                     GLenum pname,
>+                                                                     GLint *params);
>+ANGLE_EXPORT void GL_APIENTRY GetRenderbufferParameterivOESContextANGLE(GLeglContext ctx,
>+                                                                        GLenum target,
>+                                                                        GLenum pname,
>+                                                                        GLint *params);
>+ANGLE_EXPORT void GL_APIENTRY GetSamplerParameterIivOESContextANGLE(GLeglContext ctx,
>+                                                                    GLuint sampler,
>+                                                                    GLenum pname,
>+                                                                    GLint *params);
>+ANGLE_EXPORT void GL_APIENTRY GetSamplerParameterIuivOESContextANGLE(GLeglContext ctx,
>+                                                                     GLuint sampler,
>+                                                                     GLenum pname,
>+                                                                     GLuint *params);
>+ANGLE_EXPORT void GL_APIENTRY GetSamplerParameterfvContextANGLE(GLeglContext ctx,
>+                                                                GLuint sampler,
>+                                                                GLenum pname,
>+                                                                GLfloat *params);
>+ANGLE_EXPORT void GL_APIENTRY GetSamplerParameterivContextANGLE(GLeglContext ctx,
>+                                                                GLuint sampler,
>+                                                                GLenum pname,
>+                                                                GLint *params);
>+ANGLE_EXPORT void GL_APIENTRY GetSemaphoreParameterui64vEXTContextANGLE(GLeglContext ctx,
>+                                                                        GLuint semaphore,
>+                                                                        GLenum pname,
>+                                                                        GLuint64 *params);
>+ANGLE_EXPORT void GL_APIENTRY GetShaderInfoLogContextANGLE(GLeglContext ctx,
>+                                                           GLuint shader,
>+                                                           GLsizei bufSize,
>+                                                           GLsizei *length,
>+                                                           GLchar *infoLog);
>+ANGLE_EXPORT void GL_APIENTRY GetShaderPrecisionFormatContextANGLE(GLeglContext ctx,
>+                                                                   GLenum shadertype,
>+                                                                   GLenum precisiontype,
>+                                                                   GLint *range,
>+                                                                   GLint *precision);
>+ANGLE_EXPORT void GL_APIENTRY GetShaderSourceContextANGLE(GLeglContext ctx,
>+                                                          GLuint shader,
>+                                                          GLsizei bufSize,
>+                                                          GLsizei *length,
>+                                                          GLchar *source);
>+ANGLE_EXPORT void GL_APIENTRY GetShaderivContextANGLE(GLeglContext ctx,
>+                                                      GLuint shader,
>+                                                      GLenum pname,
>+                                                      GLint *params);
>+ANGLE_EXPORT const GLubyte *GL_APIENTRY GetStringContextANGLE(GLeglContext ctx, GLenum name);
>+ANGLE_EXPORT const GLubyte *GL_APIENTRY GetStringiContextANGLE(GLeglContext ctx,
>+                                                               GLenum name,
>+                                                               GLuint index);
>+ANGLE_EXPORT void GL_APIENTRY GetSyncivContextANGLE(GLeglContext ctx,
>+                                                    GLsync sync,
>+                                                    GLenum pname,
>+                                                    GLsizei bufSize,
>+                                                    GLsizei *length,
>+                                                    GLint *values);
>+ANGLE_EXPORT void GL_APIENTRY GetTexEnvfvContextANGLE(GLeglContext ctx,
>+                                                      GLenum target,
>+                                                      GLenum pname,
>+                                                      GLfloat *params);
>+ANGLE_EXPORT void GL_APIENTRY GetTexEnvivContextANGLE(GLeglContext ctx,
>+                                                      GLenum target,
>+                                                      GLenum pname,
>+                                                      GLint *params);
>+ANGLE_EXPORT void GL_APIENTRY GetTexEnvxvContextANGLE(GLeglContext ctx,
>+                                                      GLenum target,
>+                                                      GLenum pname,
>+                                                      GLfixed *params);
>+ANGLE_EXPORT void GL_APIENTRY GetTexGenfvOESContextANGLE(GLeglContext ctx,
>+                                                         GLenum coord,
>+                                                         GLenum pname,
>+                                                         GLfloat *params);
>+ANGLE_EXPORT void GL_APIENTRY GetTexGenivOESContextANGLE(GLeglContext ctx,
>+                                                         GLenum coord,
>+                                                         GLenum pname,
>+                                                         GLint *params);
>+ANGLE_EXPORT void GL_APIENTRY GetTexGenxvOESContextANGLE(GLeglContext ctx,
>+                                                         GLenum coord,
>+                                                         GLenum pname,
>+                                                         GLfixed *params);
>+ANGLE_EXPORT void GL_APIENTRY GetTexLevelParameterfvContextANGLE(GLeglContext ctx,
>+                                                                 GLenum target,
>+                                                                 GLint level,
>+                                                                 GLenum pname,
>+                                                                 GLfloat *params);
>+ANGLE_EXPORT void GL_APIENTRY GetTexLevelParameterivContextANGLE(GLeglContext ctx,
>+                                                                 GLenum target,
>+                                                                 GLint level,
>+                                                                 GLenum pname,
>+                                                                 GLint *params);
>+ANGLE_EXPORT void GL_APIENTRY GetTexParameterIivOESContextANGLE(GLeglContext ctx,
>+                                                                GLenum target,
>+                                                                GLenum pname,
>+                                                                GLint *params);
>+ANGLE_EXPORT void GL_APIENTRY GetTexParameterIuivOESContextANGLE(GLeglContext ctx,
>+                                                                 GLenum target,
>+                                                                 GLenum pname,
>+                                                                 GLuint *params);
>+ANGLE_EXPORT void GL_APIENTRY GetTexParameterfvContextANGLE(GLeglContext ctx,
>+                                                            GLenum target,
>+                                                            GLenum pname,
>+                                                            GLfloat *params);
>+ANGLE_EXPORT void GL_APIENTRY GetTexParameterivContextANGLE(GLeglContext ctx,
>+                                                            GLenum target,
>+                                                            GLenum pname,
>+                                                            GLint *params);
>+ANGLE_EXPORT void GL_APIENTRY GetTexParameterxvContextANGLE(GLeglContext ctx,
>+                                                            GLenum target,
>+                                                            GLenum pname,
>+                                                            GLfixed *params);
>+ANGLE_EXPORT void GL_APIENTRY GetTransformFeedbackVaryingContextANGLE(GLeglContext ctx,
>+                                                                      GLuint program,
>+                                                                      GLuint index,
>+                                                                      GLsizei bufSize,
>+                                                                      GLsizei *length,
>+                                                                      GLsizei *size,
>+                                                                      GLenum *type,
>+                                                                      GLchar *name);
>+ANGLE_EXPORT void GL_APIENTRY GetTranslatedShaderSourceANGLEContextANGLE(GLeglContext ctx,
>+                                                                         GLuint shader,
>+                                                                         GLsizei bufsize,
>+                                                                         GLsizei *length,
>+                                                                         GLchar *source);
>+ANGLE_EXPORT GLuint GL_APIENTRY GetUniformBlockIndexContextANGLE(GLeglContext ctx,
>+                                                                 GLuint program,
>+                                                                 const GLchar *uniformBlockName);
>+ANGLE_EXPORT void GL_APIENTRY GetUniformIndicesContextANGLE(GLeglContext ctx,
>+                                                            GLuint program,
>+                                                            GLsizei uniformCount,
>+                                                            const GLchar *const *uniformNames,
>+                                                            GLuint *uniformIndices);
>+ANGLE_EXPORT GLint GL_APIENTRY GetUniformLocationContextANGLE(GLeglContext ctx,
>+                                                              GLuint program,
>+                                                              const GLchar *name);
>+ANGLE_EXPORT void GL_APIENTRY GetUniformfvContextANGLE(GLeglContext ctx,
>+                                                       GLuint program,
>+                                                       GLint location,
>+                                                       GLfloat *params);
>+ANGLE_EXPORT void GL_APIENTRY GetUniformivContextANGLE(GLeglContext ctx,
>+                                                       GLuint program,
>+                                                       GLint location,
>+                                                       GLint *params);
>+ANGLE_EXPORT void GL_APIENTRY GetUniformuivContextANGLE(GLeglContext ctx,
>+                                                        GLuint program,
>+                                                        GLint location,
>+                                                        GLuint *params);
>+ANGLE_EXPORT void GL_APIENTRY GetUnsignedBytevEXTContextANGLE(GLeglContext ctx,
>+                                                              GLenum pname,
>+                                                              GLubyte *data);
>+ANGLE_EXPORT void GL_APIENTRY GetUnsignedBytei_vEXTContextANGLE(GLeglContext ctx,
>+                                                                GLenum target,
>+                                                                GLuint index,
>+                                                                GLubyte *data);
>+ANGLE_EXPORT void GL_APIENTRY GetVertexAttribIivContextANGLE(GLeglContext ctx,
>+                                                             GLuint index,
>+                                                             GLenum pname,
>+                                                             GLint *params);
>+ANGLE_EXPORT void GL_APIENTRY GetVertexAttribIuivContextANGLE(GLeglContext ctx,
>+                                                              GLuint index,
>+                                                              GLenum pname,
>+                                                              GLuint *params);
>+ANGLE_EXPORT void GL_APIENTRY GetVertexAttribPointervContextANGLE(GLeglContext ctx,
>+                                                                  GLuint index,
>+                                                                  GLenum pname,
>+                                                                  void **pointer);
>+ANGLE_EXPORT void GL_APIENTRY GetVertexAttribfvContextANGLE(GLeglContext ctx,
>+                                                            GLuint index,
>+                                                            GLenum pname,
>+                                                            GLfloat *params);
>+ANGLE_EXPORT void GL_APIENTRY GetVertexAttribivContextANGLE(GLeglContext ctx,
>+                                                            GLuint index,
>+                                                            GLenum pname,
>+                                                            GLint *params);
>+ANGLE_EXPORT void GL_APIENTRY GetnUniformfvEXTContextANGLE(GLeglContext ctx,
>+                                                           GLuint program,
>+                                                           GLint location,
>+                                                           GLsizei bufSize,
>+                                                           GLfloat *params);
>+ANGLE_EXPORT void GL_APIENTRY GetnUniformivEXTContextANGLE(GLeglContext ctx,
>+                                                           GLuint program,
>+                                                           GLint location,
>+                                                           GLsizei bufSize,
>+                                                           GLint *params);
>+ANGLE_EXPORT void GL_APIENTRY HintContextANGLE(GLeglContext ctx, GLenum target, GLenum mode);
>+ANGLE_EXPORT void GL_APIENTRY ImportMemoryFdEXTContextANGLE(GLeglContext ctx,
>+                                                            GLuint memory,
>+                                                            GLuint64 size,
>+                                                            GLenum handleType,
>+                                                            GLint fd);
>+ANGLE_EXPORT void GL_APIENTRY ImportSemaphoreFdEXTContextANGLE(GLeglContext ctx,
>+                                                               GLuint semaphore,
>+                                                               GLenum handleType,
>+                                                               GLint fd);
>+ANGLE_EXPORT void GL_APIENTRY InsertEventMarkerEXTContextANGLE(GLeglContext ctx,
>+                                                               GLsizei length,
>+                                                               const GLchar *marker);
>+ANGLE_EXPORT void GL_APIENTRY InvalidateFramebufferContextANGLE(GLeglContext ctx,
>+                                                                GLenum target,
>+                                                                GLsizei numAttachments,
>+                                                                const GLenum *attachments);
>+ANGLE_EXPORT void GL_APIENTRY InvalidateSubFramebufferContextANGLE(GLeglContext ctx,
>+                                                                   GLenum target,
>+                                                                   GLsizei numAttachments,
>+                                                                   const GLenum *attachments,
>+                                                                   GLint x,
>+                                                                   GLint y,
>+                                                                   GLsizei width,
>+                                                                   GLsizei height);
>+ANGLE_EXPORT GLboolean GL_APIENTRY IsBufferContextANGLE(GLeglContext ctx, GLuint buffer);
>+ANGLE_EXPORT GLboolean GL_APIENTRY IsEnabledContextANGLE(GLeglContext ctx, GLenum cap);
>+ANGLE_EXPORT GLboolean GL_APIENTRY IsFenceNVContextANGLE(GLeglContext ctx, GLuint fence);
>+ANGLE_EXPORT GLboolean GL_APIENTRY IsFramebufferContextANGLE(GLeglContext ctx, GLuint framebuffer);
>+ANGLE_EXPORT GLboolean GL_APIENTRY IsFramebufferOESContextANGLE(GLeglContext ctx,
>+                                                                GLuint framebuffer);
>+ANGLE_EXPORT GLboolean GL_APIENTRY IsMemoryObjectEXTContextANGLE(GLeglContext ctx,
>+                                                                 GLuint memoryObject);
>+ANGLE_EXPORT GLboolean GL_APIENTRY IsProgramContextANGLE(GLeglContext ctx, GLuint program);
>+ANGLE_EXPORT GLboolean GL_APIENTRY IsProgramPipelineContextANGLE(GLeglContext ctx, GLuint pipeline);
>+ANGLE_EXPORT GLboolean GL_APIENTRY IsQueryContextANGLE(GLeglContext ctx, GLuint id);
>+ANGLE_EXPORT GLboolean GL_APIENTRY IsQueryEXTContextANGLE(GLeglContext ctx, GLuint id);
>+ANGLE_EXPORT GLboolean GL_APIENTRY IsRenderbufferContextANGLE(GLeglContext ctx,
>+                                                              GLuint renderbuffer);
>+ANGLE_EXPORT GLboolean GL_APIENTRY IsRenderbufferOESContextANGLE(GLeglContext ctx,
>+                                                                 GLuint renderbuffer);
>+ANGLE_EXPORT GLboolean GL_APIENTRY IsSemaphoreEXTContextANGLE(GLeglContext ctx, GLuint semaphore);
>+ANGLE_EXPORT GLboolean GL_APIENTRY IsSamplerContextANGLE(GLeglContext ctx, GLuint sampler);
>+ANGLE_EXPORT GLboolean GL_APIENTRY IsShaderContextANGLE(GLeglContext ctx, GLuint shader);
>+ANGLE_EXPORT GLboolean GL_APIENTRY IsSyncContextANGLE(GLeglContext ctx, GLsync sync);
>+ANGLE_EXPORT GLboolean GL_APIENTRY IsTextureContextANGLE(GLeglContext ctx, GLuint texture);
>+ANGLE_EXPORT GLboolean GL_APIENTRY IsTransformFeedbackContextANGLE(GLeglContext ctx, GLuint id);
>+ANGLE_EXPORT GLboolean GL_APIENTRY IsVertexArrayContextANGLE(GLeglContext ctx, GLuint array);
>+ANGLE_EXPORT GLboolean GL_APIENTRY IsVertexArrayOESContextANGLE(GLeglContext ctx, GLuint array);
>+ANGLE_EXPORT void GL_APIENTRY LightModelfContextANGLE(GLeglContext ctx,
>+                                                      GLenum pname,
>+                                                      GLfloat param);
>+ANGLE_EXPORT void GL_APIENTRY LightModelfvContextANGLE(GLeglContext ctx,
>+                                                       GLenum pname,
>+                                                       const GLfloat *params);
>+ANGLE_EXPORT void GL_APIENTRY LightModelxContextANGLE(GLeglContext ctx,
>+                                                      GLenum pname,
>+                                                      GLfixed param);
>+ANGLE_EXPORT void GL_APIENTRY LightModelxvContextANGLE(GLeglContext ctx,
>+                                                       GLenum pname,
>+                                                       const GLfixed *param);
>+ANGLE_EXPORT void GL_APIENTRY LightfContextANGLE(GLeglContext ctx,
>+                                                 GLenum light,
>+                                                 GLenum pname,
>+                                                 GLfloat param);
>+ANGLE_EXPORT void GL_APIENTRY LightfvContextANGLE(GLeglContext ctx,
>+                                                  GLenum light,
>+                                                  GLenum pname,
>+                                                  const GLfloat *params);
>+ANGLE_EXPORT void GL_APIENTRY LightxContextANGLE(GLeglContext ctx,
>+                                                 GLenum light,
>+                                                 GLenum pname,
>+                                                 GLfixed param);
>+ANGLE_EXPORT void GL_APIENTRY LightxvContextANGLE(GLeglContext ctx,
>+                                                  GLenum light,
>+                                                  GLenum pname,
>+                                                  const GLfixed *params);
>+ANGLE_EXPORT void GL_APIENTRY LineWidthContextANGLE(GLeglContext ctx, GLfloat width);
>+ANGLE_EXPORT void GL_APIENTRY LineWidthxContextANGLE(GLeglContext ctx, GLfixed width);
>+ANGLE_EXPORT void GL_APIENTRY LinkProgramContextANGLE(GLeglContext ctx, GLuint program);
>+ANGLE_EXPORT void GL_APIENTRY LoadIdentityContextANGLE(GLeglContext ctx);
>+ANGLE_EXPORT void GL_APIENTRY LoadMatrixfContextANGLE(GLeglContext ctx, const GLfloat *m);
>+ANGLE_EXPORT void GL_APIENTRY LoadMatrixxContextANGLE(GLeglContext ctx, const GLfixed *m);
>+ANGLE_EXPORT void GL_APIENTRY LoadPaletteFromModelViewMatrixOESContextANGLE(GLeglContext ctx);
>+ANGLE_EXPORT void GL_APIENTRY LogicOpContextANGLE(GLeglContext ctx, GLenum opcode);
>+ANGLE_EXPORT void *GL_APIENTRY MapBufferOESContextANGLE(GLeglContext ctx,
>+                                                        GLenum target,
>+                                                        GLenum access);
>+ANGLE_EXPORT void *GL_APIENTRY MapBufferRangeContextANGLE(GLeglContext ctx,
>+                                                          GLenum target,
>+                                                          GLintptr offset,
>+                                                          GLsizeiptr length,
>+                                                          GLbitfield access);
>+ANGLE_EXPORT void *GL_APIENTRY MapBufferRangeEXTContextANGLE(GLeglContext ctx,
>+                                                             GLenum target,
>+                                                             GLintptr offset,
>+                                                             GLsizeiptr length,
>+                                                             GLbitfield access);
>+ANGLE_EXPORT void GL_APIENTRY MaterialfContextANGLE(GLeglContext ctx,
>+                                                    GLenum face,
>+                                                    GLenum pname,
>+                                                    GLfloat param);
>+ANGLE_EXPORT void GL_APIENTRY MaterialfvContextANGLE(GLeglContext ctx,
>+                                                     GLenum face,
>+                                                     GLenum pname,
>+                                                     const GLfloat *params);
>+ANGLE_EXPORT void GL_APIENTRY MaterialxContextANGLE(GLeglContext ctx,
>+                                                    GLenum face,
>+                                                    GLenum pname,
>+                                                    GLfixed param);
>+ANGLE_EXPORT void GL_APIENTRY MaterialxvContextANGLE(GLeglContext ctx,
>+                                                     GLenum face,
>+                                                     GLenum pname,
>+                                                     const GLfixed *param);
>+ANGLE_EXPORT void GL_APIENTRY MatrixIndexPointerOESContextANGLE(GLeglContext ctx,
>+                                                                GLint size,
>+                                                                GLenum type,
>+                                                                GLsizei stride,
>+                                                                const void *pointer);
>+ANGLE_EXPORT void GL_APIENTRY MatrixModeContextANGLE(GLeglContext ctx, GLenum mode);
>+ANGLE_EXPORT void GL_APIENTRY MaxShaderCompilerThreadsKHRContextANGLE(GLeglContext ctx,
>+                                                                      GLuint count);
>+ANGLE_EXPORT void GL_APIENTRY MemoryBarrierContextANGLE(GLeglContext ctx, GLbitfield barriers);
>+ANGLE_EXPORT void GL_APIENTRY MemoryBarrierByRegionContextANGLE(GLeglContext ctx,
>+                                                                GLbitfield barriers);
>+ANGLE_EXPORT void GL_APIENTRY MemoryObjectParameterivEXTContextANGLE(GLeglContext ctx,
>+                                                                     GLuint memoryObject,
>+                                                                     GLenum pname,
>+                                                                     const GLint *params);
>+ANGLE_EXPORT void GL_APIENTRY MultMatrixfContextANGLE(GLeglContext ctx, const GLfloat *m);
>+ANGLE_EXPORT void GL_APIENTRY MultMatrixxContextANGLE(GLeglContext ctx, const GLfixed *m);
>+ANGLE_EXPORT void GL_APIENTRY MultiTexCoord4fContextANGLE(GLeglContext ctx,
>+                                                          GLenum target,
>+                                                          GLfloat s,
>+                                                          GLfloat t,
>+                                                          GLfloat r,
>+                                                          GLfloat q);
>+ANGLE_EXPORT void GL_APIENTRY MultiTexCoord4xContextANGLE(GLeglContext ctx,
>+                                                          GLenum texture,
>+                                                          GLfixed s,
>+                                                          GLfixed t,
>+                                                          GLfixed r,
>+                                                          GLfixed q);
>+ANGLE_EXPORT void GL_APIENTRY Normal3fContextANGLE(GLeglContext ctx,
>+                                                   GLfloat nx,
>+                                                   GLfloat ny,
>+                                                   GLfloat nz);
>+ANGLE_EXPORT void GL_APIENTRY Normal3xContextANGLE(GLeglContext ctx,
>+                                                   GLfixed nx,
>+                                                   GLfixed ny,
>+                                                   GLfixed nz);
>+ANGLE_EXPORT void GL_APIENTRY NormalPointerContextANGLE(GLeglContext ctx,
>+                                                        GLenum type,
>+                                                        GLsizei stride,
>+                                                        const void *pointer);
>+ANGLE_EXPORT void GL_APIENTRY ObjectLabelKHRContextANGLE(GLeglContext ctx,
>+                                                         GLenum identifier,
>+                                                         GLuint name,
>+                                                         GLsizei length,
>+                                                         const GLchar *label);
>+ANGLE_EXPORT void GL_APIENTRY ObjectPtrLabelKHRContextANGLE(GLeglContext ctx,
>+                                                            const void *ptr,
>+                                                            GLsizei length,
>+                                                            const GLchar *label);
>+ANGLE_EXPORT void GL_APIENTRY OrthofContextANGLE(GLeglContext ctx,
>+                                                 GLfloat l,
>+                                                 GLfloat r,
>+                                                 GLfloat b,
>+                                                 GLfloat t,
>+                                                 GLfloat n,
>+                                                 GLfloat f);
>+ANGLE_EXPORT void GL_APIENTRY OrthoxContextANGLE(GLeglContext ctx,
>+                                                 GLfixed l,
>+                                                 GLfixed r,
>+                                                 GLfixed b,
>+                                                 GLfixed t,
>+                                                 GLfixed n,
>+                                                 GLfixed f);
>+ANGLE_EXPORT void GL_APIENTRY PauseTransformFeedbackContextANGLE(GLeglContext ctx);
>+ANGLE_EXPORT void GL_APIENTRY PixelStoreiContextANGLE(GLeglContext ctx, GLenum pname, GLint param);
>+ANGLE_EXPORT void GL_APIENTRY PointParameterfContextANGLE(GLeglContext ctx,
>+                                                          GLenum pname,
>+                                                          GLfloat param);
>+ANGLE_EXPORT void GL_APIENTRY PointParameterfvContextANGLE(GLeglContext ctx,
>+                                                           GLenum pname,
>+                                                           const GLfloat *params);
>+ANGLE_EXPORT void GL_APIENTRY PointParameterxContextANGLE(GLeglContext ctx,
>+                                                          GLenum pname,
>+                                                          GLfixed param);
>+ANGLE_EXPORT void GL_APIENTRY PointParameterxvContextANGLE(GLeglContext ctx,
>+                                                           GLenum pname,
>+                                                           const GLfixed *params);
>+ANGLE_EXPORT void GL_APIENTRY PointSizeContextANGLE(GLeglContext ctx, GLfloat size);
>+ANGLE_EXPORT void GL_APIENTRY PointSizePointerOESContextANGLE(GLeglContext ctx,
>+                                                              GLenum type,
>+                                                              GLsizei stride,
>+                                                              const void *pointer);
>+ANGLE_EXPORT void GL_APIENTRY PointSizexContextANGLE(GLeglContext ctx, GLfixed size);
>+ANGLE_EXPORT void GL_APIENTRY PolygonOffsetContextANGLE(GLeglContext ctx,
>+                                                        GLfloat factor,
>+                                                        GLfloat units);
>+ANGLE_EXPORT void GL_APIENTRY PolygonOffsetxContextANGLE(GLeglContext ctx,
>+                                                         GLfixed factor,
>+                                                         GLfixed units);
>+ANGLE_EXPORT void GL_APIENTRY PopDebugGroupKHRContextANGLE(GLeglContext ctx);
>+ANGLE_EXPORT void GL_APIENTRY PopGroupMarkerEXTContextANGLE(GLeglContext ctx);
>+ANGLE_EXPORT void GL_APIENTRY PopMatrixContextANGLE(GLeglContext ctx);
>+ANGLE_EXPORT void GL_APIENTRY ProgramBinaryContextANGLE(GLeglContext ctx,
>+                                                        GLuint program,
>+                                                        GLenum binaryFormat,
>+                                                        const void *binary,
>+                                                        GLsizei length);
>+ANGLE_EXPORT void GL_APIENTRY ProgramBinaryOESContextANGLE(GLeglContext ctx,
>+                                                           GLuint program,
>+                                                           GLenum binaryFormat,
>+                                                           const void *binary,
>+                                                           GLint length);
>+ANGLE_EXPORT void GL_APIENTRY ProgramParameteriContextANGLE(GLeglContext ctx,
>+                                                            GLuint program,
>+                                                            GLenum pname,
>+                                                            GLint value);
>+ANGLE_EXPORT void GL_APIENTRY ProgramUniform1fContextANGLE(GLeglContext ctx,
>+                                                           GLuint program,
>+                                                           GLint location,
>+                                                           GLfloat v0);
>+ANGLE_EXPORT void GL_APIENTRY ProgramUniform1fvContextANGLE(GLeglContext ctx,
>+                                                            GLuint program,
>+                                                            GLint location,
>+                                                            GLsizei count,
>+                                                            const GLfloat *value);
>+ANGLE_EXPORT void GL_APIENTRY ProgramUniform1iContextANGLE(GLeglContext ctx,
>+                                                           GLuint program,
>+                                                           GLint location,
>+                                                           GLint v0);
>+ANGLE_EXPORT void GL_APIENTRY ProgramUniform1ivContextANGLE(GLeglContext ctx,
>+                                                            GLuint program,
>+                                                            GLint location,
>+                                                            GLsizei count,
>+                                                            const GLint *value);
>+ANGLE_EXPORT void GL_APIENTRY ProgramUniform1uiContextANGLE(GLeglContext ctx,
>+                                                            GLuint program,
>+                                                            GLint location,
>+                                                            GLuint v0);
>+ANGLE_EXPORT void GL_APIENTRY ProgramUniform1uivContextANGLE(GLeglContext ctx,
>+                                                             GLuint program,
>+                                                             GLint location,
>+                                                             GLsizei count,
>+                                                             const GLuint *value);
>+ANGLE_EXPORT void GL_APIENTRY ProgramUniform2fContextANGLE(GLeglContext ctx,
>+                                                           GLuint program,
>+                                                           GLint location,
>+                                                           GLfloat v0,
>+                                                           GLfloat v1);
>+ANGLE_EXPORT void GL_APIENTRY ProgramUniform2fvContextANGLE(GLeglContext ctx,
>+                                                            GLuint program,
>+                                                            GLint location,
>+                                                            GLsizei count,
>+                                                            const GLfloat *value);
>+ANGLE_EXPORT void GL_APIENTRY
>+ProgramUniform2iContextANGLE(GLeglContext ctx, GLuint program, GLint location, GLint v0, GLint v1);
>+ANGLE_EXPORT void GL_APIENTRY ProgramUniform2ivContextANGLE(GLeglContext ctx,
>+                                                            GLuint program,
>+                                                            GLint location,
>+                                                            GLsizei count,
>+                                                            const GLint *value);
>+ANGLE_EXPORT void GL_APIENTRY ProgramUniform2uiContextANGLE(GLeglContext ctx,
>+                                                            GLuint program,
>+                                                            GLint location,
>+                                                            GLuint v0,
>+                                                            GLuint v1);
>+ANGLE_EXPORT void GL_APIENTRY ProgramUniform2uivContextANGLE(GLeglContext ctx,
>+                                                             GLuint program,
>+                                                             GLint location,
>+                                                             GLsizei count,
>+                                                             const GLuint *value);
>+ANGLE_EXPORT void GL_APIENTRY ProgramUniform3fContextANGLE(GLeglContext ctx,
>+                                                           GLuint program,
>+                                                           GLint location,
>+                                                           GLfloat v0,
>+                                                           GLfloat v1,
>+                                                           GLfloat v2);
>+ANGLE_EXPORT void GL_APIENTRY ProgramUniform3fvContextANGLE(GLeglContext ctx,
>+                                                            GLuint program,
>+                                                            GLint location,
>+                                                            GLsizei count,
>+                                                            const GLfloat *value);
>+ANGLE_EXPORT void GL_APIENTRY ProgramUniform3iContextANGLE(GLeglContext ctx,
>+                                                           GLuint program,
>+                                                           GLint location,
>+                                                           GLint v0,
>+                                                           GLint v1,
>+                                                           GLint v2);
>+ANGLE_EXPORT void GL_APIENTRY ProgramUniform3ivContextANGLE(GLeglContext ctx,
>+                                                            GLuint program,
>+                                                            GLint location,
>+                                                            GLsizei count,
>+                                                            const GLint *value);
>+ANGLE_EXPORT void GL_APIENTRY ProgramUniform3uiContextANGLE(GLeglContext ctx,
>+                                                            GLuint program,
>+                                                            GLint location,
>+                                                            GLuint v0,
>+                                                            GLuint v1,
>+                                                            GLuint v2);
>+ANGLE_EXPORT void GL_APIENTRY ProgramUniform3uivContextANGLE(GLeglContext ctx,
>+                                                             GLuint program,
>+                                                             GLint location,
>+                                                             GLsizei count,
>+                                                             const GLuint *value);
>+ANGLE_EXPORT void GL_APIENTRY ProgramUniform4fContextANGLE(GLeglContext ctx,
>+                                                           GLuint program,
>+                                                           GLint location,
>+                                                           GLfloat v0,
>+                                                           GLfloat v1,
>+                                                           GLfloat v2,
>+                                                           GLfloat v3);
>+ANGLE_EXPORT void GL_APIENTRY ProgramUniform4fvContextANGLE(GLeglContext ctx,
>+                                                            GLuint program,
>+                                                            GLint location,
>+                                                            GLsizei count,
>+                                                            const GLfloat *value);
>+ANGLE_EXPORT void GL_APIENTRY ProgramUniform4iContextANGLE(GLeglContext ctx,
>+                                                           GLuint program,
>+                                                           GLint location,
>+                                                           GLint v0,
>+                                                           GLint v1,
>+                                                           GLint v2,
>+                                                           GLint v3);
>+ANGLE_EXPORT void GL_APIENTRY ProgramUniform4ivContextANGLE(GLeglContext ctx,
>+                                                            GLuint program,
>+                                                            GLint location,
>+                                                            GLsizei count,
>+                                                            const GLint *value);
>+ANGLE_EXPORT void GL_APIENTRY ProgramUniform4uiContextANGLE(GLeglContext ctx,
>+                                                            GLuint program,
>+                                                            GLint location,
>+                                                            GLuint v0,
>+                                                            GLuint v1,
>+                                                            GLuint v2,
>+                                                            GLuint v3);
>+ANGLE_EXPORT void GL_APIENTRY ProgramUniform4uivContextANGLE(GLeglContext ctx,
>+                                                             GLuint program,
>+                                                             GLint location,
>+                                                             GLsizei count,
>+                                                             const GLuint *value);
>+ANGLE_EXPORT void GL_APIENTRY ProgramUniformMatrix2fvContextANGLE(GLeglContext ctx,
>+                                                                  GLuint program,
>+                                                                  GLint location,
>+                                                                  GLsizei count,
>+                                                                  GLboolean transpose,
>+                                                                  const GLfloat *value);
>+ANGLE_EXPORT void GL_APIENTRY ProgramUniformMatrix2x3fvContextANGLE(GLeglContext ctx,
>+                                                                    GLuint program,
>+                                                                    GLint location,
>+                                                                    GLsizei count,
>+                                                                    GLboolean transpose,
>+                                                                    const GLfloat *value);
>+ANGLE_EXPORT void GL_APIENTRY ProgramUniformMatrix2x4fvContextANGLE(GLeglContext ctx,
>+                                                                    GLuint program,
>+                                                                    GLint location,
>+                                                                    GLsizei count,
>+                                                                    GLboolean transpose,
>+                                                                    const GLfloat *value);
>+ANGLE_EXPORT void GL_APIENTRY ProgramUniformMatrix3fvContextANGLE(GLeglContext ctx,
>+                                                                  GLuint program,
>+                                                                  GLint location,
>+                                                                  GLsizei count,
>+                                                                  GLboolean transpose,
>+                                                                  const GLfloat *value);
>+ANGLE_EXPORT void GL_APIENTRY ProgramUniformMatrix3x2fvContextANGLE(GLeglContext ctx,
>+                                                                    GLuint program,
>+                                                                    GLint location,
>+                                                                    GLsizei count,
>+                                                                    GLboolean transpose,
>+                                                                    const GLfloat *value);
>+ANGLE_EXPORT void GL_APIENTRY ProgramUniformMatrix3x4fvContextANGLE(GLeglContext ctx,
>+                                                                    GLuint program,
>+                                                                    GLint location,
>+                                                                    GLsizei count,
>+                                                                    GLboolean transpose,
>+                                                                    const GLfloat *value);
>+ANGLE_EXPORT void GL_APIENTRY ProgramUniformMatrix4fvContextANGLE(GLeglContext ctx,
>+                                                                  GLuint program,
>+                                                                  GLint location,
>+                                                                  GLsizei count,
>+                                                                  GLboolean transpose,
>+                                                                  const GLfloat *value);
>+ANGLE_EXPORT void GL_APIENTRY ProgramUniformMatrix4x2fvContextANGLE(GLeglContext ctx,
>+                                                                    GLuint program,
>+                                                                    GLint location,
>+                                                                    GLsizei count,
>+                                                                    GLboolean transpose,
>+                                                                    const GLfloat *value);
>+ANGLE_EXPORT void GL_APIENTRY ProgramUniformMatrix4x3fvContextANGLE(GLeglContext ctx,
>+                                                                    GLuint program,
>+                                                                    GLint location,
>+                                                                    GLsizei count,
>+                                                                    GLboolean transpose,
>+                                                                    const GLfloat *value);
>+ANGLE_EXPORT void GL_APIENTRY PushDebugGroupKHRContextANGLE(GLeglContext ctx,
>+                                                            GLenum source,
>+                                                            GLuint id,
>+                                                            GLsizei length,
>+                                                            const GLchar *message);
>+ANGLE_EXPORT void GL_APIENTRY PushGroupMarkerEXTContextANGLE(GLeglContext ctx,
>+                                                             GLsizei length,
>+                                                             const GLchar *marker);
>+ANGLE_EXPORT void GL_APIENTRY PushMatrixContextANGLE(GLeglContext ctx);
>+ANGLE_EXPORT void GL_APIENTRY QueryCounterEXTContextANGLE(GLeglContext ctx,
>+                                                          GLuint id,
>+                                                          GLenum target);
>+ANGLE_EXPORT GLbitfield GL_APIENTRY QueryMatrixxOESContextANGLE(GLeglContext ctx,
>+                                                                GLfixed *mantissa,
>+                                                                GLint *exponent);
>+ANGLE_EXPORT void GL_APIENTRY ReadBufferContextANGLE(GLeglContext ctx, GLenum src);
>+ANGLE_EXPORT void GL_APIENTRY ReadPixelsContextANGLE(GLeglContext ctx,
>+                                                     GLint x,
>+                                                     GLint y,
>+                                                     GLsizei width,
>+                                                     GLsizei height,
>+                                                     GLenum format,
>+                                                     GLenum type,
>+                                                     void *pixels);
>+ANGLE_EXPORT void GL_APIENTRY ReadnPixelsEXTContextANGLE(GLeglContext ctx,
>+                                                         GLint x,
>+                                                         GLint y,
>+                                                         GLsizei width,
>+                                                         GLsizei height,
>+                                                         GLenum format,
>+                                                         GLenum type,
>+                                                         GLsizei bufSize,
>+                                                         void *data);
>+ANGLE_EXPORT void GL_APIENTRY ReleaseShaderCompilerContextANGLE(GLeglContext ctx);
>+ANGLE_EXPORT void GL_APIENTRY RenderbufferStorageContextANGLE(GLeglContext ctx,
>+                                                              GLenum target,
>+                                                              GLenum internalformat,
>+                                                              GLsizei width,
>+                                                              GLsizei height);
>+ANGLE_EXPORT void GL_APIENTRY RenderbufferStorageMultisampleContextANGLE(GLeglContext ctx,
>+                                                                         GLenum target,
>+                                                                         GLsizei samples,
>+                                                                         GLenum internalformat,
>+                                                                         GLsizei width,
>+                                                                         GLsizei height);
>+ANGLE_EXPORT void GL_APIENTRY RenderbufferStorageMultisampleANGLEContextANGLE(GLeglContext ctx,
>+                                                                              GLenum target,
>+                                                                              GLsizei samples,
>+                                                                              GLenum internalformat,
>+                                                                              GLsizei width,
>+                                                                              GLsizei height);
>+ANGLE_EXPORT void GL_APIENTRY RenderbufferStorageOESContextANGLE(GLeglContext ctx,
>+                                                                 GLenum target,
>+                                                                 GLenum internalformat,
>+                                                                 GLsizei width,
>+                                                                 GLsizei height);
>+ANGLE_EXPORT void GL_APIENTRY ResumeTransformFeedbackContextANGLE(GLeglContext ctx);
>+ANGLE_EXPORT void GL_APIENTRY
>+RotatefContextANGLE(GLeglContext ctx, GLfloat angle, GLfloat x, GLfloat y, GLfloat z);
>+ANGLE_EXPORT void GL_APIENTRY
>+RotatexContextANGLE(GLeglContext ctx, GLfixed angle, GLfixed x, GLfixed y, GLfixed z);
>+ANGLE_EXPORT void GL_APIENTRY SampleCoverageContextANGLE(GLeglContext ctx,
>+                                                         GLfloat value,
>+                                                         GLboolean invert);
>+ANGLE_EXPORT void GL_APIENTRY SampleCoveragexContextANGLE(GLeglContext ctx,
>+                                                          GLclampx value,
>+                                                          GLboolean invert);
>+ANGLE_EXPORT void GL_APIENTRY SampleMaskiContextANGLE(GLeglContext ctx,
>+                                                      GLuint maskNumber,
>+                                                      GLbitfield mask);
>+ANGLE_EXPORT void GL_APIENTRY SamplerParameterIivOESContextANGLE(GLeglContext ctx,
>+                                                                 GLuint sampler,
>+                                                                 GLenum pname,
>+                                                                 const GLint *param);
>+ANGLE_EXPORT void GL_APIENTRY SamplerParameterIuivOESContextANGLE(GLeglContext ctx,
>+                                                                  GLuint sampler,
>+                                                                  GLenum pname,
>+                                                                  const GLuint *param);
>+ANGLE_EXPORT void GL_APIENTRY SamplerParameterfContextANGLE(GLeglContext ctx,
>+                                                            GLuint sampler,
>+                                                            GLenum pname,
>+                                                            GLfloat param);
>+ANGLE_EXPORT void GL_APIENTRY SamplerParameterfvContextANGLE(GLeglContext ctx,
>+                                                             GLuint sampler,
>+                                                             GLenum pname,
>+                                                             const GLfloat *param);
>+ANGLE_EXPORT void GL_APIENTRY SamplerParameteriContextANGLE(GLeglContext ctx,
>+                                                            GLuint sampler,
>+                                                            GLenum pname,
>+                                                            GLint param);
>+ANGLE_EXPORT void GL_APIENTRY SamplerParameterivContextANGLE(GLeglContext ctx,
>+                                                             GLuint sampler,
>+                                                             GLenum pname,
>+                                                             const GLint *param);
>+ANGLE_EXPORT void GL_APIENTRY ScalefContextANGLE(GLeglContext ctx, GLfloat x, GLfloat y, GLfloat z);
>+ANGLE_EXPORT void GL_APIENTRY ScalexContextANGLE(GLeglContext ctx, GLfixed x, GLfixed y, GLfixed z);
>+ANGLE_EXPORT void GL_APIENTRY
>+ScissorContextANGLE(GLeglContext ctx, GLint x, GLint y, GLsizei width, GLsizei height);
>+ANGLE_EXPORT void GL_APIENTRY SemaphoreParameterui64vEXTContextANGLE(GLeglContext ctx,
>+                                                                     GLuint semaphore,
>+                                                                     GLenum pname,
>+                                                                     const GLuint64 *params);
>+ANGLE_EXPORT void GL_APIENTRY SetFenceNVContextANGLE(GLeglContext ctx,
>+                                                     GLuint fence,
>+                                                     GLenum condition);
>+ANGLE_EXPORT void GL_APIENTRY ShadeModelContextANGLE(GLeglContext ctx, GLenum mode);
>+ANGLE_EXPORT void GL_APIENTRY ShaderBinaryContextANGLE(GLeglContext ctx,
>+                                                       GLsizei count,
>+                                                       const GLuint *shaders,
>+                                                       GLenum binaryformat,
>+                                                       const void *binary,
>+                                                       GLsizei length);
>+ANGLE_EXPORT void GL_APIENTRY ShaderSourceContextANGLE(GLeglContext ctx,
>+                                                       GLuint shader,
>+                                                       GLsizei count,
>+                                                       const GLchar *const *string,
>+                                                       const GLint *length);
>+ANGLE_EXPORT void GL_APIENTRY SignalSemaphoreEXTContextANGLE(GLeglContext ctx,
>+                                                             GLuint semaphore,
>+                                                             GLuint numBufferBarriers,
>+                                                             const GLuint *buffers,
>+                                                             GLuint numTextureBarriers,
>+                                                             const GLuint *textures,
>+                                                             const GLenum *dstLayouts);
>+ANGLE_EXPORT void GL_APIENTRY StencilFuncContextANGLE(GLeglContext ctx,
>+                                                      GLenum func,
>+                                                      GLint ref,
>+                                                      GLuint mask);
>+ANGLE_EXPORT void GL_APIENTRY
>+StencilFuncSeparateContextANGLE(GLeglContext ctx, GLenum face, GLenum func, GLint ref, GLuint mask);
>+ANGLE_EXPORT void GL_APIENTRY StencilMaskContextANGLE(GLeglContext ctx, GLuint mask);
>+ANGLE_EXPORT void GL_APIENTRY StencilMaskSeparateContextANGLE(GLeglContext ctx,
>+                                                              GLenum face,
>+                                                              GLuint mask);
>+ANGLE_EXPORT void GL_APIENTRY StencilOpContextANGLE(GLeglContext ctx,
>+                                                    GLenum fail,
>+                                                    GLenum zfail,
>+                                                    GLenum zpass);
>+ANGLE_EXPORT void GL_APIENTRY StencilOpSeparateContextANGLE(GLeglContext ctx,
>+                                                            GLenum face,
>+                                                            GLenum sfail,
>+                                                            GLenum dpfail,
>+                                                            GLenum dppass);
>+ANGLE_EXPORT GLboolean GL_APIENTRY TestFenceNVContextANGLE(GLeglContext ctx, GLuint fence);
>+ANGLE_EXPORT void GL_APIENTRY TexCoordPointerContextANGLE(GLeglContext ctx,
>+                                                          GLint size,
>+                                                          GLenum type,
>+                                                          GLsizei stride,
>+                                                          const void *pointer);
>+ANGLE_EXPORT void GL_APIENTRY TexEnvfContextANGLE(GLeglContext ctx,
>+                                                  GLenum target,
>+                                                  GLenum pname,
>+                                                  GLfloat param);
>+ANGLE_EXPORT void GL_APIENTRY TexEnvfvContextANGLE(GLeglContext ctx,
>+                                                   GLenum target,
>+                                                   GLenum pname,
>+                                                   const GLfloat *params);
>+ANGLE_EXPORT void GL_APIENTRY TexEnviContextANGLE(GLeglContext ctx,
>+                                                  GLenum target,
>+                                                  GLenum pname,
>+                                                  GLint param);
>+ANGLE_EXPORT void GL_APIENTRY TexEnvivContextANGLE(GLeglContext ctx,
>+                                                   GLenum target,
>+                                                   GLenum pname,
>+                                                   const GLint *params);
>+ANGLE_EXPORT void GL_APIENTRY TexEnvxContextANGLE(GLeglContext ctx,
>+                                                  GLenum target,
>+                                                  GLenum pname,
>+                                                  GLfixed param);
>+ANGLE_EXPORT void GL_APIENTRY TexEnvxvContextANGLE(GLeglContext ctx,
>+                                                   GLenum target,
>+                                                   GLenum pname,
>+                                                   const GLfixed *params);
>+ANGLE_EXPORT void GL_APIENTRY TexGenfOESContextANGLE(GLeglContext ctx,
>+                                                     GLenum coord,
>+                                                     GLenum pname,
>+                                                     GLfloat param);
>+ANGLE_EXPORT void GL_APIENTRY TexGenfvOESContextANGLE(GLeglContext ctx,
>+                                                      GLenum coord,
>+                                                      GLenum pname,
>+                                                      const GLfloat *params);
>+ANGLE_EXPORT void GL_APIENTRY TexGeniOESContextANGLE(GLeglContext ctx,
>+                                                     GLenum coord,
>+                                                     GLenum pname,
>+                                                     GLint param);
>+ANGLE_EXPORT void GL_APIENTRY TexGenivOESContextANGLE(GLeglContext ctx,
>+                                                      GLenum coord,
>+                                                      GLenum pname,
>+                                                      const GLint *params);
>+ANGLE_EXPORT void GL_APIENTRY TexGenxOESContextANGLE(GLeglContext ctx,
>+                                                     GLenum coord,
>+                                                     GLenum pname,
>+                                                     GLfixed param);
>+ANGLE_EXPORT void GL_APIENTRY TexGenxvOESContextANGLE(GLeglContext ctx,
>+                                                      GLenum coord,
>+                                                      GLenum pname,
>+                                                      const GLfixed *params);
>+ANGLE_EXPORT void GL_APIENTRY TexImage2DContextANGLE(GLeglContext ctx,
>+                                                     GLenum target,
>+                                                     GLint level,
>+                                                     GLint internalformat,
>+                                                     GLsizei width,
>+                                                     GLsizei height,
>+                                                     GLint border,
>+                                                     GLenum format,
>+                                                     GLenum type,
>+                                                     const void *pixels);
>+ANGLE_EXPORT void GL_APIENTRY TexImage3DContextANGLE(GLeglContext ctx,
>+                                                     GLenum target,
>+                                                     GLint level,
>+                                                     GLint internalformat,
>+                                                     GLsizei width,
>+                                                     GLsizei height,
>+                                                     GLsizei depth,
>+                                                     GLint border,
>+                                                     GLenum format,
>+                                                     GLenum type,
>+                                                     const void *pixels);
>+ANGLE_EXPORT void GL_APIENTRY TexParameterIivOESContextANGLE(GLeglContext ctx,
>+                                                             GLenum target,
>+                                                             GLenum pname,
>+                                                             const GLint *params);
>+ANGLE_EXPORT void GL_APIENTRY TexParameterIuivOESContextANGLE(GLeglContext ctx,
>+                                                              GLenum target,
>+                                                              GLenum pname,
>+                                                              const GLuint *params);
>+ANGLE_EXPORT void GL_APIENTRY TexParameterfContextANGLE(GLeglContext ctx,
>+                                                        GLenum target,
>+                                                        GLenum pname,
>+                                                        GLfloat param);
>+ANGLE_EXPORT void GL_APIENTRY TexParameterfvContextANGLE(GLeglContext ctx,
>+                                                         GLenum target,
>+                                                         GLenum pname,
>+                                                         const GLfloat *params);
>+ANGLE_EXPORT void GL_APIENTRY TexParameteriContextANGLE(GLeglContext ctx,
>+                                                        GLenum target,
>+                                                        GLenum pname,
>+                                                        GLint param);
>+ANGLE_EXPORT void GL_APIENTRY TexParameterivContextANGLE(GLeglContext ctx,
>+                                                         GLenum target,
>+                                                         GLenum pname,
>+                                                         const GLint *params);
>+ANGLE_EXPORT void GL_APIENTRY TexParameterxContextANGLE(GLeglContext ctx,
>+                                                        GLenum target,
>+                                                        GLenum pname,
>+                                                        GLfixed param);
>+ANGLE_EXPORT void GL_APIENTRY TexParameterxvContextANGLE(GLeglContext ctx,
>+                                                         GLenum target,
>+                                                         GLenum pname,
>+                                                         const GLfixed *params);
>+ANGLE_EXPORT void GL_APIENTRY TexStorage1DEXTContextANGLE(GLeglContext ctx,
>+                                                          GLenum target,
>+                                                          GLsizei levels,
>+                                                          GLenum internalformat,
>+                                                          GLsizei width);
>+ANGLE_EXPORT void GL_APIENTRY TexStorage2DContextANGLE(GLeglContext ctx,
>+                                                       GLenum target,
>+                                                       GLsizei levels,
>+                                                       GLenum internalformat,
>+                                                       GLsizei width,
>+                                                       GLsizei height);
>+ANGLE_EXPORT void GL_APIENTRY TexStorage2DEXTContextANGLE(GLeglContext ctx,
>+                                                          GLenum target,
>+                                                          GLsizei levels,
>+                                                          GLenum internalformat,
>+                                                          GLsizei width,
>+                                                          GLsizei height);
>+ANGLE_EXPORT void GL_APIENTRY TexStorage2DMultisampleContextANGLE(GLeglContext ctx,
>+                                                                  GLenum target,
>+                                                                  GLsizei samples,
>+                                                                  GLenum internalformat,
>+                                                                  GLsizei width,
>+                                                                  GLsizei height,
>+                                                                  GLboolean fixedsamplelocations);
>+ANGLE_EXPORT void GL_APIENTRY TexStorage3DContextANGLE(GLeglContext ctx,
>+                                                       GLenum target,
>+                                                       GLsizei levels,
>+                                                       GLenum internalformat,
>+                                                       GLsizei width,
>+                                                       GLsizei height,
>+                                                       GLsizei depth);
>+ANGLE_EXPORT void GL_APIENTRY TexStorage3DEXTContextANGLE(GLeglContext ctx,
>+                                                          GLenum target,
>+                                                          GLsizei levels,
>+                                                          GLenum internalformat,
>+                                                          GLsizei width,
>+                                                          GLsizei height,
>+                                                          GLsizei depth);
>+ANGLE_EXPORT void GL_APIENTRY
>+TexStorage3DMultisampleOESContextANGLE(GLeglContext ctx,
>+                                       GLenum target,
>+                                       GLsizei samples,
>+                                       GLenum internalformat,
>+                                       GLsizei width,
>+                                       GLsizei height,
>+                                       GLsizei depth,
>+                                       GLboolean fixedsamplelocations);
>+ANGLE_EXPORT void GL_APIENTRY TexStorageMem2DEXTContextANGLE(GLeglContext ctx,
>+                                                             GLenum target,
>+                                                             GLsizei levels,
>+                                                             GLenum internalFormat,
>+                                                             GLsizei width,
>+                                                             GLsizei height,
>+                                                             GLuint memory,
>+                                                             GLuint64 offset);
>+ANGLE_EXPORT void GL_APIENTRY
>+TexStorageMem2DMultisampleEXTContextANGLE(GLeglContext ctx,
>+                                          GLenum target,
>+                                          GLsizei samples,
>+                                          GLenum internalFormat,
>+                                          GLsizei width,
>+                                          GLsizei height,
>+                                          GLboolean fixedSampleLocations,
>+                                          GLuint memory,
>+                                          GLuint64 offset);
>+ANGLE_EXPORT void GL_APIENTRY TexStorageMem3DEXTContextANGLE(GLeglContext ctx,
>+                                                             GLenum target,
>+                                                             GLsizei levels,
>+                                                             GLenum internalFormat,
>+                                                             GLsizei width,
>+                                                             GLsizei height,
>+                                                             GLsizei depth,
>+                                                             GLuint memory,
>+                                                             GLuint64 offset);
>+ANGLE_EXPORT void GL_APIENTRY
>+TexStorageMem3DMultisampleEXTContextANGLE(GLeglContext ctx,
>+                                          GLenum target,
>+                                          GLsizei samples,
>+                                          GLenum internalFormat,
>+                                          GLsizei width,
>+                                          GLsizei height,
>+                                          GLsizei depth,
>+                                          GLboolean fixedSampleLocations,
>+                                          GLuint memory,
>+                                          GLuint64 offset);
>+ANGLE_EXPORT void GL_APIENTRY TexSubImage2DContextANGLE(GLeglContext ctx,
>+                                                        GLenum target,
>+                                                        GLint level,
>+                                                        GLint xoffset,
>+                                                        GLint yoffset,
>+                                                        GLsizei width,
>+                                                        GLsizei height,
>+                                                        GLenum format,
>+                                                        GLenum type,
>+                                                        const void *pixels);
>+ANGLE_EXPORT void GL_APIENTRY TexSubImage3DContextANGLE(GLeglContext ctx,
>+                                                        GLenum target,
>+                                                        GLint level,
>+                                                        GLint xoffset,
>+                                                        GLint yoffset,
>+                                                        GLint zoffset,
>+                                                        GLsizei width,
>+                                                        GLsizei height,
>+                                                        GLsizei depth,
>+                                                        GLenum format,
>+                                                        GLenum type,
>+                                                        const void *pixels);
>+ANGLE_EXPORT void GL_APIENTRY TransformFeedbackVaryingsContextANGLE(GLeglContext ctx,
>+                                                                    GLuint program,
>+                                                                    GLsizei count,
>+                                                                    const GLchar *const *varyings,
>+                                                                    GLenum bufferMode);
>+ANGLE_EXPORT void GL_APIENTRY TranslatefContextANGLE(GLeglContext ctx,
>+                                                     GLfloat x,
>+                                                     GLfloat y,
>+                                                     GLfloat z);
>+ANGLE_EXPORT void GL_APIENTRY TranslatexContextANGLE(GLeglContext ctx,
>+                                                     GLfixed x,
>+                                                     GLfixed y,
>+                                                     GLfixed z);
>+ANGLE_EXPORT void GL_APIENTRY Uniform1fContextANGLE(GLeglContext ctx, GLint location, GLfloat v0);
>+ANGLE_EXPORT void GL_APIENTRY Uniform1fvContextANGLE(GLeglContext ctx,
>+                                                     GLint location,
>+                                                     GLsizei count,
>+                                                     const GLfloat *value);
>+ANGLE_EXPORT void GL_APIENTRY Uniform1iContextANGLE(GLeglContext ctx, GLint location, GLint v0);
>+ANGLE_EXPORT void GL_APIENTRY Uniform1ivContextANGLE(GLeglContext ctx,
>+                                                     GLint location,
>+                                                     GLsizei count,
>+                                                     const GLint *value);
>+ANGLE_EXPORT void GL_APIENTRY Uniform1uiContextANGLE(GLeglContext ctx, GLint location, GLuint v0);
>+ANGLE_EXPORT void GL_APIENTRY Uniform1uivContextANGLE(GLeglContext ctx,
>+                                                      GLint location,
>+                                                      GLsizei count,
>+                                                      const GLuint *value);
>+ANGLE_EXPORT void GL_APIENTRY Uniform2fContextANGLE(GLeglContext ctx,
>+                                                    GLint location,
>+                                                    GLfloat v0,
>+                                                    GLfloat v1);
>+ANGLE_EXPORT void GL_APIENTRY Uniform2fvContextANGLE(GLeglContext ctx,
>+                                                     GLint location,
>+                                                     GLsizei count,
>+                                                     const GLfloat *value);
>+ANGLE_EXPORT void GL_APIENTRY Uniform2iContextANGLE(GLeglContext ctx,
>+                                                    GLint location,
>+                                                    GLint v0,
>+                                                    GLint v1);
>+ANGLE_EXPORT void GL_APIENTRY Uniform2ivContextANGLE(GLeglContext ctx,
>+                                                     GLint location,
>+                                                     GLsizei count,
>+                                                     const GLint *value);
>+ANGLE_EXPORT void GL_APIENTRY Uniform2uiContextANGLE(GLeglContext ctx,
>+                                                     GLint location,
>+                                                     GLuint v0,
>+                                                     GLuint v1);
>+ANGLE_EXPORT void GL_APIENTRY Uniform2uivContextANGLE(GLeglContext ctx,
>+                                                      GLint location,
>+                                                      GLsizei count,
>+                                                      const GLuint *value);
>+ANGLE_EXPORT void GL_APIENTRY
>+Uniform3fContextANGLE(GLeglContext ctx, GLint location, GLfloat v0, GLfloat v1, GLfloat v2);
>+ANGLE_EXPORT void GL_APIENTRY Uniform3fvContextANGLE(GLeglContext ctx,
>+                                                     GLint location,
>+                                                     GLsizei count,
>+                                                     const GLfloat *value);
>+ANGLE_EXPORT void GL_APIENTRY
>+Uniform3iContextANGLE(GLeglContext ctx, GLint location, GLint v0, GLint v1, GLint v2);
>+ANGLE_EXPORT void GL_APIENTRY Uniform3ivContextANGLE(GLeglContext ctx,
>+                                                     GLint location,
>+                                                     GLsizei count,
>+                                                     const GLint *value);
>+ANGLE_EXPORT void GL_APIENTRY
>+Uniform3uiContextANGLE(GLeglContext ctx, GLint location, GLuint v0, GLuint v1, GLuint v2);
>+ANGLE_EXPORT void GL_APIENTRY Uniform3uivContextANGLE(GLeglContext ctx,
>+                                                      GLint location,
>+                                                      GLsizei count,
>+                                                      const GLuint *value);
>+ANGLE_EXPORT void GL_APIENTRY Uniform4fContextANGLE(GLeglContext ctx,
>+                                                    GLint location,
>+                                                    GLfloat v0,
>+                                                    GLfloat v1,
>+                                                    GLfloat v2,
>+                                                    GLfloat v3);
>+ANGLE_EXPORT void GL_APIENTRY Uniform4fvContextANGLE(GLeglContext ctx,
>+                                                     GLint location,
>+                                                     GLsizei count,
>+                                                     const GLfloat *value);
>+ANGLE_EXPORT void GL_APIENTRY
>+Uniform4iContextANGLE(GLeglContext ctx, GLint location, GLint v0, GLint v1, GLint v2, GLint v3);
>+ANGLE_EXPORT void GL_APIENTRY Uniform4ivContextANGLE(GLeglContext ctx,
>+                                                     GLint location,
>+                                                     GLsizei count,
>+                                                     const GLint *value);
>+ANGLE_EXPORT void GL_APIENTRY Uniform4uiContextANGLE(GLeglContext ctx,
>+                                                     GLint location,
>+                                                     GLuint v0,
>+                                                     GLuint v1,
>+                                                     GLuint v2,
>+                                                     GLuint v3);
>+ANGLE_EXPORT void GL_APIENTRY Uniform4uivContextANGLE(GLeglContext ctx,
>+                                                      GLint location,
>+                                                      GLsizei count,
>+                                                      const GLuint *value);
>+ANGLE_EXPORT void GL_APIENTRY UniformBlockBindingContextANGLE(GLeglContext ctx,
>+                                                              GLuint program,
>+                                                              GLuint uniformBlockIndex,
>+                                                              GLuint uniformBlockBinding);
>+ANGLE_EXPORT void GL_APIENTRY UniformMatrix2fvContextANGLE(GLeglContext ctx,
>+                                                           GLint location,
>+                                                           GLsizei count,
>+                                                           GLboolean transpose,
>+                                                           const GLfloat *value);
>+ANGLE_EXPORT void GL_APIENTRY UniformMatrix2x3fvContextANGLE(GLeglContext ctx,
>+                                                             GLint location,
>+                                                             GLsizei count,
>+                                                             GLboolean transpose,
>+                                                             const GLfloat *value);
>+ANGLE_EXPORT void GL_APIENTRY UniformMatrix2x4fvContextANGLE(GLeglContext ctx,
>+                                                             GLint location,
>+                                                             GLsizei count,
>+                                                             GLboolean transpose,
>+                                                             const GLfloat *value);
>+ANGLE_EXPORT void GL_APIENTRY UniformMatrix3fvContextANGLE(GLeglContext ctx,
>+                                                           GLint location,
>+                                                           GLsizei count,
>+                                                           GLboolean transpose,
>+                                                           const GLfloat *value);
>+ANGLE_EXPORT void GL_APIENTRY UniformMatrix3x2fvContextANGLE(GLeglContext ctx,
>+                                                             GLint location,
>+                                                             GLsizei count,
>+                                                             GLboolean transpose,
>+                                                             const GLfloat *value);
>+ANGLE_EXPORT void GL_APIENTRY UniformMatrix3x4fvContextANGLE(GLeglContext ctx,
>+                                                             GLint location,
>+                                                             GLsizei count,
>+                                                             GLboolean transpose,
>+                                                             const GLfloat *value);
>+ANGLE_EXPORT void GL_APIENTRY UniformMatrix4fvContextANGLE(GLeglContext ctx,
>+                                                           GLint location,
>+                                                           GLsizei count,
>+                                                           GLboolean transpose,
>+                                                           const GLfloat *value);
>+ANGLE_EXPORT void GL_APIENTRY UniformMatrix4x2fvContextANGLE(GLeglContext ctx,
>+                                                             GLint location,
>+                                                             GLsizei count,
>+                                                             GLboolean transpose,
>+                                                             const GLfloat *value);
>+ANGLE_EXPORT void GL_APIENTRY UniformMatrix4x3fvContextANGLE(GLeglContext ctx,
>+                                                             GLint location,
>+                                                             GLsizei count,
>+                                                             GLboolean transpose,
>+                                                             const GLfloat *value);
>+ANGLE_EXPORT GLboolean GL_APIENTRY UnmapBufferContextANGLE(GLeglContext ctx, GLenum target);
>+ANGLE_EXPORT GLboolean GL_APIENTRY UnmapBufferOESContextANGLE(GLeglContext ctx, GLenum target);
>+ANGLE_EXPORT void GL_APIENTRY UseProgramContextANGLE(GLeglContext ctx, GLuint program);
>+ANGLE_EXPORT void GL_APIENTRY UseProgramStagesContextANGLE(GLeglContext ctx,
>+                                                           GLuint pipeline,
>+                                                           GLbitfield stages,
>+                                                           GLuint program);
>+ANGLE_EXPORT void GL_APIENTRY ValidateProgramContextANGLE(GLeglContext ctx, GLuint program);
>+ANGLE_EXPORT void GL_APIENTRY ValidateProgramPipelineContextANGLE(GLeglContext ctx,
>+                                                                  GLuint pipeline);
>+ANGLE_EXPORT void GL_APIENTRY VertexAttrib1fContextANGLE(GLeglContext ctx, GLuint index, GLfloat x);
>+ANGLE_EXPORT void GL_APIENTRY VertexAttrib1fvContextANGLE(GLeglContext ctx,
>+                                                          GLuint index,
>+                                                          const GLfloat *v);
>+ANGLE_EXPORT void GL_APIENTRY VertexAttrib2fContextANGLE(GLeglContext ctx,
>+                                                         GLuint index,
>+                                                         GLfloat x,
>+                                                         GLfloat y);
>+ANGLE_EXPORT void GL_APIENTRY VertexAttrib2fvContextANGLE(GLeglContext ctx,
>+                                                          GLuint index,
>+                                                          const GLfloat *v);
>+ANGLE_EXPORT void GL_APIENTRY
>+VertexAttrib3fContextANGLE(GLeglContext ctx, GLuint index, GLfloat x, GLfloat y, GLfloat z);
>+ANGLE_EXPORT void GL_APIENTRY VertexAttrib3fvContextANGLE(GLeglContext ctx,
>+                                                          GLuint index,
>+                                                          const GLfloat *v);
>+ANGLE_EXPORT void GL_APIENTRY VertexAttrib4fContextANGLE(GLeglContext ctx,
>+                                                         GLuint index,
>+                                                         GLfloat x,
>+                                                         GLfloat y,
>+                                                         GLfloat z,
>+                                                         GLfloat w);
>+ANGLE_EXPORT void GL_APIENTRY VertexAttrib4fvContextANGLE(GLeglContext ctx,
>+                                                          GLuint index,
>+                                                          const GLfloat *v);
>+ANGLE_EXPORT void GL_APIENTRY VertexAttribBindingContextANGLE(GLeglContext ctx,
>+                                                              GLuint attribindex,
>+                                                              GLuint bindingindex);
>+ANGLE_EXPORT void GL_APIENTRY VertexAttribDivisorContextANGLE(GLeglContext ctx,
>+                                                              GLuint index,
>+                                                              GLuint divisor);
>+ANGLE_EXPORT void GL_APIENTRY VertexAttribDivisorANGLEContextANGLE(GLeglContext ctx,
>+                                                                   GLuint index,
>+                                                                   GLuint divisor);
>+ANGLE_EXPORT void GL_APIENTRY VertexAttribDivisorEXTContextANGLE(GLeglContext ctx,
>+                                                                 GLuint index,
>+                                                                 GLuint divisor);
>+ANGLE_EXPORT void GL_APIENTRY VertexAttribFormatContextANGLE(GLeglContext ctx,
>+                                                             GLuint attribindex,
>+                                                             GLint size,
>+                                                             GLenum type,
>+                                                             GLboolean normalized,
>+                                                             GLuint relativeoffset);
>+ANGLE_EXPORT void GL_APIENTRY
>+VertexAttribI4iContextANGLE(GLeglContext ctx, GLuint index, GLint x, GLint y, GLint z, GLint w);
>+ANGLE_EXPORT void GL_APIENTRY VertexAttribI4ivContextANGLE(GLeglContext ctx,
>+                                                           GLuint index,
>+                                                           const GLint *v);
>+ANGLE_EXPORT void GL_APIENTRY VertexAttribI4uiContextANGLE(GLeglContext ctx,
>+                                                           GLuint index,
>+                                                           GLuint x,
>+                                                           GLuint y,
>+                                                           GLuint z,
>+                                                           GLuint w);
>+ANGLE_EXPORT void GL_APIENTRY VertexAttribI4uivContextANGLE(GLeglContext ctx,
>+                                                            GLuint index,
>+                                                            const GLuint *v);
>+ANGLE_EXPORT void GL_APIENTRY VertexAttribIFormatContextANGLE(GLeglContext ctx,
>+                                                              GLuint attribindex,
>+                                                              GLint size,
>+                                                              GLenum type,
>+                                                              GLuint relativeoffset);
>+ANGLE_EXPORT void GL_APIENTRY VertexAttribIPointerContextANGLE(GLeglContext ctx,
>+                                                               GLuint index,
>+                                                               GLint size,
>+                                                               GLenum type,
>+                                                               GLsizei stride,
>+                                                               const void *pointer);
>+ANGLE_EXPORT void GL_APIENTRY VertexAttribPointerContextANGLE(GLeglContext ctx,
>+                                                              GLuint index,
>+                                                              GLint size,
>+                                                              GLenum type,
>+                                                              GLboolean normalized,
>+                                                              GLsizei stride,
>+                                                              const void *pointer);
>+ANGLE_EXPORT void GL_APIENTRY VertexBindingDivisorContextANGLE(GLeglContext ctx,
>+                                                               GLuint bindingindex,
>+                                                               GLuint divisor);
>+ANGLE_EXPORT void GL_APIENTRY VertexPointerContextANGLE(GLeglContext ctx,
>+                                                        GLint size,
>+                                                        GLenum type,
>+                                                        GLsizei stride,
>+                                                        const void *pointer);
>+ANGLE_EXPORT void GL_APIENTRY
>+ViewportContextANGLE(GLeglContext ctx, GLint x, GLint y, GLsizei width, GLsizei height);
>+ANGLE_EXPORT void GL_APIENTRY WaitSemaphoreEXTContextANGLE(GLeglContext ctx,
>+                                                           GLuint semaphore,
>+                                                           GLuint numBufferBarriers,
>+                                                           const GLuint *buffers,
>+                                                           GLuint numTextureBarriers,
>+                                                           const GLuint *textures,
>+                                                           const GLenum *srcLayouts);
>+ANGLE_EXPORT void GL_APIENTRY WaitSyncContextANGLE(GLeglContext ctx,
>+                                                   GLsync sync,
>+                                                   GLbitfield flags,
>+                                                   GLuint64 timeout);
>+ANGLE_EXPORT void GL_APIENTRY WeightPointerOESContextANGLE(GLeglContext ctx,
>+                                                           GLint size,
>+                                                           GLenum type,
>+                                                           GLsizei stride,
>+                                                           const void *pointer);
>+ANGLE_EXPORT void GL_APIENTRY BindUniformLocationCHROMIUMContextANGLE(GLeglContext ctx,
>+                                                                      GLuint program,
>+                                                                      GLint location,
>+                                                                      const GLchar *name);
>+ANGLE_EXPORT void GL_APIENTRY CoverageModulationCHROMIUMContextANGLE(GLeglContext ctx,
>+                                                                     GLenum components);
>+ANGLE_EXPORT void GL_APIENTRY MatrixLoadfCHROMIUMContextANGLE(GLeglContext ctx,
>+                                                              GLenum matrixMode,
>+                                                              const GLfloat *matrix);
>+ANGLE_EXPORT void GL_APIENTRY MatrixLoadIdentityCHROMIUMContextANGLE(GLeglContext ctx,
>+                                                                     GLenum matrixMode);
>+ANGLE_EXPORT GLuint GL_APIENTRY GenPathsCHROMIUMContextANGLE(GLeglContext ctx, GLsizei range);
>+ANGLE_EXPORT void GL_APIENTRY DeletePathsCHROMIUMContextANGLE(GLeglContext ctx,
>+                                                              GLuint first,
>+                                                              GLsizei range);
>+ANGLE_EXPORT GLboolean GL_APIENTRY IsPathCHROMIUMContextANGLE(GLeglContext ctx, GLuint path);
>+ANGLE_EXPORT void GL_APIENTRY PathCommandsCHROMIUMContextANGLE(GLeglContext ctx,
>+                                                               GLuint path,
>+                                                               GLsizei numCommands,
>+                                                               const GLubyte *commands,
>+                                                               GLsizei numCoords,
>+                                                               GLenum coordType,
>+                                                               const void *coords);
>+ANGLE_EXPORT void GL_APIENTRY PathParameterfCHROMIUMContextANGLE(GLeglContext ctx,
>+                                                                 GLuint path,
>+                                                                 GLenum pname,
>+                                                                 GLfloat value);
>+ANGLE_EXPORT void GL_APIENTRY PathParameteriCHROMIUMContextANGLE(GLeglContext ctx,
>+                                                                 GLuint path,
>+                                                                 GLenum pname,
>+                                                                 GLint value);
>+ANGLE_EXPORT void GL_APIENTRY GetPathParameterfvCHROMIUMContextANGLE(GLeglContext ctx,
>+                                                                     GLuint path,
>+                                                                     GLenum pname,
>+                                                                     GLfloat *value);
>+ANGLE_EXPORT void GL_APIENTRY GetPathParameterivCHROMIUMContextANGLE(GLeglContext ctx,
>+                                                                     GLuint path,
>+                                                                     GLenum pname,
>+                                                                     GLint *value);
>+ANGLE_EXPORT void GL_APIENTRY PathStencilFuncCHROMIUMContextANGLE(GLeglContext ctx,
>+                                                                  GLenum func,
>+                                                                  GLint ref,
>+                                                                  GLuint mask);
>+ANGLE_EXPORT void GL_APIENTRY StencilFillPathCHROMIUMContextANGLE(GLeglContext ctx,
>+                                                                  GLuint path,
>+                                                                  GLenum fillMode,
>+                                                                  GLuint mask);
>+ANGLE_EXPORT void GL_APIENTRY StencilStrokePathCHROMIUMContextANGLE(GLeglContext ctx,
>+                                                                    GLuint path,
>+                                                                    GLint reference,
>+                                                                    GLuint mask);
>+ANGLE_EXPORT void GL_APIENTRY CoverFillPathCHROMIUMContextANGLE(GLeglContext ctx,
>+                                                                GLuint path,
>+                                                                GLenum coverMode);
>+ANGLE_EXPORT void GL_APIENTRY CoverStrokePathCHROMIUMContextANGLE(GLeglContext ctx,
>+                                                                  GLuint path,
>+                                                                  GLenum coverMode);
>+ANGLE_EXPORT void GL_APIENTRY StencilThenCoverFillPathCHROMIUMContextANGLE(GLeglContext ctx,
>+                                                                           GLuint path,
>+                                                                           GLenum fillMode,
>+                                                                           GLuint mask,
>+                                                                           GLenum coverMode);
>+ANGLE_EXPORT void GL_APIENTRY StencilThenCoverStrokePathCHROMIUMContextANGLE(GLeglContext ctx,
>+                                                                             GLuint path,
>+                                                                             GLint reference,
>+                                                                             GLuint mask,
>+                                                                             GLenum coverMode);
>+ANGLE_EXPORT void GL_APIENTRY
>+CoverFillPathInstancedCHROMIUMContextANGLE(GLeglContext ctx,
>+                                           GLsizei numPath,
>+                                           GLenum pathNameType,
>+                                           const void *paths,
>+                                           GLuint pathBase,
>+                                           GLenum coverMode,
>+                                           GLenum transformType,
>+                                           const GLfloat *transformValues);
>+ANGLE_EXPORT void GL_APIENTRY
>+CoverStrokePathInstancedCHROMIUMContextANGLE(GLeglContext ctx,
>+                                             GLsizei numPath,
>+                                             GLenum pathNameType,
>+                                             const void *paths,
>+                                             GLuint pathBase,
>+                                             GLenum coverMode,
>+                                             GLenum transformType,
>+                                             const GLfloat *transformValues);
>+ANGLE_EXPORT void GL_APIENTRY
>+StencilStrokePathInstancedCHROMIUMContextANGLE(GLeglContext ctx,
>+                                               GLsizei numPath,
>+                                               GLenum pathNameType,
>+                                               const void *paths,
>+                                               GLuint pathBase,
>+                                               GLint reference,
>+                                               GLuint mask,
>+                                               GLenum transformType,
>+                                               const GLfloat *transformValues);
>+ANGLE_EXPORT void GL_APIENTRY
>+StencilFillPathInstancedCHROMIUMContextANGLE(GLeglContext ctx,
>+                                             GLsizei numPaths,
>+                                             GLenum pathNameType,
>+                                             const void *paths,
>+                                             GLuint pathBase,
>+                                             GLenum fillMode,
>+                                             GLuint mask,
>+                                             GLenum transformType,
>+                                             const GLfloat *transformValues);
>+ANGLE_EXPORT void GL_APIENTRY
>+StencilThenCoverFillPathInstancedCHROMIUMContextANGLE(GLeglContext ctx,
>+                                                      GLsizei numPaths,
>+                                                      GLenum pathNameType,
>+                                                      const void *paths,
>+                                                      GLuint pathBase,
>+                                                      GLenum fillMode,
>+                                                      GLuint mask,
>+                                                      GLenum coverMode,
>+                                                      GLenum transformType,
>+                                                      const GLfloat *transformValues);
>+ANGLE_EXPORT void GL_APIENTRY
>+StencilThenCoverStrokePathInstancedCHROMIUMContextANGLE(GLeglContext ctx,
>+                                                        GLsizei numPaths,
>+                                                        GLenum pathNameType,
>+                                                        const void *paths,
>+                                                        GLuint pathBase,
>+                                                        GLint reference,
>+                                                        GLuint mask,
>+                                                        GLenum coverMode,
>+                                                        GLenum transformType,
>+                                                        const GLfloat *transformValues);
>+ANGLE_EXPORT void GL_APIENTRY BindFragmentInputLocationCHROMIUMContextANGLE(GLeglContext ctx,
>+                                                                            GLuint programs,
>+                                                                            GLint location,
>+                                                                            const GLchar *name);
>+ANGLE_EXPORT void GL_APIENTRY
>+ProgramPathFragmentInputGenCHROMIUMContextANGLE(GLeglContext ctx,
>+                                                GLuint program,
>+                                                GLint location,
>+                                                GLenum genMode,
>+                                                GLint components,
>+                                                const GLfloat *coeffs);
>+ANGLE_EXPORT void GL_APIENTRY CopyTextureCHROMIUMContextANGLE(GLeglContext ctx,
>+                                                              GLuint sourceId,
>+                                                              GLint sourceLevel,
>+                                                              GLenum destTarget,
>+                                                              GLuint destId,
>+                                                              GLint destLevel,
>+                                                              GLint internalFormat,
>+                                                              GLenum destType,
>+                                                              GLboolean unpackFlipY,
>+                                                              GLboolean unpackPremultiplyAlpha,
>+                                                              GLboolean unpackUnmultiplyAlpha);
>+ANGLE_EXPORT void GL_APIENTRY CopySubTextureCHROMIUMContextANGLE(GLeglContext ctx,
>+                                                                 GLuint sourceId,
>+                                                                 GLint sourceLevel,
>+                                                                 GLenum destTarget,
>+                                                                 GLuint destId,
>+                                                                 GLint destLevel,
>+                                                                 GLint xoffset,
>+                                                                 GLint yoffset,
>+                                                                 GLint x,
>+                                                                 GLint y,
>+                                                                 GLint width,
>+                                                                 GLint height,
>+                                                                 GLboolean unpackFlipY,
>+                                                                 GLboolean unpackPremultiplyAlpha,
>+                                                                 GLboolean unpackUnmultiplyAlpha);
>+ANGLE_EXPORT void GL_APIENTRY CompressedCopyTextureCHROMIUMContextANGLE(GLeglContext ctx,
>+                                                                        GLuint sourceId,
>+                                                                        GLuint destId);
>+ANGLE_EXPORT void GL_APIENTRY RequestExtensionANGLEContextANGLE(GLeglContext ctx,
>+                                                                const GLchar *name);
>+ANGLE_EXPORT void GL_APIENTRY GetBooleanvRobustANGLEContextANGLE(GLeglContext ctx,
>+                                                                 GLenum pname,
>+                                                                 GLsizei bufSize,
>+                                                                 GLsizei *length,
>+                                                                 GLboolean *params);
>+ANGLE_EXPORT void GL_APIENTRY GetBufferParameterivRobustANGLEContextANGLE(GLeglContext ctx,
>+                                                                          GLenum target,
>+                                                                          GLenum pname,
>+                                                                          GLsizei bufSize,
>+                                                                          GLsizei *length,
>+                                                                          GLint *params);
>+ANGLE_EXPORT void GL_APIENTRY GetFloatvRobustANGLEContextANGLE(GLeglContext ctx,
>+                                                               GLenum pname,
>+                                                               GLsizei bufSize,
>+                                                               GLsizei *length,
>+                                                               GLfloat *params);
>+ANGLE_EXPORT void GL_APIENTRY
>+GetFramebufferAttachmentParameterivRobustANGLEContextANGLE(GLeglContext ctx,
>+                                                           GLenum target,
>+                                                           GLenum attachment,
>+                                                           GLenum pname,
>+                                                           GLsizei bufSize,
>+                                                           GLsizei *length,
>+                                                           GLint *params);
>+ANGLE_EXPORT void GL_APIENTRY GetIntegervRobustANGLEContextANGLE(GLeglContext ctx,
>+                                                                 GLenum pname,
>+                                                                 GLsizei bufSize,
>+                                                                 GLsizei *length,
>+                                                                 GLint *data);
>+ANGLE_EXPORT void GL_APIENTRY GetProgramivRobustANGLEContextANGLE(GLeglContext ctx,
>+                                                                  GLuint program,
>+                                                                  GLenum pname,
>+                                                                  GLsizei bufSize,
>+                                                                  GLsizei *length,
>+                                                                  GLint *params);
>+ANGLE_EXPORT void GL_APIENTRY GetRenderbufferParameterivRobustANGLEContextANGLE(GLeglContext ctx,
>+                                                                                GLenum target,
>+                                                                                GLenum pname,
>+                                                                                GLsizei bufSize,
>+                                                                                GLsizei *length,
>+                                                                                GLint *params);
>+ANGLE_EXPORT void GL_APIENTRY GetShaderivRobustANGLEContextANGLE(GLeglContext ctx,
>+                                                                 GLuint shader,
>+                                                                 GLenum pname,
>+                                                                 GLsizei bufSize,
>+                                                                 GLsizei *length,
>+                                                                 GLint *params);
>+ANGLE_EXPORT void GL_APIENTRY GetTexParameterfvRobustANGLEContextANGLE(GLeglContext ctx,
>+                                                                       GLenum target,
>+                                                                       GLenum pname,
>+                                                                       GLsizei bufSize,
>+                                                                       GLsizei *length,
>+                                                                       GLfloat *params);
>+ANGLE_EXPORT void GL_APIENTRY GetTexParameterivRobustANGLEContextANGLE(GLeglContext ctx,
>+                                                                       GLenum target,
>+                                                                       GLenum pname,
>+                                                                       GLsizei bufSize,
>+                                                                       GLsizei *length,
>+                                                                       GLint *params);
>+ANGLE_EXPORT void GL_APIENTRY GetUniformfvRobustANGLEContextANGLE(GLeglContext ctx,
>+                                                                  GLuint program,
>+                                                                  GLint location,
>+                                                                  GLsizei bufSize,
>+                                                                  GLsizei *length,
>+                                                                  GLfloat *params);
>+ANGLE_EXPORT void GL_APIENTRY GetUniformivRobustANGLEContextANGLE(GLeglContext ctx,
>+                                                                  GLuint program,
>+                                                                  GLint location,
>+                                                                  GLsizei bufSize,
>+                                                                  GLsizei *length,
>+                                                                  GLint *params);
>+ANGLE_EXPORT void GL_APIENTRY GetVertexAttribfvRobustANGLEContextANGLE(GLeglContext ctx,
>+                                                                       GLuint index,
>+                                                                       GLenum pname,
>+                                                                       GLsizei bufSize,
>+                                                                       GLsizei *length,
>+                                                                       GLfloat *params);
>+ANGLE_EXPORT void GL_APIENTRY GetVertexAttribivRobustANGLEContextANGLE(GLeglContext ctx,
>+                                                                       GLuint index,
>+                                                                       GLenum pname,
>+                                                                       GLsizei bufSize,
>+                                                                       GLsizei *length,
>+                                                                       GLint *params);
>+ANGLE_EXPORT void GL_APIENTRY GetVertexAttribPointervRobustANGLEContextANGLE(GLeglContext ctx,
>+                                                                             GLuint index,
>+                                                                             GLenum pname,
>+                                                                             GLsizei bufSize,
>+                                                                             GLsizei *length,
>+                                                                             void **pointer);
>+ANGLE_EXPORT void GL_APIENTRY ReadPixelsRobustANGLEContextANGLE(GLeglContext ctx,
>+                                                                GLint x,
>+                                                                GLint y,
>+                                                                GLsizei width,
>+                                                                GLsizei height,
>+                                                                GLenum format,
>+                                                                GLenum type,
>+                                                                GLsizei bufSize,
>+                                                                GLsizei *length,
>+                                                                GLsizei *columns,
>+                                                                GLsizei *rows,
>+                                                                void *pixels);
>+ANGLE_EXPORT void GL_APIENTRY TexImage2DRobustANGLEContextANGLE(GLeglContext ctx,
>+                                                                GLenum target,
>+                                                                GLint level,
>+                                                                GLint internalformat,
>+                                                                GLsizei width,
>+                                                                GLsizei height,
>+                                                                GLint border,
>+                                                                GLenum format,
>+                                                                GLenum type,
>+                                                                GLsizei bufSize,
>+                                                                const void *pixels);
>+ANGLE_EXPORT void GL_APIENTRY TexParameterfvRobustANGLEContextANGLE(GLeglContext ctx,
>+                                                                    GLenum target,
>+                                                                    GLenum pname,
>+                                                                    GLsizei bufSize,
>+                                                                    const GLfloat *params);
>+ANGLE_EXPORT void GL_APIENTRY TexParameterivRobustANGLEContextANGLE(GLeglContext ctx,
>+                                                                    GLenum target,
>+                                                                    GLenum pname,
>+                                                                    GLsizei bufSize,
>+                                                                    const GLint *params);
>+ANGLE_EXPORT void GL_APIENTRY TexSubImage2DRobustANGLEContextANGLE(GLeglContext ctx,
>+                                                                   GLenum target,
>+                                                                   GLint level,
>+                                                                   GLint xoffset,
>+                                                                   GLint yoffset,
>+                                                                   GLsizei width,
>+                                                                   GLsizei height,
>+                                                                   GLenum format,
>+                                                                   GLenum type,
>+                                                                   GLsizei bufSize,
>+                                                                   const void *pixels);
>+ANGLE_EXPORT void GL_APIENTRY TexImage3DRobustANGLEContextANGLE(GLeglContext ctx,
>+                                                                GLenum target,
>+                                                                GLint level,
>+                                                                GLint internalformat,
>+                                                                GLsizei width,
>+                                                                GLsizei height,
>+                                                                GLsizei depth,
>+                                                                GLint border,
>+                                                                GLenum format,
>+                                                                GLenum type,
>+                                                                GLsizei bufSize,
>+                                                                const void *pixels);
>+ANGLE_EXPORT void GL_APIENTRY TexSubImage3DRobustANGLEContextANGLE(GLeglContext ctx,
>+                                                                   GLenum target,
>+                                                                   GLint level,
>+                                                                   GLint xoffset,
>+                                                                   GLint yoffset,
>+                                                                   GLint zoffset,
>+                                                                   GLsizei width,
>+                                                                   GLsizei height,
>+                                                                   GLsizei depth,
>+                                                                   GLenum format,
>+                                                                   GLenum type,
>+                                                                   GLsizei bufSize,
>+                                                                   const void *pixels);
>+ANGLE_EXPORT void GL_APIENTRY CompressedTexImage2DRobustANGLEContextANGLE(GLeglContext ctx,
>+                                                                          GLenum target,
>+                                                                          GLint level,
>+                                                                          GLenum internalformat,
>+                                                                          GLsizei width,
>+                                                                          GLsizei height,
>+                                                                          GLint border,
>+                                                                          GLsizei imageSize,
>+                                                                          GLsizei dataSize,
>+                                                                          const GLvoid *data);
>+ANGLE_EXPORT void GL_APIENTRY CompressedTexSubImage2DRobustANGLEContextANGLE(GLeglContext ctx,
>+                                                                             GLenum target,
>+                                                                             GLint level,
>+                                                                             GLsizei xoffset,
>+                                                                             GLsizei yoffset,
>+                                                                             GLsizei width,
>+                                                                             GLsizei height,
>+                                                                             GLenum format,
>+                                                                             GLsizei imageSize,
>+                                                                             GLsizei dataSize,
>+                                                                             const GLvoid *data);
>+ANGLE_EXPORT void GL_APIENTRY CompressedTexImage3DRobustANGLEContextANGLE(GLeglContext ctx,
>+                                                                          GLenum target,
>+                                                                          GLint level,
>+                                                                          GLenum internalformat,
>+                                                                          GLsizei width,
>+                                                                          GLsizei height,
>+                                                                          GLsizei depth,
>+                                                                          GLint border,
>+                                                                          GLsizei imageSize,
>+                                                                          GLsizei dataSize,
>+                                                                          const GLvoid *data);
>+ANGLE_EXPORT void GL_APIENTRY CompressedTexSubImage3DRobustANGLEContextANGLE(GLeglContext ctx,
>+                                                                             GLenum target,
>+                                                                             GLint level,
>+                                                                             GLint xoffset,
>+                                                                             GLint yoffset,
>+                                                                             GLint zoffset,
>+                                                                             GLsizei width,
>+                                                                             GLsizei height,
>+                                                                             GLsizei depth,
>+                                                                             GLenum format,
>+                                                                             GLsizei imageSize,
>+                                                                             GLsizei dataSize,
>+                                                                             const GLvoid *data);
>+ANGLE_EXPORT void GL_APIENTRY GetQueryivRobustANGLEContextANGLE(GLeglContext ctx,
>+                                                                GLenum target,
>+                                                                GLenum pname,
>+                                                                GLsizei bufSize,
>+                                                                GLsizei *length,
>+                                                                GLint *params);
>+ANGLE_EXPORT void GL_APIENTRY GetQueryObjectuivRobustANGLEContextANGLE(GLeglContext ctx,
>+                                                                       GLuint id,
>+                                                                       GLenum pname,
>+                                                                       GLsizei bufSize,
>+                                                                       GLsizei *length,
>+                                                                       GLuint *params);
>+ANGLE_EXPORT void GL_APIENTRY GetBufferPointervRobustANGLEContextANGLE(GLeglContext ctx,
>+                                                                       GLenum target,
>+                                                                       GLenum pname,
>+                                                                       GLsizei bufSize,
>+                                                                       GLsizei *length,
>+                                                                       void **params);
>+ANGLE_EXPORT void GL_APIENTRY GetIntegeri_vRobustANGLEContextANGLE(GLeglContext ctx,
>+                                                                   GLenum target,
>+                                                                   GLuint index,
>+                                                                   GLsizei bufSize,
>+                                                                   GLsizei *length,
>+                                                                   GLint *data);
>+ANGLE_EXPORT void GL_APIENTRY GetInternalformativRobustANGLEContextANGLE(GLeglContext ctx,
>+                                                                         GLenum target,
>+                                                                         GLenum internalformat,
>+                                                                         GLenum pname,
>+                                                                         GLsizei bufSize,
>+                                                                         GLsizei *length,
>+                                                                         GLint *params);
>+ANGLE_EXPORT void GL_APIENTRY GetVertexAttribIivRobustANGLEContextANGLE(GLeglContext ctx,
>+                                                                        GLuint index,
>+                                                                        GLenum pname,
>+                                                                        GLsizei bufSize,
>+                                                                        GLsizei *length,
>+                                                                        GLint *params);
>+ANGLE_EXPORT void GL_APIENTRY GetVertexAttribIuivRobustANGLEContextANGLE(GLeglContext ctx,
>+                                                                         GLuint index,
>+                                                                         GLenum pname,
>+                                                                         GLsizei bufSize,
>+                                                                         GLsizei *length,
>+                                                                         GLuint *params);
>+ANGLE_EXPORT void GL_APIENTRY GetUniformuivRobustANGLEContextANGLE(GLeglContext ctx,
>+                                                                   GLuint program,
>+                                                                   GLint location,
>+                                                                   GLsizei bufSize,
>+                                                                   GLsizei *length,
>+                                                                   GLuint *params);
>+ANGLE_EXPORT void GL_APIENTRY
>+GetActiveUniformBlockivRobustANGLEContextANGLE(GLeglContext ctx,
>+                                               GLuint program,
>+                                               GLuint uniformBlockIndex,
>+                                               GLenum pname,
>+                                               GLsizei bufSize,
>+                                               GLsizei *length,
>+                                               GLint *params);
>+ANGLE_EXPORT void GL_APIENTRY GetInteger64vRobustANGLEContextANGLE(GLeglContext ctx,
>+                                                                   GLenum pname,
>+                                                                   GLsizei bufSize,
>+                                                                   GLsizei *length,
>+                                                                   GLint64 *data);
>+ANGLE_EXPORT void GL_APIENTRY GetInteger64i_vRobustANGLEContextANGLE(GLeglContext ctx,
>+                                                                     GLenum target,
>+                                                                     GLuint index,
>+                                                                     GLsizei bufSize,
>+                                                                     GLsizei *length,
>+                                                                     GLint64 *data);
>+ANGLE_EXPORT void GL_APIENTRY GetBufferParameteri64vRobustANGLEContextANGLE(GLeglContext ctx,
>+                                                                            GLenum target,
>+                                                                            GLenum pname,
>+                                                                            GLsizei bufSize,
>+                                                                            GLsizei *length,
>+                                                                            GLint64 *params);
>+ANGLE_EXPORT void GL_APIENTRY SamplerParameterivRobustANGLEContextANGLE(GLeglContext ctx,
>+                                                                        GLuint sampler,
>+                                                                        GLuint pname,
>+                                                                        GLsizei bufSize,
>+                                                                        const GLint *param);
>+ANGLE_EXPORT void GL_APIENTRY SamplerParameterfvRobustANGLEContextANGLE(GLeglContext ctx,
>+                                                                        GLuint sampler,
>+                                                                        GLenum pname,
>+                                                                        GLsizei bufSize,
>+                                                                        const GLfloat *param);
>+ANGLE_EXPORT void GL_APIENTRY GetSamplerParameterivRobustANGLEContextANGLE(GLeglContext ctx,
>+                                                                           GLuint sampler,
>+                                                                           GLenum pname,
>+                                                                           GLsizei bufSize,
>+                                                                           GLsizei *length,
>+                                                                           GLint *params);
>+ANGLE_EXPORT void GL_APIENTRY GetSamplerParameterfvRobustANGLEContextANGLE(GLeglContext ctx,
>+                                                                           GLuint sampler,
>+                                                                           GLenum pname,
>+                                                                           GLsizei bufSize,
>+                                                                           GLsizei *length,
>+                                                                           GLfloat *params);
>+ANGLE_EXPORT void GL_APIENTRY GetFramebufferParameterivRobustANGLEContextANGLE(GLeglContext ctx,
>+                                                                               GLuint sampler,
>+                                                                               GLenum pname,
>+                                                                               GLsizei bufSize,
>+                                                                               GLsizei *length,
>+                                                                               GLint *params);
>+ANGLE_EXPORT void GL_APIENTRY GetProgramInterfaceivRobustANGLEContextANGLE(GLeglContext ctx,
>+                                                                           GLuint program,
>+                                                                           GLenum programInterface,
>+                                                                           GLenum pname,
>+                                                                           GLsizei bufSize,
>+                                                                           GLsizei *length,
>+                                                                           GLint *params);
>+ANGLE_EXPORT void GL_APIENTRY GetBooleani_vRobustANGLEContextANGLE(GLeglContext ctx,
>+                                                                   GLenum target,
>+                                                                   GLuint index,
>+                                                                   GLsizei bufSize,
>+                                                                   GLsizei *length,
>+                                                                   GLboolean *data);
>+ANGLE_EXPORT void GL_APIENTRY GetMultisamplefvRobustANGLEContextANGLE(GLeglContext ctx,
>+                                                                      GLenum pname,
>+                                                                      GLuint index,
>+                                                                      GLsizei bufSize,
>+                                                                      GLsizei *length,
>+                                                                      GLfloat *val);
>+ANGLE_EXPORT void GL_APIENTRY GetTexLevelParameterivRobustANGLEContextANGLE(GLeglContext ctx,
>+                                                                            GLenum target,
>+                                                                            GLint level,
>+                                                                            GLenum pname,
>+                                                                            GLsizei bufSize,
>+                                                                            GLsizei *length,
>+                                                                            GLint *params);
>+ANGLE_EXPORT void GL_APIENTRY GetTexLevelParameterfvRobustANGLEContextANGLE(GLeglContext ctx,
>+                                                                            GLenum target,
>+                                                                            GLint level,
>+                                                                            GLenum pname,
>+                                                                            GLsizei bufSize,
>+                                                                            GLsizei *length,
>+                                                                            GLfloat *params);
>+ANGLE_EXPORT void GL_APIENTRY GetPointervRobustANGLERobustANGLEContextANGLE(GLeglContext ctx,
>+                                                                            GLenum pname,
>+                                                                            GLsizei bufSize,
>+                                                                            GLsizei *length,
>+                                                                            void **params);
>+ANGLE_EXPORT void GL_APIENTRY ReadnPixelsRobustANGLEContextANGLE(GLeglContext ctx,
>+                                                                 GLint x,
>+                                                                 GLint y,
>+                                                                 GLsizei width,
>+                                                                 GLsizei height,
>+                                                                 GLenum format,
>+                                                                 GLenum type,
>+                                                                 GLsizei bufSize,
>+                                                                 GLsizei *length,
>+                                                                 GLsizei *columns,
>+                                                                 GLsizei *rows,
>+                                                                 void *data);
>+ANGLE_EXPORT void GL_APIENTRY GetnUniformfvRobustANGLEContextANGLE(GLeglContext ctx,
>+                                                                   GLuint program,
>+                                                                   GLint location,
>+                                                                   GLsizei bufSize,
>+                                                                   GLsizei *length,
>+                                                                   GLfloat *params);
>+ANGLE_EXPORT void GL_APIENTRY GetnUniformivRobustANGLEContextANGLE(GLeglContext ctx,
>+                                                                   GLuint program,
>+                                                                   GLint location,
>+                                                                   GLsizei bufSize,
>+                                                                   GLsizei *length,
>+                                                                   GLint *params);
>+ANGLE_EXPORT void GL_APIENTRY GetnUniformuivRobustANGLEContextANGLE(GLeglContext ctx,
>+                                                                    GLuint program,
>+                                                                    GLint location,
>+                                                                    GLsizei bufSize,
>+                                                                    GLsizei *length,
>+                                                                    GLuint *params);
>+ANGLE_EXPORT void GL_APIENTRY TexParameterIivRobustANGLEContextANGLE(GLeglContext ctx,
>+                                                                     GLenum target,
>+                                                                     GLenum pname,
>+                                                                     GLsizei bufSize,
>+                                                                     const GLint *params);
>+ANGLE_EXPORT void GL_APIENTRY TexParameterIuivRobustANGLEContextANGLE(GLeglContext ctx,
>+                                                                      GLenum target,
>+                                                                      GLenum pname,
>+                                                                      GLsizei bufSize,
>+                                                                      const GLuint *params);
>+ANGLE_EXPORT void GL_APIENTRY GetTexParameterIivRobustANGLEContextANGLE(GLeglContext ctx,
>+                                                                        GLenum target,
>+                                                                        GLenum pname,
>+                                                                        GLsizei bufSize,
>+                                                                        GLsizei *length,
>+                                                                        GLint *params);
>+ANGLE_EXPORT void GL_APIENTRY GetTexParameterIuivRobustANGLEContextANGLE(GLeglContext ctx,
>+                                                                         GLenum target,
>+                                                                         GLenum pname,
>+                                                                         GLsizei bufSize,
>+                                                                         GLsizei *length,
>+                                                                         GLuint *params);
>+ANGLE_EXPORT void GL_APIENTRY SamplerParameterIivRobustANGLEContextANGLE(GLeglContext ctx,
>+                                                                         GLuint sampler,
>+                                                                         GLenum pname,
>+                                                                         GLsizei bufSize,
>+                                                                         const GLint *param);
>+ANGLE_EXPORT void GL_APIENTRY SamplerParameterIuivRobustANGLEContextANGLE(GLeglContext ctx,
>+                                                                          GLuint sampler,
>+                                                                          GLenum pname,
>+                                                                          GLsizei bufSize,
>+                                                                          const GLuint *param);
>+ANGLE_EXPORT void GL_APIENTRY GetSamplerParameterIivRobustANGLEContextANGLE(GLeglContext ctx,
>+                                                                            GLuint sampler,
>+                                                                            GLenum pname,
>+                                                                            GLsizei bufSize,
>+                                                                            GLsizei *length,
>+                                                                            GLint *params);
>+ANGLE_EXPORT void GL_APIENTRY GetSamplerParameterIuivRobustANGLEContextANGLE(GLeglContext ctx,
>+                                                                             GLuint sampler,
>+                                                                             GLenum pname,
>+                                                                             GLsizei bufSize,
>+                                                                             GLsizei *length,
>+                                                                             GLuint *params);
>+ANGLE_EXPORT void GL_APIENTRY GetQueryObjectivRobustANGLEContextANGLE(GLeglContext ctx,
>+                                                                      GLuint id,
>+                                                                      GLenum pname,
>+                                                                      GLsizei bufSize,
>+                                                                      GLsizei *length,
>+                                                                      GLint *params);
>+ANGLE_EXPORT void GL_APIENTRY GetQueryObjecti64vRobustANGLEContextANGLE(GLeglContext ctx,
>+                                                                        GLuint id,
>+                                                                        GLenum pname,
>+                                                                        GLsizei bufSize,
>+                                                                        GLsizei *length,
>+                                                                        GLint64 *params);
>+ANGLE_EXPORT void GL_APIENTRY GetQueryObjectui64vRobustANGLEContextANGLE(GLeglContext ctx,
>+                                                                         GLuint id,
>+                                                                         GLenum pname,
>+                                                                         GLsizei bufSize,
>+                                                                         GLsizei *length,
>+                                                                         GLuint64 *params);
>+ANGLE_EXPORT void GL_APIENTRY CopyTexture3DANGLEContextANGLE(GLeglContext ctx,
>+                                                             GLuint sourceId,
>+                                                             GLint sourceLevel,
>+                                                             GLenum destTarget,
>+                                                             GLuint destId,
>+                                                             GLint destLevel,
>+                                                             GLint internalFormat,
>+                                                             GLenum destType,
>+                                                             GLboolean unpackFlipY,
>+                                                             GLboolean unpackPremultiplyAlpha,
>+                                                             GLboolean unpackUnmultiplyAlpha);
>+ANGLE_EXPORT void GL_APIENTRY CopySubTexture3DANGLEContextANGLE(GLeglContext ctx,
>+                                                                GLuint sourceId,
>+                                                                GLint sourceLevel,
>+                                                                GLenum destTarget,
>+                                                                GLuint destId,
>+                                                                GLint destLevel,
>+                                                                GLint xoffset,
>+                                                                GLint yoffset,
>+                                                                GLint zoffset,
>+                                                                GLint x,
>+                                                                GLint y,
>+                                                                GLint z,
>+                                                                GLint width,
>+                                                                GLint height,
>+                                                                GLint depth,
>+                                                                GLboolean unpackFlipY,
>+                                                                GLboolean unpackPremultiplyAlpha,
>+                                                                GLboolean unpackUnmultiplyAlpha);
>+ANGLE_EXPORT void GL_APIENTRY
>+TexStorage2DMultisampleANGLEContextANGLE(GLeglContext ctx,
>+                                         GLenum target,
>+                                         GLsizei samples,
>+                                         GLenum internalformat,
>+                                         GLsizei width,
>+                                         GLsizei height,
>+                                         GLboolean fixedsamplelocations);
>+ANGLE_EXPORT void GL_APIENTRY GetTexLevelParameterivANGLEContextANGLE(GLeglContext ctx,
>+                                                                      GLenum target,
>+                                                                      GLint level,
>+                                                                      GLenum pname,
>+                                                                      GLint *params);
>+ANGLE_EXPORT void GL_APIENTRY GetTexLevelParameterfvANGLEContextANGLE(GLeglContext ctx,
>+                                                                      GLenum target,
>+                                                                      GLint level,
>+                                                                      GLenum pname,
>+                                                                      GLfloat *params);
>+ANGLE_EXPORT void GL_APIENTRY MultiDrawArraysANGLEContextANGLE(GLeglContext ctx,
>+                                                               GLenum mode,
>+                                                               const GLint *firsts,
>+                                                               const GLsizei *counts,
>+                                                               GLsizei drawcount);
>+ANGLE_EXPORT void GL_APIENTRY
>+MultiDrawArraysInstancedANGLEContextANGLE(GLeglContext ctx,
>+                                          GLenum mode,
>+                                          const GLint *firsts,
>+                                          const GLsizei *counts,
>+                                          const GLsizei *instanceCounts,
>+                                          GLsizei drawcount);
>+ANGLE_EXPORT void GL_APIENTRY MultiDrawElementsANGLEContextANGLE(GLeglContext ctx,
>+                                                                 GLenum mode,
>+                                                                 const GLsizei *counts,
>+                                                                 GLenum type,
>+                                                                 const GLvoid *const *indices,
>+                                                                 GLsizei drawcount);
>+ANGLE_EXPORT void GL_APIENTRY
>+MultiDrawElementsInstancedANGLEContextANGLE(GLeglContext ctx,
>+                                            GLenum mode,
>+                                            const GLsizei *counts,
>+                                            GLenum type,
>+                                            const GLvoid *const *indices,
>+                                            const GLsizei *instanceCounts,
>+                                            GLsizei drawcount);
>+ANGLE_EXPORT void GL_APIENTRY GetMultisamplefvANGLEContextANGLE(GLeglContext ctx,
>+                                                                GLenum pname,
>+                                                                GLuint index,
>+                                                                GLfloat *val);
>+ANGLE_EXPORT void GL_APIENTRY SampleMaskiANGLEContextANGLE(GLeglContext ctx,
>+                                                           GLuint maskNumber,
>+                                                           GLbitfield mask);
>+ANGLE_EXPORT void GL_APIENTRY ProvokingVertexANGLEContextANGLE(GLeglContext ctx, GLenum mode);
>+ANGLE_EXPORT void GL_APIENTRY LoseContextCHROMIUMContextANGLE(GLeglContext ctx,
>+                                                              GLenum current,
>+                                                              GLenum other);
>+}  // namespace gl
>+
>+#endif  // LIBGLESV2_ENTRY_POINTS_GLES_EXT_AUTOGEN_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libGLESv2/entry_points_utils.h b/Source/ThirdParty/ANGLE/src/libGLESv2/entry_points_utils.h
>new file mode 100644
>index 00000000000..9761584dd3c
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libGLESv2/entry_points_utils.h
>@@ -0,0 +1,86 @@
>+//
>+// Copyright 2018 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// entry_point_utils:
>+//   These helpers are used in GLES entry point routines.
>+
>+#ifndef LIBGLESV2_ENTRY_POINT_UTILS_H_
>+#define LIBGLESV2_ENTRY_POINT_UTILS_H_
>+
>+#include "angle_gl.h"
>+#include "common/Optional.h"
>+#include "common/PackedEnums.h"
>+#include "common/angleutils.h"
>+#include "common/mathutil.h"
>+#include "libGLESv2/entry_points_enum_autogen.h"
>+
>+namespace gl
>+{
>+// A template struct for determining the default value to return for each entry point.
>+template <EntryPoint EP, typename ReturnType>
>+struct DefaultReturnValue;
>+
>+// Default return values for each basic return type.
>+template <EntryPoint EP>
>+struct DefaultReturnValue<EP, GLint>
>+{
>+    static constexpr GLint kValue = -1;
>+};
>+
>+// This doubles as the GLenum return value.
>+template <EntryPoint EP>
>+struct DefaultReturnValue<EP, GLuint>
>+{
>+    static constexpr GLuint kValue = 0;
>+};
>+
>+template <EntryPoint EP>
>+struct DefaultReturnValue<EP, GLboolean>
>+{
>+    static constexpr GLboolean kValue = GL_FALSE;
>+};
>+
>+// Catch-all rules for pointer types.
>+template <EntryPoint EP, typename PointerType>
>+struct DefaultReturnValue<EP, const PointerType *>
>+{
>+    static constexpr const PointerType *kValue = nullptr;
>+};
>+
>+template <EntryPoint EP, typename PointerType>
>+struct DefaultReturnValue<EP, PointerType *>
>+{
>+    static constexpr PointerType *kValue = nullptr;
>+};
>+
>+// Overloaded to return invalid index
>+template <>
>+struct DefaultReturnValue<EntryPoint::GetUniformBlockIndex, GLuint>
>+{
>+    static constexpr GLuint kValue = GL_INVALID_INDEX;
>+};
>+
>+// Specialized enum error value.
>+template <>
>+struct DefaultReturnValue<EntryPoint::ClientWaitSync, GLenum>
>+{
>+    static constexpr GLenum kValue = GL_WAIT_FAILED;
>+};
>+
>+// glTestFenceNV should still return TRUE for an invalid fence.
>+template <>
>+struct DefaultReturnValue<EntryPoint::TestFenceNV, GLboolean>
>+{
>+    static constexpr GLboolean kValue = GL_TRUE;
>+};
>+
>+template <EntryPoint EP, typename ReturnType>
>+constexpr ANGLE_INLINE ReturnType GetDefaultReturnValue()
>+{
>+    return DefaultReturnValue<EP, ReturnType>::kValue;
>+}
>+}  // namespace gl
>+
>+#endif  // LIBGLESV2_ENTRY_POINT_UTILS_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libGLESv2/gen_proc_table.py b/Source/ThirdParty/ANGLE/src/libGLESv2/gen_proc_table.py
>index 616b5424d56..834222f86d1 100644
>--- a/Source/ThirdParty/ANGLE/src/libGLESv2/gen_proc_table.py
>+++ b/Source/ThirdParty/ANGLE/src/libGLESv2/gen_proc_table.py
>@@ -1,10 +1,11 @@
>-#!/usr/bin/python
>+#!python
> # Copyright 2017 The ANGLE Project Authors. All rights reserved.
> # Use of this source code is governed by a BSD-style license that can be
> # found in the LICENSE file.
> #
> # gen_proc_table.py:
> #  Code generation for entry point loading tables.
>+#  NOTE: don't run this script directly. Run scripts/run_code_generation.py.
> 
> # TODO(jmadill): Should be part of entry point generation.
> 
>@@ -14,6 +15,10 @@ from datetime import date
> data_source_name = "proc_table_data.json"
> out_file_name = "proc_table_autogen.cpp"
> 
>+# The EGL_ANGLE_explicit_context extension is generated differently from other extensions.
>+# Toggle generation here.
>+support_egl_ANGLE_explicit_context = True
>+
> template_cpp = """// GENERATED FILE - DO NOT EDIT.
> // Generated by {script_name} using data from {data_source_name}.
> //
>@@ -29,10 +34,11 @@ template_cpp = """// GENERATED FILE - DO NOT EDIT.
> 
> #include "libGLESv2/entry_points_egl.h"
> #include "libGLESv2/entry_points_egl_ext.h"
>+#include "libGLESv2/entry_points_gles_1_0_autogen.h"
> #include "libGLESv2/entry_points_gles_2_0_autogen.h"
>-#include "libGLESv2/entry_points_gles_2_0_ext.h"
> #include "libGLESv2/entry_points_gles_3_0_autogen.h"
> #include "libGLESv2/entry_points_gles_3_1_autogen.h"
>+#include "libGLESv2/entry_points_gles_ext_autogen.h"
> #include "platform/Platform.h"
> 
> #define P(FUNC) reinterpret_cast<__eglMustCastToProperFunctionPointerType>(FUNC)
>@@ -50,28 +56,51 @@ size_t g_numProcs = {num_procs};
> sys.path.append('../libANGLE/renderer')
> import angle_format
> 
>-json_data = angle_format.load_json(data_source_name)
>+def main():
> 
>-all_functions = {}
>+    # auto_script parameters.
>+    if len(sys.argv) > 1:
>+        inputs = [data_source_name]
>+        outputs = [out_file_name]
> 
>-for description, functions in json_data.iteritems():
>-    for function in functions:
>-        if function.startswith("gl"):
>-            all_functions[function] = "gl::" + function[2:]
>-        elif function.startswith("egl"):
>-            all_functions[function] = "egl::" + function[3:]
>+        if sys.argv[1] == 'inputs':
>+            print ','.join(inputs)
>+        elif sys.argv[1] == 'outputs':
>+            print ','.join(outputs)
>         else:
>-            all_functions[function] = function
>-
>-proc_data = [('    {"%s", P(%s)}' % (func, angle_func)) for func, angle_func in sorted(all_functions.iteritems())]
>-
>-with open(out_file_name, 'wt') as out_file:
>-    output_cpp = template_cpp.format(
>-        script_name = sys.argv[0],
>-        data_source_name = data_source_name,
>-        copyright_year = date.today().year,
>-        proc_data = ",\n".join(proc_data),
>-        num_procs = len(proc_data))
>-    out_file.write(output_cpp)
>-    out_file.close()
>-
>+            print('Invalid script parameters')
>+            return 1
>+        return 0
>+
>+    json_data = angle_format.load_json(data_source_name)
>+
>+    all_functions = {}
>+
>+    for description, functions in json_data.iteritems():
>+        for function in functions:
>+            if function.startswith("gl"):
>+                all_functions[function] = "gl::" + function[2:]
>+                # Special handling for EGL_ANGLE_explicit_context extension
>+                if support_egl_ANGLE_explicit_context:
>+                    all_functions[function + "ContextANGLE"] = "gl::" + function[2:] + "ContextANGLE"
>+            elif function.startswith("egl"):
>+                all_functions[function] = "EGL_" + function[3:]
>+            else:
>+                all_functions[function] = function
>+
>+    proc_data = [('    {"%s", P(%s)}' % (func, angle_func)) for func, angle_func in sorted(all_functions.iteritems())]
>+
>+    with open(out_file_name, 'w') as out_file:
>+        output_cpp = template_cpp.format(
>+            script_name = sys.argv[0],
>+            data_source_name = data_source_name,
>+            copyright_year = date.today().year,
>+            proc_data = ",\n".join(proc_data),
>+            num_procs = len(proc_data))
>+        out_file.write(output_cpp)
>+        out_file.close()
>+    return 0
>+
>+
>+if __name__ == '__main__':
>+    sys.exit(main())
>diff --git a/Source/ThirdParty/ANGLE/src/libGLESv2/global_state.cpp b/Source/ThirdParty/ANGLE/src/libGLESv2/global_state.cpp
>index c5f3dfe4e12..4c7c28ac1da 100644
>--- a/Source/ThirdParty/ANGLE/src/libGLESv2/global_state.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libGLESv2/global_state.cpp
>@@ -12,32 +12,29 @@
> #include "common/platform.h"
> #include "common/tls.h"
> 
>-#include "libANGLE/Thread.h"
>-
> namespace gl
> {
>-
>-Context *GetGlobalContext()
>-{
>-    egl::Thread *thread = egl::GetCurrentThread();
>-    return thread->getContext();
>-}
>-
>-Context *GetValidGlobalContext()
>-{
>-    egl::Thread *thread = egl::GetCurrentThread();
>-    return thread->getValidContext();
>-}
>-
>+// In single-threaded cases we can avoid a TLS lookup for the current Context.
>+//
>+// Let a global single-threaded context have 3 states: unset, set, and multi-threaded.
>+// Initially it is unset. Then, on MakeCurrent:
>+//
>+//  * if the ST context is unset                      -> set the global context.
>+//  * if the ST context is set and matches the TLS    -> set the global context.
>+//  * if the ST context is set and does not match TLS -> set multi-threaded mode.
>+//  * if in multi-threaded mode, unset and subsequently ignore the global context.
>+//
>+// Implementation-wise we can use a pointer and a boolean to represent the three modes.
>+Context *gSingleThreadedContext = nullptr;
>+bool gIsMultiThreadedContext    = false;
> }  // namespace gl
> 
> namespace egl
> {
>-
> namespace
> {
>-
> static TLSIndex threadTLS = TLS_INVALID_INDEX;
>+Debug *g_Debug            = nullptr;
> 
> Thread *AllocateCurrentThread()
> {
>@@ -57,6 +54,15 @@ Thread *AllocateCurrentThread()
>     return thread;
> }
> 
>+void AllocateDebug()
>+{
>+    // TODO(geofflang): Lock around global allocation. http://anglebug.com/2464
>+    if (g_Debug == nullptr)
>+    {
>+        g_Debug = new Debug();
>+    }
>+}
>+
> }  // anonymous namespace
> 
> Thread *GetCurrentThread()
>@@ -74,8 +80,50 @@ Thread *GetCurrentThread()
>     return (current ? current : AllocateCurrentThread());
> }
> 
>+Debug *GetDebug()
>+{
>+    AllocateDebug();
>+    return g_Debug;
>+}
>+
>+void SetContextCurrent(Thread *thread, gl::Context *context)
>+{
>+    // See above comment on gGlobalContext.
>+    // If the context is in multi-threaded mode, ignore the global context.
>+    if (!gl::gIsMultiThreadedContext)
>+    {
>+        // If the global context is unset or matches the current TLS, set the global context.
>+        if (gl::gSingleThreadedContext == nullptr ||
>+            gl::gSingleThreadedContext == thread->getContext())
>+        {
>+            gl::gSingleThreadedContext = context;
>+        }
>+        else
>+        {
>+            // If the global context is set and does not match TLS, set multi-threaded mode.
>+            gl::gSingleThreadedContext  = nullptr;
>+            gl::gIsMultiThreadedContext = true;
>+        }
>+    }
>+    thread->setCurrent(context);
>+}
> }  // namespace egl
> 
>+#if ANGLE_FORCE_THREAD_SAFETY == ANGLE_ENABLED
>+namespace angle
>+{
>+namespace
>+{
>+std::mutex g_Mutex;
>+}  // anonymous namespace
>+
>+std::mutex &GetGlobalMutex()
>+{
>+    return g_Mutex;
>+}
>+}  // namespace angle
>+#endif
>+
> #ifdef ANGLE_PLATFORM_WINDOWS
> namespace egl
> {
>@@ -90,8 +138,16 @@ bool DeallocateCurrentThread()
>     return SetTLSValue(threadTLS, nullptr);
> }
> 
>+void DealocateDebug()
>+{
>+    SafeDelete(g_Debug);
>+}
>+
> bool InitializeProcess()
> {
>+    ASSERT(g_Debug == nullptr);
>+    AllocateDebug();
>+
>     threadTLS = CreateTLSIndex();
>     if (threadTLS == TLS_INVALID_INDEX)
>     {
>@@ -103,6 +159,8 @@ bool InitializeProcess()
> 
> bool TerminateProcess()
> {
>+    DealocateDebug();
>+
>     if (!DeallocateCurrentThread())
>     {
>         return false;
>diff --git a/Source/ThirdParty/ANGLE/src/libGLESv2/global_state.h b/Source/ThirdParty/ANGLE/src/libGLESv2/global_state.h
>index 3e3740c90ef..03d353a5775 100644
>--- a/Source/ThirdParty/ANGLE/src/libGLESv2/global_state.h
>+++ b/Source/ThirdParty/ANGLE/src/libGLESv2/global_state.h
>@@ -9,21 +9,61 @@
> #ifndef LIBGLESV2_GLOBALSTATE_H_
> #define LIBGLESV2_GLOBALSTATE_H_
> 
>-namespace gl
>-{
>-class Context;
>+#include "libANGLE/Context.h"
>+#include "libANGLE/Debug.h"
>+#include "libANGLE/Thread.h"
>+#include "libANGLE/features.h"
> 
>-Context *GetGlobalContext();
>-Context *GetValidGlobalContext();
>-
>-}  // namespace gl
>+#include <mutex>
> 
> namespace egl
> {
>+class Debug;
> class Thread;
> 
> Thread *GetCurrentThread();
>-
>+Debug *GetDebug();
>+void SetContextCurrent(Thread *thread, gl::Context *context);
> }  // namespace egl
> 
>-#endif // LIBGLESV2_GLOBALSTATE_H_
>+namespace gl
>+{
>+extern Context *gSingleThreadedContext;
>+
>+ANGLE_INLINE Context *GetGlobalContext()
>+{
>+    if (gSingleThreadedContext)
>+    {
>+        return gSingleThreadedContext;
>+    }
>+
>+    egl::Thread *thread = egl::GetCurrentThread();
>+    return thread->getContext();
>+}
>+
>+ANGLE_INLINE Context *GetValidGlobalContext()
>+{
>+    if (gSingleThreadedContext && !gSingleThreadedContext->isContextLost())
>+    {
>+        return gSingleThreadedContext;
>+    }
>+
>+    egl::Thread *thread = egl::GetCurrentThread();
>+    return thread->getValidContext();
>+}
>+
>+}  // namespace gl
>+
>+#if ANGLE_FORCE_THREAD_SAFETY == ANGLE_ENABLED
>+namespace angle
>+{
>+std::mutex &GetGlobalMutex();
>+}  // namespace angle
>+
>+#    define ANGLE_SCOPED_GLOBAL_LOCK() \
>+        std::lock_guard<std::mutex> globalMutexLock(angle::GetGlobalMutex())
>+#else
>+#    define ANGLE_SCOPED_GLOBAL_LOCK()
>+#endif
>+
>+#endif  // LIBGLESV2_GLOBALSTATE_H_
>diff --git a/Source/ThirdParty/ANGLE/src/libGLESv2/libGLESv2.cpp b/Source/ThirdParty/ANGLE/src/libGLESv2/libGLESv2.cpp
>deleted file mode 100644
>index ffd78a2ac01..00000000000
>--- a/Source/ThirdParty/ANGLE/src/libGLESv2/libGLESv2.cpp
>+++ /dev/null
>@@ -1,2575 +0,0 @@
>-//
>-// Copyright (c) 2002-2014 The ANGLE Project Authors. All rights reserved.
>-// Use of this source code is governed by a BSD-style license that can be
>-// found in the LICENSE file.
>-//
>-
>-// libGLESv2.cpp: Implements the exported OpenGL ES 2.0 functions.
>-
>-#include "libGLESv2/entry_points_gles_2_0_autogen.h"
>-#include "libGLESv2/entry_points_gles_2_0_ext.h"
>-#include "libGLESv2/entry_points_gles_3_0_autogen.h"
>-#include "libGLESv2/entry_points_gles_3_1_autogen.h"
>-
>-#include "common/event_tracer.h"
>-
>-extern "C" {
>-
>-void GL_APIENTRY glActiveTexture(GLenum texture)
>-{
>-    return gl::ActiveTexture(texture);
>-}
>-
>-void GL_APIENTRY glAttachShader(GLuint program, GLuint shader)
>-{
>-    return gl::AttachShader(program, shader);
>-}
>-
>-void GL_APIENTRY glBindAttribLocation(GLuint program, GLuint index, const GLchar *name)
>-{
>-    return gl::BindAttribLocation(program, index, name);
>-}
>-
>-void GL_APIENTRY glBindBuffer(GLenum target, GLuint buffer)
>-{
>-    return gl::BindBuffer(target, buffer);
>-}
>-
>-void GL_APIENTRY glBindFramebuffer(GLenum target, GLuint framebuffer)
>-{
>-    return gl::BindFramebuffer(target, framebuffer);
>-}
>-
>-void GL_APIENTRY glBindRenderbuffer(GLenum target, GLuint renderbuffer)
>-{
>-    return gl::BindRenderbuffer(target, renderbuffer);
>-}
>-
>-void GL_APIENTRY glBindTexture(GLenum target, GLuint texture)
>-{
>-    return gl::BindTexture(target, texture);
>-}
>-
>-void GL_APIENTRY glBlendColor(GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha)
>-{
>-    return gl::BlendColor(red, green, blue, alpha);
>-}
>-
>-void GL_APIENTRY glBlendEquation(GLenum mode)
>-{
>-    return gl::BlendEquation(mode);
>-}
>-
>-void GL_APIENTRY glBlendEquationSeparate(GLenum modeRGB, GLenum modeAlpha)
>-{
>-    return gl::BlendEquationSeparate(modeRGB, modeAlpha);
>-}
>-
>-void GL_APIENTRY glBlendFunc(GLenum sfactor, GLenum dfactor)
>-{
>-    return gl::BlendFunc(sfactor, dfactor);
>-}
>-
>-void GL_APIENTRY glBlendFuncSeparate(GLenum srcRGB, GLenum dstRGB, GLenum srcAlpha, GLenum dstAlpha)
>-{
>-    return gl::BlendFuncSeparate(srcRGB, dstRGB, srcAlpha, dstAlpha);
>-}
>-
>-void GL_APIENTRY glBufferData(GLenum target, GLsizeiptr size, const void *data, GLenum usage)
>-{
>-    return gl::BufferData(target, size, data, usage);
>-}
>-
>-void GL_APIENTRY glBufferSubData(GLenum target, GLintptr offset, GLsizeiptr size, const void *data)
>-{
>-    return gl::BufferSubData(target, offset, size, data);
>-}
>-
>-GLenum GL_APIENTRY glCheckFramebufferStatus(GLenum target)
>-{
>-    return gl::CheckFramebufferStatus(target);
>-}
>-
>-void GL_APIENTRY glClear(GLbitfield mask)
>-{
>-    return gl::Clear(mask);
>-}
>-
>-void GL_APIENTRY glClearColor(GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha)
>-{
>-    return gl::ClearColor(red, green, blue, alpha);
>-}
>-
>-void GL_APIENTRY glClearDepthf(GLfloat depth)
>-{
>-    return gl::ClearDepthf(depth);
>-}
>-
>-void GL_APIENTRY glClearStencil(GLint s)
>-{
>-    return gl::ClearStencil(s);
>-}
>-
>-void GL_APIENTRY glColorMask(GLboolean red, GLboolean green, GLboolean blue, GLboolean alpha)
>-{
>-    return gl::ColorMask(red, green, blue, alpha);
>-}
>-
>-void GL_APIENTRY glCompileShader(GLuint shader)
>-{
>-    return gl::CompileShader(shader);
>-}
>-
>-void GL_APIENTRY glCompressedTexImage2D(GLenum target,
>-                                        GLint level,
>-                                        GLenum internalformat,
>-                                        GLsizei width,
>-                                        GLsizei height,
>-                                        GLint border,
>-                                        GLsizei imageSize,
>-                                        const void *data)
>-{
>-    return gl::CompressedTexImage2D(target, level, internalformat, width, height, border, imageSize,
>-                                    data);
>-}
>-
>-void GL_APIENTRY glCompressedTexSubImage2D(GLenum target,
>-                                           GLint level,
>-                                           GLint xoffset,
>-                                           GLint yoffset,
>-                                           GLsizei width,
>-                                           GLsizei height,
>-                                           GLenum format,
>-                                           GLsizei imageSize,
>-                                           const void *data)
>-{
>-    return gl::CompressedTexSubImage2D(target, level, xoffset, yoffset, width, height, format,
>-                                       imageSize, data);
>-}
>-
>-void GL_APIENTRY glCopyTexImage2D(GLenum target,
>-                                  GLint level,
>-                                  GLenum internalformat,
>-                                  GLint x,
>-                                  GLint y,
>-                                  GLsizei width,
>-                                  GLsizei height,
>-                                  GLint border)
>-{
>-    return gl::CopyTexImage2D(target, level, internalformat, x, y, width, height, border);
>-}
>-
>-void GL_APIENTRY glCopyTexSubImage2D(GLenum target,
>-                                     GLint level,
>-                                     GLint xoffset,
>-                                     GLint yoffset,
>-                                     GLint x,
>-                                     GLint y,
>-                                     GLsizei width,
>-                                     GLsizei height)
>-{
>-    return gl::CopyTexSubImage2D(target, level, xoffset, yoffset, x, y, width, height);
>-}
>-
>-GLuint GL_APIENTRY glCreateProgram(void)
>-{
>-    return gl::CreateProgram();
>-}
>-
>-GLuint GL_APIENTRY glCreateShader(GLenum type)
>-{
>-    return gl::CreateShader(type);
>-}
>-
>-void GL_APIENTRY glCullFace(GLenum mode)
>-{
>-    return gl::CullFace(mode);
>-}
>-
>-void GL_APIENTRY glDeleteBuffers(GLsizei n, const GLuint *buffers)
>-{
>-    return gl::DeleteBuffers(n, buffers);
>-}
>-
>-void GL_APIENTRY glDeleteFramebuffers(GLsizei n, const GLuint *framebuffers)
>-{
>-    return gl::DeleteFramebuffers(n, framebuffers);
>-}
>-
>-void GL_APIENTRY glDeleteProgram(GLuint program)
>-{
>-    return gl::DeleteProgram(program);
>-}
>-
>-void GL_APIENTRY glDeleteRenderbuffers(GLsizei n, const GLuint *renderbuffers)
>-{
>-    return gl::DeleteRenderbuffers(n, renderbuffers);
>-}
>-
>-void GL_APIENTRY glDeleteShader(GLuint shader)
>-{
>-    return gl::DeleteShader(shader);
>-}
>-
>-void GL_APIENTRY glDeleteTextures(GLsizei n, const GLuint *textures)
>-{
>-    return gl::DeleteTextures(n, textures);
>-}
>-
>-void GL_APIENTRY glDepthFunc(GLenum func)
>-{
>-    return gl::DepthFunc(func);
>-}
>-
>-void GL_APIENTRY glDepthMask(GLboolean flag)
>-{
>-    return gl::DepthMask(flag);
>-}
>-
>-void GL_APIENTRY glDepthRangef(GLfloat n, GLfloat f)
>-{
>-    return gl::DepthRangef(n, f);
>-}
>-
>-void GL_APIENTRY glDetachShader(GLuint program, GLuint shader)
>-{
>-    return gl::DetachShader(program, shader);
>-}
>-
>-void GL_APIENTRY glDisable(GLenum cap)
>-{
>-    return gl::Disable(cap);
>-}
>-
>-void GL_APIENTRY glDisableVertexAttribArray(GLuint index)
>-{
>-    return gl::DisableVertexAttribArray(index);
>-}
>-
>-void GL_APIENTRY glDrawArrays(GLenum mode, GLint first, GLsizei count)
>-{
>-    return gl::DrawArrays(mode, first, count);
>-}
>-
>-void GL_APIENTRY glDrawElements(GLenum mode, GLsizei count, GLenum type, const void *indices)
>-{
>-    return gl::DrawElements(mode, count, type, indices);
>-}
>-
>-void GL_APIENTRY glEnable(GLenum cap)
>-{
>-    return gl::Enable(cap);
>-}
>-
>-void GL_APIENTRY glEnableVertexAttribArray(GLuint index)
>-{
>-    return gl::EnableVertexAttribArray(index);
>-}
>-
>-void GL_APIENTRY glFinish(void)
>-{
>-    return gl::Finish();
>-}
>-
>-void GL_APIENTRY glFlush(void)
>-{
>-    return gl::Flush();
>-}
>-
>-void GL_APIENTRY glFramebufferRenderbuffer(GLenum target,
>-                                           GLenum attachment,
>-                                           GLenum renderbuffertarget,
>-                                           GLuint renderbuffer)
>-{
>-    return gl::FramebufferRenderbuffer(target, attachment, renderbuffertarget, renderbuffer);
>-}
>-
>-void GL_APIENTRY glFramebufferTexture2D(GLenum target,
>-                                        GLenum attachment,
>-                                        GLenum textarget,
>-                                        GLuint texture,
>-                                        GLint level)
>-{
>-    return gl::FramebufferTexture2D(target, attachment, textarget, texture, level);
>-}
>-
>-void GL_APIENTRY glFrontFace(GLenum mode)
>-{
>-    return gl::FrontFace(mode);
>-}
>-
>-void GL_APIENTRY glGenBuffers(GLsizei n, GLuint *buffers)
>-{
>-    return gl::GenBuffers(n, buffers);
>-}
>-
>-void GL_APIENTRY glGenerateMipmap(GLenum target)
>-{
>-    return gl::GenerateMipmap(target);
>-}
>-
>-void GL_APIENTRY glGenFramebuffers(GLsizei n, GLuint *framebuffers)
>-{
>-    return gl::GenFramebuffers(n, framebuffers);
>-}
>-
>-void GL_APIENTRY glGenRenderbuffers(GLsizei n, GLuint *renderbuffers)
>-{
>-    return gl::GenRenderbuffers(n, renderbuffers);
>-}
>-
>-void GL_APIENTRY glGenTextures(GLsizei n, GLuint *textures)
>-{
>-    return gl::GenTextures(n, textures);
>-}
>-
>-void GL_APIENTRY glGetActiveAttrib(GLuint program,
>-                                   GLuint index,
>-                                   GLsizei bufsize,
>-                                   GLsizei *length,
>-                                   GLint *size,
>-                                   GLenum *type,
>-                                   GLchar *name)
>-{
>-    return gl::GetActiveAttrib(program, index, bufsize, length, size, type, name);
>-}
>-
>-void GL_APIENTRY glGetActiveUniform(GLuint program,
>-                                    GLuint index,
>-                                    GLsizei bufsize,
>-                                    GLsizei *length,
>-                                    GLint *size,
>-                                    GLenum *type,
>-                                    GLchar *name)
>-{
>-    return gl::GetActiveUniform(program, index, bufsize, length, size, type, name);
>-}
>-
>-void GL_APIENTRY glGetAttachedShaders(GLuint program,
>-                                      GLsizei maxcount,
>-                                      GLsizei *count,
>-                                      GLuint *shaders)
>-{
>-    return gl::GetAttachedShaders(program, maxcount, count, shaders);
>-}
>-
>-GLint GL_APIENTRY glGetAttribLocation(GLuint program, const GLchar *name)
>-{
>-    return gl::GetAttribLocation(program, name);
>-}
>-
>-void GL_APIENTRY glGetBooleanv(GLenum pname, GLboolean *params)
>-{
>-    return gl::GetBooleanv(pname, params);
>-}
>-
>-void GL_APIENTRY glGetBufferParameteriv(GLenum target, GLenum pname, GLint *params)
>-{
>-    return gl::GetBufferParameteriv(target, pname, params);
>-}
>-
>-GLenum GL_APIENTRY glGetError(void)
>-{
>-    return gl::GetError();
>-}
>-
>-void GL_APIENTRY glGetFloatv(GLenum pname, GLfloat *params)
>-{
>-    return gl::GetFloatv(pname, params);
>-}
>-
>-void GL_APIENTRY glGetFramebufferAttachmentParameteriv(GLenum target,
>-                                                       GLenum attachment,
>-                                                       GLenum pname,
>-                                                       GLint *params)
>-{
>-    return gl::GetFramebufferAttachmentParameteriv(target, attachment, pname, params);
>-}
>-
>-void GL_APIENTRY glGetIntegerv(GLenum pname, GLint *params)
>-{
>-    return gl::GetIntegerv(pname, params);
>-}
>-
>-void GL_APIENTRY glGetProgramiv(GLuint program, GLenum pname, GLint *params)
>-{
>-    return gl::GetProgramiv(program, pname, params);
>-}
>-
>-void GL_APIENTRY glGetProgramInfoLog(GLuint program,
>-                                     GLsizei bufsize,
>-                                     GLsizei *length,
>-                                     GLchar *infolog)
>-{
>-    return gl::GetProgramInfoLog(program, bufsize, length, infolog);
>-}
>-
>-void GL_APIENTRY glGetRenderbufferParameteriv(GLenum target, GLenum pname, GLint *params)
>-{
>-    return gl::GetRenderbufferParameteriv(target, pname, params);
>-}
>-
>-void GL_APIENTRY glGetShaderiv(GLuint shader, GLenum pname, GLint *params)
>-{
>-    return gl::GetShaderiv(shader, pname, params);
>-}
>-
>-void GL_APIENTRY glGetShaderInfoLog(GLuint shader,
>-                                    GLsizei bufsize,
>-                                    GLsizei *length,
>-                                    GLchar *infolog)
>-{
>-    return gl::GetShaderInfoLog(shader, bufsize, length, infolog);
>-}
>-
>-void GL_APIENTRY glGetShaderPrecisionFormat(GLenum shadertype,
>-                                            GLenum precisiontype,
>-                                            GLint *range,
>-                                            GLint *precision)
>-{
>-    return gl::GetShaderPrecisionFormat(shadertype, precisiontype, range, precision);
>-}
>-
>-void GL_APIENTRY glGetShaderSource(GLuint shader, GLsizei bufsize, GLsizei *length, GLchar *source)
>-{
>-    return gl::GetShaderSource(shader, bufsize, length, source);
>-}
>-
>-const GLubyte *GL_APIENTRY glGetString(GLenum name)
>-{
>-    return gl::GetString(name);
>-}
>-
>-void GL_APIENTRY glGetTexParameterfv(GLenum target, GLenum pname, GLfloat *params)
>-{
>-    return gl::GetTexParameterfv(target, pname, params);
>-}
>-
>-void GL_APIENTRY glGetTexParameteriv(GLenum target, GLenum pname, GLint *params)
>-{
>-    return gl::GetTexParameteriv(target, pname, params);
>-}
>-
>-void GL_APIENTRY glGetUniformfv(GLuint program, GLint location, GLfloat *params)
>-{
>-    return gl::GetUniformfv(program, location, params);
>-}
>-
>-void GL_APIENTRY glGetUniformiv(GLuint program, GLint location, GLint *params)
>-{
>-    return gl::GetUniformiv(program, location, params);
>-}
>-
>-GLint GL_APIENTRY glGetUniformLocation(GLuint program, const GLchar *name)
>-{
>-    return gl::GetUniformLocation(program, name);
>-}
>-
>-void GL_APIENTRY glGetVertexAttribfv(GLuint index, GLenum pname, GLfloat *params)
>-{
>-    return gl::GetVertexAttribfv(index, pname, params);
>-}
>-
>-void GL_APIENTRY glGetVertexAttribiv(GLuint index, GLenum pname, GLint *params)
>-{
>-    return gl::GetVertexAttribiv(index, pname, params);
>-}
>-
>-void GL_APIENTRY glGetVertexAttribPointerv(GLuint index, GLenum pname, void **pointer)
>-{
>-    return gl::GetVertexAttribPointerv(index, pname, pointer);
>-}
>-
>-void GL_APIENTRY glHint(GLenum target, GLenum mode)
>-{
>-    return gl::Hint(target, mode);
>-}
>-
>-GLboolean GL_APIENTRY glIsBuffer(GLuint buffer)
>-{
>-    return gl::IsBuffer(buffer);
>-}
>-
>-GLboolean GL_APIENTRY glIsEnabled(GLenum cap)
>-{
>-    return gl::IsEnabled(cap);
>-}
>-
>-GLboolean GL_APIENTRY glIsFramebuffer(GLuint framebuffer)
>-{
>-    return gl::IsFramebuffer(framebuffer);
>-}
>-
>-GLboolean GL_APIENTRY glIsProgram(GLuint program)
>-{
>-    return gl::IsProgram(program);
>-}
>-
>-GLboolean GL_APIENTRY glIsRenderbuffer(GLuint renderbuffer)
>-{
>-    return gl::IsRenderbuffer(renderbuffer);
>-}
>-
>-GLboolean GL_APIENTRY glIsShader(GLuint shader)
>-{
>-    return gl::IsShader(shader);
>-}
>-
>-GLboolean GL_APIENTRY glIsTexture(GLuint texture)
>-{
>-    return gl::IsTexture(texture);
>-}
>-
>-void GL_APIENTRY glLineWidth(GLfloat width)
>-{
>-    return gl::LineWidth(width);
>-}
>-
>-void GL_APIENTRY glLinkProgram(GLuint program)
>-{
>-    return gl::LinkProgram(program);
>-}
>-
>-void GL_APIENTRY glPixelStorei(GLenum pname, GLint param)
>-{
>-    return gl::PixelStorei(pname, param);
>-}
>-
>-void GL_APIENTRY glPolygonOffset(GLfloat factor, GLfloat units)
>-{
>-    return gl::PolygonOffset(factor, units);
>-}
>-
>-void GL_APIENTRY glReadPixels(GLint x,
>-                              GLint y,
>-                              GLsizei width,
>-                              GLsizei height,
>-                              GLenum format,
>-                              GLenum type,
>-                              void *pixels)
>-{
>-    return gl::ReadPixels(x, y, width, height, format, type, pixels);
>-}
>-
>-void GL_APIENTRY glReleaseShaderCompiler(void)
>-{
>-    return gl::ReleaseShaderCompiler();
>-}
>-
>-void GL_APIENTRY glRenderbufferStorage(GLenum target,
>-                                       GLenum internalformat,
>-                                       GLsizei width,
>-                                       GLsizei height)
>-{
>-    return gl::RenderbufferStorage(target, internalformat, width, height);
>-}
>-
>-void GL_APIENTRY glSampleCoverage(GLfloat value, GLboolean invert)
>-{
>-    return gl::SampleCoverage(value, invert);
>-}
>-
>-void GL_APIENTRY glScissor(GLint x, GLint y, GLsizei width, GLsizei height)
>-{
>-    return gl::Scissor(x, y, width, height);
>-}
>-
>-void GL_APIENTRY glShaderBinary(GLsizei n,
>-                                const GLuint *shaders,
>-                                GLenum binaryformat,
>-                                const void *binary,
>-                                GLsizei length)
>-{
>-    return gl::ShaderBinary(n, shaders, binaryformat, binary, length);
>-}
>-
>-void GL_APIENTRY glShaderSource(GLuint shader,
>-                                GLsizei count,
>-                                const GLchar *const *string,
>-                                const GLint *length)
>-{
>-    return gl::ShaderSource(shader, count, string, length);
>-}
>-
>-void GL_APIENTRY glStencilFunc(GLenum func, GLint ref, GLuint mask)
>-{
>-    return gl::StencilFunc(func, ref, mask);
>-}
>-
>-void GL_APIENTRY glStencilFuncSeparate(GLenum face, GLenum func, GLint ref, GLuint mask)
>-{
>-    return gl::StencilFuncSeparate(face, func, ref, mask);
>-}
>-
>-void GL_APIENTRY glStencilMask(GLuint mask)
>-{
>-    return gl::StencilMask(mask);
>-}
>-
>-void GL_APIENTRY glStencilMaskSeparate(GLenum face, GLuint mask)
>-{
>-    return gl::StencilMaskSeparate(face, mask);
>-}
>-
>-void GL_APIENTRY glStencilOp(GLenum fail, GLenum zfail, GLenum zpass)
>-{
>-    return gl::StencilOp(fail, zfail, zpass);
>-}
>-
>-void GL_APIENTRY glStencilOpSeparate(GLenum face, GLenum fail, GLenum zfail, GLenum zpass)
>-{
>-    return gl::StencilOpSeparate(face, fail, zfail, zpass);
>-}
>-
>-void GL_APIENTRY glTexImage2D(GLenum target,
>-                              GLint level,
>-                              GLint internalformat,
>-                              GLsizei width,
>-                              GLsizei height,
>-                              GLint border,
>-                              GLenum format,
>-                              GLenum type,
>-                              const void *pixels)
>-{
>-    return gl::TexImage2D(target, level, internalformat, width, height, border, format, type,
>-                          pixels);
>-}
>-
>-void GL_APIENTRY glTexParameterf(GLenum target, GLenum pname, GLfloat param)
>-{
>-    return gl::TexParameterf(target, pname, param);
>-}
>-
>-void GL_APIENTRY glTexParameterfv(GLenum target, GLenum pname, const GLfloat *params)
>-{
>-    return gl::TexParameterfv(target, pname, params);
>-}
>-
>-void GL_APIENTRY glTexParameteri(GLenum target, GLenum pname, GLint param)
>-{
>-    return gl::TexParameteri(target, pname, param);
>-}
>-
>-void GL_APIENTRY glTexParameteriv(GLenum target, GLenum pname, const GLint *params)
>-{
>-    return gl::TexParameteriv(target, pname, params);
>-}
>-
>-void GL_APIENTRY glTexSubImage2D(GLenum target,
>-                                 GLint level,
>-                                 GLint xoffset,
>-                                 GLint yoffset,
>-                                 GLsizei width,
>-                                 GLsizei height,
>-                                 GLenum format,
>-                                 GLenum type,
>-                                 const void *pixels)
>-{
>-    return gl::TexSubImage2D(target, level, xoffset, yoffset, width, height, format, type, pixels);
>-}
>-
>-void GL_APIENTRY glUniform1f(GLint location, GLfloat x)
>-{
>-    return gl::Uniform1f(location, x);
>-}
>-
>-void GL_APIENTRY glUniform1fv(GLint location, GLsizei count, const GLfloat *v)
>-{
>-    return gl::Uniform1fv(location, count, v);
>-}
>-
>-void GL_APIENTRY glUniform1i(GLint location, GLint x)
>-{
>-    return gl::Uniform1i(location, x);
>-}
>-
>-void GL_APIENTRY glUniform1iv(GLint location, GLsizei count, const GLint *v)
>-{
>-    return gl::Uniform1iv(location, count, v);
>-}
>-
>-void GL_APIENTRY glUniform2f(GLint location, GLfloat x, GLfloat y)
>-{
>-    return gl::Uniform2f(location, x, y);
>-}
>-
>-void GL_APIENTRY glUniform2fv(GLint location, GLsizei count, const GLfloat *v)
>-{
>-    return gl::Uniform2fv(location, count, v);
>-}
>-
>-void GL_APIENTRY glUniform2i(GLint location, GLint x, GLint y)
>-{
>-    return gl::Uniform2i(location, x, y);
>-}
>-
>-void GL_APIENTRY glUniform2iv(GLint location, GLsizei count, const GLint *v)
>-{
>-    return gl::Uniform2iv(location, count, v);
>-}
>-
>-void GL_APIENTRY glUniform3f(GLint location, GLfloat x, GLfloat y, GLfloat z)
>-{
>-    return gl::Uniform3f(location, x, y, z);
>-}
>-
>-void GL_APIENTRY glUniform3fv(GLint location, GLsizei count, const GLfloat *v)
>-{
>-    return gl::Uniform3fv(location, count, v);
>-}
>-
>-void GL_APIENTRY glUniform3i(GLint location, GLint x, GLint y, GLint z)
>-{
>-    return gl::Uniform3i(location, x, y, z);
>-}
>-
>-void GL_APIENTRY glUniform3iv(GLint location, GLsizei count, const GLint *v)
>-{
>-    return gl::Uniform3iv(location, count, v);
>-}
>-
>-void GL_APIENTRY glUniform4f(GLint location, GLfloat x, GLfloat y, GLfloat z, GLfloat w)
>-{
>-    return gl::Uniform4f(location, x, y, z, w);
>-}
>-
>-void GL_APIENTRY glUniform4fv(GLint location, GLsizei count, const GLfloat *v)
>-{
>-    return gl::Uniform4fv(location, count, v);
>-}
>-
>-void GL_APIENTRY glUniform4i(GLint location, GLint x, GLint y, GLint z, GLint w)
>-{
>-    return gl::Uniform4i(location, x, y, z, w);
>-}
>-
>-void GL_APIENTRY glUniform4iv(GLint location, GLsizei count, const GLint *v)
>-{
>-    return gl::Uniform4iv(location, count, v);
>-}
>-
>-void GL_APIENTRY glUniformMatrix2fv(GLint location,
>-                                    GLsizei count,
>-                                    GLboolean transpose,
>-                                    const GLfloat *value)
>-{
>-    return gl::UniformMatrix2fv(location, count, transpose, value);
>-}
>-
>-void GL_APIENTRY glUniformMatrix3fv(GLint location,
>-                                    GLsizei count,
>-                                    GLboolean transpose,
>-                                    const GLfloat *value)
>-{
>-    return gl::UniformMatrix3fv(location, count, transpose, value);
>-}
>-
>-void GL_APIENTRY glUniformMatrix4fv(GLint location,
>-                                    GLsizei count,
>-                                    GLboolean transpose,
>-                                    const GLfloat *value)
>-{
>-    return gl::UniformMatrix4fv(location, count, transpose, value);
>-}
>-
>-void GL_APIENTRY glUseProgram(GLuint program)
>-{
>-    return gl::UseProgram(program);
>-}
>-
>-void GL_APIENTRY glValidateProgram(GLuint program)
>-{
>-    return gl::ValidateProgram(program);
>-}
>-
>-void GL_APIENTRY glVertexAttrib1f(GLuint indx, GLfloat x)
>-{
>-    return gl::VertexAttrib1f(indx, x);
>-}
>-
>-void GL_APIENTRY glVertexAttrib1fv(GLuint indx, const GLfloat *values)
>-{
>-    return gl::VertexAttrib1fv(indx, values);
>-}
>-
>-void GL_APIENTRY glVertexAttrib2f(GLuint indx, GLfloat x, GLfloat y)
>-{
>-    return gl::VertexAttrib2f(indx, x, y);
>-}
>-
>-void GL_APIENTRY glVertexAttrib2fv(GLuint indx, const GLfloat *values)
>-{
>-    return gl::VertexAttrib2fv(indx, values);
>-}
>-
>-void GL_APIENTRY glVertexAttrib3f(GLuint indx, GLfloat x, GLfloat y, GLfloat z)
>-{
>-    return gl::VertexAttrib3f(indx, x, y, z);
>-}
>-
>-void GL_APIENTRY glVertexAttrib3fv(GLuint indx, const GLfloat *values)
>-{
>-    return gl::VertexAttrib3fv(indx, values);
>-}
>-
>-void GL_APIENTRY glVertexAttrib4f(GLuint indx, GLfloat x, GLfloat y, GLfloat z, GLfloat w)
>-{
>-    return gl::VertexAttrib4f(indx, x, y, z, w);
>-}
>-
>-void GL_APIENTRY glVertexAttrib4fv(GLuint indx, const GLfloat *values)
>-{
>-    return gl::VertexAttrib4fv(indx, values);
>-}
>-
>-void GL_APIENTRY glVertexAttribPointer(GLuint indx,
>-                                       GLint size,
>-                                       GLenum type,
>-                                       GLboolean normalized,
>-                                       GLsizei stride,
>-                                       const void *ptr)
>-{
>-    return gl::VertexAttribPointer(indx, size, type, normalized, stride, ptr);
>-}
>-
>-void GL_APIENTRY glViewport(GLint x, GLint y, GLsizei width, GLsizei height)
>-{
>-    return gl::Viewport(x, y, width, height);
>-}
>-
>-void GL_APIENTRY glReadBuffer(GLenum mode)
>-{
>-    return gl::ReadBuffer(mode);
>-}
>-
>-void GL_APIENTRY glDrawRangeElements(GLenum mode,
>-                                     GLuint start,
>-                                     GLuint end,
>-                                     GLsizei count,
>-                                     GLenum type,
>-                                     const void *indices)
>-{
>-    return gl::DrawRangeElements(mode, start, end, count, type, indices);
>-}
>-
>-void GL_APIENTRY glTexImage3D(GLenum target,
>-                              GLint level,
>-                              GLint internalformat,
>-                              GLsizei width,
>-                              GLsizei height,
>-                              GLsizei depth,
>-                              GLint border,
>-                              GLenum format,
>-                              GLenum type,
>-                              const void *pixels)
>-{
>-    return gl::TexImage3D(target, level, internalformat, width, height, depth, border, format, type,
>-                          pixels);
>-}
>-
>-void GL_APIENTRY glTexSubImage3D(GLenum target,
>-                                 GLint level,
>-                                 GLint xoffset,
>-                                 GLint yoffset,
>-                                 GLint zoffset,
>-                                 GLsizei width,
>-                                 GLsizei height,
>-                                 GLsizei depth,
>-                                 GLenum format,
>-                                 GLenum type,
>-                                 const void *pixels)
>-{
>-    return gl::TexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format,
>-                             type, pixels);
>-}
>-
>-void GL_APIENTRY glCopyTexSubImage3D(GLenum target,
>-                                     GLint level,
>-                                     GLint xoffset,
>-                                     GLint yoffset,
>-                                     GLint zoffset,
>-                                     GLint x,
>-                                     GLint y,
>-                                     GLsizei width,
>-                                     GLsizei height)
>-{
>-    return gl::CopyTexSubImage3D(target, level, xoffset, yoffset, zoffset, x, y, width, height);
>-}
>-
>-void GL_APIENTRY glCompressedTexImage3D(GLenum target,
>-                                        GLint level,
>-                                        GLenum internalformat,
>-                                        GLsizei width,
>-                                        GLsizei height,
>-                                        GLsizei depth,
>-                                        GLint border,
>-                                        GLsizei imageSize,
>-                                        const void *data)
>-{
>-    return gl::CompressedTexImage3D(target, level, internalformat, width, height, depth, border,
>-                                    imageSize, data);
>-}
>-
>-void GL_APIENTRY glCompressedTexSubImage3D(GLenum target,
>-                                           GLint level,
>-                                           GLint xoffset,
>-                                           GLint yoffset,
>-                                           GLint zoffset,
>-                                           GLsizei width,
>-                                           GLsizei height,
>-                                           GLsizei depth,
>-                                           GLenum format,
>-                                           GLsizei imageSize,
>-                                           const void *data)
>-{
>-    return gl::CompressedTexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height,
>-                                       depth, format, imageSize, data);
>-}
>-
>-void GL_APIENTRY glGenQueries(GLsizei n, GLuint *ids)
>-{
>-    return gl::GenQueries(n, ids);
>-}
>-
>-void GL_APIENTRY glDeleteQueries(GLsizei n, const GLuint *ids)
>-{
>-    return gl::DeleteQueries(n, ids);
>-}
>-
>-GLboolean GL_APIENTRY glIsQuery(GLuint id)
>-{
>-    return gl::IsQuery(id);
>-}
>-
>-void GL_APIENTRY glBeginQuery(GLenum target, GLuint id)
>-{
>-    return gl::BeginQuery(target, id);
>-}
>-
>-void GL_APIENTRY glEndQuery(GLenum target)
>-{
>-    return gl::EndQuery(target);
>-}
>-
>-void GL_APIENTRY glGetQueryiv(GLenum target, GLenum pname, GLint *params)
>-{
>-    return gl::GetQueryiv(target, pname, params);
>-}
>-
>-void GL_APIENTRY glGetQueryObjectuiv(GLuint id, GLenum pname, GLuint *params)
>-{
>-    return gl::GetQueryObjectuiv(id, pname, params);
>-}
>-
>-GLboolean GL_APIENTRY glUnmapBuffer(GLenum target)
>-{
>-    return gl::UnmapBuffer(target);
>-}
>-
>-void GL_APIENTRY glGetBufferPointerv(GLenum target, GLenum pname, void **params)
>-{
>-    return gl::GetBufferPointerv(target, pname, params);
>-}
>-
>-void GL_APIENTRY glDrawBuffers(GLsizei n, const GLenum *bufs)
>-{
>-    return gl::DrawBuffers(n, bufs);
>-}
>-
>-void GL_APIENTRY glUniformMatrix2x3fv(GLint location,
>-                                      GLsizei count,
>-                                      GLboolean transpose,
>-                                      const GLfloat *value)
>-{
>-    return gl::UniformMatrix2x3fv(location, count, transpose, value);
>-}
>-
>-void GL_APIENTRY glUniformMatrix3x2fv(GLint location,
>-                                      GLsizei count,
>-                                      GLboolean transpose,
>-                                      const GLfloat *value)
>-{
>-    return gl::UniformMatrix3x2fv(location, count, transpose, value);
>-}
>-
>-void GL_APIENTRY glUniformMatrix2x4fv(GLint location,
>-                                      GLsizei count,
>-                                      GLboolean transpose,
>-                                      const GLfloat *value)
>-{
>-    return gl::UniformMatrix2x4fv(location, count, transpose, value);
>-}
>-
>-void GL_APIENTRY glUniformMatrix4x2fv(GLint location,
>-                                      GLsizei count,
>-                                      GLboolean transpose,
>-                                      const GLfloat *value)
>-{
>-    return gl::UniformMatrix4x2fv(location, count, transpose, value);
>-}
>-
>-void GL_APIENTRY glUniformMatrix3x4fv(GLint location,
>-                                      GLsizei count,
>-                                      GLboolean transpose,
>-                                      const GLfloat *value)
>-{
>-    return gl::UniformMatrix3x4fv(location, count, transpose, value);
>-}
>-
>-void GL_APIENTRY glUniformMatrix4x3fv(GLint location,
>-                                      GLsizei count,
>-                                      GLboolean transpose,
>-                                      const GLfloat *value)
>-{
>-    return gl::UniformMatrix4x3fv(location, count, transpose, value);
>-}
>-
>-void GL_APIENTRY glBlitFramebuffer(GLint srcX0,
>-                                   GLint srcY0,
>-                                   GLint srcX1,
>-                                   GLint srcY1,
>-                                   GLint dstX0,
>-                                   GLint dstY0,
>-                                   GLint dstX1,
>-                                   GLint dstY1,
>-                                   GLbitfield mask,
>-                                   GLenum filter)
>-{
>-    return gl::BlitFramebuffer(srcX0, srcY0, srcX1, srcY1, dstX0, dstY0, dstX1, dstY1, mask,
>-                               filter);
>-}
>-
>-void GL_APIENTRY glRenderbufferStorageMultisample(GLenum target,
>-                                                  GLsizei samples,
>-                                                  GLenum internalformat,
>-                                                  GLsizei width,
>-                                                  GLsizei height)
>-{
>-    return gl::RenderbufferStorageMultisample(target, samples, internalformat, width, height);
>-}
>-
>-void GL_APIENTRY glFramebufferTextureLayer(GLenum target,
>-                                           GLenum attachment,
>-                                           GLuint texture,
>-                                           GLint level,
>-                                           GLint layer)
>-{
>-    return gl::FramebufferTextureLayer(target, attachment, texture, level, layer);
>-}
>-
>-void *GL_APIENTRY glMapBufferRange(GLenum target,
>-                                   GLintptr offset,
>-                                   GLsizeiptr length,
>-                                   GLbitfield access)
>-{
>-    return gl::MapBufferRange(target, offset, length, access);
>-}
>-
>-void GL_APIENTRY glFlushMappedBufferRange(GLenum target, GLintptr offset, GLsizeiptr length)
>-{
>-    return gl::FlushMappedBufferRange(target, offset, length);
>-}
>-
>-void GL_APIENTRY glBindVertexArray(GLuint array)
>-{
>-    return gl::BindVertexArray(array);
>-}
>-
>-void GL_APIENTRY glDeleteVertexArrays(GLsizei n, const GLuint *arrays)
>-{
>-    return gl::DeleteVertexArrays(n, arrays);
>-}
>-
>-void GL_APIENTRY glGenVertexArrays(GLsizei n, GLuint *arrays)
>-{
>-    return gl::GenVertexArrays(n, arrays);
>-}
>-
>-GLboolean GL_APIENTRY glIsVertexArray(GLuint array)
>-{
>-    return gl::IsVertexArray(array);
>-}
>-
>-void GL_APIENTRY glGetIntegeri_v(GLenum target, GLuint index, GLint *data)
>-{
>-    return gl::GetIntegeri_v(target, index, data);
>-}
>-
>-void GL_APIENTRY glBeginTransformFeedback(GLenum primitiveMode)
>-{
>-    return gl::BeginTransformFeedback(primitiveMode);
>-}
>-
>-void GL_APIENTRY glEndTransformFeedback(void)
>-{
>-    return gl::EndTransformFeedback();
>-}
>-
>-void GL_APIENTRY
>-glBindBufferRange(GLenum target, GLuint index, GLuint buffer, GLintptr offset, GLsizeiptr size)
>-{
>-    return gl::BindBufferRange(target, index, buffer, offset, size);
>-}
>-
>-void GL_APIENTRY glBindBufferBase(GLenum target, GLuint index, GLuint buffer)
>-{
>-    return gl::BindBufferBase(target, index, buffer);
>-}
>-
>-void GL_APIENTRY glTransformFeedbackVaryings(GLuint program,
>-                                             GLsizei count,
>-                                             const GLchar *const *varyings,
>-                                             GLenum bufferMode)
>-{
>-    return gl::TransformFeedbackVaryings(program, count, varyings, bufferMode);
>-}
>-
>-void GL_APIENTRY glGetTransformFeedbackVarying(GLuint program,
>-                                               GLuint index,
>-                                               GLsizei bufSize,
>-                                               GLsizei *length,
>-                                               GLsizei *size,
>-                                               GLenum *type,
>-                                               GLchar *name)
>-{
>-    return gl::GetTransformFeedbackVarying(program, index, bufSize, length, size, type, name);
>-}
>-
>-void GL_APIENTRY
>-glVertexAttribIPointer(GLuint index, GLint size, GLenum type, GLsizei stride, const void *pointer)
>-{
>-    return gl::VertexAttribIPointer(index, size, type, stride, pointer);
>-}
>-
>-void GL_APIENTRY glGetVertexAttribIiv(GLuint index, GLenum pname, GLint *params)
>-{
>-    return gl::GetVertexAttribIiv(index, pname, params);
>-}
>-
>-void GL_APIENTRY glGetVertexAttribIuiv(GLuint index, GLenum pname, GLuint *params)
>-{
>-    return gl::GetVertexAttribIuiv(index, pname, params);
>-}
>-
>-void GL_APIENTRY glVertexAttribI4i(GLuint index, GLint x, GLint y, GLint z, GLint w)
>-{
>-    return gl::VertexAttribI4i(index, x, y, z, w);
>-}
>-
>-void GL_APIENTRY glVertexAttribI4ui(GLuint index, GLuint x, GLuint y, GLuint z, GLuint w)
>-{
>-    return gl::VertexAttribI4ui(index, x, y, z, w);
>-}
>-
>-void GL_APIENTRY glVertexAttribI4iv(GLuint index, const GLint *v)
>-{
>-    return gl::VertexAttribI4iv(index, v);
>-}
>-
>-void GL_APIENTRY glVertexAttribI4uiv(GLuint index, const GLuint *v)
>-{
>-    return gl::VertexAttribI4uiv(index, v);
>-}
>-
>-void GL_APIENTRY glGetUniformuiv(GLuint program, GLint location, GLuint *params)
>-{
>-    return gl::GetUniformuiv(program, location, params);
>-}
>-
>-GLint GL_APIENTRY glGetFragDataLocation(GLuint program, const GLchar *name)
>-{
>-    return gl::GetFragDataLocation(program, name);
>-}
>-
>-void GL_APIENTRY glUniform1ui(GLint location, GLuint v0)
>-{
>-    return gl::Uniform1ui(location, v0);
>-}
>-
>-void GL_APIENTRY glUniform2ui(GLint location, GLuint v0, GLuint v1)
>-{
>-    return gl::Uniform2ui(location, v0, v1);
>-}
>-
>-void GL_APIENTRY glUniform3ui(GLint location, GLuint v0, GLuint v1, GLuint v2)
>-{
>-    return gl::Uniform3ui(location, v0, v1, v2);
>-}
>-
>-void GL_APIENTRY glUniform4ui(GLint location, GLuint v0, GLuint v1, GLuint v2, GLuint v3)
>-{
>-    return gl::Uniform4ui(location, v0, v1, v2, v3);
>-}
>-
>-void GL_APIENTRY glUniform1uiv(GLint location, GLsizei count, const GLuint *value)
>-{
>-    return gl::Uniform1uiv(location, count, value);
>-}
>-
>-void GL_APIENTRY glUniform2uiv(GLint location, GLsizei count, const GLuint *value)
>-{
>-    return gl::Uniform2uiv(location, count, value);
>-}
>-
>-void GL_APIENTRY glUniform3uiv(GLint location, GLsizei count, const GLuint *value)
>-{
>-    return gl::Uniform3uiv(location, count, value);
>-}
>-
>-void GL_APIENTRY glUniform4uiv(GLint location, GLsizei count, const GLuint *value)
>-{
>-    return gl::Uniform4uiv(location, count, value);
>-}
>-
>-void GL_APIENTRY glClearBufferiv(GLenum buffer, GLint drawbuffer, const GLint *value)
>-{
>-    return gl::ClearBufferiv(buffer, drawbuffer, value);
>-}
>-
>-void GL_APIENTRY glClearBufferuiv(GLenum buffer, GLint drawbuffer, const GLuint *value)
>-{
>-    return gl::ClearBufferuiv(buffer, drawbuffer, value);
>-}
>-
>-void GL_APIENTRY glClearBufferfv(GLenum buffer, GLint drawbuffer, const GLfloat *value)
>-{
>-    return gl::ClearBufferfv(buffer, drawbuffer, value);
>-}
>-
>-void GL_APIENTRY glClearBufferfi(GLenum buffer, GLint drawbuffer, GLfloat depth, GLint stencil)
>-{
>-    return gl::ClearBufferfi(buffer, drawbuffer, depth, stencil);
>-}
>-
>-const GLubyte *GL_APIENTRY glGetStringi(GLenum name, GLuint index)
>-{
>-    return gl::GetStringi(name, index);
>-}
>-
>-void GL_APIENTRY glCopyBufferSubData(GLenum readTarget,
>-                                     GLenum writeTarget,
>-                                     GLintptr readOffset,
>-                                     GLintptr writeOffset,
>-                                     GLsizeiptr size)
>-{
>-    return gl::CopyBufferSubData(readTarget, writeTarget, readOffset, writeOffset, size);
>-}
>-
>-void GL_APIENTRY glGetUniformIndices(GLuint program,
>-                                     GLsizei uniformCount,
>-                                     const GLchar *const *uniformNames,
>-                                     GLuint *uniformIndices)
>-{
>-    return gl::GetUniformIndices(program, uniformCount, uniformNames, uniformIndices);
>-}
>-
>-void GL_APIENTRY glGetActiveUniformsiv(GLuint program,
>-                                       GLsizei uniformCount,
>-                                       const GLuint *uniformIndices,
>-                                       GLenum pname,
>-                                       GLint *params)
>-{
>-    return gl::GetActiveUniformsiv(program, uniformCount, uniformIndices, pname, params);
>-}
>-
>-GLuint GL_APIENTRY glGetUniformBlockIndex(GLuint program, const GLchar *uniformBlockName)
>-{
>-    return gl::GetUniformBlockIndex(program, uniformBlockName);
>-}
>-
>-void GL_APIENTRY glGetActiveUniformBlockiv(GLuint program,
>-                                           GLuint uniformBlockIndex,
>-                                           GLenum pname,
>-                                           GLint *params)
>-{
>-    return gl::GetActiveUniformBlockiv(program, uniformBlockIndex, pname, params);
>-}
>-
>-void GL_APIENTRY glGetActiveUniformBlockName(GLuint program,
>-                                             GLuint uniformBlockIndex,
>-                                             GLsizei bufSize,
>-                                             GLsizei *length,
>-                                             GLchar *uniformBlockName)
>-{
>-    return gl::GetActiveUniformBlockName(program, uniformBlockIndex, bufSize, length,
>-                                         uniformBlockName);
>-}
>-
>-void GL_APIENTRY glUniformBlockBinding(GLuint program,
>-                                       GLuint uniformBlockIndex,
>-                                       GLuint uniformBlockBinding)
>-{
>-    return gl::UniformBlockBinding(program, uniformBlockIndex, uniformBlockBinding);
>-}
>-
>-void GL_APIENTRY glDrawArraysInstanced(GLenum mode,
>-                                       GLint first,
>-                                       GLsizei count,
>-                                       GLsizei instanceCount)
>-{
>-    return gl::DrawArraysInstanced(mode, first, count, instanceCount);
>-}
>-
>-void GL_APIENTRY glDrawElementsInstanced(GLenum mode,
>-                                         GLsizei count,
>-                                         GLenum type,
>-                                         const void *indices,
>-                                         GLsizei instanceCount)
>-{
>-    return gl::DrawElementsInstanced(mode, count, type, indices, instanceCount);
>-}
>-
>-GLsync GL_APIENTRY glFenceSync(GLenum condition, GLbitfield flags)
>-{
>-    return gl::FenceSync(condition, flags);
>-}
>-
>-GLboolean GL_APIENTRY glIsSync(GLsync sync)
>-{
>-    return gl::IsSync(sync);
>-}
>-
>-void GL_APIENTRY glDeleteSync(GLsync sync)
>-{
>-    return gl::DeleteSync(sync);
>-}
>-
>-GLenum GL_APIENTRY glClientWaitSync(GLsync sync, GLbitfield flags, GLuint64 timeout)
>-{
>-    return gl::ClientWaitSync(sync, flags, timeout);
>-}
>-
>-void GL_APIENTRY glWaitSync(GLsync sync, GLbitfield flags, GLuint64 timeout)
>-{
>-    return gl::WaitSync(sync, flags, timeout);
>-}
>-
>-void GL_APIENTRY glGetInteger64v(GLenum pname, GLint64 *params)
>-{
>-    return gl::GetInteger64v(pname, params);
>-}
>-
>-void GL_APIENTRY
>-glGetSynciv(GLsync sync, GLenum pname, GLsizei bufSize, GLsizei *length, GLint *values)
>-{
>-    return gl::GetSynciv(sync, pname, bufSize, length, values);
>-}
>-
>-void GL_APIENTRY glGetInteger64i_v(GLenum target, GLuint index, GLint64 *data)
>-{
>-    return gl::GetInteger64i_v(target, index, data);
>-}
>-
>-void GL_APIENTRY glGetBufferParameteri64v(GLenum target, GLenum pname, GLint64 *params)
>-{
>-    return gl::GetBufferParameteri64v(target, pname, params);
>-}
>-
>-void GL_APIENTRY glGenSamplers(GLsizei count, GLuint *samplers)
>-{
>-    return gl::GenSamplers(count, samplers);
>-}
>-
>-void GL_APIENTRY glDeleteSamplers(GLsizei count, const GLuint *samplers)
>-{
>-    return gl::DeleteSamplers(count, samplers);
>-}
>-
>-GLboolean GL_APIENTRY glIsSampler(GLuint sampler)
>-{
>-    return gl::IsSampler(sampler);
>-}
>-
>-void GL_APIENTRY glBindSampler(GLuint unit, GLuint sampler)
>-{
>-    return gl::BindSampler(unit, sampler);
>-}
>-
>-void GL_APIENTRY glSamplerParameteri(GLuint sampler, GLenum pname, GLint param)
>-{
>-    return gl::SamplerParameteri(sampler, pname, param);
>-}
>-
>-void GL_APIENTRY glSamplerParameteriv(GLuint sampler, GLenum pname, const GLint *param)
>-{
>-    return gl::SamplerParameteriv(sampler, pname, param);
>-}
>-
>-void GL_APIENTRY glSamplerParameterf(GLuint sampler, GLenum pname, GLfloat param)
>-{
>-    return gl::SamplerParameterf(sampler, pname, param);
>-}
>-
>-void GL_APIENTRY glSamplerParameterfv(GLuint sampler, GLenum pname, const GLfloat *param)
>-{
>-    return gl::SamplerParameterfv(sampler, pname, param);
>-}
>-
>-void GL_APIENTRY glGetSamplerParameteriv(GLuint sampler, GLenum pname, GLint *params)
>-{
>-    return gl::GetSamplerParameteriv(sampler, pname, params);
>-}
>-
>-void GL_APIENTRY glGetSamplerParameterfv(GLuint sampler, GLenum pname, GLfloat *params)
>-{
>-    return gl::GetSamplerParameterfv(sampler, pname, params);
>-}
>-
>-void GL_APIENTRY glVertexAttribDivisor(GLuint index, GLuint divisor)
>-{
>-    return gl::VertexAttribDivisor(index, divisor);
>-}
>-
>-void GL_APIENTRY glBindTransformFeedback(GLenum target, GLuint id)
>-{
>-    return gl::BindTransformFeedback(target, id);
>-}
>-
>-void GL_APIENTRY glDeleteTransformFeedbacks(GLsizei n, const GLuint *ids)
>-{
>-    return gl::DeleteTransformFeedbacks(n, ids);
>-}
>-
>-void GL_APIENTRY glGenTransformFeedbacks(GLsizei n, GLuint *ids)
>-{
>-    return gl::GenTransformFeedbacks(n, ids);
>-}
>-
>-GLboolean GL_APIENTRY glIsTransformFeedback(GLuint id)
>-{
>-    return gl::IsTransformFeedback(id);
>-}
>-
>-void GL_APIENTRY glPauseTransformFeedback(void)
>-{
>-    return gl::PauseTransformFeedback();
>-}
>-
>-void GL_APIENTRY glResumeTransformFeedback(void)
>-{
>-    return gl::ResumeTransformFeedback();
>-}
>-
>-void GL_APIENTRY glGetProgramBinary(GLuint program,
>-                                    GLsizei bufSize,
>-                                    GLsizei *length,
>-                                    GLenum *binaryFormat,
>-                                    void *binary)
>-{
>-    return gl::GetProgramBinary(program, bufSize, length, binaryFormat, binary);
>-}
>-
>-void GL_APIENTRY glProgramBinary(GLuint program,
>-                                 GLenum binaryFormat,
>-                                 const void *binary,
>-                                 GLsizei length)
>-{
>-    return gl::ProgramBinary(program, binaryFormat, binary, length);
>-}
>-
>-void GL_APIENTRY glProgramParameteri(GLuint program, GLenum pname, GLint value)
>-{
>-    return gl::ProgramParameteri(program, pname, value);
>-}
>-
>-void GL_APIENTRY glInvalidateFramebuffer(GLenum target,
>-                                         GLsizei numAttachments,
>-                                         const GLenum *attachments)
>-{
>-    return gl::InvalidateFramebuffer(target, numAttachments, attachments);
>-}
>-
>-void GL_APIENTRY glInvalidateSubFramebuffer(GLenum target,
>-                                            GLsizei numAttachments,
>-                                            const GLenum *attachments,
>-                                            GLint x,
>-                                            GLint y,
>-                                            GLsizei width,
>-                                            GLsizei height)
>-{
>-    return gl::InvalidateSubFramebuffer(target, numAttachments, attachments, x, y, width, height);
>-}
>-
>-void GL_APIENTRY
>-glTexStorage2D(GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height)
>-{
>-    return gl::TexStorage2D(target, levels, internalformat, width, height);
>-}
>-
>-void GL_APIENTRY glTexStorage3D(GLenum target,
>-                                GLsizei levels,
>-                                GLenum internalformat,
>-                                GLsizei width,
>-                                GLsizei height,
>-                                GLsizei depth)
>-{
>-    return gl::TexStorage3D(target, levels, internalformat, width, height, depth);
>-}
>-
>-void GL_APIENTRY glGetInternalformativ(GLenum target,
>-                                       GLenum internalformat,
>-                                       GLenum pname,
>-                                       GLsizei bufSize,
>-                                       GLint *params)
>-{
>-    return gl::GetInternalformativ(target, internalformat, pname, bufSize, params);
>-}
>-
>-void GL_APIENTRY glBlitFramebufferANGLE(GLint srcX0,
>-                                        GLint srcY0,
>-                                        GLint srcX1,
>-                                        GLint srcY1,
>-                                        GLint dstX0,
>-                                        GLint dstY0,
>-                                        GLint dstX1,
>-                                        GLint dstY1,
>-                                        GLbitfield mask,
>-                                        GLenum filter)
>-{
>-    return gl::BlitFramebufferANGLE(srcX0, srcY0, srcX1, srcY1, dstX0, dstY0, dstX1, dstY1, mask,
>-                                    filter);
>-}
>-
>-void GL_APIENTRY glRenderbufferStorageMultisampleANGLE(GLenum target,
>-                                                       GLsizei samples,
>-                                                       GLenum internalformat,
>-                                                       GLsizei width,
>-                                                       GLsizei height)
>-{
>-    return gl::RenderbufferStorageMultisampleANGLE(target, samples, internalformat, width, height);
>-}
>-
>-void GL_APIENTRY glDiscardFramebufferEXT(GLenum target,
>-                                         GLsizei numAttachments,
>-                                         const GLenum *attachments)
>-{
>-    return gl::DiscardFramebufferEXT(target, numAttachments, attachments);
>-}
>-
>-void GL_APIENTRY glDeleteFencesNV(GLsizei n, const GLuint *fences)
>-{
>-    return gl::DeleteFencesNV(n, fences);
>-}
>-
>-void GL_APIENTRY glGenFencesNV(GLsizei n, GLuint *fences)
>-{
>-    return gl::GenFencesNV(n, fences);
>-}
>-
>-GLboolean GL_APIENTRY glIsFenceNV(GLuint fence)
>-{
>-    return gl::IsFenceNV(fence);
>-}
>-
>-GLboolean GL_APIENTRY glTestFenceNV(GLuint fence)
>-{
>-    return gl::TestFenceNV(fence);
>-}
>-
>-void GL_APIENTRY glGetFenceivNV(GLuint fence, GLenum pname, GLint *params)
>-{
>-    return gl::GetFenceivNV(fence, pname, params);
>-}
>-
>-void GL_APIENTRY glFinishFenceNV(GLuint fence)
>-{
>-    return gl::FinishFenceNV(fence);
>-}
>-
>-void GL_APIENTRY glSetFenceNV(GLuint fence, GLenum condition)
>-{
>-    return gl::SetFenceNV(fence, condition);
>-}
>-
>-void GL_APIENTRY glGetTranslatedShaderSourceANGLE(GLuint shader,
>-                                                  GLsizei bufsize,
>-                                                  GLsizei *length,
>-                                                  GLchar *source)
>-{
>-    return gl::GetTranslatedShaderSourceANGLE(shader, bufsize, length, source);
>-}
>-
>-void GL_APIENTRY glTexStorage2DEXT(GLenum target,
>-                                   GLsizei levels,
>-                                   GLenum internalformat,
>-                                   GLsizei width,
>-                                   GLsizei height)
>-{
>-    return gl::TexStorage2DEXT(target, levels, internalformat, width, height);
>-}
>-
>-GLenum GL_APIENTRY glGetGraphicsResetStatusEXT(void)
>-{
>-    return gl::GetGraphicsResetStatusEXT();
>-}
>-
>-void GL_APIENTRY glReadnPixelsEXT(GLint x,
>-                                  GLint y,
>-                                  GLsizei width,
>-                                  GLsizei height,
>-                                  GLenum format,
>-                                  GLenum type,
>-                                  GLsizei bufSize,
>-                                  void *data)
>-{
>-    return gl::ReadnPixelsEXT(x, y, width, height, format, type, bufSize, data);
>-}
>-
>-void GL_APIENTRY glGetnUniformfvEXT(GLuint program, GLint location, GLsizei bufSize, float *params)
>-{
>-    return gl::GetnUniformfvEXT(program, location, bufSize, params);
>-}
>-
>-void GL_APIENTRY glGetnUniformivEXT(GLuint program, GLint location, GLsizei bufSize, GLint *params)
>-{
>-    return gl::GetnUniformivEXT(program, location, bufSize, params);
>-}
>-
>-void GL_APIENTRY glGenQueriesEXT(GLsizei n, GLuint *ids)
>-{
>-    return gl::GenQueriesEXT(n, ids);
>-}
>-
>-void GL_APIENTRY glDeleteQueriesEXT(GLsizei n, const GLuint *ids)
>-{
>-    return gl::DeleteQueriesEXT(n, ids);
>-}
>-
>-GLboolean GL_APIENTRY glIsQueryEXT(GLuint id)
>-{
>-    return gl::IsQueryEXT(id);
>-}
>-
>-void GL_APIENTRY glBeginQueryEXT(GLenum target, GLuint id)
>-{
>-    return gl::BeginQueryEXT(target, id);
>-}
>-
>-void GL_APIENTRY glEndQueryEXT(GLenum target)
>-{
>-    return gl::EndQueryEXT(target);
>-}
>-
>-void GL_APIENTRY glQueryCounterEXT(GLuint id, GLenum target)
>-{
>-    return gl::QueryCounterEXT(id, target);
>-}
>-
>-void GL_APIENTRY glGetQueryivEXT(GLenum target, GLenum pname, GLint *params)
>-{
>-    return gl::GetQueryivEXT(target, pname, params);
>-}
>-
>-void GL_APIENTRY glGetQueryObjectivEXT(GLuint id, GLenum pname, GLint *params)
>-{
>-    return gl::GetQueryObjectivEXT(id, pname, params);
>-}
>-
>-void GL_APIENTRY glGetQueryObjectuivEXT(GLuint id, GLenum pname, GLuint *params)
>-{
>-    return gl::GetQueryObjectuivEXT(id, pname, params);
>-}
>-
>-void GL_APIENTRY glGetQueryObjecti64vEXT(GLuint id, GLenum pname, GLint64 *params)
>-{
>-    return gl::GetQueryObjecti64vEXT(id, pname, params);
>-}
>-
>-void GL_APIENTRY glGetQueryObjectui64vEXT(GLuint id, GLenum pname, GLuint64 *params)
>-{
>-    return gl::GetQueryObjectui64vEXT(id, pname, params);
>-}
>-
>-void GL_APIENTRY glDrawBuffersEXT(GLsizei n, const GLenum *bufs)
>-{
>-    return gl::DrawBuffersEXT(n, bufs);
>-}
>-
>-void GL_APIENTRY glDrawArraysInstancedANGLE(GLenum mode,
>-                                            GLint first,
>-                                            GLsizei count,
>-                                            GLsizei primcount)
>-{
>-    return gl::DrawArraysInstancedANGLE(mode, first, count, primcount);
>-}
>-
>-void GL_APIENTRY glDrawElementsInstancedANGLE(GLenum mode,
>-                                              GLsizei count,
>-                                              GLenum type,
>-                                              const void *indices,
>-                                              GLsizei primcount)
>-{
>-    return gl::DrawElementsInstancedANGLE(mode, count, type, indices, primcount);
>-}
>-
>-void GL_APIENTRY glVertexAttribDivisorANGLE(GLuint index, GLuint divisor)
>-{
>-    return gl::VertexAttribDivisorANGLE(index, divisor);
>-}
>-
>-void GL_APIENTRY glGetProgramBinaryOES(GLuint program,
>-                                       GLsizei bufSize,
>-                                       GLsizei *length,
>-                                       GLenum *binaryFormat,
>-                                       void *binary)
>-{
>-    return gl::GetProgramBinaryOES(program, bufSize, length, binaryFormat, binary);
>-}
>-
>-void GL_APIENTRY glProgramBinaryOES(GLuint program,
>-                                    GLenum binaryFormat,
>-                                    const void *binary,
>-                                    GLint length)
>-{
>-    return gl::ProgramBinaryOES(program, binaryFormat, binary, length);
>-}
>-
>-void *GL_APIENTRY glMapBufferOES(GLenum target, GLenum access)
>-{
>-    return gl::MapBufferOES(target, access);
>-}
>-
>-GLboolean GL_APIENTRY glUnmapBufferOES(GLenum target)
>-{
>-    return gl::UnmapBufferOES(target);
>-}
>-
>-void GL_APIENTRY glGetBufferPointervOES(GLenum target, GLenum pname, void **params)
>-{
>-    return gl::GetBufferPointervOES(target, pname, params);
>-}
>-
>-void *GL_APIENTRY glMapBufferRangeEXT(GLenum target,
>-                                      GLintptr offset,
>-                                      GLsizeiptr length,
>-                                      GLbitfield access)
>-{
>-    return gl::MapBufferRangeEXT(target, offset, length, access);
>-}
>-
>-void GL_APIENTRY glFlushMappedBufferRangeEXT(GLenum target, GLintptr offset, GLsizeiptr length)
>-{
>-    return gl::FlushMappedBufferRangeEXT(target, offset, length);
>-}
>-
>-void GL_APIENTRY glInsertEventMarkerEXT(GLsizei length, const char *marker)
>-{
>-    return gl::InsertEventMarkerEXT(length, marker);
>-}
>-
>-void GL_APIENTRY glPushGroupMarkerEXT(GLsizei length, const char *marker)
>-{
>-    return gl::PushGroupMarkerEXT(length, marker);
>-}
>-
>-void GL_APIENTRY glPopGroupMarkerEXT()
>-{
>-    return gl::PopGroupMarkerEXT();
>-}
>-
>-void GL_APIENTRY glEGLImageTargetTexture2DOES(GLenum target, GLeglImageOES image)
>-{
>-    return gl::EGLImageTargetTexture2DOES(target, image);
>-}
>-
>-void GL_APIENTRY glEGLImageTargetRenderbufferStorageOES(GLenum target, GLeglImageOES image)
>-{
>-    return gl::EGLImageTargetRenderbufferStorageOES(target, image);
>-}
>-
>-void GL_APIENTRY glBindVertexArrayOES(GLuint array)
>-{
>-    return gl::BindVertexArrayOES(array);
>-}
>-
>-void GL_APIENTRY glDeleteVertexArraysOES(GLsizei n, const GLuint *arrays)
>-{
>-    return gl::DeleteVertexArraysOES(n, arrays);
>-}
>-
>-void GL_APIENTRY glGenVertexArraysOES(GLsizei n, GLuint *arrays)
>-{
>-    return gl::GenVertexArraysOES(n, arrays);
>-}
>-
>-GLboolean GL_APIENTRY glIsVertexArrayOES(GLuint array)
>-{
>-    return gl::IsVertexArrayOES(array);
>-}
>-
>-void GL_APIENTRY glDebugMessageControlKHR(GLenum source,
>-                                          GLenum type,
>-                                          GLenum severity,
>-                                          GLsizei count,
>-                                          const GLuint *ids,
>-                                          GLboolean enabled)
>-{
>-    return gl::DebugMessageControlKHR(source, type, severity, count, ids, enabled);
>-}
>-
>-void GL_APIENTRY glDebugMessageInsertKHR(GLenum source,
>-                                         GLenum type,
>-                                         GLuint id,
>-                                         GLenum severity,
>-                                         GLsizei length,
>-                                         const GLchar *buf)
>-{
>-    return gl::DebugMessageInsertKHR(source, type, id, severity, length, buf);
>-}
>-
>-void GL_APIENTRY glDebugMessageCallbackKHR(GLDEBUGPROCKHR callback, const void *userParam)
>-{
>-    return gl::DebugMessageCallbackKHR(callback, userParam);
>-}
>-
>-GLuint GL_APIENTRY glGetDebugMessageLogKHR(GLuint count,
>-                                           GLsizei bufSize,
>-                                           GLenum *sources,
>-                                           GLenum *types,
>-                                           GLuint *ids,
>-                                           GLenum *severities,
>-                                           GLsizei *lengths,
>-                                           GLchar *messageLog)
>-{
>-    return gl::GetDebugMessageLogKHR(count, bufSize, sources, types, ids, severities, lengths,
>-                                     messageLog);
>-}
>-
>-void GL_APIENTRY glPushDebugGroupKHR(GLenum source,
>-                                     GLuint id,
>-                                     GLsizei length,
>-                                     const GLchar *message)
>-{
>-    return gl::PushDebugGroupKHR(source, id, length, message);
>-}
>-
>-void GL_APIENTRY glPopDebugGroupKHR(void)
>-{
>-    return gl::PopDebugGroupKHR();
>-}
>-
>-void GL_APIENTRY glObjectLabelKHR(GLenum identifier,
>-                                  GLuint name,
>-                                  GLsizei length,
>-                                  const GLchar *label)
>-{
>-    return gl::ObjectLabelKHR(identifier, name, length, label);
>-}
>-
>-void GL_APIENTRY
>-glGetObjectLabelKHR(GLenum identifier, GLuint name, GLsizei bufSize, GLsizei *length, GLchar *label)
>-{
>-    return gl::GetObjectLabelKHR(identifier, name, bufSize, length, label);
>-}
>-
>-void GL_APIENTRY glObjectPtrLabelKHR(const void *ptr, GLsizei length, const GLchar *label)
>-{
>-    return gl::ObjectPtrLabelKHR(ptr, length, label);
>-}
>-
>-void GL_APIENTRY glGetObjectPtrLabelKHR(const void *ptr,
>-                                        GLsizei bufSize,
>-                                        GLsizei *length,
>-                                        GLchar *label)
>-{
>-    return gl::GetObjectPtrLabelKHR(ptr, bufSize, length, label);
>-}
>-
>-void GL_APIENTRY glGetPointervKHR(GLenum pname, void **params)
>-{
>-    return gl::GetPointervKHR(pname, params);
>-}
>-
>-void GL_APIENTRY glBindUniformLocationCHROMIUM(GLuint program, GLint location, const GLchar *name)
>-{
>-    return gl::BindUniformLocationCHROMIUM(program, location, name);
>-}
>-
>-void GL_APIENTRY glCoverageModulationCHROMIUM(GLenum components)
>-{
>-    return gl::CoverageModulationCHROMIUM(components);
>-}
>-
>-// CHROMIUM_path_rendendering
>-void GL_APIENTRY glMatrixLoadfCHROMIUM(GLenum matrixMode, const GLfloat *matrix)
>-{
>-    gl::MatrixLoadfCHROMIUM(matrixMode, matrix);
>-}
>-
>-void GL_APIENTRY glMatrixLoadIdentityCHROMIUM(GLenum matrixMode)
>-{
>-    gl::MatrixLoadIdentityCHROMIUM(matrixMode);
>-}
>-
>-GLuint GL_APIENTRY glGenPathsCHROMIUM(GLsizei range)
>-{
>-    return gl::GenPathsCHROMIUM(range);
>-}
>-
>-void GL_APIENTRY glDeletePathsCHROMIUM(GLuint first, GLsizei range)
>-{
>-    gl::DeletePathsCHROMIUM(first, range);
>-}
>-
>-GLboolean GL_APIENTRY glIsPathCHROMIUM(GLuint path)
>-{
>-    return gl::IsPathCHROMIUM(path);
>-}
>-
>-void GL_APIENTRY glPathCommandsCHROMIUM(GLuint path,
>-                                        GLsizei numCommands,
>-                                        const GLubyte *commands,
>-                                        GLsizei numCoords,
>-                                        GLenum coordType,
>-                                        const void *coords)
>-{
>-    gl::PathCommandsCHROMIUM(path, numCommands, commands, numCoords, coordType, coords);
>-}
>-
>-void GL_APIENTRY glPathParameterfCHROMIUM(GLuint path, GLenum pname, GLfloat value)
>-{
>-    gl::PathParameterfCHROMIUM(path, pname, value);
>-}
>-
>-void GL_APIENTRY glPathParameteriCHROMIUM(GLuint path, GLenum pname, GLint value)
>-{
>-    gl::PathParameteriCHROMIUM(path, pname, value);
>-}
>-
>-void GL_APIENTRY glGetPathParameterfvCHROMIUM(GLuint path, GLenum pname, GLfloat *value)
>-{
>-    gl::GetPathParameterfCHROMIUM(path, pname, value);
>-}
>-
>-void GL_APIENTRY glGetPathParameterivCHROMIUM(GLuint path, GLenum pname, GLint *value)
>-{
>-    gl::GetPathParameteriCHROMIUM(path, pname, value);
>-}
>-
>-void GL_APIENTRY glPathStencilFuncCHROMIUM(GLenum func, GLint ref, GLuint mask)
>-{
>-    gl::PathStencilFuncCHROMIUM(func, ref, mask);
>-}
>-
>-void GL_APIENTRY glStencilFillPathCHROMIUM(GLuint path, GLenum fillMode, GLuint mask)
>-{
>-    gl::StencilFillPathCHROMIUM(path, fillMode, mask);
>-}
>-
>-void GL_APIENTRY glStencilStrokePathCHROMIUM(GLuint path, GLint reference, GLuint mask)
>-{
>-    gl::StencilStrokePathCHROMIUM(path, reference, mask);
>-}
>-
>-void GL_APIENTRY glCoverFillPathCHROMIUM(GLuint path, GLenum coverMode)
>-{
>-    gl::CoverFillPathCHROMIUM(path, coverMode);
>-}
>-
>-void GL_APIENTRY glCoverStrokePathCHROMIUM(GLuint path, GLenum coverMode)
>-{
>-    gl::CoverStrokePathCHROMIUM(path, coverMode);
>-}
>-
>-void GL_APIENTRY glStencilThenCoverFillPathCHROMIUM(GLuint path,
>-                                                    GLenum fillMode,
>-                                                    GLuint mask,
>-                                                    GLenum coverMode)
>-{
>-    gl::StencilThenCoverFillPathCHROMIUM(path, fillMode, mask, coverMode);
>-}
>-
>-void GL_APIENTRY glStencilThenCoverStrokePathCHROMIUM(GLuint path,
>-                                                      GLint reference,
>-                                                      GLuint mask,
>-                                                      GLenum coverMode)
>-{
>-    gl::StencilThenCoverStrokePathCHROMIUM(path, reference, mask, coverMode);
>-}
>-
>-void GL_APIENTRY glCoverFillPathInstancedCHROMIUM(GLsizei numPaths,
>-                                                  GLenum pathNameType,
>-                                                  const void *paths,
>-                                                  GLuint pathBase,
>-                                                  GLenum coverMode,
>-                                                  GLenum transformType,
>-                                                  const GLfloat *transformValues)
>-{
>-    gl::CoverFillPathInstancedCHROMIUM(numPaths, pathNameType, paths, pathBase, coverMode,
>-                                       transformType, transformValues);
>-}
>-
>-void GL_APIENTRY glCoverStrokePathInstancedCHROMIUM(GLsizei numPaths,
>-                                                    GLenum pathNameType,
>-                                                    const void *paths,
>-                                                    GLuint pathBase,
>-                                                    GLenum coverMode,
>-                                                    GLenum transformType,
>-                                                    const GLfloat *transformValues)
>-{
>-    gl::CoverStrokePathInstancedCHROMIUM(numPaths, pathNameType, paths, pathBase, coverMode,
>-                                         transformType, transformValues);
>-}
>-
>-void GL_APIENTRY glStencilFillPathInstancedCHROMIUM(GLsizei numPaths,
>-                                                    GLenum pathNameType,
>-                                                    const void *paths,
>-                                                    GLuint pathBase,
>-                                                    GLenum fillMode,
>-                                                    GLuint mask,
>-                                                    GLenum transformType,
>-                                                    const GLfloat *transformValues)
>-{
>-    gl::StencilFillPathInstancedCHROMIUM(numPaths, pathNameType, paths, pathBase, fillMode, mask,
>-                                         transformType, transformValues);
>-}
>-
>-void GL_APIENTRY glStencilStrokePathInstancedCHROMIUM(GLsizei numPaths,
>-                                                      GLenum pathNameType,
>-                                                      const void *paths,
>-                                                      GLuint pathBase,
>-                                                      GLint reference,
>-                                                      GLuint mask,
>-                                                      GLenum transformType,
>-                                                      const GLfloat *transformValues)
>-{
>-    gl::StencilStrokePathInstancedCHROMIUM(numPaths, pathNameType, paths, pathBase, reference, mask,
>-                                           transformType, transformValues);
>-}
>-
>-void GL_APIENTRY glStencilThenCoverFillPathInstancedCHROMIUM(GLsizei numPaths,
>-                                                             GLenum pathNameType,
>-                                                             const void *paths,
>-                                                             GLuint pathBase,
>-                                                             GLenum fillMode,
>-                                                             GLuint mask,
>-                                                             GLenum coverMode,
>-                                                             GLenum transformType,
>-                                                             const GLfloat *transformValues)
>-{
>-    gl::StencilThenCoverFillPathInstancedCHROMIUM(numPaths, pathNameType, paths, pathBase, fillMode,
>-                                                  mask, coverMode, transformType, transformValues);
>-}
>-
>-void GL_APIENTRY glStencilThenCoverStrokePathInstancedCHROMIUM(GLsizei numPaths,
>-                                                               GLenum pathNameType,
>-                                                               const void *paths,
>-                                                               GLuint pathBase,
>-                                                               GLint reference,
>-                                                               GLuint mask,
>-                                                               GLenum coverMode,
>-                                                               GLenum transformType,
>-                                                               const GLfloat *transformValues)
>-{
>-    gl::StencilThenCoverStrokePathInstancedCHROMIUM(numPaths, pathNameType, paths, pathBase,
>-                                                    reference, mask, coverMode, transformType,
>-                                                    transformValues);
>-}
>-
>-void GL_APIENTRY glBindFragmentInputLocationCHROMIUM(GLuint program,
>-                                                     GLint location,
>-                                                     const GLchar *name)
>-{
>-    gl::BindFragmentInputLocationCHROMIUM(program, location, name);
>-}
>-
>-void GL_APIENTRY glProgramPathFragmentInputGenCHROMIUM(GLuint program,
>-                                                       GLint location,
>-                                                       GLenum genMode,
>-                                                       GLint components,
>-                                                       const GLfloat *coeffs)
>-{
>-    gl::ProgramPathFragmentInputGenCHROMIUM(program, location, genMode, components, coeffs);
>-}
>-
>-// GLES 3.1
>-void GL_APIENTRY glDispatchCompute(GLuint numGroupsX, GLuint numGroupsY, GLuint numGroupsZ)
>-{
>-    gl::DispatchCompute(numGroupsX, numGroupsY, numGroupsZ);
>-}
>-
>-void GL_APIENTRY glDispatchComputeIndirect(GLintptr indirect)
>-{
>-    gl::DispatchComputeIndirect(indirect);
>-}
>-
>-void GL_APIENTRY glDrawArraysIndirect(GLenum mode, const void *indirect)
>-{
>-    gl::DrawArraysIndirect(mode, indirect);
>-}
>-
>-void GL_APIENTRY glDrawElementsIndirect(GLenum mode, GLenum type, const void *indirect)
>-{
>-    gl::DrawElementsIndirect(mode, type, indirect);
>-}
>-
>-void GL_APIENTRY glFramebufferParameteri(GLenum target, GLenum pname, GLint param)
>-{
>-    gl::FramebufferParameteri(target, pname, param);
>-}
>-
>-void GL_APIENTRY glGetFramebufferParameteriv(GLenum target, GLenum pname, GLint *params)
>-{
>-    gl::GetFramebufferParameteriv(target, pname, params);
>-}
>-
>-void GL_APIENTRY glGetProgramInterfaceiv(GLuint program,
>-                                         GLenum programInterface,
>-                                         GLenum pname,
>-                                         GLint *params)
>-{
>-    gl::GetProgramInterfaceiv(program, programInterface, pname, params);
>-}
>-
>-GLuint GL_APIENTRY glGetProgramResourceIndex(GLuint program,
>-                                             GLenum programInterface,
>-                                             const GLchar *name)
>-{
>-    return gl::GetProgramResourceIndex(program, programInterface, name);
>-}
>-
>-void GL_APIENTRY glGetProgramResourceName(GLuint program,
>-                                          GLenum programInterface,
>-                                          GLuint index,
>-                                          GLsizei bufSize,
>-                                          GLsizei *length,
>-                                          GLchar *name)
>-{
>-    gl::GetProgramResourceName(program, programInterface, index, bufSize, length, name);
>-}
>-
>-void GL_APIENTRY glGetProgramResourceiv(GLuint program,
>-                                        GLenum programInterface,
>-                                        GLuint index,
>-                                        GLsizei propCount,
>-                                        const GLenum *props,
>-                                        GLsizei bufSize,
>-                                        GLsizei *length,
>-                                        GLint *params)
>-{
>-    gl::GetProgramResourceiv(program, programInterface, index, propCount, props, bufSize, length,
>-                             params);
>-}
>-
>-GLint GL_APIENTRY glGetProgramResourceLocation(GLuint program,
>-                                               GLenum programInterface,
>-                                               const GLchar *name)
>-{
>-    return gl::GetProgramResourceLocation(program, programInterface, name);
>-}
>-
>-void GL_APIENTRY glUseProgramStages(GLuint pipeline, GLbitfield stages, GLuint program)
>-{
>-    gl::UseProgramStages(pipeline, stages, program);
>-}
>-
>-void GL_APIENTRY glActiveShaderProgram(GLuint pipeline, GLuint program)
>-{
>-    gl::ActiveShaderProgram(pipeline, program);
>-}
>-
>-GLuint GL_APIENTRY glCreateShaderProgramv(GLenum type, GLsizei count, const GLchar *const *strings)
>-{
>-    return gl::CreateShaderProgramv(type, count, strings);
>-}
>-
>-void GL_APIENTRY glBindProgramPipeline(GLuint pipeline)
>-{
>-    gl::BindProgramPipeline(pipeline);
>-}
>-
>-void GL_APIENTRY glDeleteProgramPipelines(GLsizei n, const GLuint *pipelines)
>-{
>-    gl::DeleteProgramPipelines(n, pipelines);
>-}
>-
>-void GL_APIENTRY glGenProgramPipelines(GLsizei n, GLuint *pipelines)
>-{
>-    gl::GenProgramPipelines(n, pipelines);
>-}
>-
>-GLboolean GL_APIENTRY glIsProgramPipeline(GLuint pipeline)
>-{
>-    return gl::IsProgramPipeline(pipeline);
>-}
>-
>-void GL_APIENTRY glGetProgramPipelineiv(GLuint pipeline, GLenum pname, GLint *params)
>-{
>-    gl::GetProgramPipelineiv(pipeline, pname, params);
>-}
>-
>-void GL_APIENTRY glProgramUniform1i(GLuint program, GLint location, GLint v0)
>-{
>-    gl::ProgramUniform1i(program, location, v0);
>-}
>-
>-void GL_APIENTRY glProgramUniform2i(GLuint program, GLint location, GLint v0, GLint v1)
>-{
>-    gl::ProgramUniform2i(program, location, v0, v1);
>-}
>-
>-void GL_APIENTRY glProgramUniform3i(GLuint program, GLint location, GLint v0, GLint v1, GLint v2)
>-{
>-    gl::ProgramUniform3i(program, location, v0, v1, v2);
>-}
>-
>-void GL_APIENTRY
>-glProgramUniform4i(GLuint program, GLint location, GLint v0, GLint v1, GLint v2, GLint v3)
>-{
>-    gl::ProgramUniform4i(program, location, v0, v1, v2, v3);
>-}
>-
>-void GL_APIENTRY glProgramUniform1ui(GLuint program, GLint location, GLuint v0)
>-{
>-    gl::ProgramUniform1ui(program, location, v0);
>-}
>-
>-void GL_APIENTRY glProgramUniform2ui(GLuint program, GLint location, GLuint v0, GLuint v1)
>-{
>-    gl::ProgramUniform2ui(program, location, v0, v1);
>-}
>-
>-void GL_APIENTRY
>-glProgramUniform3ui(GLuint program, GLint location, GLuint v0, GLuint v1, GLuint v2)
>-{
>-    gl::ProgramUniform3ui(program, location, v0, v1, v2);
>-}
>-
>-void GL_APIENTRY
>-glProgramUniform4ui(GLuint program, GLint location, GLuint v0, GLuint v1, GLuint v2, GLuint v3)
>-{
>-    gl::ProgramUniform4ui(program, location, v0, v1, v2, v3);
>-}
>-
>-void GL_APIENTRY glProgramUniform1f(GLuint program, GLint location, GLfloat v0)
>-{
>-    gl::ProgramUniform1f(program, location, v0);
>-}
>-
>-void GL_APIENTRY glProgramUniform2f(GLuint program, GLint location, GLfloat v0, GLfloat v1)
>-{
>-    gl::ProgramUniform2f(program, location, v0, v1);
>-}
>-
>-void GL_APIENTRY
>-glProgramUniform3f(GLuint program, GLint location, GLfloat v0, GLfloat v1, GLfloat v2)
>-{
>-    gl::ProgramUniform3f(program, location, v0, v1, v2);
>-}
>-
>-void GL_APIENTRY
>-glProgramUniform4f(GLuint program, GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3)
>-{
>-    gl::ProgramUniform4f(program, location, v0, v1, v2, v3);
>-}
>-
>-void GL_APIENTRY glProgramUniform1iv(GLuint program,
>-                                     GLint location,
>-                                     GLsizei count,
>-                                     const GLint *value)
>-{
>-    gl::ProgramUniform1iv(program, location, count, value);
>-}
>-
>-void GL_APIENTRY glProgramUniform2iv(GLuint program,
>-                                     GLint location,
>-                                     GLsizei count,
>-                                     const GLint *value)
>-{
>-    gl::ProgramUniform2iv(program, location, count, value);
>-}
>-
>-void GL_APIENTRY glProgramUniform3iv(GLuint program,
>-                                     GLint location,
>-                                     GLsizei count,
>-                                     const GLint *value)
>-{
>-    gl::ProgramUniform3iv(program, location, count, value);
>-}
>-
>-void GL_APIENTRY glProgramUniform4iv(GLuint program,
>-                                     GLint location,
>-                                     GLsizei count,
>-                                     const GLint *value)
>-{
>-    gl::ProgramUniform4iv(program, location, count, value);
>-}
>-
>-void GL_APIENTRY glProgramUniform1uiv(GLuint program,
>-                                      GLint location,
>-                                      GLsizei count,
>-                                      const GLuint *value)
>-{
>-    gl::ProgramUniform1uiv(program, location, count, value);
>-}
>-
>-void GL_APIENTRY glProgramUniform2uiv(GLuint program,
>-                                      GLint location,
>-                                      GLsizei count,
>-                                      const GLuint *value)
>-{
>-    gl::ProgramUniform2uiv(program, location, count, value);
>-}
>-
>-void GL_APIENTRY glProgramUniform3uiv(GLuint program,
>-                                      GLint location,
>-                                      GLsizei count,
>-                                      const GLuint *value)
>-{
>-    gl::ProgramUniform3uiv(program, location, count, value);
>-}
>-
>-void GL_APIENTRY glProgramUniform4uiv(GLuint program,
>-                                      GLint location,
>-                                      GLsizei count,
>-                                      const GLuint *value)
>-{
>-    gl::ProgramUniform4uiv(program, location, count, value);
>-}
>-
>-void GL_APIENTRY glProgramUniform1fv(GLuint program,
>-                                     GLint location,
>-                                     GLsizei count,
>-                                     const GLfloat *value)
>-{
>-    gl::ProgramUniform1fv(program, location, count, value);
>-}
>-
>-void GL_APIENTRY glProgramUniform2fv(GLuint program,
>-                                     GLint location,
>-                                     GLsizei count,
>-                                     const GLfloat *value)
>-{
>-    gl::ProgramUniform2fv(program, location, count, value);
>-}
>-
>-void GL_APIENTRY glProgramUniform3fv(GLuint program,
>-                                     GLint location,
>-                                     GLsizei count,
>-                                     const GLfloat *value)
>-{
>-    gl::ProgramUniform3fv(program, location, count, value);
>-}
>-
>-void GL_APIENTRY glProgramUniform4fv(GLuint program,
>-                                     GLint location,
>-                                     GLsizei count,
>-                                     const GLfloat *value)
>-{
>-    gl::ProgramUniform4fv(program, location, count, value);
>-}
>-
>-void GL_APIENTRY glProgramUniformMatrix2fv(GLuint program,
>-                                           GLint location,
>-                                           GLsizei count,
>-                                           GLboolean transpose,
>-                                           const GLfloat *value)
>-{
>-    gl::ProgramUniformMatrix2fv(program, location, count, transpose, value);
>-}
>-
>-void GL_APIENTRY glProgramUniformMatrix3fv(GLuint program,
>-                                           GLint location,
>-                                           GLsizei count,
>-                                           GLboolean transpose,
>-                                           const GLfloat *value)
>-{
>-    gl::ProgramUniformMatrix3fv(program, location, count, transpose, value);
>-}
>-
>-void GL_APIENTRY glProgramUniformMatrix4fv(GLuint program,
>-                                           GLint location,
>-                                           GLsizei count,
>-                                           GLboolean transpose,
>-                                           const GLfloat *value)
>-{
>-    gl::ProgramUniformMatrix4fv(program, location, count, transpose, value);
>-}
>-
>-void GL_APIENTRY glProgramUniformMatrix2x3fv(GLuint program,
>-                                             GLint location,
>-                                             GLsizei count,
>-                                             GLboolean transpose,
>-                                             const GLfloat *value)
>-{
>-    gl::ProgramUniformMatrix2x3fv(program, location, count, transpose, value);
>-}
>-
>-void GL_APIENTRY glProgramUniformMatrix3x2fv(GLuint program,
>-                                             GLint location,
>-                                             GLsizei count,
>-                                             GLboolean transpose,
>-                                             const GLfloat *value)
>-{
>-    gl::ProgramUniformMatrix3x2fv(program, location, count, transpose, value);
>-}
>-
>-void GL_APIENTRY glProgramUniformMatrix2x4fv(GLuint program,
>-                                             GLint location,
>-                                             GLsizei count,
>-                                             GLboolean transpose,
>-                                             const GLfloat *value)
>-{
>-    gl::ProgramUniformMatrix2x4fv(program, location, count, transpose, value);
>-}
>-
>-void GL_APIENTRY glProgramUniformMatrix4x2fv(GLuint program,
>-                                             GLint location,
>-                                             GLsizei count,
>-                                             GLboolean transpose,
>-                                             const GLfloat *value)
>-{
>-    gl::ProgramUniformMatrix4x2fv(program, location, count, transpose, value);
>-}
>-
>-void GL_APIENTRY glProgramUniformMatrix3x4fv(GLuint program,
>-                                             GLint location,
>-                                             GLsizei count,
>-                                             GLboolean transpose,
>-                                             const GLfloat *value)
>-{
>-    gl::ProgramUniformMatrix3x4fv(program, location, count, transpose, value);
>-}
>-
>-void GL_APIENTRY glProgramUniformMatrix4x3fv(GLuint program,
>-                                             GLint location,
>-                                             GLsizei count,
>-                                             GLboolean transpose,
>-                                             const GLfloat *value)
>-{
>-    gl::ProgramUniformMatrix4x3fv(program, location, count, transpose, value);
>-}
>-
>-void GL_APIENTRY glValidateProgramPipeline(GLuint pipeline)
>-{
>-    gl::ValidateProgramPipeline(pipeline);
>-}
>-
>-void GL_APIENTRY glGetProgramPipelineInfoLog(GLuint pipeline,
>-                                             GLsizei bufSize,
>-                                             GLsizei *length,
>-                                             GLchar *infoLog)
>-{
>-    gl::GetProgramPipelineInfoLog(pipeline, bufSize, length, infoLog);
>-}
>-
>-void GL_APIENTRY glBindImageTexture(GLuint unit,
>-                                    GLuint texture,
>-                                    GLint level,
>-                                    GLboolean layered,
>-                                    GLint layer,
>-                                    GLenum access,
>-                                    GLenum format)
>-{
>-    gl::BindImageTexture(unit, texture, level, layered, layer, access, format);
>-}
>-
>-void GL_APIENTRY glGetBooleani_v(GLenum target, GLuint index, GLboolean *data)
>-{
>-    gl::GetBooleani_v(target, index, data);
>-}
>-
>-void GL_APIENTRY glMemoryBarrier(GLbitfield barriers)
>-{
>-    gl::MemoryBarrier(barriers);
>-}
>-
>-void GL_APIENTRY glMemoryBarrierByRegion(GLbitfield barriers)
>-{
>-    gl::MemoryBarrierByRegion(barriers);
>-}
>-
>-void GL_APIENTRY glTexStorage2DMultisample(GLenum target,
>-                                           GLsizei samples,
>-                                           GLenum internalformat,
>-                                           GLsizei width,
>-                                           GLsizei height,
>-                                           GLboolean fixedsamplelocations)
>-{
>-    gl::TexStorage2DMultisample(target, samples, internalformat, width, height,
>-                                fixedsamplelocations);
>-}
>-
>-void GL_APIENTRY glGetMultisamplefv(GLenum pname, GLuint index, GLfloat *val)
>-{
>-    gl::GetMultisamplefv(pname, index, val);
>-}
>-
>-void GL_APIENTRY glSampleMaski(GLuint maskNumber, GLbitfield mask)
>-{
>-    gl::SampleMaski(maskNumber, mask);
>-}
>-
>-void GL_APIENTRY glGetTexLevelParameteriv(GLenum target, GLint level, GLenum pname, GLint *params)
>-{
>-    gl::GetTexLevelParameteriv(target, level, pname, params);
>-}
>-
>-void GL_APIENTRY glGetTexLevelParameterfv(GLenum target, GLint level, GLenum pname, GLfloat *params)
>-{
>-    gl::GetTexLevelParameterfv(target, level, pname, params);
>-}
>-
>-void GL_APIENTRY glBindVertexBuffer(GLuint bindingindex,
>-                                    GLuint buffer,
>-                                    GLintptr offset,
>-                                    GLsizei stride)
>-{
>-    gl::BindVertexBuffer(bindingindex, buffer, offset, stride);
>-}
>-
>-void GL_APIENTRY glVertexAttribFormat(GLuint attribindex,
>-                                      GLint size,
>-                                      GLenum type,
>-                                      GLboolean normalized,
>-                                      GLuint relativeoffset)
>-{
>-    gl::VertexAttribFormat(attribindex, size, type, normalized, relativeoffset);
>-}
>-
>-void GL_APIENTRY glVertexAttribIFormat(GLuint attribindex,
>-                                       GLint size,
>-                                       GLenum type,
>-                                       GLuint relativeoffset)
>-{
>-    gl::VertexAttribIFormat(attribindex, size, type, relativeoffset);
>-}
>-
>-void GL_APIENTRY glVertexAttribBinding(GLuint attribindex, GLuint bindingindex)
>-{
>-    gl::VertexAttribBinding(attribindex, bindingindex);
>-}
>-
>-void GL_APIENTRY glVertexBindingDivisor(GLuint bindingindex, GLuint divisor)
>-{
>-    gl::VertexBindingDivisor(bindingindex, divisor);
>-}
>-
>-void GL_APIENTRY glFramebufferTextureMultiviewLayeredANGLE(GLenum target,
>-                                                           GLenum attachment,
>-                                                           GLuint texture,
>-                                                           GLint level,
>-                                                           GLint baseViewIndex,
>-                                                           GLsizei numViews)
>-{
>-    gl::FramebufferTextureMultiviewLayeredANGLE(target, attachment, texture, level, baseViewIndex,
>-                                                numViews);
>-}
>-
>-void GL_APIENTRY glFramebufferTextureMultiviewSideBySideANGLE(GLenum target,
>-                                                              GLenum attachment,
>-                                                              GLuint texture,
>-                                                              GLint level,
>-                                                              GLsizei numViews,
>-                                                              const GLint *viewportOffsets)
>-{
>-    gl::FramebufferTextureMultiviewSideBySideANGLE(target, attachment, texture, level, numViews,
>-                                                   viewportOffsets);
>-}
>-
>-void GL_APIENTRY glRequestExtensionANGLE(const GLchar *name)
>-{
>-    gl::RequestExtensionANGLE(name);
>-}
>-
>-}  // extern "C"
>diff --git a/Source/ThirdParty/ANGLE/src/libGLESv2/libGLESv2.def b/Source/ThirdParty/ANGLE/src/libGLESv2/libGLESv2.def
>deleted file mode 100644
>index 2ff4cc0579a..00000000000
>--- a/Source/ThirdParty/ANGLE/src/libGLESv2/libGLESv2.def
>+++ /dev/null
>@@ -1,412 +0,0 @@
>-LIBRARY libGLESv2
>-EXPORTS
>-    glActiveTexture                 @1
>-    glAttachShader                  @2
>-    glBindAttribLocation            @3
>-    glBindBuffer                    @4
>-    glBindFramebuffer               @5
>-    glBindRenderbuffer              @6
>-    glBindTexture                   @7
>-    glBlendColor                    @8
>-    glBlendEquation                 @9
>-    glBlendEquationSeparate         @10
>-    glBlendFunc                     @11
>-    glBlendFuncSeparate             @12
>-    glBufferData                    @13
>-    glBufferSubData                 @14
>-    glCheckFramebufferStatus        @15
>-    glClear                         @16
>-    glClearColor                    @17
>-    glClearDepthf                   @18
>-    glClearStencil                  @19
>-    glColorMask                     @20
>-    glCompileShader                 @21
>-    glCompressedTexImage2D          @22
>-    glCompressedTexSubImage2D       @23
>-    glCopyTexImage2D                @24
>-    glCopyTexSubImage2D             @25
>-    glCreateProgram                 @26
>-    glCreateShader                  @27
>-    glCullFace                      @28
>-    glDeleteBuffers                 @29
>-    glDeleteFramebuffers            @30
>-    glDeleteProgram                 @32
>-    glDeleteRenderbuffers           @33
>-    glDeleteShader                  @34
>-    glDeleteTextures                @31
>-    glDepthFunc                     @36
>-    glDepthMask                     @37
>-    glDepthRangef                   @38
>-    glDetachShader                  @35
>-    glDisable                       @39
>-    glDisableVertexAttribArray      @40
>-    glDrawArrays                    @41
>-    glDrawElements                  @42
>-    glEnable                        @43
>-    glEnableVertexAttribArray       @44
>-    glFinish                        @45
>-    glFlush                         @46
>-    glFramebufferRenderbuffer       @47
>-    glFramebufferTexture2D          @48
>-    glFrontFace                     @49
>-    glGenBuffers                    @50
>-    glGenFramebuffers               @52
>-    glGenRenderbuffers              @53
>-    glGenTextures                   @54
>-    glGenerateMipmap                @51
>-    glGetActiveAttrib               @55
>-    glGetActiveUniform              @56
>-    glGetAttachedShaders            @57
>-    glGetAttribLocation             @58
>-    glGetBooleanv                   @59
>-    glGetBufferParameteriv          @60
>-    glGetError                      @61
>-    glGetFloatv                     @62
>-    glGetFramebufferAttachmentParameteriv   @63
>-    glGetIntegerv                   @64
>-    glGetProgramInfoLog             @66
>-    glGetProgramiv                  @65
>-    glGetRenderbufferParameteriv    @67
>-    glGetShaderInfoLog              @69
>-    glGetShaderPrecisionFormat      @70
>-    glGetShaderSource               @71
>-    glGetShaderiv                   @68
>-    glGetString                     @72
>-    glGetTexParameterfv             @73
>-    glGetTexParameteriv             @74
>-    glGetUniformLocation            @77
>-    glGetUniformfv                  @75
>-    glGetUniformiv                  @76
>-    glGetVertexAttribPointerv       @80
>-    glGetVertexAttribfv             @78
>-    glGetVertexAttribiv             @79
>-    glHint                          @81
>-    glIsBuffer                      @82
>-    glIsEnabled                     @83
>-    glIsFramebuffer                 @84
>-    glIsProgram                     @85
>-    glIsRenderbuffer                @86
>-    glIsShader                      @87
>-    glIsTexture                     @88
>-    glLineWidth                     @89
>-    glLinkProgram                   @90
>-    glPixelStorei                   @91
>-    glPolygonOffset                 @92
>-    glReadPixels                    @93
>-    glReleaseShaderCompiler         @94
>-    glRenderbufferStorage           @95
>-    glSampleCoverage                @96
>-    glScissor                       @97
>-    glShaderBinary                  @98
>-    glShaderSource                  @99
>-    glStencilFunc                   @100
>-    glStencilFuncSeparate           @101
>-    glStencilMask                   @102
>-    glStencilMaskSeparate           @103
>-    glStencilOp                     @104
>-    glStencilOpSeparate             @105
>-    glTexImage2D                    @106
>-    glTexParameterf                 @107
>-    glTexParameterfv                @108
>-    glTexParameteri                 @109
>-    glTexParameteriv                @110
>-    glTexSubImage2D                 @111
>-    glUniform1f                     @112
>-    glUniform1fv                    @113
>-    glUniform1i                     @114
>-    glUniform1iv                    @115
>-    glUniform2f                     @116
>-    glUniform2fv                    @117
>-    glUniform2i                     @118
>-    glUniform2iv                    @119
>-    glUniform3f                     @120
>-    glUniform3fv                    @121
>-    glUniform3i                     @122
>-    glUniform3iv                    @123
>-    glUniform4f                     @124
>-    glUniform4fv                    @125
>-    glUniform4i                     @126
>-    glUniform4iv                    @127
>-    glUniformMatrix2fv              @128
>-    glUniformMatrix3fv              @129
>-    glUniformMatrix4fv              @130
>-    glUseProgram                    @131
>-    glValidateProgram               @132
>-    glVertexAttrib1f                @133
>-    glVertexAttrib1fv               @134
>-    glVertexAttrib2f                @135
>-    glVertexAttrib2fv               @136
>-    glVertexAttrib3f                @137
>-    glVertexAttrib3fv               @138
>-    glVertexAttrib4f                @139
>-    glVertexAttrib4fv               @140
>-    glVertexAttribPointer           @141
>-    glViewport                      @142
>-
>-    ; Extensions
>-    glBlitFramebufferANGLE          @149
>-    glRenderbufferStorageMultisampleANGLE @150
>-    glDeleteFencesNV                @151
>-    glFinishFenceNV                 @152
>-    glGenFencesNV                   @153
>-    glGetFenceivNV                  @154
>-    glIsFenceNV                     @155
>-    glSetFenceNV                    @156
>-    glTestFenceNV                   @157
>-    glGetTranslatedShaderSourceANGLE @159
>-    glTexStorage2DEXT               @160
>-    glGetGraphicsResetStatusEXT     @161
>-    glReadnPixelsEXT                @162
>-    glGetnUniformfvEXT              @163
>-    glGetnUniformivEXT              @164
>-    glGenQueriesEXT                 @165
>-    glDeleteQueriesEXT              @166
>-    glIsQueryEXT                    @167
>-    glBeginQueryEXT                 @168
>-    glEndQueryEXT                   @169
>-    glGetQueryivEXT                 @170
>-    glGetQueryObjectuivEXT          @171
>-    glVertexAttribDivisorANGLE      @172
>-    glDrawArraysInstancedANGLE      @173
>-    glDrawElementsInstancedANGLE    @174
>-    glProgramBinaryOES              @175
>-    glGetProgramBinaryOES           @176
>-    glDrawBuffersEXT                @179
>-    glMapBufferOES                  @285
>-    glUnmapBufferOES                @286
>-    glGetBufferPointervOES          @287
>-    glMapBufferRangeEXT             @288
>-    glFlushMappedBufferRangeEXT     @289
>-    glDiscardFramebufferEXT         @293
>-    glInsertEventMarkerEXT          @294
>-    glPushGroupMarkerEXT            @295
>-    glPopGroupMarkerEXT             @296
>-    glEGLImageTargetTexture2DOES    @297
>-    glEGLImageTargetRenderbufferStorageOES @298
>-    glBindVertexArrayOES            @299
>-    glDeleteVertexArraysOES         @300
>-    glGenVertexArraysOES            @301
>-    glIsVertexArrayOES              @302
>-    glDebugMessageControlKHR        @303
>-    glDebugMessageInsertKHR         @304
>-    glDebugMessageCallbackKHR       @305
>-    glGetDebugMessageLogKHR         @306
>-    glPushDebugGroupKHR             @307
>-    glPopDebugGroupKHR              @308
>-    glObjectLabelKHR                @309
>-    glGetObjectLabelKHR             @310
>-    glObjectPtrLabelKHR             @311
>-    glGetObjectPtrLabelKHR          @312
>-    glGetPointervKHR                @313
>-    glQueryCounterEXT               @314
>-    glGetQueryObjectivEXT           @315
>-    glGetQueryObjecti64vEXT         @316
>-    glGetQueryObjectui64vEXT        @317
>-    glBindUniformLocationCHROMIUM   @318
>-    glCoverageModulationCHROMIUM    @319
>-
>-    glMatrixLoadfCHROMIUM           @320
>-    glMatrixLoadIdentityCHROMIUM    @321
>-    glGenPathsCHROMIUM              @322
>-    glDeletePathsCHROMIUM           @323
>-    glIsPathCHROMIUM                @324
>-    glPathCommandsCHROMIUM          @325
>-    glPathParameterfCHROMIUM        @326
>-    glPathParameteriCHROMIUM        @327
>-    glGetPathParameterfvCHROMIUM    @328
>-    glGetPathParameterivCHROMIUM    @329
>-    glPathStencilFuncCHROMIUM       @330
>-    glStencilFillPathCHROMIUM       @331
>-    glStencilStrokePathCHROMIUM     @332
>-    glCoverFillPathCHROMIUM         @333
>-    glCoverStrokePathCHROMIUM       @334
>-    glStencilThenCoverFillPathCHROMIUM            @335
>-    glStencilThenCoverStrokePathCHROMIUM          @336
>-    glCoverFillPathInstancedCHROMIUM              @337
>-    glCoverStrokePathInstancedCHROMIUM            @338
>-    glStencilStrokePathInstancedCHROMIUM          @339
>-    glStencilFillPathInstancedCHROMIUM            @340
>-    glStencilThenCoverFillPathInstancedCHROMIUM   @341
>-    glStencilThenCoverStrokePathInstancedCHROMIUM @342
>-    glBindFragmentInputLocationCHROMIUM           @343
>-    glProgramPathFragmentInputGenCHROMIUM         @344
>-
>-    glFramebufferTextureMultiviewLayeredANGLE @413
>-    glFramebufferTextureMultiviewSideBySideANGLE @414
>-    glRequestExtensionANGLE         @415
>-
>-    ; GLES 3.0 Functions
>-    glReadBuffer                    @180
>-    glDrawRangeElements             @181
>-    glTexImage3D                    @182
>-    glTexSubImage3D                 @183
>-    glCopyTexSubImage3D             @184
>-    glCompressedTexImage3D          @185
>-    glCompressedTexSubImage3D       @186
>-    glGenQueries                    @187
>-    glDeleteQueries                 @188
>-    glIsQuery                       @189
>-    glBeginQuery                    @190
>-    glEndQuery                      @191
>-    glGetQueryiv                    @192
>-    glGetQueryObjectuiv             @193
>-    glUnmapBuffer                   @194
>-    glGetBufferPointerv             @195
>-    glDrawBuffers                   @196
>-    glUniformMatrix2x3fv            @197
>-    glUniformMatrix3x2fv            @198
>-    glUniformMatrix2x4fv            @199
>-    glUniformMatrix4x2fv            @200
>-    glUniformMatrix3x4fv            @201
>-    glUniformMatrix4x3fv            @202
>-    glBlitFramebuffer               @203
>-    glRenderbufferStorageMultisample @204
>-    glFramebufferTextureLayer       @205
>-    glMapBufferRange                @206
>-    glFlushMappedBufferRange        @207
>-    glBindVertexArray               @208
>-    glDeleteVertexArrays            @209
>-    glGenVertexArrays               @210
>-    glIsVertexArray                 @211
>-    glGetIntegeri_v                 @212
>-    glBeginTransformFeedback        @213
>-    glEndTransformFeedback          @214
>-    glBindBufferRange               @215
>-    glBindBufferBase                @216
>-    glTransformFeedbackVaryings     @217
>-    glGetTransformFeedbackVarying   @218
>-    glVertexAttribIPointer          @219
>-    glGetVertexAttribIiv            @220
>-    glGetVertexAttribIuiv           @221
>-    glVertexAttribI4i               @222
>-    glVertexAttribI4ui              @223
>-    glVertexAttribI4iv              @224
>-    glVertexAttribI4uiv             @225
>-    glGetUniformuiv                 @226
>-    glGetFragDataLocation           @227
>-    glUniform1ui                    @228
>-    glUniform2ui                    @229
>-    glUniform3ui                    @230
>-    glUniform4ui                    @231
>-    glUniform1uiv                   @232
>-    glUniform2uiv                   @233
>-    glUniform3uiv                   @234
>-    glUniform4uiv                   @235
>-    glClearBufferiv                 @236
>-    glClearBufferuiv                @237
>-    glClearBufferfv                 @238
>-    glClearBufferfi                 @239
>-    glGetStringi                    @240
>-    glCopyBufferSubData             @241
>-    glGetUniformIndices             @242
>-    glGetActiveUniformsiv           @243
>-    glGetUniformBlockIndex          @244
>-    glGetActiveUniformBlockiv       @245
>-    glGetActiveUniformBlockName     @246
>-    glUniformBlockBinding           @247
>-    glDrawArraysInstanced           @248
>-    glDrawElementsInstanced         @249
>-    glFenceSync                     @250
>-    glIsSync                        @251
>-    glDeleteSync                    @252
>-    glClientWaitSync                @253
>-    glWaitSync                      @254
>-    glGetInteger64v                 @255
>-    glGetSynciv                     @256
>-    glGetInteger64i_v               @257
>-    glGetBufferParameteri64v        @258
>-    glGenSamplers                   @259
>-    glDeleteSamplers                @260
>-    glIsSampler                     @261
>-    glBindSampler                   @262
>-    glSamplerParameteri             @263
>-    glSamplerParameteriv            @264
>-    glSamplerParameterf             @265
>-    glSamplerParameterfv            @266
>-    glGetSamplerParameteriv         @267
>-    glGetSamplerParameterfv         @268
>-    glVertexAttribDivisor           @269
>-    glBindTransformFeedback         @270
>-    glDeleteTransformFeedbacks      @271
>-    glGenTransformFeedbacks         @272
>-    glIsTransformFeedback           @273
>-    glPauseTransformFeedback        @274
>-    glResumeTransformFeedback       @275
>-    glGetProgramBinary              @276
>-    glProgramBinary                 @277
>-    glProgramParameteri             @278
>-    glInvalidateFramebuffer         @279
>-    glInvalidateSubFramebuffer      @280
>-    glTexStorage2D                  @281
>-    glTexStorage3D                  @282
>-    glGetInternalformativ           @283
>-
>-    ; GLES 3.1 Functions
>-    glDispatchCompute               @345
>-    glDispatchComputeIndirect       @346
>-    glDrawArraysIndirect            @347
>-    glDrawElementsIndirect          @348
>-    glFramebufferParameteri         @349
>-    glGetFramebufferParameteriv     @350
>-    glGetProgramInterfaceiv         @351
>-    glGetProgramResourceIndex       @352
>-    glGetProgramResourceName        @353
>-    glGetProgramResourceiv          @354
>-    glGetProgramResourceLocation    @355
>-    glUseProgramStages              @356
>-    glActiveShaderProgram           @357
>-    glCreateShaderProgramv          @358
>-    glBindProgramPipeline           @359
>-    glDeleteProgramPipelines        @360
>-    glGenProgramPipelines           @361
>-    glIsProgramPipeline             @362
>-    glGetProgramPipelineiv          @363
>-    glProgramUniform1i              @364
>-    glProgramUniform2i              @365
>-    glProgramUniform3i              @366
>-    glProgramUniform4i              @367
>-    glProgramUniform1ui             @368
>-    glProgramUniform2ui             @369
>-    glProgramUniform3ui             @370
>-    glProgramUniform4ui             @371
>-    glProgramUniform1f              @372
>-    glProgramUniform2f              @373
>-    glProgramUniform3f              @374
>-    glProgramUniform4f              @375
>-    glProgramUniform1iv             @376
>-    glProgramUniform2iv             @377
>-    glProgramUniform3iv             @378
>-    glProgramUniform4iv             @379
>-    glProgramUniform1uiv            @380
>-    glProgramUniform2uiv            @381
>-    glProgramUniform3uiv            @382
>-    glProgramUniform4uiv            @383
>-    glProgramUniform1fv             @384
>-    glProgramUniform2fv             @385
>-    glProgramUniform3fv             @386
>-    glProgramUniform4fv             @387
>-    glProgramUniformMatrix2fv       @388
>-    glProgramUniformMatrix3fv       @389
>-    glProgramUniformMatrix4fv       @390
>-    glProgramUniformMatrix2x3fv     @391
>-    glProgramUniformMatrix3x2fv     @392
>-    glProgramUniformMatrix2x4fv     @393
>-    glProgramUniformMatrix4x2fv     @394
>-    glProgramUniformMatrix3x4fv     @395
>-    glProgramUniformMatrix4x3fv     @396
>-    glValidateProgramPipeline       @397
>-    glGetProgramPipelineInfoLog     @398
>-    glBindImageTexture              @399
>-    glGetBooleani_v                 @400
>-    glMemoryBarrier                 @401
>-    glMemoryBarrierByRegion         @402
>-    glTexStorage2DMultisample       @403
>-    glGetMultisamplefv              @404
>-    glSampleMaski                   @405
>-    glGetTexLevelParameteriv        @406
>-    glGetTexLevelParameterfv        @407
>-    glBindVertexBuffer              @408
>-    glVertexAttribFormat            @409
>-    glVertexAttribIFormat           @410
>-    glVertexAttribBinding           @411
>-    glVertexBindingDivisor          @412
>diff --git a/Source/ThirdParty/ANGLE/src/libGLESv2/libGLESv2_autogen.cpp b/Source/ThirdParty/ANGLE/src/libGLESv2/libGLESv2_autogen.cpp
>new file mode 100644
>index 00000000000..3ad9afabda6
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libGLESv2/libGLESv2_autogen.cpp
>@@ -0,0 +1,9559 @@
>+// GENERATED FILE - DO NOT EDIT.
>+// Generated by generate_entry_points.py using data from gl.xml and gl_angle_ext.xml.
>+//
>+// Copyright 2019 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// libGLESv2.cpp: Implements the exported OpenGL ES functions.
>+
>+#include "angle_gl.h"
>+
>+#include "libGLESv2/entry_points_gles_1_0_autogen.h"
>+#include "libGLESv2/entry_points_gles_2_0_autogen.h"
>+#include "libGLESv2/entry_points_gles_3_0_autogen.h"
>+#include "libGLESv2/entry_points_gles_3_1_autogen.h"
>+#include "libGLESv2/entry_points_gles_ext_autogen.h"
>+
>+#include "common/event_tracer.h"
>+
>+extern "C" {
>+
>+// OpenGL ES 2.0
>+void GL_APIENTRY glActiveTexture(GLenum texture)
>+{
>+    return gl::ActiveTexture(texture);
>+}
>+
>+void GL_APIENTRY glAttachShader(GLuint program, GLuint shader)
>+{
>+    return gl::AttachShader(program, shader);
>+}
>+
>+void GL_APIENTRY glBindAttribLocation(GLuint program, GLuint index, const GLchar *name)
>+{
>+    return gl::BindAttribLocation(program, index, name);
>+}
>+
>+void GL_APIENTRY glBindBuffer(GLenum target, GLuint buffer)
>+{
>+    return gl::BindBuffer(target, buffer);
>+}
>+
>+void GL_APIENTRY glBindFramebuffer(GLenum target, GLuint framebuffer)
>+{
>+    return gl::BindFramebuffer(target, framebuffer);
>+}
>+
>+void GL_APIENTRY glBindRenderbuffer(GLenum target, GLuint renderbuffer)
>+{
>+    return gl::BindRenderbuffer(target, renderbuffer);
>+}
>+
>+void GL_APIENTRY glBindTexture(GLenum target, GLuint texture)
>+{
>+    return gl::BindTexture(target, texture);
>+}
>+
>+void GL_APIENTRY glBlendColor(GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha)
>+{
>+    return gl::BlendColor(red, green, blue, alpha);
>+}
>+
>+void GL_APIENTRY glBlendEquation(GLenum mode)
>+{
>+    return gl::BlendEquation(mode);
>+}
>+
>+void GL_APIENTRY glBlendEquationSeparate(GLenum modeRGB, GLenum modeAlpha)
>+{
>+    return gl::BlendEquationSeparate(modeRGB, modeAlpha);
>+}
>+
>+void GL_APIENTRY glBlendFunc(GLenum sfactor, GLenum dfactor)
>+{
>+    return gl::BlendFunc(sfactor, dfactor);
>+}
>+
>+void GL_APIENTRY glBlendFuncSeparate(GLenum sfactorRGB,
>+                                     GLenum dfactorRGB,
>+                                     GLenum sfactorAlpha,
>+                                     GLenum dfactorAlpha)
>+{
>+    return gl::BlendFuncSeparate(sfactorRGB, dfactorRGB, sfactorAlpha, dfactorAlpha);
>+}
>+
>+void GL_APIENTRY glBufferData(GLenum target, GLsizeiptr size, const void *data, GLenum usage)
>+{
>+    return gl::BufferData(target, size, data, usage);
>+}
>+
>+void GL_APIENTRY glBufferSubData(GLenum target, GLintptr offset, GLsizeiptr size, const void *data)
>+{
>+    return gl::BufferSubData(target, offset, size, data);
>+}
>+
>+GLenum GL_APIENTRY glCheckFramebufferStatus(GLenum target)
>+{
>+    return gl::CheckFramebufferStatus(target);
>+}
>+
>+void GL_APIENTRY glClear(GLbitfield mask)
>+{
>+    return gl::Clear(mask);
>+}
>+
>+void GL_APIENTRY glClearColor(GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha)
>+{
>+    return gl::ClearColor(red, green, blue, alpha);
>+}
>+
>+void GL_APIENTRY glClearDepthf(GLfloat d)
>+{
>+    return gl::ClearDepthf(d);
>+}
>+
>+void GL_APIENTRY glClearStencil(GLint s)
>+{
>+    return gl::ClearStencil(s);
>+}
>+
>+void GL_APIENTRY glColorMask(GLboolean red, GLboolean green, GLboolean blue, GLboolean alpha)
>+{
>+    return gl::ColorMask(red, green, blue, alpha);
>+}
>+
>+void GL_APIENTRY glCompileShader(GLuint shader)
>+{
>+    return gl::CompileShader(shader);
>+}
>+
>+void GL_APIENTRY glCompressedTexImage2D(GLenum target,
>+                                        GLint level,
>+                                        GLenum internalformat,
>+                                        GLsizei width,
>+                                        GLsizei height,
>+                                        GLint border,
>+                                        GLsizei imageSize,
>+                                        const void *data)
>+{
>+    return gl::CompressedTexImage2D(target, level, internalformat, width, height, border, imageSize,
>+                                    data);
>+}
>+
>+void GL_APIENTRY glCompressedTexSubImage2D(GLenum target,
>+                                           GLint level,
>+                                           GLint xoffset,
>+                                           GLint yoffset,
>+                                           GLsizei width,
>+                                           GLsizei height,
>+                                           GLenum format,
>+                                           GLsizei imageSize,
>+                                           const void *data)
>+{
>+    return gl::CompressedTexSubImage2D(target, level, xoffset, yoffset, width, height, format,
>+                                       imageSize, data);
>+}
>+
>+void GL_APIENTRY glCopyTexImage2D(GLenum target,
>+                                  GLint level,
>+                                  GLenum internalformat,
>+                                  GLint x,
>+                                  GLint y,
>+                                  GLsizei width,
>+                                  GLsizei height,
>+                                  GLint border)
>+{
>+    return gl::CopyTexImage2D(target, level, internalformat, x, y, width, height, border);
>+}
>+
>+void GL_APIENTRY glCopyTexSubImage2D(GLenum target,
>+                                     GLint level,
>+                                     GLint xoffset,
>+                                     GLint yoffset,
>+                                     GLint x,
>+                                     GLint y,
>+                                     GLsizei width,
>+                                     GLsizei height)
>+{
>+    return gl::CopyTexSubImage2D(target, level, xoffset, yoffset, x, y, width, height);
>+}
>+
>+GLuint GL_APIENTRY glCreateProgram()
>+{
>+    return gl::CreateProgram();
>+}
>+
>+GLuint GL_APIENTRY glCreateShader(GLenum type)
>+{
>+    return gl::CreateShader(type);
>+}
>+
>+void GL_APIENTRY glCullFace(GLenum mode)
>+{
>+    return gl::CullFace(mode);
>+}
>+
>+void GL_APIENTRY glDeleteBuffers(GLsizei n, const GLuint *buffers)
>+{
>+    return gl::DeleteBuffers(n, buffers);
>+}
>+
>+void GL_APIENTRY glDeleteFramebuffers(GLsizei n, const GLuint *framebuffers)
>+{
>+    return gl::DeleteFramebuffers(n, framebuffers);
>+}
>+
>+void GL_APIENTRY glDeleteProgram(GLuint program)
>+{
>+    return gl::DeleteProgram(program);
>+}
>+
>+void GL_APIENTRY glDeleteRenderbuffers(GLsizei n, const GLuint *renderbuffers)
>+{
>+    return gl::DeleteRenderbuffers(n, renderbuffers);
>+}
>+
>+void GL_APIENTRY glDeleteShader(GLuint shader)
>+{
>+    return gl::DeleteShader(shader);
>+}
>+
>+void GL_APIENTRY glDeleteTextures(GLsizei n, const GLuint *textures)
>+{
>+    return gl::DeleteTextures(n, textures);
>+}
>+
>+void GL_APIENTRY glDepthFunc(GLenum func)
>+{
>+    return gl::DepthFunc(func);
>+}
>+
>+void GL_APIENTRY glDepthMask(GLboolean flag)
>+{
>+    return gl::DepthMask(flag);
>+}
>+
>+void GL_APIENTRY glDepthRangef(GLfloat n, GLfloat f)
>+{
>+    return gl::DepthRangef(n, f);
>+}
>+
>+void GL_APIENTRY glDetachShader(GLuint program, GLuint shader)
>+{
>+    return gl::DetachShader(program, shader);
>+}
>+
>+void GL_APIENTRY glDisable(GLenum cap)
>+{
>+    return gl::Disable(cap);
>+}
>+
>+void GL_APIENTRY glDisableVertexAttribArray(GLuint index)
>+{
>+    return gl::DisableVertexAttribArray(index);
>+}
>+
>+void GL_APIENTRY glDrawArrays(GLenum mode, GLint first, GLsizei count)
>+{
>+    return gl::DrawArrays(mode, first, count);
>+}
>+
>+void GL_APIENTRY glDrawElements(GLenum mode, GLsizei count, GLenum type, const void *indices)
>+{
>+    return gl::DrawElements(mode, count, type, indices);
>+}
>+
>+void GL_APIENTRY glEnable(GLenum cap)
>+{
>+    return gl::Enable(cap);
>+}
>+
>+void GL_APIENTRY glEnableVertexAttribArray(GLuint index)
>+{
>+    return gl::EnableVertexAttribArray(index);
>+}
>+
>+void GL_APIENTRY glFinish()
>+{
>+    return gl::Finish();
>+}
>+
>+void GL_APIENTRY glFlush()
>+{
>+    return gl::Flush();
>+}
>+
>+void GL_APIENTRY glFramebufferRenderbuffer(GLenum target,
>+                                           GLenum attachment,
>+                                           GLenum renderbuffertarget,
>+                                           GLuint renderbuffer)
>+{
>+    return gl::FramebufferRenderbuffer(target, attachment, renderbuffertarget, renderbuffer);
>+}
>+
>+void GL_APIENTRY glFramebufferTexture2D(GLenum target,
>+                                        GLenum attachment,
>+                                        GLenum textarget,
>+                                        GLuint texture,
>+                                        GLint level)
>+{
>+    return gl::FramebufferTexture2D(target, attachment, textarget, texture, level);
>+}
>+
>+void GL_APIENTRY glFrontFace(GLenum mode)
>+{
>+    return gl::FrontFace(mode);
>+}
>+
>+void GL_APIENTRY glGenBuffers(GLsizei n, GLuint *buffers)
>+{
>+    return gl::GenBuffers(n, buffers);
>+}
>+
>+void GL_APIENTRY glGenFramebuffers(GLsizei n, GLuint *framebuffers)
>+{
>+    return gl::GenFramebuffers(n, framebuffers);
>+}
>+
>+void GL_APIENTRY glGenRenderbuffers(GLsizei n, GLuint *renderbuffers)
>+{
>+    return gl::GenRenderbuffers(n, renderbuffers);
>+}
>+
>+void GL_APIENTRY glGenTextures(GLsizei n, GLuint *textures)
>+{
>+    return gl::GenTextures(n, textures);
>+}
>+
>+void GL_APIENTRY glGenerateMipmap(GLenum target)
>+{
>+    return gl::GenerateMipmap(target);
>+}
>+
>+void GL_APIENTRY glGetActiveAttrib(GLuint program,
>+                                   GLuint index,
>+                                   GLsizei bufSize,
>+                                   GLsizei *length,
>+                                   GLint *size,
>+                                   GLenum *type,
>+                                   GLchar *name)
>+{
>+    return gl::GetActiveAttrib(program, index, bufSize, length, size, type, name);
>+}
>+
>+void GL_APIENTRY glGetActiveUniform(GLuint program,
>+                                    GLuint index,
>+                                    GLsizei bufSize,
>+                                    GLsizei *length,
>+                                    GLint *size,
>+                                    GLenum *type,
>+                                    GLchar *name)
>+{
>+    return gl::GetActiveUniform(program, index, bufSize, length, size, type, name);
>+}
>+
>+void GL_APIENTRY glGetAttachedShaders(GLuint program,
>+                                      GLsizei maxCount,
>+                                      GLsizei *count,
>+                                      GLuint *shaders)
>+{
>+    return gl::GetAttachedShaders(program, maxCount, count, shaders);
>+}
>+
>+GLint GL_APIENTRY glGetAttribLocation(GLuint program, const GLchar *name)
>+{
>+    return gl::GetAttribLocation(program, name);
>+}
>+
>+void GL_APIENTRY glGetBooleanv(GLenum pname, GLboolean *data)
>+{
>+    return gl::GetBooleanv(pname, data);
>+}
>+
>+void GL_APIENTRY glGetBufferParameteriv(GLenum target, GLenum pname, GLint *params)
>+{
>+    return gl::GetBufferParameteriv(target, pname, params);
>+}
>+
>+GLenum GL_APIENTRY glGetError()
>+{
>+    return gl::GetError();
>+}
>+
>+void GL_APIENTRY glGetFloatv(GLenum pname, GLfloat *data)
>+{
>+    return gl::GetFloatv(pname, data);
>+}
>+
>+void GL_APIENTRY glGetFramebufferAttachmentParameteriv(GLenum target,
>+                                                       GLenum attachment,
>+                                                       GLenum pname,
>+                                                       GLint *params)
>+{
>+    return gl::GetFramebufferAttachmentParameteriv(target, attachment, pname, params);
>+}
>+
>+void GL_APIENTRY glGetIntegerv(GLenum pname, GLint *data)
>+{
>+    return gl::GetIntegerv(pname, data);
>+}
>+
>+void GL_APIENTRY glGetProgramInfoLog(GLuint program,
>+                                     GLsizei bufSize,
>+                                     GLsizei *length,
>+                                     GLchar *infoLog)
>+{
>+    return gl::GetProgramInfoLog(program, bufSize, length, infoLog);
>+}
>+
>+void GL_APIENTRY glGetProgramiv(GLuint program, GLenum pname, GLint *params)
>+{
>+    return gl::GetProgramiv(program, pname, params);
>+}
>+
>+void GL_APIENTRY glGetRenderbufferParameteriv(GLenum target, GLenum pname, GLint *params)
>+{
>+    return gl::GetRenderbufferParameteriv(target, pname, params);
>+}
>+
>+void GL_APIENTRY glGetShaderInfoLog(GLuint shader,
>+                                    GLsizei bufSize,
>+                                    GLsizei *length,
>+                                    GLchar *infoLog)
>+{
>+    return gl::GetShaderInfoLog(shader, bufSize, length, infoLog);
>+}
>+
>+void GL_APIENTRY glGetShaderPrecisionFormat(GLenum shadertype,
>+                                            GLenum precisiontype,
>+                                            GLint *range,
>+                                            GLint *precision)
>+{
>+    return gl::GetShaderPrecisionFormat(shadertype, precisiontype, range, precision);
>+}
>+
>+void GL_APIENTRY glGetShaderSource(GLuint shader, GLsizei bufSize, GLsizei *length, GLchar *source)
>+{
>+    return gl::GetShaderSource(shader, bufSize, length, source);
>+}
>+
>+void GL_APIENTRY glGetShaderiv(GLuint shader, GLenum pname, GLint *params)
>+{
>+    return gl::GetShaderiv(shader, pname, params);
>+}
>+
>+const GLubyte *GL_APIENTRY glGetString(GLenum name)
>+{
>+    return gl::GetString(name);
>+}
>+
>+void GL_APIENTRY glGetTexParameterfv(GLenum target, GLenum pname, GLfloat *params)
>+{
>+    return gl::GetTexParameterfv(target, pname, params);
>+}
>+
>+void GL_APIENTRY glGetTexParameteriv(GLenum target, GLenum pname, GLint *params)
>+{
>+    return gl::GetTexParameteriv(target, pname, params);
>+}
>+
>+GLint GL_APIENTRY glGetUniformLocation(GLuint program, const GLchar *name)
>+{
>+    return gl::GetUniformLocation(program, name);
>+}
>+
>+void GL_APIENTRY glGetUniformfv(GLuint program, GLint location, GLfloat *params)
>+{
>+    return gl::GetUniformfv(program, location, params);
>+}
>+
>+void GL_APIENTRY glGetUniformiv(GLuint program, GLint location, GLint *params)
>+{
>+    return gl::GetUniformiv(program, location, params);
>+}
>+
>+void GL_APIENTRY glGetVertexAttribPointerv(GLuint index, GLenum pname, void **pointer)
>+{
>+    return gl::GetVertexAttribPointerv(index, pname, pointer);
>+}
>+
>+void GL_APIENTRY glGetVertexAttribfv(GLuint index, GLenum pname, GLfloat *params)
>+{
>+    return gl::GetVertexAttribfv(index, pname, params);
>+}
>+
>+void GL_APIENTRY glGetVertexAttribiv(GLuint index, GLenum pname, GLint *params)
>+{
>+    return gl::GetVertexAttribiv(index, pname, params);
>+}
>+
>+void GL_APIENTRY glHint(GLenum target, GLenum mode)
>+{
>+    return gl::Hint(target, mode);
>+}
>+
>+GLboolean GL_APIENTRY glIsBuffer(GLuint buffer)
>+{
>+    return gl::IsBuffer(buffer);
>+}
>+
>+GLboolean GL_APIENTRY glIsEnabled(GLenum cap)
>+{
>+    return gl::IsEnabled(cap);
>+}
>+
>+GLboolean GL_APIENTRY glIsFramebuffer(GLuint framebuffer)
>+{
>+    return gl::IsFramebuffer(framebuffer);
>+}
>+
>+GLboolean GL_APIENTRY glIsProgram(GLuint program)
>+{
>+    return gl::IsProgram(program);
>+}
>+
>+GLboolean GL_APIENTRY glIsRenderbuffer(GLuint renderbuffer)
>+{
>+    return gl::IsRenderbuffer(renderbuffer);
>+}
>+
>+GLboolean GL_APIENTRY glIsShader(GLuint shader)
>+{
>+    return gl::IsShader(shader);
>+}
>+
>+GLboolean GL_APIENTRY glIsTexture(GLuint texture)
>+{
>+    return gl::IsTexture(texture);
>+}
>+
>+void GL_APIENTRY glLineWidth(GLfloat width)
>+{
>+    return gl::LineWidth(width);
>+}
>+
>+void GL_APIENTRY glLinkProgram(GLuint program)
>+{
>+    return gl::LinkProgram(program);
>+}
>+
>+void GL_APIENTRY glPixelStorei(GLenum pname, GLint param)
>+{
>+    return gl::PixelStorei(pname, param);
>+}
>+
>+void GL_APIENTRY glPolygonOffset(GLfloat factor, GLfloat units)
>+{
>+    return gl::PolygonOffset(factor, units);
>+}
>+
>+void GL_APIENTRY glReadPixels(GLint x,
>+                              GLint y,
>+                              GLsizei width,
>+                              GLsizei height,
>+                              GLenum format,
>+                              GLenum type,
>+                              void *pixels)
>+{
>+    return gl::ReadPixels(x, y, width, height, format, type, pixels);
>+}
>+
>+void GL_APIENTRY glReleaseShaderCompiler()
>+{
>+    return gl::ReleaseShaderCompiler();
>+}
>+
>+void GL_APIENTRY glRenderbufferStorage(GLenum target,
>+                                       GLenum internalformat,
>+                                       GLsizei width,
>+                                       GLsizei height)
>+{
>+    return gl::RenderbufferStorage(target, internalformat, width, height);
>+}
>+
>+void GL_APIENTRY glSampleCoverage(GLfloat value, GLboolean invert)
>+{
>+    return gl::SampleCoverage(value, invert);
>+}
>+
>+void GL_APIENTRY glScissor(GLint x, GLint y, GLsizei width, GLsizei height)
>+{
>+    return gl::Scissor(x, y, width, height);
>+}
>+
>+void GL_APIENTRY glShaderBinary(GLsizei count,
>+                                const GLuint *shaders,
>+                                GLenum binaryformat,
>+                                const void *binary,
>+                                GLsizei length)
>+{
>+    return gl::ShaderBinary(count, shaders, binaryformat, binary, length);
>+}
>+
>+void GL_APIENTRY glShaderSource(GLuint shader,
>+                                GLsizei count,
>+                                const GLchar *const *string,
>+                                const GLint *length)
>+{
>+    return gl::ShaderSource(shader, count, string, length);
>+}
>+
>+void GL_APIENTRY glStencilFunc(GLenum func, GLint ref, GLuint mask)
>+{
>+    return gl::StencilFunc(func, ref, mask);
>+}
>+
>+void GL_APIENTRY glStencilFuncSeparate(GLenum face, GLenum func, GLint ref, GLuint mask)
>+{
>+    return gl::StencilFuncSeparate(face, func, ref, mask);
>+}
>+
>+void GL_APIENTRY glStencilMask(GLuint mask)
>+{
>+    return gl::StencilMask(mask);
>+}
>+
>+void GL_APIENTRY glStencilMaskSeparate(GLenum face, GLuint mask)
>+{
>+    return gl::StencilMaskSeparate(face, mask);
>+}
>+
>+void GL_APIENTRY glStencilOp(GLenum fail, GLenum zfail, GLenum zpass)
>+{
>+    return gl::StencilOp(fail, zfail, zpass);
>+}
>+
>+void GL_APIENTRY glStencilOpSeparate(GLenum face, GLenum sfail, GLenum dpfail, GLenum dppass)
>+{
>+    return gl::StencilOpSeparate(face, sfail, dpfail, dppass);
>+}
>+
>+void GL_APIENTRY glTexImage2D(GLenum target,
>+                              GLint level,
>+                              GLint internalformat,
>+                              GLsizei width,
>+                              GLsizei height,
>+                              GLint border,
>+                              GLenum format,
>+                              GLenum type,
>+                              const void *pixels)
>+{
>+    return gl::TexImage2D(target, level, internalformat, width, height, border, format, type,
>+                          pixels);
>+}
>+
>+void GL_APIENTRY glTexParameterf(GLenum target, GLenum pname, GLfloat param)
>+{
>+    return gl::TexParameterf(target, pname, param);
>+}
>+
>+void GL_APIENTRY glTexParameterfv(GLenum target, GLenum pname, const GLfloat *params)
>+{
>+    return gl::TexParameterfv(target, pname, params);
>+}
>+
>+void GL_APIENTRY glTexParameteri(GLenum target, GLenum pname, GLint param)
>+{
>+    return gl::TexParameteri(target, pname, param);
>+}
>+
>+void GL_APIENTRY glTexParameteriv(GLenum target, GLenum pname, const GLint *params)
>+{
>+    return gl::TexParameteriv(target, pname, params);
>+}
>+
>+void GL_APIENTRY glTexSubImage2D(GLenum target,
>+                                 GLint level,
>+                                 GLint xoffset,
>+                                 GLint yoffset,
>+                                 GLsizei width,
>+                                 GLsizei height,
>+                                 GLenum format,
>+                                 GLenum type,
>+                                 const void *pixels)
>+{
>+    return gl::TexSubImage2D(target, level, xoffset, yoffset, width, height, format, type, pixels);
>+}
>+
>+void GL_APIENTRY glUniform1f(GLint location, GLfloat v0)
>+{
>+    return gl::Uniform1f(location, v0);
>+}
>+
>+void GL_APIENTRY glUniform1fv(GLint location, GLsizei count, const GLfloat *value)
>+{
>+    return gl::Uniform1fv(location, count, value);
>+}
>+
>+void GL_APIENTRY glUniform1i(GLint location, GLint v0)
>+{
>+    return gl::Uniform1i(location, v0);
>+}
>+
>+void GL_APIENTRY glUniform1iv(GLint location, GLsizei count, const GLint *value)
>+{
>+    return gl::Uniform1iv(location, count, value);
>+}
>+
>+void GL_APIENTRY glUniform2f(GLint location, GLfloat v0, GLfloat v1)
>+{
>+    return gl::Uniform2f(location, v0, v1);
>+}
>+
>+void GL_APIENTRY glUniform2fv(GLint location, GLsizei count, const GLfloat *value)
>+{
>+    return gl::Uniform2fv(location, count, value);
>+}
>+
>+void GL_APIENTRY glUniform2i(GLint location, GLint v0, GLint v1)
>+{
>+    return gl::Uniform2i(location, v0, v1);
>+}
>+
>+void GL_APIENTRY glUniform2iv(GLint location, GLsizei count, const GLint *value)
>+{
>+    return gl::Uniform2iv(location, count, value);
>+}
>+
>+void GL_APIENTRY glUniform3f(GLint location, GLfloat v0, GLfloat v1, GLfloat v2)
>+{
>+    return gl::Uniform3f(location, v0, v1, v2);
>+}
>+
>+void GL_APIENTRY glUniform3fv(GLint location, GLsizei count, const GLfloat *value)
>+{
>+    return gl::Uniform3fv(location, count, value);
>+}
>+
>+void GL_APIENTRY glUniform3i(GLint location, GLint v0, GLint v1, GLint v2)
>+{
>+    return gl::Uniform3i(location, v0, v1, v2);
>+}
>+
>+void GL_APIENTRY glUniform3iv(GLint location, GLsizei count, const GLint *value)
>+{
>+    return gl::Uniform3iv(location, count, value);
>+}
>+
>+void GL_APIENTRY glUniform4f(GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3)
>+{
>+    return gl::Uniform4f(location, v0, v1, v2, v3);
>+}
>+
>+void GL_APIENTRY glUniform4fv(GLint location, GLsizei count, const GLfloat *value)
>+{
>+    return gl::Uniform4fv(location, count, value);
>+}
>+
>+void GL_APIENTRY glUniform4i(GLint location, GLint v0, GLint v1, GLint v2, GLint v3)
>+{
>+    return gl::Uniform4i(location, v0, v1, v2, v3);
>+}
>+
>+void GL_APIENTRY glUniform4iv(GLint location, GLsizei count, const GLint *value)
>+{
>+    return gl::Uniform4iv(location, count, value);
>+}
>+
>+void GL_APIENTRY glUniformMatrix2fv(GLint location,
>+                                    GLsizei count,
>+                                    GLboolean transpose,
>+                                    const GLfloat *value)
>+{
>+    return gl::UniformMatrix2fv(location, count, transpose, value);
>+}
>+
>+void GL_APIENTRY glUniformMatrix3fv(GLint location,
>+                                    GLsizei count,
>+                                    GLboolean transpose,
>+                                    const GLfloat *value)
>+{
>+    return gl::UniformMatrix3fv(location, count, transpose, value);
>+}
>+
>+void GL_APIENTRY glUniformMatrix4fv(GLint location,
>+                                    GLsizei count,
>+                                    GLboolean transpose,
>+                                    const GLfloat *value)
>+{
>+    return gl::UniformMatrix4fv(location, count, transpose, value);
>+}
>+
>+void GL_APIENTRY glUseProgram(GLuint program)
>+{
>+    return gl::UseProgram(program);
>+}
>+
>+void GL_APIENTRY glValidateProgram(GLuint program)
>+{
>+    return gl::ValidateProgram(program);
>+}
>+
>+void GL_APIENTRY glVertexAttrib1f(GLuint index, GLfloat x)
>+{
>+    return gl::VertexAttrib1f(index, x);
>+}
>+
>+void GL_APIENTRY glVertexAttrib1fv(GLuint index, const GLfloat *v)
>+{
>+    return gl::VertexAttrib1fv(index, v);
>+}
>+
>+void GL_APIENTRY glVertexAttrib2f(GLuint index, GLfloat x, GLfloat y)
>+{
>+    return gl::VertexAttrib2f(index, x, y);
>+}
>+
>+void GL_APIENTRY glVertexAttrib2fv(GLuint index, const GLfloat *v)
>+{
>+    return gl::VertexAttrib2fv(index, v);
>+}
>+
>+void GL_APIENTRY glVertexAttrib3f(GLuint index, GLfloat x, GLfloat y, GLfloat z)
>+{
>+    return gl::VertexAttrib3f(index, x, y, z);
>+}
>+
>+void GL_APIENTRY glVertexAttrib3fv(GLuint index, const GLfloat *v)
>+{
>+    return gl::VertexAttrib3fv(index, v);
>+}
>+
>+void GL_APIENTRY glVertexAttrib4f(GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w)
>+{
>+    return gl::VertexAttrib4f(index, x, y, z, w);
>+}
>+
>+void GL_APIENTRY glVertexAttrib4fv(GLuint index, const GLfloat *v)
>+{
>+    return gl::VertexAttrib4fv(index, v);
>+}
>+
>+void GL_APIENTRY glVertexAttribPointer(GLuint index,
>+                                       GLint size,
>+                                       GLenum type,
>+                                       GLboolean normalized,
>+                                       GLsizei stride,
>+                                       const void *pointer)
>+{
>+    return gl::VertexAttribPointer(index, size, type, normalized, stride, pointer);
>+}
>+
>+void GL_APIENTRY glViewport(GLint x, GLint y, GLsizei width, GLsizei height)
>+{
>+    return gl::Viewport(x, y, width, height);
>+}
>+
>+// OpenGL ES 3.0
>+void GL_APIENTRY glBeginQuery(GLenum target, GLuint id)
>+{
>+    return gl::BeginQuery(target, id);
>+}
>+
>+void GL_APIENTRY glBeginTransformFeedback(GLenum primitiveMode)
>+{
>+    return gl::BeginTransformFeedback(primitiveMode);
>+}
>+
>+void GL_APIENTRY glBindBufferBase(GLenum target, GLuint index, GLuint buffer)
>+{
>+    return gl::BindBufferBase(target, index, buffer);
>+}
>+
>+void GL_APIENTRY
>+glBindBufferRange(GLenum target, GLuint index, GLuint buffer, GLintptr offset, GLsizeiptr size)
>+{
>+    return gl::BindBufferRange(target, index, buffer, offset, size);
>+}
>+
>+void GL_APIENTRY glBindSampler(GLuint unit, GLuint sampler)
>+{
>+    return gl::BindSampler(unit, sampler);
>+}
>+
>+void GL_APIENTRY glBindTransformFeedback(GLenum target, GLuint id)
>+{
>+    return gl::BindTransformFeedback(target, id);
>+}
>+
>+void GL_APIENTRY glBindVertexArray(GLuint array)
>+{
>+    return gl::BindVertexArray(array);
>+}
>+
>+void GL_APIENTRY glBlitFramebuffer(GLint srcX0,
>+                                   GLint srcY0,
>+                                   GLint srcX1,
>+                                   GLint srcY1,
>+                                   GLint dstX0,
>+                                   GLint dstY0,
>+                                   GLint dstX1,
>+                                   GLint dstY1,
>+                                   GLbitfield mask,
>+                                   GLenum filter)
>+{
>+    return gl::BlitFramebuffer(srcX0, srcY0, srcX1, srcY1, dstX0, dstY0, dstX1, dstY1, mask,
>+                               filter);
>+}
>+
>+void GL_APIENTRY glClearBufferfi(GLenum buffer, GLint drawbuffer, GLfloat depth, GLint stencil)
>+{
>+    return gl::ClearBufferfi(buffer, drawbuffer, depth, stencil);
>+}
>+
>+void GL_APIENTRY glClearBufferfv(GLenum buffer, GLint drawbuffer, const GLfloat *value)
>+{
>+    return gl::ClearBufferfv(buffer, drawbuffer, value);
>+}
>+
>+void GL_APIENTRY glClearBufferiv(GLenum buffer, GLint drawbuffer, const GLint *value)
>+{
>+    return gl::ClearBufferiv(buffer, drawbuffer, value);
>+}
>+
>+void GL_APIENTRY glClearBufferuiv(GLenum buffer, GLint drawbuffer, const GLuint *value)
>+{
>+    return gl::ClearBufferuiv(buffer, drawbuffer, value);
>+}
>+
>+GLenum GL_APIENTRY glClientWaitSync(GLsync sync, GLbitfield flags, GLuint64 timeout)
>+{
>+    return gl::ClientWaitSync(sync, flags, timeout);
>+}
>+
>+void GL_APIENTRY glCompressedTexImage3D(GLenum target,
>+                                        GLint level,
>+                                        GLenum internalformat,
>+                                        GLsizei width,
>+                                        GLsizei height,
>+                                        GLsizei depth,
>+                                        GLint border,
>+                                        GLsizei imageSize,
>+                                        const void *data)
>+{
>+    return gl::CompressedTexImage3D(target, level, internalformat, width, height, depth, border,
>+                                    imageSize, data);
>+}
>+
>+void GL_APIENTRY glCompressedTexSubImage3D(GLenum target,
>+                                           GLint level,
>+                                           GLint xoffset,
>+                                           GLint yoffset,
>+                                           GLint zoffset,
>+                                           GLsizei width,
>+                                           GLsizei height,
>+                                           GLsizei depth,
>+                                           GLenum format,
>+                                           GLsizei imageSize,
>+                                           const void *data)
>+{
>+    return gl::CompressedTexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height,
>+                                       depth, format, imageSize, data);
>+}
>+
>+void GL_APIENTRY glCopyBufferSubData(GLenum readTarget,
>+                                     GLenum writeTarget,
>+                                     GLintptr readOffset,
>+                                     GLintptr writeOffset,
>+                                     GLsizeiptr size)
>+{
>+    return gl::CopyBufferSubData(readTarget, writeTarget, readOffset, writeOffset, size);
>+}
>+
>+void GL_APIENTRY glCopyTexSubImage3D(GLenum target,
>+                                     GLint level,
>+                                     GLint xoffset,
>+                                     GLint yoffset,
>+                                     GLint zoffset,
>+                                     GLint x,
>+                                     GLint y,
>+                                     GLsizei width,
>+                                     GLsizei height)
>+{
>+    return gl::CopyTexSubImage3D(target, level, xoffset, yoffset, zoffset, x, y, width, height);
>+}
>+
>+void GL_APIENTRY glDeleteQueries(GLsizei n, const GLuint *ids)
>+{
>+    return gl::DeleteQueries(n, ids);
>+}
>+
>+void GL_APIENTRY glDeleteSamplers(GLsizei count, const GLuint *samplers)
>+{
>+    return gl::DeleteSamplers(count, samplers);
>+}
>+
>+void GL_APIENTRY glDeleteSync(GLsync sync)
>+{
>+    return gl::DeleteSync(sync);
>+}
>+
>+void GL_APIENTRY glDeleteTransformFeedbacks(GLsizei n, const GLuint *ids)
>+{
>+    return gl::DeleteTransformFeedbacks(n, ids);
>+}
>+
>+void GL_APIENTRY glDeleteVertexArrays(GLsizei n, const GLuint *arrays)
>+{
>+    return gl::DeleteVertexArrays(n, arrays);
>+}
>+
>+void GL_APIENTRY glDrawArraysInstanced(GLenum mode,
>+                                       GLint first,
>+                                       GLsizei count,
>+                                       GLsizei instancecount)
>+{
>+    return gl::DrawArraysInstanced(mode, first, count, instancecount);
>+}
>+
>+void GL_APIENTRY glDrawBuffers(GLsizei n, const GLenum *bufs)
>+{
>+    return gl::DrawBuffers(n, bufs);
>+}
>+
>+void GL_APIENTRY glDrawElementsInstanced(GLenum mode,
>+                                         GLsizei count,
>+                                         GLenum type,
>+                                         const void *indices,
>+                                         GLsizei instancecount)
>+{
>+    return gl::DrawElementsInstanced(mode, count, type, indices, instancecount);
>+}
>+
>+void GL_APIENTRY glDrawRangeElements(GLenum mode,
>+                                     GLuint start,
>+                                     GLuint end,
>+                                     GLsizei count,
>+                                     GLenum type,
>+                                     const void *indices)
>+{
>+    return gl::DrawRangeElements(mode, start, end, count, type, indices);
>+}
>+
>+void GL_APIENTRY glEndQuery(GLenum target)
>+{
>+    return gl::EndQuery(target);
>+}
>+
>+void GL_APIENTRY glEndTransformFeedback()
>+{
>+    return gl::EndTransformFeedback();
>+}
>+
>+GLsync GL_APIENTRY glFenceSync(GLenum condition, GLbitfield flags)
>+{
>+    return gl::FenceSync(condition, flags);
>+}
>+
>+void GL_APIENTRY glFlushMappedBufferRange(GLenum target, GLintptr offset, GLsizeiptr length)
>+{
>+    return gl::FlushMappedBufferRange(target, offset, length);
>+}
>+
>+void GL_APIENTRY glFramebufferTextureLayer(GLenum target,
>+                                           GLenum attachment,
>+                                           GLuint texture,
>+                                           GLint level,
>+                                           GLint layer)
>+{
>+    return gl::FramebufferTextureLayer(target, attachment, texture, level, layer);
>+}
>+
>+void GL_APIENTRY glGenQueries(GLsizei n, GLuint *ids)
>+{
>+    return gl::GenQueries(n, ids);
>+}
>+
>+void GL_APIENTRY glGenSamplers(GLsizei count, GLuint *samplers)
>+{
>+    return gl::GenSamplers(count, samplers);
>+}
>+
>+void GL_APIENTRY glGenTransformFeedbacks(GLsizei n, GLuint *ids)
>+{
>+    return gl::GenTransformFeedbacks(n, ids);
>+}
>+
>+void GL_APIENTRY glGenVertexArrays(GLsizei n, GLuint *arrays)
>+{
>+    return gl::GenVertexArrays(n, arrays);
>+}
>+
>+void GL_APIENTRY glGetActiveUniformBlockName(GLuint program,
>+                                             GLuint uniformBlockIndex,
>+                                             GLsizei bufSize,
>+                                             GLsizei *length,
>+                                             GLchar *uniformBlockName)
>+{
>+    return gl::GetActiveUniformBlockName(program, uniformBlockIndex, bufSize, length,
>+                                         uniformBlockName);
>+}
>+
>+void GL_APIENTRY glGetActiveUniformBlockiv(GLuint program,
>+                                           GLuint uniformBlockIndex,
>+                                           GLenum pname,
>+                                           GLint *params)
>+{
>+    return gl::GetActiveUniformBlockiv(program, uniformBlockIndex, pname, params);
>+}
>+
>+void GL_APIENTRY glGetActiveUniformsiv(GLuint program,
>+                                       GLsizei uniformCount,
>+                                       const GLuint *uniformIndices,
>+                                       GLenum pname,
>+                                       GLint *params)
>+{
>+    return gl::GetActiveUniformsiv(program, uniformCount, uniformIndices, pname, params);
>+}
>+
>+void GL_APIENTRY glGetBufferParameteri64v(GLenum target, GLenum pname, GLint64 *params)
>+{
>+    return gl::GetBufferParameteri64v(target, pname, params);
>+}
>+
>+void GL_APIENTRY glGetBufferPointerv(GLenum target, GLenum pname, void **params)
>+{
>+    return gl::GetBufferPointerv(target, pname, params);
>+}
>+
>+GLint GL_APIENTRY glGetFragDataLocation(GLuint program, const GLchar *name)
>+{
>+    return gl::GetFragDataLocation(program, name);
>+}
>+
>+void GL_APIENTRY glGetInteger64i_v(GLenum target, GLuint index, GLint64 *data)
>+{
>+    return gl::GetInteger64i_v(target, index, data);
>+}
>+
>+void GL_APIENTRY glGetInteger64v(GLenum pname, GLint64 *data)
>+{
>+    return gl::GetInteger64v(pname, data);
>+}
>+
>+void GL_APIENTRY glGetIntegeri_v(GLenum target, GLuint index, GLint *data)
>+{
>+    return gl::GetIntegeri_v(target, index, data);
>+}
>+
>+void GL_APIENTRY glGetInternalformativ(GLenum target,
>+                                       GLenum internalformat,
>+                                       GLenum pname,
>+                                       GLsizei bufSize,
>+                                       GLint *params)
>+{
>+    return gl::GetInternalformativ(target, internalformat, pname, bufSize, params);
>+}
>+
>+void GL_APIENTRY glGetProgramBinary(GLuint program,
>+                                    GLsizei bufSize,
>+                                    GLsizei *length,
>+                                    GLenum *binaryFormat,
>+                                    void *binary)
>+{
>+    return gl::GetProgramBinary(program, bufSize, length, binaryFormat, binary);
>+}
>+
>+void GL_APIENTRY glGetQueryObjectuiv(GLuint id, GLenum pname, GLuint *params)
>+{
>+    return gl::GetQueryObjectuiv(id, pname, params);
>+}
>+
>+void GL_APIENTRY glGetQueryiv(GLenum target, GLenum pname, GLint *params)
>+{
>+    return gl::GetQueryiv(target, pname, params);
>+}
>+
>+void GL_APIENTRY glGetSamplerParameterfv(GLuint sampler, GLenum pname, GLfloat *params)
>+{
>+    return gl::GetSamplerParameterfv(sampler, pname, params);
>+}
>+
>+void GL_APIENTRY glGetSamplerParameteriv(GLuint sampler, GLenum pname, GLint *params)
>+{
>+    return gl::GetSamplerParameteriv(sampler, pname, params);
>+}
>+
>+const GLubyte *GL_APIENTRY glGetStringi(GLenum name, GLuint index)
>+{
>+    return gl::GetStringi(name, index);
>+}
>+
>+void GL_APIENTRY
>+glGetSynciv(GLsync sync, GLenum pname, GLsizei bufSize, GLsizei *length, GLint *values)
>+{
>+    return gl::GetSynciv(sync, pname, bufSize, length, values);
>+}
>+
>+void GL_APIENTRY glGetTransformFeedbackVarying(GLuint program,
>+                                               GLuint index,
>+                                               GLsizei bufSize,
>+                                               GLsizei *length,
>+                                               GLsizei *size,
>+                                               GLenum *type,
>+                                               GLchar *name)
>+{
>+    return gl::GetTransformFeedbackVarying(program, index, bufSize, length, size, type, name);
>+}
>+
>+GLuint GL_APIENTRY glGetUniformBlockIndex(GLuint program, const GLchar *uniformBlockName)
>+{
>+    return gl::GetUniformBlockIndex(program, uniformBlockName);
>+}
>+
>+void GL_APIENTRY glGetUniformIndices(GLuint program,
>+                                     GLsizei uniformCount,
>+                                     const GLchar *const *uniformNames,
>+                                     GLuint *uniformIndices)
>+{
>+    return gl::GetUniformIndices(program, uniformCount, uniformNames, uniformIndices);
>+}
>+
>+void GL_APIENTRY glGetUniformuiv(GLuint program, GLint location, GLuint *params)
>+{
>+    return gl::GetUniformuiv(program, location, params);
>+}
>+
>+void GL_APIENTRY glGetVertexAttribIiv(GLuint index, GLenum pname, GLint *params)
>+{
>+    return gl::GetVertexAttribIiv(index, pname, params);
>+}
>+
>+void GL_APIENTRY glGetVertexAttribIuiv(GLuint index, GLenum pname, GLuint *params)
>+{
>+    return gl::GetVertexAttribIuiv(index, pname, params);
>+}
>+
>+void GL_APIENTRY glInvalidateFramebuffer(GLenum target,
>+                                         GLsizei numAttachments,
>+                                         const GLenum *attachments)
>+{
>+    return gl::InvalidateFramebuffer(target, numAttachments, attachments);
>+}
>+
>+void GL_APIENTRY glInvalidateSubFramebuffer(GLenum target,
>+                                            GLsizei numAttachments,
>+                                            const GLenum *attachments,
>+                                            GLint x,
>+                                            GLint y,
>+                                            GLsizei width,
>+                                            GLsizei height)
>+{
>+    return gl::InvalidateSubFramebuffer(target, numAttachments, attachments, x, y, width, height);
>+}
>+
>+GLboolean GL_APIENTRY glIsQuery(GLuint id)
>+{
>+    return gl::IsQuery(id);
>+}
>+
>+GLboolean GL_APIENTRY glIsSampler(GLuint sampler)
>+{
>+    return gl::IsSampler(sampler);
>+}
>+
>+GLboolean GL_APIENTRY glIsSync(GLsync sync)
>+{
>+    return gl::IsSync(sync);
>+}
>+
>+GLboolean GL_APIENTRY glIsTransformFeedback(GLuint id)
>+{
>+    return gl::IsTransformFeedback(id);
>+}
>+
>+GLboolean GL_APIENTRY glIsVertexArray(GLuint array)
>+{
>+    return gl::IsVertexArray(array);
>+}
>+
>+void *GL_APIENTRY glMapBufferRange(GLenum target,
>+                                   GLintptr offset,
>+                                   GLsizeiptr length,
>+                                   GLbitfield access)
>+{
>+    return gl::MapBufferRange(target, offset, length, access);
>+}
>+
>+void GL_APIENTRY glPauseTransformFeedback()
>+{
>+    return gl::PauseTransformFeedback();
>+}
>+
>+void GL_APIENTRY glProgramBinary(GLuint program,
>+                                 GLenum binaryFormat,
>+                                 const void *binary,
>+                                 GLsizei length)
>+{
>+    return gl::ProgramBinary(program, binaryFormat, binary, length);
>+}
>+
>+void GL_APIENTRY glProgramParameteri(GLuint program, GLenum pname, GLint value)
>+{
>+    return gl::ProgramParameteri(program, pname, value);
>+}
>+
>+void GL_APIENTRY glReadBuffer(GLenum src)
>+{
>+    return gl::ReadBuffer(src);
>+}
>+
>+void GL_APIENTRY glRenderbufferStorageMultisample(GLenum target,
>+                                                  GLsizei samples,
>+                                                  GLenum internalformat,
>+                                                  GLsizei width,
>+                                                  GLsizei height)
>+{
>+    return gl::RenderbufferStorageMultisample(target, samples, internalformat, width, height);
>+}
>+
>+void GL_APIENTRY glResumeTransformFeedback()
>+{
>+    return gl::ResumeTransformFeedback();
>+}
>+
>+void GL_APIENTRY glSamplerParameterf(GLuint sampler, GLenum pname, GLfloat param)
>+{
>+    return gl::SamplerParameterf(sampler, pname, param);
>+}
>+
>+void GL_APIENTRY glSamplerParameterfv(GLuint sampler, GLenum pname, const GLfloat *param)
>+{
>+    return gl::SamplerParameterfv(sampler, pname, param);
>+}
>+
>+void GL_APIENTRY glSamplerParameteri(GLuint sampler, GLenum pname, GLint param)
>+{
>+    return gl::SamplerParameteri(sampler, pname, param);
>+}
>+
>+void GL_APIENTRY glSamplerParameteriv(GLuint sampler, GLenum pname, const GLint *param)
>+{
>+    return gl::SamplerParameteriv(sampler, pname, param);
>+}
>+
>+void GL_APIENTRY glTexImage3D(GLenum target,
>+                              GLint level,
>+                              GLint internalformat,
>+                              GLsizei width,
>+                              GLsizei height,
>+                              GLsizei depth,
>+                              GLint border,
>+                              GLenum format,
>+                              GLenum type,
>+                              const void *pixels)
>+{
>+    return gl::TexImage3D(target, level, internalformat, width, height, depth, border, format, type,
>+                          pixels);
>+}
>+
>+void GL_APIENTRY
>+glTexStorage2D(GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height)
>+{
>+    return gl::TexStorage2D(target, levels, internalformat, width, height);
>+}
>+
>+void GL_APIENTRY glTexStorage3D(GLenum target,
>+                                GLsizei levels,
>+                                GLenum internalformat,
>+                                GLsizei width,
>+                                GLsizei height,
>+                                GLsizei depth)
>+{
>+    return gl::TexStorage3D(target, levels, internalformat, width, height, depth);
>+}
>+
>+void GL_APIENTRY glTexSubImage3D(GLenum target,
>+                                 GLint level,
>+                                 GLint xoffset,
>+                                 GLint yoffset,
>+                                 GLint zoffset,
>+                                 GLsizei width,
>+                                 GLsizei height,
>+                                 GLsizei depth,
>+                                 GLenum format,
>+                                 GLenum type,
>+                                 const void *pixels)
>+{
>+    return gl::TexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format,
>+                             type, pixels);
>+}
>+
>+void GL_APIENTRY glTransformFeedbackVaryings(GLuint program,
>+                                             GLsizei count,
>+                                             const GLchar *const *varyings,
>+                                             GLenum bufferMode)
>+{
>+    return gl::TransformFeedbackVaryings(program, count, varyings, bufferMode);
>+}
>+
>+void GL_APIENTRY glUniform1ui(GLint location, GLuint v0)
>+{
>+    return gl::Uniform1ui(location, v0);
>+}
>+
>+void GL_APIENTRY glUniform1uiv(GLint location, GLsizei count, const GLuint *value)
>+{
>+    return gl::Uniform1uiv(location, count, value);
>+}
>+
>+void GL_APIENTRY glUniform2ui(GLint location, GLuint v0, GLuint v1)
>+{
>+    return gl::Uniform2ui(location, v0, v1);
>+}
>+
>+void GL_APIENTRY glUniform2uiv(GLint location, GLsizei count, const GLuint *value)
>+{
>+    return gl::Uniform2uiv(location, count, value);
>+}
>+
>+void GL_APIENTRY glUniform3ui(GLint location, GLuint v0, GLuint v1, GLuint v2)
>+{
>+    return gl::Uniform3ui(location, v0, v1, v2);
>+}
>+
>+void GL_APIENTRY glUniform3uiv(GLint location, GLsizei count, const GLuint *value)
>+{
>+    return gl::Uniform3uiv(location, count, value);
>+}
>+
>+void GL_APIENTRY glUniform4ui(GLint location, GLuint v0, GLuint v1, GLuint v2, GLuint v3)
>+{
>+    return gl::Uniform4ui(location, v0, v1, v2, v3);
>+}
>+
>+void GL_APIENTRY glUniform4uiv(GLint location, GLsizei count, const GLuint *value)
>+{
>+    return gl::Uniform4uiv(location, count, value);
>+}
>+
>+void GL_APIENTRY glUniformBlockBinding(GLuint program,
>+                                       GLuint uniformBlockIndex,
>+                                       GLuint uniformBlockBinding)
>+{
>+    return gl::UniformBlockBinding(program, uniformBlockIndex, uniformBlockBinding);
>+}
>+
>+void GL_APIENTRY glUniformMatrix2x3fv(GLint location,
>+                                      GLsizei count,
>+                                      GLboolean transpose,
>+                                      const GLfloat *value)
>+{
>+    return gl::UniformMatrix2x3fv(location, count, transpose, value);
>+}
>+
>+void GL_APIENTRY glUniformMatrix2x4fv(GLint location,
>+                                      GLsizei count,
>+                                      GLboolean transpose,
>+                                      const GLfloat *value)
>+{
>+    return gl::UniformMatrix2x4fv(location, count, transpose, value);
>+}
>+
>+void GL_APIENTRY glUniformMatrix3x2fv(GLint location,
>+                                      GLsizei count,
>+                                      GLboolean transpose,
>+                                      const GLfloat *value)
>+{
>+    return gl::UniformMatrix3x2fv(location, count, transpose, value);
>+}
>+
>+void GL_APIENTRY glUniformMatrix3x4fv(GLint location,
>+                                      GLsizei count,
>+                                      GLboolean transpose,
>+                                      const GLfloat *value)
>+{
>+    return gl::UniformMatrix3x4fv(location, count, transpose, value);
>+}
>+
>+void GL_APIENTRY glUniformMatrix4x2fv(GLint location,
>+                                      GLsizei count,
>+                                      GLboolean transpose,
>+                                      const GLfloat *value)
>+{
>+    return gl::UniformMatrix4x2fv(location, count, transpose, value);
>+}
>+
>+void GL_APIENTRY glUniformMatrix4x3fv(GLint location,
>+                                      GLsizei count,
>+                                      GLboolean transpose,
>+                                      const GLfloat *value)
>+{
>+    return gl::UniformMatrix4x3fv(location, count, transpose, value);
>+}
>+
>+GLboolean GL_APIENTRY glUnmapBuffer(GLenum target)
>+{
>+    return gl::UnmapBuffer(target);
>+}
>+
>+void GL_APIENTRY glVertexAttribDivisor(GLuint index, GLuint divisor)
>+{
>+    return gl::VertexAttribDivisor(index, divisor);
>+}
>+
>+void GL_APIENTRY glVertexAttribI4i(GLuint index, GLint x, GLint y, GLint z, GLint w)
>+{
>+    return gl::VertexAttribI4i(index, x, y, z, w);
>+}
>+
>+void GL_APIENTRY glVertexAttribI4iv(GLuint index, const GLint *v)
>+{
>+    return gl::VertexAttribI4iv(index, v);
>+}
>+
>+void GL_APIENTRY glVertexAttribI4ui(GLuint index, GLuint x, GLuint y, GLuint z, GLuint w)
>+{
>+    return gl::VertexAttribI4ui(index, x, y, z, w);
>+}
>+
>+void GL_APIENTRY glVertexAttribI4uiv(GLuint index, const GLuint *v)
>+{
>+    return gl::VertexAttribI4uiv(index, v);
>+}
>+
>+void GL_APIENTRY
>+glVertexAttribIPointer(GLuint index, GLint size, GLenum type, GLsizei stride, const void *pointer)
>+{
>+    return gl::VertexAttribIPointer(index, size, type, stride, pointer);
>+}
>+
>+void GL_APIENTRY glWaitSync(GLsync sync, GLbitfield flags, GLuint64 timeout)
>+{
>+    return gl::WaitSync(sync, flags, timeout);
>+}
>+
>+// OpenGL ES 3.1
>+void GL_APIENTRY glActiveShaderProgram(GLuint pipeline, GLuint program)
>+{
>+    return gl::ActiveShaderProgram(pipeline, program);
>+}
>+
>+void GL_APIENTRY glBindImageTexture(GLuint unit,
>+                                    GLuint texture,
>+                                    GLint level,
>+                                    GLboolean layered,
>+                                    GLint layer,
>+                                    GLenum access,
>+                                    GLenum format)
>+{
>+    return gl::BindImageTexture(unit, texture, level, layered, layer, access, format);
>+}
>+
>+void GL_APIENTRY glBindProgramPipeline(GLuint pipeline)
>+{
>+    return gl::BindProgramPipeline(pipeline);
>+}
>+
>+void GL_APIENTRY glBindVertexBuffer(GLuint bindingindex,
>+                                    GLuint buffer,
>+                                    GLintptr offset,
>+                                    GLsizei stride)
>+{
>+    return gl::BindVertexBuffer(bindingindex, buffer, offset, stride);
>+}
>+
>+GLuint GL_APIENTRY glCreateShaderProgramv(GLenum type, GLsizei count, const GLchar *const *strings)
>+{
>+    return gl::CreateShaderProgramv(type, count, strings);
>+}
>+
>+void GL_APIENTRY glDeleteProgramPipelines(GLsizei n, const GLuint *pipelines)
>+{
>+    return gl::DeleteProgramPipelines(n, pipelines);
>+}
>+
>+void GL_APIENTRY glDispatchCompute(GLuint num_groups_x, GLuint num_groups_y, GLuint num_groups_z)
>+{
>+    return gl::DispatchCompute(num_groups_x, num_groups_y, num_groups_z);
>+}
>+
>+void GL_APIENTRY glDispatchComputeIndirect(GLintptr indirect)
>+{
>+    return gl::DispatchComputeIndirect(indirect);
>+}
>+
>+void GL_APIENTRY glDrawArraysIndirect(GLenum mode, const void *indirect)
>+{
>+    return gl::DrawArraysIndirect(mode, indirect);
>+}
>+
>+void GL_APIENTRY glDrawElementsIndirect(GLenum mode, GLenum type, const void *indirect)
>+{
>+    return gl::DrawElementsIndirect(mode, type, indirect);
>+}
>+
>+void GL_APIENTRY glFramebufferParameteri(GLenum target, GLenum pname, GLint param)
>+{
>+    return gl::FramebufferParameteri(target, pname, param);
>+}
>+
>+void GL_APIENTRY glGenProgramPipelines(GLsizei n, GLuint *pipelines)
>+{
>+    return gl::GenProgramPipelines(n, pipelines);
>+}
>+
>+void GL_APIENTRY glGetBooleani_v(GLenum target, GLuint index, GLboolean *data)
>+{
>+    return gl::GetBooleani_v(target, index, data);
>+}
>+
>+void GL_APIENTRY glGetFramebufferParameteriv(GLenum target, GLenum pname, GLint *params)
>+{
>+    return gl::GetFramebufferParameteriv(target, pname, params);
>+}
>+
>+void GL_APIENTRY glGetMultisamplefv(GLenum pname, GLuint index, GLfloat *val)
>+{
>+    return gl::GetMultisamplefv(pname, index, val);
>+}
>+
>+void GL_APIENTRY glGetProgramInterfaceiv(GLuint program,
>+                                         GLenum programInterface,
>+                                         GLenum pname,
>+                                         GLint *params)
>+{
>+    return gl::GetProgramInterfaceiv(program, programInterface, pname, params);
>+}
>+
>+void GL_APIENTRY glGetProgramPipelineInfoLog(GLuint pipeline,
>+                                             GLsizei bufSize,
>+                                             GLsizei *length,
>+                                             GLchar *infoLog)
>+{
>+    return gl::GetProgramPipelineInfoLog(pipeline, bufSize, length, infoLog);
>+}
>+
>+void GL_APIENTRY glGetProgramPipelineiv(GLuint pipeline, GLenum pname, GLint *params)
>+{
>+    return gl::GetProgramPipelineiv(pipeline, pname, params);
>+}
>+
>+GLuint GL_APIENTRY glGetProgramResourceIndex(GLuint program,
>+                                             GLenum programInterface,
>+                                             const GLchar *name)
>+{
>+    return gl::GetProgramResourceIndex(program, programInterface, name);
>+}
>+
>+GLint GL_APIENTRY glGetProgramResourceLocation(GLuint program,
>+                                               GLenum programInterface,
>+                                               const GLchar *name)
>+{
>+    return gl::GetProgramResourceLocation(program, programInterface, name);
>+}
>+
>+void GL_APIENTRY glGetProgramResourceName(GLuint program,
>+                                          GLenum programInterface,
>+                                          GLuint index,
>+                                          GLsizei bufSize,
>+                                          GLsizei *length,
>+                                          GLchar *name)
>+{
>+    return gl::GetProgramResourceName(program, programInterface, index, bufSize, length, name);
>+}
>+
>+void GL_APIENTRY glGetProgramResourceiv(GLuint program,
>+                                        GLenum programInterface,
>+                                        GLuint index,
>+                                        GLsizei propCount,
>+                                        const GLenum *props,
>+                                        GLsizei bufSize,
>+                                        GLsizei *length,
>+                                        GLint *params)
>+{
>+    return gl::GetProgramResourceiv(program, programInterface, index, propCount, props, bufSize,
>+                                    length, params);
>+}
>+
>+void GL_APIENTRY glGetTexLevelParameterfv(GLenum target, GLint level, GLenum pname, GLfloat *params)
>+{
>+    return gl::GetTexLevelParameterfv(target, level, pname, params);
>+}
>+
>+void GL_APIENTRY glGetTexLevelParameteriv(GLenum target, GLint level, GLenum pname, GLint *params)
>+{
>+    return gl::GetTexLevelParameteriv(target, level, pname, params);
>+}
>+
>+GLboolean GL_APIENTRY glIsProgramPipeline(GLuint pipeline)
>+{
>+    return gl::IsProgramPipeline(pipeline);
>+}
>+
>+void GL_APIENTRY glMemoryBarrier(GLbitfield barriers)
>+{
>+    return gl::MemoryBarrier(barriers);
>+}
>+
>+void GL_APIENTRY glMemoryBarrierByRegion(GLbitfield barriers)
>+{
>+    return gl::MemoryBarrierByRegion(barriers);
>+}
>+
>+void GL_APIENTRY glProgramUniform1f(GLuint program, GLint location, GLfloat v0)
>+{
>+    return gl::ProgramUniform1f(program, location, v0);
>+}
>+
>+void GL_APIENTRY glProgramUniform1fv(GLuint program,
>+                                     GLint location,
>+                                     GLsizei count,
>+                                     const GLfloat *value)
>+{
>+    return gl::ProgramUniform1fv(program, location, count, value);
>+}
>+
>+void GL_APIENTRY glProgramUniform1i(GLuint program, GLint location, GLint v0)
>+{
>+    return gl::ProgramUniform1i(program, location, v0);
>+}
>+
>+void GL_APIENTRY glProgramUniform1iv(GLuint program,
>+                                     GLint location,
>+                                     GLsizei count,
>+                                     const GLint *value)
>+{
>+    return gl::ProgramUniform1iv(program, location, count, value);
>+}
>+
>+void GL_APIENTRY glProgramUniform1ui(GLuint program, GLint location, GLuint v0)
>+{
>+    return gl::ProgramUniform1ui(program, location, v0);
>+}
>+
>+void GL_APIENTRY glProgramUniform1uiv(GLuint program,
>+                                      GLint location,
>+                                      GLsizei count,
>+                                      const GLuint *value)
>+{
>+    return gl::ProgramUniform1uiv(program, location, count, value);
>+}
>+
>+void GL_APIENTRY glProgramUniform2f(GLuint program, GLint location, GLfloat v0, GLfloat v1)
>+{
>+    return gl::ProgramUniform2f(program, location, v0, v1);
>+}
>+
>+void GL_APIENTRY glProgramUniform2fv(GLuint program,
>+                                     GLint location,
>+                                     GLsizei count,
>+                                     const GLfloat *value)
>+{
>+    return gl::ProgramUniform2fv(program, location, count, value);
>+}
>+
>+void GL_APIENTRY glProgramUniform2i(GLuint program, GLint location, GLint v0, GLint v1)
>+{
>+    return gl::ProgramUniform2i(program, location, v0, v1);
>+}
>+
>+void GL_APIENTRY glProgramUniform2iv(GLuint program,
>+                                     GLint location,
>+                                     GLsizei count,
>+                                     const GLint *value)
>+{
>+    return gl::ProgramUniform2iv(program, location, count, value);
>+}
>+
>+void GL_APIENTRY glProgramUniform2ui(GLuint program, GLint location, GLuint v0, GLuint v1)
>+{
>+    return gl::ProgramUniform2ui(program, location, v0, v1);
>+}
>+
>+void GL_APIENTRY glProgramUniform2uiv(GLuint program,
>+                                      GLint location,
>+                                      GLsizei count,
>+                                      const GLuint *value)
>+{
>+    return gl::ProgramUniform2uiv(program, location, count, value);
>+}
>+
>+void GL_APIENTRY
>+glProgramUniform3f(GLuint program, GLint location, GLfloat v0, GLfloat v1, GLfloat v2)
>+{
>+    return gl::ProgramUniform3f(program, location, v0, v1, v2);
>+}
>+
>+void GL_APIENTRY glProgramUniform3fv(GLuint program,
>+                                     GLint location,
>+                                     GLsizei count,
>+                                     const GLfloat *value)
>+{
>+    return gl::ProgramUniform3fv(program, location, count, value);
>+}
>+
>+void GL_APIENTRY glProgramUniform3i(GLuint program, GLint location, GLint v0, GLint v1, GLint v2)
>+{
>+    return gl::ProgramUniform3i(program, location, v0, v1, v2);
>+}
>+
>+void GL_APIENTRY glProgramUniform3iv(GLuint program,
>+                                     GLint location,
>+                                     GLsizei count,
>+                                     const GLint *value)
>+{
>+    return gl::ProgramUniform3iv(program, location, count, value);
>+}
>+
>+void GL_APIENTRY
>+glProgramUniform3ui(GLuint program, GLint location, GLuint v0, GLuint v1, GLuint v2)
>+{
>+    return gl::ProgramUniform3ui(program, location, v0, v1, v2);
>+}
>+
>+void GL_APIENTRY glProgramUniform3uiv(GLuint program,
>+                                      GLint location,
>+                                      GLsizei count,
>+                                      const GLuint *value)
>+{
>+    return gl::ProgramUniform3uiv(program, location, count, value);
>+}
>+
>+void GL_APIENTRY
>+glProgramUniform4f(GLuint program, GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3)
>+{
>+    return gl::ProgramUniform4f(program, location, v0, v1, v2, v3);
>+}
>+
>+void GL_APIENTRY glProgramUniform4fv(GLuint program,
>+                                     GLint location,
>+                                     GLsizei count,
>+                                     const GLfloat *value)
>+{
>+    return gl::ProgramUniform4fv(program, location, count, value);
>+}
>+
>+void GL_APIENTRY
>+glProgramUniform4i(GLuint program, GLint location, GLint v0, GLint v1, GLint v2, GLint v3)
>+{
>+    return gl::ProgramUniform4i(program, location, v0, v1, v2, v3);
>+}
>+
>+void GL_APIENTRY glProgramUniform4iv(GLuint program,
>+                                     GLint location,
>+                                     GLsizei count,
>+                                     const GLint *value)
>+{
>+    return gl::ProgramUniform4iv(program, location, count, value);
>+}
>+
>+void GL_APIENTRY
>+glProgramUniform4ui(GLuint program, GLint location, GLuint v0, GLuint v1, GLuint v2, GLuint v3)
>+{
>+    return gl::ProgramUniform4ui(program, location, v0, v1, v2, v3);
>+}
>+
>+void GL_APIENTRY glProgramUniform4uiv(GLuint program,
>+                                      GLint location,
>+                                      GLsizei count,
>+                                      const GLuint *value)
>+{
>+    return gl::ProgramUniform4uiv(program, location, count, value);
>+}
>+
>+void GL_APIENTRY glProgramUniformMatrix2fv(GLuint program,
>+                                           GLint location,
>+                                           GLsizei count,
>+                                           GLboolean transpose,
>+                                           const GLfloat *value)
>+{
>+    return gl::ProgramUniformMatrix2fv(program, location, count, transpose, value);
>+}
>+
>+void GL_APIENTRY glProgramUniformMatrix2x3fv(GLuint program,
>+                                             GLint location,
>+                                             GLsizei count,
>+                                             GLboolean transpose,
>+                                             const GLfloat *value)
>+{
>+    return gl::ProgramUniformMatrix2x3fv(program, location, count, transpose, value);
>+}
>+
>+void GL_APIENTRY glProgramUniformMatrix2x4fv(GLuint program,
>+                                             GLint location,
>+                                             GLsizei count,
>+                                             GLboolean transpose,
>+                                             const GLfloat *value)
>+{
>+    return gl::ProgramUniformMatrix2x4fv(program, location, count, transpose, value);
>+}
>+
>+void GL_APIENTRY glProgramUniformMatrix3fv(GLuint program,
>+                                           GLint location,
>+                                           GLsizei count,
>+                                           GLboolean transpose,
>+                                           const GLfloat *value)
>+{
>+    return gl::ProgramUniformMatrix3fv(program, location, count, transpose, value);
>+}
>+
>+void GL_APIENTRY glProgramUniformMatrix3x2fv(GLuint program,
>+                                             GLint location,
>+                                             GLsizei count,
>+                                             GLboolean transpose,
>+                                             const GLfloat *value)
>+{
>+    return gl::ProgramUniformMatrix3x2fv(program, location, count, transpose, value);
>+}
>+
>+void GL_APIENTRY glProgramUniformMatrix3x4fv(GLuint program,
>+                                             GLint location,
>+                                             GLsizei count,
>+                                             GLboolean transpose,
>+                                             const GLfloat *value)
>+{
>+    return gl::ProgramUniformMatrix3x4fv(program, location, count, transpose, value);
>+}
>+
>+void GL_APIENTRY glProgramUniformMatrix4fv(GLuint program,
>+                                           GLint location,
>+                                           GLsizei count,
>+                                           GLboolean transpose,
>+                                           const GLfloat *value)
>+{
>+    return gl::ProgramUniformMatrix4fv(program, location, count, transpose, value);
>+}
>+
>+void GL_APIENTRY glProgramUniformMatrix4x2fv(GLuint program,
>+                                             GLint location,
>+                                             GLsizei count,
>+                                             GLboolean transpose,
>+                                             const GLfloat *value)
>+{
>+    return gl::ProgramUniformMatrix4x2fv(program, location, count, transpose, value);
>+}
>+
>+void GL_APIENTRY glProgramUniformMatrix4x3fv(GLuint program,
>+                                             GLint location,
>+                                             GLsizei count,
>+                                             GLboolean transpose,
>+                                             const GLfloat *value)
>+{
>+    return gl::ProgramUniformMatrix4x3fv(program, location, count, transpose, value);
>+}
>+
>+void GL_APIENTRY glSampleMaski(GLuint maskNumber, GLbitfield mask)
>+{
>+    return gl::SampleMaski(maskNumber, mask);
>+}
>+
>+void GL_APIENTRY glTexStorage2DMultisample(GLenum target,
>+                                           GLsizei samples,
>+                                           GLenum internalformat,
>+                                           GLsizei width,
>+                                           GLsizei height,
>+                                           GLboolean fixedsamplelocations)
>+{
>+    return gl::TexStorage2DMultisample(target, samples, internalformat, width, height,
>+                                       fixedsamplelocations);
>+}
>+
>+void GL_APIENTRY glUseProgramStages(GLuint pipeline, GLbitfield stages, GLuint program)
>+{
>+    return gl::UseProgramStages(pipeline, stages, program);
>+}
>+
>+void GL_APIENTRY glValidateProgramPipeline(GLuint pipeline)
>+{
>+    return gl::ValidateProgramPipeline(pipeline);
>+}
>+
>+void GL_APIENTRY glVertexAttribBinding(GLuint attribindex, GLuint bindingindex)
>+{
>+    return gl::VertexAttribBinding(attribindex, bindingindex);
>+}
>+
>+void GL_APIENTRY glVertexAttribFormat(GLuint attribindex,
>+                                      GLint size,
>+                                      GLenum type,
>+                                      GLboolean normalized,
>+                                      GLuint relativeoffset)
>+{
>+    return gl::VertexAttribFormat(attribindex, size, type, normalized, relativeoffset);
>+}
>+
>+void GL_APIENTRY glVertexAttribIFormat(GLuint attribindex,
>+                                       GLint size,
>+                                       GLenum type,
>+                                       GLuint relativeoffset)
>+{
>+    return gl::VertexAttribIFormat(attribindex, size, type, relativeoffset);
>+}
>+
>+void GL_APIENTRY glVertexBindingDivisor(GLuint bindingindex, GLuint divisor)
>+{
>+    return gl::VertexBindingDivisor(bindingindex, divisor);
>+}
>+
>+// OpenGL ES 1.0
>+void GL_APIENTRY glAlphaFunc(GLenum func, GLfloat ref)
>+{
>+    return gl::AlphaFunc(func, ref);
>+}
>+
>+void GL_APIENTRY glAlphaFuncx(GLenum func, GLfixed ref)
>+{
>+    return gl::AlphaFuncx(func, ref);
>+}
>+
>+void GL_APIENTRY glClearColorx(GLfixed red, GLfixed green, GLfixed blue, GLfixed alpha)
>+{
>+    return gl::ClearColorx(red, green, blue, alpha);
>+}
>+
>+void GL_APIENTRY glClearDepthx(GLfixed depth)
>+{
>+    return gl::ClearDepthx(depth);
>+}
>+
>+void GL_APIENTRY glClientActiveTexture(GLenum texture)
>+{
>+    return gl::ClientActiveTexture(texture);
>+}
>+
>+void GL_APIENTRY glClipPlanef(GLenum p, const GLfloat *eqn)
>+{
>+    return gl::ClipPlanef(p, eqn);
>+}
>+
>+void GL_APIENTRY glClipPlanex(GLenum plane, const GLfixed *equation)
>+{
>+    return gl::ClipPlanex(plane, equation);
>+}
>+
>+void GL_APIENTRY glColor4f(GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha)
>+{
>+    return gl::Color4f(red, green, blue, alpha);
>+}
>+
>+void GL_APIENTRY glColor4ub(GLubyte red, GLubyte green, GLubyte blue, GLubyte alpha)
>+{
>+    return gl::Color4ub(red, green, blue, alpha);
>+}
>+
>+void GL_APIENTRY glColor4x(GLfixed red, GLfixed green, GLfixed blue, GLfixed alpha)
>+{
>+    return gl::Color4x(red, green, blue, alpha);
>+}
>+
>+void GL_APIENTRY glColorPointer(GLint size, GLenum type, GLsizei stride, const void *pointer)
>+{
>+    return gl::ColorPointer(size, type, stride, pointer);
>+}
>+
>+void GL_APIENTRY glDepthRangex(GLfixed n, GLfixed f)
>+{
>+    return gl::DepthRangex(n, f);
>+}
>+
>+void GL_APIENTRY glDisableClientState(GLenum array)
>+{
>+    return gl::DisableClientState(array);
>+}
>+
>+void GL_APIENTRY glEnableClientState(GLenum array)
>+{
>+    return gl::EnableClientState(array);
>+}
>+
>+void GL_APIENTRY glFogf(GLenum pname, GLfloat param)
>+{
>+    return gl::Fogf(pname, param);
>+}
>+
>+void GL_APIENTRY glFogfv(GLenum pname, const GLfloat *params)
>+{
>+    return gl::Fogfv(pname, params);
>+}
>+
>+void GL_APIENTRY glFogx(GLenum pname, GLfixed param)
>+{
>+    return gl::Fogx(pname, param);
>+}
>+
>+void GL_APIENTRY glFogxv(GLenum pname, const GLfixed *param)
>+{
>+    return gl::Fogxv(pname, param);
>+}
>+
>+void GL_APIENTRY glFrustumf(GLfloat l, GLfloat r, GLfloat b, GLfloat t, GLfloat n, GLfloat f)
>+{
>+    return gl::Frustumf(l, r, b, t, n, f);
>+}
>+
>+void GL_APIENTRY glFrustumx(GLfixed l, GLfixed r, GLfixed b, GLfixed t, GLfixed n, GLfixed f)
>+{
>+    return gl::Frustumx(l, r, b, t, n, f);
>+}
>+
>+void GL_APIENTRY glGetClipPlanef(GLenum plane, GLfloat *equation)
>+{
>+    return gl::GetClipPlanef(plane, equation);
>+}
>+
>+void GL_APIENTRY glGetClipPlanex(GLenum plane, GLfixed *equation)
>+{
>+    return gl::GetClipPlanex(plane, equation);
>+}
>+
>+void GL_APIENTRY glGetFixedv(GLenum pname, GLfixed *params)
>+{
>+    return gl::GetFixedv(pname, params);
>+}
>+
>+void GL_APIENTRY glGetLightfv(GLenum light, GLenum pname, GLfloat *params)
>+{
>+    return gl::GetLightfv(light, pname, params);
>+}
>+
>+void GL_APIENTRY glGetLightxv(GLenum light, GLenum pname, GLfixed *params)
>+{
>+    return gl::GetLightxv(light, pname, params);
>+}
>+
>+void GL_APIENTRY glGetMaterialfv(GLenum face, GLenum pname, GLfloat *params)
>+{
>+    return gl::GetMaterialfv(face, pname, params);
>+}
>+
>+void GL_APIENTRY glGetMaterialxv(GLenum face, GLenum pname, GLfixed *params)
>+{
>+    return gl::GetMaterialxv(face, pname, params);
>+}
>+
>+void GL_APIENTRY glGetPointerv(GLenum pname, void **params)
>+{
>+    return gl::GetPointerv(pname, params);
>+}
>+
>+void GL_APIENTRY glGetTexEnvfv(GLenum target, GLenum pname, GLfloat *params)
>+{
>+    return gl::GetTexEnvfv(target, pname, params);
>+}
>+
>+void GL_APIENTRY glGetTexEnviv(GLenum target, GLenum pname, GLint *params)
>+{
>+    return gl::GetTexEnviv(target, pname, params);
>+}
>+
>+void GL_APIENTRY glGetTexEnvxv(GLenum target, GLenum pname, GLfixed *params)
>+{
>+    return gl::GetTexEnvxv(target, pname, params);
>+}
>+
>+void GL_APIENTRY glGetTexParameterxv(GLenum target, GLenum pname, GLfixed *params)
>+{
>+    return gl::GetTexParameterxv(target, pname, params);
>+}
>+
>+void GL_APIENTRY glLightModelf(GLenum pname, GLfloat param)
>+{
>+    return gl::LightModelf(pname, param);
>+}
>+
>+void GL_APIENTRY glLightModelfv(GLenum pname, const GLfloat *params)
>+{
>+    return gl::LightModelfv(pname, params);
>+}
>+
>+void GL_APIENTRY glLightModelx(GLenum pname, GLfixed param)
>+{
>+    return gl::LightModelx(pname, param);
>+}
>+
>+void GL_APIENTRY glLightModelxv(GLenum pname, const GLfixed *param)
>+{
>+    return gl::LightModelxv(pname, param);
>+}
>+
>+void GL_APIENTRY glLightf(GLenum light, GLenum pname, GLfloat param)
>+{
>+    return gl::Lightf(light, pname, param);
>+}
>+
>+void GL_APIENTRY glLightfv(GLenum light, GLenum pname, const GLfloat *params)
>+{
>+    return gl::Lightfv(light, pname, params);
>+}
>+
>+void GL_APIENTRY glLightx(GLenum light, GLenum pname, GLfixed param)
>+{
>+    return gl::Lightx(light, pname, param);
>+}
>+
>+void GL_APIENTRY glLightxv(GLenum light, GLenum pname, const GLfixed *params)
>+{
>+    return gl::Lightxv(light, pname, params);
>+}
>+
>+void GL_APIENTRY glLineWidthx(GLfixed width)
>+{
>+    return gl::LineWidthx(width);
>+}
>+
>+void GL_APIENTRY glLoadIdentity()
>+{
>+    return gl::LoadIdentity();
>+}
>+
>+void GL_APIENTRY glLoadMatrixf(const GLfloat *m)
>+{
>+    return gl::LoadMatrixf(m);
>+}
>+
>+void GL_APIENTRY glLoadMatrixx(const GLfixed *m)
>+{
>+    return gl::LoadMatrixx(m);
>+}
>+
>+void GL_APIENTRY glLogicOp(GLenum opcode)
>+{
>+    return gl::LogicOp(opcode);
>+}
>+
>+void GL_APIENTRY glMaterialf(GLenum face, GLenum pname, GLfloat param)
>+{
>+    return gl::Materialf(face, pname, param);
>+}
>+
>+void GL_APIENTRY glMaterialfv(GLenum face, GLenum pname, const GLfloat *params)
>+{
>+    return gl::Materialfv(face, pname, params);
>+}
>+
>+void GL_APIENTRY glMaterialx(GLenum face, GLenum pname, GLfixed param)
>+{
>+    return gl::Materialx(face, pname, param);
>+}
>+
>+void GL_APIENTRY glMaterialxv(GLenum face, GLenum pname, const GLfixed *param)
>+{
>+    return gl::Materialxv(face, pname, param);
>+}
>+
>+void GL_APIENTRY glMatrixMode(GLenum mode)
>+{
>+    return gl::MatrixMode(mode);
>+}
>+
>+void GL_APIENTRY glMultMatrixf(const GLfloat *m)
>+{
>+    return gl::MultMatrixf(m);
>+}
>+
>+void GL_APIENTRY glMultMatrixx(const GLfixed *m)
>+{
>+    return gl::MultMatrixx(m);
>+}
>+
>+void GL_APIENTRY glMultiTexCoord4f(GLenum target, GLfloat s, GLfloat t, GLfloat r, GLfloat q)
>+{
>+    return gl::MultiTexCoord4f(target, s, t, r, q);
>+}
>+
>+void GL_APIENTRY glMultiTexCoord4x(GLenum texture, GLfixed s, GLfixed t, GLfixed r, GLfixed q)
>+{
>+    return gl::MultiTexCoord4x(texture, s, t, r, q);
>+}
>+
>+void GL_APIENTRY glNormal3f(GLfloat nx, GLfloat ny, GLfloat nz)
>+{
>+    return gl::Normal3f(nx, ny, nz);
>+}
>+
>+void GL_APIENTRY glNormal3x(GLfixed nx, GLfixed ny, GLfixed nz)
>+{
>+    return gl::Normal3x(nx, ny, nz);
>+}
>+
>+void GL_APIENTRY glNormalPointer(GLenum type, GLsizei stride, const void *pointer)
>+{
>+    return gl::NormalPointer(type, stride, pointer);
>+}
>+
>+void GL_APIENTRY glOrthof(GLfloat l, GLfloat r, GLfloat b, GLfloat t, GLfloat n, GLfloat f)
>+{
>+    return gl::Orthof(l, r, b, t, n, f);
>+}
>+
>+void GL_APIENTRY glOrthox(GLfixed l, GLfixed r, GLfixed b, GLfixed t, GLfixed n, GLfixed f)
>+{
>+    return gl::Orthox(l, r, b, t, n, f);
>+}
>+
>+void GL_APIENTRY glPointParameterf(GLenum pname, GLfloat param)
>+{
>+    return gl::PointParameterf(pname, param);
>+}
>+
>+void GL_APIENTRY glPointParameterfv(GLenum pname, const GLfloat *params)
>+{
>+    return gl::PointParameterfv(pname, params);
>+}
>+
>+void GL_APIENTRY glPointParameterx(GLenum pname, GLfixed param)
>+{
>+    return gl::PointParameterx(pname, param);
>+}
>+
>+void GL_APIENTRY glPointParameterxv(GLenum pname, const GLfixed *params)
>+{
>+    return gl::PointParameterxv(pname, params);
>+}
>+
>+void GL_APIENTRY glPointSize(GLfloat size)
>+{
>+    return gl::PointSize(size);
>+}
>+
>+void GL_APIENTRY glPointSizex(GLfixed size)
>+{
>+    return gl::PointSizex(size);
>+}
>+
>+void GL_APIENTRY glPolygonOffsetx(GLfixed factor, GLfixed units)
>+{
>+    return gl::PolygonOffsetx(factor, units);
>+}
>+
>+void GL_APIENTRY glPopMatrix()
>+{
>+    return gl::PopMatrix();
>+}
>+
>+void GL_APIENTRY glPushMatrix()
>+{
>+    return gl::PushMatrix();
>+}
>+
>+void GL_APIENTRY glRotatef(GLfloat angle, GLfloat x, GLfloat y, GLfloat z)
>+{
>+    return gl::Rotatef(angle, x, y, z);
>+}
>+
>+void GL_APIENTRY glRotatex(GLfixed angle, GLfixed x, GLfixed y, GLfixed z)
>+{
>+    return gl::Rotatex(angle, x, y, z);
>+}
>+
>+void GL_APIENTRY glSampleCoveragex(GLclampx value, GLboolean invert)
>+{
>+    return gl::SampleCoveragex(value, invert);
>+}
>+
>+void GL_APIENTRY glScalef(GLfloat x, GLfloat y, GLfloat z)
>+{
>+    return gl::Scalef(x, y, z);
>+}
>+
>+void GL_APIENTRY glScalex(GLfixed x, GLfixed y, GLfixed z)
>+{
>+    return gl::Scalex(x, y, z);
>+}
>+
>+void GL_APIENTRY glShadeModel(GLenum mode)
>+{
>+    return gl::ShadeModel(mode);
>+}
>+
>+void GL_APIENTRY glTexCoordPointer(GLint size, GLenum type, GLsizei stride, const void *pointer)
>+{
>+    return gl::TexCoordPointer(size, type, stride, pointer);
>+}
>+
>+void GL_APIENTRY glTexEnvf(GLenum target, GLenum pname, GLfloat param)
>+{
>+    return gl::TexEnvf(target, pname, param);
>+}
>+
>+void GL_APIENTRY glTexEnvfv(GLenum target, GLenum pname, const GLfloat *params)
>+{
>+    return gl::TexEnvfv(target, pname, params);
>+}
>+
>+void GL_APIENTRY glTexEnvi(GLenum target, GLenum pname, GLint param)
>+{
>+    return gl::TexEnvi(target, pname, param);
>+}
>+
>+void GL_APIENTRY glTexEnviv(GLenum target, GLenum pname, const GLint *params)
>+{
>+    return gl::TexEnviv(target, pname, params);
>+}
>+
>+void GL_APIENTRY glTexEnvx(GLenum target, GLenum pname, GLfixed param)
>+{
>+    return gl::TexEnvx(target, pname, param);
>+}
>+
>+void GL_APIENTRY glTexEnvxv(GLenum target, GLenum pname, const GLfixed *params)
>+{
>+    return gl::TexEnvxv(target, pname, params);
>+}
>+
>+void GL_APIENTRY glTexParameterx(GLenum target, GLenum pname, GLfixed param)
>+{
>+    return gl::TexParameterx(target, pname, param);
>+}
>+
>+void GL_APIENTRY glTexParameterxv(GLenum target, GLenum pname, const GLfixed *params)
>+{
>+    return gl::TexParameterxv(target, pname, params);
>+}
>+
>+void GL_APIENTRY glTranslatef(GLfloat x, GLfloat y, GLfloat z)
>+{
>+    return gl::Translatef(x, y, z);
>+}
>+
>+void GL_APIENTRY glTranslatex(GLfixed x, GLfixed y, GLfixed z)
>+{
>+    return gl::Translatex(x, y, z);
>+}
>+
>+void GL_APIENTRY glVertexPointer(GLint size, GLenum type, GLsizei stride, const void *pointer)
>+{
>+    return gl::VertexPointer(size, type, stride, pointer);
>+}
>+
>+// GL_ANGLE_copy_texture_3d
>+void GL_APIENTRY glCopyTexture3DANGLE(GLuint sourceId,
>+                                      GLint sourceLevel,
>+                                      GLenum destTarget,
>+                                      GLuint destId,
>+                                      GLint destLevel,
>+                                      GLint internalFormat,
>+                                      GLenum destType,
>+                                      GLboolean unpackFlipY,
>+                                      GLboolean unpackPremultiplyAlpha,
>+                                      GLboolean unpackUnmultiplyAlpha)
>+{
>+    return gl::CopyTexture3DANGLE(sourceId, sourceLevel, destTarget, destId, destLevel,
>+                                  internalFormat, destType, unpackFlipY, unpackPremultiplyAlpha,
>+                                  unpackUnmultiplyAlpha);
>+}
>+
>+void GL_APIENTRY glCopySubTexture3DANGLE(GLuint sourceId,
>+                                         GLint sourceLevel,
>+                                         GLenum destTarget,
>+                                         GLuint destId,
>+                                         GLint destLevel,
>+                                         GLint xoffset,
>+                                         GLint yoffset,
>+                                         GLint zoffset,
>+                                         GLint x,
>+                                         GLint y,
>+                                         GLint z,
>+                                         GLint width,
>+                                         GLint height,
>+                                         GLint depth,
>+                                         GLboolean unpackFlipY,
>+                                         GLboolean unpackPremultiplyAlpha,
>+                                         GLboolean unpackUnmultiplyAlpha)
>+{
>+    return gl::CopySubTexture3DANGLE(sourceId, sourceLevel, destTarget, destId, destLevel, xoffset,
>+                                     yoffset, zoffset, x, y, z, width, height, depth, unpackFlipY,
>+                                     unpackPremultiplyAlpha, unpackUnmultiplyAlpha);
>+}
>+
>+// GL_ANGLE_framebuffer_blit
>+void GL_APIENTRY glBlitFramebufferANGLE(GLint srcX0,
>+                                        GLint srcY0,
>+                                        GLint srcX1,
>+                                        GLint srcY1,
>+                                        GLint dstX0,
>+                                        GLint dstY0,
>+                                        GLint dstX1,
>+                                        GLint dstY1,
>+                                        GLbitfield mask,
>+                                        GLenum filter)
>+{
>+    return gl::BlitFramebufferANGLE(srcX0, srcY0, srcX1, srcY1, dstX0, dstY0, dstX1, dstY1, mask,
>+                                    filter);
>+}
>+
>+// GL_ANGLE_framebuffer_multisample
>+void GL_APIENTRY glRenderbufferStorageMultisampleANGLE(GLenum target,
>+                                                       GLsizei samples,
>+                                                       GLenum internalformat,
>+                                                       GLsizei width,
>+                                                       GLsizei height)
>+{
>+    return gl::RenderbufferStorageMultisampleANGLE(target, samples, internalformat, width, height);
>+}
>+
>+// GL_ANGLE_instanced_arrays
>+void GL_APIENTRY glDrawArraysInstancedANGLE(GLenum mode,
>+                                            GLint first,
>+                                            GLsizei count,
>+                                            GLsizei primcount)
>+{
>+    return gl::DrawArraysInstancedANGLE(mode, first, count, primcount);
>+}
>+
>+void GL_APIENTRY glDrawElementsInstancedANGLE(GLenum mode,
>+                                              GLsizei count,
>+                                              GLenum type,
>+                                              const void *indices,
>+                                              GLsizei primcount)
>+{
>+    return gl::DrawElementsInstancedANGLE(mode, count, type, indices, primcount);
>+}
>+
>+void GL_APIENTRY glVertexAttribDivisorANGLE(GLuint index, GLuint divisor)
>+{
>+    return gl::VertexAttribDivisorANGLE(index, divisor);
>+}
>+
>+// GL_ANGLE_multi_draw
>+void GL_APIENTRY glMultiDrawArraysANGLE(GLenum mode,
>+                                        const GLint *firsts,
>+                                        const GLsizei *counts,
>+                                        GLsizei drawcount)
>+{
>+    return gl::MultiDrawArraysANGLE(mode, firsts, counts, drawcount);
>+}
>+
>+void GL_APIENTRY glMultiDrawArraysInstancedANGLE(GLenum mode,
>+                                                 const GLint *firsts,
>+                                                 const GLsizei *counts,
>+                                                 const GLsizei *instanceCounts,
>+                                                 GLsizei drawcount)
>+{
>+    return gl::MultiDrawArraysInstancedANGLE(mode, firsts, counts, instanceCounts, drawcount);
>+}
>+
>+void GL_APIENTRY glMultiDrawElementsANGLE(GLenum mode,
>+                                          const GLsizei *counts,
>+                                          GLenum type,
>+                                          const GLvoid *const *indices,
>+                                          GLsizei drawcount)
>+{
>+    return gl::MultiDrawElementsANGLE(mode, counts, type, indices, drawcount);
>+}
>+
>+void GL_APIENTRY glMultiDrawElementsInstancedANGLE(GLenum mode,
>+                                                   const GLsizei *counts,
>+                                                   GLenum type,
>+                                                   const GLvoid *const *indices,
>+                                                   const GLsizei *instanceCounts,
>+                                                   GLsizei drawcount)
>+{
>+    return gl::MultiDrawElementsInstancedANGLE(mode, counts, type, indices, instanceCounts,
>+                                               drawcount);
>+}
>+
>+// GL_ANGLE_provoking_vertex
>+void GL_APIENTRY glProvokingVertexANGLE(GLenum mode)
>+{
>+    return gl::ProvokingVertexANGLE(mode);
>+}
>+
>+// GL_ANGLE_request_extension
>+void GL_APIENTRY glRequestExtensionANGLE(const GLchar *name)
>+{
>+    return gl::RequestExtensionANGLE(name);
>+}
>+
>+// GL_ANGLE_robust_client_memory
>+void GL_APIENTRY glGetBooleanvRobustANGLE(GLenum pname,
>+                                          GLsizei bufSize,
>+                                          GLsizei *length,
>+                                          GLboolean *params)
>+{
>+    return gl::GetBooleanvRobustANGLE(pname, bufSize, length, params);
>+}
>+
>+void GL_APIENTRY glGetBufferParameterivRobustANGLE(GLenum target,
>+                                                   GLenum pname,
>+                                                   GLsizei bufSize,
>+                                                   GLsizei *length,
>+                                                   GLint *params)
>+{
>+    return gl::GetBufferParameterivRobustANGLE(target, pname, bufSize, length, params);
>+}
>+
>+void GL_APIENTRY glGetFloatvRobustANGLE(GLenum pname,
>+                                        GLsizei bufSize,
>+                                        GLsizei *length,
>+                                        GLfloat *params)
>+{
>+    return gl::GetFloatvRobustANGLE(pname, bufSize, length, params);
>+}
>+
>+void GL_APIENTRY glGetFramebufferAttachmentParameterivRobustANGLE(GLenum target,
>+                                                                  GLenum attachment,
>+                                                                  GLenum pname,
>+                                                                  GLsizei bufSize,
>+                                                                  GLsizei *length,
>+                                                                  GLint *params)
>+{
>+    return gl::GetFramebufferAttachmentParameterivRobustANGLE(target, attachment, pname, bufSize,
>+                                                              length, params);
>+}
>+
>+void GL_APIENTRY glGetIntegervRobustANGLE(GLenum pname,
>+                                          GLsizei bufSize,
>+                                          GLsizei *length,
>+                                          GLint *data)
>+{
>+    return gl::GetIntegervRobustANGLE(pname, bufSize, length, data);
>+}
>+
>+void GL_APIENTRY glGetProgramivRobustANGLE(GLuint program,
>+                                           GLenum pname,
>+                                           GLsizei bufSize,
>+                                           GLsizei *length,
>+                                           GLint *params)
>+{
>+    return gl::GetProgramivRobustANGLE(program, pname, bufSize, length, params);
>+}
>+
>+void GL_APIENTRY glGetRenderbufferParameterivRobustANGLE(GLenum target,
>+                                                         GLenum pname,
>+                                                         GLsizei bufSize,
>+                                                         GLsizei *length,
>+                                                         GLint *params)
>+{
>+    return gl::GetRenderbufferParameterivRobustANGLE(target, pname, bufSize, length, params);
>+}
>+
>+void GL_APIENTRY glGetShaderivRobustANGLE(GLuint shader,
>+                                          GLenum pname,
>+                                          GLsizei bufSize,
>+                                          GLsizei *length,
>+                                          GLint *params)
>+{
>+    return gl::GetShaderivRobustANGLE(shader, pname, bufSize, length, params);
>+}
>+
>+void GL_APIENTRY glGetTexParameterfvRobustANGLE(GLenum target,
>+                                                GLenum pname,
>+                                                GLsizei bufSize,
>+                                                GLsizei *length,
>+                                                GLfloat *params)
>+{
>+    return gl::GetTexParameterfvRobustANGLE(target, pname, bufSize, length, params);
>+}
>+
>+void GL_APIENTRY glGetTexParameterivRobustANGLE(GLenum target,
>+                                                GLenum pname,
>+                                                GLsizei bufSize,
>+                                                GLsizei *length,
>+                                                GLint *params)
>+{
>+    return gl::GetTexParameterivRobustANGLE(target, pname, bufSize, length, params);
>+}
>+
>+void GL_APIENTRY glGetUniformfvRobustANGLE(GLuint program,
>+                                           GLint location,
>+                                           GLsizei bufSize,
>+                                           GLsizei *length,
>+                                           GLfloat *params)
>+{
>+    return gl::GetUniformfvRobustANGLE(program, location, bufSize, length, params);
>+}
>+
>+void GL_APIENTRY glGetUniformivRobustANGLE(GLuint program,
>+                                           GLint location,
>+                                           GLsizei bufSize,
>+                                           GLsizei *length,
>+                                           GLint *params)
>+{
>+    return gl::GetUniformivRobustANGLE(program, location, bufSize, length, params);
>+}
>+
>+void GL_APIENTRY glGetVertexAttribfvRobustANGLE(GLuint index,
>+                                                GLenum pname,
>+                                                GLsizei bufSize,
>+                                                GLsizei *length,
>+                                                GLfloat *params)
>+{
>+    return gl::GetVertexAttribfvRobustANGLE(index, pname, bufSize, length, params);
>+}
>+
>+void GL_APIENTRY glGetVertexAttribivRobustANGLE(GLuint index,
>+                                                GLenum pname,
>+                                                GLsizei bufSize,
>+                                                GLsizei *length,
>+                                                GLint *params)
>+{
>+    return gl::GetVertexAttribivRobustANGLE(index, pname, bufSize, length, params);
>+}
>+
>+void GL_APIENTRY glGetVertexAttribPointervRobustANGLE(GLuint index,
>+                                                      GLenum pname,
>+                                                      GLsizei bufSize,
>+                                                      GLsizei *length,
>+                                                      void **pointer)
>+{
>+    return gl::GetVertexAttribPointervRobustANGLE(index, pname, bufSize, length, pointer);
>+}
>+
>+void GL_APIENTRY glReadPixelsRobustANGLE(GLint x,
>+                                         GLint y,
>+                                         GLsizei width,
>+                                         GLsizei height,
>+                                         GLenum format,
>+                                         GLenum type,
>+                                         GLsizei bufSize,
>+                                         GLsizei *length,
>+                                         GLsizei *columns,
>+                                         GLsizei *rows,
>+                                         void *pixels)
>+{
>+    return gl::ReadPixelsRobustANGLE(x, y, width, height, format, type, bufSize, length, columns,
>+                                     rows, pixels);
>+}
>+
>+void GL_APIENTRY glTexImage2DRobustANGLE(GLenum target,
>+                                         GLint level,
>+                                         GLint internalformat,
>+                                         GLsizei width,
>+                                         GLsizei height,
>+                                         GLint border,
>+                                         GLenum format,
>+                                         GLenum type,
>+                                         GLsizei bufSize,
>+                                         const void *pixels)
>+{
>+    return gl::TexImage2DRobustANGLE(target, level, internalformat, width, height, border, format,
>+                                     type, bufSize, pixels);
>+}
>+
>+void GL_APIENTRY glTexParameterfvRobustANGLE(GLenum target,
>+                                             GLenum pname,
>+                                             GLsizei bufSize,
>+                                             const GLfloat *params)
>+{
>+    return gl::TexParameterfvRobustANGLE(target, pname, bufSize, params);
>+}
>+
>+void GL_APIENTRY glTexParameterivRobustANGLE(GLenum target,
>+                                             GLenum pname,
>+                                             GLsizei bufSize,
>+                                             const GLint *params)
>+{
>+    return gl::TexParameterivRobustANGLE(target, pname, bufSize, params);
>+}
>+
>+void GL_APIENTRY glTexSubImage2DRobustANGLE(GLenum target,
>+                                            GLint level,
>+                                            GLint xoffset,
>+                                            GLint yoffset,
>+                                            GLsizei width,
>+                                            GLsizei height,
>+                                            GLenum format,
>+                                            GLenum type,
>+                                            GLsizei bufSize,
>+                                            const void *pixels)
>+{
>+    return gl::TexSubImage2DRobustANGLE(target, level, xoffset, yoffset, width, height, format,
>+                                        type, bufSize, pixels);
>+}
>+
>+void GL_APIENTRY glTexImage3DRobustANGLE(GLenum target,
>+                                         GLint level,
>+                                         GLint internalformat,
>+                                         GLsizei width,
>+                                         GLsizei height,
>+                                         GLsizei depth,
>+                                         GLint border,
>+                                         GLenum format,
>+                                         GLenum type,
>+                                         GLsizei bufSize,
>+                                         const void *pixels)
>+{
>+    return gl::TexImage3DRobustANGLE(target, level, internalformat, width, height, depth, border,
>+                                     format, type, bufSize, pixels);
>+}
>+
>+void GL_APIENTRY glTexSubImage3DRobustANGLE(GLenum target,
>+                                            GLint level,
>+                                            GLint xoffset,
>+                                            GLint yoffset,
>+                                            GLint zoffset,
>+                                            GLsizei width,
>+                                            GLsizei height,
>+                                            GLsizei depth,
>+                                            GLenum format,
>+                                            GLenum type,
>+                                            GLsizei bufSize,
>+                                            const void *pixels)
>+{
>+    return gl::TexSubImage3DRobustANGLE(target, level, xoffset, yoffset, zoffset, width, height,
>+                                        depth, format, type, bufSize, pixels);
>+}
>+
>+void GL_APIENTRY glCompressedTexImage2DRobustANGLE(GLenum target,
>+                                                   GLint level,
>+                                                   GLenum internalformat,
>+                                                   GLsizei width,
>+                                                   GLsizei height,
>+                                                   GLint border,
>+                                                   GLsizei imageSize,
>+                                                   GLsizei dataSize,
>+                                                   const GLvoid *data)
>+{
>+    return gl::CompressedTexImage2DRobustANGLE(target, level, internalformat, width, height, border,
>+                                               imageSize, dataSize, data);
>+}
>+
>+void GL_APIENTRY glCompressedTexSubImage2DRobustANGLE(GLenum target,
>+                                                      GLint level,
>+                                                      GLsizei xoffset,
>+                                                      GLsizei yoffset,
>+                                                      GLsizei width,
>+                                                      GLsizei height,
>+                                                      GLenum format,
>+                                                      GLsizei imageSize,
>+                                                      GLsizei dataSize,
>+                                                      const GLvoid *data)
>+{
>+    return gl::CompressedTexSubImage2DRobustANGLE(target, level, xoffset, yoffset, width, height,
>+                                                  format, imageSize, dataSize, data);
>+}
>+
>+void GL_APIENTRY glCompressedTexImage3DRobustANGLE(GLenum target,
>+                                                   GLint level,
>+                                                   GLenum internalformat,
>+                                                   GLsizei width,
>+                                                   GLsizei height,
>+                                                   GLsizei depth,
>+                                                   GLint border,
>+                                                   GLsizei imageSize,
>+                                                   GLsizei dataSize,
>+                                                   const GLvoid *data)
>+{
>+    return gl::CompressedTexImage3DRobustANGLE(target, level, internalformat, width, height, depth,
>+                                               border, imageSize, dataSize, data);
>+}
>+
>+void GL_APIENTRY glCompressedTexSubImage3DRobustANGLE(GLenum target,
>+                                                      GLint level,
>+                                                      GLint xoffset,
>+                                                      GLint yoffset,
>+                                                      GLint zoffset,
>+                                                      GLsizei width,
>+                                                      GLsizei height,
>+                                                      GLsizei depth,
>+                                                      GLenum format,
>+                                                      GLsizei imageSize,
>+                                                      GLsizei dataSize,
>+                                                      const GLvoid *data)
>+{
>+    return gl::CompressedTexSubImage3DRobustANGLE(target, level, xoffset, yoffset, zoffset, width,
>+                                                  height, depth, format, imageSize, dataSize, data);
>+}
>+
>+void GL_APIENTRY glGetQueryivRobustANGLE(GLenum target,
>+                                         GLenum pname,
>+                                         GLsizei bufSize,
>+                                         GLsizei *length,
>+                                         GLint *params)
>+{
>+    return gl::GetQueryivRobustANGLE(target, pname, bufSize, length, params);
>+}
>+
>+void GL_APIENTRY glGetQueryObjectuivRobustANGLE(GLuint id,
>+                                                GLenum pname,
>+                                                GLsizei bufSize,
>+                                                GLsizei *length,
>+                                                GLuint *params)
>+{
>+    return gl::GetQueryObjectuivRobustANGLE(id, pname, bufSize, length, params);
>+}
>+
>+void GL_APIENTRY glGetBufferPointervRobustANGLE(GLenum target,
>+                                                GLenum pname,
>+                                                GLsizei bufSize,
>+                                                GLsizei *length,
>+                                                void **params)
>+{
>+    return gl::GetBufferPointervRobustANGLE(target, pname, bufSize, length, params);
>+}
>+
>+void GL_APIENTRY glGetIntegeri_vRobustANGLE(GLenum target,
>+                                            GLuint index,
>+                                            GLsizei bufSize,
>+                                            GLsizei *length,
>+                                            GLint *data)
>+{
>+    return gl::GetIntegeri_vRobustANGLE(target, index, bufSize, length, data);
>+}
>+
>+void GL_APIENTRY glGetInternalformativRobustANGLE(GLenum target,
>+                                                  GLenum internalformat,
>+                                                  GLenum pname,
>+                                                  GLsizei bufSize,
>+                                                  GLsizei *length,
>+                                                  GLint *params)
>+{
>+    return gl::GetInternalformativRobustANGLE(target, internalformat, pname, bufSize, length,
>+                                              params);
>+}
>+
>+void GL_APIENTRY glGetVertexAttribIivRobustANGLE(GLuint index,
>+                                                 GLenum pname,
>+                                                 GLsizei bufSize,
>+                                                 GLsizei *length,
>+                                                 GLint *params)
>+{
>+    return gl::GetVertexAttribIivRobustANGLE(index, pname, bufSize, length, params);
>+}
>+
>+void GL_APIENTRY glGetVertexAttribIuivRobustANGLE(GLuint index,
>+                                                  GLenum pname,
>+                                                  GLsizei bufSize,
>+                                                  GLsizei *length,
>+                                                  GLuint *params)
>+{
>+    return gl::GetVertexAttribIuivRobustANGLE(index, pname, bufSize, length, params);
>+}
>+
>+void GL_APIENTRY glGetUniformuivRobustANGLE(GLuint program,
>+                                            GLint location,
>+                                            GLsizei bufSize,
>+                                            GLsizei *length,
>+                                            GLuint *params)
>+{
>+    return gl::GetUniformuivRobustANGLE(program, location, bufSize, length, params);
>+}
>+
>+void GL_APIENTRY glGetActiveUniformBlockivRobustANGLE(GLuint program,
>+                                                      GLuint uniformBlockIndex,
>+                                                      GLenum pname,
>+                                                      GLsizei bufSize,
>+                                                      GLsizei *length,
>+                                                      GLint *params)
>+{
>+    return gl::GetActiveUniformBlockivRobustANGLE(program, uniformBlockIndex, pname, bufSize,
>+                                                  length, params);
>+}
>+
>+void GL_APIENTRY glGetInteger64vRobustANGLE(GLenum pname,
>+                                            GLsizei bufSize,
>+                                            GLsizei *length,
>+                                            GLint64 *data)
>+{
>+    return gl::GetInteger64vRobustANGLE(pname, bufSize, length, data);
>+}
>+
>+void GL_APIENTRY glGetInteger64i_vRobustANGLE(GLenum target,
>+                                              GLuint index,
>+                                              GLsizei bufSize,
>+                                              GLsizei *length,
>+                                              GLint64 *data)
>+{
>+    return gl::GetInteger64i_vRobustANGLE(target, index, bufSize, length, data);
>+}
>+
>+void GL_APIENTRY glGetBufferParameteri64vRobustANGLE(GLenum target,
>+                                                     GLenum pname,
>+                                                     GLsizei bufSize,
>+                                                     GLsizei *length,
>+                                                     GLint64 *params)
>+{
>+    return gl::GetBufferParameteri64vRobustANGLE(target, pname, bufSize, length, params);
>+}
>+
>+void GL_APIENTRY glSamplerParameterivRobustANGLE(GLuint sampler,
>+                                                 GLuint pname,
>+                                                 GLsizei bufSize,
>+                                                 const GLint *param)
>+{
>+    return gl::SamplerParameterivRobustANGLE(sampler, pname, bufSize, param);
>+}
>+
>+void GL_APIENTRY glSamplerParameterfvRobustANGLE(GLuint sampler,
>+                                                 GLenum pname,
>+                                                 GLsizei bufSize,
>+                                                 const GLfloat *param)
>+{
>+    return gl::SamplerParameterfvRobustANGLE(sampler, pname, bufSize, param);
>+}
>+
>+void GL_APIENTRY glGetSamplerParameterivRobustANGLE(GLuint sampler,
>+                                                    GLenum pname,
>+                                                    GLsizei bufSize,
>+                                                    GLsizei *length,
>+                                                    GLint *params)
>+{
>+    return gl::GetSamplerParameterivRobustANGLE(sampler, pname, bufSize, length, params);
>+}
>+
>+void GL_APIENTRY glGetSamplerParameterfvRobustANGLE(GLuint sampler,
>+                                                    GLenum pname,
>+                                                    GLsizei bufSize,
>+                                                    GLsizei *length,
>+                                                    GLfloat *params)
>+{
>+    return gl::GetSamplerParameterfvRobustANGLE(sampler, pname, bufSize, length, params);
>+}
>+
>+void GL_APIENTRY glGetFramebufferParameterivRobustANGLE(GLuint sampler,
>+                                                        GLenum pname,
>+                                                        GLsizei bufSize,
>+                                                        GLsizei *length,
>+                                                        GLint *params)
>+{
>+    return gl::GetFramebufferParameterivRobustANGLE(sampler, pname, bufSize, length, params);
>+}
>+
>+void GL_APIENTRY glGetProgramInterfaceivRobustANGLE(GLuint program,
>+                                                    GLenum programInterface,
>+                                                    GLenum pname,
>+                                                    GLsizei bufSize,
>+                                                    GLsizei *length,
>+                                                    GLint *params)
>+{
>+    return gl::GetProgramInterfaceivRobustANGLE(program, programInterface, pname, bufSize, length,
>+                                                params);
>+}
>+
>+void GL_APIENTRY glGetBooleani_vRobustANGLE(GLenum target,
>+                                            GLuint index,
>+                                            GLsizei bufSize,
>+                                            GLsizei *length,
>+                                            GLboolean *data)
>+{
>+    return gl::GetBooleani_vRobustANGLE(target, index, bufSize, length, data);
>+}
>+
>+void GL_APIENTRY glGetMultisamplefvRobustANGLE(GLenum pname,
>+                                               GLuint index,
>+                                               GLsizei bufSize,
>+                                               GLsizei *length,
>+                                               GLfloat *val)
>+{
>+    return gl::GetMultisamplefvRobustANGLE(pname, index, bufSize, length, val);
>+}
>+
>+void GL_APIENTRY glGetTexLevelParameterivRobustANGLE(GLenum target,
>+                                                     GLint level,
>+                                                     GLenum pname,
>+                                                     GLsizei bufSize,
>+                                                     GLsizei *length,
>+                                                     GLint *params)
>+{
>+    return gl::GetTexLevelParameterivRobustANGLE(target, level, pname, bufSize, length, params);
>+}
>+
>+void GL_APIENTRY glGetTexLevelParameterfvRobustANGLE(GLenum target,
>+                                                     GLint level,
>+                                                     GLenum pname,
>+                                                     GLsizei bufSize,
>+                                                     GLsizei *length,
>+                                                     GLfloat *params)
>+{
>+    return gl::GetTexLevelParameterfvRobustANGLE(target, level, pname, bufSize, length, params);
>+}
>+
>+void GL_APIENTRY glGetPointervRobustANGLERobustANGLE(GLenum pname,
>+                                                     GLsizei bufSize,
>+                                                     GLsizei *length,
>+                                                     void **params)
>+{
>+    return gl::GetPointervRobustANGLERobustANGLE(pname, bufSize, length, params);
>+}
>+
>+void GL_APIENTRY glReadnPixelsRobustANGLE(GLint x,
>+                                          GLint y,
>+                                          GLsizei width,
>+                                          GLsizei height,
>+                                          GLenum format,
>+                                          GLenum type,
>+                                          GLsizei bufSize,
>+                                          GLsizei *length,
>+                                          GLsizei *columns,
>+                                          GLsizei *rows,
>+                                          void *data)
>+{
>+    return gl::ReadnPixelsRobustANGLE(x, y, width, height, format, type, bufSize, length, columns,
>+                                      rows, data);
>+}
>+
>+void GL_APIENTRY glGetnUniformfvRobustANGLE(GLuint program,
>+                                            GLint location,
>+                                            GLsizei bufSize,
>+                                            GLsizei *length,
>+                                            GLfloat *params)
>+{
>+    return gl::GetnUniformfvRobustANGLE(program, location, bufSize, length, params);
>+}
>+
>+void GL_APIENTRY glGetnUniformivRobustANGLE(GLuint program,
>+                                            GLint location,
>+                                            GLsizei bufSize,
>+                                            GLsizei *length,
>+                                            GLint *params)
>+{
>+    return gl::GetnUniformivRobustANGLE(program, location, bufSize, length, params);
>+}
>+
>+void GL_APIENTRY glGetnUniformuivRobustANGLE(GLuint program,
>+                                             GLint location,
>+                                             GLsizei bufSize,
>+                                             GLsizei *length,
>+                                             GLuint *params)
>+{
>+    return gl::GetnUniformuivRobustANGLE(program, location, bufSize, length, params);
>+}
>+
>+void GL_APIENTRY glTexParameterIivRobustANGLE(GLenum target,
>+                                              GLenum pname,
>+                                              GLsizei bufSize,
>+                                              const GLint *params)
>+{
>+    return gl::TexParameterIivRobustANGLE(target, pname, bufSize, params);
>+}
>+
>+void GL_APIENTRY glTexParameterIuivRobustANGLE(GLenum target,
>+                                               GLenum pname,
>+                                               GLsizei bufSize,
>+                                               const GLuint *params)
>+{
>+    return gl::TexParameterIuivRobustANGLE(target, pname, bufSize, params);
>+}
>+
>+void GL_APIENTRY glGetTexParameterIivRobustANGLE(GLenum target,
>+                                                 GLenum pname,
>+                                                 GLsizei bufSize,
>+                                                 GLsizei *length,
>+                                                 GLint *params)
>+{
>+    return gl::GetTexParameterIivRobustANGLE(target, pname, bufSize, length, params);
>+}
>+
>+void GL_APIENTRY glGetTexParameterIuivRobustANGLE(GLenum target,
>+                                                  GLenum pname,
>+                                                  GLsizei bufSize,
>+                                                  GLsizei *length,
>+                                                  GLuint *params)
>+{
>+    return gl::GetTexParameterIuivRobustANGLE(target, pname, bufSize, length, params);
>+}
>+
>+void GL_APIENTRY glSamplerParameterIivRobustANGLE(GLuint sampler,
>+                                                  GLenum pname,
>+                                                  GLsizei bufSize,
>+                                                  const GLint *param)
>+{
>+    return gl::SamplerParameterIivRobustANGLE(sampler, pname, bufSize, param);
>+}
>+
>+void GL_APIENTRY glSamplerParameterIuivRobustANGLE(GLuint sampler,
>+                                                   GLenum pname,
>+                                                   GLsizei bufSize,
>+                                                   const GLuint *param)
>+{
>+    return gl::SamplerParameterIuivRobustANGLE(sampler, pname, bufSize, param);
>+}
>+
>+void GL_APIENTRY glGetSamplerParameterIivRobustANGLE(GLuint sampler,
>+                                                     GLenum pname,
>+                                                     GLsizei bufSize,
>+                                                     GLsizei *length,
>+                                                     GLint *params)
>+{
>+    return gl::GetSamplerParameterIivRobustANGLE(sampler, pname, bufSize, length, params);
>+}
>+
>+void GL_APIENTRY glGetSamplerParameterIuivRobustANGLE(GLuint sampler,
>+                                                      GLenum pname,
>+                                                      GLsizei bufSize,
>+                                                      GLsizei *length,
>+                                                      GLuint *params)
>+{
>+    return gl::GetSamplerParameterIuivRobustANGLE(sampler, pname, bufSize, length, params);
>+}
>+
>+void GL_APIENTRY glGetQueryObjectivRobustANGLE(GLuint id,
>+                                               GLenum pname,
>+                                               GLsizei bufSize,
>+                                               GLsizei *length,
>+                                               GLint *params)
>+{
>+    return gl::GetQueryObjectivRobustANGLE(id, pname, bufSize, length, params);
>+}
>+
>+void GL_APIENTRY glGetQueryObjecti64vRobustANGLE(GLuint id,
>+                                                 GLenum pname,
>+                                                 GLsizei bufSize,
>+                                                 GLsizei *length,
>+                                                 GLint64 *params)
>+{
>+    return gl::GetQueryObjecti64vRobustANGLE(id, pname, bufSize, length, params);
>+}
>+
>+void GL_APIENTRY glGetQueryObjectui64vRobustANGLE(GLuint id,
>+                                                  GLenum pname,
>+                                                  GLsizei bufSize,
>+                                                  GLsizei *length,
>+                                                  GLuint64 *params)
>+{
>+    return gl::GetQueryObjectui64vRobustANGLE(id, pname, bufSize, length, params);
>+}
>+
>+// GL_ANGLE_texture_multisample
>+void GL_APIENTRY glTexStorage2DMultisampleANGLE(GLenum target,
>+                                                GLsizei samples,
>+                                                GLenum internalformat,
>+                                                GLsizei width,
>+                                                GLsizei height,
>+                                                GLboolean fixedsamplelocations)
>+{
>+    return gl::TexStorage2DMultisampleANGLE(target, samples, internalformat, width, height,
>+                                            fixedsamplelocations);
>+}
>+
>+void GL_APIENTRY glGetTexLevelParameterivANGLE(GLenum target,
>+                                               GLint level,
>+                                               GLenum pname,
>+                                               GLint *params)
>+{
>+    return gl::GetTexLevelParameterivANGLE(target, level, pname, params);
>+}
>+
>+void GL_APIENTRY glGetTexLevelParameterfvANGLE(GLenum target,
>+                                               GLint level,
>+                                               GLenum pname,
>+                                               GLfloat *params)
>+{
>+    return gl::GetTexLevelParameterfvANGLE(target, level, pname, params);
>+}
>+
>+void GL_APIENTRY glGetMultisamplefvANGLE(GLenum pname, GLuint index, GLfloat *val)
>+{
>+    return gl::GetMultisamplefvANGLE(pname, index, val);
>+}
>+
>+void GL_APIENTRY glSampleMaskiANGLE(GLuint maskNumber, GLbitfield mask)
>+{
>+    return gl::SampleMaskiANGLE(maskNumber, mask);
>+}
>+
>+// GL_ANGLE_translated_shader_source
>+void GL_APIENTRY glGetTranslatedShaderSourceANGLE(GLuint shader,
>+                                                  GLsizei bufsize,
>+                                                  GLsizei *length,
>+                                                  GLchar *source)
>+{
>+    return gl::GetTranslatedShaderSourceANGLE(shader, bufsize, length, source);
>+}
>+
>+// GL_CHROMIUM_bind_uniform_location
>+void GL_APIENTRY glBindUniformLocationCHROMIUM(GLuint program, GLint location, const GLchar *name)
>+{
>+    return gl::BindUniformLocationCHROMIUM(program, location, name);
>+}
>+
>+// GL_CHROMIUM_copy_compressed_texture
>+void GL_APIENTRY glCompressedCopyTextureCHROMIUM(GLuint sourceId, GLuint destId)
>+{
>+    return gl::CompressedCopyTextureCHROMIUM(sourceId, destId);
>+}
>+
>+// GL_CHROMIUM_copy_texture
>+void GL_APIENTRY glCopyTextureCHROMIUM(GLuint sourceId,
>+                                       GLint sourceLevel,
>+                                       GLenum destTarget,
>+                                       GLuint destId,
>+                                       GLint destLevel,
>+                                       GLint internalFormat,
>+                                       GLenum destType,
>+                                       GLboolean unpackFlipY,
>+                                       GLboolean unpackPremultiplyAlpha,
>+                                       GLboolean unpackUnmultiplyAlpha)
>+{
>+    return gl::CopyTextureCHROMIUM(sourceId, sourceLevel, destTarget, destId, destLevel,
>+                                   internalFormat, destType, unpackFlipY, unpackPremultiplyAlpha,
>+                                   unpackUnmultiplyAlpha);
>+}
>+
>+void GL_APIENTRY glCopySubTextureCHROMIUM(GLuint sourceId,
>+                                          GLint sourceLevel,
>+                                          GLenum destTarget,
>+                                          GLuint destId,
>+                                          GLint destLevel,
>+                                          GLint xoffset,
>+                                          GLint yoffset,
>+                                          GLint x,
>+                                          GLint y,
>+                                          GLint width,
>+                                          GLint height,
>+                                          GLboolean unpackFlipY,
>+                                          GLboolean unpackPremultiplyAlpha,
>+                                          GLboolean unpackUnmultiplyAlpha)
>+{
>+    return gl::CopySubTextureCHROMIUM(sourceId, sourceLevel, destTarget, destId, destLevel, xoffset,
>+                                      yoffset, x, y, width, height, unpackFlipY,
>+                                      unpackPremultiplyAlpha, unpackUnmultiplyAlpha);
>+}
>+
>+// GL_CHROMIUM_framebuffer_mixed_samples
>+void GL_APIENTRY glCoverageModulationCHROMIUM(GLenum components)
>+{
>+    return gl::CoverageModulationCHROMIUM(components);
>+}
>+
>+void GL_APIENTRY glMatrixLoadfCHROMIUM(GLenum matrixMode, const GLfloat *matrix)
>+{
>+    return gl::MatrixLoadfCHROMIUM(matrixMode, matrix);
>+}
>+
>+void GL_APIENTRY glMatrixLoadIdentityCHROMIUM(GLenum matrixMode)
>+{
>+    return gl::MatrixLoadIdentityCHROMIUM(matrixMode);
>+}
>+
>+// GL_CHROMIUM_lose_context
>+void GL_APIENTRY glLoseContextCHROMIUM(GLenum current, GLenum other)
>+{
>+    return gl::LoseContextCHROMIUM(current, other);
>+}
>+
>+// GL_CHROMIUM_path_rendering
>+GLuint GL_APIENTRY glGenPathsCHROMIUM(GLsizei range)
>+{
>+    return gl::GenPathsCHROMIUM(range);
>+}
>+
>+void GL_APIENTRY glDeletePathsCHROMIUM(GLuint first, GLsizei range)
>+{
>+    return gl::DeletePathsCHROMIUM(first, range);
>+}
>+
>+GLboolean GL_APIENTRY glIsPathCHROMIUM(GLuint path)
>+{
>+    return gl::IsPathCHROMIUM(path);
>+}
>+
>+void GL_APIENTRY glPathCommandsCHROMIUM(GLuint path,
>+                                        GLsizei numCommands,
>+                                        const GLubyte *commands,
>+                                        GLsizei numCoords,
>+                                        GLenum coordType,
>+                                        const void *coords)
>+{
>+    return gl::PathCommandsCHROMIUM(path, numCommands, commands, numCoords, coordType, coords);
>+}
>+
>+void GL_APIENTRY glPathParameterfCHROMIUM(GLuint path, GLenum pname, GLfloat value)
>+{
>+    return gl::PathParameterfCHROMIUM(path, pname, value);
>+}
>+
>+void GL_APIENTRY glPathParameteriCHROMIUM(GLuint path, GLenum pname, GLint value)
>+{
>+    return gl::PathParameteriCHROMIUM(path, pname, value);
>+}
>+
>+void GL_APIENTRY glGetPathParameterfvCHROMIUM(GLuint path, GLenum pname, GLfloat *value)
>+{
>+    return gl::GetPathParameterfvCHROMIUM(path, pname, value);
>+}
>+
>+void GL_APIENTRY glGetPathParameterivCHROMIUM(GLuint path, GLenum pname, GLint *value)
>+{
>+    return gl::GetPathParameterivCHROMIUM(path, pname, value);
>+}
>+
>+void GL_APIENTRY glPathStencilFuncCHROMIUM(GLenum func, GLint ref, GLuint mask)
>+{
>+    return gl::PathStencilFuncCHROMIUM(func, ref, mask);
>+}
>+
>+void GL_APIENTRY glStencilFillPathCHROMIUM(GLuint path, GLenum fillMode, GLuint mask)
>+{
>+    return gl::StencilFillPathCHROMIUM(path, fillMode, mask);
>+}
>+
>+void GL_APIENTRY glStencilStrokePathCHROMIUM(GLuint path, GLint reference, GLuint mask)
>+{
>+    return gl::StencilStrokePathCHROMIUM(path, reference, mask);
>+}
>+
>+void GL_APIENTRY glCoverFillPathCHROMIUM(GLuint path, GLenum coverMode)
>+{
>+    return gl::CoverFillPathCHROMIUM(path, coverMode);
>+}
>+
>+void GL_APIENTRY glCoverStrokePathCHROMIUM(GLuint path, GLenum coverMode)
>+{
>+    return gl::CoverStrokePathCHROMIUM(path, coverMode);
>+}
>+
>+void GL_APIENTRY glStencilThenCoverFillPathCHROMIUM(GLuint path,
>+                                                    GLenum fillMode,
>+                                                    GLuint mask,
>+                                                    GLenum coverMode)
>+{
>+    return gl::StencilThenCoverFillPathCHROMIUM(path, fillMode, mask, coverMode);
>+}
>+
>+void GL_APIENTRY glStencilThenCoverStrokePathCHROMIUM(GLuint path,
>+                                                      GLint reference,
>+                                                      GLuint mask,
>+                                                      GLenum coverMode)
>+{
>+    return gl::StencilThenCoverStrokePathCHROMIUM(path, reference, mask, coverMode);
>+}
>+
>+void GL_APIENTRY glCoverFillPathInstancedCHROMIUM(GLsizei numPath,
>+                                                  GLenum pathNameType,
>+                                                  const void *paths,
>+                                                  GLuint pathBase,
>+                                                  GLenum coverMode,
>+                                                  GLenum transformType,
>+                                                  const GLfloat *transformValues)
>+{
>+    return gl::CoverFillPathInstancedCHROMIUM(numPath, pathNameType, paths, pathBase, coverMode,
>+                                              transformType, transformValues);
>+}
>+
>+void GL_APIENTRY glCoverStrokePathInstancedCHROMIUM(GLsizei numPath,
>+                                                    GLenum pathNameType,
>+                                                    const void *paths,
>+                                                    GLuint pathBase,
>+                                                    GLenum coverMode,
>+                                                    GLenum transformType,
>+                                                    const GLfloat *transformValues)
>+{
>+    return gl::CoverStrokePathInstancedCHROMIUM(numPath, pathNameType, paths, pathBase, coverMode,
>+                                                transformType, transformValues);
>+}
>+
>+void GL_APIENTRY glStencilStrokePathInstancedCHROMIUM(GLsizei numPath,
>+                                                      GLenum pathNameType,
>+                                                      const void *paths,
>+                                                      GLuint pathBase,
>+                                                      GLint reference,
>+                                                      GLuint mask,
>+                                                      GLenum transformType,
>+                                                      const GLfloat *transformValues)
>+{
>+    return gl::StencilStrokePathInstancedCHROMIUM(numPath, pathNameType, paths, pathBase, reference,
>+                                                  mask, transformType, transformValues);
>+}
>+
>+void GL_APIENTRY glStencilFillPathInstancedCHROMIUM(GLsizei numPaths,
>+                                                    GLenum pathNameType,
>+                                                    const void *paths,
>+                                                    GLuint pathBase,
>+                                                    GLenum fillMode,
>+                                                    GLuint mask,
>+                                                    GLenum transformType,
>+                                                    const GLfloat *transformValues)
>+{
>+    return gl::StencilFillPathInstancedCHROMIUM(numPaths, pathNameType, paths, pathBase, fillMode,
>+                                                mask, transformType, transformValues);
>+}
>+
>+void GL_APIENTRY glStencilThenCoverFillPathInstancedCHROMIUM(GLsizei numPaths,
>+                                                             GLenum pathNameType,
>+                                                             const void *paths,
>+                                                             GLuint pathBase,
>+                                                             GLenum fillMode,
>+                                                             GLuint mask,
>+                                                             GLenum coverMode,
>+                                                             GLenum transformType,
>+                                                             const GLfloat *transformValues)
>+{
>+    return gl::StencilThenCoverFillPathInstancedCHROMIUM(numPaths, pathNameType, paths, pathBase,
>+                                                         fillMode, mask, coverMode, transformType,
>+                                                         transformValues);
>+}
>+
>+void GL_APIENTRY glStencilThenCoverStrokePathInstancedCHROMIUM(GLsizei numPaths,
>+                                                               GLenum pathNameType,
>+                                                               const void *paths,
>+                                                               GLuint pathBase,
>+                                                               GLint reference,
>+                                                               GLuint mask,
>+                                                               GLenum coverMode,
>+                                                               GLenum transformType,
>+                                                               const GLfloat *transformValues)
>+{
>+    return gl::StencilThenCoverStrokePathInstancedCHROMIUM(numPaths, pathNameType, paths, pathBase,
>+                                                           reference, mask, coverMode,
>+                                                           transformType, transformValues);
>+}
>+
>+void GL_APIENTRY glBindFragmentInputLocationCHROMIUM(GLuint programs,
>+                                                     GLint location,
>+                                                     const GLchar *name)
>+{
>+    return gl::BindFragmentInputLocationCHROMIUM(programs, location, name);
>+}
>+
>+void GL_APIENTRY glProgramPathFragmentInputGenCHROMIUM(GLuint program,
>+                                                       GLint location,
>+                                                       GLenum genMode,
>+                                                       GLint components,
>+                                                       const GLfloat *coeffs)
>+{
>+    return gl::ProgramPathFragmentInputGenCHROMIUM(program, location, genMode, components, coeffs);
>+}
>+
>+// GL_EXT_blend_func_extended
>+void GL_APIENTRY glBindFragDataLocationEXT(GLuint program, GLuint color, const GLchar *name)
>+{
>+    return gl::BindFragDataLocationEXT(program, color, name);
>+}
>+
>+void GL_APIENTRY glBindFragDataLocationIndexedEXT(GLuint program,
>+                                                  GLuint colorNumber,
>+                                                  GLuint index,
>+                                                  const GLchar *name)
>+{
>+    return gl::BindFragDataLocationIndexedEXT(program, colorNumber, index, name);
>+}
>+
>+GLint GL_APIENTRY glGetFragDataIndexEXT(GLuint program, const GLchar *name)
>+{
>+    return gl::GetFragDataIndexEXT(program, name);
>+}
>+
>+GLint GL_APIENTRY glGetProgramResourceLocationIndexEXT(GLuint program,
>+                                                       GLenum programInterface,
>+                                                       const GLchar *name)
>+{
>+    return gl::GetProgramResourceLocationIndexEXT(program, programInterface, name);
>+}
>+
>+// GL_EXT_debug_marker
>+void GL_APIENTRY glInsertEventMarkerEXT(GLsizei length, const GLchar *marker)
>+{
>+    return gl::InsertEventMarkerEXT(length, marker);
>+}
>+
>+void GL_APIENTRY glPopGroupMarkerEXT()
>+{
>+    return gl::PopGroupMarkerEXT();
>+}
>+
>+void GL_APIENTRY glPushGroupMarkerEXT(GLsizei length, const GLchar *marker)
>+{
>+    return gl::PushGroupMarkerEXT(length, marker);
>+}
>+
>+// GL_EXT_discard_framebuffer
>+void GL_APIENTRY glDiscardFramebufferEXT(GLenum target,
>+                                         GLsizei numAttachments,
>+                                         const GLenum *attachments)
>+{
>+    return gl::DiscardFramebufferEXT(target, numAttachments, attachments);
>+}
>+
>+// GL_EXT_disjoint_timer_query
>+void GL_APIENTRY glBeginQueryEXT(GLenum target, GLuint id)
>+{
>+    return gl::BeginQueryEXT(target, id);
>+}
>+
>+void GL_APIENTRY glDeleteQueriesEXT(GLsizei n, const GLuint *ids)
>+{
>+    return gl::DeleteQueriesEXT(n, ids);
>+}
>+
>+void GL_APIENTRY glEndQueryEXT(GLenum target)
>+{
>+    return gl::EndQueryEXT(target);
>+}
>+
>+void GL_APIENTRY glGenQueriesEXT(GLsizei n, GLuint *ids)
>+{
>+    return gl::GenQueriesEXT(n, ids);
>+}
>+
>+void GL_APIENTRY glGetQueryObjecti64vEXT(GLuint id, GLenum pname, GLint64 *params)
>+{
>+    return gl::GetQueryObjecti64vEXT(id, pname, params);
>+}
>+
>+void GL_APIENTRY glGetQueryObjectivEXT(GLuint id, GLenum pname, GLint *params)
>+{
>+    return gl::GetQueryObjectivEXT(id, pname, params);
>+}
>+
>+void GL_APIENTRY glGetQueryObjectui64vEXT(GLuint id, GLenum pname, GLuint64 *params)
>+{
>+    return gl::GetQueryObjectui64vEXT(id, pname, params);
>+}
>+
>+void GL_APIENTRY glGetQueryObjectuivEXT(GLuint id, GLenum pname, GLuint *params)
>+{
>+    return gl::GetQueryObjectuivEXT(id, pname, params);
>+}
>+
>+void GL_APIENTRY glGetQueryivEXT(GLenum target, GLenum pname, GLint *params)
>+{
>+    return gl::GetQueryivEXT(target, pname, params);
>+}
>+
>+GLboolean GL_APIENTRY glIsQueryEXT(GLuint id)
>+{
>+    return gl::IsQueryEXT(id);
>+}
>+
>+void GL_APIENTRY glQueryCounterEXT(GLuint id, GLenum target)
>+{
>+    return gl::QueryCounterEXT(id, target);
>+}
>+
>+// GL_EXT_draw_buffers
>+void GL_APIENTRY glDrawBuffersEXT(GLsizei n, const GLenum *bufs)
>+{
>+    return gl::DrawBuffersEXT(n, bufs);
>+}
>+
>+// GL_EXT_geometry_shader
>+void GL_APIENTRY glFramebufferTextureEXT(GLenum target,
>+                                         GLenum attachment,
>+                                         GLuint texture,
>+                                         GLint level)
>+{
>+    return gl::FramebufferTextureEXT(target, attachment, texture, level);
>+}
>+
>+// GL_EXT_instanced_arrays
>+void GL_APIENTRY glDrawArraysInstancedEXT(GLenum mode,
>+                                          GLint start,
>+                                          GLsizei count,
>+                                          GLsizei primcount)
>+{
>+    return gl::DrawArraysInstancedEXT(mode, start, count, primcount);
>+}
>+
>+void GL_APIENTRY glDrawElementsInstancedEXT(GLenum mode,
>+                                            GLsizei count,
>+                                            GLenum type,
>+                                            const void *indices,
>+                                            GLsizei primcount)
>+{
>+    return gl::DrawElementsInstancedEXT(mode, count, type, indices, primcount);
>+}
>+
>+void GL_APIENTRY glVertexAttribDivisorEXT(GLuint index, GLuint divisor)
>+{
>+    return gl::VertexAttribDivisorEXT(index, divisor);
>+}
>+
>+// GL_EXT_map_buffer_range
>+void GL_APIENTRY glFlushMappedBufferRangeEXT(GLenum target, GLintptr offset, GLsizeiptr length)
>+{
>+    return gl::FlushMappedBufferRangeEXT(target, offset, length);
>+}
>+
>+void *GL_APIENTRY glMapBufferRangeEXT(GLenum target,
>+                                      GLintptr offset,
>+                                      GLsizeiptr length,
>+                                      GLbitfield access)
>+{
>+    return gl::MapBufferRangeEXT(target, offset, length, access);
>+}
>+
>+// GL_EXT_memory_object
>+void GL_APIENTRY glBufferStorageMemEXT(GLenum target,
>+                                       GLsizeiptr size,
>+                                       GLuint memory,
>+                                       GLuint64 offset)
>+{
>+    return gl::BufferStorageMemEXT(target, size, memory, offset);
>+}
>+
>+void GL_APIENTRY glCreateMemoryObjectsEXT(GLsizei n, GLuint *memoryObjects)
>+{
>+    return gl::CreateMemoryObjectsEXT(n, memoryObjects);
>+}
>+
>+void GL_APIENTRY glDeleteMemoryObjectsEXT(GLsizei n, const GLuint *memoryObjects)
>+{
>+    return gl::DeleteMemoryObjectsEXT(n, memoryObjects);
>+}
>+
>+void GL_APIENTRY glGetMemoryObjectParameterivEXT(GLuint memoryObject, GLenum pname, GLint *params)
>+{
>+    return gl::GetMemoryObjectParameterivEXT(memoryObject, pname, params);
>+}
>+
>+void GL_APIENTRY glGetUnsignedBytevEXT(GLenum pname, GLubyte *data)
>+{
>+    return gl::GetUnsignedBytevEXT(pname, data);
>+}
>+
>+void GL_APIENTRY glGetUnsignedBytei_vEXT(GLenum target, GLuint index, GLubyte *data)
>+{
>+    return gl::GetUnsignedBytei_vEXT(target, index, data);
>+}
>+
>+GLboolean GL_APIENTRY glIsMemoryObjectEXT(GLuint memoryObject)
>+{
>+    return gl::IsMemoryObjectEXT(memoryObject);
>+}
>+
>+void GL_APIENTRY glMemoryObjectParameterivEXT(GLuint memoryObject,
>+                                              GLenum pname,
>+                                              const GLint *params)
>+{
>+    return gl::MemoryObjectParameterivEXT(memoryObject, pname, params);
>+}
>+
>+void GL_APIENTRY glTexStorageMem2DEXT(GLenum target,
>+                                      GLsizei levels,
>+                                      GLenum internalFormat,
>+                                      GLsizei width,
>+                                      GLsizei height,
>+                                      GLuint memory,
>+                                      GLuint64 offset)
>+{
>+    return gl::TexStorageMem2DEXT(target, levels, internalFormat, width, height, memory, offset);
>+}
>+
>+void GL_APIENTRY glTexStorageMem2DMultisampleEXT(GLenum target,
>+                                                 GLsizei samples,
>+                                                 GLenum internalFormat,
>+                                                 GLsizei width,
>+                                                 GLsizei height,
>+                                                 GLboolean fixedSampleLocations,
>+                                                 GLuint memory,
>+                                                 GLuint64 offset)
>+{
>+    return gl::TexStorageMem2DMultisampleEXT(target, samples, internalFormat, width, height,
>+                                             fixedSampleLocations, memory, offset);
>+}
>+
>+void GL_APIENTRY glTexStorageMem3DEXT(GLenum target,
>+                                      GLsizei levels,
>+                                      GLenum internalFormat,
>+                                      GLsizei width,
>+                                      GLsizei height,
>+                                      GLsizei depth,
>+                                      GLuint memory,
>+                                      GLuint64 offset)
>+{
>+    return gl::TexStorageMem3DEXT(target, levels, internalFormat, width, height, depth, memory,
>+                                  offset);
>+}
>+
>+void GL_APIENTRY glTexStorageMem3DMultisampleEXT(GLenum target,
>+                                                 GLsizei samples,
>+                                                 GLenum internalFormat,
>+                                                 GLsizei width,
>+                                                 GLsizei height,
>+                                                 GLsizei depth,
>+                                                 GLboolean fixedSampleLocations,
>+                                                 GLuint memory,
>+                                                 GLuint64 offset)
>+{
>+    return gl::TexStorageMem3DMultisampleEXT(target, samples, internalFormat, width, height, depth,
>+                                             fixedSampleLocations, memory, offset);
>+}
>+
>+// GL_EXT_memory_object_fd
>+void GL_APIENTRY glImportMemoryFdEXT(GLuint memory, GLuint64 size, GLenum handleType, GLint fd)
>+{
>+    return gl::ImportMemoryFdEXT(memory, size, handleType, fd);
>+}
>+
>+// GL_EXT_occlusion_query_boolean
>+
>+// GL_EXT_robustness
>+GLenum GL_APIENTRY glGetGraphicsResetStatusEXT()
>+{
>+    return gl::GetGraphicsResetStatusEXT();
>+}
>+
>+void GL_APIENTRY glGetnUniformfvEXT(GLuint program,
>+                                    GLint location,
>+                                    GLsizei bufSize,
>+                                    GLfloat *params)
>+{
>+    return gl::GetnUniformfvEXT(program, location, bufSize, params);
>+}
>+
>+void GL_APIENTRY glGetnUniformivEXT(GLuint program, GLint location, GLsizei bufSize, GLint *params)
>+{
>+    return gl::GetnUniformivEXT(program, location, bufSize, params);
>+}
>+
>+void GL_APIENTRY glReadnPixelsEXT(GLint x,
>+                                  GLint y,
>+                                  GLsizei width,
>+                                  GLsizei height,
>+                                  GLenum format,
>+                                  GLenum type,
>+                                  GLsizei bufSize,
>+                                  void *data)
>+{
>+    return gl::ReadnPixelsEXT(x, y, width, height, format, type, bufSize, data);
>+}
>+
>+// GL_EXT_semaphore
>+void GL_APIENTRY glDeleteSemaphoresEXT(GLsizei n, const GLuint *semaphores)
>+{
>+    return gl::DeleteSemaphoresEXT(n, semaphores);
>+}
>+
>+void GL_APIENTRY glGenSemaphoresEXT(GLsizei n, GLuint *semaphores)
>+{
>+    return gl::GenSemaphoresEXT(n, semaphores);
>+}
>+
>+void GL_APIENTRY glGetSemaphoreParameterui64vEXT(GLuint semaphore, GLenum pname, GLuint64 *params)
>+{
>+    return gl::GetSemaphoreParameterui64vEXT(semaphore, pname, params);
>+}
>+
>+GLboolean GL_APIENTRY glIsSemaphoreEXT(GLuint semaphore)
>+{
>+    return gl::IsSemaphoreEXT(semaphore);
>+}
>+
>+void GL_APIENTRY glSemaphoreParameterui64vEXT(GLuint semaphore,
>+                                              GLenum pname,
>+                                              const GLuint64 *params)
>+{
>+    return gl::SemaphoreParameterui64vEXT(semaphore, pname, params);
>+}
>+
>+void GL_APIENTRY glSignalSemaphoreEXT(GLuint semaphore,
>+                                      GLuint numBufferBarriers,
>+                                      const GLuint *buffers,
>+                                      GLuint numTextureBarriers,
>+                                      const GLuint *textures,
>+                                      const GLenum *dstLayouts)
>+{
>+    return gl::SignalSemaphoreEXT(semaphore, numBufferBarriers, buffers, numTextureBarriers,
>+                                  textures, dstLayouts);
>+}
>+
>+void GL_APIENTRY glWaitSemaphoreEXT(GLuint semaphore,
>+                                    GLuint numBufferBarriers,
>+                                    const GLuint *buffers,
>+                                    GLuint numTextureBarriers,
>+                                    const GLuint *textures,
>+                                    const GLenum *srcLayouts)
>+{
>+    return gl::WaitSemaphoreEXT(semaphore, numBufferBarriers, buffers, numTextureBarriers, textures,
>+                                srcLayouts);
>+}
>+
>+// GL_EXT_semaphore_fd
>+void GL_APIENTRY glImportSemaphoreFdEXT(GLuint semaphore, GLenum handleType, GLint fd)
>+{
>+    return gl::ImportSemaphoreFdEXT(semaphore, handleType, fd);
>+}
>+
>+// GL_EXT_texture_storage
>+void GL_APIENTRY glTexStorage1DEXT(GLenum target,
>+                                   GLsizei levels,
>+                                   GLenum internalformat,
>+                                   GLsizei width)
>+{
>+    return gl::TexStorage1DEXT(target, levels, internalformat, width);
>+}
>+
>+void GL_APIENTRY glTexStorage2DEXT(GLenum target,
>+                                   GLsizei levels,
>+                                   GLenum internalformat,
>+                                   GLsizei width,
>+                                   GLsizei height)
>+{
>+    return gl::TexStorage2DEXT(target, levels, internalformat, width, height);
>+}
>+
>+void GL_APIENTRY glTexStorage3DEXT(GLenum target,
>+                                   GLsizei levels,
>+                                   GLenum internalformat,
>+                                   GLsizei width,
>+                                   GLsizei height,
>+                                   GLsizei depth)
>+{
>+    return gl::TexStorage3DEXT(target, levels, internalformat, width, height, depth);
>+}
>+
>+// GL_KHR_debug
>+void GL_APIENTRY glDebugMessageCallbackKHR(GLDEBUGPROCKHR callback, const void *userParam)
>+{
>+    return gl::DebugMessageCallbackKHR(callback, userParam);
>+}
>+
>+void GL_APIENTRY glDebugMessageControlKHR(GLenum source,
>+                                          GLenum type,
>+                                          GLenum severity,
>+                                          GLsizei count,
>+                                          const GLuint *ids,
>+                                          GLboolean enabled)
>+{
>+    return gl::DebugMessageControlKHR(source, type, severity, count, ids, enabled);
>+}
>+
>+void GL_APIENTRY glDebugMessageInsertKHR(GLenum source,
>+                                         GLenum type,
>+                                         GLuint id,
>+                                         GLenum severity,
>+                                         GLsizei length,
>+                                         const GLchar *buf)
>+{
>+    return gl::DebugMessageInsertKHR(source, type, id, severity, length, buf);
>+}
>+
>+GLuint GL_APIENTRY glGetDebugMessageLogKHR(GLuint count,
>+                                           GLsizei bufSize,
>+                                           GLenum *sources,
>+                                           GLenum *types,
>+                                           GLuint *ids,
>+                                           GLenum *severities,
>+                                           GLsizei *lengths,
>+                                           GLchar *messageLog)
>+{
>+    return gl::GetDebugMessageLogKHR(count, bufSize, sources, types, ids, severities, lengths,
>+                                     messageLog);
>+}
>+
>+void GL_APIENTRY
>+glGetObjectLabelKHR(GLenum identifier, GLuint name, GLsizei bufSize, GLsizei *length, GLchar *label)
>+{
>+    return gl::GetObjectLabelKHR(identifier, name, bufSize, length, label);
>+}
>+
>+void GL_APIENTRY glGetObjectPtrLabelKHR(const void *ptr,
>+                                        GLsizei bufSize,
>+                                        GLsizei *length,
>+                                        GLchar *label)
>+{
>+    return gl::GetObjectPtrLabelKHR(ptr, bufSize, length, label);
>+}
>+
>+void GL_APIENTRY glGetPointervKHR(GLenum pname, void **params)
>+{
>+    return gl::GetPointervKHR(pname, params);
>+}
>+
>+void GL_APIENTRY glObjectLabelKHR(GLenum identifier,
>+                                  GLuint name,
>+                                  GLsizei length,
>+                                  const GLchar *label)
>+{
>+    return gl::ObjectLabelKHR(identifier, name, length, label);
>+}
>+
>+void GL_APIENTRY glObjectPtrLabelKHR(const void *ptr, GLsizei length, const GLchar *label)
>+{
>+    return gl::ObjectPtrLabelKHR(ptr, length, label);
>+}
>+
>+void GL_APIENTRY glPopDebugGroupKHR()
>+{
>+    return gl::PopDebugGroupKHR();
>+}
>+
>+void GL_APIENTRY glPushDebugGroupKHR(GLenum source,
>+                                     GLuint id,
>+                                     GLsizei length,
>+                                     const GLchar *message)
>+{
>+    return gl::PushDebugGroupKHR(source, id, length, message);
>+}
>+
>+// GL_KHR_parallel_shader_compile
>+void GL_APIENTRY glMaxShaderCompilerThreadsKHR(GLuint count)
>+{
>+    return gl::MaxShaderCompilerThreadsKHR(count);
>+}
>+
>+// GL_NV_fence
>+void GL_APIENTRY glDeleteFencesNV(GLsizei n, const GLuint *fences)
>+{
>+    return gl::DeleteFencesNV(n, fences);
>+}
>+
>+void GL_APIENTRY glFinishFenceNV(GLuint fence)
>+{
>+    return gl::FinishFenceNV(fence);
>+}
>+
>+void GL_APIENTRY glGenFencesNV(GLsizei n, GLuint *fences)
>+{
>+    return gl::GenFencesNV(n, fences);
>+}
>+
>+void GL_APIENTRY glGetFenceivNV(GLuint fence, GLenum pname, GLint *params)
>+{
>+    return gl::GetFenceivNV(fence, pname, params);
>+}
>+
>+GLboolean GL_APIENTRY glIsFenceNV(GLuint fence)
>+{
>+    return gl::IsFenceNV(fence);
>+}
>+
>+void GL_APIENTRY glSetFenceNV(GLuint fence, GLenum condition)
>+{
>+    return gl::SetFenceNV(fence, condition);
>+}
>+
>+GLboolean GL_APIENTRY glTestFenceNV(GLuint fence)
>+{
>+    return gl::TestFenceNV(fence);
>+}
>+
>+// GL_OES_EGL_image
>+void GL_APIENTRY glEGLImageTargetRenderbufferStorageOES(GLenum target, GLeglImageOES image)
>+{
>+    return gl::EGLImageTargetRenderbufferStorageOES(target, image);
>+}
>+
>+void GL_APIENTRY glEGLImageTargetTexture2DOES(GLenum target, GLeglImageOES image)
>+{
>+    return gl::EGLImageTargetTexture2DOES(target, image);
>+}
>+
>+// GL_OES_draw_texture
>+void GL_APIENTRY glDrawTexfOES(GLfloat x, GLfloat y, GLfloat z, GLfloat width, GLfloat height)
>+{
>+    return gl::DrawTexfOES(x, y, z, width, height);
>+}
>+
>+void GL_APIENTRY glDrawTexfvOES(const GLfloat *coords)
>+{
>+    return gl::DrawTexfvOES(coords);
>+}
>+
>+void GL_APIENTRY glDrawTexiOES(GLint x, GLint y, GLint z, GLint width, GLint height)
>+{
>+    return gl::DrawTexiOES(x, y, z, width, height);
>+}
>+
>+void GL_APIENTRY glDrawTexivOES(const GLint *coords)
>+{
>+    return gl::DrawTexivOES(coords);
>+}
>+
>+void GL_APIENTRY glDrawTexsOES(GLshort x, GLshort y, GLshort z, GLshort width, GLshort height)
>+{
>+    return gl::DrawTexsOES(x, y, z, width, height);
>+}
>+
>+void GL_APIENTRY glDrawTexsvOES(const GLshort *coords)
>+{
>+    return gl::DrawTexsvOES(coords);
>+}
>+
>+void GL_APIENTRY glDrawTexxOES(GLfixed x, GLfixed y, GLfixed z, GLfixed width, GLfixed height)
>+{
>+    return gl::DrawTexxOES(x, y, z, width, height);
>+}
>+
>+void GL_APIENTRY glDrawTexxvOES(const GLfixed *coords)
>+{
>+    return gl::DrawTexxvOES(coords);
>+}
>+
>+// GL_OES_framebuffer_object
>+void GL_APIENTRY glBindFramebufferOES(GLenum target, GLuint framebuffer)
>+{
>+    return gl::BindFramebufferOES(target, framebuffer);
>+}
>+
>+void GL_APIENTRY glBindRenderbufferOES(GLenum target, GLuint renderbuffer)
>+{
>+    return gl::BindRenderbufferOES(target, renderbuffer);
>+}
>+
>+GLenum GL_APIENTRY glCheckFramebufferStatusOES(GLenum target)
>+{
>+    return gl::CheckFramebufferStatusOES(target);
>+}
>+
>+void GL_APIENTRY glDeleteFramebuffersOES(GLsizei n, const GLuint *framebuffers)
>+{
>+    return gl::DeleteFramebuffersOES(n, framebuffers);
>+}
>+
>+void GL_APIENTRY glDeleteRenderbuffersOES(GLsizei n, const GLuint *renderbuffers)
>+{
>+    return gl::DeleteRenderbuffersOES(n, renderbuffers);
>+}
>+
>+void GL_APIENTRY glFramebufferRenderbufferOES(GLenum target,
>+                                              GLenum attachment,
>+                                              GLenum renderbuffertarget,
>+                                              GLuint renderbuffer)
>+{
>+    return gl::FramebufferRenderbufferOES(target, attachment, renderbuffertarget, renderbuffer);
>+}
>+
>+void GL_APIENTRY glFramebufferTexture2DOES(GLenum target,
>+                                           GLenum attachment,
>+                                           GLenum textarget,
>+                                           GLuint texture,
>+                                           GLint level)
>+{
>+    return gl::FramebufferTexture2DOES(target, attachment, textarget, texture, level);
>+}
>+
>+void GL_APIENTRY glGenFramebuffersOES(GLsizei n, GLuint *framebuffers)
>+{
>+    return gl::GenFramebuffersOES(n, framebuffers);
>+}
>+
>+void GL_APIENTRY glGenRenderbuffersOES(GLsizei n, GLuint *renderbuffers)
>+{
>+    return gl::GenRenderbuffersOES(n, renderbuffers);
>+}
>+
>+void GL_APIENTRY glGenerateMipmapOES(GLenum target)
>+{
>+    return gl::GenerateMipmapOES(target);
>+}
>+
>+void GL_APIENTRY glGetFramebufferAttachmentParameterivOES(GLenum target,
>+                                                          GLenum attachment,
>+                                                          GLenum pname,
>+                                                          GLint *params)
>+{
>+    return gl::GetFramebufferAttachmentParameterivOES(target, attachment, pname, params);
>+}
>+
>+void GL_APIENTRY glGetRenderbufferParameterivOES(GLenum target, GLenum pname, GLint *params)
>+{
>+    return gl::GetRenderbufferParameterivOES(target, pname, params);
>+}
>+
>+GLboolean GL_APIENTRY glIsFramebufferOES(GLuint framebuffer)
>+{
>+    return gl::IsFramebufferOES(framebuffer);
>+}
>+
>+GLboolean GL_APIENTRY glIsRenderbufferOES(GLuint renderbuffer)
>+{
>+    return gl::IsRenderbufferOES(renderbuffer);
>+}
>+
>+void GL_APIENTRY glRenderbufferStorageOES(GLenum target,
>+                                          GLenum internalformat,
>+                                          GLsizei width,
>+                                          GLsizei height)
>+{
>+    return gl::RenderbufferStorageOES(target, internalformat, width, height);
>+}
>+
>+// GL_OES_get_program_binary
>+void GL_APIENTRY glGetProgramBinaryOES(GLuint program,
>+                                       GLsizei bufSize,
>+                                       GLsizei *length,
>+                                       GLenum *binaryFormat,
>+                                       void *binary)
>+{
>+    return gl::GetProgramBinaryOES(program, bufSize, length, binaryFormat, binary);
>+}
>+
>+void GL_APIENTRY glProgramBinaryOES(GLuint program,
>+                                    GLenum binaryFormat,
>+                                    const void *binary,
>+                                    GLint length)
>+{
>+    return gl::ProgramBinaryOES(program, binaryFormat, binary, length);
>+}
>+
>+// GL_OES_mapbuffer
>+void GL_APIENTRY glGetBufferPointervOES(GLenum target, GLenum pname, void **params)
>+{
>+    return gl::GetBufferPointervOES(target, pname, params);
>+}
>+
>+void *GL_APIENTRY glMapBufferOES(GLenum target, GLenum access)
>+{
>+    return gl::MapBufferOES(target, access);
>+}
>+
>+GLboolean GL_APIENTRY glUnmapBufferOES(GLenum target)
>+{
>+    return gl::UnmapBufferOES(target);
>+}
>+
>+// GL_OES_matrix_palette
>+void GL_APIENTRY glCurrentPaletteMatrixOES(GLuint matrixpaletteindex)
>+{
>+    return gl::CurrentPaletteMatrixOES(matrixpaletteindex);
>+}
>+
>+void GL_APIENTRY glLoadPaletteFromModelViewMatrixOES()
>+{
>+    return gl::LoadPaletteFromModelViewMatrixOES();
>+}
>+
>+void GL_APIENTRY glMatrixIndexPointerOES(GLint size,
>+                                         GLenum type,
>+                                         GLsizei stride,
>+                                         const void *pointer)
>+{
>+    return gl::MatrixIndexPointerOES(size, type, stride, pointer);
>+}
>+
>+void GL_APIENTRY glWeightPointerOES(GLint size, GLenum type, GLsizei stride, const void *pointer)
>+{
>+    return gl::WeightPointerOES(size, type, stride, pointer);
>+}
>+
>+// GL_OES_point_size_array
>+void GL_APIENTRY glPointSizePointerOES(GLenum type, GLsizei stride, const void *pointer)
>+{
>+    return gl::PointSizePointerOES(type, stride, pointer);
>+}
>+
>+// GL_OES_query_matrix
>+GLbitfield GL_APIENTRY glQueryMatrixxOES(GLfixed *mantissa, GLint *exponent)
>+{
>+    return gl::QueryMatrixxOES(mantissa, exponent);
>+}
>+
>+// GL_OES_texture_border_clamp
>+void GL_APIENTRY glGetSamplerParameterIivOES(GLuint sampler, GLenum pname, GLint *params)
>+{
>+    return gl::GetSamplerParameterIivOES(sampler, pname, params);
>+}
>+
>+void GL_APIENTRY glGetSamplerParameterIuivOES(GLuint sampler, GLenum pname, GLuint *params)
>+{
>+    return gl::GetSamplerParameterIuivOES(sampler, pname, params);
>+}
>+
>+void GL_APIENTRY glGetTexParameterIivOES(GLenum target, GLenum pname, GLint *params)
>+{
>+    return gl::GetTexParameterIivOES(target, pname, params);
>+}
>+
>+void GL_APIENTRY glGetTexParameterIuivOES(GLenum target, GLenum pname, GLuint *params)
>+{
>+    return gl::GetTexParameterIuivOES(target, pname, params);
>+}
>+
>+void GL_APIENTRY glSamplerParameterIivOES(GLuint sampler, GLenum pname, const GLint *param)
>+{
>+    return gl::SamplerParameterIivOES(sampler, pname, param);
>+}
>+
>+void GL_APIENTRY glSamplerParameterIuivOES(GLuint sampler, GLenum pname, const GLuint *param)
>+{
>+    return gl::SamplerParameterIuivOES(sampler, pname, param);
>+}
>+
>+void GL_APIENTRY glTexParameterIivOES(GLenum target, GLenum pname, const GLint *params)
>+{
>+    return gl::TexParameterIivOES(target, pname, params);
>+}
>+
>+void GL_APIENTRY glTexParameterIuivOES(GLenum target, GLenum pname, const GLuint *params)
>+{
>+    return gl::TexParameterIuivOES(target, pname, params);
>+}
>+
>+// GL_OES_texture_cube_map
>+void GL_APIENTRY glGetTexGenfvOES(GLenum coord, GLenum pname, GLfloat *params)
>+{
>+    return gl::GetTexGenfvOES(coord, pname, params);
>+}
>+
>+void GL_APIENTRY glGetTexGenivOES(GLenum coord, GLenum pname, GLint *params)
>+{
>+    return gl::GetTexGenivOES(coord, pname, params);
>+}
>+
>+void GL_APIENTRY glGetTexGenxvOES(GLenum coord, GLenum pname, GLfixed *params)
>+{
>+    return gl::GetTexGenxvOES(coord, pname, params);
>+}
>+
>+void GL_APIENTRY glTexGenfOES(GLenum coord, GLenum pname, GLfloat param)
>+{
>+    return gl::TexGenfOES(coord, pname, param);
>+}
>+
>+void GL_APIENTRY glTexGenfvOES(GLenum coord, GLenum pname, const GLfloat *params)
>+{
>+    return gl::TexGenfvOES(coord, pname, params);
>+}
>+
>+void GL_APIENTRY glTexGeniOES(GLenum coord, GLenum pname, GLint param)
>+{
>+    return gl::TexGeniOES(coord, pname, param);
>+}
>+
>+void GL_APIENTRY glTexGenivOES(GLenum coord, GLenum pname, const GLint *params)
>+{
>+    return gl::TexGenivOES(coord, pname, params);
>+}
>+
>+void GL_APIENTRY glTexGenxOES(GLenum coord, GLenum pname, GLfixed param)
>+{
>+    return gl::TexGenxOES(coord, pname, param);
>+}
>+
>+void GL_APIENTRY glTexGenxvOES(GLenum coord, GLenum pname, const GLfixed *params)
>+{
>+    return gl::TexGenxvOES(coord, pname, params);
>+}
>+
>+// GL_OES_texture_storage_multisample_2d_array
>+void GL_APIENTRY glTexStorage3DMultisampleOES(GLenum target,
>+                                              GLsizei samples,
>+                                              GLenum internalformat,
>+                                              GLsizei width,
>+                                              GLsizei height,
>+                                              GLsizei depth,
>+                                              GLboolean fixedsamplelocations)
>+{
>+    return gl::TexStorage3DMultisampleOES(target, samples, internalformat, width, height, depth,
>+                                          fixedsamplelocations);
>+}
>+
>+// GL_OES_vertex_array_object
>+void GL_APIENTRY glBindVertexArrayOES(GLuint array)
>+{
>+    return gl::BindVertexArrayOES(array);
>+}
>+
>+void GL_APIENTRY glDeleteVertexArraysOES(GLsizei n, const GLuint *arrays)
>+{
>+    return gl::DeleteVertexArraysOES(n, arrays);
>+}
>+
>+void GL_APIENTRY glGenVertexArraysOES(GLsizei n, GLuint *arrays)
>+{
>+    return gl::GenVertexArraysOES(n, arrays);
>+}
>+
>+GLboolean GL_APIENTRY glIsVertexArrayOES(GLuint array)
>+{
>+    return gl::IsVertexArrayOES(array);
>+}
>+
>+// GL_OVR_multiview
>+void GL_APIENTRY glFramebufferTextureMultiviewOVR(GLenum target,
>+                                                  GLenum attachment,
>+                                                  GLuint texture,
>+                                                  GLint level,
>+                                                  GLint baseViewIndex,
>+                                                  GLsizei numViews)
>+{
>+    return gl::FramebufferTextureMultiviewOVR(target, attachment, texture, level, baseViewIndex,
>+                                              numViews);
>+}
>+
>+// GL_OVR_multiview2
>+
>+// EGL_ANGLE_explicit_context
>+void GL_APIENTRY glActiveShaderProgramContextANGLE(GLeglContext ctx,
>+                                                   GLuint pipeline,
>+                                                   GLuint program)
>+{
>+    return gl::ActiveShaderProgramContextANGLE(ctx, pipeline, program);
>+}
>+
>+void GL_APIENTRY glActiveTextureContextANGLE(GLeglContext ctx, GLenum texture)
>+{
>+    return gl::ActiveTextureContextANGLE(ctx, texture);
>+}
>+
>+void GL_APIENTRY glAlphaFuncContextANGLE(GLeglContext ctx, GLenum func, GLfloat ref)
>+{
>+    return gl::AlphaFuncContextANGLE(ctx, func, ref);
>+}
>+
>+void GL_APIENTRY glAlphaFuncxContextANGLE(GLeglContext ctx, GLenum func, GLfixed ref)
>+{
>+    return gl::AlphaFuncxContextANGLE(ctx, func, ref);
>+}
>+
>+void GL_APIENTRY glAttachShaderContextANGLE(GLeglContext ctx, GLuint program, GLuint shader)
>+{
>+    return gl::AttachShaderContextANGLE(ctx, program, shader);
>+}
>+
>+void GL_APIENTRY glBeginQueryContextANGLE(GLeglContext ctx, GLenum target, GLuint id)
>+{
>+    return gl::BeginQueryContextANGLE(ctx, target, id);
>+}
>+
>+void GL_APIENTRY glBeginQueryEXTContextANGLE(GLeglContext ctx, GLenum target, GLuint id)
>+{
>+    return gl::BeginQueryEXTContextANGLE(ctx, target, id);
>+}
>+
>+void GL_APIENTRY glBeginTransformFeedbackContextANGLE(GLeglContext ctx, GLenum primitiveMode)
>+{
>+    return gl::BeginTransformFeedbackContextANGLE(ctx, primitiveMode);
>+}
>+
>+void GL_APIENTRY glBindAttribLocationContextANGLE(GLeglContext ctx,
>+                                                  GLuint program,
>+                                                  GLuint index,
>+                                                  const GLchar *name)
>+{
>+    return gl::BindAttribLocationContextANGLE(ctx, program, index, name);
>+}
>+
>+void GL_APIENTRY glBindBufferContextANGLE(GLeglContext ctx, GLenum target, GLuint buffer)
>+{
>+    return gl::BindBufferContextANGLE(ctx, target, buffer);
>+}
>+
>+void GL_APIENTRY glBindBufferBaseContextANGLE(GLeglContext ctx,
>+                                              GLenum target,
>+                                              GLuint index,
>+                                              GLuint buffer)
>+{
>+    return gl::BindBufferBaseContextANGLE(ctx, target, index, buffer);
>+}
>+
>+void GL_APIENTRY glBindBufferRangeContextANGLE(GLeglContext ctx,
>+                                               GLenum target,
>+                                               GLuint index,
>+                                               GLuint buffer,
>+                                               GLintptr offset,
>+                                               GLsizeiptr size)
>+{
>+    return gl::BindBufferRangeContextANGLE(ctx, target, index, buffer, offset, size);
>+}
>+
>+void GL_APIENTRY glBindFragDataLocationEXTContextANGLE(GLeglContext ctx,
>+                                                       GLuint program,
>+                                                       GLuint color,
>+                                                       const GLchar *name)
>+{
>+    return gl::BindFragDataLocationEXTContextANGLE(ctx, program, color, name);
>+}
>+
>+void GL_APIENTRY glBindFragDataLocationIndexedEXTContextANGLE(GLeglContext ctx,
>+                                                              GLuint program,
>+                                                              GLuint colorNumber,
>+                                                              GLuint index,
>+                                                              const GLchar *name)
>+{
>+    return gl::BindFragDataLocationIndexedEXTContextANGLE(ctx, program, colorNumber, index, name);
>+}
>+
>+void GL_APIENTRY glBindFramebufferContextANGLE(GLeglContext ctx, GLenum target, GLuint framebuffer)
>+{
>+    return gl::BindFramebufferContextANGLE(ctx, target, framebuffer);
>+}
>+
>+void GL_APIENTRY glBindFramebufferOESContextANGLE(GLeglContext ctx,
>+                                                  GLenum target,
>+                                                  GLuint framebuffer)
>+{
>+    return gl::BindFramebufferOESContextANGLE(ctx, target, framebuffer);
>+}
>+
>+void GL_APIENTRY glBindImageTextureContextANGLE(GLeglContext ctx,
>+                                                GLuint unit,
>+                                                GLuint texture,
>+                                                GLint level,
>+                                                GLboolean layered,
>+                                                GLint layer,
>+                                                GLenum access,
>+                                                GLenum format)
>+{
>+    return gl::BindImageTextureContextANGLE(ctx, unit, texture, level, layered, layer, access,
>+                                            format);
>+}
>+
>+void GL_APIENTRY glBindProgramPipelineContextANGLE(GLeglContext ctx, GLuint pipeline)
>+{
>+    return gl::BindProgramPipelineContextANGLE(ctx, pipeline);
>+}
>+
>+void GL_APIENTRY glBindRenderbufferContextANGLE(GLeglContext ctx,
>+                                                GLenum target,
>+                                                GLuint renderbuffer)
>+{
>+    return gl::BindRenderbufferContextANGLE(ctx, target, renderbuffer);
>+}
>+
>+void GL_APIENTRY glBindRenderbufferOESContextANGLE(GLeglContext ctx,
>+                                                   GLenum target,
>+                                                   GLuint renderbuffer)
>+{
>+    return gl::BindRenderbufferOESContextANGLE(ctx, target, renderbuffer);
>+}
>+
>+void GL_APIENTRY glBindSamplerContextANGLE(GLeglContext ctx, GLuint unit, GLuint sampler)
>+{
>+    return gl::BindSamplerContextANGLE(ctx, unit, sampler);
>+}
>+
>+void GL_APIENTRY glBindTextureContextANGLE(GLeglContext ctx, GLenum target, GLuint texture)
>+{
>+    return gl::BindTextureContextANGLE(ctx, target, texture);
>+}
>+
>+void GL_APIENTRY glBindTransformFeedbackContextANGLE(GLeglContext ctx, GLenum target, GLuint id)
>+{
>+    return gl::BindTransformFeedbackContextANGLE(ctx, target, id);
>+}
>+
>+void GL_APIENTRY glBindVertexArrayContextANGLE(GLeglContext ctx, GLuint array)
>+{
>+    return gl::BindVertexArrayContextANGLE(ctx, array);
>+}
>+
>+void GL_APIENTRY glBindVertexArrayOESContextANGLE(GLeglContext ctx, GLuint array)
>+{
>+    return gl::BindVertexArrayOESContextANGLE(ctx, array);
>+}
>+
>+void GL_APIENTRY glBindVertexBufferContextANGLE(GLeglContext ctx,
>+                                                GLuint bindingindex,
>+                                                GLuint buffer,
>+                                                GLintptr offset,
>+                                                GLsizei stride)
>+{
>+    return gl::BindVertexBufferContextANGLE(ctx, bindingindex, buffer, offset, stride);
>+}
>+
>+void GL_APIENTRY
>+glBlendColorContextANGLE(GLeglContext ctx, GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha)
>+{
>+    return gl::BlendColorContextANGLE(ctx, red, green, blue, alpha);
>+}
>+
>+void GL_APIENTRY glBlendEquationContextANGLE(GLeglContext ctx, GLenum mode)
>+{
>+    return gl::BlendEquationContextANGLE(ctx, mode);
>+}
>+
>+void GL_APIENTRY glBlendEquationSeparateContextANGLE(GLeglContext ctx,
>+                                                     GLenum modeRGB,
>+                                                     GLenum modeAlpha)
>+{
>+    return gl::BlendEquationSeparateContextANGLE(ctx, modeRGB, modeAlpha);
>+}
>+
>+void GL_APIENTRY glBlendFuncContextANGLE(GLeglContext ctx, GLenum sfactor, GLenum dfactor)
>+{
>+    return gl::BlendFuncContextANGLE(ctx, sfactor, dfactor);
>+}
>+
>+void GL_APIENTRY glBlendFuncSeparateContextANGLE(GLeglContext ctx,
>+                                                 GLenum sfactorRGB,
>+                                                 GLenum dfactorRGB,
>+                                                 GLenum sfactorAlpha,
>+                                                 GLenum dfactorAlpha)
>+{
>+    return gl::BlendFuncSeparateContextANGLE(ctx, sfactorRGB, dfactorRGB, sfactorAlpha,
>+                                             dfactorAlpha);
>+}
>+
>+void GL_APIENTRY glBlitFramebufferContextANGLE(GLeglContext ctx,
>+                                               GLint srcX0,
>+                                               GLint srcY0,
>+                                               GLint srcX1,
>+                                               GLint srcY1,
>+                                               GLint dstX0,
>+                                               GLint dstY0,
>+                                               GLint dstX1,
>+                                               GLint dstY1,
>+                                               GLbitfield mask,
>+                                               GLenum filter)
>+{
>+    return gl::BlitFramebufferContextANGLE(ctx, srcX0, srcY0, srcX1, srcY1, dstX0, dstY0, dstX1,
>+                                           dstY1, mask, filter);
>+}
>+
>+void GL_APIENTRY glBlitFramebufferANGLEContextANGLE(GLeglContext ctx,
>+                                                    GLint srcX0,
>+                                                    GLint srcY0,
>+                                                    GLint srcX1,
>+                                                    GLint srcY1,
>+                                                    GLint dstX0,
>+                                                    GLint dstY0,
>+                                                    GLint dstX1,
>+                                                    GLint dstY1,
>+                                                    GLbitfield mask,
>+                                                    GLenum filter)
>+{
>+    return gl::BlitFramebufferANGLEContextANGLE(ctx, srcX0, srcY0, srcX1, srcY1, dstX0, dstY0,
>+                                                dstX1, dstY1, mask, filter);
>+}
>+
>+void GL_APIENTRY glBufferDataContextANGLE(GLeglContext ctx,
>+                                          GLenum target,
>+                                          GLsizeiptr size,
>+                                          const void *data,
>+                                          GLenum usage)
>+{
>+    return gl::BufferDataContextANGLE(ctx, target, size, data, usage);
>+}
>+
>+void GL_APIENTRY glBufferStorageMemEXTContextANGLE(GLeglContext ctx,
>+                                                   GLenum target,
>+                                                   GLsizeiptr size,
>+                                                   GLuint memory,
>+                                                   GLuint64 offset)
>+{
>+    return gl::BufferStorageMemEXTContextANGLE(ctx, target, size, memory, offset);
>+}
>+
>+void GL_APIENTRY glBufferSubDataContextANGLE(GLeglContext ctx,
>+                                             GLenum target,
>+                                             GLintptr offset,
>+                                             GLsizeiptr size,
>+                                             const void *data)
>+{
>+    return gl::BufferSubDataContextANGLE(ctx, target, offset, size, data);
>+}
>+
>+GLenum GL_APIENTRY glCheckFramebufferStatusContextANGLE(GLeglContext ctx, GLenum target)
>+{
>+    return gl::CheckFramebufferStatusContextANGLE(ctx, target);
>+}
>+
>+GLenum GL_APIENTRY glCheckFramebufferStatusOESContextANGLE(GLeglContext ctx, GLenum target)
>+{
>+    return gl::CheckFramebufferStatusOESContextANGLE(ctx, target);
>+}
>+
>+void GL_APIENTRY glClearContextANGLE(GLeglContext ctx, GLbitfield mask)
>+{
>+    return gl::ClearContextANGLE(ctx, mask);
>+}
>+
>+void GL_APIENTRY glClearBufferfiContextANGLE(GLeglContext ctx,
>+                                             GLenum buffer,
>+                                             GLint drawbuffer,
>+                                             GLfloat depth,
>+                                             GLint stencil)
>+{
>+    return gl::ClearBufferfiContextANGLE(ctx, buffer, drawbuffer, depth, stencil);
>+}
>+
>+void GL_APIENTRY glClearBufferfvContextANGLE(GLeglContext ctx,
>+                                             GLenum buffer,
>+                                             GLint drawbuffer,
>+                                             const GLfloat *value)
>+{
>+    return gl::ClearBufferfvContextANGLE(ctx, buffer, drawbuffer, value);
>+}
>+
>+void GL_APIENTRY glClearBufferivContextANGLE(GLeglContext ctx,
>+                                             GLenum buffer,
>+                                             GLint drawbuffer,
>+                                             const GLint *value)
>+{
>+    return gl::ClearBufferivContextANGLE(ctx, buffer, drawbuffer, value);
>+}
>+
>+void GL_APIENTRY glClearBufferuivContextANGLE(GLeglContext ctx,
>+                                              GLenum buffer,
>+                                              GLint drawbuffer,
>+                                              const GLuint *value)
>+{
>+    return gl::ClearBufferuivContextANGLE(ctx, buffer, drawbuffer, value);
>+}
>+
>+void GL_APIENTRY
>+glClearColorContextANGLE(GLeglContext ctx, GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha)
>+{
>+    return gl::ClearColorContextANGLE(ctx, red, green, blue, alpha);
>+}
>+
>+void GL_APIENTRY
>+glClearColorxContextANGLE(GLeglContext ctx, GLfixed red, GLfixed green, GLfixed blue, GLfixed alpha)
>+{
>+    return gl::ClearColorxContextANGLE(ctx, red, green, blue, alpha);
>+}
>+
>+void GL_APIENTRY glClearDepthfContextANGLE(GLeglContext ctx, GLfloat d)
>+{
>+    return gl::ClearDepthfContextANGLE(ctx, d);
>+}
>+
>+void GL_APIENTRY glClearDepthxContextANGLE(GLeglContext ctx, GLfixed depth)
>+{
>+    return gl::ClearDepthxContextANGLE(ctx, depth);
>+}
>+
>+void GL_APIENTRY glClearStencilContextANGLE(GLeglContext ctx, GLint s)
>+{
>+    return gl::ClearStencilContextANGLE(ctx, s);
>+}
>+
>+void GL_APIENTRY glClientActiveTextureContextANGLE(GLeglContext ctx, GLenum texture)
>+{
>+    return gl::ClientActiveTextureContextANGLE(ctx, texture);
>+}
>+
>+GLenum GL_APIENTRY glClientWaitSyncContextANGLE(GLeglContext ctx,
>+                                                GLsync sync,
>+                                                GLbitfield flags,
>+                                                GLuint64 timeout)
>+{
>+    return gl::ClientWaitSyncContextANGLE(ctx, sync, flags, timeout);
>+}
>+
>+void GL_APIENTRY glClipPlanefContextANGLE(GLeglContext ctx, GLenum p, const GLfloat *eqn)
>+{
>+    return gl::ClipPlanefContextANGLE(ctx, p, eqn);
>+}
>+
>+void GL_APIENTRY glClipPlanexContextANGLE(GLeglContext ctx, GLenum plane, const GLfixed *equation)
>+{
>+    return gl::ClipPlanexContextANGLE(ctx, plane, equation);
>+}
>+
>+void GL_APIENTRY
>+glColor4fContextANGLE(GLeglContext ctx, GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha)
>+{
>+    return gl::Color4fContextANGLE(ctx, red, green, blue, alpha);
>+}
>+
>+void GL_APIENTRY
>+glColor4ubContextANGLE(GLeglContext ctx, GLubyte red, GLubyte green, GLubyte blue, GLubyte alpha)
>+{
>+    return gl::Color4ubContextANGLE(ctx, red, green, blue, alpha);
>+}
>+
>+void GL_APIENTRY
>+glColor4xContextANGLE(GLeglContext ctx, GLfixed red, GLfixed green, GLfixed blue, GLfixed alpha)
>+{
>+    return gl::Color4xContextANGLE(ctx, red, green, blue, alpha);
>+}
>+
>+void GL_APIENTRY glColorMaskContextANGLE(GLeglContext ctx,
>+                                         GLboolean red,
>+                                         GLboolean green,
>+                                         GLboolean blue,
>+                                         GLboolean alpha)
>+{
>+    return gl::ColorMaskContextANGLE(ctx, red, green, blue, alpha);
>+}
>+
>+void GL_APIENTRY glColorPointerContextANGLE(GLeglContext ctx,
>+                                            GLint size,
>+                                            GLenum type,
>+                                            GLsizei stride,
>+                                            const void *pointer)
>+{
>+    return gl::ColorPointerContextANGLE(ctx, size, type, stride, pointer);
>+}
>+
>+void GL_APIENTRY glCompileShaderContextANGLE(GLeglContext ctx, GLuint shader)
>+{
>+    return gl::CompileShaderContextANGLE(ctx, shader);
>+}
>+
>+void GL_APIENTRY glCompressedTexImage2DContextANGLE(GLeglContext ctx,
>+                                                    GLenum target,
>+                                                    GLint level,
>+                                                    GLenum internalformat,
>+                                                    GLsizei width,
>+                                                    GLsizei height,
>+                                                    GLint border,
>+                                                    GLsizei imageSize,
>+                                                    const void *data)
>+{
>+    return gl::CompressedTexImage2DContextANGLE(ctx, target, level, internalformat, width, height,
>+                                                border, imageSize, data);
>+}
>+
>+void GL_APIENTRY glCompressedTexImage3DContextANGLE(GLeglContext ctx,
>+                                                    GLenum target,
>+                                                    GLint level,
>+                                                    GLenum internalformat,
>+                                                    GLsizei width,
>+                                                    GLsizei height,
>+                                                    GLsizei depth,
>+                                                    GLint border,
>+                                                    GLsizei imageSize,
>+                                                    const void *data)
>+{
>+    return gl::CompressedTexImage3DContextANGLE(ctx, target, level, internalformat, width, height,
>+                                                depth, border, imageSize, data);
>+}
>+
>+void GL_APIENTRY glCompressedTexSubImage2DContextANGLE(GLeglContext ctx,
>+                                                       GLenum target,
>+                                                       GLint level,
>+                                                       GLint xoffset,
>+                                                       GLint yoffset,
>+                                                       GLsizei width,
>+                                                       GLsizei height,
>+                                                       GLenum format,
>+                                                       GLsizei imageSize,
>+                                                       const void *data)
>+{
>+    return gl::CompressedTexSubImage2DContextANGLE(ctx, target, level, xoffset, yoffset, width,
>+                                                   height, format, imageSize, data);
>+}
>+
>+void GL_APIENTRY glCompressedTexSubImage3DContextANGLE(GLeglContext ctx,
>+                                                       GLenum target,
>+                                                       GLint level,
>+                                                       GLint xoffset,
>+                                                       GLint yoffset,
>+                                                       GLint zoffset,
>+                                                       GLsizei width,
>+                                                       GLsizei height,
>+                                                       GLsizei depth,
>+                                                       GLenum format,
>+                                                       GLsizei imageSize,
>+                                                       const void *data)
>+{
>+    return gl::CompressedTexSubImage3DContextANGLE(ctx, target, level, xoffset, yoffset, zoffset,
>+                                                   width, height, depth, format, imageSize, data);
>+}
>+
>+void GL_APIENTRY glCopyBufferSubDataContextANGLE(GLeglContext ctx,
>+                                                 GLenum readTarget,
>+                                                 GLenum writeTarget,
>+                                                 GLintptr readOffset,
>+                                                 GLintptr writeOffset,
>+                                                 GLsizeiptr size)
>+{
>+    return gl::CopyBufferSubDataContextANGLE(ctx, readTarget, writeTarget, readOffset, writeOffset,
>+                                             size);
>+}
>+
>+void GL_APIENTRY glCopyTexImage2DContextANGLE(GLeglContext ctx,
>+                                              GLenum target,
>+                                              GLint level,
>+                                              GLenum internalformat,
>+                                              GLint x,
>+                                              GLint y,
>+                                              GLsizei width,
>+                                              GLsizei height,
>+                                              GLint border)
>+{
>+    return gl::CopyTexImage2DContextANGLE(ctx, target, level, internalformat, x, y, width, height,
>+                                          border);
>+}
>+
>+void GL_APIENTRY glCopyTexSubImage2DContextANGLE(GLeglContext ctx,
>+                                                 GLenum target,
>+                                                 GLint level,
>+                                                 GLint xoffset,
>+                                                 GLint yoffset,
>+                                                 GLint x,
>+                                                 GLint y,
>+                                                 GLsizei width,
>+                                                 GLsizei height)
>+{
>+    return gl::CopyTexSubImage2DContextANGLE(ctx, target, level, xoffset, yoffset, x, y, width,
>+                                             height);
>+}
>+
>+void GL_APIENTRY glCopyTexSubImage3DContextANGLE(GLeglContext ctx,
>+                                                 GLenum target,
>+                                                 GLint level,
>+                                                 GLint xoffset,
>+                                                 GLint yoffset,
>+                                                 GLint zoffset,
>+                                                 GLint x,
>+                                                 GLint y,
>+                                                 GLsizei width,
>+                                                 GLsizei height)
>+{
>+    return gl::CopyTexSubImage3DContextANGLE(ctx, target, level, xoffset, yoffset, zoffset, x, y,
>+                                             width, height);
>+}
>+
>+void GL_APIENTRY glCreateMemoryObjectsEXTContextANGLE(GLeglContext ctx,
>+                                                      GLsizei n,
>+                                                      GLuint *memoryObjects)
>+{
>+    return gl::CreateMemoryObjectsEXTContextANGLE(ctx, n, memoryObjects);
>+}
>+
>+GLuint GL_APIENTRY glCreateProgramContextANGLE(GLeglContext ctx)
>+{
>+    return gl::CreateProgramContextANGLE(ctx);
>+}
>+
>+GLuint GL_APIENTRY glCreateShaderContextANGLE(GLeglContext ctx, GLenum type)
>+{
>+    return gl::CreateShaderContextANGLE(ctx, type);
>+}
>+
>+GLuint GL_APIENTRY glCreateShaderProgramvContextANGLE(GLeglContext ctx,
>+                                                      GLenum type,
>+                                                      GLsizei count,
>+                                                      const GLchar *const *strings)
>+{
>+    return gl::CreateShaderProgramvContextANGLE(ctx, type, count, strings);
>+}
>+
>+void GL_APIENTRY glCullFaceContextANGLE(GLeglContext ctx, GLenum mode)
>+{
>+    return gl::CullFaceContextANGLE(ctx, mode);
>+}
>+
>+void GL_APIENTRY glCurrentPaletteMatrixOESContextANGLE(GLeglContext ctx, GLuint matrixpaletteindex)
>+{
>+    return gl::CurrentPaletteMatrixOESContextANGLE(ctx, matrixpaletteindex);
>+}
>+
>+void GL_APIENTRY glDebugMessageCallbackKHRContextANGLE(GLeglContext ctx,
>+                                                       GLDEBUGPROCKHR callback,
>+                                                       const void *userParam)
>+{
>+    return gl::DebugMessageCallbackKHRContextANGLE(ctx, callback, userParam);
>+}
>+
>+void GL_APIENTRY glDebugMessageControlKHRContextANGLE(GLeglContext ctx,
>+                                                      GLenum source,
>+                                                      GLenum type,
>+                                                      GLenum severity,
>+                                                      GLsizei count,
>+                                                      const GLuint *ids,
>+                                                      GLboolean enabled)
>+{
>+    return gl::DebugMessageControlKHRContextANGLE(ctx, source, type, severity, count, ids, enabled);
>+}
>+
>+void GL_APIENTRY glDebugMessageInsertKHRContextANGLE(GLeglContext ctx,
>+                                                     GLenum source,
>+                                                     GLenum type,
>+                                                     GLuint id,
>+                                                     GLenum severity,
>+                                                     GLsizei length,
>+                                                     const GLchar *buf)
>+{
>+    return gl::DebugMessageInsertKHRContextANGLE(ctx, source, type, id, severity, length, buf);
>+}
>+
>+void GL_APIENTRY glDeleteBuffersContextANGLE(GLeglContext ctx, GLsizei n, const GLuint *buffers)
>+{
>+    return gl::DeleteBuffersContextANGLE(ctx, n, buffers);
>+}
>+
>+void GL_APIENTRY glDeleteFencesNVContextANGLE(GLeglContext ctx, GLsizei n, const GLuint *fences)
>+{
>+    return gl::DeleteFencesNVContextANGLE(ctx, n, fences);
>+}
>+
>+void GL_APIENTRY glDeleteFramebuffersContextANGLE(GLeglContext ctx,
>+                                                  GLsizei n,
>+                                                  const GLuint *framebuffers)
>+{
>+    return gl::DeleteFramebuffersContextANGLE(ctx, n, framebuffers);
>+}
>+
>+void GL_APIENTRY glDeleteFramebuffersOESContextANGLE(GLeglContext ctx,
>+                                                     GLsizei n,
>+                                                     const GLuint *framebuffers)
>+{
>+    return gl::DeleteFramebuffersOESContextANGLE(ctx, n, framebuffers);
>+}
>+
>+void GL_APIENTRY glDeleteMemoryObjectsEXTContextANGLE(GLeglContext ctx,
>+                                                      GLsizei n,
>+                                                      const GLuint *memoryObjects)
>+{
>+    return gl::DeleteMemoryObjectsEXTContextANGLE(ctx, n, memoryObjects);
>+}
>+
>+void GL_APIENTRY glDeleteProgramContextANGLE(GLeglContext ctx, GLuint program)
>+{
>+    return gl::DeleteProgramContextANGLE(ctx, program);
>+}
>+
>+void GL_APIENTRY glDeleteProgramPipelinesContextANGLE(GLeglContext ctx,
>+                                                      GLsizei n,
>+                                                      const GLuint *pipelines)
>+{
>+    return gl::DeleteProgramPipelinesContextANGLE(ctx, n, pipelines);
>+}
>+
>+void GL_APIENTRY glDeleteQueriesContextANGLE(GLeglContext ctx, GLsizei n, const GLuint *ids)
>+{
>+    return gl::DeleteQueriesContextANGLE(ctx, n, ids);
>+}
>+
>+void GL_APIENTRY glDeleteQueriesEXTContextANGLE(GLeglContext ctx, GLsizei n, const GLuint *ids)
>+{
>+    return gl::DeleteQueriesEXTContextANGLE(ctx, n, ids);
>+}
>+
>+void GL_APIENTRY glDeleteRenderbuffersContextANGLE(GLeglContext ctx,
>+                                                   GLsizei n,
>+                                                   const GLuint *renderbuffers)
>+{
>+    return gl::DeleteRenderbuffersContextANGLE(ctx, n, renderbuffers);
>+}
>+
>+void GL_APIENTRY glDeleteRenderbuffersOESContextANGLE(GLeglContext ctx,
>+                                                      GLsizei n,
>+                                                      const GLuint *renderbuffers)
>+{
>+    return gl::DeleteRenderbuffersOESContextANGLE(ctx, n, renderbuffers);
>+}
>+
>+void GL_APIENTRY glDeleteSamplersContextANGLE(GLeglContext ctx,
>+                                              GLsizei count,
>+                                              const GLuint *samplers)
>+{
>+    return gl::DeleteSamplersContextANGLE(ctx, count, samplers);
>+}
>+
>+void GL_APIENTRY glDeleteSemaphoresEXTContextANGLE(GLeglContext ctx,
>+                                                   GLsizei n,
>+                                                   const GLuint *semaphores)
>+{
>+    return gl::DeleteSemaphoresEXTContextANGLE(ctx, n, semaphores);
>+}
>+
>+void GL_APIENTRY glDeleteShaderContextANGLE(GLeglContext ctx, GLuint shader)
>+{
>+    return gl::DeleteShaderContextANGLE(ctx, shader);
>+}
>+
>+void GL_APIENTRY glDeleteSyncContextANGLE(GLeglContext ctx, GLsync sync)
>+{
>+    return gl::DeleteSyncContextANGLE(ctx, sync);
>+}
>+
>+void GL_APIENTRY glDeleteTexturesContextANGLE(GLeglContext ctx, GLsizei n, const GLuint *textures)
>+{
>+    return gl::DeleteTexturesContextANGLE(ctx, n, textures);
>+}
>+
>+void GL_APIENTRY glDeleteTransformFeedbacksContextANGLE(GLeglContext ctx,
>+                                                        GLsizei n,
>+                                                        const GLuint *ids)
>+{
>+    return gl::DeleteTransformFeedbacksContextANGLE(ctx, n, ids);
>+}
>+
>+void GL_APIENTRY glDeleteVertexArraysContextANGLE(GLeglContext ctx, GLsizei n, const GLuint *arrays)
>+{
>+    return gl::DeleteVertexArraysContextANGLE(ctx, n, arrays);
>+}
>+
>+void GL_APIENTRY glDeleteVertexArraysOESContextANGLE(GLeglContext ctx,
>+                                                     GLsizei n,
>+                                                     const GLuint *arrays)
>+{
>+    return gl::DeleteVertexArraysOESContextANGLE(ctx, n, arrays);
>+}
>+
>+void GL_APIENTRY glDepthFuncContextANGLE(GLeglContext ctx, GLenum func)
>+{
>+    return gl::DepthFuncContextANGLE(ctx, func);
>+}
>+
>+void GL_APIENTRY glDepthMaskContextANGLE(GLeglContext ctx, GLboolean flag)
>+{
>+    return gl::DepthMaskContextANGLE(ctx, flag);
>+}
>+
>+void GL_APIENTRY glDepthRangefContextANGLE(GLeglContext ctx, GLfloat n, GLfloat f)
>+{
>+    return gl::DepthRangefContextANGLE(ctx, n, f);
>+}
>+
>+void GL_APIENTRY glDepthRangexContextANGLE(GLeglContext ctx, GLfixed n, GLfixed f)
>+{
>+    return gl::DepthRangexContextANGLE(ctx, n, f);
>+}
>+
>+void GL_APIENTRY glDetachShaderContextANGLE(GLeglContext ctx, GLuint program, GLuint shader)
>+{
>+    return gl::DetachShaderContextANGLE(ctx, program, shader);
>+}
>+
>+void GL_APIENTRY glDisableContextANGLE(GLeglContext ctx, GLenum cap)
>+{
>+    return gl::DisableContextANGLE(ctx, cap);
>+}
>+
>+void GL_APIENTRY glDisableClientStateContextANGLE(GLeglContext ctx, GLenum array)
>+{
>+    return gl::DisableClientStateContextANGLE(ctx, array);
>+}
>+
>+void GL_APIENTRY glDisableVertexAttribArrayContextANGLE(GLeglContext ctx, GLuint index)
>+{
>+    return gl::DisableVertexAttribArrayContextANGLE(ctx, index);
>+}
>+
>+void GL_APIENTRY glDiscardFramebufferEXTContextANGLE(GLeglContext ctx,
>+                                                     GLenum target,
>+                                                     GLsizei numAttachments,
>+                                                     const GLenum *attachments)
>+{
>+    return gl::DiscardFramebufferEXTContextANGLE(ctx, target, numAttachments, attachments);
>+}
>+
>+void GL_APIENTRY glDispatchComputeContextANGLE(GLeglContext ctx,
>+                                               GLuint num_groups_x,
>+                                               GLuint num_groups_y,
>+                                               GLuint num_groups_z)
>+{
>+    return gl::DispatchComputeContextANGLE(ctx, num_groups_x, num_groups_y, num_groups_z);
>+}
>+
>+void GL_APIENTRY glDispatchComputeIndirectContextANGLE(GLeglContext ctx, GLintptr indirect)
>+{
>+    return gl::DispatchComputeIndirectContextANGLE(ctx, indirect);
>+}
>+
>+void GL_APIENTRY glDrawArraysContextANGLE(GLeglContext ctx, GLenum mode, GLint first, GLsizei count)
>+{
>+    return gl::DrawArraysContextANGLE(ctx, mode, first, count);
>+}
>+
>+void GL_APIENTRY glDrawArraysIndirectContextANGLE(GLeglContext ctx,
>+                                                  GLenum mode,
>+                                                  const void *indirect)
>+{
>+    return gl::DrawArraysIndirectContextANGLE(ctx, mode, indirect);
>+}
>+
>+void GL_APIENTRY glDrawArraysInstancedContextANGLE(GLeglContext ctx,
>+                                                   GLenum mode,
>+                                                   GLint first,
>+                                                   GLsizei count,
>+                                                   GLsizei instancecount)
>+{
>+    return gl::DrawArraysInstancedContextANGLE(ctx, mode, first, count, instancecount);
>+}
>+
>+void GL_APIENTRY glDrawArraysInstancedANGLEContextANGLE(GLeglContext ctx,
>+                                                        GLenum mode,
>+                                                        GLint first,
>+                                                        GLsizei count,
>+                                                        GLsizei primcount)
>+{
>+    return gl::DrawArraysInstancedANGLEContextANGLE(ctx, mode, first, count, primcount);
>+}
>+
>+void GL_APIENTRY glDrawArraysInstancedEXTContextANGLE(GLeglContext ctx,
>+                                                      GLenum mode,
>+                                                      GLint start,
>+                                                      GLsizei count,
>+                                                      GLsizei primcount)
>+{
>+    return gl::DrawArraysInstancedEXTContextANGLE(ctx, mode, start, count, primcount);
>+}
>+
>+void GL_APIENTRY glDrawBuffersContextANGLE(GLeglContext ctx, GLsizei n, const GLenum *bufs)
>+{
>+    return gl::DrawBuffersContextANGLE(ctx, n, bufs);
>+}
>+
>+void GL_APIENTRY glDrawBuffersEXTContextANGLE(GLeglContext ctx, GLsizei n, const GLenum *bufs)
>+{
>+    return gl::DrawBuffersEXTContextANGLE(ctx, n, bufs);
>+}
>+
>+void GL_APIENTRY glDrawElementsContextANGLE(GLeglContext ctx,
>+                                            GLenum mode,
>+                                            GLsizei count,
>+                                            GLenum type,
>+                                            const void *indices)
>+{
>+    return gl::DrawElementsContextANGLE(ctx, mode, count, type, indices);
>+}
>+
>+void GL_APIENTRY glDrawElementsIndirectContextANGLE(GLeglContext ctx,
>+                                                    GLenum mode,
>+                                                    GLenum type,
>+                                                    const void *indirect)
>+{
>+    return gl::DrawElementsIndirectContextANGLE(ctx, mode, type, indirect);
>+}
>+
>+void GL_APIENTRY glDrawElementsInstancedContextANGLE(GLeglContext ctx,
>+                                                     GLenum mode,
>+                                                     GLsizei count,
>+                                                     GLenum type,
>+                                                     const void *indices,
>+                                                     GLsizei instancecount)
>+{
>+    return gl::DrawElementsInstancedContextANGLE(ctx, mode, count, type, indices, instancecount);
>+}
>+
>+void GL_APIENTRY glDrawElementsInstancedANGLEContextANGLE(GLeglContext ctx,
>+                                                          GLenum mode,
>+                                                          GLsizei count,
>+                                                          GLenum type,
>+                                                          const void *indices,
>+                                                          GLsizei primcount)
>+{
>+    return gl::DrawElementsInstancedANGLEContextANGLE(ctx, mode, count, type, indices, primcount);
>+}
>+
>+void GL_APIENTRY glDrawElementsInstancedEXTContextANGLE(GLeglContext ctx,
>+                                                        GLenum mode,
>+                                                        GLsizei count,
>+                                                        GLenum type,
>+                                                        const void *indices,
>+                                                        GLsizei primcount)
>+{
>+    return gl::DrawElementsInstancedEXTContextANGLE(ctx, mode, count, type, indices, primcount);
>+}
>+
>+void GL_APIENTRY glDrawRangeElementsContextANGLE(GLeglContext ctx,
>+                                                 GLenum mode,
>+                                                 GLuint start,
>+                                                 GLuint end,
>+                                                 GLsizei count,
>+                                                 GLenum type,
>+                                                 const void *indices)
>+{
>+    return gl::DrawRangeElementsContextANGLE(ctx, mode, start, end, count, type, indices);
>+}
>+
>+void GL_APIENTRY glDrawTexfOESContextANGLE(GLeglContext ctx,
>+                                           GLfloat x,
>+                                           GLfloat y,
>+                                           GLfloat z,
>+                                           GLfloat width,
>+                                           GLfloat height)
>+{
>+    return gl::DrawTexfOESContextANGLE(ctx, x, y, z, width, height);
>+}
>+
>+void GL_APIENTRY glDrawTexfvOESContextANGLE(GLeglContext ctx, const GLfloat *coords)
>+{
>+    return gl::DrawTexfvOESContextANGLE(ctx, coords);
>+}
>+
>+void GL_APIENTRY
>+glDrawTexiOESContextANGLE(GLeglContext ctx, GLint x, GLint y, GLint z, GLint width, GLint height)
>+{
>+    return gl::DrawTexiOESContextANGLE(ctx, x, y, z, width, height);
>+}
>+
>+void GL_APIENTRY glDrawTexivOESContextANGLE(GLeglContext ctx, const GLint *coords)
>+{
>+    return gl::DrawTexivOESContextANGLE(ctx, coords);
>+}
>+
>+void GL_APIENTRY glDrawTexsOESContextANGLE(GLeglContext ctx,
>+                                           GLshort x,
>+                                           GLshort y,
>+                                           GLshort z,
>+                                           GLshort width,
>+                                           GLshort height)
>+{
>+    return gl::DrawTexsOESContextANGLE(ctx, x, y, z, width, height);
>+}
>+
>+void GL_APIENTRY glDrawTexsvOESContextANGLE(GLeglContext ctx, const GLshort *coords)
>+{
>+    return gl::DrawTexsvOESContextANGLE(ctx, coords);
>+}
>+
>+void GL_APIENTRY glDrawTexxOESContextANGLE(GLeglContext ctx,
>+                                           GLfixed x,
>+                                           GLfixed y,
>+                                           GLfixed z,
>+                                           GLfixed width,
>+                                           GLfixed height)
>+{
>+    return gl::DrawTexxOESContextANGLE(ctx, x, y, z, width, height);
>+}
>+
>+void GL_APIENTRY glDrawTexxvOESContextANGLE(GLeglContext ctx, const GLfixed *coords)
>+{
>+    return gl::DrawTexxvOESContextANGLE(ctx, coords);
>+}
>+
>+void GL_APIENTRY glEGLImageTargetRenderbufferStorageOESContextANGLE(GLeglContext ctx,
>+                                                                    GLenum target,
>+                                                                    GLeglImageOES image)
>+{
>+    return gl::EGLImageTargetRenderbufferStorageOESContextANGLE(ctx, target, image);
>+}
>+
>+void GL_APIENTRY glEGLImageTargetTexture2DOESContextANGLE(GLeglContext ctx,
>+                                                          GLenum target,
>+                                                          GLeglImageOES image)
>+{
>+    return gl::EGLImageTargetTexture2DOESContextANGLE(ctx, target, image);
>+}
>+
>+void GL_APIENTRY glEnableContextANGLE(GLeglContext ctx, GLenum cap)
>+{
>+    return gl::EnableContextANGLE(ctx, cap);
>+}
>+
>+void GL_APIENTRY glEnableClientStateContextANGLE(GLeglContext ctx, GLenum array)
>+{
>+    return gl::EnableClientStateContextANGLE(ctx, array);
>+}
>+
>+void GL_APIENTRY glEnableVertexAttribArrayContextANGLE(GLeglContext ctx, GLuint index)
>+{
>+    return gl::EnableVertexAttribArrayContextANGLE(ctx, index);
>+}
>+
>+void GL_APIENTRY glEndQueryContextANGLE(GLeglContext ctx, GLenum target)
>+{
>+    return gl::EndQueryContextANGLE(ctx, target);
>+}
>+
>+void GL_APIENTRY glEndQueryEXTContextANGLE(GLeglContext ctx, GLenum target)
>+{
>+    return gl::EndQueryEXTContextANGLE(ctx, target);
>+}
>+
>+void GL_APIENTRY glEndTransformFeedbackContextANGLE(GLeglContext ctx)
>+{
>+    return gl::EndTransformFeedbackContextANGLE(ctx);
>+}
>+
>+GLsync GL_APIENTRY glFenceSyncContextANGLE(GLeglContext ctx, GLenum condition, GLbitfield flags)
>+{
>+    return gl::FenceSyncContextANGLE(ctx, condition, flags);
>+}
>+
>+void GL_APIENTRY glFinishContextANGLE(GLeglContext ctx)
>+{
>+    return gl::FinishContextANGLE(ctx);
>+}
>+
>+void GL_APIENTRY glFinishFenceNVContextANGLE(GLeglContext ctx, GLuint fence)
>+{
>+    return gl::FinishFenceNVContextANGLE(ctx, fence);
>+}
>+
>+void GL_APIENTRY glFlushContextANGLE(GLeglContext ctx)
>+{
>+    return gl::FlushContextANGLE(ctx);
>+}
>+
>+void GL_APIENTRY glFlushMappedBufferRangeContextANGLE(GLeglContext ctx,
>+                                                      GLenum target,
>+                                                      GLintptr offset,
>+                                                      GLsizeiptr length)
>+{
>+    return gl::FlushMappedBufferRangeContextANGLE(ctx, target, offset, length);
>+}
>+
>+void GL_APIENTRY glFlushMappedBufferRangeEXTContextANGLE(GLeglContext ctx,
>+                                                         GLenum target,
>+                                                         GLintptr offset,
>+                                                         GLsizeiptr length)
>+{
>+    return gl::FlushMappedBufferRangeEXTContextANGLE(ctx, target, offset, length);
>+}
>+
>+void GL_APIENTRY glFogfContextANGLE(GLeglContext ctx, GLenum pname, GLfloat param)
>+{
>+    return gl::FogfContextANGLE(ctx, pname, param);
>+}
>+
>+void GL_APIENTRY glFogfvContextANGLE(GLeglContext ctx, GLenum pname, const GLfloat *params)
>+{
>+    return gl::FogfvContextANGLE(ctx, pname, params);
>+}
>+
>+void GL_APIENTRY glFogxContextANGLE(GLeglContext ctx, GLenum pname, GLfixed param)
>+{
>+    return gl::FogxContextANGLE(ctx, pname, param);
>+}
>+
>+void GL_APIENTRY glFogxvContextANGLE(GLeglContext ctx, GLenum pname, const GLfixed *param)
>+{
>+    return gl::FogxvContextANGLE(ctx, pname, param);
>+}
>+
>+void GL_APIENTRY glFramebufferParameteriContextANGLE(GLeglContext ctx,
>+                                                     GLenum target,
>+                                                     GLenum pname,
>+                                                     GLint param)
>+{
>+    return gl::FramebufferParameteriContextANGLE(ctx, target, pname, param);
>+}
>+
>+void GL_APIENTRY glFramebufferRenderbufferContextANGLE(GLeglContext ctx,
>+                                                       GLenum target,
>+                                                       GLenum attachment,
>+                                                       GLenum renderbuffertarget,
>+                                                       GLuint renderbuffer)
>+{
>+    return gl::FramebufferRenderbufferContextANGLE(ctx, target, attachment, renderbuffertarget,
>+                                                   renderbuffer);
>+}
>+
>+void GL_APIENTRY glFramebufferRenderbufferOESContextANGLE(GLeglContext ctx,
>+                                                          GLenum target,
>+                                                          GLenum attachment,
>+                                                          GLenum renderbuffertarget,
>+                                                          GLuint renderbuffer)
>+{
>+    return gl::FramebufferRenderbufferOESContextANGLE(ctx, target, attachment, renderbuffertarget,
>+                                                      renderbuffer);
>+}
>+
>+void GL_APIENTRY glFramebufferTexture2DContextANGLE(GLeglContext ctx,
>+                                                    GLenum target,
>+                                                    GLenum attachment,
>+                                                    GLenum textarget,
>+                                                    GLuint texture,
>+                                                    GLint level)
>+{
>+    return gl::FramebufferTexture2DContextANGLE(ctx, target, attachment, textarget, texture, level);
>+}
>+
>+void GL_APIENTRY glFramebufferTexture2DOESContextANGLE(GLeglContext ctx,
>+                                                       GLenum target,
>+                                                       GLenum attachment,
>+                                                       GLenum textarget,
>+                                                       GLuint texture,
>+                                                       GLint level)
>+{
>+    return gl::FramebufferTexture2DOESContextANGLE(ctx, target, attachment, textarget, texture,
>+                                                   level);
>+}
>+
>+void GL_APIENTRY glFramebufferTextureEXTContextANGLE(GLeglContext ctx,
>+                                                     GLenum target,
>+                                                     GLenum attachment,
>+                                                     GLuint texture,
>+                                                     GLint level)
>+{
>+    return gl::FramebufferTextureEXTContextANGLE(ctx, target, attachment, texture, level);
>+}
>+
>+void GL_APIENTRY glFramebufferTextureLayerContextANGLE(GLeglContext ctx,
>+                                                       GLenum target,
>+                                                       GLenum attachment,
>+                                                       GLuint texture,
>+                                                       GLint level,
>+                                                       GLint layer)
>+{
>+    return gl::FramebufferTextureLayerContextANGLE(ctx, target, attachment, texture, level, layer);
>+}
>+
>+void GL_APIENTRY glFramebufferTextureMultiviewOVRContextANGLE(GLeglContext ctx,
>+                                                              GLenum target,
>+                                                              GLenum attachment,
>+                                                              GLuint texture,
>+                                                              GLint level,
>+                                                              GLint baseViewIndex,
>+                                                              GLsizei numViews)
>+{
>+    return gl::FramebufferTextureMultiviewOVRContextANGLE(ctx, target, attachment, texture, level,
>+                                                          baseViewIndex, numViews);
>+}
>+
>+void GL_APIENTRY glFrontFaceContextANGLE(GLeglContext ctx, GLenum mode)
>+{
>+    return gl::FrontFaceContextANGLE(ctx, mode);
>+}
>+
>+void GL_APIENTRY glFrustumfContextANGLE(GLeglContext ctx,
>+                                        GLfloat l,
>+                                        GLfloat r,
>+                                        GLfloat b,
>+                                        GLfloat t,
>+                                        GLfloat n,
>+                                        GLfloat f)
>+{
>+    return gl::FrustumfContextANGLE(ctx, l, r, b, t, n, f);
>+}
>+
>+void GL_APIENTRY glFrustumxContextANGLE(GLeglContext ctx,
>+                                        GLfixed l,
>+                                        GLfixed r,
>+                                        GLfixed b,
>+                                        GLfixed t,
>+                                        GLfixed n,
>+                                        GLfixed f)
>+{
>+    return gl::FrustumxContextANGLE(ctx, l, r, b, t, n, f);
>+}
>+
>+void GL_APIENTRY glGenBuffersContextANGLE(GLeglContext ctx, GLsizei n, GLuint *buffers)
>+{
>+    return gl::GenBuffersContextANGLE(ctx, n, buffers);
>+}
>+
>+void GL_APIENTRY glGenFencesNVContextANGLE(GLeglContext ctx, GLsizei n, GLuint *fences)
>+{
>+    return gl::GenFencesNVContextANGLE(ctx, n, fences);
>+}
>+
>+void GL_APIENTRY glGenFramebuffersContextANGLE(GLeglContext ctx, GLsizei n, GLuint *framebuffers)
>+{
>+    return gl::GenFramebuffersContextANGLE(ctx, n, framebuffers);
>+}
>+
>+void GL_APIENTRY glGenFramebuffersOESContextANGLE(GLeglContext ctx, GLsizei n, GLuint *framebuffers)
>+{
>+    return gl::GenFramebuffersOESContextANGLE(ctx, n, framebuffers);
>+}
>+
>+void GL_APIENTRY glGenProgramPipelinesContextANGLE(GLeglContext ctx, GLsizei n, GLuint *pipelines)
>+{
>+    return gl::GenProgramPipelinesContextANGLE(ctx, n, pipelines);
>+}
>+
>+void GL_APIENTRY glGenQueriesContextANGLE(GLeglContext ctx, GLsizei n, GLuint *ids)
>+{
>+    return gl::GenQueriesContextANGLE(ctx, n, ids);
>+}
>+
>+void GL_APIENTRY glGenQueriesEXTContextANGLE(GLeglContext ctx, GLsizei n, GLuint *ids)
>+{
>+    return gl::GenQueriesEXTContextANGLE(ctx, n, ids);
>+}
>+
>+void GL_APIENTRY glGenRenderbuffersContextANGLE(GLeglContext ctx, GLsizei n, GLuint *renderbuffers)
>+{
>+    return gl::GenRenderbuffersContextANGLE(ctx, n, renderbuffers);
>+}
>+
>+void GL_APIENTRY glGenRenderbuffersOESContextANGLE(GLeglContext ctx,
>+                                                   GLsizei n,
>+                                                   GLuint *renderbuffers)
>+{
>+    return gl::GenRenderbuffersOESContextANGLE(ctx, n, renderbuffers);
>+}
>+
>+void GL_APIENTRY glGenSamplersContextANGLE(GLeglContext ctx, GLsizei count, GLuint *samplers)
>+{
>+    return gl::GenSamplersContextANGLE(ctx, count, samplers);
>+}
>+
>+void GL_APIENTRY glGenSemaphoresEXTContextANGLE(GLeglContext ctx, GLsizei n, GLuint *semaphores)
>+{
>+    return gl::GenSemaphoresEXTContextANGLE(ctx, n, semaphores);
>+}
>+
>+void GL_APIENTRY glGenTexturesContextANGLE(GLeglContext ctx, GLsizei n, GLuint *textures)
>+{
>+    return gl::GenTexturesContextANGLE(ctx, n, textures);
>+}
>+
>+void GL_APIENTRY glGenTransformFeedbacksContextANGLE(GLeglContext ctx, GLsizei n, GLuint *ids)
>+{
>+    return gl::GenTransformFeedbacksContextANGLE(ctx, n, ids);
>+}
>+
>+void GL_APIENTRY glGenVertexArraysContextANGLE(GLeglContext ctx, GLsizei n, GLuint *arrays)
>+{
>+    return gl::GenVertexArraysContextANGLE(ctx, n, arrays);
>+}
>+
>+void GL_APIENTRY glGenVertexArraysOESContextANGLE(GLeglContext ctx, GLsizei n, GLuint *arrays)
>+{
>+    return gl::GenVertexArraysOESContextANGLE(ctx, n, arrays);
>+}
>+
>+void GL_APIENTRY glGenerateMipmapContextANGLE(GLeglContext ctx, GLenum target)
>+{
>+    return gl::GenerateMipmapContextANGLE(ctx, target);
>+}
>+
>+void GL_APIENTRY glGenerateMipmapOESContextANGLE(GLeglContext ctx, GLenum target)
>+{
>+    return gl::GenerateMipmapOESContextANGLE(ctx, target);
>+}
>+
>+void GL_APIENTRY glGetActiveAttribContextANGLE(GLeglContext ctx,
>+                                               GLuint program,
>+                                               GLuint index,
>+                                               GLsizei bufSize,
>+                                               GLsizei *length,
>+                                               GLint *size,
>+                                               GLenum *type,
>+                                               GLchar *name)
>+{
>+    return gl::GetActiveAttribContextANGLE(ctx, program, index, bufSize, length, size, type, name);
>+}
>+
>+void GL_APIENTRY glGetActiveUniformContextANGLE(GLeglContext ctx,
>+                                                GLuint program,
>+                                                GLuint index,
>+                                                GLsizei bufSize,
>+                                                GLsizei *length,
>+                                                GLint *size,
>+                                                GLenum *type,
>+                                                GLchar *name)
>+{
>+    return gl::GetActiveUniformContextANGLE(ctx, program, index, bufSize, length, size, type, name);
>+}
>+
>+void GL_APIENTRY glGetActiveUniformBlockNameContextANGLE(GLeglContext ctx,
>+                                                         GLuint program,
>+                                                         GLuint uniformBlockIndex,
>+                                                         GLsizei bufSize,
>+                                                         GLsizei *length,
>+                                                         GLchar *uniformBlockName)
>+{
>+    return gl::GetActiveUniformBlockNameContextANGLE(ctx, program, uniformBlockIndex, bufSize,
>+                                                     length, uniformBlockName);
>+}
>+
>+void GL_APIENTRY glGetActiveUniformBlockivContextANGLE(GLeglContext ctx,
>+                                                       GLuint program,
>+                                                       GLuint uniformBlockIndex,
>+                                                       GLenum pname,
>+                                                       GLint *params)
>+{
>+    return gl::GetActiveUniformBlockivContextANGLE(ctx, program, uniformBlockIndex, pname, params);
>+}
>+
>+void GL_APIENTRY glGetActiveUniformsivContextANGLE(GLeglContext ctx,
>+                                                   GLuint program,
>+                                                   GLsizei uniformCount,
>+                                                   const GLuint *uniformIndices,
>+                                                   GLenum pname,
>+                                                   GLint *params)
>+{
>+    return gl::GetActiveUniformsivContextANGLE(ctx, program, uniformCount, uniformIndices, pname,
>+                                               params);
>+}
>+
>+void GL_APIENTRY glGetAttachedShadersContextANGLE(GLeglContext ctx,
>+                                                  GLuint program,
>+                                                  GLsizei maxCount,
>+                                                  GLsizei *count,
>+                                                  GLuint *shaders)
>+{
>+    return gl::GetAttachedShadersContextANGLE(ctx, program, maxCount, count, shaders);
>+}
>+
>+GLint GL_APIENTRY glGetAttribLocationContextANGLE(GLeglContext ctx,
>+                                                  GLuint program,
>+                                                  const GLchar *name)
>+{
>+    return gl::GetAttribLocationContextANGLE(ctx, program, name);
>+}
>+
>+void GL_APIENTRY glGetBooleani_vContextANGLE(GLeglContext ctx,
>+                                             GLenum target,
>+                                             GLuint index,
>+                                             GLboolean *data)
>+{
>+    return gl::GetBooleani_vContextANGLE(ctx, target, index, data);
>+}
>+
>+void GL_APIENTRY glGetBooleanvContextANGLE(GLeglContext ctx, GLenum pname, GLboolean *data)
>+{
>+    return gl::GetBooleanvContextANGLE(ctx, pname, data);
>+}
>+
>+void GL_APIENTRY glGetBufferParameteri64vContextANGLE(GLeglContext ctx,
>+                                                      GLenum target,
>+                                                      GLenum pname,
>+                                                      GLint64 *params)
>+{
>+    return gl::GetBufferParameteri64vContextANGLE(ctx, target, pname, params);
>+}
>+
>+void GL_APIENTRY glGetBufferParameterivContextANGLE(GLeglContext ctx,
>+                                                    GLenum target,
>+                                                    GLenum pname,
>+                                                    GLint *params)
>+{
>+    return gl::GetBufferParameterivContextANGLE(ctx, target, pname, params);
>+}
>+
>+void GL_APIENTRY glGetBufferPointervContextANGLE(GLeglContext ctx,
>+                                                 GLenum target,
>+                                                 GLenum pname,
>+                                                 void **params)
>+{
>+    return gl::GetBufferPointervContextANGLE(ctx, target, pname, params);
>+}
>+
>+void GL_APIENTRY glGetBufferPointervOESContextANGLE(GLeglContext ctx,
>+                                                    GLenum target,
>+                                                    GLenum pname,
>+                                                    void **params)
>+{
>+    return gl::GetBufferPointervOESContextANGLE(ctx, target, pname, params);
>+}
>+
>+void GL_APIENTRY glGetClipPlanefContextANGLE(GLeglContext ctx, GLenum plane, GLfloat *equation)
>+{
>+    return gl::GetClipPlanefContextANGLE(ctx, plane, equation);
>+}
>+
>+void GL_APIENTRY glGetClipPlanexContextANGLE(GLeglContext ctx, GLenum plane, GLfixed *equation)
>+{
>+    return gl::GetClipPlanexContextANGLE(ctx, plane, equation);
>+}
>+
>+GLuint GL_APIENTRY glGetDebugMessageLogKHRContextANGLE(GLeglContext ctx,
>+                                                       GLuint count,
>+                                                       GLsizei bufSize,
>+                                                       GLenum *sources,
>+                                                       GLenum *types,
>+                                                       GLuint *ids,
>+                                                       GLenum *severities,
>+                                                       GLsizei *lengths,
>+                                                       GLchar *messageLog)
>+{
>+    return gl::GetDebugMessageLogKHRContextANGLE(ctx, count, bufSize, sources, types, ids,
>+                                                 severities, lengths, messageLog);
>+}
>+
>+GLenum GL_APIENTRY glGetErrorContextANGLE(GLeglContext ctx)
>+{
>+    return gl::GetErrorContextANGLE(ctx);
>+}
>+
>+void GL_APIENTRY glGetFenceivNVContextANGLE(GLeglContext ctx,
>+                                            GLuint fence,
>+                                            GLenum pname,
>+                                            GLint *params)
>+{
>+    return gl::GetFenceivNVContextANGLE(ctx, fence, pname, params);
>+}
>+
>+void GL_APIENTRY glGetFixedvContextANGLE(GLeglContext ctx, GLenum pname, GLfixed *params)
>+{
>+    return gl::GetFixedvContextANGLE(ctx, pname, params);
>+}
>+
>+void GL_APIENTRY glGetFloatvContextANGLE(GLeglContext ctx, GLenum pname, GLfloat *data)
>+{
>+    return gl::GetFloatvContextANGLE(ctx, pname, data);
>+}
>+
>+GLint GL_APIENTRY glGetFragDataIndexEXTContextANGLE(GLeglContext ctx,
>+                                                    GLuint program,
>+                                                    const GLchar *name)
>+{
>+    return gl::GetFragDataIndexEXTContextANGLE(ctx, program, name);
>+}
>+
>+GLint GL_APIENTRY glGetFragDataLocationContextANGLE(GLeglContext ctx,
>+                                                    GLuint program,
>+                                                    const GLchar *name)
>+{
>+    return gl::GetFragDataLocationContextANGLE(ctx, program, name);
>+}
>+
>+void GL_APIENTRY glGetFramebufferAttachmentParameterivContextANGLE(GLeglContext ctx,
>+                                                                   GLenum target,
>+                                                                   GLenum attachment,
>+                                                                   GLenum pname,
>+                                                                   GLint *params)
>+{
>+    return gl::GetFramebufferAttachmentParameterivContextANGLE(ctx, target, attachment, pname,
>+                                                               params);
>+}
>+
>+void GL_APIENTRY glGetFramebufferAttachmentParameterivOESContextANGLE(GLeglContext ctx,
>+                                                                      GLenum target,
>+                                                                      GLenum attachment,
>+                                                                      GLenum pname,
>+                                                                      GLint *params)
>+{
>+    return gl::GetFramebufferAttachmentParameterivOESContextANGLE(ctx, target, attachment, pname,
>+                                                                  params);
>+}
>+
>+void GL_APIENTRY glGetFramebufferParameterivContextANGLE(GLeglContext ctx,
>+                                                         GLenum target,
>+                                                         GLenum pname,
>+                                                         GLint *params)
>+{
>+    return gl::GetFramebufferParameterivContextANGLE(ctx, target, pname, params);
>+}
>+
>+GLenum GL_APIENTRY glGetGraphicsResetStatusEXTContextANGLE(GLeglContext ctx)
>+{
>+    return gl::GetGraphicsResetStatusEXTContextANGLE(ctx);
>+}
>+
>+void GL_APIENTRY glGetInteger64i_vContextANGLE(GLeglContext ctx,
>+                                               GLenum target,
>+                                               GLuint index,
>+                                               GLint64 *data)
>+{
>+    return gl::GetInteger64i_vContextANGLE(ctx, target, index, data);
>+}
>+
>+void GL_APIENTRY glGetInteger64vContextANGLE(GLeglContext ctx, GLenum pname, GLint64 *data)
>+{
>+    return gl::GetInteger64vContextANGLE(ctx, pname, data);
>+}
>+
>+void GL_APIENTRY glGetIntegeri_vContextANGLE(GLeglContext ctx,
>+                                             GLenum target,
>+                                             GLuint index,
>+                                             GLint *data)
>+{
>+    return gl::GetIntegeri_vContextANGLE(ctx, target, index, data);
>+}
>+
>+void GL_APIENTRY glGetIntegervContextANGLE(GLeglContext ctx, GLenum pname, GLint *data)
>+{
>+    return gl::GetIntegervContextANGLE(ctx, pname, data);
>+}
>+
>+void GL_APIENTRY glGetInternalformativContextANGLE(GLeglContext ctx,
>+                                                   GLenum target,
>+                                                   GLenum internalformat,
>+                                                   GLenum pname,
>+                                                   GLsizei bufSize,
>+                                                   GLint *params)
>+{
>+    return gl::GetInternalformativContextANGLE(ctx, target, internalformat, pname, bufSize, params);
>+}
>+
>+void GL_APIENTRY glGetLightfvContextANGLE(GLeglContext ctx,
>+                                          GLenum light,
>+                                          GLenum pname,
>+                                          GLfloat *params)
>+{
>+    return gl::GetLightfvContextANGLE(ctx, light, pname, params);
>+}
>+
>+void GL_APIENTRY glGetLightxvContextANGLE(GLeglContext ctx,
>+                                          GLenum light,
>+                                          GLenum pname,
>+                                          GLfixed *params)
>+{
>+    return gl::GetLightxvContextANGLE(ctx, light, pname, params);
>+}
>+
>+void GL_APIENTRY glGetMaterialfvContextANGLE(GLeglContext ctx,
>+                                             GLenum face,
>+                                             GLenum pname,
>+                                             GLfloat *params)
>+{
>+    return gl::GetMaterialfvContextANGLE(ctx, face, pname, params);
>+}
>+
>+void GL_APIENTRY glGetMaterialxvContextANGLE(GLeglContext ctx,
>+                                             GLenum face,
>+                                             GLenum pname,
>+                                             GLfixed *params)
>+{
>+    return gl::GetMaterialxvContextANGLE(ctx, face, pname, params);
>+}
>+
>+void GL_APIENTRY glGetMemoryObjectParameterivEXTContextANGLE(GLeglContext ctx,
>+                                                             GLuint memoryObject,
>+                                                             GLenum pname,
>+                                                             GLint *params)
>+{
>+    return gl::GetMemoryObjectParameterivEXTContextANGLE(ctx, memoryObject, pname, params);
>+}
>+
>+void GL_APIENTRY glGetMultisamplefvContextANGLE(GLeglContext ctx,
>+                                                GLenum pname,
>+                                                GLuint index,
>+                                                GLfloat *val)
>+{
>+    return gl::GetMultisamplefvContextANGLE(ctx, pname, index, val);
>+}
>+
>+void GL_APIENTRY glGetObjectLabelKHRContextANGLE(GLeglContext ctx,
>+                                                 GLenum identifier,
>+                                                 GLuint name,
>+                                                 GLsizei bufSize,
>+                                                 GLsizei *length,
>+                                                 GLchar *label)
>+{
>+    return gl::GetObjectLabelKHRContextANGLE(ctx, identifier, name, bufSize, length, label);
>+}
>+
>+void GL_APIENTRY glGetObjectPtrLabelKHRContextANGLE(GLeglContext ctx,
>+                                                    const void *ptr,
>+                                                    GLsizei bufSize,
>+                                                    GLsizei *length,
>+                                                    GLchar *label)
>+{
>+    return gl::GetObjectPtrLabelKHRContextANGLE(ctx, ptr, bufSize, length, label);
>+}
>+
>+void GL_APIENTRY glGetPointervContextANGLE(GLeglContext ctx, GLenum pname, void **params)
>+{
>+    return gl::GetPointervContextANGLE(ctx, pname, params);
>+}
>+
>+void GL_APIENTRY glGetPointervKHRContextANGLE(GLeglContext ctx, GLenum pname, void **params)
>+{
>+    return gl::GetPointervKHRContextANGLE(ctx, pname, params);
>+}
>+
>+void GL_APIENTRY glGetProgramBinaryContextANGLE(GLeglContext ctx,
>+                                                GLuint program,
>+                                                GLsizei bufSize,
>+                                                GLsizei *length,
>+                                                GLenum *binaryFormat,
>+                                                void *binary)
>+{
>+    return gl::GetProgramBinaryContextANGLE(ctx, program, bufSize, length, binaryFormat, binary);
>+}
>+
>+void GL_APIENTRY glGetProgramBinaryOESContextANGLE(GLeglContext ctx,
>+                                                   GLuint program,
>+                                                   GLsizei bufSize,
>+                                                   GLsizei *length,
>+                                                   GLenum *binaryFormat,
>+                                                   void *binary)
>+{
>+    return gl::GetProgramBinaryOESContextANGLE(ctx, program, bufSize, length, binaryFormat, binary);
>+}
>+
>+void GL_APIENTRY glGetProgramInfoLogContextANGLE(GLeglContext ctx,
>+                                                 GLuint program,
>+                                                 GLsizei bufSize,
>+                                                 GLsizei *length,
>+                                                 GLchar *infoLog)
>+{
>+    return gl::GetProgramInfoLogContextANGLE(ctx, program, bufSize, length, infoLog);
>+}
>+
>+void GL_APIENTRY glGetProgramInterfaceivContextANGLE(GLeglContext ctx,
>+                                                     GLuint program,
>+                                                     GLenum programInterface,
>+                                                     GLenum pname,
>+                                                     GLint *params)
>+{
>+    return gl::GetProgramInterfaceivContextANGLE(ctx, program, programInterface, pname, params);
>+}
>+
>+void GL_APIENTRY glGetProgramPipelineInfoLogContextANGLE(GLeglContext ctx,
>+                                                         GLuint pipeline,
>+                                                         GLsizei bufSize,
>+                                                         GLsizei *length,
>+                                                         GLchar *infoLog)
>+{
>+    return gl::GetProgramPipelineInfoLogContextANGLE(ctx, pipeline, bufSize, length, infoLog);
>+}
>+
>+void GL_APIENTRY glGetProgramPipelineivContextANGLE(GLeglContext ctx,
>+                                                    GLuint pipeline,
>+                                                    GLenum pname,
>+                                                    GLint *params)
>+{
>+    return gl::GetProgramPipelineivContextANGLE(ctx, pipeline, pname, params);
>+}
>+
>+GLuint GL_APIENTRY glGetProgramResourceIndexContextANGLE(GLeglContext ctx,
>+                                                         GLuint program,
>+                                                         GLenum programInterface,
>+                                                         const GLchar *name)
>+{
>+    return gl::GetProgramResourceIndexContextANGLE(ctx, program, programInterface, name);
>+}
>+
>+GLint GL_APIENTRY glGetProgramResourceLocationContextANGLE(GLeglContext ctx,
>+                                                           GLuint program,
>+                                                           GLenum programInterface,
>+                                                           const GLchar *name)
>+{
>+    return gl::GetProgramResourceLocationContextANGLE(ctx, program, programInterface, name);
>+}
>+
>+GLint GL_APIENTRY glGetProgramResourceLocationIndexEXTContextANGLE(GLeglContext ctx,
>+                                                                   GLuint program,
>+                                                                   GLenum programInterface,
>+                                                                   const GLchar *name)
>+{
>+    return gl::GetProgramResourceLocationIndexEXTContextANGLE(ctx, program, programInterface, name);
>+}
>+
>+void GL_APIENTRY glGetProgramResourceNameContextANGLE(GLeglContext ctx,
>+                                                      GLuint program,
>+                                                      GLenum programInterface,
>+                                                      GLuint index,
>+                                                      GLsizei bufSize,
>+                                                      GLsizei *length,
>+                                                      GLchar *name)
>+{
>+    return gl::GetProgramResourceNameContextANGLE(ctx, program, programInterface, index, bufSize,
>+                                                  length, name);
>+}
>+
>+void GL_APIENTRY glGetProgramResourceivContextANGLE(GLeglContext ctx,
>+                                                    GLuint program,
>+                                                    GLenum programInterface,
>+                                                    GLuint index,
>+                                                    GLsizei propCount,
>+                                                    const GLenum *props,
>+                                                    GLsizei bufSize,
>+                                                    GLsizei *length,
>+                                                    GLint *params)
>+{
>+    return gl::GetProgramResourceivContextANGLE(ctx, program, programInterface, index, propCount,
>+                                                props, bufSize, length, params);
>+}
>+
>+void GL_APIENTRY glGetProgramivContextANGLE(GLeglContext ctx,
>+                                            GLuint program,
>+                                            GLenum pname,
>+                                            GLint *params)
>+{
>+    return gl::GetProgramivContextANGLE(ctx, program, pname, params);
>+}
>+
>+void GL_APIENTRY glGetQueryObjecti64vEXTContextANGLE(GLeglContext ctx,
>+                                                     GLuint id,
>+                                                     GLenum pname,
>+                                                     GLint64 *params)
>+{
>+    return gl::GetQueryObjecti64vEXTContextANGLE(ctx, id, pname, params);
>+}
>+
>+void GL_APIENTRY glGetQueryObjectivEXTContextANGLE(GLeglContext ctx,
>+                                                   GLuint id,
>+                                                   GLenum pname,
>+                                                   GLint *params)
>+{
>+    return gl::GetQueryObjectivEXTContextANGLE(ctx, id, pname, params);
>+}
>+
>+void GL_APIENTRY glGetQueryObjectui64vEXTContextANGLE(GLeglContext ctx,
>+                                                      GLuint id,
>+                                                      GLenum pname,
>+                                                      GLuint64 *params)
>+{
>+    return gl::GetQueryObjectui64vEXTContextANGLE(ctx, id, pname, params);
>+}
>+
>+void GL_APIENTRY glGetQueryObjectuivContextANGLE(GLeglContext ctx,
>+                                                 GLuint id,
>+                                                 GLenum pname,
>+                                                 GLuint *params)
>+{
>+    return gl::GetQueryObjectuivContextANGLE(ctx, id, pname, params);
>+}
>+
>+void GL_APIENTRY glGetQueryObjectuivEXTContextANGLE(GLeglContext ctx,
>+                                                    GLuint id,
>+                                                    GLenum pname,
>+                                                    GLuint *params)
>+{
>+    return gl::GetQueryObjectuivEXTContextANGLE(ctx, id, pname, params);
>+}
>+
>+void GL_APIENTRY glGetQueryivContextANGLE(GLeglContext ctx,
>+                                          GLenum target,
>+                                          GLenum pname,
>+                                          GLint *params)
>+{
>+    return gl::GetQueryivContextANGLE(ctx, target, pname, params);
>+}
>+
>+void GL_APIENTRY glGetQueryivEXTContextANGLE(GLeglContext ctx,
>+                                             GLenum target,
>+                                             GLenum pname,
>+                                             GLint *params)
>+{
>+    return gl::GetQueryivEXTContextANGLE(ctx, target, pname, params);
>+}
>+
>+void GL_APIENTRY glGetRenderbufferParameterivContextANGLE(GLeglContext ctx,
>+                                                          GLenum target,
>+                                                          GLenum pname,
>+                                                          GLint *params)
>+{
>+    return gl::GetRenderbufferParameterivContextANGLE(ctx, target, pname, params);
>+}
>+
>+void GL_APIENTRY glGetRenderbufferParameterivOESContextANGLE(GLeglContext ctx,
>+                                                             GLenum target,
>+                                                             GLenum pname,
>+                                                             GLint *params)
>+{
>+    return gl::GetRenderbufferParameterivOESContextANGLE(ctx, target, pname, params);
>+}
>+
>+void GL_APIENTRY glGetSamplerParameterIivOESContextANGLE(GLeglContext ctx,
>+                                                         GLuint sampler,
>+                                                         GLenum pname,
>+                                                         GLint *params)
>+{
>+    return gl::GetSamplerParameterIivOESContextANGLE(ctx, sampler, pname, params);
>+}
>+
>+void GL_APIENTRY glGetSamplerParameterIuivOESContextANGLE(GLeglContext ctx,
>+                                                          GLuint sampler,
>+                                                          GLenum pname,
>+                                                          GLuint *params)
>+{
>+    return gl::GetSamplerParameterIuivOESContextANGLE(ctx, sampler, pname, params);
>+}
>+
>+void GL_APIENTRY glGetSamplerParameterfvContextANGLE(GLeglContext ctx,
>+                                                     GLuint sampler,
>+                                                     GLenum pname,
>+                                                     GLfloat *params)
>+{
>+    return gl::GetSamplerParameterfvContextANGLE(ctx, sampler, pname, params);
>+}
>+
>+void GL_APIENTRY glGetSamplerParameterivContextANGLE(GLeglContext ctx,
>+                                                     GLuint sampler,
>+                                                     GLenum pname,
>+                                                     GLint *params)
>+{
>+    return gl::GetSamplerParameterivContextANGLE(ctx, sampler, pname, params);
>+}
>+
>+void GL_APIENTRY glGetSemaphoreParameterui64vEXTContextANGLE(GLeglContext ctx,
>+                                                             GLuint semaphore,
>+                                                             GLenum pname,
>+                                                             GLuint64 *params)
>+{
>+    return gl::GetSemaphoreParameterui64vEXTContextANGLE(ctx, semaphore, pname, params);
>+}
>+
>+void GL_APIENTRY glGetShaderInfoLogContextANGLE(GLeglContext ctx,
>+                                                GLuint shader,
>+                                                GLsizei bufSize,
>+                                                GLsizei *length,
>+                                                GLchar *infoLog)
>+{
>+    return gl::GetShaderInfoLogContextANGLE(ctx, shader, bufSize, length, infoLog);
>+}
>+
>+void GL_APIENTRY glGetShaderPrecisionFormatContextANGLE(GLeglContext ctx,
>+                                                        GLenum shadertype,
>+                                                        GLenum precisiontype,
>+                                                        GLint *range,
>+                                                        GLint *precision)
>+{
>+    return gl::GetShaderPrecisionFormatContextANGLE(ctx, shadertype, precisiontype, range,
>+                                                    precision);
>+}
>+
>+void GL_APIENTRY glGetShaderSourceContextANGLE(GLeglContext ctx,
>+                                               GLuint shader,
>+                                               GLsizei bufSize,
>+                                               GLsizei *length,
>+                                               GLchar *source)
>+{
>+    return gl::GetShaderSourceContextANGLE(ctx, shader, bufSize, length, source);
>+}
>+
>+void GL_APIENTRY glGetShaderivContextANGLE(GLeglContext ctx,
>+                                           GLuint shader,
>+                                           GLenum pname,
>+                                           GLint *params)
>+{
>+    return gl::GetShaderivContextANGLE(ctx, shader, pname, params);
>+}
>+
>+const GLubyte *GL_APIENTRY glGetStringContextANGLE(GLeglContext ctx, GLenum name)
>+{
>+    return gl::GetStringContextANGLE(ctx, name);
>+}
>+
>+const GLubyte *GL_APIENTRY glGetStringiContextANGLE(GLeglContext ctx, GLenum name, GLuint index)
>+{
>+    return gl::GetStringiContextANGLE(ctx, name, index);
>+}
>+
>+void GL_APIENTRY glGetSyncivContextANGLE(GLeglContext ctx,
>+                                         GLsync sync,
>+                                         GLenum pname,
>+                                         GLsizei bufSize,
>+                                         GLsizei *length,
>+                                         GLint *values)
>+{
>+    return gl::GetSyncivContextANGLE(ctx, sync, pname, bufSize, length, values);
>+}
>+
>+void GL_APIENTRY glGetTexEnvfvContextANGLE(GLeglContext ctx,
>+                                           GLenum target,
>+                                           GLenum pname,
>+                                           GLfloat *params)
>+{
>+    return gl::GetTexEnvfvContextANGLE(ctx, target, pname, params);
>+}
>+
>+void GL_APIENTRY glGetTexEnvivContextANGLE(GLeglContext ctx,
>+                                           GLenum target,
>+                                           GLenum pname,
>+                                           GLint *params)
>+{
>+    return gl::GetTexEnvivContextANGLE(ctx, target, pname, params);
>+}
>+
>+void GL_APIENTRY glGetTexEnvxvContextANGLE(GLeglContext ctx,
>+                                           GLenum target,
>+                                           GLenum pname,
>+                                           GLfixed *params)
>+{
>+    return gl::GetTexEnvxvContextANGLE(ctx, target, pname, params);
>+}
>+
>+void GL_APIENTRY glGetTexGenfvOESContextANGLE(GLeglContext ctx,
>+                                              GLenum coord,
>+                                              GLenum pname,
>+                                              GLfloat *params)
>+{
>+    return gl::GetTexGenfvOESContextANGLE(ctx, coord, pname, params);
>+}
>+
>+void GL_APIENTRY glGetTexGenivOESContextANGLE(GLeglContext ctx,
>+                                              GLenum coord,
>+                                              GLenum pname,
>+                                              GLint *params)
>+{
>+    return gl::GetTexGenivOESContextANGLE(ctx, coord, pname, params);
>+}
>+
>+void GL_APIENTRY glGetTexGenxvOESContextANGLE(GLeglContext ctx,
>+                                              GLenum coord,
>+                                              GLenum pname,
>+                                              GLfixed *params)
>+{
>+    return gl::GetTexGenxvOESContextANGLE(ctx, coord, pname, params);
>+}
>+
>+void GL_APIENTRY glGetTexLevelParameterfvContextANGLE(GLeglContext ctx,
>+                                                      GLenum target,
>+                                                      GLint level,
>+                                                      GLenum pname,
>+                                                      GLfloat *params)
>+{
>+    return gl::GetTexLevelParameterfvContextANGLE(ctx, target, level, pname, params);
>+}
>+
>+void GL_APIENTRY glGetTexLevelParameterivContextANGLE(GLeglContext ctx,
>+                                                      GLenum target,
>+                                                      GLint level,
>+                                                      GLenum pname,
>+                                                      GLint *params)
>+{
>+    return gl::GetTexLevelParameterivContextANGLE(ctx, target, level, pname, params);
>+}
>+
>+void GL_APIENTRY glGetTexParameterIivOESContextANGLE(GLeglContext ctx,
>+                                                     GLenum target,
>+                                                     GLenum pname,
>+                                                     GLint *params)
>+{
>+    return gl::GetTexParameterIivOESContextANGLE(ctx, target, pname, params);
>+}
>+
>+void GL_APIENTRY glGetTexParameterIuivOESContextANGLE(GLeglContext ctx,
>+                                                      GLenum target,
>+                                                      GLenum pname,
>+                                                      GLuint *params)
>+{
>+    return gl::GetTexParameterIuivOESContextANGLE(ctx, target, pname, params);
>+}
>+
>+void GL_APIENTRY glGetTexParameterfvContextANGLE(GLeglContext ctx,
>+                                                 GLenum target,
>+                                                 GLenum pname,
>+                                                 GLfloat *params)
>+{
>+    return gl::GetTexParameterfvContextANGLE(ctx, target, pname, params);
>+}
>+
>+void GL_APIENTRY glGetTexParameterivContextANGLE(GLeglContext ctx,
>+                                                 GLenum target,
>+                                                 GLenum pname,
>+                                                 GLint *params)
>+{
>+    return gl::GetTexParameterivContextANGLE(ctx, target, pname, params);
>+}
>+
>+void GL_APIENTRY glGetTexParameterxvContextANGLE(GLeglContext ctx,
>+                                                 GLenum target,
>+                                                 GLenum pname,
>+                                                 GLfixed *params)
>+{
>+    return gl::GetTexParameterxvContextANGLE(ctx, target, pname, params);
>+}
>+
>+void GL_APIENTRY glGetTransformFeedbackVaryingContextANGLE(GLeglContext ctx,
>+                                                           GLuint program,
>+                                                           GLuint index,
>+                                                           GLsizei bufSize,
>+                                                           GLsizei *length,
>+                                                           GLsizei *size,
>+                                                           GLenum *type,
>+                                                           GLchar *name)
>+{
>+    return gl::GetTransformFeedbackVaryingContextANGLE(ctx, program, index, bufSize, length, size,
>+                                                       type, name);
>+}
>+
>+void GL_APIENTRY glGetTranslatedShaderSourceANGLEContextANGLE(GLeglContext ctx,
>+                                                              GLuint shader,
>+                                                              GLsizei bufsize,
>+                                                              GLsizei *length,
>+                                                              GLchar *source)
>+{
>+    return gl::GetTranslatedShaderSourceANGLEContextANGLE(ctx, shader, bufsize, length, source);
>+}
>+
>+GLuint GL_APIENTRY glGetUniformBlockIndexContextANGLE(GLeglContext ctx,
>+                                                      GLuint program,
>+                                                      const GLchar *uniformBlockName)
>+{
>+    return gl::GetUniformBlockIndexContextANGLE(ctx, program, uniformBlockName);
>+}
>+
>+void GL_APIENTRY glGetUniformIndicesContextANGLE(GLeglContext ctx,
>+                                                 GLuint program,
>+                                                 GLsizei uniformCount,
>+                                                 const GLchar *const *uniformNames,
>+                                                 GLuint *uniformIndices)
>+{
>+    return gl::GetUniformIndicesContextANGLE(ctx, program, uniformCount, uniformNames,
>+                                             uniformIndices);
>+}
>+
>+GLint GL_APIENTRY glGetUniformLocationContextANGLE(GLeglContext ctx,
>+                                                   GLuint program,
>+                                                   const GLchar *name)
>+{
>+    return gl::GetUniformLocationContextANGLE(ctx, program, name);
>+}
>+
>+void GL_APIENTRY glGetUniformfvContextANGLE(GLeglContext ctx,
>+                                            GLuint program,
>+                                            GLint location,
>+                                            GLfloat *params)
>+{
>+    return gl::GetUniformfvContextANGLE(ctx, program, location, params);
>+}
>+
>+void GL_APIENTRY glGetUniformivContextANGLE(GLeglContext ctx,
>+                                            GLuint program,
>+                                            GLint location,
>+                                            GLint *params)
>+{
>+    return gl::GetUniformivContextANGLE(ctx, program, location, params);
>+}
>+
>+void GL_APIENTRY glGetUniformuivContextANGLE(GLeglContext ctx,
>+                                             GLuint program,
>+                                             GLint location,
>+                                             GLuint *params)
>+{
>+    return gl::GetUniformuivContextANGLE(ctx, program, location, params);
>+}
>+
>+void GL_APIENTRY glGetUnsignedBytevEXTContextANGLE(GLeglContext ctx, GLenum pname, GLubyte *data)
>+{
>+    return gl::GetUnsignedBytevEXTContextANGLE(ctx, pname, data);
>+}
>+
>+void GL_APIENTRY glGetUnsignedBytei_vEXTContextANGLE(GLeglContext ctx,
>+                                                     GLenum target,
>+                                                     GLuint index,
>+                                                     GLubyte *data)
>+{
>+    return gl::GetUnsignedBytei_vEXTContextANGLE(ctx, target, index, data);
>+}
>+
>+void GL_APIENTRY glGetVertexAttribIivContextANGLE(GLeglContext ctx,
>+                                                  GLuint index,
>+                                                  GLenum pname,
>+                                                  GLint *params)
>+{
>+    return gl::GetVertexAttribIivContextANGLE(ctx, index, pname, params);
>+}
>+
>+void GL_APIENTRY glGetVertexAttribIuivContextANGLE(GLeglContext ctx,
>+                                                   GLuint index,
>+                                                   GLenum pname,
>+                                                   GLuint *params)
>+{
>+    return gl::GetVertexAttribIuivContextANGLE(ctx, index, pname, params);
>+}
>+
>+void GL_APIENTRY glGetVertexAttribPointervContextANGLE(GLeglContext ctx,
>+                                                       GLuint index,
>+                                                       GLenum pname,
>+                                                       void **pointer)
>+{
>+    return gl::GetVertexAttribPointervContextANGLE(ctx, index, pname, pointer);
>+}
>+
>+void GL_APIENTRY glGetVertexAttribfvContextANGLE(GLeglContext ctx,
>+                                                 GLuint index,
>+                                                 GLenum pname,
>+                                                 GLfloat *params)
>+{
>+    return gl::GetVertexAttribfvContextANGLE(ctx, index, pname, params);
>+}
>+
>+void GL_APIENTRY glGetVertexAttribivContextANGLE(GLeglContext ctx,
>+                                                 GLuint index,
>+                                                 GLenum pname,
>+                                                 GLint *params)
>+{
>+    return gl::GetVertexAttribivContextANGLE(ctx, index, pname, params);
>+}
>+
>+void GL_APIENTRY glGetnUniformfvEXTContextANGLE(GLeglContext ctx,
>+                                                GLuint program,
>+                                                GLint location,
>+                                                GLsizei bufSize,
>+                                                GLfloat *params)
>+{
>+    return gl::GetnUniformfvEXTContextANGLE(ctx, program, location, bufSize, params);
>+}
>+
>+void GL_APIENTRY glGetnUniformivEXTContextANGLE(GLeglContext ctx,
>+                                                GLuint program,
>+                                                GLint location,
>+                                                GLsizei bufSize,
>+                                                GLint *params)
>+{
>+    return gl::GetnUniformivEXTContextANGLE(ctx, program, location, bufSize, params);
>+}
>+
>+void GL_APIENTRY glHintContextANGLE(GLeglContext ctx, GLenum target, GLenum mode)
>+{
>+    return gl::HintContextANGLE(ctx, target, mode);
>+}
>+
>+void GL_APIENTRY glImportMemoryFdEXTContextANGLE(GLeglContext ctx,
>+                                                 GLuint memory,
>+                                                 GLuint64 size,
>+                                                 GLenum handleType,
>+                                                 GLint fd)
>+{
>+    return gl::ImportMemoryFdEXTContextANGLE(ctx, memory, size, handleType, fd);
>+}
>+
>+void GL_APIENTRY glImportSemaphoreFdEXTContextANGLE(GLeglContext ctx,
>+                                                    GLuint semaphore,
>+                                                    GLenum handleType,
>+                                                    GLint fd)
>+{
>+    return gl::ImportSemaphoreFdEXTContextANGLE(ctx, semaphore, handleType, fd);
>+}
>+
>+void GL_APIENTRY glInsertEventMarkerEXTContextANGLE(GLeglContext ctx,
>+                                                    GLsizei length,
>+                                                    const GLchar *marker)
>+{
>+    return gl::InsertEventMarkerEXTContextANGLE(ctx, length, marker);
>+}
>+
>+void GL_APIENTRY glInvalidateFramebufferContextANGLE(GLeglContext ctx,
>+                                                     GLenum target,
>+                                                     GLsizei numAttachments,
>+                                                     const GLenum *attachments)
>+{
>+    return gl::InvalidateFramebufferContextANGLE(ctx, target, numAttachments, attachments);
>+}
>+
>+void GL_APIENTRY glInvalidateSubFramebufferContextANGLE(GLeglContext ctx,
>+                                                        GLenum target,
>+                                                        GLsizei numAttachments,
>+                                                        const GLenum *attachments,
>+                                                        GLint x,
>+                                                        GLint y,
>+                                                        GLsizei width,
>+                                                        GLsizei height)
>+{
>+    return gl::InvalidateSubFramebufferContextANGLE(ctx, target, numAttachments, attachments, x, y,
>+                                                    width, height);
>+}
>+
>+GLboolean GL_APIENTRY glIsBufferContextANGLE(GLeglContext ctx, GLuint buffer)
>+{
>+    return gl::IsBufferContextANGLE(ctx, buffer);
>+}
>+
>+GLboolean GL_APIENTRY glIsEnabledContextANGLE(GLeglContext ctx, GLenum cap)
>+{
>+    return gl::IsEnabledContextANGLE(ctx, cap);
>+}
>+
>+GLboolean GL_APIENTRY glIsFenceNVContextANGLE(GLeglContext ctx, GLuint fence)
>+{
>+    return gl::IsFenceNVContextANGLE(ctx, fence);
>+}
>+
>+GLboolean GL_APIENTRY glIsFramebufferContextANGLE(GLeglContext ctx, GLuint framebuffer)
>+{
>+    return gl::IsFramebufferContextANGLE(ctx, framebuffer);
>+}
>+
>+GLboolean GL_APIENTRY glIsFramebufferOESContextANGLE(GLeglContext ctx, GLuint framebuffer)
>+{
>+    return gl::IsFramebufferOESContextANGLE(ctx, framebuffer);
>+}
>+
>+GLboolean GL_APIENTRY glIsMemoryObjectEXTContextANGLE(GLeglContext ctx, GLuint memoryObject)
>+{
>+    return gl::IsMemoryObjectEXTContextANGLE(ctx, memoryObject);
>+}
>+
>+GLboolean GL_APIENTRY glIsProgramContextANGLE(GLeglContext ctx, GLuint program)
>+{
>+    return gl::IsProgramContextANGLE(ctx, program);
>+}
>+
>+GLboolean GL_APIENTRY glIsProgramPipelineContextANGLE(GLeglContext ctx, GLuint pipeline)
>+{
>+    return gl::IsProgramPipelineContextANGLE(ctx, pipeline);
>+}
>+
>+GLboolean GL_APIENTRY glIsQueryContextANGLE(GLeglContext ctx, GLuint id)
>+{
>+    return gl::IsQueryContextANGLE(ctx, id);
>+}
>+
>+GLboolean GL_APIENTRY glIsQueryEXTContextANGLE(GLeglContext ctx, GLuint id)
>+{
>+    return gl::IsQueryEXTContextANGLE(ctx, id);
>+}
>+
>+GLboolean GL_APIENTRY glIsRenderbufferContextANGLE(GLeglContext ctx, GLuint renderbuffer)
>+{
>+    return gl::IsRenderbufferContextANGLE(ctx, renderbuffer);
>+}
>+
>+GLboolean GL_APIENTRY glIsRenderbufferOESContextANGLE(GLeglContext ctx, GLuint renderbuffer)
>+{
>+    return gl::IsRenderbufferOESContextANGLE(ctx, renderbuffer);
>+}
>+
>+GLboolean GL_APIENTRY glIsSemaphoreEXTContextANGLE(GLeglContext ctx, GLuint semaphore)
>+{
>+    return gl::IsSemaphoreEXTContextANGLE(ctx, semaphore);
>+}
>+
>+GLboolean GL_APIENTRY glIsSamplerContextANGLE(GLeglContext ctx, GLuint sampler)
>+{
>+    return gl::IsSamplerContextANGLE(ctx, sampler);
>+}
>+
>+GLboolean GL_APIENTRY glIsShaderContextANGLE(GLeglContext ctx, GLuint shader)
>+{
>+    return gl::IsShaderContextANGLE(ctx, shader);
>+}
>+
>+GLboolean GL_APIENTRY glIsSyncContextANGLE(GLeglContext ctx, GLsync sync)
>+{
>+    return gl::IsSyncContextANGLE(ctx, sync);
>+}
>+
>+GLboolean GL_APIENTRY glIsTextureContextANGLE(GLeglContext ctx, GLuint texture)
>+{
>+    return gl::IsTextureContextANGLE(ctx, texture);
>+}
>+
>+GLboolean GL_APIENTRY glIsTransformFeedbackContextANGLE(GLeglContext ctx, GLuint id)
>+{
>+    return gl::IsTransformFeedbackContextANGLE(ctx, id);
>+}
>+
>+GLboolean GL_APIENTRY glIsVertexArrayContextANGLE(GLeglContext ctx, GLuint array)
>+{
>+    return gl::IsVertexArrayContextANGLE(ctx, array);
>+}
>+
>+GLboolean GL_APIENTRY glIsVertexArrayOESContextANGLE(GLeglContext ctx, GLuint array)
>+{
>+    return gl::IsVertexArrayOESContextANGLE(ctx, array);
>+}
>+
>+void GL_APIENTRY glLightModelfContextANGLE(GLeglContext ctx, GLenum pname, GLfloat param)
>+{
>+    return gl::LightModelfContextANGLE(ctx, pname, param);
>+}
>+
>+void GL_APIENTRY glLightModelfvContextANGLE(GLeglContext ctx, GLenum pname, const GLfloat *params)
>+{
>+    return gl::LightModelfvContextANGLE(ctx, pname, params);
>+}
>+
>+void GL_APIENTRY glLightModelxContextANGLE(GLeglContext ctx, GLenum pname, GLfixed param)
>+{
>+    return gl::LightModelxContextANGLE(ctx, pname, param);
>+}
>+
>+void GL_APIENTRY glLightModelxvContextANGLE(GLeglContext ctx, GLenum pname, const GLfixed *param)
>+{
>+    return gl::LightModelxvContextANGLE(ctx, pname, param);
>+}
>+
>+void GL_APIENTRY glLightfContextANGLE(GLeglContext ctx, GLenum light, GLenum pname, GLfloat param)
>+{
>+    return gl::LightfContextANGLE(ctx, light, pname, param);
>+}
>+
>+void GL_APIENTRY glLightfvContextANGLE(GLeglContext ctx,
>+                                       GLenum light,
>+                                       GLenum pname,
>+                                       const GLfloat *params)
>+{
>+    return gl::LightfvContextANGLE(ctx, light, pname, params);
>+}
>+
>+void GL_APIENTRY glLightxContextANGLE(GLeglContext ctx, GLenum light, GLenum pname, GLfixed param)
>+{
>+    return gl::LightxContextANGLE(ctx, light, pname, param);
>+}
>+
>+void GL_APIENTRY glLightxvContextANGLE(GLeglContext ctx,
>+                                       GLenum light,
>+                                       GLenum pname,
>+                                       const GLfixed *params)
>+{
>+    return gl::LightxvContextANGLE(ctx, light, pname, params);
>+}
>+
>+void GL_APIENTRY glLineWidthContextANGLE(GLeglContext ctx, GLfloat width)
>+{
>+    return gl::LineWidthContextANGLE(ctx, width);
>+}
>+
>+void GL_APIENTRY glLineWidthxContextANGLE(GLeglContext ctx, GLfixed width)
>+{
>+    return gl::LineWidthxContextANGLE(ctx, width);
>+}
>+
>+void GL_APIENTRY glLinkProgramContextANGLE(GLeglContext ctx, GLuint program)
>+{
>+    return gl::LinkProgramContextANGLE(ctx, program);
>+}
>+
>+void GL_APIENTRY glLoadIdentityContextANGLE(GLeglContext ctx)
>+{
>+    return gl::LoadIdentityContextANGLE(ctx);
>+}
>+
>+void GL_APIENTRY glLoadMatrixfContextANGLE(GLeglContext ctx, const GLfloat *m)
>+{
>+    return gl::LoadMatrixfContextANGLE(ctx, m);
>+}
>+
>+void GL_APIENTRY glLoadMatrixxContextANGLE(GLeglContext ctx, const GLfixed *m)
>+{
>+    return gl::LoadMatrixxContextANGLE(ctx, m);
>+}
>+
>+void GL_APIENTRY glLoadPaletteFromModelViewMatrixOESContextANGLE(GLeglContext ctx)
>+{
>+    return gl::LoadPaletteFromModelViewMatrixOESContextANGLE(ctx);
>+}
>+
>+void GL_APIENTRY glLogicOpContextANGLE(GLeglContext ctx, GLenum opcode)
>+{
>+    return gl::LogicOpContextANGLE(ctx, opcode);
>+}
>+
>+void *GL_APIENTRY glMapBufferOESContextANGLE(GLeglContext ctx, GLenum target, GLenum access)
>+{
>+    return gl::MapBufferOESContextANGLE(ctx, target, access);
>+}
>+
>+void *GL_APIENTRY glMapBufferRangeContextANGLE(GLeglContext ctx,
>+                                               GLenum target,
>+                                               GLintptr offset,
>+                                               GLsizeiptr length,
>+                                               GLbitfield access)
>+{
>+    return gl::MapBufferRangeContextANGLE(ctx, target, offset, length, access);
>+}
>+
>+void *GL_APIENTRY glMapBufferRangeEXTContextANGLE(GLeglContext ctx,
>+                                                  GLenum target,
>+                                                  GLintptr offset,
>+                                                  GLsizeiptr length,
>+                                                  GLbitfield access)
>+{
>+    return gl::MapBufferRangeEXTContextANGLE(ctx, target, offset, length, access);
>+}
>+
>+void GL_APIENTRY glMaterialfContextANGLE(GLeglContext ctx, GLenum face, GLenum pname, GLfloat param)
>+{
>+    return gl::MaterialfContextANGLE(ctx, face, pname, param);
>+}
>+
>+void GL_APIENTRY glMaterialfvContextANGLE(GLeglContext ctx,
>+                                          GLenum face,
>+                                          GLenum pname,
>+                                          const GLfloat *params)
>+{
>+    return gl::MaterialfvContextANGLE(ctx, face, pname, params);
>+}
>+
>+void GL_APIENTRY glMaterialxContextANGLE(GLeglContext ctx, GLenum face, GLenum pname, GLfixed param)
>+{
>+    return gl::MaterialxContextANGLE(ctx, face, pname, param);
>+}
>+
>+void GL_APIENTRY glMaterialxvContextANGLE(GLeglContext ctx,
>+                                          GLenum face,
>+                                          GLenum pname,
>+                                          const GLfixed *param)
>+{
>+    return gl::MaterialxvContextANGLE(ctx, face, pname, param);
>+}
>+
>+void GL_APIENTRY glMatrixIndexPointerOESContextANGLE(GLeglContext ctx,
>+                                                     GLint size,
>+                                                     GLenum type,
>+                                                     GLsizei stride,
>+                                                     const void *pointer)
>+{
>+    return gl::MatrixIndexPointerOESContextANGLE(ctx, size, type, stride, pointer);
>+}
>+
>+void GL_APIENTRY glMatrixModeContextANGLE(GLeglContext ctx, GLenum mode)
>+{
>+    return gl::MatrixModeContextANGLE(ctx, mode);
>+}
>+
>+void GL_APIENTRY glMaxShaderCompilerThreadsKHRContextANGLE(GLeglContext ctx, GLuint count)
>+{
>+    return gl::MaxShaderCompilerThreadsKHRContextANGLE(ctx, count);
>+}
>+
>+void GL_APIENTRY glMemoryBarrierContextANGLE(GLeglContext ctx, GLbitfield barriers)
>+{
>+    return gl::MemoryBarrierContextANGLE(ctx, barriers);
>+}
>+
>+void GL_APIENTRY glMemoryBarrierByRegionContextANGLE(GLeglContext ctx, GLbitfield barriers)
>+{
>+    return gl::MemoryBarrierByRegionContextANGLE(ctx, barriers);
>+}
>+
>+void GL_APIENTRY glMemoryObjectParameterivEXTContextANGLE(GLeglContext ctx,
>+                                                          GLuint memoryObject,
>+                                                          GLenum pname,
>+                                                          const GLint *params)
>+{
>+    return gl::MemoryObjectParameterivEXTContextANGLE(ctx, memoryObject, pname, params);
>+}
>+
>+void GL_APIENTRY glMultMatrixfContextANGLE(GLeglContext ctx, const GLfloat *m)
>+{
>+    return gl::MultMatrixfContextANGLE(ctx, m);
>+}
>+
>+void GL_APIENTRY glMultMatrixxContextANGLE(GLeglContext ctx, const GLfixed *m)
>+{
>+    return gl::MultMatrixxContextANGLE(ctx, m);
>+}
>+
>+void GL_APIENTRY glMultiTexCoord4fContextANGLE(GLeglContext ctx,
>+                                               GLenum target,
>+                                               GLfloat s,
>+                                               GLfloat t,
>+                                               GLfloat r,
>+                                               GLfloat q)
>+{
>+    return gl::MultiTexCoord4fContextANGLE(ctx, target, s, t, r, q);
>+}
>+
>+void GL_APIENTRY glMultiTexCoord4xContextANGLE(GLeglContext ctx,
>+                                               GLenum texture,
>+                                               GLfixed s,
>+                                               GLfixed t,
>+                                               GLfixed r,
>+                                               GLfixed q)
>+{
>+    return gl::MultiTexCoord4xContextANGLE(ctx, texture, s, t, r, q);
>+}
>+
>+void GL_APIENTRY glNormal3fContextANGLE(GLeglContext ctx, GLfloat nx, GLfloat ny, GLfloat nz)
>+{
>+    return gl::Normal3fContextANGLE(ctx, nx, ny, nz);
>+}
>+
>+void GL_APIENTRY glNormal3xContextANGLE(GLeglContext ctx, GLfixed nx, GLfixed ny, GLfixed nz)
>+{
>+    return gl::Normal3xContextANGLE(ctx, nx, ny, nz);
>+}
>+
>+void GL_APIENTRY glNormalPointerContextANGLE(GLeglContext ctx,
>+                                             GLenum type,
>+                                             GLsizei stride,
>+                                             const void *pointer)
>+{
>+    return gl::NormalPointerContextANGLE(ctx, type, stride, pointer);
>+}
>+
>+void GL_APIENTRY glObjectLabelKHRContextANGLE(GLeglContext ctx,
>+                                              GLenum identifier,
>+                                              GLuint name,
>+                                              GLsizei length,
>+                                              const GLchar *label)
>+{
>+    return gl::ObjectLabelKHRContextANGLE(ctx, identifier, name, length, label);
>+}
>+
>+void GL_APIENTRY glObjectPtrLabelKHRContextANGLE(GLeglContext ctx,
>+                                                 const void *ptr,
>+                                                 GLsizei length,
>+                                                 const GLchar *label)
>+{
>+    return gl::ObjectPtrLabelKHRContextANGLE(ctx, ptr, length, label);
>+}
>+
>+void GL_APIENTRY glOrthofContextANGLE(GLeglContext ctx,
>+                                      GLfloat l,
>+                                      GLfloat r,
>+                                      GLfloat b,
>+                                      GLfloat t,
>+                                      GLfloat n,
>+                                      GLfloat f)
>+{
>+    return gl::OrthofContextANGLE(ctx, l, r, b, t, n, f);
>+}
>+
>+void GL_APIENTRY glOrthoxContextANGLE(GLeglContext ctx,
>+                                      GLfixed l,
>+                                      GLfixed r,
>+                                      GLfixed b,
>+                                      GLfixed t,
>+                                      GLfixed n,
>+                                      GLfixed f)
>+{
>+    return gl::OrthoxContextANGLE(ctx, l, r, b, t, n, f);
>+}
>+
>+void GL_APIENTRY glPauseTransformFeedbackContextANGLE(GLeglContext ctx)
>+{
>+    return gl::PauseTransformFeedbackContextANGLE(ctx);
>+}
>+
>+void GL_APIENTRY glPixelStoreiContextANGLE(GLeglContext ctx, GLenum pname, GLint param)
>+{
>+    return gl::PixelStoreiContextANGLE(ctx, pname, param);
>+}
>+
>+void GL_APIENTRY glPointParameterfContextANGLE(GLeglContext ctx, GLenum pname, GLfloat param)
>+{
>+    return gl::PointParameterfContextANGLE(ctx, pname, param);
>+}
>+
>+void GL_APIENTRY glPointParameterfvContextANGLE(GLeglContext ctx,
>+                                                GLenum pname,
>+                                                const GLfloat *params)
>+{
>+    return gl::PointParameterfvContextANGLE(ctx, pname, params);
>+}
>+
>+void GL_APIENTRY glPointParameterxContextANGLE(GLeglContext ctx, GLenum pname, GLfixed param)
>+{
>+    return gl::PointParameterxContextANGLE(ctx, pname, param);
>+}
>+
>+void GL_APIENTRY glPointParameterxvContextANGLE(GLeglContext ctx,
>+                                                GLenum pname,
>+                                                const GLfixed *params)
>+{
>+    return gl::PointParameterxvContextANGLE(ctx, pname, params);
>+}
>+
>+void GL_APIENTRY glPointSizeContextANGLE(GLeglContext ctx, GLfloat size)
>+{
>+    return gl::PointSizeContextANGLE(ctx, size);
>+}
>+
>+void GL_APIENTRY glPointSizePointerOESContextANGLE(GLeglContext ctx,
>+                                                   GLenum type,
>+                                                   GLsizei stride,
>+                                                   const void *pointer)
>+{
>+    return gl::PointSizePointerOESContextANGLE(ctx, type, stride, pointer);
>+}
>+
>+void GL_APIENTRY glPointSizexContextANGLE(GLeglContext ctx, GLfixed size)
>+{
>+    return gl::PointSizexContextANGLE(ctx, size);
>+}
>+
>+void GL_APIENTRY glPolygonOffsetContextANGLE(GLeglContext ctx, GLfloat factor, GLfloat units)
>+{
>+    return gl::PolygonOffsetContextANGLE(ctx, factor, units);
>+}
>+
>+void GL_APIENTRY glPolygonOffsetxContextANGLE(GLeglContext ctx, GLfixed factor, GLfixed units)
>+{
>+    return gl::PolygonOffsetxContextANGLE(ctx, factor, units);
>+}
>+
>+void GL_APIENTRY glPopDebugGroupKHRContextANGLE(GLeglContext ctx)
>+{
>+    return gl::PopDebugGroupKHRContextANGLE(ctx);
>+}
>+
>+void GL_APIENTRY glPopGroupMarkerEXTContextANGLE(GLeglContext ctx)
>+{
>+    return gl::PopGroupMarkerEXTContextANGLE(ctx);
>+}
>+
>+void GL_APIENTRY glPopMatrixContextANGLE(GLeglContext ctx)
>+{
>+    return gl::PopMatrixContextANGLE(ctx);
>+}
>+
>+void GL_APIENTRY glProgramBinaryContextANGLE(GLeglContext ctx,
>+                                             GLuint program,
>+                                             GLenum binaryFormat,
>+                                             const void *binary,
>+                                             GLsizei length)
>+{
>+    return gl::ProgramBinaryContextANGLE(ctx, program, binaryFormat, binary, length);
>+}
>+
>+void GL_APIENTRY glProgramBinaryOESContextANGLE(GLeglContext ctx,
>+                                                GLuint program,
>+                                                GLenum binaryFormat,
>+                                                const void *binary,
>+                                                GLint length)
>+{
>+    return gl::ProgramBinaryOESContextANGLE(ctx, program, binaryFormat, binary, length);
>+}
>+
>+void GL_APIENTRY glProgramParameteriContextANGLE(GLeglContext ctx,
>+                                                 GLuint program,
>+                                                 GLenum pname,
>+                                                 GLint value)
>+{
>+    return gl::ProgramParameteriContextANGLE(ctx, program, pname, value);
>+}
>+
>+void GL_APIENTRY glProgramUniform1fContextANGLE(GLeglContext ctx,
>+                                                GLuint program,
>+                                                GLint location,
>+                                                GLfloat v0)
>+{
>+    return gl::ProgramUniform1fContextANGLE(ctx, program, location, v0);
>+}
>+
>+void GL_APIENTRY glProgramUniform1fvContextANGLE(GLeglContext ctx,
>+                                                 GLuint program,
>+                                                 GLint location,
>+                                                 GLsizei count,
>+                                                 const GLfloat *value)
>+{
>+    return gl::ProgramUniform1fvContextANGLE(ctx, program, location, count, value);
>+}
>+
>+void GL_APIENTRY glProgramUniform1iContextANGLE(GLeglContext ctx,
>+                                                GLuint program,
>+                                                GLint location,
>+                                                GLint v0)
>+{
>+    return gl::ProgramUniform1iContextANGLE(ctx, program, location, v0);
>+}
>+
>+void GL_APIENTRY glProgramUniform1ivContextANGLE(GLeglContext ctx,
>+                                                 GLuint program,
>+                                                 GLint location,
>+                                                 GLsizei count,
>+                                                 const GLint *value)
>+{
>+    return gl::ProgramUniform1ivContextANGLE(ctx, program, location, count, value);
>+}
>+
>+void GL_APIENTRY glProgramUniform1uiContextANGLE(GLeglContext ctx,
>+                                                 GLuint program,
>+                                                 GLint location,
>+                                                 GLuint v0)
>+{
>+    return gl::ProgramUniform1uiContextANGLE(ctx, program, location, v0);
>+}
>+
>+void GL_APIENTRY glProgramUniform1uivContextANGLE(GLeglContext ctx,
>+                                                  GLuint program,
>+                                                  GLint location,
>+                                                  GLsizei count,
>+                                                  const GLuint *value)
>+{
>+    return gl::ProgramUniform1uivContextANGLE(ctx, program, location, count, value);
>+}
>+
>+void GL_APIENTRY glProgramUniform2fContextANGLE(GLeglContext ctx,
>+                                                GLuint program,
>+                                                GLint location,
>+                                                GLfloat v0,
>+                                                GLfloat v1)
>+{
>+    return gl::ProgramUniform2fContextANGLE(ctx, program, location, v0, v1);
>+}
>+
>+void GL_APIENTRY glProgramUniform2fvContextANGLE(GLeglContext ctx,
>+                                                 GLuint program,
>+                                                 GLint location,
>+                                                 GLsizei count,
>+                                                 const GLfloat *value)
>+{
>+    return gl::ProgramUniform2fvContextANGLE(ctx, program, location, count, value);
>+}
>+
>+void GL_APIENTRY
>+glProgramUniform2iContextANGLE(GLeglContext ctx, GLuint program, GLint location, GLint v0, GLint v1)
>+{
>+    return gl::ProgramUniform2iContextANGLE(ctx, program, location, v0, v1);
>+}
>+
>+void GL_APIENTRY glProgramUniform2ivContextANGLE(GLeglContext ctx,
>+                                                 GLuint program,
>+                                                 GLint location,
>+                                                 GLsizei count,
>+                                                 const GLint *value)
>+{
>+    return gl::ProgramUniform2ivContextANGLE(ctx, program, location, count, value);
>+}
>+
>+void GL_APIENTRY glProgramUniform2uiContextANGLE(GLeglContext ctx,
>+                                                 GLuint program,
>+                                                 GLint location,
>+                                                 GLuint v0,
>+                                                 GLuint v1)
>+{
>+    return gl::ProgramUniform2uiContextANGLE(ctx, program, location, v0, v1);
>+}
>+
>+void GL_APIENTRY glProgramUniform2uivContextANGLE(GLeglContext ctx,
>+                                                  GLuint program,
>+                                                  GLint location,
>+                                                  GLsizei count,
>+                                                  const GLuint *value)
>+{
>+    return gl::ProgramUniform2uivContextANGLE(ctx, program, location, count, value);
>+}
>+
>+void GL_APIENTRY glProgramUniform3fContextANGLE(GLeglContext ctx,
>+                                                GLuint program,
>+                                                GLint location,
>+                                                GLfloat v0,
>+                                                GLfloat v1,
>+                                                GLfloat v2)
>+{
>+    return gl::ProgramUniform3fContextANGLE(ctx, program, location, v0, v1, v2);
>+}
>+
>+void GL_APIENTRY glProgramUniform3fvContextANGLE(GLeglContext ctx,
>+                                                 GLuint program,
>+                                                 GLint location,
>+                                                 GLsizei count,
>+                                                 const GLfloat *value)
>+{
>+    return gl::ProgramUniform3fvContextANGLE(ctx, program, location, count, value);
>+}
>+
>+void GL_APIENTRY glProgramUniform3iContextANGLE(GLeglContext ctx,
>+                                                GLuint program,
>+                                                GLint location,
>+                                                GLint v0,
>+                                                GLint v1,
>+                                                GLint v2)
>+{
>+    return gl::ProgramUniform3iContextANGLE(ctx, program, location, v0, v1, v2);
>+}
>+
>+void GL_APIENTRY glProgramUniform3ivContextANGLE(GLeglContext ctx,
>+                                                 GLuint program,
>+                                                 GLint location,
>+                                                 GLsizei count,
>+                                                 const GLint *value)
>+{
>+    return gl::ProgramUniform3ivContextANGLE(ctx, program, location, count, value);
>+}
>+
>+void GL_APIENTRY glProgramUniform3uiContextANGLE(GLeglContext ctx,
>+                                                 GLuint program,
>+                                                 GLint location,
>+                                                 GLuint v0,
>+                                                 GLuint v1,
>+                                                 GLuint v2)
>+{
>+    return gl::ProgramUniform3uiContextANGLE(ctx, program, location, v0, v1, v2);
>+}
>+
>+void GL_APIENTRY glProgramUniform3uivContextANGLE(GLeglContext ctx,
>+                                                  GLuint program,
>+                                                  GLint location,
>+                                                  GLsizei count,
>+                                                  const GLuint *value)
>+{
>+    return gl::ProgramUniform3uivContextANGLE(ctx, program, location, count, value);
>+}
>+
>+void GL_APIENTRY glProgramUniform4fContextANGLE(GLeglContext ctx,
>+                                                GLuint program,
>+                                                GLint location,
>+                                                GLfloat v0,
>+                                                GLfloat v1,
>+                                                GLfloat v2,
>+                                                GLfloat v3)
>+{
>+    return gl::ProgramUniform4fContextANGLE(ctx, program, location, v0, v1, v2, v3);
>+}
>+
>+void GL_APIENTRY glProgramUniform4fvContextANGLE(GLeglContext ctx,
>+                                                 GLuint program,
>+                                                 GLint location,
>+                                                 GLsizei count,
>+                                                 const GLfloat *value)
>+{
>+    return gl::ProgramUniform4fvContextANGLE(ctx, program, location, count, value);
>+}
>+
>+void GL_APIENTRY glProgramUniform4iContextANGLE(GLeglContext ctx,
>+                                                GLuint program,
>+                                                GLint location,
>+                                                GLint v0,
>+                                                GLint v1,
>+                                                GLint v2,
>+                                                GLint v3)
>+{
>+    return gl::ProgramUniform4iContextANGLE(ctx, program, location, v0, v1, v2, v3);
>+}
>+
>+void GL_APIENTRY glProgramUniform4ivContextANGLE(GLeglContext ctx,
>+                                                 GLuint program,
>+                                                 GLint location,
>+                                                 GLsizei count,
>+                                                 const GLint *value)
>+{
>+    return gl::ProgramUniform4ivContextANGLE(ctx, program, location, count, value);
>+}
>+
>+void GL_APIENTRY glProgramUniform4uiContextANGLE(GLeglContext ctx,
>+                                                 GLuint program,
>+                                                 GLint location,
>+                                                 GLuint v0,
>+                                                 GLuint v1,
>+                                                 GLuint v2,
>+                                                 GLuint v3)
>+{
>+    return gl::ProgramUniform4uiContextANGLE(ctx, program, location, v0, v1, v2, v3);
>+}
>+
>+void GL_APIENTRY glProgramUniform4uivContextANGLE(GLeglContext ctx,
>+                                                  GLuint program,
>+                                                  GLint location,
>+                                                  GLsizei count,
>+                                                  const GLuint *value)
>+{
>+    return gl::ProgramUniform4uivContextANGLE(ctx, program, location, count, value);
>+}
>+
>+void GL_APIENTRY glProgramUniformMatrix2fvContextANGLE(GLeglContext ctx,
>+                                                       GLuint program,
>+                                                       GLint location,
>+                                                       GLsizei count,
>+                                                       GLboolean transpose,
>+                                                       const GLfloat *value)
>+{
>+    return gl::ProgramUniformMatrix2fvContextANGLE(ctx, program, location, count, transpose, value);
>+}
>+
>+void GL_APIENTRY glProgramUniformMatrix2x3fvContextANGLE(GLeglContext ctx,
>+                                                         GLuint program,
>+                                                         GLint location,
>+                                                         GLsizei count,
>+                                                         GLboolean transpose,
>+                                                         const GLfloat *value)
>+{
>+    return gl::ProgramUniformMatrix2x3fvContextANGLE(ctx, program, location, count, transpose,
>+                                                     value);
>+}
>+
>+void GL_APIENTRY glProgramUniformMatrix2x4fvContextANGLE(GLeglContext ctx,
>+                                                         GLuint program,
>+                                                         GLint location,
>+                                                         GLsizei count,
>+                                                         GLboolean transpose,
>+                                                         const GLfloat *value)
>+{
>+    return gl::ProgramUniformMatrix2x4fvContextANGLE(ctx, program, location, count, transpose,
>+                                                     value);
>+}
>+
>+void GL_APIENTRY glProgramUniformMatrix3fvContextANGLE(GLeglContext ctx,
>+                                                       GLuint program,
>+                                                       GLint location,
>+                                                       GLsizei count,
>+                                                       GLboolean transpose,
>+                                                       const GLfloat *value)
>+{
>+    return gl::ProgramUniformMatrix3fvContextANGLE(ctx, program, location, count, transpose, value);
>+}
>+
>+void GL_APIENTRY glProgramUniformMatrix3x2fvContextANGLE(GLeglContext ctx,
>+                                                         GLuint program,
>+                                                         GLint location,
>+                                                         GLsizei count,
>+                                                         GLboolean transpose,
>+                                                         const GLfloat *value)
>+{
>+    return gl::ProgramUniformMatrix3x2fvContextANGLE(ctx, program, location, count, transpose,
>+                                                     value);
>+}
>+
>+void GL_APIENTRY glProgramUniformMatrix3x4fvContextANGLE(GLeglContext ctx,
>+                                                         GLuint program,
>+                                                         GLint location,
>+                                                         GLsizei count,
>+                                                         GLboolean transpose,
>+                                                         const GLfloat *value)
>+{
>+    return gl::ProgramUniformMatrix3x4fvContextANGLE(ctx, program, location, count, transpose,
>+                                                     value);
>+}
>+
>+void GL_APIENTRY glProgramUniformMatrix4fvContextANGLE(GLeglContext ctx,
>+                                                       GLuint program,
>+                                                       GLint location,
>+                                                       GLsizei count,
>+                                                       GLboolean transpose,
>+                                                       const GLfloat *value)
>+{
>+    return gl::ProgramUniformMatrix4fvContextANGLE(ctx, program, location, count, transpose, value);
>+}
>+
>+void GL_APIENTRY glProgramUniformMatrix4x2fvContextANGLE(GLeglContext ctx,
>+                                                         GLuint program,
>+                                                         GLint location,
>+                                                         GLsizei count,
>+                                                         GLboolean transpose,
>+                                                         const GLfloat *value)
>+{
>+    return gl::ProgramUniformMatrix4x2fvContextANGLE(ctx, program, location, count, transpose,
>+                                                     value);
>+}
>+
>+void GL_APIENTRY glProgramUniformMatrix4x3fvContextANGLE(GLeglContext ctx,
>+                                                         GLuint program,
>+                                                         GLint location,
>+                                                         GLsizei count,
>+                                                         GLboolean transpose,
>+                                                         const GLfloat *value)
>+{
>+    return gl::ProgramUniformMatrix4x3fvContextANGLE(ctx, program, location, count, transpose,
>+                                                     value);
>+}
>+
>+void GL_APIENTRY glPushDebugGroupKHRContextANGLE(GLeglContext ctx,
>+                                                 GLenum source,
>+                                                 GLuint id,
>+                                                 GLsizei length,
>+                                                 const GLchar *message)
>+{
>+    return gl::PushDebugGroupKHRContextANGLE(ctx, source, id, length, message);
>+}
>+
>+void GL_APIENTRY glPushGroupMarkerEXTContextANGLE(GLeglContext ctx,
>+                                                  GLsizei length,
>+                                                  const GLchar *marker)
>+{
>+    return gl::PushGroupMarkerEXTContextANGLE(ctx, length, marker);
>+}
>+
>+void GL_APIENTRY glPushMatrixContextANGLE(GLeglContext ctx)
>+{
>+    return gl::PushMatrixContextANGLE(ctx);
>+}
>+
>+void GL_APIENTRY glQueryCounterEXTContextANGLE(GLeglContext ctx, GLuint id, GLenum target)
>+{
>+    return gl::QueryCounterEXTContextANGLE(ctx, id, target);
>+}
>+
>+GLbitfield GL_APIENTRY glQueryMatrixxOESContextANGLE(GLeglContext ctx,
>+                                                     GLfixed *mantissa,
>+                                                     GLint *exponent)
>+{
>+    return gl::QueryMatrixxOESContextANGLE(ctx, mantissa, exponent);
>+}
>+
>+void GL_APIENTRY glReadBufferContextANGLE(GLeglContext ctx, GLenum src)
>+{
>+    return gl::ReadBufferContextANGLE(ctx, src);
>+}
>+
>+void GL_APIENTRY glReadPixelsContextANGLE(GLeglContext ctx,
>+                                          GLint x,
>+                                          GLint y,
>+                                          GLsizei width,
>+                                          GLsizei height,
>+                                          GLenum format,
>+                                          GLenum type,
>+                                          void *pixels)
>+{
>+    return gl::ReadPixelsContextANGLE(ctx, x, y, width, height, format, type, pixels);
>+}
>+
>+void GL_APIENTRY glReadnPixelsEXTContextANGLE(GLeglContext ctx,
>+                                              GLint x,
>+                                              GLint y,
>+                                              GLsizei width,
>+                                              GLsizei height,
>+                                              GLenum format,
>+                                              GLenum type,
>+                                              GLsizei bufSize,
>+                                              void *data)
>+{
>+    return gl::ReadnPixelsEXTContextANGLE(ctx, x, y, width, height, format, type, bufSize, data);
>+}
>+
>+void GL_APIENTRY glReleaseShaderCompilerContextANGLE(GLeglContext ctx)
>+{
>+    return gl::ReleaseShaderCompilerContextANGLE(ctx);
>+}
>+
>+void GL_APIENTRY glRenderbufferStorageContextANGLE(GLeglContext ctx,
>+                                                   GLenum target,
>+                                                   GLenum internalformat,
>+                                                   GLsizei width,
>+                                                   GLsizei height)
>+{
>+    return gl::RenderbufferStorageContextANGLE(ctx, target, internalformat, width, height);
>+}
>+
>+void GL_APIENTRY glRenderbufferStorageMultisampleContextANGLE(GLeglContext ctx,
>+                                                              GLenum target,
>+                                                              GLsizei samples,
>+                                                              GLenum internalformat,
>+                                                              GLsizei width,
>+                                                              GLsizei height)
>+{
>+    return gl::RenderbufferStorageMultisampleContextANGLE(ctx, target, samples, internalformat,
>+                                                          width, height);
>+}
>+
>+void GL_APIENTRY glRenderbufferStorageMultisampleANGLEContextANGLE(GLeglContext ctx,
>+                                                                   GLenum target,
>+                                                                   GLsizei samples,
>+                                                                   GLenum internalformat,
>+                                                                   GLsizei width,
>+                                                                   GLsizei height)
>+{
>+    return gl::RenderbufferStorageMultisampleANGLEContextANGLE(ctx, target, samples, internalformat,
>+                                                               width, height);
>+}
>+
>+void GL_APIENTRY glRenderbufferStorageOESContextANGLE(GLeglContext ctx,
>+                                                      GLenum target,
>+                                                      GLenum internalformat,
>+                                                      GLsizei width,
>+                                                      GLsizei height)
>+{
>+    return gl::RenderbufferStorageOESContextANGLE(ctx, target, internalformat, width, height);
>+}
>+
>+void GL_APIENTRY glResumeTransformFeedbackContextANGLE(GLeglContext ctx)
>+{
>+    return gl::ResumeTransformFeedbackContextANGLE(ctx);
>+}
>+
>+void GL_APIENTRY
>+glRotatefContextANGLE(GLeglContext ctx, GLfloat angle, GLfloat x, GLfloat y, GLfloat z)
>+{
>+    return gl::RotatefContextANGLE(ctx, angle, x, y, z);
>+}
>+
>+void GL_APIENTRY
>+glRotatexContextANGLE(GLeglContext ctx, GLfixed angle, GLfixed x, GLfixed y, GLfixed z)
>+{
>+    return gl::RotatexContextANGLE(ctx, angle, x, y, z);
>+}
>+
>+void GL_APIENTRY glSampleCoverageContextANGLE(GLeglContext ctx, GLfloat value, GLboolean invert)
>+{
>+    return gl::SampleCoverageContextANGLE(ctx, value, invert);
>+}
>+
>+void GL_APIENTRY glSampleCoveragexContextANGLE(GLeglContext ctx, GLclampx value, GLboolean invert)
>+{
>+    return gl::SampleCoveragexContextANGLE(ctx, value, invert);
>+}
>+
>+void GL_APIENTRY glSampleMaskiContextANGLE(GLeglContext ctx, GLuint maskNumber, GLbitfield mask)
>+{
>+    return gl::SampleMaskiContextANGLE(ctx, maskNumber, mask);
>+}
>+
>+void GL_APIENTRY glSamplerParameterIivOESContextANGLE(GLeglContext ctx,
>+                                                      GLuint sampler,
>+                                                      GLenum pname,
>+                                                      const GLint *param)
>+{
>+    return gl::SamplerParameterIivOESContextANGLE(ctx, sampler, pname, param);
>+}
>+
>+void GL_APIENTRY glSamplerParameterIuivOESContextANGLE(GLeglContext ctx,
>+                                                       GLuint sampler,
>+                                                       GLenum pname,
>+                                                       const GLuint *param)
>+{
>+    return gl::SamplerParameterIuivOESContextANGLE(ctx, sampler, pname, param);
>+}
>+
>+void GL_APIENTRY glSamplerParameterfContextANGLE(GLeglContext ctx,
>+                                                 GLuint sampler,
>+                                                 GLenum pname,
>+                                                 GLfloat param)
>+{
>+    return gl::SamplerParameterfContextANGLE(ctx, sampler, pname, param);
>+}
>+
>+void GL_APIENTRY glSamplerParameterfvContextANGLE(GLeglContext ctx,
>+                                                  GLuint sampler,
>+                                                  GLenum pname,
>+                                                  const GLfloat *param)
>+{
>+    return gl::SamplerParameterfvContextANGLE(ctx, sampler, pname, param);
>+}
>+
>+void GL_APIENTRY glSamplerParameteriContextANGLE(GLeglContext ctx,
>+                                                 GLuint sampler,
>+                                                 GLenum pname,
>+                                                 GLint param)
>+{
>+    return gl::SamplerParameteriContextANGLE(ctx, sampler, pname, param);
>+}
>+
>+void GL_APIENTRY glSamplerParameterivContextANGLE(GLeglContext ctx,
>+                                                  GLuint sampler,
>+                                                  GLenum pname,
>+                                                  const GLint *param)
>+{
>+    return gl::SamplerParameterivContextANGLE(ctx, sampler, pname, param);
>+}
>+
>+void GL_APIENTRY glScalefContextANGLE(GLeglContext ctx, GLfloat x, GLfloat y, GLfloat z)
>+{
>+    return gl::ScalefContextANGLE(ctx, x, y, z);
>+}
>+
>+void GL_APIENTRY glScalexContextANGLE(GLeglContext ctx, GLfixed x, GLfixed y, GLfixed z)
>+{
>+    return gl::ScalexContextANGLE(ctx, x, y, z);
>+}
>+
>+void GL_APIENTRY
>+glScissorContextANGLE(GLeglContext ctx, GLint x, GLint y, GLsizei width, GLsizei height)
>+{
>+    return gl::ScissorContextANGLE(ctx, x, y, width, height);
>+}
>+
>+void GL_APIENTRY glSemaphoreParameterui64vEXTContextANGLE(GLeglContext ctx,
>+                                                          GLuint semaphore,
>+                                                          GLenum pname,
>+                                                          const GLuint64 *params)
>+{
>+    return gl::SemaphoreParameterui64vEXTContextANGLE(ctx, semaphore, pname, params);
>+}
>+
>+void GL_APIENTRY glSetFenceNVContextANGLE(GLeglContext ctx, GLuint fence, GLenum condition)
>+{
>+    return gl::SetFenceNVContextANGLE(ctx, fence, condition);
>+}
>+
>+void GL_APIENTRY glShadeModelContextANGLE(GLeglContext ctx, GLenum mode)
>+{
>+    return gl::ShadeModelContextANGLE(ctx, mode);
>+}
>+
>+void GL_APIENTRY glShaderBinaryContextANGLE(GLeglContext ctx,
>+                                            GLsizei count,
>+                                            const GLuint *shaders,
>+                                            GLenum binaryformat,
>+                                            const void *binary,
>+                                            GLsizei length)
>+{
>+    return gl::ShaderBinaryContextANGLE(ctx, count, shaders, binaryformat, binary, length);
>+}
>+
>+void GL_APIENTRY glShaderSourceContextANGLE(GLeglContext ctx,
>+                                            GLuint shader,
>+                                            GLsizei count,
>+                                            const GLchar *const *string,
>+                                            const GLint *length)
>+{
>+    return gl::ShaderSourceContextANGLE(ctx, shader, count, string, length);
>+}
>+
>+void GL_APIENTRY glSignalSemaphoreEXTContextANGLE(GLeglContext ctx,
>+                                                  GLuint semaphore,
>+                                                  GLuint numBufferBarriers,
>+                                                  const GLuint *buffers,
>+                                                  GLuint numTextureBarriers,
>+                                                  const GLuint *textures,
>+                                                  const GLenum *dstLayouts)
>+{
>+    return gl::SignalSemaphoreEXTContextANGLE(ctx, semaphore, numBufferBarriers, buffers,
>+                                              numTextureBarriers, textures, dstLayouts);
>+}
>+
>+void GL_APIENTRY glStencilFuncContextANGLE(GLeglContext ctx, GLenum func, GLint ref, GLuint mask)
>+{
>+    return gl::StencilFuncContextANGLE(ctx, func, ref, mask);
>+}
>+
>+void GL_APIENTRY glStencilFuncSeparateContextANGLE(GLeglContext ctx,
>+                                                   GLenum face,
>+                                                   GLenum func,
>+                                                   GLint ref,
>+                                                   GLuint mask)
>+{
>+    return gl::StencilFuncSeparateContextANGLE(ctx, face, func, ref, mask);
>+}
>+
>+void GL_APIENTRY glStencilMaskContextANGLE(GLeglContext ctx, GLuint mask)
>+{
>+    return gl::StencilMaskContextANGLE(ctx, mask);
>+}
>+
>+void GL_APIENTRY glStencilMaskSeparateContextANGLE(GLeglContext ctx, GLenum face, GLuint mask)
>+{
>+    return gl::StencilMaskSeparateContextANGLE(ctx, face, mask);
>+}
>+
>+void GL_APIENTRY glStencilOpContextANGLE(GLeglContext ctx, GLenum fail, GLenum zfail, GLenum zpass)
>+{
>+    return gl::StencilOpContextANGLE(ctx, fail, zfail, zpass);
>+}
>+
>+void GL_APIENTRY glStencilOpSeparateContextANGLE(GLeglContext ctx,
>+                                                 GLenum face,
>+                                                 GLenum sfail,
>+                                                 GLenum dpfail,
>+                                                 GLenum dppass)
>+{
>+    return gl::StencilOpSeparateContextANGLE(ctx, face, sfail, dpfail, dppass);
>+}
>+
>+GLboolean GL_APIENTRY glTestFenceNVContextANGLE(GLeglContext ctx, GLuint fence)
>+{
>+    return gl::TestFenceNVContextANGLE(ctx, fence);
>+}
>+
>+void GL_APIENTRY glTexCoordPointerContextANGLE(GLeglContext ctx,
>+                                               GLint size,
>+                                               GLenum type,
>+                                               GLsizei stride,
>+                                               const void *pointer)
>+{
>+    return gl::TexCoordPointerContextANGLE(ctx, size, type, stride, pointer);
>+}
>+
>+void GL_APIENTRY glTexEnvfContextANGLE(GLeglContext ctx, GLenum target, GLenum pname, GLfloat param)
>+{
>+    return gl::TexEnvfContextANGLE(ctx, target, pname, param);
>+}
>+
>+void GL_APIENTRY glTexEnvfvContextANGLE(GLeglContext ctx,
>+                                        GLenum target,
>+                                        GLenum pname,
>+                                        const GLfloat *params)
>+{
>+    return gl::TexEnvfvContextANGLE(ctx, target, pname, params);
>+}
>+
>+void GL_APIENTRY glTexEnviContextANGLE(GLeglContext ctx, GLenum target, GLenum pname, GLint param)
>+{
>+    return gl::TexEnviContextANGLE(ctx, target, pname, param);
>+}
>+
>+void GL_APIENTRY glTexEnvivContextANGLE(GLeglContext ctx,
>+                                        GLenum target,
>+                                        GLenum pname,
>+                                        const GLint *params)
>+{
>+    return gl::TexEnvivContextANGLE(ctx, target, pname, params);
>+}
>+
>+void GL_APIENTRY glTexEnvxContextANGLE(GLeglContext ctx, GLenum target, GLenum pname, GLfixed param)
>+{
>+    return gl::TexEnvxContextANGLE(ctx, target, pname, param);
>+}
>+
>+void GL_APIENTRY glTexEnvxvContextANGLE(GLeglContext ctx,
>+                                        GLenum target,
>+                                        GLenum pname,
>+                                        const GLfixed *params)
>+{
>+    return gl::TexEnvxvContextANGLE(ctx, target, pname, params);
>+}
>+
>+void GL_APIENTRY glTexGenfOESContextANGLE(GLeglContext ctx,
>+                                          GLenum coord,
>+                                          GLenum pname,
>+                                          GLfloat param)
>+{
>+    return gl::TexGenfOESContextANGLE(ctx, coord, pname, param);
>+}
>+
>+void GL_APIENTRY glTexGenfvOESContextANGLE(GLeglContext ctx,
>+                                           GLenum coord,
>+                                           GLenum pname,
>+                                           const GLfloat *params)
>+{
>+    return gl::TexGenfvOESContextANGLE(ctx, coord, pname, params);
>+}
>+
>+void GL_APIENTRY glTexGeniOESContextANGLE(GLeglContext ctx, GLenum coord, GLenum pname, GLint param)
>+{
>+    return gl::TexGeniOESContextANGLE(ctx, coord, pname, param);
>+}
>+
>+void GL_APIENTRY glTexGenivOESContextANGLE(GLeglContext ctx,
>+                                           GLenum coord,
>+                                           GLenum pname,
>+                                           const GLint *params)
>+{
>+    return gl::TexGenivOESContextANGLE(ctx, coord, pname, params);
>+}
>+
>+void GL_APIENTRY glTexGenxOESContextANGLE(GLeglContext ctx,
>+                                          GLenum coord,
>+                                          GLenum pname,
>+                                          GLfixed param)
>+{
>+    return gl::TexGenxOESContextANGLE(ctx, coord, pname, param);
>+}
>+
>+void GL_APIENTRY glTexGenxvOESContextANGLE(GLeglContext ctx,
>+                                           GLenum coord,
>+                                           GLenum pname,
>+                                           const GLfixed *params)
>+{
>+    return gl::TexGenxvOESContextANGLE(ctx, coord, pname, params);
>+}
>+
>+void GL_APIENTRY glTexImage2DContextANGLE(GLeglContext ctx,
>+                                          GLenum target,
>+                                          GLint level,
>+                                          GLint internalformat,
>+                                          GLsizei width,
>+                                          GLsizei height,
>+                                          GLint border,
>+                                          GLenum format,
>+                                          GLenum type,
>+                                          const void *pixels)
>+{
>+    return gl::TexImage2DContextANGLE(ctx, target, level, internalformat, width, height, border,
>+                                      format, type, pixels);
>+}
>+
>+void GL_APIENTRY glTexImage3DContextANGLE(GLeglContext ctx,
>+                                          GLenum target,
>+                                          GLint level,
>+                                          GLint internalformat,
>+                                          GLsizei width,
>+                                          GLsizei height,
>+                                          GLsizei depth,
>+                                          GLint border,
>+                                          GLenum format,
>+                                          GLenum type,
>+                                          const void *pixels)
>+{
>+    return gl::TexImage3DContextANGLE(ctx, target, level, internalformat, width, height, depth,
>+                                      border, format, type, pixels);
>+}
>+
>+void GL_APIENTRY glTexParameterIivOESContextANGLE(GLeglContext ctx,
>+                                                  GLenum target,
>+                                                  GLenum pname,
>+                                                  const GLint *params)
>+{
>+    return gl::TexParameterIivOESContextANGLE(ctx, target, pname, params);
>+}
>+
>+void GL_APIENTRY glTexParameterIuivOESContextANGLE(GLeglContext ctx,
>+                                                   GLenum target,
>+                                                   GLenum pname,
>+                                                   const GLuint *params)
>+{
>+    return gl::TexParameterIuivOESContextANGLE(ctx, target, pname, params);
>+}
>+
>+void GL_APIENTRY glTexParameterfContextANGLE(GLeglContext ctx,
>+                                             GLenum target,
>+                                             GLenum pname,
>+                                             GLfloat param)
>+{
>+    return gl::TexParameterfContextANGLE(ctx, target, pname, param);
>+}
>+
>+void GL_APIENTRY glTexParameterfvContextANGLE(GLeglContext ctx,
>+                                              GLenum target,
>+                                              GLenum pname,
>+                                              const GLfloat *params)
>+{
>+    return gl::TexParameterfvContextANGLE(ctx, target, pname, params);
>+}
>+
>+void GL_APIENTRY glTexParameteriContextANGLE(GLeglContext ctx,
>+                                             GLenum target,
>+                                             GLenum pname,
>+                                             GLint param)
>+{
>+    return gl::TexParameteriContextANGLE(ctx, target, pname, param);
>+}
>+
>+void GL_APIENTRY glTexParameterivContextANGLE(GLeglContext ctx,
>+                                              GLenum target,
>+                                              GLenum pname,
>+                                              const GLint *params)
>+{
>+    return gl::TexParameterivContextANGLE(ctx, target, pname, params);
>+}
>+
>+void GL_APIENTRY glTexParameterxContextANGLE(GLeglContext ctx,
>+                                             GLenum target,
>+                                             GLenum pname,
>+                                             GLfixed param)
>+{
>+    return gl::TexParameterxContextANGLE(ctx, target, pname, param);
>+}
>+
>+void GL_APIENTRY glTexParameterxvContextANGLE(GLeglContext ctx,
>+                                              GLenum target,
>+                                              GLenum pname,
>+                                              const GLfixed *params)
>+{
>+    return gl::TexParameterxvContextANGLE(ctx, target, pname, params);
>+}
>+
>+void GL_APIENTRY glTexStorage1DEXTContextANGLE(GLeglContext ctx,
>+                                               GLenum target,
>+                                               GLsizei levels,
>+                                               GLenum internalformat,
>+                                               GLsizei width)
>+{
>+    return gl::TexStorage1DEXTContextANGLE(ctx, target, levels, internalformat, width);
>+}
>+
>+void GL_APIENTRY glTexStorage2DContextANGLE(GLeglContext ctx,
>+                                            GLenum target,
>+                                            GLsizei levels,
>+                                            GLenum internalformat,
>+                                            GLsizei width,
>+                                            GLsizei height)
>+{
>+    return gl::TexStorage2DContextANGLE(ctx, target, levels, internalformat, width, height);
>+}
>+
>+void GL_APIENTRY glTexStorage2DEXTContextANGLE(GLeglContext ctx,
>+                                               GLenum target,
>+                                               GLsizei levels,
>+                                               GLenum internalformat,
>+                                               GLsizei width,
>+                                               GLsizei height)
>+{
>+    return gl::TexStorage2DEXTContextANGLE(ctx, target, levels, internalformat, width, height);
>+}
>+
>+void GL_APIENTRY glTexStorage2DMultisampleContextANGLE(GLeglContext ctx,
>+                                                       GLenum target,
>+                                                       GLsizei samples,
>+                                                       GLenum internalformat,
>+                                                       GLsizei width,
>+                                                       GLsizei height,
>+                                                       GLboolean fixedsamplelocations)
>+{
>+    return gl::TexStorage2DMultisampleContextANGLE(ctx, target, samples, internalformat, width,
>+                                                   height, fixedsamplelocations);
>+}
>+
>+void GL_APIENTRY glTexStorage3DContextANGLE(GLeglContext ctx,
>+                                            GLenum target,
>+                                            GLsizei levels,
>+                                            GLenum internalformat,
>+                                            GLsizei width,
>+                                            GLsizei height,
>+                                            GLsizei depth)
>+{
>+    return gl::TexStorage3DContextANGLE(ctx, target, levels, internalformat, width, height, depth);
>+}
>+
>+void GL_APIENTRY glTexStorage3DEXTContextANGLE(GLeglContext ctx,
>+                                               GLenum target,
>+                                               GLsizei levels,
>+                                               GLenum internalformat,
>+                                               GLsizei width,
>+                                               GLsizei height,
>+                                               GLsizei depth)
>+{
>+    return gl::TexStorage3DEXTContextANGLE(ctx, target, levels, internalformat, width, height,
>+                                           depth);
>+}
>+
>+void GL_APIENTRY glTexStorage3DMultisampleOESContextANGLE(GLeglContext ctx,
>+                                                          GLenum target,
>+                                                          GLsizei samples,
>+                                                          GLenum internalformat,
>+                                                          GLsizei width,
>+                                                          GLsizei height,
>+                                                          GLsizei depth,
>+                                                          GLboolean fixedsamplelocations)
>+{
>+    return gl::TexStorage3DMultisampleOESContextANGLE(ctx, target, samples, internalformat, width,
>+                                                      height, depth, fixedsamplelocations);
>+}
>+
>+void GL_APIENTRY glTexStorageMem2DEXTContextANGLE(GLeglContext ctx,
>+                                                  GLenum target,
>+                                                  GLsizei levels,
>+                                                  GLenum internalFormat,
>+                                                  GLsizei width,
>+                                                  GLsizei height,
>+                                                  GLuint memory,
>+                                                  GLuint64 offset)
>+{
>+    return gl::TexStorageMem2DEXTContextANGLE(ctx, target, levels, internalFormat, width, height,
>+                                              memory, offset);
>+}
>+
>+void GL_APIENTRY glTexStorageMem2DMultisampleEXTContextANGLE(GLeglContext ctx,
>+                                                             GLenum target,
>+                                                             GLsizei samples,
>+                                                             GLenum internalFormat,
>+                                                             GLsizei width,
>+                                                             GLsizei height,
>+                                                             GLboolean fixedSampleLocations,
>+                                                             GLuint memory,
>+                                                             GLuint64 offset)
>+{
>+    return gl::TexStorageMem2DMultisampleEXTContextANGLE(
>+        ctx, target, samples, internalFormat, width, height, fixedSampleLocations, memory, offset);
>+}
>+
>+void GL_APIENTRY glTexStorageMem3DEXTContextANGLE(GLeglContext ctx,
>+                                                  GLenum target,
>+                                                  GLsizei levels,
>+                                                  GLenum internalFormat,
>+                                                  GLsizei width,
>+                                                  GLsizei height,
>+                                                  GLsizei depth,
>+                                                  GLuint memory,
>+                                                  GLuint64 offset)
>+{
>+    return gl::TexStorageMem3DEXTContextANGLE(ctx, target, levels, internalFormat, width, height,
>+                                              depth, memory, offset);
>+}
>+
>+void GL_APIENTRY glTexStorageMem3DMultisampleEXTContextANGLE(GLeglContext ctx,
>+                                                             GLenum target,
>+                                                             GLsizei samples,
>+                                                             GLenum internalFormat,
>+                                                             GLsizei width,
>+                                                             GLsizei height,
>+                                                             GLsizei depth,
>+                                                             GLboolean fixedSampleLocations,
>+                                                             GLuint memory,
>+                                                             GLuint64 offset)
>+{
>+    return gl::TexStorageMem3DMultisampleEXTContextANGLE(ctx, target, samples, internalFormat,
>+                                                         width, height, depth, fixedSampleLocations,
>+                                                         memory, offset);
>+}
>+
>+void GL_APIENTRY glTexSubImage2DContextANGLE(GLeglContext ctx,
>+                                             GLenum target,
>+                                             GLint level,
>+                                             GLint xoffset,
>+                                             GLint yoffset,
>+                                             GLsizei width,
>+                                             GLsizei height,
>+                                             GLenum format,
>+                                             GLenum type,
>+                                             const void *pixels)
>+{
>+    return gl::TexSubImage2DContextANGLE(ctx, target, level, xoffset, yoffset, width, height,
>+                                         format, type, pixels);
>+}
>+
>+void GL_APIENTRY glTexSubImage3DContextANGLE(GLeglContext ctx,
>+                                             GLenum target,
>+                                             GLint level,
>+                                             GLint xoffset,
>+                                             GLint yoffset,
>+                                             GLint zoffset,
>+                                             GLsizei width,
>+                                             GLsizei height,
>+                                             GLsizei depth,
>+                                             GLenum format,
>+                                             GLenum type,
>+                                             const void *pixels)
>+{
>+    return gl::TexSubImage3DContextANGLE(ctx, target, level, xoffset, yoffset, zoffset, width,
>+                                         height, depth, format, type, pixels);
>+}
>+
>+void GL_APIENTRY glTransformFeedbackVaryingsContextANGLE(GLeglContext ctx,
>+                                                         GLuint program,
>+                                                         GLsizei count,
>+                                                         const GLchar *const *varyings,
>+                                                         GLenum bufferMode)
>+{
>+    return gl::TransformFeedbackVaryingsContextANGLE(ctx, program, count, varyings, bufferMode);
>+}
>+
>+void GL_APIENTRY glTranslatefContextANGLE(GLeglContext ctx, GLfloat x, GLfloat y, GLfloat z)
>+{
>+    return gl::TranslatefContextANGLE(ctx, x, y, z);
>+}
>+
>+void GL_APIENTRY glTranslatexContextANGLE(GLeglContext ctx, GLfixed x, GLfixed y, GLfixed z)
>+{
>+    return gl::TranslatexContextANGLE(ctx, x, y, z);
>+}
>+
>+void GL_APIENTRY glUniform1fContextANGLE(GLeglContext ctx, GLint location, GLfloat v0)
>+{
>+    return gl::Uniform1fContextANGLE(ctx, location, v0);
>+}
>+
>+void GL_APIENTRY glUniform1fvContextANGLE(GLeglContext ctx,
>+                                          GLint location,
>+                                          GLsizei count,
>+                                          const GLfloat *value)
>+{
>+    return gl::Uniform1fvContextANGLE(ctx, location, count, value);
>+}
>+
>+void GL_APIENTRY glUniform1iContextANGLE(GLeglContext ctx, GLint location, GLint v0)
>+{
>+    return gl::Uniform1iContextANGLE(ctx, location, v0);
>+}
>+
>+void GL_APIENTRY glUniform1ivContextANGLE(GLeglContext ctx,
>+                                          GLint location,
>+                                          GLsizei count,
>+                                          const GLint *value)
>+{
>+    return gl::Uniform1ivContextANGLE(ctx, location, count, value);
>+}
>+
>+void GL_APIENTRY glUniform1uiContextANGLE(GLeglContext ctx, GLint location, GLuint v0)
>+{
>+    return gl::Uniform1uiContextANGLE(ctx, location, v0);
>+}
>+
>+void GL_APIENTRY glUniform1uivContextANGLE(GLeglContext ctx,
>+                                           GLint location,
>+                                           GLsizei count,
>+                                           const GLuint *value)
>+{
>+    return gl::Uniform1uivContextANGLE(ctx, location, count, value);
>+}
>+
>+void GL_APIENTRY glUniform2fContextANGLE(GLeglContext ctx, GLint location, GLfloat v0, GLfloat v1)
>+{
>+    return gl::Uniform2fContextANGLE(ctx, location, v0, v1);
>+}
>+
>+void GL_APIENTRY glUniform2fvContextANGLE(GLeglContext ctx,
>+                                          GLint location,
>+                                          GLsizei count,
>+                                          const GLfloat *value)
>+{
>+    return gl::Uniform2fvContextANGLE(ctx, location, count, value);
>+}
>+
>+void GL_APIENTRY glUniform2iContextANGLE(GLeglContext ctx, GLint location, GLint v0, GLint v1)
>+{
>+    return gl::Uniform2iContextANGLE(ctx, location, v0, v1);
>+}
>+
>+void GL_APIENTRY glUniform2ivContextANGLE(GLeglContext ctx,
>+                                          GLint location,
>+                                          GLsizei count,
>+                                          const GLint *value)
>+{
>+    return gl::Uniform2ivContextANGLE(ctx, location, count, value);
>+}
>+
>+void GL_APIENTRY glUniform2uiContextANGLE(GLeglContext ctx, GLint location, GLuint v0, GLuint v1)
>+{
>+    return gl::Uniform2uiContextANGLE(ctx, location, v0, v1);
>+}
>+
>+void GL_APIENTRY glUniform2uivContextANGLE(GLeglContext ctx,
>+                                           GLint location,
>+                                           GLsizei count,
>+                                           const GLuint *value)
>+{
>+    return gl::Uniform2uivContextANGLE(ctx, location, count, value);
>+}
>+
>+void GL_APIENTRY
>+glUniform3fContextANGLE(GLeglContext ctx, GLint location, GLfloat v0, GLfloat v1, GLfloat v2)
>+{
>+    return gl::Uniform3fContextANGLE(ctx, location, v0, v1, v2);
>+}
>+
>+void GL_APIENTRY glUniform3fvContextANGLE(GLeglContext ctx,
>+                                          GLint location,
>+                                          GLsizei count,
>+                                          const GLfloat *value)
>+{
>+    return gl::Uniform3fvContextANGLE(ctx, location, count, value);
>+}
>+
>+void GL_APIENTRY
>+glUniform3iContextANGLE(GLeglContext ctx, GLint location, GLint v0, GLint v1, GLint v2)
>+{
>+    return gl::Uniform3iContextANGLE(ctx, location, v0, v1, v2);
>+}
>+
>+void GL_APIENTRY glUniform3ivContextANGLE(GLeglContext ctx,
>+                                          GLint location,
>+                                          GLsizei count,
>+                                          const GLint *value)
>+{
>+    return gl::Uniform3ivContextANGLE(ctx, location, count, value);
>+}
>+
>+void GL_APIENTRY
>+glUniform3uiContextANGLE(GLeglContext ctx, GLint location, GLuint v0, GLuint v1, GLuint v2)
>+{
>+    return gl::Uniform3uiContextANGLE(ctx, location, v0, v1, v2);
>+}
>+
>+void GL_APIENTRY glUniform3uivContextANGLE(GLeglContext ctx,
>+                                           GLint location,
>+                                           GLsizei count,
>+                                           const GLuint *value)
>+{
>+    return gl::Uniform3uivContextANGLE(ctx, location, count, value);
>+}
>+
>+void GL_APIENTRY glUniform4fContextANGLE(GLeglContext ctx,
>+                                         GLint location,
>+                                         GLfloat v0,
>+                                         GLfloat v1,
>+                                         GLfloat v2,
>+                                         GLfloat v3)
>+{
>+    return gl::Uniform4fContextANGLE(ctx, location, v0, v1, v2, v3);
>+}
>+
>+void GL_APIENTRY glUniform4fvContextANGLE(GLeglContext ctx,
>+                                          GLint location,
>+                                          GLsizei count,
>+                                          const GLfloat *value)
>+{
>+    return gl::Uniform4fvContextANGLE(ctx, location, count, value);
>+}
>+
>+void GL_APIENTRY
>+glUniform4iContextANGLE(GLeglContext ctx, GLint location, GLint v0, GLint v1, GLint v2, GLint v3)
>+{
>+    return gl::Uniform4iContextANGLE(ctx, location, v0, v1, v2, v3);
>+}
>+
>+void GL_APIENTRY glUniform4ivContextANGLE(GLeglContext ctx,
>+                                          GLint location,
>+                                          GLsizei count,
>+                                          const GLint *value)
>+{
>+    return gl::Uniform4ivContextANGLE(ctx, location, count, value);
>+}
>+
>+void GL_APIENTRY glUniform4uiContextANGLE(GLeglContext ctx,
>+                                          GLint location,
>+                                          GLuint v0,
>+                                          GLuint v1,
>+                                          GLuint v2,
>+                                          GLuint v3)
>+{
>+    return gl::Uniform4uiContextANGLE(ctx, location, v0, v1, v2, v3);
>+}
>+
>+void GL_APIENTRY glUniform4uivContextANGLE(GLeglContext ctx,
>+                                           GLint location,
>+                                           GLsizei count,
>+                                           const GLuint *value)
>+{
>+    return gl::Uniform4uivContextANGLE(ctx, location, count, value);
>+}
>+
>+void GL_APIENTRY glUniformBlockBindingContextANGLE(GLeglContext ctx,
>+                                                   GLuint program,
>+                                                   GLuint uniformBlockIndex,
>+                                                   GLuint uniformBlockBinding)
>+{
>+    return gl::UniformBlockBindingContextANGLE(ctx, program, uniformBlockIndex,
>+                                               uniformBlockBinding);
>+}
>+
>+void GL_APIENTRY glUniformMatrix2fvContextANGLE(GLeglContext ctx,
>+                                                GLint location,
>+                                                GLsizei count,
>+                                                GLboolean transpose,
>+                                                const GLfloat *value)
>+{
>+    return gl::UniformMatrix2fvContextANGLE(ctx, location, count, transpose, value);
>+}
>+
>+void GL_APIENTRY glUniformMatrix2x3fvContextANGLE(GLeglContext ctx,
>+                                                  GLint location,
>+                                                  GLsizei count,
>+                                                  GLboolean transpose,
>+                                                  const GLfloat *value)
>+{
>+    return gl::UniformMatrix2x3fvContextANGLE(ctx, location, count, transpose, value);
>+}
>+
>+void GL_APIENTRY glUniformMatrix2x4fvContextANGLE(GLeglContext ctx,
>+                                                  GLint location,
>+                                                  GLsizei count,
>+                                                  GLboolean transpose,
>+                                                  const GLfloat *value)
>+{
>+    return gl::UniformMatrix2x4fvContextANGLE(ctx, location, count, transpose, value);
>+}
>+
>+void GL_APIENTRY glUniformMatrix3fvContextANGLE(GLeglContext ctx,
>+                                                GLint location,
>+                                                GLsizei count,
>+                                                GLboolean transpose,
>+                                                const GLfloat *value)
>+{
>+    return gl::UniformMatrix3fvContextANGLE(ctx, location, count, transpose, value);
>+}
>+
>+void GL_APIENTRY glUniformMatrix3x2fvContextANGLE(GLeglContext ctx,
>+                                                  GLint location,
>+                                                  GLsizei count,
>+                                                  GLboolean transpose,
>+                                                  const GLfloat *value)
>+{
>+    return gl::UniformMatrix3x2fvContextANGLE(ctx, location, count, transpose, value);
>+}
>+
>+void GL_APIENTRY glUniformMatrix3x4fvContextANGLE(GLeglContext ctx,
>+                                                  GLint location,
>+                                                  GLsizei count,
>+                                                  GLboolean transpose,
>+                                                  const GLfloat *value)
>+{
>+    return gl::UniformMatrix3x4fvContextANGLE(ctx, location, count, transpose, value);
>+}
>+
>+void GL_APIENTRY glUniformMatrix4fvContextANGLE(GLeglContext ctx,
>+                                                GLint location,
>+                                                GLsizei count,
>+                                                GLboolean transpose,
>+                                                const GLfloat *value)
>+{
>+    return gl::UniformMatrix4fvContextANGLE(ctx, location, count, transpose, value);
>+}
>+
>+void GL_APIENTRY glUniformMatrix4x2fvContextANGLE(GLeglContext ctx,
>+                                                  GLint location,
>+                                                  GLsizei count,
>+                                                  GLboolean transpose,
>+                                                  const GLfloat *value)
>+{
>+    return gl::UniformMatrix4x2fvContextANGLE(ctx, location, count, transpose, value);
>+}
>+
>+void GL_APIENTRY glUniformMatrix4x3fvContextANGLE(GLeglContext ctx,
>+                                                  GLint location,
>+                                                  GLsizei count,
>+                                                  GLboolean transpose,
>+                                                  const GLfloat *value)
>+{
>+    return gl::UniformMatrix4x3fvContextANGLE(ctx, location, count, transpose, value);
>+}
>+
>+GLboolean GL_APIENTRY glUnmapBufferContextANGLE(GLeglContext ctx, GLenum target)
>+{
>+    return gl::UnmapBufferContextANGLE(ctx, target);
>+}
>+
>+GLboolean GL_APIENTRY glUnmapBufferOESContextANGLE(GLeglContext ctx, GLenum target)
>+{
>+    return gl::UnmapBufferOESContextANGLE(ctx, target);
>+}
>+
>+void GL_APIENTRY glUseProgramContextANGLE(GLeglContext ctx, GLuint program)
>+{
>+    return gl::UseProgramContextANGLE(ctx, program);
>+}
>+
>+void GL_APIENTRY glUseProgramStagesContextANGLE(GLeglContext ctx,
>+                                                GLuint pipeline,
>+                                                GLbitfield stages,
>+                                                GLuint program)
>+{
>+    return gl::UseProgramStagesContextANGLE(ctx, pipeline, stages, program);
>+}
>+
>+void GL_APIENTRY glValidateProgramContextANGLE(GLeglContext ctx, GLuint program)
>+{
>+    return gl::ValidateProgramContextANGLE(ctx, program);
>+}
>+
>+void GL_APIENTRY glValidateProgramPipelineContextANGLE(GLeglContext ctx, GLuint pipeline)
>+{
>+    return gl::ValidateProgramPipelineContextANGLE(ctx, pipeline);
>+}
>+
>+void GL_APIENTRY glVertexAttrib1fContextANGLE(GLeglContext ctx, GLuint index, GLfloat x)
>+{
>+    return gl::VertexAttrib1fContextANGLE(ctx, index, x);
>+}
>+
>+void GL_APIENTRY glVertexAttrib1fvContextANGLE(GLeglContext ctx, GLuint index, const GLfloat *v)
>+{
>+    return gl::VertexAttrib1fvContextANGLE(ctx, index, v);
>+}
>+
>+void GL_APIENTRY glVertexAttrib2fContextANGLE(GLeglContext ctx, GLuint index, GLfloat x, GLfloat y)
>+{
>+    return gl::VertexAttrib2fContextANGLE(ctx, index, x, y);
>+}
>+
>+void GL_APIENTRY glVertexAttrib2fvContextANGLE(GLeglContext ctx, GLuint index, const GLfloat *v)
>+{
>+    return gl::VertexAttrib2fvContextANGLE(ctx, index, v);
>+}
>+
>+void GL_APIENTRY
>+glVertexAttrib3fContextANGLE(GLeglContext ctx, GLuint index, GLfloat x, GLfloat y, GLfloat z)
>+{
>+    return gl::VertexAttrib3fContextANGLE(ctx, index, x, y, z);
>+}
>+
>+void GL_APIENTRY glVertexAttrib3fvContextANGLE(GLeglContext ctx, GLuint index, const GLfloat *v)
>+{
>+    return gl::VertexAttrib3fvContextANGLE(ctx, index, v);
>+}
>+
>+void GL_APIENTRY glVertexAttrib4fContextANGLE(GLeglContext ctx,
>+                                              GLuint index,
>+                                              GLfloat x,
>+                                              GLfloat y,
>+                                              GLfloat z,
>+                                              GLfloat w)
>+{
>+    return gl::VertexAttrib4fContextANGLE(ctx, index, x, y, z, w);
>+}
>+
>+void GL_APIENTRY glVertexAttrib4fvContextANGLE(GLeglContext ctx, GLuint index, const GLfloat *v)
>+{
>+    return gl::VertexAttrib4fvContextANGLE(ctx, index, v);
>+}
>+
>+void GL_APIENTRY glVertexAttribBindingContextANGLE(GLeglContext ctx,
>+                                                   GLuint attribindex,
>+                                                   GLuint bindingindex)
>+{
>+    return gl::VertexAttribBindingContextANGLE(ctx, attribindex, bindingindex);
>+}
>+
>+void GL_APIENTRY glVertexAttribDivisorContextANGLE(GLeglContext ctx, GLuint index, GLuint divisor)
>+{
>+    return gl::VertexAttribDivisorContextANGLE(ctx, index, divisor);
>+}
>+
>+void GL_APIENTRY glVertexAttribDivisorANGLEContextANGLE(GLeglContext ctx,
>+                                                        GLuint index,
>+                                                        GLuint divisor)
>+{
>+    return gl::VertexAttribDivisorANGLEContextANGLE(ctx, index, divisor);
>+}
>+
>+void GL_APIENTRY glVertexAttribDivisorEXTContextANGLE(GLeglContext ctx,
>+                                                      GLuint index,
>+                                                      GLuint divisor)
>+{
>+    return gl::VertexAttribDivisorEXTContextANGLE(ctx, index, divisor);
>+}
>+
>+void GL_APIENTRY glVertexAttribFormatContextANGLE(GLeglContext ctx,
>+                                                  GLuint attribindex,
>+                                                  GLint size,
>+                                                  GLenum type,
>+                                                  GLboolean normalized,
>+                                                  GLuint relativeoffset)
>+{
>+    return gl::VertexAttribFormatContextANGLE(ctx, attribindex, size, type, normalized,
>+                                              relativeoffset);
>+}
>+
>+void GL_APIENTRY
>+glVertexAttribI4iContextANGLE(GLeglContext ctx, GLuint index, GLint x, GLint y, GLint z, GLint w)
>+{
>+    return gl::VertexAttribI4iContextANGLE(ctx, index, x, y, z, w);
>+}
>+
>+void GL_APIENTRY glVertexAttribI4ivContextANGLE(GLeglContext ctx, GLuint index, const GLint *v)
>+{
>+    return gl::VertexAttribI4ivContextANGLE(ctx, index, v);
>+}
>+
>+void GL_APIENTRY glVertexAttribI4uiContextANGLE(GLeglContext ctx,
>+                                                GLuint index,
>+                                                GLuint x,
>+                                                GLuint y,
>+                                                GLuint z,
>+                                                GLuint w)
>+{
>+    return gl::VertexAttribI4uiContextANGLE(ctx, index, x, y, z, w);
>+}
>+
>+void GL_APIENTRY glVertexAttribI4uivContextANGLE(GLeglContext ctx, GLuint index, const GLuint *v)
>+{
>+    return gl::VertexAttribI4uivContextANGLE(ctx, index, v);
>+}
>+
>+void GL_APIENTRY glVertexAttribIFormatContextANGLE(GLeglContext ctx,
>+                                                   GLuint attribindex,
>+                                                   GLint size,
>+                                                   GLenum type,
>+                                                   GLuint relativeoffset)
>+{
>+    return gl::VertexAttribIFormatContextANGLE(ctx, attribindex, size, type, relativeoffset);
>+}
>+
>+void GL_APIENTRY glVertexAttribIPointerContextANGLE(GLeglContext ctx,
>+                                                    GLuint index,
>+                                                    GLint size,
>+                                                    GLenum type,
>+                                                    GLsizei stride,
>+                                                    const void *pointer)
>+{
>+    return gl::VertexAttribIPointerContextANGLE(ctx, index, size, type, stride, pointer);
>+}
>+
>+void GL_APIENTRY glVertexAttribPointerContextANGLE(GLeglContext ctx,
>+                                                   GLuint index,
>+                                                   GLint size,
>+                                                   GLenum type,
>+                                                   GLboolean normalized,
>+                                                   GLsizei stride,
>+                                                   const void *pointer)
>+{
>+    return gl::VertexAttribPointerContextANGLE(ctx, index, size, type, normalized, stride, pointer);
>+}
>+
>+void GL_APIENTRY glVertexBindingDivisorContextANGLE(GLeglContext ctx,
>+                                                    GLuint bindingindex,
>+                                                    GLuint divisor)
>+{
>+    return gl::VertexBindingDivisorContextANGLE(ctx, bindingindex, divisor);
>+}
>+
>+void GL_APIENTRY glVertexPointerContextANGLE(GLeglContext ctx,
>+                                             GLint size,
>+                                             GLenum type,
>+                                             GLsizei stride,
>+                                             const void *pointer)
>+{
>+    return gl::VertexPointerContextANGLE(ctx, size, type, stride, pointer);
>+}
>+
>+void GL_APIENTRY
>+glViewportContextANGLE(GLeglContext ctx, GLint x, GLint y, GLsizei width, GLsizei height)
>+{
>+    return gl::ViewportContextANGLE(ctx, x, y, width, height);
>+}
>+
>+void GL_APIENTRY glWaitSemaphoreEXTContextANGLE(GLeglContext ctx,
>+                                                GLuint semaphore,
>+                                                GLuint numBufferBarriers,
>+                                                const GLuint *buffers,
>+                                                GLuint numTextureBarriers,
>+                                                const GLuint *textures,
>+                                                const GLenum *srcLayouts)
>+{
>+    return gl::WaitSemaphoreEXTContextANGLE(ctx, semaphore, numBufferBarriers, buffers,
>+                                            numTextureBarriers, textures, srcLayouts);
>+}
>+
>+void GL_APIENTRY glWaitSyncContextANGLE(GLeglContext ctx,
>+                                        GLsync sync,
>+                                        GLbitfield flags,
>+                                        GLuint64 timeout)
>+{
>+    return gl::WaitSyncContextANGLE(ctx, sync, flags, timeout);
>+}
>+
>+void GL_APIENTRY glWeightPointerOESContextANGLE(GLeglContext ctx,
>+                                                GLint size,
>+                                                GLenum type,
>+                                                GLsizei stride,
>+                                                const void *pointer)
>+{
>+    return gl::WeightPointerOESContextANGLE(ctx, size, type, stride, pointer);
>+}
>+
>+void GL_APIENTRY glBindUniformLocationCHROMIUMContextANGLE(GLeglContext ctx,
>+                                                           GLuint program,
>+                                                           GLint location,
>+                                                           const GLchar *name)
>+{
>+    return gl::BindUniformLocationCHROMIUMContextANGLE(ctx, program, location, name);
>+}
>+
>+void GL_APIENTRY glCoverageModulationCHROMIUMContextANGLE(GLeglContext ctx, GLenum components)
>+{
>+    return gl::CoverageModulationCHROMIUMContextANGLE(ctx, components);
>+}
>+
>+void GL_APIENTRY glMatrixLoadfCHROMIUMContextANGLE(GLeglContext ctx,
>+                                                   GLenum matrixMode,
>+                                                   const GLfloat *matrix)
>+{
>+    return gl::MatrixLoadfCHROMIUMContextANGLE(ctx, matrixMode, matrix);
>+}
>+
>+void GL_APIENTRY glMatrixLoadIdentityCHROMIUMContextANGLE(GLeglContext ctx, GLenum matrixMode)
>+{
>+    return gl::MatrixLoadIdentityCHROMIUMContextANGLE(ctx, matrixMode);
>+}
>+
>+GLuint GL_APIENTRY glGenPathsCHROMIUMContextANGLE(GLeglContext ctx, GLsizei range)
>+{
>+    return gl::GenPathsCHROMIUMContextANGLE(ctx, range);
>+}
>+
>+void GL_APIENTRY glDeletePathsCHROMIUMContextANGLE(GLeglContext ctx, GLuint first, GLsizei range)
>+{
>+    return gl::DeletePathsCHROMIUMContextANGLE(ctx, first, range);
>+}
>+
>+GLboolean GL_APIENTRY glIsPathCHROMIUMContextANGLE(GLeglContext ctx, GLuint path)
>+{
>+    return gl::IsPathCHROMIUMContextANGLE(ctx, path);
>+}
>+
>+void GL_APIENTRY glPathCommandsCHROMIUMContextANGLE(GLeglContext ctx,
>+                                                    GLuint path,
>+                                                    GLsizei numCommands,
>+                                                    const GLubyte *commands,
>+                                                    GLsizei numCoords,
>+                                                    GLenum coordType,
>+                                                    const void *coords)
>+{
>+    return gl::PathCommandsCHROMIUMContextANGLE(ctx, path, numCommands, commands, numCoords,
>+                                                coordType, coords);
>+}
>+
>+void GL_APIENTRY glPathParameterfCHROMIUMContextANGLE(GLeglContext ctx,
>+                                                      GLuint path,
>+                                                      GLenum pname,
>+                                                      GLfloat value)
>+{
>+    return gl::PathParameterfCHROMIUMContextANGLE(ctx, path, pname, value);
>+}
>+
>+void GL_APIENTRY glPathParameteriCHROMIUMContextANGLE(GLeglContext ctx,
>+                                                      GLuint path,
>+                                                      GLenum pname,
>+                                                      GLint value)
>+{
>+    return gl::PathParameteriCHROMIUMContextANGLE(ctx, path, pname, value);
>+}
>+
>+void GL_APIENTRY glGetPathParameterfvCHROMIUMContextANGLE(GLeglContext ctx,
>+                                                          GLuint path,
>+                                                          GLenum pname,
>+                                                          GLfloat *value)
>+{
>+    return gl::GetPathParameterfvCHROMIUMContextANGLE(ctx, path, pname, value);
>+}
>+
>+void GL_APIENTRY glGetPathParameterivCHROMIUMContextANGLE(GLeglContext ctx,
>+                                                          GLuint path,
>+                                                          GLenum pname,
>+                                                          GLint *value)
>+{
>+    return gl::GetPathParameterivCHROMIUMContextANGLE(ctx, path, pname, value);
>+}
>+
>+void GL_APIENTRY glPathStencilFuncCHROMIUMContextANGLE(GLeglContext ctx,
>+                                                       GLenum func,
>+                                                       GLint ref,
>+                                                       GLuint mask)
>+{
>+    return gl::PathStencilFuncCHROMIUMContextANGLE(ctx, func, ref, mask);
>+}
>+
>+void GL_APIENTRY glStencilFillPathCHROMIUMContextANGLE(GLeglContext ctx,
>+                                                       GLuint path,
>+                                                       GLenum fillMode,
>+                                                       GLuint mask)
>+{
>+    return gl::StencilFillPathCHROMIUMContextANGLE(ctx, path, fillMode, mask);
>+}
>+
>+void GL_APIENTRY glStencilStrokePathCHROMIUMContextANGLE(GLeglContext ctx,
>+                                                         GLuint path,
>+                                                         GLint reference,
>+                                                         GLuint mask)
>+{
>+    return gl::StencilStrokePathCHROMIUMContextANGLE(ctx, path, reference, mask);
>+}
>+
>+void GL_APIENTRY glCoverFillPathCHROMIUMContextANGLE(GLeglContext ctx,
>+                                                     GLuint path,
>+                                                     GLenum coverMode)
>+{
>+    return gl::CoverFillPathCHROMIUMContextANGLE(ctx, path, coverMode);
>+}
>+
>+void GL_APIENTRY glCoverStrokePathCHROMIUMContextANGLE(GLeglContext ctx,
>+                                                       GLuint path,
>+                                                       GLenum coverMode)
>+{
>+    return gl::CoverStrokePathCHROMIUMContextANGLE(ctx, path, coverMode);
>+}
>+
>+void GL_APIENTRY glStencilThenCoverFillPathCHROMIUMContextANGLE(GLeglContext ctx,
>+                                                                GLuint path,
>+                                                                GLenum fillMode,
>+                                                                GLuint mask,
>+                                                                GLenum coverMode)
>+{
>+    return gl::StencilThenCoverFillPathCHROMIUMContextANGLE(ctx, path, fillMode, mask, coverMode);
>+}
>+
>+void GL_APIENTRY glStencilThenCoverStrokePathCHROMIUMContextANGLE(GLeglContext ctx,
>+                                                                  GLuint path,
>+                                                                  GLint reference,
>+                                                                  GLuint mask,
>+                                                                  GLenum coverMode)
>+{
>+    return gl::StencilThenCoverStrokePathCHROMIUMContextANGLE(ctx, path, reference, mask,
>+                                                              coverMode);
>+}
>+
>+void GL_APIENTRY glCoverFillPathInstancedCHROMIUMContextANGLE(GLeglContext ctx,
>+                                                              GLsizei numPath,
>+                                                              GLenum pathNameType,
>+                                                              const void *paths,
>+                                                              GLuint pathBase,
>+                                                              GLenum coverMode,
>+                                                              GLenum transformType,
>+                                                              const GLfloat *transformValues)
>+{
>+    return gl::CoverFillPathInstancedCHROMIUMContextANGLE(
>+        ctx, numPath, pathNameType, paths, pathBase, coverMode, transformType, transformValues);
>+}
>+
>+void GL_APIENTRY glCoverStrokePathInstancedCHROMIUMContextANGLE(GLeglContext ctx,
>+                                                                GLsizei numPath,
>+                                                                GLenum pathNameType,
>+                                                                const void *paths,
>+                                                                GLuint pathBase,
>+                                                                GLenum coverMode,
>+                                                                GLenum transformType,
>+                                                                const GLfloat *transformValues)
>+{
>+    return gl::CoverStrokePathInstancedCHROMIUMContextANGLE(
>+        ctx, numPath, pathNameType, paths, pathBase, coverMode, transformType, transformValues);
>+}
>+
>+void GL_APIENTRY glStencilStrokePathInstancedCHROMIUMContextANGLE(GLeglContext ctx,
>+                                                                  GLsizei numPath,
>+                                                                  GLenum pathNameType,
>+                                                                  const void *paths,
>+                                                                  GLuint pathBase,
>+                                                                  GLint reference,
>+                                                                  GLuint mask,
>+                                                                  GLenum transformType,
>+                                                                  const GLfloat *transformValues)
>+{
>+    return gl::StencilStrokePathInstancedCHROMIUMContextANGLE(ctx, numPath, pathNameType, paths,
>+                                                              pathBase, reference, mask,
>+                                                              transformType, transformValues);
>+}
>+
>+void GL_APIENTRY glStencilFillPathInstancedCHROMIUMContextANGLE(GLeglContext ctx,
>+                                                                GLsizei numPaths,
>+                                                                GLenum pathNameType,
>+                                                                const void *paths,
>+                                                                GLuint pathBase,
>+                                                                GLenum fillMode,
>+                                                                GLuint mask,
>+                                                                GLenum transformType,
>+                                                                const GLfloat *transformValues)
>+{
>+    return gl::StencilFillPathInstancedCHROMIUMContextANGLE(ctx, numPaths, pathNameType, paths,
>+                                                            pathBase, fillMode, mask, transformType,
>+                                                            transformValues);
>+}
>+
>+void GL_APIENTRY
>+glStencilThenCoverFillPathInstancedCHROMIUMContextANGLE(GLeglContext ctx,
>+                                                        GLsizei numPaths,
>+                                                        GLenum pathNameType,
>+                                                        const void *paths,
>+                                                        GLuint pathBase,
>+                                                        GLenum fillMode,
>+                                                        GLuint mask,
>+                                                        GLenum coverMode,
>+                                                        GLenum transformType,
>+                                                        const GLfloat *transformValues)
>+{
>+    return gl::StencilThenCoverFillPathInstancedCHROMIUMContextANGLE(
>+        ctx, numPaths, pathNameType, paths, pathBase, fillMode, mask, coverMode, transformType,
>+        transformValues);
>+}
>+
>+void GL_APIENTRY
>+glStencilThenCoverStrokePathInstancedCHROMIUMContextANGLE(GLeglContext ctx,
>+                                                          GLsizei numPaths,
>+                                                          GLenum pathNameType,
>+                                                          const void *paths,
>+                                                          GLuint pathBase,
>+                                                          GLint reference,
>+                                                          GLuint mask,
>+                                                          GLenum coverMode,
>+                                                          GLenum transformType,
>+                                                          const GLfloat *transformValues)
>+{
>+    return gl::StencilThenCoverStrokePathInstancedCHROMIUMContextANGLE(
>+        ctx, numPaths, pathNameType, paths, pathBase, reference, mask, coverMode, transformType,
>+        transformValues);
>+}
>+
>+void GL_APIENTRY glBindFragmentInputLocationCHROMIUMContextANGLE(GLeglContext ctx,
>+                                                                 GLuint programs,
>+                                                                 GLint location,
>+                                                                 const GLchar *name)
>+{
>+    return gl::BindFragmentInputLocationCHROMIUMContextANGLE(ctx, programs, location, name);
>+}
>+
>+void GL_APIENTRY glProgramPathFragmentInputGenCHROMIUMContextANGLE(GLeglContext ctx,
>+                                                                   GLuint program,
>+                                                                   GLint location,
>+                                                                   GLenum genMode,
>+                                                                   GLint components,
>+                                                                   const GLfloat *coeffs)
>+{
>+    return gl::ProgramPathFragmentInputGenCHROMIUMContextANGLE(ctx, program, location, genMode,
>+                                                               components, coeffs);
>+}
>+
>+void GL_APIENTRY glCopyTextureCHROMIUMContextANGLE(GLeglContext ctx,
>+                                                   GLuint sourceId,
>+                                                   GLint sourceLevel,
>+                                                   GLenum destTarget,
>+                                                   GLuint destId,
>+                                                   GLint destLevel,
>+                                                   GLint internalFormat,
>+                                                   GLenum destType,
>+                                                   GLboolean unpackFlipY,
>+                                                   GLboolean unpackPremultiplyAlpha,
>+                                                   GLboolean unpackUnmultiplyAlpha)
>+{
>+    return gl::CopyTextureCHROMIUMContextANGLE(ctx, sourceId, sourceLevel, destTarget, destId,
>+                                               destLevel, internalFormat, destType, unpackFlipY,
>+                                               unpackPremultiplyAlpha, unpackUnmultiplyAlpha);
>+}
>+
>+void GL_APIENTRY glCopySubTextureCHROMIUMContextANGLE(GLeglContext ctx,
>+                                                      GLuint sourceId,
>+                                                      GLint sourceLevel,
>+                                                      GLenum destTarget,
>+                                                      GLuint destId,
>+                                                      GLint destLevel,
>+                                                      GLint xoffset,
>+                                                      GLint yoffset,
>+                                                      GLint x,
>+                                                      GLint y,
>+                                                      GLint width,
>+                                                      GLint height,
>+                                                      GLboolean unpackFlipY,
>+                                                      GLboolean unpackPremultiplyAlpha,
>+                                                      GLboolean unpackUnmultiplyAlpha)
>+{
>+    return gl::CopySubTextureCHROMIUMContextANGLE(
>+        ctx, sourceId, sourceLevel, destTarget, destId, destLevel, xoffset, yoffset, x, y, width,
>+        height, unpackFlipY, unpackPremultiplyAlpha, unpackUnmultiplyAlpha);
>+}
>+
>+void GL_APIENTRY glCompressedCopyTextureCHROMIUMContextANGLE(GLeglContext ctx,
>+                                                             GLuint sourceId,
>+                                                             GLuint destId)
>+{
>+    return gl::CompressedCopyTextureCHROMIUMContextANGLE(ctx, sourceId, destId);
>+}
>+
>+void GL_APIENTRY glRequestExtensionANGLEContextANGLE(GLeglContext ctx, const GLchar *name)
>+{
>+    return gl::RequestExtensionANGLEContextANGLE(ctx, name);
>+}
>+
>+void GL_APIENTRY glGetBooleanvRobustANGLEContextANGLE(GLeglContext ctx,
>+                                                      GLenum pname,
>+                                                      GLsizei bufSize,
>+                                                      GLsizei *length,
>+                                                      GLboolean *params)
>+{
>+    return gl::GetBooleanvRobustANGLEContextANGLE(ctx, pname, bufSize, length, params);
>+}
>+
>+void GL_APIENTRY glGetBufferParameterivRobustANGLEContextANGLE(GLeglContext ctx,
>+                                                               GLenum target,
>+                                                               GLenum pname,
>+                                                               GLsizei bufSize,
>+                                                               GLsizei *length,
>+                                                               GLint *params)
>+{
>+    return gl::GetBufferParameterivRobustANGLEContextANGLE(ctx, target, pname, bufSize, length,
>+                                                           params);
>+}
>+
>+void GL_APIENTRY glGetFloatvRobustANGLEContextANGLE(GLeglContext ctx,
>+                                                    GLenum pname,
>+                                                    GLsizei bufSize,
>+                                                    GLsizei *length,
>+                                                    GLfloat *params)
>+{
>+    return gl::GetFloatvRobustANGLEContextANGLE(ctx, pname, bufSize, length, params);
>+}
>+
>+void GL_APIENTRY glGetFramebufferAttachmentParameterivRobustANGLEContextANGLE(GLeglContext ctx,
>+                                                                              GLenum target,
>+                                                                              GLenum attachment,
>+                                                                              GLenum pname,
>+                                                                              GLsizei bufSize,
>+                                                                              GLsizei *length,
>+                                                                              GLint *params)
>+{
>+    return gl::GetFramebufferAttachmentParameterivRobustANGLEContextANGLE(
>+        ctx, target, attachment, pname, bufSize, length, params);
>+}
>+
>+void GL_APIENTRY glGetIntegervRobustANGLEContextANGLE(GLeglContext ctx,
>+                                                      GLenum pname,
>+                                                      GLsizei bufSize,
>+                                                      GLsizei *length,
>+                                                      GLint *data)
>+{
>+    return gl::GetIntegervRobustANGLEContextANGLE(ctx, pname, bufSize, length, data);
>+}
>+
>+void GL_APIENTRY glGetProgramivRobustANGLEContextANGLE(GLeglContext ctx,
>+                                                       GLuint program,
>+                                                       GLenum pname,
>+                                                       GLsizei bufSize,
>+                                                       GLsizei *length,
>+                                                       GLint *params)
>+{
>+    return gl::GetProgramivRobustANGLEContextANGLE(ctx, program, pname, bufSize, length, params);
>+}
>+
>+void GL_APIENTRY glGetRenderbufferParameterivRobustANGLEContextANGLE(GLeglContext ctx,
>+                                                                     GLenum target,
>+                                                                     GLenum pname,
>+                                                                     GLsizei bufSize,
>+                                                                     GLsizei *length,
>+                                                                     GLint *params)
>+{
>+    return gl::GetRenderbufferParameterivRobustANGLEContextANGLE(ctx, target, pname, bufSize,
>+                                                                 length, params);
>+}
>+
>+void GL_APIENTRY glGetShaderivRobustANGLEContextANGLE(GLeglContext ctx,
>+                                                      GLuint shader,
>+                                                      GLenum pname,
>+                                                      GLsizei bufSize,
>+                                                      GLsizei *length,
>+                                                      GLint *params)
>+{
>+    return gl::GetShaderivRobustANGLEContextANGLE(ctx, shader, pname, bufSize, length, params);
>+}
>+
>+void GL_APIENTRY glGetTexParameterfvRobustANGLEContextANGLE(GLeglContext ctx,
>+                                                            GLenum target,
>+                                                            GLenum pname,
>+                                                            GLsizei bufSize,
>+                                                            GLsizei *length,
>+                                                            GLfloat *params)
>+{
>+    return gl::GetTexParameterfvRobustANGLEContextANGLE(ctx, target, pname, bufSize, length,
>+                                                        params);
>+}
>+
>+void GL_APIENTRY glGetTexParameterivRobustANGLEContextANGLE(GLeglContext ctx,
>+                                                            GLenum target,
>+                                                            GLenum pname,
>+                                                            GLsizei bufSize,
>+                                                            GLsizei *length,
>+                                                            GLint *params)
>+{
>+    return gl::GetTexParameterivRobustANGLEContextANGLE(ctx, target, pname, bufSize, length,
>+                                                        params);
>+}
>+
>+void GL_APIENTRY glGetUniformfvRobustANGLEContextANGLE(GLeglContext ctx,
>+                                                       GLuint program,
>+                                                       GLint location,
>+                                                       GLsizei bufSize,
>+                                                       GLsizei *length,
>+                                                       GLfloat *params)
>+{
>+    return gl::GetUniformfvRobustANGLEContextANGLE(ctx, program, location, bufSize, length, params);
>+}
>+
>+void GL_APIENTRY glGetUniformivRobustANGLEContextANGLE(GLeglContext ctx,
>+                                                       GLuint program,
>+                                                       GLint location,
>+                                                       GLsizei bufSize,
>+                                                       GLsizei *length,
>+                                                       GLint *params)
>+{
>+    return gl::GetUniformivRobustANGLEContextANGLE(ctx, program, location, bufSize, length, params);
>+}
>+
>+void GL_APIENTRY glGetVertexAttribfvRobustANGLEContextANGLE(GLeglContext ctx,
>+                                                            GLuint index,
>+                                                            GLenum pname,
>+                                                            GLsizei bufSize,
>+                                                            GLsizei *length,
>+                                                            GLfloat *params)
>+{
>+    return gl::GetVertexAttribfvRobustANGLEContextANGLE(ctx, index, pname, bufSize, length, params);
>+}
>+
>+void GL_APIENTRY glGetVertexAttribivRobustANGLEContextANGLE(GLeglContext ctx,
>+                                                            GLuint index,
>+                                                            GLenum pname,
>+                                                            GLsizei bufSize,
>+                                                            GLsizei *length,
>+                                                            GLint *params)
>+{
>+    return gl::GetVertexAttribivRobustANGLEContextANGLE(ctx, index, pname, bufSize, length, params);
>+}
>+
>+void GL_APIENTRY glGetVertexAttribPointervRobustANGLEContextANGLE(GLeglContext ctx,
>+                                                                  GLuint index,
>+                                                                  GLenum pname,
>+                                                                  GLsizei bufSize,
>+                                                                  GLsizei *length,
>+                                                                  void **pointer)
>+{
>+    return gl::GetVertexAttribPointervRobustANGLEContextANGLE(ctx, index, pname, bufSize, length,
>+                                                              pointer);
>+}
>+
>+void GL_APIENTRY glReadPixelsRobustANGLEContextANGLE(GLeglContext ctx,
>+                                                     GLint x,
>+                                                     GLint y,
>+                                                     GLsizei width,
>+                                                     GLsizei height,
>+                                                     GLenum format,
>+                                                     GLenum type,
>+                                                     GLsizei bufSize,
>+                                                     GLsizei *length,
>+                                                     GLsizei *columns,
>+                                                     GLsizei *rows,
>+                                                     void *pixels)
>+{
>+    return gl::ReadPixelsRobustANGLEContextANGLE(ctx, x, y, width, height, format, type, bufSize,
>+                                                 length, columns, rows, pixels);
>+}
>+
>+void GL_APIENTRY glTexImage2DRobustANGLEContextANGLE(GLeglContext ctx,
>+                                                     GLenum target,
>+                                                     GLint level,
>+                                                     GLint internalformat,
>+                                                     GLsizei width,
>+                                                     GLsizei height,
>+                                                     GLint border,
>+                                                     GLenum format,
>+                                                     GLenum type,
>+                                                     GLsizei bufSize,
>+                                                     const void *pixels)
>+{
>+    return gl::TexImage2DRobustANGLEContextANGLE(ctx, target, level, internalformat, width, height,
>+                                                 border, format, type, bufSize, pixels);
>+}
>+
>+void GL_APIENTRY glTexParameterfvRobustANGLEContextANGLE(GLeglContext ctx,
>+                                                         GLenum target,
>+                                                         GLenum pname,
>+                                                         GLsizei bufSize,
>+                                                         const GLfloat *params)
>+{
>+    return gl::TexParameterfvRobustANGLEContextANGLE(ctx, target, pname, bufSize, params);
>+}
>+
>+void GL_APIENTRY glTexParameterivRobustANGLEContextANGLE(GLeglContext ctx,
>+                                                         GLenum target,
>+                                                         GLenum pname,
>+                                                         GLsizei bufSize,
>+                                                         const GLint *params)
>+{
>+    return gl::TexParameterivRobustANGLEContextANGLE(ctx, target, pname, bufSize, params);
>+}
>+
>+void GL_APIENTRY glTexSubImage2DRobustANGLEContextANGLE(GLeglContext ctx,
>+                                                        GLenum target,
>+                                                        GLint level,
>+                                                        GLint xoffset,
>+                                                        GLint yoffset,
>+                                                        GLsizei width,
>+                                                        GLsizei height,
>+                                                        GLenum format,
>+                                                        GLenum type,
>+                                                        GLsizei bufSize,
>+                                                        const void *pixels)
>+{
>+    return gl::TexSubImage2DRobustANGLEContextANGLE(ctx, target, level, xoffset, yoffset, width,
>+                                                    height, format, type, bufSize, pixels);
>+}
>+
>+void GL_APIENTRY glTexImage3DRobustANGLEContextANGLE(GLeglContext ctx,
>+                                                     GLenum target,
>+                                                     GLint level,
>+                                                     GLint internalformat,
>+                                                     GLsizei width,
>+                                                     GLsizei height,
>+                                                     GLsizei depth,
>+                                                     GLint border,
>+                                                     GLenum format,
>+                                                     GLenum type,
>+                                                     GLsizei bufSize,
>+                                                     const void *pixels)
>+{
>+    return gl::TexImage3DRobustANGLEContextANGLE(ctx, target, level, internalformat, width, height,
>+                                                 depth, border, format, type, bufSize, pixels);
>+}
>+
>+void GL_APIENTRY glTexSubImage3DRobustANGLEContextANGLE(GLeglContext ctx,
>+                                                        GLenum target,
>+                                                        GLint level,
>+                                                        GLint xoffset,
>+                                                        GLint yoffset,
>+                                                        GLint zoffset,
>+                                                        GLsizei width,
>+                                                        GLsizei height,
>+                                                        GLsizei depth,
>+                                                        GLenum format,
>+                                                        GLenum type,
>+                                                        GLsizei bufSize,
>+                                                        const void *pixels)
>+{
>+    return gl::TexSubImage3DRobustANGLEContextANGLE(ctx, target, level, xoffset, yoffset, zoffset,
>+                                                    width, height, depth, format, type, bufSize,
>+                                                    pixels);
>+}
>+
>+void GL_APIENTRY glCompressedTexImage2DRobustANGLEContextANGLE(GLeglContext ctx,
>+                                                               GLenum target,
>+                                                               GLint level,
>+                                                               GLenum internalformat,
>+                                                               GLsizei width,
>+                                                               GLsizei height,
>+                                                               GLint border,
>+                                                               GLsizei imageSize,
>+                                                               GLsizei dataSize,
>+                                                               const GLvoid *data)
>+{
>+    return gl::CompressedTexImage2DRobustANGLEContextANGLE(
>+        ctx, target, level, internalformat, width, height, border, imageSize, dataSize, data);
>+}
>+
>+void GL_APIENTRY glCompressedTexSubImage2DRobustANGLEContextANGLE(GLeglContext ctx,
>+                                                                  GLenum target,
>+                                                                  GLint level,
>+                                                                  GLsizei xoffset,
>+                                                                  GLsizei yoffset,
>+                                                                  GLsizei width,
>+                                                                  GLsizei height,
>+                                                                  GLenum format,
>+                                                                  GLsizei imageSize,
>+                                                                  GLsizei dataSize,
>+                                                                  const GLvoid *data)
>+{
>+    return gl::CompressedTexSubImage2DRobustANGLEContextANGLE(
>+        ctx, target, level, xoffset, yoffset, width, height, format, imageSize, dataSize, data);
>+}
>+
>+void GL_APIENTRY glCompressedTexImage3DRobustANGLEContextANGLE(GLeglContext ctx,
>+                                                               GLenum target,
>+                                                               GLint level,
>+                                                               GLenum internalformat,
>+                                                               GLsizei width,
>+                                                               GLsizei height,
>+                                                               GLsizei depth,
>+                                                               GLint border,
>+                                                               GLsizei imageSize,
>+                                                               GLsizei dataSize,
>+                                                               const GLvoid *data)
>+{
>+    return gl::CompressedTexImage3DRobustANGLEContextANGLE(ctx, target, level, internalformat,
>+                                                           width, height, depth, border, imageSize,
>+                                                           dataSize, data);
>+}
>+
>+void GL_APIENTRY glCompressedTexSubImage3DRobustANGLEContextANGLE(GLeglContext ctx,
>+                                                                  GLenum target,
>+                                                                  GLint level,
>+                                                                  GLint xoffset,
>+                                                                  GLint yoffset,
>+                                                                  GLint zoffset,
>+                                                                  GLsizei width,
>+                                                                  GLsizei height,
>+                                                                  GLsizei depth,
>+                                                                  GLenum format,
>+                                                                  GLsizei imageSize,
>+                                                                  GLsizei dataSize,
>+                                                                  const GLvoid *data)
>+{
>+    return gl::CompressedTexSubImage3DRobustANGLEContextANGLE(ctx, target, level, xoffset, yoffset,
>+                                                              zoffset, width, height, depth, format,
>+                                                              imageSize, dataSize, data);
>+}
>+
>+void GL_APIENTRY glGetQueryivRobustANGLEContextANGLE(GLeglContext ctx,
>+                                                     GLenum target,
>+                                                     GLenum pname,
>+                                                     GLsizei bufSize,
>+                                                     GLsizei *length,
>+                                                     GLint *params)
>+{
>+    return gl::GetQueryivRobustANGLEContextANGLE(ctx, target, pname, bufSize, length, params);
>+}
>+
>+void GL_APIENTRY glGetQueryObjectuivRobustANGLEContextANGLE(GLeglContext ctx,
>+                                                            GLuint id,
>+                                                            GLenum pname,
>+                                                            GLsizei bufSize,
>+                                                            GLsizei *length,
>+                                                            GLuint *params)
>+{
>+    return gl::GetQueryObjectuivRobustANGLEContextANGLE(ctx, id, pname, bufSize, length, params);
>+}
>+
>+void GL_APIENTRY glGetBufferPointervRobustANGLEContextANGLE(GLeglContext ctx,
>+                                                            GLenum target,
>+                                                            GLenum pname,
>+                                                            GLsizei bufSize,
>+                                                            GLsizei *length,
>+                                                            void **params)
>+{
>+    return gl::GetBufferPointervRobustANGLEContextANGLE(ctx, target, pname, bufSize, length,
>+                                                        params);
>+}
>+
>+void GL_APIENTRY glGetIntegeri_vRobustANGLEContextANGLE(GLeglContext ctx,
>+                                                        GLenum target,
>+                                                        GLuint index,
>+                                                        GLsizei bufSize,
>+                                                        GLsizei *length,
>+                                                        GLint *data)
>+{
>+    return gl::GetIntegeri_vRobustANGLEContextANGLE(ctx, target, index, bufSize, length, data);
>+}
>+
>+void GL_APIENTRY glGetInternalformativRobustANGLEContextANGLE(GLeglContext ctx,
>+                                                              GLenum target,
>+                                                              GLenum internalformat,
>+                                                              GLenum pname,
>+                                                              GLsizei bufSize,
>+                                                              GLsizei *length,
>+                                                              GLint *params)
>+{
>+    return gl::GetInternalformativRobustANGLEContextANGLE(ctx, target, internalformat, pname,
>+                                                          bufSize, length, params);
>+}
>+
>+void GL_APIENTRY glGetVertexAttribIivRobustANGLEContextANGLE(GLeglContext ctx,
>+                                                             GLuint index,
>+                                                             GLenum pname,
>+                                                             GLsizei bufSize,
>+                                                             GLsizei *length,
>+                                                             GLint *params)
>+{
>+    return gl::GetVertexAttribIivRobustANGLEContextANGLE(ctx, index, pname, bufSize, length,
>+                                                         params);
>+}
>+
>+void GL_APIENTRY glGetVertexAttribIuivRobustANGLEContextANGLE(GLeglContext ctx,
>+                                                              GLuint index,
>+                                                              GLenum pname,
>+                                                              GLsizei bufSize,
>+                                                              GLsizei *length,
>+                                                              GLuint *params)
>+{
>+    return gl::GetVertexAttribIuivRobustANGLEContextANGLE(ctx, index, pname, bufSize, length,
>+                                                          params);
>+}
>+
>+void GL_APIENTRY glGetUniformuivRobustANGLEContextANGLE(GLeglContext ctx,
>+                                                        GLuint program,
>+                                                        GLint location,
>+                                                        GLsizei bufSize,
>+                                                        GLsizei *length,
>+                                                        GLuint *params)
>+{
>+    return gl::GetUniformuivRobustANGLEContextANGLE(ctx, program, location, bufSize, length,
>+                                                    params);
>+}
>+
>+void GL_APIENTRY glGetActiveUniformBlockivRobustANGLEContextANGLE(GLeglContext ctx,
>+                                                                  GLuint program,
>+                                                                  GLuint uniformBlockIndex,
>+                                                                  GLenum pname,
>+                                                                  GLsizei bufSize,
>+                                                                  GLsizei *length,
>+                                                                  GLint *params)
>+{
>+    return gl::GetActiveUniformBlockivRobustANGLEContextANGLE(ctx, program, uniformBlockIndex,
>+                                                              pname, bufSize, length, params);
>+}
>+
>+void GL_APIENTRY glGetInteger64vRobustANGLEContextANGLE(GLeglContext ctx,
>+                                                        GLenum pname,
>+                                                        GLsizei bufSize,
>+                                                        GLsizei *length,
>+                                                        GLint64 *data)
>+{
>+    return gl::GetInteger64vRobustANGLEContextANGLE(ctx, pname, bufSize, length, data);
>+}
>+
>+void GL_APIENTRY glGetInteger64i_vRobustANGLEContextANGLE(GLeglContext ctx,
>+                                                          GLenum target,
>+                                                          GLuint index,
>+                                                          GLsizei bufSize,
>+                                                          GLsizei *length,
>+                                                          GLint64 *data)
>+{
>+    return gl::GetInteger64i_vRobustANGLEContextANGLE(ctx, target, index, bufSize, length, data);
>+}
>+
>+void GL_APIENTRY glGetBufferParameteri64vRobustANGLEContextANGLE(GLeglContext ctx,
>+                                                                 GLenum target,
>+                                                                 GLenum pname,
>+                                                                 GLsizei bufSize,
>+                                                                 GLsizei *length,
>+                                                                 GLint64 *params)
>+{
>+    return gl::GetBufferParameteri64vRobustANGLEContextANGLE(ctx, target, pname, bufSize, length,
>+                                                             params);
>+}
>+
>+void GL_APIENTRY glSamplerParameterivRobustANGLEContextANGLE(GLeglContext ctx,
>+                                                             GLuint sampler,
>+                                                             GLuint pname,
>+                                                             GLsizei bufSize,
>+                                                             const GLint *param)
>+{
>+    return gl::SamplerParameterivRobustANGLEContextANGLE(ctx, sampler, pname, bufSize, param);
>+}
>+
>+void GL_APIENTRY glSamplerParameterfvRobustANGLEContextANGLE(GLeglContext ctx,
>+                                                             GLuint sampler,
>+                                                             GLenum pname,
>+                                                             GLsizei bufSize,
>+                                                             const GLfloat *param)
>+{
>+    return gl::SamplerParameterfvRobustANGLEContextANGLE(ctx, sampler, pname, bufSize, param);
>+}
>+
>+void GL_APIENTRY glGetSamplerParameterivRobustANGLEContextANGLE(GLeglContext ctx,
>+                                                                GLuint sampler,
>+                                                                GLenum pname,
>+                                                                GLsizei bufSize,
>+                                                                GLsizei *length,
>+                                                                GLint *params)
>+{
>+    return gl::GetSamplerParameterivRobustANGLEContextANGLE(ctx, sampler, pname, bufSize, length,
>+                                                            params);
>+}
>+
>+void GL_APIENTRY glGetSamplerParameterfvRobustANGLEContextANGLE(GLeglContext ctx,
>+                                                                GLuint sampler,
>+                                                                GLenum pname,
>+                                                                GLsizei bufSize,
>+                                                                GLsizei *length,
>+                                                                GLfloat *params)
>+{
>+    return gl::GetSamplerParameterfvRobustANGLEContextANGLE(ctx, sampler, pname, bufSize, length,
>+                                                            params);
>+}
>+
>+void GL_APIENTRY glGetFramebufferParameterivRobustANGLEContextANGLE(GLeglContext ctx,
>+                                                                    GLuint sampler,
>+                                                                    GLenum pname,
>+                                                                    GLsizei bufSize,
>+                                                                    GLsizei *length,
>+                                                                    GLint *params)
>+{
>+    return gl::GetFramebufferParameterivRobustANGLEContextANGLE(ctx, sampler, pname, bufSize,
>+                                                                length, params);
>+}
>+
>+void GL_APIENTRY glGetProgramInterfaceivRobustANGLEContextANGLE(GLeglContext ctx,
>+                                                                GLuint program,
>+                                                                GLenum programInterface,
>+                                                                GLenum pname,
>+                                                                GLsizei bufSize,
>+                                                                GLsizei *length,
>+                                                                GLint *params)
>+{
>+    return gl::GetProgramInterfaceivRobustANGLEContextANGLE(ctx, program, programInterface, pname,
>+                                                            bufSize, length, params);
>+}
>+
>+void GL_APIENTRY glGetBooleani_vRobustANGLEContextANGLE(GLeglContext ctx,
>+                                                        GLenum target,
>+                                                        GLuint index,
>+                                                        GLsizei bufSize,
>+                                                        GLsizei *length,
>+                                                        GLboolean *data)
>+{
>+    return gl::GetBooleani_vRobustANGLEContextANGLE(ctx, target, index, bufSize, length, data);
>+}
>+
>+void GL_APIENTRY glGetMultisamplefvRobustANGLEContextANGLE(GLeglContext ctx,
>+                                                           GLenum pname,
>+                                                           GLuint index,
>+                                                           GLsizei bufSize,
>+                                                           GLsizei *length,
>+                                                           GLfloat *val)
>+{
>+    return gl::GetMultisamplefvRobustANGLEContextANGLE(ctx, pname, index, bufSize, length, val);
>+}
>+
>+void GL_APIENTRY glGetTexLevelParameterivRobustANGLEContextANGLE(GLeglContext ctx,
>+                                                                 GLenum target,
>+                                                                 GLint level,
>+                                                                 GLenum pname,
>+                                                                 GLsizei bufSize,
>+                                                                 GLsizei *length,
>+                                                                 GLint *params)
>+{
>+    return gl::GetTexLevelParameterivRobustANGLEContextANGLE(ctx, target, level, pname, bufSize,
>+                                                             length, params);
>+}
>+
>+void GL_APIENTRY glGetTexLevelParameterfvRobustANGLEContextANGLE(GLeglContext ctx,
>+                                                                 GLenum target,
>+                                                                 GLint level,
>+                                                                 GLenum pname,
>+                                                                 GLsizei bufSize,
>+                                                                 GLsizei *length,
>+                                                                 GLfloat *params)
>+{
>+    return gl::GetTexLevelParameterfvRobustANGLEContextANGLE(ctx, target, level, pname, bufSize,
>+                                                             length, params);
>+}
>+
>+void GL_APIENTRY glGetPointervRobustANGLERobustANGLEContextANGLE(GLeglContext ctx,
>+                                                                 GLenum pname,
>+                                                                 GLsizei bufSize,
>+                                                                 GLsizei *length,
>+                                                                 void **params)
>+{
>+    return gl::GetPointervRobustANGLERobustANGLEContextANGLE(ctx, pname, bufSize, length, params);
>+}
>+
>+void GL_APIENTRY glReadnPixelsRobustANGLEContextANGLE(GLeglContext ctx,
>+                                                      GLint x,
>+                                                      GLint y,
>+                                                      GLsizei width,
>+                                                      GLsizei height,
>+                                                      GLenum format,
>+                                                      GLenum type,
>+                                                      GLsizei bufSize,
>+                                                      GLsizei *length,
>+                                                      GLsizei *columns,
>+                                                      GLsizei *rows,
>+                                                      void *data)
>+{
>+    return gl::ReadnPixelsRobustANGLEContextANGLE(ctx, x, y, width, height, format, type, bufSize,
>+                                                  length, columns, rows, data);
>+}
>+
>+void GL_APIENTRY glGetnUniformfvRobustANGLEContextANGLE(GLeglContext ctx,
>+                                                        GLuint program,
>+                                                        GLint location,
>+                                                        GLsizei bufSize,
>+                                                        GLsizei *length,
>+                                                        GLfloat *params)
>+{
>+    return gl::GetnUniformfvRobustANGLEContextANGLE(ctx, program, location, bufSize, length,
>+                                                    params);
>+}
>+
>+void GL_APIENTRY glGetnUniformivRobustANGLEContextANGLE(GLeglContext ctx,
>+                                                        GLuint program,
>+                                                        GLint location,
>+                                                        GLsizei bufSize,
>+                                                        GLsizei *length,
>+                                                        GLint *params)
>+{
>+    return gl::GetnUniformivRobustANGLEContextANGLE(ctx, program, location, bufSize, length,
>+                                                    params);
>+}
>+
>+void GL_APIENTRY glGetnUniformuivRobustANGLEContextANGLE(GLeglContext ctx,
>+                                                         GLuint program,
>+                                                         GLint location,
>+                                                         GLsizei bufSize,
>+                                                         GLsizei *length,
>+                                                         GLuint *params)
>+{
>+    return gl::GetnUniformuivRobustANGLEContextANGLE(ctx, program, location, bufSize, length,
>+                                                     params);
>+}
>+
>+void GL_APIENTRY glTexParameterIivRobustANGLEContextANGLE(GLeglContext ctx,
>+                                                          GLenum target,
>+                                                          GLenum pname,
>+                                                          GLsizei bufSize,
>+                                                          const GLint *params)
>+{
>+    return gl::TexParameterIivRobustANGLEContextANGLE(ctx, target, pname, bufSize, params);
>+}
>+
>+void GL_APIENTRY glTexParameterIuivRobustANGLEContextANGLE(GLeglContext ctx,
>+                                                           GLenum target,
>+                                                           GLenum pname,
>+                                                           GLsizei bufSize,
>+                                                           const GLuint *params)
>+{
>+    return gl::TexParameterIuivRobustANGLEContextANGLE(ctx, target, pname, bufSize, params);
>+}
>+
>+void GL_APIENTRY glGetTexParameterIivRobustANGLEContextANGLE(GLeglContext ctx,
>+                                                             GLenum target,
>+                                                             GLenum pname,
>+                                                             GLsizei bufSize,
>+                                                             GLsizei *length,
>+                                                             GLint *params)
>+{
>+    return gl::GetTexParameterIivRobustANGLEContextANGLE(ctx, target, pname, bufSize, length,
>+                                                         params);
>+}
>+
>+void GL_APIENTRY glGetTexParameterIuivRobustANGLEContextANGLE(GLeglContext ctx,
>+                                                              GLenum target,
>+                                                              GLenum pname,
>+                                                              GLsizei bufSize,
>+                                                              GLsizei *length,
>+                                                              GLuint *params)
>+{
>+    return gl::GetTexParameterIuivRobustANGLEContextANGLE(ctx, target, pname, bufSize, length,
>+                                                          params);
>+}
>+
>+void GL_APIENTRY glSamplerParameterIivRobustANGLEContextANGLE(GLeglContext ctx,
>+                                                              GLuint sampler,
>+                                                              GLenum pname,
>+                                                              GLsizei bufSize,
>+                                                              const GLint *param)
>+{
>+    return gl::SamplerParameterIivRobustANGLEContextANGLE(ctx, sampler, pname, bufSize, param);
>+}
>+
>+void GL_APIENTRY glSamplerParameterIuivRobustANGLEContextANGLE(GLeglContext ctx,
>+                                                               GLuint sampler,
>+                                                               GLenum pname,
>+                                                               GLsizei bufSize,
>+                                                               const GLuint *param)
>+{
>+    return gl::SamplerParameterIuivRobustANGLEContextANGLE(ctx, sampler, pname, bufSize, param);
>+}
>+
>+void GL_APIENTRY glGetSamplerParameterIivRobustANGLEContextANGLE(GLeglContext ctx,
>+                                                                 GLuint sampler,
>+                                                                 GLenum pname,
>+                                                                 GLsizei bufSize,
>+                                                                 GLsizei *length,
>+                                                                 GLint *params)
>+{
>+    return gl::GetSamplerParameterIivRobustANGLEContextANGLE(ctx, sampler, pname, bufSize, length,
>+                                                             params);
>+}
>+
>+void GL_APIENTRY glGetSamplerParameterIuivRobustANGLEContextANGLE(GLeglContext ctx,
>+                                                                  GLuint sampler,
>+                                                                  GLenum pname,
>+                                                                  GLsizei bufSize,
>+                                                                  GLsizei *length,
>+                                                                  GLuint *params)
>+{
>+    return gl::GetSamplerParameterIuivRobustANGLEContextANGLE(ctx, sampler, pname, bufSize, length,
>+                                                              params);
>+}
>+
>+void GL_APIENTRY glGetQueryObjectivRobustANGLEContextANGLE(GLeglContext ctx,
>+                                                           GLuint id,
>+                                                           GLenum pname,
>+                                                           GLsizei bufSize,
>+                                                           GLsizei *length,
>+                                                           GLint *params)
>+{
>+    return gl::GetQueryObjectivRobustANGLEContextANGLE(ctx, id, pname, bufSize, length, params);
>+}
>+
>+void GL_APIENTRY glGetQueryObjecti64vRobustANGLEContextANGLE(GLeglContext ctx,
>+                                                             GLuint id,
>+                                                             GLenum pname,
>+                                                             GLsizei bufSize,
>+                                                             GLsizei *length,
>+                                                             GLint64 *params)
>+{
>+    return gl::GetQueryObjecti64vRobustANGLEContextANGLE(ctx, id, pname, bufSize, length, params);
>+}
>+
>+void GL_APIENTRY glGetQueryObjectui64vRobustANGLEContextANGLE(GLeglContext ctx,
>+                                                              GLuint id,
>+                                                              GLenum pname,
>+                                                              GLsizei bufSize,
>+                                                              GLsizei *length,
>+                                                              GLuint64 *params)
>+{
>+    return gl::GetQueryObjectui64vRobustANGLEContextANGLE(ctx, id, pname, bufSize, length, params);
>+}
>+
>+void GL_APIENTRY glCopyTexture3DANGLEContextANGLE(GLeglContext ctx,
>+                                                  GLuint sourceId,
>+                                                  GLint sourceLevel,
>+                                                  GLenum destTarget,
>+                                                  GLuint destId,
>+                                                  GLint destLevel,
>+                                                  GLint internalFormat,
>+                                                  GLenum destType,
>+                                                  GLboolean unpackFlipY,
>+                                                  GLboolean unpackPremultiplyAlpha,
>+                                                  GLboolean unpackUnmultiplyAlpha)
>+{
>+    return gl::CopyTexture3DANGLEContextANGLE(ctx, sourceId, sourceLevel, destTarget, destId,
>+                                              destLevel, internalFormat, destType, unpackFlipY,
>+                                              unpackPremultiplyAlpha, unpackUnmultiplyAlpha);
>+}
>+
>+void GL_APIENTRY glCopySubTexture3DANGLEContextANGLE(GLeglContext ctx,
>+                                                     GLuint sourceId,
>+                                                     GLint sourceLevel,
>+                                                     GLenum destTarget,
>+                                                     GLuint destId,
>+                                                     GLint destLevel,
>+                                                     GLint xoffset,
>+                                                     GLint yoffset,
>+                                                     GLint zoffset,
>+                                                     GLint x,
>+                                                     GLint y,
>+                                                     GLint z,
>+                                                     GLint width,
>+                                                     GLint height,
>+                                                     GLint depth,
>+                                                     GLboolean unpackFlipY,
>+                                                     GLboolean unpackPremultiplyAlpha,
>+                                                     GLboolean unpackUnmultiplyAlpha)
>+{
>+    return gl::CopySubTexture3DANGLEContextANGLE(
>+        ctx, sourceId, sourceLevel, destTarget, destId, destLevel, xoffset, yoffset, zoffset, x, y,
>+        z, width, height, depth, unpackFlipY, unpackPremultiplyAlpha, unpackUnmultiplyAlpha);
>+}
>+
>+void GL_APIENTRY glTexStorage2DMultisampleANGLEContextANGLE(GLeglContext ctx,
>+                                                            GLenum target,
>+                                                            GLsizei samples,
>+                                                            GLenum internalformat,
>+                                                            GLsizei width,
>+                                                            GLsizei height,
>+                                                            GLboolean fixedsamplelocations)
>+{
>+    return gl::TexStorage2DMultisampleANGLEContextANGLE(ctx, target, samples, internalformat, width,
>+                                                        height, fixedsamplelocations);
>+}
>+
>+void GL_APIENTRY glGetTexLevelParameterivANGLEContextANGLE(GLeglContext ctx,
>+                                                           GLenum target,
>+                                                           GLint level,
>+                                                           GLenum pname,
>+                                                           GLint *params)
>+{
>+    return gl::GetTexLevelParameterivANGLEContextANGLE(ctx, target, level, pname, params);
>+}
>+
>+void GL_APIENTRY glGetTexLevelParameterfvANGLEContextANGLE(GLeglContext ctx,
>+                                                           GLenum target,
>+                                                           GLint level,
>+                                                           GLenum pname,
>+                                                           GLfloat *params)
>+{
>+    return gl::GetTexLevelParameterfvANGLEContextANGLE(ctx, target, level, pname, params);
>+}
>+
>+void GL_APIENTRY glMultiDrawArraysANGLEContextANGLE(GLeglContext ctx,
>+                                                    GLenum mode,
>+                                                    const GLint *firsts,
>+                                                    const GLsizei *counts,
>+                                                    GLsizei drawcount)
>+{
>+    return gl::MultiDrawArraysANGLEContextANGLE(ctx, mode, firsts, counts, drawcount);
>+}
>+
>+void GL_APIENTRY glMultiDrawArraysInstancedANGLEContextANGLE(GLeglContext ctx,
>+                                                             GLenum mode,
>+                                                             const GLint *firsts,
>+                                                             const GLsizei *counts,
>+                                                             const GLsizei *instanceCounts,
>+                                                             GLsizei drawcount)
>+{
>+    return gl::MultiDrawArraysInstancedANGLEContextANGLE(ctx, mode, firsts, counts, instanceCounts,
>+                                                         drawcount);
>+}
>+
>+void GL_APIENTRY glMultiDrawElementsANGLEContextANGLE(GLeglContext ctx,
>+                                                      GLenum mode,
>+                                                      const GLsizei *counts,
>+                                                      GLenum type,
>+                                                      const GLvoid *const *indices,
>+                                                      GLsizei drawcount)
>+{
>+    return gl::MultiDrawElementsANGLEContextANGLE(ctx, mode, counts, type, indices, drawcount);
>+}
>+
>+void GL_APIENTRY glMultiDrawElementsInstancedANGLEContextANGLE(GLeglContext ctx,
>+                                                               GLenum mode,
>+                                                               const GLsizei *counts,
>+                                                               GLenum type,
>+                                                               const GLvoid *const *indices,
>+                                                               const GLsizei *instanceCounts,
>+                                                               GLsizei drawcount)
>+{
>+    return gl::MultiDrawElementsInstancedANGLEContextANGLE(ctx, mode, counts, type, indices,
>+                                                           instanceCounts, drawcount);
>+}
>+
>+void GL_APIENTRY glGetMultisamplefvANGLEContextANGLE(GLeglContext ctx,
>+                                                     GLenum pname,
>+                                                     GLuint index,
>+                                                     GLfloat *val)
>+{
>+    return gl::GetMultisamplefvANGLEContextANGLE(ctx, pname, index, val);
>+}
>+
>+void GL_APIENTRY glSampleMaskiANGLEContextANGLE(GLeglContext ctx,
>+                                                GLuint maskNumber,
>+                                                GLbitfield mask)
>+{
>+    return gl::SampleMaskiANGLEContextANGLE(ctx, maskNumber, mask);
>+}
>+
>+void GL_APIENTRY glProvokingVertexANGLEContextANGLE(GLeglContext ctx, GLenum mode)
>+{
>+    return gl::ProvokingVertexANGLEContextANGLE(ctx, mode);
>+}
>+
>+void GL_APIENTRY glLoseContextCHROMIUMContextANGLE(GLeglContext ctx, GLenum current, GLenum other)
>+{
>+    return gl::LoseContextCHROMIUMContextANGLE(ctx, current, other);
>+}
>+
>+}  // extern "C"
>diff --git a/Source/ThirdParty/ANGLE/src/libGLESv2/libGLESv2_autogen.def b/Source/ThirdParty/ANGLE/src/libGLESv2/libGLESv2_autogen.def
>new file mode 100644
>index 00000000000..5f33d74b67f
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/libGLESv2/libGLESv2_autogen.def
>@@ -0,0 +1,1542 @@
>+; GENERATED FILE - DO NOT EDIT.
>+; Generated by generate_entry_points.py using data from Khronos and ANGLE XML files.
>+;
>+; Copyright 2019 The ANGLE Project Authors. All rights reserved.
>+; Use of this source code is governed by a BSD-style license that can be
>+; found in the LICENSE file.
>+LIBRARY libGLESv2
>+EXPORTS
>+
>+    ; OpenGL ES 2.0
>+    glActiveTexture
>+    glAttachShader
>+    glBindAttribLocation
>+    glBindBuffer
>+    glBindFramebuffer
>+    glBindRenderbuffer
>+    glBindTexture
>+    glBlendColor
>+    glBlendEquation
>+    glBlendEquationSeparate
>+    glBlendFunc
>+    glBlendFuncSeparate
>+    glBufferData
>+    glBufferSubData
>+    glCheckFramebufferStatus
>+    glClear
>+    glClearColor
>+    glClearDepthf
>+    glClearStencil
>+    glColorMask
>+    glCompileShader
>+    glCompressedTexImage2D
>+    glCompressedTexSubImage2D
>+    glCopyTexImage2D
>+    glCopyTexSubImage2D
>+    glCreateProgram
>+    glCreateShader
>+    glCullFace
>+    glDeleteBuffers
>+    glDeleteFramebuffers
>+    glDeleteProgram
>+    glDeleteRenderbuffers
>+    glDeleteShader
>+    glDeleteTextures
>+    glDepthFunc
>+    glDepthMask
>+    glDepthRangef
>+    glDetachShader
>+    glDisable
>+    glDisableVertexAttribArray
>+    glDrawArrays
>+    glDrawElements
>+    glEnable
>+    glEnableVertexAttribArray
>+    glFinish
>+    glFlush
>+    glFramebufferRenderbuffer
>+    glFramebufferTexture2D
>+    glFrontFace
>+    glGenBuffers
>+    glGenFramebuffers
>+    glGenRenderbuffers
>+    glGenTextures
>+    glGenerateMipmap
>+    glGetActiveAttrib
>+    glGetActiveUniform
>+    glGetAttachedShaders
>+    glGetAttribLocation
>+    glGetBooleanv
>+    glGetBufferParameteriv
>+    glGetError
>+    glGetFloatv
>+    glGetFramebufferAttachmentParameteriv
>+    glGetIntegerv
>+    glGetProgramInfoLog
>+    glGetProgramiv
>+    glGetRenderbufferParameteriv
>+    glGetShaderInfoLog
>+    glGetShaderPrecisionFormat
>+    glGetShaderSource
>+    glGetShaderiv
>+    glGetString
>+    glGetTexParameterfv
>+    glGetTexParameteriv
>+    glGetUniformLocation
>+    glGetUniformfv
>+    glGetUniformiv
>+    glGetVertexAttribPointerv
>+    glGetVertexAttribfv
>+    glGetVertexAttribiv
>+    glHint
>+    glIsBuffer
>+    glIsEnabled
>+    glIsFramebuffer
>+    glIsProgram
>+    glIsRenderbuffer
>+    glIsShader
>+    glIsTexture
>+    glLineWidth
>+    glLinkProgram
>+    glPixelStorei
>+    glPolygonOffset
>+    glReadPixels
>+    glReleaseShaderCompiler
>+    glRenderbufferStorage
>+    glSampleCoverage
>+    glScissor
>+    glShaderBinary
>+    glShaderSource
>+    glStencilFunc
>+    glStencilFuncSeparate
>+    glStencilMask
>+    glStencilMaskSeparate
>+    glStencilOp
>+    glStencilOpSeparate
>+    glTexImage2D
>+    glTexParameterf
>+    glTexParameterfv
>+    glTexParameteri
>+    glTexParameteriv
>+    glTexSubImage2D
>+    glUniform1f
>+    glUniform1fv
>+    glUniform1i
>+    glUniform1iv
>+    glUniform2f
>+    glUniform2fv
>+    glUniform2i
>+    glUniform2iv
>+    glUniform3f
>+    glUniform3fv
>+    glUniform3i
>+    glUniform3iv
>+    glUniform4f
>+    glUniform4fv
>+    glUniform4i
>+    glUniform4iv
>+    glUniformMatrix2fv
>+    glUniformMatrix3fv
>+    glUniformMatrix4fv
>+    glUseProgram
>+    glValidateProgram
>+    glVertexAttrib1f
>+    glVertexAttrib1fv
>+    glVertexAttrib2f
>+    glVertexAttrib2fv
>+    glVertexAttrib3f
>+    glVertexAttrib3fv
>+    glVertexAttrib4f
>+    glVertexAttrib4fv
>+    glVertexAttribPointer
>+    glViewport
>+
>+    ; OpenGL ES 3.0
>+    glBeginQuery
>+    glBeginTransformFeedback
>+    glBindBufferBase
>+    glBindBufferRange
>+    glBindSampler
>+    glBindTransformFeedback
>+    glBindVertexArray
>+    glBlitFramebuffer
>+    glClearBufferfi
>+    glClearBufferfv
>+    glClearBufferiv
>+    glClearBufferuiv
>+    glClientWaitSync
>+    glCompressedTexImage3D
>+    glCompressedTexSubImage3D
>+    glCopyBufferSubData
>+    glCopyTexSubImage3D
>+    glDeleteQueries
>+    glDeleteSamplers
>+    glDeleteSync
>+    glDeleteTransformFeedbacks
>+    glDeleteVertexArrays
>+    glDrawArraysInstanced
>+    glDrawBuffers
>+    glDrawElementsInstanced
>+    glDrawRangeElements
>+    glEndQuery
>+    glEndTransformFeedback
>+    glFenceSync
>+    glFlushMappedBufferRange
>+    glFramebufferTextureLayer
>+    glGenQueries
>+    glGenSamplers
>+    glGenTransformFeedbacks
>+    glGenVertexArrays
>+    glGetActiveUniformBlockName
>+    glGetActiveUniformBlockiv
>+    glGetActiveUniformsiv
>+    glGetBufferParameteri64v
>+    glGetBufferPointerv
>+    glGetFragDataLocation
>+    glGetInteger64i_v
>+    glGetInteger64v
>+    glGetIntegeri_v
>+    glGetInternalformativ
>+    glGetProgramBinary
>+    glGetQueryObjectuiv
>+    glGetQueryiv
>+    glGetSamplerParameterfv
>+    glGetSamplerParameteriv
>+    glGetStringi
>+    glGetSynciv
>+    glGetTransformFeedbackVarying
>+    glGetUniformBlockIndex
>+    glGetUniformIndices
>+    glGetUniformuiv
>+    glGetVertexAttribIiv
>+    glGetVertexAttribIuiv
>+    glInvalidateFramebuffer
>+    glInvalidateSubFramebuffer
>+    glIsQuery
>+    glIsSampler
>+    glIsSync
>+    glIsTransformFeedback
>+    glIsVertexArray
>+    glMapBufferRange
>+    glPauseTransformFeedback
>+    glProgramBinary
>+    glProgramParameteri
>+    glReadBuffer
>+    glRenderbufferStorageMultisample
>+    glResumeTransformFeedback
>+    glSamplerParameterf
>+    glSamplerParameterfv
>+    glSamplerParameteri
>+    glSamplerParameteriv
>+    glTexImage3D
>+    glTexStorage2D
>+    glTexStorage3D
>+    glTexSubImage3D
>+    glTransformFeedbackVaryings
>+    glUniform1ui
>+    glUniform1uiv
>+    glUniform2ui
>+    glUniform2uiv
>+    glUniform3ui
>+    glUniform3uiv
>+    glUniform4ui
>+    glUniform4uiv
>+    glUniformBlockBinding
>+    glUniformMatrix2x3fv
>+    glUniformMatrix2x4fv
>+    glUniformMatrix3x2fv
>+    glUniformMatrix3x4fv
>+    glUniformMatrix4x2fv
>+    glUniformMatrix4x3fv
>+    glUnmapBuffer
>+    glVertexAttribDivisor
>+    glVertexAttribI4i
>+    glVertexAttribI4iv
>+    glVertexAttribI4ui
>+    glVertexAttribI4uiv
>+    glVertexAttribIPointer
>+    glWaitSync
>+
>+    ; OpenGL ES 3.1
>+    glActiveShaderProgram
>+    glBindImageTexture
>+    glBindProgramPipeline
>+    glBindVertexBuffer
>+    glCreateShaderProgramv
>+    glDeleteProgramPipelines
>+    glDispatchCompute
>+    glDispatchComputeIndirect
>+    glDrawArraysIndirect
>+    glDrawElementsIndirect
>+    glFramebufferParameteri
>+    glGenProgramPipelines
>+    glGetBooleani_v
>+    glGetFramebufferParameteriv
>+    glGetMultisamplefv
>+    glGetProgramInterfaceiv
>+    glGetProgramPipelineInfoLog
>+    glGetProgramPipelineiv
>+    glGetProgramResourceIndex
>+    glGetProgramResourceLocation
>+    glGetProgramResourceName
>+    glGetProgramResourceiv
>+    glGetTexLevelParameterfv
>+    glGetTexLevelParameteriv
>+    glIsProgramPipeline
>+    glMemoryBarrier
>+    glMemoryBarrierByRegion
>+    glProgramUniform1f
>+    glProgramUniform1fv
>+    glProgramUniform1i
>+    glProgramUniform1iv
>+    glProgramUniform1ui
>+    glProgramUniform1uiv
>+    glProgramUniform2f
>+    glProgramUniform2fv
>+    glProgramUniform2i
>+    glProgramUniform2iv
>+    glProgramUniform2ui
>+    glProgramUniform2uiv
>+    glProgramUniform3f
>+    glProgramUniform3fv
>+    glProgramUniform3i
>+    glProgramUniform3iv
>+    glProgramUniform3ui
>+    glProgramUniform3uiv
>+    glProgramUniform4f
>+    glProgramUniform4fv
>+    glProgramUniform4i
>+    glProgramUniform4iv
>+    glProgramUniform4ui
>+    glProgramUniform4uiv
>+    glProgramUniformMatrix2fv
>+    glProgramUniformMatrix2x3fv
>+    glProgramUniformMatrix2x4fv
>+    glProgramUniformMatrix3fv
>+    glProgramUniformMatrix3x2fv
>+    glProgramUniformMatrix3x4fv
>+    glProgramUniformMatrix4fv
>+    glProgramUniformMatrix4x2fv
>+    glProgramUniformMatrix4x3fv
>+    glSampleMaski
>+    glTexStorage2DMultisample
>+    glUseProgramStages
>+    glValidateProgramPipeline
>+    glVertexAttribBinding
>+    glVertexAttribFormat
>+    glVertexAttribIFormat
>+    glVertexBindingDivisor
>+
>+    ; OpenGL ES 1.0
>+    glAlphaFunc
>+    glAlphaFuncx
>+    glClearColorx
>+    glClearDepthx
>+    glClientActiveTexture
>+    glClipPlanef
>+    glClipPlanex
>+    glColor4f
>+    glColor4ub
>+    glColor4x
>+    glColorPointer
>+    glDepthRangex
>+    glDisableClientState
>+    glEnableClientState
>+    glFogf
>+    glFogfv
>+    glFogx
>+    glFogxv
>+    glFrustumf
>+    glFrustumx
>+    glGetClipPlanef
>+    glGetClipPlanex
>+    glGetFixedv
>+    glGetLightfv
>+    glGetLightxv
>+    glGetMaterialfv
>+    glGetMaterialxv
>+    glGetPointerv
>+    glGetTexEnvfv
>+    glGetTexEnviv
>+    glGetTexEnvxv
>+    glGetTexParameterxv
>+    glLightModelf
>+    glLightModelfv
>+    glLightModelx
>+    glLightModelxv
>+    glLightf
>+    glLightfv
>+    glLightx
>+    glLightxv
>+    glLineWidthx
>+    glLoadIdentity
>+    glLoadMatrixf
>+    glLoadMatrixx
>+    glLogicOp
>+    glMaterialf
>+    glMaterialfv
>+    glMaterialx
>+    glMaterialxv
>+    glMatrixMode
>+    glMultMatrixf
>+    glMultMatrixx
>+    glMultiTexCoord4f
>+    glMultiTexCoord4x
>+    glNormal3f
>+    glNormal3x
>+    glNormalPointer
>+    glOrthof
>+    glOrthox
>+    glPointParameterf
>+    glPointParameterfv
>+    glPointParameterx
>+    glPointParameterxv
>+    glPointSize
>+    glPointSizex
>+    glPolygonOffsetx
>+    glPopMatrix
>+    glPushMatrix
>+    glRotatef
>+    glRotatex
>+    glSampleCoveragex
>+    glScalef
>+    glScalex
>+    glShadeModel
>+    glTexCoordPointer
>+    glTexEnvf
>+    glTexEnvfv
>+    glTexEnvi
>+    glTexEnviv
>+    glTexEnvx
>+    glTexEnvxv
>+    glTexParameterx
>+    glTexParameterxv
>+    glTranslatef
>+    glTranslatex
>+    glVertexPointer
>+
>+    ; GL_ANGLE_copy_texture_3d
>+    glCopySubTexture3DANGLE
>+    glCopyTexture3DANGLE
>+
>+    ; GL_ANGLE_framebuffer_blit
>+    glBlitFramebufferANGLE
>+
>+    ; GL_ANGLE_framebuffer_multisample
>+    glRenderbufferStorageMultisampleANGLE
>+
>+    ; GL_ANGLE_instanced_arrays
>+    glDrawArraysInstancedANGLE
>+    glDrawElementsInstancedANGLE
>+    glVertexAttribDivisorANGLE
>+
>+    ; GL_ANGLE_multi_draw
>+    glMultiDrawArraysANGLE
>+    glMultiDrawArraysInstancedANGLE
>+    glMultiDrawElementsANGLE
>+    glMultiDrawElementsInstancedANGLE
>+
>+    ; GL_ANGLE_provoking_vertex
>+    glProvokingVertexANGLE
>+
>+    ; GL_ANGLE_request_extension
>+    glRequestExtensionANGLE
>+
>+    ; GL_ANGLE_robust_client_memory
>+    glCompressedTexImage2DRobustANGLE
>+    glCompressedTexImage3DRobustANGLE
>+    glCompressedTexSubImage2DRobustANGLE
>+    glCompressedTexSubImage3DRobustANGLE
>+    glGetActiveUniformBlockivRobustANGLE
>+    glGetBooleani_vRobustANGLE
>+    glGetBooleanvRobustANGLE
>+    glGetBufferParameteri64vRobustANGLE
>+    glGetBufferParameterivRobustANGLE
>+    glGetBufferPointervRobustANGLE
>+    glGetFloatvRobustANGLE
>+    glGetFramebufferAttachmentParameterivRobustANGLE
>+    glGetFramebufferParameterivRobustANGLE
>+    glGetInteger64i_vRobustANGLE
>+    glGetInteger64vRobustANGLE
>+    glGetIntegeri_vRobustANGLE
>+    glGetIntegervRobustANGLE
>+    glGetInternalformativRobustANGLE
>+    glGetMultisamplefvRobustANGLE
>+    glGetPointervRobustANGLERobustANGLE
>+    glGetProgramInterfaceivRobustANGLE
>+    glGetProgramivRobustANGLE
>+    glGetQueryObjecti64vRobustANGLE
>+    glGetQueryObjectivRobustANGLE
>+    glGetQueryObjectui64vRobustANGLE
>+    glGetQueryObjectuivRobustANGLE
>+    glGetQueryivRobustANGLE
>+    glGetRenderbufferParameterivRobustANGLE
>+    glGetSamplerParameterIivRobustANGLE
>+    glGetSamplerParameterIuivRobustANGLE
>+    glGetSamplerParameterfvRobustANGLE
>+    glGetSamplerParameterivRobustANGLE
>+    glGetShaderivRobustANGLE
>+    glGetTexLevelParameterfvRobustANGLE
>+    glGetTexLevelParameterivRobustANGLE
>+    glGetTexParameterIivRobustANGLE
>+    glGetTexParameterIuivRobustANGLE
>+    glGetTexParameterfvRobustANGLE
>+    glGetTexParameterivRobustANGLE
>+    glGetUniformfvRobustANGLE
>+    glGetUniformivRobustANGLE
>+    glGetUniformuivRobustANGLE
>+    glGetVertexAttribIivRobustANGLE
>+    glGetVertexAttribIuivRobustANGLE
>+    glGetVertexAttribPointervRobustANGLE
>+    glGetVertexAttribfvRobustANGLE
>+    glGetVertexAttribivRobustANGLE
>+    glGetnUniformfvRobustANGLE
>+    glGetnUniformivRobustANGLE
>+    glGetnUniformuivRobustANGLE
>+    glReadPixelsRobustANGLE
>+    glReadnPixelsRobustANGLE
>+    glSamplerParameterIivRobustANGLE
>+    glSamplerParameterIuivRobustANGLE
>+    glSamplerParameterfvRobustANGLE
>+    glSamplerParameterivRobustANGLE
>+    glTexImage2DRobustANGLE
>+    glTexImage3DRobustANGLE
>+    glTexParameterIivRobustANGLE
>+    glTexParameterIuivRobustANGLE
>+    glTexParameterfvRobustANGLE
>+    glTexParameterivRobustANGLE
>+    glTexSubImage2DRobustANGLE
>+    glTexSubImage3DRobustANGLE
>+
>+    ; GL_ANGLE_texture_multisample
>+    glGetMultisamplefvANGLE
>+    glGetTexLevelParameterfvANGLE
>+    glGetTexLevelParameterivANGLE
>+    glSampleMaskiANGLE
>+    glTexStorage2DMultisampleANGLE
>+
>+    ; GL_ANGLE_translated_shader_source
>+    glGetTranslatedShaderSourceANGLE
>+
>+    ; GL_CHROMIUM_bind_uniform_location
>+    glBindUniformLocationCHROMIUM
>+
>+    ; GL_CHROMIUM_copy_compressed_texture
>+    glCompressedCopyTextureCHROMIUM
>+
>+    ; GL_CHROMIUM_copy_texture
>+    glCopySubTextureCHROMIUM
>+    glCopyTextureCHROMIUM
>+
>+    ; GL_CHROMIUM_framebuffer_mixed_samples
>+    glCoverageModulationCHROMIUM
>+    glMatrixLoadIdentityCHROMIUM
>+    glMatrixLoadfCHROMIUM
>+
>+    ; GL_CHROMIUM_lose_context
>+    glLoseContextCHROMIUM
>+
>+    ; GL_CHROMIUM_path_rendering
>+    glBindFragmentInputLocationCHROMIUM
>+    glCoverFillPathCHROMIUM
>+    glCoverFillPathInstancedCHROMIUM
>+    glCoverStrokePathCHROMIUM
>+    glCoverStrokePathInstancedCHROMIUM
>+    glDeletePathsCHROMIUM
>+    glGenPathsCHROMIUM
>+    glGetPathParameterfvCHROMIUM
>+    glGetPathParameterivCHROMIUM
>+    glIsPathCHROMIUM
>+    glPathCommandsCHROMIUM
>+    glPathParameterfCHROMIUM
>+    glPathParameteriCHROMIUM
>+    glPathStencilFuncCHROMIUM
>+    glProgramPathFragmentInputGenCHROMIUM
>+    glStencilFillPathCHROMIUM
>+    glStencilFillPathInstancedCHROMIUM
>+    glStencilStrokePathCHROMIUM
>+    glStencilStrokePathInstancedCHROMIUM
>+    glStencilThenCoverFillPathCHROMIUM
>+    glStencilThenCoverFillPathInstancedCHROMIUM
>+    glStencilThenCoverStrokePathCHROMIUM
>+    glStencilThenCoverStrokePathInstancedCHROMIUM
>+
>+    ; GL_EXT_blend_func_extended
>+    glBindFragDataLocationEXT
>+    glBindFragDataLocationIndexedEXT
>+    glGetFragDataIndexEXT
>+    glGetProgramResourceLocationIndexEXT
>+
>+    ; GL_EXT_debug_marker
>+    glInsertEventMarkerEXT
>+    glPopGroupMarkerEXT
>+    glPushGroupMarkerEXT
>+
>+    ; GL_EXT_discard_framebuffer
>+    glDiscardFramebufferEXT
>+
>+    ; GL_EXT_disjoint_timer_query
>+    glBeginQueryEXT
>+    glDeleteQueriesEXT
>+    glEndQueryEXT
>+    glGenQueriesEXT
>+    glGetQueryObjecti64vEXT
>+    glGetQueryObjectivEXT
>+    glGetQueryObjectui64vEXT
>+    glGetQueryObjectuivEXT
>+    glGetQueryivEXT
>+    glIsQueryEXT
>+    glQueryCounterEXT
>+
>+    ; GL_EXT_draw_buffers
>+    glDrawBuffersEXT
>+
>+    ; GL_EXT_geometry_shader
>+    glFramebufferTextureEXT
>+
>+    ; GL_EXT_instanced_arrays
>+    glDrawArraysInstancedEXT
>+    glDrawElementsInstancedEXT
>+    glVertexAttribDivisorEXT
>+
>+    ; GL_EXT_map_buffer_range
>+    glFlushMappedBufferRangeEXT
>+    glMapBufferRangeEXT
>+
>+    ; GL_EXT_memory_object
>+    glBufferStorageMemEXT
>+    glCreateMemoryObjectsEXT
>+    glDeleteMemoryObjectsEXT
>+    glGetMemoryObjectParameterivEXT
>+    glGetUnsignedBytei_vEXT
>+    glGetUnsignedBytevEXT
>+    glIsMemoryObjectEXT
>+    glMemoryObjectParameterivEXT
>+    glTexStorageMem2DEXT
>+    glTexStorageMem2DMultisampleEXT
>+    glTexStorageMem3DEXT
>+    glTexStorageMem3DMultisampleEXT
>+
>+    ; GL_EXT_memory_object_fd
>+    glImportMemoryFdEXT
>+
>+    ; GL_EXT_occlusion_query_boolean
>+
>+    ; GL_EXT_robustness
>+    glGetGraphicsResetStatusEXT
>+    glGetnUniformfvEXT
>+    glGetnUniformivEXT
>+    glReadnPixelsEXT
>+
>+    ; GL_EXT_semaphore
>+    glDeleteSemaphoresEXT
>+    glGenSemaphoresEXT
>+    glGetSemaphoreParameterui64vEXT
>+    glIsSemaphoreEXT
>+    glSemaphoreParameterui64vEXT
>+    glSignalSemaphoreEXT
>+    glWaitSemaphoreEXT
>+
>+    ; GL_EXT_semaphore_fd
>+    glImportSemaphoreFdEXT
>+
>+    ; GL_EXT_texture_storage
>+    glTexStorage1DEXT
>+    glTexStorage2DEXT
>+    glTexStorage3DEXT
>+
>+    ; GL_KHR_debug
>+    glDebugMessageCallbackKHR
>+    glDebugMessageControlKHR
>+    glDebugMessageInsertKHR
>+    glGetDebugMessageLogKHR
>+    glGetObjectLabelKHR
>+    glGetObjectPtrLabelKHR
>+    glGetPointervKHR
>+    glObjectLabelKHR
>+    glObjectPtrLabelKHR
>+    glPopDebugGroupKHR
>+    glPushDebugGroupKHR
>+
>+    ; GL_KHR_parallel_shader_compile
>+    glMaxShaderCompilerThreadsKHR
>+
>+    ; GL_NV_fence
>+    glDeleteFencesNV
>+    glFinishFenceNV
>+    glGenFencesNV
>+    glGetFenceivNV
>+    glIsFenceNV
>+    glSetFenceNV
>+    glTestFenceNV
>+
>+    ; GL_OES_EGL_image
>+    glEGLImageTargetRenderbufferStorageOES
>+    glEGLImageTargetTexture2DOES
>+
>+    ; GL_OES_draw_texture
>+    glDrawTexfOES
>+    glDrawTexfvOES
>+    glDrawTexiOES
>+    glDrawTexivOES
>+    glDrawTexsOES
>+    glDrawTexsvOES
>+    glDrawTexxOES
>+    glDrawTexxvOES
>+
>+    ; GL_OES_framebuffer_object
>+    glBindFramebufferOES
>+    glBindRenderbufferOES
>+    glCheckFramebufferStatusOES
>+    glDeleteFramebuffersOES
>+    glDeleteRenderbuffersOES
>+    glFramebufferRenderbufferOES
>+    glFramebufferTexture2DOES
>+    glGenFramebuffersOES
>+    glGenRenderbuffersOES
>+    glGenerateMipmapOES
>+    glGetFramebufferAttachmentParameterivOES
>+    glGetRenderbufferParameterivOES
>+    glIsFramebufferOES
>+    glIsRenderbufferOES
>+    glRenderbufferStorageOES
>+
>+    ; GL_OES_get_program_binary
>+    glGetProgramBinaryOES
>+    glProgramBinaryOES
>+
>+    ; GL_OES_mapbuffer
>+    glGetBufferPointervOES
>+    glMapBufferOES
>+    glUnmapBufferOES
>+
>+    ; GL_OES_matrix_palette
>+    glCurrentPaletteMatrixOES
>+    glLoadPaletteFromModelViewMatrixOES
>+    glMatrixIndexPointerOES
>+    glWeightPointerOES
>+
>+    ; GL_OES_point_size_array
>+    glPointSizePointerOES
>+
>+    ; GL_OES_query_matrix
>+    glQueryMatrixxOES
>+
>+    ; GL_OES_texture_border_clamp
>+    glGetSamplerParameterIivOES
>+    glGetSamplerParameterIuivOES
>+    glGetTexParameterIivOES
>+    glGetTexParameterIuivOES
>+    glSamplerParameterIivOES
>+    glSamplerParameterIuivOES
>+    glTexParameterIivOES
>+    glTexParameterIuivOES
>+
>+    ; GL_OES_texture_cube_map
>+    glGetTexGenfvOES
>+    glGetTexGenivOES
>+    glGetTexGenxvOES
>+    glTexGenfOES
>+    glTexGenfvOES
>+    glTexGeniOES
>+    glTexGenivOES
>+    glTexGenxOES
>+    glTexGenxvOES
>+
>+    ; GL_OES_texture_storage_multisample_2d_array
>+    glTexStorage3DMultisampleOES
>+
>+    ; GL_OES_vertex_array_object
>+    glBindVertexArrayOES
>+    glDeleteVertexArraysOES
>+    glGenVertexArraysOES
>+    glIsVertexArrayOES
>+
>+    ; GL_OVR_multiview
>+    glFramebufferTextureMultiviewOVR
>+
>+    ; GL_OVR_multiview2
>+
>+    ; EGL_ANGLE_explicit_context
>+    glActiveShaderProgramContextANGLE
>+    glActiveTextureContextANGLE
>+    glAlphaFuncContextANGLE
>+    glAlphaFuncxContextANGLE
>+    glAttachShaderContextANGLE
>+    glBeginQueryContextANGLE
>+    glBeginQueryEXTContextANGLE
>+    glBeginTransformFeedbackContextANGLE
>+    glBindAttribLocationContextANGLE
>+    glBindBufferContextANGLE
>+    glBindBufferBaseContextANGLE
>+    glBindBufferRangeContextANGLE
>+    glBindFragDataLocationEXTContextANGLE
>+    glBindFragDataLocationIndexedEXTContextANGLE
>+    glBindFragmentInputLocationCHROMIUMContextANGLE
>+    glBindFramebufferContextANGLE
>+    glBindFramebufferOESContextANGLE
>+    glBindImageTextureContextANGLE
>+    glBindProgramPipelineContextANGLE
>+    glBindRenderbufferContextANGLE
>+    glBindRenderbufferOESContextANGLE
>+    glBindSamplerContextANGLE
>+    glBindTextureContextANGLE
>+    glBindTransformFeedbackContextANGLE
>+    glBindUniformLocationCHROMIUMContextANGLE
>+    glBindVertexArrayContextANGLE
>+    glBindVertexArrayOESContextANGLE
>+    glBindVertexBufferContextANGLE
>+    glBlendColorContextANGLE
>+    glBlendEquationContextANGLE
>+    glBlendEquationSeparateContextANGLE
>+    glBlendFuncContextANGLE
>+    glBlendFuncSeparateContextANGLE
>+    glBlitFramebufferContextANGLE
>+    glBlitFramebufferANGLEContextANGLE
>+    glBufferDataContextANGLE
>+    glBufferStorageMemEXTContextANGLE
>+    glBufferSubDataContextANGLE
>+    glCheckFramebufferStatusContextANGLE
>+    glCheckFramebufferStatusOESContextANGLE
>+    glClearContextANGLE
>+    glClearBufferfiContextANGLE
>+    glClearBufferfvContextANGLE
>+    glClearBufferivContextANGLE
>+    glClearBufferuivContextANGLE
>+    glClearColorContextANGLE
>+    glClearColorxContextANGLE
>+    glClearDepthfContextANGLE
>+    glClearDepthxContextANGLE
>+    glClearStencilContextANGLE
>+    glClientActiveTextureContextANGLE
>+    glClientWaitSyncContextANGLE
>+    glClipPlanefContextANGLE
>+    glClipPlanexContextANGLE
>+    glColor4fContextANGLE
>+    glColor4ubContextANGLE
>+    glColor4xContextANGLE
>+    glColorMaskContextANGLE
>+    glColorPointerContextANGLE
>+    glCompileShaderContextANGLE
>+    glCompressedCopyTextureCHROMIUMContextANGLE
>+    glCompressedTexImage2DContextANGLE
>+    glCompressedTexImage2DRobustANGLEContextANGLE
>+    glCompressedTexImage3DContextANGLE
>+    glCompressedTexImage3DRobustANGLEContextANGLE
>+    glCompressedTexSubImage2DContextANGLE
>+    glCompressedTexSubImage2DRobustANGLEContextANGLE
>+    glCompressedTexSubImage3DContextANGLE
>+    glCompressedTexSubImage3DRobustANGLEContextANGLE
>+    glCopyBufferSubDataContextANGLE
>+    glCopySubTexture3DANGLEContextANGLE
>+    glCopySubTextureCHROMIUMContextANGLE
>+    glCopyTexImage2DContextANGLE
>+    glCopyTexSubImage2DContextANGLE
>+    glCopyTexSubImage3DContextANGLE
>+    glCopyTexture3DANGLEContextANGLE
>+    glCopyTextureCHROMIUMContextANGLE
>+    glCoverFillPathCHROMIUMContextANGLE
>+    glCoverFillPathInstancedCHROMIUMContextANGLE
>+    glCoverStrokePathCHROMIUMContextANGLE
>+    glCoverStrokePathInstancedCHROMIUMContextANGLE
>+    glCoverageModulationCHROMIUMContextANGLE
>+    glCreateMemoryObjectsEXTContextANGLE
>+    glCreateProgramContextANGLE
>+    glCreateShaderContextANGLE
>+    glCreateShaderProgramvContextANGLE
>+    glCullFaceContextANGLE
>+    glCurrentPaletteMatrixOESContextANGLE
>+    glDebugMessageCallbackKHRContextANGLE
>+    glDebugMessageControlKHRContextANGLE
>+    glDebugMessageInsertKHRContextANGLE
>+    glDeleteBuffersContextANGLE
>+    glDeleteFencesNVContextANGLE
>+    glDeleteFramebuffersContextANGLE
>+    glDeleteFramebuffersOESContextANGLE
>+    glDeleteMemoryObjectsEXTContextANGLE
>+    glDeletePathsCHROMIUMContextANGLE
>+    glDeleteProgramContextANGLE
>+    glDeleteProgramPipelinesContextANGLE
>+    glDeleteQueriesContextANGLE
>+    glDeleteQueriesEXTContextANGLE
>+    glDeleteRenderbuffersContextANGLE
>+    glDeleteRenderbuffersOESContextANGLE
>+    glDeleteSamplersContextANGLE
>+    glDeleteSemaphoresEXTContextANGLE
>+    glDeleteShaderContextANGLE
>+    glDeleteSyncContextANGLE
>+    glDeleteTexturesContextANGLE
>+    glDeleteTransformFeedbacksContextANGLE
>+    glDeleteVertexArraysContextANGLE
>+    glDeleteVertexArraysOESContextANGLE
>+    glDepthFuncContextANGLE
>+    glDepthMaskContextANGLE
>+    glDepthRangefContextANGLE
>+    glDepthRangexContextANGLE
>+    glDetachShaderContextANGLE
>+    glDisableContextANGLE
>+    glDisableClientStateContextANGLE
>+    glDisableVertexAttribArrayContextANGLE
>+    glDiscardFramebufferEXTContextANGLE
>+    glDispatchComputeContextANGLE
>+    glDispatchComputeIndirectContextANGLE
>+    glDrawArraysContextANGLE
>+    glDrawArraysIndirectContextANGLE
>+    glDrawArraysInstancedContextANGLE
>+    glDrawArraysInstancedANGLEContextANGLE
>+    glDrawArraysInstancedEXTContextANGLE
>+    glDrawBuffersContextANGLE
>+    glDrawBuffersEXTContextANGLE
>+    glDrawElementsContextANGLE
>+    glDrawElementsIndirectContextANGLE
>+    glDrawElementsInstancedContextANGLE
>+    glDrawElementsInstancedANGLEContextANGLE
>+    glDrawElementsInstancedEXTContextANGLE
>+    glDrawRangeElementsContextANGLE
>+    glDrawTexfOESContextANGLE
>+    glDrawTexfvOESContextANGLE
>+    glDrawTexiOESContextANGLE
>+    glDrawTexivOESContextANGLE
>+    glDrawTexsOESContextANGLE
>+    glDrawTexsvOESContextANGLE
>+    glDrawTexxOESContextANGLE
>+    glDrawTexxvOESContextANGLE
>+    glEGLImageTargetRenderbufferStorageOESContextANGLE
>+    glEGLImageTargetTexture2DOESContextANGLE
>+    glEnableContextANGLE
>+    glEnableClientStateContextANGLE
>+    glEnableVertexAttribArrayContextANGLE
>+    glEndQueryContextANGLE
>+    glEndQueryEXTContextANGLE
>+    glEndTransformFeedbackContextANGLE
>+    glFenceSyncContextANGLE
>+    glFinishContextANGLE
>+    glFinishFenceNVContextANGLE
>+    glFlushContextANGLE
>+    glFlushMappedBufferRangeContextANGLE
>+    glFlushMappedBufferRangeEXTContextANGLE
>+    glFogfContextANGLE
>+    glFogfvContextANGLE
>+    glFogxContextANGLE
>+    glFogxvContextANGLE
>+    glFramebufferParameteriContextANGLE
>+    glFramebufferRenderbufferContextANGLE
>+    glFramebufferRenderbufferOESContextANGLE
>+    glFramebufferTexture2DContextANGLE
>+    glFramebufferTexture2DOESContextANGLE
>+    glFramebufferTextureEXTContextANGLE
>+    glFramebufferTextureLayerContextANGLE
>+    glFramebufferTextureMultiviewOVRContextANGLE
>+    glFrontFaceContextANGLE
>+    glFrustumfContextANGLE
>+    glFrustumxContextANGLE
>+    glGenBuffersContextANGLE
>+    glGenFencesNVContextANGLE
>+    glGenFramebuffersContextANGLE
>+    glGenFramebuffersOESContextANGLE
>+    glGenPathsCHROMIUMContextANGLE
>+    glGenProgramPipelinesContextANGLE
>+    glGenQueriesContextANGLE
>+    glGenQueriesEXTContextANGLE
>+    glGenRenderbuffersContextANGLE
>+    glGenRenderbuffersOESContextANGLE
>+    glGenSamplersContextANGLE
>+    glGenSemaphoresEXTContextANGLE
>+    glGenTexturesContextANGLE
>+    glGenTransformFeedbacksContextANGLE
>+    glGenVertexArraysContextANGLE
>+    glGenVertexArraysOESContextANGLE
>+    glGenerateMipmapContextANGLE
>+    glGenerateMipmapOESContextANGLE
>+    glGetActiveAttribContextANGLE
>+    glGetActiveUniformContextANGLE
>+    glGetActiveUniformBlockNameContextANGLE
>+    glGetActiveUniformBlockivContextANGLE
>+    glGetActiveUniformBlockivRobustANGLEContextANGLE
>+    glGetActiveUniformsivContextANGLE
>+    glGetAttachedShadersContextANGLE
>+    glGetAttribLocationContextANGLE
>+    glGetBooleani_vContextANGLE
>+    glGetBooleani_vRobustANGLEContextANGLE
>+    glGetBooleanvContextANGLE
>+    glGetBooleanvRobustANGLEContextANGLE
>+    glGetBufferParameteri64vContextANGLE
>+    glGetBufferParameteri64vRobustANGLEContextANGLE
>+    glGetBufferParameterivContextANGLE
>+    glGetBufferParameterivRobustANGLEContextANGLE
>+    glGetBufferPointervContextANGLE
>+    glGetBufferPointervOESContextANGLE
>+    glGetBufferPointervRobustANGLEContextANGLE
>+    glGetClipPlanefContextANGLE
>+    glGetClipPlanexContextANGLE
>+    glGetDebugMessageLogKHRContextANGLE
>+    glGetErrorContextANGLE
>+    glGetFenceivNVContextANGLE
>+    glGetFixedvContextANGLE
>+    glGetFloatvContextANGLE
>+    glGetFloatvRobustANGLEContextANGLE
>+    glGetFragDataIndexEXTContextANGLE
>+    glGetFragDataLocationContextANGLE
>+    glGetFramebufferAttachmentParameterivContextANGLE
>+    glGetFramebufferAttachmentParameterivOESContextANGLE
>+    glGetFramebufferAttachmentParameterivRobustANGLEContextANGLE
>+    glGetFramebufferParameterivContextANGLE
>+    glGetFramebufferParameterivRobustANGLEContextANGLE
>+    glGetGraphicsResetStatusEXTContextANGLE
>+    glGetInteger64i_vContextANGLE
>+    glGetInteger64i_vRobustANGLEContextANGLE
>+    glGetInteger64vContextANGLE
>+    glGetInteger64vRobustANGLEContextANGLE
>+    glGetIntegeri_vContextANGLE
>+    glGetIntegeri_vRobustANGLEContextANGLE
>+    glGetIntegervContextANGLE
>+    glGetIntegervRobustANGLEContextANGLE
>+    glGetInternalformativContextANGLE
>+    glGetInternalformativRobustANGLEContextANGLE
>+    glGetLightfvContextANGLE
>+    glGetLightxvContextANGLE
>+    glGetMaterialfvContextANGLE
>+    glGetMaterialxvContextANGLE
>+    glGetMemoryObjectParameterivEXTContextANGLE
>+    glGetMultisamplefvContextANGLE
>+    glGetMultisamplefvANGLEContextANGLE
>+    glGetMultisamplefvRobustANGLEContextANGLE
>+    glGetObjectLabelKHRContextANGLE
>+    glGetObjectPtrLabelKHRContextANGLE
>+    glGetPathParameterfvCHROMIUMContextANGLE
>+    glGetPathParameterivCHROMIUMContextANGLE
>+    glGetPointervContextANGLE
>+    glGetPointervKHRContextANGLE
>+    glGetPointervRobustANGLERobustANGLEContextANGLE
>+    glGetProgramBinaryContextANGLE
>+    glGetProgramBinaryOESContextANGLE
>+    glGetProgramInfoLogContextANGLE
>+    glGetProgramInterfaceivContextANGLE
>+    glGetProgramInterfaceivRobustANGLEContextANGLE
>+    glGetProgramPipelineInfoLogContextANGLE
>+    glGetProgramPipelineivContextANGLE
>+    glGetProgramResourceIndexContextANGLE
>+    glGetProgramResourceLocationContextANGLE
>+    glGetProgramResourceLocationIndexEXTContextANGLE
>+    glGetProgramResourceNameContextANGLE
>+    glGetProgramResourceivContextANGLE
>+    glGetProgramivContextANGLE
>+    glGetProgramivRobustANGLEContextANGLE
>+    glGetQueryObjecti64vEXTContextANGLE
>+    glGetQueryObjecti64vRobustANGLEContextANGLE
>+    glGetQueryObjectivEXTContextANGLE
>+    glGetQueryObjectivRobustANGLEContextANGLE
>+    glGetQueryObjectui64vEXTContextANGLE
>+    glGetQueryObjectui64vRobustANGLEContextANGLE
>+    glGetQueryObjectuivContextANGLE
>+    glGetQueryObjectuivEXTContextANGLE
>+    glGetQueryObjectuivRobustANGLEContextANGLE
>+    glGetQueryivContextANGLE
>+    glGetQueryivEXTContextANGLE
>+    glGetQueryivRobustANGLEContextANGLE
>+    glGetRenderbufferParameterivContextANGLE
>+    glGetRenderbufferParameterivOESContextANGLE
>+    glGetRenderbufferParameterivRobustANGLEContextANGLE
>+    glGetSamplerParameterIivOESContextANGLE
>+    glGetSamplerParameterIivRobustANGLEContextANGLE
>+    glGetSamplerParameterIuivOESContextANGLE
>+    glGetSamplerParameterIuivRobustANGLEContextANGLE
>+    glGetSamplerParameterfvContextANGLE
>+    glGetSamplerParameterfvRobustANGLEContextANGLE
>+    glGetSamplerParameterivContextANGLE
>+    glGetSamplerParameterivRobustANGLEContextANGLE
>+    glGetSemaphoreParameterui64vEXTContextANGLE
>+    glGetShaderInfoLogContextANGLE
>+    glGetShaderPrecisionFormatContextANGLE
>+    glGetShaderSourceContextANGLE
>+    glGetShaderivContextANGLE
>+    glGetShaderivRobustANGLEContextANGLE
>+    glGetStringContextANGLE
>+    glGetStringiContextANGLE
>+    glGetSyncivContextANGLE
>+    glGetTexEnvfvContextANGLE
>+    glGetTexEnvivContextANGLE
>+    glGetTexEnvxvContextANGLE
>+    glGetTexGenfvOESContextANGLE
>+    glGetTexGenivOESContextANGLE
>+    glGetTexGenxvOESContextANGLE
>+    glGetTexLevelParameterfvContextANGLE
>+    glGetTexLevelParameterfvANGLEContextANGLE
>+    glGetTexLevelParameterfvRobustANGLEContextANGLE
>+    glGetTexLevelParameterivContextANGLE
>+    glGetTexLevelParameterivANGLEContextANGLE
>+    glGetTexLevelParameterivRobustANGLEContextANGLE
>+    glGetTexParameterIivOESContextANGLE
>+    glGetTexParameterIivRobustANGLEContextANGLE
>+    glGetTexParameterIuivOESContextANGLE
>+    glGetTexParameterIuivRobustANGLEContextANGLE
>+    glGetTexParameterfvContextANGLE
>+    glGetTexParameterfvRobustANGLEContextANGLE
>+    glGetTexParameterivContextANGLE
>+    glGetTexParameterivRobustANGLEContextANGLE
>+    glGetTexParameterxvContextANGLE
>+    glGetTransformFeedbackVaryingContextANGLE
>+    glGetTranslatedShaderSourceANGLEContextANGLE
>+    glGetUniformBlockIndexContextANGLE
>+    glGetUniformIndicesContextANGLE
>+    glGetUniformLocationContextANGLE
>+    glGetUniformfvContextANGLE
>+    glGetUniformfvRobustANGLEContextANGLE
>+    glGetUniformivContextANGLE
>+    glGetUniformivRobustANGLEContextANGLE
>+    glGetUniformuivContextANGLE
>+    glGetUniformuivRobustANGLEContextANGLE
>+    glGetUnsignedBytei_vEXTContextANGLE
>+    glGetUnsignedBytevEXTContextANGLE
>+    glGetVertexAttribIivContextANGLE
>+    glGetVertexAttribIivRobustANGLEContextANGLE
>+    glGetVertexAttribIuivContextANGLE
>+    glGetVertexAttribIuivRobustANGLEContextANGLE
>+    glGetVertexAttribPointervContextANGLE
>+    glGetVertexAttribPointervRobustANGLEContextANGLE
>+    glGetVertexAttribfvContextANGLE
>+    glGetVertexAttribfvRobustANGLEContextANGLE
>+    glGetVertexAttribivContextANGLE
>+    glGetVertexAttribivRobustANGLEContextANGLE
>+    glGetnUniformfvEXTContextANGLE
>+    glGetnUniformfvRobustANGLEContextANGLE
>+    glGetnUniformivEXTContextANGLE
>+    glGetnUniformivRobustANGLEContextANGLE
>+    glGetnUniformuivRobustANGLEContextANGLE
>+    glHintContextANGLE
>+    glImportMemoryFdEXTContextANGLE
>+    glImportSemaphoreFdEXTContextANGLE
>+    glInsertEventMarkerEXTContextANGLE
>+    glInvalidateFramebufferContextANGLE
>+    glInvalidateSubFramebufferContextANGLE
>+    glIsBufferContextANGLE
>+    glIsEnabledContextANGLE
>+    glIsFenceNVContextANGLE
>+    glIsFramebufferContextANGLE
>+    glIsFramebufferOESContextANGLE
>+    glIsMemoryObjectEXTContextANGLE
>+    glIsPathCHROMIUMContextANGLE
>+    glIsProgramContextANGLE
>+    glIsProgramPipelineContextANGLE
>+    glIsQueryContextANGLE
>+    glIsQueryEXTContextANGLE
>+    glIsRenderbufferContextANGLE
>+    glIsRenderbufferOESContextANGLE
>+    glIsSamplerContextANGLE
>+    glIsSemaphoreEXTContextANGLE
>+    glIsShaderContextANGLE
>+    glIsSyncContextANGLE
>+    glIsTextureContextANGLE
>+    glIsTransformFeedbackContextANGLE
>+    glIsVertexArrayContextANGLE
>+    glIsVertexArrayOESContextANGLE
>+    glLightModelfContextANGLE
>+    glLightModelfvContextANGLE
>+    glLightModelxContextANGLE
>+    glLightModelxvContextANGLE
>+    glLightfContextANGLE
>+    glLightfvContextANGLE
>+    glLightxContextANGLE
>+    glLightxvContextANGLE
>+    glLineWidthContextANGLE
>+    glLineWidthxContextANGLE
>+    glLinkProgramContextANGLE
>+    glLoadIdentityContextANGLE
>+    glLoadMatrixfContextANGLE
>+    glLoadMatrixxContextANGLE
>+    glLoadPaletteFromModelViewMatrixOESContextANGLE
>+    glLogicOpContextANGLE
>+    glLoseContextCHROMIUMContextANGLE
>+    glMapBufferOESContextANGLE
>+    glMapBufferRangeContextANGLE
>+    glMapBufferRangeEXTContextANGLE
>+    glMaterialfContextANGLE
>+    glMaterialfvContextANGLE
>+    glMaterialxContextANGLE
>+    glMaterialxvContextANGLE
>+    glMatrixIndexPointerOESContextANGLE
>+    glMatrixLoadIdentityCHROMIUMContextANGLE
>+    glMatrixLoadfCHROMIUMContextANGLE
>+    glMatrixModeContextANGLE
>+    glMaxShaderCompilerThreadsKHRContextANGLE
>+    glMemoryBarrierContextANGLE
>+    glMemoryBarrierByRegionContextANGLE
>+    glMemoryObjectParameterivEXTContextANGLE
>+    glMultMatrixfContextANGLE
>+    glMultMatrixxContextANGLE
>+    glMultiDrawArraysANGLEContextANGLE
>+    glMultiDrawArraysInstancedANGLEContextANGLE
>+    glMultiDrawElementsANGLEContextANGLE
>+    glMultiDrawElementsInstancedANGLEContextANGLE
>+    glMultiTexCoord4fContextANGLE
>+    glMultiTexCoord4xContextANGLE
>+    glNormal3fContextANGLE
>+    glNormal3xContextANGLE
>+    glNormalPointerContextANGLE
>+    glObjectLabelKHRContextANGLE
>+    glObjectPtrLabelKHRContextANGLE
>+    glOrthofContextANGLE
>+    glOrthoxContextANGLE
>+    glPathCommandsCHROMIUMContextANGLE
>+    glPathParameterfCHROMIUMContextANGLE
>+    glPathParameteriCHROMIUMContextANGLE
>+    glPathStencilFuncCHROMIUMContextANGLE
>+    glPauseTransformFeedbackContextANGLE
>+    glPixelStoreiContextANGLE
>+    glPointParameterfContextANGLE
>+    glPointParameterfvContextANGLE
>+    glPointParameterxContextANGLE
>+    glPointParameterxvContextANGLE
>+    glPointSizeContextANGLE
>+    glPointSizePointerOESContextANGLE
>+    glPointSizexContextANGLE
>+    glPolygonOffsetContextANGLE
>+    glPolygonOffsetxContextANGLE
>+    glPopDebugGroupKHRContextANGLE
>+    glPopGroupMarkerEXTContextANGLE
>+    glPopMatrixContextANGLE
>+    glProgramBinaryContextANGLE
>+    glProgramBinaryOESContextANGLE
>+    glProgramParameteriContextANGLE
>+    glProgramPathFragmentInputGenCHROMIUMContextANGLE
>+    glProgramUniform1fContextANGLE
>+    glProgramUniform1fvContextANGLE
>+    glProgramUniform1iContextANGLE
>+    glProgramUniform1ivContextANGLE
>+    glProgramUniform1uiContextANGLE
>+    glProgramUniform1uivContextANGLE
>+    glProgramUniform2fContextANGLE
>+    glProgramUniform2fvContextANGLE
>+    glProgramUniform2iContextANGLE
>+    glProgramUniform2ivContextANGLE
>+    glProgramUniform2uiContextANGLE
>+    glProgramUniform2uivContextANGLE
>+    glProgramUniform3fContextANGLE
>+    glProgramUniform3fvContextANGLE
>+    glProgramUniform3iContextANGLE
>+    glProgramUniform3ivContextANGLE
>+    glProgramUniform3uiContextANGLE
>+    glProgramUniform3uivContextANGLE
>+    glProgramUniform4fContextANGLE
>+    glProgramUniform4fvContextANGLE
>+    glProgramUniform4iContextANGLE
>+    glProgramUniform4ivContextANGLE
>+    glProgramUniform4uiContextANGLE
>+    glProgramUniform4uivContextANGLE
>+    glProgramUniformMatrix2fvContextANGLE
>+    glProgramUniformMatrix2x3fvContextANGLE
>+    glProgramUniformMatrix2x4fvContextANGLE
>+    glProgramUniformMatrix3fvContextANGLE
>+    glProgramUniformMatrix3x2fvContextANGLE
>+    glProgramUniformMatrix3x4fvContextANGLE
>+    glProgramUniformMatrix4fvContextANGLE
>+    glProgramUniformMatrix4x2fvContextANGLE
>+    glProgramUniformMatrix4x3fvContextANGLE
>+    glProvokingVertexANGLEContextANGLE
>+    glPushDebugGroupKHRContextANGLE
>+    glPushGroupMarkerEXTContextANGLE
>+    glPushMatrixContextANGLE
>+    glQueryCounterEXTContextANGLE
>+    glQueryMatrixxOESContextANGLE
>+    glReadBufferContextANGLE
>+    glReadPixelsContextANGLE
>+    glReadPixelsRobustANGLEContextANGLE
>+    glReadnPixelsEXTContextANGLE
>+    glReadnPixelsRobustANGLEContextANGLE
>+    glReleaseShaderCompilerContextANGLE
>+    glRenderbufferStorageContextANGLE
>+    glRenderbufferStorageMultisampleContextANGLE
>+    glRenderbufferStorageMultisampleANGLEContextANGLE
>+    glRenderbufferStorageOESContextANGLE
>+    glRequestExtensionANGLEContextANGLE
>+    glResumeTransformFeedbackContextANGLE
>+    glRotatefContextANGLE
>+    glRotatexContextANGLE
>+    glSampleCoverageContextANGLE
>+    glSampleCoveragexContextANGLE
>+    glSampleMaskiContextANGLE
>+    glSampleMaskiANGLEContextANGLE
>+    glSamplerParameterIivOESContextANGLE
>+    glSamplerParameterIivRobustANGLEContextANGLE
>+    glSamplerParameterIuivOESContextANGLE
>+    glSamplerParameterIuivRobustANGLEContextANGLE
>+    glSamplerParameterfContextANGLE
>+    glSamplerParameterfvContextANGLE
>+    glSamplerParameterfvRobustANGLEContextANGLE
>+    glSamplerParameteriContextANGLE
>+    glSamplerParameterivContextANGLE
>+    glSamplerParameterivRobustANGLEContextANGLE
>+    glScalefContextANGLE
>+    glScalexContextANGLE
>+    glScissorContextANGLE
>+    glSemaphoreParameterui64vEXTContextANGLE
>+    glSetFenceNVContextANGLE
>+    glShadeModelContextANGLE
>+    glShaderBinaryContextANGLE
>+    glShaderSourceContextANGLE
>+    glSignalSemaphoreEXTContextANGLE
>+    glStencilFillPathCHROMIUMContextANGLE
>+    glStencilFillPathInstancedCHROMIUMContextANGLE
>+    glStencilFuncContextANGLE
>+    glStencilFuncSeparateContextANGLE
>+    glStencilMaskContextANGLE
>+    glStencilMaskSeparateContextANGLE
>+    glStencilOpContextANGLE
>+    glStencilOpSeparateContextANGLE
>+    glStencilStrokePathCHROMIUMContextANGLE
>+    glStencilStrokePathInstancedCHROMIUMContextANGLE
>+    glStencilThenCoverFillPathCHROMIUMContextANGLE
>+    glStencilThenCoverFillPathInstancedCHROMIUMContextANGLE
>+    glStencilThenCoverStrokePathCHROMIUMContextANGLE
>+    glStencilThenCoverStrokePathInstancedCHROMIUMContextANGLE
>+    glTestFenceNVContextANGLE
>+    glTexCoordPointerContextANGLE
>+    glTexEnvfContextANGLE
>+    glTexEnvfvContextANGLE
>+    glTexEnviContextANGLE
>+    glTexEnvivContextANGLE
>+    glTexEnvxContextANGLE
>+    glTexEnvxvContextANGLE
>+    glTexGenfOESContextANGLE
>+    glTexGenfvOESContextANGLE
>+    glTexGeniOESContextANGLE
>+    glTexGenivOESContextANGLE
>+    glTexGenxOESContextANGLE
>+    glTexGenxvOESContextANGLE
>+    glTexImage2DContextANGLE
>+    glTexImage2DRobustANGLEContextANGLE
>+    glTexImage3DContextANGLE
>+    glTexImage3DRobustANGLEContextANGLE
>+    glTexParameterIivOESContextANGLE
>+    glTexParameterIivRobustANGLEContextANGLE
>+    glTexParameterIuivOESContextANGLE
>+    glTexParameterIuivRobustANGLEContextANGLE
>+    glTexParameterfContextANGLE
>+    glTexParameterfvContextANGLE
>+    glTexParameterfvRobustANGLEContextANGLE
>+    glTexParameteriContextANGLE
>+    glTexParameterivContextANGLE
>+    glTexParameterivRobustANGLEContextANGLE
>+    glTexParameterxContextANGLE
>+    glTexParameterxvContextANGLE
>+    glTexStorage1DEXTContextANGLE
>+    glTexStorage2DContextANGLE
>+    glTexStorage2DEXTContextANGLE
>+    glTexStorage2DMultisampleContextANGLE
>+    glTexStorage2DMultisampleANGLEContextANGLE
>+    glTexStorage3DContextANGLE
>+    glTexStorage3DEXTContextANGLE
>+    glTexStorage3DMultisampleOESContextANGLE
>+    glTexStorageMem2DEXTContextANGLE
>+    glTexStorageMem2DMultisampleEXTContextANGLE
>+    glTexStorageMem3DEXTContextANGLE
>+    glTexStorageMem3DMultisampleEXTContextANGLE
>+    glTexSubImage2DContextANGLE
>+    glTexSubImage2DRobustANGLEContextANGLE
>+    glTexSubImage3DContextANGLE
>+    glTexSubImage3DRobustANGLEContextANGLE
>+    glTransformFeedbackVaryingsContextANGLE
>+    glTranslatefContextANGLE
>+    glTranslatexContextANGLE
>+    glUniform1fContextANGLE
>+    glUniform1fvContextANGLE
>+    glUniform1iContextANGLE
>+    glUniform1ivContextANGLE
>+    glUniform1uiContextANGLE
>+    glUniform1uivContextANGLE
>+    glUniform2fContextANGLE
>+    glUniform2fvContextANGLE
>+    glUniform2iContextANGLE
>+    glUniform2ivContextANGLE
>+    glUniform2uiContextANGLE
>+    glUniform2uivContextANGLE
>+    glUniform3fContextANGLE
>+    glUniform3fvContextANGLE
>+    glUniform3iContextANGLE
>+    glUniform3ivContextANGLE
>+    glUniform3uiContextANGLE
>+    glUniform3uivContextANGLE
>+    glUniform4fContextANGLE
>+    glUniform4fvContextANGLE
>+    glUniform4iContextANGLE
>+    glUniform4ivContextANGLE
>+    glUniform4uiContextANGLE
>+    glUniform4uivContextANGLE
>+    glUniformBlockBindingContextANGLE
>+    glUniformMatrix2fvContextANGLE
>+    glUniformMatrix2x3fvContextANGLE
>+    glUniformMatrix2x4fvContextANGLE
>+    glUniformMatrix3fvContextANGLE
>+    glUniformMatrix3x2fvContextANGLE
>+    glUniformMatrix3x4fvContextANGLE
>+    glUniformMatrix4fvContextANGLE
>+    glUniformMatrix4x2fvContextANGLE
>+    glUniformMatrix4x3fvContextANGLE
>+    glUnmapBufferContextANGLE
>+    glUnmapBufferOESContextANGLE
>+    glUseProgramContextANGLE
>+    glUseProgramStagesContextANGLE
>+    glValidateProgramContextANGLE
>+    glValidateProgramPipelineContextANGLE
>+    glVertexAttrib1fContextANGLE
>+    glVertexAttrib1fvContextANGLE
>+    glVertexAttrib2fContextANGLE
>+    glVertexAttrib2fvContextANGLE
>+    glVertexAttrib3fContextANGLE
>+    glVertexAttrib3fvContextANGLE
>+    glVertexAttrib4fContextANGLE
>+    glVertexAttrib4fvContextANGLE
>+    glVertexAttribBindingContextANGLE
>+    glVertexAttribDivisorContextANGLE
>+    glVertexAttribDivisorANGLEContextANGLE
>+    glVertexAttribDivisorEXTContextANGLE
>+    glVertexAttribFormatContextANGLE
>+    glVertexAttribI4iContextANGLE
>+    glVertexAttribI4ivContextANGLE
>+    glVertexAttribI4uiContextANGLE
>+    glVertexAttribI4uivContextANGLE
>+    glVertexAttribIFormatContextANGLE
>+    glVertexAttribIPointerContextANGLE
>+    glVertexAttribPointerContextANGLE
>+    glVertexBindingDivisorContextANGLE
>+    glVertexPointerContextANGLE
>+    glViewportContextANGLE
>+    glWaitSemaphoreEXTContextANGLE
>+    glWaitSyncContextANGLE
>+    glWeightPointerOESContextANGLE
>+
>+    ; EGL 1.0
>+    EGL_ChooseConfig
>+    EGL_CopyBuffers
>+    EGL_CreateContext
>+    EGL_CreatePbufferSurface
>+    EGL_CreatePixmapSurface
>+    EGL_CreateWindowSurface
>+    EGL_DestroyContext
>+    EGL_DestroySurface
>+    EGL_GetConfigAttrib
>+    EGL_GetConfigs
>+    EGL_GetCurrentDisplay
>+    EGL_GetCurrentSurface
>+    EGL_GetDisplay
>+    EGL_GetError
>+    EGL_GetProcAddress
>+    EGL_Initialize
>+    EGL_MakeCurrent
>+    EGL_QueryContext
>+    EGL_QueryString
>+    EGL_QuerySurface
>+    EGL_SwapBuffers
>+    EGL_Terminate
>+    EGL_WaitGL
>+    EGL_WaitNative
>+
>+    ; EGL 1.1
>+    EGL_BindTexImage
>+    EGL_ReleaseTexImage
>+    EGL_SurfaceAttrib
>+    EGL_SwapInterval
>+
>+    ; EGL 1.2
>+    EGL_BindAPI
>+    EGL_CreatePbufferFromClientBuffer
>+    EGL_QueryAPI
>+    EGL_ReleaseThread
>+    EGL_WaitClient
>+
>+    ; EGL 1.4
>+    EGL_GetCurrentContext
>+
>+    ; EGL 1.5
>+    EGL_ClientWaitSync
>+    EGL_CreateImage
>+    EGL_CreatePlatformPixmapSurface
>+    EGL_CreatePlatformWindowSurface
>+    EGL_CreateSync
>+    EGL_DestroyImage
>+    EGL_DestroySync
>+    EGL_GetPlatformDisplay
>+    EGL_GetSyncAttrib
>+    EGL_WaitSync
>+
>+    ; EGL_ANDROID_blob_cache
>+    EGL_SetBlobCacheFuncsANDROID
>+
>+    ; EGL_ANDROID_get_frame_timestamps
>+    EGL_GetCompositorTimingANDROID
>+    EGL_GetCompositorTimingSupportedANDROID
>+    EGL_GetFrameTimestampSupportedANDROID
>+    EGL_GetFrameTimestampsANDROID
>+    EGL_GetNextFrameIdANDROID
>+
>+    ; EGL_ANDROID_presentation_time
>+    EGL_PresentationTimeANDROID
>+
>+    ; EGL_ANGLE_device_creation
>+    EGL_CreateDeviceANGLE
>+    EGL_ReleaseDeviceANGLE
>+
>+    ; EGL_ANGLE_program_cache_control
>+    EGL_ProgramCacheGetAttribANGLE
>+    EGL_ProgramCachePopulateANGLE
>+    EGL_ProgramCacheQueryANGLE
>+    EGL_ProgramCacheResizeANGLE
>+
>+    ; EGL_ANGLE_query_surface_pointer
>+    EGL_QuerySurfacePointerANGLE
>+
>+    ; EGL_ANGLE_stream_producer_d3d_texture
>+    EGL_CreateStreamProducerD3DTextureANGLE
>+    EGL_StreamPostD3DTextureANGLE
>+
>+    ; EGL_CHROMIUM_get_sync_values
>+    EGL_GetSyncValuesCHROMIUM
>+
>+    ; EGL_EXT_device_query
>+    EGL_QueryDeviceAttribEXT
>+    EGL_QueryDeviceStringEXT
>+    EGL_QueryDisplayAttribEXT
>+
>+    ; EGL_EXT_platform_base
>+    EGL_CreatePlatformPixmapSurfaceEXT
>+    EGL_CreatePlatformWindowSurfaceEXT
>+    EGL_GetPlatformDisplayEXT
>+
>+    ; EGL_KHR_debug
>+    EGL_DebugMessageControlKHR
>+    EGL_LabelObjectKHR
>+    EGL_QueryDebugKHR
>+
>+    ; EGL_KHR_fence_sync
>+    EGL_ClientWaitSyncKHR
>+    EGL_CreateSyncKHR
>+    EGL_DestroySyncKHR
>+    EGL_GetSyncAttribKHR
>+
>+    ; EGL_KHR_image
>+    EGL_CreateImageKHR
>+    EGL_DestroyImageKHR
>+
>+    ; EGL_KHR_stream
>+    EGL_CreateStreamKHR
>+    EGL_DestroyStreamKHR
>+    EGL_QueryStreamKHR
>+    EGL_QueryStreamu64KHR
>+    EGL_StreamAttribKHR
>+
>+    ; EGL_KHR_stream_consumer_gltexture
>+    EGL_StreamConsumerAcquireKHR
>+    EGL_StreamConsumerGLTextureExternalKHR
>+    EGL_StreamConsumerReleaseKHR
>+
>+    ; EGL_KHR_swap_buffers_with_damage
>+    EGL_SwapBuffersWithDamageKHR
>+
>+    ; EGL_KHR_wait_sync
>+    EGL_WaitSyncKHR
>+
>+    ; EGL_NV_post_sub_buffer
>+    EGL_PostSubBufferNV
>+
>+    ; EGL_NV_stream_consumer_gltexture_yuv
>+    EGL_StreamConsumerGLTextureExternalAttribsNV
>diff --git a/Source/ThirdParty/ANGLE/src/libGLESv2/proc_table.h b/Source/ThirdParty/ANGLE/src/libGLESv2/proc_table.h
>index f718291be7e..38506e7c4c4 100644
>--- a/Source/ThirdParty/ANGLE/src/libGLESv2/proc_table.h
>+++ b/Source/ThirdParty/ANGLE/src/libGLESv2/proc_table.h
>@@ -11,6 +11,7 @@
> #define LIBGLESV2_PROC_TABLE_H_
> 
> #include <EGL/egl.h>
>+#include <stddef.h>
> #include <utility>
> 
> namespace egl
>diff --git a/Source/ThirdParty/ANGLE/src/libGLESv2/proc_table_autogen.cpp b/Source/ThirdParty/ANGLE/src/libGLESv2/proc_table_autogen.cpp
>index f294c1edc30..dfb2438f46c 100644
>--- a/Source/ThirdParty/ANGLE/src/libGLESv2/proc_table_autogen.cpp
>+++ b/Source/ThirdParty/ANGLE/src/libGLESv2/proc_table_autogen.cpp
>@@ -1,7 +1,7 @@
> // GENERATED FILE - DO NOT EDIT.
> // Generated by gen_proc_table.py using data from proc_table_data.json.
> //
>-// Copyright 2017 The ANGLE Project Authors. All rights reserved.
>+// Copyright 2019 The ANGLE Project Authors. All rights reserved.
> // Use of this source code is governed by a BSD-style license that can be
> // found in the LICENSE file.
> //
>@@ -13,10 +13,11 @@
> 
> #include "libGLESv2/entry_points_egl.h"
> #include "libGLESv2/entry_points_egl_ext.h"
>+#include "libGLESv2/entry_points_gles_1_0_autogen.h"
> #include "libGLESv2/entry_points_gles_2_0_autogen.h"
>-#include "libGLESv2/entry_points_gles_2_0_ext.h"
> #include "libGLESv2/entry_points_gles_3_0_autogen.h"
> #include "libGLESv2/entry_points_gles_3_1_autogen.h"
>+#include "libGLESv2/entry_points_gles_ext_autogen.h"
> #include "platform/Platform.h"
> 
> #define P(FUNC) reinterpret_cast<__eglMustCastToProperFunctionPointerType>(FUNC)
>@@ -26,523 +27,1396 @@ namespace egl
> ProcEntry g_procTable[] = {
>     {"ANGLEGetDisplayPlatform", P(ANGLEGetDisplayPlatform)},
>     {"ANGLEResetDisplayPlatform", P(ANGLEResetDisplayPlatform)},
>-    {"eglBindAPI", P(egl::BindAPI)},
>-    {"eglBindTexImage", P(egl::BindTexImage)},
>-    {"eglChooseConfig", P(egl::ChooseConfig)},
>-    {"eglClientWaitSync", P(egl::ClientWaitSync)},
>-    {"eglCopyBuffers", P(egl::CopyBuffers)},
>-    {"eglCreateContext", P(egl::CreateContext)},
>-    {"eglCreateDeviceANGLE", P(egl::CreateDeviceANGLE)},
>-    {"eglCreateImage", P(egl::CreateImage)},
>-    {"eglCreateImageKHR", P(egl::CreateImageKHR)},
>-    {"eglCreatePbufferFromClientBuffer", P(egl::CreatePbufferFromClientBuffer)},
>-    {"eglCreatePbufferSurface", P(egl::CreatePbufferSurface)},
>-    {"eglCreatePixmapSurface", P(egl::CreatePixmapSurface)},
>-    {"eglCreatePlatformPixmapSurface", P(egl::CreatePlatformPixmapSurface)},
>-    {"eglCreatePlatformWindowSurface", P(egl::CreatePlatformWindowSurface)},
>-    {"eglCreateStreamKHR", P(egl::CreateStreamKHR)},
>-    {"eglCreateStreamProducerD3DTextureNV12ANGLE", P(egl::CreateStreamProducerD3DTextureNV12ANGLE)},
>-    {"eglCreateSync", P(egl::CreateSync)},
>-    {"eglCreateWindowSurface", P(egl::CreateWindowSurface)},
>-    {"eglDestroyContext", P(egl::DestroyContext)},
>-    {"eglDestroyImage", P(egl::DestroyImage)},
>-    {"eglDestroyImageKHR", P(egl::DestroyImageKHR)},
>-    {"eglDestroyStreamKHR", P(egl::DestroyStreamKHR)},
>-    {"eglDestroySurface", P(egl::DestroySurface)},
>-    {"eglDestroySync", P(egl::DestroySync)},
>-    {"eglGetConfigAttrib", P(egl::GetConfigAttrib)},
>-    {"eglGetConfigs", P(egl::GetConfigs)},
>-    {"eglGetCurrentContext", P(egl::GetCurrentContext)},
>-    {"eglGetCurrentDisplay", P(egl::GetCurrentDisplay)},
>-    {"eglGetCurrentSurface", P(egl::GetCurrentSurface)},
>-    {"eglGetDisplay", P(egl::GetDisplay)},
>-    {"eglGetError", P(egl::GetError)},
>-    {"eglGetPlatformDisplay", P(egl::GetPlatformDisplay)},
>-    {"eglGetPlatformDisplayEXT", P(egl::GetPlatformDisplayEXT)},
>-    {"eglGetProcAddress", P(egl::GetProcAddress)},
>-    {"eglGetSyncAttrib", P(egl::GetSyncAttrib)},
>-    {"eglGetSyncValuesCHROMIUM", P(egl::GetSyncValuesCHROMIUM)},
>-    {"eglInitialize", P(egl::Initialize)},
>-    {"eglMakeCurrent", P(egl::MakeCurrent)},
>-    {"eglPostSubBufferNV", P(egl::PostSubBufferNV)},
>-    {"eglProgramCacheGetAttribANGLE", P(egl::ProgramCacheGetAttribANGLE)},
>-    {"eglProgramCachePopulateANGLE", P(egl::ProgramCachePopulateANGLE)},
>-    {"eglProgramCacheQueryANGLE", P(egl::ProgramCacheQueryANGLE)},
>-    {"eglProgramCacheResizeANGLE", P(egl::ProgramCacheResizeANGLE)},
>-    {"eglQueryAPI", P(egl::QueryAPI)},
>-    {"eglQueryContext", P(egl::QueryContext)},
>-    {"eglQueryDeviceAttribEXT", P(egl::QueryDeviceAttribEXT)},
>-    {"eglQueryDeviceStringEXT", P(egl::QueryDeviceStringEXT)},
>-    {"eglQueryDisplayAttribEXT", P(egl::QueryDisplayAttribEXT)},
>-    {"eglQueryStreamKHR", P(egl::QueryStreamKHR)},
>-    {"eglQueryStreamu64KHR", P(egl::QueryStreamu64KHR)},
>-    {"eglQueryString", P(egl::QueryString)},
>-    {"eglQuerySurface", P(egl::QuerySurface)},
>-    {"eglQuerySurfacePointerANGLE", P(egl::QuerySurfacePointerANGLE)},
>-    {"eglReleaseDeviceANGLE", P(egl::ReleaseDeviceANGLE)},
>-    {"eglReleaseTexImage", P(egl::ReleaseTexImage)},
>-    {"eglReleaseThread", P(egl::ReleaseThread)},
>-    {"eglStreamAttribKHR", P(egl::StreamAttribKHR)},
>-    {"eglStreamConsumerAcquireKHR", P(egl::StreamConsumerAcquireKHR)},
>+    {"eglBindAPI", P(EGL_BindAPI)},
>+    {"eglBindTexImage", P(EGL_BindTexImage)},
>+    {"eglChooseConfig", P(EGL_ChooseConfig)},
>+    {"eglClientWaitSync", P(EGL_ClientWaitSync)},
>+    {"eglClientWaitSyncKHR", P(EGL_ClientWaitSyncKHR)},
>+    {"eglCopyBuffers", P(EGL_CopyBuffers)},
>+    {"eglCreateContext", P(EGL_CreateContext)},
>+    {"eglCreateDeviceANGLE", P(EGL_CreateDeviceANGLE)},
>+    {"eglCreateImage", P(EGL_CreateImage)},
>+    {"eglCreateImageKHR", P(EGL_CreateImageKHR)},
>+    {"eglCreatePbufferFromClientBuffer", P(EGL_CreatePbufferFromClientBuffer)},
>+    {"eglCreatePbufferSurface", P(EGL_CreatePbufferSurface)},
>+    {"eglCreatePixmapSurface", P(EGL_CreatePixmapSurface)},
>+    {"eglCreatePlatformPixmapSurface", P(EGL_CreatePlatformPixmapSurface)},
>+    {"eglCreatePlatformPixmapSurfaceEXT", P(EGL_CreatePlatformPixmapSurfaceEXT)},
>+    {"eglCreatePlatformWindowSurface", P(EGL_CreatePlatformWindowSurface)},
>+    {"eglCreatePlatformWindowSurfaceEXT", P(EGL_CreatePlatformWindowSurfaceEXT)},
>+    {"eglCreateStreamKHR", P(EGL_CreateStreamKHR)},
>+    {"eglCreateStreamProducerD3DTextureANGLE", P(EGL_CreateStreamProducerD3DTextureANGLE)},
>+    {"eglCreateSync", P(EGL_CreateSync)},
>+    {"eglCreateSyncKHR", P(EGL_CreateSyncKHR)},
>+    {"eglCreateWindowSurface", P(EGL_CreateWindowSurface)},
>+    {"eglDebugMessageControlKHR", P(EGL_DebugMessageControlKHR)},
>+    {"eglDestroyContext", P(EGL_DestroyContext)},
>+    {"eglDestroyImage", P(EGL_DestroyImage)},
>+    {"eglDestroyImageKHR", P(EGL_DestroyImageKHR)},
>+    {"eglDestroyStreamKHR", P(EGL_DestroyStreamKHR)},
>+    {"eglDestroySurface", P(EGL_DestroySurface)},
>+    {"eglDestroySync", P(EGL_DestroySync)},
>+    {"eglDestroySyncKHR", P(EGL_DestroySyncKHR)},
>+    {"eglGetCompositorTimingANDROID", P(EGL_GetCompositorTimingANDROID)},
>+    {"eglGetCompositorTimingSupportedANDROID", P(EGL_GetCompositorTimingSupportedANDROID)},
>+    {"eglGetConfigAttrib", P(EGL_GetConfigAttrib)},
>+    {"eglGetConfigs", P(EGL_GetConfigs)},
>+    {"eglGetCurrentContext", P(EGL_GetCurrentContext)},
>+    {"eglGetCurrentDisplay", P(EGL_GetCurrentDisplay)},
>+    {"eglGetCurrentSurface", P(EGL_GetCurrentSurface)},
>+    {"eglGetDisplay", P(EGL_GetDisplay)},
>+    {"eglGetError", P(EGL_GetError)},
>+    {"eglGetFrameTimestampSupportedANDROID", P(EGL_GetFrameTimestampSupportedANDROID)},
>+    {"eglGetFrameTimestampsANDROID", P(EGL_GetFrameTimestampsANDROID)},
>+    {"eglGetNextFrameIdANDROID", P(EGL_GetNextFrameIdANDROID)},
>+    {"eglGetPlatformDisplay", P(EGL_GetPlatformDisplay)},
>+    {"eglGetPlatformDisplayEXT", P(EGL_GetPlatformDisplayEXT)},
>+    {"eglGetProcAddress", P(EGL_GetProcAddress)},
>+    {"eglGetSyncAttrib", P(EGL_GetSyncAttrib)},
>+    {"eglGetSyncAttribKHR", P(EGL_GetSyncAttribKHR)},
>+    {"eglGetSyncValuesCHROMIUM", P(EGL_GetSyncValuesCHROMIUM)},
>+    {"eglInitialize", P(EGL_Initialize)},
>+    {"eglLabelObjectKHR", P(EGL_LabelObjectKHR)},
>+    {"eglMakeCurrent", P(EGL_MakeCurrent)},
>+    {"eglPostSubBufferNV", P(EGL_PostSubBufferNV)},
>+    {"eglPresentationTimeANDROID", P(EGL_PresentationTimeANDROID)},
>+    {"eglProgramCacheGetAttribANGLE", P(EGL_ProgramCacheGetAttribANGLE)},
>+    {"eglProgramCachePopulateANGLE", P(EGL_ProgramCachePopulateANGLE)},
>+    {"eglProgramCacheQueryANGLE", P(EGL_ProgramCacheQueryANGLE)},
>+    {"eglProgramCacheResizeANGLE", P(EGL_ProgramCacheResizeANGLE)},
>+    {"eglQueryAPI", P(EGL_QueryAPI)},
>+    {"eglQueryContext", P(EGL_QueryContext)},
>+    {"eglQueryDebugKHR", P(EGL_QueryDebugKHR)},
>+    {"eglQueryDeviceAttribEXT", P(EGL_QueryDeviceAttribEXT)},
>+    {"eglQueryDeviceStringEXT", P(EGL_QueryDeviceStringEXT)},
>+    {"eglQueryDisplayAttribEXT", P(EGL_QueryDisplayAttribEXT)},
>+    {"eglQueryStreamKHR", P(EGL_QueryStreamKHR)},
>+    {"eglQueryStreamu64KHR", P(EGL_QueryStreamu64KHR)},
>+    {"eglQueryString", P(EGL_QueryString)},
>+    {"eglQuerySurface", P(EGL_QuerySurface)},
>+    {"eglQuerySurfacePointerANGLE", P(EGL_QuerySurfacePointerANGLE)},
>+    {"eglReleaseDeviceANGLE", P(EGL_ReleaseDeviceANGLE)},
>+    {"eglReleaseTexImage", P(EGL_ReleaseTexImage)},
>+    {"eglReleaseThread", P(EGL_ReleaseThread)},
>+    {"eglSetBlobCacheFuncsANDROID", P(EGL_SetBlobCacheFuncsANDROID)},
>+    {"eglStreamAttribKHR", P(EGL_StreamAttribKHR)},
>+    {"eglStreamConsumerAcquireKHR", P(EGL_StreamConsumerAcquireKHR)},
>     {"eglStreamConsumerGLTextureExternalAttribsNV",
>-     P(egl::StreamConsumerGLTextureExternalAttribsNV)},
>-    {"eglStreamConsumerGLTextureExternalKHR", P(egl::StreamConsumerGLTextureExternalKHR)},
>-    {"eglStreamConsumerReleaseKHR", P(egl::StreamConsumerReleaseKHR)},
>-    {"eglStreamPostD3DTextureNV12ANGLE", P(egl::StreamPostD3DTextureNV12ANGLE)},
>-    {"eglSurfaceAttrib", P(egl::SurfaceAttrib)},
>-    {"eglSwapBuffers", P(egl::SwapBuffers)},
>-    {"eglSwapBuffersWithDamageEXT", P(egl::SwapBuffersWithDamageEXT)},
>-    {"eglSwapInterval", P(egl::SwapInterval)},
>-    {"eglTerminate", P(egl::Terminate)},
>-    {"eglWaitClient", P(egl::WaitClient)},
>-    {"eglWaitGL", P(egl::WaitGL)},
>-    {"eglWaitNative", P(egl::WaitNative)},
>-    {"eglWaitSync", P(egl::WaitSync)},
>+     P(EGL_StreamConsumerGLTextureExternalAttribsNV)},
>+    {"eglStreamConsumerGLTextureExternalKHR", P(EGL_StreamConsumerGLTextureExternalKHR)},
>+    {"eglStreamConsumerReleaseKHR", P(EGL_StreamConsumerReleaseKHR)},
>+    {"eglStreamPostD3DTextureANGLE", P(EGL_StreamPostD3DTextureANGLE)},
>+    {"eglSurfaceAttrib", P(EGL_SurfaceAttrib)},
>+    {"eglSwapBuffers", P(EGL_SwapBuffers)},
>+    {"eglSwapBuffersWithDamageKHR", P(EGL_SwapBuffersWithDamageKHR)},
>+    {"eglSwapInterval", P(EGL_SwapInterval)},
>+    {"eglTerminate", P(EGL_Terminate)},
>+    {"eglWaitClient", P(EGL_WaitClient)},
>+    {"eglWaitGL", P(EGL_WaitGL)},
>+    {"eglWaitNative", P(EGL_WaitNative)},
>+    {"eglWaitSync", P(EGL_WaitSync)},
>+    {"eglWaitSyncKHR", P(EGL_WaitSyncKHR)},
>     {"glActiveShaderProgram", P(gl::ActiveShaderProgram)},
>+    {"glActiveShaderProgramContextANGLE", P(gl::ActiveShaderProgramContextANGLE)},
>     {"glActiveTexture", P(gl::ActiveTexture)},
>+    {"glActiveTextureContextANGLE", P(gl::ActiveTextureContextANGLE)},
>+    {"glAlphaFunc", P(gl::AlphaFunc)},
>+    {"glAlphaFuncContextANGLE", P(gl::AlphaFuncContextANGLE)},
>+    {"glAlphaFuncx", P(gl::AlphaFuncx)},
>+    {"glAlphaFuncxContextANGLE", P(gl::AlphaFuncxContextANGLE)},
>     {"glAttachShader", P(gl::AttachShader)},
>+    {"glAttachShaderContextANGLE", P(gl::AttachShaderContextANGLE)},
>     {"glBeginQuery", P(gl::BeginQuery)},
>+    {"glBeginQueryContextANGLE", P(gl::BeginQueryContextANGLE)},
>     {"glBeginQueryEXT", P(gl::BeginQueryEXT)},
>+    {"glBeginQueryEXTContextANGLE", P(gl::BeginQueryEXTContextANGLE)},
>     {"glBeginTransformFeedback", P(gl::BeginTransformFeedback)},
>+    {"glBeginTransformFeedbackContextANGLE", P(gl::BeginTransformFeedbackContextANGLE)},
>     {"glBindAttribLocation", P(gl::BindAttribLocation)},
>+    {"glBindAttribLocationContextANGLE", P(gl::BindAttribLocationContextANGLE)},
>     {"glBindBuffer", P(gl::BindBuffer)},
>     {"glBindBufferBase", P(gl::BindBufferBase)},
>+    {"glBindBufferBaseContextANGLE", P(gl::BindBufferBaseContextANGLE)},
>+    {"glBindBufferContextANGLE", P(gl::BindBufferContextANGLE)},
>     {"glBindBufferRange", P(gl::BindBufferRange)},
>+    {"glBindBufferRangeContextANGLE", P(gl::BindBufferRangeContextANGLE)},
>+    {"glBindFragDataLocationEXT", P(gl::BindFragDataLocationEXT)},
>+    {"glBindFragDataLocationEXTContextANGLE", P(gl::BindFragDataLocationEXTContextANGLE)},
>+    {"glBindFragDataLocationIndexedEXT", P(gl::BindFragDataLocationIndexedEXT)},
>+    {"glBindFragDataLocationIndexedEXTContextANGLE",
>+     P(gl::BindFragDataLocationIndexedEXTContextANGLE)},
>+    {"glBindFragmentInputLocationCHROMIUM", P(gl::BindFragmentInputLocationCHROMIUM)},
>+    {"glBindFragmentInputLocationCHROMIUMContextANGLE",
>+     P(gl::BindFragmentInputLocationCHROMIUMContextANGLE)},
>     {"glBindFramebuffer", P(gl::BindFramebuffer)},
>+    {"glBindFramebufferContextANGLE", P(gl::BindFramebufferContextANGLE)},
>     {"glBindImageTexture", P(gl::BindImageTexture)},
>+    {"glBindImageTextureContextANGLE", P(gl::BindImageTextureContextANGLE)},
>     {"glBindProgramPipeline", P(gl::BindProgramPipeline)},
>+    {"glBindProgramPipelineContextANGLE", P(gl::BindProgramPipelineContextANGLE)},
>     {"glBindRenderbuffer", P(gl::BindRenderbuffer)},
>+    {"glBindRenderbufferContextANGLE", P(gl::BindRenderbufferContextANGLE)},
>     {"glBindSampler", P(gl::BindSampler)},
>+    {"glBindSamplerContextANGLE", P(gl::BindSamplerContextANGLE)},
>     {"glBindTexture", P(gl::BindTexture)},
>+    {"glBindTextureContextANGLE", P(gl::BindTextureContextANGLE)},
>     {"glBindTransformFeedback", P(gl::BindTransformFeedback)},
>+    {"glBindTransformFeedbackContextANGLE", P(gl::BindTransformFeedbackContextANGLE)},
>     {"glBindUniformLocationCHROMIUM", P(gl::BindUniformLocationCHROMIUM)},
>+    {"glBindUniformLocationCHROMIUMContextANGLE", P(gl::BindUniformLocationCHROMIUMContextANGLE)},
>     {"glBindVertexArray", P(gl::BindVertexArray)},
>+    {"glBindVertexArrayContextANGLE", P(gl::BindVertexArrayContextANGLE)},
>     {"glBindVertexArrayOES", P(gl::BindVertexArrayOES)},
>+    {"glBindVertexArrayOESContextANGLE", P(gl::BindVertexArrayOESContextANGLE)},
>     {"glBindVertexBuffer", P(gl::BindVertexBuffer)},
>+    {"glBindVertexBufferContextANGLE", P(gl::BindVertexBufferContextANGLE)},
>     {"glBlendColor", P(gl::BlendColor)},
>+    {"glBlendColorContextANGLE", P(gl::BlendColorContextANGLE)},
>     {"glBlendEquation", P(gl::BlendEquation)},
>+    {"glBlendEquationContextANGLE", P(gl::BlendEquationContextANGLE)},
>     {"glBlendEquationSeparate", P(gl::BlendEquationSeparate)},
>+    {"glBlendEquationSeparateContextANGLE", P(gl::BlendEquationSeparateContextANGLE)},
>     {"glBlendFunc", P(gl::BlendFunc)},
>+    {"glBlendFuncContextANGLE", P(gl::BlendFuncContextANGLE)},
>     {"glBlendFuncSeparate", P(gl::BlendFuncSeparate)},
>+    {"glBlendFuncSeparateContextANGLE", P(gl::BlendFuncSeparateContextANGLE)},
>     {"glBlitFramebuffer", P(gl::BlitFramebuffer)},
>     {"glBlitFramebufferANGLE", P(gl::BlitFramebufferANGLE)},
>+    {"glBlitFramebufferANGLEContextANGLE", P(gl::BlitFramebufferANGLEContextANGLE)},
>+    {"glBlitFramebufferContextANGLE", P(gl::BlitFramebufferContextANGLE)},
>     {"glBufferData", P(gl::BufferData)},
>+    {"glBufferDataContextANGLE", P(gl::BufferDataContextANGLE)},
>+    {"glBufferStorageMemEXT", P(gl::BufferStorageMemEXT)},
>+    {"glBufferStorageMemEXTContextANGLE", P(gl::BufferStorageMemEXTContextANGLE)},
>     {"glBufferSubData", P(gl::BufferSubData)},
>+    {"glBufferSubDataContextANGLE", P(gl::BufferSubDataContextANGLE)},
>     {"glCheckFramebufferStatus", P(gl::CheckFramebufferStatus)},
>+    {"glCheckFramebufferStatusContextANGLE", P(gl::CheckFramebufferStatusContextANGLE)},
>     {"glClear", P(gl::Clear)},
>     {"glClearBufferfi", P(gl::ClearBufferfi)},
>+    {"glClearBufferfiContextANGLE", P(gl::ClearBufferfiContextANGLE)},
>     {"glClearBufferfv", P(gl::ClearBufferfv)},
>+    {"glClearBufferfvContextANGLE", P(gl::ClearBufferfvContextANGLE)},
>     {"glClearBufferiv", P(gl::ClearBufferiv)},
>+    {"glClearBufferivContextANGLE", P(gl::ClearBufferivContextANGLE)},
>     {"glClearBufferuiv", P(gl::ClearBufferuiv)},
>+    {"glClearBufferuivContextANGLE", P(gl::ClearBufferuivContextANGLE)},
>     {"glClearColor", P(gl::ClearColor)},
>+    {"glClearColorContextANGLE", P(gl::ClearColorContextANGLE)},
>+    {"glClearColorx", P(gl::ClearColorx)},
>+    {"glClearColorxContextANGLE", P(gl::ClearColorxContextANGLE)},
>+    {"glClearContextANGLE", P(gl::ClearContextANGLE)},
>     {"glClearDepthf", P(gl::ClearDepthf)},
>+    {"glClearDepthfContextANGLE", P(gl::ClearDepthfContextANGLE)},
>+    {"glClearDepthx", P(gl::ClearDepthx)},
>+    {"glClearDepthxContextANGLE", P(gl::ClearDepthxContextANGLE)},
>     {"glClearStencil", P(gl::ClearStencil)},
>+    {"glClearStencilContextANGLE", P(gl::ClearStencilContextANGLE)},
>+    {"glClientActiveTexture", P(gl::ClientActiveTexture)},
>+    {"glClientActiveTextureContextANGLE", P(gl::ClientActiveTextureContextANGLE)},
>     {"glClientWaitSync", P(gl::ClientWaitSync)},
>+    {"glClientWaitSyncContextANGLE", P(gl::ClientWaitSyncContextANGLE)},
>+    {"glClipPlanef", P(gl::ClipPlanef)},
>+    {"glClipPlanefContextANGLE", P(gl::ClipPlanefContextANGLE)},
>+    {"glClipPlanex", P(gl::ClipPlanex)},
>+    {"glClipPlanexContextANGLE", P(gl::ClipPlanexContextANGLE)},
>+    {"glColor4f", P(gl::Color4f)},
>+    {"glColor4fContextANGLE", P(gl::Color4fContextANGLE)},
>+    {"glColor4ub", P(gl::Color4ub)},
>+    {"glColor4ubContextANGLE", P(gl::Color4ubContextANGLE)},
>+    {"glColor4x", P(gl::Color4x)},
>+    {"glColor4xContextANGLE", P(gl::Color4xContextANGLE)},
>     {"glColorMask", P(gl::ColorMask)},
>+    {"glColorMaskContextANGLE", P(gl::ColorMaskContextANGLE)},
>+    {"glColorPointer", P(gl::ColorPointer)},
>+    {"glColorPointerContextANGLE", P(gl::ColorPointerContextANGLE)},
>     {"glCompileShader", P(gl::CompileShader)},
>+    {"glCompileShaderContextANGLE", P(gl::CompileShaderContextANGLE)},
>     {"glCompressedCopyTextureCHROMIUM", P(gl::CompressedCopyTextureCHROMIUM)},
>+    {"glCompressedCopyTextureCHROMIUMContextANGLE",
>+     P(gl::CompressedCopyTextureCHROMIUMContextANGLE)},
>     {"glCompressedTexImage2D", P(gl::CompressedTexImage2D)},
>+    {"glCompressedTexImage2DContextANGLE", P(gl::CompressedTexImage2DContextANGLE)},
>     {"glCompressedTexImage2DRobustANGLE", P(gl::CompressedTexImage2DRobustANGLE)},
>+    {"glCompressedTexImage2DRobustANGLEContextANGLE",
>+     P(gl::CompressedTexImage2DRobustANGLEContextANGLE)},
>     {"glCompressedTexImage3D", P(gl::CompressedTexImage3D)},
>+    {"glCompressedTexImage3DContextANGLE", P(gl::CompressedTexImage3DContextANGLE)},
>     {"glCompressedTexImage3DRobustANGLE", P(gl::CompressedTexImage3DRobustANGLE)},
>+    {"glCompressedTexImage3DRobustANGLEContextANGLE",
>+     P(gl::CompressedTexImage3DRobustANGLEContextANGLE)},
>     {"glCompressedTexSubImage2D", P(gl::CompressedTexSubImage2D)},
>+    {"glCompressedTexSubImage2DContextANGLE", P(gl::CompressedTexSubImage2DContextANGLE)},
>     {"glCompressedTexSubImage2DRobustANGLE", P(gl::CompressedTexSubImage2DRobustANGLE)},
>+    {"glCompressedTexSubImage2DRobustANGLEContextANGLE",
>+     P(gl::CompressedTexSubImage2DRobustANGLEContextANGLE)},
>     {"glCompressedTexSubImage3D", P(gl::CompressedTexSubImage3D)},
>+    {"glCompressedTexSubImage3DContextANGLE", P(gl::CompressedTexSubImage3DContextANGLE)},
>     {"glCompressedTexSubImage3DRobustANGLE", P(gl::CompressedTexSubImage3DRobustANGLE)},
>+    {"glCompressedTexSubImage3DRobustANGLEContextANGLE",
>+     P(gl::CompressedTexSubImage3DRobustANGLEContextANGLE)},
>     {"glCopyBufferSubData", P(gl::CopyBufferSubData)},
>+    {"glCopyBufferSubDataContextANGLE", P(gl::CopyBufferSubDataContextANGLE)},
>+    {"glCopySubTexture3DANGLE", P(gl::CopySubTexture3DANGLE)},
>+    {"glCopySubTexture3DANGLEContextANGLE", P(gl::CopySubTexture3DANGLEContextANGLE)},
>     {"glCopySubTextureCHROMIUM", P(gl::CopySubTextureCHROMIUM)},
>+    {"glCopySubTextureCHROMIUMContextANGLE", P(gl::CopySubTextureCHROMIUMContextANGLE)},
>     {"glCopyTexImage2D", P(gl::CopyTexImage2D)},
>+    {"glCopyTexImage2DContextANGLE", P(gl::CopyTexImage2DContextANGLE)},
>     {"glCopyTexSubImage2D", P(gl::CopyTexSubImage2D)},
>+    {"glCopyTexSubImage2DContextANGLE", P(gl::CopyTexSubImage2DContextANGLE)},
>     {"glCopyTexSubImage3D", P(gl::CopyTexSubImage3D)},
>+    {"glCopyTexSubImage3DContextANGLE", P(gl::CopyTexSubImage3DContextANGLE)},
>+    {"glCopyTexture3DANGLE", P(gl::CopyTexture3DANGLE)},
>+    {"glCopyTexture3DANGLEContextANGLE", P(gl::CopyTexture3DANGLEContextANGLE)},
>     {"glCopyTextureCHROMIUM", P(gl::CopyTextureCHROMIUM)},
>+    {"glCopyTextureCHROMIUMContextANGLE", P(gl::CopyTextureCHROMIUMContextANGLE)},
>+    {"glCoverFillPathCHROMIUM", P(gl::CoverFillPathCHROMIUM)},
>+    {"glCoverFillPathCHROMIUMContextANGLE", P(gl::CoverFillPathCHROMIUMContextANGLE)},
>+    {"glCoverFillPathInstancedCHROMIUM", P(gl::CoverFillPathInstancedCHROMIUM)},
>+    {"glCoverFillPathInstancedCHROMIUMContextANGLE",
>+     P(gl::CoverFillPathInstancedCHROMIUMContextANGLE)},
>+    {"glCoverStrokePathCHROMIUM", P(gl::CoverStrokePathCHROMIUM)},
>+    {"glCoverStrokePathCHROMIUMContextANGLE", P(gl::CoverStrokePathCHROMIUMContextANGLE)},
>+    {"glCoverStrokePathInstancedCHROMIUM", P(gl::CoverStrokePathInstancedCHROMIUM)},
>+    {"glCoverStrokePathInstancedCHROMIUMContextANGLE",
>+     P(gl::CoverStrokePathInstancedCHROMIUMContextANGLE)},
>+    {"glCoverageModulationCHROMIUM", P(gl::CoverageModulationCHROMIUM)},
>+    {"glCoverageModulationCHROMIUMContextANGLE", P(gl::CoverageModulationCHROMIUMContextANGLE)},
>+    {"glCreateMemoryObjectsEXT", P(gl::CreateMemoryObjectsEXT)},
>+    {"glCreateMemoryObjectsEXTContextANGLE", P(gl::CreateMemoryObjectsEXTContextANGLE)},
>     {"glCreateProgram", P(gl::CreateProgram)},
>+    {"glCreateProgramContextANGLE", P(gl::CreateProgramContextANGLE)},
>     {"glCreateShader", P(gl::CreateShader)},
>+    {"glCreateShaderContextANGLE", P(gl::CreateShaderContextANGLE)},
>     {"glCreateShaderProgramv", P(gl::CreateShaderProgramv)},
>+    {"glCreateShaderProgramvContextANGLE", P(gl::CreateShaderProgramvContextANGLE)},
>     {"glCullFace", P(gl::CullFace)},
>+    {"glCullFaceContextANGLE", P(gl::CullFaceContextANGLE)},
>+    {"glCurrentPaletteMatrixOES", P(gl::CurrentPaletteMatrixOES)},
>+    {"glCurrentPaletteMatrixOESContextANGLE", P(gl::CurrentPaletteMatrixOESContextANGLE)},
>     {"glDebugMessageCallbackKHR", P(gl::DebugMessageCallbackKHR)},
>+    {"glDebugMessageCallbackKHRContextANGLE", P(gl::DebugMessageCallbackKHRContextANGLE)},
>     {"glDebugMessageControlKHR", P(gl::DebugMessageControlKHR)},
>+    {"glDebugMessageControlKHRContextANGLE", P(gl::DebugMessageControlKHRContextANGLE)},
>     {"glDebugMessageInsertKHR", P(gl::DebugMessageInsertKHR)},
>+    {"glDebugMessageInsertKHRContextANGLE", P(gl::DebugMessageInsertKHRContextANGLE)},
>     {"glDeleteBuffers", P(gl::DeleteBuffers)},
>+    {"glDeleteBuffersContextANGLE", P(gl::DeleteBuffersContextANGLE)},
>     {"glDeleteFencesNV", P(gl::DeleteFencesNV)},
>+    {"glDeleteFencesNVContextANGLE", P(gl::DeleteFencesNVContextANGLE)},
>     {"glDeleteFramebuffers", P(gl::DeleteFramebuffers)},
>+    {"glDeleteFramebuffersContextANGLE", P(gl::DeleteFramebuffersContextANGLE)},
>+    {"glDeleteMemoryObjectsEXT", P(gl::DeleteMemoryObjectsEXT)},
>+    {"glDeleteMemoryObjectsEXTContextANGLE", P(gl::DeleteMemoryObjectsEXTContextANGLE)},
>+    {"glDeletePathsCHROMIUM", P(gl::DeletePathsCHROMIUM)},
>+    {"glDeletePathsCHROMIUMContextANGLE", P(gl::DeletePathsCHROMIUMContextANGLE)},
>     {"glDeleteProgram", P(gl::DeleteProgram)},
>+    {"glDeleteProgramContextANGLE", P(gl::DeleteProgramContextANGLE)},
>     {"glDeleteProgramPipelines", P(gl::DeleteProgramPipelines)},
>+    {"glDeleteProgramPipelinesContextANGLE", P(gl::DeleteProgramPipelinesContextANGLE)},
>     {"glDeleteQueries", P(gl::DeleteQueries)},
>+    {"glDeleteQueriesContextANGLE", P(gl::DeleteQueriesContextANGLE)},
>     {"glDeleteQueriesEXT", P(gl::DeleteQueriesEXT)},
>+    {"glDeleteQueriesEXTContextANGLE", P(gl::DeleteQueriesEXTContextANGLE)},
>     {"glDeleteRenderbuffers", P(gl::DeleteRenderbuffers)},
>+    {"glDeleteRenderbuffersContextANGLE", P(gl::DeleteRenderbuffersContextANGLE)},
>     {"glDeleteSamplers", P(gl::DeleteSamplers)},
>+    {"glDeleteSamplersContextANGLE", P(gl::DeleteSamplersContextANGLE)},
>+    {"glDeleteSemaphoresEXT", P(gl::DeleteSemaphoresEXT)},
>+    {"glDeleteSemaphoresEXTContextANGLE", P(gl::DeleteSemaphoresEXTContextANGLE)},
>     {"glDeleteShader", P(gl::DeleteShader)},
>+    {"glDeleteShaderContextANGLE", P(gl::DeleteShaderContextANGLE)},
>     {"glDeleteSync", P(gl::DeleteSync)},
>+    {"glDeleteSyncContextANGLE", P(gl::DeleteSyncContextANGLE)},
>     {"glDeleteTextures", P(gl::DeleteTextures)},
>+    {"glDeleteTexturesContextANGLE", P(gl::DeleteTexturesContextANGLE)},
>     {"glDeleteTransformFeedbacks", P(gl::DeleteTransformFeedbacks)},
>+    {"glDeleteTransformFeedbacksContextANGLE", P(gl::DeleteTransformFeedbacksContextANGLE)},
>     {"glDeleteVertexArrays", P(gl::DeleteVertexArrays)},
>+    {"glDeleteVertexArraysContextANGLE", P(gl::DeleteVertexArraysContextANGLE)},
>     {"glDeleteVertexArraysOES", P(gl::DeleteVertexArraysOES)},
>+    {"glDeleteVertexArraysOESContextANGLE", P(gl::DeleteVertexArraysOESContextANGLE)},
>     {"glDepthFunc", P(gl::DepthFunc)},
>+    {"glDepthFuncContextANGLE", P(gl::DepthFuncContextANGLE)},
>     {"glDepthMask", P(gl::DepthMask)},
>+    {"glDepthMaskContextANGLE", P(gl::DepthMaskContextANGLE)},
>     {"glDepthRangef", P(gl::DepthRangef)},
>+    {"glDepthRangefContextANGLE", P(gl::DepthRangefContextANGLE)},
>+    {"glDepthRangex", P(gl::DepthRangex)},
>+    {"glDepthRangexContextANGLE", P(gl::DepthRangexContextANGLE)},
>     {"glDetachShader", P(gl::DetachShader)},
>+    {"glDetachShaderContextANGLE", P(gl::DetachShaderContextANGLE)},
>     {"glDisable", P(gl::Disable)},
>+    {"glDisableClientState", P(gl::DisableClientState)},
>+    {"glDisableClientStateContextANGLE", P(gl::DisableClientStateContextANGLE)},
>+    {"glDisableContextANGLE", P(gl::DisableContextANGLE)},
>     {"glDisableVertexAttribArray", P(gl::DisableVertexAttribArray)},
>+    {"glDisableVertexAttribArrayContextANGLE", P(gl::DisableVertexAttribArrayContextANGLE)},
>     {"glDiscardFramebufferEXT", P(gl::DiscardFramebufferEXT)},
>+    {"glDiscardFramebufferEXTContextANGLE", P(gl::DiscardFramebufferEXTContextANGLE)},
>     {"glDispatchCompute", P(gl::DispatchCompute)},
>+    {"glDispatchComputeContextANGLE", P(gl::DispatchComputeContextANGLE)},
>     {"glDispatchComputeIndirect", P(gl::DispatchComputeIndirect)},
>+    {"glDispatchComputeIndirectContextANGLE", P(gl::DispatchComputeIndirectContextANGLE)},
>     {"glDrawArrays", P(gl::DrawArrays)},
>+    {"glDrawArraysContextANGLE", P(gl::DrawArraysContextANGLE)},
>     {"glDrawArraysIndirect", P(gl::DrawArraysIndirect)},
>+    {"glDrawArraysIndirectContextANGLE", P(gl::DrawArraysIndirectContextANGLE)},
>     {"glDrawArraysInstanced", P(gl::DrawArraysInstanced)},
>     {"glDrawArraysInstancedANGLE", P(gl::DrawArraysInstancedANGLE)},
>+    {"glDrawArraysInstancedANGLEContextANGLE", P(gl::DrawArraysInstancedANGLEContextANGLE)},
>+    {"glDrawArraysInstancedContextANGLE", P(gl::DrawArraysInstancedContextANGLE)},
>+    {"glDrawArraysInstancedEXT", P(gl::DrawArraysInstancedEXT)},
>+    {"glDrawArraysInstancedEXTContextANGLE", P(gl::DrawArraysInstancedEXTContextANGLE)},
>     {"glDrawBuffers", P(gl::DrawBuffers)},
>+    {"glDrawBuffersContextANGLE", P(gl::DrawBuffersContextANGLE)},
>     {"glDrawBuffersEXT", P(gl::DrawBuffersEXT)},
>+    {"glDrawBuffersEXTContextANGLE", P(gl::DrawBuffersEXTContextANGLE)},
>     {"glDrawElements", P(gl::DrawElements)},
>+    {"glDrawElementsContextANGLE", P(gl::DrawElementsContextANGLE)},
>     {"glDrawElementsIndirect", P(gl::DrawElementsIndirect)},
>+    {"glDrawElementsIndirectContextANGLE", P(gl::DrawElementsIndirectContextANGLE)},
>     {"glDrawElementsInstanced", P(gl::DrawElementsInstanced)},
>     {"glDrawElementsInstancedANGLE", P(gl::DrawElementsInstancedANGLE)},
>+    {"glDrawElementsInstancedANGLEContextANGLE", P(gl::DrawElementsInstancedANGLEContextANGLE)},
>+    {"glDrawElementsInstancedContextANGLE", P(gl::DrawElementsInstancedContextANGLE)},
>+    {"glDrawElementsInstancedEXT", P(gl::DrawElementsInstancedEXT)},
>+    {"glDrawElementsInstancedEXTContextANGLE", P(gl::DrawElementsInstancedEXTContextANGLE)},
>     {"glDrawRangeElements", P(gl::DrawRangeElements)},
>+    {"glDrawRangeElementsContextANGLE", P(gl::DrawRangeElementsContextANGLE)},
>+    {"glDrawTexfOES", P(gl::DrawTexfOES)},
>+    {"glDrawTexfOESContextANGLE", P(gl::DrawTexfOESContextANGLE)},
>+    {"glDrawTexfvOES", P(gl::DrawTexfvOES)},
>+    {"glDrawTexfvOESContextANGLE", P(gl::DrawTexfvOESContextANGLE)},
>+    {"glDrawTexiOES", P(gl::DrawTexiOES)},
>+    {"glDrawTexiOESContextANGLE", P(gl::DrawTexiOESContextANGLE)},
>+    {"glDrawTexivOES", P(gl::DrawTexivOES)},
>+    {"glDrawTexivOESContextANGLE", P(gl::DrawTexivOESContextANGLE)},
>+    {"glDrawTexsOES", P(gl::DrawTexsOES)},
>+    {"glDrawTexsOESContextANGLE", P(gl::DrawTexsOESContextANGLE)},
>+    {"glDrawTexsvOES", P(gl::DrawTexsvOES)},
>+    {"glDrawTexsvOESContextANGLE", P(gl::DrawTexsvOESContextANGLE)},
>+    {"glDrawTexxOES", P(gl::DrawTexxOES)},
>+    {"glDrawTexxOESContextANGLE", P(gl::DrawTexxOESContextANGLE)},
>+    {"glDrawTexxvOES", P(gl::DrawTexxvOES)},
>+    {"glDrawTexxvOESContextANGLE", P(gl::DrawTexxvOESContextANGLE)},
>     {"glEGLImageTargetRenderbufferStorageOES", P(gl::EGLImageTargetRenderbufferStorageOES)},
>+    {"glEGLImageTargetRenderbufferStorageOESContextANGLE",
>+     P(gl::EGLImageTargetRenderbufferStorageOESContextANGLE)},
>     {"glEGLImageTargetTexture2DOES", P(gl::EGLImageTargetTexture2DOES)},
>+    {"glEGLImageTargetTexture2DOESContextANGLE", P(gl::EGLImageTargetTexture2DOESContextANGLE)},
>     {"glEnable", P(gl::Enable)},
>+    {"glEnableClientState", P(gl::EnableClientState)},
>+    {"glEnableClientStateContextANGLE", P(gl::EnableClientStateContextANGLE)},
>+    {"glEnableContextANGLE", P(gl::EnableContextANGLE)},
>     {"glEnableVertexAttribArray", P(gl::EnableVertexAttribArray)},
>+    {"glEnableVertexAttribArrayContextANGLE", P(gl::EnableVertexAttribArrayContextANGLE)},
>     {"glEndQuery", P(gl::EndQuery)},
>+    {"glEndQueryContextANGLE", P(gl::EndQueryContextANGLE)},
>     {"glEndQueryEXT", P(gl::EndQueryEXT)},
>+    {"glEndQueryEXTContextANGLE", P(gl::EndQueryEXTContextANGLE)},
>     {"glEndTransformFeedback", P(gl::EndTransformFeedback)},
>+    {"glEndTransformFeedbackContextANGLE", P(gl::EndTransformFeedbackContextANGLE)},
>     {"glFenceSync", P(gl::FenceSync)},
>+    {"glFenceSyncContextANGLE", P(gl::FenceSyncContextANGLE)},
>     {"glFinish", P(gl::Finish)},
>+    {"glFinishContextANGLE", P(gl::FinishContextANGLE)},
>     {"glFinishFenceNV", P(gl::FinishFenceNV)},
>+    {"glFinishFenceNVContextANGLE", P(gl::FinishFenceNVContextANGLE)},
>     {"glFlush", P(gl::Flush)},
>+    {"glFlushContextANGLE", P(gl::FlushContextANGLE)},
>     {"glFlushMappedBufferRange", P(gl::FlushMappedBufferRange)},
>+    {"glFlushMappedBufferRangeContextANGLE", P(gl::FlushMappedBufferRangeContextANGLE)},
>     {"glFlushMappedBufferRangeEXT", P(gl::FlushMappedBufferRangeEXT)},
>+    {"glFlushMappedBufferRangeEXTContextANGLE", P(gl::FlushMappedBufferRangeEXTContextANGLE)},
>+    {"glFogf", P(gl::Fogf)},
>+    {"glFogfContextANGLE", P(gl::FogfContextANGLE)},
>+    {"glFogfv", P(gl::Fogfv)},
>+    {"glFogfvContextANGLE", P(gl::FogfvContextANGLE)},
>+    {"glFogx", P(gl::Fogx)},
>+    {"glFogxContextANGLE", P(gl::FogxContextANGLE)},
>+    {"glFogxv", P(gl::Fogxv)},
>+    {"glFogxvContextANGLE", P(gl::FogxvContextANGLE)},
>     {"glFramebufferParameteri", P(gl::FramebufferParameteri)},
>+    {"glFramebufferParameteriContextANGLE", P(gl::FramebufferParameteriContextANGLE)},
>     {"glFramebufferRenderbuffer", P(gl::FramebufferRenderbuffer)},
>+    {"glFramebufferRenderbufferContextANGLE", P(gl::FramebufferRenderbufferContextANGLE)},
>     {"glFramebufferTexture2D", P(gl::FramebufferTexture2D)},
>+    {"glFramebufferTexture2DContextANGLE", P(gl::FramebufferTexture2DContextANGLE)},
>+    {"glFramebufferTextureEXT", P(gl::FramebufferTextureEXT)},
>+    {"glFramebufferTextureEXTContextANGLE", P(gl::FramebufferTextureEXTContextANGLE)},
>     {"glFramebufferTextureLayer", P(gl::FramebufferTextureLayer)},
>-    {"glFramebufferTextureMultiviewLayeredANGLE", P(gl::FramebufferTextureMultiviewLayeredANGLE)},
>-    {"glFramebufferTextureMultiviewSideBySideANGLE",
>-     P(gl::FramebufferTextureMultiviewSideBySideANGLE)},
>+    {"glFramebufferTextureLayerContextANGLE", P(gl::FramebufferTextureLayerContextANGLE)},
>+    {"glFramebufferTextureMultiviewOVR", P(gl::FramebufferTextureMultiviewOVR)},
>+    {"glFramebufferTextureMultiviewOVRContextANGLE",
>+     P(gl::FramebufferTextureMultiviewOVRContextANGLE)},
>     {"glFrontFace", P(gl::FrontFace)},
>+    {"glFrontFaceContextANGLE", P(gl::FrontFaceContextANGLE)},
>+    {"glFrustumf", P(gl::Frustumf)},
>+    {"glFrustumfContextANGLE", P(gl::FrustumfContextANGLE)},
>+    {"glFrustumx", P(gl::Frustumx)},
>+    {"glFrustumxContextANGLE", P(gl::FrustumxContextANGLE)},
>     {"glGenBuffers", P(gl::GenBuffers)},
>+    {"glGenBuffersContextANGLE", P(gl::GenBuffersContextANGLE)},
>     {"glGenFencesNV", P(gl::GenFencesNV)},
>+    {"glGenFencesNVContextANGLE", P(gl::GenFencesNVContextANGLE)},
>     {"glGenFramebuffers", P(gl::GenFramebuffers)},
>+    {"glGenFramebuffersContextANGLE", P(gl::GenFramebuffersContextANGLE)},
>+    {"glGenPathsCHROMIUM", P(gl::GenPathsCHROMIUM)},
>+    {"glGenPathsCHROMIUMContextANGLE", P(gl::GenPathsCHROMIUMContextANGLE)},
>     {"glGenProgramPipelines", P(gl::GenProgramPipelines)},
>+    {"glGenProgramPipelinesContextANGLE", P(gl::GenProgramPipelinesContextANGLE)},
>     {"glGenQueries", P(gl::GenQueries)},
>+    {"glGenQueriesContextANGLE", P(gl::GenQueriesContextANGLE)},
>     {"glGenQueriesEXT", P(gl::GenQueriesEXT)},
>+    {"glGenQueriesEXTContextANGLE", P(gl::GenQueriesEXTContextANGLE)},
>     {"glGenRenderbuffers", P(gl::GenRenderbuffers)},
>+    {"glGenRenderbuffersContextANGLE", P(gl::GenRenderbuffersContextANGLE)},
>     {"glGenSamplers", P(gl::GenSamplers)},
>+    {"glGenSamplersContextANGLE", P(gl::GenSamplersContextANGLE)},
>+    {"glGenSemaphoresEXT", P(gl::GenSemaphoresEXT)},
>+    {"glGenSemaphoresEXTContextANGLE", P(gl::GenSemaphoresEXTContextANGLE)},
>     {"glGenTextures", P(gl::GenTextures)},
>+    {"glGenTexturesContextANGLE", P(gl::GenTexturesContextANGLE)},
>     {"glGenTransformFeedbacks", P(gl::GenTransformFeedbacks)},
>+    {"glGenTransformFeedbacksContextANGLE", P(gl::GenTransformFeedbacksContextANGLE)},
>     {"glGenVertexArrays", P(gl::GenVertexArrays)},
>+    {"glGenVertexArraysContextANGLE", P(gl::GenVertexArraysContextANGLE)},
>     {"glGenVertexArraysOES", P(gl::GenVertexArraysOES)},
>+    {"glGenVertexArraysOESContextANGLE", P(gl::GenVertexArraysOESContextANGLE)},
>     {"glGenerateMipmap", P(gl::GenerateMipmap)},
>+    {"glGenerateMipmapContextANGLE", P(gl::GenerateMipmapContextANGLE)},
>     {"glGetActiveAttrib", P(gl::GetActiveAttrib)},
>+    {"glGetActiveAttribContextANGLE", P(gl::GetActiveAttribContextANGLE)},
>     {"glGetActiveUniform", P(gl::GetActiveUniform)},
>     {"glGetActiveUniformBlockName", P(gl::GetActiveUniformBlockName)},
>+    {"glGetActiveUniformBlockNameContextANGLE", P(gl::GetActiveUniformBlockNameContextANGLE)},
>     {"glGetActiveUniformBlockiv", P(gl::GetActiveUniformBlockiv)},
>+    {"glGetActiveUniformBlockivContextANGLE", P(gl::GetActiveUniformBlockivContextANGLE)},
>     {"glGetActiveUniformBlockivRobustANGLE", P(gl::GetActiveUniformBlockivRobustANGLE)},
>+    {"glGetActiveUniformBlockivRobustANGLEContextANGLE",
>+     P(gl::GetActiveUniformBlockivRobustANGLEContextANGLE)},
>+    {"glGetActiveUniformContextANGLE", P(gl::GetActiveUniformContextANGLE)},
>     {"glGetActiveUniformsiv", P(gl::GetActiveUniformsiv)},
>+    {"glGetActiveUniformsivContextANGLE", P(gl::GetActiveUniformsivContextANGLE)},
>     {"glGetAttachedShaders", P(gl::GetAttachedShaders)},
>+    {"glGetAttachedShadersContextANGLE", P(gl::GetAttachedShadersContextANGLE)},
>     {"glGetAttribLocation", P(gl::GetAttribLocation)},
>+    {"glGetAttribLocationContextANGLE", P(gl::GetAttribLocationContextANGLE)},
>     {"glGetBooleani_v", P(gl::GetBooleani_v)},
>+    {"glGetBooleani_vContextANGLE", P(gl::GetBooleani_vContextANGLE)},
>     {"glGetBooleani_vRobustANGLE", P(gl::GetBooleani_vRobustANGLE)},
>+    {"glGetBooleani_vRobustANGLEContextANGLE", P(gl::GetBooleani_vRobustANGLEContextANGLE)},
>     {"glGetBooleanv", P(gl::GetBooleanv)},
>+    {"glGetBooleanvContextANGLE", P(gl::GetBooleanvContextANGLE)},
>     {"glGetBooleanvRobustANGLE", P(gl::GetBooleanvRobustANGLE)},
>+    {"glGetBooleanvRobustANGLEContextANGLE", P(gl::GetBooleanvRobustANGLEContextANGLE)},
>     {"glGetBufferParameteri64v", P(gl::GetBufferParameteri64v)},
>+    {"glGetBufferParameteri64vContextANGLE", P(gl::GetBufferParameteri64vContextANGLE)},
>     {"glGetBufferParameteri64vRobustANGLE", P(gl::GetBufferParameteri64vRobustANGLE)},
>+    {"glGetBufferParameteri64vRobustANGLEContextANGLE",
>+     P(gl::GetBufferParameteri64vRobustANGLEContextANGLE)},
>     {"glGetBufferParameteriv", P(gl::GetBufferParameteriv)},
>+    {"glGetBufferParameterivContextANGLE", P(gl::GetBufferParameterivContextANGLE)},
>     {"glGetBufferParameterivRobustANGLE", P(gl::GetBufferParameterivRobustANGLE)},
>+    {"glGetBufferParameterivRobustANGLEContextANGLE",
>+     P(gl::GetBufferParameterivRobustANGLEContextANGLE)},
>     {"glGetBufferPointerv", P(gl::GetBufferPointerv)},
>+    {"glGetBufferPointervContextANGLE", P(gl::GetBufferPointervContextANGLE)},
>     {"glGetBufferPointervOES", P(gl::GetBufferPointervOES)},
>+    {"glGetBufferPointervOESContextANGLE", P(gl::GetBufferPointervOESContextANGLE)},
>     {"glGetBufferPointervRobustANGLE", P(gl::GetBufferPointervRobustANGLE)},
>+    {"glGetBufferPointervRobustANGLEContextANGLE", P(gl::GetBufferPointervRobustANGLEContextANGLE)},
>+    {"glGetClipPlanef", P(gl::GetClipPlanef)},
>+    {"glGetClipPlanefContextANGLE", P(gl::GetClipPlanefContextANGLE)},
>+    {"glGetClipPlanex", P(gl::GetClipPlanex)},
>+    {"glGetClipPlanexContextANGLE", P(gl::GetClipPlanexContextANGLE)},
>     {"glGetDebugMessageLogKHR", P(gl::GetDebugMessageLogKHR)},
>+    {"glGetDebugMessageLogKHRContextANGLE", P(gl::GetDebugMessageLogKHRContextANGLE)},
>     {"glGetError", P(gl::GetError)},
>+    {"glGetErrorContextANGLE", P(gl::GetErrorContextANGLE)},
>     {"glGetFenceivNV", P(gl::GetFenceivNV)},
>+    {"glGetFenceivNVContextANGLE", P(gl::GetFenceivNVContextANGLE)},
>+    {"glGetFixedv", P(gl::GetFixedv)},
>+    {"glGetFixedvContextANGLE", P(gl::GetFixedvContextANGLE)},
>     {"glGetFloatv", P(gl::GetFloatv)},
>+    {"glGetFloatvContextANGLE", P(gl::GetFloatvContextANGLE)},
>     {"glGetFloatvRobustANGLE", P(gl::GetFloatvRobustANGLE)},
>+    {"glGetFloatvRobustANGLEContextANGLE", P(gl::GetFloatvRobustANGLEContextANGLE)},
>+    {"glGetFragDataIndexEXT", P(gl::GetFragDataIndexEXT)},
>+    {"glGetFragDataIndexEXTContextANGLE", P(gl::GetFragDataIndexEXTContextANGLE)},
>     {"glGetFragDataLocation", P(gl::GetFragDataLocation)},
>+    {"glGetFragDataLocationContextANGLE", P(gl::GetFragDataLocationContextANGLE)},
>     {"glGetFramebufferAttachmentParameteriv", P(gl::GetFramebufferAttachmentParameteriv)},
>+    {"glGetFramebufferAttachmentParameterivContextANGLE",
>+     P(gl::GetFramebufferAttachmentParameterivContextANGLE)},
>     {"glGetFramebufferAttachmentParameterivRobustANGLE",
>      P(gl::GetFramebufferAttachmentParameterivRobustANGLE)},
>+    {"glGetFramebufferAttachmentParameterivRobustANGLEContextANGLE",
>+     P(gl::GetFramebufferAttachmentParameterivRobustANGLEContextANGLE)},
>     {"glGetFramebufferParameteriv", P(gl::GetFramebufferParameteriv)},
>+    {"glGetFramebufferParameterivContextANGLE", P(gl::GetFramebufferParameterivContextANGLE)},
>     {"glGetFramebufferParameterivRobustANGLE", P(gl::GetFramebufferParameterivRobustANGLE)},
>+    {"glGetFramebufferParameterivRobustANGLEContextANGLE",
>+     P(gl::GetFramebufferParameterivRobustANGLEContextANGLE)},
>     {"glGetGraphicsResetStatusEXT", P(gl::GetGraphicsResetStatusEXT)},
>+    {"glGetGraphicsResetStatusEXTContextANGLE", P(gl::GetGraphicsResetStatusEXTContextANGLE)},
>     {"glGetInteger64i_v", P(gl::GetInteger64i_v)},
>+    {"glGetInteger64i_vContextANGLE", P(gl::GetInteger64i_vContextANGLE)},
>     {"glGetInteger64i_vRobustANGLE", P(gl::GetInteger64i_vRobustANGLE)},
>+    {"glGetInteger64i_vRobustANGLEContextANGLE", P(gl::GetInteger64i_vRobustANGLEContextANGLE)},
>     {"glGetInteger64v", P(gl::GetInteger64v)},
>+    {"glGetInteger64vContextANGLE", P(gl::GetInteger64vContextANGLE)},
>     {"glGetInteger64vRobustANGLE", P(gl::GetInteger64vRobustANGLE)},
>+    {"glGetInteger64vRobustANGLEContextANGLE", P(gl::GetInteger64vRobustANGLEContextANGLE)},
>     {"glGetIntegeri_v", P(gl::GetIntegeri_v)},
>+    {"glGetIntegeri_vContextANGLE", P(gl::GetIntegeri_vContextANGLE)},
>     {"glGetIntegeri_vRobustANGLE", P(gl::GetIntegeri_vRobustANGLE)},
>+    {"glGetIntegeri_vRobustANGLEContextANGLE", P(gl::GetIntegeri_vRobustANGLEContextANGLE)},
>     {"glGetIntegerv", P(gl::GetIntegerv)},
>+    {"glGetIntegervContextANGLE", P(gl::GetIntegervContextANGLE)},
>     {"glGetIntegervRobustANGLE", P(gl::GetIntegervRobustANGLE)},
>+    {"glGetIntegervRobustANGLEContextANGLE", P(gl::GetIntegervRobustANGLEContextANGLE)},
>     {"glGetInternalformativ", P(gl::GetInternalformativ)},
>+    {"glGetInternalformativContextANGLE", P(gl::GetInternalformativContextANGLE)},
>     {"glGetInternalformativRobustANGLE", P(gl::GetInternalformativRobustANGLE)},
>+    {"glGetInternalformativRobustANGLEContextANGLE",
>+     P(gl::GetInternalformativRobustANGLEContextANGLE)},
>+    {"glGetLightfv", P(gl::GetLightfv)},
>+    {"glGetLightfvContextANGLE", P(gl::GetLightfvContextANGLE)},
>+    {"glGetLightxv", P(gl::GetLightxv)},
>+    {"glGetLightxvContextANGLE", P(gl::GetLightxvContextANGLE)},
>+    {"glGetMaterialfv", P(gl::GetMaterialfv)},
>+    {"glGetMaterialfvContextANGLE", P(gl::GetMaterialfvContextANGLE)},
>+    {"glGetMaterialxv", P(gl::GetMaterialxv)},
>+    {"glGetMaterialxvContextANGLE", P(gl::GetMaterialxvContextANGLE)},
>+    {"glGetMemoryObjectParameterivEXT", P(gl::GetMemoryObjectParameterivEXT)},
>+    {"glGetMemoryObjectParameterivEXTContextANGLE",
>+     P(gl::GetMemoryObjectParameterivEXTContextANGLE)},
>     {"glGetMultisamplefv", P(gl::GetMultisamplefv)},
>+    {"glGetMultisamplefvANGLE", P(gl::GetMultisamplefvANGLE)},
>+    {"glGetMultisamplefvANGLEContextANGLE", P(gl::GetMultisamplefvANGLEContextANGLE)},
>+    {"glGetMultisamplefvContextANGLE", P(gl::GetMultisamplefvContextANGLE)},
>     {"glGetMultisamplefvRobustANGLE", P(gl::GetMultisamplefvRobustANGLE)},
>+    {"glGetMultisamplefvRobustANGLEContextANGLE", P(gl::GetMultisamplefvRobustANGLEContextANGLE)},
>     {"glGetObjectLabelKHR", P(gl::GetObjectLabelKHR)},
>+    {"glGetObjectLabelKHRContextANGLE", P(gl::GetObjectLabelKHRContextANGLE)},
>     {"glGetObjectPtrLabelKHR", P(gl::GetObjectPtrLabelKHR)},
>+    {"glGetObjectPtrLabelKHRContextANGLE", P(gl::GetObjectPtrLabelKHRContextANGLE)},
>+    {"glGetPathParameterfvCHROMIUM", P(gl::GetPathParameterfvCHROMIUM)},
>+    {"glGetPathParameterfvCHROMIUMContextANGLE", P(gl::GetPathParameterfvCHROMIUMContextANGLE)},
>+    {"glGetPathParameterivCHROMIUM", P(gl::GetPathParameterivCHROMIUM)},
>+    {"glGetPathParameterivCHROMIUMContextANGLE", P(gl::GetPathParameterivCHROMIUMContextANGLE)},
>+    {"glGetPointerv", P(gl::GetPointerv)},
>+    {"glGetPointervContextANGLE", P(gl::GetPointervContextANGLE)},
>     {"glGetPointervKHR", P(gl::GetPointervKHR)},
>+    {"glGetPointervKHRContextANGLE", P(gl::GetPointervKHRContextANGLE)},
>     {"glGetPointervRobustANGLERobustANGLE", P(gl::GetPointervRobustANGLERobustANGLE)},
>+    {"glGetPointervRobustANGLERobustANGLEContextANGLE",
>+     P(gl::GetPointervRobustANGLERobustANGLEContextANGLE)},
>     {"glGetProgramBinary", P(gl::GetProgramBinary)},
>+    {"glGetProgramBinaryContextANGLE", P(gl::GetProgramBinaryContextANGLE)},
>     {"glGetProgramBinaryOES", P(gl::GetProgramBinaryOES)},
>+    {"glGetProgramBinaryOESContextANGLE", P(gl::GetProgramBinaryOESContextANGLE)},
>     {"glGetProgramInfoLog", P(gl::GetProgramInfoLog)},
>+    {"glGetProgramInfoLogContextANGLE", P(gl::GetProgramInfoLogContextANGLE)},
>     {"glGetProgramInterfaceiv", P(gl::GetProgramInterfaceiv)},
>+    {"glGetProgramInterfaceivContextANGLE", P(gl::GetProgramInterfaceivContextANGLE)},
>     {"glGetProgramInterfaceivRobustANGLE", P(gl::GetProgramInterfaceivRobustANGLE)},
>+    {"glGetProgramInterfaceivRobustANGLEContextANGLE",
>+     P(gl::GetProgramInterfaceivRobustANGLEContextANGLE)},
>     {"glGetProgramPipelineInfoLog", P(gl::GetProgramPipelineInfoLog)},
>+    {"glGetProgramPipelineInfoLogContextANGLE", P(gl::GetProgramPipelineInfoLogContextANGLE)},
>     {"glGetProgramPipelineiv", P(gl::GetProgramPipelineiv)},
>+    {"glGetProgramPipelineivContextANGLE", P(gl::GetProgramPipelineivContextANGLE)},
>     {"glGetProgramResourceIndex", P(gl::GetProgramResourceIndex)},
>+    {"glGetProgramResourceIndexContextANGLE", P(gl::GetProgramResourceIndexContextANGLE)},
>     {"glGetProgramResourceLocation", P(gl::GetProgramResourceLocation)},
>+    {"glGetProgramResourceLocationContextANGLE", P(gl::GetProgramResourceLocationContextANGLE)},
>+    {"glGetProgramResourceLocationIndexEXT", P(gl::GetProgramResourceLocationIndexEXT)},
>+    {"glGetProgramResourceLocationIndexEXTContextANGLE",
>+     P(gl::GetProgramResourceLocationIndexEXTContextANGLE)},
>     {"glGetProgramResourceName", P(gl::GetProgramResourceName)},
>+    {"glGetProgramResourceNameContextANGLE", P(gl::GetProgramResourceNameContextANGLE)},
>     {"glGetProgramResourceiv", P(gl::GetProgramResourceiv)},
>+    {"glGetProgramResourceivContextANGLE", P(gl::GetProgramResourceivContextANGLE)},
>     {"glGetProgramiv", P(gl::GetProgramiv)},
>+    {"glGetProgramivContextANGLE", P(gl::GetProgramivContextANGLE)},
>     {"glGetProgramivRobustANGLE", P(gl::GetProgramivRobustANGLE)},
>+    {"glGetProgramivRobustANGLEContextANGLE", P(gl::GetProgramivRobustANGLEContextANGLE)},
>     {"glGetQueryObjecti64vEXT", P(gl::GetQueryObjecti64vEXT)},
>+    {"glGetQueryObjecti64vEXTContextANGLE", P(gl::GetQueryObjecti64vEXTContextANGLE)},
>     {"glGetQueryObjecti64vRobustANGLE", P(gl::GetQueryObjecti64vRobustANGLE)},
>+    {"glGetQueryObjecti64vRobustANGLEContextANGLE",
>+     P(gl::GetQueryObjecti64vRobustANGLEContextANGLE)},
>     {"glGetQueryObjectivEXT", P(gl::GetQueryObjectivEXT)},
>+    {"glGetQueryObjectivEXTContextANGLE", P(gl::GetQueryObjectivEXTContextANGLE)},
>     {"glGetQueryObjectivRobustANGLE", P(gl::GetQueryObjectivRobustANGLE)},
>+    {"glGetQueryObjectivRobustANGLEContextANGLE", P(gl::GetQueryObjectivRobustANGLEContextANGLE)},
>     {"glGetQueryObjectui64vEXT", P(gl::GetQueryObjectui64vEXT)},
>+    {"glGetQueryObjectui64vEXTContextANGLE", P(gl::GetQueryObjectui64vEXTContextANGLE)},
>     {"glGetQueryObjectui64vRobustANGLE", P(gl::GetQueryObjectui64vRobustANGLE)},
>+    {"glGetQueryObjectui64vRobustANGLEContextANGLE",
>+     P(gl::GetQueryObjectui64vRobustANGLEContextANGLE)},
>     {"glGetQueryObjectuiv", P(gl::GetQueryObjectuiv)},
>+    {"glGetQueryObjectuivContextANGLE", P(gl::GetQueryObjectuivContextANGLE)},
>     {"glGetQueryObjectuivEXT", P(gl::GetQueryObjectuivEXT)},
>+    {"glGetQueryObjectuivEXTContextANGLE", P(gl::GetQueryObjectuivEXTContextANGLE)},
>     {"glGetQueryObjectuivRobustANGLE", P(gl::GetQueryObjectuivRobustANGLE)},
>+    {"glGetQueryObjectuivRobustANGLEContextANGLE", P(gl::GetQueryObjectuivRobustANGLEContextANGLE)},
>     {"glGetQueryiv", P(gl::GetQueryiv)},
>+    {"glGetQueryivContextANGLE", P(gl::GetQueryivContextANGLE)},
>     {"glGetQueryivEXT", P(gl::GetQueryivEXT)},
>+    {"glGetQueryivEXTContextANGLE", P(gl::GetQueryivEXTContextANGLE)},
>     {"glGetQueryivRobustANGLE", P(gl::GetQueryivRobustANGLE)},
>+    {"glGetQueryivRobustANGLEContextANGLE", P(gl::GetQueryivRobustANGLEContextANGLE)},
>     {"glGetRenderbufferParameteriv", P(gl::GetRenderbufferParameteriv)},
>+    {"glGetRenderbufferParameterivContextANGLE", P(gl::GetRenderbufferParameterivContextANGLE)},
>     {"glGetRenderbufferParameterivRobustANGLE", P(gl::GetRenderbufferParameterivRobustANGLE)},
>+    {"glGetRenderbufferParameterivRobustANGLEContextANGLE",
>+     P(gl::GetRenderbufferParameterivRobustANGLEContextANGLE)},
>+    {"glGetSamplerParameterIivOES", P(gl::GetSamplerParameterIivOES)},
>+    {"glGetSamplerParameterIivOESContextANGLE", P(gl::GetSamplerParameterIivOESContextANGLE)},
>     {"glGetSamplerParameterIivRobustANGLE", P(gl::GetSamplerParameterIivRobustANGLE)},
>+    {"glGetSamplerParameterIivRobustANGLEContextANGLE",
>+     P(gl::GetSamplerParameterIivRobustANGLEContextANGLE)},
>+    {"glGetSamplerParameterIuivOES", P(gl::GetSamplerParameterIuivOES)},
>+    {"glGetSamplerParameterIuivOESContextANGLE", P(gl::GetSamplerParameterIuivOESContextANGLE)},
>     {"glGetSamplerParameterIuivRobustANGLE", P(gl::GetSamplerParameterIuivRobustANGLE)},
>+    {"glGetSamplerParameterIuivRobustANGLEContextANGLE",
>+     P(gl::GetSamplerParameterIuivRobustANGLEContextANGLE)},
>     {"glGetSamplerParameterfv", P(gl::GetSamplerParameterfv)},
>+    {"glGetSamplerParameterfvContextANGLE", P(gl::GetSamplerParameterfvContextANGLE)},
>     {"glGetSamplerParameterfvRobustANGLE", P(gl::GetSamplerParameterfvRobustANGLE)},
>+    {"glGetSamplerParameterfvRobustANGLEContextANGLE",
>+     P(gl::GetSamplerParameterfvRobustANGLEContextANGLE)},
>     {"glGetSamplerParameteriv", P(gl::GetSamplerParameteriv)},
>+    {"glGetSamplerParameterivContextANGLE", P(gl::GetSamplerParameterivContextANGLE)},
>     {"glGetSamplerParameterivRobustANGLE", P(gl::GetSamplerParameterivRobustANGLE)},
>+    {"glGetSamplerParameterivRobustANGLEContextANGLE",
>+     P(gl::GetSamplerParameterivRobustANGLEContextANGLE)},
>+    {"glGetSemaphoreParameterui64vEXT", P(gl::GetSemaphoreParameterui64vEXT)},
>+    {"glGetSemaphoreParameterui64vEXTContextANGLE",
>+     P(gl::GetSemaphoreParameterui64vEXTContextANGLE)},
>     {"glGetShaderInfoLog", P(gl::GetShaderInfoLog)},
>+    {"glGetShaderInfoLogContextANGLE", P(gl::GetShaderInfoLogContextANGLE)},
>     {"glGetShaderPrecisionFormat", P(gl::GetShaderPrecisionFormat)},
>+    {"glGetShaderPrecisionFormatContextANGLE", P(gl::GetShaderPrecisionFormatContextANGLE)},
>     {"glGetShaderSource", P(gl::GetShaderSource)},
>+    {"glGetShaderSourceContextANGLE", P(gl::GetShaderSourceContextANGLE)},
>     {"glGetShaderiv", P(gl::GetShaderiv)},
>+    {"glGetShaderivContextANGLE", P(gl::GetShaderivContextANGLE)},
>     {"glGetShaderivRobustANGLE", P(gl::GetShaderivRobustANGLE)},
>+    {"glGetShaderivRobustANGLEContextANGLE", P(gl::GetShaderivRobustANGLEContextANGLE)},
>     {"glGetString", P(gl::GetString)},
>+    {"glGetStringContextANGLE", P(gl::GetStringContextANGLE)},
>     {"glGetStringi", P(gl::GetStringi)},
>+    {"glGetStringiContextANGLE", P(gl::GetStringiContextANGLE)},
>     {"glGetSynciv", P(gl::GetSynciv)},
>+    {"glGetSyncivContextANGLE", P(gl::GetSyncivContextANGLE)},
>+    {"glGetTexEnvfv", P(gl::GetTexEnvfv)},
>+    {"glGetTexEnvfvContextANGLE", P(gl::GetTexEnvfvContextANGLE)},
>+    {"glGetTexEnviv", P(gl::GetTexEnviv)},
>+    {"glGetTexEnvivContextANGLE", P(gl::GetTexEnvivContextANGLE)},
>+    {"glGetTexEnvxv", P(gl::GetTexEnvxv)},
>+    {"glGetTexEnvxvContextANGLE", P(gl::GetTexEnvxvContextANGLE)},
>     {"glGetTexLevelParameterfv", P(gl::GetTexLevelParameterfv)},
>+    {"glGetTexLevelParameterfvANGLE", P(gl::GetTexLevelParameterfvANGLE)},
>+    {"glGetTexLevelParameterfvANGLEContextANGLE", P(gl::GetTexLevelParameterfvANGLEContextANGLE)},
>+    {"glGetTexLevelParameterfvContextANGLE", P(gl::GetTexLevelParameterfvContextANGLE)},
>     {"glGetTexLevelParameterfvRobustANGLE", P(gl::GetTexLevelParameterfvRobustANGLE)},
>+    {"glGetTexLevelParameterfvRobustANGLEContextANGLE",
>+     P(gl::GetTexLevelParameterfvRobustANGLEContextANGLE)},
>     {"glGetTexLevelParameteriv", P(gl::GetTexLevelParameteriv)},
>+    {"glGetTexLevelParameterivANGLE", P(gl::GetTexLevelParameterivANGLE)},
>+    {"glGetTexLevelParameterivANGLEContextANGLE", P(gl::GetTexLevelParameterivANGLEContextANGLE)},
>+    {"glGetTexLevelParameterivContextANGLE", P(gl::GetTexLevelParameterivContextANGLE)},
>     {"glGetTexLevelParameterivRobustANGLE", P(gl::GetTexLevelParameterivRobustANGLE)},
>+    {"glGetTexLevelParameterivRobustANGLEContextANGLE",
>+     P(gl::GetTexLevelParameterivRobustANGLEContextANGLE)},
>+    {"glGetTexParameterIivOES", P(gl::GetTexParameterIivOES)},
>+    {"glGetTexParameterIivOESContextANGLE", P(gl::GetTexParameterIivOESContextANGLE)},
>     {"glGetTexParameterIivRobustANGLE", P(gl::GetTexParameterIivRobustANGLE)},
>+    {"glGetTexParameterIivRobustANGLEContextANGLE",
>+     P(gl::GetTexParameterIivRobustANGLEContextANGLE)},
>+    {"glGetTexParameterIuivOES", P(gl::GetTexParameterIuivOES)},
>+    {"glGetTexParameterIuivOESContextANGLE", P(gl::GetTexParameterIuivOESContextANGLE)},
>     {"glGetTexParameterIuivRobustANGLE", P(gl::GetTexParameterIuivRobustANGLE)},
>+    {"glGetTexParameterIuivRobustANGLEContextANGLE",
>+     P(gl::GetTexParameterIuivRobustANGLEContextANGLE)},
>     {"glGetTexParameterfv", P(gl::GetTexParameterfv)},
>+    {"glGetTexParameterfvContextANGLE", P(gl::GetTexParameterfvContextANGLE)},
>     {"glGetTexParameterfvRobustANGLE", P(gl::GetTexParameterfvRobustANGLE)},
>+    {"glGetTexParameterfvRobustANGLEContextANGLE", P(gl::GetTexParameterfvRobustANGLEContextANGLE)},
>     {"glGetTexParameteriv", P(gl::GetTexParameteriv)},
>+    {"glGetTexParameterivContextANGLE", P(gl::GetTexParameterivContextANGLE)},
>     {"glGetTexParameterivRobustANGLE", P(gl::GetTexParameterivRobustANGLE)},
>+    {"glGetTexParameterivRobustANGLEContextANGLE", P(gl::GetTexParameterivRobustANGLEContextANGLE)},
>+    {"glGetTexParameterxv", P(gl::GetTexParameterxv)},
>+    {"glGetTexParameterxvContextANGLE", P(gl::GetTexParameterxvContextANGLE)},
>     {"glGetTransformFeedbackVarying", P(gl::GetTransformFeedbackVarying)},
>+    {"glGetTransformFeedbackVaryingContextANGLE", P(gl::GetTransformFeedbackVaryingContextANGLE)},
>     {"glGetTranslatedShaderSourceANGLE", P(gl::GetTranslatedShaderSourceANGLE)},
>+    {"glGetTranslatedShaderSourceANGLEContextANGLE",
>+     P(gl::GetTranslatedShaderSourceANGLEContextANGLE)},
>     {"glGetUniformBlockIndex", P(gl::GetUniformBlockIndex)},
>+    {"glGetUniformBlockIndexContextANGLE", P(gl::GetUniformBlockIndexContextANGLE)},
>     {"glGetUniformIndices", P(gl::GetUniformIndices)},
>+    {"glGetUniformIndicesContextANGLE", P(gl::GetUniformIndicesContextANGLE)},
>     {"glGetUniformLocation", P(gl::GetUniformLocation)},
>+    {"glGetUniformLocationContextANGLE", P(gl::GetUniformLocationContextANGLE)},
>     {"glGetUniformfv", P(gl::GetUniformfv)},
>+    {"glGetUniformfvContextANGLE", P(gl::GetUniformfvContextANGLE)},
>     {"glGetUniformfvRobustANGLE", P(gl::GetUniformfvRobustANGLE)},
>+    {"glGetUniformfvRobustANGLEContextANGLE", P(gl::GetUniformfvRobustANGLEContextANGLE)},
>     {"glGetUniformiv", P(gl::GetUniformiv)},
>+    {"glGetUniformivContextANGLE", P(gl::GetUniformivContextANGLE)},
>     {"glGetUniformivRobustANGLE", P(gl::GetUniformivRobustANGLE)},
>+    {"glGetUniformivRobustANGLEContextANGLE", P(gl::GetUniformivRobustANGLEContextANGLE)},
>     {"glGetUniformuiv", P(gl::GetUniformuiv)},
>+    {"glGetUniformuivContextANGLE", P(gl::GetUniformuivContextANGLE)},
>     {"glGetUniformuivRobustANGLE", P(gl::GetUniformuivRobustANGLE)},
>+    {"glGetUniformuivRobustANGLEContextANGLE", P(gl::GetUniformuivRobustANGLEContextANGLE)},
>+    {"glGetUnsignedBytei_vEXT", P(gl::GetUnsignedBytei_vEXT)},
>+    {"glGetUnsignedBytei_vEXTContextANGLE", P(gl::GetUnsignedBytei_vEXTContextANGLE)},
>+    {"glGetUnsignedBytevEXT", P(gl::GetUnsignedBytevEXT)},
>+    {"glGetUnsignedBytevEXTContextANGLE", P(gl::GetUnsignedBytevEXTContextANGLE)},
>     {"glGetVertexAttribIiv", P(gl::GetVertexAttribIiv)},
>+    {"glGetVertexAttribIivContextANGLE", P(gl::GetVertexAttribIivContextANGLE)},
>     {"glGetVertexAttribIivRobustANGLE", P(gl::GetVertexAttribIivRobustANGLE)},
>+    {"glGetVertexAttribIivRobustANGLEContextANGLE",
>+     P(gl::GetVertexAttribIivRobustANGLEContextANGLE)},
>     {"glGetVertexAttribIuiv", P(gl::GetVertexAttribIuiv)},
>+    {"glGetVertexAttribIuivContextANGLE", P(gl::GetVertexAttribIuivContextANGLE)},
>     {"glGetVertexAttribIuivRobustANGLE", P(gl::GetVertexAttribIuivRobustANGLE)},
>+    {"glGetVertexAttribIuivRobustANGLEContextANGLE",
>+     P(gl::GetVertexAttribIuivRobustANGLEContextANGLE)},
>     {"glGetVertexAttribPointerv", P(gl::GetVertexAttribPointerv)},
>+    {"glGetVertexAttribPointervContextANGLE", P(gl::GetVertexAttribPointervContextANGLE)},
>     {"glGetVertexAttribPointervRobustANGLE", P(gl::GetVertexAttribPointervRobustANGLE)},
>+    {"glGetVertexAttribPointervRobustANGLEContextANGLE",
>+     P(gl::GetVertexAttribPointervRobustANGLEContextANGLE)},
>     {"glGetVertexAttribfv", P(gl::GetVertexAttribfv)},
>+    {"glGetVertexAttribfvContextANGLE", P(gl::GetVertexAttribfvContextANGLE)},
>     {"glGetVertexAttribfvRobustANGLE", P(gl::GetVertexAttribfvRobustANGLE)},
>+    {"glGetVertexAttribfvRobustANGLEContextANGLE", P(gl::GetVertexAttribfvRobustANGLEContextANGLE)},
>     {"glGetVertexAttribiv", P(gl::GetVertexAttribiv)},
>+    {"glGetVertexAttribivContextANGLE", P(gl::GetVertexAttribivContextANGLE)},
>     {"glGetVertexAttribivRobustANGLE", P(gl::GetVertexAttribivRobustANGLE)},
>+    {"glGetVertexAttribivRobustANGLEContextANGLE", P(gl::GetVertexAttribivRobustANGLEContextANGLE)},
>     {"glGetnUniformfvEXT", P(gl::GetnUniformfvEXT)},
>+    {"glGetnUniformfvEXTContextANGLE", P(gl::GetnUniformfvEXTContextANGLE)},
>     {"glGetnUniformfvRobustANGLE", P(gl::GetnUniformfvRobustANGLE)},
>+    {"glGetnUniformfvRobustANGLEContextANGLE", P(gl::GetnUniformfvRobustANGLEContextANGLE)},
>     {"glGetnUniformivEXT", P(gl::GetnUniformivEXT)},
>+    {"glGetnUniformivEXTContextANGLE", P(gl::GetnUniformivEXTContextANGLE)},
>     {"glGetnUniformivRobustANGLE", P(gl::GetnUniformivRobustANGLE)},
>+    {"glGetnUniformivRobustANGLEContextANGLE", P(gl::GetnUniformivRobustANGLEContextANGLE)},
>     {"glGetnUniformuivRobustANGLE", P(gl::GetnUniformuivRobustANGLE)},
>+    {"glGetnUniformuivRobustANGLEContextANGLE", P(gl::GetnUniformuivRobustANGLEContextANGLE)},
>     {"glHint", P(gl::Hint)},
>+    {"glHintContextANGLE", P(gl::HintContextANGLE)},
>+    {"glImportMemoryFdEXT", P(gl::ImportMemoryFdEXT)},
>+    {"glImportMemoryFdEXTContextANGLE", P(gl::ImportMemoryFdEXTContextANGLE)},
>+    {"glImportSemaphoreFdEXT", P(gl::ImportSemaphoreFdEXT)},
>+    {"glImportSemaphoreFdEXTContextANGLE", P(gl::ImportSemaphoreFdEXTContextANGLE)},
>     {"glInsertEventMarkerEXT", P(gl::InsertEventMarkerEXT)},
>+    {"glInsertEventMarkerEXTContextANGLE", P(gl::InsertEventMarkerEXTContextANGLE)},
>     {"glInvalidateFramebuffer", P(gl::InvalidateFramebuffer)},
>+    {"glInvalidateFramebufferContextANGLE", P(gl::InvalidateFramebufferContextANGLE)},
>     {"glInvalidateSubFramebuffer", P(gl::InvalidateSubFramebuffer)},
>+    {"glInvalidateSubFramebufferContextANGLE", P(gl::InvalidateSubFramebufferContextANGLE)},
>     {"glIsBuffer", P(gl::IsBuffer)},
>+    {"glIsBufferContextANGLE", P(gl::IsBufferContextANGLE)},
>     {"glIsEnabled", P(gl::IsEnabled)},
>+    {"glIsEnabledContextANGLE", P(gl::IsEnabledContextANGLE)},
>     {"glIsFenceNV", P(gl::IsFenceNV)},
>+    {"glIsFenceNVContextANGLE", P(gl::IsFenceNVContextANGLE)},
>     {"glIsFramebuffer", P(gl::IsFramebuffer)},
>+    {"glIsFramebufferContextANGLE", P(gl::IsFramebufferContextANGLE)},
>+    {"glIsMemoryObjectEXT", P(gl::IsMemoryObjectEXT)},
>+    {"glIsMemoryObjectEXTContextANGLE", P(gl::IsMemoryObjectEXTContextANGLE)},
>+    {"glIsPathCHROMIUM", P(gl::IsPathCHROMIUM)},
>+    {"glIsPathCHROMIUMContextANGLE", P(gl::IsPathCHROMIUMContextANGLE)},
>     {"glIsProgram", P(gl::IsProgram)},
>+    {"glIsProgramContextANGLE", P(gl::IsProgramContextANGLE)},
>     {"glIsProgramPipeline", P(gl::IsProgramPipeline)},
>+    {"glIsProgramPipelineContextANGLE", P(gl::IsProgramPipelineContextANGLE)},
>     {"glIsQuery", P(gl::IsQuery)},
>+    {"glIsQueryContextANGLE", P(gl::IsQueryContextANGLE)},
>     {"glIsQueryEXT", P(gl::IsQueryEXT)},
>+    {"glIsQueryEXTContextANGLE", P(gl::IsQueryEXTContextANGLE)},
>     {"glIsRenderbuffer", P(gl::IsRenderbuffer)},
>+    {"glIsRenderbufferContextANGLE", P(gl::IsRenderbufferContextANGLE)},
>     {"glIsSampler", P(gl::IsSampler)},
>+    {"glIsSamplerContextANGLE", P(gl::IsSamplerContextANGLE)},
>+    {"glIsSemaphoreEXT", P(gl::IsSemaphoreEXT)},
>+    {"glIsSemaphoreEXTContextANGLE", P(gl::IsSemaphoreEXTContextANGLE)},
>     {"glIsShader", P(gl::IsShader)},
>+    {"glIsShaderContextANGLE", P(gl::IsShaderContextANGLE)},
>     {"glIsSync", P(gl::IsSync)},
>+    {"glIsSyncContextANGLE", P(gl::IsSyncContextANGLE)},
>     {"glIsTexture", P(gl::IsTexture)},
>+    {"glIsTextureContextANGLE", P(gl::IsTextureContextANGLE)},
>     {"glIsTransformFeedback", P(gl::IsTransformFeedback)},
>+    {"glIsTransformFeedbackContextANGLE", P(gl::IsTransformFeedbackContextANGLE)},
>     {"glIsVertexArray", P(gl::IsVertexArray)},
>+    {"glIsVertexArrayContextANGLE", P(gl::IsVertexArrayContextANGLE)},
>     {"glIsVertexArrayOES", P(gl::IsVertexArrayOES)},
>+    {"glIsVertexArrayOESContextANGLE", P(gl::IsVertexArrayOESContextANGLE)},
>+    {"glLightModelf", P(gl::LightModelf)},
>+    {"glLightModelfContextANGLE", P(gl::LightModelfContextANGLE)},
>+    {"glLightModelfv", P(gl::LightModelfv)},
>+    {"glLightModelfvContextANGLE", P(gl::LightModelfvContextANGLE)},
>+    {"glLightModelx", P(gl::LightModelx)},
>+    {"glLightModelxContextANGLE", P(gl::LightModelxContextANGLE)},
>+    {"glLightModelxv", P(gl::LightModelxv)},
>+    {"glLightModelxvContextANGLE", P(gl::LightModelxvContextANGLE)},
>+    {"glLightf", P(gl::Lightf)},
>+    {"glLightfContextANGLE", P(gl::LightfContextANGLE)},
>+    {"glLightfv", P(gl::Lightfv)},
>+    {"glLightfvContextANGLE", P(gl::LightfvContextANGLE)},
>+    {"glLightx", P(gl::Lightx)},
>+    {"glLightxContextANGLE", P(gl::LightxContextANGLE)},
>+    {"glLightxv", P(gl::Lightxv)},
>+    {"glLightxvContextANGLE", P(gl::LightxvContextANGLE)},
>     {"glLineWidth", P(gl::LineWidth)},
>+    {"glLineWidthContextANGLE", P(gl::LineWidthContextANGLE)},
>+    {"glLineWidthx", P(gl::LineWidthx)},
>+    {"glLineWidthxContextANGLE", P(gl::LineWidthxContextANGLE)},
>     {"glLinkProgram", P(gl::LinkProgram)},
>+    {"glLinkProgramContextANGLE", P(gl::LinkProgramContextANGLE)},
>+    {"glLoadIdentity", P(gl::LoadIdentity)},
>+    {"glLoadIdentityContextANGLE", P(gl::LoadIdentityContextANGLE)},
>+    {"glLoadMatrixf", P(gl::LoadMatrixf)},
>+    {"glLoadMatrixfContextANGLE", P(gl::LoadMatrixfContextANGLE)},
>+    {"glLoadMatrixx", P(gl::LoadMatrixx)},
>+    {"glLoadMatrixxContextANGLE", P(gl::LoadMatrixxContextANGLE)},
>+    {"glLoadPaletteFromModelViewMatrixOES", P(gl::LoadPaletteFromModelViewMatrixOES)},
>+    {"glLoadPaletteFromModelViewMatrixOESContextANGLE",
>+     P(gl::LoadPaletteFromModelViewMatrixOESContextANGLE)},
>+    {"glLogicOp", P(gl::LogicOp)},
>+    {"glLogicOpContextANGLE", P(gl::LogicOpContextANGLE)},
>+    {"glLoseContextCHROMIUM", P(gl::LoseContextCHROMIUM)},
>+    {"glLoseContextCHROMIUMContextANGLE", P(gl::LoseContextCHROMIUMContextANGLE)},
>     {"glMapBufferOES", P(gl::MapBufferOES)},
>+    {"glMapBufferOESContextANGLE", P(gl::MapBufferOESContextANGLE)},
>     {"glMapBufferRange", P(gl::MapBufferRange)},
>+    {"glMapBufferRangeContextANGLE", P(gl::MapBufferRangeContextANGLE)},
>     {"glMapBufferRangeEXT", P(gl::MapBufferRangeEXT)},
>+    {"glMapBufferRangeEXTContextANGLE", P(gl::MapBufferRangeEXTContextANGLE)},
>+    {"glMaterialf", P(gl::Materialf)},
>+    {"glMaterialfContextANGLE", P(gl::MaterialfContextANGLE)},
>+    {"glMaterialfv", P(gl::Materialfv)},
>+    {"glMaterialfvContextANGLE", P(gl::MaterialfvContextANGLE)},
>+    {"glMaterialx", P(gl::Materialx)},
>+    {"glMaterialxContextANGLE", P(gl::MaterialxContextANGLE)},
>+    {"glMaterialxv", P(gl::Materialxv)},
>+    {"glMaterialxvContextANGLE", P(gl::MaterialxvContextANGLE)},
>+    {"glMatrixIndexPointerOES", P(gl::MatrixIndexPointerOES)},
>+    {"glMatrixIndexPointerOESContextANGLE", P(gl::MatrixIndexPointerOESContextANGLE)},
>+    {"glMatrixLoadIdentityCHROMIUM", P(gl::MatrixLoadIdentityCHROMIUM)},
>+    {"glMatrixLoadIdentityCHROMIUMContextANGLE", P(gl::MatrixLoadIdentityCHROMIUMContextANGLE)},
>+    {"glMatrixLoadfCHROMIUM", P(gl::MatrixLoadfCHROMIUM)},
>+    {"glMatrixLoadfCHROMIUMContextANGLE", P(gl::MatrixLoadfCHROMIUMContextANGLE)},
>+    {"glMatrixMode", P(gl::MatrixMode)},
>+    {"glMatrixModeContextANGLE", P(gl::MatrixModeContextANGLE)},
>+    {"glMaxShaderCompilerThreadsKHR", P(gl::MaxShaderCompilerThreadsKHR)},
>+    {"glMaxShaderCompilerThreadsKHRContextANGLE", P(gl::MaxShaderCompilerThreadsKHRContextANGLE)},
>     {"glMemoryBarrier", P(gl::MemoryBarrier)},
>     {"glMemoryBarrierByRegion", P(gl::MemoryBarrierByRegion)},
>+    {"glMemoryBarrierByRegionContextANGLE", P(gl::MemoryBarrierByRegionContextANGLE)},
>+    {"glMemoryBarrierContextANGLE", P(gl::MemoryBarrierContextANGLE)},
>+    {"glMemoryObjectParameterivEXT", P(gl::MemoryObjectParameterivEXT)},
>+    {"glMemoryObjectParameterivEXTContextANGLE", P(gl::MemoryObjectParameterivEXTContextANGLE)},
>+    {"glMultMatrixf", P(gl::MultMatrixf)},
>+    {"glMultMatrixfContextANGLE", P(gl::MultMatrixfContextANGLE)},
>+    {"glMultMatrixx", P(gl::MultMatrixx)},
>+    {"glMultMatrixxContextANGLE", P(gl::MultMatrixxContextANGLE)},
>+    {"glMultiDrawArraysANGLE", P(gl::MultiDrawArraysANGLE)},
>+    {"glMultiDrawArraysANGLEContextANGLE", P(gl::MultiDrawArraysANGLEContextANGLE)},
>+    {"glMultiDrawArraysInstancedANGLE", P(gl::MultiDrawArraysInstancedANGLE)},
>+    {"glMultiDrawArraysInstancedANGLEContextANGLE",
>+     P(gl::MultiDrawArraysInstancedANGLEContextANGLE)},
>+    {"glMultiDrawElementsANGLE", P(gl::MultiDrawElementsANGLE)},
>+    {"glMultiDrawElementsANGLEContextANGLE", P(gl::MultiDrawElementsANGLEContextANGLE)},
>+    {"glMultiDrawElementsInstancedANGLE", P(gl::MultiDrawElementsInstancedANGLE)},
>+    {"glMultiDrawElementsInstancedANGLEContextANGLE",
>+     P(gl::MultiDrawElementsInstancedANGLEContextANGLE)},
>+    {"glMultiTexCoord4f", P(gl::MultiTexCoord4f)},
>+    {"glMultiTexCoord4fContextANGLE", P(gl::MultiTexCoord4fContextANGLE)},
>+    {"glMultiTexCoord4x", P(gl::MultiTexCoord4x)},
>+    {"glMultiTexCoord4xContextANGLE", P(gl::MultiTexCoord4xContextANGLE)},
>+    {"glNormal3f", P(gl::Normal3f)},
>+    {"glNormal3fContextANGLE", P(gl::Normal3fContextANGLE)},
>+    {"glNormal3x", P(gl::Normal3x)},
>+    {"glNormal3xContextANGLE", P(gl::Normal3xContextANGLE)},
>+    {"glNormalPointer", P(gl::NormalPointer)},
>+    {"glNormalPointerContextANGLE", P(gl::NormalPointerContextANGLE)},
>     {"glObjectLabelKHR", P(gl::ObjectLabelKHR)},
>+    {"glObjectLabelKHRContextANGLE", P(gl::ObjectLabelKHRContextANGLE)},
>     {"glObjectPtrLabelKHR", P(gl::ObjectPtrLabelKHR)},
>+    {"glObjectPtrLabelKHRContextANGLE", P(gl::ObjectPtrLabelKHRContextANGLE)},
>+    {"glOrthof", P(gl::Orthof)},
>+    {"glOrthofContextANGLE", P(gl::OrthofContextANGLE)},
>+    {"glOrthox", P(gl::Orthox)},
>+    {"glOrthoxContextANGLE", P(gl::OrthoxContextANGLE)},
>+    {"glPathCommandsCHROMIUM", P(gl::PathCommandsCHROMIUM)},
>+    {"glPathCommandsCHROMIUMContextANGLE", P(gl::PathCommandsCHROMIUMContextANGLE)},
>+    {"glPathParameterfCHROMIUM", P(gl::PathParameterfCHROMIUM)},
>+    {"glPathParameterfCHROMIUMContextANGLE", P(gl::PathParameterfCHROMIUMContextANGLE)},
>+    {"glPathParameteriCHROMIUM", P(gl::PathParameteriCHROMIUM)},
>+    {"glPathParameteriCHROMIUMContextANGLE", P(gl::PathParameteriCHROMIUMContextANGLE)},
>+    {"glPathStencilFuncCHROMIUM", P(gl::PathStencilFuncCHROMIUM)},
>+    {"glPathStencilFuncCHROMIUMContextANGLE", P(gl::PathStencilFuncCHROMIUMContextANGLE)},
>     {"glPauseTransformFeedback", P(gl::PauseTransformFeedback)},
>+    {"glPauseTransformFeedbackContextANGLE", P(gl::PauseTransformFeedbackContextANGLE)},
>     {"glPixelStorei", P(gl::PixelStorei)},
>+    {"glPixelStoreiContextANGLE", P(gl::PixelStoreiContextANGLE)},
>+    {"glPointParameterf", P(gl::PointParameterf)},
>+    {"glPointParameterfContextANGLE", P(gl::PointParameterfContextANGLE)},
>+    {"glPointParameterfv", P(gl::PointParameterfv)},
>+    {"glPointParameterfvContextANGLE", P(gl::PointParameterfvContextANGLE)},
>+    {"glPointParameterx", P(gl::PointParameterx)},
>+    {"glPointParameterxContextANGLE", P(gl::PointParameterxContextANGLE)},
>+    {"glPointParameterxv", P(gl::PointParameterxv)},
>+    {"glPointParameterxvContextANGLE", P(gl::PointParameterxvContextANGLE)},
>+    {"glPointSize", P(gl::PointSize)},
>+    {"glPointSizeContextANGLE", P(gl::PointSizeContextANGLE)},
>+    {"glPointSizePointerOES", P(gl::PointSizePointerOES)},
>+    {"glPointSizePointerOESContextANGLE", P(gl::PointSizePointerOESContextANGLE)},
>+    {"glPointSizex", P(gl::PointSizex)},
>+    {"glPointSizexContextANGLE", P(gl::PointSizexContextANGLE)},
>     {"glPolygonOffset", P(gl::PolygonOffset)},
>+    {"glPolygonOffsetContextANGLE", P(gl::PolygonOffsetContextANGLE)},
>+    {"glPolygonOffsetx", P(gl::PolygonOffsetx)},
>+    {"glPolygonOffsetxContextANGLE", P(gl::PolygonOffsetxContextANGLE)},
>     {"glPopDebugGroupKHR", P(gl::PopDebugGroupKHR)},
>+    {"glPopDebugGroupKHRContextANGLE", P(gl::PopDebugGroupKHRContextANGLE)},
>     {"glPopGroupMarkerEXT", P(gl::PopGroupMarkerEXT)},
>+    {"glPopGroupMarkerEXTContextANGLE", P(gl::PopGroupMarkerEXTContextANGLE)},
>+    {"glPopMatrix", P(gl::PopMatrix)},
>+    {"glPopMatrixContextANGLE", P(gl::PopMatrixContextANGLE)},
>     {"glProgramBinary", P(gl::ProgramBinary)},
>+    {"glProgramBinaryContextANGLE", P(gl::ProgramBinaryContextANGLE)},
>     {"glProgramBinaryOES", P(gl::ProgramBinaryOES)},
>+    {"glProgramBinaryOESContextANGLE", P(gl::ProgramBinaryOESContextANGLE)},
>     {"glProgramParameteri", P(gl::ProgramParameteri)},
>+    {"glProgramParameteriContextANGLE", P(gl::ProgramParameteriContextANGLE)},
>+    {"glProgramPathFragmentInputGenCHROMIUM", P(gl::ProgramPathFragmentInputGenCHROMIUM)},
>+    {"glProgramPathFragmentInputGenCHROMIUMContextANGLE",
>+     P(gl::ProgramPathFragmentInputGenCHROMIUMContextANGLE)},
>     {"glProgramUniform1f", P(gl::ProgramUniform1f)},
>+    {"glProgramUniform1fContextANGLE", P(gl::ProgramUniform1fContextANGLE)},
>     {"glProgramUniform1fv", P(gl::ProgramUniform1fv)},
>+    {"glProgramUniform1fvContextANGLE", P(gl::ProgramUniform1fvContextANGLE)},
>     {"glProgramUniform1i", P(gl::ProgramUniform1i)},
>+    {"glProgramUniform1iContextANGLE", P(gl::ProgramUniform1iContextANGLE)},
>     {"glProgramUniform1iv", P(gl::ProgramUniform1iv)},
>+    {"glProgramUniform1ivContextANGLE", P(gl::ProgramUniform1ivContextANGLE)},
>     {"glProgramUniform1ui", P(gl::ProgramUniform1ui)},
>+    {"glProgramUniform1uiContextANGLE", P(gl::ProgramUniform1uiContextANGLE)},
>     {"glProgramUniform1uiv", P(gl::ProgramUniform1uiv)},
>+    {"glProgramUniform1uivContextANGLE", P(gl::ProgramUniform1uivContextANGLE)},
>     {"glProgramUniform2f", P(gl::ProgramUniform2f)},
>+    {"glProgramUniform2fContextANGLE", P(gl::ProgramUniform2fContextANGLE)},
>     {"glProgramUniform2fv", P(gl::ProgramUniform2fv)},
>+    {"glProgramUniform2fvContextANGLE", P(gl::ProgramUniform2fvContextANGLE)},
>     {"glProgramUniform2i", P(gl::ProgramUniform2i)},
>+    {"glProgramUniform2iContextANGLE", P(gl::ProgramUniform2iContextANGLE)},
>     {"glProgramUniform2iv", P(gl::ProgramUniform2iv)},
>+    {"glProgramUniform2ivContextANGLE", P(gl::ProgramUniform2ivContextANGLE)},
>     {"glProgramUniform2ui", P(gl::ProgramUniform2ui)},
>+    {"glProgramUniform2uiContextANGLE", P(gl::ProgramUniform2uiContextANGLE)},
>     {"glProgramUniform2uiv", P(gl::ProgramUniform2uiv)},
>+    {"glProgramUniform2uivContextANGLE", P(gl::ProgramUniform2uivContextANGLE)},
>     {"glProgramUniform3f", P(gl::ProgramUniform3f)},
>+    {"glProgramUniform3fContextANGLE", P(gl::ProgramUniform3fContextANGLE)},
>     {"glProgramUniform3fv", P(gl::ProgramUniform3fv)},
>+    {"glProgramUniform3fvContextANGLE", P(gl::ProgramUniform3fvContextANGLE)},
>     {"glProgramUniform3i", P(gl::ProgramUniform3i)},
>+    {"glProgramUniform3iContextANGLE", P(gl::ProgramUniform3iContextANGLE)},
>     {"glProgramUniform3iv", P(gl::ProgramUniform3iv)},
>+    {"glProgramUniform3ivContextANGLE", P(gl::ProgramUniform3ivContextANGLE)},
>     {"glProgramUniform3ui", P(gl::ProgramUniform3ui)},
>+    {"glProgramUniform3uiContextANGLE", P(gl::ProgramUniform3uiContextANGLE)},
>     {"glProgramUniform3uiv", P(gl::ProgramUniform3uiv)},
>+    {"glProgramUniform3uivContextANGLE", P(gl::ProgramUniform3uivContextANGLE)},
>     {"glProgramUniform4f", P(gl::ProgramUniform4f)},
>+    {"glProgramUniform4fContextANGLE", P(gl::ProgramUniform4fContextANGLE)},
>     {"glProgramUniform4fv", P(gl::ProgramUniform4fv)},
>+    {"glProgramUniform4fvContextANGLE", P(gl::ProgramUniform4fvContextANGLE)},
>     {"glProgramUniform4i", P(gl::ProgramUniform4i)},
>+    {"glProgramUniform4iContextANGLE", P(gl::ProgramUniform4iContextANGLE)},
>     {"glProgramUniform4iv", P(gl::ProgramUniform4iv)},
>+    {"glProgramUniform4ivContextANGLE", P(gl::ProgramUniform4ivContextANGLE)},
>     {"glProgramUniform4ui", P(gl::ProgramUniform4ui)},
>+    {"glProgramUniform4uiContextANGLE", P(gl::ProgramUniform4uiContextANGLE)},
>     {"glProgramUniform4uiv", P(gl::ProgramUniform4uiv)},
>+    {"glProgramUniform4uivContextANGLE", P(gl::ProgramUniform4uivContextANGLE)},
>     {"glProgramUniformMatrix2fv", P(gl::ProgramUniformMatrix2fv)},
>+    {"glProgramUniformMatrix2fvContextANGLE", P(gl::ProgramUniformMatrix2fvContextANGLE)},
>     {"glProgramUniformMatrix2x3fv", P(gl::ProgramUniformMatrix2x3fv)},
>+    {"glProgramUniformMatrix2x3fvContextANGLE", P(gl::ProgramUniformMatrix2x3fvContextANGLE)},
>     {"glProgramUniformMatrix2x4fv", P(gl::ProgramUniformMatrix2x4fv)},
>+    {"glProgramUniformMatrix2x4fvContextANGLE", P(gl::ProgramUniformMatrix2x4fvContextANGLE)},
>     {"glProgramUniformMatrix3fv", P(gl::ProgramUniformMatrix3fv)},
>+    {"glProgramUniformMatrix3fvContextANGLE", P(gl::ProgramUniformMatrix3fvContextANGLE)},
>     {"glProgramUniformMatrix3x2fv", P(gl::ProgramUniformMatrix3x2fv)},
>+    {"glProgramUniformMatrix3x2fvContextANGLE", P(gl::ProgramUniformMatrix3x2fvContextANGLE)},
>     {"glProgramUniformMatrix3x4fv", P(gl::ProgramUniformMatrix3x4fv)},
>+    {"glProgramUniformMatrix3x4fvContextANGLE", P(gl::ProgramUniformMatrix3x4fvContextANGLE)},
>     {"glProgramUniformMatrix4fv", P(gl::ProgramUniformMatrix4fv)},
>+    {"glProgramUniformMatrix4fvContextANGLE", P(gl::ProgramUniformMatrix4fvContextANGLE)},
>     {"glProgramUniformMatrix4x2fv", P(gl::ProgramUniformMatrix4x2fv)},
>+    {"glProgramUniformMatrix4x2fvContextANGLE", P(gl::ProgramUniformMatrix4x2fvContextANGLE)},
>     {"glProgramUniformMatrix4x3fv", P(gl::ProgramUniformMatrix4x3fv)},
>+    {"glProgramUniformMatrix4x3fvContextANGLE", P(gl::ProgramUniformMatrix4x3fvContextANGLE)},
>+    {"glProvokingVertexANGLE", P(gl::ProvokingVertexANGLE)},
>+    {"glProvokingVertexANGLEContextANGLE", P(gl::ProvokingVertexANGLEContextANGLE)},
>     {"glPushDebugGroupKHR", P(gl::PushDebugGroupKHR)},
>+    {"glPushDebugGroupKHRContextANGLE", P(gl::PushDebugGroupKHRContextANGLE)},
>     {"glPushGroupMarkerEXT", P(gl::PushGroupMarkerEXT)},
>+    {"glPushGroupMarkerEXTContextANGLE", P(gl::PushGroupMarkerEXTContextANGLE)},
>+    {"glPushMatrix", P(gl::PushMatrix)},
>+    {"glPushMatrixContextANGLE", P(gl::PushMatrixContextANGLE)},
>     {"glQueryCounterEXT", P(gl::QueryCounterEXT)},
>+    {"glQueryCounterEXTContextANGLE", P(gl::QueryCounterEXTContextANGLE)},
>+    {"glQueryMatrixxOES", P(gl::QueryMatrixxOES)},
>+    {"glQueryMatrixxOESContextANGLE", P(gl::QueryMatrixxOESContextANGLE)},
>     {"glReadBuffer", P(gl::ReadBuffer)},
>+    {"glReadBufferContextANGLE", P(gl::ReadBufferContextANGLE)},
>     {"glReadPixels", P(gl::ReadPixels)},
>+    {"glReadPixelsContextANGLE", P(gl::ReadPixelsContextANGLE)},
>     {"glReadPixelsRobustANGLE", P(gl::ReadPixelsRobustANGLE)},
>+    {"glReadPixelsRobustANGLEContextANGLE", P(gl::ReadPixelsRobustANGLEContextANGLE)},
>     {"glReadnPixelsEXT", P(gl::ReadnPixelsEXT)},
>+    {"glReadnPixelsEXTContextANGLE", P(gl::ReadnPixelsEXTContextANGLE)},
>     {"glReadnPixelsRobustANGLE", P(gl::ReadnPixelsRobustANGLE)},
>+    {"glReadnPixelsRobustANGLEContextANGLE", P(gl::ReadnPixelsRobustANGLEContextANGLE)},
>     {"glReleaseShaderCompiler", P(gl::ReleaseShaderCompiler)},
>+    {"glReleaseShaderCompilerContextANGLE", P(gl::ReleaseShaderCompilerContextANGLE)},
>     {"glRenderbufferStorage", P(gl::RenderbufferStorage)},
>+    {"glRenderbufferStorageContextANGLE", P(gl::RenderbufferStorageContextANGLE)},
>     {"glRenderbufferStorageMultisample", P(gl::RenderbufferStorageMultisample)},
>     {"glRenderbufferStorageMultisampleANGLE", P(gl::RenderbufferStorageMultisampleANGLE)},
>+    {"glRenderbufferStorageMultisampleANGLEContextANGLE",
>+     P(gl::RenderbufferStorageMultisampleANGLEContextANGLE)},
>+    {"glRenderbufferStorageMultisampleContextANGLE",
>+     P(gl::RenderbufferStorageMultisampleContextANGLE)},
>     {"glRequestExtensionANGLE", P(gl::RequestExtensionANGLE)},
>+    {"glRequestExtensionANGLEContextANGLE", P(gl::RequestExtensionANGLEContextANGLE)},
>     {"glResumeTransformFeedback", P(gl::ResumeTransformFeedback)},
>+    {"glResumeTransformFeedbackContextANGLE", P(gl::ResumeTransformFeedbackContextANGLE)},
>+    {"glRotatef", P(gl::Rotatef)},
>+    {"glRotatefContextANGLE", P(gl::RotatefContextANGLE)},
>+    {"glRotatex", P(gl::Rotatex)},
>+    {"glRotatexContextANGLE", P(gl::RotatexContextANGLE)},
>     {"glSampleCoverage", P(gl::SampleCoverage)},
>+    {"glSampleCoverageContextANGLE", P(gl::SampleCoverageContextANGLE)},
>+    {"glSampleCoveragex", P(gl::SampleCoveragex)},
>+    {"glSampleCoveragexContextANGLE", P(gl::SampleCoveragexContextANGLE)},
>     {"glSampleMaski", P(gl::SampleMaski)},
>+    {"glSampleMaskiANGLE", P(gl::SampleMaskiANGLE)},
>+    {"glSampleMaskiANGLEContextANGLE", P(gl::SampleMaskiANGLEContextANGLE)},
>+    {"glSampleMaskiContextANGLE", P(gl::SampleMaskiContextANGLE)},
>+    {"glSamplerParameterIivOES", P(gl::SamplerParameterIivOES)},
>+    {"glSamplerParameterIivOESContextANGLE", P(gl::SamplerParameterIivOESContextANGLE)},
>     {"glSamplerParameterIivRobustANGLE", P(gl::SamplerParameterIivRobustANGLE)},
>+    {"glSamplerParameterIivRobustANGLEContextANGLE",
>+     P(gl::SamplerParameterIivRobustANGLEContextANGLE)},
>+    {"glSamplerParameterIuivOES", P(gl::SamplerParameterIuivOES)},
>+    {"glSamplerParameterIuivOESContextANGLE", P(gl::SamplerParameterIuivOESContextANGLE)},
>     {"glSamplerParameterIuivRobustANGLE", P(gl::SamplerParameterIuivRobustANGLE)},
>+    {"glSamplerParameterIuivRobustANGLEContextANGLE",
>+     P(gl::SamplerParameterIuivRobustANGLEContextANGLE)},
>     {"glSamplerParameterf", P(gl::SamplerParameterf)},
>+    {"glSamplerParameterfContextANGLE", P(gl::SamplerParameterfContextANGLE)},
>     {"glSamplerParameterfv", P(gl::SamplerParameterfv)},
>+    {"glSamplerParameterfvContextANGLE", P(gl::SamplerParameterfvContextANGLE)},
>     {"glSamplerParameterfvRobustANGLE", P(gl::SamplerParameterfvRobustANGLE)},
>+    {"glSamplerParameterfvRobustANGLEContextANGLE",
>+     P(gl::SamplerParameterfvRobustANGLEContextANGLE)},
>     {"glSamplerParameteri", P(gl::SamplerParameteri)},
>+    {"glSamplerParameteriContextANGLE", P(gl::SamplerParameteriContextANGLE)},
>     {"glSamplerParameteriv", P(gl::SamplerParameteriv)},
>+    {"glSamplerParameterivContextANGLE", P(gl::SamplerParameterivContextANGLE)},
>     {"glSamplerParameterivRobustANGLE", P(gl::SamplerParameterivRobustANGLE)},
>+    {"glSamplerParameterivRobustANGLEContextANGLE",
>+     P(gl::SamplerParameterivRobustANGLEContextANGLE)},
>+    {"glScalef", P(gl::Scalef)},
>+    {"glScalefContextANGLE", P(gl::ScalefContextANGLE)},
>+    {"glScalex", P(gl::Scalex)},
>+    {"glScalexContextANGLE", P(gl::ScalexContextANGLE)},
>     {"glScissor", P(gl::Scissor)},
>+    {"glScissorContextANGLE", P(gl::ScissorContextANGLE)},
>+    {"glSemaphoreParameterui64vEXT", P(gl::SemaphoreParameterui64vEXT)},
>+    {"glSemaphoreParameterui64vEXTContextANGLE", P(gl::SemaphoreParameterui64vEXTContextANGLE)},
>     {"glSetFenceNV", P(gl::SetFenceNV)},
>+    {"glSetFenceNVContextANGLE", P(gl::SetFenceNVContextANGLE)},
>+    {"glShadeModel", P(gl::ShadeModel)},
>+    {"glShadeModelContextANGLE", P(gl::ShadeModelContextANGLE)},
>     {"glShaderBinary", P(gl::ShaderBinary)},
>+    {"glShaderBinaryContextANGLE", P(gl::ShaderBinaryContextANGLE)},
>     {"glShaderSource", P(gl::ShaderSource)},
>+    {"glShaderSourceContextANGLE", P(gl::ShaderSourceContextANGLE)},
>+    {"glSignalSemaphoreEXT", P(gl::SignalSemaphoreEXT)},
>+    {"glSignalSemaphoreEXTContextANGLE", P(gl::SignalSemaphoreEXTContextANGLE)},
>+    {"glStencilFillPathCHROMIUM", P(gl::StencilFillPathCHROMIUM)},
>+    {"glStencilFillPathCHROMIUMContextANGLE", P(gl::StencilFillPathCHROMIUMContextANGLE)},
>+    {"glStencilFillPathInstancedCHROMIUM", P(gl::StencilFillPathInstancedCHROMIUM)},
>+    {"glStencilFillPathInstancedCHROMIUMContextANGLE",
>+     P(gl::StencilFillPathInstancedCHROMIUMContextANGLE)},
>     {"glStencilFunc", P(gl::StencilFunc)},
>+    {"glStencilFuncContextANGLE", P(gl::StencilFuncContextANGLE)},
>     {"glStencilFuncSeparate", P(gl::StencilFuncSeparate)},
>+    {"glStencilFuncSeparateContextANGLE", P(gl::StencilFuncSeparateContextANGLE)},
>     {"glStencilMask", P(gl::StencilMask)},
>+    {"glStencilMaskContextANGLE", P(gl::StencilMaskContextANGLE)},
>     {"glStencilMaskSeparate", P(gl::StencilMaskSeparate)},
>+    {"glStencilMaskSeparateContextANGLE", P(gl::StencilMaskSeparateContextANGLE)},
>     {"glStencilOp", P(gl::StencilOp)},
>+    {"glStencilOpContextANGLE", P(gl::StencilOpContextANGLE)},
>     {"glStencilOpSeparate", P(gl::StencilOpSeparate)},
>+    {"glStencilOpSeparateContextANGLE", P(gl::StencilOpSeparateContextANGLE)},
>+    {"glStencilStrokePathCHROMIUM", P(gl::StencilStrokePathCHROMIUM)},
>+    {"glStencilStrokePathCHROMIUMContextANGLE", P(gl::StencilStrokePathCHROMIUMContextANGLE)},
>+    {"glStencilStrokePathInstancedCHROMIUM", P(gl::StencilStrokePathInstancedCHROMIUM)},
>+    {"glStencilStrokePathInstancedCHROMIUMContextANGLE",
>+     P(gl::StencilStrokePathInstancedCHROMIUMContextANGLE)},
>+    {"glStencilThenCoverFillPathCHROMIUM", P(gl::StencilThenCoverFillPathCHROMIUM)},
>+    {"glStencilThenCoverFillPathCHROMIUMContextANGLE",
>+     P(gl::StencilThenCoverFillPathCHROMIUMContextANGLE)},
>+    {"glStencilThenCoverFillPathInstancedCHROMIUM",
>+     P(gl::StencilThenCoverFillPathInstancedCHROMIUM)},
>+    {"glStencilThenCoverFillPathInstancedCHROMIUMContextANGLE",
>+     P(gl::StencilThenCoverFillPathInstancedCHROMIUMContextANGLE)},
>+    {"glStencilThenCoverStrokePathCHROMIUM", P(gl::StencilThenCoverStrokePathCHROMIUM)},
>+    {"glStencilThenCoverStrokePathCHROMIUMContextANGLE",
>+     P(gl::StencilThenCoverStrokePathCHROMIUMContextANGLE)},
>+    {"glStencilThenCoverStrokePathInstancedCHROMIUM",
>+     P(gl::StencilThenCoverStrokePathInstancedCHROMIUM)},
>+    {"glStencilThenCoverStrokePathInstancedCHROMIUMContextANGLE",
>+     P(gl::StencilThenCoverStrokePathInstancedCHROMIUMContextANGLE)},
>     {"glTestFenceNV", P(gl::TestFenceNV)},
>+    {"glTestFenceNVContextANGLE", P(gl::TestFenceNVContextANGLE)},
>+    {"glTexCoordPointer", P(gl::TexCoordPointer)},
>+    {"glTexCoordPointerContextANGLE", P(gl::TexCoordPointerContextANGLE)},
>+    {"glTexEnvf", P(gl::TexEnvf)},
>+    {"glTexEnvfContextANGLE", P(gl::TexEnvfContextANGLE)},
>+    {"glTexEnvfv", P(gl::TexEnvfv)},
>+    {"glTexEnvfvContextANGLE", P(gl::TexEnvfvContextANGLE)},
>+    {"glTexEnvi", P(gl::TexEnvi)},
>+    {"glTexEnviContextANGLE", P(gl::TexEnviContextANGLE)},
>+    {"glTexEnviv", P(gl::TexEnviv)},
>+    {"glTexEnvivContextANGLE", P(gl::TexEnvivContextANGLE)},
>+    {"glTexEnvx", P(gl::TexEnvx)},
>+    {"glTexEnvxContextANGLE", P(gl::TexEnvxContextANGLE)},
>+    {"glTexEnvxv", P(gl::TexEnvxv)},
>+    {"glTexEnvxvContextANGLE", P(gl::TexEnvxvContextANGLE)},
>     {"glTexImage2D", P(gl::TexImage2D)},
>+    {"glTexImage2DContextANGLE", P(gl::TexImage2DContextANGLE)},
>     {"glTexImage2DRobustANGLE", P(gl::TexImage2DRobustANGLE)},
>+    {"glTexImage2DRobustANGLEContextANGLE", P(gl::TexImage2DRobustANGLEContextANGLE)},
>     {"glTexImage3D", P(gl::TexImage3D)},
>+    {"glTexImage3DContextANGLE", P(gl::TexImage3DContextANGLE)},
>     {"glTexImage3DRobustANGLE", P(gl::TexImage3DRobustANGLE)},
>+    {"glTexImage3DRobustANGLEContextANGLE", P(gl::TexImage3DRobustANGLEContextANGLE)},
>+    {"glTexParameterIivOES", P(gl::TexParameterIivOES)},
>+    {"glTexParameterIivOESContextANGLE", P(gl::TexParameterIivOESContextANGLE)},
>     {"glTexParameterIivRobustANGLE", P(gl::TexParameterIivRobustANGLE)},
>+    {"glTexParameterIivRobustANGLEContextANGLE", P(gl::TexParameterIivRobustANGLEContextANGLE)},
>+    {"glTexParameterIuivOES", P(gl::TexParameterIuivOES)},
>+    {"glTexParameterIuivOESContextANGLE", P(gl::TexParameterIuivOESContextANGLE)},
>     {"glTexParameterIuivRobustANGLE", P(gl::TexParameterIuivRobustANGLE)},
>+    {"glTexParameterIuivRobustANGLEContextANGLE", P(gl::TexParameterIuivRobustANGLEContextANGLE)},
>     {"glTexParameterf", P(gl::TexParameterf)},
>+    {"glTexParameterfContextANGLE", P(gl::TexParameterfContextANGLE)},
>     {"glTexParameterfv", P(gl::TexParameterfv)},
>+    {"glTexParameterfvContextANGLE", P(gl::TexParameterfvContextANGLE)},
>     {"glTexParameterfvRobustANGLE", P(gl::TexParameterfvRobustANGLE)},
>+    {"glTexParameterfvRobustANGLEContextANGLE", P(gl::TexParameterfvRobustANGLEContextANGLE)},
>     {"glTexParameteri", P(gl::TexParameteri)},
>+    {"glTexParameteriContextANGLE", P(gl::TexParameteriContextANGLE)},
>     {"glTexParameteriv", P(gl::TexParameteriv)},
>+    {"glTexParameterivContextANGLE", P(gl::TexParameterivContextANGLE)},
>     {"glTexParameterivRobustANGLE", P(gl::TexParameterivRobustANGLE)},
>+    {"glTexParameterivRobustANGLEContextANGLE", P(gl::TexParameterivRobustANGLEContextANGLE)},
>+    {"glTexParameterx", P(gl::TexParameterx)},
>+    {"glTexParameterxContextANGLE", P(gl::TexParameterxContextANGLE)},
>+    {"glTexParameterxv", P(gl::TexParameterxv)},
>+    {"glTexParameterxvContextANGLE", P(gl::TexParameterxvContextANGLE)},
>     {"glTexStorage2D", P(gl::TexStorage2D)},
>+    {"glTexStorage2DContextANGLE", P(gl::TexStorage2DContextANGLE)},
>     {"glTexStorage2DEXT", P(gl::TexStorage2DEXT)},
>+    {"glTexStorage2DEXTContextANGLE", P(gl::TexStorage2DEXTContextANGLE)},
>     {"glTexStorage2DMultisample", P(gl::TexStorage2DMultisample)},
>+    {"glTexStorage2DMultisampleANGLE", P(gl::TexStorage2DMultisampleANGLE)},
>+    {"glTexStorage2DMultisampleANGLEContextANGLE", P(gl::TexStorage2DMultisampleANGLEContextANGLE)},
>+    {"glTexStorage2DMultisampleContextANGLE", P(gl::TexStorage2DMultisampleContextANGLE)},
>     {"glTexStorage3D", P(gl::TexStorage3D)},
>+    {"glTexStorage3DContextANGLE", P(gl::TexStorage3DContextANGLE)},
>+    {"glTexStorage3DEXT", P(gl::TexStorage3DEXT)},
>+    {"glTexStorage3DEXTContextANGLE", P(gl::TexStorage3DEXTContextANGLE)},
>+    {"glTexStorage3DMultisampleOES", P(gl::TexStorage3DMultisampleOES)},
>+    {"glTexStorage3DMultisampleOESContextANGLE", P(gl::TexStorage3DMultisampleOESContextANGLE)},
>+    {"glTexStorageMem2DEXT", P(gl::TexStorageMem2DEXT)},
>+    {"glTexStorageMem2DEXTContextANGLE", P(gl::TexStorageMem2DEXTContextANGLE)},
>+    {"glTexStorageMem2DMultisampleEXT", P(gl::TexStorageMem2DMultisampleEXT)},
>+    {"glTexStorageMem2DMultisampleEXTContextANGLE",
>+     P(gl::TexStorageMem2DMultisampleEXTContextANGLE)},
>+    {"glTexStorageMem3DEXT", P(gl::TexStorageMem3DEXT)},
>+    {"glTexStorageMem3DEXTContextANGLE", P(gl::TexStorageMem3DEXTContextANGLE)},
>+    {"glTexStorageMem3DMultisampleEXT", P(gl::TexStorageMem3DMultisampleEXT)},
>+    {"glTexStorageMem3DMultisampleEXTContextANGLE",
>+     P(gl::TexStorageMem3DMultisampleEXTContextANGLE)},
>     {"glTexSubImage2D", P(gl::TexSubImage2D)},
>+    {"glTexSubImage2DContextANGLE", P(gl::TexSubImage2DContextANGLE)},
>     {"glTexSubImage2DRobustANGLE", P(gl::TexSubImage2DRobustANGLE)},
>+    {"glTexSubImage2DRobustANGLEContextANGLE", P(gl::TexSubImage2DRobustANGLEContextANGLE)},
>     {"glTexSubImage3D", P(gl::TexSubImage3D)},
>+    {"glTexSubImage3DContextANGLE", P(gl::TexSubImage3DContextANGLE)},
>     {"glTexSubImage3DRobustANGLE", P(gl::TexSubImage3DRobustANGLE)},
>+    {"glTexSubImage3DRobustANGLEContextANGLE", P(gl::TexSubImage3DRobustANGLEContextANGLE)},
>     {"glTransformFeedbackVaryings", P(gl::TransformFeedbackVaryings)},
>+    {"glTransformFeedbackVaryingsContextANGLE", P(gl::TransformFeedbackVaryingsContextANGLE)},
>+    {"glTranslatef", P(gl::Translatef)},
>+    {"glTranslatefContextANGLE", P(gl::TranslatefContextANGLE)},
>+    {"glTranslatex", P(gl::Translatex)},
>+    {"glTranslatexContextANGLE", P(gl::TranslatexContextANGLE)},
>     {"glUniform1f", P(gl::Uniform1f)},
>+    {"glUniform1fContextANGLE", P(gl::Uniform1fContextANGLE)},
>     {"glUniform1fv", P(gl::Uniform1fv)},
>+    {"glUniform1fvContextANGLE", P(gl::Uniform1fvContextANGLE)},
>     {"glUniform1i", P(gl::Uniform1i)},
>+    {"glUniform1iContextANGLE", P(gl::Uniform1iContextANGLE)},
>     {"glUniform1iv", P(gl::Uniform1iv)},
>+    {"glUniform1ivContextANGLE", P(gl::Uniform1ivContextANGLE)},
>     {"glUniform1ui", P(gl::Uniform1ui)},
>+    {"glUniform1uiContextANGLE", P(gl::Uniform1uiContextANGLE)},
>     {"glUniform1uiv", P(gl::Uniform1uiv)},
>+    {"glUniform1uivContextANGLE", P(gl::Uniform1uivContextANGLE)},
>     {"glUniform2f", P(gl::Uniform2f)},
>+    {"glUniform2fContextANGLE", P(gl::Uniform2fContextANGLE)},
>     {"glUniform2fv", P(gl::Uniform2fv)},
>+    {"glUniform2fvContextANGLE", P(gl::Uniform2fvContextANGLE)},
>     {"glUniform2i", P(gl::Uniform2i)},
>+    {"glUniform2iContextANGLE", P(gl::Uniform2iContextANGLE)},
>     {"glUniform2iv", P(gl::Uniform2iv)},
>+    {"glUniform2ivContextANGLE", P(gl::Uniform2ivContextANGLE)},
>     {"glUniform2ui", P(gl::Uniform2ui)},
>+    {"glUniform2uiContextANGLE", P(gl::Uniform2uiContextANGLE)},
>     {"glUniform2uiv", P(gl::Uniform2uiv)},
>+    {"glUniform2uivContextANGLE", P(gl::Uniform2uivContextANGLE)},
>     {"glUniform3f", P(gl::Uniform3f)},
>+    {"glUniform3fContextANGLE", P(gl::Uniform3fContextANGLE)},
>     {"glUniform3fv", P(gl::Uniform3fv)},
>+    {"glUniform3fvContextANGLE", P(gl::Uniform3fvContextANGLE)},
>     {"glUniform3i", P(gl::Uniform3i)},
>+    {"glUniform3iContextANGLE", P(gl::Uniform3iContextANGLE)},
>     {"glUniform3iv", P(gl::Uniform3iv)},
>+    {"glUniform3ivContextANGLE", P(gl::Uniform3ivContextANGLE)},
>     {"glUniform3ui", P(gl::Uniform3ui)},
>+    {"glUniform3uiContextANGLE", P(gl::Uniform3uiContextANGLE)},
>     {"glUniform3uiv", P(gl::Uniform3uiv)},
>+    {"glUniform3uivContextANGLE", P(gl::Uniform3uivContextANGLE)},
>     {"glUniform4f", P(gl::Uniform4f)},
>+    {"glUniform4fContextANGLE", P(gl::Uniform4fContextANGLE)},
>     {"glUniform4fv", P(gl::Uniform4fv)},
>+    {"glUniform4fvContextANGLE", P(gl::Uniform4fvContextANGLE)},
>     {"glUniform4i", P(gl::Uniform4i)},
>+    {"glUniform4iContextANGLE", P(gl::Uniform4iContextANGLE)},
>     {"glUniform4iv", P(gl::Uniform4iv)},
>+    {"glUniform4ivContextANGLE", P(gl::Uniform4ivContextANGLE)},
>     {"glUniform4ui", P(gl::Uniform4ui)},
>+    {"glUniform4uiContextANGLE", P(gl::Uniform4uiContextANGLE)},
>     {"glUniform4uiv", P(gl::Uniform4uiv)},
>+    {"glUniform4uivContextANGLE", P(gl::Uniform4uivContextANGLE)},
>     {"glUniformBlockBinding", P(gl::UniformBlockBinding)},
>+    {"glUniformBlockBindingContextANGLE", P(gl::UniformBlockBindingContextANGLE)},
>     {"glUniformMatrix2fv", P(gl::UniformMatrix2fv)},
>+    {"glUniformMatrix2fvContextANGLE", P(gl::UniformMatrix2fvContextANGLE)},
>     {"glUniformMatrix2x3fv", P(gl::UniformMatrix2x3fv)},
>+    {"glUniformMatrix2x3fvContextANGLE", P(gl::UniformMatrix2x3fvContextANGLE)},
>     {"glUniformMatrix2x4fv", P(gl::UniformMatrix2x4fv)},
>+    {"glUniformMatrix2x4fvContextANGLE", P(gl::UniformMatrix2x4fvContextANGLE)},
>     {"glUniformMatrix3fv", P(gl::UniformMatrix3fv)},
>+    {"glUniformMatrix3fvContextANGLE", P(gl::UniformMatrix3fvContextANGLE)},
>     {"glUniformMatrix3x2fv", P(gl::UniformMatrix3x2fv)},
>+    {"glUniformMatrix3x2fvContextANGLE", P(gl::UniformMatrix3x2fvContextANGLE)},
>     {"glUniformMatrix3x4fv", P(gl::UniformMatrix3x4fv)},
>+    {"glUniformMatrix3x4fvContextANGLE", P(gl::UniformMatrix3x4fvContextANGLE)},
>     {"glUniformMatrix4fv", P(gl::UniformMatrix4fv)},
>+    {"glUniformMatrix4fvContextANGLE", P(gl::UniformMatrix4fvContextANGLE)},
>     {"glUniformMatrix4x2fv", P(gl::UniformMatrix4x2fv)},
>+    {"glUniformMatrix4x2fvContextANGLE", P(gl::UniformMatrix4x2fvContextANGLE)},
>     {"glUniformMatrix4x3fv", P(gl::UniformMatrix4x3fv)},
>+    {"glUniformMatrix4x3fvContextANGLE", P(gl::UniformMatrix4x3fvContextANGLE)},
>     {"glUnmapBuffer", P(gl::UnmapBuffer)},
>+    {"glUnmapBufferContextANGLE", P(gl::UnmapBufferContextANGLE)},
>     {"glUnmapBufferOES", P(gl::UnmapBufferOES)},
>+    {"glUnmapBufferOESContextANGLE", P(gl::UnmapBufferOESContextANGLE)},
>     {"glUseProgram", P(gl::UseProgram)},
>+    {"glUseProgramContextANGLE", P(gl::UseProgramContextANGLE)},
>     {"glUseProgramStages", P(gl::UseProgramStages)},
>+    {"glUseProgramStagesContextANGLE", P(gl::UseProgramStagesContextANGLE)},
>     {"glValidateProgram", P(gl::ValidateProgram)},
>+    {"glValidateProgramContextANGLE", P(gl::ValidateProgramContextANGLE)},
>     {"glValidateProgramPipeline", P(gl::ValidateProgramPipeline)},
>+    {"glValidateProgramPipelineContextANGLE", P(gl::ValidateProgramPipelineContextANGLE)},
>     {"glVertexAttrib1f", P(gl::VertexAttrib1f)},
>+    {"glVertexAttrib1fContextANGLE", P(gl::VertexAttrib1fContextANGLE)},
>     {"glVertexAttrib1fv", P(gl::VertexAttrib1fv)},
>+    {"glVertexAttrib1fvContextANGLE", P(gl::VertexAttrib1fvContextANGLE)},
>     {"glVertexAttrib2f", P(gl::VertexAttrib2f)},
>+    {"glVertexAttrib2fContextANGLE", P(gl::VertexAttrib2fContextANGLE)},
>     {"glVertexAttrib2fv", P(gl::VertexAttrib2fv)},
>+    {"glVertexAttrib2fvContextANGLE", P(gl::VertexAttrib2fvContextANGLE)},
>     {"glVertexAttrib3f", P(gl::VertexAttrib3f)},
>+    {"glVertexAttrib3fContextANGLE", P(gl::VertexAttrib3fContextANGLE)},
>     {"glVertexAttrib3fv", P(gl::VertexAttrib3fv)},
>+    {"glVertexAttrib3fvContextANGLE", P(gl::VertexAttrib3fvContextANGLE)},
>     {"glVertexAttrib4f", P(gl::VertexAttrib4f)},
>+    {"glVertexAttrib4fContextANGLE", P(gl::VertexAttrib4fContextANGLE)},
>     {"glVertexAttrib4fv", P(gl::VertexAttrib4fv)},
>+    {"glVertexAttrib4fvContextANGLE", P(gl::VertexAttrib4fvContextANGLE)},
>     {"glVertexAttribBinding", P(gl::VertexAttribBinding)},
>+    {"glVertexAttribBindingContextANGLE", P(gl::VertexAttribBindingContextANGLE)},
>     {"glVertexAttribDivisor", P(gl::VertexAttribDivisor)},
>     {"glVertexAttribDivisorANGLE", P(gl::VertexAttribDivisorANGLE)},
>+    {"glVertexAttribDivisorANGLEContextANGLE", P(gl::VertexAttribDivisorANGLEContextANGLE)},
>+    {"glVertexAttribDivisorContextANGLE", P(gl::VertexAttribDivisorContextANGLE)},
>+    {"glVertexAttribDivisorEXT", P(gl::VertexAttribDivisorEXT)},
>+    {"glVertexAttribDivisorEXTContextANGLE", P(gl::VertexAttribDivisorEXTContextANGLE)},
>     {"glVertexAttribFormat", P(gl::VertexAttribFormat)},
>+    {"glVertexAttribFormatContextANGLE", P(gl::VertexAttribFormatContextANGLE)},
>     {"glVertexAttribI4i", P(gl::VertexAttribI4i)},
>+    {"glVertexAttribI4iContextANGLE", P(gl::VertexAttribI4iContextANGLE)},
>     {"glVertexAttribI4iv", P(gl::VertexAttribI4iv)},
>+    {"glVertexAttribI4ivContextANGLE", P(gl::VertexAttribI4ivContextANGLE)},
>     {"glVertexAttribI4ui", P(gl::VertexAttribI4ui)},
>+    {"glVertexAttribI4uiContextANGLE", P(gl::VertexAttribI4uiContextANGLE)},
>     {"glVertexAttribI4uiv", P(gl::VertexAttribI4uiv)},
>+    {"glVertexAttribI4uivContextANGLE", P(gl::VertexAttribI4uivContextANGLE)},
>     {"glVertexAttribIFormat", P(gl::VertexAttribIFormat)},
>+    {"glVertexAttribIFormatContextANGLE", P(gl::VertexAttribIFormatContextANGLE)},
>     {"glVertexAttribIPointer", P(gl::VertexAttribIPointer)},
>+    {"glVertexAttribIPointerContextANGLE", P(gl::VertexAttribIPointerContextANGLE)},
>     {"glVertexAttribPointer", P(gl::VertexAttribPointer)},
>+    {"glVertexAttribPointerContextANGLE", P(gl::VertexAttribPointerContextANGLE)},
>     {"glVertexBindingDivisor", P(gl::VertexBindingDivisor)},
>+    {"glVertexBindingDivisorContextANGLE", P(gl::VertexBindingDivisorContextANGLE)},
>+    {"glVertexPointer", P(gl::VertexPointer)},
>+    {"glVertexPointerContextANGLE", P(gl::VertexPointerContextANGLE)},
>     {"glViewport", P(gl::Viewport)},
>-    {"glWaitSync", P(gl::WaitSync)}};
>+    {"glViewportContextANGLE", P(gl::ViewportContextANGLE)},
>+    {"glWaitSemaphoreEXT", P(gl::WaitSemaphoreEXT)},
>+    {"glWaitSemaphoreEXTContextANGLE", P(gl::WaitSemaphoreEXTContextANGLE)},
>+    {"glWaitSync", P(gl::WaitSync)},
>+    {"glWaitSyncContextANGLE", P(gl::WaitSyncContextANGLE)},
>+    {"glWeightPointerOES", P(gl::WeightPointerOES)},
>+    {"glWeightPointerOESContextANGLE", P(gl::WeightPointerOESContextANGLE)}};
> 
>-size_t g_numProcs = 516;
>+size_t g_numProcs = 1332;
> }  // namespace egl
>diff --git a/Source/ThirdParty/ANGLE/src/libGLESv2/proc_table_data.json b/Source/ThirdParty/ANGLE/src/libGLESv2/proc_table_data.json
>index 5ce1d433a82..397691539c2 100644
>--- a/Source/ThirdParty/ANGLE/src/libGLESv2/proc_table_data.json
>+++ b/Source/ThirdParty/ANGLE/src/libGLESv2/proc_table_data.json
>@@ -1,4 +1,177 @@
> {
>+    "GLES1 core": [
>+        "glAlphaFunc",
>+        "glClearColor",
>+        "glClearDepthf",
>+        "glClipPlanef",
>+        "glColor4f",
>+        "glDepthRangef",
>+        "glFogf",
>+        "glFogfv",
>+        "glFrustumf",
>+        "glGetClipPlanef",
>+        "glGetFloatv",
>+        "glGetLightfv",
>+        "glGetMaterialfv",
>+        "glGetTexEnvfv",
>+        "glGetTexParameterfv",
>+        "glLightModelf",
>+        "glLightModelfv",
>+        "glLightf",
>+        "glLightfv",
>+        "glLineWidth",
>+        "glLoadMatrixf",
>+        "glMaterialf",
>+        "glMaterialfv",
>+        "glMultMatrixf",
>+        "glMultiTexCoord4f",
>+        "glNormal3f",
>+        "glOrthof",
>+        "glPointParameterf",
>+        "glPointParameterfv",
>+        "glPointSize",
>+        "glPolygonOffset",
>+        "glRotatef",
>+        "glScalef",
>+        "glTexEnvf",
>+        "glTexEnvfv",
>+        "glTexParameterf",
>+        "glTexParameterfv",
>+        "glTranslatef",
>+        "glActiveTexture",
>+        "glAlphaFuncx",
>+        "glBindBuffer",
>+        "glBindTexture",
>+        "glBlendFunc",
>+        "glBufferData",
>+        "glBufferSubData",
>+        "glClear",
>+        "glClearColorx",
>+        "glClearDepthx",
>+        "glClearStencil",
>+        "glClientActiveTexture",
>+        "glClipPlanex",
>+        "glColor4ub",
>+        "glColor4x",
>+        "glColorMask",
>+        "glColorPointer",
>+        "glCompressedTexImage2D",
>+        "glCompressedTexSubImage2D",
>+        "glCopyTexImage2D",
>+        "glCopyTexSubImage2D",
>+        "glCullFace",
>+        "glDeleteBuffers",
>+        "glDeleteTextures",
>+        "glDepthFunc",
>+        "glDepthMask",
>+        "glDepthRangex",
>+        "glDisable",
>+        "glDisableClientState",
>+        "glDrawArrays",
>+        "glDrawElements",
>+        "glEnable",
>+        "glEnableClientState",
>+        "glFinish",
>+        "glFlush",
>+        "glFogx",
>+        "glFogxv",
>+        "glFrontFace",
>+        "glFrustumx",
>+        "glGetBooleanv",
>+        "glGetBufferParameteriv",
>+        "glGetClipPlanex",
>+        "glGenBuffers",
>+        "glGenTextures",
>+        "glGetError",
>+        "glGetFixedv",
>+        "glGetIntegerv",
>+        "glGetLightxv",
>+        "glGetMaterialxv",
>+        "glGetPointerv",
>+        "glGetString",
>+        "glGetTexEnviv",
>+        "glGetTexEnvxv",
>+        "glGetTexParameteriv",
>+        "glGetTexParameterxv",
>+        "glHint",
>+        "glIsBuffer",
>+        "glIsEnabled",
>+        "glIsTexture",
>+        "glLightModelx",
>+        "glLightModelxv",
>+        "glLightx",
>+        "glLightxv",
>+        "glLineWidthx",
>+        "glLoadIdentity",
>+        "glLoadMatrixx",
>+        "glLogicOp",
>+        "glMaterialx",
>+        "glMaterialxv",
>+        "glMatrixMode",
>+        "glMultMatrixx",
>+        "glMultiTexCoord4x",
>+        "glNormal3x",
>+        "glNormalPointer",
>+        "glOrthox",
>+        "glPixelStorei",
>+        "glPointParameterx",
>+        "glPointParameterxv",
>+        "glPointSizex",
>+        "glPolygonOffsetx",
>+        "glPopMatrix",
>+        "glPushMatrix",
>+        "glReadPixels",
>+        "glRotatex",
>+        "glSampleCoverage",
>+        "glSampleCoveragex",
>+        "glScalex",
>+        "glScissor",
>+        "glShadeModel",
>+        "glStencilFunc",
>+        "glStencilMask",
>+        "glStencilOp",
>+        "glTexCoordPointer",
>+        "glTexEnvi",
>+        "glTexEnvx",
>+        "glTexEnviv",
>+        "glTexEnvxv",
>+        "glTexImage2D",
>+        "glTexParameteri",
>+        "glTexParameterx",
>+        "glTexParameteriv",
>+        "glTexParameterxv",
>+        "glTexSubImage2D",
>+        "glTranslatex",
>+        "glVertexPointer",
>+        "glViewport"
>+    ],
>+
>+    "GL_OES_draw_texture": [
>+        "glDrawTexsOES",
>+        "glDrawTexiOES",
>+        "glDrawTexxOES",
>+        "glDrawTexsvOES",
>+        "glDrawTexivOES",
>+        "glDrawTexxvOES",
>+        "glDrawTexfOES",
>+        "glDrawTexfvOES"
>+    ],
>+
>+    "GL_OES_matrix_palette": [
>+        "glCurrentPaletteMatrixOES",
>+        "glLoadPaletteFromModelViewMatrixOES",
>+        "glMatrixIndexPointerOES",
>+        "glWeightPointerOES"
>+    ],
>+
>+    "GL_OES_point_size_array": [
>+        "glPointSizePointerOES"
>+    ],
>+
>+    "GL_OES_query_matrix": [
>+        "glQueryMatrixxOES"
>+    ],
>+
>     "GLES2 core": [
>         "glActiveTexture",
>         "glAttachShader",
>@@ -170,8 +343,48 @@
>         "glGetTranslatedShaderSourceANGLE"
>     ],
> 
>+    "GL_CHROMIUM_framebuffer_mixed_samples": [
>+         "glMatrixLoadfCHROMIUM",
>+         "glMatrixLoadIdentityCHROMIUM",
>+         "glCoverageModulationCHROMIUM"
>+    ],
>+
>+    "GL_CHROMIUM_path_rendering": [
>+         "glGenPathsCHROMIUM",
>+         "glDeletePathsCHROMIUM",
>+         "glIsPathCHROMIUM",
>+         "glPathCommandsCHROMIUM",
>+         "glPathParameterfCHROMIUM",
>+         "glPathParameteriCHROMIUM",
>+         "glGetPathParameterfvCHROMIUM",
>+         "glGetPathParameterivCHROMIUM",
>+         "glPathStencilFuncCHROMIUM",
>+         "glStencilFillPathCHROMIUM",
>+         "glStencilStrokePathCHROMIUM",
>+         "glCoverFillPathCHROMIUM",
>+         "glCoverStrokePathCHROMIUM",
>+         "glStencilThenCoverFillPathCHROMIUM",
>+         "glStencilThenCoverStrokePathCHROMIUM",
>+         "glCoverFillPathInstancedCHROMIUM",
>+         "glCoverStrokePathInstancedCHROMIUM",
>+         "glStencilFillPathInstancedCHROMIUM",
>+         "glStencilStrokePathInstancedCHROMIUM",
>+         "glStencilThenCoverFillPathInstancedCHROMIUM",
>+         "glStencilThenCoverStrokePathInstancedCHROMIUM",
>+         "glBindFragmentInputLocationCHROMIUM",
>+         "glProgramPathFragmentInputGenCHROMIUM"
>+    ],
>+
>+    "GL_EXT_blend_func_extended": [
>+        "glBindFragDataLocationIndexedEXT",
>+        "glBindFragDataLocationEXT",
>+        "glGetProgramResourceLocationIndexEXT",
>+        "glGetFragDataIndexEXT"
>+    ],
>+
>     "GL_EXT_texture_storage": [
>-        "glTexStorage2DEXT"
>+        "glTexStorage2DEXT",
>+        "glTexStorage3DEXT"
>     ],
> 
>     "GL_EXT_robustness": [
>@@ -215,6 +428,12 @@
>         "glVertexAttribDivisorANGLE"
>     ],
> 
>+    "GL_EXT_instanced_arrays": [
>+        "glDrawArraysInstancedEXT",
>+        "glDrawElementsInstancedEXT",
>+        "glVertexAttribDivisorEXT"
>+    ],
>+
>     "GL_OES_get_program_binary": [
>         "glGetProgramBinaryOES",
>         "glProgramBinaryOES"
>@@ -276,6 +495,11 @@
>         "glCompressedCopyTextureCHROMIUM"
>     ],
> 
>+    "GL_ANGLE_copy_texture_3D":[
>+        "glCopyTexture3DANGLE",
>+        "glCopySubTexture3DANGLE"
>+    ],
>+
>     "GL_ANGLE_request_extension": [
>         "glRequestExtensionANGLE"
>     ],
>@@ -347,9 +571,34 @@
>         "glGetQueryObjectui64vRobustANGLE"
>     ],
> 
>-    "GL_ANGLE_multiview": [
>-        "glFramebufferTextureMultiviewLayeredANGLE",
>-        "glFramebufferTextureMultiviewSideBySideANGLE"
>+    "GL_ANGLE_multi_draw": [
>+      "glMultiDrawArraysANGLE",
>+      "glMultiDrawArraysInstancedANGLE",
>+      "glMultiDrawElementsANGLE",
>+      "glMultiDrawElementsInstancedANGLE"
>+    ],
>+
>+    "GL_OVR_multiview2": [
>+        "glFramebufferTextureMultiviewOVR"
>+    ],
>+
>+    "GL_KHR_parallel_shader_compile": [
>+        "glMaxShaderCompilerThreadsKHR"
>+    ],
>+
>+    "GL_OES_texture_storage_multisample_2d_array": [
>+        "glTexStorage3DMultisampleOES"
>+    ],
>+
>+    "GL_OES_texture_border_clamp": [
>+        "glTexParameterIivOES",
>+        "glTexParameterIuivOES",
>+        "glGetTexParameterIivOES",
>+        "glGetTexParameterIuivOES",
>+        "glSamplerParameterIivOES",
>+        "glSamplerParameterIuivOES",
>+        "glGetSamplerParameterIivOES",
>+        "glGetSamplerParameterIuivOES"
>     ],
> 
>     "GLES3 core": [
>@@ -530,6 +779,22 @@
>         "glVertexBindingDivisor"
>     ],
> 
>+    "GL_EXT_geometry_shader": [
>+        "glFramebufferTextureEXT"
>+    ],
>+
>+    "GL_ANGLE_texture_multisample": [
>+      "glTexStorage2DMultisampleANGLE",
>+      "glGetTexLevelParameterfvANGLE",
>+      "glGetTexLevelParameterivANGLE",
>+      "glGetMultisamplefvANGLE",
>+      "glSampleMaskiANGLE"
>+    ],
>+
>+    "GL_ANGLE_provoking_vertex": [
>+      "glProvokingVertexANGLE"
>+    ],
>+
>     "EGL 1.0": [
>         "eglChooseConfig",
>         "eglCopyBuffers",
>@@ -598,7 +863,9 @@
>     ],
> 
>     "EGL_EXT_platform_base": [
>-        "eglGetPlatformDisplayEXT"
>+        "eglGetPlatformDisplayEXT",
>+        "eglCreatePlatformWindowSurfaceEXT",
>+        "eglCreatePlatformPixmapSurfaceEXT"
>     ],
> 
>     "EGL_EXT_device_query": [
>@@ -635,17 +902,34 @@
>         "eglStreamConsumerGLTextureExternalAttribsNV"
>     ],
> 
>-    "EGL_ANGLE_stream_producer_d3d_texture_nv12": [
>-        "eglCreateStreamProducerD3DTextureNV12ANGLE",
>-        "eglStreamPostD3DTextureNV12ANGLE"
>+    "EGL_ANGLE_stream_producer_d3d_texture": [
>+        "eglCreateStreamProducerD3DTextureANGLE",
>+        "eglStreamPostD3DTextureANGLE"
>     ],
> 
>+    "EGL_KHR_fence_sync": [
>+        "eglCreateSyncKHR",
>+        "eglDestroySyncKHR",
>+        "eglClientWaitSyncKHR",
>+        "eglGetSyncAttribKHR"
>+    ],
>+    "EGL_KHR_wait_sync": [
>+        "eglWaitSyncKHR"
>+    ],
>     "EGL_CHROMIUM_get_sync_values": [
>         "eglGetSyncValuesCHROMIUM"
>     ],
> 
>-    "EGL_EXT_swap_buffers_with_damage": [
>-        "eglSwapBuffersWithDamageEXT"
>+    "EGL_KHR_swap_buffers_with_damage": [
>+        "eglSwapBuffersWithDamageKHR"
>+    ],
>+
>+    "EGL_ANDROID_presentation_time": [
>+        "eglPresentationTimeANDROID"
>+    ],
>+
>+    "EGL_ANDROID_blob_cache": [
>+        "eglSetBlobCacheFuncsANDROID"
>     ],
> 
>     "EGL_ANGLE_program_cache_control": [
>@@ -655,8 +939,62 @@
>         "eglProgramCacheResizeANGLE"
>     ],
> 
>+    "EGL_KHR_debug": [
>+        "eglDebugMessageControlKHR",
>+        "eglQueryDebugKHR",
>+        "eglLabelObjectKHR"
>+    ],
>+
>+    "EGL_ANDROID_get_frame_timestamps": [
>+        "eglGetCompositorTimingSupportedANDROID",
>+        "eglGetCompositorTimingANDROID",
>+        "eglGetNextFrameIdANDROID",
>+        "eglGetFrameTimestampSupportedANDROID",
>+        "eglGetFrameTimestampsANDROID"
>+    ],
>+
>     "angle::Platform related entry points": [
>         "ANGLEGetDisplayPlatform",
>         "ANGLEResetDisplayPlatform"
>+    ],
>+
>+    "GL_EXT_memory_object/GL_EXT_semaphore": [
>+        "glGetUnsignedBytevEXT",
>+        "glGetUnsignedBytei_vEXT"
>+    ],
>+
>+    "GL_EXT_memory_object": [
>+        "glDeleteMemoryObjectsEXT",
>+        "glIsMemoryObjectEXT",
>+        "glCreateMemoryObjectsEXT",
>+        "glMemoryObjectParameterivEXT",
>+        "glGetMemoryObjectParameterivEXT",
>+        "glTexStorageMem2DEXT",
>+        "glTexStorageMem2DMultisampleEXT",
>+        "glTexStorageMem3DEXT",
>+        "glTexStorageMem3DMultisampleEXT",
>+        "glBufferStorageMemEXT"
>+    ],
>+
>+    "GL_EXT_memory_object_fd": [
>+        "glImportMemoryFdEXT"
>+    ],
>+
>+    "GL_EXT_semaphore": [
>+        "glGenSemaphoresEXT",
>+        "glDeleteSemaphoresEXT",
>+        "glIsSemaphoreEXT",
>+        "glSemaphoreParameterui64vEXT",
>+        "glGetSemaphoreParameterui64vEXT",
>+        "glWaitSemaphoreEXT",
>+        "glSignalSemaphoreEXT"
>+    ],
>+
>+    "GL_EXT_semaphore_fd": [
>+        "glImportSemaphoreFdEXT"
>+    ],
>+
>+    "GL_CHROMIUM_lose_context": [
>+        "glLoseContextCHROMIUM"
>     ]
> }
>diff --git a/Source/ThirdParty/ANGLE/src/libGLESv2/resource.h b/Source/ThirdParty/ANGLE/src/libGLESv2/resource.h
>index 39adaad0dd6..7308c2ecfde 100644
>--- a/Source/ThirdParty/ANGLE/src/libGLESv2/resource.h
>+++ b/Source/ThirdParty/ANGLE/src/libGLESv2/resource.h
>@@ -3,12 +3,12 @@
> // Used by libGLESv2.rc
> 
> // Next default values for new objects
>-// 
>+//
> #ifdef APSTUDIO_INVOKED
>-#ifndef APSTUDIO_READONLY_SYMBOLS
>-#define _APS_NEXT_RESOURCE_VALUE        101
>-#define _APS_NEXT_COMMAND_VALUE         40001
>-#define _APS_NEXT_CONTROL_VALUE         1001
>-#define _APS_NEXT_SYMED_VALUE           101
>-#endif
>+#    ifndef APSTUDIO_READONLY_SYMBOLS
>+#        define _APS_NEXT_RESOURCE_VALUE 101
>+#        define _APS_NEXT_COMMAND_VALUE 40001
>+#        define _APS_NEXT_CONTROL_VALUE 1001
>+#        define _APS_NEXT_SYMED_VALUE 101
>+#    endif
> #endif
>diff --git a/Source/ThirdParty/ANGLE/src/tests/BUILD.gn b/Source/ThirdParty/ANGLE/src/tests/BUILD.gn
>index f7852105f77..24ec46812c1 100644
>--- a/Source/ThirdParty/ANGLE/src/tests/BUILD.gn
>+++ b/Source/ThirdParty/ANGLE/src/tests/BUILD.gn
>@@ -1,75 +1,42 @@
>-# Copyright 2015 The Chromium Authors. All rights reserved.
>+# Copyright 2015 The ANGLE Project Authors. All rights reserved.
> # Use of this source code is governed by a BSD-style license that can be
> # found in the LICENSE file.
> 
>-import("../../gni/angle.gni")
> import("//build/config/chromecast_build.gni")
> import("//testing/test.gni")
>-
>-unittests_gypi = exec_script("//build/gypi_to_gn.py",
>-                             [
>-                               rebase_path("angle_unittests.gypi"),
>-                               "--replace=<(angle_path)=.",
>-                             ],
>-                             "scope",
>-                             [ "angle_unittests.gypi" ])
>+import("../../gni/angle.gni")
>+import("angle_unittests.gni")
> 
> declare_args() {
>   # Don't build dEQP by default.
>   build_angle_deqp_tests = false
>+  build_angle_gles1_conform_tests = false
> }
> 
>+googletest_deps = [
>+  "//testing/gmock",
>+  "//testing/gtest",
>+  "//third_party/googletest:gmock",
>+  "//third_party/googletest:gtest",
>+]
>+
> if (build_with_chromium) {
>-  googletest_deps = [
>-    "//base",
>-    "//base/test:test_support",
>-    "//testing/gmock",
>-    "//testing/gtest",
>-  ]
>+  googletest_deps += [ "//base/test:test_support" ]
> } else {
>-  googletest_deps = [
>-    ":angle_internal_gmock",
>-    ":angle_internal_gtest",
>-  ]
>-
>-  config("angle_internal_gtest_config") {
>-    include_dirs = [
>-      "//third_party/googletest/src/googletest",
>-      "//third_party/googletest/src/googletest/include",
>-    ]
>-  }
>-
>-  static_library("angle_internal_gtest") {
>-    sources = [
>-      "//third_party/googletest/src/googletest/src/gtest-all.cc",
>-    ]
>-    public_configs = [ ":angle_internal_gtest_config" ]
>-  }
>-
>-  config("angle_internal_gmock_config") {
>-    include_dirs = [
>-      "//third_party/googletest/src/googlemock",
>-      "//third_party/googletest/src/googlemock/include",
>-      "//third_party/googletest/src/googletest/include",
>-    ]
>-  }
>-
>-  static_library("angle_internal_gmock") {
>-    sources = [
>-      "//third_party/googletest/src/googlemock/src/gmock-all.cc",
>-    ]
>-    public_configs = [ ":angle_internal_gmock_config" ]
>-  }
>-
>   group("all") {
>     testonly = true
>     deps = [
>       "//src/tests:angle_end2end_tests",
>       "//src/tests:angle_perftests",
>       "//src/tests:angle_unittests",
>-      "//src/tests:angle_white_box_tests",
>     ]
>-    if (build_angle_deqp_tests) {
>+    if (!is_fuchsia) {
>+      deps += [
>+        "//src/tests:angle_white_box_perftests",
>+        "//src/tests:angle_white_box_tests",
>+      ]
>+    }
>+    if (build_angle_deqp_tests && !is_fuchsia) {
>       deps += [
>         "//src/tests:angle_deqp_egl_no_gtest",
>         "//src/tests:angle_deqp_egl_tests",
>@@ -81,187 +48,504 @@ if (build_with_chromium) {
>         "//src/tests:angle_deqp_gles3_tests",
>       ]
>     }
>+    if (build_angle_gles1_conform_tests) {
>+      deps += [ "//src/tests:angle_gles1_conformance_tests" ]
>+    }
>   }
> }
> 
>-test("angle_unittests") {
>-  include_dirs = [ "$angle_root/src" ]
>+# Helper template for including "main" files in Chromium.
>+template("angle_tests_main") {
>+  source_set(target_name) {
>+    testonly = true
>+    public_deps = googletest_deps
>+    deps = [
>+      "${angle_root}:includes",
>+    ]
> 
>-  sources = rebase_path(unittests_gypi.angle_unittests_sources, ".", "../..")
>+    main = invoker.main
> 
>-  if (angle_enable_hlsl) {
>-    sources +=
>-        rebase_path(unittests_gypi.angle_unittests_hlsl_sources, ".", "../..")
>-    defines = [ "ANGLE_ENABLE_HLSL" ]
>+    if (build_with_chromium) {
>+      sources = [
>+        "//gpu/$main.cc",
>+      ]
>+    } else {
>+      sources = [
>+        "$main.cpp",
>+      ]
>+    }
>+  }
>+}
>+
>+# Should fix the naming here once we migrate away from Chromium "main" files.
>+angle_tests_main("angle_unittests_main") {
>+  main = "angle_unittest_main"
>+}
>+
>+angle_tests_main("angle_end2end_tests_main") {
>+  main = "angle_end2end_tests_main"
>+}
>+
>+angle_tests_main("angle_perftests_main") {
>+  main = "angle_perftests_main"
>+}
>+
>+angle_test("angle_unittests_helper") {
>+  sources = angle_unittests_helper_sources
>+
>+  deps = [
>+    "${angle_root}:angle_common",
>+  ]
>+}
>+
>+test_expectations_sources = [
>+  "test_expectations/GPUTestConfig.cpp",
>+  "test_expectations/GPUTestConfig.h",
>+  "test_expectations/GPUTestExpectationsParser.cpp",
>+  "test_expectations/GPUTestExpectationsParser.h",
>+]
>+if (is_mac) {
>+  test_expectations_sources_mac = [
>+    "test_expectations/GPUTestConfig_mac.mm",
>+    "test_expectations/GPUTestConfig_mac.h",
>+  ]
>+}
>+
>+config("angle_test_expectations_config") {
>+  include_dirs = [ "${angle_root}:angle_common" ]
>+}
>+
>+angle_static_library("angle_test_expectations") {
>+  public_configs += [ ":angle_test_expectations_config" ]
>+  public_deps = [
>+    "${angle_root}:angle_common",
>+    "${angle_root}:angle_gpu_info_util",
>+    "${angle_root}:angle_util",
>+  ]
>+  sources = test_expectations_sources
>+  if (is_mac) {
>+    sources += test_expectations_sources_mac
>+    libs = [ "Cocoa.framework" ]
>   }
>+}
> 
>-  if (build_with_chromium) {
>-    sources += [ "//gpu/angle_unittest_main.cc" ]
>-  } else {
>-    sources += [ "angle_unittests_main.cpp" ]
>+angle_test("angle_unittests") {
>+  sources = angle_unittests_sources
>+
>+  if (angle_enable_hlsl) {
>+    sources += angle_unittests_hlsl_sources
>+    defines = [ "ANGLE_ENABLE_HLSL" ]
>   }
> 
>   deps = googletest_deps + [
>-           angle_root + ":libANGLE",
>-           angle_root + ":preprocessor",
>-           angle_root + ":translator",
>+           "${angle_root}:libANGLE",
>+           ":angle_test_expectations",
>+           "${angle_root}:preprocessor",
>+           "${angle_root}:translator",
>+           "${angle_root}:libfeature_support${angle_libs_suffix}",
>+           ":angle_unittests_main",
>          ]
>+  if (!is_android && !is_fuchsia) {
>+    # SystemUtils.RunApp, the only unittest using a helper binary, is not supported on these
>+    # platforms yet.
>+    data_deps = [
>+      ":angle_unittests_helper",
>+    ]
>+  }
> }
> 
>-if (is_win || is_linux || is_mac || is_android) {
>-  end2end_gypi = exec_script("//build/gypi_to_gn.py",
>-                             [
>-                               rebase_path("angle_end2end_tests.gypi"),
>-                               "--replace=<(angle_path)=.",
>-                             ],
>-                             "scope",
>-                             [ "angle_end2end_tests.gypi" ])
>-
>-  test("angle_end2end_tests") {
>-    include_dirs = [
>-      "../../src/tests",
>-      "../../util",
>-    ]
>+if (is_win || is_linux || is_mac || is_android || is_fuchsia) {
>+  import("angle_end2end_tests.gni")
> 
>-    if (is_android) {
>-      use_native_activity = true
>-    }
>+  angle_test("angle_end2end_tests") {
>+    include_dirs = [ "." ]
> 
>-    sources =
>-        rebase_path(end2end_gypi.angle_end2end_tests_sources, ".", "../..")
>+    sources = angle_end2end_tests_sources
>+    libs = []
> 
>+    if (is_mac) {
>+      sources += angle_end2end_tests_mac_sources
>+      libs += [
>+        "CoreFoundation.framework",
>+        "IOSurface.framework",
>+      ]
>+    }
>     if (is_win) {
>-      sources += rebase_path(end2end_gypi.angle_end2end_tests_win_sources,
>-                             ".",
>-                             "../..")
>+      sources += angle_end2end_tests_win_sources
>     }
>     if (use_x11) {
>-      sources += rebase_path(end2end_gypi.angle_end2end_tests_x11_sources,
>-                             ".",
>-                             "../..")
>+      sources += angle_end2end_tests_x11_sources
>     }
>-
>-    if (build_with_chromium) {
>-      sources += [ "//gpu/angle_end2end_tests_main.cc" ]
>-    } else {
>-      sources += [ "angle_end2end_tests_main.cpp" ]
>+    if (angle_enable_vulkan) {
>+      sources += angle_end2end_tests_vulkan_sources
>     }
> 
>     configs += [
>-      angle_root + ":internal_config",
>-      angle_root + ":libANGLE_config",
>+      "${angle_root}:libANGLE_config",
>+      "${angle_root}:library_name_config",
>     ]
> 
>-    if (is_linux && !is_component_build) {
>-      # Set rpath to find libEGL.so and libGLESv2.so even in a non-component build.
>-      configs += [ "//build/config/gcc:rpath_for_built_shared_libraries" ]
>-    }
>+    deps = [
>+      ":angle_end2end_tests_main",
>+      ":angle_test_expectations",
>+      "${angle_root}:angle_gpu_info_util",
>+      "${angle_root}:angle_image_util",
>+      "${angle_root}:angle_util",
>+      "${angle_root}:angle_util_loader_headers",
>+    ]
>+
>+    data_deps = [
>+      "${angle_root}:libEGL${angle_libs_suffix}",
>+      "${angle_root}:libGLESv1_CM${angle_libs_suffix}",
>+      "${angle_root}:libGLESv2${angle_libs_suffix}",
>+    ]
> 
>-    deps = googletest_deps + [
>-             angle_root + ":angle_image_util",
>-             angle_root + ":angle_util",
>-             angle_root + ":libEGL",
>-             angle_root + ":libGLESv2",
>-             angle_root + ":preprocessor",
>-             angle_root + ":translator",
>-           ]
>+    if (is_android) {
>+      use_native_activity = true
>+    }
>+    if (angle_enable_vulkan) {
>+      deps += [ "${angle_root}:angle_vulkan" ]
>+    }
>   }
>+}
> 
>-  white_box_gypi = exec_script("//build/gypi_to_gn.py",
>-                               [
>-                                 rebase_path("angle_white_box_tests.gypi"),
>-                                 "--replace=<(angle_path)=.",
>-                               ],
>-                               "scope",
>-                               [ "angle_white_box_tests.gypi" ])
>+if (is_win || is_linux || is_mac || is_android) {
>+  import("angle_white_box_tests.gni")
> 
>-  test("angle_white_box_tests") {
>-    include_dirs = [
>-      "../../src/tests",
>-      "../../util",
>+  angle_test("angle_white_box_tests") {
>+    include_dirs = [ "." ]
>+    sources = angle_white_box_tests_sources
>+
>+    if (is_win) {
>+      sources += angle_white_box_tests_win_sources
>+    }
>+
>+    if (angle_enable_vulkan) {
>+      sources += [ "gl_tests/VulkanFormatTablesTest.cpp" ]
>+      sources += [ "gl_tests/VulkanUniformUpdatesTest.cpp" ]
>+    }
>+
>+    configs += [
>+      "${angle_root}:libANGLE_config",
>+      "${angle_root}:library_name_config",
>+    ]
>+
>+    deps = [
>+      ":angle_end2end_tests_main",
>+      "${angle_root}:angle_util_static",
>+      "${angle_root}:libANGLE",
>+      "${angle_root}:libEGL_static",
>+      "${angle_root}:libGLESv2_static",
>+      "${angle_root}:preprocessor",
>+      "${angle_root}:translator",
>     ]
> 
>     if (is_android) {
>       use_native_activity = true
>     }
>+  }
>+}
>+
>+if (is_win || is_linux || is_android || is_mac) {
>+  import("angle_perftests.gni")
> 
>-    sources =
>-        rebase_path(white_box_gypi.angle_white_box_tests_sources, ".", "../..")
>+  # This test suite is for perf tests that use ANGLE's internals in some direct way.
>+  angle_test("angle_white_box_perftests") {
>+    include_dirs = [ "." ]
>+    sources = angle_white_box_perf_tests_sources
>+
>+    deps = [
>+      ":angle_perftests_main",
>+      "${angle_jsoncpp_dir}:jsoncpp",
>+      "${angle_root}:angle_util_static",
>+      "${angle_root}:libANGLE",
>+      "${angle_root}:libEGL_static",
>+      "${angle_root}:libGLESv2_static",
>+    ]
> 
>     if (is_win) {
>-      sources += rebase_path(white_box_gypi.angle_white_box_tests_win_sources,
>-                             ".",
>-                             "../..")
>+      sources += angle_white_box_perf_tests_win_sources
>     }
> 
>-    # Share the same main file as end2end_tests.
>-    # TODO(jmadill): Probably should rename this if we're sharing.
>-    if (build_with_chromium) {
>-      sources += [ "//gpu/angle_end2end_tests_main.cc" ]
>-    } else {
>-      sources += [ "angle_end2end_tests_main.cpp" ]
>+    if (angle_enable_vulkan) {
>+      sources += angle_white_box_perf_tests_vulkan_sources
>+      deps += [ "${angle_glslang_dir}:glslang_sources" ]
>     }
> 
>     configs += [
>-      angle_root + ":internal_config",
>-      angle_root + ":libANGLE_config",
>+      "${angle_root}:libANGLE_config",
>+      "${angle_root}:library_name_config",
>     ]
> 
>-    deps = googletest_deps + [
>-             angle_root + ":angle_util_static",
>-             angle_root + ":libANGLE",
>-             angle_root + ":libEGL_static",
>-             angle_root + ":libGLESv2_static",
>-             angle_root + ":preprocessor",
>-             angle_root + ":translator",
>-           ]
>+    if (is_android) {
>+      use_native_activity = true
>+    }
>   }
> }
> 
>-if (is_win || is_linux || is_android || is_mac) {
>-  perftests_gypi = exec_script("//build/gypi_to_gn.py",
>-                               [
>-                                 rebase_path("angle_perftests.gypi"),
>-                                 "--replace=<(angle_path)=.",
>-                               ],
>-                               "scope",
>-                               [ "angle_perftests.gypi" ])
>-
>-  test("angle_perftests") {
>-    include_dirs = [
>-      "../../src/tests",
>-      "../../util",
>+if (is_win || is_linux || is_android || is_mac || is_fuchsia) {
>+  import("angle_perftests.gni")
>+
>+  # This test suite is designed to run against a generic GL implementation.
>+  angle_test("angle_perftests") {
>+    include_dirs = [ "." ]
>+    sources = angle_perf_tests_sources
>+
>+    deps = [
>+      ":angle_perftests_main",
>+      "${angle_jsoncpp_dir}:jsoncpp",
>+      "${angle_root}:angle_common",
>+      "${angle_root}:angle_gpu_info_util",
>+      "${angle_root}:angle_system_utils",
>+      "${angle_root}:angle_util",
>+      "${angle_root}:angle_util_loader_headers",
>+    ]
>+
>+    data_deps = [
>+      "${angle_root}:libEGL${angle_libs_suffix}",
>+      "${angle_root}:libGLESv2${angle_libs_suffix}",
>+    ]
>+
>+    configs += [
>+      "${angle_root}:libANGLE_config",
>+      "${angle_root}:library_name_config",
>     ]
> 
>     if (is_android) {
>       use_native_activity = true
>-      configs -= [ "//build/config/android:hide_all_but_jni" ]
>     }
> 
>-    sources = rebase_path(perftests_gypi.angle_perf_tests_sources, ".", "../..")
>-
>-    if (is_win) {
>-      sources +=
>-          rebase_path(perftests_gypi.angle_perf_tests_win_sources, ".", "../..")
>+    if (is_win || is_linux) {
>+      data_deps += [ "${angle_root}/third_party/glmark2:glmark2_angle" ]
>+    }
>+    if (is_win && target_cpu != "arm64") {
>+      data_deps += [ "${angle_root}/third_party/glmark2:glmark2_wgl" ]
>     }
>+    if (is_linux) {
>+      data_deps += [ "${angle_root}/third_party/glmark2:glmark2_glx" ]
>+    }
>+  }
>+}
> 
>-    if (build_with_chromium) {
>-      sources += [ "//gpu/angle_perftests_main.cc" ]
>-    } else {
>-      sources += [ "angle_perftests_main.cpp" ]
>+###-----------------------------------------------------
>+### ES 1 conformance tests
>+###-----------------------------------------------------
>+
>+if (build_angle_gles1_conform_tests) {
>+  gles1_conform_root = "//third_party/gles1_conform"
>+
>+  config("angle_gles1_conform_support") {
>+    include_dirs = [
>+      "$gles1_conform_root",
>+      "$gles1_conform_root/conform/conform",
>+      "$gles1_conform_root/conform/conformshell",
>+      "$gles1_conform_root/ctk",
>+      "$gles1_conform_root/fixed",
>+      "$gles1_conform_root/include",
>+      "$gles1_conform_root/platform",
>+    ]
>+
>+    defines = [
>+      "COMMON",
>+      "CONFORM_ALTERNATE_MAIN",
>+      "NULLWS",
>+    ]
>+
>+    cflags = []
>+    if (is_clang) {
>+      # Remove when crbug.com/428099 is resolved.
>+      cflags += [
>+        "-Wno-implicit-function-declaration",
>+        "-Wno-self-assign",
>+        "-Wno-sign-compare",
>+        "-Wno-unused-const-variable",
>+        "-Wno-unused-variable",
>+        "-Wno-int-to-pointer-cast",
>+
>+        # Upstream tests do null pointer arithmetic, so disable those warnings.
>+        "-Wno-null-pointer-arithmetic",
>+      ]
>     }
>+  }
> 
>+  # This source set is a bit special so we don't use angle_source_set.
>+  source_set("angle_gles1_conformance_no_gtest") {
>     configs += [
>-      angle_root + ":internal_config",
>-      angle_root + ":libANGLE_config",
>+      ":angle_gles1_conform_support",
>+      "${angle_root}:internal_config",
>     ]
> 
>-    deps = googletest_deps + [
>-             angle_root + ":angle_util_static",
>-             angle_root + ":libANGLE",
>-             angle_root + ":libEGL_static",
>-             angle_root + ":libGLESv2_static",
>-           ]
>+    public_configs = [
>+      "${angle_root}:angle_util_config",
>+      "${angle_root}:gl_prototypes",
>+      "${angle_root}:angle_static",
>+    ]
>+
>+    testonly = true
>+
>+    deps = [
>+      "${angle_root}:angle_common",
>+      "${angle_root}:angle_util_static",
>+      "${angle_root}:libEGL_static",
>+      "${angle_root}:libGLESv1_CM_static",
>+      "${angle_root}:libGLESv2_static",
>+      "${angle_root}:preprocessor",
>+      "${angle_root}:translator",
>+    ]
>+
>+    sources = [
>+      "$gles1_conform_root/conform/conform/apfunc.c",
>+      "$gles1_conform_root/conform/conform/appl.c",
>+      "$gles1_conform_root/conform/conform/bclear.c",
>+      "$gles1_conform_root/conform/conform/bcolor.c",
>+      "$gles1_conform_root/conform/conform/bcorner.c",
>+      "$gles1_conform_root/conform/conform/blend.c",
>+      "$gles1_conform_root/conform/conform/bufobj.c",
>+      "$gles1_conform_root/conform/conform/clip.c",
>+      "$gles1_conform_root/conform/conform/colramp.c",
>+      "$gles1_conform_root/conform/conform/copytex.c",
>+      "$gles1_conform_root/conform/conform/dither.c",
>+      "$gles1_conform_root/conform/conform/divzero.c",
>+      "$gles1_conform_root/conform/conform/drawtex.c",
>+      "$gles1_conform_root/conform/conform/fogexp.c",
>+      "$gles1_conform_root/conform/conform/foglin.c",
>+      "$gles1_conform_root/conform/conform/gets.c",
>+      "$gles1_conform_root/conform/conform/l_ac.c",
>+      "$gles1_conform_root/conform/conform/l_al.c",
>+      "$gles1_conform_root/conform/conform/l_am.c",
>+      "$gles1_conform_root/conform/conform/l_ap.c",
>+      "$gles1_conform_root/conform/conform/l_as.c",
>+      "$gles1_conform_root/conform/conform/l_dl.c",
>+      "$gles1_conform_root/conform/conform/l_dm.c",
>+      "$gles1_conform_root/conform/conform/l_dmn.c",
>+      "$gles1_conform_root/conform/conform/l_dmp.c",
>+      "$gles1_conform_root/conform/conform/l_em.c",
>+      "$gles1_conform_root/conform/conform/l_se.c",
>+      "$gles1_conform_root/conform/conform/l_sed.c",
>+      "$gles1_conform_root/conform/conform/l_sen.c",
>+      "$gles1_conform_root/conform/conform/l_sep.c",
>+      "$gles1_conform_root/conform/conform/l_sl.c",
>+      "$gles1_conform_root/conform/conform/l_sm.c",
>+      "$gles1_conform_root/conform/conform/l_sn.c",
>+      "$gles1_conform_root/conform/conform/l_sp.c",
>+      "$gles1_conform_root/conform/conform/lineaa.c",
>+      "$gles1_conform_root/conform/conform/linehv.c",
>+      "$gles1_conform_root/conform/conform/linerast.c",
>+      "$gles1_conform_root/conform/conform/logicop.c",
>+      "$gles1_conform_root/conform/conform/mask.c",
>+      "$gles1_conform_root/conform/conform/mget.c",
>+      "$gles1_conform_root/conform/conform/mipgen.c",
>+      "$gles1_conform_root/conform/conform/miplevels.c",
>+      "$gles1_conform_root/conform/conform/miplin.c",
>+      "$gles1_conform_root/conform/conform/mipsel.c",
>+      "$gles1_conform_root/conform/conform/mpalette.c",
>+      "$gles1_conform_root/conform/conform/mquery.c",
>+      "$gles1_conform_root/conform/conform/mstack.c",
>+      "$gles1_conform_root/conform/conform/multitex.c",
>+      "$gles1_conform_root/conform/conform/mustpass.c",
>+      "$gles1_conform_root/conform/conform/packpix.c",
>+      "$gles1_conform_root/conform/conform/pntaa.c",
>+      "$gles1_conform_root/conform/conform/pntrast.c",
>+      "$gles1_conform_root/conform/conform/pntsprt.c",
>+      "$gles1_conform_root/conform/conform/pntszary.c",
>+      "$gles1_conform_root/conform/conform/polycull.c",
>+      "$gles1_conform_root/conform/conform/readfmt.c",
>+      "$gles1_conform_root/conform/conform/rescalen.c",
>+      "$gles1_conform_root/conform/conform/scissor.c",
>+      "$gles1_conform_root/conform/conform/spclear.c",
>+      "$gles1_conform_root/conform/conform/spcorner.c",
>+      "$gles1_conform_root/conform/conform/spfunc.c",
>+      "$gles1_conform_root/conform/conform/spop.c",
>+      "$gles1_conform_root/conform/conform/tests.c",
>+      "$gles1_conform_root/conform/conform/texcombine.c",
>+      "$gles1_conform_root/conform/conform/texdecal.c",
>+      "$gles1_conform_root/conform/conform/texedge.c",
>+      "$gles1_conform_root/conform/conform/texpalet.c",
>+      "$gles1_conform_root/conform/conform/trirast.c",
>+      "$gles1_conform_root/conform/conform/tritile.c",
>+      "$gles1_conform_root/conform/conform/userclip.c",
>+      "$gles1_conform_root/conform/conform/vorder.c",
>+      "$gles1_conform_root/conform/conform/vpclamp.c",
>+      "$gles1_conform_root/conform/conform/xform.c",
>+      "$gles1_conform_root/conform/conform/xformmix.c",
>+      "$gles1_conform_root/conform/conform/xformn.c",
>+      "$gles1_conform_root/conform/conform/xformvp.c",
>+      "$gles1_conform_root/conform/conform/xformw.c",
>+      "$gles1_conform_root/conform/conform/zbclear.c",
>+      "$gles1_conform_root/conform/conform/zbfunc.c",
>+      "$gles1_conform_root/conform/conformshell/conform.h",
>+      "$gles1_conform_root/conform/conformshell/driver.c",
>+      "$gles1_conform_root/conform/conformshell/driver.h",
>+      "$gles1_conform_root/conform/conformshell/path.c",
>+      "$gles1_conform_root/conform/conformshell/path.h",
>+      "$gles1_conform_root/conform/conformshell/pathdata.c",
>+      "$gles1_conform_root/conform/conformshell/pathdata.h",
>+      "$gles1_conform_root/conform/conformshell/paths.c",
>+      "$gles1_conform_root/conform/conformshell/shell.c",
>+      "$gles1_conform_root/conform/conformshell/util.c",
>+      "$gles1_conform_root/conform/conformshell/util.h",
>+      "$gles1_conform_root/conform/conformshell/utilg.c",
>+      "$gles1_conform_root/conform/conformshell/utilg.h",
>+      "$gles1_conform_root/conform/conformshell/utilm.c",
>+      "$gles1_conform_root/conform/conformshell/utilm.h",
>+      "$gles1_conform_root/conform/conformshell/utilp.c",
>+      "$gles1_conform_root/conform/conformshell/utilp.h",
>+      "$gles1_conform_root/conform/conformshell/utilru.c",
>+      "$gles1_conform_root/conform/conformshell/utilru.h",
>+      "$gles1_conform_root/conform/conformshell/utils.c",
>+      "$gles1_conform_root/conform/conformshell/utils.h",
>+      "$gles1_conform_root/conform/conformshell/utilt.c",
>+      "$gles1_conform_root/conform/conformshell/utilt.h",
>+      "$gles1_conform_root/ctk/ctk.h",
>+      "$gles1_conform_root/ctk/ctkn.c",
>+      "$gles1_conform_root/ctk/glext.c",
>+      "$gles1_conform_root/fixed/fixed.c",
>+      "$gles1_conform_root/fixed/float64.c",
>+      "$gles1_conform_root/fixed/int32.c",
>+      "$gles1_conform_root/fixed/int64.c",
>+      "$gles1_conform_root/platform/gl_fixed_point.h",
>+      "$gles1_conform_root/platform/gl_single_precision.h",
>+      "$gles1_conform_root/platform/math_fixed.h",
>+      "$gles1_conform_root/platform/math_float.h",
>+      "$gles1_conform_root/platform/platform.h",
>+      "$gles1_conform_root/platform/platform_gl.h",
>+      "$gles1_conform_root/platform/platform_random.h",
>+      "$gles1_conform_root/platform/platform_stdlib.h",
>+      "$gles1_conform_root/platform/platform_types.h",
>+      "$gles1_conform_root/platform/printf_fixed.h",
>+      "$gles1_conform_root/platform/printf_float.h",
>+      "$gles1_conform_root/platform/random.c",
>+      "$gles1_conform_root/platform/stdlib_ansi.h",
>+    ]
>+  }
>+
>+  angle_test("angle_gles1_conformance_tests") {
>+    deps = [
>+      ":angle_end2end_tests_main",
>+      ":angle_gles1_conformance_no_gtest",
>+    ]
>+
>+    include_dirs = [ "." ]
>+
>+    sources = [
>+      "gles1_conformance_tests/ConformanceTests.cpp",
>+      "test_utils/ANGLETest.cpp",
>+      "test_utils/ANGLETest.h",
>+      "test_utils/angle_test_configs.cpp",
>+      "test_utils/angle_test_configs.h",
>+      "test_utils/angle_test_instantiate.cpp",
>+      "test_utils/angle_test_instantiate.h",
>+      "test_utils/gl_raii.h",
>+    ]
>+
>+    configs += [
>+      "${angle_root}:libANGLE_config",
>+      "${angle_root}:library_name_config",
>+    ]
>+
>+    if (is_android) {
>+      use_native_activity = true
>+    }
>   }
> }
> 
>@@ -269,28 +553,56 @@ if (is_win || is_linux || is_android || is_mac) {
> ### dEQP tests
> ###-----------------------------------------------------
> 
>-# TODO(jmadill): Other platforms.
>-if (build_angle_deqp_tests) {
>-  deqp_gypi = exec_script("//build/gypi_to_gn.py",
>-                          [
>-                            rebase_path("deqp.gypi"),
>-                            "--replace=<(angle_path)=.",
>-                            "--replace=<(deqp_path)=//third_party/deqp/src",
>-                          ],
>-                          "scope",
>-                          [ "deqp.gypi" ])
>+if (build_angle_deqp_tests && !is_fuchsia) {
>+  import("deqp.gni")
>+
>+  angle_tests_main("angle_deqp_tests_main") {
>+    main = "angle_deqp_tests_main"
>+  }
> 
>   config("angle_deqp_support") {
>-    include_dirs = rebase_path(deqp_gypi.deqp_include_dirs, ".", "../..")
>+    include_dirs = deqp_include_dirs
>     if (is_win && !is_clang) {
>-      include_dirs += [ "../deqp/src/framework/platform/win32" ]
>-      cflags = deqp_gypi.deqp_win_cflags
>+      include_dirs +=
>+          [ "$angle_root/third_party/deqp/src/framework/platform/win32" ]
>+      cflags = [
>+        "/EHsc",  # dEQP requires exceptions
>+        "/wd4091",  # typedef ignored when no variable is declared
>+        "/wd4100",
>+        "/wd4125",  # decimal digit terminates octal escape sequence
>+        "/wd4127",  # conditional expression constant
>+        "/wd4244",  # possible loss of data
>+        "/wd4245",  # argument signed/unsigned mismatch
>+        "/wd4297",  # function assumed not to throw an exception but does
>+        "/wd4389",  # signed/unsigned mismatch
>+        "/wd4510",  # default constructor could not be generated
>+        "/wd4512",
>+        "/wd4610",  # cannot be instantiated
>+        "/wd4611",  # setjmp interaction non-portable
>+        "/wd4701",  # potentially uninit used
>+        "/wd4702",  # unreachable code
>+        "/wd4706",  # assignment within conditional expression
>+        "/wd4838",  # conversion requires a narrowing conversion
>+        "/wd4996",  # deprecated
>+      ]
>     }
>     if (is_android) {
>-      include_dirs += [ "../../../deqp/src/framework/platform/android" ]
>+      include_dirs +=
>+          [ "$angle_root/third_party/deqp/src/framework/platform/android" ]
>     }
>-    defines = deqp_gypi.deqp_defines
>-    defines += [ "_MBCS" ]
>+    defines = [
>+      "DEQP_SUPPORT_GLES31=1",
>+      "DEQP_SUPPORT_GLES3=1",
>+      "DEQP_SUPPORT_GLES2=1",
>+      "DEQP_SUPPORT_EGL=1",
>+      "DEQP_TARGET_NAME=\"angle\"",
>+      "DEQP_GLES31_RUNTIME_LOAD=1",
>+      "DEQP_GLES3_RUNTIME_LOAD=1",
>+      "DEQP_GLES2_RUNTIME_LOAD=1",
>+      "QP_SUPPORT_PNG=1",
>+      "_HAS_EXCEPTIONS=1",
>+      "_MBCS",
>+    ]
> 
>     if (is_clang) {
>       # TODO(jmadill): Remove this once we fix dEQP.
>@@ -315,6 +627,7 @@ if (build_angle_deqp_tests) {
>     "//build/config/compiler:chromium_code",
>     "//build/config/compiler:no_exceptions",
>     "//build/config/compiler:no_rtti",
>+    "${angle_root}:extra_warnings",
>   ]
> 
>   if (is_win) {
>@@ -325,16 +638,22 @@ if (build_angle_deqp_tests) {
>     ]
>   }
> 
>-  static_library("angle_deqp_decpp") {
>-    configs -= deqp_undefine_configs
>-    public_configs = [
>+  angle_static_library("angle_deqp_decpp") {
>+    suppressed_configs += deqp_undefine_configs
>+    public_configs += [
>       ":angle_deqp_support",
>       "//build/config/compiler:exceptions",
>       "//build/config/compiler:no_chromium_code",
>-      angle_root + ":internal_config",
>     ]
>+    if (is_clang) {
>+      cflags_cc = [
>+        # Supresses self assign warnings in SharedPtr_selfTest
>+        # Can be removed if dEQP or clang are fixed
>+        "-Wno-self-assign",
>+      ]
>+    }
> 
>-    sources = rebase_path(deqp_gypi.deqp_libtester_decpp_sources, ".", "../..")
>+    sources = deqp_libtester_decpp_sources
>   }
> 
>   config("angle_deqp_libtester_config") {
>@@ -345,65 +664,51 @@ if (build_angle_deqp_tests) {
>       cflags_cc = [
>         "-Wno-delete-non-virtual-dtor",
>         "-Wno-deprecated",
>+
>+        # Supresses self assign warning in setLumSat
>+        # Can be removed if dEQP or clang are fixed
>+        "-Wno-self-assign",
>       ]
>     }
>   }
> 
>-  static_library("angle_deqp_libtester") {
>+  angle_static_library("angle_deqp_libtester") {
>     public_deps = [
>       ":angle_deqp_decpp",
>-      angle_root + ":angle_common",
>-      angle_root + ":angle_util",
>-      angle_root + ":libEGL",
>-      "//third_party/libpng:libpng",
>+      "${angle_libpng_dir}:libpng",
>+      "${angle_root}:angle_common",
>+      "${angle_root}:angle_util",
>+      "${angle_root}:libEGL${angle_libs_suffix}",
>+      "${angle_root}:libGLESv2${angle_libs_suffix}",
>     ]
> 
>-    configs -= deqp_undefine_configs
>-    public_configs = [ ":angle_deqp_libtester_config" ]
>-    sources = rebase_path(deqp_gypi.deqp_libtester_sources, ".", "../..")
>+    suppressed_configs += deqp_undefine_configs
>+    configs += [ "${angle_root}:library_name_config" ]
>+    public_configs += [ ":angle_deqp_libtester_config" ]
>+    sources = deqp_libtester_sources
>     if (is_win) {
>-      sources += rebase_path(deqp_gypi.deqp_libtester_sources_win, ".", "../..")
>+      sources += deqp_libtester_sources_win
>     }
>     if (is_linux || is_android || is_mac) {
>-      sources +=
>-          rebase_path(deqp_gypi.deqp_libtester_sources_unix, ".", "../..")
>+      sources += deqp_libtester_sources_unix
>     }
>     if (is_android) {
>-      sources +=
>-          rebase_path(deqp_gypi.deqp_libtester_sources_android, ".", "../..")
>+      sources += deqp_libtester_sources_android
>       libs = [ "log" ]
>     }
>   }
> 
>-  config("angle_deqp_gtest_support_config") {
>-    include_dirs = [ "third_party/gpu_test_expectations" ]
>-  }
>-
>-  source_set("angle_deqp_gtest_support") {
>+  angle_source_set("angle_deqp_gtest_support") {
>     testonly = true
> 
>-    public_deps = googletest_deps + [
>-                    angle_root + ":angle_common",
>-                    angle_root + ":angle_util",
>-                  ]
>-
>-    public_configs = [ ":angle_deqp_gtest_support_config" ]
>-
>-    sources = deqp_gypi.deqp_gpu_test_expectations_sources
>-    if (is_mac) {
>-      sources += deqp_gypi.deqp_gpu_test_expectations_sources_mac
>-      libs = [ "Cocoa.framework" ]
>-    }
>-
>-    if (build_with_chromium) {
>-      sources += [ "//gpu/angle_deqp_tests_main.cc" ]
>-    } else {
>-      sources += [ "deqp_support/angle_deqp_gtest_main.cpp" ]
>-    }
>+    public_deps = [
>+      ":angle_deqp_tests_main",
>+      ":angle_test_expectations",
>+      "${angle_root}:angle_common",
>+      "${angle_root}:angle_util",
>+    ]
> 
>-    if (!is_android) {
>-      public_deps += [ angle_root + ":angle_gpu_info_util" ]
>-    }
>+    libs = []
>   }
> 
>   api_names = [
>@@ -419,10 +724,10 @@ if (build_angle_deqp_tests) {
>     "ANGLE_DEQP_EGL_TESTS",
>   ]
>   target_sources = [
>-    deqp_gypi.deqp_gles2_sources,
>-    deqp_gypi.deqp_gles3_sources,
>-    deqp_gypi.deqp_gles31_sources,
>-    deqp_gypi.deqp_egl_sources,
>+    deqp_gles2_sources,
>+    deqp_gles3_sources,
>+    deqp_gles31_sources,
>+    deqp_egl_sources,
>   ]
> 
>   foreach(index,
>@@ -439,20 +744,16 @@ if (build_angle_deqp_tests) {
>     }
> 
>     shared_library_name = "angle_deqp_lib${api_name}"
>-    shared_library(shared_library_name) {
>+    angle_shared_library(shared_library_name) {
>       deps = [
>         ":angle_deqp_libtester",
>-        "//build/config:exe_and_shlib_deps",
>-        angle_root + ":angle_util",
>+        "${angle_root}:angle_util",
>       ]
> 
>-      configs -= deqp_undefine_configs
>-      if (is_android) {
>-        configs -= [ "//build/config/android:hide_all_but_jni_onload" ]
>-      }
>-      public_configs = [ ":${config_name}" ]
>+      suppressed_configs += deqp_undefine_configs
>+      public_configs += [ ":${config_name}" ]
> 
>-      sources = rebase_path(target_sources[index], ".", "../..")
>+      sources = target_sources[index]
>       sources += [
>         "deqp_support/angle_deqp_libtester_main.cpp",
>         "deqp_support/tcuANGLEPlatform.cpp",
>@@ -461,7 +762,7 @@ if (build_angle_deqp_tests) {
>     }
> 
>     if (!build_with_chromium) {
>-      executable("angle_deqp_${api_name}_no_gtest") {
>+      angle_executable("angle_deqp_${api_name}_no_gtest") {
>         sources = [
>           "deqp_support/angle_deqp_tests_main.cpp",
>         ]
>@@ -472,7 +773,7 @@ if (build_angle_deqp_tests) {
>     }
> 
>     test_name = "angle_deqp_${api_name}_tests"
>-    test(test_name) {
>+    angle_test(test_name) {
>       deps = [
>         ":${shared_library_name}",
>         ":angle_deqp_gtest_support",
>@@ -483,17 +784,18 @@ if (build_angle_deqp_tests) {
>         "deqp_support/angle_deqp_gtest.cpp",
>       ]
> 
>+      # Use the master lists from the Khronos version for GLES. For EGL the Khronos lists use wildcards.
>+      mustpass_dir = "external/openglcts/data/mustpass/gles/aosp_mustpass"
>+      if (api_name == "egl") {
>+        mustpass_dir = "android/cts"
>+      }
>+
>       data = [
>+        "$angle_root/third_party/deqp/src/$mustpass_dir/master/${api_name}-master.txt",
>+        "$angle_root/third_party/deqp/src/data/",
>         "deqp_support/deqp_${api_name}_test_expectations.txt",
>-        "../../../deqp/src/android/cts/master/${api_name}-master.txt",
>-        "../../../deqp/src/data/",
>       ]
> 
>-      if (is_linux && !is_component_build) {
>-        # Set rpath to find *.so files even in a non-component build.
>-        configs += [ "//build/config/gcc:rpath_for_built_shared_libraries" ]
>-      }
>-
>       if (is_android) {
>         use_native_activity = true
>       }
>diff --git a/Source/ThirdParty/ANGLE/src/tests/deqp_support/angle_deqp_gtest_main.cpp b/Source/ThirdParty/ANGLE/src/tests/angle_deqp_tests_main.cpp
>similarity index 100%
>rename from Source/ThirdParty/ANGLE/src/tests/deqp_support/angle_deqp_gtest_main.cpp
>rename to Source/ThirdParty/ANGLE/src/tests/angle_deqp_tests_main.cpp
>diff --git a/Source/ThirdParty/ANGLE/src/tests/angle_end2end_tests.gni b/Source/ThirdParty/ANGLE/src/tests/angle_end2end_tests.gni
>new file mode 100644
>index 00000000000..01441458b68
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/tests/angle_end2end_tests.gni
>@@ -0,0 +1,169 @@
>+# Copyright (c) 2014 The ANGLE Project Authors. All rights reserved.
>+# Use of this source code is governed by a BSD-style license that can be
>+# found in the LICENSE file.
>+
>+angle_end2end_tests_sources = [
>+  "gl_tests/AtomicCounterBufferTest.cpp",
>+  "gl_tests/AttributeLayoutTest.cpp",
>+  "gl_tests/BindGeneratesResourceTest.cpp",
>+  "gl_tests/BindUniformLocationTest.cpp",
>+  "gl_tests/BlendFuncExtendedTest.cpp",
>+  "gl_tests/BlendMinMaxTest.cpp",
>+  "gl_tests/BlitFramebufferANGLETest.cpp",
>+  "gl_tests/BPTCCompressedTextureTest.cpp",
>+  "gl_tests/BufferDataTest.cpp",
>+  "gl_tests/BuiltinVariableTest.cpp",
>+  "gl_tests/ClearTest.cpp",
>+  "gl_tests/ClientArraysTest.cpp",
>+  "gl_tests/ColorMaskTest.cpp",
>+  "gl_tests/ComputeShaderTest.cpp",
>+  "gl_tests/ContextLostTest.cpp",
>+  "gl_tests/CopyCompressedTextureTest.cpp",
>+  "gl_tests/CopyTexImageTest.cpp",
>+  "gl_tests/CopyTextureTest.cpp",
>+  "gl_tests/CopyTexture3DTest.cpp",
>+  "gl_tests/CubeMapTextureTest.cpp",
>+  "gl_tests/DebugMarkerTest.cpp",
>+  "gl_tests/DebugTest.cpp",
>+  "gl_tests/DepthStencilFormatsTest.cpp",
>+  "gl_tests/DepthStencilTest.cpp",
>+  "gl_tests/DifferentStencilMasksTest.cpp",
>+  "gl_tests/DiscardFramebufferEXTTest.cpp",
>+  "gl_tests/DrawBuffersTest.cpp",
>+  "gl_tests/DrawElementsTest.cpp",
>+  "gl_tests/DXT1CompressedTextureTest.cpp",
>+  "gl_tests/DXTSRGBCompressedTextureTest.cpp",
>+  "gl_tests/ETCTextureTest.cpp",
>+  "gl_tests/ExplicitContextTest.cpp",
>+  "gl_tests/FenceSyncTests.cpp",
>+  "gl_tests/FloatingPointSurfaceTest.cpp",
>+  "gl_tests/FramebufferMixedSamplesTest.cpp",
>+  "gl_tests/FramebufferMultiviewTest.cpp",
>+  "gl_tests/FramebufferRenderMipmapTest.cpp",
>+  "gl_tests/FramebufferTest.cpp",
>+  "gl_tests/GeometryShaderTest.cpp",
>+  "gl_tests/gles1/AlphaFuncTest.cpp",
>+  "gl_tests/gles1/BasicDrawTest.cpp",
>+  "gl_tests/gles1/ClientActiveTextureTest.cpp",
>+  "gl_tests/gles1/ClientStateEnable.cpp",
>+  "gl_tests/gles1/ClipPlaneTest.cpp",
>+  "gl_tests/gles1/CurrentColorTest.cpp",
>+  "gl_tests/gles1/CurrentNormalTest.cpp",
>+  "gl_tests/gles1/CurrentTextureCoordsTest.cpp",
>+  "gl_tests/gles1/DrawTextureTest.cpp",
>+  "gl_tests/gles1/FogTest.cpp",
>+  "gl_tests/gles1/MaterialsTest.cpp",
>+  "gl_tests/gles1/MatrixBuiltinsTest.cpp",
>+  "gl_tests/gles1/MatrixLoadTest.cpp",
>+  "gl_tests/gles1/MatrixModeTest.cpp",
>+  "gl_tests/gles1/MatrixMultTest.cpp",
>+  "gl_tests/gles1/MatrixStackTest.cpp",
>+  "gl_tests/gles1/LightsTest.cpp",
>+  "gl_tests/gles1/PointParameterTest.cpp",
>+  "gl_tests/gles1/PointSpriteTest.cpp",
>+  "gl_tests/gles1/ShadeModelTest.cpp",
>+  "gl_tests/gles1/TextureEnvTest.cpp",
>+  "gl_tests/gles1/TextureParameterTest.cpp",
>+  "gl_tests/gles1/TextureTargetEnableTest.cpp",
>+  "gl_tests/gles1/VertexPointerTest.cpp",
>+  "gl_tests/GLSLTest.cpp",
>+  "gl_tests/ImageTest.cpp",
>+  "gl_tests/IncompleteTextureTest.cpp",
>+  "gl_tests/IndexBufferOffsetTest.cpp",
>+  "gl_tests/IndexedPointsTest.cpp",
>+  "gl_tests/InstancingTest.cpp",
>+  "gl_tests/LineLoopTest.cpp",
>+  "gl_tests/LinkAndRelinkTest.cpp",
>+  "gl_tests/MaxTextureSizeTest.cpp",
>+  "gl_tests/MemorySizeTest.cpp",
>+  "gl_tests/MemoryObjectTest.cpp",
>+  "gl_tests/MipmapTest.cpp",
>+  "gl_tests/MultiDrawTest.cpp",
>+  "gl_tests/MultisampleCompatibilityTest.cpp",
>+  "gl_tests/MultithreadingTest.cpp",
>+  "gl_tests/MultiviewDrawTest.cpp",
>+  "gl_tests/media/pixel.inl",
>+  "gl_tests/PackUnpackTest.cpp",
>+  "gl_tests/PathRenderingTest.cpp",
>+  "gl_tests/PbufferTest.cpp",
>+  "gl_tests/PBOExtensionTest.cpp",
>+  "gl_tests/PointSpritesTest.cpp",
>+  "gl_tests/ProvokingVertexTest.cpp",
>+  "gl_tests/ObjectAllocationTest.cpp",
>+  "gl_tests/OcclusionQueriesTest.cpp",
>+  "gl_tests/ParallelShaderCompileTest.cpp",
>+  "gl_tests/ProgramBinaryTest.cpp",
>+  "gl_tests/ProgramInterfaceTest.cpp",
>+  "gl_tests/ProgramParameterTest.cpp",
>+  "gl_tests/ProgramPipelineTest.cpp",
>+  "gl_tests/ReadPixelsTest.cpp",
>+  "gl_tests/RenderbufferMultisampleTest.cpp",
>+  "gl_tests/RendererTest.cpp",
>+  "gl_tests/RequestExtensionTest.cpp",
>+  "gl_tests/RobustBufferAccessBehaviorTest.cpp",
>+  "gl_tests/RobustClientMemoryTest.cpp",
>+  "gl_tests/RobustResourceInitTest.cpp",
>+  "gl_tests/SamplersTest.cpp",
>+  "gl_tests/ShaderStorageBufferTest.cpp",
>+  "gl_tests/SimpleOperationTest.cpp",
>+  "gl_tests/SixteenBppTextureTest.cpp",
>+  "gl_tests/SRGBFramebufferTest.cpp",
>+  "gl_tests/SRGBTextureTest.cpp",
>+  "gl_tests/StateChangeTest.cpp",
>+  "gl_tests/SwizzleTest.cpp",
>+  "gl_tests/SyncQueriesTest.cpp",
>+  "gl_tests/TextureMultisampleTest.cpp",
>+  "gl_tests/TextureRectangleTest.cpp",
>+  "gl_tests/TextureTest.cpp",
>+  "gl_tests/TextureUploadFormatTest.cpp",
>+  "gl_tests/TimerQueriesTest.cpp",
>+  "gl_tests/TransformFeedbackTest.cpp",
>+  "gl_tests/UniformBufferTest.cpp",
>+  "gl_tests/UniformTest.cpp",
>+  "gl_tests/UnpackAlignmentTest.cpp",
>+  "gl_tests/UnpackRowLength.cpp",
>+  "gl_tests/VertexAttributeTest.cpp",
>+  "gl_tests/ViewportTest.cpp",
>+  "gl_tests/WebGLCompatibilityTest.cpp",
>+  "gl_tests/WebGLFramebufferTest.cpp",
>+  "gl_tests/WebGLReadOutsideFramebufferTest.cpp",
>+  "egl_tests/EGLBlobCacheTest.cpp",
>+  "egl_tests/EGLChooseConfigTest.cpp",
>+  "egl_tests/EGLContextCompatibilityTest.cpp",
>+  "egl_tests/EGLContextSharingTest.cpp",
>+  "egl_tests/EGLDebugTest.cpp",
>+  "egl_tests/EGLProgramCacheControlTest.cpp",
>+  "egl_tests/EGLQueryContextTest.cpp",
>+  "egl_tests/EGLRecordableTest.cpp",
>+  "egl_tests/EGLRobustnessTest.cpp",
>+  "egl_tests/EGLSanityCheckTest.cpp",
>+  "egl_tests/EGLSurfacelessContextTest.cpp",
>+  "egl_tests/EGLSurfaceTest.cpp",
>+  "egl_tests/EGLSyncTest.cpp",
>+  "test_expectations/GPUTestExpectationsTest.cpp",
>+  "test_utils/ANGLETest.cpp",
>+  "test_utils/ANGLETest.h",
>+  "test_utils/MultiviewTest.cpp",
>+  "test_utils/MultiviewTest.h",
>+  "test_utils/angle_test_configs.cpp",
>+  "test_utils/angle_test_configs.h",
>+  "test_utils/angle_test_instantiate.cpp",
>+  "test_utils/angle_test_instantiate.h",
>+  "test_utils/gl_raii.h",
>+]
>+angle_end2end_tests_mac_sources =
>+    [ "egl_tests/EGLIOSurfaceClientBufferTest.cpp" ]
>+angle_end2end_tests_win_sources = [
>+  "gl_tests/D3DImageFormatConversionTest.cpp",
>+  "egl_tests/EGLDeviceTest.cpp",
>+  "egl_tests/EGLPresentPathD3D11Test.cpp",
>+  "egl_tests/EGLStreamTest.cpp",
>+  "egl_tests/EGLSyncControlTest.cpp",
>+  "egl_tests/media/yuvtest.inl",
>+]
>+angle_end2end_tests_x11_sources = [ "egl_tests/EGLX11VisualTest.cpp" ]
>+angle_end2end_tests_vulkan_sources = [
>+  "gl_tests/VulkanExternalImageTest.cpp",
>+  "test_utils/VulkanExternalHelper.cpp",
>+  "test_utils/VulkanExternalHelper.h",
>+]
>diff --git a/Source/ThirdParty/ANGLE/src/tests/angle_end2end_tests.gypi b/Source/ThirdParty/ANGLE/src/tests/angle_end2end_tests.gypi
>deleted file mode 100644
>index 9dc9a94dced..00000000000
>--- a/Source/ThirdParty/ANGLE/src/tests/angle_end2end_tests.gypi
>+++ /dev/null
>@@ -1,171 +0,0 @@
>-# Copyright (c) 2014 The ANGLE Project Authors. All rights reserved.
>-# Use of this source code is governed by a BSD-style license that can be
>-# found in the LICENSE file.
>-
>-# This .gypi describes all of the sources and dependencies to build a
>-# unified "angle_end2end_tests" target, which contains all of the
>-# tests that exercise the ANGLE implementation. It requires a parent
>-# target to include this gypi in an executable target containing a
>-# gtest harness in a main.cpp.
>-
>-{
>-    # Everything below this is duplicated in the GN build.
>-    # If you change anything also change angle/src/tests/BUILD.gn
>-    'variables':
>-    {
>-        'angle_end2end_tests_sources':
>-        [
>-            '<(angle_path)/src/tests/gl_tests/AtomicCounterBufferTest.cpp',
>-            '<(angle_path)/src/tests/gl_tests/BindGeneratesResourceTest.cpp',
>-            '<(angle_path)/src/tests/gl_tests/BindUniformLocationTest.cpp',
>-            '<(angle_path)/src/tests/gl_tests/BlendMinMaxTest.cpp',
>-            '<(angle_path)/src/tests/gl_tests/BlitFramebufferANGLETest.cpp',
>-            '<(angle_path)/src/tests/gl_tests/BufferDataTest.cpp',
>-            '<(angle_path)/src/tests/gl_tests/BuiltinVariableTest.cpp',
>-            '<(angle_path)/src/tests/gl_tests/ClearTest.cpp',
>-            '<(angle_path)/src/tests/gl_tests/ClientArraysTest.cpp',
>-            '<(angle_path)/src/tests/gl_tests/ColorMaskTest.cpp',
>-            '<(angle_path)/src/tests/gl_tests/ComputeShaderTest.cpp',
>-            '<(angle_path)/src/tests/gl_tests/CopyCompressedTextureTest.cpp',
>-            '<(angle_path)/src/tests/gl_tests/CopyTexImageTest.cpp',
>-            '<(angle_path)/src/tests/gl_tests/CopyTextureTest.cpp',
>-            '<(angle_path)/src/tests/gl_tests/CubeMapTextureTest.cpp',
>-            '<(angle_path)/src/tests/gl_tests/DebugMarkerTest.cpp',
>-            '<(angle_path)/src/tests/gl_tests/DebugTest.cpp',
>-            '<(angle_path)/src/tests/gl_tests/DepthStencilFormatsTest.cpp',
>-            '<(angle_path)/src/tests/gl_tests/DiscardFramebufferEXTTest.cpp',
>-            '<(angle_path)/src/tests/gl_tests/DrawBuffersTest.cpp',
>-            '<(angle_path)/src/tests/gl_tests/DrawElementsTest.cpp',
>-            '<(angle_path)/src/tests/gl_tests/DXT1CompressedTextureTest.cpp',
>-            '<(angle_path)/src/tests/gl_tests/DXTSRGBCompressedTextureTest.cpp',
>-            '<(angle_path)/src/tests/gl_tests/ETCTextureTest.cpp',
>-            '<(angle_path)/src/tests/gl_tests/FenceSyncTests.cpp',
>-            '<(angle_path)/src/tests/gl_tests/FloatingPointSurfaceTest.cpp',
>-            '<(angle_path)/src/tests/gl_tests/FramebufferMixedSamplesTest.cpp',
>-            '<(angle_path)/src/tests/gl_tests/FramebufferMultiviewTest.cpp',
>-            '<(angle_path)/src/tests/gl_tests/FramebufferRenderMipmapTest.cpp',
>-            '<(angle_path)/src/tests/gl_tests/FramebufferTest.cpp',
>-            '<(angle_path)/src/tests/gl_tests/GeometryShaderTest.cpp',
>-            '<(angle_path)/src/tests/gl_tests/GLSLTest.cpp',
>-            '<(angle_path)/src/tests/gl_tests/ImageTest.cpp',
>-            '<(angle_path)/src/tests/gl_tests/IncompleteTextureTest.cpp',
>-            '<(angle_path)/src/tests/gl_tests/IndexBufferOffsetTest.cpp',
>-            '<(angle_path)/src/tests/gl_tests/IndexedPointsTest.cpp',
>-            '<(angle_path)/src/tests/gl_tests/InstancingTest.cpp',
>-            '<(angle_path)/src/tests/gl_tests/LineLoopTest.cpp',
>-            '<(angle_path)/src/tests/gl_tests/MaxTextureSizeTest.cpp',
>-            '<(angle_path)/src/tests/gl_tests/MipmapTest.cpp',
>-            '<(angle_path)/src/tests/gl_tests/MultisampleCompatibilityTest.cpp',
>-            '<(angle_path)/src/tests/gl_tests/MultiviewDrawTest.cpp',
>-            '<(angle_path)/src/tests/gl_tests/media/pixel.inl',
>-            '<(angle_path)/src/tests/gl_tests/PackUnpackTest.cpp',
>-            '<(angle_path)/src/tests/gl_tests/PathRenderingTest.cpp',
>-            '<(angle_path)/src/tests/gl_tests/PbufferTest.cpp',
>-            '<(angle_path)/src/tests/gl_tests/PBOExtensionTest.cpp',
>-            '<(angle_path)/src/tests/gl_tests/PointSpritesTest.cpp',
>-            '<(angle_path)/src/tests/gl_tests/ProvokingVertexTest.cpp',
>-            '<(angle_path)/src/tests/gl_tests/ObjectAllocationTest.cpp',
>-            '<(angle_path)/src/tests/gl_tests/OcclusionQueriesTest.cpp',
>-            '<(angle_path)/src/tests/gl_tests/ProgramBinaryTest.cpp',
>-            '<(angle_path)/src/tests/gl_tests/ProgramInterfaceTest.cpp',
>-            '<(angle_path)/src/tests/gl_tests/ProgramParameterTest.cpp',
>-            '<(angle_path)/src/tests/gl_tests/ProgramPipelineTest.cpp',
>-            '<(angle_path)/src/tests/gl_tests/ReadPixelsTest.cpp',
>-            '<(angle_path)/src/tests/gl_tests/RendererTest.cpp',
>-            '<(angle_path)/src/tests/gl_tests/RobustBufferAccessBehaviorTest.cpp',
>-            '<(angle_path)/src/tests/gl_tests/RobustClientMemoryTest.cpp',
>-            '<(angle_path)/src/tests/gl_tests/RobustResourceInitTest.cpp',
>-            '<(angle_path)/src/tests/gl_tests/ShaderStorageBufferTest.cpp',
>-            '<(angle_path)/src/tests/gl_tests/SimpleOperationTest.cpp',
>-            '<(angle_path)/src/tests/gl_tests/SixteenBppTextureTest.cpp',
>-            '<(angle_path)/src/tests/gl_tests/SRGBFramebufferTest.cpp',
>-            '<(angle_path)/src/tests/gl_tests/SRGBTextureTest.cpp',
>-            '<(angle_path)/src/tests/gl_tests/StateChangeTest.cpp',
>-            '<(angle_path)/src/tests/gl_tests/SwizzleTest.cpp',
>-            '<(angle_path)/src/tests/gl_tests/SyncQueriesTest.cpp',
>-            '<(angle_path)/src/tests/gl_tests/TextureMultisampleTest.cpp',
>-            '<(angle_path)/src/tests/gl_tests/TextureRectangleTest.cpp',
>-            '<(angle_path)/src/tests/gl_tests/TextureTest.cpp',
>-            '<(angle_path)/src/tests/gl_tests/TextureUploadFormatTest.cpp',
>-            '<(angle_path)/src/tests/gl_tests/TimerQueriesTest.cpp',
>-            '<(angle_path)/src/tests/gl_tests/TransformFeedbackTest.cpp',
>-            '<(angle_path)/src/tests/gl_tests/UniformBufferTest.cpp',
>-            '<(angle_path)/src/tests/gl_tests/UniformTest.cpp',
>-            '<(angle_path)/src/tests/gl_tests/UnpackAlignmentTest.cpp',
>-            '<(angle_path)/src/tests/gl_tests/UnpackRowLength.cpp',
>-            '<(angle_path)/src/tests/gl_tests/VertexAttributeTest.cpp',
>-            '<(angle_path)/src/tests/gl_tests/ViewportTest.cpp',
>-            '<(angle_path)/src/tests/gl_tests/WebGLCompatibilityTest.cpp',
>-            '<(angle_path)/src/tests/gl_tests/WebGLFramebufferTest.cpp',
>-            '<(angle_path)/src/tests/gl_tests/WebGLReadOutsideFramebufferTest.cpp',
>-            '<(angle_path)/src/tests/egl_tests/EGLContextCompatibilityTest.cpp',
>-            '<(angle_path)/src/tests/egl_tests/EGLContextSharingTest.cpp',
>-            '<(angle_path)/src/tests/egl_tests/EGLProgramCacheControlTest.cpp',
>-            '<(angle_path)/src/tests/egl_tests/EGLQueryContextTest.cpp',
>-            '<(angle_path)/src/tests/egl_tests/EGLRobustnessTest.cpp',
>-            '<(angle_path)/src/tests/egl_tests/EGLSanityCheckTest.cpp',
>-            '<(angle_path)/src/tests/egl_tests/EGLSurfacelessContextTest.cpp',
>-            '<(angle_path)/src/tests/egl_tests/EGLSurfaceTest.cpp',
>-            '<(angle_path)/src/tests/test_utils/ANGLETest.cpp',
>-            '<(angle_path)/src/tests/test_utils/ANGLETest.h',
>-            '<(angle_path)/src/tests/test_utils/angle_test_configs.cpp',
>-            '<(angle_path)/src/tests/test_utils/angle_test_configs.h',
>-            '<(angle_path)/src/tests/test_utils/angle_test_instantiate.cpp',
>-            '<(angle_path)/src/tests/test_utils/angle_test_instantiate.h',
>-            '<(angle_path)/src/tests/test_utils/gl_raii.h',
>-        ],
>-        'angle_end2end_tests_win_sources':
>-        [
>-            '<(angle_path)/src/tests/gl_tests/D3DImageFormatConversionTest.cpp',
>-            '<(angle_path)/src/tests/egl_tests/EGLDeviceTest.cpp',
>-            '<(angle_path)/src/tests/egl_tests/EGLPresentPathD3D11Test.cpp',
>-            '<(angle_path)/src/tests/egl_tests/EGLStreamTest.cpp',
>-            '<(angle_path)/src/tests/egl_tests/EGLSyncControlTest.cpp',
>-            # TODO(cwallez) for Linux, requires a portable implementation of threads
>-            '<(angle_path)/src/tests/egl_tests/EGLThreadTest.cpp',
>-            '<(angle_path)/src/tests/egl_tests/media/yuvtest.inl',
>-        ],
>-        'angle_end2end_tests_x11_sources':
>-        [
>-            '<(angle_path)/src/tests/egl_tests/EGLX11VisualTest.cpp',
>-        ],
>-    },
>-    'dependencies':
>-    [
>-        '<(angle_path)/src/angle.gyp:angle_image_util',
>-        # We use the D3D11 config for enabling Debug runtime error logging.
>-        '<(angle_path)/src/angle.gyp:libANGLE_d3d11_config',
>-        # This lets us filter test configs more intelligently.
>-        '<(angle_path)/src/angle.gyp:libANGLE_renderer_config',
>-        '<(angle_path)/src/angle.gyp:libEGL',
>-        '<(angle_path)/src/angle.gyp:libGLESv2',
>-        '<(angle_path)/src/tests/tests.gyp:angle_test_support',
>-        '<(angle_path)/util/util.gyp:angle_util',
>-    ],
>-    'include_dirs':
>-    [
>-        '<(angle_path)/include',
>-        '<(angle_path)/src/tests'
>-    ],
>-    'sources':
>-    [
>-        '<@(angle_end2end_tests_sources)',
>-    ],
>-    'conditions':
>-    [
>-        ['OS=="win"',
>-        {
>-            'sources':
>-            [
>-                '<@(angle_end2end_tests_win_sources)',
>-            ],
>-        }],
>-        ['use_x11==1',
>-        {
>-            'sources':
>-            [
>-                '<@(angle_end2end_tests_x11_sources)',
>-            ],
>-        }],
>-    ]
>-}
>diff --git a/Source/ThirdParty/ANGLE/src/tests/angle_end2end_tests_main.cpp b/Source/ThirdParty/ANGLE/src/tests/angle_end2end_tests_main.cpp
>index b4b9f02f4dc..c6a868d3138 100644
>--- a/Source/ThirdParty/ANGLE/src/tests/angle_end2end_tests_main.cpp
>+++ b/Source/ThirdParty/ANGLE/src/tests/angle_end2end_tests_main.cpp
>@@ -5,12 +5,13 @@
> //
> 
> #include "gtest/gtest.h"
>-#include "test_utils/ANGLETest.h"
> 
>-int main(int argc, char** argv)
>+void ANGLEProcessTestArgs(int *argc, char *argv[]);
>+
>+int main(int argc, char **argv)
> {
>     testing::InitGoogleTest(&argc, argv);
>-    testing::AddGlobalTestEnvironment(new ANGLETestEnvironment());
>+    ANGLEProcessTestArgs(&argc, argv);
>     int rt = RUN_ALL_TESTS();
>     return rt;
> }
>diff --git a/Source/ThirdParty/ANGLE/src/tests/angle_perftests.gni b/Source/ThirdParty/ANGLE/src/tests/angle_perftests.gni
>new file mode 100644
>index 00000000000..c63b02ca173
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/tests/angle_perftests.gni
>@@ -0,0 +1,71 @@
>+# Copyright 2015 The ANGLE Project Authors. All rights reserved.
>+# Use of this source code is governed by a BSD-style license that can be
>+# found in the LICENSE file.
>+
>+angle_perf_tests_sources = [
>+  "perf_tests/ANGLEPerfTest.cpp",
>+  "perf_tests/ANGLEPerfTest.h",
>+  "perf_tests/ANGLEPerfTestArgs.cpp",
>+  "perf_tests/ANGLEPerfTestArgs.h",
>+  "perf_tests/BlitFramebufferPerf.cpp",
>+  "perf_tests/BindingPerf.cpp",
>+  "perf_tests/BufferSubData.cpp",
>+  "perf_tests/ClearPerf.cpp",
>+  "perf_tests/DispatchComputePerf.cpp",
>+  "perf_tests/DrawCallPerf.cpp",
>+  "perf_tests/DrawCallPerfParams.cpp",
>+  "perf_tests/DrawCallPerfParams.h",
>+  "perf_tests/DrawElementsPerf.cpp",
>+  "perf_tests/DynamicPromotionPerfTest.cpp",
>+  "perf_tests/EGLMakeCurrentPerf.cpp",
>+  "perf_tests/IndexConversionPerf.cpp",
>+  "perf_tests/InstancingPerf.cpp",
>+  "perf_tests/InterleavedAttributeData.cpp",
>+  "perf_tests/LinkProgramPerfTest.cpp",
>+  "perf_tests/MultiviewPerf.cpp",
>+  "perf_tests/PointSprites.cpp",
>+  "perf_tests/TextureSampling.cpp",
>+  "perf_tests/TextureUploadPerf.cpp",
>+  "perf_tests/TexturesPerf.cpp",
>+  "perf_tests/UniformsPerf.cpp",
>+  "perf_tests/VulkanBarriersPerf.cpp",
>+  "perf_tests/glmark2Benchmark.cpp",
>+  "perf_tests/third_party/perf/perf_test.cc",
>+  "perf_tests/third_party/perf/perf_test.h",
>+  "test_utils/angle_test_configs.cpp",
>+  "test_utils/angle_test_configs.h",
>+  "test_utils/angle_test_instantiate.cpp",
>+  "test_utils/angle_test_instantiate.h",
>+  "test_utils/draw_call_perf_utils.cpp",
>+  "test_utils/draw_call_perf_utils.h",
>+  "test_utils/gl_raii.h",
>+]
>+
>+angle_white_box_perf_tests_sources = [
>+  "angle_unittests_utils.h",
>+  "perf_tests/ANGLEPerfTest.cpp",
>+  "perf_tests/ANGLEPerfTest.h",
>+  "perf_tests/ANGLEPerfTestArgs.cpp",
>+  "perf_tests/ANGLEPerfTestArgs.h",
>+  "perf_tests/BitSetIteratorPerf.cpp",
>+  "perf_tests/CompilerPerf.cpp",
>+  "perf_tests/EGLInitializePerf.cpp",  # Uses ANGLEGetDisplayPlatform, a non-standard EP.
>+  "perf_tests/ResultPerf.cpp",
>+  "perf_tests/third_party/perf/perf_test.cc",
>+  "perf_tests/third_party/perf/perf_test.h",
>+  "test_utils/angle_test_configs.cpp",
>+  "test_utils/angle_test_configs.h",
>+  "test_utils/angle_test_instantiate.cpp",
>+  "test_utils/angle_test_instantiate.h",
>+  "test_utils/gl_raii.h",
>+]
>+
>+angle_white_box_perf_tests_win_sources =
>+    [ "perf_tests/IndexDataManagerTest.cpp" ]
>+
>+angle_white_box_perf_tests_vulkan_sources = [
>+  "perf_tests/VulkanCommandBufferPerf.cpp",
>+  "perf_tests/VulkanPipelineCachePerf.cpp",
>+  "test_utils/third_party/vulkan_command_buffer_utils.cpp",
>+  "test_utils/third_party/vulkan_command_buffer_utils.h",
>+]
>diff --git a/Source/ThirdParty/ANGLE/src/tests/angle_perftests.gypi b/Source/ThirdParty/ANGLE/src/tests/angle_perftests.gypi
>deleted file mode 100644
>index ea9c1141cf3..00000000000
>--- a/Source/ThirdParty/ANGLE/src/tests/angle_perftests.gypi
>+++ /dev/null
>@@ -1,84 +0,0 @@
>-# Copyright 2015 The ANGLE Project Authors. All rights reserved.
>-# Use of this source code is governed by a BSD-style license that can be
>-# found in the LICENSE file.
>-#
>-# angle_perftests.gypi:
>-#
>-# This .gypi describes all of the sources and dependencies to build a
>-# unified "angle_perftests" target, which contains all of ANGLE's
>-# performance tests (buffer updates, texture updates, draw calls, etc)
>-# It requires a parent target to include this gypi in an executable
>-# target containing a gtest harness in a main.cpp.
>-
>-{
>-    'variables':
>-    {
>-        'angle_perf_tests_sources':
>-        [
>-            '<(angle_path)/src/tests/perf_tests/ANGLEPerfTest.cpp',
>-            '<(angle_path)/src/tests/perf_tests/ANGLEPerfTest.h',
>-            '<(angle_path)/src/tests/perf_tests/BlitFramebufferPerf.cpp',
>-            '<(angle_path)/src/tests/perf_tests/BindingPerf.cpp',
>-            '<(angle_path)/src/tests/perf_tests/BitSetIteratorPerf.cpp',
>-            '<(angle_path)/src/tests/perf_tests/BufferSubData.cpp',
>-            '<(angle_path)/src/tests/perf_tests/DrawCallPerf.cpp',
>-            '<(angle_path)/src/tests/perf_tests/DrawCallPerfParams.cpp',
>-            '<(angle_path)/src/tests/perf_tests/DrawCallPerfParams.h',
>-            '<(angle_path)/src/tests/perf_tests/DrawElementsPerf.cpp',
>-            '<(angle_path)/src/tests/perf_tests/DynamicPromotionPerfTest.cpp',
>-            '<(angle_path)/src/tests/perf_tests/EGLInitializePerf.cpp',
>-            '<(angle_path)/src/tests/perf_tests/IndexConversionPerf.cpp',
>-            '<(angle_path)/src/tests/perf_tests/InstancingPerf.cpp',
>-            '<(angle_path)/src/tests/perf_tests/InterleavedAttributeData.cpp',
>-            '<(angle_path)/src/tests/perf_tests/LinkProgramPerfTest.cpp',
>-            '<(angle_path)/src/tests/perf_tests/MultiviewPerf.cpp',
>-            '<(angle_path)/src/tests/perf_tests/PointSprites.cpp',
>-            '<(angle_path)/src/tests/perf_tests/TexSubImage.cpp',
>-            '<(angle_path)/src/tests/perf_tests/TextureSampling.cpp',
>-            '<(angle_path)/src/tests/perf_tests/TexturesPerf.cpp',
>-            '<(angle_path)/src/tests/perf_tests/UniformsPerf.cpp',
>-            '<(angle_path)/src/tests/perf_tests/third_party/perf/perf_test.cc',
>-            '<(angle_path)/src/tests/perf_tests/third_party/perf/perf_test.h',
>-            '<(angle_path)/src/tests/test_utils/angle_test_configs.cpp',
>-            '<(angle_path)/src/tests/test_utils/angle_test_configs.h',
>-            '<(angle_path)/src/tests/test_utils/angle_test_instantiate.cpp',
>-            '<(angle_path)/src/tests/test_utils/angle_test_instantiate.h',
>-            '<(angle_path)/src/tests/test_utils/draw_call_perf_utils.cpp',
>-            '<(angle_path)/src/tests/test_utils/draw_call_perf_utils.h',
>-        ],
>-        'angle_perf_tests_win_sources':
>-        [
>-            '<(angle_path)/src/tests/perf_tests/IndexDataManagerTest.cpp',
>-        ]
>-    },
>-    # Everything below (except WinRT-related config) must be also maintained for GN.
>-    # If you change anything below, also update angle/src/tests/BUILD.gn.
>-    'dependencies':
>-    [
>-        '<(angle_path)/src/angle.gyp:angle_common',
>-        '<(angle_path)/src/angle.gyp:libANGLE',
>-        '<(angle_path)/src/angle.gyp:libGLESv2_static',
>-        '<(angle_path)/src/angle.gyp:libEGL_static',
>-        '<(angle_path)/src/tests/tests.gyp:angle_test_support',
>-        '<(angle_path)/util/util.gyp:angle_util_static',
>-    ],
>-    'include_dirs':
>-    [
>-        '<(angle_path)/include',
>-        '<(angle_path)/src/tests'
>-    ],
>-    'sources':
>-    [
>-        '<@(angle_perf_tests_sources)',
>-    ],
>-    'conditions':
>-    [
>-        ['OS=="win"',
>-        {
>-            'sources':
>-            [
>-                '<@(angle_perf_tests_win_sources)',
>-            ],
>-        }],
>-    ]
>-}
>diff --git a/Source/ThirdParty/ANGLE/src/tests/angle_perftests_main.cpp b/Source/ThirdParty/ANGLE/src/tests/angle_perftests_main.cpp
>index 920f4809eb8..92e841b33ce 100644
>--- a/Source/ThirdParty/ANGLE/src/tests/angle_perftests_main.cpp
>+++ b/Source/ThirdParty/ANGLE/src/tests/angle_perftests_main.cpp
>@@ -9,18 +9,11 @@
> 
> #include <gtest/gtest.h>
> 
>-extern bool g_OnlyOneRunFrame;
>+void ANGLEProcessPerfTestArgs(int *argc, char **argv);
> 
> int main(int argc, char **argv)
> {
>-    for (int i = 0; i < argc; ++i)
>-    {
>-        if (strcmp("--one-frame-only", argv[i]) == 0)
>-        {
>-            g_OnlyOneRunFrame = true;
>-        }
>-    }
>-
>+    ANGLEProcessPerfTestArgs(&argc, argv);
>     testing::InitGoogleTest(&argc, argv);
>     testing::AddGlobalTestEnvironment(new testing::Environment());
>     int rt = RUN_ALL_TESTS();
>diff --git a/Source/ThirdParty/ANGLE/src/tests/angle_unittest_main.cpp b/Source/ThirdParty/ANGLE/src/tests/angle_unittest_main.cpp
>new file mode 100644
>index 00000000000..88a5bb995ab
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/tests/angle_unittest_main.cpp
>@@ -0,0 +1,36 @@
>+//
>+// Copyright (c) 2013 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+
>+#include "GLSLANG/ShaderLang.h"
>+#include "gtest/gtest.h"
>+
>+class CompilerTestEnvironment : public testing::Environment
>+{
>+  public:
>+    void SetUp() override
>+    {
>+        if (!sh::Initialize())
>+        {
>+            FAIL() << "Failed to initialize the compiler.";
>+        }
>+    }
>+
>+    void TearDown() override
>+    {
>+        if (!sh::Finalize())
>+        {
>+            FAIL() << "Failed to finalize the compiler.";
>+        }
>+    }
>+};
>+
>+int main(int argc, char **argv)
>+{
>+    testing::InitGoogleTest(&argc, argv);
>+    testing::AddGlobalTestEnvironment(new CompilerTestEnvironment());
>+    int rt = RUN_ALL_TESTS();
>+    return rt;
>+}
>diff --git a/Source/ThirdParty/ANGLE/src/tests/angle_unittests.gni b/Source/ThirdParty/ANGLE/src/tests/angle_unittests.gni
>new file mode 100644
>index 00000000000..15847ebea1f
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/tests/angle_unittests.gni
>@@ -0,0 +1,143 @@
>+# Copyright (c) 2015 The ANGLE Project Authors. All rights reserved.
>+# Use of this source code is governed by a BSD-style license that can be
>+# found in the LICENSE file.
>+
>+angle_unittests_sources = [
>+  "../common/FastVector_unittest.cpp",
>+  "../common/FixedVector_unittest.cpp",
>+  "../common/PoolAlloc_unittest.cpp",
>+  "../common/Optional_unittest.cpp",
>+  "../common/aligned_memory_unittest.cpp",
>+  "../common/angleutils_unittest.cpp",
>+  "../common/bitset_utils_unittest.cpp",
>+  "../common/hash_utils_unittest.cpp",
>+  "../common/mathutil_unittest.cpp",
>+  "../common/matrix_utils_unittest.cpp",
>+  "../common/string_utils_unittest.cpp",
>+  "../common/system_utils_unittest.cpp",
>+  "../common/system_utils_unittest_helper.h",
>+  "../common/utilities_unittest.cpp",
>+  "../common/vector_utils_unittest.cpp",
>+  "../feature_support_util/feature_support_util_unittest.cpp",
>+  "../gpu_info_util/SystemInfo_unittest.cpp",
>+  "../libANGLE/BinaryStream_unittest.cpp",
>+  "../libANGLE/BlobCache_unittest.cpp",
>+  "../libANGLE/Config_unittest.cpp",
>+  "../libANGLE/Fence_unittest.cpp",
>+  "../libANGLE/HandleAllocator_unittest.cpp",
>+  "../libANGLE/HandleRangeAllocator_unittest.cpp",
>+  "../libANGLE/Image_unittest.cpp",
>+  "../libANGLE/ImageIndexIterator_unittest.cpp",
>+  "../libANGLE/Observer_unittest.cpp",
>+  "../libANGLE/Program_unittest.cpp",
>+  "../libANGLE/ResourceManager_unittest.cpp",
>+  "../libANGLE/ResourceMap_unittest.cpp",
>+  "../libANGLE/SizedMRUCache_unittest.cpp",
>+  "../libANGLE/Surface_unittest.cpp",
>+  "../libANGLE/TransformFeedback_unittest.cpp",
>+  "../libANGLE/VaryingPacking_unittest.cpp",
>+  "../libANGLE/VertexArray_unittest.cpp",
>+  "../libANGLE/WorkerThread_unittest.cpp",
>+  "../libANGLE/renderer/BufferImpl_mock.h",
>+  "../libANGLE/renderer/FramebufferImpl_mock.h",
>+  "../libANGLE/renderer/ProgramImpl_mock.h",
>+  "../libANGLE/renderer/RenderbufferImpl_mock.h",
>+  "../libANGLE/renderer/ImageImpl_mock.h",
>+  "../libANGLE/renderer/TextureImpl_mock.h",
>+  "../libANGLE/renderer/TransformFeedbackImpl_mock.h",
>+  "../tests/angle_unittests_utils.h",
>+  "../tests/compiler_tests/API_test.cpp",
>+  "../tests/compiler_tests/AppendixALimitations_test.cpp",
>+  "../tests/compiler_tests/ARB_texture_rectangle_test.cpp",
>+  "../tests/compiler_tests/AtomicCounter_test.cpp",
>+  "../tests/compiler_tests/BufferVariables_test.cpp",
>+  "../tests/compiler_tests/CollectVariables_test.cpp",
>+  "../tests/compiler_tests/ConstantFolding_test.cpp",
>+  "../tests/compiler_tests/ConstantFoldingNaN_test.cpp",
>+  "../tests/compiler_tests/ConstantFoldingOverflow_test.cpp",
>+  "../tests/compiler_tests/ConstructCompiler_test.cpp",
>+  "../tests/compiler_tests/DebugShaderPrecision_test.cpp",
>+  "../tests/compiler_tests/EmulateGLDrawID_test.cpp",
>+  "../tests/compiler_tests/EmulateGLFragColorBroadcast_test.cpp",
>+  "../tests/compiler_tests/ExpressionLimit_test.cpp",
>+  "../tests/compiler_tests/EXT_YUV_target_test.cpp",
>+  "../tests/compiler_tests/EXT_blend_func_extended_test.cpp",
>+  "../tests/compiler_tests/EXT_frag_depth_test.cpp",
>+  "../tests/compiler_tests/EXT_shader_texture_lod_test.cpp",
>+  "../tests/compiler_tests/ExtensionDirective_test.cpp",
>+  "../tests/compiler_tests/FloatLex_test.cpp",
>+  "../tests/compiler_tests/FragDepth_test.cpp",
>+  "../tests/compiler_tests/GLSLCompatibilityOutput_test.cpp",
>+  "../tests/compiler_tests/GlFragDataNotModified_test.cpp",
>+  "../tests/compiler_tests/GeometryShader_test.cpp",
>+  "../tests/compiler_tests/ImmutableString_test.cpp",
>+  "../tests/compiler_tests/ImmutableString_test_autogen.cpp",
>+  "../tests/compiler_tests/InitOutputVariables_test.cpp",
>+  "../tests/compiler_tests/IntermNode_test.cpp",
>+  "../tests/compiler_tests/NV_draw_buffers_test.cpp",
>+  "../tests/compiler_tests/OES_standard_derivatives_test.cpp",
>+  "../tests/compiler_tests/Pack_Unpack_test.cpp",
>+  "../tests/compiler_tests/PruneEmptyCases_test.cpp",
>+  "../tests/compiler_tests/PruneEmptyDeclarations_test.cpp",
>+  "../tests/compiler_tests/PrunePureLiteralStatements_test.cpp",
>+  "../tests/compiler_tests/PruneUnusedFunctions_test.cpp",
>+  "../tests/compiler_tests/QualificationOrderESSL31_test.cpp",
>+  "../tests/compiler_tests/QualificationOrder_test.cpp",
>+  "../tests/compiler_tests/RecordConstantPrecision_test.cpp",
>+  "../tests/compiler_tests/RegenerateStructNames_test.cpp",
>+  "../tests/compiler_tests/RemovePow_test.cpp",
>+  "../tests/compiler_tests/RemoveUnreferencedVariables_test.cpp",
>+  "../tests/compiler_tests/RewriteDoWhile_test.cpp",
>+  "../tests/compiler_tests/SamplerMultisample_test.cpp",
>+  "../tests/compiler_tests/ScalarizeVecAndMatConstructorArgs_test.cpp",
>+  "../tests/compiler_tests/ShaderImage_test.cpp",
>+  "../tests/compiler_tests/ShaderValidation_test.cpp",
>+  "../tests/compiler_tests/ShaderVariable_test.cpp",
>+  "../tests/compiler_tests/ShCompile_test.cpp",
>+  "../tests/compiler_tests/TextureFunction_test.cpp",
>+  "../tests/compiler_tests/Type_test.cpp",
>+  "../tests/compiler_tests/TypeTracking_test.cpp",
>+  "../tests/compiler_tests/UnfoldShortCircuitAST_test.cpp",
>+  "../tests/compiler_tests/VariablePacker_test.cpp",
>+  "../tests/compiler_tests/VectorizeVectorScalarArithmetic_test.cpp",
>+  "../tests/compiler_tests/OVR_multiview2_test.cpp",
>+  "../tests/compiler_tests/WorkGroupSize_test.cpp",
>+  "../tests/test_expectations/GPUTestExpectationsParser_unittest.cpp",
>+  "../tests/preprocessor_tests/char_test.cpp",
>+  "../tests/preprocessor_tests/comment_test.cpp",
>+  "../tests/preprocessor_tests/define_test.cpp",
>+  "../tests/preprocessor_tests/error_test.cpp",
>+  "../tests/preprocessor_tests/extension_test.cpp",
>+  "../tests/preprocessor_tests/identifier_test.cpp",
>+  "../tests/preprocessor_tests/if_test.cpp",
>+  "../tests/preprocessor_tests/input_test.cpp",
>+  "../tests/preprocessor_tests/location_test.cpp",
>+  "../tests/preprocessor_tests/MockDiagnostics.h",
>+  "../tests/preprocessor_tests/MockDirectiveHandler.h",
>+  "../tests/preprocessor_tests/number_test.cpp",
>+  "../tests/preprocessor_tests/operator_test.cpp",
>+  "../tests/preprocessor_tests/pragma_test.cpp",
>+  "../tests/preprocessor_tests/PreprocessorTest.cpp",
>+  "../tests/preprocessor_tests/PreprocessorTest.h",
>+  "../tests/preprocessor_tests/space_test.cpp",
>+  "../tests/preprocessor_tests/token_test.cpp",
>+  "../tests/preprocessor_tests/version_test.cpp",
>+  "../tests/test_utils/compiler_test.cpp",
>+  "../tests/test_utils/compiler_test.h",
>+  "../tests/test_utils/ConstantFoldingTest.h",
>+  "../tests/test_utils/ConstantFoldingTest.cpp",
>+  "../tests/test_utils/ShaderCompileTreeTest.h",
>+  "../tests/test_utils/ShaderCompileTreeTest.cpp",
>+  "../tests/test_utils/ShaderExtensionTest.h",
>+]
>+
>+# TODO(jmadill): should probably call this windows sources
>+angle_unittests_hlsl_sources = [
>+  "../tests/compiler_tests/HLSLOutput_test.cpp",
>+  "../tests/compiler_tests/UnrollFlatten_test.cpp",
>+]
>+
>+angle_unittests_helper_sources = [
>+  "../common/system_utils_unittest_helper.cpp",
>+  "../common/system_utils_unittest_helper.h",
>+]
>diff --git a/Source/ThirdParty/ANGLE/src/tests/angle_unittests.gypi b/Source/ThirdParty/ANGLE/src/tests/angle_unittests.gypi
>deleted file mode 100644
>index 93dbfbaeaf3..00000000000
>--- a/Source/ThirdParty/ANGLE/src/tests/angle_unittests.gypi
>+++ /dev/null
>@@ -1,183 +0,0 @@
>-# Copyright (c) 2015 The ANGLE Project Authors. All rights reserved.
>-# Use of this source code is governed by a BSD-style license that can be
>-# found in the LICENSE file.
>-
>-# This .gypi describes all of the sources and dependencies to build a
>-# unified "angle_unittests" target, which contains all of ANGLE's
>-# tests that don't require a fully functional ANGLE in order to run
>-# (compiler tests, preprocessor tests, etc.). It requires a parent
>-# target to include this gypi in an executable target containing a
>-# gtest harness in a main.cpp.
>-
>-{
>-    'variables':
>-    {
>-        'angle_unittests_sources':
>-        [
>-            '<(angle_path)/src/common/Optional_unittest.cpp',
>-            '<(angle_path)/src/common/angleutils_unittest.cpp',
>-            '<(angle_path)/src/common/bitset_utils_unittest.cpp',
>-            '<(angle_path)/src/common/mathutil_unittest.cpp',
>-            '<(angle_path)/src/common/matrix_utils_unittest.cpp',
>-            '<(angle_path)/src/common/string_utils_unittest.cpp',
>-            '<(angle_path)/src/common/utilities_unittest.cpp',
>-            '<(angle_path)/src/common/vector_utils_unittest.cpp',
>-            '<(angle_path)/src/gpu_info_util/SystemInfo_unittest.cpp',
>-            '<(angle_path)/src/libANGLE/BinaryStream_unittest.cpp',
>-            '<(angle_path)/src/libANGLE/Config_unittest.cpp',
>-            '<(angle_path)/src/libANGLE/Fence_unittest.cpp',
>-            '<(angle_path)/src/libANGLE/HandleAllocator_unittest.cpp',
>-            '<(angle_path)/src/libANGLE/HandleRangeAllocator_unittest.cpp',
>-            '<(angle_path)/src/libANGLE/Image_unittest.cpp',
>-            '<(angle_path)/src/libANGLE/ImageIndexIterator_unittest.cpp',
>-            '<(angle_path)/src/libANGLE/Program_unittest.cpp',
>-            '<(angle_path)/src/libANGLE/ResourceManager_unittest.cpp',
>-            '<(angle_path)/src/libANGLE/SizedMRUCache_unittest.cpp',
>-            '<(angle_path)/src/libANGLE/Surface_unittest.cpp',
>-            '<(angle_path)/src/libANGLE/TransformFeedback_unittest.cpp',
>-            '<(angle_path)/src/libANGLE/VaryingPacking_unittest.cpp',
>-            '<(angle_path)/src/libANGLE/VertexArray_unittest.cpp',
>-            '<(angle_path)/src/libANGLE/WorkerThread_unittest.cpp',
>-            '<(angle_path)/src/libANGLE/renderer/BufferImpl_mock.h',
>-            '<(angle_path)/src/libANGLE/renderer/FramebufferImpl_mock.h',
>-            '<(angle_path)/src/libANGLE/renderer/ProgramImpl_mock.h',
>-            '<(angle_path)/src/libANGLE/renderer/RenderbufferImpl_mock.h',
>-            '<(angle_path)/src/libANGLE/renderer/ImageImpl_mock.h',
>-            '<(angle_path)/src/libANGLE/renderer/TextureImpl_mock.h',
>-            '<(angle_path)/src/libANGLE/renderer/TransformFeedbackImpl_mock.h',
>-            '<(angle_path)/src/libANGLE/signal_utils_unittest.cpp',
>-            '<(angle_path)/src/libANGLE/validationES_unittest.cpp',
>-            '<(angle_path)/src/tests/angle_unittests_utils.h',
>-            '<(angle_path)/src/tests/compiler_tests/API_test.cpp',
>-            '<(angle_path)/src/tests/compiler_tests/AppendixALimitations_test.cpp',
>-            '<(angle_path)/src/tests/compiler_tests/ARB_texture_rectangle_test.cpp',
>-            '<(angle_path)/src/tests/compiler_tests/AtomicCounter_test.cpp',
>-            '<(angle_path)/src/tests/compiler_tests/BufferVariables_test.cpp',
>-            '<(angle_path)/src/tests/compiler_tests/CollectVariables_test.cpp',
>-            '<(angle_path)/src/tests/compiler_tests/ConstantFolding_test.cpp',
>-            '<(angle_path)/src/tests/compiler_tests/ConstantFoldingNaN_test.cpp',
>-            '<(angle_path)/src/tests/compiler_tests/ConstantFoldingOverflow_test.cpp',
>-            '<(angle_path)/src/tests/compiler_tests/ConstructCompiler_test.cpp',
>-            '<(angle_path)/src/tests/compiler_tests/DebugShaderPrecision_test.cpp',
>-            '<(angle_path)/src/tests/compiler_tests/EmulateGLFragColorBroadcast_test.cpp',
>-            '<(angle_path)/src/tests/compiler_tests/ExpressionLimit_test.cpp',
>-            '<(angle_path)/src/tests/compiler_tests/EXT_YUV_target_test.cpp',
>-            '<(angle_path)/src/tests/compiler_tests/EXT_blend_func_extended_test.cpp',
>-            '<(angle_path)/src/tests/compiler_tests/ExtensionDirective_test.cpp',
>-            '<(angle_path)/src/tests/compiler_tests/FloatLex_test.cpp',
>-            '<(angle_path)/src/tests/compiler_tests/FragDepth_test.cpp',
>-            '<(angle_path)/src/tests/compiler_tests/GLSLCompatibilityOutput_test.cpp',
>-            '<(angle_path)/src/tests/compiler_tests/GeometryShader_test.cpp',
>-            '<(angle_path)/src/tests/compiler_tests/InitOutputVariables_test.cpp',
>-            '<(angle_path)/src/tests/compiler_tests/IntermNode_test.cpp',
>-            '<(angle_path)/src/tests/compiler_tests/NV_draw_buffers_test.cpp',
>-            '<(angle_path)/src/tests/compiler_tests/Pack_Unpack_test.cpp',
>-            '<(angle_path)/src/tests/compiler_tests/PruneEmptyDeclarations_test.cpp',
>-            '<(angle_path)/src/tests/compiler_tests/PrunePureLiteralStatements_test.cpp',
>-            '<(angle_path)/src/tests/compiler_tests/PruneUnusedFunctions_test.cpp',
>-            '<(angle_path)/src/tests/compiler_tests/QualificationOrderESSL31_test.cpp',
>-            '<(angle_path)/src/tests/compiler_tests/QualificationOrder_test.cpp',
>-            '<(angle_path)/src/tests/compiler_tests/RecordConstantPrecision_test.cpp',
>-            '<(angle_path)/src/tests/compiler_tests/RemovePow_test.cpp',
>-            '<(angle_path)/src/tests/compiler_tests/RemoveUnreferencedVariables_test.cpp',
>-            '<(angle_path)/src/tests/compiler_tests/RewriteDoWhile_test.cpp',
>-            '<(angle_path)/src/tests/compiler_tests/SamplerMultisample_test.cpp',
>-            '<(angle_path)/src/tests/compiler_tests/ShaderExtension_test.cpp',
>-            '<(angle_path)/src/tests/compiler_tests/ShaderImage_test.cpp',
>-            '<(angle_path)/src/tests/compiler_tests/ShaderValidation_test.cpp',
>-            '<(angle_path)/src/tests/compiler_tests/ShaderVariable_test.cpp',
>-            '<(angle_path)/src/tests/compiler_tests/ShCompile_test.cpp',
>-            '<(angle_path)/src/tests/compiler_tests/TypeTracking_test.cpp',
>-            '<(angle_path)/src/tests/compiler_tests/VariablePacker_test.cpp',
>-            '<(angle_path)/src/tests/compiler_tests/VectorizeVectorScalarArithmetic_test.cpp',
>-            '<(angle_path)/src/tests/compiler_tests/WEBGL_multiview_test.cpp',
>-            '<(angle_path)/src/tests/compiler_tests/WorkGroupSize_test.cpp',
>-            '<(angle_path)/src/tests/preprocessor_tests/char_test.cpp',
>-            '<(angle_path)/src/tests/preprocessor_tests/comment_test.cpp',
>-            '<(angle_path)/src/tests/preprocessor_tests/define_test.cpp',
>-            '<(angle_path)/src/tests/preprocessor_tests/error_test.cpp',
>-            '<(angle_path)/src/tests/preprocessor_tests/extension_test.cpp',
>-            '<(angle_path)/src/tests/preprocessor_tests/identifier_test.cpp',
>-            '<(angle_path)/src/tests/preprocessor_tests/if_test.cpp',
>-            '<(angle_path)/src/tests/preprocessor_tests/input_test.cpp',
>-            '<(angle_path)/src/tests/preprocessor_tests/location_test.cpp',
>-            '<(angle_path)/src/tests/preprocessor_tests/MockDiagnostics.h',
>-            '<(angle_path)/src/tests/preprocessor_tests/MockDirectiveHandler.h',
>-            '<(angle_path)/src/tests/preprocessor_tests/number_test.cpp',
>-            '<(angle_path)/src/tests/preprocessor_tests/operator_test.cpp',
>-            '<(angle_path)/src/tests/preprocessor_tests/pragma_test.cpp',
>-            '<(angle_path)/src/tests/preprocessor_tests/PreprocessorTest.cpp',
>-            '<(angle_path)/src/tests/preprocessor_tests/PreprocessorTest.h',
>-            '<(angle_path)/src/tests/preprocessor_tests/space_test.cpp',
>-            '<(angle_path)/src/tests/preprocessor_tests/token_test.cpp',
>-            '<(angle_path)/src/tests/preprocessor_tests/version_test.cpp',
>-            '<(angle_path)/src/tests/test_utils/compiler_test.cpp',
>-            '<(angle_path)/src/tests/test_utils/compiler_test.h',
>-            '<(angle_path)/src/tests/test_utils/ConstantFoldingTest.h',
>-            '<(angle_path)/src/tests/test_utils/ConstantFoldingTest.cpp',
>-            '<(angle_path)/src/tests/test_utils/ShaderCompileTreeTest.h',
>-            '<(angle_path)/src/tests/test_utils/ShaderCompileTreeTest.cpp',
>-        ],
>-        # TODO(jmadill): should probably call this windows sources
>-        'angle_unittests_hlsl_sources':
>-        [
>-            '<(angle_path)/src/tests/compiler_tests/HLSLOutput_test.cpp',
>-            '<(angle_path)/src/tests/compiler_tests/UnrollFlatten_test.cpp',
>-        ],
>-    },
>-    # Everything below this but the WinRT configuration is duplicated in the GN build.
>-    # If you change anything also change angle/src/tests/BUILD.gn
>-    'dependencies':
>-    [
>-        '<(angle_path)/src/angle.gyp:libANGLE',
>-        '<(angle_path)/src/angle.gyp:preprocessor',
>-        '<(angle_path)/src/angle.gyp:translator',
>-        '<(angle_path)/src/tests/tests.gyp:angle_test_support',
>-    ],
>-    'include_dirs':
>-    [
>-        '<(angle_path)/include',
>-        '<(angle_path)/src',
>-    ],
>-    'sources':
>-    [
>-        '<@(angle_unittests_sources)',
>-    ],
>-    'conditions':
>-    [
>-        ['angle_build_winrt==1',
>-        {
>-            'sources':
>-            [
>-                '<(angle_path)/src/libANGLE/renderer/d3d/d3d11/winrt/CoreWindowNativeWindow_unittest.cpp',
>-                '<(angle_path)/src/libANGLE/renderer/d3d/d3d11/winrt/SwapChainPanelNativeWindow_unittest.cpp',
>-            ],
>-            'defines':
>-            [
>-                'ANGLE_ENABLE_D3D11',
>-            ],
>-            'msvs_settings':
>-            {
>-                'VCLinkerTool':
>-                {
>-                    'AdditionalDependencies':
>-                    [
>-                        'runtimeobject.lib',
>-                    ],
>-                },
>-            },
>-        }],
>-        ['OS=="win"',
>-        {
>-            # TODO(cwallez): make this angle_enable_hlsl instead (requires gyp file refactoring)
>-            'defines':
>-            [
>-                'ANGLE_ENABLE_HLSL',
>-            ],
>-            'sources':
>-            [
>-                '<@(angle_unittests_hlsl_sources)',
>-            ],
>-        }],
>-    ],
>-}
>diff --git a/Source/ThirdParty/ANGLE/src/tests/angle_unittests_main.cpp b/Source/ThirdParty/ANGLE/src/tests/angle_unittests_main.cpp
>deleted file mode 100644
>index 1b44dbbcce8..00000000000
>--- a/Source/ThirdParty/ANGLE/src/tests/angle_unittests_main.cpp
>+++ /dev/null
>@@ -1,36 +0,0 @@
>-//
>-// Copyright (c) 2013 The ANGLE Project Authors. All rights reserved.
>-// Use of this source code is governed by a BSD-style license that can be
>-// found in the LICENSE file.
>-//
>-
>-#include "gtest/gtest.h"
>-#include "GLSLANG/ShaderLang.h"
>-
>-class CompilerTestEnvironment : public testing::Environment
>-{
>-  public:
>-    void SetUp() override
>-    {
>-        if (!sh::Initialize())
>-        {
>-            FAIL() << "Failed to initialize the compiler.";
>-        }
>-    }
>-
>-    void TearDown() override
>-    {
>-        if (!sh::Finalize())
>-        {
>-            FAIL() << "Failed to finalize the compiler.";
>-        }
>-    }
>-};
>-
>-int main(int argc, char** argv)
>-{
>-    testing::InitGoogleTest(&argc, argv);
>-    testing::AddGlobalTestEnvironment(new CompilerTestEnvironment());
>-    int rt = RUN_ALL_TESTS();
>-    return rt;
>-}
>diff --git a/Source/ThirdParty/ANGLE/src/tests/angle_unittests_utils.h b/Source/ThirdParty/ANGLE/src/tests/angle_unittests_utils.h
>index 73105303314..c3bb4fd4f60 100644
>--- a/Source/ThirdParty/ANGLE/src/tests/angle_unittests_utils.h
>+++ b/Source/ThirdParty/ANGLE/src/tests/angle_unittests_utils.h
>@@ -38,7 +38,10 @@ class NullFactory : public GLImplFactory
>     TextureImpl *createTexture(const gl::TextureState &data) override { return nullptr; }
> 
>     // Renderbuffer creation
>-    RenderbufferImpl *createRenderbuffer() override { return nullptr; }
>+    RenderbufferImpl *createRenderbuffer(const gl::RenderbufferState &state) override
>+    {
>+        return nullptr;
>+    }
> 
>     // Buffer creation
>     BufferImpl *createBuffer(const gl::BufferState &state) override { return nullptr; }
>@@ -50,7 +53,7 @@ class NullFactory : public GLImplFactory
>     }
> 
>     // Query and Fence creation
>-    QueryImpl *createQuery(GLenum type) override { return nullptr; }
>+    QueryImpl *createQuery(gl::QueryType type) override { return nullptr; }
>     FenceNVImpl *createFenceNV() override { return nullptr; }
>     SyncImpl *createSync() override { return nullptr; }
> 
>@@ -79,17 +82,18 @@ class NullFactory : public GLImplFactory
> class MockGLFactory : public GLImplFactory
> {
>   public:
>-    MOCK_METHOD1(createContext, ContextImpl *(const gl::ContextState &));
>+    MOCK_METHOD1(createContext, ContextImpl *(const gl::State &));
>     MOCK_METHOD0(createCompiler, CompilerImpl *());
>     MOCK_METHOD1(createShader, ShaderImpl *(const gl::ShaderState &));
>     MOCK_METHOD1(createProgram, ProgramImpl *(const gl::ProgramState &));
>     MOCK_METHOD1(createProgramPipeline, ProgramPipelineImpl *(const gl::ProgramPipelineState &));
>     MOCK_METHOD1(createFramebuffer, FramebufferImpl *(const gl::FramebufferState &));
>+    MOCK_METHOD0(createMemoryObject, MemoryObjectImpl *());
>     MOCK_METHOD1(createTexture, TextureImpl *(const gl::TextureState &));
>-    MOCK_METHOD0(createRenderbuffer, RenderbufferImpl *());
>+    MOCK_METHOD1(createRenderbuffer, RenderbufferImpl *(const gl::RenderbufferState &));
>     MOCK_METHOD1(createBuffer, BufferImpl *(const gl::BufferState &));
>     MOCK_METHOD1(createVertexArray, VertexArrayImpl *(const gl::VertexArrayState &));
>-    MOCK_METHOD1(createQuery, QueryImpl *(GLenum type));
>+    MOCK_METHOD1(createQuery, QueryImpl *(gl::QueryType type));
>     MOCK_METHOD0(createFenceNV, FenceNVImpl *());
>     MOCK_METHOD0(createSync, SyncImpl *());
>     MOCK_METHOD1(createTransformFeedback,
>@@ -116,13 +120,21 @@ class MockEGLFactory : public EGLImplFactory
>                  SurfaceImpl *(const egl::SurfaceState &,
>                                NativePixmapType,
>                                const egl::AttributeMap &));
>-    MOCK_METHOD3(createImage,
>-                 ImageImpl *(const egl::ImageState &, EGLenum, const egl::AttributeMap &));
>-    MOCK_METHOD1(createContext, ContextImpl *(const gl::ContextState &));
>-    MOCK_METHOD2(createStreamProducerD3DTextureNV12,
>+    MOCK_METHOD4(createImage,
>+                 ImageImpl *(const egl::ImageState &,
>+                             const gl::Context *,
>+                             EGLenum,
>+                             const egl::AttributeMap &));
>+    MOCK_METHOD5(createContext,
>+                 ContextImpl *(const gl::State &,
>+                               gl::ErrorSet *,
>+                               const egl::Config *,
>+                               const gl::Context *,
>+                               const egl::AttributeMap &));
>+    MOCK_METHOD2(createStreamProducerD3DTexture,
>                  StreamProducerImpl *(egl::Stream::ConsumerType, const egl::AttributeMap &));
> };
> 
> }  // namespace rx
> 
>-#endif // TESTS_ANGLE_UNITTESTS_UTILS_H_
>+#endif  // TESTS_ANGLE_UNITTESTS_UTILS_H_
>diff --git a/Source/ThirdParty/ANGLE/src/tests/angle_white_box_tests.gni b/Source/ThirdParty/ANGLE/src/tests/angle_white_box_tests.gni
>new file mode 100644
>index 00000000000..98a46c7d8d3
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/tests/angle_white_box_tests.gni
>@@ -0,0 +1,22 @@
>+# Copyright (c) 2014 The ANGLE Project Authors. All rights reserved.
>+# Use of this source code is governed by a BSD-style license that can be
>+# found in the LICENSE file.
>+
>+angle_white_box_tests_sources = [
>+  "util_tests/PrintSystemInfoTest.cpp",
>+  "test_utils/angle_test_configs.cpp",
>+  "test_utils/angle_test_configs.h",
>+  "test_utils/angle_test_instantiate.cpp",
>+  "test_utils/angle_test_instantiate.h",
>+  "test_utils/ANGLETest.cpp",
>+  "test_utils/ANGLETest.h",
>+  "test_utils/gl_raii.h",
>+]
>+angle_white_box_tests_win_sources = [
>+  "egl_tests/EGLDirectCompositionTest.cpp",
>+  "gl_tests/D3D11EmulatedIndexedBufferTest.cpp",
>+  "gl_tests/D3D11FormatTablesTest.cpp",
>+  "gl_tests/D3D11InputLayoutCacheTest.cpp",
>+  "gl_tests/D3DTextureTest.cpp",
>+  "gl_tests/ErrorMessages.cpp",
>+]
>diff --git a/Source/ThirdParty/ANGLE/src/tests/angle_white_box_tests.gypi b/Source/ThirdParty/ANGLE/src/tests/angle_white_box_tests.gypi
>deleted file mode 100644
>index d2f12d407fe..00000000000
>--- a/Source/ThirdParty/ANGLE/src/tests/angle_white_box_tests.gypi
>+++ /dev/null
>@@ -1,64 +0,0 @@
>-# Copyright (c) 2014 The ANGLE Project Authors. All rights reserved.
>-# Use of this source code is governed by a BSD-style license that can be
>-# found in the LICENSE file.
>-
>-# This .gypi describes all of the sources and dependencies to build a
>-# unified "angle_white_box_tests" target, which contains all of the
>-# tests that exercise the ANGLE implementation. It requires a parent
>-# target to include this gypi in an executable target containing a
>-# gtest harness in a main.cpp.
>-
>-{
>-    # Everything below this is duplicated in the GN build.
>-    # If you change anything also change angle/src/tests/BUILD.gn
>-    'variables':
>-    {
>-        'angle_white_box_tests_sources':
>-        [
>-            '<(angle_path)/src/tests/util_tests/PrintSystemInfoTest.cpp',
>-            '<(angle_path)/src/tests/test_utils/angle_test_configs.cpp',
>-            '<(angle_path)/src/tests/test_utils/angle_test_configs.h',
>-            '<(angle_path)/src/tests/test_utils/angle_test_instantiate.cpp',
>-            '<(angle_path)/src/tests/test_utils/angle_test_instantiate.h',
>-            '<(angle_path)/src/tests/test_utils/ANGLETest.cpp',
>-            '<(angle_path)/src/tests/test_utils/ANGLETest.h',
>-            '<(angle_path)/src/tests/test_utils/gl_raii.h',
>-        ],
>-        'angle_white_box_tests_win_sources':
>-        [
>-            '<(angle_path)/src/tests/gl_tests/D3D11EmulatedIndexedBufferTest.cpp',
>-            '<(angle_path)/src/tests/gl_tests/D3D11FormatTablesTest.cpp',
>-            '<(angle_path)/src/tests/gl_tests/D3D11InputLayoutCacheTest.cpp',
>-            '<(angle_path)/src/tests/gl_tests/D3DTextureTest.cpp',
>-            '<(angle_path)/src/tests/gl_tests/ErrorMessages.cpp'
>-        ],
>-    },
>-    'dependencies':
>-    [
>-        '<(angle_path)/src/angle.gyp:angle_common',
>-        '<(angle_path)/src/angle.gyp:libANGLE',
>-        '<(angle_path)/src/angle.gyp:libGLESv2_static',
>-        '<(angle_path)/src/angle.gyp:libEGL_static',
>-        '<(angle_path)/src/tests/tests.gyp:angle_test_support',
>-        '<(angle_path)/util/util.gyp:angle_util_static',
>-    ],
>-    'include_dirs':
>-    [
>-        '<(angle_path)/include',
>-        '<(angle_path)/src/tests'
>-    ],
>-    'sources':
>-    [
>-        '<@(angle_white_box_tests_sources)',
>-    ],
>-    'conditions':
>-    [
>-        ['OS=="win"',
>-        {
>-            'sources':
>-            [
>-                '<@(angle_white_box_tests_win_sources)',
>-            ],
>-        }],
>-    ]
>-}
>diff --git a/Source/ThirdParty/ANGLE/src/tests/compiler_tests/API_test.cpp b/Source/ThirdParty/ANGLE/src/tests/compiler_tests/API_test.cpp
>index 090e31ebc5f..c2e95f35fbd 100644
>--- a/Source/ThirdParty/ANGLE/src/tests/compiler_tests/API_test.cpp
>+++ b/Source/ThirdParty/ANGLE/src/tests/compiler_tests/API_test.cpp
>@@ -7,9 +7,9 @@
> //   Some tests for the compiler API.
> //
> 
>+#include "GLSLANG/ShaderLang.h"
> #include "angle_gl.h"
> #include "gtest/gtest.h"
>-#include "GLSLANG/ShaderLang.h"
> 
> TEST(APITest, CompareShBuiltInResources)
> {
>@@ -23,4 +23,3 @@ TEST(APITest, CompareShBuiltInResources)
> 
>     EXPECT_TRUE(memcmp(&a_resources, &b_resources, sizeof(a_resources)) == 0);
> }
>-
>diff --git a/Source/ThirdParty/ANGLE/src/tests/compiler_tests/ARB_texture_rectangle_test.cpp b/Source/ThirdParty/ANGLE/src/tests/compiler_tests/ARB_texture_rectangle_test.cpp
>index 8a0052eedf2..c061b5e9f3e 100644
>--- a/Source/ThirdParty/ANGLE/src/tests/compiler_tests/ARB_texture_rectangle_test.cpp
>+++ b/Source/ThirdParty/ANGLE/src/tests/compiler_tests/ARB_texture_rectangle_test.cpp
>@@ -30,6 +30,46 @@ class ARBTextureRectangleTest : public ARBTextureRectangleTestNoExt
>     }
> };
> 
>+// Check that if the extension is not supported, trying to use the features without having an
>+// extension directive fails.
>+TEST_F(ARBTextureRectangleTestNoExt, NewTypeAndBuiltinsWithoutExtensionDirective)
>+{
>+    const std::string &shaderString =
>+        R"(
>+        precision mediump float;
>+        uniform sampler2DRect tex;
>+        void main()
>+        {
>+            vec4 color = texture2DRect(tex, vec2(1.0));
>+            color = texture2DRectProj(tex, vec3(1.0));
>+            color = texture2DRectProj(tex, vec4(1.0));
>+        })";
>+    if (compile(shaderString))
>+    {
>+        FAIL() << "Shader compilation succeeded, expecting failure:\n" << mInfoLog;
>+    }
>+}
>+
>+// Check that if the extension is not supported, trying to use the features fails.
>+TEST_F(ARBTextureRectangleTestNoExt, NewTypeAndBuiltinsWithExtensionDirective)
>+{
>+    const std::string &shaderString =
>+        R"(
>+        #extension GL_ARB_texture_rectangle : enable
>+        precision mediump float;
>+        uniform sampler2DRect tex;
>+        void main()
>+        {
>+            vec4 color = texture2DRect(tex, vec2(1.0));
>+            color = texture2DRectProj(tex, vec3(1.0));
>+            color = texture2DRectProj(tex, vec4(1.0));
>+        })";
>+    if (compile(shaderString))
>+    {
>+        FAIL() << "Shader compilation succeeded, expecting failure:\n" << mInfoLog;
>+    }
>+}
>+
> // Check that new types and builtins are usable even with the #extension directive
> // Issue #15 of ARB_texture_rectangle explains that the extension was specified before the
> // #extension mechanism was in place so it doesn't require explicit enabling.
>diff --git a/Source/ThirdParty/ANGLE/src/tests/compiler_tests/AppendixALimitations_test.cpp b/Source/ThirdParty/ANGLE/src/tests/compiler_tests/AppendixALimitations_test.cpp
>index a14b249c315..6be269663e9 100644
>--- a/Source/ThirdParty/ANGLE/src/tests/compiler_tests/AppendixALimitations_test.cpp
>+++ b/Source/ThirdParty/ANGLE/src/tests/compiler_tests/AppendixALimitations_test.cpp
>@@ -9,9 +9,9 @@
> 
> #include "gtest/gtest.h"
> 
>+#include "GLSLANG/ShaderLang.h"
> #include "angle_gl.h"
> #include "gtest/gtest.h"
>-#include "GLSLANG/ShaderLang.h"
> #include "tests/test_utils/ShaderCompileTreeTest.h"
> 
> using namespace sh;
>@@ -20,6 +20,7 @@ class AppendixALimitationsTest : public ShaderCompileTreeTest
> {
>   public:
>     AppendixALimitationsTest() {}
>+
>   protected:
>     ::GLenum getShaderType() const override { return GL_FRAGMENT_SHADER; }
>     ShShaderSpec getShaderSpec() const override { return SH_WEBGL_SPEC; }
>diff --git a/Source/ThirdParty/ANGLE/src/tests/compiler_tests/BufferVariables_test.cpp b/Source/ThirdParty/ANGLE/src/tests/compiler_tests/BufferVariables_test.cpp
>index 4c155d786ec..90617ad5e35 100644
>--- a/Source/ThirdParty/ANGLE/src/tests/compiler_tests/BufferVariables_test.cpp
>+++ b/Source/ThirdParty/ANGLE/src/tests/compiler_tests/BufferVariables_test.cpp
>@@ -205,6 +205,66 @@ TEST_F(BufferVariablesTest, AssignToBufferVariableWithinReadonlyBlock)
>     }
> }
> 
>+// Test that can't assign to a readonly buffer variable through an instance name.
>+TEST_F(BufferVariablesTest, AssignToReadonlyBufferVariableByInstanceName)
>+{
>+    const std::string &source =
>+        R"(#version 310 es
>+        layout(binding = 3) buffer buf {
>+            readonly float f;
>+        } instanceBuffer;
>+        void main()
>+        {
>+            instanceBuffer.f += 0.2;
>+        })";
>+    if (compile(source))
>+    {
>+        FAIL() << "Shader compilation succeeded, expecting failure:\n" << mInfoLog;
>+    }
>+}
>+
>+// Test that can't assign to a readonly struct buffer variable.
>+TEST_F(BufferVariablesTest, AssignToReadonlyStructBufferVariable)
>+{
>+    const std::string &source =
>+        R"(#version 310 es
>+        struct S {
>+            float f;
>+        };
>+        layout(binding = 3) buffer buf {
>+            readonly S s;
>+        };
>+        void main()
>+        {
>+            s.f += 0.2;
>+        })";
>+    if (compile(source))
>+    {
>+        FAIL() << "Shader compilation succeeded, expecting failure:\n" << mInfoLog;
>+    }
>+}
>+
>+// Test that can't assign to a readonly struct buffer variable through an instance name.
>+TEST_F(BufferVariablesTest, AssignToReadonlyStructBufferVariableByInstanceName)
>+{
>+    const std::string &source =
>+        R"(#version 310 es
>+        struct S {
>+            float f;
>+        };
>+        layout(binding = 3) buffer buf {
>+            readonly S s;
>+        } instanceBuffer;
>+        void main()
>+        {
>+            instanceBuffer.s.f += 0.2;
>+        })";
>+    if (compile(source))
>+    {
>+        FAIL() << "Shader compilation succeeded, expecting failure:\n" << mInfoLog;
>+    }
>+}
>+
> // Test that a readonly and writeonly buffer variable should neither read or write.
> TEST_F(BufferVariablesTest, AccessReadonlyWriteonlyBufferVariable)
> {
>diff --git a/Source/ThirdParty/ANGLE/src/tests/compiler_tests/CollectVariables_test.cpp b/Source/ThirdParty/ANGLE/src/tests/compiler_tests/CollectVariables_test.cpp
>index fdef8d9e413..fc560610b08 100644
>--- a/Source/ThirdParty/ANGLE/src/tests/compiler_tests/CollectVariables_test.cpp
>+++ b/Source/ThirdParty/ANGLE/src/tests/compiler_tests/CollectVariables_test.cpp
>@@ -9,10 +9,10 @@
> 
> #include <memory>
> 
>-#include "angle_gl.h"
>-#include "gtest/gtest.h"
> #include "GLSLANG/ShaderLang.h"
>+#include "angle_gl.h"
> #include "compiler/translator/TranslatorGLSL.h"
>+#include "gtest/gtest.h"
> 
> using namespace sh;
> 
>@@ -39,7 +39,9 @@ class CollectVariablesTest : public testing::Test
>     {
>         ShBuiltInResources resources;
>         InitBuiltInResources(&resources);
>-        resources.MaxDrawBuffers = 8;
>+        resources.MaxDrawBuffers           = 8;
>+        resources.EXT_blend_func_extended  = true;
>+        resources.MaxDualSourceDrawBuffers = 1;
> 
>         initTranslator(resources);
>     }
>@@ -54,7 +56,7 @@ class CollectVariablesTest : public testing::Test
>     // For use in the gl_DepthRange tests.
>     void validateDepthRangeShader(const std::string &shaderString)
>     {
>-        const char *shaderStrings[] = { shaderString.c_str() };
>+        const char *shaderStrings[] = {shaderString.c_str()};
>         ASSERT_TRUE(mTranslator->compile(shaderStrings, 1, SH_VARIABLES));
> 
>         const std::vector<Uniform> &uniforms = mTranslator->getUniforms();
>@@ -66,7 +68,7 @@ class CollectVariablesTest : public testing::Test
>         ASSERT_EQ(3u, uniform.fields.size());
> 
>         bool foundNear = false;
>-        bool foundFar = false;
>+        bool foundFar  = false;
>         bool foundDiff = false;
> 
>         for (const auto &field : uniform.fields)
>@@ -113,6 +115,7 @@ class CollectVariablesTest : public testing::Test
>         const OutputVariable &outputVariable = outputVariables[varIndex];
>         EXPECT_EQ(-1, outputVariable.location);
>         EXPECT_TRUE(outputVariable.staticUse);
>+        EXPECT_TRUE(outputVariable.active);
>         EXPECT_EQ(varName, outputVariable.name);
>         *outResult = &outputVariable;
>     }
>@@ -125,6 +128,17 @@ class CollectVariablesTest : public testing::Test
> 
>     void compile(const std::string &shaderString) { compile(shaderString, 0u); }
> 
>+    void checkUniformStaticallyUsedButNotActive(const char *name)
>+    {
>+        const auto &uniforms = mTranslator->getUniforms();
>+        ASSERT_EQ(1u, uniforms.size());
>+
>+        const Uniform &uniform = uniforms[0];
>+        EXPECT_EQ(name, uniform.name);
>+        EXPECT_TRUE(uniform.staticUse);
>+        EXPECT_FALSE(uniform.active);
>+    }
>+
>     ::GLenum mShaderType;
>     std::unique_ptr<TranslatorGLSL> mTranslator;
> };
>@@ -138,7 +152,7 @@ class CollectVertexVariablesTest : public CollectVariablesTest
> class CollectFragmentVariablesTest : public CollectVariablesTest
> {
>   public:
>-      CollectFragmentVariablesTest() : CollectVariablesTest(GL_FRAGMENT_SHADER) {}
>+    CollectFragmentVariablesTest() : CollectVariablesTest(GL_FRAGMENT_SHADER) {}
> };
> 
> class CollectVariablesTestES31 : public CollectVariablesTest
>@@ -155,31 +169,29 @@ class CollectVariablesTestES31 : public CollectVariablesTest
>     }
> };
> 
>-class CollectVariablesOESGeometryShaderTest : public CollectVariablesTestES31
>+class CollectVariablesEXTGeometryShaderTest : public CollectVariablesTestES31
> {
>   public:
>-    CollectVariablesOESGeometryShaderTest(sh::GLenum shaderType)
>+    CollectVariablesEXTGeometryShaderTest(sh::GLenum shaderType)
>         : CollectVariablesTestES31(shaderType)
>-    {
>-    }
>+    {}
> 
>   protected:
>     void SetUp() override
>     {
>         ShBuiltInResources resources;
>         InitBuiltInResources(&resources);
>-        resources.OES_geometry_shader = 1;
>+        resources.EXT_geometry_shader = 1;
> 
>         initTranslator(resources);
>     }
> };
> 
>-class CollectGeometryVariablesTest : public CollectVariablesOESGeometryShaderTest
>+class CollectGeometryVariablesTest : public CollectVariablesEXTGeometryShaderTest
> {
>   public:
>-    CollectGeometryVariablesTest() : CollectVariablesOESGeometryShaderTest(GL_GEOMETRY_SHADER_OES)
>-    {
>-    }
>+    CollectGeometryVariablesTest() : CollectVariablesEXTGeometryShaderTest(GL_GEOMETRY_SHADER_EXT)
>+    {}
> 
>   protected:
>     void compileGeometryShaderWithInputPrimitive(const std::string &inputPrimitive,
>@@ -188,7 +200,7 @@ class CollectGeometryVariablesTest : public CollectVariablesOESGeometryShaderTes
>     {
>         std::ostringstream sstream;
>         sstream << "#version 310 es\n"
>-                << "#extension GL_OES_geometry_shader : require\n"
>+                << "#extension GL_EXT_geometry_shader : require\n"
>                 << "layout (" << inputPrimitive << ") in;\n"
>                 << "layout (points, max_vertices = 2) out;\n"
>                 << inputVarying << functionBody;
>@@ -197,13 +209,12 @@ class CollectGeometryVariablesTest : public CollectVariablesOESGeometryShaderTes
>     }
> };
> 
>-class CollectFragmentVariablesOESGeometryShaderTest : public CollectVariablesOESGeometryShaderTest
>+class CollectFragmentVariablesEXTGeometryShaderTest : public CollectVariablesEXTGeometryShaderTest
> {
>   public:
>-    CollectFragmentVariablesOESGeometryShaderTest()
>-        : CollectVariablesOESGeometryShaderTest(GL_FRAGMENT_SHADER)
>-    {
>-    }
>+    CollectFragmentVariablesEXTGeometryShaderTest()
>+        : CollectVariablesEXTGeometryShaderTest(GL_FRAGMENT_SHADER)
>+    {}
> 
>   protected:
>     void initTranslator(const ShBuiltInResources &resources)
>@@ -247,6 +258,7 @@ TEST_F(CollectFragmentVariablesTest, SimpleOutputVar)
>     EXPECT_EQ(-1, outputVariable.location);
>     EXPECT_GLENUM_EQ(GL_MEDIUM_FLOAT, outputVariable.precision);
>     EXPECT_TRUE(outputVariable.staticUse);
>+    EXPECT_TRUE(outputVariable.active);
>     EXPECT_GLENUM_EQ(GL_FLOAT_VEC4, outputVariable.type);
>     EXPECT_EQ("out_fragColor", outputVariable.name);
> }
>@@ -272,6 +284,7 @@ TEST_F(CollectFragmentVariablesTest, LocationOutputVar)
>     EXPECT_EQ(5, outputVariable.location);
>     EXPECT_GLENUM_EQ(GL_MEDIUM_FLOAT, outputVariable.precision);
>     EXPECT_TRUE(outputVariable.staticUse);
>+    EXPECT_TRUE(outputVariable.active);
>     EXPECT_GLENUM_EQ(GL_FLOAT_VEC4, outputVariable.type);
>     EXPECT_EQ("out_fragColor", outputVariable.name);
> }
>@@ -296,6 +309,7 @@ TEST_F(CollectVertexVariablesTest, LocationAttribute)
>     EXPECT_EQ(5, attribute.location);
>     EXPECT_GLENUM_EQ(GL_HIGH_FLOAT, attribute.precision);
>     EXPECT_TRUE(attribute.staticUse);
>+    EXPECT_TRUE(attribute.active);
>     EXPECT_GLENUM_EQ(GL_FLOAT_VEC4, attribute.type);
>     EXPECT_EQ("in_Position", attribute.name);
> }
>@@ -319,10 +333,10 @@ TEST_F(CollectVertexVariablesTest, SimpleInterfaceBlock)
>     const InterfaceBlock &interfaceBlock = interfaceBlocks[0];
> 
>     EXPECT_EQ(0u, interfaceBlock.arraySize);
>-    EXPECT_FALSE(interfaceBlock.isRowMajorLayout);
>     EXPECT_EQ(BLOCKLAYOUT_SHARED, interfaceBlock.layout);
>     EXPECT_EQ("b", interfaceBlock.name);
>     EXPECT_TRUE(interfaceBlock.staticUse);
>+    EXPECT_TRUE(interfaceBlock.active);
> 
>     ASSERT_EQ(1u, interfaceBlock.fields.size());
> 
>@@ -330,6 +344,7 @@ TEST_F(CollectVertexVariablesTest, SimpleInterfaceBlock)
> 
>     EXPECT_GLENUM_EQ(GL_HIGH_FLOAT, field.precision);
>     EXPECT_TRUE(field.staticUse);
>+    EXPECT_TRUE(field.active);
>     EXPECT_GLENUM_EQ(GL_FLOAT, field.type);
>     EXPECT_EQ("f", field.name);
>     EXPECT_FALSE(field.isRowMajorLayout);
>@@ -355,11 +370,11 @@ TEST_F(CollectVertexVariablesTest, SimpleInstancedInterfaceBlock)
>     const InterfaceBlock &interfaceBlock = interfaceBlocks[0];
> 
>     EXPECT_EQ(0u, interfaceBlock.arraySize);
>-    EXPECT_FALSE(interfaceBlock.isRowMajorLayout);
>     EXPECT_EQ(BLOCKLAYOUT_SHARED, interfaceBlock.layout);
>     EXPECT_EQ("b", interfaceBlock.name);
>     EXPECT_EQ("blockInstance", interfaceBlock.instanceName);
>     EXPECT_TRUE(interfaceBlock.staticUse);
>+    EXPECT_TRUE(interfaceBlock.active);
> 
>     ASSERT_EQ(1u, interfaceBlock.fields.size());
> 
>@@ -367,6 +382,7 @@ TEST_F(CollectVertexVariablesTest, SimpleInstancedInterfaceBlock)
> 
>     EXPECT_GLENUM_EQ(GL_HIGH_FLOAT, field.precision);
>     EXPECT_TRUE(field.staticUse);
>+    EXPECT_TRUE(field.active);
>     EXPECT_GLENUM_EQ(GL_FLOAT, field.type);
>     EXPECT_EQ("f", field.name);
>     EXPECT_FALSE(field.isRowMajorLayout);
>@@ -393,30 +409,31 @@ TEST_F(CollectVertexVariablesTest, StructInterfaceBlock)
>     const InterfaceBlock &interfaceBlock = interfaceBlocks[0];
> 
>     EXPECT_EQ(0u, interfaceBlock.arraySize);
>-    EXPECT_FALSE(interfaceBlock.isRowMajorLayout);
>     EXPECT_EQ(BLOCKLAYOUT_SHARED, interfaceBlock.layout);
>     EXPECT_EQ("b", interfaceBlock.name);
>     EXPECT_EQ(DecorateName("b"), interfaceBlock.mappedName);
>     EXPECT_TRUE(interfaceBlock.staticUse);
>+    EXPECT_TRUE(interfaceBlock.active);
> 
>     ASSERT_EQ(1u, interfaceBlock.fields.size());
> 
>-    const InterfaceBlockField &field = interfaceBlock.fields[0];
>+    const InterfaceBlockField &blockField = interfaceBlock.fields[0];
> 
>-    EXPECT_TRUE(field.isStruct());
>-    EXPECT_TRUE(field.staticUse);
>-    EXPECT_EQ("s", field.name);
>-    EXPECT_EQ(DecorateName("s"), field.mappedName);
>-    EXPECT_FALSE(field.isRowMajorLayout);
>+    EXPECT_TRUE(blockField.isStruct());
>+    EXPECT_TRUE(blockField.staticUse);
>+    EXPECT_TRUE(blockField.active);
>+    EXPECT_EQ("s", blockField.name);
>+    EXPECT_EQ(DecorateName("s"), blockField.mappedName);
>+    EXPECT_FALSE(blockField.isRowMajorLayout);
> 
>-    const ShaderVariable &member = field.fields[0];
>+    const ShaderVariable &structField = blockField.fields[0];
> 
>-    // NOTE: we don't currently mark struct members as statically used or not
>-    EXPECT_FALSE(member.isStruct());
>-    EXPECT_EQ("f", member.name);
>-    EXPECT_EQ(DecorateName("f"), member.mappedName);
>-    EXPECT_GLENUM_EQ(GL_FLOAT, member.type);
>-    EXPECT_GLENUM_EQ(GL_HIGH_FLOAT, member.precision);
>+    // NOTE: we don't track static use or active at individual struct member granularity.
>+    EXPECT_FALSE(structField.isStruct());
>+    EXPECT_EQ("f", structField.name);
>+    EXPECT_EQ(DecorateName("f"), structField.mappedName);
>+    EXPECT_GLENUM_EQ(GL_FLOAT, structField.type);
>+    EXPECT_GLENUM_EQ(GL_HIGH_FLOAT, structField.precision);
> }
> 
> TEST_F(CollectVertexVariablesTest, StructInstancedInterfaceBlock)
>@@ -439,31 +456,32 @@ TEST_F(CollectVertexVariablesTest, StructInstancedInterfaceBlock)
>     const InterfaceBlock &interfaceBlock = interfaceBlocks[0];
> 
>     EXPECT_EQ(0u, interfaceBlock.arraySize);
>-    EXPECT_FALSE(interfaceBlock.isRowMajorLayout);
>     EXPECT_EQ(BLOCKLAYOUT_SHARED, interfaceBlock.layout);
>     EXPECT_EQ("b", interfaceBlock.name);
>     EXPECT_EQ(DecorateName("b"), interfaceBlock.mappedName);
>     EXPECT_EQ("instanceName", interfaceBlock.instanceName);
>     EXPECT_TRUE(interfaceBlock.staticUse);
>+    EXPECT_TRUE(interfaceBlock.active);
> 
>     ASSERT_EQ(1u, interfaceBlock.fields.size());
> 
>-    const InterfaceBlockField &field = interfaceBlock.fields[0];
>+    const InterfaceBlockField &blockField = interfaceBlock.fields[0];
> 
>-    EXPECT_TRUE(field.isStruct());
>-    EXPECT_TRUE(field.staticUse);
>-    EXPECT_EQ("s", field.name);
>-    EXPECT_EQ(DecorateName("s"), field.mappedName);
>-    EXPECT_FALSE(field.isRowMajorLayout);
>+    EXPECT_TRUE(blockField.isStruct());
>+    EXPECT_TRUE(blockField.staticUse);
>+    EXPECT_TRUE(blockField.active);
>+    EXPECT_EQ("s", blockField.name);
>+    EXPECT_EQ(DecorateName("s"), blockField.mappedName);
>+    EXPECT_FALSE(blockField.isRowMajorLayout);
> 
>-    const ShaderVariable &member = field.fields[0];
>+    const ShaderVariable &structField = blockField.fields[0];
> 
>-    // NOTE: we don't currently mark struct members as statically used or not
>-    EXPECT_FALSE(member.isStruct());
>-    EXPECT_EQ("f", member.name);
>-    EXPECT_EQ(DecorateName("f"), member.mappedName);
>-    EXPECT_GLENUM_EQ(GL_FLOAT, member.type);
>-    EXPECT_GLENUM_EQ(GL_HIGH_FLOAT, member.precision);
>+    // NOTE: we don't track static use or active at individual struct member granularity.
>+    EXPECT_FALSE(structField.isStruct());
>+    EXPECT_EQ("f", structField.name);
>+    EXPECT_EQ(DecorateName("f"), structField.mappedName);
>+    EXPECT_GLENUM_EQ(GL_FLOAT, structField.type);
>+    EXPECT_GLENUM_EQ(GL_HIGH_FLOAT, structField.precision);
> }
> 
> TEST_F(CollectVertexVariablesTest, NestedStructRowMajorInterfaceBlock)
>@@ -486,30 +504,31 @@ TEST_F(CollectVertexVariablesTest, NestedStructRowMajorInterfaceBlock)
>     const InterfaceBlock &interfaceBlock = interfaceBlocks[0];
> 
>     EXPECT_EQ(0u, interfaceBlock.arraySize);
>-    EXPECT_TRUE(interfaceBlock.isRowMajorLayout);
>     EXPECT_EQ(BLOCKLAYOUT_SHARED, interfaceBlock.layout);
>     EXPECT_EQ("b", interfaceBlock.name);
>     EXPECT_EQ(DecorateName("b"), interfaceBlock.mappedName);
>     EXPECT_TRUE(interfaceBlock.staticUse);
>+    EXPECT_TRUE(interfaceBlock.active);
> 
>     ASSERT_EQ(1u, interfaceBlock.fields.size());
> 
>-    const InterfaceBlockField &field = interfaceBlock.fields[0];
>+    const InterfaceBlockField &blockField = interfaceBlock.fields[0];
> 
>-    EXPECT_TRUE(field.isStruct());
>-    EXPECT_TRUE(field.staticUse);
>-    EXPECT_EQ("s", field.name);
>-    EXPECT_EQ(DecorateName("s"), field.mappedName);
>-    EXPECT_TRUE(field.isRowMajorLayout);
>+    EXPECT_TRUE(blockField.isStruct());
>+    EXPECT_TRUE(blockField.staticUse);
>+    EXPECT_TRUE(blockField.active);
>+    EXPECT_EQ("s", blockField.name);
>+    EXPECT_EQ(DecorateName("s"), blockField.mappedName);
>+    EXPECT_TRUE(blockField.isRowMajorLayout);
> 
>-    const ShaderVariable &member = field.fields[0];
>+    const ShaderVariable &structField = blockField.fields[0];
> 
>-    // NOTE: we don't currently mark struct members as statically used or not
>-    EXPECT_FALSE(member.isStruct());
>-    EXPECT_EQ("m", member.name);
>-    EXPECT_EQ(DecorateName("m"), member.mappedName);
>-    EXPECT_GLENUM_EQ(GL_FLOAT_MAT2, member.type);
>-    EXPECT_GLENUM_EQ(GL_HIGH_FLOAT, member.precision);
>+    // NOTE: we don't track static use or active at individual struct member granularity.
>+    EXPECT_FALSE(structField.isStruct());
>+    EXPECT_EQ("m", structField.name);
>+    EXPECT_EQ(DecorateName("m"), structField.mappedName);
>+    EXPECT_GLENUM_EQ(GL_FLOAT_MAT2, structField.type);
>+    EXPECT_GLENUM_EQ(GL_HIGH_FLOAT, structField.precision);
> }
> 
> TEST_F(CollectVertexVariablesTest, VaryingInterpolation)
>@@ -538,6 +557,7 @@ TEST_F(CollectVertexVariablesTest, VaryingInterpolation)
>     EXPECT_FALSE(varying->isArray());
>     EXPECT_GLENUM_EQ(GL_MEDIUM_FLOAT, varying->precision);
>     EXPECT_TRUE(varying->staticUse);
>+    EXPECT_TRUE(varying->active);
>     EXPECT_GLENUM_EQ(GL_FLOAT, varying->type);
>     EXPECT_EQ("vary", varying->name);
>     EXPECT_EQ(DecorateName("vary"), varying->mappedName);
>@@ -550,7 +570,8 @@ TEST_F(CollectVertexVariablesTest, DepthRange)
>     const std::string &shaderString =
>         "attribute vec4 position;\n"
>         "void main() {\n"
>-        "   gl_Position = position + vec4(gl_DepthRange.near, gl_DepthRange.far, gl_DepthRange.diff, 1.0);\n"
>+        "   gl_Position = position + vec4(gl_DepthRange.near, gl_DepthRange.far, "
>+        "gl_DepthRange.diff, 1.0);\n"
>         "}\n";
> 
>     validateDepthRangeShader(shaderString);
>@@ -601,7 +622,7 @@ TEST_F(CollectFragmentVariablesTest, OutputVarESSL1FragData)
>     ShBuiltInResources resources       = mTranslator->getResources();
>     resources.EXT_draw_buffers         = 1;
>     const unsigned int kMaxDrawBuffers = 3u;
>-    resources.MaxDrawBuffers = kMaxDrawBuffers;
>+    resources.MaxDrawBuffers           = kMaxDrawBuffers;
>     initTranslator(resources);
> 
>     const OutputVariable *outputVariable = nullptr;
>@@ -625,7 +646,7 @@ TEST_F(CollectFragmentVariablesTest, OutputVarESSL1FragDepthMediump)
>         "}\n";
> 
>     ShBuiltInResources resources = mTranslator->getResources();
>-    resources.EXT_frag_depth = 1;
>+    resources.EXT_frag_depth     = 1;
>     initTranslator(resources);
> 
>     const OutputVariable *outputVariable = nullptr;
>@@ -671,7 +692,7 @@ TEST_F(CollectFragmentVariablesTest, OutputVarESSL3FragDepthHighp)
>         "}\n";
> 
>     ShBuiltInResources resources = mTranslator->getResources();
>-    resources.EXT_frag_depth = 1;
>+    resources.EXT_frag_depth     = 1;
>     initTranslator(resources);
> 
>     const OutputVariable *outputVariable = nullptr;
>@@ -795,12 +816,12 @@ TEST_F(CollectHashedVertexVariablesTest, InstancedInterfaceBlock)
>     const InterfaceBlock &interfaceBlock = interfaceBlocks[0];
> 
>     EXPECT_EQ(0u, interfaceBlock.arraySize);
>-    EXPECT_FALSE(interfaceBlock.isRowMajorLayout);
>     EXPECT_EQ(BLOCKLAYOUT_SHARED, interfaceBlock.layout);
>     EXPECT_EQ("blockName", interfaceBlock.name);
>     EXPECT_EQ("blockInstance", interfaceBlock.instanceName);
>     EXPECT_EQ("webgl_9", interfaceBlock.mappedName);
>     EXPECT_TRUE(interfaceBlock.staticUse);
>+    EXPECT_TRUE(interfaceBlock.active);
> 
>     ASSERT_EQ(1u, interfaceBlock.fields.size());
> 
>@@ -808,6 +829,7 @@ TEST_F(CollectHashedVertexVariablesTest, InstancedInterfaceBlock)
> 
>     EXPECT_GLENUM_EQ(GL_HIGH_FLOAT, field.precision);
>     EXPECT_TRUE(field.staticUse);
>+    EXPECT_TRUE(field.active);
>     EXPECT_GLENUM_EQ(GL_FLOAT, field.type);
>     EXPECT_EQ("field", field.name);
>     EXPECT_EQ("webgl_5", field.mappedName);
>@@ -815,17 +837,21 @@ TEST_F(CollectHashedVertexVariablesTest, InstancedInterfaceBlock)
>     EXPECT_TRUE(field.fields.empty());
> }
> 
>+// Test a struct uniform where the struct does have a name.
> TEST_F(CollectHashedVertexVariablesTest, StructUniform)
> {
>     const std::string &shaderString =
>-        "#version 300 es\n"
>-        "struct sType {\n"
>-        "  float field;\n"
>-        "};"
>-        "uniform sType u;"
>-        "void main() {\n"
>-        "   gl_Position = vec4(u.field, 0.0, 0.0, 1.0);\n"
>-        "}\n";
>+        R"(#version 300 es
>+        struct sType
>+        {
>+            float field;
>+        };
>+        uniform sType u;
>+
>+        void main()
>+        {
>+            gl_Position = vec4(u.field, 0.0, 0.0, 1.0);
>+        })";
> 
>     compile(shaderString);
> 
>@@ -837,14 +863,63 @@ TEST_F(CollectHashedVertexVariablesTest, StructUniform)
>     EXPECT_FALSE(uniform.isArray());
>     EXPECT_EQ("u", uniform.name);
>     EXPECT_EQ("webgl_1", uniform.mappedName);
>+    EXPECT_EQ("sType", uniform.structName);
>     EXPECT_TRUE(uniform.staticUse);
>+    EXPECT_TRUE(uniform.active);
> 
>     ASSERT_EQ(1u, uniform.fields.size());
> 
>     const ShaderVariable &field = uniform.fields[0];
> 
>     EXPECT_GLENUM_EQ(GL_HIGH_FLOAT, field.precision);
>-    // EXPECT_TRUE(field.staticUse); // we don't yet support struct static use
>+    // We don't yet support tracking static use per field, but fields are marked statically used in
>+    // case the struct is.
>+    EXPECT_TRUE(field.staticUse);
>+    EXPECT_TRUE(field.active);
>+    EXPECT_GLENUM_EQ(GL_FLOAT, field.type);
>+    EXPECT_EQ("field", field.name);
>+    EXPECT_EQ("webgl_5", field.mappedName);
>+    EXPECT_TRUE(field.fields.empty());
>+}
>+
>+// Test a struct uniform where the struct doesn't have a name.
>+TEST_F(CollectHashedVertexVariablesTest, NamelessStructUniform)
>+{
>+    const std::string &shaderString =
>+        R"(#version 300 es
>+        uniform struct
>+        {
>+            float field;
>+        } u;
>+
>+        void main()
>+        {
>+            gl_Position = vec4(u.field, 0.0, 0.0, 1.0);
>+        })";
>+
>+    compile(shaderString);
>+
>+    const auto &uniforms = mTranslator->getUniforms();
>+    ASSERT_EQ(1u, uniforms.size());
>+
>+    const Uniform &uniform = uniforms[0];
>+
>+    EXPECT_FALSE(uniform.isArray());
>+    EXPECT_EQ("u", uniform.name);
>+    EXPECT_EQ("webgl_1", uniform.mappedName);
>+    EXPECT_EQ("", uniform.structName);
>+    EXPECT_TRUE(uniform.staticUse);
>+    EXPECT_TRUE(uniform.active);
>+
>+    ASSERT_EQ(1u, uniform.fields.size());
>+
>+    const ShaderVariable &field = uniform.fields[0];
>+
>+    EXPECT_GLENUM_EQ(GL_HIGH_FLOAT, field.precision);
>+    // We don't yet support tracking static use per field, but fields are marked statically used in
>+    // case the struct is.
>+    EXPECT_TRUE(field.staticUse);
>+    EXPECT_TRUE(field.active);
>     EXPECT_GLENUM_EQ(GL_FLOAT, field.type);
>     EXPECT_EQ("field", field.name);
>     EXPECT_EQ("webgl_5", field.mappedName);
>@@ -874,6 +949,7 @@ TEST_F(CollectFragmentVariablesTest, MultiDeclaration)
>     EXPECT_FALSE(uniform.isArray());
>     EXPECT_GLENUM_EQ(GL_MEDIUM_FLOAT, uniform.precision);
>     EXPECT_TRUE(uniform.staticUse);
>+    EXPECT_TRUE(uniform.active);
>     EXPECT_GLENUM_EQ(GL_FLOAT, uniform.type);
>     EXPECT_EQ("uA", uniform.name);
> 
>@@ -881,6 +957,7 @@ TEST_F(CollectFragmentVariablesTest, MultiDeclaration)
>     EXPECT_FALSE(uniformB.isArray());
>     EXPECT_GLENUM_EQ(GL_MEDIUM_FLOAT, uniformB.precision);
>     EXPECT_TRUE(uniformB.staticUse);
>+    EXPECT_TRUE(uniformB.active);
>     EXPECT_GLENUM_EQ(GL_FLOAT, uniformB.type);
>     EXPECT_EQ("uB", uniformB.name);
> }
>@@ -907,6 +984,7 @@ TEST_F(CollectFragmentVariablesTest, EmptyDeclarator)
>     EXPECT_FALSE(uniformB.isArray());
>     EXPECT_GLENUM_EQ(GL_MEDIUM_FLOAT, uniformB.precision);
>     EXPECT_TRUE(uniformB.staticUse);
>+    EXPECT_TRUE(uniformB.active);
>     EXPECT_GLENUM_EQ(GL_FLOAT, uniformB.type);
>     EXPECT_EQ("uB", uniformB.name);
> }
>@@ -917,7 +995,7 @@ TEST_F(CollectVertexVariablesTest, ViewID_OVR)
> {
>     const std::string &shaderString =
>         "#version 300 es\n"
>-        "#extension GL_OVR_multiview : require\n"
>+        "#extension GL_OVR_multiview2 : require\n"
>         "precision mediump float;\n"
>         "void main()\n"
>         "{\n"
>@@ -925,7 +1003,7 @@ TEST_F(CollectVertexVariablesTest, ViewID_OVR)
>         "}\n";
> 
>     ShBuiltInResources resources = mTranslator->getResources();
>-    resources.OVR_multiview      = 1;
>+    resources.OVR_multiview2     = 1;
>     resources.MaxViewsOVR        = 4;
>     initTranslator(resources);
> 
>@@ -944,7 +1022,7 @@ TEST_F(CollectGeometryVariablesTest, CollectGLInFields)
> {
>     const std::string &shaderString =
>         R"(#version 310 es
>-        #extension GL_OES_geometry_shader : require
>+        #extension GL_EXT_geometry_shader : require
> 
>         layout (points) in;
>         layout (points, max_vertices = 2) out;
>@@ -969,6 +1047,7 @@ TEST_F(CollectGeometryVariablesTest, CollectGLInFields)
>     EXPECT_EQ("gl_PerVertex", inBlock->name);
>     EXPECT_EQ("gl_in", inBlock->instanceName);
>     EXPECT_TRUE(inBlock->staticUse);
>+    EXPECT_TRUE(inBlock->active);
>     EXPECT_TRUE(inBlock->isBuiltIn());
> 
>     ASSERT_EQ(1u, inBlock->fields.size());
>@@ -978,6 +1057,7 @@ TEST_F(CollectGeometryVariablesTest, CollectGLInFields)
>     EXPECT_FALSE(glPositionField.isArray());
>     EXPECT_FALSE(glPositionField.isStruct());
>     EXPECT_TRUE(glPositionField.staticUse);
>+    EXPECT_TRUE(glPositionField.active);
>     EXPECT_TRUE(glPositionField.isBuiltIn());
>     EXPECT_GLENUM_EQ(GL_HIGH_FLOAT, glPositionField.precision);
>     EXPECT_GLENUM_EQ(GL_FLOAT_VEC4, glPositionField.type);
>@@ -1015,7 +1095,7 @@ TEST_F(CollectGeometryVariablesTest, CollectPrimitiveIDIn)
> {
>     const std::string &shaderString =
>         R"(#version 310 es
>-        #extension GL_OES_geometry_shader : require
>+        #extension GL_EXT_geometry_shader : require
>         layout (points) in;
>         layout (points, max_vertices = 2) out;
>         void main()
>@@ -1037,6 +1117,7 @@ TEST_F(CollectGeometryVariablesTest, CollectPrimitiveIDIn)
>     EXPECT_FALSE(varying->isArray());
>     EXPECT_FALSE(varying->isStruct());
>     EXPECT_TRUE(varying->staticUse);
>+    EXPECT_TRUE(varying->active);
>     EXPECT_TRUE(varying->isBuiltIn());
>     EXPECT_GLENUM_EQ(GL_HIGH_INT, varying->precision);
>     EXPECT_GLENUM_EQ(GL_INT, varying->type);
>@@ -1047,7 +1128,7 @@ TEST_F(CollectGeometryVariablesTest, CollectInvocationID)
> {
>     const std::string &shaderString =
>         R"(#version 310 es
>-        #extension GL_OES_geometry_shader : require
>+        #extension GL_EXT_geometry_shader : require
>         layout (points, invocations = 2) in;
>         layout (points, max_vertices = 2) out;
>         void main()
>@@ -1069,6 +1150,7 @@ TEST_F(CollectGeometryVariablesTest, CollectInvocationID)
>     EXPECT_FALSE(varying->isArray());
>     EXPECT_FALSE(varying->isStruct());
>     EXPECT_TRUE(varying->staticUse);
>+    EXPECT_TRUE(varying->active);
>     EXPECT_TRUE(varying->isBuiltIn());
>     EXPECT_GLENUM_EQ(GL_HIGH_INT, varying->precision);
>     EXPECT_GLENUM_EQ(GL_INT, varying->type);
>@@ -1079,7 +1161,7 @@ TEST_F(CollectGeometryVariablesTest, CollectGLInIndexedByExpression)
> {
>     const std::string &shaderString =
>         R"(#version 310 es
>-        #extension GL_OES_geometry_shader : require
>+        #extension GL_EXT_geometry_shader : require
>         layout (triangles, invocations = 2) in;
>         layout (points, max_vertices = 2) out;
>         void main()
>@@ -1108,14 +1190,14 @@ TEST_F(CollectGeometryVariablesTest, CollectGLInIndexedByExpression)
> TEST_F(CollectGeometryVariablesTest, CollectPosition)
> {
>     const std::string &shaderString =
>-        "#version 310 es\n"
>-        "#extension GL_OES_geometry_shader : require\n"
>-        "layout (points) in;\n"
>-        "layout (points, max_vertices = 2) out;\n"
>-        "void main()\n"
>-        "{\n"
>-        "    gl_Position = vec4(0.1, 0.2, 0.3, 1);\n"
>-        "}\n";
>+        R"(#version 310 es
>+        #extension GL_EXT_geometry_shader : require
>+        layout (points) in;
>+        layout (points, max_vertices = 2) out;
>+        void main()
>+        {
>+            gl_Position = vec4(0.1, 0.2, 0.3, 1);
>+        })";
> 
>     compile(shaderString);
> 
>@@ -1130,6 +1212,7 @@ TEST_F(CollectGeometryVariablesTest, CollectPosition)
>     EXPECT_FALSE(varying->isArray());
>     EXPECT_FALSE(varying->isStruct());
>     EXPECT_TRUE(varying->staticUse);
>+    EXPECT_TRUE(varying->active);
>     EXPECT_TRUE(varying->isBuiltIn());
>     EXPECT_GLENUM_EQ(GL_HIGH_FLOAT, varying->precision);
>     EXPECT_GLENUM_EQ(GL_FLOAT_VEC4, varying->type);
>@@ -1139,14 +1222,14 @@ TEST_F(CollectGeometryVariablesTest, CollectPosition)
> TEST_F(CollectGeometryVariablesTest, CollectPrimitiveID)
> {
>     const std::string &shaderString =
>-        "#version 310 es\n"
>-        "#extension GL_OES_geometry_shader : require\n"
>-        "layout (points) in;\n"
>-        "layout (points, max_vertices = 2) out;\n"
>-        "void main()\n"
>-        "{\n"
>-        "    gl_PrimitiveID = 100;\n"
>-        "}\n";
>+        R"(#version 310 es
>+        #extension GL_EXT_geometry_shader : require
>+        layout (points) in;
>+        layout (points, max_vertices = 2) out;
>+        void main()
>+        {
>+            gl_PrimitiveID = 100;
>+        })";
> 
>     compile(shaderString);
> 
>@@ -1161,6 +1244,7 @@ TEST_F(CollectGeometryVariablesTest, CollectPrimitiveID)
>     EXPECT_FALSE(varying->isArray());
>     EXPECT_FALSE(varying->isStruct());
>     EXPECT_TRUE(varying->staticUse);
>+    EXPECT_TRUE(varying->active);
>     EXPECT_TRUE(varying->isBuiltIn());
>     EXPECT_GLENUM_EQ(GL_HIGH_INT, varying->precision);
>     EXPECT_GLENUM_EQ(GL_INT, varying->type);
>@@ -1170,14 +1254,14 @@ TEST_F(CollectGeometryVariablesTest, CollectPrimitiveID)
> TEST_F(CollectGeometryVariablesTest, CollectLayer)
> {
>     const std::string &shaderString =
>-        "#version 310 es\n"
>-        "#extension GL_OES_geometry_shader : require\n"
>-        "layout (points) in;\n"
>-        "layout (points, max_vertices = 2) out;\n"
>-        "void main()\n"
>-        "{\n"
>-        "    gl_Layer = 2;\n"
>-        "}\n";
>+        R"(#version 310 es
>+        #extension GL_EXT_geometry_shader : require
>+        layout (points) in;
>+        layout (points, max_vertices = 2) out;
>+        void main()
>+        {
>+            gl_Layer = 2;
>+        })";
> 
>     compile(shaderString);
> 
>@@ -1192,17 +1276,18 @@ TEST_F(CollectGeometryVariablesTest, CollectLayer)
>     EXPECT_FALSE(varying->isArray());
>     EXPECT_FALSE(varying->isStruct());
>     EXPECT_TRUE(varying->staticUse);
>+    EXPECT_TRUE(varying->active);
>     EXPECT_TRUE(varying->isBuiltIn());
>     EXPECT_GLENUM_EQ(GL_HIGH_INT, varying->precision);
>     EXPECT_GLENUM_EQ(GL_INT, varying->type);
> }
> 
> // Test collecting gl_PrimitiveID in a fragment shader.
>-TEST_F(CollectFragmentVariablesOESGeometryShaderTest, CollectPrimitiveID)
>+TEST_F(CollectFragmentVariablesEXTGeometryShaderTest, CollectPrimitiveID)
> {
>     const std::string &shaderString =
>         R"(#version 310 es
>-        #extension GL_OES_geometry_shader : require
>+        #extension GL_EXT_geometry_shader : require
> 
>         out int my_out;
> 
>@@ -1223,17 +1308,18 @@ TEST_F(CollectFragmentVariablesOESGeometryShaderTest, CollectPrimitiveID)
>     EXPECT_FALSE(varying->isArray());
>     EXPECT_FALSE(varying->isStruct());
>     EXPECT_TRUE(varying->staticUse);
>+    EXPECT_TRUE(varying->active);
>     EXPECT_TRUE(varying->isBuiltIn());
>     EXPECT_GLENUM_EQ(GL_HIGH_INT, varying->precision);
>     EXPECT_GLENUM_EQ(GL_INT, varying->type);
> }
> 
> // Test collecting gl_Layer in a fragment shader.
>-TEST_F(CollectFragmentVariablesOESGeometryShaderTest, CollectLayer)
>+TEST_F(CollectFragmentVariablesEXTGeometryShaderTest, CollectLayer)
> {
>     const std::string &shaderString =
>         R"(#version 310 es
>-        #extension GL_OES_geometry_shader : require
>+        #extension GL_EXT_geometry_shader : require
> 
>         out int my_out;
> 
>@@ -1254,6 +1340,7 @@ TEST_F(CollectFragmentVariablesOESGeometryShaderTest, CollectLayer)
>     EXPECT_FALSE(varying->isArray());
>     EXPECT_FALSE(varying->isStruct());
>     EXPECT_TRUE(varying->staticUse);
>+    EXPECT_TRUE(varying->active);
>     EXPECT_TRUE(varying->isBuiltIn());
>     EXPECT_GLENUM_EQ(GL_HIGH_INT, varying->precision);
>     EXPECT_GLENUM_EQ(GL_INT, varying->type);
>@@ -1263,12 +1350,12 @@ TEST_F(CollectFragmentVariablesOESGeometryShaderTest, CollectLayer)
> TEST_F(CollectVertexVariablesES31Test, CollectOutputWithLocation)
> {
>     const std::string &shaderString =
>-        "#version 310 es\n"
>-        "out vec4 v_output1;\n"
>-        "layout (location = 1) out vec4 v_output2;\n"
>-        "void main()\n"
>-        "{\n"
>-        "}\n";
>+        R"(#version 310 es
>+        out vec4 v_output1;
>+        layout (location = 1) out vec4 v_output2;
>+        void main()
>+        {
>+        })";
> 
>     compile(shaderString);
> 
>@@ -1288,15 +1375,15 @@ TEST_F(CollectVertexVariablesES31Test, CollectOutputWithLocation)
> TEST_F(CollectFragmentVariablesES31Test, CollectInputWithLocation)
> {
>     const std::string &shaderString =
>-        "#version 310 es\n"
>-        "precision mediump float;\n"
>-        "in vec4 f_input1;\n"
>-        "layout (location = 1) in vec4 f_input2;\n"
>-        "layout (location = 0) out vec4 o_color;\n"
>-        "void main()\n"
>-        "{\n"
>-        "    o_color = f_input2;\n"
>-        "}\n";
>+        R"(#version 310 es
>+        precision mediump float;
>+        in vec4 f_input1;
>+        layout (location = 1) in vec4 f_input2;
>+        layout (location = 0) out vec4 o_color;
>+        void main()
>+        {
>+            o_color = f_input2;
>+        })";
> 
>     compile(shaderString);
> 
>@@ -1317,7 +1404,7 @@ TEST_F(CollectGeometryVariablesTest, CollectInputs)
> {
>     const std::string &shaderString =
>         R"(#version 310 es
>-        #extension GL_OES_geometry_shader : require
>+        #extension GL_EXT_geometry_shader : require
>         layout (points) in;
>         layout (points, max_vertices = 2) out;
>         in vec4 texcoord1[];
>@@ -1346,6 +1433,7 @@ TEST_F(CollectGeometryVariablesTest, CollectInputs)
>         EXPECT_TRUE(varying.isArray());
>         EXPECT_FALSE(varying.isStruct());
>         EXPECT_TRUE(varying.staticUse);
>+        EXPECT_TRUE(varying.active);
>         EXPECT_FALSE(varying.isBuiltIn());
>         EXPECT_GLENUM_EQ(GL_HIGH_FLOAT, varying.precision);
>         EXPECT_GLENUM_EQ(GL_FLOAT_VEC4, varying.type);
>@@ -1390,7 +1478,7 @@ TEST_F(CollectGeometryVariablesTest, CollectInputsWithInterpolationQualifiers)
> {
>     const std::string &kHeader =
>         "#version 310 es\n"
>-        "#extension GL_OES_geometry_shader : require\n";
>+        "#extension GL_EXT_geometry_shader : require\n";
>     const std::string &kLayout =
>         "layout (points) in;\n"
>         "layout (points, max_vertices = 2) out;\n";
>@@ -1428,7 +1516,7 @@ TEST_F(CollectGeometryVariablesTest, CollectOutputsWithInterpolationQualifiers)
> {
>     const std::string &kHeader =
>         "#version 310 es\n"
>-        "#extension GL_OES_geometry_shader : require\n"
>+        "#extension GL_EXT_geometry_shader : require\n"
>         "layout (points) in;\n"
>         "layout (points, max_vertices = 2) out;\n";
> 
>@@ -1465,15 +1553,15 @@ TEST_F(CollectGeometryVariablesTest, CollectOutputsWithInterpolationQualifiers)
> TEST_F(CollectGeometryVariablesTest, CollectOutputsWithInvariant)
> {
>     const std::string &shaderString =
>-        "#version 310 es\n"
>-        "#extension GL_OES_geometry_shader : require\n"
>-        "layout (points) in;\n"
>-        "layout (points, max_vertices = 2) out;\n"
>-        "invariant out vec4 texcoord;\n"
>-        "void main()\n"
>-        "{\n"
>-        "    texcoord = vec4(1.0, 0.0, 0.0, 1.0);\n"
>-        "}\n";
>+        R"(#version 310 es
>+        #extension GL_EXT_geometry_shader : require
>+        layout (points) in;
>+        layout (points, max_vertices = 2) out;
>+        invariant out vec4 texcoord;
>+        void main()
>+        {
>+            texcoord = vec4(1.0, 0.0, 0.0, 1.0);
>+        })";
> 
>     compile(shaderString);
> 
>@@ -1484,3 +1572,546 @@ TEST_F(CollectGeometryVariablesTest, CollectOutputsWithInvariant)
>     EXPECT_EQ("texcoord", varying->name);
>     EXPECT_TRUE(varying->isInvariant);
> }
>+
>+// Test collecting a varying variable that is used inside a folded ternary operator. The result of
>+// the folded ternary operator has a different qualifier from the original variable, which makes
>+// this case tricky.
>+TEST_F(CollectFragmentVariablesTest, VaryingUsedInsideFoldedTernary)
>+{
>+    const std::string &shaderString =
>+        R"(#version 300 es
>+        precision highp float;
>+        centroid in float vary;
>+        out vec4 color;
>+        void main() {
>+           color = vec4(0.0, true ? vary : 0.0, 0.0, 1.0);
>+        })";
>+
>+    compile(shaderString);
>+
>+    const std::vector<Varying> &varyings = mTranslator->getInputVaryings();
>+    ASSERT_EQ(1u, varyings.size());
>+
>+    const Varying *varying = &varyings[0];
>+
>+    EXPECT_FALSE(varying->isArray());
>+    EXPECT_GLENUM_EQ(GL_HIGH_FLOAT, varying->precision);
>+    EXPECT_TRUE(varying->staticUse);
>+    EXPECT_TRUE(varying->active);
>+    EXPECT_GLENUM_EQ(GL_FLOAT, varying->type);
>+    EXPECT_EQ("vary", varying->name);
>+    EXPECT_EQ(DecorateName("vary"), varying->mappedName);
>+    EXPECT_EQ(INTERPOLATION_CENTROID, varying->interpolation);
>+}
>+
>+// Test a variable that is statically used but not active. The variable is used in a branch of a
>+// ternary op that is not evaluated.
>+TEST_F(CollectFragmentVariablesTest, StaticallyUsedButNotActiveInTernaryOp)
>+{
>+    const std::string &shaderString =
>+        R"(#version 300 es
>+        precision mediump float;
>+        out vec4 out_fragColor;
>+        uniform float u;
>+        void main()
>+        {
>+            out_fragColor = vec4(true ? 0.0 : u);
>+        })";
>+
>+    compile(shaderString);
>+    checkUniformStaticallyUsedButNotActive("u");
>+}
>+
>+// Test a variable that is statically used but not active. The variable is a return value in an
>+// unused function.
>+TEST_F(CollectFragmentVariablesTest, StaticallyUsedButNotActiveAsReturnValue)
>+{
>+    const std::string &shaderString =
>+        R"(#version 300 es
>+        precision mediump float;
>+        out vec4 out_fragColor;
>+        uniform float u;
>+        float f() {
>+            return u;
>+        }
>+        void main()
>+        {
>+            out_fragColor = vec4(0.0);
>+        })";
>+
>+    compile(shaderString);
>+    checkUniformStaticallyUsedButNotActive("u");
>+}
>+
>+// Test a variable that is statically used but not active. The variable is an if statement condition
>+// inside a block that is not executed.
>+TEST_F(CollectFragmentVariablesTest, StaticallyUsedButNotActiveAsIfCondition)
>+{
>+    const std::string &shaderString =
>+        R"(#version 300 es
>+        precision mediump float;
>+        out vec4 out_fragColor;
>+        uniform bool u;
>+        void main()
>+        {
>+            if (false) {
>+                if (u) {
>+                    out_fragColor = vec4(1.0);
>+                }
>+            }
>+            out_fragColor = vec4(0.0);
>+        })";
>+
>+    compile(shaderString);
>+    checkUniformStaticallyUsedButNotActive("u");
>+}
>+
>+// Test a variable that is statically used but not active. The variable is a constructor argument in
>+// a block that is not executed.
>+TEST_F(CollectFragmentVariablesTest, StaticallyUsedButNotActiveAsConstructorArgument)
>+{
>+    const std::string &shaderString =
>+        R"(#version 300 es
>+        precision mediump float;
>+        out vec4 out_fragColor;
>+        uniform float u;
>+        void main()
>+        {
>+            if (false) {
>+                out_fragColor = vec4(u);
>+            }
>+            out_fragColor = vec4(0.0);
>+        })";
>+
>+    compile(shaderString);
>+    checkUniformStaticallyUsedButNotActive("u");
>+}
>+
>+// Test a variable that is statically used but not active. The variable is a binary operator operand
>+// in a block that is not executed.
>+TEST_F(CollectFragmentVariablesTest, StaticallyUsedButNotActiveAsBinaryOpOperand)
>+{
>+    const std::string &shaderString =
>+        R"(#version 300 es
>+        precision mediump float;
>+        out vec4 out_fragColor;
>+        uniform vec4 u;
>+        void main()
>+        {
>+            if (false) {
>+                out_fragColor = u + 1.0;
>+            }
>+            out_fragColor = vec4(0.0);
>+        })";
>+
>+    compile(shaderString);
>+    checkUniformStaticallyUsedButNotActive("u");
>+}
>+
>+// Test a variable that is statically used but not active. The variable is a comparison operator
>+// operand in a block that is not executed.
>+TEST_F(CollectFragmentVariablesTest, StaticallyUsedButNotActiveAsComparisonOpOperand)
>+{
>+    const std::string &shaderString =
>+        R"(#version 300 es
>+        precision mediump float;
>+        out vec4 out_fragColor;
>+        uniform vec4 u;
>+        void main()
>+        {
>+            if (false) {
>+                if (u == vec4(1.0))
>+                {
>+                    out_fragColor = vec4(1.0);
>+                }
>+            }
>+            out_fragColor = vec4(0.0);
>+        })";
>+
>+    compile(shaderString);
>+    checkUniformStaticallyUsedButNotActive("u");
>+}
>+
>+// Test a variable that is statically used but not active. The variable is an unary operator operand
>+// in a block that is not executed.
>+TEST_F(CollectFragmentVariablesTest, StaticallyUsedButNotActiveAsUnaryOpOperand)
>+{
>+    const std::string &shaderString =
>+        R"(#version 300 es
>+        precision mediump float;
>+        out vec4 out_fragColor;
>+        uniform vec4 u;
>+        void main()
>+        {
>+            if (false) {
>+                out_fragColor = -u;
>+            }
>+            out_fragColor = vec4(0.0);
>+        })";
>+
>+    compile(shaderString);
>+    checkUniformStaticallyUsedButNotActive("u");
>+}
>+
>+// Test a variable that is statically used but not active. The variable is an rvalue in an assigment
>+// in a block that is not executed.
>+TEST_F(CollectFragmentVariablesTest, StaticallyUsedButNotActiveAsAssignmentRValue)
>+{
>+    const std::string &shaderString =
>+        R"(#version 300 es
>+        precision mediump float;
>+        out vec4 out_fragColor;
>+        uniform vec4 u;
>+        void main()
>+        {
>+            if (false) {
>+                out_fragColor = u;
>+            }
>+            out_fragColor = vec4(0.0);
>+        })";
>+
>+    compile(shaderString);
>+    checkUniformStaticallyUsedButNotActive("u");
>+}
>+
>+// Test a variable that is statically used but not active. The variable is a comma operator operand
>+// in a block that is not executed.
>+TEST_F(CollectFragmentVariablesTest, StaticallyUsedButNotActiveAsCommaOperand)
>+{
>+    const std::string &shaderString =
>+        R"(#version 300 es
>+        precision mediump float;
>+        out vec4 out_fragColor;
>+        uniform vec4 u;
>+        void main()
>+        {
>+            if (false) {
>+                out_fragColor = u, vec4(1.0);
>+            }
>+            out_fragColor = vec4(0.0);
>+        })";
>+
>+    compile(shaderString);
>+    checkUniformStaticallyUsedButNotActive("u");
>+}
>+
>+// Test a variable that is statically used but not active. The variable is a switch init statement
>+// in a block that is not executed.
>+TEST_F(CollectFragmentVariablesTest, StaticallyUsedButNotActiveAsSwitchInitStatement)
>+{
>+    const std::string &shaderString =
>+        R"(#version 300 es
>+        precision mediump float;
>+        out vec4 out_fragColor;
>+        uniform int u;
>+        void main()
>+        {
>+            if (false)
>+            {
>+                switch (u)
>+                {
>+                    case 1:
>+                        out_fragColor = vec4(2.0);
>+                    default:
>+                        out_fragColor = vec4(1.0);
>+                }
>+            }
>+            out_fragColor = vec4(0.0);
>+        })";
>+
>+    compile(shaderString);
>+    checkUniformStaticallyUsedButNotActive("u");
>+}
>+
>+// Test a variable that is statically used but not active. The variable is a loop condition in a
>+// block that is not executed.
>+TEST_F(CollectFragmentVariablesTest, StaticallyUsedButNotActiveAsLoopCondition)
>+{
>+    const std::string &shaderString =
>+        R"(#version 300 es
>+        precision mediump float;
>+        out vec4 out_fragColor;
>+        uniform bool u;
>+        void main()
>+        {
>+            int counter = 0;
>+            if (false)
>+            {
>+                while (u)
>+                {
>+                    if (++counter > 2)
>+                    {
>+                        break;
>+                    }
>+                }
>+            }
>+            out_fragColor = vec4(0.0);
>+        })";
>+
>+    compile(shaderString);
>+    checkUniformStaticallyUsedButNotActive("u");
>+}
>+
>+// Test a variable that is statically used but not active. The variable is a loop expression in a
>+// block that is not executed.
>+TEST_F(CollectFragmentVariablesTest, StaticallyUsedButNotActiveAsLoopExpression)
>+{
>+    const std::string &shaderString =
>+        R"(#version 300 es
>+        precision mediump float;
>+        out vec4 out_fragColor;
>+        uniform bool u;
>+        void main()
>+        {
>+            if (false)
>+            {
>+                for (int i = 0; i < 3; u)
>+                {
>+                    ++i;
>+                }
>+            }
>+            out_fragColor = vec4(0.0);
>+        })";
>+
>+    compile(shaderString);
>+    checkUniformStaticallyUsedButNotActive("u");
>+}
>+
>+// Test a variable that is statically used but not active. The variable is a vector index in a block
>+// that is not executed.
>+TEST_F(CollectFragmentVariablesTest, StaticallyUsedButNotActiveAsVectorIndex)
>+{
>+    const std::string &shaderString =
>+        R"(#version 300 es
>+        precision mediump float;
>+        out vec4 out_fragColor;
>+        uniform int u;
>+        void main()
>+        {
>+            vec4 color = vec4(0.0);
>+            if (false)
>+            {
>+                color[u] = 1.0;
>+            }
>+            out_fragColor = color;
>+        })";
>+
>+    compile(shaderString);
>+    checkUniformStaticallyUsedButNotActive("u");
>+}
>+
>+// Test a variable that is statically used but not active. The variable is referenced in a block
>+// that's not executed. This is a bit of a corner case with some room for interpretation, but we
>+// treat the variable as statically used.
>+TEST_F(CollectFragmentVariablesTest, StaticallyUsedButNotActiveJustAReference)
>+{
>+    const std::string &shaderString =
>+        R"(#version 300 es
>+        precision mediump float;
>+        out vec4 out_fragColor;
>+        uniform int u;
>+        void main()
>+        {
>+            vec4 color = vec4(0.0);
>+            if (false)
>+            {
>+                u;
>+            }
>+            out_fragColor = color;
>+        })";
>+
>+    compile(shaderString);
>+    checkUniformStaticallyUsedButNotActive("u");
>+}
>+
>+// Test a variable that is statically used but not active. The variable is referenced in a block
>+// without braces that's not executed. This is a bit of a corner case with some room for
>+// interpretation, but we treat the variable as statically used.
>+TEST_F(CollectFragmentVariablesTest, StaticallyUsedButNotActiveJustAReferenceNoBracesIf)
>+{
>+    const std::string &shaderString =
>+        R"(#version 300 es
>+        precision mediump float;
>+        out vec4 out_fragColor;
>+        uniform int u;
>+        void main()
>+        {
>+            vec4 color = vec4(0.0);
>+            if (false)
>+                u;
>+            out_fragColor = color;
>+        })";
>+
>+    compile(shaderString);
>+    checkUniformStaticallyUsedButNotActive("u");
>+}
>+
>+// Test a variable that is referenced in a loop body without braces.
>+TEST_F(CollectFragmentVariablesTest, JustAVariableReferenceInNoBracesLoop)
>+{
>+    const std::string &shaderString =
>+        R"(#version 300 es
>+        precision mediump float;
>+        out vec4 out_fragColor;
>+        uniform int u;
>+        void main()
>+        {
>+            vec4 color = vec4(0.0);
>+            while (false)
>+                u;
>+            out_fragColor = color;
>+        })";
>+
>+    compile(shaderString);
>+
>+    const auto &uniforms = mTranslator->getUniforms();
>+    ASSERT_EQ(1u, uniforms.size());
>+
>+    const Uniform &uniform = uniforms[0];
>+    EXPECT_EQ("u", uniform.name);
>+    EXPECT_TRUE(uniform.staticUse);
>+    // Note that we don't check the active flag here - the usage of the uniform is not currently
>+    // being optimized away.
>+}
>+
>+// Test an interface block member variable that is statically used but not active.
>+TEST_F(CollectVertexVariablesTest, StaticallyUsedButNotActiveSimpleInterfaceBlock)
>+{
>+    const std::string &shaderString =
>+        R"(#version 300 es
>+        uniform b
>+        {
>+            float f;
>+        };
>+        void main() {
>+            gl_Position = vec4(true ? 0.0 : f);
>+        })";
>+
>+    compile(shaderString);
>+
>+    const std::vector<InterfaceBlock> &interfaceBlocks = mTranslator->getInterfaceBlocks();
>+    ASSERT_EQ(1u, interfaceBlocks.size());
>+    const InterfaceBlock &interfaceBlock = interfaceBlocks[0];
>+
>+    EXPECT_EQ("b", interfaceBlock.name);
>+    EXPECT_TRUE(interfaceBlock.staticUse);
>+    EXPECT_FALSE(interfaceBlock.active);
>+
>+    ASSERT_EQ(1u, interfaceBlock.fields.size());
>+    const InterfaceBlockField &field = interfaceBlock.fields[0];
>+
>+    EXPECT_EQ("f", field.name);
>+    EXPECT_TRUE(field.staticUse);
>+    EXPECT_FALSE(field.active);
>+}
>+
>+// Test an interface block instance variable that is statically used but not active.
>+TEST_F(CollectVertexVariablesTest, StaticallyUsedButNotActiveInstancedInterfaceBlock)
>+{
>+    const std::string &shaderString =
>+        R"(#version 300 es
>+        uniform b
>+        {
>+            float f;
>+        } blockInstance;
>+        void main() {
>+            gl_Position = vec4(true ? 0.0 : blockInstance.f);
>+        })";
>+
>+    compile(shaderString);
>+
>+    const std::vector<InterfaceBlock> &interfaceBlocks = mTranslator->getInterfaceBlocks();
>+    ASSERT_EQ(1u, interfaceBlocks.size());
>+    const InterfaceBlock &interfaceBlock = interfaceBlocks[0];
>+
>+    EXPECT_EQ("b", interfaceBlock.name);
>+    EXPECT_TRUE(interfaceBlock.staticUse);
>+    EXPECT_FALSE(interfaceBlock.active);
>+
>+    ASSERT_EQ(1u, interfaceBlock.fields.size());
>+    const InterfaceBlockField &field = interfaceBlock.fields[0];
>+
>+    EXPECT_EQ("f", field.name);
>+    // See TODO in CollectVariables.cpp about tracking instanced interface block field static use.
>+    // EXPECT_TRUE(field.staticUse);
>+    EXPECT_FALSE(field.active);
>+}
>+
>+// Test an interface block member variable that is statically used. The variable is used to call
>+// array length method.
>+TEST_F(CollectVertexVariablesTest, StaticallyUsedInArrayLengthOp)
>+{
>+    const std::string &shaderString =
>+        R"(#version 300 es
>+        uniform b
>+        {
>+            float f[3];
>+        };
>+        void main() {
>+            if (f.length() > 1)
>+            {
>+                gl_Position = vec4(1.0);
>+            }
>+            else
>+            {
>+                gl_Position = vec4(0.0);
>+            }
>+        })";
>+
>+    compile(shaderString);
>+
>+    const std::vector<InterfaceBlock> &interfaceBlocks = mTranslator->getInterfaceBlocks();
>+    ASSERT_EQ(1u, interfaceBlocks.size());
>+    const InterfaceBlock &interfaceBlock = interfaceBlocks[0];
>+
>+    EXPECT_EQ("b", interfaceBlock.name);
>+    EXPECT_TRUE(interfaceBlock.staticUse);
>+}
>+
>+// Test a varying that is declared invariant but not otherwise used.
>+TEST_F(CollectVertexVariablesTest, VaryingOnlyDeclaredInvariant)
>+{
>+    const std::string &shaderString =
>+        R"(precision mediump float;
>+        varying float vf;
>+        invariant vf;
>+        void main()
>+        {
>+        })";
>+
>+    compile(shaderString);
>+
>+    const auto &varyings = mTranslator->getOutputVaryings();
>+    ASSERT_EQ(1u, varyings.size());
>+
>+    const Varying &varying = varyings[0];
>+    EXPECT_EQ("vf", varying.name);
>+    EXPECT_FALSE(varying.staticUse);
>+    EXPECT_FALSE(varying.active);
>+}
>+
>+// Test an output variable that is declared with the index layout qualifier from
>+// EXT_blend_func_extended.
>+TEST_F(CollectFragmentVariablesTest, OutputVarESSL3EXTBlendFuncExtendedIndex)
>+{
>+    const std::string &shaderString =
>+        R"(#version 300 es
>+#extension GL_EXT_blend_func_extended : require
>+precision mediump float;
>+layout(location = 0, index = 1) out float outVar;
>+void main()
>+{
>+    outVar = 0.0;
>+})";
>+
>+    compile(shaderString);
>+
>+    const auto &outputs = mTranslator->getOutputVariables();
>+    ASSERT_EQ(1u, outputs.size());
>+
>+    const OutputVariable &output = outputs[0];
>+    EXPECT_EQ("outVar", output.name);
>+    EXPECT_TRUE(output.staticUse);
>+    EXPECT_TRUE(output.active);
>+    EXPECT_EQ(1, output.index);
>+}
>diff --git a/Source/ThirdParty/ANGLE/src/tests/compiler_tests/ConstantFolding_test.cpp b/Source/ThirdParty/ANGLE/src/tests/compiler_tests/ConstantFolding_test.cpp
>index 0f67362851f..deb28eb117a 100644
>--- a/Source/ThirdParty/ANGLE/src/tests/compiler_tests/ConstantFolding_test.cpp
>+++ b/Source/ThirdParty/ANGLE/src/tests/compiler_tests/ConstantFolding_test.cpp
>@@ -146,18 +146,10 @@ TEST_F(ConstantFoldingTest, Fold2x2MatrixInverse)
>         "   my_Vec = m[0];\n"
>         "}\n";
>     compileAssumeSuccess(shaderString);
>-    float inputElements[] =
>-    {
>-        2.0f, 3.0f,
>-        5.0f, 7.0f
>-    };
>+    float inputElements[] = {2.0f, 3.0f, 5.0f, 7.0f};
>     std::vector<float> input(inputElements, inputElements + 4);
>     ASSERT_FALSE(constantColumnMajorMatrixFoundInAST(input));
>-    float outputElements[] =
>-    {
>-        -7.0f, 3.0f,
>-        5.0f, -2.0f
>-    };
>+    float outputElements[] = {-7.0f, 3.0f, 5.0f, -2.0f};
>     std::vector<float> result(outputElements, outputElements + 4);
>     ASSERT_TRUE(constantColumnMajorMatrixFoundInAST(result));
> }
>@@ -175,23 +167,15 @@ TEST_F(ConstantFoldingTest, Fold3x3MatrixInverse)
>         "                                23.0f, 29.0f, 31.0f,\n"
>         "                                37.0f, 41.0f, 43.0f));\n"
>         "   mat3 m = m3 * mat3(i);\n"
>-        "   my_Vec = m3[0];\n"
>+        "   my_Vec = m[0];\n"
>         "}\n";
>     compileAssumeSuccess(shaderString);
>-    float inputElements[] =
>-    {
>-        11.0f, 13.0f, 19.0f,
>-        23.0f, 29.0f, 31.0f,
>-        37.0f, 41.0f, 43.0f
>-    };
>+    float inputElements[] = {11.0f, 13.0f, 19.0f, 23.0f, 29.0f, 31.0f, 37.0f, 41.0f, 43.0f};
>     std::vector<float> input(inputElements, inputElements + 9);
>     ASSERT_FALSE(constantVectorFoundInAST(input));
>-    float outputElements[] =
>-    {
>-        3.0f / 85.0f, -11.0f / 34.0f, 37.0f / 170.0f,
>-        -79.0f / 340.0f, 23.0f / 68.0f, -12.0f / 85.0f,
>-        13.0f / 68.0f, -3.0f / 68.0f, -1.0f / 34.0f
>-    };
>+    float outputElements[] = {3.0f / 85.0f,    -11.0f / 34.0f, 37.0f / 170.0f,
>+                              -79.0f / 340.0f, 23.0f / 68.0f,  -12.0f / 85.0f,
>+                              13.0f / 68.0f,   -3.0f / 68.0f,  -1.0f / 34.0f};
>     std::vector<float> result(outputElements, outputElements + 9);
>     const float floatFaultTolerance = 0.000001f;
>     ASSERT_TRUE(constantVectorNearFoundInAST(result, floatFaultTolerance));
>@@ -214,22 +198,14 @@ TEST_F(ConstantFoldingTest, Fold4x4MatrixInverse)
>         "   my_Vec = m[0];\n"
>         "}\n";
>     compileAssumeSuccess(shaderString);
>-    float inputElements[] =
>-    {
>-        29.0f, 31.0f, 37.0f, 41.0f,
>-        43.0f, 47.0f, 53.0f, 59.0f,
>-        61.0f, 67.0f, 71.0f, 73.0f,
>-        79.0f, 83.0f, 89.0f, 97.0f
>-    };
>+    float inputElements[] = {29.0f, 31.0f, 37.0f, 41.0f, 43.0f, 47.0f, 53.0f, 59.0f,
>+                             61.0f, 67.0f, 71.0f, 73.0f, 79.0f, 83.0f, 89.0f, 97.0f};
>     std::vector<float> input(inputElements, inputElements + 16);
>     ASSERT_FALSE(constantVectorFoundInAST(input));
>-    float outputElements[] =
>-    {
>-        43.0f / 126.0f, -11.0f / 21.0f, -2.0f / 21.0f, 31.0f / 126.0f,
>-        -5.0f / 7.0f, 9.0f / 14.0f, 1.0f / 14.0f, -1.0f / 7.0f,
>-        85.0f / 126.0f, -11.0f / 21.0f, 43.0f / 210.0f, -38.0f / 315.0f,
>-        -2.0f / 7.0f, 5.0f / 14.0f, -6.0f / 35.0f, 3.0f / 70.0f
>-    };
>+    float outputElements[] = {43.0f / 126.0f, -11.0f / 21.0f, -2.0f / 21.0f,  31.0f / 126.0f,
>+                              -5.0f / 7.0f,   9.0f / 14.0f,   1.0f / 14.0f,   -1.0f / 7.0f,
>+                              85.0f / 126.0f, -11.0f / 21.0f, 43.0f / 210.0f, -38.0f / 315.0f,
>+                              -2.0f / 7.0f,   5.0f / 14.0f,   -6.0f / 35.0f,  3.0f / 70.0f};
>     std::vector<float> result(outputElements, outputElements + 16);
>     const float floatFaultTolerance = 0.00001f;
>     ASSERT_TRUE(constantVectorNearFoundInAST(result, floatFaultTolerance));
>@@ -251,11 +227,7 @@ TEST_F(ConstantFoldingTest, Fold2x2MatrixDeterminant)
>         "   my_Float = f;\n"
>         "}\n";
>     compileAssumeSuccess(shaderString);
>-    float inputElements[] =
>-    {
>-        2.0f, 3.0f,
>-        5.0f, 7.0f
>-    };
>+    float inputElements[] = {2.0f, 3.0f, 5.0f, 7.0f};
>     std::vector<float> input(inputElements, inputElements + 4);
>     ASSERT_FALSE(constantColumnMajorMatrixFoundInAST(input));
>     ASSERT_TRUE(constantFoundInAST(-1.0f));
>@@ -270,17 +242,12 @@ TEST_F(ConstantFoldingTest, Fold3x3MatrixDeterminant)
>         "out float my_Float;"
>         "void main() {\n"
>         "   const float f = determinant(mat3(11.0f, 13.0f, 19.0f,\n"
>-             "                               23.0f, 29.0f, 31.0f,\n"
>+        "                               23.0f, 29.0f, 31.0f,\n"
>         "                                    37.0f, 41.0f, 43.0f));\n"
>         "   my_Float = f;\n"
>         "}\n";
>     compileAssumeSuccess(shaderString);
>-    float inputElements[] =
>-    {
>-        11.0f, 13.0f, 19.0f,
>-        23.0f, 29.0f, 31.0f,
>-        37.0f, 41.0f, 43.0f
>-    };
>+    float inputElements[] = {11.0f, 13.0f, 19.0f, 23.0f, 29.0f, 31.0f, 37.0f, 41.0f, 43.0f};
>     std::vector<float> input(inputElements, inputElements + 9);
>     ASSERT_FALSE(constantColumnMajorMatrixFoundInAST(input));
>     ASSERT_TRUE(constantFoundInAST(-680.0f));
>@@ -301,13 +268,8 @@ TEST_F(ConstantFoldingTest, Fold4x4MatrixDeterminant)
>         "   my_Float = f;\n"
>         "}\n";
>     compileAssumeSuccess(shaderString);
>-    float inputElements[] =
>-    {
>-        29.0f, 31.0f, 37.0f, 41.0f,
>-        43.0f, 47.0f, 53.0f, 59.0f,
>-        61.0f, 67.0f, 71.0f, 73.0f,
>-        79.0f, 83.0f, 89.0f, 97.0f
>-    };
>+    float inputElements[] = {29.0f, 31.0f, 37.0f, 41.0f, 43.0f, 47.0f, 53.0f, 59.0f,
>+                             61.0f, 67.0f, 71.0f, 73.0f, 79.0f, 83.0f, 89.0f, 97.0f};
>     std::vector<float> input(inputElements, inputElements + 16);
>     ASSERT_FALSE(constantColumnMajorMatrixFoundInAST(input));
>     ASSERT_TRUE(constantFoundInAST(-2520.0f));
>@@ -330,20 +292,10 @@ TEST_F(ConstantFoldingTest, Fold3x3MatrixTranspose)
>         "   my_Vec = m[0];\n"
>         "}\n";
>     compileAssumeSuccess(shaderString);
>-    float inputElements[] =
>-    {
>-        11.0f, 13.0f, 19.0f,
>-        23.0f, 29.0f, 31.0f,
>-        37.0f, 41.0f, 43.0f
>-    };
>+    float inputElements[] = {11.0f, 13.0f, 19.0f, 23.0f, 29.0f, 31.0f, 37.0f, 41.0f, 43.0f};
>     std::vector<float> input(inputElements, inputElements + 9);
>     ASSERT_FALSE(constantColumnMajorMatrixFoundInAST(input));
>-    float outputElements[] =
>-    {
>-        11.0f, 23.0f, 37.0f,
>-        13.0f, 29.0f, 41.0f,
>-        19.0f, 31.0f, 43.0f
>-    };
>+    float outputElements[] = {11.0f, 23.0f, 37.0f, 13.0f, 29.0f, 41.0f, 19.0f, 31.0f, 43.0f};
>     std::vector<float> result(outputElements, outputElements + 9);
>     ASSERT_TRUE(constantColumnMajorMatrixFoundInAST(result));
> }
>@@ -436,11 +388,7 @@ TEST_F(ConstantFoldingTest, FoldMat2ConstructorTakingMat2)
>         "   gl_FragColor = vec4(m[0], m[1]);\n"
>         "}\n";
>     compileAssumeSuccess(shaderString);
>-    float outputElements[] =
>-    {
>-        0.0f, 1.0f,
>-        2.0f, 3.0f
>-    };
>+    float outputElements[] = {0.0f, 1.0f, 2.0f, 3.0f};
>     std::vector<float> result(outputElements, outputElements + 4);
>     ASSERT_TRUE(constantColumnMajorMatrixFoundInAST(result));
> }
>@@ -457,11 +405,7 @@ TEST_F(ConstantFoldingTest, FoldMat2ConstructorTakingScalar)
>         "   gl_FragColor = vec4(m[0], m[1]);\n"
>         "}\n";
>     compileAssumeSuccess(shaderString);
>-    float outputElements[] =
>-    {
>-        3.0f, 0.0f,
>-        0.0f, 3.0f
>-    };
>+    float outputElements[] = {3.0f, 0.0f, 0.0f, 3.0f};
>     std::vector<float> result(outputElements, outputElements + 4);
>     ASSERT_TRUE(constantColumnMajorMatrixFoundInAST(result));
> }
>@@ -478,11 +422,7 @@ TEST_F(ConstantFoldingTest, FoldMat2ConstructorTakingMix)
>         "   gl_FragColor = vec4(m[0], m[1]);\n"
>         "}\n";
>     compileAssumeSuccess(shaderString);
>-    float outputElements[] =
>-    {
>-        -1.0, 0.0f,
>-        1.0f, 2.0f
>-    };
>+    float outputElements[] = {-1.0, 0.0f, 1.0f, 2.0f};
>     std::vector<float> result(outputElements, outputElements + 4);
>     ASSERT_TRUE(constantColumnMajorMatrixFoundInAST(result));
> }
>@@ -499,11 +439,7 @@ TEST_F(ConstantFoldingTest, FoldMat2ConstructorTakingMat3)
>         "   gl_FragColor = vec4(m[0], m[1]);\n"
>         "}\n";
>     compileAssumeSuccess(shaderString);
>-    float outputElements[] =
>-    {
>-        0.0f, 1.0f,
>-        3.0f, 4.0f
>-    };
>+    float outputElements[] = {0.0f, 1.0f, 3.0f, 4.0f};
>     std::vector<float> result(outputElements, outputElements + 4);
>     ASSERT_TRUE(constantColumnMajorMatrixFoundInAST(result));
> }
>@@ -524,18 +460,12 @@ TEST_F(ConstantFoldingTest, FoldMat4x3ConstructorTakingMat3x2)
>         "   my_FragColor = vec4(m[0], m[1][0]);\n"
>         "}\n";
>     compileAssumeSuccess(shaderString);
>-    float outputElements[] =
>-    {
>-        1.0f, 2.0f, 0.0f,
>-        3.0f, 4.0f, 0.0f,
>-        5.0f, 6.0f, 1.0f,
>-        0.0f, 0.0f, 0.0f
>-    };
>+    float outputElements[] = {1.0f, 2.0f, 0.0f, 3.0f, 4.0f, 0.0f,
>+                              5.0f, 6.0f, 1.0f, 0.0f, 0.0f, 0.0f};
>     std::vector<float> result(outputElements, outputElements + 12);
>     ASSERT_TRUE(constantColumnMajorMatrixFoundInAST(result));
> }
> 
>-
> // Test that constant mat2 initialization with a vec4 parameter works correctly.
> TEST_F(ConstantFoldingTest, FoldMat2ConstructorTakingVec4)
> {
>@@ -548,11 +478,7 @@ TEST_F(ConstantFoldingTest, FoldMat2ConstructorTakingVec4)
>         "   gl_FragColor = vec4(m[0], m[1]);\n"
>         "}\n";
>     compileAssumeSuccess(shaderString);
>-    float outputElements[] =
>-    {
>-        0.0f, 1.0f,
>-        2.0f, 3.0f
>-    };
>+    float outputElements[] = {0.0f, 1.0f, 2.0f, 3.0f};
>     std::vector<float> result(outputElements, outputElements + 4);
>     ASSERT_TRUE(constantColumnMajorMatrixFoundInAST(result));
> }
>@@ -935,6 +861,13 @@ TEST_F(ConstantFoldingTest, FoldIsInfOutOfRangeFloatLiteral)
>     ASSERT_TRUE(constantFoundInAST(true));
> }
> 
>+// Regression test case of unary + constant folding of a void struct member.
>+TEST_F(ConstantFoldingTest, VoidStructMember)
>+{
>+    constexpr const char *kShaderString = "struct U{void t;}n(){+U().t";
>+    ASSERT_FALSE(compile(kShaderString));
>+}
>+
> // Test that floats that are too small to be represented get flushed to zero.
> // ESSL 3.00.6 section 4.1.4 Floats:
> // "A value with a magnitude too small to be represented as a mantissa and exponent is converted to
>@@ -1417,3 +1350,247 @@ TEST_F(ConstantFoldingExpressionTest, FoldLdexp)
>     evaluateFloat(floatString);
>     ASSERT_TRUE(constantFoundInAST(1.25f));
> }
>+
>+// Fold a ternary operator.
>+TEST_F(ConstantFoldingTest, FoldTernary)
>+{
>+    const std::string &shaderString =
>+        R"(#version 300 es
>+        precision highp int;
>+        uniform int u;
>+        out int my_FragColor;
>+        void main()
>+        {
>+            my_FragColor = (true ? 1 : u);
>+        })";
>+    compileAssumeSuccess(shaderString);
>+    ASSERT_TRUE(constantFoundInAST(1));
>+    ASSERT_FALSE(symbolFoundInMain("u"));
>+}
>+
>+// Fold a ternary operator inside a consuming expression.
>+TEST_F(ConstantFoldingTest, FoldTernaryInsideExpression)
>+{
>+    const std::string &shaderString =
>+        R"(#version 300 es
>+        precision highp int;
>+        uniform int u;
>+        out int my_FragColor;
>+        void main()
>+        {
>+            my_FragColor = ivec2((true ? 1 : u) + 2, 4).x;
>+        })";
>+    compileAssumeSuccess(shaderString);
>+    ASSERT_TRUE(constantFoundInAST(3));
>+    ASSERT_FALSE(symbolFoundInMain("u"));
>+}
>+
>+// Fold indexing into an array constructor.
>+TEST_F(ConstantFoldingExpressionTest, FoldArrayConstructorIndexing)
>+{
>+    const std::string &floatString = "(float[3](-1.0, 1.0, 2.0))[2]";
>+    evaluateFloat(floatString);
>+    ASSERT_FALSE(constantFoundInAST(-1.0f));
>+    ASSERT_FALSE(constantFoundInAST(1.0f));
>+    ASSERT_TRUE(constantFoundInAST(2.0f));
>+}
>+
>+// Fold indexing into an array of arrays constructor.
>+TEST_F(ConstantFoldingExpressionTest, FoldArrayOfArraysConstructorIndexing)
>+{
>+    const std::string &floatString = "(float[2][2](float[2](-1.0, 1.0), float[2](2.0, 3.0)))[1][0]";
>+    evaluateFloat(floatString);
>+    ASSERT_FALSE(constantFoundInAST(-1.0f));
>+    ASSERT_FALSE(constantFoundInAST(1.0f));
>+    ASSERT_FALSE(constantFoundInAST(3.0f));
>+    ASSERT_TRUE(constantFoundInAST(2.0f));
>+}
>+
>+// Fold indexing into a named constant array.
>+TEST_F(ConstantFoldingTest, FoldNamedArrayIndexing)
>+{
>+    const std::string &shaderString =
>+        R"(#version 300 es
>+        precision highp float;
>+        const float[3] arr = float[3](-1.0, 1.0, 2.0);
>+        out float my_FragColor;
>+        void main()
>+        {
>+            my_FragColor = arr[1];
>+        })";
>+    compileAssumeSuccess(shaderString);
>+    ASSERT_FALSE(constantFoundInAST(-1.0f));
>+    ASSERT_FALSE(constantFoundInAST(2.0f));
>+    ASSERT_TRUE(constantFoundInAST(1.0f));
>+    // The variable should be pruned out since after folding the indexing, there are no more
>+    // references to it.
>+    ASSERT_FALSE(symbolFoundInAST("arr"));
>+}
>+
>+// Fold indexing into a named constant array of arrays.
>+TEST_F(ConstantFoldingTest, FoldNamedArrayOfArraysIndexing)
>+{
>+    const std::string &shaderString =
>+        R"(#version 310 es
>+        precision highp float;
>+        const float[2][2] arr = float[2][2](float[2](-1.0, 1.0), float[2](2.0, 3.0));
>+        out float my_FragColor;
>+        void main()
>+        {
>+            my_FragColor = arr[0][1];
>+        })";
>+    compileAssumeSuccess(shaderString);
>+    ASSERT_FALSE(constantFoundInAST(-1.0f));
>+    ASSERT_FALSE(constantFoundInAST(2.0f));
>+    ASSERT_FALSE(constantFoundInAST(3.0f));
>+    ASSERT_TRUE(constantFoundInAST(1.0f));
>+    // The variable should be pruned out since after folding the indexing, there are no more
>+    // references to it.
>+    ASSERT_FALSE(symbolFoundInAST("arr"));
>+}
>+
>+// Fold indexing into an array constructor where some of the arguments are constant and others are
>+// non-constant but without side effects.
>+TEST_F(ConstantFoldingTest, FoldArrayConstructorIndexingWithMixedArguments)
>+{
>+    const std::string &shaderString =
>+        R"(#version 300 es
>+        precision highp float;
>+        uniform float u;
>+        out float my_FragColor;
>+        void main()
>+        {
>+            my_FragColor = float[2](u, 1.0)[1];
>+        })";
>+    compileAssumeSuccess(shaderString);
>+    ASSERT_TRUE(constantFoundInAST(1.0f));
>+    ASSERT_FALSE(constantFoundInAST(1));
>+    ASSERT_FALSE(symbolFoundInMain("u"));
>+}
>+
>+// Indexing into an array constructor where some of the arguments have side effects can't be folded.
>+TEST_F(ConstantFoldingTest, CantFoldArrayConstructorIndexingWithSideEffects)
>+{
>+    const std::string &shaderString =
>+        R"(#version 300 es
>+        precision highp float;
>+        out float my_FragColor;
>+        void main()
>+        {
>+            float sideEffectTarget = 0.0;
>+            float f = float[3](sideEffectTarget = 1.0, 1.0, 2.0)[1];
>+            my_FragColor = f + sideEffectTarget;
>+        })";
>+    compileAssumeSuccess(shaderString);
>+    // All of the array constructor arguments should be present in the final AST.
>+    ASSERT_TRUE(constantFoundInAST(1.0f));
>+    ASSERT_TRUE(constantFoundInAST(2.0f));
>+}
>+
>+// Fold comparing two array constructors.
>+TEST_F(ConstantFoldingTest, FoldArrayConstructorEquality)
>+{
>+    const std::string &shaderString =
>+        R"(#version 300 es
>+        precision highp float;
>+        out float my_FragColor;
>+        void main()
>+        {
>+            const bool b = (float[3](2.0, 1.0, -1.0) == float[3](2.0, 1.0, -1.0));
>+            my_FragColor = b ? 3.0 : 4.0;
>+        })";
>+    compileAssumeSuccess(shaderString);
>+    ASSERT_TRUE(constantFoundInAST(3.0f));
>+    ASSERT_FALSE(constantFoundInAST(4.0f));
>+}
>+
>+// Fold comparing two named constant arrays.
>+TEST_F(ConstantFoldingExpressionTest, FoldNamedArrayEquality)
>+{
>+    const std::string &shaderString =
>+        R"(#version 300 es
>+        precision highp float;
>+        const float[3] arrA = float[3](-1.0, 1.0, 2.0);
>+        const float[3] arrB = float[3](-1.0, 1.0, 2.0);
>+        out float my_FragColor;
>+        void main()
>+        {
>+            const bool b = (arrA == arrB);
>+            my_FragColor = b ? 3.0 : 4.0;
>+        })";
>+    compileAssumeSuccess(shaderString);
>+    ASSERT_TRUE(constantFoundInAST(3.0f));
>+    ASSERT_FALSE(constantFoundInAST(4.0f));
>+}
>+
>+// Fold comparing two array of arrays constructors.
>+TEST_F(ConstantFoldingTest, FoldArrayOfArraysConstructorEquality)
>+{
>+    const std::string &shaderString =
>+        R"(#version 310 es
>+        precision highp float;
>+        out float my_FragColor;
>+        void main()
>+        {
>+            const bool b = (float[2][2](float[2](-1.0, 1.0), float[2](2.0, 3.0)) ==
>+                            float[2][2](float[2](-1.0, 1.0), float[2](2.0, 1000.0)));
>+            my_FragColor = b ? 4.0 : 5.0;
>+        })";
>+    compileAssumeSuccess(shaderString);
>+    ASSERT_TRUE(constantFoundInAST(5.0f));
>+    ASSERT_FALSE(constantFoundInAST(4.0f));
>+}
>+
>+// Test that casting a negative float to uint results in a warning. ESSL 3.00.6 section 5.4.1
>+// specifies this as an undefined conversion.
>+TEST_F(ConstantFoldingExpressionTest, FoldNegativeFloatToUint)
>+{
>+    const std::string &uintString = "uint(-1.0)";
>+    evaluateUint(uintString);
>+    ASSERT_TRUE(constantFoundInAST(std::numeric_limits<unsigned int>::max()));
>+    ASSERT_TRUE(hasWarning());
>+}
>+
>+// Test that casting a negative float to uint inside a uvec constructor results in a warning. ESSL
>+// 3.00.6 section 5.4.1 specifies this as an undefined conversion.
>+TEST_F(ConstantFoldingExpressionTest, FoldNegativeFloatToUvec)
>+{
>+    const std::string &uintString = "uvec4(2.0, 1.0, vec2(0.0, -1.0)).w";
>+    evaluateUint(uintString);
>+    ASSERT_TRUE(constantFoundInAST(std::numeric_limits<unsigned int>::max()));
>+    ASSERT_TRUE(hasWarning());
>+}
>+
>+// Test that a negative float doesn't result in a warning when it is inside a constructor but isn't
>+// actually converted.
>+TEST_F(ConstantFoldingExpressionTest, NegativeFloatInsideUvecConstructorButOutOfRange)
>+{
>+    const std::string &uintString = "uvec2(1.0, vec2(0.0, -1.0)).x";
>+    evaluateUint(uintString);
>+    ASSERT_FALSE(hasWarning());
>+}
>+
>+// Test that a large float (above max int32_t) is converted to unsigned integer correctly.
>+TEST_F(ConstantFoldingExpressionTest, LargeFloatToUint)
>+{
>+    const std::string &uintString = "uint(3221225472.0)";
>+    evaluateUint(uintString);
>+    ASSERT_TRUE(constantFoundInAST(3221225472u));
>+    ASSERT_FALSE(hasWarning());
>+}
>+
>+// Test that folding % with a negative dividend generates a warning.
>+TEST_F(ConstantFoldingExpressionTest, IntegerModulusNegativeDividend)
>+{
>+    const std::string &intString = "(-5) % 3";
>+    evaluateInt(intString);
>+    ASSERT_TRUE(hasWarning());
>+}
>+
>+// Test that folding % with a negative divisor generates a warning.
>+TEST_F(ConstantFoldingExpressionTest, IntegerModulusNegativeDivisor)
>+{
>+    const std::string &intString = "5 % (-3)";
>+    evaluateInt(intString);
>+    ASSERT_TRUE(hasWarning());
>+}
>diff --git a/Source/ThirdParty/ANGLE/src/tests/compiler_tests/ConstructCompiler_test.cpp b/Source/ThirdParty/ANGLE/src/tests/compiler_tests/ConstructCompiler_test.cpp
>index 30829d38712..daa30313c39 100644
>--- a/Source/ThirdParty/ANGLE/src/tests/compiler_tests/ConstructCompiler_test.cpp
>+++ b/Source/ThirdParty/ANGLE/src/tests/compiler_tests/ConstructCompiler_test.cpp
>@@ -7,9 +7,9 @@
> //   Test the sh::ConstructCompiler interface with different parameters.
> //
> 
>+#include "GLSLANG/ShaderLang.h"
> #include "angle_gl.h"
> #include "gtest/gtest.h"
>-#include "GLSLANG/ShaderLang.h"
> 
> // Test default parameters.
> TEST(ConstructCompilerTest, DefaultParameters)
>diff --git a/Source/ThirdParty/ANGLE/src/tests/compiler_tests/DebugShaderPrecision_test.cpp b/Source/ThirdParty/ANGLE/src/tests/compiler_tests/DebugShaderPrecision_test.cpp
>index ded5b961666..76511735da1 100644
>--- a/Source/ThirdParty/ANGLE/src/tests/compiler_tests/DebugShaderPrecision_test.cpp
>+++ b/Source/ThirdParty/ANGLE/src/tests/compiler_tests/DebugShaderPrecision_test.cpp
>@@ -7,9 +7,9 @@
> //   Tests for writing the code for shader precision emulation.
> //
> 
>+#include "GLSLANG/ShaderLang.h"
> #include "angle_gl.h"
> #include "gtest/gtest.h"
>-#include "GLSLANG/ShaderLang.h"
> #include "tests/test_utils/compiler_test.h"
> 
> using namespace sh;
>@@ -47,8 +47,7 @@ class NoDebugShaderPrecisionTest : public MatchOutputCodeTest
>   public:
>     NoDebugShaderPrecisionTest()
>         : MatchOutputCodeTest(GL_FRAGMENT_SHADER, 0, SH_GLSL_COMPATIBILITY_OUTPUT)
>-    {
>-    }
>+    {}
> };
> 
> TEST_F(DebugShaderPrecisionTest, RoundingFunctionsDefined)
>@@ -288,19 +287,17 @@ TEST_F(DebugShaderPrecisionTest, CompoundAddFunction)
>         "   gl_FragColor = v;\n"
>         "}\n";
>     compile(shaderString);
>-    ASSERT_TRUE(foundInESSLCode(
>-        "highp vec4 angle_compound_add_frm(inout highp vec4 x, in highp vec4 y) {\n"
>-        "    x = angle_frm(angle_frm(x) + y);"
>-    ));
>-    ASSERT_TRUE(foundInGLSLCode(
>-        "vec4 angle_compound_add_frm(inout vec4 x, in vec4 y) {\n"
>-        "    x = angle_frm(angle_frm(x) + y);"
>-    ));
>+    ASSERT_TRUE(
>+        foundInESSLCode("highp vec4 angle_compound_add_frm(inout highp vec4 x, in highp vec4 y) {\n"
>+                        "    x = angle_frm(angle_frm(x) + y);"));
>+    ASSERT_TRUE(
>+        foundInGLSLCode("vec4 angle_compound_add_frm(inout vec4 x, in vec4 y) {\n"
>+                        "    x = angle_frm(angle_frm(x) + y);"));
>     ASSERT_TRUE(
>         foundInHLSLCode("float4 angle_compound_add_frm(inout float4 x, in float4 y) {\n"
>                         "    x = angle_frm(angle_frm(x) + y);"));
>     ASSERT_TRUE(foundInAllGLSLCode("angle_compound_add_frm(_uv, angle_frm(_uu2));"));
>-    ASSERT_TRUE(foundInHLSLCode("angle_compound_add_frm(_v, angle_frm(_u2));"));
>+    ASSERT_TRUE(foundInHLSLCode("angle_compound_add_frm(_v1030, angle_frm(_u2));"));
>     ASSERT_TRUE(notFoundInCode("+="));
> }
> 
>@@ -316,19 +313,17 @@ TEST_F(DebugShaderPrecisionTest, CompoundSubFunction)
>         "   gl_FragColor = v;\n"
>         "}\n";
>     compile(shaderString);
>-    ASSERT_TRUE(foundInESSLCode(
>-        "highp vec4 angle_compound_sub_frm(inout highp vec4 x, in highp vec4 y) {\n"
>-        "    x = angle_frm(angle_frm(x) - y);"
>-    ));
>-    ASSERT_TRUE(foundInGLSLCode(
>-        "vec4 angle_compound_sub_frm(inout vec4 x, in vec4 y) {\n"
>-        "    x = angle_frm(angle_frm(x) - y);"
>-    ));
>+    ASSERT_TRUE(
>+        foundInESSLCode("highp vec4 angle_compound_sub_frm(inout highp vec4 x, in highp vec4 y) {\n"
>+                        "    x = angle_frm(angle_frm(x) - y);"));
>+    ASSERT_TRUE(
>+        foundInGLSLCode("vec4 angle_compound_sub_frm(inout vec4 x, in vec4 y) {\n"
>+                        "    x = angle_frm(angle_frm(x) - y);"));
>     ASSERT_TRUE(
>         foundInHLSLCode("float4 angle_compound_sub_frm(inout float4 x, in float4 y) {\n"
>                         "    x = angle_frm(angle_frm(x) - y);"));
>     ASSERT_TRUE(foundInAllGLSLCode("angle_compound_sub_frm(_uv, angle_frm(_uu2));"));
>-    ASSERT_TRUE(foundInHLSLCode("angle_compound_sub_frm(_v, angle_frm(_u2));"));
>+    ASSERT_TRUE(foundInHLSLCode("angle_compound_sub_frm(_v1030, angle_frm(_u2));"));
>     ASSERT_TRUE(notFoundInCode("-="));
> }
> 
>@@ -344,19 +339,17 @@ TEST_F(DebugShaderPrecisionTest, CompoundDivFunction)
>         "   gl_FragColor = v;\n"
>         "}\n";
>     compile(shaderString);
>-    ASSERT_TRUE(foundInESSLCode(
>-        "highp vec4 angle_compound_div_frm(inout highp vec4 x, in highp vec4 y) {\n"
>-        "    x = angle_frm(angle_frm(x) / y);"
>-    ));
>-    ASSERT_TRUE(foundInGLSLCode(
>-        "vec4 angle_compound_div_frm(inout vec4 x, in vec4 y) {\n"
>-        "    x = angle_frm(angle_frm(x) / y);"
>-    ));
>+    ASSERT_TRUE(
>+        foundInESSLCode("highp vec4 angle_compound_div_frm(inout highp vec4 x, in highp vec4 y) {\n"
>+                        "    x = angle_frm(angle_frm(x) / y);"));
>+    ASSERT_TRUE(
>+        foundInGLSLCode("vec4 angle_compound_div_frm(inout vec4 x, in vec4 y) {\n"
>+                        "    x = angle_frm(angle_frm(x) / y);"));
>     ASSERT_TRUE(
>         foundInHLSLCode("float4 angle_compound_div_frm(inout float4 x, in float4 y) {\n"
>                         "    x = angle_frm(angle_frm(x) / y);"));
>     ASSERT_TRUE(foundInAllGLSLCode("angle_compound_div_frm(_uv, angle_frm(_uu2));"));
>-    ASSERT_TRUE(foundInHLSLCode("angle_compound_div_frm(_v, angle_frm(_u2));"));
>+    ASSERT_TRUE(foundInHLSLCode("angle_compound_div_frm(_v1030, angle_frm(_u2));"));
>     ASSERT_TRUE(notFoundInCode("/="));
> }
> 
>@@ -372,19 +365,17 @@ TEST_F(DebugShaderPrecisionTest, CompoundMulFunction)
>         "   gl_FragColor = v;\n"
>         "}\n";
>     compile(shaderString);
>-    ASSERT_TRUE(foundInESSLCode(
>-        "highp vec4 angle_compound_mul_frm(inout highp vec4 x, in highp vec4 y) {\n"
>-        "    x = angle_frm(angle_frm(x) * y);"
>-    ));
>-    ASSERT_TRUE(foundInGLSLCode(
>-        "vec4 angle_compound_mul_frm(inout vec4 x, in vec4 y) {\n"
>-        "    x = angle_frm(angle_frm(x) * y);"
>-    ));
>+    ASSERT_TRUE(
>+        foundInESSLCode("highp vec4 angle_compound_mul_frm(inout highp vec4 x, in highp vec4 y) {\n"
>+                        "    x = angle_frm(angle_frm(x) * y);"));
>+    ASSERT_TRUE(
>+        foundInGLSLCode("vec4 angle_compound_mul_frm(inout vec4 x, in vec4 y) {\n"
>+                        "    x = angle_frm(angle_frm(x) * y);"));
>     ASSERT_TRUE(
>         foundInHLSLCode("float4 angle_compound_mul_frm(inout float4 x, in float4 y) {\n"
>                         "    x = angle_frm(angle_frm(x) * y);"));
>     ASSERT_TRUE(foundInAllGLSLCode("angle_compound_mul_frm(_uv, angle_frm(_uu2));"));
>-    ASSERT_TRUE(foundInHLSLCode("angle_compound_mul_frm(_v, angle_frm(_u2));"));
>+    ASSERT_TRUE(foundInHLSLCode("angle_compound_mul_frm(_v1030, angle_frm(_u2));"));
>     ASSERT_TRUE(notFoundInCode("*="));
> }
> 
>@@ -402,17 +393,15 @@ TEST_F(DebugShaderPrecisionTest, CompoundAddVectorPlusScalarFunction)
>     compile(shaderString);
>     ASSERT_TRUE(foundInESSLCode(
>         "highp vec4 angle_compound_add_frm(inout highp vec4 x, in highp float y) {\n"
>-        "    x = angle_frm(angle_frm(x) + y);"
>-    ));
>-    ASSERT_TRUE(foundInGLSLCode(
>-        "vec4 angle_compound_add_frm(inout vec4 x, in float y) {\n"
>-        "    x = angle_frm(angle_frm(x) + y);"
>-    ));
>+        "    x = angle_frm(angle_frm(x) + y);"));
>+    ASSERT_TRUE(
>+        foundInGLSLCode("vec4 angle_compound_add_frm(inout vec4 x, in float y) {\n"
>+                        "    x = angle_frm(angle_frm(x) + y);"));
>     ASSERT_TRUE(
>         foundInHLSLCode("float4 angle_compound_add_frm(inout float4 x, in float y) {\n"
>                         "    x = angle_frm(angle_frm(x) + y);"));
>     ASSERT_TRUE(foundInAllGLSLCode("angle_compound_add_frm(_uv, angle_frm(_uu2));"));
>-    ASSERT_TRUE(foundInHLSLCode("angle_compound_add_frm(_v, angle_frm(_u2));"));
>+    ASSERT_TRUE(foundInHLSLCode("angle_compound_add_frm(_v1030, angle_frm(_u2));"));
>     ASSERT_TRUE(notFoundInCode("+="));
> }
> 
>@@ -428,19 +417,17 @@ TEST_F(DebugShaderPrecisionTest, CompoundMatrixTimesMatrixFunction)
>         "   gl_FragColor = m[0];\n"
>         "}\n";
>     compile(shaderString);
>-    ASSERT_TRUE(foundInESSLCode(
>-        "highp mat4 angle_compound_mul_frm(inout highp mat4 x, in highp mat4 y) {\n"
>-        "    x = angle_frm(angle_frm(x) * y);"
>-    ));
>-    ASSERT_TRUE(foundInGLSLCode(
>-        "mat4 angle_compound_mul_frm(inout mat4 x, in mat4 y) {\n"
>-        "    x = angle_frm(angle_frm(x) * y);"
>-    ));
>+    ASSERT_TRUE(
>+        foundInESSLCode("highp mat4 angle_compound_mul_frm(inout highp mat4 x, in highp mat4 y) {\n"
>+                        "    x = angle_frm(angle_frm(x) * y);"));
>+    ASSERT_TRUE(
>+        foundInGLSLCode("mat4 angle_compound_mul_frm(inout mat4 x, in mat4 y) {\n"
>+                        "    x = angle_frm(angle_frm(x) * y);"));
>     ASSERT_TRUE(
>         foundInHLSLCode("float4x4 angle_compound_mul_frm(inout float4x4 x, in float4x4 y) {\n"
>                         "    x = angle_frm(angle_frm(x) * y);"));
>     ASSERT_TRUE(foundInAllGLSLCode("angle_compound_mul_frm(_um, angle_frm(_uu2));"));
>-    ASSERT_TRUE(foundInHLSLCode("angle_compound_mul_frm(_m, angle_frm(_u2));"));
>+    ASSERT_TRUE(foundInHLSLCode("angle_compound_mul_frm(_m1030, angle_frm(_u2));"));
>     ASSERT_TRUE(notFoundInCode("*="));
> }
> 
>@@ -470,7 +457,7 @@ TEST_F(DebugShaderPrecisionTest, CompoundNonSquareMatrixTimesMatrixFunction)
>         foundInHLSLCode("float2x4 angle_compound_mul_frm(inout float2x4 x, in float2x2 y) {\n"
>                         "    x = angle_frm(angle_frm(x) * y);"));
>     ASSERT_TRUE(foundInAllGLSLCode("angle_compound_mul_frm(_um, angle_frm(_uu2));"));
>-    ASSERT_TRUE(foundInHLSLCode("angle_compound_mul_frm(_m, angle_frm(_u2));"));
>+    ASSERT_TRUE(foundInHLSLCode("angle_compound_mul_frm(_m1031, angle_frm(_u2));"));
>     ASSERT_TRUE(notFoundInCode("*="));
> }
> 
>@@ -488,17 +475,15 @@ TEST_F(DebugShaderPrecisionTest, CompoundMatrixTimesScalarFunction)
>     compile(shaderString);
>     ASSERT_TRUE(foundInESSLCode(
>         "highp mat4 angle_compound_mul_frm(inout highp mat4 x, in highp float y) {\n"
>-        "    x = angle_frm(angle_frm(x) * y);"
>-    ));
>-    ASSERT_TRUE(foundInGLSLCode(
>-        "mat4 angle_compound_mul_frm(inout mat4 x, in float y) {\n"
>-        "    x = angle_frm(angle_frm(x) * y);"
>-    ));
>+        "    x = angle_frm(angle_frm(x) * y);"));
>+    ASSERT_TRUE(
>+        foundInGLSLCode("mat4 angle_compound_mul_frm(inout mat4 x, in float y) {\n"
>+                        "    x = angle_frm(angle_frm(x) * y);"));
>     ASSERT_TRUE(
>         foundInHLSLCode("float4x4 angle_compound_mul_frm(inout float4x4 x, in float y) {\n"
>                         "    x = angle_frm(angle_frm(x) * y);"));
>     ASSERT_TRUE(foundInAllGLSLCode("angle_compound_mul_frm(_um, angle_frm(_uu2));"));
>-    ASSERT_TRUE(foundInHLSLCode("angle_compound_mul_frm(_m, angle_frm(_u2));"));
>+    ASSERT_TRUE(foundInHLSLCode("angle_compound_mul_frm(_m1030, angle_frm(_u2));"));
>     ASSERT_TRUE(notFoundInCode("*="));
> }
> 
>@@ -514,18 +499,17 @@ TEST_F(DebugShaderPrecisionTest, CompoundVectorTimesMatrixFunction)
>         "   gl_FragColor = v;\n"
>         "}\n";
>     compile(shaderString);
>-    ASSERT_TRUE(foundInESSLCode(
>-        "highp vec4 angle_compound_mul_frm(inout highp vec4 x, in highp mat4 y) {\n"
>-        "    x = angle_frm(angle_frm(x) * y);"
>-    ));
>-    ASSERT_TRUE(foundInGLSLCode("vec4 angle_compound_mul_frm(inout vec4 x, in mat4 y) {\n"
>-        "    x = angle_frm(angle_frm(x) * y);"
>-    ));
>+    ASSERT_TRUE(
>+        foundInESSLCode("highp vec4 angle_compound_mul_frm(inout highp vec4 x, in highp mat4 y) {\n"
>+                        "    x = angle_frm(angle_frm(x) * y);"));
>+    ASSERT_TRUE(
>+        foundInGLSLCode("vec4 angle_compound_mul_frm(inout vec4 x, in mat4 y) {\n"
>+                        "    x = angle_frm(angle_frm(x) * y);"));
>     ASSERT_TRUE(
>         foundInHLSLCode("float4 angle_compound_mul_frm(inout float4 x, in float4x4 y) {\n"
>                         "    x = angle_frm(angle_frm(x) * y);"));
>     ASSERT_TRUE(foundInAllGLSLCode("angle_compound_mul_frm(_uv, angle_frm(_uu2));"));
>-    ASSERT_TRUE(foundInHLSLCode("angle_compound_mul_frm(_v, angle_frm(_u2));"));
>+    ASSERT_TRUE(foundInHLSLCode("angle_compound_mul_frm(_v1030, angle_frm(_u2));"));
>     ASSERT_TRUE(notFoundInCode("*="));
> }
> 
>@@ -543,17 +527,15 @@ TEST_F(DebugShaderPrecisionTest, CompoundVectorTimesScalarFunction)
>     compile(shaderString);
>     ASSERT_TRUE(foundInESSLCode(
>         "highp vec4 angle_compound_mul_frm(inout highp vec4 x, in highp float y) {\n"
>-        "    x = angle_frm(angle_frm(x) * y);"
>-    ));
>-    ASSERT_TRUE(foundInGLSLCode(
>-        "vec4 angle_compound_mul_frm(inout vec4 x, in float y) {\n"
>-        "    x = angle_frm(angle_frm(x) * y);"
>-    ));
>+        "    x = angle_frm(angle_frm(x) * y);"));
>+    ASSERT_TRUE(
>+        foundInGLSLCode("vec4 angle_compound_mul_frm(inout vec4 x, in float y) {\n"
>+                        "    x = angle_frm(angle_frm(x) * y);"));
>     ASSERT_TRUE(
>         foundInHLSLCode("float4 angle_compound_mul_frm(inout float4 x, in float y) {\n"
>                         "    x = angle_frm(angle_frm(x) * y);"));
>     ASSERT_TRUE(foundInAllGLSLCode("angle_compound_mul_frm(_uv, angle_frm(_uu2));"));
>-    ASSERT_TRUE(foundInHLSLCode("angle_compound_mul_frm(_v, angle_frm(_u2));"));
>+    ASSERT_TRUE(foundInHLSLCode("angle_compound_mul_frm(_v1030, angle_frm(_u2));"));
>     ASSERT_TRUE(notFoundInCode("*="));
> }
> 
>@@ -582,11 +564,11 @@ TEST_F(DebugShaderPrecisionTest, BinaryMathRounding)
>     ASSERT_TRUE(foundInAllGLSLCode("v4 = angle_frm((angle_frm(_uu4) / angle_frm(_uu5)))"));
>     ASSERT_TRUE(foundInAllGLSLCode("v6 = angle_frm((_uv5 = angle_frm(_uu5)))"));
> 
>-    ASSERT_TRUE(foundInHLSLCode("v1 = angle_frm((angle_frm(_u1) + angle_frm(_u2)))"));
>-    ASSERT_TRUE(foundInHLSLCode("v2 = angle_frm((angle_frm(_u2) - angle_frm(_u3)))"));
>-    ASSERT_TRUE(foundInHLSLCode("v3 = angle_frm((angle_frm(_u3) * angle_frm(_u4)))"));
>-    ASSERT_TRUE(foundInHLSLCode("v4 = angle_frm((angle_frm(_u4) / angle_frm(_u5)))"));
>-    ASSERT_TRUE(foundInHLSLCode("v6 = angle_frm((_v5 = angle_frm(_u5)))"));
>+    ASSERT_TRUE(foundInHLSLCode("v11033 = angle_frm((angle_frm(_u1) + angle_frm(_u2)))"));
>+    ASSERT_TRUE(foundInHLSLCode("v21034 = angle_frm((angle_frm(_u2) - angle_frm(_u3)))"));
>+    ASSERT_TRUE(foundInHLSLCode("v31035 = angle_frm((angle_frm(_u3) * angle_frm(_u4)))"));
>+    ASSERT_TRUE(foundInHLSLCode("v41036 = angle_frm((angle_frm(_u4) / angle_frm(_u5)))"));
>+    ASSERT_TRUE(foundInHLSLCode("v61038 = angle_frm((_v51037 = angle_frm(_u5)))"));
> }
> 
> TEST_F(DebugShaderPrecisionTest, BuiltInMathFunctionRounding)
>@@ -650,10 +632,10 @@ TEST_F(DebugShaderPrecisionTest, BuiltInMathFunctionRounding)
>         "   mat4 m1 = matrixCompMult(um1, um2);\n"
> 
>         "   gl_FragColor = v1 + v2 + v3 + v4 + v5 + v6 + v7 + v8 + v9 + v10 +"
>-            "v11 + v12 + v13 + v14 + v15 + v16 + v17 + v18 + v19 + v20 +"
>-            "v21 + v22 + v23 + v24 + v25 + v26 + v27 + v28 + v29 + v30 +"
>-            "v31 + v32 + v33 + v34 + v35 + v36 + v37 + v38 + v39 +"
>-            "vec4(f1, f2, f3, 0.0) + vec4(vf31, 0.0) + m1[0];\n"
>+        "v11 + v12 + v13 + v14 + v15 + v16 + v17 + v18 + v19 + v20 +"
>+        "v21 + v22 + v23 + v24 + v25 + v26 + v27 + v28 + v29 + v30 +"
>+        "v31 + v32 + v33 + v34 + v35 + v36 + v37 + v38 + v39 +"
>+        "vec4(f1, f2, f3, 0.0) + vec4(vf31, 0.0) + m1[0];\n"
>         "}\n";
>     compile(shaderString);
>     ASSERT_TRUE(foundInAllGLSLCode("v1 = angle_frm(radians(angle_frm(_uu1)))"));
>@@ -712,59 +694,59 @@ TEST_F(DebugShaderPrecisionTest, BuiltInMathFunctionRounding)
>     ASSERT_TRUE(
>         foundInAllGLSLCode("m1 = angle_frm(matrixCompMult(angle_frm(_uum1), angle_frm(_uum2)))"));
> 
>-    ASSERT_TRUE(foundInHLSLCode("v1 = angle_frm(radians(angle_frm(_u1)))"));
>-    ASSERT_TRUE(foundInHLSLCode("v2 = angle_frm(degrees(angle_frm(_u1)))"));
>-    ASSERT_TRUE(foundInHLSLCode("v3 = angle_frm(sin(angle_frm(_u1)))"));
>-    ASSERT_TRUE(foundInHLSLCode("v4 = angle_frm(cos(angle_frm(_u1)))"));
>-    ASSERT_TRUE(foundInHLSLCode("v5 = angle_frm(tan(angle_frm(_u1)))"));
>-    ASSERT_TRUE(foundInHLSLCode("v6 = angle_frm(asin(angle_frm(_u1)))"));
>-    ASSERT_TRUE(foundInHLSLCode("v7 = angle_frm(acos(angle_frm(_u1)))"));
>-    ASSERT_TRUE(foundInHLSLCode("v8 = angle_frm(atan(angle_frm(_u1)))"));
>-    ASSERT_TRUE(foundInHLSLCode("v9 = angle_frm(atan_emu(angle_frm(_u1), angle_frm(_u2)))"));
>-    ASSERT_TRUE(foundInHLSLCode("v10 = angle_frm(pow(angle_frm(_u1), angle_frm(_u2)))"));
>-    ASSERT_TRUE(foundInHLSLCode("v11 = angle_frm(exp(angle_frm(_u1)))"));
>-    ASSERT_TRUE(foundInHLSLCode("v12 = angle_frm(log(angle_frm(_u1)))"));
>-    ASSERT_TRUE(foundInHLSLCode("v13 = angle_frm(exp2(angle_frm(_u1)))"));
>-    ASSERT_TRUE(foundInHLSLCode("v14 = angle_frm(log2(angle_frm(_u1)))"));
>-    ASSERT_TRUE(foundInHLSLCode("v15 = angle_frm(sqrt(angle_frm(_u1)))"));
>-    ASSERT_TRUE(foundInHLSLCode("v16 = angle_frm(rsqrt(angle_frm(_u1)))"));
>-    ASSERT_TRUE(foundInHLSLCode("v17 = angle_frm(abs(angle_frm(_u1)))"));
>-    ASSERT_TRUE(foundInHLSLCode("v18 = angle_frm(sign(angle_frm(_u1)))"));
>-    ASSERT_TRUE(foundInHLSLCode("v19 = angle_frm(floor(angle_frm(_u1)))"));
>-    ASSERT_TRUE(foundInHLSLCode("v20 = angle_frm(ceil(angle_frm(_u1)))"));
>-    ASSERT_TRUE(foundInHLSLCode("v21 = angle_frm(frac(angle_frm(_u1)))"));
>-    ASSERT_TRUE(foundInHLSLCode("v22 = angle_frm(mod_emu(angle_frm(_u1), angle_frm(_uf)))"));
>-    ASSERT_TRUE(foundInHLSLCode("v23 = angle_frm(mod_emu(angle_frm(_u1), angle_frm(_u2)))"));
>-    ASSERT_TRUE(foundInHLSLCode("v24 = angle_frm(min(angle_frm(_u1), angle_frm(_uf)))"));
>-    ASSERT_TRUE(foundInHLSLCode("v25 = angle_frm(min(angle_frm(_u1), angle_frm(_u2)))"));
>-    ASSERT_TRUE(foundInHLSLCode("v26 = angle_frm(max(angle_frm(_u1), angle_frm(_uf)))"));
>-    ASSERT_TRUE(foundInHLSLCode("v27 = angle_frm(max(angle_frm(_u1), angle_frm(_u2)))"));
>-    ASSERT_TRUE(
>-        foundInHLSLCode("v28 = angle_frm(clamp(angle_frm(_u1), angle_frm(_u2), angle_frm(_u3)))"));
>-    ASSERT_TRUE(
>-        foundInHLSLCode("v29 = angle_frm(clamp(angle_frm(_u1), angle_frm(_uf), angle_frm(_uf2)))"));
>-    ASSERT_TRUE(
>-        foundInHLSLCode("v30 = angle_frm(lerp(angle_frm(_u1), angle_frm(_u2), angle_frm(_u3)))"));
>-    ASSERT_TRUE(
>-        foundInHLSLCode("v31 = angle_frm(lerp(angle_frm(_u1), angle_frm(_u2), angle_frm(_uf)))"));
>-    ASSERT_TRUE(foundInHLSLCode("v32 = angle_frm(step(angle_frm(_u1), angle_frm(_u2)))"));
>-    ASSERT_TRUE(foundInHLSLCode("v33 = angle_frm(step(angle_frm(_uf), angle_frm(_u1)))"));
>+    ASSERT_TRUE(foundInHLSLCode("v11037 = angle_frm(radians(angle_frm(_u1)))"));
>+    ASSERT_TRUE(foundInHLSLCode("v21038 = angle_frm(degrees(angle_frm(_u1)))"));
>+    ASSERT_TRUE(foundInHLSLCode("v31039 = angle_frm(sin(angle_frm(_u1)))"));
>+    ASSERT_TRUE(foundInHLSLCode("v41040 = angle_frm(cos(angle_frm(_u1)))"));
>+    ASSERT_TRUE(foundInHLSLCode("v51041 = angle_frm(tan(angle_frm(_u1)))"));
>+    ASSERT_TRUE(foundInHLSLCode("v61042 = angle_frm(asin(angle_frm(_u1)))"));
>+    ASSERT_TRUE(foundInHLSLCode("v71043 = angle_frm(acos(angle_frm(_u1)))"));
>+    ASSERT_TRUE(foundInHLSLCode("v81044 = angle_frm(atan(angle_frm(_u1)))"));
>+    ASSERT_TRUE(foundInHLSLCode("v91045 = angle_frm(atan_emu(angle_frm(_u1), angle_frm(_u2)))"));
>+    ASSERT_TRUE(foundInHLSLCode("v101046 = angle_frm(pow(angle_frm(_u1), angle_frm(_u2)))"));
>+    ASSERT_TRUE(foundInHLSLCode("v111047 = angle_frm(exp(angle_frm(_u1)))"));
>+    ASSERT_TRUE(foundInHLSLCode("v121048 = angle_frm(log(angle_frm(_u1)))"));
>+    ASSERT_TRUE(foundInHLSLCode("v131049 = angle_frm(exp2(angle_frm(_u1)))"));
>+    ASSERT_TRUE(foundInHLSLCode("v141050 = angle_frm(log2(angle_frm(_u1)))"));
>+    ASSERT_TRUE(foundInHLSLCode("v151051 = angle_frm(sqrt(angle_frm(_u1)))"));
>+    ASSERT_TRUE(foundInHLSLCode("v161052 = angle_frm(rsqrt(angle_frm(_u1)))"));
>+    ASSERT_TRUE(foundInHLSLCode("v171053 = angle_frm(abs(angle_frm(_u1)))"));
>+    ASSERT_TRUE(foundInHLSLCode("v181054 = angle_frm(sign(angle_frm(_u1)))"));
>+    ASSERT_TRUE(foundInHLSLCode("v191055 = angle_frm(floor(angle_frm(_u1)))"));
>+    ASSERT_TRUE(foundInHLSLCode("v201056 = angle_frm(ceil(angle_frm(_u1)))"));
>+    ASSERT_TRUE(foundInHLSLCode("v211057 = angle_frm(frac(angle_frm(_u1)))"));
>+    ASSERT_TRUE(foundInHLSLCode("v221058 = angle_frm(mod_emu(angle_frm(_u1), angle_frm(_uf)))"));
>+    ASSERT_TRUE(foundInHLSLCode("v231059 = angle_frm(mod_emu(angle_frm(_u1), angle_frm(_u2)))"));
>+    ASSERT_TRUE(foundInHLSLCode("v241060 = angle_frm(min(angle_frm(_u1), angle_frm(_uf)))"));
>+    ASSERT_TRUE(foundInHLSLCode("v251061 = angle_frm(min(angle_frm(_u1), angle_frm(_u2)))"));
>+    ASSERT_TRUE(foundInHLSLCode("v261062 = angle_frm(max(angle_frm(_u1), angle_frm(_uf)))"));
>+    ASSERT_TRUE(foundInHLSLCode("v271063 = angle_frm(max(angle_frm(_u1), angle_frm(_u2)))"));
>+    ASSERT_TRUE(foundInHLSLCode(
>+        "v281064 = angle_frm(clamp(angle_frm(_u1), angle_frm(_u2), angle_frm(_u3)))"));
>+    ASSERT_TRUE(foundInHLSLCode(
>+        "v291065 = angle_frm(clamp(angle_frm(_u1), angle_frm(_uf), angle_frm(_uf2)))"));
>     ASSERT_TRUE(foundInHLSLCode(
>-        "v34 = angle_frm(smoothstep(angle_frm(_u1), angle_frm(_u2), angle_frm(_u3)))"));
>+        "v301066 = angle_frm(lerp(angle_frm(_u1), angle_frm(_u2), angle_frm(_u3)))"));
>     ASSERT_TRUE(foundInHLSLCode(
>-        "v35 = angle_frm(smoothstep(angle_frm(_uf), angle_frm(_uf2), angle_frm(_u1)))"));
>-    ASSERT_TRUE(foundInHLSLCode("v36 = angle_frm(normalize(angle_frm(_u1)))"));
>+        "v311067 = angle_frm(lerp(angle_frm(_u1), angle_frm(_u2), angle_frm(_uf)))"));
>+    ASSERT_TRUE(foundInHLSLCode("v321068 = angle_frm(step(angle_frm(_u1), angle_frm(_u2)))"));
>+    ASSERT_TRUE(foundInHLSLCode("v331069 = angle_frm(step(angle_frm(_uf), angle_frm(_u1)))"));
>     ASSERT_TRUE(foundInHLSLCode(
>-        "v37 = angle_frm(faceforward_emu(angle_frm(_u1), angle_frm(_u2), angle_frm(_u3)))"));
>-    ASSERT_TRUE(foundInHLSLCode("v38 = angle_frm(reflect(angle_frm(_u1), angle_frm(_u2)))"));
>+        "v341070 = angle_frm(smoothstep(angle_frm(_u1), angle_frm(_u2), angle_frm(_u3)))"));
>     ASSERT_TRUE(foundInHLSLCode(
>-        "v39 = angle_frm(refract(angle_frm(_u1), angle_frm(_u2), angle_frm(_uf)))"));
>+        "v351071 = angle_frm(smoothstep(angle_frm(_uf), angle_frm(_uf2), angle_frm(_u1)))"));
>+    ASSERT_TRUE(foundInHLSLCode("v361072 = angle_frm(normalize(angle_frm(_u1)))"));
>+    ASSERT_TRUE(foundInHLSLCode(
>+        "v371073 = angle_frm(faceforward_emu(angle_frm(_u1), angle_frm(_u2), angle_frm(_u3)))"));
>+    ASSERT_TRUE(foundInHLSLCode("v381074 = angle_frm(reflect(angle_frm(_u1), angle_frm(_u2)))"));
>+    ASSERT_TRUE(foundInHLSLCode(
>+        "v391075 = angle_frm(refract(angle_frm(_u1), angle_frm(_u2), angle_frm(_uf)))"));
> 
>-    ASSERT_TRUE(foundInHLSLCode("f1 = angle_frm(length(angle_frm(_u1)))"));
>-    ASSERT_TRUE(foundInHLSLCode("f2 = angle_frm(distance(angle_frm(_u1), angle_frm(_u2)))"));
>-    ASSERT_TRUE(foundInHLSLCode("f3 = angle_frm(dot(angle_frm(_u1), angle_frm(_u2)))"));
>-    ASSERT_TRUE(foundInHLSLCode("vf31 = angle_frm(cross(angle_frm(_uf31), angle_frm(_uf32)))"));
>-    ASSERT_TRUE(foundInHLSLCode("m1 = angle_frm((angle_frm(_um1) * angle_frm(_um2)))"));
>+    ASSERT_TRUE(foundInHLSLCode("f11076 = angle_frm(length(angle_frm(_u1)))"));
>+    ASSERT_TRUE(foundInHLSLCode("f21077 = angle_frm(distance(angle_frm(_u1), angle_frm(_u2)))"));
>+    ASSERT_TRUE(foundInHLSLCode("f31078 = angle_frm(dot(angle_frm(_u1), angle_frm(_u2)))"));
>+    ASSERT_TRUE(foundInHLSLCode("vf311079 = angle_frm(cross(angle_frm(_uf31), angle_frm(_uf32)))"));
>+    ASSERT_TRUE(foundInHLSLCode("m11080 = angle_frm((angle_frm(_um1) * angle_frm(_um2)))"));
> }
> 
> TEST_F(DebugShaderPrecisionTest, BuiltInRelationalFunctionRounding)
>@@ -790,12 +772,12 @@ TEST_F(DebugShaderPrecisionTest, BuiltInRelationalFunctionRounding)
>     ASSERT_TRUE(foundInAllGLSLCode("bv5 = equal(angle_frm(_uu1), angle_frm(_uu2))"));
>     ASSERT_TRUE(foundInAllGLSLCode("bv6 = notEqual(angle_frm(_uu1), angle_frm(_uu2))"));
> 
>-    ASSERT_TRUE(foundInHLSLCode("bv1 = (angle_frm(_u1) < angle_frm(_u2))"));
>-    ASSERT_TRUE(foundInHLSLCode("bv2 = (angle_frm(_u1) <= angle_frm(_u2))"));
>-    ASSERT_TRUE(foundInHLSLCode("bv3 = (angle_frm(_u1) > angle_frm(_u2))"));
>-    ASSERT_TRUE(foundInHLSLCode("bv4 = (angle_frm(_u1) >= angle_frm(_u2))"));
>-    ASSERT_TRUE(foundInHLSLCode("bv5 = (angle_frm(_u1) == angle_frm(_u2))"));
>-    ASSERT_TRUE(foundInHLSLCode("bv6 = (angle_frm(_u1) != angle_frm(_u2))"));
>+    ASSERT_TRUE(foundInHLSLCode("bv11030 = (angle_frm(_u1) < angle_frm(_u2))"));
>+    ASSERT_TRUE(foundInHLSLCode("bv21031 = (angle_frm(_u1) <= angle_frm(_u2))"));
>+    ASSERT_TRUE(foundInHLSLCode("bv31032 = (angle_frm(_u1) > angle_frm(_u2))"));
>+    ASSERT_TRUE(foundInHLSLCode("bv41033 = (angle_frm(_u1) >= angle_frm(_u2))"));
>+    ASSERT_TRUE(foundInHLSLCode("bv51034 = (angle_frm(_u1) == angle_frm(_u2))"));
>+    ASSERT_TRUE(foundInHLSLCode("bv61035 = (angle_frm(_u1) != angle_frm(_u2))"));
> }
> 
> TEST_F(DebugShaderPrecisionTest, ConstructorRounding)
>@@ -817,8 +799,8 @@ TEST_F(DebugShaderPrecisionTest, ConstructorRounding)
>     ASSERT_TRUE(foundInAllGLSLCode("v1 = angle_frm(vec4(_uu1, _uu2, angle_frl(_uu3), _uu4))"));
>     ASSERT_TRUE(foundInAllGLSLCode("v2 = angle_frm(vec4(_uuiv))"));
> 
>-    ASSERT_TRUE(foundInHLSLCode("v1 = angle_frm(vec4_ctor(_u1, _u2, angle_frl(_u3), _u4))"));
>-    ASSERT_TRUE(foundInHLSLCode("v2 = angle_frm(vec4_ctor(_uiv))"));
>+    ASSERT_TRUE(foundInHLSLCode("v11033 = angle_frm(vec4_ctor(_u1, _u2, angle_frl(_u3), _u4))"));
>+    ASSERT_TRUE(foundInHLSLCode("v21034 = angle_frm(vec4_ctor(_uiv))"));
> }
> 
> TEST_F(DebugShaderPrecisionTest, StructConstructorNoRounding)
>@@ -833,7 +815,7 @@ TEST_F(DebugShaderPrecisionTest, StructConstructorNoRounding)
>         "}\n";
>     compile(shaderString);
>     ASSERT_TRUE(foundInAllGLSLCode("s = _uS(angle_frm(_uu))"));
>-    ASSERT_TRUE(foundInHLSLCode("s = _S_ctor(angle_frm(_u))"));
>+    ASSERT_TRUE(foundInHLSLCode("s1031 = _S_ctor(angle_frm(_u))"));
>     ASSERT_TRUE(notFoundInCode("angle_frm(_uS"));  // GLSL
>     ASSERT_TRUE(notFoundInCode("angle_frm(_S"));   // HLSL
> }
>@@ -849,7 +831,7 @@ TEST_F(DebugShaderPrecisionTest, SwizzleRounding)
>         "}\n";
>     compile(shaderString);
>     ASSERT_TRUE(foundInAllGLSLCode("v = angle_frm(_uu).xyxy"));
>-    ASSERT_TRUE(foundInHLSLCode("v = angle_frm(_u).xyxy"));
>+    ASSERT_TRUE(foundInHLSLCode("v1029 = angle_frm(_u).xyxy"));
> }
> 
> TEST_F(DebugShaderPrecisionTest, BuiltInTexFunctionRounding)
>@@ -865,7 +847,7 @@ TEST_F(DebugShaderPrecisionTest, BuiltInTexFunctionRounding)
>         "}\n";
>     compile(shaderString);
>     ASSERT_TRUE(foundInAllGLSLCode("v = angle_frl(texture2D(_us, angle_frm(_uu)))"));
>-    ASSERT_TRUE(foundInHLSLCode("v = angle_frl(gl_texture2D(_s, angle_frm(_u)))"));
>+    ASSERT_TRUE(foundInHLSLCode("v1030 = angle_frl(gl_texture2D(_s, angle_frm(_u)))"));
> }
> 
> TEST_F(DebugShaderPrecisionTest, FunctionCallParameterQualifiersFromDefinition)
>@@ -900,14 +882,14 @@ TEST_F(DebugShaderPrecisionTest, FunctionCallParameterQualifiersFromDefinition)
>     // otherwise.
>     // Test in parameters
>     ASSERT_TRUE(foundInAllGLSLCode("v = _uadd(angle_frm(_uu1), angle_frm(_uu2))"));
>-    ASSERT_TRUE(foundInHLSLCode("v = f_add_float4_float4(angle_frm(_u1), angle_frm(_u2))"));
>+    ASSERT_TRUE(foundInHLSLCode("v1043 = f_add_float4_float4(angle_frm(_u1), angle_frm(_u2))"));
>     // Test inout parameter
>     ASSERT_TRUE(foundInAllGLSLCode("_ucompound_add(_uv, angle_frm(_uu3))"));
>-    ASSERT_TRUE(foundInHLSLCode("compound_add_float4_float4(_v, angle_frm(_u3))"));
>+    ASSERT_TRUE(foundInHLSLCode("compound_add_float4_float4(_v1043, angle_frm(_u3))"));
>     // Test out parameter
>     ASSERT_TRUE(foundInAllGLSLCode("_uadd_to_last(angle_frm(_uu4), angle_frm(_uu5), _uv2)"));
>-    ASSERT_TRUE(
>-        foundInHLSLCode("add_to_last_float4_float4_float4(angle_frm(_u4), angle_frm(_u5), _v2)"));
>+    ASSERT_TRUE(foundInHLSLCode(
>+        "add_to_last_float4_float4_float4(angle_frm(_u4), angle_frm(_u5), _v21044)"));
> }
> 
> TEST_F(DebugShaderPrecisionTest, FunctionCallParameterQualifiersFromPrototype)
>@@ -941,14 +923,14 @@ TEST_F(DebugShaderPrecisionTest, FunctionCallParameterQualifiersFromPrototype)
>     compile(shaderString);
>     // Test in parameters
>     ASSERT_TRUE(foundInAllGLSLCode("v = _uadd(angle_frm(_uu1), angle_frm(_uu2))"));
>-    ASSERT_TRUE(foundInHLSLCode("v = f_add_float4_float4(angle_frm(_u1), angle_frm(_u2))"));
>+    ASSERT_TRUE(foundInHLSLCode("v1043 = f_add_float4_float4(angle_frm(_u1), angle_frm(_u2))"));
>     // Test inout parameter
>     ASSERT_TRUE(foundInAllGLSLCode("_ucompound_add(_uv, angle_frm(_uu3))"));
>-    ASSERT_TRUE(foundInHLSLCode("compound_add_float4_float4(_v, angle_frm(_u3))"));
>+    ASSERT_TRUE(foundInHLSLCode("compound_add_float4_float4(_v1043, angle_frm(_u3))"));
>     // Test out parameter
>     ASSERT_TRUE(foundInAllGLSLCode("add_to_last(angle_frm(_uu4), angle_frm(_uu5), _uv2)"));
>-    ASSERT_TRUE(
>-        foundInHLSLCode("add_to_last_float4_float4_float4(angle_frm(_u4), angle_frm(_u5), _v2)"));
>+    ASSERT_TRUE(foundInHLSLCode(
>+        "add_to_last_float4_float4_float4(angle_frm(_u4), angle_frm(_u5), _v21044)"));
> }
> 
> TEST_F(DebugShaderPrecisionTest, NestedFunctionCalls)
>@@ -975,7 +957,7 @@ TEST_F(DebugShaderPrecisionTest, NestedFunctionCalls)
>     ASSERT_TRUE(foundInAllGLSLCode(
>         "v2 = _uadd(_ucompound_add(_uv, angle_frm(_uu2)), angle_frm(fract(angle_frm(_uu3))))"));
>     ASSERT_TRUE(foundInHLSLCode(
>-        "v2 = f_add_float4_float4(f_compound_add_float4_float4(_v, angle_frm(_u2)), "
>+        "v21038 = f_add_float4_float4(f_compound_add_float4_float4(_v1037, angle_frm(_u2)), "
>         "angle_frm(frac(angle_frm(_u3))))"));
> }
> 
>@@ -1028,7 +1010,7 @@ TEST_F(DebugShaderPrecisionTest, ModfOutParameter)
>         "}\n";
>     compile(shaderString);
>     ASSERT_TRUE(foundInAllGLSLCode("modf(angle_frm(_uu), _uo)"));
>-    ASSERT_TRUE(foundInHLSLCode("modf(angle_frm(_u), _o)"));
>+    ASSERT_TRUE(foundInHLSLCode("modf(angle_frm(_u), _o1030)"));
> }
> 
> #if defined(ANGLE_ENABLE_HLSL)
>diff --git a/Source/ThirdParty/ANGLE/src/tests/compiler_tests/EXT_YUV_target_test.cpp b/Source/ThirdParty/ANGLE/src/tests/compiler_tests/EXT_YUV_target_test.cpp
>index 6b247b16b96..821fcfec825 100644
>--- a/Source/ThirdParty/ANGLE/src/tests/compiler_tests/EXT_YUV_target_test.cpp
>+++ b/Source/ThirdParty/ANGLE/src/tests/compiler_tests/EXT_YUV_target_test.cpp
>@@ -7,17 +7,13 @@
> //   Test for EXT_YUV_target implementation.
> //
> 
>-#include "angle_gl.h"
>-#include "gtest/gtest.h"
>-#include "GLSLANG/ShaderLang.h"
>+#include "tests/test_utils/ShaderExtensionTest.h"
> 
>-using testing::Combine;
>-using testing::Values;
>+using EXTYUVTargetTest = sh::ShaderExtensionTest;
> 
> namespace
> {
>-const char ESSLVersion300[] = "#version 300 es\n";
>-const char EXTYTPragma[]    = "#extension GL_EXT_YUV_target : require\n";
>+const char EXTYTPragma[] = "#extension GL_EXT_YUV_target : require\n";
> 
> const char ESSL300_SimpleShader[] =
>     "precision mediump float;\n"
>@@ -220,60 +216,29 @@ const char ESSL300_BuiltInFunctionsShader[] =
>         my_color = vec4(rgb, 1.0);
>     })";
> 
>-class EXTYUVTargetTest : public testing::TestWithParam<testing::tuple<const char *, const char *>>
>-{
>-  protected:
>-    virtual void SetUp()
>-    {
>-        sh::InitBuiltInResources(&mResources);
>-        mResources.EXT_YUV_target = 1;
>+const char ESSL300_OverloadRgb2Yuv[] =
>+    R"(precision mediump float;
>+    float rgb_2_yuv(float x) { return x + 1.0; }
> 
>-        mCompiler = nullptr;
>-    }
>+    in float i;
>+    out float o;
> 
>-    virtual void TearDown() { DestroyCompiler(); }
>-    void DestroyCompiler()
>+    void main()
>     {
>-        if (mCompiler)
>-        {
>-            sh::Destruct(mCompiler);
>-            mCompiler = nullptr;
>-        }
>-    }
>+        o = rgb_2_yuv(i);
>+    })";
> 
>-    void InitializeCompiler()
>-    {
>-        DestroyCompiler();
>-        mCompiler =
>-            sh::ConstructCompiler(GL_FRAGMENT_SHADER, SH_GLES3_SPEC, SH_ESSL_OUTPUT, &mResources);
>-        ASSERT_TRUE(mCompiler != nullptr) << "Compiler could not be constructed.";
>-    }
>+const char ESSL300_OverloadYuv2Rgb[] =
>+    R"(precision mediump float;
>+    float yuv_2_rgb(float x) { return x + 1.0; }
> 
>-    testing::AssertionResult TestShaderCompile(const char *pragma)
>-    {
>-        return TestShaderCompile(testing::get<0>(GetParam()),  // Version.
>-                                 pragma,
>-                                 testing::get<1>(GetParam())  // Shader.
>-                                 );
>-    }
>+    in float i;
>+    out float o;
> 
>-    testing::AssertionResult TestShaderCompile(const char *version,
>-                                               const char *pragma,
>-                                               const char *shader)
>+    void main()
>     {
>-        const char *shaderStrings[] = {version, pragma, shader};
>-        bool success                = sh::Compile(mCompiler, shaderStrings, 3, 0);
>-        if (success)
>-        {
>-            return ::testing::AssertionSuccess() << "Compilation success";
>-        }
>-        return ::testing::AssertionFailure() << sh::GetInfoLog(mCompiler);
>-    }
>-
>-  protected:
>-    ShBuiltInResources mResources;
>-    ShHandle mCompiler;
>-};
>+        o = yuv_2_rgb(i);
>+    })";
> 
> // Extension flag is required to compile properly. Expect failure when it is
> // not present.
>@@ -305,14 +270,14 @@ TEST_P(EXTYUVTargetTest, CompileSucceedsWithExtensionAndPragma)
>     EXPECT_TRUE(TestShaderCompile(EXTYTPragma));
> }
> 
>-INSTANTIATE_TEST_CASE_P(CorrectVariantsWithExtensionAndPragma,
>-                        EXTYUVTargetTest,
>-                        Combine(Values(ESSLVersion300),
>-                                Values(ESSL300_SimpleShader, ESSL300_FragColorShader)));
>+INSTANTIATE_TEST_SUITE_P(CorrectVariantsWithExtensionAndPragma,
>+                         EXTYUVTargetTest,
>+                         Combine(Values(SH_GLES3_SPEC),
>+                                 Values(sh::ESSLVersion300),
>+                                 Values(ESSL300_SimpleShader, ESSL300_FragColorShader)));
> 
> class EXTYUVTargetCompileSuccessTest : public EXTYUVTargetTest
>-{
>-};
>+{};
> 
> TEST_P(EXTYUVTargetCompileSuccessTest, CompileSucceeds)
> {
>@@ -322,17 +287,17 @@ TEST_P(EXTYUVTargetCompileSuccessTest, CompileSucceeds)
>     EXPECT_TRUE(TestShaderCompile(EXTYTPragma));
> }
> 
>-INSTANTIATE_TEST_CASE_P(CorrectESSL300Shaders,
>-                        EXTYUVTargetCompileSuccessTest,
>-                        Combine(Values(ESSLVersion300),
>-                                Values(ESSL300_FragColorShader,
>-                                       ESSL300_YUVQualifierMultipleTimesShader,
>-                                       ESSL300_YuvCscStandardEXTShader,
>-                                       ESSL300_BuiltInFunctionsShader)));
>+INSTANTIATE_TEST_SUITE_P(CorrectESSL300Shaders,
>+                         EXTYUVTargetCompileSuccessTest,
>+                         Combine(Values(SH_GLES3_SPEC),
>+                                 Values(sh::ESSLVersion300),
>+                                 Values(ESSL300_FragColorShader,
>+                                        ESSL300_YUVQualifierMultipleTimesShader,
>+                                        ESSL300_YuvCscStandardEXTShader,
>+                                        ESSL300_BuiltInFunctionsShader)));
> 
> class EXTYUVTargetCompileFailureTest : public EXTYUVTargetTest
>-{
>-};
>+{};
> 
> TEST_P(EXTYUVTargetCompileFailureTest, CompileFails)
> {
>@@ -342,25 +307,44 @@ TEST_P(EXTYUVTargetCompileFailureTest, CompileFails)
>     EXPECT_FALSE(TestShaderCompile(EXTYTPragma));
> }
> 
>-INSTANTIATE_TEST_CASE_P(IncorrectESSL300Shaders,
>-                        EXTYUVTargetCompileFailureTest,
>-                        Combine(Values(ESSLVersion300),
>-                                Values(ESSL300_YUVQualifierFailureShader1,
>-                                       ESSL300_YUVQualifierFailureShader2,
>-                                       ESSL300_LocationAndYUVFailureShader,
>-                                       ESSL300_MultipleColorAndYUVOutputsFailureShader1,
>-                                       ESSL300_MultipleColorAndYUVOutputsFailureShader2,
>-                                       ESSL300_DepthAndYUVOutputsFailureShader,
>-                                       ESSL300_MultipleYUVOutputsFailureShader,
>-                                       ESSL300_YuvCscStandartdEXTConstructFailureShader1,
>-                                       ESSL300_YuvCscStandartdEXTConstructFailureShader2,
>-                                       ESSL300_YuvCscStandartdEXTConversionFailureShader1,
>-                                       ESSL300_YuvCscStandartdEXTConversionFailureShader2,
>-                                       ESSL300_YuvCscStandartdEXTConversionFailureShader3,
>-                                       ESSL300_YuvCscStandartdEXTConversionFailureShader4,
>-                                       ESSL300_YuvCscStandartdEXTConversionFailureShader5,
>-                                       ESSL300_YuvCscStandartdEXTQualifiersFailureShader1,
>-                                       ESSL300_YuvCscStandartdEXTQualifiersFailureShader2,
>-                                       ESSL300_YuvCscStandartdEXTQualifiersFailureShader3)));
>+INSTANTIATE_TEST_SUITE_P(IncorrectESSL300Shaders,
>+                         EXTYUVTargetCompileFailureTest,
>+                         Combine(Values(SH_GLES3_SPEC),
>+                                 Values(sh::ESSLVersion300),
>+                                 Values(ESSL300_YUVQualifierFailureShader1,
>+                                        ESSL300_YUVQualifierFailureShader2,
>+                                        ESSL300_LocationAndYUVFailureShader,
>+                                        ESSL300_MultipleColorAndYUVOutputsFailureShader1,
>+                                        ESSL300_MultipleColorAndYUVOutputsFailureShader2,
>+                                        ESSL300_DepthAndYUVOutputsFailureShader,
>+                                        ESSL300_MultipleYUVOutputsFailureShader,
>+                                        ESSL300_YuvCscStandartdEXTConstructFailureShader1,
>+                                        ESSL300_YuvCscStandartdEXTConstructFailureShader2,
>+                                        ESSL300_YuvCscStandartdEXTConversionFailureShader1,
>+                                        ESSL300_YuvCscStandartdEXTConversionFailureShader2,
>+                                        ESSL300_YuvCscStandartdEXTConversionFailureShader3,
>+                                        ESSL300_YuvCscStandartdEXTConversionFailureShader4,
>+                                        ESSL300_YuvCscStandartdEXTConversionFailureShader5,
>+                                        ESSL300_YuvCscStandartdEXTQualifiersFailureShader1,
>+                                        ESSL300_YuvCscStandartdEXTQualifiersFailureShader2,
>+                                        ESSL300_YuvCscStandartdEXTQualifiersFailureShader3)));
>+
>+class EXTYUVNotEnabledTest : public EXTYUVTargetTest
>+{};
>+
>+TEST_P(EXTYUVNotEnabledTest, CanOverloadConversions)
>+{
>+    // Expect compile success with a shader that overloads functions in the EXT_YUV_target
>+    // extension.
>+    mResources.EXT_YUV_target = 0;
>+    InitializeCompiler();
>+    EXPECT_TRUE(TestShaderCompile(""));
>+}
>+
>+INSTANTIATE_TEST_SUITE_P(CoreESSL300Shaders,
>+                         EXTYUVNotEnabledTest,
>+                         Combine(Values(SH_GLES3_SPEC),
>+                                 Values(sh::ESSLVersion300),
>+                                 Values(ESSL300_OverloadRgb2Yuv, ESSL300_OverloadYuv2Rgb)));
> 
> }  // namespace
>diff --git a/Source/ThirdParty/ANGLE/src/tests/compiler_tests/EXT_blend_func_extended_test.cpp b/Source/ThirdParty/ANGLE/src/tests/compiler_tests/EXT_blend_func_extended_test.cpp
>index 7d965d77c82..eabb1fa0c67 100644
>--- a/Source/ThirdParty/ANGLE/src/tests/compiler_tests/EXT_blend_func_extended_test.cpp
>+++ b/Source/ThirdParty/ANGLE/src/tests/compiler_tests/EXT_blend_func_extended_test.cpp
>@@ -7,20 +7,11 @@
> //   Test for EXT_blend_func_extended_test
> //
> 
>-#include "angle_gl.h"
>-#include "gtest/gtest.h"
>-#include "GLSLANG/ShaderLang.h"
>-
>-using testing::Combine;
>-using testing::Values;
>-using testing::make_tuple;
>+#include "tests/test_utils/ShaderExtensionTest.h"
> 
> namespace
> {
>-const char ESSLVersion100[] = "#version 100\n";
>-const char ESSLVersion300[] = "#version 300 es\n";
>-const char ESSLVersion310[] = "#version 310 es\n";
>-const char EXTBFEPragma[]   = "#extension GL_EXT_blend_func_extended : require\n";
>+const char EXTBFEPragma[] = "#extension GL_EXT_blend_func_extended : require\n";
> 
> const char ESSL100_SimpleShader1[] =
>     "precision mediump float;\n"
>@@ -76,9 +67,8 @@ const char ESSL300_MaxDualSourceAccessShader[] =
>     "    fragColor = vec4(gl_MaxDualSourceDrawBuffersEXT / 10);\n"
>     "}\n";
> 
>-// In GLSL version 300 es, the only way to write a correct shader is to require the extension and
>-// then leave the locations unspecified. The caller will then bind the variables with the extension
>-// binding functions.
>+// In ES 3.0, the locations can be assigned through the API with glBindFragDataLocationIndexedEXT.
>+// It's fine to have a mix of specified and unspecified locations.
> const char ESSL300_LocationAndUnspecifiedOutputShader[] =
>     "precision mediump float;\n"
>     "layout(location = 0) out mediump vec4 fragColor;"
>@@ -88,6 +78,7 @@ const char ESSL300_LocationAndUnspecifiedOutputShader[] =
>     "    secondaryFragColor = vec4(1.0);\n"
>     "}\n";
> 
>+// It's also fine to leave locations completely unspecified.
> const char ESSL300_TwoUnspecifiedLocationOutputsShader[] =
>     "precision mediump float;\n"
>     "out mediump vec4 fragColor;"
>@@ -97,83 +88,82 @@ const char ESSL300_TwoUnspecifiedLocationOutputsShader[] =
>     "    secondaryFragColor = vec4(1.0);\n"
>     "}\n";
> 
>-// Shader that is correct in GLSL ES 3.10 fails when used in version 300 es.
>-const char ESSL310_LocationIndexShader[] =
>-    "precision mediump float;\n"
>-    "layout(location = 0) out mediump vec4 fragColor;"
>-    "layout(location = 0, index = 1) out mediump vec4 secondaryFragColor;"
>-    "void main() {\n"
>-    "   fragColor = vec4(1);\n"
>-    "   secondaryFragColor = vec4(1);\n"
>-    "}\n";
>-
>-// Shader that specifies index layout qualifier but not location fails to compile. Currently fails
>-// to compile due to version 310 es not being supported.
>-const char ESSL310_LocationIndexFailureShader[] =
>-    "precision mediump float;\n"
>-    "layout(location = 0) out mediump vec4 fragColor;"
>-    "layout(index = 1) out mediump vec4 secondaryFragColor;"
>-    "void main() {\n"
>-    "   fragColor = vec4(1.0);\n"
>-    "   secondaryFragColor = vec4(1.0);\n"
>-    "}\n";
>+// Shader that is specifies two outputs with the same location but different indexes is valid.
>+const char ESSL300_LocationIndexShader[] =
>+    R"(precision mediump float;
>+layout(location = 0) out mediump vec4 fragColor;
>+layout(location = 0, index = 1) out mediump vec4 secondaryFragColor;
>+void main() {
>+    fragColor = vec4(1);
>+    secondaryFragColor = vec4(1);
>+})";
>+
>+// Shader that specifies index layout qualifier but not location fails to compile.
>+const char ESSL300_LocationIndexFailureShader[] =
>+    R"(precision mediump float;
>+layout(index = 0) out vec4 fragColor;
>+void main() {
>+    fragColor = vec4(1.0);
>+})";
>+
>+// Shader that specifies index layout qualifier multiple times fails to compile.
>+const char ESSL300_DoubleIndexFailureShader[] =
>+    R"(precision mediump float;
>+layout(index = 0, location = 0, index = 1) out vec4 fragColor;
>+void main() {
>+    fragColor = vec4(1.0);
>+})";
>+
>+// Global index layout qualifier fails.
>+const char ESSL300_GlobalIndexFailureShader[] =
>+    R"(precision mediump float;
>+layout(index = 0);
>+out vec4 fragColor;
>+void main() {
>+    fragColor = vec4(1.0);
>+})";
>+
>+// Index layout qualifier on a non-output variable fails.
>+const char ESSL300_IndexOnUniformVariableFailureShader[] =
>+    R"(precision mediump float;
>+layout(index = 0) uniform vec4 u;
>+out vec4 fragColor;
>+void main() {
>+    fragColor = u;
>+})";
>+
>+// Index layout qualifier on a struct fails.
>+const char ESSL300_IndexOnStructFailureShader[] =
>+    R"(precision mediump float;
>+layout(index = 0) struct S {
>+    vec4 field;
>+};
>+out vec4 fragColor;
>+void main() {
>+    fragColor = vec4(1.0);
>+})";
>+
>+// Index layout qualifier on a struct member fails.
>+const char ESSL300_IndexOnStructFieldFailureShader[] =
>+    R"(precision mediump float;
>+struct S {
>+    layout(index = 0) vec4 field;
>+};
>+out mediump vec4 fragColor;
>+void main() {
>+    fragColor = vec4(1.0);
>+})";
> 
>-class EXTBlendFuncExtendedTest
>-    : public testing::TestWithParam<testing::tuple<ShShaderSpec, const char *, const char *>>
>+class EXTBlendFuncExtendedTest : public sh::ShaderExtensionTest
> {
>   protected:
>-    virtual void SetUp()
>+    void SetUp() override
>     {
>-        sh::InitBuiltInResources(&mResources);
>+        sh::ShaderExtensionTest::SetUp();
>         // EXT_draw_buffers is used in some of the shaders for test purposes.
>         mResources.EXT_draw_buffers = 1;
>         mResources.NV_draw_buffers  = 2;
>-
>-        mCompiler = nullptr;
>     }
>-
>-    virtual void TearDown() { DestroyCompiler(); }
>-    void DestroyCompiler()
>-    {
>-        if (mCompiler)
>-        {
>-            sh::Destruct(mCompiler);
>-            mCompiler = nullptr;
>-        }
>-    }
>-
>-    void InitializeCompiler()
>-    {
>-        DestroyCompiler();
>-        mCompiler = sh::ConstructCompiler(GL_FRAGMENT_SHADER, testing::get<0>(GetParam()),
>-                                          SH_GLSL_COMPATIBILITY_OUTPUT, &mResources);
>-        ASSERT_TRUE(mCompiler != nullptr) << "Compiler could not be constructed.";
>-    }
>-
>-    testing::AssertionResult TestShaderCompile(const char *pragma)
>-    {
>-        return TestShaderCompile(testing::get<1>(GetParam()),  // Version.
>-                                 pragma,
>-                                 testing::get<2>(GetParam())  // Shader.
>-                                 );
>-    }
>-
>-    testing::AssertionResult TestShaderCompile(const char *version,
>-                                               const char *pragma,
>-                                               const char *shader)
>-    {
>-        const char *shaderStrings[] = {version, pragma, shader};
>-        bool success                = sh::Compile(mCompiler, shaderStrings, 3, 0);
>-        if (success)
>-        {
>-            return ::testing::AssertionSuccess() << "Compilation success";
>-        }
>-        return ::testing::AssertionFailure() << sh::GetInfoLog(mCompiler);
>-    }
>-
>-  protected:
>-    ShBuiltInResources mResources;
>-    ShHandle mCompiler;
> };
> 
> // Extension flag is required to compile properly. Expect failure when it is
>@@ -210,25 +200,25 @@ TEST_P(EXTBlendFuncExtendedTest, CompileSucceedsWithExtensionAndPragma)
> 
> // The SL #version 100 shaders that are correct work similarly
> // in both GL2 and GL3, with and without the version string.
>-INSTANTIATE_TEST_CASE_P(CorrectESSL100Shaders,
>-                        EXTBlendFuncExtendedTest,
>-                        Combine(Values(SH_GLES2_SPEC, SH_GLES3_SPEC),
>-                                Values("", ESSLVersion100),
>-                                Values(ESSL100_SimpleShader1,
>-                                       ESSL100_MaxDualSourceAccessShader,
>-                                       ESSL100_FragDataShader)));
>-
>-INSTANTIATE_TEST_CASE_P(CorrectESSL300Shaders,
>-                        EXTBlendFuncExtendedTest,
>-                        Combine(Values(SH_GLES3_SPEC),
>-                                Values(ESSLVersion300),
>-                                Values(ESSL300_MaxDualSourceAccessShader,
>-                                       ESSL300_LocationAndUnspecifiedOutputShader,
>-                                       ESSL300_TwoUnspecifiedLocationOutputsShader)));
>+INSTANTIATE_TEST_SUITE_P(CorrectESSL100Shaders,
>+                         EXTBlendFuncExtendedTest,
>+                         Combine(Values(SH_GLES2_SPEC, SH_GLES3_SPEC),
>+                                 Values("", sh::ESSLVersion100),
>+                                 Values(ESSL100_SimpleShader1,
>+                                        ESSL100_MaxDualSourceAccessShader,
>+                                        ESSL100_FragDataShader)));
>+
>+INSTANTIATE_TEST_SUITE_P(CorrectESSL300Shaders,
>+                         EXTBlendFuncExtendedTest,
>+                         Combine(Values(SH_GLES3_SPEC),
>+                                 Values(sh::ESSLVersion300),
>+                                 Values(ESSL300_MaxDualSourceAccessShader,
>+                                        ESSL300_LocationAndUnspecifiedOutputShader,
>+                                        ESSL300_TwoUnspecifiedLocationOutputsShader,
>+                                        ESSL300_LocationIndexShader)));
> 
> class EXTBlendFuncExtendedCompileFailureTest : public EXTBlendFuncExtendedTest
>-{
>-};
>+{};
> 
> TEST_P(EXTBlendFuncExtendedCompileFailureTest, CompileFails)
> {
>@@ -240,46 +230,39 @@ TEST_P(EXTBlendFuncExtendedCompileFailureTest, CompileFails)
> }
> 
> // Incorrect #version 100 shaders fail.
>-INSTANTIATE_TEST_CASE_P(IncorrectESSL100Shaders,
>-                        EXTBlendFuncExtendedCompileFailureTest,
>-                        Combine(Values(SH_GLES2_SPEC),
>-                                Values(ESSLVersion100),
>-                                Values(ESSL100_ColorAndDataWriteFailureShader1,
>-                                       ESSL100_ColorAndDataWriteFailureShader2,
>-                                       ESSL100_ColorAndDataWriteFailureShader3)));
>+INSTANTIATE_TEST_SUITE_P(IncorrectESSL100Shaders,
>+                         EXTBlendFuncExtendedCompileFailureTest,
>+                         Combine(Values(SH_GLES2_SPEC),
>+                                 Values(sh::ESSLVersion100),
>+                                 Values(ESSL100_ColorAndDataWriteFailureShader1,
>+                                        ESSL100_ColorAndDataWriteFailureShader2,
>+                                        ESSL100_ColorAndDataWriteFailureShader3)));
> 
> // Correct #version 300 es shaders fail in GLES2 context, regardless of version string.
>-INSTANTIATE_TEST_CASE_P(CorrectESSL300Shaders,
>-                        EXTBlendFuncExtendedCompileFailureTest,
>-                        Combine(Values(SH_GLES2_SPEC),
>-                                Values("", ESSLVersion100, ESSLVersion300),
>-                                Values(ESSL300_LocationAndUnspecifiedOutputShader,
>-                                       ESSL300_TwoUnspecifiedLocationOutputsShader)));
>+INSTANTIATE_TEST_SUITE_P(CorrectESSL300Shaders,
>+                         EXTBlendFuncExtendedCompileFailureTest,
>+                         Combine(Values(SH_GLES2_SPEC),
>+                                 Values("", sh::ESSLVersion100, sh::ESSLVersion300),
>+                                 Values(ESSL300_LocationAndUnspecifiedOutputShader,
>+                                        ESSL300_TwoUnspecifiedLocationOutputsShader)));
> 
> // Correct #version 100 shaders fail when used with #version 300 es.
>-INSTANTIATE_TEST_CASE_P(CorrectESSL100Shaders,
>-                        EXTBlendFuncExtendedCompileFailureTest,
>-                        Combine(Values(SH_GLES3_SPEC),
>-                                Values(ESSLVersion300),
>-                                Values(ESSL100_SimpleShader1, ESSL100_FragDataShader)));
>-
>-// Incorrect #version 310 es always fails.
>-INSTANTIATE_TEST_CASE_P(IncorrectESSL310Shaders,
>-                        EXTBlendFuncExtendedCompileFailureTest,
>-                        Combine(Values(SH_GLES3_SPEC),
>-                                Values(ESSLVersion300, ESSLVersion310),
>-                                Values(ESSL310_LocationIndexFailureShader)));
>-
>-// Correct #version 310 es fails in #version 300 es.
>-INSTANTIATE_TEST_CASE_P(
>-    CorrectESSL310ShadersInESSL300,
>-    EXTBlendFuncExtendedCompileFailureTest,
>-    Values(make_tuple(SH_GLES3_SPEC, &ESSLVersion300[0], &ESSL310_LocationIndexShader[0])));
>-
>-// Correct #version 310 es fails in #version 310 es, due to 3.1 not being supported.
>-INSTANTIATE_TEST_CASE_P(
>-    CorrectESSL310Shaders,
>-    EXTBlendFuncExtendedCompileFailureTest,
>-    Values(make_tuple(SH_GLES3_SPEC, &ESSLVersion310[0], &ESSL310_LocationIndexShader[0])));
>+INSTANTIATE_TEST_SUITE_P(CorrectESSL100Shaders,
>+                         EXTBlendFuncExtendedCompileFailureTest,
>+                         Combine(Values(SH_GLES3_SPEC),
>+                                 Values(sh::ESSLVersion300),
>+                                 Values(ESSL100_SimpleShader1, ESSL100_FragDataShader)));
>+
>+// Incorrect #version 300 es shaders always fail.
>+INSTANTIATE_TEST_SUITE_P(IncorrectESSL300Shaders,
>+                         EXTBlendFuncExtendedCompileFailureTest,
>+                         Combine(Values(SH_GLES3_1_SPEC),
>+                                 Values(sh::ESSLVersion300, sh::ESSLVersion310),
>+                                 Values(ESSL300_LocationIndexFailureShader,
>+                                        ESSL300_DoubleIndexFailureShader,
>+                                        ESSL300_GlobalIndexFailureShader,
>+                                        ESSL300_IndexOnUniformVariableFailureShader,
>+                                        ESSL300_IndexOnStructFailureShader,
>+                                        ESSL300_IndexOnStructFieldFailureShader)));
> 
> }  // namespace
>diff --git a/Source/ThirdParty/ANGLE/src/tests/compiler_tests/EXT_frag_depth_test.cpp b/Source/ThirdParty/ANGLE/src/tests/compiler_tests/EXT_frag_depth_test.cpp
>new file mode 100644
>index 00000000000..bdec7eb230f
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/tests/compiler_tests/EXT_frag_depth_test.cpp
>@@ -0,0 +1,67 @@
>+//
>+// Copyright (c) 2018 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// EXT_frag_depth_test.cpp:
>+//   Test for EXT_frag_depth
>+//
>+
>+#include "tests/test_utils/ShaderExtensionTest.h"
>+
>+using EXTFragDepthTest = sh::ShaderExtensionTest;
>+
>+namespace
>+{
>+const char EXTPragma[] = "#extension GL_EXT_frag_depth : require\n";
>+
>+// Shader setting gl_FragDepthEXT
>+const char ESSL100_FragDepthShader[] =
>+
>+    R"(
>+    precision mediump float;
>+
>+    void main()
>+    {
>+        gl_FragDepthEXT = 1.0;
>+    })";
>+
>+// Extension flag is required to compile properly. Expect failure when it is
>+// not present.
>+TEST_P(EXTFragDepthTest, CompileFailsWithoutExtension)
>+{
>+    mResources.EXT_frag_depth = 0;
>+    InitializeCompiler();
>+    EXPECT_FALSE(TestShaderCompile(EXTPragma));
>+}
>+
>+// Extension directive is required to compile properly. Expect failure when
>+// it is not present.
>+TEST_P(EXTFragDepthTest, CompileFailsWithExtensionWithoutPragma)
>+{
>+    mResources.EXT_frag_depth = 1;
>+    InitializeCompiler();
>+    EXPECT_FALSE(TestShaderCompile(""));
>+}
>+
>+// With extension flag and extension directive, compiling succeeds.
>+// Also test that the extension directive state is reset correctly.
>+TEST_P(EXTFragDepthTest, CompileSucceedsWithExtensionAndPragma)
>+{
>+    mResources.EXT_frag_depth = 1;
>+    InitializeCompiler();
>+    EXPECT_TRUE(TestShaderCompile(EXTPragma));
>+    // Test reset functionality.
>+    EXPECT_FALSE(TestShaderCompile(""));
>+    EXPECT_TRUE(TestShaderCompile(EXTPragma));
>+}
>+
>+// The SL #version 100 shaders that are correct work similarly
>+// in both GL2 and GL3, with and without the version string.
>+INSTANTIATE_TEST_SUITE_P(CorrectESSL100Shaders,
>+                         EXTFragDepthTest,
>+                         Combine(Values(SH_GLES2_SPEC),
>+                                 Values(sh::ESSLVersion100),
>+                                 Values(ESSL100_FragDepthShader)));
>+
>+}  // anonymous namespace
>diff --git a/Source/ThirdParty/ANGLE/src/tests/compiler_tests/EXT_shader_texture_lod_test.cpp b/Source/ThirdParty/ANGLE/src/tests/compiler_tests/EXT_shader_texture_lod_test.cpp
>new file mode 100644
>index 00000000000..fac9fc02358
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/tests/compiler_tests/EXT_shader_texture_lod_test.cpp
>@@ -0,0 +1,68 @@
>+//
>+// Copyright (c) 2018 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// EXT_shader_texture_lod_test.cpp:
>+//   Test for EXT_shader_texture_lod
>+//
>+
>+#include "tests/test_utils/ShaderExtensionTest.h"
>+
>+using EXTShaderTextureLodTest = sh::ShaderExtensionTest;
>+
>+namespace
>+{
>+const char EXTPragma[] = "#extension GL_EXT_shader_texture_lod : require\n";
>+
>+// Shader calling texture2DLodEXT()
>+const char ESSL100_TextureLodShader[] =
>+    R"(
>+    precision mediump float;
>+    varying vec2 texCoord0v;
>+    uniform float lod;
>+    uniform sampler2D tex;
>+    void main()
>+    {
>+        vec4 color = texture2DLodEXT(tex, texCoord0v, lod);
>+    })";
>+
>+// Extension flag is required to compile properly. Expect failure when it is
>+// not present.
>+TEST_P(EXTShaderTextureLodTest, CompileFailsWithoutExtension)
>+{
>+    mResources.EXT_shader_texture_lod = 0;
>+    InitializeCompiler();
>+    EXPECT_FALSE(TestShaderCompile(EXTPragma));
>+}
>+
>+// Extension directive is required to compile properly. Expect failure when
>+// it is not present.
>+TEST_P(EXTShaderTextureLodTest, CompileFailsWithExtensionWithoutPragma)
>+{
>+    mResources.EXT_shader_texture_lod = 1;
>+    InitializeCompiler();
>+    EXPECT_FALSE(TestShaderCompile(""));
>+}
>+
>+// With extension flag and extension directive, compiling succeeds.
>+// Also test that the extension directive state is reset correctly.
>+TEST_P(EXTShaderTextureLodTest, CompileSucceedsWithExtensionAndPragma)
>+{
>+    mResources.EXT_shader_texture_lod = 1;
>+    InitializeCompiler();
>+    EXPECT_TRUE(TestShaderCompile(EXTPragma));
>+    // Test reset functionality.
>+    EXPECT_FALSE(TestShaderCompile(""));
>+    EXPECT_TRUE(TestShaderCompile(EXTPragma));
>+}
>+
>+// The SL #version 100 shaders that are correct work similarly
>+// in both GL2 and GL3, with and without the version string.
>+INSTANTIATE_TEST_SUITE_P(CorrectESSL100Shaders,
>+                         EXTShaderTextureLodTest,
>+                         Combine(Values(SH_GLES2_SPEC),
>+                                 Values(sh::ESSLVersion100),
>+                                 Values(ESSL100_TextureLodShader)));
>+
>+}  // anonymous namespace
>diff --git a/Source/ThirdParty/ANGLE/src/tests/compiler_tests/EmulateGLDrawID_test.cpp b/Source/ThirdParty/ANGLE/src/tests/compiler_tests/EmulateGLDrawID_test.cpp
>new file mode 100644
>index 00000000000..c7b49a865d1
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/tests/compiler_tests/EmulateGLDrawID_test.cpp
>@@ -0,0 +1,171 @@
>+//
>+// Copyright 2018 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// ANGLE_draw_id.cpp:
>+//   Test for ANGLE_draw_id extension
>+//
>+
>+#include "compiler/translator/tree_ops/EmulateGLDrawID.h"
>+#include "GLSLANG/ShaderLang.h"
>+#include "angle_gl.h"
>+#include "gtest/gtest.h"
>+#include "tests/test_utils/compiler_test.h"
>+
>+using namespace sh;
>+
>+class EmulateGLDrawIDTest : public MatchOutputCodeTest
>+{
>+  public:
>+    EmulateGLDrawIDTest()
>+        : MatchOutputCodeTest(GL_VERTEX_SHADER, SH_VARIABLES, SH_GLSL_COMPATIBILITY_OUTPUT)
>+    {
>+        getResources()->ANGLE_multi_draw = 1;
>+    }
>+
>+  protected:
>+    void CheckCompileFailure(const std::string &shaderString, const char *expectedError = nullptr)
>+    {
>+        std::string translatedCode;
>+        std::string infoLog;
>+        bool success = compileTestShader(GL_VERTEX_SHADER, SH_GLES2_SPEC,
>+                                         SH_GLSL_COMPATIBILITY_OUTPUT, shaderString, getResources(),
>+                                         SH_VARIABLES, &translatedCode, &infoLog);
>+        EXPECT_FALSE(success);
>+        if (expectedError)
>+        {
>+            EXPECT_TRUE(infoLog.find(expectedError) != std::string::npos);
>+        }
>+    }
>+};
>+
>+// Check that compilation fails if the compile option to emulate gl_DrawID
>+// is not set
>+TEST_F(EmulateGLDrawIDTest, RequiresEmulation)
>+{
>+    CheckCompileFailure(
>+        "#extension GL_ANGLE_multi_draw : require\n"
>+        "void main() {\n"
>+        "   gl_Position = vec4(float(gl_DrawID), 0.0, 0.0, 1.0);\n"
>+        "}\n",
>+        "extension is not supported");
>+}
>+
>+// Check that compiling with emulation with gl_DrawID works with different shader versions
>+TEST_F(EmulateGLDrawIDTest, CheckCompile)
>+{
>+    const std::string shaderString =
>+        "#extension GL_ANGLE_multi_draw : require\n"
>+        "void main() {\n"
>+        "   gl_Position = vec4(float(gl_DrawID), 0.0, 0.0, 1.0);\n"
>+        "}\n";
>+
>+    compile(shaderString, SH_OBJECT_CODE | SH_VARIABLES | SH_EMULATE_GL_DRAW_ID);
>+    compile("#version 100\n" + shaderString, SH_OBJECT_CODE | SH_VARIABLES | SH_EMULATE_GL_DRAW_ID);
>+    compile("#version 300 es\n" + shaderString,
>+            SH_OBJECT_CODE | SH_VARIABLES | SH_EMULATE_GL_DRAW_ID);
>+}
>+
>+// Check that gl_DrawID is properly emulated
>+TEST_F(EmulateGLDrawIDTest, EmulatesUniform)
>+{
>+    addOutputType(SH_GLSL_COMPATIBILITY_OUTPUT);
>+    addOutputType(SH_ESSL_OUTPUT);
>+#ifdef ANGLE_ENABLE_VULKAN
>+    addOutputType(SH_GLSL_VULKAN_OUTPUT);
>+#endif
>+#ifdef ANGLE_ENABLE_HLSL
>+    addOutputType(SH_HLSL_3_0_OUTPUT);
>+    addOutputType(SH_HLSL_3_0_OUTPUT);
>+#endif
>+
>+    const std::string &shaderString =
>+        "#extension GL_ANGLE_multi_draw : require\n"
>+        "void main() {\n"
>+        "   gl_Position = vec4(float(gl_DrawID), 0.0, 0.0, 1.0);\n"
>+        "}\n";
>+
>+    compile(shaderString, SH_OBJECT_CODE | SH_VARIABLES | SH_EMULATE_GL_DRAW_ID);
>+
>+    EXPECT_TRUE(notFoundInCode("gl_DrawID"));
>+    EXPECT_TRUE(foundInCode("angle_DrawID"));
>+    EXPECT_TRUE(notFoundInCode("GL_ANGLE_multi_draw"));
>+
>+    EXPECT_TRUE(foundInCode(SH_GLSL_COMPATIBILITY_OUTPUT, "uniform int angle_DrawID"));
>+    EXPECT_TRUE(foundInCode(SH_ESSL_OUTPUT, "uniform highp int angle_DrawID"));
>+
>+#ifdef ANGLE_ENABLE_VULKAN
>+    EXPECT_TRUE(
>+        foundInCode(SH_GLSL_VULKAN_OUTPUT, "uniform defaultUniforms\n{\n    int angle_DrawID;"));
>+#endif
>+#ifdef ANGLE_ENABLE_HLSL
>+    EXPECT_TRUE(foundInCode(SH_HLSL_3_0_OUTPUT, "uniform int angle_DrawID : register"));
>+    EXPECT_TRUE(foundInCode(SH_HLSL_3_0_OUTPUT, "uniform int angle_DrawID : register"));
>+#endif
>+}
>+
>+// Check that a user-defined "gl_DrawID" is not permitted
>+TEST_F(EmulateGLDrawIDTest, DisallowsUserDefinedGLDrawID)
>+{
>+    // Check that it is not permitted without the extension
>+    CheckCompileFailure(
>+        "uniform int gl_DrawID;\n"
>+        "void main() {\n"
>+        "   gl_Position = vec4(float(gl_DrawID), 0.0, 0.0, 1.0);\n"
>+        "}\n",
>+        "reserved built-in name");
>+
>+    CheckCompileFailure(
>+        "void main() {\n"
>+        "   int gl_DrawID = 0;\n"
>+        "   gl_Position = vec4(float(gl_DrawID), 0.0, 0.0, 1.0);\n"
>+        "}\n",
>+        "reserved built-in name");
>+
>+    // Check that it is not permitted with the extension
>+    CheckCompileFailure(
>+        "#extension GL_ANGLE_multi_draw : require\n"
>+        "uniform int gl_DrawID;\n"
>+        "void main() {\n"
>+        "   gl_Position = vec4(float(gl_DrawID), 0.0, 0.0, 1.0);\n"
>+        "}\n",
>+        "reserved built-in name");
>+
>+    CheckCompileFailure(
>+        "#extension GL_ANGLE_multi_draw : require\n"
>+        "void main() {\n"
>+        "   int gl_DrawID = 0;\n"
>+        "   gl_Position = vec4(float(gl_DrawID), 0.0, 0.0, 1.0);\n"
>+        "}\n",
>+        "reserved built-in name");
>+}
>+
>+// gl_DrawID is translated to angle_DrawID internally. Check that a user-defined
>+// angle_DrawID is permitted
>+TEST_F(EmulateGLDrawIDTest, AllowsUserDefinedANGLEDrawID)
>+{
>+    addOutputType(SH_GLSL_COMPATIBILITY_OUTPUT);
>+    addOutputType(SH_ESSL_OUTPUT);
>+#ifdef ANGLE_ENABLE_VULKAN
>+    addOutputType(SH_GLSL_VULKAN_OUTPUT);
>+#endif
>+#ifdef ANGLE_ENABLE_HLSL
>+    addOutputType(SH_HLSL_3_0_OUTPUT);
>+    addOutputType(SH_HLSL_3_0_OUTPUT);
>+#endif
>+
>+    const std::string &shaderString =
>+        "#extension GL_ANGLE_multi_draw : require\n"
>+        "uniform int angle_DrawID;\n"
>+        "void main() {\n"
>+        "   gl_Position = vec4(float(angle_DrawID + gl_DrawID), 0.0, 0.0, 1.0);\n"
>+        "}\n";
>+
>+    compile(shaderString, SH_OBJECT_CODE | SH_VARIABLES | SH_EMULATE_GL_DRAW_ID);
>+
>+    // " angle_DrawID" (note the space) should appear exactly twice:
>+    //    once in the declaration and once in the body.
>+    // The user-defined angle_DrawID should be decorated
>+    EXPECT_TRUE(foundInCode(" angle_DrawID", 2));
>+}
>diff --git a/Source/ThirdParty/ANGLE/src/tests/compiler_tests/EmulateGLFragColorBroadcast_test.cpp b/Source/ThirdParty/ANGLE/src/tests/compiler_tests/EmulateGLFragColorBroadcast_test.cpp
>index 07cf3fd680c..7634168d802 100644
>--- a/Source/ThirdParty/ANGLE/src/tests/compiler_tests/EmulateGLFragColorBroadcast_test.cpp
>+++ b/Source/ThirdParty/ANGLE/src/tests/compiler_tests/EmulateGLFragColorBroadcast_test.cpp
>@@ -7,9 +7,9 @@
> //   Tests for gl_FragColor broadcast behavior emulation.
> //
> 
>+#include "GLSLANG/ShaderLang.h"
> #include "angle_gl.h"
> #include "gtest/gtest.h"
>-#include "GLSLANG/ShaderLang.h"
> #include "tests/test_utils/compiler_test.h"
> 
> using namespace sh;
>@@ -78,4 +78,4 @@ TEST_F(EmulateGLFragColorBroadcastTest, EmptyMain)
>     EXPECT_FALSE(foundInCode("gl_FragData[1]"));
> }
> 
>-}  // namespace anonymous
>+}  // namespace
>diff --git a/Source/ThirdParty/ANGLE/src/tests/compiler_tests/ExpressionLimit_test.cpp b/Source/ThirdParty/ANGLE/src/tests/compiler_tests/ExpressionLimit_test.cpp
>index 8aefe2346b2..62bb2a9af0c 100644
>--- a/Source/ThirdParty/ANGLE/src/tests/compiler_tests/ExpressionLimit_test.cpp
>+++ b/Source/ThirdParty/ANGLE/src/tests/compiler_tests/ExpressionLimit_test.cpp
>@@ -6,21 +6,22 @@
> #include <sstream>
> #include <string>
> #include <vector>
>+#include "GLSLANG/ShaderLang.h"
> #include "angle_gl.h"
> #include "gtest/gtest.h"
>-#include "GLSLANG/ShaderLang.h"
>-
>-#define SHADER(Src) #Src
> 
>-class ExpressionLimitTest : public testing::Test {
>-protected:
>+class ExpressionLimitTest : public testing::Test
>+{
>+  protected:
>     static const int kMaxExpressionComplexity = 16;
>     static const int kMaxCallStackDepth       = 16;
>     static const int kMaxFunctionParameters   = 16;
>-    static const char* kExpressionTooComplex;
>-    static const char* kCallStackTooDeep;
>-    static const char* kHasRecursion;
>+    static const char *kExpressionTooComplex;
>+    static const char *kCallStackTooDeep;
>+    static const char *kHasRecursion;
>     static const char *kTooManyParameters;
>+    static const char *kTooComplexSwitch;
>+    static const char *kGlobalVariableInit;
> 
>     virtual void SetUp()
>     {
>@@ -51,22 +52,23 @@ protected:
>         res->MaxFunctionParameters   = kMaxFunctionParameters;
>     }
> 
>-    void GenerateLongExpression(int length, std::stringstream* ss)
>+    static void GenerateLongExpression(int length, std::stringstream *ss)
>     {
>-        for (int ii = 0; ii < length; ++ii) {
>-          *ss << "+ vec4(" << ii << ")";
>+        for (int ii = 0; ii < length; ++ii)
>+        {
>+            *ss << "+ vec4(" << ii << ")";
>         }
>     }
> 
>-    std::string GenerateShaderWithLongExpression(int length)
>+    static std::string GenerateShaderWithLongExpression(int length)
>     {
>-        static const char* shaderStart = SHADER(
>-            precision mediump float;
>+        static const char *shaderStart =
>+            R"(precision mediump float;
>             uniform vec4 u_color;
>             void main()
>             {
>                gl_FragColor = u_color
>-        );
>+        )";
> 
>         std::stringstream ss;
>         ss << shaderStart;
>@@ -76,10 +78,10 @@ protected:
>         return ss.str();
>     }
> 
>-    std::string GenerateShaderWithUnusedLongExpression(int length)
>+    static std::string GenerateShaderWithUnusedLongExpression(int length)
>     {
>-        static const char* shaderStart = SHADER(
>-            precision mediump float;
>+        static const char *shaderStart =
>+            R"(precision mediump float;
>             uniform vec4 u_color;
>             void main()
>             {
>@@ -87,7 +89,7 @@ protected:
>             }
>             vec4 someFunction() {
>               return u_color
>-        );
>+        )";
> 
>         std::stringstream ss;
> 
>@@ -98,25 +100,26 @@ protected:
>         return ss.str();
>     }
> 
>-    void GenerateDeepFunctionStack(int length, std::stringstream* ss)
>+    static void GenerateDeepFunctionStack(int length, std::stringstream *ss)
>     {
>-        static const char* shaderStart = SHADER(
>-            precision mediump float;
>+        static const char *shaderStart =
>+            R"(precision mediump float;
>             uniform vec4 u_color;
>             vec4 function0()  {
>               return u_color;
>             }
>-        );
>+        )";
> 
>         *ss << shaderStart;
>-        for (int ii = 0; ii < length; ++ii) {
>-          *ss << "vec4 function" << (ii + 1) << "() {\n"
>-              << "  return function" << ii << "();\n"
>-              << "}\n";
>+        for (int ii = 0; ii < length; ++ii)
>+        {
>+            *ss << "vec4 function" << (ii + 1) << "() {\n"
>+                << "  return function" << ii << "();\n"
>+                << "}\n";
>         }
>     }
> 
>-    std::string GenerateShaderWithDeepFunctionStack(int length)
>+    static std::string GenerateShaderWithDeepFunctionStack(int length)
>     {
>         std::stringstream ss;
> 
>@@ -129,7 +132,7 @@ protected:
>         return ss.str();
>     }
> 
>-    std::string GenerateShaderWithUnusedDeepFunctionStack(int length)
>+    static std::string GenerateShaderWithUnusedDeepFunctionStack(int length)
>     {
>         std::stringstream ss;
> 
>@@ -139,11 +142,10 @@ protected:
>            << "  gl_FragColor = vec4(0,0,0,0);\n"
>            << "}";
> 
>-
>         return ss.str();
>     }
> 
>-    std::string GenerateShaderWithFunctionParameters(int parameters)
>+    static std::string GenerateShaderWithFunctionParameters(int parameters)
>     {
>         std::stringstream ss;
> 
>@@ -171,6 +173,50 @@ protected:
>         return ss.str();
>     }
> 
>+    static std::string GenerateShaderWithNestingInsideSwitch(int nesting)
>+    {
>+        std::stringstream shaderString;
>+        shaderString <<
>+            R"(#version 300 es
>+            uniform int u;
>+
>+            void main()
>+            {
>+                int x;
>+                switch (u)
>+                {
>+                    case 0:
>+                        x = x)";
>+        for (int i = 0; i < nesting; ++i)
>+        {
>+            shaderString << " + x";
>+        }
>+        shaderString <<
>+            R"(;
>+                }  // switch (u)
>+            })";
>+        return shaderString.str();
>+    }
>+
>+    static std::string GenerateShaderWithNestingInsideGlobalInitializer(int nesting)
>+    {
>+        std::stringstream shaderString;
>+        shaderString <<
>+            R"(uniform int u;
>+            int x = u)";
>+
>+        for (int i = 0; i < nesting; ++i)
>+        {
>+            shaderString << " + u";
>+        }
>+        shaderString << R"(;
>+            void main()
>+            {
>+                gl_FragColor = vec4(0.0);
>+            })";
>+        return shaderString.str();
>+    }
>+
>     // Compiles a shader and if there's an error checks for a specific
>     // substring in the error log. This way we know the error is specific
>     // to the issue we are testing.
>@@ -179,10 +225,10 @@ protected:
>                                 ShCompileOptions compileOptions,
>                                 const char *expected_error)
>     {
>-                bool success = sh::Compile(compiler, &source, 1, compileOptions) != 0;
>-                if (success)
>-                {
>-                    success = !expected_error;
>+        bool success = sh::Compile(compiler, &source, 1, compileOptions) != 0;
>+        if (success)
>+        {
>+            success = !expected_error;
>         }
>         else
>         {
>@@ -198,19 +244,20 @@ protected:
>     ShBuiltInResources resources;
> };
> 
>-const char* ExpressionLimitTest::kExpressionTooComplex =
>-    "Expression too complex";
>-const char* ExpressionLimitTest::kCallStackTooDeep =
>-    "Call stack too deep";
>-const char* ExpressionLimitTest::kHasRecursion =
>+const char *ExpressionLimitTest::kExpressionTooComplex = "Expression too complex";
>+const char *ExpressionLimitTest::kCallStackTooDeep     = "Call stack too deep";
>+const char *ExpressionLimitTest::kHasRecursion =
>     "Recursive function call in the following call chain";
>-const char* ExpressionLimitTest::kTooManyParameters =
>-    "Function has too many parameters";
>+const char *ExpressionLimitTest::kTooManyParameters = "Function has too many parameters";
>+const char *ExpressionLimitTest::kTooComplexSwitch =
>+    "too complex expressions inside a switch statement";
>+const char *ExpressionLimitTest::kGlobalVariableInit =
>+    "global variable initializers must be constant expressions";
> 
> TEST_F(ExpressionLimitTest, ExpressionComplexity)
> {
>-    ShShaderSpec spec = SH_WEBGL_SPEC;
>-    ShShaderOutput output = SH_ESSL_OUTPUT;
>+    ShShaderSpec spec       = SH_WEBGL_SPEC;
>+    ShShaderOutput output   = SH_ESSL_OUTPUT;
>     ShHandle vertexCompiler = sh::ConstructCompiler(GL_FRAGMENT_SHADER, spec, output, &resources);
>     ShCompileOptions compileOptions = SH_LIMIT_EXPRESSION_COMPLEXITY;
> 
>@@ -220,9 +267,7 @@ TEST_F(ExpressionLimitTest, ExpressionComplexity)
>         compileOptions, nullptr));
>     // Test expression over the limit fails.
>     EXPECT_TRUE(CheckShaderCompilation(
>-        vertexCompiler,
>-        GenerateShaderWithLongExpression(
>-            kMaxExpressionComplexity + 10).c_str(),
>+        vertexCompiler, GenerateShaderWithLongExpression(kMaxExpressionComplexity + 10).c_str(),
>         compileOptions, kExpressionTooComplex));
>     // Test expression over the limit without a limit does not fail.
>     EXPECT_TRUE(CheckShaderCompilation(
>@@ -233,8 +278,8 @@ TEST_F(ExpressionLimitTest, ExpressionComplexity)
> 
> TEST_F(ExpressionLimitTest, UnusedExpressionComplexity)
> {
>-    ShShaderSpec spec = SH_WEBGL_SPEC;
>-    ShShaderOutput output = SH_ESSL_OUTPUT;
>+    ShShaderSpec spec       = SH_WEBGL_SPEC;
>+    ShShaderOutput output   = SH_ESSL_OUTPUT;
>     ShHandle vertexCompiler = sh::ConstructCompiler(GL_FRAGMENT_SHADER, spec, output, &resources);
>     ShCompileOptions compileOptions = SH_LIMIT_EXPRESSION_COMPLEXITY;
> 
>@@ -246,8 +291,7 @@ TEST_F(ExpressionLimitTest, UnusedExpressionComplexity)
>     // Test expression over the limit fails.
>     EXPECT_TRUE(CheckShaderCompilation(
>         vertexCompiler,
>-        GenerateShaderWithUnusedLongExpression(
>-            kMaxExpressionComplexity + 10).c_str(),
>+        GenerateShaderWithUnusedLongExpression(kMaxExpressionComplexity + 10).c_str(),
>         compileOptions, kExpressionTooComplex));
>     // Test expression over the limit without a limit does not fail.
>     EXPECT_TRUE(CheckShaderCompilation(
>@@ -259,8 +303,8 @@ TEST_F(ExpressionLimitTest, UnusedExpressionComplexity)
> 
> TEST_F(ExpressionLimitTest, CallStackDepth)
> {
>-    ShShaderSpec spec = SH_WEBGL_SPEC;
>-    ShShaderOutput output = SH_ESSL_OUTPUT;
>+    ShShaderSpec spec       = SH_WEBGL_SPEC;
>+    ShShaderOutput output   = SH_ESSL_OUTPUT;
>     ShHandle vertexCompiler = sh::ConstructCompiler(GL_FRAGMENT_SHADER, spec, output, &resources);
>     ShCompileOptions compileOptions = SH_LIMIT_CALL_STACK_DEPTH;
> 
>@@ -270,9 +314,7 @@ TEST_F(ExpressionLimitTest, CallStackDepth)
>         compileOptions, nullptr));
>     // Test call stack over the limit fails.
>     EXPECT_TRUE(CheckShaderCompilation(
>-        vertexCompiler,
>-        GenerateShaderWithDeepFunctionStack(
>-            kMaxCallStackDepth + 10).c_str(),
>+        vertexCompiler, GenerateShaderWithDeepFunctionStack(kMaxCallStackDepth + 10).c_str(),
>         compileOptions, kCallStackTooDeep));
>     // Test call stack over the limit without limit does not fail.
>     EXPECT_TRUE(CheckShaderCompilation(
>@@ -283,8 +325,8 @@ TEST_F(ExpressionLimitTest, CallStackDepth)
> 
> TEST_F(ExpressionLimitTest, UnusedCallStackDepth)
> {
>-    ShShaderSpec spec = SH_WEBGL_SPEC;
>-    ShShaderOutput output = SH_ESSL_OUTPUT;
>+    ShShaderSpec spec       = SH_WEBGL_SPEC;
>+    ShShaderOutput output   = SH_ESSL_OUTPUT;
>     ShHandle vertexCompiler = sh::ConstructCompiler(GL_FRAGMENT_SHADER, spec, output, &resources);
>     ShCompileOptions compileOptions = SH_LIMIT_CALL_STACK_DEPTH;
> 
>@@ -294,9 +336,7 @@ TEST_F(ExpressionLimitTest, UnusedCallStackDepth)
>         compileOptions, nullptr));
>     // Test call stack over the limit fails.
>     EXPECT_TRUE(CheckShaderCompilation(
>-        vertexCompiler,
>-        GenerateShaderWithUnusedDeepFunctionStack(
>-            kMaxCallStackDepth + 10).c_str(),
>+        vertexCompiler, GenerateShaderWithUnusedDeepFunctionStack(kMaxCallStackDepth + 10).c_str(),
>         compileOptions, kCallStackTooDeep));
>     // Test call stack over the limit without limit does not fail.
>     EXPECT_TRUE(CheckShaderCompilation(
>@@ -307,13 +347,13 @@ TEST_F(ExpressionLimitTest, UnusedCallStackDepth)
> 
> TEST_F(ExpressionLimitTest, Recursion)
> {
>-    ShShaderSpec spec = SH_WEBGL_SPEC;
>-    ShShaderOutput output = SH_ESSL_OUTPUT;
>+    ShShaderSpec spec       = SH_WEBGL_SPEC;
>+    ShShaderOutput output   = SH_ESSL_OUTPUT;
>     ShHandle vertexCompiler = sh::ConstructCompiler(GL_FRAGMENT_SHADER, spec, output, &resources);
>     ShCompileOptions compileOptions = 0;
> 
>-    static const char* shaderWithRecursion0 = SHADER(
>-        precision mediump float;
>+    static const char *shaderWithRecursion0 =
>+        R"(precision mediump float;
>         uniform vec4 u_color;
>         vec4 someFunc()  {
>             return someFunc();
>@@ -322,10 +362,10 @@ TEST_F(ExpressionLimitTest, Recursion)
>         void main() {
>             gl_FragColor = u_color * someFunc();
>         }
>-    );
>+    )";
> 
>-    static const char* shaderWithRecursion1 = SHADER(
>-        precision mediump float;
>+    static const char *shaderWithRecursion1 =
>+        R"(precision mediump float;
>         uniform vec4 u_color;
> 
>         vec4 someFunc();
>@@ -341,10 +381,10 @@ TEST_F(ExpressionLimitTest, Recursion)
>         void main() {
>             gl_FragColor = u_color * someFunc();
>         }
>-    );
>+    )";
> 
>-    static const char* shaderWithRecursion2 = SHADER(
>-        precision mediump float;
>+    static const char *shaderWithRecursion2 =
>+        R"(precision mediump float;
>         uniform vec4 u_color;
>         vec4 someFunc()  {
>             if (u_color.x > 0.5) {
>@@ -357,10 +397,10 @@ TEST_F(ExpressionLimitTest, Recursion)
>         void main() {
>             gl_FragColor = someFunc();
>         }
>-    );
>+    )";
> 
>-    static const char* shaderWithRecursion3 = SHADER(
>-        precision mediump float;
>+    static const char *shaderWithRecursion3 =
>+        R"(precision mediump float;
>         uniform vec4 u_color;
>         vec4 someFunc()  {
>             if (u_color.x > 0.5) {
>@@ -373,10 +413,10 @@ TEST_F(ExpressionLimitTest, Recursion)
>         void main() {
>             gl_FragColor = someFunc();
>         }
>-    );
>+    )";
> 
>-    static const char* shaderWithRecursion4 = SHADER(
>-        precision mediump float;
>+    static const char *shaderWithRecursion4 =
>+        R"(precision mediump float;
>         uniform vec4 u_color;
>         vec4 someFunc()  {
>             return (u_color.x > 0.5) ? vec4(1) : someFunc();
>@@ -385,10 +425,10 @@ TEST_F(ExpressionLimitTest, Recursion)
>         void main() {
>             gl_FragColor = someFunc();
>         }
>-    );
>+    )";
> 
>-    static const char* shaderWithRecursion5 = SHADER(
>-        precision mediump float;
>+    static const char *shaderWithRecursion5 =
>+        R"(precision mediump float;
>         uniform vec4 u_color;
>         vec4 someFunc()  {
>             return (u_color.x > 0.5) ? someFunc() : vec4(1);
>@@ -397,10 +437,10 @@ TEST_F(ExpressionLimitTest, Recursion)
>         void main() {
>             gl_FragColor = someFunc();
>         }
>-    );
>+    )";
> 
>-    static const char* shaderWithRecursion6 = SHADER(
>-        precision mediump float;
>+    static const char *shaderWithRecursion6 =
>+        R"(precision mediump float;
>         uniform vec4 u_color;
>         vec4 someFunc()  {
>             return someFunc();
>@@ -409,10 +449,10 @@ TEST_F(ExpressionLimitTest, Recursion)
>         void main() {
>             gl_FragColor = u_color;
>         }
>-    );
>+    )";
> 
>-    static const char* shaderWithNoRecursion = SHADER(
>-        precision mediump float;
>+    static const char *shaderWithNoRecursion =
>+        R"(precision mediump float;
>         uniform vec4 u_color;
> 
>         vec3 rgb(int r, int g, int b) {
>@@ -424,10 +464,10 @@ TEST_F(ExpressionLimitTest, Recursion)
>             vec3 faceColor2 = rgb(183, 148, 133);
>             gl_FragColor = u_color + vec4(hairColor0 + faceColor2, 0);
>         }
>-    );
>+    )";
> 
>-    static const char* shaderWithRecursion7 = SHADER(
>-        precision mediump float;
>+    static const char *shaderWithRecursion7 =
>+        R"(precision mediump float;
>         uniform vec4 u_color;
> 
>         vec4 function2() {
>@@ -443,10 +483,10 @@ TEST_F(ExpressionLimitTest, Recursion)
>         void main() {
>             gl_FragColor = function1();
>         }
>-    );
>+    )";
> 
>-    static const char* shaderWithRecursion8 = SHADER(
>-        precision mediump float;
>+    static const char *shaderWithRecursion8 =
>+        R"(precision mediump float;
>         uniform vec4 u_color;
> 
>         vec4 function1();
>@@ -466,48 +506,38 @@ TEST_F(ExpressionLimitTest, Recursion)
>         void main() {
>             gl_FragColor = function1();
>         }
>-    );
>+    )";
> 
>     // Check simple recursions fails.
>-    EXPECT_TRUE(CheckShaderCompilation(
>-        vertexCompiler, shaderWithRecursion0,
>-        compileOptions, kHasRecursion));
>+    EXPECT_TRUE(CheckShaderCompilation(vertexCompiler, shaderWithRecursion0, compileOptions,
>+                                       kHasRecursion));
>     // Check simple recursions fails.
>-    EXPECT_TRUE(CheckShaderCompilation(
>-        vertexCompiler, shaderWithRecursion1,
>-        compileOptions, kHasRecursion));
>+    EXPECT_TRUE(CheckShaderCompilation(vertexCompiler, shaderWithRecursion1, compileOptions,
>+                                       kHasRecursion));
>     // Check if recursions fails.
>-    EXPECT_TRUE(CheckShaderCompilation(
>-        vertexCompiler, shaderWithRecursion2,
>-        compileOptions, kHasRecursion));
>+    EXPECT_TRUE(CheckShaderCompilation(vertexCompiler, shaderWithRecursion2, compileOptions,
>+                                       kHasRecursion));
>     // Check if recursions fails.
>-    EXPECT_TRUE(CheckShaderCompilation(
>-        vertexCompiler, shaderWithRecursion3,
>-        compileOptions, kHasRecursion));
>+    EXPECT_TRUE(CheckShaderCompilation(vertexCompiler, shaderWithRecursion3, compileOptions,
>+                                       kHasRecursion));
>     // Check ternary recursions fails.
>-    EXPECT_TRUE(CheckShaderCompilation(
>-        vertexCompiler, shaderWithRecursion4,
>-        compileOptions, kHasRecursion));
>+    EXPECT_TRUE(CheckShaderCompilation(vertexCompiler, shaderWithRecursion4, compileOptions,
>+                                       kHasRecursion));
>     // Check ternary recursions fails.
>-    EXPECT_TRUE(CheckShaderCompilation(
>-        vertexCompiler, shaderWithRecursion5,
>-        compileOptions, kHasRecursion));
>+    EXPECT_TRUE(CheckShaderCompilation(vertexCompiler, shaderWithRecursion5, compileOptions,
>+                                       kHasRecursion));
> 
>     // Check some more forms of recursion
>-    EXPECT_TRUE(CheckShaderCompilation(
>-        vertexCompiler, shaderWithRecursion6,
>-        compileOptions, kHasRecursion));
>-    EXPECT_TRUE(CheckShaderCompilation(
>-        vertexCompiler, shaderWithRecursion7,
>-        compileOptions, kHasRecursion));
>-    EXPECT_TRUE(CheckShaderCompilation(
>-        vertexCompiler, shaderWithRecursion8,
>-        compileOptions, kHasRecursion));
>+    EXPECT_TRUE(CheckShaderCompilation(vertexCompiler, shaderWithRecursion6, compileOptions,
>+                                       kHasRecursion));
>+    EXPECT_TRUE(CheckShaderCompilation(vertexCompiler, shaderWithRecursion7, compileOptions,
>+                                       kHasRecursion));
>+    EXPECT_TRUE(CheckShaderCompilation(vertexCompiler, shaderWithRecursion8, compileOptions,
>+                                       kHasRecursion));
>     // Check unused recursions fails if limiting call stack
>     // since we check all paths.
>-    EXPECT_TRUE(CheckShaderCompilation(
>-        vertexCompiler, shaderWithRecursion6,
>-        compileOptions | SH_LIMIT_CALL_STACK_DEPTH, kHasRecursion));
>+    EXPECT_TRUE(CheckShaderCompilation(vertexCompiler, shaderWithRecursion6,
>+                                       compileOptions | SH_LIMIT_CALL_STACK_DEPTH, kHasRecursion));
> 
>     // Check unused recursions passes.
>     EXPECT_TRUE(
>@@ -539,3 +569,51 @@ TEST_F(ExpressionLimitTest, FunctionParameterCount)
>         compileOptions & ~SH_LIMIT_EXPRESSION_COMPLEXITY, nullptr));
>     sh::Destruct(compiler);
> }
>+
>+TEST_F(ExpressionLimitTest, NestingInsideSwitch)
>+{
>+    ShShaderSpec spec     = SH_WEBGL2_SPEC;
>+    ShShaderOutput output = SH_ESSL_OUTPUT;
>+    ShHandle compiler     = sh::ConstructCompiler(GL_FRAGMENT_SHADER, spec, output, &resources);
>+    ShCompileOptions compileOptions = SH_LIMIT_EXPRESSION_COMPLEXITY;
>+
>+    // Test nesting over the limit fails.
>+    EXPECT_TRUE(CheckShaderCompilation(
>+        compiler, GenerateShaderWithNestingInsideSwitch(kMaxExpressionComplexity + 1).c_str(),
>+        compileOptions, kExpressionTooComplex));
>+    // Test nesting over the limit without limit does not fail.
>+    EXPECT_TRUE(CheckShaderCompilation(
>+        compiler, GenerateShaderWithNestingInsideSwitch(kMaxExpressionComplexity + 1).c_str(),
>+        compileOptions & ~SH_LIMIT_EXPRESSION_COMPLEXITY, nullptr));
>+    // Test that nesting way over the limit doesn't cause stack overflow but is handled
>+    // gracefully.
>+    EXPECT_TRUE(CheckShaderCompilation(compiler,
>+                                       GenerateShaderWithNestingInsideSwitch(5000).c_str(),
>+                                       compileOptions, kTooComplexSwitch));
>+    sh::Destruct(compiler);
>+}
>+
>+TEST_F(ExpressionLimitTest, NestingInsideGlobalInitializer)
>+{
>+    ShShaderSpec spec     = SH_WEBGL_SPEC;
>+    ShShaderOutput output = SH_ESSL_OUTPUT;
>+    ShHandle compiler     = sh::ConstructCompiler(GL_FRAGMENT_SHADER, spec, output, &resources);
>+    ShCompileOptions compileOptions = SH_LIMIT_EXPRESSION_COMPLEXITY;
>+
>+    // Test nesting over the limit fails.
>+    EXPECT_TRUE(CheckShaderCompilation(
>+        compiler,
>+        GenerateShaderWithNestingInsideGlobalInitializer(kMaxExpressionComplexity + 1).c_str(),
>+        compileOptions, kExpressionTooComplex));
>+    // Test nesting over the limit without limit does not fail.
>+    EXPECT_TRUE(CheckShaderCompilation(
>+        compiler,
>+        GenerateShaderWithNestingInsideGlobalInitializer(kMaxExpressionComplexity + 1).c_str(),
>+        compileOptions & ~SH_LIMIT_EXPRESSION_COMPLEXITY, nullptr));
>+    // Test that nesting way over the limit doesn't cause stack overflow but is handled
>+    // gracefully.
>+    EXPECT_TRUE(CheckShaderCompilation(
>+        compiler, GenerateShaderWithNestingInsideGlobalInitializer(5000).c_str(), compileOptions,
>+        kGlobalVariableInit));
>+    sh::Destruct(compiler);
>+}
>diff --git a/Source/ThirdParty/ANGLE/src/tests/compiler_tests/FloatLex_test.cpp b/Source/ThirdParty/ANGLE/src/tests/compiler_tests/FloatLex_test.cpp
>index 013d7ca8eb6..699bcdee8c5 100644
>--- a/Source/ThirdParty/ANGLE/src/tests/compiler_tests/FloatLex_test.cpp
>+++ b/Source/ThirdParty/ANGLE/src/tests/compiler_tests/FloatLex_test.cpp
>@@ -29,8 +29,6 @@ class StrtofClampParser
>     }
> };
> 
>-// NumericLexFloat32OutOfRangeToInfinity usually only comes to play in corner cases of parsing, but
>-// it's useful to test that it works as expected across the whole range of floats.
> class NumericLexFloatParser
> {
>   public:
>@@ -65,7 +63,7 @@ class FloatLexTest : public ::testing::Test
> };
> 
> typedef ::testing::Types<StrtofClampParser, NumericLexFloatParser> FloatParserTypes;
>-TYPED_TEST_CASE(FloatLexTest, FloatParserTypes);
>+TYPED_TEST_SUITE(FloatLexTest, FloatParserTypes);
> 
> TYPED_TEST(FloatLexTest, One)
> {
>@@ -153,6 +151,29 @@ TYPED_TEST(FloatLexTest, SlightlyAboveMaxFloat)
> TYPED_TEST(FloatLexTest, SlightlyBelowMaxFloat)
> {
>     ASSERT_FALSE(TestFixture::IsInfinity("3.4028e38"));
>+    ASSERT_TRUE(TestFixture::ParsedMatches("3.4028e38", 3.4028e38f));
>+}
>+
>+TYPED_TEST(FloatLexTest, SlightlyAboveMaxFloatLargerMantissa)
>+{
>+    ASSERT_TRUE(TestFixture::IsInfinity("34.029e37"));
>+}
>+
>+TYPED_TEST(FloatLexTest, SlightlyBelowMaxFloatLargerMantissa)
>+{
>+    ASSERT_FALSE(TestFixture::IsInfinity("34.028e37"));
>+    ASSERT_TRUE(TestFixture::ParsedMatches("34.028e37", 3.4028e38f));
>+}
>+
>+TYPED_TEST(FloatLexTest, SlightlyAboveMaxFloatSmallerMantissa)
>+{
>+    ASSERT_TRUE(TestFixture::IsInfinity("0.34029e39"));
>+}
>+
>+TYPED_TEST(FloatLexTest, SlightlyBelowMaxFloatSmallerMantissa)
>+{
>+    ASSERT_FALSE(TestFixture::IsInfinity("0.34028e39"));
>+    ASSERT_TRUE(TestFixture::ParsedMatches("0.34028e39", 3.4028e38f));
> }
> 
> TYPED_TEST(FloatLexTest, SlightlyBelowMinSubnormalFloat)
>diff --git a/Source/ThirdParty/ANGLE/src/tests/compiler_tests/FragDepth_test.cpp b/Source/ThirdParty/ANGLE/src/tests/compiler_tests/FragDepth_test.cpp
>index 1d3e358ca68..6c307d99565 100644
>--- a/Source/ThirdParty/ANGLE/src/tests/compiler_tests/FragDepth_test.cpp
>+++ b/Source/ThirdParty/ANGLE/src/tests/compiler_tests/FragDepth_test.cpp
>@@ -7,9 +7,9 @@
> //   Test for GLES SL 3.0 gl_FragDepth variable implementation.
> //
> 
>+#include "GLSLANG/ShaderLang.h"
> #include "angle_gl.h"
> #include "gtest/gtest.h"
>-#include "GLSLANG/ShaderLang.h"
> 
> namespace
> {
>@@ -116,4 +116,4 @@ TEST_P(FragDepthTest, ExtensionFDFailsESSL300)
> }
> 
> // The tests should pass regardless whether the EXT_frag_depth is on or not.
>-INSTANTIATE_TEST_CASE_P(FragDepthTests, FragDepthTest, testing::Values(false, true));
>+INSTANTIATE_TEST_SUITE_P(FragDepthTests, FragDepthTest, testing::Values(false, true));
>diff --git a/Source/ThirdParty/ANGLE/src/tests/compiler_tests/GLSLCompatibilityOutput_test.cpp b/Source/ThirdParty/ANGLE/src/tests/compiler_tests/GLSLCompatibilityOutput_test.cpp
>index 8adec774a1d..aec3bf80466 100644
>--- a/Source/ThirdParty/ANGLE/src/tests/compiler_tests/GLSLCompatibilityOutput_test.cpp
>+++ b/Source/ThirdParty/ANGLE/src/tests/compiler_tests/GLSLCompatibilityOutput_test.cpp
>@@ -7,9 +7,9 @@
> //   Test compiler output for glsl compatibility mode
> //
> 
>+#include "GLSLANG/ShaderLang.h"
> #include "angle_gl.h"
> #include "gtest/gtest.h"
>-#include "GLSLANG/ShaderLang.h"
> #include "tests/test_utils/compiler_test.h"
> 
> using namespace sh;
>@@ -19,8 +19,7 @@ class GLSLCompatibilityOutputTest : public MatchOutputCodeTest
>   public:
>     GLSLCompatibilityOutputTest()
>         : MatchOutputCodeTest(GL_VERTEX_SHADER, SH_VARIABLES, SH_GLSL_COMPATIBILITY_OUTPUT)
>-    {
>-    }
>+    {}
> };
> 
> // Verify gl_Position is written when compiling in compatibility mode
>diff --git a/Source/ThirdParty/ANGLE/src/tests/compiler_tests/GeometryShader_test.cpp b/Source/ThirdParty/ANGLE/src/tests/compiler_tests/GeometryShader_test.cpp
>index ad8512cb1ab..3c401ef65d6 100644
>--- a/Source/ThirdParty/ANGLE/src/tests/compiler_tests/GeometryShader_test.cpp
>+++ b/Source/ThirdParty/ANGLE/src/tests/compiler_tests/GeometryShader_test.cpp
>@@ -25,10 +25,10 @@ class GeometryShaderTest : public ShaderCompileTreeTest
>   protected:
>     void initResources(ShBuiltInResources *resources) override
>     {
>-        resources->OES_geometry_shader = 1;
>+        resources->EXT_geometry_shader = 1;
>     }
> 
>-    ::GLenum getShaderType() const override { return GL_GEOMETRY_SHADER_OES; }
>+    ::GLenum getShaderType() const override { return GL_GEOMETRY_SHADER_EXT; }
> 
>     ShShaderSpec getShaderSpec() const override { return SH_GLES3_1_SPEC; }
> 
>@@ -91,12 +91,10 @@ class GeometryShaderTest : public ShaderCompileTreeTest
>         return sstream.str();
>     }
> 
>-    const std::string kVersion                         = "#version 310 es\n";
>-    const std::array<std::string, 2> kExtensionStrings = {
>-        {"#extension GL_OES_geometry_shader", "#extension GL_EXT_geometry_shader"}};
>+    const std::string kVersion = "#version 310 es\n";
>     const std::string kHeader =
>         "#version 310 es\n"
>-        "#extension GL_OES_geometry_shader : require\n";
>+        "#extension GL_EXT_geometry_shader : require\n";
>     const std::string kInputLayout  = "layout (points) in;\n";
>     const std::string kOutputLayout = "layout (points, max_vertices = 1) out;\n";
> 
>@@ -112,32 +110,15 @@ class GeometryShaderTest : public ShaderCompileTreeTest
>         "void main()\n"
>         "{\n"
>         "}\n";
>-    const std::string kShaderBody =
>-        R"(layout(triangles, invocations = 2) in;
>-        layout(triangle_strip, max_vertices = 3) out;
>-        in vec4 i_color[];
>-        out vec4 o_color;
>-        void main()
>-        {
>-            for (int i = 0; i < i_color.length(); i++)
>-            {
>-                gl_Position = gl_in[i].gl_Position;
>-                o_color = i_color[i];
>-                gl_PrimitiveID = gl_PrimitiveIDIn;
>-                gl_Layer = gl_InvocationID;
>-                EmitVertex();
>-            }
>-            EndPrimitive();
>-        })";
> };
> 
> class GeometryShaderOutputCodeTest : public MatchOutputCodeTest
> {
>   public:
>     GeometryShaderOutputCodeTest()
>-        : MatchOutputCodeTest(GL_GEOMETRY_SHADER_OES, SH_OBJECT_CODE, SH_ESSL_OUTPUT)
>+        : MatchOutputCodeTest(GL_GEOMETRY_SHADER_EXT, SH_OBJECT_CODE, SH_ESSL_OUTPUT)
>     {
>-        getResources()->OES_geometry_shader = 1;
>+        getResources()->EXT_geometry_shader = 1;
>     }
> };
> 
>@@ -145,12 +126,10 @@ class GeometryShaderOutputCodeTest : public MatchOutputCodeTest
> TEST_F(GeometryShaderTest, Version300)
> {
>     const std::string &shaderString =
>-        "#version 300 es\n"
>-        "layout(points) in;\n"
>-        "layout(points, max_vertices = 1) out;\n"
>-        "void main()\n"
>-        "{\n"
>-        "}\n";
>+        R"(#version 300 es
>+        void main()
>+        {
>+        })";
> 
>     if (compile(shaderString))
>     {
>@@ -159,16 +138,14 @@ TEST_F(GeometryShaderTest, Version300)
> }
> 
> // Geometry Shaders are not supported in GLSL ES shaders version 310 without extension
>-// OES_geometry_shader enabled.
>+// EXT_geometry_shader enabled.
> TEST_F(GeometryShaderTest, Version310WithoutExtension)
> {
>     const std::string &shaderString =
>-        "#version 310 es\n"
>-        "layout(points) in;\n"
>-        "layout(points, max_vertices = 1) out;\n"
>-        "void main()\n"
>-        "{\n"
>-        "}\n";
>+        R"(#version 310 es
>+        void main()
>+        {
>+        })";
> 
>     if (compile(shaderString))
>     {
>@@ -176,17 +153,34 @@ TEST_F(GeometryShaderTest, Version310WithoutExtension)
>     }
> }
> 
>-// Geometry Shaders are supported in GLSL ES shaders version 310 with OES_geometry_shader enabled.
>-TEST_F(GeometryShaderTest, Version310WithOESExtension)
>+// Geometry Shaders are not supported in GLSL ES shaders version 310 with extension
>+// EXT_geometry_shader disabled.
>+TEST_F(GeometryShaderTest, Version310ExtensionDisabled)
> {
>     const std::string &shaderString =
>-        "#version 310 es\n"
>-        "#extension GL_OES_geometry_shader : require\n"
>-        "layout(points) in;\n"
>-        "layout(points, max_vertices = 1) out;\n"
>-        "void main()\n"
>-        "{\n"
>-        "}\n";
>+        R"(#version 310 es
>+        #extension GL_EXT_geometry_shader : disable
>+        void main()
>+        {
>+        })";
>+
>+    if (compile(shaderString))
>+    {
>+        FAIL() << "Shader compilation succeeded, expecting failure:\n" << mInfoLog;
>+    }
>+}
>+
>+// Geometry Shaders are supported in GLSL ES shaders version 310 with EXT_geometry_shader enabled.
>+TEST_F(GeometryShaderTest, Version310WithEXTExtension)
>+{
>+    const std::string &shaderString =
>+        R"(#version 310 es
>+        #extension GL_EXT_geometry_shader : require
>+        layout(points) in;
>+        layout(points, max_vertices = 1) out;
>+        void main()
>+        {
>+        })";
> 
>     if (!compile(shaderString))
>     {
>@@ -199,12 +193,12 @@ TEST_F(GeometryShaderTest, Version310WithOESExtension)
> TEST_F(GeometryShaderTest, NoInputPrimitives)
> {
>     const std::string &shaderString =
>-        "#version 310 es\n"
>-        "#extension GL_OES_geometry_shader : require\n"
>-        "layout(points, max_vertices = 1) out;\n"
>-        "void main()\n"
>-        "{\n"
>-        "}\n";
>+        R"(#version 310 es
>+        #extension GL_EXT_geometry_shader : require
>+        layout(points, max_vertices = 1) out;
>+        void main()
>+        {
>+        })";
> 
>     if (!compile(shaderString))
>     {
>@@ -266,13 +260,13 @@ TEST_F(GeometryShaderTest, RedeclareInputPrimitives)
> TEST_F(GeometryShaderTest, DeclareDifferentInputPrimitivesInOneLayout)
> {
>     const std::string &shaderString =
>-        "#version 310 es\n"
>-        "#extension GL_OES_geometry_shader : require\n"
>-        "layout (points, triangles) in;\n"
>-        "layout (points, max_vertices = 1) out;\n"
>-        "void main()\n"
>-        "{\n"
>-        "}\n";
>+        R"(#version 310 es
>+        #extension GL_EXT_geometry_shader : require
>+        layout (points, triangles) in;
>+        layout (points, max_vertices = 1) out;
>+        void main()
>+        {
>+        })";
> 
>     if (compile(shaderString))
>     {
>@@ -284,13 +278,13 @@ TEST_F(GeometryShaderTest, DeclareDifferentInputPrimitivesInOneLayout)
> TEST_F(GeometryShaderTest, InvocationsLessThanOne)
> {
>     const std::string &shaderString =
>-        "#version 310 es\n"
>-        "#extension GL_OES_geometry_shader : require\n"
>-        "layout (points, invocations = 0) in;\n"
>-        "layout (points, max_vertices = 1) out;\n"
>-        "void main()\n"
>-        "{\n"
>-        "}\n";
>+        R"(#version 310 es
>+        #extension GL_EXT_geometry_shader : require
>+        layout (points, invocations = 0) in;
>+        layout (points, max_vertices = 1) out;
>+        void main()
>+        {
>+        })";
> 
>     if (compile(shaderString))
>     {
>@@ -303,13 +297,13 @@ TEST_F(GeometryShaderTest, InvocationsLessThanOne)
> TEST_F(GeometryShaderTest, InvocationsEqualsOne)
> {
>     const std::string &shaderString =
>-        "#version 310 es\n"
>-        "#extension GL_OES_geometry_shader : require\n"
>-        "layout (points, invocations = 1) in;\n"
>-        "layout (points, max_vertices = 1) out;\n"
>-        "void main()\n"
>-        "{\n"
>-        "}\n";
>+        R"(#version 310 es
>+        #extension GL_EXT_geometry_shader : require
>+        layout (points, invocations = 1) in;
>+        layout (points, max_vertices = 1) out;
>+        void main()
>+        {
>+        })";
> 
>     if (!compile(shaderString))
>     {
>@@ -321,14 +315,14 @@ TEST_F(GeometryShaderTest, InvocationsEqualsOne)
> TEST_F(GeometryShaderTest, InvocationsEqualsOneInSeparatedLayout)
> {
>     const std::string &shaderString =
>-        "#version 310 es\n"
>-        "#extension GL_OES_geometry_shader : require\n"
>-        "layout (points) in;\n"
>-        "layout (invocations = 1) in;\n"
>-        "layout (points, max_vertices = 1) out;\n"
>-        "void main()\n"
>-        "{\n"
>-        "}\n";
>+        R"(#version 310 es
>+        #extension GL_EXT_geometry_shader : require
>+        layout (points) in;
>+        layout (invocations = 1) in;
>+        layout (points, max_vertices = 1) out;
>+        void main()
>+        {
>+        })";
> 
>     if (!compile(shaderString))
>     {
>@@ -341,13 +335,13 @@ TEST_F(GeometryShaderTest, InvocationsEqualsOneInSeparatedLayout)
> TEST_F(GeometryShaderTest, TooLargeInvocations)
> {
>     const std::string &shaderString =
>-        "#version 310 es\n"
>-        "#extension GL_OES_geometry_shader : require\n"
>-        "layout (points, invocations = 9989899) in;\n"
>-        "layout (points, max_vertices = 1) out;\n"
>-        "void main()\n"
>-        "{\n"
>-        "}\n";
>+        R"(#version 310 es
>+        #extension GL_EXT_geometry_shader : require
>+        layout (points, invocations = 9989899) in;
>+        layout (points, max_vertices = 1) out;
>+        void main()
>+        {
>+        })";
> 
>     if (compile(shaderString))
>     {
>@@ -359,13 +353,13 @@ TEST_F(GeometryShaderTest, TooLargeInvocations)
> TEST_F(GeometryShaderTest, InvocationsDeclaredWithInputPrimitives)
> {
>     const std::string &shaderString =
>-        "#version 310 es\n"
>-        "#extension GL_OES_geometry_shader : require\n"
>-        "layout (points, invocations = 3) in;\n"
>-        "layout (points, max_vertices = 1) out;\n"
>-        "void main()\n"
>-        "{\n"
>-        "}\n";
>+        R"(#version 310 es
>+        #extension GL_EXT_geometry_shader : require
>+        layout (points, invocations = 3) in;
>+        layout (points, max_vertices = 1) out;
>+        void main()
>+        {
>+        })";
> 
>     if (!compile(shaderString))
>     {
>@@ -377,13 +371,13 @@ TEST_F(GeometryShaderTest, InvocationsDeclaredWithInputPrimitives)
> TEST_F(GeometryShaderTest, InvocationsBeforeInputPrimitives)
> {
>     const std::string &shaderString =
>-        "#version 310 es\n"
>-        "#extension GL_OES_geometry_shader : require\n"
>-        "layout (invocations = 3, points) in;\n"
>-        "layout (points, max_vertices = 1) out;\n"
>-        "void main()\n"
>-        "{\n"
>-        "}\n";
>+        R"(#version 310 es
>+        #extension GL_EXT_geometry_shader : require
>+        layout (invocations = 3, points) in;
>+        layout (points, max_vertices = 1) out;
>+        void main()
>+        {
>+        })";
> 
>     if (!compile(shaderString))
>     {
>@@ -395,14 +389,14 @@ TEST_F(GeometryShaderTest, InvocationsBeforeInputPrimitives)
> TEST_F(GeometryShaderTest, InvocationsInIndividualLayout)
> {
>     const std::string &shaderString =
>-        "#version 310 es\n"
>-        "#extension GL_OES_geometry_shader : require\n"
>-        "layout (points) in;\n"
>-        "layout (invocations = 3) in;\n"
>-        "layout (points, max_vertices = 1) out;\n"
>-        "void main()\n"
>-        "{\n"
>-        "}\n";
>+        R"(#version 310 es
>+        #extension GL_EXT_geometry_shader : require
>+        layout (points) in;
>+        layout (invocations = 3) in;
>+        layout (points, max_vertices = 1) out;
>+        void main()
>+        {
>+        })";
> 
>     if (!compile(shaderString))
>     {
>@@ -414,14 +408,14 @@ TEST_F(GeometryShaderTest, InvocationsInIndividualLayout)
> TEST_F(GeometryShaderTest, DuplicatedInvocations)
> {
>     const std::string &shaderString =
>-        "#version 310 es\n"
>-        "#extension GL_OES_geometry_shader : require\n"
>-        "layout (points, invocations = 3) in;\n"
>-        "layout (invocations = 3) in;\n"
>-        "layout (points, max_vertices = 1) out;\n"
>-        "void main()\n"
>-        "{\n"
>-        "}\n";
>+        R"(#version 310 es
>+        #extension GL_EXT_geometry_shader : require
>+        layout (points, invocations = 3) in;
>+        layout (invocations = 3) in;
>+        layout (points, max_vertices = 1) out;
>+        void main()
>+        {
>+        })";
> 
>     if (!compile(shaderString))
>     {
>@@ -434,14 +428,14 @@ TEST_F(GeometryShaderTest, DuplicatedInvocations)
> TEST_F(GeometryShaderTest, RedeclareDifferentInvocations)
> {
>     const std::string &shaderString =
>-        "#version 310 es\n"
>-        "#extension GL_OES_geometry_shader : require\n"
>-        "layout (points, invocations = 3) in;\n"
>-        "layout (invocations = 5) in;\n"
>-        "layout (points, max_vertices = 1) out;\n"
>-        "void main()\n"
>-        "{\n"
>-        "}\n";
>+        R"(#version 310 es
>+        #extension GL_EXT_geometry_shader : require
>+        layout (points, invocations = 3) in;
>+        layout (invocations = 5) in;
>+        layout (points, max_vertices = 1) out;
>+        void main()
>+        {
>+        })";
> 
>     if (compile(shaderString))
>     {
>@@ -454,14 +448,14 @@ TEST_F(GeometryShaderTest, RedeclareDifferentInvocations)
> TEST_F(GeometryShaderTest, RedeclareDifferentInvocationsAfterInvocationEqualsOne)
> {
>     const std::string &shaderString =
>-        "#version 310 es\n"
>-        "#extension GL_OES_geometry_shader : require\n"
>-        "layout (points, invocations = 1) in;\n"
>-        "layout (invocations = 5) in;\n"
>-        "layout (points, max_vertices = 1) out;\n"
>-        "void main()\n"
>-        "{\n"
>-        "}\n";
>+        R"(#version 310 es
>+        #extension GL_EXT_geometry_shader : require
>+        layout (points, invocations = 1) in;
>+        layout (invocations = 5) in;
>+        layout (points, max_vertices = 1) out;
>+        void main()
>+        {
>+        })";
> 
>     if (compile(shaderString))
>     {
>@@ -473,13 +467,13 @@ TEST_F(GeometryShaderTest, RedeclareDifferentInvocationsAfterInvocationEqualsOne
> TEST_F(GeometryShaderTest, RedeclareDifferentInvocationsInOneLayout)
> {
>     const std::string &shaderString =
>-        "#version 310 es\n"
>-        "#extension GL_OES_geometry_shader : require\n"
>-        "layout (points, invocations = 3, invocations = 5) in;\n"
>-        "layout (points, max_vertices = 1) out;\n"
>-        "void main()\n"
>-        "{\n"
>-        "}\n";
>+        R"(#version 310 es
>+        #extension GL_EXT_geometry_shader : require
>+        layout (points, invocations = 3, invocations = 5) in;
>+        layout (points, max_vertices = 1) out;
>+        void main()
>+        {
>+        })";
> 
>     if (compile(shaderString))
>     {
>@@ -491,13 +485,13 @@ TEST_F(GeometryShaderTest, RedeclareDifferentInvocationsInOneLayout)
> TEST_F(GeometryShaderTest, DeclareInvocationsInOutLayout)
> {
>     const std::string &shaderString =
>-        "#version 310 es\n"
>-        "#extension GL_OES_geometry_shader : require\n"
>-        "layout (points) in;\n"
>-        "layout (points, invocations = 3, max_vertices = 1) out;\n"
>-        "void main()\n"
>-        "{\n"
>-        "}\n";
>+        R"(#version 310 es
>+        #extension GL_EXT_geometry_shader : require
>+        layout (points) in;
>+        layout (points, invocations = 3, max_vertices = 1) out;
>+        void main()
>+        {
>+        })";
> 
>     if (compile(shaderString))
>     {
>@@ -509,14 +503,14 @@ TEST_F(GeometryShaderTest, DeclareInvocationsInOutLayout)
> TEST_F(GeometryShaderTest, DeclareInvocationsInLayoutNoQualifier)
> {
>     const std::string &shaderString =
>-        "#version 310 es\n"
>-        "#extension GL_OES_geometry_shader : require\n"
>-        "layout (points) in;\n"
>-        "layout (invocations = 3);\n"
>-        "layout (points, max_vertices = 1) out;\n"
>-        "void main()\n"
>-        "{\n"
>-        "}\n";
>+        R"(#version 310 es
>+        #extension GL_EXT_geometry_shader : require
>+        layout (points) in;
>+        layout (invocations = 3);
>+        layout (points, max_vertices = 1) out;
>+        void main()
>+        {
>+        })";
> 
>     if (compile(shaderString))
>     {
>@@ -528,13 +522,13 @@ TEST_F(GeometryShaderTest, DeclareInvocationsInLayoutNoQualifier)
> TEST_F(GeometryShaderTest, DeclareOutputPrimitiveBeforeInputPrimitiveDeclare)
> {
>     const std::string &shaderString =
>-        "#version 310 es\n"
>-        "#extension GL_OES_geometry_shader : require\n"
>-        "layout (points, max_vertices = 1) out;\n"
>-        "layout (points) in;\n"
>-        "void main()\n"
>-        "{\n"
>-        "}\n";
>+        R"(#version 310 es
>+        #extension GL_EXT_geometry_shader : require
>+        layout (points, max_vertices = 1) out;
>+        layout (points) in;
>+        void main()
>+        {
>+        })";
> 
>     if (!compile(shaderString))
>     {
>@@ -546,13 +540,13 @@ TEST_F(GeometryShaderTest, DeclareOutputPrimitiveBeforeInputPrimitiveDeclare)
> TEST_F(GeometryShaderTest, DeclareMaxVerticesBeforeOutputPrimitive)
> {
>     const std::string &shaderString =
>-        "#version 310 es\n"
>-        "#extension GL_OES_geometry_shader : require\n"
>-        "layout (points) in;\n"
>-        "layout (max_vertices = 1, points) out;\n"
>-        "void main()\n"
>-        "{\n"
>-        "}\n";
>+        R"(#version 310 es
>+        #extension GL_EXT_geometry_shader : require
>+        layout (points) in;
>+        layout (max_vertices = 1, points) out;
>+        void main()
>+        {
>+        })";
> 
>     if (!compile(shaderString))
>     {
>@@ -565,13 +559,13 @@ TEST_F(GeometryShaderTest, DeclareMaxVerticesBeforeOutputPrimitive)
> TEST_F(GeometryShaderTest, NoOutputPrimitives)
> {
>     const std::string &shaderString =
>-        "#version 310 es\n"
>-        "#extension GL_OES_geometry_shader : require\n"
>-        "layout (points) in;\n"
>-        "layout (max_vertices = 1) out;\n"
>-        "void main()\n"
>-        "{\n"
>-        "}\n";
>+        R"(#version 310 es
>+        #extension GL_EXT_geometry_shader : require
>+        layout (points) in;
>+        layout (max_vertices = 1) out;
>+        void main()
>+        {
>+        })";
> 
>     if (!compile(shaderString))
>     {
>@@ -634,13 +628,13 @@ TEST_F(GeometryShaderTest, RedeclareOutputPrimitives)
> TEST_F(GeometryShaderTest, RedeclareDifferentOutputPrimitivesInOneLayout)
> {
>     const std::string &shaderString =
>-        "#version 310 es\n"
>-        "#extension GL_OES_geometry_shader : require\n"
>-        "layout (points) in;\n"
>-        "layout (points, max_vertices = 3, line_strip) out;\n"
>-        "void main()\n"
>-        "{\n"
>-        "}\n";
>+        R"(#version 310 es
>+        #extension GL_EXT_geometry_shader : require
>+        layout (points) in;
>+        layout (points, max_vertices = 3, line_strip) out;
>+        void main()
>+        {
>+        })";
> 
>     if (compile(shaderString))
>     {
>@@ -653,12 +647,12 @@ TEST_F(GeometryShaderTest, RedeclareDifferentOutputPrimitivesInOneLayout)
> TEST_F(GeometryShaderTest, NoOutLayouts)
> {
>     const std::string &shaderString =
>-        "#version 310 es\n"
>-        "#extension GL_OES_geometry_shader : require\n"
>-        "layout (points) in;\n"
>-        "void main()\n"
>-        "{\n"
>-        "}\n";
>+        R"(#version 310 es
>+        #extension GL_EXT_geometry_shader : require
>+        layout (points) in;
>+        void main()
>+        {
>+        })";
> 
>     if (!compile(shaderString))
>     {
>@@ -671,13 +665,13 @@ TEST_F(GeometryShaderTest, NoOutLayouts)
> TEST_F(GeometryShaderTest, NoMaxVertices)
> {
>     const std::string &shaderString =
>-        "#version 310 es\n"
>-        "#extension GL_OES_geometry_shader : require\n"
>-        "layout (points) in;\n"
>-        "layout (points) out;\n"
>-        "void main()\n"
>-        "{\n"
>-        "}\n";
>+        R"(#version 310 es
>+        #extension GL_EXT_geometry_shader : require
>+        layout (points) in;
>+        layout (points) out;
>+        void main()
>+        {
>+        })";
> 
>     if (!compile(shaderString))
>     {
>@@ -689,13 +683,13 @@ TEST_F(GeometryShaderTest, NoMaxVertices)
> TEST_F(GeometryShaderTest, NegativeMaxVertices)
> {
>     const std::string &shaderString =
>-        "#version 310 es\n"
>-        "#extension GL_OES_geometry_shader : require\n"
>-        "layout (points) in;\n"
>-        "layout (points, max_vertices = -1) out;\n"
>-        "void main()\n"
>-        "{\n"
>-        "}\n";
>+        R"(#version 310 es
>+        #extension GL_EXT_geometry_shader : require
>+        layout (points) in;
>+        layout (points, max_vertices = -1) out;
>+        void main()
>+        {
>+        })";
> 
>     if (compile(shaderString))
>     {
>@@ -707,13 +701,13 @@ TEST_F(GeometryShaderTest, NegativeMaxVertices)
> TEST_F(GeometryShaderTest, ZeroMaxVertices)
> {
>     const std::string &shaderString =
>-        "#version 310 es\n"
>-        "#extension GL_OES_geometry_shader : require\n"
>-        "layout (points) in;\n"
>-        "layout (points, max_vertices = 0) out;\n"
>-        "void main()\n"
>-        "{\n"
>-        "}\n";
>+        R"(#version 310 es
>+        #extension GL_EXT_geometry_shader : require
>+        layout (points) in;
>+        layout (points, max_vertices = 0) out;
>+        void main()
>+        {
>+        })";
> 
>     if (!compile(shaderString))
>     {
>@@ -726,13 +720,13 @@ TEST_F(GeometryShaderTest, ZeroMaxVertices)
> TEST_F(GeometryShaderTest, TooLargeMaxVertices)
> {
>     const std::string &shaderString =
>-        "#version 310 es\n"
>-        "#extension GL_OES_geometry_shader : require\n"
>-        "layout (points) in;\n"
>-        "layout (points, max_vertices = 257) out;\n"
>-        "void main()\n"
>-        "{\n"
>-        "}\n";
>+        R"(#version 310 es
>+        #extension GL_EXT_geometry_shader : require
>+        layout (points) in;
>+        layout (points, max_vertices = 257) out;
>+        void main()
>+        {
>+        })";
> 
>     if (compile(shaderString))
>     {
>@@ -744,14 +738,14 @@ TEST_F(GeometryShaderTest, TooLargeMaxVertices)
> TEST_F(GeometryShaderTest, MaxVerticesInIndividualLayout)
> {
>     const std::string &shaderString =
>-        "#version 310 es\n"
>-        "#extension GL_OES_geometry_shader : require\n"
>-        "layout (points) in;\n"
>-        "layout (points) out;\n"
>-        "layout (max_vertices = 1) out;\n"
>-        "void main()\n"
>-        "{\n"
>-        "}\n";
>+        R"(#version 310 es
>+        #extension GL_EXT_geometry_shader : require
>+        layout (points) in;
>+        layout (points) out;
>+        layout (max_vertices = 1) out;
>+        void main()
>+        {
>+        })";
> 
>     if (!compile(shaderString))
>     {
>@@ -763,14 +757,14 @@ TEST_F(GeometryShaderTest, MaxVerticesInIndividualLayout)
> TEST_F(GeometryShaderTest, DuplicatedMaxVertices)
> {
>     const std::string &shaderString =
>-        "#version 310 es\n"
>-        "#extension GL_OES_geometry_shader : require\n"
>-        "layout (points) in;\n"
>-        "layout (points, max_vertices = 1) out;\n"
>-        "layout (max_vertices = 1) out;\n"
>-        "void main()\n"
>-        "{\n"
>-        "}\n";
>+        R"(#version 310 es
>+        #extension GL_EXT_geometry_shader : require
>+        layout (points) in;
>+        layout (points, max_vertices = 1) out;
>+        layout (max_vertices = 1) out;
>+        void main()
>+        {
>+        })";
> 
>     if (!compile(shaderString))
>     {
>@@ -782,14 +776,14 @@ TEST_F(GeometryShaderTest, DuplicatedMaxVertices)
> TEST_F(GeometryShaderTest, RedeclareDifferentMaxVertices)
> {
>     const std::string &shaderString =
>-        "#version 310 es\n"
>-        "#extension GL_OES_geometry_shader : require\n"
>-        "layout (points) in;\n"
>-        "layout (points, max_vertices = 1) out;\n"
>-        "layout (max_vertices = 2) out;\n"
>-        "void main()\n"
>-        "{\n"
>-        "}\n";
>+        R"(#version 310 es
>+        #extension GL_EXT_geometry_shader : require
>+        layout (points) in;
>+        layout (points, max_vertices = 1) out;
>+        layout (max_vertices = 2) out;
>+        void main()
>+        {
>+        })";
> 
>     if (compile(shaderString))
>     {
>@@ -801,13 +795,13 @@ TEST_F(GeometryShaderTest, RedeclareDifferentMaxVertices)
> TEST_F(GeometryShaderTest, RedeclareDifferentMaxVerticesInOneLayout)
> {
>     const std::string &shaderString =
>-        "#version 310 es\n"
>-        "#extension GL_OES_geometry_shader : require\n"
>-        "layout (points) in;\n"
>-        "layout (points, max_vertices = 2, max_vertices = 1) out;\n"
>-        "void main()\n"
>-        "{\n"
>-        "}\n";
>+        R"(#version 310 es
>+        #extension GL_EXT_geometry_shader : require
>+        layout (points) in;
>+        layout (points, max_vertices = 2, max_vertices = 1) out;
>+        void main()
>+        {
>+        })";
> 
>     if (compile(shaderString))
>     {
>@@ -819,42 +813,42 @@ TEST_F(GeometryShaderTest, RedeclareDifferentMaxVerticesInOneLayout)
> TEST_F(GeometryShaderTest, InvalidLocation)
> {
>     const std::string &shaderString1 =
>-        "#version 310 es\n"
>-        "#extension GL_OES_geometry_shader : require\n"
>-        "layout (points, location = 1) in;\n"
>-        "layout (points, max_vertices = 2) out;\n"
>-        "void main()\n"
>-        "{\n"
>-        "}\n";
>+        R"(#version 310 es
>+        #extension GL_EXT_geometry_shader : require
>+        layout (points, location = 1) in;
>+        layout (points, max_vertices = 2) out;
>+        void main()
>+        {
>+        })";
> 
>     const std::string &shaderString2 =
>-        "#version 310 es\n"
>-        "#extension GL_OES_geometry_shader : require\n"
>-        "layout (points) in;\n"
>-        "layout (invocations = 2, location = 1) in;\n"
>-        "layout (points, max_vertices = 2) out;\n"
>-        "void main()\n"
>-        "{\n"
>-        "}\n";
>+        R"(#version 310 es
>+        #extension GL_EXT_geometry_shader : require
>+        layout (points) in;
>+        layout (invocations = 2, location = 1) in;
>+        layout (points, max_vertices = 2) out;
>+        void main()
>+        {
>+        })";
> 
>     const std::string &shaderString3 =
>-        "#version 310 es\n"
>-        "#extension GL_OES_geometry_shader : require\n"
>-        "layout (points) in;\n"
>-        "layout (points, location = 3, max_vertices = 2) out;\n"
>-        "void main()\n"
>-        "{\n"
>-        "}\n";
>+        R"(#version 310 es
>+        #extension GL_EXT_geometry_shader : require
>+        layout (points) in;
>+        layout (points, location = 3, max_vertices = 2) out;
>+        void main()
>+        {
>+        })";
> 
>     const std::string &shaderString4 =
>-        "#version 310 es\n"
>-        "#extension GL_OES_geometry_shader : require\n"
>-        "layout (points) in;\n"
>-        "layout (points) out;\n"
>-        "layout (max_vertices = 2, location = 3) out;\n"
>-        "void main()\n"
>-        "{\n"
>-        "}\n";
>+        R"(#version 310 es
>+        #extension GL_EXT_geometry_shader : require
>+        layout (points) in;
>+        layout (points) out;
>+        layout (max_vertices = 2, location = 3) out;
>+        void main()
>+        {
>+        })";
> 
>     if (compile(shaderString1) || compile(shaderString2) || compile(shaderString3) ||
>         compile(shaderString4))
>@@ -867,41 +861,41 @@ TEST_F(GeometryShaderTest, InvalidLocation)
> TEST_F(GeometryShaderTest, InvalidLayoutQualifiers)
> {
>     const std::string &shaderString1 =
>-        "#version 310 es\n"
>-        "#extension GL_OES_geometry_shader : require\n"
>-        "layout (points, abc) in;\n"
>-        "layout (points, max_vertices = 2) out;\n"
>-        "void main()\n"
>-        "{\n"
>-        "}\n";
>+        R"(#version 310 es
>+        #extension GL_EXT_geometry_shader : require
>+        layout (points, abc) in;
>+        layout (points, max_vertices = 2) out;
>+        void main()
>+        {
>+        })";
> 
>     const std::string &shaderString2 =
>-        "#version 310 es\n"
>-        "#extension GL_OES_geometry_shader : require\n"
>-        "layout (points) in;\n"
>-        "layout (points, abc, max_vertices = 2) out;\n"
>-        "void main()\n"
>-        "{\n"
>-        "}\n";
>+        R"(#version 310 es
>+        #extension GL_EXT_geometry_shader : require
>+        layout (points) in;
>+        layout (points, abc, max_vertices = 2) out;
>+        void main()
>+        {
>+        })";
> 
>     const std::string &shaderString3 =
>-        "#version 310 es\n"
>-        "#extension GL_OES_geometry_shader : require\n"
>-        "layout (points, xyz = 2) in;\n"
>-        "layout (points, max_vertices = 2) out;\n"
>-        "void main()\n"
>-        "{\n"
>-        "}\n";
>+        R"(#version 310 es
>+        #extension GL_EXT_geometry_shader : require
>+        layout (points, xyz = 2) in;
>+        layout (points, max_vertices = 2) out;
>+        void main()
>+        {
>+        })";
> 
>-    const std::string &shaderString4 =
>-        "#version 310 es\n"
>-        "#extension GL_OES_geometry_shader : require\n"
>-        "layout (points) in;\n"
>-        "layout (points) out;\n"
>-        "layout (max_vertices = 2, xyz = 3) out;\n"
>-        "void main()\n"
>-        "{\n"
>-        "}\n";
>+    const std::string &shaderString4 =
>+        R"(#version 310 es
>+        #extension GL_EXT_geometry_shader : require
>+        layout (points) in;
>+        layout (points) out;
>+        layout (max_vertices = 2, xyz = 3) out;
>+        void main()
>+        {
>+        })";
> 
>     if (compile(shaderString1) || compile(shaderString2) || compile(shaderString3) ||
>         compile(shaderString4))
>@@ -914,15 +908,15 @@ TEST_F(GeometryShaderTest, InvalidLayoutQualifiers)
> TEST_F(GeometryShaderTest, IndexGLInByConstantInteger)
> {
>     const std::string &shaderString =
>-        "#version 310 es\n"
>-        "#extension GL_OES_geometry_shader : require\n"
>-        "layout (points) in;\n"
>-        "layout (points, max_vertices = 2) out;\n"
>-        "void main()\n"
>-        "{\n"
>-        "    vec4 position;\n"
>-        "    position = gl_in[0].gl_Position;\n"
>-        "}\n";
>+        R"(#version 310 es
>+        #extension GL_EXT_geometry_shader : require
>+        layout (points) in;
>+        layout (points, max_vertices = 2) out;
>+        void main()
>+        {
>+            vec4 position;
>+            position = gl_in[0].gl_Position;
>+        })";
> 
>     if (!compile(shaderString))
>     {
>@@ -934,18 +928,18 @@ TEST_F(GeometryShaderTest, IndexGLInByConstantInteger)
> TEST_F(GeometryShaderTest, IndexGLInByVariable)
> {
>     const std::string &shaderString =
>-        "#version 310 es\n"
>-        "#extension GL_OES_geometry_shader : require\n"
>-        "layout (lines) in;\n"
>-        "layout (points, max_vertices = 2) out;\n"
>-        "void main()\n"
>-        "{\n"
>-        "    vec4 position;\n"
>-        "    for (int i = 0; i < 2; i++)\n"
>-        "    {\n"
>-        "        position = gl_in[i].gl_Position;\n"
>-        "    }\n"
>-        "}\n";
>+        R"(#version 310 es
>+        #extension GL_EXT_geometry_shader : require
>+        layout (lines) in;
>+        layout (points, max_vertices = 2) out;
>+        void main()
>+        {
>+            vec4 position;
>+            for (int i = 0; i < 2; i++)
>+            {
>+                position = gl_in[i].gl_Position;
>+            }
>+        })";
> 
>     if (!compile(shaderString))
>     {
>@@ -958,13 +952,13 @@ TEST_F(GeometryShaderTest, IndexGLInByVariable)
> TEST_F(GeometryShaderTest, IndexGLInWithoutInputPrimitive)
> {
>     const std::string &shaderString =
>-        "#version 310 es\n"
>-        "#extension GL_OES_geometry_shader : require\n"
>-        "layout (points, max_vertices = 2) out;\n"
>-        "void main()\n"
>-        "{\n"
>-        "    vec4 position = gl_in[0].gl_Position;\n"
>-        "}\n";
>+        R"(#version 310 es
>+        #extension GL_EXT_geometry_shader : require
>+        layout (points, max_vertices = 2) out;
>+        void main()
>+        {
>+            vec4 position = gl_in[0].gl_Position;
>+        })";
> 
>     if (compile(shaderString))
>     {
>@@ -976,13 +970,13 @@ TEST_F(GeometryShaderTest, IndexGLInWithoutInputPrimitive)
> TEST_F(GeometryShaderTest, UseGLInLengthWithoutInputPrimitive)
> {
>     const std::string &shaderString =
>-        "#version 310 es\n"
>-        "#extension GL_OES_geometry_shader : require\n"
>-        "layout (points, max_vertices = 2) out;\n"
>-        "void main()\n"
>-        "{\n"
>-        "    int length = gl_in.length();\n"
>-        "}\n";
>+        R"(#version 310 es
>+        #extension GL_EXT_geometry_shader : require
>+        layout (points, max_vertices = 2) out;
>+        void main()
>+        {
>+            int length = gl_in.length();
>+        })";
> 
>     if (compile(shaderString))
>     {
>@@ -995,7 +989,7 @@ TEST_F(GeometryShaderTest, UseGLInLengthWithInputPrimitive)
> {
>     const std::string &shaderString =
>         R"(#version 310 es
>-        #extension GL_OES_geometry_shader : require
>+        #extension GL_EXT_geometry_shader : require
>         layout (points) in;
>         layout (points, max_vertices = 2) out;
>         void main()
>@@ -1014,14 +1008,14 @@ TEST_F(GeometryShaderTest, UseGLInLengthWithInputPrimitive)
> TEST_F(GeometryShaderTest, AssignValueToGLIn)
> {
>     const std::string &shaderString =
>-        "#version 310 es\n"
>-        "#extension GL_OES_geometry_shader : require\n"
>-        "layout (points) in;\n"
>-        "layout (points, max_vertices = 2) out;\n"
>-        "void main()\n"
>-        "{\n"
>-        "    gl_in[0].gl_Position = vec4(0, 0, 0, 1);\n"
>-        "}\n";
>+        R"(#version 310 es
>+        #extension GL_EXT_geometry_shader : require
>+        layout (points) in;
>+        layout (points, max_vertices = 2) out;
>+        void main()
>+        {
>+            gl_in[0].gl_Position = vec4(0, 0, 0, 1);
>+        })";
>     if (compile(shaderString))
>     {
>         FAIL() << "Shader compilation succeeded, expecting failure:\n" << mInfoLog;
>@@ -1032,18 +1026,18 @@ TEST_F(GeometryShaderTest, AssignValueToGLIn)
> TEST_F(GeometryShaderTest, BuiltInVariables)
> {
>     const std::string &shaderString =
>-        "#version 310 es\n"
>-        "#extension GL_OES_geometry_shader : require\n"
>-        "layout (points, invocations = 2) in;\n"
>-        "layout (points, max_vertices = 2) out;\n"
>-        "void main()\n"
>-        "{\n"
>-        "    gl_Position = gl_in[gl_InvocationID].gl_Position;\n"
>-        "    int invocation = gl_InvocationID;\n"
>-        "    gl_Layer = invocation;\n"
>-        "    int primitiveIn = gl_PrimitiveIDIn;\n"
>-        "    gl_PrimitiveID = primitiveIn;\n"
>-        "}\n";
>+        R"(#version 310 es
>+        #extension GL_EXT_geometry_shader : require
>+        layout (points, invocations = 2) in;
>+        layout (points, max_vertices = 2) out;
>+        void main()
>+        {
>+            gl_Position = gl_in[gl_InvocationID].gl_Position;
>+            int invocation = gl_InvocationID;
>+            gl_Layer = invocation;
>+            int primitiveIn = gl_PrimitiveIDIn;
>+            gl_PrimitiveID = primitiveIn;
>+        })";
>     if (!compile(shaderString))
>     {
>         FAIL() << "Shader compilation failed, expecting success:\n" << mInfoLog;
>@@ -1054,14 +1048,14 @@ TEST_F(GeometryShaderTest, BuiltInVariables)
> TEST_F(GeometryShaderTest, AssignValueToGLPrimitiveIn)
> {
>     const std::string &shaderString =
>-        "#version 310 es\n"
>-        "#extension GL_OES_geometry_shader : require\n"
>-        "layout (points, invocations = 2) in;\n"
>-        "layout (points, max_vertices = 2) out;\n"
>-        "void main()\n"
>-        "{\n"
>-        "    gl_PrimitiveIDIn = 1;\n"
>-        "}\n";
>+        R"(#version 310 es
>+        #extension GL_EXT_geometry_shader : require
>+        layout (points, invocations = 2) in;
>+        layout (points, max_vertices = 2) out;
>+        void main()
>+        {
>+            gl_PrimitiveIDIn = 1;
>+        })";
>     if (compile(shaderString))
>     {
>         FAIL() << "Shader compilation succeeded, expecting failure:\n" << mInfoLog;
>@@ -1072,14 +1066,14 @@ TEST_F(GeometryShaderTest, AssignValueToGLPrimitiveIn)
> TEST_F(GeometryShaderTest, AssignValueToGLInvocations)
> {
>     const std::string &shaderString =
>-        "#version 310 es\n"
>-        "#extension GL_OES_geometry_shader : require\n"
>-        "layout (points, invocations = 2) in;\n"
>-        "layout (points, max_vertices = 2) out;\n"
>-        "void main()\n"
>-        "{\n"
>-        "    gl_InvocationID = 1;\n"
>-        "}\n";
>+        R"(#version 310 es
>+        #extension GL_EXT_geometry_shader : require
>+        layout (points, invocations = 2) in;
>+        layout (points, max_vertices = 2) out;
>+        void main()
>+        {
>+            gl_InvocationID = 1;
>+        })";
>     if (compile(shaderString))
>     {
>         FAIL() << "Shader compilation succeeded, expecting failure:\n" << mInfoLog;
>@@ -1090,16 +1084,16 @@ TEST_F(GeometryShaderTest, AssignValueToGLInvocations)
> TEST_F(GeometryShaderTest, GeometryShaderBuiltInFunctions)
> {
>     const std::string &shaderString =
>-        "#version 310 es\n"
>-        "#extension GL_OES_geometry_shader : require\n"
>-        "layout (points) in;\n"
>-        "layout (points, max_vertices = 2) out;\n"
>-        "void main()\n"
>-        "{\n"
>-        "    gl_Position = gl_in[0].gl_Position;\n"
>-        "    EmitVertex();\n"
>-        "    EndPrimitive();\n"
>-        "}\n";
>+        R"(#version 310 es
>+        #extension GL_EXT_geometry_shader : require
>+        layout (points) in;
>+        layout (points, max_vertices = 2) out;
>+        void main()
>+        {
>+            gl_Position = gl_in[0].gl_Position;
>+            EmitVertex();
>+            EndPrimitive();
>+        })";
> 
>     if (!compile(shaderString))
>     {
>@@ -1107,23 +1101,23 @@ TEST_F(GeometryShaderTest, GeometryShaderBuiltInFunctions)
>     }
> }
> 
>-// Verify that using EmitVertex() or EndPrimitive() without GL_OES_geometry_shader declared causes a
>+// Verify that using EmitVertex() or EndPrimitive() without GL_EXT_geometry_shader declared causes a
> // compile error.
> TEST_F(GeometryShaderTest, GeometryShaderBuiltInFunctionsWithoutExtension)
> {
>     const std::string &shaderString1 =
>-        "#version 310 es\n"
>-        "void main()\n"
>-        "{\n"
>-        "    EmitVertex();\n"
>-        "}\n";
>+        R"(#version 310 es
>+        void main()
>+        {
>+            EmitVertex();
>+        })";
> 
>     const std::string &shaderString2 =
>-        "#version 310 es\n"
>-        "void main()\n"
>-        "{\n"
>-        "    EndPrimitive();\n"
>-        "}\n";
>+        R"(#version 310 es
>+        void main()
>+        {
>+            EndPrimitive();
>+        })";
> 
>     if (compile(shaderString1) || compile(shaderString2))
>     {
>@@ -1136,7 +1130,7 @@ TEST_F(GeometryShaderTest, GeometryShaderBuiltInConstants)
> {
>     const std::string &kShaderHeader =
>         R"(#version 310 es
>-        #extension GL_OES_geometry_shader : require
>+        #extension GL_EXT_geometry_shader : require
>         layout (points) in;
>         layout (points, max_vertices = 2) out;
>         void main()
>@@ -1144,10 +1138,14 @@ TEST_F(GeometryShaderTest, GeometryShaderBuiltInConstants)
>             gl_Position.x = float()";
> 
>     const std::array<std::string, 9> kGeometryShaderBuiltinConstants = {{
>-        "gl_MaxGeometryInputComponents", "gl_MaxGeometryOutputComponents",
>-        "gl_MaxGeometryImageUniforms", "gl_MaxGeometryTextureImageUnits",
>-        "gl_MaxGeometryOutputVertices", "gl_MaxGeometryTotalOutputComponents",
>-        "gl_MaxGeometryUniformComponents", "gl_MaxGeometryAtomicCounters",
>+        "gl_MaxGeometryInputComponents",
>+        "gl_MaxGeometryOutputComponents",
>+        "gl_MaxGeometryImageUniforms",
>+        "gl_MaxGeometryTextureImageUnits",
>+        "gl_MaxGeometryOutputVertices",
>+        "gl_MaxGeometryTotalOutputComponents",
>+        "gl_MaxGeometryUniformComponents",
>+        "gl_MaxGeometryAtomicCounters",
>         "gl_MaxGeometryAtomicCounterBuffers",
>     }};
> 
>@@ -1167,7 +1165,7 @@ TEST_F(GeometryShaderTest, GeometryShaderBuiltInConstants)
>     }
> }
> 
>-// Verify that using any Geometry Shader built-in constant values without GL_OES_geometry_shader
>+// Verify that using any Geometry Shader built-in constant values without GL_EXT_geometry_shader
> // declared causes a compile error.
> TEST_F(GeometryShaderTest, GeometryShaderBuiltInConstantsWithoutExtension)
> {
>@@ -1178,10 +1176,14 @@ TEST_F(GeometryShaderTest, GeometryShaderBuiltInConstantsWithoutExtension)
>         "    int val = ";
> 
>     const std::array<std::string, 9> kGeometryShaderBuiltinConstants = {{
>-        "gl_MaxGeometryInputComponents", "gl_MaxGeometryOutputComponents",
>-        "gl_MaxGeometryImageUniforms", "gl_MaxGeometryTextureImageUnits",
>-        "gl_MaxGeometryOutputVertices", "gl_MaxGeometryTotalOutputComponents",
>-        "gl_MaxGeometryUniformComponents", "gl_MaxGeometryAtomicCounters",
>+        "gl_MaxGeometryInputComponents",
>+        "gl_MaxGeometryOutputComponents",
>+        "gl_MaxGeometryImageUniforms",
>+        "gl_MaxGeometryTextureImageUnits",
>+        "gl_MaxGeometryOutputVertices",
>+        "gl_MaxGeometryTotalOutputComponents",
>+        "gl_MaxGeometryUniformComponents",
>+        "gl_MaxGeometryAtomicCounters",
>         "gl_MaxGeometryAtomicCounterBuffers",
>     }};
> 
>@@ -1204,14 +1206,14 @@ TEST_F(GeometryShaderTest, GeometryShaderBuiltInConstantsWithoutExtension)
> TEST_F(GeometryShaderTest, NonArrayInput)
> {
>     const std::string &shaderString =
>-        "#version 310 es\n"
>-        "#extension GL_OES_geometry_shader : require\n"
>-        "layout (points) in;\n"
>-        "layout (points, max_vertices = 1) out;\n"
>-        "in vec4 texcoord;\n"
>-        "void main()\n"
>-        "{\n"
>-        "}\n";
>+        R"(#version 310 es
>+        #extension GL_EXT_geometry_shader : require
>+        layout (points) in;
>+        layout (points, max_vertices = 1) out;
>+        in vec4 texcoord;
>+        void main()
>+        {
>+        })";
> 
>     if (compile(shaderString))
>     {
>@@ -1224,29 +1226,29 @@ TEST_F(GeometryShaderTest, NonArrayInput)
> TEST_F(GeometryShaderTest, DeclareUnsizedInputBeforeInputPrimitive)
> {
>     const std::string &shaderString1 =
>-        "#version 310 es\n"
>-        "#extension GL_OES_geometry_shader : require\n"
>-        "in vec4 texcoord[];\n"
>-        "layout (points) in;\n"
>-        "layout (points, max_vertices = 1) out;\n"
>-        "void main()\n"
>-        "{\n"
>-        "    vec4 coord = texcoord[0];\n"
>-        "    int length = texcoord.length();\n"
>-        "}\n";
>+        R"(#version 310 es
>+        #extension GL_EXT_geometry_shader : require
>+        in vec4 texcoord[];
>+        layout (points) in;
>+        layout (points, max_vertices = 1) out;
>+        void main()
>+        {
>+            vec4 coord = texcoord[0];
>+            int length = texcoord.length();
>+        })";
> 
>     const std::string &shaderString2 =
>-        "#version 310 es\n"
>-        "#extension GL_OES_geometry_shader : require\n"
>-        "in vec4 texcoord1[1];\n"
>-        "in vec4 texcoord2[];\n"
>-        "layout (points) in;\n"
>-        "layout (points, max_vertices = 1) out;\n"
>-        "void main()\n"
>-        "{\n"
>-        "    vec4 coord = texcoord2[0];\n"
>-        "    int length = texcoord2.length();\n"
>-        "}\n";
>+        R"(#version 310 es
>+        #extension GL_EXT_geometry_shader : require
>+        in vec4 texcoord1[1];
>+        in vec4 texcoord2[];
>+        layout (points) in;
>+        layout (points, max_vertices = 1) out;
>+        void main()
>+        {
>+            vec4 coord = texcoord2[0];
>+            int length = texcoord2.length();
>+        })";
> 
>     if (compile(shaderString1) || compile(shaderString2))
>     {
>@@ -1259,23 +1261,23 @@ TEST_F(GeometryShaderTest, DeclareUnsizedInputBeforeInputPrimitive)
> TEST_F(GeometryShaderTest, DeclareUnsizedInputWithoutInputPrimitive)
> {
>     const std::string &shaderString1 =
>-        "#version 310 es\n"
>-        "#extension GL_OES_geometry_shader : require\n"
>-        "layout (points, max_vertices = 1) out;\n"
>-        "in vec4 texcoord[];\n"
>-        "void main()\n"
>-        "{\n"
>-        "}\n";
>+        R"(#version 310 es
>+        #extension GL_EXT_geometry_shader : require
>+        layout (points, max_vertices = 1) out;
>+        in vec4 texcoord[];
>+        void main()
>+        {
>+        })";
> 
>     const std::string &shaderString2 =
>-        "#version 310 es\n"
>-        "#extension GL_OES_geometry_shader : require\n"
>-        "layout (points, max_vertices = 1) out;\n"
>-        "in vec4 texcoord1[1];\n"
>-        "in vec4 texcoord2[];\n"
>-        "void main()\n"
>-        "{\n"
>-        "}\n";
>+        R"(#version 310 es
>+        #extension GL_EXT_geometry_shader : require
>+        layout (points, max_vertices = 1) out;
>+        in vec4 texcoord1[1];
>+        in vec4 texcoord2[];
>+        void main()
>+        {
>+        })";
> 
>     if (compile(shaderString1) || compile(shaderString2))
>     {
>@@ -1289,7 +1291,7 @@ TEST_F(GeometryShaderTest, IndexingUnsizedInputDeclaredAfterInputPrimitive)
> {
>     const std::string &shaderString =
>         R"(#version 310 es
>-        #extension GL_OES_geometry_shader : require
>+        #extension GL_EXT_geometry_shader : require
>         layout (points) in;
>         layout (points, max_vertices = 1) out;
>         in vec4 texcoord[], texcoord2[];
>@@ -1312,7 +1314,7 @@ TEST_F(GeometryShaderTest, CallingLengthOnUnsizedInputDeclaredAfterInputPrimitiv
> {
>     const std::string &shaderString =
>         R"(#version 310 es
>-        #extension GL_OES_geometry_shader : require
>+        #extension GL_EXT_geometry_shader : require
>         layout (points) in;
>         layout (points, max_vertices = 1) out;
>         in vec4 texcoord[];
>@@ -1332,15 +1334,15 @@ TEST_F(GeometryShaderTest, CallingLengthOnUnsizedInputDeclaredAfterInputPrimitiv
> TEST_F(GeometryShaderTest, AssignValueToInput)
> {
>     const std::string &shaderString =
>-        "#version 310 es\n"
>-        "#extension GL_OES_geometry_shader : require\n"
>-        "layout (points) in;\n"
>-        "layout (points, max_vertices = 1) out;\n"
>-        "in vec4 texcoord[];\n"
>-        "void main()\n"
>-        "{\n"
>-        "    texcoord[0] = vec4(1.0, 0.0, 0.0, 1.0);\n"
>-        "}\n";
>+        R"(#version 310 es
>+        #extension GL_EXT_geometry_shader : require
>+        layout (points) in;
>+        layout (points, max_vertices = 1) out;
>+        in vec4 texcoord[];
>+        void main()
>+        {
>+            texcoord[0] = vec4(1.0, 0.0, 0.0, 1.0);
>+        })";
> 
>     if (compile(shaderString))
>     {
>@@ -1353,7 +1355,7 @@ TEST_F(GeometryShaderTest, InputWithLocations)
> {
>     const std::string &shaderString =
>         R"(#version 310 es
>-        #extension GL_OES_geometry_shader : require
>+        #extension GL_EXT_geometry_shader : require
>         layout (triangles) in;
>         layout (points, max_vertices = 1) out;
>         layout (location = 0) in vec4 texcoord1[];
>@@ -1427,14 +1429,14 @@ TEST_F(GeometryShaderTest, InputWithSizeAfterInputPrimitive)
> TEST_F(GeometryShaderTest, NonArrayOutputs)
> {
>     const std::string &shaderString =
>-        "#version 310 es\n"
>-        "#extension GL_OES_geometry_shader : require\n"
>-        "layout (points) in;\n"
>-        "layout (points, max_vertices = 1) out;\n"
>-        "out vec4 color;\n"
>-        "void main()\n"
>-        "{\n"
>-        "}\n";
>+        R"(#version 310 es
>+        #extension GL_EXT_geometry_shader : require
>+        layout (points) in;
>+        layout (points, max_vertices = 1) out;
>+        out vec4 color;
>+        void main()
>+        {
>+        })";
> 
>     if (!compile(shaderString))
>     {
>@@ -1446,17 +1448,17 @@ TEST_F(GeometryShaderTest, NonArrayOutputs)
> TEST_F(GeometryShaderTest, OutputsWithLocation)
> {
>     const std::string &shaderString =
>-        "#version 310 es\n"
>-        "#extension GL_OES_geometry_shader : require\n"
>-        "layout (triangles) in;\n"
>-        "layout (points, max_vertices = 1) out;\n"
>-        "layout (location = 0) out vec4 color1;\n"
>-        "layout (location = 1) out vec4 color2;\n"
>-        "void main()\n"
>-        "{\n"
>-        "    color1 = vec4(0.0, 1.0, 0.0, 1.0);\n"
>-        "    color2 = vec4(1.0, 0.0, 0.0, 1.0);\n"
>-        "}\n";
>+        R"(#version 310 es
>+        #extension GL_EXT_geometry_shader : require
>+        layout (triangles) in;
>+        layout (points, max_vertices = 1) out;
>+        layout (location = 0) out vec4 color1;
>+        layout (location = 1) out vec4 color2;
>+        void main()
>+        {
>+            color1 = vec4(0.0, 1.0, 0.0, 1.0);
>+            color2 = vec4(1.0, 0.0, 0.0, 1.0);
>+        })";
> 
>     if (!compile(shaderString))
>     {
>@@ -1468,16 +1470,16 @@ TEST_F(GeometryShaderTest, OutputsWithLocation)
> TEST_F(GeometryShaderTest, SizedArrayOutputs)
> {
>     const std::string &shaderString =
>-        "#version 310 es\n"
>-        "#extension GL_OES_geometry_shader : require\n"
>-        "layout (triangles) in;\n"
>-        "layout (points, max_vertices = 1) out;\n"
>-        "out vec4 color[2];\n"
>-        "void main()\n"
>-        "{\n"
>-        "    color[0] = vec4(0.0, 1.0, 0.0, 1.0);\n"
>-        "    color[1] = vec4(1.0, 0.0, 0.0, 1.0);\n"
>-        "}\n";
>+        R"(#version 310 es
>+        #extension GL_EXT_geometry_shader : require
>+        layout (triangles) in;
>+        layout (points, max_vertices = 1) out;
>+        out vec4 color[2];
>+        void main()
>+        {
>+            color[0] = vec4(0.0, 1.0, 0.0, 1.0);
>+            color[1] = vec4(1.0, 0.0, 0.0, 1.0);
>+        })";
> 
>     if (!compile(shaderString))
>     {
>@@ -1489,14 +1491,14 @@ TEST_F(GeometryShaderTest, SizedArrayOutputs)
> TEST_F(GeometryShaderTest, UnsizedArrayOutputs)
> {
>     const std::string &shaderString =
>-        "#version 310 es\n"
>-        "#extension GL_OES_geometry_shader : require\n"
>-        "layout (triangles) in;\n"
>-        "layout (points, max_vertices = 1) out;\n"
>-        "out vec4 color[];\n"
>-        "void main()\n"
>-        "{\n"
>-        "}\n";
>+        R"(#version 310 es
>+        #extension GL_EXT_geometry_shader : require
>+        layout (triangles) in;
>+        layout (points, max_vertices = 1) out;
>+        out vec4 color[];
>+        void main()
>+        {
>+        })";
> 
>     if (compile(shaderString))
>     {
>@@ -1540,15 +1542,15 @@ TEST_F(GeometryShaderTest, OutputWithInterpolationQualifiers)
> TEST_F(GeometryShaderTest, InvariantOutput)
> {
>     const std::string &shaderString =
>-        "#version 310 es\n"
>-        "#extension GL_OES_geometry_shader : require\n"
>-        "layout (points) in;\n"
>-        "layout (points, max_vertices = 2) out;\n"
>-        "invariant out vec4 gs_output;\n"
>-        "void main()\n"
>-        "{\n"
>-        "    gl_Position = gl_in[0].gl_Position;\n"
>-        "}\n";
>+        R"(#version 310 es
>+        #extension GL_EXT_geometry_shader : require
>+        layout (points) in;
>+        layout (points, max_vertices = 2) out;
>+        invariant out vec4 gs_output;
>+        void main()
>+        {
>+            gl_Position = gl_in[0].gl_Position;
>+        })";
> 
>     if (!compile(shaderString))
>     {
>@@ -1561,7 +1563,7 @@ TEST_F(GeometryShaderOutputCodeTest, ValidateGLInMembersInOutputShaderString)
> {
>     const std::string &shaderString1 =
>         R"(#version 310 es
>-        #extension GL_OES_geometry_shader : require
>+        #extension GL_EXT_geometry_shader : require
>         layout (lines) in;
>         layout (points, max_vertices = 2) out;
>         void main()
>@@ -1578,7 +1580,7 @@ TEST_F(GeometryShaderOutputCodeTest, ValidateGLInMembersInOutputShaderString)
> 
>     const std::string &shaderString2 =
>         R"(#version 310 es
>-        #extension GL_OES_geometry_shader : require
>+        #extension GL_EXT_geometry_shader : require
>         layout (points) in;
>         layout (points, max_vertices = 2) out;
>         void main()
>@@ -1591,56 +1593,54 @@ TEST_F(GeometryShaderOutputCodeTest, ValidateGLInMembersInOutputShaderString)
>     EXPECT_TRUE(foundInESSLCode("].gl_Position"));
> }
> 
>-// Verify that Geometry Shaders are supported in GLSL ES version 310 with EXT_geometry_shader
>-// enabled.
>-TEST_F(GeometryShaderTest, Version310WithEXTExtension)
>+// Verify that geometry shader inputs can be declared as struct arrays.
>+TEST_F(GeometryShaderTest, StructArrayInput)
> {
>-    std::ostringstream stream;
>-
>-    const std::string &kEXTExtensionString = kExtensionStrings[1];
>-    ASSERT_TRUE(kEXTExtensionString == "#extension GL_EXT_geometry_shader");
>-
>-    stream << kVersion << kEXTExtensionString << " : require\n" << kShaderBody;
>+    const std::string &shaderString =
>+        R"(#version 310 es
>+        #extension GL_EXT_geometry_shader : require
>+        layout (points) in;
>+        layout (points, max_vertices = 2) out;
>+        struct S
>+        {
>+            float value1;
>+            vec4 value2;
>+        };
>+        in S gs_input[];
>+        out S gs_output;
>+        void main()
>+        {
>+            gs_output = gs_input[0];
>+        })";
> 
>-    if (!compile(stream.str()))
>+    if (!compile(shaderString))
>     {
>         FAIL() << "Shader compilation failed, expecting success:\n" << mInfoLog;
>     }
> }
> 
>-// Verify that Geometry Shaders are supported in GLSL ES version 310 with mixed using
>-// "EXT_geometry_shader" and "OES_geometry_shader" extension strings.
>-TEST_F(GeometryShaderTest, MixedUseOESAndEXTExtension)
>+// Verify that geometry shader outputs cannot be declared as struct arrays.
>+TEST_F(GeometryShaderTest, StructArrayOutput)
> {
>-    const std::array<std::string, 3> kExtensionBehaviors = {{"require", "disable", "warn"}};
>-
>-    ASSERT_TRUE(kExtensionStrings.size() == 2u);
>+    const std::string &shaderString =
>+        R"(#version 310 es
>+        #extension GL_EXT_geometry_shader : require
>+        layout (points) in;
>+        layout (points, max_vertices = 2) out;
>+        struct S
>+        {
>+            float value1;
>+            vec4 value2;
>+        };
>+        out S gs_output[1];
>+        void main()
>+        {
>+            gs_output[0].value1 = 1.0;
>+            gs_output[0].value2 = vec4(1.0, 0.0, 0.0, 1.0);
>+        })";
> 
>-    for (const std::string &extensionBehavior1 : kExtensionBehaviors)
>+    if (compile(shaderString))
>     {
>-        for (const std::string &extensionBehavior2 : kExtensionBehaviors)
>-        {
>-            for (size_t i = 0; i < 2u; ++i)
>-            {
>-                std::ostringstream stream;
>-                stream << kVersion << kExtensionStrings[i] << " : " << extensionBehavior1 << "\n"
>-                       << kExtensionStrings[1 - i] << " : " << extensionBehavior2 << "\n"
>-                       << kShaderBody;
>-
>-                bool shouldCompile =
>-                    extensionBehavior1 != "disable" || extensionBehavior2 != "disable";
>-                if (shouldCompile != compile(stream.str()))
>-                {
>-                    if (shouldCompile)
>-                    {
>-                        FAIL() << "Shader compilation failed, expecting success:\n" << mInfoLog;
>-                    }
>-                    else
>-                    {
>-                        FAIL() << "Shader compilation succeeded, expecting failure:\n" << mInfoLog;
>-                    }
>-                }
>-            }
>-        }
>+        FAIL() << "Shader compilation succeeded, expecting failure:\n" << mInfoLog;
>     }
> }
>\ No newline at end of file
>diff --git a/Source/ThirdParty/ANGLE/src/tests/compiler_tests/GlFragDataNotModified_test.cpp b/Source/ThirdParty/ANGLE/src/tests/compiler_tests/GlFragDataNotModified_test.cpp
>new file mode 100644
>index 00000000000..c9a8f978d1f
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/tests/compiler_tests/GlFragDataNotModified_test.cpp
>@@ -0,0 +1,52 @@
>+//
>+// Copyright (c) 2018 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// GlFragDataNotModified_test.cpp:
>+//   Test that the properties of built-in gl_FragData are not modified when a shader is compiled
>+//   multiple times.
>+//
>+
>+#include "tests/test_utils/ShaderCompileTreeTest.h"
>+
>+namespace
>+{
>+
>+class GlFragDataNotModifiedTest : public sh::ShaderCompileTreeTest
>+{
>+  public:
>+    GlFragDataNotModifiedTest() {}
>+
>+  protected:
>+    void initResources(ShBuiltInResources *resources) override
>+    {
>+        resources->MaxDrawBuffers   = 4;
>+        resources->EXT_draw_buffers = 1;
>+    }
>+
>+    ::GLenum getShaderType() const override { return GL_FRAGMENT_SHADER; }
>+    ShShaderSpec getShaderSpec() const override { return SH_GLES2_SPEC; }
>+};
>+
>+// Test a bug where we could modify the value of a builtin variable.
>+TEST_F(GlFragDataNotModifiedTest, BuiltinRewritingBug)
>+{
>+    const std::string &shaderString =
>+        "#extension GL_EXT_draw_buffers : require\n"
>+        "precision mediump float;\n"
>+        "void main() {\n"
>+        "    gl_FragData[gl_MaxDrawBuffers] = vec4(0.0);\n"
>+        "}";
>+
>+    if (compile(shaderString))
>+    {
>+        FAIL() << "Shader compilation succeeded, expecting failure\n";
>+    }
>+    if (compile(shaderString))
>+    {
>+        FAIL() << "Shader compilation succeeded, expecting failure\n";
>+    }
>+}
>+
>+}  // anonymous namespace
>diff --git a/Source/ThirdParty/ANGLE/src/tests/compiler_tests/HLSLOutput_test.cpp b/Source/ThirdParty/ANGLE/src/tests/compiler_tests/HLSLOutput_test.cpp
>index 269100e65b2..8115977e509 100644
>--- a/Source/ThirdParty/ANGLE/src/tests/compiler_tests/HLSLOutput_test.cpp
>+++ b/Source/ThirdParty/ANGLE/src/tests/compiler_tests/HLSLOutput_test.cpp
>@@ -72,3 +72,155 @@ TEST_F(HLSL30VertexOutputTest, RewriteElseBlockReturningStruct)
>     EXPECT_FALSE(foundInCode("(foo)"));
>     EXPECT_FALSE(foundInCode(" foo"));
> }
>+
>+// Test that having an array constructor as a statement doesn't trigger an assert in HLSL output.
>+// This test has a constant array constructor statement.
>+TEST_F(HLSLOutputTest, ConstArrayConstructorStatement)
>+{
>+    const std::string &shaderString =
>+        R"(#version 300 es
>+        void main()
>+        {
>+            int[1](0);
>+        })";
>+    compile(shaderString);
>+}
>+
>+// Test that having an array constructor as a statement doesn't trigger an assert in HLSL output.
>+TEST_F(HLSLOutputTest, ArrayConstructorStatement)
>+{
>+    const std::string &shaderString =
>+        R"(#version 300 es
>+        precision mediump float;
>+        out vec4 outColor;
>+        void main()
>+        {
>+            outColor = vec4(0.0, 0.0, 0.0, 1.0);
>+            float[1](outColor[1]++);
>+        })";
>+    compile(shaderString);
>+}
>+
>+// Test an array of arrays constructor as a statement.
>+TEST_F(HLSLOutputTest, ArrayOfArraysStatement)
>+{
>+    const std::string &shaderString =
>+        R"(#version 310 es
>+        precision mediump float;
>+        out vec4 outColor;
>+        void main()
>+        {
>+            outColor = vec4(0.0, 0.0, 0.0, 1.0);
>+            float[2][2](float[2](outColor[1]++, 0.0), float[2](1.0, 2.0));
>+        })";
>+    compile(shaderString);
>+}
>+
>+// Test dynamic indexing of a vector. This makes sure that helper functions added for dynamic
>+// indexing have correct data that subsequent traversal steps rely on.
>+TEST_F(HLSLOutputTest, VectorDynamicIndexing)
>+{
>+    const std::string &shaderString =
>+        R"(#version 300 es
>+        precision mediump float;
>+        out vec4 outColor;
>+        uniform int i;
>+        void main()
>+        {
>+            vec4 foo = vec4(0.0, 0.0, 0.0, 1.0);
>+            foo[i] = foo[i + 1];
>+            outColor = foo;
>+        })";
>+    compile(shaderString);
>+}
>+
>+// Test returning an array from a user-defined function. This makes sure that function symbols are
>+// changed consistently when the user-defined function is changed to have an array out parameter.
>+TEST_F(HLSLOutputTest, ArrayReturnValue)
>+{
>+    const std::string &shaderString =
>+        R"(#version 300 es
>+        precision mediump float;
>+        uniform float u;
>+        out vec4 outColor;
>+
>+        float[2] getArray(float f)
>+        {
>+            return float[2](f, f + 1.0);
>+        }
>+
>+        void main()
>+        {
>+            float[2] arr = getArray(u);
>+            outColor = vec4(arr[0], arr[1], 0.0, 1.0);
>+        })";
>+    compile(shaderString);
>+}
>+
>+// Test that writing parameters without a name doesn't assert.
>+TEST_F(HLSLOutputTest, ParameterWithNoName)
>+{
>+    const std::string &shaderString =
>+        R"(precision mediump float;
>+
>+        uniform vec4 v;
>+
>+        vec4 s(vec4)
>+        {
>+            return v;
>+        }
>+        void main()
>+        {
>+            gl_FragColor = s(v);
>+        })";
>+    compile(shaderString);
>+}
>+
>+// Test that array dimensions are written out correctly.
>+TEST_F(HLSLOutputTest, Array)
>+{
>+    const std::string &shaderString =
>+        R"(#version 300 es
>+        precision mediump float;
>+
>+        uniform float uf;
>+
>+        out vec4 my_FragColor;
>+
>+        void main()
>+        {
>+            my_FragColor = vec4(0.0, 0.0, 0.0, 1.0);
>+            float arr[2];
>+            for (int i = 0; i < 2; ++i) {
>+                arr[i] = uf * 2.0;
>+                my_FragColor.x += arr[i];
>+            }
>+        })";
>+    compile(shaderString);
>+    // The unique id of arr is 1030, which is given to the symbol when parsed and inserted to the
>+    // symbol table
>+    EXPECT_TRUE(foundInCode("_arr1030[2]"));
>+}
>+
>+// Test that initializing array with previously declared array will not be overwritten
>+TEST_F(HLSLOutputTest, SameNameArray)
>+{
>+    const std::string &shaderString =
>+        R"(#version 300 es
>+        precision highp float;
>+        out vec4 my_FragColor;
>+
>+        void main()
>+        {
>+          float arr[2] = float[2](1.0, 1.0);
>+          {
>+            float arr[2] = arr;
>+            my_FragColor = vec4(0.0, arr[0], 0.0, arr[1]);
>+          }
>+        })";
>+    compile(shaderString);
>+    // The unique id of the original array, arr, is 1029
>+    EXPECT_TRUE(foundInCode("_arr1029[2]"));
>+    // The unique id of the new array, arr, is 1030
>+    EXPECT_TRUE(foundInCode("_arr1030[2]"));
>+}
>\ No newline at end of file
>diff --git a/Source/ThirdParty/ANGLE/src/tests/compiler_tests/ImmutableString_test.cpp b/Source/ThirdParty/ANGLE/src/tests/compiler_tests/ImmutableString_test.cpp
>new file mode 100644
>index 00000000000..b17cc198202
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/tests/compiler_tests/ImmutableString_test.cpp
>@@ -0,0 +1,74 @@
>+// Copyright 2018 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// ImmutableString_test.cpp:
>+//   Tests for ImmutableString and ImmutableStringBuilder.
>+
>+#include "compiler/translator/ImmutableString.h"
>+#include "compiler/translator/ImmutableStringBuilder.h"
>+#include "compiler/translator/PoolAlloc.h"
>+#include "gtest/gtest.h"
>+
>+using namespace sh;
>+
>+class ImmutableStringBuilderTest : public testing::Test
>+{
>+  public:
>+    ImmutableStringBuilderTest() {}
>+
>+  protected:
>+    void SetUp() override
>+    {
>+        allocator.push();
>+        SetGlobalPoolAllocator(&allocator);
>+    }
>+
>+    void TearDown() override
>+    {
>+        SetGlobalPoolAllocator(nullptr);
>+        allocator.pop();
>+    }
>+
>+    angle::PoolAllocator allocator;
>+};
>+
>+// Test writing a 32-bit signed int as hexadecimal using ImmutableStringBuilder.
>+TEST_F(ImmutableStringBuilderTest, AppendHexInt32)
>+{
>+    int32_t i = -1;
>+    ImmutableStringBuilder strBuilder(2 * sizeof(int32_t));
>+    strBuilder.appendHex(i);
>+    ImmutableString str = strBuilder;
>+    EXPECT_EQ(std::string("ffffffff"), str.data());
>+}
>+
>+// Test writing a 32-bit unsigned int as hexadecimal using ImmutableStringBuilder.
>+TEST_F(ImmutableStringBuilderTest, AppendHexUint32)
>+{
>+    uint32_t i = 0x1234beefu;
>+    ImmutableStringBuilder strBuilder(2 * sizeof(uint32_t));
>+    strBuilder.appendHex(i);
>+    ImmutableString str = strBuilder;
>+    EXPECT_EQ(std::string("1234beef"), str.data());
>+}
>+
>+// Test writing a 64-bit signed int as hexadecimal using ImmutableStringBuilder.
>+TEST_F(ImmutableStringBuilderTest, AppendHexInt64)
>+{
>+    int64_t i = -1;
>+    ImmutableStringBuilder strBuilder(2 * sizeof(int64_t));
>+    strBuilder.appendHex(i);
>+    ImmutableString str = strBuilder;
>+    EXPECT_EQ(std::string("ffffffffffffffff"), str.data());
>+}
>+
>+// Test writing a 64-bit unsigned int as hexadecimal using ImmutableStringBuilder.
>+TEST_F(ImmutableStringBuilderTest, AppendHexUint64)
>+{
>+    uint64_t i = 0xfeedcafe9876beefull;
>+    ImmutableStringBuilder strBuilder(2 * sizeof(uint64_t));
>+    strBuilder.appendHex(i);
>+    ImmutableString str = strBuilder;
>+    EXPECT_EQ(std::string("feedcafe9876beef"), str.data());
>+}
>diff --git a/Source/ThirdParty/ANGLE/src/tests/compiler_tests/ImmutableString_test_autogen.cpp b/Source/ThirdParty/ANGLE/src/tests/compiler_tests/ImmutableString_test_autogen.cpp
>new file mode 100644
>index 00000000000..423d61969e0
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/tests/compiler_tests/ImmutableString_test_autogen.cpp
>@@ -0,0 +1,1092 @@
>+// GENERATED FILE - DO NOT EDIT.
>+// Generated by gen_builtin_symbols.py using data from builtin_function_declarations.txt.
>+//
>+// Copyright 2019 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// ImmutableString_test_autogen.cpp:
>+//   Tests for matching script-generated hashes with runtime computed hashes.
>+
>+#include "compiler/translator/ImmutableString.h"
>+#include "gtest/gtest.h"
>+
>+namespace sh
>+{
>+
>+TEST(ImmutableStringTest, ScriptGeneratedHashesMatch)
>+{
>+    ASSERT_EQ(0x0848139au, ImmutableString("atan(8B0A").mangledNameHash());
>+    ASSERT_EQ(0x0e52e500u, ImmutableString("radians(0B").mangledNameHash());
>+    ASSERT_EQ(0x0e55ac28u, ImmutableString("radians(1B").mangledNameHash());
>+    ASSERT_EQ(0x0e547683u, ImmutableString("radians(2B").mangledNameHash());
>+    ASSERT_EQ(0x0e537b7au, ImmutableString("radians(3B").mangledNameHash());
>+    ASSERT_EQ(0x0e52b187u, ImmutableString("degrees(0B").mangledNameHash());
>+    ASSERT_EQ(0x0e541edeu, ImmutableString("degrees(1B").mangledNameHash());
>+    ASSERT_EQ(0x0e507f22u, ImmutableString("degrees(2B").mangledNameHash());
>+    ASSERT_EQ(0x0e519bd4u, ImmutableString("degrees(3B").mangledNameHash());
>+    ASSERT_EQ(0x06344570u, ImmutableString("sin(0B").mangledNameHash());
>+    ASSERT_EQ(0x063314b1u, ImmutableString("sin(1B").mangledNameHash());
>+    ASSERT_EQ(0x0635d3b3u, ImmutableString("sin(2B").mangledNameHash());
>+    ASSERT_EQ(0x0634cf9au, ImmutableString("sin(3B").mangledNameHash());
>+    ASSERT_EQ(0x06366a98u, ImmutableString("cos(0B").mangledNameHash());
>+    ASSERT_EQ(0x063786f1u, ImmutableString("cos(1B").mangledNameHash());
>+    ASSERT_EQ(0x0630bc6au, ImmutableString("cos(2B").mangledNameHash());
>+    ASSERT_EQ(0x06320b8bu, ImmutableString("cos(3B").mangledNameHash());
>+    ASSERT_EQ(0x063770d0u, ImmutableString("tan(0B").mangledNameHash());
>+    ASSERT_EQ(0x06309ccau, ImmutableString("tan(1B").mangledNameHash());
>+    ASSERT_EQ(0x0635a80fu, ImmutableString("tan(2B").mangledNameHash());
>+    ASSERT_EQ(0x063719d6u, ImmutableString("tan(3B").mangledNameHash());
>+    ASSERT_EQ(0x083ca453u, ImmutableString("asin(0B").mangledNameHash());
>+    ASSERT_EQ(0x083df752u, ImmutableString("asin(1B").mangledNameHash());
>+    ASSERT_EQ(0x083e6948u, ImmutableString("asin(2B").mangledNameHash());
>+    ASSERT_EQ(0x083f6552u, ImmutableString("asin(3B").mangledNameHash());
>+    ASSERT_EQ(0x083afbc8u, ImmutableString("acos(0B").mangledNameHash());
>+    ASSERT_EQ(0x0839e751u, ImmutableString("acos(1B").mangledNameHash());
>+    ASSERT_EQ(0x08396a55u, ImmutableString("acos(2B").mangledNameHash());
>+    ASSERT_EQ(0x08383aacu, ImmutableString("acos(3B").mangledNameHash());
>+    ASSERT_EQ(0x084c10fau, ImmutableString("atan(0B0B").mangledNameHash());
>+    ASSERT_EQ(0x084aa6bfu, ImmutableString("atan(1B1B").mangledNameHash());
>+    ASSERT_EQ(0x084ee899u, ImmutableString("atan(2B2B").mangledNameHash());
>+    ASSERT_EQ(0x08482806u, ImmutableString("atan(3B3B").mangledNameHash());
>+    ASSERT_EQ(0x083c624bu, ImmutableString("atan(0B").mangledNameHash());
>+    ASSERT_EQ(0x083b7e52u, ImmutableString("atan(1B").mangledNameHash());
>+    ASSERT_EQ(0x083aea5fu, ImmutableString("atan(2B").mangledNameHash());
>+    ASSERT_EQ(0x083dac10u, ImmutableString("atan(3B").mangledNameHash());
>+    ASSERT_EQ(0x083aa373u, ImmutableString("sinh(0B").mangledNameHash());
>+    ASSERT_EQ(0x08398f4au, ImmutableString("sinh(1B").mangledNameHash());
>+    ASSERT_EQ(0x08392747u, ImmutableString("sinh(2B").mangledNameHash());
>+    ASSERT_EQ(0x083bd9f8u, ImmutableString("sinh(3B").mangledNameHash());
>+    ASSERT_EQ(0x083b5c45u, ImmutableString("cosh(0B").mangledNameHash());
>+    ASSERT_EQ(0x083c57c4u, ImmutableString("cosh(1B").mangledNameHash());
>+    ASSERT_EQ(0x083d8227u, ImmutableString("cosh(2B").mangledNameHash());
>+    ASSERT_EQ(0x083ed2deu, ImmutableString("cosh(3B").mangledNameHash());
>+    ASSERT_EQ(0x0838944cu, ImmutableString("tanh(0B").mangledNameHash());
>+    ASSERT_EQ(0x083991ddu, ImmutableString("tanh(1B").mangledNameHash());
>+    ASSERT_EQ(0x083acb5eu, ImmutableString("tanh(2B").mangledNameHash());
>+    ASSERT_EQ(0x0838025eu, ImmutableString("tanh(3B").mangledNameHash());
>+    ASSERT_EQ(0x0a464ad3u, ImmutableString("asinh(0B").mangledNameHash());
>+    ASSERT_EQ(0x0a47bb52u, ImmutableString("asinh(1B").mangledNameHash());
>+    ASSERT_EQ(0x0a400148u, ImmutableString("asinh(2B").mangledNameHash());
>+    ASSERT_EQ(0x0a4125d1u, ImmutableString("asinh(3B").mangledNameHash());
>+    ASSERT_EQ(0x0a461d10u, ImmutableString("acosh(0B").mangledNameHash());
>+    ASSERT_EQ(0x0a44ad91u, ImmutableString("acosh(1B").mangledNameHash());
>+    ASSERT_EQ(0x0a478c93u, ImmutableString("acosh(2B").mangledNameHash());
>+    ASSERT_EQ(0x0a46778au, ImmutableString("acosh(3B").mangledNameHash());
>+    ASSERT_EQ(0x0a4582c9u, ImmutableString("atanh(0B").mangledNameHash());
>+    ASSERT_EQ(0x0a4431a8u, ImmutableString("atanh(1B").mangledNameHash());
>+    ASSERT_EQ(0x0a430643u, ImmutableString("atanh(2B").mangledNameHash());
>+    ASSERT_EQ(0x0a45fcfdu, ImmutableString("atanh(3B").mangledNameHash());
>+    ASSERT_EQ(0x0646b392u, ImmutableString("pow(0B0B").mangledNameHash());
>+    ASSERT_EQ(0x06439435u, ImmutableString("pow(1B1B").mangledNameHash());
>+    ASSERT_EQ(0x064318fcu, ImmutableString("pow(2B2B").mangledNameHash());
>+    ASSERT_EQ(0x06418e42u, ImmutableString("pow(3B3B").mangledNameHash());
>+    ASSERT_EQ(0x063595b9u, ImmutableString("exp(0B").mangledNameHash());
>+    ASSERT_EQ(0x0636b1f1u, ImmutableString("exp(1B").mangledNameHash());
>+    ASSERT_EQ(0x0637ca4au, ImmutableString("exp(2B").mangledNameHash());
>+    ASSERT_EQ(0x06352335u, ImmutableString("exp(3B").mangledNameHash());
>+    ASSERT_EQ(0x063055e6u, ImmutableString("log(0B").mangledNameHash());
>+    ASSERT_EQ(0x06330b41u, ImmutableString("log(1B").mangledNameHash());
>+    ASSERT_EQ(0x0631d12au, ImmutableString("log(2B").mangledNameHash());
>+    ASSERT_EQ(0x0630dce3u, ImmutableString("log(3B").mangledNameHash());
>+    ASSERT_EQ(0x0839daf2u, ImmutableString("exp2(0B").mangledNameHash());
>+    ASSERT_EQ(0x083b2b93u, ImmutableString("exp2(1B").mangledNameHash());
>+    ASSERT_EQ(0x083f8b90u, ImmutableString("exp2(2B").mangledNameHash());
>+    ASSERT_EQ(0x0838ac89u, ImmutableString("exp2(3B").mangledNameHash());
>+    ASSERT_EQ(0x083f4babu, ImmutableString("log2(0B").mangledNameHash());
>+    ASSERT_EQ(0x083e1b7au, ImmutableString("log2(1B").mangledNameHash());
>+    ASSERT_EQ(0x083cc6e1u, ImmutableString("log2(2B").mangledNameHash());
>+    ASSERT_EQ(0x083fd32eu, ImmutableString("log2(3B").mangledNameHash());
>+    ASSERT_EQ(0x0838dc31u, ImmutableString("sqrt(0B").mangledNameHash());
>+    ASSERT_EQ(0x083bcf76u, ImmutableString("sqrt(1B").mangledNameHash());
>+    ASSERT_EQ(0x083b577bu, ImmutableString("sqrt(2B").mangledNameHash());
>+    ASSERT_EQ(0x083a07bau, ImmutableString("sqrt(3B").mangledNameHash());
>+    ASSERT_EQ(0x16772b69u, ImmutableString("inversesqrt(0B").mangledNameHash());
>+    ASSERT_EQ(0x1671d38eu, ImmutableString("inversesqrt(1B").mangledNameHash());
>+    ASSERT_EQ(0x1670b92du, ImmutableString("inversesqrt(2B").mangledNameHash());
>+    ASSERT_EQ(0x1677857cu, ImmutableString("inversesqrt(3B").mangledNameHash());
>+    ASSERT_EQ(0x0630942fu, ImmutableString("abs(0B").mangledNameHash());
>+    ASSERT_EQ(0x063770dfu, ImmutableString("abs(1B").mangledNameHash());
>+    ASSERT_EQ(0x06371aefu, ImmutableString("abs(2B").mangledNameHash());
>+    ASSERT_EQ(0x0631a1ccu, ImmutableString("abs(3B").mangledNameHash());
>+    ASSERT_EQ(0x06309dbcu, ImmutableString("abs(0C").mangledNameHash());
>+    ASSERT_EQ(0x06378eb0u, ImmutableString("abs(1C").mangledNameHash());
>+    ASSERT_EQ(0x06370c70u, ImmutableString("abs(2C").mangledNameHash());
>+    ASSERT_EQ(0x0631d85fu, ImmutableString("abs(3C").mangledNameHash());
>+    ASSERT_EQ(0x083dd4deu, ImmutableString("sign(0B").mangledNameHash());
>+    ASSERT_EQ(0x083af266u, ImmutableString("sign(1B").mangledNameHash());
>+    ASSERT_EQ(0x083c1fc5u, ImmutableString("sign(2B").mangledNameHash());
>+    ASSERT_EQ(0x083d6eacu, ImmutableString("sign(3B").mangledNameHash());
>+    ASSERT_EQ(0x083dd369u, ImmutableString("sign(0C").mangledNameHash());
>+    ASSERT_EQ(0x083acbf5u, ImmutableString("sign(1C").mangledNameHash());
>+    ASSERT_EQ(0x083c1656u, ImmutableString("sign(2C").mangledNameHash());
>+    ASSERT_EQ(0x083d503bu, ImmutableString("sign(3C").mangledNameHash());
>+    ASSERT_EQ(0x0a43465eu, ImmutableString("floor(0B").mangledNameHash());
>+    ASSERT_EQ(0x0a45ecc0u, ImmutableString("floor(1B").mangledNameHash());
>+    ASSERT_EQ(0x0a44da6bu, ImmutableString("floor(2B").mangledNameHash());
>+    ASSERT_EQ(0x0a43be63u, ImmutableString("floor(3B").mangledNameHash());
>+    ASSERT_EQ(0x0a412446u, ImmutableString("trunc(0B").mangledNameHash());
>+    ASSERT_EQ(0x0a43edf9u, ImmutableString("trunc(1B").mangledNameHash());
>+    ASSERT_EQ(0x0a42b872u, ImmutableString("trunc(2B").mangledNameHash());
>+    ASSERT_EQ(0x0a41bc4bu, ImmutableString("trunc(3B").mangledNameHash());
>+    ASSERT_EQ(0x0a407c52u, ImmutableString("round(0B").mangledNameHash());
>+    ASSERT_EQ(0x0a4758c8u, ImmutableString("round(1B").mangledNameHash());
>+    ASSERT_EQ(0x0a46f2d2u, ImmutableString("round(2B").mangledNameHash());
>+    ASSERT_EQ(0x0a4189d9u, ImmutableString("round(3B").mangledNameHash());
>+    ASSERT_EQ(0x1266c2deu, ImmutableString("roundEven(0B").mangledNameHash());
>+    ASSERT_EQ(0x1265cf4cu, ImmutableString("roundEven(1B").mangledNameHash());
>+    ASSERT_EQ(0x12614fd4u, ImmutableString("roundEven(2B").mangledNameHash());
>+    ASSERT_EQ(0x12601c9du, ImmutableString("roundEven(3B").mangledNameHash());
>+    ASSERT_EQ(0x083a7922u, ImmutableString("ceil(0B").mangledNameHash());
>+    ASSERT_EQ(0x083f6afdu, ImmutableString("ceil(1B").mangledNameHash());
>+    ASSERT_EQ(0x0838a17eu, ImmutableString("ceil(2B").mangledNameHash());
>+    ASSERT_EQ(0x0839f1a7u, ImmutableString("ceil(3B").mangledNameHash());
>+    ASSERT_EQ(0x0a402a9cu, ImmutableString("fract(0B").mangledNameHash());
>+    ASSERT_EQ(0x0a4726f2u, ImmutableString("fract(1B").mangledNameHash());
>+    ASSERT_EQ(0x0a42a596u, ImmutableString("fract(2B").mangledNameHash());
>+    ASSERT_EQ(0x0a41745fu, ImmutableString("fract(3B").mangledNameHash());
>+    ASSERT_EQ(0x064778feu, ImmutableString("mod(0B0B").mangledNameHash());
>+    ASSERT_EQ(0x064082ceu, ImmutableString("mod(1B0B").mangledNameHash());
>+    ASSERT_EQ(0x06403847u, ImmutableString("mod(2B0B").mangledNameHash());
>+    ASSERT_EQ(0x0645f03eu, ImmutableString("mod(3B0B").mangledNameHash());
>+    ASSERT_EQ(0x0641f1d7u, ImmutableString("mod(1B1B").mangledNameHash());
>+    ASSERT_EQ(0x0642b54du, ImmutableString("mod(2B2B").mangledNameHash());
>+    ASSERT_EQ(0x06457883u, ImmutableString("mod(3B3B").mangledNameHash());
>+    ASSERT_EQ(0x0641ceeeu, ImmutableString("min(0B0B").mangledNameHash());
>+    ASSERT_EQ(0x064107b7u, ImmutableString("min(1B0B").mangledNameHash());
>+    ASSERT_EQ(0x06462cf0u, ImmutableString("min(2B0B").mangledNameHash());
>+    ASSERT_EQ(0x06467507u, ImmutableString("min(3B0B").mangledNameHash());
>+    ASSERT_EQ(0x064274eeu, ImmutableString("min(1B1B").mangledNameHash());
>+    ASSERT_EQ(0x0640a98au, ImmutableString("min(2B2B").mangledNameHash());
>+    ASSERT_EQ(0x0645fd82u, ImmutableString("min(3B3B").mangledNameHash());
>+    ASSERT_EQ(0x0645e25du, ImmutableString("min(0C0C").mangledNameHash());
>+    ASSERT_EQ(0x0644176eu, ImmutableString("min(1C1C").mangledNameHash());
>+    ASSERT_EQ(0x06441467u, ImmutableString("min(2C2C").mangledNameHash());
>+    ASSERT_EQ(0x0642dbfeu, ImmutableString("min(3C3C").mangledNameHash());
>+    ASSERT_EQ(0x06450593u, ImmutableString("min(1C0C").mangledNameHash());
>+    ASSERT_EQ(0x06425db3u, ImmutableString("min(2C0C").mangledNameHash());
>+    ASSERT_EQ(0x06425522u, ImmutableString("min(3C0C").mangledNameHash());
>+    ASSERT_EQ(0x06420bb0u, ImmutableString("min(0D0D").mangledNameHash());
>+    ASSERT_EQ(0x0644a6dfu, ImmutableString("min(1D1D").mangledNameHash());
>+    ASSERT_EQ(0x064236d1u, ImmutableString("min(2D2D").mangledNameHash());
>+    ASSERT_EQ(0x064305b5u, ImmutableString("min(3D3D").mangledNameHash());
>+    ASSERT_EQ(0x06436c9au, ImmutableString("min(1D0D").mangledNameHash());
>+    ASSERT_EQ(0x06408ba2u, ImmutableString("min(2D0D").mangledNameHash());
>+    ASSERT_EQ(0x0643ebd5u, ImmutableString("min(3D0D").mangledNameHash());
>+    ASSERT_EQ(0x06472996u, ImmutableString("max(0B0B").mangledNameHash());
>+    ASSERT_EQ(0x0645114fu, ImmutableString("max(1B0B").mangledNameHash());
>+    ASSERT_EQ(0x06468fb1u, ImmutableString("max(2B0B").mangledNameHash());
>+    ASSERT_EQ(0x0643486cu, ImmutableString("max(3B0B").mangledNameHash());
>+    ASSERT_EQ(0x0646155eu, ImmutableString("max(1B1B").mangledNameHash());
>+    ASSERT_EQ(0x06400261u, ImmutableString("max(2B2B").mangledNameHash());
>+    ASSERT_EQ(0x064225ceu, ImmutableString("max(3B3B").mangledNameHash());
>+    ASSERT_EQ(0x06454045u, ImmutableString("max(0C0C").mangledNameHash());
>+    ASSERT_EQ(0x0647bc75u, ImmutableString("max(1C1C").mangledNameHash());
>+    ASSERT_EQ(0x0644cd73u, ImmutableString("max(2C2C").mangledNameHash());
>+    ASSERT_EQ(0x06448798u, ImmutableString("max(3C3C").mangledNameHash());
>+    ASSERT_EQ(0x0640f128u, ImmutableString("max(1C0C").mangledNameHash());
>+    ASSERT_EQ(0x06429e9cu, ImmutableString("max(2C0C").mangledNameHash());
>+    ASSERT_EQ(0x06475b89u, ImmutableString("max(3C0C").mangledNameHash());
>+    ASSERT_EQ(0x06473146u, ImmutableString("max(0D0D").mangledNameHash());
>+    ASSERT_EQ(0x06460349u, ImmutableString("max(1D1D").mangledNameHash());
>+    ASSERT_EQ(0x06429550u, ImmutableString("max(2D2D").mangledNameHash());
>+    ASSERT_EQ(0x0642c869u, ImmutableString("max(3D3D").mangledNameHash());
>+    ASSERT_EQ(0x06452105u, ImmutableString("max(1D0D").mangledNameHash());
>+    ASSERT_EQ(0x06443b94u, ImmutableString("max(2D0D").mangledNameHash());
>+    ASSERT_EQ(0x06472b16u, ImmutableString("max(3D0D").mangledNameHash());
>+    ASSERT_EQ(0x0a65f6b4u, ImmutableString("clamp(0B0B0B").mangledNameHash());
>+    ASSERT_EQ(0x0a62e0c3u, ImmutableString("clamp(1B0B0B").mangledNameHash());
>+    ASSERT_EQ(0x0a6670deu, ImmutableString("clamp(2B0B0B").mangledNameHash());
>+    ASSERT_EQ(0x0a658fc9u, ImmutableString("clamp(3B0B0B").mangledNameHash());
>+    ASSERT_EQ(0x0a635d1au, ImmutableString("clamp(1B1B1B").mangledNameHash());
>+    ASSERT_EQ(0x0a679af4u, ImmutableString("clamp(2B2B2B").mangledNameHash());
>+    ASSERT_EQ(0x0a619e65u, ImmutableString("clamp(3B3B3B").mangledNameHash());
>+    ASSERT_EQ(0x0a621a2bu, ImmutableString("clamp(0C0C0C").mangledNameHash());
>+    ASSERT_EQ(0x0a60d0c5u, ImmutableString("clamp(1C0C0C").mangledNameHash());
>+    ASSERT_EQ(0x0a660047u, ImmutableString("clamp(2C0C0C").mangledNameHash());
>+    ASSERT_EQ(0x0a624f01u, ImmutableString("clamp(3C0C0C").mangledNameHash());
>+    ASSERT_EQ(0x0a62ab50u, ImmutableString("clamp(1C1C1C").mangledNameHash());
>+    ASSERT_EQ(0x0a601dd8u, ImmutableString("clamp(2C2C2C").mangledNameHash());
>+    ASSERT_EQ(0x0a656274u, ImmutableString("clamp(3C3C3C").mangledNameHash());
>+    ASSERT_EQ(0x0a660f60u, ImmutableString("clamp(0D0D0D").mangledNameHash());
>+    ASSERT_EQ(0x0a60570du, ImmutableString("clamp(1D0D0D").mangledNameHash());
>+    ASSERT_EQ(0x0a623042u, ImmutableString("clamp(2D0D0D").mangledNameHash());
>+    ASSERT_EQ(0x0a65a625u, ImmutableString("clamp(3D0D0D").mangledNameHash());
>+    ASSERT_EQ(0x0a631d0bu, ImmutableString("clamp(1D1D1D").mangledNameHash());
>+    ASSERT_EQ(0x0a64f567u, ImmutableString("clamp(2D2D2D").mangledNameHash());
>+    ASSERT_EQ(0x0a674065u, ImmutableString("clamp(3D3D3D").mangledNameHash());
>+    ASSERT_EQ(0x0655be57u, ImmutableString("mix(0B0B0B").mangledNameHash());
>+    ASSERT_EQ(0x0650f1c9u, ImmutableString("mix(1B1B0B").mangledNameHash());
>+    ASSERT_EQ(0x0653049du, ImmutableString("mix(2B2B0B").mangledNameHash());
>+    ASSERT_EQ(0x06561bdcu, ImmutableString("mix(3B3B0B").mangledNameHash());
>+    ASSERT_EQ(0x0657a0a8u, ImmutableString("mix(1B1B1B").mangledNameHash());
>+    ASSERT_EQ(0x06549219u, ImmutableString("mix(2B2B2B").mangledNameHash());
>+    ASSERT_EQ(0x06568deeu, ImmutableString("mix(3B3B3B").mangledNameHash());
>+    ASSERT_EQ(0x0655a7e2u, ImmutableString("mix(0B0B0E").mangledNameHash());
>+    ASSERT_EQ(0x0657f3adu, ImmutableString("mix(1B1B1E").mangledNameHash());
>+    ASSERT_EQ(0x0654b2f8u, ImmutableString("mix(2B2B2E").mangledNameHash());
>+    ASSERT_EQ(0x06567d08u, ImmutableString("mix(3B3B3E").mangledNameHash());
>+    ASSERT_EQ(0x084e7be4u, ImmutableString("step(0B0B").mangledNameHash());
>+    ASSERT_EQ(0x084c9765u, ImmutableString("step(1B1B").mangledNameHash());
>+    ASSERT_EQ(0x0849bcfdu, ImmutableString("step(2B2B").mangledNameHash());
>+    ASSERT_EQ(0x084e7af1u, ImmutableString("step(3B3B").mangledNameHash());
>+    ASSERT_EQ(0x08491304u, ImmutableString("step(0B1B").mangledNameHash());
>+    ASSERT_EQ(0x084feda7u, ImmutableString("step(0B2B").mangledNameHash());
>+    ASSERT_EQ(0x084ec1e6u, ImmutableString("step(0B3B").mangledNameHash());
>+    ASSERT_EQ(0x148de9b5u, ImmutableString("smoothstep(0B0B0B").mangledNameHash());
>+    ASSERT_EQ(0x1489436du, ImmutableString("smoothstep(1B1B1B").mangledNameHash());
>+    ASSERT_EQ(0x148a33b9u, ImmutableString("smoothstep(2B2B2B").mangledNameHash());
>+    ASSERT_EQ(0x1489bfb6u, ImmutableString("smoothstep(3B3B3B").mangledNameHash());
>+    ASSERT_EQ(0x14888e72u, ImmutableString("smoothstep(0B0B1B").mangledNameHash());
>+    ASSERT_EQ(0x148f7bf9u, ImmutableString("smoothstep(0B0B2B").mangledNameHash());
>+    ASSERT_EQ(0x148e5c11u, ImmutableString("smoothstep(0B0B3B").mangledNameHash());
>+    ASSERT_EQ(0x084bf445u, ImmutableString("modf(0B0B").mangledNameHash());
>+    ASSERT_EQ(0x084a908au, ImmutableString("modf(1B1B").mangledNameHash());
>+    ASSERT_EQ(0x084fa835u, ImmutableString("modf(2B2B").mangledNameHash());
>+    ASSERT_EQ(0x084807e9u, ImmutableString("modf(3B3B").mangledNameHash());
>+    ASSERT_EQ(0x0a46ab3bu, ImmutableString("isnan(0B").mangledNameHash());
>+    ASSERT_EQ(0x0a47fa7au, ImmutableString("isnan(1B").mangledNameHash());
>+    ASSERT_EQ(0x0a406460u, ImmutableString("isnan(2B").mangledNameHash());
>+    ASSERT_EQ(0x0a4561b0u, ImmutableString("isnan(3B").mangledNameHash());
>+    ASSERT_EQ(0x0a443a26u, ImmutableString("isinf(0B").mangledNameHash());
>+    ASSERT_EQ(0x0a452617u, ImmutableString("isinf(1B").mangledNameHash());
>+    ASSERT_EQ(0x0a4262ceu, ImmutableString("isinf(2B").mangledNameHash());
>+    ASSERT_EQ(0x0a43b397u, ImmutableString("isinf(3B").mangledNameHash());
>+    ASSERT_EQ(0x1c8ae0a5u, ImmutableString("floatBitsToInt(0B").mangledNameHash());
>+    ASSERT_EQ(0x1c89b11cu, ImmutableString("floatBitsToInt(1B").mangledNameHash());
>+    ASSERT_EQ(0x1c887f5eu, ImmutableString("floatBitsToInt(2B").mangledNameHash());
>+    ASSERT_EQ(0x1c8f60afu, ImmutableString("floatBitsToInt(3B").mangledNameHash());
>+    ASSERT_EQ(0x1e903284u, ImmutableString("floatBitsToUint(0B").mangledNameHash());
>+    ASSERT_EQ(0x1e95201fu, ImmutableString("floatBitsToUint(1B").mangledNameHash());
>+    ASSERT_EQ(0x1e966adcu, ImmutableString("floatBitsToUint(2B").mangledNameHash());
>+    ASSERT_EQ(0x1e97a505u, ImmutableString("floatBitsToUint(3B").mangledNameHash());
>+    ASSERT_EQ(0x1c89e261u, ImmutableString("intBitsToFloat(0C").mangledNameHash());
>+    ASSERT_EQ(0x1c88f18cu, ImmutableString("intBitsToFloat(1C").mangledNameHash());
>+    ASSERT_EQ(0x1c887424u, ImmutableString("intBitsToFloat(2C").mangledNameHash());
>+    ASSERT_EQ(0x1c8b20dau, ImmutableString("intBitsToFloat(3C").mangledNameHash());
>+    ASSERT_EQ(0x1e93c13fu, ImmutableString("uintBitsToFloat(0D").mangledNameHash());
>+    ASSERT_EQ(0x1e95582au, ImmutableString("uintBitsToFloat(1D").mangledNameHash());
>+    ASSERT_EQ(0x1e95b0a7u, ImmutableString("uintBitsToFloat(2D").mangledNameHash());
>+    ASSERT_EQ(0x1e92e353u, ImmutableString("uintBitsToFloat(3D").mangledNameHash());
>+    ASSERT_EQ(0x0a5799e7u, ImmutableString("frexp(0B0C").mangledNameHash());
>+    ASSERT_EQ(0x0a55008fu, ImmutableString("frexp(1B1C").mangledNameHash());
>+    ASSERT_EQ(0x0a50a6eeu, ImmutableString("frexp(2B2C").mangledNameHash());
>+    ASSERT_EQ(0x0a53e9c4u, ImmutableString("frexp(3B3C").mangledNameHash());
>+    ASSERT_EQ(0x0a52bed1u, ImmutableString("ldexp(0B0C").mangledNameHash());
>+    ASSERT_EQ(0x0a50832eu, ImmutableString("ldexp(1B1C").mangledNameHash());
>+    ASSERT_EQ(0x0a54aa52u, ImmutableString("ldexp(2B2C").mangledNameHash());
>+    ASSERT_EQ(0x0a57c201u, ImmutableString("ldexp(3B3C").mangledNameHash());
>+    ASSERT_EQ(0x1a84fa77u, ImmutableString("packSnorm2x16(1B").mangledNameHash());
>+    ASSERT_EQ(0x1a873678u, ImmutableString("packUnorm2x16(1B").mangledNameHash());
>+    ASSERT_EQ(0x187df788u, ImmutableString("packHalf2x16(1B").mangledNameHash());
>+    ASSERT_EQ(0x1e95511bu, ImmutableString("unpackSnorm2x16(0D").mangledNameHash());
>+    ASSERT_EQ(0x1e9718ffu, ImmutableString("unpackUnorm2x16(0D").mangledNameHash());
>+    ASSERT_EQ(0x1c8dd4e6u, ImmutableString("unpackHalf2x16(0D").mangledNameHash());
>+    ASSERT_EQ(0x187c1f3fu, ImmutableString("packUnorm4x8(3B").mangledNameHash());
>+    ASSERT_EQ(0x187b7b7cu, ImmutableString("packSnorm4x8(3B").mangledNameHash());
>+    ASSERT_EQ(0x1c8be3bau, ImmutableString("unpackUnorm4x8(0D").mangledNameHash());
>+    ASSERT_EQ(0x1c894fb3u, ImmutableString("unpackSnorm4x8(0D").mangledNameHash());
>+    ASSERT_EQ(0x0c48bffau, ImmutableString("length(0B").mangledNameHash());
>+    ASSERT_EQ(0x0c4f6cbbu, ImmutableString("length(1B").mangledNameHash());
>+    ASSERT_EQ(0x0c4a38b6u, ImmutableString("length(2B").mangledNameHash());
>+    ASSERT_EQ(0x0c4924f7u, ImmutableString("length(3B").mangledNameHash());
>+    ASSERT_EQ(0x106caf4fu, ImmutableString("distance(0B0B").mangledNameHash());
>+    ASSERT_EQ(0x106ff564u, ImmutableString("distance(1B1B").mangledNameHash());
>+    ASSERT_EQ(0x1068c0bfu, ImmutableString("distance(2B2B").mangledNameHash());
>+    ASSERT_EQ(0x1068425fu, ImmutableString("distance(3B3B").mangledNameHash());
>+    ASSERT_EQ(0x06450933u, ImmutableString("dot(0B0B").mangledNameHash());
>+    ASSERT_EQ(0x06421555u, ImmutableString("dot(1B1B").mangledNameHash());
>+    ASSERT_EQ(0x06463219u, ImmutableString("dot(2B2B").mangledNameHash());
>+    ASSERT_EQ(0x06415ae6u, ImmutableString("dot(3B3B").mangledNameHash());
>+    ASSERT_EQ(0x0a527d10u, ImmutableString("cross(2B2B").mangledNameHash());
>+    ASSERT_EQ(0x12650243u, ImmutableString("normalize(0B").mangledNameHash());
>+    ASSERT_EQ(0x126235c4u, ImmutableString("normalize(1B").mangledNameHash());
>+    ASSERT_EQ(0x12635a67u, ImmutableString("normalize(2B").mangledNameHash());
>+    ASSERT_EQ(0x1264aa3eu, ImmutableString("normalize(3B").mangledNameHash());
>+    ASSERT_EQ(0x1697cde8u, ImmutableString("faceforward(0B0B0B").mangledNameHash());
>+    ASSERT_EQ(0x1691c40bu, ImmutableString("faceforward(1B1B1B").mangledNameHash());
>+    ASSERT_EQ(0x1696babeu, ImmutableString("faceforward(2B2B2B").mangledNameHash());
>+    ASSERT_EQ(0x1690b84du, ImmutableString("faceforward(3B3B3B").mangledNameHash());
>+    ASSERT_EQ(0x0e63358eu, ImmutableString("reflect(0B0B").mangledNameHash());
>+    ASSERT_EQ(0x0e665b7bu, ImmutableString("reflect(1B1B").mangledNameHash());
>+    ASSERT_EQ(0x0e620f44u, ImmutableString("reflect(2B2B").mangledNameHash());
>+    ASSERT_EQ(0x0e631c50u, ImmutableString("reflect(3B3B").mangledNameHash());
>+    ASSERT_EQ(0x0e73b594u, ImmutableString("refract(0B0B0B").mangledNameHash());
>+    ASSERT_EQ(0x0e706684u, ImmutableString("refract(1B1B0B").mangledNameHash());
>+    ASSERT_EQ(0x0e71a4fcu, ImmutableString("refract(2B2B0B").mangledNameHash());
>+    ASSERT_EQ(0x0e71b28du, ImmutableString("refract(3B3B0B").mangledNameHash());
>+    ASSERT_EQ(0x1c993bdfu, ImmutableString("matrixCompMult(5B5B").mangledNameHash());
>+    ASSERT_EQ(0x1c9e72dbu, ImmutableString("matrixCompMult(ABAB").mangledNameHash());
>+    ASSERT_EQ(0x1c9b357cu, ImmutableString("matrixCompMult(FBFB").mangledNameHash());
>+    ASSERT_EQ(0x1c9876e4u, ImmutableString("matrixCompMult(9B9B").mangledNameHash());
>+    ASSERT_EQ(0x1c9c8697u, ImmutableString("matrixCompMult(6B6B").mangledNameHash());
>+    ASSERT_EQ(0x1c9ea241u, ImmutableString("matrixCompMult(DBDB").mangledNameHash());
>+    ASSERT_EQ(0x1c99affcu, ImmutableString("matrixCompMult(7B7B").mangledNameHash());
>+    ASSERT_EQ(0x1c9fa571u, ImmutableString("matrixCompMult(EBEB").mangledNameHash());
>+    ASSERT_EQ(0x1c9ccd5au, ImmutableString("matrixCompMult(BBBB").mangledNameHash());
>+    ASSERT_EQ(0x188880cbu, ImmutableString("outerProduct(1B1B").mangledNameHash());
>+    ASSERT_EQ(0x188db87au, ImmutableString("outerProduct(2B2B").mangledNameHash());
>+    ASSERT_EQ(0x188e0232u, ImmutableString("outerProduct(3B3B").mangledNameHash());
>+    ASSERT_EQ(0x188e2270u, ImmutableString("outerProduct(2B1B").mangledNameHash());
>+    ASSERT_EQ(0x188916c3u, ImmutableString("outerProduct(1B2B").mangledNameHash());
>+    ASSERT_EQ(0x188f8feeu, ImmutableString("outerProduct(3B1B").mangledNameHash());
>+    ASSERT_EQ(0x188a12cau, ImmutableString("outerProduct(1B3B").mangledNameHash());
>+    ASSERT_EQ(0x1888c44du, ImmutableString("outerProduct(3B2B").mangledNameHash());
>+    ASSERT_EQ(0x18887331u, ImmutableString("outerProduct(2B3B").mangledNameHash());
>+    ASSERT_EQ(0x1267db60u, ImmutableString("transpose(5B").mangledNameHash());
>+    ASSERT_EQ(0x12602fd7u, ImmutableString("transpose(AB").mangledNameHash());
>+    ASSERT_EQ(0x12661b07u, ImmutableString("transpose(FB").mangledNameHash());
>+    ASSERT_EQ(0x12650771u, ImmutableString("transpose(6B").mangledNameHash());
>+    ASSERT_EQ(0x12658f24u, ImmutableString("transpose(9B").mangledNameHash());
>+    ASSERT_EQ(0x12665430u, ImmutableString("transpose(7B").mangledNameHash());
>+    ASSERT_EQ(0x1267de6cu, ImmutableString("transpose(DB").mangledNameHash());
>+    ASSERT_EQ(0x12655b22u, ImmutableString("transpose(BB").mangledNameHash());
>+    ASSERT_EQ(0x1264f5e4u, ImmutableString("transpose(EB").mangledNameHash());
>+    ASSERT_EQ(0x1676ad75u, ImmutableString("determinant(5B").mangledNameHash());
>+    ASSERT_EQ(0x167719ccu, ImmutableString("determinant(AB").mangledNameHash());
>+    ASSERT_EQ(0x1674ed12u, ImmutableString("determinant(FB").mangledNameHash());
>+    ASSERT_EQ(0x0e503084u, ImmutableString("inverse(5B").mangledNameHash());
>+    ASSERT_EQ(0x0e507cbdu, ImmutableString("inverse(AB").mangledNameHash());
>+    ASSERT_EQ(0x0e50cc43u, ImmutableString("inverse(FB").mangledNameHash());
>+    ASSERT_EQ(0x1069b2c0u, ImmutableString("lessThan(1B1B").mangledNameHash());
>+    ASSERT_EQ(0x106a713eu, ImmutableString("lessThan(2B2B").mangledNameHash());
>+    ASSERT_EQ(0x106d2c39u, ImmutableString("lessThan(3B3B").mangledNameHash());
>+    ASSERT_EQ(0x106b4468u, ImmutableString("lessThan(1C1C").mangledNameHash());
>+    ASSERT_EQ(0x106faaeau, ImmutableString("lessThan(2C2C").mangledNameHash());
>+    ASSERT_EQ(0x106a110cu, ImmutableString("lessThan(3C3C").mangledNameHash());
>+    ASSERT_EQ(0x106d7bd6u, ImmutableString("lessThan(1D1D").mangledNameHash());
>+    ASSERT_EQ(0x10697de8u, ImmutableString("lessThan(2D2D").mangledNameHash());
>+    ASSERT_EQ(0x106843efu, ImmutableString("lessThan(3D3D").mangledNameHash());
>+    ASSERT_EQ(0x1a95c72au, ImmutableString("lessThanEqual(1B1B").mangledNameHash());
>+    ASSERT_EQ(0x1a97d055u, ImmutableString("lessThanEqual(2B2B").mangledNameHash());
>+    ASSERT_EQ(0x1a9642f7u, ImmutableString("lessThanEqual(3B3B").mangledNameHash());
>+    ASSERT_EQ(0x1a977782u, ImmutableString("lessThanEqual(1C1C").mangledNameHash());
>+    ASSERT_EQ(0x1a9481a8u, ImmutableString("lessThanEqual(2C2C").mangledNameHash());
>+    ASSERT_EQ(0x1a94a164u, ImmutableString("lessThanEqual(3C3C").mangledNameHash());
>+    ASSERT_EQ(0x1a95efdcu, ImmutableString("lessThanEqual(1D1D").mangledNameHash());
>+    ASSERT_EQ(0x1a92589du, ImmutableString("lessThanEqual(2D2D").mangledNameHash());
>+    ASSERT_EQ(0x1a96ec62u, ImmutableString("lessThanEqual(3D3D").mangledNameHash());
>+    ASSERT_EQ(0x16817df9u, ImmutableString("greaterThan(1B1B").mangledNameHash());
>+    ASSERT_EQ(0x16853112u, ImmutableString("greaterThan(2B2B").mangledNameHash());
>+    ASSERT_EQ(0x16829d5du, ImmutableString("greaterThan(3B3B").mangledNameHash());
>+    ASSERT_EQ(0x1685db46u, ImmutableString("greaterThan(1C1C").mangledNameHash());
>+    ASSERT_EQ(0x1685d025u, ImmutableString("greaterThan(2C2C").mangledNameHash());
>+    ASSERT_EQ(0x1681b963u, ImmutableString("greaterThan(3C3C").mangledNameHash());
>+    ASSERT_EQ(0x168174f7u, ImmutableString("greaterThan(1D1D").mangledNameHash());
>+    ASSERT_EQ(0x1681d6b4u, ImmutableString("greaterThan(2D2D").mangledNameHash());
>+    ASSERT_EQ(0x16812c54u, ImmutableString("greaterThan(3D3D").mangledNameHash());
>+    ASSERT_EQ(0x20acdd3au, ImmutableString("greaterThanEqual(1B1B").mangledNameHash());
>+    ASSERT_EQ(0x20ae6ffbu, ImmutableString("greaterThanEqual(2B2B").mangledNameHash());
>+    ASSERT_EQ(0x20adfc96u, ImmutableString("greaterThanEqual(3B3B").mangledNameHash());
>+    ASSERT_EQ(0x20af1dd4u, ImmutableString("greaterThanEqual(1C1C").mangledNameHash());
>+    ASSERT_EQ(0x20ab1dc0u, ImmutableString("greaterThanEqual(2C2C").mangledNameHash());
>+    ASSERT_EQ(0x20ad192cu, ImmutableString("greaterThanEqual(3C3C").mangledNameHash());
>+    ASSERT_EQ(0x20aedbacu, ImmutableString("greaterThanEqual(1D1D").mangledNameHash());
>+    ASSERT_EQ(0x20a92dc6u, ImmutableString("greaterThanEqual(2D2D").mangledNameHash());
>+    ASSERT_EQ(0x20ae96edu, ImmutableString("greaterThanEqual(3D3D").mangledNameHash());
>+    ASSERT_EQ(0x0a57a8f5u, ImmutableString("equal(1B1B").mangledNameHash());
>+    ASSERT_EQ(0x0a54c30cu, ImmutableString("equal(2B2B").mangledNameHash());
>+    ASSERT_EQ(0x0a51bddcu, ImmutableString("equal(3B3B").mangledNameHash());
>+    ASSERT_EQ(0x0a554046u, ImmutableString("equal(1C1C").mangledNameHash());
>+    ASSERT_EQ(0x0a542036u, ImmutableString("equal(2C2C").mangledNameHash());
>+    ASSERT_EQ(0x0a56874bu, ImmutableString("equal(3C3C").mangledNameHash());
>+    ASSERT_EQ(0x0a5613e7u, ImmutableString("equal(1D1D").mangledNameHash());
>+    ASSERT_EQ(0x0a524bc4u, ImmutableString("equal(2D2D").mangledNameHash());
>+    ASSERT_EQ(0x0a56ba24u, ImmutableString("equal(3D3D").mangledNameHash());
>+    ASSERT_EQ(0x0a5744dcu, ImmutableString("equal(1E1E").mangledNameHash());
>+    ASSERT_EQ(0x0a56fc88u, ImmutableString("equal(2E2E").mangledNameHash());
>+    ASSERT_EQ(0x0a513a26u, ImmutableString("equal(3E3E").mangledNameHash());
>+    ASSERT_EQ(0x106ade94u, ImmutableString("notEqual(1B1B").mangledNameHash());
>+    ASSERT_EQ(0x106dabccu, ImmutableString("notEqual(2B2B").mangledNameHash());
>+    ASSERT_EQ(0x106b8219u, ImmutableString("notEqual(3B3B").mangledNameHash());
>+    ASSERT_EQ(0x106b25c9u, ImmutableString("notEqual(1C1C").mangledNameHash());
>+    ASSERT_EQ(0x106a63f2u, ImmutableString("notEqual(2C2C").mangledNameHash());
>+    ASSERT_EQ(0x106eaf65u, ImmutableString("notEqual(3C3C").mangledNameHash());
>+    ASSERT_EQ(0x106ad530u, ImmutableString("notEqual(1D1D").mangledNameHash());
>+    ASSERT_EQ(0x106e7a45u, ImmutableString("notEqual(2D2D").mangledNameHash());
>+    ASSERT_EQ(0x106e2903u, ImmutableString("notEqual(3D3D").mangledNameHash());
>+    ASSERT_EQ(0x1068f060u, ImmutableString("notEqual(1E1E").mangledNameHash());
>+    ASSERT_EQ(0x10695fe7u, ImmutableString("notEqual(2E2E").mangledNameHash());
>+    ASSERT_EQ(0x106bc4fcu, ImmutableString("notEqual(3E3E").mangledNameHash());
>+    ASSERT_EQ(0x063194bfu, ImmutableString("any(1E").mangledNameHash());
>+    ASSERT_EQ(0x063415e2u, ImmutableString("any(2E").mangledNameHash());
>+    ASSERT_EQ(0x0632fcb3u, ImmutableString("any(3E").mangledNameHash());
>+    ASSERT_EQ(0x06307fbcu, ImmutableString("all(1E").mangledNameHash());
>+    ASSERT_EQ(0x0635eb79u, ImmutableString("all(2E").mangledNameHash());
>+    ASSERT_EQ(0x0636dda0u, ImmutableString("all(3E").mangledNameHash());
>+    ASSERT_EQ(0x0636e0efu, ImmutableString("not(1E").mangledNameHash());
>+    ASSERT_EQ(0x06376a86u, ImmutableString("not(2E").mangledNameHash());
>+    ASSERT_EQ(0x0630826fu, ImmutableString("not(3E").mangledNameHash());
>+    ASSERT_EQ(0x1eb17f7du, ImmutableString("bitfieldExtract(0C0C0C").mangledNameHash());
>+    ASSERT_EQ(0x1eb19a50u, ImmutableString("bitfieldExtract(1C0C0C").mangledNameHash());
>+    ASSERT_EQ(0x1eb0c64fu, ImmutableString("bitfieldExtract(2C0C0C").mangledNameHash());
>+    ASSERT_EQ(0x1eb17d11u, ImmutableString("bitfieldExtract(3C0C0C").mangledNameHash());
>+    ASSERT_EQ(0x1eb0f9fau, ImmutableString("bitfieldExtract(0D0C0C").mangledNameHash());
>+    ASSERT_EQ(0x1eb5f0c8u, ImmutableString("bitfieldExtract(1D0C0C").mangledNameHash());
>+    ASSERT_EQ(0x1eb28b55u, ImmutableString("bitfieldExtract(2D0C0C").mangledNameHash());
>+    ASSERT_EQ(0x1eb12f29u, ImmutableString("bitfieldExtract(3D0C0C").mangledNameHash());
>+    ASSERT_EQ(0x1cbdf898u, ImmutableString("bitfieldInsert(0C0C0C0C").mangledNameHash());
>+    ASSERT_EQ(0x1cb90fd0u, ImmutableString("bitfieldInsert(1C1C0C0C").mangledNameHash());
>+    ASSERT_EQ(0x1cbfaf73u, ImmutableString("bitfieldInsert(2C2C0C0C").mangledNameHash());
>+    ASSERT_EQ(0x1cb880bfu, ImmutableString("bitfieldInsert(3C3C0C0C").mangledNameHash());
>+    ASSERT_EQ(0x1cbb43f5u, ImmutableString("bitfieldInsert(0D0D0C0C").mangledNameHash());
>+    ASSERT_EQ(0x1cb9fb13u, ImmutableString("bitfieldInsert(1D1D0C0C").mangledNameHash());
>+    ASSERT_EQ(0x1cbb9db3u, ImmutableString("bitfieldInsert(2D2D0C0C").mangledNameHash());
>+    ASSERT_EQ(0x1cb84b0cu, ImmutableString("bitfieldInsert(3D3D0C0C").mangledNameHash());
>+    ASSERT_EQ(0x1e91c654u, ImmutableString("bitfieldReverse(0C").mangledNameHash());
>+    ASSERT_EQ(0x1e970da3u, ImmutableString("bitfieldReverse(1C").mangledNameHash());
>+    ASSERT_EQ(0x1e9797d2u, ImmutableString("bitfieldReverse(2C").mangledNameHash());
>+    ASSERT_EQ(0x1e9088f7u, ImmutableString("bitfieldReverse(3C").mangledNameHash());
>+    ASSERT_EQ(0x1e91e675u, ImmutableString("bitfieldReverse(0D").mangledNameHash());
>+    ASSERT_EQ(0x1e96ddc2u, ImmutableString("bitfieldReverse(1D").mangledNameHash());
>+    ASSERT_EQ(0x1e9744d7u, ImmutableString("bitfieldReverse(2D").mangledNameHash());
>+    ASSERT_EQ(0x1e907f62u, ImmutableString("bitfieldReverse(3D").mangledNameHash());
>+    ASSERT_EQ(0x1059dae9u, ImmutableString("bitCount(0C").mangledNameHash());
>+    ASSERT_EQ(0x1058cbf7u, ImmutableString("bitCount(1C").mangledNameHash());
>+    ASSERT_EQ(0x10584c2du, ImmutableString("bitCount(2C").mangledNameHash());
>+    ASSERT_EQ(0x105b1832u, ImmutableString("bitCount(3C").mangledNameHash());
>+    ASSERT_EQ(0x1059a37cu, ImmutableString("bitCount(0D").mangledNameHash());
>+    ASSERT_EQ(0x105896f1u, ImmutableString("bitCount(1D").mangledNameHash());
>+    ASSERT_EQ(0x10581cccu, ImmutableString("bitCount(2D").mangledNameHash());
>+    ASSERT_EQ(0x105b2810u, ImmutableString("bitCount(3D").mangledNameHash());
>+    ASSERT_EQ(0x0e5607c2u, ImmutableString("findLSB(0C").mangledNameHash());
>+    ASSERT_EQ(0x0e5514e7u, ImmutableString("findLSB(1C").mangledNameHash());
>+    ASSERT_EQ(0x0e54832eu, ImmutableString("findLSB(2C").mangledNameHash());
>+    ASSERT_EQ(0x0e574a59u, ImmutableString("findLSB(3C").mangledNameHash());
>+    ASSERT_EQ(0x0e5650c7u, ImmutableString("findLSB(0D").mangledNameHash());
>+    ASSERT_EQ(0x0e550f72u, ImmutableString("findLSB(1D").mangledNameHash());
>+    ASSERT_EQ(0x0e54b667u, ImmutableString("findLSB(2D").mangledNameHash());
>+    ASSERT_EQ(0x0e573680u, ImmutableString("findLSB(3D").mangledNameHash());
>+    ASSERT_EQ(0x0e508070u, ImmutableString("findMSB(0C").mangledNameHash());
>+    ASSERT_EQ(0x0e51917du, ImmutableString("findMSB(1C").mangledNameHash());
>+    ASSERT_EQ(0x0e56cd55u, ImmutableString("findMSB(2C").mangledNameHash());
>+    ASSERT_EQ(0x0e500330u, ImmutableString("findMSB(3C").mangledNameHash());
>+    ASSERT_EQ(0x0e508a05u, ImmutableString("findMSB(0D").mangledNameHash());
>+    ASSERT_EQ(0x0e51dc78u, ImmutableString("findMSB(1D").mangledNameHash());
>+    ASSERT_EQ(0x0e56a99cu, ImmutableString("findMSB(2D").mangledNameHash());
>+    ASSERT_EQ(0x0e503089u, ImmutableString("findMSB(3D").mangledNameHash());
>+    ASSERT_EQ(0x1283ba95u, ImmutableString("uaddCarry(0D0D0D").mangledNameHash());
>+    ASSERT_EQ(0x12843bc0u, ImmutableString("uaddCarry(1D1D1D").mangledNameHash());
>+    ASSERT_EQ(0x12840dfbu, ImmutableString("uaddCarry(2D2D2D").mangledNameHash());
>+    ASSERT_EQ(0x12842566u, ImmutableString("uaddCarry(3D3D3D").mangledNameHash());
>+    ASSERT_EQ(0x148f6fe1u, ImmutableString("usubBorrow(0D0D0D").mangledNameHash());
>+    ASSERT_EQ(0x148ab5f1u, ImmutableString("usubBorrow(1D1D1D").mangledNameHash());
>+    ASSERT_EQ(0x14896692u, ImmutableString("usubBorrow(2D2D2D").mangledNameHash());
>+    ASSERT_EQ(0x1488ffa7u, ImmutableString("usubBorrow(3D3D3D").mangledNameHash());
>+    ASSERT_EQ(0x18a93bdcu, ImmutableString("umulExtended(0D0D0D0D").mangledNameHash());
>+    ASSERT_EQ(0x18ab4baeu, ImmutableString("umulExtended(1D1D1D1D").mangledNameHash());
>+    ASSERT_EQ(0x18aa71ceu, ImmutableString("umulExtended(2D2D2D2D").mangledNameHash());
>+    ASSERT_EQ(0x18a94b63u, ImmutableString("umulExtended(3D3D3D3D").mangledNameHash());
>+    ASSERT_EQ(0x18ac377fu, ImmutableString("imulExtended(0C0C0C0C").mangledNameHash());
>+    ASSERT_EQ(0x18ae7b8cu, ImmutableString("imulExtended(1C1C1C1C").mangledNameHash());
>+    ASSERT_EQ(0x18a851efu, ImmutableString("imulExtended(2C2C2C2C").mangledNameHash());
>+    ASSERT_EQ(0x18ac1df0u, ImmutableString("imulExtended(3C3C3C3C").mangledNameHash());
>+    ASSERT_EQ(0x1271689cu, ImmutableString("texture2D(0H1B").mangledNameHash());
>+    ASSERT_EQ(0x1a96b8d6u, ImmutableString("texture2DProj(0H2B").mangledNameHash());
>+    ASSERT_EQ(0x1a95bcc7u, ImmutableString("texture2DProj(0H3B").mangledNameHash());
>+    ASSERT_EQ(0x1680927du, ImmutableString("textureCube(0J2B").mangledNameHash());
>+    ASSERT_EQ(0x127728cau, ImmutableString("texture2D(0L1B").mangledNameHash());
>+    ASSERT_EQ(0x1a92969du, ImmutableString("texture2DProj(0L2B").mangledNameHash());
>+    ASSERT_EQ(0x1a9584eau, ImmutableString("texture2DProj(0L3B").mangledNameHash());
>+    ASSERT_EQ(0x1a902408u, ImmutableString("texture2DRect(0N1B").mangledNameHash());
>+    ASSERT_EQ(0x22b65e05u, ImmutableString("texture2DRectProj(0N2B").mangledNameHash());
>+    ASSERT_EQ(0x22b53a05u, ImmutableString("texture2DRectProj(0N3B").mangledNameHash());
>+    ASSERT_EQ(0x0e663be3u, ImmutableString("texture(0N1B").mangledNameHash());
>+    ASSERT_EQ(0x1686cb94u, ImmutableString("textureProj(0N2B").mangledNameHash());
>+    ASSERT_EQ(0x1685b785u, ImmutableString("textureProj(0N3B").mangledNameHash());
>+    ASSERT_EQ(0x20cb8d71u, ImmutableString("texture2DGradEXT(0H1B1B1B").mangledNameHash());
>+    ASSERT_EQ(0x28ed5178u, ImmutableString("texture2DProjGradEXT(0H2B1B1B").mangledNameHash());
>+    ASSERT_EQ(0x28e995cbu, ImmutableString("texture2DProjGradEXT(0H3B1B1B").mangledNameHash());
>+    ASSERT_EQ(0x24dbd51eu, ImmutableString("textureCubeGradEXT(0J2B2B2B").mangledNameHash());
>+    ASSERT_EQ(0x12846ba6u, ImmutableString("texture2D(0H1B0B").mangledNameHash());
>+    ASSERT_EQ(0x1aa44389u, ImmutableString("texture2DProj(0H2B0B").mangledNameHash());
>+    ASSERT_EQ(0x1aa197a7u, ImmutableString("texture2DProj(0H3B0B").mangledNameHash());
>+    ASSERT_EQ(0x1696a314u, ImmutableString("textureCube(0J2B0B").mangledNameHash());
>+    ASSERT_EQ(0x08398819u, ImmutableString("dFdx(0B").mangledNameHash());
>+    ASSERT_EQ(0x083c6796u, ImmutableString("dFdx(1B").mangledNameHash());
>+    ASSERT_EQ(0x083c0d13u, ImmutableString("dFdx(2B").mangledNameHash());
>+    ASSERT_EQ(0x083abe52u, ImmutableString("dFdx(3B").mangledNameHash());
>+    ASSERT_EQ(0x08394c88u, ImmutableString("dFdy(0B").mangledNameHash());
>+    ASSERT_EQ(0x083a7081u, ImmutableString("dFdy(1B").mangledNameHash());
>+    ASSERT_EQ(0x083b9d7au, ImmutableString("dFdy(2B").mangledNameHash());
>+    ASSERT_EQ(0x083ced8bu, ImmutableString("dFdy(3B").mangledNameHash());
>+    ASSERT_EQ(0x0c4d354eu, ImmutableString("fwidth(0B").mangledNameHash());
>+    ASSERT_EQ(0x0c483e39u, ImmutableString("fwidth(1B").mangledNameHash());
>+    ASSERT_EQ(0x0c4fa8b5u, ImmutableString("fwidth(2B").mangledNameHash());
>+    ASSERT_EQ(0x0c4e7b0cu, ImmutableString("fwidth(3B").mangledNameHash());
>+    ASSERT_EQ(0x1eb43b6cu, ImmutableString("texture2DLodEXT(0H1B0B").mangledNameHash());
>+    ASSERT_EQ(0x26d60d82u, ImmutableString("texture2DProjLodEXT(0H2B0B").mangledNameHash());
>+    ASSERT_EQ(0x26d1d3beu, ImmutableString("texture2DProjLodEXT(0H3B0B").mangledNameHash());
>+    ASSERT_EQ(0x22c206a5u, ImmutableString("textureCubeLodEXT(0J2B0B").mangledNameHash());
>+    ASSERT_EQ(0x18986fc2u, ImmutableString("texture2DLod(0H1B0B").mangledNameHash());
>+    ASSERT_EQ(0x20bc6337u, ImmutableString("texture2DProjLod(0H2B0B").mangledNameHash());
>+    ASSERT_EQ(0x20b8a0c3u, ImmutableString("texture2DProjLod(0H3B0B").mangledNameHash());
>+    ASSERT_EQ(0x1cac1f4du, ImmutableString("textureCubeLod(0J2B0B").mangledNameHash());
>+    ASSERT_EQ(0x0e65ea73u, ImmutableString("texture(0H1B").mangledNameHash());
>+    ASSERT_EQ(0x0e60bb56u, ImmutableString("texture(0Q1B").mangledNameHash());
>+    ASSERT_EQ(0x0e64ec86u, ImmutableString("texture(0W1B").mangledNameHash());
>+    ASSERT_EQ(0x0e625169u, ImmutableString("texture(0I2B").mangledNameHash());
>+    ASSERT_EQ(0x0e67a979u, ImmutableString("texture(0R2B").mangledNameHash());
>+    ASSERT_EQ(0x0e64854cu, ImmutableString("texture(0X2B").mangledNameHash());
>+    ASSERT_EQ(0x0e6470f1u, ImmutableString("texture(0J2B").mangledNameHash());
>+    ASSERT_EQ(0x0e60445cu, ImmutableString("texture(0S2B").mangledNameHash());
>+    ASSERT_EQ(0x0e67dce5u, ImmutableString("texture(0Y2B").mangledNameHash());
>+    ASSERT_EQ(0x0e61222eu, ImmutableString("texture(0K2B").mangledNameHash());
>+    ASSERT_EQ(0x0e62790eu, ImmutableString("texture(0T2B").mangledNameHash());
>+    ASSERT_EQ(0x0e61e49du, ImmutableString("texture(0Z2B").mangledNameHash());
>+    ASSERT_EQ(0x168178c7u, ImmutableString("textureProj(0H2B").mangledNameHash());
>+    ASSERT_EQ(0x1685011eu, ImmutableString("textureProj(0Q2B").mangledNameHash());
>+    ASSERT_EQ(0x1687d107u, ImmutableString("textureProj(0W2B").mangledNameHash());
>+    ASSERT_EQ(0x16840064u, ImmutableString("textureProj(0H3B").mangledNameHash());
>+    ASSERT_EQ(0x16860d28u, ImmutableString("textureProj(0Q3B").mangledNameHash());
>+    ASSERT_EQ(0x16812eeeu, ImmutableString("textureProj(0W3B").mangledNameHash());
>+    ASSERT_EQ(0x1685ca01u, ImmutableString("textureProj(0I3B").mangledNameHash());
>+    ASSERT_EQ(0x1687c54du, ImmutableString("textureProj(0R3B").mangledNameHash());
>+    ASSERT_EQ(0x1682b6c4u, ImmutableString("textureProj(0X3B").mangledNameHash());
>+    ASSERT_EQ(0x148b33b6u, ImmutableString("textureLod(0H1B0B").mangledNameHash());
>+    ASSERT_EQ(0x148fa8bbu, ImmutableString("textureLod(0Q1B0B").mangledNameHash());
>+    ASSERT_EQ(0x1488a5bfu, ImmutableString("textureLod(0W1B0B").mangledNameHash());
>+    ASSERT_EQ(0x148d335cu, ImmutableString("textureLod(0I2B0B").mangledNameHash());
>+    ASSERT_EQ(0x148cccafu, ImmutableString("textureLod(0R2B0B").mangledNameHash());
>+    ASSERT_EQ(0x14882ba7u, ImmutableString("textureLod(0X2B0B").mangledNameHash());
>+    ASSERT_EQ(0x148b00dbu, ImmutableString("textureLod(0J2B0B").mangledNameHash());
>+    ASSERT_EQ(0x148a66beu, ImmutableString("textureLod(0S2B0B").mangledNameHash());
>+    ASSERT_EQ(0x148e44d3u, ImmutableString("textureLod(0Y2B0B").mangledNameHash());
>+    ASSERT_EQ(0x148ed87fu, ImmutableString("textureLod(0K2B0B").mangledNameHash());
>+    ASSERT_EQ(0x1489e510u, ImmutableString("textureLod(0T2B0B").mangledNameHash());
>+    ASSERT_EQ(0x148fe911u, ImmutableString("textureLod(0Z2B0B").mangledNameHash());
>+    ASSERT_EQ(0x0e600d82u, ImmutableString("texture(0c2B").mangledNameHash());
>+    ASSERT_EQ(0x0e67665bu, ImmutableString("texture(0d3B").mangledNameHash());
>+    ASSERT_EQ(0x0e6044aeu, ImmutableString("texture(0e3B").mangledNameHash());
>+    ASSERT_EQ(0x16875a59u, ImmutableString("textureProj(0c3B").mangledNameHash());
>+    ASSERT_EQ(0x148a95e7u, ImmutableString("textureLod(0c2B0B").mangledNameHash());
>+    ASSERT_EQ(0x168434eeu, ImmutableString("textureSize(0H0C").mangledNameHash());
>+    ASSERT_EQ(0x16869d00u, ImmutableString("textureSize(0Q0C").mangledNameHash());
>+    ASSERT_EQ(0x16846c6cu, ImmutableString("textureSize(0W0C").mangledNameHash());
>+    ASSERT_EQ(0x16803d05u, ImmutableString("textureSize(0I0C").mangledNameHash());
>+    ASSERT_EQ(0x16863c73u, ImmutableString("textureSize(0R0C").mangledNameHash());
>+    ASSERT_EQ(0x1686a82au, ImmutableString("textureSize(0X0C").mangledNameHash());
>+    ASSERT_EQ(0x1681f153u, ImmutableString("textureSize(0J0C").mangledNameHash());
>+    ASSERT_EQ(0x168245a4u, ImmutableString("textureSize(0S0C").mangledNameHash());
>+    ASSERT_EQ(0x1682d660u, ImmutableString("textureSize(0Y0C").mangledNameHash());
>+    ASSERT_EQ(0x16861104u, ImmutableString("textureSize(0K0C").mangledNameHash());
>+    ASSERT_EQ(0x168093aau, ImmutableString("textureSize(0T0C").mangledNameHash());
>+    ASSERT_EQ(0x16849618u, ImmutableString("textureSize(0Z0C").mangledNameHash());
>+    ASSERT_EQ(0x1686aa87u, ImmutableString("textureSize(0c0C").mangledNameHash());
>+    ASSERT_EQ(0x1684f1b3u, ImmutableString("textureSize(0d0C").mangledNameHash());
>+    ASSERT_EQ(0x168115fbu, ImmutableString("textureSize(0e0C").mangledNameHash());
>+    ASSERT_EQ(0x1caa108bu, ImmutableString("textureProjLod(0H2B0B").mangledNameHash());
>+    ASSERT_EQ(0x1caa957cu, ImmutableString("textureProjLod(0Q2B0B").mangledNameHash());
>+    ASSERT_EQ(0x1ca9ff27u, ImmutableString("textureProjLod(0W2B0B").mangledNameHash());
>+    ASSERT_EQ(0x1ca8c89au, ImmutableString("textureProjLod(0H3B0B").mangledNameHash());
>+    ASSERT_EQ(0x1ca85d55u, ImmutableString("textureProjLod(0Q3B0B").mangledNameHash());
>+    ASSERT_EQ(0x1cab3a35u, ImmutableString("textureProjLod(0W3B0B").mangledNameHash());
>+    ASSERT_EQ(0x1caf96afu, ImmutableString("textureProjLod(0I3B0B").mangledNameHash());
>+    ASSERT_EQ(0x1cae6ef8u, ImmutableString("textureProjLod(0R3B0B").mangledNameHash());
>+    ASSERT_EQ(0x1cadb5feu, ImmutableString("textureProjLod(0X3B0B").mangledNameHash());
>+    ASSERT_EQ(0x1ca81af6u, ImmutableString("textureProjLod(0c3B0B").mangledNameHash());
>+    ASSERT_EQ(0x148fd5b6u, ImmutableString("texelFetch(0H1C0C").mangledNameHash());
>+    ASSERT_EQ(0x148e5d86u, ImmutableString("texelFetch(0Q1C0C").mangledNameHash());
>+    ASSERT_EQ(0x148e6d96u, ImmutableString("texelFetch(0W1C0C").mangledNameHash());
>+    ASSERT_EQ(0x148bab65u, ImmutableString("texelFetch(0I2C0C").mangledNameHash());
>+    ASSERT_EQ(0x14885983u, ImmutableString("texelFetch(0R2C0C").mangledNameHash());
>+    ASSERT_EQ(0x148e100eu, ImmutableString("texelFetch(0X2C0C").mangledNameHash());
>+    ASSERT_EQ(0x148d0a7bu, ImmutableString("texelFetch(0K2C0C").mangledNameHash());
>+    ASSERT_EQ(0x148fb13cu, ImmutableString("texelFetch(0T2C0C").mangledNameHash());
>+    ASSERT_EQ(0x14885e67u, ImmutableString("texelFetch(0Z2C0C").mangledNameHash());
>+    ASSERT_EQ(0x16a19c8du, ImmutableString("textureGrad(0H1B1B1B").mangledNameHash());
>+    ASSERT_EQ(0x16a2ff3du, ImmutableString("textureGrad(0Q1B1B1B").mangledNameHash());
>+    ASSERT_EQ(0x16a4a66cu, ImmutableString("textureGrad(0W1B1B1B").mangledNameHash());
>+    ASSERT_EQ(0x16a00e04u, ImmutableString("textureGrad(0I2B2B2B").mangledNameHash());
>+    ASSERT_EQ(0x16a34692u, ImmutableString("textureGrad(0R2B2B2B").mangledNameHash());
>+    ASSERT_EQ(0x16a04ad9u, ImmutableString("textureGrad(0X2B2B2B").mangledNameHash());
>+    ASSERT_EQ(0x16a1ec87u, ImmutableString("textureGrad(0J2B2B2B").mangledNameHash());
>+    ASSERT_EQ(0x16a68a81u, ImmutableString("textureGrad(0S2B2B2B").mangledNameHash());
>+    ASSERT_EQ(0x16a3b8f6u, ImmutableString("textureGrad(0Y2B2B2B").mangledNameHash());
>+    ASSERT_EQ(0x16a3a842u, ImmutableString("textureGrad(0c2B1B1B").mangledNameHash());
>+    ASSERT_EQ(0x16a4e27cu, ImmutableString("textureGrad(0d3B2B2B").mangledNameHash());
>+    ASSERT_EQ(0x16a71104u, ImmutableString("textureGrad(0K2B1B1B").mangledNameHash());
>+    ASSERT_EQ(0x16a66883u, ImmutableString("textureGrad(0T2B1B1B").mangledNameHash());
>+    ASSERT_EQ(0x16a6a742u, ImmutableString("textureGrad(0Z2B1B1B").mangledNameHash());
>+    ASSERT_EQ(0x16a1478fu, ImmutableString("textureGrad(0e3B1B1B").mangledNameHash());
>+    ASSERT_EQ(0x1ec5ab9du, ImmutableString("textureProjGrad(0H2B1B1B").mangledNameHash());
>+    ASSERT_EQ(0x1ec1a98bu, ImmutableString("textureProjGrad(0Q2B1B1B").mangledNameHash());
>+    ASSERT_EQ(0x1ec25826u, ImmutableString("textureProjGrad(0W2B1B1B").mangledNameHash());
>+    ASSERT_EQ(0x1ec323fdu, ImmutableString("textureProjGrad(0H3B1B1B").mangledNameHash());
>+    ASSERT_EQ(0x1ec5fc9fu, ImmutableString("textureProjGrad(0Q3B1B1B").mangledNameHash());
>+    ASSERT_EQ(0x1ec67b05u, ImmutableString("textureProjGrad(0W3B1B1B").mangledNameHash());
>+    ASSERT_EQ(0x1ec3ee61u, ImmutableString("textureProjGrad(0I3B2B2B").mangledNameHash());
>+    ASSERT_EQ(0x1ec578cfu, ImmutableString("textureProjGrad(0R3B2B2B").mangledNameHash());
>+    ASSERT_EQ(0x1ec2304bu, ImmutableString("textureProjGrad(0X3B2B2B").mangledNameHash());
>+    ASSERT_EQ(0x1ec719d1u, ImmutableString("textureProjGrad(0c3B1B1B").mangledNameHash());
>+    ASSERT_EQ(0x1673f496u, ImmutableString("textureSize(0O").mangledNameHash());
>+    ASSERT_EQ(0x167394d8u, ImmutableString("textureSize(0U").mangledNameHash());
>+    ASSERT_EQ(0x16752ab6u, ImmutableString("textureSize(0a").mangledNameHash());
>+    ASSERT_EQ(0x1673b4b7u, ImmutableString("textureSize(0P").mangledNameHash());
>+    ASSERT_EQ(0x1673a791u, ImmutableString("textureSize(0V").mangledNameHash());
>+    ASSERT_EQ(0x1675566fu, ImmutableString("textureSize(0b").mangledNameHash());
>+    ASSERT_EQ(0x1aa11785u, ImmutableString("textureOffset(0H1B1C").mangledNameHash());
>+    ASSERT_EQ(0x1aa01270u, ImmutableString("textureOffset(0Q1B1C").mangledNameHash());
>+    ASSERT_EQ(0x1aa541b7u, ImmutableString("textureOffset(0W1B1C").mangledNameHash());
>+    ASSERT_EQ(0x1aa64995u, ImmutableString("textureOffset(0I2B2C").mangledNameHash());
>+    ASSERT_EQ(0x1aa7a781u, ImmutableString("textureOffset(0R2B2C").mangledNameHash());
>+    ASSERT_EQ(0x1aa31637u, ImmutableString("textureOffset(0X2B2C").mangledNameHash());
>+    ASSERT_EQ(0x1aa05156u, ImmutableString("textureOffset(0c2B1C").mangledNameHash());
>+    ASSERT_EQ(0x1aa41f4au, ImmutableString("textureOffset(0K2B1C").mangledNameHash());
>+    ASSERT_EQ(0x1aa26095u, ImmutableString("textureOffset(0T2B1C").mangledNameHash());
>+    ASSERT_EQ(0x1aa385c2u, ImmutableString("textureOffset(0Z2B1C").mangledNameHash());
>+    ASSERT_EQ(0x22c0a359u, ImmutableString("textureProjOffset(0H2B1C").mangledNameHash());
>+    ASSERT_EQ(0x22c29005u, ImmutableString("textureProjOffset(0Q2B1C").mangledNameHash());
>+    ASSERT_EQ(0x22c03489u, ImmutableString("textureProjOffset(0W2B1C").mangledNameHash());
>+    ASSERT_EQ(0x22c2da46u, ImmutableString("textureProjOffset(0H3B1C").mangledNameHash());
>+    ASSERT_EQ(0x22c246a2u, ImmutableString("textureProjOffset(0Q3B1C").mangledNameHash());
>+    ASSERT_EQ(0x22c3e359u, ImmutableString("textureProjOffset(0W3B1C").mangledNameHash());
>+    ASSERT_EQ(0x22c458dcu, ImmutableString("textureProjOffset(0I3B2C").mangledNameHash());
>+    ASSERT_EQ(0x22c43880u, ImmutableString("textureProjOffset(0R3B2C").mangledNameHash());
>+    ASSERT_EQ(0x22c47909u, ImmutableString("textureProjOffset(0X3B2C").mangledNameHash());
>+    ASSERT_EQ(0x22c19992u, ImmutableString("textureProjOffset(0c3B1C").mangledNameHash());
>+    ASSERT_EQ(0x20cc9477u, ImmutableString("textureLodOffset(0H1B0B1C").mangledNameHash());
>+    ASSERT_EQ(0x20ccf3edu, ImmutableString("textureLodOffset(0Q1B0B1C").mangledNameHash());
>+    ASSERT_EQ(0x20cdc61au, ImmutableString("textureLodOffset(0W1B0B1C").mangledNameHash());
>+    ASSERT_EQ(0x20cde748u, ImmutableString("textureLodOffset(0I2B0B2C").mangledNameHash());
>+    ASSERT_EQ(0x20ceb3dau, ImmutableString("textureLodOffset(0R2B0B2C").mangledNameHash());
>+    ASSERT_EQ(0x20cde370u, ImmutableString("textureLodOffset(0X2B0B2C").mangledNameHash());
>+    ASSERT_EQ(0x20c9733bu, ImmutableString("textureLodOffset(0c2B0B1C").mangledNameHash());
>+    ASSERT_EQ(0x20cd0de3u, ImmutableString("textureLodOffset(0K2B0B1C").mangledNameHash());
>+    ASSERT_EQ(0x20cd8d8du, ImmutableString("textureLodOffset(0T2B0B1C").mangledNameHash());
>+    ASSERT_EQ(0x20ca4914u, ImmutableString("textureLodOffset(0Z2B0B1C").mangledNameHash());
>+    ASSERT_EQ(0x28eab462u, ImmutableString("textureProjLodOffset(0H2B0B1C").mangledNameHash());
>+    ASSERT_EQ(0x28ef956cu, ImmutableString("textureProjLodOffset(0Q2B0B1C").mangledNameHash());
>+    ASSERT_EQ(0x28e9a246u, ImmutableString("textureProjLodOffset(0W2B0B1C").mangledNameHash());
>+    ASSERT_EQ(0x28ebf99eu, ImmutableString("textureProjLodOffset(0H3B0B1C").mangledNameHash());
>+    ASSERT_EQ(0x28ec29a7u, ImmutableString("textureProjLodOffset(0Q3B0B1C").mangledNameHash());
>+    ASSERT_EQ(0x28e8b7d0u, ImmutableString("textureProjLodOffset(0W3B0B1C").mangledNameHash());
>+    ASSERT_EQ(0x28eb8605u, ImmutableString("textureProjLodOffset(0I3B0B2C").mangledNameHash());
>+    ASSERT_EQ(0x28e91d51u, ImmutableString("textureProjLodOffset(0R3B0B2C").mangledNameHash());
>+    ASSERT_EQ(0x28eecd92u, ImmutableString("textureProjLodOffset(0X3B0B2C").mangledNameHash());
>+    ASSERT_EQ(0x28efb13bu, ImmutableString("textureProjLodOffset(0c3B0B1C").mangledNameHash());
>+    ASSERT_EQ(0x20cb3102u, ImmutableString("texelFetchOffset(0H1C0C1C").mangledNameHash());
>+    ASSERT_EQ(0x20cc1a52u, ImmutableString("texelFetchOffset(0Q1C0C1C").mangledNameHash());
>+    ASSERT_EQ(0x20cbf8d9u, ImmutableString("texelFetchOffset(0W1C0C1C").mangledNameHash());
>+    ASSERT_EQ(0x20c8fa96u, ImmutableString("texelFetchOffset(0I2C0C2C").mangledNameHash());
>+    ASSERT_EQ(0x20cbfefau, ImmutableString("texelFetchOffset(0R2C0C2C").mangledNameHash());
>+    ASSERT_EQ(0x20c9a178u, ImmutableString("texelFetchOffset(0X2C0C2C").mangledNameHash());
>+    ASSERT_EQ(0x20cac068u, ImmutableString("texelFetchOffset(0K2C0C1C").mangledNameHash());
>+    ASSERT_EQ(0x20cfe609u, ImmutableString("texelFetchOffset(0T2C0C1C").mangledNameHash());
>+    ASSERT_EQ(0x20cb952du, ImmutableString("texelFetchOffset(0Z2C0C1C").mangledNameHash());
>+    ASSERT_EQ(0x22e71012u, ImmutableString("textureGradOffset(0H1B1B1B1C").mangledNameHash());
>+    ASSERT_EQ(0x22e5c876u, ImmutableString("textureGradOffset(0Q1B1B1B1C").mangledNameHash());
>+    ASSERT_EQ(0x22e0fe8cu, ImmutableString("textureGradOffset(0W1B1B1B1C").mangledNameHash());
>+    ASSERT_EQ(0x22e3e9eau, ImmutableString("textureGradOffset(0I2B2B2B2C").mangledNameHash());
>+    ASSERT_EQ(0x22e5bb38u, ImmutableString("textureGradOffset(0R2B2B2B2C").mangledNameHash());
>+    ASSERT_EQ(0x22e61729u, ImmutableString("textureGradOffset(0X2B2B2B2C").mangledNameHash());
>+    ASSERT_EQ(0x22e7429eu, ImmutableString("textureGradOffset(0c2B1B1B1C").mangledNameHash());
>+    ASSERT_EQ(0x22e165b8u, ImmutableString("textureGradOffset(0K2B1B1B1C").mangledNameHash());
>+    ASSERT_EQ(0x22e28d80u, ImmutableString("textureGradOffset(0T2B1B1B1C").mangledNameHash());
>+    ASSERT_EQ(0x22e68293u, ImmutableString("textureGradOffset(0Z2B1B1B1C").mangledNameHash());
>+    ASSERT_EQ(0x22e3ab1cu, ImmutableString("textureGradOffset(0e3B1B1B1C").mangledNameHash());
>+    ASSERT_EQ(0x2b077535u, ImmutableString("textureProjGradOffset(0H2B1B1B1C").mangledNameHash());
>+    ASSERT_EQ(0x2b03ccf9u, ImmutableString("textureProjGradOffset(0Q2B1B1B1C").mangledNameHash());
>+    ASSERT_EQ(0x2b03db51u, ImmutableString("textureProjGradOffset(0W2B1B1B1C").mangledNameHash());
>+    ASSERT_EQ(0x2b022418u, ImmutableString("textureProjGradOffset(0H3B1B1B1C").mangledNameHash());
>+    ASSERT_EQ(0x2b06f874u, ImmutableString("textureProjGradOffset(0Q3B1B1B1C").mangledNameHash());
>+    ASSERT_EQ(0x2b07f768u, ImmutableString("textureProjGradOffset(0W3B1B1B1C").mangledNameHash());
>+    ASSERT_EQ(0x2b02af8fu, ImmutableString("textureProjGradOffset(0I3B2B2B2C").mangledNameHash());
>+    ASSERT_EQ(0x2b047dfau, ImmutableString("textureProjGradOffset(0R3B2B2B2C").mangledNameHash());
>+    ASSERT_EQ(0x2b0252ccu, ImmutableString("textureProjGradOffset(0X3B2B2B2C").mangledNameHash());
>+    ASSERT_EQ(0x2b00aacdu, ImmutableString("textureProjGradOffset(0c3B1B1B1C").mangledNameHash());
>+    ASSERT_EQ(0x1ab57bbcu, ImmutableString("textureOffset(0H1B1C0B").mangledNameHash());
>+    ASSERT_EQ(0x1ab55c9du, ImmutableString("textureOffset(0Q1B1C0B").mangledNameHash());
>+    ASSERT_EQ(0x1ab5d795u, ImmutableString("textureOffset(0W1B1C0B").mangledNameHash());
>+    ASSERT_EQ(0x1ab59b6cu, ImmutableString("textureOffset(0I2B2C0B").mangledNameHash());
>+    ASSERT_EQ(0x1ab63f72u, ImmutableString("textureOffset(0R2B2C0B").mangledNameHash());
>+    ASSERT_EQ(0x1ab0a952u, ImmutableString("textureOffset(0X2B2C0B").mangledNameHash());
>+    ASSERT_EQ(0x1ab7e533u, ImmutableString("textureOffset(0c2B1C0B").mangledNameHash());
>+    ASSERT_EQ(0x1ab63ddau, ImmutableString("textureOffset(0K2B1C0B").mangledNameHash());
>+    ASSERT_EQ(0x1ab5753fu, ImmutableString("textureOffset(0T2B1C0B").mangledNameHash());
>+    ASSERT_EQ(0x1ab29724u, ImmutableString("textureOffset(0Z2B1C0B").mangledNameHash());
>+    ASSERT_EQ(0x22d6ee53u, ImmutableString("textureProjOffset(0H2B1C0B").mangledNameHash());
>+    ASSERT_EQ(0x22d60e91u, ImmutableString("textureProjOffset(0Q2B1C0B").mangledNameHash());
>+    ASSERT_EQ(0x22d1425bu, ImmutableString("textureProjOffset(0W2B1C0B").mangledNameHash());
>+    ASSERT_EQ(0x22d62e81u, ImmutableString("textureProjOffset(0H3B1C0B").mangledNameHash());
>+    ASSERT_EQ(0x22d11d67u, ImmutableString("textureProjOffset(0Q3B1C0B").mangledNameHash());
>+    ASSERT_EQ(0x22d17100u, ImmutableString("textureProjOffset(0W3B1C0B").mangledNameHash());
>+    ASSERT_EQ(0x22d6b2e8u, ImmutableString("textureProjOffset(0I3B2C0B").mangledNameHash());
>+    ASSERT_EQ(0x22d6074cu, ImmutableString("textureProjOffset(0R3B2C0B").mangledNameHash());
>+    ASSERT_EQ(0x22d60cd3u, ImmutableString("textureProjOffset(0X3B2C0B").mangledNameHash());
>+    ASSERT_EQ(0x22d1ca54u, ImmutableString("textureProjOffset(0c3B1C0B").mangledNameHash());
>+    ASSERT_EQ(0x0e661665u, ImmutableString("texture(0L1B").mangledNameHash());
>+    ASSERT_EQ(0x16838d15u, ImmutableString("textureProj(0L2B").mangledNameHash());
>+    ASSERT_EQ(0x16865716u, ImmutableString("textureProj(0L3B").mangledNameHash());
>+    ASSERT_EQ(0x16845c90u, ImmutableString("textureSize(0L0C").mangledNameHash());
>+    ASSERT_EQ(0x148eff58u, ImmutableString("texelFetch(0L1C0C").mangledNameHash());
>+    ASSERT_EQ(0x0e63b9efu, ImmutableString("texture(0M1B").mangledNameHash());
>+    ASSERT_EQ(0x1682d0c8u, ImmutableString("textureProj(0M2B").mangledNameHash());
>+    ASSERT_EQ(0x1683ecb1u, ImmutableString("textureProj(0M3B").mangledNameHash());
>+    ASSERT_EQ(0x127589a7u, ImmutableString("rgb_2_yuv(2B0G").mangledNameHash());
>+    ASSERT_EQ(0x1273f9dbu, ImmutableString("yuv_2_rgb(2B0G").mangledNameHash());
>+    ASSERT_EQ(0x168046b0u, ImmutableString("textureSize(0M0C").mangledNameHash());
>+    ASSERT_EQ(0x148a14a7u, ImmutableString("texelFetch(0M1C0C").mangledNameHash());
>+    ASSERT_EQ(0x0e76e7c1u, ImmutableString("texture(0H1B0B").mangledNameHash());
>+    ASSERT_EQ(0x0e7386b0u, ImmutableString("texture(0Q1B0B").mangledNameHash());
>+    ASSERT_EQ(0x0e70d11du, ImmutableString("texture(0W1B0B").mangledNameHash());
>+    ASSERT_EQ(0x0e77d1c8u, ImmutableString("texture(0I2B0B").mangledNameHash());
>+    ASSERT_EQ(0x0e7720c0u, ImmutableString("texture(0R2B0B").mangledNameHash());
>+    ASSERT_EQ(0x0e70eff9u, ImmutableString("texture(0X2B0B").mangledNameHash());
>+    ASSERT_EQ(0x0e75d15fu, ImmutableString("texture(0J2B0B").mangledNameHash());
>+    ASSERT_EQ(0x0e75399eu, ImmutableString("texture(0S2B0B").mangledNameHash());
>+    ASSERT_EQ(0x0e755c73u, ImmutableString("texture(0Y2B0B").mangledNameHash());
>+    ASSERT_EQ(0x0e742a66u, ImmutableString("texture(0K2B0B").mangledNameHash());
>+    ASSERT_EQ(0x0e7013d9u, ImmutableString("texture(0T2B0B").mangledNameHash());
>+    ASSERT_EQ(0x0e734ff8u, ImmutableString("texture(0Z2B0B").mangledNameHash());
>+    ASSERT_EQ(0x1696f029u, ImmutableString("textureProj(0H2B0B").mangledNameHash());
>+    ASSERT_EQ(0x16939955u, ImmutableString("textureProj(0Q2B0B").mangledNameHash());
>+    ASSERT_EQ(0x169465e2u, ImmutableString("textureProj(0W2B0B").mangledNameHash());
>+    ASSERT_EQ(0x16965fd9u, ImmutableString("textureProj(0H3B0B").mangledNameHash());
>+    ASSERT_EQ(0x16925badu, ImmutableString("textureProj(0Q3B0B").mangledNameHash());
>+    ASSERT_EQ(0x1690a3cfu, ImmutableString("textureProj(0W3B0B").mangledNameHash());
>+    ASSERT_EQ(0x169350d8u, ImmutableString("textureProj(0I3B0B").mangledNameHash());
>+    ASSERT_EQ(0x1694622au, ImmutableString("textureProj(0R3B0B").mangledNameHash());
>+    ASSERT_EQ(0x1695f573u, ImmutableString("textureProj(0X3B0B").mangledNameHash());
>+    ASSERT_EQ(0x0e716d8fu, ImmutableString("texture(0c2B0B").mangledNameHash());
>+    ASSERT_EQ(0x0e740087u, ImmutableString("texture(0d3B0B").mangledNameHash());
>+    ASSERT_EQ(0x1692d089u, ImmutableString("textureProj(0c3B0B").mangledNameHash());
>+    ASSERT_EQ(0x0e723219u, ImmutableString("texture(0L1B0B").mangledNameHash());
>+    ASSERT_EQ(0x1697e9b9u, ImmutableString("textureProj(0L2B0B").mangledNameHash());
>+    ASSERT_EQ(0x16900558u, ImmutableString("textureProj(0L3B0B").mangledNameHash());
>+    ASSERT_EQ(0x0e71856cu, ImmutableString("texture(0M1B0B").mangledNameHash());
>+    ASSERT_EQ(0x1691c2edu, ImmutableString("textureProj(0M2B0B").mangledNameHash());
>+    ASSERT_EQ(0x1690ae9fu, ImmutableString("textureProj(0M3B0B").mangledNameHash());
>+    ASSERT_EQ(0x14896e41u, ImmutableString("texelFetch(0O1C0C").mangledNameHash());
>+    ASSERT_EQ(0x148ed16fu, ImmutableString("texelFetch(0U1C0C").mangledNameHash());
>+    ASSERT_EQ(0x148ddb10u, ImmutableString("texelFetch(0a1C0C").mangledNameHash());
>+    ASSERT_EQ(0x148e872bu, ImmutableString("texelFetch(0P2C0C").mangledNameHash());
>+    ASSERT_EQ(0x14880e11u, ImmutableString("texelFetch(0V2C0C").mangledNameHash());
>+    ASSERT_EQ(0x1489244fu, ImmutableString("texelFetch(0b2C0C").mangledNameHash());
>+    ASSERT_EQ(0x1a92a1ceu, ImmutableString("textureGather(0H1B").mangledNameHash());
>+    ASSERT_EQ(0x1a92c882u, ImmutableString("textureGather(0Q1B").mangledNameHash());
>+    ASSERT_EQ(0x1a92a168u, ImmutableString("textureGather(0W1B").mangledNameHash());
>+    ASSERT_EQ(0x1aa4c59du, ImmutableString("textureGather(0H1B0C").mangledNameHash());
>+    ASSERT_EQ(0x1aa133bcu, ImmutableString("textureGather(0Q1B0C").mangledNameHash());
>+    ASSERT_EQ(0x1aa220b0u, ImmutableString("textureGather(0W1B0C").mangledNameHash());
>+    ASSERT_EQ(0x1a94543du, ImmutableString("textureGather(0K2B").mangledNameHash());
>+    ASSERT_EQ(0x1a95f707u, ImmutableString("textureGather(0T2B").mangledNameHash());
>+    ASSERT_EQ(0x1a94eb48u, ImmutableString("textureGather(0Z2B").mangledNameHash());
>+    ASSERT_EQ(0x1aa78b86u, ImmutableString("textureGather(0K2B0C").mangledNameHash());
>+    ASSERT_EQ(0x1aa2aafeu, ImmutableString("textureGather(0T2B0C").mangledNameHash());
>+    ASSERT_EQ(0x1aa17115u, ImmutableString("textureGather(0Z2B0C").mangledNameHash());
>+    ASSERT_EQ(0x1a979ae3u, ImmutableString("textureGather(0J2B").mangledNameHash());
>+    ASSERT_EQ(0x1a9418e8u, ImmutableString("textureGather(0S2B").mangledNameHash());
>+    ASSERT_EQ(0x1a910beau, ImmutableString("textureGather(0Y2B").mangledNameHash());
>+    ASSERT_EQ(0x1aa4986bu, ImmutableString("textureGather(0J2B0C").mangledNameHash());
>+    ASSERT_EQ(0x1aa3ef46u, ImmutableString("textureGather(0S2B0C").mangledNameHash());
>+    ASSERT_EQ(0x1aa7fa48u, ImmutableString("textureGather(0Y2B0C").mangledNameHash());
>+    ASSERT_EQ(0x1a926b0du, ImmutableString("textureGather(0c1B").mangledNameHash());
>+    ASSERT_EQ(0x1aa182eeu, ImmutableString("textureGather(0c1B0B").mangledNameHash());
>+    ASSERT_EQ(0x1a94d27du, ImmutableString("textureGather(0e2B").mangledNameHash());
>+    ASSERT_EQ(0x1aa039c7u, ImmutableString("textureGather(0e2B0B").mangledNameHash());
>+    ASSERT_EQ(0x1a91963cu, ImmutableString("textureGather(0d2B").mangledNameHash());
>+    ASSERT_EQ(0x1aa353f8u, ImmutableString("textureGather(0d2B0B").mangledNameHash());
>+    ASSERT_EQ(0x26d71952u, ImmutableString("textureGatherOffset(0H1B1C").mangledNameHash());
>+    ASSERT_EQ(0x26d0b451u, ImmutableString("textureGatherOffset(0Q1B1C").mangledNameHash());
>+    ASSERT_EQ(0x26d00e91u, ImmutableString("textureGatherOffset(0W1B1C").mangledNameHash());
>+    ASSERT_EQ(0x26e476d0u, ImmutableString("textureGatherOffset(0H1B1C0C").mangledNameHash());
>+    ASSERT_EQ(0x26e567feu, ImmutableString("textureGatherOffset(0Q1B1C0C").mangledNameHash());
>+    ASSERT_EQ(0x26e737a0u, ImmutableString("textureGatherOffset(0W1B1C0C").mangledNameHash());
>+    ASSERT_EQ(0x26d1f440u, ImmutableString("textureGatherOffset(0K2B1C").mangledNameHash());
>+    ASSERT_EQ(0x26d2d875u, ImmutableString("textureGatherOffset(0T2B1C").mangledNameHash());
>+    ASSERT_EQ(0x26d0db41u, ImmutableString("textureGatherOffset(0Z2B1C").mangledNameHash());
>+    ASSERT_EQ(0x26e459f8u, ImmutableString("textureGatherOffset(0K2B1C0C").mangledNameHash());
>+    ASSERT_EQ(0x26e1982cu, ImmutableString("textureGatherOffset(0T2B1C0C").mangledNameHash());
>+    ASSERT_EQ(0x26e47c82u, ImmutableString("textureGatherOffset(0Z2B1C0C").mangledNameHash());
>+    ASSERT_EQ(0x26e580eau, ImmutableString("textureGatherOffset(0c1B0B1C").mangledNameHash());
>+    ASSERT_EQ(0x26e53ca1u, ImmutableString("textureGatherOffset(0e2B0B1C").mangledNameHash());
>+    ASSERT_EQ(0x1a805162u, ImmutableString("atomicCounter(0F").mangledNameHash());
>+    ASSERT_EQ(0x2ccf8f34u, ImmutableString("atomicCounterIncrement(0F").mangledNameHash());
>+    ASSERT_EQ(0x2ccfbbbeu, ImmutableString("atomicCounterDecrement(0F").mangledNameHash());
>+    ASSERT_EQ(0x127258f0u, ImmutableString("atomicAdd(0D0D").mangledNameHash());
>+    ASSERT_EQ(0x1270b3f8u, ImmutableString("atomicAdd(0C0C").mangledNameHash());
>+    ASSERT_EQ(0x1273e62au, ImmutableString("atomicMin(0D0D").mangledNameHash());
>+    ASSERT_EQ(0x12717c89u, ImmutableString("atomicMin(0C0C").mangledNameHash());
>+    ASSERT_EQ(0x1273d1adu, ImmutableString("atomicMax(0D0D").mangledNameHash());
>+    ASSERT_EQ(0x1277882au, ImmutableString("atomicMax(0C0C").mangledNameHash());
>+    ASSERT_EQ(0x127648cau, ImmutableString("atomicAnd(0D0D").mangledNameHash());
>+    ASSERT_EQ(0x127478d9u, ImmutableString("atomicAnd(0C0C").mangledNameHash());
>+    ASSERT_EQ(0x106a2daeu, ImmutableString("atomicOr(0D0D").mangledNameHash());
>+    ASSERT_EQ(0x106bd5b6u, ImmutableString("atomicOr(0C0C").mangledNameHash());
>+    ASSERT_EQ(0x12771119u, ImmutableString("atomicXor(0D0D").mangledNameHash());
>+    ASSERT_EQ(0x1270b766u, ImmutableString("atomicXor(0C0C").mangledNameHash());
>+    ASSERT_EQ(0x1c9986beu, ImmutableString("atomicExchange(0D0D").mangledNameHash());
>+    ASSERT_EQ(0x1c9b5eecu, ImmutableString("atomicExchange(0C0C").mangledNameHash());
>+    ASSERT_EQ(0x1caa900cu, ImmutableString("atomicCompSwap(0D0D0D").mangledNameHash());
>+    ASSERT_EQ(0x1ca86085u, ImmutableString("atomicCompSwap(0C0C0C").mangledNameHash());
>+    ASSERT_EQ(0x1265cc8du, ImmutableString("imageSize(0f").mangledNameHash());
>+    ASSERT_EQ(0x1265b53eu, ImmutableString("imageSize(0g").mangledNameHash());
>+    ASSERT_EQ(0x1265e603u, ImmutableString("imageSize(0h").mangledNameHash());
>+    ASSERT_EQ(0x1265fcacu, ImmutableString("imageSize(0i").mangledNameHash());
>+    ASSERT_EQ(0x1265f559u, ImmutableString("imageSize(0j").mangledNameHash());
>+    ASSERT_EQ(0x1265cbcau, ImmutableString("imageSize(0k").mangledNameHash());
>+    ASSERT_EQ(0x12660ccfu, ImmutableString("imageSize(0l").mangledNameHash());
>+    ASSERT_EQ(0x12661578u, ImmutableString("imageSize(0m").mangledNameHash());
>+    ASSERT_EQ(0x12661be5u, ImmutableString("imageSize(0n").mangledNameHash());
>+    ASSERT_EQ(0x1265e196u, ImmutableString("imageSize(0o").mangledNameHash());
>+    ASSERT_EQ(0x126520f8u, ImmutableString("imageSize(0p").mangledNameHash());
>+    ASSERT_EQ(0x12653967u, ImmutableString("imageSize(0q").mangledNameHash());
>+    ASSERT_EQ(0x12739c87u, ImmutableString("imageLoad(0f1C").mangledNameHash());
>+    ASSERT_EQ(0x12755603u, ImmutableString("imageLoad(0g1C").mangledNameHash());
>+    ASSERT_EQ(0x12700109u, ImmutableString("imageLoad(0h1C").mangledNameHash());
>+    ASSERT_EQ(0x127539b2u, ImmutableString("imageLoad(0i2C").mangledNameHash());
>+    ASSERT_EQ(0x12715f47u, ImmutableString("imageLoad(0j2C").mangledNameHash());
>+    ASSERT_EQ(0x127474cau, ImmutableString("imageLoad(0k2C").mangledNameHash());
>+    ASSERT_EQ(0x1276656cu, ImmutableString("imageLoad(0l2C").mangledNameHash());
>+    ASSERT_EQ(0x12731984u, ImmutableString("imageLoad(0m2C").mangledNameHash());
>+    ASSERT_EQ(0x12712664u, ImmutableString("imageLoad(0n2C").mangledNameHash());
>+    ASSERT_EQ(0x12744c0du, ImmutableString("imageLoad(0o2C").mangledNameHash());
>+    ASSERT_EQ(0x1274d54bu, ImmutableString("imageLoad(0p2C").mangledNameHash());
>+    ASSERT_EQ(0x12737ed6u, ImmutableString("imageLoad(0q2C").mangledNameHash());
>+    ASSERT_EQ(0x148d86dcu, ImmutableString("imageStore(0f1C3B").mangledNameHash());
>+    ASSERT_EQ(0x148bb1bdu, ImmutableString("imageStore(0g1C3C").mangledNameHash());
>+    ASSERT_EQ(0x148ffee8u, ImmutableString("imageStore(0h1C3D").mangledNameHash());
>+    ASSERT_EQ(0x148fd5f1u, ImmutableString("imageStore(0i2C3B").mangledNameHash());
>+    ASSERT_EQ(0x148e668au, ImmutableString("imageStore(0j2C3C").mangledNameHash());
>+    ASSERT_EQ(0x1488078cu, ImmutableString("imageStore(0k2C3D").mangledNameHash());
>+    ASSERT_EQ(0x148dcfd5u, ImmutableString("imageStore(0l2C3B").mangledNameHash());
>+    ASSERT_EQ(0x148e37b8u, ImmutableString("imageStore(0m2C3C").mangledNameHash());
>+    ASSERT_EQ(0x148ed534u, ImmutableString("imageStore(0n2C3D").mangledNameHash());
>+    ASSERT_EQ(0x148f7a82u, ImmutableString("imageStore(0o2C3B").mangledNameHash());
>+    ASSERT_EQ(0x148a0cecu, ImmutableString("imageStore(0p2C3C").mangledNameHash());
>+    ASSERT_EQ(0x148c1e41u, ImmutableString("imageStore(0q2C3D").mangledNameHash());
>+    ASSERT_EQ(0x1a7538dfu, ImmutableString("memoryBarrier(").mangledNameHash());
>+    ASSERT_EQ(0x34ded18du, ImmutableString("memoryBarrierAtomicCounter(").mangledNameHash());
>+    ASSERT_EQ(0x26a7e24bu, ImmutableString("memoryBarrierBuffer(").mangledNameHash());
>+    ASSERT_EQ(0x249e7359u, ImmutableString("memoryBarrierImage(").mangledNameHash());
>+    ASSERT_EQ(0x0e41a660u, ImmutableString("barrier(").mangledNameHash());
>+    ASSERT_EQ(0x26a4d8e6u, ImmutableString("memoryBarrierShared(").mangledNameHash());
>+    ASSERT_EQ(0x249ee97cu, ImmutableString("groupMemoryBarrier(").mangledNameHash());
>+    ASSERT_EQ(0x145d55c9u, ImmutableString("EmitVertex(").mangledNameHash());
>+    ASSERT_EQ(0x186fcde2u, ImmutableString("EndPrimitive(").mangledNameHash());
>+    ASSERT_EQ(0x7e2d0692u, ImmutableString("frexp").mangledNameHash());
>+    ASSERT_EQ(0x7e2c727fu, ImmutableString("ldexp").mangledNameHash());
>+    ASSERT_EQ(0x7e657e29u, ImmutableString("packUnorm4x8").mangledNameHash());
>+    ASSERT_EQ(0x7e6273e5u, ImmutableString("packSnorm4x8").mangledNameHash());
>+    ASSERT_EQ(0x7e71963eu, ImmutableString("unpackUnorm4x8").mangledNameHash());
>+    ASSERT_EQ(0x7e73f1d1u, ImmutableString("unpackSnorm4x8").mangledNameHash());
>+    ASSERT_EQ(0x7e7fa0c1u, ImmutableString("bitfieldExtract").mangledNameHash());
>+    ASSERT_EQ(0x7e77c121u, ImmutableString("bitfieldInsert").mangledNameHash());
>+    ASSERT_EQ(0x7e7f2cb2u, ImmutableString("bitfieldReverse").mangledNameHash());
>+    ASSERT_EQ(0x7e41283bu, ImmutableString("bitCount").mangledNameHash());
>+    ASSERT_EQ(0x7e399596u, ImmutableString("findLSB").mangledNameHash());
>+    ASSERT_EQ(0x7e3bdf3fu, ImmutableString("findMSB").mangledNameHash());
>+    ASSERT_EQ(0x7e4e5094u, ImmutableString("uaddCarry").mangledNameHash());
>+    ASSERT_EQ(0x7e55de86u, ImmutableString("usubBorrow").mangledNameHash());
>+    ASSERT_EQ(0x7e6746f4u, ImmutableString("umulExtended").mangledNameHash());
>+    ASSERT_EQ(0x7e62a9a0u, ImmutableString("imulExtended").mangledNameHash());
>+    ASSERT_EQ(0x7e5e217eu, ImmutableString("textureSize").mangledNameHash());
>+    ASSERT_EQ(0x7e5237e1u, ImmutableString("texelFetch").mangledNameHash());
>+    ASSERT_EQ(0x7e6d0f32u, ImmutableString("textureGather").mangledNameHash());
>+    ASSERT_EQ(0x7e9d8ad9u, ImmutableString("textureGatherOffset").mangledNameHash());
>+    ASSERT_EQ(0x7e6e00a5u, ImmutableString("atomicCounter").mangledNameHash());
>+    ASSERT_EQ(0x7eb323ddu, ImmutableString("atomicCounterIncrement").mangledNameHash());
>+    ASSERT_EQ(0x7eb6aed0u, ImmutableString("atomicCounterDecrement").mangledNameHash());
>+    ASSERT_EQ(0x7e4800e3u, ImmutableString("atomicAdd").mangledNameHash());
>+    ASSERT_EQ(0x7e49061fu, ImmutableString("atomicMin").mangledNameHash());
>+    ASSERT_EQ(0x7e4893a8u, ImmutableString("atomicMax").mangledNameHash());
>+    ASSERT_EQ(0x7e4f21aeu, ImmutableString("atomicAnd").mangledNameHash());
>+    ASSERT_EQ(0x7e4690b3u, ImmutableString("atomicOr").mangledNameHash());
>+    ASSERT_EQ(0x7e4dea77u, ImmutableString("atomicXor").mangledNameHash());
>+    ASSERT_EQ(0x7e75cfb1u, ImmutableString("atomicExchange").mangledNameHash());
>+    ASSERT_EQ(0x7e778ffcu, ImmutableString("atomicCompSwap").mangledNameHash());
>+    ASSERT_EQ(0x7e4b6656u, ImmutableString("imageSize").mangledNameHash());
>+    ASSERT_EQ(0x7e4a45b6u, ImmutableString("imageLoad").mangledNameHash());
>+    ASSERT_EQ(0x7e5276efu, ImmutableString("imageStore").mangledNameHash());
>+    ASSERT_EQ(0x7e69d0dbu, ImmutableString("memoryBarrier").mangledNameHash());
>+    ASSERT_EQ(0x7ed5b06bu, ImmutableString("memoryBarrierAtomicCounter").mangledNameHash());
>+    ASSERT_EQ(0x7e9b7f32u, ImmutableString("memoryBarrierBuffer").mangledNameHash());
>+    ASSERT_EQ(0x7e9269d7u, ImmutableString("memoryBarrierImage").mangledNameHash());
>+    ASSERT_EQ(0x7e39f4e9u, ImmutableString("barrier").mangledNameHash());
>+    ASSERT_EQ(0x7e9f4b19u, ImmutableString("memoryBarrierShared").mangledNameHash());
>+    ASSERT_EQ(0x7e93c6b9u, ImmutableString("groupMemoryBarrier").mangledNameHash());
>+    ASSERT_EQ(0x7e55adc2u, ImmutableString("EmitVertex").mangledNameHash());
>+    ASSERT_EQ(0x7e65b2cau, ImmutableString("EndPrimitive").mangledNameHash());
>+    ASSERT_EQ(0x7e209eadu, ImmutableString("sinh").mangledNameHash());
>+    ASSERT_EQ(0x7e27a4feu, ImmutableString("cosh").mangledNameHash());
>+    ASSERT_EQ(0x7e205c92u, ImmutableString("tanh").mangledNameHash());
>+    ASSERT_EQ(0x7e2dcbc6u, ImmutableString("asinh").mangledNameHash());
>+    ASSERT_EQ(0x7e2f67c3u, ImmutableString("acosh").mangledNameHash());
>+    ASSERT_EQ(0x7e28294fu, ImmutableString("atanh").mangledNameHash());
>+    ASSERT_EQ(0x7e19507bu, ImmutableString("abs").mangledNameHash());
>+    ASSERT_EQ(0x7e206e40u, ImmutableString("sign").mangledNameHash());
>+    ASSERT_EQ(0x7e2eab16u, ImmutableString("trunc").mangledNameHash());
>+    ASSERT_EQ(0x7e2a7a64u, ImmutableString("round").mangledNameHash());
>+    ASSERT_EQ(0x7e4d323bu, ImmutableString("roundEven").mangledNameHash());
>+    ASSERT_EQ(0x7e1e492du, ImmutableString("min").mangledNameHash());
>+    ASSERT_EQ(0x7e1ebe0eu, ImmutableString("max").mangledNameHash());
>+    ASSERT_EQ(0x7e2d5dcbu, ImmutableString("clamp").mangledNameHash());
>+    ASSERT_EQ(0x7e1ea71bu, ImmutableString("mix").mangledNameHash());
>+    ASSERT_EQ(0x7e274509u, ImmutableString("modf").mangledNameHash());
>+    ASSERT_EQ(0x7e2d8df4u, ImmutableString("isnan").mangledNameHash());
>+    ASSERT_EQ(0x7e2924b8u, ImmutableString("isinf").mangledNameHash());
>+    ASSERT_EQ(0x7e759618u, ImmutableString("floatBitsToInt").mangledNameHash());
>+    ASSERT_EQ(0x7e7e5132u, ImmutableString("floatBitsToUint").mangledNameHash());
>+    ASSERT_EQ(0x7e77fc97u, ImmutableString("intBitsToFloat").mangledNameHash());
>+    ASSERT_EQ(0x7e7e0e81u, ImmutableString("uintBitsToFloat").mangledNameHash());
>+    ASSERT_EQ(0x7e6a013du, ImmutableString("packSnorm2x16").mangledNameHash());
>+    ASSERT_EQ(0x7e6b72b8u, ImmutableString("packUnorm2x16").mangledNameHash());
>+    ASSERT_EQ(0x7e62daa3u, ImmutableString("packHalf2x16").mangledNameHash());
>+    ASSERT_EQ(0x7e7b6a0eu, ImmutableString("unpackSnorm2x16").mangledNameHash());
>+    ASSERT_EQ(0x7e792d39u, ImmutableString("unpackUnorm2x16").mangledNameHash());
>+    ASSERT_EQ(0x7e715db5u, ImmutableString("unpackHalf2x16").mangledNameHash());
>+    ASSERT_EQ(0x7e76bea7u, ImmutableString("matrixCompMult").mangledNameHash());
>+    ASSERT_EQ(0x7e646b9bu, ImmutableString("outerProduct").mangledNameHash());
>+    ASSERT_EQ(0x7e4e024cu, ImmutableString("transpose").mangledNameHash());
>+    ASSERT_EQ(0x7e5ba531u, ImmutableString("determinant").mangledNameHash());
>+    ASSERT_EQ(0x7e3d828cu, ImmutableString("inverse").mangledNameHash());
>+    ASSERT_EQ(0x7e403a20u, ImmutableString("lessThan").mangledNameHash());
>+    ASSERT_EQ(0x7e683586u, ImmutableString("lessThanEqual").mangledNameHash());
>+    ASSERT_EQ(0x7e582ffcu, ImmutableString("greaterThan").mangledNameHash());
>+    ASSERT_EQ(0x7e876cccu, ImmutableString("greaterThanEqual").mangledNameHash());
>+    ASSERT_EQ(0x7e297347u, ImmutableString("equal").mangledNameHash());
>+    ASSERT_EQ(0x7e413f93u, ImmutableString("notEqual").mangledNameHash());
>+    ASSERT_EQ(0x7e39ebd7u, ImmutableString("texture").mangledNameHash());
>+    ASSERT_EQ(0x7e5caafbu, ImmutableString("textureProj").mangledNameHash());
>+    ASSERT_EQ(0x7e501e0cu, ImmutableString("textureLod").mangledNameHash());
>+    ASSERT_EQ(0x7e75ae2fu, ImmutableString("textureProjLod").mangledNameHash());
>+    ASSERT_EQ(0x7e599347u, ImmutableString("textureGrad").mangledNameHash());
>+    ASSERT_EQ(0x7e7bc1fdu, ImmutableString("textureProjGrad").mangledNameHash());
>+    ASSERT_EQ(0x7e6c5187u, ImmutableString("textureOffset").mangledNameHash());
>+    ASSERT_EQ(0x7e8d2d2du, ImmutableString("textureProjOffset").mangledNameHash());
>+    ASSERT_EQ(0x7e81c71au, ImmutableString("textureLodOffset").mangledNameHash());
>+    ASSERT_EQ(0x7ea0be08u, ImmutableString("textureProjLodOffset").mangledNameHash());
>+    ASSERT_EQ(0x7e80919du, ImmutableString("texelFetchOffset").mangledNameHash());
>+    ASSERT_EQ(0x7e8b5832u, ImmutableString("textureGradOffset").mangledNameHash());
>+    ASSERT_EQ(0x7eac5717u, ImmutableString("textureProjGradOffset").mangledNameHash());
>+    ASSERT_EQ(0x7e4d27c2u, ImmutableString("rgb_2_yuv").mangledNameHash());
>+    ASSERT_EQ(0x7e4e33aeu, ImmutableString("yuv_2_rgb").mangledNameHash());
>+    ASSERT_EQ(0x7e265ea7u, ImmutableString("dFdx").mangledNameHash());
>+    ASSERT_EQ(0x7e2624d4u, ImmutableString("dFdy").mangledNameHash());
>+    ASSERT_EQ(0x7e324ea1u, ImmutableString("fwidth").mangledNameHash());
>+    ASSERT_EQ(0x7e48c50cu, ImmutableString("texture2D").mangledNameHash());
>+    ASSERT_EQ(0x7e6e3735u, ImmutableString("texture2DProj").mangledNameHash());
>+    ASSERT_EQ(0x7e5ffc48u, ImmutableString("textureCube").mangledNameHash());
>+    ASSERT_EQ(0x7e69f545u, ImmutableString("texture2DRect").mangledNameHash());
>+    ASSERT_EQ(0x7e8b66e4u, ImmutableString("texture2DRectProj").mangledNameHash());
>+    ASSERT_EQ(0x7e868a22u, ImmutableString("texture2DGradEXT").mangledNameHash());
>+    ASSERT_EQ(0x7ea20b8fu, ImmutableString("texture2DProjGradEXT").mangledNameHash());
>+    ASSERT_EQ(0x7e90fa5bu, ImmutableString("textureCubeGradEXT").mangledNameHash());
>+    ASSERT_EQ(0x7e7b843eu, ImmutableString("texture2DLodEXT").mangledNameHash());
>+    ASSERT_EQ(0x7e9ddba0u, ImmutableString("texture2DProjLodEXT").mangledNameHash());
>+    ASSERT_EQ(0x7e8b81cau, ImmutableString("textureCubeLodEXT").mangledNameHash());
>+    ASSERT_EQ(0x7e67c7ceu, ImmutableString("texture2DLod").mangledNameHash());
>+    ASSERT_EQ(0x7e819b90u, ImmutableString("texture2DProjLod").mangledNameHash());
>+    ASSERT_EQ(0x7e758eddu, ImmutableString("textureCubeLod").mangledNameHash());
>+    ASSERT_EQ(0x7e3c3cb3u, ImmutableString("radians").mangledNameHash());
>+    ASSERT_EQ(0x7e3d784cu, ImmutableString("degrees").mangledNameHash());
>+    ASSERT_EQ(0x7e1f0bccu, ImmutableString("sin").mangledNameHash());
>+    ASSERT_EQ(0x7e1fdef3u, ImmutableString("cos").mangledNameHash());
>+    ASSERT_EQ(0x7e1cf321u, ImmutableString("tan").mangledNameHash());
>+    ASSERT_EQ(0x7e27ebd5u, ImmutableString("asin").mangledNameHash());
>+    ASSERT_EQ(0x7e21ff11u, ImmutableString("acos").mangledNameHash());
>+    ASSERT_EQ(0x7e203979u, ImmutableString("atan").mangledNameHash());
>+    ASSERT_EQ(0x7e1acb4eu, ImmutableString("pow").mangledNameHash());
>+    ASSERT_EQ(0x7e1b921cu, ImmutableString("exp").mangledNameHash());
>+    ASSERT_EQ(0x7e19ebdbu, ImmutableString("log").mangledNameHash());
>+    ASSERT_EQ(0x7e24bcdbu, ImmutableString("exp2").mangledNameHash());
>+    ASSERT_EQ(0x7e209ec1u, ImmutableString("log2").mangledNameHash());
>+    ASSERT_EQ(0x7e23f4beu, ImmutableString("sqrt").mangledNameHash());
>+    ASSERT_EQ(0x7e5f4d0fu, ImmutableString("inversesqrt").mangledNameHash());
>+    ASSERT_EQ(0x7e2dcb25u, ImmutableString("floor").mangledNameHash());
>+    ASSERT_EQ(0x7e23152fu, ImmutableString("ceil").mangledNameHash());
>+    ASSERT_EQ(0x7e2f6df3u, ImmutableString("fract").mangledNameHash());
>+    ASSERT_EQ(0x7e1eee70u, ImmutableString("mod").mangledNameHash());
>+    ASSERT_EQ(0x7e26202fu, ImmutableString("step").mangledNameHash());
>+    ASSERT_EQ(0x7e54a2cfu, ImmutableString("smoothstep").mangledNameHash());
>+    ASSERT_EQ(0x7e340894u, ImmutableString("length").mangledNameHash());
>+    ASSERT_EQ(0x7e4161fau, ImmutableString("distance").mangledNameHash());
>+    ASSERT_EQ(0x7e1e8464u, ImmutableString("dot").mangledNameHash());
>+    ASSERT_EQ(0x7e295733u, ImmutableString("cross").mangledNameHash());
>+    ASSERT_EQ(0x7e4e7aa5u, ImmutableString("normalize").mangledNameHash());
>+    ASSERT_EQ(0x7e5ae14bu, ImmutableString("faceforward").mangledNameHash());
>+    ASSERT_EQ(0x7e3c8e91u, ImmutableString("reflect").mangledNameHash());
>+    ASSERT_EQ(0x7e38233fu, ImmutableString("refract").mangledNameHash());
>+    ASSERT_EQ(0x7e197102u, ImmutableString("any").mangledNameHash());
>+    ASSERT_EQ(0x7e1892eeu, ImmutableString("all").mangledNameHash());
>+    ASSERT_EQ(0x7e195106u, ImmutableString("not").mangledNameHash());
>+    ASSERT_EQ(0x7e8166efu, ImmutableString("gl_MaxImageUnits").mangledNameHash());
>+    ASSERT_EQ(0x7ecf4a1bu, ImmutableString("gl_MaxVertexImageUniforms").mangledNameHash());
>+    ASSERT_EQ(0x7edf534au, ImmutableString("gl_MaxFragmentImageUniforms").mangledNameHash());
>+    ASSERT_EQ(0x7ed2bd5cu, ImmutableString("gl_MaxComputeImageUniforms").mangledNameHash());
>+    ASSERT_EQ(0x7ed9ae57u, ImmutableString("gl_MaxCombinedImageUniforms").mangledNameHash());
>+    ASSERT_EQ(0x7f1c60f8u,
>+              ImmutableString("gl_MaxCombinedShaderOutputResources").mangledNameHash());
>+    ASSERT_EQ(0x7edeadeeu, ImmutableString("gl_MaxComputeWorkGroupCount").mangledNameHash());
>+    ASSERT_EQ(0x7ed77973u, ImmutableString("gl_MaxComputeWorkGroupSize").mangledNameHash());
>+    ASSERT_EQ(0x7ef3740bu, ImmutableString("gl_MaxComputeUniformComponents").mangledNameHash());
>+    ASSERT_EQ(0x7ef00fc2u, ImmutableString("gl_MaxComputeTextureImageUnits").mangledNameHash());
>+    ASSERT_EQ(0x7ede0db3u, ImmutableString("gl_MaxComputeAtomicCounters").mangledNameHash());
>+    ASSERT_EQ(0x7f0d626fu, ImmutableString("gl_MaxComputeAtomicCounterBuffers").mangledNameHash());
>+    ASSERT_EQ(0x7ed27574u, ImmutableString("gl_MaxVertexAtomicCounters").mangledNameHash());
>+    ASSERT_EQ(0x7ee23dcau, ImmutableString("gl_MaxFragmentAtomicCounters").mangledNameHash());
>+    ASSERT_EQ(0x7ee400c5u, ImmutableString("gl_MaxCombinedAtomicCounters").mangledNameHash());
>+    ASSERT_EQ(0x7edacc17u, ImmutableString("gl_MaxAtomicCounterBindings").mangledNameHash());
>+    ASSERT_EQ(0x7f008375u, ImmutableString("gl_MaxVertexAtomicCounterBuffers").mangledNameHash());
>+    ASSERT_EQ(0x7f17bd18u, ImmutableString("gl_MaxFragmentAtomicCounterBuffers").mangledNameHash());
>+    ASSERT_EQ(0x7f11e359u, ImmutableString("gl_MaxCombinedAtomicCounterBuffers").mangledNameHash());
>+    ASSERT_EQ(0x7eecdfadu, ImmutableString("gl_MaxAtomicCounterBufferSize").mangledNameHash());
>+    ASSERT_EQ(0x7eec3ae1u, ImmutableString("gl_MaxGeometryInputComponents").mangledNameHash());
>+    ASSERT_EQ(0x7ef69ab4u, ImmutableString("gl_MaxGeometryOutputComponents").mangledNameHash());
>+    ASSERT_EQ(0x7ed9f437u, ImmutableString("gl_MaxGeometryImageUniforms").mangledNameHash());
>+    ASSERT_EQ(0x7ef9b17du, ImmutableString("gl_MaxGeometryTextureImageUnits").mangledNameHash());
>+    ASSERT_EQ(0x7ee1b439u, ImmutableString("gl_MaxGeometryOutputVertices").mangledNameHash());
>+    ASSERT_EQ(0x7f1cd073u,
>+              ImmutableString("gl_MaxGeometryTotalOutputComponents").mangledNameHash());
>+    ASSERT_EQ(0x7efe1865u, ImmutableString("gl_MaxGeometryUniformComponents").mangledNameHash());
>+    ASSERT_EQ(0x7ee6d3cfu, ImmutableString("gl_MaxGeometryAtomicCounters").mangledNameHash());
>+    ASSERT_EQ(0x7f170f84u, ImmutableString("gl_MaxGeometryAtomicCounterBuffers").mangledNameHash());
>+    ASSERT_EQ(0x7e2bef7au, ImmutableString("gl_in").mangledNameHash());
>+    ASSERT_EQ(0x7e82b146u, ImmutableString("gl_NumWorkGroups").mangledNameHash());
>+    ASSERT_EQ(0x7e808e8fu, ImmutableString("gl_WorkGroupSize").mangledNameHash());
>+    ASSERT_EQ(0x7e736b62u, ImmutableString("gl_WorkGroupID").mangledNameHash());
>+    ASSERT_EQ(0x7ea251edu, ImmutableString("gl_LocalInvocationID").mangledNameHash());
>+    ASSERT_EQ(0x7ead13a8u, ImmutableString("gl_GlobalInvocationID").mangledNameHash());
>+    ASSERT_EQ(0x7ebcd395u, ImmutableString("gl_LocalInvocationIndex").mangledNameHash());
>+    ASSERT_EQ(0x7e865240u, ImmutableString("gl_PrimitiveIDIn").mangledNameHash());
>+    ASSERT_EQ(0x7e7fe684u, ImmutableString("gl_InvocationID").mangledNameHash());
>+    ASSERT_EQ(0x7e742076u, ImmutableString("gl_PrimitiveID").mangledNameHash());
>+    ASSERT_EQ(0x7e400f84u, ImmutableString("gl_Layer").mangledNameHash());
>+    ASSERT_EQ(0x7e67167au, ImmutableString("gl_PerVertex").mangledNameHash());
>+    ASSERT_EQ(0x7e580bc5u, ImmutableString("gl_Position").mangledNameHash());
>+    ASSERT_EQ(0x7ec8d677u, ImmutableString("gl_MaxVertexOutputVectors").mangledNameHash());
>+    ASSERT_EQ(0x7ed1aaebu, ImmutableString("gl_MaxFragmentInputVectors").mangledNameHash());
>+    ASSERT_EQ(0x7ec3c4d1u, ImmutableString("gl_MinProgramTexelOffset").mangledNameHash());
>+    ASSERT_EQ(0x7ec10648u, ImmutableString("gl_MaxProgramTexelOffset").mangledNameHash());
>+    ASSERT_EQ(0x7e645c89u, ImmutableString("gl_FragDepth").mangledNameHash());
>+    ASSERT_EQ(0x7e6be47fu, ImmutableString("gl_InstanceID").mangledNameHash());
>+    ASSERT_EQ(0x7e5f8987u, ImmutableString("gl_VertexID").mangledNameHash());
>+    ASSERT_EQ(0x7e4c3c42u, ImmutableString("gl_DrawID").mangledNameHash());
>+    ASSERT_EQ(0x7e6f6de9u, ImmutableString("gl_ViewID_OVR").mangledNameHash());
>+    ASSERT_EQ(0x7ea6cdf6u, ImmutableString("gl_MaxVaryingVectors").mangledNameHash());
>+    ASSERT_EQ(0x7e5a0c08u, ImmutableString("gl_FragData").mangledNameHash());
>+    ASSERT_EQ(0x7ebce486u, ImmutableString("gl_SecondaryFragDataEXT").mangledNameHash());
>+    ASSERT_EQ(0x7e7c38efu, ImmutableString("gl_FragDepthEXT").mangledNameHash());
>+    ASSERT_EQ(0x7e60c438u, ImmutableString("gl_FragColor").mangledNameHash());
>+    ASSERT_EQ(0x7ec56cbeu, ImmutableString("gl_SecondaryFragColorEXT").mangledNameHash());
>+    ASSERT_EQ(0x7e7970c2u, ImmutableString("gl_LastFragData").mangledNameHash());
>+    ASSERT_EQ(0x7e802016u, ImmutableString("gl_LastFragColor").mangledNameHash());
>+    ASSERT_EQ(0x7e9f0a88u, ImmutableString("gl_LastFragColorARM").mangledNameHash());
>+    ASSERT_EQ(0x7ebeff64u, ImmutableString("gl_DepthRangeParameters").mangledNameHash());
>+    ASSERT_EQ(0x7e6af03cu, ImmutableString("gl_DepthRange").mangledNameHash());
>+    ASSERT_EQ(0x7e9ad799u, ImmutableString("gl_MaxVertexAttribs").mangledNameHash());
>+    ASSERT_EQ(0x7ed35151u, ImmutableString("gl_MaxVertexUniformVectors").mangledNameHash());
>+    ASSERT_EQ(0x7eea039au, ImmutableString("gl_MaxVertexTextureImageUnits").mangledNameHash());
>+    ASSERT_EQ(0x7ef84293u, ImmutableString("gl_MaxCombinedTextureImageUnits").mangledNameHash());
>+    ASSERT_EQ(0x7ebaa8e5u, ImmutableString("gl_MaxTextureImageUnits").mangledNameHash());
>+    ASSERT_EQ(0x7ee45ba1u, ImmutableString("gl_MaxFragmentUniformVectors").mangledNameHash());
>+    ASSERT_EQ(0x7e8ab02eu, ImmutableString("gl_MaxDrawBuffers").mangledNameHash());
>+    ASSERT_EQ(0x7ef1e608u, ImmutableString("gl_MaxDualSourceDrawBuffersEXT").mangledNameHash());
>+    ASSERT_EQ(0x7e64c010u, ImmutableString("gl_FragCoord").mangledNameHash());
>+    ASSERT_EQ(0x7e73011eu, ImmutableString("gl_FrontFacing").mangledNameHash());
>+    ASSERT_EQ(0x7e6c2088u, ImmutableString("gl_PointCoord").mangledNameHash());
>+    ASSERT_EQ(0x7e63931cu, ImmutableString("gl_PointSize").mangledNameHash());
>+}
>+
>+}  // namespace sh
>diff --git a/Source/ThirdParty/ANGLE/src/tests/compiler_tests/InitOutputVariables_test.cpp b/Source/ThirdParty/ANGLE/src/tests/compiler_tests/InitOutputVariables_test.cpp
>index f4645111123..ddbc9f13de3 100644
>--- a/Source/ThirdParty/ANGLE/src/tests/compiler_tests/InitOutputVariables_test.cpp
>+++ b/Source/ThirdParty/ANGLE/src/tests/compiler_tests/InitOutputVariables_test.cpp
>@@ -9,10 +9,10 @@
> 
> #include "common/angleutils.h"
> 
>-#include "compiler/translator/FindMain.h"
>-#include "compiler/translator/IntermNode_util.h"
>-#include "compiler/translator/IntermTraverse.h"
> #include "compiler/translator/SymbolTable.h"
>+#include "compiler/translator/tree_util/FindMain.h"
>+#include "compiler/translator/tree_util/IntermNode_util.h"
>+#include "compiler/translator/tree_util/IntermTraverse.h"
> #include "tests/test_utils/ShaderCompileTreeTest.h"
> 
> #include <algorithm>
>@@ -36,7 +36,9 @@ bool AreSymbolsTheSame(const TIntermSymbol *expected, const TIntermSymbol *candi
>     const bool sameTypes       = expectedType == candidateType &&
>                            expectedType.getPrecision() == candidateType.getPrecision() &&
>                            expectedType.getQualifier() == candidateType.getQualifier();
>-    const bool sameSymbols = expected->getSymbol() == candidate->getSymbol();
>+    const bool sameSymbols = (expected->variable().symbolType() == SymbolType::Empty &&
>+                              candidate->variable().symbolType() == SymbolType::Empty) ||
>+                             expected->getName() == candidate->getName();
>     return sameSymbols && sameTypes;
> }
> 
>@@ -62,24 +64,28 @@ bool AreLValuesTheSame(TIntermTyped *expected, TIntermTyped *candidate)
>     return AreSymbolsTheSame(expected->getAsSymbolNode(), candidate->getAsSymbolNode());
> }
> 
>-TIntermTyped *CreateLValueNode(const TString &lValueName, const TType &type)
>+TIntermTyped *CreateLValueNode(const ImmutableString &lValueName, const TType &type)
> {
>     // We're using a dummy symbol table here, don't need to assign proper symbol ids to these nodes.
>     TSymbolTable symbolTable;
>-    return new TIntermSymbol(symbolTable.nextUniqueId(), lValueName, type);
>+    TVariable *variable =
>+        new TVariable(&symbolTable, lValueName, new TType(type), SymbolType::UserDefined);
>+    return new TIntermSymbol(variable);
> }
> 
>-ExpectedLValues CreateIndexedLValueNodeList(const TString &lValueName,
>-                                            TType elementType,
>+ExpectedLValues CreateIndexedLValueNodeList(const ImmutableString &lValueName,
>+                                            const TType &elementType,
>                                             unsigned arraySize)
> {
>     ASSERT(elementType.isArray() == false);
>-    elementType.makeArray(arraySize);
>+    TType *arrayType = new TType(elementType);
>+    arrayType->makeArray(arraySize);
> 
>     // We're using a dummy symbol table here, don't need to assign proper symbol ids to these nodes.
>     TSymbolTable symbolTable;
>-    TIntermSymbol *arraySymbol =
>-        new TIntermSymbol(symbolTable.nextUniqueId(), lValueName, elementType);
>+    TVariable *variable =
>+        new TVariable(&symbolTable, lValueName, arrayType, SymbolType::UserDefined);
>+    TIntermSymbol *arraySymbol = new TIntermSymbol(variable);
> 
>     ExpectedLValues expected(arraySize);
>     for (unsigned index = 0u; index < arraySize; ++index)
>@@ -150,10 +156,9 @@ class VerifyOutputVariableInitializers final : public TIntermTraverser
> class FindStructByName final : public TIntermTraverser
> {
>   public:
>-    FindStructByName(const TString &structName)
>+    FindStructByName(const ImmutableString &structName)
>         : TIntermTraverser(true, false, false), mStructName(structName), mStructure(nullptr)
>-    {
>-    }
>+    {}
> 
>     void visitSymbol(TIntermSymbol *symbol) override
>     {
>@@ -162,20 +167,21 @@ class FindStructByName final : public TIntermTraverser
>             return;
>         }
> 
>-        TStructure *structure = symbol->getTypePointer()->getStruct();
>+        const TStructure *structure = symbol->getType().getStruct();
> 
>-        if (structure != nullptr && structure->name() == mStructName)
>+        if (structure != nullptr && structure->symbolType() != SymbolType::Empty &&
>+            structure->name() == mStructName)
>         {
>             mStructure = structure;
>         }
>     }
> 
>-    bool isStructureFound() const { return mStructure != nullptr; };
>-    TStructure *getStructure() const { return mStructure; }
>+    bool isStructureFound() const { return mStructure != nullptr; }
>+    const TStructure *getStructure() const { return mStructure; }
> 
>   private:
>-    TString mStructName;
>-    TStructure *mStructure;
>+    ImmutableString mStructName;
>+    const TStructure *mStructure;
> };
> 
> }  // namespace
>@@ -251,10 +257,10 @@ TEST_F(InitOutputVariablesWebGL2VertexShaderTest, OutputAllQualifiers)
>     VerifyOutputVariableInitializers verifier(mASTRoot);
> 
>     ExpectedLValues expectedLValues = {
>-        CreateLValueNode("out1", TType(EbtFloat, EbpMedium, EvqVertexOut, 4)),
>-        CreateLValueNode("out2", TType(EbtInt, EbpLow, EvqFlatOut)),
>-        CreateLValueNode("out3", TType(EbtFloat, EbpMedium, EvqCentroidOut)),
>-        CreateLValueNode("out4", TType(EbtFloat, EbpMedium, EvqSmoothOut))};
>+        CreateLValueNode(ImmutableString("out1"), TType(EbtFloat, EbpMedium, EvqVertexOut, 4)),
>+        CreateLValueNode(ImmutableString("out2"), TType(EbtInt, EbpLow, EvqFlatOut)),
>+        CreateLValueNode(ImmutableString("out3"), TType(EbtFloat, EbpMedium, EvqCentroidOut)),
>+        CreateLValueNode(ImmutableString("out4"), TType(EbtFloat, EbpMedium, EvqSmoothOut))};
>     EXPECT_TRUE(verifier.areAllExpectedLValuesFound(expectedLValues));
> }
> 
>@@ -270,8 +276,8 @@ TEST_F(InitOutputVariablesWebGL2VertexShaderTest, OutputArray)
>     compileAssumeSuccess(shaderString);
>     VerifyOutputVariableInitializers verifier(mASTRoot);
> 
>-    ExpectedLValues expectedLValues =
>-        CreateIndexedLValueNodeList("out1", TType(EbtFloat, EbpMedium, EvqVertexOut), 2);
>+    ExpectedLValues expectedLValues = CreateIndexedLValueNodeList(
>+        ImmutableString("out1"), TType(EbtFloat, EbpMedium, EvqVertexOut), 2);
>     EXPECT_TRUE(verifier.areAllExpectedLValuesFound(expectedLValues));
> }
> 
>@@ -291,14 +297,14 @@ TEST_F(InitOutputVariablesWebGL2VertexShaderTest, OutputStruct)
>     compileAssumeSuccess(shaderString);
>     VerifyOutputVariableInitializers verifier(mASTRoot);
> 
>-    FindStructByName findStruct("MyS");
>+    FindStructByName findStruct(ImmutableString("MyS"));
>     mASTRoot->traverse(&findStruct);
>     ASSERT(findStruct.isStructureFound());
> 
>-    TType type(EbtStruct, EbpUndefined, EvqVertexOut);
>-    type.setStruct(findStruct.getStructure());
>+    TType type(findStruct.getStructure(), false);
>+    type.setQualifier(EvqVertexOut);
> 
>-    TIntermTyped *expectedLValue = CreateLValueNode("out1", type);
>+    TIntermTyped *expectedLValue = CreateLValueNode(ImmutableString("out1"), type);
>     EXPECT_TRUE(verifier.isExpectedLValueFound(expectedLValue));
>     delete expectedLValue;
> }
>@@ -315,7 +321,7 @@ TEST_F(InitOutputVariablesWebGL2VertexShaderTest, OutputFromESSL1Shader)
>     VerifyOutputVariableInitializers verifier(mASTRoot);
> 
>     TIntermTyped *expectedLValue =
>-        CreateLValueNode("out1", TType(EbtFloat, EbpMedium, EvqVaryingOut, 4));
>+        CreateLValueNode(ImmutableString("out1"), TType(EbtFloat, EbpMedium, EvqVaryingOut, 4));
>     EXPECT_TRUE(verifier.isExpectedLValueFound(expectedLValue));
>     delete expectedLValue;
> }
>@@ -333,7 +339,7 @@ TEST_F(InitOutputVariablesWebGL2FragmentShaderTest, Output)
>     VerifyOutputVariableInitializers verifier(mASTRoot);
> 
>     TIntermTyped *expectedLValue =
>-        CreateLValueNode("out1", TType(EbtFloat, EbpMedium, EvqFragmentOut, 4));
>+        CreateLValueNode(ImmutableString("out1"), TType(EbtFloat, EbpMedium, EvqFragmentOut, 4));
>     EXPECT_TRUE(verifier.isExpectedLValueFound(expectedLValue));
>     delete expectedLValue;
> }
>@@ -350,8 +356,8 @@ TEST_F(InitOutputVariablesWebGL2FragmentShaderTest, FragData)
>     compileAssumeSuccess(shaderString);
>     VerifyOutputVariableInitializers verifier(mASTRoot);
> 
>-    ExpectedLValues expectedLValues =
>-        CreateIndexedLValueNodeList("gl_FragData", TType(EbtFloat, EbpMedium, EvqFragData, 4), 1);
>+    ExpectedLValues expectedLValues = CreateIndexedLValueNodeList(
>+        ImmutableString("gl_FragData"), TType(EbtFloat, EbpMedium, EvqFragData, 4), 1);
>     EXPECT_TRUE(verifier.isExpectedLValueFound(expectedLValues[0]));
>     EXPECT_EQ(1u, verifier.getCandidates().size());
> }
>@@ -370,8 +376,8 @@ TEST_F(InitOutputVariablesWebGL1FragmentShaderTest, FragData)
> 
>     // In the symbol table, gl_FragData array has 2 elements. However, only the 1st one should be
>     // initialized.
>-    ExpectedLValues expectedLValues =
>-        CreateIndexedLValueNodeList("gl_FragData", TType(EbtFloat, EbpMedium, EvqFragData, 4), 2);
>+    ExpectedLValues expectedLValues = CreateIndexedLValueNodeList(
>+        ImmutableString("gl_FragData"), TType(EbtFloat, EbpMedium, EvqFragData, 4), 2);
>     EXPECT_TRUE(verifier.isExpectedLValueFound(expectedLValues[0]));
>     EXPECT_EQ(1u, verifier.getCandidates().size());
> }
>@@ -389,8 +395,8 @@ TEST_F(InitOutputVariablesWebGL1FragmentShaderTest, FragDataWithDrawBuffersExtEn
>     compileAssumeSuccess(shaderString);
>     VerifyOutputVariableInitializers verifier(mASTRoot);
> 
>-    ExpectedLValues expectedLValues =
>-        CreateIndexedLValueNodeList("gl_FragData", TType(EbtFloat, EbpMedium, EvqFragData, 4), 2);
>+    ExpectedLValues expectedLValues = CreateIndexedLValueNodeList(
>+        ImmutableString("gl_FragData"), TType(EbtFloat, EbpMedium, EvqFragData, 4), 2);
>     EXPECT_TRUE(verifier.isExpectedLValueFound(expectedLValues[0]));
>     EXPECT_TRUE(verifier.isExpectedLValueFound(expectedLValues[1]));
>     EXPECT_EQ(2u, verifier.getCandidates().size());
>@@ -409,7 +415,7 @@ TEST_F(InitOutputVariablesWebGL2VertexShaderTest, InitGLPositionWhenNotStaticall
>     VerifyOutputVariableInitializers verifier(mASTRoot);
> 
>     TIntermTyped *glPosition =
>-        CreateLValueNode("gl_Position", TType(EbtFloat, EbpHigh, EvqPosition, 4));
>+        CreateLValueNode(ImmutableString("gl_Position"), TType(EbtFloat, EbpHigh, EvqPosition, 4));
>     EXPECT_TRUE(verifier.isExpectedLValueFound(glPosition));
>     EXPECT_EQ(1u, verifier.getCandidates().size());
> }
>@@ -428,7 +434,7 @@ TEST_F(InitOutputVariablesWebGL2VertexShaderTest, InitGLPositionOnceWhenStatical
>     VerifyOutputVariableInitializers verifier(mASTRoot);
> 
>     TIntermTyped *glPosition =
>-        CreateLValueNode("gl_Position", TType(EbtFloat, EbpHigh, EvqPosition, 4));
>+        CreateLValueNode(ImmutableString("gl_Position"), TType(EbtFloat, EbpHigh, EvqPosition, 4));
>     EXPECT_TRUE(verifier.isExpectedLValueFound(glPosition));
>     EXPECT_EQ(1u, verifier.getCandidates().size());
> }
>diff --git a/Source/ThirdParty/ANGLE/src/tests/compiler_tests/IntermNode_test.cpp b/Source/ThirdParty/ANGLE/src/tests/compiler_tests/IntermNode_test.cpp
>index df51aab8191..71efdff0b80 100644
>--- a/Source/ThirdParty/ANGLE/src/tests/compiler_tests/IntermNode_test.cpp
>+++ b/Source/ThirdParty/ANGLE/src/tests/compiler_tests/IntermNode_test.cpp
>@@ -11,6 +11,7 @@
> #include "angle_gl.h"
> #include "compiler/translator/InfoSink.h"
> #include "compiler/translator/PoolAlloc.h"
>+#include "compiler/translator/StaticType.h"
> #include "compiler/translator/SymbolTable.h"
> #include "gtest/gtest.h"
> 
>@@ -36,19 +37,20 @@ class IntermNodeTest : public testing::Test
> 
>     TIntermSymbol *createTestSymbol(const TType &type)
>     {
>-        TInfoSinkBase symbolNameOut;
>+        std::stringstream symbolNameOut;
>         symbolNameOut << "test" << mUniqueIndex;
>-        TString symbolName = symbolNameOut.c_str();
>+        ImmutableString symbolName(symbolNameOut.str());
>         ++mUniqueIndex;
> 
>         // We're using a dummy symbol table here, don't need to assign proper symbol ids to these
>         // nodes.
>         TSymbolTable symbolTable;
>-
>-        TIntermSymbol *node = new TIntermSymbol(symbolTable.nextUniqueId(), symbolName, type);
>+        TType *variableType = new TType(type);
>+        variableType->setQualifier(EvqTemporary);
>+        TVariable *variable =
>+            new TVariable(&symbolTable, symbolName, variableType, SymbolType::AngleInternal);
>+        TIntermSymbol *node = new TIntermSymbol(variable);
>         node->setLine(createUniqueSourceLoc());
>-        node->setInternal(true);
>-        node->getTypePointer()->setQualifier(EvqTemporary);
>         return node;
>     }
> 
>@@ -58,6 +60,22 @@ class IntermNodeTest : public testing::Test
>         return createTestSymbol(type);
>     }
> 
>+    TFunction *createTestFunction(const TType &returnType, const TIntermSequence &args)
>+    {
>+        // We're using a dummy symbol table similarly as for creating symbol nodes.
>+        const ImmutableString name("testFunc");
>+        TSymbolTable symbolTable;
>+        TFunction *func = new TFunction(&symbolTable, name, SymbolType::UserDefined,
>+                                        new TType(returnType), false);
>+        for (TIntermNode *arg : args)
>+        {
>+            const TType *type = new TType(arg->getAsTyped()->getType());
>+            func->addParameter(new TVariable(&symbolTable, ImmutableString("param"), type,
>+                                             SymbolType::UserDefined));
>+        }
>+        return func;
>+    }
>+
>     void checkTypeEqualWithQualifiers(const TType &original, const TType &copy)
>     {
>         ASSERT_EQ(original, copy);
>@@ -73,9 +91,9 @@ class IntermNodeTest : public testing::Test
>         ASSERT_NE(nullptr, copy);
>         ASSERT_NE(nullptr, original);
>         ASSERT_NE(original, copy);
>-        ASSERT_EQ(original->getId(), copy->getId());
>-        ASSERT_EQ(original->getName().getString(), copy->getName().getString());
>-        ASSERT_EQ(original->getName().isInternal(), copy->getName().isInternal());
>+        ASSERT_EQ(&original->variable(), &copy->variable());
>+        ASSERT_EQ(original->uniqueId(), copy->uniqueId());
>+        ASSERT_EQ(original->getName(), copy->getName());
>         checkTypeEqualWithQualifiers(original->getType(), copy->getType());
>         ASSERT_EQ(original->getLine().first_file, copy->getLine().first_file);
>         ASSERT_EQ(original->getLine().first_line, copy->getLine().first_line);
>@@ -113,7 +131,7 @@ class IntermNodeTest : public testing::Test
>     }
> 
>   private:
>-    TPoolAllocator allocator;
>+    angle::PoolAllocator allocator;
>     int mUniqueIndex;
> };
> 
>@@ -121,14 +139,15 @@ class IntermNodeTest : public testing::Test
> // original.
> TEST_F(IntermNodeTest, DeepCopySymbolNode)
> {
>-    TType type(EbtInt, EbpHigh);
>+    const TType *type = StaticType::Get<EbtInt, EbpHigh, EvqTemporary, 1, 1>();
> 
>     // We're using a dummy symbol table here, don't need to assign proper symbol ids to these nodes.
>     TSymbolTable symbolTable;
> 
>-    TIntermSymbol *original = new TIntermSymbol(symbolTable.nextUniqueId(), TString("name"), type);
>+    TVariable *variable =
>+        new TVariable(&symbolTable, ImmutableString("name"), type, SymbolType::AngleInternal);
>+    TIntermSymbol *original = new TIntermSymbol(variable);
>     original->setLine(getTestSourceLoc());
>-    original->setInternal(true);
>     TIntermTyped *copy = original->deepCopy();
>     checkSymbolCopy(original, copy);
>     checkTestSourceLoc(copy->getLine());
>@@ -161,7 +180,7 @@ TEST_F(IntermNodeTest, DeepCopyBinaryNode)
>     TIntermBinary *original = new TIntermBinary(EOpAdd, createTestSymbol(), createTestSymbol());
>     original->setLine(getTestSourceLoc());
>     TIntermTyped *copyTyped = original->deepCopy();
>-    TIntermBinary *copy = copyTyped->getAsBinaryNode();
>+    TIntermBinary *copy     = copyTyped->getAsBinaryNode();
>     ASSERT_NE(nullptr, copy);
>     ASSERT_NE(original, copy);
>     checkTestSourceLoc(copy->getLine());
>@@ -177,10 +196,10 @@ TEST_F(IntermNodeTest, DeepCopyUnaryNode)
> {
>     TType type(EbtFloat, EbpHigh);
> 
>-    TIntermUnary *original = new TIntermUnary(EOpPreIncrement, createTestSymbol());
>+    TIntermUnary *original = new TIntermUnary(EOpPreIncrement, createTestSymbol(), nullptr);
>     original->setLine(getTestSourceLoc());
>     TIntermTyped *copyTyped = original->deepCopy();
>-    TIntermUnary *copy = copyTyped->getAsUnaryNode();
>+    TIntermUnary *copy      = copyTyped->getAsUnaryNode();
>     ASSERT_NE(nullptr, copy);
>     ASSERT_NE(original, copy);
>     checkTestSourceLoc(copy->getLine());
>@@ -197,12 +216,15 @@ TEST_F(IntermNodeTest, DeepCopyAggregateNode)
>     originalSeq->push_back(createTestSymbol());
>     originalSeq->push_back(createTestSymbol());
>     originalSeq->push_back(createTestSymbol());
>-    TIntermAggregate *original =
>-        TIntermAggregate::Create(originalSeq->at(0)->getAsTyped()->getType(), EOpMix, originalSeq);
>+
>+    TFunction *testFunc =
>+        createTestFunction(originalSeq->back()->getAsTyped()->getType(), *originalSeq);
>+
>+    TIntermAggregate *original = TIntermAggregate::CreateFunctionCall(*testFunc, originalSeq);
>     original->setLine(getTestSourceLoc());
> 
>     TIntermTyped *copyTyped = original->deepCopy();
>-    TIntermAggregate *copy = copyTyped->getAsAggregate();
>+    TIntermAggregate *copy  = copyTyped->getAsAggregate();
>     ASSERT_NE(nullptr, copy);
>     ASSERT_NE(original, copy);
>     checkTestSourceLoc(copy->getLine());
>@@ -238,4 +260,3 @@ TEST_F(IntermNodeTest, DeepCopyTernaryNode)
>     checkSymbolCopy(original->getTrueExpression(), copy->getTrueExpression());
>     checkSymbolCopy(original->getFalseExpression(), copy->getFalseExpression());
> }
>-
>diff --git a/Source/ThirdParty/ANGLE/src/tests/compiler_tests/NV_draw_buffers_test.cpp b/Source/ThirdParty/ANGLE/src/tests/compiler_tests/NV_draw_buffers_test.cpp
>index 13a44fd5983..016bdb9f888 100644
>--- a/Source/ThirdParty/ANGLE/src/tests/compiler_tests/NV_draw_buffers_test.cpp
>+++ b/Source/ThirdParty/ANGLE/src/tests/compiler_tests/NV_draw_buffers_test.cpp
>@@ -7,9 +7,9 @@
> //   Test for NV_draw_buffers setting
> //
> 
>+#include "GLSLANG/ShaderLang.h"
> #include "angle_gl.h"
> #include "gtest/gtest.h"
>-#include "GLSLANG/ShaderLang.h"
> #include "tests/test_utils/compiler_test.h"
> 
> using namespace sh;
>diff --git a/Source/ThirdParty/ANGLE/src/tests/compiler_tests/OES_standard_derivatives_test.cpp b/Source/ThirdParty/ANGLE/src/tests/compiler_tests/OES_standard_derivatives_test.cpp
>new file mode 100644
>index 00000000000..f32667abcef
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/tests/compiler_tests/OES_standard_derivatives_test.cpp
>@@ -0,0 +1,90 @@
>+//
>+// Copyright (c) 2018 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// OES_standard_derivatives_test.cpp:
>+//   Test for OES_standard_derivatives
>+//
>+
>+#include "tests/test_utils/ShaderExtensionTest.h"
>+
>+using OESStandardDerivativesTest = sh::ShaderExtensionTest;
>+
>+namespace
>+{
>+const char OESPragma[] = "#extension GL_OES_standard_derivatives : require\n";
>+
>+// Shader calling dFdx()
>+const char ESSL100_DfdxShader[] =
>+    R"(
>+    precision mediump float;
>+    varying float x;
>+
>+    void main()
>+    {
>+        gl_FragColor = vec4(dFdx(x));
>+     })";
>+
>+// Shader calling dFdy()
>+const char ESSL100_DfdyShader[] =
>+    R"(
>+    precision mediump float;
>+    varying float x;
>+
>+    void main()
>+    {
>+        gl_FragColor = vec4(dFdy(x));
>+    })";
>+
>+// Shader calling fwidth()
>+const char ESSL100_FwidthShader[] =
>+    R"(
>+    precision mediump float;
>+    varying float x;
>+
>+    void main()
>+    {
>+        gl_FragColor = vec4(fwidth(x));
>+    })";
>+
>+// Extension flag is required to compile properly. Expect failure when it is
>+// not present.
>+TEST_P(OESStandardDerivativesTest, CompileFailsWithoutExtension)
>+{
>+    mResources.OES_standard_derivatives = 0;
>+    InitializeCompiler();
>+    EXPECT_FALSE(TestShaderCompile(OESPragma));
>+}
>+
>+// Extension directive is required to compile properly. Expect failure when
>+// it is not present.
>+TEST_P(OESStandardDerivativesTest, CompileFailsWithExtensionWithoutPragma)
>+{
>+    mResources.OES_standard_derivatives = 1;
>+    InitializeCompiler();
>+    EXPECT_FALSE(TestShaderCompile(""));
>+}
>+
>+// With extension flag and extension directive, compiling succeeds.
>+// Also test that the extension directive state is reset correctly.
>+TEST_P(OESStandardDerivativesTest, CompileSucceedsWithExtensionAndPragma)
>+{
>+    mResources.OES_standard_derivatives = 1;
>+    InitializeCompiler();
>+    EXPECT_TRUE(TestShaderCompile(OESPragma));
>+    // Test reset functionality.
>+    EXPECT_FALSE(TestShaderCompile(""));
>+    EXPECT_TRUE(TestShaderCompile(OESPragma));
>+}
>+
>+// The SL #version 100 shaders that are correct work similarly
>+// in both GL2 and GL3, with and without the version string.
>+INSTANTIATE_TEST_SUITE_P(
>+    CorrectESSL100Shaders,
>+    OESStandardDerivativesTest,
>+    Combine(Values(SH_GLES2_SPEC),
>+            Values(sh::ESSLVersion100),
>+            Values(ESSL100_DfdxShader, ESSL100_DfdyShader, ESSL100_FwidthShader)));
>+
>+}  // anonymous namespace
>diff --git a/Source/ThirdParty/ANGLE/src/tests/compiler_tests/OVR_multiview2_test.cpp b/Source/ThirdParty/ANGLE/src/tests/compiler_tests/OVR_multiview2_test.cpp
>new file mode 100644
>index 00000000000..b294a2ff125
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/tests/compiler_tests/OVR_multiview2_test.cpp
>@@ -0,0 +1,719 @@
>+//
>+// Copyright (c) 2016 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// WEBGL_multiview_test.cpp:
>+//   Test that shaders with gl_ViewID_OVR are validated correctly.
>+//
>+
>+#include "GLSLANG/ShaderLang.h"
>+#include "compiler/translator/tree_util/IntermTraverse.h"
>+#include "tests/test_utils/ShaderCompileTreeTest.h"
>+#include "tests/test_utils/compiler_test.h"
>+
>+using namespace sh;
>+
>+namespace
>+{
>+
>+class SymbolOccurrenceCounter : public TIntermTraverser
>+{
>+  public:
>+    SymbolOccurrenceCounter() : TIntermTraverser(true, false, false), mNumberOfOccurrences(0u) {}
>+
>+    void visitSymbol(TIntermSymbol *node) override
>+    {
>+        if (shouldCountSymbol(node))
>+        {
>+            ++mNumberOfOccurrences;
>+        }
>+    }
>+
>+    virtual bool shouldCountSymbol(const TIntermSymbol *node) const = 0;
>+
>+    unsigned getNumberOfOccurrences() const { return mNumberOfOccurrences; }
>+
>+  private:
>+    unsigned mNumberOfOccurrences;
>+};
>+
>+class SymbolOccurrenceCounterByQualifier : public SymbolOccurrenceCounter
>+{
>+  public:
>+    SymbolOccurrenceCounterByQualifier(TQualifier symbolQualifier)
>+        : mSymbolQualifier(symbolQualifier)
>+    {}
>+
>+    bool shouldCountSymbol(const TIntermSymbol *node) const override
>+    {
>+        return node->getQualifier() == mSymbolQualifier;
>+    }
>+
>+  private:
>+    TQualifier mSymbolQualifier;
>+};
>+
>+class SymbolOccurrenceCounterByName : public SymbolOccurrenceCounter
>+{
>+  public:
>+    SymbolOccurrenceCounterByName(const ImmutableString &symbolName) : mSymbolName(symbolName) {}
>+
>+    bool shouldCountSymbol(const TIntermSymbol *node) const override
>+    {
>+        return node->variable().symbolType() != SymbolType::Empty && node->getName() == mSymbolName;
>+    }
>+
>+  private:
>+    ImmutableString mSymbolName;
>+};
>+
>+class SymbolOccurrenceCounterByNameAndQualifier : public SymbolOccurrenceCounter
>+{
>+  public:
>+    SymbolOccurrenceCounterByNameAndQualifier(const ImmutableString &symbolName,
>+                                              TQualifier qualifier)
>+        : mSymbolName(symbolName), mSymbolQualifier(qualifier)
>+    {}
>+
>+    bool shouldCountSymbol(const TIntermSymbol *node) const override
>+    {
>+        return node->variable().symbolType() != SymbolType::Empty &&
>+               node->getName() == mSymbolName && node->getQualifier() == mSymbolQualifier;
>+    }
>+
>+  private:
>+    ImmutableString mSymbolName;
>+    TQualifier mSymbolQualifier;
>+};
>+
>+class OVRMultiviewVertexShaderTest : public ShaderCompileTreeTest
>+{
>+  public:
>+    OVRMultiviewVertexShaderTest() {}
>+
>+  protected:
>+    ::GLenum getShaderType() const override { return GL_VERTEX_SHADER; }
>+    ShShaderSpec getShaderSpec() const override { return SH_WEBGL3_SPEC; }
>+    void initResources(ShBuiltInResources *resources) override
>+    {
>+        resources->OVR_multiview2 = 1;
>+        resources->MaxViewsOVR    = 4;
>+    }
>+};
>+
>+class OVRMultiviewFragmentShaderTest : public ShaderCompileTreeTest
>+{
>+  public:
>+    OVRMultiviewFragmentShaderTest() {}
>+
>+  protected:
>+    ::GLenum getShaderType() const override { return GL_FRAGMENT_SHADER; }
>+    ShShaderSpec getShaderSpec() const override { return SH_WEBGL3_SPEC; }
>+    void initResources(ShBuiltInResources *resources) override
>+    {
>+        resources->OVR_multiview2 = 1;
>+        resources->MaxViewsOVR    = 4;
>+    }
>+};
>+
>+class OVRMultiviewOutputCodeTest : public MatchOutputCodeTest
>+{
>+  public:
>+    OVRMultiviewOutputCodeTest(sh::GLenum shaderType)
>+        : MatchOutputCodeTest(shaderType, 0, SH_ESSL_OUTPUT)
>+    {
>+        addOutputType(SH_GLSL_COMPATIBILITY_OUTPUT);
>+
>+        getResources()->OVR_multiview2 = 1;
>+        getResources()->MaxViewsOVR    = 4;
>+    }
>+
>+    void requestHLSLOutput()
>+    {
>+#if defined(ANGLE_ENABLE_HLSL)
>+        addOutputType(SH_HLSL_4_1_OUTPUT);
>+#endif
>+    }
>+
>+    bool foundInAllGLSLCode(const char *str)
>+    {
>+        return foundInGLSLCode(str) && foundInESSLCode(str);
>+    }
>+
>+    bool foundInHLSLCode(const char *stringToFind) const
>+    {
>+#if defined(ANGLE_ENABLE_HLSL)
>+        return foundInCode(SH_HLSL_4_1_OUTPUT, stringToFind);
>+#else
>+        return true;
>+#endif
>+    }
>+};
>+
>+class OVRMultiviewVertexShaderOutputCodeTest : public OVRMultiviewOutputCodeTest
>+{
>+  public:
>+    OVRMultiviewVertexShaderOutputCodeTest() : OVRMultiviewOutputCodeTest(GL_VERTEX_SHADER) {}
>+};
>+
>+class OVRMultiviewFragmentShaderOutputCodeTest : public OVRMultiviewOutputCodeTest
>+{
>+  public:
>+    OVRMultiviewFragmentShaderOutputCodeTest() : OVRMultiviewOutputCodeTest(GL_FRAGMENT_SHADER) {}
>+};
>+
>+class OVRMultiviewComputeShaderOutputCodeTest : public OVRMultiviewOutputCodeTest
>+{
>+  public:
>+    OVRMultiviewComputeShaderOutputCodeTest() : OVRMultiviewOutputCodeTest(GL_COMPUTE_SHADER) {}
>+};
>+
>+void VariableOccursNTimes(TIntermBlock *root,
>+                          const ImmutableString &varName,
>+                          const TQualifier varQualifier,
>+                          unsigned n)
>+{
>+    // Check that there are n occurrences of the variable with the given name and qualifier.
>+    SymbolOccurrenceCounterByNameAndQualifier viewIDByNameAndQualifier(varName, varQualifier);
>+    root->traverse(&viewIDByNameAndQualifier);
>+    EXPECT_EQ(n, viewIDByNameAndQualifier.getNumberOfOccurrences());
>+
>+    // Check that there are n occurrences of the variable with the given name. By this we guarantee
>+    // that there are no other occurrences of the variable with the same name but different
>+    // qualifier.
>+    SymbolOccurrenceCounterByName viewIDByName(varName);
>+    root->traverse(&viewIDByName);
>+    EXPECT_EQ(n, viewIDByName.getNumberOfOccurrences());
>+}
>+
>+// Unsupported GL_OVR_multiview extension directive (GL_OVR_multiview2 spec only exposes
>+// GL_OVR_multiview2).
>+TEST_F(OVRMultiviewVertexShaderTest, InvalidMultiview2)
>+{
>+    const std::string &shaderString =
>+        "#version 300 es\n"
>+        "#extension GL_OVR_multiview : require\n"
>+        "layout(num_views = 2) in;\n"
>+        "void main()\n"
>+        "{\n"
>+        "    gl_Position.x = (gl_ViewID_OVR == 0u) ? 1.0 : 0.0;\n"
>+        "    gl_Position.yzw = vec3(0, 0, 1);\n"
>+        "}\n";
>+    if (compile(shaderString))
>+    {
>+        FAIL() << "Shader compilation succeeded, expecting failure:\n" << mInfoLog;
>+    }
>+}
>+
>+// Invalid combination of non-matching num_views declarations.
>+TEST_F(OVRMultiviewVertexShaderTest, InvalidNumViewsMismatch)
>+{
>+    const std::string &shaderString =
>+        "#version 300 es\n"
>+        "#extension GL_OVR_multiview2 : require\n"
>+        "layout(num_views = 2) in;\n"
>+        "layout(num_views = 1) in;\n"
>+        "void main()\n"
>+        "{\n"
>+        "    gl_Position.x = (gl_ViewID_OVR == 0u) ? 1.0 : 0.0;\n"
>+        "    gl_Position.yzw = vec3(0, 0, 1);\n"
>+        "}\n";
>+    if (compile(shaderString))
>+    {
>+        FAIL() << "Shader compilation succeeded, expecting failure:\n" << mInfoLog;
>+    }
>+}
>+
>+// Invalid value zero for num_views.
>+TEST_F(OVRMultiviewVertexShaderTest, InvalidNumViewsZero)
>+{
>+    const std::string &shaderString =
>+        "#version 300 es\n"
>+        "#extension GL_OVR_multiview2 : require\n"
>+        "layout(num_views = 0) in;\n"
>+        "void main()\n"
>+        "{\n"
>+        "    gl_Position.x = (gl_ViewID_OVR == 0u) ? 1.0 : 0.0;\n"
>+        "    gl_Position.yzw = vec3(0, 0, 1);\n"
>+        "}\n";
>+    if (compile(shaderString))
>+    {
>+        FAIL() << "Shader compilation succeeded, expecting failure:\n" << mInfoLog;
>+    }
>+}
>+
>+// Too large value for num_views.
>+TEST_F(OVRMultiviewVertexShaderTest, InvalidNumViewsGreaterThanMax)
>+{
>+    const std::string &shaderString =
>+        "#version 300 es\n"
>+        "#extension GL_OVR_multiview2 : require\n"
>+        "layout(num_views = 5) in;\n"
>+        "void main()\n"
>+        "{\n"
>+        "    gl_Position.x = (gl_ViewID_OVR == 0u) ? 1.0 : 0.0;\n"
>+        "    gl_Position.yzw = vec3(0, 0, 1);\n"
>+        "}\n";
>+    if (compile(shaderString))
>+    {
>+        FAIL() << "Shader compilation succeeded, expecting failure:\n" << mInfoLog;
>+    }
>+}
>+
>+// Valid use of gl_ViewID_OVR.
>+TEST_F(OVRMultiviewVertexShaderTest, ViewIDUsed)
>+{
>+    const std::string &shaderString =
>+        "#version 300 es\n"
>+        "#extension GL_OVR_multiview2 : require\n"
>+        "layout(num_views = 2) in;\n"
>+        "layout(num_views = 2) in;  // Duplicated on purpose\n"
>+        "in vec4 pos;\n"
>+        "out float myOutput;\n"
>+        "void main()\n"
>+        "{\n"
>+        "    if (gl_ViewID_OVR == 0u)\n"
>+        "    {\n"
>+        "        gl_Position = pos;\n"
>+        "        myOutput = 1.0;\n"
>+        "    }\n"
>+        "    else\n"
>+        "    {\n"
>+        "        gl_Position = pos + vec4(1.0, 0.0, 0.0, 0.0);\n"
>+        "        myOutput = 2.0;\n"
>+        "    }\n"
>+        "    gl_Position += (gl_ViewID_OVR == 0u) ? 1.0 : 0.0;\n"
>+        "}\n";
>+    if (!compile(shaderString))
>+    {
>+        FAIL() << "Shader compilation failed, expecting success:\n" << mInfoLog;
>+    }
>+}
>+
>+// Read gl_FragCoord in a OVR_multiview2 fragment shader.
>+TEST_F(OVRMultiviewFragmentShaderTest, ReadOfFragCoord)
>+{
>+    const std::string &shaderString =
>+        "#version 300 es\n"
>+        "#extension GL_OVR_multiview2 : require\n"
>+        "precision highp float;\n"
>+        "out vec4 outColor;\n"
>+        "void main()\n"
>+        "{\n"
>+        "    outColor = vec4(gl_FragCoord.xy, 0, 1);\n"
>+        "}\n";
>+    if (!compile(shaderString))
>+    {
>+        FAIL() << "Shader compilation failed, expecting success:\n" << mInfoLog;
>+    }
>+}
>+
>+// Read gl_ViewID_OVR in an OVR_multiview2 fragment shader.
>+TEST_F(OVRMultiviewFragmentShaderTest, ReadOfViewID)
>+{
>+    const std::string &shaderString =
>+        "#version 300 es\n"
>+        "#extension GL_OVR_multiview2 : require\n"
>+        "precision highp float;\n"
>+        "out vec4 outColor;\n"
>+        "void main()\n"
>+        "{\n"
>+        "    outColor = vec4(gl_ViewID_OVR, 0, 0, 1);\n"
>+        "}\n";
>+    if (!compile(shaderString))
>+    {
>+        FAIL() << "Shader compilation failed, expecting success:\n" << mInfoLog;
>+    }
>+}
>+
>+// Correct use of GL_OVR_multiview2 macro.
>+TEST_F(OVRMultiviewVertexShaderTest, UseOfExtensionMacro)
>+{
>+    const std::string &shaderString =
>+        "#version 300 es\n"
>+        "#ifdef GL_OVR_multiview2\n"
>+        "#if (GL_OVR_multiview2 == 1)\n"
>+        "void main()\n"
>+        "{\n"
>+        "    gl_Position = vec4(0.0, 0.0, 0.0, 1.0);\n"
>+        "}\n"
>+        "#endif\n"
>+        "#endif\n";
>+    if (!compile(shaderString))
>+    {
>+        FAIL() << "Shader compilation failed, expecting success:\n" << mInfoLog;
>+    }
>+}
>+
>+// Test that gl_ViewID_OVR can't be used as an l-value.
>+TEST_F(OVRMultiviewVertexShaderTest, ViewIdAsLValue)
>+{
>+    const std::string &shaderString =
>+        "#version 300 es\n"
>+        "#extension GL_OVR_multiview2 : require\n"
>+        "layout(num_views = 2) in;\n"
>+        "void foo(out uint u)\n"
>+        "{\n"
>+        "    u = 3u;\n"
>+        "}\n"
>+        "void main()\n"
>+        "{\n"
>+        "    foo(gl_ViewID_OVR);\n"
>+        "    gl_Position = vec4(0.0, 0.0, 0.0, 1.0);\n"
>+        "}\n";
>+    if (compile(shaderString))
>+    {
>+        FAIL() << "Shader compilation succeeded, expecting failure:\n" << mInfoLog;
>+    }
>+}
>+
>+// Test that compiling an ESSL 1.00 shader with multiview support fails.
>+TEST_F(OVRMultiviewVertexShaderTest, ESSL1Shader)
>+{
>+    const std::string &shaderString =
>+        "#extension GL_OVR_multiview2 : require\n"
>+        "layout(num_views = 2) in;\n"
>+        "void main()\n"
>+        "{\n"
>+        "    if (gl_ViewID_OVR == 0)\n"
>+        "    {\n"
>+        "        gl_Position = vec4(-1.0, 0.0, 0.0, 1.0);\n"
>+        "    }\n"
>+        "    else\n"
>+        "    {\n"
>+        "        gl_Position = vec4(1.0, 0.0, 0.0, 1.0);\n"
>+        "    }\n"
>+        "}\n";
>+    if (compile(shaderString))
>+    {
>+        FAIL() << "Shader compilation succeeded, expecting failure:\n" << mInfoLog;
>+    }
>+}
>+
>+// Test that compiling an ESSL 1.00 shader with an unsupported global layout qualifier fails.
>+TEST_F(OVRMultiviewVertexShaderTest, ESSL1ShaderUnsupportedGlobalLayoutQualifier)
>+{
>+    const std::string &shaderString =
>+        "#extension GL_OVR_multiview2 : require\n"
>+        "layout(num_views = 2) in;\n"
>+        "layout(std140) uniform;\n"
>+        "void main()\n"
>+        "{\n"
>+        "    if (gl_ViewID_OVR == 0)\n"
>+        "    {\n"
>+        "        gl_Position = vec4(-1.0, 0.0, 0.0, 1.0);\n"
>+        "    }\n"
>+        "    else\n"
>+        "    {\n"
>+        "        gl_Position = vec4(1.0, 0.0, 0.0, 1.0);\n"
>+        "    }\n"
>+        "}\n";
>+    if (compile(shaderString))
>+    {
>+        FAIL() << "Shader compilation succeeded, expecting failure:\n" << mInfoLog;
>+    }
>+}
>+
>+// Test that compiling an ESSL 1.00 vertex shader with an unsupported input storage qualifier fails.
>+TEST_F(OVRMultiviewVertexShaderTest, ESSL1ShaderUnsupportedInputStorageQualifier)
>+{
>+    const std::string &shaderString =
>+        "#extension GL_OVR_multiview2 : require\n"
>+        "layout(num_views = 2) in;\n"
>+        "in vec4 pos;\n"
>+        "void main()\n"
>+        "{\n"
>+        "    if (gl_ViewID_OVR == 0)\n"
>+        "    {\n"
>+        "        gl_Position = vec4(-1.0, 0.0, 0.0, 1.0);\n"
>+        "    }\n"
>+        "    else\n"
>+        "    {\n"
>+        "        gl_Position = vec4(1.0, 0.0, 0.0, 1.0);\n"
>+        "    }\n"
>+        "}\n";
>+    if (compile(shaderString))
>+    {
>+        FAIL() << "Shader compilation succeeded, expecting failure:\n" << mInfoLog;
>+    }
>+}
>+
>+// Test that compiling an ESSL 1.00 fragment shader with an unsupported input storage qualifier
>+// fails.
>+TEST_F(OVRMultiviewFragmentShaderTest, ESSL1ShaderUnsupportedInStorageQualifier)
>+{
>+    const std::string &shaderString =
>+        "#extension GL_OVR_multiview2 : require\n"
>+        "precision highp float;\n"
>+        "in vec4 color;\n"
>+        "void main()\n"
>+        "{\n"
>+        "    if (gl_ViewID_OVR == 0)\n"
>+        "    {\n"
>+        "        gl_FragColor = color;\n"
>+        "    }\n"
>+        "    else\n"
>+        "    {\n"
>+        "        gl_FragColor = color + vec4(1.0, 0.0, 0.0, 1.0);\n"
>+        "    }\n"
>+        "}\n";
>+    if (compile(shaderString))
>+    {
>+        FAIL() << "Shader compilation succeeded, expecting failure:\n" << mInfoLog;
>+    }
>+}
>+
>+// Test that gl_InstanceID gets correctly replaced by InstanceID. gl_InstanceID should only be used
>+// twice: once to initialize ViewID_OVR and once for InstanceID. The number of occurrences of
>+// InstanceID in the AST should be the sum of two and the number of occurrences of gl_InstanceID
>+// before any renaming.
>+TEST_F(OVRMultiviewVertexShaderTest, GLInstanceIDIsRenamed)
>+{
>+    const std::string &shaderString =
>+        "#version 300 es\n"
>+        "#extension GL_OVR_multiview2 : require\n"
>+        "layout(num_views = 2) in;\n"
>+        "flat out int myInstance;\n"
>+        "out float myInstanceF;\n"
>+        "out float myInstanceF2;\n"
>+        "void main()\n"
>+        "{\n"
>+        "   gl_Position.x = gl_ViewID_OVR == 0u ? 0. : 1.;\n"
>+        "   gl_Position.yzw = vec3(0., 0., 1.);\n"
>+        "   myInstance = gl_InstanceID;\n"
>+        "   myInstanceF = float(gl_InstanceID) + .5;\n"
>+        "   myInstanceF2 = float(gl_InstanceID) + .1;\n"
>+        "}\n";
>+    mExtraCompileOptions |= SH_INITIALIZE_BUILTINS_FOR_INSTANCED_MULTIVIEW;
>+    compileAssumeSuccess(shaderString);
>+
>+    SymbolOccurrenceCounterByName glInstanceIDByName(ImmutableString("gl_InstanceID"));
>+    mASTRoot->traverse(&glInstanceIDByName);
>+    EXPECT_EQ(2u, glInstanceIDByName.getNumberOfOccurrences());
>+
>+    SymbolOccurrenceCounterByQualifier glInstanceIDByQualifier(EvqInstanceID);
>+    mASTRoot->traverse(&glInstanceIDByQualifier);
>+    EXPECT_EQ(2u, glInstanceIDByQualifier.getNumberOfOccurrences());
>+
>+    SymbolOccurrenceCounterByName instanceIDByName(ImmutableString("InstanceID"));
>+    mASTRoot->traverse(&instanceIDByName);
>+    EXPECT_EQ(5u, instanceIDByName.getNumberOfOccurrences());
>+}
>+
>+// Test that gl_ViewID_OVR gets correctly replaced by ViewID_OVR. gl_ViewID_OVR should not be found
>+// by either name or qualifier. The number of occurrences of ViewID_OVR in the AST should be the sum
>+// of two and the number of occurrences of gl_ViewID_OVR before any renaming.
>+TEST_F(OVRMultiviewVertexShaderTest, GLViewIDIsRenamed)
>+{
>+    const std::string &shaderString =
>+        "#version 300 es\n"
>+        "#extension GL_OVR_multiview2 : require\n"
>+        "layout(num_views = 2) in;\n"
>+        "flat out uint a;\n"
>+        "void main()\n"
>+        "{\n"
>+        "   gl_Position.x = gl_ViewID_OVR == 0u ? 0. : 1.;\n"
>+        "   gl_Position.yzw = vec3(0., 0., 1.);\n"
>+        "   a = gl_ViewID_OVR == 0u ? (gl_ViewID_OVR+2u) : gl_ViewID_OVR;\n"
>+        "}\n";
>+    mExtraCompileOptions |= SH_INITIALIZE_BUILTINS_FOR_INSTANCED_MULTIVIEW;
>+    compileAssumeSuccess(shaderString);
>+
>+    SymbolOccurrenceCounterByName glViewIDOVRByName(ImmutableString("gl_ViewID_OVR"));
>+    mASTRoot->traverse(&glViewIDOVRByName);
>+    EXPECT_EQ(0u, glViewIDOVRByName.getNumberOfOccurrences());
>+
>+    SymbolOccurrenceCounterByQualifier glViewIDOVRByQualifier(EvqViewIDOVR);
>+    mASTRoot->traverse(&glViewIDOVRByQualifier);
>+    EXPECT_EQ(0u, glViewIDOVRByQualifier.getNumberOfOccurrences());
>+
>+    SymbolOccurrenceCounterByNameAndQualifier viewIDByNameAndQualifier(
>+        ImmutableString("ViewID_OVR"), EvqFlatOut);
>+    mASTRoot->traverse(&viewIDByNameAndQualifier);
>+    EXPECT_EQ(6u, viewIDByNameAndQualifier.getNumberOfOccurrences());
>+}
>+
>+// The test checks that ViewID_OVR and InstanceID have the correct initializers based on the
>+// number of views.
>+TEST_F(OVRMultiviewVertexShaderOutputCodeTest, ViewIDAndInstanceIDHaveCorrectValues)
>+{
>+    const std::string &shaderString =
>+        "#version 300 es\n"
>+        "#extension GL_OVR_multiview2 : require\n"
>+        "layout(num_views = 3) in;\n"
>+        "flat out int myInstance;\n"
>+        "void main()\n"
>+        "{\n"
>+        "   gl_Position.x = gl_ViewID_OVR == 0u ? 0. : 1.;\n"
>+        "   gl_Position.yzw = vec3(0., 0., 1.);\n"
>+        "   myInstance = gl_InstanceID;\n"
>+        "}\n";
>+    requestHLSLOutput();
>+    compile(shaderString, SH_INITIALIZE_BUILTINS_FOR_INSTANCED_MULTIVIEW);
>+
>+    EXPECT_TRUE(foundInAllGLSLCode("ViewID_OVR = (uint(gl_InstanceID) % 3u)"));
>+    EXPECT_TRUE(foundInAllGLSLCode("InstanceID = int((uint(gl_InstanceID) / 3u))"));
>+
>+    EXPECT_TRUE(foundInHLSLCode("ViewID_OVR = (uint_ctor(gl_InstanceID) % 3)"));
>+#if defined(ANGLE_ENABLE_HLSL)
>+    EXPECT_FALSE(foundInHLSLCode("_ViewID_OVR = (uint_ctor(gl_InstanceID) % 3)"));
>+#endif
>+    EXPECT_TRUE(foundInHLSLCode("InstanceID = int_ctor((uint_ctor(gl_InstanceID) / 3))"));
>+}
>+
>+// The test checks that the directive enabling GL_OVR_multiview2 is not outputted if the extension
>+// is emulated.
>+TEST_F(OVRMultiviewVertexShaderOutputCodeTest, StrippedOVRMultiviewDirective)
>+{
>+    const std::string &shaderString =
>+        "#version 300 es\n"
>+        "#extension GL_OVR_multiview2 : require\n"
>+        "layout(num_views = 3) in;\n"
>+        "void main()\n"
>+        "{\n"
>+        "}\n";
>+    // The directive must not be present if any of the multiview emulation options are set.
>+    compile(shaderString, SH_INITIALIZE_BUILTINS_FOR_INSTANCED_MULTIVIEW);
>+    EXPECT_FALSE(foundInESSLCode("GL_OVR_multiview2"));
>+    EXPECT_FALSE(foundInGLSLCode("GL_OVR_multiview2"));
>+
>+    // The directive should be outputted from the ESSL translator with none of the options being
>+    // set.
>+    compile(shaderString);
>+    EXPECT_TRUE(foundInESSLCode("GL_OVR_multiview2"));
>+}
>+
>+// Test that ViewID_OVR is declared as a flat input variable in an ESSL 3.00 fragment shader.
>+TEST_F(OVRMultiviewFragmentShaderTest, ViewIDDeclaredAsFlatInput)
>+{
>+    const std::string &shaderString =
>+        "#version 300 es\n"
>+        "#extension GL_OVR_multiview2 : require\n"
>+        "void main()\n"
>+        "{\n"
>+        "}\n";
>+    mExtraCompileOptions |= SH_INITIALIZE_BUILTINS_FOR_INSTANCED_MULTIVIEW;
>+    compileAssumeSuccess(shaderString);
>+    VariableOccursNTimes(mASTRoot, ImmutableString("ViewID_OVR"), EvqFlatIn, 1u);
>+}
>+
>+// Test that ViewID_OVR is declared as a flat output variable in an ESSL 1.00 vertex shader.
>+TEST_F(OVRMultiviewVertexShaderTest, ViewIDDeclaredAsFlatOutput)
>+{
>+    const std::string &shaderString =
>+        "#extension GL_OVR_multiview2 : require\n"
>+        "void main()\n"
>+        "{\n"
>+        "}\n";
>+    mExtraCompileOptions |= SH_INITIALIZE_BUILTINS_FOR_INSTANCED_MULTIVIEW;
>+    compileAssumeSuccess(shaderString);
>+    VariableOccursNTimes(mASTRoot, ImmutableString("ViewID_OVR"), EvqFlatOut, 2u);
>+}
>+
>+// The test checks that the GL_NV_viewport_array2 extension is emitted in a vertex shader if the
>+// SH_SELECT_VIEW_IN_NV_GLSL_VERTEX_SHADER option is set.
>+TEST_F(OVRMultiviewVertexShaderOutputCodeTest, ViewportArray2IsEmitted)
>+{
>+    const std::string &shaderString =
>+        "#version 300 es\n"
>+        "#extension GL_OVR_multiview2 : require\n"
>+        "layout(num_views = 3) in;\n"
>+        "void main()\n"
>+        "{\n"
>+        "}\n";
>+    compile(shaderString, SH_INITIALIZE_BUILTINS_FOR_INSTANCED_MULTIVIEW |
>+                              SH_SELECT_VIEW_IN_NV_GLSL_VERTEX_SHADER);
>+    EXPECT_TRUE(foundInAllGLSLCode("#extension GL_NV_viewport_array2 : require"));
>+}
>+
>+// The test checks that the GL_NV_viewport_array2 extension is not emitted in a vertex shader if the
>+// OVR_multiview2 extension is not requested in the shader source even if the
>+// SH_SELECT_VIEW_IN_NV_GLSL_VERTEX_SHADER option is set.
>+TEST_F(OVRMultiviewVertexShaderOutputCodeTest, ViewportArray2IsNotEmitted)
>+{
>+    const std::string &shaderString =
>+        "#version 300 es\n"
>+        "void main()\n"
>+        "{\n"
>+        "}\n";
>+    compile(shaderString, SH_INITIALIZE_BUILTINS_FOR_INSTANCED_MULTIVIEW |
>+                              SH_SELECT_VIEW_IN_NV_GLSL_VERTEX_SHADER);
>+    EXPECT_FALSE(foundInGLSLCode("#extension GL_NV_viewport_array2"));
>+    EXPECT_FALSE(foundInESSLCode("#extension GL_NV_viewport_array2"));
>+}
>+
>+// The test checks that the GL_NV_viewport_array2 extension is not emitted in a fragment shader if
>+// the SH_SELECT_VIEW_IN_NV_GLSL_VERTEX_SHADER option is set.
>+TEST_F(OVRMultiviewFragmentShaderOutputCodeTest, ViewportArray2IsNotEmitted)
>+{
>+    const std::string &shaderString =
>+        "#version 300 es\n"
>+        "#extension GL_OVR_multiview2 : require\n"
>+        "void main()\n"
>+        "{\n"
>+        "}\n";
>+    compile(shaderString, SH_INITIALIZE_BUILTINS_FOR_INSTANCED_MULTIVIEW |
>+                              SH_SELECT_VIEW_IN_NV_GLSL_VERTEX_SHADER);
>+    EXPECT_FALSE(foundInGLSLCode("#extension GL_NV_viewport_array2"));
>+    EXPECT_FALSE(foundInESSLCode("#extension GL_NV_viewport_array2"));
>+}
>+
>+// The test checks that the GL_NV_viewport_array2 extension is not emitted in a compute shader if
>+// the SH_SELECT_VIEW_IN_NV_GLSL_VERTEX_SHADER option is set.
>+TEST_F(OVRMultiviewComputeShaderOutputCodeTest, ViewportArray2IsNotEmitted)
>+{
>+    const std::string &shaderString =
>+        R"(#version 310 es
>+        #extension GL_OVR_multiview2 : require
>+        void main()
>+        {
>+        })";
>+    compile(shaderString, SH_INITIALIZE_BUILTINS_FOR_INSTANCED_MULTIVIEW |
>+                              SH_SELECT_VIEW_IN_NV_GLSL_VERTEX_SHADER);
>+    EXPECT_FALSE(foundInGLSLCode("#extension GL_NV_viewport_array2"));
>+    EXPECT_FALSE(foundInESSLCode("#extension GL_NV_viewport_array2"));
>+}
>+
>+// The test checks that the viewport index is selected after the initialization of ViewID_OVR for
>+// GLSL and ESSL ouputs.
>+TEST_F(OVRMultiviewVertexShaderOutputCodeTest, GlViewportIndexIsSet)
>+{
>+    const std::string &shaderString =
>+        "#version 300 es\n"
>+        "#extension GL_OVR_multiview2 : require\n"
>+        "layout(num_views = 3) in;\n"
>+        "void main()\n"
>+        "{\n"
>+        "}\n";
>+    compile(shaderString, SH_INITIALIZE_BUILTINS_FOR_INSTANCED_MULTIVIEW |
>+                              SH_SELECT_VIEW_IN_NV_GLSL_VERTEX_SHADER);
>+
>+    std::vector<const char *> expectedStrings = {"ViewID_OVR = (uint(gl_InstanceID) % 3u)",
>+                                                 "gl_ViewportIndex = int(ViewID_OVR)"};
>+    EXPECT_TRUE(foundInCodeInOrder(SH_ESSL_OUTPUT, expectedStrings));
>+    EXPECT_TRUE(foundInCodeInOrder(SH_GLSL_COMPATIBILITY_OUTPUT, expectedStrings));
>+}
>+
>+// The test checks that the layer is selected after the initialization of ViewID_OVR for
>+// GLSL and ESSL ouputs.
>+TEST_F(OVRMultiviewVertexShaderOutputCodeTest, GlLayerIsSet)
>+{
>+    const std::string &shaderString =
>+        "#version 300 es\n"
>+        "#extension GL_OVR_multiview2 : require\n"
>+        "layout(num_views = 3) in;\n"
>+        "void main()\n"
>+        "{\n"
>+        "}\n";
>+    compile(shaderString, SH_INITIALIZE_BUILTINS_FOR_INSTANCED_MULTIVIEW |
>+                              SH_SELECT_VIEW_IN_NV_GLSL_VERTEX_SHADER);
>+
>+    std::vector<const char *> expectedStrings = {
>+        "ViewID_OVR = (uint(gl_InstanceID) % 3u)",
>+        "gl_Layer = (int(ViewID_OVR) + multiviewBaseViewLayerIndex)"};
>+    EXPECT_TRUE(foundInCodeInOrder(SH_ESSL_OUTPUT, expectedStrings));
>+    EXPECT_TRUE(foundInCodeInOrder(SH_GLSL_COMPATIBILITY_OUTPUT, expectedStrings));
>+}
>+
>+}  // namespace
>\ No newline at end of file
>diff --git a/Source/ThirdParty/ANGLE/src/tests/compiler_tests/Pack_Unpack_test.cpp b/Source/ThirdParty/ANGLE/src/tests/compiler_tests/Pack_Unpack_test.cpp
>index bc87e95c024..512538972c1 100644
>--- a/Source/ThirdParty/ANGLE/src/tests/compiler_tests/Pack_Unpack_test.cpp
>+++ b/Source/ThirdParty/ANGLE/src/tests/compiler_tests/Pack_Unpack_test.cpp
>@@ -7,9 +7,9 @@
> //   Tests for the emulating pack_unpack functions for GLSL.
> //
> 
>+#include "GLSLANG/ShaderLang.h"
> #include "angle_gl.h"
> #include "gtest/gtest.h"
>-#include "GLSLANG/ShaderLang.h"
> #include "tests/test_utils/compiler_test.h"
> 
> using namespace sh;
>@@ -125,4 +125,4 @@ TEST_F(PackUnpackTest, UnpackHalf2x16Emulation)
>     ASSERT_TRUE(foundInCode("vec2 unpackHalf2x16_emu(uint u)"));
> }
> 
>-} // namespace
>+}  // namespace
>diff --git a/Source/ThirdParty/ANGLE/src/tests/compiler_tests/PruneEmptyCases_test.cpp b/Source/ThirdParty/ANGLE/src/tests/compiler_tests/PruneEmptyCases_test.cpp
>new file mode 100644
>index 00000000000..c4b0c412540
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/tests/compiler_tests/PruneEmptyCases_test.cpp
>@@ -0,0 +1,114 @@
>+//
>+// Copyright (c) 2018 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// PruneEmptyCases_test.cpp:
>+//   Tests for pruning empty cases and switch statements. This ensures that the translator doesn't
>+//   produce switch statements where the last case statement is not followed by anything.
>+//
>+
>+#include "GLSLANG/ShaderLang.h"
>+#include "angle_gl.h"
>+#include "gtest/gtest.h"
>+#include "tests/test_utils/compiler_test.h"
>+
>+using namespace sh;
>+
>+namespace
>+{
>+
>+class PruneEmptyCasesTest : public MatchOutputCodeTest
>+{
>+  public:
>+    PruneEmptyCasesTest() : MatchOutputCodeTest(GL_FRAGMENT_SHADER, 0, SH_GLSL_COMPATIBILITY_OUTPUT)
>+    {}
>+};
>+
>+// Test that a switch statement that only contains no-ops is pruned entirely.
>+TEST_F(PruneEmptyCasesTest, SwitchStatementWithOnlyNoOps)
>+{
>+    const std::string shaderString =
>+        R"(#version 300 es
>+
>+        uniform int ui;
>+
>+        void main(void)
>+        {
>+            int i = ui;
>+            switch (i)
>+            {
>+                case 0:
>+                case 1:
>+                    { {} }
>+                    int j;
>+                    1;
>+            }
>+        })";
>+    compile(shaderString);
>+    ASSERT_TRUE(notFoundInCode("switch"));
>+    ASSERT_TRUE(notFoundInCode("case"));
>+}
>+
>+// Test that a init statement that has a side effect is preserved even if the switch is pruned.
>+TEST_F(PruneEmptyCasesTest, SwitchStatementWithOnlyNoOpsAndInitWithSideEffect)
>+{
>+    const std::string shaderString =
>+        R"(#version 300 es
>+
>+        precision mediump float;
>+        out vec4 my_FragColor;
>+
>+        uniform int uni_i;
>+
>+        void main(void)
>+        {
>+            int i = uni_i;
>+            switch (++i)
>+            {
>+                case 0:
>+                case 1:
>+                    { {} }
>+                    int j;
>+                    1;
>+            }
>+            my_FragColor = vec4(i);
>+        })";
>+    compile(shaderString);
>+    ASSERT_TRUE(notFoundInCode("switch"));
>+    ASSERT_TRUE(notFoundInCode("case"));
>+    ASSERT_TRUE(foundInCode("++_ui"));
>+}
>+
>+// Test a switch statement where the last case only contains no-ops.
>+TEST_F(PruneEmptyCasesTest, SwitchStatementLastCaseOnlyNoOps)
>+{
>+    const std::string shaderString =
>+        R"(#version 300 es
>+
>+        precision mediump float;
>+        out vec4 my_FragColor;
>+
>+        uniform int ui;
>+
>+        void main(void)
>+        {
>+            int i = ui;
>+            switch (i)
>+            {
>+                case 0:
>+                    my_FragColor = vec4(0);
>+                    break;
>+                case 1:
>+                case 2:
>+                    { {} }
>+                    int j;
>+                    1;
>+            }
>+        })";
>+    compile(shaderString);
>+    ASSERT_TRUE(foundInCode("switch"));
>+    ASSERT_TRUE(foundInCode("case", 1));
>+}
>+
>+}  // namespace
>diff --git a/Source/ThirdParty/ANGLE/src/tests/compiler_tests/PruneEmptyDeclarations_test.cpp b/Source/ThirdParty/ANGLE/src/tests/compiler_tests/PruneEmptyDeclarations_test.cpp
>index 8ff49f41f32..214d810f28a 100644
>--- a/Source/ThirdParty/ANGLE/src/tests/compiler_tests/PruneEmptyDeclarations_test.cpp
>+++ b/Source/ThirdParty/ANGLE/src/tests/compiler_tests/PruneEmptyDeclarations_test.cpp
>@@ -7,9 +7,9 @@
> //   Tests for pruning empty declarations.
> //
> 
>+#include "GLSLANG/ShaderLang.h"
> #include "angle_gl.h"
> #include "gtest/gtest.h"
>-#include "GLSLANG/ShaderLang.h"
> #include "tests/test_utils/compiler_test.h"
> 
> using namespace sh;
>@@ -22,8 +22,7 @@ class PruneEmptyDeclarationsTest : public MatchOutputCodeTest
>   public:
>     PruneEmptyDeclarationsTest()
>         : MatchOutputCodeTest(GL_VERTEX_SHADER, 0, SH_GLSL_COMPATIBILITY_OUTPUT)
>-    {
>-    }
>+    {}
> };
> 
> TEST_F(PruneEmptyDeclarationsTest, EmptyDeclarationStartsDeclaratorList)
>diff --git a/Source/ThirdParty/ANGLE/src/tests/compiler_tests/PrunePureLiteralStatements_test.cpp b/Source/ThirdParty/ANGLE/src/tests/compiler_tests/PrunePureLiteralStatements_test.cpp
>index 70a975f8b24..5db941a6e8a 100644
>--- a/Source/ThirdParty/ANGLE/src/tests/compiler_tests/PrunePureLiteralStatements_test.cpp
>+++ b/Source/ThirdParty/ANGLE/src/tests/compiler_tests/PrunePureLiteralStatements_test.cpp
>@@ -148,7 +148,8 @@ TEST_F(PrunePureLiteralStatementsTest, SwitchLiteralExpressionOnlyLastCase)
>     ASSERT_TRUE(notFoundInCode("42"));
> }
> 
>-// Test that the pruning correctly handles the pruning inside switch statements - pruning isn't stopped by literal statements
>+// Test that the pruning correctly handles the pruning inside switch statements - pruning isn't
>+// stopped by literal statements
> TEST_F(PrunePureLiteralStatementsTest, SwitchLiteralExpressionLiteralDoesntStop)
> {
>     const std::string shaderString =
>diff --git a/Source/ThirdParty/ANGLE/src/tests/compiler_tests/PruneUnusedFunctions_test.cpp b/Source/ThirdParty/ANGLE/src/tests/compiler_tests/PruneUnusedFunctions_test.cpp
>index d9ccedcd569..817ae9c2fbc 100644
>--- a/Source/ThirdParty/ANGLE/src/tests/compiler_tests/PruneUnusedFunctions_test.cpp
>+++ b/Source/ThirdParty/ANGLE/src/tests/compiler_tests/PruneUnusedFunctions_test.cpp
>@@ -7,9 +7,9 @@
> //   Test for the pruning of unused function with the SH_PRUNE_UNUSED_FUNCTIONS compile flag
> //
> 
>+#include "GLSLANG/ShaderLang.h"
> #include "angle_gl.h"
> #include "gtest/gtest.h"
>-#include "GLSLANG/ShaderLang.h"
> #include "tests/test_utils/compiler_test.h"
> 
> using namespace sh;
>@@ -90,4 +90,4 @@ TEST_F(PruneUnusedFunctionsTest, UsedFunction)
>     EXPECT_TRUE(foundInCode("main(", 1));
> }
> 
>-}
>+}  // namespace
>diff --git a/Source/ThirdParty/ANGLE/src/tests/compiler_tests/QualificationOrderESSL31_test.cpp b/Source/ThirdParty/ANGLE/src/tests/compiler_tests/QualificationOrderESSL31_test.cpp
>index 8dfff08cd8e..11ee4f1eb52 100644
>--- a/Source/ThirdParty/ANGLE/src/tests/compiler_tests/QualificationOrderESSL31_test.cpp
>+++ b/Source/ThirdParty/ANGLE/src/tests/compiler_tests/QualificationOrderESSL31_test.cpp
>@@ -9,11 +9,11 @@
> 
> #include "gtest/gtest.h"
> 
>+#include "GLSLANG/ShaderLang.h"
> #include "angle_gl.h"
> #include "compiler/translator/TranslatorESSL.h"
>-#include "GLSLANG/ShaderLang.h"
>-#include "tests/test_utils/compiler_test.h"
> #include "tests/test_utils/ShaderCompileTreeTest.h"
>+#include "tests/test_utils/compiler_test.h"
> 
> using namespace sh;
> 
>@@ -21,13 +21,14 @@ class QualificationVertexShaderTestESSL31 : public ShaderCompileTreeTest
> {
>   public:
>     QualificationVertexShaderTestESSL31() {}
>+
>   protected:
>     ::GLenum getShaderType() const override { return GL_VERTEX_SHADER; }
>     ShShaderSpec getShaderSpec() const override { return SH_GLES3_1_SPEC; }
> 
>-    const TIntermSymbol *findSymbolInAST(const TString &symbolName, TBasicType basicType)
>+    const TIntermSymbol *findSymbolInAST(const ImmutableString &symbolName)
>     {
>-        return FindSymbolNode(mASTRoot, symbolName, basicType);
>+        return FindSymbolNode(mASTRoot, symbolName);
>     }
> };
> 
>@@ -47,7 +48,7 @@ TEST_F(QualificationVertexShaderTestESSL31, CentroidOut)
>     }
>     else
>     {
>-        const TIntermSymbol *node = findSymbolInAST("something", EbtFloat);
>+        const TIntermSymbol *node = findSymbolInAST(ImmutableString("something"));
>         ASSERT_NE(nullptr, node);
> 
>         const TType &type = node->getType();
>@@ -70,7 +71,7 @@ TEST_F(QualificationVertexShaderTestESSL31, AllQualifiersMixed)
>     }
>     else
>     {
>-        const TIntermSymbol *node = findSymbolInAST("something", EbtFloat);
>+        const TIntermSymbol *node = findSymbolInAST(ImmutableString("something"));
>         ASSERT_NE(nullptr, node);
> 
>         const TType &type = node->getType();
>@@ -95,7 +96,7 @@ TEST_F(QualificationVertexShaderTestESSL31, MultipleLayouts)
>     }
>     else
>     {
>-        const TIntermSymbol *node = findSymbolInAST("something", EbtFloat);
>+        const TIntermSymbol *node = findSymbolInAST(ImmutableString("something"));
>         ASSERT_NE(nullptr, node);
> 
>         const TType &type = node->getType();
>@@ -122,7 +123,7 @@ TEST_F(QualificationVertexShaderTestESSL31, MultipleLayoutsInterfaceBlock)
>     }
>     else
>     {
>-        const TIntermSymbol *node = findSymbolInAST("MyInterfaceName", EbtInterfaceBlock);
>+        const TIntermSymbol *node = findSymbolInAST(ImmutableString("MyInterfaceName"));
>         ASSERT_NE(nullptr, node);
> 
>         const TType &type                = node->getType();
>@@ -150,7 +151,7 @@ TEST_F(QualificationVertexShaderTestESSL31, MultipleLayoutsInterfaceBlock2)
>     }
>     else
>     {
>-        const TIntermSymbol *node = findSymbolInAST("MyInterfaceName", EbtInterfaceBlock);
>+        const TIntermSymbol *node = findSymbolInAST(ImmutableString("MyInterfaceName"));
>         ASSERT_NE(nullptr, node);
> 
>         const TType &type                = node->getType();
>diff --git a/Source/ThirdParty/ANGLE/src/tests/compiler_tests/QualificationOrder_test.cpp b/Source/ThirdParty/ANGLE/src/tests/compiler_tests/QualificationOrder_test.cpp
>index c82acffd76a..c0249dbb93b 100644
>--- a/Source/ThirdParty/ANGLE/src/tests/compiler_tests/QualificationOrder_test.cpp
>+++ b/Source/ThirdParty/ANGLE/src/tests/compiler_tests/QualificationOrder_test.cpp
>@@ -429,7 +429,7 @@ TEST_F(QualificationOrderFragmentShaderTest, InvalidFunctionParametersInvariant)
>         "}\n"
>         "void main()\n"
>         "{\n"
>-        "   gl_FragColor = vec4(foo0(value));\n"
>+        "	gl_FragColor = vec4(foo0(value));\n"
>         "}\n";
> 
>     if (compile(shaderString))
>@@ -449,7 +449,7 @@ TEST_F(QualificationOrderFragmentShaderTest, InvalidFunctionParametersAttribute)
>         "}\n"
>         "void main()\n"
>         "{\n"
>-        "   gl_FragColor = vec4(foo0(value));\n"
>+        "	gl_FragColor = vec4(foo0(value));\n"
>         "}\n";
> 
>     if (compile(shaderString))
>@@ -469,7 +469,7 @@ TEST_F(QualificationOrderFragmentShaderTest, InvalidFunctionParametersVarying)
>         "}\n"
>         "void main()\n"
>         "{\n"
>-        "   gl_FragColor = vec4(foo0(value));\n"
>+        "	gl_FragColor = vec4(foo0(value));\n"
>         "}\n";
> 
>     if (compile(shaderString))
>@@ -491,7 +491,7 @@ TEST_F(QualificationOrderFragmentShaderTest, InvalidFunctionParametersLayout)
>         "out vec4 colorOUT;\n"
>         "void main()\n"
>         "{\n"
>-        "   colorOUT = vec4(foo0(value));\n"
>+        "	colorOUT = vec4(foo0(value));\n"
>         "}\n";
> 
>     if (compile(shaderString))
>@@ -513,7 +513,7 @@ TEST_F(QualificationOrderFragmentShaderTest, InvalidFunctionParametersCentroidIn
>         "out vec4 colorOUT;\n"
>         "void main()\n"
>         "{\n"
>-        "   colorOUT = vec4(foo0(value));\n"
>+        "	colorOUT = vec4(foo0(value));\n"
>         "}\n";
> 
>     if (compile(shaderString))
>@@ -535,7 +535,7 @@ TEST_F(QualificationOrderFragmentShaderTest, InvalidFunctionParametersFlatIn)
>         "out vec4 colorOUT;\n"
>         "void main()\n"
>         "{\n"
>-        "   colorOUT = vec4(foo0(value));\n"
>+        "	colorOUT = vec4(foo0(value));\n"
>         "}\n";
> 
>     if (compile(shaderString))
>diff --git a/Source/ThirdParty/ANGLE/src/tests/compiler_tests/RecordConstantPrecision_test.cpp b/Source/ThirdParty/ANGLE/src/tests/compiler_tests/RecordConstantPrecision_test.cpp
>index 3aa7e50a6b0..29bd6f1b03a 100644
>--- a/Source/ThirdParty/ANGLE/src/tests/compiler_tests/RecordConstantPrecision_test.cpp
>+++ b/Source/ThirdParty/ANGLE/src/tests/compiler_tests/RecordConstantPrecision_test.cpp
>@@ -7,9 +7,9 @@
> //   Test for recording constant variable precision when it affects consuming expression.
> //
> 
>+#include "GLSLANG/ShaderLang.h"
> #include "angle_gl.h"
> #include "gtest/gtest.h"
>-#include "GLSLANG/ShaderLang.h"
> #include "tests/test_utils/compiler_test.h"
> 
> using namespace sh;
>@@ -74,7 +74,6 @@ TEST_F(RecordConstantPrecisionTest, FoldedBinaryConstantPrecisionIsHigher)
>     ASSERT_FALSE(foundInCode("fract((4096.5"));
> }
> 
>-
> // The constant cannot be folded if its precision is higher than the other operands, since it
> // increases the precision of the consuming expression. This applies also when the constant is
> // part of a constant expression that can be folded.
>diff --git a/Source/ThirdParty/ANGLE/src/tests/compiler_tests/RegenerateStructNames_test.cpp b/Source/ThirdParty/ANGLE/src/tests/compiler_tests/RegenerateStructNames_test.cpp
>new file mode 100644
>index 00000000000..6dc069553b2
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/tests/compiler_tests/RegenerateStructNames_test.cpp
>@@ -0,0 +1,73 @@
>+//
>+// Copyright (c) 2017 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// RegenerateStructNames_test.cpp:
>+//   Tests for regenerating struct names.
>+//
>+
>+#include "GLSLANG/ShaderLang.h"
>+#include "angle_gl.h"
>+#include "gtest/gtest.h"
>+#include "tests/test_utils/compiler_test.h"
>+
>+using namespace sh;
>+
>+class RegenerateStructNamesTest : public MatchOutputCodeTest
>+{
>+  public:
>+    RegenerateStructNamesTest()
>+        : MatchOutputCodeTest(GL_FRAGMENT_SHADER, SH_REGENERATE_STRUCT_NAMES, SH_ESSL_OUTPUT)
>+    {}
>+};
>+
>+// Test that a struct defined in a function scope is renamed. The global struct that's used as a
>+// type of a uniform cannot be renamed.
>+TEST_F(RegenerateStructNamesTest, GlobalStructAndLocalStructWithTheSameName)
>+{
>+    const std::string &shaderString =
>+        R"(precision mediump float;
>+
>+        struct myStruct
>+        {
>+            float foo;
>+        };
>+
>+        uniform myStruct us;
>+
>+        void main()
>+        {
>+            struct myStruct
>+            {
>+                vec2 bar;
>+            };
>+            myStruct scoped;
>+            scoped.bar = vec2(1.0, 2.0) * us.foo;
>+            gl_FragColor = vec4(scoped.bar, 0.0, 1.0);
>+        })";
>+    compile(shaderString);
>+    EXPECT_TRUE(foundInCode("struct _umyStruct"));
>+    EXPECT_TRUE(foundInCode("struct _u_webgl_struct_"));
>+}
>+
>+// Test that a nameless struct is handled gracefully.
>+TEST_F(RegenerateStructNamesTest, NamelessStruct)
>+{
>+    const std::string &shaderString =
>+        R"(precision mediump float;
>+
>+        uniform float u;
>+
>+        void main()
>+        {
>+            struct
>+            {
>+                vec2 bar;
>+            } scoped;
>+            scoped.bar = vec2(1.0, 2.0) * u;
>+            gl_FragColor = vec4(scoped.bar, 0.0, 1.0);
>+        })";
>+    compile(shaderString);
>+    EXPECT_TRUE(foundInCode("struct"));
>+}
>diff --git a/Source/ThirdParty/ANGLE/src/tests/compiler_tests/RemovePow_test.cpp b/Source/ThirdParty/ANGLE/src/tests/compiler_tests/RemovePow_test.cpp
>index 8367ac74568..ecce96efcf9 100644
>--- a/Source/ThirdParty/ANGLE/src/tests/compiler_tests/RemovePow_test.cpp
>+++ b/Source/ThirdParty/ANGLE/src/tests/compiler_tests/RemovePow_test.cpp
>@@ -7,11 +7,11 @@
> //   Tests for removing pow() function calls from the AST.
> //
> 
>-#include "angle_gl.h"
>-#include "gtest/gtest.h"
> #include "GLSLANG/ShaderLang.h"
>-#include "compiler/translator/NodeSearch.h"
>+#include "angle_gl.h"
> #include "compiler/translator/TranslatorGLSL.h"
>+#include "compiler/translator/tree_util/NodeSearch.h"
>+#include "gtest/gtest.h"
> 
> using namespace sh;
> 
>@@ -39,11 +39,11 @@ class RemovePowTest : public testing::Test
>         allocator.pop();
>     }
> 
>-    void compile(const std::string& shaderString)
>+    void compile(const std::string &shaderString)
>     {
>-        const char *shaderStrings[] = { shaderString.c_str() };
>-        mASTRoot = mTranslatorGLSL->compileTreeForTesting(shaderStrings, 1,
>-                                                          SH_OBJECT_CODE | SH_REMOVE_POW_WITH_CONSTANT_EXPONENT);
>+        const char *shaderStrings[] = {shaderString.c_str()};
>+        mASTRoot                    = mTranslatorGLSL->compileTreeForTesting(
>+            shaderStrings, 1, SH_OBJECT_CODE | SH_REMOVE_POW_WITH_CONSTANT_EXPONENT);
>         if (!mASTRoot)
>         {
>             TInfoSink &infoSink = mTranslatorGLSL->getInfoSink();
>@@ -61,7 +61,7 @@ class RemovePowTest : public testing::Test
>     sh::TranslatorGLSL *mTranslatorGLSL;
>     TIntermNode *mASTRoot;
> 
>-    TPoolAllocator allocator;
>+    angle::PoolAllocator allocator;
> };
> 
> // Check if there's a pow() node anywhere in the tree.
>@@ -122,7 +122,7 @@ class FindNestedPowWorkaround : public sh::NodeSearchTraverser<FindNestedPowWork
>     bool visitUnary(Visit visit, TIntermUnary *node) override
>     {
>         TIntermNode *base = nullptr;
>-        bool oneFound = IsPowWorkaround(node, &base);
>+        bool oneFound     = IsPowWorkaround(node, &base);
>         if (oneFound && base)
>             mFound = IsPowWorkaround(base, nullptr);
>         return !mFound;
>@@ -155,4 +155,3 @@ TEST_F(RemovePowTest, NestedPowWithConstantExponent)
>     ASSERT_FALSE(foundInAST<FindPow>());
>     ASSERT_TRUE(foundInAST<FindNestedPowWorkaround>());
> }
>-
>diff --git a/Source/ThirdParty/ANGLE/src/tests/compiler_tests/RemoveUnreferencedVariables_test.cpp b/Source/ThirdParty/ANGLE/src/tests/compiler_tests/RemoveUnreferencedVariables_test.cpp
>index 4e74e9517f1..a5f983e015f 100644
>--- a/Source/ThirdParty/ANGLE/src/tests/compiler_tests/RemoveUnreferencedVariables_test.cpp
>+++ b/Source/ThirdParty/ANGLE/src/tests/compiler_tests/RemoveUnreferencedVariables_test.cpp
>@@ -18,8 +18,7 @@ class RemoveUnreferencedVariablesTest : public MatchOutputCodeTest
> {
>   public:
>     RemoveUnreferencedVariablesTest() : MatchOutputCodeTest(GL_FRAGMENT_SHADER, 0, SH_ESSL_OUTPUT)
>-    {
>-    }
>+    {}
> };
> 
> // Test that a simple unreferenced declaration is pruned.
>@@ -686,3 +685,29 @@ TEST_F(RemoveUnreferencedVariablesTest, UserDefinedTypeInUniformBlock)
> 
>     ASSERT_TRUE(foundInCode("struct _umyStructType"));
> }
>+
>+// Test that a struct type that is referenced from an initializer with a constructor can be removed.
>+TEST_F(RemoveUnreferencedVariablesTest, UserDefinedTypeConstructorInitializer)
>+{
>+    const std::string &shaderString =
>+        R"(#version 300 es
>+
>+        precision highp float;
>+        out vec4 my_FragColor;
>+
>+        struct myStructType
>+        {
>+            int iMember;
>+        };
>+
>+        uniform int ui;
>+
>+        void main()
>+        {
>+            myStructType S = myStructType(ui);
>+            my_FragColor = vec4(0, 1, 0, 1);
>+        })";
>+    compile(shaderString);
>+
>+    ASSERT_TRUE(notFoundInCode("myStructType"));
>+}
>diff --git a/Source/ThirdParty/ANGLE/src/tests/compiler_tests/RewriteDoWhile_test.cpp b/Source/ThirdParty/ANGLE/src/tests/compiler_tests/RewriteDoWhile_test.cpp
>index 7532f2844d0..a7f7c5126f7 100644
>--- a/Source/ThirdParty/ANGLE/src/tests/compiler_tests/RewriteDoWhile_test.cpp
>+++ b/Source/ThirdParty/ANGLE/src/tests/compiler_tests/RewriteDoWhile_test.cpp
>@@ -30,8 +30,7 @@ class RewriteDoWhileCrashTest : public ShaderCompileTreeTest
>     }
> };
> 
>-// Make sure that the RewriteDoWhile step doesn't crash due to creating temp symbols before calling
>-// nextTemporaryId(). Regression test.
>+// Make sure that the RewriteDoWhile step doesn't crash. Regression test.
> TEST_F(RewriteDoWhileCrashTest, RunsSuccessfully)
> {
>     const std::string &shaderString =
>diff --git a/Source/ThirdParty/ANGLE/src/tests/compiler_tests/SamplerMultisample_test.cpp b/Source/ThirdParty/ANGLE/src/tests/compiler_tests/SamplerMultisample_test.cpp
>index e1baa3aef9b..64a6ad7acbd 100644
>--- a/Source/ThirdParty/ANGLE/src/tests/compiler_tests/SamplerMultisample_test.cpp
>+++ b/Source/ThirdParty/ANGLE/src/tests/compiler_tests/SamplerMultisample_test.cpp
>@@ -7,9 +7,9 @@
> // Tests compiling shaders that use gsampler2DMS types
> //
> 
>+#include "GLSLANG/ShaderLang.h"
> #include "angle_gl.h"
> #include "gtest/gtest.h"
>-#include "GLSLANG/ShaderLang.h"
> #include "tests/test_utils/ShaderCompileTreeTest.h"
> 
> using namespace sh;
>@@ -24,64 +24,374 @@ class SamplerMultisampleTest : public ShaderCompileTreeTest
>     ShShaderSpec getShaderSpec() const override { return SH_GLES3_1_SPEC; }
> };
> 
>-// checks whether compiler has parsed the gsampler2DMS, texelfetch qualifiers correctly
>-TEST_F(SamplerMultisampleTest, TexelFetchSampler2DMSQualifier)
>+class SamplerMultisampleArrayTest : public ShaderCompileTreeTest
>+{
>+  public:
>+    SamplerMultisampleArrayTest() {}
>+
>+    void initResources(ShBuiltInResources *resources) override
>+    {
>+        resources->OES_texture_storage_multisample_2d_array = 1;
>+    }
>+
>+  protected:
>+    ::GLenum getShaderType() const override { return GL_FRAGMENT_SHADER; }
>+    ShShaderSpec getShaderSpec() const override { return SH_GLES3_1_SPEC; }
>+};
>+
>+// Checks whether compiler has parsed the gsampler2DMS, texelfetch correctly.
>+TEST_F(SamplerMultisampleTest, TexelFetchSampler2DMS)
> {
>-    const std::string &shaderString =
>-        "#version 310 es\n"
>-        "precision highp float;\n"
>-        "uniform highp sampler2DMS s;\n"
>-        "uniform highp isampler2DMS is;\n"
>-        "uniform highp usampler2DMS us;\n"
>-        ""
>-        "void main() {\n"
>-        "    vec4 tex1 = texelFetch(s, ivec2(0, 0), 0);\n"
>-        "    ivec4 tex2 = texelFetch(is, ivec2(0, 0), 0);\n"
>-        "    uvec4 tex3 = texelFetch(us, ivec2(0, 0), 0);\n"
>-        "}\n";
>+    constexpr char kShaderString[] =
>+        R"(#version 310 es
>+        precision highp float;
>+        uniform highp sampler2DMS s;
>+        uniform highp isampler2DMS is;
>+        uniform highp usampler2DMS us;
>+
>+        void main() {
>+            vec4 tex1 = texelFetch(s, ivec2(0, 0), 0);
>+            ivec4 tex2 = texelFetch(is, ivec2(0, 0), 0);
>+            uvec4 tex3 = texelFetch(us, ivec2(0, 0), 0);
>+        })";
> 
>-    if (!compile(shaderString))
>+    if (!compile(kShaderString))
>     {
>         FAIL() << "Shader compilation failed, expecting success:\n" << mInfoLog;
>     }
> }
> 
>-// checks whether compiler has parsed the gsampler2DMS, texturesize qualifiers correctly
>-TEST_F(SamplerMultisampleTest, TextureSizeSampler2DMSQualifier)
>+// Checks whether compiler has parsed the gsampler2DMS, textureSize correctly.
>+TEST_F(SamplerMultisampleTest, TextureSizeSampler2DMS)
> {
>-    const std::string &shaderString =
>-        "#version 310 es\n"
>-        "precision highp float;\n"
>-        "uniform highp sampler2DMS s;\n"
>-        "uniform highp isampler2DMS is;\n"
>-        "uniform highp usampler2DMS us;\n"
>-        ""
>-        "void main() {\n"
>-        "    ivec2 size = textureSize(s);\n"
>-        "    size = textureSize(is);\n"
>-        "    size = textureSize(us);\n"
>-        "}\n";
>+    constexpr char kShaderString[] =
>+        R"(#version 310 es
>+        precision highp float;
>+        uniform highp sampler2DMS s;
>+        uniform highp isampler2DMS is;
>+        uniform highp usampler2DMS us;
> 
>-    if (!compile(shaderString))
>+        void main() {
>+            ivec2 size = textureSize(s);
>+            size = textureSize(is);
>+            size = textureSize(us);
>+        })";
>+
>+    if (!compile(kShaderString))
>     {
>         FAIL() << "Shader compilation failed, expecting success:\n" << mInfoLog;
>     }
> }
> 
>-// checks gsampler2DMS has no default precision
>+// Check that sampler2DMS has no default precision.
> TEST_F(SamplerMultisampleTest, NoPrecisionSampler2DMS)
> {
>-    const std::string &shaderString =
>-        "#version 310 es\n"
>-        "precision highp float;\n"
>-        "uniform sampler2DMS s;\n"
>-        "uniform isampler2DMS is;\n"
>-        "uniform usampler2DMS us;\n"
>-        ""
>-        "void main() {}\n";
>+    constexpr char kShaderString[] =
>+        R"(#version 310 es
>+        precision highp float;
>+        uniform sampler2DMS s;
>+
>+        void main() {})";
>+
>+    if (compile(kShaderString))
>+    {
>+        FAIL() << "Shader compilation succeeded, expecting failure:\n" << mInfoLog;
>+    }
>+}
>+
>+// Check that isampler2DMS has no default precision.
>+TEST_F(SamplerMultisampleTest, NoPrecisionISampler2DMS)
>+{
>+    constexpr char kShaderString[] =
>+        R"(#version 310 es
>+        precision highp float;
>+        uniform isampler2DMS s;
>+
>+        void main() {})";
>+
>+    if (compile(kShaderString))
>+    {
>+        FAIL() << "Shader compilation succeeded, expecting failure:\n" << mInfoLog;
>+    }
>+}
>+
>+// Check that usampler2DMS has no default precision.
>+TEST_F(SamplerMultisampleTest, NoPrecisionUSampler2DMS)
>+{
>+    constexpr char kShaderString[] =
>+        R"(#version 310 es
>+        precision highp float;
>+        uniform usampler2DMS s;
>+
>+        void main() {})";
>+
>+    if (compile(kShaderString))
>+    {
>+        FAIL() << "Shader compilation succeeded, expecting failure:\n" << mInfoLog;
>+    }
>+}
>+
>+// Negative test: checks that sampler2DMS is not usable in ESSL 3.00.
>+TEST_F(SamplerMultisampleTest, Sampler2DMSESSL300)
>+{
>+    constexpr char kShaderString[] =
>+        R"(#version 300 es
>+        precision highp float;
>+        uniform highp sampler2DMS s;
>+
>+        void main() {
>+        })";
>+
>+    if (compile(kShaderString))
>+    {
>+        FAIL() << "Shader compilation succeeded, expecting failure:\n" << mInfoLog;
>+    }
>+}
>+
>+// Negative test: checks that isampler2DMS is not usable in ESSL 3.00.
>+TEST_F(SamplerMultisampleTest, ISampler2DMSESSL300)
>+{
>+    constexpr char kShaderString[] =
>+        R"(#version 300 es
>+        precision highp float;
>+        uniform highp isampler2DMS s;
>+
>+        void main() {
>+        })";
>+
>+    if (compile(kShaderString))
>+    {
>+        FAIL() << "Shader compilation succeeded, expecting failure:\n" << mInfoLog;
>+    }
>+}
>+
>+// Negative test: checks that usampler2DMS is not usable in ESSL 3.00.
>+TEST_F(SamplerMultisampleTest, USampler2DMSESSL300)
>+{
>+    constexpr char kShaderString[] =
>+        R"(#version 300 es
>+        precision highp float;
>+        uniform highp usampler2DMS s;
>+
>+        void main() {
>+        })";
>+
>+    if (compile(kShaderString))
>+    {
>+        FAIL() << "Shader compilation succeeded, expecting failure:\n" << mInfoLog;
>+    }
>+}
>+
>+// Negative test: checks that sampler2DMSArray is not usable in ESSL 3.10 without extensions.
>+TEST_F(SamplerMultisampleTest, Sampler2DMSArrayNotSupported)
>+{
>+    constexpr char kShaderString[] =
>+        R"(#version 310 es
>+        precision highp float;
>+        uniform highp sampler2DMSArray s;
>+
>+        void main() {
>+        })";
>+
>+    if (compile(kShaderString))
>+    {
>+        FAIL() << "Shader compilation succeeded, expecting failure:\n" << mInfoLog;
>+    }
>+}
>+
>+// Negative test: checks that isampler2DMSArray is not usable in ESSL 3.10 without extensions.
>+TEST_F(SamplerMultisampleTest, ISampler2DMSArrayNotSupported)
>+{
>+    constexpr char kShaderString[] =
>+        R"(#version 310 es
>+        precision highp float;
>+        uniform highp isampler2DMSArray s;
>+
>+        void main() {
>+        })";
>+
>+    if (compile(kShaderString))
>+    {
>+        FAIL() << "Shader compilation succeeded, expecting failure:\n" << mInfoLog;
>+    }
>+}
>+
>+// Negative test: checks that usampler2DMSArray is not usable in ESSL 3.10 without extensions.
>+TEST_F(SamplerMultisampleTest, USampler2DMSArrayNotSupported)
>+{
>+    constexpr char kShaderString[] =
>+        R"(#version 310 es
>+        precision highp float;
>+        uniform highp usampler2DMSArray s;
>+
>+        void main() {
>+        })";
>+
>+    if (compile(kShaderString))
>+    {
>+        FAIL() << "Shader compilation succeeded, expecting failure:\n" << mInfoLog;
>+    }
>+}
>+
>+// Checks whether compiler has parsed the gsampler2DMSArray, texelfetch correctly.
>+TEST_F(SamplerMultisampleArrayTest, TexelFetchSampler2DMSArray)
>+{
>+    constexpr char kShaderString[] =
>+        R"(#version 310 es
>+        #extension GL_OES_texture_storage_multisample_2d_array : require
>+        precision highp float;
>+        uniform highp sampler2DMSArray s;
>+        uniform highp isampler2DMSArray is;
>+        uniform highp usampler2DMSArray us;
>+
>+        void main() {
>+            vec4 tex1 = texelFetch(s, ivec3(0, 0, 0), 0);
>+            ivec4 tex2 = texelFetch(is, ivec3(0, 0, 0), 0);
>+            uvec4 tex3 = texelFetch(us, ivec3(0, 0, 0), 0);
>+        })";
>+
>+    if (!compile(kShaderString))
>+    {
>+        FAIL() << "Shader compilation failed, expecting success:\n" << mInfoLog;
>+    }
>+}
>+
>+// Checks whether compiler has parsed the gsampler2DMSArray, textureSize correctly.
>+TEST_F(SamplerMultisampleArrayTest, TextureSizeSampler2DMSArray)
>+{
>+    constexpr char kShaderString[] =
>+        R"(#version 310 es
>+        #extension GL_OES_texture_storage_multisample_2d_array : require
>+        precision highp float;
>+        uniform highp sampler2DMSArray s;
>+        uniform highp isampler2DMSArray is;
>+        uniform highp usampler2DMSArray us;
>+
>+        void main() {
>+            ivec3 size = textureSize(s);
>+            size = textureSize(is);
>+            size = textureSize(us);
>+        })";
>+
>+    if (!compile(kShaderString))
>+    {
>+        FAIL() << "Shader compilation failed, expecting success:\n" << mInfoLog;
>+    }
>+}
>+
>+// Check that sampler2DMSArray has no default precision.
>+TEST_F(SamplerMultisampleArrayTest, NoPrecisionSampler2DMSArray)
>+{
>+    constexpr char kShaderString[] =
>+        R"(#version 310 es
>+        #extension GL_OES_texture_storage_multisample_2d_array : require
>+        precision highp float;
>+        uniform sampler2DMSArray s;
>+
>+        void main() {})";
>+
>+    if (compile(kShaderString))
>+    {
>+        FAIL() << "Shader compilation succeeded, expecting failure:\n" << mInfoLog;
>+    }
>+}
>+
>+// Check that isampler2DMSArray has no default precision.
>+TEST_F(SamplerMultisampleArrayTest, NoPrecisionISampler2DMSArray)
>+{
>+    constexpr char kShaderString[] =
>+        R"(#version 310 es
>+        #extension GL_OES_texture_storage_multisample_2d_array : require
>+        precision highp float;
>+        uniform isampler2DMSArray s;
>+
>+        void main() {})";
>+
>+    if (compile(kShaderString))
>+    {
>+        FAIL() << "Shader compilation succeeded, expecting failure:\n" << mInfoLog;
>+    }
>+}
>+
>+// Check that usampler2DMSArray has no default precision.
>+TEST_F(SamplerMultisampleArrayTest, NoPrecisionUSampler2DMSArray)
>+{
>+    constexpr char kShaderString[] =
>+        R"(#version 310 es
>+        #extension GL_OES_texture_storage_multisample_2d_array : require
>+        precision highp float;
>+        uniform usampler2DMSArray s;
>+
>+        void main() {})";
> 
>-    if (compile(shaderString))
>+    if (compile(kShaderString))
>     {
>         FAIL() << "Shader compilation succeeded, expecting failure:\n" << mInfoLog;
>     }
> }
>+
>+class SamplerMultisampleEXTTest : public SamplerMultisampleTest
>+{
>+  public:
>+    SamplerMultisampleEXTTest() {}
>+
>+  protected:
>+    void initResources(ShBuiltInResources *resources) override
>+    {
>+        resources->ANGLE_texture_multisample = 1;
>+    }
>+
>+    ::GLenum getShaderType() const override { return GL_FRAGMENT_SHADER; }
>+    ShShaderSpec getShaderSpec() const override { return SH_GLES3_SPEC; }
>+};
>+
>+// checks ANGLE_texture_multisample is supported in es 3.0
>+TEST_F(SamplerMultisampleEXTTest, TextureMultisampleEXTEnabled)
>+{
>+    constexpr char kShaderString[] =
>+        R"(#version 300 es
>+        #extension GL_ANGLE_texture_multisample : require
>+        precision highp float;
>+        uniform highp sampler2DMS s;
>+        uniform highp isampler2DMS is;
>+        uniform highp usampler2DMS us;
>+
>+        void main() {
>+            ivec2 size = textureSize(s);
>+            size = textureSize(is);
>+            size = textureSize(us);
>+            vec4 tex1 = texelFetch(s, ivec2(0, 0), 0);
>+            ivec4 tex2 = texelFetch(is, ivec2(0, 0), 0);
>+            uvec4 tex3 = texelFetch(us, ivec2(0, 0), 0);
>+        })";
>+
>+    if (!compile(kShaderString))
>+    {
>+        FAIL() << "Shader compilation failure, expecting success:\n" << mInfoLog;
>+    }
>+}
>+
>+// checks that multisample texture is not supported without ANGLE_texture_multisample in es 3.0
>+TEST_F(SamplerMultisampleEXTTest, TextureMultisampleEXTDisabled)
>+{
>+    constexpr char kShaderString[] =
>+        R"(#version 300 es
>+        precision highp float;
>+        uniform highp sampler2DMS s;
>+        uniform highp isampler2DMS is;
>+        uniform highp usampler2DMS us;
>+
>+        void main() {
>+            ivec2 size = textureSize(s);
>+            size = textureSize(is);
>+            size = textureSize(us);
>+            vec4 tex1 = texelFetch(s, ivec2(0, 0), 0);
>+            ivec4 tex2 = texelFetch(is, ivec2(0, 0), 0);
>+            uvec4 tex3 = texelFetch(us, ivec2(0, 0), 0);
>+        })";
>+
>+    if (compile(kShaderString))
>+    {
>+        FAIL() << "Shader compilation success, expecting failure:\n" << mInfoLog;
>+    }
>+}
>diff --git a/Source/ThirdParty/ANGLE/src/tests/compiler_tests/ScalarizeVecAndMatConstructorArgs_test.cpp b/Source/ThirdParty/ANGLE/src/tests/compiler_tests/ScalarizeVecAndMatConstructorArgs_test.cpp
>new file mode 100644
>index 00000000000..3640b3fcf54
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/tests/compiler_tests/ScalarizeVecAndMatConstructorArgs_test.cpp
>@@ -0,0 +1,119 @@
>+//
>+// Copyright (c) 2017 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// ScalarizeVecAndMatConstructorArgs_test.cpp:
>+//   Tests for scalarizing vector and matrix constructor args.
>+//
>+
>+#include "GLSLANG/ShaderLang.h"
>+#include "angle_gl.h"
>+#include "gtest/gtest.h"
>+#include "tests/test_utils/compiler_test.h"
>+
>+using namespace sh;
>+
>+namespace
>+{
>+
>+class ScalarizeVecAndMatConstructorArgsTest : public MatchOutputCodeTest
>+{
>+  public:
>+    ScalarizeVecAndMatConstructorArgsTest()
>+        : MatchOutputCodeTest(GL_FRAGMENT_SHADER,
>+                              SH_SCALARIZE_VEC_AND_MAT_CONSTRUCTOR_ARGS,
>+                              SH_ESSL_OUTPUT)
>+    {}
>+};
>+
>+// Verifies scalarizing matrix inside a vector constructor.
>+TEST_F(ScalarizeVecAndMatConstructorArgsTest, MatrixInVectorConstructor)
>+{
>+    const std::string shaderString =
>+        R"(
>+        precision mediump float;
>+
>+        uniform mat2 umat2;
>+
>+        void main()
>+        {
>+            gl_FragColor = vec4(umat2);
>+        })";
>+    compile(shaderString);
>+
>+    std::vector<const char *> expectedStrings = {
>+        "main()", " = _uumat2", "gl_FragColor = vec4(", "[0][0],", "[0][1],", "[1][0],", "[1][1])"};
>+
>+    EXPECT_TRUE(foundInCodeInOrder(expectedStrings));
>+}
>+
>+// Verifies scalarizing a vector insized a matrix constructor.
>+TEST_F(ScalarizeVecAndMatConstructorArgsTest, VectorInMatrixConstructor)
>+{
>+    const std::string shaderString =
>+        R"(
>+        precision mediump float;
>+
>+        uniform vec2 uvec2;
>+
>+        void main()
>+        {
>+            mat2 m = mat2(uvec2, uvec2);
>+            gl_FragColor = vec4(m * uvec2, m * uvec2);
>+        })";
>+    compile(shaderString);
>+
>+    std::vector<const char *> expectedStrings = {
>+        "main()", " = _uuvec2", "mat2(", "[0],", "[1],", "[0],", "[1])", "gl_FragColor = vec4("};
>+
>+    EXPECT_TRUE(foundInCodeInOrder(expectedStrings));
>+}
>+
>+// Verifies that scalarizing vector and matrix constructor args inside a sequence operator preserves
>+// correct order of operations.
>+TEST_F(ScalarizeVecAndMatConstructorArgsTest, SequenceOperator)
>+{
>+    const std::string shaderString =
>+        R"(
>+        precision mediump float;
>+
>+        uniform vec2 u;
>+
>+        void main()
>+        {
>+            vec2 v = u;
>+            mat2 m = (v[0] += 1.0, mat2(v, v[1], -v[0]));
>+            gl_FragColor = vec4(m[0], m[1]);
>+        })";
>+    compile(shaderString);
>+
>+    std::vector<const char *> expectedStrings = {"_uv[0] += 1.0", "-_uv[0]"};
>+
>+    EXPECT_TRUE(foundInCodeInOrder(expectedStrings));
>+}
>+
>+// Verifies that scalarizing vector and matrix constructor args inside multiple declarations
>+// preserves the correct order of operations.
>+TEST_F(ScalarizeVecAndMatConstructorArgsTest, MultiDeclaration)
>+{
>+    const std::string shaderString =
>+        R"(
>+        precision mediump float;
>+
>+        uniform vec2 u;
>+
>+        void main()
>+        {
>+            vec2 v = vec2(u[0]),
>+                 w = mat2(v, v) * u;
>+            gl_FragColor = vec4(v, w);
>+        })";
>+    compile(shaderString);
>+
>+    std::vector<const char *> expectedStrings = {"vec2(_uu[0])", "mat2("};
>+
>+    EXPECT_TRUE(foundInCodeInOrder(expectedStrings));
>+}
>+
>+}  // anonymous namespace
>diff --git a/Source/ThirdParty/ANGLE/src/tests/compiler_tests/ShCompile_test.cpp b/Source/ThirdParty/ANGLE/src/tests/compiler_tests/ShCompile_test.cpp
>index 21e4a3cbe79..a6b55b1063b 100644
>--- a/Source/ThirdParty/ANGLE/src/tests/compiler_tests/ShCompile_test.cpp
>+++ b/Source/ThirdParty/ANGLE/src/tests/compiler_tests/ShCompile_test.cpp
>@@ -7,9 +7,12 @@
> //   Test the sh::Compile interface with different parameters.
> //
> 
>+#include <clocale>
>+#include "GLSLANG/ShaderLang.h"
> #include "angle_gl.h"
>+#include "common/angleutils.h"
>+#include "common/platform.h"
> #include "gtest/gtest.h"
>-#include "GLSLANG/ShaderLang.h"
> 
> class ShCompileTest : public testing::Test
> {
>@@ -36,16 +39,68 @@ class ShCompileTest : public testing::Test
> 
>     void testCompile(const char **shaderStrings, int stringCount, bool expectation)
>     {
>-        bool success                  = sh::Compile(mCompiler, shaderStrings, stringCount, 0);
>+        ShCompileOptions options      = SH_OBJECT_CODE | SH_VARIABLES | SH_INIT_OUTPUT_VARIABLES;
>+        bool success                  = sh::Compile(mCompiler, shaderStrings, stringCount, options);
>         const std::string &compileLog = sh::GetInfoLog(mCompiler);
>         EXPECT_EQ(expectation, success) << compileLog;
>     }
> 
>-  private:
>     ShBuiltInResources mResources;
>+
>+    class ScopedRestoreDefaultLocale : angle::NonCopyable
>+    {
>+      public:
>+        ScopedRestoreDefaultLocale();
>+        ~ScopedRestoreDefaultLocale();
>+
>+      private:
>+        std::locale defaultLocale;
>+    };
>+
>+  public:
>     ShHandle mCompiler;
> };
> 
>+ShCompileTest::ScopedRestoreDefaultLocale::ScopedRestoreDefaultLocale()
>+{
>+    defaultLocale = std::locale();
>+}
>+
>+ShCompileTest::ScopedRestoreDefaultLocale::~ScopedRestoreDefaultLocale()
>+{
>+    std::locale::global(defaultLocale);
>+}
>+
>+class ShCompileComputeTest : public ShCompileTest
>+{
>+  public:
>+    ShCompileComputeTest() {}
>+
>+  protected:
>+    void SetUp() override
>+    {
>+        sh::InitBuiltInResources(&mResources);
>+        mCompiler = sh::ConstructCompiler(GL_COMPUTE_SHADER, SH_WEBGL3_SPEC,
>+                                          SH_GLSL_COMPATIBILITY_OUTPUT, &mResources);
>+        ASSERT_TRUE(mCompiler != nullptr) << "Compiler could not be constructed.";
>+    }
>+};
>+
>+// Test calling sh::Compile with compute shader source string.
>+TEST_F(ShCompileComputeTest, ComputeShaderString)
>+{
>+    constexpr char kComputeShaderString[] =
>+        R"(#version 310 es
>+        layout(local_size_x=1) in;
>+        void main()
>+        {
>+        })";
>+
>+    const char *shaderStrings[] = {kComputeShaderString};
>+
>+    testCompile(shaderStrings, 1, true);
>+}
>+
> // Test calling sh::Compile with more than one shader source string.
> TEST_F(ShCompileTest, MultipleShaderStrings)
> {
>@@ -81,3 +136,68 @@ TEST_F(ShCompileTest, TokensSplitInShaderStrings)
> 
>     testCompile(shaderStrings, 3, true);
> }
>+
>+// Parsing floats in shaders can run afoul of locale settings.
>+// Eg. in de_DE, `strtof("1.9")` will yield `1.0f`. (It's expecting "1,9")
>+TEST_F(ShCompileTest, DecimalSepLocale)
>+{
>+    // Locale names are platform dependent, add platform-specific names of locales to be tested here
>+    const std::string availableLocales[] = {
>+        "de_DE", "de-DE", "de_DE.UTF-8", "de_DE.ISO8859-1", "de_DE.ISO8859-15", "de_DE@euro",
>+        "de_DE.88591", "de_DE.88591.en", "de_DE.iso88591", "de_DE.ISO-8859-1", "de_DE.ISO_8859-1",
>+        "de_DE.iso885915", "de_DE.ISO-8859-15", "de_DE.ISO_8859-15", "de_DE.8859-15",
>+        "de_DE.8859-15@euro", "de_DE.ISO-8859-15@euro", "de_DE.UTF-8@euro", "de_DE.utf8",
>+        "German_germany", "German_Germany", "German_Germany.1252", "German_Germany.UTF-8", "German",
>+        // One ubuntu tester doesn't have a german locale, but da_DK.utf8 has similar float
>+        // representation
>+        "da_DK.utf8"};
>+
>+    const auto localeExists = [](const std::string name) {
>+        return bool(setlocale(LC_ALL, name.c_str()));
>+    };
>+
>+    const char kSource[] = R"(
>+    void main()
>+    {
>+        gl_FragColor = vec4(1.9);
>+    })";
>+    const char *parts[]  = {kSource};
>+
>+    int testedLocales = 0;
>+
>+    // Ensure the locale is reset after the test runs.
>+    ScopedRestoreDefaultLocale restoreLocale;
>+
>+    for (const std::string &locale : availableLocales)
>+    {
>+        // If the locale doesn't exist on the testing platform, the locale constructor will fail,
>+        // throwing an exception
>+        // We use setlocale() (through localeExists) to test whether a locale
>+        // exists before calling the locale constructor
>+        if (localeExists(locale))
>+        {
>+            std::locale localizedLoc(locale);
>+
>+            // std::locale::global() must be used instead of setlocale() to affect new streams'
>+            // default locale
>+            std::locale::global(std::locale::classic());
>+            sh::Compile(mCompiler, parts, 1, SH_OBJECT_CODE);
>+            std::string referenceOut = sh::GetObjectCode(mCompiler);
>+            EXPECT_NE(referenceOut.find("1.9"), std::string::npos)
>+                << "float formatted incorrectly with classic locale";
>+
>+            sh::ClearResults(mCompiler);
>+
>+            std::locale::global(localizedLoc);
>+            sh::Compile(mCompiler, parts, 1, SH_OBJECT_CODE);
>+            std::string localizedOut = sh::GetObjectCode(mCompiler);
>+            EXPECT_NE(localizedOut.find("1.9"), std::string::npos)
>+                << "float formatted incorrectly with locale (" << localizedLoc.name() << ") set";
>+
>+            ASSERT_EQ(referenceOut, localizedOut)
>+                << "different output with locale (" << localizedLoc.name() << ") set";
>+
>+            testedLocales++;
>+        }
>+    }
>+}
>\ No newline at end of file
>diff --git a/Source/ThirdParty/ANGLE/src/tests/compiler_tests/ShaderExtension_test.cpp b/Source/ThirdParty/ANGLE/src/tests/compiler_tests/ShaderExtension_test.cpp
>deleted file mode 100644
>index 576fa75b406..00000000000
>--- a/Source/ThirdParty/ANGLE/src/tests/compiler_tests/ShaderExtension_test.cpp
>+++ /dev/null
>@@ -1,218 +0,0 @@
>-//
>-// Copyright (c) 2015 The ANGLE Project Authors. All rights reserved.
>-// Use of this source code is governed by a BSD-style license that can be
>-// found in the LICENSE file.
>-//
>-// Extension_test.cpp
>-//   Test that shaders need various extensions to be compiled.
>-//
>-
>-#include "angle_gl.h"
>-#include "gtest/gtest.h"
>-#include "GLSLANG/ShaderLang.h"
>-
>-static const char *FragDepthExtShdr[] =
>-{
>-    // First string of the shader. The required pragma declaration.
>-    "#extension GL_EXT_frag_depth : enable\n",
>-
>-    // Second string of the shader. The rest of the shader body.
>-    "void main() { gl_FragDepthEXT = 1.0; }\n"
>-};
>-
>-static const char *StandDerivExtShdr[] =
>-{
>-    // First string of the shader. The required pragma declaration.
>-    "#extension GL_OES_standard_derivatives : enable\n",
>-
>-    // Second string of the shader. The rest of the shader body.
>-    "precision mediump float;\n"
>-    "varying vec2 texCoord;\n"
>-    "void main() { gl_FragColor = vec4(dFdx(texCoord.x), dFdy(texCoord.y), fwidth(texCoord.x), 1.0); }\n"
>-};
>-
>-static const char *TextureLODShdr[] =
>-{
>-    // First string of the shader. The required pragma declaration.
>-    "#extension GL_EXT_shader_texture_lod : enable\n",
>-
>-    // Second string of the shader. The rest of the shader body.
>-    "precision mediump float;\n"
>-    "varying vec2 texCoord0v;\n"
>-    "uniform float lod;\n"
>-    "uniform sampler2D tex;\n"
>-    "void main() { vec4 color = texture2DLodEXT(tex, texCoord0v, lod); }\n"
>-};
>-
>-class ShaderExtensionTest : public testing::Test
>-{
>-  public:
>-    ShaderExtensionTest() {}
>-
>-  protected:
>-    virtual void SetUp()
>-    {
>-        sh::InitBuiltInResources(&mResources);
>-        mCompiler = nullptr;
>-    }
>-
>-    virtual void TearDown()
>-    {
>-        DestroyCompiler();
>-    }
>-
>-    void DestroyCompiler()
>-    {
>-        if (mCompiler)
>-        {
>-            sh::Destruct(mCompiler);
>-            mCompiler = nullptr;
>-        }
>-    }
>-
>-    void InitializeCompiler()
>-    {
>-        DestroyCompiler();
>-        mCompiler = sh::ConstructCompiler(GL_FRAGMENT_SHADER, SH_WEBGL_SPEC,
>-                                          SH_GLSL_COMPATIBILITY_OUTPUT, &mResources);
>-        ASSERT_TRUE(mCompiler != nullptr) << "Compiler could not be constructed.";
>-    }
>-
>-    void TestShaderExtension(const char **shaderStrings, int stringCount, bool expectation)
>-    {
>-        bool success                  = sh::Compile(mCompiler, shaderStrings, stringCount, 0);
>-        const std::string &compileLog = sh::GetInfoLog(mCompiler);
>-        EXPECT_EQ(expectation, success) << compileLog;
>-    }
>-
>-  protected:
>-    ShBuiltInResources mResources;
>-    ShHandle mCompiler;
>-};
>-
>-TEST_F(ShaderExtensionTest, FragDepthExtRequiresExt)
>-{
>-    // Extension is required to compile properly.
>-    mResources.EXT_frag_depth = 0;
>-    InitializeCompiler();
>-    TestShaderExtension(FragDepthExtShdr, 2, false);
>-}
>-
>-TEST_F(ShaderExtensionTest, FragDepthExtRequiresPragma)
>-{
>-    // Pragma is required to compile properly.
>-    mResources.EXT_frag_depth = 1;
>-    InitializeCompiler();
>-    TestShaderExtension(&FragDepthExtShdr[1], 1, false);
>-}
>-
>-TEST_F(ShaderExtensionTest, FragDepthExtCompiles)
>-{
>-    // Test that it compiles properly with extension enabled.
>-    mResources.EXT_frag_depth = 1;
>-    InitializeCompiler();
>-    TestShaderExtension(FragDepthExtShdr, 2, true);
>-}
>-
>-TEST_F(ShaderExtensionTest, FragDepthExtResetsInternalStates)
>-{
>-    // Test that extension internal states are reset properly between compiles.
>-    mResources.EXT_frag_depth = 1;
>-    InitializeCompiler();
>-
>-    TestShaderExtension(FragDepthExtShdr, 2, true);
>-    TestShaderExtension(&FragDepthExtShdr[1], 1, false);
>-    TestShaderExtension(FragDepthExtShdr, 2, true);
>-}
>-
>-TEST_F(ShaderExtensionTest, StandDerivExtRequiresExt)
>-{
>-    // Extension is required to compile properly.
>-    mResources.OES_standard_derivatives = 0;
>-    InitializeCompiler();
>-    TestShaderExtension(StandDerivExtShdr, 2, false);
>-}
>-
>-TEST_F(ShaderExtensionTest, StandDerivExtRequiresPragma)
>-{
>-    // Pragma is required to compile properly.
>-    mResources.OES_standard_derivatives = 1;
>-    InitializeCompiler();
>-    TestShaderExtension(&StandDerivExtShdr[1], 1, false);
>-}
>-
>-TEST_F(ShaderExtensionTest, StandDerivExtCompiles)
>-{
>-    // Test that it compiles properly with extension enabled.
>-    mResources.OES_standard_derivatives = 1;
>-    InitializeCompiler();
>-    TestShaderExtension(StandDerivExtShdr, 2, true);
>-}
>-
>-TEST_F(ShaderExtensionTest, StandDerivExtResetsInternalStates)
>-{
>-    // Test that extension internal states are reset properly between compiles.
>-    mResources.OES_standard_derivatives = 1;
>-    InitializeCompiler();
>-
>-    TestShaderExtension(StandDerivExtShdr, 2, true);
>-    TestShaderExtension(&StandDerivExtShdr[1], 1, false);
>-    TestShaderExtension(StandDerivExtShdr, 2, true);
>-    TestShaderExtension(&StandDerivExtShdr[1], 1, false);
>-}
>-
>-TEST_F(ShaderExtensionTest, TextureLODExtRequiresExt)
>-{
>-    // Extension is required to compile properly.
>-    mResources.EXT_shader_texture_lod = 0;
>-    InitializeCompiler();
>-    TestShaderExtension(TextureLODShdr, 2, false);
>-}
>-
>-TEST_F(ShaderExtensionTest, TextureLODExtRequiresPragma)
>-{
>-    // Pragma is required to compile properly.
>-    mResources.EXT_shader_texture_lod = 1;
>-    InitializeCompiler();
>-    TestShaderExtension(&TextureLODShdr[1], 1, false);
>-}
>-
>-TEST_F(ShaderExtensionTest, TextureLODExtCompiles)
>-{
>-    // Test that it compiles properly with extension enabled.
>-    mResources.EXT_shader_texture_lod = 1;
>-    InitializeCompiler();
>-    TestShaderExtension(TextureLODShdr, 2, true);
>-}
>-
>-TEST_F(ShaderExtensionTest, TextureLODExtResetsInternalStates)
>-{
>-    // Test that extension internal states are reset properly between compiles.
>-    mResources.EXT_shader_texture_lod = 1;
>-    InitializeCompiler();
>-
>-    TestShaderExtension(&TextureLODShdr[1], 1, false);
>-    TestShaderExtension(TextureLODShdr, 2, true);
>-    TestShaderExtension(&TextureLODShdr[1], 1, false);
>-    TestShaderExtension(TextureLODShdr, 2, true);
>-}
>-
>-// Test a bug where we could modify the value of a builtin variable.
>-TEST_F(ShaderExtensionTest, BuiltinRewritingBug)
>-{
>-    mResources.MaxDrawBuffers = 4;
>-    mResources.EXT_draw_buffers = 1;
>-    InitializeCompiler();
>-
>-    const std::string &shaderString =
>-        "#extension GL_EXT_draw_buffers : require\n"
>-        "precision mediump float;\n"
>-        "void main() {\n"
>-        "    gl_FragData[gl_MaxDrawBuffers] = vec4(0.0);\n"
>-        "}";
>-
>-    const char *shaderStrings[] = { shaderString.c_str() };
>-
>-    TestShaderExtension(shaderStrings, 1, false);
>-    TestShaderExtension(shaderStrings, 1, false);
>-}
>diff --git a/Source/ThirdParty/ANGLE/src/tests/compiler_tests/ShaderImage_test.cpp b/Source/ThirdParty/ANGLE/src/tests/compiler_tests/ShaderImage_test.cpp
>index 49e8ceb01ad..fae5c04687b 100644
>--- a/Source/ThirdParty/ANGLE/src/tests/compiler_tests/ShaderImage_test.cpp
>+++ b/Source/ThirdParty/ANGLE/src/tests/compiler_tests/ShaderImage_test.cpp
>@@ -7,11 +7,12 @@
> // Tests for images
> //
> 
>+#include "GLSLANG/ShaderLang.h"
> #include "angle_gl.h"
>+#include "compiler/translator/StaticType.h"
> #include "gtest/gtest.h"
>-#include "GLSLANG/ShaderLang.h"
>-#include "tests/test_utils/compiler_test.h"
> #include "tests/test_utils/ShaderCompileTreeTest.h"
>+#include "tests/test_utils/compiler_test.h"
> 
> using namespace sh;
> 
>@@ -86,7 +87,7 @@ void CheckExportedImageUniform(const std::vector<sh::Uniform> &uniforms,
> // Checks whether the image is saved in the AST as a node with the correct properties given the
> // shader.
> void CheckImageDeclaration(TIntermNode *astRoot,
>-                           const TString &imageName,
>+                           const ImmutableString &imageName,
>                            TBasicType imageType,
>                            TLayoutImageInternalFormat internalFormat,
>                            bool readonly,
>@@ -96,9 +97,10 @@ void CheckImageDeclaration(TIntermNode *astRoot,
>                            bool volatileQualifier,
>                            int binding)
> {
>-    const TIntermSymbol *myImageNode = FindSymbolNode(astRoot, imageName, imageType);
>+    const TIntermSymbol *myImageNode = FindSymbolNode(astRoot, imageName);
>     ASSERT_NE(nullptr, myImageNode);
> 
>+    ASSERT_EQ(imageType, myImageNode->getBasicType());
>     const TType &myImageType                = myImageNode->getType();
>     TLayoutQualifier myImageLayoutQualifier = myImageType.getLayoutQualifier();
>     ASSERT_EQ(internalFormat, myImageLayoutQualifier.imageInternalFormat);
>@@ -145,8 +147,8 @@ TEST_F(ShaderImageTest, Image2DDeclaration)
>     }
> 
>     CheckExportedImageUniform(getUniforms(), 0, GL_IMAGE_2D, "myImage");
>-    CheckImageDeclaration(mASTRoot, "myImage", EbtImage2D, EiifRGBA32F, true, false, false, false,
>-                          false, 1);
>+    CheckImageDeclaration(mASTRoot, ImmutableString("myImage"), EbtImage2D, EiifRGBA32F, true,
>+                          false, false, false, false, 1);
> }
> 
> // Test that an image3D is properly parsed and exported as a uniform.
>@@ -165,8 +167,8 @@ TEST_F(ShaderImageTest, Image3DDeclaration)
>     }
> 
>     CheckExportedImageUniform(getUniforms(), 0, GL_UNSIGNED_INT_IMAGE_3D, "myImage");
>-    CheckImageDeclaration(mASTRoot, "myImage", EbtUImage3D, EiifRGBA32UI, true, true, false, false,
>-                          false, 3);
>+    CheckImageDeclaration(mASTRoot, ImmutableString("myImage"), EbtUImage3D, EiifRGBA32UI, true,
>+                          true, false, false, false, 3);
> }
> 
> // Check that imageLoad calls get correctly parsed.
>@@ -187,10 +189,16 @@ TEST_F(ShaderImageTest, ImageLoad)
>     }
> 
>     // imageLoad call with image2D passed
>-    CheckImageLoadCall(mASTRoot, "imageLoad(im21;vi2;", EbtImage2D, 2);
>+    std::string mangledName2D = "imageLoad(";
>+    mangledName2D += StaticType::GetBasic<EbtImage2D>()->getMangledName();
>+    mangledName2D += StaticType::GetBasic<EbtInt, 2>()->getMangledName();
>+    CheckImageLoadCall(mASTRoot, mangledName2D.c_str(), EbtImage2D, 2);
> 
>     // imageLoad call with image3D passed
>-    CheckImageLoadCall(mASTRoot, "imageLoad(iim31;vi3;", EbtIImage3D, 3);
>+    std::string mangledName3D = "imageLoad(";
>+    mangledName3D += StaticType::GetBasic<EbtIImage3D>()->getMangledName();
>+    mangledName3D += StaticType::GetBasic<EbtInt, 3>()->getMangledName();
>+    CheckImageLoadCall(mASTRoot, mangledName3D.c_str(), EbtIImage3D, 3);
> }
> 
> // Check that imageStore calls get correctly parsed.
>@@ -211,10 +219,18 @@ TEST_F(ShaderImageTest, ImageStore)
>     }
> 
>     // imageStore call with image2D
>-    CheckImageStoreCall(mASTRoot, "imageStore(im21;vi2;vf4;", EbtImage2D, 2, EbtFloat, 4);
>+    std::string mangledName2D = "imageStore(";
>+    mangledName2D += StaticType::GetBasic<EbtImage2D>()->getMangledName();
>+    mangledName2D += StaticType::GetBasic<EbtInt, 2>()->getMangledName();
>+    mangledName2D += StaticType::GetBasic<EbtFloat, 4>()->getMangledName();
>+    CheckImageStoreCall(mASTRoot, mangledName2D.c_str(), EbtImage2D, 2, EbtFloat, 4);
> 
>     // imageStore call with image2DArray
>-    CheckImageStoreCall(mASTRoot, "imageStore(uim2a1;vi3;vu4;", EbtUImage2DArray, 3, EbtUInt, 4);
>+    std::string mangledName2DArray = "imageStore(";
>+    mangledName2DArray += StaticType::GetBasic<EbtUImage2DArray>()->getMangledName();
>+    mangledName2DArray += StaticType::GetBasic<EbtInt, 3>()->getMangledName();
>+    mangledName2DArray += StaticType::GetBasic<EbtUInt, 4>()->getMangledName();
>+    CheckImageStoreCall(mASTRoot, mangledName2DArray.c_str(), EbtUImage2DArray, 3, EbtUInt, 4);
> }
> 
> // Check that memory qualifiers are correctly parsed.
>@@ -233,10 +249,10 @@ TEST_F(ShaderImageTest, ImageMemoryQualifiers)
>         FAIL() << "Shader compilation failed" << mInfoLog;
>     }
> 
>-    CheckImageDeclaration(mASTRoot, "image1", EbtImage2D, EiifRGBA32F, true, false, true, false,
>-                          false, -1);
>-    CheckImageDeclaration(mASTRoot, "image2", EbtImage2D, EiifRGBA32F, false, true, true, false,
>-                          true, -1);
>-    CheckImageDeclaration(mASTRoot, "image3", EbtImage2D, EiifRGBA32F, true, true, true, true, true,
>-                          -1);
>+    CheckImageDeclaration(mASTRoot, ImmutableString("image1"), EbtImage2D, EiifRGBA32F, true, false,
>+                          true, false, false, -1);
>+    CheckImageDeclaration(mASTRoot, ImmutableString("image2"), EbtImage2D, EiifRGBA32F, false, true,
>+                          true, false, true, -1);
>+    CheckImageDeclaration(mASTRoot, ImmutableString("image3"), EbtImage2D, EiifRGBA32F, true, true,
>+                          true, true, true, -1);
> }
>diff --git a/Source/ThirdParty/ANGLE/src/tests/compiler_tests/ShaderValidation_test.cpp b/Source/ThirdParty/ANGLE/src/tests/compiler_tests/ShaderValidation_test.cpp
>index e3f587e64f1..8700e6b9eea 100644
>--- a/Source/ThirdParty/ANGLE/src/tests/compiler_tests/ShaderValidation_test.cpp
>+++ b/Source/ThirdParty/ANGLE/src/tests/compiler_tests/ShaderValidation_test.cpp
>@@ -7,9 +7,9 @@
> //   Tests that malformed shaders fail compilation, and that correct shaders pass compilation.
> //
> 
>+#include "GLSLANG/ShaderLang.h"
> #include "angle_gl.h"
> #include "gtest/gtest.h"
>-#include "GLSLANG/ShaderLang.h"
> #include "tests/test_utils/ShaderCompileTreeTest.h"
> 
> using namespace sh;
>@@ -20,6 +20,7 @@ class FragmentShaderValidationTest : public ShaderCompileTreeTest
> {
>   public:
>     FragmentShaderValidationTest() {}
>+
>   protected:
>     ::GLenum getShaderType() const override { return GL_FRAGMENT_SHADER; }
>     ShShaderSpec getShaderSpec() const override { return SH_GLES3_1_SPEC; }
>@@ -101,21 +102,21 @@ class GeometryShaderValidationTest : public ShaderCompileTreeTest
>   protected:
>     void initResources(ShBuiltInResources *resources) override
>     {
>-        resources->OES_geometry_shader = 1;
>+        resources->EXT_geometry_shader = 1;
>     }
>-    ::GLenum getShaderType() const override { return GL_GEOMETRY_SHADER_OES; }
>+    ::GLenum getShaderType() const override { return GL_GEOMETRY_SHADER_EXT; }
>     ShShaderSpec getShaderSpec() const override { return SH_GLES3_1_SPEC; }
> };
> 
>-class FragmentShaderOESGeometryShaderValidationTest : public FragmentShaderValidationTest
>+class FragmentShaderEXTGeometryShaderValidationTest : public FragmentShaderValidationTest
> {
>   public:
>-    FragmentShaderOESGeometryShaderValidationTest() {}
>+    FragmentShaderEXTGeometryShaderValidationTest() {}
> 
>   protected:
>     void initResources(ShBuiltInResources *resources) override
>     {
>-        resources->OES_geometry_shader = 1;
>+        resources->EXT_geometry_shader = 1;
>     }
> };
> 
>@@ -1748,10 +1749,9 @@ TEST_F(FragmentShaderValidationTest, StructEqDifferentStruct)
> TEST_F(ComputeShaderValidationTest, Version100)
> {
>     const std::string &shaderString =
>-        "void main()\n"
>-        "layout(local_size_x=1) in;\n"
>-        "{\n"
>-        "}\n";
>+        R"(void main()
>+        {
>+        })";
>     if (compile(shaderString))
>     {
>         FAIL() << "Shader compilation succeeded, expecting failure:\n" << mInfoLog;
>@@ -1762,11 +1762,10 @@ TEST_F(ComputeShaderValidationTest, Version100)
> TEST_F(ComputeShaderValidationTest, Version300)
> {
>     const std::string &shaderString =
>-        "#version 300 es\n"
>-        "void main()\n"
>-        "layout(local_size_x=1) in;\n"
>-        "{\n"
>-        "}\n";
>+        R"(#version 300 es
>+        void main()
>+        {
>+        })";
>     if (compile(shaderString))
>     {
>         FAIL() << "Shader compilation succeeded, expecting failure:\n" << mInfoLog;
>@@ -2274,42 +2273,42 @@ TEST_F(FragmentShaderValidationTest, InvalidUseOfLocalSizeX)
> TEST_F(GeometryShaderValidationTest, InvalidUseOfLocalSizeX)
> {
>     const std::string &shaderString1 =
>-        "#version 310 es\n"
>-        "#extension GL_OES_geometry_shader : require\n"
>-        "layout (points, local_size_x = 15) in;\n"
>-        "layout (points, max_vertices = 2) out;\n"
>-        "void main()\n"
>-        "{\n"
>-        "}\n";
>+        R"(#version 310 es
>+        #extension GL_EXT_geometry_shader : require
>+        layout (points, local_size_x = 15) in;
>+        layout (points, max_vertices = 2) out;
>+        void main()
>+        {
>+        })";
> 
>     const std::string &shaderString2 =
>-        "#version 310 es\n"
>-        "#extension GL_OES_geometry_shader : require\n"
>-        "layout (points) in;\n"
>-        "layout (invocations = 2, local_size_x = 15) in;\n"
>-        "layout (points, max_vertices = 2) out;\n"
>-        "void main()\n"
>-        "{\n"
>-        "}\n";
>+        R"(#version 310 es
>+        #extension GL_EXT_geometry_shader : require
>+        layout (points) in;
>+        layout (invocations = 2, local_size_x = 15) in;
>+        layout (points, max_vertices = 2) out;
>+        void main()
>+        {
>+        })";
> 
>     const std::string &shaderString3 =
>-        "#version 310 es\n"
>-        "#extension GL_OES_geometry_shader : require\n"
>-        "layout (points) in;\n"
>-        "layout (points, local_size_x = 15, max_vertices = 2) out;\n"
>-        "void main()\n"
>-        "{\n"
>-        "}\n";
>+        R"(#version 310 es
>+        #extension GL_EXT_geometry_shader : require
>+        layout (points) in;
>+        layout (points, local_size_x = 15, max_vertices = 2) out;
>+        void main()
>+        {
>+        })";
> 
>     const std::string &shaderString4 =
>-        "#version 310 es\n"
>-        "#extension GL_OES_geometry_shader : require\n"
>-        "layout (points) in;\n"
>-        "layout (points) out;\n"
>-        "layout (max_vertices = 2, local_size_x = 15) out;\n"
>-        "void main()\n"
>-        "{\n"
>-        "}\n";
>+        R"(#version 310 es
>+        #extension GL_EXT_geometry_shader : require
>+        layout (points) in;
>+        layout (points) out;
>+        layout (max_vertices = 2, local_size_x = 15) out;
>+        void main()
>+        {
>+        })";
>     if (compile(shaderString1) || compile(shaderString2) || compile(shaderString3) ||
>         compile(shaderString4))
>     {
>@@ -4438,20 +4437,20 @@ TEST_F(VertexShaderValidationTest, ViewportIndexInESSL310)
>     }
> }
> 
>-// Test that gl_PrimitiveID is valid in fragment shader with 'GL_OES_geometry_shader' declared.
>-TEST_F(FragmentShaderOESGeometryShaderValidationTest, PrimitiveIDWithExtension)
>+// Test that gl_PrimitiveID is valid in fragment shader with 'GL_EXT_geometry_shader' declared.
>+TEST_F(FragmentShaderEXTGeometryShaderValidationTest, PrimitiveIDWithExtension)
> {
>     const std::string &shaderString =
>-        "#version 310 es\n"
>-        "#extension GL_OES_geometry_shader : require\n"
>-        "precision mediump float;\n"
>-        "layout(location = 0) out mediump vec4 fragColor;\n"
>-        "void main(void)\n"
>-        "{\n"
>-        "    vec4 data = vec4(0.1, 0.2, 0.3, 0.4);\n"
>-        "    float value = data[gl_PrimitiveID % 4];\n"
>-        "    fragColor = vec4(value, 0, 0, 1);\n"
>-        "}\n";
>+        R"(#version 310 es
>+        #extension GL_EXT_geometry_shader : require
>+        precision mediump float;
>+        layout(location = 0) out mediump vec4 fragColor;
>+        void main(void)
>+        {
>+            vec4 data = vec4(0.1, 0.2, 0.3, 0.4);
>+            float value = data[gl_PrimitiveID % 4];
>+            fragColor = vec4(value, 0, 0, 1);
>+        })";
> 
>     if (!compile(shaderString))
>     {
>@@ -4459,19 +4458,19 @@ TEST_F(FragmentShaderOESGeometryShaderValidationTest, PrimitiveIDWithExtension)
>     }
> }
> 
>-// Test that gl_PrimitiveID is invalid in fragment shader without 'GL_OES_geometry_shader' declared.
>-TEST_F(FragmentShaderOESGeometryShaderValidationTest, PrimitiveIDWithoutExtension)
>+// Test that gl_PrimitiveID is invalid in fragment shader without 'GL_EXT_geometry_shader' declared.
>+TEST_F(FragmentShaderEXTGeometryShaderValidationTest, PrimitiveIDWithoutExtension)
> {
>     const std::string &shaderString =
>-        "#version 310 es\n"
>-        "precision mediump float;\n"
>-        "layout(location = 0) out mediump vec4 fragColor;\n"
>-        "void main(void)\n"
>-        "{\n"
>-        "    vec4 data = vec4(0.1, 0.2, 0.3, 0.4);\n"
>-        "    float value = data[gl_PrimitiveID % 4];\n"
>-        "    fragColor = vec4(value, 0, 0, 1);\n"
>-        "}\n";
>+        R"(#version 310 es
>+        precision mediump float;
>+        layout(location = 0) out mediump vec4 fragColor;
>+        void main(void)
>+        {
>+            vec4 data = vec4(0.1, 0.2, 0.3, 0.4);
>+            float value = data[gl_PrimitiveID % 4];
>+            fragColor = vec4(value, 0, 0, 1);
>+        })";
> 
>     if (compile(shaderString))
>     {
>@@ -4480,18 +4479,18 @@ TEST_F(FragmentShaderOESGeometryShaderValidationTest, PrimitiveIDWithoutExtensio
> }
> 
> // Test that gl_PrimitiveID cannot be l-value in fragment shader.
>-TEST_F(FragmentShaderOESGeometryShaderValidationTest, AssignValueToPrimitiveID)
>+TEST_F(FragmentShaderEXTGeometryShaderValidationTest, AssignValueToPrimitiveID)
> {
>     const std::string &shaderString =
>-        "#version 310 es\n"
>-        "#extension GL_OES_geometry_shader : require\n"
>-        "precision mediump float;\n"
>-        "layout(location = 0) out mediump vec4 fragColor;\n"
>-        "void main(void)\n"
>-        "{\n"
>-        "    gl_PrimitiveID = 1;\n"
>-        "    fragColor = vec4(1.0, 0.0, 0.0, 1.0);\n"
>-        "}\n";
>+        R"(#version 310 es
>+        #extension GL_EXT_geometry_shader : require
>+        precision mediump float;
>+        layout(location = 0) out mediump vec4 fragColor;
>+        void main(void)
>+        {
>+            gl_PrimitiveID = 1;
>+            fragColor = vec4(1.0, 0.0, 0.0, 1.0);
>+        })";
> 
>     if (compile(shaderString))
>     {
>@@ -4499,20 +4498,20 @@ TEST_F(FragmentShaderOESGeometryShaderValidationTest, AssignValueToPrimitiveID)
>     }
> }
> 
>-// Test that gl_Layer is valid in fragment shader with 'GL_OES_geometry_shader' declared.
>-TEST_F(FragmentShaderOESGeometryShaderValidationTest, LayerWithExtension)
>+// Test that gl_Layer is valid in fragment shader with 'GL_EXT_geometry_shader' declared.
>+TEST_F(FragmentShaderEXTGeometryShaderValidationTest, LayerWithExtension)
> {
>     const std::string &shaderString =
>-        "#version 310 es\n"
>-        "#extension GL_OES_geometry_shader : require\n"
>-        "precision mediump float;\n"
>-        "layout(location = 0) out mediump vec4 fragColor;\n"
>-        "void main(void)\n"
>-        "{\n"
>-        "    vec4 data = vec4(0.1, 0.2, 0.3, 0.4);\n"
>-        "    float value = data[gl_Layer % 4];\n"
>-        "    fragColor = vec4(value, 0, 0, 1);\n"
>-        "}\n";
>+        R"(#version 310 es
>+        #extension GL_EXT_geometry_shader : require
>+        precision mediump float;
>+        layout(location = 0) out mediump vec4 fragColor;
>+        void main(void)
>+        {
>+            vec4 data = vec4(0.1, 0.2, 0.3, 0.4);
>+            float value = data[gl_Layer % 4];
>+            fragColor = vec4(value, 0, 0, 1);
>+        })";
> 
>     if (!compile(shaderString))
>     {
>@@ -4520,19 +4519,19 @@ TEST_F(FragmentShaderOESGeometryShaderValidationTest, LayerWithExtension)
>     }
> }
> 
>-// Test that gl_Layer is invalid in fragment shader without 'GL_OES_geometry_shader' declared.
>-TEST_F(FragmentShaderOESGeometryShaderValidationTest, LayerWithoutExtension)
>+// Test that gl_Layer is invalid in fragment shader without 'GL_EXT_geometry_shader' declared.
>+TEST_F(FragmentShaderEXTGeometryShaderValidationTest, LayerWithoutExtension)
> {
>     const std::string &shaderString =
>-        "#version 310 es\n"
>-        "precision mediump float;\n"
>-        "layout(location = 0) out mediump vec4 fragColor;\n"
>-        "void main(void)\n"
>-        "{\n"
>-        "    vec4 data = vec4(0.1, 0.2, 0.3, 0.4);\n"
>-        "    float value = data[gl_Layer % 4];\n"
>-        "    fragColor = vec4(value, 0, 0, 1);\n"
>-        "}\n";
>+        R"(#version 310 es
>+        precision mediump float;
>+        layout(location = 0) out mediump vec4 fragColor;
>+        void main(void)
>+        {
>+            vec4 data = vec4(0.1, 0.2, 0.3, 0.4);
>+            float value = data[gl_Layer % 4];
>+            fragColor = vec4(value, 0, 0, 1);
>+        })";
> 
>     if (compile(shaderString))
>     {
>@@ -4541,18 +4540,18 @@ TEST_F(FragmentShaderOESGeometryShaderValidationTest, LayerWithoutExtension)
> }
> 
> // Test that gl_Layer cannot be l-value in fragment shader.
>-TEST_F(FragmentShaderOESGeometryShaderValidationTest, AssignValueToLayer)
>+TEST_F(FragmentShaderEXTGeometryShaderValidationTest, AssignValueToLayer)
> {
>     const std::string &shaderString =
>-        "#version 310 es\n"
>-        "#extension GL_OES_geometry_shader : require\n"
>-        "precision mediump float;\n"
>-        "layout(location = 0) out mediump vec4 fragColor;\n"
>-        "void main(void)\n"
>-        "{\n"
>-        "    gl_Layer = 1;\n"
>-        "    fragColor = vec4(1.0, 0.0, 0.0, 1.0);\n"
>-        "}\n";
>+        R"(#version 310 es
>+        #extension GL_EXT_geometry_shader : require
>+        precision mediump float;
>+        layout(location = 0) out mediump vec4 fragColor;
>+        void main(void)
>+        {
>+            gl_Layer = 1;
>+            fragColor = vec4(1.0, 0.0, 0.0, 1.0);
>+        })";
> 
>     if (compile(shaderString))
>     {
>@@ -4560,13 +4559,13 @@ TEST_F(FragmentShaderOESGeometryShaderValidationTest, AssignValueToLayer)
>     }
> }
> 
>-// Test that all built-in constants defined in GL_OES_geometry_shader can be used in fragment shader
>-// with 'GL_OES_geometry_shader' declared.
>-TEST_F(FragmentShaderOESGeometryShaderValidationTest, GeometryShaderBuiltInConstants)
>+// Test that all built-in constants defined in GL_EXT_geometry_shader can be used in fragment shader
>+// with 'GL_EXT_geometry_shader' declared.
>+TEST_F(FragmentShaderEXTGeometryShaderValidationTest, GeometryShaderBuiltInConstants)
> {
>     const std::string &kShaderHeader =
>         R"(#version 310 es
>-        #extension GL_OES_geometry_shader : require
>+        #extension GL_EXT_geometry_shader : require
>         precision mediump float;
>         layout(location = 0) out mediump vec4 fragColor;
>         void main(void)
>@@ -4574,10 +4573,14 @@ TEST_F(FragmentShaderOESGeometryShaderValidationTest, GeometryShaderBuiltInConst
>             int val = )";
> 
>     const std::array<std::string, 9> kGeometryShaderBuiltinConstants = {{
>-        "gl_MaxGeometryInputComponents", "gl_MaxGeometryOutputComponents",
>-        "gl_MaxGeometryImageUniforms", "gl_MaxGeometryTextureImageUnits",
>-        "gl_MaxGeometryOutputVertices", "gl_MaxGeometryTotalOutputComponents",
>-        "gl_MaxGeometryUniformComponents", "gl_MaxGeometryAtomicCounters",
>+        "gl_MaxGeometryInputComponents",
>+        "gl_MaxGeometryOutputComponents",
>+        "gl_MaxGeometryImageUniforms",
>+        "gl_MaxGeometryTextureImageUnits",
>+        "gl_MaxGeometryOutputVertices",
>+        "gl_MaxGeometryTotalOutputComponents",
>+        "gl_MaxGeometryUniformComponents",
>+        "gl_MaxGeometryAtomicCounters",
>         "gl_MaxGeometryAtomicCounterBuffers",
>     }};
> 
>@@ -4597,9 +4600,9 @@ TEST_F(FragmentShaderOESGeometryShaderValidationTest, GeometryShaderBuiltInConst
>     }
> }
> 
>-// Test that any built-in constants defined in GL_OES_geometry_shader cannot be used in fragment
>-// shader without 'GL_OES_geometry_shader' declared.
>-TEST_F(FragmentShaderOESGeometryShaderValidationTest,
>+// Test that any built-in constants defined in GL_EXT_geometry_shader cannot be used in fragment
>+// shader without 'GL_EXT_geometry_shader' declared.
>+TEST_F(FragmentShaderEXTGeometryShaderValidationTest,
>        GeometryShaderBuiltInConstantsWithoutExtension)
> {
>     const std::string &kShaderHeader =
>@@ -4611,10 +4614,14 @@ TEST_F(FragmentShaderOESGeometryShaderValidationTest,
>         "    int val = ";
> 
>     const std::array<std::string, 9> kGeometryShaderBuiltinConstants = {{
>-        "gl_MaxGeometryInputComponents", "gl_MaxGeometryOutputComponents",
>-        "gl_MaxGeometryImageUniforms", "gl_MaxGeometryTextureImageUnits",
>-        "gl_MaxGeometryOutputVertices", "gl_MaxGeometryTotalOutputComponents",
>-        "gl_MaxGeometryUniformComponents", "gl_MaxGeometryAtomicCounters",
>+        "gl_MaxGeometryInputComponents",
>+        "gl_MaxGeometryOutputComponents",
>+        "gl_MaxGeometryImageUniforms",
>+        "gl_MaxGeometryTextureImageUnits",
>+        "gl_MaxGeometryOutputVertices",
>+        "gl_MaxGeometryTotalOutputComponents",
>+        "gl_MaxGeometryUniformComponents",
>+        "gl_MaxGeometryAtomicCounters",
>         "gl_MaxGeometryAtomicCounterBuffers",
>     }};
> 
>@@ -4655,20 +4662,20 @@ TEST_F(VertexShaderValidationTest, InterfaceBlockUsingConstQualifier)
>     }
> }
> 
>-// Test that using shader io blocks without declaration of GL_OES_shader_io_block is not allowed.
>+// Test that using shader io blocks without declaration of GL_EXT_shader_io_block is not allowed.
> TEST_F(VertexShaderValidationTest, IOBlockWithoutExtension)
> {
>     const std::string &shaderString =
>-        "#version 310 es\n"
>-        "out block\n"
>-        "{\n"
>-        "    vec2 value;\n"
>-        "} VSOutput[2];\n"
>-        "void main()\n"
>-        "{\n"
>-        "    int i = 0;\n"
>-        "    vec2 value1 = VSOutput[i].value;\n"
>-        "}\n";
>+        R"(#version 310 es
>+        out block
>+        {
>+            vec2 value;
>+        } VSOutput[2];
>+        void main()
>+        {
>+            int i = 0;
>+            vec2 value1 = VSOutput[i].value;
>+        })";
> 
>     if (compile(shaderString))
>     {
>@@ -4676,22 +4683,22 @@ TEST_F(VertexShaderValidationTest, IOBlockWithoutExtension)
>     }
> }
> 
>-// Test that using shader io blocks without declaration of GL_OES_shader_io_block is not allowed.
>+// Test that using shader io blocks without declaration of GL_EXT_shader_io_block is not allowed.
> TEST_F(FragmentShaderValidationTest, IOBlockWithoutExtension)
> {
>     const std::string &shaderString =
>-        "#version 310 es\n"
>-        "precision mediump float;\n"
>-        "in block\n"
>-        "{\n"
>-        "    vec4 i_color;\n"
>-        "} FSInput[2];\n"
>-        "out vec4 o_color;\n"
>-        "void main()\n"
>-        "{\n"
>-        "    int i = 0;\n"
>-        "    o_color = FSInput[i].i_color;"
>-        "}\n";
>+        R"(#version 310 es
>+        precision mediump float;
>+        in block
>+        {
>+            vec4 i_color;
>+        } FSInput[2];
>+        out vec4 o_color;
>+        void main()
>+        {
>+            int i = 0;
>+            o_color = FSInput[i].i_color;
>+        })";
> 
>     if (compile(shaderString))
>     {
>@@ -5071,7 +5078,8 @@ TEST_F(FragmentShaderValidationTest, SwitchFinalCaseHasEmptyDeclaration)
>     }
> }
> 
>-// Test that nothing is needed after the final case in a switch statement in ESSL 3.10.
>+// The final case in a switch statement can't be empty in ESSL 3.10 either. This is the intent of
>+// the spec though public spec in early 2018 didn't reflect this yet.
> TEST_F(FragmentShaderValidationTest, SwitchFinalCaseEmptyESSL310)
> {
>     const std::string &shaderString =
>@@ -5089,9 +5097,9 @@ TEST_F(FragmentShaderValidationTest, SwitchFinalCaseEmptyESSL310)
>             }
>         })";
> 
>-    if (!compile(shaderString))
>+    if (compile(shaderString))
>     {
>-        FAIL() << "Shader compilation failed, expecting success:\n" << mInfoLog;
>+        FAIL() << "Shader compilation succeeded, expecting failure:\n" << mInfoLog;
>     }
> }
> 
>@@ -5554,3 +5562,504 @@ TEST_F(FragmentShaderValidationTest, AtomicAddWithNonStorageVariable)
>         FAIL() << "Shader compilation succeeded, expecting failure:\n" << mInfoLog;
>     }
> }
>+
>+// Test that negative indexing of a matrix doesn't result in an assert.
>+TEST_F(FragmentShaderValidationTest, MatrixNegativeIndex)
>+{
>+    const std::string &shaderString =
>+        R"(
>+        precision mediump float;
>+
>+        void main()
>+        {
>+            gl_FragColor = mat4(1.0)[-1];
>+        })";
>+
>+    if (compile(shaderString))
>+    {
>+        FAIL() << "Shader compilation succeeded, expecting failure:\n" << mInfoLog;
>+    }
>+}
>+
>+// Global variable initializers need to be constant expressions. Test with assigning a ternary
>+// expression that ANGLE can fold.
>+TEST_F(FragmentShaderValidationTest, AssignConstantFoldedFromNonConstantTernaryToGlobal)
>+{
>+    const std::string &shaderString =
>+        R"(#version 300 es
>+        precision mediump float;
>+
>+        uniform float u;
>+        float f = true ? 1.0 : u;
>+
>+        out vec4 my_FragColor;
>+
>+        void main()
>+        {
>+           my_FragColor = vec4(f);
>+        })";
>+    if (compile(shaderString))
>+    {
>+        FAIL() << "Shader compilation succeeded, expecting failure:\n" << mInfoLog;
>+    }
>+}
>+
>+// Global variable initializers need to be constant expressions. Test with assigning a ternary
>+// expression that ANGLE can fold.
>+TEST_F(FragmentShaderValidationTest,
>+       AssignConstantArrayVariableFoldedFromNonConstantTernaryToGlobal)
>+{
>+    const std::string &shaderString =
>+        R"(#version 300 es
>+        precision mediump float;
>+
>+        uniform float u[2];
>+        const float c[2] = float[2](1.0, 2.0);
>+        float f[2] = true ? c : u;
>+
>+        out vec4 my_FragColor;
>+
>+        void main()
>+        {
>+           my_FragColor = vec4(f[0], f[1], 0.0, 1.0);
>+        })";
>+    if (compile(shaderString))
>+    {
>+        FAIL() << "Shader compilation succeeded, expecting failure:\n" << mInfoLog;
>+    }
>+}
>+
>+// Test going past the struct nesting limit while simultaneously using invalid nested struct
>+// definitions. This makes sure that the code generating an error message about going past the
>+// struct nesting limit does not access the name of a nameless struct definition.
>+TEST_F(WebGL1FragmentShaderValidationTest, StructNestingLimitWithNestedStructDefinitions)
>+{
>+    const std::string &shaderString =
>+        R"(
>+        precision mediump float;
>+
>+        struct
>+        {
>+            struct
>+            {
>+                struct
>+                {
>+                    struct
>+                    {
>+                        struct
>+                        {
>+                            struct
>+                            {
>+                                float f;
>+                            } s5;
>+                        } s4;
>+                    } s3;
>+                } s2;
>+            } s1;
>+        } s0;
>+
>+        void main(void)
>+        {
>+            gl_FragColor = vec4(s0.s1.s2.s3.s4.s5.f);
>+        })";
>+    if (compile(shaderString))
>+    {
>+        FAIL() << "Shader compilation succeeded, expecting failure:\n" << mInfoLog;
>+    }
>+}
>+
>+// Test that the result of a sequence operator is not a constant-expression.
>+// ESSL 3.00 section 12.43.
>+TEST_F(FragmentShaderValidationTest, CommaReturnsNonConstant)
>+{
>+    const std::string &shaderString =
>+        R"(#version 300 es
>+
>+        precision highp float;
>+        out vec4 my_FragColor;
>+
>+        void main(void)
>+        {
>+            const int i = (0, 0);
>+            my_FragColor = vec4(i);
>+        })";
>+    if (compile(shaderString))
>+    {
>+        FAIL() << "Shader compilation succeeded, expecting failure:\n" << mInfoLog;
>+    }
>+}
>+
>+// Test that the result of indexing into an array constructor with some non-constant arguments is
>+// not a constant expression.
>+TEST_F(FragmentShaderValidationTest,
>+       IndexingIntoArrayConstructorWithNonConstantArgumentsIsNotConstantExpression)
>+{
>+    const std::string &shaderString =
>+        R"(#version 310 es
>+        precision highp float;
>+        uniform float u;
>+        out float my_FragColor;
>+        void main()
>+        {
>+            const float f = float[2](u, 1.0)[1];
>+            my_FragColor = f;
>+        })";
>+    if (compile(shaderString))
>+    {
>+        FAIL() << "Shader compilation succeeded, expecting failure:\n" << mInfoLog;
>+    }
>+}
>+
>+// Test that the type of an initializer of a constant variable needs to match.
>+TEST_F(FragmentShaderValidationTest, ConstantInitializerTypeMismatch)
>+{
>+    const std::string &shaderString =
>+        R"(
>+        precision mediump float;
>+        const float f = 0;
>+
>+        void main()
>+        {
>+            gl_FragColor = vec4(f);
>+        })";
>+    if (compile(shaderString))
>+    {
>+        FAIL() << "Shader compilation succeeded, expecting failure:\n" << mInfoLog;
>+    }
>+}
>+
>+// Test that redeclaring a built-in is an error in ESSL 1.00. ESSL 1.00.17 section 4.2.6 disallows
>+// "redefinition" of built-ins - it's not very explicit about redeclaring them, but we treat this as
>+// an error. The redeclaration cannot serve any purpose since it can't be accompanied by a
>+// definition.
>+TEST_F(FragmentShaderValidationTest, RedeclaringBuiltIn)
>+{
>+    const std::string &shaderString =
>+        R"(
>+        precision mediump float;
>+        float sin(float x);
>+
>+        void main()
>+        {
>+            gl_FragColor = vec4(0.0);
>+        })";
>+    if (compile(shaderString))
>+    {
>+        FAIL() << "Shader compilation succeeded, expecting failure:\n" << mInfoLog;
>+    }
>+}
>+
>+// Redefining a built-in that is not available in the current shader stage is assumed to be not an
>+// error. Test with redefining groupMemoryBarrier() in fragment shader. The built-in
>+// groupMemoryBarrier() is only available in compute shaders.
>+TEST_F(FragmentShaderValidationTest, RedeclaringBuiltInFromAnotherShaderStage)
>+{
>+    const std::string &shaderString =
>+        R"(#version 310 es
>+        precision mediump float;
>+        out vec4 my_FragColor;
>+        float groupMemoryBarrier() { return 1.0; }
>+
>+        void main()
>+        {
>+            my_FragColor = vec4(groupMemoryBarrier());
>+        })";
>+    if (!compile(shaderString))
>+    {
>+        FAIL() << "Shader compilation failed, expecting success:\n" << mInfoLog;
>+    }
>+}
>+
>+// Test that standard derivative functions that are in core ESSL 3.00 compile successfully.
>+TEST_F(FragmentShaderValidationTest, ESSL300StandardDerivatives)
>+{
>+    const std::string &shaderString =
>+        R"(#version 300 es
>+        precision mediump float;
>+        in vec4 iv;
>+        out vec4 my_FragColor;
>+
>+        void main()
>+        {
>+            vec4 v4 = vec4(0.0);
>+            v4 += fwidth(iv);
>+            v4 += dFdx(iv);
>+            v4 += dFdy(iv);
>+            my_FragColor = v4;
>+        })";
>+    if (!compile(shaderString))
>+    {
>+        FAIL() << "Shader compilation failed, expecting success:\n" << mInfoLog;
>+    }
>+}
>+
>+// Test that vertex shader built-in gl_Position is not accessible in fragment shader.
>+TEST_F(FragmentShaderValidationTest, GlPosition)
>+{
>+    const std::string &shaderString =
>+        R"(#version 300 es
>+        precision mediump float;
>+        in vec4 iv;
>+        out vec4 my_FragColor;
>+
>+        void main()
>+        {
>+            gl_Position = iv;
>+            my_FragColor = iv;
>+        })";
>+    if (compile(shaderString))
>+    {
>+        FAIL() << "Shader compilation succeeded, expecting failure:\n" << mInfoLog;
>+    }
>+}
>+
>+// Test that compute shader built-in gl_LocalInvocationID is not accessible in fragment shader.
>+TEST_F(FragmentShaderValidationTest, GlLocalInvocationID)
>+{
>+    const std::string &shaderString =
>+        R"(#version 310 es
>+        precision mediump float;
>+        out vec3 my_FragColor;
>+
>+        void main()
>+        {
>+            my_FragColor = vec3(gl_LocalInvocationID);
>+        })";
>+    if (compile(shaderString))
>+    {
>+        FAIL() << "Shader compilation succeeded, expecting failure:\n" << mInfoLog;
>+    }
>+}
>+
>+// Test that fragment shader built-in gl_FragCoord is not accessible in vertex shader.
>+TEST_F(VertexShaderValidationTest, GlFragCoord)
>+{
>+    const std::string &shaderString =
>+        R"(#version 300 es
>+        precision mediump float;
>+
>+        void main()
>+        {
>+            gl_Position = vec4(gl_FragCoord);
>+        })";
>+    if (compile(shaderString))
>+    {
>+        FAIL() << "Shader compilation succeeded, expecting failure:\n" << mInfoLog;
>+    }
>+}
>+
>+// Test that a long sequence of repeated swizzling on an l-value does not cause a stack overflow.
>+TEST_F(VertexShaderValidationTest, LValueRepeatedSwizzle)
>+{
>+    std::stringstream shaderString;
>+    shaderString << R"(#version 300 es
>+        precision mediump float;
>+
>+        uniform vec2 u;
>+
>+        void main()
>+        {
>+            vec2 f;
>+            f)";
>+    for (int i = 0; i < 1000; ++i)
>+    {
>+        shaderString << ".yx.yx";
>+    }
>+    shaderString << R"( = vec2(0.0);
>+        })";
>+
>+    if (!compile(shaderString.str()))
>+    {
>+        FAIL() << "Shader compilation failed, expecting success:\n" << mInfoLog;
>+    }
>+}
>+
>+// Test that swizzling that contains duplicate components can't form an l-value, even if it is
>+// swizzled again so that the final result does not contain duplicate components.
>+TEST_F(VertexShaderValidationTest, LValueSwizzleDuplicateComponents)
>+{
>+
>+    const std::string &shaderString = R"(#version 300 es
>+        precision mediump float;
>+
>+        void main()
>+        {
>+            vec2 f;
>+            (f.xxyy).xz = vec2(0.0);
>+        })";
>+
>+    if (compile(shaderString))
>+    {
>+        FAIL() << "Shader compilation succeeded, expecting failure:\n" << mInfoLog;
>+    }
>+}
>+
>+// Test that a fragment shader with nested if statements without braces compiles successfully.
>+TEST_F(FragmentShaderValidationTest, HandleIfInnerIfStatementAlwaysTriviallyPruned)
>+{
>+    const std::string &shaderString =
>+        R"(precision mediump float;
>+        void main()
>+        {
>+            if (true)
>+                if (false)
>+                    gl_FragColor = vec4(0.0);
>+        })";
>+    if (!compile(shaderString))
>+    {
>+        FAIL() << "Shader compilation failed, expecting success:\n" << mInfoLog;
>+    }
>+}
>+
>+// Test that a fragment shader with an if statement nested in a loop without braces compiles
>+// successfully.
>+TEST_F(FragmentShaderValidationTest, HandleLoopInnerIfStatementAlwaysTriviallyPruned)
>+{
>+    const std::string &shaderString =
>+        R"(precision mediump float;
>+        void main()
>+        {
>+            while (false)
>+                if (false)
>+                    gl_FragColor = vec4(0.0);
>+        })";
>+    if (!compile(shaderString))
>+    {
>+        FAIL() << "Shader compilation failed, expecting success:\n" << mInfoLog;
>+    }
>+}
>+
>+// Test that declaring both gl_FragColor and gl_FragData invariant is not an error. The GLSL ES 1.00
>+// spec only disallows writing to both of them. ANGLE extends this validation to also cover reads,
>+// but it makes sense not to treat declaring them both invariant as an error.
>+TEST_F(FragmentShaderValidationTest, DeclareBothBuiltInFragmentOutputsInvariant)
>+{
>+    const std::string &shaderString =
>+        R"(
>+        invariant gl_FragColor;
>+        invariant gl_FragData;
>+        precision mediump float;
>+        void main()
>+        {
>+            gl_FragColor = vec4(0.0);
>+        })";
>+    if (!compile(shaderString))
>+    {
>+        FAIL() << "Shader compilation failed, expecting success:\n" << mInfoLog;
>+    }
>+}
>+
>+// Test that a case cannot be placed inside a block nested inside a switch statement. GLSL ES 3.10
>+// section 6.2.
>+TEST_F(FragmentShaderValidationTest, CaseInsideBlock)
>+{
>+    const std::string &shaderString =
>+        R"(#version 300 es
>+        precision mediump float;
>+        uniform int u;
>+        out vec4 my_FragColor;
>+        void main()
>+        {
>+            switch (u)
>+            {
>+                case 1:
>+                {
>+                    case 0:
>+                        my_FragColor = vec4(0.0);
>+                }
>+                default:
>+                    my_FragColor = vec4(1.0);
>+            }
>+        })";
>+    if (compile(shaderString))
>+    {
>+        FAIL() << "Shader compilation succeeded, expecting failure:\n" << mInfoLog;
>+    }
>+}
>+
>+// Test using a value from a constant array as a case label.
>+TEST_F(FragmentShaderValidationTest, ValueFromConstantArrayAsCaseLabel)
>+{
>+    const std::string &shaderString =
>+        R"(#version 300 es
>+        precision mediump float;
>+        uniform int u;
>+        const int[3] arr = int[3](2, 1, 0);
>+        out vec4 my_FragColor;
>+        void main()
>+        {
>+            switch (u)
>+            {
>+                case arr[1]:
>+                    my_FragColor = vec4(0.0);
>+                case 2:
>+                case 0:
>+                default:
>+                    my_FragColor = vec4(1.0);
>+            }
>+        })";
>+    if (!compile(shaderString))
>+    {
>+        FAIL() << "Shader compilation failed, expecting success:\n" << mInfoLog;
>+    }
>+}
>+
>+// Test using a value from a constant array as a fragment output index.
>+TEST_F(FragmentShaderValidationTest, ValueFromConstantArrayAsFragmentOutputIndex)
>+{
>+    const std::string &shaderString =
>+        R"(#version 300 es
>+        precision mediump float;
>+        uniform int u;
>+        const int[3] arr = int[3](4, 1, 0);
>+        out vec4 my_FragData[2];
>+        void main()
>+        {
>+            my_FragData[arr[1]] = vec4(0.0);
>+            my_FragData[arr[2]] = vec4(0.0);
>+        })";
>+    if (!compile(shaderString))
>+    {
>+        FAIL() << "Shader compilation failed, expecting success:\n" << mInfoLog;
>+    }
>+}
>+
>+// Test using a value from a constant array as an array size.
>+TEST_F(FragmentShaderValidationTest, ValueFromConstantArrayAsArraySize)
>+{
>+    const std::string &shaderString =
>+        R"(#version 300 es
>+        precision mediump float;
>+        uniform int u;
>+        const int[3] arr = int[3](0, 2, 0);
>+        const int[arr[1]] arr2 = int[2](2, 1);
>+        out vec4 my_FragColor;
>+        void main()
>+        {
>+            my_FragColor = vec4(arr2[1]);
>+        })";
>+    if (!compile(shaderString))
>+    {
>+        FAIL() << "Shader compilation failed, expecting success:\n" << mInfoLog;
>+    }
>+}
>+
>+// Test that an invalid struct with void fields doesn't crash or assert when used in a comma
>+// operator. This is a regression test.
>+TEST_F(FragmentShaderValidationTest, InvalidStructWithVoidFieldsInComma)
>+{
>+    // The struct needed the two fields for the bug to repro.
>+    const std::string &shaderString =
>+        R"(#version 300 es
>+precision highp float;
>+
>+struct T { void a[8], c; };
>+
>+void main() {
>+    0.0, T();
>+})";
>+    if (compile(shaderString))
>+    {
>+        FAIL() << "Shader compilation succeeded, expecting failure:\n" << mInfoLog;
>+    }
>+}
>\ No newline at end of file
>diff --git a/Source/ThirdParty/ANGLE/src/tests/compiler_tests/ShaderVariable_test.cpp b/Source/ThirdParty/ANGLE/src/tests/compiler_tests/ShaderVariable_test.cpp
>index 9dadc54980a..f3a0f238f60 100644
>--- a/Source/ThirdParty/ANGLE/src/tests/compiler_tests/ShaderVariable_test.cpp
>+++ b/Source/ThirdParty/ANGLE/src/tests/compiler_tests/ShaderVariable_test.cpp
>@@ -7,10 +7,10 @@
> //   Some tests for shader inspection
> //
> 
>+#include "GLSLANG/ShaderLang.h"
> #include "angle_gl.h"
> #include "compiler/translator/Compiler.h"
> #include "gtest/gtest.h"
>-#include "GLSLANG/ShaderLang.h"
> 
> namespace sh
> {
>@@ -26,22 +26,22 @@ TEST(ShaderVariableTest, FindInfoByMappedName)
>     // };
>     // B uni[2];
>     ShaderVariable uni(0, 2);
>-    uni.name = "uni";
>+    uni.name       = "uni";
>     uni.mappedName = "m_uni";
>     uni.structName = "B";
>     {
>         ShaderVariable a(0, 3);
>-        a.name = "a";
>+        a.name       = "a";
>         a.mappedName = "m_a";
>         a.structName = "A";
>         {
>             ShaderVariable x(GL_FLOAT, 2);
>-            x.name = "x";
>+            x.name       = "x";
>             x.mappedName = "m_x";
>             a.fields.push_back(x);
> 
>             ShaderVariable y(GL_FLOAT_VEC3);
>-            y.name = "y";
>+            y.name       = "y";
>             y.mappedName = "m_y";
>             a.fields.push_back(y);
>         }
>@@ -52,34 +52,28 @@ TEST(ShaderVariableTest, FindInfoByMappedName)
>     std::string originalFullName;
> 
>     std::string mappedFullName = "wrongName";
>-    EXPECT_FALSE(uni.findInfoByMappedName(
>-        mappedFullName, &leafVar, &originalFullName));
>+    EXPECT_FALSE(uni.findInfoByMappedName(mappedFullName, &leafVar, &originalFullName));
> 
>     mappedFullName = "m_uni";
>-    EXPECT_TRUE(uni.findInfoByMappedName(
>-        mappedFullName, &leafVar, &originalFullName));
>+    EXPECT_TRUE(uni.findInfoByMappedName(mappedFullName, &leafVar, &originalFullName));
>     EXPECT_EQ(&uni, leafVar);
>     EXPECT_STREQ("uni", originalFullName.c_str());
> 
>     mappedFullName = "m_uni[0].m_a[1].wrongName";
>-    EXPECT_FALSE(uni.findInfoByMappedName(
>-        mappedFullName, &leafVar, &originalFullName));
>+    EXPECT_FALSE(uni.findInfoByMappedName(mappedFullName, &leafVar, &originalFullName));
> 
>     mappedFullName = "m_uni[0].m_a[1].m_x";
>-    EXPECT_TRUE(uni.findInfoByMappedName(
>-        mappedFullName, &leafVar, &originalFullName));
>+    EXPECT_TRUE(uni.findInfoByMappedName(mappedFullName, &leafVar, &originalFullName));
>     EXPECT_EQ(&(uni.fields[0].fields[0]), leafVar);
>     EXPECT_STREQ("uni[0].a[1].x", originalFullName.c_str());
> 
>     mappedFullName = "m_uni[0].m_a[1].m_x[0]";
>-    EXPECT_TRUE(uni.findInfoByMappedName(
>-        mappedFullName, &leafVar, &originalFullName));
>+    EXPECT_TRUE(uni.findInfoByMappedName(mappedFullName, &leafVar, &originalFullName));
>     EXPECT_EQ(&(uni.fields[0].fields[0]), leafVar);
>     EXPECT_STREQ("uni[0].a[1].x[0]", originalFullName.c_str());
> 
>     mappedFullName = "m_uni[0].m_a[1].m_y";
>-    EXPECT_TRUE(uni.findInfoByMappedName(
>-        mappedFullName, &leafVar, &originalFullName));
>+    EXPECT_TRUE(uni.findInfoByMappedName(mappedFullName, &leafVar, &originalFullName));
>     EXPECT_EQ(&(uni.fields[0].fields[1]), leafVar);
>     EXPECT_STREQ("uni[0].a[1].y", originalFullName.c_str());
> }
>@@ -92,17 +86,17 @@ TEST(ShaderVariableTest, IsSameUniformWithDifferentFieldOrder)
>     // };
>     // uniform A uni;
>     Uniform vx_a;
>-    vx_a.name = "uni";
>+    vx_a.name       = "uni";
>     vx_a.mappedName = "m_uni";
>     vx_a.structName = "A";
>     {
>         ShaderVariable x(GL_FLOAT);
>-        x.name = "x";
>+        x.name       = "x";
>         x.mappedName = "m_x";
>         vx_a.fields.push_back(x);
> 
>         ShaderVariable y(GL_FLOAT);
>-        y.name = "y";
>+        y.name       = "y";
>         y.mappedName = "m_y";
>         vx_a.fields.push_back(y);
>     }
>@@ -113,17 +107,17 @@ TEST(ShaderVariableTest, IsSameUniformWithDifferentFieldOrder)
>     // };
>     // uniform A uni;
>     Uniform fx_a;
>-    fx_a.name = "uni";
>+    fx_a.name       = "uni";
>     fx_a.mappedName = "m_uni";
>     fx_a.structName = "A";
>     {
>         ShaderVariable y(GL_FLOAT);
>-        y.name = "y";
>+        y.name       = "y";
>         y.mappedName = "m_y";
>         fx_a.fields.push_back(y);
> 
>         ShaderVariable x(GL_FLOAT);
>-        x.name = "x";
>+        x.name       = "x";
>         x.mappedName = "m_x";
>         fx_a.fields.push_back(x);
>     }
>@@ -139,17 +133,17 @@ TEST(ShaderVariableTest, IsSameUniformWithDifferentStructNames)
>     // };
>     // uniform A uni;
>     Uniform vx_a;
>-    vx_a.name = "uni";
>+    vx_a.name       = "uni";
>     vx_a.mappedName = "m_uni";
>     vx_a.structName = "A";
>     {
>         ShaderVariable x(GL_FLOAT);
>-        x.name = "x";
>+        x.name       = "x";
>         x.mappedName = "m_x";
>         vx_a.fields.push_back(x);
> 
>         ShaderVariable y(GL_FLOAT);
>-        y.name = "y";
>+        y.name       = "y";
>         y.mappedName = "m_y";
>         vx_a.fields.push_back(y);
>     }
>@@ -160,16 +154,16 @@ TEST(ShaderVariableTest, IsSameUniformWithDifferentStructNames)
>     // };
>     // uniform B uni;
>     Uniform fx_a;
>-    fx_a.name = "uni";
>+    fx_a.name       = "uni";
>     fx_a.mappedName = "m_uni";
>     {
>         ShaderVariable x(GL_FLOAT);
>-        x.name = "x";
>+        x.name       = "x";
>         x.mappedName = "m_x";
>         fx_a.fields.push_back(x);
> 
>         ShaderVariable y(GL_FLOAT);
>-        y.name = "y";
>+        y.name       = "y";
>         y.mappedName = "m_y";
>         fx_a.fields.push_back(y);
>     }
>@@ -188,20 +182,20 @@ TEST(ShaderVariableTest, IsSameVaryingWithDifferentInvariance)
> {
>     // invariant varying float vary;
>     Varying vx;
>-    vx.type = GL_FLOAT;
>-    vx.precision = GL_MEDIUM_FLOAT;
>-    vx.name = "vary";
>-    vx.mappedName = "m_vary";
>-    vx.staticUse = true;
>+    vx.type        = GL_FLOAT;
>+    vx.precision   = GL_MEDIUM_FLOAT;
>+    vx.name        = "vary";
>+    vx.mappedName  = "m_vary";
>+    vx.staticUse   = true;
>     vx.isInvariant = true;
> 
>     // varying float vary;
>     Varying fx;
>-    fx.type = GL_FLOAT;
>-    fx.precision = GL_MEDIUM_FLOAT;
>-    fx.name = "vary";
>-    fx.mappedName = "m_vary";
>-    fx.staticUse = true;
>+    fx.type        = GL_FLOAT;
>+    fx.precision   = GL_MEDIUM_FLOAT;
>+    fx.name        = "vary";
>+    fx.mappedName  = "m_vary";
>+    fx.staticUse   = true;
>     fx.isInvariant = false;
> 
>     // Default to ESSL1 behavior: invariance must match
>@@ -227,16 +221,14 @@ TEST(ShaderVariableTest, InvariantDoubleDeleteBug)
>                                               SH_GLSL_COMPATIBILITY_OUTPUT, &resources);
>     EXPECT_NE(static_cast<ShHandle>(0), compiler);
> 
>-    const char *program[] =
>-    {
>+    const char *program[] = {
>         "attribute vec4 position;\n"
>         "varying float v;\n"
>         "invariant v;\n"
>         "void main() {\n"
>         "  v = 1.0;\n"
>         "  gl_Position = position;\n"
>-        "}"
>-    };
>+        "}"};
> 
>     EXPECT_TRUE(sh::Compile(compiler, program, 1, SH_OBJECT_CODE));
>     EXPECT_TRUE(sh::Compile(compiler, program, 1, SH_OBJECT_CODE));
>@@ -263,8 +255,7 @@ TEST(ShaderVariableTest, IllegalInvariantVarying)
>            foo();
>            gl_Position = v_varying;
>         })"};
>-    const char *program2[] =
>-    {
>+    const char *program2[] = {
>         "varying vec4 v_varying;\n"
>         "void foo() {\n"
>         "  invariant v_varying;\n"
>@@ -272,8 +263,7 @@ TEST(ShaderVariableTest, IllegalInvariantVarying)
>         "void main() {\n"
>         "  foo();\n"
>         "  gl_Position = v_varying;\n"
>-        "}"
>-    };
>+        "}"};
> 
>     EXPECT_TRUE(sh::Compile(compiler, program1, 1, SH_VARIABLES));
>     EXPECT_FALSE(sh::Compile(compiler, program2, 1, SH_VARIABLES));
>@@ -289,35 +279,35 @@ TEST(ShaderVariableTest, InvariantLeakAcrossShaders)
>                                               SH_GLSL_COMPATIBILITY_OUTPUT, &resources);
>     EXPECT_NE(static_cast<ShHandle>(0), compiler);
> 
>-    const char *program1[] =
>-    {
>+    const char *program1[] = {
>         "varying vec4 v_varying;\n"
>         "invariant v_varying;\n"
>         "void main() {\n"
>         "  gl_Position = v_varying;\n"
>-        "}"
>-    };
>-    const char *program2[] =
>-    {
>+        "}"};
>+    const char *program2[] = {
>         "varying vec4 v_varying;\n"
>         "void main() {\n"
>         "  gl_Position = v_varying;\n"
>-        "}"
>-    };
>+        "}"};
> 
>     EXPECT_TRUE(sh::Compile(compiler, program1, 1, SH_VARIABLES));
>     const std::vector<sh::Varying> *varyings = sh::GetOutputVaryings(compiler);
>     for (const sh::Varying &varying : *varyings)
>     {
>         if (varying.name == "v_varying")
>+        {
>             EXPECT_TRUE(varying.isInvariant);
>+        }
>     }
>     EXPECT_TRUE(sh::Compile(compiler, program2, 1, SH_VARIABLES));
>     varyings = sh::GetOutputVaryings(compiler);
>     for (const sh::Varying &varying : *varyings)
>     {
>         if (varying.name == "v_varying")
>+        {
>             EXPECT_FALSE(varying.isInvariant);
>+        }
>     }
>     sh::Destruct(compiler);
> }
>@@ -331,35 +321,35 @@ TEST(ShaderVariableTest, GlobalInvariantLeakAcrossShaders)
>                                               SH_GLSL_COMPATIBILITY_OUTPUT, &resources);
>     EXPECT_NE(static_cast<ShHandle>(0), compiler);
> 
>-    const char *program1[] =
>-    {
>+    const char *program1[] = {
>         "#pragma STDGL invariant(all)\n"
>         "varying vec4 v_varying;\n"
>         "void main() {\n"
>         "  gl_Position = v_varying;\n"
>-        "}"
>-    };
>-    const char *program2[] =
>-    {
>+        "}"};
>+    const char *program2[] = {
>         "varying vec4 v_varying;\n"
>         "void main() {\n"
>         "  gl_Position = v_varying;\n"
>-        "}"
>-    };
>+        "}"};
> 
>     EXPECT_TRUE(sh::Compile(compiler, program1, 1, SH_VARIABLES));
>     const std::vector<sh::Varying> *varyings = sh::GetOutputVaryings(compiler);
>     for (const sh::Varying &varying : *varyings)
>     {
>         if (varying.name == "v_varying")
>+        {
>             EXPECT_TRUE(varying.isInvariant);
>+        }
>     }
>     EXPECT_TRUE(sh::Compile(compiler, program2, 1, SH_VARIABLES));
>     varyings = sh::GetOutputVaryings(compiler);
>     for (const sh::Varying &varying : *varyings)
>     {
>         if (varying.name == "v_varying")
>+        {
>             EXPECT_FALSE(varying.isInvariant);
>+        }
>     }
>     sh::Destruct(compiler);
> }
>@@ -374,40 +364,38 @@ TEST(ShaderVariableTest, BuiltinInvariantVarying)
>                                               SH_GLSL_COMPATIBILITY_OUTPUT, &resources);
>     EXPECT_NE(static_cast<ShHandle>(0), compiler);
> 
>-    const char *program1[] =
>-    {
>+    const char *program1[] = {
>         "invariant gl_Position;\n"
>         "void main() {\n"
>         "  gl_Position = vec4(0, 0, 0, 0);\n"
>-        "}"
>-    };
>-    const char *program2[] =
>-    {
>+        "}"};
>+    const char *program2[] = {
>         "void main() {\n"
>         "  gl_Position = vec4(0, 0, 0, 0);\n"
>-        "}"
>-    };
>-    const char *program3[] =
>-    {
>+        "}"};
>+    const char *program3[] = {
>         "void main() {\n"
>         "  invariant gl_Position;\n"
>         "  gl_Position = vec4(0, 0, 0, 0);\n"
>-        "}"
>-    };
>+        "}"};
> 
>     EXPECT_TRUE(sh::Compile(compiler, program1, 1, SH_VARIABLES));
>     const std::vector<sh::Varying> *varyings = sh::GetOutputVaryings(compiler);
>     for (const sh::Varying &varying : *varyings)
>     {
>         if (varying.name == "gl_Position")
>+        {
>             EXPECT_TRUE(varying.isInvariant);
>+        }
>     }
>     EXPECT_TRUE(sh::Compile(compiler, program2, 1, SH_VARIABLES));
>     varyings = sh::GetOutputVaryings(compiler);
>     for (const sh::Varying &varying : *varyings)
>     {
>         if (varying.name == "gl_Position")
>+        {
>             EXPECT_FALSE(varying.isInvariant);
>+        }
>     }
>     EXPECT_FALSE(sh::Compile(compiler, program3, 1, SH_VARIABLES));
>     sh::Destruct(compiler);
>diff --git a/Source/ThirdParty/ANGLE/src/tests/compiler_tests/TextureFunction_test.cpp b/Source/ThirdParty/ANGLE/src/tests/compiler_tests/TextureFunction_test.cpp
>new file mode 100644
>index 00000000000..33994d62f6d
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/tests/compiler_tests/TextureFunction_test.cpp
>@@ -0,0 +1,98 @@
>+//
>+// Copyright (c) 2018 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// TextureFunction_test.cpp:
>+//   Tests that malformed texture function calls don't pass compilation.
>+//
>+
>+#include <array>
>+
>+#include "GLSLANG/ShaderLang.h"
>+#include "angle_gl.h"
>+#include "gtest/gtest.h"
>+#include "tests/test_utils/ShaderCompileTreeTest.h"
>+
>+using namespace sh;
>+
>+class TextureFunctionTest : public ShaderCompileTreeTest
>+{
>+  public:
>+    TextureFunctionTest() {}
>+
>+  protected:
>+    ::GLenum getShaderType() const override { return GL_FRAGMENT_SHADER; }
>+    ShShaderSpec getShaderSpec() const override { return SH_GLES3_1_SPEC; }
>+};
>+
>+// Test that none of the texture offset functions can take a non-constant parameter.
>+TEST_F(TextureFunctionTest, NonConstantOffset)
>+{
>+    const std::string &shaderTemplate =
>+        R"(#version 310 es
>+        precision mediump float;
>+        out vec4 my_FragColor;
>+        uniform sampler2D s;
>+        uniform vec4 samplePos;
>+
>+        void main()
>+        {
>+            my_FragColor = {sample};
>+        })";
>+
>+    const std::array<const std::string, 10> sampleVariants(
>+        {"texelFetchOffset(s, ivec2(samplePos.xy), 0, {offset})",
>+         "textureLodOffset(s, samplePos.xy, 0.0, {offset})",
>+         "textureProjLodOffset(s, samplePos.xyz, 0.0, {offset})",
>+         "textureGradOffset(s, samplePos.xy, vec2(1.0), vec2(1.0), {offset})",
>+         "textureProjGradOffset(s, samplePos.xyz, vec2(1.0), vec2(1.0), {offset})",
>+         "textureOffset(s, samplePos.xy, {offset})",
>+         "textureOffset(s, samplePos.xy, {offset}, 1.0)",
>+         "textureProjOffset(s, samplePos.xyz, {offset})",
>+         "textureProjOffset(s, samplePos.xyz, {offset}, 1.0)",
>+         "textureGatherOffset(s, samplePos.xy, {offset})"});
>+
>+    size_t sampleReplacePos = shaderTemplate.find("{sample}");
>+
>+    for (auto &variantTemplate : sampleVariants)
>+    {
>+        size_t offsetReplacePos = variantTemplate.find("{offset}");
>+
>+        std::string variantConst = variantTemplate;
>+        variantConst.replace(offsetReplacePos, 8, "ivec2(0, 0)");
>+
>+        std::string shaderValid = shaderTemplate;
>+        shaderValid.replace(sampleReplacePos, 8, variantConst);
>+        if (!compile(shaderValid))
>+        {
>+            FAIL() << "Shader compilation failed with sample function " << variantConst
>+                   << ", expecting success:\n"
>+                   << mInfoLog;
>+        }
>+
>+        std::string variantNonConst = variantTemplate;
>+        variantNonConst.replace(offsetReplacePos, 8, "ivec2(samplePos.xy)");
>+
>+        std::string shaderNonConst = shaderTemplate;
>+        shaderNonConst.replace(sampleReplacePos, 8, variantNonConst);
>+        if (compile(shaderNonConst))
>+        {
>+            FAIL() << "Shader compilation succeeded with sample function " << variantNonConst
>+                   << ", expecting failure:\n"
>+                   << mInfoLog;
>+        }
>+
>+        std::string variantOutOfBounds = variantTemplate;
>+        variantOutOfBounds.replace(offsetReplacePos, 8, "ivec2(1000, 1000)");
>+
>+        std::string shaderOutOfBounds = shaderTemplate;
>+        shaderOutOfBounds.replace(sampleReplacePos, 8, variantOutOfBounds);
>+        if (compile(shaderOutOfBounds))
>+        {
>+            FAIL() << "Shader compilation succeeded with sample function " << variantOutOfBounds
>+                   << ", expecting failure:\n"
>+                   << mInfoLog;
>+        }
>+    }
>+}
>diff --git a/Source/ThirdParty/ANGLE/src/tests/compiler_tests/TypeTracking_test.cpp b/Source/ThirdParty/ANGLE/src/tests/compiler_tests/TypeTracking_test.cpp
>index b2913c6a5b3..f87ba2ef945 100644
>--- a/Source/ThirdParty/ANGLE/src/tests/compiler_tests/TypeTracking_test.cpp
>+++ b/Source/ThirdParty/ANGLE/src/tests/compiler_tests/TypeTracking_test.cpp
>@@ -8,10 +8,10 @@
> //   precision.
> //
> 
>-#include "angle_gl.h"
>-#include "gtest/gtest.h"
> #include "GLSLANG/ShaderLang.h"
>+#include "angle_gl.h"
> #include "compiler/translator/TranslatorESSL.h"
>+#include "gtest/gtest.h"
> 
> using namespace sh;
> 
>@@ -33,22 +33,19 @@ class TypeTrackingTest : public testing::Test
> 
>     void TearDown() override { delete mTranslator; }
> 
>-    void compile(const std::string& shaderString)
>+    void compile(const std::string &shaderString)
>     {
>-        const char *shaderStrings[] = { shaderString.c_str() };
>-        bool compilationSuccess = mTranslator->compile(shaderStrings, 1, SH_INTERMEDIATE_TREE);
>-        TInfoSink &infoSink = mTranslator->getInfoSink();
>+        const char *shaderStrings[] = {shaderString.c_str()};
>+        bool compilationSuccess     = mTranslator->compile(shaderStrings, 1, SH_INTERMEDIATE_TREE);
>+        TInfoSink &infoSink         = mTranslator->getInfoSink();
>         mInfoLog                    = RemoveSymbolIdsFromInfoLog(infoSink.info.c_str());
>         if (!compilationSuccess)
>             FAIL() << "Shader compilation failed " << mInfoLog;
>     }
> 
>-    bool foundErrorInIntermediateTree() const
>-    {
>-        return foundInIntermediateTree("ERROR:");
>-    }
>+    bool foundErrorInIntermediateTree() const { return foundInIntermediateTree("ERROR:"); }
> 
>-    bool foundInIntermediateTree(const char* stringToFind) const
>+    bool foundInIntermediateTree(const char *stringToFind) const
>     {
>         return mInfoLog.find(stringToFind) != std::string::npos;
>     }
>@@ -153,7 +150,8 @@ TEST_F(TypeTrackingTest, BuiltInMatFunctionResultTypeAndPrecision)
>         "   mat2x4 tmp24 = mat2x4(m);\n"
>         "   mat4x3 tmp43 = mat4x3(m);\n"
>         "   mat3x4 tmp34 = mat3x4(m);\n"
>-        "   my_FragColor = vec4(tmp32[2][1] * tmp23[1][2], tmp42[3][1] * tmp24[1][3], tmp43[3][2] * tmp34[2][3], 1.0);\n"
>+        "   my_FragColor = vec4(tmp32[2][1] * tmp23[1][2], tmp42[3][1] * tmp24[1][3], tmp43[3][2] "
>+        "* tmp34[2][3], 1.0);\n"
>         "}\n";
>     compile(shaderString);
>     ASSERT_FALSE(foundErrorInIntermediateTree());
>@@ -222,7 +220,8 @@ TEST_F(TypeTrackingTest, BuiltInVecToBoolFunctionResultType)
> TEST_F(TypeTrackingTest, Texture2DResultTypeAndPrecision)
> {
>     // ESSL spec section 4.5.3: sampler2D and samplerCube are lowp by default
>-    // ESSL spec section 8: For the texture functions, the precision of the return type matches the precision of the sampler type.
>+    // ESSL spec section 8: For the texture functions, the precision of the return type matches the
>+    // precision of the sampler type.
>     const std::string &shaderString =
>         "precision mediump float;\n"
>         "uniform sampler2D s;\n"
>@@ -239,7 +238,8 @@ TEST_F(TypeTrackingTest, Texture2DResultTypeAndPrecision)
> TEST_F(TypeTrackingTest, TextureCubeResultTypeAndPrecision)
> {
>     // ESSL spec section 4.5.3: sampler2D and samplerCube are lowp by default
>-    // ESSL spec section 8: For the texture functions, the precision of the return type matches the precision of the sampler type.
>+    // ESSL spec section 8: For the texture functions, the precision of the return type matches the
>+    // precision of the sampler type.
>     const std::string &shaderString =
>         "precision mediump float;\n"
>         "uniform samplerCube sc;\n"
>diff --git a/Source/ThirdParty/ANGLE/src/tests/compiler_tests/Type_test.cpp b/Source/ThirdParty/ANGLE/src/tests/compiler_tests/Type_test.cpp
>new file mode 100644
>index 00000000000..e09fd116697
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/tests/compiler_tests/Type_test.cpp
>@@ -0,0 +1,61 @@
>+//
>+// Copyright (c) 2018 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// Type_test.cpp:
>+//   Tests for StaticType, TType and BasicType.
>+//
>+
>+#include "angle_gl.h"
>+#include "compiler/translator/PoolAlloc.h"
>+#include "compiler/translator/StaticType.h"
>+#include "compiler/translator/Types.h"
>+#include "gtest/gtest.h"
>+
>+namespace sh
>+{
>+
>+// Verify that mangled name matches between a vector/matrix TType and a corresponding StaticType.
>+TEST(Type, VectorAndMatrixMangledNameConsistent)
>+{
>+    angle::PoolAllocator allocator;
>+    allocator.push();
>+    SetGlobalPoolAllocator(&allocator);
>+
>+    const TType *staticTypeScalar = StaticType::Get<EbtFloat, EbpMedium, EvqGlobal, 1, 1>();
>+    const TType *staticTypeVec2   = StaticType::Get<EbtFloat, EbpMedium, EvqGlobal, 2, 1>();
>+    const TType *staticTypeMat2x4 = StaticType::Get<EbtFloat, EbpMedium, EvqGlobal, 2, 4>();
>+    TType *typeScalar             = new TType(EbtFloat, EbpMedium, EvqGlobal, 1, 1);
>+    TType *typeVec2               = new TType(EbtFloat, EbpMedium, EvqGlobal, 2, 1);
>+    TType *typeMat2x4             = new TType(EbtFloat, EbpMedium, EvqGlobal, 2, 4);
>+    EXPECT_EQ(std::string(staticTypeScalar->getMangledName()),
>+              std::string(typeScalar->getMangledName()));
>+    EXPECT_EQ(std::string(staticTypeVec2->getMangledName()),
>+              std::string(typeVec2->getMangledName()));
>+    EXPECT_EQ(std::string(staticTypeMat2x4->getMangledName()),
>+              std::string(typeMat2x4->getMangledName()));
>+
>+    SetGlobalPoolAllocator(nullptr);
>+    allocator.pop();
>+}
>+
>+// Verify that basic type mangled names are unique.
>+TEST(Type, BaseTypeMangledNamesUnique)
>+{
>+    std::set<char> uniqueNames;
>+    for (int i = static_cast<int>(EbtVoid); i < static_cast<int>(EbtLast); ++i)
>+    {
>+        if (i == static_cast<int>(EbtStruct) || i == static_cast<int>(EbtInterfaceBlock))
>+        {
>+            continue;
>+        }
>+        char mangledName = GetBasicMangledName(static_cast<TBasicType>(i));
>+        if (mangledName != '{')
>+        {
>+            ASSERT_TRUE(uniqueNames.insert(mangledName).second);
>+        }
>+    }
>+}
>+
>+}  // namespace sh
>diff --git a/Source/ThirdParty/ANGLE/src/tests/compiler_tests/UnfoldShortCircuitAST_test.cpp b/Source/ThirdParty/ANGLE/src/tests/compiler_tests/UnfoldShortCircuitAST_test.cpp
>new file mode 100644
>index 00000000000..b4990124619
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/tests/compiler_tests/UnfoldShortCircuitAST_test.cpp
>@@ -0,0 +1,92 @@
>+//
>+// Copyright (c) 2018 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// UnfoldShortCircuitAST_test.cpp:
>+//  Tests shader compilation with SH_UNFOLD_SHORT_CIRCUIT workaround on.
>+
>+#include "GLSLANG/ShaderLang.h"
>+#include "angle_gl.h"
>+#include "gtest/gtest.h"
>+#include "tests/test_utils/compiler_test.h"
>+
>+using namespace sh;
>+
>+class UnfoldShortCircuitASTTest : public MatchOutputCodeTest
>+{
>+  public:
>+    UnfoldShortCircuitASTTest()
>+        : MatchOutputCodeTest(GL_FRAGMENT_SHADER, SH_UNFOLD_SHORT_CIRCUIT, SH_GLSL_330_CORE_OUTPUT)
>+    {}
>+};
>+
>+// Test unfolding the && operator.
>+TEST_F(UnfoldShortCircuitASTTest, UnfoldAnd)
>+{
>+    const std::string &shaderString =
>+        R"(#version 300 es
>+        precision highp float;
>+
>+        out vec4 color;
>+        uniform bool b;
>+        uniform bool b2;
>+
>+        void main()
>+        {
>+            color = vec4(0, 0, 0, 1);
>+            if (b && b2)
>+            {
>+                color = vec4(0, 1, 0, 1);
>+            }
>+        })";
>+    compile(shaderString);
>+    ASSERT_TRUE(foundInCode("(_ub) ? (_ub2) : (false)"));
>+}
>+
>+// Test unfolding the || operator.
>+TEST_F(UnfoldShortCircuitASTTest, UnfoldOr)
>+{
>+    const std::string &shaderString =
>+        R"(#version 300 es
>+        precision highp float;
>+
>+        out vec4 color;
>+        uniform bool b;
>+        uniform bool b2;
>+
>+        void main()
>+        {
>+            color = vec4(0, 0, 0, 1);
>+            if (b || b2)
>+            {
>+                color = vec4(0, 1, 0, 1);
>+            }
>+        })";
>+    compile(shaderString);
>+    ASSERT_TRUE(foundInCode("(_ub) ? (true) : (_ub2)"));
>+}
>+
>+// Test unfolding nested && and || operators. Both should be unfolded.
>+TEST_F(UnfoldShortCircuitASTTest, UnfoldNested)
>+{
>+    const std::string &shaderString =
>+        R"(#version 300 es
>+        precision highp float;
>+
>+        out vec4 color;
>+        uniform bool b;
>+        uniform bool b2;
>+        uniform bool b3;
>+
>+        void main()
>+        {
>+            color = vec4(0, 0, 0, 1);
>+            if (b && (b2 || b3))
>+            {
>+                color = vec4(0, 1, 0, 1);
>+            }
>+        })";
>+    compile(shaderString);
>+    ASSERT_TRUE(foundInCode("(_ub) ? (((_ub2) ? (true) : (_ub3))) : (false)"));
>+}
>diff --git a/Source/ThirdParty/ANGLE/src/tests/compiler_tests/UnrollFlatten_test.cpp b/Source/ThirdParty/ANGLE/src/tests/compiler_tests/UnrollFlatten_test.cpp
>index 82ed75ab736..3ea8d5ac175 100644
>--- a/Source/ThirdParty/ANGLE/src/tests/compiler_tests/UnrollFlatten_test.cpp
>+++ b/Source/ThirdParty/ANGLE/src/tests/compiler_tests/UnrollFlatten_test.cpp
>@@ -8,10 +8,10 @@
> //   This test can only be enabled when HLSL support is enabled.
> //
> 
>+#include "GLSLANG/ShaderLang.h"
> #include "angle_gl.h"
> #include "common/angleutils.h"
> #include "gtest/gtest.h"
>-#include "GLSLANG/ShaderLang.h"
> #include "tests/test_utils/compiler_test.h"
> 
> using namespace sh;
>@@ -42,15 +42,16 @@ class UnrollFlattenTest : public testing::Test
> 
>     void expect(const char *patterns[], size_t count)
>     {
>-        const char *badPatterns[] = { UNROLL, FLATTEN };
>+        const char *badPatterns[] = {UNROLL, FLATTEN};
>         for (size_t i = 0; i < count; i++)
>         {
>             const char *pattern = patterns[i];
>-            auto position = mTranslatedSource.find(pattern, mCurrentPosition);
>+            auto position       = mTranslatedSource.find(pattern, mCurrentPosition);
>             if (position == std::string::npos)
>             {
>                 FAIL() << "Couldn't find '" << pattern << "' after expectations '"
>-                       << mExpectationList << "' in translated source:\n" << mTranslatedSource;
>+                       << mExpectationList << "' in translated source:\n"
>+                       << mTranslatedSource;
>             }
> 
>             for (size_t j = 0; j < ArraySize(badPatterns); j++)
>@@ -59,8 +60,10 @@ class UnrollFlattenTest : public testing::Test
>                 if (pattern != badPattern &&
>                     mTranslatedSource.find(badPattern, mCurrentPosition) < position)
>                 {
>-                    FAIL() << "Found '" << badPattern << "' before '" << pattern << "' after expectations '"
>-                           << mExpectationList << "' in translated source:\n" << mTranslatedSource;
>+                    FAIL() << "Found '" << badPattern << "' before '" << pattern
>+                           << "' after expectations '" << mExpectationList
>+                           << "' in translated source:\n"
>+                           << mTranslatedSource;
>                 }
>             }
>             mExpectationList += " - " + std::string(pattern);
>@@ -79,7 +82,7 @@ class UnrollFlattenTest : public testing::Test
>     std::string mExpectationList;
> };
> 
>-const char *UnrollFlattenTest::UNROLL = "LOOP";
>+const char *UnrollFlattenTest::UNROLL  = "LOOP";
> const char *UnrollFlattenTest::FLATTEN = "FLATTEN";
> 
> // Check that the nothing is added if there is no gradient operation
>@@ -89,20 +92,20 @@ TEST_F(UnrollFlattenTest, NoGradient)
>     const std::string &shaderString =
>         "precision mediump float;\n"
>         "uniform float f;\n"
>-        "float fun(float a){\n" // 1
>-        "    if (a > 1.0) {return f;}\n" // 2
>+        "float fun(float a){\n"           // 1
>+        "    if (a > 1.0) {return f;}\n"  // 2
>         "    else {return a + 1.0;}\n"
>         "}\n"
>-        "float fun2(float a){\n" // 3
>-        "    for (int i = 0; i < 10; i++) {\n" // 4
>-        "        if (a > 1.0) {break;}\n" // 5
>-        "        a = fun(a);\n" // 6
>+        "float fun2(float a){\n"                // 3
>+        "    for (int i = 0; i < 10; i++) {\n"  // 4
>+        "        if (a > 1.0) {break;}\n"       // 5
>+        "        a = fun(a);\n"                 // 6
>         "    }\n"
>         "    return a;\n"
>         "}\n"
>         "void main() {\n"
>         "    float accum = 0.0;\n"
>-        "    if (f < 5.0) {accum = fun2(accum);}\n" // 7
>+        "    if (f < 5.0) {accum = fun2(accum);}\n"  // 7
>         "    gl_FragColor = vec4(accum);\n"
>         "}\n";
>     compile(shaderString);
>@@ -113,12 +116,8 @@ TEST_F(UnrollFlattenTest, NoGradient)
>     // 5 - no FLATTEN because does not contain loop with a gradient
>     // 6 - call non-Lod0 version
>     // 7 - no FLATTEN
>-    const char *expectations[] =
>-    {
>-        "fun(", "if",
>-        "fun2(", "for", "if", "break", "fun(",
>-        "main(", "if", "fun2("
>-    };
>+    const char *expectations[] = {"fun(",  "if",   "fun2(", "for", "if",
>+                                  "break", "fun(", "main(", "if",  "fun2("};
>     expect(expectations, ArraySize(expectations));
> }
> 
>@@ -131,20 +130,20 @@ TEST_F(UnrollFlattenTest, GradientNotInDiscont)
>         "precision mediump float;\n"
>         "uniform float f;\n"
>         "uniform sampler2D tex;"
>-        "float fun(float a){\n" // 1
>-        "    return texture2D(tex, vec2(0.5, f)).x;\n" // 2
>+        "float fun(float a){\n"                         // 1
>+        "    return texture2D(tex, vec2(0.5, f)).x;\n"  // 2
>         "}\n"
>-        "float fun2(float a){\n" // 3
>-        "    for (int i = 0; i < 10; i++) {\n" // 4
>-        "        if (a > 1.0) {}\n" // 5
>-        "        a = fun(a);\n" // 6
>-        "        a += texture2D(tex, vec2(a, 0.0)).x;" // 7
>+        "float fun2(float a){\n"                        // 3
>+        "    for (int i = 0; i < 10; i++) {\n"          // 4
>+        "        if (a > 1.0) {}\n"                     // 5
>+        "        a = fun(a);\n"                         // 6
>+        "        a += texture2D(tex, vec2(a, 0.0)).x;"  // 7
>         "    }\n"
>         "    return a;\n"
>         "}\n"
>         "void main() {\n"
>         "    float accum = 0.0;\n"
>-        "    if (f < 5.0) {accum = fun2(accum);}\n" // 8
>+        "    if (f < 5.0) {accum = fun2(accum);}\n"  // 8
>         "    gl_FragColor = vec4(accum);\n"
>         "}\n";
>     // 1 - shouldn't get a Lod0 version generated
>@@ -156,12 +155,8 @@ TEST_F(UnrollFlattenTest, GradientNotInDiscont)
>     // 7 - call non-Lod0 version
>     // 8 - FLATTEN because it contains a loop with a gradient
>     compile(shaderString);
>-    const char *expectations[] =
>-    {
>-        "fun(", "texture2D(",
>-        "fun2(", "LOOP", "for", "if", "fun(", "texture2D(",
>-        "main(", "FLATTEN", "if", "fun2("
>-    };
>+    const char *expectations[] = {"fun(", "texture2D(", "fun2(", "LOOP",    "for", "if",
>+                                  "fun(", "texture2D(", "main(", "FLATTEN", "if",  "fun2("};
>     expect(expectations, ArraySize(expectations));
> }
> 
>@@ -173,20 +168,20 @@ TEST_F(UnrollFlattenTest, GradientInDiscont)
>         "precision mediump float;\n"
>         "uniform float f;\n"
>         "uniform sampler2D tex;"
>-        "float fun(float a){\n" // 1
>-        "    return texture2D(tex, vec2(0.5, f)).x;\n" // 2
>+        "float fun(float a){\n"                         // 1
>+        "    return texture2D(tex, vec2(0.5, f)).x;\n"  // 2
>         "}\n"
>-        "float fun2(float a){\n" // 3
>-        "    for (int i = 0; i < 10; i++) {\n" // 4
>-        "        if (a > 1.0) {break;}\n" // 5
>-        "        a = fun(a);\n" // 6
>-        "        a += texture2D(tex, vec2(a, 0.0)).x;" // 7
>+        "float fun2(float a){\n"                        // 3
>+        "    for (int i = 0; i < 10; i++) {\n"          // 4
>+        "        if (a > 1.0) {break;}\n"               // 5
>+        "        a = fun(a);\n"                         // 6
>+        "        a += texture2D(tex, vec2(a, 0.0)).x;"  // 7
>         "    }\n"
>         "    return a;\n"
>         "}\n"
>         "void main() {\n"
>         "    float accum = 0.0;\n"
>-        "    if (f < 5.0) {accum = fun2(accum);}\n" // 8
>+        "    if (f < 5.0) {accum = fun2(accum);}\n"  // 8
>         "    gl_FragColor = vec4(accum);\n"
>         "}\n";
>     // 1 - should get a Lod0 version generated (gradient + discont loop)
>@@ -198,13 +193,9 @@ TEST_F(UnrollFlattenTest, GradientInDiscont)
>     // 7 - call Lod0 version
>     // 8 - FLATTEN because it contains a loop with a gradient
>     compile(shaderString);
>-    const char *expectations[] =
>-    {
>-        "fun(", "texture2D(",
>-        "funLod0(", "texture2DLod0(",
>-        "fun2(", "LOOP", "for", "if", "break", "funLod0(", "texture2DLod0",
>-        "main(", "FLATTEN", "if", "fun2("
>-    };
>+    const char *expectations[] = {
>+        "fun(",  "texture2D(", "funLod0(",      "texture2DLod0(", "fun2(",   "LOOP", "for",  "if",
>+        "break", "funLod0(",   "texture2DLod0", "main(",          "FLATTEN", "if",   "fun2("};
>     expect(expectations, ArraySize(expectations));
> }
> 
>@@ -235,4 +226,4 @@ TEST_F(UnrollFlattenTest_ES3, TextureBuiltin)
>     const char *expectations[] = {"main(", "LOOP", "Lod0("};
>     expect(expectations, ArraySize(expectations));
> }
>-}
>+}  // namespace
>diff --git a/Source/ThirdParty/ANGLE/src/tests/compiler_tests/VariablePacker_test.cpp b/Source/ThirdParty/ANGLE/src/tests/compiler_tests/VariablePacker_test.cpp
>index 244811ba9ab..44b5d86eccd 100644
>--- a/Source/ThirdParty/ANGLE/src/tests/compiler_tests/VariablePacker_test.cpp
>+++ b/Source/ThirdParty/ANGLE/src/tests/compiler_tests/VariablePacker_test.cpp
>@@ -3,10 +3,12 @@
> // Use of this source code is governed by a BSD-style license that can be
> // found in the LICENSE file.
> //
>+
> #include "gtest/gtest.h"
>+
> #include "angle_gl.h"
>-#include "common/utilities.h"
> #include "common/angleutils.h"
>+#include "common/utilities.h"
> #include "compiler/translator/VariablePacker.h"
> 
> namespace
>diff --git a/Source/ThirdParty/ANGLE/src/tests/compiler_tests/WEBGL_multiview_test.cpp b/Source/ThirdParty/ANGLE/src/tests/compiler_tests/WEBGL_multiview_test.cpp
>deleted file mode 100644
>index 0ec970ce2cd..00000000000
>--- a/Source/ThirdParty/ANGLE/src/tests/compiler_tests/WEBGL_multiview_test.cpp
>+++ /dev/null
>@@ -1,763 +0,0 @@
>-//
>-// Copyright (c) 2016 The ANGLE Project Authors. All rights reserved.
>-// Use of this source code is governed by a BSD-style license that can be
>-// found in the LICENSE file.
>-//
>-// WEBGL_multiview_test.cpp:
>-//   Test that shaders with gl_ViewID_OVR are validated correctly.
>-//
>-
>-#include "GLSLANG/ShaderLang.h"
>-#include "compiler/translator/IntermTraverse.h"
>-#include "tests/test_utils/ShaderCompileTreeTest.h"
>-#include "tests/test_utils/compiler_test.h"
>-
>-using namespace sh;
>-
>-namespace
>-{
>-
>-class SymbolOccurrenceCounter : public TIntermTraverser
>-{
>-  public:
>-    SymbolOccurrenceCounter() : TIntermTraverser(true, false, false), mNumberOfOccurrences(0u) {}
>-
>-    void visitSymbol(TIntermSymbol *node) override
>-    {
>-        if (shouldCountSymbol(node))
>-        {
>-            ++mNumberOfOccurrences;
>-        }
>-    }
>-
>-    virtual bool shouldCountSymbol(const TIntermSymbol *node) const = 0;
>-
>-    unsigned getNumberOfOccurrences() const { return mNumberOfOccurrences; }
>-
>-  private:
>-    unsigned mNumberOfOccurrences;
>-};
>-
>-class SymbolOccurrenceCounterByQualifier : public SymbolOccurrenceCounter
>-{
>-  public:
>-    SymbolOccurrenceCounterByQualifier(TQualifier symbolQualifier)
>-        : mSymbolQualifier(symbolQualifier)
>-    {
>-    }
>-
>-    bool shouldCountSymbol(const TIntermSymbol *node) const override
>-    {
>-        return node->getQualifier() == mSymbolQualifier;
>-    }
>-
>-  private:
>-    TQualifier mSymbolQualifier;
>-};
>-
>-class SymbolOccurrenceCounterByName : public SymbolOccurrenceCounter
>-{
>-  public:
>-    SymbolOccurrenceCounterByName(const TString &symbolName) : mSymbolName(symbolName) {}
>-
>-    bool shouldCountSymbol(const TIntermSymbol *node) const override
>-    {
>-        return node->getName().getString() == mSymbolName;
>-    }
>-
>-  private:
>-    TString mSymbolName;
>-};
>-
>-class SymbolOccurrenceCounterByNameAndQualifier : public SymbolOccurrenceCounter
>-{
>-  public:
>-    SymbolOccurrenceCounterByNameAndQualifier(const TString &symbolName, TQualifier qualifier)
>-        : mSymbolName(symbolName), mSymbolQualifier(qualifier)
>-    {
>-    }
>-
>-    bool shouldCountSymbol(const TIntermSymbol *node) const override
>-    {
>-        return node->getName().getString() == mSymbolName &&
>-               node->getQualifier() == mSymbolQualifier;
>-    }
>-
>-  private:
>-    TString mSymbolName;
>-    TQualifier mSymbolQualifier;
>-};
>-
>-class WEBGLMultiviewVertexShaderTest : public ShaderCompileTreeTest
>-{
>-  public:
>-    WEBGLMultiviewVertexShaderTest() {}
>-  protected:
>-    ::GLenum getShaderType() const override { return GL_VERTEX_SHADER; }
>-    ShShaderSpec getShaderSpec() const override { return SH_WEBGL3_SPEC; }
>-    void initResources(ShBuiltInResources *resources) override
>-    {
>-        resources->OVR_multiview = 1;
>-        resources->MaxViewsOVR   = 4;
>-    }
>-};
>-
>-class WEBGLMultiviewFragmentShaderTest : public ShaderCompileTreeTest
>-{
>-  public:
>-    WEBGLMultiviewFragmentShaderTest() {}
>-  protected:
>-    ::GLenum getShaderType() const override { return GL_FRAGMENT_SHADER; }
>-    ShShaderSpec getShaderSpec() const override { return SH_WEBGL3_SPEC; }
>-    void initResources(ShBuiltInResources *resources) override
>-    {
>-        resources->OVR_multiview = 1;
>-        resources->MaxViewsOVR   = 4;
>-    }
>-};
>-
>-class WEBGLMultiviewOutputCodeTest : public MatchOutputCodeTest
>-{
>-  public:
>-    WEBGLMultiviewOutputCodeTest(sh::GLenum shaderType)
>-        : MatchOutputCodeTest(shaderType, 0, SH_ESSL_OUTPUT)
>-    {
>-        addOutputType(SH_GLSL_COMPATIBILITY_OUTPUT);
>-
>-        getResources()->OVR_multiview = 1;
>-        getResources()->MaxViewsOVR   = 4;
>-    }
>-
>-    void requestHLSLOutput()
>-    {
>-#if defined(ANGLE_ENABLE_HLSL)
>-        addOutputType(SH_HLSL_4_1_OUTPUT);
>-#endif
>-    }
>-
>-    bool foundInAllGLSLCode(const char *str)
>-    {
>-        return foundInGLSLCode(str) && foundInESSLCode(str);
>-    }
>-
>-    bool foundInHLSLCode(const char *stringToFind) const
>-    {
>-#if defined(ANGLE_ENABLE_HLSL)
>-        return foundInCode(SH_HLSL_4_1_OUTPUT, stringToFind);
>-#else
>-        return true;
>-#endif
>-    }
>-};
>-
>-class WEBGLMultiviewVertexShaderOutputCodeTest : public WEBGLMultiviewOutputCodeTest
>-{
>-  public:
>-    WEBGLMultiviewVertexShaderOutputCodeTest() : WEBGLMultiviewOutputCodeTest(GL_VERTEX_SHADER) {}
>-};
>-
>-class WEBGLMultiviewFragmentShaderOutputCodeTest : public WEBGLMultiviewOutputCodeTest
>-{
>-  public:
>-    WEBGLMultiviewFragmentShaderOutputCodeTest() : WEBGLMultiviewOutputCodeTest(GL_FRAGMENT_SHADER)
>-    {
>-    }
>-};
>-
>-class WEBGLMultiviewComputeShaderOutputCodeTest : public WEBGLMultiviewOutputCodeTest
>-{
>-  public:
>-    WEBGLMultiviewComputeShaderOutputCodeTest() : WEBGLMultiviewOutputCodeTest(GL_COMPUTE_SHADER) {}
>-};
>-
>-void VariableOccursNTimes(TIntermBlock *root,
>-                          const TString &varName,
>-                          const TQualifier varQualifier,
>-                          unsigned n)
>-{
>-    // Check that there are n occurrences of the variable with the given name and qualifier.
>-    SymbolOccurrenceCounterByNameAndQualifier viewIDByNameAndQualifier(varName, varQualifier);
>-    root->traverse(&viewIDByNameAndQualifier);
>-    EXPECT_EQ(n, viewIDByNameAndQualifier.getNumberOfOccurrences());
>-
>-    // Check that there are n occurrences of the variable with the given name. By this we guarantee
>-    // that there are no other occurrences of the variable with the same name but different
>-    // qualifier.
>-    SymbolOccurrenceCounterByName viewIDByName(varName);
>-    root->traverse(&viewIDByName);
>-    EXPECT_EQ(n, viewIDByName.getNumberOfOccurrences());
>-}
>-
>-// Unsupported GL_OVR_multiview2 extension directive (WEBGL_multiview spec only exposes
>-// GL_OVR_multiview).
>-TEST_F(WEBGLMultiviewVertexShaderTest, InvalidMultiview2)
>-{
>-    const std::string &shaderString =
>-        "#version 300 es\n"
>-        "#extension GL_OVR_multiview2 : require\n"
>-        "layout(num_views = 2) in;\n"
>-        "void main()\n"
>-        "{\n"
>-        "    gl_Position.x = (gl_ViewID_OVR == 0u) ? 1.0 : 0.0;\n"
>-        "    gl_Position.yzw = vec3(0, 0, 1);\n"
>-        "}\n";
>-    if (compile(shaderString))
>-    {
>-        FAIL() << "Shader compilation succeeded, expecting failure:\n" << mInfoLog;
>-    }
>-}
>-
>-// Invalid combination of non-matching num_views declarations.
>-TEST_F(WEBGLMultiviewVertexShaderTest, InvalidNumViewsMismatch)
>-{
>-    const std::string &shaderString =
>-        "#version 300 es\n"
>-        "#extension GL_OVR_multiview : require\n"
>-        "layout(num_views = 2) in;\n"
>-        "layout(num_views = 1) in;\n"
>-        "void main()\n"
>-        "{\n"
>-        "    gl_Position.x = (gl_ViewID_OVR == 0u) ? 1.0 : 0.0;\n"
>-        "    gl_Position.yzw = vec3(0, 0, 1);\n"
>-        "}\n";
>-    if (compile(shaderString))
>-    {
>-        FAIL() << "Shader compilation succeeded, expecting failure:\n" << mInfoLog;
>-    }
>-}
>-
>-// Invalid value zero for num_views.
>-TEST_F(WEBGLMultiviewVertexShaderTest, InvalidNumViewsZero)
>-{
>-    const std::string &shaderString =
>-        "#version 300 es\n"
>-        "#extension GL_OVR_multiview : require\n"
>-        "layout(num_views = 0) in;\n"
>-        "void main()\n"
>-        "{\n"
>-        "    gl_Position.x = (gl_ViewID_OVR == 0u) ? 1.0 : 0.0;\n"
>-        "    gl_Position.yzw = vec3(0, 0, 1);\n"
>-        "}\n";
>-    if (compile(shaderString))
>-    {
>-        FAIL() << "Shader compilation succeeded, expecting failure:\n" << mInfoLog;
>-    }
>-}
>-
>-// Too large value for num_views.
>-TEST_F(WEBGLMultiviewVertexShaderTest, InvalidNumViewsGreaterThanMax)
>-{
>-    const std::string &shaderString =
>-        "#version 300 es\n"
>-        "#extension GL_OVR_multiview : require\n"
>-        "layout(num_views = 5) in;\n"
>-        "void main()\n"
>-        "{\n"
>-        "    gl_Position.x = (gl_ViewID_OVR == 0u) ? 1.0 : 0.0;\n"
>-        "    gl_Position.yzw = vec3(0, 0, 1);\n"
>-        "}\n";
>-    if (compile(shaderString))
>-    {
>-        FAIL() << "Shader compilation succeeded, expecting failure:\n" << mInfoLog;
>-    }
>-}
>-
>-// Valid use of gl_ViewID_OVR.
>-TEST_F(WEBGLMultiviewVertexShaderTest, ViewIDUsed)
>-{
>-    const std::string &shaderString =
>-        "#version 300 es\n"
>-        "#extension GL_OVR_multiview : require\n"
>-        "layout(num_views = 2) in;\n"
>-        "layout(num_views = 2) in;  // Duplicated on purpose\n"
>-        "in vec4 pos;\n"
>-        "out float myOutput;\n"
>-        "void main()\n"
>-        "{\n"
>-        "    if (gl_ViewID_OVR == 0u)\n"
>-        "    {\n"
>-        "        gl_Position = pos;\n"
>-        "        myOutput = 1.0;\n"
>-        "    }\n"
>-        "    else\n"
>-        "    {\n"
>-        "        gl_Position = pos + vec4(1.0, 0.0, 0.0, 0.0);\n"
>-        "        myOutput = 2.0;\n"
>-        "    }\n"
>-        "    gl_Position += (gl_ViewID_OVR == 0u) ? 1.0 : 0.0;\n"
>-        "}\n";
>-    if (!compile(shaderString))
>-    {
>-        FAIL() << "Shader compilation failed, expecting success:\n" << mInfoLog;
>-    }
>-}
>-
>-// Read gl_FragCoord in a OVR_multiview fragment shader.
>-TEST_F(WEBGLMultiviewFragmentShaderTest, ReadOfFragCoord)
>-{
>-    const std::string &shaderString =
>-        "#version 300 es\n"
>-        "#extension GL_OVR_multiview : require\n"
>-        "precision highp float;\n"
>-        "out vec4 outColor;\n"
>-        "void main()\n"
>-        "{\n"
>-        "    outColor = vec4(gl_FragCoord.xy, 0, 1);\n"
>-        "}\n";
>-    if (!compile(shaderString))
>-    {
>-        FAIL() << "Shader compilation failed, expecting success:\n" << mInfoLog;
>-    }
>-}
>-
>-// Read gl_ViewID_OVR in an OVR_multiview fragment shader.
>-TEST_F(WEBGLMultiviewFragmentShaderTest, ReadOfViewID)
>-{
>-    const std::string &shaderString =
>-        "#version 300 es\n"
>-        "#extension GL_OVR_multiview : require\n"
>-        "precision highp float;\n"
>-        "out vec4 outColor;\n"
>-        "void main()\n"
>-        "{\n"
>-        "    outColor = vec4(gl_ViewID_OVR, 0, 0, 1);\n"
>-        "}\n";
>-    if (!compile(shaderString))
>-    {
>-        FAIL() << "Shader compilation failed, expecting success:\n" << mInfoLog;
>-    }
>-}
>-
>-// Correct use of GL_OVR_multiview macro.
>-TEST_F(WEBGLMultiviewVertexShaderTest, UseOfExtensionMacro)
>-{
>-    const std::string &shaderString =
>-        "#version 300 es\n"
>-        "#ifdef GL_OVR_multiview\n"
>-        "#if (GL_OVR_multiview == 1)\n"
>-        "void main()\n"
>-        "{\n"
>-        "    gl_Position = vec4(0.0, 0.0, 0.0, 1.0);\n"
>-        "}\n"
>-        "#endif\n"
>-        "#endif\n";
>-    if (!compile(shaderString))
>-    {
>-        FAIL() << "Shader compilation failed, expecting success:\n" << mInfoLog;
>-    }
>-}
>-
>-// Test that gl_ViewID_OVR can't be used as an l-value.
>-TEST_F(WEBGLMultiviewVertexShaderTest, ViewIdAsLValue)
>-{
>-    const std::string &shaderString =
>-        "#version 300 es\n"
>-        "#extension GL_OVR_multiview : require\n"
>-        "layout(num_views = 2) in;\n"
>-        "void foo(out uint u)\n"
>-        "{\n"
>-        "    u = 3u;\n"
>-        "}\n"
>-        "void main()\n"
>-        "{\n"
>-        "    foo(gl_ViewID_OVR);\n"
>-        "    gl_Position = vec4(0.0, 0.0, 0.0, 1.0);\n"
>-        "}\n";
>-    if (compile(shaderString))
>-    {
>-        FAIL() << "Shader compilation succeeded, expecting failure:\n" << mInfoLog;
>-    }
>-}
>-
>-// Test that compiling an ESSL 1.00 shader with multiview support succeeds.
>-TEST_F(WEBGLMultiviewVertexShaderTest, ESSL1Shader)
>-{
>-    const std::string &shaderString =
>-        "#extension GL_OVR_multiview : require\n"
>-        "layout(num_views = 2) in;\n"
>-        "void main()\n"
>-        "{\n"
>-        "    if (gl_ViewID_OVR == 0)\n"
>-        "    {\n"
>-        "        gl_Position = vec4(-1.0, 0.0, 0.0, 1.0);\n"
>-        "    }\n"
>-        "    else\n"
>-        "    {\n"
>-        "        gl_Position = vec4(1.0, 0.0, 0.0, 1.0);\n"
>-        "    }\n"
>-        "}\n";
>-    if (!compile(shaderString))
>-    {
>-        FAIL() << "Shader compilation failed, expecting success:\n" << mInfoLog;
>-    }
>-}
>-
>-// Test that compiling an ESSL 1.00 shader with an unsupported global layout qualifier fails.
>-TEST_F(WEBGLMultiviewVertexShaderTest, ESSL1ShaderUnsupportedGlobalLayoutQualifier)
>-{
>-    const std::string &shaderString =
>-        "#extension GL_OVR_multiview : require\n"
>-        "layout(num_views = 2) in;\n"
>-        "layout(std140) uniform;\n"
>-        "void main()\n"
>-        "{\n"
>-        "    if (gl_ViewID_OVR == 0)\n"
>-        "    {\n"
>-        "        gl_Position = vec4(-1.0, 0.0, 0.0, 1.0);\n"
>-        "    }\n"
>-        "    else\n"
>-        "    {\n"
>-        "        gl_Position = vec4(1.0, 0.0, 0.0, 1.0);\n"
>-        "    }\n"
>-        "}\n";
>-    if (compile(shaderString))
>-    {
>-        FAIL() << "Shader compilation succeeded, expecting failure:\n" << mInfoLog;
>-    }
>-}
>-
>-// Test that compiling an ESSL 1.00 vertex shader with an unsupported input storage qualifier fails.
>-TEST_F(WEBGLMultiviewVertexShaderTest, ESSL1ShaderUnsupportedInputStorageQualifier)
>-{
>-    const std::string &shaderString =
>-        "#extension GL_OVR_multiview : require\n"
>-        "layout(num_views = 2) in;\n"
>-        "in vec4 pos;\n"
>-        "void main()\n"
>-        "{\n"
>-        "    if (gl_ViewID_OVR == 0)\n"
>-        "    {\n"
>-        "        gl_Position = vec4(-1.0, 0.0, 0.0, 1.0);\n"
>-        "    }\n"
>-        "    else\n"
>-        "    {\n"
>-        "        gl_Position = vec4(1.0, 0.0, 0.0, 1.0);\n"
>-        "    }\n"
>-        "}\n";
>-    if (compile(shaderString))
>-    {
>-        FAIL() << "Shader compilation succeeded, expecting failure:\n" << mInfoLog;
>-    }
>-}
>-
>-// Test that compiling an ESSL 1.00 fragment shader with an unsupported input storage qualifier
>-// fails.
>-TEST_F(WEBGLMultiviewFragmentShaderTest, ESSL1ShaderUnsupportedInStorageQualifier)
>-{
>-    const std::string &shaderString =
>-        "#extension GL_OVR_multiview : require\n"
>-        "precision highp float;\n"
>-        "in vec4 color;\n"
>-        "void main()\n"
>-        "{\n"
>-        "    if (gl_ViewID_OVR == 0)\n"
>-        "    {\n"
>-        "        gl_FragColor = color;\n"
>-        "    }\n"
>-        "    else\n"
>-        "    {\n"
>-        "        gl_FragColor = color + vec4(1.0, 0.0, 0.0, 1.0);\n"
>-        "    }\n"
>-        "}\n";
>-    if (compile(shaderString))
>-    {
>-        FAIL() << "Shader compilation succeeded, expecting failure:\n" << mInfoLog;
>-    }
>-}
>-
>-// Test that gl_InstanceID gets correctly replaced by InstanceID. gl_InstanceID should only be used
>-// twice: once to initialize ViewID_OVR and once for InstanceID. The number of occurrences of
>-// InstanceID in the AST should be the sum of two and the number of occurrences of gl_InstanceID
>-// before any renaming.
>-TEST_F(WEBGLMultiviewVertexShaderTest, GLInstanceIDIsRenamed)
>-{
>-    const std::string &shaderString =
>-        "#version 300 es\n"
>-        "#extension GL_OVR_multiview : require\n"
>-        "layout(num_views = 2) in;\n"
>-        "flat out int myInstance;\n"
>-        "out float myInstanceF;\n"
>-        "out float myInstanceF2;\n"
>-        "void main()\n"
>-        "{\n"
>-        "   gl_Position.x = gl_ViewID_OVR == 0u ? 0. : 1.;\n"
>-        "   gl_Position.yzw = vec3(0., 0., 1.);\n"
>-        "   myInstance = gl_InstanceID;\n"
>-        "   myInstanceF = float(gl_InstanceID) + .5;\n"
>-        "   myInstanceF2 = float(gl_InstanceID) + .1;\n"
>-        "}\n";
>-    mExtraCompileOptions |= SH_INITIALIZE_BUILTINS_FOR_INSTANCED_MULTIVIEW;
>-    compileAssumeSuccess(shaderString);
>-
>-    SymbolOccurrenceCounterByName glInstanceIDByName("gl_InstanceID");
>-    mASTRoot->traverse(&glInstanceIDByName);
>-    EXPECT_EQ(2u, glInstanceIDByName.getNumberOfOccurrences());
>-
>-    SymbolOccurrenceCounterByQualifier glInstanceIDByQualifier(EvqInstanceID);
>-    mASTRoot->traverse(&glInstanceIDByQualifier);
>-    EXPECT_EQ(2u, glInstanceIDByQualifier.getNumberOfOccurrences());
>-
>-    SymbolOccurrenceCounterByName instanceIDByName("InstanceID");
>-    mASTRoot->traverse(&instanceIDByName);
>-    EXPECT_EQ(5u, instanceIDByName.getNumberOfOccurrences());
>-}
>-
>-// Test that gl_ViewID_OVR gets correctly replaced by ViewID_OVR. gl_ViewID_OVR should not be found
>-// by either name or qualifier. The number of occurrences of ViewID_OVR in the AST should be the sum
>-// of two and the number of occurrences of gl_ViewID_OVR before any renaming.
>-TEST_F(WEBGLMultiviewVertexShaderTest, GLViewIDIsRenamed)
>-{
>-    const std::string &shaderString =
>-        "#version 300 es\n"
>-        "#extension GL_OVR_multiview : require\n"
>-        "layout(num_views = 2) in;\n"
>-        "flat out uint a;\n"
>-        "void main()\n"
>-        "{\n"
>-        "   gl_Position.x = gl_ViewID_OVR == 0u ? 0. : 1.;\n"
>-        "   gl_Position.yzw = vec3(0., 0., 1.);\n"
>-        "   a = gl_ViewID_OVR == 0u ? (gl_ViewID_OVR+2u) : gl_ViewID_OVR;\n"
>-        "}\n";
>-    mExtraCompileOptions |= SH_INITIALIZE_BUILTINS_FOR_INSTANCED_MULTIVIEW;
>-    compileAssumeSuccess(shaderString);
>-
>-    SymbolOccurrenceCounterByName glViewIDOVRByName("gl_ViewID_OVR");
>-    mASTRoot->traverse(&glViewIDOVRByName);
>-    EXPECT_EQ(0u, glViewIDOVRByName.getNumberOfOccurrences());
>-
>-    SymbolOccurrenceCounterByQualifier glViewIDOVRByQualifier(EvqViewIDOVR);
>-    mASTRoot->traverse(&glViewIDOVRByQualifier);
>-    EXPECT_EQ(0u, glViewIDOVRByQualifier.getNumberOfOccurrences());
>-
>-    SymbolOccurrenceCounterByNameAndQualifier viewIDByNameAndQualifier("ViewID_OVR", EvqFlatOut);
>-    mASTRoot->traverse(&viewIDByNameAndQualifier);
>-    EXPECT_EQ(6u, viewIDByNameAndQualifier.getNumberOfOccurrences());
>-}
>-
>-// The test checks that ViewID_OVR and InstanceID have the correct initializers based on the
>-// number of views.
>-TEST_F(WEBGLMultiviewVertexShaderOutputCodeTest, ViewIDAndInstanceIDHaveCorrectValues)
>-{
>-    const std::string &shaderString =
>-        "#version 300 es\n"
>-        "#extension GL_OVR_multiview : require\n"
>-        "layout(num_views = 3) in;\n"
>-        "flat out int myInstance;\n"
>-        "void main()\n"
>-        "{\n"
>-        "   gl_Position.x = gl_ViewID_OVR == 0u ? 0. : 1.;\n"
>-        "   gl_Position.yzw = vec3(0., 0., 1.);\n"
>-        "   myInstance = gl_InstanceID;\n"
>-        "}\n";
>-    requestHLSLOutput();
>-    compile(shaderString, SH_INITIALIZE_BUILTINS_FOR_INSTANCED_MULTIVIEW);
>-
>-    EXPECT_TRUE(foundInAllGLSLCode("ViewID_OVR = (uint(gl_InstanceID) % 3u)"));
>-    EXPECT_TRUE(foundInAllGLSLCode("InstanceID = int((uint(gl_InstanceID) / 3u))"));
>-
>-    EXPECT_TRUE(foundInHLSLCode("ViewID_OVR = (uint_ctor(gl_InstanceID) % 3)"));
>-    EXPECT_TRUE(foundInHLSLCode("InstanceID = int_ctor((uint_ctor(gl_InstanceID) / 3))"));
>-}
>-
>-// The test checks that the directive enabling GL_OVR_multiview is not outputted if the extension is
>-// emulated.
>-TEST_F(WEBGLMultiviewVertexShaderOutputCodeTest, StrippedOVRMultiviewDirective)
>-{
>-    const std::string &shaderString =
>-        "#version 300 es\n"
>-        "#extension GL_OVR_multiview : require\n"
>-        "layout(num_views = 3) in;\n"
>-        "void main()\n"
>-        "{\n"
>-        "}\n";
>-    // The directive must not be present if any of the multiview emulation options are set.
>-    compile(shaderString, SH_INITIALIZE_BUILTINS_FOR_INSTANCED_MULTIVIEW);
>-    EXPECT_FALSE(foundInESSLCode("GL_OVR_multiview"));
>-    EXPECT_FALSE(foundInGLSLCode("GL_OVR_multiview"));
>-
>-    compile(shaderString, SH_TRANSLATE_VIEWID_OVR_TO_UNIFORM);
>-    EXPECT_FALSE(foundInESSLCode("GL_OVR_multiview"));
>-    EXPECT_FALSE(foundInGLSLCode("GL_OVR_multiview"));
>-
>-    // The directive should be outputted from the ESSL translator with none of the options being
>-    // set.
>-    compile(shaderString);
>-    EXPECT_TRUE(foundInESSLCode("GL_OVR_multiview"));
>-}
>-
>-// Test that gl_InstanceID is collected in an ESSL1 shader if the
>-// SH_INITIALIZE_BUILTINS_FOR_INSTANCED_MULTIVIEW option is set.
>-TEST_F(WEBGLMultiviewVertexShaderTest, InstaceIDCollectedESSL1)
>-{
>-    const std::string &shaderString =
>-        "#extension GL_OVR_multiview : require\n"
>-        "layout(num_views = 2) in;\n"
>-        "void main()\n"
>-        "{\n"
>-        "   gl_Position.x = gl_ViewID_OVR == 0 ? 0. : 1.;\n"
>-        "   gl_Position.yzw = vec3(0., 0., 1.);\n"
>-        "}\n";
>-    mExtraCompileOptions |= SH_INITIALIZE_BUILTINS_FOR_INSTANCED_MULTIVIEW;
>-    mExtraCompileOptions |= SH_VARIABLES;
>-    compileAssumeSuccess(shaderString);
>-
>-    const std::vector<Attribute> &attributes = getAttributes();
>-    bool isGLInstanceIDFound                 = false;
>-    for (size_t i = 0u; i < attributes.size() && !isGLInstanceIDFound; ++i)
>-    {
>-        isGLInstanceIDFound = (attributes[i].name == "gl_InstanceID");
>-    }
>-    EXPECT_TRUE(isGLInstanceIDFound);
>-}
>-
>-// Test that ViewID_OVR is declared as a flat input variable in an ESSL 3.00 fragment shader.
>-TEST_F(WEBGLMultiviewFragmentShaderTest, ViewIDDeclaredAsFlatInput)
>-{
>-    const std::string &shaderString =
>-        "#version 300 es\n"
>-        "#extension GL_OVR_multiview : require\n"
>-        "void main()\n"
>-        "{\n"
>-        "}\n";
>-    mExtraCompileOptions |= SH_INITIALIZE_BUILTINS_FOR_INSTANCED_MULTIVIEW;
>-    compileAssumeSuccess(shaderString);
>-    VariableOccursNTimes(mASTRoot, "ViewID_OVR", EvqFlatIn, 1u);
>-}
>-
>-// Test that ViewID_OVR is declared as a flat output variable in an ESSL 1.00 vertex shader.
>-TEST_F(WEBGLMultiviewVertexShaderTest, ViewIDDeclaredAsFlatOutput)
>-{
>-    const std::string &shaderString =
>-        "#extension GL_OVR_multiview : require\n"
>-        "void main()\n"
>-        "{\n"
>-        "}\n";
>-    mExtraCompileOptions |= SH_INITIALIZE_BUILTINS_FOR_INSTANCED_MULTIVIEW;
>-    compileAssumeSuccess(shaderString);
>-    VariableOccursNTimes(mASTRoot, "ViewID_OVR", EvqFlatOut, 2u);
>-}
>-
>-// The test checks that the GL_NV_viewport_array2 extension is emitted in a vertex shader if the
>-// SH_SELECT_VIEW_IN_NV_GLSL_VERTEX_SHADER option is set.
>-TEST_F(WEBGLMultiviewVertexShaderOutputCodeTest, ViewportArray2IsEmitted)
>-{
>-    const std::string &shaderString =
>-        "#version 300 es\n"
>-        "#extension GL_OVR_multiview : require\n"
>-        "layout(num_views = 3) in;\n"
>-        "void main()\n"
>-        "{\n"
>-        "}\n";
>-    compile(shaderString, SH_INITIALIZE_BUILTINS_FOR_INSTANCED_MULTIVIEW |
>-                              SH_SELECT_VIEW_IN_NV_GLSL_VERTEX_SHADER);
>-    EXPECT_TRUE(foundInAllGLSLCode("#extension GL_NV_viewport_array2 : require"));
>-}
>-
>-// The test checks that the GL_NV_viewport_array2 extension is not emitted in a vertex shader if the
>-// OVR_multiview extension is not requested in the shader source even if the
>-// SH_SELECT_VIEW_IN_NV_GLSL_VERTEX_SHADER option is set.
>-TEST_F(WEBGLMultiviewVertexShaderOutputCodeTest, ViewportArray2IsNotEmitted)
>-{
>-    const std::string &shaderString =
>-        "#version 300 es\n"
>-        "void main()\n"
>-        "{\n"
>-        "}\n";
>-    compile(shaderString, SH_INITIALIZE_BUILTINS_FOR_INSTANCED_MULTIVIEW |
>-                              SH_SELECT_VIEW_IN_NV_GLSL_VERTEX_SHADER);
>-    EXPECT_FALSE(foundInGLSLCode("#extension GL_NV_viewport_array2"));
>-    EXPECT_FALSE(foundInESSLCode("#extension GL_NV_viewport_array2"));
>-}
>-
>-// The test checks that the GL_NV_viewport_array2 extension is not emitted in a fragment shader if
>-// the SH_SELECT_VIEW_IN_NV_GLSL_VERTEX_SHADER option is set.
>-TEST_F(WEBGLMultiviewFragmentShaderOutputCodeTest, ViewportArray2IsNotEmitted)
>-{
>-    const std::string &shaderString =
>-        "#version 300 es\n"
>-        "#extension GL_OVR_multiview : require\n"
>-        "void main()\n"
>-        "{\n"
>-        "}\n";
>-    compile(shaderString, SH_INITIALIZE_BUILTINS_FOR_INSTANCED_MULTIVIEW |
>-                              SH_SELECT_VIEW_IN_NV_GLSL_VERTEX_SHADER);
>-    EXPECT_FALSE(foundInGLSLCode("#extension GL_NV_viewport_array2"));
>-    EXPECT_FALSE(foundInESSLCode("#extension GL_NV_viewport_array2"));
>-}
>-
>-// The test checks that the GL_NV_viewport_array2 extension is not emitted in a compute shader if
>-// the SH_SELECT_VIEW_IN_NV_GLSL_VERTEX_SHADER option is set.
>-TEST_F(WEBGLMultiviewComputeShaderOutputCodeTest, ViewportArray2IsNotEmitted)
>-{
>-    const std::string &shaderString =
>-        "#version 300 es\n"
>-        "#extension GL_OVR_multiview : require\n"
>-        "void main()\n"
>-        "{\n"
>-        "}\n";
>-    compile(shaderString, SH_INITIALIZE_BUILTINS_FOR_INSTANCED_MULTIVIEW |
>-                              SH_SELECT_VIEW_IN_NV_GLSL_VERTEX_SHADER);
>-    EXPECT_FALSE(foundInGLSLCode("#extension GL_NV_viewport_array2"));
>-    EXPECT_FALSE(foundInESSLCode("#extension GL_NV_viewport_array2"));
>-}
>-
>-// The test checks that the viewport index is selected after the initialization of ViewID_OVR for
>-// GLSL and ESSL ouputs.
>-TEST_F(WEBGLMultiviewVertexShaderOutputCodeTest, GlViewportIndexIsSet)
>-{
>-    const std::string &shaderString =
>-        "#version 300 es\n"
>-        "#extension GL_OVR_multiview : require\n"
>-        "layout(num_views = 3) in;\n"
>-        "void main()\n"
>-        "{\n"
>-        "}\n";
>-    compile(shaderString, SH_INITIALIZE_BUILTINS_FOR_INSTANCED_MULTIVIEW |
>-                              SH_SELECT_VIEW_IN_NV_GLSL_VERTEX_SHADER);
>-    const char glViewportIndexAssignment[] = "gl_ViewportIndex = int(ViewID_OVR)";
>-
>-    // Check that the viewport index is selected.
>-    EXPECT_TRUE(foundInAllGLSLCode(glViewportIndexAssignment));
>-
>-    // Setting gl_ViewportIndex must happen after ViewID_OVR's initialization.
>-    const char viewIDOVRAssignment[] = "ViewID_OVR = (uint(gl_InstanceID) % 3u)";
>-    size_t viewIDOVRAssignmentLoc = findInCode(SH_GLSL_COMPATIBILITY_OUTPUT, viewIDOVRAssignment);
>-    size_t glViewportIndexAssignmentLoc =
>-        findInCode(SH_GLSL_COMPATIBILITY_OUTPUT, glViewportIndexAssignment);
>-    EXPECT_LT(viewIDOVRAssignmentLoc, glViewportIndexAssignmentLoc);
>-
>-    viewIDOVRAssignmentLoc       = findInCode(SH_ESSL_OUTPUT, viewIDOVRAssignment);
>-    glViewportIndexAssignmentLoc = findInCode(SH_ESSL_OUTPUT, glViewportIndexAssignment);
>-    EXPECT_LT(viewIDOVRAssignmentLoc, glViewportIndexAssignmentLoc);
>-}
>-
>-// The test checks that the layer is selected after the initialization of ViewID_OVR for
>-// GLSL and ESSL ouputs.
>-TEST_F(WEBGLMultiviewVertexShaderOutputCodeTest, GlLayerIsSet)
>-{
>-    const std::string &shaderString =
>-        "#version 300 es\n"
>-        "#extension GL_OVR_multiview : require\n"
>-        "layout(num_views = 3) in;\n"
>-        "void main()\n"
>-        "{\n"
>-        "}\n";
>-    compile(shaderString, SH_INITIALIZE_BUILTINS_FOR_INSTANCED_MULTIVIEW |
>-                              SH_SELECT_VIEW_IN_NV_GLSL_VERTEX_SHADER);
>-    const char glLayerAssignment[] = "gl_Layer = (int(ViewID_OVR) + multiviewBaseViewLayerIndex)";
>-
>-    // Check that the layer is selected.
>-    EXPECT_TRUE(foundInAllGLSLCode(glLayerAssignment));
>-
>-    // Setting gl_Layer must happen after ViewID_OVR's initialization.
>-    const char viewIDOVRAssignment[] = "ViewID_OVR = (uint(gl_InstanceID) % 3u)";
>-    size_t viewIDOVRAssignmentLoc = findInCode(SH_GLSL_COMPATIBILITY_OUTPUT, viewIDOVRAssignment);
>-    size_t glLayerAssignmentLoc   = findInCode(SH_GLSL_COMPATIBILITY_OUTPUT, glLayerAssignment);
>-    EXPECT_LT(viewIDOVRAssignmentLoc, glLayerAssignmentLoc);
>-
>-    viewIDOVRAssignmentLoc = findInCode(SH_ESSL_OUTPUT, viewIDOVRAssignment);
>-    glLayerAssignmentLoc   = findInCode(SH_ESSL_OUTPUT, glLayerAssignment);
>-    EXPECT_LT(viewIDOVRAssignmentLoc, glLayerAssignmentLoc);
>-}
>-
>-}  // namespace
>\ No newline at end of file
>diff --git a/Source/ThirdParty/ANGLE/src/tests/compiler_tests/WorkGroupSize_test.cpp b/Source/ThirdParty/ANGLE/src/tests/compiler_tests/WorkGroupSize_test.cpp
>index 980617f840a..525e69ec46b 100644
>--- a/Source/ThirdParty/ANGLE/src/tests/compiler_tests/WorkGroupSize_test.cpp
>+++ b/Source/ThirdParty/ANGLE/src/tests/compiler_tests/WorkGroupSize_test.cpp
>@@ -7,10 +7,10 @@
> // tests for local group size in a compute shader
> //
> 
>-#include "angle_gl.h"
>-#include "gtest/gtest.h"
> #include "GLSLANG/ShaderLang.h"
>+#include "angle_gl.h"
> #include "compiler/translator/TranslatorESSL.h"
>+#include "gtest/gtest.h"
> #include "tests/test_utils/compiler_test.h"
> 
> using namespace sh;
>diff --git a/Source/ThirdParty/ANGLE/src/tests/deqp.gni b/Source/ThirdParty/ANGLE/src/tests/deqp.gni
>new file mode 100644
>index 00000000000..91d0c3b1b7d
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/tests/deqp.gni
>@@ -0,0 +1,1145 @@
>+# Copyright 2015 The ANGLE Project Authors. All rights reserved.
>+# Use of this source code is governed by a BSD-style license that can be
>+# found in the LICENSE file.
>+
>+# leading underscore makes this a local variable
>+_deqp_path = "../../third_party/deqp/src"
>+
>+deqp_include_dirs = [
>+  "$_deqp_path/executor",
>+  "$_deqp_path/execserver",
>+  "$_deqp_path/framework/common",
>+  "$_deqp_path/framework/delibs/debase",
>+  "$_deqp_path/framework/delibs/decpp",
>+  "$_deqp_path/framework/delibs/depool",
>+  "$_deqp_path/framework/delibs/dethread",
>+  "$_deqp_path/framework/delibs/deutil",
>+  "$_deqp_path/framework/delibs/destream",
>+  "$_deqp_path/framework/egl",
>+  "$_deqp_path/framework/egl/wrapper",
>+  "$_deqp_path/framework/opengl",
>+  "$_deqp_path/framework/opengl/simplereference",
>+  "$_deqp_path/framework/opengl/wrapper",
>+  "$_deqp_path/framework/platform/null",
>+  "$_deqp_path/framework/qphelper",
>+  "$_deqp_path/framework/randomshaders",
>+  "$_deqp_path/framework/referencerenderer",
>+  "$_deqp_path/modules/gles2",
>+  "$_deqp_path/modules/gles2/functional",
>+  "$_deqp_path/modules/gles2/accuracy",
>+  "$_deqp_path/modules/gles2/performance",
>+  "$_deqp_path/modules/gles2/stress",
>+  "$_deqp_path/modules/gles2/usecases",
>+  "$_deqp_path/modules/gles3",
>+  "$_deqp_path/modules/gles3/functional",
>+  "$_deqp_path/modules/gles3/accuracy",
>+  "$_deqp_path/modules/gles3/performance",
>+  "$_deqp_path/modules/gles3/stress",
>+  "$_deqp_path/modules/gles3/usecases",
>+  "$_deqp_path/modules/gles31",
>+  "$_deqp_path/modules/gles31/functional",
>+  "$_deqp_path/modules/gles31/stress",
>+  "$_deqp_path/modules/glshared",
>+  "$_deqp_path/modules/glusecases",
>+]
>+deqp_gles2_sources = [
>+  "$_deqp_path/modules/gles2/accuracy/es2aAccuracyTests.cpp",
>+  "$_deqp_path/modules/gles2/accuracy/es2aAccuracyTests.hpp",
>+  "$_deqp_path/modules/gles2/accuracy/es2aTextureFilteringTests.cpp",
>+  "$_deqp_path/modules/gles2/accuracy/es2aTextureFilteringTests.hpp",
>+  "$_deqp_path/modules/gles2/accuracy/es2aTextureMipmapTests.cpp",
>+  "$_deqp_path/modules/gles2/accuracy/es2aTextureMipmapTests.hpp",
>+  "$_deqp_path/modules/gles2/accuracy/es2aVaryingInterpolationTests.cpp",
>+  "$_deqp_path/modules/gles2/accuracy/es2aVaryingInterpolationTests.hpp",
>+  "$_deqp_path/modules/gles2/functional/es2fApiCase.cpp",
>+  "$_deqp_path/modules/gles2/functional/es2fApiCase.hpp",
>+  "$_deqp_path/modules/gles2/functional/es2fAttribLocationTests.cpp",
>+  "$_deqp_path/modules/gles2/functional/es2fAttribLocationTests.hpp",
>+  "$_deqp_path/modules/gles2/functional/es2fBlendTests.cpp",
>+  "$_deqp_path/modules/gles2/functional/es2fBlendTests.hpp",
>+  "$_deqp_path/modules/gles2/functional/es2fBooleanStateQueryTests.cpp",
>+  "$_deqp_path/modules/gles2/functional/es2fBooleanStateQueryTests.hpp",
>+  "$_deqp_path/modules/gles2/functional/es2fBufferObjectQueryTests.cpp",
>+  "$_deqp_path/modules/gles2/functional/es2fBufferObjectQueryTests.hpp",
>+  "$_deqp_path/modules/gles2/functional/es2fBufferTestUtil.cpp",
>+  "$_deqp_path/modules/gles2/functional/es2fBufferTestUtil.hpp",
>+  "$_deqp_path/modules/gles2/functional/es2fBufferWriteTests.cpp",
>+  "$_deqp_path/modules/gles2/functional/es2fBufferWriteTests.hpp",
>+  "$_deqp_path/modules/gles2/functional/es2fClippingTests.cpp",
>+  "$_deqp_path/modules/gles2/functional/es2fClippingTests.hpp",
>+  "$_deqp_path/modules/gles2/functional/es2fColorClearTest.cpp",
>+  "$_deqp_path/modules/gles2/functional/es2fColorClearTest.hpp",
>+  "$_deqp_path/modules/gles2/functional/es2fDebugMarkerTests.cpp",
>+  "$_deqp_path/modules/gles2/functional/es2fDebugMarkerTests.hpp",
>+  "$_deqp_path/modules/gles2/functional/es2fDefaultVertexAttributeTests.cpp",
>+  "$_deqp_path/modules/gles2/functional/es2fDefaultVertexAttributeTests.hpp",
>+  "$_deqp_path/modules/gles2/functional/es2fDepthRangeTests.cpp",
>+  "$_deqp_path/modules/gles2/functional/es2fDepthRangeTests.hpp",
>+  "$_deqp_path/modules/gles2/functional/es2fDepthStencilClearTests.cpp",
>+  "$_deqp_path/modules/gles2/functional/es2fDepthStencilClearTests.hpp",
>+  "$_deqp_path/modules/gles2/functional/es2fDepthStencilTests.cpp",
>+  "$_deqp_path/modules/gles2/functional/es2fDepthStencilTests.hpp",
>+  "$_deqp_path/modules/gles2/functional/es2fDepthTests.cpp",
>+  "$_deqp_path/modules/gles2/functional/es2fDepthTests.hpp",
>+  "$_deqp_path/modules/gles2/functional/es2fDitheringTests.cpp",
>+  "$_deqp_path/modules/gles2/functional/es2fDitheringTests.hpp",
>+  "$_deqp_path/modules/gles2/functional/es2fDrawTests.cpp",
>+  "$_deqp_path/modules/gles2/functional/es2fDrawTests.hpp",
>+  "$_deqp_path/modules/gles2/functional/es2fFboApiTest.cpp",
>+  "$_deqp_path/modules/gles2/functional/es2fFboApiTest.hpp",
>+  "$_deqp_path/modules/gles2/functional/es2fFboCompletenessTests.cpp",
>+  "$_deqp_path/modules/gles2/functional/es2fFboCompletenessTests.hpp",
>+  "$_deqp_path/modules/gles2/functional/es2fFboRenderTest.cpp",
>+  "$_deqp_path/modules/gles2/functional/es2fFboRenderTest.hpp",
>+  "$_deqp_path/modules/gles2/functional/es2fFboStateQueryTests.cpp",
>+  "$_deqp_path/modules/gles2/functional/es2fFboStateQueryTests.hpp",
>+  "$_deqp_path/modules/gles2/functional/es2fFloatStateQueryTests.cpp",
>+  "$_deqp_path/modules/gles2/functional/es2fFloatStateQueryTests.hpp",
>+  "$_deqp_path/modules/gles2/functional/es2fFlushFinishTests.cpp",
>+  "$_deqp_path/modules/gles2/functional/es2fFlushFinishTests.hpp",
>+  "$_deqp_path/modules/gles2/functional/es2fFragOpInteractionTests.cpp",
>+  "$_deqp_path/modules/gles2/functional/es2fFragOpInteractionTests.hpp",
>+  "$_deqp_path/modules/gles2/functional/es2fFunctionalTests.cpp",
>+  "$_deqp_path/modules/gles2/functional/es2fFunctionalTests.hpp",
>+  "$_deqp_path/modules/gles2/functional/es2fImplementationLimitTests.cpp",
>+  "$_deqp_path/modules/gles2/functional/es2fImplementationLimitTests.hpp",
>+  "$_deqp_path/modules/gles2/functional/es2fIntegerStateQueryTests.cpp",
>+  "$_deqp_path/modules/gles2/functional/es2fIntegerStateQueryTests.hpp",
>+  "$_deqp_path/modules/gles2/functional/es2fLifetimeTests.cpp",
>+  "$_deqp_path/modules/gles2/functional/es2fLifetimeTests.hpp",
>+  "$_deqp_path/modules/gles2/functional/es2fLightAmountTest.cpp",
>+  "$_deqp_path/modules/gles2/functional/es2fLightAmountTest.hpp",
>+  "$_deqp_path/modules/gles2/functional/es2fMultisampleTests.cpp",
>+  "$_deqp_path/modules/gles2/functional/es2fMultisampleTests.hpp",
>+  "$_deqp_path/modules/gles2/functional/es2fNegativeBufferApiTests.cpp",
>+  "$_deqp_path/modules/gles2/functional/es2fNegativeBufferApiTests.hpp",
>+  "$_deqp_path/modules/gles2/functional/es2fNegativeFragmentApiTests.cpp",
>+  "$_deqp_path/modules/gles2/functional/es2fNegativeFragmentApiTests.hpp",
>+  "$_deqp_path/modules/gles2/functional/es2fNegativeShaderApiTests.cpp",
>+  "$_deqp_path/modules/gles2/functional/es2fNegativeShaderApiTests.hpp",
>+  "$_deqp_path/modules/gles2/functional/es2fNegativeStateApiTests.cpp",
>+  "$_deqp_path/modules/gles2/functional/es2fNegativeStateApiTests.hpp",
>+  "$_deqp_path/modules/gles2/functional/es2fNegativeTextureApiTests.cpp",
>+  "$_deqp_path/modules/gles2/functional/es2fNegativeTextureApiTests.hpp",
>+  "$_deqp_path/modules/gles2/functional/es2fNegativeVertexArrayApiTests.cpp",
>+  "$_deqp_path/modules/gles2/functional/es2fNegativeVertexArrayApiTests.hpp",
>+  "$_deqp_path/modules/gles2/functional/es2fPolygonOffsetTests.cpp",
>+  "$_deqp_path/modules/gles2/functional/es2fPolygonOffsetTests.hpp",
>+  "$_deqp_path/modules/gles2/functional/es2fPrerequisiteTests.cpp",
>+  "$_deqp_path/modules/gles2/functional/es2fPrerequisiteTests.hpp",
>+  "$_deqp_path/modules/gles2/functional/es2fRandomFragmentOpTests.cpp",
>+  "$_deqp_path/modules/gles2/functional/es2fRandomFragmentOpTests.hpp",
>+  "$_deqp_path/modules/gles2/functional/es2fRandomShaderTests.cpp",
>+  "$_deqp_path/modules/gles2/functional/es2fRandomShaderTests.hpp",
>+  "$_deqp_path/modules/gles2/functional/es2fRasterizationTests.cpp",
>+  "$_deqp_path/modules/gles2/functional/es2fRasterizationTests.hpp",
>+  "$_deqp_path/modules/gles2/functional/es2fRboStateQueryTests.cpp",
>+  "$_deqp_path/modules/gles2/functional/es2fRboStateQueryTests.hpp",
>+  "$_deqp_path/modules/gles2/functional/es2fReadPixelsTests.cpp",
>+  "$_deqp_path/modules/gles2/functional/es2fReadPixelsTests.hpp",
>+  "$_deqp_path/modules/gles2/functional/es2fScissorTests.cpp",
>+  "$_deqp_path/modules/gles2/functional/es2fScissorTests.hpp",
>+  "$_deqp_path/modules/gles2/functional/es2fShaderAlgorithmTests.cpp",
>+  "$_deqp_path/modules/gles2/functional/es2fShaderAlgorithmTests.hpp",
>+  "$_deqp_path/modules/gles2/functional/es2fShaderApiTests.cpp",
>+  "$_deqp_path/modules/gles2/functional/es2fShaderApiTests.hpp",
>+  "$_deqp_path/modules/gles2/functional/es2fShaderBuiltinVarTests.cpp",
>+  "$_deqp_path/modules/gles2/functional/es2fShaderBuiltinVarTests.hpp",
>+  "$_deqp_path/modules/gles2/functional/es2fShaderConstExprTests.cpp",
>+  "$_deqp_path/modules/gles2/functional/es2fShaderConstExprTests.hpp",
>+  "$_deqp_path/modules/gles2/functional/es2fShaderDiscardTests.cpp",
>+  "$_deqp_path/modules/gles2/functional/es2fShaderDiscardTests.hpp",
>+  "$_deqp_path/modules/gles2/functional/es2fShaderExecuteTest.cpp",
>+  "$_deqp_path/modules/gles2/functional/es2fShaderExecuteTest.hpp",
>+  "$_deqp_path/modules/gles2/functional/es2fShaderFragDataTests.cpp",
>+  "$_deqp_path/modules/gles2/functional/es2fShaderFragDataTests.hpp",
>+  "$_deqp_path/modules/gles2/functional/es2fShaderIndexingTests.cpp",
>+  "$_deqp_path/modules/gles2/functional/es2fShaderIndexingTests.hpp",
>+  "$_deqp_path/modules/gles2/functional/es2fShaderInvarianceTests.cpp",
>+  "$_deqp_path/modules/gles2/functional/es2fShaderInvarianceTests.hpp",
>+  "$_deqp_path/modules/gles2/functional/es2fShaderLoopTests.cpp",
>+  "$_deqp_path/modules/gles2/functional/es2fShaderLoopTests.hpp",
>+  "$_deqp_path/modules/gles2/functional/es2fShaderMatrixTests.cpp",
>+  "$_deqp_path/modules/gles2/functional/es2fShaderMatrixTests.hpp",
>+  "$_deqp_path/modules/gles2/functional/es2fShaderOperatorTests.cpp",
>+  "$_deqp_path/modules/gles2/functional/es2fShaderOperatorTests.hpp",
>+  "$_deqp_path/modules/gles2/functional/es2fShaderReturnTests.cpp",
>+  "$_deqp_path/modules/gles2/functional/es2fShaderReturnTests.hpp",
>+  "$_deqp_path/modules/gles2/functional/es2fShaderStateQueryTests.cpp",
>+  "$_deqp_path/modules/gles2/functional/es2fShaderStateQueryTests.hpp",
>+  "$_deqp_path/modules/gles2/functional/es2fShaderStructTests.cpp",
>+  "$_deqp_path/modules/gles2/functional/es2fShaderStructTests.hpp",
>+  "$_deqp_path/modules/gles2/functional/es2fShaderTextureFunctionTests.cpp",
>+  "$_deqp_path/modules/gles2/functional/es2fShaderTextureFunctionTests.hpp",
>+  "$_deqp_path/modules/gles2/functional/es2fStencilTests.cpp",
>+  "$_deqp_path/modules/gles2/functional/es2fStencilTests.hpp",
>+  "$_deqp_path/modules/gles2/functional/es2fStringQueryTests.cpp",
>+  "$_deqp_path/modules/gles2/functional/es2fStringQueryTests.hpp",
>+  "$_deqp_path/modules/gles2/functional/es2fTextureCompletenessTests.cpp",
>+  "$_deqp_path/modules/gles2/functional/es2fTextureCompletenessTests.hpp",
>+  "$_deqp_path/modules/gles2/functional/es2fTextureFilteringTests.cpp",
>+  "$_deqp_path/modules/gles2/functional/es2fTextureFilteringTests.hpp",
>+  "$_deqp_path/modules/gles2/functional/es2fTextureFormatTests.cpp",
>+  "$_deqp_path/modules/gles2/functional/es2fTextureFormatTests.hpp",
>+  "$_deqp_path/modules/gles2/functional/es2fTextureMipmapTests.cpp",
>+  "$_deqp_path/modules/gles2/functional/es2fTextureMipmapTests.hpp",
>+  "$_deqp_path/modules/gles2/functional/es2fTextureSizeTests.cpp",
>+  "$_deqp_path/modules/gles2/functional/es2fTextureSizeTests.hpp",
>+  "$_deqp_path/modules/gles2/functional/es2fTextureSpecificationTests.cpp",
>+  "$_deqp_path/modules/gles2/functional/es2fTextureSpecificationTests.hpp",
>+  "$_deqp_path/modules/gles2/functional/es2fTextureStateQueryTests.cpp",
>+  "$_deqp_path/modules/gles2/functional/es2fTextureStateQueryTests.hpp",
>+  "$_deqp_path/modules/gles2/functional/es2fTextureUnitTests.cpp",
>+  "$_deqp_path/modules/gles2/functional/es2fTextureUnitTests.hpp",
>+  "$_deqp_path/modules/gles2/functional/es2fTextureWrapTests.cpp",
>+  "$_deqp_path/modules/gles2/functional/es2fTextureWrapTests.hpp",
>+  "$_deqp_path/modules/gles2/functional/es2fUniformApiTests.cpp",
>+  "$_deqp_path/modules/gles2/functional/es2fUniformApiTests.hpp",
>+  "$_deqp_path/modules/gles2/functional/es2fVertexArrayTest.cpp",
>+  "$_deqp_path/modules/gles2/functional/es2fVertexArrayTest.hpp",
>+  "$_deqp_path/modules/gles2/functional/es2fVertexTextureTests.cpp",
>+  "$_deqp_path/modules/gles2/functional/es2fVertexTextureTests.hpp",
>+  "$_deqp_path/modules/gles2/performance/es2pBlendTests.cpp",
>+  "$_deqp_path/modules/gles2/performance/es2pBlendTests.hpp",
>+  "$_deqp_path/modules/gles2/performance/es2pDrawCallBatchingTests.cpp",
>+  "$_deqp_path/modules/gles2/performance/es2pDrawCallBatchingTests.hpp",
>+  "$_deqp_path/modules/gles2/performance/es2pPerformanceTests.cpp",
>+  "$_deqp_path/modules/gles2/performance/es2pPerformanceTests.hpp",
>+  "$_deqp_path/modules/gles2/performance/es2pRedundantStateChangeTests.cpp",
>+  "$_deqp_path/modules/gles2/performance/es2pRedundantStateChangeTests.hpp",
>+  "$_deqp_path/modules/gles2/performance/es2pShaderCompilationCases.cpp",
>+  "$_deqp_path/modules/gles2/performance/es2pShaderCompilationCases.hpp",
>+  "$_deqp_path/modules/gles2/performance/es2pShaderCompilerTests.cpp",
>+  "$_deqp_path/modules/gles2/performance/es2pShaderCompilerTests.hpp",
>+  "$_deqp_path/modules/gles2/performance/es2pShaderControlStatementTests.cpp",
>+  "$_deqp_path/modules/gles2/performance/es2pShaderControlStatementTests.hpp",
>+  "$_deqp_path/modules/gles2/performance/es2pShaderOperatorTests.cpp",
>+  "$_deqp_path/modules/gles2/performance/es2pShaderOperatorTests.hpp",
>+  "$_deqp_path/modules/gles2/performance/es2pShaderOptimizationTests.cpp",
>+  "$_deqp_path/modules/gles2/performance/es2pShaderOptimizationTests.hpp",
>+  "$_deqp_path/modules/gles2/performance/es2pStateChangeCallTests.cpp",
>+  "$_deqp_path/modules/gles2/performance/es2pStateChangeCallTests.hpp",
>+  "$_deqp_path/modules/gles2/performance/es2pStateChangeTests.cpp",
>+  "$_deqp_path/modules/gles2/performance/es2pStateChangeTests.hpp",
>+  "$_deqp_path/modules/gles2/performance/es2pTextureCases.cpp",
>+  "$_deqp_path/modules/gles2/performance/es2pTextureCases.hpp",
>+  "$_deqp_path/modules/gles2/performance/es2pTextureCountTests.cpp",
>+  "$_deqp_path/modules/gles2/performance/es2pTextureCountTests.hpp",
>+  "$_deqp_path/modules/gles2/performance/es2pTextureFilteringTests.cpp",
>+  "$_deqp_path/modules/gles2/performance/es2pTextureFilteringTests.hpp",
>+  "$_deqp_path/modules/gles2/performance/es2pTextureFormatTests.cpp",
>+  "$_deqp_path/modules/gles2/performance/es2pTextureFormatTests.hpp",
>+  "$_deqp_path/modules/gles2/performance/es2pTextureUploadTests.cpp",
>+  "$_deqp_path/modules/gles2/performance/es2pTextureUploadTests.hpp",
>+  "$_deqp_path/modules/gles2/stress/es2sDrawTests.cpp",
>+  "$_deqp_path/modules/gles2/stress/es2sDrawTests.hpp",
>+  "$_deqp_path/modules/gles2/stress/es2sLongRunningTests.cpp",
>+  "$_deqp_path/modules/gles2/stress/es2sLongRunningTests.hpp",
>+  "$_deqp_path/modules/gles2/stress/es2sMemoryTests.cpp",
>+  "$_deqp_path/modules/gles2/stress/es2sMemoryTests.hpp",
>+  "$_deqp_path/modules/gles2/stress/es2sSpecialFloatTests.cpp",
>+  "$_deqp_path/modules/gles2/stress/es2sSpecialFloatTests.hpp",
>+  "$_deqp_path/modules/gles2/stress/es2sStressTests.cpp",
>+  "$_deqp_path/modules/gles2/stress/es2sStressTests.hpp",
>+  "$_deqp_path/modules/gles2/stress/es2sVertexArrayTests.cpp",
>+  "$_deqp_path/modules/gles2/stress/es2sVertexArrayTests.hpp",
>+  "$_deqp_path/modules/gles2/tes2CapabilityTests.cpp",
>+  "$_deqp_path/modules/gles2/tes2CapabilityTests.hpp",
>+  "$_deqp_path/modules/gles2/tes2Context.cpp",
>+  "$_deqp_path/modules/gles2/tes2Context.hpp",
>+  "$_deqp_path/modules/gles2/tes2InfoTests.cpp",
>+  "$_deqp_path/modules/gles2/tes2InfoTests.hpp",
>+  "$_deqp_path/modules/gles2/tes2TestCase.cpp",
>+  "$_deqp_path/modules/gles2/tes2TestCase.hpp",
>+  "$_deqp_path/modules/gles2/tes2TestPackage.cpp",
>+  "$_deqp_path/modules/gles2/tes2TestPackage.hpp",
>+  "$_deqp_path/modules/gles2/tes2TestPackageEntry.cpp",
>+]
>+deqp_gles3_sources = [
>+  "$_deqp_path/modules/gles3/accuracy/es3aAccuracyTests.cpp",
>+  "$_deqp_path/modules/gles3/accuracy/es3aAccuracyTests.hpp",
>+  "$_deqp_path/modules/gles3/accuracy/es3aTextureFilteringTests.cpp",
>+  "$_deqp_path/modules/gles3/accuracy/es3aTextureFilteringTests.hpp",
>+  "$_deqp_path/modules/gles3/accuracy/es3aTextureMipmapTests.cpp",
>+  "$_deqp_path/modules/gles3/accuracy/es3aTextureMipmapTests.hpp",
>+  "$_deqp_path/modules/gles3/accuracy/es3aVaryingInterpolationTests.cpp",
>+  "$_deqp_path/modules/gles3/accuracy/es3aVaryingInterpolationTests.hpp",
>+  "$_deqp_path/modules/gles3/functional/es3fApiCase.cpp",
>+  "$_deqp_path/modules/gles3/functional/es3fApiCase.hpp",
>+  "$_deqp_path/modules/gles3/functional/es3fASTCDecompressionCases.cpp",
>+  "$_deqp_path/modules/gles3/functional/es3fASTCDecompressionCases.hpp",
>+  "$_deqp_path/modules/gles3/functional/es3fAttribLocationTests.cpp",
>+  "$_deqp_path/modules/gles3/functional/es3fAttribLocationTests.hpp",
>+  "$_deqp_path/modules/gles3/functional/es3fBlendTests.cpp",
>+  "$_deqp_path/modules/gles3/functional/es3fBlendTests.hpp",
>+  "$_deqp_path/modules/gles3/functional/es3fBooleanStateQueryTests.cpp",
>+  "$_deqp_path/modules/gles3/functional/es3fBooleanStateQueryTests.hpp",
>+  "$_deqp_path/modules/gles3/functional/es3fBufferCopyTests.cpp",
>+  "$_deqp_path/modules/gles3/functional/es3fBufferCopyTests.hpp",
>+  "$_deqp_path/modules/gles3/functional/es3fBufferMapTests.cpp",
>+  "$_deqp_path/modules/gles3/functional/es3fBufferMapTests.hpp",
>+  "$_deqp_path/modules/gles3/functional/es3fBufferObjectQueryTests.cpp",
>+  "$_deqp_path/modules/gles3/functional/es3fBufferObjectQueryTests.hpp",
>+  "$_deqp_path/modules/gles3/functional/es3fBufferWriteTests.cpp",
>+  "$_deqp_path/modules/gles3/functional/es3fBufferWriteTests.hpp",
>+  "$_deqp_path/modules/gles3/functional/es3fBuiltinPrecisionTests.cpp",
>+  "$_deqp_path/modules/gles3/functional/es3fBuiltinPrecisionTests.hpp",
>+  "$_deqp_path/modules/gles3/functional/es3fClippingTests.cpp",
>+  "$_deqp_path/modules/gles3/functional/es3fClippingTests.hpp",
>+  "$_deqp_path/modules/gles3/functional/es3fColorClearTest.cpp",
>+  "$_deqp_path/modules/gles3/functional/es3fColorClearTest.hpp",
>+  "$_deqp_path/modules/gles3/functional/es3fCompressedTextureTests.cpp",
>+  "$_deqp_path/modules/gles3/functional/es3fCompressedTextureTests.hpp",
>+  "$_deqp_path/modules/gles3/functional/es3fDefaultVertexArrayObjectTests.cpp",
>+  "$_deqp_path/modules/gles3/functional/es3fDefaultVertexArrayObjectTests.hpp",
>+  "$_deqp_path/modules/gles3/functional/es3fDefaultVertexAttributeTests.cpp",
>+  "$_deqp_path/modules/gles3/functional/es3fDefaultVertexAttributeTests.hpp",
>+  "$_deqp_path/modules/gles3/functional/es3fDepthStencilClearTests.cpp",
>+  "$_deqp_path/modules/gles3/functional/es3fDepthStencilClearTests.hpp",
>+  "$_deqp_path/modules/gles3/functional/es3fDepthStencilTests.cpp",
>+  "$_deqp_path/modules/gles3/functional/es3fDepthStencilTests.hpp",
>+  "$_deqp_path/modules/gles3/functional/es3fDepthTests.cpp",
>+  "$_deqp_path/modules/gles3/functional/es3fDepthTests.hpp",
>+  "$_deqp_path/modules/gles3/functional/es3fDitheringTests.cpp",
>+  "$_deqp_path/modules/gles3/functional/es3fDitheringTests.hpp",
>+  "$_deqp_path/modules/gles3/functional/es3fDrawTests.cpp",
>+  "$_deqp_path/modules/gles3/functional/es3fDrawTests.hpp",
>+  "$_deqp_path/modules/gles3/functional/es3fFboApiTests.cpp",
>+  "$_deqp_path/modules/gles3/functional/es3fFboApiTests.hpp",
>+  "$_deqp_path/modules/gles3/functional/es3fFboColorbufferTests.cpp",
>+  "$_deqp_path/modules/gles3/functional/es3fFboColorbufferTests.hpp",
>+  "$_deqp_path/modules/gles3/functional/es3fFboCompletenessTests.cpp",
>+  "$_deqp_path/modules/gles3/functional/es3fFboCompletenessTests.hpp",
>+  "$_deqp_path/modules/gles3/functional/es3fFboDepthbufferTests.cpp",
>+  "$_deqp_path/modules/gles3/functional/es3fFboDepthbufferTests.hpp",
>+  "$_deqp_path/modules/gles3/functional/es3fFboInvalidateTests.cpp",
>+  "$_deqp_path/modules/gles3/functional/es3fFboInvalidateTests.hpp",
>+  "$_deqp_path/modules/gles3/functional/es3fFboMultisampleTests.cpp",
>+  "$_deqp_path/modules/gles3/functional/es3fFboMultisampleTests.hpp",
>+  "$_deqp_path/modules/gles3/functional/es3fFboRenderTest.cpp",
>+  "$_deqp_path/modules/gles3/functional/es3fFboRenderTest.hpp",
>+  "$_deqp_path/modules/gles3/functional/es3fFboStateQueryTests.cpp",
>+  "$_deqp_path/modules/gles3/functional/es3fFboStateQueryTests.hpp",
>+  "$_deqp_path/modules/gles3/functional/es3fFboStencilbufferTests.cpp",
>+  "$_deqp_path/modules/gles3/functional/es3fFboStencilbufferTests.hpp",
>+  "$_deqp_path/modules/gles3/functional/es3fFboTestCase.cpp",
>+  "$_deqp_path/modules/gles3/functional/es3fFboTestCase.hpp",
>+  "$_deqp_path/modules/gles3/functional/es3fFboTestUtil.cpp",
>+  "$_deqp_path/modules/gles3/functional/es3fFboTestUtil.hpp",
>+  "$_deqp_path/modules/gles3/functional/es3fFloatStateQueryTests.cpp",
>+  "$_deqp_path/modules/gles3/functional/es3fFloatStateQueryTests.hpp",
>+  "$_deqp_path/modules/gles3/functional/es3fFlushFinishTests.cpp",
>+  "$_deqp_path/modules/gles3/functional/es3fFlushFinishTests.hpp",
>+  "$_deqp_path/modules/gles3/functional/es3fFragDepthTests.cpp",
>+  "$_deqp_path/modules/gles3/functional/es3fFragDepthTests.hpp",
>+  "$_deqp_path/modules/gles3/functional/es3fFragmentOutputTests.cpp",
>+  "$_deqp_path/modules/gles3/functional/es3fFragmentOutputTests.hpp",
>+  "$_deqp_path/modules/gles3/functional/es3fFragOpInteractionTests.cpp",
>+  "$_deqp_path/modules/gles3/functional/es3fFragOpInteractionTests.hpp",
>+  "$_deqp_path/modules/gles3/functional/es3fFramebufferBlitTests.cpp",
>+  "$_deqp_path/modules/gles3/functional/es3fFramebufferBlitTests.hpp",
>+  "$_deqp_path/modules/gles3/functional/es3fFunctionalTests.cpp",
>+  "$_deqp_path/modules/gles3/functional/es3fFunctionalTests.hpp",
>+  "$_deqp_path/modules/gles3/functional/es3fImplementationLimitTests.cpp",
>+  "$_deqp_path/modules/gles3/functional/es3fImplementationLimitTests.hpp",
>+  "$_deqp_path/modules/gles3/functional/es3fIndexedStateQueryTests.cpp",
>+  "$_deqp_path/modules/gles3/functional/es3fIndexedStateQueryTests.hpp",
>+  "$_deqp_path/modules/gles3/functional/es3fInstancedRenderingTests.cpp",
>+  "$_deqp_path/modules/gles3/functional/es3fInstancedRenderingTests.hpp",
>+  "$_deqp_path/modules/gles3/functional/es3fInteger64StateQueryTests.cpp",
>+  "$_deqp_path/modules/gles3/functional/es3fInteger64StateQueryTests.hpp",
>+  "$_deqp_path/modules/gles3/functional/es3fIntegerStateQueryTests.cpp",
>+  "$_deqp_path/modules/gles3/functional/es3fIntegerStateQueryTests.hpp",
>+  "$_deqp_path/modules/gles3/functional/es3fInternalFormatQueryTests.cpp",
>+  "$_deqp_path/modules/gles3/functional/es3fInternalFormatQueryTests.hpp",
>+  "$_deqp_path/modules/gles3/functional/es3fLifetimeTests.cpp",
>+  "$_deqp_path/modules/gles3/functional/es3fLifetimeTests.hpp",
>+  "$_deqp_path/modules/gles3/functional/es3fMultisampleTests.cpp",
>+  "$_deqp_path/modules/gles3/functional/es3fMultisampleTests.hpp",
>+  "$_deqp_path/modules/gles3/functional/es3fMultiviewTests.cpp",
>+  "$_deqp_path/modules/gles3/functional/es3fMultiviewTests.hpp",
>+  "$_deqp_path/modules/gles3/functional/es3fNegativeBufferApiTests.cpp",
>+  "$_deqp_path/modules/gles3/functional/es3fNegativeBufferApiTests.hpp",
>+  "$_deqp_path/modules/gles3/functional/es3fNegativeFragmentApiTests.cpp",
>+  "$_deqp_path/modules/gles3/functional/es3fNegativeFragmentApiTests.hpp",
>+  "$_deqp_path/modules/gles3/functional/es3fNegativeShaderApiTests.cpp",
>+  "$_deqp_path/modules/gles3/functional/es3fNegativeShaderApiTests.hpp",
>+  "$_deqp_path/modules/gles3/functional/es3fNegativeStateApiTests.cpp",
>+  "$_deqp_path/modules/gles3/functional/es3fNegativeStateApiTests.hpp",
>+  "$_deqp_path/modules/gles3/functional/es3fNegativeTextureApiTests.cpp",
>+  "$_deqp_path/modules/gles3/functional/es3fNegativeTextureApiTests.hpp",
>+  "$_deqp_path/modules/gles3/functional/es3fNegativeVertexArrayApiTests.cpp",
>+  "$_deqp_path/modules/gles3/functional/es3fNegativeVertexArrayApiTests.hpp",
>+  "$_deqp_path/modules/gles3/functional/es3fOcclusionQueryTests.cpp",
>+  "$_deqp_path/modules/gles3/functional/es3fOcclusionQueryTests.hpp",
>+  "$_deqp_path/modules/gles3/functional/es3fPixelBufferObjectTests.cpp",
>+  "$_deqp_path/modules/gles3/functional/es3fPixelBufferObjectTests.hpp",
>+  "$_deqp_path/modules/gles3/functional/es3fPolygonOffsetTests.cpp",
>+  "$_deqp_path/modules/gles3/functional/es3fPolygonOffsetTests.hpp",
>+  "$_deqp_path/modules/gles3/functional/es3fPrerequisiteTests.cpp",
>+  "$_deqp_path/modules/gles3/functional/es3fPrerequisiteTests.hpp",
>+  "$_deqp_path/modules/gles3/functional/es3fPrimitiveRestartTests.cpp",
>+  "$_deqp_path/modules/gles3/functional/es3fPrimitiveRestartTests.hpp",
>+  "$_deqp_path/modules/gles3/functional/es3fRandomFragmentOpTests.cpp",
>+  "$_deqp_path/modules/gles3/functional/es3fRandomFragmentOpTests.hpp",
>+  "$_deqp_path/modules/gles3/functional/es3fRandomShaderTests.cpp",
>+  "$_deqp_path/modules/gles3/functional/es3fRandomShaderTests.hpp",
>+  "$_deqp_path/modules/gles3/functional/es3fRasterizationTests.cpp",
>+  "$_deqp_path/modules/gles3/functional/es3fRasterizationTests.hpp",
>+  "$_deqp_path/modules/gles3/functional/es3fRasterizerDiscardTests.cpp",
>+  "$_deqp_path/modules/gles3/functional/es3fRasterizerDiscardTests.hpp",
>+  "$_deqp_path/modules/gles3/functional/es3fRboStateQueryTests.cpp",
>+  "$_deqp_path/modules/gles3/functional/es3fRboStateQueryTests.hpp",
>+  "$_deqp_path/modules/gles3/functional/es3fReadPixelsTests.cpp",
>+  "$_deqp_path/modules/gles3/functional/es3fReadPixelsTests.hpp",
>+  "$_deqp_path/modules/gles3/functional/es3fSamplerObjectTests.cpp",
>+  "$_deqp_path/modules/gles3/functional/es3fSamplerObjectTests.hpp",
>+  "$_deqp_path/modules/gles3/functional/es3fSamplerStateQueryTests.cpp",
>+  "$_deqp_path/modules/gles3/functional/es3fSamplerStateQueryTests.hpp",
>+  "$_deqp_path/modules/gles3/functional/es3fScissorTests.cpp",
>+  "$_deqp_path/modules/gles3/functional/es3fScissorTests.hpp",
>+  "$_deqp_path/modules/gles3/functional/es3fShaderApiTests.cpp",
>+  "$_deqp_path/modules/gles3/functional/es3fShaderApiTests.hpp",
>+  "$_deqp_path/modules/gles3/functional/es3fShaderBuiltinVarTests.cpp",
>+  "$_deqp_path/modules/gles3/functional/es3fShaderBuiltinVarTests.hpp",
>+  "$_deqp_path/modules/gles3/functional/es3fShaderCommonFunctionTests.cpp",
>+  "$_deqp_path/modules/gles3/functional/es3fShaderCommonFunctionTests.hpp",
>+  "$_deqp_path/modules/gles3/functional/es3fShaderConstExprTests.cpp",
>+  "$_deqp_path/modules/gles3/functional/es3fShaderConstExprTests.hpp",
>+  "$_deqp_path/modules/gles3/functional/es3fShaderDerivateTests.cpp",
>+  "$_deqp_path/modules/gles3/functional/es3fShaderDerivateTests.hpp",
>+  "$_deqp_path/modules/gles3/functional/es3fShaderDiscardTests.cpp",
>+  "$_deqp_path/modules/gles3/functional/es3fShaderDiscardTests.hpp",
>+  "$_deqp_path/modules/gles3/functional/es3fShaderFragDataTests.cpp",
>+  "$_deqp_path/modules/gles3/functional/es3fShaderFragDataTests.hpp",
>+  "$_deqp_path/modules/gles3/functional/es3fShaderIndexingTests.cpp",
>+  "$_deqp_path/modules/gles3/functional/es3fShaderIndexingTests.hpp",
>+  "$_deqp_path/modules/gles3/functional/es3fShaderInvarianceTests.cpp",
>+  "$_deqp_path/modules/gles3/functional/es3fShaderInvarianceTests.hpp",
>+  "$_deqp_path/modules/gles3/functional/es3fShaderLoopTests.cpp",
>+  "$_deqp_path/modules/gles3/functional/es3fShaderLoopTests.hpp",
>+  "$_deqp_path/modules/gles3/functional/es3fShaderMetamorphicTests.cpp",
>+  "$_deqp_path/modules/gles3/functional/es3fShaderMetamorphicTests.hpp",
>+  "$_deqp_path/modules/gles3/functional/es3fShaderMatrixTests.cpp",
>+  "$_deqp_path/modules/gles3/functional/es3fShaderMatrixTests.hpp",
>+  "$_deqp_path/modules/gles3/functional/es3fShaderOperatorTests.cpp",
>+  "$_deqp_path/modules/gles3/functional/es3fShaderOperatorTests.hpp",
>+  "$_deqp_path/modules/gles3/functional/es3fShaderPackingFunctionTests.cpp",
>+  "$_deqp_path/modules/gles3/functional/es3fShaderPackingFunctionTests.hpp",
>+  "$_deqp_path/modules/gles3/functional/es3fShaderPrecisionTests.cpp",
>+  "$_deqp_path/modules/gles3/functional/es3fShaderPrecisionTests.hpp",
>+  "$_deqp_path/modules/gles3/functional/es3fShaderReturnTests.cpp",
>+  "$_deqp_path/modules/gles3/functional/es3fShaderReturnTests.hpp",
>+  "$_deqp_path/modules/gles3/functional/es3fShaderStateQueryTests.cpp",
>+  "$_deqp_path/modules/gles3/functional/es3fShaderStateQueryTests.hpp",
>+  "$_deqp_path/modules/gles3/functional/es3fShaderStructTests.cpp",
>+  "$_deqp_path/modules/gles3/functional/es3fShaderStructTests.hpp",
>+  "$_deqp_path/modules/gles3/functional/es3fShaderSwitchTests.cpp",
>+  "$_deqp_path/modules/gles3/functional/es3fShaderSwitchTests.hpp",
>+  "$_deqp_path/modules/gles3/functional/es3fShaderTextureFunctionTests.cpp",
>+  "$_deqp_path/modules/gles3/functional/es3fShaderTextureFunctionTests.hpp",
>+  "$_deqp_path/modules/gles3/functional/es3fStencilTests.cpp",
>+  "$_deqp_path/modules/gles3/functional/es3fStencilTests.hpp",
>+  "$_deqp_path/modules/gles3/functional/es3fStringQueryTests.cpp",
>+  "$_deqp_path/modules/gles3/functional/es3fStringQueryTests.hpp",
>+  "$_deqp_path/modules/gles3/functional/es3fSyncTests.cpp",
>+  "$_deqp_path/modules/gles3/functional/es3fSyncTests.hpp",
>+  "$_deqp_path/modules/gles3/functional/es3fTextureFilteringTests.cpp",
>+  "$_deqp_path/modules/gles3/functional/es3fTextureFilteringTests.hpp",
>+  "$_deqp_path/modules/gles3/functional/es3fTextureFormatTests.cpp",
>+  "$_deqp_path/modules/gles3/functional/es3fTextureFormatTests.hpp",
>+  "$_deqp_path/modules/gles3/functional/es3fTextureMipmapTests.cpp",
>+  "$_deqp_path/modules/gles3/functional/es3fTextureMipmapTests.hpp",
>+  "$_deqp_path/modules/gles3/functional/es3fTextureShadowTests.cpp",
>+  "$_deqp_path/modules/gles3/functional/es3fTextureShadowTests.hpp",
>+  "$_deqp_path/modules/gles3/functional/es3fTextureSizeTests.cpp",
>+  "$_deqp_path/modules/gles3/functional/es3fTextureSizeTests.hpp",
>+  "$_deqp_path/modules/gles3/functional/es3fTextureSpecificationTests.cpp",
>+  "$_deqp_path/modules/gles3/functional/es3fTextureSpecificationTests.hpp",
>+  "$_deqp_path/modules/gles3/functional/es3fTextureStateQueryTests.cpp",
>+  "$_deqp_path/modules/gles3/functional/es3fTextureStateQueryTests.hpp",
>+  "$_deqp_path/modules/gles3/functional/es3fTextureSwizzleTests.cpp",
>+  "$_deqp_path/modules/gles3/functional/es3fTextureSwizzleTests.hpp",
>+  "$_deqp_path/modules/gles3/functional/es3fTextureUnitTests.cpp",
>+  "$_deqp_path/modules/gles3/functional/es3fTextureUnitTests.hpp",
>+  "$_deqp_path/modules/gles3/functional/es3fTextureWrapTests.cpp",
>+  "$_deqp_path/modules/gles3/functional/es3fTextureWrapTests.hpp",
>+  "$_deqp_path/modules/gles3/functional/es3fTransformFeedbackTests.cpp",
>+  "$_deqp_path/modules/gles3/functional/es3fTransformFeedbackTests.hpp",
>+  "$_deqp_path/modules/gles3/functional/es3fUniformApiTests.cpp",
>+  "$_deqp_path/modules/gles3/functional/es3fUniformApiTests.hpp",
>+  "$_deqp_path/modules/gles3/functional/es3fUniformBlockTests.cpp",
>+  "$_deqp_path/modules/gles3/functional/es3fUniformBlockTests.hpp",
>+  "$_deqp_path/modules/gles3/functional/es3fVertexArrayObjectTests.cpp",
>+  "$_deqp_path/modules/gles3/functional/es3fVertexArrayObjectTests.hpp",
>+  "$_deqp_path/modules/gles3/functional/es3fVertexArrayTest.cpp",
>+  "$_deqp_path/modules/gles3/functional/es3fVertexArrayTest.hpp",
>+  "$_deqp_path/modules/gles3/functional/es3fVertexTextureTests.cpp",
>+  "$_deqp_path/modules/gles3/functional/es3fVertexTextureTests.hpp",
>+  "$_deqp_path/modules/gles3/performance/es3pBlendTests.cpp",
>+  "$_deqp_path/modules/gles3/performance/es3pBlendTests.hpp",
>+  "$_deqp_path/modules/gles3/performance/es3pBufferDataUploadTests.cpp",
>+  "$_deqp_path/modules/gles3/performance/es3pBufferDataUploadTests.hpp",
>+  "$_deqp_path/modules/gles3/performance/es3pDepthTests.cpp",
>+  "$_deqp_path/modules/gles3/performance/es3pDepthTests.hpp",
>+  "$_deqp_path/modules/gles3/performance/es3pPerformanceTests.cpp",
>+  "$_deqp_path/modules/gles3/performance/es3pPerformanceTests.hpp",
>+  "$_deqp_path/modules/gles3/performance/es3pRedundantStateChangeTests.cpp",
>+  "$_deqp_path/modules/gles3/performance/es3pRedundantStateChangeTests.hpp",
>+  "$_deqp_path/modules/gles3/performance/es3pShaderCompilationCases.cpp",
>+  "$_deqp_path/modules/gles3/performance/es3pShaderCompilationCases.hpp",
>+  "$_deqp_path/modules/gles3/performance/es3pShaderCompilerTests.cpp",
>+  "$_deqp_path/modules/gles3/performance/es3pShaderCompilerTests.hpp",
>+  "$_deqp_path/modules/gles3/performance/es3pShaderControlStatementTests.cpp",
>+  "$_deqp_path/modules/gles3/performance/es3pShaderControlStatementTests.hpp",
>+  "$_deqp_path/modules/gles3/performance/es3pShaderOperatorTests.cpp",
>+  "$_deqp_path/modules/gles3/performance/es3pShaderOperatorTests.hpp",
>+  "$_deqp_path/modules/gles3/performance/es3pShaderOptimizationTests.cpp",
>+  "$_deqp_path/modules/gles3/performance/es3pShaderOptimizationTests.hpp",
>+  "$_deqp_path/modules/gles3/performance/es3pStateChangeCallTests.cpp",
>+  "$_deqp_path/modules/gles3/performance/es3pStateChangeCallTests.hpp",
>+  "$_deqp_path/modules/gles3/performance/es3pStateChangeTests.cpp",
>+  "$_deqp_path/modules/gles3/performance/es3pStateChangeTests.hpp",
>+  "$_deqp_path/modules/gles3/performance/es3pTextureCases.cpp",
>+  "$_deqp_path/modules/gles3/performance/es3pTextureCases.hpp",
>+  "$_deqp_path/modules/gles3/performance/es3pTextureCountTests.cpp",
>+  "$_deqp_path/modules/gles3/performance/es3pTextureCountTests.hpp",
>+  "$_deqp_path/modules/gles3/performance/es3pTextureFilteringTests.cpp",
>+  "$_deqp_path/modules/gles3/performance/es3pTextureFilteringTests.hpp",
>+  "$_deqp_path/modules/gles3/performance/es3pTextureFormatTests.cpp",
>+  "$_deqp_path/modules/gles3/performance/es3pTextureFormatTests.hpp",
>+  "$_deqp_path/modules/gles3/stress/es3sDrawTests.cpp",
>+  "$_deqp_path/modules/gles3/stress/es3sDrawTests.hpp",
>+  "$_deqp_path/modules/gles3/stress/es3sLongRunningShaderTests.cpp",
>+  "$_deqp_path/modules/gles3/stress/es3sLongRunningShaderTests.hpp",
>+  "$_deqp_path/modules/gles3/stress/es3sLongRunningTests.cpp",
>+  "$_deqp_path/modules/gles3/stress/es3sLongRunningTests.hpp",
>+  "$_deqp_path/modules/gles3/stress/es3sLongShaderTests.cpp",
>+  "$_deqp_path/modules/gles3/stress/es3sLongShaderTests.hpp",
>+  "$_deqp_path/modules/gles3/stress/es3sMemoryTests.cpp",
>+  "$_deqp_path/modules/gles3/stress/es3sMemoryTests.hpp",
>+  "$_deqp_path/modules/gles3/stress/es3sOcclusionQueryTests.cpp",
>+  "$_deqp_path/modules/gles3/stress/es3sOcclusionQueryTests.hpp",
>+  "$_deqp_path/modules/gles3/stress/es3sSpecialFloatTests.cpp",
>+  "$_deqp_path/modules/gles3/stress/es3sSpecialFloatTests.hpp",
>+  "$_deqp_path/modules/gles3/stress/es3sStressTests.cpp",
>+  "$_deqp_path/modules/gles3/stress/es3sStressTests.hpp",
>+  "$_deqp_path/modules/gles3/stress/es3sSyncTests.cpp",
>+  "$_deqp_path/modules/gles3/stress/es3sSyncTests.hpp",
>+  "$_deqp_path/modules/gles3/stress/es3sVertexArrayTests.cpp",
>+  "$_deqp_path/modules/gles3/stress/es3sVertexArrayTests.hpp",
>+  "$_deqp_path/modules/gles3/tes3Context.cpp",
>+  "$_deqp_path/modules/gles3/tes3Context.hpp",
>+  "$_deqp_path/modules/gles3/tes3InfoTests.cpp",
>+  "$_deqp_path/modules/gles3/tes3InfoTests.hpp",
>+  "$_deqp_path/modules/gles3/tes3TestCase.cpp",
>+  "$_deqp_path/modules/gles3/tes3TestCase.hpp",
>+  "$_deqp_path/modules/gles3/tes3TestPackage.cpp",
>+  "$_deqp_path/modules/gles3/tes3TestPackage.hpp",
>+  "$_deqp_path/modules/gles3/tes3TestPackageEntry.cpp",
>+]
>+deqp_gles31_sources = [
>+  "$_deqp_path/modules/gles31/functional/es31fAdvancedBlendTests.cpp",
>+  "$_deqp_path/modules/gles31/functional/es31fAdvancedBlendTests.hpp",
>+  "$_deqp_path/modules/gles31/functional/es31fAndroidExtensionPackES31ATests.cpp",
>+  "$_deqp_path/modules/gles31/functional/es31fAndroidExtensionPackES31ATests.hpp",
>+  "$_deqp_path/modules/gles31/functional/es31fAtomicCounterTests.cpp",
>+  "$_deqp_path/modules/gles31/functional/es31fAtomicCounterTests.hpp",
>+  "$_deqp_path/modules/gles31/functional/es31fBasicComputeShaderTests.cpp",
>+  "$_deqp_path/modules/gles31/functional/es31fBasicComputeShaderTests.hpp",
>+  "$_deqp_path/modules/gles31/functional/es31fBooleanStateQueryTests.cpp",
>+  "$_deqp_path/modules/gles31/functional/es31fBooleanStateQueryTests.hpp",
>+  "$_deqp_path/modules/gles31/functional/es31fBuiltinPrecisionTests.cpp",
>+  "$_deqp_path/modules/gles31/functional/es31fBuiltinPrecisionTests.hpp",
>+  "$_deqp_path/modules/gles31/functional/es31fComputeShaderBuiltinVarTests.cpp",
>+  "$_deqp_path/modules/gles31/functional/es31fComputeShaderBuiltinVarTests.hpp",
>+  "$_deqp_path/modules/gles31/functional/es31fCopyImageTests.cpp",
>+  "$_deqp_path/modules/gles31/functional/es31fCopyImageTests.hpp",
>+  "$_deqp_path/modules/gles31/functional/es31fDebugTests.cpp",
>+  "$_deqp_path/modules/gles31/functional/es31fDebugTests.hpp",
>+  "$_deqp_path/modules/gles31/functional/es31fDefaultVertexArrayObjectTests.cpp",
>+  "$_deqp_path/modules/gles31/functional/es31fDefaultVertexArrayObjectTests.hpp",
>+  "$_deqp_path/modules/gles31/functional/es31fDrawBuffersIndexedTests.cpp",
>+  "$_deqp_path/modules/gles31/functional/es31fDrawBuffersIndexedTests.hpp",
>+  "$_deqp_path/modules/gles31/functional/es31fDrawElementsBaseVertexTests.cpp",
>+  "$_deqp_path/modules/gles31/functional/es31fDrawElementsBaseVertexTests.hpp",
>+  "$_deqp_path/modules/gles31/functional/es31fDrawTests.cpp",
>+  "$_deqp_path/modules/gles31/functional/es31fDrawTests.hpp",
>+  "$_deqp_path/modules/gles31/functional/es31fFboColorbufferTests.cpp",
>+  "$_deqp_path/modules/gles31/functional/es31fFboColorbufferTests.hpp",
>+  "$_deqp_path/modules/gles31/functional/es31fFboNoAttachmentTests.cpp",
>+  "$_deqp_path/modules/gles31/functional/es31fFboNoAttachmentTests.hpp",
>+  "$_deqp_path/modules/gles31/functional/es31fFboSRGBWriteControlTests.cpp",
>+  "$_deqp_path/modules/gles31/functional/es31fFboSRGBWriteControlTests.hpp",
>+  "$_deqp_path/modules/gles31/functional/es31fFboTestCase.cpp",
>+  "$_deqp_path/modules/gles31/functional/es31fFboTestCase.hpp",
>+  "$_deqp_path/modules/gles31/functional/es31fFboTestUtil.cpp",
>+  "$_deqp_path/modules/gles31/functional/es31fFboTestUtil.hpp",
>+  "$_deqp_path/modules/gles31/functional/es31fFramebufferDefaultStateQueryTests.cpp",
>+  "$_deqp_path/modules/gles31/functional/es31fFramebufferDefaultStateQueryTests.hpp",
>+  "$_deqp_path/modules/gles31/functional/es31fFunctionalTests.cpp",
>+  "$_deqp_path/modules/gles31/functional/es31fFunctionalTests.hpp",
>+  "$_deqp_path/modules/gles31/functional/es31fGeometryShaderTests.cpp",
>+  "$_deqp_path/modules/gles31/functional/es31fGeometryShaderTests.hpp",
>+  "$_deqp_path/modules/gles31/functional/es31fIndexedStateQueryTests.cpp",
>+  "$_deqp_path/modules/gles31/functional/es31fIndexedStateQueryTests.hpp",
>+  "$_deqp_path/modules/gles31/functional/es31fIndirectComputeDispatchTests.cpp",
>+  "$_deqp_path/modules/gles31/functional/es31fIndirectComputeDispatchTests.hpp",
>+  "$_deqp_path/modules/gles31/functional/es31fInfoLogQueryShared.cpp",
>+  "$_deqp_path/modules/gles31/functional/es31fInfoLogQueryShared.hpp",
>+  "$_deqp_path/modules/gles31/functional/es31fIntegerStateQueryTests.cpp",
>+  "$_deqp_path/modules/gles31/functional/es31fIntegerStateQueryTests.hpp",
>+  "$_deqp_path/modules/gles31/functional/es31fInternalFormatQueryTests.cpp",
>+  "$_deqp_path/modules/gles31/functional/es31fInternalFormatQueryTests.hpp",
>+  "$_deqp_path/modules/gles31/functional/es31fLayoutBindingTests.cpp",
>+  "$_deqp_path/modules/gles31/functional/es31fLayoutBindingTests.hpp",
>+  "$_deqp_path/modules/gles31/functional/es31fMultisampleShaderRenderCase.cpp",
>+  "$_deqp_path/modules/gles31/functional/es31fMultisampleShaderRenderCase.hpp",
>+  "$_deqp_path/modules/gles31/functional/es31fMultisampleTests.cpp",
>+  "$_deqp_path/modules/gles31/functional/es31fMultisampleTests.hpp",
>+  "$_deqp_path/modules/gles31/functional/es31fNegativeAdvancedBlendEquationTests.cpp",
>+  "$_deqp_path/modules/gles31/functional/es31fNegativeAdvancedBlendEquationTests.hpp",
>+  "$_deqp_path/modules/gles31/functional/es31fNegativeAtomicCounterTests.cpp",
>+  "$_deqp_path/modules/gles31/functional/es31fNegativeAtomicCounterTests.hpp",
>+  "$_deqp_path/modules/gles31/functional/es31fNegativeBufferApiTests.cpp",
>+  "$_deqp_path/modules/gles31/functional/es31fNegativeBufferApiTests.hpp",
>+  "$_deqp_path/modules/gles31/functional/es31fNegativeComputeTests.cpp",
>+  "$_deqp_path/modules/gles31/functional/es31fNegativeComputeTests.hpp",
>+  "$_deqp_path/modules/gles31/functional/es31fNegativeFragmentApiTests.cpp",
>+  "$_deqp_path/modules/gles31/functional/es31fNegativeFragmentApiTests.hpp",
>+  "$_deqp_path/modules/gles31/functional/es31fNegativePreciseTests.cpp",
>+  "$_deqp_path/modules/gles31/functional/es31fNegativePreciseTests.hpp",
>+  "$_deqp_path/modules/gles31/functional/es31fNegativeSampleVariablesTests.cpp",
>+  "$_deqp_path/modules/gles31/functional/es31fNegativeSampleVariablesTests.hpp",
>+  "$_deqp_path/modules/gles31/functional/es31fNegativeShaderApiTests.cpp",
>+  "$_deqp_path/modules/gles31/functional/es31fNegativeShaderApiTests.hpp",
>+  "$_deqp_path/modules/gles31/functional/es31fNegativeShaderDirectiveTests.cpp",
>+  "$_deqp_path/modules/gles31/functional/es31fNegativeShaderDirectiveTests.hpp",
>+  "$_deqp_path/modules/gles31/functional/es31fNegativeShaderFramebufferFetchTests.cpp",
>+  "$_deqp_path/modules/gles31/functional/es31fNegativeShaderFramebufferFetchTests.hpp",
>+  "$_deqp_path/modules/gles31/functional/es31fNegativeShaderFunctionTests.cpp",
>+  "$_deqp_path/modules/gles31/functional/es31fNegativeShaderFunctionTests.hpp",
>+  "$_deqp_path/modules/gles31/functional/es31fNegativeShaderImageLoadStoreTests.cpp",
>+  "$_deqp_path/modules/gles31/functional/es31fNegativeShaderImageLoadStoreTests.hpp",
>+  "$_deqp_path/modules/gles31/functional/es31fNegativeShaderStorageTests.cpp",
>+  "$_deqp_path/modules/gles31/functional/es31fNegativeShaderStorageTests.hpp",
>+  "$_deqp_path/modules/gles31/functional/es31fNegativeSSBOBlockTests.cpp",
>+  "$_deqp_path/modules/gles31/functional/es31fNegativeSSBOBlockTests.hpp",
>+  "$_deqp_path/modules/gles31/functional/es31fNegativeStateApiTests.cpp",
>+  "$_deqp_path/modules/gles31/functional/es31fNegativeStateApiTests.hpp",
>+  "$_deqp_path/modules/gles31/functional/es31fNegativeTestShared.cpp",
>+  "$_deqp_path/modules/gles31/functional/es31fNegativeTestShared.hpp",
>+  "$_deqp_path/modules/gles31/functional/es31fNegativeTessellationTests.cpp",
>+  "$_deqp_path/modules/gles31/functional/es31fNegativeTessellationTests.hpp",
>+  "$_deqp_path/modules/gles31/functional/es31fNegativeTextureApiTests.cpp",
>+  "$_deqp_path/modules/gles31/functional/es31fNegativeTextureApiTests.hpp",
>+  "$_deqp_path/modules/gles31/functional/es31fNegativeVertexArrayApiTests.cpp",
>+  "$_deqp_path/modules/gles31/functional/es31fNegativeVertexArrayApiTests.hpp",
>+  "$_deqp_path/modules/gles31/functional/es31fOpaqueTypeIndexingTests.cpp",
>+  "$_deqp_path/modules/gles31/functional/es31fOpaqueTypeIndexingTests.hpp",
>+  "$_deqp_path/modules/gles31/functional/es31fPrimitiveBoundingBoxTests.cpp",
>+  "$_deqp_path/modules/gles31/functional/es31fPrimitiveBoundingBoxTests.hpp",
>+  "$_deqp_path/modules/gles31/functional/es31fProgramInterfaceDefinition.cpp",
>+  "$_deqp_path/modules/gles31/functional/es31fProgramInterfaceDefinition.hpp",
>+  "$_deqp_path/modules/gles31/functional/es31fProgramInterfaceDefinitionUtil.cpp",
>+  "$_deqp_path/modules/gles31/functional/es31fProgramInterfaceDefinitionUtil.hpp",
>+  "$_deqp_path/modules/gles31/functional/es31fProgramInterfaceQueryTestCase.cpp",
>+  "$_deqp_path/modules/gles31/functional/es31fProgramInterfaceQueryTestCase.hpp",
>+  "$_deqp_path/modules/gles31/functional/es31fProgramInterfaceQueryTests.cpp",
>+  "$_deqp_path/modules/gles31/functional/es31fProgramInterfaceQueryTests.hpp",
>+  "$_deqp_path/modules/gles31/functional/es31fProgramPipelineStateQueryTests.cpp",
>+  "$_deqp_path/modules/gles31/functional/es31fProgramPipelineStateQueryTests.hpp",
>+  "$_deqp_path/modules/gles31/functional/es31fProgramStateQueryTests.cpp",
>+  "$_deqp_path/modules/gles31/functional/es31fProgramStateQueryTests.hpp",
>+  "$_deqp_path/modules/gles31/functional/es31fProgramUniformTests.cpp",
>+  "$_deqp_path/modules/gles31/functional/es31fProgramUniformTests.hpp",
>+  "$_deqp_path/modules/gles31/functional/es31fSRGBDecodeTests.cpp",
>+  "$_deqp_path/modules/gles31/functional/es31fSRGBDecodeTests.hpp",
>+  "$_deqp_path/modules/gles31/functional/es31fSSBOArrayLengthTests.cpp",
>+  "$_deqp_path/modules/gles31/functional/es31fSSBOArrayLengthTests.hpp",
>+  "$_deqp_path/modules/gles31/functional/es31fSSBOLayoutCase.cpp",
>+  "$_deqp_path/modules/gles31/functional/es31fSSBOLayoutCase.hpp",
>+  "$_deqp_path/modules/gles31/functional/es31fSSBOLayoutTests.cpp",
>+  "$_deqp_path/modules/gles31/functional/es31fSSBOLayoutTests.hpp",
>+  "$_deqp_path/modules/gles31/functional/es31fSampleShadingTests.cpp",
>+  "$_deqp_path/modules/gles31/functional/es31fSampleShadingTests.hpp",
>+  "$_deqp_path/modules/gles31/functional/es31fSampleVariableTests.cpp",
>+  "$_deqp_path/modules/gles31/functional/es31fSampleVariableTests.hpp",
>+  "$_deqp_path/modules/gles31/functional/es31fSamplerStateQueryTests.cpp",
>+  "$_deqp_path/modules/gles31/functional/es31fSamplerStateQueryTests.hpp",
>+  "$_deqp_path/modules/gles31/functional/es31fSeparateShaderTests.cpp",
>+  "$_deqp_path/modules/gles31/functional/es31fSeparateShaderTests.hpp",
>+  "$_deqp_path/modules/gles31/functional/es31fShaderAtomicOpTests.cpp",
>+  "$_deqp_path/modules/gles31/functional/es31fShaderAtomicOpTests.hpp",
>+  "$_deqp_path/modules/gles31/functional/es31fShaderBuiltinConstantTests.cpp",
>+  "$_deqp_path/modules/gles31/functional/es31fShaderBuiltinConstantTests.hpp",
>+  "$_deqp_path/modules/gles31/functional/es31fShaderCommonFunctionTests.cpp",
>+  "$_deqp_path/modules/gles31/functional/es31fShaderCommonFunctionTests.hpp",
>+  "$_deqp_path/modules/gles31/functional/es31fShaderFramebufferFetchTests.cpp",
>+  "$_deqp_path/modules/gles31/functional/es31fShaderFramebufferFetchTests.hpp",
>+  "$_deqp_path/modules/gles31/functional/es31fShaderHelperInvocationTests.cpp",
>+  "$_deqp_path/modules/gles31/functional/es31fShaderHelperInvocationTests.hpp",
>+  "$_deqp_path/modules/gles31/functional/es31fShaderImageLoadStoreTests.cpp",
>+  "$_deqp_path/modules/gles31/functional/es31fShaderImageLoadStoreTests.hpp",
>+  "$_deqp_path/modules/gles31/functional/es31fShaderIntegerFunctionTests.cpp",
>+  "$_deqp_path/modules/gles31/functional/es31fShaderIntegerFunctionTests.hpp",
>+  "$_deqp_path/modules/gles31/functional/es31fShaderMultisampleInterpolationStateQueryTests.cpp",
>+  "$_deqp_path/modules/gles31/functional/es31fShaderMultisampleInterpolationStateQueryTests.hpp",
>+  "$_deqp_path/modules/gles31/functional/es31fShaderMultisampleInterpolationTests.cpp",
>+  "$_deqp_path/modules/gles31/functional/es31fShaderMultisampleInterpolationTests.hpp",
>+  "$_deqp_path/modules/gles31/functional/es31fShaderPackingFunctionTests.cpp",
>+  "$_deqp_path/modules/gles31/functional/es31fShaderPackingFunctionTests.hpp",
>+  "$_deqp_path/modules/gles31/functional/es31fShaderSharedVarTests.cpp",
>+  "$_deqp_path/modules/gles31/functional/es31fShaderSharedVarTests.hpp",
>+  "$_deqp_path/modules/gles31/functional/es31fShaderStateQueryTests.cpp",
>+  "$_deqp_path/modules/gles31/functional/es31fShaderStateQueryTests.hpp",
>+  "$_deqp_path/modules/gles31/functional/es31fShaderTextureSizeTests.cpp",
>+  "$_deqp_path/modules/gles31/functional/es31fShaderTextureSizeTests.hpp",
>+  "$_deqp_path/modules/gles31/functional/es31fShaderUniformIntegerFunctionTests.cpp",
>+  "$_deqp_path/modules/gles31/functional/es31fShaderUniformIntegerFunctionTests.hpp",
>+  "$_deqp_path/modules/gles31/functional/es31fStencilTexturingTests.cpp",
>+  "$_deqp_path/modules/gles31/functional/es31fStencilTexturingTests.hpp",
>+  "$_deqp_path/modules/gles31/functional/es31fSynchronizationTests.cpp",
>+  "$_deqp_path/modules/gles31/functional/es31fSynchronizationTests.hpp",
>+  "$_deqp_path/modules/gles31/functional/es31fTessellationGeometryInteractionTests.cpp",
>+  "$_deqp_path/modules/gles31/functional/es31fTessellationGeometryInteractionTests.hpp",
>+  "$_deqp_path/modules/gles31/functional/es31fTessellationTests.cpp",
>+  "$_deqp_path/modules/gles31/functional/es31fTessellationTests.hpp",
>+  "$_deqp_path/modules/gles31/functional/es31fTextureBorderClampTests.cpp",
>+  "$_deqp_path/modules/gles31/functional/es31fTextureBorderClampTests.hpp",
>+  "$_deqp_path/modules/gles31/functional/es31fTextureBufferTests.cpp",
>+  "$_deqp_path/modules/gles31/functional/es31fTextureBufferTests.hpp",
>+  "$_deqp_path/modules/gles31/functional/es31fTextureFilteringTests.cpp",
>+  "$_deqp_path/modules/gles31/functional/es31fTextureFilteringTests.hpp",
>+  "$_deqp_path/modules/gles31/functional/es31fTextureFormatTests.cpp",
>+  "$_deqp_path/modules/gles31/functional/es31fTextureFormatTests.hpp",
>+  "$_deqp_path/modules/gles31/functional/es31fTextureGatherTests.cpp",
>+  "$_deqp_path/modules/gles31/functional/es31fTextureGatherTests.hpp",
>+  "$_deqp_path/modules/gles31/functional/es31fTextureLevelStateQueryTests.cpp",
>+  "$_deqp_path/modules/gles31/functional/es31fTextureLevelStateQueryTests.hpp",
>+  "$_deqp_path/modules/gles31/functional/es31fTextureMultisampleTests.cpp",
>+  "$_deqp_path/modules/gles31/functional/es31fTextureMultisampleTests.hpp",
>+  "$_deqp_path/modules/gles31/functional/es31fTextureSpecificationTests.cpp",
>+  "$_deqp_path/modules/gles31/functional/es31fTextureSpecificationTests.hpp",
>+  "$_deqp_path/modules/gles31/functional/es31fTextureStateQueryTests.cpp",
>+  "$_deqp_path/modules/gles31/functional/es31fTextureStateQueryTests.hpp",
>+  "$_deqp_path/modules/gles31/functional/es31fUniformBlockTests.cpp",
>+  "$_deqp_path/modules/gles31/functional/es31fUniformBlockTests.hpp",
>+  "$_deqp_path/modules/gles31/functional/es31fUniformLocationTests.cpp",
>+  "$_deqp_path/modules/gles31/functional/es31fUniformLocationTests.hpp",
>+  "$_deqp_path/modules/gles31/functional/es31fVertexAttributeBindingStateQueryTests.cpp",
>+  "$_deqp_path/modules/gles31/functional/es31fVertexAttributeBindingStateQueryTests.hpp",
>+  "$_deqp_path/modules/gles31/functional/es31fVertexAttributeBindingTests.cpp",
>+  "$_deqp_path/modules/gles31/functional/es31fVertexAttributeBindingTests.hpp",
>+  "$_deqp_path/modules/gles31/stress/es31sDrawTests.cpp",
>+  "$_deqp_path/modules/gles31/stress/es31sDrawTests.hpp",
>+  "$_deqp_path/modules/gles31/stress/es31sStressTests.cpp",
>+  "$_deqp_path/modules/gles31/stress/es31sStressTests.hpp",
>+  "$_deqp_path/modules/gles31/stress/es31sTessellationGeometryInteractionTests.cpp",
>+  "$_deqp_path/modules/gles31/stress/es31sTessellationGeometryInteractionTests.hpp",
>+  "$_deqp_path/modules/gles31/stress/es31sVertexAttributeBindingTests.cpp",
>+  "$_deqp_path/modules/gles31/stress/es31sVertexAttributeBindingTests.hpp",
>+  "$_deqp_path/modules/gles31/tes31Context.cpp",
>+  "$_deqp_path/modules/gles31/tes31Context.hpp",
>+  "$_deqp_path/modules/gles31/tes31InfoTests.cpp",
>+  "$_deqp_path/modules/gles31/tes31InfoTests.hpp",
>+  "$_deqp_path/modules/gles31/tes31TestCase.cpp",
>+  "$_deqp_path/modules/gles31/tes31TestCase.hpp",
>+  "$_deqp_path/modules/gles31/tes31TestPackage.cpp",
>+  "$_deqp_path/modules/gles31/tes31TestPackage.hpp",
>+  "$_deqp_path/modules/gles31/tes31TestPackageEntry.cpp",
>+]
>+deqp_egl_sources = [
>+  "$_deqp_path/modules/egl/teglAndroidUtil.cpp",
>+  "$_deqp_path/modules/egl/teglAndroidUtil.hpp",
>+  "$_deqp_path/modules/egl/teglApiCase.cpp",
>+  "$_deqp_path/modules/egl/teglApiCase.hpp",
>+  "$_deqp_path/modules/egl/teglBufferAgeTests.cpp",
>+  "$_deqp_path/modules/egl/teglBufferAgeTests.hpp",
>+  "$_deqp_path/modules/egl/teglChooseConfigReference.cpp",
>+  "$_deqp_path/modules/egl/teglChooseConfigReference.hpp",
>+  "$_deqp_path/modules/egl/teglChooseConfigTests.cpp",
>+  "$_deqp_path/modules/egl/teglChooseConfigTests.hpp",
>+  "$_deqp_path/modules/egl/teglClientExtensionTests.cpp",
>+  "$_deqp_path/modules/egl/teglClientExtensionTests.hpp",
>+  "$_deqp_path/modules/egl/teglColorClearCase.cpp",
>+  "$_deqp_path/modules/egl/teglColorClearCase.hpp",
>+  "$_deqp_path/modules/egl/teglColorClearTests.cpp",
>+  "$_deqp_path/modules/egl/teglColorClearTests.hpp",
>+  "$_deqp_path/modules/egl/teglConfigList.cpp",
>+  "$_deqp_path/modules/egl/teglConfigList.hpp",
>+  "$_deqp_path/modules/egl/teglCreateContextExtTests.cpp",
>+  "$_deqp_path/modules/egl/teglCreateContextExtTests.hpp",
>+  "$_deqp_path/modules/egl/teglCreateContextTests.cpp",
>+  "$_deqp_path/modules/egl/teglCreateContextTests.hpp",
>+  "$_deqp_path/modules/egl/teglCreateSurfaceTests.cpp",
>+  "$_deqp_path/modules/egl/teglCreateSurfaceTests.hpp",
>+  "$_deqp_path/modules/egl/teglGetFrameTimestampsTests.cpp",
>+  "$_deqp_path/modules/egl/teglGetFrameTimestampsTests.hpp",
>+  "$_deqp_path/modules/egl/teglGetProcAddressTests.cpp",
>+  "$_deqp_path/modules/egl/teglGetProcAddressTests.hpp",
>+  "$_deqp_path/modules/egl/teglGLES1RenderUtil.cpp",
>+  "$_deqp_path/modules/egl/teglGLES1RenderUtil.hpp",
>+  "$_deqp_path/modules/egl/teglGLES2RenderUtil.cpp",
>+  "$_deqp_path/modules/egl/teglGLES2RenderUtil.hpp",
>+  "$_deqp_path/modules/egl/teglGLES2SharedRenderingPerfTests.cpp",
>+  "$_deqp_path/modules/egl/teglGLES2SharedRenderingPerfTests.hpp",
>+  "$_deqp_path/modules/egl/teglGLES2SharingTests.cpp",
>+  "$_deqp_path/modules/egl/teglGLES2SharingTests.hpp",
>+  "$_deqp_path/modules/egl/teglGLES2SharingThreadedTests.cpp",
>+  "$_deqp_path/modules/egl/teglGLES2SharingThreadedTests.hpp",
>+  "$_deqp_path/modules/egl/teglImageFormatTests.cpp",
>+  "$_deqp_path/modules/egl/teglImageFormatTests.hpp",
>+  "$_deqp_path/modules/egl/teglImageTests.cpp",
>+  "$_deqp_path/modules/egl/teglImageTests.hpp",
>+  "$_deqp_path/modules/egl/teglImageUtil.cpp",
>+  "$_deqp_path/modules/egl/teglImageUtil.hpp",
>+  "$_deqp_path/modules/egl/teglInfoTests.cpp",
>+  "$_deqp_path/modules/egl/teglInfoTests.hpp",
>+  "$_deqp_path/modules/egl/teglMakeCurrentPerfTests.cpp",
>+  "$_deqp_path/modules/egl/teglMakeCurrentPerfTests.hpp",
>+  "$_deqp_path/modules/egl/teglMemoryStressTests.cpp",
>+  "$_deqp_path/modules/egl/teglMemoryStressTests.hpp",
>+  "$_deqp_path/modules/egl/teglMultiContextTests.cpp",
>+  "$_deqp_path/modules/egl/teglMultiContextTests.hpp",
>+  "$_deqp_path/modules/egl/teglMultiThreadTests.cpp",
>+  "$_deqp_path/modules/egl/teglMultiThreadTests.hpp",
>+  "$_deqp_path/modules/egl/teglMutableRenderBufferTests.cpp",
>+  "$_deqp_path/modules/egl/teglMutableRenderBufferTests.hpp",
>+  "$_deqp_path/modules/egl/teglNativeColorMappingTests.cpp",
>+  "$_deqp_path/modules/egl/teglNativeColorMappingTests.hpp",
>+  "$_deqp_path/modules/egl/teglNativeCoordMappingTests.cpp",
>+  "$_deqp_path/modules/egl/teglNativeCoordMappingTests.hpp",
>+  "$_deqp_path/modules/egl/teglNegativeApiTests.cpp",
>+  "$_deqp_path/modules/egl/teglNegativeApiTests.hpp",
>+  "$_deqp_path/modules/egl/teglNegativePartialUpdateTests.cpp",
>+  "$_deqp_path/modules/egl/teglNegativePartialUpdateTests.hpp",
>+  "$_deqp_path/modules/egl/teglPreservingSwapTests.cpp",
>+  "$_deqp_path/modules/egl/teglPreservingSwapTests.hpp",
>+  "$_deqp_path/modules/egl/teglPartialUpdateTests.cpp",
>+  "$_deqp_path/modules/egl/teglPartialUpdateTests.hpp",
>+  "$_deqp_path/modules/egl/teglQueryConfigTests.cpp",
>+  "$_deqp_path/modules/egl/teglQueryConfigTests.hpp",
>+  "$_deqp_path/modules/egl/teglQueryContextTests.cpp",
>+  "$_deqp_path/modules/egl/teglQueryContextTests.hpp",
>+  "$_deqp_path/modules/egl/teglQuerySurfaceTests.cpp",
>+  "$_deqp_path/modules/egl/teglQuerySurfaceTests.hpp",
>+  "$_deqp_path/modules/egl/teglRenderCase.cpp",
>+  "$_deqp_path/modules/egl/teglRenderCase.hpp",
>+  "$_deqp_path/modules/egl/teglRenderTests.cpp",
>+  "$_deqp_path/modules/egl/teglRenderTests.hpp",
>+  "$_deqp_path/modules/egl/teglResizeTests.cpp",
>+  "$_deqp_path/modules/egl/teglResizeTests.hpp",
>+  "$_deqp_path/modules/egl/teglRobustnessTests.cpp",
>+  "$_deqp_path/modules/egl/teglRobustnessTests.hpp",
>+  "$_deqp_path/modules/egl/teglSimpleConfigCase.cpp",
>+  "$_deqp_path/modules/egl/teglSimpleConfigCase.hpp",
>+  "$_deqp_path/modules/egl/teglSurfacelessContextTests.cpp",
>+  "$_deqp_path/modules/egl/teglSurfacelessContextTests.hpp",
>+  "$_deqp_path/modules/egl/teglSwapBuffersTests.cpp",
>+  "$_deqp_path/modules/egl/teglSwapBuffersTests.hpp",
>+  "$_deqp_path/modules/egl/teglSwapBuffersWithDamageTests.cpp",
>+  "$_deqp_path/modules/egl/teglSwapBuffersWithDamageTests.hpp",
>+  "$_deqp_path/modules/egl/teglSyncTests.cpp",
>+  "$_deqp_path/modules/egl/teglSyncTests.hpp",
>+  "$_deqp_path/modules/egl/teglTestCase.cpp",
>+  "$_deqp_path/modules/egl/teglTestCase.hpp",
>+  "$_deqp_path/modules/egl/teglTestPackage.cpp",
>+  "$_deqp_path/modules/egl/teglTestPackage.hpp",
>+  "$_deqp_path/modules/egl/teglTestPackageEntry.cpp",
>+  "$_deqp_path/modules/egl/teglThreadCleanUpTests.cpp",
>+  "$_deqp_path/modules/egl/teglThreadCleanUpTests.hpp",
>+  "$_deqp_path/modules/egl/teglVGRenderUtil.cpp",
>+  "$_deqp_path/modules/egl/teglVGRenderUtil.hpp",
>+  "$_deqp_path/modules/egl/teglWideColorTests.cpp",
>+  "$_deqp_path/modules/egl/teglWideColorTests.hpp",
>+]
>+deqp_libtester_decpp_sources = [
>+  "$_deqp_path/framework/delibs/decpp/deArrayBuffer.cpp",
>+  "$_deqp_path/framework/delibs/decpp/deBlockBuffer.cpp",
>+  "$_deqp_path/framework/delibs/decpp/deCommandLine.cpp",
>+  "$_deqp_path/framework/delibs/decpp/deDefs.cpp",
>+  "$_deqp_path/framework/delibs/decpp/deDirectoryIterator.cpp",
>+  "$_deqp_path/framework/delibs/decpp/deDynamicLibrary.cpp",
>+  "$_deqp_path/framework/delibs/decpp/deFilePath.cpp",
>+  "$_deqp_path/framework/delibs/decpp/deMemPool.cpp",
>+  "$_deqp_path/framework/delibs/decpp/deMutex.cpp",
>+  "$_deqp_path/framework/delibs/decpp/dePoolArray.cpp",
>+  "$_deqp_path/framework/delibs/decpp/dePoolString.cpp",
>+  "$_deqp_path/framework/delibs/decpp/deProcess.cpp",
>+  "$_deqp_path/framework/delibs/decpp/deRandom.cpp",
>+  "$_deqp_path/framework/delibs/decpp/deRingBuffer.cpp",
>+  "$_deqp_path/framework/delibs/decpp/deSemaphore.cpp",
>+  "$_deqp_path/framework/delibs/decpp/deSharedPtr.cpp",
>+  "$_deqp_path/framework/delibs/decpp/deSha1.cpp",
>+  "$_deqp_path/framework/delibs/decpp/deSocket.cpp",
>+  "$_deqp_path/framework/delibs/decpp/deSTLUtil.cpp",
>+  "$_deqp_path/framework/delibs/decpp/deStringUtil.cpp",
>+  "$_deqp_path/framework/delibs/decpp/deThread.cpp",
>+  "$_deqp_path/framework/delibs/decpp/deThreadLocal.cpp",
>+  "$_deqp_path/framework/delibs/decpp/deThreadSafeRingBuffer.cpp",
>+  "$_deqp_path/framework/delibs/decpp/deUniquePtr.cpp",
>+]
>+deqp_libtester_sources = [
>+  "$_deqp_path/execserver/xsDefs.cpp",
>+  "$_deqp_path/execserver/xsExecutionServer.cpp",
>+  "$_deqp_path/execserver/xsPosixFileReader.cpp",
>+  "$_deqp_path/execserver/xsPosixTestProcess.cpp",
>+  "$_deqp_path/execserver/xsProtocol.cpp",
>+  "$_deqp_path/execserver/xsTcpServer.cpp",
>+  "$_deqp_path/execserver/xsTestDriver.cpp",
>+  "$_deqp_path/execserver/xsTestProcess.cpp",
>+  "$_deqp_path/executor/xeBatchExecutor.cpp",
>+  "$_deqp_path/executor/xeBatchResult.cpp",
>+  "$_deqp_path/executor/xeCallQueue.cpp",
>+  "$_deqp_path/executor/xeCommLink.cpp",
>+  "$_deqp_path/executor/xeContainerFormatParser.cpp",
>+  "$_deqp_path/executor/xeDefs.cpp",
>+  "$_deqp_path/executor/xeLocalTcpIpLink.cpp",
>+  "$_deqp_path/executor/xeTcpIpLink.cpp",
>+  "$_deqp_path/executor/xeTestCase.cpp",
>+  "$_deqp_path/executor/xeTestCaseListParser.cpp",
>+  "$_deqp_path/executor/xeTestCaseResult.cpp",
>+  "$_deqp_path/executor/xeTestLogParser.cpp",
>+  "$_deqp_path/executor/xeTestLogWriter.cpp",
>+  "$_deqp_path/executor/xeTestResultParser.cpp",
>+  "$_deqp_path/executor/xeXMLParser.cpp",
>+  "$_deqp_path/executor/xeXMLWriter.cpp",
>+  "$_deqp_path/framework/common/tcuApp.cpp",
>+  "$_deqp_path/framework/common/tcuAstcUtil.cpp",
>+  "$_deqp_path/framework/common/tcuBilinearImageCompare.cpp",
>+  "$_deqp_path/framework/common/tcuCommandLine.cpp",
>+  "$_deqp_path/framework/common/tcuCompressedTexture.cpp",
>+  "$_deqp_path/framework/common/tcuCPUWarmup.cpp",
>+  "$_deqp_path/framework/common/tcuDefs.cpp",
>+  "$_deqp_path/framework/common/tcuEither.cpp",
>+  "$_deqp_path/framework/common/tcuFactoryRegistry.cpp",
>+  "$_deqp_path/framework/common/tcuFloatFormat.cpp",
>+  "$_deqp_path/framework/common/tcuFunctionLibrary.cpp",
>+  "$_deqp_path/framework/common/tcuFuzzyImageCompare.cpp",
>+  "$_deqp_path/framework/common/tcuImageCompare.cpp",
>+  "$_deqp_path/framework/common/tcuImageIO.cpp",
>+  "$_deqp_path/framework/common/tcuInterval.cpp",
>+  "$_deqp_path/framework/common/tcuPlatform.cpp",
>+  "$_deqp_path/framework/common/tcuRandomValueIterator.cpp",
>+  "$_deqp_path/framework/common/tcuRasterizationVerifier.cpp",
>+  "$_deqp_path/framework/common/tcuRasterizationVerifier.hpp",
>+  "$_deqp_path/framework/common/tcuRenderTarget.cpp",
>+  "$_deqp_path/framework/common/tcuResource.cpp",
>+  "$_deqp_path/framework/common/tcuResultCollector.cpp",
>+  "$_deqp_path/framework/common/tcuRGBA.cpp",
>+  "$_deqp_path/framework/common/tcuStringTemplate.cpp",
>+  "$_deqp_path/framework/common/tcuSurface.cpp",
>+  "$_deqp_path/framework/common/tcuSurfaceAccess.cpp",
>+  "$_deqp_path/framework/common/tcuSurfaceAccess.hpp",
>+  "$_deqp_path/framework/common/tcuTestCase.cpp",
>+  "$_deqp_path/framework/common/tcuTestContext.cpp",
>+  "$_deqp_path/framework/common/tcuTestHierarchyIterator.cpp",
>+  "$_deqp_path/framework/common/tcuTestHierarchyUtil.cpp",
>+  "$_deqp_path/framework/common/tcuTestLog.cpp",
>+  "$_deqp_path/framework/common/tcuTestPackage.cpp",
>+  "$_deqp_path/framework/common/tcuTestSessionExecutor.cpp",
>+  "$_deqp_path/framework/common/tcuTexCompareVerifier.cpp",
>+  "$_deqp_path/framework/common/tcuTexLookupVerifier.cpp",
>+  "$_deqp_path/framework/common/tcuTexture.cpp",
>+  "$_deqp_path/framework/common/tcuTextureUtil.cpp",
>+  "$_deqp_path/framework/common/tcuTexVerifierUtil.cpp",
>+  "$_deqp_path/framework/common/tcuThreadUtil.cpp",
>+  "$_deqp_path/framework/common/tcuSeedBuilder.cpp",
>+  "$_deqp_path/framework/delibs/debase/deDefs.c",
>+  "$_deqp_path/framework/delibs/debase/deFloat16.c",
>+  "$_deqp_path/framework/delibs/debase/deInt32.c",
>+  "$_deqp_path/framework/delibs/debase/deInt32Test.c",
>+  "$_deqp_path/framework/delibs/debase/deMath.c",
>+  "$_deqp_path/framework/delibs/debase/deMemory.c",
>+  "$_deqp_path/framework/delibs/debase/deRandom.c",
>+  "$_deqp_path/framework/delibs/debase/deString.c",
>+  "$_deqp_path/framework/delibs/debase/deSha1.c",
>+  "$_deqp_path/framework/delibs/deimage/deImage.c",
>+  "$_deqp_path/framework/delibs/deimage/deTarga.c",
>+  "$_deqp_path/framework/delibs/depool/deMemPool.c",
>+  "$_deqp_path/framework/delibs/depool/dePoolArray.c",
>+  "$_deqp_path/framework/delibs/depool/dePoolHashArray.c",
>+  "$_deqp_path/framework/delibs/depool/dePoolHash.c",
>+  "$_deqp_path/framework/delibs/depool/dePoolHashSet.c",
>+  "$_deqp_path/framework/delibs/depool/dePoolHeap.c",
>+  "$_deqp_path/framework/delibs/depool/dePoolMultiSet.c",
>+  "$_deqp_path/framework/delibs/depool/dePoolSet.c",
>+  "$_deqp_path/framework/delibs/depool/dePoolStringBuilder.c",
>+  "$_deqp_path/framework/delibs/depool/dePoolTest.c",
>+  "$_deqp_path/framework/delibs/destream/deFileStream.c",
>+  "$_deqp_path/framework/delibs/destream/deRingbuffer.c",
>+  "$_deqp_path/framework/delibs/destream/deStreamCpyThread.c",
>+  "$_deqp_path/framework/delibs/destream/deThreadStream.c",
>+  "$_deqp_path/framework/delibs/dethread/deAtomic.c",
>+  "$_deqp_path/framework/delibs/dethread/deSingleton.c",
>+  "$_deqp_path/framework/delibs/dethread/deThreadTest.c",
>+  "$_deqp_path/framework/delibs/deutil/deClock.c",
>+  "$_deqp_path/framework/delibs/deutil/deCommandLine.c",
>+  "$_deqp_path/framework/delibs/deutil/deDynamicLibrary.c",
>+  "$_deqp_path/framework/delibs/deutil/deFile.c",
>+  "$_deqp_path/framework/delibs/deutil/deProcess.c",
>+  "$_deqp_path/framework/delibs/deutil/deSocket.c",
>+  "$_deqp_path/framework/delibs/deutil/deTimer.c",
>+  "$_deqp_path/framework/delibs/deutil/deTimerTest.c",
>+  "$_deqp_path/framework/egl/egluCallLogWrapper.cpp",
>+  "$_deqp_path/framework/egl/egluConfigFilter.cpp",
>+  "$_deqp_path/framework/egl/egluConfigInfo.cpp",
>+  "$_deqp_path/framework/egl/egluDefs.cpp",
>+  "$_deqp_path/framework/egl/egluGLContextFactory.cpp",
>+  "$_deqp_path/framework/egl/egluGLFunctionLoader.cpp",
>+  "$_deqp_path/framework/egl/egluGLUtil.cpp",
>+
>+  # TODO(jmadill): Remove override when upstreamed. http://anglebug.com/2564
>+  #"$_deqp_path/framework/egl/egluNativeDisplay.cpp",
>+  "deqp_support/egluNativeDisplay_override.cpp",
>+  "deqp_support/egluNativeDisplay_override.hpp",
>+  "$_deqp_path/framework/egl/egluNativePixmap.cpp",
>+  "$_deqp_path/framework/egl/egluNativeWindow.cpp",
>+  "$_deqp_path/framework/egl/egluPlatform.cpp",
>+  "$_deqp_path/framework/egl/egluStaticESLibrary.cpp",
>+  "$_deqp_path/framework/egl/egluStrUtil.cpp",
>+  "$_deqp_path/framework/egl/egluUnique.cpp",
>+
>+  # TODO(jmadill): Remove override when upstreamed. http://anglebug.com/2564
>+  #"$_deqp_path/framework/egl/egluUtil.cpp",
>+  "deqp_support/egluUtil_override.cpp",
>+  "$_deqp_path/framework/egl/wrapper/eglwDefs.cpp",
>+  "$_deqp_path/framework/egl/wrapper/eglwFunctions.cpp",
>+  "$_deqp_path/framework/egl/wrapper/eglwLibrary.cpp",
>+  "$_deqp_path/framework/opengl/gluCallLogWrapper.cpp",
>+  "$_deqp_path/framework/opengl/gluContextFactory.cpp",
>+  "$_deqp_path/framework/opengl/gluContextInfo.cpp",
>+  "$_deqp_path/framework/opengl/gluDefs.cpp",
>+  "$_deqp_path/framework/opengl/gluDrawUtil.cpp",
>+  "$_deqp_path/framework/opengl/gluDummyRenderContext.cpp",
>+  "$_deqp_path/framework/opengl/gluFboRenderContext.cpp",
>+  "$_deqp_path/framework/opengl/gluObjectWrapper.cpp",
>+  "$_deqp_path/framework/opengl/gluPixelTransfer.cpp",
>+  "$_deqp_path/framework/opengl/gluPlatform.cpp",
>+  "$_deqp_path/framework/opengl/gluProgramInterfaceQuery.cpp",
>+  "$_deqp_path/framework/opengl/gluRenderConfig.cpp",
>+  "$_deqp_path/framework/opengl/gluRenderContext.cpp",
>+  "$_deqp_path/framework/opengl/gluShaderLibrary.cpp",
>+  "$_deqp_path/framework/opengl/gluShaderProgram.cpp",
>+  "$_deqp_path/framework/opengl/gluShaderUtil.cpp",
>+  "$_deqp_path/framework/opengl/gluStateReset.cpp",
>+  "$_deqp_path/framework/opengl/gluStrUtil.cpp",
>+  "$_deqp_path/framework/opengl/gluTexture.cpp",
>+  "$_deqp_path/framework/opengl/gluTextureUtil.cpp",
>+  "$_deqp_path/framework/opengl/gluTextureTestUtil.cpp",
>+  "$_deqp_path/framework/opengl/gluTextureTestUtil.hpp",
>+  "$_deqp_path/framework/opengl/gluVarType.cpp",
>+  "$_deqp_path/framework/opengl/gluVarTypeUtil.cpp",
>+  "$_deqp_path/framework/opengl/simplereference/sglrContext.cpp",
>+  "$_deqp_path/framework/opengl/simplereference/sglrContextUtil.cpp",
>+  "$_deqp_path/framework/opengl/simplereference/sglrContextWrapper.cpp",
>+  "$_deqp_path/framework/opengl/simplereference/sglrGLContext.cpp",
>+  "$_deqp_path/framework/opengl/simplereference/sglrReferenceContext.cpp",
>+  "$_deqp_path/framework/opengl/simplereference/sglrReferenceUtils.cpp",
>+  "$_deqp_path/framework/opengl/simplereference/sglrShaderProgram.cpp",
>+  "$_deqp_path/framework/opengl/wrapper/glwDefs.cpp",
>+  "$_deqp_path/framework/opengl/wrapper/glwFunctions.cpp",
>+  "$_deqp_path/framework/opengl/wrapper/glwInitES20Direct.cpp",
>+  "$_deqp_path/framework/opengl/wrapper/glwInitES30Direct.cpp",
>+  "$_deqp_path/framework/opengl/wrapper/glwInitFunctions.cpp",
>+  "$_deqp_path/framework/opengl/wrapper/glwWrapper.cpp",
>+  "$_deqp_path/framework/platform/null/tcuNullContextFactory.cpp",
>+  "$_deqp_path/framework/platform/null/tcuNullContextFactory.hpp",
>+  "$_deqp_path/framework/platform/null/tcuNullRenderContext.cpp",
>+  "$_deqp_path/framework/qphelper/qpCrashHandler.c",
>+  "$_deqp_path/framework/qphelper/qpDebugOut.c",
>+  "$_deqp_path/framework/qphelper/qpInfo.c",
>+  "$_deqp_path/framework/qphelper/qpTestLog.c",
>+  "$_deqp_path/framework/qphelper/qpWatchDog.c",
>+  "$_deqp_path/framework/qphelper/qpXmlWriter.c",
>+  "$_deqp_path/framework/randomshaders/rsgBinaryOps.cpp",
>+  "$_deqp_path/framework/randomshaders/rsgBuiltinFunctions.cpp",
>+  "$_deqp_path/framework/randomshaders/rsgDefs.cpp",
>+  "$_deqp_path/framework/randomshaders/rsgExecutionContext.cpp",
>+  "$_deqp_path/framework/randomshaders/rsgExpression.cpp",
>+  "$_deqp_path/framework/randomshaders/rsgExpressionGenerator.cpp",
>+  "$_deqp_path/framework/randomshaders/rsgFunctionGenerator.cpp",
>+  "$_deqp_path/framework/randomshaders/rsgGeneratorState.cpp",
>+  "$_deqp_path/framework/randomshaders/rsgNameAllocator.cpp",
>+  "$_deqp_path/framework/randomshaders/rsgParameters.cpp",
>+  "$_deqp_path/framework/randomshaders/rsgPrettyPrinter.cpp",
>+  "$_deqp_path/framework/randomshaders/rsgProgramExecutor.cpp",
>+  "$_deqp_path/framework/randomshaders/rsgProgramGenerator.cpp",
>+  "$_deqp_path/framework/randomshaders/rsgSamplers.cpp",
>+  "$_deqp_path/framework/randomshaders/rsgShader.cpp",
>+  "$_deqp_path/framework/randomshaders/rsgShaderGenerator.cpp",
>+  "$_deqp_path/framework/randomshaders/rsgStatement.cpp",
>+  "$_deqp_path/framework/randomshaders/rsgToken.cpp",
>+  "$_deqp_path/framework/randomshaders/rsgUtils.cpp",
>+  "$_deqp_path/framework/randomshaders/rsgVariable.cpp",
>+  "$_deqp_path/framework/randomshaders/rsgVariableManager.cpp",
>+  "$_deqp_path/framework/randomshaders/rsgVariableType.cpp",
>+  "$_deqp_path/framework/randomshaders/rsgVariableValue.cpp",
>+  "$_deqp_path/framework/referencerenderer/rrDefs.cpp",
>+  "$_deqp_path/framework/referencerenderer/rrFragmentOperations.cpp",
>+  "$_deqp_path/framework/referencerenderer/rrMultisamplePixelBufferAccess.cpp",
>+  "$_deqp_path/framework/referencerenderer/rrPrimitivePacket.cpp",
>+  "$_deqp_path/framework/referencerenderer/rrRasterizer.cpp",
>+  "$_deqp_path/framework/referencerenderer/rrRenderer.cpp",
>+  "$_deqp_path/framework/referencerenderer/rrShaders.cpp",
>+  "$_deqp_path/framework/referencerenderer/rrShadingContext.cpp",
>+  "$_deqp_path/framework/referencerenderer/rrVertexAttrib.cpp",
>+  "$_deqp_path/framework/referencerenderer/rrVertexPacket.cpp",
>+  "$_deqp_path/modules/glshared/glsAttributeLocationTests.cpp",
>+  "$_deqp_path/modules/glshared/glsBufferTestUtil.cpp",
>+  "$_deqp_path/modules/glshared/glsBuiltinPrecisionTests.cpp",
>+  "$_deqp_path/modules/glshared/glsCalibration.cpp",
>+  "$_deqp_path/modules/glshared/glsDrawTest.cpp",
>+  "$_deqp_path/modules/glshared/glsFboCompletenessTests.cpp",
>+  "$_deqp_path/modules/glshared/glsFboUtil.cpp",
>+  "$_deqp_path/modules/glshared/glsFragmentOpUtil.cpp",
>+  "$_deqp_path/modules/glshared/glsFragOpInteractionCase.cpp",
>+  "$_deqp_path/modules/glshared/glsInteractionTestUtil.cpp",
>+  "$_deqp_path/modules/glshared/glsLifetimeTests.cpp",
>+  "$_deqp_path/modules/glshared/glsLongStressCase.cpp",
>+  "$_deqp_path/modules/glshared/glsLongStressTestUtil.cpp",
>+  "$_deqp_path/modules/glshared/glsMemoryStressCase.cpp",
>+  "$_deqp_path/modules/glshared/glsRandomShaderCase.cpp",
>+  "$_deqp_path/modules/glshared/glsRandomShaderProgram.cpp",
>+  "$_deqp_path/modules/glshared/glsRandomUniformBlockCase.cpp",
>+  "$_deqp_path/modules/glshared/glsSamplerObjectTest.cpp",
>+  "$_deqp_path/modules/glshared/glsScissorTests.cpp",
>+  "$_deqp_path/modules/glshared/glsShaderConstExprTests.cpp",
>+  "$_deqp_path/modules/glshared/glsShaderExecUtil.cpp",
>+  "$_deqp_path/modules/glshared/glsShaderLibraryCase.cpp",
>+  "$_deqp_path/modules/glshared/glsShaderLibrary.cpp",
>+  "$_deqp_path/modules/glshared/glsShaderPerformanceCase.cpp",
>+  "$_deqp_path/modules/glshared/glsShaderPerformanceMeasurer.cpp",
>+  "$_deqp_path/modules/glshared/glsShaderRenderCase.cpp",
>+  "$_deqp_path/modules/glshared/glsStateQueryUtil.cpp",
>+  "$_deqp_path/modules/glshared/glsStateChangePerfTestCases.cpp",
>+  "$_deqp_path/modules/glshared/glsTextureBufferCase.cpp",
>+  "$_deqp_path/modules/glshared/glsTextureStateQueryTests.cpp",
>+  "$_deqp_path/modules/glshared/glsTextureTestUtil.cpp",
>+  "$_deqp_path/modules/glshared/glsUniformBlockCase.cpp",
>+  "$_deqp_path/modules/glshared/glsVertexArrayTests.cpp",
>+  "deqp_support/tcuANGLENativeDisplayFactory.cpp",
>+  "deqp_support/tcuANGLENativeDisplayFactory.h",
>+
>+  # TODO(jmadill): integrate with dEQP
>+  "deqp_support/tcuRandomOrderExecutor.cpp",
>+  "deqp_support/tcuRandomOrderExecutor.h",
>+]
>+deqp_libtester_sources_win = [
>+  "$_deqp_path/framework/delibs/dethread/win32/deMutexWin32.c",
>+  "$_deqp_path/framework/delibs/dethread/win32/deSemaphoreWin32.c",
>+  "$_deqp_path/framework/delibs/dethread/win32/deThreadLocalWin32.c",
>+  "$_deqp_path/framework/delibs/dethread/win32/deThreadWin32.c",
>+]
>+deqp_libtester_sources_unix = [
>+  "$_deqp_path/framework/delibs/dethread/unix/deMutexUnix.c",
>+  "$_deqp_path/framework/delibs/dethread/unix/deNamedSemaphoreUnix.c",
>+  "$_deqp_path/framework/delibs/dethread/unix/deSemaphoreUnix.c",
>+  "$_deqp_path/framework/delibs/dethread/unix/deThreadLocalUnix.c",
>+  "$_deqp_path/framework/delibs/dethread/unix/deThreadUnix.c",
>+]
>+deqp_libtester_sources_android = [
>+  "$_deqp_path/framework/platform/android/tcuAndroidInternals.cpp",
>+  "$_deqp_path/framework/platform/android/tcuAndroidInternals.hpp",
>+]
>diff --git a/Source/ThirdParty/ANGLE/src/tests/deqp.gypi b/Source/ThirdParty/ANGLE/src/tests/deqp.gypi
>deleted file mode 100644
>index 8516531a95f..00000000000
>--- a/Source/ThirdParty/ANGLE/src/tests/deqp.gypi
>+++ /dev/null
>@@ -1,1947 +0,0 @@
>-# Copyright 2015 The ANGLE Project Authors. All rights reserved.
>-# Use of this source code is governed by a BSD-style license that can be
>-# found in the LICENSE file.
>-
>-{
>-    'variables':
>-    {
>-        # Define these variables within an inner variables dict.
>-        # This is necessary to get these variables defined for the conditions
>-        # within the outer variables dict which operate on these variables.
>-        'variables':
>-        {
>-            'angle_build_winrt%': 0,
>-        },
>-
>-        # Copy conditionally-set variables to the outer variables dict.
>-        'angle_build_winrt%': '<(angle_build_winrt)',
>-
>-        'deqp_path': '<(DEPTH)/third_party/deqp/src',
>-        'libpng_path': '<(DEPTH)/third_party/libpng/src',
>-        'zlib_path': '<(DEPTH)/third_party/zlib',
>-
>-        'angle_build_deqp_libraries%' : 0,
>-        'angle_build_deqp_gtest_support%' : 0,
>-        'angle_build_deqp_executables%' : 0,
>-        'angle_build_deqp_gtest_executables%' :0,
>-
>-        'clang_warning_flags':
>-        [
>-             # tcu::CommandLine has virtual functions but no virtual destructor
>-            '-Wno-no-delete-non-virtual-dtor',
>-        ],
>-
>-        'deqp_win_cflags':
>-        [
>-            '/EHsc',   # dEQP requires exceptions
>-            '/wd4091', # typedef ignored when no variable is declared
>-            '/wd4100',
>-            '/wd4125', # decimal digit terminates octal escape sequence
>-            '/wd4127', # conditional expression constant
>-            '/wd4244', # possible loss of data
>-            '/wd4245', # argument signed/unsigned mismatch
>-            '/wd4297', # function assumed not to throw an exception but does
>-            '/wd4389', # signed/unsigned mismatch
>-            '/wd4510', # default constructor could not be generated
>-            '/wd4512',
>-            '/wd4610', # cannot be instantiated
>-            '/wd4611', # setjmp interaction non-portable
>-            '/wd4701', # potentially uninit used
>-            '/wd4702', # unreachable code
>-            '/wd4706', # assignment within conditional expression
>-            '/wd4838', # conversion requires a narrowing conversion
>-            '/wd4996', # deprecated
>-        ],
>-        'deqp_defines':
>-        [
>-            'DEQP_SUPPORT_GLES31=1',
>-            'DEQP_SUPPORT_GLES3=1',
>-            'DEQP_SUPPORT_GLES2=1',
>-            'DEQP_SUPPORT_EGL=1',
>-            'DEQP_TARGET_NAME="angle"',
>-            'DEQP_GLES31_RUNTIME_LOAD=1',
>-            'DEQP_GLES3_RUNTIME_LOAD=1',
>-            'DEQP_GLES2_RUNTIME_LOAD=1',
>-            'QP_SUPPORT_PNG=1',
>-            '_HAS_EXCEPTIONS=1',
>-        ],
>-        'deqp_undefines':
>-        [
>-            'WIN32_LEAN_AND_MEAN',
>-            'NOMINMAX',
>-            '_HAS_EXCEPTIONS=0',
>-        ],
>-        'deqp_include_dirs':
>-        [
>-            '<(deqp_path)/executor',
>-            '<(deqp_path)/execserver',
>-            '<(deqp_path)/framework/common',
>-            '<(deqp_path)/framework/delibs/debase',
>-            '<(deqp_path)/framework/delibs/decpp',
>-            '<(deqp_path)/framework/delibs/depool',
>-            '<(deqp_path)/framework/delibs/dethread',
>-            '<(deqp_path)/framework/delibs/deutil',
>-            '<(deqp_path)/framework/delibs/destream',
>-            '<(deqp_path)/framework/egl',
>-            '<(deqp_path)/framework/egl/wrapper',
>-            '<(deqp_path)/framework/opengl',
>-            '<(deqp_path)/framework/opengl/simplereference',
>-            '<(deqp_path)/framework/opengl/wrapper',
>-            '<(deqp_path)/framework/platform/null',
>-            '<(deqp_path)/framework/qphelper',
>-            '<(deqp_path)/framework/randomshaders',
>-            '<(deqp_path)/framework/referencerenderer',
>-            '<(deqp_path)/modules/gles2',
>-            '<(deqp_path)/modules/gles2/functional',
>-            '<(deqp_path)/modules/gles2/accuracy',
>-            '<(deqp_path)/modules/gles2/performance',
>-            '<(deqp_path)/modules/gles2/stress',
>-            '<(deqp_path)/modules/gles2/usecases',
>-            '<(deqp_path)/modules/gles3',
>-            '<(deqp_path)/modules/gles3/functional',
>-            '<(deqp_path)/modules/gles3/accuracy',
>-            '<(deqp_path)/modules/gles3/performance',
>-            '<(deqp_path)/modules/gles3/stress',
>-            '<(deqp_path)/modules/gles3/usecases',
>-            '<(deqp_path)/modules/gles31',
>-            '<(deqp_path)/modules/gles31/functional',
>-            '<(deqp_path)/modules/gles31/stress',
>-            '<(deqp_path)/modules/glshared',
>-            '<(deqp_path)/modules/glusecases',
>-        ],
>-        'deqp_gles2_sources':
>-        [
>-            '<(deqp_path)/modules/gles2/accuracy/es2aAccuracyTests.cpp',
>-            '<(deqp_path)/modules/gles2/accuracy/es2aAccuracyTests.hpp',
>-            '<(deqp_path)/modules/gles2/accuracy/es2aTextureFilteringTests.cpp',
>-            '<(deqp_path)/modules/gles2/accuracy/es2aTextureFilteringTests.hpp',
>-            '<(deqp_path)/modules/gles2/accuracy/es2aTextureMipmapTests.cpp',
>-            '<(deqp_path)/modules/gles2/accuracy/es2aTextureMipmapTests.hpp',
>-            '<(deqp_path)/modules/gles2/accuracy/es2aVaryingInterpolationTests.cpp',
>-            '<(deqp_path)/modules/gles2/accuracy/es2aVaryingInterpolationTests.hpp',
>-            '<(deqp_path)/modules/gles2/functional/es2fApiCase.cpp',
>-            '<(deqp_path)/modules/gles2/functional/es2fApiCase.hpp',
>-            '<(deqp_path)/modules/gles2/functional/es2fAttribLocationTests.cpp',
>-            '<(deqp_path)/modules/gles2/functional/es2fAttribLocationTests.hpp',
>-            '<(deqp_path)/modules/gles2/functional/es2fBlendTests.cpp',
>-            '<(deqp_path)/modules/gles2/functional/es2fBlendTests.hpp',
>-            '<(deqp_path)/modules/gles2/functional/es2fBooleanStateQueryTests.cpp',
>-            '<(deqp_path)/modules/gles2/functional/es2fBooleanStateQueryTests.hpp',
>-            '<(deqp_path)/modules/gles2/functional/es2fBufferObjectQueryTests.cpp',
>-            '<(deqp_path)/modules/gles2/functional/es2fBufferObjectQueryTests.hpp',
>-            '<(deqp_path)/modules/gles2/functional/es2fBufferTestUtil.cpp',
>-            '<(deqp_path)/modules/gles2/functional/es2fBufferTestUtil.hpp',
>-            '<(deqp_path)/modules/gles2/functional/es2fBufferWriteTests.cpp',
>-            '<(deqp_path)/modules/gles2/functional/es2fBufferWriteTests.hpp',
>-            '<(deqp_path)/modules/gles2/functional/es2fClippingTests.cpp',
>-            '<(deqp_path)/modules/gles2/functional/es2fClippingTests.hpp',
>-            '<(deqp_path)/modules/gles2/functional/es2fColorClearTest.cpp',
>-            '<(deqp_path)/modules/gles2/functional/es2fColorClearTest.hpp',
>-            '<(deqp_path)/modules/gles2/functional/es2fDebugMarkerTests.cpp',
>-            '<(deqp_path)/modules/gles2/functional/es2fDebugMarkerTests.hpp',
>-            '<(deqp_path)/modules/gles2/functional/es2fDefaultVertexAttributeTests.cpp',
>-            '<(deqp_path)/modules/gles2/functional/es2fDefaultVertexAttributeTests.hpp',
>-            '<(deqp_path)/modules/gles2/functional/es2fDepthRangeTests.cpp',
>-            '<(deqp_path)/modules/gles2/functional/es2fDepthRangeTests.hpp',
>-            '<(deqp_path)/modules/gles2/functional/es2fDepthStencilClearTests.cpp',
>-            '<(deqp_path)/modules/gles2/functional/es2fDepthStencilClearTests.hpp',
>-            '<(deqp_path)/modules/gles2/functional/es2fDepthStencilTests.cpp',
>-            '<(deqp_path)/modules/gles2/functional/es2fDepthStencilTests.hpp',
>-            '<(deqp_path)/modules/gles2/functional/es2fDepthTests.cpp',
>-            '<(deqp_path)/modules/gles2/functional/es2fDepthTests.hpp',
>-            '<(deqp_path)/modules/gles2/functional/es2fDitheringTests.cpp',
>-            '<(deqp_path)/modules/gles2/functional/es2fDitheringTests.hpp',
>-            '<(deqp_path)/modules/gles2/functional/es2fDrawTests.cpp',
>-            '<(deqp_path)/modules/gles2/functional/es2fDrawTests.hpp',
>-            '<(deqp_path)/modules/gles2/functional/es2fFboApiTest.cpp',
>-            '<(deqp_path)/modules/gles2/functional/es2fFboApiTest.hpp',
>-            '<(deqp_path)/modules/gles2/functional/es2fFboCompletenessTests.cpp',
>-            '<(deqp_path)/modules/gles2/functional/es2fFboCompletenessTests.hpp',
>-            '<(deqp_path)/modules/gles2/functional/es2fFboRenderTest.cpp',
>-            '<(deqp_path)/modules/gles2/functional/es2fFboRenderTest.hpp',
>-            '<(deqp_path)/modules/gles2/functional/es2fFboStateQueryTests.cpp',
>-            '<(deqp_path)/modules/gles2/functional/es2fFboStateQueryTests.hpp',
>-            '<(deqp_path)/modules/gles2/functional/es2fFloatStateQueryTests.cpp',
>-            '<(deqp_path)/modules/gles2/functional/es2fFloatStateQueryTests.hpp',
>-            '<(deqp_path)/modules/gles2/functional/es2fFlushFinishTests.cpp',
>-            '<(deqp_path)/modules/gles2/functional/es2fFlushFinishTests.hpp',
>-            '<(deqp_path)/modules/gles2/functional/es2fFragOpInteractionTests.cpp',
>-            '<(deqp_path)/modules/gles2/functional/es2fFragOpInteractionTests.hpp',
>-            '<(deqp_path)/modules/gles2/functional/es2fFunctionalTests.cpp',
>-            '<(deqp_path)/modules/gles2/functional/es2fFunctionalTests.hpp',
>-            '<(deqp_path)/modules/gles2/functional/es2fImplementationLimitTests.cpp',
>-            '<(deqp_path)/modules/gles2/functional/es2fImplementationLimitTests.hpp',
>-            '<(deqp_path)/modules/gles2/functional/es2fIntegerStateQueryTests.cpp',
>-            '<(deqp_path)/modules/gles2/functional/es2fIntegerStateQueryTests.hpp',
>-            '<(deqp_path)/modules/gles2/functional/es2fLifetimeTests.cpp',
>-            '<(deqp_path)/modules/gles2/functional/es2fLifetimeTests.hpp',
>-            '<(deqp_path)/modules/gles2/functional/es2fLightAmountTest.cpp',
>-            '<(deqp_path)/modules/gles2/functional/es2fLightAmountTest.hpp',
>-            '<(deqp_path)/modules/gles2/functional/es2fMultisampleTests.cpp',
>-            '<(deqp_path)/modules/gles2/functional/es2fMultisampleTests.hpp',
>-            '<(deqp_path)/modules/gles2/functional/es2fNegativeBufferApiTests.cpp',
>-            '<(deqp_path)/modules/gles2/functional/es2fNegativeBufferApiTests.hpp',
>-            '<(deqp_path)/modules/gles2/functional/es2fNegativeFragmentApiTests.cpp',
>-            '<(deqp_path)/modules/gles2/functional/es2fNegativeFragmentApiTests.hpp',
>-            '<(deqp_path)/modules/gles2/functional/es2fNegativeShaderApiTests.cpp',
>-            '<(deqp_path)/modules/gles2/functional/es2fNegativeShaderApiTests.hpp',
>-            '<(deqp_path)/modules/gles2/functional/es2fNegativeStateApiTests.cpp',
>-            '<(deqp_path)/modules/gles2/functional/es2fNegativeStateApiTests.hpp',
>-            '<(deqp_path)/modules/gles2/functional/es2fNegativeTextureApiTests.cpp',
>-            '<(deqp_path)/modules/gles2/functional/es2fNegativeTextureApiTests.hpp',
>-            '<(deqp_path)/modules/gles2/functional/es2fNegativeVertexArrayApiTests.cpp',
>-            '<(deqp_path)/modules/gles2/functional/es2fNegativeVertexArrayApiTests.hpp',
>-            '<(deqp_path)/modules/gles2/functional/es2fPolygonOffsetTests.cpp',
>-            '<(deqp_path)/modules/gles2/functional/es2fPolygonOffsetTests.hpp',
>-            '<(deqp_path)/modules/gles2/functional/es2fPrerequisiteTests.cpp',
>-            '<(deqp_path)/modules/gles2/functional/es2fPrerequisiteTests.hpp',
>-            '<(deqp_path)/modules/gles2/functional/es2fRandomFragmentOpTests.cpp',
>-            '<(deqp_path)/modules/gles2/functional/es2fRandomFragmentOpTests.hpp',
>-            '<(deqp_path)/modules/gles2/functional/es2fRandomShaderTests.cpp',
>-            '<(deqp_path)/modules/gles2/functional/es2fRandomShaderTests.hpp',
>-            '<(deqp_path)/modules/gles2/functional/es2fRasterizationTests.cpp',
>-            '<(deqp_path)/modules/gles2/functional/es2fRasterizationTests.hpp',
>-            '<(deqp_path)/modules/gles2/functional/es2fRboStateQueryTests.cpp',
>-            '<(deqp_path)/modules/gles2/functional/es2fRboStateQueryTests.hpp',
>-            '<(deqp_path)/modules/gles2/functional/es2fReadPixelsTests.cpp',
>-            '<(deqp_path)/modules/gles2/functional/es2fReadPixelsTests.hpp',
>-            '<(deqp_path)/modules/gles2/functional/es2fScissorTests.cpp',
>-            '<(deqp_path)/modules/gles2/functional/es2fScissorTests.hpp',
>-            '<(deqp_path)/modules/gles2/functional/es2fShaderAlgorithmTests.cpp',
>-            '<(deqp_path)/modules/gles2/functional/es2fShaderAlgorithmTests.hpp',
>-            '<(deqp_path)/modules/gles2/functional/es2fShaderApiTests.cpp',
>-            '<(deqp_path)/modules/gles2/functional/es2fShaderApiTests.hpp',
>-            '<(deqp_path)/modules/gles2/functional/es2fShaderBuiltinVarTests.cpp',
>-            '<(deqp_path)/modules/gles2/functional/es2fShaderBuiltinVarTests.hpp',
>-            '<(deqp_path)/modules/gles2/functional/es2fShaderConstExprTests.cpp',
>-            '<(deqp_path)/modules/gles2/functional/es2fShaderConstExprTests.hpp',
>-            '<(deqp_path)/modules/gles2/functional/es2fShaderDiscardTests.cpp',
>-            '<(deqp_path)/modules/gles2/functional/es2fShaderDiscardTests.hpp',
>-            '<(deqp_path)/modules/gles2/functional/es2fShaderExecuteTest.cpp',
>-            '<(deqp_path)/modules/gles2/functional/es2fShaderExecuteTest.hpp',
>-            '<(deqp_path)/modules/gles2/functional/es2fShaderFragDataTests.cpp',
>-            '<(deqp_path)/modules/gles2/functional/es2fShaderFragDataTests.hpp',
>-            '<(deqp_path)/modules/gles2/functional/es2fShaderIndexingTests.cpp',
>-            '<(deqp_path)/modules/gles2/functional/es2fShaderIndexingTests.hpp',
>-            '<(deqp_path)/modules/gles2/functional/es2fShaderInvarianceTests.cpp',
>-            '<(deqp_path)/modules/gles2/functional/es2fShaderInvarianceTests.hpp',
>-            '<(deqp_path)/modules/gles2/functional/es2fShaderLoopTests.cpp',
>-            '<(deqp_path)/modules/gles2/functional/es2fShaderLoopTests.hpp',
>-            '<(deqp_path)/modules/gles2/functional/es2fShaderMatrixTests.hpp',
>-            '<(deqp_path)/modules/gles2/functional/es2fShaderOperatorTests.cpp',
>-            '<(deqp_path)/modules/gles2/functional/es2fShaderOperatorTests.hpp',
>-            '<(deqp_path)/modules/gles2/functional/es2fShaderReturnTests.cpp',
>-            '<(deqp_path)/modules/gles2/functional/es2fShaderReturnTests.hpp',
>-            '<(deqp_path)/modules/gles2/functional/es2fShaderStateQueryTests.cpp',
>-            '<(deqp_path)/modules/gles2/functional/es2fShaderStateQueryTests.hpp',
>-            '<(deqp_path)/modules/gles2/functional/es2fShaderStructTests.cpp',
>-            '<(deqp_path)/modules/gles2/functional/es2fShaderStructTests.hpp',
>-            '<(deqp_path)/modules/gles2/functional/es2fShaderTextureFunctionTests.cpp',
>-            '<(deqp_path)/modules/gles2/functional/es2fShaderTextureFunctionTests.hpp',
>-            '<(deqp_path)/modules/gles2/functional/es2fStencilTests.cpp',
>-            '<(deqp_path)/modules/gles2/functional/es2fStencilTests.hpp',
>-            '<(deqp_path)/modules/gles2/functional/es2fStringQueryTests.cpp',
>-            '<(deqp_path)/modules/gles2/functional/es2fStringQueryTests.hpp',
>-            '<(deqp_path)/modules/gles2/functional/es2fTextureCompletenessTests.cpp',
>-            '<(deqp_path)/modules/gles2/functional/es2fTextureCompletenessTests.hpp',
>-            '<(deqp_path)/modules/gles2/functional/es2fTextureFilteringTests.cpp',
>-            '<(deqp_path)/modules/gles2/functional/es2fTextureFilteringTests.hpp',
>-            '<(deqp_path)/modules/gles2/functional/es2fTextureFormatTests.cpp',
>-            '<(deqp_path)/modules/gles2/functional/es2fTextureFormatTests.hpp',
>-            '<(deqp_path)/modules/gles2/functional/es2fTextureMipmapTests.cpp',
>-            '<(deqp_path)/modules/gles2/functional/es2fTextureMipmapTests.hpp',
>-            '<(deqp_path)/modules/gles2/functional/es2fTextureSizeTests.cpp',
>-            '<(deqp_path)/modules/gles2/functional/es2fTextureSizeTests.hpp',
>-            '<(deqp_path)/modules/gles2/functional/es2fTextureSpecificationTests.cpp',
>-            '<(deqp_path)/modules/gles2/functional/es2fTextureSpecificationTests.hpp',
>-            '<(deqp_path)/modules/gles2/functional/es2fTextureStateQueryTests.cpp',
>-            '<(deqp_path)/modules/gles2/functional/es2fTextureStateQueryTests.hpp',
>-            '<(deqp_path)/modules/gles2/functional/es2fTextureUnitTests.cpp',
>-            '<(deqp_path)/modules/gles2/functional/es2fTextureUnitTests.hpp',
>-            '<(deqp_path)/modules/gles2/functional/es2fTextureWrapTests.cpp',
>-            '<(deqp_path)/modules/gles2/functional/es2fTextureWrapTests.hpp',
>-            '<(deqp_path)/modules/gles2/functional/es2fUniformApiTests.cpp',
>-            '<(deqp_path)/modules/gles2/functional/es2fUniformApiTests.hpp',
>-            '<(deqp_path)/modules/gles2/functional/es2fVertexArrayTest.cpp',
>-            '<(deqp_path)/modules/gles2/functional/es2fVertexArrayTest.hpp',
>-            '<(deqp_path)/modules/gles2/functional/es2fVertexTextureTests.cpp',
>-            '<(deqp_path)/modules/gles2/functional/es2fVertexTextureTests.hpp',
>-            '<(deqp_path)/modules/gles2/performance/es2pBlendTests.cpp',
>-            '<(deqp_path)/modules/gles2/performance/es2pBlendTests.hpp',
>-            '<(deqp_path)/modules/gles2/performance/es2pDrawCallBatchingTests.cpp',
>-            '<(deqp_path)/modules/gles2/performance/es2pDrawCallBatchingTests.hpp',
>-            '<(deqp_path)/modules/gles2/performance/es2pPerformanceTests.cpp',
>-            '<(deqp_path)/modules/gles2/performance/es2pPerformanceTests.hpp',
>-            '<(deqp_path)/modules/gles2/performance/es2pRedundantStateChangeTests.cpp',
>-            '<(deqp_path)/modules/gles2/performance/es2pRedundantStateChangeTests.hpp',
>-            '<(deqp_path)/modules/gles2/performance/es2pShaderCompilationCases.cpp',
>-            '<(deqp_path)/modules/gles2/performance/es2pShaderCompilationCases.hpp',
>-            '<(deqp_path)/modules/gles2/performance/es2pShaderCompilerTests.cpp',
>-            '<(deqp_path)/modules/gles2/performance/es2pShaderCompilerTests.hpp',
>-            '<(deqp_path)/modules/gles2/performance/es2pShaderControlStatementTests.cpp',
>-            '<(deqp_path)/modules/gles2/performance/es2pShaderControlStatementTests.hpp',
>-            '<(deqp_path)/modules/gles2/performance/es2pShaderOperatorTests.cpp',
>-            '<(deqp_path)/modules/gles2/performance/es2pShaderOperatorTests.hpp',
>-            '<(deqp_path)/modules/gles2/performance/es2pShaderOptimizationTests.cpp',
>-            '<(deqp_path)/modules/gles2/performance/es2pShaderOptimizationTests.hpp',
>-            '<(deqp_path)/modules/gles2/performance/es2pStateChangeCallTests.cpp',
>-            '<(deqp_path)/modules/gles2/performance/es2pStateChangeCallTests.hpp',
>-            '<(deqp_path)/modules/gles2/performance/es2pStateChangeTests.cpp',
>-            '<(deqp_path)/modules/gles2/performance/es2pStateChangeTests.hpp',
>-            '<(deqp_path)/modules/gles2/performance/es2pTextureCases.cpp',
>-            '<(deqp_path)/modules/gles2/performance/es2pTextureCases.hpp',
>-            '<(deqp_path)/modules/gles2/performance/es2pTextureCountTests.cpp',
>-            '<(deqp_path)/modules/gles2/performance/es2pTextureCountTests.hpp',
>-            '<(deqp_path)/modules/gles2/performance/es2pTextureFilteringTests.cpp',
>-            '<(deqp_path)/modules/gles2/performance/es2pTextureFilteringTests.hpp',
>-            '<(deqp_path)/modules/gles2/performance/es2pTextureFormatTests.cpp',
>-            '<(deqp_path)/modules/gles2/performance/es2pTextureFormatTests.hpp',
>-            '<(deqp_path)/modules/gles2/performance/es2pTextureUploadTests.cpp',
>-            '<(deqp_path)/modules/gles2/performance/es2pTextureUploadTests.hpp',
>-            '<(deqp_path)/modules/gles2/stress/es2sDrawTests.cpp',
>-            '<(deqp_path)/modules/gles2/stress/es2sDrawTests.hpp',
>-            '<(deqp_path)/modules/gles2/stress/es2sLongRunningTests.cpp',
>-            '<(deqp_path)/modules/gles2/stress/es2sLongRunningTests.hpp',
>-            '<(deqp_path)/modules/gles2/stress/es2sMemoryTests.cpp',
>-            '<(deqp_path)/modules/gles2/stress/es2sMemoryTests.hpp',
>-            '<(deqp_path)/modules/gles2/stress/es2sSpecialFloatTests.cpp',
>-            '<(deqp_path)/modules/gles2/stress/es2sSpecialFloatTests.hpp',
>-            '<(deqp_path)/modules/gles2/stress/es2sStressTests.cpp',
>-            '<(deqp_path)/modules/gles2/stress/es2sStressTests.hpp',
>-            '<(deqp_path)/modules/gles2/stress/es2sVertexArrayTests.cpp',
>-            '<(deqp_path)/modules/gles2/stress/es2sVertexArrayTests.hpp',
>-            '<(deqp_path)/modules/gles2/tes2CapabilityTests.cpp',
>-            '<(deqp_path)/modules/gles2/tes2CapabilityTests.hpp',
>-            '<(deqp_path)/modules/gles2/tes2Context.cpp',
>-            '<(deqp_path)/modules/gles2/tes2Context.hpp',
>-            '<(deqp_path)/modules/gles2/tes2InfoTests.cpp',
>-            '<(deqp_path)/modules/gles2/tes2InfoTests.hpp',
>-            '<(deqp_path)/modules/gles2/tes2TestCase.cpp',
>-            '<(deqp_path)/modules/gles2/tes2TestCase.hpp',
>-            '<(deqp_path)/modules/gles2/tes2TestPackage.cpp',
>-            '<(deqp_path)/modules/gles2/tes2TestPackage.hpp',
>-            '<(deqp_path)/modules/gles2/tes2TestPackageEntry.cpp',
>-            # TODO(geofflang): Remove this once the test is updated in dEQP or the VC++2017
>-            # compiler is fixed (crbug.com/759402)
>-            #'<(deqp_path)/modules/gles2/functional/es2fShaderMatrixTests.cpp',
>-            '<(angle_path)/src/tests/deqp_support/es2fShaderMatrixTests.cpp',
>-        ],
>-        'deqp_gles3_sources':
>-        [
>-            '<(deqp_path)/modules/gles3/accuracy/es3aAccuracyTests.cpp',
>-            '<(deqp_path)/modules/gles3/accuracy/es3aAccuracyTests.hpp',
>-            '<(deqp_path)/modules/gles3/accuracy/es3aTextureFilteringTests.cpp',
>-            '<(deqp_path)/modules/gles3/accuracy/es3aTextureFilteringTests.hpp',
>-            '<(deqp_path)/modules/gles3/accuracy/es3aTextureMipmapTests.cpp',
>-            '<(deqp_path)/modules/gles3/accuracy/es3aTextureMipmapTests.hpp',
>-            '<(deqp_path)/modules/gles3/accuracy/es3aVaryingInterpolationTests.cpp',
>-            '<(deqp_path)/modules/gles3/accuracy/es3aVaryingInterpolationTests.hpp',
>-            '<(deqp_path)/modules/gles3/functional/es3fApiCase.cpp',
>-            '<(deqp_path)/modules/gles3/functional/es3fApiCase.hpp',
>-            '<(deqp_path)/modules/gles3/functional/es3fASTCDecompressionCases.cpp',
>-            '<(deqp_path)/modules/gles3/functional/es3fASTCDecompressionCases.hpp',
>-            '<(deqp_path)/modules/gles3/functional/es3fAttribLocationTests.cpp',
>-            '<(deqp_path)/modules/gles3/functional/es3fAttribLocationTests.hpp',
>-            '<(deqp_path)/modules/gles3/functional/es3fBlendTests.cpp',
>-            '<(deqp_path)/modules/gles3/functional/es3fBlendTests.hpp',
>-            '<(deqp_path)/modules/gles3/functional/es3fBooleanStateQueryTests.cpp',
>-            '<(deqp_path)/modules/gles3/functional/es3fBooleanStateQueryTests.hpp',
>-            '<(deqp_path)/modules/gles3/functional/es3fBufferCopyTests.cpp',
>-            '<(deqp_path)/modules/gles3/functional/es3fBufferCopyTests.hpp',
>-            '<(deqp_path)/modules/gles3/functional/es3fBufferMapTests.cpp',
>-            '<(deqp_path)/modules/gles3/functional/es3fBufferMapTests.hpp',
>-            '<(deqp_path)/modules/gles3/functional/es3fBufferObjectQueryTests.cpp',
>-            '<(deqp_path)/modules/gles3/functional/es3fBufferObjectQueryTests.hpp',
>-            '<(deqp_path)/modules/gles3/functional/es3fBufferWriteTests.cpp',
>-            '<(deqp_path)/modules/gles3/functional/es3fBufferWriteTests.hpp',
>-            '<(deqp_path)/modules/gles3/functional/es3fBuiltinPrecisionTests.cpp',
>-            '<(deqp_path)/modules/gles3/functional/es3fBuiltinPrecisionTests.hpp',
>-            '<(deqp_path)/modules/gles3/functional/es3fClippingTests.cpp',
>-            '<(deqp_path)/modules/gles3/functional/es3fClippingTests.hpp',
>-            '<(deqp_path)/modules/gles3/functional/es3fColorClearTest.cpp',
>-            '<(deqp_path)/modules/gles3/functional/es3fColorClearTest.hpp',
>-            '<(deqp_path)/modules/gles3/functional/es3fCompressedTextureTests.cpp',
>-            '<(deqp_path)/modules/gles3/functional/es3fCompressedTextureTests.hpp',
>-            '<(deqp_path)/modules/gles3/functional/es3fDefaultVertexArrayObjectTests.cpp',
>-            '<(deqp_path)/modules/gles3/functional/es3fDefaultVertexArrayObjectTests.hpp',
>-            '<(deqp_path)/modules/gles3/functional/es3fDefaultVertexAttributeTests.cpp',
>-            '<(deqp_path)/modules/gles3/functional/es3fDefaultVertexAttributeTests.hpp',
>-            '<(deqp_path)/modules/gles3/functional/es3fDepthStencilClearTests.cpp',
>-            '<(deqp_path)/modules/gles3/functional/es3fDepthStencilClearTests.hpp',
>-            '<(deqp_path)/modules/gles3/functional/es3fDepthStencilTests.cpp',
>-            '<(deqp_path)/modules/gles3/functional/es3fDepthStencilTests.hpp',
>-            '<(deqp_path)/modules/gles3/functional/es3fDepthTests.cpp',
>-            '<(deqp_path)/modules/gles3/functional/es3fDepthTests.hpp',
>-            '<(deqp_path)/modules/gles3/functional/es3fDitheringTests.cpp',
>-            '<(deqp_path)/modules/gles3/functional/es3fDitheringTests.hpp',
>-            '<(deqp_path)/modules/gles3/functional/es3fDrawTests.cpp',
>-            '<(deqp_path)/modules/gles3/functional/es3fDrawTests.hpp',
>-            '<(deqp_path)/modules/gles3/functional/es3fFboApiTests.cpp',
>-            '<(deqp_path)/modules/gles3/functional/es3fFboApiTests.hpp',
>-            '<(deqp_path)/modules/gles3/functional/es3fFboColorbufferTests.cpp',
>-            '<(deqp_path)/modules/gles3/functional/es3fFboColorbufferTests.hpp',
>-            '<(deqp_path)/modules/gles3/functional/es3fFboCompletenessTests.cpp',
>-            '<(deqp_path)/modules/gles3/functional/es3fFboCompletenessTests.hpp',
>-            '<(deqp_path)/modules/gles3/functional/es3fFboDepthbufferTests.cpp',
>-            '<(deqp_path)/modules/gles3/functional/es3fFboDepthbufferTests.hpp',
>-            '<(deqp_path)/modules/gles3/functional/es3fFboInvalidateTests.cpp',
>-            '<(deqp_path)/modules/gles3/functional/es3fFboInvalidateTests.hpp',
>-            '<(deqp_path)/modules/gles3/functional/es3fFboMultisampleTests.cpp',
>-            '<(deqp_path)/modules/gles3/functional/es3fFboMultisampleTests.hpp',
>-            '<(deqp_path)/modules/gles3/functional/es3fFboRenderTest.cpp',
>-            '<(deqp_path)/modules/gles3/functional/es3fFboRenderTest.hpp',
>-            '<(deqp_path)/modules/gles3/functional/es3fFboStateQueryTests.cpp',
>-            '<(deqp_path)/modules/gles3/functional/es3fFboStateQueryTests.hpp',
>-            '<(deqp_path)/modules/gles3/functional/es3fFboStencilbufferTests.cpp',
>-            '<(deqp_path)/modules/gles3/functional/es3fFboStencilbufferTests.hpp',
>-            '<(deqp_path)/modules/gles3/functional/es3fFboTestCase.cpp',
>-            '<(deqp_path)/modules/gles3/functional/es3fFboTestCase.hpp',
>-            '<(deqp_path)/modules/gles3/functional/es3fFboTestUtil.cpp',
>-            '<(deqp_path)/modules/gles3/functional/es3fFboTestUtil.hpp',
>-            '<(deqp_path)/modules/gles3/functional/es3fFloatStateQueryTests.cpp',
>-            '<(deqp_path)/modules/gles3/functional/es3fFloatStateQueryTests.hpp',
>-            '<(deqp_path)/modules/gles3/functional/es3fFlushFinishTests.cpp',
>-            '<(deqp_path)/modules/gles3/functional/es3fFlushFinishTests.hpp',
>-            '<(deqp_path)/modules/gles3/functional/es3fFragDepthTests.cpp',
>-            '<(deqp_path)/modules/gles3/functional/es3fFragDepthTests.hpp',
>-            '<(deqp_path)/modules/gles3/functional/es3fFragmentOutputTests.cpp',
>-            '<(deqp_path)/modules/gles3/functional/es3fFragmentOutputTests.hpp',
>-            '<(deqp_path)/modules/gles3/functional/es3fFragOpInteractionTests.cpp',
>-            '<(deqp_path)/modules/gles3/functional/es3fFragOpInteractionTests.hpp',
>-            '<(deqp_path)/modules/gles3/functional/es3fFramebufferBlitTests.cpp',
>-            '<(deqp_path)/modules/gles3/functional/es3fFramebufferBlitTests.hpp',
>-            '<(deqp_path)/modules/gles3/functional/es3fFunctionalTests.cpp',
>-            '<(deqp_path)/modules/gles3/functional/es3fFunctionalTests.hpp',
>-            '<(deqp_path)/modules/gles3/functional/es3fImplementationLimitTests.cpp',
>-            '<(deqp_path)/modules/gles3/functional/es3fImplementationLimitTests.hpp',
>-            '<(deqp_path)/modules/gles3/functional/es3fIndexedStateQueryTests.cpp',
>-            '<(deqp_path)/modules/gles3/functional/es3fIndexedStateQueryTests.hpp',
>-            '<(deqp_path)/modules/gles3/functional/es3fInstancedRenderingTests.cpp',
>-            '<(deqp_path)/modules/gles3/functional/es3fInstancedRenderingTests.hpp',
>-            '<(deqp_path)/modules/gles3/functional/es3fInteger64StateQueryTests.cpp',
>-            '<(deqp_path)/modules/gles3/functional/es3fInteger64StateQueryTests.hpp',
>-            '<(deqp_path)/modules/gles3/functional/es3fIntegerStateQueryTests.cpp',
>-            '<(deqp_path)/modules/gles3/functional/es3fIntegerStateQueryTests.hpp',
>-            '<(deqp_path)/modules/gles3/functional/es3fInternalFormatQueryTests.cpp',
>-            '<(deqp_path)/modules/gles3/functional/es3fInternalFormatQueryTests.hpp',
>-            '<(deqp_path)/modules/gles3/functional/es3fLifetimeTests.cpp',
>-            '<(deqp_path)/modules/gles3/functional/es3fLifetimeTests.hpp',
>-            '<(deqp_path)/modules/gles3/functional/es3fMultisampleTests.cpp',
>-            '<(deqp_path)/modules/gles3/functional/es3fMultisampleTests.hpp',
>-            '<(deqp_path)/modules/gles3/functional/es3fNegativeBufferApiTests.cpp',
>-            '<(deqp_path)/modules/gles3/functional/es3fNegativeBufferApiTests.hpp',
>-            '<(deqp_path)/modules/gles3/functional/es3fNegativeFragmentApiTests.cpp',
>-            '<(deqp_path)/modules/gles3/functional/es3fNegativeFragmentApiTests.hpp',
>-            '<(deqp_path)/modules/gles3/functional/es3fNegativeShaderApiTests.cpp',
>-            '<(deqp_path)/modules/gles3/functional/es3fNegativeShaderApiTests.hpp',
>-            '<(deqp_path)/modules/gles3/functional/es3fNegativeStateApiTests.cpp',
>-            '<(deqp_path)/modules/gles3/functional/es3fNegativeStateApiTests.hpp',
>-            '<(deqp_path)/modules/gles3/functional/es3fNegativeTextureApiTests.cpp',
>-            '<(deqp_path)/modules/gles3/functional/es3fNegativeTextureApiTests.hpp',
>-            '<(deqp_path)/modules/gles3/functional/es3fNegativeVertexArrayApiTests.cpp',
>-            '<(deqp_path)/modules/gles3/functional/es3fNegativeVertexArrayApiTests.hpp',
>-            '<(deqp_path)/modules/gles3/functional/es3fOcclusionQueryTests.cpp',
>-            '<(deqp_path)/modules/gles3/functional/es3fOcclusionQueryTests.hpp',
>-            '<(deqp_path)/modules/gles3/functional/es3fPixelBufferObjectTests.cpp',
>-            '<(deqp_path)/modules/gles3/functional/es3fPixelBufferObjectTests.hpp',
>-            '<(deqp_path)/modules/gles3/functional/es3fPolygonOffsetTests.cpp',
>-            '<(deqp_path)/modules/gles3/functional/es3fPolygonOffsetTests.hpp',
>-            '<(deqp_path)/modules/gles3/functional/es3fPrerequisiteTests.cpp',
>-            '<(deqp_path)/modules/gles3/functional/es3fPrerequisiteTests.hpp',
>-            '<(deqp_path)/modules/gles3/functional/es3fPrimitiveRestartTests.cpp',
>-            '<(deqp_path)/modules/gles3/functional/es3fPrimitiveRestartTests.hpp',
>-            '<(deqp_path)/modules/gles3/functional/es3fRandomFragmentOpTests.cpp',
>-            '<(deqp_path)/modules/gles3/functional/es3fRandomFragmentOpTests.hpp',
>-            '<(deqp_path)/modules/gles3/functional/es3fRandomShaderTests.cpp',
>-            '<(deqp_path)/modules/gles3/functional/es3fRandomShaderTests.hpp',
>-            '<(deqp_path)/modules/gles3/functional/es3fRasterizationTests.cpp',
>-            '<(deqp_path)/modules/gles3/functional/es3fRasterizationTests.hpp',
>-            '<(deqp_path)/modules/gles3/functional/es3fRasterizerDiscardTests.cpp',
>-            '<(deqp_path)/modules/gles3/functional/es3fRasterizerDiscardTests.hpp',
>-            '<(deqp_path)/modules/gles3/functional/es3fRboStateQueryTests.cpp',
>-            '<(deqp_path)/modules/gles3/functional/es3fRboStateQueryTests.hpp',
>-            '<(deqp_path)/modules/gles3/functional/es3fReadPixelsTests.cpp',
>-            '<(deqp_path)/modules/gles3/functional/es3fReadPixelsTests.hpp',
>-            '<(deqp_path)/modules/gles3/functional/es3fSamplerObjectTests.cpp',
>-            '<(deqp_path)/modules/gles3/functional/es3fSamplerObjectTests.hpp',
>-            '<(deqp_path)/modules/gles3/functional/es3fSamplerStateQueryTests.cpp',
>-            '<(deqp_path)/modules/gles3/functional/es3fSamplerStateQueryTests.hpp',
>-            '<(deqp_path)/modules/gles3/functional/es3fScissorTests.cpp',
>-            '<(deqp_path)/modules/gles3/functional/es3fScissorTests.hpp',
>-            '<(deqp_path)/modules/gles3/functional/es3fShaderApiTests.cpp',
>-            '<(deqp_path)/modules/gles3/functional/es3fShaderApiTests.hpp',
>-            '<(deqp_path)/modules/gles3/functional/es3fShaderBuiltinVarTests.cpp',
>-            '<(deqp_path)/modules/gles3/functional/es3fShaderBuiltinVarTests.hpp',
>-            '<(deqp_path)/modules/gles3/functional/es3fShaderCommonFunctionTests.cpp',
>-            '<(deqp_path)/modules/gles3/functional/es3fShaderCommonFunctionTests.hpp',
>-            '<(deqp_path)/modules/gles3/functional/es3fShaderConstExprTests.cpp',
>-            '<(deqp_path)/modules/gles3/functional/es3fShaderConstExprTests.hpp',
>-            '<(deqp_path)/modules/gles3/functional/es3fShaderDerivateTests.cpp',
>-            '<(deqp_path)/modules/gles3/functional/es3fShaderDerivateTests.hpp',
>-            '<(deqp_path)/modules/gles3/functional/es3fShaderDiscardTests.cpp',
>-            '<(deqp_path)/modules/gles3/functional/es3fShaderDiscardTests.hpp',
>-            '<(deqp_path)/modules/gles3/functional/es3fShaderFragDataTests.cpp',
>-            '<(deqp_path)/modules/gles3/functional/es3fShaderFragDataTests.hpp',
>-            '<(deqp_path)/modules/gles3/functional/es3fShaderIndexingTests.cpp',
>-            '<(deqp_path)/modules/gles3/functional/es3fShaderIndexingTests.hpp',
>-            '<(deqp_path)/modules/gles3/functional/es3fShaderInvarianceTests.cpp',
>-            '<(deqp_path)/modules/gles3/functional/es3fShaderInvarianceTests.hpp',
>-            '<(deqp_path)/modules/gles3/functional/es3fShaderLoopTests.cpp',
>-            '<(deqp_path)/modules/gles3/functional/es3fShaderLoopTests.hpp',
>-            '<(deqp_path)/modules/gles3/functional/es3fShaderMatrixTests.hpp',
>-            '<(deqp_path)/modules/gles3/functional/es3fShaderOperatorTests.cpp',
>-            '<(deqp_path)/modules/gles3/functional/es3fShaderOperatorTests.hpp',
>-            '<(deqp_path)/modules/gles3/functional/es3fShaderPackingFunctionTests.cpp',
>-            '<(deqp_path)/modules/gles3/functional/es3fShaderPackingFunctionTests.hpp',
>-            '<(deqp_path)/modules/gles3/functional/es3fShaderPrecisionTests.cpp',
>-            '<(deqp_path)/modules/gles3/functional/es3fShaderPrecisionTests.hpp',
>-            '<(deqp_path)/modules/gles3/functional/es3fShaderReturnTests.cpp',
>-            '<(deqp_path)/modules/gles3/functional/es3fShaderReturnTests.hpp',
>-            '<(deqp_path)/modules/gles3/functional/es3fShaderStateQueryTests.cpp',
>-            '<(deqp_path)/modules/gles3/functional/es3fShaderStateQueryTests.hpp',
>-            '<(deqp_path)/modules/gles3/functional/es3fShaderStructTests.cpp',
>-            '<(deqp_path)/modules/gles3/functional/es3fShaderStructTests.hpp',
>-            '<(deqp_path)/modules/gles3/functional/es3fShaderSwitchTests.cpp',
>-            '<(deqp_path)/modules/gles3/functional/es3fShaderSwitchTests.hpp',
>-            '<(deqp_path)/modules/gles3/functional/es3fShaderTextureFunctionTests.cpp',
>-            '<(deqp_path)/modules/gles3/functional/es3fShaderTextureFunctionTests.hpp',
>-            '<(deqp_path)/modules/gles3/functional/es3fStencilTests.cpp',
>-            '<(deqp_path)/modules/gles3/functional/es3fStencilTests.hpp',
>-            '<(deqp_path)/modules/gles3/functional/es3fStringQueryTests.cpp',
>-            '<(deqp_path)/modules/gles3/functional/es3fStringQueryTests.hpp',
>-            '<(deqp_path)/modules/gles3/functional/es3fSyncTests.cpp',
>-            '<(deqp_path)/modules/gles3/functional/es3fSyncTests.hpp',
>-            '<(deqp_path)/modules/gles3/functional/es3fTextureFilteringTests.cpp',
>-            '<(deqp_path)/modules/gles3/functional/es3fTextureFilteringTests.hpp',
>-            '<(deqp_path)/modules/gles3/functional/es3fTextureFormatTests.cpp',
>-            '<(deqp_path)/modules/gles3/functional/es3fTextureFormatTests.hpp',
>-            '<(deqp_path)/modules/gles3/functional/es3fTextureMipmapTests.cpp',
>-            '<(deqp_path)/modules/gles3/functional/es3fTextureMipmapTests.hpp',
>-            '<(deqp_path)/modules/gles3/functional/es3fTextureShadowTests.cpp',
>-            '<(deqp_path)/modules/gles3/functional/es3fTextureShadowTests.hpp',
>-            '<(deqp_path)/modules/gles3/functional/es3fTextureSizeTests.cpp',
>-            '<(deqp_path)/modules/gles3/functional/es3fTextureSizeTests.hpp',
>-            '<(deqp_path)/modules/gles3/functional/es3fTextureSpecificationTests.cpp',
>-            '<(deqp_path)/modules/gles3/functional/es3fTextureSpecificationTests.hpp',
>-            '<(deqp_path)/modules/gles3/functional/es3fTextureStateQueryTests.cpp',
>-            '<(deqp_path)/modules/gles3/functional/es3fTextureStateQueryTests.hpp',
>-            '<(deqp_path)/modules/gles3/functional/es3fTextureSwizzleTests.cpp',
>-            '<(deqp_path)/modules/gles3/functional/es3fTextureSwizzleTests.hpp',
>-            '<(deqp_path)/modules/gles3/functional/es3fTextureUnitTests.cpp',
>-            '<(deqp_path)/modules/gles3/functional/es3fTextureUnitTests.hpp',
>-            '<(deqp_path)/modules/gles3/functional/es3fTextureWrapTests.cpp',
>-            '<(deqp_path)/modules/gles3/functional/es3fTextureWrapTests.hpp',
>-            '<(deqp_path)/modules/gles3/functional/es3fTransformFeedbackTests.cpp',
>-            '<(deqp_path)/modules/gles3/functional/es3fTransformFeedbackTests.hpp',
>-            '<(deqp_path)/modules/gles3/functional/es3fUniformApiTests.cpp',
>-            '<(deqp_path)/modules/gles3/functional/es3fUniformApiTests.hpp',
>-            '<(deqp_path)/modules/gles3/functional/es3fUniformBlockTests.cpp',
>-            '<(deqp_path)/modules/gles3/functional/es3fUniformBlockTests.hpp',
>-            '<(deqp_path)/modules/gles3/functional/es3fVertexArrayObjectTests.cpp',
>-            '<(deqp_path)/modules/gles3/functional/es3fVertexArrayObjectTests.hpp',
>-            '<(deqp_path)/modules/gles3/functional/es3fVertexArrayTest.cpp',
>-            '<(deqp_path)/modules/gles3/functional/es3fVertexArrayTest.hpp',
>-            '<(deqp_path)/modules/gles3/functional/es3fVertexTextureTests.cpp',
>-            '<(deqp_path)/modules/gles3/functional/es3fVertexTextureTests.hpp',
>-            '<(deqp_path)/modules/gles3/performance/es3pBlendTests.cpp',
>-            '<(deqp_path)/modules/gles3/performance/es3pBlendTests.hpp',
>-            '<(deqp_path)/modules/gles3/performance/es3pBufferDataUploadTests.cpp',
>-            '<(deqp_path)/modules/gles3/performance/es3pBufferDataUploadTests.hpp',
>-            '<(deqp_path)/modules/gles3/performance/es3pDepthTests.cpp',
>-            '<(deqp_path)/modules/gles3/performance/es3pDepthTests.hpp',
>-            '<(deqp_path)/modules/gles3/performance/es3pPerformanceTests.cpp',
>-            '<(deqp_path)/modules/gles3/performance/es3pPerformanceTests.hpp',
>-            '<(deqp_path)/modules/gles3/performance/es3pRedundantStateChangeTests.cpp',
>-            '<(deqp_path)/modules/gles3/performance/es3pRedundantStateChangeTests.hpp',
>-            '<(deqp_path)/modules/gles3/performance/es3pShaderCompilationCases.cpp',
>-            '<(deqp_path)/modules/gles3/performance/es3pShaderCompilationCases.hpp',
>-            '<(deqp_path)/modules/gles3/performance/es3pShaderCompilerTests.cpp',
>-            '<(deqp_path)/modules/gles3/performance/es3pShaderCompilerTests.hpp',
>-            '<(deqp_path)/modules/gles3/performance/es3pShaderControlStatementTests.cpp',
>-            '<(deqp_path)/modules/gles3/performance/es3pShaderControlStatementTests.hpp',
>-            '<(deqp_path)/modules/gles3/performance/es3pShaderOperatorTests.cpp',
>-            '<(deqp_path)/modules/gles3/performance/es3pShaderOperatorTests.hpp',
>-            '<(deqp_path)/modules/gles3/performance/es3pShaderOptimizationTests.cpp',
>-            '<(deqp_path)/modules/gles3/performance/es3pShaderOptimizationTests.hpp',
>-            '<(deqp_path)/modules/gles3/performance/es3pStateChangeCallTests.cpp',
>-            '<(deqp_path)/modules/gles3/performance/es3pStateChangeCallTests.hpp',
>-            '<(deqp_path)/modules/gles3/performance/es3pStateChangeTests.cpp',
>-            '<(deqp_path)/modules/gles3/performance/es3pStateChangeTests.hpp',
>-            '<(deqp_path)/modules/gles3/performance/es3pTextureCases.cpp',
>-            '<(deqp_path)/modules/gles3/performance/es3pTextureCases.hpp',
>-            '<(deqp_path)/modules/gles3/performance/es3pTextureCountTests.cpp',
>-            '<(deqp_path)/modules/gles3/performance/es3pTextureCountTests.hpp',
>-            '<(deqp_path)/modules/gles3/performance/es3pTextureFilteringTests.cpp',
>-            '<(deqp_path)/modules/gles3/performance/es3pTextureFilteringTests.hpp',
>-            '<(deqp_path)/modules/gles3/performance/es3pTextureFormatTests.cpp',
>-            '<(deqp_path)/modules/gles3/performance/es3pTextureFormatTests.hpp',
>-            '<(deqp_path)/modules/gles3/stress/es3sDrawTests.cpp',
>-            '<(deqp_path)/modules/gles3/stress/es3sDrawTests.hpp',
>-            '<(deqp_path)/modules/gles3/stress/es3sLongRunningShaderTests.cpp',
>-            '<(deqp_path)/modules/gles3/stress/es3sLongRunningShaderTests.hpp',
>-            '<(deqp_path)/modules/gles3/stress/es3sLongRunningTests.cpp',
>-            '<(deqp_path)/modules/gles3/stress/es3sLongRunningTests.hpp',
>-            '<(deqp_path)/modules/gles3/stress/es3sLongShaderTests.cpp',
>-            '<(deqp_path)/modules/gles3/stress/es3sLongShaderTests.hpp',
>-            '<(deqp_path)/modules/gles3/stress/es3sMemoryTests.cpp',
>-            '<(deqp_path)/modules/gles3/stress/es3sMemoryTests.hpp',
>-            '<(deqp_path)/modules/gles3/stress/es3sOcclusionQueryTests.cpp',
>-            '<(deqp_path)/modules/gles3/stress/es3sOcclusionQueryTests.hpp',
>-            '<(deqp_path)/modules/gles3/stress/es3sSpecialFloatTests.cpp',
>-            '<(deqp_path)/modules/gles3/stress/es3sSpecialFloatTests.hpp',
>-            '<(deqp_path)/modules/gles3/stress/es3sStressTests.cpp',
>-            '<(deqp_path)/modules/gles3/stress/es3sStressTests.hpp',
>-            '<(deqp_path)/modules/gles3/stress/es3sSyncTests.cpp',
>-            '<(deqp_path)/modules/gles3/stress/es3sSyncTests.hpp',
>-            '<(deqp_path)/modules/gles3/stress/es3sVertexArrayTests.cpp',
>-            '<(deqp_path)/modules/gles3/stress/es3sVertexArrayTests.hpp',
>-            '<(deqp_path)/modules/gles3/tes3Context.cpp',
>-            '<(deqp_path)/modules/gles3/tes3Context.hpp',
>-            '<(deqp_path)/modules/gles3/tes3InfoTests.cpp',
>-            '<(deqp_path)/modules/gles3/tes3InfoTests.hpp',
>-            '<(deqp_path)/modules/gles3/tes3TestCase.cpp',
>-            '<(deqp_path)/modules/gles3/tes3TestCase.hpp',
>-            '<(deqp_path)/modules/gles3/tes3TestPackage.cpp',
>-            '<(deqp_path)/modules/gles3/tes3TestPackage.hpp',
>-            '<(deqp_path)/modules/gles3/tes3TestPackageEntry.cpp',
>-            # TODO(jmadill): Remove this once the test is updated in dEQP or the VC++2017
>-            # compiler is fixed (crbug.com/759402)
>-            #'<(deqp_path)/modules/gles3/functional/es3fShaderMatrixTests.cpp',
>-            '<(angle_path)/src/tests/deqp_support/es3fShaderMatrixTests.cpp',
>-        ],
>-        'deqp_gles31_sources':
>-        [
>-            '<(deqp_path)/modules/gles31/functional/es31fAdvancedBlendTests.cpp',
>-            '<(deqp_path)/modules/gles31/functional/es31fAdvancedBlendTests.hpp',
>-            '<(deqp_path)/modules/gles31/functional/es31fAndroidExtensionPackES31ATests.cpp',
>-            '<(deqp_path)/modules/gles31/functional/es31fAndroidExtensionPackES31ATests.hpp',
>-            '<(deqp_path)/modules/gles31/functional/es31fAtomicCounterTests.cpp',
>-            '<(deqp_path)/modules/gles31/functional/es31fAtomicCounterTests.hpp',
>-            '<(deqp_path)/modules/gles31/functional/es31fBasicComputeShaderTests.cpp',
>-            '<(deqp_path)/modules/gles31/functional/es31fBasicComputeShaderTests.hpp',
>-            '<(deqp_path)/modules/gles31/functional/es31fBooleanStateQueryTests.cpp',
>-            '<(deqp_path)/modules/gles31/functional/es31fBooleanStateQueryTests.hpp',
>-            '<(deqp_path)/modules/gles31/functional/es31fBuiltinPrecisionTests.cpp',
>-            '<(deqp_path)/modules/gles31/functional/es31fBuiltinPrecisionTests.hpp',
>-            '<(deqp_path)/modules/gles31/functional/es31fComputeShaderBuiltinVarTests.cpp',
>-            '<(deqp_path)/modules/gles31/functional/es31fComputeShaderBuiltinVarTests.hpp',
>-            '<(deqp_path)/modules/gles31/functional/es31fCopyImageTests.cpp',
>-            '<(deqp_path)/modules/gles31/functional/es31fCopyImageTests.hpp',
>-            '<(deqp_path)/modules/gles31/functional/es31fDebugTests.cpp',
>-            '<(deqp_path)/modules/gles31/functional/es31fDebugTests.hpp',
>-            '<(deqp_path)/modules/gles31/functional/es31fDefaultVertexArrayObjectTests.cpp',
>-            '<(deqp_path)/modules/gles31/functional/es31fDefaultVertexArrayObjectTests.hpp',
>-            '<(deqp_path)/modules/gles31/functional/es31fDrawBuffersIndexedTests.cpp',
>-            '<(deqp_path)/modules/gles31/functional/es31fDrawBuffersIndexedTests.hpp',
>-            '<(deqp_path)/modules/gles31/functional/es31fDrawTests.cpp',
>-            '<(deqp_path)/modules/gles31/functional/es31fDrawTests.hpp',
>-            '<(deqp_path)/modules/gles31/functional/es31fFboColorbufferTests.cpp',
>-            '<(deqp_path)/modules/gles31/functional/es31fFboColorbufferTests.hpp',
>-            '<(deqp_path)/modules/gles31/functional/es31fFboNoAttachmentTests.cpp',
>-            '<(deqp_path)/modules/gles31/functional/es31fFboNoAttachmentTests.hpp',
>-            '<(deqp_path)/modules/gles31/functional/es31fFboTestCase.cpp',
>-            '<(deqp_path)/modules/gles31/functional/es31fFboTestCase.hpp',
>-            '<(deqp_path)/modules/gles31/functional/es31fFboTestUtil.cpp',
>-            '<(deqp_path)/modules/gles31/functional/es31fFboTestUtil.hpp',
>-            '<(deqp_path)/modules/gles31/functional/es31fFramebufferDefaultStateQueryTests.cpp',
>-            '<(deqp_path)/modules/gles31/functional/es31fFramebufferDefaultStateQueryTests.hpp',
>-            '<(deqp_path)/modules/gles31/functional/es31fFunctionalTests.cpp',
>-            '<(deqp_path)/modules/gles31/functional/es31fFunctionalTests.hpp',
>-            '<(deqp_path)/modules/gles31/functional/es31fGeometryShaderTests.cpp',
>-            '<(deqp_path)/modules/gles31/functional/es31fGeometryShaderTests.hpp',
>-            '<(deqp_path)/modules/gles31/functional/es31fIndexedStateQueryTests.cpp',
>-            '<(deqp_path)/modules/gles31/functional/es31fIndexedStateQueryTests.hpp',
>-            '<(deqp_path)/modules/gles31/functional/es31fIndirectComputeDispatchTests.cpp',
>-            '<(deqp_path)/modules/gles31/functional/es31fIndirectComputeDispatchTests.hpp',
>-            '<(deqp_path)/modules/gles31/functional/es31fInfoLogQueryShared.cpp',
>-            '<(deqp_path)/modules/gles31/functional/es31fInfoLogQueryShared.hpp',
>-            '<(deqp_path)/modules/gles31/functional/es31fIntegerStateQueryTests.cpp',
>-            '<(deqp_path)/modules/gles31/functional/es31fIntegerStateQueryTests.hpp',
>-            '<(deqp_path)/modules/gles31/functional/es31fInternalFormatQueryTests.cpp',
>-            '<(deqp_path)/modules/gles31/functional/es31fInternalFormatQueryTests.hpp',
>-            '<(deqp_path)/modules/gles31/functional/es31fLayoutBindingTests.cpp',
>-            '<(deqp_path)/modules/gles31/functional/es31fLayoutBindingTests.hpp',
>-            '<(deqp_path)/modules/gles31/functional/es31fMultisampleShaderRenderCase.cpp',
>-            '<(deqp_path)/modules/gles31/functional/es31fMultisampleShaderRenderCase.hpp',
>-            '<(deqp_path)/modules/gles31/functional/es31fMultisampleTests.cpp',
>-            '<(deqp_path)/modules/gles31/functional/es31fMultisampleTests.hpp',
>-            '<(deqp_path)/modules/gles31/functional/es31fNegativeAdvancedBlendEquationTests.cpp',
>-            '<(deqp_path)/modules/gles31/functional/es31fNegativeAdvancedBlendEquationTests.hpp',
>-            '<(deqp_path)/modules/gles31/functional/es31fNegativeAtomicCounterTests.cpp',
>-            '<(deqp_path)/modules/gles31/functional/es31fNegativeAtomicCounterTests.hpp',
>-            '<(deqp_path)/modules/gles31/functional/es31fNegativeBufferApiTests.cpp',
>-            '<(deqp_path)/modules/gles31/functional/es31fNegativeBufferApiTests.hpp',
>-            '<(deqp_path)/modules/gles31/functional/es31fNegativeFragmentApiTests.cpp',
>-            '<(deqp_path)/modules/gles31/functional/es31fNegativeFragmentApiTests.hpp',
>-            '<(deqp_path)/modules/gles31/functional/es31fNegativePreciseTests.cpp',
>-            '<(deqp_path)/modules/gles31/functional/es31fNegativePreciseTests.hpp',
>-            '<(deqp_path)/modules/gles31/functional/es31fNegativeShaderApiTests.cpp',
>-            '<(deqp_path)/modules/gles31/functional/es31fNegativeShaderApiTests.hpp',
>-            '<(deqp_path)/modules/gles31/functional/es31fNegativeShaderDirectiveTests.cpp',
>-            '<(deqp_path)/modules/gles31/functional/es31fNegativeShaderDirectiveTests.hpp',
>-            '<(deqp_path)/modules/gles31/functional/es31fNegativeShaderFunctionTests.cpp',
>-            '<(deqp_path)/modules/gles31/functional/es31fNegativeShaderFunctionTests.hpp',
>-            '<(deqp_path)/modules/gles31/functional/es31fNegativeShaderImageLoadStoreTests.cpp',
>-            '<(deqp_path)/modules/gles31/functional/es31fNegativeShaderImageLoadStoreTests.hpp',
>-            '<(deqp_path)/modules/gles31/functional/es31fNegativeStateApiTests.cpp',
>-            '<(deqp_path)/modules/gles31/functional/es31fNegativeStateApiTests.hpp',
>-            '<(deqp_path)/modules/gles31/functional/es31fNegativeTestShared.cpp',
>-            '<(deqp_path)/modules/gles31/functional/es31fNegativeTestShared.hpp',
>-            '<(deqp_path)/modules/gles31/functional/es31fNegativeTextureApiTests.cpp',
>-            '<(deqp_path)/modules/gles31/functional/es31fNegativeTextureApiTests.hpp',
>-            '<(deqp_path)/modules/gles31/functional/es31fNegativeVertexArrayApiTests.cpp',
>-            '<(deqp_path)/modules/gles31/functional/es31fNegativeVertexArrayApiTests.hpp',
>-            '<(deqp_path)/modules/gles31/functional/es31fOpaqueTypeIndexingTests.cpp',
>-            '<(deqp_path)/modules/gles31/functional/es31fOpaqueTypeIndexingTests.hpp',
>-            '<(deqp_path)/modules/gles31/functional/es31fPrimitiveBoundingBoxTests.cpp',
>-            '<(deqp_path)/modules/gles31/functional/es31fPrimitiveBoundingBoxTests.hpp',
>-            '<(deqp_path)/modules/gles31/functional/es31fProgramInterfaceDefinition.cpp',
>-            '<(deqp_path)/modules/gles31/functional/es31fProgramInterfaceDefinition.hpp',
>-            '<(deqp_path)/modules/gles31/functional/es31fProgramInterfaceDefinitionUtil.cpp',
>-            '<(deqp_path)/modules/gles31/functional/es31fProgramInterfaceDefinitionUtil.hpp',
>-            '<(deqp_path)/modules/gles31/functional/es31fProgramInterfaceQueryTestCase.cpp',
>-            '<(deqp_path)/modules/gles31/functional/es31fProgramInterfaceQueryTestCase.hpp',
>-            '<(deqp_path)/modules/gles31/functional/es31fProgramInterfaceQueryTests.cpp',
>-            '<(deqp_path)/modules/gles31/functional/es31fProgramInterfaceQueryTests.hpp',
>-            '<(deqp_path)/modules/gles31/functional/es31fProgramPipelineStateQueryTests.cpp',
>-            '<(deqp_path)/modules/gles31/functional/es31fProgramPipelineStateQueryTests.hpp',
>-            '<(deqp_path)/modules/gles31/functional/es31fProgramStateQueryTests.cpp',
>-            '<(deqp_path)/modules/gles31/functional/es31fProgramStateQueryTests.hpp',
>-            '<(deqp_path)/modules/gles31/functional/es31fProgramUniformTests.cpp',
>-            '<(deqp_path)/modules/gles31/functional/es31fProgramUniformTests.hpp',
>-            '<(deqp_path)/modules/gles31/functional/es31fSSBOArrayLengthTests.cpp',
>-            '<(deqp_path)/modules/gles31/functional/es31fSSBOArrayLengthTests.hpp',
>-            '<(deqp_path)/modules/gles31/functional/es31fSSBOLayoutCase.cpp',
>-            '<(deqp_path)/modules/gles31/functional/es31fSSBOLayoutCase.hpp',
>-            '<(deqp_path)/modules/gles31/functional/es31fSSBOLayoutTests.cpp',
>-            '<(deqp_path)/modules/gles31/functional/es31fSSBOLayoutTests.hpp',
>-            '<(deqp_path)/modules/gles31/functional/es31fSampleShadingTests.cpp',
>-            '<(deqp_path)/modules/gles31/functional/es31fSampleShadingTests.hpp',
>-            '<(deqp_path)/modules/gles31/functional/es31fSampleVariableTests.cpp',
>-            '<(deqp_path)/modules/gles31/functional/es31fSampleVariableTests.hpp',
>-            '<(deqp_path)/modules/gles31/functional/es31fSamplerStateQueryTests.cpp',
>-            '<(deqp_path)/modules/gles31/functional/es31fSamplerStateQueryTests.hpp',
>-            '<(deqp_path)/modules/gles31/functional/es31fSeparateShaderTests.cpp',
>-            '<(deqp_path)/modules/gles31/functional/es31fSeparateShaderTests.hpp',
>-            '<(deqp_path)/modules/gles31/functional/es31fShaderAtomicOpTests.cpp',
>-            '<(deqp_path)/modules/gles31/functional/es31fShaderAtomicOpTests.hpp',
>-            '<(deqp_path)/modules/gles31/functional/es31fShaderBuiltinConstantTests.cpp',
>-            '<(deqp_path)/modules/gles31/functional/es31fShaderBuiltinConstantTests.hpp',
>-            '<(deqp_path)/modules/gles31/functional/es31fShaderCommonFunctionTests.cpp',
>-            '<(deqp_path)/modules/gles31/functional/es31fShaderCommonFunctionTests.hpp',
>-            '<(deqp_path)/modules/gles31/functional/es31fShaderHelperInvocationTests.cpp',
>-            '<(deqp_path)/modules/gles31/functional/es31fShaderHelperInvocationTests.hpp',
>-            '<(deqp_path)/modules/gles31/functional/es31fShaderImageLoadStoreTests.cpp',
>-            '<(deqp_path)/modules/gles31/functional/es31fShaderImageLoadStoreTests.hpp',
>-            '<(deqp_path)/modules/gles31/functional/es31fShaderIntegerFunctionTests.cpp',
>-            '<(deqp_path)/modules/gles31/functional/es31fShaderIntegerFunctionTests.hpp',
>-            '<(deqp_path)/modules/gles31/functional/es31fShaderMultisampleInterpolationStateQueryTests.cpp',
>-            '<(deqp_path)/modules/gles31/functional/es31fShaderMultisampleInterpolationStateQueryTests.hpp',
>-            '<(deqp_path)/modules/gles31/functional/es31fShaderMultisampleInterpolationTests.cpp',
>-            '<(deqp_path)/modules/gles31/functional/es31fShaderMultisampleInterpolationTests.hpp',
>-            '<(deqp_path)/modules/gles31/functional/es31fShaderPackingFunctionTests.cpp',
>-            '<(deqp_path)/modules/gles31/functional/es31fShaderPackingFunctionTests.hpp',
>-            '<(deqp_path)/modules/gles31/functional/es31fShaderSharedVarTests.cpp',
>-            '<(deqp_path)/modules/gles31/functional/es31fShaderSharedVarTests.hpp',
>-            '<(deqp_path)/modules/gles31/functional/es31fShaderStateQueryTests.cpp',
>-            '<(deqp_path)/modules/gles31/functional/es31fShaderStateQueryTests.hpp',
>-            '<(deqp_path)/modules/gles31/functional/es31fShaderTextureSizeTests.cpp',
>-            '<(deqp_path)/modules/gles31/functional/es31fShaderTextureSizeTests.hpp',
>-            '<(deqp_path)/modules/gles31/functional/es31fStencilTexturingTests.cpp',
>-            '<(deqp_path)/modules/gles31/functional/es31fStencilTexturingTests.hpp',
>-            '<(deqp_path)/modules/gles31/functional/es31fSynchronizationTests.cpp',
>-            '<(deqp_path)/modules/gles31/functional/es31fSynchronizationTests.hpp',
>-            '<(deqp_path)/modules/gles31/functional/es31fTessellationGeometryInteractionTests.cpp',
>-            '<(deqp_path)/modules/gles31/functional/es31fTessellationGeometryInteractionTests.hpp',
>-            '<(deqp_path)/modules/gles31/functional/es31fTessellationTests.cpp',
>-            '<(deqp_path)/modules/gles31/functional/es31fTessellationTests.hpp',
>-            '<(deqp_path)/modules/gles31/functional/es31fTextureBorderClampTests.cpp',
>-            '<(deqp_path)/modules/gles31/functional/es31fTextureBorderClampTests.hpp',
>-            '<(deqp_path)/modules/gles31/functional/es31fTextureBufferTests.cpp',
>-            '<(deqp_path)/modules/gles31/functional/es31fTextureBufferTests.hpp',
>-            '<(deqp_path)/modules/gles31/functional/es31fTextureFilteringTests.cpp',
>-            '<(deqp_path)/modules/gles31/functional/es31fTextureFilteringTests.hpp',
>-            '<(deqp_path)/modules/gles31/functional/es31fTextureFormatTests.cpp',
>-            '<(deqp_path)/modules/gles31/functional/es31fTextureFormatTests.hpp',
>-            '<(deqp_path)/modules/gles31/functional/es31fTextureGatherTests.cpp',
>-            '<(deqp_path)/modules/gles31/functional/es31fTextureGatherTests.hpp',
>-            '<(deqp_path)/modules/gles31/functional/es31fTextureLevelStateQueryTests.cpp',
>-            '<(deqp_path)/modules/gles31/functional/es31fTextureLevelStateQueryTests.hpp',
>-            '<(deqp_path)/modules/gles31/functional/es31fTextureMultisampleTests.cpp',
>-            '<(deqp_path)/modules/gles31/functional/es31fTextureMultisampleTests.hpp',
>-            '<(deqp_path)/modules/gles31/functional/es31fTextureSpecificationTests.cpp',
>-            '<(deqp_path)/modules/gles31/functional/es31fTextureSpecificationTests.hpp',
>-            '<(deqp_path)/modules/gles31/functional/es31fTextureStateQueryTests.cpp',
>-            '<(deqp_path)/modules/gles31/functional/es31fTextureStateQueryTests.hpp',
>-            '<(deqp_path)/modules/gles31/functional/es31fUniformBlockTests.cpp',
>-            '<(deqp_path)/modules/gles31/functional/es31fUniformBlockTests.hpp',
>-            '<(deqp_path)/modules/gles31/functional/es31fUniformLocationTests.cpp',
>-            '<(deqp_path)/modules/gles31/functional/es31fUniformLocationTests.hpp',
>-            '<(deqp_path)/modules/gles31/functional/es31fVertexAttributeBindingStateQueryTests.cpp',
>-            '<(deqp_path)/modules/gles31/functional/es31fVertexAttributeBindingStateQueryTests.hpp',
>-            '<(deqp_path)/modules/gles31/functional/es31fVertexAttributeBindingTests.cpp',
>-            '<(deqp_path)/modules/gles31/functional/es31fVertexAttributeBindingTests.hpp',
>-            '<(deqp_path)/modules/gles31/stress/es31sDrawTests.cpp',
>-            '<(deqp_path)/modules/gles31/stress/es31sDrawTests.hpp',
>-            '<(deqp_path)/modules/gles31/stress/es31sStressTests.cpp',
>-            '<(deqp_path)/modules/gles31/stress/es31sStressTests.hpp',
>-            '<(deqp_path)/modules/gles31/stress/es31sTessellationGeometryInteractionTests.cpp',
>-            '<(deqp_path)/modules/gles31/stress/es31sTessellationGeometryInteractionTests.hpp',
>-            '<(deqp_path)/modules/gles31/stress/es31sVertexAttributeBindingTests.cpp',
>-            '<(deqp_path)/modules/gles31/stress/es31sVertexAttributeBindingTests.hpp',
>-            '<(deqp_path)/modules/gles31/tes31Context.cpp',
>-            '<(deqp_path)/modules/gles31/tes31Context.hpp',
>-            '<(deqp_path)/modules/gles31/tes31InfoTests.cpp',
>-            '<(deqp_path)/modules/gles31/tes31InfoTests.hpp',
>-            '<(deqp_path)/modules/gles31/tes31TestCase.cpp',
>-            '<(deqp_path)/modules/gles31/tes31TestCase.hpp',
>-            '<(deqp_path)/modules/gles31/tes31TestPackage.cpp',
>-            '<(deqp_path)/modules/gles31/tes31TestPackage.hpp',
>-            '<(deqp_path)/modules/gles31/tes31TestPackageEntry.cpp'
>-        ],
>-        'deqp_egl_sources':
>-        [
>-            '<(deqp_path)/modules/egl/teglAndroidUtil.cpp',
>-            '<(deqp_path)/modules/egl/teglAndroidUtil.hpp',
>-            '<(deqp_path)/modules/egl/teglApiCase.cpp',
>-            '<(deqp_path)/modules/egl/teglApiCase.hpp',
>-            '<(deqp_path)/modules/egl/teglBufferAgeTests.cpp',
>-            '<(deqp_path)/modules/egl/teglBufferAgeTests.hpp',
>-            '<(deqp_path)/modules/egl/teglChooseConfigReference.cpp',
>-            '<(deqp_path)/modules/egl/teglChooseConfigReference.hpp',
>-            '<(deqp_path)/modules/egl/teglChooseConfigTests.cpp',
>-            '<(deqp_path)/modules/egl/teglChooseConfigTests.hpp',
>-            '<(deqp_path)/modules/egl/teglClientExtensionTests.cpp',
>-            '<(deqp_path)/modules/egl/teglClientExtensionTests.hpp',
>-            '<(deqp_path)/modules/egl/teglColorClearCase.cpp',
>-            '<(deqp_path)/modules/egl/teglColorClearCase.hpp',
>-            '<(deqp_path)/modules/egl/teglColorClearTests.cpp',
>-            '<(deqp_path)/modules/egl/teglColorClearTests.hpp',
>-            '<(deqp_path)/modules/egl/teglConfigList.cpp',
>-            '<(deqp_path)/modules/egl/teglConfigList.hpp',
>-            '<(deqp_path)/modules/egl/teglCreateContextExtTests.cpp',
>-            '<(deqp_path)/modules/egl/teglCreateContextExtTests.hpp',
>-            '<(deqp_path)/modules/egl/teglCreateContextTests.cpp',
>-            '<(deqp_path)/modules/egl/teglCreateContextTests.hpp',
>-            '<(deqp_path)/modules/egl/teglCreateSurfaceTests.cpp',
>-            '<(deqp_path)/modules/egl/teglCreateSurfaceTests.hpp',
>-            '<(deqp_path)/modules/egl/teglGetProcAddressTests.cpp',
>-            '<(deqp_path)/modules/egl/teglGetProcAddressTests.hpp',
>-            '<(deqp_path)/modules/egl/teglGLES1RenderUtil.cpp',
>-            '<(deqp_path)/modules/egl/teglGLES1RenderUtil.hpp',
>-            '<(deqp_path)/modules/egl/teglGLES2RenderUtil.cpp',
>-            '<(deqp_path)/modules/egl/teglGLES2RenderUtil.hpp',
>-            '<(deqp_path)/modules/egl/teglGLES2SharedRenderingPerfTests.cpp',
>-            '<(deqp_path)/modules/egl/teglGLES2SharedRenderingPerfTests.hpp',
>-            '<(deqp_path)/modules/egl/teglGLES2SharingTests.cpp',
>-            '<(deqp_path)/modules/egl/teglGLES2SharingTests.hpp',
>-            '<(deqp_path)/modules/egl/teglGLES2SharingThreadedTests.cpp',
>-            '<(deqp_path)/modules/egl/teglGLES2SharingThreadedTests.hpp',
>-            '<(deqp_path)/modules/egl/teglImageFormatTests.cpp',
>-            '<(deqp_path)/modules/egl/teglImageFormatTests.hpp',
>-            '<(deqp_path)/modules/egl/teglImageTests.cpp',
>-            '<(deqp_path)/modules/egl/teglImageTests.hpp',
>-            '<(deqp_path)/modules/egl/teglImageUtil.cpp',
>-            '<(deqp_path)/modules/egl/teglImageUtil.hpp',
>-            '<(deqp_path)/modules/egl/teglInfoTests.cpp',
>-            '<(deqp_path)/modules/egl/teglInfoTests.hpp',
>-            '<(deqp_path)/modules/egl/teglMakeCurrentPerfTests.cpp',
>-            '<(deqp_path)/modules/egl/teglMakeCurrentPerfTests.hpp',
>-            '<(deqp_path)/modules/egl/teglMemoryStressTests.cpp',
>-            '<(deqp_path)/modules/egl/teglMemoryStressTests.hpp',
>-            '<(deqp_path)/modules/egl/teglMultiContextTests.cpp',
>-            '<(deqp_path)/modules/egl/teglMultiContextTests.hpp',
>-            '<(deqp_path)/modules/egl/teglMultiThreadTests.cpp',
>-            '<(deqp_path)/modules/egl/teglMultiThreadTests.hpp',
>-            '<(deqp_path)/modules/egl/teglMutableRenderBufferTests.cpp',
>-            '<(deqp_path)/modules/egl/teglMutableRenderBufferTests.hpp',
>-            '<(deqp_path)/modules/egl/teglNativeColorMappingTests.cpp',
>-            '<(deqp_path)/modules/egl/teglNativeColorMappingTests.hpp',
>-            '<(deqp_path)/modules/egl/teglNativeCoordMappingTests.cpp',
>-            '<(deqp_path)/modules/egl/teglNativeCoordMappingTests.hpp',
>-            '<(deqp_path)/modules/egl/teglNegativeApiTests.cpp',
>-            '<(deqp_path)/modules/egl/teglNegativeApiTests.hpp',
>-            '<(deqp_path)/modules/egl/teglNegativePartialUpdateTests.cpp',
>-            '<(deqp_path)/modules/egl/teglNegativePartialUpdateTests.hpp',
>-            '<(deqp_path)/modules/egl/teglPreservingSwapTests.cpp',
>-            '<(deqp_path)/modules/egl/teglPreservingSwapTests.hpp',
>-            '<(deqp_path)/modules/egl/teglPartialUpdateTests.cpp',
>-            '<(deqp_path)/modules/egl/teglPartialUpdateTests.hpp',
>-            '<(deqp_path)/modules/egl/teglQueryConfigTests.cpp',
>-            '<(deqp_path)/modules/egl/teglQueryConfigTests.hpp',
>-            '<(deqp_path)/modules/egl/teglQueryContextTests.cpp',
>-            '<(deqp_path)/modules/egl/teglQueryContextTests.hpp',
>-            '<(deqp_path)/modules/egl/teglQuerySurfaceTests.cpp',
>-            '<(deqp_path)/modules/egl/teglQuerySurfaceTests.hpp',
>-            '<(deqp_path)/modules/egl/teglRenderCase.cpp',
>-            '<(deqp_path)/modules/egl/teglRenderCase.hpp',
>-            '<(deqp_path)/modules/egl/teglRenderTests.cpp',
>-            '<(deqp_path)/modules/egl/teglRenderTests.hpp',
>-            '<(deqp_path)/modules/egl/teglResizeTests.cpp',
>-            '<(deqp_path)/modules/egl/teglResizeTests.hpp',
>-            '<(deqp_path)/modules/egl/teglSimpleConfigCase.cpp',
>-            '<(deqp_path)/modules/egl/teglSimpleConfigCase.hpp',
>-            '<(deqp_path)/modules/egl/teglSurfacelessContextTests.cpp',
>-            '<(deqp_path)/modules/egl/teglSurfacelessContextTests.hpp',
>-            '<(deqp_path)/modules/egl/teglSwapBuffersTests.cpp',
>-            '<(deqp_path)/modules/egl/teglSwapBuffersTests.hpp',
>-            '<(deqp_path)/modules/egl/teglSwapBuffersWithDamageTests.cpp',
>-            '<(deqp_path)/modules/egl/teglSwapBuffersWithDamageTests.hpp',
>-            '<(deqp_path)/modules/egl/teglSyncTests.cpp',
>-            '<(deqp_path)/modules/egl/teglSyncTests.hpp',
>-            '<(deqp_path)/modules/egl/teglTestCase.cpp',
>-            '<(deqp_path)/modules/egl/teglTestCase.hpp',
>-            '<(deqp_path)/modules/egl/teglTestPackage.cpp',
>-            '<(deqp_path)/modules/egl/teglTestPackage.hpp',
>-            '<(deqp_path)/modules/egl/teglTestPackageEntry.cpp',
>-            '<(deqp_path)/modules/egl/teglThreadCleanUpTests.cpp',
>-            '<(deqp_path)/modules/egl/teglThreadCleanUpTests.hpp',
>-            '<(deqp_path)/modules/egl/teglVGRenderUtil.cpp',
>-            '<(deqp_path)/modules/egl/teglVGRenderUtil.hpp',
>-        ],
>-        'deqp_libtester_decpp_sources':
>-        [
>-            '<(deqp_path)/framework/delibs/decpp/deArrayBuffer.cpp',
>-            '<(deqp_path)/framework/delibs/decpp/deBlockBuffer.cpp',
>-            '<(deqp_path)/framework/delibs/decpp/deCommandLine.cpp',
>-            '<(deqp_path)/framework/delibs/decpp/deDefs.cpp',
>-            '<(deqp_path)/framework/delibs/decpp/deDirectoryIterator.cpp',
>-            '<(deqp_path)/framework/delibs/decpp/deDynamicLibrary.cpp',
>-            '<(deqp_path)/framework/delibs/decpp/deFilePath.cpp',
>-            '<(deqp_path)/framework/delibs/decpp/deMemPool.cpp',
>-            '<(deqp_path)/framework/delibs/decpp/deMutex.cpp',
>-            '<(deqp_path)/framework/delibs/decpp/dePoolArray.cpp',
>-            '<(deqp_path)/framework/delibs/decpp/dePoolString.cpp',
>-            '<(deqp_path)/framework/delibs/decpp/deProcess.cpp',
>-            '<(deqp_path)/framework/delibs/decpp/deRandom.cpp',
>-            '<(deqp_path)/framework/delibs/decpp/deRingBuffer.cpp',
>-            '<(deqp_path)/framework/delibs/decpp/deSemaphore.cpp',
>-            '<(deqp_path)/framework/delibs/decpp/deSharedPtr.cpp',
>-            '<(deqp_path)/framework/delibs/decpp/deSha1.cpp',
>-            '<(deqp_path)/framework/delibs/decpp/deSocket.cpp',
>-            '<(deqp_path)/framework/delibs/decpp/deSTLUtil.cpp',
>-            '<(deqp_path)/framework/delibs/decpp/deStringUtil.cpp',
>-            '<(deqp_path)/framework/delibs/decpp/deThread.cpp',
>-            '<(deqp_path)/framework/delibs/decpp/deThreadLocal.cpp',
>-            '<(deqp_path)/framework/delibs/decpp/deThreadSafeRingBuffer.cpp',
>-            '<(deqp_path)/framework/delibs/decpp/deUniquePtr.cpp',
>-        ],
>-        'deqp_libtester_sources':
>-        [
>-            '<(deqp_path)/execserver/xsDefs.cpp',
>-            '<(deqp_path)/execserver/xsExecutionServer.cpp',
>-            '<(deqp_path)/execserver/xsPosixFileReader.cpp',
>-            '<(deqp_path)/execserver/xsPosixTestProcess.cpp',
>-            '<(deqp_path)/execserver/xsProtocol.cpp',
>-            '<(deqp_path)/execserver/xsTcpServer.cpp',
>-            '<(deqp_path)/execserver/xsTestDriver.cpp',
>-            '<(deqp_path)/execserver/xsTestProcess.cpp',
>-            '<(deqp_path)/executor/xeBatchExecutor.cpp',
>-            '<(deqp_path)/executor/xeBatchResult.cpp',
>-            '<(deqp_path)/executor/xeCallQueue.cpp',
>-            '<(deqp_path)/executor/xeCommLink.cpp',
>-            '<(deqp_path)/executor/xeContainerFormatParser.cpp',
>-            '<(deqp_path)/executor/xeDefs.cpp',
>-            '<(deqp_path)/executor/xeLocalTcpIpLink.cpp',
>-            '<(deqp_path)/executor/xeTcpIpLink.cpp',
>-            '<(deqp_path)/executor/xeTestCase.cpp',
>-            '<(deqp_path)/executor/xeTestCaseListParser.cpp',
>-            '<(deqp_path)/executor/xeTestCaseResult.cpp',
>-            '<(deqp_path)/executor/xeTestLogParser.cpp',
>-            '<(deqp_path)/executor/xeTestLogWriter.cpp',
>-            '<(deqp_path)/executor/xeTestResultParser.cpp',
>-            '<(deqp_path)/executor/xeXMLParser.cpp',
>-            '<(deqp_path)/executor/xeXMLWriter.cpp',
>-            '<(deqp_path)/framework/common/tcuApp.cpp',
>-            '<(deqp_path)/framework/common/tcuAstcUtil.cpp',
>-            '<(deqp_path)/framework/common/tcuBilinearImageCompare.cpp',
>-            '<(deqp_path)/framework/common/tcuCommandLine.cpp',
>-            '<(deqp_path)/framework/common/tcuCompressedTexture.cpp',
>-            '<(deqp_path)/framework/common/tcuCPUWarmup.cpp',
>-            '<(deqp_path)/framework/common/tcuDefs.cpp',
>-            '<(deqp_path)/framework/common/tcuEither.cpp',
>-            '<(deqp_path)/framework/common/tcuFactoryRegistry.cpp',
>-            '<(deqp_path)/framework/common/tcuFloatFormat.cpp',
>-            '<(deqp_path)/framework/common/tcuFunctionLibrary.cpp',
>-            '<(deqp_path)/framework/common/tcuFuzzyImageCompare.cpp',
>-            '<(deqp_path)/framework/common/tcuImageCompare.cpp',
>-            '<(deqp_path)/framework/common/tcuImageIO.cpp',
>-            '<(deqp_path)/framework/common/tcuInterval.cpp',
>-            '<(deqp_path)/framework/common/tcuPlatform.cpp',
>-            '<(deqp_path)/framework/common/tcuRandomValueIterator.cpp',
>-            '<(deqp_path)/framework/common/tcuRasterizationVerifier.cpp',
>-            '<(deqp_path)/framework/common/tcuRasterizationVerifier.hpp',
>-            '<(deqp_path)/framework/common/tcuRenderTarget.cpp',
>-            '<(deqp_path)/framework/common/tcuResource.cpp',
>-            '<(deqp_path)/framework/common/tcuResultCollector.cpp',
>-            '<(deqp_path)/framework/common/tcuRGBA.cpp',
>-            '<(deqp_path)/framework/common/tcuStringTemplate.cpp',
>-            '<(deqp_path)/framework/common/tcuSurface.cpp',
>-            '<(deqp_path)/framework/common/tcuSurfaceAccess.cpp',
>-            '<(deqp_path)/framework/common/tcuSurfaceAccess.hpp',
>-            '<(deqp_path)/framework/common/tcuTestCase.cpp',
>-            '<(deqp_path)/framework/common/tcuTestContext.cpp',
>-            '<(deqp_path)/framework/common/tcuTestHierarchyIterator.cpp',
>-            '<(deqp_path)/framework/common/tcuTestHierarchyUtil.cpp',
>-            '<(deqp_path)/framework/common/tcuTestLog.cpp',
>-            '<(deqp_path)/framework/common/tcuTestPackage.cpp',
>-            '<(deqp_path)/framework/common/tcuTestSessionExecutor.cpp',
>-            '<(deqp_path)/framework/common/tcuTexCompareVerifier.cpp',
>-            '<(deqp_path)/framework/common/tcuTexLookupVerifier.cpp',
>-            '<(deqp_path)/framework/common/tcuTexture.cpp',
>-            '<(deqp_path)/framework/common/tcuTextureUtil.cpp',
>-            '<(deqp_path)/framework/common/tcuTexVerifierUtil.cpp',
>-            '<(deqp_path)/framework/common/tcuThreadUtil.cpp',
>-            '<(deqp_path)/framework/common/tcuSeedBuilder.cpp',
>-            '<(deqp_path)/framework/delibs/debase/deDefs.c',
>-            '<(deqp_path)/framework/delibs/debase/deFloat16.c',
>-            '<(deqp_path)/framework/delibs/debase/deInt32.c',
>-            '<(deqp_path)/framework/delibs/debase/deInt32Test.c',
>-            '<(deqp_path)/framework/delibs/debase/deMath.c',
>-            '<(deqp_path)/framework/delibs/debase/deMemory.c',
>-            '<(deqp_path)/framework/delibs/debase/deRandom.c',
>-            '<(deqp_path)/framework/delibs/debase/deString.c',
>-            '<(deqp_path)/framework/delibs/debase/deSha1.c',
>-            '<(deqp_path)/framework/delibs/deimage/deImage.c',
>-            '<(deqp_path)/framework/delibs/deimage/deTarga.c',
>-            '<(deqp_path)/framework/delibs/depool/deMemPool.c',
>-            '<(deqp_path)/framework/delibs/depool/dePoolArray.c',
>-            '<(deqp_path)/framework/delibs/depool/dePoolHashArray.c',
>-            '<(deqp_path)/framework/delibs/depool/dePoolHash.c',
>-            '<(deqp_path)/framework/delibs/depool/dePoolHashSet.c',
>-            '<(deqp_path)/framework/delibs/depool/dePoolHeap.c',
>-            '<(deqp_path)/framework/delibs/depool/dePoolMultiSet.c',
>-            '<(deqp_path)/framework/delibs/depool/dePoolSet.c',
>-            '<(deqp_path)/framework/delibs/depool/dePoolStringBuilder.c',
>-            '<(deqp_path)/framework/delibs/depool/dePoolTest.c',
>-            '<(deqp_path)/framework/delibs/destream/deFileStream.c',
>-            '<(deqp_path)/framework/delibs/destream/deRingbuffer.c',
>-            '<(deqp_path)/framework/delibs/destream/deStreamCpyThread.c',
>-            '<(deqp_path)/framework/delibs/destream/deThreadStream.c',
>-            '<(deqp_path)/framework/delibs/dethread/deAtomic.c',
>-            '<(deqp_path)/framework/delibs/dethread/deSingleton.c',
>-            '<(deqp_path)/framework/delibs/dethread/deThreadTest.c',
>-            '<(deqp_path)/framework/delibs/deutil/deClock.c',
>-            '<(deqp_path)/framework/delibs/deutil/deCommandLine.c',
>-            '<(deqp_path)/framework/delibs/deutil/deDynamicLibrary.c',
>-            '<(deqp_path)/framework/delibs/deutil/deFile.c',
>-            '<(deqp_path)/framework/delibs/deutil/deProcess.c',
>-            '<(deqp_path)/framework/delibs/deutil/deSocket.c',
>-            '<(deqp_path)/framework/delibs/deutil/deTimer.c',
>-            '<(deqp_path)/framework/delibs/deutil/deTimerTest.c',
>-            '<(deqp_path)/framework/egl/egluCallLogWrapper.cpp',
>-            '<(deqp_path)/framework/egl/egluConfigFilter.cpp',
>-            '<(deqp_path)/framework/egl/egluConfigInfo.cpp',
>-            '<(deqp_path)/framework/egl/egluDefs.cpp',
>-            '<(deqp_path)/framework/egl/egluGLContextFactory.cpp',
>-            '<(deqp_path)/framework/egl/egluGLFunctionLoader.cpp',
>-            '<(deqp_path)/framework/egl/egluGLUtil.cpp',
>-            '<(deqp_path)/framework/egl/egluNativeDisplay.cpp',
>-            '<(deqp_path)/framework/egl/egluNativePixmap.cpp',
>-            '<(deqp_path)/framework/egl/egluNativeWindow.cpp',
>-            '<(deqp_path)/framework/egl/egluPlatform.cpp',
>-            '<(deqp_path)/framework/egl/egluStaticESLibrary.cpp',
>-            '<(deqp_path)/framework/egl/egluStrUtil.cpp',
>-            '<(deqp_path)/framework/egl/egluUnique.cpp',
>-            '<(deqp_path)/framework/egl/egluUtil.cpp',
>-            '<(deqp_path)/framework/egl/wrapper/eglwDefs.cpp',
>-            '<(deqp_path)/framework/egl/wrapper/eglwFunctions.cpp',
>-            '<(deqp_path)/framework/egl/wrapper/eglwLibrary.cpp',
>-            '<(deqp_path)/framework/opengl/gluCallLogWrapper.cpp',
>-            '<(deqp_path)/framework/opengl/gluContextFactory.cpp',
>-            '<(deqp_path)/framework/opengl/gluContextInfo.cpp',
>-            '<(deqp_path)/framework/opengl/gluDefs.cpp',
>-            '<(deqp_path)/framework/opengl/gluDrawUtil.cpp',
>-            '<(deqp_path)/framework/opengl/gluDummyRenderContext.cpp',
>-            '<(deqp_path)/framework/opengl/gluES3PlusWrapperContext.cpp',
>-            '<(deqp_path)/framework/opengl/gluFboRenderContext.cpp',
>-            '<(deqp_path)/framework/opengl/gluObjectWrapper.cpp',
>-            '<(deqp_path)/framework/opengl/gluPixelTransfer.cpp',
>-            '<(deqp_path)/framework/opengl/gluPlatform.cpp',
>-            '<(deqp_path)/framework/opengl/gluProgramInterfaceQuery.cpp',
>-            '<(deqp_path)/framework/opengl/gluRenderConfig.cpp',
>-            '<(deqp_path)/framework/opengl/gluRenderContext.cpp',
>-            '<(deqp_path)/framework/opengl/gluShaderLibrary.cpp',
>-            '<(deqp_path)/framework/opengl/gluShaderProgram.cpp',
>-            '<(deqp_path)/framework/opengl/gluShaderUtil.cpp',
>-            '<(deqp_path)/framework/opengl/gluStateReset.cpp',
>-            '<(deqp_path)/framework/opengl/gluStrUtil.cpp',
>-            '<(deqp_path)/framework/opengl/gluTexture.cpp',
>-            '<(deqp_path)/framework/opengl/gluTextureUtil.cpp',
>-            '<(deqp_path)/framework/opengl/gluTextureTestUtil.cpp',
>-            '<(deqp_path)/framework/opengl/gluTextureTestUtil.hpp',
>-            '<(deqp_path)/framework/opengl/gluVarType.cpp',
>-            '<(deqp_path)/framework/opengl/gluVarTypeUtil.cpp',
>-            '<(deqp_path)/framework/opengl/simplereference/sglrContext.cpp',
>-            '<(deqp_path)/framework/opengl/simplereference/sglrContextUtil.cpp',
>-            '<(deqp_path)/framework/opengl/simplereference/sglrContextWrapper.cpp',
>-            '<(deqp_path)/framework/opengl/simplereference/sglrGLContext.cpp',
>-            '<(deqp_path)/framework/opengl/simplereference/sglrReferenceContext.cpp',
>-            '<(deqp_path)/framework/opengl/simplereference/sglrReferenceUtils.cpp',
>-            '<(deqp_path)/framework/opengl/simplereference/sglrShaderProgram.cpp',
>-            '<(deqp_path)/framework/opengl/wrapper/glwDefs.cpp',
>-            '<(deqp_path)/framework/opengl/wrapper/glwFunctions.cpp',
>-            '<(deqp_path)/framework/opengl/wrapper/glwInitES20Direct.cpp',
>-            '<(deqp_path)/framework/opengl/wrapper/glwInitES30Direct.cpp',
>-            '<(deqp_path)/framework/opengl/wrapper/glwInitFunctions.cpp',
>-            '<(deqp_path)/framework/opengl/wrapper/glwWrapper.cpp',
>-            '<(deqp_path)/framework/platform/null/tcuNullContextFactory.cpp',
>-            '<(deqp_path)/framework/platform/null/tcuNullContextFactory.hpp',
>-            '<(deqp_path)/framework/platform/null/tcuNullRenderContext.cpp',
>-            '<(deqp_path)/framework/qphelper/qpCrashHandler.c',
>-            '<(deqp_path)/framework/qphelper/qpDebugOut.c',
>-            '<(deqp_path)/framework/qphelper/qpInfo.c',
>-            # TODO(jmadill): Restore this when we upstream the change.
>-            #'<(deqp_path)/framework/qphelper/qpTestLog.c',
>-            '<(deqp_path)/framework/qphelper/qpWatchDog.c',
>-            '<(deqp_path)/framework/qphelper/qpXmlWriter.c',
>-            '<(deqp_path)/framework/randomshaders/rsgBinaryOps.cpp',
>-            '<(deqp_path)/framework/randomshaders/rsgBuiltinFunctions.cpp',
>-            '<(deqp_path)/framework/randomshaders/rsgDefs.cpp',
>-            '<(deqp_path)/framework/randomshaders/rsgExecutionContext.cpp',
>-            '<(deqp_path)/framework/randomshaders/rsgExpression.cpp',
>-            '<(deqp_path)/framework/randomshaders/rsgExpressionGenerator.cpp',
>-            '<(deqp_path)/framework/randomshaders/rsgFunctionGenerator.cpp',
>-            '<(deqp_path)/framework/randomshaders/rsgGeneratorState.cpp',
>-            '<(deqp_path)/framework/randomshaders/rsgNameAllocator.cpp',
>-            '<(deqp_path)/framework/randomshaders/rsgParameters.cpp',
>-            '<(deqp_path)/framework/randomshaders/rsgPrettyPrinter.cpp',
>-            '<(deqp_path)/framework/randomshaders/rsgProgramExecutor.cpp',
>-            '<(deqp_path)/framework/randomshaders/rsgProgramGenerator.cpp',
>-            '<(deqp_path)/framework/randomshaders/rsgSamplers.cpp',
>-            '<(deqp_path)/framework/randomshaders/rsgShader.cpp',
>-            '<(deqp_path)/framework/randomshaders/rsgShaderGenerator.cpp',
>-            '<(deqp_path)/framework/randomshaders/rsgStatement.cpp',
>-            '<(deqp_path)/framework/randomshaders/rsgToken.cpp',
>-            '<(deqp_path)/framework/randomshaders/rsgUtils.cpp',
>-            '<(deqp_path)/framework/randomshaders/rsgVariable.cpp',
>-            '<(deqp_path)/framework/randomshaders/rsgVariableManager.cpp',
>-            '<(deqp_path)/framework/randomshaders/rsgVariableType.cpp',
>-            '<(deqp_path)/framework/randomshaders/rsgVariableValue.cpp',
>-            '<(deqp_path)/framework/referencerenderer/rrDefs.cpp',
>-            '<(deqp_path)/framework/referencerenderer/rrFragmentOperations.cpp',
>-            '<(deqp_path)/framework/referencerenderer/rrMultisamplePixelBufferAccess.cpp',
>-            '<(deqp_path)/framework/referencerenderer/rrPrimitivePacket.cpp',
>-            '<(deqp_path)/framework/referencerenderer/rrRasterizer.cpp',
>-            '<(deqp_path)/framework/referencerenderer/rrRenderer.cpp',
>-            '<(deqp_path)/framework/referencerenderer/rrShaders.cpp',
>-            '<(deqp_path)/framework/referencerenderer/rrShadingContext.cpp',
>-            '<(deqp_path)/framework/referencerenderer/rrVertexAttrib.cpp',
>-            '<(deqp_path)/framework/referencerenderer/rrVertexPacket.cpp',
>-            '<(deqp_path)/modules/glshared/glsAttributeLocationTests.cpp',
>-            '<(deqp_path)/modules/glshared/glsBufferTestUtil.cpp',
>-            '<(deqp_path)/modules/glshared/glsBuiltinPrecisionTests.cpp',
>-            '<(deqp_path)/modules/glshared/glsCalibration.cpp',
>-            '<(deqp_path)/modules/glshared/glsDrawTest.cpp',
>-            '<(deqp_path)/modules/glshared/glsFboCompletenessTests.cpp',
>-            '<(deqp_path)/modules/glshared/glsFboUtil.cpp',
>-            '<(deqp_path)/modules/glshared/glsFragmentOpUtil.cpp',
>-            '<(deqp_path)/modules/glshared/glsFragOpInteractionCase.cpp',
>-            '<(deqp_path)/modules/glshared/glsInteractionTestUtil.cpp',
>-            '<(deqp_path)/modules/glshared/glsLifetimeTests.cpp',
>-            '<(deqp_path)/modules/glshared/glsLongStressCase.cpp',
>-            '<(deqp_path)/modules/glshared/glsLongStressTestUtil.cpp',
>-            '<(deqp_path)/modules/glshared/glsMemoryStressCase.cpp',
>-            '<(deqp_path)/modules/glshared/glsRandomShaderCase.cpp',
>-            '<(deqp_path)/modules/glshared/glsRandomShaderProgram.cpp',
>-            '<(deqp_path)/modules/glshared/glsRandomUniformBlockCase.cpp',
>-            '<(deqp_path)/modules/glshared/glsSamplerObjectTest.cpp',
>-            '<(deqp_path)/modules/glshared/glsScissorTests.cpp',
>-            '<(deqp_path)/modules/glshared/glsShaderConstExprTests.cpp',
>-            '<(deqp_path)/modules/glshared/glsShaderExecUtil.cpp',
>-            '<(deqp_path)/modules/glshared/glsShaderLibraryCase.cpp',
>-            '<(deqp_path)/modules/glshared/glsShaderLibrary.cpp',
>-            '<(deqp_path)/modules/glshared/glsShaderPerformanceCase.cpp',
>-            '<(deqp_path)/modules/glshared/glsShaderPerformanceMeasurer.cpp',
>-            '<(deqp_path)/modules/glshared/glsShaderRenderCase.cpp',
>-            '<(deqp_path)/modules/glshared/glsStateQueryUtil.cpp',
>-            '<(deqp_path)/modules/glshared/glsStateChangePerfTestCases.cpp',
>-            '<(deqp_path)/modules/glshared/glsTextureBufferCase.cpp',
>-            '<(deqp_path)/modules/glshared/glsTextureStateQueryTests.cpp',
>-            '<(deqp_path)/modules/glshared/glsTextureTestUtil.cpp',
>-            '<(deqp_path)/modules/glshared/glsUniformBlockCase.cpp',
>-            '<(deqp_path)/modules/glshared/glsVertexArrayTests.cpp',
>-            # TODO(jmadill): Remove this when we upstream the change.
>-            '<(angle_path)/src/tests/deqp_support/qpTestLog.c',
>-            '<(angle_path)/src/tests/deqp_support/tcuANGLENativeDisplayFactory.cpp',
>-            '<(angle_path)/src/tests/deqp_support/tcuANGLENativeDisplayFactory.h',
>-            # TODO(jmadill): integrate with dEQP
>-            '<(angle_path)/src/tests/deqp_support/tcuRandomOrderExecutor.cpp',
>-            '<(angle_path)/src/tests/deqp_support/tcuRandomOrderExecutor.h',
>-        ],
>-        'deqp_libtester_sources_win':
>-        [
>-            '<(deqp_path)/framework/delibs/dethread/win32/deMutexWin32.c',
>-            '<(deqp_path)/framework/delibs/dethread/win32/deSemaphoreWin32.c',
>-            '<(deqp_path)/framework/delibs/dethread/win32/deThreadLocalWin32.c',
>-            '<(deqp_path)/framework/delibs/dethread/win32/deThreadWin32.c',
>-        ],
>-        'deqp_libtester_sources_unix':
>-        [
>-            '<(deqp_path)/framework/delibs/dethread/unix/deMutexUnix.c',
>-            '<(deqp_path)/framework/delibs/dethread/unix/deNamedSemaphoreUnix.c',
>-            '<(deqp_path)/framework/delibs/dethread/unix/deSemaphoreUnix.c',
>-            '<(deqp_path)/framework/delibs/dethread/unix/deThreadLocalUnix.c',
>-            '<(deqp_path)/framework/delibs/dethread/unix/deThreadUnix.c',
>-        ],
>-        'deqp_libtester_sources_android':
>-        [
>-            '<(deqp_path)/framework/platform/android/tcuAndroidInternals.cpp',
>-            '<(deqp_path)/framework/platform/android/tcuAndroidInternals.hpp',
>-        ],
>-        'deqp_gpu_test_expectations_sources':
>-        [
>-            'third_party/gpu_test_expectations/gpu_info.cc',
>-            'third_party/gpu_test_expectations/gpu_info.h',
>-            'third_party/gpu_test_expectations/gpu_test_config.cc',
>-            'third_party/gpu_test_expectations/gpu_test_config.h',
>-            'third_party/gpu_test_expectations/gpu_test_expectations_parser.cc',
>-            'third_party/gpu_test_expectations/gpu_test_expectations_parser.h',
>-        ],
>-        'deqp_gpu_test_expectations_sources_mac':
>-        [
>-            'third_party/gpu_test_expectations/gpu_test_config_mac.mm',
>-            'third_party/gpu_test_expectations/gpu_test_config_mac.h',
>-        ],
>-        'conditions':
>-        [
>-            ['(OS=="win" or OS=="linux" or OS=="mac")',
>-            {
>-                # Build the dEQP libraries for all Windows/Linux builds
>-                'angle_build_deqp_libraries%': 1,
>-            }],
>-            ['((OS=="win" or OS=="linux" or OS=="mac") and angle_build_winrt==0)',
>-            {
>-                # Build the dEQP GoogleTest support helpers for all Windows/Linux builds except WinRT
>-                # GoogleTest doesn't support WinRT
>-                'angle_build_deqp_gtest_support%': 1,
>-            }],
>-            ['((OS=="win" or OS=="linux" or OS=="mac") and angle_build_winrt==0)',
>-            {
>-                # Build the dEQP executables for all standalone Windows/Linux builds except WinRT
>-                # GYP doesn't support generating standalone WinRT executables
>-                'angle_build_deqp_executables%': 1,
>-
>-                # Build the GoogleTest versions of dEQP for all standalone Windows/Linux builds except WinRT
>-                # GoogleTest doesn't support WinRT
>-                'angle_build_deqp_gtest_executables%': 1,
>-            }],
>-            ['OS=="linux" and use_x11==1',
>-            {
>-                'deqp_include_dirs':
>-                [
>-                    '<(deqp_path)/framework/platform/x11',
>-                ],
>-            }],
>-            ['OS=="linux"',
>-            {
>-                'deqp_defines':
>-                [
>-                    # Ask the system headers to expose all the regular function otherwise
>-                    # dEQP doesn't compile and produces warnings about implicitly defined
>-                    # functions.
>-                    # This has to be GNU_SOURCE as on Linux dEQP uses syscall()
>-                    '_GNU_SOURCE',
>-                ],
>-            }],
>-            ['OS=="mac"',
>-            {
>-                'deqp_include_dirs':
>-                [
>-                    '<(deqp_path)/framework/platform/osx',
>-                ],
>-                'deqp_defines':
>-                [
>-                    # Ask the system headers to expose all the regular function otherwise
>-                    # dEQP doesn't compile and produces warnings about implicitly defined
>-                    # functions.
>-                    '_XOPEN_SOURCE=600',
>-                ],
>-            }],
>-            ['use_ozone==1',
>-            {
>-                'deqp_defines':
>-                [
>-                    'ANGLE_USE_OZONE',
>-                ],
>-            }],
>-        ],
>-    },
>-    'conditions':
>-    [
>-        ['angle_build_deqp_libraries==1',
>-        {
>-            'targets':
>-            [
>-                {
>-                    'target_name': 'angle_zlib',
>-                    'type': 'static_library',
>-                    'includes': [ '../../gyp/common_defines.gypi', ],
>-                    'include_dirs':
>-                    [
>-                        '<(zlib_path)',
>-                    ],
>-                    'direct_dependent_settings':
>-                    {
>-                        'include_dirs':
>-                        [
>-                            '<(zlib_path)',
>-                        ],
>-                    },
>-                    'msvs_settings':
>-                    {
>-                        'VCCLCompilerTool':
>-                        {
>-                            'AdditionalOptions':
>-                            [
>-                                '/wd4131', # old-style declarator
>-                                '/wd4244', # Conversion from 'type1' to 'type2', possible loss of data
>-                                '/wd4245', # argument signed/unsigned mismatch
>-                                '/wd4267', # size_t to 'type', possible loss of data
>-                                '/wd4324', # structure was padded
>-                                '/wd4701', # potentially uninit used
>-                                '/wd4996', # deprecated
>-                            ],
>-                        },
>-                    },
>-                    'conditions':
>-                    [
>-                        ['angle_build_winrt==1',
>-                        {
>-                            # In zlib, deflate.c/insert_string_sse assumes _MSC_VER is only used for x86 or x64
>-                            # To compile this function for ARM using MSC, we trick it by defining __clang__
>-                            # __clang__ isn't used elsewhere zlib, so this workaround shouldn't impact anything else
>-                            'defines':
>-                            [
>-                                '__clang__',
>-                            ],
>-                        }],
>-                    ],
>-                    'sources':
>-                    [
>-                        '<(zlib_path)/adler32.c',
>-                        '<(zlib_path)/compress.c',
>-                        '<(zlib_path)/crc32.c',
>-                        '<(zlib_path)/crc32.h',
>-                        '<(zlib_path)/deflate.c',
>-                        '<(zlib_path)/deflate.h',
>-                        '<(zlib_path)/gzclose.c',
>-                        '<(zlib_path)/gzguts.h',
>-                        '<(zlib_path)/gzlib.c',
>-                        '<(zlib_path)/gzread.c',
>-                        '<(zlib_path)/gzwrite.c',
>-                        '<(zlib_path)/infback.c',
>-                        '<(zlib_path)/inffast.c',
>-                        '<(zlib_path)/inffast.h',
>-                        '<(zlib_path)/inffixed.h',
>-                        '<(zlib_path)/inflate.c',
>-                        '<(zlib_path)/inflate.h',
>-                        '<(zlib_path)/inftrees.c',
>-                        '<(zlib_path)/inftrees.h',
>-                        '<(zlib_path)/trees.c',
>-                        '<(zlib_path)/trees.h',
>-                        '<(zlib_path)/uncompr.c',
>-                        '<(zlib_path)/x86.h',
>-                        '<(zlib_path)/zconf.h',
>-                        '<(zlib_path)/zlib.h',
>-                        '<(zlib_path)/zutil.c',
>-                        '<(zlib_path)/zutil.h',
>-                        '<(zlib_path)/simd_stub.c',
>-                    ],
>-                },
>-
>-                {
>-                    'target_name': 'angle_libpng',
>-                    'type': 'static_library',
>-                    'includes': [ '../../gyp/common_defines.gypi', ],
>-                    'dependencies':
>-                    [
>-                        'angle_zlib'
>-                    ],
>-                    'msvs_settings':
>-                    {
>-                        'VCCLCompilerTool':
>-                        {
>-                            'AdditionalOptions':
>-                            [
>-                                '/wd4018', # signed/unsigned mismatch
>-                                '/wd4028', # parameter differs from decl
>-                                '/wd4101', # unreferenced local
>-                                '/wd4189', # unreferenced but initted
>-                                '/wd4244', # Conversion from 'type1' to 'type2', possible loss of data
>-                                '/wd4267', # Conversion from 'size_t' to 'type', possible loss of data
>-                            ],
>-                        },
>-                    },
>-                    'sources':
>-                    [
>-                        '<(libpng_path)/png.c',
>-                        '<(libpng_path)/pngerror.c',
>-                        '<(libpng_path)/pngget.c',
>-                        '<(libpng_path)/pngmem.c',
>-                        '<(libpng_path)/pngpread.c',
>-                        '<(libpng_path)/pngread.c',
>-                        '<(libpng_path)/pngrio.c',
>-                        '<(libpng_path)/pngrtran.c',
>-                        '<(libpng_path)/pngrutil.c',
>-                        '<(libpng_path)/pngset.c',
>-                        '<(libpng_path)/pngtrans.c',
>-                        '<(libpng_path)/pngwio.c',
>-                        '<(libpng_path)/pngwrite.c',
>-                        '<(libpng_path)/pngwtran.c',
>-                        '<(libpng_path)/pngwutil.c',
>-                    ],
>-                },
>-            ], # targets
>-        }], # angle_build_deqp_libraries==1
>-        ['angle_build_deqp_libraries==1',
>-        {
>-            'targets':
>-            [
>-                {
>-                    'target_name': 'angle_deqp_support',
>-                    'type': 'none',
>-                    'direct_dependent_settings':
>-                    {
>-                        'configurations':
>-                        {
>-                            'Common_Base':
>-                            {
>-                                'msvs_configuration_attributes':
>-                                {
>-                                    # dEQP requires ASCII
>-                                    'CharacterSet': '0',
>-                                },
>-                                'msvs_settings':
>-                                {
>-                                    'VCLinkerTool':
>-                                    {
>-                                        'conditions':
>-                                        [
>-                                            ['angle_build_winrt==0',
>-                                            {
>-                                                'AdditionalDependencies':
>-                                                [
>-                                                    'dbghelp.lib',
>-                                                    'gdi32.lib',
>-                                                    'user32.lib',
>-                                                    'ws2_32.lib',
>-                                                ],
>-                                            }],
>-                                            ['angle_build_winrt==1',
>-                                            {
>-                                                # Disable COMDAT optimizations, disabled by default for non-WinRT
>-                                                'AdditionalOptions': ['/OPT:NOREF', '/OPT:NOICF'],
>-                                                # AdditionalDependencies automatically configures the required .libs
>-                                                'AdditionalDependencies':
>-                                                [
>-                                                    '%(AdditionalDependencies)'
>-                                                ],
>-                                            }],
>-                                        ],
>-                                    },
>-                                },
>-                            },
>-
>-                            'Debug_Base':
>-                            {
>-                                'msvs_settings':
>-                                {
>-                                    'VCCLCompilerTool':
>-                                    {
>-                                        'RuntimeTypeInfo': 'true', # dEQP needs RTTI
>-                                    },
>-                                },
>-                            },
>-
>-                            'Release_Base':
>-                            {
>-                                'msvs_settings':
>-                                {
>-                                    'VCCLCompilerTool':
>-                                    {
>-                                        'RuntimeTypeInfo': 'true', # dEQP needs RTTI
>-                                    },
>-                                },
>-                            },
>-                        },
>-                        # Re-enable RTTI and exceptions, dEQP needs them.
>-                        'cflags_cc!':
>-                        [
>-                            '-fno-exceptions',
>-                            '-fno-rtti',
>-                        ],
>-                        'include_dirs':
>-                        [
>-                            '<@(deqp_include_dirs)',
>-                            '<(libpng_path)',
>-                            '<(zlib_path)',
>-                        ],
>-                        'defines': ['<@(deqp_defines)'],
>-                        'defines!': [ '<@(deqp_undefines)' ],
>-                        'msvs_settings':
>-                        {
>-                            'VCCLCompilerTool':
>-                            {
>-                                'AdditionalOptions': ['<@(deqp_win_cflags)'],
>-                            },
>-                        },
>-                        'conditions':
>-                        [
>-                            ['clang==1',
>-                            {
>-                                # TODO(jmadill): Remove this once we fix dEQP.
>-                                'cflags_cc':
>-                                [
>-                                    '-Wno-delete-non-virtual-dtor',
>-                                ],
>-                            }],
>-                            ['OS=="win"',
>-                            {
>-                                'cflags': ['<@(deqp_win_cflags)'],
>-                                'cflags_cc': ['<@(deqp_win_cflags)'],
>-                                'include_dirs':
>-                                [
>-                                    '<(deqp_path)/framework/platform/win32',
>-                                ],
>-                            }],
>-                        ],
>-                    },
>-                    'conditions':
>-                    [
>-                        ['angle_build_winrt==1',
>-                        {
>-                            'type' : 'shared_library',
>-                        }],
>-                    ],
>-                },
>-
>-                # Compile decpp separately because MSVC ignores the extension of the files when
>-                # outputting the obj file, and later thinks that a decpp obj and another obj are the
>-                # same, ignoring one and eventually producing a link error. The problem occurs for
>-                # example between decpp/deRandom.cpp and debase/deRandom.c
>-                {
>-                    'target_name': 'angle_deqp_decpp',
>-                    'type': 'static_library',
>-                    'dependencies': [ 'angle_deqp_support' ],
>-                    'sources':
>-                    [
>-                        '<@(deqp_libtester_decpp_sources)',
>-                    ],
>-                    # In a chromium build dl is required for deDynamicLibrary
>-                    'conditions':
>-                    [
>-                        ['OS=="linux"',
>-                        {
>-                            'link_settings':
>-                            {
>-                                'libraries': ['-ldl']
>-                            },
>-                        }],
>-                    ],
>-                },
>-
>-                {
>-                    'target_name': 'angle_deqp_libtester',
>-                    'type': 'static_library',
>-                    'dependencies':
>-                    [
>-                        '<(angle_path)/src/angle.gyp:angle_common',
>-                        'angle_deqp_decpp',
>-                        'angle_deqp_support',
>-                        'angle_libpng',
>-                        '<(angle_path)/src/angle.gyp:libEGL',
>-                        '<(angle_path)/util/util.gyp:angle_util',
>-                    ],
>-                    'export_dependent_settings':
>-                    [
>-                        'angle_deqp_support',
>-                        '<(angle_path)/util/util.gyp:angle_util',
>-                    ],
>-                    'include_dirs':
>-                    [
>-                        '<(angle_path)/include',
>-                    ],
>-                    'direct_dependent_settings':
>-                    {
>-                        'include_dirs':
>-                        [
>-                            '<(angle_path)/include',
>-                        ],
>-                        'defines':
>-                        [
>-                            'ANGLE_DEQP_LIBTESTER_IMPLEMENTATION',
>-                        ],
>-                    },
>-                    'msvs_settings':
>-                    {
>-                        'VCCLCompilerTool':
>-                        {
>-                            'AdditionalOptions':
>-                            [
>-                                '/bigobj', # needed for glsBuiltinPrecisionTests.cpp
>-                                '/wd4251', # needed for angle_util STL objects not having DLL interface
>-                            ],
>-                        },
>-                    },
>-                    'sources':
>-                    [
>-                        '<@(deqp_libtester_sources)',
>-                    ],
>-                    'conditions':
>-                    [
>-                        ['OS=="mac"',
>-                        {
>-                            'direct_dependent_settings':
>-                            {
>-                                'xcode_settings':
>-                                {
>-                                    'DYLIB_INSTALL_NAME_BASE': '@rpath',
>-                                },
>-                            },
>-                        }],
>-                        ['OS=="win"',
>-                        {
>-                            'sources': [ '<@(deqp_libtester_sources_win)', ],
>-                        }],
>-                        ['OS=="linux" or OS=="mac"',
>-                        {
>-                            'sources': [ '<@(deqp_libtester_sources_unix)', ],
>-                        }],
>-                        ['OS=="linux"',
>-                        {
>-                            'link_settings':
>-                            {
>-                                'libraries': ['-lrt']
>-                            },
>-                        }],
>-                    ],
>-                },
>-
>-                {
>-                    'target_name': 'angle_deqp_libgles2',
>-                    'type': 'shared_library',
>-                    'dependencies':
>-                    [
>-                        'angle_deqp_libtester',
>-                    ],
>-                    'defines':
>-                    [
>-                        'ANGLE_DEQP_GLES2_TESTS',
>-                    ],
>-                    'direct_dependent_settings':
>-                    {
>-                        'defines':
>-                        [
>-                            'ANGLE_DEQP_GLES2_TESTS',
>-                        ],
>-                    },
>-                    'sources':
>-                    [
>-                        '<@(deqp_gles2_sources)',
>-                        'deqp_support/angle_deqp_libtester_main.cpp',
>-                        'deqp_support/tcuANGLEPlatform.cpp',
>-                        'deqp_support/tcuANGLEPlatform.h',
>-                    ],
>-                    # TODO(geofflang): Remove once es2fShaderMatrixTests.cpp no longer requires
>-                    # a local copy (crbug.com/759402)
>-                    'include_dirs':
>-                    [
>-                        '<(deqp_path)/modules/gles2/functional',
>-                    ],
>-                },
>-
>-                {
>-                    'target_name': 'angle_deqp_libgles3',
>-                    'type': 'shared_library',
>-                    'dependencies':
>-                    [
>-                        'angle_deqp_libtester',
>-                    ],
>-                    'defines':
>-                    [
>-                        'ANGLE_DEQP_GLES3_TESTS',
>-                    ],
>-                    'direct_dependent_settings':
>-                    {
>-                        'defines':
>-                        [
>-                            'ANGLE_DEQP_GLES3_TESTS',
>-                        ],
>-                    },
>-                    'sources':
>-                    [
>-                        '<@(deqp_gles3_sources)',
>-                        'deqp_support/angle_deqp_libtester_main.cpp',
>-                        'deqp_support/tcuANGLEPlatform.cpp',
>-                        'deqp_support/tcuANGLEPlatform.h',
>-                    ],
>-                },
>-
>-                {
>-                    'target_name': 'angle_deqp_libgles31',
>-                    'type': 'shared_library',
>-                    'dependencies':
>-                    [
>-                        'angle_deqp_libtester',
>-                    ],
>-                    'defines':
>-                    [
>-                        'ANGLE_DEQP_GLES31_TESTS',
>-                    ],
>-                    'direct_dependent_settings':
>-                    {
>-                        'defines':
>-                        [
>-                            'ANGLE_DEQP_GLES31_TESTS',
>-                        ],
>-                    },
>-                    'sources':
>-                    [
>-                        '<@(deqp_gles31_sources)',
>-                        'deqp_support/angle_deqp_libtester_main.cpp',
>-                        'deqp_support/tcuANGLEPlatform.cpp',
>-                        'deqp_support/tcuANGLEPlatform.h',
>-                    ],
>-                },
>-
>-                {
>-                    'target_name': 'angle_deqp_libegl',
>-                    'type': 'shared_library',
>-                    'dependencies':
>-                    [
>-                        'angle_deqp_libtester',
>-                    ],
>-                    'defines':
>-                    [
>-                        'ANGLE_DEQP_EGL_TESTS',
>-                    ],
>-                    'direct_dependent_settings':
>-                    {
>-                        'defines':
>-                        [
>-                            'ANGLE_DEQP_EGL_TESTS',
>-                        ],
>-                    },
>-                    'sources':
>-                    [
>-                        '<@(deqp_egl_sources)',
>-                        'deqp_support/angle_deqp_libtester_main.cpp',
>-                        'deqp_support/tcuANGLEPlatform.cpp',
>-                        'deqp_support/tcuANGLEPlatform.h',
>-                    ],
>-                },
>-            ], # targets
>-        }], # angle_build_deqp_libraries
>-        ['angle_build_deqp_executables==1',
>-        {
>-            "targets":
>-            [
>-                {
>-                    'target_name': 'angle_deqp_gles2_tests',
>-                    'type': 'executable',
>-                    'dependencies':
>-                    [
>-                        'angle_deqp_libgles2',
>-                        # Real dependency is in angle_deqp_libtester, however, not propagated here by GYP
>-                        '<(angle_path)/src/angle.gyp:libEGL',
>-                    ],
>-                    'sources':
>-                    [
>-                        'deqp_support/angle_deqp_tests_main.cpp',
>-                    ],
>-                },
>-
>-                {
>-                    'target_name': 'angle_deqp_gles3_tests',
>-                    'type': 'executable',
>-                    'dependencies':
>-                    [
>-                        'angle_deqp_libgles3',
>-                        # Real dependency is in angle_deqp_libtester, however, not propagated here by GYP
>-                        '<(angle_path)/src/angle.gyp:libEGL',
>-                    ],
>-                    'sources':
>-                    [
>-                        'deqp_support/angle_deqp_tests_main.cpp',
>-                    ],
>-                },
>-
>-                {
>-                    'target_name': 'angle_deqp_gles31_tests',
>-                    'type': 'executable',
>-                    'dependencies':
>-                    [
>-                        'angle_deqp_libgles31',
>-                        # Real dependency is in angle_deqp_libtester, however, not propagated here by GYP
>-                        '<(angle_path)/src/angle.gyp:libEGL',
>-                    ],
>-                    'sources':
>-                    [
>-                        'deqp_support/angle_deqp_tests_main.cpp',
>-                    ],
>-                },
>-
>-                {
>-                    'target_name': 'angle_deqp_egl_tests',
>-                    'type': 'executable',
>-                    'dependencies':
>-                    [
>-                        'angle_deqp_libegl',
>-                        # Real dependency is in angle_deqp_libtester, however, not propagated here by GYP
>-                        '<(angle_path)/src/angle.gyp:libEGL',
>-                    ],
>-                    'sources':
>-                    [
>-                        'deqp_support/angle_deqp_tests_main.cpp',
>-                    ],
>-                },
>-            ], # targets
>-        }], # angle_build_deqp_executables
>-        ['angle_build_deqp_gtest_support==1',
>-        {
>-            'targets':
>-            [
>-                # Helper target for synching our implementation with chrome's
>-                {
>-                    'target_name': 'angle_deqp_gtest_support',
>-                    'type': 'none',
>-                    'dependencies':
>-                    [
>-                        'angle_test_support',
>-                        '<(angle_path)/util/util.gyp:angle_util',
>-                        '<(angle_path)/src/angle.gyp:angle_common',
>-                    ],
>-                    'export_dependent_settings':
>-                    [
>-                        'angle_test_support',
>-                        '<(angle_path)/util/util.gyp:angle_util',
>-                    ],
>-                    'conditions':
>-                    [
>-                        ['OS!="android"',
>-                        {
>-                            'dependencies':
>-                            [
>-                                '<(angle_path)/src/angle.gyp:angle_gpu_info_util',
>-                            ],
>-                        }],
>-                    ],
>-                    'direct_dependent_settings':
>-                    {
>-                        'include_dirs':
>-                        [
>-                            'deqp_support',
>-                            'third_party/gpu_test_expectations',
>-                        ],
>-                        'sources':
>-                        [
>-                            '<@(deqp_gpu_test_expectations_sources)',
>-                            'deqp_support/angle_deqp_gtest.cpp',
>-                        ],
>-
>-                        'defines':
>-                        [
>-                            # Re-define the missing Windows macros
>-                            '<@(deqp_undefines)',
>-                        ],
>-
>-                        'msvs_settings':
>-                        {
>-                            'VCLinkerTool':
>-                            {
>-                                'AdditionalDependencies':
>-                                [
>-                                    'user32.lib',
>-                                ],
>-                            },
>-                        },
>-                        'conditions':
>-                        [
>-                            ['OS=="mac"',
>-                            {
>-                                'sources':
>-                                [
>-                                    '<@(deqp_gpu_test_expectations_sources_mac)',
>-                                ],
>-                            }],
>-                        ],
>-                    },
>-                },
>-            ], # targets
>-        }], # angle_build_deqp_gtest_support
>-        ['angle_build_deqp_gtest_executables==1',
>-        {
>-            "targets":
>-            [
>-                {
>-                    'target_name': 'angle_deqp_gtest_gles2_tests',
>-                    'type': 'executable',
>-                    'includes': [ '../../gyp/common_defines.gypi', ],
>-                    'dependencies':
>-                    [
>-                        'angle_deqp_gtest_support',
>-                        'angle_deqp_libgles2',
>-                        # Real dependency is in angle_deqp_libtester, however, not propagated here by GYP
>-                        '<(angle_path)/src/angle.gyp:libEGL',
>-                    ],
>-                    'sources':
>-                    [
>-                        'deqp_support/angle_deqp_gtest_main.cpp',
>-                    ],
>-                },
>-
>-                {
>-                    'target_name': 'angle_deqp_gtest_gles3_tests',
>-                    'type': 'executable',
>-                    'includes': [ '../../gyp/common_defines.gypi', ],
>-                    'dependencies':
>-                    [
>-                        'angle_deqp_gtest_support',
>-                        'angle_deqp_libgles3',
>-                        # Real dependency is in angle_deqp_libtester, however, not propagated here by GYP
>-                        '<(angle_path)/src/angle.gyp:libEGL',
>-                    ],
>-                    'sources':
>-                    [
>-                        'deqp_support/angle_deqp_gtest_main.cpp',
>-                    ],
>-                },
>-
>-                {
>-                    'target_name': 'angle_deqp_gtest_gles31_tests',
>-                    'type': 'executable',
>-                    'includes': [ '../../gyp/common_defines.gypi', ],
>-                    'dependencies':
>-                    [
>-                        'angle_deqp_gtest_support',
>-                        'angle_deqp_libgles31',
>-                        # Real dependency is in angle_deqp_libtester, however, not propagated here by GYP
>-                        '<(angle_path)/src/angle.gyp:libEGL',
>-                    ],
>-                    'sources':
>-                    [
>-                        'deqp_support/angle_deqp_gtest_main.cpp',
>-                    ],
>-                },
>-
>-                {
>-                    'target_name': 'angle_deqp_gtest_egl_tests',
>-                    'type': 'executable',
>-                    'includes': [ '../../gyp/common_defines.gypi', ],
>-                    'dependencies':
>-                    [
>-                        'angle_deqp_gtest_support',
>-                        'angle_deqp_libegl',
>-                        # Real dependency is in angle_deqp_libtester, however, not propagated here by GYP
>-                        '<(angle_path)/src/angle.gyp:libEGL',
>-                    ],
>-                    'sources':
>-                    [
>-                        'deqp_support/angle_deqp_gtest_main.cpp',
>-                    ],
>-                },
>-            ], # targets
>-        }], # angle_build_deqp_gtest_executables
>-    ], # conditions
>-}
>diff --git a/Source/ThirdParty/ANGLE/src/tests/deqp_support/angle_deqp_gtest.cpp b/Source/ThirdParty/ANGLE/src/tests/deqp_support/angle_deqp_gtest.cpp
>index a4bec133f91..d103983a473 100644
>--- a/Source/ThirdParty/ANGLE/src/tests/deqp_support/angle_deqp_gtest.cpp
>+++ b/Source/ThirdParty/ANGLE/src/tests/deqp_support/angle_deqp_gtest.cpp
>@@ -7,58 +7,112 @@
> //   dEQP and GoogleTest integration logic. Calls through to the random
> //   order executor.
> 
>-#include <fstream>
> #include <stdint.h>
>+#include <array>
>+#include <fstream>
> 
> #include <gtest/gtest.h>
> 
> #include "angle_deqp_libtester.h"
>+#include "common/Optional.h"
> #include "common/angleutils.h"
> #include "common/debug.h"
>-#include "common/Optional.h"
> #include "common/platform.h"
> #include "common/string_utils.h"
>-#include "gpu_test_expectations_parser.h"
>-#include "system_utils.h"
>+#include "platform/Platform.h"
>+#include "tests/test_expectations/GPUTestConfig.h"
>+#include "tests/test_expectations/GPUTestExpectationsParser.h"
>+#include "util/system_utils.h"
> 
>+namespace angle
>+{
> namespace
> {
>+bool gGlobalError = false;
>+bool gExpectError = false;
> 
>-#if defined(ANGLE_PLATFORM_ANDROID)
>-const char *g_CaseListRelativePath =
>-    "/../../sdcard/chromium_tests_root/third_party/deqp/src/android/cts/master/";
>-#else
>-const char *g_CaseListRelativePath = "/../../third_party/deqp/src/android/cts/master/";
>-#endif
>+constexpr char kInfoTag[] = "*RESULT";
> 
>-const char *g_TestExpectationsSearchPaths[] = {
>-    "/../../src/tests/deqp_support/", "/../../third_party/angle/src/tests/deqp_support/",
>-    "/deqp_support/", "/../../sdcard/chromium_tests_root/third_party/angle/src/tests/deqp_support/",
>+// Stored as globals to work around a Clang bug. http://crbug.com/951458
>+std::vector<std::string> gUnexpectedFailed;
>+std::vector<std::string> gUnexpectedPasses;
>+
>+void HandlePlatformError(angle::PlatformMethods *platform, const char *errorMessage)
>+{
>+    if (!gExpectError)
>+    {
>+        FAIL() << errorMessage;
>+    }
>+    gGlobalError = true;
>+}
>+
>+std::string DrawElementsToGoogleTestName(const std::string &dEQPName)
>+{
>+    std::string gTestName = dEQPName.substr(dEQPName.find('.') + 1);
>+    std::replace(gTestName.begin(), gTestName.end(), '.', '_');
>+
>+    // Occurs in some luminance tests
>+    gTestName.erase(std::remove(gTestName.begin(), gTestName.end(), '-'), gTestName.end());
>+    return gTestName;
>+}
>+
>+// We look for a GLES Khronos master list first. We keep the Android CTS so we can locate a version
>+// of egl-master.txt that has the full list of tests.
>+const char *gCaseListSearchPaths[] = {
>+    "/../../third_party/deqp/src/external/openglcts/data/mustpass/gles/aosp_mustpass/master/",
>+    "/../../third_party/angle/third_party/deqp/src/external/openglcts/data/mustpass/gles/"
>+    "aosp_mustpass/master/",
>+    "/../../sdcard/chromium_tests_root/third_party/angle/third_party/deqp/src/external/openglcts/"
>+    "data/mustpass/gles/aosp_mustpass/master/",
>+    "/../../third_party/deqp/src/android/cts/master/",
>+    "/../../third_party/angle/third_party/deqp/src/android/cts/master/",
>+    "/../../sdcard/chromium_tests_root/third_party/angle/third_party/deqp/src/android/cts/master/",
> };
> 
>-const char *g_CaseListFiles[] = {
>-    "gles2-master.txt", "gles3-master.txt", "gles31-master.txt", "egl-master.txt",
>+const char *gTestExpectationsSearchPaths[] = {
>+    "/../../src/tests/deqp_support/",
>+    "/../../third_party/angle/src/tests/deqp_support/",
>+    "/deqp_support/",
>+    "/../../sdcard/chromium_tests_root/third_party/angle/src/tests/deqp_support/",
> };
> 
>-const char *g_TestExpectationsFiles[] = {
>-    "deqp_gles2_test_expectations.txt", "deqp_gles3_test_expectations.txt",
>-    "deqp_gles31_test_expectations.txt", "deqp_egl_test_expectations.txt",
>+const char *gCaseListFiles[] = {
>+    "gles2-master.txt",
>+    "gles3-master.txt",
>+    "gles31-master.txt",
>+    "egl-master.txt",
> };
> 
>-using APIInfo = std::pair<const char *, gpu::GPUTestConfig::API>;
>+const char *gTestExpectationsFiles[] = {
>+    "deqp_gles2_test_expectations.txt",
>+    "deqp_gles3_test_expectations.txt",
>+    "deqp_gles31_test_expectations.txt",
>+    "deqp_egl_test_expectations.txt",
>+};
> 
>-const APIInfo g_eglDisplayAPIs[] = {
>-    {"angle-d3d9", gpu::GPUTestConfig::kAPID3D9},
>-    {"angle-d3d11", gpu::GPUTestConfig::kAPID3D11},
>-    {"angle-gl", gpu::GPUTestConfig::kAPIGLDesktop},
>-    {"angle-gles", gpu::GPUTestConfig::kAPIGLES},
>-    {"angle-null", gpu::GPUTestConfig::kAPIUnknown },
>+using APIInfo = std::pair<const char *, angle::GPUTestConfig::API>;
>+
>+const APIInfo gEGLDisplayAPIs[] = {
>+    {"angle-d3d9", angle::GPUTestConfig::kAPID3D9},
>+    {"angle-d3d11", angle::GPUTestConfig::kAPID3D11},
>+    {"angle-gl", angle::GPUTestConfig::kAPIGLDesktop},
>+    {"angle-gles", angle::GPUTestConfig::kAPIGLES},
>+    {"angle-null", angle::GPUTestConfig::kAPIUnknown},
>+    {"angle-vulkan", angle::GPUTestConfig::kAPIVulkan},
> };
> 
>-const char *g_deqpEGLString = "--deqp-egl-display-type=";
>-const char *g_angleEGLString = "--use-angle=";
>+const char *gdEQPEGLString  = "--deqp-egl-display-type=";
>+const char *gANGLEEGLString = "--use-angle=";
>+const char *gdEQPCaseString = "--deqp-case=";
>+
>+std::array<char, 500> gCaseStringBuffer;
>+
>+const APIInfo *gInitAPI = nullptr;
> 
>-const APIInfo *g_initAPI = nullptr;
>+constexpr const char *gdEQPEGLConfigNameString = "--deqp-gl-config-name=";
>+
>+// Default the config to RGBA8
>+const char *gEGLConfigName = "rgba8888d24s8";
> 
> // Returns the default API for a platform.
> const char *GetDefaultAPIName()
>@@ -70,13 +124,13 @@ const char *GetDefaultAPIName()
> #elif defined(ANGLE_PLATFORM_ANDROID)
>     return "angle-gles";
> #else
>-#error Unknown platform.
>+#    error Unknown platform.
> #endif
> }
> 
> const APIInfo *FindAPIInfo(const std::string &arg)
> {
>-    for (auto &displayAPI : g_eglDisplayAPIs)
>+    for (auto &displayAPI : gEGLDisplayAPIs)
>     {
>         if (arg == displayAPI.first)
>         {
>@@ -93,6 +147,11 @@ const APIInfo *GetDefaultAPIInfo()
>     return defaultInfo;
> }
> 
>+std::string GetTestStatLine(const std::string &key, const std::string &value)
>+{
>+    return std::string(kInfoTag) + ": " + key + ": " + value + "\n";
>+}
>+
> // During the CaseList initialization we cannot use the GTEST FAIL macro to quit the program because
> // the initialization is called outside of tests the first time.
> void Die()
>@@ -100,13 +159,16 @@ void Die()
>     exit(EXIT_FAILURE);
> }
> 
>-Optional<std::string> FindTestExpectationsPath(const std::string &exeDir,
>-                                                      size_t testModuleIndex)
>+Optional<std::string> FindFileFromPaths(const char *paths[],
>+                                        size_t numPaths,
>+                                        const std::string &exeDir,
>+                                        const std::string &searchFile)
> {
>-    for (const char *testPath : g_TestExpectationsSearchPaths)
>+    for (size_t pathIndex = 0; pathIndex < numPaths; ++pathIndex)
>     {
>+        const char *testPath = paths[pathIndex];
>         std::stringstream testExpectationsPathStr;
>-        testExpectationsPathStr << exeDir << testPath << g_TestExpectationsFiles[testModuleIndex];
>+        testExpectationsPathStr << exeDir << testPath << searchFile;
> 
>         std::string path = testExpectationsPathStr.str();
>         std::ifstream inFile(path.c_str());
>@@ -120,6 +182,18 @@ Optional<std::string> FindTestExpectationsPath(const std::string &exeDir,
>     return Optional<std::string>::Invalid();
> }
> 
>+Optional<std::string> FindCaseListPath(const std::string &exeDir, size_t testModuleIndex)
>+{
>+    return FindFileFromPaths(gCaseListSearchPaths, ArraySize(gCaseListSearchPaths), exeDir,
>+                             gCaseListFiles[testModuleIndex]);
>+}
>+
>+Optional<std::string> FindTestExpectationsPath(const std::string &exeDir, size_t testModuleIndex)
>+{
>+    return FindFileFromPaths(gTestExpectationsSearchPaths, ArraySize(gTestExpectationsSearchPaths),
>+                             exeDir, gTestExpectationsFiles[testModuleIndex]);
>+}
>+
> class dEQPCaseList
> {
>   public:
>@@ -127,14 +201,9 @@ class dEQPCaseList
> 
>     struct CaseInfo
>     {
>-        CaseInfo(const std::string &dEQPName,
>-                 const std::string &gTestName,
>-                 int expectation)
>-            : mDEQPName(dEQPName),
>-              mGTestName(gTestName),
>-              mExpectation(expectation)
>-        {
>-        }
>+        CaseInfo(const std::string &dEQPName, const std::string &gTestName, int expectation)
>+            : mDEQPName(dEQPName), mGTestName(gTestName), mExpectation(expectation)
>+        {}
> 
>         std::string mDEQPName;
>         std::string mGTestName;
>@@ -158,17 +227,12 @@ class dEQPCaseList
> 
>   private:
>     std::vector<CaseInfo> mCaseInfoList;
>-    gpu::GPUTestExpectationsParser mTestExpectationsParser;
>-    gpu::GPUTestBotConfig mTestConfig;
>+    angle::GPUTestExpectationsParser mTestExpectationsParser;
>     size_t mTestModuleIndex;
>-    bool mInitialized;
>+    bool mInitialized = false;
> };
> 
>-dEQPCaseList::dEQPCaseList(size_t testModuleIndex)
>-    : mTestModuleIndex(testModuleIndex),
>-      mInitialized(false)
>-{
>-}
>+dEQPCaseList::dEQPCaseList(size_t testModuleIndex) : mTestModuleIndex(testModuleIndex) {}
> 
> void dEQPCaseList::initialize()
> {
>@@ -181,9 +245,12 @@ void dEQPCaseList::initialize()
> 
>     std::string exeDir = angle::GetExecutableDirectory();
> 
>-    std::stringstream caseListPathStr;
>-    caseListPathStr << exeDir << g_CaseListRelativePath << g_CaseListFiles[mTestModuleIndex];
>-    std::string caseListPath = caseListPathStr.str();
>+    Optional<std::string> caseListPath = FindCaseListPath(exeDir, mTestModuleIndex);
>+    if (!caseListPath.valid())
>+    {
>+        std::cerr << "Failed to find case list file." << std::endl;
>+        Die();
>+    }
> 
>     Optional<std::string> testExpectationsPath = FindTestExpectationsPath(exeDir, mTestModuleIndex);
>     if (!testExpectationsPath.valid())
>@@ -192,10 +259,20 @@ void dEQPCaseList::initialize()
>         Die();
>     }
> 
>-    if (!mTestExpectationsParser.LoadTestExpectationsFromFile(testExpectationsPath.value()))
>+    angle::GPUTestConfig::API api = GetDefaultAPIInfo()->second;
>+    // Set the API from the command line, or using the default platform API.
>+    if (gInitAPI)
>+    {
>+        api = gInitAPI->second;
>+    }
>+
>+    angle::GPUTestConfig testConfig = angle::GPUTestConfig(api);
>+
>+    if (!mTestExpectationsParser.loadTestExpectationsFromFile(testConfig,
>+                                                              testExpectationsPath.value()))
>     {
>         std::stringstream errorMsgStream;
>-        for (const auto &message : mTestExpectationsParser.GetErrorMessages())
>+        for (const auto &message : mTestExpectationsParser.getErrorMessages())
>         {
>             errorMsgStream << std::endl << " " << message;
>         }
>@@ -204,23 +281,7 @@ void dEQPCaseList::initialize()
>         Die();
>     }
> 
>-    if (!mTestConfig.LoadCurrentConfig(nullptr))
>-    {
>-        std::cerr << "Failed to load test configuration." << std::endl;
>-        Die();
>-    }
>-
>-    // Set the API from the command line, or using the default platform API.
>-    if (g_initAPI)
>-    {
>-        mTestConfig.set_api(g_initAPI->second);
>-    }
>-    else
>-    {
>-        mTestConfig.set_api(GetDefaultAPIInfo()->second);
>-    }
>-
>-    std::ifstream caseListStream(caseListPath);
>+    std::ifstream caseListStream(caseListPath.value());
>     if (caseListStream.fail())
>     {
>         std::cerr << "Failed to load the case list." << std::endl;
>@@ -235,19 +296,25 @@ void dEQPCaseList::initialize()
>         std::string dEQPName = angle::TrimString(inString, angle::kWhitespaceASCII);
>         if (dEQPName.empty())
>             continue;
>-        std::string gTestName = dEQPName.substr(dEQPName.find('.') + 1);
>+        std::string gTestName = DrawElementsToGoogleTestName(dEQPName);
>         if (gTestName.empty())
>             continue;
>-        std::replace(gTestName.begin(), gTestName.end(), '.', '_');
> 
>-        // Occurs in some luminance tests
>-        gTestName.erase(std::remove(gTestName.begin(), gTestName.end(), '-'), gTestName.end());
>+        int expectation = mTestExpectationsParser.getTestExpectation(dEQPName);
>+        mCaseInfoList.push_back(CaseInfo(dEQPName, gTestName, expectation));
>+    }
> 
>-        int expectation = mTestExpectationsParser.GetTestExpectation(dEQPName, mTestConfig);
>-        if (expectation != gpu::GPUTestExpectationsParser::kGpuTestSkip)
>-        {
>-            mCaseInfoList.push_back(CaseInfo(dEQPName, gTestName, expectation));
>-        }
>+    std::stringstream unusedMsgStream;
>+    bool anyUnused = false;
>+    for (const auto &message : mTestExpectationsParser.getUnusedExpectationsMessages())
>+    {
>+        anyUnused = true;
>+        unusedMsgStream << std::endl << " " << message;
>+    }
>+    if (anyUnused)
>+    {
>+        std::cerr << "Failed to validate test expectations." << unusedMsgStream.str() << std::endl;
>+        Die();
>     }
> }
> 
>@@ -277,49 +344,146 @@ class dEQPTest : public testing::TestWithParam<size_t>
>     static void TearDownTestCase();
> 
>   protected:
>-    void runTest()
>+    void runTest() const
>     {
>+        if (sTestExceptionCount > 1)
>+        {
>+            std::cout << "Too many exceptions, skipping all remaining tests." << std::endl;
>+            return;
>+        }
>+
>         const auto &caseInfo = GetCaseList().getCaseInfo(GetParam());
>         std::cout << caseInfo.mDEQPName << std::endl;
> 
>-        bool result = deqp_libtester_run(caseInfo.mDEQPName.c_str());
>+        // Tests that crash exit the harness before collecting the result. To tally the number of
>+        // crashed tests we track how many tests we "tried" to run.
>+        sTestCount++;
>+
>+        if (caseInfo.mExpectation == angle::GPUTestExpectationsParser::kGpuTestSkip)
>+        {
>+            sSkippedTestCount++;
>+            std::cout << "Test skipped.\n";
>+            return;
>+        }
>+
>+        gExpectError = (caseInfo.mExpectation != angle::GPUTestExpectationsParser::kGpuTestPass);
>+        TestResult result = deqp_libtester_run(caseInfo.mDEQPName.c_str());
>+
>+        bool testSucceeded = countTestResultAndReturnSuccess(result);
>+
>+        // Check the global error flag for unexpected platform errors.
>+        if (gGlobalError)
>+        {
>+            testSucceeded = false;
>+            gGlobalError  = false;
>+        }
> 
>-        if (caseInfo.mExpectation == gpu::GPUTestExpectationsParser::kGpuTestPass)
>+        if (caseInfo.mExpectation == angle::GPUTestExpectationsParser::kGpuTestPass)
>         {
>-            EXPECT_TRUE(result);
>-            sPasses += (result ? 1u : 0u);
>-            sFails += (!result ? 1u : 0u);
>+            EXPECT_TRUE(testSucceeded);
>+
>+            if (!testSucceeded)
>+            {
>+                gUnexpectedFailed.push_back(caseInfo.mDEQPName);
>+            }
>         }
>-        else if (result)
>+        else if (testSucceeded)
>         {
>             std::cout << "Test expected to fail but passed!" << std::endl;
>-            sUnexpectedPasses++;
>+            gUnexpectedPasses.push_back(caseInfo.mDEQPName);
>         }
>-        else
>+    }
>+
>+    bool countTestResultAndReturnSuccess(TestResult result) const
>+    {
>+        switch (result)
>+        {
>+            case TestResult::Pass:
>+                sPassedTestCount++;
>+                return true;
>+            case TestResult::Fail:
>+                sFailedTestCount++;
>+                return false;
>+            case TestResult::NotSupported:
>+                sNotSupportedTestCount++;
>+                return true;
>+            case TestResult::Exception:
>+                sTestExceptionCount++;
>+                return false;
>+            default:
>+                std::cerr << "Unexpected test result code: " << static_cast<int>(result) << "\n";
>+                return false;
>+        }
>+    }
>+
>+    static void PrintTestStats()
>+    {
>+        uint32_t crashedCount =
>+            sTestCount - (sPassedTestCount + sFailedTestCount + sNotSupportedTestCount +
>+                          sTestExceptionCount + sSkippedTestCount);
>+
>+        std::cout << GetTestStatLine("Total", std::to_string(sTestCount));
>+        std::cout << GetTestStatLine("Passed", std::to_string(sPassedTestCount));
>+        std::cout << GetTestStatLine("Failed", std::to_string(sFailedTestCount));
>+        std::cout << GetTestStatLine("Skipped", std::to_string(sSkippedTestCount));
>+        std::cout << GetTestStatLine("Not Supported", std::to_string(sNotSupportedTestCount));
>+        std::cout << GetTestStatLine("Exception", std::to_string(sTestExceptionCount));
>+        std::cout << GetTestStatLine("Crashed", std::to_string(crashedCount));
>+
>+        if (!gUnexpectedPasses.empty())
>+        {
>+            std::cout << GetTestStatLine("Unexpected Passed Count",
>+                                         std::to_string(gUnexpectedPasses.size()));
>+            for (const std::string &testName : gUnexpectedPasses)
>+            {
>+                std::cout << GetTestStatLine("Unexpected Passed Tests", testName);
>+            }
>+        }
>+
>+        if (!gUnexpectedFailed.empty())
>         {
>-            sFails++;
>+            std::cout << GetTestStatLine("Unexpected Failed Count",
>+                                         std::to_string(gUnexpectedFailed.size()));
>+            for (const std::string &testName : gUnexpectedFailed)
>+            {
>+                std::cout << GetTestStatLine("Unexpected Failed Tests", testName);
>+            }
>         }
>     }
> 
>-    static unsigned int sPasses;
>-    static unsigned int sFails;
>-    static unsigned int sUnexpectedPasses;
>+    static uint32_t sTestCount;
>+    static uint32_t sPassedTestCount;
>+    static uint32_t sFailedTestCount;
>+    static uint32_t sTestExceptionCount;
>+    static uint32_t sNotSupportedTestCount;
>+    static uint32_t sSkippedTestCount;
> };
> 
> template <size_t TestModuleIndex>
>-unsigned int dEQPTest<TestModuleIndex>::sPasses           = 0;
>+uint32_t dEQPTest<TestModuleIndex>::sTestCount = 0;
> template <size_t TestModuleIndex>
>-unsigned int dEQPTest<TestModuleIndex>::sFails            = 0;
>+uint32_t dEQPTest<TestModuleIndex>::sPassedTestCount = 0;
> template <size_t TestModuleIndex>
>-unsigned int dEQPTest<TestModuleIndex>::sUnexpectedPasses = 0;
>+uint32_t dEQPTest<TestModuleIndex>::sFailedTestCount = 0;
>+template <size_t TestModuleIndex>
>+uint32_t dEQPTest<TestModuleIndex>::sTestExceptionCount = 0;
>+template <size_t TestModuleIndex>
>+uint32_t dEQPTest<TestModuleIndex>::sNotSupportedTestCount = 0;
>+template <size_t TestModuleIndex>
>+uint32_t dEQPTest<TestModuleIndex>::sSkippedTestCount = 0;
> 
> // static
> template <size_t TestModuleIndex>
> void dEQPTest<TestModuleIndex>::SetUpTestCase()
> {
>-    sPasses           = 0;
>-    sFails            = 0;
>-    sUnexpectedPasses = 0;
>+    sPassedTestCount       = 0;
>+    sFailedTestCount       = 0;
>+    sNotSupportedTestCount = 0;
>+    sTestExceptionCount    = 0;
>+    sTestCount             = 0;
>+    sSkippedTestCount      = 0;
>+    gUnexpectedPasses.clear();
>+    gUnexpectedFailed.clear();
> 
>     std::vector<const char *> argv;
> 
>@@ -327,12 +491,18 @@ void dEQPTest<TestModuleIndex>::SetUpTestCase()
>     argv.push_back("");
> 
>     // Add init api.
>-    const char *targetApi    = g_initAPI ? g_initAPI->first : GetDefaultAPIName();
>-    std::string apiArgString = std::string(g_deqpEGLString) + targetApi;
>+    const char *targetApi    = gInitAPI ? gInitAPI->first : GetDefaultAPIName();
>+    std::string apiArgString = std::string(gdEQPEGLString) + targetApi;
>     argv.push_back(apiArgString.c_str());
> 
>+    // Add config name
>+    const char *targetConfigName = gEGLConfigName;
>+    std::string configArgString  = std::string(gdEQPEGLConfigNameString) + targetConfigName;
>+    argv.push_back(configArgString.c_str());
>+
>     // Init the platform.
>-    if (!deqp_libtester_init_platform(static_cast<int>(argv.size()), argv.data()))
>+    if (!deqp_libtester_init_platform(static_cast<int>(argv.size()), argv.data(),
>+                                      reinterpret_cast<void *>(&HandlePlatformError)))
>     {
>         std::cout << "Aborting test due to dEQP initialization error." << std::endl;
>         exit(1);
>@@ -343,56 +513,41 @@ void dEQPTest<TestModuleIndex>::SetUpTestCase()
> template <size_t TestModuleIndex>
> void dEQPTest<TestModuleIndex>::TearDownTestCase()
> {
>-    unsigned int total = sPasses + sFails;
>-    float passFrac     = static_cast<float>(sPasses) / static_cast<float>(total) * 100.0f;
>-    float failFrac     = static_cast<float>(sFails) / static_cast<float>(total) * 100.0f;
>-    std::cout << "Passed: " << sPasses << "/" << total << " tests. (" << passFrac << "%)"
>-              << std::endl;
>-    if (sFails > 0)
>-    {
>-        std::cout << "Failed: " << sFails << "/" << total << " tests. (" << failFrac << "%)"
>-                  << std::endl;
>-    }
>-    if (sUnexpectedPasses > 0)
>-    {
>-        std::cout << sUnexpectedPasses << " tests unexpectedly passed." << std::endl;
>-    }
>-
>+    PrintTestStats();
>     deqp_libtester_shutdown_platform();
> }
> 
>-#define ANGLE_INSTANTIATE_DEQP_TEST_CASE(DEQP_TEST, N)                          \
>-    class DEQP_TEST : public dEQPTest<N>                                        \
>-    {                                                                           \
>-    };                                                                          \
>-    TEST_P(DEQP_TEST, Default) { runTest(); }                                   \
>-                                                                                \
>-    INSTANTIATE_TEST_CASE_P(, DEQP_TEST, DEQP_TEST::GetTestingRange(),          \
>-                            [](const testing::TestParamInfo<size_t> &info) {    \
>-                                return DEQP_TEST::GetCaseGTestName(info.param); \
>-                            })
>+#define ANGLE_INSTANTIATE_DEQP_TEST_CASE(API, N)                              \
>+    class dEQP : public dEQPTest<N>                                           \
>+    {};                                                                       \
>+    TEST_P(dEQP, API) { runTest(); }                                          \
>+                                                                              \
>+    INSTANTIATE_TEST_SUITE_P(, dEQP, dEQP::GetTestingRange(),                 \
>+                             [](const testing::TestParamInfo<size_t> &info) { \
>+                                 return dEQP::GetCaseGTestName(info.param);   \
>+                             })
> 
> #ifdef ANGLE_DEQP_GLES2_TESTS
>-ANGLE_INSTANTIATE_DEQP_TEST_CASE(dEQP_GLES2, 0);
>+ANGLE_INSTANTIATE_DEQP_TEST_CASE(GLES2, 0);
> #endif
> 
> #ifdef ANGLE_DEQP_GLES3_TESTS
>-ANGLE_INSTANTIATE_DEQP_TEST_CASE(dEQP_GLES3, 1);
>+ANGLE_INSTANTIATE_DEQP_TEST_CASE(GLES3, 1);
> #endif
> 
> #ifdef ANGLE_DEQP_GLES31_TESTS
>-ANGLE_INSTANTIATE_DEQP_TEST_CASE(dEQP_GLES31, 2);
>+ANGLE_INSTANTIATE_DEQP_TEST_CASE(GLES31, 2);
> #endif
> 
> #ifdef ANGLE_DEQP_EGL_TESTS
>-ANGLE_INSTANTIATE_DEQP_TEST_CASE(dEQP_EGL, 3);
>+ANGLE_INSTANTIATE_DEQP_TEST_CASE(EGL, 3);
> #endif
> 
> void HandleDisplayType(const char *displayTypeString)
> {
>     std::stringstream argStream;
> 
>-    if (g_initAPI)
>+    if (gInitAPI)
>     {
>         std::cout << "Cannot specify two EGL displays!" << std::endl;
>         exit(1);
>@@ -406,15 +561,38 @@ void HandleDisplayType(const char *displayTypeString)
>     argStream << displayTypeString;
>     std::string arg = argStream.str();
> 
>-    g_initAPI = FindAPIInfo(arg);
>+    gInitAPI = FindAPIInfo(arg);
> 
>-    if (!g_initAPI)
>+    if (!gInitAPI)
>     {
>         std::cout << "Unknown ANGLE back-end API: " << displayTypeString << std::endl;
>         exit(1);
>     }
> }
> 
>+void HandleEGLConfigName(const char *configNameString)
>+{
>+    gEGLConfigName = configNameString;
>+}
>+
>+// The --deqp-case flag takes a case expression that is parsed into a --gtest_filter. It converts
>+// the "dEQP" style names (functional.thing.*) into "GoogleTest" style names (functional_thing_*).
>+// Currently it does not handle multiple tests and multiple filters in different arguments.
>+void HandleCaseName(const char *caseString, int *argc, int argIndex, char **argv)
>+{
>+    std::string googleTestName = DrawElementsToGoogleTestName(caseString);
>+    gCaseStringBuffer.fill(0);
>+    int bytesWritten = snprintf(gCaseStringBuffer.data(), gCaseStringBuffer.size() - 1,
>+                                "--gtest_filter=*%s", googleTestName.c_str());
>+    if (bytesWritten <= 0 || static_cast<size_t>(bytesWritten) >= gCaseStringBuffer.size() - 1)
>+    {
>+        std::cout << "Error parsing test case string: " << caseString;
>+        exit(1);
>+    }
>+
>+    argv[argIndex] = gCaseStringBuffer.data();
>+}
>+
> void DeleteArg(int *argc, int argIndex, char **argv)
> {
>     (*argc)--;
>@@ -423,27 +601,35 @@ void DeleteArg(int *argc, int argIndex, char **argv)
>         argv[moveIndex] = argv[moveIndex + 1];
>     }
> }
>-
>-} // anonymous namespace
>+}  // anonymous namespace
> 
> // Called from main() to process command-line arguments.
>-namespace angle
>-{
> void InitTestHarness(int *argc, char **argv)
> {
>     int argIndex = 0;
>     while (argIndex < *argc)
>     {
>-        if (strncmp(argv[argIndex], g_deqpEGLString, strlen(g_deqpEGLString)) == 0)
>+        if (strncmp(argv[argIndex], gdEQPEGLString, strlen(gdEQPEGLString)) == 0)
>+        {
>+            HandleDisplayType(argv[argIndex] + strlen(gdEQPEGLString));
>+            DeleteArg(argc, argIndex, argv);
>+        }
>+        else if (strncmp(argv[argIndex], gANGLEEGLString, strlen(gANGLEEGLString)) == 0)
>         {
>-            HandleDisplayType(argv[argIndex] + strlen(g_deqpEGLString));
>+            HandleDisplayType(argv[argIndex] + strlen(gANGLEEGLString));
>             DeleteArg(argc, argIndex, argv);
>         }
>-        else if (strncmp(argv[argIndex], g_angleEGLString, strlen(g_angleEGLString)) == 0)
>+        else if (strncmp(argv[argIndex], gdEQPEGLConfigNameString,
>+                         strlen(gdEQPEGLConfigNameString)) == 0)
>         {
>-            HandleDisplayType(argv[argIndex] + strlen(g_angleEGLString));
>+            HandleEGLConfigName(argv[argIndex] + strlen(gdEQPEGLConfigNameString));
>             DeleteArg(argc, argIndex, argv);
>         }
>+        else if (strncmp(argv[argIndex], gdEQPCaseString, strlen(gdEQPCaseString)) == 0)
>+        {
>+            HandleCaseName(argv[argIndex] + strlen(gdEQPCaseString), argc, argIndex, argv);
>+            argIndex++;
>+        }
>         else
>         {
>             argIndex++;
>diff --git a/Source/ThirdParty/ANGLE/src/tests/deqp_support/angle_deqp_libtester.h b/Source/ThirdParty/ANGLE/src/tests/deqp_support/angle_deqp_libtester.h
>index 7f35ddb0688..c91731bef04 100644
>--- a/Source/ThirdParty/ANGLE/src/tests/deqp_support/angle_deqp_libtester.h
>+++ b/Source/ThirdParty/ANGLE/src/tests/deqp_support/angle_deqp_libtester.h
>@@ -11,25 +11,36 @@
> #define ANGLE_DEQP_LIBTESTER_H_
> 
> #if defined(_WIN32)
>-#   if defined(ANGLE_DEQP_LIBTESTER_IMPLEMENTATION)
>-#       define ANGLE_LIBTESTER_EXPORT __declspec(dllexport)
>-#   else
>-#       define ANGLE_LIBTESTER_EXPORT __declspec(dllimport)
>-#   endif
>+#    if defined(ANGLE_DEQP_LIBTESTER_IMPLEMENTATION)
>+#        define ANGLE_LIBTESTER_EXPORT __declspec(dllexport)
>+#    else
>+#        define ANGLE_LIBTESTER_EXPORT __declspec(dllimport)
>+#    endif
> #elif defined(__GNUC__)
>-#   if defined(ANGLE_DEQP_LIBTESTER_IMPLEMENTATION)
>-#       define ANGLE_LIBTESTER_EXPORT __attribute__((visibility ("default")))
>-#   else
>-#       define ANGLE_LIBTESTER_EXPORT
>-#   endif
>+#    if defined(ANGLE_DEQP_LIBTESTER_IMPLEMENTATION)
>+#        define ANGLE_LIBTESTER_EXPORT __attribute__((visibility("default")))
>+#    else
>+#        define ANGLE_LIBTESTER_EXPORT
>+#    endif
> #else
>-#   define ANGLE_LIBTESTER_EXPORT
>+#    define ANGLE_LIBTESTER_EXPORT
> #endif
> 
>+// Possible results of deqp_libtester_run
>+enum class TestResult
>+{
>+    Pass,
>+    Fail,
>+    NotSupported,
>+    Exception,
>+};
>+
> // Exported to the tester app.
> ANGLE_LIBTESTER_EXPORT int deqp_libtester_main(int argc, const char *argv[]);
>-ANGLE_LIBTESTER_EXPORT bool deqp_libtester_init_platform(int argc, const char *argv[]);
>+ANGLE_LIBTESTER_EXPORT bool deqp_libtester_init_platform(int argc,
>+                                                         const char *argv[],
>+                                                         void *logErrorFunc);
> ANGLE_LIBTESTER_EXPORT void deqp_libtester_shutdown_platform();
>-ANGLE_LIBTESTER_EXPORT bool deqp_libtester_run(const char *caseName);
>+ANGLE_LIBTESTER_EXPORT TestResult deqp_libtester_run(const char *caseName);
> 
>-#endif // ANGLE_DEQP_LIBTESTER_H_
>+#endif  // ANGLE_DEQP_LIBTESTER_H_
>diff --git a/Source/ThirdParty/ANGLE/src/tests/deqp_support/angle_deqp_libtester_main.cpp b/Source/ThirdParty/ANGLE/src/tests/deqp_support/angle_deqp_libtester_main.cpp
>index 90727f390a1..8190f6ede02 100644
>--- a/Source/ThirdParty/ANGLE/src/tests/deqp_support/angle_deqp_libtester_main.cpp
>+++ b/Source/ThirdParty/ANGLE/src/tests/deqp_support/angle_deqp_libtester_main.cpp
>@@ -12,6 +12,7 @@
> #include "common/angleutils.h"
> #include "deMath.h"
> #include "deUniquePtr.hpp"
>+#include "platform/Platform.h"
> #include "tcuApp.hpp"
> #include "tcuCommandLine.hpp"
> #include "tcuDefs.hpp"
>@@ -19,40 +20,39 @@
> #include "tcuRandomOrderExecutor.h"
> #include "tcuResource.hpp"
> #include "tcuTestLog.hpp"
>-#include "system_utils.h"
>+#include "util/system_utils.h"
> 
> #if (DE_OS == DE_OS_WIN32)
>-#include <Windows.h>
>+#    include <Windows.h>
> #elif (DE_OS == DE_OS_UNIX) || (DE_OS == DE_OS_OSX)
>-#include <sys/unistd.h>
>-#include <sys/stat.h>
>-#include <sys/types.h>
>+#    include <sys/stat.h>
>+#    include <sys/types.h>
>+#    include <sys/unistd.h>
> #elif (DE_OS == DE_OS_ANDROID)
>-#include <sys/stat.h>
>+#    include <sys/stat.h>
> #endif
> 
>-tcu::Platform *createPlatform();
>+tcu::Platform *CreateANGLEPlatform(angle::LogErrorFunc logErrorFunc);
> 
> namespace
> {
> 
>-tcu::Platform *g_platform = nullptr;
>-tcu::CommandLine *g_cmdLine = nullptr;
>-tcu::DirArchive *g_archive = nullptr;
>-tcu::TestLog *g_log = nullptr;
>-tcu::TestContext *g_testCtx = nullptr;
>-tcu::TestPackageRoot *g_root = nullptr;
>+tcu::Platform *g_platform            = nullptr;
>+tcu::CommandLine *g_cmdLine          = nullptr;
>+tcu::DirArchive *g_archive           = nullptr;
>+tcu::TestLog *g_log                  = nullptr;
>+tcu::TestContext *g_testCtx          = nullptr;
>+tcu::TestPackageRoot *g_root         = nullptr;
> tcu::RandomOrderExecutor *g_executor = nullptr;
> 
> const char *g_dEQPDataSearchDirs[] = {
>-    "data",
>-    "third_party/deqp/data",
>+    "../../../third_party/deqp/src/data",
>+    "../../sdcard/chromium_tests_root/third_party/angle/third_party/deqp/src/data",
>+    "../../third_party/angle/third_party/deqp/src/data",
>+    "../../third_party/deqp/src/data",
>     "../third_party/deqp/src/data",
>-    "deqp_support/data",
>+    "data",
>     "third_party/deqp/src/data",
>-    "../../third_party/deqp/src/data",
>-    "../../../third_party/deqp/src/data",
>-    "../../sdcard/chromium_tests_root/third_party/deqp/src/data",
> };
> 
> // TODO(jmadill): upstream to dEQP?
>@@ -78,7 +78,7 @@ deBool deIsDir(const char *filename)
>     return result == 0 && ((st.st_mode & S_IFDIR) == S_IFDIR);
> }
> #else
>-#error TODO(jmadill): support other platforms
>+#    error TODO(jmadill): support other platforms
> #endif
> 
> bool FindDataDir(std::string *dataDirOut)
>@@ -119,7 +119,9 @@ std::string GetLogFileName(std::string deqpDataDir)
> 
> }  // anonymous namespace
> 
>-ANGLE_LIBTESTER_EXPORT bool deqp_libtester_init_platform(int argc, const char *argv[])
>+ANGLE_LIBTESTER_EXPORT bool deqp_libtester_init_platform(int argc,
>+                                                         const char *argv[],
>+                                                         void *logErrorFunc)
> {
>     try
>     {
>@@ -127,9 +129,9 @@ ANGLE_LIBTESTER_EXPORT bool deqp_libtester_init_platform(int argc, const char *a
>         // Set stdout to line-buffered mode (will be fully buffered by default if stdout is pipe).
>         setvbuf(stdout, DE_NULL, _IOLBF, 4 * 1024);
> #endif
>-        g_platform = createPlatform();
>+        g_platform = CreateANGLEPlatform(reinterpret_cast<angle::LogErrorFunc>(logErrorFunc));
> 
>-        if (!deSetRoundingMode(DE_ROUNDINGMODE_TO_NEAREST))
>+        if (!deSetRoundingMode(DE_ROUNDINGMODE_TO_NEAREST_EVEN))
>         {
>             std::cout << "Failed to set floating point rounding mode." << std::endl;
>             return false;
>@@ -146,10 +148,10 @@ ANGLE_LIBTESTER_EXPORT bool deqp_libtester_init_platform(int argc, const char *a
>         g_archive = new tcu::DirArchive(deqpDataDir.c_str());
>         g_log     = new tcu::TestLog(GetLogFileName(deqpDataDir).c_str(), g_cmdLine->getLogFlags());
>         g_testCtx = new tcu::TestContext(*g_platform, *g_archive, *g_log, *g_cmdLine, DE_NULL);
>-        g_root = new tcu::TestPackageRoot(*g_testCtx, tcu::TestPackageRegistry::getSingleton());
>+        g_root    = new tcu::TestPackageRoot(*g_testCtx, tcu::TestPackageRegistry::getSingleton());
>         g_executor = new tcu::RandomOrderExecutor(*g_root, *g_testCtx);
>     }
>-    catch (const std::exception& e)
>+    catch (const std::exception &e)
>     {
>         tcu::die("%s", e.what());
>         return false;
>@@ -161,7 +163,7 @@ ANGLE_LIBTESTER_EXPORT bool deqp_libtester_init_platform(int argc, const char *a
> // Exported to the tester app.
> ANGLE_LIBTESTER_EXPORT int deqp_libtester_main(int argc, const char *argv[])
> {
>-    if (!deqp_libtester_init_platform(argc, argv))
>+    if (!deqp_libtester_init_platform(argc, argv, nullptr))
>     {
>         tcu::die("Could not initialize the dEQP platform");
>     }
>@@ -205,10 +207,10 @@ ANGLE_LIBTESTER_EXPORT void deqp_libtester_shutdown_platform()
>     g_platform = nullptr;
> }
> 
>-ANGLE_LIBTESTER_EXPORT bool deqp_libtester_run(const char *caseName)
>+ANGLE_LIBTESTER_EXPORT TestResult deqp_libtester_run(const char *caseName)
> {
>     const char *emptyString = "";
>-    if (g_platform == nullptr && !deqp_libtester_init_platform(1, &emptyString))
>+    if (g_platform == nullptr && !deqp_libtester_init_platform(1, &emptyString, nullptr))
>     {
>         tcu::die("Failed to initialize platform.");
>     }
>@@ -224,16 +226,18 @@ ANGLE_LIBTESTER_EXPORT bool deqp_libtester_run(const char *caseName)
>             switch (result.getCode())
>             {
>                 case QP_TEST_RESULT_PASS:
>+                    return TestResult::Pass;
>                 case QP_TEST_RESULT_NOT_SUPPORTED:
>-                    return true;
>+                    std::cout << "Not supported! " << result.getDescription() << std::endl;
>+                    return TestResult::NotSupported;
>                 case QP_TEST_RESULT_QUALITY_WARNING:
>                     std::cout << "Quality warning! " << result.getDescription() << std::endl;
>-                    return true;
>+                    return TestResult::Pass;
>                 case QP_TEST_RESULT_COMPATIBILITY_WARNING:
>                     std::cout << "Compatiblity warning! " << result.getDescription() << std::endl;
>-                    return true;
>+                    return TestResult::Pass;
>                 default:
>-                    return false;
>+                    return TestResult::Fail;
>             }
>         }
>         else
>@@ -244,7 +248,8 @@ ANGLE_LIBTESTER_EXPORT bool deqp_libtester_run(const char *caseName)
>     catch (const std::exception &e)
>     {
>         std::cout << "Exception running test: " << e.what() << std::endl;
>+        return TestResult::Exception;
>     }
> 
>-    return false;
>+    return TestResult::Fail;
> }
>diff --git a/Source/ThirdParty/ANGLE/src/tests/deqp_support/deqp_egl_TestExpectations b/Source/ThirdParty/ANGLE/src/tests/deqp_support/deqp_egl_TestExpectations
>deleted file mode 100644
>index 881368d9367..00000000000
>--- a/Source/ThirdParty/ANGLE/src/tests/deqp_support/deqp_egl_TestExpectations
>+++ /dev/null
>@@ -1,150 +0,0 @@
>-// Copyright 2015 The ANGLE Project Authors. All rights reserved.
>-// Use of this source code is governed by a BSD-style license that can be
>-// found in the LICENSE file.
>-
>-// This file contains a list of defective dEQP conformance tests. The expected
>-// format is:
>-//  {BUG#} {MODIFIERS} : {TEST_NAME} = {PASS,FAIL,FLAKY,TIMEOUT,SKIP}
>-//
>-// MODIFIERS can be a combination of the below list:
>-//  WIN XP VISTA WIN7 MAC LEOPARD SNOWLEOPARD LION LINUX CHROMEOS MOUNTAINLION
>-//  MAVERICKS
>-//  NVIDIA AMD INTEL
>-//  0xabcd - GPU PCI device ID. Specifying a PCI id requires a vendor.
>-//  DEBUG RELEASE
>-// TODO(jmadill): Add ANGLE Renderer selection modifiers
>-//
>-// TEST_NAME can be a specific test name, or have a '*' in the end, which
>-// indicates a prefix matching.
>-//
>-// Examples:
>-//  91530 MAC WIN LINUX : context_lost_restored = TIMEOUT
>-//  91533 WIN : gl_min_uniforms = FAIL
>-//  91531 MAC WIN LINUX : conformance_more_* = SKIP
>-//  91532 MAC NVIDIA 0x0640 : tex_image_and_sub_image_2d_with_video = PASS FAIL
>-
>-// ANGLE does not yet support multithreading
>-1340 WIN MAC LINUX : dEQP-EGL.functional.sharing.gles2.multithread.* = SKIP
>-1340 WIN MAC LINUX : dEQP-EGL.functional.multithread.* = SKIP
>-1340 WIN MAC LINUX : dEQP-EGL.functional.render.multi_thread.* = SKIP
>-
>-// dEQP doesn't handle configs created for extensions
>-1662 WIN : dEQP-EGL.functional.color_clears.single_context.gles2.other = FAIL
>-1662 WIN : dEQP-EGL.functional.color_clears.single_context.gles3.other = FAIL
>-1662 WIN : dEQP-EGL.functional.color_clears.multi_context.gles2.other = FAIL
>-1662 WIN : dEQP-EGL.functional.color_clears.multi_context.gles3.other = FAIL
>-1662 WIN : dEQP-EGL.functional.color_clears.multi_thread.gles2.other = FAIL
>-1662 WIN : dEQP-EGL.functional.color_clears.multi_thread.gles3.other = FAIL
>-1662 WIN : dEQP-EGL.functional.render.single_context.gles2.other = FAIL
>-1662 WIN : dEQP-EGL.functional.render.single_context.gles3.other = FAIL
>-1662 WIN : dEQP-EGL.functional.render.multi_context.gles2.other = FAIL
>-1662 WIN : dEQP-EGL.functional.render.multi_context.gles3.other = FAIL
>-1662 WIN : dEQP-EGL.functional.render.multi_context.gles2_gles3.other = FAIL
>-1662 WIN : dEQP-EGL.functional.render.multi_thread.gles2.other = FAIL
>-1662 WIN : dEQP-EGL.functional.render.multi_thread.gles3.other = FAIL
>-1662 WIN : dEQP-EGL.functional.native_coord_mapping.native_window.other_clear = FAIL
>-1662 WIN : dEQP-EGL.functional.native_coord_mapping.native_window.other_render = FAIL
>-1662 WIN : dEQP-EGL.functional.query_context.get_current_context.other = FAIL
>-1662 WIN : dEQP-EGL.functional.query_context.get_current_surface.other = FAIL
>-1662 WIN : dEQP-EGL.functional.query_context.get_current_display.other = FAIL
>-1662 WIN : dEQP-EGL.functional.query_context.query_context.other = FAIL
>-1662 WIN : dEQP-EGL.functional.native_color_mapping.native_window.other_clear = SKIP
>-1662 WIN : dEQP-EGL.functional.native_color_mapping.native_window.other_render = SKIP
>-
>-////////////////////////////////////////////////////////////////////////////////
>-//
>-//  Temprory entries: they should be removed once the bugs are fixed.
>-//
>-////////////////////////////////////////////////////////////////////////////////
>-
>-// TODO(jmadill): Triage these into permananent and temporary failures.
>-1340 WIN : dEQP-EGL.functional.query_config.get_configs.get_configs_bounds = FAIL
>-1340 WIN : dEQP-EGL.functional.choose_config.simple.selection_only.buffer_size = FAIL
>-1340 WIN : dEQP-EGL.functional.choose_config.simple.selection_only.red_size = FAIL
>-1340 WIN : dEQP-EGL.functional.choose_config.simple.selection_only.green_size = FAIL
>-1340 WIN : dEQP-EGL.functional.choose_config.simple.selection_only.blue_size = FAIL
>-1340 WIN : dEQP-EGL.functional.choose_config.simple.selection_only.luminance_size = FAIL
>-1340 WIN : dEQP-EGL.functional.choose_config.simple.selection_only.alpha_size = FAIL
>-1340 WIN : dEQP-EGL.functional.choose_config.simple.selection_only.alpha_mask_size = FAIL
>-1340 WIN : dEQP-EGL.functional.choose_config.simple.selection_only.bind_to_texture_rgb = FAIL
>-1340 WIN : dEQP-EGL.functional.choose_config.simple.selection_only.bind_to_texture_rgba = FAIL
>-1340 WIN : dEQP-EGL.functional.choose_config.simple.selection_only.color_buffer_type = FAIL
>-1340 WIN : dEQP-EGL.functional.choose_config.simple.selection_only.config_caveat = FAIL
>-1340 WIN : dEQP-EGL.functional.choose_config.simple.selection_only.config_id = FAIL
>-1340 WIN : dEQP-EGL.functional.choose_config.simple.selection_only.depth_size = FAIL
>-1340 WIN : dEQP-EGL.functional.choose_config.simple.selection_only.level = FAIL
>-1340 WIN : dEQP-EGL.functional.choose_config.simple.selection_only.max_swap_interval = FAIL
>-1340 WIN : dEQP-EGL.functional.choose_config.simple.selection_only.min_swap_interval = FAIL
>-1340 WIN : dEQP-EGL.functional.choose_config.simple.selection_only.native_renderable = FAIL
>-1340 WIN : dEQP-EGL.functional.choose_config.simple.selection_only.native_visual_type = FAIL
>-1340 WIN : dEQP-EGL.functional.choose_config.simple.selection_only.sample_buffers = FAIL
>-1340 WIN : dEQP-EGL.functional.choose_config.simple.selection_only.samples = FAIL
>-1340 WIN : dEQP-EGL.functional.choose_config.simple.selection_only.stencil_size = FAIL
>-1340 WIN : dEQP-EGL.functional.choose_config.simple.selection_only.surface_type = FAIL
>-1340 WIN : dEQP-EGL.functional.choose_config.simple.selection_only.transparent_red_value = FAIL
>-1340 WIN : dEQP-EGL.functional.choose_config.simple.selection_only.transparent_green_value = FAIL
>-1340 WIN : dEQP-EGL.functional.choose_config.simple.selection_only.transparent_blue_value = FAIL
>-1340 WIN : dEQP-EGL.functional.choose_config.simple.selection_and_sort.buffer_size = FAIL
>-1340 WIN : dEQP-EGL.functional.choose_config.simple.selection_and_sort.red_size = FAIL
>-1340 WIN : dEQP-EGL.functional.choose_config.simple.selection_and_sort.green_size = FAIL
>-1340 WIN : dEQP-EGL.functional.choose_config.simple.selection_and_sort.blue_size = FAIL
>-1340 WIN : dEQP-EGL.functional.choose_config.simple.selection_and_sort.luminance_size = FAIL
>-1340 WIN : dEQP-EGL.functional.choose_config.simple.selection_and_sort.alpha_size = FAIL
>-1340 WIN : dEQP-EGL.functional.choose_config.simple.selection_and_sort.alpha_mask_size = FAIL
>-1340 WIN : dEQP-EGL.functional.choose_config.simple.selection_and_sort.bind_to_texture_rgb = FAIL
>-1340 WIN : dEQP-EGL.functional.choose_config.simple.selection_and_sort.bind_to_texture_rgba = FAIL
>-1340 WIN : dEQP-EGL.functional.choose_config.simple.selection_and_sort.color_buffer_type = FAIL
>-1340 WIN : dEQP-EGL.functional.choose_config.simple.selection_and_sort.config_caveat = FAIL
>-1340 WIN : dEQP-EGL.functional.choose_config.simple.selection_and_sort.config_id = FAIL
>-1340 WIN : dEQP-EGL.functional.choose_config.simple.selection_and_sort.depth_size = FAIL
>-1340 WIN : dEQP-EGL.functional.choose_config.simple.selection_and_sort.level = FAIL
>-1340 WIN : dEQP-EGL.functional.choose_config.simple.selection_and_sort.max_swap_interval = FAIL
>-1340 WIN : dEQP-EGL.functional.choose_config.simple.selection_and_sort.min_swap_interval = FAIL
>-1340 WIN : dEQP-EGL.functional.choose_config.simple.selection_and_sort.native_renderable = FAIL
>-1340 WIN : dEQP-EGL.functional.choose_config.simple.selection_and_sort.native_visual_type = FAIL
>-1340 WIN : dEQP-EGL.functional.choose_config.simple.selection_and_sort.sample_buffers = FAIL
>-1340 WIN : dEQP-EGL.functional.choose_config.simple.selection_and_sort.samples = FAIL
>-1340 WIN : dEQP-EGL.functional.choose_config.simple.selection_and_sort.stencil_size = FAIL
>-1340 WIN : dEQP-EGL.functional.choose_config.simple.selection_and_sort.surface_type = FAIL
>-1340 WIN : dEQP-EGL.functional.choose_config.simple.selection_and_sort.transparent_red_value = FAIL
>-1340 WIN : dEQP-EGL.functional.choose_config.simple.selection_and_sort.transparent_green_value = FAIL
>-1340 WIN : dEQP-EGL.functional.choose_config.simple.selection_and_sort.transparent_blue_value = FAIL
>-1340 WIN : dEQP-EGL.functional.choose_config.random.color_sizes = FAIL
>-1340 WIN : dEQP-EGL.functional.choose_config.random.color_depth_stencil_sizes = FAIL
>-1340 WIN : dEQP-EGL.functional.choose_config.random.buffer_sizes = FAIL
>-1340 WIN : dEQP-EGL.functional.choose_config.random.surface_type = FAIL
>-1340 WIN : dEQP-EGL.functional.choose_config.random.sample_buffers = FAIL
>-1340 WIN : dEQP-EGL.functional.render.single_context.gles2.rgba5551_window = FAIL
>-1340 WIN : dEQP-EGL.functional.render.single_context.gles2.rgba5551_pbuffer = FAIL
>-1340 WIN : dEQP-EGL.functional.render.single_context.gles3.rgba5551_window = FAIL
>-1340 WIN : dEQP-EGL.functional.render.single_context.gles3.rgba5551_pbuffer = FAIL
>-1340 WIN : dEQP-EGL.functional.render.multi_context.gles2.rgba5551_window = FAIL
>-1340 WIN : dEQP-EGL.functional.render.multi_context.gles2.rgba5551_pbuffer = FAIL
>-1340 WIN : dEQP-EGL.functional.render.multi_context.gles3.rgba5551_window = FAIL
>-1340 WIN : dEQP-EGL.functional.render.multi_context.gles3.rgba5551_pbuffer = FAIL
>-1340 WIN : dEQP-EGL.functional.render.multi_context.gles2_gles3.rgba5551_window = FAIL
>-1340 WIN : dEQP-EGL.functional.render.multi_context.gles2_gles3.rgba5551_pbuffer = FAIL
>-1340 WIN : dEQP-EGL.functional.image.modify.tex_rgb8_tex_subimage_rgb565 = FAIL
>-1340 WIN : dEQP-EGL.functional.image.modify.tex_rgb565_tex_subimage_rgb8 = FAIL
>-1340 WIN : dEQP-EGL.functional.image.modify.tex_rgba8_tex_subimage_rgba5_a1 = FAIL
>-1340 WIN : dEQP-EGL.functional.image.modify.tex_rgba8_tex_subimage_rgba4 = FAIL
>-1340 WIN : dEQP-EGL.functional.image.modify.tex_rgba5_a1_tex_subimage_rgba8 = FAIL
>-1340 WIN : dEQP-EGL.functional.image.modify.tex_rgba5_a1_tex_subimage_rgba4 = FAIL
>-1340 WIN : dEQP-EGL.functional.image.modify.tex_rgba4_tex_subimage_rgba8 = FAIL
>-1340 WIN : dEQP-EGL.functional.image.modify.tex_rgba4_tex_subimage_rgba5_a1 = FAIL
>-1340 WIN : dEQP-EGL.functional.image.modify.renderbuffer_rgba4_tex_subimage_rgba8 = FAIL
>-1340 WIN : dEQP-EGL.functional.image.modify.renderbuffer_rgba4_tex_subimage_rgba5_a1 = FAIL
>-1340 WIN : dEQP-EGL.functional.image.modify.renderbuffer_rgb5_a1_tex_subimage_rgba8 = FAIL
>-1340 WIN : dEQP-EGL.functional.image.modify.renderbuffer_rgb5_a1_tex_subimage_rgba4 = FAIL
>-1340 WIN : dEQP-EGL.functional.image.modify.renderbuffer_rgb565_tex_subimage_rgb8 = FAIL
>-1340 WIN : dEQP-EGL.functional.negative_api.choose_config = SKIP
>-1340 WIN : dEQP-EGL.functional.negative_api.get_display = FAIL
>-1340 WIN : dEQP-EGL.functional.negative_api.surface_attrib = SKIP
>-1340 WIN : dEQP-EGL.functional.negative_api.swap_interval = FAIL
>-1340 WIN : dEQP-EGL.functional.native_color_mapping.native_window.* = FAIL
>-1340 WIN : dEQP-EGL.functional.native_coord_mapping.native_window.* = FAIL
>-1340 WIN : dEQP-EGL.functional.get_proc_address.extension.egl_ext_platform_base = FAIL
>-1340 WIN : dEQP-EGL.functional.preserve_swap.preserve.no_read_before_swap.* = SKIP
>-1340 WIN : dEQP-EGL.functional.preserve_swap.preserve.read_before_swap.* = SKIP
>-1340 WIN : dEQP-EGL.functional.resize.back_buffer.* = SKIP
>-1340 WIN : dEQP-EGL.functional.resize.pixel_density.* = SKIP
>diff --git a/Source/ThirdParty/ANGLE/src/tests/deqp_support/deqp_egl_test_expectations.txt b/Source/ThirdParty/ANGLE/src/tests/deqp_support/deqp_egl_test_expectations.txt
>new file mode 100644
>index 00000000000..93a842cabee
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/tests/deqp_support/deqp_egl_test_expectations.txt
>@@ -0,0 +1,235 @@
>+// Copyright 2015 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+
>+// This file contains a list of defective dEQP conformance tests. The expected
>+// format is:
>+//  {BUG#} {MODIFIERS} : {TEST_NAME} = {PASS,FAIL,FLAKY,TIMEOUT,SKIP}
>+//
>+// MODIFIERS can be a combination of the below list, combined with a logical AND:
>+//  WIN XP VISTA WIN7 WIN8 WIN10
>+//  MAC LEOPARD SNOWLEOPARD LION MOUNTAINLION MAVERICKS YOSEMITE ELCAPITAN SIERRA HIGHSIERRA MOJAVE
>+//  LINUX CHROMEOS ANDROID
>+//  NVIDIA AMD INTEL
>+//  DEBUG RELEASE
>+//  D3D9 D3D11 OPENGL GLES VULKAN
>+//  NEXUS5X PIXEL2
>+//  QUADROP400
>+//
>+//
>+// TEST_NAME can be a specific test name, or have a '*' in the end, which
>+// indicates a prefix matching.
>+//
>+// Examples:
>+// fails on both windows and mac (crash)
>+//  91530 WIN : context_lost_restored = SKIP
>+//  91530 MAC : context_lost_restored = SKIP
>+// fails on windows using NVIDIA GPUs
>+//  91533 WIN NVIDIA : gl_min_uniforms = FAIL
>+// fails on Nexus5X with GLES backend (hangs)
>+//  91531 NEXUS5X GLES : conformance_more_* = SKIP
>+
>+// ANGLE does not yet support multithreading
>+1340 : dEQP-EGL.functional.sharing.gles2.multithread.* = SKIP
>+1340 : dEQP-EGL.functional.multithread.* = SKIP
>+1340 : dEQP-EGL.functional.render.multi_thread.* = SKIP
>+
>+// dEQP doesn't handle configs created for extensions
>+1662 WIN : dEQP-EGL.functional.color_clears.single_context.gles2.other = FAIL
>+1662 WIN : dEQP-EGL.functional.color_clears.single_context.gles3.other = FAIL
>+1662 WIN : dEQP-EGL.functional.color_clears.multi_context.gles2.other = FAIL
>+1662 WIN : dEQP-EGL.functional.color_clears.multi_context.gles3.other = FAIL
>+1662 WIN : dEQP-EGL.functional.color_clears.multi_thread.gles2.other = FAIL
>+1662 WIN : dEQP-EGL.functional.color_clears.multi_thread.gles3.other = FAIL
>+1662 WIN : dEQP-EGL.functional.render.single_context.gles2.other = FAIL
>+1662 WIN : dEQP-EGL.functional.render.single_context.gles3.other = FAIL
>+1662 WIN : dEQP-EGL.functional.render.multi_context.gles2.other = FAIL
>+1662 WIN : dEQP-EGL.functional.render.multi_context.gles3.other = FAIL
>+1662 WIN : dEQP-EGL.functional.render.multi_context.gles2_gles3.other = FAIL
>+1662 WIN : dEQP-EGL.functional.render.multi_thread.gles2.other = FAIL
>+1662 WIN : dEQP-EGL.functional.render.multi_thread.gles3.other = FAIL
>+1662 WIN : dEQP-EGL.functional.native_coord_mapping.native_window.other_clear = FAIL
>+1662 WIN : dEQP-EGL.functional.native_coord_mapping.native_window.other_render = FAIL
>+1662 WIN : dEQP-EGL.functional.query_context.get_current_context.other = FAIL
>+1662 WIN : dEQP-EGL.functional.query_context.get_current_surface.other = FAIL
>+1662 WIN : dEQP-EGL.functional.query_context.get_current_display.other = FAIL
>+1662 WIN : dEQP-EGL.functional.query_context.query_context.other = FAIL
>+1662 WIN : dEQP-EGL.functional.native_color_mapping.native_window.other_clear = SKIP
>+1662 WIN : dEQP-EGL.functional.native_color_mapping.native_window.other_render = SKIP
>+
>+// Intentionally causes TDRs that eventually blacklist the application
>+2319 : dEQP-EGL.functional.robustness.reset_context.shaders.infinite_loop.* = SKIP
>+
>+////////////////////////////////////////////////////////////////////////////////
>+//
>+//  Temprory entries: they should be removed once the bugs are fixed.
>+//
>+////////////////////////////////////////////////////////////////////////////////
>+
>+// Flaky since we enabled depth/stencil backbuffer in all tests.
>+2429 WIN NVIDIA : dEQP-EGL.functional.query_context.query_context.rgba8888_window = FAIL
>+
>+// TODO(jmadill): Triage these into permananent and temporary failures.
>+1340 WIN : dEQP-EGL.functional.query_config.get_configs.get_configs_bounds = FAIL
>+3270 WIN : dEQP-EGL.functional.choose_config.simple.selection_only.config_id = FAIL
>+3270 WIN : dEQP-EGL.functional.choose_config.simple.selection_and_sort.config_id = FAIL
>+1340 WIN : dEQP-EGL.functional.render.single_context.gles2.rgba5551_window = FAIL
>+1340 WIN : dEQP-EGL.functional.render.single_context.gles2.rgba5551_pbuffer = FAIL
>+1340 WIN : dEQP-EGL.functional.render.single_context.gles3.rgba5551_window = FAIL
>+1340 WIN : dEQP-EGL.functional.render.single_context.gles3.rgba5551_pbuffer = FAIL
>+1340 WIN : dEQP-EGL.functional.render.multi_context.gles2.rgba5551_window = FAIL
>+1340 WIN : dEQP-EGL.functional.render.multi_context.gles2.rgba5551_pbuffer = FAIL
>+1340 WIN : dEQP-EGL.functional.render.multi_context.gles3.rgba5551_window = FAIL
>+1340 WIN : dEQP-EGL.functional.render.multi_context.gles3.rgba5551_pbuffer = FAIL
>+1340 WIN : dEQP-EGL.functional.render.multi_context.gles2_gles3.rgba5551_window = FAIL
>+1340 WIN : dEQP-EGL.functional.render.multi_context.gles2_gles3.rgba5551_pbuffer = FAIL
>+1340 WIN : dEQP-EGL.functional.negative_api.choose_config = SKIP
>+1340 WIN : dEQP-EGL.functional.negative_api.surface_attrib = SKIP
>+1340 WIN : dEQP-EGL.functional.negative_api.swap_interval = FAIL
>+2382 WIN : dEQP-EGL.functional.native_color_mapping.native_window.* = SKIP
>+1340 WIN : dEQP-EGL.functional.native_coord_mapping.native_window.* = FAIL
>+2716 WIN : dEQP-EGL.functional.preserve_swap.preserve.no_read_before_swap.* = SKIP
>+2716 WIN : dEQP-EGL.functional.preserve_swap.preserve.read_before_swap.* = SKIP
>+1340 WIN : dEQP-EGL.functional.resize.back_buffer.* = SKIP
>+1340 WIN : dEQP-EGL.functional.resize.pixel_density.* = SKIP
>+
>+// Windows OpenGL failures
>+2546 WIN : dEQP-EGL.functional.resize.surface_size.shrink = SKIP
>+2546 WIN : dEQP-EGL.functional.color_clears.multi_thread.* = FAIL
>+2546 WIN : dEQP-EGL.functional.query_surface.simple.pbuffer.rgba8888_depth_stencil = FAIL
>+2546 WIN : dEQP-EGL.functional.thread_cleanup.* = SKIP
>+
>+// Windows Vulkan failures
>+2635 WIN VULKAN : dEQP-EGL.functional.multicontext.non_shared_clear = FAIL
>+2635 WIN VULKAN : dEQP-EGL.functional.multicontext.non_shared_make_current = FAIL
>+2635 WIN VULKAN : dEQP-EGL.functional.multicontext.shared_clear = FAIL
>+2635 WIN VULKAN : dEQP-EGL.functional.multicontext.shared_make_current = FAIL
>+2635 WIN VULKAN : dEQP-EGL.functional.query_surface.set_attribute.pbuffer.rgba8888_depth_stencil = FAIL
>+2635 WIN VULKAN : dEQP-EGL.functional.query_surface.set_attribute.pbuffer.rgba8888_no_depth_no_stencil = FAIL
>+2715 WIN VULKAN : dEQP-EGL.functional.query_surface.simple.pbuffer.rgb888_depth_no_stencil = FAIL
>+2715 WIN VULKAN : dEQP-EGL.functional.query_surface.simple.pbuffer.rgb888_depth_stencil = FAIL
>+2715 WIN VULKAN : dEQP-EGL.functional.query_surface.simple.pbuffer.rgb888_no_depth_no_stencil = FAIL
>+2715 WIN VULKAN : dEQP-EGL.functional.query_surface.simple.pbuffer.rgba8888_depth_no_stencil = FAIL
>+2715 WIN VULKAN : dEQP-EGL.functional.query_surface.simple.pbuffer.rgba8888_no_depth_no_stencil = FAIL
>+2635 WIN VULKAN : dEQP-EGL.functional.resize.surface_size.grow = FAIL
>+2635 WIN VULKAN : dEQP-EGL.functional.resize.surface_size.stretch_height = FAIL
>+2635 WIN VULKAN : dEQP-EGL.functional.resize.surface_size.stretch_width = FAIL
>+2635 WIN VULKAN : dEQP-EGL.functional.wide_color.pbuffer_8888_colorspace_default = FAIL
>+2716 WIN VULKAN : dEQP-EGL.functional.preserve_swap.no_preserve.* = FAIL
>+
>+// Linux failures
>+2546 LINUX : dEQP-EGL.functional.color_clears.multi_context.gles1.rgba8888_pixmap = SKIP
>+2546 LINUX : dEQP-EGL.functional.color_clears.multi_context.gles1_gles2.rgba8888_pixmap = SKIP
>+2546 LINUX : dEQP-EGL.functional.color_clears.multi_context.gles1_gles2_gles3.rgba8888_pixmap = SKIP
>+2546 LINUX : dEQP-EGL.functional.color_clears.multi_context.gles2.rgba8888_pixmap = SKIP
>+2546 LINUX : dEQP-EGL.functional.color_clears.multi_context.gles3.rgba8888_pixmap = SKIP
>+2546 LINUX : dEQP-EGL.functional.color_clears.multi_thread.* = SKIP
>+2546 LINUX : dEQP-EGL.functional.color_clears.multi_thread.gles1_gles2.rgba8888_pixmap = SKIP
>+2546 LINUX : dEQP-EGL.functional.color_clears.multi_thread.gles1_gles2_gles3.rgba8888_pixmap = SKIP
>+2546 LINUX : dEQP-EGL.functional.color_clears.single_context.gles1.rgba8888_pixmap = SKIP
>+2546 LINUX : dEQP-EGL.functional.color_clears.single_context.gles2.rgba8888_pixmap = SKIP
>+2546 LINUX : dEQP-EGL.functional.color_clears.single_context.gles3.rgba8888_pixmap = SKIP
>+2546 LINUX : dEQP-EGL.functional.create_surface.pixmap.rgba8888_depth_stencil = SKIP
>+2546 LINUX : dEQP-EGL.functional.create_surface.pixmap.rgba8888_no_depth_no_stencil = SKIP
>+2546 LINUX : dEQP-EGL.functional.negative_api.copy_buffers = SKIP
>+2546 LINUX : dEQP-EGL.functional.query_context.get_current_context.rgba8888_pixmap = SKIP
>+2546 LINUX : dEQP-EGL.functional.query_context.get_current_display.rgba8888_pixmap = SKIP
>+2546 LINUX : dEQP-EGL.functional.query_context.get_current_surface.rgba8888_pixmap = SKIP
>+2546 LINUX : dEQP-EGL.functional.query_context.query_context.rgba8888_pixmap = SKIP
>+2546 LINUX : dEQP-EGL.functional.query_surface.set_attribute.pixmap.rgba8888_depth_stencil = SKIP
>+2546 LINUX : dEQP-EGL.functional.query_surface.set_attribute.pixmap.rgba8888_no_depth_no_stencil = SKIP
>+2546 LINUX : dEQP-EGL.functional.query_surface.simple.pixmap.rgba8888_depth_stencil = SKIP
>+2546 LINUX : dEQP-EGL.functional.query_surface.simple.pixmap.rgba8888_no_depth_no_stencil = SKIP
>+2546 LINUX : dEQP-EGL.functional.render.multi_context.* = SKIP
>+2546 LINUX : dEQP-EGL.functional.render.single_context.gles2.rgba8888_pixmap = SKIP
>+2546 LINUX : dEQP-EGL.functional.render.single_context.gles3.rgba8888_pixmap = SKIP
>+2546 LINUX : dEQP-EGL.functional.thread_cleanup.* = SKIP
>+2546 LINUX : dEQP-EGL.functional.native_color_mapping.native_window.* = FAIL
>+2546 LINUX : dEQP-EGL.functional.native_coord_mapping.native_window.* = FAIL
>+2546 LINUX : dEQP-EGL.functional.negative_api.choose_config = FAIL
>+2546 LINUX : dEQP-EGL.functional.negative_api.swap_interval = FAIL
>+2546 LINUX : dEQP-EGL.functional.query_surface.simple.pbuffer.rgba8888_depth_stencil = FAIL
>+2546 LINUX : dEQP-EGL.functional.query_surface.simple.pbuffer.rgba8888_no_depth_no_stencil = FAIL
>+
>+// Linux Vulkan failures
>+2635 LINUX VULKAN : dEQP-EGL.functional.query_surface.set_attribute.pbuffer.rgba8888_depth_stencil = FAIL
>+2635 LINUX VULKAN : dEQP-EGL.functional.query_surface.set_attribute.pbuffer.rgba8888_no_depth_no_stencil = FAIL
>+2715 LINUX VULKAN : dEQP-EGL.functional.query_surface.simple.pbuffer.rgb888_depth_stencil = FAIL
>+2715 LINUX VULKAN : dEQP-EGL.functional.query_surface.simple.pbuffer.rgb888_no_depth_no_stencil = FAIL
>+2716 LINUX VULKAN : dEQP-EGL.functional.preserve_swap.no_preserve.* = FAIL
>+
>+// Mac failures
>+2546 MAC : dEQP-EGL.functional.native_color_mapping.native_window.* = FAIL
>+2546 MAC : dEQP-EGL.functional.native_coord_mapping.native_window.* = FAIL
>+2546 MAC : dEQP-EGL.functional.negative_api.choose_config = FAIL
>+2546 MAC : dEQP-EGL.functional.negative_api.copy_buffers = FAIL
>+2546 MAC : dEQP-EGL.functional.negative_api.swap_interval = FAIL
>+2546 MAC : dEQP-EGL.functional.query_surface.simple.pbuffer.rgba8888_depth_stencil = FAIL
>+2546 MAC : dEQP-EGL.functional.color_clears.multi_thread.* = SKIP
>+2546 MAC : dEQP-EGL.functional.thread_cleanup.* = SKIP
>+
>+// Android GLES-only failues
>+2567 ANDROID GLES : dEQP-EGL.functional.image.api.create_image_gles2_tex2d_red = FAIL
>+2567 ANDROID GLES : dEQP-EGL.functional.image.api.create_image_gles2_tex2d_rg = FAIL
>+2716 ANDROID GLES : dEQP-EGL.functional.preserve_swap.preserve.* = FAIL
>+
>+// Android failures
>+2546 ANDROID : dEQP-EGL.functional.buffer_age.* = FAIL
>+3270 ANDROID : dEQP-EGL.functional.choose_config.simple.selection_only.transparent_red_value = FAIL
>+3270 ANDROID : dEQP-EGL.functional.choose_config.simple.selection_only.transparent_green_value = FAIL
>+3270 ANDROID : dEQP-EGL.functional.choose_config.simple.selection_only.transparent_blue_value = FAIL
>+3270 ANDROID : dEQP-EGL.functional.choose_config.simple.selection_and_sort.transparent_red_value = FAIL
>+3270 ANDROID : dEQP-EGL.functional.choose_config.simple.selection_and_sort.transparent_green_value = FAIL
>+3270 ANDROID : dEQP-EGL.functional.choose_config.simple.selection_and_sort.transparent_blue_value = FAIL
>+2546 ANDROID : dEQP-EGL.functional.color_clears.multi_context.* = SKIP
>+2546 ANDROID : dEQP-EGL.functional.color_clears.multi_thread.* = SKIP
>+2546 ANDROID : dEQP-EGL.functional.color_clears.single_context.* = SKIP
>+2546 ANDROID : dEQP-EGL.functional.native_color_mapping.native_window.* = SKIP
>+2546 ANDROID : dEQP-EGL.functional.native_coord_mapping.native_window.* = SKIP
>+2546 ANDROID : dEQP-EGL.functional.negative_api.copy_buffers = FAIL
>+2546 ANDROID : dEQP-EGL.functional.partial_update.odd_clear_* = FAIL
>+2546 ANDROID : dEQP-EGL.functional.partial_update.odd_render_* = FAIL
>+2546 ANDROID : dEQP-EGL.functional.partial_update.render_* = FAIL
>+2546 ANDROID : dEQP-EGL.functional.query_context.get_current_context.* = SKIP
>+2546 ANDROID : dEQP-EGL.functional.query_context.get_current_display.* = SKIP
>+2546 ANDROID : dEQP-EGL.functional.query_context.get_current_surface.r* = FAIL
>+2546 ANDROID : dEQP-EGL.functional.query_context.query_context.* = SKIP
>+2546 ANDROID : dEQP-EGL.functional.render.multi_context.* = SKIP
>+2546 ANDROID : dEQP-EGL.functional.render.single_context.* = SKIP
>+2546 ANDROID : dEQP-EGL.functional.thread_cleanup.multi_context_* = SKIP
>+2546 ANDROID : dEQP-EGL.functional.thread_cleanup.single_context_* = FAIL
>+
>+// Vulkan
>+3081 VULKAN : dEQP-EGL.functional.image.create.gles2_renderbuffer_depth16_depth_buffer = SKIP
>+3081 VULKAN : dEQP-EGL.functional.image.create.gles2_renderbuffer_stencil_stencil_buffer = SKIP
>+3081 VULKAN : dEQP-EGL.functional.image.modify.renderbuffer_depth16_renderbuffer_clear_depth = SKIP
>+3081 VULKAN : dEQP-EGL.functional.image.modify.renderbuffer_stencil_renderbuffer_clear_stencil = SKIP
>+3081 VULKAN : dEQP-EGL.functional.image.render_multiple_contexts.gles2_renderbuffer_depth16_depth_buffer = SKIP
>+3081 VULKAN : dEQP-EGL.functional.image.render_multiple_contexts.gles2_renderbuffer_stencil_stencil_buffer = SKIP
>+
>+// Android Vulkan
>+2546 ANDROID VULKAN : dEQP-EGL.functional.create_surface.window.other = SKIP
>+2546 ANDROID VULKAN : dEQP-EGL.functional.query_context.get_current_surface.other = SKIP
>+2546 ANDROID VULKAN : dEQP-EGL.functional.query_surface.set_attribute.window.other = SKIP
>+2546 ANDROID VULKAN : dEQP-EGL.functional.query_surface.simple.window.other = SKIP
>+2546 ANDROID VULKAN : dEQP-EGL.functional.resize.pixel_density.* = SKIP
>+2546 ANDROID VULKAN : dEQP-EGL.functional.wide_color.window* = SKIP
>+
>+// ES 1 tests
>+2306 WIN : dEQP-EGL.functional.color_clears.single_context.gles1* = FAIL
>+2306 WIN : dEQP-EGL.functional.color_clears.multi_context.gles1* = FAIL
>+2306 MAC : dEQP-EGL.functional.color_clears.single_context.gles1* = FAIL
>+2306 MAC : dEQP-EGL.functional.color_clears.multi_context.gles1* = FAIL
>+2306 LINUX : dEQP-EGL.functional.color_clears.single_context.gles1* = FAIL
>+2306 LINUX : dEQP-EGL.functional.color_clears.multi_context.gles1* = FAIL
>+
>+// Tests failing since the Jan 2018 roll of dEQP
>+2341 : dEQP-EGL.functional.swap_buffers.* = SKIP
>+2330 : dEQP-EGL.functional.robustness.create_context.no_reset_notification = SKIP
>+2330 : dEQP-EGL.functional.robustness.create_context.lose_context_on_reset = SKIP
>+2330 : dEQP-EGL.functional.robustness.reset_context.fixed_function_pipeline.reset_status.index_buffer_out_of_bounds = SKIP
>+2330 : dEQP-EGL.functional.robustness.reset_context.fixed_function_pipeline.reset_status.vertex_buffer_out_of_bounds = SKIP
>+
>+// Tests were being hidden by flakiness (anglebug.com/3271)
>+3325 : dEQP-EGL.functional.fence_sync.* = SKIP
>+3325 : dEQP-EGL.functional.reusable_sync.* = SKIP
>diff --git a/Source/ThirdParty/ANGLE/src/tests/deqp_support/deqp_gles2_TestExpectations b/Source/ThirdParty/ANGLE/src/tests/deqp_support/deqp_gles2_TestExpectations
>deleted file mode 100644
>index 318b65c6d7d..00000000000
>--- a/Source/ThirdParty/ANGLE/src/tests/deqp_support/deqp_gles2_TestExpectations
>+++ /dev/null
>@@ -1,167 +0,0 @@
>-// Copyright 2015 The ANGLE Project Authors. All rights reserved.
>-// Use of this source code is governed by a BSD-style license that can be
>-// found in the LICENSE file.
>-
>-// This file contains a list of defective dEQP conformance tests. The expected
>-// format is:
>-//  {BUG#} {MODIFIERS} : {TEST_NAME} = {PASS,FAIL,FLAKY,TIMEOUT,SKIP}
>-//
>-// MODIFIERS can be a combination of the below list:
>-//  WIN XP VISTA WIN7 MAC LEOPARD SNOWLEOPARD LION LINUX CHROMEOS MOUNTAINLION
>-//  MAVERICKS
>-//  NVIDIA AMD INTEL
>-//  0xabcd - GPU PCI device ID. Specifying a PCI id requires a vendor.
>-//  DEBUG RELEASE
>-// TODO(jmadill): Add ANGLE Renderer selection modifiers
>-//
>-// TEST_NAME can be a specific test name, or have a '*' in the end, which
>-// indicates a prefix matching.
>-//
>-// Examples:
>-//  91530 MAC WIN LINUX : context_lost_restored = TIMEOUT
>-//  91533 WIN : gl_min_uniforms = FAIL
>-//  91531 MAC WIN LINUX : conformance_more_* = SKIP
>-//  91532 MAC NVIDIA 0x0640 : tex_image_and_sub_image_2d_with_video = PASS FAIL
>-
>-// Skip these tests due to timeouts
>-1034 DEBUG RELEASE : dEQP-GLES2.functional.flush_finish.* = SKIP
>-
>-// Don't run these tests for faster turnover
>-998 DEBUG RELEASE : dEQP-GLES2.performance.* = SKIP
>-998 DEBUG RELEASE : dEQP-GLES2.stress.* = SKIP
>-
>-// Tests that we fail because they're not in line with the WebGL spec
>-1335 DEBUG RELEASE : dEQP-GLES2.functional.shaders.preprocessor.conditional_inclusion.basic_2* = FAIL
>-
>-// Failures related to not supporting separate depth/stencil masks on D3D11.
>-1655 D3D11 : dEQP-GLES2.functional.fragment_ops.depth_stencil.stencil_depth_funcs.stencil_* = FAIL
>-1655 D3D11 : dEQP-GLES2.functional.fragment_ops.depth_stencil.stencil_ops.* = FAIL
>-1655 D3D11 : dEQP-GLES2.functional.fragment_ops.depth_stencil.write_mask.* = FAIL
>-1655 D3D11 : dEQP-GLES2.functional.fragment_ops.blend.equation_src_func_dst_func.add_constant_color_constant_alpha = FAIL
>-1655 D3D11 : dEQP-GLES2.functional.fragment_ops.blend.equation_src_func_dst_func.add_constant_color_one_minus_constant_alpha = FAIL
>-1655 D3D11 : dEQP-GLES2.functional.fragment_ops.blend.equation_src_func_dst_func.add_one_minus_constant_color_constant_alpha = FAIL
>-1655 D3D11 : dEQP-GLES2.functional.fragment_ops.blend.equation_src_func_dst_func.add_one_minus_constant_color_one_minus_constant_alpha = FAIL
>-1655 D3D11 : dEQP-GLES2.functional.fragment_ops.blend.equation_src_func_dst_func.add_constant_alpha_constant_color = FAIL
>-1655 D3D11 : dEQP-GLES2.functional.fragment_ops.blend.equation_src_func_dst_func.add_constant_alpha_one_minus_constant_color = FAIL
>-1655 D3D11 : dEQP-GLES2.functional.fragment_ops.blend.equation_src_func_dst_func.add_one_minus_constant_alpha_constant_color = FAIL
>-1655 D3D11 : dEQP-GLES2.functional.fragment_ops.blend.equation_src_func_dst_func.add_one_minus_constant_alpha_one_minus_constant_color = FAIL
>-1655 D3D11 : dEQP-GLES2.functional.fragment_ops.blend.equation_src_func_dst_func.subtract_constant_color_constant_alpha = FAIL
>-1655 D3D11 : dEQP-GLES2.functional.fragment_ops.blend.equation_src_func_dst_func.subtract_constant_color_one_minus_constant_alpha = FAIL
>-1655 D3D11 : dEQP-GLES2.functional.fragment_ops.blend.equation_src_func_dst_func.subtract_one_minus_constant_color_constant_alpha = FAIL
>-1655 D3D11 : dEQP-GLES2.functional.fragment_ops.blend.equation_src_func_dst_func.subtract_one_minus_constant_color_one_minus_constant_alpha = FAIL
>-1655 D3D11 : dEQP-GLES2.functional.fragment_ops.blend.equation_src_func_dst_func.subtract_constant_alpha_constant_color = FAIL
>-1655 D3D11 : dEQP-GLES2.functional.fragment_ops.blend.equation_src_func_dst_func.subtract_constant_alpha_one_minus_constant_color = FAIL
>-1655 D3D11 : dEQP-GLES2.functional.fragment_ops.blend.equation_src_func_dst_func.subtract_one_minus_constant_alpha_constant_color = FAIL
>-1655 D3D11 : dEQP-GLES2.functional.fragment_ops.blend.equation_src_func_dst_func.subtract_one_minus_constant_alpha_one_minus_constant_color = FAIL
>-1655 D3D11 : dEQP-GLES2.functional.fragment_ops.blend.equation_src_func_dst_func.reverse_subtract_constant_color_constant_alpha = FAIL
>-1655 D3D11 : dEQP-GLES2.functional.fragment_ops.blend.equation_src_func_dst_func.reverse_subtract_constant_color_one_minus_constant_alpha = FAIL
>-1655 D3D11 : dEQP-GLES2.functional.fragment_ops.blend.equation_src_func_dst_func.reverse_subtract_one_minus_constant_color_constant_alpha = FAIL
>-1655 D3D11 : dEQP-GLES2.functional.fragment_ops.blend.equation_src_func_dst_func.reverse_subtract_one_minus_constant_color_one_minus_constant_alpha = FAIL
>-1655 D3D11 : dEQP-GLES2.functional.fragment_ops.blend.equation_src_func_dst_func.reverse_subtract_constant_alpha_constant_color = FAIL
>-1655 D3D11 : dEQP-GLES2.functional.fragment_ops.blend.equation_src_func_dst_func.reverse_subtract_constant_alpha_one_minus_constant_color = FAIL
>-1655 D3D11 : dEQP-GLES2.functional.fragment_ops.blend.equation_src_func_dst_func.reverse_subtract_one_minus_constant_alpha_constant_color = FAIL
>-1655 D3D11 : dEQP-GLES2.functional.fragment_ops.blend.equation_src_func_dst_func.reverse_subtract_one_minus_constant_alpha_one_minus_constant_color = FAIL
>-1655 D3D11 : dEQP-GLES2.functional.fragment_ops.random.* = FAIL
>-1655 D3D11 : dEQP-GLES2.functional.fragment_ops.interaction.basic_shader.* = FAIL
>-
>-////////////////////////////////////////////////////////////////////////////////
>-//
>-//  Temporary entries: they should be removed once the bugs are fixed.
>-//
>-////////////////////////////////////////////////////////////////////////////////
>-
>-// Only fails in D3D11 32-bit.
>-1418 D3D11 : dEQP-GLES2.functional.clipping.triangle_vertex.clip_three.clip_pos_x_pos_y_pos_z_and_neg_x_pos_y_pos_z_and_neg_x_neg_y_neg_z = FAIL
>-
>-// Quadro P400
>-// TODO(jmadill): Narrow to P400 device only: 0x1CB3.
>-2222 D3D11 NVIDIA : dEQP-GLES2.functional.shaders.functions.control_flow.return_in_nested_loop_fragment = FAIL
>-2222 D3D11 NVIDIA : dEQP-GLES2.functional.shaders.functions.control_flow.return_in_nested_loop_vertex = FAIL
>-
>-// Failures on the D3D11 bots that do not reproduce locally
>-// TODO(jmadill): Figure out why these fail on the bots, but not locally.
>-1108 D3D11 : dEQP-GLES2.functional.shaders.struct.local.dynamic_loop_struct_array_fragment = FAIL
>-1108 D3D11 : dEQP-GLES2.functional.shaders.invariance.highp.loop_2 = FAIL
>-1108 D3D11 : dEQP-GLES2.functional.shaders.invariance.mediump.loop_2 = FAIL
>-
>-// OpenGL desktop back-end failures
>-1656 OPENGL : dEQP-GLES2.functional.fbo.completeness.renderable.texture.stencil.srgb8_alpha8 = FAIL
>-1656 OPENGL : dEQP-GLES2.functional.fbo.completeness.renderable.texture.depth.srgb8_alpha8 = FAIL
>-
>-// Mac specific failures
>-1143 MAC : dEQP-GLES2.functional.shaders.scoping.valid.local_int_variable_hides_struct_type_* = FAIL
>-1143 MAC : dEQP-GLES2.functional.shaders.scoping.valid.local_struct_variable_hides_struct_type_* = FAIL
>-1143 MAC : dEQP-GLES2.functional.shaders.scoping.valid.function_parameter_hides_struct_type_* = FAIL
>-1143 MAC : dEQP-GLES2.functional.shaders.random.trigonometric.vertex.65 = FAIL
>-
>-// Mac Intel specific
>-2137 MAC INTEL : dEQP-GLES2.functional.color_clear.complex_rgb = FAIL
>-2137 MAC INTEL : dEQP-GLES2.functional.color_clear.complex_rgba = FAIL
>-2137 MAC INTEL : dEQP-GLES2.functional.color_clear.long_masked_rgb = FAIL
>-2137 MAC INTEL : dEQP-GLES2.functional.color_clear.long_masked_rgba = FAIL
>-2137 MAC INTEL : dEQP-GLES2.functional.color_clear.masked_rgb = FAIL
>-2137 MAC INTEL : dEQP-GLES2.functional.color_clear.masked_rgba = FAIL
>-2137 MAC INTEL : dEQP-GLES2.functional.color_clear.masked_scissored_rgb = FAIL
>-2137 MAC INTEL : dEQP-GLES2.functional.color_clear.masked_scissored_rgba = FAIL
>-2137 MAC INTEL : dEQP-GLES2.functional.color_clear.scissored_rgb = FAIL
>-2137 MAC INTEL : dEQP-GLES2.functional.color_clear.scissored_rgba = FAIL
>-2137 MAC INTEL : dEQP-GLES2.functional.color_clear.short_scissored_rgb = FAIL
>-2137 MAC INTEL : dEQP-GLES2.functional.texture.specification.basic_copyteximage2d.cube_alpha = FAIL
>-2137 MAC INTEL : dEQP-GLES2.functional.texture.specification.basic_copyteximage2d.cube_luminance = FAIL
>-2137 MAC INTEL : dEQP-GLES2.functional.texture.specification.basic_copyteximage2d.cube_luminance_alpha = FAIL
>-2137 MAC INTEL : dEQP-GLES2.functional.texture.specification.basic_copyteximage2d.cube_rgb = FAIL
>-2137 MAC INTEL : dEQP-GLES2.functional.texture.specification.basic_copyteximage2d.cube_rgba = FAIL
>-2137 MAC INTEL : dEQP-GLES2.functional.shaders.discard.dynamic_loop_never = SKIP
>-2137 MAC INTEL : dEQP-GLES2.functional.shaders.discard.function_static_loop_never = SKIP
>-2137 MAC INTEL : dEQP-GLES2.functional.shaders.discard.static_loop_never = SKIP
>-
>-// Mac AMD specific
>-2137 MAC AMD : dEQP-GLES2.functional.clipping.point.wide_point_clip = FAIL
>-
>-// Android only failures
>-1484 ANDROID : dEQP-GLES2.functional.vertex_arrays.* = SKIP
>-1485 ANDROID : dEQP-GLES2.functional.clipping.triangle_vertex.clip_three.clip_neg_x_neg_z_and_pos_x_pos_z_and_neg_x_neg_y_pos_z = FAIL
>-1486 ANDROID : dEQP-GLES2.functional.fbo.completeness.attachment_combinations.none_none_none_tex = FAIL
>-1486 ANDROID : dEQP-GLES2.functional.fbo.completeness.attachment_combinations.none_none_rbo_tex = FAIL
>-1486 ANDROID : dEQP-GLES2.functional.fbo.completeness.attachment_combinations.none_none_tex_none = FAIL
>-1486 ANDROID : dEQP-GLES2.functional.fbo.completeness.attachment_combinations.none_none_tex_rbo = FAIL
>-1486 ANDROID : dEQP-GLES2.functional.fbo.completeness.attachment_combinations.none_none_tex_tex = FAIL
>-1486 ANDROID : dEQP-GLES2.functional.fbo.completeness.attachment_combinations.rbo_none_none_tex = FAIL
>-1486 ANDROID : dEQP-GLES2.functional.fbo.completeness.attachment_combinations.rbo_none_rbo_tex = FAIL
>-1486 ANDROID : dEQP-GLES2.functional.fbo.completeness.attachment_combinations.rbo_none_tex_none = FAIL
>-1486 ANDROID : dEQP-GLES2.functional.fbo.completeness.attachment_combinations.rbo_none_tex_rbo = FAIL
>-1486 ANDROID : dEQP-GLES2.functional.fbo.completeness.attachment_combinations.rbo_none_tex_tex = FAIL
>-1486 ANDROID : dEQP-GLES2.functional.fbo.completeness.attachment_combinations.tex_none_none_tex = FAIL
>-1486 ANDROID : dEQP-GLES2.functional.fbo.completeness.attachment_combinations.tex_none_rbo_tex = FAIL
>-1486 ANDROID : dEQP-GLES2.functional.fbo.completeness.attachment_combinations.tex_none_tex_none = FAIL
>-1486 ANDROID : dEQP-GLES2.functional.fbo.completeness.attachment_combinations.tex_none_tex_rbo = FAIL
>-1486 ANDROID : dEQP-GLES2.functional.fbo.completeness.attachment_combinations.tex_none_tex_tex = FAIL
>-1487 ANDROID : dEQP-GLES2.functional.fbo.completeness.renderable.texture.color0.depth_stencil_unsigned_int_24_8 = FAIL
>-1487 ANDROID : dEQP-GLES2.functional.fbo.completeness.renderable.texture.color0.srgb8 = FAIL
>-1487 ANDROID : dEQP-GLES2.functional.fbo.completeness.renderable.texture.stencil.depth_stencil_unsigned_int_24_8 = FAIL
>-1487 ANDROID : dEQP-GLES2.functional.fbo.completeness.renderable.texture.stencil.srgb8 = FAIL
>-1487 ANDROID : dEQP-GLES2.functional.fbo.completeness.renderable.texture.depth.depth_stencil_unsigned_int_24_8 = FAIL
>-1487 ANDROID : dEQP-GLES2.functional.fbo.completeness.renderable.texture.depth.srgb8 = FAIL
>-1488 ANDROID : dEQP-GLES2.functional.shaders.return.conditional_return_always_vertex = FAIL
>-1488 ANDROID : dEQP-GLES2.functional.shaders.return.conditional_return_always_fragment = FAIL
>-1488 ANDROID : dEQP-GLES2.functional.shaders.return.output_write_always_vertex = FAIL
>-1488 ANDROID : dEQP-GLES2.functional.shaders.return.output_write_always_fragment = FAIL
>-1489 ANDROID : dEQP-GLES2.functional.texture.mipmap.2d.generate.a8_fastest = FAIL
>-1489 ANDROID : dEQP-GLES2.functional.texture.mipmap.2d.generate.a8_nicest = FAIL
>-1489 ANDROID : dEQP-GLES2.functional.texture.mipmap.2d.generate.l8_fastest = FAIL
>-1489 ANDROID : dEQP-GLES2.functional.texture.mipmap.2d.generate.l8_nicest = FAIL
>-1489 ANDROID : dEQP-GLES2.functional.texture.mipmap.2d.generate.la88_fastest = FAIL
>-1489 ANDROID : dEQP-GLES2.functional.texture.mipmap.2d.generate.la88_nicest = FAIL
>-1489 ANDROID : dEQP-GLES2.functional.texture.mipmap.cube.generate.a8_fastest = FAIL
>-1489 ANDROID : dEQP-GLES2.functional.texture.mipmap.cube.generate.a8_nicest = FAIL
>-1489 ANDROID : dEQP-GLES2.functional.texture.mipmap.cube.generate.l8_fastest = FAIL
>-1489 ANDROID : dEQP-GLES2.functional.texture.mipmap.cube.generate.l8_nicest = FAIL
>-1489 ANDROID : dEQP-GLES2.functional.texture.mipmap.cube.generate.la88_fastest = FAIL
>-1489 ANDROID : dEQP-GLES2.functional.texture.mipmap.cube.generate.la88_nicest = FAIL
>-
>-// Windows Linux and Mac failures
>-1028 WIN LINUX MAC : dEQP-GLES2.functional.fbo.completeness.renderable.texture.color0.srgb8 = FAIL
>-1028 WIN LINUX MAC : dEQP-GLES2.functional.fbo.completeness.renderable.texture.stencil.srgb8 = FAIL
>-1028 WIN LINUX MAC : dEQP-GLES2.functional.fbo.completeness.renderable.texture.depth.depth_component_unsigned_short = FAIL
>-1028 WIN LINUX MAC : dEQP-GLES2.functional.fbo.completeness.renderable.texture.depth.depth_component_unsigned_int = FAIL
>-1028 WIN LINUX MAC : dEQP-GLES2.functional.fbo.completeness.renderable.texture.depth.srgb8 = FAIL
>diff --git a/Source/ThirdParty/ANGLE/src/tests/deqp_support/deqp_gles2_test_expectations.txt b/Source/ThirdParty/ANGLE/src/tests/deqp_support/deqp_gles2_test_expectations.txt
>new file mode 100644
>index 00000000000..2617846e85f
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/tests/deqp_support/deqp_gles2_test_expectations.txt
>@@ -0,0 +1,392 @@
>+// Copyright 2015 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+
>+// This file contains a list of defective dEQP conformance tests. The expected
>+// format is:
>+//  {BUG#} {MODIFIERS} : {TEST_NAME} = {PASS,FAIL,FLAKY,TIMEOUT,SKIP}
>+//
>+// MODIFIERS can be a combination of the below list, combined with a logical AND:
>+//  WIN XP VISTA WIN7 WIN8 WIN10
>+//  MAC LEOPARD SNOWLEOPARD LION MOUNTAINLION MAVERICKS YOSEMITE ELCAPITAN SIERRA HIGHSIERRA MOJAVE
>+//  LINUX CHROMEOS ANDROID
>+//  NVIDIA AMD INTEL
>+//  DEBUG RELEASE
>+//  D3D9 D3D11 OPENGL GLES VULKAN
>+//  NEXUS5X PIXEL2
>+//  QUADROP400
>+//
>+//
>+// TEST_NAME can be a specific test name, or have a '*' in the end, which
>+// indicates a prefix matching.
>+//
>+// Examples:
>+// fails on both windows and mac (crash)
>+//  91530 WIN : context_lost_restored = SKIP
>+//  91530 MAC : context_lost_restored = SKIP
>+// fails on windows using NVIDIA GPUs
>+//  91533 WIN NVIDIA : gl_min_uniforms = FAIL
>+// fails on Nexus5X with GLES backend (hangs)
>+//  91531 NEXUS5X GLES : conformance_more_* = SKIP
>+
>+// Skip these tests due to timeouts
>+1034 : dEQP-GLES2.functional.flush_finish.* = SKIP
>+
>+// Failures related to not supporting separate depth/stencil masks on D3D11.
>+1655 D3D11 : dEQP-GLES2.functional.fragment_ops.depth_stencil.stencil_depth_funcs.stencil_* = FAIL
>+1655 D3D11 : dEQP-GLES2.functional.fragment_ops.depth_stencil.stencil_ops.* = FAIL
>+1655 D3D11 : dEQP-GLES2.functional.fragment_ops.depth_stencil.write_mask.* = FAIL
>+1655 D3D11 : dEQP-GLES2.functional.fragment_ops.blend.equation_src_func_dst_func.add_constant_color_constant_alpha = FAIL
>+1655 D3D11 : dEQP-GLES2.functional.fragment_ops.blend.equation_src_func_dst_func.add_constant_color_one_minus_constant_alpha = FAIL
>+1655 D3D11 : dEQP-GLES2.functional.fragment_ops.blend.equation_src_func_dst_func.add_one_minus_constant_color_constant_alpha = FAIL
>+1655 D3D11 : dEQP-GLES2.functional.fragment_ops.blend.equation_src_func_dst_func.add_one_minus_constant_color_one_minus_constant_alpha = FAIL
>+1655 D3D11 : dEQP-GLES2.functional.fragment_ops.blend.equation_src_func_dst_func.add_constant_alpha_constant_color = FAIL
>+1655 D3D11 : dEQP-GLES2.functional.fragment_ops.blend.equation_src_func_dst_func.add_constant_alpha_one_minus_constant_color = FAIL
>+1655 D3D11 : dEQP-GLES2.functional.fragment_ops.blend.equation_src_func_dst_func.add_one_minus_constant_alpha_constant_color = FAIL
>+1655 D3D11 : dEQP-GLES2.functional.fragment_ops.blend.equation_src_func_dst_func.add_one_minus_constant_alpha_one_minus_constant_color = FAIL
>+1655 D3D11 : dEQP-GLES2.functional.fragment_ops.blend.equation_src_func_dst_func.subtract_constant_color_constant_alpha = FAIL
>+1655 D3D11 : dEQP-GLES2.functional.fragment_ops.blend.equation_src_func_dst_func.subtract_constant_color_one_minus_constant_alpha = FAIL
>+1655 D3D11 : dEQP-GLES2.functional.fragment_ops.blend.equation_src_func_dst_func.subtract_one_minus_constant_color_constant_alpha = FAIL
>+1655 D3D11 : dEQP-GLES2.functional.fragment_ops.blend.equation_src_func_dst_func.subtract_one_minus_constant_color_one_minus_constant_alpha = FAIL
>+1655 D3D11 : dEQP-GLES2.functional.fragment_ops.blend.equation_src_func_dst_func.subtract_constant_alpha_constant_color = FAIL
>+1655 D3D11 : dEQP-GLES2.functional.fragment_ops.blend.equation_src_func_dst_func.subtract_constant_alpha_one_minus_constant_color = FAIL
>+1655 D3D11 : dEQP-GLES2.functional.fragment_ops.blend.equation_src_func_dst_func.subtract_one_minus_constant_alpha_constant_color = FAIL
>+1655 D3D11 : dEQP-GLES2.functional.fragment_ops.blend.equation_src_func_dst_func.subtract_one_minus_constant_alpha_one_minus_constant_color = FAIL
>+1655 D3D11 : dEQP-GLES2.functional.fragment_ops.blend.equation_src_func_dst_func.reverse_subtract_constant_color_constant_alpha = FAIL
>+1655 D3D11 : dEQP-GLES2.functional.fragment_ops.blend.equation_src_func_dst_func.reverse_subtract_constant_color_one_minus_constant_alpha = FAIL
>+1655 D3D11 : dEQP-GLES2.functional.fragment_ops.blend.equation_src_func_dst_func.reverse_subtract_one_minus_constant_color_constant_alpha = FAIL
>+1655 D3D11 : dEQP-GLES2.functional.fragment_ops.blend.equation_src_func_dst_func.reverse_subtract_one_minus_constant_color_one_minus_constant_alpha = FAIL
>+1655 D3D11 : dEQP-GLES2.functional.fragment_ops.blend.equation_src_func_dst_func.reverse_subtract_constant_alpha_constant_color = FAIL
>+1655 D3D11 : dEQP-GLES2.functional.fragment_ops.blend.equation_src_func_dst_func.reverse_subtract_constant_alpha_one_minus_constant_color = FAIL
>+1655 D3D11 : dEQP-GLES2.functional.fragment_ops.blend.equation_src_func_dst_func.reverse_subtract_one_minus_constant_alpha_constant_color = FAIL
>+1655 D3D11 : dEQP-GLES2.functional.fragment_ops.blend.equation_src_func_dst_func.reverse_subtract_one_minus_constant_alpha_one_minus_constant_color = FAIL
>+1655 D3D11 : dEQP-GLES2.functional.fragment_ops.random.* = FAIL
>+1655 D3D11 : dEQP-GLES2.functional.fragment_ops.interaction.basic_shader.* = FAIL
>+
>+////////////////////////////////////////////////////////////////////////////////
>+//
>+//  Temporary entries: they should be removed once the bugs are fixed.
>+//
>+////////////////////////////////////////////////////////////////////////////////
>+
>+// dEQP bugs
>+1028 : dEQP-GLES2.functional.fbo.completeness.renderable.texture.color0.srgb8 = FAIL
>+1028 : dEQP-GLES2.functional.fbo.completeness.renderable.texture.stencil.srgb8 = FAIL
>+1028 : dEQP-GLES2.functional.fbo.completeness.renderable.texture.depth.srgb8 = FAIL
>+
>+// Bind aliasing is not working currently
>+3252 : dEQP-GLES2.functional.attribute_location.bind_aliasing.cond* = FAIL
>+3252 : dEQP-GLES2.functional.attribute_location.bind_aliasing.max_cond* = FAIL
>+
>+// Half float OES either has an implementation bug or a dEQP bug.
>+3283 : dEQP-GLES2.functional.fbo.completeness.renderable.texture.color0.rgba_half_float_oes = FAIL
>+
>+// Shader failures.
>+3285 : dEQP-GLES2.functional.shaders.preprocessor.pragmas.pragma_fragment = FAIL
>+3287 : dEQP-GLES2.functional.shaders.scoping.valid.local_variable_hides_function_parameter_vertex = FAIL
>+3287 : dEQP-GLES2.functional.shaders.scoping.valid.local_variable_hides_function_parameter_fragment = FAIL
>+
>+// The fragment_ops.depth_stencil.random tests all seem to fail on D3D11.
>+3282 D3D11 : dEQP-GLES2.functional.fragment_ops.depth_stencil.random.* = FAIL
>+
>+// Failures related to the depth_range on Windows / NVIDIA and ATI.
>+2426 D3D11 : dEQP-GLES2.functional.depth_range.write.reverse = FAIL
>+2426 D3D11 : dEQP-GLES2.functional.depth_range.write.half_to_zero = FAIL
>+2426 D3D11 : dEQP-GLES2.functional.depth_range.write.one_to_half = FAIL
>+2426 D3D11 : dEQP-GLES2.functional.depth_range.write.0_8_to_third = FAIL
>+2426 D3D11 : dEQP-GLES2.functional.depth_range.compare.reverse = FAIL
>+2426 D3D11 : dEQP-GLES2.functional.depth_range.compare.half_to_zero = FAIL
>+2426 D3D11 : dEQP-GLES2.functional.depth_range.compare.one_to_half = FAIL
>+2426 D3D11 : dEQP-GLES2.functional.depth_range.compare.0_8_to_third = FAIL
>+
>+// Windows D3D11 Intel and NVIDIA. Suppressed on all cards for simplicity.
>+3292 D3D11 : dEQP-GLES2.functional.polygon_offset.default_render_with_units = FAIL
>+3292 D3D11 : dEQP-GLES2.functional.polygon_offset.fixed16_render_with_units = FAIL
>+
>+// Common subexpression invariance
>+3293 D3D11 : dEQP-GLES2.functional.shaders.invariance.highp.common_subexpression_1 = FAIL
>+3293 D3D11 : dEQP-GLES2.functional.shaders.invariance.lowp.common_subexpression_1 = FAIL
>+3293 D3D11 : dEQP-GLES2.functional.shaders.invariance.mediump.common_subexpression_1 = FAIL
>+
>+// Fails with significant image differences
>+3295 D3D11 : dEQP-GLES2.functional.shaders.texture_functions.vertex.texturecubelod = FAIL
>+
>+// Only fails in D3D11 32-bit.
>+1418 D3D11 : dEQP-GLES2.functional.clipping.triangle_vertex.clip_three.clip_pos_x_pos_y_pos_z_and_neg_x_pos_y_pos_z_and_neg_x_neg_y_neg_z = FAIL
>+
>+// D3D11 AMD
>+2342 D3D11 AMD : dEQP-GLES2.functional.texture.size.cube.64x64_l8 = FAIL
>+2342 D3D11 AMD : dEQP-GLES2.functional.texture.size.cube.64x64_rgb888 = FAIL
>+2342 D3D11 AMD : dEQP-GLES2.functional.texture.size.cube.64x64_rgba8888 = FAIL
>+
>+// Additional texture.vertex.cube failures on AMD
>+3299 D3D11 AMD : dEQP-GLES2.functional.texture.vertex.cube.filtering.linear_mipmap_linear_nearest_repeat = FAIL
>+3299 D3D11 AMD : dEQP-GLES2.functional.texture.vertex.cube.filtering.linear_mipmap_linear_linear_repeat = FAIL
>+3299 D3D11 AMD : dEQP-GLES2.functional.texture.vertex.cube.filtering.nearest_mipmap_linear_nearest_clamp = FAIL
>+3299 D3D11 AMD : dEQP-GLES2.functional.texture.vertex.cube.filtering.nearest_mipmap_linear_nearest_repeat = FAIL
>+3299 D3D11 AMD : dEQP-GLES2.functional.texture.vertex.cube.filtering.nearest_mipmap_linear_nearest_mirror = FAIL
>+3299 D3D11 AMD : dEQP-GLES2.functional.texture.vertex.cube.filtering.nearest_mipmap_linear_linear_clamp = FAIL
>+3299 D3D11 AMD : dEQP-GLES2.functional.texture.vertex.cube.filtering.nearest_mipmap_linear_linear_repeat = FAIL
>+3299 D3D11 AMD : dEQP-GLES2.functional.texture.vertex.cube.filtering.nearest_mipmap_linear_linear_mirror = FAIL
>+3299 D3D11 AMD : dEQP-GLES2.functional.texture.vertex.cube.wrap.repeat_clamp = FAIL
>+3299 D3D11 AMD : dEQP-GLES2.functional.texture.vertex.cube.wrap.repeat_repeat = FAIL
>+3299 D3D11 AMD : dEQP-GLES2.functional.texture.vertex.cube.wrap.repeat_mirror = FAIL
>+
>+// Quadro P400
>+// TODO(jmadill): Narrow to P400 device only: 0x1CB3.
>+2222 D3D11 NVIDIA : dEQP-GLES2.functional.shaders.functions.control_flow.return_in_nested_loop_fragment = FAIL
>+2222 D3D11 NVIDIA : dEQP-GLES2.functional.shaders.functions.control_flow.return_in_nested_loop_vertex = FAIL
>+
>+// AMD GPU vertex shader texture sampling is not precise enough when rendering to 32-bit backbuffers
>+2337 D3D11 AMD : dEQP-GLES2.functional.texture.vertex.2d.wrap.* = FAIL
>+2337 D3D11 AMD : dEQP-GLES2.functional.texture.vertex.2d.filtering.linear_mipmap_linear_* = FAIL
>+2337 D3D11 AMD : dEQP-GLES2.functional.texture.vertex.2d.filtering.nearest_mipmap_linear_* = FAIL
>+
>+// Several mipmap sub tests fail on AMD. Mark them all as failing conservatively.
>+3296 D3D11 AMD : dEQP-GLES2.functional.texture.mipmap.* = FAIL
>+
>+// Failures on the D3D11 bots that do not reproduce locally
>+// TODO(jmadill): Figure out why these fail on the bots, but not locally.
>+1108 D3D11 : dEQP-GLES2.functional.shaders.struct.local.dynamic_loop_struct_array_fragment = FAIL
>+1108 D3D11 : dEQP-GLES2.functional.shaders.invariance.highp.loop_2 = FAIL
>+1108 D3D11 : dEQP-GLES2.functional.shaders.invariance.mediump.loop_2 = FAIL
>+
>+// OpenGL desktop back-end failures
>+1656 OPENGL : dEQP-GLES2.functional.fbo.completeness.renderable.texture.color0.srgb8_alpha8 = FAIL
>+1656 OPENGL : dEQP-GLES2.functional.fbo.completeness.renderable.texture.stencil.srgb8_alpha8 = FAIL
>+1656 OPENGL : dEQP-GLES2.functional.fbo.completeness.renderable.texture.depth.srgb8_alpha8 = FAIL
>+3291 OPENGL : dEQP-GLES2.functional.texture.mipmap.cube.projected.linear_linear = FAIL
>+
>+// Linux OpenGL Intel
>+3302 OPENGL INTEL LINUX : dEQP-GLES2.functional.rasterization.interpolation.basic.lines_wide = FAIL
>+3302 OPENGL INTEL LINUX : dEQP-GLES2.functional.rasterization.interpolation.basic.line_strip_wide = FAIL
>+3302 OPENGL INTEL LINUX : dEQP-GLES2.functional.rasterization.interpolation.basic.line_loop_wide = FAIL
>+3302 OPENGL INTEL LINUX : dEQP-GLES2.functional.rasterization.interpolation.projected.lines_wide = FAIL
>+3302 OPENGL INTEL LINUX : dEQP-GLES2.functional.rasterization.interpolation.projected.line_strip_wide = FAIL
>+3302 OPENGL INTEL LINUX : dEQP-GLES2.functional.rasterization.interpolation.projected.line_loop_wide = FAIL
>+3302 OPENGL INTEL LINUX : dEQP-GLES2.functional.shaders.texture_functions.vertex.texturecubelod = FAIL
>+3302 OPENGL INTEL LINUX : dEQP-GLES2.functional.texture.vertex.cube.filtering.linear_mipmap_linear_linear_repeat = FAIL
>+3302 OPENGL INTEL LINUX : dEQP-GLES2.functional.texture.vertex.cube.filtering.linear_mipmap_linear_nearest_repeat = FAIL
>+3302 OPENGL INTEL LINUX : dEQP-GLES2.functional.texture.vertex.cube.wrap.repeat_repeat = FAIL
>+
>+// Linux OpenGL NVIDIA
>+3303 OPENGL NVIDIA LINUX : dEQP-GLES2.functional.texture.mipmap.cube.projected.nearest_linear = FAIL
>+
>+// Mac OpenGL specific failures
>+1143 MAC OPENGL : dEQP-GLES2.functional.shaders.scoping.valid.local_int_variable_hides_struct_type_* = FAIL
>+1143 MAC OPENGL : dEQP-GLES2.functional.shaders.scoping.valid.local_struct_variable_hides_struct_type_* = FAIL
>+1143 MAC OPENGL : dEQP-GLES2.functional.shaders.scoping.valid.function_parameter_hides_struct_type_* = FAIL
>+1143 MAC OPENGL : dEQP-GLES2.functional.shaders.random.trigonometric.vertex.65 = FAIL
>+2631 MAC OPENGL : dEQP-GLES2.functional.shaders.operator.sequence.side_effects.affect_* = FAIL
>+3317 MAC OPENGL : dEQP-GLES2.functional.shaders.linkage.varying_4 = FAIL
>+
>+// MAC OPENGL INTEL specific
>+2137 MAC OPENGL INTEL : dEQP-GLES2.functional.color_clear.complex_rgb = FAIL
>+2137 MAC OPENGL INTEL : dEQP-GLES2.functional.color_clear.complex_rgba = FAIL
>+2137 MAC OPENGL INTEL : dEQP-GLES2.functional.color_clear.long_masked_rgb = FAIL
>+2137 MAC OPENGL INTEL : dEQP-GLES2.functional.color_clear.long_masked_rgba = FAIL
>+2137 MAC OPENGL INTEL : dEQP-GLES2.functional.color_clear.masked_rgb = FAIL
>+2137 MAC OPENGL INTEL : dEQP-GLES2.functional.color_clear.masked_rgba = FAIL
>+2137 MAC OPENGL INTEL : dEQP-GLES2.functional.color_clear.masked_scissored_rgb = FAIL
>+2137 MAC OPENGL INTEL : dEQP-GLES2.functional.color_clear.masked_scissored_rgba = FAIL
>+2137 MAC OPENGL INTEL : dEQP-GLES2.functional.color_clear.scissored_rgb = FAIL
>+2137 MAC OPENGL INTEL : dEQP-GLES2.functional.color_clear.scissored_rgba = FAIL
>+2137 MAC OPENGL INTEL : dEQP-GLES2.functional.color_clear.short_scissored_rgb = FAIL
>+2137 MAC OPENGL INTEL : dEQP-GLES2.functional.texture.specification.basic_copyteximage2d.cube_alpha = FAIL
>+2137 MAC OPENGL INTEL : dEQP-GLES2.functional.texture.specification.basic_copyteximage2d.cube_luminance = FAIL
>+2137 MAC OPENGL INTEL : dEQP-GLES2.functional.texture.specification.basic_copyteximage2d.cube_luminance_alpha = FAIL
>+2137 MAC OPENGL INTEL : dEQP-GLES2.functional.texture.specification.basic_copyteximage2d.cube_rgb = FAIL
>+2137 MAC OPENGL INTEL : dEQP-GLES2.functional.texture.specification.basic_copyteximage2d.cube_rgba = FAIL
>+2137 MAC OPENGL INTEL : dEQP-GLES2.functional.shaders.discard.dynamic_loop_never = SKIP
>+2137 MAC OPENGL INTEL : dEQP-GLES2.functional.shaders.discard.function_static_loop_never = SKIP
>+2137 MAC OPENGL INTEL : dEQP-GLES2.functional.shaders.discard.static_loop_never = SKIP
>+
>+3317 MAC OPENGL INTEL : dEQP-GLES2.functional.polygon_offset.default_render_with_units = FAIL
>+3317 MAC OPENGL INTEL : dEQP-GLES2.functional.polygon_offset.fixed16_render_with_units = FAIL
>+3317 MAC OPENGL INTEL : dEQP-GLES2.functional.shaders.invariance.highp.common_subexpression_1 = FAIL
>+3317 MAC OPENGL INTEL : dEQP-GLES2.functional.shaders.invariance.highp.common_subexpression_3 = FAIL
>+3317 MAC OPENGL INTEL : dEQP-GLES2.functional.shaders.invariance.mediump.common_subexpression_1 = FAIL
>+3317 MAC OPENGL INTEL : dEQP-GLES2.functional.shaders.invariance.mediump.common_subexpression_3 = FAIL
>+3317 MAC OPENGL INTEL : dEQP-GLES2.functional.shaders.invariance.lowp.common_subexpression_1 = FAIL
>+3317 MAC OPENGL INTEL : dEQP-GLES2.functional.shaders.invariance.lowp.common_subexpression_3 = FAIL
>+3317 MAC OPENGL INTEL : dEQP-GLES2.functional.texture.filtering.2d.linear_nearest_clamp_rgba8888_pot = FAIL
>+3317 MAC OPENGL INTEL : dEQP-GLES2.functional.texture.filtering.2d.linear_nearest_clamp_rgb888_pot = FAIL
>+3317 MAC OPENGL INTEL : dEQP-GLES2.functional.texture.filtering.2d.linear_nearest_clamp_rgba4444_pot = FAIL
>+3317 MAC OPENGL INTEL : dEQP-GLES2.functional.texture.filtering.2d.linear_nearest_clamp_l8_pot = FAIL
>+3317 MAC OPENGL INTEL : dEQP-GLES2.functional.texture.filtering.2d.linear_nearest_repeat_rgba8888_pot = FAIL
>+3317 MAC OPENGL INTEL : dEQP-GLES2.functional.texture.filtering.2d.linear_nearest_repeat_rgb888_pot = FAIL
>+3317 MAC OPENGL INTEL : dEQP-GLES2.functional.texture.filtering.2d.linear_nearest_repeat_rgba4444_pot = FAIL
>+3317 MAC OPENGL INTEL : dEQP-GLES2.functional.texture.filtering.2d.linear_nearest_repeat_l8_pot = FAIL
>+3317 MAC OPENGL INTEL : dEQP-GLES2.functional.texture.filtering.2d.linear_nearest_mirror_rgba8888_pot = FAIL
>+3317 MAC OPENGL INTEL : dEQP-GLES2.functional.texture.filtering.2d.linear_nearest_mirror_rgb888_pot = FAIL
>+3317 MAC OPENGL INTEL : dEQP-GLES2.functional.texture.filtering.2d.linear_nearest_mirror_rgba4444_pot = FAIL
>+3317 MAC OPENGL INTEL : dEQP-GLES2.functional.texture.filtering.2d.linear_nearest_mirror_l8_pot = FAIL
>+3317 MAC OPENGL INTEL : dEQP-GLES2.functional.texture.filtering.cube.linear_nearest_clamp_rgba8888_pot = FAIL
>+3317 MAC OPENGL INTEL : dEQP-GLES2.functional.texture.filtering.cube.linear_nearest_clamp_rgb888_pot = FAIL
>+3317 MAC OPENGL INTEL : dEQP-GLES2.functional.texture.filtering.cube.linear_nearest_clamp_rgba4444_pot = FAIL
>+3317 MAC OPENGL INTEL : dEQP-GLES2.functional.texture.filtering.cube.linear_nearest_clamp_l8_pot = FAIL
>+3317 MAC OPENGL INTEL : dEQP-GLES2.functional.texture.filtering.cube.linear_nearest_repeat_rgba8888_pot = FAIL
>+3317 MAC OPENGL INTEL : dEQP-GLES2.functional.texture.filtering.cube.linear_nearest_repeat_rgb888_pot = FAIL
>+3317 MAC OPENGL INTEL : dEQP-GLES2.functional.texture.filtering.cube.linear_nearest_repeat_rgba4444_pot = FAIL
>+3317 MAC OPENGL INTEL : dEQP-GLES2.functional.texture.filtering.cube.linear_nearest_repeat_l8_pot = FAIL
>+3317 MAC OPENGL INTEL : dEQP-GLES2.functional.texture.filtering.cube.linear_nearest_mirror_rgba8888_pot = FAIL
>+3317 MAC OPENGL INTEL : dEQP-GLES2.functional.texture.filtering.cube.linear_nearest_mirror_rgb888_pot = FAIL
>+3317 MAC OPENGL INTEL : dEQP-GLES2.functional.texture.filtering.cube.linear_nearest_mirror_rgba4444_pot = FAIL
>+3317 MAC OPENGL INTEL : dEQP-GLES2.functional.texture.filtering.cube.linear_nearest_mirror_l8_pot = FAIL
>+3317 MAC OPENGL INTEL : dEQP-GLES2.functional.texture.vertex.2d.filtering.linear_nearest_* = FAIL
>+3317 MAC OPENGL INTEL : dEQP-GLES2.functional.texture.vertex.cube.filtering.linear_nearest_* = FAIL
>+
>+// Mac AMD OpenGL specific
>+2137 MAC OPENGL AMD : dEQP-GLES2.functional.clipping.point.wide_point_clip = FAIL
>+3317 MAC OPENGL AMD : dEQP-GLES2.functional.clipping.point.wide_point_clip_viewport_center = FAIL
>+3317 MAC OPENGL AMD : dEQP-GLES2.functional.clipping.point.wide_point_clip_viewport_corner = FAIL
>+
>+// Android GLES backend only failures
>+1488 GLES ANDROID : dEQP-GLES2.functional.shaders.return.conditional_return_always_vertex = FAIL
>+1488 GLES ANDROID : dEQP-GLES2.functional.shaders.return.conditional_return_always_fragment = FAIL
>+1488 GLES ANDROID : dEQP-GLES2.functional.shaders.return.output_write_always_vertex = FAIL
>+1488 GLES ANDROID : dEQP-GLES2.functional.shaders.return.output_write_always_fragment = FAIL
>+2631 GLES ANDROID : dEQP-GLES2.functional.shaders.operator.sequence.side_effects.affect_* = FAIL
>+2630 GLES ANDROID : dEQP-GLES2.functional.shaders.struct.uniform.sampler_in_array_function_arg_* = FAIL
>+2630 GLES ANDROID : dEQP-GLES2.functional.shaders.struct.uniform.sampler_in_function_arg_* = FAIL
>+
>+// Nexus 5x failures
>+3309 NEXUS5X GLES : dEQP-GLES2.functional.fbo.render.texsubimage.after_render_tex2d_rgb = FAIL
>+3309 NEXUS5X GLES : dEQP-GLES2.functional.polygon_offset.default_result_depth_clamp = FAIL
>+3309 NEXUS5X GLES : dEQP-GLES2.functional.shaders.return.output_write_in_func_always_vertex = FAIL
>+3309 NEXUS5X GLES : dEQP-GLES2.functional.shaders.return.output_write_in_func_always_fragment = FAIL
>+3309 NEXUS5X GLES : dEQP-GLES2.functional.shaders.texture_functions.vertex.texturecubelod = FAIL
>+3309 NEXUS5X GLES : dEQP-GLES2.functional.texture.mipmap.cube.* = FAIL
>+3309 NEXUS5X GLES : dEQP-GLES2.functional.texture.vertex.cube.filtering.linear_mipmap_linear_* = FAIL
>+3309 NEXUS5X GLES : dEQP-GLES2.functional.texture.vertex.cube.wrap.clamp_* = FAIL
>+3309 NEXUS5X GLES : dEQP-GLES2.functional.texture.vertex.cube.wrap.mirror_* = FAIL
>+3309 NEXUS5X GLES : dEQP-GLES2.functional.uniform_api.random.3 = FAIL
>+3309 NEXUS5X GLES : dEQP-GLES2.functional.uniform_api.random.54 = FAIL
>+
>+// General Vulkan failures
>+3300 VULKAN : dEQP-GLES2.functional.shaders.texture_functions.vertex.texturecubelod = FAIL
>+
>+// Only seen failing on Android
>+3241 VULKAN ANDROID : dEQP-GLES2.functional.depth_stencil_clear.depth_scissored_masked = FAIL
>+
>+// Wide point clipping
>+3253 VULKAN : dEQP-GLES2.functional.clipping.point.wide_point_clip_viewport_center = FAIL
>+3253 VULKAN : dEQP-GLES2.functional.clipping.point.wide_point_clip_viewport_corner = FAIL
>+
>+// Other clipping
>+3254 VULKAN : dEQP-GLES2.functional.clipping.line.line_clip_viewport_center = FAIL
>+3254 VULKAN : dEQP-GLES2.functional.clipping.line.line_clip_viewport_corner = FAIL
>+
>+// Only seems to be an issue on NVIDIA
>+3254 VULKAN NVIDIA : dEQP-GLES2.functional.clipping.point.point_clip_viewport_center = FAIL
>+3254 VULKAN NVIDIA : dEQP-GLES2.functional.clipping.point.point_clip_viewport_corner = FAIL
>+
>+// These seem to fail on both D3D11 and Vulkan
>+3243 VULKAN : dEQP-GLES2.functional.texture.mipmap.cube.basic.linear_nearest = FAIL
>+3243 VULKAN : dEQP-GLES2.functional.texture.mipmap.cube.basic.linear_linear = FAIL
>+3243 VULKAN : dEQP-GLES2.functional.texture.mipmap.cube.projected.linear_nearest = FAIL
>+3243 VULKAN : dEQP-GLES2.functional.texture.mipmap.cube.projected.linear_linear = FAIL
>+3243 VULKAN : dEQP-GLES2.functional.texture.mipmap.cube.bias.linear_nearest = FAIL
>+3243 VULKAN : dEQP-GLES2.functional.texture.mipmap.cube.bias.linear_linear = FAIL
>+// D3D11 AMD already covered by Line 148
>+3243 D3D11 INTEL : dEQP-GLES2.functional.texture.mipmap.cube.basic.linear_nearest = FAIL
>+3243 D3D11 INTEL : dEQP-GLES2.functional.texture.mipmap.cube.basic.linear_linear = FAIL
>+3243 D3D11 INTEL : dEQP-GLES2.functional.texture.mipmap.cube.projected.linear_nearest = FAIL
>+3243 D3D11 INTEL : dEQP-GLES2.functional.texture.mipmap.cube.projected.linear_linear = FAIL
>+3243 D3D11 INTEL : dEQP-GLES2.functional.texture.mipmap.cube.bias.linear_nearest = FAIL
>+3243 D3D11 INTEL : dEQP-GLES2.functional.texture.mipmap.cube.bias.linear_linear = FAIL
>+3243 D3D11 NVIDIA : dEQP-GLES2.functional.texture.mipmap.cube.basic.linear_nearest = FAIL
>+3243 D3D11 NVIDIA : dEQP-GLES2.functional.texture.mipmap.cube.basic.linear_linear = FAIL
>+3243 D3D11 NVIDIA : dEQP-GLES2.functional.texture.mipmap.cube.projected.linear_nearest = FAIL
>+3243 D3D11 NVIDIA : dEQP-GLES2.functional.texture.mipmap.cube.projected.linear_linear = FAIL
>+3243 D3D11 NVIDIA : dEQP-GLES2.functional.texture.mipmap.cube.bias.linear_nearest = FAIL
>+3243 D3D11 NVIDIA : dEQP-GLES2.functional.texture.mipmap.cube.bias.linear_linear = FAIL
>+
>+// Fail with very tiny pixel differences
>+3240 VULKAN : dEQP-GLES2.functional.texture.vertex.cube.filtering.linear_mipmap_linear_nearest_clamp = FAIL
>+3240 VULKAN : dEQP-GLES2.functional.texture.vertex.cube.filtering.linear_mipmap_linear_nearest_mirror = FAIL
>+3240 VULKAN : dEQP-GLES2.functional.texture.vertex.cube.filtering.linear_mipmap_linear_linear_clamp = FAIL
>+3240 VULKAN : dEQP-GLES2.functional.texture.vertex.cube.filtering.linear_mipmap_linear_linear_mirror = FAIL
>+3240 VULKAN : dEQP-GLES2.functional.texture.vertex.cube.wrap.clamp_clamp = FAIL
>+3240 VULKAN : dEQP-GLES2.functional.texture.vertex.cube.wrap.clamp_repeat = FAIL
>+3240 VULKAN : dEQP-GLES2.functional.texture.vertex.cube.wrap.clamp_mirror = FAIL
>+3240 VULKAN : dEQP-GLES2.functional.texture.vertex.cube.wrap.mirror_clamp = FAIL
>+3240 VULKAN : dEQP-GLES2.functional.texture.vertex.cube.wrap.mirror_repeat = FAIL
>+3240 VULKAN : dEQP-GLES2.functional.texture.vertex.cube.wrap.mirror_mirror = FAIL
>+3240 D3D11 : dEQP-GLES2.functional.texture.vertex.cube.filtering.linear_mipmap_linear_nearest_clamp = FAIL
>+3240 D3D11 : dEQP-GLES2.functional.texture.vertex.cube.filtering.linear_mipmap_linear_nearest_mirror = FAIL
>+3240 D3D11 : dEQP-GLES2.functional.texture.vertex.cube.filtering.linear_mipmap_linear_linear_clamp = FAIL
>+3240 D3D11 : dEQP-GLES2.functional.texture.vertex.cube.filtering.linear_mipmap_linear_linear_mirror = FAIL
>+3240 D3D11 : dEQP-GLES2.functional.texture.vertex.cube.wrap.clamp_clamp = FAIL
>+3240 D3D11 : dEQP-GLES2.functional.texture.vertex.cube.wrap.clamp_repeat = FAIL
>+3240 D3D11 : dEQP-GLES2.functional.texture.vertex.cube.wrap.clamp_mirror = FAIL
>+3240 D3D11 : dEQP-GLES2.functional.texture.vertex.cube.wrap.mirror_clamp = FAIL
>+3240 D3D11 : dEQP-GLES2.functional.texture.vertex.cube.wrap.mirror_repeat = FAIL
>+3240 D3D11 : dEQP-GLES2.functional.texture.vertex.cube.wrap.mirror_mirror = FAIL
>+
>+// Android Vulkan backend only failures
>+2549 VULKAN ANDROID : dEQP-GLES2.functional.fragment_ops.depth_stencil.stencil* = SKIP
>+
>+// Line segment rasterization has a bug that affects Android configs.
>+2830 VULKAN ANDROID : dEQP-GLES2.functional.rasterization.primitives.line* = SKIP
>+
>+// Passes on Pixel XL. Fails on 5x and Pixel 2. Might be fixed in latest driver.
>+2609 VULKAN ANDROID : dEQP-GLES2.functional.texture.mipmap.cube.generate.* = SKIP
>+
>+// Fails on Nexus 5x only. TODO(jmadill): Remove suppression when possible. http://anglebug.com/2791
>+2791 VULKAN ANDROID : dEQP-GLES2.functional.clipping.* = SKIP
>+
>+// Failing on the Pixel 2.
>+2727 VULKAN ANDROID : dEQP-GLES2.functional.shaders.builtin_variable.pointcoord = FAIL
>+2808 VULKAN ANDROID : dEQP-GLES2.functional.shaders.builtin_variable.fragcoord_w = FAIL
>+3306 VULKAN ANDROID : dEQP-GLES2.functional.polygon_offset.default_factor_1_slope = FAIL
>+3306 VULKAN ANDROID : dEQP-GLES2.functional.polygon_offset.fixed16_factor_1_slope = FAIL
>+3307 VULKAN ANDROID : dEQP-GLES2.functional.texture.mipmap.cube.projected.nearest_linear = FAIL
>+
>+// Vulkan AMD drivers don't seem to support wide point clipping.
>+2463 VULKAN WIN AMD : dEQP-GLES2.functional.clipping.point.wide_point_clip = FAIL
>+
>+// These failures are possibly due to an AMD driver bug.
>+2847 VULKAN WIN AMD : dEQP-GLES2.functional.draw.random.14 = SKIP
>+2847 VULKAN WIN AMD : dEQP-GLES2.functional.draw.random.30 = SKIP
>+2847 VULKAN WIN AMD : dEQP-GLES2.functional.draw.random.41 = SKIP
>+2847 VULKAN WIN AMD : dEQP-GLES2.functional.vertex_arrays.single_attribute.first.byte_first* = SKIP
>+2847 VULKAN WIN AMD : dEQP-GLES2.functional.vertex_arrays.single_attribute.first.float_first* = SKIP
>+2847 VULKAN WIN AMD : dEQP-GLES2.functional.vertex_arrays.single_attribute.offset.buffer_1_17_byte* = SKIP
>+2847 VULKAN WIN AMD : dEQP-GLES2.functional.vertex_arrays.single_attribute.offset.buffer_1_2_byte* = SKIP
>+2847 VULKAN WIN AMD : dEQP-GLES2.functional.vertex_arrays.single_attribute.offset.buffer_1_32_byte* = SKIP
>+2847 VULKAN WIN AMD : dEQP-GLES2.functional.vertex_arrays.single_attribute.offset.buffer_17_17_byte* = SKIP
>+2847 VULKAN WIN AMD : dEQP-GLES2.functional.vertex_arrays.single_attribute.offset.buffer_17_2_byte* = SKIP
>+2847 VULKAN WIN AMD : dEQP-GLES2.functional.vertex_arrays.single_attribute.offset.buffer_17_32_byte* = SKIP
>+2847 VULKAN WIN AMD : dEQP-GLES2.functional.vertex_arrays.single_attribute.offset.buffer_32_17_byte* = SKIP
>+2847 VULKAN WIN AMD : dEQP-GLES2.functional.vertex_arrays.single_attribute.offset.buffer_32_32_byte* = SKIP
>+2847 VULKAN WIN AMD : dEQP-GLES2.functional.vertex_arrays.single_attribute.offset.buffer_32_32_float* = SKIP
>+2847 VULKAN WIN AMD : dEQP-GLES2.functional.vertex_arrays.single_attribute.offset.buffer_4_17_byte* = SKIP
>+2847 VULKAN WIN AMD : dEQP-GLES2.functional.vertex_arrays.single_attribute.offset.buffer_4_32_byte* = SKIP
>+2847 VULKAN WIN AMD : dEQP-GLES2.functional.vertex_arrays.single_attribute.offset.buffer_4_32_float* = SKIP
>+2847 VULKAN WIN AMD : dEQP-GLES2.functional.vertex_arrays.single_attribute.strides.buffer_0_17_byte* = SKIP
>+2847 VULKAN WIN AMD : dEQP-GLES2.functional.vertex_arrays.single_attribute.strides.buffer_0_32_byte* = SKIP
>+2847 VULKAN WIN AMD : dEQP-GLES2.functional.vertex_arrays.single_attribute.strides.buffer_0_32_float* = SKIP
>+2847 VULKAN WIN AMD : dEQP-GLES2.functional.vertex_arrays.single_attribute.strides.buffer_0_32_short* = SKIP
>+2847 VULKAN WIN AMD : dEQP-GLES2.functional.vertex_arrays.single_attribute.strides.buffer_0_3_byte* = SKIP
>+2847 VULKAN WIN AMD : dEQP-GLES2.functional.vertex_arrays.single_attribute.strides.buffer_0_6_short* = SKIP
>+2847 VULKAN WIN AMD : dEQP-GLES2.functional.vertex_arrays.single_attribute.usages.buffer_0_0_byte* = SKIP
>+2847 VULKAN WIN AMD : dEQP-GLES2.functional.vertex_arrays.single_attribute.usages.buffer_0_0_short* = SKIP
>+2847 VULKAN WIN AMD : dEQP-GLES2.functional.vertex_arrays.single_attribute.usages.buffer_0_17_byte* = SKIP
>+2847 VULKAN WIN AMD : dEQP-GLES2.functional.vertex_arrays.single_attribute.usages.buffer_0_32_byte* = SKIP
>+2847 VULKAN WIN AMD : dEQP-GLES2.functional.vertex_arrays.single_attribute.usages.buffer_0_32_float* = SKIP
>+2847 VULKAN WIN AMD : dEQP-GLES2.functional.vertex_arrays.single_attribute.usages.buffer_0_32_short* = SKIP
>+
>+// Fails after OpenGL line rasterization rules implementation. Possibly a bug in FragCoord.
>+2809 VULKAN WIN AMD : dEQP-GLES2.functional.clipping.line.long_line_clip = FAIL
>+
>+// Polygon offset failures
>+3301 VULKAN WIN AMD : dEQP-GLES2.functional.polygon_offset.default_result_depth_clamp = FAIL
>+3301 VULKAN WIN AMD : dEQP-GLES2.functional.polygon_offset.default_factor_1_slope = FAIL
>+3301 VULKAN WIN AMD : dEQP-GLES2.functional.polygon_offset.fixed16_render_with_units = FAIL
>+
>+// Failures on newer NVIDIA drivers (411.95) and passes on older drivers (388.16).
>+2976 VULKAN NVIDIA : dEQP-GLES2.functional.shaders.invariance.* = FAIL
>+
>+// Tests were being hidden by flakiness (anglebug.com/3271)
>+3328 VULKAN WIN NVIDIA : dEQP-GLES2.functional.shaders.swizzles.vector_swizzles.mediump_vec4_qqqt_vertex = SKIP
>diff --git a/Source/ThirdParty/ANGLE/src/tests/deqp_support/deqp_gles31_TestExpectations b/Source/ThirdParty/ANGLE/src/tests/deqp_support/deqp_gles31_TestExpectations
>deleted file mode 100644
>index c88d0718cf1..00000000000
>--- a/Source/ThirdParty/ANGLE/src/tests/deqp_support/deqp_gles31_TestExpectations
>+++ /dev/null
>@@ -1,1739 +0,0 @@
>-// Copyright 2016 The ANGLE Project Authors. All rights reserved.
>-// Use of this source code is governed by a BSD-style license that can be
>-// found in the LICENSE file.
>-
>-// This file contains a list of defective dEQP conformance tests. The expected
>-// format is:
>-//  {BUG#} {MODIFIERS} : {TEST_NAME} = {PASS,FAIL,FLAKY,TIMEOUT,SKIP}
>-//
>-// MODIFIERS can be a combination of the below list:
>-//  WIN XP VISTA WIN7 MAC LEOPARD SNOWLEOPARD LION LINUX CHROMEOS MOUNTAINLION
>-//  MAVERICKS
>-//  NVIDIA AMD INTEL
>-//  0xabcd - GPU PCI device ID. Specifying a PCI id requires a vendor.
>-//  DEBUG RELEASE
>-// TODO(jmadill): Add ANGLE Renderer selection modifiers
>-//
>-// TEST_NAME can be a specific test name, or have a '*' in the end, which
>-// indicates a prefix matching.
>-//
>-// Examples:
>-//  91530 MAC WIN LINUX : context_lost_restored = TIMEOUT
>-//  91533 WIN : gl_min_uniforms = FAIL
>-//  91531 MAC WIN LINUX : conformance_more_* = SKIP
>-//  91532 MAC NVIDIA 0x0640 : tex_image_and_sub_image_2d_with_video = PASS FAIL
>-
>-// Crashing Tests
>-1920 NVIDIA D3D11 : dEQP-GLES31.functional.layout_binding.ubo.vertex_binding_max = SKIP
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.program_interface_query.transform_feedback_varying.resource_list.vertex_fragment.builtin_gl_position = SKIP
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.program_interface_query.transform_feedback_varying.resource_list.vertex_fragment.default_block_struct_member = SKIP
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.program_interface_query.transform_feedback_varying.array_size.vertex_fragment.default_block_struct_member = SKIP
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.program_interface_query.transform_feedback_varying.name_length.vertex_fragment.default_block_struct_member = SKIP
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.program_interface_query.transform_feedback_varying.type.vertex_fragment.struct.* = SKIP
>-1442 D3D11 : dEQP-GLES31.functional.vertex_attribute_binding.* = SKIP
>-1442 D3D11 : dEQP-GLES31.functional.stencil_texturing.* = SKIP
>-1442 D3D11 : dEQP-GLES31.functional.texture.gather.* = SKIP
>-// TODO(xinghua.cao@intel.com): FAIL expectation instead of SKIP should be sufficient for OpenGL, but the
>-// test expectations parser doesn't support having FAIL for GL and SKIP for D3D with the same test filter.
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.image_load_store.* = SKIP
>-
>-// TODO(jiawei.shao@intel.com): Implement FramebufferTextureEXT entry point defined in OpenGL ES 3.1 extension GL_EXT_geometry_shader
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.geometry_shading.query.framebuffer_* = SKIP
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.geometry_shading.layered.* = SKIP
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.geometry_shading.instanced.invocation_per_layer_* = SKIP
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.geometry_shading.instanced.multiple_layers_per_invocation_* = SKIP
>-
>-// D3D11 Failing Tests
>-1442 D3D11 : dEQP-GLES31.functional.state_query.integer.max_compute_shared_memory_size_* = FAIL
>-1442 D3D11 : dEQP-GLES31.functional.state_query.integer.max_compute_atomic_counter_buffers_* = FAIL
>-1442 D3D11 : dEQP-GLES31.functional.state_query.integer.max_compute_atomic_counters_* = FAIL
>-1442 D3D11 : dEQP-GLES31.functional.state_query.integer.max_compute_shader_storage_blocks_* = FAIL
>-1442 D3D11 : dEQP-GLES31.functional.state_query.integer.max_atomic_counter_buffer_bindings_* = FAIL
>-1442 D3D11 : dEQP-GLES31.functional.state_query.integer.max_atomic_counter_buffer_size_* = FAIL
>-1442 D3D11 : dEQP-GLES31.functional.state_query.integer.max_combined_atomic_counter_buffers_* = FAIL
>-1442 D3D11 : dEQP-GLES31.functional.state_query.integer.max_combined_atomic_counters* = FAIL
>-1442 D3D11 : dEQP-GLES31.functional.state_query.integer.max_image_units_* = FAIL
>-1442 D3D11 : dEQP-GLES31.functional.state_query.integer.max_combined_image_uniforms_* = FAIL
>-1442 D3D11 : dEQP-GLES31.functional.state_query.integer.max_shader_storage_buffer_bindings_* = FAIL
>-1442 D3D11 : dEQP-GLES31.functional.state_query.integer.max_shader_storage_block_size_* = FAIL
>-1442 D3D11 : dEQP-GLES31.functional.state_query.integer.max_combined_shader_storage_blocks_* = FAIL
>-1442 D3D11 : dEQP-GLES31.functional.state_query.integer.max_combined_shader_output_resources_* = FAIL
>-1442 D3D11 : dEQP-GLES31.functional.state_query.integer.max_uniform_buffer_bindings_* = FAIL
>-1442 D3D11 : dEQP-GLES31.functional.state_query.integer.max_combined_texture_image_units_* = FAIL
>-1729 D3D11 : dEQP-GLES31.functional.state_query.indexed.atomic_counter_buffer_* = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.state_query.indexed.shader_storage_buffer_* = FAIL
>-1442 D3D11 : dEQP-GLES31.functional.state_query.internal_format.renderbuffer.* = FAIL
>-1442 D3D11 : dEQP-GLES31.functional.state_query.program.compute_work_group_size_get_programiv = FAIL
>-1442 D3D11 : dEQP-GLES31.functional.layout_binding.ssbo.* = FAIL
>-1442 D3D11 : dEQP-GLES31.functional.compute.basic.empty = FAIL
>-1442 D3D11 : dEQP-GLES31.functional.compute.basic.ssbo_local_barrier_single_invocation = FAIL
>-1442 D3D11 : dEQP-GLES31.functional.compute.basic.ssbo_local_barrier_single_group = FAIL
>-1442 D3D11 : dEQP-GLES31.functional.compute.basic.ssbo_local_barrier_multiple_groups = FAIL
>-1442 D3D11 : dEQP-GLES31.functional.compute.basic.ssbo_rw_single_invocation = FAIL
>-1442 D3D11 : dEQP-GLES31.functional.compute.basic.ssbo_rw_multiple_groups = FAIL
>-1442 D3D11 : dEQP-GLES31.functional.compute.basic.copy_image_to_ssbo_small = FAIL
>-1442 D3D11 : dEQP-GLES31.functional.compute.basic.copy_ssbo_multiple_groups = FAIL
>-1442 D3D11 : dEQP-GLES31.functional.compute.basic.copy_ssbo_multiple_invocations = FAIL
>-1442 D3D11 : dEQP-GLES31.functional.compute.basic.copy_ssbo_single_invocation = FAIL
>-1442 D3D11 : dEQP-GLES31.functional.compute.basic.copy_ssbo_to_image_small = FAIL
>-1442 D3D11 : dEQP-GLES31.functional.compute.basic.shared_var_single_invocation = FAIL
>-1442 D3D11 : dEQP-GLES31.functional.compute.basic.shared_var_single_group = FAIL
>-1442 D3D11 : dEQP-GLES31.functional.compute.basic.shared_var_multiple_invocations = FAIL
>-1442 D3D11 : dEQP-GLES31.functional.compute.basic.shared_var_multiple_groups = FAIL
>-1442 D3D11 : dEQP-GLES31.functional.compute.basic.write_multiple_arr_single_invocation = FAIL
>-1442 D3D11 : dEQP-GLES31.functional.compute.basic.write_multiple_arr_multiple_groups = FAIL
>-1442 D3D11 : dEQP-GLES31.functional.compute.basic.ubo_to_ssbo_single_invocation = FAIL
>-1442 D3D11 : dEQP-GLES31.functional.compute.basic.ubo_to_ssbo_single_group = FAIL
>-1442 D3D11 : dEQP-GLES31.functional.compute.basic.ubo_to_ssbo_multiple_invocations = FAIL
>-1442 D3D11 : dEQP-GLES31.functional.compute.basic.ubo_to_ssbo_multiple_groups = FAIL
>-1442 D3D11 : dEQP-GLES31.functional.compute.basic.shared_atomic_op_single_invocation = FAIL
>-1442 D3D11 : dEQP-GLES31.functional.compute.basic.shared_atomic_op_single_group = FAIL
>-1442 D3D11 : dEQP-GLES31.functional.compute.basic.shared_atomic_op_multiple_invocations = FAIL
>-1442 D3D11 : dEQP-GLES31.functional.compute.basic.shared_atomic_op_multiple_groups = FAIL
>-1442 D3D11 : dEQP-GLES31.functional.compute.shared_var.atomic.* = FAIL
>-1442 D3D11 : dEQP-GLES31.functional.compute.shared_var.basic_type.* = FAIL
>-1442 D3D11 : dEQP-GLES31.functional.compute.shared_var.work_group_size.* = FAIL
>-1442 D3D11 : dEQP-GLES31.functional.atomic_counter.* = FAIL
>-1442 D3D11 : dEQP-GLES31.functional.debug.negative_coverage.callbacks.texture.texparameter* = SKIP
>-1442 D3D11 : dEQP-GLES31.functional.debug.negative_coverage.get_error.texture.texparameter* = SKIP
>-1442 D3D11 : dEQP-GLES31.functional.debug.negative_coverage.log.texture.texparameter* = SKIP
>-1442 D3D11 : dEQP-GLES31.functional.debug.async.case_4_log = SKIP
>-1442 D3D11 : dEQP-GLES31.functional.debug.async.case_5_callback = SKIP
>-1442 D3D11 : dEQP-GLES31.functional.debug.error_filters.case_2 = SKIP
>-1442 D3D11 : dEQP-GLES31.functional.debug.error_filters.case_3 = SKIP
>-1442 D3D11 : dEQP-GLES31.functional.debug.error_filters.case_9 = SKIP
>-1442 D3D11 : dEQP-GLES31.functional.debug.error_filters.case_10 = SKIP
>-1442 D3D11 : dEQP-GLES31.functional.debug.error_filters.case_27 = SKIP
>-1442 D3D11 : dEQP-GLES31.functional.debug.error_filters.case_28 = SKIP
>-1442 D3D11 : dEQP-GLES31.functional.debug.error_groups.case_2 = SKIP
>-1442 D3D11 : dEQP-GLES31.functional.debug.error_groups.case_3 = SKIP
>-1442 D3D11 : dEQP-GLES31.functional.debug.error_groups.case_9 = SKIP
>-1442 D3D11 : dEQP-GLES31.functional.debug.error_groups.case_10 = SKIP
>-1442 D3D11 : dEQP-GLES31.functional.state_query.program.active_atomic_counter_buffers_get_programiv = FAIL
>-1442 D3D11 : dEQP-GLES31.functional.layout_binding.ubo.* = FAIL
>-1442 D3D11 : dEQP-GLES31.functional.program_interface_query.* = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.abs.float_lowp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.abs.float_mediump_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.abs.float_highp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.abs.vec2_lowp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.abs.vec2_mediump_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.abs.vec2_highp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.abs.vec3_lowp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.abs.vec3_mediump_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.abs.vec3_highp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.abs.vec4_lowp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.abs.vec4_mediump_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.abs.vec4_highp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.abs.int_lowp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.abs.int_mediump_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.abs.int_highp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.abs.ivec2_lowp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.abs.ivec2_mediump_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.abs.ivec2_highp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.abs.ivec3_lowp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.abs.ivec3_mediump_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.abs.ivec3_highp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.abs.ivec4_lowp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.abs.ivec4_mediump_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.abs.ivec4_highp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.sign.float_lowp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.sign.float_mediump_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.sign.float_highp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.sign.vec2_lowp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.sign.vec2_mediump_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.sign.vec2_highp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.sign.vec3_lowp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.sign.vec3_mediump_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.sign.vec3_highp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.sign.vec4_lowp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.sign.vec4_mediump_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.sign.vec4_highp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.sign.int_lowp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.sign.int_mediump_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.sign.int_highp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.sign.ivec2_lowp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.sign.ivec2_mediump_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.sign.ivec2_highp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.sign.ivec3_lowp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.sign.ivec3_mediump_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.sign.ivec3_highp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.sign.ivec4_lowp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.sign.ivec4_mediump_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.sign.ivec4_highp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.floor.float_lowp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.floor.float_mediump_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.floor.float_highp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.floor.vec2_lowp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.floor.vec2_mediump_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.floor.vec2_highp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.floor.vec3_lowp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.floor.vec3_mediump_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.floor.vec3_highp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.floor.vec4_lowp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.floor.vec4_mediump_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.floor.vec4_highp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.trunc.float_lowp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.trunc.float_mediump_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.trunc.float_highp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.trunc.vec2_lowp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.trunc.vec2_mediump_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.trunc.vec2_highp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.trunc.vec3_lowp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.trunc.vec3_mediump_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.trunc.vec3_highp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.trunc.vec4_lowp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.trunc.vec4_mediump_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.trunc.vec4_highp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.round.float_lowp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.round.float_mediump_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.round.float_highp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.round.vec2_lowp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.round.vec2_mediump_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.round.vec2_highp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.round.vec3_lowp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.round.vec3_mediump_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.round.vec3_highp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.round.vec4_lowp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.round.vec4_mediump_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.round.vec4_highp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.roundeven.float_lowp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.roundeven.float_mediump_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.roundeven.float_highp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.roundeven.vec2_lowp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.roundeven.vec2_mediump_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.roundeven.vec2_highp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.roundeven.vec3_lowp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.roundeven.vec3_mediump_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.roundeven.vec3_highp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.roundeven.vec4_lowp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.roundeven.vec4_mediump_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.roundeven.vec4_highp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.ceil.float_lowp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.ceil.float_mediump_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.ceil.float_highp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.ceil.vec2_lowp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.ceil.vec2_mediump_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.ceil.vec2_highp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.ceil.vec3_lowp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.ceil.vec3_mediump_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.ceil.vec3_highp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.ceil.vec4_lowp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.ceil.vec4_mediump_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.ceil.vec4_highp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.fract.float_lowp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.fract.float_mediump_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.fract.float_highp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.fract.vec2_lowp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.fract.vec2_mediump_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.fract.vec2_highp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.fract.vec3_lowp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.fract.vec3_mediump_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.fract.vec3_highp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.fract.vec4_lowp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.fract.vec4_mediump_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.fract.vec4_highp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.modf.float_lowp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.modf.float_mediump_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.modf.float_highp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.modf.vec2_lowp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.modf.vec2_mediump_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.modf.vec2_highp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.modf.vec3_lowp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.modf.vec3_mediump_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.modf.vec3_highp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.modf.vec4_lowp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.modf.vec4_mediump_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.modf.vec4_highp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.isnan.float_lowp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.isnan.float_mediump_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.isnan.float_highp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.isnan.vec2_lowp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.isnan.vec2_mediump_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.isnan.vec2_highp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.isnan.vec3_lowp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.isnan.vec3_mediump_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.isnan.vec3_highp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.isnan.vec4_lowp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.isnan.vec4_mediump_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.isnan.vec4_highp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.isinf.float_lowp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.isinf.float_mediump_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.isinf.float_highp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.isinf.vec2_lowp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.isinf.vec2_mediump_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.isinf.vec2_highp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.isinf.vec3_lowp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.isinf.vec3_mediump_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.isinf.vec3_highp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.isinf.vec4_lowp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.isinf.vec4_mediump_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.isinf.vec4_highp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.floatbitstoint.float_lowp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.floatbitstoint.float_mediump_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.floatbitstoint.float_highp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.floatbitstoint.vec2_lowp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.floatbitstoint.vec2_mediump_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.floatbitstoint.vec2_highp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.floatbitstoint.vec3_lowp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.floatbitstoint.vec3_mediump_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.floatbitstoint.vec3_highp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.floatbitstoint.vec4_lowp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.floatbitstoint.vec4_mediump_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.floatbitstoint.vec4_highp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.floatbitstouint.float_lowp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.floatbitstouint.float_mediump_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.floatbitstouint.float_highp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.floatbitstouint.vec2_lowp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.floatbitstouint.vec2_mediump_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.floatbitstouint.vec2_highp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.floatbitstouint.vec3_lowp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.floatbitstouint.vec3_mediump_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.floatbitstouint.vec3_highp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.floatbitstouint.vec4_lowp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.floatbitstouint.vec4_mediump_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.floatbitstouint.vec4_highp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.frexp.float_lowp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.frexp.float_mediump_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.frexp.float_highp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.frexp.vec2_lowp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.frexp.vec2_mediump_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.frexp.vec2_highp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.frexp.vec3_lowp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.frexp.vec3_mediump_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.frexp.vec3_highp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.frexp.vec4_lowp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.frexp.vec4_mediump_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.frexp.vec4_highp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.ldexp.float_lowp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.ldexp.float_mediump_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.ldexp.float_highp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.ldexp.vec2_lowp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.ldexp.vec2_mediump_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.ldexp.vec2_highp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.ldexp.vec3_lowp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.ldexp.vec3_mediump_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.ldexp.vec3_highp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.ldexp.vec4_lowp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.ldexp.vec4_mediump_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.ldexp.vec4_highp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.intbitstofloat.int_highp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.intbitstofloat.ivec2_highp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.intbitstofloat.ivec3_highp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.uintbitstofloat.uint_highp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.uintbitstofloat.uvec2_highp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.uintbitstofloat.uvec3_highp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.pack_unpack.packsnorm4x8_lowp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.pack_unpack.packsnorm4x8_mediump_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.pack_unpack.packsnorm4x8_highp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.pack_unpack.unpacksnorm4x8_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.pack_unpack.packunorm4x8_lowp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.pack_unpack.packunorm4x8_mediump_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.pack_unpack.packunorm4x8_highp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.pack_unpack.unpackunorm4x8_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.pack_unpack.packsnorm2x16_lowp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.pack_unpack.packsnorm2x16_mediump_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.pack_unpack.packsnorm2x16_highp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.pack_unpack.unpacksnorm2x16_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.pack_unpack.packunorm2x16_lowp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.pack_unpack.packunorm2x16_mediump_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.pack_unpack.packunorm2x16_highp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.pack_unpack.unpackunorm2x16_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.pack_unpack.packhalf2x16_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.pack_unpack.unpackhalf2x16_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.uaddcarry.uint_lowp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.uaddcarry.uint_mediump_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.uaddcarry.uint_highp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.uaddcarry.uvec2_lowp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.uaddcarry.uvec2_mediump_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.uaddcarry.uvec2_highp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.uaddcarry.uvec3_lowp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.uaddcarry.uvec3_mediump_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.uaddcarry.uvec3_highp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.uaddcarry.uvec4_lowp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.uaddcarry.uvec4_mediump_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.uaddcarry.uvec4_highp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.usubborrow.uint_lowp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.usubborrow.uint_mediump_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.usubborrow.uint_highp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.usubborrow.uvec2_lowp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.usubborrow.uvec2_mediump_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.usubborrow.uvec2_highp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.usubborrow.uvec3_lowp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.usubborrow.uvec3_mediump_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.usubborrow.uvec3_highp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.usubborrow.uvec4_lowp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.usubborrow.uvec4_mediump_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.usubborrow.uvec4_highp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.umulextended.uint_highp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.umulextended.uvec2_highp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.umulextended.uvec3_highp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.umulextended.uvec4_highp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.imulextended.int_highp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.imulextended.ivec2_highp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.imulextended.ivec3_highp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.imulextended.ivec4_highp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitfieldextract.int_lowp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitfieldextract.int_mediump_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitfieldextract.int_highp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitfieldextract.ivec2_lowp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitfieldextract.ivec2_mediump_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitfieldextract.ivec2_highp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitfieldextract.ivec3_lowp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitfieldextract.ivec3_mediump_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitfieldextract.ivec3_highp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitfieldextract.ivec4_lowp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitfieldextract.ivec4_mediump_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitfieldextract.ivec4_highp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitfieldextract.uint_lowp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitfieldextract.uint_mediump_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitfieldextract.uint_highp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitfieldextract.uvec2_lowp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitfieldextract.uvec2_mediump_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitfieldextract.uvec2_highp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitfieldextract.uvec3_lowp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitfieldextract.uvec3_mediump_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitfieldextract.uvec3_highp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitfieldextract.uvec4_lowp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitfieldextract.uvec4_mediump_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitfieldextract.uvec4_highp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitfieldinsert.int_lowp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitfieldinsert.int_mediump_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitfieldinsert.int_highp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitfieldinsert.ivec2_lowp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitfieldinsert.ivec2_mediump_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitfieldinsert.ivec2_highp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitfieldinsert.ivec3_lowp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitfieldinsert.ivec3_mediump_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitfieldinsert.ivec3_highp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitfieldinsert.ivec4_lowp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitfieldinsert.ivec4_mediump_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitfieldinsert.ivec4_highp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitfieldinsert.uint_lowp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitfieldinsert.uint_mediump_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitfieldinsert.uint_highp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitfieldinsert.uvec2_lowp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitfieldinsert.uvec2_mediump_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitfieldinsert.uvec2_highp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitfieldinsert.uvec3_lowp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitfieldinsert.uvec3_mediump_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitfieldinsert.uvec3_highp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitfieldinsert.uvec4_lowp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitfieldinsert.uvec4_mediump_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitfieldinsert.uvec4_highp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitfieldreverse.int_lowp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitfieldreverse.int_mediump_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitfieldreverse.int_highp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitfieldreverse.ivec2_lowp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitfieldreverse.ivec2_mediump_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitfieldreverse.ivec2_highp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitfieldreverse.ivec3_lowp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitfieldreverse.ivec3_mediump_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitfieldreverse.ivec3_highp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitfieldreverse.ivec4_lowp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitfieldreverse.ivec4_mediump_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitfieldreverse.ivec4_highp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitfieldreverse.uint_lowp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitfieldreverse.uint_mediump_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitfieldreverse.uint_highp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitfieldreverse.uvec2_lowp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitfieldreverse.uvec2_mediump_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitfieldreverse.uvec2_highp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitfieldreverse.uvec3_lowp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitfieldreverse.uvec3_mediump_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitfieldreverse.uvec3_highp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitfieldreverse.uvec4_lowp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitfieldreverse.uvec4_mediump_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitfieldreverse.uvec4_highp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitcount.int_lowp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitcount.int_mediump_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitcount.int_highp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitcount.ivec2_lowp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitcount.ivec2_mediump_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitcount.ivec2_highp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitcount.ivec3_lowp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitcount.ivec3_mediump_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitcount.ivec3_highp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitcount.ivec4_lowp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitcount.ivec4_mediump_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitcount.ivec4_highp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitcount.uint_lowp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitcount.uint_mediump_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitcount.uint_highp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitcount.uvec2_lowp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitcount.uvec2_mediump_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitcount.uvec2_highp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitcount.uvec3_lowp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitcount.uvec3_mediump_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitcount.uvec3_highp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitcount.uvec4_lowp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitcount.uvec4_mediump_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitcount.uvec4_highp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.findlsb.int_lowp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.findlsb.int_mediump_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.findlsb.int_highp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.findlsb.ivec2_lowp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.findlsb.ivec2_mediump_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.findlsb.ivec2_highp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.findlsb.ivec3_lowp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.findlsb.ivec3_mediump_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.findlsb.ivec3_highp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.findlsb.ivec4_lowp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.findlsb.ivec4_mediump_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.findlsb.ivec4_highp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.findlsb.uint_lowp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.findlsb.uint_mediump_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.findlsb.uint_highp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.findlsb.uvec2_lowp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.findlsb.uvec2_mediump_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.findlsb.uvec2_highp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.findlsb.uvec3_lowp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.findlsb.uvec3_mediump_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.findlsb.uvec3_highp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.findlsb.uvec4_lowp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.findlsb.uvec4_mediump_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.findlsb.uvec4_highp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.findmsb.int_lowp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.findmsb.int_mediump_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.findmsb.int_highp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.findmsb.ivec2_lowp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.findmsb.ivec2_mediump_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.findmsb.ivec2_highp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.findmsb.ivec3_lowp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.findmsb.ivec3_mediump_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.findmsb.ivec3_highp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.findmsb.ivec4_lowp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.findmsb.ivec4_mediump_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.findmsb.ivec4_highp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.findmsb.uint_lowp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.findmsb.uint_mediump_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.findmsb.uint_highp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.findmsb.uvec2_lowp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.findmsb.uvec2_mediump_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.findmsb.uvec2_highp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.findmsb.uvec3_lowp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.findmsb.uvec3_mediump_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.findmsb.uvec3_highp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.findmsb.uvec4_lowp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.findmsb.uvec4_mediump_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.findmsb.uvec4_highp_compute = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.linkage.shader_storage_block.mismatch_number_of_declarations = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.linkage.shader_storage_block.mismatch_order = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.linkage.shader_storage_block.mismatch_type = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.linkage.shader_storage_block.mismatch_member_name = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.linkage.shader_storage_block.mismatch_member_unsized_sized_array = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.linkage.shader_storage_block.mismatch_member_array_size = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.linkage.shader_storage_block.mismatch_with_and_without_instance_name = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.shaders.linkage.shader_storage_block.mismatch_block_array_size = FAIL
>-1951 D3D11 : dEQP-GLES31.functional.ssbo.* = FAIL
>-
>-// OPENGL Failing Tests
>-1665 WIN NVIDIA OPENGL : dEQP-GLES31.functional.draw_indirect.negative.command_offset_not_in_buffer_unsigned32_wrap = FAIL
>-1442 NVIDIA OPENGL : dEQP-GLES31.functional.fbo.no_attachments.maximums.all = FAIL
>-1442 OPENGL : dEQP-GLES31.functional.program_interface_query.atomic_counter_buffer.buffer_data_size = FAIL
>-1442 OPENGL : dEQP-GLES31.functional.program_interface_query.atomic_counter_buffer.referenced_by* = FAIL
>-1442 OPENGL : dEQP-GLES31.functional.program_interface_query.buffer_limited_query.* = FAIL
>-1442 OPENGL : dEQP-GLES31.functional.program_interface_query.buffer_variable.* = FAIL
>-1442 OPENGL : dEQP-GLES31.functional.program_interface_query.program_input.* = FAIL
>-1442 OPENGL : dEQP-GLES31.functional.program_interface_query.program_output.* = FAIL
>-1442 OPENGL : dEQP-GLES31.functional.program_interface_query.shader_storage_block.* = FAIL
>-1442 OPENGL : dEQP-GLES31.functional.program_interface_query.transform_feedback_varying.* = FAIL
>-1442 OPENGL : dEQP-GLES31.functional.program_interface_query.uniform.matrix_row_major.* = FAIL
>-1442 OPENGL : dEQP-GLES31.functional.program_interface_query.uniform.matrix_stride.* = FAIL
>-1442 OPENGL : dEQP-GLES31.functional.program_interface_query.uniform.referenced_by_shader.* = FAIL
>-1442 OPENGL : dEQP-GLES31.functional.program_interface_query.uniform.random.* = FAIL
>-1442 OPENGL : dEQP-GLES31.functional.program_interface_query.uniform_block.resource_list.block_array = FAIL
>-1442 OPENGL : dEQP-GLES31.functional.program_interface_query.uniform_block.resource_list.block_array_single_element = FAIL
>-1442 OPENGL : dEQP-GLES31.functional.program_interface_query.uniform_block.referenced_by.* = FAIL
>-1951 OPENGL : dEQP-GLES31.functional.ssbo.layout.* = FAIL
>-
>-// OpenGL and D3D11 Failing Tests
>-1663 OPENGL D3D11 : dEQP-GLES31.functional.draw_indirect.compute_interop.* = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_var.compute.num_work_groups = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_var.compute.work_group_size = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_var.compute.work_group_id = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_var.compute.local_invocation_id = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_var.compute.global_invocation_id = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_var.compute.local_invocation_index = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.add.lowp_compute.scalar = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.add.lowp_compute.vec2 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.add.lowp_compute.vec3 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.add.lowp_compute.vec4 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.add.mediump_compute.scalar = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.add.mediump_compute.vec2 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.add.mediump_compute.vec3 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.add.mediump_compute.vec4 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.add.highp_compute.scalar = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.add.highp_compute.vec2 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.add.highp_compute.vec3 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.add.highp_compute.vec4 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.sub.lowp_compute.scalar = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.sub.lowp_compute.vec2 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.sub.lowp_compute.vec3 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.sub.lowp_compute.vec4 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.sub.mediump_compute.scalar = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.sub.mediump_compute.vec2 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.sub.mediump_compute.vec3 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.sub.mediump_compute.vec4 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.sub.highp_compute.scalar = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.sub.highp_compute.vec2 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.sub.highp_compute.vec3 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.sub.highp_compute.vec4 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.mul.lowp_compute.scalar = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.mul.lowp_compute.vec2 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.mul.lowp_compute.vec3 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.mul.lowp_compute.vec4 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.mul.mediump_compute.scalar = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.mul.mediump_compute.vec2 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.mul.mediump_compute.vec3 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.mul.mediump_compute.vec4 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.mul.highp_compute.scalar = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.mul.highp_compute.vec2 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.mul.highp_compute.vec3 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.mul.highp_compute.vec4 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.div.lowp_compute.scalar = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.div.lowp_compute.vec2 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.div.lowp_compute.vec3 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.div.lowp_compute.vec4 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.div.mediump_compute.scalar = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.div.mediump_compute.vec2 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.div.mediump_compute.vec3 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.div.mediump_compute.vec4 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.radians.lowp_compute.scalar = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.radians.lowp_compute.vec2 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.radians.lowp_compute.vec3 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.radians.lowp_compute.vec4 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.radians.mediump_compute.scalar = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.radians.mediump_compute.vec2 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.radians.mediump_compute.vec3 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.radians.mediump_compute.vec4 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.radians.highp_compute.scalar = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.radians.highp_compute.vec2 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.radians.highp_compute.vec3 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.radians.highp_compute.vec4 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.degrees.lowp_compute.scalar = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.degrees.lowp_compute.vec2 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.degrees.lowp_compute.vec3 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.degrees.lowp_compute.vec4 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.degrees.mediump_compute.scalar = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.degrees.mediump_compute.vec2 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.degrees.mediump_compute.vec3 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.degrees.mediump_compute.vec4 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.degrees.highp_compute.scalar = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.degrees.highp_compute.vec2 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.degrees.highp_compute.vec3 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.degrees.highp_compute.vec4 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.sin.lowp_compute.scalar = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.sin.lowp_compute.vec2 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.sin.lowp_compute.vec3 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.sin.lowp_compute.vec4 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.sin.highp_compute.scalar = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.sin.highp_compute.vec2 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.sin.highp_compute.vec3 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.sin.highp_compute.vec4 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.cos.lowp_compute.scalar = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.cos.lowp_compute.vec2 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.cos.lowp_compute.vec3 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.cos.lowp_compute.vec4 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.cos.highp_compute.scalar = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.cos.highp_compute.vec2 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.cos.highp_compute.vec3 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.cos.highp_compute.vec4 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.tan.lowp_compute.scalar = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.tan.lowp_compute.vec2 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.tan.lowp_compute.vec3 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.tan.lowp_compute.vec4 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.tan.highp_compute.scalar = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.tan.highp_compute.vec2 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.tan.highp_compute.vec3 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.tan.highp_compute.vec4 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.asin.lowp_compute.scalar = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.asin.lowp_compute.vec2 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.asin.lowp_compute.vec3 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.asin.lowp_compute.vec4 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.asin.mediump_compute.scalar = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.asin.mediump_compute.vec2 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.asin.mediump_compute.vec3 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.asin.mediump_compute.vec4 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.asin.highp_compute.scalar = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.asin.highp_compute.vec2 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.asin.highp_compute.vec3 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.asin.highp_compute.vec4 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.acos.lowp_compute.scalar = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.acos.lowp_compute.vec2 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.acos.lowp_compute.vec3 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.acos.lowp_compute.vec4 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.acos.highp_compute.scalar = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.acos.highp_compute.vec2 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.acos.highp_compute.vec3 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.acos.highp_compute.vec4 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.atan2.lowp_compute.scalar = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.atan2.lowp_compute.vec2 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.atan2.lowp_compute.vec3 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.atan2.lowp_compute.vec4 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.atan.lowp_compute.scalar = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.atan.lowp_compute.vec2 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.atan.lowp_compute.vec3 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.atan.lowp_compute.vec4 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.atan.highp_compute.scalar = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.atan.highp_compute.vec2 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.atan.highp_compute.vec3 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.atan.highp_compute.vec4 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.sinh.lowp_compute.scalar = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.sinh.lowp_compute.vec2 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.sinh.lowp_compute.vec3 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.sinh.lowp_compute.vec4 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.sinh.mediump_compute.scalar = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.sinh.mediump_compute.vec2 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.sinh.mediump_compute.vec3 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.sinh.mediump_compute.vec4 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.sinh.highp_compute.scalar = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.sinh.highp_compute.vec2 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.sinh.highp_compute.vec3 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.sinh.highp_compute.vec4 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.cosh.lowp_compute.scalar = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.cosh.lowp_compute.vec2 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.cosh.lowp_compute.vec3 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.cosh.lowp_compute.vec4 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.cosh.mediump_compute.scalar = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.cosh.mediump_compute.vec2 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.cosh.mediump_compute.vec3 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.cosh.mediump_compute.vec4 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.cosh.highp_compute.scalar = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.cosh.highp_compute.vec2 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.cosh.highp_compute.vec3 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.cosh.highp_compute.vec4 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.tanh.lowp_compute.scalar = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.tanh.lowp_compute.vec2 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.tanh.lowp_compute.vec3 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.tanh.lowp_compute.vec4 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.tanh.mediump_compute.scalar = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.tanh.mediump_compute.vec2 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.tanh.mediump_compute.vec3 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.tanh.mediump_compute.vec4 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.tanh.highp_compute.scalar = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.tanh.highp_compute.vec2 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.tanh.highp_compute.vec3 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.tanh.highp_compute.vec4 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.asinh.lowp_compute.scalar = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.asinh.lowp_compute.vec2 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.asinh.lowp_compute.vec3 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.asinh.lowp_compute.vec4 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.asinh.mediump_compute.scalar = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.asinh.mediump_compute.vec2 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.asinh.mediump_compute.vec3 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.asinh.mediump_compute.vec4 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.asinh.highp_compute.scalar = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.asinh.highp_compute.vec2 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.asinh.highp_compute.vec3 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.asinh.highp_compute.vec4 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.acosh.lowp_compute.scalar = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.acosh.lowp_compute.vec2 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.acosh.lowp_compute.vec3 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.acosh.lowp_compute.vec4 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.acosh.mediump_compute.scalar = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.acosh.mediump_compute.vec2 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.acosh.mediump_compute.vec3 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.acosh.mediump_compute.vec4 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.atanh.lowp_compute.scalar = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.atanh.lowp_compute.vec2 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.atanh.lowp_compute.vec3 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.atanh.lowp_compute.vec4 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.atanh.mediump_compute.scalar = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.atanh.mediump_compute.vec2 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.atanh.mediump_compute.vec3 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.atanh.mediump_compute.vec4 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.pow.lowp_compute.scalar = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.pow.lowp_compute.vec2 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.pow.lowp_compute.vec3 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.pow.lowp_compute.vec4 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.pow.mediump_compute.scalar = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.pow.mediump_compute.vec2 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.pow.mediump_compute.vec3 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.pow.mediump_compute.vec4 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.pow.highp_compute.scalar = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.pow.highp_compute.vec2 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.pow.highp_compute.vec3 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.pow.highp_compute.vec4 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.exp.lowp_compute.scalar = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.exp.lowp_compute.vec2 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.exp.lowp_compute.vec3 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.exp.lowp_compute.vec4 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.exp.mediump_compute.scalar = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.exp.mediump_compute.vec2 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.exp.mediump_compute.vec3 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.exp.mediump_compute.vec4 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.exp.highp_compute.scalar = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.exp.highp_compute.vec2 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.exp.highp_compute.vec3 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.exp.highp_compute.vec4 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.log.lowp_compute.scalar = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.log.lowp_compute.vec2 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.log.lowp_compute.vec3 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.log.lowp_compute.vec4 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.log.mediump_compute.scalar = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.log.mediump_compute.vec2 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.log.mediump_compute.vec3 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.log.mediump_compute.vec4 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.log.highp_compute.scalar = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.log.highp_compute.vec2 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.log.highp_compute.vec3 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.log.highp_compute.vec4 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.exp2.lowp_compute.scalar = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.exp2.lowp_compute.vec2 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.exp2.lowp_compute.vec3 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.exp2.lowp_compute.vec4 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.exp2.mediump_compute.scalar = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.exp2.mediump_compute.vec2 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.exp2.mediump_compute.vec3 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.exp2.mediump_compute.vec4 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.exp2.highp_compute.scalar = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.exp2.highp_compute.vec2 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.exp2.highp_compute.vec3 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.exp2.highp_compute.vec4 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.log2.lowp_compute.scalar = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.log2.lowp_compute.vec2 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.log2.lowp_compute.vec3 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.log2.lowp_compute.vec4 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.log2.mediump_compute.scalar = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.log2.mediump_compute.vec2 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.log2.mediump_compute.vec3 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.log2.mediump_compute.vec4 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.log2.highp_compute.scalar = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.log2.highp_compute.vec2 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.log2.highp_compute.vec3 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.log2.highp_compute.vec4 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.sqrt.lowp_compute.scalar = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.sqrt.lowp_compute.vec2 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.sqrt.lowp_compute.vec3 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.sqrt.lowp_compute.vec4 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.sqrt.mediump_compute.scalar = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.sqrt.mediump_compute.vec2 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.sqrt.mediump_compute.vec3 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.sqrt.mediump_compute.vec4 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.sqrt.highp_compute.scalar = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.sqrt.highp_compute.vec2 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.sqrt.highp_compute.vec3 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.sqrt.highp_compute.vec4 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.inversesqrt.lowp_compute.scalar = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.inversesqrt.lowp_compute.vec2 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.inversesqrt.lowp_compute.vec3 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.inversesqrt.lowp_compute.vec4 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.inversesqrt.mediump_compute.scalar = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.inversesqrt.mediump_compute.vec2 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.inversesqrt.mediump_compute.vec3 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.inversesqrt.mediump_compute.vec4 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.inversesqrt.highp_compute.scalar = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.inversesqrt.highp_compute.vec2 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.inversesqrt.highp_compute.vec3 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.inversesqrt.highp_compute.vec4 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.abs.lowp_compute.scalar = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.abs.lowp_compute.vec2 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.abs.lowp_compute.vec3 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.abs.lowp_compute.vec4 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.abs.mediump_compute.scalar = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.abs.mediump_compute.vec2 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.abs.mediump_compute.vec3 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.abs.mediump_compute.vec4 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.abs.highp_compute.scalar = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.abs.highp_compute.vec2 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.abs.highp_compute.vec3 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.abs.highp_compute.vec4 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.sign.lowp_compute.scalar = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.sign.lowp_compute.vec2 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.sign.lowp_compute.vec3 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.sign.lowp_compute.vec4 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.sign.mediump_compute.scalar = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.sign.mediump_compute.vec2 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.sign.mediump_compute.vec3 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.sign.mediump_compute.vec4 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.sign.highp_compute.scalar = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.sign.highp_compute.vec2 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.sign.highp_compute.vec3 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.sign.highp_compute.vec4 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.floor.lowp_compute.scalar = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.floor.lowp_compute.vec2 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.floor.lowp_compute.vec3 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.floor.lowp_compute.vec4 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.floor.mediump_compute.scalar = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.floor.mediump_compute.vec2 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.floor.mediump_compute.vec3 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.floor.mediump_compute.vec4 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.floor.highp_compute.scalar = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.floor.highp_compute.vec2 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.floor.highp_compute.vec3 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.floor.highp_compute.vec4 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.trunc.lowp_compute.scalar = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.trunc.lowp_compute.vec2 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.trunc.lowp_compute.vec3 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.trunc.lowp_compute.vec4 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.trunc.mediump_compute.scalar = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.trunc.mediump_compute.vec2 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.trunc.mediump_compute.vec3 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.trunc.mediump_compute.vec4 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.trunc.highp_compute.scalar = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.trunc.highp_compute.vec2 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.trunc.highp_compute.vec3 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.trunc.highp_compute.vec4 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.round.lowp_compute.scalar = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.round.lowp_compute.vec2 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.round.lowp_compute.vec3 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.round.lowp_compute.vec4 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.round.mediump_compute.scalar = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.round.mediump_compute.vec2 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.round.mediump_compute.vec3 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.round.mediump_compute.vec4 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.round.highp_compute.scalar = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.round.highp_compute.vec2 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.round.highp_compute.vec3 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.round.highp_compute.vec4 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.roundeven.lowp_compute.scalar = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.roundeven.lowp_compute.vec2 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.roundeven.lowp_compute.vec3 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.roundeven.lowp_compute.vec4 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.roundeven.mediump_compute.scalar = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.roundeven.mediump_compute.vec2 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.roundeven.mediump_compute.vec3 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.roundeven.mediump_compute.vec4 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.roundeven.highp_compute.scalar = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.roundeven.highp_compute.vec2 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.roundeven.highp_compute.vec3 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.roundeven.highp_compute.vec4 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.ceil.lowp_compute.scalar = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.ceil.lowp_compute.vec2 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.ceil.lowp_compute.vec3 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.ceil.lowp_compute.vec4 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.ceil.mediump_compute.scalar = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.ceil.mediump_compute.vec2 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.ceil.mediump_compute.vec3 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.ceil.mediump_compute.vec4 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.ceil.highp_compute.scalar = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.ceil.highp_compute.vec2 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.ceil.highp_compute.vec3 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.ceil.highp_compute.vec4 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.fract.lowp_compute.scalar = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.fract.lowp_compute.vec2 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.fract.lowp_compute.vec3 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.fract.lowp_compute.vec4 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.fract.mediump_compute.scalar = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.fract.mediump_compute.vec2 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.fract.mediump_compute.vec3 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.fract.mediump_compute.vec4 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.fract.highp_compute.scalar = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.fract.highp_compute.vec2 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.fract.highp_compute.vec3 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.fract.highp_compute.vec4 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.mod.lowp_compute.scalar = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.mod.lowp_compute.vec2 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.mod.lowp_compute.vec3 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.mod.lowp_compute.vec4 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.mod.mediump_compute.scalar = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.mod.mediump_compute.vec2 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.mod.mediump_compute.vec3 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.mod.mediump_compute.vec4 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.modf.lowp_compute = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.modf.mediump_compute = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.modf.highp_compute = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.min.lowp_compute.scalar = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.min.lowp_compute.vec2 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.min.lowp_compute.vec3 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.min.lowp_compute.vec4 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.min.mediump_compute.scalar = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.min.mediump_compute.vec2 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.min.mediump_compute.vec3 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.min.mediump_compute.vec4 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.max.lowp_compute.scalar = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.max.lowp_compute.vec2 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.max.lowp_compute.vec3 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.max.lowp_compute.vec4 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.max.mediump_compute.scalar = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.max.mediump_compute.vec2 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.max.mediump_compute.vec3 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.max.mediump_compute.vec4 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.clamp.lowp_compute.scalar = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.clamp.lowp_compute.vec2 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.clamp.lowp_compute.vec3 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.clamp.lowp_compute.vec4 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.clamp.mediump_compute.scalar = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.clamp.mediump_compute.vec2 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.clamp.mediump_compute.vec3 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.clamp.mediump_compute.vec4 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.mix.lowp_compute.scalar = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.mix.lowp_compute.vec2 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.mix.lowp_compute.vec3 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.mix.lowp_compute.vec4 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.mix.mediump_compute.scalar = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.mix.mediump_compute.vec2 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.mix.mediump_compute.vec3 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.mix.mediump_compute.vec4 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.mix.highp_compute.scalar = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.mix.highp_compute.vec2 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.mix.highp_compute.vec3 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.mix.highp_compute.vec4 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.step.lowp_compute.scalar = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.step.lowp_compute.vec2 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.step.lowp_compute.vec3 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.step.lowp_compute.vec4 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.step.mediump_compute.scalar = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.step.mediump_compute.vec2 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.step.mediump_compute.vec3 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.step.mediump_compute.vec4 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.step.highp_compute.scalar = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.step.highp_compute.vec2 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.step.highp_compute.vec3 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.step.highp_compute.vec4 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.smoothstep.lowp_compute.scalar = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.smoothstep.lowp_compute.vec2 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.smoothstep.lowp_compute.vec3 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.smoothstep.lowp_compute.vec4 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.length.lowp_compute.scalar = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.length.lowp_compute.vec2 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.length.lowp_compute.vec3 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.length.lowp_compute.vec4 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.length.mediump_compute.scalar = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.length.mediump_compute.vec2 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.length.mediump_compute.vec3 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.length.mediump_compute.vec4 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.length.highp_compute.scalar = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.length.highp_compute.vec2 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.length.highp_compute.vec3 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.length.highp_compute.vec4 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.distance.lowp_compute.scalar = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.distance.lowp_compute.vec2 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.distance.lowp_compute.vec3 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.distance.lowp_compute.vec4 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.distance.mediump_compute.scalar = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.distance.mediump_compute.vec2 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.distance.mediump_compute.vec3 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.distance.mediump_compute.vec4 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.distance.highp_compute.scalar = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.distance.highp_compute.vec2 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.distance.highp_compute.vec3 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.distance.highp_compute.vec4 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.dot.lowp_compute.scalar = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.dot.lowp_compute.vec2 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.dot.lowp_compute.vec3 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.dot.lowp_compute.vec4 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.dot.mediump_compute.scalar = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.dot.mediump_compute.vec2 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.dot.mediump_compute.vec3 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.dot.mediump_compute.vec4 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.dot.highp_compute.scalar = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.dot.highp_compute.vec2 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.dot.highp_compute.vec3 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.cross.lowp_compute = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.cross.mediump_compute = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.cross.highp_compute = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.normalize.lowp_compute.scalar = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.normalize.lowp_compute.vec2 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.normalize.lowp_compute.vec3 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.normalize.lowp_compute.vec4 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.normalize.mediump_compute.scalar = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.normalize.mediump_compute.vec2 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.normalize.mediump_compute.vec3 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.normalize.mediump_compute.vec4 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.normalize.highp_compute.scalar = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.normalize.highp_compute.vec2 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.normalize.highp_compute.vec3 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.normalize.highp_compute.vec4 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.faceforward.lowp_compute.scalar = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.faceforward.lowp_compute.vec2 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.faceforward.lowp_compute.vec3 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.faceforward.lowp_compute.vec4 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.faceforward.mediump_compute.scalar = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.faceforward.mediump_compute.vec2 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.faceforward.mediump_compute.vec3 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.faceforward.mediump_compute.vec4 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.faceforward.highp_compute.scalar = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.faceforward.highp_compute.vec2 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.faceforward.highp_compute.vec3 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.faceforward.highp_compute.vec4 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.reflect.lowp_compute.scalar = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.reflect.lowp_compute.vec2 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.reflect.lowp_compute.vec3 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.reflect.lowp_compute.vec4 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.reflect.mediump_compute.vec2 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.reflect.mediump_compute.vec3 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.reflect.mediump_compute.vec4 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.reflect.highp_compute.vec2 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.reflect.highp_compute.vec3 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.refract.lowp_compute.scalar = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.refract.lowp_compute.vec2 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.refract.lowp_compute.vec3 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.refract.lowp_compute.vec4 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.refract.mediump_compute.scalar = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.refract.mediump_compute.vec2 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.refract.mediump_compute.vec3 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.refract.mediump_compute.vec4 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.refract.highp_compute.scalar = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.refract.highp_compute.vec2 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.refract.highp_compute.vec3 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.refract.highp_compute.vec4 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.matrixcompmult.lowp_compute.mat2 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.matrixcompmult.lowp_compute.mat2x3 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.matrixcompmult.lowp_compute.mat2x4 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.matrixcompmult.lowp_compute.mat3x2 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.matrixcompmult.lowp_compute.mat3 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.matrixcompmult.lowp_compute.mat3x4 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.matrixcompmult.lowp_compute.mat4x2 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.matrixcompmult.lowp_compute.mat4x3 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.matrixcompmult.lowp_compute.mat4 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.matrixcompmult.mediump_compute.mat2 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.matrixcompmult.mediump_compute.mat2x3 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.matrixcompmult.mediump_compute.mat2x4 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.matrixcompmult.mediump_compute.mat3x2 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.matrixcompmult.mediump_compute.mat3 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.matrixcompmult.mediump_compute.mat3x4 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.matrixcompmult.mediump_compute.mat4x2 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.matrixcompmult.mediump_compute.mat4x3 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.matrixcompmult.mediump_compute.mat4 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.matrixcompmult.highp_compute.mat2 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.matrixcompmult.highp_compute.mat2x3 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.matrixcompmult.highp_compute.mat2x4 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.matrixcompmult.highp_compute.mat3x2 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.matrixcompmult.highp_compute.mat3 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.matrixcompmult.highp_compute.mat3x4 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.matrixcompmult.highp_compute.mat4x2 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.matrixcompmult.highp_compute.mat4x3 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.matrixcompmult.highp_compute.mat4 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.outerproduct.lowp_compute.mat2 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.outerproduct.lowp_compute.mat2x3 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.outerproduct.lowp_compute.mat2x4 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.outerproduct.lowp_compute.mat3x2 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.outerproduct.lowp_compute.mat3 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.outerproduct.lowp_compute.mat3x4 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.outerproduct.lowp_compute.mat4x2 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.outerproduct.lowp_compute.mat4x3 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.outerproduct.lowp_compute.mat4 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.outerproduct.mediump_compute.mat2 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.outerproduct.mediump_compute.mat2x3 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.outerproduct.mediump_compute.mat2x4 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.outerproduct.mediump_compute.mat3x2 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.outerproduct.mediump_compute.mat3 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.outerproduct.mediump_compute.mat3x4 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.outerproduct.mediump_compute.mat4x2 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.outerproduct.mediump_compute.mat4x3 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.outerproduct.mediump_compute.mat4 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.outerproduct.highp_compute.mat2 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.outerproduct.highp_compute.mat2x3 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.outerproduct.highp_compute.mat2x4 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.outerproduct.highp_compute.mat3x2 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.outerproduct.highp_compute.mat3 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.outerproduct.highp_compute.mat3x4 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.outerproduct.highp_compute.mat4x2 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.outerproduct.highp_compute.mat4x3 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.outerproduct.highp_compute.mat4 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.transpose.lowp_compute.mat2 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.transpose.lowp_compute.mat2x3 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.transpose.lowp_compute.mat2x4 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.transpose.lowp_compute.mat3x2 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.transpose.lowp_compute.mat3 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.transpose.lowp_compute.mat3x4 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.transpose.lowp_compute.mat4x2 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.transpose.lowp_compute.mat4x3 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.transpose.lowp_compute.mat4 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.transpose.mediump_compute.mat2 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.transpose.mediump_compute.mat2x3 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.transpose.mediump_compute.mat2x4 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.transpose.mediump_compute.mat3x2 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.transpose.mediump_compute.mat3 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.transpose.mediump_compute.mat3x4 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.transpose.mediump_compute.mat4x2 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.transpose.mediump_compute.mat4x3 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.transpose.mediump_compute.mat4 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.transpose.highp_compute.mat2 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.transpose.highp_compute.mat2x3 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.transpose.highp_compute.mat2x4 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.transpose.highp_compute.mat3x2 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.transpose.highp_compute.mat3 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.transpose.highp_compute.mat3x4 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.transpose.highp_compute.mat4x2 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.transpose.highp_compute.mat4x3 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.transpose.highp_compute.mat4 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.determinant.lowp_compute.mat2 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.determinant.mediump_compute.mat2 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.determinant.highp_compute.mat2 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.inverse.lowp_compute.mat2 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.inverse.mediump_compute.mat2 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.frexp.* = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.precision.ldexp.* = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.opaque_type_indexing.* = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_constants.core.max_vertex_attribs = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_constants.core.max_vertex_uniform_vectors = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_constants.core.max_vertex_output_vectors = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_constants.core.max_fragment_input_vectors = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_constants.core.max_fragment_uniform_vectors = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_constants.core.max_draw_buffers = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_constants.core.max_vertex_texture_image_units = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_constants.core.max_combined_texture_image_units = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_constants.core.max_texture_image_units = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_constants.core.min_program_texel_offset = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_constants.core.max_program_texel_offset = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_constants.core.max_image_units = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_constants.core.max_vertex_image_uniforms = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_constants.core.max_fragment_image_uniforms = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_constants.core.max_compute_image_uniforms = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_constants.core.max_combined_image_uniforms = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_constants.core.max_combined_shader_output_resources = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_constants.core.max_compute_uniform_components = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_constants.core.max_compute_texture_image_units = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_constants.core.max_compute_atomic_counters = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_constants.core.max_compute_atomic_counter_buffers = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_constants.core.max_vertex_atomic_counters = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_constants.core.max_fragment_atomic_counters = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_constants.core.max_combined_atomic_counters = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_constants.core.max_atomic_counter_bindings = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_constants.core.max_vertex_atomic_counter_buffers = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_constants.core.max_fragment_atomic_counter_buffers = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_constants.core.max_combined_atomic_counter_buffers = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_constants.core.max_atomic_counter_buffer_size = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_constants.core.max_compute_work_group_count = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_constants.core.max_compute_work_group_size = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.shaders.helper_invocation.* = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.compute.basic.ssbo_unsized_arr_single_invocation = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.compute.basic.ssbo_unsized_arr_multiple_groups = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.compute.basic.write_multiple_unsized_arr_single_invocation = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.compute.basic.write_multiple_unsized_arr_multiple_groups = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.compute.basic.ssbo_cmd_barrier_single = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.compute.basic.ssbo_cmd_barrier_multiple = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.compute.basic.copy_image_to_ssbo_large = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.compute.basic.copy_ssbo_to_image_large = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.compute.basic.image_barrier_single = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.compute.basic.image_barrier_multiple = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.compute.basic.atomic_counter_single_invocation = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.compute.basic.atomic_counter_single_group = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.compute.basic.atomic_counter_multiple_invocations = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.compute.basic.atomic_counter_multiple_groups = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.compute.indirect_dispatch.* = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.ubo.random.basic_type_arrays.4 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.ubo.random.basic_type_arrays.10 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.ubo.random.all_per_block_buffers.1 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.ubo.random.all_per_block_buffers.7 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.ubo.random.all_per_block_buffers.10 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.ubo.random.all_per_block_buffers.13 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.ubo.random.all_per_block_buffers.18 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.ubo.random.all_per_block_buffers.20 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.ubo.random.all_per_block_buffers.29 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.ubo.random.all_per_block_buffers.41 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.ubo.random.all_shared_buffer.1 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.ubo.random.all_shared_buffer.8 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.ubo.random.all_shared_buffer.22 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.ubo.random.all_shared_buffer.37 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.ubo.random.all_shared_buffer.38 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.stencil_texturing.format.depth32f_stencil8_2d = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.stencil_texturing.format.depth32f_stencil8_2d_array = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.stencil_texturing.format.depth32f_stencil8_cube = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.stencil_texturing.format.depth24_stencil8_2d = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.stencil_texturing.format.depth24_stencil8_2d_array = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.stencil_texturing.format.depth24_stencil8_cube = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.stencil_texturing.render.depth32f_stencil8_clear = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.stencil_texturing.render.depth32f_stencil8_draw = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.stencil_texturing.render.depth24_stencil8_clear = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.stencil_texturing.render.depth24_stencil8_draw = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.stencil_texturing.misc.compare_mode_effect = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.stencil_texturing.misc.base_level = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.state_query.integer.dispatch_indirect_buffer_binding_* = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.state_query.integer.program_pipeline_binding_* = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.state_query.indexed.image_binding* = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.state_query.texture.texture_2d.depth_stencil_mode_* = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.state_query.texture.texture_cube_map.depth_stencil_mode_* = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.state_query.texture.texture_2d_array.depth_stencil_mode_* = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.state_query.texture.texture_3d.depth_stencil_mode_* = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.state_query.texture.texture_2d_multisample.* = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.state_query.internal_format.renderbuffer.rgb10_a2ui_samples = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.state_query.internal_format.renderbuffer.r8i_samples = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.state_query.internal_format.renderbuffer.r8ui_samples = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.state_query.internal_format.renderbuffer.r16i_samples = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.state_query.internal_format.renderbuffer.r16ui_samples = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.state_query.internal_format.renderbuffer.r32i_samples = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.state_query.internal_format.renderbuffer.r32ui_samples = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.state_query.internal_format.renderbuffer.rg8i_samples = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.state_query.internal_format.renderbuffer.rg8ui_samples = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.state_query.internal_format.renderbuffer.rg16i_samples = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.state_query.internal_format.renderbuffer.rg16ui_samples = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.state_query.internal_format.renderbuffer.rg32i_samples = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.state_query.internal_format.renderbuffer.rg32ui_samples = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.state_query.internal_format.renderbuffer.rgba8i_samples = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.state_query.internal_format.renderbuffer.rgba8ui_samples = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.state_query.internal_format.renderbuffer.rgba16i_samples = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.state_query.internal_format.renderbuffer.rgba16ui_samples = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.state_query.internal_format.renderbuffer.rgba32i_samples = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.state_query.internal_format.renderbuffer.rgba32ui_samples = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.state_query.internal_format.partial_query.num_sample_counts = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.state_query.internal_format.partial_query.samples = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.state_query.program.program_separable_get_programiv = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.state_query.program_pipeline.* = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.synchronization.* = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.separate_shader.* = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.debug.error_filters.case_11 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.debug.error_groups.case_11 = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.debug.negative_coverage.callbacks.buffer.bind_buffer_range = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.debug.negative_coverage.callbacks.shader.compile_compute_shader = SKIP
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.debug.negative_coverage.callbacks.shader_directive.primitive_bounding_box = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.debug.negative_coverage.callbacks.shader_directive.tessellation_shader = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.debug.negative_coverage.log.buffer.bind_buffer_range = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.debug.negative_coverage.log.shader.compile_compute_shader = SKIP
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.debug.negative_coverage.log.shader_directive.primitive_bounding_box = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.debug.negative_coverage.log.shader_directive.tessellation_shader = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.debug.negative_coverage.get_error.buffer.bind_buffer_range = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.debug.negative_coverage.get_error.buffer.read_pixels_format_mismatch = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.debug.negative_coverage.get_error.buffer.framebuffer_texture2d = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.debug.negative_coverage.get_error.buffer.blit_framebuffer = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.debug.negative_coverage.get_error.buffer.invalidate_sub_framebuffer = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.debug.negative_coverage.get_error.texture.copyteximage2d_invalid_format = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.debug.negative_coverage.get_error.texture.copyteximage2d_inequal_width_height_cube = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.debug.negative_coverage.get_error.texture.copyteximage2d_max_width_height = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.debug.negative_coverage.get_error.texture.copytexsubimage2d_invalid_offset = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.debug.negative_coverage.get_error.texture.copytexsubimage2d_texture_internalformat = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.debug.negative_coverage.get_error.texture.texparameteri = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.debug.negative_coverage.get_error.texture.texparameterf = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.debug.negative_coverage.get_error.texture.texparameteriv = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.debug.negative_coverage.get_error.texture.texparameterfv = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.debug.negative_coverage.get_error.texture.compressedtexsubimage2d = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.debug.negative_coverage.get_error.texture.compressedtexsubimage2d_invalid_size = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.debug.negative_coverage.get_error.texture.texsubimage3d_neg_level = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.debug.negative_coverage.get_error.texture.texsubimage3d_neg_offset = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.debug.negative_coverage.get_error.texture.copytexsubimage3d_invalid_offset = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.debug.negative_coverage.get_error.texture.compressedtexsubimage3d = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.debug.negative_coverage.get_error.texture.compressedtexsubimage3d_invalid_buffer_target = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.debug.negative_coverage.get_error.shader.compile_compute_shader = SKIP
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.debug.negative_coverage.get_error.vertex_array.draw_range_elements = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.debug.negative_coverage.get_error.vertex_array.draw_range_elements_incomplete_primitive = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.debug.negative_coverage.get_error.shader_directive.primitive_bounding_box = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.debug.negative_coverage.get_error.shader_directive.tessellation_shader = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.debug.object_labels.program_pipeline = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.layout_binding.image.image2d.* = FAIL
>-1442 OPENGL D3D11 : dEQP-GLES31.functional.layout_binding.image.image3d.* = FAIL
>-
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.abs.float_lowp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.abs.float_mediump_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.abs.float_highp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.abs.vec2_lowp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.abs.vec2_mediump_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.abs.vec2_highp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.abs.vec3_lowp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.abs.vec3_mediump_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.abs.vec3_highp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.abs.vec4_lowp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.abs.vec4_mediump_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.abs.vec4_highp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.abs.int_lowp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.abs.int_mediump_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.abs.int_highp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.abs.ivec2_lowp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.abs.ivec2_mediump_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.abs.ivec2_highp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.abs.ivec3_lowp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.abs.ivec3_mediump_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.abs.ivec3_highp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.abs.ivec4_lowp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.abs.ivec4_mediump_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.abs.ivec4_highp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.sign.float_lowp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.sign.float_mediump_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.sign.float_highp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.sign.vec2_lowp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.sign.vec2_mediump_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.sign.vec2_highp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.sign.vec3_lowp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.sign.vec3_mediump_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.sign.vec3_highp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.sign.vec4_lowp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.sign.vec4_mediump_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.sign.vec4_highp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.sign.int_lowp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.sign.int_mediump_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.sign.int_highp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.sign.ivec2_lowp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.sign.ivec2_mediump_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.sign.ivec2_highp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.sign.ivec3_lowp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.sign.ivec3_mediump_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.sign.ivec3_highp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.sign.ivec4_lowp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.sign.ivec4_mediump_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.sign.ivec4_highp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.floor.float_lowp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.floor.float_mediump_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.floor.float_highp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.floor.vec2_lowp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.floor.vec2_mediump_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.floor.vec2_highp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.floor.vec3_lowp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.floor.vec3_mediump_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.floor.vec3_highp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.floor.vec4_lowp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.floor.vec4_mediump_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.floor.vec4_highp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.trunc.float_lowp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.trunc.float_mediump_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.trunc.float_highp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.trunc.vec2_lowp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.trunc.vec2_mediump_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.trunc.vec2_highp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.trunc.vec3_lowp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.trunc.vec3_mediump_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.trunc.vec3_highp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.trunc.vec4_lowp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.trunc.vec4_mediump_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.trunc.vec4_highp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.round.float_lowp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.round.float_mediump_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.round.float_highp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.round.vec2_lowp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.round.vec2_mediump_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.round.vec2_highp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.round.vec3_lowp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.round.vec3_mediump_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.round.vec3_highp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.round.vec4_lowp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.round.vec4_mediump_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.round.vec4_highp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.roundeven.float_lowp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.roundeven.float_mediump_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.roundeven.float_highp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.roundeven.vec2_lowp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.roundeven.vec2_mediump_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.roundeven.vec2_highp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.roundeven.vec3_lowp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.roundeven.vec3_mediump_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.roundeven.vec3_highp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.roundeven.vec4_lowp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.roundeven.vec4_mediump_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.roundeven.vec4_highp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.ceil.float_lowp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.ceil.float_mediump_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.ceil.float_highp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.ceil.vec2_lowp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.ceil.vec2_mediump_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.ceil.vec2_highp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.ceil.vec3_lowp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.ceil.vec3_mediump_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.ceil.vec3_highp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.ceil.vec4_lowp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.ceil.vec4_mediump_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.ceil.vec4_highp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.fract.float_lowp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.fract.float_mediump_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.fract.float_highp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.fract.vec2_lowp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.fract.vec2_mediump_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.fract.vec2_highp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.fract.vec3_lowp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.fract.vec3_mediump_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.fract.vec3_highp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.fract.vec4_lowp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.fract.vec4_mediump_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.fract.vec4_highp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.modf.float_lowp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.modf.float_mediump_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.modf.float_highp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.modf.vec2_lowp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.modf.vec2_mediump_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.modf.vec2_highp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.modf.vec3_lowp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.modf.vec3_mediump_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.modf.vec3_highp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.modf.vec4_lowp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.modf.vec4_mediump_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.modf.vec4_highp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.isnan.float_lowp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.isnan.float_mediump_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.isnan.float_highp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.isnan.vec2_lowp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.isnan.vec2_mediump_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.isnan.vec2_highp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.isnan.vec3_lowp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.isnan.vec3_mediump_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.isnan.vec3_highp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.isnan.vec4_lowp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.isnan.vec4_mediump_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.isnan.vec4_highp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.isinf.float_lowp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.isinf.float_mediump_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.isinf.float_highp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.isinf.vec2_lowp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.isinf.vec2_mediump_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.isinf.vec2_highp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.isinf.vec3_lowp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.isinf.vec3_mediump_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.isinf.vec3_highp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.isinf.vec4_lowp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.isinf.vec4_mediump_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.isinf.vec4_highp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.floatbitstoint.float_lowp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.floatbitstoint.float_mediump_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.floatbitstoint.float_highp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.floatbitstoint.vec2_lowp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.floatbitstoint.vec2_mediump_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.floatbitstoint.vec2_highp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.floatbitstoint.vec3_lowp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.floatbitstoint.vec3_mediump_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.floatbitstoint.vec3_highp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.floatbitstoint.vec4_lowp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.floatbitstoint.vec4_mediump_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.floatbitstoint.vec4_highp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.floatbitstouint.float_lowp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.floatbitstouint.float_mediump_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.floatbitstouint.float_highp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.floatbitstouint.vec2_lowp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.floatbitstouint.vec2_mediump_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.floatbitstouint.vec2_highp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.floatbitstouint.vec3_lowp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.floatbitstouint.vec3_mediump_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.floatbitstouint.vec3_highp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.floatbitstouint.vec4_lowp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.floatbitstouint.vec4_mediump_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.floatbitstouint.vec4_highp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.frexp.float_lowp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.frexp.float_mediump_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.frexp.float_highp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.frexp.vec2_lowp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.frexp.vec2_mediump_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.frexp.vec2_highp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.frexp.vec3_lowp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.frexp.vec3_mediump_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.frexp.vec3_highp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.frexp.vec4_lowp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.frexp.vec4_mediump_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.frexp.vec4_highp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.ldexp.float_lowp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.ldexp.float_mediump_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.ldexp.float_highp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.ldexp.vec2_lowp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.ldexp.vec2_mediump_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.ldexp.vec2_highp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.ldexp.vec3_lowp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.ldexp.vec3_mediump_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.ldexp.vec3_highp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.ldexp.vec4_lowp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.ldexp.vec4_mediump_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.ldexp.vec4_highp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.fma.float_lowp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.fma.float_mediump_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.fma.float_highp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.fma.vec2_lowp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.fma.vec2_mediump_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.fma.vec2_highp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.fma.vec3_lowp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.fma.vec3_mediump_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.fma.vec3_highp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.fma.vec4_lowp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.fma.vec4_mediump_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.fma.vec4_highp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.intbitstofloat.int_highp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.intbitstofloat.ivec2_highp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.intbitstofloat.ivec3_highp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.uintbitstofloat.uint_highp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.uintbitstofloat.uvec2_highp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.uintbitstofloat.uvec3_highp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.pack_unpack.packsnorm4x8_lowp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.pack_unpack.packsnorm4x8_mediump_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.pack_unpack.packsnorm4x8_highp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.pack_unpack.unpacksnorm4x8_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.pack_unpack.packunorm4x8_lowp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.pack_unpack.packunorm4x8_mediump_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.pack_unpack.packunorm4x8_highp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.pack_unpack.unpackunorm4x8_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.pack_unpack.packsnorm2x16_lowp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.pack_unpack.packsnorm2x16_mediump_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.pack_unpack.packsnorm2x16_highp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.pack_unpack.unpacksnorm2x16_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.pack_unpack.packunorm2x16_lowp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.pack_unpack.packunorm2x16_mediump_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.pack_unpack.packunorm2x16_highp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.pack_unpack.unpackunorm2x16_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.pack_unpack.packhalf2x16_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.pack_unpack.unpackhalf2x16_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.uaddcarry.uint_lowp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.uaddcarry.uint_mediump_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.uaddcarry.uint_highp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.uaddcarry.uvec2_lowp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.uaddcarry.uvec2_mediump_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.uaddcarry.uvec2_highp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.uaddcarry.uvec3_lowp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.uaddcarry.uvec3_mediump_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.uaddcarry.uvec3_highp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.uaddcarry.uvec4_lowp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.uaddcarry.uvec4_mediump_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.uaddcarry.uvec4_highp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.usubborrow.uint_lowp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.usubborrow.uint_mediump_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.usubborrow.uint_highp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.usubborrow.uvec2_lowp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.usubborrow.uvec2_mediump_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.usubborrow.uvec2_highp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.usubborrow.uvec3_lowp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.usubborrow.uvec3_mediump_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.usubborrow.uvec3_highp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.usubborrow.uvec4_lowp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.usubborrow.uvec4_mediump_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.usubborrow.uvec4_highp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.umulextended.uint_highp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.umulextended.uvec2_highp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.umulextended.uvec3_highp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.umulextended.uvec4_highp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.imulextended.int_highp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.imulextended.ivec2_highp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.imulextended.ivec3_highp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.imulextended.ivec4_highp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitfieldextract.int_lowp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitfieldextract.int_mediump_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitfieldextract.int_highp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitfieldextract.ivec2_lowp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitfieldextract.ivec2_mediump_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitfieldextract.ivec2_highp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitfieldextract.ivec3_lowp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitfieldextract.ivec3_mediump_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitfieldextract.ivec3_highp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitfieldextract.ivec4_lowp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitfieldextract.ivec4_mediump_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitfieldextract.ivec4_highp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitfieldextract.uint_lowp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitfieldextract.uint_mediump_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitfieldextract.uint_highp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitfieldextract.uvec2_lowp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitfieldextract.uvec2_mediump_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitfieldextract.uvec2_highp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitfieldextract.uvec3_lowp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitfieldextract.uvec3_mediump_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitfieldextract.uvec3_highp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitfieldextract.uvec4_lowp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitfieldextract.uvec4_mediump_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitfieldextract.uvec4_highp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitfieldinsert.int_lowp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitfieldinsert.int_mediump_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitfieldinsert.int_highp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitfieldinsert.ivec2_lowp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitfieldinsert.ivec2_mediump_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitfieldinsert.ivec2_highp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitfieldinsert.ivec3_lowp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitfieldinsert.ivec3_mediump_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitfieldinsert.ivec3_highp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitfieldinsert.ivec4_lowp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitfieldinsert.ivec4_mediump_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitfieldinsert.ivec4_highp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitfieldinsert.uint_lowp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitfieldinsert.uint_mediump_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitfieldinsert.uint_highp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitfieldinsert.uvec2_lowp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitfieldinsert.uvec2_mediump_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitfieldinsert.uvec2_highp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitfieldinsert.uvec3_lowp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitfieldinsert.uvec3_mediump_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitfieldinsert.uvec3_highp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitfieldinsert.uvec4_lowp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitfieldinsert.uvec4_mediump_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitfieldinsert.uvec4_highp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitfieldreverse.int_lowp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitfieldreverse.int_mediump_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitfieldreverse.int_highp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitfieldreverse.ivec2_lowp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitfieldreverse.ivec2_mediump_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitfieldreverse.ivec2_highp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitfieldreverse.ivec3_lowp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitfieldreverse.ivec3_mediump_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitfieldreverse.ivec3_highp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitfieldreverse.ivec4_lowp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitfieldreverse.ivec4_mediump_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitfieldreverse.ivec4_highp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitfieldreverse.uint_lowp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitfieldreverse.uint_mediump_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitfieldreverse.uint_highp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitfieldreverse.uvec2_lowp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitfieldreverse.uvec2_mediump_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitfieldreverse.uvec2_highp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitfieldreverse.uvec3_lowp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitfieldreverse.uvec3_mediump_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitfieldreverse.uvec3_highp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitfieldreverse.uvec4_lowp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitfieldreverse.uvec4_mediump_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitfieldreverse.uvec4_highp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitcount.int_lowp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitcount.int_mediump_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitcount.int_highp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitcount.ivec2_lowp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitcount.ivec2_mediump_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitcount.ivec2_highp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitcount.ivec3_lowp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitcount.ivec3_mediump_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitcount.ivec3_highp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitcount.ivec4_lowp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitcount.ivec4_mediump_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitcount.ivec4_highp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitcount.uint_lowp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitcount.uint_mediump_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitcount.uint_highp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitcount.uvec2_lowp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitcount.uvec2_mediump_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitcount.uvec2_highp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitcount.uvec3_lowp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitcount.uvec3_mediump_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitcount.uvec3_highp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitcount.uvec4_lowp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitcount.uvec4_mediump_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitcount.uvec4_highp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.findlsb.int_lowp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.findlsb.int_mediump_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.findlsb.int_highp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.findlsb.ivec2_lowp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.findlsb.ivec2_mediump_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.findlsb.ivec2_highp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.findlsb.ivec3_lowp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.findlsb.ivec3_mediump_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.findlsb.ivec3_highp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.findlsb.ivec4_lowp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.findlsb.ivec4_mediump_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.findlsb.ivec4_highp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.findlsb.uint_lowp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.findlsb.uint_mediump_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.findlsb.uint_highp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.findlsb.uvec2_lowp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.findlsb.uvec2_mediump_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.findlsb.uvec2_highp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.findlsb.uvec3_lowp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.findlsb.uvec3_mediump_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.findlsb.uvec3_highp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.findlsb.uvec4_lowp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.findlsb.uvec4_mediump_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.findlsb.uvec4_highp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.findmsb.int_lowp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.findmsb.int_mediump_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.findmsb.int_highp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.findmsb.ivec2_lowp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.findmsb.ivec2_mediump_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.findmsb.ivec2_highp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.findmsb.ivec3_lowp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.findmsb.ivec3_mediump_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.findmsb.ivec3_highp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.findmsb.ivec4_lowp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.findmsb.ivec4_mediump_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.findmsb.ivec4_highp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.findmsb.uint_lowp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.findmsb.uint_mediump_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.findmsb.uint_highp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.findmsb.uvec2_lowp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.findmsb.uvec2_mediump_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.findmsb.uvec2_highp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.findmsb.uvec3_lowp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.findmsb.uvec3_mediump_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.findmsb.uvec3_highp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.findmsb.uvec4_lowp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.findmsb.uvec4_mediump_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.findmsb.uvec4_highp_geometry = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.builtin_constants.geometry_shader.* = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.shaders.linkage.geometry.* = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.state_query.program.geometry_shader_state_get_programiv = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.debug.negative_coverage.callbacks.shader_directive.geometry_shader = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.debug.negative_coverage.log.shader_directive.geometry_shader = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.debug.negative_coverage.get_error.shader_directive.geometry_shader = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.geometry_shading.query.* = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.geometry_shading.basic.* = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.geometry_shading.input.* = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.geometry_shading.conversion.* = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.geometry_shading.emit.* = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.geometry_shading.varying.* = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.geometry_shading.instanced.geometry_* = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.geometry_shading.instanced.invocation_output_* = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.geometry_shading.instanced.draw_* = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.geometry_shading.vertex_transform_feedback.* = FAIL
>-1941 OPENGL D3D11 : dEQP-GLES31.functional.geometry_shading.negative.* = FAIL
>diff --git a/Source/ThirdParty/ANGLE/src/tests/deqp_support/deqp_gles31_test_expectations.txt b/Source/ThirdParty/ANGLE/src/tests/deqp_support/deqp_gles31_test_expectations.txt
>new file mode 100644
>index 00000000000..e7314b1f642
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/tests/deqp_support/deqp_gles31_test_expectations.txt
>@@ -0,0 +1,608 @@
>+// Copyright 2016 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+
>+// This file contains a list of defective dEQP conformance tests. The expected
>+// format is:
>+//  {BUG#} {MODIFIERS} : {TEST_NAME} = {PASS,FAIL,FLAKY,TIMEOUT,SKIP}
>+//
>+// MODIFIERS can be a combination of the below list, combined with a logical AND:
>+//  WIN XP VISTA WIN7 WIN8 WIN10
>+//  MAC LEOPARD SNOWLEOPARD LION MOUNTAINLION MAVERICKS YOSEMITE ELCAPITAN SIERRA HIGHSIERRA MOJAVE
>+//  LINUX CHROMEOS ANDROID
>+//  NVIDIA AMD INTEL
>+//  DEBUG RELEASE
>+//  D3D9 D3D11 OPENGL GLES VULKAN
>+//  NEXUS5X PIXEL2
>+//  QUADROP400
>+//
>+//
>+// TEST_NAME can be a specific test name, or have a '*' in the end, which
>+// indicates a prefix matching.
>+//
>+// Examples:
>+// fails on both windows and mac (crash)
>+//  91530 WIN : context_lost_restored = SKIP
>+//  91530 MAC : context_lost_restored = SKIP
>+// fails on windows using NVIDIA GPUs
>+//  91533 WIN NVIDIA : gl_min_uniforms = FAIL
>+// fails on Nexus5X with GLES backend (hangs)
>+//  91531 NEXUS5X GLES : conformance_more_* = SKIP
>+
>+// Crashing Tests
>+1920 NVIDIA D3D11 : dEQP-GLES31.functional.layout_binding.ubo.vertex_binding_max = SKIP
>+1442 D3D11 : dEQP-GLES31.functional.program_interface_query.transform_feedback_varying.resource_list.vertex_fragment.builtin_gl_position = SKIP
>+1442 OPENGL : dEQP-GLES31.functional.program_interface_query.transform_feedback_varying.resource_list.vertex_fragment.builtin_gl_position = SKIP
>+
>+// Crashing Tests on Linux on Intel HD 630.
>+2349 LINUX INTEL : dEQP-GLES31.functional.synchronization.in_invocation.image_* = SKIP
>+2349 LINUX INTEL : dEQP-GLES31.functional.synchronization.inter_invocation.image_* = SKIP
>+2349 LINUX INTEL : dEQP-GLES31.functional.compute.basic.copy_image_to_ssbo_small = SKIP
>+2349 LINUX INTEL : dEQP-GLES31.functional.compute.basic.copy_ssbo_to_image_small = SKIP
>+2349 LINUX INTEL : dEQP-GLES31.functional.compute.basic.image_barrier_multiple = SKIP
>+
>+// Failing Tests on Linux on Intel HD 630.
>+2349 LINUX INTEL : dEQP-GLES31.functional.debug.negative_coverage.get_error.shader.program_binary = FAIL
>+
>+
>+1442 : dEQP-GLES31.functional.program_interface_query.transform_feedback_varying.resource_list.vertex_fragment.default_block_struct_member = SKIP
>+1442 : dEQP-GLES31.functional.program_interface_query.transform_feedback_varying.array_size.vertex_fragment.default_block_struct_member = SKIP
>+1442 : dEQP-GLES31.functional.program_interface_query.transform_feedback_varying.name_length.vertex_fragment.default_block_struct_member = SKIP
>+1442 : dEQP-GLES31.functional.program_interface_query.transform_feedback_varying.type.vertex_fragment.struct.* = SKIP
>+1442 : dEQP-GLES31.functional.image_load_store.* = SKIP
>+
>+
>+// D3D11 Failing Tests
>+// Below cases are failed due to binding multi-UAVs to a single buffer is not supported in D3D backend.
>+// http://anglebug.com/3032
>+3032 D3D11 : dEQP-GLES31.functional.ssbo.layout.single_struct.single_buffer* = FAIL
>+3032 D3D11 : dEQP-GLES31.functional.ssbo.layout.single_struct_array.single_buffer* = FAIL
>+3032 D3D11 : dEQP-GLES31.functional.ssbo.layout.single_nested_struct.single_buffer* = FAIL
>+3032 D3D11 : dEQP-GLES31.functional.ssbo.layout.single_nested_struct_array.single_buffer* = FAIL
>+3032 D3D11 : dEQP-GLES31.functional.ssbo.layout.unsized_struct_array.single_buffer* = FAIL
>+3032 D3D11 : dEQP-GLES31.functional.ssbo.layout.2_level_unsized_struct_array.single_buffer* = FAIL
>+3032 D3D11 : dEQP-GLES31.functional.ssbo.layout.unsized_nested_struct_array.single_buffer* = FAIL
>+3032 D3D11 : dEQP-GLES31.functional.ssbo.layout.multi_basic_types.single_buffer* = FAIL
>+3032 D3D11 : dEQP-GLES31.functional.ssbo.layout.multi_nested_struct.single_buffer* = FAIL
>+3032 D3D11 : dEQP-GLES31.functional.ssbo.layout.random.nested_structs_arrays_instance_arrays.13 = FAIL
>+3032 D3D11 : dEQP-GLES31.functional.ssbo.layout.random.all_shared_buffer* = FAIL
>+
>+1442 D3D11 : dEQP-GLES31.functional.state_query.integer.max_compute_atomic_counters_* = FAIL
>+1442 D3D11 : dEQP-GLES31.functional.state_query.integer.max_atomic_counter_buffer_size_* = FAIL
>+1442 D3D11 : dEQP-GLES31.functional.state_query.integer.max_combined_atomic_counters* = FAIL
>+1442 D3D11 : dEQP-GLES31.functional.state_query.integer.max_uniform_buffer_bindings_* = FAIL
>+1442 D3D11 : dEQP-GLES31.functional.state_query.integer.max_combined_texture_image_units_* = FAIL
>+1442 D3D11 : dEQP-GLES31.functional.state_query.program.compute_work_group_size_get_programiv = FAIL
>+1442 D3D11 : dEQP-GLES31.functional.debug.async.case_4_log = SKIP
>+1442 D3D11 : dEQP-GLES31.functional.debug.async.case_5_callback = SKIP
>+1442 D3D11 : dEQP-GLES31.functional.debug.error_filters.case_2 = FAIL
>+1442 D3D11 : dEQP-GLES31.functional.debug.error_filters.case_3 = FAIL
>+1442 D3D11 : dEQP-GLES31.functional.debug.error_filters.case_9 = FAIL
>+1442 D3D11 : dEQP-GLES31.functional.debug.error_filters.case_10 = FAIL
>+1442 D3D11 : dEQP-GLES31.functional.debug.error_filters.case_27 = FAIL
>+1442 D3D11 : dEQP-GLES31.functional.debug.error_filters.case_28 = FAIL
>+1442 D3D11 : dEQP-GLES31.functional.debug.error_groups.case_2 = FAIL
>+1442 D3D11 : dEQP-GLES31.functional.debug.error_groups.case_3 = FAIL
>+1442 D3D11 : dEQP-GLES31.functional.debug.error_groups.case_9 = FAIL
>+1442 D3D11 : dEQP-GLES31.functional.debug.error_groups.case_10 = FAIL
>+1663 D3D11 : dEQP-GLES31.functional.draw_indirect.compute_interop.* = FAIL
>+
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.abs.float_lowp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.abs.float_mediump_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.abs.float_highp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.abs.vec2_lowp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.abs.vec2_mediump_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.abs.vec2_highp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.abs.vec3_lowp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.abs.vec3_mediump_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.abs.vec3_highp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.abs.vec4_lowp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.abs.vec4_mediump_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.abs.vec4_highp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.abs.int_lowp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.abs.int_mediump_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.abs.int_highp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.abs.ivec2_lowp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.abs.ivec2_mediump_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.abs.ivec2_highp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.abs.ivec3_lowp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.abs.ivec3_mediump_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.abs.ivec3_highp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.abs.ivec4_lowp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.abs.ivec4_mediump_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.abs.ivec4_highp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.sign.float_lowp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.sign.float_mediump_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.sign.float_highp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.sign.vec2_lowp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.sign.vec2_mediump_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.sign.vec2_highp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.sign.vec3_lowp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.sign.vec3_mediump_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.sign.vec3_highp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.sign.vec4_lowp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.sign.vec4_mediump_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.sign.vec4_highp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.sign.int_lowp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.sign.int_mediump_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.sign.int_highp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.sign.ivec2_lowp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.sign.ivec2_mediump_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.sign.ivec2_highp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.sign.ivec3_lowp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.sign.ivec3_mediump_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.sign.ivec3_highp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.sign.ivec4_lowp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.sign.ivec4_mediump_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.sign.ivec4_highp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.floor.float_lowp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.floor.float_mediump_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.floor.float_highp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.floor.vec2_lowp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.floor.vec2_mediump_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.floor.vec2_highp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.floor.vec3_lowp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.floor.vec3_mediump_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.floor.vec3_highp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.floor.vec4_lowp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.floor.vec4_mediump_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.floor.vec4_highp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.trunc.float_lowp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.trunc.float_mediump_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.trunc.float_highp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.trunc.vec2_lowp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.trunc.vec2_mediump_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.trunc.vec2_highp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.trunc.vec3_lowp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.trunc.vec3_mediump_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.trunc.vec3_highp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.trunc.vec4_lowp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.trunc.vec4_mediump_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.trunc.vec4_highp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.round.float_lowp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.round.float_mediump_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.round.float_highp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.round.vec2_lowp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.round.vec2_mediump_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.round.vec2_highp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.round.vec3_lowp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.round.vec3_mediump_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.round.vec3_highp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.round.vec4_lowp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.round.vec4_mediump_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.round.vec4_highp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.roundeven.float_lowp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.roundeven.float_mediump_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.roundeven.float_highp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.roundeven.vec2_lowp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.roundeven.vec2_mediump_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.roundeven.vec2_highp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.roundeven.vec3_lowp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.roundeven.vec3_mediump_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.roundeven.vec3_highp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.roundeven.vec4_lowp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.roundeven.vec4_mediump_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.roundeven.vec4_highp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.ceil.float_lowp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.ceil.float_mediump_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.ceil.float_highp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.ceil.vec2_lowp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.ceil.vec2_mediump_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.ceil.vec2_highp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.ceil.vec3_lowp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.ceil.vec3_mediump_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.ceil.vec3_highp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.ceil.vec4_lowp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.ceil.vec4_mediump_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.ceil.vec4_highp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.fract.float_lowp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.fract.float_mediump_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.fract.float_highp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.fract.vec2_lowp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.fract.vec2_mediump_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.fract.vec2_highp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.fract.vec3_lowp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.fract.vec3_mediump_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.fract.vec3_highp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.fract.vec4_lowp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.fract.vec4_mediump_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.fract.vec4_highp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.modf.float_lowp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.modf.float_mediump_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.modf.float_highp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.modf.vec2_lowp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.modf.vec2_mediump_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.modf.vec2_highp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.modf.vec3_lowp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.modf.vec3_mediump_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.modf.vec3_highp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.modf.vec4_lowp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.modf.vec4_mediump_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.modf.vec4_highp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.isnan.float_lowp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.isnan.float_mediump_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.isnan.float_highp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.isnan.vec2_lowp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.isnan.vec2_mediump_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.isnan.vec2_highp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.isnan.vec3_lowp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.isnan.vec3_mediump_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.isnan.vec3_highp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.isnan.vec4_lowp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.isnan.vec4_mediump_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.isnan.vec4_highp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.isinf.float_lowp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.isinf.float_mediump_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.isinf.float_highp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.isinf.vec2_lowp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.isinf.vec2_mediump_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.isinf.vec2_highp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.isinf.vec3_lowp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.isinf.vec3_mediump_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.isinf.vec3_highp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.isinf.vec4_lowp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.isinf.vec4_mediump_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.isinf.vec4_highp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.floatbitstoint.float_lowp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.floatbitstoint.float_mediump_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.floatbitstoint.float_highp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.floatbitstoint.vec2_lowp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.floatbitstoint.vec2_mediump_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.floatbitstoint.vec2_highp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.floatbitstoint.vec3_lowp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.floatbitstoint.vec3_mediump_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.floatbitstoint.vec3_highp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.floatbitstoint.vec4_lowp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.floatbitstoint.vec4_mediump_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.floatbitstoint.vec4_highp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.floatbitstouint.float_lowp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.floatbitstouint.float_mediump_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.floatbitstouint.float_highp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.floatbitstouint.vec2_lowp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.floatbitstouint.vec2_mediump_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.floatbitstouint.vec2_highp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.floatbitstouint.vec3_lowp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.floatbitstouint.vec3_mediump_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.floatbitstouint.vec3_highp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.floatbitstouint.vec4_lowp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.floatbitstouint.vec4_mediump_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.floatbitstouint.vec4_highp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.frexp.float_lowp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.frexp.float_mediump_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.frexp.float_highp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.frexp.vec2_lowp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.frexp.vec2_mediump_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.frexp.vec2_highp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.frexp.vec3_lowp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.frexp.vec3_mediump_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.frexp.vec3_highp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.frexp.vec4_lowp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.frexp.vec4_mediump_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.frexp.vec4_highp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.ldexp.float_lowp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.ldexp.float_mediump_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.ldexp.float_highp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.ldexp.vec2_lowp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.ldexp.vec2_mediump_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.ldexp.vec2_highp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.ldexp.vec3_lowp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.ldexp.vec3_mediump_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.ldexp.vec3_highp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.ldexp.vec4_lowp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.ldexp.vec4_mediump_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.ldexp.vec4_highp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.fma.float_lowp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.fma.float_mediump_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.fma.float_highp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.fma.vec2_lowp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.fma.vec2_mediump_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.fma.vec2_highp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.fma.vec3_lowp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.fma.vec3_mediump_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.fma.vec3_highp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.fma.vec4_lowp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.fma.vec4_mediump_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.fma.vec4_highp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.intbitstofloat.int_highp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.intbitstofloat.ivec2_highp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.intbitstofloat.ivec3_highp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.uintbitstofloat.uint_highp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.uintbitstofloat.uvec2_highp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.uintbitstofloat.uvec3_highp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.pack_unpack.packsnorm4x8_lowp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.pack_unpack.packsnorm4x8_mediump_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.pack_unpack.packsnorm4x8_highp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.pack_unpack.unpacksnorm4x8_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.pack_unpack.packunorm4x8_lowp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.pack_unpack.packunorm4x8_mediump_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.pack_unpack.packunorm4x8_highp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.pack_unpack.unpackunorm4x8_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.pack_unpack.packsnorm2x16_lowp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.pack_unpack.packsnorm2x16_mediump_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.pack_unpack.packsnorm2x16_highp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.pack_unpack.unpacksnorm2x16_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.pack_unpack.packunorm2x16_lowp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.pack_unpack.packunorm2x16_mediump_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.pack_unpack.packunorm2x16_highp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.pack_unpack.unpackunorm2x16_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.pack_unpack.packhalf2x16_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.pack_unpack.unpackhalf2x16_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.uaddcarry.uint_lowp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.uaddcarry.uint_mediump_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.uaddcarry.uint_highp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.uaddcarry.uvec2_lowp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.uaddcarry.uvec2_mediump_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.uaddcarry.uvec2_highp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.uaddcarry.uvec3_lowp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.uaddcarry.uvec3_mediump_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.uaddcarry.uvec3_highp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.uaddcarry.uvec4_lowp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.uaddcarry.uvec4_mediump_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.uaddcarry.uvec4_highp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.usubborrow.uint_lowp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.usubborrow.uint_mediump_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.usubborrow.uint_highp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.usubborrow.uvec2_lowp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.usubborrow.uvec2_mediump_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.usubborrow.uvec2_highp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.usubborrow.uvec3_lowp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.usubborrow.uvec3_mediump_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.usubborrow.uvec3_highp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.usubborrow.uvec4_lowp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.usubborrow.uvec4_mediump_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.usubborrow.uvec4_highp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.umulextended.uint_highp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.umulextended.uvec2_highp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.umulextended.uvec3_highp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.umulextended.uvec4_highp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.imulextended.int_highp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.imulextended.ivec2_highp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.imulextended.ivec3_highp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.imulextended.ivec4_highp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitfieldextract.int_lowp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitfieldextract.int_mediump_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitfieldextract.int_highp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitfieldextract.ivec2_lowp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitfieldextract.ivec2_mediump_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitfieldextract.ivec2_highp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitfieldextract.ivec3_lowp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitfieldextract.ivec3_mediump_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitfieldextract.ivec3_highp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitfieldextract.ivec4_lowp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitfieldextract.ivec4_mediump_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitfieldextract.ivec4_highp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitfieldextract.uint_lowp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitfieldextract.uint_mediump_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitfieldextract.uint_highp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitfieldextract.uvec2_lowp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitfieldextract.uvec2_mediump_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitfieldextract.uvec2_highp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitfieldextract.uvec3_lowp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitfieldextract.uvec3_mediump_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitfieldextract.uvec3_highp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitfieldextract.uvec4_lowp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitfieldextract.uvec4_mediump_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitfieldextract.uvec4_highp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitfieldinsert.int_lowp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitfieldinsert.int_mediump_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitfieldinsert.int_highp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitfieldinsert.ivec2_lowp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitfieldinsert.ivec2_mediump_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitfieldinsert.ivec2_highp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitfieldinsert.ivec3_lowp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitfieldinsert.ivec3_mediump_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitfieldinsert.ivec3_highp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitfieldinsert.ivec4_lowp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitfieldinsert.ivec4_mediump_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitfieldinsert.ivec4_highp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitfieldinsert.uint_lowp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitfieldinsert.uint_mediump_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitfieldinsert.uint_highp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitfieldinsert.uvec2_lowp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitfieldinsert.uvec2_mediump_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitfieldinsert.uvec2_highp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitfieldinsert.uvec3_lowp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitfieldinsert.uvec3_mediump_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitfieldinsert.uvec3_highp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitfieldinsert.uvec4_lowp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitfieldinsert.uvec4_mediump_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitfieldinsert.uvec4_highp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitfieldreverse.int_lowp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitfieldreverse.int_mediump_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitfieldreverse.int_highp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitfieldreverse.ivec2_lowp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitfieldreverse.ivec2_mediump_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitfieldreverse.ivec2_highp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitfieldreverse.ivec3_lowp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitfieldreverse.ivec3_mediump_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitfieldreverse.ivec3_highp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitfieldreverse.ivec4_lowp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitfieldreverse.ivec4_mediump_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitfieldreverse.ivec4_highp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitfieldreverse.uint_lowp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitfieldreverse.uint_mediump_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitfieldreverse.uint_highp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitfieldreverse.uvec2_lowp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitfieldreverse.uvec2_mediump_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitfieldreverse.uvec2_highp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitfieldreverse.uvec3_lowp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitfieldreverse.uvec3_mediump_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitfieldreverse.uvec3_highp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitfieldreverse.uvec4_lowp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitfieldreverse.uvec4_mediump_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitfieldreverse.uvec4_highp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitcount.int_lowp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitcount.int_mediump_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitcount.int_highp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitcount.ivec2_lowp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitcount.ivec2_mediump_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitcount.ivec2_highp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitcount.ivec3_lowp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitcount.ivec3_mediump_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitcount.ivec3_highp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitcount.ivec4_lowp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitcount.ivec4_mediump_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitcount.ivec4_highp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitcount.uint_lowp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitcount.uint_mediump_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitcount.uint_highp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitcount.uvec2_lowp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitcount.uvec2_mediump_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitcount.uvec2_highp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitcount.uvec3_lowp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitcount.uvec3_mediump_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitcount.uvec3_highp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitcount.uvec4_lowp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitcount.uvec4_mediump_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.bitcount.uvec4_highp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.findlsb.int_lowp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.findlsb.int_mediump_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.findlsb.int_highp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.findlsb.ivec2_lowp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.findlsb.ivec2_mediump_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.findlsb.ivec2_highp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.findlsb.ivec3_lowp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.findlsb.ivec3_mediump_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.findlsb.ivec3_highp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.findlsb.ivec4_lowp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.findlsb.ivec4_mediump_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.findlsb.ivec4_highp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.findlsb.uint_lowp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.findlsb.uint_mediump_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.findlsb.uint_highp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.findlsb.uvec2_lowp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.findlsb.uvec2_mediump_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.findlsb.uvec2_highp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.findlsb.uvec3_lowp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.findlsb.uvec3_mediump_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.findlsb.uvec3_highp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.findlsb.uvec4_lowp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.findlsb.uvec4_mediump_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.findlsb.uvec4_highp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.findmsb.int_lowp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.findmsb.int_mediump_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.findmsb.int_highp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.findmsb.ivec2_lowp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.findmsb.ivec2_mediump_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.findmsb.ivec2_highp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.findmsb.ivec3_lowp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.findmsb.ivec3_mediump_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.findmsb.ivec3_highp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.findmsb.ivec4_lowp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.findmsb.ivec4_mediump_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.findmsb.ivec4_highp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.findmsb.uint_lowp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.findmsb.uint_mediump_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.findmsb.uint_highp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.findmsb.uvec2_lowp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.findmsb.uvec2_mediump_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.findmsb.uvec2_highp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.findmsb.uvec3_lowp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.findmsb.uvec3_mediump_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.findmsb.uvec3_highp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.findmsb.uvec4_lowp_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.findmsb.uvec4_mediump_geometry = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.findmsb.uvec4_highp_geometry = FAIL
>+2619 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.uniform.findLSBMinusOne.highp_compute = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_constants.geometry_shader.* = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.state_query.program.geometry_shader_state_get_programiv = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.geometry_shading.query.* = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.geometry_shading.basic.* = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.geometry_shading.conversion.* = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.geometry_shading.emit.* = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.geometry_shading.varying.* = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.geometry_shading.layered.* = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.geometry_shading.instanced.* = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.geometry_shading.input.* = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.geometry_shading.negative.* = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.geometry_shading.vertex_transform_feedback.* = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.shaders.linkage.es31.geometry.* = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.debug.negative_coverage.callbacks.shader_directive.geometry_shader = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.debug.negative_coverage.log.shader_directive.geometry_shader = FAIL
>+1941 D3D11 : dEQP-GLES31.functional.debug.negative_coverage.get_error.shader_directive.geometry_shader = FAIL
>+2826 D3D11 : dEQP-GLES31.functional.texture.gather.basic.cube.rgba8.texture_swizzle.* = FAIL
>+2826 D3D11 : dEQP-GLES31.functional.texture.gather.basic.cube.rgba8i.* = FAIL
>+2826 D3D11 : dEQP-GLES31.functional.texture.gather.basic.cube.rgba8ui.* = FAIL
>+
>+// OPENGL Failing Tests
>+1665 WIN NVIDIA OPENGL : dEQP-GLES31.functional.draw_indirect.negative.command_offset_not_in_buffer_unsigned32_wrap = FAIL
>+1442 NVIDIA OPENGL : dEQP-GLES31.functional.fbo.no_attachments.maximums.all = FAIL
>+1442 OPENGL : dEQP-GLES31.functional.program_interface_query.atomic_counter_buffer.referenced_by* = FAIL
>+1442 OPENGL : dEQP-GLES31.functional.program_interface_query.buffer_limited_query.* = FAIL
>+1442 OPENGL : dEQP-GLES31.functional.program_interface_query.buffer_variable.* = FAIL
>+1442 OPENGL : dEQP-GLES31.functional.program_interface_query.program_input.* = FAIL
>+1442 OPENGL : dEQP-GLES31.functional.program_interface_query.program_output.* = FAIL
>+1442 OPENGL : dEQP-GLES31.functional.program_interface_query.shader_storage_block.referenced_by.* = FAIL
>+1442 OPENGL : dEQP-GLES31.functional.program_interface_query.transform_feedback_varying.* = FAIL
>+1442 OPENGL : dEQP-GLES31.functional.program_interface_query.uniform.referenced_by_shader.* = FAIL
>+1442 OPENGL : dEQP-GLES31.functional.program_interface_query.uniform.random.* = FAIL
>+1442 OPENGL : dEQP-GLES31.functional.program_interface_query.uniform_block.referenced_by.* = FAIL
>+
>+// An NVIDIA bug seems to occur when sending GL commands in a certain order to the driver
>+2432 NVIDIA OPENGL : dEQP-GLES31.functional.vertex_attribute_binding.usage.mixed_usage.mixed_api_change_binding_point = SKIP
>+
>+// OpenGL and D3D11 Failing Tests
>+1442 : dEQP-GLES31.functional.compute.basic.copy_image_to_ssbo_large = FAIL
>+1442 : dEQP-GLES31.functional.compute.basic.copy_ssbo_to_image_large = FAIL
>+1442 : dEQP-GLES31.functional.shaders.opaque_type_indexing.* = FAIL
>+1442 : dEQP-GLES31.functional.shaders.helper_invocation.* = FAIL
>+1442 : dEQP-GLES31.functional.state_query.integer.program_pipeline_binding_* = FAIL
>+1442 : dEQP-GLES31.functional.state_query.program.program_separable_get_programiv = FAIL
>+1442 : dEQP-GLES31.functional.state_query.program_pipeline.* = FAIL
>+1442 : dEQP-GLES31.functional.synchronization.inter_call.without_memory_barrier.atomic_counter_dispatch_100_calls_1k_invocations = FAIL
>+1442 : dEQP-GLES31.functional.separate_shader.* = FAIL
>+1442 : dEQP-GLES31.functional.debug.error_filters.case_11 = FAIL
>+1442 : dEQP-GLES31.functional.debug.error_groups.case_11 = FAIL
>+1442 : dEQP-GLES31.functional.debug.negative_coverage.callbacks.buffer.bind_buffer_range = FAIL
>+1442 : dEQP-GLES31.functional.debug.negative_coverage.callbacks.shader.compile_compute_shader = SKIP
>+1442 : dEQP-GLES31.functional.debug.negative_coverage.callbacks.shader_directive.primitive_bounding_box = FAIL
>+1442 : dEQP-GLES31.functional.debug.negative_coverage.callbacks.shader_directive.tessellation_shader = FAIL
>+1442 : dEQP-GLES31.functional.debug.negative_coverage.log.buffer.bind_buffer_range = FAIL
>+1442 : dEQP-GLES31.functional.debug.negative_coverage.log.shader.compile_compute_shader = SKIP
>+1442 : dEQP-GLES31.functional.debug.negative_coverage.log.shader_directive.primitive_bounding_box = FAIL
>+1442 : dEQP-GLES31.functional.debug.negative_coverage.log.shader_directive.tessellation_shader = FAIL
>+1442 : dEQP-GLES31.functional.debug.negative_coverage.get_error.buffer.bind_buffer_range = FAIL
>+1442 : dEQP-GLES31.functional.debug.negative_coverage.get_error.buffer.read_pixels_format_mismatch = FAIL
>+1442 : dEQP-GLES31.functional.debug.negative_coverage.get_error.buffer.framebuffer_texture2d = FAIL
>+1442 : dEQP-GLES31.functional.debug.negative_coverage.get_error.texture.copyteximage2d_invalid_format = FAIL
>+1442 : dEQP-GLES31.functional.debug.negative_coverage.get_error.texture.copyteximage2d_inequal_width_height_cube = FAIL
>+1442 : dEQP-GLES31.functional.debug.negative_coverage.get_error.texture.copyteximage2d_max_width_height = FAIL
>+1442 : dEQP-GLES31.functional.debug.negative_coverage.get_error.texture.copytexsubimage2d_invalid_offset = FAIL
>+1442 : dEQP-GLES31.functional.debug.negative_coverage.get_error.texture.compressedtexsubimage2d = FAIL
>+1442 : dEQP-GLES31.functional.debug.negative_coverage.get_error.texture.compressedtexsubimage2d_invalid_size = FAIL
>+1442 : dEQP-GLES31.functional.debug.negative_coverage.get_error.texture.texsubimage3d_neg_level = FAIL
>+1442 : dEQP-GLES31.functional.debug.negative_coverage.get_error.texture.texsubimage3d_neg_offset = FAIL
>+1442 : dEQP-GLES31.functional.debug.negative_coverage.get_error.texture.copytexsubimage3d_invalid_offset = FAIL
>+1442 : dEQP-GLES31.functional.debug.negative_coverage.get_error.texture.compressedtexsubimage3d = FAIL
>+1442 : dEQP-GLES31.functional.debug.negative_coverage.get_error.texture.compressedtexsubimage3d_invalid_buffer_target = FAIL
>+1442 : dEQP-GLES31.functional.debug.negative_coverage.get_error.shader.compile_compute_shader = SKIP
>+1442 : dEQP-GLES31.functional.debug.negative_coverage.get_error.vertex_array.draw_range_elements = FAIL
>+1442 : dEQP-GLES31.functional.debug.negative_coverage.get_error.vertex_array.draw_range_elements_incomplete_primitive = FAIL
>+1442 : dEQP-GLES31.functional.debug.negative_coverage.get_error.shader_directive.primitive_bounding_box = FAIL
>+1442 : dEQP-GLES31.functional.debug.negative_coverage.get_error.shader_directive.tessellation_shader = FAIL
>+1442 : dEQP-GLES31.functional.debug.object_labels.program_pipeline = FAIL
>+
>+2324 : dEQP-GLES31.functional.debug.negative_coverage.callbacks.compute.program_not_active = FAIL
>+2324 : dEQP-GLES31.functional.debug.negative_coverage.log.compute.program_not_active = FAIL
>+2324 : dEQP-GLES31.functional.debug.negative_coverage.get_error.compute.program_not_active = FAIL
>+2324 : dEQP-GLES31.functional.debug.negative_coverage.get_error.shader_storage.block_number_limits = FAIL
>+2324 : dEQP-GLES31.functional.debug.negative_coverage.log.shader_storage.block_number_limits = FAIL
>+2324 : dEQP-GLES31.functional.debug.negative_coverage.callbacks.shader_storage.block_number_limits = FAIL
>+
>+// These tests are failing because of compile errors with SSBOs in compute shaders.
>+1951 D3D11 : dEQP-GLES31.functional.debug.negative_coverage.callbacks.compute.exceed_shared_memory_size_limit = FAIL
>+1951 D3D11 : dEQP-GLES31.functional.debug.negative_coverage.get_error.compute.exceed_shared_memory_size_limit = FAIL
>+1951 D3D11 : dEQP-GLES31.functional.debug.negative_coverage.log.compute.exceed_shared_memory_size_limit = FAIL
>+
>+1442 D3D11 : dEQP-GLES31.functional.stencil_texturing.* = SKIP
>+// TODO(xinghua.cao@intel.com): FAIL expectation instead of SKIP should be sufficient for OpenGL, but the
>+// test expectations parser doesn't support having FAIL for GL and SKIP for D3D with the same test filter.
>+
>+1729 D3D11 : dEQP-GLES31.functional.atomic_counter.* = SKIP
>+1951 D3D11 : dEQP-GLES31.functional.layout_binding.ssbo.* = SKIP
>+1951 D3D11 : dEQP-GLES31.functional.shaders.opaque_type_indexing.ssbo.* = SKIP
>+1442 D3D11 : dEQP-GLES31.functional.program_interface_query.* = SKIP
>+1442 D3D11 : dEQP-GLES31.functional.synchronization.* = SKIP
>+1442 D3D11 : dEQP-GLES31.functional.layout_binding.image.* = SKIP
>+// This case is skipped since it uses atomic counter builtin functions which haven't been implemented.
>+1729 D3D11 : dEQP-GLES31.functional.state_query.program.active_atomic_counter_buffers_get_programiv = SKIP
>diff --git a/Source/ThirdParty/ANGLE/src/tests/deqp_support/deqp_gles3_TestExpectations b/Source/ThirdParty/ANGLE/src/tests/deqp_support/deqp_gles3_TestExpectations
>deleted file mode 100644
>index 600394ef50e..00000000000
>--- a/Source/ThirdParty/ANGLE/src/tests/deqp_support/deqp_gles3_TestExpectations
>+++ /dev/null
>@@ -1,453 +0,0 @@
>-// Copyright 2015 The ANGLE Project Authors. All rights reserved.
>-// Use of this source code is governed by a BSD-style license that can be
>-// found in the LICENSE file.
>-
>-// This file contains a list of defective dEQP conformance tests. The expected
>-// format is:
>-//  {BUG#} {MODIFIERS} : {TEST_NAME} = {PASS,FAIL,FLAKY,TIMEOUT,SKIP}
>-//
>-// MODIFIERS can be a combination of the below list:
>-//  WIN XP VISTA WIN7 MAC LEOPARD SNOWLEOPARD LION LINUX CHROMEOS MOUNTAINLION
>-//  MAVERICKS
>-//  NVIDIA AMD INTEL
>-//  0xabcd - GPU PCI device ID. Specifying a PCI id requires a vendor.
>-//  DEBUG RELEASE
>-// TODO(jmadill): Add ANGLE Renderer selection modifiers
>-//
>-// TEST_NAME can be a specific test name, or have a '*' in the end, which
>-// indicates a prefix matching.
>-//
>-// Examples:
>-//  91530 MAC WIN LINUX : context_lost_restored = TIMEOUT
>-//  91533 WIN : gl_min_uniforms = FAIL
>-//  91531 MAC WIN LINUX : conformance_more_* = SKIP
>-//  91532 MAC NVIDIA 0x0640 : tex_image_and_sub_image_2d_with_video = PASS FAIL
>-
>-// Don't run these tests for faster turnover
>-998 DEBUG RELEASE : dEQP-GLES3.performance.* = SKIP
>-998 DEBUG RELEASE : dEQP-GLES3.stress.* = SKIP
>-1101 DEBUG RELEASE : dEQP-GLES3.functional.flush_finish.* = SKIP
>-
>-// TODO(jmadill): Figure out why these fail on the bots, but not locally.
>-1108 WIN : dEQP-GLES3.functional.shaders.struct.local.dynamic_loop_struct_array_fragment = FAIL
>-1094 WIN : dEQP-GLES3.functional.shaders.invariance.highp.loop_2 = FAIL
>-1094 WIN : dEQP-GLES3.functional.shaders.invariance.mediump.loop_2 = FAIL
>-
>-// We can't support distinct texture sizes in D3D11.
>-1097 WIN : dEQP-GLES3.functional.fbo.completeness.size.distinct = FAIL
>-
>-// Fail because we support these formats through the ANGLE_depth_texture extension instead of OES_depth_texture
>-605754 MAC WIN LINUX ANDROID : dEQP-GLES3.functional.fbo.completeness.renderable.texture.depth.depth_component_unsigned_short = FAIL
>-605754 MAC WIN LINUX ANDROID : dEQP-GLES3.functional.fbo.completeness.renderable.texture.depth.depth_component_unsigned_int = FAIL
>-
>-// Tests that we fail because they're not in line with the WebGL spec
>-1335 MAC WIN LINUX : dEQP-GLES3.functional.shaders.preprocessor.conditional_inclusion.basic_2* = FAIL
>-1335 MAC WIN LINUX : dEQP-GLES3.functional.shaders.preprocessor.conditional_inclusion.defined_macro_defined_test* = FAIL
>-1335 MAC WIN LINUX : dEQP-GLES3.functional.shaders.preprocessor.conditional_inclusion.defined_macro_undef* = FAIL
>-1335 MAC WIN LINUX : dEQP-GLES3.functional.shaders.preprocessor.conditional_inclusion.define_defined* = FAIL
>-1335 MAC WIN LINUX : dEQP-GLES3.functional.shaders.preprocessor.conditional_inclusion.define_defined_outside_if* = FAIL
>-
>-////////////////////////////////////////////////////////////////////////////////
>-//
>-//  Temporary entries: they should be removed once the bugs are fixed.
>-//
>-////////////////////////////////////////////////////////////////////////////////
>-
>-// TODO(jmadill): Find why this fails when run in a certain sequence, but not singly.
>-1098 WIN : dEQP-GLES3.functional.uniform_api.random.50 = FAIL
>-
>-// Missing the SampleCmp instruction in vertex shaders.
>-1435 WIN : dEQP-GLES3.functional.shaders.texture_functions.texturelod.sampler2dshadow_vertex = FAIL
>-1435 WIN : dEQP-GLES3.functional.shaders.texture_functions.texturelodoffset.sampler2dshadow_vertex = FAIL
>-1435 WIN : dEQP-GLES3.functional.shaders.texture_functions.textureprojlod.sampler2dshadow_vertex = FAIL
>-1435 WIN : dEQP-GLES3.functional.shaders.texture_functions.textureprojlodoffset.sampler2dshadow_vertex = FAIL
>-
>-// SampleCmp is missing gradient/offset parameters in HLSL.
>-1436 WIN : dEQP-GLES3.functional.shaders.texture_functions.texturelod.sampler2dshadow_fragment = FAIL
>-1436 WIN : dEQP-GLES3.functional.shaders.texture_functions.texturelodoffset.sampler2dshadow_fragment = FAIL
>-1436 WIN : dEQP-GLES3.functional.shaders.texture_functions.textureprojlod.sampler2dshadow_fragment = FAIL
>-1436 WIN : dEQP-GLES3.functional.shaders.texture_functions.textureprojlodoffset.sampler2dshadow_fragment = FAIL
>-1436 WIN : dEQP-GLES3.functional.shaders.texture_functions.texturegrad.sampler2dshadow_vertex = FAIL
>-1436 WIN : dEQP-GLES3.functional.shaders.texture_functions.texturegrad.sampler2dshadow_fragment = FAIL
>-1436 WIN : dEQP-GLES3.functional.shaders.texture_functions.texturegrad.sampler2darrayshadow_vertex = FAIL
>-1436 WIN : dEQP-GLES3.functional.shaders.texture_functions.texturegrad.sampler2darrayshadow_fragment = FAIL
>-1436 WIN : dEQP-GLES3.functional.shaders.texture_functions.texturegradoffset.sampler2dshadow_vertex = FAIL
>-1436 WIN : dEQP-GLES3.functional.shaders.texture_functions.texturegradoffset.sampler2dshadow_fragment = FAIL
>-1436 WIN : dEQP-GLES3.functional.shaders.texture_functions.texturegradoffset.sampler2darrayshadow_vertex = FAIL
>-1436 WIN : dEQP-GLES3.functional.shaders.texture_functions.texturegradoffset.sampler2darrayshadow_fragment = FAIL
>-1436 WIN : dEQP-GLES3.functional.shaders.texture_functions.textureprojgrad.sampler2dshadow_vertex = FAIL
>-1436 WIN : dEQP-GLES3.functional.shaders.texture_functions.textureprojgrad.sampler2dshadow_fragment = FAIL
>-1436 WIN : dEQP-GLES3.functional.shaders.texture_functions.textureprojgradoffset.sampler2dshadow_vertex = FAIL
>-1436 WIN : dEQP-GLES3.functional.shaders.texture_functions.textureprojgradoffset.sampler2dshadow_fragment = FAIL
>-
>-// TODO(jmadill, cwallez): triage the failures below into permanent and temporary failures
>-
>-// Quadro P400
>-// TODO(jmadill): Narrow to P400 device only: 0x1CB3.
>-2222 D3D11 NVIDIA : dEQP-GLES3.functional.shaders.functions.control_flow.return_in_nested_loop_fragment = FAIL
>-2222 D3D11 NVIDIA : dEQP-GLES3.functional.shaders.functions.control_flow.return_in_nested_loop_vertex = FAIL
>-2222 D3D11 NVIDIA : dEQP-GLES3.functional.texture.mipmap.2d.min_lod.linear_nearest = FAIL
>-2222 D3D11 NVIDIA : dEQP-GLES3.functional.texture.mipmap.2d.min_lod.nearest_nearest = FAIL
>-2222 D3D11 NVIDIA : dEQP-GLES3.functional.texture.mipmap.3d.min_lod.linear_nearest = FAIL
>-2222 D3D11 NVIDIA : dEQP-GLES3.functional.texture.mipmap.3d.min_lod.nearest_nearest = FAIL
>-2222 LINUX NVIDIA : dEQP-GLES3.functional.fbo.completeness.samples.rbo2_rbo2_rbo0 = FAIL
>-
>-// Failing everywhere
>-1101 DEBUG RELEASE : dEQP-GLES3.functional.negative_api.texture.compressedtexsubimage2d = FAIL
>-1101 DEBUG RELEASE : dEQP-GLES3.functional.negative_api.texture.compressedtexsubimage3d = FAIL
>-1101 DEBUG RELEASE : dEQP-GLES3.functional.negative_api.texture.compressedtexsubimage3d_invalid_buffer_target = FAIL
>-
>-// Windows and Linux failures
>-
>-1095 WIN LINUX : dEQP-GLES3.functional.texture.mipmap.2d.projected.nearest_nearest_clamp = FAIL
>-1095 WIN LINUX : dEQP-GLES3.functional.texture.mipmap.2d.projected.nearest_nearest_repeat = FAIL
>-1095 WIN LINUX : dEQP-GLES3.functional.texture.mipmap.2d.projected.nearest_nearest_mirror = FAIL
>-1095 WIN LINUX : dEQP-GLES3.functional.texture.mipmap.2d.projected.linear_nearest_clamp = FAIL
>-1095 WIN LINUX : dEQP-GLES3.functional.texture.mipmap.2d.projected.linear_nearest_repeat = FAIL
>-1095 WIN LINUX : dEQP-GLES3.functional.texture.mipmap.2d.projected.linear_nearest_mirror = FAIL
>-
>-// Windows only failure
>-
>-1093 WIN : dEQP-GLES3.functional.shaders.builtin_functions.precision.tanh.highp_vertex.scalar = FAIL
>-1093 WIN : dEQP-GLES3.functional.shaders.builtin_functions.precision.tanh.highp_vertex.vec2 = FAIL
>-1093 WIN : dEQP-GLES3.functional.shaders.builtin_functions.precision.tanh.highp_vertex.vec3 = FAIL
>-1093 WIN : dEQP-GLES3.functional.shaders.builtin_functions.precision.tanh.highp_vertex.vec4 = FAIL
>-1093 WIN : dEQP-GLES3.functional.shaders.builtin_functions.precision.tanh.highp_fragment.scalar = FAIL
>-1093 WIN : dEQP-GLES3.functional.shaders.builtin_functions.precision.tanh.highp_fragment.vec2 = FAIL
>-1093 WIN : dEQP-GLES3.functional.shaders.builtin_functions.precision.tanh.highp_fragment.vec3 = FAIL
>-1093 WIN : dEQP-GLES3.functional.shaders.builtin_functions.precision.tanh.highp_fragment.vec4 = FAIL
>-1092 WIN : dEQP-GLES3.functional.shaders.texture_functions.textureoffset.sampler3d_fixed_fragment = FAIL
>-1092 WIN : dEQP-GLES3.functional.shaders.texture_functions.textureoffset.sampler3d_float_fragment = FAIL
>-1092 WIN : dEQP-GLES3.functional.shaders.texture_functions.textureprojoffset.sampler3d_fixed_fragment = FAIL
>-1092 WIN : dEQP-GLES3.functional.shaders.texture_functions.textureprojoffset.sampler3d_float_fragment = FAIL
>-1096 WIN : dEQP-GLES3.functional.fragment_ops.depth_stencil.stencil_depth_funcs.stencil_* = FAIL
>-1096 WIN : dEQP-GLES3.functional.fragment_ops.depth_stencil.stencil_ops.* = FAIL
>-1096 WIN : dEQP-GLES3.functional.fragment_ops.depth_stencil.write_mask.* = FAIL
>-1096 WIN : dEQP-GLES3.functional.fragment_ops.depth_stencil.random.* = FAIL
>-1096 WIN : dEQP-GLES3.functional.fragment_ops.blend.default_framebuffer.equation_src_func_dst_func.add_constant_color_constant_alpha = FAIL
>-1096 WIN : dEQP-GLES3.functional.fragment_ops.blend.default_framebuffer.equation_src_func_dst_func.add_constant_color_one_minus_constant_alpha = FAIL
>-1096 WIN : dEQP-GLES3.functional.fragment_ops.blend.default_framebuffer.equation_src_func_dst_func.add_one_minus_constant_color_constant_alpha = FAIL
>-1096 WIN : dEQP-GLES3.functional.fragment_ops.blend.default_framebuffer.equation_src_func_dst_func.add_one_minus_constant_color_one_minus_constant_alpha = FAIL
>-1096 WIN : dEQP-GLES3.functional.fragment_ops.blend.default_framebuffer.equation_src_func_dst_func.add_constant_alpha_constant_color = FAIL
>-1096 WIN : dEQP-GLES3.functional.fragment_ops.blend.default_framebuffer.equation_src_func_dst_func.add_constant_alpha_one_minus_constant_color = FAIL
>-1096 WIN : dEQP-GLES3.functional.fragment_ops.blend.default_framebuffer.equation_src_func_dst_func.add_one_minus_constant_alpha_constant_color = FAIL
>-1096 WIN : dEQP-GLES3.functional.fragment_ops.blend.default_framebuffer.equation_src_func_dst_func.add_one_minus_constant_alpha_one_minus_constant_color = FAIL
>-1096 WIN : dEQP-GLES3.functional.fragment_ops.blend.default_framebuffer.equation_src_func_dst_func.subtract_constant_color_constant_alpha = FAIL
>-1096 WIN : dEQP-GLES3.functional.fragment_ops.blend.default_framebuffer.equation_src_func_dst_func.subtract_constant_color_one_minus_constant_alpha = FAIL
>-1096 WIN : dEQP-GLES3.functional.fragment_ops.blend.default_framebuffer.equation_src_func_dst_func.subtract_one_minus_constant_color_constant_alpha = FAIL
>-1096 WIN : dEQP-GLES3.functional.fragment_ops.blend.default_framebuffer.equation_src_func_dst_func.subtract_one_minus_constant_color_one_minus_constant_alpha = FAIL
>-1096 WIN : dEQP-GLES3.functional.fragment_ops.blend.default_framebuffer.equation_src_func_dst_func.subtract_constant_alpha_constant_color = FAIL
>-1096 WIN : dEQP-GLES3.functional.fragment_ops.blend.default_framebuffer.equation_src_func_dst_func.subtract_constant_alpha_one_minus_constant_color = FAIL
>-1096 WIN : dEQP-GLES3.functional.fragment_ops.blend.default_framebuffer.equation_src_func_dst_func.subtract_one_minus_constant_alpha_constant_color = FAIL
>-1096 WIN : dEQP-GLES3.functional.fragment_ops.blend.default_framebuffer.equation_src_func_dst_func.subtract_one_minus_constant_alpha_one_minus_constant_color = FAIL
>-1096 WIN : dEQP-GLES3.functional.fragment_ops.blend.default_framebuffer.equation_src_func_dst_func.reverse_subtract_constant_color_constant_alpha = FAIL
>-1096 WIN : dEQP-GLES3.functional.fragment_ops.blend.default_framebuffer.equation_src_func_dst_func.reverse_subtract_constant_color_one_minus_constant_alpha = FAIL
>-1096 WIN : dEQP-GLES3.functional.fragment_ops.blend.default_framebuffer.equation_src_func_dst_func.reverse_subtract_one_minus_constant_color_constant_alpha = FAIL
>-1096 WIN : dEQP-GLES3.functional.fragment_ops.blend.default_framebuffer.equation_src_func_dst_func.reverse_subtract_one_minus_constant_color_one_minus_constant_alpha = FAIL
>-1096 WIN : dEQP-GLES3.functional.fragment_ops.blend.default_framebuffer.equation_src_func_dst_func.reverse_subtract_constant_alpha_constant_color = FAIL
>-1096 WIN : dEQP-GLES3.functional.fragment_ops.blend.default_framebuffer.equation_src_func_dst_func.reverse_subtract_constant_alpha_one_minus_constant_color = FAIL
>-1096 WIN : dEQP-GLES3.functional.fragment_ops.blend.default_framebuffer.equation_src_func_dst_func.reverse_subtract_one_minus_constant_alpha_constant_color = FAIL
>-1096 WIN : dEQP-GLES3.functional.fragment_ops.blend.default_framebuffer.equation_src_func_dst_func.reverse_subtract_one_minus_constant_alpha_one_minus_constant_color = FAIL
>-1096 WIN : dEQP-GLES3.functional.fragment_ops.blend.fbo_srgb.equation_src_func_dst_func.add_constant_color_constant_alpha = FAIL
>-1096 WIN : dEQP-GLES3.functional.fragment_ops.blend.fbo_srgb.equation_src_func_dst_func.add_constant_color_one_minus_constant_alpha = FAIL
>-1096 WIN : dEQP-GLES3.functional.fragment_ops.blend.fbo_srgb.equation_src_func_dst_func.add_one_minus_constant_color_constant_alpha = FAIL
>-1096 WIN : dEQP-GLES3.functional.fragment_ops.blend.fbo_srgb.equation_src_func_dst_func.add_one_minus_constant_color_one_minus_constant_alpha = FAIL
>-1096 WIN : dEQP-GLES3.functional.fragment_ops.blend.fbo_srgb.equation_src_func_dst_func.add_constant_alpha_constant_color = FAIL
>-1096 WIN : dEQP-GLES3.functional.fragment_ops.blend.fbo_srgb.equation_src_func_dst_func.add_constant_alpha_one_minus_constant_color = FAIL
>-1096 WIN : dEQP-GLES3.functional.fragment_ops.blend.fbo_srgb.equation_src_func_dst_func.add_one_minus_constant_alpha_constant_color = FAIL
>-1096 WIN : dEQP-GLES3.functional.fragment_ops.blend.fbo_srgb.equation_src_func_dst_func.add_one_minus_constant_alpha_one_minus_constant_color = FAIL
>-1096 WIN : dEQP-GLES3.functional.fragment_ops.blend.fbo_srgb.equation_src_func_dst_func.subtract_constant_color_constant_alpha = FAIL
>-1096 WIN : dEQP-GLES3.functional.fragment_ops.blend.fbo_srgb.equation_src_func_dst_func.subtract_constant_color_one_minus_constant_alpha = FAIL
>-1096 WIN : dEQP-GLES3.functional.fragment_ops.blend.fbo_srgb.equation_src_func_dst_func.subtract_one_minus_constant_color_constant_alpha = FAIL
>-1096 WIN : dEQP-GLES3.functional.fragment_ops.blend.fbo_srgb.equation_src_func_dst_func.subtract_one_minus_constant_color_one_minus_constant_alpha = FAIL
>-1096 WIN : dEQP-GLES3.functional.fragment_ops.blend.fbo_srgb.equation_src_func_dst_func.subtract_constant_alpha_constant_color = FAIL
>-1096 WIN : dEQP-GLES3.functional.fragment_ops.blend.fbo_srgb.equation_src_func_dst_func.subtract_constant_alpha_one_minus_constant_color = FAIL
>-1096 WIN : dEQP-GLES3.functional.fragment_ops.blend.fbo_srgb.equation_src_func_dst_func.subtract_one_minus_constant_alpha_constant_color = FAIL
>-1096 WIN : dEQP-GLES3.functional.fragment_ops.blend.fbo_srgb.equation_src_func_dst_func.subtract_one_minus_constant_alpha_one_minus_constant_color = FAIL
>-1096 WIN : dEQP-GLES3.functional.fragment_ops.blend.fbo_srgb.equation_src_func_dst_func.reverse_subtract_constant_color_constant_alpha = FAIL
>-1096 WIN : dEQP-GLES3.functional.fragment_ops.blend.fbo_srgb.equation_src_func_dst_func.reverse_subtract_constant_color_one_minus_constant_alpha = FAIL
>-1096 WIN : dEQP-GLES3.functional.fragment_ops.blend.fbo_srgb.equation_src_func_dst_func.reverse_subtract_one_minus_constant_color_constant_alpha = FAIL
>-1096 WIN : dEQP-GLES3.functional.fragment_ops.blend.fbo_srgb.equation_src_func_dst_func.reverse_subtract_one_minus_constant_color_one_minus_constant_alpha = FAIL
>-1096 WIN : dEQP-GLES3.functional.fragment_ops.blend.fbo_srgb.equation_src_func_dst_func.reverse_subtract_constant_alpha_constant_color = FAIL
>-1096 WIN : dEQP-GLES3.functional.fragment_ops.blend.fbo_srgb.equation_src_func_dst_func.reverse_subtract_constant_alpha_one_minus_constant_color = FAIL
>-1096 WIN : dEQP-GLES3.functional.fragment_ops.blend.fbo_srgb.equation_src_func_dst_func.reverse_subtract_one_minus_constant_alpha_constant_color = FAIL
>-1096 WIN : dEQP-GLES3.functional.fragment_ops.blend.fbo_srgb.equation_src_func_dst_func.reverse_subtract_one_minus_constant_alpha_one_minus_constant_color = FAIL
>-1096 WIN : dEQP-GLES3.functional.fragment_ops.random.* = FAIL
>-1096 WIN : dEQP-GLES3.functional.fragment_ops.interaction.basic_shader.* = FAIL
>-1098 WIN : dEQP-GLES3.functional.uniform_api.random.8 = FAIL
>-1098 WIN : dEQP-GLES3.functional.uniform_api.random.81 = FAIL
>-1101 WIN : dEQP-GLES3.functional.polygon_offset.fixed16_render_with_units = FAIL
>-1101 WIN : dEQP-GLES3.functional.polygon_offset.fixed24_render_with_units = FAIL
>-1101 WIN : dEQP-GLES3.functional.lifetime.attach.deleted_input.buffer_vertex_array = FAIL
>-
>-// Windows AMD specific failures
>-1633 WIN AMD : dEQP-GLES3.functional.fbo.blit.depth_stencil.depth24_stencil8_scale = FAIL
>-1633 WIN AMD : dEQP-GLES3.functional.fbo.blit.depth_stencil.depth24_stencil8_stencil_only = FAIL
>-1633 WIN AMD : dEQP-GLES3.functional.fbo.color.repeated_clear.blit.tex2d.r11f_g11f_b10f = FAIL
>-1633 WIN AMD : dEQP-GLES3.functional.fbo.color.repeated_clear.blit.tex2d.rg32f = FAIL
>-1633 WIN AMD : dEQP-GLES3.functional.fbo.color.repeated_clear.blit.tex2d.rg16f = FAIL
>-1633 WIN AMD : dEQP-GLES3.functional.fbo.color.repeated_clear.blit.tex2d.r32f = FAIL
>-1633 WIN AMD : dEQP-GLES3.functional.fbo.color.repeated_clear.blit.tex2d.r16f = FAIL
>-1633 WIN AMD : dEQP-GLES3.functional.fbo.color.repeated_clear.blit.tex2d.rgb16f = FAIL
>-1633 WIN AMD : dEQP-GLES3.functional.fbo.color.repeated_clear.blit.tex2d.rg8 = FAIL
>-1633 WIN AMD : dEQP-GLES3.functional.fbo.color.repeated_clear.blit.tex2d.rgb10_a2 = FAIL
>-1633 WIN AMD : dEQP-GLES3.functional.fbo.color.repeated_clear.blit.tex2d.rgba16f = FAIL
>-1633 WIN AMD : dEQP-GLES3.functional.fbo.color.repeated_clear.blit.tex2d.r8 = FAIL
>-1633 WIN AMD : dEQP-GLES3.functional.fbo.color.repeated_clear.sample.tex2d.rgba32f = FAIL
>-1633 WIN AMD : dEQP-GLES3.functional.fbo.color.repeated_clear.sample.tex2d.rgba16f = FAIL
>-1633 WIN AMD : dEQP-GLES3.functional.fbo.color.repeated_clear.sample.tex2d.r11f_g11f_b10f = FAIL
>-1633 WIN AMD : dEQP-GLES3.functional.fbo.color.repeated_clear.sample.tex2d.rg32f = FAIL
>-1633 WIN AMD : dEQP-GLES3.functional.fbo.color.repeated_clear.sample.tex2d.rg16f = FAIL
>-1633 WIN AMD : dEQP-GLES3.functional.fbo.color.repeated_clear.sample.tex2d.r32f = FAIL
>-1633 WIN AMD : dEQP-GLES3.functional.fbo.color.repeated_clear.sample.tex2d.r16f = FAIL
>-1633 WIN AMD : dEQP-GLES3.functional.fbo.color.repeated_clear.sample.tex2d.rgb16f = FAIL
>-1633 WIN AMD : dEQP-GLES3.functional.fbo.color.repeated_clear.sample.tex2d.rg8 = FAIL
>-1633 WIN AMD : dEQP-GLES3.functional.fbo.color.repeated_clear.sample.tex2d.r8 = FAIL
>-1633 WIN AMD : dEQP-GLES3.functional.fbo.color.repeated_clear.sample.tex2d.rgb10_a2 = FAIL
>-1633 WIN AMD : dEQP-GLES3.functional.fbo.render.shared_colorbuffer_clear.tex2d_rgb16f = FAIL
>-1633 WIN AMD : dEQP-GLES3.functional.rasterization.fbo.rbo_multisample_max.interpolation.lines = FAIL
>-1633 WIN AMD : dEQP-GLES3.functional.rasterization.fbo.rbo_multisample_max.primitives.lines = FAIL
>-1633 WIN AMD : dEQP-GLES3.functional.texture.filtering.cube.formats.rgb10_a2_nearest_mipmap_nearest = FAIL
>-1633 WIN AMD : dEQP-GLES3.functional.texture.filtering.cube.formats.rgb565_nearest_mipmap_nearest = FAIL
>-1633 WIN AMD : dEQP-GLES3.functional.texture.filtering.cube.formats.rgba16f_nearest_mipmap_nearest = FAIL
>-1633 WIN AMD : dEQP-GLES3.functional.texture.mipmap.2d.min_lod.nearest_nearest = FAIL
>-1633 WIN AMD : dEQP-GLES3.functional.texture.mipmap.2d.min_lod.linear_nearest = FAIL
>-1633 WIN AMD : dEQP-GLES3.functional.texture.mipmap.2d.max_lod.nearest_nearest = FAIL
>-1633 WIN AMD : dEQP-GLES3.functional.texture.mipmap.2d.max_lod.linear_nearest = FAIL
>-1633 WIN AMD : dEQP-GLES3.functional.texture.mipmap.3d.min_lod.nearest_nearest = FAIL
>-1633 WIN AMD : dEQP-GLES3.functional.texture.mipmap.3d.min_lod.linear_nearest = FAIL
>-1633 WIN AMD : dEQP-GLES3.functional.texture.mipmap.3d.max_lod.nearest_nearest = FAIL
>-1633 WIN AMD : dEQP-GLES3.functional.texture.mipmap.3d.max_lod.linear_nearest = FAIL
>-
>-// Windows Intel-specific failures
>-
>-1349 WIN INTEL : dEQP-GLES3.functional.shaders.texture_functions.texturelod.isamplercube_* = FAIL
>-1349 WIN INTEL : dEQP-GLES3.functional.shaders.texture_functions.texturelod.usamplercube_* = FAIL
>-1349 WIN INTEL : dEQP-GLES3.functional.shaders.texture_functions.texturegrad.isamplercube_vertex = FAIL
>-1349 WIN INTEL : dEQP-GLES3.functional.shaders.texture_functions.texturegrad.usamplercube_vertex = FAIL
>-1349 WIN INTEL : dEQP-GLES3.functional.shaders.texture_functions.texturegrad.usamplercube_fragment = FAIL
>-1349 WIN INTEL : dEQP-GLES3.functional.texture.units.2_units.only_cube.0 = FAIL
>-1349 WIN INTEL : dEQP-GLES3.functional.texture.units.2_units.only_cube.2 = FAIL
>-1349 WIN INTEL : dEQP-GLES3.functional.texture.units.2_units.only_cube.4 = FAIL
>-1349 WIN INTEL : dEQP-GLES3.functional.texture.units.2_units.only_cube.7 = FAIL
>-1349 WIN INTEL : dEQP-GLES3.functional.texture.units.2_units.only_cube.8 = FAIL
>-1349 WIN INTEL : dEQP-GLES3.functional.texture.units.2_units.mixed.4 = FAIL
>-1349 WIN INTEL : dEQP-GLES3.functional.texture.units.4_units.only_cube.0 = FAIL
>-1349 WIN INTEL : dEQP-GLES3.functional.texture.units.4_units.only_cube.1 = FAIL
>-1349 WIN INTEL : dEQP-GLES3.functional.texture.units.4_units.only_cube.2 = FAIL
>-1349 WIN INTEL : dEQP-GLES3.functional.texture.units.4_units.only_cube.6 = FAIL
>-1349 WIN INTEL : dEQP-GLES3.functional.texture.units.4_units.only_cube.7 = FAIL
>-1349 WIN INTEL : dEQP-GLES3.functional.texture.units.4_units.only_cube.8 = FAIL
>-1349 WIN INTEL : dEQP-GLES3.functional.texture.units.4_units.only_cube.9 = FAIL
>-1349 WIN INTEL : dEQP-GLES3.functional.texture.units.4_units.mixed.4 = FAIL
>-1349 WIN INTEL : dEQP-GLES3.functional.texture.units.4_units.mixed.6 = FAIL
>-1349 WIN INTEL : dEQP-GLES3.functional.texture.units.4_units.mixed.7 = FAIL
>-1349 WIN INTEL : dEQP-GLES3.functional.texture.units.8_units.only_cube.* = FAIL
>-1349 WIN INTEL : dEQP-GLES3.functional.texture.units.8_units.mixed.2 = FAIL
>-1349 WIN INTEL : dEQP-GLES3.functional.texture.units.8_units.mixed.3 = FAIL
>-1349 WIN INTEL : dEQP-GLES3.functional.texture.units.8_units.mixed.4 = FAIL
>-1349 WIN INTEL : dEQP-GLES3.functional.texture.units.8_units.mixed.6 = FAIL
>-1349 WIN INTEL : dEQP-GLES3.functional.texture.units.8_units.mixed.7 = FAIL
>-1349 WIN INTEL : dEQP-GLES3.functional.texture.units.all_units.only_cube.* = FAIL
>-1349 WIN INTEL : dEQP-GLES3.functional.texture.units.all_units.mixed.2 = FAIL
>-1349 WIN INTEL : dEQP-GLES3.functional.texture.units.all_units.mixed.3 = FAIL
>-1349 WIN INTEL : dEQP-GLES3.functional.texture.units.all_units.mixed.4 = FAIL
>-1349 WIN INTEL : dEQP-GLES3.functional.texture.units.all_units.mixed.6 = FAIL
>-1349 WIN INTEL : dEQP-GLES3.functional.texture.units.all_units.mixed.7 = FAIL
>-
>-// Linux only failures
>-
>-// UBO tests trigger crashes when getting the program info log, skip them until this is fixed.
>-1323 LINUX : dEQP-GLES3.functional.ubo.* = SKIP
>-
>-1323 LINUX : dEQP-GLES3.functional.fbo.blit.default_framebuffer.srgb8_alpha8 = FAIL
>-1323 LINUX : dEQP-GLES3.functional.fbo.blit.default_framebuffer.srgb8_alpha8_linear_out_of_bounds_blit_to_default = FAIL
>-1323 LINUX : dEQP-GLES3.functional.fbo.blit.default_framebuffer.srgb8_alpha8_linear_scale_blit_to_default = FAIL
>-1323 LINUX : dEQP-GLES3.functional.fbo.blit.default_framebuffer.srgb8_alpha8_nearest_scale_blit_to_default = FAIL
>-1323 LINUX : dEQP-GLES3.functional.fbo.depth.depth_test_clamp.depth_component32f = FAIL
>-1323 LINUX : dEQP-GLES3.functional.fbo.depth.depth_test_clamp.depth32f_stencil8 = FAIL
>-1323 LINUX : dEQP-GLES3.functional.fbo.depth.depth_write_clamp.depth_component32f = FAIL
>-1323 LINUX : dEQP-GLES3.functional.fbo.depth.depth_write_clamp.depth32f_stencil8 = FAIL
>-1323 LINUX : dEQP-GLES3.functional.rasterization.fbo.rbo_multisample_max.primitives.points = FAIL
>-1323 LINUX : dEQP-GLES3.functional.state_query.integers64.max_server_wait_timeout_getfloat = FAIL
>-1323 LINUX : dEQP-GLES3.functional.texture.mipmap.2d.projected.linear_linear_clamp = FAIL
>-1323 LINUX : dEQP-GLES3.functional.texture.mipmap.2d.projected.linear_linear_mirror = FAIL
>-1323 LINUX : dEQP-GLES3.functional.texture.mipmap.2d.projected.linear_linear_repeat = FAIL
>-1323 LINUX : dEQP-GLES3.functional.texture.mipmap.2d.projected.nearest_linear_clamp = FAIL
>-1323 LINUX : dEQP-GLES3.functional.texture.mipmap.2d.projected.nearest_linear_mirror = FAIL
>-1323 LINUX : dEQP-GLES3.functional.texture.mipmap.2d.projected.nearest_linear_repeat = FAIL
>-1098 LINUX : dEQP-GLES3.functional.uniform_api.random.6 = FAIL
>-
>-// While loops with 'continue' seem flaky on Linux. (Possibly all GL renderers)
>-1324 LINUX : dEQP-GLES3.functional.shaders.loops.while_constant_iterations.conditional_continue_vertex = FAIL
>-1324 LINUX : dEQP-GLES3.functional.shaders.loops.while_constant_iterations.conditional_continue_fragment = FAIL
>-1324 LINUX : dEQP-GLES3.functional.shaders.loops.while_constant_iterations.unconditional_continue_vertex = FAIL
>-1324 LINUX : dEQP-GLES3.functional.shaders.loops.while_constant_iterations.unconditional_continue_fragment = FAIL
>-1324 LINUX : dEQP-GLES3.functional.shaders.loops.while_constant_iterations.only_continue_vertex = FAIL
>-1324 LINUX : dEQP-GLES3.functional.shaders.loops.while_constant_iterations.only_continue_fragment = FAIL
>-1324 LINUX : dEQP-GLES3.functional.shaders.loops.while_constant_iterations.double_continue_vertex = FAIL
>-1324 LINUX : dEQP-GLES3.functional.shaders.loops.while_constant_iterations.double_continue_fragment = FAIL
>-1324 LINUX : dEQP-GLES3.functional.shaders.loops.while_constant_iterations.mixed_break_continue_vertex = FAIL
>-1324 LINUX : dEQP-GLES3.functional.shaders.loops.while_constant_iterations.mixed_break_continue_fragment = FAIL
>-1324 LINUX : dEQP-GLES3.functional.shaders.loops.while_uniform_iterations.conditional_continue_vertex = FAIL
>-1324 LINUX : dEQP-GLES3.functional.shaders.loops.while_uniform_iterations.conditional_continue_fragment = FAIL
>-1324 LINUX : dEQP-GLES3.functional.shaders.loops.while_uniform_iterations.unconditional_continue_vertex = FAIL
>-1324 LINUX : dEQP-GLES3.functional.shaders.loops.while_uniform_iterations.unconditional_continue_fragment = FAIL
>-1324 LINUX : dEQP-GLES3.functional.shaders.loops.while_uniform_iterations.only_continue_vertex = FAIL
>-1324 LINUX : dEQP-GLES3.functional.shaders.loops.while_uniform_iterations.only_continue_fragment = FAIL
>-1324 LINUX : dEQP-GLES3.functional.shaders.loops.while_uniform_iterations.double_continue_vertex = FAIL
>-1324 LINUX : dEQP-GLES3.functional.shaders.loops.while_uniform_iterations.double_continue_fragment = FAIL
>-1324 LINUX : dEQP-GLES3.functional.shaders.loops.while_uniform_iterations.mixed_break_continue_vertex = FAIL
>-1324 LINUX : dEQP-GLES3.functional.shaders.loops.while_uniform_iterations.mixed_break_continue_fragment = FAIL
>-1324 LINUX : dEQP-GLES3.functional.shaders.loops.while_dynamic_iterations.conditional_continue_vertex = FAIL
>-1324 LINUX : dEQP-GLES3.functional.shaders.loops.while_dynamic_iterations.conditional_continue_fragment = FAIL
>-1324 LINUX : dEQP-GLES3.functional.shaders.loops.while_dynamic_iterations.unconditional_continue_vertex = FAIL
>-1324 LINUX : dEQP-GLES3.functional.shaders.loops.while_dynamic_iterations.unconditional_continue_fragment = FAIL
>-1324 LINUX : dEQP-GLES3.functional.shaders.loops.while_dynamic_iterations.only_continue_vertex = FAIL
>-1324 LINUX : dEQP-GLES3.functional.shaders.loops.while_dynamic_iterations.only_continue_fragment = FAIL
>-1324 LINUX : dEQP-GLES3.functional.shaders.loops.while_dynamic_iterations.double_continue_vertex = FAIL
>-1324 LINUX : dEQP-GLES3.functional.shaders.loops.while_dynamic_iterations.double_continue_fragment = FAIL
>-1324 LINUX : dEQP-GLES3.functional.shaders.loops.while_dynamic_iterations.mixed_break_continue_vertex = FAIL
>-1324 LINUX : dEQP-GLES3.functional.shaders.loops.while_dynamic_iterations.mixed_break_continue_fragment = FAIL
>-1324 LINUX : dEQP-GLES3.functional.shaders.loops.do_while_constant_iterations.conditional_continue_vertex = FAIL
>-1324 LINUX : dEQP-GLES3.functional.shaders.loops.do_while_constant_iterations.conditional_continue_fragment = FAIL
>-1324 LINUX : dEQP-GLES3.functional.shaders.loops.do_while_constant_iterations.unconditional_continue_vertex = FAIL
>-1324 LINUX : dEQP-GLES3.functional.shaders.loops.do_while_constant_iterations.unconditional_continue_fragment = FAIL
>-1324 LINUX : dEQP-GLES3.functional.shaders.loops.do_while_constant_iterations.only_continue_vertex = FAIL
>-1324 LINUX : dEQP-GLES3.functional.shaders.loops.do_while_constant_iterations.only_continue_fragment = FAIL
>-1324 LINUX : dEQP-GLES3.functional.shaders.loops.do_while_constant_iterations.double_continue_vertex = FAIL
>-1324 LINUX : dEQP-GLES3.functional.shaders.loops.do_while_constant_iterations.double_continue_fragment = FAIL
>-1324 LINUX : dEQP-GLES3.functional.shaders.loops.do_while_constant_iterations.mixed_break_continue_vertex = FAIL
>-1324 LINUX : dEQP-GLES3.functional.shaders.loops.do_while_constant_iterations.mixed_break_continue_fragment = FAIL
>-1324 LINUX : dEQP-GLES3.functional.shaders.loops.do_while_uniform_iterations.conditional_continue_vertex = FAIL
>-1324 LINUX : dEQP-GLES3.functional.shaders.loops.do_while_uniform_iterations.conditional_continue_fragment = FAIL
>-1324 LINUX : dEQP-GLES3.functional.shaders.loops.do_while_uniform_iterations.unconditional_continue_vertex = FAIL
>-1324 LINUX : dEQP-GLES3.functional.shaders.loops.do_while_uniform_iterations.unconditional_continue_fragment = FAIL
>-1324 LINUX : dEQP-GLES3.functional.shaders.loops.do_while_uniform_iterations.only_continue_vertex = FAIL
>-1324 LINUX : dEQP-GLES3.functional.shaders.loops.do_while_uniform_iterations.only_continue_fragment = FAIL
>-1324 LINUX : dEQP-GLES3.functional.shaders.loops.do_while_uniform_iterations.double_continue_vertex = FAIL
>-1324 LINUX : dEQP-GLES3.functional.shaders.loops.do_while_uniform_iterations.double_continue_fragment = FAIL
>-1324 LINUX : dEQP-GLES3.functional.shaders.loops.do_while_uniform_iterations.mixed_break_continue_vertex = FAIL
>-1324 LINUX : dEQP-GLES3.functional.shaders.loops.do_while_uniform_iterations.mixed_break_continue_fragment = FAIL
>-1324 LINUX : dEQP-GLES3.functional.shaders.loops.do_while_dynamic_iterations.conditional_continue_vertex = FAIL
>-1324 LINUX : dEQP-GLES3.functional.shaders.loops.do_while_dynamic_iterations.conditional_continue_fragment = FAIL
>-1324 LINUX : dEQP-GLES3.functional.shaders.loops.do_while_dynamic_iterations.unconditional_continue_vertex = FAIL
>-1324 LINUX : dEQP-GLES3.functional.shaders.loops.do_while_dynamic_iterations.unconditional_continue_fragment = FAIL
>-1324 LINUX : dEQP-GLES3.functional.shaders.loops.do_while_dynamic_iterations.only_continue_vertex = FAIL
>-1324 LINUX : dEQP-GLES3.functional.shaders.loops.do_while_dynamic_iterations.only_continue_fragment = FAIL
>-1324 LINUX : dEQP-GLES3.functional.shaders.loops.do_while_dynamic_iterations.double_continue_vertex = FAIL
>-1324 LINUX : dEQP-GLES3.functional.shaders.loops.do_while_dynamic_iterations.double_continue_fragment = FAIL
>-1324 LINUX : dEQP-GLES3.functional.shaders.loops.do_while_dynamic_iterations.mixed_break_continue_vertex = FAIL
>-1324 LINUX : dEQP-GLES3.functional.shaders.loops.do_while_dynamic_iterations.mixed_break_continue_fragment = FAIL
>-
>-// Mac failures (overbroad suppresions)
>-2137 MAC : dEQP-GLES3.functional.fbo.blit.default_framebuffer.* = FAIL
>-2137 MAC : dEQP-GLES3.functional.fbo.blit.rect.out_of_bounds_reverse_* = FAIL
>-2137 MAC : dEQP-GLES3.functional.implementation_limits.compressed_texture_formats = FAIL
>-2137 MAC : dEQP-GLES3.functional.implementation_limits.num_compressed_texture_formats = FAIL
>-2137 MAC : dEQP-GLES3.functional.negative_api.shader.program_binary = FAIL
>-2137 MAC : dEQP-GLES3.functional.primitive_restart.* = FAIL
>-2137 MAC : dEQP-GLES3.functional.shaders.linkage.varying.rules.vertex_declare_fragment_use = FAIL
>-2137 MAC : dEQP-GLES3.functional.shaders.scoping.valid.function_parameter_hides_struct_type_fragment = FAIL
>-2137 MAC : dEQP-GLES3.functional.shaders.scoping.valid.function_parameter_hides_struct_type_vertex = FAIL
>-2137 MAC : dEQP-GLES3.functional.shaders.scoping.valid.local_int_variable_hides_struct_type_fragment = FAIL
>-2137 MAC : dEQP-GLES3.functional.shaders.scoping.valid.local_int_variable_hides_struct_type_vertex = FAIL
>-2137 MAC : dEQP-GLES3.functional.shaders.scoping.valid.local_struct_variable_hides_struct_type_fragment = FAIL
>-2137 MAC : dEQP-GLES3.functional.shaders.scoping.valid.local_struct_variable_hides_struct_type_vertex = FAIL
>-2137 MAC : dEQP-GLES3.functional.state_query.integers64.max_server_wait_timeout_getfloat = FAIL
>-2137 MAC : dEQP-GLES3.functional.state_query.integers.compressed_texture_formats_getfloat = FAIL
>-2137 MAC : dEQP-GLES3.functional.state_query.integers.compressed_texture_formats_getinteger = FAIL
>-2137 MAC : dEQP-GLES3.functional.state_query.integers.compressed_texture_formats_getinteger64 = FAIL
>-
>-// Mac AMD failures
>-2137 MAC AMD : dEQP-GLES3.functional.clipping.point.wide_point_clip = FAIL
>-2137 MAC AMD : dEQP-GLES3.functional.clipping.point.wide_point_clip_viewport_center = FAIL
>-2137 MAC AMD : dEQP-GLES3.functional.clipping.point.wide_point_clip_viewport_corner = FAIL
>-2137 MAC AMD : dEQP-GLES3.functional.fbo.blit.rect.out_of_bounds_nearest = FAIL
>-2137 MAC AMD : dEQP-GLES3.functional.shaders.builtin_functions.precision.tanh.highp_* = FAIL
>-2137 MAC AMD : dEQP-GLES3.functional.texture.mipmap.2d.projected.* = FAIL
>-2137 MAC AMD : dEQP-GLES3.functional.transform_feedback.* = FAIL
>-
>-// Mac Intel crashes
>-2137 MAC INTEL : dEQP-GLES3.functional.shaders.discard.function_static_loop_never = SKIP
>-2137 MAC INTEL : dEQP-GLES3.functional.shaders.discard.dynamic_loop_never = SKIP
>-2137 MAC INTEL : dEQP-GLES3.functional.shaders.discard.static_loop_never = SKIP
>-
>-// Mac Intel failures
>-2137 MAC INTEL : dEQP-GLES3.functional.color_clear.* = FAIL
>-// All the out of bounds variants fail.
>-2137 MAC INTEL : dEQP-GLES3.functional.fbo.blit.rect.nearest_consistency_mag_reverse_src_dst_y = FAIL
>-2137 MAC INTEL : dEQP-GLES3.functional.fbo.blit.rect.nearest_consistency_min_reverse_src_dst_y = FAIL
>-// Fails for all integer formats
>-2137 MAC INTEL : dEQP-GLES3.functional.fbo.color.repeated_clear.sample.tex2d.* = FAIL
>-2137 MAC INTEL : dEQP-GLES3.functional.fbo.completeness.attachment_combinations.none_rbo_none_none = FAIL
>-2137 MAC INTEL : dEQP-GLES3.functional.fbo.completeness.attachment_combinations.none_tex_none_none = FAIL
>-2137 MAC INTEL : dEQP-GLES3.functional.polygon_offset.default_render_with_units = FAIL
>-2137 MAC INTEL : dEQP-GLES3.functional.polygon_offset.fixed16_render_with_units = FAIL
>-2137 MAC INTEL : dEQP-GLES3.functional.polygon_offset.fixed24_render_with_units = FAIL
>-2137 MAC INTEL : dEQP-GLES3.functional.shaders.builtin_functions.precision.cos.highp_* = FAIL
>-2137 MAC INTEL : dEQP-GLES3.functional.shaders.builtin_functions.precision.sin.highp_* = FAIL
>-2137 MAC INTEL : dEQP-GLES3.functional.shaders.invariance.lowp.common_subexpression_1 = FAIL
>-2137 MAC INTEL : dEQP-GLES3.functional.shaders.invariance.lowp.common_subexpression_3 = FAIL
>-2137 MAC INTEL : dEQP-GLES3.functional.shaders.invariance.mediump.common_subexpression_1 = FAIL
>-2137 MAC INTEL : dEQP-GLES3.functional.shaders.invariance.mediump.common_subexpression_3 = FAIL
>-2137 MAC INTEL : dEQP-GLES3.functional.shaders.invariance.highp.common_subexpression_1 = FAIL
>-2137 MAC INTEL : dEQP-GLES3.functional.shaders.invariance.highp.common_subexpression_3 = FAIL
>-2137 MAC INTEL : dEQP-GLES3.functional.shaders.texture_functions.texelfetchoffset.usampler2d_fragment = FAIL
>-2137 MAC INTEL : dEQP-GLES3.functional.shaders.texture_functions.texelfetchoffset.usampler2d_vertex  = FAIL
>-2137 MAC INTEL : dEQP-GLES3.functional.shaders.texture_functions.texturegradoffset.usampler3d_fragment  = FAIL
>-2137 MAC INTEL : dEQP-GLES3.functional.shaders.texture_functions.texturegrad.usampler3d_fragment  = FAIL
>-2137 MAC INTEL : dEQP-GLES3.functional.shaders.texture_functions.texturegrad.usamplercube_fragment  = FAIL
>-2137 MAC INTEL : dEQP-GLES3.functional.shaders.texture_functions.texturegrad.usamplercube_vertex  = FAIL
>-2137 MAC INTEL : dEQP-GLES3.functional.shaders.texture_functions.texturelod.usamplercube_fragment  = FAIL
>-2137 MAC INTEL : dEQP-GLES3.functional.shaders.texture_functions.texturelod.usamplercube_vertex  = FAIL
>-2137 MAC INTEL : dEQP-GLES3.functional.shaders.texture_functions.textureprojgradoffset.usampler3d_fragment  = FAIL
>-2137 MAC INTEL : dEQP-GLES3.functional.shaders.texture_functions.textureprojgrad.usampler3d_fragment  = FAIL
>-// Fails the integer npot cases = FAIL
>-2137 MAC INTEL : dEQP-GLES3.functional.texture.format.sized.cube.* = FAIL
>-2137 MAC INTEL : dEQP-GLES3.functional.texture.specification.basic_copyteximage2d.cube_alpha = FAIL
>-2137 MAC INTEL : dEQP-GLES3.functional.texture.specification.basic_copyteximage2d.cube_luminance = FAIL
>-2137 MAC INTEL : dEQP-GLES3.functional.texture.specification.basic_copyteximage2d.cube_luminance_alpha = FAIL
>-2137 MAC INTEL : dEQP-GLES3.functional.texture.specification.basic_copyteximage2d.cube_rgb = FAIL
>-2137 MAC INTEL : dEQP-GLES3.functional.texture.specification.basic_copyteximage2d.cube_rgba = FAIL
>-2137 MAC INTEL : dEQP-GLES3.functional.texture.specification.random_teximage2d.2d_5 = FAIL
>-2137 MAC INTEL : dEQP-GLES3.functional.texture.specification.teximage3d_* = FAIL
>-2137 MAC INTEL : dEQP-GLES3.functional.texture.specification.texsubimage3d_* = FAIL
>-2137 MAC INTEL : dEQP-GLES3.functional.ubo.* = FAIL
>-
>-// Android only failures
>-1487 ANDROID : dEQP-GLES3.functional.fbo.completeness.renderable.texture.color0.red_half_float_oes = FAIL
>-1487 ANDROID : dEQP-GLES3.functional.fbo.completeness.renderable.texture.color0.rg_half_float_oes = FAIL
>-1964 ANDROID : dEQP-GLES3.functional.occlusion_query.* = FAIL
>-1962 ANDROID : dEQP-GLES3.functional.shaders.preprocessor.conditional_inclusion.basic_2_fragment = FAIL
>-1962 ANDROID : dEQP-GLES3.functional.shaders.preprocessor.conditional_inclusion.basic_2_vertex = FAIL
>-1962 ANDROID : dEQP-GLES3.functional.shaders.preprocessor.conditional_inclusion.defined_macro_undef_fragment = FAIL
>-1962 ANDROID : dEQP-GLES3.functional.shaders.preprocessor.conditional_inclusion.defined_macro_undef_vertex = FAIL
>-1963 ANDROID : dEQP-GLES3.functional.shaders.return.conditional_return_always_fragment = FAIL
>-1963 ANDROID : dEQP-GLES3.functional.shaders.return.conditional_return_always_vertex = FAIL
>-1963 ANDROID : dEQP-GLES3.functional.shaders.return.output_write_always_fragment = FAIL
>-1963 ANDROID : dEQP-GLES3.functional.shaders.return.output_write_always_vertex = FAIL
>-1963 ANDROID : dEQP-GLES3.functional.shaders.return.output_write_in_func_always_fragment = FAIL
>-1963 ANDROID : dEQP-GLES3.functional.shaders.return.output_write_in_func_always_vertex = FAIL
>-1529 ANDROID : dEQP-GLES3.functional.texture.mipmap.2d.generate.a8_* = FAIL
>-1529 ANDROID : dEQP-GLES3.functional.texture.mipmap.2d.generate.l8_* = FAIL
>-1529 ANDROID : dEQP-GLES3.functional.texture.mipmap.2d.generate.la88_* = FAIL
>-1529 ANDROID : dEQP-GLES3.functional.texture.mipmap.cube.generate.a8_* = FAIL
>-1529 ANDROID : dEQP-GLES3.functional.texture.mipmap.cube.generate.l8_* = FAIL
>-1529 ANDROID : dEQP-GLES3.functional.texture.mipmap.cube.generate.la88_* = FAIL
>-1531 ANDROID : dEQP-GLES3.functional.transform_feedback.basic_types.interleaved.* = FAIL
>-1531 ANDROID : dEQP-GLES3.functional.transform_feedback.basic_types.separate.* = FAIL
>-1531 ANDROID : dEQP-GLES3.functional.transform_feedback.interpolation.* = FAIL
>-1531 ANDROID : dEQP-GLES3.functional.transform_feedback.point_size.* = FAIL
>-1531 ANDROID : dEQP-GLES3.functional.transform_feedback.position.* = FAIL
>-1531 ANDROID : dEQP-GLES3.functional.transform_feedback.random.interleaved.lines.5 = FAIL
>-1531 ANDROID : dEQP-GLES3.functional.transform_feedback.random.interleaved.lines.8 = FAIL
>-1531 ANDROID : dEQP-GLES3.functional.transform_feedback.random.interleaved.lines.10 = FAIL
>-1531 ANDROID : dEQP-GLES3.functional.transform_feedback.random.interleaved.points.6 = FAIL
>-1531 ANDROID : dEQP-GLES3.functional.transform_feedback.random.interleaved.points.7 = FAIL
>-1531 ANDROID : dEQP-GLES3.functional.transform_feedback.random.interleaved.triangles.2 = FAIL
>-1531 ANDROID : dEQP-GLES3.functional.transform_feedback.random.separate.lines.4 = FAIL
>-1531 ANDROID : dEQP-GLES3.functional.transform_feedback.random.separate.lines.6 = FAIL
>-1531 ANDROID : dEQP-GLES3.functional.transform_feedback.random.separate.lines.8 = FAIL
>-1531 ANDROID : dEQP-GLES3.functional.transform_feedback.random.separate.points.4 = FAIL
>-1531 ANDROID : dEQP-GLES3.functional.transform_feedback.random.separate.triangles.4 = FAIL
>diff --git a/Source/ThirdParty/ANGLE/src/tests/deqp_support/deqp_gles3_test_expectations.txt b/Source/ThirdParty/ANGLE/src/tests/deqp_support/deqp_gles3_test_expectations.txt
>new file mode 100644
>index 00000000000..12dbea87ce7
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/tests/deqp_support/deqp_gles3_test_expectations.txt
>@@ -0,0 +1,751 @@
>+// Copyright 2015 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+
>+// This file contains a list of defective dEQP conformance tests. The expected
>+// format is:
>+//  {BUG#} {MODIFIERS} : {TEST_NAME} = {PASS,FAIL,FLAKY,TIMEOUT,SKIP}
>+//
>+// MODIFIERS can be a combination of the below list, combined with a logical AND:
>+//  WIN XP VISTA WIN7 WIN8 WIN10
>+//  MAC LEOPARD SNOWLEOPARD LION MOUNTAINLION MAVERICKS YOSEMITE ELCAPITAN SIERRA HIGHSIERRA MOJAVE
>+//  LINUX CHROMEOS ANDROID
>+//  NVIDIA AMD INTEL
>+//  DEBUG RELEASE
>+//  D3D9 D3D11 OPENGL GLES VULKAN
>+//  NEXUS5X PIXEL2
>+//  QUADROP400
>+//
>+//
>+// TEST_NAME can be a specific test name, or have a '*' in the end, which
>+// indicates a prefix matching.
>+//
>+// Examples:
>+// fails on both windows and mac (crash)
>+//  91530 WIN : context_lost_restored = SKIP
>+//  91530 MAC : context_lost_restored = SKIP
>+// fails on windows using NVIDIA GPUs
>+//  91533 WIN NVIDIA : gl_min_uniforms = FAIL
>+// fails on Nexus5X with GLES backend (hangs)
>+//  91531 NEXUS5X GLES : conformance_more_* = SKIP
>+
>+// Don't run these tests for faster turnover
>+1101 : dEQP-GLES3.functional.flush_finish.* = SKIP
>+
>+// Figure out why this caused this regression in Chrome:
>+// https://bugs.chromium.org/p/chromium/issues/detail?id=833809#
>+2321 : dEQP-GLES3.functional.state_query.fbo.framebuffer_unspecified_attachment_x_size_rbo = FAIL
>+
>+// TODO(jmadill): Figure out why these fail on the bots, but not locally.
>+1108 WIN D3D11 : dEQP-GLES3.functional.shaders.struct.local.dynamic_loop_struct_array_fragment = FAIL
>+1094 WIN D3D11 : dEQP-GLES3.functional.shaders.invariance.highp.loop_2 = FAIL
>+1094 WIN D3D11 : dEQP-GLES3.functional.shaders.invariance.mediump.loop_2 = FAIL
>+
>+// We can't support distinct texture sizes in D3D11.
>+1097 WIN D3D11 : dEQP-GLES3.functional.fbo.completeness.size.distinct = FAIL
>+
>+////////////////////////////////////////////////////////////////////////////////
>+//
>+//  Temporary entries: they should be removed once the bugs are fixed.
>+//
>+////////////////////////////////////////////////////////////////////////////////
>+
>+// Failures related to using a depth/stencil enabled backbuffer on Windows / NVIDIA.
>+2428 D3D11 NVIDIA : dEQP-GLES3.functional.shaders.invariance.highp.common_subexpression_1 = FAIL
>+2428 D3D11 NVIDIA : dEQP-GLES3.functional.shaders.invariance.mediump.common_subexpression_1 = FAIL
>+2428 D3D11 NVIDIA : dEQP-GLES3.functional.shaders.invariance.lowp.common_subexpression_1 = FAIL
>+2428 D3D11 NVIDIA : dEQP-GLES3.functional.fbo.invalidate.default.render_all = SKIP
>+2428 D3D11 NVIDIA : dEQP-GLES3.functional.fbo.invalidate.default.render_depth_stencil = SKIP
>+2428 D3D11 NVIDIA : dEQP-GLES3.functional.fbo.invalidate.default.bind_depth_stencil = SKIP
>+2428 D3D11 NVIDIA : dEQP-GLES3.functional.fbo.invalidate.default.draw_framebuffer_all = SKIP
>+2428 D3D11 NVIDIA : dEQP-GLES3.functional.fbo.invalidate.default.read_framebuffer_all = SKIP
>+2428 D3D11 NVIDIA : dEQP-GLES3.functional.fbo.invalidate.default.bind_all = SKIP
>+2428 D3D11 NVIDIA : dEQP-GLES3.functional.polygon_offset.default_render_with_units = SKIP
>+
>+// Tests were being hidden by flakiness (anglebug.com/3271)
>+3329 D3D11 NVIDIA : dEQP-GLES3.functional.transform_feedback.interpolation.flat.* = FAIL
>+3329 D3D11 NVIDIA : dEQP-GLES3.functional.transform_feedback.basic_types.interleaved.triangles.* = FAIL
>+3329 D3D11 NVIDIA : dEQP-GLES3.functional.transform_feedback.basic_types.separate.triangles.* = FAIL
>+
>+// Missing the SampleCmp instruction in vertex shaders.
>+1435 WIN D3D11 : dEQP-GLES3.functional.shaders.texture_functions.texturelod.sampler2dshadow_vertex = FAIL
>+1435 WIN D3D11 : dEQP-GLES3.functional.shaders.texture_functions.texturelodoffset.sampler2dshadow_vertex = FAIL
>+1435 WIN D3D11 : dEQP-GLES3.functional.shaders.texture_functions.textureprojlod.sampler2dshadow_vertex = FAIL
>+1435 WIN D3D11 : dEQP-GLES3.functional.shaders.texture_functions.textureprojlodoffset.sampler2dshadow_vertex = FAIL
>+
>+// SampleCmp is missing gradient/offset parameters in HLSL.
>+1436 WIN D3D11 : dEQP-GLES3.functional.shaders.texture_functions.texturelod.sampler2dshadow_fragment = FAIL
>+1436 WIN D3D11 : dEQP-GLES3.functional.shaders.texture_functions.texturelodoffset.sampler2dshadow_fragment = FAIL
>+1436 WIN D3D11 : dEQP-GLES3.functional.shaders.texture_functions.textureprojlod.sampler2dshadow_fragment = FAIL
>+1436 WIN D3D11 : dEQP-GLES3.functional.shaders.texture_functions.textureprojlodoffset.sampler2dshadow_fragment = FAIL
>+1436 WIN D3D11 : dEQP-GLES3.functional.shaders.texture_functions.texturegrad.sampler2dshadow_vertex = FAIL
>+1436 WIN D3D11 : dEQP-GLES3.functional.shaders.texture_functions.texturegrad.sampler2dshadow_fragment = FAIL
>+1436 WIN D3D11 : dEQP-GLES3.functional.shaders.texture_functions.texturegrad.sampler2darrayshadow_vertex = FAIL
>+1436 WIN D3D11 : dEQP-GLES3.functional.shaders.texture_functions.texturegrad.sampler2darrayshadow_fragment = FAIL
>+1436 WIN D3D11 : dEQP-GLES3.functional.shaders.texture_functions.texturegradoffset.sampler2dshadow_vertex = FAIL
>+1436 WIN D3D11 : dEQP-GLES3.functional.shaders.texture_functions.texturegradoffset.sampler2dshadow_fragment = FAIL
>+1436 WIN D3D11 : dEQP-GLES3.functional.shaders.texture_functions.texturegradoffset.sampler2darrayshadow_vertex = FAIL
>+1436 WIN D3D11 : dEQP-GLES3.functional.shaders.texture_functions.texturegradoffset.sampler2darrayshadow_fragment = FAIL
>+1436 WIN D3D11 : dEQP-GLES3.functional.shaders.texture_functions.textureprojgrad.sampler2dshadow_vertex = FAIL
>+1436 WIN D3D11 : dEQP-GLES3.functional.shaders.texture_functions.textureprojgrad.sampler2dshadow_fragment = FAIL
>+1436 WIN D3D11 : dEQP-GLES3.functional.shaders.texture_functions.textureprojgradoffset.sampler2dshadow_vertex = FAIL
>+1436 WIN D3D11 : dEQP-GLES3.functional.shaders.texture_functions.textureprojgradoffset.sampler2dshadow_fragment = FAIL
>+
>+// DrawBuffers test failing on D3D11.
>+3298 WIN D3D11 : dEQP-GLES3.functional.shaders.fragdata.draw_buffers = FAIL
>+
>+// TODO(jmadill, cwallez): triage the failures below into permanent and temporary failures
>+
>+// Quadro P400
>+// TODO(jmadill): Narrow to P400 device only: 0x1CB3.
>+2222 D3D11 NVIDIA : dEQP-GLES3.functional.shaders.functions.control_flow.return_in_nested_loop_fragment = FAIL
>+2222 D3D11 NVIDIA : dEQP-GLES3.functional.shaders.functions.control_flow.return_in_nested_loop_vertex = FAIL
>+2222 D3D11 NVIDIA : dEQP-GLES3.functional.texture.mipmap.2d.min_lod.linear_nearest = FAIL
>+2222 D3D11 NVIDIA : dEQP-GLES3.functional.texture.mipmap.2d.min_lod.nearest_nearest = FAIL
>+2222 D3D11 NVIDIA : dEQP-GLES3.functional.texture.mipmap.3d.min_lod.linear_nearest = FAIL
>+2222 D3D11 NVIDIA : dEQP-GLES3.functional.texture.mipmap.3d.min_lod.nearest_nearest = FAIL
>+2222 D3D11 NVIDIA : dEQP-GLES3.functional.texture.mipmap.cube.min_lod.linear_nearest = FAIL
>+2222 D3D11 NVIDIA : dEQP-GLES3.functional.texture.mipmap.cube.min_lod.nearest_nearest = FAIL
>+
>+// Failing everywhere
>+2322 : dEQP-GLES3.functional.shaders.metamorphic.* = FAIL
>+
>+// Bind aliasing is not working currently
>+3252 : dEQP-GLES3.functional.attribute_location.bind_aliasing.cond* = FAIL
>+3252 : dEQP-GLES3.functional.attribute_location.bind_aliasing.max_cond* = FAIL
>+
>+// Windows and Linux failures
>+1095 WIN : dEQP-GLES3.functional.texture.mipmap.2d.projected.* = FAIL
>+1095 LINUX : dEQP-GLES3.functional.texture.mipmap.2d.projected.* = FAIL
>+
>+// Windows only failure
>+1096 WIN D3D11 : dEQP-GLES3.functional.fragment_ops.depth_stencil.stencil_depth_funcs.stencil_* = FAIL
>+1096 WIN D3D11 : dEQP-GLES3.functional.fragment_ops.depth_stencil.stencil_ops.* = FAIL
>+1096 WIN D3D11 : dEQP-GLES3.functional.fragment_ops.depth_stencil.write_mask.* = FAIL
>+1096 WIN D3D11 : dEQP-GLES3.functional.fragment_ops.depth_stencil.random.* = FAIL
>+1096 WIN D3D11 : dEQP-GLES3.functional.fragment_ops.blend.default_framebuffer.equation_src_func_dst_func.add_constant_color_constant_alpha = FAIL
>+1096 WIN D3D11 : dEQP-GLES3.functional.fragment_ops.blend.default_framebuffer.equation_src_func_dst_func.add_constant_color_one_minus_constant_alpha = FAIL
>+1096 WIN D3D11 : dEQP-GLES3.functional.fragment_ops.blend.default_framebuffer.equation_src_func_dst_func.add_one_minus_constant_color_constant_alpha = FAIL
>+1096 WIN D3D11 : dEQP-GLES3.functional.fragment_ops.blend.default_framebuffer.equation_src_func_dst_func.add_one_minus_constant_color_one_minus_constant_alpha = FAIL
>+1096 WIN D3D11 : dEQP-GLES3.functional.fragment_ops.blend.default_framebuffer.equation_src_func_dst_func.add_constant_alpha_constant_color = FAIL
>+1096 WIN D3D11 : dEQP-GLES3.functional.fragment_ops.blend.default_framebuffer.equation_src_func_dst_func.add_constant_alpha_one_minus_constant_color = FAIL
>+1096 WIN D3D11 : dEQP-GLES3.functional.fragment_ops.blend.default_framebuffer.equation_src_func_dst_func.add_one_minus_constant_alpha_constant_color = FAIL
>+1096 WIN D3D11 : dEQP-GLES3.functional.fragment_ops.blend.default_framebuffer.equation_src_func_dst_func.add_one_minus_constant_alpha_one_minus_constant_color = FAIL
>+1096 WIN D3D11 : dEQP-GLES3.functional.fragment_ops.blend.default_framebuffer.equation_src_func_dst_func.subtract_constant_color_constant_alpha = FAIL
>+1096 WIN D3D11 : dEQP-GLES3.functional.fragment_ops.blend.default_framebuffer.equation_src_func_dst_func.subtract_constant_color_one_minus_constant_alpha = FAIL
>+1096 WIN D3D11 : dEQP-GLES3.functional.fragment_ops.blend.default_framebuffer.equation_src_func_dst_func.subtract_one_minus_constant_color_constant_alpha = FAIL
>+1096 WIN D3D11 : dEQP-GLES3.functional.fragment_ops.blend.default_framebuffer.equation_src_func_dst_func.subtract_one_minus_constant_color_one_minus_constant_alpha = FAIL
>+1096 WIN D3D11 : dEQP-GLES3.functional.fragment_ops.blend.default_framebuffer.equation_src_func_dst_func.subtract_constant_alpha_constant_color = FAIL
>+1096 WIN D3D11 : dEQP-GLES3.functional.fragment_ops.blend.default_framebuffer.equation_src_func_dst_func.subtract_constant_alpha_one_minus_constant_color = FAIL
>+1096 WIN D3D11 : dEQP-GLES3.functional.fragment_ops.blend.default_framebuffer.equation_src_func_dst_func.subtract_one_minus_constant_alpha_constant_color = FAIL
>+1096 WIN D3D11 : dEQP-GLES3.functional.fragment_ops.blend.default_framebuffer.equation_src_func_dst_func.subtract_one_minus_constant_alpha_one_minus_constant_color = FAIL
>+1096 WIN D3D11 : dEQP-GLES3.functional.fragment_ops.blend.default_framebuffer.equation_src_func_dst_func.reverse_subtract_constant_color_constant_alpha = FAIL
>+1096 WIN D3D11 : dEQP-GLES3.functional.fragment_ops.blend.default_framebuffer.equation_src_func_dst_func.reverse_subtract_constant_color_one_minus_constant_alpha = FAIL
>+1096 WIN D3D11 : dEQP-GLES3.functional.fragment_ops.blend.default_framebuffer.equation_src_func_dst_func.reverse_subtract_one_minus_constant_color_constant_alpha = FAIL
>+1096 WIN D3D11 : dEQP-GLES3.functional.fragment_ops.blend.default_framebuffer.equation_src_func_dst_func.reverse_subtract_one_minus_constant_color_one_minus_constant_alpha = FAIL
>+1096 WIN D3D11 : dEQP-GLES3.functional.fragment_ops.blend.default_framebuffer.equation_src_func_dst_func.reverse_subtract_constant_alpha_constant_color = FAIL
>+1096 WIN D3D11 : dEQP-GLES3.functional.fragment_ops.blend.default_framebuffer.equation_src_func_dst_func.reverse_subtract_constant_alpha_one_minus_constant_color = FAIL
>+1096 WIN D3D11 : dEQP-GLES3.functional.fragment_ops.blend.default_framebuffer.equation_src_func_dst_func.reverse_subtract_one_minus_constant_alpha_constant_color = FAIL
>+1096 WIN D3D11 : dEQP-GLES3.functional.fragment_ops.blend.default_framebuffer.equation_src_func_dst_func.reverse_subtract_one_minus_constant_alpha_one_minus_constant_color = FAIL
>+1096 WIN D3D11 : dEQP-GLES3.functional.fragment_ops.blend.fbo_srgb.equation_src_func_dst_func.add_constant_color_constant_alpha = FAIL
>+1096 WIN D3D11 : dEQP-GLES3.functional.fragment_ops.blend.fbo_srgb.equation_src_func_dst_func.add_constant_color_one_minus_constant_alpha = FAIL
>+1096 WIN D3D11 : dEQP-GLES3.functional.fragment_ops.blend.fbo_srgb.equation_src_func_dst_func.add_one_minus_constant_color_constant_alpha = FAIL
>+1096 WIN D3D11 : dEQP-GLES3.functional.fragment_ops.blend.fbo_srgb.equation_src_func_dst_func.add_one_minus_constant_color_one_minus_constant_alpha = FAIL
>+1096 WIN D3D11 : dEQP-GLES3.functional.fragment_ops.blend.fbo_srgb.equation_src_func_dst_func.add_constant_alpha_constant_color = FAIL
>+1096 WIN D3D11 : dEQP-GLES3.functional.fragment_ops.blend.fbo_srgb.equation_src_func_dst_func.add_constant_alpha_one_minus_constant_color = FAIL
>+1096 WIN D3D11 : dEQP-GLES3.functional.fragment_ops.blend.fbo_srgb.equation_src_func_dst_func.add_one_minus_constant_alpha_constant_color = FAIL
>+1096 WIN D3D11 : dEQP-GLES3.functional.fragment_ops.blend.fbo_srgb.equation_src_func_dst_func.add_one_minus_constant_alpha_one_minus_constant_color = FAIL
>+1096 WIN D3D11 : dEQP-GLES3.functional.fragment_ops.blend.fbo_srgb.equation_src_func_dst_func.subtract_constant_color_constant_alpha = FAIL
>+1096 WIN D3D11 : dEQP-GLES3.functional.fragment_ops.blend.fbo_srgb.equation_src_func_dst_func.subtract_constant_color_one_minus_constant_alpha = FAIL
>+1096 WIN D3D11 : dEQP-GLES3.functional.fragment_ops.blend.fbo_srgb.equation_src_func_dst_func.subtract_one_minus_constant_color_constant_alpha = FAIL
>+1096 WIN D3D11 : dEQP-GLES3.functional.fragment_ops.blend.fbo_srgb.equation_src_func_dst_func.subtract_one_minus_constant_color_one_minus_constant_alpha = FAIL
>+1096 WIN D3D11 : dEQP-GLES3.functional.fragment_ops.blend.fbo_srgb.equation_src_func_dst_func.subtract_constant_alpha_constant_color = FAIL
>+1096 WIN D3D11 : dEQP-GLES3.functional.fragment_ops.blend.fbo_srgb.equation_src_func_dst_func.subtract_constant_alpha_one_minus_constant_color = FAIL
>+1096 WIN D3D11 : dEQP-GLES3.functional.fragment_ops.blend.fbo_srgb.equation_src_func_dst_func.subtract_one_minus_constant_alpha_constant_color = FAIL
>+1096 WIN D3D11 : dEQP-GLES3.functional.fragment_ops.blend.fbo_srgb.equation_src_func_dst_func.subtract_one_minus_constant_alpha_one_minus_constant_color = FAIL
>+1096 WIN D3D11 : dEQP-GLES3.functional.fragment_ops.blend.fbo_srgb.equation_src_func_dst_func.reverse_subtract_constant_color_constant_alpha = FAIL
>+1096 WIN D3D11 : dEQP-GLES3.functional.fragment_ops.blend.fbo_srgb.equation_src_func_dst_func.reverse_subtract_constant_color_one_minus_constant_alpha = FAIL
>+1096 WIN D3D11 : dEQP-GLES3.functional.fragment_ops.blend.fbo_srgb.equation_src_func_dst_func.reverse_subtract_one_minus_constant_color_constant_alpha = FAIL
>+1096 WIN D3D11 : dEQP-GLES3.functional.fragment_ops.blend.fbo_srgb.equation_src_func_dst_func.reverse_subtract_one_minus_constant_color_one_minus_constant_alpha = FAIL
>+1096 WIN D3D11 : dEQP-GLES3.functional.fragment_ops.blend.fbo_srgb.equation_src_func_dst_func.reverse_subtract_constant_alpha_constant_color = FAIL
>+1096 WIN D3D11 : dEQP-GLES3.functional.fragment_ops.blend.fbo_srgb.equation_src_func_dst_func.reverse_subtract_constant_alpha_one_minus_constant_color = FAIL
>+1096 WIN D3D11 : dEQP-GLES3.functional.fragment_ops.blend.fbo_srgb.equation_src_func_dst_func.reverse_subtract_one_minus_constant_alpha_constant_color = FAIL
>+1096 WIN D3D11 : dEQP-GLES3.functional.fragment_ops.blend.fbo_srgb.equation_src_func_dst_func.reverse_subtract_one_minus_constant_alpha_one_minus_constant_color = FAIL
>+1096 WIN D3D11 : dEQP-GLES3.functional.fragment_ops.random.* = FAIL
>+1096 WIN D3D11 : dEQP-GLES3.functional.fragment_ops.interaction.basic_shader.* = FAIL
>+1101 WIN D3D11 : dEQP-GLES3.functional.polygon_offset.fixed16_render_with_units = FAIL
>+1101 WIN D3D11 : dEQP-GLES3.functional.polygon_offset.fixed24_render_with_units = FAIL
>+1101 WIN D3D11 : dEQP-GLES3.functional.lifetime.attach.deleted_input.buffer_vertex_array = FAIL
>+
>+// Basic line transform feedback tests flaky on Windows.
>+2676 WIN D3D11 : dEQP-GLES3.functional.transform_feedback.basic_types.interleaved.lines.* = FAIL
>+2676 WIN D3D11 : dEQP-GLES3.functional.transform_feedback.basic_types.separate.lines.* = FAIL
>+
>+// Very small threshold issue. Could upstream a higher tolerance to dEQP.
>+2323 WIN D3D11 : dEQP-GLES3.functional.texture.units.2_units.only_cube.7 = FAIL
>+
>+// Blit related failures on D3D11
>+3297 WIN D3D11 : dEQP-GLES3.functional.fbo.blit.rect.nearest_consistency_out_of_bounds_mag_reverse_dst_x = FAIL
>+3297 WIN D3D11 : dEQP-GLES3.functional.fbo.blit.rect.nearest_consistency_out_of_bounds_mag_reverse_dst_y = FAIL
>+3297 WIN D3D11 : dEQP-GLES3.functional.fbo.blit.rect.nearest_consistency_out_of_bounds_mag_reverse_src_x = FAIL
>+3297 WIN D3D11 : dEQP-GLES3.functional.fbo.blit.rect.nearest_consistency_out_of_bounds_mag_reverse_src_y = FAIL
>+3297 WIN D3D11 : dEQP-GLES3.functional.fbo.blit.rect.out_of_bounds_linear = FAIL
>+3297 WIN D3D11 : dEQP-GLES3.functional.fbo.blit.rect.out_of_bounds_reverse_dst_x_linear = FAIL
>+3297 WIN D3D11 : dEQP-GLES3.functional.fbo.blit.rect.out_of_bounds_reverse_dst_y_linear = FAIL
>+3297 WIN D3D11 : dEQP-GLES3.functional.fbo.blit.rect.out_of_bounds_reverse_src_dst_x_linear = FAIL
>+3297 WIN D3D11 : dEQP-GLES3.functional.fbo.blit.rect.out_of_bounds_reverse_src_dst_y_linear = FAIL
>+3297 WIN D3D11 : dEQP-GLES3.functional.fbo.blit.rect.out_of_bounds_reverse_src_x_linear = FAIL
>+3297 WIN D3D11 : dEQP-GLES3.functional.fbo.blit.rect.out_of_bounds_reverse_src_y_linear = FAIL
>+
>+// Windows AMD specific failures
>+1633 WIN D3D11 AMD : dEQP-GLES3.functional.fbo.blit.depth_stencil.depth24_stencil8_scale = FAIL
>+1633 WIN D3D11 AMD : dEQP-GLES3.functional.fbo.blit.depth_stencil.depth24_stencil8_stencil_only = FAIL
>+1633 WIN D3D11 AMD : dEQP-GLES3.functional.fbo.color.repeated_clear.blit.tex2d.r11f_g11f_b10f = FAIL
>+1633 WIN D3D11 AMD : dEQP-GLES3.functional.fbo.color.repeated_clear.blit.tex2d.rg32f = FAIL
>+1633 WIN D3D11 AMD : dEQP-GLES3.functional.fbo.color.repeated_clear.blit.tex2d.rg16f = FAIL
>+1633 WIN D3D11 AMD : dEQP-GLES3.functional.fbo.color.repeated_clear.blit.tex2d.r32f = FAIL
>+1633 WIN D3D11 AMD : dEQP-GLES3.functional.fbo.color.repeated_clear.blit.tex2d.r16f = FAIL
>+1633 WIN D3D11 AMD : dEQP-GLES3.functional.fbo.color.repeated_clear.blit.tex2d.rgb16f = FAIL
>+1633 WIN D3D11 AMD : dEQP-GLES3.functional.fbo.color.repeated_clear.blit.tex2d.rg8 = FAIL
>+1633 WIN D3D11 AMD : dEQP-GLES3.functional.fbo.color.repeated_clear.blit.tex2d.rgb10_a2 = FAIL
>+1633 WIN D3D11 AMD : dEQP-GLES3.functional.fbo.color.repeated_clear.blit.tex2d.rgba16f = FAIL
>+1633 WIN D3D11 AMD : dEQP-GLES3.functional.fbo.color.repeated_clear.blit.tex2d.r8 = FAIL
>+1633 WIN D3D11 AMD : dEQP-GLES3.functional.fbo.color.repeated_clear.sample.tex2d.rgba32f = FAIL
>+1633 WIN D3D11 AMD : dEQP-GLES3.functional.fbo.color.repeated_clear.sample.tex2d.rgba16f = FAIL
>+1633 WIN D3D11 AMD : dEQP-GLES3.functional.fbo.color.repeated_clear.sample.tex2d.r11f_g11f_b10f = FAIL
>+1633 WIN D3D11 AMD : dEQP-GLES3.functional.fbo.color.repeated_clear.sample.tex2d.rg32f = FAIL
>+1633 WIN D3D11 AMD : dEQP-GLES3.functional.fbo.color.repeated_clear.sample.tex2d.rg16f = FAIL
>+1633 WIN D3D11 AMD : dEQP-GLES3.functional.fbo.color.repeated_clear.sample.tex2d.r32f = FAIL
>+1633 WIN D3D11 AMD : dEQP-GLES3.functional.fbo.color.repeated_clear.sample.tex2d.r16f = FAIL
>+1633 WIN D3D11 AMD : dEQP-GLES3.functional.fbo.color.repeated_clear.sample.tex2d.rgb16f = FAIL
>+1633 WIN D3D11 AMD : dEQP-GLES3.functional.fbo.color.repeated_clear.sample.tex2d.rg8 = FAIL
>+1633 WIN D3D11 AMD : dEQP-GLES3.functional.fbo.color.repeated_clear.sample.tex2d.r8 = FAIL
>+1633 WIN D3D11 AMD : dEQP-GLES3.functional.fbo.color.repeated_clear.sample.tex2d.rgb10_a2 = FAIL
>+1633 WIN D3D11 AMD : dEQP-GLES3.functional.fbo.render.shared_colorbuffer_clear.tex2d_rgb16f = FAIL
>+1633 WIN D3D11 AMD : dEQP-GLES3.functional.rasterization.fbo.rbo_multisample_max.interpolation.lines = FAIL
>+1633 WIN D3D11 AMD : dEQP-GLES3.functional.rasterization.fbo.rbo_multisample_max.primitives.lines = FAIL
>+1633 WIN D3D11 AMD : dEQP-GLES3.functional.texture.filtering.cube.formats.rgb10_a2_nearest_mipmap_nearest = FAIL
>+1633 WIN D3D11 AMD : dEQP-GLES3.functional.texture.filtering.cube.formats.rgb565_nearest_mipmap_nearest = FAIL
>+1633 WIN D3D11 AMD : dEQP-GLES3.functional.texture.filtering.cube.formats.rgba16f_nearest_mipmap_nearest = FAIL
>+1633 WIN D3D11 AMD : dEQP-GLES3.functional.texture.mipmap.2d.min_lod.nearest_nearest = FAIL
>+1633 WIN D3D11 AMD : dEQP-GLES3.functional.texture.mipmap.2d.min_lod.linear_nearest = FAIL
>+1633 WIN D3D11 AMD : dEQP-GLES3.functional.texture.mipmap.2d.max_lod.nearest_nearest = FAIL
>+1633 WIN D3D11 AMD : dEQP-GLES3.functional.texture.mipmap.2d.max_lod.linear_nearest = FAIL
>+1633 WIN D3D11 AMD : dEQP-GLES3.functional.texture.mipmap.3d.min_lod.nearest_nearest = FAIL
>+1633 WIN D3D11 AMD : dEQP-GLES3.functional.texture.mipmap.3d.min_lod.linear_nearest = FAIL
>+1633 WIN D3D11 AMD : dEQP-GLES3.functional.texture.mipmap.3d.max_lod.nearest_nearest = FAIL
>+1633 WIN D3D11 AMD : dEQP-GLES3.functional.texture.mipmap.3d.max_lod.linear_nearest = FAIL
>+
>+// D3D11 Intel specific
>+
>+1349 D3D11 INTEL : dEQP-GLES3.functional.texture.units.2_units.only_cube.6 = FAIL
>+1349 D3D11 INTEL : dEQP-GLES3.functional.texture.units.2_units.only_2d_array.8 = FAIL
>+1349 D3D11 INTEL : dEQP-GLES3.functional.texture.units.2_units.only_3d.8 = FAIL
>+1349 D3D11 INTEL : dEQP-GLES3.functional.texture.units.2_units.mixed.0 = FAIL
>+1349 D3D11 INTEL : dEQP-GLES3.functional.texture.units.2_units.mixed.8 = FAIL
>+1349 D3D11 INTEL : dEQP-GLES3.functional.texture.units.2_units.mixed.9 = FAIL
>+1349 D3D11 INTEL : dEQP-GLES3.functional.texture.units.4_units.only_3d.3 = FAIL
>+2349 D3D11 INTEL : dEQP-GLES3.functional.texture.mipmap.2d.min_lod.nearest_nearest = FAIL
>+2349 D3D11 INTEL : dEQP-GLES3.functional.texture.mipmap.2d.min_lod.linear_nearest = FAIL
>+2349 D3D11 INTEL : dEQP-GLES3.functional.texture.mipmap.3d.min_lod.nearest_nearest = FAIL
>+2349 D3D11 INTEL : dEQP-GLES3.functional.texture.mipmap.3d.min_lod.linear_nearest = FAIL
>+2349 D3D11 INTEL : dEQP-GLES3.functional.rasterization.fbo.rbo_multisample_4.primitives.lines = FAIL
>+2349 D3D11 INTEL : dEQP-GLES3.functional.rasterization.fbo.rbo_multisample_4.interpolation.lines = FAIL
>+2349 D3D11 INTEL : dEQP-GLES3.functional.rasterization.fbo.rbo_multisample_max.primitives.lines = FAIL
>+2349 D3D11 INTEL : dEQP-GLES3.functional.rasterization.fbo.rbo_multisample_max.interpolation.lines = FAIL
>+
>+// Failing Tests on Windows and Mac on Intel HD 630
>+2137 WIN INTEL : dEQP-GLES3.functional.fbo.color.repeated_clear.sample.tex2d.* = FAIL
>+2137 MAC INTEL : dEQP-GLES3.functional.fbo.color.repeated_clear.sample.tex2d.* = FAIL
>+
>+// Linux only failures
>+
>+// UBO tests trigger crashes when getting the program info log, skip them until this is fixed.
>+1323 LINUX OPENGL : dEQP-GLES3.functional.ubo.* = SKIP
>+
>+1323 LINUX OPENGL : dEQP-GLES3.functional.fbo.depth.depth_test_clamp.depth_component32f = FAIL
>+1323 LINUX OPENGL : dEQP-GLES3.functional.fbo.depth.depth_test_clamp.depth32f_stencil8 = FAIL
>+1323 LINUX OPENGL : dEQP-GLES3.functional.fbo.depth.depth_write_clamp.depth_component32f = FAIL
>+1323 LINUX OPENGL : dEQP-GLES3.functional.fbo.depth.depth_write_clamp.depth32f_stencil8 = FAIL
>+1323 LINUX OPENGL : dEQP-GLES3.functional.rasterization.fbo.rbo_multisample_max.primitives.points = FAIL
>+
>+// While loops with 'continue' seem flaky on Linux. (Possibly all GL renderers)
>+1324 LINUX OPENGL : dEQP-GLES3.functional.shaders.loops.while_constant_iterations.conditional_continue_vertex = FAIL
>+1324 LINUX OPENGL : dEQP-GLES3.functional.shaders.loops.while_constant_iterations.conditional_continue_fragment = FAIL
>+1324 LINUX OPENGL : dEQP-GLES3.functional.shaders.loops.while_constant_iterations.unconditional_continue_vertex = FAIL
>+1324 LINUX OPENGL : dEQP-GLES3.functional.shaders.loops.while_constant_iterations.unconditional_continue_fragment = FAIL
>+1324 LINUX OPENGL : dEQP-GLES3.functional.shaders.loops.while_constant_iterations.only_continue_vertex = FAIL
>+1324 LINUX OPENGL : dEQP-GLES3.functional.shaders.loops.while_constant_iterations.only_continue_fragment = FAIL
>+1324 LINUX OPENGL : dEQP-GLES3.functional.shaders.loops.while_constant_iterations.double_continue_vertex = FAIL
>+1324 LINUX OPENGL : dEQP-GLES3.functional.shaders.loops.while_constant_iterations.double_continue_fragment = FAIL
>+1324 LINUX OPENGL : dEQP-GLES3.functional.shaders.loops.while_constant_iterations.mixed_break_continue_vertex = FAIL
>+1324 LINUX OPENGL : dEQP-GLES3.functional.shaders.loops.while_constant_iterations.mixed_break_continue_fragment = FAIL
>+1324 LINUX OPENGL : dEQP-GLES3.functional.shaders.loops.while_uniform_iterations.conditional_continue_vertex = FAIL
>+1324 LINUX OPENGL : dEQP-GLES3.functional.shaders.loops.while_uniform_iterations.conditional_continue_fragment = FAIL
>+1324 LINUX OPENGL : dEQP-GLES3.functional.shaders.loops.while_uniform_iterations.unconditional_continue_vertex = FAIL
>+1324 LINUX OPENGL : dEQP-GLES3.functional.shaders.loops.while_uniform_iterations.unconditional_continue_fragment = FAIL
>+1324 LINUX OPENGL : dEQP-GLES3.functional.shaders.loops.while_uniform_iterations.only_continue_vertex = FAIL
>+1324 LINUX OPENGL : dEQP-GLES3.functional.shaders.loops.while_uniform_iterations.only_continue_fragment = FAIL
>+1324 LINUX OPENGL : dEQP-GLES3.functional.shaders.loops.while_uniform_iterations.double_continue_vertex = FAIL
>+1324 LINUX OPENGL : dEQP-GLES3.functional.shaders.loops.while_uniform_iterations.double_continue_fragment = FAIL
>+1324 LINUX OPENGL : dEQP-GLES3.functional.shaders.loops.while_uniform_iterations.mixed_break_continue_vertex = FAIL
>+1324 LINUX OPENGL : dEQP-GLES3.functional.shaders.loops.while_uniform_iterations.mixed_break_continue_fragment = FAIL
>+1324 LINUX OPENGL : dEQP-GLES3.functional.shaders.loops.while_dynamic_iterations.conditional_continue_vertex = FAIL
>+1324 LINUX OPENGL : dEQP-GLES3.functional.shaders.loops.while_dynamic_iterations.conditional_continue_fragment = FAIL
>+1324 LINUX OPENGL : dEQP-GLES3.functional.shaders.loops.while_dynamic_iterations.unconditional_continue_vertex = FAIL
>+1324 LINUX OPENGL : dEQP-GLES3.functional.shaders.loops.while_dynamic_iterations.unconditional_continue_fragment = FAIL
>+1324 LINUX OPENGL : dEQP-GLES3.functional.shaders.loops.while_dynamic_iterations.only_continue_vertex = FAIL
>+1324 LINUX OPENGL : dEQP-GLES3.functional.shaders.loops.while_dynamic_iterations.only_continue_fragment = FAIL
>+1324 LINUX OPENGL : dEQP-GLES3.functional.shaders.loops.while_dynamic_iterations.double_continue_vertex = FAIL
>+1324 LINUX OPENGL : dEQP-GLES3.functional.shaders.loops.while_dynamic_iterations.double_continue_fragment = FAIL
>+1324 LINUX OPENGL : dEQP-GLES3.functional.shaders.loops.while_dynamic_iterations.mixed_break_continue_vertex = FAIL
>+1324 LINUX OPENGL : dEQP-GLES3.functional.shaders.loops.while_dynamic_iterations.mixed_break_continue_fragment = FAIL
>+1324 LINUX OPENGL : dEQP-GLES3.functional.shaders.loops.do_while_constant_iterations.conditional_continue_vertex = FAIL
>+1324 LINUX OPENGL : dEQP-GLES3.functional.shaders.loops.do_while_constant_iterations.conditional_continue_fragment = FAIL
>+1324 LINUX OPENGL : dEQP-GLES3.functional.shaders.loops.do_while_constant_iterations.unconditional_continue_vertex = FAIL
>+1324 LINUX OPENGL : dEQP-GLES3.functional.shaders.loops.do_while_constant_iterations.unconditional_continue_fragment = FAIL
>+1324 LINUX OPENGL : dEQP-GLES3.functional.shaders.loops.do_while_constant_iterations.only_continue_vertex = FAIL
>+1324 LINUX OPENGL : dEQP-GLES3.functional.shaders.loops.do_while_constant_iterations.only_continue_fragment = FAIL
>+1324 LINUX OPENGL : dEQP-GLES3.functional.shaders.loops.do_while_constant_iterations.double_continue_vertex = FAIL
>+1324 LINUX OPENGL : dEQP-GLES3.functional.shaders.loops.do_while_constant_iterations.double_continue_fragment = FAIL
>+1324 LINUX OPENGL : dEQP-GLES3.functional.shaders.loops.do_while_constant_iterations.mixed_break_continue_vertex = FAIL
>+1324 LINUX OPENGL : dEQP-GLES3.functional.shaders.loops.do_while_constant_iterations.mixed_break_continue_fragment = FAIL
>+1324 LINUX OPENGL : dEQP-GLES3.functional.shaders.loops.do_while_uniform_iterations.conditional_continue_vertex = FAIL
>+1324 LINUX OPENGL : dEQP-GLES3.functional.shaders.loops.do_while_uniform_iterations.conditional_continue_fragment = FAIL
>+1324 LINUX OPENGL : dEQP-GLES3.functional.shaders.loops.do_while_uniform_iterations.unconditional_continue_vertex = FAIL
>+1324 LINUX OPENGL : dEQP-GLES3.functional.shaders.loops.do_while_uniform_iterations.unconditional_continue_fragment = FAIL
>+1324 LINUX OPENGL : dEQP-GLES3.functional.shaders.loops.do_while_uniform_iterations.only_continue_vertex = FAIL
>+1324 LINUX OPENGL : dEQP-GLES3.functional.shaders.loops.do_while_uniform_iterations.only_continue_fragment = FAIL
>+1324 LINUX OPENGL : dEQP-GLES3.functional.shaders.loops.do_while_uniform_iterations.double_continue_vertex = FAIL
>+1324 LINUX OPENGL : dEQP-GLES3.functional.shaders.loops.do_while_uniform_iterations.double_continue_fragment = FAIL
>+1324 LINUX OPENGL : dEQP-GLES3.functional.shaders.loops.do_while_uniform_iterations.mixed_break_continue_vertex = FAIL
>+1324 LINUX OPENGL : dEQP-GLES3.functional.shaders.loops.do_while_uniform_iterations.mixed_break_continue_fragment = FAIL
>+1324 LINUX OPENGL : dEQP-GLES3.functional.shaders.loops.do_while_dynamic_iterations.conditional_continue_vertex = FAIL
>+1324 LINUX OPENGL : dEQP-GLES3.functional.shaders.loops.do_while_dynamic_iterations.conditional_continue_fragment = FAIL
>+1324 LINUX OPENGL : dEQP-GLES3.functional.shaders.loops.do_while_dynamic_iterations.unconditional_continue_vertex = FAIL
>+1324 LINUX OPENGL : dEQP-GLES3.functional.shaders.loops.do_while_dynamic_iterations.unconditional_continue_fragment = FAIL
>+1324 LINUX OPENGL : dEQP-GLES3.functional.shaders.loops.do_while_dynamic_iterations.only_continue_vertex = FAIL
>+1324 LINUX OPENGL : dEQP-GLES3.functional.shaders.loops.do_while_dynamic_iterations.only_continue_fragment = FAIL
>+1324 LINUX OPENGL : dEQP-GLES3.functional.shaders.loops.do_while_dynamic_iterations.double_continue_vertex = FAIL
>+1324 LINUX OPENGL : dEQP-GLES3.functional.shaders.loops.do_while_dynamic_iterations.double_continue_fragment = FAIL
>+1324 LINUX OPENGL : dEQP-GLES3.functional.shaders.loops.do_while_dynamic_iterations.mixed_break_continue_vertex = FAIL
>+1324 LINUX OPENGL : dEQP-GLES3.functional.shaders.loops.do_while_dynamic_iterations.mixed_break_continue_fragment = FAIL
>+
>+// Polygon offset failures
>+3304 LINUX OPENGL : dEQP-GLES3.functional.polygon_offset.float32_factor_1_slope = FAIL
>+3304 LINUX OPENGL : dEQP-GLES3.functional.polygon_offset.float32_result_depth_clamp = FAIL
>+
>+// Flaky test
>+3305 LINUX OPENGL : dEQP-GLES3.functional.shaders.builtin_functions.common.uintbitstofloat.uint_highp_vertex = FAIL
>+
>+// Linux Intel specific
>+2349 LINUX OPENGL INTEL : dEQP-GLES3.functional.fbo.blit.default_framebuffer* = FAIL
>+
>+// Mac failures (overbroad suppresions)
>+2137 MAC OPENGL : dEQP-GLES3.functional.fbo.blit.default_framebuffer.* = FAIL
>+2137 MAC OPENGL : dEQP-GLES3.functional.fbo.blit.rect.out_of_bounds_reverse_* = FAIL
>+2137 MAC OPENGL : dEQP-GLES3.functional.implementation_limits.compressed_texture_formats = FAIL
>+2137 MAC OPENGL : dEQP-GLES3.functional.implementation_limits.num_compressed_texture_formats = FAIL
>+2137 MAC OPENGL : dEQP-GLES3.functional.primitive_restart.* = FAIL
>+2137 MAC OPENGL : dEQP-GLES3.functional.shaders.linkage.varying.rules.vertex_declare_fragment_use = FAIL
>+2137 MAC OPENGL : dEQP-GLES3.functional.shaders.scoping.valid.function_parameter_hides_struct_type_fragment = FAIL
>+2137 MAC OPENGL : dEQP-GLES3.functional.shaders.scoping.valid.function_parameter_hides_struct_type_vertex = FAIL
>+2137 MAC OPENGL : dEQP-GLES3.functional.shaders.scoping.valid.local_int_variable_hides_struct_type_fragment = FAIL
>+2137 MAC OPENGL : dEQP-GLES3.functional.shaders.scoping.valid.local_int_variable_hides_struct_type_vertex = FAIL
>+2137 MAC OPENGL : dEQP-GLES3.functional.shaders.scoping.valid.local_struct_variable_hides_struct_type_fragment = FAIL
>+2137 MAC OPENGL : dEQP-GLES3.functional.shaders.scoping.valid.local_struct_variable_hides_struct_type_vertex = FAIL
>+2137 MAC OPENGL : dEQP-GLES3.functional.state_query.integers.compressed_texture_formats_getfloat = FAIL
>+2137 MAC OPENGL : dEQP-GLES3.functional.state_query.integers.compressed_texture_formats_getinteger = FAIL
>+2137 MAC OPENGL : dEQP-GLES3.functional.state_query.integers.compressed_texture_formats_getinteger64 = FAIL
>+2137 MAC OPENGL : dEQP-GLES3.functional.dither.disabled.* = FAIL
>+2137 MAC OPENGL : dEQP-GLES3.functional.fragment_ops.depth_stencil.stencil_depth_funcs.stencil_* = FAIL
>+2137 MAC OPENGL : dEQP-GLES3.functional.shaders.arrays.complex_expression.and_short_circuits_* = FAIL
>+2137 MAC OPENGL : dEQP-GLES3.functional.shaders.arrays.complex_expression.or_short_circuits_* = FAIL
>+2137 MAC OPENGL : dEQP-GLES3.functional.shaders.fragdata.valid_static_index = FAIL
>+2137 MAC OPENGL : dEQP-GLES3.functional.shaders.loops.short_circuit.* = FAIL
>+3317 MAC OPENGL : dEQP-GLES3.functional.fbo.blit.rect.out_of_bounds_linear = FAIL
>+
>+// Mac AMD failures
>+2137 MAC OPENGL AMD : dEQP-GLES3.functional.clipping.point.wide_point_clip = FAIL
>+2137 MAC OPENGL AMD : dEQP-GLES3.functional.clipping.point.wide_point_clip_viewport_center = FAIL
>+2137 MAC OPENGL AMD : dEQP-GLES3.functional.clipping.point.wide_point_clip_viewport_corner = FAIL
>+2137 MAC OPENGL AMD : dEQP-GLES3.functional.fbo.blit.rect.out_of_bounds_nearest = FAIL
>+2137 MAC OPENGL AMD : dEQP-GLES3.functional.shaders.builtin_functions.precision.tanh.highp_* = FAIL
>+2137 MAC OPENGL AMD : dEQP-GLES3.functional.texture.mipmap.2d.projected.* = FAIL
>+2137 MAC OPENGL AMD : dEQP-GLES3.functional.transform_feedback.* = FAIL
>+
>+3317 MAC OPENGL AMD : dEQP-GLES3.functional.shaders.builtin_functions.precision.ceil.* = FAIL
>+3317 MAC OPENGL AMD : dEQP-GLES3.functional.shaders.texture_functions.textureprojlod.isampler3d_vertex = FAIL
>+3317 MAC OPENGL AMD : dEQP-GLES3.functional.shaders.texture_functions.textureprojlod.usampler3d_vertex = FAIL
>+
>+// Mac Intel crashes
>+2137 MAC OPENGL INTEL : dEQP-GLES3.functional.shaders.discard.function_static_loop_never = SKIP
>+2137 MAC OPENGL INTEL : dEQP-GLES3.functional.shaders.discard.dynamic_loop_never = SKIP
>+2137 MAC OPENGL INTEL : dEQP-GLES3.functional.shaders.discard.static_loop_never = SKIP
>+
>+// Mac Intel failures
>+2137 MAC OPENGL INTEL : dEQP-GLES3.functional.color_clear.* = FAIL
>+// All the out of bounds variants fail.
>+2137 MAC OPENGL INTEL : dEQP-GLES3.functional.fbo.blit.rect.nearest_consistency_mag_reverse_src_dst_y = FAIL
>+2137 MAC OPENGL INTEL : dEQP-GLES3.functional.fbo.blit.rect.nearest_consistency_min_reverse_src_dst_y = FAIL
>+// Fails for all integer formats
>+2137 MAC OPENGL INTEL : dEQP-GLES3.functional.fbo.completeness.attachment_combinations.none_rbo_none_none = FAIL
>+2137 MAC OPENGL INTEL : dEQP-GLES3.functional.fbo.completeness.attachment_combinations.none_tex_none_none = FAIL
>+2137 MAC OPENGL INTEL : dEQP-GLES3.functional.polygon_offset.default_render_with_units = FAIL
>+2137 MAC OPENGL INTEL : dEQP-GLES3.functional.polygon_offset.fixed16_render_with_units = FAIL
>+2137 MAC OPENGL INTEL : dEQP-GLES3.functional.polygon_offset.fixed24_render_with_units = FAIL
>+2137 MAC OPENGL INTEL : dEQP-GLES3.functional.shaders.builtin_functions.precision.cos.highp_* = FAIL
>+2137 MAC OPENGL INTEL : dEQP-GLES3.functional.shaders.builtin_functions.precision.sin.highp_* = FAIL
>+2137 MAC OPENGL INTEL : dEQP-GLES3.functional.shaders.invariance.lowp.common_subexpression_1 = FAIL
>+2137 MAC OPENGL INTEL : dEQP-GLES3.functional.shaders.invariance.lowp.common_subexpression_3 = FAIL
>+2137 MAC OPENGL INTEL : dEQP-GLES3.functional.shaders.invariance.mediump.common_subexpression_1 = FAIL
>+2137 MAC OPENGL INTEL : dEQP-GLES3.functional.shaders.invariance.mediump.common_subexpression_3 = FAIL
>+2137 MAC OPENGL INTEL : dEQP-GLES3.functional.shaders.invariance.highp.common_subexpression_1 = FAIL
>+2137 MAC OPENGL INTEL : dEQP-GLES3.functional.shaders.invariance.highp.common_subexpression_3 = FAIL
>+2137 MAC OPENGL INTEL : dEQP-GLES3.functional.shaders.texture_functions.texelfetchoffset.usampler2d_fragment = FAIL
>+2137 MAC OPENGL INTEL : dEQP-GLES3.functional.shaders.texture_functions.texelfetchoffset.usampler2d_vertex  = FAIL
>+2137 MAC OPENGL INTEL : dEQP-GLES3.functional.shaders.texture_functions.texturegradoffset.usampler3d_fragment  = FAIL
>+2137 MAC OPENGL INTEL : dEQP-GLES3.functional.shaders.texture_functions.texturegrad.usampler3d_fragment  = FAIL
>+2137 MAC OPENGL INTEL : dEQP-GLES3.functional.shaders.texture_functions.texturegrad.usamplercube_fragment  = FAIL
>+2137 MAC OPENGL INTEL : dEQP-GLES3.functional.shaders.texture_functions.texturegrad.usamplercube_vertex  = FAIL
>+2137 MAC OPENGL INTEL : dEQP-GLES3.functional.shaders.texture_functions.texturelod.usamplercube_fragment  = FAIL
>+2137 MAC OPENGL INTEL : dEQP-GLES3.functional.shaders.texture_functions.texturelod.usamplercube_vertex  = FAIL
>+2137 MAC OPENGL INTEL : dEQP-GLES3.functional.shaders.texture_functions.textureprojgradoffset.usampler3d_fragment  = FAIL
>+2137 MAC OPENGL INTEL : dEQP-GLES3.functional.shaders.texture_functions.textureprojgrad.usampler3d_fragment  = FAIL
>+// Fails the integer npot cases = FAIL
>+2137 MAC OPENGL INTEL : dEQP-GLES3.functional.texture.format.sized.cube.* = FAIL
>+2137 MAC OPENGL INTEL : dEQP-GLES3.functional.texture.specification.basic_copyteximage2d.cube_alpha = FAIL
>+2137 MAC OPENGL INTEL : dEQP-GLES3.functional.texture.specification.basic_copyteximage2d.cube_luminance = FAIL
>+2137 MAC OPENGL INTEL : dEQP-GLES3.functional.texture.specification.basic_copyteximage2d.cube_luminance_alpha = FAIL
>+2137 MAC OPENGL INTEL : dEQP-GLES3.functional.texture.specification.basic_copyteximage2d.cube_rgb = FAIL
>+2137 MAC OPENGL INTEL : dEQP-GLES3.functional.texture.specification.basic_copyteximage2d.cube_rgba = FAIL
>+2137 MAC OPENGL INTEL : dEQP-GLES3.functional.texture.specification.random_teximage2d.2d_5 = FAIL
>+2137 MAC OPENGL INTEL : dEQP-GLES3.functional.texture.specification.teximage3d_* = FAIL
>+2137 MAC OPENGL INTEL : dEQP-GLES3.functional.texture.specification.texsubimage3d_* = FAIL
>+2137 MAC OPENGL INTEL : dEQP-GLES3.functional.ubo.* = FAIL
>+2137 MAC OPENGL INTEL : dEQP-GLES3.functional.shaders.texture_functions.texelfetchoffset.* = FAIL
>+
>+3317 MAC OPENGL INTEL : dEQP-GLES3.functional.fbo.blit.rect.nearest_consistency_mag = FAIL
>+3317 MAC OPENGL INTEL : dEQP-GLES3.functional.fbo.blit.rect.nearest_consistency_mag_reverse_src_x = FAIL
>+3317 MAC OPENGL INTEL : dEQP-GLES3.functional.fbo.blit.rect.nearest_consistency_mag_reverse_dst_x = FAIL
>+3317 MAC OPENGL INTEL : dEQP-GLES3.functional.fbo.blit.rect.nearest_consistency_mag_reverse_src_dst_x = FAIL
>+3317 MAC OPENGL INTEL : dEQP-GLES3.functional.fbo.blit.rect.nearest_consistency_min = FAIL
>+3317 MAC OPENGL INTEL : dEQP-GLES3.functional.fbo.blit.rect.nearest_consistency_min_reverse_src_x = FAIL
>+3317 MAC OPENGL INTEL : dEQP-GLES3.functional.fbo.blit.rect.nearest_consistency_min_reverse_dst_x = FAIL
>+3317 MAC OPENGL INTEL : dEQP-GLES3.functional.fbo.blit.rect.nearest_consistency_min_reverse_src_dst_x = FAIL
>+3317 MAC OPENGL INTEL : dEQP-GLES3.functional.fbo.blit.rect.nearest_consistency_out_of_bounds_mag = FAIL
>+3317 MAC OPENGL INTEL : dEQP-GLES3.functional.fbo.blit.rect.nearest_consistency_out_of_bounds_mag_reverse_src_x = FAIL
>+3317 MAC OPENGL INTEL : dEQP-GLES3.functional.fbo.blit.rect.nearest_consistency_out_of_bounds_mag_reverse_dst_x = FAIL
>+3317 MAC OPENGL INTEL : dEQP-GLES3.functional.fbo.blit.rect.nearest_consistency_out_of_bounds_mag_reverse_src_dst_x = FAIL
>+3317 MAC OPENGL INTEL : dEQP-GLES3.functional.fbo.blit.rect.nearest_consistency_out_of_bounds_mag_reverse_src_dst_y = FAIL
>+3317 MAC OPENGL INTEL : dEQP-GLES3.functional.texture.filtering.2d_array.combinations.linear_nearest_* = FAIL
>+3317 MAC OPENGL INTEL : dEQP-GLES3.functional.texture.filtering.2d.combinations.linear_nearest_* = FAIL
>+3317 MAC OPENGL INTEL : dEQP-GLES3.functional.texture.filtering.3d.combinations.linear_nearest_* = FAIL
>+3317 MAC OPENGL INTEL : dEQP-GLES3.functional.texture.filtering.cube.combinations.linear_nearest_* = FAIL
>+3317 MAC OPENGL INTEL : dEQP-GLES3.functional.texture.mipmap.cube.max_level.linear_nearest = FAIL
>+3317 MAC OPENGL INTEL : dEQP-GLES3.functional.texture.vertex.2d_array.filtering.linear_nearest_* = FAIL
>+3317 MAC OPENGL INTEL : dEQP-GLES3.functional.texture.vertex.2d.filtering.linear_nearest_* = FAIL
>+3317 MAC OPENGL INTEL : dEQP-GLES3.functional.texture.vertex.3d.filtering.linear_nearest_* = FAIL
>+3317 MAC OPENGL INTEL : dEQP-GLES3.functional.texture.vertex.cube.filtering.linear_nearest_* = FAIL
>+
>+// Android only failures
>+1487 ANDROID GLES : dEQP-GLES3.functional.fbo.completeness.renderable.texture.color0.red_half_float_oes = FAIL
>+1487 ANDROID GLES : dEQP-GLES3.functional.fbo.completeness.renderable.texture.color0.rg_half_float_oes = FAIL
>+1487 ANDROID GLES : dEQP-GLES3.functional.fbo.completeness.renderable.texture.stencil.depth_stencil_unsigned_int_24_8 = FAIL
>+1487 ANDROID GLES : dEQP-GLES3.functional.fbo.completeness.renderable.texture.depth.depth_stencil_unsigned_int_24_8 = FAIL
>+1487 ANDROID GLES : dEQP-GLES3.functional.fbo.completeness.renderable.texture.depth.depth_component_unsigned_short = FAIL
>+1487 ANDROID GLES : dEQP-GLES3.functional.fbo.completeness.renderable.texture.depth.depth_component_unsigned_int = FAIL
>+1964 ANDROID GLES : dEQP-GLES3.functional.occlusion_query.* = FAIL
>+1962 ANDROID GLES : dEQP-GLES3.functional.shaders.preprocessor.conditional_inclusion.basic_2_fragment = FAIL
>+1962 ANDROID GLES : dEQP-GLES3.functional.shaders.preprocessor.conditional_inclusion.basic_2_vertex = FAIL
>+1962 ANDROID GLES : dEQP-GLES3.functional.shaders.preprocessor.conditional_inclusion.defined_macro_undef_fragment = FAIL
>+1962 ANDROID GLES : dEQP-GLES3.functional.shaders.preprocessor.conditional_inclusion.defined_macro_undef_vertex = FAIL
>+1963 ANDROID GLES : dEQP-GLES3.functional.shaders.return.conditional_return_always_fragment = FAIL
>+1963 ANDROID GLES : dEQP-GLES3.functional.shaders.return.conditional_return_always_vertex = FAIL
>+1963 ANDROID GLES : dEQP-GLES3.functional.shaders.return.output_write_always_fragment = FAIL
>+1963 ANDROID GLES : dEQP-GLES3.functional.shaders.return.output_write_always_vertex = FAIL
>+1963 ANDROID GLES : dEQP-GLES3.functional.shaders.return.output_write_in_func_always_fragment = FAIL
>+1963 ANDROID GLES : dEQP-GLES3.functional.shaders.return.output_write_in_func_always_vertex = FAIL
>+1529 ANDROID GLES : dEQP-GLES3.functional.texture.mipmap.2d.generate.a8_* = FAIL
>+1529 ANDROID GLES : dEQP-GLES3.functional.texture.mipmap.2d.generate.l8_* = FAIL
>+1529 ANDROID GLES : dEQP-GLES3.functional.texture.mipmap.2d.generate.la88_* = FAIL
>+1529 ANDROID GLES : dEQP-GLES3.functional.texture.mipmap.cube.generate.a8_* = FAIL
>+1529 ANDROID GLES : dEQP-GLES3.functional.texture.mipmap.cube.generate.l8_* = FAIL
>+1529 ANDROID GLES : dEQP-GLES3.functional.texture.mipmap.cube.generate.la88_* = FAIL
>+1531 ANDROID GLES : dEQP-GLES3.functional.transform_feedback.basic_types.interleaved.* = FAIL
>+1531 ANDROID GLES : dEQP-GLES3.functional.transform_feedback.basic_types.separate.* = FAIL
>+1531 ANDROID GLES : dEQP-GLES3.functional.transform_feedback.interpolation.* = FAIL
>+1531 ANDROID GLES : dEQP-GLES3.functional.transform_feedback.point_size.* = FAIL
>+1531 ANDROID GLES : dEQP-GLES3.functional.transform_feedback.position.* = FAIL
>+1531 ANDROID GLES : dEQP-GLES3.functional.transform_feedback.random.interleaved.lines.5 = FAIL
>+1531 ANDROID GLES : dEQP-GLES3.functional.transform_feedback.random.interleaved.lines.8 = FAIL
>+1531 ANDROID GLES : dEQP-GLES3.functional.transform_feedback.random.interleaved.lines.10 = FAIL
>+1531 ANDROID GLES : dEQP-GLES3.functional.transform_feedback.random.interleaved.points.6 = FAIL
>+1531 ANDROID GLES : dEQP-GLES3.functional.transform_feedback.random.interleaved.points.7 = FAIL
>+1531 ANDROID GLES : dEQP-GLES3.functional.transform_feedback.random.interleaved.triangles.2 = FAIL
>+1531 ANDROID GLES : dEQP-GLES3.functional.transform_feedback.random.separate.lines.4 = FAIL
>+1531 ANDROID GLES : dEQP-GLES3.functional.transform_feedback.random.separate.lines.6 = FAIL
>+1531 ANDROID GLES : dEQP-GLES3.functional.transform_feedback.random.separate.lines.8 = FAIL
>+1531 ANDROID GLES : dEQP-GLES3.functional.transform_feedback.random.separate.points.4 = FAIL
>+1531 ANDROID GLES : dEQP-GLES3.functional.transform_feedback.random.separate.triangles.4 = FAIL
>+2629 ANDROID GLES : dEQP-GLES3.functional.shaders.struct.local.array_member_equality_fragment = SKIP
>+2629 ANDROID GLES : dEQP-GLES3.functional.shaders.struct.local.array_member_equality_vertex = SKIP
>+2627 ANDROID GLES : dEQP-GLES3.functional.shaders.arrays.complex_expression.and_short_circuits_* = FAIL
>+2627 ANDROID GLES : dEQP-GLES3.functional.shaders.arrays.complex_expression.or_short_circuits_* = FAIL
>+2628 ANDROID GLES : dEQP-GLES3.functional.shaders.indexing.moredynamic.user_defined_fncall_inout_parameter_fragment = FAIL
>+2628 ANDROID GLES : dEQP-GLES3.functional.shaders.indexing.moredynamic.user_defined_fncall_inout_parameter_with_index_with_side_effects_fragment = FAIL
>+2628 ANDROID GLES : dEQP-GLES3.functional.shaders.indexing.moredynamic.user_defined_fncall_out_parameter_fragment = FAIL
>+2627 ANDROID GLES : dEQP-GLES3.functional.shaders.loops.short_circuit.* = FAIL
>+
>+2567 ANDROID GLES : dEQP-GLES3.functional.fbo.completeness.renderable.texture.depth.red_unsigned_byte = FAIL
>+2567 ANDROID GLES : dEQP-GLES3.functional.fbo.completeness.renderable.texture.depth.rg_unsigned_byte = FAIL
>+2567 ANDROID GLES : dEQP-GLES3.functional.fbo.completeness.renderable.texture.stencil.red_unsigned_byte = FAIL
>+2567 ANDROID GLES : dEQP-GLES3.functional.fbo.completeness.renderable.texture.stencil.rg_unsigned_byte = FAIL
>+
>+// Nexus 5x failures
>+3308 NEXUS5X GLES : dEQP-GLES3.functional.polygon_offset.default_result_depth_clamp = FAIL
>+3308 NEXUS5X GLES : dEQP-GLES3.functional.polygon_offset.fixed24_result_depth_clamp = FAIL
>+3308 NEXUS5X GLES : dEQP-GLES3.functional.transform_feedback.random.interleaved.lines.3 = FAIL
>+3308 NEXUS5X GLES : dEQP-GLES3.functional.transform_feedback.random.interleaved.triangles.8 = FAIL
>+3308 NEXUS5X GLES : dEQP-GLES3.functional.transform_feedback.random.interleaved.triangles.10 = FAIL
>+
>+// Seems to fail on all desktop GL
>+2960 OPENGL : dEQP-GLES3.functional.fbo.blit.default_framebuffer.srgb8_alpha8 = FAIL
>+2960 OPENGL : dEQP-GLES3.functional.fbo.blit.default_framebuffer.srgb8_alpha8_linear_out_of_bounds_blit_to_default = FAIL
>+2960 OPENGL : dEQP-GLES3.functional.fbo.blit.default_framebuffer.srgb8_alpha8_linear_scale_blit_to_default = FAIL
>+2960 OPENGL : dEQP-GLES3.functional.fbo.blit.default_framebuffer.srgb8_alpha8_nearest_scale_blit_to_default = FAIL
>+
>+// Fails on Windows + Linux.
>+2222 OPENGL NVIDIA : dEQP-GLES3.functional.fbo.completeness.samples.rbo2_rbo2_rbo0 = FAIL
>+
>+// General Vulkan failures
>+
>+// Limits:
>+2950 VULKAN : dEQP-GLES3.functional.implementation_limits.max_elements* = SKIP
>+2950 VULKAN : dEQP-GLES3.functional.implementation_limits.compressed_texture_formats = SKIP
>+2950 VULKAN : dEQP-GLES3.functional.implementation_limits.num_compressed_texture_formats = SKIP
>+2950 VULKAN : dEQP-GLES3.functional.implementation_limits.max_vertex_uniform_blocks = SKIP
>+2950 VULKAN : dEQP-GLES3.functional.implementation_limits.max_fragment_uniform_blocks = SKIP
>+2950 VULKAN : dEQP-GLES3.functional.implementation_limits.max_fragment_input_components = SKIP
>+2950 VULKAN : dEQP-GLES3.functional.implementation_limits.max_program_texel_offset = SKIP
>+2950 VULKAN : dEQP-GLES3.functional.implementation_limits.min_program_texel_offset = SKIP
>+2950 VULKAN : dEQP-GLES3.functional.implementation_limits.max_uniform_buffer_bindings = SKIP
>+2950 VULKAN : dEQP-GLES3.functional.implementation_limits.max_uniform_block_size = SKIP
>+2950 VULKAN : dEQP-GLES3.functional.implementation_limits.max_combined_vertex_uniform_components = SKIP
>+2950 VULKAN : dEQP-GLES3.functional.implementation_limits.max_combined_fragment_uniform_components = SKIP
>+2950 VULKAN : dEQP-GLES3.functional.implementation_limits.max_combined_uniform_blocks = SKIP
>+2950 VULKAN : dEQP-GLES3.functional.implementation_limits.max_transform_feedback_* = SKIP
>+
>+// 3D texture (anglebug.com/3188), 2D array (anglebug.com/3189):
>+3189 VULKAN : dEQP-GLES3.functional.shaders.texture_functions.texturegrad.sampler2darrayshadow_vertex = SKIP
>+3189 VULKAN : dEQP-GLES3.functional.fbo.completeness.layer.2darr* = SKIP
>+3189 VULKAN : dEQP-GLES3.functional.fbo.completeness.layer.* = SKIP
>+3189 VULKAN : dEQP-GLES3.functional.fbo.color.tex2darray.* = SKIP
>+3189 VULKAN : dEQP-GLES3.functional.fbo.color.tex3d.* = SKIP
>+3189 VULKAN : dEQP-GLES3.functional.texture.* = SKIP
>+
>+// Multisampling:
>+3204 VULKAN : dEQP-GLES3.functional.fbo.completeness.samples.* = SKIP
>+3204 VULKAN : dEQP-GLES3.functional.fbo.msaa.* = SKIP
>+3204 VULKAN : dEQP-GLES3.functional.negative_api.buffer.read_pixels_fbo_format_mismatch = SKIP
>+3204 VULKAN : dEQP-GLES3.functional.negative_api.buffer.blit_framebuffer_multisample = SKIP
>+3204 VULKAN : dEQP-GLES3.functional.multisample.* = SKIP
>+3204 VULKAN : dEQP-GLES3.functional.state_query.rbo.renderbuffer_samples = SKIP
>+3204 VULKAN : dEQP-GLES3.functional.fragment_out.* = SKIP
>+3204 VULKAN : dEQP-GLES3.functional.rasterization.fbo.rbo_multisample* = SKIP
>+
>+// Formats:
>+2950 VULKAN : dEQP-GLES3.functional.fbo.completeness.renderable.renderbuffer.color0.rgba32f = FAIL
>+2950 VULKAN : dEQP-GLES3.functional.fbo.completeness.renderable.texture.color0.rgba32f = FAIL
>+
>+// Depth/Stencil textures:
>+2905 VULKAN : dEQP-GLES3.functional.fbo.completeness.renderable.texture.depth.depth_component_unsigned_int = FAIL
>+2905 VULKAN : dEQP-GLES3.functional.fbo.render.resize.tex2d_rgba8_depth_tex2d_depth_component16 = SKIP
>+2905 VULKAN : dEQP-GLES3.functional.fbo.render.resize.tex2d_rgba8_depth_tex2d_depth_component24 = SKIP
>+2905 VULKAN : dEQP-GLES3.functional.fbo.render.resize.tex2d_rgba8_depth_tex2d_depth_component32f = SKIP
>+2905 VULKAN : dEQP-GLES3.functional.fbo.render.resize.tex2d_rgba8_depth_stencil_tex2d_depth24_stencil8 = SKIP
>+2905 VULKAN : dEQP-GLES3.functional.fbo.render.resize.tex2d_rgba8_depth_stencil_tex2d_depth32f_stencil8 = SKIP
>+2905 VULKAN : dEQP-GLES3.functional.fbo.render.recreate_depth_stencil.* = SKIP
>+2905 VULKAN : dEQP-GLES3.functional.fbo.completeness.renderable.texture.stencil.depth_stencil_unsigned_int_24_8 = SKIP
>+2905 VULKAN : dEQP-GLES3.functional.fbo.completeness.renderable.texture.stencil.depth24_stencil8 = SKIP
>+2905 VULKAN : dEQP-GLES3.functional.fbo.completeness.renderable.texture.stencil.depth32f_stencil8 = SKIP
>+2905 VULKAN : dEQP-GLES3.functional.fbo.completeness.renderable.texture.depth.depth_component_unsigned_short = SKIP
>+2905 VULKAN : dEQP-GLES3.functional.fbo.completeness.renderable.texture.depth.depth_component16 = SKIP
>+2905 VULKAN : dEQP-GLES3.functional.fbo.completeness.renderable.texture.depth.depth_component24 = SKIP
>+2905 VULKAN : dEQP-GLES3.functional.fbo.completeness.renderable.texture.depth.depth_stencil_unsigned_int_24_8 = SKIP
>+2905 VULKAN : dEQP-GLES3.functional.fbo.completeness.renderable.texture.depth.depth24_stencil8 = SKIP
>+2905 VULKAN : dEQP-GLES3.functional.fbo.completeness.renderable.texture.depth.depth_component32f = SKIP
>+2905 VULKAN : dEQP-GLES3.functional.fbo.completeness.renderable.texture.depth.depth32f_stencil8 = SKIP
>+2905 VULKAN : dEQP-GLES3.functional.fbo.completeness.attachment_combinations.* = SKIP
>+2905 VULKAN : dEQP-GLES3.functional.fbo.render.shared_depth_stencil.* = SKIP
>+2905 VULKAN : dEQP-GLES3.functional.fbo.depth.* = SKIP
>+2905 VULKAN : dEQP-GLES3.functional.fbo.stencil.* = SKIP
>+2905 VULKAN : dEQP-GLES3.functional.state_query.fbo.framebuffer_attachment_component_type = SKIP
>+2905 VULKAN : dEQP-GLES3.functional.state_query.fbo.framebuffer_attachment_x_size_texture = SKIP
>+
>+// Min/Max blending:
>+2897 VULKAN : dEQP-GLES3.functional.fragment_ops.blend.default_framebuffer.equation_src_func_dst_func.min = SKIP
>+2897 VULKAN : dEQP-GLES3.functional.fragment_ops.blend.default_framebuffer.equation_src_func_dst_func.max = SKIP
>+2897 VULKAN : dEQP-GLES3.functional.fragment_ops.blend.default_framebuffer.rgb_equation_alpha_equation.add_min = SKIP
>+2897 VULKAN : dEQP-GLES3.functional.fragment_ops.blend.default_framebuffer.rgb_equation_alpha_equation.add_max = SKIP
>+2897 VULKAN : dEQP-GLES3.functional.fragment_ops.blend.default_framebuffer.rgb_equation_alpha_equation.subtract_min = SKIP
>+2897 VULKAN : dEQP-GLES3.functional.fragment_ops.blend.default_framebuffer.rgb_equation_alpha_equation.subtract_max = SKIP
>+2897 VULKAN : dEQP-GLES3.functional.fragment_ops.blend.default_framebuffer.rgb_equation_alpha_equation.reverse_subtract_min = SKIP
>+2897 VULKAN : dEQP-GLES3.functional.fragment_ops.blend.default_framebuffer.rgb_equation_alpha_equation.reverse_subtract_max = SKIP
>+2897 VULKAN : dEQP-GLES3.functional.fragment_ops.blend.default_framebuffer.rgb_equation_alpha_equation.min* = SKIP
>+2897 VULKAN : dEQP-GLES3.functional.fragment_ops.blend.default_framebuffer.rgb_equation_alpha_equation.max* = SKIP
>+2897 VULKAN : dEQP-GLES3.functional.fragment_ops.blend.fbo_srgb.equation_src_func_dst_func.min = SKIP
>+2897 VULKAN : dEQP-GLES3.functional.fragment_ops.blend.fbo_srgb.equation_src_func_dst_func.max = SKIP
>+2897 VULKAN : dEQP-GLES3.functional.fragment_ops.blend.fbo_srgb.rgb_equation_alpha_equation.add_min = SKIP
>+2897 VULKAN : dEQP-GLES3.functional.fragment_ops.blend.fbo_srgb.rgb_equation_alpha_equation.add_max = SKIP
>+2897 VULKAN : dEQP-GLES3.functional.fragment_ops.blend.fbo_srgb.rgb_equation_alpha_equation.subtract_min = SKIP
>+2897 VULKAN : dEQP-GLES3.functional.fragment_ops.blend.fbo_srgb.rgb_equation_alpha_equation.subtract_max = SKIP
>+2897 VULKAN : dEQP-GLES3.functional.fragment_ops.blend.fbo_srgb.rgb_equation_alpha_equation.reverse_subtract_min = SKIP
>+2897 VULKAN : dEQP-GLES3.functional.fragment_ops.blend.fbo_srgb.rgb_equation_alpha_equation.reverse_subtract_max = SKIP
>+2897 VULKAN : dEQP-GLES3.functional.fragment_ops.blend.fbo_srgb.rgb_equation_alpha_equation.min* = SKIP
>+2897 VULKAN : dEQP-GLES3.functional.fragment_ops.blend.fbo_srgb.rgb_equation_alpha_equation.max* = SKIP
>+
>+// Blit:
>+3200 VULKAN : dEQP-GLES3.functional.fbo.blit.* = SKIP
>+3200 VULKAN : dEQP-GLES3.functional.fragment_ops.scissor.framebuffer_blit_center = FAIL
>+3200 VULKAN : dEQP-GLES3.functional.fragment_ops.scissor.framebuffer_blit_corner = FAIL
>+
>+// Buffer copy:
>+3194 VULKAN : dEQP-GLES3.functional.buffer.copy.* = SKIP
>+
>+// Shader support:
>+3219 VULKAN : dEQP-GLES3.functional.shaders.* = SKIP
>+3219 VULKAN : dEQP-GLES3.functional.rasterization.flatshading.* = SKIP
>+3219 VULKAN : dEQP-GLES3.functional.negative_api.shader.link_program = FAIL
>+3219 VULKAN : dEQP-GLES3.functional.negative_api.shader.use_program = FAIL
>+
>+// New vertex attribute formats:
>+3193 VULKAN : dEQP-GLES3.functional.vertex_arrays.single_attribute.strides.int2_10_10_10.* = SKIP
>+3193 VULKAN : dEQP-GLES3.functional.vertex_arrays.single_attribute.normalize.unsigned_int.components* = SKIP
>+3193 VULKAN : dEQP-GLES3.functional.vertex_arrays.single_attribute.normalize.int.components* = SKIP
>+3193 VULKAN : dEQP-GLES3.functional.vertex_arrays.single_attribute.normalize.half.components* = SKIP
>+3193 VULKAN : dEQP-GLES3.functional.vertex_arrays.single_attribute.normalize.usigned_int2_10_10_10.components* = SKIP
>+3193 VULKAN : dEQP-GLES3.functional.vertex_arrays.single_attribute.normalize.int2_10_10_10.components* = SKIP
>+3193 VULKAN : dEQP-GLES3.functional.vertex_arrays.single_attribute.output_types.unsigned_int.components* = SKIP
>+3193 VULKAN : dEQP-GLES3.functional.vertex_arrays.single_attribute.output_types.int.components* = SKIP
>+3193 VULKAN : dEQP-GLES3.functional.vertex_arrays.single_attribute.output_types.half.components* = SKIP
>+3193 VULKAN : dEQP-GLES3.functional.vertex_arrays.single_attribute.output_types.usigned_int2_10_10_10.components* = SKIP
>+3193 VULKAN : dEQP-GLES3.functional.vertex_arrays.single_attribute.output_types.int2_10_10_10.components* = SKIP
>+3193 VULKAN : dEQP-GLES3.functional.vertex_arrays.single_attribute.output_types.byte.components* = SKIP
>+3193 VULKAN : dEQP-GLES3.functional.vertex_arrays.single_attribute.output_types.unsigned_byte.components* = SKIP
>+3193 VULKAN : dEQP-GLES3.functional.vertex_arrays.single_attribute.output_types.short.components* = SKIP
>+3193 VULKAN : dEQP-GLES3.functional.vertex_arrays.single_attribute.output_types.unsigned_short.components* = SKIP
>+3193 VULKAN : dEQP-GLES3.functional.vertex_arrays.single_attribute.first.int2_10_10_10* = SKIP
>+3193 VULKAN : dEQP-GLES3.functional.vertex_arrays.single_attribute.offset.int2_10_10_10* = SKIP
>+3193 VULKAN : dEQP-GLES3.functional.vertex_array_objects.all_attributes = SKIP
>+3193 VULKAN : dEQP-GLES3.functional.draw.* = SKIP
>+3193 VULKAN : dEQP-GLES3.functional.default_vertex_attrib.int.* = SKIP
>+3193 VULKAN : dEQP-GLES3.functional.default_vertex_attrib.ivec* = SKIP
>+3193 VULKAN : dEQP-GLES3.functional.default_vertex_attrib.uint.* = SKIP
>+3193 VULKAN : dEQP-GLES3.functional.default_vertex_attrib.uvec* = SKIP
>+
>+// Polygon offset:
>+2950 VULKAN : dEQP-GLES3.functional.polygon_offset.float32_result_depth_clamp = FAIL
>+2950 VULKAN : dEQP-GLES3.functional.polygon_offset.float32_factor_1_slope = FAIL
>+
>+// UBO:
>+2950 VULKAN : dEQP-GLES3.functional.ubo.* = SKIP
>+3219 VULKAN : dEQP-GLES3.functional.shaders.uniform_block.* = SKIP
>+
>+// PBO:
>+2950 VULKAN : dEQP-GLES3.functional.pbo.* = SKIP
>+
>+// Uniform API:
>+2950 VULKAN : dEQP-GLES3.functional.uniform_api.value.* = SKIP
>+2950 VULKAN : dEQP-GLES3.functional.uniform_api.random.* = SKIP
>+
>+// Transform feedback:
>+2950 VULKAN : dEQP-GLES3.functional.negative_api.shader.uniform_block_binding = FAIL
>+2950 VULKAN : dEQP-GLES3.functional.negative_api.shader.bind_transform_feedback = FAIL
>+2950 VULKAN : dEQP-GLES3.functional.negative_api.shader.begin_transform_feedback = FAIL
>+2950 VULKAN : dEQP-GLES3.functional.negative_api.shader.pause_transform_feedback = FAIL
>+2950 VULKAN : dEQP-GLES3.functional.negative_api.shader.resume_transform_feedback = FAIL
>+2950 VULKAN : dEQP-GLES3.functional.negative_api.shader.end_transform_feedback = FAIL
>+2950 VULKAN : dEQP-GLES3.functional.transform_feedback.* = FAIL
>+2950 VULKAN : dEQP-GLES3.functional.state_query.boolean.transform_feedback_* = FAIL
>+2950 VULKAN : dEQP-GLES3.functional.state_query.integers.max_transform_feedback_* = FAIL
>+2950 VULKAN : dEQP-GLES3.functional.state_query.integers.transform_feedback_* = FAIL
>+2950 VULKAN : dEQP-GLES3.functional.state_query.indexed.transform_feedback_* = FAIL
>+2950 VULKAN : dEQP-GLES3.functional.state_query.shader.transform_feedback = FAIL
>+
>+// Misc unimplemented:
>+
>+// - FramebufferVk::invalidate*:
>+2950 VULKAN : dEQP-GLES3.functional.fbo.invalidate.* = SKIP
>+
>+// - Primitive restart:
>+2950 VULKAN : dEQP-GLES3.functional.primitive_restart.* = SKIP
>+
>+// - BufferVk::copySubData:
>+2950 VULKAN : dEQP-GLES3.functional.negative_api.buffer.copy_buffer_sub_data = SKIP
>+
>+// - ES3 Query Types:
>+2950 VULKAN : dEQP-GLES3.functional.negative_api.fragment.begin_query = SKIP
>+
>+// - ContextVk::drawRangeElements:
>+2950 VULKAN : dEQP-GLES3.functional.negative_api.vertex_array.draw_range_element* = SKIP
>+
>+// - TextureVk::setBaseLevel:
>+2950 VULKAN : dEQP-GLES3.functional.state_query.texture.texture_2d_texture_base_level_gettexparameter* = SKIP
>+2950 VULKAN : dEQP-GLES3.functional.state_query.texture.texture_3d_texture_base_level_gettexparameter* = SKIP
>+2950 VULKAN : dEQP-GLES3.functional.state_query.texture.texture_2d_array_texture_base_level_gettexparameter* = SKIP
>+2950 VULKAN : dEQP-GLES3.functional.state_query.texture.texture_cube_map_texture_base_level_gettexparameter* = SKIP
>+
>+// - ES3 State queries:
>+2950 VULKAN : dEQP-GLES3.functional.state_query.integers.max_elements_indices_getfloat = FAIL
>+2950 VULKAN : dEQP-GLES3.functional.state_query.integers.max_elements_vertices_getfloat = FAIL
>+2950 VULKAN : dEQP-GLES3.functional.state_query.integers.max_vertex_uniform_blocks_get* = FAIL
>+2950 VULKAN : dEQP-GLES3.functional.state_query.integers.max_fragment_uniform_blocks_get* = FAIL
>+2950 VULKAN : dEQP-GLES3.functional.state_query.integers.max_combined_uniform_blocks_get* = FAIL
>+2950 VULKAN : dEQP-GLES3.functional.state_query.integers.max_fragment_input_components_get* = FAIL
>+2950 VULKAN : dEQP-GLES3.functional.state_query.integers.max_program_texel_offset_get* = FAIL
>+2950 VULKAN : dEQP-GLES3.functional.state_query.integers.max_uniform_buffer_bindings_get* = FAIL
>+2950 VULKAN : dEQP-GLES3.functional.state_query.integers.max_samples_get* = FAIL
>+2950 VULKAN : dEQP-GLES3.functional.state_query.integers.min_program_texel_offset_get* = FAIL
>+2950 VULKAN : dEQP-GLES3.functional.state_query.integers.compressed_texture_formats_get* = FAIL
>+2950 VULKAN : dEQP-GLES3.functional.state_query.indexed.uniform_buffer* = FAIL
>+2950 VULKAN : dEQP-GLES3.functional.state_query.integers64.max_uniform_block_size_get* = FAIL
>+2950 VULKAN : dEQP-GLES3.functional.state_query.integers64.max_combined_vertex_uniform_components_get* = FAIL
>+2950 VULKAN : dEQP-GLES3.functional.state_query.integers64.max_combined_fragment_uniform_components_get* = FAIL
>+
>+// Misc failures:
>+2950 VULKAN : dEQP-GLES3.functional.negative_api.vertex_array.draw_elements_incomplete_primitive = FAIL
>+2950 VULKAN : dEQP-GLES3.functional.state_query.fbo.framebuffer_attachment_color_encoding = FAIL
>+2950 VULKAN : dEQP-GLES3.functional.state_query.rbo.renderbuffer_internal_format = FAIL
>+2950 VULKAN : dEQP-GLES3.functional.state_query.rbo.renderbuffer_component_size_color = FAIL
>+2950 VULKAN : dEQP-GLES3.functional.state_query.shader.program_active_uniform_blocks = FAIL
>+2950 VULKAN : dEQP-GLES3.functional.state_query.shader.uniform_value_uint = FAIL
>+2950 VULKAN : dEQP-GLES3.functional.lifetime.* = SKIP
>+2950 VULKAN : dEQP-GLES3.functional.clipping.line.line_clip_viewport_center = FAIL
>+2950 VULKAN : dEQP-GLES3.functional.clipping.line.line_clip_viewport_corner = FAIL
>+2950 VULKAN : dEQP-GLES3.functional.clipping.point.wide_point_clip_viewport_center = FAIL
>+2950 VULKAN : dEQP-GLES3.functional.clipping.point.wide_point_clip_viewport_corner = FAIL
>+2950 VULKAN : dEQP-GLES3.functional.clipping.point.point_clip_viewport_center = FAIL
>+2950 VULKAN : dEQP-GLES3.functional.clipping.point.point_clip_viewport_corner = FAIL
>+
>+// To be triaged:
>+2950 VULKAN : dEQP-GLES3.functional.fragment_ops.interaction.basic_shader.* = SKIP
>+2950 VULKAN : dEQP-GLES3.functional.fragment_ops.random.* = SKIP
>+2950 VULKAN : dEQP-GLES3.functional.samplers.* = SKIP
>+2950 VULKAN : dEQP-GLES3.functional.instanced.* = SKIP
>+2950 VULKAN : dEQP-GLES3.functional.rasterizer_discard.* = SKIP
>+2950 VULKAN : dEQP-GLES3.functional.negative_api.vertex_array.draw_element* = SKIP
>+2950 VULKAN : dEQP-GLES3.functional.negative_api.state.get_uniform* = SKIP
>+2950 VULKAN : dEQP-GLES3.functional.negative_api.state.get_active_unifor* = SKIP
>+2950 VULKAN : dEQP-GLES3.functional.negative_api.state.get_active_attrib = SKIP
>+
>+// Android Vulkan failures
>+2950 ANDROID VULKAN : dEQP-GLES3.functional.implementation_limits.max_combined_texture_image_units = FAIL
>+2950 ANDROID VULKAN : dEQP-GLES3.functional.state_query.integers.max_combined_texture_image_units_getfloat = FAIL
>+2950 ANDROID VULKAN : dEQP-GLES3.functional.state_query.integers.max_combined_texture_image_units_getinteger64 = FAIL
>+2950 ANDROID VULKAN : dEQP-GLES3.functional.fragment_ops.blend.fbo_srgb.rgb_func_alpha_func.* = SKIP
>+2950 ANDROID VULKAN : dEQP-GLES3.functional.fragment_ops.depth_stencil.stencil_ops.* = SKIP
>+2950 ANDROID VULKAN : dEQP-GLES3.functional.polygon_offset.* = FAIL
>+2950 ANDROID VULKAN : dEQP-GLES3.functional.rasterization.fbo.rbo_singlesample.primitives.lines = FAIL
>+2950 ANDROID VULKAN : dEQP-GLES3.functional.rasterization.fbo.texture_2d.primitives.lines = FAIL
>+2950 ANDROID VULKAN : dEQP-GLES3.functional.rasterization.primitives.line* = FAIL
>diff --git a/Source/ThirdParty/ANGLE/src/tests/deqp_support/egluNativeDisplay_override.cpp b/Source/ThirdParty/ANGLE/src/tests/deqp_support/egluNativeDisplay_override.cpp
>new file mode 100644
>index 00000000000..7db9234d245
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/tests/deqp_support/egluNativeDisplay_override.cpp
>@@ -0,0 +1,110 @@
>+/*-------------------------------------------------------------------------
>+ * drawElements Quality Program Tester Core
>+ * ----------------------------------------
>+ *
>+ * Copyright 2014 The Android Open Source Project
>+ *
>+ * Licensed under the Apache License, Version 2.0 (the "License");
>+ * you may not use this file except in compliance with the License.
>+ * You may obtain a copy of the License at
>+ *
>+ *      http://www.apache.org/licenses/LICENSE-2.0
>+ *
>+ * Unless required by applicable law or agreed to in writing, software
>+ * distributed under the License is distributed on an "AS IS" BASIS,
>+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
>+ * See the License for the specific language governing permissions and
>+ * limitations under the License.
>+ *
>+ */ /*!
>+ * \file
>+ * \brief EGL native display abstraction
>+ */ /*--------------------------------------------------------------------*/
>+
>+#include "egluNativeDisplay_override.hpp"
>+#include "eglwEnums.hpp"
>+
>+namespace eglu
>+{
>+
>+using namespace eglw;
>+
>+// NativeDisplay
>+
>+NativeDisplay::NativeDisplay(Capability capabilities,
>+                             EGLenum platformType,
>+                             const char *platformExtension)
>+    : m_capabilities(capabilities),
>+      m_platformType(platformType),
>+      m_platformExtension(platformExtension)
>+{
>+    DE_ASSERT(platformType != EGL_NONE && platformExtension);
>+    DE_ASSERT(capabilities & CAPABILITY_GET_DISPLAY_PLATFORM_EXT);
>+}
>+
>+NativeDisplay::NativeDisplay(Capability capabilities)
>+    : m_capabilities(capabilities), m_platformType(EGL_NONE), m_platformExtension("")
>+{
>+    DE_ASSERT(!(capabilities & CAPABILITY_GET_DISPLAY_PLATFORM_EXT));
>+    DE_ASSERT(capabilities & CAPABILITY_GET_DISPLAY_LEGACY);
>+}
>+
>+NativeDisplay::~NativeDisplay(void) {}
>+
>+EGLNativeDisplayType NativeDisplay::getLegacyNative(void)
>+{
>+    // If NativeDisplay claims to support CAPABILITY_GET_DISPLAY_LEGACY then
>+    // this method must be implemented.
>+    TCU_CHECK_INTERNAL((m_capabilities & CAPABILITY_GET_DISPLAY_LEGACY) == 0);
>+    TCU_THROW(NotSupportedError, "eglu::NativeDisplay can't be used with eglGetDisplay()");
>+}
>+
>+void *NativeDisplay::getPlatformNative(void)
>+{
>+    // If NativeDisplay claims to support CAPABILITY_GET_DISPLAY_PLATFORM then
>+    // this method must be implemented.
>+    TCU_CHECK_INTERNAL((m_capabilities & CAPABILITY_GET_DISPLAY_PLATFORM_EXT) == 0);
>+    TCU_THROW(NotSupportedError,
>+              "eglu::NativeDisplay can't be used with eglGetPlatformDisplayEXT()");
>+}
>+
>+const EGLAttrib *NativeDisplay::getPlatformAttributes(void) const
>+{
>+    // If NativeDisplay claims to support CAPABILITY_GET_DISPLAY_PLATFORM then
>+    // this method must be implemented.
>+    TCU_CHECK_INTERNAL((m_capabilities & CAPABILITY_GET_DISPLAY_PLATFORM_EXT) == 0);
>+    TCU_THROW(NotSupportedError,
>+              "eglu::NativeDisplay can't be used with eglGetPlatformDisplayEXT()");
>+}
>+
>+// NativeDisplayFactory
>+
>+NativeDisplayFactory::NativeDisplayFactory(const std::string &name,
>+                                           const std::string &description,
>+                                           NativeDisplay::Capability capabilities,
>+                                           EGLenum platformType,
>+                                           const char *platformExtension)
>+    : FactoryBase(name, description),
>+      m_capabilities(capabilities),
>+      m_platformType(platformType),
>+      m_platformExtension(platformExtension)
>+{
>+    DE_ASSERT(platformType != EGL_NONE && platformExtension);
>+    DE_ASSERT(capabilities & NativeDisplay::CAPABILITY_GET_DISPLAY_PLATFORM_EXT);
>+}
>+
>+NativeDisplayFactory::NativeDisplayFactory(const std::string &name,
>+                                           const std::string &description,
>+                                           NativeDisplay::Capability capabilities)
>+    : FactoryBase(name, description),
>+      m_capabilities(capabilities),
>+      m_platformType(EGL_NONE),
>+      m_platformExtension("")
>+{
>+    DE_ASSERT(!(capabilities & NativeDisplay::CAPABILITY_GET_DISPLAY_PLATFORM_EXT));
>+    DE_ASSERT(capabilities & NativeDisplay::CAPABILITY_GET_DISPLAY_LEGACY);
>+}
>+
>+NativeDisplayFactory::~NativeDisplayFactory(void) {}
>+
>+}  // namespace eglu
>diff --git a/Source/ThirdParty/ANGLE/src/tests/deqp_support/egluNativeDisplay_override.hpp b/Source/ThirdParty/ANGLE/src/tests/deqp_support/egluNativeDisplay_override.hpp
>new file mode 100644
>index 00000000000..e3a003a27db
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/tests/deqp_support/egluNativeDisplay_override.hpp
>@@ -0,0 +1,116 @@
>+#ifndef _EGLUNATIVEDISPLAY_HPP
>+#define _EGLUNATIVEDISPLAY_HPP
>+/*-------------------------------------------------------------------------
>+ * drawElements Quality Program Tester Core
>+ * ----------------------------------------
>+ *
>+ * Copyright 2014 The Android Open Source Project
>+ *
>+ * Licensed under the Apache License, Version 2.0 (the "License");
>+ * you may not use this file except in compliance with the License.
>+ * You may obtain a copy of the License at
>+ *
>+ *      http://www.apache.org/licenses/LICENSE-2.0
>+ *
>+ * Unless required by applicable law or agreed to in writing, software
>+ * distributed under the License is distributed on an "AS IS" BASIS,
>+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
>+ * See the License for the specific language governing permissions and
>+ * limitations under the License.
>+ *
>+ *//*!
>+ * \file
>+ * \brief EGL native display abstraction
>+ *//*--------------------------------------------------------------------*/
>+
>+#include "tcuDefs.hpp"
>+#include "tcuFactoryRegistry.hpp"
>+#include "egluNativeWindow.hpp"
>+#include "egluNativePixmap.hpp"
>+#include "eglwDefs.hpp"
>+
>+#include <string>
>+
>+namespace eglw
>+{
>+class Library;
>+}
>+
>+namespace eglu
>+{
>+
>+class NativeDisplay
>+{
>+public:
>+	enum Capability
>+	{
>+		CAPABILITY_GET_DISPLAY_LEGACY		= (1<<0),	//!< Query EGL display using eglGetDisplay()
>+		CAPABILITY_GET_DISPLAY_PLATFORM		= (1<<1),	//!< Query EGL display using eglGetPlatformDisplay()
>+		CAPABILITY_GET_DISPLAY_PLATFORM_EXT = (1<<2)	//!< Query EGL display using eglGetPlatformDisplayEXT()
>+	};
>+
>+	virtual								~NativeDisplay				(void);
>+
>+	virtual const eglw::Library&		getLibrary					(void) const = 0;
>+
>+	Capability							getCapabilities				(void) const { return m_capabilities; }
>+	eglw::EGLenum						getPlatformType				(void) const { return m_platformType; }
>+	const char*							getPlatformExtensionName	(void) const { return (m_platformExtension.empty() ? DE_NULL : m_platformExtension.c_str()); }
>+
>+	//! Get EGLNativeDisplayType that can be used with eglGetDisplay(). Default implementation throws tcu::NotSupportedError().
>+	virtual eglw::EGLNativeDisplayType	getLegacyNative				(void);
>+
>+	//! Return display pointer that can be used with eglGetPlatformDisplay(). Default implementations throw tcu::NotSupportedError()
>+	virtual void*						getPlatformNative			(void);
>+
>+	//! Attributes to pass to eglGetPlatformDisplay(EXT)
>+	virtual const eglw::EGLAttrib*		getPlatformAttributes		(void) const;
>+
>+protected:
>+										NativeDisplay				(Capability capabilities, eglw::EGLenum platformType, const char* platformExtension);
>+										NativeDisplay				(Capability capabilities);
>+
>+private:
>+										NativeDisplay				(const NativeDisplay&);
>+	NativeDisplay&						operator=					(const NativeDisplay&);
>+
>+	const Capability					m_capabilities;
>+	const eglw::EGLenum					m_platformType;				//!< EGL platform type, or EGL_NONE if not supported.
>+	const std::string					m_platformExtension;
>+};
>+
>+class NativeDisplayFactory : public tcu::FactoryBase
>+{
>+public:
>+	virtual								~NativeDisplayFactory		(void);
>+
>+	virtual NativeDisplay*				createDisplay				(const eglw::EGLAttrib* attribList = DE_NULL) const = 0;
>+
>+	NativeDisplay::Capability			getCapabilities				(void) const { return m_capabilities; }
>+	eglw::EGLenum						getPlatformType				(void) const { return m_platformType; }
>+	const char*							getPlatformExtensionName	(void) const { return (m_platformExtension.empty() ? DE_NULL : m_platformExtension.c_str()); }
>+
>+	const NativeWindowFactoryRegistry&	getNativeWindowRegistry		(void) const { return m_nativeWindowRegistry; }
>+	const NativePixmapFactoryRegistry&	getNativePixmapRegistry		(void) const { return m_nativePixmapRegistry; }
>+
>+protected:
>+										NativeDisplayFactory		(const std::string& name, const std::string& description, NativeDisplay::Capability capabilities);
>+										NativeDisplayFactory		(const std::string& name, const std::string& description, NativeDisplay::Capability capabilities, eglw::EGLenum platformType, const char* platformExtension);
>+
>+	NativeWindowFactoryRegistry			m_nativeWindowRegistry;
>+	NativePixmapFactoryRegistry			m_nativePixmapRegistry;
>+
>+private:
>+										NativeDisplayFactory		(const NativeDisplayFactory&);
>+	NativeDisplayFactory&				operator=					(const NativeDisplayFactory&);
>+
>+	const NativeDisplay::Capability		m_capabilities;
>+	const eglw::EGLenum					m_platformType;
>+	const std::string					m_platformExtension;
>+};
>+
>+typedef tcu::FactoryRegistry<NativeDisplayFactory> NativeDisplayFactoryRegistry;
>+
>+} // eglu
>+
>+#endif // _EGLUNATIVEDISPLAY_HPP
>diff --git a/Source/ThirdParty/ANGLE/src/tests/deqp_support/egluUtil_override.cpp b/Source/ThirdParty/ANGLE/src/tests/deqp_support/egluUtil_override.cpp
>new file mode 100644
>index 00000000000..1950001a8f5
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/tests/deqp_support/egluUtil_override.cpp
>@@ -0,0 +1,536 @@
>+/*-------------------------------------------------------------------------
>+ * drawElements Quality Program Tester Core
>+ * ----------------------------------------
>+ *
>+ * Copyright 2014 The Android Open Source Project
>+ *
>+ * Licensed under the Apache License, Version 2.0 (the "License");
>+ * you may not use this file except in compliance with the License.
>+ * You may obtain a copy of the License at
>+ *
>+ *      http://www.apache.org/licenses/LICENSE-2.0
>+ *
>+ * Unless required by applicable law or agreed to in writing, software
>+ * distributed under the License is distributed on an "AS IS" BASIS,
>+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
>+ * See the License for the specific language governing permissions and
>+ * limitations under the License.
>+ *
>+ */ /*!
>+ * \file
>+ * \brief EGL utilities
>+ */ /*--------------------------------------------------------------------*/
>+
>+#include "egluNativeDisplay_override.hpp"
>+
>+#include "deSTLUtil.hpp"
>+#include "deStringUtil.hpp"
>+#include "egluConfigFilter.hpp"
>+#include "egluDefs.hpp"
>+#include "egluUtil.hpp"
>+#include "eglwEnums.hpp"
>+#include "eglwLibrary.hpp"
>+#include "glwEnums.hpp"
>+#include "tcuCommandLine.hpp"
>+
>+#include <algorithm>
>+#include <sstream>
>+
>+using std::string;
>+using std::vector;
>+
>+namespace eglu
>+{
>+
>+using namespace eglw;
>+
>+vector<EGLint> attribMapToList(const AttribMap &attribs)
>+{
>+    vector<EGLint> attribList;
>+
>+    for (AttribMap::const_iterator it = attribs.begin(); it != attribs.end(); ++it)
>+    {
>+        attribList.push_back(it->first);
>+        attribList.push_back(it->second);
>+    }
>+
>+    attribList.push_back(EGL_NONE);
>+
>+    return attribList;
>+}
>+
>+Version getVersion(const Library &egl, EGLDisplay display)
>+{
>+    EGLint major, minor;
>+
>+    // eglInitialize on already initialized displays just returns the version.
>+    EGLU_CHECK_CALL(egl, initialize(display, &major, &minor));
>+
>+    return Version(major, minor);
>+}
>+
>+vector<string> getExtensions(const Library &egl, EGLDisplay display)
>+{
>+    const char *const extensionStr = egl.queryString(display, EGL_EXTENSIONS);
>+
>+    EGLU_CHECK_MSG(egl, "Querying extensions failed");
>+
>+    return de::splitString(extensionStr, ' ');
>+}
>+
>+bool hasExtension(const Library &egl, EGLDisplay display, const string &str)
>+{
>+    const vector<string> extensions = getExtensions(egl, display);
>+    return de::contains(extensions.begin(), extensions.end(), str);
>+}
>+
>+vector<string> getClientExtensions(const Library &egl)
>+{
>+    return getExtensions(egl, EGL_NO_DISPLAY);
>+}
>+
>+vector<string> getDisplayExtensions(const Library &egl, EGLDisplay display)
>+{
>+    DE_ASSERT(display != EGL_NO_DISPLAY);
>+
>+    return getExtensions(egl, display);
>+}
>+
>+vector<EGLConfig> getConfigs(const Library &egl, EGLDisplay display)
>+{
>+    vector<EGLConfig> configs;
>+    EGLint configCount = 0;
>+    EGLU_CHECK_CALL(egl, getConfigs(display, DE_NULL, 0, &configCount));
>+
>+    if (configCount > 0)
>+    {
>+        configs.resize(configCount);
>+        EGLU_CHECK_CALL(egl,
>+                        getConfigs(display, &(configs[0]), (EGLint)configs.size(), &configCount));
>+    }
>+
>+    return configs;
>+}
>+
>+vector<EGLConfig> chooseConfigs(const Library &egl, EGLDisplay display, const EGLint *attribList)
>+{
>+    EGLint numConfigs = 0;
>+
>+    EGLU_CHECK_CALL(egl, chooseConfig(display, attribList, DE_NULL, 0, &numConfigs));
>+
>+    {
>+        vector<EGLConfig> configs(numConfigs);
>+
>+        if (numConfigs > 0)
>+            EGLU_CHECK_CALL(
>+                egl, chooseConfig(display, attribList, &configs.front(), numConfigs, &numConfigs));
>+
>+        return configs;
>+    }
>+}
>+
>+vector<EGLConfig> chooseConfigs(const Library &egl, EGLDisplay display, const FilterList &filters)
>+{
>+    const vector<EGLConfig> allConfigs(getConfigs(egl, display));
>+    vector<EGLConfig> matchingConfigs;
>+
>+    for (vector<EGLConfig>::const_iterator cfg = allConfigs.begin(); cfg != allConfigs.end(); ++cfg)
>+    {
>+        if (filters.match(egl, display, *cfg))
>+            matchingConfigs.push_back(*cfg);
>+    }
>+
>+    return matchingConfigs;
>+}
>+
>+EGLConfig chooseSingleConfig(const Library &egl, EGLDisplay display, const FilterList &filters)
>+{
>+    const vector<EGLConfig> allConfigs(getConfigs(egl, display));
>+
>+    for (vector<EGLConfig>::const_iterator cfg = allConfigs.begin(); cfg != allConfigs.end(); ++cfg)
>+    {
>+        if (filters.match(egl, display, *cfg))
>+            return *cfg;
>+    }
>+
>+    TCU_THROW(NotSupportedError, "No matching EGL config found");
>+}
>+
>+EGLConfig chooseSingleConfig(const Library &egl, EGLDisplay display, const EGLint *attribList)
>+{
>+    const vector<EGLConfig> configs(chooseConfigs(egl, display, attribList));
>+    if (configs.empty())
>+        TCU_THROW(NotSupportedError, "No matching EGL config found");
>+
>+    return configs.front();
>+}
>+
>+vector<EGLConfig> chooseConfigs(const Library &egl, EGLDisplay display, const AttribMap &attribs)
>+{
>+    const vector<EGLint> attribList = attribMapToList(attribs);
>+    return chooseConfigs(egl, display, &attribList.front());
>+}
>+
>+EGLConfig chooseSingleConfig(const Library &egl, EGLDisplay display, const AttribMap &attribs)
>+{
>+    const vector<EGLint> attribList = attribMapToList(attribs);
>+    return chooseSingleConfig(egl, display, &attribList.front());
>+}
>+
>+EGLConfig chooseConfigByID(const Library &egl, EGLDisplay display, EGLint id)
>+{
>+    AttribMap attribs;
>+
>+    attribs[EGL_CONFIG_ID]         = id;
>+    attribs[EGL_TRANSPARENT_TYPE]  = EGL_DONT_CARE;
>+    attribs[EGL_COLOR_BUFFER_TYPE] = EGL_DONT_CARE;
>+    attribs[EGL_RENDERABLE_TYPE]   = EGL_DONT_CARE;
>+    attribs[EGL_SURFACE_TYPE]      = EGL_DONT_CARE;
>+
>+    return chooseSingleConfig(egl, display, attribs);
>+}
>+
>+EGLint getConfigAttribInt(const Library &egl, EGLDisplay display, EGLConfig config, EGLint attrib)
>+{
>+    EGLint value = 0;
>+    EGLU_CHECK_CALL(egl, getConfigAttrib(display, config, attrib, &value));
>+    return value;
>+}
>+
>+EGLint getConfigID(const Library &egl, EGLDisplay display, EGLConfig config)
>+{
>+    return getConfigAttribInt(egl, display, config, EGL_CONFIG_ID);
>+}
>+
>+EGLint querySurfaceInt(const Library &egl, EGLDisplay display, EGLSurface surface, EGLint attrib)
>+{
>+    EGLint value = 0;
>+    EGLU_CHECK_CALL(egl, querySurface(display, surface, attrib, &value));
>+    return value;
>+}
>+
>+tcu::IVec2 getSurfaceSize(const Library &egl, EGLDisplay display, EGLSurface surface)
>+{
>+    const EGLint width  = querySurfaceInt(egl, display, surface, EGL_WIDTH);
>+    const EGLint height = querySurfaceInt(egl, display, surface, EGL_HEIGHT);
>+    return tcu::IVec2(width, height);
>+}
>+
>+tcu::IVec2 getSurfaceResolution(const Library &egl, EGLDisplay display, EGLSurface surface)
>+{
>+    const EGLint hRes = querySurfaceInt(egl, display, surface, EGL_HORIZONTAL_RESOLUTION);
>+    const EGLint vRes = querySurfaceInt(egl, display, surface, EGL_VERTICAL_RESOLUTION);
>+
>+    if (hRes == EGL_UNKNOWN || vRes == EGL_UNKNOWN)
>+        TCU_THROW(NotSupportedError, "Surface doesn't support pixel density queries");
>+    return tcu::IVec2(hRes, vRes);
>+}
>+
>+//! Get EGLdisplay using eglGetDisplay() or eglGetPlatformDisplayEXT()
>+EGLDisplay getDisplay(NativeDisplay &nativeDisplay)
>+{
>+    const Library &egl = nativeDisplay.getLibrary();
>+    const bool supportsLegacyGetDisplay =
>+        (nativeDisplay.getCapabilities() & NativeDisplay::CAPABILITY_GET_DISPLAY_LEGACY) != 0;
>+    const bool supportsPlatformGetDisplay =
>+        (nativeDisplay.getCapabilities() & NativeDisplay::CAPABILITY_GET_DISPLAY_PLATFORM) != 0;
>+    const bool supportsPlatformGetDisplayEXT =
>+        (nativeDisplay.getCapabilities() & NativeDisplay::CAPABILITY_GET_DISPLAY_PLATFORM_EXT) != 0;
>+    bool usePlatformExt = false;
>+    EGLDisplay display  = EGL_NO_DISPLAY;
>+
>+    TCU_CHECK_INTERNAL(supportsLegacyGetDisplay || supportsPlatformGetDisplay);
>+
>+    if (supportsPlatformGetDisplayEXT)
>+    {
>+        const vector<string> platformExts = getClientExtensions(egl);
>+        usePlatformExt                    = de::contains(platformExts.begin(), platformExts.end(),
>+                                      string("EGL_EXT_platform_base")) &&
>+                         de::contains(platformExts.begin(), platformExts.end(),
>+                                      string(nativeDisplay.getPlatformExtensionName()));
>+    }
>+
>+    if (supportsPlatformGetDisplay)
>+    {
>+        display = egl.getPlatformDisplay(nativeDisplay.getPlatformType(),
>+                                         nativeDisplay.getPlatformNative(),
>+                                         nativeDisplay.getPlatformAttributes());
>+        EGLU_CHECK_MSG(egl, "eglGetPlatformDisplay()");
>+        TCU_CHECK(display != EGL_NO_DISPLAY);
>+    }
>+    else if (usePlatformExt)
>+    {
>+        const vector<EGLint> legacyAttribs =
>+            toLegacyAttribList(nativeDisplay.getPlatformAttributes());
>+
>+        display = egl.getPlatformDisplayEXT(nativeDisplay.getPlatformType(),
>+                                            nativeDisplay.getPlatformNative(), &legacyAttribs[0]);
>+        EGLU_CHECK_MSG(egl, "eglGetPlatformDisplayEXT()");
>+        TCU_CHECK(display != EGL_NO_DISPLAY);
>+    }
>+    else if (supportsLegacyGetDisplay)
>+    {
>+        display = egl.getDisplay(nativeDisplay.getLegacyNative());
>+        EGLU_CHECK_MSG(egl, "eglGetDisplay()");
>+        TCU_CHECK(display != EGL_NO_DISPLAY);
>+    }
>+    else
>+        throw tcu::InternalError("No supported way to get EGL display", DE_NULL, __FILE__,
>+                                 __LINE__);
>+
>+    DE_ASSERT(display != EGL_NO_DISPLAY);
>+    return display;
>+}
>+
>+EGLDisplay getAndInitDisplay(NativeDisplay &nativeDisplay, Version *version)
>+{
>+    const Library &egl = nativeDisplay.getLibrary();
>+    EGLDisplay display = getDisplay(nativeDisplay);
>+    int major, minor;
>+
>+    EGLU_CHECK_CALL(egl, initialize(display, &major, &minor));
>+
>+    if (version)
>+        *version = Version(major, minor);
>+
>+    return display;
>+}
>+
>+//! Create EGL window surface using eglCreateWindowSurface() or eglCreatePlatformWindowSurfaceEXT()
>+EGLSurface createWindowSurface(NativeDisplay &nativeDisplay,
>+                               NativeWindow &window,
>+                               EGLDisplay display,
>+                               EGLConfig config,
>+                               const EGLAttrib *attribList)
>+{
>+    const Library &egl = nativeDisplay.getLibrary();
>+    const bool supportsLegacyCreate =
>+        (window.getCapabilities() & NativeWindow::CAPABILITY_CREATE_SURFACE_LEGACY) != 0;
>+    const bool supportsPlatformCreate =
>+        (window.getCapabilities() & NativeWindow::CAPABILITY_CREATE_SURFACE_PLATFORM) != 0;
>+    bool usePlatformExt = false;
>+    EGLSurface surface  = EGL_NO_SURFACE;
>+
>+    TCU_CHECK_INTERNAL(supportsLegacyCreate || supportsPlatformCreate);
>+
>+    if (supportsPlatformCreate)
>+    {
>+        const vector<string> platformExts = getClientExtensions(egl);
>+        usePlatformExt                    = de::contains(platformExts.begin(), platformExts.end(),
>+                                      string("EGL_EXT_platform_base")) &&
>+                         de::contains(platformExts.begin(), platformExts.end(),
>+                                      string(nativeDisplay.getPlatformExtensionName()));
>+    }
>+
>+    // \todo [2014-03-13 pyry] EGL 1.5 core support
>+    if (usePlatformExt)
>+    {
>+        const vector<EGLint> legacyAttribs = toLegacyAttribList(attribList);
>+
>+        surface = egl.createPlatformWindowSurfaceEXT(display, config, window.getPlatformNative(),
>+                                                     &legacyAttribs[0]);
>+        EGLU_CHECK_MSG(egl, "eglCreatePlatformWindowSurfaceEXT()");
>+        TCU_CHECK(surface != EGL_NO_SURFACE);
>+    }
>+    else if (supportsLegacyCreate)
>+    {
>+        const vector<EGLint> legacyAttribs = toLegacyAttribList(attribList);
>+        surface =
>+            egl.createWindowSurface(display, config, window.getLegacyNative(), &legacyAttribs[0]);
>+        EGLU_CHECK_MSG(egl, "eglCreateWindowSurface()");
>+        TCU_CHECK(surface != EGL_NO_SURFACE);
>+    }
>+    else
>+        throw tcu::InternalError("No supported way to create EGL window surface", DE_NULL, __FILE__,
>+                                 __LINE__);
>+
>+    DE_ASSERT(surface != EGL_NO_SURFACE);
>+    return surface;
>+}
>+
>+//! Create EGL pixmap surface using eglCreatePixmapSurface() or eglCreatePlatformPixmapSurfaceEXT()
>+EGLSurface createPixmapSurface(NativeDisplay &nativeDisplay,
>+                               NativePixmap &pixmap,
>+                               EGLDisplay display,
>+                               EGLConfig config,
>+                               const EGLAttrib *attribList)
>+{
>+    const Library &egl = nativeDisplay.getLibrary();
>+    const bool supportsLegacyCreate =
>+        (pixmap.getCapabilities() & NativePixmap::CAPABILITY_CREATE_SURFACE_LEGACY) != 0;
>+    const bool supportsPlatformCreate =
>+        (pixmap.getCapabilities() & NativePixmap::CAPABILITY_CREATE_SURFACE_PLATFORM) != 0;
>+    bool usePlatformExt = false;
>+    EGLSurface surface  = EGL_NO_SURFACE;
>+
>+    TCU_CHECK_INTERNAL(supportsLegacyCreate || supportsPlatformCreate);
>+
>+    if (supportsPlatformCreate)
>+    {
>+        const vector<string> platformExts = getClientExtensions(egl);
>+        usePlatformExt                    = de::contains(platformExts.begin(), platformExts.end(),
>+                                      string("EGL_EXT_platform_base")) &&
>+                         de::contains(platformExts.begin(), platformExts.end(),
>+                                      string(nativeDisplay.getPlatformExtensionName()));
>+    }
>+
>+    if (usePlatformExt)
>+    {
>+        const vector<EGLint> legacyAttribs = toLegacyAttribList(attribList);
>+
>+        surface = egl.createPlatformPixmapSurfaceEXT(display, config, pixmap.getPlatformNative(),
>+                                                     &legacyAttribs[0]);
>+        EGLU_CHECK_MSG(egl, "eglCreatePlatformPixmapSurfaceEXT()");
>+        TCU_CHECK(surface != EGL_NO_SURFACE);
>+    }
>+    else if (supportsLegacyCreate)
>+    {
>+        const vector<EGLint> legacyAttribs = toLegacyAttribList(attribList);
>+        surface =
>+            egl.createPixmapSurface(display, config, pixmap.getLegacyNative(), &legacyAttribs[0]);
>+        EGLU_CHECK_MSG(egl, "eglCreatePixmapSurface()");
>+        TCU_CHECK(surface != EGL_NO_SURFACE);
>+    }
>+    else
>+        throw tcu::InternalError("No supported way to create EGL pixmap surface", DE_NULL, __FILE__,
>+                                 __LINE__);
>+
>+    DE_ASSERT(surface != EGL_NO_SURFACE);
>+    return surface;
>+}
>+
>+static WindowParams::Visibility getWindowVisibility(tcu::WindowVisibility visibility)
>+{
>+    switch (visibility)
>+    {
>+        case tcu::WINDOWVISIBILITY_WINDOWED:
>+            return WindowParams::VISIBILITY_VISIBLE;
>+        case tcu::WINDOWVISIBILITY_FULLSCREEN:
>+            return WindowParams::VISIBILITY_FULLSCREEN;
>+        case tcu::WINDOWVISIBILITY_HIDDEN:
>+            return WindowParams::VISIBILITY_HIDDEN;
>+
>+        default:
>+            DE_ASSERT(false);
>+            return WindowParams::VISIBILITY_DONT_CARE;
>+    }
>+}
>+
>+WindowParams::Visibility parseWindowVisibility(const tcu::CommandLine &commandLine)
>+{
>+    return getWindowVisibility(commandLine.getVisibility());
>+}
>+
>+EGLenum parseClientAPI(const std::string &api)
>+{
>+    if (api == "OpenGL")
>+        return EGL_OPENGL_API;
>+    else if (api == "OpenGL_ES")
>+        return EGL_OPENGL_ES_API;
>+    else if (api == "OpenVG")
>+        return EGL_OPENVG_API;
>+    else
>+        throw tcu::InternalError("Unknown EGL client API '" + api + "'");
>+}
>+
>+vector<EGLenum> parseClientAPIs(const std::string &apiList)
>+{
>+    const vector<string> apiStrs = de::splitString(apiList, ' ');
>+    vector<EGLenum> apis;
>+
>+    for (vector<string>::const_iterator api = apiStrs.begin(); api != apiStrs.end(); ++api)
>+        apis.push_back(parseClientAPI(*api));
>+
>+    return apis;
>+}
>+
>+vector<EGLenum> getClientAPIs(const eglw::Library &egl, eglw::EGLDisplay display)
>+{
>+    return parseClientAPIs(egl.queryString(display, EGL_CLIENT_APIS));
>+}
>+
>+EGLint getRenderableAPIsMask(const eglw::Library &egl, eglw::EGLDisplay display)
>+{
>+    const vector<EGLConfig> configs = getConfigs(egl, display);
>+    EGLint allAPIs                  = 0;
>+
>+    for (vector<EGLConfig>::const_iterator i = configs.begin(); i != configs.end(); ++i)
>+        allAPIs |= getConfigAttribInt(egl, display, *i, EGL_RENDERABLE_TYPE);
>+
>+    return allAPIs;
>+}
>+
>+vector<EGLint> toLegacyAttribList(const EGLAttrib *attribs)
>+{
>+    const deUint64 attribMask = 0xffffffffull;  //!< Max bits that can be used
>+    vector<EGLint> legacyAttribs;
>+
>+    if (attribs)
>+    {
>+        for (const EGLAttrib *attrib = attribs; *attrib != EGL_NONE; attrib += 2)
>+        {
>+            if ((attrib[0] & ~attribMask) || (attrib[1] & ~attribMask))
>+                throw tcu::InternalError("Failed to translate EGLAttrib to EGLint", DE_NULL,
>+                                         __FILE__, __LINE__);
>+
>+            legacyAttribs.push_back((EGLint)attrib[0]);
>+            legacyAttribs.push_back((EGLint)attrib[1]);
>+        }
>+    }
>+
>+    legacyAttribs.push_back(EGL_NONE);
>+
>+    return legacyAttribs;
>+}
>+
>+template <typename Factory>
>+static const Factory &selectFactory(const tcu::FactoryRegistry<Factory> &registry,
>+                                    const char *objectTypeName,
>+                                    const char *cmdLineArg)
>+{
>+    if (cmdLineArg)
>+    {
>+        const Factory *factory = registry.getFactoryByName(cmdLineArg);
>+
>+        if (factory)
>+            return *factory;
>+        else
>+        {
>+            tcu::print("ERROR: Unknown or unsupported EGL %s type '%s'", objectTypeName,
>+                       cmdLineArg);
>+            tcu::print("Available EGL %s types:\n", objectTypeName);
>+            for (size_t ndx = 0; ndx < registry.getFactoryCount(); ndx++)
>+                tcu::print("  %s: %s\n", registry.getFactoryByIndex(ndx)->getName(),
>+                           registry.getFactoryByIndex(ndx)->getDescription());
>+
>+            TCU_THROW(NotSupportedError, (string("Unsupported or unknown EGL ") + objectTypeName +
>+                                          " type '" + cmdLineArg + "'")
>+                                             .c_str());
>+        }
>+    }
>+    else if (!registry.empty())
>+        return *registry.getDefaultFactory();
>+    else
>+        TCU_THROW(NotSupportedError,
>+                  (string("No factory supporting EGL '") + objectTypeName + "' type").c_str());
>+}
>+
>+const NativeDisplayFactory &selectNativeDisplayFactory(const NativeDisplayFactoryRegistry &registry,
>+                                                       const tcu::CommandLine &cmdLine)
>+{
>+    return selectFactory(registry, "display", cmdLine.getEGLDisplayType());
>+}
>+
>+const NativeWindowFactory &selectNativeWindowFactory(const NativeDisplayFactory &factory,
>+                                                     const tcu::CommandLine &cmdLine)
>+{
>+    return selectFactory(factory.getNativeWindowRegistry(), "window", cmdLine.getEGLWindowType());
>+}
>+
>+const NativePixmapFactory &selectNativePixmapFactory(const NativeDisplayFactory &factory,
>+                                                     const tcu::CommandLine &cmdLine)
>+{
>+    return selectFactory(factory.getNativePixmapRegistry(), "pixmap", cmdLine.getEGLPixmapType());
>+}
>+
>+}  // namespace eglu
>diff --git a/Source/ThirdParty/ANGLE/src/tests/deqp_support/es2fShaderMatrixTests.cpp b/Source/ThirdParty/ANGLE/src/tests/deqp_support/es2fShaderMatrixTests.cpp
>deleted file mode 100644
>index 54d8474fde4..00000000000
>--- a/Source/ThirdParty/ANGLE/src/tests/deqp_support/es2fShaderMatrixTests.cpp
>+++ /dev/null
>@@ -1,1229 +0,0 @@
>-/*-------------------------------------------------------------------------
>- * drawElements Quality Program OpenGL ES 2.0 Module
>- * -------------------------------------------------
>- *
>- * Copyright 2014 The Android Open Source Project
>- *
>- * Licensed under the Apache License, Version 2.0 (the "License");
>- * you may not use this file except in compliance with the License.
>- * You may obtain a copy of the License at
>- *
>- *      http://www.apache.org/licenses/LICENSE-2.0
>- *
>- * Unless required by applicable law or agreed to in writing, software
>- * distributed under the License is distributed on an "AS IS" BASIS,
>- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
>- * See the License for the specific language governing permissions and
>- * limitations under the License.
>- *
>- *//*!
>- * \file
>- * \brief Shader matrix arithmetic tests.
>- *
>- * Variables:
>- *  + operation
>- *    - mat OP mat
>- *    - mat OP vec
>- *    - vec OP mat
>- *    - mat OP scalar
>- *    - OP mat
>- *  + matrix source
>- *    - constant (ctor)
>- *    - uniform
>- *    - vertex input
>- *    - fragment input
>- *  + other operand: always dynamic data?
>- *  + how to reduce to vec3?
>- *//*--------------------------------------------------------------------*/
>-
>-#include "es2fShaderMatrixTests.hpp"
>-#include "glsShaderRenderCase.hpp"
>-#include "gluShaderUtil.hpp"
>-#include "tcuVector.hpp"
>-#include "tcuMatrix.hpp"
>-#include "tcuMatrixUtil.hpp"
>-#include "deStringUtil.hpp"
>-
>-#include "glwEnums.hpp"
>-#include "glwFunctions.hpp"
>-
>-namespace deqp
>-{
>-namespace gles2
>-{
>-namespace Functional
>-{
>-
>-using std::string;
>-using std::vector;
>-using namespace glu;
>-using namespace deqp::gls;
>-
>-using tcu::Vec2;
>-using tcu::Vec3;
>-using tcu::Vec4;
>-using tcu::Mat2;
>-using tcu::Mat3;
>-using tcu::Mat4;
>-
>-// Uniform / constant values for tests.
>-// \note Input1 should not contain 0 components as it is used as divisor in div cases.
>-// \todo [2012-02-14 pyry] Make these dynamic.
>-static const float  s_constInFloat[2]   = { 0.5f, -0.2f };
>-static const Vec2   s_constInVec2[2]    = { Vec2(1.2f, 0.5f), Vec2(0.5f, 1.0f) };
>-static const Vec3   s_constInVec3[2]    = { Vec3(1.1f, 0.1f, 0.5f), Vec3(-0.2f, 0.5f, 0.8f) };
>-static const Vec4   s_constInVec4[2]    = { Vec4(1.4f, 0.2f, -0.5f, 0.7f), Vec4(0.2f, -1.0f, 0.5f, 0.8f) };
>-
>-static const float s_constInMat20[] = { 0.6f, -1.0f, 0.7f, 0.4f };
>-static const float s_constInMat21[] = { -0.5f, -0.4f, 0.7f, -0.8f };
>-
>-static const float s_constInMat31[] =
>-{
>-    1.2f,  0.1f, -0.1f,
>-    0.1f,  0.9f,  0.2f,
>-    0.2f, -0.1f,  0.7f
>-};
>-static const float s_constInMat41[] =
>-{
>-     1.2f, -0.2f,  0.4f,  0.1f,
>-     0.1f,  0.8f, -0.1f, -0.2f,
>-    -0.2f,  0.1f, -1.1f,  0.3f,
>-     0.1f,  0.2f,  0.3f,  0.9f
>-};
>-
>-static const Mat2   s_constInMat2[2]    = { tcu::Mat2(s_constInMat20), tcu::Mat2(s_constInMat21) };
>-static const Mat3   s_constInMat3[2]    = { tcu::translationMatrix(tcu::Vec2(0.2f, -0.3f)), tcu::Mat3(s_constInMat31) };
>-static const Mat4   s_constInMat4[2]    = { tcu::translationMatrix(tcu::Vec3(0.2f, -0.3f, 0.15f)), tcu::Mat4(s_constInMat41) };
>-
>-namespace MatrixCaseUtils
>-{
>-
>-enum InputType
>-{
>-    INPUTTYPE_CONST = 0,
>-    INPUTTYPE_UNIFORM,
>-    INPUTTYPE_DYNAMIC,
>-
>-    INPUTTYPE_LAST
>-};
>-
>-struct ShaderInput
>-{
>-    ShaderInput (InputType inputType_, DataType dataType_, Precision precision_)
>-        : inputType (inputType_)
>-        , dataType  (dataType_)
>-        , precision (precision_)
>-    {
>-    }
>-
>-    InputType       inputType;
>-    DataType        dataType;
>-    Precision       precision;
>-};
>-
>-enum MatrixOp
>-{
>-    OP_ADD = 0,
>-    OP_SUB,
>-    OP_MUL,
>-    OP_DIV,
>-    OP_COMP_MUL,
>-    OP_UNARY_PLUS,
>-    OP_NEGATION,
>-    OP_PRE_INCREMENT,
>-    OP_PRE_DECREMENT,
>-    OP_POST_INCREMENT,
>-    OP_POST_DECREMENT,
>-    OP_ADD_INTO,
>-    OP_SUBTRACT_FROM,
>-    OP_MULTIPLY_INTO,
>-    OP_DIVIDE_INTO,
>-
>-    OP_LAST
>-};
>-
>-// Type traits.
>-
>-template <int DataT>
>-struct TypeTraits;
>-
>-#define DECLARE_TYPE_TRAIT(DATATYPE, TYPE)  \
>-template<>                                  \
>-struct TypeTraits<DATATYPE> {               \
>-    typedef TYPE Type;                      \
>-}
>-
>-DECLARE_TYPE_TRAIT(TYPE_FLOAT,      float);
>-DECLARE_TYPE_TRAIT(TYPE_FLOAT_VEC2, tcu::Vec2);
>-DECLARE_TYPE_TRAIT(TYPE_FLOAT_VEC3, tcu::Vec3);
>-DECLARE_TYPE_TRAIT(TYPE_FLOAT_VEC4, tcu::Vec4);
>-DECLARE_TYPE_TRAIT(TYPE_FLOAT_MAT2, tcu::Mat2);
>-DECLARE_TYPE_TRAIT(TYPE_FLOAT_MAT3, tcu::Mat3);
>-DECLARE_TYPE_TRAIT(TYPE_FLOAT_MAT4, tcu::Mat4);
>-
>-// Operation info
>-
>-enum OperationType
>-{
>-    OPERATIONTYPE_BINARY_OPERATOR = 0,
>-    OPERATIONTYPE_BINARY_FUNCTION,
>-    OPERATIONTYPE_UNARY_PREFIX_OPERATOR,
>-    OPERATIONTYPE_UNARY_POSTFIX_OPERATOR,
>-    OPERATIONTYPE_ASSIGNMENT,
>-
>-    OPERATIONTYPE_LAST
>-};
>-
>-static const char* getOperationName (MatrixOp op)
>-{
>-    switch (op)
>-    {
>-        case OP_ADD:            return "+";
>-        case OP_SUB:            return "-";
>-        case OP_MUL:            return "*";
>-        case OP_DIV:            return "/";
>-        case OP_COMP_MUL:       return "matrixCompMult";
>-        case OP_UNARY_PLUS:     return "+";
>-        case OP_NEGATION:       return "-";
>-        case OP_PRE_INCREMENT:  return "++";
>-        case OP_PRE_DECREMENT:  return "--";
>-        case OP_POST_INCREMENT: return "++";
>-        case OP_POST_DECREMENT: return "--";
>-        case OP_ADD_INTO:       return "+=";
>-        case OP_SUBTRACT_FROM:  return "-=";
>-        case OP_MULTIPLY_INTO:  return "*=";
>-        case OP_DIVIDE_INTO:    return "/=";
>-        default:
>-            DE_ASSERT(DE_FALSE);
>-            return "";
>-    }
>-}
>-
>-static OperationType getOperationType (MatrixOp op)
>-{
>-    switch (op)
>-    {
>-        case OP_ADD:            return OPERATIONTYPE_BINARY_OPERATOR;
>-        case OP_SUB:            return OPERATIONTYPE_BINARY_OPERATOR;
>-        case OP_MUL:            return OPERATIONTYPE_BINARY_OPERATOR;
>-        case OP_DIV:            return OPERATIONTYPE_BINARY_OPERATOR;
>-        case OP_COMP_MUL:       return OPERATIONTYPE_BINARY_FUNCTION;
>-        case OP_UNARY_PLUS:     return OPERATIONTYPE_UNARY_PREFIX_OPERATOR;
>-        case OP_NEGATION:       return OPERATIONTYPE_UNARY_PREFIX_OPERATOR;
>-        case OP_PRE_INCREMENT:  return OPERATIONTYPE_UNARY_PREFIX_OPERATOR;
>-        case OP_PRE_DECREMENT:  return OPERATIONTYPE_UNARY_PREFIX_OPERATOR;
>-        case OP_POST_INCREMENT: return OPERATIONTYPE_UNARY_POSTFIX_OPERATOR;
>-        case OP_POST_DECREMENT: return OPERATIONTYPE_UNARY_POSTFIX_OPERATOR;
>-        case OP_ADD_INTO:       return OPERATIONTYPE_ASSIGNMENT;
>-        case OP_SUBTRACT_FROM:  return OPERATIONTYPE_ASSIGNMENT;
>-        case OP_MULTIPLY_INTO:  return OPERATIONTYPE_ASSIGNMENT;
>-        case OP_DIVIDE_INTO:    return OPERATIONTYPE_ASSIGNMENT;
>-        default:
>-            DE_ASSERT(DE_FALSE);
>-            return OPERATIONTYPE_LAST;
>-    }
>-}
>-
>-enum TestMatrixType
>-{
>-    TESTMATRIXTYPE_DEFAULT = 0,
>-    TESTMATRIXTYPE_NEGATED,
>-    TESTMATRIXTYPE_INCREMENTED,
>-    TESTMATRIXTYPE_DECREMENTED,
>-
>-    TESTMATRIXTYPE_LAST
>-};
>-
>-static TestMatrixType getOperationTestMatrixType (MatrixOp op)
>-{
>-    switch(op)
>-    {
>-        case OP_ADD:            return TESTMATRIXTYPE_DEFAULT;
>-        case OP_SUB:            return TESTMATRIXTYPE_DEFAULT;
>-        case OP_MUL:            return TESTMATRIXTYPE_DEFAULT;
>-        case OP_DIV:            return TESTMATRIXTYPE_DEFAULT;
>-        case OP_COMP_MUL:       return TESTMATRIXTYPE_DEFAULT;
>-        case OP_UNARY_PLUS:     return TESTMATRIXTYPE_DEFAULT;
>-        case OP_NEGATION:       return TESTMATRIXTYPE_NEGATED;
>-        case OP_PRE_INCREMENT:  return TESTMATRIXTYPE_NEGATED;
>-        case OP_PRE_DECREMENT:  return TESTMATRIXTYPE_INCREMENTED;
>-        case OP_POST_INCREMENT: return TESTMATRIXTYPE_NEGATED;
>-        case OP_POST_DECREMENT: return TESTMATRIXTYPE_DEFAULT;
>-        case OP_ADD_INTO:       return TESTMATRIXTYPE_DECREMENTED;
>-        case OP_SUBTRACT_FROM:  return TESTMATRIXTYPE_DEFAULT;
>-        case OP_MULTIPLY_INTO:  return TESTMATRIXTYPE_DEFAULT;
>-        case OP_DIVIDE_INTO:    return TESTMATRIXTYPE_DEFAULT;
>-
>-        default:
>-            DE_ASSERT(DE_FALSE);
>-            return TESTMATRIXTYPE_LAST;
>-    }
>-}
>-
>-static bool isOperationBinary (MatrixOp op)
>-{
>-    return getOperationType(op) == OPERATIONTYPE_BINARY_OPERATOR ||
>-           getOperationType(op) == OPERATIONTYPE_BINARY_FUNCTION ||
>-           getOperationType(op) == OPERATIONTYPE_ASSIGNMENT;
>-}
>-
>-static bool isOperationMatrixScalar (MatrixOp op)
>-{
>-    return op == OP_ADD || op == OP_SUB || op == OP_MUL || op == OP_DIV;
>-}
>-
>-static bool isOperationMatrixVector (MatrixOp op)
>-{
>-    return op == OP_MUL;
>-}
>-
>-static bool isOperationMatrixMatrix (MatrixOp op)
>-{
>-    return op == OP_ADD || op == OP_SUB || op == OP_MUL || op == OP_DIV || op == OP_COMP_MUL;
>-}
>-
>-static bool isOperationUnary (MatrixOp op)
>-{
>-    return  op == OP_UNARY_PLUS         ||
>-            op == OP_NEGATION           ||
>-            op == OP_PRE_INCREMENT      ||
>-            op == OP_PRE_DECREMENT      ||
>-            op == OP_POST_INCREMENT     ||
>-            op == OP_POST_DECREMENT;
>-}
>-
>-static bool isOperationValueModifying (MatrixOp op)
>-{
>-    return  op == OP_PRE_INCREMENT      ||
>-            op == OP_PRE_DECREMENT      ||
>-            op == OP_POST_INCREMENT     ||
>-            op == OP_POST_DECREMENT;
>-}
>-
>-static bool isOperationAssignment (MatrixOp op)
>-{
>-    return  op == OP_ADD_INTO        ||
>-            op == OP_SUBTRACT_FROM   ||
>-            op == OP_MULTIPLY_INTO   ||
>-            op == OP_DIVIDE_INTO;
>-}
>-
>-// Operation nature
>-
>-enum OperationNature
>-{
>-    OPERATIONNATURE_PURE = 0,
>-    OPERATIONNATURE_MUTATING,
>-    OPERATIONNATURE_ASSIGNMENT,
>-
>-    OPERATIONNATURE_LAST
>-};
>-
>-static OperationNature getOperationNature (MatrixOp op)
>-{
>-    if (isOperationAssignment(op))
>-        return OPERATIONNATURE_ASSIGNMENT;
>-
>-    if (isOperationValueModifying(op))
>-        return OPERATIONNATURE_MUTATING;
>-
>-    return OPERATIONNATURE_PURE;
>-}
>-
>-// Input value loader.
>-
>-template <int InputT, int DataT>
>-typename TypeTraits<DataT>::Type getInputValue (const ShaderEvalContext& evalCtx, int inputNdx);
>-
>-template <> inline float        getInputValue<INPUTTYPE_CONST,      TYPE_FLOAT>         (const ShaderEvalContext& evalCtx, int inputNdx) { DE_UNREF(evalCtx); return s_constInFloat[inputNdx];  }
>-template <> inline tcu::Vec2    getInputValue<INPUTTYPE_CONST,      TYPE_FLOAT_VEC2>    (const ShaderEvalContext& evalCtx, int inputNdx) { DE_UNREF(evalCtx); return s_constInVec2[inputNdx];   }
>-template <> inline tcu::Vec3    getInputValue<INPUTTYPE_CONST,      TYPE_FLOAT_VEC3>    (const ShaderEvalContext& evalCtx, int inputNdx) { DE_UNREF(evalCtx); return s_constInVec3[inputNdx];   }
>-template <> inline tcu::Vec4    getInputValue<INPUTTYPE_CONST,      TYPE_FLOAT_VEC4>    (const ShaderEvalContext& evalCtx, int inputNdx) { DE_UNREF(evalCtx); return s_constInVec4[inputNdx];   }
>-template <> inline tcu::Mat2    getInputValue<INPUTTYPE_CONST,      TYPE_FLOAT_MAT2>    (const ShaderEvalContext& evalCtx, int inputNdx) { DE_UNREF(evalCtx); return s_constInMat2[inputNdx];   }
>-template <> inline tcu::Mat3    getInputValue<INPUTTYPE_CONST,      TYPE_FLOAT_MAT3>    (const ShaderEvalContext& evalCtx, int inputNdx) { DE_UNREF(evalCtx); return s_constInMat3[inputNdx];   }
>-template <> inline tcu::Mat4    getInputValue<INPUTTYPE_CONST,      TYPE_FLOAT_MAT4>    (const ShaderEvalContext& evalCtx, int inputNdx) { DE_UNREF(evalCtx); return s_constInMat4[inputNdx];   }
>-
>-template <> inline float        getInputValue<INPUTTYPE_DYNAMIC,    TYPE_FLOAT>         (const ShaderEvalContext& evalCtx, int inputNdx) { DE_UNREF(inputNdx); return evalCtx.coords.x();                   }
>-template <> inline tcu::Vec2    getInputValue<INPUTTYPE_DYNAMIC,    TYPE_FLOAT_VEC2>    (const ShaderEvalContext& evalCtx, int inputNdx) { DE_UNREF(inputNdx); return evalCtx.coords.swizzle(0, 1);         }
>-template <> inline tcu::Vec3    getInputValue<INPUTTYPE_DYNAMIC,    TYPE_FLOAT_VEC3>    (const ShaderEvalContext& evalCtx, int inputNdx) { DE_UNREF(inputNdx); return evalCtx.coords.swizzle(0, 1, 2);      }
>-template <> inline tcu::Vec4    getInputValue<INPUTTYPE_DYNAMIC,    TYPE_FLOAT_VEC4>    (const ShaderEvalContext& evalCtx, int inputNdx) { DE_UNREF(inputNdx); return evalCtx.coords.swizzle(0, 1, 2, 3);   }
>-
>-template <> inline tcu::Mat2 getInputValue<INPUTTYPE_DYNAMIC, TYPE_FLOAT_MAT2> (const ShaderEvalContext& evalCtx, int inputNdx)
>-{
>-    DE_UNREF(inputNdx); // Not used.
>-    tcu::Mat2 m;
>-    m.setColumn(0, evalCtx.in[0].swizzle(0,1));
>-    m.setColumn(1, evalCtx.in[1].swizzle(0,1));
>-    return m;
>-}
>-
>-template <> inline tcu::Mat3 getInputValue<INPUTTYPE_DYNAMIC, TYPE_FLOAT_MAT3> (const ShaderEvalContext& evalCtx, int inputNdx)
>-{
>-    DE_UNREF(inputNdx); // Not used.
>-    tcu::Mat3 m;
>-    m.setColumn(0, evalCtx.in[0].swizzle(0,1,2));
>-    m.setColumn(1, evalCtx.in[1].swizzle(0,1,2));
>-    m.setColumn(2, evalCtx.in[2].swizzle(0,1,2));
>-    return m;
>-}
>-
>-template <> inline tcu::Mat4 getInputValue<INPUTTYPE_DYNAMIC, TYPE_FLOAT_MAT4> (const ShaderEvalContext& evalCtx, int inputNdx)
>-{
>-    DE_UNREF(inputNdx); // Not used.
>-    tcu::Mat4 m;
>-    m.setColumn(0, evalCtx.in[0]);
>-    m.setColumn(1, evalCtx.in[1]);
>-    m.setColumn(2, evalCtx.in[2]);
>-    m.setColumn(3, evalCtx.in[3]);
>-    return m;
>-}
>-
>-// Reduction from expression result to vec3.
>-
>-inline tcu::Vec3 reduceToVec3 (const tcu::Vec2& value) { return value.swizzle(0,1,0); }
>-inline tcu::Vec3 reduceToVec3 (const tcu::Vec3& value) { return value; }
>-inline tcu::Vec3 reduceToVec3 (const tcu::Vec4& value) { return tcu::Vec3(value.x(), value.y(), value.z()+value.w()); }
>-inline tcu::Vec3 reduceToVec3 (const tcu::Mat2& value) { return tcu::Vec3(value(0, 0), value(0, 1), value(1, 0)+value(1, 1)); }
>-inline tcu::Vec3 reduceToVec3 (const tcu::Mat3& value) { return value.getColumn(0) + value.getColumn(1) + value.getColumn(2); }
>-inline tcu::Vec3 reduceToVec3 (const tcu::Mat4& value) { return value.getColumn(0).swizzle(0,1,2) + value.getColumn(1).swizzle(1,2,3) + value.getColumn(2).swizzle(2,3,0) + value.getColumn(3).swizzle(3,0,1); }
>-
>-// matrixCompMult
>-
>-template <typename T, int Rows, int Cols>
>-tcu::Matrix<T, Rows, Cols> matrixCompMult (const tcu::Matrix<T, Rows, Cols>& a, const tcu::Matrix<T, Rows, Cols>& b)
>-{
>-    tcu::Matrix<T, Rows, Cols> retVal;
>-
>-    for (int r = 0; r < Rows; ++r)
>-        for (int c = 0; c < Cols; ++c)
>-            retVal(r,c) = a(r,c) * b(r, c);
>-
>-    return retVal;
>-}
>-
>-// negate
>-
>-template <typename T, int Rows, int Cols>
>-tcu::Matrix<T, Rows, Cols> negate (const tcu::Matrix<T, Rows, Cols>& mat)
>-{
>-    tcu::Matrix<T, Rows, Cols> retVal;
>-
>-    for (int r = 0; r < Rows; ++r)
>-        for (int c = 0; c < Cols; ++c)
>-            retVal(r,c) = -mat(r, c);
>-
>-    return retVal;
>-}
>-
>-// increment/decrement
>-
>-template <typename T, int Rows, int Cols>
>-tcu::Matrix<T, Rows, Cols> increment (const tcu::Matrix<T, Rows, Cols>& mat)
>-{
>-    tcu::Matrix<T, Rows, Cols> retVal;
>-
>-    for (int r = 0; r < Rows; ++r)
>-        for (int c = 0; c < Cols; ++c)
>-            retVal(r,c) = mat(r, c) + 1.0f;
>-
>-    return retVal;
>-}
>-
>-template <typename T, int Rows, int Cols>
>-tcu::Matrix<T, Rows, Cols> decrement (const tcu::Matrix<T, Rows, Cols>& mat)
>-{
>-    tcu::Matrix<T, Rows, Cols> retVal;
>-
>-    for (int r = 0; r < Rows; ++r)
>-        for (int c = 0; c < Cols; ++c)
>-            retVal(r,c) = mat(r, c) - 1.0f;
>-
>-    return retVal;
>-}
>-
>-// Evaluator template.
>-
>-template <int Op, int In0Type, int In0DataType, int In1Type, int In1DataType>
>-struct Evaluator;
>-
>-template <int In0Type, int In0DataType, int In1Type, int In1DataType>
>-struct Evaluator<OP_ADD, In0Type, In0DataType, In1Type, In1DataType>
>-{
>-    static void evaluate (ShaderEvalContext& evalCtx)
>-    {
>-        evalCtx.color.xyz() = reduceToVec3(getInputValue<In0Type, In0DataType>(evalCtx, 0) + getInputValue<In1Type, In1DataType>(evalCtx, 1));
>-    }
>-};
>-
>-template <int In0Type, int In0DataType, int In1Type, int In1DataType>
>-struct Evaluator<OP_SUB, In0Type, In0DataType, In1Type, In1DataType>
>-{
>-    static void evaluate (ShaderEvalContext& evalCtx)
>-    {
>-        evalCtx.color.xyz() = reduceToVec3(getInputValue<In0Type, In0DataType>(evalCtx, 0) - getInputValue<In1Type, In1DataType>(evalCtx, 1));
>-    }
>-};
>-
>-template <int In0Type, int In0DataType, int In1Type, int In1DataType>
>-struct Evaluator<OP_MUL, In0Type, In0DataType, In1Type, In1DataType>
>-{
>-    static void evaluate (ShaderEvalContext& evalCtx)
>-    {
>-        evalCtx.color.xyz() = reduceToVec3(getInputValue<In0Type, In0DataType>(evalCtx, 0) * getInputValue<In1Type, In1DataType>(evalCtx, 1));
>-    }
>-};
>-
>-template <int In0Type, int In0DataType, int In1Type, int In1DataType>
>-struct Evaluator<OP_DIV, In0Type, In0DataType, In1Type, In1DataType>
>-{
>-    static void evaluate (ShaderEvalContext& evalCtx)
>-    {
>-        evalCtx.color.xyz() = reduceToVec3(getInputValue<In0Type, In0DataType>(evalCtx, 0) / getInputValue<In1Type, In1DataType>(evalCtx, 1));
>-    }
>-};
>-
>-template <int In0Type, int In0DataType, int In1Type, int In1DataType>
>-struct Evaluator<OP_COMP_MUL, In0Type, In0DataType, In1Type, In1DataType>
>-{
>-    static void evaluate (ShaderEvalContext& evalCtx)
>-    {
>-        evalCtx.color.xyz() = reduceToVec3(matrixCompMult(getInputValue<In0Type, In0DataType>(evalCtx, 0), getInputValue<In1Type, In1DataType>(evalCtx, 1)));
>-    }
>-};
>-
>-template <int In0Type, int In0DataType, int In1Type, int In1DataType>
>-struct Evaluator<OP_UNARY_PLUS, In0Type, In0DataType, In1Type, In1DataType>
>-{
>-    static void evaluate (ShaderEvalContext& evalCtx)
>-    {
>-        evalCtx.color.xyz() = reduceToVec3(getInputValue<In0Type, In0DataType>(evalCtx, 0));
>-    }
>-};
>-
>-template <int In0Type, int In0DataType, int In1Type, int In1DataType>
>-struct Evaluator<OP_NEGATION, In0Type, In0DataType, In1Type, In1DataType>
>-{
>-    static void evaluate (ShaderEvalContext& evalCtx)
>-    {
>-        evalCtx.color.xyz() = reduceToVec3(negate(getInputValue<In0Type, In0DataType>(evalCtx, 0)));
>-    }
>-};
>-
>-template <int In0Type, int In0DataType, int In1Type, int In1DataType>
>-struct Evaluator<OP_PRE_INCREMENT, In0Type, In0DataType, In1Type, In1DataType>
>-{
>-    static void evaluate (ShaderEvalContext& evalCtx)
>-    {
>-        // modifying reduction: sum modified value too
>-        evalCtx.color.xyz() = reduceToVec3(increment(getInputValue<In0Type, In0DataType>(evalCtx, 0))) + reduceToVec3(increment(getInputValue<In0Type, In0DataType>(evalCtx, 0)));
>-    }
>-};
>-
>-template <int In0Type, int In0DataType, int In1Type, int In1DataType>
>-struct Evaluator<OP_PRE_DECREMENT, In0Type, In0DataType, In1Type, In1DataType>
>-{
>-    static void evaluate (ShaderEvalContext& evalCtx)
>-    {
>-        // modifying reduction: sum modified value too
>-        evalCtx.color.xyz() = reduceToVec3(decrement(getInputValue<In0Type, In0DataType>(evalCtx, 0))) + reduceToVec3(decrement(getInputValue<In0Type, In0DataType>(evalCtx, 0)));
>-    }
>-};
>-
>-template <int In0Type, int In0DataType, int In1Type, int In1DataType>
>-struct Evaluator<OP_POST_INCREMENT, In0Type, In0DataType, In1Type, In1DataType>
>-{
>-    static void evaluate (ShaderEvalContext& evalCtx)
>-    {
>-        // modifying reduction: sum modified value too
>-        evalCtx.color.xyz() = reduceToVec3(getInputValue<In0Type, In0DataType>(evalCtx, 0)) + reduceToVec3(increment(getInputValue<In0Type, In0DataType>(evalCtx, 0)));
>-    }
>-};
>-
>-template <int In0Type, int In0DataType, int In1Type, int In1DataType>
>-struct Evaluator<OP_POST_DECREMENT, In0Type, In0DataType, In1Type, In1DataType>
>-{
>-    static void evaluate (ShaderEvalContext& evalCtx)
>-    {
>-        // modifying reduction: sum modified value too
>-        evalCtx.color.xyz() = reduceToVec3(getInputValue<In0Type, In0DataType>(evalCtx, 0)) + reduceToVec3(decrement(getInputValue<In0Type, In0DataType>(evalCtx, 0)));
>-    }
>-};
>-
>-template <int In0Type, int In0DataType, int In1Type, int In1DataType>
>-struct Evaluator<OP_ADD_INTO, In0Type, In0DataType, In1Type, In1DataType>
>-{
>-    static void evaluate (ShaderEvalContext& evalCtx)
>-    {
>-        evalCtx.color.xyz() = reduceToVec3(getInputValue<In0Type, In0DataType>(evalCtx, 0) + getInputValue<In1Type, In1DataType>(evalCtx, 1));
>-    }
>-};
>-
>-template <int In0Type, int In0DataType, int In1Type, int In1DataType>
>-struct Evaluator<OP_SUBTRACT_FROM, In0Type, In0DataType, In1Type, In1DataType>
>-{
>-    static void evaluate (ShaderEvalContext& evalCtx)
>-    {
>-        evalCtx.color.xyz() = reduceToVec3(getInputValue<In0Type, In0DataType>(evalCtx, 0) - getInputValue<In1Type, In1DataType>(evalCtx, 1));
>-    }
>-};
>-
>-template <int In0Type, int In0DataType, int In1Type, int In1DataType>
>-struct Evaluator<OP_MULTIPLY_INTO, In0Type, In0DataType, In1Type, In1DataType>
>-{
>-    static void evaluate (ShaderEvalContext& evalCtx)
>-    {
>-        evalCtx.color.xyz() = reduceToVec3(getInputValue<In0Type, In0DataType>(evalCtx, 0) * getInputValue<In1Type, In1DataType>(evalCtx, 1));
>-    }
>-};
>-
>-template <int In0Type, int In0DataType, int In1Type, int In1DataType>
>-struct Evaluator<OP_DIVIDE_INTO, In0Type, In0DataType, In1Type, In1DataType>
>-{
>-    static void evaluate (ShaderEvalContext& evalCtx)
>-    {
>-        evalCtx.color.xyz() = reduceToVec3(getInputValue<In0Type, In0DataType>(evalCtx, 0) / getInputValue<In1Type, In1DataType>(evalCtx, 1));
>-    }
>-};
>-
>-ShaderEvalFunc getEvalFunc (const ShaderInput& in0, const ShaderInput& in1, MatrixOp op)
>-{
>-    DE_STATIC_ASSERT(TYPE_LAST      <= (1<<7));
>-    DE_STATIC_ASSERT(OP_LAST        <= (1<<4));
>-    DE_STATIC_ASSERT(INPUTTYPE_LAST <= (1<<2));
>-
>-#define PACK_EVAL_CASE(OP, IN0TYPE, IN0DATATYPE, IN1TYPE, IN1DATATYPE)  (((OP) << 18) | ((IN0TYPE) << 16) | ((IN0DATATYPE) << 9) | ((IN1TYPE) << 7) | (IN1DATATYPE))
>-
>-#define MAKE_EVAL_CASE(OP, IN0TYPE, IN0DATATYPE, IN1TYPE, IN1DATATYPE)      \
>-    case PACK_EVAL_CASE(OP, IN0TYPE, IN0DATATYPE, IN1TYPE, IN1DATATYPE):    \
>-        return Evaluator<OP, IN0TYPE, IN0DATATYPE, IN1TYPE, IN1DATATYPE>::evaluate
>-
>-#define SCALAR_OPS(IN0TYPE, IN0DATATYPE, IN1TYPE, IN1DATATYPE)  \
>-    MAKE_EVAL_CASE(OP_ADD,      IN0TYPE, IN0DATATYPE, IN1TYPE, IN1DATATYPE);    \
>-    MAKE_EVAL_CASE(OP_SUB,      IN0TYPE, IN0DATATYPE, IN1TYPE, IN1DATATYPE);    \
>-    MAKE_EVAL_CASE(OP_MUL,      IN0TYPE, IN0DATATYPE, IN1TYPE, IN1DATATYPE);    \
>-    MAKE_EVAL_CASE(OP_DIV,      IN0TYPE, IN0DATATYPE, IN1TYPE, IN1DATATYPE)
>-
>-#define ALL_OPS(IN0TYPE, IN0DATATYPE, IN1TYPE, IN1DATATYPE) \
>-    MAKE_EVAL_CASE(OP_ADD,          IN0TYPE, IN0DATATYPE, IN1TYPE, IN1DATATYPE);    \
>-    MAKE_EVAL_CASE(OP_SUB,          IN0TYPE, IN0DATATYPE, IN1TYPE, IN1DATATYPE);    \
>-    MAKE_EVAL_CASE(OP_MUL,          IN0TYPE, IN0DATATYPE, IN1TYPE, IN1DATATYPE);    \
>-    MAKE_EVAL_CASE(OP_DIV,          IN0TYPE, IN0DATATYPE, IN1TYPE, IN1DATATYPE);    \
>-    MAKE_EVAL_CASE(OP_COMP_MUL,     IN0TYPE, IN0DATATYPE, IN1TYPE, IN1DATATYPE);
>-
>-#define MUL_OP(IN0TYPE, IN0DATATYPE, IN1TYPE, IN1DATATYPE)  \
>-    MAKE_EVAL_CASE(OP_MUL, IN0TYPE, IN0DATATYPE, IN1TYPE, IN1DATATYPE)
>-
>-#define MAKE_MAT_SCALAR_VEC_CASES(OP, TYPE0, TYPE1)             \
>-    OP(INPUTTYPE_CONST,     TYPE0, INPUTTYPE_CONST,     TYPE1); \
>-    OP(INPUTTYPE_DYNAMIC,   TYPE0, INPUTTYPE_CONST,     TYPE1); \
>-    OP(INPUTTYPE_CONST,     TYPE0, INPUTTYPE_DYNAMIC,   TYPE1); \
>-    OP(INPUTTYPE_DYNAMIC,   TYPE0, INPUTTYPE_DYNAMIC,   TYPE1)
>-
>-#define MAKE_MAT_MAT_CASES(OP, MATTYPE)                             \
>-    OP(INPUTTYPE_CONST,     MATTYPE, INPUTTYPE_CONST,   MATTYPE);   \
>-    OP(INPUTTYPE_DYNAMIC,   MATTYPE, INPUTTYPE_CONST,   MATTYPE)
>-
>-#define UNARY_OP(IN0TYPE, IN0DATATYPE)                                                      \
>-    MAKE_EVAL_CASE(OP_UNARY_PLUS,       IN0TYPE, IN0DATATYPE, INPUTTYPE_CONST, TYPE_LAST);  \
>-    MAKE_EVAL_CASE(OP_NEGATION,         IN0TYPE, IN0DATATYPE, INPUTTYPE_CONST, TYPE_LAST);  \
>-    MAKE_EVAL_CASE(OP_PRE_INCREMENT,    IN0TYPE, IN0DATATYPE, INPUTTYPE_CONST, TYPE_LAST);  \
>-    MAKE_EVAL_CASE(OP_PRE_DECREMENT,    IN0TYPE, IN0DATATYPE, INPUTTYPE_CONST, TYPE_LAST);  \
>-    MAKE_EVAL_CASE(OP_POST_INCREMENT,   IN0TYPE, IN0DATATYPE, INPUTTYPE_CONST, TYPE_LAST);  \
>-    MAKE_EVAL_CASE(OP_POST_DECREMENT,   IN0TYPE, IN0DATATYPE, INPUTTYPE_CONST, TYPE_LAST)
>-
>-#define MAKE_UNARY_CASES(OP, MATTYPE)   \
>-    OP(INPUTTYPE_CONST,     MATTYPE);   \
>-    OP(INPUTTYPE_DYNAMIC,   MATTYPE)
>-
>-#define ASSIGN_OP(IN0TYPE, IN0DATATYPE, IN1TYPE, IN1DATATYPE)                           \
>-    MAKE_EVAL_CASE(OP_ADD_INTO,         IN0TYPE, IN0DATATYPE, IN1TYPE, IN1DATATYPE);    \
>-    MAKE_EVAL_CASE(OP_SUBTRACT_FROM,    IN0TYPE, IN0DATATYPE, IN1TYPE, IN1DATATYPE);    \
>-    MAKE_EVAL_CASE(OP_MULTIPLY_INTO,    IN0TYPE, IN0DATATYPE, IN1TYPE, IN1DATATYPE);    \
>-    MAKE_EVAL_CASE(OP_DIVIDE_INTO,      IN0TYPE, IN0DATATYPE, IN1TYPE, IN1DATATYPE)
>-
>-#define MAKE_ASSIGNMENT_CASES(OP, MATTYPE)                      \
>-    OP(INPUTTYPE_CONST,     MATTYPE, INPUTTYPE_CONST,   MATTYPE);   \
>-    OP(INPUTTYPE_DYNAMIC,   MATTYPE, INPUTTYPE_CONST,   MATTYPE);   \
>-    OP(INPUTTYPE_CONST,     MATTYPE, INPUTTYPE_DYNAMIC, MATTYPE);   \
>-    OP(INPUTTYPE_DYNAMIC,   MATTYPE, INPUTTYPE_DYNAMIC, MATTYPE)
>-
>-    // \note At the moment there is no difference between uniform and const inputs. This saves binary size.
>-    InputType in0Type = in0.inputType == INPUTTYPE_DYNAMIC ? INPUTTYPE_DYNAMIC : INPUTTYPE_CONST;
>-    InputType in1Type = in1.inputType == INPUTTYPE_DYNAMIC ? INPUTTYPE_DYNAMIC : INPUTTYPE_CONST;
>-
>-    switch (PACK_EVAL_CASE(op, in0Type, in0.dataType, in1Type, in1.dataType))
>-    {
>-        // Matrix-scalar.
>-        MAKE_MAT_SCALAR_VEC_CASES(SCALAR_OPS,   TYPE_FLOAT_MAT2, TYPE_FLOAT);
>-        MAKE_MAT_SCALAR_VEC_CASES(SCALAR_OPS,   TYPE_FLOAT_MAT3, TYPE_FLOAT);
>-        MAKE_MAT_SCALAR_VEC_CASES(SCALAR_OPS,   TYPE_FLOAT_MAT4, TYPE_FLOAT);
>-
>-        // Matrix-vector.
>-        MAKE_MAT_SCALAR_VEC_CASES(MUL_OP,       TYPE_FLOAT_MAT2, TYPE_FLOAT_VEC2);
>-        MAKE_MAT_SCALAR_VEC_CASES(MUL_OP,       TYPE_FLOAT_MAT3, TYPE_FLOAT_VEC3);
>-        MAKE_MAT_SCALAR_VEC_CASES(MUL_OP,       TYPE_FLOAT_MAT4, TYPE_FLOAT_VEC4);
>-
>-        // Vector-matrix.
>-        MAKE_MAT_SCALAR_VEC_CASES(MUL_OP,       TYPE_FLOAT_VEC2, TYPE_FLOAT_MAT2);
>-        MAKE_MAT_SCALAR_VEC_CASES(MUL_OP,       TYPE_FLOAT_VEC3, TYPE_FLOAT_MAT3);
>-        MAKE_MAT_SCALAR_VEC_CASES(MUL_OP,       TYPE_FLOAT_VEC4, TYPE_FLOAT_MAT4);
>-
>-        // Matrix-matrix.
>-        MAKE_MAT_MAT_CASES(ALL_OPS, TYPE_FLOAT_MAT2);
>-        MAKE_MAT_MAT_CASES(ALL_OPS, TYPE_FLOAT_MAT3);
>-        MAKE_MAT_MAT_CASES(ALL_OPS, TYPE_FLOAT_MAT4);
>-
>-        // Unary matrix
>-        MAKE_UNARY_CASES(UNARY_OP, TYPE_FLOAT_MAT2);
>-        MAKE_UNARY_CASES(UNARY_OP, TYPE_FLOAT_MAT3);
>-        MAKE_UNARY_CASES(UNARY_OP, TYPE_FLOAT_MAT4);
>-
>-        // Assignment matrix
>-        MAKE_ASSIGNMENT_CASES(ASSIGN_OP, TYPE_FLOAT_MAT2);
>-        MAKE_ASSIGNMENT_CASES(ASSIGN_OP, TYPE_FLOAT_MAT3);
>-        MAKE_ASSIGNMENT_CASES(ASSIGN_OP, TYPE_FLOAT_MAT4);
>-
>-        default:
>-            DE_ASSERT(DE_FALSE);
>-            return DE_NULL;
>-    }
>-
>-#undef PACK_EVAL_CASE
>-#undef MAKE_EVAL_CASE
>-#undef MUL_OP
>-#undef ALL_OPS
>-#undef MAKE_MAT_SCALAR_VEC_CASES
>-#undef MAKE_MAT_MAT_CASES
>-}
>-
>-// Shader source format utilities.
>-
>-template <int Size>
>-void writeVectorConstructor (std::ostream& str, const tcu::Vector<float, Size>& v)
>-{
>-    str << "vec" << Size << "(";
>-    for (int ndx = 0; ndx < Size; ndx++)
>-    {
>-        if (ndx != 0)
>-            str << ", ";
>-        str << de::floatToString(v[ndx], 1);
>-    }
>-    str << ")";
>-}
>-
>-template <int Cols, int Rows>
>-void writeMatrixConstructor (std::ostream& str, const tcu::Matrix<float, Rows, Cols>& m)
>-{
>-    if (Rows == Cols)
>-        str << "mat" << Cols;
>-    else
>-        str << "mat" << Cols << "x" << Rows;
>-
>-    str << "(";
>-    for (int colNdx = 0; colNdx < Cols; colNdx++)
>-    {
>-        for (int rowNdx = 0; rowNdx < Rows; rowNdx++)
>-        {
>-            if (rowNdx > 0 || colNdx > 0)
>-                str << ", ";
>-            str << de::floatToString(m(rowNdx, colNdx), 1);
>-        }
>-    }
>-    str << ")";
>-}
>-
>-} // MatrixCaseUtils
>-
>-using namespace MatrixCaseUtils;
>-
>-class ShaderMatrixCase : public ShaderRenderCase
>-{
>-public:
>-                    ShaderMatrixCase            (Context& context, const char* name, const char* desc, const ShaderInput& in0, const ShaderInput& in1, MatrixOp op, bool isVertexCase);
>-                    ~ShaderMatrixCase           (void);
>-
>-    void            init                        (void);
>-
>-protected:
>-    std::string     genGLSLMatToVec3Reduction   (const glu::DataType& matType, const char* varName);
>-    void            setupUniforms               (int programID, const tcu::Vec4& constCoords);
>-
>-private:
>-    ShaderInput     m_in0;
>-    ShaderInput     m_in1;
>-    MatrixOp        m_op;
>-};
>-
>-ShaderMatrixCase::ShaderMatrixCase (Context& context, const char* name, const char* desc, const ShaderInput& in0, const ShaderInput& in1, MatrixOp op, bool isVertexCase)
>-    : ShaderRenderCase  (context.getTestContext(), context.getRenderContext(), context.getContextInfo(), name, desc, isVertexCase, getEvalFunc(in0, in1, op))
>-    , m_in0             (in0)
>-    , m_in1             (in1)
>-    , m_op              (op)
>-{
>-}
>-
>-ShaderMatrixCase::~ShaderMatrixCase (void)
>-{
>-}
>-
>-void ShaderMatrixCase::init (void)
>-{
>-    std::ostringstream  vtx;
>-    std::ostringstream  frag;
>-    std::ostringstream& op              = m_isVertexCase ? vtx : frag;
>-
>-    bool                isInDynMat0     = isDataTypeMatrix(m_in0.dataType) && m_in0.inputType == INPUTTYPE_DYNAMIC;
>-    bool                isInDynMat1     = isDataTypeMatrix(m_in1.dataType) && m_in1.inputType == INPUTTYPE_DYNAMIC;
>-    string              inValue0;
>-    string              inValue1;
>-    DataType            resultType      = TYPE_LAST;
>-    Precision           resultPrec      = m_in0.precision;
>-    vector<string>      passVars;
>-    int                 numInputs       = (isOperationBinary(m_op)) ? (2) : (1);
>-
>-    std::string         operationValue0;
>-    std::string         operationValue1;
>-
>-    DE_ASSERT(!isInDynMat0 || !isInDynMat1); // Only single dynamic matrix input is allowed.
>-    DE_UNREF(isInDynMat0 && isInDynMat1);
>-
>-    // Compute result type.
>-    if (isDataTypeMatrix(m_in0.dataType) && isDataTypeMatrix(m_in1.dataType))
>-    {
>-        DE_ASSERT(m_in0.dataType == m_in1.dataType);
>-        resultType = m_in0.dataType;
>-    }
>-    else if (getOperationType(m_op) == OPERATIONTYPE_UNARY_PREFIX_OPERATOR ||
>-             getOperationType(m_op) == OPERATIONTYPE_UNARY_POSTFIX_OPERATOR)
>-    {
>-        resultType = m_in0.dataType;
>-    }
>-    else
>-    {
>-        int         matNdx      = isDataTypeMatrix(m_in0.dataType) ? 0 : 1;
>-        DataType    matrixType  = matNdx == 0 ? m_in0.dataType : m_in1.dataType;
>-        DataType    otherType   = matNdx == 0 ? m_in1.dataType : m_in0.dataType;
>-
>-        if (otherType == TYPE_FLOAT)
>-            resultType = matrixType;
>-        else
>-        {
>-            DE_ASSERT(isDataTypeVector(otherType));
>-            resultType = otherType;
>-        }
>-    }
>-
>-    vtx << "attribute highp vec4 a_position;\n";
>-    if (m_isVertexCase)
>-    {
>-        vtx << "varying mediump vec4 v_color;\n";
>-        frag << "varying mediump vec4 v_color;\n";
>-    }
>-
>-    // Input declarations.
>-    for (int inNdx = 0; inNdx < numInputs; inNdx++)
>-    {
>-        const ShaderInput&  in          = inNdx > 0 ? m_in1 : m_in0;
>-        const char*         precName    = getPrecisionName(in.precision);
>-        const char*         typeName    = getDataTypeName(in.dataType);
>-        string&             inValue     = inNdx > 0 ? inValue1 : inValue0;
>-
>-        if (in.inputType == INPUTTYPE_DYNAMIC)
>-        {
>-            vtx << "attribute " << precName << " " << typeName << " a_";
>-
>-            if (isDataTypeMatrix(in.dataType))
>-            {
>-                // a_matN, v_matN
>-                vtx << typeName << ";\n";
>-                if (!m_isVertexCase)
>-                {
>-                    vtx << "varying " << precName << " " << typeName << " v_" << typeName << ";\n";
>-                    frag << "varying " << precName << " " << typeName << " v_" << typeName << ";\n";
>-                    passVars.push_back(typeName);
>-                }
>-
>-                inValue = string(m_isVertexCase ? "a_" : "v_") + getDataTypeName(in.dataType);
>-            }
>-            else
>-            {
>-                // a_coords, v_coords
>-                vtx << "coords;\n";
>-                if (!m_isVertexCase)
>-                {
>-                    vtx << "varying " << precName << " " << typeName << " v_coords;\n";
>-                    frag << "varying " << precName << " " << typeName << " v_coords;\n";
>-                    passVars.push_back("coords");
>-                }
>-
>-                inValue = m_isVertexCase ? "a_coords" : "v_coords";
>-            }
>-        }
>-        else if (in.inputType == INPUTTYPE_UNIFORM)
>-        {
>-            op << "uniform " << precName << " " << typeName << " u_in" << inNdx << ";\n";
>-            inValue = string("u_in") + de::toString(inNdx);
>-        }
>-        else if (in.inputType == INPUTTYPE_CONST)
>-        {
>-            op << "const " << precName << " " << typeName << " in" << inNdx << " = ";
>-
>-            // Generate declaration.
>-            switch (in.dataType)
>-            {
>-                case TYPE_FLOAT:        op << de::floatToString(s_constInFloat[inNdx], 1);                  break;
>-                case TYPE_FLOAT_VEC2:   writeVectorConstructor<2>(op, s_constInVec2[inNdx]);                break;
>-                case TYPE_FLOAT_VEC3:   writeVectorConstructor<3>(op, s_constInVec3[inNdx]);                break;
>-                case TYPE_FLOAT_VEC4:   writeVectorConstructor<4>(op, s_constInVec4[inNdx]);                break;
>-                case TYPE_FLOAT_MAT2:   writeMatrixConstructor<2, 2>(op, Mat2(s_constInMat2[inNdx]));       break;
>-                case TYPE_FLOAT_MAT3:   writeMatrixConstructor<3, 3>(op, Mat3(s_constInMat3[inNdx]));       break;
>-                case TYPE_FLOAT_MAT4:   writeMatrixConstructor<4, 4>(op, Mat4(s_constInMat4[inNdx]));       break;
>-
>-                default:
>-                    DE_ASSERT(DE_FALSE);
>-            }
>-
>-            op << ";\n";
>-
>-            inValue = string("in") + de::toString(inNdx);
>-        }
>-    }
>-
>-    vtx << "\n"
>-        << "void main (void)\n"
>-        << "{\n"
>-        << "    gl_Position = a_position;\n";
>-    frag << "\n"
>-         << "void main (void)\n"
>-         << "{\n";
>-
>-    if (m_isVertexCase)
>-    {
>-        frag << "   gl_FragColor = v_color;\n";
>-    }
>-    else
>-    {
>-        for (vector<string>::const_iterator copyIter = passVars.begin(); copyIter != passVars.end(); copyIter++)
>-            vtx << "    v_" << *copyIter << " = " << "a_" << *copyIter << ";\n";
>-    }
>-
>-    // Operation.
>-
>-    switch (getOperationNature(m_op))
>-    {
>-        case OPERATIONNATURE_PURE:
>-            DE_ASSERT(getOperationType(m_op) != OPERATIONTYPE_ASSIGNMENT);
>-
>-            operationValue0 = inValue0;
>-            operationValue1 = inValue1;
>-            break;
>-
>-        case OPERATIONNATURE_MUTATING:
>-            DE_ASSERT(getOperationType(m_op) != OPERATIONTYPE_ASSIGNMENT);
>-
>-            op << " " << getPrecisionName(resultPrec) << " " << getDataTypeName(resultType) << " tmpValue = " << inValue0 << ";\n";
>-
>-            operationValue0 = "tmpValue";
>-            operationValue1 = inValue1;
>-            break;
>-
>-        case OPERATIONNATURE_ASSIGNMENT:
>-            DE_ASSERT(getOperationType(m_op) == OPERATIONTYPE_ASSIGNMENT);
>-
>-            operationValue0 = inValue0;
>-            operationValue1 = inValue1;
>-            break;
>-
>-        default:
>-            DE_ASSERT(DE_FALSE);
>-    }
>-
>-    switch (getOperationType(m_op))
>-    {
>-        case OPERATIONTYPE_BINARY_OPERATOR:
>-            op << " " << getPrecisionName(resultPrec) << " " << getDataTypeName(resultType) << " res = " << operationValue0 << " " << getOperationName(m_op) << " " << operationValue1 << ";\n";
>-            break;
>-
>-        case OPERATIONTYPE_UNARY_PREFIX_OPERATOR:
>-            op << " " << getPrecisionName(resultPrec) << " " << getDataTypeName(resultType) << " res = " << getOperationName(m_op) << operationValue0 << ";\n";
>-            break;
>-
>-        case OPERATIONTYPE_UNARY_POSTFIX_OPERATOR:
>-            op << " " << getPrecisionName(resultPrec) << " " << getDataTypeName(resultType) << " res = " << operationValue0 << getOperationName(m_op) << ";\n";
>-            break;
>-
>-        case OPERATIONTYPE_BINARY_FUNCTION:
>-            op << " " << getPrecisionName(resultPrec) << " " << getDataTypeName(resultType) << " res = " << getOperationName(m_op) << "(" << operationValue0 << ", " << operationValue1 << ");\n";
>-            break;
>-
>-        case OPERATIONTYPE_ASSIGNMENT:
>-            op << " " << getPrecisionName(resultPrec) << " " << getDataTypeName(resultType) << " res = " << operationValue0 << ";\n";
>-            op << " res " << getOperationName(m_op) << " " << operationValue1 << ";\n";
>-            break;
>-
>-        default:
>-            DE_ASSERT(DE_FALSE);
>-    }
>-
>-    // Reduction to vec3 (rgb). Check the used value too if it was modified.
>-    op << " " << (m_isVertexCase ? "v_color" : "gl_FragColor") << " = ";
>-
>-    if (isOperationValueModifying(m_op))
>-        op << "vec4(" << genGLSLMatToVec3Reduction(resultType, "res") << ", 1.0) + vec4(" << genGLSLMatToVec3Reduction(resultType, "tmpValue") << ", 0.0);\n";
>-    else
>-        op << "vec4(" << genGLSLMatToVec3Reduction(resultType, "res") << ", 1.0);\n";
>-
>-    vtx << "}\n";
>-    frag << "}\n";
>-
>-    m_vertShaderSource  = vtx.str();
>-    m_fragShaderSource  = frag.str();
>-
>-    // \todo [2012-02-14 pyry] Compute better values for matrix tests.
>-    m_userAttribTransforms.resize(4);
>-    for (int attribNdx = 0; attribNdx < 4; attribNdx++)
>-    {
>-        m_userAttribTransforms[attribNdx] = Mat4(0.0f);
>-        m_userAttribTransforms[attribNdx]((0 + attribNdx) % 4, 0) = 1.0f;
>-        m_userAttribTransforms[attribNdx]((1 + attribNdx) % 4, 1) = 1.0f;
>-        m_userAttribTransforms[attribNdx]((2 + attribNdx) % 4, 2) = 1.0f;
>-        m_userAttribTransforms[attribNdx]((3 + attribNdx) % 4, 3) = 1.0f;
>-    }
>-
>-    // prevent bad reference cases such as black result images by fine-tuning used matrices
>-    if (getOperationTestMatrixType(m_op) != TESTMATRIXTYPE_DEFAULT)
>-    {
>-        for (int attribNdx = 0; attribNdx < 4; attribNdx++)
>-        {
>-            for (int row = 0; row < 4; row++)
>-            for (int col = 0; col < 4; col++)
>-            {
>-                switch (getOperationTestMatrixType(m_op))
>-                {
>-                    case TESTMATRIXTYPE_NEGATED:
>-                        m_userAttribTransforms[attribNdx](row, col) = -m_userAttribTransforms[attribNdx](row, col);
>-                        break;
>-                    case TESTMATRIXTYPE_INCREMENTED:
>-                        m_userAttribTransforms[attribNdx](row, col) += 0.3f;
>-                        break;
>-                    case TESTMATRIXTYPE_DECREMENTED:
>-                        m_userAttribTransforms[attribNdx](row, col) -= 0.1f;
>-                        break;
>-
>-                    default:
>-                        DE_ASSERT(DE_FALSE);
>-                        break;
>-                }
>-            }
>-        }
>-    }
>-
>-    ShaderRenderCase::init();
>-}
>-
>-std::string ShaderMatrixCase::genGLSLMatToVec3Reduction (const glu::DataType& matType, const char* varName)
>-{
>-    std::ostringstream op;
>-
>-    switch (matType)
>-    {
>-        case TYPE_FLOAT:        op << varName << ", "       << varName << ", "          << varName << "";                                       break;
>-        case TYPE_FLOAT_VEC2:   op << varName << ".x, "     << varName << ".y, "        << varName << ".x";                                     break;
>-        case TYPE_FLOAT_VEC3:   op << varName << "";                                                                                            break;
>-        case TYPE_FLOAT_VEC4:   op << varName << ".x, "     << varName << ".y, "        << varName << ".z+"         << varName << ".w";         break;
>-        case TYPE_FLOAT_MAT2:   op << varName << "[0][0], " << varName << "[1][0], "    << varName << "[0][1]+"     << varName << "[1][1]";     break;
>-        case TYPE_FLOAT_MAT3:   op << varName << "[0]+"     << varName << "[1]+"        << varName << "[2]";                                    break;
>-        case TYPE_FLOAT_MAT4:   op << varName << "[0].xyz+" << varName << "[1].yzw+"    << varName << "[2].zwx+"    << varName << "[3].wxy";    break;
>-
>-        default:
>-            DE_ASSERT(DE_FALSE);
>-    }
>-
>-    return op.str();
>-}
>-
>-void ShaderMatrixCase::setupUniforms (int programID, const tcu::Vec4& constCoords)
>-{
>-    const glw::Functions& gl = m_renderCtx.getFunctions();
>-
>-    DE_UNREF(constCoords);
>-
>-    for (int inNdx = 0; inNdx < 2; inNdx++)
>-    {
>-        const ShaderInput& in = inNdx > 0 ? m_in1 : m_in0;
>-
>-        if (in.inputType == INPUTTYPE_UNIFORM)
>-        {
>-            int loc = gl.getUniformLocation(programID, (string("u_in") + de::toString(inNdx)).c_str());
>-
>-            if (loc < 0)
>-                continue;
>-
>-            switch (in.dataType)
>-            {
>-                case TYPE_FLOAT:        gl.uniform1f(loc, s_constInFloat[inNdx]);                                                   break;
>-                case TYPE_FLOAT_VEC2:   gl.uniform2fv(loc, 1, s_constInVec2[inNdx].getPtr());                                       break;
>-                case TYPE_FLOAT_VEC3:   gl.uniform3fv(loc, 1, s_constInVec3[inNdx].getPtr());                                       break;
>-                case TYPE_FLOAT_VEC4:   gl.uniform4fv(loc, 1, s_constInVec4[inNdx].getPtr());                                       break;
>-                case TYPE_FLOAT_MAT2:   gl.uniformMatrix2fv(loc, 1, GL_FALSE, s_constInMat2[inNdx].getColumnMajorData().getPtr());  break;
>-                case TYPE_FLOAT_MAT3:   gl.uniformMatrix3fv(loc, 1, GL_FALSE, s_constInMat3[inNdx].getColumnMajorData().getPtr());  break;
>-                case TYPE_FLOAT_MAT4:   gl.uniformMatrix4fv(loc, 1, GL_FALSE, s_constInMat4[inNdx].getColumnMajorData().getPtr());  break;
>-                default:
>-                    DE_ASSERT(false);
>-            }
>-        }
>-    }
>-}
>-
>-ShaderMatrixTests::ShaderMatrixTests (Context& context)
>-    : TestCaseGroup(context, "matrix", "Matrix Tests")
>-{
>-}
>-
>-ShaderMatrixTests::~ShaderMatrixTests (void)
>-{
>-}
>-
>-void ShaderMatrixTests::init (void)
>-{
>-    static const struct
>-    {
>-        const char*     name;
>-        const char*     desc;
>-        MatrixOp        op;
>-        bool            extendedInputTypeCases; // !< test with const and uniform types too
>-    } ops[] =
>-    {
>-        { "add",            "Matrix addition tests",                        OP_ADD,             true    },
>-        { "sub",            "Matrix subtraction tests",                     OP_SUB,             true    },
>-        { "mul",            "Matrix multiplication tests",                  OP_MUL,             true    },
>-        { "div",            "Matrix division tests",                        OP_DIV,             true    },
>-        { "matrixcompmult", "Matrix component-wise multiplication tests",   OP_COMP_MUL,        false   },
>-        { "unary_addition", "Matrix unary addition tests",                  OP_UNARY_PLUS,      false   },
>-        { "negation",       "Matrix negation tests",                        OP_NEGATION,        false   },
>-        { "pre_increment",  "Matrix prefix increment tests",                OP_PRE_INCREMENT,   false   },
>-        { "pre_decrement",  "Matrix prefix decrement tests",                OP_PRE_DECREMENT,   false   },
>-        { "post_increment", "Matrix postfix increment tests",               OP_POST_INCREMENT,  false   },
>-        { "post_decrement", "Matrix postfix decrement tests",               OP_POST_DECREMENT,  false   },
>-        { "add_assign",     "Matrix add into tests",                        OP_ADD_INTO,        false   },
>-        { "sub_assign",     "Matrix subtract from tests",                   OP_SUBTRACT_FROM,   false   },
>-        { "mul_assign",     "Matrix multiply into tests",                   OP_MULTIPLY_INTO,   false   },
>-        { "div_assign",     "Matrix divide into tests",                     OP_DIVIDE_INTO,     false   },
>-    };
>-
>-    struct InputTypeSpec
>-    {
>-        const char*     name;
>-        const char*     desc;
>-        InputType       type;
>-    };
>-    static const InputTypeSpec extendedInputTypes[] =
>-    {
>-        { "const",      "Constant matrix input",    INPUTTYPE_CONST     },
>-        { "uniform",    "Uniform matrix input",     INPUTTYPE_UNIFORM   },
>-        { "dynamic",    "Dynamic matrix input",     INPUTTYPE_DYNAMIC   }
>-    };
>-    static const InputTypeSpec reducedInputTypes[] =
>-    {
>-        { "dynamic",    "Dynamic matrix input",     INPUTTYPE_DYNAMIC   }
>-    };
>-
>-    static const DataType matrixTypes[] =
>-    {
>-        TYPE_FLOAT_MAT2,
>-        TYPE_FLOAT_MAT3,
>-        TYPE_FLOAT_MAT4
>-    };
>-
>-    static const Precision precisions[] =
>-    {
>-        PRECISION_LOWP,
>-        PRECISION_MEDIUMP,
>-        PRECISION_HIGHP
>-    };
>-
>-    for (int opNdx = 0; opNdx < DE_LENGTH_OF_ARRAY(ops); opNdx++)
>-    {
>-        const InputTypeSpec*    inTypeList      = (ops[opNdx].extendedInputTypeCases) ? (extendedInputTypes) : (reducedInputTypes);
>-        const int               inTypeListSize  = (ops[opNdx].extendedInputTypeCases) ? (DE_LENGTH_OF_ARRAY(extendedInputTypes)) : (DE_LENGTH_OF_ARRAY(reducedInputTypes));
>-        const MatrixOp          op              = ops[opNdx].op;
>-        tcu::TestCaseGroup*     opGroup         = new tcu::TestCaseGroup(m_testCtx, ops[opNdx].name, ops[opNdx].desc);
>-
>-        addChild(opGroup);
>-
>-        for (int inTypeNdx = 0; inTypeNdx < inTypeListSize; inTypeNdx++)
>-        {
>-            const InputType     inputType   = inTypeList[inTypeNdx].type;
>-
>-            for (int matTypeNdx = 0; matTypeNdx < DE_LENGTH_OF_ARRAY(matrixTypes); matTypeNdx++)
>-            {
>-                DataType    matType     = matrixTypes[matTypeNdx];
>-                const char* matTypeName = getDataTypeName(matType);
>-
>-                for (int precNdx = 0; precNdx < DE_LENGTH_OF_ARRAY(precisions); precNdx++)
>-                {
>-                    Precision   precision   = precisions[precNdx];
>-                    const char* precName    = getPrecisionName(precision);
>-                    string      baseName    = string(inTypeList[inTypeNdx].name) + "_" + precName + "_" + matTypeName + "_";
>-                    ShaderInput matIn       (inputType, matType, precision);
>-
>-                    if (isOperationMatrixScalar(op))
>-                    {
>-                        // Matrix-scalar \note For div cases we use uniform input.
>-                        ShaderInput scalarIn(op == OP_DIV ? INPUTTYPE_UNIFORM : INPUTTYPE_DYNAMIC, TYPE_FLOAT, precision);
>-                        opGroup->addChild(new ShaderMatrixCase(m_context, (baseName + "float_vertex").c_str(),      "Matrix-scalar case", matIn, scalarIn, op, true));
>-                        opGroup->addChild(new ShaderMatrixCase(m_context, (baseName + "float_fragment").c_str(),    "Matrix-scalar case", matIn, scalarIn, op, false));
>-                    }
>-
>-                    if (isOperationMatrixVector(op))
>-                    {
>-                        // Matrix-vector.
>-                        DataType    vecType = getDataTypeFloatVec(getDataTypeMatrixNumColumns(matType));
>-                        ShaderInput vecIn   (op == OP_DIV ? INPUTTYPE_UNIFORM : INPUTTYPE_DYNAMIC, vecType, precision);
>-
>-                        opGroup->addChild(new ShaderMatrixCase(m_context, (baseName + getDataTypeName(vecType) + "_vertex").c_str(),    "Matrix-vector case", matIn, vecIn, op, true));
>-                        opGroup->addChild(new ShaderMatrixCase(m_context, (baseName + getDataTypeName(vecType) + "_fragment").c_str(),  "Matrix-vector case", matIn, vecIn, op, false));
>-
>-                        // Vector-matrix.
>-                        string vecMatName = string(inTypeList[inTypeNdx].name) + "_" + precName + "_" + getDataTypeName(vecType) + "_" + matTypeName;
>-                        opGroup->addChild(new ShaderMatrixCase(m_context, (vecMatName + "_vertex").c_str(),     "Vector-matrix case", vecIn, matIn, op, true));
>-                        opGroup->addChild(new ShaderMatrixCase(m_context, (vecMatName + "_fragment").c_str(),   "Vector-matrix case", vecIn, matIn, op, false));
>-                    }
>-
>-                    if (isOperationMatrixMatrix(op))
>-                    {
>-                        // Matrix-matrix.
>-                        ShaderInput otherMatIn(inputType == INPUTTYPE_DYNAMIC ? INPUTTYPE_UNIFORM : inputType, matType, precision);
>-                        opGroup->addChild(new ShaderMatrixCase(m_context, (baseName + matTypeName + "_vertex").c_str(),     "Matrix-matrix case", matIn, otherMatIn, op, true));
>-                        opGroup->addChild(new ShaderMatrixCase(m_context, (baseName + matTypeName + "_fragment").c_str(),   "Matrix-matrix case", matIn, otherMatIn, op, false));
>-                    }
>-
>-                    if (isOperationUnary(op))
>-                    {
>-                        // op matrix
>-                        ShaderInput voidInput(INPUTTYPE_LAST, TYPE_LAST, PRECISION_LAST);
>-                        opGroup->addChild(new ShaderMatrixCase(m_context, (baseName + "vertex").c_str(),        "Matrix case", matIn, voidInput, op, true));
>-                        opGroup->addChild(new ShaderMatrixCase(m_context, (baseName + "fragment").c_str(),  "Matrix case", matIn, voidInput, op, false));
>-                    }
>-
>-                    if (isOperationAssignment(op))
>-                    {
>-                        ShaderInput otherMatIn(inputType == INPUTTYPE_DYNAMIC ? INPUTTYPE_UNIFORM : inputType, matType, precision);
>-                        opGroup->addChild(new ShaderMatrixCase(m_context, (baseName + "vertex").c_str(),        "Matrix assignment case", matIn, otherMatIn, op, true));
>-                        opGroup->addChild(new ShaderMatrixCase(m_context, (baseName + "fragment").c_str(),  "Matrix assignment case", matIn, otherMatIn, op, false));
>-                    }
>-                }
>-            }
>-        }
>-    }
>-}
>-
>-} // Functional
>-} // gles2
>-} // deqp
>-
>-#if defined(_MSC_VER) && _MSC_FULL_VER == 191125507
>-// Work around crbug.com/759402 which is a code-gen bug in VC++ 2017, version
>-// 15.3.2.
>-#pragma optimize("", off)
>-#endif
>diff --git a/Source/ThirdParty/ANGLE/src/tests/deqp_support/es3fShaderMatrixTests.cpp b/Source/ThirdParty/ANGLE/src/tests/deqp_support/es3fShaderMatrixTests.cpp
>deleted file mode 100644
>index 25784982c54..00000000000
>--- a/Source/ThirdParty/ANGLE/src/tests/deqp_support/es3fShaderMatrixTests.cpp
>+++ /dev/null
>@@ -1,1979 +0,0 @@
>-/*-------------------------------------------------------------------------
>- * drawElements Quality Program OpenGL ES 3.0 Module
>- * -------------------------------------------------
>- *
>- * Copyright 2014 The Android Open Source Project
>- *
>- * Licensed under the Apache License, Version 2.0 (the "License");
>- * you may not use this file except in compliance with the License.
>- * You may obtain a copy of the License at
>- *
>- *      http://www.apache.org/licenses/LICENSE-2.0
>- *
>- * Unless required by applicable law or agreed to in writing, software
>- * distributed under the License is distributed on an "AS IS" BASIS,
>- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
>- * See the License for the specific language governing permissions and
>- * limitations under the License.
>- *
>- *//*!
>- * \file
>- * \brief Shader matrix arithmetic tests.
>- *
>- * Variables:
>- *  + operation
>- *    - mat OP mat
>- *    - mat OP vec
>- *    - vec OP mat
>- *    - mat OP scalar
>- *    - OP ( mat )
>- *    - vec OP vec
>- *    - OP mat
>- *  + matrix source
>- *    - constant (ctor)
>- *    - uniform
>- *    - vertex input
>- *    - fragment input
>- *  + other operand: always dynamic data?
>- *  + how to reduce to vec3?
>- *//*--------------------------------------------------------------------*/
>-
>-#include "es3fShaderMatrixTests.hpp"
>-#include "glsShaderRenderCase.hpp"
>-#include "gluShaderUtil.hpp"
>-#include "tcuVector.hpp"
>-#include "tcuMatrix.hpp"
>-#include "tcuMatrixUtil.hpp"
>-#include "deStringUtil.hpp"
>-
>-#include "glwEnums.hpp"
>-#include "glwFunctions.hpp"
>-
>-namespace deqp
>-{
>-namespace gles3
>-{
>-namespace Functional
>-{
>-
>-using std::string;
>-using std::vector;
>-using namespace glu;
>-using namespace deqp::gls;
>-
>-using tcu::Vec2;
>-using tcu::Vec3;
>-using tcu::Vec4;
>-using tcu::Mat2;
>-using tcu::Mat2x3;
>-using tcu::Mat2x4;
>-using tcu::Mat3x2;
>-using tcu::Mat3;
>-using tcu::Mat3x4;
>-using tcu::Mat4x2;
>-using tcu::Mat4x3;
>-using tcu::Mat4;
>-
>-// Uniform / constant values for tests.
>-// \note Input1 should not contain 0 components as it is used as divisor in div cases.
>-// \todo [2012-02-14 pyry] Make these dynamic.
>-static const float  s_constInFloat[2]   = { 0.5f, -0.2f };
>-static const Vec2   s_constInVec2[2]    = { Vec2(1.2f, 0.5f), Vec2(0.5f, 1.0f) };
>-static const Vec3   s_constInVec3[2]    = { Vec3(1.1f, 0.1f, 0.5f), Vec3(-0.2f, 0.5f, 0.8f) };
>-static const Vec4   s_constInVec4[2]    = { Vec4(1.4f, 0.2f, -0.5f, 0.7f), Vec4(0.2f, -1.0f, 0.5f, 0.8f) };
>-
>-static const float s_constInMat2x2[2][4] =
>-{
>-    {
>-        -0.1f,  1.0f,
>-        -0.2f,  0.0f,
>-    },
>-    {
>-         0.8f,  0.1f,
>-         0.5f, -0.9f,
>-    },
>-};
>-static const float s_constInMat3x2[2][6] =
>-{
>-    {
>-         0.8f, -0.3f,  0.3f,
>-         1.0f,  1.2f, -1.2f,
>-    },
>-    {
>-         1.2f, -1.0f,  0.5f,
>-        -0.8f,  1.1f,  0.3f,
>-    },
>-};
>-static const float s_constInMat4x2[2][8] =
>-{
>-    {
>-        -0.2f,  0.5f, 0.0f, -1.0f,
>-         1.2f, -0.5f, 0.3f, -0.9f,
>-    },
>-    {
>-        1.0f,  0.1f, -1.1f,  0.6f,
>-        0.8f, -1.2f, -1.1f,  0.7f,
>-    },
>-};
>-static const float s_constInMat2x3[2][6] =
>-{
>-    {
>-        -0.6f, -0.1f,
>-        -0.7f, -1.2f,
>-        -0.2f,  0.0f,
>-    },
>-    {
>-         1.1f,  0.6f,
>-         0.8f,  1.0f,
>-         0.7f,  0.1f,
>-    },
>-};
>-static const float s_constInMat3x3[2][9] =
>-{
>-    {
>-        -0.2f,  1.1f, 1.2f,
>-        -1.0f,  1.2f, 0.5f,
>-         0.7f, -0.2f, 1.0f,
>-    },
>-    {
>-        -0.1f, -0.1f,  0.1f,
>-        -0.1f, -0.2f,  1.0f,
>-        -0.5f,  0.1f, -0.4f,
>-    },
>-};
>-static const float s_constInMat4x3[2][12] =
>-{
>-    {
>-        -0.9f,  0.0f,  0.6f,  0.2f,
>-         0.9f, -0.1f, -0.3f, -0.7f,
>-        -0.1f,  0.1f,  1.0f,  0.0f,
>-    },
>-    {
>-         0.5f,  0.7f,  0.7f,  1.2f,
>-         1.1f,  0.1f,  1.0f, -1.0f,
>-        -0.2f, -0.2f, -0.3f, -0.5f,
>-    },
>-};
>-static const float s_constInMat2x4[2][8] =
>-{
>-    {
>-        -0.6f, -1.1f,
>-        -0.6f, -0.6f,
>-        -0.2f, -0.6f,
>-        -0.1f, -0.1f,
>-    },
>-    {
>-        -1.2f, -1.0f,
>-         0.7f, -1.0f,
>-         0.7f,  0.7f,
>-        -0.4f, -0.3f,
>-    },
>-};
>-static const float s_constInMat3x4[2][12] =
>-{
>-    {
>-         0.6f, -0.4f,  1.2f,
>-         0.9f,  0.8f,  0.4f,
>-         1.1f,  0.3f,  0.5f,
>-        -0.2f,  0.0f,  1.1f,
>-    },
>-    {
>-        -0.8f,  1.2f, -0.2f,
>-        -1.1f, -0.9f, -0.5f,
>-        -1.2f,  1.0f,  1.2f,
>-         0.1f, -0.7f, -0.5f,
>-    },
>-};
>-static const float s_constInMat4x4[2][16] =
>-{
>-    {
>-         0.3f,  0.9f, -0.2f,  1.0f,
>-        -0.4f, -0.6f,  0.6f, -1.0f,
>-        -0.9f, -0.1f,  0.3f, -0.2f,
>-        -0.3f, -0.9f,  1.0f,  0.1f,
>-    },
>-    {
>-         0.4f, -0.7f, -0.8f,  0.7f,
>-        -0.4f, -0.8f,  0.6f, -0.3f,
>-         0.7f, -1.0f,  0.1f, -0.3f,
>-         0.2f,  0.6f,  0.4f, -1.0f,
>-    },
>-};
>-
>-namespace MatrixCaseUtils
>-{
>-
>-enum InputType
>-{
>-    INPUTTYPE_CONST = 0,
>-    INPUTTYPE_UNIFORM,
>-    INPUTTYPE_DYNAMIC,
>-
>-    INPUTTYPE_LAST
>-};
>-
>-struct ShaderInput
>-{
>-    ShaderInput (InputType inputType_, DataType dataType_, Precision precision_)
>-        : inputType (inputType_)
>-        , dataType  (dataType_)
>-        , precision (precision_)
>-    {
>-    }
>-
>-    InputType       inputType;
>-    DataType        dataType;
>-    Precision       precision;
>-};
>-
>-enum MatrixOp
>-{
>-    OP_ADD = 0,
>-    OP_SUB,
>-    OP_MUL,
>-    OP_DIV,
>-    OP_COMP_MUL,
>-    OP_OUTER_PRODUCT,
>-    OP_TRANSPOSE,
>-    OP_INVERSE,
>-    OP_DETERMINANT,
>-    OP_UNARY_PLUS,
>-    OP_NEGATION,
>-    OP_PRE_INCREMENT,
>-    OP_PRE_DECREMENT,
>-    OP_POST_INCREMENT,
>-    OP_POST_DECREMENT,
>-    OP_ADD_INTO,
>-    OP_SUBTRACT_FROM,
>-    OP_MULTIPLY_INTO,
>-    OP_DIVIDE_INTO,
>-    OP_LAST
>-};
>-
>-// Type traits.
>-
>-template <int DataT>
>-struct TypeTraits;
>-
>-#define DECLARE_TYPE_TRAIT(DATATYPE, TYPE)  \
>-template<>                                  \
>-struct TypeTraits<DATATYPE> {               \
>-    typedef TYPE Type;                      \
>-}
>-
>-DECLARE_TYPE_TRAIT(TYPE_FLOAT,          float);
>-DECLARE_TYPE_TRAIT(TYPE_FLOAT_VEC2,     tcu::Vec2);
>-DECLARE_TYPE_TRAIT(TYPE_FLOAT_VEC3,     tcu::Vec3);
>-DECLARE_TYPE_TRAIT(TYPE_FLOAT_VEC4,     tcu::Vec4);
>-DECLARE_TYPE_TRAIT(TYPE_FLOAT_MAT2,     tcu::Mat2);
>-DECLARE_TYPE_TRAIT(TYPE_FLOAT_MAT2X3,   tcu::Mat2x3);
>-DECLARE_TYPE_TRAIT(TYPE_FLOAT_MAT2X4,   tcu::Mat2x4);
>-DECLARE_TYPE_TRAIT(TYPE_FLOAT_MAT3X2,   tcu::Mat3x2);
>-DECLARE_TYPE_TRAIT(TYPE_FLOAT_MAT3,     tcu::Mat3);
>-DECLARE_TYPE_TRAIT(TYPE_FLOAT_MAT3X4,   tcu::Mat3x4);
>-DECLARE_TYPE_TRAIT(TYPE_FLOAT_MAT4X2,   tcu::Mat4x2);
>-DECLARE_TYPE_TRAIT(TYPE_FLOAT_MAT4X3,   tcu::Mat4x3);
>-DECLARE_TYPE_TRAIT(TYPE_FLOAT_MAT4,     tcu::Mat4);
>-
>-// Operation info
>-
>-enum OperationType
>-{
>-    OPERATIONTYPE_BINARY_OPERATOR = 0,
>-    OPERATIONTYPE_BINARY_FUNCTION,
>-    OPERATIONTYPE_UNARY_PREFIX_OPERATOR,
>-    OPERATIONTYPE_UNARY_POSTFIX_OPERATOR,
>-    OPERATIONTYPE_UNARY_FUNCTION,
>-    OPERATIONTYPE_ASSIGNMENT,
>-
>-    OPERATIONTYPE_LAST
>-};
>-
>-static const char* getOperationName (MatrixOp op)
>-{
>-    switch (op)
>-    {
>-        case OP_ADD:            return "+";
>-        case OP_SUB:            return "-";
>-        case OP_MUL:            return "*";
>-        case OP_DIV:            return "/";
>-        case OP_COMP_MUL:       return "matrixCompMult";
>-        case OP_OUTER_PRODUCT:  return "outerProduct";
>-        case OP_TRANSPOSE:      return "transpose";
>-        case OP_INVERSE:        return "inverse";
>-        case OP_DETERMINANT:    return "determinant";
>-        case OP_UNARY_PLUS:     return "+";
>-        case OP_NEGATION:       return "-";
>-        case OP_PRE_INCREMENT:  return "++";
>-        case OP_PRE_DECREMENT:  return "--";
>-        case OP_POST_INCREMENT: return "++";
>-        case OP_POST_DECREMENT: return "--";
>-        case OP_ADD_INTO:       return "+=";
>-        case OP_SUBTRACT_FROM:  return "-=";
>-        case OP_MULTIPLY_INTO:  return "*=";
>-        case OP_DIVIDE_INTO:    return "/=";
>-
>-        default:
>-            DE_ASSERT(DE_FALSE);
>-            return "";
>-    }
>-}
>-
>-static OperationType getOperationType (MatrixOp op)
>-{
>-    switch (op)
>-    {
>-        case OP_ADD:            return OPERATIONTYPE_BINARY_OPERATOR;
>-        case OP_SUB:            return OPERATIONTYPE_BINARY_OPERATOR;
>-        case OP_MUL:            return OPERATIONTYPE_BINARY_OPERATOR;
>-        case OP_DIV:            return OPERATIONTYPE_BINARY_OPERATOR;
>-        case OP_COMP_MUL:       return OPERATIONTYPE_BINARY_FUNCTION;
>-        case OP_OUTER_PRODUCT:  return OPERATIONTYPE_BINARY_FUNCTION;
>-        case OP_TRANSPOSE:      return OPERATIONTYPE_UNARY_FUNCTION;
>-        case OP_INVERSE:        return OPERATIONTYPE_UNARY_FUNCTION;
>-        case OP_DETERMINANT:    return OPERATIONTYPE_UNARY_FUNCTION;
>-        case OP_UNARY_PLUS:     return OPERATIONTYPE_UNARY_PREFIX_OPERATOR;
>-        case OP_NEGATION:       return OPERATIONTYPE_UNARY_PREFIX_OPERATOR;
>-        case OP_PRE_INCREMENT:  return OPERATIONTYPE_UNARY_PREFIX_OPERATOR;
>-        case OP_PRE_DECREMENT:  return OPERATIONTYPE_UNARY_PREFIX_OPERATOR;
>-        case OP_POST_INCREMENT: return OPERATIONTYPE_UNARY_POSTFIX_OPERATOR;
>-        case OP_POST_DECREMENT: return OPERATIONTYPE_UNARY_POSTFIX_OPERATOR;
>-        case OP_ADD_INTO:       return OPERATIONTYPE_ASSIGNMENT;
>-        case OP_SUBTRACT_FROM:  return OPERATIONTYPE_ASSIGNMENT;
>-        case OP_MULTIPLY_INTO:  return OPERATIONTYPE_ASSIGNMENT;
>-        case OP_DIVIDE_INTO:    return OPERATIONTYPE_ASSIGNMENT;
>-        default:
>-            DE_ASSERT(DE_FALSE);
>-            return OPERATIONTYPE_LAST;
>-    }
>-}
>-
>-enum TestMatrixType
>-{
>-    TESTMATRIXTYPE_DEFAULT = 0,
>-    TESTMATRIXTYPE_NEGATED,
>-    TESTMATRIXTYPE_INCREMENTED,
>-    TESTMATRIXTYPE_DECREMENTED,
>-    TESTMATRIXTYPE_NEGATED_INCREMENTED,
>-    TESTMATRIXTYPE_INCREMENTED_LESS,
>-
>-    TESTMATRIXTYPE_LAST
>-};
>-
>-static TestMatrixType getOperationTestMatrixType (MatrixOp op)
>-{
>-    switch(op)
>-    {
>-        case OP_ADD:            return TESTMATRIXTYPE_DEFAULT;
>-        case OP_SUB:            return TESTMATRIXTYPE_DEFAULT;
>-        case OP_MUL:            return TESTMATRIXTYPE_DEFAULT;
>-        case OP_DIV:            return TESTMATRIXTYPE_DEFAULT;
>-        case OP_COMP_MUL:       return TESTMATRIXTYPE_DEFAULT;
>-        case OP_OUTER_PRODUCT:  return TESTMATRIXTYPE_DEFAULT;
>-        case OP_TRANSPOSE:      return TESTMATRIXTYPE_DEFAULT;
>-        case OP_INVERSE:        return TESTMATRIXTYPE_DEFAULT;
>-        case OP_DETERMINANT:    return TESTMATRIXTYPE_DEFAULT;
>-        case OP_UNARY_PLUS:     return TESTMATRIXTYPE_DECREMENTED;
>-        case OP_NEGATION:       return TESTMATRIXTYPE_NEGATED_INCREMENTED;
>-        case OP_PRE_INCREMENT:  return TESTMATRIXTYPE_NEGATED;
>-        case OP_PRE_DECREMENT:  return TESTMATRIXTYPE_INCREMENTED;
>-        case OP_POST_INCREMENT: return TESTMATRIXTYPE_NEGATED;
>-        case OP_POST_DECREMENT: return TESTMATRIXTYPE_DEFAULT;
>-        case OP_ADD_INTO:       return TESTMATRIXTYPE_DEFAULT;
>-        case OP_SUBTRACT_FROM:  return TESTMATRIXTYPE_INCREMENTED_LESS;
>-        case OP_MULTIPLY_INTO:  return TESTMATRIXTYPE_NEGATED;
>-        case OP_DIVIDE_INTO:    return TESTMATRIXTYPE_DECREMENTED;
>-
>-        default:
>-            DE_ASSERT(DE_FALSE);
>-            return TESTMATRIXTYPE_LAST;
>-    }
>-}
>-
>-static bool isOperationBinary (MatrixOp op)
>-{
>-    return getOperationType(op) == OPERATIONTYPE_BINARY_OPERATOR ||
>-           getOperationType(op) == OPERATIONTYPE_BINARY_FUNCTION ||
>-           getOperationType(op) == OPERATIONTYPE_ASSIGNMENT;
>-}
>-
>-static bool isOperationMatrixScalar (MatrixOp op)
>-{
>-    return op == OP_ADD || op == OP_SUB || op == OP_MUL || op == OP_DIV;
>-}
>-
>-static bool isOperationMatrixVector (MatrixOp op)
>-{
>-    return op == OP_MUL;
>-}
>-
>-static bool isOperationArithmeticMatrixMatrix (MatrixOp op)
>-{
>-    return op == OP_MUL;
>-}
>-
>-static bool isOperationComponentwiseMatrixMatrix (MatrixOp op)
>-{
>-    return op == OP_ADD || op == OP_SUB || op == OP_MUL || op == OP_DIV || op == OP_COMP_MUL;
>-}
>-
>-static bool isOperationVectorVector (MatrixOp op)
>-{
>-    return op == OP_OUTER_PRODUCT;
>-}
>-
>-static bool isOperationUnaryAnyMatrix (MatrixOp op)
>-{
>-    return  op == OP_TRANSPOSE           ||
>-            op == OP_UNARY_PLUS          ||
>-            op == OP_NEGATION            ||
>-            op == OP_PRE_INCREMENT       ||
>-            op == OP_PRE_DECREMENT       ||
>-            op == OP_POST_INCREMENT      ||
>-            op == OP_POST_DECREMENT;
>-}
>-
>-static bool isOperationUnarySymmetricMatrix (MatrixOp op)
>-{
>-    return op == OP_INVERSE || op == OP_DETERMINANT;
>-}
>-
>-static bool isOperationValueModifying (MatrixOp op)
>-{
>-    return  op == OP_PRE_INCREMENT       ||
>-            op == OP_PRE_DECREMENT       ||
>-            op == OP_POST_INCREMENT      ||
>-            op == OP_POST_DECREMENT;
>-}
>-
>-static bool isOperationAssignment (MatrixOp op)
>-{
>-    return  op == OP_ADD_INTO        ||
>-            op == OP_SUBTRACT_FROM   ||
>-            op == OP_MULTIPLY_INTO   ||
>-            op == OP_DIVIDE_INTO;
>-}
>-
>-static bool isOperationAssignmentAnyMatrix (MatrixOp op)
>-{
>-    return  op == OP_ADD_INTO        ||
>-            op == OP_SUBTRACT_FROM   ||
>-            op == OP_DIVIDE_INTO;
>-}
>-
>-static bool isOperationAssignmentSymmetricMatrix (MatrixOp op)
>-{
>-    return op == OP_MULTIPLY_INTO;
>-}
>-
>-// Operation nature
>-
>-enum OperationNature
>-{
>-    OPERATIONNATURE_PURE = 0,
>-    OPERATIONNATURE_MUTATING,
>-    OPERATIONNATURE_ASSIGNMENT,
>-
>-    OPERATIONNATURE_LAST
>-};
>-
>-static OperationNature getOperationNature (MatrixOp op)
>-{
>-    if (isOperationAssignment(op))
>-        return OPERATIONNATURE_ASSIGNMENT;
>-
>-    if (isOperationValueModifying(op))
>-        return OPERATIONNATURE_MUTATING;
>-
>-    return OPERATIONNATURE_PURE;
>-}
>-
>-// Input value loader.
>-
>-template <int InputT, int DataT>
>-typename TypeTraits<DataT>::Type getInputValue (const ShaderEvalContext& evalCtx, int inputNdx);
>-
>-template <> inline float        getInputValue<INPUTTYPE_CONST,      TYPE_FLOAT>         (const ShaderEvalContext& evalCtx, int inputNdx) { DE_UNREF(evalCtx); return s_constInFloat[inputNdx];  }
>-template <> inline tcu::Vec2    getInputValue<INPUTTYPE_CONST,      TYPE_FLOAT_VEC2>    (const ShaderEvalContext& evalCtx, int inputNdx) { DE_UNREF(evalCtx); return s_constInVec2[inputNdx];   }
>-template <> inline tcu::Vec3    getInputValue<INPUTTYPE_CONST,      TYPE_FLOAT_VEC3>    (const ShaderEvalContext& evalCtx, int inputNdx) { DE_UNREF(evalCtx); return s_constInVec3[inputNdx];   }
>-template <> inline tcu::Vec4    getInputValue<INPUTTYPE_CONST,      TYPE_FLOAT_VEC4>    (const ShaderEvalContext& evalCtx, int inputNdx) { DE_UNREF(evalCtx); return s_constInVec4[inputNdx];   }
>-
>-template <> inline tcu::Mat2    getInputValue<INPUTTYPE_CONST,      TYPE_FLOAT_MAT2>    (const ShaderEvalContext& evalCtx, int inputNdx) { DE_UNREF(evalCtx); return tcu::Mat2(s_constInMat2x2[inputNdx]);      }
>-template <> inline tcu::Mat2x3  getInputValue<INPUTTYPE_CONST,      TYPE_FLOAT_MAT2X3>  (const ShaderEvalContext& evalCtx, int inputNdx) { DE_UNREF(evalCtx); return tcu::Mat2x3(s_constInMat2x3[inputNdx]);    }
>-template <> inline tcu::Mat2x4  getInputValue<INPUTTYPE_CONST,      TYPE_FLOAT_MAT2X4>  (const ShaderEvalContext& evalCtx, int inputNdx) { DE_UNREF(evalCtx); return tcu::Mat2x4(s_constInMat2x4[inputNdx]);    }
>-template <> inline tcu::Mat3x2  getInputValue<INPUTTYPE_CONST,      TYPE_FLOAT_MAT3X2>  (const ShaderEvalContext& evalCtx, int inputNdx) { DE_UNREF(evalCtx); return tcu::Mat3x2(s_constInMat3x2[inputNdx]);    }
>-template <> inline tcu::Mat3    getInputValue<INPUTTYPE_CONST,      TYPE_FLOAT_MAT3>    (const ShaderEvalContext& evalCtx, int inputNdx) { DE_UNREF(evalCtx); return tcu::Mat3(s_constInMat3x3[inputNdx]);      }
>-template <> inline tcu::Mat3x4  getInputValue<INPUTTYPE_CONST,      TYPE_FLOAT_MAT3X4>  (const ShaderEvalContext& evalCtx, int inputNdx) { DE_UNREF(evalCtx); return tcu::Mat3x4(s_constInMat3x4[inputNdx]);    }
>-template <> inline tcu::Mat4x2  getInputValue<INPUTTYPE_CONST,      TYPE_FLOAT_MAT4X2>  (const ShaderEvalContext& evalCtx, int inputNdx) { DE_UNREF(evalCtx); return tcu::Mat4x2(s_constInMat4x2[inputNdx]);    }
>-template <> inline tcu::Mat4x3  getInputValue<INPUTTYPE_CONST,      TYPE_FLOAT_MAT4X3>  (const ShaderEvalContext& evalCtx, int inputNdx) { DE_UNREF(evalCtx); return tcu::Mat4x3(s_constInMat4x3[inputNdx]);    }
>-template <> inline tcu::Mat4    getInputValue<INPUTTYPE_CONST,      TYPE_FLOAT_MAT4>    (const ShaderEvalContext& evalCtx, int inputNdx) { DE_UNREF(evalCtx); return tcu::Mat4(s_constInMat4x4[inputNdx]);      }
>-
>-template <> inline float        getInputValue<INPUTTYPE_DYNAMIC,    TYPE_FLOAT>         (const ShaderEvalContext& evalCtx, int inputNdx) { DE_UNREF(inputNdx); return evalCtx.coords.x();                   }
>-template <> inline tcu::Vec2    getInputValue<INPUTTYPE_DYNAMIC,    TYPE_FLOAT_VEC2>    (const ShaderEvalContext& evalCtx, int inputNdx) { DE_UNREF(inputNdx); return evalCtx.coords.swizzle(0, 1);         }
>-template <> inline tcu::Vec3    getInputValue<INPUTTYPE_DYNAMIC,    TYPE_FLOAT_VEC3>    (const ShaderEvalContext& evalCtx, int inputNdx) { DE_UNREF(inputNdx); return evalCtx.coords.swizzle(0, 1, 2);      }
>-template <> inline tcu::Vec4    getInputValue<INPUTTYPE_DYNAMIC,    TYPE_FLOAT_VEC4>    (const ShaderEvalContext& evalCtx, int inputNdx) { DE_UNREF(inputNdx); return evalCtx.coords.swizzle(0, 1, 2, 3);   }
>-
>-template <> inline tcu::Mat2 getInputValue<INPUTTYPE_DYNAMIC, TYPE_FLOAT_MAT2> (const ShaderEvalContext& evalCtx, int inputNdx)
>-{
>-    DE_UNREF(inputNdx); // Not used.
>-    tcu::Mat2 m;
>-    m.setColumn(0, evalCtx.in[0].swizzle(0,1));
>-    m.setColumn(1, evalCtx.in[1].swizzle(0,1));
>-    return m;
>-}
>-
>-template <> inline tcu::Mat2x3 getInputValue<INPUTTYPE_DYNAMIC, TYPE_FLOAT_MAT2X3> (const ShaderEvalContext& evalCtx, int inputNdx)
>-{
>-    DE_UNREF(inputNdx); // Not used.
>-    tcu::Mat2x3 m;
>-    m.setColumn(0, evalCtx.in[0].swizzle(0,1,2));
>-    m.setColumn(1, evalCtx.in[1].swizzle(0,1,2));
>-    return m;
>-}
>-
>-template <> inline tcu::Mat2x4 getInputValue<INPUTTYPE_DYNAMIC, TYPE_FLOAT_MAT2X4> (const ShaderEvalContext& evalCtx, int inputNdx)
>-{
>-    DE_UNREF(inputNdx); // Not used.
>-    tcu::Mat2x4 m;
>-    m.setColumn(0, evalCtx.in[0]);
>-    m.setColumn(1, evalCtx.in[1]);
>-    return m;
>-}
>-
>-template <> inline tcu::Mat3x2 getInputValue<INPUTTYPE_DYNAMIC, TYPE_FLOAT_MAT3X2> (const ShaderEvalContext& evalCtx, int inputNdx)
>-{
>-    DE_UNREF(inputNdx); // Not used.
>-    tcu::Mat3x2 m;
>-    m.setColumn(0, evalCtx.in[0].swizzle(0,1));
>-    m.setColumn(1, evalCtx.in[1].swizzle(0,1));
>-    m.setColumn(2, evalCtx.in[2].swizzle(0,1));
>-    return m;
>-}
>-
>-template <> inline tcu::Mat3 getInputValue<INPUTTYPE_DYNAMIC, TYPE_FLOAT_MAT3> (const ShaderEvalContext& evalCtx, int inputNdx)
>-{
>-    DE_UNREF(inputNdx); // Not used.
>-    tcu::Mat3 m;
>-    m.setColumn(0, evalCtx.in[0].swizzle(0,1,2));
>-    m.setColumn(1, evalCtx.in[1].swizzle(0,1,2));
>-    m.setColumn(2, evalCtx.in[2].swizzle(0,1,2));
>-    return m;
>-}
>-
>-template <> inline tcu::Mat3x4 getInputValue<INPUTTYPE_DYNAMIC, TYPE_FLOAT_MAT3X4> (const ShaderEvalContext& evalCtx, int inputNdx)
>-{
>-    DE_UNREF(inputNdx); // Not used.
>-    tcu::Mat3x4 m;
>-    m.setColumn(0, evalCtx.in[0]);
>-    m.setColumn(1, evalCtx.in[1]);
>-    m.setColumn(2, evalCtx.in[2]);
>-    return m;
>-}
>-
>-template <> inline tcu::Mat4x2 getInputValue<INPUTTYPE_DYNAMIC, TYPE_FLOAT_MAT4X2> (const ShaderEvalContext& evalCtx, int inputNdx)
>-{
>-    DE_UNREF(inputNdx); // Not used.
>-    tcu::Mat4x2 m;
>-    m.setColumn(0, evalCtx.in[0].swizzle(0,1));
>-    m.setColumn(1, evalCtx.in[1].swizzle(0,1));
>-    m.setColumn(2, evalCtx.in[2].swizzle(0,1));
>-    m.setColumn(3, evalCtx.in[3].swizzle(0,1));
>-    return m;
>-}
>-
>-template <> inline tcu::Mat4x3 getInputValue<INPUTTYPE_DYNAMIC, TYPE_FLOAT_MAT4X3> (const ShaderEvalContext& evalCtx, int inputNdx)
>-{
>-    DE_UNREF(inputNdx); // Not used.
>-    tcu::Mat4x3 m;
>-    m.setColumn(0, evalCtx.in[0].swizzle(0,1,2));
>-    m.setColumn(1, evalCtx.in[1].swizzle(0,1,2));
>-    m.setColumn(2, evalCtx.in[2].swizzle(0,1,2));
>-    m.setColumn(3, evalCtx.in[3].swizzle(0,1,2));
>-    return m;
>-}
>-
>-template <> inline tcu::Mat4 getInputValue<INPUTTYPE_DYNAMIC, TYPE_FLOAT_MAT4> (const ShaderEvalContext& evalCtx, int inputNdx)
>-{
>-    DE_UNREF(inputNdx); // Not used.
>-    tcu::Mat4 m;
>-    m.setColumn(0, evalCtx.in[0]);
>-    m.setColumn(1, evalCtx.in[1]);
>-    m.setColumn(2, evalCtx.in[2]);
>-    m.setColumn(3, evalCtx.in[3]);
>-    return m;
>-}
>-
>-// Reduction from expression result to vec3.
>-
>-inline tcu::Vec3 reduceToVec3 (const tcu::Vec2& value)      { return value.swizzle(0,1,0); }
>-inline tcu::Vec3 reduceToVec3 (const tcu::Vec3& value)      { return value; }
>-inline tcu::Vec3 reduceToVec3 (const tcu::Vec4& value)      { return tcu::Vec3(value.x(), value.y(), value.z()+value.w()); }
>-inline tcu::Vec3 reduceToVec3 (const tcu::Mat2& value)      { return tcu::Vec3(value(0, 0), value(0, 1), value(1, 0)+value(1, 1)); }
>-inline tcu::Vec3 reduceToVec3 (const tcu::Mat2x3& value)    { return value.getColumn(0) + value.getColumn(1); }
>-inline tcu::Vec3 reduceToVec3 (const tcu::Mat2x4& value)    { return value.getColumn(0).swizzle(0,1,2) + value.getColumn(1).swizzle(1,2,3); }
>-inline tcu::Vec3 reduceToVec3 (const tcu::Mat3x2& value)    { return tcu::Vec3(value(0,0)+value(1,0), value(0,1)+value(1,1), value(0,2)+value(1,2)); }
>-inline tcu::Vec3 reduceToVec3 (const tcu::Mat3& value)      { return value.getColumn(0) + value.getColumn(1) + value.getColumn(2); }
>-inline tcu::Vec3 reduceToVec3 (const tcu::Mat3x4& value)    { return value.getColumn(0).swizzle(0,1,2) + value.getColumn(1).swizzle(1,2,3) + value.getColumn(2).swizzle(2,3,0); }
>-inline tcu::Vec3 reduceToVec3 (const tcu::Mat4x2& value)    { return tcu::Vec3(value(0,0)+value(1,0)+value(0,3), value(0,1)+value(1,1)+value(1,3), value(0,2)+value(1,2)); }
>-inline tcu::Vec3 reduceToVec3 (const tcu::Mat4x3& value)    { return value.getColumn(0) + value.getColumn(1) + value.getColumn(2) + value.getColumn(3); }
>-inline tcu::Vec3 reduceToVec3 (const tcu::Mat4& value)      { return value.getColumn(0).swizzle(0,1,2) + value.getColumn(1).swizzle(1,2,3) + value.getColumn(2).swizzle(2,3,0) + value.getColumn(3).swizzle(3,0,1); }
>-
>-// matrixCompMult
>-
>-template <typename T, int Rows, int Cols>
>-tcu::Matrix<T, Rows, Cols> matrixCompMult (const tcu::Matrix<T, Rows, Cols>& a, const tcu::Matrix<T, Rows, Cols>& b)
>-{
>-    tcu::Matrix<T, Rows, Cols> retVal;
>-
>-    for (int r = 0; r < Rows; ++r)
>-        for (int c = 0; c < Cols; ++c)
>-            retVal(r,c) = a(r,c) * b(r, c);
>-
>-    return retVal;
>-}
>-
>-// transpose
>-
>-template <typename T, int Rows, int Cols>
>-tcu::Matrix<T, Cols, Rows> transpose (const tcu::Matrix<T, Rows, Cols>& mat)
>-{
>-    tcu::Matrix<T, Cols, Rows> retVal;
>-
>-    for (int r = 0; r < Rows; ++r)
>-        for (int c = 0; c < Cols; ++c)
>-            retVal(c, r) = mat(r, c);
>-
>-    return retVal;
>-}
>-
>-// outerProduct
>-
>-template <typename T, int Rows, int Cols>
>-tcu::Matrix<T, Cols, Rows> outerProduct (const tcu::Vector<T, Cols>& a, const tcu::Vector<T, Rows>& b)
>-{
>-    tcu::Matrix<T, Rows, Cols> retVal;
>-
>-    for (int r = 0; r < Rows; ++r)
>-        for (int c = 0; c < Cols; ++c)
>-            retVal(r,c) = a[c] * b[r];
>-
>-    return transpose(retVal); // to gl-form (column-major)
>-}
>-
>-// Determinant
>-
>-template <int Size>
>-float determinant (const tcu::Matrix<float, Size, Size>& mat);
>-
>-template <>
>-float determinant<2> (const tcu::Matrix<float, 2, 2>& mat)
>-{
>-    return mat(0,0) * mat(1,1) - mat(1,0) * mat(0,1);
>-}
>-
>-template <>
>-float determinant<3> (const tcu::Matrix<float, 3, 3>& mat)
>-{
>-    return  + mat(0,0) * mat(1,1) * mat(2,2)
>-            + mat(0,1) * mat(1,2) * mat(2,0)
>-            + mat(0,2) * mat(1,0) * mat(2,1)
>-            - mat(0,0) * mat(1,2) * mat(2,1)
>-            - mat(0,1) * mat(1,0) * mat(2,2)
>-            - mat(0,2) * mat(1,1) * mat(2,0);
>-}
>-
>-template <>
>-float determinant<4> (const tcu::Matrix<float, 4, 4>& mat)
>-{
>-    const float minorMatrices[4][3*3] =
>-    {
>-        {
>-            mat(1,1),   mat(2,1),   mat(3,1),
>-            mat(1,2),   mat(2,2),   mat(3,2),
>-            mat(1,3),   mat(2,3),   mat(3,3),
>-        },
>-        {
>-            mat(1,0),   mat(2,0),   mat(3,0),
>-            mat(1,2),   mat(2,2),   mat(3,2),
>-            mat(1,3),   mat(2,3),   mat(3,3),
>-        },
>-        {
>-            mat(1,0),   mat(2,0),   mat(3,0),
>-            mat(1,1),   mat(2,1),   mat(3,1),
>-            mat(1,3),   mat(2,3),   mat(3,3),
>-        },
>-        {
>-            mat(1,0),   mat(2,0),   mat(3,0),
>-            mat(1,1),   mat(2,1),   mat(3,1),
>-            mat(1,2),   mat(2,2),   mat(3,2),
>-        }
>-    };
>-
>-    return  + mat(0,0) * determinant(tcu::Mat3(minorMatrices[0]))
>-            - mat(0,1) * determinant(tcu::Mat3(minorMatrices[1]))
>-            + mat(0,2) * determinant(tcu::Mat3(minorMatrices[2]))
>-            - mat(0,3) * determinant(tcu::Mat3(minorMatrices[3]));
>-}
>-
>-// Inverse
>-
>-template <int Size>
>-tcu::Matrix<float, Size, Size> inverse (const tcu::Matrix<float, Size, Size>& mat);
>-
>-template <>
>-tcu::Matrix<float, 2, 2> inverse<2> (const tcu::Matrix<float, 2, 2>& mat)
>-{
>-    const float                 det     = determinant(mat);
>-    tcu::Matrix<float, 2, 2>    retVal;
>-
>-    DE_ASSERT(det != 0.0f);
>-
>-    retVal(0, 0) =  mat(1, 1) / det;
>-    retVal(0, 1) = -mat(0, 1) / det;
>-    retVal(1, 0) = -mat(1, 0) / det;
>-    retVal(1, 1) =  mat(0, 0) / det;
>-
>-    return retVal;
>-}
>-
>-template <>
>-tcu::Matrix<float, 3, 3> inverse<3> (const tcu::Matrix<float, 3, 3>& mat)
>-{
>-    // Blockwise inversion
>-
>-    DE_ASSERT(determinant(mat) != 0.0f);
>-
>-    const float areaA[2*2] =
>-    {
>-        mat(0,0),   mat(0,1),
>-        mat(1,0),   mat(1,1)
>-    };
>-    const float areaB[2] =
>-    {
>-        mat(0,2),
>-        mat(1,2),
>-    };
>-    const float areaC[2] =
>-    {
>-        mat(2,0),   mat(2,1),
>-    };
>-    const float areaD[1] =
>-    {
>-        mat(2,2)
>-    };
>-    const float nullField[4] = { 0.0f };
>-
>-    const tcu::Matrix<float, 2, 2>  invA = inverse(tcu::Matrix<float, 2, 2>(areaA));
>-    const tcu::Matrix<float, 2, 1>  matB =         tcu::Matrix<float, 2, 1>(areaB);
>-    const tcu::Matrix<float, 1, 2>  matC =         tcu::Matrix<float, 1, 2>(areaC);
>-    const tcu::Matrix<float, 1, 1>  matD =         tcu::Matrix<float, 1, 1>(areaD);
>-
>-    const float                     schurComplement = 1.0f / (matD - matC*invA*matB)(0,0);
>-    const tcu::Matrix<float, 2, 2>  zeroMat         = Mat2(nullField);
>-
>-    const tcu::Matrix<float, 2, 2>  blockA = invA + invA*matB*schurComplement*matC*invA;
>-    const tcu::Matrix<float, 2, 1>  blockB = (zeroMat-invA)*matB*schurComplement;
>-    const tcu::Matrix<float, 1, 2>  blockC = matC*invA*(-schurComplement);
>-    const float                     blockD = schurComplement;
>-
>-    const float result[3*3] =
>-    {
>-        blockA(0,0),    blockA(0,1),    blockB(0,0),
>-        blockA(1,0),    blockA(1,1),    blockB(1,0),
>-        blockC(0,0),    blockC(0,1),    blockD,
>-    };
>-
>-    return Mat3(result);
>-}
>-
>-template <>
>-tcu::Matrix<float, 4, 4> inverse<4> (const tcu::Matrix<float, 4, 4>& mat)
>-{
>-    // Blockwise inversion
>-
>-    DE_ASSERT(determinant(mat) != 0.0f);
>-
>-    const float areaA[2*2] =
>-    {
>-        mat(0,0),   mat(0,1),
>-        mat(1,0),   mat(1,1)
>-    };
>-    const float areaB[2*2] =
>-    {
>-        mat(0,2),   mat(0,3),
>-        mat(1,2),   mat(1,3)
>-    };
>-    const float areaC[2*2] =
>-    {
>-        mat(2,0),   mat(2,1),
>-        mat(3,0),   mat(3,1)
>-    };
>-    const float areaD[2*2] =
>-    {
>-        mat(2,2),   mat(2,3),
>-        mat(3,2),   mat(3,3)
>-    };
>-    const float nullField[4] = { 0.0f };
>-
>-    const tcu::Matrix<float, 2, 2> invA = inverse(Mat2(areaA));
>-    const tcu::Matrix<float, 2, 2> matB =         Mat2(areaB);
>-    const tcu::Matrix<float, 2, 2> matC =         Mat2(areaC);
>-    const tcu::Matrix<float, 2, 2> matD =         Mat2(areaD);
>-
>-    const tcu::Matrix<float, 2, 2> schurComplement = inverse(matD - matC*invA*matB);
>-    const tcu::Matrix<float, 2, 2> zeroMat         = Mat2(nullField);
>-
>-    const tcu::Matrix<float, 2, 2> blockA = invA + invA*matB*schurComplement*matC*invA;
>-    const tcu::Matrix<float, 2, 2> blockB = (zeroMat-invA)*matB*schurComplement;
>-    const tcu::Matrix<float, 2, 2> blockC = (zeroMat-schurComplement)*matC*invA;
>-    const tcu::Matrix<float, 2, 2> blockD = schurComplement;
>-
>-    const float result[4*4] =
>-    {
>-        blockA(0,0),    blockA(0,1),    blockB(0,0),    blockB(0,1),
>-        blockA(1,0),    blockA(1,1),    blockB(1,0),    blockB(1,1),
>-        blockC(0,0),    blockC(0,1),    blockD(0,0),    blockD(0,1),
>-        blockC(1,0),    blockC(1,1),    blockD(1,0),    blockD(1,1),
>-    };
>-
>-    return Mat4(result);
>-}
>-
>-// negate
>-
>-template <typename T, int Rows, int Cols>
>-tcu::Matrix<T, Rows, Cols> negate (const tcu::Matrix<T, Rows, Cols>& mat)
>-{
>-    tcu::Matrix<T, Rows, Cols> retVal;
>-
>-    for (int r = 0; r < Rows; ++r)
>-        for (int c = 0; c < Cols; ++c)
>-            retVal(r,c) = -mat(r, c);
>-
>-    return retVal;
>-}
>-
>-// increment/decrement
>-
>-template <typename T, int Rows, int Cols>
>-tcu::Matrix<T, Rows, Cols> increment (const tcu::Matrix<T, Rows, Cols>& mat)
>-{
>-    tcu::Matrix<T, Rows, Cols> retVal;
>-
>-    for (int r = 0; r < Rows; ++r)
>-        for (int c = 0; c < Cols; ++c)
>-            retVal(r,c) = mat(r, c) + 1.0f;
>-
>-    return retVal;
>-}
>-
>-template <typename T, int Rows, int Cols>
>-tcu::Matrix<T, Rows, Cols> decrement (const tcu::Matrix<T, Rows, Cols>& mat)
>-{
>-    tcu::Matrix<T, Rows, Cols> retVal;
>-
>-    for (int r = 0; r < Rows; ++r)
>-        for (int c = 0; c < Cols; ++c)
>-            retVal(r,c) = mat(r, c) - 1.0f;
>-
>-    return retVal;
>-}
>-
>-// Evaluator template.
>-
>-typedef void (*MatrixShaderEvalFunc) (ShaderEvalContext& evalCtx, InputType in0Type, InputType in1Type);
>-
>-template <int Op, int In0DataType, int In1DataType>
>-struct Evaluator;
>-
>-template <int In0DataType, int In1DataType>
>-struct Evaluator<OP_ADD, In0DataType, In1DataType>
>-{
>-    static void evaluate (ShaderEvalContext& evalCtx, InputType in0Type, InputType in1Type)
>-    {
>-        typename TypeTraits<In0DataType>::Type  in0 = (in0Type == INPUTTYPE_DYNAMIC) ? getInputValue<INPUTTYPE_DYNAMIC, In0DataType>(evalCtx, 0)
>-                                                                                     : getInputValue<INPUTTYPE_CONST,   In0DataType>(evalCtx, 0);
>-        typename TypeTraits<In1DataType>::Type  in1 = (in1Type == INPUTTYPE_DYNAMIC) ? getInputValue<INPUTTYPE_DYNAMIC, In1DataType>(evalCtx, 1)
>-                                                                                     : getInputValue<INPUTTYPE_CONST,   In1DataType>(evalCtx, 1);
>-        evalCtx.color.xyz() = reduceToVec3(in0 + in1);
>-    }
>-};
>-
>-template <int In0DataType, int In1DataType>
>-struct Evaluator<OP_SUB, In0DataType, In1DataType>
>-{
>-    static void evaluate (ShaderEvalContext& evalCtx, InputType in0Type, InputType in1Type)
>-    {
>-        typename TypeTraits<In0DataType>::Type  in0 = (in0Type == INPUTTYPE_DYNAMIC) ? getInputValue<INPUTTYPE_DYNAMIC, In0DataType>(evalCtx, 0)
>-                                                                                     : getInputValue<INPUTTYPE_CONST,   In0DataType>(evalCtx, 0);
>-        typename TypeTraits<In1DataType>::Type  in1 = (in1Type == INPUTTYPE_DYNAMIC) ? getInputValue<INPUTTYPE_DYNAMIC, In1DataType>(evalCtx, 1)
>-                                                                                     : getInputValue<INPUTTYPE_CONST,   In1DataType>(evalCtx, 1);
>-        evalCtx.color.xyz() = reduceToVec3(in0 - in1);
>-    }
>-};
>-
>-template <int In0DataType, int In1DataType>
>-struct Evaluator<OP_MUL, In0DataType, In1DataType>
>-{
>-    static void evaluate (ShaderEvalContext& evalCtx, InputType in0Type, InputType in1Type)
>-    {
>-        typename TypeTraits<In0DataType>::Type  in0 = (in0Type == INPUTTYPE_DYNAMIC) ? getInputValue<INPUTTYPE_DYNAMIC, In0DataType>(evalCtx, 0)
>-                                                                                     : getInputValue<INPUTTYPE_CONST,   In0DataType>(evalCtx, 0);
>-        typename TypeTraits<In1DataType>::Type  in1 = (in1Type == INPUTTYPE_DYNAMIC) ? getInputValue<INPUTTYPE_DYNAMIC, In1DataType>(evalCtx, 1)
>-                                                                                     : getInputValue<INPUTTYPE_CONST,   In1DataType>(evalCtx, 1);
>-        evalCtx.color.xyz() = reduceToVec3(in0 * in1);
>-    }
>-};
>-
>-template <int In0DataType, int In1DataType>
>-struct Evaluator<OP_DIV, In0DataType, In1DataType>
>-{
>-    static void evaluate (ShaderEvalContext& evalCtx, InputType in0Type, InputType in1Type)
>-    {
>-        typename TypeTraits<In0DataType>::Type  in0 = (in0Type == INPUTTYPE_DYNAMIC) ? getInputValue<INPUTTYPE_DYNAMIC, In0DataType>(evalCtx, 0)
>-                                                                                     : getInputValue<INPUTTYPE_CONST,   In0DataType>(evalCtx, 0);
>-        typename TypeTraits<In1DataType>::Type  in1 = (in1Type == INPUTTYPE_DYNAMIC) ? getInputValue<INPUTTYPE_DYNAMIC, In1DataType>(evalCtx, 1)
>-                                                                                     : getInputValue<INPUTTYPE_CONST,   In1DataType>(evalCtx, 1);
>-        evalCtx.color.xyz() = reduceToVec3(in0 / in1);
>-    }
>-};
>-
>-template <int In0DataType, int In1DataType>
>-struct Evaluator<OP_COMP_MUL, In0DataType, In1DataType>
>-{
>-    static void evaluate (ShaderEvalContext& evalCtx, InputType in0Type, InputType in1Type)
>-    {
>-        typename TypeTraits<In0DataType>::Type  in0 = (in0Type == INPUTTYPE_DYNAMIC) ? getInputValue<INPUTTYPE_DYNAMIC, In0DataType>(evalCtx, 0)
>-                                                                                     : getInputValue<INPUTTYPE_CONST,   In0DataType>(evalCtx, 0);
>-        typename TypeTraits<In1DataType>::Type  in1 = (in1Type == INPUTTYPE_DYNAMIC) ? getInputValue<INPUTTYPE_DYNAMIC, In1DataType>(evalCtx, 1)
>-                                                                                     : getInputValue<INPUTTYPE_CONST,   In1DataType>(evalCtx, 1);
>-        evalCtx.color.xyz() = reduceToVec3(matrixCompMult(in0, in1));
>-    }
>-};
>-
>-template <int In0DataType, int In1DataType>
>-struct Evaluator<OP_OUTER_PRODUCT, In0DataType, In1DataType>
>-{
>-    static void evaluate (ShaderEvalContext& evalCtx, InputType in0Type, InputType in1Type)
>-    {
>-        typename TypeTraits<In0DataType>::Type  in0 = (in0Type == INPUTTYPE_DYNAMIC) ? getInputValue<INPUTTYPE_DYNAMIC, In0DataType>(evalCtx, 0)
>-                                                                                     : getInputValue<INPUTTYPE_CONST,   In0DataType>(evalCtx, 0);
>-        typename TypeTraits<In1DataType>::Type  in1 = (in1Type == INPUTTYPE_DYNAMIC) ? getInputValue<INPUTTYPE_DYNAMIC, In1DataType>(evalCtx, 1)
>-                                                                                     : getInputValue<INPUTTYPE_CONST,   In1DataType>(evalCtx, 1);
>-        evalCtx.color.xyz() = reduceToVec3(outerProduct(in0, in1));
>-    }
>-};
>-
>-template <int In0DataType, int In1DataType>
>-struct Evaluator<OP_TRANSPOSE, In0DataType, In1DataType>
>-{
>-    static void evaluate (ShaderEvalContext& evalCtx, InputType in0Type, InputType in1Type)
>-    {
>-        DE_UNREF(in1Type);
>-        typename TypeTraits<In0DataType>::Type  in0 = (in0Type == INPUTTYPE_DYNAMIC) ? getInputValue<INPUTTYPE_DYNAMIC, In0DataType>(evalCtx, 0)
>-                                                                                     : getInputValue<INPUTTYPE_CONST,   In0DataType>(evalCtx, 0);
>-        evalCtx.color.xyz() = reduceToVec3(transpose(in0));
>-    }
>-};
>-
>-template <int In0DataType, int In1DataType>
>-struct Evaluator<OP_INVERSE, In0DataType, In1DataType>
>-{
>-    static void evaluate (ShaderEvalContext& evalCtx, InputType in0Type, InputType in1Type)
>-    {
>-        DE_UNREF(in1Type);
>-        typename TypeTraits<In0DataType>::Type  in0 = (in0Type == INPUTTYPE_DYNAMIC) ? getInputValue<INPUTTYPE_DYNAMIC, In0DataType>(evalCtx, 0)
>-                                                                                     : getInputValue<INPUTTYPE_CONST,   In0DataType>(evalCtx, 0);
>-        evalCtx.color.xyz() = reduceToVec3(inverse(in0));
>-    }
>-};
>-
>-template <int In0DataType, int In1DataType>
>-struct Evaluator<OP_DETERMINANT, In0DataType, In1DataType>
>-{
>-    static void evaluate (ShaderEvalContext& evalCtx, InputType in0Type, InputType in1Type)
>-    {
>-        DE_UNREF(in1Type);
>-        typename TypeTraits<In0DataType>::Type  in0 = (in0Type == INPUTTYPE_DYNAMIC) ? getInputValue<INPUTTYPE_DYNAMIC, In0DataType>(evalCtx, 0)
>-                                                                                     : getInputValue<INPUTTYPE_CONST,   In0DataType>(evalCtx, 0);
>-        evalCtx.color.xyz() = Vec3(determinant(in0));
>-    }
>-};
>-
>-template <int In0DataType, int In1DataType>
>-struct Evaluator<OP_UNARY_PLUS, In0DataType, In1DataType>
>-{
>-    static void evaluate (ShaderEvalContext& evalCtx, InputType in0Type, InputType in1Type)
>-    {
>-        DE_UNREF(in1Type);
>-        typename TypeTraits<In0DataType>::Type  in0 = (in0Type == INPUTTYPE_DYNAMIC) ? getInputValue<INPUTTYPE_DYNAMIC, In0DataType>(evalCtx, 0)
>-                                                                                     : getInputValue<INPUTTYPE_CONST,   In0DataType>(evalCtx, 0);
>-        evalCtx.color.xyz() = reduceToVec3(in0);
>-    }
>-};
>-
>-template <int In0DataType, int In1DataType>
>-struct Evaluator<OP_NEGATION, In0DataType, In1DataType>
>-{
>-    static void evaluate (ShaderEvalContext& evalCtx, InputType in0Type, InputType in1Type)
>-    {
>-        DE_UNREF(in1Type);
>-        typename TypeTraits<In0DataType>::Type  in0 = (in0Type == INPUTTYPE_DYNAMIC) ? getInputValue<INPUTTYPE_DYNAMIC, In0DataType>(evalCtx, 0)
>-                                                                                     : getInputValue<INPUTTYPE_CONST,   In0DataType>(evalCtx, 0);
>-        evalCtx.color.xyz() = reduceToVec3(negate(in0));
>-    }
>-};
>-
>-template <int In0DataType, int In1DataType>
>-struct Evaluator<OP_PRE_INCREMENT, In0DataType, In1DataType>
>-{
>-    static void evaluate (ShaderEvalContext& evalCtx, InputType in0Type, InputType in1Type)
>-    {
>-        DE_UNREF(in1Type);
>-        typename TypeTraits<In0DataType>::Type  in0 = (in0Type == INPUTTYPE_DYNAMIC) ? getInputValue<INPUTTYPE_DYNAMIC, In0DataType>(evalCtx, 0)
>-                                                                                     : getInputValue<INPUTTYPE_CONST,   In0DataType>(evalCtx, 0);
>-
>-        // modifying reduction: sum modified value too
>-        evalCtx.color.xyz() = reduceToVec3(increment(in0)) + reduceToVec3(increment(in0));
>-    }
>-};
>-
>-template <int In0DataType, int In1DataType>
>-struct Evaluator<OP_PRE_DECREMENT, In0DataType, In1DataType>
>-{
>-    static void evaluate (ShaderEvalContext& evalCtx, InputType in0Type, InputType in1Type)
>-    {
>-        DE_UNREF(in1Type);
>-        typename TypeTraits<In0DataType>::Type  in0 = (in0Type == INPUTTYPE_DYNAMIC) ? getInputValue<INPUTTYPE_DYNAMIC, In0DataType>(evalCtx, 0)
>-                                                                                     : getInputValue<INPUTTYPE_CONST,   In0DataType>(evalCtx, 0);
>-
>-        // modifying reduction: sum modified value too
>-        evalCtx.color.xyz() = reduceToVec3(decrement(in0)) + reduceToVec3(decrement(in0));
>-    }
>-};
>-
>-template <int In0DataType, int In1DataType>
>-struct Evaluator<OP_POST_INCREMENT, In0DataType, In1DataType>
>-{
>-    static void evaluate (ShaderEvalContext& evalCtx, InputType in0Type, InputType in1Type)
>-    {
>-        DE_UNREF(in1Type);
>-        typename TypeTraits<In0DataType>::Type  in0 = (in0Type == INPUTTYPE_DYNAMIC) ? getInputValue<INPUTTYPE_DYNAMIC, In0DataType>(evalCtx, 0)
>-                                                                                     : getInputValue<INPUTTYPE_CONST,   In0DataType>(evalCtx, 0);
>-
>-        // modifying reduction: sum modified value too
>-        evalCtx.color.xyz() = reduceToVec3(in0) + reduceToVec3(increment(in0));
>-    }
>-};
>-
>-template <int In0DataType, int In1DataType>
>-struct Evaluator<OP_POST_DECREMENT, In0DataType, In1DataType>
>-{
>-    static void evaluate (ShaderEvalContext& evalCtx, InputType in0Type, InputType in1Type)
>-    {
>-        DE_UNREF(in1Type);
>-        typename TypeTraits<In0DataType>::Type  in0 = (in0Type == INPUTTYPE_DYNAMIC) ? getInputValue<INPUTTYPE_DYNAMIC, In0DataType>(evalCtx, 0)
>-                                                                                     : getInputValue<INPUTTYPE_CONST,   In0DataType>(evalCtx, 0);
>-
>-        // modifying reduction: sum modified value too
>-        evalCtx.color.xyz() = reduceToVec3(in0) + reduceToVec3(decrement(in0));
>-    }
>-};
>-
>-template <int In0DataType, int In1DataType>
>-struct Evaluator<OP_ADD_INTO, In0DataType, In1DataType>
>-{
>-    static void evaluate (ShaderEvalContext& evalCtx, InputType in0Type, InputType in1Type)
>-    {
>-        typename TypeTraits<In0DataType>::Type  in0 = (in0Type == INPUTTYPE_DYNAMIC) ? getInputValue<INPUTTYPE_DYNAMIC, In0DataType>(evalCtx, 0)
>-                                                                                     : getInputValue<INPUTTYPE_CONST,   In0DataType>(evalCtx, 0);
>-        typename TypeTraits<In1DataType>::Type  in1 = (in1Type == INPUTTYPE_DYNAMIC) ? getInputValue<INPUTTYPE_DYNAMIC, In1DataType>(evalCtx, 1)
>-                                                                                     : getInputValue<INPUTTYPE_CONST,   In1DataType>(evalCtx, 1);
>-        evalCtx.color.xyz() = reduceToVec3(in0 + in1);
>-    }
>-};
>-
>-template <int In0DataType, int In1DataType>
>-struct Evaluator<OP_SUBTRACT_FROM, In0DataType, In1DataType>
>-{
>-    static void evaluate (ShaderEvalContext& evalCtx, InputType in0Type, InputType in1Type)
>-    {
>-        typename TypeTraits<In0DataType>::Type  in0 = (in0Type == INPUTTYPE_DYNAMIC) ? getInputValue<INPUTTYPE_DYNAMIC, In0DataType>(evalCtx, 0)
>-                                                                                     : getInputValue<INPUTTYPE_CONST,   In0DataType>(evalCtx, 0);
>-        typename TypeTraits<In1DataType>::Type  in1 = (in1Type == INPUTTYPE_DYNAMIC) ? getInputValue<INPUTTYPE_DYNAMIC, In1DataType>(evalCtx, 1)
>-                                                                                     : getInputValue<INPUTTYPE_CONST,   In1DataType>(evalCtx, 1);
>-        evalCtx.color.xyz() = reduceToVec3(in0 - in1);
>-    }
>-};
>-
>-template <int In0DataType, int In1DataType>
>-struct Evaluator<OP_MULTIPLY_INTO, In0DataType, In1DataType>
>-{
>-    static void evaluate (ShaderEvalContext& evalCtx, InputType in0Type, InputType in1Type)
>-    {
>-        typename TypeTraits<In0DataType>::Type  in0 = (in0Type == INPUTTYPE_DYNAMIC) ? getInputValue<INPUTTYPE_DYNAMIC, In0DataType>(evalCtx, 0)
>-                                                                                     : getInputValue<INPUTTYPE_CONST,   In0DataType>(evalCtx, 0);
>-        typename TypeTraits<In1DataType>::Type  in1 = (in1Type == INPUTTYPE_DYNAMIC) ? getInputValue<INPUTTYPE_DYNAMIC, In1DataType>(evalCtx, 1)
>-                                                                                     : getInputValue<INPUTTYPE_CONST,   In1DataType>(evalCtx, 1);
>-        evalCtx.color.xyz() = reduceToVec3(in0 * in1);
>-    }
>-};
>-
>-template <int In0DataType, int In1DataType>
>-struct Evaluator<OP_DIVIDE_INTO, In0DataType, In1DataType>
>-{
>-    static void evaluate (ShaderEvalContext& evalCtx, InputType in0Type, InputType in1Type)
>-    {
>-        typename TypeTraits<In0DataType>::Type  in0 = (in0Type == INPUTTYPE_DYNAMIC) ? getInputValue<INPUTTYPE_DYNAMIC, In0DataType>(evalCtx, 0)
>-                                                                                     : getInputValue<INPUTTYPE_CONST,   In0DataType>(evalCtx, 0);
>-        typename TypeTraits<In1DataType>::Type  in1 = (in1Type == INPUTTYPE_DYNAMIC) ? getInputValue<INPUTTYPE_DYNAMIC, In1DataType>(evalCtx, 1)
>-                                                                                     : getInputValue<INPUTTYPE_CONST,   In1DataType>(evalCtx, 1);
>-        evalCtx.color.xyz() = reduceToVec3(in0 / in1);
>-    }
>-};
>-
>-MatrixShaderEvalFunc getEvalFunc (const ShaderInput& in0, const ShaderInput& in1, MatrixOp op)
>-{
>-    // Evaluator is selected based on op and input data types.
>-    // For efficient lookup the types and op enums are packed together to form a 19-bit key:
>-    // [18..14 OP] [13..7 TYPE0] [6..0 TYPE1]
>-
>-    DE_STATIC_ASSERT(TYPE_LAST  <= (1<<7));
>-    DE_STATIC_ASSERT(OP_LAST    <= (1<<5));
>-
>-#define PACK_EVAL_CASE(OP, IN0DATATYPE, IN1DATATYPE)    (((OP) << 14) | ((IN0DATATYPE) << 7) | (IN1DATATYPE))
>-
>-#define MAKE_EVAL_CASE(OP, IN0DATATYPE, IN1DATATYPE)    \
>-    case PACK_EVAL_CASE(OP, IN0DATATYPE, IN1DATATYPE):  \
>-        return Evaluator<OP, IN0DATATYPE, IN1DATATYPE>::evaluate
>-
>-#define MAKE_SCALAR_OPS(IN0DATATYPE, IN1DATATYPE)       \
>-    MAKE_EVAL_CASE(OP_ADD, IN0DATATYPE, IN1DATATYPE);   \
>-    MAKE_EVAL_CASE(OP_SUB, IN0DATATYPE, IN1DATATYPE);   \
>-    MAKE_EVAL_CASE(OP_MUL, IN0DATATYPE, IN1DATATYPE);   \
>-    MAKE_EVAL_CASE(OP_DIV, IN0DATATYPE, IN1DATATYPE)
>-
>-#define MAKE_CWISE_OPS(IN0DATATYPE, IN1DATATYPE)            \
>-    MAKE_EVAL_CASE(OP_ADD,      IN0DATATYPE, IN1DATATYPE);  \
>-    MAKE_EVAL_CASE(OP_SUB,      IN0DATATYPE, IN1DATATYPE);  \
>-    MAKE_EVAL_CASE(OP_DIV,      IN0DATATYPE, IN1DATATYPE);  \
>-    MAKE_EVAL_CASE(OP_COMP_MUL, IN0DATATYPE, IN1DATATYPE)
>-
>-#define MAKE_MUL_OP(IN0DATATYPE, IN1DATATYPE)           \
>-    MAKE_EVAL_CASE(OP_MUL, IN0DATATYPE, IN1DATATYPE)
>-
>-#define MAKE_VECVEC_OP(IN0DATATYPE, IN1DATATYPE)            \
>-    MAKE_EVAL_CASE(OP_OUTER_PRODUCT, IN0DATATYPE, IN1DATATYPE)
>-
>-#define MAKE_UNARY_OP(IN0DATATYPE)                              \
>-    MAKE_EVAL_CASE(OP_TRANSPOSE,        IN0DATATYPE, TYPE_LAST);    \
>-    MAKE_EVAL_CASE(OP_UNARY_PLUS,       IN0DATATYPE, TYPE_LAST);    \
>-    MAKE_EVAL_CASE(OP_NEGATION,         IN0DATATYPE, TYPE_LAST);    \
>-    MAKE_EVAL_CASE(OP_PRE_INCREMENT,    IN0DATATYPE, TYPE_LAST);    \
>-    MAKE_EVAL_CASE(OP_PRE_DECREMENT,    IN0DATATYPE, TYPE_LAST);    \
>-    MAKE_EVAL_CASE(OP_POST_INCREMENT,   IN0DATATYPE, TYPE_LAST);    \
>-    MAKE_EVAL_CASE(OP_POST_DECREMENT,   IN0DATATYPE, TYPE_LAST)
>-
>-#define MAKE_UNARY_SYMMETRIC_OP(IN0DATATYPE)                    \
>-    MAKE_UNARY_OP(IN0DATATYPE);                                 \
>-    MAKE_EVAL_CASE(OP_DETERMINANT,  IN0DATATYPE, TYPE_LAST);    \
>-    MAKE_EVAL_CASE(OP_INVERSE,      IN0DATATYPE, TYPE_LAST)
>-
>-#define MAKE_ASSIGNMENT_OP(IN0DATATYPE)                             \
>-    MAKE_EVAL_CASE(OP_ADD_INTO,         IN0DATATYPE, IN0DATATYPE);  \
>-    MAKE_EVAL_CASE(OP_SUBTRACT_FROM,    IN0DATATYPE, IN0DATATYPE);  \
>-    MAKE_EVAL_CASE(OP_DIVIDE_INTO,      IN0DATATYPE, IN0DATATYPE)
>-
>-#define MAKE_ASSIGNMENT_SYMMETRIC_OP(IN0DATATYPE)                   \
>-    MAKE_ASSIGNMENT_OP(IN0DATATYPE);                                \
>-    MAKE_EVAL_CASE(OP_MULTIPLY_INTO,    IN0DATATYPE, IN0DATATYPE)
>-
>-    switch (PACK_EVAL_CASE(op, in0.dataType, in1.dataType))
>-    {
>-        // Matrix-scalar.
>-        MAKE_SCALAR_OPS(TYPE_FLOAT_MAT2,    TYPE_FLOAT);
>-        MAKE_SCALAR_OPS(TYPE_FLOAT_MAT2X3,  TYPE_FLOAT);
>-        MAKE_SCALAR_OPS(TYPE_FLOAT_MAT2X4,  TYPE_FLOAT);
>-        MAKE_SCALAR_OPS(TYPE_FLOAT_MAT3X2,  TYPE_FLOAT);
>-        MAKE_SCALAR_OPS(TYPE_FLOAT_MAT3,    TYPE_FLOAT);
>-        MAKE_SCALAR_OPS(TYPE_FLOAT_MAT3X4,  TYPE_FLOAT);
>-        MAKE_SCALAR_OPS(TYPE_FLOAT_MAT4X2,  TYPE_FLOAT);
>-        MAKE_SCALAR_OPS(TYPE_FLOAT_MAT4X3,  TYPE_FLOAT);
>-        MAKE_SCALAR_OPS(TYPE_FLOAT_MAT4,    TYPE_FLOAT);
>-
>-        // Matrix-vector.
>-        MAKE_MUL_OP(TYPE_FLOAT_MAT2,    TYPE_FLOAT_VEC2);
>-        MAKE_MUL_OP(TYPE_FLOAT_MAT2X3,  TYPE_FLOAT_VEC2);
>-        MAKE_MUL_OP(TYPE_FLOAT_MAT2X4,  TYPE_FLOAT_VEC2);
>-        MAKE_MUL_OP(TYPE_FLOAT_MAT3X2,  TYPE_FLOAT_VEC3);
>-        MAKE_MUL_OP(TYPE_FLOAT_MAT3,    TYPE_FLOAT_VEC3);
>-        MAKE_MUL_OP(TYPE_FLOAT_MAT3X4,  TYPE_FLOAT_VEC3);
>-        MAKE_MUL_OP(TYPE_FLOAT_MAT4X2,  TYPE_FLOAT_VEC4);
>-        MAKE_MUL_OP(TYPE_FLOAT_MAT4X3,  TYPE_FLOAT_VEC4);
>-        MAKE_MUL_OP(TYPE_FLOAT_MAT4,    TYPE_FLOAT_VEC4);
>-
>-        // Vector-matrix.
>-        MAKE_MUL_OP(TYPE_FLOAT_VEC2, TYPE_FLOAT_MAT2);
>-        MAKE_MUL_OP(TYPE_FLOAT_VEC3, TYPE_FLOAT_MAT2X3);
>-        MAKE_MUL_OP(TYPE_FLOAT_VEC4, TYPE_FLOAT_MAT2X4);
>-        MAKE_MUL_OP(TYPE_FLOAT_VEC2, TYPE_FLOAT_MAT3X2);
>-        MAKE_MUL_OP(TYPE_FLOAT_VEC3, TYPE_FLOAT_MAT3);
>-        MAKE_MUL_OP(TYPE_FLOAT_VEC4, TYPE_FLOAT_MAT3X4);
>-        MAKE_MUL_OP(TYPE_FLOAT_VEC2, TYPE_FLOAT_MAT4X2);
>-        MAKE_MUL_OP(TYPE_FLOAT_VEC3, TYPE_FLOAT_MAT4X3);
>-        MAKE_MUL_OP(TYPE_FLOAT_VEC4, TYPE_FLOAT_MAT4);
>-
>-        // Matrix-matrix.
>-        MAKE_CWISE_OPS(TYPE_FLOAT_MAT2,     TYPE_FLOAT_MAT2);
>-        MAKE_MUL_OP(TYPE_FLOAT_MAT2,        TYPE_FLOAT_MAT2);
>-        MAKE_MUL_OP(TYPE_FLOAT_MAT2,        TYPE_FLOAT_MAT3X2);
>-        MAKE_MUL_OP(TYPE_FLOAT_MAT2,        TYPE_FLOAT_MAT4X2);
>-
>-        MAKE_CWISE_OPS(TYPE_FLOAT_MAT2X3,   TYPE_FLOAT_MAT2X3);
>-        MAKE_MUL_OP(TYPE_FLOAT_MAT2X3,      TYPE_FLOAT_MAT2);
>-        MAKE_MUL_OP(TYPE_FLOAT_MAT2X3,      TYPE_FLOAT_MAT3X2);
>-        MAKE_MUL_OP(TYPE_FLOAT_MAT2X3,      TYPE_FLOAT_MAT4X2);
>-
>-        MAKE_CWISE_OPS(TYPE_FLOAT_MAT2X4,   TYPE_FLOAT_MAT2X4);
>-        MAKE_MUL_OP(TYPE_FLOAT_MAT2X4,      TYPE_FLOAT_MAT2);
>-        MAKE_MUL_OP(TYPE_FLOAT_MAT2X4,      TYPE_FLOAT_MAT3X2);
>-        MAKE_MUL_OP(TYPE_FLOAT_MAT2X4,      TYPE_FLOAT_MAT4X2);
>-
>-        MAKE_CWISE_OPS(TYPE_FLOAT_MAT3X2,   TYPE_FLOAT_MAT3X2);
>-        MAKE_MUL_OP(TYPE_FLOAT_MAT3X2,      TYPE_FLOAT_MAT2X3);
>-        MAKE_MUL_OP(TYPE_FLOAT_MAT3X2,      TYPE_FLOAT_MAT3);
>-        MAKE_MUL_OP(TYPE_FLOAT_MAT3X2,      TYPE_FLOAT_MAT4X3);
>-
>-        MAKE_CWISE_OPS(TYPE_FLOAT_MAT3,     TYPE_FLOAT_MAT3);
>-        MAKE_MUL_OP(TYPE_FLOAT_MAT3,        TYPE_FLOAT_MAT2X3);
>-        MAKE_MUL_OP(TYPE_FLOAT_MAT3,        TYPE_FLOAT_MAT3);
>-        MAKE_MUL_OP(TYPE_FLOAT_MAT3,        TYPE_FLOAT_MAT4X3);
>-
>-        MAKE_CWISE_OPS(TYPE_FLOAT_MAT3X4,   TYPE_FLOAT_MAT3X4);
>-        MAKE_MUL_OP(TYPE_FLOAT_MAT3X4,      TYPE_FLOAT_MAT2X3);
>-        MAKE_MUL_OP(TYPE_FLOAT_MAT3X4,      TYPE_FLOAT_MAT3);
>-        MAKE_MUL_OP(TYPE_FLOAT_MAT3X4,      TYPE_FLOAT_MAT4X3);
>-
>-        MAKE_CWISE_OPS(TYPE_FLOAT_MAT4X2,   TYPE_FLOAT_MAT4X2);
>-        MAKE_MUL_OP(TYPE_FLOAT_MAT4X2,      TYPE_FLOAT_MAT2X4);
>-        MAKE_MUL_OP(TYPE_FLOAT_MAT4X2,      TYPE_FLOAT_MAT3X4);
>-        MAKE_MUL_OP(TYPE_FLOAT_MAT4X2,      TYPE_FLOAT_MAT4);
>-
>-        MAKE_CWISE_OPS(TYPE_FLOAT_MAT4X3,   TYPE_FLOAT_MAT4X3);
>-        MAKE_MUL_OP(TYPE_FLOAT_MAT4X3,      TYPE_FLOAT_MAT2X4);
>-        MAKE_MUL_OP(TYPE_FLOAT_MAT4X3,      TYPE_FLOAT_MAT3X4);
>-        MAKE_MUL_OP(TYPE_FLOAT_MAT4X3,      TYPE_FLOAT_MAT4);
>-
>-        MAKE_CWISE_OPS(TYPE_FLOAT_MAT4,     TYPE_FLOAT_MAT4);
>-        MAKE_MUL_OP(TYPE_FLOAT_MAT4,        TYPE_FLOAT_MAT2X4);
>-        MAKE_MUL_OP(TYPE_FLOAT_MAT4,        TYPE_FLOAT_MAT3X4);
>-        MAKE_MUL_OP(TYPE_FLOAT_MAT4,        TYPE_FLOAT_MAT4);
>-
>-        // Vector-vector.
>-        MAKE_VECVEC_OP(TYPE_FLOAT_VEC2,     TYPE_FLOAT_VEC2);
>-        MAKE_VECVEC_OP(TYPE_FLOAT_VEC2,     TYPE_FLOAT_VEC3);
>-        MAKE_VECVEC_OP(TYPE_FLOAT_VEC2,     TYPE_FLOAT_VEC4);
>-        MAKE_VECVEC_OP(TYPE_FLOAT_VEC3,     TYPE_FLOAT_VEC2);
>-        MAKE_VECVEC_OP(TYPE_FLOAT_VEC3,     TYPE_FLOAT_VEC3);
>-        MAKE_VECVEC_OP(TYPE_FLOAT_VEC3,     TYPE_FLOAT_VEC4);
>-        MAKE_VECVEC_OP(TYPE_FLOAT_VEC4,     TYPE_FLOAT_VEC2);
>-        MAKE_VECVEC_OP(TYPE_FLOAT_VEC4,     TYPE_FLOAT_VEC3);
>-        MAKE_VECVEC_OP(TYPE_FLOAT_VEC4,     TYPE_FLOAT_VEC4);
>-
>-        // Unary Matrix.
>-        MAKE_UNARY_SYMMETRIC_OP(TYPE_FLOAT_MAT2);
>-        MAKE_UNARY_OP(TYPE_FLOAT_MAT2X3);
>-        MAKE_UNARY_OP(TYPE_FLOAT_MAT2X4);
>-        MAKE_UNARY_OP(TYPE_FLOAT_MAT3X2);
>-        MAKE_UNARY_SYMMETRIC_OP(TYPE_FLOAT_MAT3);
>-        MAKE_UNARY_OP(TYPE_FLOAT_MAT3X4);
>-        MAKE_UNARY_OP(TYPE_FLOAT_MAT4X2);
>-        MAKE_UNARY_OP(TYPE_FLOAT_MAT4X3);
>-        MAKE_UNARY_SYMMETRIC_OP(TYPE_FLOAT_MAT4);
>-
>-        // Assignments
>-        MAKE_ASSIGNMENT_SYMMETRIC_OP(TYPE_FLOAT_MAT2);
>-        MAKE_ASSIGNMENT_OP(TYPE_FLOAT_MAT2X3);
>-        MAKE_ASSIGNMENT_OP(TYPE_FLOAT_MAT2X4);
>-        MAKE_ASSIGNMENT_OP(TYPE_FLOAT_MAT3X2);
>-        MAKE_ASSIGNMENT_SYMMETRIC_OP(TYPE_FLOAT_MAT3);
>-        MAKE_ASSIGNMENT_OP(TYPE_FLOAT_MAT3X4);
>-        MAKE_ASSIGNMENT_OP(TYPE_FLOAT_MAT4X2);
>-        MAKE_ASSIGNMENT_OP(TYPE_FLOAT_MAT4X3);
>-        MAKE_ASSIGNMENT_SYMMETRIC_OP(TYPE_FLOAT_MAT4);
>-
>-        default:
>-            DE_ASSERT(DE_FALSE);
>-            return DE_NULL;
>-    }
>-
>-#undef PACK_EVAL_CASE
>-#undef MAKE_EVAL_CASE
>-#undef MUL_OP
>-#undef ALL_OPS
>-#undef MAKE_MAT_SCALAR_VEC_CASES
>-#undef MAKE_MAT_MAT_CASES
>-}
>-
>-// Shader source format utilities.
>-
>-template <int Size>
>-void writeVectorConstructor (std::ostream& str, const tcu::Vector<float, Size>& v)
>-{
>-    str << "vec" << Size << "(";
>-    for (int ndx = 0; ndx < Size; ndx++)
>-    {
>-        if (ndx != 0)
>-            str << ", ";
>-        str << de::floatToString(v[ndx], 1);
>-    }
>-    str << ")";
>-}
>-
>-template <int Cols, int Rows>
>-void writeMatrixConstructor (std::ostream& str, const tcu::Matrix<float, Rows, Cols>& m)
>-{
>-    if (Rows == Cols)
>-        str << "mat" << Cols;
>-    else
>-        str << "mat" << Cols << "x" << Rows;
>-
>-    str << "(";
>-    for (int colNdx = 0; colNdx < Cols; colNdx++)
>-    {
>-        for (int rowNdx = 0; rowNdx < Rows; rowNdx++)
>-        {
>-            if (rowNdx > 0 || colNdx > 0)
>-                str << ", ";
>-            str << de::floatToString(m(rowNdx, colNdx), 1);
>-        }
>-    }
>-    str << ")";
>-}
>-
>-} // MatrixCaseUtils
>-
>-using namespace MatrixCaseUtils;
>-
>-class MatrixShaderEvaluator : public ShaderEvaluator
>-{
>-public:
>-                            MatrixShaderEvaluator   (MatrixShaderEvalFunc evalFunc, InputType inType0, InputType inType1);
>-
>-    virtual void            evaluate                (ShaderEvalContext& evalCtx);
>-
>-private:
>-    MatrixShaderEvalFunc    m_matEvalFunc;
>-    InputType               m_inType0;
>-    InputType               m_inType1;
>-};
>-
>-MatrixShaderEvaluator::MatrixShaderEvaluator (MatrixShaderEvalFunc evalFunc, InputType inType0, InputType inType1)
>-    : m_matEvalFunc (evalFunc)
>-    , m_inType0     (inType0)
>-    , m_inType1     (inType1)
>-{
>-}
>-
>-void MatrixShaderEvaluator::evaluate (ShaderEvalContext& evalCtx)
>-{
>-    m_matEvalFunc(evalCtx, m_inType0, m_inType1);
>-}
>-
>-class ShaderMatrixCase : public ShaderRenderCase
>-{
>-public:
>-                            ShaderMatrixCase            (Context& context, const char* name, const char* desc, const ShaderInput& in0, const ShaderInput& in1, MatrixOp op, bool isVertexCase);
>-                            ~ShaderMatrixCase           (void);
>-
>-    void                    init                        (void);
>-
>-protected:
>-    std::string             genGLSLMatToVec3Reduction   (const glu::DataType& matType, const char* varName);
>-    void                    setupUniforms               (int programID, const tcu::Vec4& constCoords);
>-
>-private:
>-    ShaderInput             m_in0;
>-    ShaderInput             m_in1;
>-    MatrixOp                m_op;
>-    MatrixShaderEvaluator   m_matEvaluator;
>-};
>-
>-ShaderMatrixCase::ShaderMatrixCase (Context& context, const char* name, const char* desc, const ShaderInput& in0, const ShaderInput& in1, MatrixOp op, bool isVertexCase)
>-    : ShaderRenderCase  (context.getTestContext(), context.getRenderContext(), context.getContextInfo(), name, desc, isVertexCase, m_matEvaluator)
>-    , m_in0             (in0)
>-    , m_in1             (in1)
>-    , m_op              (op)
>-    , m_matEvaluator    (getEvalFunc(in0, in1, op), in0.inputType, in1.inputType)
>-{
>-}
>-
>-ShaderMatrixCase::~ShaderMatrixCase (void)
>-{
>-}
>-
>-void ShaderMatrixCase::init (void)
>-{
>-    std::ostringstream  vtx;
>-    std::ostringstream  frag;
>-    std::ostringstream& op              = m_isVertexCase ? vtx : frag;
>-
>-    bool                isInDynMat0     = isDataTypeMatrix(m_in0.dataType) && m_in0.inputType == INPUTTYPE_DYNAMIC;
>-    bool                isInDynMat1     = isDataTypeMatrix(m_in1.dataType) && m_in1.inputType == INPUTTYPE_DYNAMIC;
>-    string              inValue0;
>-    string              inValue1;
>-    DataType            resultType      = TYPE_LAST;
>-    Precision           resultPrec      = m_in0.precision;
>-    vector<string>      passVars;
>-    int                 numInputs       = (isOperationBinary(m_op)) ? (2) : (1);
>-
>-    std::string         operationValue0;
>-    std::string         operationValue1;
>-
>-    DE_ASSERT(!isInDynMat0 || !isInDynMat1); // Only single dynamic matrix input is allowed.
>-    DE_UNREF(isInDynMat0 && isInDynMat1);
>-
>-    // Compute result type.
>-    if (m_op == OP_MUL && isDataTypeMatrix(m_in0.dataType) && isDataTypeMatrix(m_in1.dataType))
>-    {
>-        resultType = getDataTypeMatrix(getDataTypeMatrixNumColumns(m_in1.dataType), getDataTypeMatrixNumRows(m_in0.dataType));
>-    }
>-    else if (m_op == OP_OUTER_PRODUCT)
>-    {
>-        resultType = getDataTypeMatrix(getDataTypeScalarSize(m_in1.dataType), getDataTypeScalarSize(m_in0.dataType));
>-    }
>-    else if (m_op == OP_TRANSPOSE)
>-    {
>-        resultType = getDataTypeMatrix(getDataTypeMatrixNumRows(m_in0.dataType), getDataTypeMatrixNumColumns(m_in0.dataType));
>-    }
>-    else if (m_op == OP_INVERSE)
>-    {
>-        resultType = m_in0.dataType;
>-    }
>-    else if (m_op == OP_DETERMINANT)
>-    {
>-        resultType = TYPE_FLOAT;
>-    }
>-    else if (getOperationType(m_op) == OPERATIONTYPE_UNARY_PREFIX_OPERATOR ||
>-             getOperationType(m_op) == OPERATIONTYPE_UNARY_POSTFIX_OPERATOR)
>-    {
>-        resultType = m_in0.dataType;
>-    }
>-    else if (isDataTypeMatrix(m_in0.dataType) && isDataTypeMatrix(m_in1.dataType))
>-    {
>-        DE_ASSERT(m_in0.dataType == m_in1.dataType);
>-        resultType = m_in0.dataType;
>-    }
>-    else if (isDataTypeMatrix(m_in0.dataType) || isDataTypeMatrix(m_in1.dataType))
>-    {
>-        int         matNdx      = isDataTypeMatrix(m_in0.dataType) ? 0 : 1;
>-        DataType    matrixType  = matNdx == 0 ? m_in0.dataType : m_in1.dataType;
>-        DataType    otherType   = matNdx == 0 ? m_in1.dataType : m_in0.dataType;
>-
>-        if (otherType == TYPE_FLOAT)
>-            resultType = matrixType;
>-        else
>-        {
>-            DE_ASSERT(isDataTypeVector(otherType));
>-            resultType = getDataTypeFloatVec(matNdx == 0 ? getDataTypeMatrixNumRows(matrixType) : getDataTypeMatrixNumColumns(matrixType));
>-        }
>-    }
>-    else
>-    {
>-        DE_ASSERT(DE_FALSE);
>-    }
>-
>-    vtx << "#version 300 es\n";
>-    frag << "#version 300 es\n";
>-
>-    vtx << "in highp vec4 a_position;\n";
>-    frag << "layout(location = 0) out mediump vec4 dEQP_FragColor;\n";
>-    if (m_isVertexCase)
>-    {
>-        vtx << "out mediump vec4 v_color;\n";
>-        frag << "in mediump vec4 v_color;\n";
>-    }
>-
>-    // Input declarations.
>-    for (int inNdx = 0; inNdx < numInputs; inNdx++)
>-    {
>-        const ShaderInput&  in          = inNdx > 0 ? m_in1 : m_in0;
>-        const char*         precName    = getPrecisionName(in.precision);
>-        const char*         typeName    = getDataTypeName(in.dataType);
>-        string&             inValue     = inNdx > 0 ? inValue1 : inValue0;
>-
>-        if (in.inputType == INPUTTYPE_DYNAMIC)
>-        {
>-            vtx << "in " << precName << " " << typeName << " a_";
>-
>-            if (isDataTypeMatrix(in.dataType))
>-            {
>-                // a_matN, v_matN
>-                vtx << typeName << ";\n";
>-                if (!m_isVertexCase)
>-                {
>-                    vtx << "out " << precName << " " << typeName << " v_" << typeName << ";\n";
>-                    frag << "in " << precName << " " << typeName << " v_" << typeName << ";\n";
>-                    passVars.push_back(typeName);
>-                }
>-
>-                inValue = string(m_isVertexCase ? "a_" : "v_") + getDataTypeName(in.dataType);
>-            }
>-            else
>-            {
>-                // a_coords, v_coords
>-                vtx << "coords;\n";
>-                if (!m_isVertexCase)
>-                {
>-                    vtx << "out " << precName << " " << typeName << " v_coords;\n";
>-                    frag << "in " << precName << " " << typeName << " v_coords;\n";
>-                    passVars.push_back("coords");
>-                }
>-
>-                inValue = m_isVertexCase ? "a_coords" : "v_coords";
>-            }
>-        }
>-        else if (in.inputType == INPUTTYPE_UNIFORM)
>-        {
>-            op << "uniform " << precName << " " << typeName << " u_in" << inNdx << ";\n";
>-            inValue = string("u_in") + de::toString(inNdx);
>-        }
>-        else if (in.inputType == INPUTTYPE_CONST)
>-        {
>-            op << "const " << precName << " " << typeName << " in" << inNdx << " = ";
>-
>-            // Generate declaration.
>-            switch (in.dataType)
>-            {
>-                case TYPE_FLOAT:        op << de::floatToString(s_constInFloat[inNdx], 1);                  break;
>-                case TYPE_FLOAT_VEC2:   writeVectorConstructor<2>(op, s_constInVec2[inNdx]);                break;
>-                case TYPE_FLOAT_VEC3:   writeVectorConstructor<3>(op, s_constInVec3[inNdx]);                break;
>-                case TYPE_FLOAT_VEC4:   writeVectorConstructor<4>(op, s_constInVec4[inNdx]);                break;
>-                case TYPE_FLOAT_MAT2:   writeMatrixConstructor<2, 2>(op, Mat2(s_constInMat2x2[inNdx]));     break;
>-                case TYPE_FLOAT_MAT2X3: writeMatrixConstructor<2, 3>(op, Mat2x3(s_constInMat2x3[inNdx]));   break;
>-                case TYPE_FLOAT_MAT2X4: writeMatrixConstructor<2, 4>(op, Mat2x4(s_constInMat2x4[inNdx]));   break;
>-                case TYPE_FLOAT_MAT3X2: writeMatrixConstructor<3, 2>(op, Mat3x2(s_constInMat3x2[inNdx]));   break;
>-                case TYPE_FLOAT_MAT3:   writeMatrixConstructor<3, 3>(op, Mat3(s_constInMat3x3[inNdx]));     break;
>-                case TYPE_FLOAT_MAT3X4: writeMatrixConstructor<3, 4>(op, Mat3x4(s_constInMat3x4[inNdx]));   break;
>-                case TYPE_FLOAT_MAT4X2: writeMatrixConstructor<4, 2>(op, Mat4x2(s_constInMat4x2[inNdx]));   break;
>-                case TYPE_FLOAT_MAT4X3: writeMatrixConstructor<4, 3>(op, Mat4x3(s_constInMat4x3[inNdx]));   break;
>-                case TYPE_FLOAT_MAT4:   writeMatrixConstructor<4, 4>(op, Mat4(s_constInMat4x4[inNdx]));     break;
>-
>-                default:
>-                    DE_ASSERT(DE_FALSE);
>-            }
>-
>-            op << ";\n";
>-
>-            inValue = string("in") + de::toString(inNdx);
>-        }
>-    }
>-
>-    vtx << "\n"
>-        << "void main (void)\n"
>-        << "{\n"
>-        << "    gl_Position = a_position;\n";
>-    frag << "\n"
>-         << "void main (void)\n"
>-         << "{\n";
>-
>-    if (m_isVertexCase)
>-        frag << "   dEQP_FragColor = v_color;\n";
>-    else
>-    {
>-        for (vector<string>::const_iterator copyIter = passVars.begin(); copyIter != passVars.end(); copyIter++)
>-            vtx << "    v_" << *copyIter << " = " << "a_" << *copyIter << ";\n";
>-    }
>-
>-    // Operation.
>-
>-    switch (getOperationNature(m_op))
>-    {
>-        case OPERATIONNATURE_PURE:
>-            DE_ASSERT(getOperationType(m_op) != OPERATIONTYPE_ASSIGNMENT);
>-
>-            operationValue0 = inValue0;
>-            operationValue1 = inValue1;
>-            break;
>-
>-        case OPERATIONNATURE_MUTATING:
>-            DE_ASSERT(getOperationType(m_op) != OPERATIONTYPE_ASSIGNMENT);
>-
>-            op << " " << getPrecisionName(resultPrec) << " " << getDataTypeName(resultType) << " tmpValue = " << inValue0 << ";\n";
>-
>-            operationValue0 = "tmpValue";
>-            operationValue1 = inValue1;
>-            break;
>-
>-        case OPERATIONNATURE_ASSIGNMENT:
>-            DE_ASSERT(getOperationType(m_op) == OPERATIONTYPE_ASSIGNMENT);
>-
>-            operationValue0 = inValue0;
>-            operationValue1 = inValue1;
>-            break;
>-
>-        default:
>-            DE_ASSERT(DE_FALSE);
>-    }
>-
>-    switch (getOperationType(m_op))
>-    {
>-        case OPERATIONTYPE_BINARY_OPERATOR:
>-            op << " " << getPrecisionName(resultPrec) << " " << getDataTypeName(resultType) << " res = " << operationValue0 << " " << getOperationName(m_op) << " " << operationValue1 << ";\n";
>-            break;
>-
>-        case OPERATIONTYPE_UNARY_PREFIX_OPERATOR:
>-            op << " " << getPrecisionName(resultPrec) << " " << getDataTypeName(resultType) << " res = " << getOperationName(m_op) << operationValue0 << ";\n";
>-            break;
>-
>-        case OPERATIONTYPE_UNARY_POSTFIX_OPERATOR:
>-            op << " " << getPrecisionName(resultPrec) << " " << getDataTypeName(resultType) << " res = " << operationValue0 << getOperationName(m_op) << ";\n";
>-            break;
>-
>-        case OPERATIONTYPE_BINARY_FUNCTION:
>-            op << " " << getPrecisionName(resultPrec) << " " << getDataTypeName(resultType) << " res = " << getOperationName(m_op) << "(" << operationValue0 << ", " << operationValue1 << ");\n";
>-            break;
>-
>-        case OPERATIONTYPE_UNARY_FUNCTION:
>-            op << " " << getPrecisionName(resultPrec) << " " << getDataTypeName(resultType) << " res = " << getOperationName(m_op) << "(" << operationValue0 << ");\n";
>-            break;
>-
>-        case OPERATIONTYPE_ASSIGNMENT:
>-            op << " " << getPrecisionName(resultPrec) << " " << getDataTypeName(resultType) << " res = " << operationValue0 << ";\n";
>-            op << " res " << getOperationName(m_op) << " " << operationValue1 << ";\n";
>-            break;
>-
>-        default:
>-            DE_ASSERT(DE_FALSE);
>-    }
>-
>-    // Reduction to vec3 (rgb). Check the used value too if it was modified
>-    op << " " << (m_isVertexCase ? "v_color" : "dEQP_FragColor") << " = ";
>-
>-    if (isOperationValueModifying(m_op))
>-        op << "vec4(" << genGLSLMatToVec3Reduction(resultType, "res") << ", 1.0) + vec4(" << genGLSLMatToVec3Reduction(resultType, "tmpValue") << ", 0.0);\n";
>-    else
>-        op << "vec4(" << genGLSLMatToVec3Reduction(resultType, "res") << ", 1.0);\n";
>-
>-    vtx << "}\n";
>-    frag << "}\n";
>-
>-    m_vertShaderSource  = vtx.str();
>-    m_fragShaderSource  = frag.str();
>-
>-    // \todo [2012-02-14 pyry] Compute better values for matrix tests.
>-    m_userAttribTransforms.resize(4);
>-    for (int attribNdx = 0; attribNdx < 4; attribNdx++)
>-    {
>-        m_userAttribTransforms[attribNdx] = Mat4(0.0f);
>-        m_userAttribTransforms[attribNdx](                  0, 3) = 0.2f;                               // !< prevent matrix*vec from going into zero (assuming vec.w != 0)
>-        m_userAttribTransforms[attribNdx](                  1, 3) = 0.1f;                               // !<
>-        m_userAttribTransforms[attribNdx](                  2, 3) = 0.4f + 0.15f * float(attribNdx);    // !<
>-        m_userAttribTransforms[attribNdx](                  3, 3) = 0.7f;                               // !<
>-        m_userAttribTransforms[attribNdx]((0 + attribNdx) % 4, 0) = 1.0f;
>-        m_userAttribTransforms[attribNdx]((1 + attribNdx) % 4, 1) = 1.0f;
>-        m_userAttribTransforms[attribNdx]((2 + attribNdx) % 4, 2) = 1.0f;
>-        m_userAttribTransforms[attribNdx]((3 + attribNdx) % 4, 3) = 1.0f;
>-    }
>-
>-    // prevent bad reference cases such as black result images by fine-tuning used matrices
>-    if (getOperationTestMatrixType(m_op) != TESTMATRIXTYPE_DEFAULT)
>-    {
>-        for (int attribNdx = 0; attribNdx < 4; attribNdx++)
>-        {
>-            for (int row = 0; row < 4; row++)
>-            for (int col = 0; col < 4; col++)
>-            {
>-                switch (getOperationTestMatrixType(m_op))
>-                {
>-                    case TESTMATRIXTYPE_NEGATED:
>-                        m_userAttribTransforms[attribNdx](row, col) = -m_userAttribTransforms[attribNdx](row, col);
>-                        break;
>-                    case TESTMATRIXTYPE_INCREMENTED:
>-                        m_userAttribTransforms[attribNdx](row, col) += 0.3f;
>-                        break;
>-                    case TESTMATRIXTYPE_DECREMENTED:
>-                        m_userAttribTransforms[attribNdx](row, col) -= 0.3f;
>-                        break;
>-                    case TESTMATRIXTYPE_NEGATED_INCREMENTED:
>-                        m_userAttribTransforms[attribNdx](row, col) = -m_userAttribTransforms[attribNdx](row, col) + 0.3f;
>-                        break;
>-                    case TESTMATRIXTYPE_INCREMENTED_LESS:
>-                        m_userAttribTransforms[attribNdx](row, col) -= 0.1f;
>-                        break;
>-
>-                    default:
>-                        DE_ASSERT(DE_FALSE);
>-                        break;
>-                }
>-            }
>-        }
>-    }
>-
>-    ShaderRenderCase::init();
>-}
>-
>-std::string ShaderMatrixCase::genGLSLMatToVec3Reduction (const glu::DataType& matType, const char* varName)
>-{
>-    std::ostringstream op;
>-
>-    switch (matType)
>-    {
>-        case TYPE_FLOAT:        op << varName << ", "           << varName << ", "          << varName << "";                                                                                                                                           break;
>-        case TYPE_FLOAT_VEC2:   op << varName << ".x, "         << varName << ".y, "        << varName << ".x";                                                                                                                                         break;
>-        case TYPE_FLOAT_VEC3:   op << varName << "";                                                                                                                                                                                                    break;
>-        case TYPE_FLOAT_VEC4:   op << varName << ".x, "         << varName << ".y, "        << varName << ".z+"         << varName << ".w";                                                                                                             break;
>-        case TYPE_FLOAT_MAT2:   op << varName << "[0][0], "     << varName << "[1][0], "    << varName << "[0][1]+"     << varName << "[1][1]";                                                                                                         break;
>-        case TYPE_FLOAT_MAT2X3: op << varName << "[0] + "       << varName << "[1]";                                                                                                                                                                    break;
>-        case TYPE_FLOAT_MAT2X4: op << varName << "[0].xyz + "   << varName << "[1].yzw";                                                                                                                                                                break;
>-        case TYPE_FLOAT_MAT3X2: op << varName << "[0][0]+"      << varName << "[0][1], "    << varName << "[1][0]+"     << varName << "[1][1], "    << varName << "[2][0]+" << varName << "[2][1]";                                                     break;
>-        case TYPE_FLOAT_MAT3:   op << varName << "[0] + "       << varName << "[1] + "      << varName << "[2]";                                                                                                                                        break;
>-        case TYPE_FLOAT_MAT3X4: op << varName << "[0].xyz + "   << varName << "[1].yzw + "  << varName << "[2].zwx";                                                                                                                                    break;
>-        case TYPE_FLOAT_MAT4X2: op << varName << "[0][0]+"      << varName << "[0][1]+"     << varName << "[3][0], "    << varName << "[1][0]+"     << varName << "[1][1]+" << varName << "[3][1], " << varName << "[2][0]+" << varName << "[2][1]";    break;
>-        case TYPE_FLOAT_MAT4X3: op << varName << "[0] + "       << varName << "[1] + "      << varName << "[2] + "      << varName << "[3]";                                                                                                            break;
>-        case TYPE_FLOAT_MAT4:   op << varName << "[0].xyz+"     << varName << "[1].yzw+"    << varName << "[2].zwx+"    << varName << "[3].wxy";                                                                                                        break;
>-
>-        default:
>-            DE_ASSERT(DE_FALSE);
>-    }
>-
>-    return op.str();
>-}
>-
>-void ShaderMatrixCase::setupUniforms (int programID, const tcu::Vec4& constCoords)
>-{
>-    const glw::Functions& gl = m_renderCtx.getFunctions();
>-
>-    DE_UNREF(constCoords);
>-
>-    for (int inNdx = 0; inNdx < 2; inNdx++)
>-    {
>-        const ShaderInput& in = inNdx > 0 ? m_in1 : m_in0;
>-
>-        if (in.inputType == INPUTTYPE_UNIFORM)
>-        {
>-            int loc = gl.getUniformLocation(programID, (string("u_in") + de::toString(inNdx)).c_str());
>-
>-            if (loc < 0)
>-                continue;
>-
>-            switch (in.dataType)
>-            {
>-                case TYPE_FLOAT:        gl.uniform1f(loc, s_constInFloat[inNdx]);                       break;
>-                case TYPE_FLOAT_VEC2:   gl.uniform2fv(loc, 1, s_constInVec2[inNdx].getPtr());           break;
>-                case TYPE_FLOAT_VEC3:   gl.uniform3fv(loc, 1, s_constInVec3[inNdx].getPtr());           break;
>-                case TYPE_FLOAT_VEC4:   gl.uniform4fv(loc, 1, s_constInVec4[inNdx].getPtr());           break;
>-                // \note GLES3 supports transpose in matrix upload.
>-                case TYPE_FLOAT_MAT2:   gl.uniformMatrix2fv (loc, 1, GL_TRUE, s_constInMat2x2[inNdx]);  break;
>-                case TYPE_FLOAT_MAT2X3: gl.uniformMatrix2x3fv(loc, 1, GL_TRUE, s_constInMat2x3[inNdx]); break;
>-                case TYPE_FLOAT_MAT2X4: gl.uniformMatrix2x4fv(loc, 1, GL_TRUE, s_constInMat2x4[inNdx]); break;
>-                case TYPE_FLOAT_MAT3X2: gl.uniformMatrix3x2fv(loc, 1, GL_TRUE, s_constInMat3x2[inNdx]); break;
>-                case TYPE_FLOAT_MAT3:   gl.uniformMatrix3fv (loc, 1, GL_TRUE, s_constInMat3x3[inNdx]);  break;
>-                case TYPE_FLOAT_MAT3X4: gl.uniformMatrix3x4fv(loc, 1, GL_TRUE, s_constInMat3x4[inNdx]); break;
>-                case TYPE_FLOAT_MAT4X2: gl.uniformMatrix4x2fv(loc, 1, GL_TRUE, s_constInMat4x2[inNdx]); break;
>-                case TYPE_FLOAT_MAT4X3: gl.uniformMatrix4x3fv(loc, 1, GL_TRUE, s_constInMat4x3[inNdx]); break;
>-                case TYPE_FLOAT_MAT4:   gl.uniformMatrix4fv (loc, 1, GL_TRUE, s_constInMat4x4[inNdx]);  break;
>-                default:
>-                    DE_ASSERT(false);
>-            }
>-        }
>-    }
>-}
>-
>-ShaderMatrixTests::ShaderMatrixTests (Context& context)
>-    : TestCaseGroup(context, "matrix", "Matrix Tests")
>-{
>-}
>-
>-ShaderMatrixTests::~ShaderMatrixTests (void)
>-{
>-}
>-
>-void ShaderMatrixTests::init (void)
>-{
>-    static const struct
>-    {
>-        const char*     name;
>-        const char*     desc;
>-        MatrixOp        op;
>-        bool            extendedInputTypeCases; // !< test with const and uniform types too
>-        bool            createInputTypeGroup;   // !< create group for input types
>-    } ops[] =
>-    {
>-        { "add",            "Matrix addition tests",                        OP_ADD,             true,   true    },
>-        { "sub",            "Matrix subtraction tests",                     OP_SUB,             true,   true    },
>-        { "mul",            "Matrix multiplication tests",                  OP_MUL,             true,   true    },
>-        { "div",            "Matrix division tests",                        OP_DIV,             true,   true    },
>-        { "matrixcompmult", "Matrix component-wise multiplication tests",   OP_COMP_MUL,        false,  true    },
>-        { "outerproduct",   "Matrix outerProduct() tests",                  OP_OUTER_PRODUCT,   false,  true    },
>-        { "transpose",      "Matrix transpose() tests",                     OP_TRANSPOSE,       false,  true    },
>-        { "determinant",    "Matrix determinant() tests",                   OP_DETERMINANT,     false,  true    },
>-        { "inverse",        "Matrix inverse() tests",                       OP_INVERSE,         false,  true    },
>-        { "unary_addition", "Matrix unary addition tests",                  OP_UNARY_PLUS,      false,  false   },
>-        { "negation",       "Matrix negation tests",                        OP_NEGATION,        false,  false   },
>-        { "pre_increment",  "Matrix prefix increment tests",                OP_PRE_INCREMENT,   false,  false   },
>-        { "pre_decrement",  "Matrix prefix decrement tests",                OP_PRE_DECREMENT,   false,  false   },
>-        { "post_increment", "Matrix postfix increment tests",               OP_POST_INCREMENT,  false,  false   },
>-        { "post_decrement", "Matrix postfix decrement tests",               OP_POST_DECREMENT,  false,  false   },
>-        { "add_assign",     "Matrix add into tests",                        OP_ADD_INTO,        false,  false   },
>-        { "sub_assign",     "Matrix subtract from tests",                   OP_SUBTRACT_FROM,   false,  false   },
>-        { "mul_assign",     "Matrix multiply into tests",                   OP_MULTIPLY_INTO,   false,  false   },
>-        { "div_assign",     "Matrix divide into tests",                     OP_DIVIDE_INTO,     false,  false   },
>-    };
>-
>-    struct InputTypeSpec
>-    {
>-        const char*     name;
>-        const char*     desc;
>-        InputType       type;
>-    };
>-    static const InputTypeSpec extendedInputTypes[] =
>-    {
>-        { "const",      "Constant matrix input",    INPUTTYPE_CONST     },
>-        { "uniform",    "Uniform matrix input",     INPUTTYPE_UNIFORM   },
>-        { "dynamic",    "Dynamic matrix input",     INPUTTYPE_DYNAMIC   }
>-    };
>-    static const InputTypeSpec reducedInputTypes[] =
>-    {
>-        { "dynamic",    "Dynamic matrix input",     INPUTTYPE_DYNAMIC   }
>-    };
>-
>-    static const DataType matrixTypes[] =
>-    {
>-        TYPE_FLOAT_MAT2,
>-        TYPE_FLOAT_MAT2X3,
>-        TYPE_FLOAT_MAT2X4,
>-        TYPE_FLOAT_MAT3X2,
>-        TYPE_FLOAT_MAT3,
>-        TYPE_FLOAT_MAT3X4,
>-        TYPE_FLOAT_MAT4X2,
>-        TYPE_FLOAT_MAT4X3,
>-        TYPE_FLOAT_MAT4
>-    };
>-
>-    static const Precision precisions[] =
>-    {
>-        PRECISION_LOWP,
>-        PRECISION_MEDIUMP,
>-        PRECISION_HIGHP
>-    };
>-
>-    for (int opNdx = 0; opNdx < DE_LENGTH_OF_ARRAY(ops); opNdx++)
>-    {
>-        const InputTypeSpec*    inTypeList      = (ops[opNdx].extendedInputTypeCases) ? (extendedInputTypes) : (reducedInputTypes);
>-        const int               inTypeListSize  = (ops[opNdx].extendedInputTypeCases) ? (DE_LENGTH_OF_ARRAY(extendedInputTypes)) : (DE_LENGTH_OF_ARRAY(reducedInputTypes));
>-        const MatrixOp          op              = ops[opNdx].op;
>-        tcu::TestCaseGroup*     opGroup         = new tcu::TestCaseGroup(m_testCtx, ops[opNdx].name, ops[opNdx].desc);
>-
>-        addChild(opGroup);
>-
>-        for (int inTypeNdx = 0; inTypeNdx < inTypeListSize; inTypeNdx++)
>-        {
>-            const InputType     inputType   = inTypeList[inTypeNdx].type;
>-            tcu::TestCaseGroup* inGroup;
>-
>-            if (ops[opNdx].createInputTypeGroup)
>-            {
>-                inGroup = new tcu::TestCaseGroup(m_testCtx, inTypeList[inTypeNdx].name, inTypeList[inTypeNdx].desc);
>-                opGroup->addChild(inGroup);
>-            }
>-            else
>-                inGroup = opGroup;
>-
>-            for (int matTypeNdx = 0; matTypeNdx < DE_LENGTH_OF_ARRAY(matrixTypes); matTypeNdx++)
>-            {
>-                DataType    matType     = matrixTypes[matTypeNdx];
>-                int         numCols     = getDataTypeMatrixNumColumns(matType);
>-                int         numRows     = getDataTypeMatrixNumRows(matType);
>-                const char* matTypeName = getDataTypeName(matType);
>-
>-                for (int precNdx = 0; precNdx < DE_LENGTH_OF_ARRAY(precisions); precNdx++)
>-                {
>-                    Precision   precision   = precisions[precNdx];
>-                    const char* precName    = getPrecisionName(precision);
>-                    string      baseName    = string(precName) + "_" + matTypeName + "_";
>-                    ShaderInput matIn       (inputType, matType, precision);
>-
>-                    if (isOperationMatrixScalar(op))
>-                    {
>-                        // Matrix-scalar \note For div cases we use uniform input.
>-                        ShaderInput scalarIn(op == OP_DIV ? INPUTTYPE_UNIFORM : INPUTTYPE_DYNAMIC, TYPE_FLOAT, precision);
>-                        inGroup->addChild(new ShaderMatrixCase(m_context, (baseName + "float_vertex").c_str(),      "Matrix-scalar case", matIn, scalarIn, op, true));
>-                        inGroup->addChild(new ShaderMatrixCase(m_context, (baseName + "float_fragment").c_str(),    "Matrix-scalar case", matIn, scalarIn, op, false));
>-                    }
>-
>-                    if (isOperationMatrixVector(op))
>-                    {
>-                        // Matrix-vector.
>-                        DataType    colVecType  = getDataTypeFloatVec(numCols);
>-                        ShaderInput colVecIn    (op == OP_DIV ? INPUTTYPE_UNIFORM : INPUTTYPE_DYNAMIC, colVecType, precision);
>-
>-                        inGroup->addChild(new ShaderMatrixCase(m_context, (baseName + getDataTypeName(colVecType) + "_vertex").c_str(),     "Matrix-vector case", matIn, colVecIn, op, true));
>-                        inGroup->addChild(new ShaderMatrixCase(m_context, (baseName + getDataTypeName(colVecType) + "_fragment").c_str(),   "Matrix-vector case", matIn, colVecIn, op, false));
>-
>-                        // Vector-matrix.
>-                        DataType    rowVecType  = getDataTypeFloatVec(numRows);
>-                        ShaderInput rowVecIn    (op == OP_DIV ? INPUTTYPE_UNIFORM : INPUTTYPE_DYNAMIC, rowVecType, precision);
>-                        string      vecMatName  = string(precName) + "_" + getDataTypeName(rowVecType) + "_" + matTypeName;
>-
>-                        inGroup->addChild(new ShaderMatrixCase(m_context, (vecMatName + "_vertex").c_str(),     "Vector-matrix case", rowVecIn, matIn, op, true));
>-                        inGroup->addChild(new ShaderMatrixCase(m_context, (vecMatName + "_fragment").c_str(),   "Vector-matrix case", rowVecIn, matIn, op, false));
>-                    }
>-
>-                    if (isOperationArithmeticMatrixMatrix(op))
>-                    {
>-                        // Arithmetic matrix-matrix multiplication.
>-                        for (int otherCols = 2; otherCols <= 4; otherCols++)
>-                        {
>-                            ShaderInput otherMatIn(inputType == INPUTTYPE_DYNAMIC ? INPUTTYPE_UNIFORM : inputType, getDataTypeMatrix(otherCols, numCols /* rows */), precision);
>-                            inGroup->addChild(new ShaderMatrixCase(m_context, (baseName + getDataTypeName(otherMatIn.dataType) + "_vertex").c_str(),    "Matrix-matrix case", matIn, otherMatIn, op, true));
>-                            inGroup->addChild(new ShaderMatrixCase(m_context, (baseName + getDataTypeName(otherMatIn.dataType) + "_fragment").c_str(),  "Matrix-matrix case", matIn, otherMatIn, op, false));
>-                        }
>-                    }
>-                    else if (isOperationComponentwiseMatrixMatrix(op))
>-                    {
>-                        // Component-wise.
>-                        ShaderInput otherMatIn(inputType == INPUTTYPE_DYNAMIC ? INPUTTYPE_UNIFORM : inputType, matType, precision);
>-                        inGroup->addChild(new ShaderMatrixCase(m_context, (baseName + matTypeName + "_vertex").c_str(),     "Matrix-matrix case", matIn, otherMatIn, op, true));
>-                        inGroup->addChild(new ShaderMatrixCase(m_context, (baseName + matTypeName + "_fragment").c_str(),   "Matrix-matrix case", matIn, otherMatIn, op, false));
>-                    }
>-
>-                    if (isOperationVectorVector(op))
>-                    {
>-                        ShaderInput vec1In(inputType,                                                               getDataTypeFloatVec(numRows), precision);
>-                        ShaderInput vec2In((inputType == INPUTTYPE_DYNAMIC) ? (INPUTTYPE_UNIFORM) : (inputType),    getDataTypeFloatVec(numCols), precision);
>-
>-                        inGroup->addChild(new ShaderMatrixCase(m_context, (baseName + "float_vertex").c_str(),      "Vector-vector case", vec1In, vec2In, op, true));
>-                        inGroup->addChild(new ShaderMatrixCase(m_context, (baseName + "float_fragment").c_str(),    "Vector-vector case", vec1In, vec2In, op, false));
>-                    }
>-
>-                    if ((isOperationUnaryAnyMatrix(op)) ||
>-                        (isOperationUnarySymmetricMatrix(op) && numCols == numRows))
>-                    {
>-                        ShaderInput voidInput(INPUTTYPE_LAST, TYPE_LAST, PRECISION_LAST);
>-                        inGroup->addChild(new ShaderMatrixCase(m_context, (baseName + "float_vertex").c_str(),      "Matrix case", matIn, voidInput, op, true));
>-                        inGroup->addChild(new ShaderMatrixCase(m_context, (baseName + "float_fragment").c_str(),    "Matrix case", matIn, voidInput, op, false));
>-                    }
>-
>-                    if ((isOperationAssignmentAnyMatrix(op)) ||
>-                        (isOperationAssignmentSymmetricMatrix(op) && numCols == numRows))
>-                    {
>-                        ShaderInput otherMatIn(inputType == INPUTTYPE_DYNAMIC ? INPUTTYPE_UNIFORM : inputType, matType, precision);
>-                        inGroup->addChild(new ShaderMatrixCase(m_context, (baseName + "float_vertex").c_str(),      "Matrix assignment case", matIn, otherMatIn, op, true));
>-                        inGroup->addChild(new ShaderMatrixCase(m_context, (baseName + "float_fragment").c_str(),    "Matrix assignment case", matIn, otherMatIn, op, false));
>-                    }
>-                }
>-            }
>-        }
>-    }
>-}
>-
>-} // Functional
>-} // gles3
>-} // deqp
>-
>-#if defined(_MSC_VER) && _MSC_FULL_VER == 191125507
>-// Work around crbug.com/759402 which is a code-gen bug in VC++ 2017, version
>-// 15.3.2.
>-#pragma optimize("", off)
>-#endif
>diff --git a/Source/ThirdParty/ANGLE/src/tests/deqp_support/qpTestLog.c b/Source/ThirdParty/ANGLE/src/tests/deqp_support/qpTestLog.c
>deleted file mode 100644
>index e3eaa9b14b2..00000000000
>--- a/Source/ThirdParty/ANGLE/src/tests/deqp_support/qpTestLog.c
>+++ /dev/null
>@@ -1,1481 +0,0 @@
>-/*-------------------------------------------------------------------------
>- * drawElements TestLog Library
>- * ----------------------------
>- *
>- * Copyright 2014 The Android Open Source Project
>- *
>- * Licensed under the Apache License, Version 2.0 (the "License");
>- * you may not use this file except in compliance with the License.
>- * You may obtain a copy of the License at
>- *
>- *      http://www.apache.org/licenses/LICENSE-2.0
>- *
>- * Unless required by applicable law or agreed to in writing, software
>- * distributed under the License is distributed on an "AS IS" BASIS,
>- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
>- * See the License for the specific language governing permissions and
>- * limitations under the License.
>- *
>- *//*!
>- * \file
>- * \brief Test case result logging
>- *//*--------------------------------------------------------------------*/
>-
>-#include "qpTestLog.h"
>-#include "qpXmlWriter.h"
>-#include "qpInfo.h"
>-#include "qpDebugOut.h"
>-
>-#include "deMemory.h"
>-#include "deInt32.h"
>-#include "deString.h"
>-
>-#include "deMutex.h"
>-
>-#if defined(QP_SUPPORT_PNG)
>-#   include <png.h>
>-#endif
>-
>-#include <stdio.h>
>-#include <stdlib.h>
>-#include <stdarg.h>
>-
>-#if (DE_OS == DE_OS_WIN32)
>-#   include <windows.h>
>-#   include <io.h>
>-#endif
>-
>-#if defined(DE_DEBUG)
>-
>-/* Utils for verifying container (Section, ImageSet, EglConfigSet) usage in debug builds. */
>-
>-typedef enum ContainerType_e
>-{
>-    CONTAINERTYPE_SECTION = 0,
>-    CONTAINERTYPE_IMAGESET,
>-    CONTAINERTYPE_EGLCONFIGSET,
>-    CONTAINERTYPE_SHADERPROGRAM,
>-    CONTAINERTYPE_SAMPLELIST,
>-    CONTAINERTYPE_SAMPLEINFO,
>-    CONTAINERTYPE_SAMPLE,
>-
>-    CONTAINERTYPE_LAST
>-} ContainerType;
>-
>-DE_INLINE deBool childContainersOk (ContainerType type)
>-{
>-    return type == CONTAINERTYPE_SECTION || type == CONTAINERTYPE_SAMPLELIST;
>-}
>-
>-enum
>-{
>-    MAX_CONTAINER_STACK_DEPTH       = 32
>-};
>-
>-typedef struct ContainerStack_s
>-{
>-    int             numElements;
>-    ContainerType   elements[MAX_CONTAINER_STACK_DEPTH];
>-} ContainerStack;
>-
>-DE_INLINE void ContainerStack_reset (ContainerStack* stack)
>-{
>-    deMemset(stack, 0, sizeof(ContainerStack));
>-}
>-
>-DE_INLINE deBool ContainerStack_isEmpty (const ContainerStack* stack)
>-{
>-    return stack->numElements == 0;
>-}
>-
>-DE_INLINE deBool ContainerStack_push (ContainerStack* stack, ContainerType type)
>-{
>-    if (stack->numElements == MAX_CONTAINER_STACK_DEPTH)
>-        return DE_FALSE;
>-
>-    if (stack->numElements > 0 && !childContainersOk(stack->elements[stack->numElements-1]))
>-        return DE_FALSE;
>-
>-    stack->elements[stack->numElements]  = type;
>-    stack->numElements                  += 1;
>-
>-    return DE_TRUE;
>-}
>-
>-DE_INLINE ContainerType ContainerStack_pop (ContainerStack* stack)
>-{
>-    DE_ASSERT(stack->numElements > 0);
>-    stack->numElements -= 1;
>-    return stack->elements[stack->numElements];
>-}
>-
>-DE_INLINE ContainerType ContainerStack_getTop (const ContainerStack* stack)
>-{
>-    if (stack->numElements > 0)
>-        return stack->elements[stack->numElements-1];
>-    else
>-        return CONTAINERTYPE_LAST;
>-}
>-
>-#endif
>-
>-/* qpTestLog instance */
>-struct qpTestLog_s
>-{
>-    deUint32                flags;              /*!< Logging flags.                     */
>-
>-    deMutex                 lock;               /*!< Lock for mutable state below.      */
>-
>-    /* State protected by lock. */
>-    FILE*                   outputFile;
>-    qpXmlWriter*            writer;
>-    deBool                  isSessionOpen;
>-    deBool                  isCaseOpen;
>-
>-#if defined(DE_DEBUG)
>-    ContainerStack          containerStack;     /*!< For container usage verification.  */
>-#endif
>-};
>-
>-/* Maps integer to string. */
>-typedef struct qpKeyStringMap_s
>-{
>-    int     key;
>-    char*   string;
>-} qpKeyStringMap;
>-
>-static const char* LOG_FORMAT_VERSION = "0.3.4";
>-
>-/* Mapping enum to above strings... */
>-static const qpKeyStringMap s_qpTestTypeMap[] =
>-{
>-    { QP_TEST_CASE_TYPE_SELF_VALIDATE,      "SelfValidate"  },
>-    { QP_TEST_CASE_TYPE_PERFORMANCE,        "Performance"   },
>-    { QP_TEST_CASE_TYPE_CAPABILITY,         "Capability"    },
>-    { QP_TEST_CASE_TYPE_ACCURACY,           "Accuracy"      },
>-
>-    { QP_TEST_CASE_TYPE_LAST,               DE_NULL         }
>-};
>-
>-DE_STATIC_ASSERT(DE_LENGTH_OF_ARRAY(s_qpTestTypeMap) == QP_TEST_CASE_TYPE_LAST + 1);
>-
>-static const qpKeyStringMap s_qpTestResultMap[] =
>-{
>-    { QP_TEST_RESULT_PASS,                      "Pass"                  },
>-    { QP_TEST_RESULT_FAIL,                      "Fail"                  },
>-    { QP_TEST_RESULT_QUALITY_WARNING,           "QualityWarning"        },
>-    { QP_TEST_RESULT_COMPATIBILITY_WARNING,     "CompatibilityWarning"  },
>-    { QP_TEST_RESULT_PENDING,                   "Pending"               },  /* should not be needed here */
>-    { QP_TEST_RESULT_NOT_SUPPORTED,             "NotSupported"          },
>-    { QP_TEST_RESULT_RESOURCE_ERROR,            "ResourceError"         },
>-    { QP_TEST_RESULT_INTERNAL_ERROR,            "InternalError"         },
>-    { QP_TEST_RESULT_CRASH,                     "Crash"                 },
>-    { QP_TEST_RESULT_TIMEOUT,                   "Timeout"               },
>-
>-    /* Add new values here if needed, remember to update qpTestResult enumeration. */
>-
>-    { QP_TEST_RESULT_LAST,                      DE_NULL                 }
>-};
>-
>-DE_STATIC_ASSERT(DE_LENGTH_OF_ARRAY(s_qpTestResultMap) == QP_TEST_RESULT_LAST + 1);
>-
>-/* Key tag to string mapping. */
>-
>-static const qpKeyStringMap s_qpTagMap[] =
>-{
>-    { QP_KEY_TAG_NONE,          DE_NULL         },
>-    { QP_KEY_TAG_PERFORMANCE,   "Performance"   },
>-    { QP_KEY_TAG_QUALITY,       "Quality"       },
>-    { QP_KEY_TAG_PRECISION,     "Precision"     },
>-    { QP_KEY_TAG_TIME,          "Time"          },
>-
>-    { QP_KEY_TAG_LAST,          DE_NULL         }
>-};
>-
>-DE_STATIC_ASSERT(DE_LENGTH_OF_ARRAY(s_qpTagMap) == QP_KEY_TAG_LAST + 1);
>-
>-/* Sample value tag to string mapping. */
>-
>-static const qpKeyStringMap s_qpSampleValueTagMap[] =
>-{
>-    { QP_SAMPLE_VALUE_TAG_PREDICTOR,    "Predictor" },
>-    { QP_SAMPLE_VALUE_TAG_RESPONSE,     "Response"  },
>-
>-    { QP_SAMPLE_VALUE_TAG_LAST,         DE_NULL     }
>-};
>-
>-DE_STATIC_ASSERT(DE_LENGTH_OF_ARRAY(s_qpSampleValueTagMap) == QP_SAMPLE_VALUE_TAG_LAST + 1);
>-
>-/* Image compression mode to string mapping. */
>-
>-static const qpKeyStringMap s_qpImageCompressionModeMap[] =
>-{
>-    { QP_IMAGE_COMPRESSION_MODE_NONE,   "None"  },
>-    { QP_IMAGE_COMPRESSION_MODE_PNG,    "PNG"   },
>-
>-    { QP_IMAGE_COMPRESSION_MODE_BEST,   DE_NULL },  /* not allowed to be written! */
>-
>-    { QP_IMAGE_COMPRESSION_MODE_LAST,   DE_NULL }
>-};
>-
>-DE_STATIC_ASSERT(DE_LENGTH_OF_ARRAY(s_qpImageCompressionModeMap) == QP_IMAGE_COMPRESSION_MODE_LAST + 1);
>-
>-/* Image format to string mapping. */
>-
>-static const qpKeyStringMap s_qpImageFormatMap[] =
>-{
>-    { QP_IMAGE_FORMAT_RGB888,   "RGB888"    },
>-    { QP_IMAGE_FORMAT_RGBA8888, "RGBA8888"  },
>-
>-    { QP_IMAGE_FORMAT_LAST,     DE_NULL     }
>-};
>-
>-DE_STATIC_ASSERT(DE_LENGTH_OF_ARRAY(s_qpImageFormatMap) == QP_IMAGE_FORMAT_LAST + 1);
>-
>-/* Shader type to string mapping. */
>-
>-static const qpKeyStringMap s_qpShaderTypeMap[] =
>-{
>-    { QP_SHADER_TYPE_VERTEX,            "VertexShader"          },
>-    { QP_SHADER_TYPE_FRAGMENT,          "FragmentShader"        },
>-    { QP_SHADER_TYPE_GEOMETRY,          "GeometryShader"        },
>-    { QP_SHADER_TYPE_TESS_CONTROL,      "TessControlShader"     },
>-    { QP_SHADER_TYPE_TESS_EVALUATION,   "TessEvaluationShader"  },
>-    { QP_SHADER_TYPE_COMPUTE,           "ComputeShader"         },
>-
>-    { QP_SHADER_TYPE_LAST,              DE_NULL                 }
>-};
>-
>-DE_STATIC_ASSERT(DE_LENGTH_OF_ARRAY(s_qpShaderTypeMap) == QP_SHADER_TYPE_LAST + 1);
>-
>-static void qpTestLog_flushFile (qpTestLog* log)
>-{
>-    DE_ASSERT(log && log->outputFile);
>-    fflush(log->outputFile);
>-#if (DE_OS == DE_OS_WIN32) && (DE_COMPILER == DE_COMPILER_MSC)
>-    /* \todo [petri] Is this really necessary? */
>-    FlushFileBuffers((HANDLE)_get_osfhandle(_fileno(log->outputFile)));
>-#endif
>-}
>-
>-#define QP_LOOKUP_STRING(KEYMAP, KEY)   qpLookupString(KEYMAP, DE_LENGTH_OF_ARRAY(KEYMAP), (int)(KEY))
>-
>-static const char* qpLookupString (const qpKeyStringMap* keyMap, int keyMapSize, int key)
>-{
>-    DE_ASSERT(keyMap);
>-    DE_ASSERT(deInBounds32(key, 0, keyMapSize));
>-    DE_ASSERT(keyMap[key].key == key);
>-    DE_UNREF(keyMapSize); /* for asserting only */
>-    return keyMap[key].string;
>-}
>-
>-DE_INLINE void int32ToString (int val, char buf[32])
>-{
>-    deSprintf(&buf[0], 32, "%d", val);
>-}
>-
>-DE_INLINE void int64ToString (deInt64 val, char buf[32])
>-{
>-    deSprintf(&buf[0], 32, "%lld", (long long int)val);
>-}
>-
>-DE_INLINE void floatToString (float value, char* buf, size_t bufSize)
>-{
>-    deSprintf(buf, bufSize, "%f", value);
>-}
>-
>-DE_INLINE void doubleToString (double value, char* buf, size_t bufSize)
>-{
>-    deSprintf(buf, bufSize, "%f", value);
>-}
>-
>-static deBool beginSession (qpTestLog* log)
>-{
>-    DE_ASSERT(log && !log->isSessionOpen);
>-
>-    /* Write session info. */
>-    fprintf(log->outputFile, "#sessionInfo releaseName %s\n", qpGetReleaseName());
>-    fprintf(log->outputFile, "#sessionInfo releaseId 0x%08x\n", qpGetReleaseId());
>-    fprintf(log->outputFile, "#sessionInfo targetName \"%s\"\n", qpGetTargetName());
>-
>-    /* Write out #beginSession. */
>-    fprintf(log->outputFile, "#beginSession\n");
>-    qpTestLog_flushFile(log);
>-
>-    log->isSessionOpen = DE_TRUE;
>-
>-    return DE_TRUE;
>-}
>-
>-static deBool endSession (qpTestLog* log)
>-{
>-    DE_ASSERT(log && log->isSessionOpen);
>-
>-    /* Make sure xml is flushed. */
>-    qpXmlWriter_flush(log->writer);
>-
>-    /* Write out #endSession. */
>-    fprintf(log->outputFile, "\n#endSession\n");
>-    qpTestLog_flushFile(log);
>-
>-    log->isSessionOpen = DE_FALSE;
>-
>-    return DE_TRUE;
>-}
>-
>-/*--------------------------------------------------------------------*//*!
>- * \brief Create a file based logger instance
>- * \param fileName Name of the file where to put logs
>- * \return qpTestLog instance, or DE_NULL if cannot create file
>- *//*--------------------------------------------------------------------*/
>-qpTestLog* qpTestLog_createFileLog (const char* fileName, deUint32 flags)
>-{
>-    qpTestLog* log = (qpTestLog*)deCalloc(sizeof(qpTestLog));
>-    if (!log)
>-        return DE_NULL;
>-
>-    DE_ASSERT(fileName && fileName[0]); /* must have filename. */
>-
>-#if defined(DE_DEBUG)
>-    ContainerStack_reset(&log->containerStack);
>-#endif
>-
>-    qpPrintf("Writing test log into %s\n", fileName);
>-
>-    /* Create output file. */
>-    log->outputFile = fopen(fileName, "wb");
>-    if (!log->outputFile)
>-    {
>-        qpPrintf("ERROR: Unable to open test log output file '%s'.\n", fileName);
>-        qpTestLog_destroy(log);
>-        return DE_NULL;
>-    }
>-
>-    log->flags          = flags;
>-    log->writer         = qpXmlWriter_createFileWriter(log->outputFile, 0, !(flags & QP_TEST_LOG_NO_FLUSH));
>-    log->lock           = deMutex_create(DE_NULL);
>-    log->isSessionOpen  = DE_FALSE;
>-    log->isCaseOpen     = DE_FALSE;
>-
>-    if (!log->writer)
>-    {
>-        qpPrintf("ERROR: Unable to create output XML writer to file '%s'.\n", fileName);
>-        qpTestLog_destroy(log);
>-        return DE_NULL;
>-    }
>-
>-    if (!log->lock)
>-    {
>-        qpPrintf("ERROR: Unable to create mutex.\n");
>-        qpTestLog_destroy(log);
>-        return DE_NULL;
>-    }
>-
>-    beginSession(log);
>-
>-    return log;
>-}
>-
>-/*--------------------------------------------------------------------*//*!
>- * \brief Destroy a logger instance
>- * \param a qpTestLog instance
>- *//*--------------------------------------------------------------------*/
>-void qpTestLog_destroy (qpTestLog* log)
>-{
>-    DE_ASSERT(log);
>-
>-    if (log->isSessionOpen)
>-        endSession(log);
>-
>-    if (log->writer)
>-        qpXmlWriter_destroy(log->writer);
>-
>-    if (log->outputFile)
>-        fclose(log->outputFile);
>-
>-    if (log->lock)
>-        deMutex_destroy(log->lock);
>-
>-    deFree(log);
>-}
>-
>-/*--------------------------------------------------------------------*//*!
>- * \brief Log start of test case
>- * \param log qpTestLog instance
>- * \param testCasePath  Full test case path (as seen in Candy).
>- * \param testCaseType  Test case type
>- * \return true if ok, false otherwise
>- *//*--------------------------------------------------------------------*/
>-deBool qpTestLog_startCase (qpTestLog* log, const char* testCasePath, qpTestCaseType testCaseType)
>-{
>-    const char*     typeStr             = QP_LOOKUP_STRING(s_qpTestTypeMap, testCaseType);
>-    int             numResultAttribs    = 0;
>-    qpXmlAttribute  resultAttribs[8];
>-
>-    DE_ASSERT(log && testCasePath && (testCasePath[0] != 0));
>-    deMutex_lock(log->lock);
>-
>-    DE_ASSERT(!log->isCaseOpen);
>-    DE_ASSERT(ContainerStack_isEmpty(&log->containerStack));
>-
>-    /* Flush XML and write out #beginTestCaseResult. */
>-    qpXmlWriter_flush(log->writer);
>-    fprintf(log->outputFile, "\n#beginTestCaseResult %s\n", testCasePath);
>-    if (!(log->flags & QP_TEST_LOG_NO_FLUSH))
>-        qpTestLog_flushFile(log);
>-
>-    log->isCaseOpen = DE_TRUE;
>-
>-    /* Fill in attributes. */
>-    resultAttribs[numResultAttribs++] = qpSetStringAttrib("Version", LOG_FORMAT_VERSION);
>-    resultAttribs[numResultAttribs++] = qpSetStringAttrib("CasePath", testCasePath);
>-    resultAttribs[numResultAttribs++] = qpSetStringAttrib("CaseType", typeStr);
>-
>-    if (!qpXmlWriter_startDocument(log->writer) ||
>-        !qpXmlWriter_startElement(log->writer, "TestCaseResult", numResultAttribs, resultAttribs))
>-    {
>-        qpPrintf("qpTestLog_startCase(): Writing XML failed\n");
>-        deMutex_unlock(log->lock);
>-        return DE_FALSE;
>-    }
>-
>-    deMutex_unlock(log->lock);
>-    return DE_TRUE;
>-}
>-
>-/*--------------------------------------------------------------------*//*!
>- * \brief Log end of test case
>- * \param log qpTestLog instance
>- * \param result Test result
>- * \param description Description of a problem in case of error
>- * \return true if ok, false otherwise
>- *//*--------------------------------------------------------------------*/
>-deBool qpTestLog_endCase (qpTestLog* log, qpTestResult result, const char* resultDetails)
>-{
>-    const char*     statusStr       = QP_LOOKUP_STRING(s_qpTestResultMap, result);
>-    qpXmlAttribute  statusAttrib    = qpSetStringAttrib("StatusCode", statusStr);
>-
>-    deMutex_lock(log->lock);
>-
>-    DE_ASSERT(log->isCaseOpen);
>-    DE_ASSERT(ContainerStack_isEmpty(&log->containerStack));
>-
>-    /* <Result StatusCode="Pass">Result details</Result>
>-     * </TestCaseResult>
>-     */
>-    if (!qpXmlWriter_startElement(log->writer, "Result", 1, &statusAttrib) ||
>-        (resultDetails && !qpXmlWriter_writeString(log->writer, resultDetails)) ||
>-        !qpXmlWriter_endElement(log->writer, "Result") ||
>-        !qpXmlWriter_endElement(log->writer, "TestCaseResult") ||
>-        !qpXmlWriter_endDocument(log->writer))      /* Close any XML elements still open */
>-    {
>-        qpPrintf("qpTestLog_endCase(): Writing XML failed\n");
>-        deMutex_unlock(log->lock);
>-        return DE_FALSE;
>-    }
>-
>-    /* Flush XML and write #endTestCaseResult. */
>-    qpXmlWriter_flush(log->writer);
>-    fprintf(log->outputFile, "\n#endTestCaseResult\n");
>-    if (!(log->flags & QP_TEST_LOG_NO_FLUSH))
>-        qpTestLog_flushFile(log);
>-
>-    log->isCaseOpen = DE_FALSE;
>-
>-    deMutex_unlock(log->lock);
>-    return DE_TRUE;
>-}
>-
>-/*--------------------------------------------------------------------*//*!
>- * \brief Abrupt termination of logging.
>- * \param log       qpTestLog instance
>- * \param result    Result code, only Crash and Timeout are allowed.
>- * \return true if ok, false otherwise
>- *//*--------------------------------------------------------------------*/
>-deBool qpTestLog_terminateCase (qpTestLog* log, qpTestResult result)
>-{
>-    const char* resultStr = QP_LOOKUP_STRING(s_qpTestResultMap, result);
>-
>-    DE_ASSERT(log);
>-    DE_ASSERT(result == QP_TEST_RESULT_CRASH || result == QP_TEST_RESULT_TIMEOUT);
>-
>-    deMutex_lock(log->lock);
>-
>-    if (!log->isCaseOpen)
>-    {
>-        deMutex_unlock(log->lock);
>-        return DE_FALSE; /* Soft error. This is called from error handler. */
>-    }
>-
>-    /* Flush XML and write #terminateTestCaseResult. */
>-    qpXmlWriter_flush(log->writer);
>-    fprintf(log->outputFile, "\n#terminateTestCaseResult %s\n", resultStr);
>-    qpTestLog_flushFile(log);
>-
>-    log->isCaseOpen = DE_FALSE;
>-
>-#if defined(DE_DEBUG)
>-    ContainerStack_reset(&log->containerStack);
>-#endif
>-
>-    deMutex_unlock(log->lock);
>-    return DE_TRUE;
>-}
>-
>-static deBool qpTestLog_writeKeyValuePair (qpTestLog* log, const char* elementName, const char* name, const char* description, const char* unit, qpKeyValueTag tag, const char* text)
>-{
>-    const char*     tagString = QP_LOOKUP_STRING(s_qpTagMap, tag);
>-    qpXmlAttribute  attribs[8];
>-    int             numAttribs = 0;
>-
>-    DE_ASSERT(log && elementName && text);
>-    deMutex_lock(log->lock);
>-
>-    /* Fill in attributes. */
>-    if (name)           attribs[numAttribs++] = qpSetStringAttrib("Name", name);
>-    if (description)    attribs[numAttribs++] = qpSetStringAttrib("Description", description);
>-    if (tagString)      attribs[numAttribs++] = qpSetStringAttrib("Tag", tagString);
>-    if (unit)           attribs[numAttribs++] = qpSetStringAttrib("Unit", unit);
>-
>-    if (!qpXmlWriter_startElement(log->writer, elementName, numAttribs, attribs) ||
>-        !qpXmlWriter_writeString(log->writer, text) ||
>-        !qpXmlWriter_endElement(log->writer, elementName))
>-    {
>-        qpPrintf("qpTestLog_writeKeyValuePair(): Writing XML failed\n");
>-        deMutex_unlock(log->lock);
>-        return DE_FALSE;
>-    }
>-
>-    deMutex_unlock(log->lock);
>-    return DE_TRUE;
>-}
>-
>-/*--------------------------------------------------------------------*//*!
>- * \brief Write a message to output log
>- * \param log       qpTestLog instance
>- * \param format    Format string of message
>- * \param ...       Parameters for message
>- * \return true if ok, false otherwise
>- *//*--------------------------------------------------------------------*/
>-deBool qpTestLog_writeMessage (qpTestLog* log, const char* format, ...)
>-{
>-    char    buffer[1024];
>-    va_list args;
>-
>-    /* \todo [petri] Handle buffer overflows! */
>-
>-    va_start(args, format);
>-    buffer[DE_LENGTH_OF_ARRAY(buffer) - 1] = 0;
>-    vsnprintf(buffer, sizeof(buffer), format, args);
>-    va_end(args);
>-
>-    /* <Text>text</Text> */
>-    return qpTestLog_writeKeyValuePair(log, "Text", DE_NULL, DE_NULL, DE_NULL, QP_KEY_TAG_LAST, buffer);
>-}
>-
>-/*--------------------------------------------------------------------*//*!
>- * \brief Write key-value-pair into log
>- * \param log           qpTestLog instance
>- * \param name          Unique identifier for entry
>- * \param description   Human readable description
>- * \param tag           Optional tag
>- * \param value         Value of the key-value-pair
>- * \return true if ok, false otherwise
>- *//*--------------------------------------------------------------------*/
>-deBool qpTestLog_writeText (qpTestLog* log, const char* name, const char* description, qpKeyValueTag tag, const char* text)
>-{
>-    /* <Text Name="name" Description="description" Tag="tag">text</Text> */
>-    return qpTestLog_writeKeyValuePair(log, "Text", name, description, DE_NULL, tag, text);
>-}
>-
>-/*--------------------------------------------------------------------*//*!
>- * \brief Write key-value-pair into log
>- * \param log           qpTestLog instance
>- * \param name          Unique identifier for entry
>- * \param description   Human readable description
>- * \param tag           Optional tag
>- * \param value         Value of the key-value-pair
>- * \return true if ok, false otherwise
>- *//*--------------------------------------------------------------------*/
>-deBool qpTestLog_writeInteger (qpTestLog* log, const char* name, const char* description, const char* unit, qpKeyValueTag tag, deInt64 value)
>-{
>-    char tmpString[64];
>-    int64ToString(value, tmpString);
>-
>-    /* <Number Name="name" Description="description" Tag="Performance">15</Number> */
>-    return qpTestLog_writeKeyValuePair(log, "Number", name, description, unit, tag, tmpString);
>-}
>-
>-/*--------------------------------------------------------------------*//*!
>- * \brief Write key-value-pair into log
>- * \param log           qpTestLog instance
>- * \param name          Unique identifier for entry
>- * \param description   Human readable description
>- * \param tag           Optional tag
>- * \param value         Value of the key-value-pair
>- * \return true if ok, false otherwise
>- *//*--------------------------------------------------------------------*/
>-deBool qpTestLog_writeFloat (qpTestLog* log, const char* name, const char* description, const char* unit, qpKeyValueTag tag, float value)
>-{
>-    char tmpString[64];
>-    floatToString(value, tmpString, sizeof(tmpString));
>-
>-    /* <Number Name="name" Description="description" Tag="Performance">15</Number> */
>-    return qpTestLog_writeKeyValuePair(log, "Number", name, description, unit, tag, tmpString);
>-}
>-
>-typedef struct Buffer_s
>-{
>-    size_t      capacity;
>-    size_t      size;
>-    deUint8*    data;
>-} Buffer;
>-
>-void Buffer_init (Buffer* buffer)
>-{
>-    buffer->capacity    = 0;
>-    buffer->size        = 0;
>-    buffer->data        = DE_NULL;
>-}
>-
>-void Buffer_deinit (Buffer* buffer)
>-{
>-    deFree(buffer->data);
>-    Buffer_init(buffer);
>-}
>-
>-deBool Buffer_resize (Buffer* buffer, size_t newSize)
>-{
>-    /* Grow buffer if necessary. */
>-    if (newSize > buffer->capacity)
>-    {
>-        size_t      newCapacity = (size_t)deAlign32(deMax32(2*(int)buffer->capacity, (int)newSize), 512);
>-        deUint8*    newData     = (deUint8*)deMalloc(newCapacity);
>-        if (!newData)
>-            return DE_FALSE;
>-
>-        memcpy(newData, buffer->data, buffer->size);
>-        deFree(buffer->data);
>-        buffer->data        = newData;
>-        buffer->capacity    = newCapacity;
>-    }
>-
>-    buffer->size = newSize;
>-    return DE_TRUE;
>-}
>-
>-deBool Buffer_append (Buffer* buffer, const deUint8* data, size_t numBytes)
>-{
>-    size_t offset = buffer->size;
>-
>-    if (!Buffer_resize(buffer, buffer->size + numBytes))
>-        return DE_FALSE;
>-
>-    /* Append bytes. */
>-    memcpy(&buffer->data[offset], data, numBytes);
>-    return DE_TRUE;
>-}
>-
>-#if defined(QP_SUPPORT_PNG)
>-void pngWriteData (png_structp png, png_bytep dataPtr, png_size_t numBytes)
>-{
>-    Buffer* buffer = (Buffer*)png_get_io_ptr(png);
>-    if (!Buffer_append(buffer, (const deUint8*)dataPtr, numBytes))
>-        png_error(png, "unable to resize PNG write buffer!");
>-}
>-
>-void pngFlushData (png_structp png)
>-{
>-    DE_UNREF(png);
>-    /* nada */
>-}
>-
>-static deBool writeCompressedPNG (png_structp png, png_infop info, png_byte** rowPointers, int width, int height, int colorFormat)
>-{
>-    if (setjmp(png_jmpbuf(png)) == 0)
>-    {
>-        /* Write data. */
>-        png_set_IHDR(png, info, (png_uint_32)width, (png_uint_32)height,
>-            8,
>-            colorFormat,
>-            PNG_INTERLACE_NONE,
>-            PNG_COMPRESSION_TYPE_BASE,
>-            PNG_FILTER_TYPE_BASE);
>-        png_write_info(png, info);
>-        png_write_image(png, rowPointers);
>-        png_write_end(png, NULL);
>-
>-        return DE_TRUE;
>-    }
>-    else
>-        return DE_FALSE;
>-}
>-
>-static deBool compressImagePNG (Buffer* buffer, qpImageFormat imageFormat, int width, int height, int rowStride, const void* data)
>-{
>-    deBool          compressOk      = DE_FALSE;
>-    png_structp     png             = DE_NULL;
>-    png_infop       info            = DE_NULL;
>-    png_byte**      rowPointers     = DE_NULL;
>-    deBool          hasAlpha        = imageFormat == QP_IMAGE_FORMAT_RGBA8888;
>-    int             ndx;
>-
>-    /* Handle format. */
>-    DE_ASSERT(imageFormat == QP_IMAGE_FORMAT_RGB888 || imageFormat == QP_IMAGE_FORMAT_RGBA8888);
>-
>-    /* Allocate & set row pointers. */
>-    rowPointers = (png_byte**)deMalloc((size_t)height * sizeof(png_byte*));
>-    if (!rowPointers)
>-        return DE_FALSE;
>-
>-    for (ndx = 0; ndx < height; ndx++)
>-        rowPointers[ndx] = (png_byte*)((const deUint8*)data + ndx*rowStride);
>-
>-    /* Initialize PNG compressor. */
>-    png = png_create_write_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL);
>-    info = png ? png_create_info_struct(png) : DE_NULL;
>-    if (png && info)
>-    {
>-        /* Set our own write function. */
>-        png_set_write_fn(png, buffer, pngWriteData, pngFlushData);
>-
>-        compressOk = writeCompressedPNG(png, info, rowPointers, width, height,
>-                                        hasAlpha ? PNG_COLOR_TYPE_RGBA : PNG_COLOR_TYPE_RGB);
>-    }
>-
>-    /* Cleanup & return. */
>-    if (png && info)
>-    {
>-        png_destroy_info_struct(png, &info);
>-        png_destroy_write_struct(&png, DE_NULL);
>-    }
>-    else if (png)
>-        png_destroy_write_struct(&png, &info);
>-
>-    deFree(rowPointers);
>-    return compressOk;
>-}
>-#endif /* QP_SUPPORT_PNG */
>-
>-/*--------------------------------------------------------------------*//*!
>- * \brief Start image set
>- * \param log           qpTestLog instance
>- * \param name          Unique identifier for the set
>- * \param description   Human readable description
>- * \return true if ok, false otherwise
>- *//*--------------------------------------------------------------------*/
>-deBool qpTestLog_startImageSet (qpTestLog* log, const char* name, const char* description)
>-{
>-    qpXmlAttribute  attribs[4];
>-    int             numAttribs = 0;
>-
>-    DE_ASSERT(log && name);
>-    deMutex_lock(log->lock);
>-
>-    attribs[numAttribs++] = qpSetStringAttrib("Name", name);
>-    if (description)
>-        attribs[numAttribs++] = qpSetStringAttrib("Description", description);
>-
>-    /* <ImageSet Name="<name>"> */
>-    if (!qpXmlWriter_startElement(log->writer, "ImageSet", numAttribs, attribs))
>-    {
>-        qpPrintf("qpTestLog_startImageSet(): Writing XML failed\n");
>-        deMutex_unlock(log->lock);
>-        return DE_FALSE;
>-    }
>-
>-    DE_ASSERT(ContainerStack_push(&log->containerStack, CONTAINERTYPE_IMAGESET));
>-
>-    deMutex_unlock(log->lock);
>-    return DE_TRUE;
>-}
>-
>-/*--------------------------------------------------------------------*//*!
>- * \brief End image set
>- * \param log           qpTestLog instance
>- * \return true if ok, false otherwise
>- *//*--------------------------------------------------------------------*/
>-deBool qpTestLog_endImageSet (qpTestLog* log)
>-{
>-    DE_ASSERT(log);
>-    deMutex_lock(log->lock);
>-
>-    /* <ImageSet Name="<name>"> */
>-    if (!qpXmlWriter_endElement(log->writer, "ImageSet"))
>-    {
>-        qpPrintf("qpTestLog_endImageSet(): Writing XML failed\n");
>-        deMutex_unlock(log->lock);
>-        return DE_FALSE;
>-    }
>-
>-    DE_ASSERT(ContainerStack_pop(&log->containerStack) == CONTAINERTYPE_IMAGESET);
>-
>-    deMutex_unlock(log->lock);
>-    return DE_TRUE;
>-}
>-
>-/*--------------------------------------------------------------------*//*!
>- * \brief Write base64 encoded raw image data into log
>- * \param log               qpTestLog instance
>- * \param name              Unique name (matching names can be compared across BatchResults).
>- * \param description       Textual description (shown in Candy).
>- * \param compressionMode   Compression mode
>- * \param imageFormat       Color format
>- * \param width             Width in pixels
>- * \param height            Height in pixels
>- * \param stride            Data stride (offset between rows)
>- * \param data              Pointer to pixel data
>- * \return 0 if OK, otherwise <0
>- *//*--------------------------------------------------------------------*/
>-deBool qpTestLog_writeImage (
>-    qpTestLog*              log,
>-    const char*             name,
>-    const char*             description,
>-    qpImageCompressionMode  compressionMode,
>-    qpImageFormat           imageFormat,
>-    int                     width,
>-    int                     height,
>-    int                     stride,
>-    const void*             data)
>-{
>-    char            widthStr[32];
>-    char            heightStr[32];
>-    qpXmlAttribute  attribs[8];
>-    int             numAttribs          = 0;
>-    Buffer          compressedBuffer;
>-    const void*     writeDataPtr        = DE_NULL;
>-    size_t          writeDataBytes      = ~(size_t)0;
>-
>-    DE_ASSERT(log && name);
>-    DE_ASSERT(deInRange32(width, 1, 16384));
>-    DE_ASSERT(deInRange32(height, 1, 16384));
>-    DE_ASSERT(data);
>-
>-    if (log->flags & QP_TEST_LOG_EXCLUDE_IMAGES)
>-        return DE_TRUE; /* Image not logged. */
>-
>-    Buffer_init(&compressedBuffer);
>-
>-    /* BEST compression mode defaults to PNG. */
>-    if (compressionMode == QP_IMAGE_COMPRESSION_MODE_BEST)
>-    {
>-#if defined(QP_SUPPORT_PNG)
>-        compressionMode = QP_IMAGE_COMPRESSION_MODE_PNG;
>-#else
>-        compressionMode = QP_IMAGE_COMPRESSION_MODE_NONE;
>-#endif
>-    }
>-
>-#if defined(QP_SUPPORT_PNG)
>-    /* Try storing with PNG compression. */
>-    if (compressionMode == QP_IMAGE_COMPRESSION_MODE_PNG)
>-    {
>-        deBool compressOk = compressImagePNG(&compressedBuffer, imageFormat, width, height, stride, data);
>-        if (compressOk)
>-        {
>-            writeDataPtr    = compressedBuffer.data;
>-            writeDataBytes  = compressedBuffer.size;
>-        }
>-        else
>-        {
>-            /* Fall-back to default compression. */
>-            qpPrintf("WARNING: PNG compression failed -- storing image uncompressed.\n");
>-            compressionMode = QP_IMAGE_COMPRESSION_MODE_NONE;
>-        }
>-    }
>-#endif
>-
>-    /* Handle image compression. */
>-    switch (compressionMode)
>-    {
>-        case QP_IMAGE_COMPRESSION_MODE_NONE:
>-        {
>-            int pixelSize       = imageFormat == QP_IMAGE_FORMAT_RGB888 ? 3 : 4;
>-            int packedStride    = pixelSize*width;
>-
>-            if (packedStride == stride)
>-                writeDataPtr = data;
>-            else
>-            {
>-                /* Need to re-pack pixels. */
>-                if (Buffer_resize(&compressedBuffer, (size_t)(packedStride*height)))
>-                {
>-                    int row;
>-                    for (row = 0; row < height; row++)
>-                        memcpy(&compressedBuffer.data[packedStride*row], &((const deUint8*)data)[row*stride], (size_t)(pixelSize*width));
>-                }
>-                else
>-                {
>-                    qpPrintf("ERROR: Failed to pack pixels for writing.\n");
>-                    Buffer_deinit(&compressedBuffer);
>-                    return DE_FALSE;
>-                }
>-            }
>-
>-            writeDataBytes = (size_t)(packedStride*height);
>-            break;
>-        }
>-
>-#if defined(QP_SUPPORT_PNG)
>-        case QP_IMAGE_COMPRESSION_MODE_PNG:
>-            DE_ASSERT(writeDataPtr); /* Already handled. */
>-            break;
>-#endif
>-
>-        default:
>-            qpPrintf("qpTestLog_writeImage(): Unknown compression mode: %s\n", QP_LOOKUP_STRING(s_qpImageCompressionModeMap, compressionMode));
>-            Buffer_deinit(&compressedBuffer);
>-            return DE_FALSE;
>-    }
>-
>-    /* Fill in attributes. */
>-    int32ToString(width, widthStr);
>-    int32ToString(height, heightStr);
>-    attribs[numAttribs++] = qpSetStringAttrib("Name", name);
>-    attribs[numAttribs++] = qpSetStringAttrib("Width", widthStr);
>-    attribs[numAttribs++] = qpSetStringAttrib("Height", heightStr);
>-    attribs[numAttribs++] = qpSetStringAttrib("Format", QP_LOOKUP_STRING(s_qpImageFormatMap, imageFormat));
>-    attribs[numAttribs++] = qpSetStringAttrib("CompressionMode", QP_LOOKUP_STRING(s_qpImageCompressionModeMap, compressionMode));
>-    if (description) attribs[numAttribs++] = qpSetStringAttrib("Description", description);
>-
>-    /* \note Log lock is acquired after compression! */
>-    deMutex_lock(log->lock);
>-
>-    /* <Image ID="result" Name="Foobar" Width="640" Height="480" Format="RGB888" CompressionMode="None">base64 data</Image> */
>-    if (!qpXmlWriter_startElement(log->writer, "Image", numAttribs, attribs) ||
>-        !qpXmlWriter_writeBase64(log->writer, (const deUint8*)writeDataPtr, writeDataBytes) ||
>-        !qpXmlWriter_endElement(log->writer, "Image"))
>-    {
>-        qpPrintf("qpTestLog_writeImage(): Writing XML failed\n");
>-        deMutex_unlock(log->lock);
>-        Buffer_deinit(&compressedBuffer);
>-        return DE_FALSE;
>-    }
>-
>-    deMutex_unlock(log->lock);
>-
>-    /* Free compressed data if allocated. */
>-    Buffer_deinit(&compressedBuffer);
>-
>-    return DE_TRUE;
>-}
>-
>-/*--------------------------------------------------------------------*//*!
>- * \brief Write a OpenGL ES shader program into the log.
>- * \param linkOk            Shader program link result, false on failure
>- * \param linkInfoLog       Implementation provided linkage log
>- *//*--------------------------------------------------------------------*/
>-deBool qpTestLog_startShaderProgram (qpTestLog* log, deBool linkOk, const char* linkInfoLog)
>-{
>-    qpXmlAttribute  programAttribs[4];
>-    int             numProgramAttribs = 0;
>-
>-    DE_ASSERT(log);
>-    deMutex_lock(log->lock);
>-
>-    programAttribs[numProgramAttribs++] = qpSetStringAttrib("LinkStatus", linkOk ? "OK" : "Fail");
>-
>-    if (!qpXmlWriter_startElement(log->writer, "ShaderProgram", numProgramAttribs, programAttribs) ||
>-        !qpXmlWriter_writeStringElement(log->writer, "InfoLog", linkInfoLog))
>-    {
>-        qpPrintf("qpTestLog_startShaderProgram(): Writing XML failed\n");
>-        deMutex_unlock(log->lock);
>-        return DE_FALSE;
>-    }
>-
>-    DE_ASSERT(ContainerStack_push(&log->containerStack, CONTAINERTYPE_SHADERPROGRAM));
>-
>-    deMutex_unlock(log->lock);
>-    return DE_TRUE;
>-}
>-
>-/*--------------------------------------------------------------------*//*!
>- * \brief End shader program
>- * \param log           qpTestLog instance
>- * \return true if ok, false otherwise
>- *//*--------------------------------------------------------------------*/
>-deBool qpTestLog_endShaderProgram (qpTestLog* log)
>-{
>-    DE_ASSERT(log);
>-    deMutex_lock(log->lock);
>-
>-    /* </ShaderProgram> */
>-    if (!qpXmlWriter_endElement(log->writer, "ShaderProgram"))
>-    {
>-        qpPrintf("qpTestLog_endShaderProgram(): Writing XML failed\n");
>-        deMutex_unlock(log->lock);
>-        return DE_FALSE;
>-    }
>-
>-    DE_ASSERT(ContainerStack_pop(&log->containerStack) == CONTAINERTYPE_SHADERPROGRAM);
>-
>-    deMutex_unlock(log->lock);
>-    return DE_TRUE;
>-}
>-
>-/*--------------------------------------------------------------------*//*!
>- * \brief Write a OpenGL ES shader into the log.
>- * \param type              Shader type
>- * \param source            Shader source
>- * \param compileOk         Shader compilation result, false on failure
>- * \param infoLog           Implementation provided shader compilation log
>- *//*--------------------------------------------------------------------*/
>-deBool qpTestLog_writeShader (qpTestLog* log, qpShaderType type, const char* source, deBool compileOk, const char* infoLog)
>-{
>-    const char*     tagName             = QP_LOOKUP_STRING(s_qpShaderTypeMap, type);
>-    const char*     sourceStr           = ((log->flags & QP_TEST_LOG_EXCLUDE_SHADER_SOURCES) == 0 || !compileOk) ? source : "";
>-    int             numShaderAttribs    = 0;
>-    qpXmlAttribute  shaderAttribs[4];
>-
>-    deMutex_lock(log->lock);
>-
>-    DE_ASSERT(source);
>-    DE_ASSERT(ContainerStack_getTop(&log->containerStack) == CONTAINERTYPE_SHADERPROGRAM);
>-
>-    shaderAttribs[numShaderAttribs++]   = qpSetStringAttrib("CompileStatus", compileOk ? "OK" : "Fail");
>-
>-    if (!qpXmlWriter_startElement(log->writer, tagName, numShaderAttribs, shaderAttribs) ||
>-        !qpXmlWriter_writeStringElement(log->writer, "ShaderSource", sourceStr) ||
>-        !qpXmlWriter_writeStringElement(log->writer, "InfoLog", infoLog) ||
>-        !qpXmlWriter_endElement(log->writer, tagName))
>-    {
>-        qpPrintf("qpTestLog_writeShader(): Writing XML failed\n");
>-        deMutex_unlock(log->lock);
>-        return DE_FALSE;
>-    }
>-
>-    deMutex_unlock(log->lock);
>-    return DE_TRUE;
>-}
>-
>-/*--------------------------------------------------------------------*//*!
>- * \brief Start writing a set of EGL configurations into the log.
>- *//*--------------------------------------------------------------------*/
>-deBool qpTestLog_startEglConfigSet (qpTestLog* log, const char* name, const char* description)
>-{
>-    qpXmlAttribute  attribs[4];
>-    int             numAttribs = 0;
>-
>-    DE_ASSERT(log && name);
>-    deMutex_lock(log->lock);
>-
>-    attribs[numAttribs++] = qpSetStringAttrib("Name", name);
>-    if (description)
>-        attribs[numAttribs++] = qpSetStringAttrib("Description", description);
>-
>-    /* <EglConfigSet Name="<name>"> */
>-    if (!qpXmlWriter_startElement(log->writer, "EglConfigSet", numAttribs, attribs))
>-    {
>-        qpPrintf("qpTestLog_startEglImageSet(): Writing XML failed\n");
>-        deMutex_unlock(log->lock);
>-        return DE_FALSE;
>-    }
>-
>-    DE_ASSERT(ContainerStack_push(&log->containerStack, CONTAINERTYPE_EGLCONFIGSET));
>-
>-    deMutex_unlock(log->lock);
>-    return DE_TRUE;
>-}
>-
>-/*--------------------------------------------------------------------*//*!
>- * \brief End an EGL config set
>- *//*--------------------------------------------------------------------*/
>-deBool qpTestLog_endEglConfigSet (qpTestLog* log)
>-{
>-    DE_ASSERT(log);
>-    deMutex_lock(log->lock);
>-
>-    /* <EglConfigSet Name="<name>"> */
>-    if (!qpXmlWriter_endElement(log->writer, "EglConfigSet"))
>-    {
>-        qpPrintf("qpTestLog_endEglImageSet(): Writing XML failed\n");
>-        deMutex_unlock(log->lock);
>-        return DE_FALSE;
>-    }
>-
>-    DE_ASSERT(ContainerStack_pop(&log->containerStack) == CONTAINERTYPE_EGLCONFIGSET);
>-
>-    deMutex_unlock(log->lock);
>-    return DE_TRUE;
>-}
>-
>-/*--------------------------------------------------------------------*//*!
>- * \brief Write an EGL config inside an EGL config set
>- * \see   qpElgConfigInfo for details
>- *//*--------------------------------------------------------------------*/
>-deBool qpTestLog_writeEglConfig (qpTestLog* log, const qpEglConfigInfo* config)
>-{
>-    qpXmlAttribute  attribs[64];
>-    int             numAttribs = 0;
>-
>-    DE_ASSERT(log && config);
>-    deMutex_lock(log->lock);
>-
>-    attribs[numAttribs++] = qpSetIntAttrib      ("BufferSize", config->bufferSize);
>-    attribs[numAttribs++] = qpSetIntAttrib      ("RedSize", config->redSize);
>-    attribs[numAttribs++] = qpSetIntAttrib      ("GreenSize", config->greenSize);
>-    attribs[numAttribs++] = qpSetIntAttrib      ("BlueSize", config->blueSize);
>-    attribs[numAttribs++] = qpSetIntAttrib      ("LuminanceSize", config->luminanceSize);
>-    attribs[numAttribs++] = qpSetIntAttrib      ("AlphaSize", config->alphaSize);
>-    attribs[numAttribs++] = qpSetIntAttrib      ("AlphaMaskSize", config->alphaMaskSize);
>-    attribs[numAttribs++] = qpSetBoolAttrib     ("BindToTextureRGB", config->bindToTextureRGB);
>-    attribs[numAttribs++] = qpSetBoolAttrib     ("BindToTextureRGBA", config->bindToTextureRGBA);
>-    attribs[numAttribs++] = qpSetStringAttrib   ("ColorBufferType", config->colorBufferType);
>-    attribs[numAttribs++] = qpSetStringAttrib   ("ConfigCaveat", config->configCaveat);
>-    attribs[numAttribs++] = qpSetIntAttrib      ("ConfigID", config->configID);
>-    attribs[numAttribs++] = qpSetStringAttrib   ("Conformant", config->conformant);
>-    attribs[numAttribs++] = qpSetIntAttrib      ("DepthSize", config->depthSize);
>-    attribs[numAttribs++] = qpSetIntAttrib      ("Level", config->level);
>-    attribs[numAttribs++] = qpSetIntAttrib      ("MaxPBufferWidth", config->maxPBufferWidth);
>-    attribs[numAttribs++] = qpSetIntAttrib      ("MaxPBufferHeight", config->maxPBufferHeight);
>-    attribs[numAttribs++] = qpSetIntAttrib      ("MaxPBufferPixels", config->maxPBufferPixels);
>-    attribs[numAttribs++] = qpSetIntAttrib      ("MaxSwapInterval", config->maxSwapInterval);
>-    attribs[numAttribs++] = qpSetIntAttrib      ("MinSwapInterval", config->minSwapInterval);
>-    attribs[numAttribs++] = qpSetBoolAttrib     ("NativeRenderable", config->nativeRenderable);
>-    attribs[numAttribs++] = qpSetStringAttrib   ("RenderableType", config->renderableType);
>-    attribs[numAttribs++] = qpSetIntAttrib      ("SampleBuffers", config->sampleBuffers);
>-    attribs[numAttribs++] = qpSetIntAttrib      ("Samples", config->samples);
>-    attribs[numAttribs++] = qpSetIntAttrib      ("StencilSize", config->stencilSize);
>-    attribs[numAttribs++] = qpSetStringAttrib   ("SurfaceTypes", config->surfaceTypes);
>-    attribs[numAttribs++] = qpSetStringAttrib   ("TransparentType", config->transparentType);
>-    attribs[numAttribs++] = qpSetIntAttrib      ("TransparentRedValue", config->transparentRedValue);
>-    attribs[numAttribs++] = qpSetIntAttrib      ("TransparentGreenValue", config->transparentGreenValue);
>-    attribs[numAttribs++] = qpSetIntAttrib      ("TransparentBlueValue", config->transparentBlueValue);
>-    DE_ASSERT(numAttribs <= DE_LENGTH_OF_ARRAY(attribs));
>-
>-    if (!qpXmlWriter_startElement(log->writer, "EglConfig", numAttribs, attribs) ||
>-        !qpXmlWriter_endElement(log->writer, "EglConfig"))
>-    {
>-        qpPrintf("qpTestLog_writeEglConfig(): Writing XML failed\n");
>-        deMutex_unlock(log->lock);
>-        return DE_FALSE;
>-    }
>-
>-    deMutex_unlock(log->lock);
>-    return DE_TRUE;
>-}
>-
>-/*--------------------------------------------------------------------*//*!
>- * \brief Start section in log.
>- * \param log           qpTestLog instance
>- * \param name          Section name
>- * \param description   Human readable description
>- * \return true if ok, false otherwise
>- *//*--------------------------------------------------------------------*/
>-deBool qpTestLog_startSection (qpTestLog* log, const char* name, const char* description)
>-{
>-    qpXmlAttribute  attribs[2];
>-    int             numAttribs = 0;
>-
>-    DE_ASSERT(log && name);
>-    deMutex_lock(log->lock);
>-
>-    attribs[numAttribs++] = qpSetStringAttrib("Name", name);
>-    if (description)
>-        attribs[numAttribs++] = qpSetStringAttrib("Description", description);
>-
>-    /* <Section Name="<name>" Description="<description>"> */
>-    if (!qpXmlWriter_startElement(log->writer, "Section", numAttribs, attribs))
>-    {
>-        qpPrintf("qpTestLog_startSection(): Writing XML failed\n");
>-        deMutex_unlock(log->lock);
>-        return DE_FALSE;
>-    }
>-
>-    DE_ASSERT(ContainerStack_push(&log->containerStack, CONTAINERTYPE_SECTION));
>-
>-    deMutex_unlock(log->lock);
>-    return DE_TRUE;
>-}
>-
>-/*--------------------------------------------------------------------*//*!
>- * \brief End section in log.
>- * \param log           qpTestLog instance
>- * \return true if ok, false otherwise
>- *//*--------------------------------------------------------------------*/
>-deBool qpTestLog_endSection (qpTestLog* log)
>-{
>-    DE_ASSERT(log);
>-    deMutex_lock(log->lock);
>-
>-    /* </Section> */
>-    if (!qpXmlWriter_endElement(log->writer, "Section"))
>-    {
>-        qpPrintf("qpTestLog_endSection(): Writing XML failed\n");
>-        deMutex_unlock(log->lock);
>-        return DE_FALSE;
>-    }
>-
>-    DE_ASSERT(ContainerStack_pop(&log->containerStack) == CONTAINERTYPE_SECTION);
>-
>-    deMutex_unlock(log->lock);
>-    return DE_TRUE;
>-}
>-
>-/*--------------------------------------------------------------------*//*!
>- * \brief Write OpenCL compute kernel source into the log.
>- *//*--------------------------------------------------------------------*/
>-deBool qpTestLog_writeKernelSource (qpTestLog* log, const char* source)
>-{
>-    const char*     sourceStr   = (log->flags & QP_TEST_LOG_EXCLUDE_SHADER_SOURCES) != 0 ? "" : source;
>-
>-    DE_ASSERT(log);
>-    deMutex_lock(log->lock);
>-
>-    if (!qpXmlWriter_writeStringElement(log->writer, "KernelSource", sourceStr))
>-    {
>-        qpPrintf("qpTestLog_writeKernelSource(): Writing XML failed\n");
>-        deMutex_unlock(log->lock);
>-        return DE_FALSE;
>-    }
>-
>-    deMutex_unlock(log->lock);
>-    return DE_TRUE;
>-}
>-
>-/*--------------------------------------------------------------------*//*!
>- * \brief Write a SPIR-V module assembly source into the log.
>- *//*--------------------------------------------------------------------*/
>-deBool qpTestLog_writeSpirVAssemblySource (qpTestLog* log, const char* source)
>-{
>-    const char* const   sourceStr   = (log->flags & QP_TEST_LOG_EXCLUDE_SHADER_SOURCES) != 0 ? "" : source;
>-
>-    deMutex_lock(log->lock);
>-
>-    DE_ASSERT(ContainerStack_getTop(&log->containerStack) == CONTAINERTYPE_SHADERPROGRAM);
>-
>-    if (!qpXmlWriter_writeStringElement(log->writer, "SpirVAssemblySource", sourceStr))
>-    {
>-        qpPrintf("qpTestLog_writeSpirVAssemblySource(): Writing XML failed\n");
>-        deMutex_unlock(log->lock);
>-        return DE_FALSE;
>-    }
>-
>-    deMutex_unlock(log->lock);
>-    return DE_TRUE;
>-}
>-
>-/*--------------------------------------------------------------------*//*!
>- * \brief Write OpenCL kernel compilation results into the log
>- *//*--------------------------------------------------------------------*/
>-deBool qpTestLog_writeCompileInfo (qpTestLog* log, const char* name, const char* description, deBool compileOk, const char* infoLog)
>-{
>-    int             numAttribs = 0;
>-    qpXmlAttribute  attribs[3];
>-
>-    DE_ASSERT(log && name && description && infoLog);
>-    deMutex_lock(log->lock);
>-
>-    attribs[numAttribs++] = qpSetStringAttrib("Name", name);
>-    attribs[numAttribs++] = qpSetStringAttrib("Description", description);
>-    attribs[numAttribs++] = qpSetStringAttrib("CompileStatus", compileOk ? "OK" : "Fail");
>-
>-    if (!qpXmlWriter_startElement(log->writer, "CompileInfo", numAttribs, attribs) ||
>-        !qpXmlWriter_writeStringElement(log->writer, "InfoLog", infoLog) ||
>-        !qpXmlWriter_endElement(log->writer, "CompileInfo"))
>-    {
>-        qpPrintf("qpTestLog_writeCompileInfo(): Writing XML failed\n");
>-        deMutex_unlock(log->lock);
>-        return DE_FALSE;
>-    }
>-
>-    deMutex_unlock(log->lock);
>-    return DE_TRUE;
>-}
>-
>-deBool qpTestLog_startSampleList (qpTestLog* log, const char* name, const char* description)
>-{
>-    int             numAttribs = 0;
>-    qpXmlAttribute  attribs[2];
>-
>-    DE_ASSERT(log && name && description);
>-    deMutex_lock(log->lock);
>-
>-    attribs[numAttribs++] = qpSetStringAttrib("Name", name);
>-    attribs[numAttribs++] = qpSetStringAttrib("Description", description);
>-
>-    if (!qpXmlWriter_startElement(log->writer, "SampleList", numAttribs, attribs))
>-    {
>-        qpPrintf("qpTestLog_startSampleList(): Writing XML failed\n");
>-        deMutex_unlock(log->lock);
>-        return DE_FALSE;
>-    }
>-
>-    DE_ASSERT(ContainerStack_push(&log->containerStack, CONTAINERTYPE_SAMPLELIST));
>-
>-    deMutex_unlock(log->lock);
>-    return DE_TRUE;
>-}
>-
>-deBool qpTestLog_startSampleInfo (qpTestLog* log)
>-{
>-    DE_ASSERT(log);
>-    deMutex_lock(log->lock);
>-
>-    if (!qpXmlWriter_startElement(log->writer, "SampleInfo", 0, DE_NULL))
>-    {
>-        qpPrintf("qpTestLog_startSampleInfo(): Writing XML failed\n");
>-        deMutex_unlock(log->lock);
>-        return DE_FALSE;
>-    }
>-
>-    DE_ASSERT(ContainerStack_push(&log->containerStack, CONTAINERTYPE_SAMPLEINFO));
>-
>-    deMutex_unlock(log->lock);
>-    return DE_TRUE;
>-}
>-
>-deBool qpTestLog_writeValueInfo (qpTestLog* log, const char* name, const char* description, const char* unit, qpSampleValueTag tag)
>-{
>-    const char*     tagName     = QP_LOOKUP_STRING(s_qpSampleValueTagMap, tag);
>-    int             numAttribs  = 0;
>-    qpXmlAttribute  attribs[4];
>-
>-    DE_ASSERT(log && name && description && tagName);
>-    deMutex_lock(log->lock);
>-
>-    DE_ASSERT(ContainerStack_getTop(&log->containerStack) == CONTAINERTYPE_SAMPLEINFO);
>-
>-    attribs[numAttribs++] = qpSetStringAttrib("Name", name);
>-    attribs[numAttribs++] = qpSetStringAttrib("Description", description);
>-    attribs[numAttribs++] = qpSetStringAttrib("Tag", tagName);
>-
>-    if (unit)
>-        attribs[numAttribs++] = qpSetStringAttrib("Unit", unit);
>-
>-    if (!qpXmlWriter_startElement(log->writer, "ValueInfo", numAttribs, attribs) ||
>-        !qpXmlWriter_endElement(log->writer, "ValueInfo"))
>-    {
>-        qpPrintf("qpTestLog_writeValueInfo(): Writing XML failed\n");
>-        deMutex_unlock(log->lock);
>-        return DE_FALSE;
>-    }
>-
>-    deMutex_unlock(log->lock);
>-    return DE_TRUE;
>-}
>-
>-deBool qpTestLog_endSampleInfo (qpTestLog* log)
>-{
>-    DE_ASSERT(log);
>-    deMutex_lock(log->lock);
>-
>-    if (!qpXmlWriter_endElement(log->writer, "SampleInfo"))
>-    {
>-        qpPrintf("qpTestLog_endSampleInfo(): Writing XML failed\n");
>-        deMutex_unlock(log->lock);
>-        return DE_FALSE;
>-    }
>-
>-    DE_ASSERT(ContainerStack_pop(&log->containerStack) == CONTAINERTYPE_SAMPLEINFO);
>-
>-    deMutex_unlock(log->lock);
>-    return DE_TRUE;
>-}
>-
>-deBool qpTestLog_startSample (qpTestLog* log)
>-{
>-    DE_ASSERT(log);
>-    deMutex_lock(log->lock);
>-
>-    DE_ASSERT(ContainerStack_getTop(&log->containerStack) == CONTAINERTYPE_SAMPLELIST);
>-
>-    if (!qpXmlWriter_startElement(log->writer, "Sample", 0, DE_NULL))
>-    {
>-        qpPrintf("qpTestLog_startSample(): Writing XML failed\n");
>-        deMutex_unlock(log->lock);
>-        return DE_FALSE;
>-    }
>-
>-    DE_ASSERT(ContainerStack_push(&log->containerStack, CONTAINERTYPE_SAMPLE));
>-
>-    deMutex_unlock(log->lock);
>-    return DE_TRUE;
>-}
>-
>-deBool qpTestLog_writeValueFloat (qpTestLog* log, double value)
>-{
>-    char tmpString[512];
>-    doubleToString(value, tmpString, (int)sizeof(tmpString));
>-
>-    deMutex_lock(log->lock);
>-
>-    DE_ASSERT(ContainerStack_getTop(&log->containerStack) == CONTAINERTYPE_SAMPLE);
>-
>-    if (!qpXmlWriter_writeStringElement(log->writer, "Value", &tmpString[0]))
>-    {
>-        qpPrintf("qpTestLog_writeSampleValue(): Writing XML failed\n");
>-        deMutex_unlock(log->lock);
>-        return DE_FALSE;
>-    }
>-
>-    deMutex_unlock(log->lock);
>-    return DE_TRUE;
>-}
>-
>-deBool qpTestLog_writeValueInteger (qpTestLog* log, deInt64 value)
>-{
>-    char tmpString[64];
>-    int64ToString(value, tmpString);
>-
>-    deMutex_lock(log->lock);
>-
>-    DE_ASSERT(ContainerStack_getTop(&log->containerStack) == CONTAINERTYPE_SAMPLE);
>-
>-    if (!qpXmlWriter_writeStringElement(log->writer, "Value", &tmpString[0]))
>-    {
>-        qpPrintf("qpTestLog_writeSampleValue(): Writing XML failed\n");
>-        deMutex_unlock(log->lock);
>-        return DE_FALSE;
>-    }
>-
>-    deMutex_unlock(log->lock);
>-    return DE_TRUE;
>-}
>-
>-deBool qpTestLog_endSample (qpTestLog* log)
>-{
>-    DE_ASSERT(log);
>-    deMutex_lock(log->lock);
>-
>-    if (!qpXmlWriter_endElement(log->writer, "Sample"))
>-    {
>-        qpPrintf("qpTestLog_endSample(): Writing XML failed\n");
>-        deMutex_unlock(log->lock);
>-        return DE_FALSE;
>-    }
>-
>-    DE_ASSERT(ContainerStack_pop(&log->containerStack) == CONTAINERTYPE_SAMPLE);
>-
>-    deMutex_unlock(log->lock);
>-    return DE_TRUE;
>-}
>-
>-deBool qpTestLog_endSampleList (qpTestLog* log)
>-{
>-    DE_ASSERT(log);
>-    deMutex_lock(log->lock);
>-
>-    if (!qpXmlWriter_endElement(log->writer, "SampleList"))
>-    {
>-        qpPrintf("qpTestLog_endSampleList(): Writing XML failed\n");
>-        deMutex_unlock(log->lock);
>-        return DE_FALSE;
>-    }
>-
>-    DE_ASSERT(ContainerStack_pop(&log->containerStack) == CONTAINERTYPE_SAMPLELIST);
>-
>-    deMutex_unlock(log->lock);
>-    return DE_TRUE;
>-}
>-
>-deUint32 qpTestLog_getLogFlags (const qpTestLog* log)
>-{
>-    DE_ASSERT(log);
>-    return log->flags;
>-}
>-
>-const char* qpGetTestResultName (qpTestResult result)
>-{
>-    return QP_LOOKUP_STRING(s_qpTestResultMap, result);
>-}
>diff --git a/Source/ThirdParty/ANGLE/src/tests/deqp_support/tcuANGLENativeDisplayFactory.cpp b/Source/ThirdParty/ANGLE/src/tests/deqp_support/tcuANGLENativeDisplayFactory.cpp
>index 028bd5f18dd..777b09e10ab 100644
>--- a/Source/ThirdParty/ANGLE/src/tests/deqp_support/tcuANGLENativeDisplayFactory.cpp
>+++ b/Source/ThirdParty/ANGLE/src/tests/deqp_support/tcuANGLENativeDisplayFactory.cpp
>@@ -18,6 +18,8 @@
>  *
>  */
> 
>+#include "egluNativeDisplay_override.hpp"
>+
> #include "tcuANGLENativeDisplayFactory.h"
> 
> #include <EGL/egl.h>
>@@ -25,20 +27,19 @@
> 
> #include "deClock.h"
> #include "deMemory.h"
>-#include "deThread.h"
> #include "egluDefs.hpp"
> #include "eglwLibrary.hpp"
>-#include "OSPixmap.h"
>-#include "OSWindow.h"
> #include "tcuTexture.hpp"
>+#include "util/OSPixmap.h"
>+#include "util/OSWindow.h"
> 
> // clang-format off
> #if (DE_OS == DE_OS_WIN32)
>-    #define ANGLE_EGL_LIBRARY_NAME "libEGL.dll"
>+    #define ANGLE_EGL_LIBRARY_FULL_NAME ANGLE_EGL_LIBRARY_NAME ".dll"
> #elif (DE_OS == DE_OS_UNIX) || (DE_OS == DE_OS_ANDROID)
>-    #define ANGLE_EGL_LIBRARY_NAME "libEGL.so"
>+    #define ANGLE_EGL_LIBRARY_FULL_NAME ANGLE_EGL_LIBRARY_NAME ".so"
> #elif (DE_OS == DE_OS_OSX)
>-    #define ANGLE_EGL_LIBRARY_NAME "libEGL.dylib"
>+    #define ANGLE_EGL_LIBRARY_FULL_NAME ANGLE_EGL_LIBRARY_NAME ".dylib"
> #else
>     #error "Unsupported platform"
> #endif
>@@ -51,26 +52,30 @@ namespace
> 
> enum
> {
>-    DEFAULT_SURFACE_WIDTH       = 400,
>-    DEFAULT_SURFACE_HEIGHT      = 300,
>-    WAIT_WINDOW_VISIBLE_MS      = 500   //!< Time to wait before issuing screenshot after changing window visibility (hack for DWM)
>+    DEFAULT_SURFACE_WIDTH  = 400,
>+    DEFAULT_SURFACE_HEIGHT = 300,
> };
> 
>-static const eglu::NativeDisplay::Capability DISPLAY_CAPABILITIES = eglu::NativeDisplay::CAPABILITY_GET_DISPLAY_PLATFORM;
>-static const eglu::NativePixmap::Capability  BITMAP_CAPABILITIES  = eglu::NativePixmap::CAPABILITY_CREATE_SURFACE_LEGACY;
>-static const eglu::NativeWindow::Capability  WINDOW_CAPABILITIES  = (eglu::NativeWindow::Capability)
>-                                                                     (eglu::NativeWindow::CAPABILITY_CREATE_SURFACE_LEGACY    |
>-                                                                      eglu::NativeWindow::CAPABILITY_GET_SURFACE_SIZE         |
>-                                                                      eglu::NativeWindow::CAPABILITY_GET_SCREEN_SIZE          |
>-                                                                      eglu::NativeWindow::CAPABILITY_READ_SCREEN_PIXELS       |
>-                                                                      eglu::NativeWindow::CAPABILITY_SET_SURFACE_SIZE         |
>-                                                                      eglu::NativeWindow::CAPABILITY_CHANGE_VISIBILITY);
>+constexpr eglu::NativeDisplay::Capability kDisplayCapabilities =
>+    static_cast<eglu::NativeDisplay::Capability>(
>+        eglu::NativeDisplay::CAPABILITY_GET_DISPLAY_PLATFORM |
>+        eglu::NativeDisplay::CAPABILITY_GET_DISPLAY_PLATFORM_EXT);
>+constexpr eglu::NativePixmap::Capability kBitmapCapabilities =
>+    eglu::NativePixmap::CAPABILITY_CREATE_SURFACE_LEGACY;
>+constexpr eglu::NativeWindow::Capability kWindowCapabilities =
>+    static_cast<eglu::NativeWindow::Capability>(
>+        eglu::NativeWindow::CAPABILITY_CREATE_SURFACE_LEGACY |
>+        eglu::NativeWindow::CAPABILITY_GET_SURFACE_SIZE |
>+        eglu::NativeWindow::CAPABILITY_GET_SCREEN_SIZE |
>+        eglu::NativeWindow::CAPABILITY_READ_SCREEN_PIXELS |
>+        eglu::NativeWindow::CAPABILITY_SET_SURFACE_SIZE |
>+        eglu::NativeWindow::CAPABILITY_CHANGE_VISIBILITY);
> 
> class ANGLENativeDisplay : public eglu::NativeDisplay
> {
>   public:
>-    ANGLENativeDisplay(const std::vector<eglw::EGLAttrib> &attribs);
>-    virtual ~ANGLENativeDisplay() {}
>+    explicit ANGLENativeDisplay(std::vector<eglw::EGLAttrib> attribs);
>+    ~ANGLENativeDisplay() override = default;
> 
>     void *getPlatformNative() override
>     {
>@@ -80,10 +85,13 @@ class ANGLENativeDisplay : public eglu::NativeDisplay
>         memcpy(&result, &mDeviceContext, sizeof(mDeviceContext));
>         return result;
>     }
>-    const eglw::EGLAttrib *getPlatformAttributes() const override { return &mPlatformAttributes[0]; }
>+    const eglw::EGLAttrib *getPlatformAttributes() const override
>+    {
>+        return &mPlatformAttributes[0];
>+    }
>     const eglw::Library &getLibrary() const override { return mLibrary; }
> 
>-    EGLNativeDisplayType getDeviceContext() { return mDeviceContext; }
>+    EGLNativeDisplayType getDeviceContext() const { return mDeviceContext; }
> 
>   private:
>     EGLNativeDisplayType mDeviceContext;
>@@ -95,10 +103,17 @@ class NativePixmapFactory : public eglu::NativePixmapFactory
> {
>   public:
>     NativePixmapFactory();
>-    ~NativePixmapFactory() {}
>-
>-    eglu::NativePixmap *createPixmap(eglu::NativeDisplay *nativeDisplay, int width, int height) const override;
>-    eglu::NativePixmap *createPixmap(eglu::NativeDisplay *nativeDisplay, eglw::EGLDisplay display, eglw::EGLConfig config, const eglw::EGLAttrib* attribList, int width, int height) const override;
>+    ~NativePixmapFactory() override = default;
>+
>+    eglu::NativePixmap *createPixmap(eglu::NativeDisplay *nativeDisplay,
>+                                     int width,
>+                                     int height) const override;
>+    eglu::NativePixmap *createPixmap(eglu::NativeDisplay *nativeDisplay,
>+                                     eglw::EGLDisplay display,
>+                                     eglw::EGLConfig config,
>+                                     const eglw::EGLAttrib *attribList,
>+                                     int width,
>+                                     int height) const override;
> };
> 
> class NativePixmap : public eglu::NativePixmap
>@@ -116,10 +131,16 @@ class NativePixmap : public eglu::NativePixmap
> class NativeWindowFactory : public eglu::NativeWindowFactory
> {
>   public:
>-    NativeWindowFactory(EventState *eventState);
>-    ~NativeWindowFactory() override {}
>+    explicit NativeWindowFactory(EventState *eventState);
>+    ~NativeWindowFactory() override = default;
> 
>-    eglu::NativeWindow *createWindow(eglu::NativeDisplay *nativeDisplay, const eglu::WindowParams &params) const override;
>+    eglu::NativeWindow *createWindow(eglu::NativeDisplay *nativeDisplay,
>+                                     const eglu::WindowParams &params) const override;
>+    eglu::NativeWindow *createWindow(eglu::NativeDisplay *nativeDisplay,
>+                                     eglw::EGLDisplay display,
>+                                     eglw::EGLConfig config,
>+                                     const eglw::EGLAttrib *attribList,
>+                                     const eglu::WindowParams &params) const override;
> 
>   private:
>     EventState *mEvents;
>@@ -128,7 +149,9 @@ class NativeWindowFactory : public eglu::NativeWindowFactory
> class NativeWindow : public eglu::NativeWindow
> {
>   public:
>-    NativeWindow(ANGLENativeDisplay *nativeDisplay, const eglu::WindowParams &params, EventState *eventState);
>+    NativeWindow(ANGLENativeDisplay *nativeDisplay,
>+                 const eglu::WindowParams &params,
>+                 EventState *eventState);
>     ~NativeWindow() override;
> 
>     eglw::EGLNativeWindowType getLegacyNative() override;
>@@ -137,7 +160,7 @@ class NativeWindow : public eglu::NativeWindow
>     void processEvents() override;
>     void setSurfaceSize(IVec2 size) override;
>     void setVisibility(eglu::WindowParams::Visibility visibility) override;
>-    void readScreenPixels(tcu::TextureLevel* dst) const override;
>+    void readScreenPixels(tcu::TextureLevel *dst) const override;
> 
>   private:
>     OSWindow *mWindow;
>@@ -146,19 +169,17 @@ class NativeWindow : public eglu::NativeWindow
> 
> // ANGLE NativeDisplay
> 
>-ANGLENativeDisplay::ANGLENativeDisplay(const std::vector<EGLAttrib> &attribs)
>-    : eglu::NativeDisplay(DISPLAY_CAPABILITIES, EGL_PLATFORM_ANGLE_ANGLE, "EGL_EXT_platform_base"),
>+ANGLENativeDisplay::ANGLENativeDisplay(std::vector<EGLAttrib> attribs)
>+    : eglu::NativeDisplay(kDisplayCapabilities, EGL_PLATFORM_ANGLE_ANGLE, "EGL_EXT_platform_base"),
>       mDeviceContext(EGL_DEFAULT_DISPLAY),
>-      mLibrary(ANGLE_EGL_LIBRARY_NAME),
>-      mPlatformAttributes(attribs)
>-{
>-}
>+      mLibrary(ANGLE_EGL_LIBRARY_FULL_NAME),
>+      mPlatformAttributes(std::move(attribs))
>+{}
> 
> // NativePixmap
> 
> NativePixmap::NativePixmap(EGLNativeDisplayType display, int width, int height, int bitDepth)
>-    : eglu::NativePixmap(BITMAP_CAPABILITIES),
>-      mPixmap(CreateOSPixmap())
>+    : eglu::NativePixmap(kBitmapCapabilities), mPixmap(CreateOSPixmap())
> {
>     if (!mPixmap)
>     {
>@@ -184,89 +205,107 @@ eglw::EGLNativePixmapType NativePixmap::getLegacyNative()
> // NativePixmapFactory
> 
> NativePixmapFactory::NativePixmapFactory()
>-    : eglu::NativePixmapFactory("bitmap", "ANGLE Bitmap", BITMAP_CAPABILITIES)
>+    : eglu::NativePixmapFactory("bitmap", "ANGLE Bitmap", kBitmapCapabilities)
>+{}
>+
>+eglu::NativePixmap *NativePixmapFactory::createPixmap(eglu::NativeDisplay *nativeDisplay,
>+                                                      eglw::EGLDisplay display,
>+                                                      eglw::EGLConfig config,
>+                                                      const eglw::EGLAttrib *attribList,
>+                                                      int width,
>+                                                      int height) const
> {
>-}
>-
>-eglu::NativePixmap *NativePixmapFactory::createPixmap (eglu::NativeDisplay* nativeDisplay, eglw::EGLDisplay display, eglw::EGLConfig config, const eglw::EGLAttrib* attribList, int width, int height) const
>-{
>-    const eglw::Library&    egl         = nativeDisplay->getLibrary();
>-    int             redBits     = 0;
>-    int             greenBits   = 0;
>-    int             blueBits    = 0;
>-    int             alphaBits   = 0;
>-    int             bitSum      = 0;
>+    const eglw::Library &egl = nativeDisplay->getLibrary();
>+    int redBits              = 0;
>+    int greenBits            = 0;
>+    int blueBits             = 0;
>+    int alphaBits            = 0;
>+    int bitSum               = 0;
> 
>     DE_ASSERT(display != EGL_NO_DISPLAY);
> 
>-    egl.getConfigAttrib(display, config, EGL_RED_SIZE,      &redBits);
>-    egl.getConfigAttrib(display, config, EGL_GREEN_SIZE,    &greenBits);
>-    egl.getConfigAttrib(display, config, EGL_BLUE_SIZE,     &blueBits);
>-    egl.getConfigAttrib(display, config, EGL_ALPHA_SIZE,    &alphaBits);
>+    egl.getConfigAttrib(display, config, EGL_RED_SIZE, &redBits);
>+    egl.getConfigAttrib(display, config, EGL_GREEN_SIZE, &greenBits);
>+    egl.getConfigAttrib(display, config, EGL_BLUE_SIZE, &blueBits);
>+    egl.getConfigAttrib(display, config, EGL_ALPHA_SIZE, &alphaBits);
>     EGLU_CHECK_MSG(egl, "eglGetConfigAttrib()");
> 
>-    bitSum = redBits+greenBits+blueBits+alphaBits;
>+    bitSum = redBits + greenBits + blueBits + alphaBits;
> 
>-    return new NativePixmap(dynamic_cast<ANGLENativeDisplay*>(nativeDisplay)->getDeviceContext(), width, height, bitSum);
>+    return new NativePixmap(dynamic_cast<ANGLENativeDisplay *>(nativeDisplay)->getDeviceContext(),
>+                            width, height, bitSum);
> }
> 
>-eglu::NativePixmap *NativePixmapFactory::createPixmap(eglu::NativeDisplay* nativeDisplay, int width, int height) const
>+eglu::NativePixmap *NativePixmapFactory::createPixmap(eglu::NativeDisplay *nativeDisplay,
>+                                                      int width,
>+                                                      int height) const
> {
>     const int defaultDepth = 32;
>-    return new NativePixmap(dynamic_cast<ANGLENativeDisplay*>(nativeDisplay)->getDeviceContext(), width, height, defaultDepth);
>+    return new NativePixmap(dynamic_cast<ANGLENativeDisplay *>(nativeDisplay)->getDeviceContext(),
>+                            width, height, defaultDepth);
> }
> 
> // NativeWindowFactory
> 
> NativeWindowFactory::NativeWindowFactory(EventState *eventState)
>-    : eglu::NativeWindowFactory("window", "ANGLE Window", WINDOW_CAPABILITIES),
>-      mEvents(eventState)
>+    : eglu::NativeWindowFactory("window", "ANGLE Window", kWindowCapabilities), mEvents(eventState)
>+{}
>+
>+eglu::NativeWindow *NativeWindowFactory::createWindow(eglu::NativeDisplay *nativeDisplay,
>+                                                      const eglu::WindowParams &params) const
> {
>+    DE_ASSERT(DE_FALSE);
>+    return nullptr;
> }
> 
>-eglu::NativeWindow *NativeWindowFactory::createWindow(eglu::NativeDisplay* nativeDisplay, const eglu::WindowParams& params) const
>+eglu::NativeWindow *NativeWindowFactory::createWindow(eglu::NativeDisplay *nativeDisplay,
>+                                                      eglw::EGLDisplay display,
>+                                                      eglw::EGLConfig config,
>+                                                      const eglw::EGLAttrib *attribList,
>+                                                      const eglu::WindowParams &params) const
> {
>-    return new NativeWindow(dynamic_cast<ANGLENativeDisplay*>(nativeDisplay), params, mEvents);
>+    return new NativeWindow(dynamic_cast<ANGLENativeDisplay *>(nativeDisplay), params, mEvents);
> }
> 
> // NativeWindow
> 
>-NativeWindow::NativeWindow(ANGLENativeDisplay *nativeDisplay, const eglu::WindowParams& params, EventState *eventState)
>-    : eglu::NativeWindow(WINDOW_CAPABILITIES),
>-      mWindow(CreateOSWindow()),
>-      mEvents(eventState)
>+NativeWindow::NativeWindow(ANGLENativeDisplay *nativeDisplay,
>+                           const eglu::WindowParams &params,
>+                           EventState *eventState)
>+    : eglu::NativeWindow(kWindowCapabilities), mWindow(OSWindow::New()), mEvents(eventState)
> {
>-    bool initialized = mWindow->initialize("dEQP ANGLE Tests",
>-                                           params.width == eglu::WindowParams::SIZE_DONT_CARE ? DEFAULT_SURFACE_WIDTH : params.width,
>-                                           params.height == eglu::WindowParams::SIZE_DONT_CARE ? DEFAULT_SURFACE_HEIGHT : params.height);
>+    bool initialized = mWindow->initialize(
>+        "dEQP ANGLE Tests",
>+        params.width == eglu::WindowParams::SIZE_DONT_CARE ? DEFAULT_SURFACE_WIDTH : params.width,
>+        params.height == eglu::WindowParams::SIZE_DONT_CARE ? DEFAULT_SURFACE_HEIGHT
>+                                                            : params.height);
>     TCU_CHECK(initialized);
> 
>     if (params.visibility != eglu::WindowParams::VISIBILITY_DONT_CARE)
>-        setVisibility(params.visibility);
>+        NativeWindow::setVisibility(params.visibility);
> }
> 
> void NativeWindow::setVisibility(eglu::WindowParams::Visibility visibility)
> {
>     switch (visibility)
>     {
>-      case eglu::WindowParams::VISIBILITY_HIDDEN:
>-        mWindow->setVisible(false);
>-        break;
>-
>-      case eglu::WindowParams::VISIBILITY_VISIBLE:
>-      case eglu::WindowParams::VISIBILITY_FULLSCREEN:
>-        // \todo [2014-03-12 pyry] Implement FULLSCREEN, or at least SW_MAXIMIZE.
>-        mWindow->setVisible(true);
>-        break;
>-
>-      default:
>-        DE_ASSERT(DE_FALSE);
>+        case eglu::WindowParams::VISIBILITY_HIDDEN:
>+            mWindow->setVisible(false);
>+            break;
>+
>+        case eglu::WindowParams::VISIBILITY_VISIBLE:
>+        case eglu::WindowParams::VISIBILITY_FULLSCREEN:
>+            mWindow->setVisible(true);
>+            break;
>+
>+        default:
>+            DE_ASSERT(DE_FALSE);
>     }
> }
> 
> NativeWindow::~NativeWindow()
> {
>-    delete mWindow;
>+    OSWindow::Delete(&mWindow);
> }
> 
> eglw::EGLNativeWindowType NativeWindow::getLegacyNative()
>@@ -284,7 +323,7 @@ void NativeWindow::processEvents()
>     mWindow->messageLoop();
> 
>     // Look for a quit event to forward to the EventState
>-    Event event;
>+    Event event = {};
>     while (mWindow->popEvent(&event))
>     {
>         if (event.Type == Event::EVENT_CLOSED)
>@@ -301,34 +340,39 @@ void NativeWindow::setSurfaceSize(IVec2 size)
> 
> void NativeWindow::readScreenPixels(tcu::TextureLevel *dst) const
> {
>-    dst->setStorage(TextureFormat(TextureFormat::BGRA, TextureFormat::UNORM_INT8), mWindow->getWidth(), mWindow->getHeight());
>+    dst->setStorage(TextureFormat(TextureFormat::BGRA, TextureFormat::UNORM_INT8),
>+                    mWindow->getWidth(), mWindow->getHeight());
>     if (!mWindow->takeScreenshot(reinterpret_cast<uint8_t *>(dst->getAccess().getDataPtr())))
>     {
>         throw InternalError("Failed to read screen pixels", DE_NULL, __FILE__, __LINE__);
>     }
> }
> 
>-} // anonymous
>-
>-ANGLENativeDisplayFactory::ANGLENativeDisplayFactory(const std::string &name,
>-                                                     const std::string &description,
>-                                                     const std::vector<eglw::EGLAttrib> &platformAttributes,
>-                                                     EventState *eventState)
>-    : eglu::NativeDisplayFactory(name, description, DISPLAY_CAPABILITIES, EGL_PLATFORM_ANGLE_ANGLE, "EGL_EXT_platform_base"),
>-      mPlatformAttributes(platformAttributes)
>+}  // namespace
>+
>+ANGLENativeDisplayFactory::ANGLENativeDisplayFactory(
>+    const std::string &name,
>+    const std::string &description,
>+    std::vector<eglw::EGLAttrib> platformAttributes,
>+    EventState *eventState)
>+    : eglu::NativeDisplayFactory(name,
>+                                 description,
>+                                 kDisplayCapabilities,
>+                                 EGL_PLATFORM_ANGLE_ANGLE,
>+                                 "EGL_EXT_platform_base"),
>+      mPlatformAttributes(std::move(platformAttributes))
> {
>     m_nativeWindowRegistry.registerFactory(new NativeWindowFactory(eventState));
>     m_nativePixmapRegistry.registerFactory(new NativePixmapFactory());
> }
> 
>-ANGLENativeDisplayFactory::~ANGLENativeDisplayFactory()
>-{
>-}
>+ANGLENativeDisplayFactory::~ANGLENativeDisplayFactory() = default;
> 
>-eglu::NativeDisplay *ANGLENativeDisplayFactory::createDisplay(const eglw::EGLAttrib *attribList) const
>+eglu::NativeDisplay *ANGLENativeDisplayFactory::createDisplay(
>+    const eglw::EGLAttrib *attribList) const
> {
>     DE_UNREF(attribList);
>     return new ANGLENativeDisplay(mPlatformAttributes);
> }
> 
>-} // tcu
>+}  // namespace tcu
>diff --git a/Source/ThirdParty/ANGLE/src/tests/deqp_support/tcuANGLENativeDisplayFactory.h b/Source/ThirdParty/ANGLE/src/tests/deqp_support/tcuANGLENativeDisplayFactory.h
>index 8eecf757f26..0e0ea2d0978 100644
>--- a/Source/ThirdParty/ANGLE/src/tests/deqp_support/tcuANGLENativeDisplayFactory.h
>+++ b/Source/ThirdParty/ANGLE/src/tests/deqp_support/tcuANGLENativeDisplayFactory.h
>@@ -21,9 +21,9 @@
> #ifndef TCU_ANGLE_WIN32_NATIVE_DISPLAY_FACTORY_H_
> #define TCU_ANGLE_WIN32_NATIVE_DISPLAY_FACTORY_H_
> 
>-#include "tcuDefs.hpp"
> #include "egluNativeDisplay.hpp"
> #include "eglwDefs.hpp"
>+#include "tcuDefs.hpp"
> 
> namespace tcu
> {
>@@ -31,10 +31,7 @@ namespace tcu
> class EventState
> {
>   public:
>-    EventState()
>-        : mQuit(false)
>-    {
>-    }
>+    EventState() : mQuit(false) {}
>     bool quitSignaled() const { return mQuit; };
>     void signalQuitEvent() { mQuit = true; };
> 
>@@ -47,16 +44,16 @@ class ANGLENativeDisplayFactory : public eglu::NativeDisplayFactory
>   public:
>     ANGLENativeDisplayFactory(const std::string &name,
>                               const std::string &description,
>-                              const std::vector<eglw::EGLAttrib> &platformAttributes,
>+                              std::vector<eglw::EGLAttrib> platformAttributes,
>                               EventState *eventState);
>     ~ANGLENativeDisplayFactory() override;
> 
>-    eglu::NativeDisplay *createDisplay(const eglw::EGLAttrib* attribList) const override;
>+    eglu::NativeDisplay *createDisplay(const eglw::EGLAttrib *attribList) const override;
> 
>   private:
>     std::vector<eglw::EGLAttrib> mPlatformAttributes;
> };
> 
>-} // tcu
>+}  // namespace tcu
> 
>-#endif // TCU_ANGLE_WIN32_NATIVE_DISPLAY_FACTORY_H_
>+#endif  // TCU_ANGLE_WIN32_NATIVE_DISPLAY_FACTORY_H_
>diff --git a/Source/ThirdParty/ANGLE/src/tests/deqp_support/tcuANGLEPlatform.cpp b/Source/ThirdParty/ANGLE/src/tests/deqp_support/tcuANGLEPlatform.cpp
>index a45d9042e47..6b4a25bfe5a 100644
>--- a/Source/ThirdParty/ANGLE/src/tests/deqp_support/tcuANGLEPlatform.cpp
>+++ b/Source/ThirdParty/ANGLE/src/tests/deqp_support/tcuANGLEPlatform.cpp
>@@ -24,116 +24,149 @@
> #include <EGL/eglext.h>
> 
> #include "egluGLContextFactory.hpp"
>-#include "system_utils.h"
> #include "tcuANGLENativeDisplayFactory.h"
> #include "tcuNullContextFactory.hpp"
>+#include "util/system_utils.h"
>+
>+static_assert(EGL_DONT_CARE == -1, "Unexpected value for EGL_DONT_CARE");
> 
> namespace tcu
> {
>-
>-ANGLEPlatform::ANGLEPlatform()
>+ANGLEPlatform::ANGLEPlatform(angle::LogErrorFunc logErrorFunc)
> {
>     angle::SetLowPriorityProcess();
> 
>+    mPlatformMethods.logError = logErrorFunc;
>+
> #if (DE_OS == DE_OS_WIN32)
>     {
>-        std::vector<eglw::EGLAttrib> d3d11Attribs;
>-        d3d11Attribs.push_back(EGL_PLATFORM_ANGLE_TYPE_ANGLE);
>-        d3d11Attribs.push_back(EGL_PLATFORM_ANGLE_TYPE_D3D11_ANGLE);
>-        d3d11Attribs.push_back(EGL_PLATFORM_ANGLE_DEVICE_TYPE_ANGLE);
>-        d3d11Attribs.push_back(EGL_PLATFORM_ANGLE_DEVICE_TYPE_HARDWARE_ANGLE);
>-        d3d11Attribs.push_back(EGL_NONE);
>-
>-        auto *d3d11Factory = new ANGLENativeDisplayFactory(
>-            "angle-d3d11", "ANGLE D3D11 Display", d3d11Attribs, &mEvents);
>+        std::vector<eglw::EGLAttrib> d3d11Attribs = initAttribs(
>+            EGL_PLATFORM_ANGLE_TYPE_D3D11_ANGLE, EGL_PLATFORM_ANGLE_DEVICE_TYPE_HARDWARE_ANGLE);
>+
>+        auto *d3d11Factory = new ANGLENativeDisplayFactory("angle-d3d11", "ANGLE D3D11 Display",
>+                                                           d3d11Attribs, &mEvents);
>         m_nativeDisplayFactoryRegistry.registerFactory(d3d11Factory);
>     }
> 
>     {
>-        std::vector<eglw::EGLAttrib> d3d9Attribs;
>-        d3d9Attribs.push_back(EGL_PLATFORM_ANGLE_TYPE_ANGLE);
>-        d3d9Attribs.push_back(EGL_PLATFORM_ANGLE_TYPE_D3D9_ANGLE);
>-        d3d9Attribs.push_back(EGL_PLATFORM_ANGLE_DEVICE_TYPE_ANGLE);
>-        d3d9Attribs.push_back(EGL_PLATFORM_ANGLE_DEVICE_TYPE_HARDWARE_ANGLE);
>-        d3d9Attribs.push_back(EGL_NONE);
>-
>-        auto *d3d9Factory = new ANGLENativeDisplayFactory(
>-            "angle-d3d9", "ANGLE D3D9 Display", d3d9Attribs, &mEvents);
>+        std::vector<eglw::EGLAttrib> d3d9Attribs = initAttribs(
>+            EGL_PLATFORM_ANGLE_TYPE_D3D9_ANGLE, EGL_PLATFORM_ANGLE_DEVICE_TYPE_HARDWARE_ANGLE);
>+
>+        auto *d3d9Factory = new ANGLENativeDisplayFactory("angle-d3d9", "ANGLE D3D9 Display",
>+                                                          d3d9Attribs, &mEvents);
>         m_nativeDisplayFactoryRegistry.registerFactory(d3d9Factory);
>     }
> 
>     {
>-        std::vector<eglw::EGLAttrib> d3d1193Attribs;
>-        d3d1193Attribs.push_back(EGL_PLATFORM_ANGLE_TYPE_ANGLE);
>-        d3d1193Attribs.push_back(EGL_PLATFORM_ANGLE_TYPE_D3D11_ANGLE);
>-        d3d1193Attribs.push_back(EGL_PLATFORM_ANGLE_DEVICE_TYPE_ANGLE);
>-        d3d1193Attribs.push_back(EGL_PLATFORM_ANGLE_DEVICE_TYPE_HARDWARE_ANGLE);
>-        d3d1193Attribs.push_back(EGL_PLATFORM_ANGLE_MAX_VERSION_MAJOR_ANGLE);
>-        d3d1193Attribs.push_back(9);
>-        d3d1193Attribs.push_back(EGL_PLATFORM_ANGLE_MAX_VERSION_MINOR_ANGLE);
>-        d3d1193Attribs.push_back(3);
>-        d3d1193Attribs.push_back(EGL_NONE);
>+        std::vector<eglw::EGLAttrib> d3d1193Attribs =
>+            initAttribs(EGL_PLATFORM_ANGLE_TYPE_D3D11_ANGLE,
>+                        EGL_PLATFORM_ANGLE_DEVICE_TYPE_HARDWARE_ANGLE, 9, 3);
> 
>         auto *d3d1193Factory = new ANGLENativeDisplayFactory(
>             "angle-d3d11-fl93", "ANGLE D3D11 FL9_3 Display", d3d1193Attribs, &mEvents);
>         m_nativeDisplayFactoryRegistry.registerFactory(d3d1193Factory);
>     }
>-#endif // (DE_OS == DE_OS_WIN32)
>+#endif  // (DE_OS == DE_OS_WIN32)
> 
> #if defined(ANGLE_USE_OZONE) || (DE_OS == DE_OS_ANDROID) || (DE_OS == DE_OS_WIN32)
>     {
>-        std::vector<eglw::EGLAttrib> glesAttribs;
>-        glesAttribs.push_back(EGL_PLATFORM_ANGLE_TYPE_ANGLE);
>-        glesAttribs.push_back(EGL_PLATFORM_ANGLE_TYPE_OPENGLES_ANGLE);
>-        glesAttribs.push_back(EGL_NONE);
>+        std::vector<eglw::EGLAttrib> glesAttribs =
>+            initAttribs(EGL_PLATFORM_ANGLE_TYPE_OPENGLES_ANGLE);
> 
>-        auto *glesFactory = new ANGLENativeDisplayFactory(
>-            "angle-gles", "ANGLE OpenGL ES Display", glesAttribs, &mEvents);
>+        auto *glesFactory = new ANGLENativeDisplayFactory("angle-gles", "ANGLE OpenGL ES Display",
>+                                                          glesAttribs, &mEvents);
>         m_nativeDisplayFactoryRegistry.registerFactory(glesFactory);
>     }
> #endif
> 
>     {
>-        std::vector<eglw::EGLAttrib> glAttribs;
>-        glAttribs.push_back(EGL_PLATFORM_ANGLE_TYPE_ANGLE);
>-        glAttribs.push_back(EGL_PLATFORM_ANGLE_TYPE_OPENGL_ANGLE);
>-        glAttribs.push_back(EGL_NONE);
>+        std::vector<eglw::EGLAttrib> glAttribs = initAttribs(EGL_PLATFORM_ANGLE_TYPE_OPENGL_ANGLE);
> 
>-        auto *glFactory = new ANGLENativeDisplayFactory(
>-            "angle-gl", "ANGLE OpenGL Display", glAttribs, &mEvents);
>+        auto *glFactory =
>+            new ANGLENativeDisplayFactory("angle-gl", "ANGLE OpenGL Display", glAttribs, &mEvents);
>         m_nativeDisplayFactoryRegistry.registerFactory(glFactory);
>     }
> 
>+#if (DE_OS == DE_OS_ANDROID) || (DE_OS == DE_OS_WIN32) || (DE_OS == DE_OS_UNIX)
>+    {
>+        std::vector<eglw::EGLAttrib> vkAttribs = initAttribs(EGL_PLATFORM_ANGLE_TYPE_VULKAN_ANGLE);
>+
>+        auto *vkFactory = new ANGLENativeDisplayFactory("angle-vulkan", "ANGLE Vulkan Display",
>+                                                        vkAttribs, &mEvents);
>+        m_nativeDisplayFactoryRegistry.registerFactory(vkFactory);
>+    }
>+#endif
>+
>     {
>-        std::vector<eglw::EGLAttrib> nullAttribs;
>-        nullAttribs.push_back(EGL_PLATFORM_ANGLE_TYPE_ANGLE);
>-        nullAttribs.push_back(EGL_PLATFORM_ANGLE_TYPE_NULL_ANGLE);
>-        nullAttribs.push_back(EGL_NONE);
>+        std::vector<eglw::EGLAttrib> nullAttribs = initAttribs(EGL_PLATFORM_ANGLE_TYPE_NULL_ANGLE);
> 
>-        auto *nullFactory = new ANGLENativeDisplayFactory(
>-            "angle-null", "ANGLE NULL Display", nullAttribs, &mEvents);
>+        auto *nullFactory = new ANGLENativeDisplayFactory("angle-null", "ANGLE NULL Display",
>+                                                          nullAttribs, &mEvents);
>         m_nativeDisplayFactoryRegistry.registerFactory(nullFactory);
>     }
> 
>-    m_contextFactoryRegistry.registerFactory(new eglu::GLContextFactory(m_nativeDisplayFactoryRegistry));
>+    m_contextFactoryRegistry.registerFactory(
>+        new eglu::GLContextFactory(m_nativeDisplayFactoryRegistry));
> 
>     // Add Null context type for use in generating case lists
>     m_contextFactoryRegistry.registerFactory(new null::NullGLContextFactory());
> }
> 
>-ANGLEPlatform::~ANGLEPlatform()
>-{
>-}
>+ANGLEPlatform::~ANGLEPlatform() {}
> 
> bool ANGLEPlatform::processEvents()
> {
>     return !mEvents.quitSignaled();
> }
> 
>-} // tcu
>+std::vector<eglw::EGLAttrib> ANGLEPlatform::initAttribs(eglw::EGLAttrib type,
>+                                                        eglw::EGLAttrib deviceType,
>+                                                        eglw::EGLAttrib majorVersion,
>+                                                        eglw::EGLAttrib minorVersion)
>+{
>+    std::vector<eglw::EGLAttrib> attribs;
>+
>+    attribs.push_back(EGL_PLATFORM_ANGLE_TYPE_ANGLE);
>+    attribs.push_back(type);
>+
>+    if (deviceType != EGL_DONT_CARE)
>+    {
>+        attribs.push_back(EGL_PLATFORM_ANGLE_DEVICE_TYPE_ANGLE);
>+        attribs.push_back(deviceType);
>+    }
>+
>+    if (majorVersion != EGL_DONT_CARE)
>+    {
>+        attribs.push_back(EGL_PLATFORM_ANGLE_MAX_VERSION_MAJOR_ANGLE);
>+        attribs.push_back(majorVersion);
>+    }
>+
>+    if (minorVersion != EGL_DONT_CARE)
>+    {
>+        attribs.push_back(EGL_PLATFORM_ANGLE_MAX_VERSION_MINOR_ANGLE);
>+        attribs.push_back(minorVersion);
>+    }
>+
>+    if (mPlatformMethods.logError)
>+    {
>+        static_assert(sizeof(eglw::EGLAttrib) == sizeof(angle::PlatformMethods *),
>+                      "Unexpected pointer size");
>+        attribs.push_back(EGL_PLATFORM_ANGLE_PLATFORM_METHODS_ANGLEX);
>+        attribs.push_back(reinterpret_cast<eglw::EGLAttrib>(&mPlatformMethods));
>+    }
>+
>+    attribs.push_back(EGL_NONE);
>+    return attribs;
>+}
>+}  // namespace tcu
> 
> // Create platform
>+tcu::Platform *CreateANGLEPlatform(angle::LogErrorFunc logErrorFunc)
>+{
>+    return new tcu::ANGLEPlatform(logErrorFunc);
>+}
>+
> tcu::Platform *createPlatform()
> {
>-    return new tcu::ANGLEPlatform();
>+    return CreateANGLEPlatform(nullptr);
> }
>diff --git a/Source/ThirdParty/ANGLE/src/tests/deqp_support/tcuANGLEPlatform.h b/Source/ThirdParty/ANGLE/src/tests/deqp_support/tcuANGLEPlatform.h
>index d62c1c60f25..fe362d5480a 100644
>--- a/Source/ThirdParty/ANGLE/src/tests/deqp_support/tcuANGLEPlatform.h
>+++ b/Source/ThirdParty/ANGLE/src/tests/deqp_support/tcuANGLEPlatform.h
>@@ -21,36 +21,48 @@
> #ifndef TCU_ANGLE_WIN32_PLATFORM_H_
> #define TCU_ANGLE_WIN32_PLATFORM_H_
> 
>+#include "gluPlatform.hpp"
> #include "tcuDefs.hpp"
> #include "tcuPlatform.hpp"
>-#include "gluPlatform.hpp"
> 
> #ifndef _EGLUPLATFORM_HPP
>-#   include "egluPlatform.hpp"
>+#    include "egluPlatform.hpp"
> #endif
> 
>+#include "platform/Platform.h"
> #include "tcuANGLENativeDisplayFactory.h"
> 
> namespace tcu
> {
> 
>-class ANGLEPlatform : public tcu::Platform,
>-                      private glu::Platform,
>-                      private eglu::Platform
>+class ANGLEPlatform : public tcu::Platform, private glu::Platform, private eglu::Platform
> {
>   public:
>-    ANGLEPlatform();
>+    ANGLEPlatform(angle::LogErrorFunc logErrorFunc);
>     ~ANGLEPlatform();
> 
>     bool processEvents() override;
> 
>-    const glu::Platform &getGLPlatform() const override { return static_cast<const glu::Platform&>(*this); }
>-    const eglu::Platform &getEGLPlatform() const override { return static_cast<const eglu::Platform&>(*this); }
>+    const glu::Platform &getGLPlatform() const override
>+    {
>+        return static_cast<const glu::Platform &>(*this);
>+    }
>+    const eglu::Platform &getEGLPlatform() const override
>+    {
>+        return static_cast<const eglu::Platform &>(*this);
>+    }
> 
>   private:
>+    // Note: -1 represents EGL_DONT_CARE, but we don't have the EGL headers here.
>+    std::vector<eglw::EGLAttrib> initAttribs(eglw::EGLAttrib type,
>+                                             eglw::EGLAttrib deviceType   = -1,
>+                                             eglw::EGLAttrib majorVersion = -1,
>+                                             eglw::EGLAttrib minorVersion = -1);
>+
>     EventState mEvents;
>+    angle::PlatformMethods mPlatformMethods;
> };
> 
>-} // tcu
>+}  // namespace tcu
> 
>-#endif // TCU_ANGLE_WIN32_PLATFORM_H_
>+#endif  // TCU_ANGLE_WIN32_PLATFORM_H_
>diff --git a/Source/ThirdParty/ANGLE/src/tests/deqp_support/tcuRandomOrderExecutor.cpp b/Source/ThirdParty/ANGLE/src/tests/deqp_support/tcuRandomOrderExecutor.cpp
>index 3745bc3cef6..8e3002111bd 100644
>--- a/Source/ThirdParty/ANGLE/src/tests/deqp_support/tcuRandomOrderExecutor.cpp
>+++ b/Source/ThirdParty/ANGLE/src/tests/deqp_support/tcuRandomOrderExecutor.cpp
>@@ -23,17 +23,17 @@
> 
> #include "tcuRandomOrderExecutor.h"
> 
>+#include "deClock.h"
>+#include "deStringUtil.hpp"
> #include "tcuCommandLine.hpp"
> #include "tcuTestLog.hpp"
>-#include "deStringUtil.hpp"
>-#include "deClock.h"
> 
>-#include <cstdio>
> #include <algorithm>
>+#include <cstdio>
> #include <fstream>
> 
>-using std::vector;
> using std::string;
>+using std::vector;
> 
> namespace tcu
> {
>@@ -58,7 +58,7 @@ void RandomOrderExecutor::pruneStack(size_t newStackSize)
>     while (m_nodeStack.size() > newStackSize)
>     {
>         NodeStackEntry &curEntry = m_nodeStack.back();
>-        const bool isPkg = curEntry.node->getNodeType() == NODETYPE_PACKAGE;
>+        const bool isPkg         = curEntry.node->getNodeType() == NODETYPE_PACKAGE;
> 
>         DE_ASSERT((m_nodeStack.size() == 2) == isPkg);
> 
>@@ -172,8 +172,8 @@ static qpTestCaseType nodeTypeToTestCaseType(TestNodeType nodeType)
> 
> TestStatus RandomOrderExecutor::execute(const std::string &casePath)
> {
>-    TestCase *const testCase = seekToCase(casePath);
>-    TestLog &log = m_testCtx.getLog();
>+    TestCase *const testCase      = seekToCase(casePath);
>+    TestLog &log                  = m_testCtx.getLog();
>     const qpTestCaseType caseType = nodeTypeToTestCaseType(testCase->getNodeType());
> 
>     m_testCtx.setTerminateAfter(false);
>@@ -188,7 +188,7 @@ TestStatus RandomOrderExecutor::execute(const std::string &casePath)
> 
> tcu::TestStatus RandomOrderExecutor::executeInner(TestCase *testCase, const std::string &casePath)
> {
>-    TestLog &log = m_testCtx.getLog();
>+    TestLog &log                 = m_testCtx.getLog();
>     const deUint64 testStartTime = deGetMicroseconds();
> 
>     m_testCtx.setTestResult(QP_TEST_RESULT_LAST, "");
>@@ -262,8 +262,9 @@ tcu::TestStatus RandomOrderExecutor::executeInner(TestCase *testCase, const std:
>     }
>     catch (const tcu::Exception &e)
>     {
>-        log << e << TestLog::Message << "Error in test case deinit, test program "
>-                                        "will terminate."
>+        log << e << TestLog::Message
>+            << "Error in test case deinit, test program "
>+               "will terminate."
>             << TestLog::EndMessage;
>         m_testCtx.setTerminateAfter(true);
>     }
>@@ -279,4 +280,4 @@ tcu::TestStatus RandomOrderExecutor::executeInner(TestCase *testCase, const std:
>     }
> }
> 
>-}  // tcu
>+}  // namespace tcu
>diff --git a/Source/ThirdParty/ANGLE/src/tests/deqp_support/tcuRandomOrderExecutor.h b/Source/ThirdParty/ANGLE/src/tests/deqp_support/tcuRandomOrderExecutor.h
>index f8c708529c0..44813bd0f14 100644
>--- a/Source/ThirdParty/ANGLE/src/tests/deqp_support/tcuRandomOrderExecutor.h
>+++ b/Source/ThirdParty/ANGLE/src/tests/deqp_support/tcuRandomOrderExecutor.h
>@@ -24,21 +24,21 @@
> #ifndef TCU_RANDOM_ORDER_EXECUTOR_H_
> #define TCU_RANDOM_ORDER_EXECUTOR_H_
> 
>-#include "tcuTestHierarchyIterator.hpp"
> #include "deUniquePtr.hpp"
>+#include "tcuTestHierarchyIterator.hpp"
> 
> namespace tcu
> {
> 
> class RandomOrderExecutor
> {
>-   public:
>+  public:
>     RandomOrderExecutor(TestPackageRoot &root, TestContext &testCtx);
>     ~RandomOrderExecutor(void);
> 
>     TestStatus execute(const std::string &path);
> 
>-   private:
>+  private:
>     void pruneStack(size_t newStackSize);
>     TestCase *seekToCase(const std::string &path);
> 
>@@ -61,6 +61,6 @@ class RandomOrderExecutor
>     de::MovePtr<TestCaseExecutor> m_caseExecutor;
> };
> 
>-}  // tcu
>+}  // namespace tcu
> 
> #endif  // TCU_RANDOM_ORDER_EXECUTOR_H_
>diff --git a/Source/ThirdParty/ANGLE/src/tests/egl_tests/EGLBlobCacheTest.cpp b/Source/ThirdParty/ANGLE/src/tests/egl_tests/EGLBlobCacheTest.cpp
>new file mode 100644
>index 00000000000..d01b6b7008f
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/tests/egl_tests/EGLBlobCacheTest.cpp
>@@ -0,0 +1,219 @@
>+//
>+// Copyright 2018 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// EGLBlobCacheTest:
>+//   Unit tests for the EGL_ANDROID_blob_cache extension.
>+
>+#include <map>
>+#include <vector>
>+
>+#include "common/angleutils.h"
>+#include "test_utils/ANGLETest.h"
>+#include "test_utils/gl_raii.h"
>+#include "util/EGLWindow.h"
>+
>+using namespace angle;
>+
>+constexpr char kEGLExtName[] = "EGL_ANDROID_blob_cache";
>+
>+enum class CacheOpResult
>+{
>+    SET_SUCCESS,
>+    GET_NOT_FOUND,
>+    GET_MEMORY_TOO_SMALL,
>+    GET_SUCCESS,
>+
>+    VALUE_NOT_SET,
>+};
>+
>+namespace
>+{
>+std::map<std::vector<uint8_t>, std::vector<uint8_t>> gApplicationCache;
>+CacheOpResult gLastCacheOpResult = CacheOpResult::VALUE_NOT_SET;
>+
>+void SetBlob(const void *key, EGLsizeiANDROID keySize, const void *value, EGLsizeiANDROID valueSize)
>+{
>+    std::vector<uint8_t> keyVec(keySize);
>+    memcpy(keyVec.data(), key, keySize);
>+
>+    std::vector<uint8_t> valueVec(valueSize);
>+    memcpy(valueVec.data(), value, valueSize);
>+
>+    gApplicationCache[keyVec] = valueVec;
>+
>+    gLastCacheOpResult = CacheOpResult::SET_SUCCESS;
>+}
>+
>+EGLsizeiANDROID GetBlob(const void *key,
>+                        EGLsizeiANDROID keySize,
>+                        void *value,
>+                        EGLsizeiANDROID valueSize)
>+{
>+    std::vector<uint8_t> keyVec(keySize);
>+    memcpy(keyVec.data(), key, keySize);
>+
>+    auto entry = gApplicationCache.find(keyVec);
>+    if (entry == gApplicationCache.end())
>+    {
>+        gLastCacheOpResult = CacheOpResult::GET_NOT_FOUND;
>+        return 0;
>+    }
>+
>+    if (entry->second.size() <= static_cast<size_t>(valueSize))
>+    {
>+        memcpy(value, entry->second.data(), entry->second.size());
>+        gLastCacheOpResult = CacheOpResult::GET_SUCCESS;
>+    }
>+    else
>+    {
>+        gLastCacheOpResult = CacheOpResult::GET_MEMORY_TOO_SMALL;
>+    }
>+
>+    return entry->second.size();
>+}
>+}  // anonymous namespace
>+
>+class EGLBlobCacheTest : public ANGLETest
>+{
>+  protected:
>+    EGLBlobCacheTest() : mHasBlobCache(false)
>+    {
>+        // Force disply caching off. Blob cache functions require it.
>+        forceNewDisplay();
>+    }
>+
>+    void SetUp() override
>+    {
>+        ANGLETest::SetUp();
>+
>+        EGLDisplay display = getEGLWindow()->getDisplay();
>+        mHasBlobCache      = IsEGLDisplayExtensionEnabled(display, kEGLExtName);
>+    }
>+
>+    bool programBinaryAvailable()
>+    {
>+        return (getClientMajorVersion() >= 3 || IsGLExtensionEnabled("GL_OES_get_program_binary"));
>+    }
>+
>+    bool mHasBlobCache;
>+};
>+
>+// Makes sure the extension exists and works
>+TEST_P(EGLBlobCacheTest, Functional)
>+{
>+    EGLDisplay display = getEGLWindow()->getDisplay();
>+
>+    EXPECT_TRUE(mHasBlobCache);
>+    eglSetBlobCacheFuncsANDROID(display, SetBlob, GetBlob);
>+    ASSERT_EGL_SUCCESS();
>+
>+    constexpr char kVertexShaderSrc[] = R"(attribute vec4 aTest;
>+attribute vec2 aPosition;
>+varying vec4 vTest;
>+void main()
>+{
>+    vTest        = aTest;
>+    gl_Position  = vec4(aPosition, 0.0, 1.0);
>+    gl_PointSize = 1.0;
>+})";
>+
>+    constexpr char kFragmentShaderSrc[] = R"(precision mediump float;
>+varying vec4 vTest;
>+void main()
>+{
>+    gl_FragColor = vTest;
>+})";
>+
>+    constexpr char kVertexShaderSrc2[] = R"(attribute vec4 aTest;
>+attribute vec2 aPosition;
>+varying vec4 vTest;
>+void main()
>+{
>+    vTest        = aTest;
>+    gl_Position  = vec4(aPosition, 1.0, 1.0);
>+    gl_PointSize = 1.0;
>+})";
>+
>+    constexpr char kFragmentShaderSrc2[] = R"(precision mediump float;
>+varying vec4 vTest;
>+void main()
>+{
>+    gl_FragColor = vTest - vec4(0.0, 1.0, 0.0, 0.0);
>+})";
>+
>+    // Compile a shader so it puts something in the cache
>+    if (programBinaryAvailable())
>+    {
>+        GLuint program = CompileProgram(kVertexShaderSrc, kFragmentShaderSrc);
>+        ASSERT_NE(0u, program);
>+        EXPECT_EQ(CacheOpResult::SET_SUCCESS, gLastCacheOpResult);
>+        gLastCacheOpResult = CacheOpResult::VALUE_NOT_SET;
>+
>+        // Compile the same shader again, so it would try to retrieve it from the cache
>+        program = CompileProgram(kVertexShaderSrc, kFragmentShaderSrc);
>+        ASSERT_NE(0u, program);
>+        EXPECT_EQ(CacheOpResult::GET_SUCCESS, gLastCacheOpResult);
>+        gLastCacheOpResult = CacheOpResult::VALUE_NOT_SET;
>+
>+        // Compile another shader, which should create a new entry
>+        program = CompileProgram(kVertexShaderSrc2, kFragmentShaderSrc2);
>+        ASSERT_NE(0u, program);
>+        EXPECT_EQ(CacheOpResult::SET_SUCCESS, gLastCacheOpResult);
>+        gLastCacheOpResult = CacheOpResult::VALUE_NOT_SET;
>+
>+        // Compile the first shader again, which should still reside in the cache
>+        program = CompileProgram(kVertexShaderSrc, kFragmentShaderSrc);
>+        ASSERT_NE(0u, program);
>+        EXPECT_EQ(CacheOpResult::GET_SUCCESS, gLastCacheOpResult);
>+        gLastCacheOpResult = CacheOpResult::VALUE_NOT_SET;
>+    }
>+}
>+
>+// Tests error conditions of the APIs.
>+TEST_P(EGLBlobCacheTest, NegativeAPI)
>+{
>+    EXPECT_TRUE(mHasBlobCache);
>+
>+    // Test bad display
>+    eglSetBlobCacheFuncsANDROID(EGL_NO_DISPLAY, nullptr, nullptr);
>+    EXPECT_EGL_ERROR(EGL_BAD_DISPLAY);
>+
>+    eglSetBlobCacheFuncsANDROID(EGL_NO_DISPLAY, SetBlob, GetBlob);
>+    EXPECT_EGL_ERROR(EGL_BAD_DISPLAY);
>+
>+    EGLDisplay display = getEGLWindow()->getDisplay();
>+
>+    // Test bad arguments
>+    eglSetBlobCacheFuncsANDROID(display, nullptr, nullptr);
>+    EXPECT_EGL_ERROR(EGL_BAD_PARAMETER);
>+
>+    eglSetBlobCacheFuncsANDROID(display, SetBlob, nullptr);
>+    EXPECT_EGL_ERROR(EGL_BAD_PARAMETER);
>+
>+    eglSetBlobCacheFuncsANDROID(display, nullptr, GetBlob);
>+    EXPECT_EGL_ERROR(EGL_BAD_PARAMETER);
>+
>+    // Set the arguments once and test setting them again (which should fail)
>+    eglSetBlobCacheFuncsANDROID(display, SetBlob, GetBlob);
>+    ASSERT_EGL_SUCCESS();
>+
>+    eglSetBlobCacheFuncsANDROID(display, SetBlob, GetBlob);
>+    EXPECT_EGL_ERROR(EGL_BAD_PARAMETER);
>+
>+    // Try again with bad parameters
>+    eglSetBlobCacheFuncsANDROID(EGL_NO_DISPLAY, nullptr, nullptr);
>+    EXPECT_EGL_ERROR(EGL_BAD_DISPLAY);
>+
>+    eglSetBlobCacheFuncsANDROID(display, nullptr, nullptr);
>+    EXPECT_EGL_ERROR(EGL_BAD_PARAMETER);
>+
>+    eglSetBlobCacheFuncsANDROID(display, SetBlob, nullptr);
>+    EXPECT_EGL_ERROR(EGL_BAD_PARAMETER);
>+
>+    eglSetBlobCacheFuncsANDROID(display, nullptr, GetBlob);
>+    EXPECT_EGL_ERROR(EGL_BAD_PARAMETER);
>+}
>+
>+ANGLE_INSTANTIATE_TEST(EGLBlobCacheTest, ES2_D3D9(), ES2_D3D11(), ES2_OPENGL(), ES2_VULKAN());
>diff --git a/Source/ThirdParty/ANGLE/src/tests/egl_tests/EGLChooseConfigTest.cpp b/Source/ThirdParty/ANGLE/src/tests/egl_tests/EGLChooseConfigTest.cpp
>new file mode 100644
>index 00000000000..6f431d3ebd0
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/tests/egl_tests/EGLChooseConfigTest.cpp
>@@ -0,0 +1,122 @@
>+//
>+// Copyright 2019 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// EGLChooseConfigTest.cpp:
>+//   Tests of proper default-value semantics for eglChooseConfig
>+
>+#include <gtest/gtest.h>
>+
>+#include "test_utils/ANGLETest.h"
>+#include "test_utils/angle_test_configs.h"
>+#include "util/EGLWindow.h"
>+
>+using namespace angle;
>+
>+namespace angle
>+{
>+class EGLChooseConfigTest : public ANGLETest
>+{
>+  protected:
>+    EGLChooseConfigTest() {}
>+};
>+
>+// Test that the EGL_COLOR_BUFFER_TYPE is defaulted to EGL_RGB_BUFFER
>+TEST_P(EGLChooseConfigTest, Defaults)
>+{
>+    EGLDisplay display = getEGLWindow()->getDisplay();
>+
>+    EGLint nConfigs       = 0;
>+    EGLint allConfigCount = 0;
>+    ASSERT_EGL_TRUE(eglGetConfigs(display, nullptr, 0, &nConfigs));
>+    ASSERT_NE(nConfigs, 0);
>+
>+    std::vector<EGLConfig> allConfigs(nConfigs);
>+    ASSERT_EGL_TRUE(eglGetConfigs(display, allConfigs.data(), nConfigs, &allConfigCount));
>+    ASSERT_EQ(nConfigs, allConfigCount);
>+
>+    // Choose configs that have the default attribute values:
>+    const EGLint defaultConfigAttributes[] = {EGL_NONE};
>+    EGLint defaultConfigCount;
>+    std::vector<EGLConfig> defaultConfigs(allConfigCount);
>+    ASSERT_EGL_TRUE(eglChooseConfig(display, defaultConfigAttributes, defaultConfigs.data(),
>+                                    defaultConfigs.size(), &defaultConfigCount));
>+    ASSERT_EGL_SUCCESS();
>+    ASSERT_LE(defaultConfigCount, allConfigCount);
>+
>+    // Check that the default configs all have the default attribute values we care about:
>+    for (EGLConfig config : defaultConfigs)
>+    {
>+        EGLint colorBufferType, level, renderableType, surfaceType, transparentType;
>+        EGLint colorComponentType;
>+
>+        eglGetConfigAttrib(display, config, EGL_COLOR_BUFFER_TYPE, &colorBufferType);
>+        ASSERT_EQ(colorBufferType, EGL_RGB_BUFFER);
>+
>+        eglGetConfigAttrib(display, config, EGL_LEVEL, &level);
>+        ASSERT_EQ(level, 0);
>+
>+        eglGetConfigAttrib(display, config, EGL_RENDERABLE_TYPE, &renderableType);
>+        ASSERT_EQ(renderableType & EGL_OPENGL_ES_BIT, EGL_OPENGL_ES_BIT);
>+
>+        eglGetConfigAttrib(display, config, EGL_SURFACE_TYPE, &surfaceType);
>+        ASSERT_EQ(surfaceType & EGL_WINDOW_BIT, EGL_WINDOW_BIT);
>+
>+        eglGetConfigAttrib(display, config, EGL_TRANSPARENT_TYPE, &transparentType);
>+        ASSERT_EQ(transparentType, EGL_NONE);
>+
>+        if (IsEGLDisplayExtensionEnabled(display, "EGL_EXT_pixel_format_float"))
>+        {
>+            eglGetConfigAttrib(display, config, EGL_COLOR_COMPONENT_TYPE_EXT, &colorComponentType);
>+            ASSERT_EQ(colorComponentType, EGL_COLOR_COMPONENT_TYPE_FIXED_EXT);
>+        }
>+    }
>+
>+    // Check that all of the configs that have the default attribute values are are defaultConfigs,
>+    // and all that don't aren't:
>+    for (EGLConfig config : allConfigs)
>+    {
>+        EGLint colorBufferType, level, renderableType, surfaceType, transparentType;
>+        EGLint colorComponentType = EGL_COLOR_COMPONENT_TYPE_FIXED_EXT;
>+
>+        eglGetConfigAttrib(display, config, EGL_COLOR_BUFFER_TYPE, &colorBufferType);
>+        eglGetConfigAttrib(display, config, EGL_LEVEL, &level);
>+        eglGetConfigAttrib(display, config, EGL_RENDERABLE_TYPE, &renderableType);
>+        eglGetConfigAttrib(display, config, EGL_SURFACE_TYPE, &surfaceType);
>+        eglGetConfigAttrib(display, config, EGL_TRANSPARENT_TYPE, &transparentType);
>+        if (IsEGLDisplayExtensionEnabled(display, "EGL_EXT_pixel_format_float"))
>+        {
>+            eglGetConfigAttrib(display, config, EGL_COLOR_COMPONENT_TYPE_EXT, &colorComponentType);
>+        }
>+
>+        bool isADefault =
>+            ((colorBufferType == EGL_RGB_BUFFER) && (level == 0) &&
>+             ((renderableType & EGL_OPENGL_ES_BIT) == EGL_OPENGL_ES_BIT) &&
>+             ((surfaceType & EGL_WINDOW_BIT) == EGL_WINDOW_BIT) && (transparentType == EGL_NONE) &&
>+             (colorComponentType == EGL_COLOR_COMPONENT_TYPE_FIXED_EXT));
>+        EGLint thisConfigID;
>+        eglGetConfigAttrib(display, config, EGL_CONFIG_ID, &thisConfigID);
>+        bool foundInDefaultConfigs = false;
>+        // Attempt to find this config ID in defaultConfigs:
>+        for (EGLConfig defaultConfig : defaultConfigs)
>+        {
>+            EGLint defaultConfigID;
>+            eglGetConfigAttrib(display, defaultConfig, EGL_CONFIG_ID, &defaultConfigID);
>+            if (defaultConfigID == thisConfigID)
>+            {
>+                foundInDefaultConfigs = true;
>+            }
>+        }
>+        ASSERT_EQ(isADefault, foundInDefaultConfigs);
>+    }
>+}
>+
>+}  // namespace angle
>+
>+ANGLE_INSTANTIATE_TEST(EGLChooseConfigTest,
>+                       ES2_D3D11(),
>+                       ES2_D3D9(),
>+                       ES2_OPENGL(),
>+                       ES2_OPENGLES(),
>+                       ES2_VULKAN());
>diff --git a/Source/ThirdParty/ANGLE/src/tests/egl_tests/EGLContextCompatibilityTest.cpp b/Source/ThirdParty/ANGLE/src/tests/egl_tests/EGLContextCompatibilityTest.cpp
>index 0e90616d87a..a822420ffa9 100644
>--- a/Source/ThirdParty/ANGLE/src/tests/egl_tests/EGLContextCompatibilityTest.cpp
>+++ b/Source/ThirdParty/ANGLE/src/tests/egl_tests/EGLContextCompatibilityTest.cpp
>@@ -11,45 +11,34 @@
> #include <gtest/gtest.h>
> 
> #include <vector>
>-#include <EGL/egl.h>
>-#include <EGL/eglext.h>
> 
>-#include "OSWindow.h"
> #include "test_utils/ANGLETest.h"
> #include "test_utils/angle_test_configs.h"
>+#include "test_utils/angle_test_instantiate.h"
>+#include "util/OSWindow.h"
> 
> using namespace angle;
> 
> namespace
> {
> 
>-const EGLint contextAttribs[] =
>-{
>-    EGL_CONTEXT_CLIENT_VERSION, 2,
>-    EGL_NONE
>-};
>-
>+const EGLint contextAttribs[] = {EGL_CONTEXT_CLIENT_VERSION, 2, EGL_NONE};
> }
> 
>-class EGLContextCompatibilityTest : public ANGLETest
>+class EGLContextCompatibilityTest : public EGLTest,
>+                                    public testing::WithParamInterface<PlatformParameters>
> {
>   public:
>-    EGLContextCompatibilityTest()
>-      : mDisplay(0)
>-    {
>-    }
>+    EGLContextCompatibilityTest() : mDisplay(0) {}
> 
>     void SetUp() override
>     {
>-        PFNEGLGETPLATFORMDISPLAYEXTPROC eglGetPlatformDisplayEXT = reinterpret_cast<PFNEGLGETPLATFORMDISPLAYEXTPROC>(eglGetProcAddress("eglGetPlatformDisplayEXT"));
>+        EGLTest::SetUp();
>+
>         ASSERT_TRUE(eglGetPlatformDisplayEXT != nullptr);
> 
>-        EGLint dispattrs[] =
>-        {
>-            EGL_PLATFORM_ANGLE_TYPE_ANGLE, GetParam().getRenderer(),
>-            EGL_NONE
>-        };
>-        mDisplay = eglGetPlatformDisplayEXT(
>+        EGLint dispattrs[] = {EGL_PLATFORM_ANGLE_TYPE_ANGLE, GetParam().getRenderer(), EGL_NONE};
>+        mDisplay           = eglGetPlatformDisplayEXT(
>             EGL_PLATFORM_ANGLE_ANGLE, reinterpret_cast<void *>(EGL_DEFAULT_DISPLAY), dispattrs);
>         ASSERT_TRUE(mDisplay != EGL_NO_DISPLAY);
> 
>@@ -61,7 +50,8 @@ class EGLContextCompatibilityTest : public ANGLETest
> 
>         int nReturnedConfigs = 0;
>         mConfigs.resize(nConfigs);
>-        ASSERT_TRUE(eglGetConfigs(mDisplay, mConfigs.data(), nConfigs, &nReturnedConfigs) == EGL_TRUE);
>+        ASSERT_TRUE(eglGetConfigs(mDisplay, mConfigs.data(), nConfigs, &nReturnedConfigs) ==
>+                    EGL_TRUE);
>         ASSERT_TRUE(nConfigs == nReturnedConfigs);
>     }
> 
>@@ -69,7 +59,7 @@ class EGLContextCompatibilityTest : public ANGLETest
>     {
>         eglMakeCurrent(mDisplay, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT);
>         eglTerminate(mDisplay);
>-    };
>+    }
> 
>   protected:
>     // Queries EGL config to determine if multisampled or not
>@@ -80,6 +70,27 @@ class EGLContextCompatibilityTest : public ANGLETest
>         return (samples > 1);
>     }
> 
>+    // The only configs with 16-bits for each of red, green, blue, and alpha is GL_RGBA16F
>+    bool isRGBA16FConfig(EGLConfig config)
>+    {
>+        EGLint red, green, blue, alpha;
>+        eglGetConfigAttrib(mDisplay, config, EGL_RED_SIZE, &red);
>+        eglGetConfigAttrib(mDisplay, config, EGL_GREEN_SIZE, &green);
>+        eglGetConfigAttrib(mDisplay, config, EGL_BLUE_SIZE, &blue);
>+        eglGetConfigAttrib(mDisplay, config, EGL_ALPHA_SIZE, &alpha);
>+        return ((red == 16) && (green == 16) && (blue == 16) && (alpha == 16));
>+    }
>+
>+    bool isRGB10_A2Config(EGLConfig config)
>+    {
>+        EGLint red, green, blue, alpha;
>+        eglGetConfigAttrib(mDisplay, config, EGL_RED_SIZE, &red);
>+        eglGetConfigAttrib(mDisplay, config, EGL_GREEN_SIZE, &green);
>+        eglGetConfigAttrib(mDisplay, config, EGL_BLUE_SIZE, &blue);
>+        eglGetConfigAttrib(mDisplay, config, EGL_ALPHA_SIZE, &alpha);
>+        return ((red == 10) && (green == 10) && (blue == 10) && (alpha == 2));
>+    }
>+
>     bool areConfigsCompatible(EGLConfig c1, EGLConfig c2, EGLint surfaceBit)
>     {
>         EGLint colorBufferType1, colorBufferType2;
>@@ -109,7 +120,7 @@ class EGLContextCompatibilityTest : public ANGLETest
> 
>         EGLint colorComponentType1 = EGL_COLOR_COMPONENT_TYPE_FIXED_EXT;
>         EGLint colorComponentType2 = EGL_COLOR_COMPONENT_TYPE_FIXED_EXT;
>-        if (eglDisplayExtensionEnabled(mDisplay, "EGL_EXT_pixel_format_float"))
>+        if (IsEGLDisplayExtensionEnabled(mDisplay, "EGL_EXT_pixel_format_float"))
>         {
>             eglGetConfigAttrib(mDisplay, c1, EGL_COLOR_COMPONENT_TYPE_EXT, &colorComponentType1);
>             eglGetConfigAttrib(mDisplay, c2, EGL_COLOR_COMPONENT_TYPE_EXT, &colorComponentType2);
>@@ -123,17 +134,21 @@ class EGLContextCompatibilityTest : public ANGLETest
>                (surfaceType2 & surfaceBit) != 0;
>     }
> 
>-    void testWindowCompatibility(EGLConfig windowConfig, EGLConfig contextConfig, bool compatible) const
>+    void testWindowCompatibility(EGLConfig windowConfig,
>+                                 EGLConfig contextConfig,
>+                                 bool compatible) const
>     {
>-        OSWindow *osWindow = CreateOSWindow();
>+        OSWindow *osWindow = OSWindow::New();
>         ASSERT_TRUE(osWindow != nullptr);
>         osWindow->initialize("EGLContextCompatibilityTest", 500, 500);
>         osWindow->setVisible(true);
> 
>-        EGLContext context = eglCreateContext(mDisplay, contextConfig, EGL_NO_CONTEXT, contextAttribs);
>+        EGLContext context =
>+            eglCreateContext(mDisplay, contextConfig, EGL_NO_CONTEXT, contextAttribs);
>         ASSERT_TRUE(context != EGL_NO_CONTEXT);
> 
>-        EGLSurface window = eglCreateWindowSurface(mDisplay, windowConfig, osWindow->getNativeWindow(), nullptr);
>+        EGLSurface window =
>+            eglCreateWindowSurface(mDisplay, windowConfig, osWindow->getNativeWindow(), nullptr);
>         ASSERT_EGL_SUCCESS();
> 
>         if (compatible)
>@@ -151,19 +166,19 @@ class EGLContextCompatibilityTest : public ANGLETest
>         eglDestroyContext(mDisplay, context);
>         ASSERT_EGL_SUCCESS();
> 
>-        SafeDelete(osWindow);
>+        OSWindow::Delete(&osWindow);
>     }
> 
>-    void testPbufferCompatibility(EGLConfig pbufferConfig, EGLConfig contextConfig, bool compatible) const
>+    void testPbufferCompatibility(EGLConfig pbufferConfig,
>+                                  EGLConfig contextConfig,
>+                                  bool compatible) const
>     {
>-        EGLContext context = eglCreateContext(mDisplay, contextConfig, EGL_NO_CONTEXT, contextAttribs);
>+        EGLContext context =
>+            eglCreateContext(mDisplay, contextConfig, EGL_NO_CONTEXT, contextAttribs);
>         ASSERT_TRUE(context != EGL_NO_CONTEXT);
> 
>-        const EGLint pBufferAttribs[] =
>-        {
>-            EGL_WIDTH, 500,
>-            EGL_HEIGHT, 500,
>-            EGL_NONE,
>+        const EGLint pBufferAttribs[] = {
>+            EGL_WIDTH, 500, EGL_HEIGHT, 500, EGL_NONE,
>         };
>         EGLSurface pbuffer = eglCreatePbufferSurface(mDisplay, pbufferConfig, pBufferAttribs);
>         ASSERT_TRUE(pbuffer != EGL_NO_SURFACE);
>@@ -199,7 +214,7 @@ class EGLContextCompatibilityTest : public ANGLETest
>         ASSERT_GL_NO_ERROR();
> 
>         EGLint surfaceCompontentType = EGL_COLOR_COMPONENT_TYPE_FIXED_EXT;
>-        if (eglDisplayExtensionEnabled(mDisplay, "EGL_EXT_pixel_format_float"))
>+        if (IsEGLDisplayExtensionEnabled(mDisplay, "EGL_EXT_pixel_format_float"))
>         {
>             eglGetConfigAttrib(mDisplay, surfaceConfig, EGL_COLOR_COMPONENT_TYPE_EXT,
>                                &surfaceCompontentType);
>@@ -244,8 +259,10 @@ TEST_P(EGLContextCompatibilityTest, WindowSameConfig)
>         if ((surfaceType & EGL_WINDOW_BIT) != 0)
>         {
>             // Disabling multisampled configurations due to test instability with various graphics
>-            // cards
>-            if (isMultisampledConfig(config))
>+            // cards, and RGBA16F/RGB10_A2 on Android due to OSWindow on Android not providing
>+            // compatible windows (anglebug.com/3156)
>+            if (isMultisampledConfig(config) ||
>+                (IsAndroid() && (isRGB10_A2Config(config) || isRGBA16FConfig(config))))
>             {
>                 continue;
>             }
>@@ -269,8 +286,9 @@ TEST_P(EGLContextCompatibilityTest, PbufferSameConfig)
>         if ((surfaceType & EGL_PBUFFER_BIT) != 0)
>         {
>             // Disabling multisampled configurations due to test instability with various graphics
>-            // cards
>-            if (isMultisampledConfig(config))
>+            // cards, and RGB10_A2 on Android due to OSWindow on Android not providing compatible
>+            // windows (anglebug.com/3156)
>+            if (isMultisampledConfig(config) || (IsAndroid() && isRGB10_A2Config(config)))
>             {
>                 continue;
>             }
>@@ -291,8 +309,11 @@ TEST_P(EGLContextCompatibilityTest, WindowDifferentConfig)
>     for (size_t i = 0; i < mConfigs.size(); i++)
>     {
>         EGLConfig config1 = mConfigs[i];
>-        // Disabling multisampled configurations due to test instability with various graphics cards
>-        if (isMultisampledConfig(config1))
>+        // Disabling multisampled configurations due to test instability with various graphics
>+        // cards, and RGBA16F/RGB10_A2 on Android due to OSWindow on Android not providing
>+        // compatible windows (anglebug.com/3156)
>+        if (isMultisampledConfig(config1) ||
>+            (IsAndroid() && (isRGB10_A2Config(config1) || isRGBA16FConfig(config1))))
>         {
>             continue;
>         }
>@@ -310,8 +331,10 @@ TEST_P(EGLContextCompatibilityTest, WindowDifferentConfig)
>         {
>             EGLConfig config2 = mConfigs[j];
>             // Disabling multisampled configurations due to test instability with various graphics
>-            // cards
>-            if (isMultisampledConfig(config2))
>+            // cards, and RGBA16F/RGB10_A2 on Android due to OSWindow on Android not providing
>+            // compatible windows (anglebug.com/3156)
>+            if (isMultisampledConfig(config2) ||
>+                (IsAndroid() && (isRGB10_A2Config(config2) || isRGBA16FConfig(config2))))
>             {
>                 continue;
>             }
>@@ -328,8 +351,10 @@ TEST_P(EGLContextCompatibilityTest, PbufferDifferentConfig)
>     for (size_t i = 0; i < mConfigs.size(); i++)
>     {
>         EGLConfig config1 = mConfigs[i];
>-        // Disabling multisampled configurations due to test instability with various graphics cards
>-        if (isMultisampledConfig(config1))
>+        // Disabling multisampled configurations due to test instability with various graphics
>+        // cards, and RGB10_A2 on Android due to OSWindow on Android not providing compatible
>+        // windows (anglebug.com/3156)
>+        if (isMultisampledConfig(config1) || (IsAndroid() && isRGB10_A2Config(config1)))
>         {
>             continue;
>         }
>@@ -347,12 +372,14 @@ TEST_P(EGLContextCompatibilityTest, PbufferDifferentConfig)
>         {
>             EGLConfig config2 = mConfigs[j];
>             // Disabling multisampled configurations due to test instability with various graphics
>-            // cards
>-            if (isMultisampledConfig(config2))
>+            // cards, and RGB10_A2 on Android due to OSWindow on Android not providing compatible
>+            // windows (anglebug.com/3156)
>+            if (isMultisampledConfig(config2) || (IsAndroid() && isRGB10_A2Config(config2)))
>             {
>                 continue;
>             }
>-            testPbufferCompatibility(config1, config2, areConfigsCompatible(config1, config2, EGL_PBUFFER_BIT));
>+            testPbufferCompatibility(config1, config2,
>+                                     areConfigsCompatible(config1, config2, EGL_PBUFFER_BIT));
>         }
>     }
> }
>@@ -361,5 +388,10 @@ TEST_P(EGLContextCompatibilityTest, PbufferDifferentConfig)
> // scales with the square of the number of configs exposed and can time out in some debug builds.
> // http://anglebug.com/2121
> #if defined(NDEBUG)
>-ANGLE_INSTANTIATE_TEST(EGLContextCompatibilityTest, ES2_D3D9(), ES2_D3D11(), ES2_OPENGL());
>-#endif
>+ANGLE_INSTANTIATE_TEST(EGLContextCompatibilityTest,
>+                       ES2_D3D9(),
>+                       ES2_D3D11(),
>+                       ES2_OPENGL(),
>+                       ES2_OPENGLES(),
>+                       ES2_VULKAN());
>+#endif  // defined(NDEBUG)
>diff --git a/Source/ThirdParty/ANGLE/src/tests/egl_tests/EGLContextSharingTest.cpp b/Source/ThirdParty/ANGLE/src/tests/egl_tests/EGLContextSharingTest.cpp
>index dc1b1022763..916d9d93650 100644
>--- a/Source/ThirdParty/ANGLE/src/tests/egl_tests/EGLContextSharingTest.cpp
>+++ b/Source/ThirdParty/ANGLE/src/tests/egl_tests/EGLContextSharingTest.cpp
>@@ -8,11 +8,9 @@
> 
> #include <gtest/gtest.h>
> 
>-#include <EGL/egl.h>
>-#include <EGL/eglext.h>
>-
> #include "test_utils/ANGLETest.h"
> #include "test_utils/angle_test_configs.h"
>+#include "util/EGLWindow.h"
> 
> using namespace angle;
> 
>@@ -98,7 +96,7 @@ TEST_P(EGLContextSharingTest, DisplayShareGroupContextCreation)
>     mContexts[0] = eglCreateContext(display, config, nullptr, inShareGroupContextAttribs);
>     mContexts[1] = eglCreateContext(display, config, mContexts[1], inShareGroupContextAttribs);
> 
>-    if (!ANGLETest::eglDisplayExtensionEnabled(display, "EGL_ANGLE_display_texture_share_group"))
>+    if (!IsEGLDisplayExtensionEnabled(display, "EGL_ANGLE_display_texture_share_group"))
>     {
>         // Make sure an error is generated and early-exit
>         ASSERT_EGL_ERROR(EGL_BAD_ATTRIBUTE);
>@@ -125,7 +123,7 @@ TEST_P(EGLContextSharingTest, DisplayShareGroupContextCreation)
> TEST_P(EGLContextSharingTest, DisplayShareGroupObjectSharing)
> {
>     EGLDisplay display = getEGLWindow()->getDisplay();
>-    if (!ANGLETest::eglDisplayExtensionEnabled(display, "EGL_ANGLE_display_texture_share_group"))
>+    if (!IsEGLDisplayExtensionEnabled(display, "EGL_ANGLE_display_texture_share_group"))
>     {
>         std::cout << "Test skipped because EGL_ANGLE_display_texture_share_group is not present."
>                   << std::endl;
>@@ -207,7 +205,7 @@ TEST_P(EGLContextSharingTest, DisplayShareGroupObjectSharing)
> TEST_P(EGLContextSharingTest, DisplayShareGroupReleasedWithLastContext)
> {
>     EGLDisplay display = getEGLWindow()->getDisplay();
>-    if (!ANGLETest::eglDisplayExtensionEnabled(display, "EGL_ANGLE_display_texture_share_group"))
>+    if (!IsEGLDisplayExtensionEnabled(display, "EGL_ANGLE_display_texture_share_group"))
>     {
>         std::cout << "Test skipped because EGL_ANGLE_display_texture_share_group is not present."
>                   << std::endl;
>@@ -254,4 +252,5 @@ ANGLE_INSTANTIATE_TEST(EGLContextSharingTest,
>                        ES2_D3D11(),
>                        ES3_D3D11(),
>                        ES2_OPENGL(),
>-                       ES3_OPENGL());
>+                       ES3_OPENGL(),
>+                       ES2_VULKAN());
>diff --git a/Source/ThirdParty/ANGLE/src/tests/egl_tests/EGLDebugTest.cpp b/Source/ThirdParty/ANGLE/src/tests/egl_tests/EGLDebugTest.cpp
>new file mode 100644
>index 00000000000..5efdbcadf2b
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/tests/egl_tests/EGLDebugTest.cpp
>@@ -0,0 +1,191 @@
>+//
>+// Copyright (c) 2018 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// EGLDebugTest.cpp:
>+//   Tests of EGL_KHR_debug extension
>+
>+#include <gtest/gtest.h>
>+
>+#include "test_utils/ANGLETest.h"
>+#include "test_utils/angle_test_configs.h"
>+#include "util/EGLWindow.h"
>+
>+namespace angle
>+{
>+class EGLDebugTest : public ANGLETest
>+{
>+  protected:
>+    void TearDown() override
>+    {
>+        eglDebugMessageControlKHR(nullptr, nullptr);
>+        ANGLETest::TearDown();
>+    }
>+
>+    bool hasExtension() const { return IsEGLClientExtensionEnabled("EGL_KHR_debug"); }
>+
>+    static void EGLAPIENTRY StubCallback(EGLenum error,
>+                                         const char *command,
>+                                         EGLint messageType,
>+                                         EGLLabelKHR threadLabel,
>+                                         EGLLabelKHR objectLabel,
>+                                         const char *message)
>+    {}
>+
>+    static void EGLAPIENTRY CheckBadBindAPIError(EGLenum error,
>+                                                 const char *command,
>+                                                 EGLint messageType,
>+                                                 EGLLabelKHR threadLabel,
>+                                                 EGLLabelKHR objectLabel,
>+                                                 const char *message)
>+    {
>+        EXPECT_STREQ("eglBindAPI", command);
>+        ASSERT_EGLENUM_EQ(EGL_BAD_PARAMETER, error);
>+        EXPECT_STREQ("Thread", static_cast<const char *>(threadLabel));
>+    }
>+
>+    static EGLDEBUGPROCKHR EGLAttribToDebugCallback(EGLAttrib attrib)
>+    {
>+        return reinterpret_cast<EGLDEBUGPROCKHR>(static_cast<uintptr_t>(attrib));
>+    }
>+
>+    static EGLAttrib DebugCallbackToEGLAttrib(EGLDEBUGPROCKHR callback)
>+    {
>+        return static_cast<EGLAttrib>(reinterpret_cast<intptr_t>(callback));
>+    }
>+};
>+
>+// Test that the extension is always available (it is implemented in ANGLE's frontend).
>+TEST_P(EGLDebugTest, ExtensionAlwaysAvailable)
>+{
>+    ASSERT_TRUE(hasExtension());
>+}
>+
>+// Check that the default message filters and callbacks are correct
>+TEST_P(EGLDebugTest, DefaultParameters)
>+{
>+    ANGLE_SKIP_TEST_IF(!hasExtension());
>+
>+    EXPECT_EQ(static_cast<EGLint>(EGL_SUCCESS), eglDebugMessageControlKHR(nullptr, nullptr));
>+
>+    EGLAttrib result = 0;
>+
>+    EXPECT_EGL_TRUE(eglQueryDebugKHR(EGL_DEBUG_MSG_ERROR_KHR, &result));
>+    EXPECT_EGL_TRUE(result);
>+
>+    EXPECT_EGL_TRUE(eglQueryDebugKHR(EGL_DEBUG_MSG_WARN_KHR, &result));
>+    EXPECT_EGL_FALSE(result);
>+
>+    EXPECT_EGL_TRUE(eglQueryDebugKHR(EGL_DEBUG_MSG_INFO_KHR, &result));
>+    EXPECT_EGL_FALSE(result);
>+
>+    EXPECT_EGL_TRUE(eglQueryDebugKHR(EGL_DEBUG_CALLBACK_KHR, &result));
>+    EXPECT_EQ(nullptr, EGLAttribToDebugCallback(result));
>+}
>+
>+// Check that the message control and callback parameters can be set and then queried back
>+TEST_P(EGLDebugTest, SetMessageControl)
>+{
>+    ANGLE_SKIP_TEST_IF(!hasExtension());
>+
>+    EGLAttrib controls[] = {
>+        EGL_DEBUG_MSG_CRITICAL_KHR,
>+        EGL_FALSE,
>+        // EGL_DEBUG_MSG_ERROR_KHR left unset
>+        EGL_DEBUG_MSG_WARN_KHR,
>+        EGL_TRUE,
>+        EGL_DEBUG_MSG_INFO_KHR,
>+        EGL_FALSE,
>+        EGL_NONE,
>+        EGL_NONE,
>+    };
>+
>+    EXPECT_EQ(static_cast<EGLint>(EGL_SUCCESS), eglDebugMessageControlKHR(&StubCallback, controls));
>+
>+    EGLAttrib result = 0;
>+
>+    EXPECT_EGL_TRUE(eglQueryDebugKHR(EGL_DEBUG_MSG_CRITICAL_KHR, &result));
>+    EXPECT_EGL_FALSE(result);
>+
>+    EXPECT_EGL_TRUE(eglQueryDebugKHR(EGL_DEBUG_MSG_ERROR_KHR, &result));
>+    EXPECT_EGL_TRUE(result);
>+
>+    EXPECT_EGL_TRUE(eglQueryDebugKHR(EGL_DEBUG_MSG_WARN_KHR, &result));
>+    EXPECT_EGL_TRUE(result);
>+
>+    EXPECT_EGL_TRUE(eglQueryDebugKHR(EGL_DEBUG_MSG_INFO_KHR, &result));
>+    EXPECT_EGL_FALSE(result);
>+
>+    EXPECT_EGL_TRUE(eglQueryDebugKHR(EGL_DEBUG_CALLBACK_KHR, &result));
>+    EXPECT_EQ(DebugCallbackToEGLAttrib(&StubCallback), result);
>+}
>+
>+// Set a thread label and then trigger a callback to verify the callback parameters are correct
>+TEST_P(EGLDebugTest, CorrectCallbackParameters)
>+{
>+    ANGLE_SKIP_TEST_IF(!hasExtension());
>+
>+    EXPECT_EQ(static_cast<EGLint>(EGL_SUCCESS), eglDebugMessageControlKHR(nullptr, nullptr));
>+
>+    EXPECT_EQ(EGL_SUCCESS, eglLabelObjectKHR(EGL_NO_DISPLAY, EGL_OBJECT_THREAD_KHR, nullptr,
>+                                             const_cast<char *>("Thread")));
>+
>+    // Enable all messages
>+    EGLAttrib controls[] = {
>+        EGL_DEBUG_MSG_CRITICAL_KHR,
>+        EGL_TRUE,
>+        EGL_DEBUG_MSG_ERROR_KHR,
>+        EGL_TRUE,
>+        EGL_DEBUG_MSG_WARN_KHR,
>+        EGL_TRUE,
>+        EGL_DEBUG_MSG_INFO_KHR,
>+        EGL_TRUE,
>+        EGL_NONE,
>+        EGL_NONE,
>+    };
>+
>+    EXPECT_EQ(static_cast<EGLint>(EGL_SUCCESS),
>+              eglDebugMessageControlKHR(&CheckBadBindAPIError, controls));
>+
>+    // Generate an error and trigger the callback
>+    EXPECT_EGL_FALSE(eglBindAPI(0xBADDBADD));
>+}
>+
>+// Test that labels can be set and that errors are generated if the wrong object type is used
>+TEST_P(EGLDebugTest, SetLabel)
>+{
>+    ANGLE_SKIP_TEST_IF(!hasExtension());
>+
>+    EXPECT_EQ(static_cast<EGLint>(EGL_SUCCESS), eglDebugMessageControlKHR(nullptr, nullptr));
>+
>+    // Display display and object must be equal when setting a display label
>+    EXPECT_EQ(static_cast<EGLint>(EGL_SUCCESS),
>+              eglLabelObjectKHR(getEGLWindow()->getDisplay(), EGL_OBJECT_DISPLAY_KHR,
>+                                getEGLWindow()->getDisplay(), const_cast<char *>("Display")));
>+    EXPECT_NE(static_cast<EGLint>(EGL_SUCCESS),
>+              eglLabelObjectKHR(nullptr, EGL_OBJECT_DISPLAY_KHR, getEGLWindow()->getDisplay(),
>+                                const_cast<char *>("Display")));
>+
>+    //  Set a surface label
>+    EXPECT_EQ(static_cast<EGLint>(EGL_SUCCESS),
>+              eglLabelObjectKHR(getEGLWindow()->getDisplay(), EGL_OBJECT_SURFACE_KHR,
>+                                getEGLWindow()->getSurface(), const_cast<char *>("Surface")));
>+    EXPECT_EGL_ERROR(EGL_SUCCESS);
>+
>+    // Provide a surface but use an image label type
>+    EXPECT_EQ(static_cast<EGLint>(EGL_BAD_PARAMETER),
>+              eglLabelObjectKHR(getEGLWindow()->getDisplay(), EGL_OBJECT_IMAGE_KHR,
>+                                getEGLWindow()->getSurface(), const_cast<char *>("Image")));
>+    EXPECT_EGL_ERROR(EGL_BAD_PARAMETER);
>+}
>+
>+ANGLE_INSTANTIATE_TEST(EGLDebugTest,
>+                       ES2_D3D9(),
>+                       ES2_D3D11(),
>+                       ES3_D3D11(),
>+                       ES2_OPENGL(),
>+                       ES3_OPENGL(),
>+                       ES2_VULKAN());
>+
>+}  // namespace angle
>diff --git a/Source/ThirdParty/ANGLE/src/tests/egl_tests/EGLDeviceTest.cpp b/Source/ThirdParty/ANGLE/src/tests/egl_tests/EGLDeviceTest.cpp
>index 9cd96d10cc4..76138ee31d0 100644
>--- a/Source/ThirdParty/ANGLE/src/tests/egl_tests/EGLDeviceTest.cpp
>+++ b/Source/ThirdParty/ANGLE/src/tests/egl_tests/EGLDeviceTest.cpp
>@@ -5,22 +5,24 @@
> //
> 
> #ifndef ANGLE_ENABLE_D3D9
>-#define ANGLE_ENABLE_D3D9
>+#    define ANGLE_ENABLE_D3D9
> #endif
> 
> #ifndef ANGLE_ENABLE_D3D11
>-#define ANGLE_ENABLE_D3D11
>+#    define ANGLE_ENABLE_D3D11
> #endif
> 
> #include <d3d11.h>
> 
>-#include "com_utils.h"
>-#include "OSWindow.h"
> #include "test_utils/ANGLETest.h"
>+#include "util/EGLWindow.h"
>+#include "util/OSWindow.h"
>+#include "util/com_utils.h"
>+#include "util/gles_loader_autogen.h"
> 
> using namespace angle;
> 
>-class EGLDeviceCreationTest : public testing::Test
>+class EGLDeviceCreationTest : public EGLTest
> {
>   protected:
>     EGLDeviceCreationTest()
>@@ -35,11 +37,12 @@ class EGLDeviceCreationTest : public testing::Test
>           mSurface(EGL_NO_SURFACE),
>           mContext(EGL_NO_CONTEXT),
>           mConfig(0)
>-    {
>-    }
>+    {}
> 
>     void SetUp() override
>     {
>+        EGLTest::SetUp();
>+
>         mD3D11Module = LoadLibrary(TEXT("d3d11.dll"));
>         if (mD3D11Module == nullptr)
>         {
>@@ -73,7 +76,7 @@ class EGLDeviceCreationTest : public testing::Test
>         SafeRelease(mDevice);
>         SafeRelease(mDeviceContext);
> 
>-        SafeDelete(mOSWindow);
>+        OSWindow::Delete(&mOSWindow);
> 
>         if (mSurface != EGL_NO_SURFACE)
>         {
>@@ -131,11 +134,11 @@ class EGLDeviceCreationTest : public testing::Test
> 
>         // Choose a config
>         const EGLint configAttributes[] = {EGL_NONE};
>-        EGLint configCount = 0;
>+        EGLint configCount              = 0;
>         ASSERT_EGL_TRUE(eglChooseConfig(mDisplay, configAttributes, &mConfig, 1, &configCount));
> 
>         // Create an OS Window
>-        mOSWindow = CreateOSWindow();
>+        mOSWindow = OSWindow::New();
>         mOSWindow->initialize("EGLSurfaceTest", 64, 64);
> 
>         // Create window surface
>@@ -144,7 +147,7 @@ class EGLDeviceCreationTest : public testing::Test
> 
>         // Create EGL context
>         EGLint contextAttibutes[] = {EGL_CONTEXT_CLIENT_VERSION, 2, EGL_NONE};
>-        mContext = eglCreateContext(mDisplay, mConfig, nullptr, contextAttibutes);
>+        mContext                  = eglCreateContext(mDisplay, mConfig, nullptr, contextAttibutes);
>         ASSERT_EGL_SUCCESS();
> 
>         // Make the surface current
>@@ -230,13 +233,8 @@ TEST_F(EGLDeviceCreationTest, BasicD3D11DeviceViaFuncPointer)
> 
>     CreateD3D11Device();
> 
>-    PFNEGLCREATEDEVICEANGLEPROC createDeviceANGLE =
>-        (PFNEGLCREATEDEVICEANGLEPROC)eglGetProcAddress("eglCreateDeviceANGLE");
>-    PFNEGLRELEASEDEVICEANGLEPROC releaseDeviceANGLE =
>-        (PFNEGLRELEASEDEVICEANGLEPROC)eglGetProcAddress("eglReleaseDeviceANGLE");
>-
>     EGLDeviceEXT eglDevice =
>-        createDeviceANGLE(EGL_D3D11_DEVICE_ANGLE, reinterpret_cast<void *>(mDevice), nullptr);
>+        eglCreateDeviceANGLE(EGL_D3D11_DEVICE_ANGLE, reinterpret_cast<void *>(mDevice), nullptr);
>     ASSERT_NE(EGL_NO_DEVICE_EXT, eglDevice);
>     ASSERT_EGL_SUCCESS();
> 
>@@ -247,7 +245,7 @@ TEST_F(EGLDeviceCreationTest, BasicD3D11DeviceViaFuncPointer)
>     ID3D11Device *queriedDevice = reinterpret_cast<ID3D11Device *>(deviceAttrib);
>     ASSERT_EQ(mFeatureLevel, queriedDevice->GetFeatureLevel());
> 
>-    releaseDeviceANGLE(eglDevice);
>+    eglReleaseDeviceANGLE(eglDevice);
> }
> 
> // Test that creating a EGLDeviceEXT from D3D11 device works, and can be used for rendering
>@@ -339,7 +337,7 @@ TEST_F(EGLDeviceCreationTest, D3D11DeviceRecovery)
>     EGLAttrib newEglDevice = 0;
>     ASSERT_EGL_TRUE(eglQueryDisplayAttribEXT(mDisplay, EGL_DEVICE_EXT, &newEglDevice));
>     ASSERT_EGL_TRUE(eglQueryDeviceAttribEXT(reinterpret_cast<EGLDeviceEXT>(newEglDevice),
>-                                                EGL_D3D11_DEVICE_ANGLE, &device));
>+                                            EGL_D3D11_DEVICE_ANGLE, &device));
>     ID3D11Device *newDevice = reinterpret_cast<ID3D11Device *>(device);
> 
>     ASSERT_EQ(reinterpret_cast<EGLDeviceEXT>(newEglDevice), eglDevice);
>@@ -448,12 +446,7 @@ TEST_F(EGLDeviceCreationTest, AnyD3D9Device)
> class EGLDeviceQueryTest : public ANGLETest
> {
>   protected:
>-    EGLDeviceQueryTest()
>-    {
>-        mQueryDisplayAttribEXT = nullptr;
>-        mQueryDeviceAttribEXT  = nullptr;
>-        mQueryDeviceStringEXT  = nullptr;
>-    }
>+    EGLDeviceQueryTest() {}
> 
>     void SetUp() override
>     {
>@@ -461,29 +454,20 @@ class EGLDeviceQueryTest : public ANGLETest
> 
>         const char *extensionString =
>             static_cast<const char *>(eglQueryString(getEGLWindow()->getDisplay(), EGL_EXTENSIONS));
>-        if (strstr(extensionString, "EGL_EXT_device_query"))
>-        {
>-            mQueryDisplayAttribEXT =
>-                (PFNEGLQUERYDISPLAYATTRIBEXTPROC)eglGetProcAddress("eglQueryDisplayAttribEXT");
>-            mQueryDeviceAttribEXT =
>-                (PFNEGLQUERYDEVICEATTRIBEXTPROC)eglGetProcAddress("eglQueryDeviceAttribEXT");
>-            mQueryDeviceStringEXT =
>-                (PFNEGLQUERYDEVICESTRINGEXTPROC)eglGetProcAddress("eglQueryDeviceStringEXT");
>-        }
> 
>-        if (!mQueryDeviceStringEXT)
>+        if (!eglQueryDeviceStringEXT)
>         {
>             FAIL() << "ANGLE extension EGL_EXT_device_query export eglQueryDeviceStringEXT was not "
>                       "found";
>         }
> 
>-        if (!mQueryDisplayAttribEXT)
>+        if (!eglQueryDisplayAttribEXT)
>         {
>             FAIL() << "ANGLE extension EGL_EXT_device_query export eglQueryDisplayAttribEXT was "
>                       "not found";
>         }
> 
>-        if (!mQueryDeviceAttribEXT)
>+        if (!eglQueryDeviceAttribEXT)
>         {
>             FAIL() << "ANGLE extension EGL_EXT_device_query export eglQueryDeviceAttribEXT was not "
>                       "found";
>@@ -491,20 +475,14 @@ class EGLDeviceQueryTest : public ANGLETest
> 
>         EGLAttrib angleDevice = 0;
>         EXPECT_EGL_TRUE(
>-            mQueryDisplayAttribEXT(getEGLWindow()->getDisplay(), EGL_DEVICE_EXT, &angleDevice));
>+            eglQueryDisplayAttribEXT(getEGLWindow()->getDisplay(), EGL_DEVICE_EXT, &angleDevice));
>         extensionString = static_cast<const char *>(
>-            mQueryDeviceStringEXT(reinterpret_cast<EGLDeviceEXT>(angleDevice), EGL_EXTENSIONS));
>+            eglQueryDeviceStringEXT(reinterpret_cast<EGLDeviceEXT>(angleDevice), EGL_EXTENSIONS));
>         if (strstr(extensionString, "EGL_ANGLE_device_d3d") == nullptr)
>         {
>             FAIL() << "ANGLE extension EGL_ANGLE_device_d3d was not found";
>         }
>     }
>-
>-    void TearDown() override { ANGLETest::TearDown(); }
>-
>-    PFNEGLQUERYDISPLAYATTRIBEXTPROC mQueryDisplayAttribEXT;
>-    PFNEGLQUERYDEVICEATTRIBEXTPROC mQueryDeviceAttribEXT;
>-    PFNEGLQUERYDEVICESTRINGEXTPROC mQueryDeviceStringEXT;
> };
> 
> // This test attempts to obtain a D3D11 device and a D3D9 device using the eglQueryDeviceAttribEXT
>@@ -518,11 +496,11 @@ TEST_P(EGLDeviceQueryTest, QueryDevice)
>     if (getPlatformRenderer() == EGL_PLATFORM_ANGLE_TYPE_D3D11_ANGLE)
>     {
>         EXPECT_EGL_TRUE(
>-            mQueryDisplayAttribEXT(getEGLWindow()->getDisplay(), EGL_DEVICE_EXT, &angleDevice));
>-        EXPECT_EGL_TRUE(mQueryDeviceAttribEXT(reinterpret_cast<EGLDeviceEXT>(angleDevice),
>-                                              EGL_D3D11_DEVICE_ANGLE, &device));
>+            eglQueryDisplayAttribEXT(getEGLWindow()->getDisplay(), EGL_DEVICE_EXT, &angleDevice));
>+        EXPECT_EGL_TRUE(eglQueryDeviceAttribEXT(reinterpret_cast<EGLDeviceEXT>(angleDevice),
>+                                                EGL_D3D11_DEVICE_ANGLE, &device));
>         ID3D11Device *d3d11Device = reinterpret_cast<ID3D11Device *>(device);
>-        IDXGIDevice *dxgiDevice = DynamicCastComObject<IDXGIDevice>(d3d11Device);
>+        IDXGIDevice *dxgiDevice   = DynamicCastComObject<IDXGIDevice>(d3d11Device);
>         EXPECT_TRUE(dxgiDevice != nullptr);
>         SafeRelease(dxgiDevice);
>     }
>@@ -530,11 +508,11 @@ TEST_P(EGLDeviceQueryTest, QueryDevice)
>     if (getPlatformRenderer() == EGL_PLATFORM_ANGLE_TYPE_D3D9_ANGLE)
>     {
>         EXPECT_EGL_TRUE(
>-            mQueryDisplayAttribEXT(getEGLWindow()->getDisplay(), EGL_DEVICE_EXT, &angleDevice));
>-        EXPECT_EGL_TRUE(mQueryDeviceAttribEXT(reinterpret_cast<EGLDeviceEXT>(angleDevice),
>-                                              EGL_D3D9_DEVICE_ANGLE, &device));
>+            eglQueryDisplayAttribEXT(getEGLWindow()->getDisplay(), EGL_DEVICE_EXT, &angleDevice));
>+        EXPECT_EGL_TRUE(eglQueryDeviceAttribEXT(reinterpret_cast<EGLDeviceEXT>(angleDevice),
>+                                                EGL_D3D9_DEVICE_ANGLE, &device));
>         IDirect3DDevice9 *d3d9Device = reinterpret_cast<IDirect3DDevice9 *>(device);
>-        IDirect3D9 *d3d9 = nullptr;
>+        IDirect3D9 *d3d9             = nullptr;
>         EXPECT_EQ(S_OK, d3d9Device->GetDirect3D(&d3d9));
>         EXPECT_TRUE(d3d9 != nullptr);
>         SafeRelease(d3d9);
>@@ -552,17 +530,17 @@ TEST_P(EGLDeviceQueryTest, QueryDeviceBadAttribute)
>     if (getPlatformRenderer() == EGL_PLATFORM_ANGLE_TYPE_D3D11_ANGLE)
>     {
>         EXPECT_EGL_TRUE(
>-            mQueryDisplayAttribEXT(getEGLWindow()->getDisplay(), EGL_DEVICE_EXT, &angleDevice));
>-        EXPECT_EGL_FALSE(mQueryDeviceAttribEXT(reinterpret_cast<EGLDeviceEXT>(angleDevice),
>-                                               EGL_D3D9_DEVICE_ANGLE, &device));
>+            eglQueryDisplayAttribEXT(getEGLWindow()->getDisplay(), EGL_DEVICE_EXT, &angleDevice));
>+        EXPECT_EGL_FALSE(eglQueryDeviceAttribEXT(reinterpret_cast<EGLDeviceEXT>(angleDevice),
>+                                                 EGL_D3D9_DEVICE_ANGLE, &device));
>     }
> 
>     if (getPlatformRenderer() == EGL_PLATFORM_ANGLE_TYPE_D3D9_ANGLE)
>     {
>         EXPECT_EGL_TRUE(
>-            mQueryDisplayAttribEXT(getEGLWindow()->getDisplay(), EGL_DEVICE_EXT, &angleDevice));
>-        EXPECT_EGL_FALSE(mQueryDeviceAttribEXT(reinterpret_cast<EGLDeviceEXT>(angleDevice),
>-                                               EGL_D3D11_DEVICE_ANGLE, &device));
>+            eglQueryDisplayAttribEXT(getEGLWindow()->getDisplay(), EGL_DEVICE_EXT, &angleDevice));
>+        EXPECT_EGL_FALSE(eglQueryDeviceAttribEXT(reinterpret_cast<EGLDeviceEXT>(angleDevice),
>+                                                 EGL_D3D11_DEVICE_ANGLE, &device));
>     }
> }
> 
>@@ -571,11 +549,11 @@ TEST_P(EGLDeviceQueryTest, QueryDeviceBadAttribute)
> //    - extracting the EGLDeviceEXT from the EGLDisplay
> //    - calling getPlatformDisplayEXT with this EGLDeviceEXT
> // results in the same EGLDisplay being returned from getPlatformDisplayEXT both times
>-TEST_P(EGLDeviceQueryTest, getPlatformDisplayDeviceReuse)
>+TEST_P(EGLDeviceQueryTest, GetPlatformDisplayDeviceReuse)
> {
>     EGLAttrib eglDevice = 0;
>     EXPECT_EGL_TRUE(
>-              eglQueryDisplayAttribEXT(getEGLWindow()->getDisplay(), EGL_DEVICE_EXT, &eglDevice));
>+        eglQueryDisplayAttribEXT(getEGLWindow()->getDisplay(), EGL_DEVICE_EXT, &eglDevice));
> 
>     EGLDisplay display2 = eglGetPlatformDisplayEXT(
>         EGL_PLATFORM_DEVICE_EXT, reinterpret_cast<EGLDeviceEXT>(eglDevice), nullptr);
>diff --git a/Source/ThirdParty/ANGLE/src/tests/egl_tests/EGLDirectCompositionTest.cpp b/Source/ThirdParty/ANGLE/src/tests/egl_tests/EGLDirectCompositionTest.cpp
>new file mode 100644
>index 00000000000..d9a427c465b
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/tests/egl_tests/EGLDirectCompositionTest.cpp
>@@ -0,0 +1,293 @@
>+//
>+// Copyright 2018 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+
>+// EGLDirectCompositionTest.cpp:
>+//   Tests pertaining to DirectComposition and WindowsUIComposition.
>+
>+#include <d3d11.h>
>+#include "test_utils/ANGLETest.h"
>+
>+#include <DispatcherQueue.h>
>+#include <VersionHelpers.h>
>+#include <Windows.Foundation.h>
>+#include <windows.ui.composition.Desktop.h>
>+#include <windows.ui.composition.h>
>+#include <windows.ui.composition.interop.h>
>+#include <wrl.h>
>+#include <memory>
>+
>+#include "libANGLE/renderer/d3d/d3d11/converged/CompositorNativeWindow11.h"
>+#include "test_utils/ANGLETest.h"
>+#include "util/OSWindow.h"
>+#include "util/com_utils.h"
>+
>+using namespace angle;
>+using namespace ABI::Windows::System;
>+using namespace ABI::Windows::UI::Composition;
>+using namespace ABI::Windows::UI::Composition::Desktop;
>+using namespace ABI::Windows::Foundation;
>+using namespace Microsoft::WRL;
>+using namespace Microsoft::WRL::Wrappers;
>+
>+const int WINDOWWIDTH = 200, WINDOWHEIGHT = 200;
>+
>+class EGLDirectCompositionTest : public ANGLETest
>+{
>+  protected:
>+    EGLDirectCompositionTest() : mOSWindow(nullptr) {}
>+
>+    void SetUp() override
>+    {
>+        if (!mRoHelper.SupportedWindowsRelease())
>+        {
>+            return;
>+        }
>+
>+        // Create an OS Window
>+        mOSWindow = OSWindow::New();
>+
>+        mOSWindow->initialize("EGLDirectCompositionTest", WINDOWWIDTH, WINDOWHEIGHT);
>+        auto nativeWindow = mOSWindow->getNativeWindow();
>+        mOSWindow->setVisible(true);
>+
>+        // Create DispatcherQueue for window to process compositor callbacks
>+        CreateDispatcherQueue(mDispatcherController);
>+
>+        HSTRING act;
>+        HSTRING_HEADER header;
>+
>+        auto hr = mRoHelper.GetStringReference(RuntimeClass_Windows_UI_Composition_Compositor, &act,
>+                                               &header);
>+
>+        ASSERT_TRUE(SUCCEEDED(hr));
>+
>+        void *fac = nullptr;
>+        hr        = mRoHelper.GetActivationFactory(act, __uuidof(IActivationFactory), &fac);
>+        ASSERT_TRUE(SUCCEEDED(hr));
>+
>+        ComPtr<IActivationFactory> compositorFactory;
>+
>+        compositorFactory.Attach((IActivationFactory *)fac);
>+
>+        hr = compositorFactory->ActivateInstance(&mCompositor);
>+        ASSERT_TRUE(SUCCEEDED(hr));
>+
>+        // Create a DesktopWindowTarget against native window (HWND)
>+        CreateDesktopWindowTarget(mCompositor, static_cast<HWND>(nativeWindow), mDesktopTarget);
>+
>+        ASSERT_TRUE(SUCCEEDED(mCompositor->CreateSpriteVisual(mAngleHost.GetAddressOf())));
>+
>+        ComPtr<IVisual> angleVis;
>+        ASSERT_TRUE(SUCCEEDED(mAngleHost.As(&angleVis)));
>+
>+        ASSERT_TRUE(SUCCEEDED(angleVis->put_Size(
>+            {static_cast<FLOAT>(WINDOWWIDTH), static_cast<FLOAT>(WINDOWHEIGHT)})));
>+
>+        ASSERT_TRUE(SUCCEEDED(angleVis->put_Offset({0, 0, 0})));
>+
>+        ComPtr<ICompositionTarget> compTarget;
>+        ASSERT_TRUE(SUCCEEDED(mDesktopTarget.As(&compTarget)));
>+        ASSERT_TRUE(SUCCEEDED(compTarget->put_Root(angleVis.Get())));
>+
>+        Init();
>+    }
>+
>+    void CreateDispatcherQueue(ComPtr<IDispatcherQueueController> &controller)
>+    {
>+        DispatcherQueueOptions options{sizeof(DispatcherQueueOptions), DQTYPE_THREAD_CURRENT,
>+                                       DQTAT_COM_STA};
>+
>+        auto hr = mRoHelper.CreateDispatcherQueueController(options, controller.GetAddressOf());
>+
>+        ASSERT_TRUE(SUCCEEDED(hr));
>+    }
>+
>+    void CreateDesktopWindowTarget(ComPtr<ICompositor> const &compositor,
>+                                   const HWND window,
>+                                   ComPtr<IDesktopWindowTarget> &target)
>+    {
>+        namespace abi = ABI::Windows::UI::Composition::Desktop;
>+
>+        ComPtr<ICompositorDesktopInterop> interop;
>+        ASSERT_TRUE(SUCCEEDED(compositor.As(&interop)));
>+
>+        ASSERT_TRUE(SUCCEEDED(interop->CreateDesktopWindowTarget(
>+            window, true, reinterpret_cast<abi::IDesktopWindowTarget **>(target.GetAddressOf()))));
>+    }
>+
>+    void Init()
>+    {
>+        if (!mRoHelper.SupportedWindowsRelease())
>+        {
>+            return;
>+        }
>+
>+        DPI_AWARENESS_CONTEXT
>+        WINAPI
>+        SetThreadDpiAwarenessContext(_In_ DPI_AWARENESS_CONTEXT dpiContext);
>+
>+        auto userModule = LoadLibraryA("user32.dll");
>+
>+        if (userModule == nullptr)
>+        {
>+            return;
>+        }
>+
>+        auto temp = GetProcAddress(userModule, "SetThreadDpiAwarenessContext");
>+
>+        mFpSetThreadDpiAwarenessContext = reinterpret_cast<_SetThreadDpiAwarenessContext *>(temp);
>+
>+        const EGLint configAttributes[] = {
>+            EGL_RED_SIZE,   8, EGL_GREEN_SIZE,   8, EGL_BLUE_SIZE, 8, EGL_ALPHA_SIZE, 8,
>+            EGL_DEPTH_SIZE, 8, EGL_STENCIL_SIZE, 8, EGL_NONE};
>+
>+        const EGLint defaultDisplayAttributes[] = {
>+            EGL_PLATFORM_ANGLE_TYPE_ANGLE,
>+            EGL_PLATFORM_ANGLE_TYPE_D3D11_ANGLE,
>+            EGL_NONE,
>+        };
>+
>+        PFNEGLGETPLATFORMDISPLAYEXTPROC eglGetPlatformDisplayEXT =
>+            reinterpret_cast<PFNEGLGETPLATFORMDISPLAYEXTPROC>(
>+                eglGetProcAddress("eglGetPlatformDisplayEXT"));
>+        ASSERT_TRUE(eglGetPlatformDisplayEXT != nullptr);
>+
>+        mEglDisplay = eglGetPlatformDisplayEXT(EGL_PLATFORM_ANGLE_ANGLE,
>+                                               reinterpret_cast<void *>(EGL_DEFAULT_DISPLAY),
>+                                               defaultDisplayAttributes);
>+        ASSERT_TRUE(mEglDisplay != EGL_NO_DISPLAY);
>+
>+        ASSERT_EGL_TRUE(eglInitialize(mEglDisplay, nullptr, nullptr));
>+
>+        EGLint nConfigs = 0;
>+
>+        ASSERT_EGL_TRUE(eglGetConfigs(mEglDisplay, nullptr, 0, &nConfigs));
>+        ASSERT_TRUE(nConfigs != 0);
>+
>+        ASSERT_EGL_TRUE(eglChooseConfig(mEglDisplay, configAttributes, &mEglConfig, 1, &nConfigs));
>+    }
>+
>+    void CreateSurface(ComPtr<ABI::Windows::UI::Composition::ISpriteVisual> visual,
>+                       EGLSurface &surface)
>+    {
>+        auto displayExtensions = eglQueryString(mEglDisplay, EGL_EXTENSIONS);
>+
>+        // Check that the EGL_ANGLE_windows_ui_composition display extension is available
>+        ASSERT_TRUE(strstr(displayExtensions, "EGL_ANGLE_windows_ui_composition") != nullptr);
>+
>+        const EGLint contextAttributes[] = {EGL_CONTEXT_CLIENT_VERSION, 2, EGL_NONE};
>+
>+        // Use a spritevisual as the nativewindowtype
>+        surface =
>+            eglCreateWindowSurface(mEglDisplay, mEglConfig,
>+                                   static_cast<EGLNativeWindowType>((void *)visual.Get()), nullptr);
>+        ASSERT_TRUE(surface != EGL_NO_SURFACE);
>+
>+        mEglContext = eglCreateContext(mEglDisplay, mEglConfig, EGL_NO_CONTEXT, contextAttributes);
>+        ASSERT_TRUE(mEglContext != EGL_NO_CONTEXT);
>+
>+        ASSERT_TRUE(eglMakeCurrent(mEglDisplay, surface, surface, mEglContext) != EGL_FALSE);
>+    }
>+
>+    void TearDown() override
>+    {
>+        if (!mRoHelper.SupportedWindowsRelease())
>+        {
>+            return;
>+        }
>+        ASSERT_EGL_TRUE(eglTerminate(mEglDisplay));
>+
>+        OSWindow::Delete(&mOSWindow);
>+    }
>+
>+    OSWindow *mOSWindow;
>+    ComPtr<ICompositor> mCompositor;
>+    ComPtr<IDispatcherQueueController> mDispatcherController;
>+    ComPtr<ICompositionColorBrush> mColorBrush;
>+    ComPtr<IDesktopWindowTarget> mDesktopTarget;
>+    ComPtr<ISpriteVisual> mAngleHost;
>+
>+    EGLDisplay mEglDisplay;
>+    EGLContext mEglContext;
>+    EGLConfig mEglConfig;
>+    rx::RoHelper mRoHelper;
>+
>+    using _SetThreadDpiAwarenessContext =
>+        DPI_AWARENESS_CONTEXT WINAPI(DPI_AWARENESS_CONTEXT dpiContext);
>+
>+    _SetThreadDpiAwarenessContext *mFpSetThreadDpiAwarenessContext;
>+};
>+
>+// This tests that a surface created using a SpriteVisual as container has the expected dimensions
>+// which should match the dimensions of the SpriteVisual passed in
>+TEST_P(EGLDirectCompositionTest, SurfaceSizeFromSpriteSize)
>+{
>+    // Only attempt this test when on Windows 10 1803+
>+    ANGLE_SKIP_TEST_IF(!mRoHelper.SupportedWindowsRelease());
>+
>+    EGLSurface s{nullptr};
>+    CreateSurface(mAngleHost, s);
>+
>+    EGLint surfacewidth = 0, surfaceheight = 0;
>+    eglQuerySurface(mEglDisplay, s, EGL_WIDTH, &surfacewidth);
>+    eglQuerySurface(mEglDisplay, s, EGL_HEIGHT, &surfaceheight);
>+
>+    ComPtr<IVisual> angleVis;
>+    ASSERT_TRUE(SUCCEEDED(mAngleHost.As(&angleVis)));
>+
>+    ABI::Windows::Foundation::Numerics::Vector2 visualsize{0, 0};
>+
>+    ASSERT_TRUE(SUCCEEDED(angleVis->get_Size(&visualsize)));
>+
>+    ASSERT_TRUE(surfacewidth == static_cast<int>(visualsize.X));
>+    ASSERT_TRUE(surfaceheight == static_cast<int>(visualsize.Y));
>+
>+    ASSERT_EGL_TRUE(eglDestroySurface(mEglDisplay, s));
>+    ASSERT_EGL_TRUE(eglDestroyContext(mEglDisplay, mEglContext));
>+}
>+
>+// This tests that a WindowSurface can be created using a SpriteVisual as the containing window
>+// and that pixels can be successfully rendered into the resulting WindowSurface
>+TEST_P(EGLDirectCompositionTest, RenderSolidColor)
>+{
>+    // Only attempt this test when on Windows 10 1803+
>+    ANGLE_SKIP_TEST_IF(!mRoHelper.SupportedWindowsRelease());
>+
>+    EGLSurface s{nullptr};
>+    CreateSurface(mAngleHost, s);
>+
>+    glClearColor(0.0f, 0.0f, 1.0f, 1.0f);
>+
>+    glViewport(0, 0, WINDOWWIDTH, WINDOWHEIGHT);
>+    glClear(GL_COLOR_BUFFER_BIT);
>+
>+    ASSERT_EGL_TRUE(eglSwapBuffers(mEglDisplay, s));
>+
>+    // ensure user/DWM have a chance to paint the window and kick it to the top of the desktop
>+    // zorder before we attempt to sample
>+    angle::Sleep(200);
>+    mOSWindow->messageLoop();
>+
>+    uint8_t *pixelBuffer = static_cast<uint8_t *>(malloc(WINDOWWIDTH * WINDOWHEIGHT * 4));
>+    ZeroMemory(pixelBuffer, WINDOWWIDTH * WINDOWHEIGHT * 4);
>+
>+    // In order to accurately capture a bitmap, we need to temporarily shift into per-monitor DPI
>+    // mode in order to get the window offset from desktop correct
>+    auto previous = mFpSetThreadDpiAwarenessContext(DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE);
>+    bool success  = mOSWindow->takeScreenshot(pixelBuffer);
>+    mFpSetThreadDpiAwarenessContext(previous);
>+    ASSERT_EGL_TRUE(success);
>+
>+    ASSERT_EGL_TRUE(pixelBuffer[(50 * 50 * 4)] == 255);
>+    ASSERT_EGL_TRUE(pixelBuffer[(50 * 50 * 4) + 1] == 0);
>+    ASSERT_EGL_TRUE(pixelBuffer[(50 * 50 * 4) + 2] == 0);
>+    ASSERT_EGL_TRUE(pixelBuffer[(50 * 50 * 4) + 3] == 255);
>+
>+    ASSERT_EGL_TRUE(eglDestroySurface(mEglDisplay, s));
>+    ASSERT_EGL_TRUE(eglDestroyContext(mEglDisplay, mEglContext));
>+}
>+
>+ANGLE_INSTANTIATE_TEST(EGLDirectCompositionTest, ES2_D3D11());
>diff --git a/Source/ThirdParty/ANGLE/src/tests/egl_tests/EGLIOSurfaceClientBufferTest.cpp b/Source/ThirdParty/ANGLE/src/tests/egl_tests/EGLIOSurfaceClientBufferTest.cpp
>new file mode 100644
>index 00000000000..150d5f10357
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/tests/egl_tests/EGLIOSurfaceClientBufferTest.cpp
>@@ -0,0 +1,733 @@
>+//
>+// Copyright 2017 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+//    EGLIOSurfaceClientBufferTest.cpp: tests for the EGL_ANGLE_iosurface_client_buffer extension.
>+//
>+
>+#include "test_utils/ANGLETest.h"
>+
>+#include "common/mathutil.h"
>+#include "test_utils/gl_raii.h"
>+#include "util/EGLWindow.h"
>+
>+#include <CoreFoundation/CoreFoundation.h>
>+#include <IOSurface/IOSurface.h>
>+
>+using namespace angle;
>+
>+namespace
>+{
>+
>+void AddIntegerValue(CFMutableDictionaryRef dictionary, const CFStringRef key, int32_t value)
>+{
>+    CFNumberRef number = CFNumberCreate(nullptr, kCFNumberSInt32Type, &value);
>+    CFDictionaryAddValue(dictionary, key, number);
>+    CFRelease(number);
>+}
>+
>+class ScopedIOSurfaceRef : angle::NonCopyable
>+{
>+  public:
>+    explicit ScopedIOSurfaceRef(IOSurfaceRef surface) : mSurface(surface) {}
>+
>+    ~ScopedIOSurfaceRef()
>+    {
>+        if (mSurface != nullptr)
>+        {
>+            CFRelease(mSurface);
>+            mSurface = nullptr;
>+        }
>+    }
>+
>+    IOSurfaceRef get() const { return mSurface; }
>+
>+    ScopedIOSurfaceRef(ScopedIOSurfaceRef &&other)
>+    {
>+        if (mSurface != nullptr)
>+        {
>+            CFRelease(mSurface);
>+        }
>+        mSurface       = other.mSurface;
>+        other.mSurface = nullptr;
>+    }
>+
>+    ScopedIOSurfaceRef &operator=(ScopedIOSurfaceRef &&other)
>+    {
>+        if (mSurface != nullptr)
>+        {
>+            CFRelease(mSurface);
>+        }
>+        mSurface       = other.mSurface;
>+        other.mSurface = nullptr;
>+
>+        return *this;
>+    }
>+
>+  private:
>+    IOSurfaceRef mSurface = nullptr;
>+};
>+
>+ScopedIOSurfaceRef CreateSinglePlaneIOSurface(int width,
>+                                              int height,
>+                                              int32_t format,
>+                                              int bytesPerElement)
>+{
>+    CFMutableDictionaryRef dict = CFDictionaryCreateMutable(
>+        kCFAllocatorDefault, 0, &kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks);
>+    AddIntegerValue(dict, kIOSurfaceWidth, width);
>+    AddIntegerValue(dict, kIOSurfaceHeight, height);
>+    AddIntegerValue(dict, kIOSurfacePixelFormat, format);
>+    AddIntegerValue(dict, kIOSurfaceBytesPerElement, bytesPerElement);
>+
>+    IOSurfaceRef ioSurface = IOSurfaceCreate(dict);
>+    EXPECT_NE(nullptr, ioSurface);
>+    CFRelease(dict);
>+
>+    return ScopedIOSurfaceRef(ioSurface);
>+}
>+
>+}  // anonymous namespace
>+
>+class IOSurfaceClientBufferTest : public ANGLETest
>+{
>+  protected:
>+    IOSurfaceClientBufferTest() : mConfig(0), mDisplay(nullptr) {}
>+
>+    void SetUp() override
>+    {
>+        ANGLETest::SetUp();
>+
>+        mConfig  = getEGLWindow()->getConfig();
>+        mDisplay = getEGLWindow()->getDisplay();
>+    }
>+
>+    void TearDown() override { ANGLETest::TearDown(); }
>+
>+    void createIOSurfacePbuffer(const ScopedIOSurfaceRef &ioSurface,
>+                                EGLint width,
>+                                EGLint height,
>+                                EGLint plane,
>+                                GLenum internalFormat,
>+                                GLenum type,
>+                                EGLSurface *pbuffer) const
>+    {
>+        // clang-format off
>+        const EGLint attribs[] = {
>+            EGL_WIDTH,                         width,
>+            EGL_HEIGHT,                        height,
>+            EGL_IOSURFACE_PLANE_ANGLE,         plane,
>+            EGL_TEXTURE_TARGET,                EGL_TEXTURE_RECTANGLE_ANGLE,
>+            EGL_TEXTURE_INTERNAL_FORMAT_ANGLE, internalFormat,
>+            EGL_TEXTURE_FORMAT,                EGL_TEXTURE_RGBA,
>+            EGL_TEXTURE_TYPE_ANGLE,            type,
>+            EGL_NONE,                          EGL_NONE,
>+        };
>+        // clang-format on
>+
>+        *pbuffer = eglCreatePbufferFromClientBuffer(mDisplay, EGL_IOSURFACE_ANGLE, ioSurface.get(),
>+                                                    mConfig, attribs);
>+        EXPECT_NE(EGL_NO_SURFACE, *pbuffer);
>+    }
>+
>+    void bindIOSurfaceToTexture(const ScopedIOSurfaceRef &ioSurface,
>+                                EGLint width,
>+                                EGLint height,
>+                                EGLint plane,
>+                                GLenum internalFormat,
>+                                GLenum type,
>+                                EGLSurface *pbuffer,
>+                                GLTexture *texture) const
>+    {
>+        createIOSurfacePbuffer(ioSurface, width, height, plane, internalFormat, type, pbuffer);
>+
>+        // Bind the pbuffer
>+        glBindTexture(GL_TEXTURE_RECTANGLE_ANGLE, *texture);
>+        EGLBoolean result = eglBindTexImage(mDisplay, *pbuffer, EGL_BACK_BUFFER);
>+        EXPECT_EGL_TRUE(result);
>+        EXPECT_EGL_SUCCESS();
>+    }
>+
>+    void doClearTest(const ScopedIOSurfaceRef &ioSurface,
>+                     GLenum internalFormat,
>+                     GLenum type,
>+                     void *data,
>+                     size_t dataSize)
>+    {
>+        // Bind the IOSurface to a texture and clear it.
>+        EGLSurface pbuffer;
>+        GLTexture texture;
>+        bindIOSurfaceToTexture(ioSurface, 1, 1, 0, internalFormat, type, &pbuffer, &texture);
>+
>+        GLFramebuffer fbo;
>+        glBindFramebuffer(GL_FRAMEBUFFER, fbo);
>+        EXPECT_GL_NO_ERROR();
>+        glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_RECTANGLE_ANGLE,
>+                               texture, 0);
>+        EXPECT_GL_NO_ERROR();
>+        EXPECT_GLENUM_EQ(glCheckFramebufferStatus(GL_FRAMEBUFFER), GL_FRAMEBUFFER_COMPLETE);
>+        EXPECT_GL_NO_ERROR();
>+
>+        glClearColor(1.0f / 255.0f, 2.0f / 255.0f, 3.0f / 255.0f, 4.0f / 255.0f);
>+        EXPECT_GL_NO_ERROR();
>+        glClear(GL_COLOR_BUFFER_BIT);
>+        EXPECT_GL_NO_ERROR();
>+
>+        // Unbind pbuffer and check content.
>+        EGLBoolean result = eglReleaseTexImage(mDisplay, pbuffer, EGL_BACK_BUFFER);
>+        EXPECT_EGL_TRUE(result);
>+        EXPECT_EGL_SUCCESS();
>+
>+        IOSurfaceLock(ioSurface.get(), kIOSurfaceLockReadOnly, nullptr);
>+        ASSERT_EQ(0, memcmp(IOSurfaceGetBaseAddress(ioSurface.get()), data, dataSize));
>+        IOSurfaceUnlock(ioSurface.get(), kIOSurfaceLockReadOnly, nullptr);
>+
>+        result = eglDestroySurface(mDisplay, pbuffer);
>+        EXPECT_EGL_TRUE(result);
>+        EXPECT_EGL_SUCCESS();
>+    }
>+
>+    enum ColorMask
>+    {
>+        R = 1,
>+        G = 2,
>+        B = 4,
>+        A = 8,
>+    };
>+    void doSampleTest(const ScopedIOSurfaceRef &ioSurface,
>+                      GLenum internalFormat,
>+                      GLenum type,
>+                      void *data,
>+                      size_t dataSize,
>+                      int mask)
>+    {
>+        // Write the data to the IOSurface
>+        IOSurfaceLock(ioSurface.get(), 0, nullptr);
>+        memcpy(IOSurfaceGetBaseAddress(ioSurface.get()), data, dataSize);
>+        IOSurfaceUnlock(ioSurface.get(), 0, nullptr);
>+
>+        // Bind the IOSurface to a texture and clear it.
>+        EGLSurface pbuffer;
>+        GLTexture texture;
>+        bindIOSurfaceToTexture(ioSurface, 1, 1, 0, internalFormat, type, &pbuffer, &texture);
>+
>+        constexpr char kVS[] =
>+            "attribute vec4 position;\n"
>+            "void main()\n"
>+            "{\n"
>+            "    gl_Position = vec4(position.xy, 0.0, 1.0);\n"
>+            "}\n";
>+
>+        constexpr char kFS[] =
>+            "#extension GL_ARB_texture_rectangle : require\n"
>+            "precision mediump float;\n"
>+            "uniform sampler2DRect tex;\n"
>+            "void main()\n"
>+            "{\n"
>+            "    gl_FragColor = texture2DRect(tex, vec2(0, 0));\n"
>+            "}\n";
>+
>+        ANGLE_GL_PROGRAM(program, kVS, kFS);
>+        glUseProgram(program);
>+
>+        GLint location = glGetUniformLocation(program, "tex");
>+        ASSERT_NE(-1, location);
>+        glUniform1i(location, 0);
>+
>+        glClearColor(0.0, 0.0, 0.0, 0.0);
>+        glClear(GL_COLOR_BUFFER_BIT);
>+        drawQuad(program, "position", 0.5f, 1.0f, false);
>+
>+        GLColor expectedColor((mask & R) ? 1 : 0, (mask & G) ? 2 : 0, (mask & B) ? 3 : 0,
>+                              (mask & A) ? 4 : 255);
>+        EXPECT_PIXEL_COLOR_EQ(0, 0, expectedColor);
>+        ASSERT_GL_NO_ERROR();
>+    }
>+
>+    EGLConfig mConfig;
>+    EGLDisplay mDisplay;
>+};
>+
>+// Test using BGRA8888 IOSurfaces for rendering
>+TEST_P(IOSurfaceClientBufferTest, RenderToBGRA8888IOSurface)
>+{
>+    ScopedIOSurfaceRef ioSurface = CreateSinglePlaneIOSurface(1, 1, 'BGRA', 4);
>+
>+    GLColor color(3, 2, 1, 4);
>+    doClearTest(ioSurface, GL_BGRA_EXT, GL_UNSIGNED_BYTE, &color, sizeof(color));
>+}
>+
>+// Test reading from BGRA8888 IOSurfaces
>+TEST_P(IOSurfaceClientBufferTest, ReadFromBGRA8888IOSurface)
>+{
>+    ScopedIOSurfaceRef ioSurface = CreateSinglePlaneIOSurface(1, 1, 'BGRA', 4);
>+
>+    GLColor color(3, 2, 1, 4);
>+    doSampleTest(ioSurface, GL_BGRA_EXT, GL_UNSIGNED_BYTE, &color, sizeof(color), R | G | B | A);
>+}
>+
>+// Test using RG88 IOSurfaces for rendering
>+TEST_P(IOSurfaceClientBufferTest, RenderToRG88IOSurface)
>+{
>+    ScopedIOSurfaceRef ioSurface = CreateSinglePlaneIOSurface(1, 1, '2C08', 2);
>+
>+    uint8_t color[2] = {1, 2};
>+    doClearTest(ioSurface, GL_RG, GL_UNSIGNED_BYTE, &color, sizeof(color));
>+}
>+
>+// Test reading from RG88 IOSurfaces
>+TEST_P(IOSurfaceClientBufferTest, ReadFromRG88IOSurface)
>+{
>+    ScopedIOSurfaceRef ioSurface = CreateSinglePlaneIOSurface(1, 1, '2C08', 2);
>+
>+    uint8_t color[2] = {1, 2};
>+    doSampleTest(ioSurface, GL_RG, GL_UNSIGNED_BYTE, &color, sizeof(color), R | G);
>+}
>+
>+// Test using R8 IOSurfaces for rendering
>+TEST_P(IOSurfaceClientBufferTest, RenderToR8IOSurface)
>+{
>+    ScopedIOSurfaceRef ioSurface = CreateSinglePlaneIOSurface(1, 1, 'L008', 1);
>+
>+    uint8_t color = 1;
>+    doClearTest(ioSurface, GL_RED, GL_UNSIGNED_BYTE, &color, sizeof(color));
>+}
>+
>+// Test reading from R8 IOSurfaces
>+TEST_P(IOSurfaceClientBufferTest, ReadFromR8IOSurface)
>+{
>+    ScopedIOSurfaceRef ioSurface = CreateSinglePlaneIOSurface(1, 1, 'L008', 1);
>+
>+    uint8_t color = 1;
>+    doSampleTest(ioSurface, GL_RED, GL_UNSIGNED_BYTE, &color, sizeof(color), R);
>+}
>+
>+// Test using R16 IOSurfaces for rendering
>+TEST_P(IOSurfaceClientBufferTest, RenderToR16IOSurface)
>+{
>+    // HACK(cwallez@chromium.org) 'L016' doesn't seem to be an official pixel format but it works
>+    // sooooooo let's test using it
>+    ScopedIOSurfaceRef ioSurface = CreateSinglePlaneIOSurface(1, 1, 'L016', 2);
>+
>+    uint16_t color = 257;
>+    doClearTest(ioSurface, GL_R16UI, GL_UNSIGNED_SHORT, &color, sizeof(color));
>+}
>+// TODO(cwallez@chromium.org): test reading from R16? It returns 0 maybe because samplerRect is
>+// only for floating textures?
>+
>+// TODO(cwallez@chromium.org): Test using RGBA half float IOSurfaces ('RGhA')
>+
>+// Test the validation errors for missing attributes for eglCreatePbufferFromClientBuffer with
>+// IOSurface
>+TEST_P(IOSurfaceClientBufferTest, NegativeValidationMissingAttributes)
>+{
>+    ScopedIOSurfaceRef ioSurface = CreateSinglePlaneIOSurface(10, 10, 'BGRA', 4);
>+
>+    // Success case
>+    {
>+        // clang-format off
>+        const EGLint attribs[] = {
>+            EGL_WIDTH,                         10,
>+            EGL_HEIGHT,                        10,
>+            EGL_IOSURFACE_PLANE_ANGLE,         0,
>+            EGL_TEXTURE_TARGET,                EGL_TEXTURE_RECTANGLE_ANGLE,
>+            EGL_TEXTURE_INTERNAL_FORMAT_ANGLE, GL_BGRA_EXT,
>+            EGL_TEXTURE_FORMAT,                EGL_TEXTURE_RGBA,
>+            EGL_TEXTURE_TYPE_ANGLE,            GL_UNSIGNED_BYTE,
>+            EGL_NONE,                          EGL_NONE,
>+        };
>+        // clang-format off
>+
>+        EGLSurface pbuffer = eglCreatePbufferFromClientBuffer(mDisplay, EGL_IOSURFACE_ANGLE, ioSurface.get(), mConfig, attribs);
>+        EXPECT_NE(EGL_NO_SURFACE, pbuffer);
>+
>+        EGLBoolean result = eglDestroySurface(mDisplay, pbuffer);
>+        EXPECT_EGL_TRUE(result);
>+        EXPECT_EGL_SUCCESS();
>+    }
>+
>+    // Missing EGL_WIDTH
>+    {
>+        // clang-format off
>+        const EGLint attribs[] = {
>+            EGL_HEIGHT,                        10,
>+            EGL_IOSURFACE_PLANE_ANGLE,         0,
>+            EGL_TEXTURE_TARGET,                EGL_TEXTURE_RECTANGLE_ANGLE,
>+            EGL_TEXTURE_INTERNAL_FORMAT_ANGLE, GL_BGRA_EXT,
>+            EGL_TEXTURE_FORMAT,                EGL_TEXTURE_RGBA,
>+            EGL_TEXTURE_TYPE_ANGLE,            GL_UNSIGNED_BYTE,
>+            EGL_NONE,                          EGL_NONE,
>+        };
>+        // clang-format on
>+
>+        EGLSurface pbuffer = eglCreatePbufferFromClientBuffer(mDisplay, EGL_IOSURFACE_ANGLE,
>+                                                              ioSurface.get(), mConfig, attribs);
>+        EXPECT_EQ(EGL_NO_SURFACE, pbuffer);
>+        EXPECT_EGL_ERROR(EGL_BAD_PARAMETER);
>+    }
>+
>+    // Missing EGL_HEIGHT
>+    {
>+        // clang-format off
>+        const EGLint attribs[] = {
>+            EGL_WIDTH,                         10,
>+            EGL_IOSURFACE_PLANE_ANGLE,         0,
>+            EGL_TEXTURE_TARGET,                EGL_TEXTURE_RECTANGLE_ANGLE,
>+            EGL_TEXTURE_INTERNAL_FORMAT_ANGLE, GL_BGRA_EXT,
>+            EGL_TEXTURE_FORMAT,                EGL_TEXTURE_RGBA,
>+            EGL_TEXTURE_TYPE_ANGLE,            GL_UNSIGNED_BYTE,
>+            EGL_NONE,                          EGL_NONE,
>+        };
>+        // clang-format on
>+
>+        EGLSurface pbuffer = eglCreatePbufferFromClientBuffer(mDisplay, EGL_IOSURFACE_ANGLE,
>+                                                              ioSurface.get(), mConfig, attribs);
>+        EXPECT_EQ(EGL_NO_SURFACE, pbuffer);
>+        EXPECT_EGL_ERROR(EGL_BAD_PARAMETER);
>+    }
>+
>+    // Missing EGL_IOSURFACE_PLANE_ANGLE
>+    {
>+        // clang-format off
>+        const EGLint attribs[] = {
>+            EGL_WIDTH,                         10,
>+            EGL_HEIGHT,                        10,
>+            EGL_TEXTURE_TARGET,                EGL_TEXTURE_RECTANGLE_ANGLE,
>+            EGL_TEXTURE_INTERNAL_FORMAT_ANGLE, GL_BGRA_EXT,
>+            EGL_TEXTURE_FORMAT,                EGL_TEXTURE_RGBA,
>+            EGL_TEXTURE_TYPE_ANGLE,            GL_UNSIGNED_BYTE,
>+            EGL_NONE,                          EGL_NONE,
>+        };
>+        // clang-format on
>+
>+        EGLSurface pbuffer = eglCreatePbufferFromClientBuffer(mDisplay, EGL_IOSURFACE_ANGLE,
>+                                                              ioSurface.get(), mConfig, attribs);
>+        EXPECT_EQ(EGL_NO_SURFACE, pbuffer);
>+        EXPECT_EGL_ERROR(EGL_BAD_PARAMETER);
>+    }
>+
>+    // Missing EGL_TEXTURE_TARGET - EGL_BAD_MATCH from the base spec of
>+    // eglCreatePbufferFromClientBuffer
>+    {
>+        // clang-format off
>+        const EGLint attribs[] = {
>+            EGL_WIDTH,                         10,
>+            EGL_HEIGHT,                        10,
>+            EGL_IOSURFACE_PLANE_ANGLE,         0,
>+            EGL_TEXTURE_INTERNAL_FORMAT_ANGLE, GL_BGRA_EXT,
>+            EGL_TEXTURE_FORMAT,                EGL_TEXTURE_RGBA,
>+            EGL_TEXTURE_TYPE_ANGLE,            GL_UNSIGNED_BYTE,
>+            EGL_NONE,                          EGL_NONE,
>+        };
>+        // clang-format on
>+
>+        EGLSurface pbuffer = eglCreatePbufferFromClientBuffer(mDisplay, EGL_IOSURFACE_ANGLE,
>+                                                              ioSurface.get(), mConfig, attribs);
>+        EXPECT_EQ(EGL_NO_SURFACE, pbuffer);
>+        EXPECT_EGL_ERROR(EGL_BAD_MATCH);
>+    }
>+
>+    // Missing EGL_TEXTURE_INTERNAL_FORMAT_ANGLE
>+    {
>+        // clang-format off
>+        const EGLint attribs[] = {
>+            EGL_WIDTH,                         10,
>+            EGL_HEIGHT,                        10,
>+            EGL_IOSURFACE_PLANE_ANGLE,         0,
>+            EGL_TEXTURE_TARGET,                EGL_TEXTURE_RECTANGLE_ANGLE,
>+            EGL_TEXTURE_FORMAT,                EGL_TEXTURE_RGBA,
>+            EGL_TEXTURE_TYPE_ANGLE,            GL_UNSIGNED_BYTE,
>+            EGL_NONE,                          EGL_NONE,
>+        };
>+        // clang-format on
>+
>+        EGLSurface pbuffer = eglCreatePbufferFromClientBuffer(mDisplay, EGL_IOSURFACE_ANGLE,
>+                                                              ioSurface.get(), mConfig, attribs);
>+        EXPECT_EQ(EGL_NO_SURFACE, pbuffer);
>+        EXPECT_EGL_ERROR(EGL_BAD_PARAMETER);
>+    }
>+
>+    // Missing EGL_TEXTURE_FORMAT - EGL_BAD_MATCH from the base spec of
>+    // eglCreatePbufferFromClientBuffer
>+    {
>+        // clang-format off
>+        const EGLint attribs[] = {
>+            EGL_WIDTH,                         10,
>+            EGL_HEIGHT,                        10,
>+            EGL_IOSURFACE_PLANE_ANGLE,         0,
>+            EGL_TEXTURE_TARGET,                EGL_TEXTURE_RECTANGLE_ANGLE,
>+            EGL_TEXTURE_INTERNAL_FORMAT_ANGLE, GL_BGRA_EXT,
>+            EGL_TEXTURE_TYPE_ANGLE,            GL_UNSIGNED_BYTE,
>+            EGL_NONE,                          EGL_NONE,
>+        };
>+        // clang-format on
>+
>+        EGLSurface pbuffer = eglCreatePbufferFromClientBuffer(mDisplay, EGL_IOSURFACE_ANGLE,
>+                                                              ioSurface.get(), mConfig, attribs);
>+        EXPECT_EQ(EGL_NO_SURFACE, pbuffer);
>+        EXPECT_EGL_ERROR(EGL_BAD_MATCH);
>+    }
>+
>+    // Missing EGL_TEXTURE_TYPE_ANGLE
>+    {
>+        // clang-format off
>+        const EGLint attribs[] = {
>+            EGL_WIDTH,                         10,
>+            EGL_HEIGHT,                        10,
>+            EGL_IOSURFACE_PLANE_ANGLE,         0,
>+            EGL_TEXTURE_TARGET,                EGL_TEXTURE_RECTANGLE_ANGLE,
>+            EGL_TEXTURE_INTERNAL_FORMAT_ANGLE, GL_BGRA_EXT,
>+            EGL_TEXTURE_FORMAT,                EGL_TEXTURE_RGBA,
>+            EGL_NONE,                          EGL_NONE,
>+        };
>+        // clang-format on
>+
>+        EGLSurface pbuffer = eglCreatePbufferFromClientBuffer(mDisplay, EGL_IOSURFACE_ANGLE,
>+                                                              ioSurface.get(), mConfig, attribs);
>+        EXPECT_EQ(EGL_NO_SURFACE, pbuffer);
>+        EXPECT_EGL_ERROR(EGL_BAD_PARAMETER);
>+    }
>+}
>+
>+// Test the validation errors for bad parameters for eglCreatePbufferFromClientBuffer with IOSurface
>+TEST_P(IOSurfaceClientBufferTest, NegativeValidationBadAttributes)
>+{
>+    ScopedIOSurfaceRef ioSurface = CreateSinglePlaneIOSurface(10, 10, 'BGRA', 4);
>+
>+    // Success case
>+    {
>+        // clang-format off
>+        const EGLint attribs[] = {
>+            EGL_WIDTH,                         10,
>+            EGL_HEIGHT,                        10,
>+            EGL_IOSURFACE_PLANE_ANGLE,         0,
>+            EGL_TEXTURE_TARGET,                EGL_TEXTURE_RECTANGLE_ANGLE,
>+            EGL_TEXTURE_INTERNAL_FORMAT_ANGLE, GL_BGRA_EXT,
>+            EGL_TEXTURE_FORMAT,                EGL_TEXTURE_RGBA,
>+            EGL_TEXTURE_TYPE_ANGLE,            GL_UNSIGNED_BYTE,
>+            EGL_NONE,                          EGL_NONE,
>+        };
>+        // clang-format off
>+
>+        EGLSurface pbuffer = eglCreatePbufferFromClientBuffer(mDisplay, EGL_IOSURFACE_ANGLE, ioSurface.get(), mConfig, attribs);
>+        EXPECT_NE(EGL_NO_SURFACE, pbuffer);
>+
>+        EGLBoolean result = eglDestroySurface(mDisplay, pbuffer);
>+        EXPECT_EGL_TRUE(result);
>+        EXPECT_EGL_SUCCESS();
>+    }
>+
>+    // EGL_TEXTURE_FORMAT must be EGL_TEXTURE_RGBA
>+    {
>+        // clang-format off
>+        const EGLint attribs[] = {
>+            EGL_WIDTH,                         10,
>+            EGL_HEIGHT,                        10,
>+            EGL_IOSURFACE_PLANE_ANGLE,         0,
>+            EGL_TEXTURE_TARGET,                EGL_TEXTURE_RECTANGLE_ANGLE,
>+            EGL_TEXTURE_INTERNAL_FORMAT_ANGLE, GL_BGRA_EXT,
>+            EGL_TEXTURE_FORMAT,                EGL_TEXTURE_RGB,
>+            EGL_TEXTURE_TYPE_ANGLE,            GL_UNSIGNED_BYTE,
>+            EGL_NONE,                          EGL_NONE,
>+        };
>+        // clang-format on
>+
>+        EGLSurface pbuffer = eglCreatePbufferFromClientBuffer(mDisplay, EGL_IOSURFACE_ANGLE,
>+                                                              ioSurface.get(), mConfig, attribs);
>+        EXPECT_EQ(EGL_NO_SURFACE, pbuffer);
>+        EXPECT_EGL_ERROR(EGL_BAD_ATTRIBUTE);
>+    }
>+
>+    // EGL_WIDTH must be at least 1
>+    {
>+        // clang-format off
>+        const EGLint attribs[] = {
>+            EGL_WIDTH,                         0,
>+            EGL_HEIGHT,                        10,
>+            EGL_IOSURFACE_PLANE_ANGLE,         0,
>+            EGL_TEXTURE_TARGET,                EGL_TEXTURE_RECTANGLE_ANGLE,
>+            EGL_TEXTURE_INTERNAL_FORMAT_ANGLE, GL_BGRA_EXT,
>+            EGL_TEXTURE_FORMAT,                EGL_TEXTURE_RGBA,
>+            EGL_TEXTURE_TYPE_ANGLE,            GL_UNSIGNED_BYTE,
>+            EGL_NONE,                          EGL_NONE,
>+        };
>+        // clang-format on
>+
>+        EGLSurface pbuffer = eglCreatePbufferFromClientBuffer(mDisplay, EGL_IOSURFACE_ANGLE,
>+                                                              ioSurface.get(), mConfig, attribs);
>+        EXPECT_EQ(EGL_NO_SURFACE, pbuffer);
>+        EXPECT_EGL_ERROR(EGL_BAD_ATTRIBUTE);
>+    }
>+
>+    // EGL_WIDTH must be at most the width of the IOSurface
>+    {
>+        // clang-format off
>+        const EGLint attribs[] = {
>+            EGL_WIDTH,                         11,
>+            EGL_HEIGHT,                        10,
>+            EGL_IOSURFACE_PLANE_ANGLE,         0,
>+            EGL_TEXTURE_TARGET,                EGL_TEXTURE_RECTANGLE_ANGLE,
>+            EGL_TEXTURE_INTERNAL_FORMAT_ANGLE, GL_BGRA_EXT,
>+            EGL_TEXTURE_FORMAT,                EGL_TEXTURE_RGBA,
>+            EGL_TEXTURE_TYPE_ANGLE,            GL_UNSIGNED_BYTE,
>+            EGL_NONE,                          EGL_NONE,
>+        };
>+        // clang-format on
>+
>+        EGLSurface pbuffer = eglCreatePbufferFromClientBuffer(mDisplay, EGL_IOSURFACE_ANGLE,
>+                                                              ioSurface.get(), mConfig, attribs);
>+        EXPECT_EQ(EGL_NO_SURFACE, pbuffer);
>+        EXPECT_EGL_ERROR(EGL_BAD_ATTRIBUTE);
>+    }
>+
>+    // EGL_HEIGHT must be at least 1
>+    {
>+        // clang-format off
>+        const EGLint attribs[] = {
>+            EGL_WIDTH,                         10,
>+            EGL_HEIGHT,                        0,
>+            EGL_IOSURFACE_PLANE_ANGLE,         0,
>+            EGL_TEXTURE_TARGET,                EGL_TEXTURE_RECTANGLE_ANGLE,
>+            EGL_TEXTURE_INTERNAL_FORMAT_ANGLE, GL_BGRA_EXT,
>+            EGL_TEXTURE_FORMAT,                EGL_TEXTURE_RGBA,
>+            EGL_TEXTURE_TYPE_ANGLE,            GL_UNSIGNED_BYTE,
>+            EGL_NONE,                          EGL_NONE,
>+        };
>+        // clang-format on
>+
>+        EGLSurface pbuffer = eglCreatePbufferFromClientBuffer(mDisplay, EGL_IOSURFACE_ANGLE,
>+                                                              ioSurface.get(), mConfig, attribs);
>+        EXPECT_EQ(EGL_NO_SURFACE, pbuffer);
>+        EXPECT_EGL_ERROR(EGL_BAD_ATTRIBUTE);
>+    }
>+
>+    // EGL_HEIGHT must be at most the height of the IOSurface
>+    {
>+        // clang-format off
>+        const EGLint attribs[] = {
>+            EGL_WIDTH,                         10,
>+            EGL_HEIGHT,                        11,
>+            EGL_IOSURFACE_PLANE_ANGLE,         0,
>+            EGL_TEXTURE_TARGET,                EGL_TEXTURE_RECTANGLE_ANGLE,
>+            EGL_TEXTURE_INTERNAL_FORMAT_ANGLE, GL_BGRA_EXT,
>+            EGL_TEXTURE_FORMAT,                EGL_TEXTURE_RGBA,
>+            EGL_TEXTURE_TYPE_ANGLE,            GL_UNSIGNED_BYTE,
>+            EGL_NONE,                          EGL_NONE,
>+        };
>+        // clang-format on
>+
>+        EGLSurface pbuffer = eglCreatePbufferFromClientBuffer(mDisplay, EGL_IOSURFACE_ANGLE,
>+                                                              ioSurface.get(), mConfig, attribs);
>+        EXPECT_EQ(EGL_NO_SURFACE, pbuffer);
>+        EXPECT_EGL_ERROR(EGL_BAD_ATTRIBUTE);
>+    }
>+
>+    // EGL_TEXTURE_FORMAT must be at EGL_TEXTURE_RECTANGLE_ANGLE
>+    {
>+        // clang-format off
>+        const EGLint attribs[] = {
>+            EGL_WIDTH,                         10,
>+            EGL_HEIGHT,                        10,
>+            EGL_IOSURFACE_PLANE_ANGLE,         0,
>+            EGL_TEXTURE_TARGET,                EGL_TEXTURE_2D,
>+            EGL_TEXTURE_INTERNAL_FORMAT_ANGLE, GL_BGRA_EXT,
>+            EGL_TEXTURE_FORMAT,                EGL_TEXTURE_RGBA,
>+            EGL_TEXTURE_TYPE_ANGLE,            GL_UNSIGNED_BYTE,
>+            EGL_NONE,                          EGL_NONE,
>+        };
>+        // clang-format on
>+
>+        EGLSurface pbuffer = eglCreatePbufferFromClientBuffer(mDisplay, EGL_IOSURFACE_ANGLE,
>+                                                              ioSurface.get(), mConfig, attribs);
>+        EXPECT_EQ(EGL_NO_SURFACE, pbuffer);
>+        EXPECT_EGL_ERROR(EGL_BAD_ATTRIBUTE);
>+    }
>+
>+    // EGL_IOSURFACE_PLANE_ANGLE must be at least 0
>+    {
>+        // clang-format off
>+        const EGLint attribs[] = {
>+            EGL_WIDTH,                         10,
>+            EGL_HEIGHT,                        10,
>+            EGL_IOSURFACE_PLANE_ANGLE,         -1,
>+            EGL_TEXTURE_TARGET,                EGL_TEXTURE_RECTANGLE_ANGLE,
>+            EGL_TEXTURE_INTERNAL_FORMAT_ANGLE, GL_BGRA_EXT,
>+            EGL_TEXTURE_FORMAT,                EGL_TEXTURE_RGBA,
>+            EGL_TEXTURE_TYPE_ANGLE,            GL_UNSIGNED_BYTE,
>+            EGL_NONE,                          EGL_NONE,
>+        };
>+        // clang-format on
>+
>+        EGLSurface pbuffer = eglCreatePbufferFromClientBuffer(mDisplay, EGL_IOSURFACE_ANGLE,
>+                                                              ioSurface.get(), mConfig, attribs);
>+        EXPECT_EQ(EGL_NO_SURFACE, pbuffer);
>+        EXPECT_EGL_ERROR(EGL_BAD_ATTRIBUTE);
>+    }
>+
>+    // EGL_IOSURFACE_PLANE_ANGLE must less than the number of planes of the IOSurface
>+    {
>+        // clang-format off
>+        const EGLint attribs[] = {
>+            EGL_WIDTH,                         10,
>+            EGL_HEIGHT,                        10,
>+            EGL_IOSURFACE_PLANE_ANGLE,         1,
>+            EGL_TEXTURE_TARGET,                EGL_TEXTURE_RECTANGLE_ANGLE,
>+            EGL_TEXTURE_INTERNAL_FORMAT_ANGLE, GL_BGRA_EXT,
>+            EGL_TEXTURE_FORMAT,                EGL_TEXTURE_RGBA,
>+            EGL_TEXTURE_TYPE_ANGLE,            GL_UNSIGNED_BYTE,
>+            EGL_NONE,                          EGL_NONE,
>+        };
>+        // clang-format on
>+
>+        EGLSurface pbuffer = eglCreatePbufferFromClientBuffer(mDisplay, EGL_IOSURFACE_ANGLE,
>+                                                              ioSurface.get(), mConfig, attribs);
>+        EXPECT_EQ(EGL_NO_SURFACE, pbuffer);
>+        EXPECT_EGL_ERROR(EGL_BAD_ATTRIBUTE);
>+    }
>+
>+    // The internal format / type most be listed in the table
>+    {
>+        // clang-format off
>+        const EGLint attribs[] = {
>+            EGL_WIDTH,                         10,
>+            EGL_HEIGHT,                        10,
>+            EGL_IOSURFACE_PLANE_ANGLE,         0,
>+            EGL_TEXTURE_TARGET,                EGL_TEXTURE_RECTANGLE_ANGLE,
>+            EGL_TEXTURE_INTERNAL_FORMAT_ANGLE, GL_RGBA,
>+            EGL_TEXTURE_FORMAT,                EGL_TEXTURE_RGBA,
>+            EGL_TEXTURE_TYPE_ANGLE,            GL_UNSIGNED_BYTE,
>+            EGL_NONE,                          EGL_NONE,
>+        };
>+        // clang-format on
>+
>+        EGLSurface pbuffer = eglCreatePbufferFromClientBuffer(mDisplay, EGL_IOSURFACE_ANGLE,
>+                                                              ioSurface.get(), mConfig, attribs);
>+        EXPECT_EQ(EGL_NO_SURFACE, pbuffer);
>+        EXPECT_EGL_ERROR(EGL_BAD_ATTRIBUTE);
>+    }
>+}
>+
>+// Test IOSurface pbuffers can be made current
>+TEST_P(IOSurfaceClientBufferTest, MakeCurrent)
>+{
>+    ScopedIOSurfaceRef ioSurface = CreateSinglePlaneIOSurface(10, 10, 'BGRA', 4);
>+
>+    EGLSurface pbuffer;
>+    createIOSurfacePbuffer(ioSurface, 10, 10, 0, GL_BGRA_EXT, GL_UNSIGNED_BYTE, &pbuffer);
>+
>+    EGLContext context = getEGLWindow()->getContext();
>+    EGLBoolean result  = eglMakeCurrent(mDisplay, pbuffer, pbuffer, context);
>+    EXPECT_EGL_TRUE(result);
>+    EXPECT_EGL_SUCCESS();
>+    // The test harness expects the EGL state to be restored before the test exits.
>+    result = eglMakeCurrent(mDisplay, getEGLWindow()->getSurface(), getEGLWindow()->getSurface(),
>+                            context);
>+    EXPECT_EGL_TRUE(result);
>+    EXPECT_EGL_SUCCESS();
>+}
>+
>+// TODO(cwallez@chromium.org): Test setting width and height to less than the IOSurface's work as
>+// expected.
>+
>+ANGLE_INSTANTIATE_TEST(IOSurfaceClientBufferTest, ES3_OPENGL());
>diff --git a/Source/ThirdParty/ANGLE/src/tests/egl_tests/EGLPresentPathD3D11Test.cpp b/Source/ThirdParty/ANGLE/src/tests/egl_tests/EGLPresentPathD3D11Test.cpp
>index 35401b70fb6..47785bb69f5 100644
>--- a/Source/ThirdParty/ANGLE/src/tests/egl_tests/EGLPresentPathD3D11Test.cpp
>+++ b/Source/ThirdParty/ANGLE/src/tests/egl_tests/EGLPresentPathD3D11Test.cpp
>@@ -6,14 +6,15 @@
> 
> #include "test_utils/ANGLETest.h"
> 
>-#include <cstdint>
>-#include "com_utils.h"
>-#include "OSWindow.h"
> #include <d3d11.h>
>+#include <cstdint>
>+
>+#include "util/OSWindow.h"
>+#include "util/com_utils.h"
> 
> using namespace angle;
> 
>-class EGLPresentPathD3D11 : public testing::TestWithParam<PlatformParameters>
>+class EGLPresentPathD3D11 : public EGLTest, public testing::WithParamInterface<PlatformParameters>
> {
>   protected:
>     EGLPresentPathD3D11()
>@@ -24,12 +25,13 @@ class EGLPresentPathD3D11 : public testing::TestWithParam<PlatformParameters>
>           mConfig(0),
>           mOSWindow(nullptr),
>           mWindowWidth(0)
>-    {
>-    }
>+    {}
> 
>     void SetUp() override
>     {
>-        mOSWindow    = CreateOSWindow();
>+        EGLTest::SetUp();
>+
>+        mOSWindow    = OSWindow::New();
>         mWindowWidth = 64;
>         mOSWindow->initialize("EGLPresentPathD3D11", mWindowWidth, mWindowWidth);
>     }
>@@ -38,24 +40,17 @@ class EGLPresentPathD3D11 : public testing::TestWithParam<PlatformParameters>
>     {
>         int clientVersion = GetParam().majorVersion;
> 
>-        const char *extensionString =
>-            static_cast<const char *>(eglQueryString(EGL_NO_DISPLAY, EGL_EXTENSIONS));
>-        ASSERT_NE(nullptr, strstr(extensionString, "EGL_ANGLE_experimental_present_path"));
>-
>-        PFNEGLGETPLATFORMDISPLAYEXTPROC eglGetPlatformDisplayEXT =
>-            reinterpret_cast<PFNEGLGETPLATFORMDISPLAYEXTPROC>(
>-                eglGetProcAddress("eglGetPlatformDisplayEXT"));
>-        ASSERT_NE(nullptr, eglGetPlatformDisplayEXT);
>-
>         // Set up EGL Display
>-        EGLint displayAttribs[] = {
>-            EGL_PLATFORM_ANGLE_TYPE_ANGLE, GetParam().getRenderer(),
>-            EGL_PLATFORM_ANGLE_MAX_VERSION_MAJOR_ANGLE, GetParam().eglParameters.majorVersion,
>-            EGL_PLATFORM_ANGLE_MAX_VERSION_MAJOR_ANGLE, GetParam().eglParameters.majorVersion,
>-            EGL_EXPERIMENTAL_PRESENT_PATH_ANGLE,
>-            usePresentPathFast ? EGL_EXPERIMENTAL_PRESENT_PATH_FAST_ANGLE
>-                               : EGL_EXPERIMENTAL_PRESENT_PATH_COPY_ANGLE,
>-            EGL_NONE};
>+        EGLint displayAttribs[] = {EGL_PLATFORM_ANGLE_TYPE_ANGLE,
>+                                   GetParam().getRenderer(),
>+                                   EGL_PLATFORM_ANGLE_MAX_VERSION_MAJOR_ANGLE,
>+                                   GetParam().eglParameters.majorVersion,
>+                                   EGL_PLATFORM_ANGLE_MAX_VERSION_MAJOR_ANGLE,
>+                                   GetParam().eglParameters.majorVersion,
>+                                   EGL_EXPERIMENTAL_PRESENT_PATH_ANGLE,
>+                                   usePresentPathFast ? EGL_EXPERIMENTAL_PRESENT_PATH_FAST_ANGLE
>+                                                      : EGL_EXPERIMENTAL_PRESENT_PATH_COPY_ANGLE,
>+                                   EGL_NONE};
>         mDisplay =
>             eglGetPlatformDisplayEXT(EGL_PLATFORM_ANGLE_ANGLE, EGL_DEFAULT_DISPLAY, displayAttribs);
>         ASSERT_TRUE(EGL_NO_DISPLAY != mDisplay);
>@@ -174,7 +169,7 @@ class EGLPresentPathD3D11 : public testing::TestWithParam<PlatformParameters>
>         }
> 
>         mOSWindow->destroy();
>-        SafeDelete(mOSWindow);
>+        OSWindow::Delete(&mOSWindow);
>     }
> 
>     void drawQuadUsingGL()
>@@ -182,7 +177,7 @@ class EGLPresentPathD3D11 : public testing::TestWithParam<PlatformParameters>
>         GLuint m2DProgram;
>         GLint mTexture2DUniformLocation;
> 
>-        const std::string vertexShaderSource =
>+        constexpr char kVS[] =
>             R"(precision highp float;
>             attribute vec4 position;
>             varying vec2 texcoord;
>@@ -193,7 +188,7 @@ class EGLPresentPathD3D11 : public testing::TestWithParam<PlatformParameters>
>                 texcoord = (position.xy * 0.5) + 0.5;
>             })";
> 
>-        const std::string fragmentShaderSource2D =
>+        constexpr char kFS[] =
>             R"(precision highp float;
>             uniform sampler2D tex;
>             varying vec2 texcoord;
>@@ -203,7 +198,7 @@ class EGLPresentPathD3D11 : public testing::TestWithParam<PlatformParameters>
>                 gl_FragColor = texture2D(tex, texcoord);
>             })";
> 
>-        m2DProgram                = CompileProgram(vertexShaderSource, fragmentShaderSource2D);
>+        m2DProgram                = CompileProgram(kVS, kFS);
>         mTexture2DUniformLocation = glGetUniformLocation(m2DProgram, "tex");
> 
>         uint8_t textureInitData[16] = {
>@@ -230,14 +225,9 @@ class EGLPresentPathD3D11 : public testing::TestWithParam<PlatformParameters>
> 
>         GLint positionLocation = glGetAttribLocation(m2DProgram, "position");
>         glUseProgram(m2DProgram);
>-        const GLfloat vertices[] =
>-        {
>-            -1.0f,  1.0f, 0.5f,
>-            -1.0f, -1.0f, 0.5f,
>-             1.0f, -1.0f, 0.5f,
>-            -1.0f,  1.0f, 0.5f,
>-             1.0f, -1.0f, 0.5f,
>-             1.0f,  1.0f, 0.5f,
>+        const GLfloat vertices[] = {
>+            -1.0f, 1.0f, 0.5f, -1.0f, -1.0f, 0.5f, 1.0f, -1.0f, 0.5f,
>+            -1.0f, 1.0f, 0.5f, 1.0f,  -1.0f, 0.5f, 1.0f, 1.0f,  0.5f,
>         };
> 
>         glVertexAttribPointer(positionLocation, 3, GL_FLOAT, GL_FALSE, 0, vertices);
>@@ -288,9 +278,9 @@ class EGLPresentPathD3D11 : public testing::TestWithParam<PlatformParameters>
>         angle::GLColor *byteData = reinterpret_cast<angle::GLColor *>(mappedSubresource.pData);
> 
>         // Note that the texture is in BGRA format, although the GLColor struct is RGBA
>-        GLColor expectedTopLeftPixel     = GLColor(0,   0, 255, 255);  // Red
>-        GLColor expectedTopRightPixel    = GLColor(0, 255,   0, 255);  // Green
>-        GLColor expectedBottomLeftPixel  = GLColor(255, 0,   0, 255);  // Blue
>+        GLColor expectedTopLeftPixel     = GLColor(0, 0, 255, 255);    // Red
>+        GLColor expectedTopRightPixel    = GLColor(0, 255, 0, 255);    // Green
>+        GLColor expectedBottomLeftPixel  = GLColor(255, 0, 0, 255);    // Blue
>         GLColor expectedBottomRightPixel = GLColor(0, 255, 255, 255);  // Red + Green
> 
>         if (usingPresentPathFast)
>diff --git a/Source/ThirdParty/ANGLE/src/tests/egl_tests/EGLProgramCacheControlTest.cpp b/Source/ThirdParty/ANGLE/src/tests/egl_tests/EGLProgramCacheControlTest.cpp
>index 40ae60aba8a..8d8f4ac1295 100644
>--- a/Source/ThirdParty/ANGLE/src/tests/egl_tests/EGLProgramCacheControlTest.cpp
>+++ b/Source/ThirdParty/ANGLE/src/tests/egl_tests/EGLProgramCacheControlTest.cpp
>@@ -9,11 +9,12 @@
> #include "common/angleutils.h"
> #include "test_utils/ANGLETest.h"
> #include "test_utils/gl_raii.h"
>+#include "util/EGLWindow.h"
> 
> using namespace angle;
> 
> constexpr EGLint kEnabledCacheSize = 0x10000;
>-constexpr char kEGLExtName[]       = "EGL_ANGLE_program_cache_control ";
>+constexpr char kEGLExtName[]       = "EGL_ANGLE_program_cache_control";
> 
> void TestCacheProgram(PlatformMethods *platform,
>                       const ProgramKeyType &key,
>@@ -30,35 +31,44 @@ class EGLProgramCacheControlTest : public ANGLETest
>     }
> 
>   protected:
>-    EGLProgramCacheControlTest() { setDeferContextInit(true); }
>+    EGLProgramCacheControlTest()
>+    {
>+        // Test flakiness was noticed when reusing displays.
>+        forceNewDisplay();
>+        setDeferContextInit(true);
>+    }
> 
>     void SetUp() override
>     {
>-        mPlatformMethods.cacheProgram = &TestCacheProgram;
>+        setContextProgramCacheEnabled(true, &TestCacheProgram);
> 
>-        ANGLETestBase::ANGLETestSetUp();
>+        ANGLETest::SetUp();
> 
>         if (extensionAvailable())
>         {
>             EGLDisplay display = getEGLWindow()->getDisplay();
>-            setContextProgramCacheEnabled(true);
>             eglProgramCacheResizeANGLE(display, kEnabledCacheSize, EGL_PROGRAM_CACHE_RESIZE_ANGLE);
>+            ASSERT_EGL_SUCCESS();
>         }
> 
>-        getEGLWindow()->initializeContext();
>+        ASSERT_TRUE(getEGLWindow()->initializeContext());
>     }
> 
>-    void TearDown() override { ANGLETestBase::ANGLETestTearDown(); }
>+    void TearDown() override
>+    {
>+        setContextProgramCacheEnabled(false, angle::DefaultCacheProgram);
>+        ANGLETest::TearDown();
>+    }
> 
>     bool extensionAvailable()
>     {
>         EGLDisplay display = getEGLWindow()->getDisplay();
>-        return eglDisplayExtensionEnabled(display, kEGLExtName);
>+        return IsEGLDisplayExtensionEnabled(display, kEGLExtName);
>     }
> 
>     bool programBinaryAvailable()
>     {
>-        return (getClientMajorVersion() >= 3 || extensionEnabled("GL_OES_get_program_binary"));
>+        return (getClientMajorVersion() >= 3 || IsGLExtensionEnabled("GL_OES_get_program_binary"));
>     }
> 
>     ProgramKeyType mCachedKey;
>@@ -176,9 +186,8 @@ TEST_P(EGLProgramCacheControlTest, SaveAndReload)
> {
>     ANGLE_SKIP_TEST_IF(!extensionAvailable() || !programBinaryAvailable());
> 
>-    const std::string vertexShader =
>-        "attribute vec4 position; void main() { gl_Position = position; }";
>-    const std::string fragmentShader = "void main() { gl_FragColor = vec4(1, 0, 0, 1); }";
>+    constexpr char kVS[] = "attribute vec4 position; void main() { gl_Position = position; }";
>+    constexpr char kFS[] = "void main() { gl_FragColor = vec4(1, 0, 0, 1); }";
> 
>     // Link a program, which will miss the cache.
>     {
>@@ -186,7 +195,7 @@ TEST_P(EGLProgramCacheControlTest, SaveAndReload)
>         glClear(GL_COLOR_BUFFER_BIT);
>         EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::green);
> 
>-        ANGLE_GL_PROGRAM(program, vertexShader, fragmentShader);
>+        ANGLE_GL_PROGRAM(program, kVS, kFS);
>         drawQuad(program, "position", 0.5f);
>         EXPECT_GL_NO_ERROR();
>         EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::red);
>@@ -229,7 +238,7 @@ TEST_P(EGLProgramCacheControlTest, SaveAndReload)
>         glClear(GL_COLOR_BUFFER_BIT);
>         EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::green);
> 
>-        ANGLE_GL_PROGRAM(program, vertexShader, fragmentShader);
>+        ANGLE_GL_PROGRAM(program, kVS, kFS);
>         drawQuad(program, "position", 0.5f);
>         EXPECT_GL_NO_ERROR();
>         EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::red);
>@@ -239,4 +248,28 @@ TEST_P(EGLProgramCacheControlTest, SaveAndReload)
>     EXPECT_TRUE(mCachedBinary.empty());
> }
> 
>-ANGLE_INSTANTIATE_TEST(EGLProgramCacheControlTest, ES2_D3D9(), ES2_D3D11(), ES2_OPENGL());
>+// Tests that trying to link a program without correct shaders doesn't buggily call the cache.
>+TEST_P(EGLProgramCacheControlTest, LinkProgramWithBadShaders)
>+{
>+    ANGLE_SKIP_TEST_IF(!extensionAvailable());
>+
>+    GLuint shader = glCreateShader(GL_FRAGMENT_SHADER);
>+
>+    GLuint program = glCreateProgram();
>+    glAttachShader(program, shader);
>+    glLinkProgram(program);
>+
>+    GLint linkStatus = 0;
>+    glGetProgramiv(program, GL_LINK_STATUS, &linkStatus);
>+    EXPECT_GL_FALSE(linkStatus);
>+    EXPECT_GL_NO_ERROR();
>+
>+    glDeleteShader(shader);
>+    glDeleteProgram(program);
>+}
>+
>+ANGLE_INSTANTIATE_TEST(EGLProgramCacheControlTest,
>+                       ES2_D3D9(),
>+                       ES2_D3D11(),
>+                       ES2_OPENGL(),
>+                       ES2_VULKAN());
>diff --git a/Source/ThirdParty/ANGLE/src/tests/egl_tests/EGLQueryContextTest.cpp b/Source/ThirdParty/ANGLE/src/tests/egl_tests/EGLQueryContextTest.cpp
>index 6b6bf0a5144..4d2099fd102 100644
>--- a/Source/ThirdParty/ANGLE/src/tests/egl_tests/EGLQueryContextTest.cpp
>+++ b/Source/ThirdParty/ANGLE/src/tests/egl_tests/EGLQueryContextTest.cpp
>@@ -6,70 +6,59 @@
> 
> #include <gtest/gtest.h>
> 
>-#include <EGL/egl.h>
>-#include <EGL/eglext.h>
>-
>-#include "test_utils/angle_test_configs.h"
>+#include "test_utils/ANGLETest.h"
> 
> using namespace angle;
> 
>-class EGLQueryContextTest : public testing::TestWithParam<PlatformParameters>
>+class EGLQueryContextTest : public EGLTest, public testing::WithParamInterface<PlatformParameters>
> {
>   public:
>     void SetUp() override
>     {
>-        int clientVersion = GetParam().majorVersion;
>+        EGLTest::SetUp();
> 
>-        PFNEGLGETPLATFORMDISPLAYEXTPROC eglGetPlatformDisplayEXT = reinterpret_cast<PFNEGLGETPLATFORMDISPLAYEXTPROC>(eglGetProcAddress("eglGetPlatformDisplayEXT"));
>-        EXPECT_TRUE(eglGetPlatformDisplayEXT != nullptr);
>+        int clientVersion = GetParam().majorVersion;
> 
>-        EGLint dispattrs[] =
>-        {
>-            EGL_PLATFORM_ANGLE_TYPE_ANGLE, GetParam().getRenderer(),
>-            EGL_NONE
>-        };
>-        mDisplay = eglGetPlatformDisplayEXT(
>+        EGLint dispattrs[] = {EGL_PLATFORM_ANGLE_TYPE_ANGLE, GetParam().getRenderer(), EGL_NONE};
>+        mDisplay           = eglGetPlatformDisplayEXT(
>             EGL_PLATFORM_ANGLE_ANGLE, reinterpret_cast<void *>(EGL_DEFAULT_DISPLAY), dispattrs);
>         EXPECT_TRUE(mDisplay != EGL_NO_DISPLAY);
>         EXPECT_TRUE(eglInitialize(mDisplay, nullptr, nullptr) != EGL_FALSE);
> 
>         EGLint ncfg;
>-        EGLint cfgattrs[] =
>-        {
>-            EGL_RED_SIZE, 8,
>-            EGL_GREEN_SIZE, 8,
>-            EGL_BLUE_SIZE, 8,
>-            EGL_RENDERABLE_TYPE, clientVersion == 3 ? EGL_OPENGL_ES3_BIT : EGL_OPENGL_ES2_BIT,
>-            EGL_SURFACE_TYPE, EGL_PBUFFER_BIT,
>-            EGL_NONE
>-        };
>+        EGLint cfgattrs[] = {EGL_RED_SIZE,
>+                             8,
>+                             EGL_GREEN_SIZE,
>+                             8,
>+                             EGL_BLUE_SIZE,
>+                             8,
>+                             EGL_RENDERABLE_TYPE,
>+                             clientVersion == 3 ? EGL_OPENGL_ES3_BIT : EGL_OPENGL_ES2_BIT,
>+                             EGL_SURFACE_TYPE,
>+                             EGL_PBUFFER_BIT,
>+                             EGL_NONE};
>         EXPECT_TRUE(eglChooseConfig(mDisplay, cfgattrs, &mConfig, 1, &ncfg) != EGL_FALSE);
>         EXPECT_TRUE(ncfg == 1);
> 
>-        EGLint ctxattrs[] =
>-        {
>-            EGL_CONTEXT_CLIENT_VERSION, clientVersion,
>-            EGL_NONE
>-        };
>-        mContext = eglCreateContext(mDisplay, mConfig, nullptr, ctxattrs);
>+        EGLint ctxattrs[] = {EGL_CONTEXT_CLIENT_VERSION, clientVersion, EGL_NONE};
>+        mContext          = eglCreateContext(mDisplay, mConfig, nullptr, ctxattrs);
>         EXPECT_TRUE(mContext != EGL_NO_CONTEXT);
> 
>-        EGLint surfattrs[] =
>-        {
>-            EGL_WIDTH, 16,
>-            EGL_HEIGHT, 16,
>-            EGL_NONE
>-        };
>-        mSurface = eglCreatePbufferSurface(mDisplay, mConfig, surfattrs);
>+        EGLint surfattrs[] = {EGL_WIDTH, 16, EGL_HEIGHT, 16, EGL_NONE};
>+        mSurface           = eglCreatePbufferSurface(mDisplay, mConfig, surfattrs);
>         EXPECT_TRUE(mSurface != EGL_NO_SURFACE);
>     }
> 
>     void TearDown() override
>     {
>-        eglMakeCurrent(mDisplay, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT);
>-        eglDestroyContext(mDisplay, mContext);
>-        eglDestroySurface(mDisplay, mSurface);
>-        eglTerminate(mDisplay);
>+        if (mDisplay != EGL_NO_DISPLAY)
>+        {
>+            eglMakeCurrent(mDisplay, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT);
>+            eglDestroyContext(mDisplay, mContext);
>+            eglDestroySurface(mDisplay, mSurface);
>+            eglTerminate(mDisplay);
>+        }
>+        ASSERT_EGL_SUCCESS() << "Error during test TearDown";
>     }
> 
>     EGLDisplay mDisplay;
>@@ -89,14 +78,16 @@ TEST_P(EGLQueryContextTest, GetConfigID)
> TEST_P(EGLQueryContextTest, GetClientType)
> {
>     EGLint clientType;
>-    EXPECT_TRUE(eglQueryContext(mDisplay, mContext, EGL_CONTEXT_CLIENT_TYPE, &clientType) != EGL_FALSE);
>+    EXPECT_TRUE(eglQueryContext(mDisplay, mContext, EGL_CONTEXT_CLIENT_TYPE, &clientType) !=
>+                EGL_FALSE);
>     EXPECT_TRUE(clientType == EGL_OPENGL_ES_API);
> }
> 
> TEST_P(EGLQueryContextTest, GetClientVersion)
> {
>     EGLint clientVersion;
>-    EXPECT_TRUE(eglQueryContext(mDisplay, mContext, EGL_CONTEXT_CLIENT_VERSION, &clientVersion) != EGL_FALSE);
>+    EXPECT_TRUE(eglQueryContext(mDisplay, mContext, EGL_CONTEXT_CLIENT_VERSION, &clientVersion) !=
>+                EGL_FALSE);
>     EXPECT_TRUE(clientVersion == GetParam().majorVersion);
> }
> 
>@@ -112,14 +103,17 @@ TEST_P(EGLQueryContextTest, GetRenderBufferBoundSurface)
>     EGLint renderBuffer, contextRenderBuffer;
>     EXPECT_TRUE(eglQuerySurface(mDisplay, mSurface, EGL_RENDER_BUFFER, &renderBuffer) != EGL_FALSE);
>     EXPECT_TRUE(eglMakeCurrent(mDisplay, mSurface, mSurface, mContext) != EGL_FALSE);
>-    EXPECT_TRUE(eglQueryContext(mDisplay, mContext, EGL_RENDER_BUFFER, &contextRenderBuffer) != EGL_FALSE);
>+    EXPECT_TRUE(eglQueryContext(mDisplay, mContext, EGL_RENDER_BUFFER, &contextRenderBuffer) !=
>+                EGL_FALSE);
>     EXPECT_TRUE(renderBuffer == contextRenderBuffer);
>+    ASSERT_EGL_SUCCESS();
> }
> 
> TEST_P(EGLQueryContextTest, BadDisplay)
> {
>     EGLint val;
>-    EXPECT_TRUE(eglQueryContext(EGL_NO_DISPLAY, mContext, EGL_CONTEXT_CLIENT_TYPE, &val) == EGL_FALSE);
>+    EXPECT_TRUE(eglQueryContext(EGL_NO_DISPLAY, mContext, EGL_CONTEXT_CLIENT_TYPE, &val) ==
>+                EGL_FALSE);
>     EXPECT_TRUE(eglGetError() == EGL_BAD_DISPLAY);
> }
> 
>@@ -138,7 +132,8 @@ TEST_P(EGLQueryContextTest, NotInitialized)
> TEST_P(EGLQueryContextTest, BadContext)
> {
>     EGLint val;
>-    EXPECT_TRUE(eglQueryContext(mDisplay, EGL_NO_CONTEXT, EGL_CONTEXT_CLIENT_TYPE, &val) == EGL_FALSE);
>+    EXPECT_TRUE(eglQueryContext(mDisplay, EGL_NO_CONTEXT, EGL_CONTEXT_CLIENT_TYPE, &val) ==
>+                EGL_FALSE);
>     EXPECT_TRUE(eglGetError() == EGL_BAD_CONTEXT);
> }
> 
>@@ -149,5 +144,11 @@ TEST_P(EGLQueryContextTest, BadAttribute)
>     EXPECT_TRUE(eglGetError() == EGL_BAD_ATTRIBUTE);
> }
> 
>-ANGLE_INSTANTIATE_TEST(EGLQueryContextTest, ES2_D3D9(), ES2_D3D11(), ES2_D3D11_FL9_3(), ES2_OPENGL(),
>-                       ES3_D3D11(), ES3_OPENGL());
>+ANGLE_INSTANTIATE_TEST(EGLQueryContextTest,
>+                       ES2_D3D9(),
>+                       ES2_D3D11(),
>+                       ES2_D3D11_FL9_3(),
>+                       ES2_OPENGL(),
>+                       ES2_VULKAN(),
>+                       ES3_D3D11(),
>+                       ES3_OPENGL());
>diff --git a/Source/ThirdParty/ANGLE/src/tests/egl_tests/EGLRecordableTest.cpp b/Source/ThirdParty/ANGLE/src/tests/egl_tests/EGLRecordableTest.cpp
>new file mode 100644
>index 00000000000..60fcc036d02
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/tests/egl_tests/EGLRecordableTest.cpp
>@@ -0,0 +1,66 @@
>+//
>+// Copyright 2019 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// EGLRecordableTest.cpp:
>+//   Tests of EGL_ANDROID_recordable extension
>+
>+#include <gtest/gtest.h>
>+
>+#include "test_utils/ANGLETest.h"
>+#include "test_utils/angle_test_configs.h"
>+#include "util/EGLWindow.h"
>+
>+using namespace angle;
>+
>+namespace angle
>+{
>+class EGLRecordableTest : public ANGLETest
>+{
>+  protected:
>+    EGLRecordableTest() {}
>+};
>+
>+// Test that the extension is always available (it is implemented in ANGLE's frontend).
>+TEST_P(EGLRecordableTest, ExtensionAlwaysAvailable)
>+{
>+    EGLDisplay display = getEGLWindow()->getDisplay();
>+    ASSERT_TRUE(IsEGLDisplayExtensionEnabled(display, "EGL_ANDROID_recordable"));
>+}
>+
>+// Check that the default message filters and callbacks are correct
>+TEST_P(EGLRecordableTest, CheckAllContexts)
>+{
>+    EGLDisplay display = getEGLWindow()->getDisplay();
>+    ANGLE_SKIP_TEST_IF(!IsEGLDisplayExtensionEnabled(display, "EGL_ANDROID_recordable"));
>+
>+    int nConfigs = 0;
>+    ASSERT_EGL_TRUE(eglGetConfigs(display, nullptr, 0, &nConfigs));
>+    ASSERT_NE(nConfigs, 0);
>+
>+    int nReturnedConfigs = 0;
>+    std::vector<EGLConfig> configs(nConfigs);
>+    ASSERT_EGL_TRUE(eglGetConfigs(display, configs.data(), nConfigs, &nReturnedConfigs));
>+    ASSERT_EQ(nConfigs, nReturnedConfigs);
>+
>+    for (EGLConfig config : configs)
>+    {
>+        EGLint isRecordable;
>+        eglGetConfigAttrib(display, config, EGL_RECORDABLE_ANDROID, &isRecordable);
>+        ASSERT_EGL_FALSE(isRecordable);
>+    }
>+
>+    const EGLint configAttributes[] = {
>+        EGL_RED_SIZE,     EGL_DONT_CARE,  EGL_GREEN_SIZE,         EGL_DONT_CARE,  EGL_BLUE_SIZE,
>+        EGL_DONT_CARE,    EGL_ALPHA_SIZE, EGL_DONT_CARE,          EGL_DEPTH_SIZE, EGL_DONT_CARE,
>+        EGL_STENCIL_SIZE, EGL_DONT_CARE,  EGL_RECORDABLE_ANDROID, EGL_FALSE,      EGL_NONE};
>+    EGLint configCount;
>+    ASSERT_EGL_TRUE(
>+        eglChooseConfig(display, configAttributes, configs.data(), configs.size(), &configCount));
>+    ASSERT_EGL_SUCCESS();
>+}
>+
>+}  // namespace angle
>+
>+ANGLE_INSTANTIATE_TEST(EGLRecordableTest, ES2_D3D11(), ES2_OPENGL(), ES2_VULKAN());
>diff --git a/Source/ThirdParty/ANGLE/src/tests/egl_tests/EGLRobustnessTest.cpp b/Source/ThirdParty/ANGLE/src/tests/egl_tests/EGLRobustnessTest.cpp
>index 0482a7fe50f..d2f91c6c652 100644
>--- a/Source/ThirdParty/ANGLE/src/tests/egl_tests/EGLRobustnessTest.cpp
>+++ b/Source/ThirdParty/ANGLE/src/tests/egl_tests/EGLRobustnessTest.cpp
>@@ -8,26 +8,23 @@
> 
> #include <gtest/gtest.h>
> 
>-#include <EGL/egl.h>
>-#include <EGL/eglext.h>
>-
>-#include "OSWindow.h"
> #include "test_utils/ANGLETest.h"
>+#include "util/OSWindow.h"
> 
> using namespace angle;
> 
>-class EGLRobustnessTest : public ::testing::TestWithParam<angle::PlatformParameters>
>+class EGLRobustnessTest : public EGLTest,
>+                          public ::testing::WithParamInterface<angle::PlatformParameters>
> {
>   public:
>     void SetUp() override
>     {
>-        mOSWindow = CreateOSWindow();
>+        EGLTest::SetUp();
>+
>+        mOSWindow = OSWindow::New();
>         mOSWindow->initialize("EGLRobustnessTest", 500, 500);
>         mOSWindow->setVisible(true);
> 
>-        auto eglGetPlatformDisplayEXT = reinterpret_cast<PFNEGLGETPLATFORMDISPLAYEXTPROC>(
>-            eglGetProcAddress("eglGetPlatformDisplayEXT"));
>-
>         const auto &platform = GetParam().eglParameters;
> 
>         std::vector<EGLint> displayAttributes;
>@@ -83,7 +80,7 @@ class EGLRobustnessTest : public ::testing::TestWithParam<angle::PlatformParamet
>         eglTerminate(mDisplay);
>         EXPECT_EGL_SUCCESS();
> 
>-        SafeDelete(mOSWindow);
>+        OSWindow::Delete(&mOSWindow);
>     }
> 
>     void createContext(EGLint resetStrategy)
>@@ -99,10 +96,6 @@ class EGLRobustnessTest : public ::testing::TestWithParam<angle::PlatformParamet
> 
>         const char *extensionString = reinterpret_cast<const char *>(glGetString(GL_EXTENSIONS));
>         ASSERT_NE(nullptr, strstr(extensionString, "GL_ANGLE_instanced_arrays"));
>-
>-        mDrawElementsInstancedANGLE =
>-            (PFNGLDRAWELEMENTSINSTANCEDANGLEPROC)eglGetProcAddress("glDrawElementsInstancedANGLE");
>-        ASSERT_NE(nullptr, mDrawElementsInstancedANGLE);
>     }
> 
>     void forceContextReset()
>@@ -141,17 +134,16 @@ class EGLRobustnessTest : public ::testing::TestWithParam<angle::PlatformParamet
>         glViewport(0, 0, mOSWindow->getWidth(), mOSWindow->getHeight());
>         glClearColor(1.0, 0.0, 0.0, 1.0);
>         glClear(GL_COLOR_BUFFER_BIT);
>-        mDrawElementsInstancedANGLE(GL_TRIANGLES, kNumQuads * 6, GL_UNSIGNED_SHORT, indices.data(),
>-                                    10000);
>+        glDrawElementsInstancedANGLE(GL_TRIANGLES, kNumQuads * 6, GL_UNSIGNED_SHORT, indices.data(),
>+                                     10000);
> 
>         glFinish();
>     }
> 
>   protected:
>-    EGLDisplay mDisplay                                             = EGL_NO_DISPLAY;
>-    EGLSurface mWindow                                              = EGL_NO_SURFACE;
>-    bool mInitialized                                               = false;
>-    PFNGLDRAWELEMENTSINSTANCEDANGLEPROC mDrawElementsInstancedANGLE = nullptr;
>+    EGLDisplay mDisplay = EGL_NO_DISPLAY;
>+    EGLSurface mWindow  = EGL_NO_SURFACE;
>+    bool mInitialized   = false;
> 
>   private:
>     EGLContext mContext = EGL_NO_CONTEXT;
>@@ -228,7 +220,7 @@ TEST_P(EGLRobustnessTest, DISABLED_ResettingDisplayWorks)
> // if there was a TDR caused by D3D so we don't run D3D tests at the same time as the OpenGL tests.
> #define D3D_HAS_PRIORITY 1
> #if D3D_HAS_PRIORITY && (defined(ANGLE_ENABLE_D3D9) || defined(ANGLE_ENABLE_D3D11))
>-ANGLE_INSTANTIATE_TEST(EGLRobustnessTest, ES2_D3D9(), ES2_D3D11());
>+ANGLE_INSTANTIATE_TEST(EGLRobustnessTest, ES2_VULKAN(), ES2_D3D9(), ES2_D3D11());
> #else
>-ANGLE_INSTANTIATE_TEST(EGLRobustnessTest, ES2_OPENGL());
>+ANGLE_INSTANTIATE_TEST(EGLRobustnessTest, ES2_VULKAN(), ES2_OPENGL());
> #endif
>diff --git a/Source/ThirdParty/ANGLE/src/tests/egl_tests/EGLSanityCheckTest.cpp b/Source/ThirdParty/ANGLE/src/tests/egl_tests/EGLSanityCheckTest.cpp
>index 5c19eb8a539..db08983d91c 100644
>--- a/Source/ThirdParty/ANGLE/src/tests/egl_tests/EGLSanityCheckTest.cpp
>+++ b/Source/ThirdParty/ANGLE/src/tests/egl_tests/EGLSanityCheckTest.cpp
>@@ -9,10 +9,17 @@
> 
> #include <gtest/gtest.h>
> 
>+#include "gpu_info_util/SystemInfo.h"
> #include "test_utils/ANGLETest.h"
>+#include "test_utils/angle_test_instantiate.h"
>+
>+using namespace angle;
>+
>+class EGLSanityCheckTest : public EGLTest
>+{};
> 
> // Checks the tests are running against ANGLE
>-TEST(EGLSanityCheckTest, IsRunningOnANGLE)
>+TEST_F(EGLSanityCheckTest, IsRunningOnANGLE)
> {
>     const char *extensionString =
>         static_cast<const char *>(eglQueryString(EGL_NO_DISPLAY, EGL_EXTENSIONS));
>@@ -20,18 +27,63 @@ TEST(EGLSanityCheckTest, IsRunningOnANGLE)
> }
> 
> // Checks that getting function pointer works
>-TEST(EGLSanityCheckTest, HasGetPlatformDisplayEXT)
>+TEST_F(EGLSanityCheckTest, HasGetPlatformDisplayEXT)
> {
>-    PFNEGLGETPLATFORMDISPLAYEXTPROC eglGetPlatformDisplayEXT =
>-        reinterpret_cast<PFNEGLGETPLATFORMDISPLAYEXTPROC>(
>-            eglGetProcAddress("eglGetPlatformDisplayEXT"));
>-
>     ASSERT_NE(eglGetPlatformDisplayEXT, nullptr);
> }
> 
> // Checks that calling GetProcAddress for a non-existant function fails.
>-TEST(EGLSanityCheckTest, GetProcAddressNegativeTest)
>+TEST_F(EGLSanityCheckTest, GetProcAddressNegativeTest)
> {
>     auto check = eglGetProcAddress("WigglyWombats");
>     EXPECT_EQ(nullptr, check);
>+}
>+
>+// Tests that our whitelist function generally maps to our support function.
>+// We can add specific exceptions here if needed.
>+// Disabled because it was creating a large number of configs. This could even result
>+// in a BDOD on Windows.
>+TEST_F(EGLSanityCheckTest, DISABLED_WhitelistMatchesSupport)
>+{
>+    // Has issues with Vulkan support detection on Android.
>+    ANGLE_SKIP_TEST_IF(IsAndroid());
>+
>+    // Cannot make any useful checks if SystemInfo is not supported.
>+    SystemInfo systemInfo;
>+    ANGLE_SKIP_TEST_IF(!GetSystemInfo(&systemInfo));
>+
>+    auto check = [&systemInfo](const PlatformParameters &params) {
>+        EXPECT_EQ(IsConfigWhitelisted(systemInfo, params), IsConfigSupported(params)) << params;
>+    };
>+
>+    check(ES1_OPENGL());
>+    check(ES2_OPENGL());
>+    check(ES3_OPENGL());
>+    check(ES31_OPENGL());
>+
>+    check(ES1_OPENGLES());
>+    check(ES2_OPENGLES());
>+    check(ES3_OPENGLES());
>+    check(ES31_OPENGLES());
>+
>+    check(ES1_D3D9());
>+    check(ES2_D3D9());
>+
>+    check(ES1_D3D11());
>+    check(ES2_D3D11());
>+    check(ES3_D3D11());
>+    check(ES31_D3D11());
>+
>+    check(ES1_VULKAN());
>+    check(ES2_VULKAN());
>+    check(ES3_VULKAN());
>+
>+    check(ES1_VULKAN_NULL());
>+    check(ES2_VULKAN_NULL());
>+    check(ES3_VULKAN_NULL());
>+
>+    check(ES1_NULL());
>+    check(ES2_NULL());
>+    check(ES3_NULL());
>+    check(ES31_NULL());
> }
>\ No newline at end of file
>diff --git a/Source/ThirdParty/ANGLE/src/tests/egl_tests/EGLStreamTest.cpp b/Source/ThirdParty/ANGLE/src/tests/egl_tests/EGLStreamTest.cpp
>index b667cf7785c..ce99ee2055a 100644
>--- a/Source/ThirdParty/ANGLE/src/tests/egl_tests/EGLStreamTest.cpp
>+++ b/Source/ThirdParty/ANGLE/src/tests/egl_tests/EGLStreamTest.cpp
>@@ -12,14 +12,28 @@
> #include <vector>
> 
> #include "media/yuvtest.inl"
>-#include "OSWindow.h"
> #include "test_utils/ANGLETest.h"
>+#include "test_utils/gl_raii.h"
>+#include "util/EGLWindow.h"
>+#include "util/OSWindow.h"
> 
> using namespace angle;
> 
> namespace
> {
> 
>+bool CheckNV12TextureSupport(ID3D11Device *device)
>+{
>+    HRESULT result;
>+    UINT formatSupport;
>+    result = device->CheckFormatSupport(DXGI_FORMAT_NV12, &formatSupport);
>+    if (result == E_FAIL)
>+    {
>+        return false;
>+    }
>+    return (formatSupport & D3D11_FORMAT_SUPPORT_TEXTURE2D) != 0;
>+}
>+
> class EGLStreamTest : public ANGLETest
> {
>   protected:
>@@ -87,7 +101,9 @@ TEST_P(EGLStreamTest, StreamValidationTest)
>     ASSERT_EQ(EGL_NO_STREAM_KHR, stream);
> 
>     const EGLint streamAttributes[] = {
>-        EGL_CONSUMER_LATENCY_USEC_KHR, 0, EGL_NONE,
>+        EGL_CONSUMER_LATENCY_USEC_KHR,
>+        0,
>+        EGL_NONE,
>     };
> 
>     stream = eglCreateStreamKHR(EGL_NO_DISPLAY, streamAttributes);
>@@ -291,9 +307,9 @@ TEST_P(EGLStreamTest, StreamConsumerGLTextureYUVDeletionTest)
>     EGLWindow *window            = getEGLWindow();
>     EGLDisplay display           = window->getDisplay();
>     const char *extensionsString = eglQueryString(display, EGL_EXTENSIONS);
>-    if (strstr(extensionsString, "EGL_ANGLE_stream_producer_d3d_texture_nv12") == nullptr)
>+    if (strstr(extensionsString, "EGL_ANGLE_stream_producer_d3d_texture") == nullptr)
>     {
>-        std::cout << "Stream producer d3d nv12 texture not supported" << std::endl;
>+        std::cout << "Stream producer d3d texture not supported" << std::endl;
>         return;
>     }
> 
>@@ -332,7 +348,7 @@ TEST_P(EGLStreamTest, StreamConsumerGLTextureYUVDeletionTest)
>         EGL_NONE,
>     };
> 
>-    result = eglCreateStreamProducerD3DTextureNV12ANGLE(display, stream, producerAttributes);
>+    result = eglCreateStreamProducerD3DTextureANGLE(display, stream, producerAttributes);
>     ASSERT_EGL_TRUE(result);
>     ASSERT_EGL_SUCCESS();
> 
>@@ -352,23 +368,299 @@ TEST_P(EGLStreamTest, StreamConsumerGLTextureYUVDeletionTest)
>     ASSERT_EGL_SUCCESS();
> }
> 
>+class D3D11TextureStreamSamplingTest : public ANGLETest
>+{
>+  protected:
>+    void SetUp() override
>+    {
>+        ANGLETest::SetUp();
>+
>+        EGLWindow *window = getEGLWindow();
>+        mDisplay          = window->getDisplay();
>+        if (!IsEGLDisplayExtensionEnabled(mDisplay, "EGL_ANGLE_stream_producer_d3d_texture"))
>+        {
>+            std::cout << "Stream producer d3d texture not supported" << std::endl;
>+            return;
>+        }
>+
>+        glGenRenderbuffers(1, &mRB);
>+        glBindRenderbuffer(GL_RENDERBUFFER, mRB);
>+        glRenderbufferStorage(GL_RENDERBUFFER, GL_RGBA8, 2, 2);
>+        glBindRenderbuffer(GL_RENDERBUFFER, 0);
>+
>+        glGenFramebuffers(1, &mFB);
>+        glBindFramebuffer(GL_FRAMEBUFFER, mFB);
>+        glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_RENDERBUFFER, mRB);
>+        ASSERT_GLENUM_EQ(GL_FRAMEBUFFER_COMPLETE, glCheckFramebufferStatus(GL_FRAMEBUFFER));
>+
>+        glViewport(0, 0, 2, 2);
>+        glClearColor(1, 0, 0, 1);
>+        glClear(GL_COLOR_BUFFER_BIT);
>+        ASSERT_GL_NO_ERROR();
>+
>+        uint32_t pixel;
>+        glReadPixels(0, 0, 1, 1, GL_RGBA, GL_UNSIGNED_BYTE, &pixel);
>+        ASSERT_EQ(pixel, 0xff0000ff);
>+
>+        mStream = eglCreateStreamKHR(mDisplay, nullptr);
>+        ASSERT_EGL_SUCCESS();
>+
>+        EGLDeviceEXT eglDevice;
>+        eglQueryDisplayAttribEXT(mDisplay, EGL_DEVICE_EXT, (EGLAttrib *)&eglDevice);
>+        eglQueryDeviceAttribEXT(eglDevice, EGL_D3D11_DEVICE_ANGLE, (EGLAttrib *)&mD3D);
>+    }
>+
>+    void TearDown() override
>+    {
>+        EGLBoolean result = eglDestroyStreamKHR(mDisplay, mStream);
>+        ASSERT_EGL_TRUE(result);
>+        ASSERT_EGL_SUCCESS();
>+
>+        glDeleteRenderbuffers(1, &mRB);
>+        glDeleteFramebuffers(1, &mFB);
>+
>+        ANGLETest::TearDown();
>+    }
>+
>+    EGLDisplay mDisplay  = 0;
>+    EGLStreamKHR mStream = 0;
>+    GLuint mRB           = 0;
>+    GLuint mFB           = 0;
>+    ID3D11Device *mD3D;
>+};
>+
>+// Test RGBA texture sampling via EGLStreams
>+TEST_P(D3D11TextureStreamSamplingTest, RGBA)
>+{
>+    EGLWindow *window  = getEGLWindow();
>+    EGLDisplay display = window->getDisplay();
>+    ANGLE_SKIP_TEST_IF(
>+        !IsEGLDisplayExtensionEnabled(display, "EGL_ANGLE_stream_producer_d3d_texture"));
>+
>+    constexpr char kVertShader[] = R"(
>+        attribute vec4 aPos;
>+        varying vec2 vTexCoord;
>+        void main()
>+        {
>+            gl_Position = aPos;
>+            vTexCoord = gl_Position.xy * 0.5 + 0.5;
>+        }
>+    )";
>+    constexpr char kFragShader[] = R"(
>+        #extension GL_NV_EGL_stream_consumer_external : require
>+        precision mediump float;
>+        uniform samplerExternalOES uTex;
>+        varying vec2 vTexCoord;
>+        void main()
>+        {
>+            gl_FragColor = texture2D(uTex, vTexCoord);
>+        }
>+    )";
>+    ANGLE_GL_PROGRAM(prog, kVertShader, kFragShader);
>+    glUseProgram(prog);
>+    glUniform1i(glGetUniformLocation(prog, "uTex"), 0);
>+
>+    GLTexture tex;
>+    glActiveTexture(GL_TEXTURE0);
>+    glBindTexture(GL_TEXTURE_EXTERNAL_OES, tex);
>+    glTexParameteri(GL_TEXTURE_EXTERNAL_OES, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
>+    ASSERT_GL_NO_ERROR();
>+
>+    EGLBoolean result = eglStreamConsumerGLTextureExternalAttribsNV(mDisplay, mStream, nullptr);
>+    ASSERT_EGL_TRUE(result);
>+    ASSERT_EGL_SUCCESS();
>+    glActiveTexture(GL_TEXTURE3);  // Set to an unused slot to ensure StreamConsumer picked up
>+                                   // the current slot.
>+
>+    result = eglCreateStreamProducerD3DTextureANGLE(mDisplay, mStream, nullptr);
>+    ASSERT_EGL_TRUE(result);
>+    ASSERT_EGL_SUCCESS();
>+
>+    // Create and post the d3d11 texture
>+
>+    D3D11_TEXTURE2D_DESC desc = {};
>+    desc.Width                = 1;
>+    desc.Height               = 1;
>+    desc.Format               = DXGI_FORMAT_R8G8B8A8_UNORM;
>+    desc.MipLevels            = 1;
>+    desc.ArraySize            = 1;
>+    desc.SampleDesc.Count     = 1;
>+    desc.Usage                = D3D11_USAGE_DEFAULT;
>+    desc.BindFlags            = D3D11_BIND_SHADER_RESOURCE;
>+
>+    constexpr uint8_t texData[] = {0x10, 0x20, 0x30, 0x40};
>+    D3D11_SUBRESOURCE_DATA subres;
>+    subres.pSysMem     = texData;
>+    subres.SysMemPitch = 4;
>+
>+    ID3D11Texture2D *texture = nullptr;
>+    (void)mD3D->CreateTexture2D(&desc, &subres, &texture);
>+    ASSERT_NE(nullptr, texture);
>+
>+    result = eglStreamPostD3DTextureANGLE(mDisplay, mStream, (void *)texture, nullptr);
>+    ASSERT_EGL_TRUE(result);
>+    ASSERT_EGL_SUCCESS();
>+
>+    // Sample and test
>+
>+    result = eglStreamConsumerAcquireKHR(mDisplay, mStream);
>+    ASSERT_EGL_TRUE(result);
>+    ASSERT_EGL_SUCCESS();
>+
>+    drawQuad(prog, "aPos", 0.0);
>+
>+    uint32_t pixel;
>+    glReadPixels(0, 0, 1, 1, GL_RGBA, GL_UNSIGNED_BYTE, &pixel);
>+    ASSERT_GL_NO_ERROR();
>+    ASSERT_EQ(pixel, static_cast<uint32_t>(0x40302010));
>+
>+    result = eglStreamConsumerReleaseKHR(mDisplay, mStream);
>+    ASSERT_EGL_TRUE(result);
>+    ASSERT_EGL_SUCCESS();
>+}
>+
>+// Test NV12 texture sampling via EGLStreams
>+TEST_P(D3D11TextureStreamSamplingTest, NV12)
>+{
>+    EGLWindow *window  = getEGLWindow();
>+    EGLDisplay display = window->getDisplay();
>+    ANGLE_SKIP_TEST_IF(
>+        !IsEGLDisplayExtensionEnabled(display, "EGL_ANGLE_stream_producer_d3d_texture"));
>+    ANGLE_SKIP_TEST_IF(!CheckNV12TextureSupport(mD3D));
>+
>+    constexpr char kVertShader[] = R"(
>+        attribute vec4 aPos;
>+        varying vec2 vTexCoord;
>+        void main()
>+        {
>+            gl_Position = aPos;
>+            vTexCoord = gl_Position.xy * 0.5 + 0.5;
>+        }
>+    )";
>+    const char kFragShader[]     = R"(
>+        #extension GL_NV_EGL_stream_consumer_external : require
>+        precision mediump float;
>+        uniform samplerExternalOES uTexY;
>+        uniform samplerExternalOES uTexUV;
>+        varying vec2 vTexCoord;
>+        void main()
>+        {
>+            gl_FragColor.r = texture2D(uTexY, vTexCoord).r;
>+            gl_FragColor.gb = texture2D(uTexUV, vTexCoord).rg;
>+            gl_FragColor.a = 1.0;
>+        }
>+    )";
>+    ANGLE_GL_PROGRAM(prog, kVertShader, kFragShader);
>+    glUseProgram(prog);
>+    glUniform1i(glGetUniformLocation(prog, "uTexY"), 0);
>+    glUniform1i(glGetUniformLocation(prog, "uTexUV"), 1);
>+
>+    ASSERT_GL_NO_ERROR();
>+
>+    GLTexture tex[2];
>+    glActiveTexture(GL_TEXTURE0);
>+    glBindTexture(GL_TEXTURE_EXTERNAL_OES, tex[0]);
>+    glTexParameteri(GL_TEXTURE_EXTERNAL_OES, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
>+    ASSERT_GL_NO_ERROR();
>+    glActiveTexture(GL_TEXTURE1);
>+    glBindTexture(GL_TEXTURE_EXTERNAL_OES, tex[1]);
>+    glTexParameteri(GL_TEXTURE_EXTERNAL_OES, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
>+    ASSERT_GL_NO_ERROR();
>+
>+    glActiveTexture(GL_TEXTURE3);  // Set to an unused slot to ensure StreamConsumer picks up
>+                                   // the current slot.
>+    constexpr EGLAttrib consumerAttributes[] = {
>+        EGL_COLOR_BUFFER_TYPE,
>+        EGL_YUV_BUFFER_EXT,
>+        EGL_YUV_NUMBER_OF_PLANES_EXT,
>+        2,
>+        EGL_YUV_PLANE0_TEXTURE_UNIT_NV,
>+        0,
>+        EGL_YUV_PLANE1_TEXTURE_UNIT_NV,
>+        1,
>+        EGL_NONE,
>+    };
>+    EGLBoolean result = eglStreamConsumerGLTextureExternalAttribsNV(
>+        mDisplay, mStream, const_cast<EGLAttrib *>(consumerAttributes));
>+    ASSERT_EGL_TRUE(result);
>+    ASSERT_EGL_SUCCESS();
>+
>+    result = eglCreateStreamProducerD3DTextureANGLE(mDisplay, mStream, nullptr);
>+    ASSERT_EGL_TRUE(result);
>+    ASSERT_EGL_SUCCESS();
>+
>+    // Create and post the d3d11 texture
>+
>+    D3D11_TEXTURE2D_DESC desc = {};
>+    desc.Width                = 2;
>+    desc.Height               = 2;
>+    desc.Format               = DXGI_FORMAT_NV12;
>+    desc.MipLevels            = 1;
>+    desc.ArraySize            = 1;
>+    desc.SampleDesc.Count     = 1;
>+    desc.Usage                = D3D11_USAGE_DEFAULT;
>+    desc.BindFlags            = D3D11_BIND_SHADER_RESOURCE;
>+
>+    /* DXGI_FORMAT_NV12:
>+     * Width and height must be even.
>+     * Direct3D 11 staging resources and initData parameters for this format use
>+     * (rowPitch * (height + (height / 2))) bytes.
>+     * The first (SysMemPitch * height) bytes are the Y plane, the remaining
>+     * (SysMemPitch * (height / 2)) bytes are the UV plane.
>+     */
>+    constexpr uint8_t texData[] = {0x10, 0x20, 0x30, 0x40, 0x50, 0x60};
>+    D3D11_SUBRESOURCE_DATA subres;
>+    subres.pSysMem     = texData;
>+    subres.SysMemPitch = 2;
>+
>+    ID3D11Texture2D *texture = nullptr;
>+    (void)mD3D->CreateTexture2D(&desc, &subres, &texture);
>+    ASSERT_NE(nullptr, texture);
>+
>+    result = eglStreamPostD3DTextureANGLE(mDisplay, mStream, (void *)texture, nullptr);
>+    ASSERT_EGL_TRUE(result);
>+    ASSERT_EGL_SUCCESS();
>+
>+    // Sample and test
>+
>+    result = eglStreamConsumerAcquireKHR(mDisplay, mStream);
>+    ASSERT_EGL_TRUE(result);
>+    ASSERT_EGL_SUCCESS();
>+
>+    drawQuad(prog, "aPos", 0.0);
>+    uint32_t pixel;
>+    glReadPixels(0, 0, 1, 1, GL_RGBA, GL_UNSIGNED_BYTE, &pixel);
>+    ASSERT_EQ(pixel, 0xff605010);
>+
>+    glReadPixels(1, 0, 1, 1, GL_RGBA, GL_UNSIGNED_BYTE, &pixel);
>+    ASSERT_EQ(pixel, 0xff605020);
>+
>+    glReadPixels(0, 1, 1, 1, GL_RGBA, GL_UNSIGNED_BYTE, &pixel);
>+    ASSERT_EQ(pixel, 0xff605030);
>+
>+    glReadPixels(1, 1, 1, 1, GL_RGBA, GL_UNSIGNED_BYTE, &pixel);
>+    ASSERT_EQ(pixel, 0xff605040);
>+
>+    result = eglStreamConsumerReleaseKHR(mDisplay, mStream);
>+    ASSERT_EGL_TRUE(result);
>+    ASSERT_EGL_SUCCESS();
>+}
>+
> // End2end test for rendering an NV12 texture. Renders a YUV quad, reads back the RGB values, and
> // ensures they are correct
> TEST_P(EGLStreamTest, StreamProducerTextureNV12End2End)
> {
>-    EGLWindow *window            = getEGLWindow();
>-    EGLDisplay display           = window->getDisplay();
>-    if (!eglDisplayExtensionEnabled(display, "EGL_ANGLE_stream_producer_d3d_texture_nv12"))
>-    {
>-        std::cout << "Stream producer d3d nv12 texture not supported" << std::endl;
>-        return;
>-    }
>+    EGLWindow *window  = getEGLWindow();
>+    EGLDisplay display = window->getDisplay();
>+    ANGLE_SKIP_TEST_IF(
>+        !IsEGLDisplayExtensionEnabled(display, "EGL_ANGLE_stream_producer_d3d_texture"));
> 
>     bool useESSL3Shaders =
>-        getClientMajorVersion() >= 3 && extensionEnabled("GL_OES_EGL_image_external_essl3");
>+        getClientMajorVersion() >= 3 && IsGLExtensionEnabled("GL_OES_EGL_image_external_essl3");
> 
>     // yuv to rgb conversion shader using Microsoft's given conversion formulas
>-    std::string yuvVS, yuvPS;
>+    const char *yuvVS = nullptr;
>+    const char *yuvPS = nullptr;
>     if (useESSL3Shaders)
>     {
>         yuvVS =
>@@ -431,8 +723,7 @@ TEST_P(EGLStreamTest, StreamProducerTextureNV12End2End)
>             "}\n";
>     }
> 
>-    GLuint program = CompileProgram(yuvVS, yuvPS);
>-    ASSERT_NE(0u, program);
>+    ANGLE_GL_PROGRAM(program, yuvVS, yuvPS);
>     GLuint yUniform  = glGetUniformLocation(program, "y");
>     GLuint uvUniform = glGetUniformLocation(program, "uv");
> 
>@@ -442,8 +733,9 @@ TEST_P(EGLStreamTest, StreamProducerTextureNV12End2End)
>     ID3D11Device *device;
>     eglQueryDeviceAttribEXT(eglDevice, EGL_D3D11_DEVICE_ANGLE, (EGLAttrib *)&device);
> 
>+    ANGLE_SKIP_TEST_IF(!CheckNV12TextureSupport(device));
>+
>     // Create the NV12 D3D11 texture
>-    HRESULT res;
>     D3D11_TEXTURE2D_DESC desc;
>     desc.Width              = yuvtest_width;
>     desc.Height             = yuvtest_height;
>@@ -463,7 +755,8 @@ TEST_P(EGLStreamTest, StreamProducerTextureNV12End2End)
>     subres.SysMemSlicePitch = yuvtest_width * yuvtest_height * 3 / 2;
> 
>     ID3D11Texture2D *texture = nullptr;
>-    res                      = device->CreateTexture2D(&desc, &subres, &texture);
>+    (void)device->CreateTexture2D(&desc, &subres, &texture);
>+    ASSERT_NE(nullptr, texture);
> 
>     // Create the stream
>     const EGLint streamAttributes[] = {
>@@ -505,15 +798,17 @@ TEST_P(EGLStreamTest, StreamProducerTextureNV12End2End)
>         EGL_NONE,
>     };
> 
>-    result = eglCreateStreamProducerD3DTextureNV12ANGLE(display, stream, producerAttributes);
>+    result = eglCreateStreamProducerD3DTextureANGLE(display, stream, producerAttributes);
>     ASSERT_EGL_TRUE(result);
>     ASSERT_EGL_SUCCESS();
> 
>     // Insert the frame
>     EGLAttrib frameAttributes[] = {
>-        EGL_D3D_TEXTURE_SUBRESOURCE_ID_ANGLE, 0, EGL_NONE,
>+        EGL_D3D_TEXTURE_SUBRESOURCE_ID_ANGLE,
>+        0,
>+        EGL_NONE,
>     };
>-    result = eglStreamPostD3DTextureNV12ANGLE(display, stream, (void *)texture, frameAttributes);
>+    result = eglStreamPostD3DTextureANGLE(display, stream, (void *)texture, frameAttributes);
>     ASSERT_EGL_TRUE(result);
>     ASSERT_EGL_SUCCESS();
> 
>@@ -543,5 +838,7 @@ ANGLE_INSTANTIATE_TEST(EGLStreamTest,
>                        ES2_D3D11(),
>                        ES3_D3D11(),
>                        ES2_OPENGL(),
>-                       ES3_OPENGL());
>+                       ES3_OPENGL(),
>+                       ES2_VULKAN());
>+ANGLE_INSTANTIATE_TEST(D3D11TextureStreamSamplingTest, ES2_D3D11(), ES3_D3D11());
> }  // anonymous namespace
>diff --git a/Source/ThirdParty/ANGLE/src/tests/egl_tests/EGLSurfaceTest.cpp b/Source/ThirdParty/ANGLE/src/tests/egl_tests/EGLSurfaceTest.cpp
>index fc2c32a075b..47c36d62e87 100644
>--- a/Source/ThirdParty/ANGLE/src/tests/egl_tests/EGLSurfaceTest.cpp
>+++ b/Source/ThirdParty/ANGLE/src/tests/egl_tests/EGLSurfaceTest.cpp
>@@ -11,21 +11,27 @@
> 
> #include <vector>
> 
>-#include "OSWindow.h"
>+#include "common/platform.h"
> #include "test_utils/ANGLETest.h"
>+#include "util/EGLWindow.h"
>+#include "util/OSWindow.h"
>+#include "util/Timer.h"
> 
> #if defined(ANGLE_ENABLE_D3D11)
>-#define INITGUID
>-#include <guiddef.h>
>+#    define INITGUID
>+#    include <guiddef.h>
> 
>-#include <d3d11.h>
>-#include <dcomp.h>
>+#    include <d3d11.h>
>+#    include <dcomp.h>
> #endif
> 
>+using namespace angle;
>+
> namespace
> {
> 
>-class EGLSurfaceTest : public testing::Test
>+class EGLSurfaceTest : public EGLTest,
>+                       public ::testing::WithParamInterface<angle::PlatformParameters>
> {
>   protected:
>     EGLSurfaceTest()
>@@ -35,12 +41,13 @@ class EGLSurfaceTest : public testing::Test
>           mContext(EGL_NO_CONTEXT),
>           mSecondContext(EGL_NO_CONTEXT),
>           mOSWindow(nullptr)
>-    {
>-    }
>+    {}
> 
>     void SetUp() override
>     {
>-        mOSWindow = CreateOSWindow();
>+        EGLTest::SetUp();
>+
>+        mOSWindow = OSWindow::New();
>         mOSWindow->initialize("EGLSurfaceTest", 64, 64);
>     }
> 
>@@ -80,16 +87,20 @@ class EGLSurfaceTest : public testing::Test
>         }
> 
>         mOSWindow->destroy();
>-        SafeDelete(mOSWindow);
>+        OSWindow::Delete(&mOSWindow);
> 
>         ASSERT_TRUE(mWindowSurface == EGL_NO_SURFACE && mContext == EGL_NO_CONTEXT);
>     }
> 
>-    void initializeDisplay(EGLenum platformType)
>+    void initializeDisplay()
>     {
>-        PFNEGLGETPLATFORMDISPLAYEXTPROC eglGetPlatformDisplayEXT = reinterpret_cast<PFNEGLGETPLATFORMDISPLAYEXTPROC>(eglGetProcAddress("eglGetPlatformDisplayEXT"));
>+        PFNEGLGETPLATFORMDISPLAYEXTPROC eglGetPlatformDisplayEXT =
>+            reinterpret_cast<PFNEGLGETPLATFORMDISPLAYEXTPROC>(
>+                eglGetProcAddress("eglGetPlatformDisplayEXT"));
>         ASSERT_TRUE(eglGetPlatformDisplayEXT != nullptr);
> 
>+        GLenum platformType = GetParam().getRenderer();
>+
>         std::vector<EGLint> displayAttributes;
>         displayAttributes.push_back(EGL_PLATFORM_ANGLE_TYPE_ANGLE);
>         displayAttributes.push_back(platformType);
>@@ -97,12 +108,8 @@ class EGLSurfaceTest : public testing::Test
>         displayAttributes.push_back(EGL_DONT_CARE);
>         displayAttributes.push_back(EGL_PLATFORM_ANGLE_MAX_VERSION_MINOR_ANGLE);
>         displayAttributes.push_back(EGL_DONT_CARE);
>-
>-        if (platformType == EGL_PLATFORM_ANGLE_TYPE_D3D9_ANGLE || platformType == EGL_PLATFORM_ANGLE_TYPE_D3D11_ANGLE)
>-        {
>-            displayAttributes.push_back(EGL_PLATFORM_ANGLE_DEVICE_TYPE_ANGLE);
>-            displayAttributes.push_back(EGL_PLATFORM_ANGLE_DEVICE_TYPE_HARDWARE_ANGLE);
>-        }
>+        displayAttributes.push_back(EGL_PLATFORM_ANGLE_DEVICE_TYPE_ANGLE);
>+        displayAttributes.push_back(EGL_PLATFORM_ANGLE_DEVICE_TYPE_HARDWARE_ANGLE);
>         displayAttributes.push_back(EGL_NONE);
> 
>         mDisplay = eglGetPlatformDisplayEXT(EGL_PLATFORM_ANGLE_ANGLE,
>@@ -137,7 +144,8 @@ class EGLSurfaceTest : public testing::Test
>         surfaceAttributes.push_back(EGL_NONE);
> 
>         // Create first window surface
>-        mWindowSurface = eglCreateWindowSurface(mDisplay, mConfig, mOSWindow->getNativeWindow(), &surfaceAttributes[0]);
>+        mWindowSurface = eglCreateWindowSurface(mDisplay, mConfig, mOSWindow->getNativeWindow(),
>+                                                &surfaceAttributes[0]);
>         ASSERT_TRUE(eglGetError() == EGL_SUCCESS);
> 
>         mPbufferSurface = eglCreatePbufferSurface(mDisplay, mConfig, &surfaceAttributes[0]);
>@@ -146,42 +154,33 @@ class EGLSurfaceTest : public testing::Test
> 
>     void initializeSurfaceWithDefaultConfig()
>     {
>-        const EGLint configAttributes[] =
>-        {
>-            EGL_RED_SIZE, EGL_DONT_CARE,
>-            EGL_GREEN_SIZE, EGL_DONT_CARE,
>-            EGL_BLUE_SIZE, EGL_DONT_CARE,
>-            EGL_ALPHA_SIZE, EGL_DONT_CARE,
>-            EGL_DEPTH_SIZE, EGL_DONT_CARE,
>-            EGL_STENCIL_SIZE, EGL_DONT_CARE,
>-            EGL_SAMPLE_BUFFERS, 0,
>-            EGL_NONE
>-        };
>+        const EGLint configAttributes[] = {EGL_RED_SIZE,
>+                                           EGL_DONT_CARE,
>+                                           EGL_GREEN_SIZE,
>+                                           EGL_DONT_CARE,
>+                                           EGL_BLUE_SIZE,
>+                                           EGL_DONT_CARE,
>+                                           EGL_ALPHA_SIZE,
>+                                           EGL_DONT_CARE,
>+                                           EGL_DEPTH_SIZE,
>+                                           EGL_DONT_CARE,
>+                                           EGL_STENCIL_SIZE,
>+                                           EGL_DONT_CARE,
>+                                           EGL_SAMPLE_BUFFERS,
>+                                           0,
>+                                           EGL_NONE};
> 
>         EGLint configCount;
>         EGLConfig config;
>-        ASSERT_TRUE(eglChooseConfig(mDisplay, configAttributes, &config, 1, &configCount) || (configCount != 1) == EGL_TRUE);
>+        ASSERT_TRUE(eglChooseConfig(mDisplay, configAttributes, &config, 1, &configCount) ||
>+                    (configCount != 1) == EGL_TRUE);
> 
>         initializeSurface(config);
>     }
> 
>     GLuint createProgram()
>     {
>-        const std::string testVertexShaderSource =
>-            R"(attribute highp vec4 position;
>-
>-            void main(void)
>-            {
>-                gl_Position = position;
>-            })";
>-
>-        const std::string testFragmentShaderSource =
>-            R"(void main(void)
>-            {
>-                gl_FragColor = vec4(1.0, 0.0, 0.0, 1.0);
>-            })";
>-
>-        return CompileProgram(testVertexShaderSource, testFragmentShaderSource);
>+        return CompileProgram(angle::essl1_shaders::vs::Simple(), angle::essl1_shaders::fs::Red());
>     }
> 
>     void drawWithProgram(GLuint program)
>@@ -189,19 +188,15 @@ class EGLSurfaceTest : public testing::Test
>         glClearColor(0, 0, 0, 1);
>         glClear(GL_COLOR_BUFFER_BIT);
> 
>-        GLint positionLocation = glGetAttribLocation(program, "position");
>+        GLint positionLocation =
>+            glGetAttribLocation(program, angle::essl1_shaders::PositionAttrib());
> 
>         glUseProgram(program);
> 
>-        const GLfloat vertices[] =
>-        {
>-            -1.0f,  1.0f, 0.5f,
>-            -1.0f, -1.0f, 0.5f,
>-             1.0f, -1.0f, 0.5f,
>+        const GLfloat vertices[] = {
>+            -1.0f, 1.0f, 0.5f, -1.0f, -1.0f, 0.5f, 1.0f, -1.0f, 0.5f,
> 
>-            -1.0f,  1.0f, 0.5f,
>-             1.0f, -1.0f, 0.5f,
>-             1.0f,  1.0f, 0.5f,
>+            -1.0f, 1.0f, 0.5f, 1.0f,  -1.0f, 0.5f, 1.0f, 1.0f,  0.5f,
>         };
> 
>         glVertexAttribPointer(positionLocation, 3, GL_FLOAT, GL_FALSE, 0, vertices);
>@@ -229,7 +224,8 @@ class EGLSurfaceTest : public testing::Test
>         surfaceAttributes.push_back(EGL_NONE);
>         surfaceAttributes.push_back(EGL_NONE);
> 
>-        mWindowSurface = eglCreateWindowSurface(mDisplay, mConfig, mOSWindow->getNativeWindow(), &surfaceAttributes[0]);
>+        mWindowSurface = eglCreateWindowSurface(mDisplay, mConfig, mOSWindow->getNativeWindow(),
>+                                                &surfaceAttributes[0]);
>         ASSERT_TRUE(eglGetError() == EGL_SUCCESS);
> 
>         eglMakeCurrent(mDisplay, mWindowSurface, mWindowSurface, mContext);
>@@ -254,16 +250,15 @@ class EGLSurfaceTest : public testing::Test
> 
> // Test a surface bug where we could have two Window surfaces active
> // at one time, blocking message loops. See http://crbug.com/475085
>-TEST_F(EGLSurfaceTest, MessageLoopBug)
>+TEST_P(EGLSurfaceTest, MessageLoopBug)
> {
>-    const char *extensionsString = eglQueryString(EGL_NO_DISPLAY, EGL_EXTENSIONS);
>-    if (strstr(extensionsString, "EGL_ANGLE_platform_angle_d3d") == nullptr)
>-    {
>-        std::cout << "D3D Platform not supported in ANGLE" << std::endl;
>-        return;
>-    }
>+    // TODO(syoussefi): http://anglebug.com/3123
>+    ANGLE_SKIP_TEST_IF(IsAndroid());
>+
>+    // http://anglebug.com/3138
>+    ANGLE_SKIP_TEST_IF(IsOzone());
> 
>-    initializeDisplay(EGL_PLATFORM_ANGLE_TYPE_D3D11_ANGLE);
>+    initializeDisplay();
>     initializeSurfaceWithDefaultConfig();
> 
>     runMessageLoopTest(EGL_NO_SURFACE, EGL_NO_CONTEXT);
>@@ -271,32 +266,27 @@ TEST_F(EGLSurfaceTest, MessageLoopBug)
> 
> // Tests the message loop bug, but with setting a second context
> // instead of null.
>-TEST_F(EGLSurfaceTest, MessageLoopBugContext)
>+TEST_P(EGLSurfaceTest, MessageLoopBugContext)
> {
>-    const char *extensionsString = eglQueryString(EGL_NO_DISPLAY, EGL_EXTENSIONS);
>-    if (strstr(extensionsString, "EGL_ANGLE_platform_angle_d3d") == nullptr)
>-    {
>-        std::cout << "D3D Platform not supported in ANGLE" << std::endl;
>-        return;
>-    }
>+    // TODO(syoussefi): http://anglebug.com/3123
>+    ANGLE_SKIP_TEST_IF(IsAndroid());
>+
>+    // http://anglebug.com/3138
>+    ANGLE_SKIP_TEST_IF(IsOzone());
> 
>-    initializeDisplay(EGL_PLATFORM_ANGLE_TYPE_D3D11_ANGLE);
>+    initializeDisplay();
>     initializeSurfaceWithDefaultConfig();
> 
>     runMessageLoopTest(mPbufferSurface, mSecondContext);
> }
> 
> // Test a bug where calling makeCurrent twice would release the surface
>-TEST_F(EGLSurfaceTest, MakeCurrentTwice)
>+TEST_P(EGLSurfaceTest, MakeCurrentTwice)
> {
>-#if defined(ANGLE_PLATFORM_APPLE) && !defined(ANGLE_STANDALONE_BUILD)
>-    // TODO(cwallez) Make context creation return at least an OpenGL ES 2 context on
>-    // the Mac trybots.
>-    std::cout << "Test skipped temporarily skipped on the Mac trybots" << std::endl;
>-    return;
>-#endif
>+    // TODO(syoussefi): http://anglebug.com/3123
>+    ANGLE_SKIP_TEST_IF(IsAndroid());
> 
>-    initializeDisplay(EGL_PLATFORM_ANGLE_TYPE_DEFAULT_ANGLE);
>+    initializeDisplay();
>     initializeSurfaceWithDefaultConfig();
> 
>     eglMakeCurrent(mDisplay, mWindowSurface, mWindowSurface, mContext);
>@@ -309,17 +299,18 @@ TEST_F(EGLSurfaceTest, MakeCurrentTwice)
>     glClear(GL_COLOR_BUFFER_BIT);
> }
> 
>-// Test that the D3D window surface is correctly resized after calling swapBuffers
>-TEST_F(EGLSurfaceTest, ResizeD3DWindow)
>+// Test that the window surface is correctly resized after calling swapBuffers
>+TEST_P(EGLSurfaceTest, ResizeWindow)
> {
>-    const char *extensionsString = eglQueryString(EGL_NO_DISPLAY, EGL_EXTENSIONS);
>-    if (strstr(extensionsString, "EGL_ANGLE_platform_angle_d3d") == nullptr)
>-    {
>-        std::cout << "D3D Platform not supported in ANGLE" << std::endl;
>-        return;
>-    }
>+    // TODO(syoussefi): http://anglebug.com/3123
>+    ANGLE_SKIP_TEST_IF(IsAndroid());
>+
>+    GLenum platform               = GetParam().getRenderer();
>+    bool platformSupportsZeroSize = platform == EGL_PLATFORM_ANGLE_TYPE_D3D11_ANGLE ||
>+                                    platform == EGL_PLATFORM_ANGLE_TYPE_D3D9_ANGLE;
>+    int minSize = platformSupportsZeroSize ? 0 : 1;
> 
>-    initializeDisplay(EGL_PLATFORM_ANGLE_TYPE_D3D11_ANGLE);
>+    initializeDisplay();
>     initializeSurfaceWithDefaultConfig();
>     initializeContext();
> 
>@@ -332,15 +323,19 @@ TEST_F(EGLSurfaceTest, ResizeD3DWindow)
>     ASSERT_EGL_SUCCESS();
>     ASSERT_EQ(64, height);  // initial size
> 
>-    // set window's height to 0
>-    mOSWindow->resize(64, 0);
>+    // set window's height to 0 (if possible) or 1
>+    mOSWindow->resize(64, minSize);
> 
>     eglSwapBuffers(mDisplay, mWindowSurface);
>     ASSERT_EGL_SUCCESS();
> 
>+    // TODO(syoussefi): the GLX implementation still reads the window size as 64x64 through
>+    // XGetGeometry.  http://anglebug.com/3122
>+    ANGLE_SKIP_TEST_IF(IsLinux() && IsOpenGL());
>+
>     eglQuerySurface(mDisplay, mWindowSurface, EGL_HEIGHT, &height);
>     ASSERT_EGL_SUCCESS();
>-    ASSERT_EQ(0, height);
>+    ASSERT_EQ(minSize, height);
> 
>     // restore window's height
>     mOSWindow->resize(64, 64);
>@@ -353,33 +348,90 @@ TEST_F(EGLSurfaceTest, ResizeD3DWindow)
>     ASSERT_EQ(64, height);
> }
> 
>-// Test creating a surface that supports a EGLConfig with 16bit
>-// support GL_RGB565
>-TEST_F(EGLSurfaceTest, CreateWithEGLConfig5650Support)
>+// Test that swap interval works.
>+TEST_P(EGLSurfaceTest, SwapInterval)
> {
>-    if (!ANGLETest::eglDisplayExtensionEnabled(EGL_NO_DISPLAY, "EGL_ANGLE_platform_angle_d3d"))
>+    // On OSX, maxInterval >= 1 is advertised, but is not implemented.  http://anglebug.com/3140
>+    ANGLE_SKIP_TEST_IF(IsOSX());
>+    // Flaky hang on Nexus 5X and 6P. http://anglebug.com/3364
>+    ANGLE_SKIP_TEST_IF((IsNexus5X() || IsNexus6P()) &&
>+                       GetParam().getRenderer() == EGL_PLATFORM_ANGLE_TYPE_OPENGLES_ANGLE);
>+
>+    initializeDisplay();
>+    initializeSurfaceWithDefaultConfig();
>+    initializeContext();
>+
>+    eglMakeCurrent(mDisplay, mWindowSurface, mWindowSurface, mContext);
>+    eglSwapBuffers(mDisplay, mWindowSurface);
>+    ASSERT_EGL_SUCCESS();
>+
>+    EGLint minInterval, maxInterval;
>+
>+    ASSERT_TRUE(eglGetConfigAttrib(mDisplay, mConfig, EGL_MIN_SWAP_INTERVAL, &minInterval));
>+    ASSERT_TRUE(eglGetConfigAttrib(mDisplay, mConfig, EGL_MAX_SWAP_INTERVAL, &maxInterval));
>+
>+    for (int iter = 0; iter < 2; ++iter)
>     {
>-        std::cout << "D3D Platform not supported in ANGLE" << std::endl;
>-        return;
>+        if (maxInterval >= 1)
>+        {
>+            std::unique_ptr<Timer> timer(CreateTimer());
>+
>+            eglSwapInterval(mDisplay, 1);
>+            timer->start();
>+            for (int i = 0; i < 180; ++i)
>+            {
>+                eglSwapBuffers(mDisplay, mWindowSurface);
>+            }
>+            timer->stop();
>+            ASSERT_EGL_SUCCESS();
>+
>+            // 120 frames at 60fps should take 3s.  At lower fps, it should take even longer.  At
>+            // 144fps, it would take 1.25s.  Let's use 1s as a lower bound.
>+            ASSERT_GT(timer->getElapsedTime(), 1);
>+        }
>+
>+        if (minInterval <= 0)
>+        {
>+            std::unique_ptr<Timer> timer(CreateTimer());
>+
>+            eglSwapInterval(mDisplay, 0);
>+            timer->start();
>+            for (int i = 0; i < 100; ++i)
>+            {
>+                eglSwapBuffers(mDisplay, mWindowSurface);
>+
>+                // Second eglSwapBuffers causes an EGL_BAD_SURFACE on Nvidia shield tv.
>+                // http://anglebug.com/3144.
>+                ANGLE_SKIP_TEST_IF(IsNVIDIAShield());
>+            }
>+            timer->stop();
>+            ASSERT_EGL_SUCCESS();
>+
>+            // 100 no-op swaps should be fairly fast, though there is no guarantee how fast it can
>+            // be. 10ms per swap is probably a safe upper bound.
>+            //
>+            // TODO(syoussefi): if a surface doesn't truly allow no-vsync, this can fail.  Until
>+            // there's a way to query the exact minInterval from the surface, this test cannot be
>+            // enabled.
>+            // ASSERT_LT(timer->getElapsedTime(), 1);
>+        }
>     }
>+}
> 
>-    const EGLint configAttributes[] =
>-    {
>-        EGL_RED_SIZE, 5,
>-        EGL_GREEN_SIZE, 6,
>-        EGL_BLUE_SIZE, 5,
>-        EGL_ALPHA_SIZE, 0,
>-        EGL_DEPTH_SIZE, 0,
>-        EGL_STENCIL_SIZE, 0,
>-        EGL_SAMPLE_BUFFERS, 0,
>-        EGL_NONE
>-    };
>+// Test creating a surface that supports a EGLConfig with 16bit
>+// support GL_RGB565
>+TEST_P(EGLSurfaceTest, CreateWithEGLConfig5650Support)
>+{
>+    const EGLint configAttributes[] = {
>+        EGL_RED_SIZE,   5, EGL_GREEN_SIZE,   6, EGL_BLUE_SIZE,      5, EGL_ALPHA_SIZE, 0,
>+        EGL_DEPTH_SIZE, 0, EGL_STENCIL_SIZE, 0, EGL_SAMPLE_BUFFERS, 0, EGL_NONE};
> 
>-    initializeDisplay(EGL_PLATFORM_ANGLE_TYPE_D3D11_ANGLE);
>+    initializeDisplay();
>     EGLConfig config;
>     if (EGLWindow::FindEGLConfig(mDisplay, configAttributes, &config) == EGL_FALSE)
>     {
>-        std::cout << "EGLConfig for a GL_RGB565 surface is not supported, skipping test" << std::endl;
>+        std::cout << "EGLConfig for a GL_RGB565 surface is not supported, skipping test"
>+                  << std::endl;
>         return;
>     }
> 
>@@ -397,31 +449,18 @@ TEST_F(EGLSurfaceTest, CreateWithEGLConfig5650Support)
> 
> // Test creating a surface that supports a EGLConfig with 16bit
> // support GL_RGBA4
>-TEST_F(EGLSurfaceTest, CreateWithEGLConfig4444Support)
>+TEST_P(EGLSurfaceTest, CreateWithEGLConfig4444Support)
> {
>-    if (!ANGLETest::eglDisplayExtensionEnabled(EGL_NO_DISPLAY, "EGL_ANGLE_platform_angle_d3d"))
>-    {
>-        std::cout << "D3D Platform not supported in ANGLE" << std::endl;
>-        return;
>-    }
>-
>-    const EGLint configAttributes[] =
>-    {
>-        EGL_RED_SIZE, 4,
>-        EGL_GREEN_SIZE, 4,
>-        EGL_BLUE_SIZE, 4,
>-        EGL_ALPHA_SIZE, 4,
>-        EGL_DEPTH_SIZE, 0,
>-        EGL_STENCIL_SIZE, 0,
>-        EGL_SAMPLE_BUFFERS, 0,
>-        EGL_NONE
>-    };
>+    const EGLint configAttributes[] = {
>+        EGL_RED_SIZE,   4, EGL_GREEN_SIZE,   4, EGL_BLUE_SIZE,      4, EGL_ALPHA_SIZE, 4,
>+        EGL_DEPTH_SIZE, 0, EGL_STENCIL_SIZE, 0, EGL_SAMPLE_BUFFERS, 0, EGL_NONE};
> 
>-    initializeDisplay(EGL_PLATFORM_ANGLE_TYPE_D3D11_ANGLE);
>+    initializeDisplay();
>     EGLConfig config;
>     if (EGLWindow::FindEGLConfig(mDisplay, configAttributes, &config) == EGL_FALSE)
>     {
>-        std::cout << "EGLConfig for a GL_RGBA4 surface is not supported, skipping test" << std::endl;
>+        std::cout << "EGLConfig for a GL_RGBA4 surface is not supported, skipping test"
>+                  << std::endl;
>         return;
>     }
> 
>@@ -439,31 +478,18 @@ TEST_F(EGLSurfaceTest, CreateWithEGLConfig4444Support)
> 
> // Test creating a surface that supports a EGLConfig with 16bit
> // support GL_RGB5_A1
>-TEST_F(EGLSurfaceTest, CreateWithEGLConfig5551Support)
>+TEST_P(EGLSurfaceTest, CreateWithEGLConfig5551Support)
> {
>-    if (!ANGLETest::eglDisplayExtensionEnabled(EGL_NO_DISPLAY, "EGL_ANGLE_platform_angle_d3d"))
>-    {
>-        std::cout << "D3D Platform not supported in ANGLE" << std::endl;
>-        return;
>-    }
>-
>-    const EGLint configAttributes[] =
>-    {
>-        EGL_RED_SIZE, 5,
>-        EGL_GREEN_SIZE, 5,
>-        EGL_BLUE_SIZE, 5,
>-        EGL_ALPHA_SIZE, 1,
>-        EGL_DEPTH_SIZE, 0,
>-        EGL_STENCIL_SIZE, 0,
>-        EGL_SAMPLE_BUFFERS, 0,
>-        EGL_NONE
>-    };
>+    const EGLint configAttributes[] = {
>+        EGL_RED_SIZE,   5, EGL_GREEN_SIZE,   5, EGL_BLUE_SIZE,      5, EGL_ALPHA_SIZE, 1,
>+        EGL_DEPTH_SIZE, 0, EGL_STENCIL_SIZE, 0, EGL_SAMPLE_BUFFERS, 0, EGL_NONE};
> 
>-    initializeDisplay(EGL_PLATFORM_ANGLE_TYPE_D3D11_ANGLE);
>+    initializeDisplay();
>     EGLConfig config;
>     if (EGLWindow::FindEGLConfig(mDisplay, configAttributes, &config) == EGL_FALSE)
>     {
>-        std::cout << "EGLConfig for a GL_RGB5_A1 surface is not supported, skipping test" << std::endl;
>+        std::cout << "EGLConfig for a GL_RGB5_A1 surface is not supported, skipping test"
>+                  << std::endl;
>         return;
>     }
> 
>@@ -480,27 +506,13 @@ TEST_F(EGLSurfaceTest, CreateWithEGLConfig5551Support)
> }
> 
> // Test creating a surface that supports a EGLConfig without alpha support
>-TEST_F(EGLSurfaceTest, CreateWithEGLConfig8880Support)
>+TEST_P(EGLSurfaceTest, CreateWithEGLConfig8880Support)
> {
>-    if (!ANGLETest::eglDisplayExtensionEnabled(EGL_NO_DISPLAY, "EGL_ANGLE_platform_angle_d3d"))
>-    {
>-        std::cout << "D3D Platform not supported in ANGLE" << std::endl;
>-        return;
>-    }
>-
>-    const EGLint configAttributes[] =
>-    {
>-        EGL_RED_SIZE, 8,
>-        EGL_GREEN_SIZE, 8,
>-        EGL_BLUE_SIZE, 8,
>-        EGL_ALPHA_SIZE, 0,
>-        EGL_DEPTH_SIZE, 0,
>-        EGL_STENCIL_SIZE, 0,
>-        EGL_SAMPLE_BUFFERS, 0,
>-        EGL_NONE
>-    };
>+    const EGLint configAttributes[] = {
>+        EGL_RED_SIZE,   8, EGL_GREEN_SIZE,   8, EGL_BLUE_SIZE,      8, EGL_ALPHA_SIZE, 0,
>+        EGL_DEPTH_SIZE, 0, EGL_STENCIL_SIZE, 0, EGL_SAMPLE_BUFFERS, 0, EGL_NONE};
> 
>-    initializeDisplay(EGL_PLATFORM_ANGLE_TYPE_D3D11_ANGLE);
>+    initializeDisplay();
>     EGLConfig config;
>     if (EGLWindow::FindEGLConfig(mDisplay, configAttributes, &config) == EGL_FALSE)
>     {
>@@ -521,16 +533,72 @@ TEST_F(EGLSurfaceTest, CreateWithEGLConfig8880Support)
>     glDeleteProgram(program);
> }
> 
>+TEST_P(EGLSurfaceTest, FixedSizeWindow)
>+{
>+    const EGLint configAttributes[] = {
>+        EGL_RED_SIZE,   8, EGL_GREEN_SIZE,   8, EGL_BLUE_SIZE,      8, EGL_ALPHA_SIZE, 0,
>+        EGL_DEPTH_SIZE, 0, EGL_STENCIL_SIZE, 0, EGL_SAMPLE_BUFFERS, 0, EGL_NONE};
>+
>+    initializeDisplay();
>+    ANGLE_SKIP_TEST_IF(EGLWindow::FindEGLConfig(mDisplay, configAttributes, &mConfig) == EGL_FALSE);
>+
>+    ANGLE_SKIP_TEST_IF(!IsEGLDisplayExtensionEnabled(mDisplay, "EGL_ANGLE_window_fixed_size"));
>+
>+    constexpr EGLint kInitialSize = 64;
>+    constexpr EGLint kUpdateSize  = 32;
>+
>+    EGLint surfaceAttributes[] = {
>+        EGL_FIXED_SIZE_ANGLE, EGL_TRUE, EGL_WIDTH, kInitialSize, EGL_HEIGHT, kInitialSize, EGL_NONE,
>+    };
>+
>+    // Create first window surface
>+    mWindowSurface =
>+        eglCreateWindowSurface(mDisplay, mConfig, mOSWindow->getNativeWindow(), surfaceAttributes);
>+    ASSERT_EGL_SUCCESS();
>+    ASSERT_NE(EGL_NO_SURFACE, mWindowSurface);
>+
>+    initializeContext();
>+    EXPECT_EGL_TRUE(eglMakeCurrent(mDisplay, mWindowSurface, mWindowSurface, mContext));
>+    ASSERT_EGL_SUCCESS();
>+
>+    EGLint queryIsFixedSize = 0;
>+    EXPECT_EGL_TRUE(
>+        eglQuerySurface(mDisplay, mWindowSurface, EGL_FIXED_SIZE_ANGLE, &queryIsFixedSize));
>+    ASSERT_EGL_SUCCESS();
>+    EXPECT_EGL_TRUE(queryIsFixedSize);
>+
>+    EGLint queryWidth = 0;
>+    EXPECT_EGL_TRUE(eglQuerySurface(mDisplay, mWindowSurface, EGL_WIDTH, &queryWidth));
>+    ASSERT_EGL_SUCCESS();
>+    EXPECT_EQ(kInitialSize, queryWidth);
>+
>+    EGLint queryHeight = 0;
>+    EXPECT_EGL_TRUE(eglQuerySurface(mDisplay, mWindowSurface, EGL_HEIGHT, &queryHeight));
>+    ASSERT_EGL_SUCCESS();
>+    EXPECT_EQ(kInitialSize, queryHeight);
>+
>+    // Update the size
>+    EXPECT_EGL_TRUE(eglSurfaceAttrib(mDisplay, mWindowSurface, EGL_WIDTH, kUpdateSize));
>+    ASSERT_EGL_SUCCESS();
>+
>+    EXPECT_EGL_TRUE(eglWaitNative(EGL_CORE_NATIVE_ENGINE));
>+    ASSERT_EGL_SUCCESS();
>+
>+    EGLint queryUpdatedWidth = 0;
>+    EXPECT_EGL_TRUE(eglQuerySurface(mDisplay, mWindowSurface, EGL_WIDTH, &queryUpdatedWidth));
>+    ASSERT_EGL_SUCCESS();
>+    EXPECT_EQ(kUpdateSize, queryUpdatedWidth);
>+}
>+
> #if defined(ANGLE_ENABLE_D3D11)
>+class EGLSurfaceTestD3D11 : public EGLSurfaceTest
>+{};
>+
> // Test that rendering to an IDCompositionSurface using a pbuffer works.
>-TEST_F(EGLSurfaceTest, CreateDirectCompositionSurface)
>+TEST_P(EGLSurfaceTestD3D11, CreateDirectCompositionSurface)
> {
>-    if (!ANGLETest::eglDisplayExtensionEnabled(EGL_NO_DISPLAY, "EGL_ANGLE_platform_angle_d3d"))
>-    {
>-        std::cout << "D3D Platform not supported in ANGLE" << std::endl;
>-        return;
>-    }
>-    initializeDisplay(EGL_PLATFORM_ANGLE_TYPE_D3D11_ANGLE);
>+    ANGLE_SKIP_TEST_IF(!IsEGLClientExtensionEnabled("EGL_ANGLE_platform_angle_d3d"));
>+    initializeDisplay();
> 
>     EGLAttrib device       = 0;
>     EGLAttrib newEglDevice = 0;
>@@ -598,5 +666,87 @@ TEST_F(EGLSurfaceTest, CreateDirectCompositionSurface)
>     glDeleteProgram(program);
> }
> 
>-#endif
>+TEST_P(EGLSurfaceTestD3D11, CreateSurfaceWithMSAA)
>+{
>+    ANGLE_SKIP_TEST_IF(!IsEGLClientExtensionEnabled("EGL_ANGLE_platform_angle_d3d"));
>+
>+    // clang-format off
>+    const EGLint configAttributes[] =
>+    {
>+        EGL_RED_SIZE, 8,
>+        EGL_GREEN_SIZE, 8,
>+        EGL_BLUE_SIZE, 8,
>+        EGL_ALPHA_SIZE, 0,
>+        EGL_DEPTH_SIZE, 0,
>+        EGL_STENCIL_SIZE, 0,
>+        EGL_SAMPLE_BUFFERS, 1,
>+        EGL_SAMPLES, 4,
>+        EGL_NONE
>+    };
>+    // clang-format on
>+
>+    initializeDisplay();
>+    EGLConfig config;
>+    if (EGLWindow::FindEGLConfig(mDisplay, configAttributes, &config) == EGL_FALSE)
>+    {
>+        std::cout << "EGLConfig for 4xMSAA is not supported, skipping test" << std::endl;
>+        return;
>+    }
>+
>+    initializeSurface(config);
>+
>+    eglMakeCurrent(mDisplay, mWindowSurface, mWindowSurface, mContext);
>+    ASSERT_EGL_SUCCESS();
>+
>+    GLuint program = createProgram();
>+    ASSERT_NE(0u, program);
>+
>+    glClearColor(0, 0, 0, 1);
>+    glClear(GL_COLOR_BUFFER_BIT);
>+
>+    GLint positionLocation = glGetAttribLocation(program, angle::essl1_shaders::PositionAttrib());
>+    ASSERT_NE(-1, positionLocation);
>+
>+    glUseProgram(program);
>+
>+    const GLfloat halfPixelOffset = 0.5f * 2.0f / mOSWindow->getWidth();
>+    // clang-format off
>+    const GLfloat vertices[] =
>+    {
>+        -1.0f + halfPixelOffset,  1.0f, 0.5f,
>+        -1.0f + halfPixelOffset, -1.0f, 0.5f,
>+         1.0f,                   -1.0f, 0.5f
>+    };
>+    // clang-format on
>+
>+    glVertexAttribPointer(positionLocation, 3, GL_FLOAT, GL_FALSE, 0, vertices);
>+    glEnableVertexAttribArray(positionLocation);
>+
>+    glDrawArrays(GL_TRIANGLES, 0, 3);
>+
>+    glDisableVertexAttribArray(positionLocation);
>+    glVertexAttribPointer(positionLocation, 4, GL_FLOAT, GL_FALSE, 0, nullptr);
>+
>+    EXPECT_PIXEL_NEAR(0, 0, 127, 0, 0, 255, 10);
>+    EXPECT_GL_NO_ERROR();
>+
>+    glDeleteProgram(program);
> }
>+
>+#endif  // ANGLE_ENABLE_D3D11
>+
>+}  // anonymous namespace
>+
>+ANGLE_INSTANTIATE_TEST(EGLSurfaceTest,
>+                       ES2_D3D9(),
>+                       ES2_D3D11(),
>+                       ES3_D3D11(),
>+                       ES2_OPENGL(),
>+                       ES3_OPENGL(),
>+                       ES2_OPENGLES(),
>+                       ES3_OPENGLES(),
>+                       ES2_VULKAN());
>+
>+#if defined(ANGLE_ENABLE_D3D11)
>+ANGLE_INSTANTIATE_TEST(EGLSurfaceTestD3D11, ES2_D3D11(), ES3_D3D11());
>+#endif
>diff --git a/Source/ThirdParty/ANGLE/src/tests/egl_tests/EGLSurfacelessContextTest.cpp b/Source/ThirdParty/ANGLE/src/tests/egl_tests/EGLSurfacelessContextTest.cpp
>index a95a005b805..bd714872450 100644
>--- a/Source/ThirdParty/ANGLE/src/tests/egl_tests/EGLSurfacelessContextTest.cpp
>+++ b/Source/ThirdParty/ANGLE/src/tests/egl_tests/EGLSurfacelessContextTest.cpp
>@@ -9,9 +9,6 @@
> 
> #include <gtest/gtest.h>
> 
>-#include <EGL/egl.h>
>-#include <EGL/eglext.h>
>-
> #include "test_utils/ANGLETest.h"
> #include "test_utils/angle_test_configs.h"
> #include "test_utils/gl_raii.h"
>@@ -21,17 +18,15 @@ using namespace angle;
> namespace
> {
> 
>-class EGLSurfacelessContextTest : public ANGLETest
>+class EGLSurfacelessContextTest : public EGLTest,
>+                                  public testing::WithParamInterface<PlatformParameters>
> {
>   public:
>     EGLSurfacelessContextTest() : mDisplay(0) {}
> 
>     void SetUp() override
>     {
>-        PFNEGLGETPLATFORMDISPLAYEXTPROC eglGetPlatformDisplayEXT =
>-            reinterpret_cast<PFNEGLGETPLATFORMDISPLAYEXTPROC>(
>-                eglGetProcAddress("eglGetPlatformDisplayEXT"));
>-        ASSERT_TRUE(eglGetPlatformDisplayEXT != nullptr);
>+        EGLTest::SetUp();
> 
>         EGLint dispattrs[] = {EGL_PLATFORM_ANGLE_TYPE_ANGLE, GetParam().getRenderer(), EGL_NONE};
>         mDisplay           = eglGetPlatformDisplayEXT(
>@@ -71,7 +66,7 @@ class EGLSurfacelessContextTest : public ANGLETest
>             eglDestroyContext(mDisplay, mContext);
>         }
> 
>-        if (mContext != EGL_NO_SURFACE)
>+        if (mPbuffer != EGL_NO_SURFACE)
>         {
>             eglDestroySurface(mDisplay, mPbuffer);
>         }
>@@ -112,7 +107,7 @@ class EGLSurfacelessContextTest : public ANGLETest
> 
>     bool checkExtension(bool verbose = true) const
>     {
>-        if (!ANGLETest::eglDisplayExtensionEnabled(mDisplay, "EGL_KHR_surfaceless_context"))
>+        if (!IsEGLDisplayExtensionEnabled(mDisplay, "EGL_KHR_surfaceless_context"))
>         {
>             if (verbose)
>             {
>@@ -265,4 +260,8 @@ TEST_P(EGLSurfacelessContextTest, Switcheroo)
> 
> }  // anonymous namespace
> 
>-ANGLE_INSTANTIATE_TEST(EGLSurfacelessContextTest, ES2_D3D9(), ES2_D3D11(), ES2_OPENGL());
>+ANGLE_INSTANTIATE_TEST(EGLSurfacelessContextTest,
>+                       ES2_D3D9(),
>+                       ES2_D3D11(),
>+                       ES2_OPENGL(),
>+                       ES2_VULKAN());
>diff --git a/Source/ThirdParty/ANGLE/src/tests/egl_tests/EGLSyncControlTest.cpp b/Source/ThirdParty/ANGLE/src/tests/egl_tests/EGLSyncControlTest.cpp
>index 8fb65f14c42..528ad69b21d 100644
>--- a/Source/ThirdParty/ANGLE/src/tests/egl_tests/EGLSyncControlTest.cpp
>+++ b/Source/ThirdParty/ANGLE/src/tests/egl_tests/EGLSyncControlTest.cpp
>@@ -8,12 +8,10 @@
> //   Tests pertaining to eglGetSyncValuesCHROMIUM.
> 
> #include <d3d11.h>
>-#include <EGL/egl.h>
>-#include <EGL/eglext.h>
> 
>-#include "com_utils.h"
>-#include "OSWindow.h"
> #include "test_utils/ANGLETest.h"
>+#include "util/OSWindow.h"
>+#include "util/com_utils.h"
> 
> using namespace angle;
> 
>@@ -66,7 +64,7 @@ class EGLSyncControlTest : public testing::Test
>         SafeRelease(mDevice);
>         SafeRelease(mDeviceContext);
> 
>-        SafeDelete(mOSWindow);
>+        OSWindow::Delete(&mOSWindow);
> 
>         if (mSurface != EGL_NO_SURFACE)
>         {
>@@ -112,7 +110,7 @@ class EGLSyncControlTest : public testing::Test
>                                    EGL_NONE};
> 
>         // Create an OS Window
>-        mOSWindow = CreateOSWindow();
>+        mOSWindow = OSWindow::New();
>         mOSWindow->initialize("EGLSyncControlTest", 64, 64);
>         mOSWindow->setVisible(true);
> 
>diff --git a/Source/ThirdParty/ANGLE/src/tests/egl_tests/EGLSyncTest.cpp b/Source/ThirdParty/ANGLE/src/tests/egl_tests/EGLSyncTest.cpp
>new file mode 100644
>index 00000000000..7ac242083e7
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/tests/egl_tests/EGLSyncTest.cpp
>@@ -0,0 +1,245 @@
>+//
>+// Copyright 2019 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// EGLSyncTest.cpp:
>+//   Tests of EGL_KHR_fence_sync and EGL_KHR_wait_sync extensions.
>+
>+#include <gtest/gtest.h>
>+
>+#include "test_utils/ANGLETest.h"
>+#include "test_utils/angle_test_configs.h"
>+#include "util/EGLWindow.h"
>+
>+using namespace angle;
>+
>+class EGLSyncTest : public ANGLETest
>+{
>+  protected:
>+    bool hasFenceSyncExtension() const
>+    {
>+        return IsEGLDisplayExtensionEnabled(getEGLWindow()->getDisplay(), "EGL_KHR_fence_sync");
>+    }
>+    bool hasWaitSyncExtension() const
>+    {
>+        return hasFenceSyncExtension() &&
>+               IsEGLDisplayExtensionEnabled(getEGLWindow()->getDisplay(), "EGL_KHR_wait_sync");
>+    }
>+    bool hasGLSyncExtension() const { return IsGLExtensionEnabled("GL_OES_EGL_sync"); }
>+};
>+
>+// Test error cases for all EGL_KHR_fence_sync functions
>+TEST_P(EGLSyncTest, FenceSyncErrors)
>+{
>+    ANGLE_SKIP_TEST_IF(!hasFenceSyncExtension());
>+
>+    EGLDisplay display = getEGLWindow()->getDisplay();
>+
>+    // If the client API doesn't have the necessary extension, test that sync creation fails and
>+    // ignore the rest of the tests.
>+    if (!hasGLSyncExtension())
>+    {
>+        EXPECT_EQ(EGL_NO_SYNC_KHR, eglCreateSyncKHR(display, EGL_SYNC_FENCE_KHR, nullptr));
>+        EXPECT_EGL_ERROR(EGL_BAD_MATCH);
>+    }
>+
>+    ANGLE_SKIP_TEST_IF(!hasGLSyncExtension());
>+
>+    EGLContext context     = eglGetCurrentContext();
>+    EGLSurface drawSurface = eglGetCurrentSurface(EGL_DRAW);
>+    EGLSurface readSurface = eglGetCurrentSurface(EGL_READ);
>+
>+    EXPECT_NE(context, EGL_NO_CONTEXT);
>+    EXPECT_NE(drawSurface, EGL_NO_SURFACE);
>+    EXPECT_NE(readSurface, EGL_NO_SURFACE);
>+
>+    // CreateSync with no attribute shouldn't cause an error
>+    EGLSyncKHR sync = eglCreateSyncKHR(display, EGL_SYNC_FENCE_KHR, nullptr);
>+    EXPECT_NE(sync, EGL_NO_SYNC_KHR);
>+
>+    EXPECT_EGL_TRUE(eglDestroySyncKHR(display, sync));
>+
>+    // CreateSync with empty attribute shouldn't cause an error
>+    const EGLint emptyAttributes[] = {EGL_NONE};
>+    sync                           = eglCreateSyncKHR(display, EGL_SYNC_FENCE_KHR, emptyAttributes);
>+    EXPECT_NE(sync, EGL_NO_SYNC_KHR);
>+
>+    // DestroySync generates BAD_PARAMETER if the sync is not valid
>+    EXPECT_EGL_FALSE(eglDestroySyncKHR(display, reinterpret_cast<EGLSyncKHR>(20)));
>+    EXPECT_EGL_ERROR(EGL_BAD_PARAMETER);
>+
>+    // CreateSync generates BAD_DISPLAY if display is not valid
>+    EXPECT_EQ(EGL_NO_SYNC_KHR, eglCreateSyncKHR(EGL_NO_DISPLAY, EGL_SYNC_FENCE_KHR, nullptr));
>+    EXPECT_EGL_ERROR(EGL_BAD_DISPLAY);
>+
>+    // CreateSync generates BAD_ATTRIBUTE if attribute is neither nullptr nor empty.
>+    const EGLint nonEmptyAttributes[] = {
>+        EGL_CL_EVENT_HANDLE,
>+        0,
>+        EGL_NONE,
>+    };
>+    EXPECT_EQ(EGL_NO_SYNC_KHR, eglCreateSyncKHR(display, EGL_SYNC_FENCE_KHR, nonEmptyAttributes));
>+    EXPECT_EGL_ERROR(EGL_BAD_ATTRIBUTE);
>+
>+    // CreateSync generates BAD_ATTRIBUTE if type is not valid
>+    EXPECT_EQ(EGL_NO_SYNC_KHR, eglCreateSyncKHR(display, 0, nullptr));
>+    EXPECT_EGL_ERROR(EGL_BAD_ATTRIBUTE);
>+
>+    // CreateSync generates BAD_MATCH if no context is current
>+    eglMakeCurrent(display, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT);
>+    EXPECT_EQ(EGL_NO_SYNC_KHR, eglCreateSyncKHR(display, EGL_SYNC_FENCE_KHR, nullptr));
>+    EXPECT_EGL_ERROR(EGL_BAD_MATCH);
>+    eglMakeCurrent(display, drawSurface, readSurface, context);
>+
>+    // ClientWaitSync generates EGL_BAD_PARAMETER if the sync object is not valid
>+    EXPECT_EGL_FALSE(eglClientWaitSyncKHR(display, reinterpret_cast<EGLSyncKHR>(30), 0, 0));
>+    EXPECT_EGL_ERROR(EGL_BAD_PARAMETER);
>+
>+    // GetSyncAttrib generates EGL_BAD_PARAMETER if the sync object is not valid, and value is not
>+    // modified
>+    constexpr EGLint kSentinelAttribValue = 123456789;
>+    EGLint attribValue                    = kSentinelAttribValue;
>+    EXPECT_EGL_FALSE(eglGetSyncAttribKHR(display, reinterpret_cast<EGLSyncKHR>(40),
>+                                         EGL_SYNC_TYPE_KHR, &attribValue));
>+    EXPECT_EGL_ERROR(EGL_BAD_PARAMETER);
>+    EXPECT_EQ(attribValue, kSentinelAttribValue);
>+
>+    // GetSyncAttrib generates EGL_BAD_ATTRIBUTE if the attribute is not valid, and value is not
>+    // modified
>+    EXPECT_EGL_FALSE(eglGetSyncAttribKHR(display, sync, EGL_CL_EVENT_HANDLE, &attribValue));
>+    EXPECT_EGL_ERROR(EGL_BAD_ATTRIBUTE);
>+    EXPECT_EQ(attribValue, kSentinelAttribValue);
>+
>+    // GetSyncAttrib generates EGL_BAD_MATCH if the attribute is valid for sync, but not the
>+    // particular sync type. We don't have such a case at the moment.
>+
>+    EXPECT_EGL_TRUE(eglDestroySyncKHR(display, sync));
>+}
>+
>+// Test error cases for all EGL_KHR_wait_sync functions
>+TEST_P(EGLSyncTest, WaitSyncErrors)
>+{
>+    // The client API that shows support for eglWaitSyncKHR is the same as the one required for
>+    // eglCreateSyncKHR.  As such, there is no way to create a sync and not be able to wait on it.
>+    // This would have created an EGL_BAD_MATCH error.
>+    ANGLE_SKIP_TEST_IF(!hasWaitSyncExtension() || !hasGLSyncExtension());
>+
>+    EGLDisplay display     = getEGLWindow()->getDisplay();
>+    EGLContext context     = eglGetCurrentContext();
>+    EGLSurface drawSurface = eglGetCurrentSurface(EGL_DRAW);
>+    EGLSurface readSurface = eglGetCurrentSurface(EGL_READ);
>+
>+    EXPECT_NE(context, EGL_NO_CONTEXT);
>+    EXPECT_NE(drawSurface, EGL_NO_SURFACE);
>+    EXPECT_NE(readSurface, EGL_NO_SURFACE);
>+
>+    EGLSyncKHR sync = eglCreateSyncKHR(display, EGL_SYNC_FENCE_KHR, nullptr);
>+    EXPECT_NE(sync, EGL_NO_SYNC_KHR);
>+
>+    // WaitSync generates BAD_MATCH if no context is current
>+    eglMakeCurrent(display, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT);
>+    EXPECT_EGL_FALSE(eglWaitSyncKHR(display, sync, 0));
>+    EXPECT_EGL_ERROR(EGL_BAD_MATCH);
>+    eglMakeCurrent(display, drawSurface, readSurface, context);
>+
>+    // WaitSync generates BAD_PARAMETER if the sync is not valid
>+    EXPECT_EGL_FALSE(eglWaitSyncKHR(display, reinterpret_cast<EGLSyncKHR>(20), 0));
>+    EXPECT_EGL_ERROR(EGL_BAD_PARAMETER);
>+
>+    // WaitSync generates BAD_PARAMETER if flags is non-zero
>+    EXPECT_EGL_FALSE(eglWaitSyncKHR(display, sync, 1));
>+    EXPECT_EGL_ERROR(EGL_BAD_PARAMETER);
>+
>+    EXPECT_EGL_TRUE(eglDestroySyncKHR(display, sync));
>+}
>+
>+// Test usage of eglGetSyncAttribKHR
>+TEST_P(EGLSyncTest, GetSyncAttrib)
>+{
>+    ANGLE_SKIP_TEST_IF(!hasFenceSyncExtension() || !hasGLSyncExtension());
>+
>+    EGLDisplay display = getEGLWindow()->getDisplay();
>+
>+    EGLSyncKHR sync = eglCreateSyncKHR(display, EGL_SYNC_FENCE_KHR, nullptr);
>+    EXPECT_NE(sync, EGL_NO_SYNC_KHR);
>+
>+    // Fence sync attributes are:
>+    //
>+    // EGL_SYNC_TYPE_KHR: EGL_SYNC_FENCE_KHR
>+    // EGL_SYNC_STATUS_KHR: EGL_UNSIGNALED_KHR or EGL_SIGNALED_KHR
>+    // EGL_SYNC_CONDITION_KHR: EGL_SYNC_PRIOR_COMMANDS_COMPLETE_KHR
>+
>+    constexpr EGLint kSentinelAttribValue = 123456789;
>+    EGLint attribValue                    = kSentinelAttribValue;
>+    EXPECT_EGL_TRUE(eglGetSyncAttribKHR(display, sync, EGL_SYNC_TYPE_KHR, &attribValue));
>+    EXPECT_EQ(attribValue, EGL_SYNC_FENCE_KHR);
>+
>+    attribValue = kSentinelAttribValue;
>+    EXPECT_EGL_TRUE(eglGetSyncAttribKHR(display, sync, EGL_SYNC_CONDITION_KHR, &attribValue));
>+    EXPECT_EQ(attribValue, EGL_SYNC_PRIOR_COMMANDS_COMPLETE_KHR);
>+
>+    attribValue = kSentinelAttribValue;
>+    EXPECT_EGL_TRUE(eglGetSyncAttribKHR(display, sync, EGL_SYNC_STATUS_KHR, &attribValue));
>+
>+    // Hack around EXPECT_* not having an "either this or that" variant:
>+    if (attribValue != EGL_SIGNALED_KHR)
>+    {
>+        EXPECT_EQ(attribValue, EGL_UNSIGNALED_KHR);
>+    }
>+
>+    EXPECT_EGL_TRUE(eglDestroySyncKHR(display, sync));
>+}
>+
>+// Test that basic usage works and doesn't generate errors or crash
>+TEST_P(EGLSyncTest, BasicOperations)
>+{
>+    ANGLE_SKIP_TEST_IF(!hasFenceSyncExtension() || !hasGLSyncExtension());
>+
>+    EGLDisplay display = getEGLWindow()->getDisplay();
>+
>+    EGLSyncKHR sync = eglCreateSyncKHR(display, EGL_SYNC_FENCE_KHR, nullptr);
>+    EXPECT_NE(sync, EGL_NO_SYNC_KHR);
>+
>+    glClearColor(1.0f, 0.0f, 1.0f, 1.0f);
>+
>+    glClear(GL_COLOR_BUFFER_BIT);
>+    EXPECT_EGL_TRUE(eglWaitSyncKHR(display, sync, 0));
>+
>+    glFlush();
>+
>+    EGLint value           = 0;
>+    unsigned int loopCount = 0;
>+
>+    // Use 'loopCount' to make sure the test doesn't get stuck in an infinite loop
>+    while (value != EGL_SIGNALED_KHR && loopCount <= 1000000)
>+    {
>+        loopCount++;
>+        EXPECT_EGL_TRUE(eglGetSyncAttribKHR(display, sync, EGL_SYNC_STATUS_KHR, &value));
>+    }
>+
>+    ASSERT_EQ(value, EGL_SIGNALED_KHR);
>+
>+    for (size_t i = 0; i < 20; i++)
>+    {
>+        glClear(GL_COLOR_BUFFER_BIT);
>+        EXPECT_EQ(
>+            EGL_CONDITION_SATISFIED_KHR,
>+            eglClientWaitSyncKHR(display, sync, EGL_SYNC_FLUSH_COMMANDS_BIT_KHR, EGL_FOREVER_KHR));
>+        EXPECT_EGL_TRUE(eglGetSyncAttribKHR(display, sync, EGL_SYNC_STATUS_KHR, &value));
>+        EXPECT_EQ(value, EGL_SIGNALED_KHR);
>+    }
>+
>+    EXPECT_EGL_TRUE(eglDestroySyncKHR(display, sync));
>+}
>+
>+ANGLE_INSTANTIATE_TEST(EGLSyncTest,
>+                       ES2_D3D9(),
>+                       ES2_D3D11(),
>+                       ES3_D3D11(),
>+                       ES2_OPENGL(),
>+                       ES3_OPENGL(),
>+                       ES2_OPENGLES(),
>+                       ES3_OPENGLES(),
>+                       ES2_VULKAN(),
>+                       ES3_VULKAN());
>diff --git a/Source/ThirdParty/ANGLE/src/tests/egl_tests/EGLThreadTest.cpp b/Source/ThirdParty/ANGLE/src/tests/egl_tests/EGLThreadTest.cpp
>deleted file mode 100644
>index 8280931955b..00000000000
>--- a/Source/ThirdParty/ANGLE/src/tests/egl_tests/EGLThreadTest.cpp
>+++ /dev/null
>@@ -1,84 +0,0 @@
>-#include "gtest/gtest.h"
>-
>-#include <EGL/egl.h>
>-#include <EGL/eglext.h>
>-
>-typedef EGLDisplay EGLAPIENTRY EGLGetDisplay(EGLNativeDisplayType display_id);
>-typedef EGLBoolean EGLAPIENTRY EGLInitialize(EGLDisplay dpy, EGLint *major, EGLint *minor);
>-typedef EGLContext EGLAPIENTRY EGLGetCurrentContext(void);
>-typedef EGLSurface EGLAPIENTRY EGLGetCurrentSurface(EGLint readdraw);
>-typedef EGLBoolean EGLAPIENTRY EGLTerminate(EGLDisplay dpy);
>-
>-class EGLThreadTest : public testing::Test
>-{
>-  public:
>-    virtual void SetUp() {}
>-    virtual void TearDown() {}
>-
>-    EGLGetDisplay *mGetDisplay;
>-    EGLInitialize *mInitialize;
>-    EGLGetCurrentContext *mGetCurrentContext;
>-    EGLGetCurrentSurface *mGetCurrentSurface;
>-
>-    EGLDisplay mDisplay;
>-
>-    HMODULE mEGL;
>-    HMODULE mGLESv2;
>-
>-    static DWORD WINAPI ThreadingTestEntryPoint(LPVOID thisPointer);
>-
>-  private:
>-    void ThreadingTest();
>-};
>-
>-DWORD WINAPI EGLThreadTest::ThreadingTestEntryPoint(LPVOID lpParameter)
>-{
>-    EGLThreadTest *test = (EGLThreadTest *)lpParameter;
>-    test->ThreadingTest();
>-    return 0;
>-}
>-
>-void EGLThreadTest::ThreadingTest()
>-{
>-    mEGL = LoadLibrary(TEXT("libEGL.dll"));
>-    mGLESv2 = LoadLibrary(TEXT("libGLESv2.dll"));
>-
>-    EXPECT_TRUE(mEGL != nullptr);
>-    EXPECT_TRUE(mGLESv2 != nullptr);
>-
>-    mGetDisplay = (EGLGetDisplay *)GetProcAddress(mEGL, "eglGetDisplay");
>-    mInitialize = (EGLInitialize *)GetProcAddress(mEGL, "eglInitialize");
>-    mGetCurrentContext = (EGLGetCurrentContext *)GetProcAddress(mEGL, "eglGetCurrentContext");
>-    mGetCurrentSurface = (EGLGetCurrentSurface *)GetProcAddress(mEGL, "eglGetCurrentSurface");
>-
>-    EXPECT_TRUE(mGetDisplay != nullptr);
>-    EXPECT_TRUE(mInitialize != nullptr);
>-    EXPECT_TRUE(mGetCurrentContext != nullptr);
>-    EXPECT_TRUE(mGetCurrentSurface != nullptr);
>-
>-    mDisplay = mGetDisplay(EGL_D3D11_ELSE_D3D9_DISPLAY_ANGLE);
>-
>-    EXPECT_TRUE(mDisplay!= EGL_NO_DISPLAY);
>-
>-    mInitialize(mDisplay, nullptr, nullptr);
>-    mGetCurrentContext();
>-}
>-
>-TEST_F(EGLThreadTest, thread_init_crash)
>-{
>-    DWORD threadId;
>-    HANDLE threadHandle =
>-        CreateThread(nullptr, 0, EGLThreadTest::ThreadingTestEntryPoint, this, 0, &threadId);
>-    EXPECT_TRUE(threadHandle != nullptr);
>-
>-    // wait for signal from thread
>-    DWORD waitResult = WaitForSingleObject(threadHandle, 1000);
>-    EXPECT_EQ(waitResult, WAIT_OBJECT_0);
>-
>-    // crash, because the TLS value is NULL on main thread
>-    mGetCurrentSurface(EGL_DRAW);
>-    mGetCurrentContext();
>-
>-    auto terminate = (EGLTerminate *)GetProcAddress(mEGL, "eglTerminate");
>-    terminate(mDisplay);
>-}
>diff --git a/Source/ThirdParty/ANGLE/src/tests/egl_tests/EGLX11VisualTest.cpp b/Source/ThirdParty/ANGLE/src/tests/egl_tests/EGLX11VisualTest.cpp
>index 5464bd315e4..90abb931df2 100644
>--- a/Source/ThirdParty/ANGLE/src/tests/egl_tests/EGLX11VisualTest.cpp
>+++ b/Source/ThirdParty/ANGLE/src/tests/egl_tests/EGLX11VisualTest.cpp
>@@ -12,9 +12,9 @@
> #include <EGL/eglext.h>
> #include <X11/Xlib.h>
> 
>-#include "OSWindow.h"
> #include "test_utils/ANGLETest.h"
>-#include "x11/X11Window.h"
>+#include "util/OSWindow.h"
>+#include "util/x11/X11Window.h"
> 
> using namespace angle;
> 
>@@ -24,14 +24,13 @@ namespace
> const EGLint contextAttribs[] = {EGL_CONTEXT_CLIENT_VERSION, 2, EGL_NONE};
> }
> 
>-class EGLX11VisualHintTest : public ::testing::TestWithParam<angle::PlatformParameters>
>+class EGLX11VisualHintTest : public EGLTest,
>+                             public ::testing::WithParamInterface<angle::PlatformParameters>
> {
>   public:
>     void SetUp() override
>     {
>-        mEglGetPlatformDisplayEXT = reinterpret_cast<PFNEGLGETPLATFORMDISPLAYEXTPROC>(
>-            eglGetProcAddress("eglGetPlatformDisplayEXT"));
>-
>+        EGLTest::SetUp();
>         mDisplay = XOpenDisplay(nullptr);
>     }
> 
>@@ -68,12 +67,11 @@ class EGLX11VisualHintTest : public ::testing::TestWithParam<angle::PlatformPara
>             }
>         }
> 
>-        UNREACHABLE();
>+        EXPECT_TRUE(false);
>         return -1;
>     }
> 
>   protected:
>-    PFNEGLGETPLATFORMDISPLAYEXTPROC mEglGetPlatformDisplayEXT;
>     Display *mDisplay;
> };
> 
>@@ -84,7 +82,7 @@ TEST_P(EGLX11VisualHintTest, InvalidVisualID)
>     auto attributes                   = getDisplayAttributes(gInvalidVisualId);
> 
>     EGLDisplay display =
>-        mEglGetPlatformDisplayEXT(EGL_PLATFORM_ANGLE_ANGLE, EGL_DEFAULT_DISPLAY, attributes.data());
>+        eglGetPlatformDisplayEXT(EGL_PLATFORM_ANGLE_ANGLE, EGL_DEFAULT_DISPLAY, attributes.data());
>     ASSERT_TRUE(display != EGL_NO_DISPLAY);
> 
>     ASSERT_TRUE(EGL_FALSE == eglInitialize(display, nullptr, nullptr));
>@@ -97,7 +95,7 @@ TEST_P(EGLX11VisualHintTest, ValidVisualIDAndClear)
> {
>     // We'll test the extension with one visual ID but we don't care which one. This means we
>     // can use OSWindow to create a window and just grab its visual.
>-    OSWindow *osWindow = CreateOSWindow();
>+    OSWindow *osWindow = OSWindow::New();
>     osWindow->initialize("EGLX11VisualHintTest", 500, 500);
>     osWindow->setVisible(true);
> 
>@@ -109,7 +107,7 @@ TEST_P(EGLX11VisualHintTest, ValidVisualIDAndClear)
> 
>     auto attributes = getDisplayAttributes(visualId);
>     EGLDisplay display =
>-        mEglGetPlatformDisplayEXT(EGL_PLATFORM_ANGLE_ANGLE, EGL_DEFAULT_DISPLAY, attributes.data());
>+        eglGetPlatformDisplayEXT(EGL_PLATFORM_ANGLE_ANGLE, EGL_DEFAULT_DISPLAY, attributes.data());
>     ASSERT_NE(EGL_NO_DISPLAY, display);
> 
>     ASSERT_TRUE(EGL_TRUE == eglInitialize(display, nullptr, nullptr));
>@@ -126,7 +124,8 @@ TEST_P(EGLX11VisualHintTest, ValidVisualIDAndClear)
>     ASSERT_EQ(nConfigs, nReturnedConfigs);
> 
>     EGLint eglNativeId;
>-    ASSERT_TRUE(EGL_TRUE == eglGetConfigAttrib(display, config, EGL_NATIVE_VISUAL_ID, &eglNativeId));
>+    ASSERT_TRUE(EGL_TRUE ==
>+                eglGetConfigAttrib(display, config, EGL_NATIVE_VISUAL_ID, &eglNativeId));
>     ASSERT_EQ(visualId, eglNativeId);
> 
>     // Finally, try to do a clear on the window.
>@@ -152,7 +151,7 @@ TEST_P(EGLX11VisualHintTest, ValidVisualIDAndClear)
>     eglDestroyContext(display, context);
>     ASSERT_EGL_SUCCESS();
> 
>-    SafeDelete(osWindow);
>+    OSWindow::Delete(&osWindow);
> 
>     eglMakeCurrent(display, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT);
>     eglTerminate(display);
>@@ -166,7 +165,7 @@ TEST_P(EGLX11VisualHintTest, InvalidWindowVisualID)
>     // creation will succeed.
>     int visualId;
>     {
>-        OSWindow *osWindow = CreateOSWindow();
>+        OSWindow *osWindow = OSWindow::New();
>         osWindow->initialize("EGLX11VisualHintTest", 500, 500);
>         osWindow->setVisible(true);
> 
>@@ -176,17 +175,16 @@ TEST_P(EGLX11VisualHintTest, InvalidWindowVisualID)
>         ASSERT_NE(0, XGetWindowAttributes(mDisplay, xWindow, &windowAttributes));
>         visualId = windowAttributes.visual->visualid;
> 
>-        SafeDelete(osWindow);
>+        OSWindow::Delete(&osWindow);
>     }
> 
>     auto attributes = getDisplayAttributes(visualId);
>     EGLDisplay display =
>-        mEglGetPlatformDisplayEXT(EGL_PLATFORM_ANGLE_ANGLE, EGL_DEFAULT_DISPLAY, attributes.data());
>+        eglGetPlatformDisplayEXT(EGL_PLATFORM_ANGLE_ANGLE, EGL_DEFAULT_DISPLAY, attributes.data());
>     ASSERT_NE(EGL_NO_DISPLAY, display);
> 
>     ASSERT_TRUE(EGL_TRUE == eglInitialize(display, nullptr, nullptr));
> 
>-
>     // Initialize the window with a visual id different from the display's visual id
>     int otherVisualId = chooseDifferentVisual(visualId);
>     ASSERT_NE(visualId, otherVisualId);
>@@ -207,7 +205,7 @@ TEST_P(EGLX11VisualHintTest, InvalidWindowVisualID)
>     ASSERT_EQ(EGL_NO_SURFACE, window);
>     ASSERT_EGL_ERROR(EGL_BAD_MATCH);
> 
>-    SafeDelete(osWindow);
>+    OSWindow::Delete(&osWindow);
> }
> 
> ANGLE_INSTANTIATE_TEST(EGLX11VisualHintTest, ES2_OPENGL());
>diff --git a/Source/ThirdParty/ANGLE/src/tests/gl_tests/AtomicCounterBufferTest.cpp b/Source/ThirdParty/ANGLE/src/tests/gl_tests/AtomicCounterBufferTest.cpp
>index e8c01948b30..312a05bcb39 100644
>--- a/Source/ThirdParty/ANGLE/src/tests/gl_tests/AtomicCounterBufferTest.cpp
>+++ b/Source/ThirdParty/ANGLE/src/tests/gl_tests/AtomicCounterBufferTest.cpp
>@@ -34,7 +34,7 @@ TEST_P(AtomicCounterBufferTest, AtomicCounterBufferBindings)
> {
>     ASSERT_EQ(3, getClientMajorVersion());
>     GLBuffer atomicCounterBuffer;
>-    glBindBufferBase(GL_ATOMIC_COUNTER_BUFFER, 1, atomicCounterBuffer.get());
>+    glBindBufferBase(GL_ATOMIC_COUNTER_BUFFER, 0, atomicCounterBuffer.get());
>     if (getClientMinorVersion() < 1)
>     {
>         EXPECT_GL_ERROR(GL_INVALID_ENUM);
>@@ -46,26 +46,25 @@ TEST_P(AtomicCounterBufferTest, AtomicCounterBufferBindings)
> }
> 
> class AtomicCounterBufferTest31 : public AtomicCounterBufferTest
>-{
>-};
>+{};
> 
> // Linking should fail if counters in vertex shader exceed gl_MaxVertexAtomicCounters.
> TEST_P(AtomicCounterBufferTest31, ExceedMaxVertexAtomicCounters)
> {
>-    const std::string &vertexShaderSource =
>+    constexpr char kVS[] =
>         "#version 310 es\n"
>-        "layout(binding = 2) uniform atomic_uint foo[gl_MaxVertexAtomicCounters + 1];\n"
>+        "layout(binding = 0) uniform atomic_uint foo[gl_MaxVertexAtomicCounters + 1];\n"
>         "void main()\n"
>         "{\n"
>         "    atomicCounterIncrement(foo[0]);\n"
>         "}\n";
>-    const std::string &fragmentShaderSource =
>+    constexpr char kFS[] =
>         "#version 310 es\n"
>         "void main()\n"
>         "{\n"
>         "}\n";
> 
>-    GLuint program = CompileProgram(vertexShaderSource, fragmentShaderSource);
>+    GLuint program = CompileProgram(kVS, kFS);
>     EXPECT_EQ(0u, program);
> }
> 
>@@ -73,21 +72,21 @@ TEST_P(AtomicCounterBufferTest31, ExceedMaxVertexAtomicCounters)
> // GLSL ES Spec 3.10.4, section 9.2.1.
> TEST_P(AtomicCounterBufferTest31, OffsetNotAllSpecified)
> {
>-    const std::string &vertexShaderSource =
>+    constexpr char kVS[] =
>         "#version 310 es\n"
>-        "layout(binding = 2, offset = 4) uniform atomic_uint foo;\n"
>+        "layout(binding = 0, offset = 4) uniform atomic_uint foo;\n"
>         "void main()\n"
>         "{\n"
>         "    atomicCounterIncrement(foo);\n"
>         "}\n";
>-    const std::string &fragmentShaderSource =
>+    constexpr char kFS[] =
>         "#version 310 es\n"
>-        "layout(binding = 2) uniform atomic_uint foo;\n"
>+        "layout(binding = 0) uniform atomic_uint foo;\n"
>         "void main()\n"
>         "{\n"
>         "}\n";
> 
>-    GLuint program = CompileProgram(vertexShaderSource, fragmentShaderSource);
>+    GLuint program = CompileProgram(kVS, kFS);
>     EXPECT_EQ(0u, program);
> }
> 
>@@ -95,40 +94,61 @@ TEST_P(AtomicCounterBufferTest31, OffsetNotAllSpecified)
> // value.
> TEST_P(AtomicCounterBufferTest31, OffsetNotAllSpecifiedWithSameValue)
> {
>-    const std::string &vertexShaderSource =
>+    constexpr char kVS[] =
>         "#version 310 es\n"
>-        "layout(binding = 2, offset = 4) uniform atomic_uint foo;\n"
>+        "layout(binding = 0, offset = 4) uniform atomic_uint foo;\n"
>         "void main()\n"
>         "{\n"
>         "    atomicCounterIncrement(foo);\n"
>         "}\n";
>-    const std::string &fragmentShaderSource =
>+    constexpr char kFS[] =
>         "#version 310 es\n"
>-        "layout(binding = 2, offset = 8) uniform atomic_uint foo;\n"
>+        "layout(binding = 0, offset = 8) uniform atomic_uint foo;\n"
>         "void main()\n"
>         "{\n"
>         "}\n";
> 
>-    GLuint program = CompileProgram(vertexShaderSource, fragmentShaderSource);
>+    GLuint program = CompileProgram(kVS, kFS);
>     EXPECT_EQ(0u, program);
> }
> 
>+// Tests atomic counter reads using compute shaders. Used as a sanity check for the translator.
>+TEST_P(AtomicCounterBufferTest31, AtomicCounterReadCompute)
>+{
>+    // Skipping due to a bug on the Adreno OpenGLES Android driver.
>+    // http://anglebug.com/2925
>+    ANGLE_SKIP_TEST_IF(IsAndroid() && IsAdreno() && IsOpenGLES());
>+
>+    constexpr char kComputeShaderSource[] = R"(#version 310 es
>+layout(local_size_x=1, local_size_y=1, local_size_z=1) in;
>+layout(binding = 0, offset = 8) uniform atomic_uint ac[3];
>+
>+void atomicCounterInFunction(in atomic_uint counter[3])
>+{
>+    atomicCounter(counter[0]);
>+}
>+
>+void main()
>+{
>+    atomicCounterInFunction(ac);
>+    atomicCounter(ac[gl_LocalInvocationIndex + 1u]);
>+})";
>+
>+    ANGLE_GL_COMPUTE_PROGRAM(program, kComputeShaderSource);
>+    EXPECT_GL_NO_ERROR();
>+}
>+
> // Test atomic counter read.
> TEST_P(AtomicCounterBufferTest31, AtomicCounterRead)
> {
>-    const std::string &vertShader =
>-        "#version 310 es\n"
>-        "precision highp float;\n"
>-        "in highp vec4 a_position;\n"
>-        "void main()\n"
>-        "{\n"
>-        "    gl_Position = a_position;\n"
>-        "}\n";
>+    // Skipping test while we work on enabling atomic counter buffer support in th D3D renderer.
>+    // http://anglebug.com/1729
>+    ANGLE_SKIP_TEST_IF(IsD3D11());
> 
>-    const std::string &fragShader =
>+    constexpr char kFS[] =
>         "#version 310 es\n"
>         "precision highp float;\n"
>-        "layout(binding = 2, offset = 4) uniform atomic_uint ac;\n"
>+        "layout(binding = 0, offset = 4) uniform atomic_uint ac;\n"
>         "out highp vec4 my_color;\n"
>         "void main()\n"
>         "{\n"
>@@ -137,7 +157,7 @@ TEST_P(AtomicCounterBufferTest31, AtomicCounterRead)
>         "    if (a1 == 3u) my_color = vec4(1.0);\n"
>         "}\n";
> 
>-    ANGLE_GL_PROGRAM(program, vertShader, fragShader);
>+    ANGLE_GL_PROGRAM(program, essl31_shaders::vs::Simple(), kFS);
> 
>     glUseProgram(program.get());
> 
>@@ -147,9 +167,9 @@ TEST_P(AtomicCounterBufferTest31, AtomicCounterRead)
>     glBindBuffer(GL_ATOMIC_COUNTER_BUFFER, atomicCounterBuffer);
>     glBufferData(GL_ATOMIC_COUNTER_BUFFER, sizeof(bufferData), bufferData, GL_STATIC_DRAW);
> 
>-    glBindBufferBase(GL_ATOMIC_COUNTER_BUFFER, 2, atomicCounterBuffer);
>+    glBindBufferBase(GL_ATOMIC_COUNTER_BUFFER, 0, atomicCounterBuffer);
> 
>-    drawQuad(program.get(), "a_position", 0.0f);
>+    drawQuad(program.get(), essl31_shaders::PositionAttrib(), 0.0f);
>     ASSERT_GL_NO_ERROR();
>     EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::white);
> }
>@@ -157,17 +177,17 @@ TEST_P(AtomicCounterBufferTest31, AtomicCounterRead)
> // Test atomic counter increment and decrement.
> TEST_P(AtomicCounterBufferTest31, AtomicCounterIncrementAndDecrement)
> {
>-    const std::string &csSource =
>+    constexpr char kCS[] =
>         "#version 310 es\n"
>         "layout(local_size_x=1, local_size_y=1, local_size_z=1) in;\n"
>-        "layout(binding = 2, offset = 4) uniform atomic_uint ac[2];\n"
>+        "layout(binding = 0, offset = 4) uniform atomic_uint ac[2];\n"
>         "void main()\n"
>         "{\n"
>         "    atomicCounterIncrement(ac[0]);\n"
>         "    atomicCounterDecrement(ac[1]);\n"
>         "}\n";
> 
>-    ANGLE_GL_COMPUTE_PROGRAM(program, csSource);
>+    ANGLE_GL_COMPUTE_PROGRAM(program, kCS);
> 
>     glUseProgram(program.get());
> 
>@@ -177,11 +197,13 @@ TEST_P(AtomicCounterBufferTest31, AtomicCounterIncrementAndDecrement)
>     glBindBuffer(GL_ATOMIC_COUNTER_BUFFER, atomicCounterBuffer);
>     glBufferData(GL_ATOMIC_COUNTER_BUFFER, sizeof(bufferData), bufferData, GL_STATIC_DRAW);
> 
>-    glBindBufferBase(GL_ATOMIC_COUNTER_BUFFER, 2, atomicCounterBuffer);
>+    glBindBufferBase(GL_ATOMIC_COUNTER_BUFFER, 0, atomicCounterBuffer);
> 
>     glDispatchCompute(1, 1, 1);
>     EXPECT_GL_NO_ERROR();
> 
>+    glMemoryBarrier(GL_ATOMIC_COUNTER_BARRIER_BIT);
>+
>     glBindBuffer(GL_ATOMIC_COUNTER_BUFFER, atomicCounterBuffer);
>     void *mappedBuffer =
>         glMapBufferRange(GL_ATOMIC_COUNTER_BUFFER, 0, sizeof(GLuint) * 3, GL_MAP_READ_BIT);
>@@ -193,11 +215,64 @@ TEST_P(AtomicCounterBufferTest31, AtomicCounterIncrementAndDecrement)
>     EXPECT_EQ(0u, bufferData[2]);
> }
> 
>+// Tests multiple atomic counter buffers.
>+TEST_P(AtomicCounterBufferTest31, AtomicCounterMultipleBuffers)
>+{
>+    GLint maxAtomicCounterBuffers = 0;
>+    glGetIntegerv(GL_MAX_COMPUTE_ATOMIC_COUNTER_BUFFERS, &maxAtomicCounterBuffers);
>+    constexpr unsigned int kBufferCount = 3;
>+    // ES 3.1 table 20.45 only guarantees 1 atomic counter buffer
>+    ANGLE_SKIP_TEST_IF(maxAtomicCounterBuffers < static_cast<int>(kBufferCount));
>+
>+    constexpr char kComputeShaderSource[] = R"(#version 310 es
>+layout(local_size_x=1, local_size_y=1, local_size_z=1) in;
>+layout(binding = 0) uniform atomic_uint ac1;
>+layout(binding = 1) uniform atomic_uint ac2;
>+layout(binding = 2) uniform atomic_uint ac3;
>+
>+void main()
>+{
>+    atomicCounterIncrement(ac1);
>+    atomicCounterIncrement(ac2);
>+    atomicCounterIncrement(ac3);
>+})";
>+
>+    ANGLE_GL_COMPUTE_PROGRAM(program, kComputeShaderSource);
>+
>+    glUseProgram(program);
>+
>+    GLBuffer atomicCounterBuffers[kBufferCount];
>+
>+    for (unsigned int ii = 0; ii < kBufferCount; ++ii)
>+    {
>+        GLuint initialData[1] = {ii};
>+        glBindBuffer(GL_ATOMIC_COUNTER_BUFFER, atomicCounterBuffers[ii]);
>+        glBufferData(GL_ATOMIC_COUNTER_BUFFER, sizeof(initialData), initialData, GL_STATIC_DRAW);
>+
>+        glBindBufferBase(GL_ATOMIC_COUNTER_BUFFER, ii, atomicCounterBuffers[ii]);
>+    }
>+
>+    glDispatchCompute(1, 1, 1);
>+    EXPECT_GL_NO_ERROR();
>+
>+    glMemoryBarrier(GL_ATOMIC_COUNTER_BARRIER_BIT);
>+
>+    for (unsigned int ii = 0; ii < kBufferCount; ++ii)
>+    {
>+        glBindBuffer(GL_ATOMIC_COUNTER_BUFFER, atomicCounterBuffers[ii]);
>+        GLuint *mappedBuffer = static_cast<GLuint *>(
>+            glMapBufferRange(GL_ATOMIC_COUNTER_BUFFER, 0, sizeof(GLuint), GL_MAP_READ_BIT));
>+        EXPECT_EQ(ii + 1, mappedBuffer[0]);
>+        glUnmapBuffer(GL_ATOMIC_COUNTER_BUFFER);
>+    }
>+}
>+
> ANGLE_INSTANTIATE_TEST(AtomicCounterBufferTest,
>                        ES3_OPENGL(),
>                        ES3_OPENGLES(),
>                        ES31_OPENGL(),
>-                       ES31_OPENGLES());
>-ANGLE_INSTANTIATE_TEST(AtomicCounterBufferTest31, ES31_OPENGL(), ES31_OPENGLES());
>+                       ES31_OPENGLES(),
>+                       ES31_D3D11());
>+ANGLE_INSTANTIATE_TEST(AtomicCounterBufferTest31, ES31_OPENGL(), ES31_OPENGLES(), ES31_D3D11());
> 
> }  // namespace
>diff --git a/Source/ThirdParty/ANGLE/src/tests/gl_tests/AttributeLayoutTest.cpp b/Source/ThirdParty/ANGLE/src/tests/gl_tests/AttributeLayoutTest.cpp
>new file mode 100644
>index 00000000000..ff423e9e583
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/tests/gl_tests/AttributeLayoutTest.cpp
>@@ -0,0 +1,475 @@
>+//
>+// Copyright 2018 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// AttributeLayoutTest:
>+//   Test various layouts of vertex attribute data:
>+//   - in memory, in buffer object, or combination of both
>+//   - sequential or interleaved
>+//   - various combinations of data types
>+
>+#include <vector>
>+
>+#include "test_utils/ANGLETest.h"
>+#include "test_utils/gl_raii.h"
>+
>+using namespace angle;
>+
>+namespace
>+{
>+
>+// Test will draw these four triangles.
>+// clang-format off
>+constexpr double kTriangleData[] = {
>+    // xy       rgb
>+    0,0,        1,1,0,
>+    -1,+1,      1,1,0,
>+    +1,+1,      1,1,0,
>+
>+    0,0,        0,1,0,
>+    +1,+1,      0,1,0,
>+    +1,-1,      0,1,0,
>+
>+    0,0,        0,1,1,
>+    +1,-1,      0,1,1,
>+    -1,-1,      0,1,1,
>+
>+    0,0,        1,0,1,
>+    -1,-1,      1,0,1,
>+    -1,+1,      1,0,1,
>+};
>+// clang-format on
>+
>+constexpr size_t kNumVertices = ArraySize(kTriangleData) / 5;
>+
>+// Vertex data source description.
>+class VertexData
>+{
>+  public:
>+    VertexData(int dimension, const double *data, unsigned offset, unsigned stride)
>+        : mDimension(dimension), mData(data), mOffset(offset), mStride(stride)
>+    {}
>+    int getDimension() const { return mDimension; }
>+    double getValue(unsigned vertexNumber, int component) const
>+    {
>+        return mData[mOffset + mStride * vertexNumber + component];
>+    }
>+
>+  private:
>+    int mDimension;
>+    const double *mData;
>+    // offset and stride in doubles
>+    unsigned mOffset;
>+    unsigned mStride;
>+};
>+
>+// A container for one or more vertex attributes.
>+class Container
>+{
>+  public:
>+    static constexpr size_t kSize = 1024;
>+
>+    void open(void) { memset(mMemory, 0xff, kSize); }
>+    void *getDestination(size_t offset) { return mMemory + offset; }
>+    virtual void close(void) {}
>+    virtual ~Container() {}
>+    virtual const char *getAddress() = 0;
>+    virtual GLuint getBuffer()       = 0;
>+
>+  protected:
>+    char mMemory[kSize];
>+};
>+
>+// Vertex attribute data in client memory.
>+class Memory : public Container
>+{
>+  public:
>+    const char *getAddress() override { return mMemory; }
>+    GLuint getBuffer() override { return 0; }
>+};
>+
>+// Vertex attribute data in buffer object.
>+class Buffer : public Container
>+{
>+  public:
>+    void close(void) override
>+    {
>+        glBindBuffer(GL_ARRAY_BUFFER, mBuffer);
>+        glBufferData(GL_ARRAY_BUFFER, sizeof(mMemory), mMemory, GL_STATIC_DRAW);
>+    }
>+
>+    const char *getAddress() override { return nullptr; }
>+    GLuint getBuffer() override { return mBuffer; }
>+
>+  protected:
>+    GLBuffer mBuffer;
>+};
>+
>+// Encapsulate the storage, layout, format and data of a vertex attribute.
>+struct Attrib
>+{
>+    void openContainer(void) const { mContainer->open(); }
>+
>+    void fillContainer(void) const
>+    {
>+        for (unsigned i = 0; i < kNumVertices; ++i)
>+        {
>+            for (int j = 0; j < mData.getDimension(); ++j)
>+            {
>+                size_t destOffset = mOffset + mStride * i + mCTypeSize * j;
>+                if (destOffset + mCTypeSize > Container::kSize)
>+                    FAIL() << "test case does not fit container";
>+
>+                double value = mData.getValue(i, j);
>+                if (mGLType == GL_FIXED)
>+                    value *= 1 << 16;
>+                else if (mNormalized)
>+                {
>+                    if (value < mMinIn || value > mMaxIn)
>+                        FAIL() << "test data does not fit format";
>+                    value = (value - mMinIn) * mScale + mMinOut;
>+                }
>+
>+                mStore(value, mContainer->getDestination(destOffset));
>+            }
>+        }
>+    }
>+
>+    void closeContainer(void) const { mContainer->close(); }
>+
>+    void enable(unsigned index) const
>+    {
>+        glBindBuffer(GL_ARRAY_BUFFER, mContainer->getBuffer());
>+        glVertexAttribPointer(index, mData.getDimension(), mGLType, mNormalized, mStride,
>+                              mContainer->getAddress() + mOffset);
>+        EXPECT_GL_NO_ERROR();
>+        glEnableVertexAttribArray(index);
>+    }
>+
>+    bool inClientMemory(void) const { return mContainer->getAddress() != nullptr; }
>+
>+    std::shared_ptr<Container> mContainer;
>+    unsigned mOffset;
>+    unsigned mStride;
>+    const VertexData &mData;
>+    void (*mStore)(double value, void *dest);
>+    GLenum mGLType;
>+    GLboolean mNormalized;
>+    size_t mCTypeSize;
>+    double mMinIn;
>+    double mMaxIn;
>+    double mMinOut;
>+    double mScale;
>+};
>+
>+// Change type and store.
>+template <class T>
>+void Store(double value, void *dest)
>+{
>+    T v = static_cast<T>(value);
>+    memcpy(dest, &v, sizeof(v));
>+}
>+
>+// Function object that makes Attrib structs according to a vertex format.
>+template <class CType, GLenum GLType, bool Normalized>
>+class Format
>+{
>+    static_assert(!(Normalized && GLType == GL_FLOAT), "Normalized float does not make sense.");
>+
>+  public:
>+    Format(bool es3) : mES3(es3) {}
>+
>+    Attrib operator()(std::shared_ptr<Container> container,
>+                      unsigned offset,
>+                      unsigned stride,
>+                      const VertexData &data) const
>+    {
>+        double minIn    = 0;
>+        double maxIn    = 1;
>+        double minOut   = std::numeric_limits<CType>::min();
>+        double rangeOut = std::numeric_limits<CType>::max() - minOut;
>+
>+        if (std::is_signed<CType>::value)
>+        {
>+            minIn = -1;
>+            maxIn = +1;
>+            if (mES3)
>+            {
>+                minOut += 1;
>+                rangeOut -= 1;
>+            }
>+        }
>+
>+        return {
>+            container,  offset,        stride, data,  Store<CType>, GLType,
>+            Normalized, sizeof(CType), minIn,  maxIn, minOut,       rangeOut / (maxIn - minIn),
>+        };
>+    }
>+
>+  protected:
>+    const bool mES3;
>+};
>+
>+typedef std::vector<Attrib> TestCase;
>+
>+void PrepareTestCase(const TestCase &tc)
>+{
>+    for (const Attrib &a : tc)
>+        a.openContainer();
>+    for (const Attrib &a : tc)
>+        a.fillContainer();
>+    for (const Attrib &a : tc)
>+        a.closeContainer();
>+    unsigned i = 0;
>+    for (const Attrib &a : tc)
>+        a.enable(i++);
>+}
>+
>+class AttributeLayoutTest : public ANGLETest
>+{
>+  protected:
>+    AttributeLayoutTest()
>+        : mProgram(0), mCoord(2, kTriangleData, 0, 5), mColor(3, kTriangleData, 2, 5)
>+    {
>+        setWindowWidth(128);
>+        setWindowHeight(128);
>+        setConfigRedBits(8);
>+        setConfigGreenBits(8);
>+        setConfigBlueBits(8);
>+        setConfigAlphaBits(8);
>+    }
>+
>+    void GetTestCases(void);
>+
>+    void SetUp() override
>+    {
>+        ANGLETest::SetUp();
>+
>+        glClearColor(.2f, .2f, .2f, .0f);
>+        glClear(GL_COLOR_BUFFER_BIT);
>+
>+        glDisable(GL_DEPTH_TEST);
>+
>+        constexpr char kVS[] =
>+            "attribute mediump vec2 coord;\n"
>+            "attribute mediump vec3 color;\n"
>+            "varying mediump vec3 vcolor;\n"
>+            "void main(void)\n"
>+            "{\n"
>+            "    gl_Position = vec4(coord, 0, 1);\n"
>+            "    vcolor = color;\n"
>+            "}\n";
>+
>+        constexpr char kFS[] =
>+            "varying mediump vec3 vcolor;\n"
>+            "void main(void)\n"
>+            "{\n"
>+            "    gl_FragColor = vec4(vcolor, 0);\n"
>+            "}\n";
>+
>+        mProgram = CompileProgram(kVS, kFS);
>+        ASSERT_NE(0u, mProgram);
>+        glUseProgram(mProgram);
>+
>+        glGenBuffers(1, &mIndexBuffer);
>+
>+        GetTestCases();
>+    }
>+
>+    void TearDown() override
>+    {
>+        mTestCases.clear();
>+        glDeleteProgram(mProgram);
>+        glDeleteBuffers(1, &mIndexBuffer);
>+        ANGLETest::TearDown();
>+    }
>+
>+    virtual bool Skip(const TestCase &) { return false; }
>+    virtual void Draw(int firstVertex, unsigned vertexCount, const GLushort *indices) = 0;
>+
>+    void Run(bool drawFirstTriangle)
>+    {
>+        glViewport(0, 0, getWindowWidth(), getWindowHeight());
>+        glUseProgram(mProgram);
>+
>+        for (unsigned i = 0; i < mTestCases.size(); ++i)
>+        {
>+            if (mTestCases[i].size() == 0 || Skip(mTestCases[i]))
>+                continue;
>+
>+            PrepareTestCase(mTestCases[i]);
>+
>+            glClear(GL_COLOR_BUFFER_BIT);
>+
>+            std::string testCase;
>+            if (drawFirstTriangle)
>+            {
>+                Draw(0, kNumVertices, mIndices);
>+                testCase = "draw";
>+            }
>+            else
>+            {
>+                Draw(3, kNumVertices - 3, mIndices + 3);
>+                testCase = "skip";
>+            }
>+
>+            testCase += " first triangle case ";
>+            int w = getWindowWidth() / 4;
>+            int h = getWindowHeight() / 4;
>+            if (drawFirstTriangle)
>+            {
>+                EXPECT_PIXEL_EQ(w * 2, h * 3, 255, 255, 0, 0) << testCase << i;
>+            }
>+            else
>+            {
>+                EXPECT_PIXEL_EQ(w * 2, h * 3, 51, 51, 51, 0) << testCase << i;
>+            }
>+            EXPECT_PIXEL_EQ(w * 3, h * 2, 0, 255, 0, 0) << testCase << i;
>+            EXPECT_PIXEL_EQ(w * 2, h * 1, 0, 255, 255, 0) << testCase << i;
>+            EXPECT_PIXEL_EQ(w * 1, h * 2, 255, 0, 255, 0) << testCase << i;
>+        }
>+    }
>+
>+    static const GLushort mIndices[kNumVertices];
>+
>+    GLuint mProgram;
>+    GLuint mIndexBuffer;
>+
>+    std::vector<TestCase> mTestCases;
>+
>+    VertexData mCoord;
>+    VertexData mColor;
>+};
>+const GLushort AttributeLayoutTest::mIndices[kNumVertices] = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11};
>+
>+void AttributeLayoutTest::GetTestCases(void)
>+{
>+    const bool es3 = getClientMajorVersion() >= 3;
>+
>+    Format<GLfloat, GL_FLOAT, false> Float(es3);
>+    Format<GLint, GL_FIXED, false> Fixed(es3);
>+
>+    Format<GLbyte, GL_BYTE, false> SByte(es3);
>+    Format<GLubyte, GL_UNSIGNED_BYTE, false> UByte(es3);
>+    Format<GLshort, GL_SHORT, false> SShort(es3);
>+    Format<GLushort, GL_UNSIGNED_SHORT, false> UShort(es3);
>+    Format<GLint, GL_INT, false> SInt(es3);
>+    Format<GLuint, GL_UNSIGNED_INT, false> UInt(es3);
>+
>+    Format<GLbyte, GL_BYTE, true> NormSByte(es3);
>+    Format<GLubyte, GL_UNSIGNED_BYTE, true> NormUByte(es3);
>+    Format<GLshort, GL_SHORT, true> NormSShort(es3);
>+    Format<GLushort, GL_UNSIGNED_SHORT, true> NormUShort(es3);
>+    Format<GLint, GL_INT, true> NormSInt(es3);
>+    Format<GLuint, GL_UNSIGNED_INT, true> NormUInt(es3);
>+
>+    std::shared_ptr<Container> M0 = std::make_shared<Memory>();
>+    std::shared_ptr<Container> M1 = std::make_shared<Memory>();
>+    std::shared_ptr<Container> B0 = std::make_shared<Buffer>();
>+    std::shared_ptr<Container> B1 = std::make_shared<Buffer>();
>+
>+    // 0. two buffers
>+    mTestCases.push_back({Float(B0, 0, 8, mCoord), Float(B1, 0, 12, mColor)});
>+
>+    // 1. two memory
>+    mTestCases.push_back({Float(M0, 0, 8, mCoord), Float(M1, 0, 12, mColor)});
>+
>+    // 2. one memory, sequential
>+    mTestCases.push_back({Float(M0, 0, 8, mCoord), Float(M0, 96, 12, mColor)});
>+
>+    // 3. one memory, interleaved
>+    mTestCases.push_back({Float(M0, 0, 20, mCoord), Float(M0, 8, 20, mColor)});
>+
>+    // 4. buffer and memory
>+    mTestCases.push_back({Float(B0, 0, 8, mCoord), Float(M0, 0, 12, mColor)});
>+
>+    // 5. stride != size
>+    mTestCases.push_back({Float(B0, 0, 16, mCoord), Float(B1, 0, 12, mColor)});
>+
>+    // 6-9. byte/short
>+    mTestCases.push_back({SByte(M0, 0, 20, mCoord), UByte(M0, 10, 20, mColor)});
>+    mTestCases.push_back({SShort(M0, 0, 20, mCoord), UShort(M0, 8, 20, mColor)});
>+    mTestCases.push_back({NormSByte(M0, 0, 8, mCoord), NormUByte(M0, 4, 8, mColor)});
>+    mTestCases.push_back({NormSShort(M0, 0, 20, mCoord), NormUShort(M0, 8, 20, mColor)});
>+
>+    // 10. one buffer, sequential
>+    mTestCases.push_back({Fixed(B0, 0, 8, mCoord), Float(B0, 96, 12, mColor)});
>+
>+    // 11. one buffer, interleaved
>+    mTestCases.push_back({Fixed(B0, 0, 20, mCoord), Float(B0, 8, 20, mColor)});
>+
>+    // 12. memory and buffer, float and integer
>+    mTestCases.push_back({Float(M0, 0, 8, mCoord), SByte(B0, 0, 12, mColor)});
>+
>+    // 13. buffer and memory, unusual offset and stride
>+    mTestCases.push_back({Float(B0, 11, 13, mCoord), Float(M0, 23, 17, mColor)});
>+
>+    // 14-15. remaining ES3 formats
>+    if (es3)
>+    {
>+        mTestCases.push_back({SInt(M0, 0, 40, mCoord), UInt(M0, 16, 40, mColor)});
>+        // Fails on Nexus devices (anglebug.com/2641)
>+        if (!IsNexus5X() && !IsNexus6P())
>+            mTestCases.push_back({NormSInt(M0, 0, 40, mCoord), NormUInt(M0, 16, 40, mColor)});
>+    }
>+}
>+
>+class AttributeLayoutNonIndexed : public AttributeLayoutTest
>+{
>+    void Draw(int firstVertex, unsigned vertexCount, const GLushort *indices) override
>+    {
>+        glDrawArrays(GL_TRIANGLES, firstVertex, vertexCount);
>+    }
>+};
>+
>+class AttributeLayoutMemoryIndexed : public AttributeLayoutTest
>+{
>+    void Draw(int firstVertex, unsigned vertexCount, const GLushort *indices) override
>+    {
>+        glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0);
>+        glDrawElements(GL_TRIANGLES, vertexCount, GL_UNSIGNED_SHORT, indices);
>+    }
>+};
>+
>+class AttributeLayoutBufferIndexed : public AttributeLayoutTest
>+{
>+    void Draw(int firstVertex, unsigned vertexCount, const GLushort *indices) override
>+    {
>+        glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, mIndexBuffer);
>+        glBufferData(GL_ELEMENT_ARRAY_BUFFER, sizeof(*mIndices) * vertexCount, indices,
>+                     GL_STATIC_DRAW);
>+        glDrawElements(GL_TRIANGLES, vertexCount, GL_UNSIGNED_SHORT, nullptr);
>+    }
>+};
>+
>+TEST_P(AttributeLayoutNonIndexed, Test)
>+{
>+    Run(true);
>+    ANGLE_SKIP_TEST_IF(IsWindows() && IsAMD() && IsOpenGL());
>+    Run(false);
>+}
>+
>+TEST_P(AttributeLayoutMemoryIndexed, Test)
>+{
>+    Run(true);
>+    ANGLE_SKIP_TEST_IF(IsWindows() && IsAMD() && (IsOpenGL() || IsD3D11_FL93()));
>+    Run(false);
>+}
>+
>+TEST_P(AttributeLayoutBufferIndexed, Test)
>+{
>+    Run(true);
>+    ANGLE_SKIP_TEST_IF(IsWindows() && IsAMD() && (IsOpenGL() || IsD3D11_FL93()));
>+    Run(false);
>+}
>+
>+#define PARAMS                                                                            \
>+    ES2_VULKAN(), ES2_OPENGL(), ES2_D3D9(), ES2_D3D11(), ES2_D3D11_FL9_3(), ES3_OPENGL(), \
>+        ES2_OPENGLES(), ES3_OPENGLES()
>+
>+ANGLE_INSTANTIATE_TEST(AttributeLayoutNonIndexed, PARAMS);
>+ANGLE_INSTANTIATE_TEST(AttributeLayoutMemoryIndexed, PARAMS);
>+ANGLE_INSTANTIATE_TEST(AttributeLayoutBufferIndexed, PARAMS);
>+
>+}  // anonymous namespace
>diff --git a/Source/ThirdParty/ANGLE/src/tests/gl_tests/BPTCCompressedTextureTest.cpp b/Source/ThirdParty/ANGLE/src/tests/gl_tests/BPTCCompressedTextureTest.cpp
>new file mode 100644
>index 00000000000..eb433f42cfa
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/tests/gl_tests/BPTCCompressedTextureTest.cpp
>@@ -0,0 +1,387 @@
>+//
>+// Copyright 2018 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+
>+// BPTCCompressedTextureTest.cpp: Tests of the GL_EXT_texture_compression_bptc extension
>+
>+#include "test_utils/ANGLETest.h"
>+#include "test_utils/gl_raii.h"
>+
>+using namespace angle;
>+
>+namespace
>+{
>+
>+const unsigned int kPixelTolerance = 1u;
>+
>+// The pixel data represents a 4x4 pixel image with the left side colored red and the right side
>+// green. It was BC7 encoded using Microsoft's BC6HBC7Encoder.
>+const std::array<GLubyte, 16> kBC7Data4x4 = {0x50, 0x1f, 0xfc, 0xf, 0x0,  0xf0, 0xe3, 0xe1,
>+                                             0xe1, 0xe1, 0xc1, 0xf, 0xfc, 0xc0, 0xf,  0xfc};
>+
>+}  // anonymous namespace
>+
>+class BPTCCompressedTextureTest : public ANGLETest
>+{
>+  protected:
>+    BPTCCompressedTextureTest()
>+    {
>+        setWindowWidth(128);
>+        setWindowHeight(128);
>+        setConfigRedBits(8);
>+        setConfigGreenBits(8);
>+        setConfigBlueBits(8);
>+        setConfigAlphaBits(8);
>+    }
>+
>+    void SetUp() override
>+    {
>+        ANGLETest::SetUp();
>+
>+        constexpr char kVS[] = R"(precision highp float;
>+attribute vec4 position;
>+varying vec2 texcoord;
>+
>+void main()
>+{
>+    gl_Position = position;
>+    texcoord = (position.xy * 0.5) + 0.5;
>+    texcoord.y = 1.0 - texcoord.y;
>+})";
>+
>+        constexpr char kFS[] = R"(precision highp float;
>+uniform sampler2D tex;
>+varying vec2 texcoord;
>+
>+void main()
>+{
>+    gl_FragColor = texture2D(tex, texcoord);
>+})";
>+
>+        mTextureProgram = CompileProgram(kVS, kFS);
>+        if (mTextureProgram == 0)
>+        {
>+            FAIL() << "shader compilation failed.";
>+        }
>+
>+        mTextureUniformLocation = glGetUniformLocation(mTextureProgram, "tex");
>+
>+        ASSERT_GL_NO_ERROR();
>+    }
>+
>+    void TearDown() override
>+    {
>+        glDeleteProgram(mTextureProgram);
>+
>+        ANGLETest::TearDown();
>+    }
>+
>+    void setupTextureParameters(GLuint texture)
>+    {
>+        glBindTexture(GL_TEXTURE_2D, texture);
>+        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
>+        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
>+        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
>+        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
>+    }
>+
>+    void drawTexture()
>+    {
>+        glUseProgram(mTextureProgram);
>+        glUniform1i(mTextureUniformLocation, 0);
>+        drawQuad(mTextureProgram, "position", 0.5f);
>+        EXPECT_GL_NO_ERROR();
>+    }
>+
>+    GLuint mTextureProgram;
>+    GLint mTextureUniformLocation;
>+};
>+
>+class BPTCCompressedTextureTestES3 : public BPTCCompressedTextureTest
>+{
>+  public:
>+    BPTCCompressedTextureTestES3() : BPTCCompressedTextureTest() {}
>+};
>+
>+// Test sampling from a BC7 non-SRGB image.
>+TEST_P(BPTCCompressedTextureTest, CompressedTexImageBC7)
>+{
>+    ANGLE_SKIP_TEST_IF(!IsGLExtensionEnabled("GL_EXT_texture_compression_bptc"));
>+
>+    GLTexture texture;
>+    setupTextureParameters(texture);
>+
>+    glCompressedTexImage2D(GL_TEXTURE_2D, 0, GL_COMPRESSED_RGBA_BPTC_UNORM_EXT, 4, 4, 0,
>+                           kBC7Data4x4.size(), kBC7Data4x4.data());
>+
>+    EXPECT_GL_NO_ERROR();
>+
>+    drawTexture();
>+
>+    EXPECT_PIXEL_COLOR_NEAR(0, 0, GLColor::red, kPixelTolerance);
>+    EXPECT_PIXEL_COLOR_NEAR(0, getWindowHeight() - 1, GLColor::red, kPixelTolerance);
>+    EXPECT_PIXEL_COLOR_NEAR(getWindowWidth() - 1, 0, GLColor::green, kPixelTolerance);
>+    EXPECT_PIXEL_COLOR_NEAR(getWindowWidth() - 1, getWindowHeight() - 1, GLColor::green,
>+                            kPixelTolerance);
>+}
>+
>+// Test sampling from a BC7 SRGB image.
>+TEST_P(BPTCCompressedTextureTest, CompressedTexImageBC7SRGB)
>+{
>+    ANGLE_SKIP_TEST_IF(!IsGLExtensionEnabled("GL_EXT_texture_compression_bptc"));
>+
>+    GLTexture texture;
>+    setupTextureParameters(texture);
>+
>+    glCompressedTexImage2D(GL_TEXTURE_2D, 0, GL_COMPRESSED_SRGB_ALPHA_BPTC_UNORM_EXT, 4, 4, 0,
>+                           kBC7Data4x4.size(), kBC7Data4x4.data());
>+
>+    EXPECT_GL_NO_ERROR();
>+
>+    drawTexture();
>+
>+    EXPECT_PIXEL_COLOR_NEAR(0, 0, GLColor::red, kPixelTolerance);
>+    EXPECT_PIXEL_COLOR_NEAR(0, getWindowHeight() - 1, GLColor::red, kPixelTolerance);
>+    EXPECT_PIXEL_COLOR_NEAR(getWindowWidth() - 1, 0, GLColor::green, kPixelTolerance);
>+    EXPECT_PIXEL_COLOR_NEAR(getWindowWidth() - 1, getWindowHeight() - 1, GLColor::green,
>+                            kPixelTolerance);
>+}
>+
>+// Test that using the BC6H floating point formats doesn't crash.
>+TEST_P(BPTCCompressedTextureTest, CompressedTexImageBC6HNoCrash)
>+{
>+    ANGLE_SKIP_TEST_IF(!IsGLExtensionEnabled("GL_EXT_texture_compression_bptc"));
>+
>+    GLTexture texture;
>+    setupTextureParameters(texture);
>+
>+    // This dummy pixel data represents a 4x4 pixel image.
>+    // TODO(http://anglebug.com/2869): Add pixel tests for these formats. These need HDR source
>+    // images.
>+    std::vector<GLubyte> data;
>+    data.resize(16u, 0u);
>+
>+    glCompressedTexImage2D(GL_TEXTURE_2D, 0, GL_COMPRESSED_RGB_BPTC_SIGNED_FLOAT_EXT, 4, 4, 0,
>+                           data.size(), data.data());
>+    glCompressedTexImage2D(GL_TEXTURE_2D, 0, GL_COMPRESSED_RGB_BPTC_UNSIGNED_FLOAT_EXT, 4, 4, 0,
>+                           data.size(), data.data());
>+
>+    EXPECT_GL_NO_ERROR();
>+
>+    drawTexture();
>+}
>+
>+// Test texStorage2D with a BPTC format.
>+TEST_P(BPTCCompressedTextureTestES3, CompressedTexStorage)
>+{
>+    ANGLE_SKIP_TEST_IF(!IsGLExtensionEnabled("GL_EXT_texture_compression_bptc"));
>+
>+    ANGLE_SKIP_TEST_IF(getClientMajorVersion() < 3);
>+
>+    GLTexture texture;
>+    setupTextureParameters(texture);
>+
>+    glTexStorage2D(GL_TEXTURE_2D, 1, GL_COMPRESSED_RGBA_BPTC_UNORM_EXT, 4, 4);
>+    EXPECT_GL_NO_ERROR();
>+    glCompressedTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, 4, 4, GL_COMPRESSED_RGBA_BPTC_UNORM_EXT,
>+                              kBC7Data4x4.size(), kBC7Data4x4.data());
>+    EXPECT_GL_NO_ERROR();
>+
>+    drawTexture();
>+
>+    EXPECT_PIXEL_COLOR_NEAR(0, 0, GLColor::red, kPixelTolerance);
>+    EXPECT_PIXEL_COLOR_NEAR(0, getWindowHeight() - 1, GLColor::red, kPixelTolerance);
>+    EXPECT_PIXEL_COLOR_NEAR(getWindowWidth() - 1, 0, GLColor::green, kPixelTolerance);
>+    EXPECT_PIXEL_COLOR_NEAR(getWindowWidth() - 1, getWindowHeight() - 1, GLColor::green,
>+                            kPixelTolerance);
>+}
>+
>+// Test validation of glCompressedTexSubImage2D with BPTC formats
>+TEST_P(BPTCCompressedTextureTest, CompressedTexSubImageValidation)
>+{
>+    ANGLE_SKIP_TEST_IF(!IsGLExtensionEnabled("GL_EXT_texture_compression_bptc"));
>+
>+    GLTexture texture;
>+    glBindTexture(GL_TEXTURE_2D, texture);
>+
>+    std::vector<GLubyte> data(16 * 2 * 2);  // 2x2 blocks, thats 8x8 pixels.
>+
>+    // Size mip 0 to a large size.
>+    glCompressedTexImage2D(GL_TEXTURE_2D, 0, GL_COMPRESSED_RGBA_BPTC_UNORM_EXT, 8, 8, 0,
>+                           data.size(), data.data());
>+    ASSERT_GL_NO_ERROR();
>+
>+    // Test a sub image with an offset that isn't a multiple of the block size.
>+    glCompressedTexSubImage2D(GL_TEXTURE_2D, 0, 1, 0, 4, 4, GL_COMPRESSED_RGBA_BPTC_UNORM_EXT,
>+                              kBC7Data4x4.size(), kBC7Data4x4.data());
>+    ASSERT_GL_ERROR(GL_INVALID_OPERATION);
>+    glCompressedTexSubImage2D(GL_TEXTURE_2D, 0, 0, 3, 4, 4, GL_COMPRESSED_RGBA_BPTC_UNORM_EXT,
>+                              kBC7Data4x4.size(), kBC7Data4x4.data());
>+    ASSERT_GL_ERROR(GL_INVALID_OPERATION);
>+
>+    // Test a sub image with a negative offset.
>+    glCompressedTexSubImage2D(GL_TEXTURE_2D, 0, -1, 0, 4, 4, GL_COMPRESSED_RGBA_BPTC_UNORM_EXT,
>+                              kBC7Data4x4.size(), kBC7Data4x4.data());
>+    ASSERT_GL_ERROR(GL_INVALID_VALUE);
>+    glCompressedTexSubImage2D(GL_TEXTURE_2D, 0, 0, -1, 4, 4, GL_COMPRESSED_RGBA_BPTC_UNORM_EXT,
>+                              kBC7Data4x4.size(), kBC7Data4x4.data());
>+    ASSERT_GL_ERROR(GL_INVALID_VALUE);
>+}
>+
>+// Test that copying BPTC textures is not allowed. This restriction exists only in
>+// EXT_texture_compression_bptc, and not in the ARB variant.
>+TEST_P(BPTCCompressedTextureTest, CopyTexImage2DDisallowed)
>+{
>+    ANGLE_SKIP_TEST_IF(!IsGLExtensionEnabled("GL_EXT_texture_compression_bptc"));
>+
>+    GLTexture texture;
>+    setupTextureParameters(texture);
>+
>+    glCopyTexImage2D(GL_TEXTURE_2D, 0, GL_COMPRESSED_RGBA_BPTC_UNORM_EXT, 0, 0, 4, 4, 0);
>+    ASSERT_GL_ERROR(GL_INVALID_OPERATION);
>+}
>+
>+// Test that copying BPTC textures is not allowed. This restriction exists only in
>+// EXT_texture_compression_bptc, and not in the ARB variant.
>+TEST_P(BPTCCompressedTextureTest, CopyTexSubImage2DDisallowed)
>+{
>+    ANGLE_SKIP_TEST_IF(!IsGLExtensionEnabled("GL_EXT_texture_compression_bptc"));
>+
>+    GLTexture texture;
>+    setupTextureParameters(texture);
>+
>+    glCompressedTexImage2D(GL_TEXTURE_2D, 0, GL_COMPRESSED_RGBA_BPTC_UNORM_EXT, 4, 4, 0,
>+                           kBC7Data4x4.size(), kBC7Data4x4.data());
>+    ASSERT_GL_NO_ERROR();
>+
>+    glCopyTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, 0, 0, 4, 4);
>+    ASSERT_GL_ERROR(GL_INVALID_OPERATION);
>+}
>+
>+// Test that copying BPTC textures is not allowed. This restriction exists only in
>+// EXT_texture_compression_bptc, and not in the ARB variant.
>+TEST_P(BPTCCompressedTextureTestES3, CopyTexSubImage3DDisallowed)
>+{
>+    ANGLE_SKIP_TEST_IF(!IsGLExtensionEnabled("GL_EXT_texture_compression_bptc"));
>+
>+    GLTexture texture;
>+    glBindTexture(GL_TEXTURE_2D_ARRAY, texture);
>+
>+    glTexStorage3D(GL_TEXTURE_2D_ARRAY, 1, GL_COMPRESSED_RGBA_BPTC_UNORM_EXT, 4, 4, 1);
>+    ASSERT_GL_NO_ERROR();
>+
>+    glCopyTexSubImage3D(GL_TEXTURE_2D_ARRAY, 0, 0, 0, 0, 0, 0, 4, 4);
>+    ASSERT_GL_ERROR(GL_INVALID_OPERATION);
>+}
>+
>+// Test uploading texture data from a PBO to a texture.
>+TEST_P(BPTCCompressedTextureTestES3, PBOCompressedTexImage)
>+{
>+    ANGLE_SKIP_TEST_IF(!IsGLExtensionEnabled("GL_EXT_texture_compression_bptc"));
>+
>+    GLTexture texture;
>+    setupTextureParameters(texture);
>+
>+    GLBuffer buffer;
>+    glBindBuffer(GL_PIXEL_UNPACK_BUFFER, buffer);
>+    glBufferData(GL_PIXEL_UNPACK_BUFFER, kBC7Data4x4.size(), kBC7Data4x4.data(), GL_STREAM_DRAW);
>+    ASSERT_GL_NO_ERROR();
>+
>+    glCompressedTexImage2D(GL_TEXTURE_2D, 0, GL_COMPRESSED_RGBA_BPTC_UNORM_EXT, 4, 4, 0,
>+                           kBC7Data4x4.size(), nullptr);
>+    ASSERT_GL_NO_ERROR();
>+
>+    drawTexture();
>+
>+    EXPECT_PIXEL_COLOR_NEAR(0, 0, GLColor::red, kPixelTolerance);
>+    EXPECT_PIXEL_COLOR_NEAR(0, getWindowHeight() - 1, GLColor::red, kPixelTolerance);
>+    EXPECT_PIXEL_COLOR_NEAR(getWindowWidth() - 1, 0, GLColor::green, kPixelTolerance);
>+    EXPECT_PIXEL_COLOR_NEAR(getWindowWidth() - 1, getWindowHeight() - 1, GLColor::green,
>+                            kPixelTolerance);
>+}
>+
>+// Test uploading texture data from a PBO to a texture allocated with texStorage2D.
>+TEST_P(BPTCCompressedTextureTestES3, PBOCompressedTexStorage)
>+{
>+    ANGLE_SKIP_TEST_IF(!IsGLExtensionEnabled("GL_EXT_texture_compression_bptc"));
>+
>+    GLTexture texture;
>+    setupTextureParameters(texture);
>+
>+    glTexStorage2D(GL_TEXTURE_2D, 1, GL_COMPRESSED_RGBA_BPTC_UNORM_EXT, 4, 4);
>+    ASSERT_GL_NO_ERROR();
>+
>+    GLBuffer buffer;
>+    glBindBuffer(GL_PIXEL_UNPACK_BUFFER, buffer);
>+    glBufferData(GL_PIXEL_UNPACK_BUFFER, kBC7Data4x4.size(), kBC7Data4x4.data(), GL_STREAM_DRAW);
>+    ASSERT_GL_NO_ERROR();
>+
>+    glCompressedTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, 4, 4, GL_COMPRESSED_RGBA_BPTC_UNORM_EXT,
>+                              kBC7Data4x4.size(), nullptr);
>+
>+    ASSERT_GL_NO_ERROR();
>+
>+    drawTexture();
>+
>+    EXPECT_PIXEL_COLOR_NEAR(0, 0, GLColor::red, kPixelTolerance);
>+    EXPECT_PIXEL_COLOR_NEAR(0, getWindowHeight() - 1, GLColor::red, kPixelTolerance);
>+    EXPECT_PIXEL_COLOR_NEAR(getWindowWidth() - 1, 0, GLColor::green, kPixelTolerance);
>+    EXPECT_PIXEL_COLOR_NEAR(getWindowWidth() - 1, getWindowHeight() - 1, GLColor::green,
>+                            kPixelTolerance);
>+}
>+
>+// Test validation of glCompressedTexSubImage3D with BPTC formats
>+TEST_P(BPTCCompressedTextureTestES3, CompressedTexSubImage3DValidation)
>+{
>+    ANGLE_SKIP_TEST_IF(!IsGLExtensionEnabled("GL_EXT_texture_compression_bptc"));
>+
>+    GLTexture texture;
>+    glBindTexture(GL_TEXTURE_2D_ARRAY, texture.get());
>+
>+    std::vector<GLubyte> data(16 * 2 * 2);  // 2x2x1 blocks, thats 8x8x1 pixels.
>+
>+    // Size mip 0 to a large size.
>+    glCompressedTexImage3D(GL_TEXTURE_2D_ARRAY, 0, GL_COMPRESSED_RGBA_BPTC_UNORM_EXT, 8, 8, 1, 0,
>+                           data.size(), data.data());
>+    ASSERT_GL_NO_ERROR();
>+
>+    // Test a sub image with an offset that isn't a multiple of the block size.
>+    glCompressedTexSubImage3D(GL_TEXTURE_2D_ARRAY, 0, 2, 0, 0, 4, 4, 1,
>+                              GL_COMPRESSED_RGBA_BPTC_UNORM_EXT, kBC7Data4x4.size(),
>+                              kBC7Data4x4.data());
>+    ASSERT_GL_ERROR(GL_INVALID_OPERATION);
>+    glCompressedTexSubImage3D(GL_TEXTURE_2D_ARRAY, 0, 0, 2, 0, 4, 4, 1,
>+                              GL_COMPRESSED_RGBA_BPTC_UNORM_EXT, kBC7Data4x4.size(),
>+                              kBC7Data4x4.data());
>+    ASSERT_GL_ERROR(GL_INVALID_OPERATION);
>+
>+    // Test a sub image with a negative offset.
>+    glCompressedTexSubImage3D(GL_TEXTURE_2D_ARRAY, 0, -1, 0, 0, 4, 4, 1,
>+                              GL_COMPRESSED_RGBA_BPTC_UNORM_EXT, kBC7Data4x4.size(),
>+                              kBC7Data4x4.data());
>+    ASSERT_GL_ERROR(GL_INVALID_VALUE);
>+    glCompressedTexSubImage3D(GL_TEXTURE_2D_ARRAY, 0, 0, -1, 0, 4, 4, 1,
>+                              GL_COMPRESSED_RGBA_BPTC_UNORM_EXT, kBC7Data4x4.size(),
>+                              kBC7Data4x4.data());
>+    ASSERT_GL_ERROR(GL_INVALID_VALUE);
>+    glCompressedTexSubImage3D(GL_TEXTURE_2D_ARRAY, 0, 0, 0, -1, 4, 4, 1,
>+                              GL_COMPRESSED_RGBA_BPTC_UNORM_EXT, kBC7Data4x4.size(),
>+                              kBC7Data4x4.data());
>+    ASSERT_GL_ERROR(GL_INVALID_VALUE);
>+}
>+
>+// Use this to select which configurations (e.g. which renderer, which GLES major version) these
>+// tests should be run against.
>+ANGLE_INSTANTIATE_TEST(BPTCCompressedTextureTest,
>+                       ES2_D3D9(),
>+                       ES2_D3D11(),
>+                       ES3_D3D11(),
>+                       ES2_OPENGL(),
>+                       ES3_OPENGL(),
>+                       ES2_OPENGLES(),
>+                       ES3_OPENGLES(),
>+                       ES2_VULKAN());
>+
>+ANGLE_INSTANTIATE_TEST(BPTCCompressedTextureTestES3, ES3_D3D11(), ES3_OPENGL(), ES3_OPENGLES());
>diff --git a/Source/ThirdParty/ANGLE/src/tests/gl_tests/BindGeneratesResourceTest.cpp b/Source/ThirdParty/ANGLE/src/tests/gl_tests/BindGeneratesResourceTest.cpp
>index e8ae739f865..02369413784 100644
>--- a/Source/ThirdParty/ANGLE/src/tests/gl_tests/BindGeneratesResourceTest.cpp
>+++ b/Source/ThirdParty/ANGLE/src/tests/gl_tests/BindGeneratesResourceTest.cpp
>@@ -21,7 +21,7 @@ class BindGeneratesResourceTest : public ANGLETest
> // available so the GL extension should always be present
> TEST_P(BindGeneratesResourceTest, ExtensionStringExposed)
> {
>-    EXPECT_TRUE(extensionEnabled("GL_CHROMIUM_bind_generates_resource"));
>+    EXPECT_TRUE(IsGLExtensionEnabled("GL_CHROMIUM_bind_generates_resource"));
> }
> 
> // Verify that GL_BIND_GENERATES_RESOURCE_CHROMIUM can be queried but not changed
>@@ -30,7 +30,7 @@ TEST_P(BindGeneratesResourceTest, QueryValidation)
>     GLint intValue = 2;
>     glGetIntegerv(GL_BIND_GENERATES_RESOURCE_CHROMIUM, &intValue);
>     EXPECT_GL_NO_ERROR();
>-    EXPECT_EQ(intValue, GL_FALSE);
>+    EXPECT_GL_FALSE(intValue);
> 
>     float floatValue = 2.0f;
>     glGetFloatv(GL_BIND_GENERATES_RESOURCE_CHROMIUM, &floatValue);
>@@ -40,11 +40,11 @@ TEST_P(BindGeneratesResourceTest, QueryValidation)
>     GLboolean boolValue = GL_TRUE;
>     glGetBooleanv(GL_BIND_GENERATES_RESOURCE_CHROMIUM, &boolValue);
>     EXPECT_GL_NO_ERROR();
>-    EXPECT_EQ(boolValue, GL_FALSE);
>+    EXPECT_GL_FALSE(boolValue);
> 
>     boolValue = glIsEnabled(GL_BIND_GENERATES_RESOURCE_CHROMIUM);
>     EXPECT_GL_NO_ERROR();
>-    EXPECT_EQ(boolValue, GL_FALSE);
>+    EXPECT_GL_FALSE(boolValue);
> 
>     glEnable(GL_BIND_GENERATES_RESOURCE_CHROMIUM);
>     EXPECT_GL_ERROR(GL_INVALID_ENUM);
>@@ -118,6 +118,7 @@ ANGLE_INSTANTIATE_TEST(BindGeneratesResourceTest,
>                        ES2_OPENGL(),
>                        ES3_OPENGL(),
>                        ES2_OPENGLES(),
>-                       ES3_OPENGLES());
>+                       ES3_OPENGLES(),
>+                       ES2_VULKAN());
> 
>-}  // namespace
>+}  // namespace angle
>diff --git a/Source/ThirdParty/ANGLE/src/tests/gl_tests/BindUniformLocationTest.cpp b/Source/ThirdParty/ANGLE/src/tests/gl_tests/BindUniformLocationTest.cpp
>index 298444794ae..32cfcbd0c08 100644
>--- a/Source/ThirdParty/ANGLE/src/tests/gl_tests/BindUniformLocationTest.cpp
>+++ b/Source/ThirdParty/ANGLE/src/tests/gl_tests/BindUniformLocationTest.cpp
>@@ -7,6 +7,7 @@
> // BindUniformLocationTest.cpp : Tests of the GL_CHROMIUM_bind_uniform_location extension.
> 
> #include "test_utils/ANGLETest.h"
>+#include "test_utils/gl_raii.h"
> 
> #include <cmath>
> 
>@@ -28,13 +29,6 @@ class BindUniformLocationTest : public ANGLETest
>         setConfigAlphaBits(8);
>     }
> 
>-    void SetUp() override
>-    {
>-        ANGLETest::SetUp();
>-        mBindUniformLocation = reinterpret_cast<PFNGLBINDUNIFORMLOCATIONCHROMIUMPROC>(
>-            eglGetProcAddress("glBindUniformLocationCHROMIUM"));
>-    }
>-
>     void TearDown() override
>     {
>         if (mProgram != 0)
>@@ -44,68 +38,74 @@ class BindUniformLocationTest : public ANGLETest
>         ANGLETest::TearDown();
>     }
> 
>-    typedef void(GL_APIENTRYP PFNGLBINDUNIFORMLOCATIONCHROMIUMPROC)(GLuint mProgram,
>-                                                                    GLint location,
>-                                                                    const GLchar *name);
>-    PFNGLBINDUNIFORMLOCATIONCHROMIUMPROC mBindUniformLocation = nullptr;
>-
>     GLuint mProgram = 0;
> };
> 
> // Test basic functionality of GL_CHROMIUM_bind_uniform_location
> TEST_P(BindUniformLocationTest, Basic)
> {
>-    if (!extensionEnabled("GL_CHROMIUM_bind_uniform_location"))
>-    {
>-        std::cout << "Test skipped because GL_CHROMIUM_bind_uniform_location is not available."
>-                  << std::endl;
>-        return;
>-    }
>-
>-    ASSERT_NE(mBindUniformLocation, nullptr);
>-
>-    const std::string vsSource =
>-        R"(attribute vec4 a_position;
>-        void main()
>-        {
>-            gl_Position = a_position;
>-        })";
>+    ANGLE_SKIP_TEST_IF(!IsGLExtensionEnabled("GL_CHROMIUM_bind_uniform_location"));
> 
>-    const std::string fsSource =
>-        R"(precision mediump float;
>-        uniform vec4 u_colorC;
>-        uniform vec4 u_colorB[2];
>-        uniform vec4 u_colorA;
>-        void main()
>-        {
>-            gl_FragColor = u_colorA + u_colorB[0] + u_colorB[1] + u_colorC;
>-        })";
>+    constexpr char kFS[] = R"(precision mediump float;
>+uniform vec4 u_colorC;
>+uniform vec4 u_colorB[2];
>+uniform vec4 u_colorA;
>+void main()
>+{
>+    gl_FragColor = u_colorA + u_colorB[0] + u_colorB[1] + u_colorC;
>+})";
> 
>     GLint colorALocation = 3;
>     GLint colorBLocation = 10;
>     GLint colorCLocation = 5;
> 
>-    GLuint vs = CompileShader(GL_VERTEX_SHADER, vsSource);
>-    GLuint fs = CompileShader(GL_FRAGMENT_SHADER, fsSource);
>+    mProgram = CompileProgram(essl1_shaders::vs::Simple(), kFS, [&](GLuint program) {
>+        glBindUniformLocationCHROMIUM(program, colorALocation, "u_colorA");
>+        glBindUniformLocationCHROMIUM(program, colorBLocation, "u_colorB[0]");
>+        glBindUniformLocationCHROMIUM(program, colorCLocation, "u_colorC");
>+    });
>+    ASSERT_NE(0u, mProgram);
> 
>-    mProgram = glCreateProgram();
>+    glUseProgram(mProgram);
> 
>-    mBindUniformLocation(mProgram, colorALocation, "u_colorA");
>-    mBindUniformLocation(mProgram, colorBLocation, "u_colorB[0]");
>-    mBindUniformLocation(mProgram, colorCLocation, "u_colorC");
>+    static const float colorB[] = {
>+        0.0f, 0.50f, 0.0f, 0.0f, 0.0f, 0.0f, 0.75f, 0.0f,
>+    };
> 
>-    glAttachShader(mProgram, vs);
>-    glDeleteShader(vs);
>+    glUniform4f(colorALocation, 0.25f, 0.0f, 0.0f, 0.0f);
>+    glUniform4fv(colorBLocation, 2, colorB);
>+    glUniform4f(colorCLocation, 0.0f, 0.0f, 0.0f, 1.0f);
> 
>-    glAttachShader(mProgram, fs);
>-    glDeleteShader(fs);
>+    drawQuad(mProgram, essl1_shaders::PositionAttrib(), 0.5f);
> 
>-    // Link the mProgram
>-    glLinkProgram(mProgram);
>-    // Check the link status
>-    GLint linked = 0;
>-    glGetProgramiv(mProgram, GL_LINK_STATUS, &linked);
>-    ASSERT_EQ(1, linked);
>+    EXPECT_GL_NO_ERROR();
>+    EXPECT_PIXEL_NEAR(0, 0, 64, 128, 192, 255, 1.0);
>+}
>+
>+// Force a sampler location and make sure it samples the correct texture
>+TEST_P(BindUniformLocationTest, SamplerLocation)
>+{
>+    ANGLE_SKIP_TEST_IF(!IsGLExtensionEnabled("GL_CHROMIUM_bind_uniform_location"));
>+
>+    constexpr char kFS[] = R"(precision mediump float;
>+uniform vec4 u_colorA;
>+uniform vec4 u_colorB[2];
>+uniform sampler2D u_sampler;
>+void main()
>+{
>+    gl_FragColor = u_colorA + u_colorB[0] + u_colorB[1] + texture2D(u_sampler, vec2(0, 0));
>+})";
>+
>+    GLint colorALocation  = 3;
>+    GLint colorBLocation  = 10;
>+    GLint samplerLocation = 1;
>+
>+    mProgram = CompileProgram(essl1_shaders::vs::Simple(), kFS, [&](GLuint program) {
>+        glBindUniformLocationCHROMIUM(program, colorALocation, "u_colorA");
>+        glBindUniformLocationCHROMIUM(program, colorBLocation, "u_colorB[0]");
>+        glBindUniformLocationCHROMIUM(program, samplerLocation, "u_sampler");
>+    });
>+    ASSERT_NE(0u, mProgram);
> 
>     glUseProgram(mProgram);
> 
>@@ -115,34 +115,28 @@ TEST_P(BindUniformLocationTest, Basic)
> 
>     glUniform4f(colorALocation, 0.25f, 0.0f, 0.0f, 0.0f);
>     glUniform4fv(colorBLocation, 2, colorB);
>-    glUniform4f(colorCLocation, 0.0f, 0.0f, 0.0f, 1.0f);
> 
>-    drawQuad(mProgram, "a_position", 0.5f);
>+    // Point the texture at texture unit 2
>+    glUniform1i(samplerLocation, 2);
>+
>+    GLTexture texture;
>+    glActiveTexture(GL_TEXTURE2);
>+    glBindTexture(GL_TEXTURE_2D, texture);
>+    constexpr GLubyte kTextureData[] = {32, 32, 32, 255};
>+    glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, 1, 1, 0, GL_RGBA, GL_UNSIGNED_BYTE, kTextureData);
>+
>+    drawQuad(mProgram, essl1_shaders::PositionAttrib(), 0.5f);
> 
>     EXPECT_GL_NO_ERROR();
>-    EXPECT_PIXEL_NEAR(0, 0, 64, 128, 192, 255, 1.0);
>+    EXPECT_PIXEL_NEAR(0, 0, 96, 160, 224, 255, 1.0);
> }
> 
> // Test that conflicts are detected when two uniforms are bound to the same location
> TEST_P(BindUniformLocationTest, ConflictsDetection)
> {
>-    if (!extensionEnabled("GL_CHROMIUM_bind_uniform_location"))
>-    {
>-        std::cout << "Test skipped because GL_CHROMIUM_bind_uniform_location is not available."
>-                  << std::endl;
>-        return;
>-    }
>-
>-    ASSERT_NE(nullptr, mBindUniformLocation);
>+    ANGLE_SKIP_TEST_IF(!IsGLExtensionEnabled("GL_CHROMIUM_bind_uniform_location"));
> 
>-    const std::string vsSource =
>-        R"(attribute vec4 a_position;
>-        void main()
>-        {
>-            gl_Position = a_position;
>-        })";
>-
>-    const std::string fsSource =
>+    constexpr char kFS[] =
>         R"(precision mediump float;
>         uniform vec4 u_colorA;
>         uniform vec4 u_colorB;
>@@ -154,8 +148,8 @@ TEST_P(BindUniformLocationTest, ConflictsDetection)
>     GLint colorALocation = 3;
>     GLint colorBLocation = 4;
> 
>-    GLuint vs = CompileShader(GL_VERTEX_SHADER, vsSource);
>-    GLuint fs = CompileShader(GL_FRAGMENT_SHADER, fsSource);
>+    GLuint vs = CompileShader(GL_VERTEX_SHADER, essl1_shaders::vs::Simple());
>+    GLuint fs = CompileShader(GL_FRAGMENT_SHADER, kFS);
> 
>     mProgram = glCreateProgram();
>     glAttachShader(mProgram, vs);
>@@ -163,16 +157,16 @@ TEST_P(BindUniformLocationTest, ConflictsDetection)
>     glAttachShader(mProgram, fs);
>     glDeleteShader(fs);
> 
>-    mBindUniformLocation(mProgram, colorALocation, "u_colorA");
>+    glBindUniformLocationCHROMIUM(mProgram, colorALocation, "u_colorA");
>     // Bind u_colorB to location a, causing conflicts, link should fail.
>-    mBindUniformLocation(mProgram, colorALocation, "u_colorB");
>+    glBindUniformLocationCHROMIUM(mProgram, colorALocation, "u_colorB");
>     glLinkProgram(mProgram);
>     GLint linked = 0;
>     glGetProgramiv(mProgram, GL_LINK_STATUS, &linked);
>     ASSERT_EQ(0, linked);
> 
>     // Bind u_colorB to location b, no conflicts, link should succeed.
>-    mBindUniformLocation(mProgram, colorBLocation, "u_colorB");
>+    glBindUniformLocationCHROMIUM(mProgram, colorBLocation, "u_colorB");
>     glLinkProgram(mProgram);
>     linked = 0;
>     glGetProgramiv(mProgram, GL_LINK_STATUS, &linked);
>@@ -182,16 +176,9 @@ TEST_P(BindUniformLocationTest, ConflictsDetection)
> // Test a use case of the chromium compositor
> TEST_P(BindUniformLocationTest, Compositor)
> {
>-    if (!extensionEnabled("GL_CHROMIUM_bind_uniform_location"))
>-    {
>-        std::cout << "Test skipped because GL_CHROMIUM_bind_uniform_location is not available."
>-                  << std::endl;
>-        return;
>-    }
>-
>-    ASSERT_NE(nullptr, mBindUniformLocation);
>+    ANGLE_SKIP_TEST_IF(!IsGLExtensionEnabled("GL_CHROMIUM_bind_uniform_location"));
> 
>-    const std::string vsSource =
>+    constexpr char kVS[] =
>         R"(attribute vec4 a_position;
>         attribute vec2 a_texCoord;
>         uniform mat4 matrix;
>@@ -206,7 +193,7 @@ TEST_P(BindUniformLocationTest, Compositor)
>             gl_Position = matrix * a_position;
>         })";
> 
>-    const std::string fsSource =
>+    constexpr char kFS[] =
>         R"(precision mediump float;
>         varying vec4 v_color;
>         uniform float alpha;
>@@ -236,29 +223,15 @@ TEST_P(BindUniformLocationTest, Compositor)
>     int multiplierLocation = counter++;
>     int colorCLocation     = counter++;
> 
>-    GLuint vs = CompileShader(GL_VERTEX_SHADER, vsSource);
>-    GLuint fs = CompileShader(GL_FRAGMENT_SHADER, fsSource);
>-
>-    mProgram = glCreateProgram();
>-
>-    mBindUniformLocation(mProgram, matrixLocation, "matrix");
>-    mBindUniformLocation(mProgram, colorALocation, "color_a");
>-    mBindUniformLocation(mProgram, colorBLocation, "color_b");
>-    mBindUniformLocation(mProgram, alphaLocation, "alpha");
>-    mBindUniformLocation(mProgram, multiplierLocation, "multiplier");
>-    mBindUniformLocation(mProgram, colorCLocation, "color_c");
>-
>-    glAttachShader(mProgram, vs);
>-    glDeleteShader(vs);
>-    glAttachShader(mProgram, fs);
>-    glDeleteShader(fs);
>-
>-    // Link the mProgram
>-    glLinkProgram(mProgram);
>-    // Check the link status
>-    GLint linked = 0;
>-    glGetProgramiv(mProgram, GL_LINK_STATUS, &linked);
>-    ASSERT_EQ(1, linked);
>+    mProgram = CompileProgram(kVS, kFS, [&](GLuint program) {
>+        glBindUniformLocationCHROMIUM(program, matrixLocation, "matrix");
>+        glBindUniformLocationCHROMIUM(program, colorALocation, "color_a");
>+        glBindUniformLocationCHROMIUM(program, colorBLocation, "color_b");
>+        glBindUniformLocationCHROMIUM(program, alphaLocation, "alpha");
>+        glBindUniformLocationCHROMIUM(program, multiplierLocation, "multiplier");
>+        glBindUniformLocationCHROMIUM(program, colorCLocation, "color_c");
>+    });
>+    ASSERT_NE(0u, mProgram);
> 
>     glUseProgram(mProgram);
> 
>@@ -292,53 +265,32 @@ TEST_P(BindUniformLocationTest, Compositor)
> // Test that unused uniforms don't conflict when bound to the same location
> TEST_P(BindUniformLocationTest, UnusedUniformUpdate)
> {
>-    if (!extensionEnabled("GL_CHROMIUM_bind_uniform_location"))
>-    {
>-        std::cout << "Test skipped because GL_CHROMIUM_bind_uniform_location is not available."
>-                  << std::endl;
>-        return;
>-    }
>+    ANGLE_SKIP_TEST_IF(!IsGLExtensionEnabled("GL_CHROMIUM_bind_uniform_location"));
> 
>-    ASSERT_NE(nullptr, mBindUniformLocation);
>+    ASSERT_NE(nullptr, glBindUniformLocationCHROMIUM);
> 
>-    const std::string vsSource =
>-        R"(attribute vec4 a_position;
>-        void main()
>-        {
>-            gl_Position = a_position;
>-        })";
>-
>-    const std::string fsSource =
>-        R"(precision mediump float;
>-        uniform vec4 u_colorA;
>-        uniform float u_colorU;
>-        uniform vec4 u_colorC;
>-        void main()
>-        {
>-            gl_FragColor = u_colorA + u_colorC;
>-        })";
>+    constexpr char kFS[] = R"(precision mediump float;
>+uniform vec4 u_colorA;
>+uniform float u_colorU;
>+uniform vec4 u_colorC;
>+void main()
>+{
>+    gl_FragColor = u_colorA + u_colorC;
>+})";
> 
>     const GLint colorULocation      = 1;
>     const GLint nonexistingLocation = 5;
>     const GLint unboundLocation     = 6;
> 
>-    GLuint vs = CompileShader(GL_VERTEX_SHADER, vsSource);
>-    GLuint fs = CompileShader(GL_FRAGMENT_SHADER, fsSource);
>+    mProgram = CompileProgram(essl1_shaders::vs::Simple(), kFS, [&](GLuint program) {
>+        glBindUniformLocationCHROMIUM(program, colorULocation, "u_colorU");
>+        // The non-existing uniform should behave like existing, but optimized away
>+        // uniform.
>+        glBindUniformLocationCHROMIUM(program, nonexistingLocation, "nonexisting");
>+        // Let A and C be assigned automatic locations.
>+    });
>+    ASSERT_NE(0u, mProgram);
> 
>-    mProgram = glCreateProgram();
>-    mBindUniformLocation(mProgram, colorULocation, "u_colorU");
>-    // The non-existing uniform should behave like existing, but optimized away
>-    // uniform.
>-    mBindUniformLocation(mProgram, nonexistingLocation, "nonexisting");
>-    // Let A and C be assigned automatic locations.
>-    glAttachShader(mProgram, vs);
>-    glDeleteShader(vs);
>-    glAttachShader(mProgram, fs);
>-    glDeleteShader(fs);
>-    glLinkProgram(mProgram);
>-    GLint linked = 0;
>-    glGetProgramiv(mProgram, GL_LINK_STATUS, &linked);
>-    ASSERT_EQ(1, linked);
>     glUseProgram(mProgram);
> 
>     // No errors on bound locations, since caller does not know
>@@ -397,22 +349,9 @@ TEST_P(BindUniformLocationTest, UnusedUniformUpdate)
> // binding the sampler to a location higher than the amount of active uniforms.
> TEST_P(BindUniformLocationTest, UseSamplerWhenUnusedUniforms)
> {
>-    if (!extensionEnabled("GL_CHROMIUM_bind_uniform_location"))
>-    {
>-        std::cout << "Test skipped because GL_CHROMIUM_bind_uniform_location is not available."
>-                  << std::endl;
>-        return;
>-    }
>-
>-    ASSERT_NE(nullptr, mBindUniformLocation);
>+    ANGLE_SKIP_TEST_IF(!IsGLExtensionEnabled("GL_CHROMIUM_bind_uniform_location"));
> 
>-    const std::string vsSource =
>-        R"(void main()
>-        {
>-            gl_Position = vec4(0);
>-        })";
>-
>-    const std::string fsSource =
>+    constexpr char kFS[] =
>         R"(uniform sampler2D tex;
>         void main()
>         {
>@@ -421,22 +360,11 @@ TEST_P(BindUniformLocationTest, UseSamplerWhenUnusedUniforms)
> 
>     const GLuint texLocation = 54;
> 
>-    GLuint vs = CompileShader(GL_VERTEX_SHADER, vsSource);
>-    GLuint fs = CompileShader(GL_FRAGMENT_SHADER, fsSource);
>-
>-    mProgram = glCreateProgram();
>-    mBindUniformLocation(mProgram, texLocation, "tex");
>+    mProgram = CompileProgram(essl1_shaders::vs::Simple(), kFS, [&](GLuint program) {
>+        glBindUniformLocationCHROMIUM(program, texLocation, "tex");
>+    });
>+    ASSERT_NE(0u, mProgram);
> 
>-    glAttachShader(mProgram, vs);
>-    glDeleteShader(vs);
>-    glAttachShader(mProgram, fs);
>-    glDeleteShader(fs);
>-
>-    glLinkProgram(mProgram);
>-
>-    GLint linked = 0;
>-    glGetProgramiv(mProgram, GL_LINK_STATUS, &linked);
>-    EXPECT_NE(0, linked);
>     glUseProgram(mProgram);
>     glUniform1i(texLocation, 0);
>     EXPECT_GL_NO_ERROR();
>@@ -446,22 +374,9 @@ TEST_P(BindUniformLocationTest, UseSamplerWhenUnusedUniforms)
> // This is valid according to the extension spec.
> TEST_P(BindUniformLocationTest, SameLocationForUsedAndUnusedUniform)
> {
>-    if (!extensionEnabled("GL_CHROMIUM_bind_uniform_location"))
>-    {
>-        std::cout << "Test skipped because GL_CHROMIUM_bind_uniform_location is not available."
>-                  << std::endl;
>-        return;
>-    }
>-
>-    ASSERT_NE(nullptr, mBindUniformLocation);
>-
>-    const std::string vsSource =
>-        R"(void main()
>-        {
>-            gl_Position = vec4(0);
>-        })";
>+    ANGLE_SKIP_TEST_IF(!IsGLExtensionEnabled("GL_CHROMIUM_bind_uniform_location"));
> 
>-    const std::string fsSource =
>+    constexpr char kFS[] =
>         R"(precision mediump float;
>         uniform vec4 a;
>         uniform vec4 b;
>@@ -472,23 +387,12 @@ TEST_P(BindUniformLocationTest, SameLocationForUsedAndUnusedUniform)
> 
>     const GLuint location = 54;
> 
>-    GLuint vs = CompileShader(GL_VERTEX_SHADER, vsSource);
>-    GLuint fs = CompileShader(GL_FRAGMENT_SHADER, fsSource);
>-
>-    mProgram = glCreateProgram();
>-    mBindUniformLocation(mProgram, location, "a");
>-    mBindUniformLocation(mProgram, location, "b");
>-
>-    glAttachShader(mProgram, vs);
>-    glDeleteShader(vs);
>-    glAttachShader(mProgram, fs);
>-    glDeleteShader(fs);
>-
>-    glLinkProgram(mProgram);
>+    mProgram = CompileProgram(essl1_shaders::vs::Zero(), kFS, [&](GLuint program) {
>+        glBindUniformLocationCHROMIUM(program, location, "a");
>+        glBindUniformLocationCHROMIUM(program, location, "b");
>+    });
>+    ASSERT_NE(0u, mProgram);
> 
>-    GLint linked = GL_FALSE;
>-    glGetProgramiv(mProgram, GL_LINK_STATUS, &linked);
>-    ASSERT_GL_TRUE(linked);
>     glUseProgram(mProgram);
>     glUniform4f(location, 0.0, 1.0, 0.0, 1.0);
>     EXPECT_GL_NO_ERROR();
>@@ -499,20 +403,14 @@ class BindUniformLocationES31Test : public BindUniformLocationTest
>   protected:
>     BindUniformLocationES31Test() : BindUniformLocationTest() {}
> 
>-    void linkProgramWithUniformLocation(GLuint vs,
>-                                        GLuint fs,
>+    void linkProgramWithUniformLocation(const char *vs,
>+                                        const char *fs,
>                                         const char *uniformName,
>                                         GLint uniformLocation)
>     {
>-        mProgram = glCreateProgram();
>-        mBindUniformLocation(mProgram, uniformLocation, uniformName);
>-
>-        glAttachShader(mProgram, vs);
>-        glDeleteShader(vs);
>-        glAttachShader(mProgram, fs);
>-        glDeleteShader(fs);
>-
>-        glLinkProgram(mProgram);
>+        mProgram = CompileProgram(vs, fs, [&](GLuint program) {
>+            glBindUniformLocationCHROMIUM(program, uniformLocation, uniformName);
>+        });
>     }
> };
> 
>@@ -520,21 +418,9 @@ class BindUniformLocationES31Test : public BindUniformLocationTest
> // bindUniformLocation API sets a consistent location.
> TEST_P(BindUniformLocationES31Test, ConsistentWithLocationLayoutQualifier)
> {
>-    if (!extensionEnabled("GL_CHROMIUM_bind_uniform_location"))
>-    {
>-        std::cout << "Test skipped because GL_CHROMIUM_bind_uniform_location is not available."
>-                  << std::endl;
>-        return;
>-    }
>-
>-    const std::string vsSource =
>-        "#version 310 es\n"
>-        "void main()\n"
>-        "{\n"
>-        "    gl_Position = vec4(0);\n"
>-        "}\n";
>+    ANGLE_SKIP_TEST_IF(!IsGLExtensionEnabled("GL_CHROMIUM_bind_uniform_location"));
> 
>-    const std::string fsSource =
>+    constexpr char kFS[] =
>         "#version 310 es\n"
>         "uniform layout(location=2) highp sampler2D tex;\n"
>         "out highp vec4 my_FragColor;\n"
>@@ -545,11 +431,7 @@ TEST_P(BindUniformLocationES31Test, ConsistentWithLocationLayoutQualifier)
> 
>     const GLuint texLocation = 2;
> 
>-    GLuint vs = CompileShader(GL_VERTEX_SHADER, vsSource);
>-    EXPECT_NE(0u, vs);
>-    GLuint fs = CompileShader(GL_FRAGMENT_SHADER, fsSource);
>-    EXPECT_NE(0u, fs);
>-    linkProgramWithUniformLocation(vs, fs, "tex", texLocation);
>+    linkProgramWithUniformLocation(essl31_shaders::vs::Zero(), kFS, "tex", texLocation);
> 
>     GLint linked = GL_FALSE;
>     glGetProgramiv(mProgram, GL_LINK_STATUS, &linked);
>@@ -566,21 +448,9 @@ TEST_P(BindUniformLocationES31Test, ConsistentWithLocationLayoutQualifier)
> // location should prevail.
> TEST_P(BindUniformLocationES31Test, LocationLayoutQualifierOverridesAPIBinding)
> {
>-    if (!extensionEnabled("GL_CHROMIUM_bind_uniform_location"))
>-    {
>-        std::cout << "Test skipped because GL_CHROMIUM_bind_uniform_location is not available."
>-                  << std::endl;
>-        return;
>-    }
>+    ANGLE_SKIP_TEST_IF(!IsGLExtensionEnabled("GL_CHROMIUM_bind_uniform_location"));
> 
>-    const std::string vsSource =
>-        "#version 310 es\n"
>-        "void main()\n"
>-        "{\n"
>-        "    gl_Position = vec4(0);\n"
>-        "}\n";
>-
>-    const std::string fsSource =
>+    constexpr char kFS[] =
>         "#version 310 es\n"
>         "uniform layout(location=2) highp sampler2D tex;\n"
>         "out highp vec4 my_FragColor;\n"
>@@ -592,11 +462,7 @@ TEST_P(BindUniformLocationES31Test, LocationLayoutQualifierOverridesAPIBinding)
>     const GLuint shaderTexLocation = 2;
>     const GLuint texLocation       = 3;
> 
>-    GLuint vs = CompileShader(GL_VERTEX_SHADER, vsSource);
>-    EXPECT_NE(0u, vs);
>-    GLuint fs = CompileShader(GL_FRAGMENT_SHADER, fsSource);
>-    EXPECT_NE(0u, fs);
>-    linkProgramWithUniformLocation(vs, fs, "tex", texLocation);
>+    linkProgramWithUniformLocation(essl31_shaders::vs::Zero(), kFS, "tex", texLocation);
> 
>     GLint linked = GL_FALSE;
>     glGetProgramiv(mProgram, GL_LINK_STATUS, &linked);
>@@ -615,21 +481,9 @@ TEST_P(BindUniformLocationES31Test, LocationLayoutQualifierOverridesAPIBinding)
> // fail.
> TEST_P(BindUniformLocationES31Test, LocationLayoutQualifierConflictsWithAPIBinding)
> {
>-    if (!extensionEnabled("GL_CHROMIUM_bind_uniform_location"))
>-    {
>-        std::cout << "Test skipped because GL_CHROMIUM_bind_uniform_location is not available."
>-                  << std::endl;
>-        return;
>-    }
>+    ANGLE_SKIP_TEST_IF(!IsGLExtensionEnabled("GL_CHROMIUM_bind_uniform_location"));
> 
>-    const std::string vsSource =
>-        "#version 310 es\n"
>-        "void main()\n"
>-        "{\n"
>-        "    gl_Position = vec4(0);\n"
>-        "}\n";
>-
>-    const std::string fsSource =
>+    constexpr char kFS[] =
>         "#version 310 es\n"
>         "uniform layout(location=2) highp sampler2D tex;\n"
>         "uniform highp sampler2D tex2;\n"
>@@ -641,11 +495,7 @@ TEST_P(BindUniformLocationES31Test, LocationLayoutQualifierConflictsWithAPIBindi
> 
>     const GLuint tex2Location = 2;
> 
>-    GLuint vs = CompileShader(GL_VERTEX_SHADER, vsSource);
>-    EXPECT_NE(0u, vs);
>-    GLuint fs = CompileShader(GL_FRAGMENT_SHADER, fsSource);
>-    EXPECT_NE(0u, fs);
>-    linkProgramWithUniformLocation(vs, fs, "tex2", tex2Location);
>+    linkProgramWithUniformLocation(essl31_shaders::vs::Zero(), kFS, "tex2", tex2Location);
> 
>     GLint linked = GL_FALSE;
>     glGetProgramiv(mProgram, GL_LINK_STATUS, &linked);
>@@ -655,19 +505,9 @@ TEST_P(BindUniformLocationES31Test, LocationLayoutQualifierConflictsWithAPIBindi
> // Test for binding a location for an array of arrays uniform.
> TEST_P(BindUniformLocationES31Test, ArrayOfArrays)
> {
>-    ANGLE_SKIP_TEST_IF(!extensionEnabled("GL_CHROMIUM_bind_uniform_location"));
>+    ANGLE_SKIP_TEST_IF(!IsGLExtensionEnabled("GL_CHROMIUM_bind_uniform_location"));
> 
>-    const std::string vsSource =
>-        R"(#version 310 es
>-
>-        in vec4 a_position;
>-
>-        void main()
>-        {
>-            gl_Position = a_position;
>-        })";
>-
>-    const std::string fsSource =
>+    constexpr char kFS[] =
>         R"(#version 310 es
>         precision highp float;
>         uniform vec4 sourceColor[2][1];
>@@ -679,11 +519,7 @@ TEST_P(BindUniformLocationES31Test, ArrayOfArrays)
> 
>     const GLuint location = 8;
> 
>-    GLuint vs = CompileShader(GL_VERTEX_SHADER, vsSource);
>-    EXPECT_NE(0u, vs);
>-    GLuint fs = CompileShader(GL_FRAGMENT_SHADER, fsSource);
>-    EXPECT_NE(0u, fs);
>-    linkProgramWithUniformLocation(vs, fs, "sourceColor[1]", location);
>+    linkProgramWithUniformLocation(essl31_shaders::vs::Simple(), kFS, "sourceColor[1]", location);
> 
>     GLint linked = GL_FALSE;
>     glGetProgramiv(mProgram, GL_LINK_STATUS, &linked);
>@@ -692,7 +528,7 @@ TEST_P(BindUniformLocationES31Test, ArrayOfArrays)
>     glUseProgram(mProgram);
>     glUniform4f(location, 0.0f, 1.0f, 0.0f, 1.0f);
> 
>-    drawQuad(mProgram, "a_position", 0.5f);
>+    drawQuad(mProgram, essl31_shaders::PositionAttrib(), 0.5f);
>     EXPECT_GL_NO_ERROR();
> 
>     EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::green);
>@@ -705,8 +541,9 @@ ANGLE_INSTANTIATE_TEST(BindUniformLocationTest,
>                        ES2_D3D11(),
>                        ES2_D3D11_FL9_3(),
>                        ES2_OPENGL(),
>-                       ES2_OPENGLES());
>+                       ES2_OPENGLES(),
>+                       ES2_VULKAN());
> 
>-ANGLE_INSTANTIATE_TEST(BindUniformLocationES31Test, ES31_D3D11(), ES31_OPENGL(), ES31_OPENGLES())
>+ANGLE_INSTANTIATE_TEST(BindUniformLocationES31Test, ES31_D3D11(), ES31_OPENGL(), ES31_OPENGLES());
> 
> }  // namespace
>diff --git a/Source/ThirdParty/ANGLE/src/tests/gl_tests/BlendFuncExtendedTest.cpp b/Source/ThirdParty/ANGLE/src/tests/gl_tests/BlendFuncExtendedTest.cpp
>new file mode 100644
>index 00000000000..49d434cde50
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/tests/gl_tests/BlendFuncExtendedTest.cpp
>@@ -0,0 +1,610 @@
>+//
>+// Copyright 2018 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// BlendFuncExtendedTest
>+//   Test EXT_blend_func_extended
>+
>+#include "test_utils/ANGLETest.h"
>+
>+#include "util/shader_utils.h"
>+
>+#include <algorithm>
>+#include <cmath>
>+#include <fstream>
>+
>+using namespace angle;
>+
>+namespace
>+{
>+
>+// Partial implementation of weight function for GLES 2 blend equation that
>+// is dual-source aware.
>+template <int factor, int index>
>+float Weight(const float /*dst*/[4], const float src[4], const float src1[4])
>+{
>+    if (factor == GL_SRC_COLOR)
>+        return src[index];
>+    if (factor == GL_SRC_ALPHA)
>+        return src[3];
>+    if (factor == GL_SRC1_COLOR_EXT)
>+        return src1[index];
>+    if (factor == GL_SRC1_ALPHA_EXT)
>+        return src1[3];
>+    if (factor == GL_ONE_MINUS_SRC1_COLOR_EXT)
>+        return 1.0f - src1[index];
>+    if (factor == GL_ONE_MINUS_SRC1_ALPHA_EXT)
>+        return 1.0f - src1[3];
>+    return 0.0f;
>+}
>+
>+GLubyte ScaleChannel(float weight)
>+{
>+    return static_cast<GLubyte>(std::floor(std::max(0.0f, std::min(1.0f, weight)) * 255.0f));
>+}
>+
>+// Implementation of GLES 2 blend equation that is dual-source aware.
>+template <int RGBs, int RGBd, int As, int Ad>
>+void BlendEquationFuncAdd(const float dst[4],
>+                          const float src[4],
>+                          const float src1[4],
>+                          angle::GLColor *result)
>+{
>+    float r[4];
>+    r[0] = src[0] * Weight<RGBs, 0>(dst, src, src1) + dst[0] * Weight<RGBd, 0>(dst, src, src1);
>+    r[1] = src[1] * Weight<RGBs, 1>(dst, src, src1) + dst[1] * Weight<RGBd, 1>(dst, src, src1);
>+    r[2] = src[2] * Weight<RGBs, 2>(dst, src, src1) + dst[2] * Weight<RGBd, 2>(dst, src, src1);
>+    r[3] = src[3] * Weight<As, 3>(dst, src, src1) + dst[3] * Weight<Ad, 3>(dst, src, src1);
>+
>+    result->R = ScaleChannel(r[0]);
>+    result->G = ScaleChannel(r[1]);
>+    result->B = ScaleChannel(r[2]);
>+    result->A = ScaleChannel(r[3]);
>+}
>+
>+void CheckPixels(GLint x,
>+                 GLint y,
>+                 GLsizei width,
>+                 GLsizei height,
>+                 GLint tolerance,
>+                 const angle::GLColor &color)
>+{
>+    for (GLint yy = 0; yy < height; ++yy)
>+    {
>+        for (GLint xx = 0; xx < width; ++xx)
>+        {
>+            const auto px = x + xx;
>+            const auto py = y + yy;
>+            EXPECT_PIXEL_COLOR_NEAR(px, py, color, 1);
>+        }
>+    }
>+}
>+
>+const GLuint kWidth  = 100;
>+const GLuint kHeight = 100;
>+
>+class EXTBlendFuncExtendedTest : public ANGLETest
>+{};
>+
>+class EXTBlendFuncExtendedTestES3 : public ANGLETest
>+{};
>+
>+class EXTBlendFuncExtendedDrawTest : public ANGLETest
>+{
>+  protected:
>+    EXTBlendFuncExtendedDrawTest() : mProgram(0)
>+    {
>+        setWindowWidth(kWidth);
>+        setWindowHeight(kHeight);
>+        setConfigRedBits(8);
>+        setConfigGreenBits(8);
>+        setConfigBlueBits(8);
>+        setConfigAlphaBits(8);
>+    }
>+
>+    void SetUp() override
>+    {
>+        ANGLETest::SetUp();
>+
>+        glGenBuffers(1, &mVBO);
>+        glBindBuffer(GL_ARRAY_BUFFER, mVBO);
>+
>+        static const float vertices[] = {
>+            1.0f, 1.0f, -1.0f, 1.0f, -1.0f, -1.0f, 1.0f, 1.0f, -1.0f, -1.0f, 1.0f, -1.0f,
>+        };
>+        glBufferData(GL_ARRAY_BUFFER, sizeof(vertices), vertices, GL_STATIC_DRAW);
>+
>+        ASSERT_GL_NO_ERROR();
>+    }
>+
>+    void TearDown() override
>+    {
>+        glDeleteBuffers(1, &mVBO);
>+        if (mProgram)
>+        {
>+            glDeleteProgram(mProgram);
>+        }
>+
>+        ASSERT_GL_NO_ERROR();
>+
>+        ANGLETest::TearDown();
>+    }
>+
>+    void makeProgram(const char *vertSource, const char *fragSource)
>+    {
>+        mProgram = CompileProgram(vertSource, fragSource);
>+
>+        ASSERT_NE(0u, mProgram);
>+    }
>+
>+    void drawTest()
>+    {
>+        glUseProgram(mProgram);
>+
>+        GLint position = glGetAttribLocation(mProgram, essl1_shaders::PositionAttrib());
>+        GLint src0     = glGetUniformLocation(mProgram, "src0");
>+        GLint src1     = glGetUniformLocation(mProgram, "src1");
>+        ASSERT_GL_NO_ERROR();
>+
>+        glBindBuffer(GL_ARRAY_BUFFER, mVBO);
>+        glEnableVertexAttribArray(position);
>+        glVertexAttribPointer(position, 2, GL_FLOAT, GL_FALSE, 0, 0);
>+        ASSERT_GL_NO_ERROR();
>+
>+        static const float kDst[4]  = {0.5f, 0.5f, 0.5f, 0.5f};
>+        static const float kSrc0[4] = {1.0f, 1.0f, 1.0f, 1.0f};
>+        static const float kSrc1[4] = {0.3f, 0.6f, 0.9f, 0.7f};
>+
>+        glUniform4f(src0, kSrc0[0], kSrc0[1], kSrc0[2], kSrc0[3]);
>+        glUniform4f(src1, kSrc1[0], kSrc1[1], kSrc1[2], kSrc1[3]);
>+        ASSERT_GL_NO_ERROR();
>+
>+        glEnable(GL_BLEND);
>+        glBlendEquation(GL_FUNC_ADD);
>+        glViewport(0, 0, kWidth, kHeight);
>+        glClearColor(kDst[0], kDst[1], kDst[2], kDst[3]);
>+        ASSERT_GL_NO_ERROR();
>+
>+        {
>+            glBlendFuncSeparate(GL_SRC1_COLOR_EXT, GL_SRC_ALPHA, GL_ONE_MINUS_SRC1_COLOR_EXT,
>+                                GL_ONE_MINUS_SRC1_ALPHA_EXT);
>+
>+            glClear(GL_COLOR_BUFFER_BIT);
>+            glDrawArrays(GL_TRIANGLES, 0, 6);
>+            ASSERT_GL_NO_ERROR();
>+
>+            // verify
>+            angle::GLColor color;
>+            BlendEquationFuncAdd<GL_SRC1_COLOR_EXT, GL_SRC_ALPHA, GL_ONE_MINUS_SRC1_COLOR_EXT,
>+                                 GL_ONE_MINUS_SRC1_ALPHA_EXT>(kDst, kSrc0, kSrc1, &color);
>+
>+            CheckPixels(kWidth / 4, (3 * kHeight) / 4, 1, 1, 1, color);
>+            CheckPixels(kWidth - 1, 0, 1, 1, 1, color);
>+        }
>+
>+        {
>+            glBlendFuncSeparate(GL_ONE_MINUS_SRC1_COLOR_EXT, GL_ONE_MINUS_SRC_ALPHA,
>+                                GL_ONE_MINUS_SRC_COLOR, GL_SRC1_ALPHA_EXT);
>+
>+            glClear(GL_COLOR_BUFFER_BIT);
>+            glDrawArrays(GL_TRIANGLES, 0, 6);
>+            ASSERT_GL_NO_ERROR();
>+
>+            // verify
>+            angle::GLColor color;
>+            BlendEquationFuncAdd<GL_ONE_MINUS_SRC1_COLOR_EXT, GL_ONE_MINUS_SRC_ALPHA,
>+                                 GL_ONE_MINUS_SRC_COLOR, GL_SRC1_ALPHA_EXT>(kDst, kSrc0, kSrc1,
>+                                                                            &color);
>+
>+            CheckPixels(kWidth / 4, (3 * kHeight) / 4, 1, 1, 1, color);
>+            CheckPixels(kWidth - 1, 0, 1, 1, 1, color);
>+        }
>+    }
>+
>+    GLuint mVBO;
>+    GLuint mProgram;
>+};
>+
>+class EXTBlendFuncExtendedDrawTestES3 : public EXTBlendFuncExtendedDrawTest
>+{
>+  protected:
>+    EXTBlendFuncExtendedDrawTestES3() : EXTBlendFuncExtendedDrawTest(), mIsES31OrNewer(false) {}
>+
>+    void SetUp() override
>+    {
>+        EXTBlendFuncExtendedDrawTest::SetUp();
>+        if (getClientMajorVersion() > 3 || getClientMinorVersion() >= 1)
>+        {
>+            mIsES31OrNewer = true;
>+        }
>+    }
>+    void checkOutputIndexQuery(const char *name, GLint expectedIndex)
>+    {
>+        GLint index = glGetFragDataIndexEXT(mProgram, name);
>+        EXPECT_EQ(expectedIndex, index);
>+        if (mIsES31OrNewer)
>+        {
>+            index = glGetProgramResourceLocationIndexEXT(mProgram, GL_PROGRAM_OUTPUT, name);
>+            EXPECT_EQ(expectedIndex, index);
>+        }
>+        else
>+        {
>+            glGetProgramResourceLocationIndexEXT(mProgram, GL_PROGRAM_OUTPUT, name);
>+            EXPECT_GL_ERROR(GL_INVALID_OPERATION);
>+        }
>+    }
>+
>+  private:
>+    bool mIsES31OrNewer;
>+};
>+
>+}  // namespace
>+
>+// Test EXT_blend_func_extended related gets.
>+TEST_P(EXTBlendFuncExtendedTest, TestMaxDualSourceDrawBuffers)
>+{
>+    ANGLE_SKIP_TEST_IF(!IsGLExtensionEnabled("GL_EXT_blend_func_extended"));
>+
>+    GLint maxDualSourceDrawBuffers = 0;
>+    glGetIntegerv(GL_MAX_DUAL_SOURCE_DRAW_BUFFERS_EXT, &maxDualSourceDrawBuffers);
>+    EXPECT_GT(maxDualSourceDrawBuffers, 0);
>+
>+    ASSERT_GL_NO_ERROR();
>+}
>+
>+// Test a shader with EXT_blend_func_extended and gl_SecondaryFragColorEXT.
>+// Outputs to primary color buffer using primary and secondary colors.
>+TEST_P(EXTBlendFuncExtendedDrawTest, FragColor)
>+{
>+    ANGLE_SKIP_TEST_IF(!IsGLExtensionEnabled("GL_EXT_blend_func_extended"));
>+
>+    const char *kFragColorShader =
>+        "#extension GL_EXT_blend_func_extended : require\n"
>+        "precision mediump float;\n"
>+        "uniform vec4 src0;\n"
>+        "uniform vec4 src1;\n"
>+        "void main() {\n"
>+        "  gl_FragColor = src0;\n"
>+        "  gl_SecondaryFragColorEXT = src1;\n"
>+        "}\n";
>+
>+    makeProgram(essl1_shaders::vs::Simple(), kFragColorShader);
>+
>+    drawTest();
>+}
>+
>+// Test a shader with EXT_blend_func_extended and gl_FragData.
>+// Outputs to a color buffer using primary and secondary frag data.
>+TEST_P(EXTBlendFuncExtendedDrawTest, FragData)
>+{
>+    ANGLE_SKIP_TEST_IF(!IsGLExtensionEnabled("GL_EXT_blend_func_extended"));
>+
>+    const char *kFragColorShader =
>+        "#extension GL_EXT_blend_func_extended : require\n"
>+        "precision mediump float;\n"
>+        "uniform vec4 src0;\n"
>+        "uniform vec4 src1;\n"
>+        "void main() {\n"
>+        "  gl_FragData[0] = src0;\n"
>+        "  gl_SecondaryFragDataEXT[0] = src1;\n"
>+        "}\n";
>+
>+    makeProgram(essl1_shaders::vs::Simple(), kFragColorShader);
>+
>+    drawTest();
>+}
>+
>+// Test an ESSL 3.00 shader that uses two fragment outputs with locations specified in the shader.
>+TEST_P(EXTBlendFuncExtendedDrawTestES3, FragmentOutputLocationsInShader)
>+{
>+    ANGLE_SKIP_TEST_IF(!IsGLExtensionEnabled("GL_EXT_blend_func_extended"));
>+
>+    const char *kFragColorShader = R"(#version 300 es
>+#extension GL_EXT_blend_func_extended : require
>+precision mediump float;
>+uniform vec4 src0;
>+uniform vec4 src1;
>+layout(location = 0, index = 1) out vec4 outSrc1;
>+layout(location = 0, index = 0) out vec4 outSrc0;
>+void main() {
>+    outSrc0 = src0;
>+    outSrc1 = src1;
>+})";
>+
>+    makeProgram(essl3_shaders::vs::Simple(), kFragColorShader);
>+
>+    checkOutputIndexQuery("outSrc0", 0);
>+    checkOutputIndexQuery("outSrc1", 1);
>+
>+    drawTest();
>+}
>+
>+// Test an ESSL 3.00 shader that uses two fragment outputs with locations specified through the API.
>+TEST_P(EXTBlendFuncExtendedDrawTestES3, FragmentOutputLocationAPI)
>+{
>+    ANGLE_SKIP_TEST_IF(!IsGLExtensionEnabled("GL_EXT_blend_func_extended"));
>+
>+    constexpr char kFS[] = R"(#version 300 es
>+#extension GL_EXT_blend_func_extended : require
>+precision mediump float;
>+uniform vec4 src0;
>+uniform vec4 src1;
>+out vec4 outSrc1;
>+out vec4 outSrc0;
>+void main() {
>+    outSrc0 = src0;
>+    outSrc1 = src1;
>+})";
>+
>+    mProgram = CompileProgram(essl3_shaders::vs::Simple(), kFS, [](GLuint program) {
>+        glBindFragDataLocationIndexedEXT(program, 0, 0, "outSrc0");
>+        glBindFragDataLocationIndexedEXT(program, 0, 1, "outSrc1");
>+    });
>+
>+    ASSERT_NE(0u, mProgram);
>+
>+    checkOutputIndexQuery("outSrc0", 0);
>+    checkOutputIndexQuery("outSrc1", 1);
>+
>+    drawTest();
>+}
>+
>+// Test an ESSL 3.00 shader that uses two fragment outputs, with location for one specified through
>+// the API and location for another being set automatically.
>+TEST_P(EXTBlendFuncExtendedDrawTestES3, FragmentOutputLocationsAPIAndAutomatic)
>+{
>+    ANGLE_SKIP_TEST_IF(!IsGLExtensionEnabled("GL_EXT_blend_func_extended"));
>+
>+    constexpr char kFS[] = R"(#version 300 es
>+#extension GL_EXT_blend_func_extended : require
>+precision mediump float;
>+uniform vec4 src0;
>+uniform vec4 src1;
>+out vec4 outSrc1;
>+out vec4 outSrc0;
>+void main() {
>+    outSrc0 = src0;
>+    outSrc1 = src1;
>+})";
>+
>+    mProgram = CompileProgram(essl3_shaders::vs::Simple(), kFS, [](GLuint program) {
>+        glBindFragDataLocationIndexedEXT(program, 0, 1, "outSrc1");
>+    });
>+
>+    ASSERT_NE(0u, mProgram);
>+
>+    checkOutputIndexQuery("outSrc0", 0);
>+    checkOutputIndexQuery("outSrc1", 1);
>+
>+    drawTest();
>+}
>+
>+// Test an ESSL 3.00 shader that uses two array fragment outputs with locations specified through
>+// the API.
>+TEST_P(EXTBlendFuncExtendedDrawTestES3, FragmentArrayOutputLocationsAPI)
>+{
>+    ANGLE_SKIP_TEST_IF(!IsGLExtensionEnabled("GL_EXT_blend_func_extended"));
>+
>+    // TODO: Investigate this mac-only failure.  http://angleproject.com/1085
>+    ANGLE_SKIP_TEST_IF(IsOSX());
>+
>+    constexpr char kFS[] = R"(#version 300 es
>+#extension GL_EXT_blend_func_extended : require
>+precision mediump float;
>+uniform vec4 src0;
>+uniform vec4 src1;
>+out vec4 outSrc1[1];
>+out vec4 outSrc0[1];
>+void main() {
>+    outSrc0[0] = src0;
>+    outSrc1[0] = src1;
>+})";
>+
>+    mProgram = CompileProgram(essl3_shaders::vs::Simple(), kFS, [](GLuint program) {
>+        // Specs aren't very clear on what kind of name should be used when binding location for
>+        // array variables. We only allow names that do include the "[0]" suffix.
>+        glBindFragDataLocationIndexedEXT(program, 0, 0, "outSrc0[0]");
>+        glBindFragDataLocationIndexedEXT(program, 0, 1, "outSrc1[0]");
>+    });
>+
>+    ASSERT_NE(0u, mProgram);
>+
>+    // The extension spec is not very clear on what name can be used for the queries for array
>+    // variables. We're checking that the queries work in the same way as specified in OpenGL 4.4
>+    // page 107.
>+    checkOutputIndexQuery("outSrc0[0]", 0);
>+    checkOutputIndexQuery("outSrc1[0]", 1);
>+    checkOutputIndexQuery("outSrc0", 0);
>+    checkOutputIndexQuery("outSrc1", 1);
>+
>+    // These queries use an out of range array index so they should return -1.
>+    checkOutputIndexQuery("outSrc0[1]", -1);
>+    checkOutputIndexQuery("outSrc1[1]", -1);
>+
>+    drawTest();
>+}
>+
>+// Test an ESSL 3.00 program with a link-time fragment output location conflict.
>+TEST_P(EXTBlendFuncExtendedTestES3, FragmentOutputLocationConflict)
>+{
>+    ANGLE_SKIP_TEST_IF(!IsGLExtensionEnabled("GL_EXT_blend_func_extended"));
>+
>+    constexpr char kFS[] = R"(#version 300 es
>+#extension GL_EXT_blend_func_extended : require
>+precision mediump float;
>+uniform vec4 src0;
>+uniform vec4 src1;
>+out vec4 out0;
>+out vec4 out1;
>+void main() {
>+    out0 = src0;
>+    out1 = src1;
>+})";
>+
>+    GLuint vs = CompileShader(GL_VERTEX_SHADER, essl3_shaders::vs::Simple());
>+    GLuint fs = CompileShader(GL_FRAGMENT_SHADER, kFS);
>+    ASSERT_NE(0u, vs);
>+    ASSERT_NE(0u, fs);
>+
>+    GLuint program = glCreateProgram();
>+    glAttachShader(program, vs);
>+    glDeleteShader(vs);
>+    glAttachShader(program, fs);
>+    glDeleteShader(fs);
>+
>+    glBindFragDataLocationIndexedEXT(program, 0, 0, "out0");
>+    glBindFragDataLocationIndexedEXT(program, 0, 0, "out1");
>+
>+    // The program should fail to link.
>+    glLinkProgram(program);
>+    GLint linkStatus;
>+    glGetProgramiv(program, GL_LINK_STATUS, &linkStatus);
>+    EXPECT_EQ(0, linkStatus);
>+
>+    glDeleteProgram(program);
>+}
>+
>+// Test an ESSL 3.00 program with some bindings set for nonexistent variables. These should not
>+// create link-time conflicts.
>+TEST_P(EXTBlendFuncExtendedTestES3, FragmentOutputLocationForNonexistentOutput)
>+{
>+    ANGLE_SKIP_TEST_IF(!IsGLExtensionEnabled("GL_EXT_blend_func_extended"));
>+
>+    constexpr char kFS[] = R"(#version 300 es
>+#extension GL_EXT_blend_func_extended : require
>+precision mediump float;
>+uniform vec4 src0;
>+out vec4 out0;
>+void main() {
>+    out0 = src0;
>+})";
>+
>+    GLuint vs = CompileShader(GL_VERTEX_SHADER, essl3_shaders::vs::Simple());
>+    GLuint fs = CompileShader(GL_FRAGMENT_SHADER, kFS);
>+    ASSERT_NE(0u, vs);
>+    ASSERT_NE(0u, fs);
>+
>+    GLuint program = glCreateProgram();
>+    glAttachShader(program, vs);
>+    glDeleteShader(vs);
>+    glAttachShader(program, fs);
>+    glDeleteShader(fs);
>+
>+    glBindFragDataLocationIndexedEXT(program, 0, 0, "out0");
>+    glBindFragDataLocationIndexedEXT(program, 0, 0, "out1");
>+    glBindFragDataLocationIndexedEXT(program, 0, 0, "out2[0]");
>+
>+    // The program should link successfully - conflicting location for nonexistent variables out1 or
>+    // out2 should not be an issue.
>+    glLinkProgram(program);
>+    GLint linkStatus;
>+    glGetProgramiv(program, GL_LINK_STATUS, &linkStatus);
>+    EXPECT_NE(0, linkStatus);
>+
>+    glDeleteProgram(program);
>+}
>+
>+// Test mixing shader-assigned and automatic output locations.
>+TEST_P(EXTBlendFuncExtendedTestES3, FragmentOutputLocationsPartiallyAutomatic)
>+{
>+    ANGLE_SKIP_TEST_IF(!IsGLExtensionEnabled("GL_EXT_blend_func_extended"));
>+
>+    GLint maxDrawBuffers;
>+    glGetIntegerv(GL_MAX_DRAW_BUFFERS, &maxDrawBuffers);
>+    ANGLE_SKIP_TEST_IF(maxDrawBuffers < 4);
>+
>+    constexpr char kFS[] = R"(#version 300 es
>+#extension GL_EXT_blend_func_extended : require
>+precision mediump float;
>+uniform vec4 src0;
>+uniform vec4 src1;
>+uniform vec4 src2;
>+uniform vec4 src3;
>+layout(location=0) out vec4 out0;
>+layout(location=3) out vec4 out3;
>+out vec4 out12[2];
>+void main() {
>+    out0 = src0;
>+    out12[0] = src1;
>+    out12[1] = src2;
>+    out3 = src3;
>+})";
>+
>+    GLuint program = CompileProgram(essl3_shaders::vs::Simple(), kFS);
>+    ASSERT_NE(0u, program);
>+
>+    GLint location = glGetFragDataLocation(program, "out0");
>+    EXPECT_EQ(0, location);
>+    location = glGetFragDataLocation(program, "out12");
>+    EXPECT_EQ(1, location);
>+    location = glGetFragDataLocation(program, "out3");
>+    EXPECT_EQ(3, location);
>+
>+    glDeleteProgram(program);
>+}
>+
>+// Test a fragment output array that doesn't fit because contiguous locations are not available.
>+TEST_P(EXTBlendFuncExtendedTestES3, FragmentOutputArrayDoesntFit)
>+{
>+    ANGLE_SKIP_TEST_IF(!IsGLExtensionEnabled("GL_EXT_blend_func_extended"));
>+
>+    GLint maxDrawBuffers;
>+    glGetIntegerv(GL_MAX_DRAW_BUFFERS, &maxDrawBuffers);
>+    ANGLE_SKIP_TEST_IF(maxDrawBuffers < 4);
>+
>+    std::stringstream fragShader;
>+    fragShader << R"(#version 300 es
>+#extension GL_EXT_blend_func_extended : require
>+precision mediump float;
>+layout(location=2) out vec4 out0;
>+out vec4 outArray[)"
>+               << (maxDrawBuffers - 1) << R"(];
>+void main() {
>+    out0 = vec4(1.0);
>+    outArray[0] = vec4(1.0);
>+})";
>+
>+    GLuint vs = CompileShader(GL_VERTEX_SHADER, essl3_shaders::vs::Simple());
>+    GLuint fs = CompileShader(GL_FRAGMENT_SHADER, fragShader.str().c_str());
>+    ASSERT_NE(0u, vs);
>+    ASSERT_NE(0u, fs);
>+
>+    GLuint program = glCreateProgram();
>+    glAttachShader(program, vs);
>+    glDeleteShader(vs);
>+    glAttachShader(program, fs);
>+    glDeleteShader(fs);
>+
>+    // The program should not link - there's no way to fit "outArray" into available output
>+    // locations.
>+    glLinkProgram(program);
>+    GLint linkStatus;
>+    glGetProgramiv(program, GL_LINK_STATUS, &linkStatus);
>+    EXPECT_EQ(0, linkStatus);
>+
>+    glDeleteProgram(program);
>+}
>+
>+ANGLE_INSTANTIATE_TEST(EXTBlendFuncExtendedTest,
>+                       ES2_OPENGL(),
>+                       ES2_OPENGLES(),
>+                       ES3_OPENGL(),
>+                       ES3_OPENGLES(),
>+                       ES2_VULKAN());
>+ANGLE_INSTANTIATE_TEST(EXTBlendFuncExtendedTestES3,
>+                       ES3_OPENGL(),
>+                       ES3_OPENGLES(),
>+                       ES31_OPENGL(),
>+                       ES31_OPENGLES());
>+ANGLE_INSTANTIATE_TEST(EXTBlendFuncExtendedDrawTest,
>+                       ES2_OPENGL(),
>+                       ES2_OPENGLES(),
>+                       ES3_OPENGL(),
>+                       ES3_OPENGLES(),
>+                       ES2_VULKAN());
>+ANGLE_INSTANTIATE_TEST(EXTBlendFuncExtendedDrawTestES3,
>+                       ES3_OPENGL(),
>+                       ES3_OPENGLES(),
>+                       ES31_OPENGL(),
>+                       ES31_OPENGLES());
>diff --git a/Source/ThirdParty/ANGLE/src/tests/gl_tests/BlendMinMaxTest.cpp b/Source/ThirdParty/ANGLE/src/tests/gl_tests/BlendMinMaxTest.cpp
>index d06f36aac5c..a9d98bc1728 100644
>--- a/Source/ThirdParty/ANGLE/src/tests/gl_tests/BlendMinMaxTest.cpp
>+++ b/Source/ThirdParty/ANGLE/src/tests/gl_tests/BlendMinMaxTest.cpp
>@@ -21,9 +21,9 @@ class BlendMinMaxTest : public ANGLETest
>         setConfigAlphaBits(8);
>         setConfigDepthBits(24);
> 
>-        mProgram = 0;
>-        mColorLocation = -1;
>-        mFramebuffer = 0;
>+        mProgram           = 0;
>+        mColorLocation     = -1;
>+        mFramebuffer       = 0;
>         mColorRenderbuffer = 0;
>     }
> 
>@@ -39,18 +39,8 @@ class BlendMinMaxTest : public ANGLETest
> 
>     void runTest(GLenum colorFormat, GLenum type)
>     {
>-        if (getClientMajorVersion() < 3 && !extensionEnabled("GL_EXT_blend_minmax"))
>-        {
>-            std::cout << "Test skipped because ES3 or GL_EXT_blend_minmax is not available." << std::endl;
>-            return;
>-        }
>-
>-        // TODO(geofflang): figure out why this fails
>-        if (IsIntel() && GetParam() == ES2_OPENGL())
>-        {
>-            std::cout << "Test skipped on OpenGL Intel due to flakyness." << std::endl;
>-            return;
>-        }
>+        ANGLE_SKIP_TEST_IF(getClientMajorVersion() < 3 &&
>+                           !IsGLExtensionEnabled("GL_EXT_blend_minmax"));
> 
>         SetUpFramebuffer(colorFormat);
> 
>@@ -78,12 +68,13 @@ class BlendMinMaxTest : public ANGLETest
>         {
>             const Color &color = colors[i];
>             glUseProgram(mProgram);
>-            glUniform4f(mColorLocation, color.values[0], color.values[1], color.values[2], color.values[3]);
>+            glUniform4f(mColorLocation, color.values[0], color.values[1], color.values[2],
>+                        color.values[3]);
> 
>             bool blendMin = (rand() % 2 == 0);
>             glBlendEquation(blendMin ? GL_MIN : GL_MAX);
> 
>-            drawQuad(mProgram, "aPosition", 0.5f);
>+            drawQuad(mProgram, essl1_shaders::PositionAttrib(), 0.5f);
> 
>             float pixel[4];
>             if (type == GL_UNSIGNED_BYTE)
>@@ -123,27 +114,13 @@ class BlendMinMaxTest : public ANGLETest
>     {
>         ANGLETest::SetUp();
> 
>-        const std::string testVertexShaderSource =
>-            R"(attribute highp vec4 aPosition;
>-            void main(void)
>-            {
>-                gl_Position = aPosition;
>-            })";
>-
>-        const std::string testFragmentShaderSource =
>-            R"(uniform highp vec4 color;
>-            void main(void)
>-            {
>-                gl_FragColor = color;
>-            })";
>-
>-        mProgram = CompileProgram(testVertexShaderSource, testFragmentShaderSource);
>+        mProgram = CompileProgram(essl1_shaders::vs::Simple(), essl1_shaders::fs::UniformColor());
>         if (mProgram == 0)
>         {
>             FAIL() << "shader compilation failed.";
>         }
> 
>-        mColorLocation = glGetUniformLocation(mProgram, "color");
>+        mColorLocation = glGetUniformLocation(mProgram, essl1_shaders::ColorUniform());
> 
>         glUseProgram(mProgram);
> 
>@@ -163,7 +140,8 @@ class BlendMinMaxTest : public ANGLETest
>         glGenRenderbuffers(1, &mColorRenderbuffer);
>         glBindRenderbuffer(GL_RENDERBUFFER, mColorRenderbuffer);
>         glRenderbufferStorage(GL_RENDERBUFFER, colorFormat, getWindowWidth(), getWindowHeight());
>-        glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_RENDERBUFFER, mColorRenderbuffer);
>+        glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_RENDERBUFFER,
>+                                  mColorRenderbuffer);
> 
>         glClearColor(0.0f, 0.0f, 0.0f, 0.0f);
>         glClear(GL_COLOR_BUFFER_BIT);
>@@ -194,36 +172,25 @@ TEST_P(BlendMinMaxTest, RGBA8)
> 
> TEST_P(BlendMinMaxTest, RGBA32F)
> {
>-    if (getClientMajorVersion() < 3 || !extensionEnabled("GL_EXT_color_buffer_float"))
>-    {
>-        std::cout << "Test skipped because ES3 and GL_EXT_color_buffer_float are not available."
>-                  << std::endl;
>-        return;
>-    }
>+    ANGLE_SKIP_TEST_IF(getClientMajorVersion() < 3 || !IsGLExtensionEnabled("GL_EXT_float_blend") ||
>+                       !IsGLExtensionEnabled("GL_EXT_color_buffer_float"));
> 
>-    // TODO (bug 1284): Investigate RGBA32f D3D SDK Layers messages on D3D11_FL9_3
>-    if (IsD3D11_FL93())
>-    {
>-        std::cout << "Test skipped on Feature Level 9_3." << std::endl;
>-        return;
>-    }
>+    // Ignore SDK layers messages on D3D11 FL 9.3 (http://anglebug.com/1284)
>+    ANGLE_SKIP_TEST_IF(IsD3D11_FL93());
> 
>     runTest(GL_RGBA32F, GL_FLOAT);
> }
> 
> TEST_P(BlendMinMaxTest, RGBA16F)
> {
>-    if (getClientMajorVersion() < 3 && !extensionEnabled("GL_EXT_color_buffer_half_float"))
>-    {
>-        std::cout << "Test skipped because ES3 or GL_EXT_color_buffer_half_float is not available."
>-                  << std::endl;
>-        return;
>-    }
>+    ANGLE_SKIP_TEST_IF(getClientMajorVersion() < 3 &&
>+                       !IsGLExtensionEnabled("GL_EXT_color_buffer_half_float"));
> 
>     runTest(GL_RGBA16F, GL_FLOAT);
> }
> 
>-// Use this to select which configurations (e.g. which renderer, which GLES major version) these tests should be run against.
>+// Use this to select which configurations (e.g. which renderer, which GLES major version) these
>+// tests should be run against.
> ANGLE_INSTANTIATE_TEST(BlendMinMaxTest,
>                        ES2_D3D9(),
>                        ES2_D3D11(),
>@@ -232,4 +199,5 @@ ANGLE_INSTANTIATE_TEST(BlendMinMaxTest,
>                        ES2_OPENGL(),
>                        ES3_OPENGL(),
>                        ES2_OPENGLES(),
>-                       ES3_OPENGLES());
>+                       ES3_OPENGLES(),
>+                       ES2_VULKAN());
>diff --git a/Source/ThirdParty/ANGLE/src/tests/gl_tests/BlitFramebufferANGLETest.cpp b/Source/ThirdParty/ANGLE/src/tests/gl_tests/BlitFramebufferANGLETest.cpp
>index 6558a3cbc7a..55a4ff5b065 100644
>--- a/Source/ThirdParty/ANGLE/src/tests/gl_tests/BlitFramebufferANGLETest.cpp
>+++ b/Source/ThirdParty/ANGLE/src/tests/gl_tests/BlitFramebufferANGLETest.cpp
>@@ -5,7 +5,6 @@
> //
> 
> #include "test_utils/ANGLETest.h"
>-
> #include "test_utils/gl_raii.h"
> 
> using namespace angle;
>@@ -15,8 +14,8 @@ class BlitFramebufferANGLETest : public ANGLETest
>   protected:
>     BlitFramebufferANGLETest()
>     {
>-        setWindowWidth(256);
>-        setWindowHeight(256);
>+        setWindowWidth(32);
>+        setWindowHeight(32);
>         setConfigRedBits(8);
>         setConfigGreenBits(8);
>         setConfigBlueBits(8);
>@@ -25,85 +24,52 @@ class BlitFramebufferANGLETest : public ANGLETest
>         setConfigStencilBits(8);
> 
>         mCheckerProgram = 0;
>-        mBlueProgram = 0;
>+        mBlueProgram    = 0;
>+        mRedProgram     = 0;
> 
>         mOriginalFBO = 0;
> 
>-        mUserFBO = 0;
>-        mUserColorBuffer = 0;
>+        mUserFBO                = 0;
>+        mUserColorBuffer        = 0;
>         mUserDepthStencilBuffer = 0;
> 
>-        mSmallFBO = 0;
>-        mSmallColorBuffer = 0;
>+        mSmallFBO                = 0;
>+        mSmallColorBuffer        = 0;
>         mSmallDepthStencilBuffer = 0;
> 
>-        mColorOnlyFBO = 0;
>+        mColorOnlyFBO         = 0;
>         mColorOnlyColorBuffer = 0;
> 
>-        mDiffFormatFBO = 0;
>+        mDiffFormatFBO         = 0;
>         mDiffFormatColorBuffer = 0;
> 
>-        mDiffSizeFBO = 0;
>+        mDiffSizeFBO         = 0;
>         mDiffSizeColorBuffer = 0;
> 
>-        mMRTFBO = 0;
>+        mMRTFBO          = 0;
>         mMRTColorBuffer0 = 0;
>         mMRTColorBuffer1 = 0;
> 
>-        mRGBAColorbuffer = 0;
>-        mRGBAFBO = 0;
>+        mRGBAColorbuffer              = 0;
>+        mRGBAFBO                      = 0;
>         mRGBAMultisampledRenderbuffer = 0;
>         mRGBAMultisampledFBO          = 0;
> 
>         mBGRAColorbuffer              = 0;
>         mBGRAFBO                      = 0;
>         mBGRAMultisampledRenderbuffer = 0;
>-        mBGRAMultisampledFBO = 0;
>+        mBGRAMultisampledFBO          = 0;
>     }
> 
>     virtual void SetUp()
>     {
>         ANGLETest::SetUp();
> 
>-        const std::string passthroughVS =
>-            R"(precision highp float;
>-            attribute vec4 position;
>-            varying vec4 pos;
>-
>-            void main()
>-            {
>-                gl_Position = position;
>-                pos = position;
>-            })";
>-
>-        const std::string checkeredFS =
>-            R"(precision highp float;
>-            varying vec4 pos;
>-
>-            void main()
>-            {
>-                if (pos.x * pos.y > 0.0)
>-                {
>-                    gl_FragColor = vec4(1.0, 0.0, 0.0, 1.0);
>-                }
>-                else
>-                {
>-                    gl_FragColor = vec4(0.0, 1.0, 0.0, 1.0);
>-                }
>-            })";
>-
>-        const std::string blueFS =
>-            R"(precision highp float;
>-            varying vec4 pos;
>-
>-            void main()
>-            {
>-                gl_FragColor = vec4(0.0, 0.0, 1.0, 1.0);
>-            })";
>-
>-        mCheckerProgram = CompileProgram(passthroughVS, checkeredFS);
>-        mBlueProgram = CompileProgram(passthroughVS, blueFS);
>-        if (mCheckerProgram == 0 || mBlueProgram == 0)
>+        mCheckerProgram =
>+            CompileProgram(essl1_shaders::vs::Passthrough(), essl1_shaders::fs::Checkered());
>+        mBlueProgram = CompileProgram(essl1_shaders::vs::Simple(), essl1_shaders::fs::Blue());
>+        mRedProgram  = CompileProgram(essl1_shaders::vs::Simple(), essl1_shaders::fs::Red());
>+        if (mCheckerProgram == 0 || mBlueProgram == 0 || mRedProgram == 0)
>         {
>             FAIL() << "shader compilation failed.";
>         }
>@@ -124,13 +90,17 @@ class BlitFramebufferANGLETest : public ANGLETest
>         glGenTextures(1, &mUserColorBuffer);
>         glGenRenderbuffers(1, &mUserDepthStencilBuffer);
>         glBindTexture(GL_TEXTURE_2D, mUserColorBuffer);
>-        glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, mUserColorBuffer, 0);
>+        glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D,
>+                               mUserColorBuffer, 0);
>         glTexImage2D(GL_TEXTURE_2D, 0, format, getWindowWidth(), getWindowHeight(), 0, format,
>                      GL_UNSIGNED_BYTE, nullptr);
>         glBindRenderbuffer(GL_RENDERBUFFER, mUserDepthStencilBuffer);
>-        glRenderbufferStorage(GL_RENDERBUFFER, GL_DEPTH24_STENCIL8_OES, getWindowWidth(), getWindowHeight());
>-        glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, GL_RENDERBUFFER, mUserDepthStencilBuffer);
>-        glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_STENCIL_ATTACHMENT, GL_RENDERBUFFER, mUserDepthStencilBuffer);
>+        glRenderbufferStorage(GL_RENDERBUFFER, GL_DEPTH24_STENCIL8_OES, getWindowWidth(),
>+                              getWindowHeight());
>+        glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, GL_RENDERBUFFER,
>+                                  mUserDepthStencilBuffer);
>+        glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_STENCIL_ATTACHMENT, GL_RENDERBUFFER,
>+                                  mUserDepthStencilBuffer);
> 
>         ASSERT_GLENUM_EQ(GL_FRAMEBUFFER_COMPLETE, glCheckFramebufferStatus(GL_FRAMEBUFFER));
>         ASSERT_GL_NO_ERROR();
>@@ -142,11 +112,15 @@ class BlitFramebufferANGLETest : public ANGLETest
>         glBindTexture(GL_TEXTURE_2D, mSmallColorBuffer);
>         glTexImage2D(GL_TEXTURE_2D, 0, format, getWindowWidth() / 2, getWindowHeight() / 2, 0,
>                      format, GL_UNSIGNED_BYTE, nullptr);
>-        glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, mSmallColorBuffer, 0);
>+        glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D,
>+                               mSmallColorBuffer, 0);
>         glBindRenderbuffer(GL_RENDERBUFFER, mSmallDepthStencilBuffer);
>-        glRenderbufferStorage(GL_RENDERBUFFER, GL_DEPTH24_STENCIL8_OES, getWindowWidth() / 2, getWindowHeight() / 2);
>-        glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, GL_RENDERBUFFER, mSmallDepthStencilBuffer);
>-        glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_STENCIL_ATTACHMENT, GL_RENDERBUFFER, mSmallDepthStencilBuffer);
>+        glRenderbufferStorage(GL_RENDERBUFFER, GL_DEPTH24_STENCIL8_OES, getWindowWidth() / 2,
>+                              getWindowHeight() / 2);
>+        glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, GL_RENDERBUFFER,
>+                                  mSmallDepthStencilBuffer);
>+        glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_STENCIL_ATTACHMENT, GL_RENDERBUFFER,
>+                                  mSmallDepthStencilBuffer);
> 
>         ASSERT_GLENUM_EQ(GL_FRAMEBUFFER_COMPLETE, glCheckFramebufferStatus(GL_FRAMEBUFFER));
>         ASSERT_GL_NO_ERROR();
>@@ -157,7 +131,8 @@ class BlitFramebufferANGLETest : public ANGLETest
>         glBindTexture(GL_TEXTURE_2D, mColorOnlyColorBuffer);
>         glTexImage2D(GL_TEXTURE_2D, 0, format, getWindowWidth(), getWindowHeight(), 0, format,
>                      GL_UNSIGNED_BYTE, nullptr);
>-        glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, mColorOnlyColorBuffer, 0);
>+        glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D,
>+                               mColorOnlyColorBuffer, 0);
> 
>         ASSERT_GLENUM_EQ(GL_FRAMEBUFFER_COMPLETE, glCheckFramebufferStatus(GL_FRAMEBUFFER));
>         ASSERT_GL_NO_ERROR();
>@@ -168,7 +143,8 @@ class BlitFramebufferANGLETest : public ANGLETest
>         glBindTexture(GL_TEXTURE_2D, mDiffFormatColorBuffer);
>         glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB, getWindowWidth(), getWindowHeight(), 0, GL_RGB,
>                      GL_UNSIGNED_SHORT_5_6_5, nullptr);
>-        glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, mDiffFormatColorBuffer, 0);
>+        glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D,
>+                               mDiffFormatColorBuffer, 0);
> 
>         ASSERT_GLENUM_EQ(GL_FRAMEBUFFER_COMPLETE, glCheckFramebufferStatus(GL_FRAMEBUFFER));
>         ASSERT_GL_NO_ERROR();
>@@ -179,12 +155,13 @@ class BlitFramebufferANGLETest : public ANGLETest
>         glBindTexture(GL_TEXTURE_2D, mDiffSizeColorBuffer);
>         glTexImage2D(GL_TEXTURE_2D, 0, format, getWindowWidth() * 2, getWindowHeight() * 2, 0,
>                      format, GL_UNSIGNED_BYTE, nullptr);
>-        glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, mDiffSizeColorBuffer, 0);
>+        glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D,
>+                               mDiffSizeColorBuffer, 0);
> 
>         ASSERT_GLENUM_EQ(GL_FRAMEBUFFER_COMPLETE, glCheckFramebufferStatus(GL_FRAMEBUFFER));
>         ASSERT_GL_NO_ERROR();
> 
>-        if (extensionEnabled("GL_EXT_draw_buffers"))
>+        if (IsGLExtensionEnabled("GL_EXT_draw_buffers"))
>         {
>             glGenFramebuffers(1, &mMRTFBO);
>             glBindFramebuffer(GL_FRAMEBUFFER, mMRTFBO);
>@@ -193,18 +170,20 @@ class BlitFramebufferANGLETest : public ANGLETest
>             glBindTexture(GL_TEXTURE_2D, mMRTColorBuffer0);
>             glTexImage2D(GL_TEXTURE_2D, 0, format, getWindowWidth(), getWindowHeight(), 0, format,
>                          GL_UNSIGNED_BYTE, nullptr);
>-            glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0_EXT, GL_TEXTURE_2D, mMRTColorBuffer0, 0);
>+            glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0_EXT, GL_TEXTURE_2D,
>+                                   mMRTColorBuffer0, 0);
>             glBindTexture(GL_TEXTURE_2D, mMRTColorBuffer1);
>             glTexImage2D(GL_TEXTURE_2D, 0, format, getWindowWidth(), getWindowHeight(), 0, format,
>                          GL_UNSIGNED_BYTE, nullptr);
>-            glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT1_EXT, GL_TEXTURE_2D, mMRTColorBuffer1, 0);
>+            glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT1_EXT, GL_TEXTURE_2D,
>+                                   mMRTColorBuffer1, 0);
> 
>             ASSERT_GLENUM_EQ(GL_FRAMEBUFFER_COMPLETE, glCheckFramebufferStatus(GL_FRAMEBUFFER));
>             ASSERT_GL_NO_ERROR();
>         }
> 
>-        if (extensionEnabled("GL_ANGLE_framebuffer_multisample") &&
>-            extensionEnabled("GL_OES_rgb8_rgba8"))
>+        if (IsGLExtensionEnabled("GL_ANGLE_framebuffer_multisample") &&
>+            IsGLExtensionEnabled("GL_OES_rgb8_rgba8"))
>         {
>             // RGBA single-sampled framebuffer
>             glGenTextures(1, &mRGBAColorbuffer);
>@@ -214,7 +193,8 @@ class BlitFramebufferANGLETest : public ANGLETest
> 
>             glGenFramebuffers(1, &mRGBAFBO);
>             glBindFramebuffer(GL_FRAMEBUFFER, mRGBAFBO);
>-            glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, mRGBAColorbuffer, 0);
>+            glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D,
>+                                   mRGBAColorbuffer, 0);
> 
>             ASSERT_GL_NO_ERROR();
>             ASSERT_GLENUM_EQ(GL_FRAMEBUFFER_COMPLETE, glCheckFramebufferStatus(GL_FRAMEBUFFER));
>@@ -233,7 +213,7 @@ class BlitFramebufferANGLETest : public ANGLETest
>             ASSERT_GL_NO_ERROR();
>             ASSERT_GLENUM_EQ(GL_FRAMEBUFFER_COMPLETE, glCheckFramebufferStatus(GL_FRAMEBUFFER));
> 
>-            if (extensionEnabled("GL_EXT_texture_format_BGRA8888"))
>+            if (IsGLExtensionEnabled("GL_EXT_texture_format_BGRA8888"))
>             {
>                 // BGRA single-sampled framebuffer
>                 glGenTextures(1, &mBGRAColorbuffer);
>@@ -272,6 +252,7 @@ class BlitFramebufferANGLETest : public ANGLETest
>     {
>         glDeleteProgram(mCheckerProgram);
>         glDeleteProgram(mBlueProgram);
>+        glDeleteProgram(mRedProgram);
> 
>         glDeleteFramebuffers(1, &mUserFBO);
>         glDeleteTextures(1, &mUserColorBuffer);
>@@ -290,7 +271,7 @@ class BlitFramebufferANGLETest : public ANGLETest
>         glDeleteFramebuffers(1, &mDiffSizeFBO);
>         glDeleteTextures(1, &mDiffSizeColorBuffer);
> 
>-        if (extensionEnabled("GL_EXT_draw_buffers"))
>+        if (IsGLExtensionEnabled("GL_EXT_draw_buffers"))
>         {
>             glDeleteFramebuffers(1, &mMRTFBO);
>             glDeleteTextures(1, &mMRTColorBuffer0);
>@@ -362,7 +343,7 @@ class BlitFramebufferANGLETest : public ANGLETest
> 
>     bool checkExtension(const std::string &extension)
>     {
>-        if (!extensionEnabled(extension))
>+        if (!IsGLExtensionEnabled(extension))
>         {
>             std::cout << "Test skipped because " << extension << " not supported." << std::endl;
>             return false;
>@@ -373,6 +354,7 @@ class BlitFramebufferANGLETest : public ANGLETest
> 
>     GLuint mCheckerProgram;
>     GLuint mBlueProgram;
>+    GLuint mRedProgram;
> 
>     GLuint mOriginalFBO;
> 
>@@ -411,65 +393,74 @@ class BlitFramebufferANGLETest : public ANGLETest
> // Draw to user-created framebuffer, blit whole-buffer color to original framebuffer.
> TEST_P(BlitFramebufferANGLETest, BlitColorToDefault)
> {
>+    ANGLE_SKIP_TEST_IF(!IsGLExtensionEnabled("GL_ANGLE_framebuffer_blit"));
>+
>     glBindFramebuffer(GL_FRAMEBUFFER, mUserFBO);
> 
>     glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT);
> 
>-    drawQuad(mCheckerProgram, "position", 0.8f);
>+    drawQuad(mCheckerProgram, essl1_shaders::PositionAttrib(), 0.8f);
> 
>     EXPECT_GL_NO_ERROR();
> 
>     glBindFramebuffer(GL_READ_FRAMEBUFFER_ANGLE, mUserFBO);
>     glBindFramebuffer(GL_DRAW_FRAMEBUFFER_ANGLE, mOriginalFBO);
> 
>-    glBlitFramebufferANGLE(0, 0, getWindowWidth(), getWindowHeight(), 0, 0, getWindowWidth(), getWindowHeight(), 
>-                           GL_COLOR_BUFFER_BIT, GL_NEAREST);
>+    glBlitFramebufferANGLE(0, 0, getWindowWidth(), getWindowHeight(), 0, 0, getWindowWidth(),
>+                           getWindowHeight(), GL_COLOR_BUFFER_BIT, GL_NEAREST);
> 
>     EXPECT_GL_NO_ERROR();
> 
>     glBindFramebuffer(GL_FRAMEBUFFER, mOriginalFBO);
> 
>-    EXPECT_PIXEL_EQ(    getWindowWidth() / 4,     getWindowHeight() / 4, 255,   0,   0, 255);
>-    EXPECT_PIXEL_EQ(3 * getWindowWidth() / 4,     getWindowHeight() / 4,   0, 255,   0, 255);
>-    EXPECT_PIXEL_EQ(3 * getWindowWidth() / 4, 3 * getWindowHeight() / 4, 255,   0,   0, 255);
>-    EXPECT_PIXEL_EQ(    getWindowWidth() / 4, 3 * getWindowHeight() / 4,   0, 255,   0, 255);
>+    EXPECT_PIXEL_EQ(getWindowWidth() / 4, getWindowHeight() / 4, 255, 0, 0, 255);
>+    EXPECT_PIXEL_EQ(3 * getWindowWidth() / 4, getWindowHeight() / 4, 0, 255, 0, 255);
>+    EXPECT_PIXEL_EQ(3 * getWindowWidth() / 4, 3 * getWindowHeight() / 4, 255, 0, 0, 255);
>+    EXPECT_PIXEL_EQ(getWindowWidth() / 4, 3 * getWindowHeight() / 4, 0, 255, 0, 255);
> }
> 
> // Draw to system framebuffer, blit whole-buffer color to user-created framebuffer.
> TEST_P(BlitFramebufferANGLETest, ReverseColorBlit)
> {
>+    ANGLE_SKIP_TEST_IF(!IsGLExtensionEnabled("GL_ANGLE_framebuffer_blit"));
>+
>+    // TODO(jmadill): Fix this. http://anglebug.com/2743
>+    ANGLE_SKIP_TEST_IF(IsVulkan() && IsAndroid());
>+
>     glBindFramebuffer(GL_FRAMEBUFFER, mOriginalFBO);
> 
>     glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT);
> 
>-    drawQuad(mCheckerProgram, "position", 0.8f);
>+    drawQuad(mCheckerProgram, essl1_shaders::PositionAttrib(), 0.8f);
> 
>     EXPECT_GL_NO_ERROR();
> 
>     glBindFramebuffer(GL_READ_FRAMEBUFFER_ANGLE, mOriginalFBO);
>     glBindFramebuffer(GL_DRAW_FRAMEBUFFER_ANGLE, mUserFBO);
> 
>-    glBlitFramebufferANGLE(0, 0, getWindowWidth(), getWindowHeight(), 0, 0, getWindowWidth(), getWindowHeight(),
>-                           GL_COLOR_BUFFER_BIT, GL_NEAREST);
>+    glBlitFramebufferANGLE(0, 0, getWindowWidth(), getWindowHeight(), 0, 0, getWindowWidth(),
>+                           getWindowHeight(), GL_COLOR_BUFFER_BIT, GL_NEAREST);
> 
>     EXPECT_GL_NO_ERROR();
> 
>     glBindFramebuffer(GL_FRAMEBUFFER, mUserFBO);
> 
>-    EXPECT_PIXEL_EQ(    getWindowWidth() / 4,     getWindowHeight() / 4, 255,   0,   0, 255);
>-    EXPECT_PIXEL_EQ(3 * getWindowWidth() / 4,     getWindowHeight() / 4,   0, 255,   0, 255);
>-    EXPECT_PIXEL_EQ(3 * getWindowWidth() / 4, 3 * getWindowHeight() / 4, 255,   0,   0, 255);
>-    EXPECT_PIXEL_EQ(    getWindowWidth() / 4, 3 * getWindowHeight() / 4,   0, 255,   0, 255);
>+    EXPECT_PIXEL_EQ(getWindowWidth() / 4, getWindowHeight() / 4, 255, 0, 0, 255);
>+    EXPECT_PIXEL_EQ(3 * getWindowWidth() / 4, getWindowHeight() / 4, 0, 255, 0, 255);
>+    EXPECT_PIXEL_EQ(3 * getWindowWidth() / 4, 3 * getWindowHeight() / 4, 255, 0, 0, 255);
>+    EXPECT_PIXEL_EQ(getWindowWidth() / 4, 3 * getWindowHeight() / 4, 0, 255, 0, 255);
> }
> 
> // blit from user-created FBO to system framebuffer, with the scissor test enabled.
> TEST_P(BlitFramebufferANGLETest, ScissoredBlit)
> {
>+    ANGLE_SKIP_TEST_IF(!IsGLExtensionEnabled("GL_ANGLE_framebuffer_blit"));
>+
>     glBindFramebuffer(GL_FRAMEBUFFER, mUserFBO);
> 
>     glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT);
> 
>-    drawQuad(mCheckerProgram, "position", 0.8f);
>+    drawQuad(mCheckerProgram, essl1_shaders::PositionAttrib(), 0.8f);
> 
>     EXPECT_GL_NO_ERROR();
> 
>@@ -482,8 +473,8 @@ TEST_P(BlitFramebufferANGLETest, ScissoredBlit)
>     glScissor(getWindowWidth() / 2, 0, getWindowWidth() / 2, getWindowHeight());
>     glEnable(GL_SCISSOR_TEST);
> 
>-    glBlitFramebufferANGLE(0, 0, getWindowWidth(), getWindowHeight(), 0, 0, getWindowWidth(), getWindowHeight(), 
>-                           GL_COLOR_BUFFER_BIT, GL_NEAREST);
>+    glBlitFramebufferANGLE(0, 0, getWindowWidth(), getWindowHeight(), 0, 0, getWindowWidth(),
>+                           getWindowHeight(), GL_COLOR_BUFFER_BIT, GL_NEAREST);
> 
>     EXPECT_GL_NO_ERROR();
> 
>@@ -491,20 +482,25 @@ TEST_P(BlitFramebufferANGLETest, ScissoredBlit)
> 
>     glBindFramebuffer(GL_FRAMEBUFFER, mOriginalFBO);
> 
>-    EXPECT_PIXEL_EQ(    getWindowWidth() / 4,     getWindowHeight() / 4, 255, 255, 255, 255);
>-    EXPECT_PIXEL_EQ(3 * getWindowWidth() / 4,     getWindowHeight() / 4,   0, 255,   0, 255);
>-    EXPECT_PIXEL_EQ(3 * getWindowWidth() / 4, 3 * getWindowHeight() / 4, 255,   0,   0, 255);
>-    EXPECT_PIXEL_EQ(    getWindowWidth() / 4, 3 * getWindowHeight() / 4, 255, 255, 255, 255);
>+    EXPECT_PIXEL_EQ(getWindowWidth() / 4, getWindowHeight() / 4, 255, 255, 255, 255);
>+    EXPECT_PIXEL_EQ(3 * getWindowWidth() / 4, getWindowHeight() / 4, 0, 255, 0, 255);
>+    EXPECT_PIXEL_EQ(3 * getWindowWidth() / 4, 3 * getWindowHeight() / 4, 255, 0, 0, 255);
>+    EXPECT_PIXEL_EQ(getWindowWidth() / 4, 3 * getWindowHeight() / 4, 255, 255, 255, 255);
> }
> 
> // blit from system FBO to user-created framebuffer, with the scissor test enabled.
> TEST_P(BlitFramebufferANGLETest, ReverseScissoredBlit)
> {
>+    ANGLE_SKIP_TEST_IF(!IsGLExtensionEnabled("GL_ANGLE_framebuffer_blit"));
>+
>+    // TODO(jmadill): Fix this. http://anglebug.com/2743
>+    ANGLE_SKIP_TEST_IF(IsVulkan() && IsAndroid());
>+
>     glBindFramebuffer(GL_FRAMEBUFFER, mOriginalFBO);
> 
>     glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT);
> 
>-    drawQuad(mCheckerProgram, "position", 0.8f);
>+    drawQuad(mCheckerProgram, essl1_shaders::PositionAttrib(), 0.8f);
> 
>     EXPECT_GL_NO_ERROR();
> 
>@@ -513,33 +509,35 @@ TEST_P(BlitFramebufferANGLETest, ReverseScissoredBlit)
> 
>     glClearColor(1.0, 1.0, 1.0, 1.0);
>     glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT);
>-    
>+
>     glScissor(getWindowWidth() / 2, 0, getWindowWidth() / 2, getWindowHeight());
>     glEnable(GL_SCISSOR_TEST);
> 
>-    glBlitFramebufferANGLE(0, 0, getWindowWidth(), getWindowHeight(), 0, 0, getWindowWidth(), getWindowHeight(), 
>-                           GL_COLOR_BUFFER_BIT, GL_NEAREST);
>+    glBlitFramebufferANGLE(0, 0, getWindowWidth(), getWindowHeight(), 0, 0, getWindowWidth(),
>+                           getWindowHeight(), GL_COLOR_BUFFER_BIT, GL_NEAREST);
> 
>     EXPECT_GL_NO_ERROR();
> 
>     glDisable(GL_SCISSOR_TEST);
> 
>     glBindFramebuffer(GL_FRAMEBUFFER, mUserFBO);
>-    
>-    EXPECT_PIXEL_EQ(    getWindowWidth() / 4,     getWindowHeight() / 4, 255, 255, 255, 255);
>-    EXPECT_PIXEL_EQ(3 * getWindowWidth() / 4,     getWindowHeight() / 4,   0, 255,   0, 255);
>-    EXPECT_PIXEL_EQ(3 * getWindowWidth() / 4, 3 * getWindowHeight() / 4, 255,   0,   0, 255);
>-    EXPECT_PIXEL_EQ(    getWindowWidth() / 4, 3 * getWindowHeight() / 4, 255, 255, 255, 255);
>+
>+    EXPECT_PIXEL_EQ(getWindowWidth() / 4, getWindowHeight() / 4, 255, 255, 255, 255);
>+    EXPECT_PIXEL_EQ(3 * getWindowWidth() / 4, getWindowHeight() / 4, 0, 255, 0, 255);
>+    EXPECT_PIXEL_EQ(3 * getWindowWidth() / 4, 3 * getWindowHeight() / 4, 255, 0, 0, 255);
>+    EXPECT_PIXEL_EQ(getWindowWidth() / 4, 3 * getWindowHeight() / 4, 255, 255, 255, 255);
> }
> 
> // blit from user-created FBO to system framebuffer, using region larger than buffer.
> TEST_P(BlitFramebufferANGLETest, OversizedBlit)
> {
>+    ANGLE_SKIP_TEST_IF(!IsGLExtensionEnabled("GL_ANGLE_framebuffer_blit"));
>+
>     glBindFramebuffer(GL_FRAMEBUFFER, mUserFBO);
> 
>     glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT);
> 
>-    drawQuad(mCheckerProgram, "position", 0.8f);
>+    drawQuad(mCheckerProgram, essl1_shaders::PositionAttrib(), 0.8f);
> 
>     EXPECT_GL_NO_ERROR();
> 
>@@ -549,27 +547,33 @@ TEST_P(BlitFramebufferANGLETest, OversizedBlit)
>     glClearColor(1.0, 1.0, 1.0, 1.0);
>     glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT);
> 
>-    glBlitFramebufferANGLE(0, 0, getWindowWidth() * 2, getWindowHeight() * 2, 0, 0, getWindowWidth() * 2, getWindowHeight() * 2, 
>-                           GL_COLOR_BUFFER_BIT, GL_NEAREST);
>+    glBlitFramebufferANGLE(0, 0, getWindowWidth() * 2, getWindowHeight() * 2, 0, 0,
>+                           getWindowWidth() * 2, getWindowHeight() * 2, GL_COLOR_BUFFER_BIT,
>+                           GL_NEAREST);
> 
>     EXPECT_GL_NO_ERROR();
> 
>     glBindFramebuffer(GL_FRAMEBUFFER, mOriginalFBO);
> 
>-    EXPECT_PIXEL_EQ(    getWindowWidth() / 4,     getWindowHeight() / 4, 255,   0,   0, 255);
>-    EXPECT_PIXEL_EQ(3 * getWindowWidth() / 4,     getWindowHeight() / 4,   0, 255,   0, 255);
>-    EXPECT_PIXEL_EQ(3 * getWindowWidth() / 4, 3 * getWindowHeight() / 4, 255,   0,   0, 255);
>-    EXPECT_PIXEL_EQ(    getWindowWidth() / 4, 3 * getWindowHeight() / 4,   0, 255,   0, 255);
>+    EXPECT_PIXEL_EQ(getWindowWidth() / 4, getWindowHeight() / 4, 255, 0, 0, 255);
>+    EXPECT_PIXEL_EQ(3 * getWindowWidth() / 4, getWindowHeight() / 4, 0, 255, 0, 255);
>+    EXPECT_PIXEL_EQ(3 * getWindowWidth() / 4, 3 * getWindowHeight() / 4, 255, 0, 0, 255);
>+    EXPECT_PIXEL_EQ(getWindowWidth() / 4, 3 * getWindowHeight() / 4, 0, 255, 0, 255);
> }
> 
> // blit from system FBO to user-created framebuffer, using region larger than buffer.
> TEST_P(BlitFramebufferANGLETest, ReverseOversizedBlit)
> {
>+    ANGLE_SKIP_TEST_IF(!IsGLExtensionEnabled("GL_ANGLE_framebuffer_blit"));
>+
>+    // TODO(jmadill): Fix this. http://anglebug.com/2743
>+    ANGLE_SKIP_TEST_IF(IsVulkan() && IsAndroid());
>+
>     glBindFramebuffer(GL_FRAMEBUFFER, mOriginalFBO);
> 
>     glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT);
> 
>-    drawQuad(mCheckerProgram, "position", 0.8f);
>+    drawQuad(mCheckerProgram, essl1_shaders::PositionAttrib(), 0.8f);
> 
>     EXPECT_GL_NO_ERROR();
> 
>@@ -579,21 +583,24 @@ TEST_P(BlitFramebufferANGLETest, ReverseOversizedBlit)
>     glClearColor(1.0, 1.0, 1.0, 1.0);
>     glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT);
> 
>-    glBlitFramebufferANGLE(0, 0, getWindowWidth() * 2, getWindowHeight() * 2, 0, 0, getWindowWidth() * 2, getWindowHeight() * 2, 
>-                           GL_COLOR_BUFFER_BIT, GL_NEAREST);
>+    glBlitFramebufferANGLE(0, 0, getWindowWidth() * 2, getWindowHeight() * 2, 0, 0,
>+                           getWindowWidth() * 2, getWindowHeight() * 2, GL_COLOR_BUFFER_BIT,
>+                           GL_NEAREST);
>     EXPECT_GL_NO_ERROR();
> 
>     glBindFramebuffer(GL_FRAMEBUFFER, mUserFBO);
> 
>-    EXPECT_PIXEL_EQ(    getWindowWidth() / 4,     getWindowHeight() / 4, 255,   0,   0, 255);
>-    EXPECT_PIXEL_EQ(3 * getWindowWidth() / 4,     getWindowHeight() / 4,   0, 255,   0, 255);
>-    EXPECT_PIXEL_EQ(3 * getWindowWidth() / 4, 3 * getWindowHeight() / 4, 255,   0,   0, 255);
>-    EXPECT_PIXEL_EQ(    getWindowWidth() / 4, 3 * getWindowHeight() / 4,   0, 255,   0, 255);
>+    EXPECT_PIXEL_EQ(getWindowWidth() / 4, getWindowHeight() / 4, 255, 0, 0, 255);
>+    EXPECT_PIXEL_EQ(3 * getWindowWidth() / 4, getWindowHeight() / 4, 0, 255, 0, 255);
>+    EXPECT_PIXEL_EQ(3 * getWindowWidth() / 4, 3 * getWindowHeight() / 4, 255, 0, 0, 255);
>+    EXPECT_PIXEL_EQ(getWindowWidth() / 4, 3 * getWindowHeight() / 4, 0, 255, 0, 255);
> }
> 
> // blit from user-created FBO to system framebuffer, with depth buffer.
>-TEST_P(BlitFramebufferANGLETest, BlitWithDepth)
>+TEST_P(BlitFramebufferANGLETest, BlitWithDepthUserToDefault)
> {
>+    ANGLE_SKIP_TEST_IF(!IsGLExtensionEnabled("GL_ANGLE_framebuffer_blit"));
>+
>     glBindFramebuffer(GL_FRAMEBUFFER, mUserFBO);
> 
>     glDepthMask(GL_TRUE);
>@@ -601,109 +608,145 @@ TEST_P(BlitFramebufferANGLETest, BlitWithDepth)
> 
>     glEnable(GL_DEPTH_TEST);
> 
>-    drawQuad(mCheckerProgram, "position", 0.3f);
>-
>     EXPECT_GL_NO_ERROR();
> 
>+    // Clear the first half of the screen
>+    glEnable(GL_SCISSOR_TEST);
>+    glScissor(0, 0, getWindowWidth(), getWindowHeight() / 2);
>+
>+    glClearDepthf(0.1f);
>+    glClearColor(1.0, 0.0, 0.0, 1.0);
>+    glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
>+
>+    // Scissor the second half of the screen
>+    glScissor(0, getWindowHeight() / 2, getWindowWidth(), getWindowHeight() / 2);
>+
>+    glClearDepthf(0.9f);
>+    glClearColor(0.0, 1.0, 0.0, 1.0);
>+    glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
>+
>+    glDisable(GL_SCISSOR_TEST);
>+
>     glBindFramebuffer(GL_DRAW_FRAMEBUFFER_ANGLE, mOriginalFBO);
>     glBindFramebuffer(GL_READ_FRAMEBUFFER_ANGLE, mUserFBO);
> 
>-    glClearColor(1.0, 1.0, 1.0, 1.0);
>-    glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT);
>-
>-    glBlitFramebufferANGLE(0, 0, getWindowWidth(), getWindowHeight(), 0, 0, getWindowWidth(), getWindowHeight(), 
>-                           GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT, GL_NEAREST);
>+    glBlitFramebufferANGLE(0, 0, getWindowWidth(), getWindowHeight(), 0, 0, getWindowWidth(),
>+                           getWindowHeight(), GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT,
>+                           GL_NEAREST);
>     EXPECT_GL_NO_ERROR();
> 
>     glBindFramebuffer(GL_FRAMEBUFFER, mOriginalFBO);
> 
>-    // if blit is happening correctly, this quad will not draw, because it is behind the blitted one
>-    drawQuad(mBlueProgram, "position", 0.8f);
>+    // if blit is happening correctly, this quad will draw only on the bottom half since it will
>+    // be behind on the first half and in front on the second half.
>+    drawQuad(mBlueProgram, essl1_shaders::PositionAttrib(), 0.5f);
> 
>     glDisable(GL_DEPTH_TEST);
> 
>-    EXPECT_PIXEL_EQ(    getWindowWidth() / 4,     getWindowHeight() / 4, 255,   0,   0, 255);
>-    EXPECT_PIXEL_EQ(3 * getWindowWidth() / 4,     getWindowHeight() / 4,   0, 255,   0, 255);
>-    EXPECT_PIXEL_EQ(3 * getWindowWidth() / 4, 3 * getWindowHeight() / 4, 255,   0,   0, 255);
>-    EXPECT_PIXEL_EQ(    getWindowWidth() / 4, 3 * getWindowHeight() / 4,   0, 255,   0, 255);
>+    EXPECT_PIXEL_EQ(getWindowWidth() / 4, getWindowHeight() / 4, 255, 0, 0, 255);
>+    EXPECT_PIXEL_EQ(3 * getWindowWidth() / 4, getWindowHeight() / 4, 255, 0, 0, 255);
>+    EXPECT_PIXEL_EQ(3 * getWindowWidth() / 4, 3 * getWindowHeight() / 4, 0, 0, 255, 255);
>+    EXPECT_PIXEL_EQ(getWindowWidth() / 4, 3 * getWindowHeight() / 4, 0, 0, 255, 255);
> }
> 
> // blit from system FBO to user-created framebuffer, with depth buffer.
>-TEST_P(BlitFramebufferANGLETest, ReverseBlitWithDepth)
>+TEST_P(BlitFramebufferANGLETest, BlitWithDepthDefaultToUser)
> {
>+    ANGLE_SKIP_TEST_IF(!IsGLExtensionEnabled("GL_ANGLE_framebuffer_blit"));
>+
>     glBindFramebuffer(GL_FRAMEBUFFER, mOriginalFBO);
> 
>+    glDepthMask(GL_TRUE);
>     glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT);
> 
>     glEnable(GL_DEPTH_TEST);
> 
>-    drawQuad(mCheckerProgram, "position", 0.3f);
>-
>     EXPECT_GL_NO_ERROR();
> 
>+    // Clear the first half of the screen
>+    glEnable(GL_SCISSOR_TEST);
>+    glScissor(0, 0, getWindowWidth(), getWindowHeight() / 2);
>+
>+    glClearDepthf(0.1f);
>+    glClearColor(1.0, 0.0, 0.0, 1.0);
>+    glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
>+
>+    // Scissor the second half of the screen
>+    glScissor(0, getWindowHeight() / 2, getWindowWidth(), getWindowHeight() / 2);
>+
>+    glClearDepthf(0.9f);
>+    glClearColor(0.0, 1.0, 0.0, 1.0);
>+    glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
>+
>+    glDisable(GL_SCISSOR_TEST);
>+
>     glBindFramebuffer(GL_DRAW_FRAMEBUFFER_ANGLE, mUserFBO);
>     glBindFramebuffer(GL_READ_FRAMEBUFFER_ANGLE, mOriginalFBO);
> 
>-    glClearColor(1.0f, 1.0f, 1.0f, 1.0f);
>-    glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT);
>-
>-    glBlitFramebufferANGLE(0, 0, getWindowWidth(), getWindowHeight(), 0, 0, getWindowWidth(), getWindowHeight(), 
>-                           GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT, GL_NEAREST);
>+    glBlitFramebufferANGLE(0, 0, getWindowWidth(), getWindowHeight(), 0, 0, getWindowWidth(),
>+                           getWindowHeight(), GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT,
>+                           GL_NEAREST);
>     EXPECT_GL_NO_ERROR();
> 
>     glBindFramebuffer(GL_FRAMEBUFFER, mUserFBO);
> 
>-    // if blit is happening correctly, this quad will not draw, because it is behind the blitted one
>-
>-    drawQuad(mBlueProgram, "position", 0.8f);
>+    // if blit is happening correctly, this quad will draw only on the bottom half since it will be
>+    // behind on the first half and in front on the second half.
>+    drawQuad(mBlueProgram, essl1_shaders::PositionAttrib(), 0.5f);
> 
>     glDisable(GL_DEPTH_TEST);
> 
>-    EXPECT_PIXEL_EQ(    getWindowWidth() / 4,     getWindowHeight() / 4, 255,   0,   0, 255);
>-    EXPECT_PIXEL_EQ(3 * getWindowWidth() / 4,     getWindowHeight() / 4,   0, 255,   0, 255);
>-    EXPECT_PIXEL_EQ(3 * getWindowWidth() / 4, 3 * getWindowHeight() / 4, 255,   0,   0, 255);
>-    EXPECT_PIXEL_EQ(    getWindowWidth() / 4, 3 * getWindowHeight() / 4,   0, 255,   0, 255);
>+    EXPECT_PIXEL_EQ(getWindowWidth() / 4, getWindowHeight() / 4, 255, 0, 0, 255);
>+    EXPECT_PIXEL_EQ(3 * getWindowWidth() / 4, getWindowHeight() / 4, 255, 0, 0, 255);
>+    EXPECT_PIXEL_EQ(3 * getWindowWidth() / 4, 3 * getWindowHeight() / 4, 0, 0, 255, 255);
>+    EXPECT_PIXEL_EQ(getWindowWidth() / 4, 3 * getWindowHeight() / 4, 0, 0, 255, 255);
> }
> 
> // blit from one region of the system fbo to another-- this should fail.
> TEST_P(BlitFramebufferANGLETest, BlitSameBufferOriginal)
> {
>+    ANGLE_SKIP_TEST_IF(!IsGLExtensionEnabled("GL_ANGLE_framebuffer_blit"));
>+
>     glBindFramebuffer(GL_FRAMEBUFFER, mOriginalFBO);
> 
>     glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT);
> 
>-    drawQuad(mCheckerProgram, "position", 0.3f);
>+    drawQuad(mCheckerProgram, essl1_shaders::PositionAttrib(), 0.3f);
> 
>     EXPECT_GL_NO_ERROR();
> 
>-    glBlitFramebufferANGLE(0, 0, getWindowWidth() / 2, getWindowHeight(), getWindowWidth() / 2, 0, getWindowWidth(), getWindowHeight(), 
>-                           GL_COLOR_BUFFER_BIT, GL_NEAREST);
>+    glBlitFramebufferANGLE(0, 0, getWindowWidth() / 2, getWindowHeight(), getWindowWidth() / 2, 0,
>+                           getWindowWidth(), getWindowHeight(), GL_COLOR_BUFFER_BIT, GL_NEAREST);
>     EXPECT_GL_ERROR(GL_INVALID_OPERATION);
> }
> 
> // blit from one region of the system fbo to another.
> TEST_P(BlitFramebufferANGLETest, BlitSameBufferUser)
> {
>+    ANGLE_SKIP_TEST_IF(!IsGLExtensionEnabled("GL_ANGLE_framebuffer_blit"));
>+
>     glBindFramebuffer(GL_FRAMEBUFFER, mUserFBO);
> 
>     glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT);
> 
>-    drawQuad(mCheckerProgram, "position", 0.3f);
>+    drawQuad(mCheckerProgram, essl1_shaders::PositionAttrib(), 0.3f);
> 
>     EXPECT_GL_NO_ERROR();
> 
>-    glBlitFramebufferANGLE(0, 0, getWindowWidth() / 2, getWindowHeight(), getWindowWidth() / 2, 0, getWindowWidth(), getWindowHeight(), 
>-                           GL_COLOR_BUFFER_BIT, GL_NEAREST);
>+    glBlitFramebufferANGLE(0, 0, getWindowWidth() / 2, getWindowHeight(), getWindowWidth() / 2, 0,
>+                           getWindowWidth(), getWindowHeight(), GL_COLOR_BUFFER_BIT, GL_NEAREST);
>     EXPECT_GL_ERROR(GL_INVALID_OPERATION);
> }
> 
> TEST_P(BlitFramebufferANGLETest, BlitPartialColor)
> {
>+    ANGLE_SKIP_TEST_IF(!IsGLExtensionEnabled("GL_ANGLE_framebuffer_blit"));
>+
>     glBindFramebuffer(GL_FRAMEBUFFER, mUserFBO);
> 
>     glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT);
> 
>-    drawQuad(mCheckerProgram, "position", 0.5f);
>+    drawQuad(mCheckerProgram, essl1_shaders::PositionAttrib(), 0.5f);
> 
>     EXPECT_GL_NO_ERROR();
> 
>@@ -711,28 +754,31 @@ TEST_P(BlitFramebufferANGLETest, BlitPartialColor)
>     glBindFramebuffer(GL_READ_FRAMEBUFFER_ANGLE, mUserFBO);
> 
>     glClearColor(1.0, 1.0, 1.0, 1.0);
>-    glClear(GL_COLOR_BUFFER_BIT| GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT);
>+    glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT);
> 
>-    glBlitFramebufferANGLE(0, 0, getWindowWidth() / 2, getWindowHeight() / 2, 0, getWindowHeight() / 2, getWindowWidth() / 2, getWindowHeight(),
>+    glBlitFramebufferANGLE(0, 0, getWindowWidth() / 2, getWindowHeight() / 2, 0,
>+                           getWindowHeight() / 2, getWindowWidth() / 2, getWindowHeight(),
>                            GL_COLOR_BUFFER_BIT, GL_NEAREST);
> 
>     EXPECT_GL_NO_ERROR();
> 
>     glBindFramebuffer(GL_FRAMEBUFFER, mOriginalFBO);
> 
>-    EXPECT_PIXEL_EQ(    getWindowWidth() / 4,     getWindowHeight() / 4, 255, 255, 255, 255);
>-    EXPECT_PIXEL_EQ(3 * getWindowWidth() / 4,     getWindowHeight() / 4, 255, 255, 255, 255);
>+    EXPECT_PIXEL_EQ(getWindowWidth() / 4, getWindowHeight() / 4, 255, 255, 255, 255);
>+    EXPECT_PIXEL_EQ(3 * getWindowWidth() / 4, getWindowHeight() / 4, 255, 255, 255, 255);
>     EXPECT_PIXEL_EQ(3 * getWindowWidth() / 4, 3 * getWindowHeight() / 4, 255, 255, 255, 255);
>-    EXPECT_PIXEL_EQ(    getWindowWidth() / 4, 3 * getWindowHeight() / 4, 255,   0,   0, 255);
>+    EXPECT_PIXEL_EQ(getWindowWidth() / 4, 3 * getWindowHeight() / 4, 255, 0, 0, 255);
> }
> 
> TEST_P(BlitFramebufferANGLETest, BlitDifferentSizes)
> {
>+    ANGLE_SKIP_TEST_IF(!IsGLExtensionEnabled("GL_ANGLE_framebuffer_blit"));
>+
>     glBindFramebuffer(GL_FRAMEBUFFER, mUserFBO);
> 
>     glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT);
> 
>-    drawQuad(mCheckerProgram, "position", 0.5f);
>+    drawQuad(mCheckerProgram, essl1_shaders::PositionAttrib(), 0.5f);
> 
>     EXPECT_GL_NO_ERROR();
> 
>@@ -740,32 +786,34 @@ TEST_P(BlitFramebufferANGLETest, BlitDifferentSizes)
>     glBindFramebuffer(GL_READ_FRAMEBUFFER_ANGLE, mUserFBO);
> 
>     glClearColor(1.0, 1.0, 1.0, 1.0);
>-    glClear(GL_COLOR_BUFFER_BIT| GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT);
>+    glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT);
> 
>-    glBlitFramebufferANGLE(0, 0, getWindowWidth(), getWindowHeight(), 0, 0, getWindowWidth(), getWindowHeight(),
>-                           GL_COLOR_BUFFER_BIT, GL_NEAREST);
>+    glBlitFramebufferANGLE(0, 0, getWindowWidth(), getWindowHeight(), 0, 0, getWindowWidth(),
>+                           getWindowHeight(), GL_COLOR_BUFFER_BIT, GL_NEAREST);
> 
>     EXPECT_GL_NO_ERROR();
> 
>     glBindFramebuffer(GL_FRAMEBUFFER, mSmallFBO);
> 
>-    EXPECT_PIXEL_EQ(    getWindowWidth() / 4,     getWindowHeight() / 4, 255,   0,   0, 255);
>+    EXPECT_PIXEL_EQ(getWindowWidth() / 4, getWindowHeight() / 4, 255, 0, 0, 255);
> 
>     EXPECT_GL_NO_ERROR();
> }
> 
> TEST_P(BlitFramebufferANGLETest, BlitWithMissingAttachments)
> {
>+    ANGLE_SKIP_TEST_IF(!IsGLExtensionEnabled("GL_ANGLE_framebuffer_blit"));
>+
>     glBindFramebuffer(GL_FRAMEBUFFER, mColorOnlyFBO);
> 
>     glClear(GL_COLOR_BUFFER_BIT);
>-    drawQuad(mCheckerProgram, "position", 0.3f);
>+    drawQuad(mCheckerProgram, essl1_shaders::PositionAttrib(), 0.3f);
> 
>     glBindFramebuffer(GL_DRAW_FRAMEBUFFER_ANGLE, mOriginalFBO);
>     glBindFramebuffer(GL_READ_FRAMEBUFFER_ANGLE, mColorOnlyFBO);
> 
>     glClearColor(1.0, 1.0, 1.0, 1.0);
>-    glClear(GL_COLOR_BUFFER_BIT| GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT);
>+    glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT);
> 
>     // generate INVALID_OPERATION if the read FBO has no depth attachment
>     glBlitFramebufferANGLE(0, 0, getWindowWidth(), getWindowHeight(), 0, 0, getWindowWidth(),
>@@ -791,81 +839,102 @@ TEST_P(BlitFramebufferANGLETest, BlitWithMissingAttachments)
> 
> TEST_P(BlitFramebufferANGLETest, BlitStencil)
> {
>+    ANGLE_SKIP_TEST_IF(!IsGLExtensionEnabled("GL_ANGLE_framebuffer_blit"));
>+
>     // TODO(jmadill): Figure out if we can fix this on D3D9.
>-    // https://code.google.com/p/angleproject/issues/detail?id=809
>-    if (IsIntel() && getPlatformRenderer() == EGL_PLATFORM_ANGLE_TYPE_D3D9_ANGLE)
>-    {
>-        std::cout << "Test skipped on Intel D3D9." << std::endl;
>-        return;
>-    }
>+    // https://code.google.com/p/angleproject/issues/detail?id=2205
>+    ANGLE_SKIP_TEST_IF(IsIntel() && IsD3D9());
>+
>+    // TODO(yunchao.he): Diagnose and fix http://anglebug.com/2693
>+    ANGLE_SKIP_TEST_IF(IsIntel() && IsLinux() && IsVulkan());
> 
>     glBindFramebuffer(GL_FRAMEBUFFER, mUserFBO);
> 
>-    glClear(GL_COLOR_BUFFER_BIT);
>+    glClearColor(0.0, 1.0, 0.0, 1.0);
>+    glClear(GL_COLOR_BUFFER_BIT | GL_STENCIL_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
>+    glClearStencil(0x0);
>+
>+    // Scissor half the screen so we fill the stencil only halfway
>+    glScissor(0, 0, getWindowWidth(), getWindowHeight() / 2);
>+    glEnable(GL_SCISSOR_TEST);
>+
>     // fill the stencil buffer with 0x1
>     glStencilFunc(GL_ALWAYS, 0x1, 0xFF);
>     glStencilOp(GL_REPLACE, GL_REPLACE, GL_REPLACE);
>-    glEnable(GL_STENCIL_TEST); 
>-    drawQuad(mCheckerProgram, "position", 0.3f);
>+    glEnable(GL_STENCIL_TEST);
>+    drawQuad(mRedProgram, essl1_shaders::PositionAttrib(), 0.3f);
>+
>+    glDisable(GL_SCISSOR_TEST);
> 
>     glBindFramebuffer(GL_DRAW_FRAMEBUFFER_ANGLE, mOriginalFBO);
>     glBindFramebuffer(GL_READ_FRAMEBUFFER_ANGLE, mUserFBO);
> 
>+    // These clears are not useful in theory because we're copying over them, but its
>+    // helpful in debugging if we see white in any result.
>     glClearColor(1.0, 1.0, 1.0, 1.0);
>     glClearStencil(0x0);
>-    glClear(GL_COLOR_BUFFER_BIT| GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT);
>+    glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT);
> 
>     // depth blit request should be silently ignored, because the read FBO has no depth attachment
>-    glBlitFramebufferANGLE(0, 0, getWindowWidth(), getWindowHeight(), 0, 0, getWindowWidth(), getWindowHeight(),
>-                           GL_COLOR_BUFFER_BIT | GL_STENCIL_BUFFER_BIT, GL_NEAREST); 
>+    glBlitFramebufferANGLE(0, 0, getWindowWidth(), getWindowHeight(), 0, 0, getWindowWidth(),
>+                           getWindowHeight(), GL_COLOR_BUFFER_BIT | GL_STENCIL_BUFFER_BIT,
>+                           GL_NEAREST);
> 
>     EXPECT_GL_NO_ERROR();
> 
>     glBindFramebuffer(GL_FRAMEBUFFER, mOriginalFBO);
> 
>-    EXPECT_PIXEL_EQ(    getWindowWidth() / 4,     getWindowHeight() / 4, 255,   0,   0, 255);
>-    EXPECT_PIXEL_EQ(3 * getWindowWidth() / 4,     getWindowHeight() / 4,   0, 255,   0, 255);
>-    EXPECT_PIXEL_EQ(3 * getWindowWidth() / 4, 3 * getWindowHeight() / 4, 255,   0,   0, 255);
>-    EXPECT_PIXEL_EQ(    getWindowWidth() / 4, 3 * getWindowHeight() / 4,   0, 255,   0, 255);
>+    EXPECT_PIXEL_EQ(getWindowWidth() / 4, getWindowHeight() / 4, 255, 0, 0, 255);
>+    EXPECT_PIXEL_EQ(3 * getWindowWidth() / 4, getWindowHeight() / 4, 255, 0, 0, 255);
>+    EXPECT_PIXEL_EQ(3 * getWindowWidth() / 4, 3 * getWindowHeight() / 4, 0, 255, 0, 255);
>+    EXPECT_PIXEL_EQ(getWindowWidth() / 4, 3 * getWindowHeight() / 4, 0, 255, 0, 255);
>+
>+    glStencilFunc(GL_EQUAL, 0x1, 0xFF);  // only pass if stencil buffer at pixel reads 0x1
>+
>+    drawQuad(mBlueProgram, essl1_shaders::PositionAttrib(),
>+             0.8f);  // blue quad will draw if stencil buffer was copied
> 
>-    glStencilFunc(GL_EQUAL, 0x1, 0xFF); // only pass if stencil buffer at pixel reads 0x1
>-    drawQuad(mBlueProgram, "position", 0.8f); // blue quad will draw if stencil buffer was copied
>     glDisable(GL_STENCIL_TEST);
> 
>-    EXPECT_PIXEL_EQ(    getWindowWidth() / 4,     getWindowHeight() / 4,   0,   0, 255, 255);
>-    EXPECT_PIXEL_EQ(3 * getWindowWidth() / 4,     getWindowHeight() / 4,   0,   0, 255, 255);
>-    EXPECT_PIXEL_EQ(3 * getWindowWidth() / 4, 3 * getWindowHeight() / 4,   0,   0, 255, 255);
>-    EXPECT_PIXEL_EQ(    getWindowWidth() / 4, 3 * getWindowHeight() / 4,   0,   0, 255, 255);
>+    EXPECT_PIXEL_EQ(getWindowWidth() / 4, getWindowHeight() / 4, 0, 0, 255, 255);
>+    EXPECT_PIXEL_EQ(3 * getWindowWidth() / 4, getWindowHeight() / 4, 0, 0, 255, 255);
>+    EXPECT_PIXEL_EQ(3 * getWindowWidth() / 4, 3 * getWindowHeight() / 4, 0, 255, 0, 255);
>+    EXPECT_PIXEL_EQ(getWindowWidth() / 4, 3 * getWindowHeight() / 4, 0, 255, 0, 255);
> }
> 
> // make sure that attempting to blit a partial depth buffer issues an error
> TEST_P(BlitFramebufferANGLETest, BlitPartialDepthStencil)
> {
>+    ANGLE_SKIP_TEST_IF(!IsGLExtensionEnabled("GL_ANGLE_framebuffer_blit"));
>+
>     glBindFramebuffer(GL_FRAMEBUFFER, mUserFBO);
> 
>     glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT);
> 
>-    drawQuad(mCheckerProgram, "position", 0.5f);
>+    drawQuad(mCheckerProgram, essl1_shaders::PositionAttrib(), 0.5f);
> 
>     EXPECT_GL_NO_ERROR();
> 
>     glBindFramebuffer(GL_DRAW_FRAMEBUFFER_ANGLE, mOriginalFBO);
>     glBindFramebuffer(GL_READ_FRAMEBUFFER_ANGLE, mUserFBO);
> 
>-    glBlitFramebufferANGLE(0, 0, getWindowWidth() / 2, getWindowHeight() / 2, 0, 0, 
>-                           getWindowWidth() / 2, getWindowHeight() / 2, GL_DEPTH_BUFFER_BIT, GL_NEAREST);
>+    glBlitFramebufferANGLE(0, 0, getWindowWidth() / 2, getWindowHeight() / 2, 0, 0,
>+                           getWindowWidth() / 2, getWindowHeight() / 2, GL_DEPTH_BUFFER_BIT,
>+                           GL_NEAREST);
>     EXPECT_GL_ERROR(GL_INVALID_OPERATION);
> }
> 
> // Test blit with MRT framebuffers
> TEST_P(BlitFramebufferANGLETest, BlitMRT)
> {
>-    if (!extensionEnabled("GL_EXT_draw_buffers"))
>+    ANGLE_SKIP_TEST_IF(!IsGLExtensionEnabled("GL_ANGLE_framebuffer_blit"));
>+
>+    if (!IsGLExtensionEnabled("GL_EXT_draw_buffers"))
>     {
>         return;
>     }
> 
>-    GLenum drawBuffers[] = { GL_COLOR_ATTACHMENT0_EXT, GL_COLOR_ATTACHMENT1_EXT };
>+    GLenum drawBuffers[] = {GL_COLOR_ATTACHMENT0_EXT, GL_COLOR_ATTACHMENT1_EXT};
> 
>     glBindFramebuffer(GL_FRAMEBUFFER, mMRTFBO);
>     glDrawBuffersEXT(2, drawBuffers);
>@@ -873,41 +942,46 @@ TEST_P(BlitFramebufferANGLETest, BlitMRT)
>     glBindFramebuffer(GL_FRAMEBUFFER, mColorOnlyFBO);
> 
>     glClear(GL_COLOR_BUFFER_BIT);
>-    
>-    drawQuad(mCheckerProgram, "position", 0.8f);
>-    
>+
>+    drawQuad(mCheckerProgram, essl1_shaders::PositionAttrib(), 0.8f);
>+
>     EXPECT_GL_NO_ERROR();
> 
>     glBindFramebuffer(GL_READ_FRAMEBUFFER_ANGLE, mColorOnlyFBO);
>     glBindFramebuffer(GL_DRAW_FRAMEBUFFER_ANGLE, mMRTFBO);
> 
>-    glBlitFramebufferANGLE(0, 0, getWindowWidth(), getWindowHeight(), 0, 0, getWindowWidth(), getWindowHeight(), 
>-                           GL_COLOR_BUFFER_BIT, GL_NEAREST);
>-    
>+    glBlitFramebufferANGLE(0, 0, getWindowWidth(), getWindowHeight(), 0, 0, getWindowWidth(),
>+                           getWindowHeight(), GL_COLOR_BUFFER_BIT, GL_NEAREST);
>+
>     EXPECT_GL_NO_ERROR();
> 
>     glBindFramebuffer(GL_FRAMEBUFFER, mMRTFBO);
> 
>-    EXPECT_PIXEL_EQ(    getWindowWidth() / 4,     getWindowHeight() / 4, 255,   0,   0, 255);
>-    EXPECT_PIXEL_EQ(3 * getWindowWidth() / 4,     getWindowHeight() / 4,   0, 255,   0, 255);
>-    EXPECT_PIXEL_EQ(3 * getWindowWidth() / 4, 3 * getWindowHeight() / 4, 255,   0,   0, 255);
>-    EXPECT_PIXEL_EQ(    getWindowWidth() / 4, 3 * getWindowHeight() / 4,   0, 255,   0, 255);
>+    EXPECT_PIXEL_EQ(getWindowWidth() / 4, getWindowHeight() / 4, 255, 0, 0, 255);
>+    EXPECT_PIXEL_EQ(3 * getWindowWidth() / 4, getWindowHeight() / 4, 0, 255, 0, 255);
>+    EXPECT_PIXEL_EQ(3 * getWindowWidth() / 4, 3 * getWindowHeight() / 4, 255, 0, 0, 255);
>+    EXPECT_PIXEL_EQ(getWindowWidth() / 4, 3 * getWindowHeight() / 4, 0, 255, 0, 255);
> 
>     glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT1_EXT, GL_TEXTURE_2D, 0, 0);
>-    glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, mMRTColorBuffer0, 0);
>-
>-    EXPECT_PIXEL_EQ(    getWindowWidth() / 4,     getWindowHeight() / 4, 255,   0,   0, 255);
>-    EXPECT_PIXEL_EQ(3 * getWindowWidth() / 4,     getWindowHeight() / 4,   0, 255,   0, 255);
>-    EXPECT_PIXEL_EQ(3 * getWindowWidth() / 4, 3 * getWindowHeight() / 4, 255,   0,   0, 255);
>-    EXPECT_PIXEL_EQ(    getWindowWidth() / 4, 3 * getWindowHeight() / 4,   0, 255,   0, 255);
>-
>-    glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, mMRTColorBuffer0, 0);
>-    glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT1_EXT, GL_TEXTURE_2D, mMRTColorBuffer1, 0);
>+    glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, mMRTColorBuffer0,
>+                           0);
>+
>+    EXPECT_PIXEL_EQ(getWindowWidth() / 4, getWindowHeight() / 4, 255, 0, 0, 255);
>+    EXPECT_PIXEL_EQ(3 * getWindowWidth() / 4, getWindowHeight() / 4, 0, 255, 0, 255);
>+    EXPECT_PIXEL_EQ(3 * getWindowWidth() / 4, 3 * getWindowHeight() / 4, 255, 0, 0, 255);
>+    EXPECT_PIXEL_EQ(getWindowWidth() / 4, 3 * getWindowHeight() / 4, 0, 255, 0, 255);
>+
>+    glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, mMRTColorBuffer0,
>+                           0);
>+    glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT1_EXT, GL_TEXTURE_2D,
>+                           mMRTColorBuffer1, 0);
> }
> 
> // Test multisampled framebuffer blits if supported
> TEST_P(BlitFramebufferANGLETest, MultisampledRGBAToRGBA)
> {
>+    ANGLE_SKIP_TEST_IF(!IsGLExtensionEnabled("GL_ANGLE_framebuffer_blit"));
>+
>     if (!checkExtension("GL_ANGLE_framebuffer_multisample"))
>         return;
> 
>@@ -919,6 +993,8 @@ TEST_P(BlitFramebufferANGLETest, MultisampledRGBAToRGBA)
> 
> TEST_P(BlitFramebufferANGLETest, MultisampledRGBAToBGRA)
> {
>+    ANGLE_SKIP_TEST_IF(!IsGLExtensionEnabled("GL_ANGLE_framebuffer_blit"));
>+
>     if (!checkExtension("GL_ANGLE_framebuffer_multisample"))
>         return;
> 
>@@ -933,6 +1009,8 @@ TEST_P(BlitFramebufferANGLETest, MultisampledRGBAToBGRA)
> 
> TEST_P(BlitFramebufferANGLETest, MultisampledBGRAToRGBA)
> {
>+    ANGLE_SKIP_TEST_IF(!IsGLExtensionEnabled("GL_ANGLE_framebuffer_blit"));
>+
>     if (!checkExtension("GL_ANGLE_framebuffer_multisample"))
>         return;
> 
>@@ -947,6 +1025,8 @@ TEST_P(BlitFramebufferANGLETest, MultisampledBGRAToRGBA)
> 
> TEST_P(BlitFramebufferANGLETest, MultisampledBGRAToBGRA)
> {
>+    ANGLE_SKIP_TEST_IF(!IsGLExtensionEnabled("GL_ANGLE_framebuffer_blit"));
>+
>     if (!checkExtension("GL_ANGLE_framebuffer_multisample"))
>         return;
> 
>@@ -962,18 +1042,20 @@ TEST_P(BlitFramebufferANGLETest, MultisampledBGRAToBGRA)
> // Make sure that attempts to stretch in a blit call issue an error
> TEST_P(BlitFramebufferANGLETest, ErrorStretching)
> {
>+    ANGLE_SKIP_TEST_IF(!IsGLExtensionEnabled("GL_ANGLE_framebuffer_blit"));
>+
>     glBindFramebuffer(GL_FRAMEBUFFER, mUserFBO);
> 
>     glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT);
> 
>-    drawQuad(mCheckerProgram, "position", 0.5f);
>+    drawQuad(mCheckerProgram, essl1_shaders::PositionAttrib(), 0.5f);
> 
>     EXPECT_GL_NO_ERROR();
> 
>     glBindFramebuffer(GL_DRAW_FRAMEBUFFER_ANGLE, mOriginalFBO);
>     glBindFramebuffer(GL_READ_FRAMEBUFFER_ANGLE, mUserFBO);
> 
>-    glBlitFramebufferANGLE(0, 0, getWindowWidth() / 2, getWindowHeight() / 2, 0, 0, 
>+    glBlitFramebufferANGLE(0, 0, getWindowWidth() / 2, getWindowHeight() / 2, 0, 0,
>                            getWindowWidth(), getWindowHeight(), GL_COLOR_BUFFER_BIT, GL_NEAREST);
>     EXPECT_GL_ERROR(GL_INVALID_OPERATION);
> }
>@@ -981,47 +1063,51 @@ TEST_P(BlitFramebufferANGLETest, ErrorStretching)
> // Make sure that attempts to flip in a blit call issue an error
> TEST_P(BlitFramebufferANGLETest, ErrorFlipping)
> {
>+    ANGLE_SKIP_TEST_IF(!IsGLExtensionEnabled("GL_ANGLE_framebuffer_blit"));
>+
>     glBindFramebuffer(GL_FRAMEBUFFER, mUserFBO);
> 
>     glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT);
> 
>-    drawQuad(mCheckerProgram, "position", 0.5f);
>+    drawQuad(mCheckerProgram, essl1_shaders::PositionAttrib(), 0.5f);
> 
>     EXPECT_GL_NO_ERROR();
> 
>     glBindFramebuffer(GL_DRAW_FRAMEBUFFER_ANGLE, mOriginalFBO);
>     glBindFramebuffer(GL_READ_FRAMEBUFFER_ANGLE, mUserFBO);
> 
>-    glBlitFramebufferANGLE(0, 0, getWindowWidth() / 2, getWindowHeight() / 2, getWindowWidth() / 2, getWindowHeight() / 2, 
>-                           0, 0, GL_COLOR_BUFFER_BIT, GL_NEAREST);
>+    glBlitFramebufferANGLE(0, 0, getWindowWidth() / 2, getWindowHeight() / 2, getWindowWidth() / 2,
>+                           getWindowHeight() / 2, 0, 0, GL_COLOR_BUFFER_BIT, GL_NEAREST);
>     EXPECT_GL_ERROR(GL_INVALID_OPERATION);
> }
> 
> TEST_P(BlitFramebufferANGLETest, Errors)
> {
>+    ANGLE_SKIP_TEST_IF(!IsGLExtensionEnabled("GL_ANGLE_framebuffer_blit"));
>+
>     glBindFramebuffer(GL_FRAMEBUFFER, mUserFBO);
> 
>     glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT);
> 
>-    drawQuad(mCheckerProgram, "position", 0.5f);
>+    drawQuad(mCheckerProgram, essl1_shaders::PositionAttrib(), 0.5f);
> 
>     EXPECT_GL_NO_ERROR();
> 
>     glBindFramebuffer(GL_DRAW_FRAMEBUFFER_ANGLE, mOriginalFBO);
>     glBindFramebuffer(GL_READ_FRAMEBUFFER_ANGLE, mUserFBO);
> 
>-    glBlitFramebufferANGLE(0, 0, getWindowWidth(), getWindowHeight(), 0, 0, getWindowWidth(), getWindowHeight(), 
>-                           GL_COLOR_BUFFER_BIT, GL_LINEAR);
>+    glBlitFramebufferANGLE(0, 0, getWindowWidth(), getWindowHeight(), 0, 0, getWindowWidth(),
>+                           getWindowHeight(), GL_COLOR_BUFFER_BIT, GL_LINEAR);
>     EXPECT_GL_ERROR(GL_INVALID_ENUM);
> 
>-    glBlitFramebufferANGLE(0, 0, getWindowWidth(), getWindowHeight(), 0, 0, getWindowWidth(), getWindowHeight(),
>-                           GL_COLOR_BUFFER_BIT | 234, GL_NEAREST);
>+    glBlitFramebufferANGLE(0, 0, getWindowWidth(), getWindowHeight(), 0, 0, getWindowWidth(),
>+                           getWindowHeight(), GL_COLOR_BUFFER_BIT | 234, GL_NEAREST);
>     EXPECT_GL_ERROR(GL_INVALID_VALUE);
> 
>     glBindFramebuffer(GL_DRAW_FRAMEBUFFER_ANGLE, mDiffFormatFBO);
> 
>-    glBlitFramebufferANGLE(0, 0, getWindowWidth(), getWindowHeight(), 0, 0, getWindowWidth(), getWindowHeight(),
>-                           GL_COLOR_BUFFER_BIT, GL_NEAREST);
>+    glBlitFramebufferANGLE(0, 0, getWindowWidth(), getWindowHeight(), 0, 0, getWindowWidth(),
>+                           getWindowHeight(), GL_COLOR_BUFFER_BIT, GL_NEAREST);
>     EXPECT_GL_ERROR(GL_INVALID_OPERATION);
> }
> 
>@@ -1042,22 +1128,47 @@ class BlitFramebufferTest : public ANGLETest
>         setConfigDepthBits(24);
>         setConfigStencilBits(8);
>     }
>+
>+    void initColorFBO(GLFramebuffer *fbo,
>+                      GLRenderbuffer *rbo,
>+                      GLenum rboFormat,
>+                      GLsizei width,
>+                      GLsizei height)
>+    {
>+        glBindRenderbuffer(GL_RENDERBUFFER, *rbo);
>+        glRenderbufferStorage(GL_RENDERBUFFER, rboFormat, width, height);
>+
>+        glBindFramebuffer(GL_FRAMEBUFFER, *fbo);
>+        glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_RENDERBUFFER, *rbo);
>+    }
>+
>+    void initColorFBOWithCheckerPattern(GLFramebuffer *fbo,
>+                                        GLRenderbuffer *rbo,
>+                                        GLenum rboFormat,
>+                                        GLsizei width,
>+                                        GLsizei height)
>+    {
>+        initColorFBO(fbo, rbo, rboFormat, width, height);
>+
>+        ANGLE_GL_PROGRAM(checkerProgram, essl1_shaders::vs::Passthrough(),
>+                         essl1_shaders::fs::Checkered());
>+        glViewport(0, 0, width, height);
>+        glBindFramebuffer(GL_FRAMEBUFFER, *fbo);
>+        drawQuad(checkerProgram.get(), essl1_shaders::PositionAttrib(), 0.5f);
>+    }
> };
> 
> // Tests resolving a multisample depth buffer.
> TEST_P(BlitFramebufferTest, MultisampleDepth)
> {
>+    // TODO(oetuaho@nvidia.com): http://crbug.com/837717
>+    ANGLE_SKIP_TEST_IF(IsOpenGL() && IsOSX());
>+
>     GLRenderbuffer renderbuf;
>     glBindRenderbuffer(GL_RENDERBUFFER, renderbuf.get());
>     glRenderbufferStorageMultisample(GL_RENDERBUFFER, 2, GL_DEPTH_COMPONENT24, 256, 256);
> 
>-    const std::string &vertex =
>-        "#version 300 es\n"
>-        "in vec2 position;\n"
>-        "void main() {\n"
>-        "  gl_Position = vec4(position, 0.0, 0.5);\n"
>-        "}";
>-    const std::string &fragment =
>+    constexpr char kFS[] =
>         "#version 300 es\n"
>         "out mediump vec4 red;\n"
>         "void main() {\n"
>@@ -1065,7 +1176,7 @@ TEST_P(BlitFramebufferTest, MultisampleDepth)
>         "   gl_FragDepth = 0.5;\n"
>         "}";
> 
>-    ANGLE_GL_PROGRAM(drawRed, vertex, fragment);
>+    ANGLE_GL_PROGRAM(drawRed, essl3_shaders::vs::Simple(), kFS);
> 
>     GLFramebuffer framebuffer;
>     glBindFramebuffer(GL_FRAMEBUFFER, framebuffer.get());
>@@ -1106,7 +1217,7 @@ TEST_P(BlitFramebufferTest, MultisampleDepth)
>     // Draw with 0.5f test and the test should pass.
>     glEnable(GL_DEPTH_TEST);
>     glDepthFunc(GL_EQUAL);
>-    drawQuad(drawRed.get(), "position", 0.5f);
>+    drawQuad(drawRed.get(), essl3_shaders::PositionAttrib(), 0.5f);
>     EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::red);
> 
>     ASSERT_GL_NO_ERROR();
>@@ -1115,24 +1226,14 @@ TEST_P(BlitFramebufferTest, MultisampleDepth)
> // Test resolving a multisampled stencil buffer.
> TEST_P(BlitFramebufferTest, MultisampleStencil)
> {
>+    // Incorrect rendering results seen on AMD Windows OpenGL. http://anglebug.com/2486
>+    ANGLE_SKIP_TEST_IF(IsAMD() && IsOpenGL() && IsWindows());
>+
>     GLRenderbuffer renderbuf;
>     glBindRenderbuffer(GL_RENDERBUFFER, renderbuf.get());
>     glRenderbufferStorageMultisample(GL_RENDERBUFFER, 2, GL_STENCIL_INDEX8, 256, 256);
> 
>-    const std::string &vertex =
>-        "#version 300 es\n"
>-        "in vec2 position;\n"
>-        "void main() {\n"
>-        "  gl_Position = vec4(position, 0.0, 1.0);\n"
>-        "}";
>-    const std::string &fragment =
>-        "#version 300 es\n"
>-        "out mediump vec4 red;\n"
>-        "void main() {\n"
>-        "   red = vec4(1.0, 0.0, 0.0, 1.0);\n"
>-        "}";
>-
>-    ANGLE_GL_PROGRAM(drawRed, vertex, fragment);
>+    ANGLE_GL_PROGRAM(drawRed, essl3_shaders::vs::Simple(), essl3_shaders::fs::Red());
> 
>     GLFramebuffer framebuffer;
>     glBindFramebuffer(GL_FRAMEBUFFER, framebuffer.get());
>@@ -1145,7 +1246,7 @@ TEST_P(BlitFramebufferTest, MultisampleStencil)
>     glStencilFunc(GL_ALWAYS, 0x1, 0xFF);
>     glStencilOp(GL_REPLACE, GL_REPLACE, GL_REPLACE);
>     glEnable(GL_STENCIL_TEST);
>-    drawQuad(drawRed.get(), "position", 0.5f);
>+    drawQuad(drawRed.get(), essl3_shaders::PositionAttrib(), 0.5f);
> 
>     GLTexture destColorbuf;
>     glBindTexture(GL_TEXTURE_2D, destColorbuf.get());
>@@ -1176,18 +1277,232 @@ TEST_P(BlitFramebufferTest, MultisampleStencil)
> 
>     // Draw red if the stencil is 0x1, which should be true after the blit/resolve.
>     glStencilFunc(GL_EQUAL, 0x1, 0xFF);
>-    drawQuad(drawRed.get(), "position", 0.5f);
>+    drawQuad(drawRed.get(), essl3_shaders::PositionAttrib(), 0.5f);
>     EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::red);
> 
>     ASSERT_GL_NO_ERROR();
> }
> 
>-// Use this to select which configurations (e.g. which renderer, which GLES major version) these tests should be run against.
>+// Blit an SRGB framebuffer and scale it.
>+TEST_P(BlitFramebufferTest, BlitSRGBToRGBAndScale)
>+{
>+    constexpr const GLsizei kWidth  = 256;
>+    constexpr const GLsizei kHeight = 256;
>+
>+    GLRenderbuffer sourceRBO, targetRBO;
>+    GLFramebuffer sourceFBO, targetFBO;
>+    initColorFBOWithCheckerPattern(&sourceFBO, &sourceRBO, GL_SRGB8_ALPHA8, kWidth * 2,
>+                                   kHeight * 2);
>+    initColorFBO(&targetFBO, &targetRBO, GL_RGBA8, kWidth, kHeight);
>+
>+    EXPECT_GL_NO_ERROR();
>+
>+    glBindFramebuffer(GL_READ_FRAMEBUFFER, sourceFBO);
>+    glBindFramebuffer(GL_DRAW_FRAMEBUFFER, targetFBO);
>+
>+    glViewport(0, 0, kWidth, kHeight);
>+
>+    glClearColor(0.0f, 0.0f, 0.0f, 0.0f);
>+    glClear(GL_COLOR_BUFFER_BIT);
>+
>+    // Scale down without flipping.
>+    glBlitFramebuffer(0, 0, kWidth * 2, kHeight * 2, 0, 0, kWidth, kHeight, GL_COLOR_BUFFER_BIT,
>+                      GL_NEAREST);
>+
>+    EXPECT_GL_NO_ERROR();
>+
>+    glBindFramebuffer(GL_FRAMEBUFFER, targetFBO);
>+
>+    EXPECT_PIXEL_COLOR_EQ(kWidth / 4, kHeight / 4, GLColor::red);
>+    EXPECT_PIXEL_COLOR_EQ(3 * kWidth / 4, kHeight / 4, GLColor::green);
>+    EXPECT_PIXEL_COLOR_EQ(3 * kWidth / 4, 3 * kHeight / 4, GLColor::red);
>+    EXPECT_PIXEL_COLOR_EQ(kWidth / 4, 3 * kHeight / 4, GLColor::green);
>+
>+    glBindFramebuffer(GL_READ_FRAMEBUFFER, sourceFBO);
>+    glBindFramebuffer(GL_DRAW_FRAMEBUFFER, targetFBO);
>+
>+    glClearColor(0.0f, 0.0f, 0.0f, 0.0f);
>+    glClear(GL_COLOR_BUFFER_BIT);
>+
>+    // Scale down and flip in the X direction.
>+    glBlitFramebuffer(0, 0, kWidth * 2, kHeight * 2, kWidth, 0, 0, kHeight, GL_COLOR_BUFFER_BIT,
>+                      GL_NEAREST);
>+
>+    EXPECT_GL_NO_ERROR();
>+
>+    glBindFramebuffer(GL_FRAMEBUFFER, targetFBO);
>+
>+    EXPECT_PIXEL_COLOR_EQ(kWidth / 4, kHeight / 4, GLColor::green);
>+    EXPECT_PIXEL_COLOR_EQ(3 * kWidth / 4, kHeight / 4, GLColor::red);
>+    EXPECT_PIXEL_COLOR_EQ(3 * kWidth / 4, 3 * kHeight / 4, GLColor::green);
>+    EXPECT_PIXEL_COLOR_EQ(kWidth / 4, 3 * kHeight / 4, GLColor::red);
>+}
>+
>+// Blit a subregion of an SRGB framebuffer to an RGB framebuffer.
>+TEST_P(BlitFramebufferTest, PartialBlitSRGBToRGB)
>+{
>+    constexpr const GLsizei kWidth  = 256;
>+    constexpr const GLsizei kHeight = 256;
>+
>+    GLRenderbuffer sourceRBO, targetRBO;
>+    GLFramebuffer sourceFBO, targetFBO;
>+    initColorFBOWithCheckerPattern(&sourceFBO, &sourceRBO, GL_SRGB8_ALPHA8, kWidth * 2,
>+                                   kHeight * 2);
>+    initColorFBO(&targetFBO, &targetRBO, GL_RGBA8, kWidth, kHeight);
>+
>+    EXPECT_GL_NO_ERROR();
>+
>+    glBindFramebuffer(GL_READ_FRAMEBUFFER, sourceFBO);
>+    glBindFramebuffer(GL_DRAW_FRAMEBUFFER, targetFBO);
>+
>+    glViewport(0, 0, kWidth, kHeight);
>+
>+    glClearColor(0.0f, 0.0f, 0.0f, 0.0f);
>+    glClear(GL_COLOR_BUFFER_BIT);
>+
>+    // Blit a part of the source FBO without flipping.
>+    glBlitFramebuffer(kWidth, kHeight, kWidth * 2, kHeight * 2, 0, 0, kWidth, kHeight,
>+                      GL_COLOR_BUFFER_BIT, GL_NEAREST);
>+
>+    EXPECT_GL_NO_ERROR();
>+
>+    glBindFramebuffer(GL_FRAMEBUFFER, targetFBO);
>+
>+    EXPECT_PIXEL_COLOR_EQ(kWidth / 4, kHeight / 4, GLColor::red);
>+    EXPECT_PIXEL_COLOR_EQ(3 * kWidth / 4, kHeight / 4, GLColor::red);
>+    EXPECT_PIXEL_COLOR_EQ(3 * kWidth / 4, 3 * kHeight / 4, GLColor::red);
>+    EXPECT_PIXEL_COLOR_EQ(kWidth / 4, 3 * kHeight / 4, GLColor::red);
>+
>+    glBindFramebuffer(GL_READ_FRAMEBUFFER, sourceFBO);
>+    glBindFramebuffer(GL_DRAW_FRAMEBUFFER, targetFBO);
>+
>+    glClearColor(0.0f, 0.0f, 0.0f, 0.0f);
>+    glClear(GL_COLOR_BUFFER_BIT);
>+
>+    // Blit a part of the source FBO and flip in the X direction.
>+    glBlitFramebuffer(kWidth * 2, 0, kWidth, kHeight, kWidth, 0, 0, kHeight, GL_COLOR_BUFFER_BIT,
>+                      GL_NEAREST);
>+
>+    EXPECT_GL_NO_ERROR();
>+
>+    glBindFramebuffer(GL_FRAMEBUFFER, targetFBO);
>+
>+    EXPECT_PIXEL_COLOR_EQ(kWidth / 4, kHeight / 4, GLColor::green);
>+    EXPECT_PIXEL_COLOR_EQ(3 * kWidth / 4, kHeight / 4, GLColor::green);
>+    EXPECT_PIXEL_COLOR_EQ(3 * kWidth / 4, 3 * kHeight / 4, GLColor::green);
>+    EXPECT_PIXEL_COLOR_EQ(kWidth / 4, 3 * kHeight / 4, GLColor::green);
>+}
>+
>+// Blit an SRGB framebuffer with an oversized source area (parts outside the source area should be
>+// clipped out).
>+TEST_P(BlitFramebufferTest, BlitSRGBToRGBOversizedSourceArea)
>+{
>+    constexpr const GLsizei kWidth  = 256;
>+    constexpr const GLsizei kHeight = 256;
>+
>+    GLRenderbuffer sourceRBO, targetRBO;
>+    GLFramebuffer sourceFBO, targetFBO;
>+    initColorFBOWithCheckerPattern(&sourceFBO, &sourceRBO, GL_SRGB8_ALPHA8, kWidth, kHeight);
>+    initColorFBO(&targetFBO, &targetRBO, GL_RGBA8, kWidth, kHeight);
>+
>+    EXPECT_GL_NO_ERROR();
>+
>+    glViewport(0, 0, kWidth, kHeight);
>+
>+    glBindFramebuffer(GL_READ_FRAMEBUFFER, sourceFBO);
>+    glBindFramebuffer(GL_DRAW_FRAMEBUFFER, targetFBO);
>+
>+    glClearColor(0.0f, 0.0f, 0.0f, 1.0f);
>+    glClear(GL_COLOR_BUFFER_BIT);
>+
>+    // Blit so that the source area gets placed at the center of the target FBO.
>+    // The width of the source area is 1/4 of the width of the target FBO.
>+    glBlitFramebuffer(-3 * kWidth / 2, -3 * kHeight / 2, 5 * kWidth / 2, 5 * kHeight / 2, 0, 0,
>+                      kWidth, kHeight, GL_COLOR_BUFFER_BIT, GL_NEAREST);
>+
>+    EXPECT_GL_NO_ERROR();
>+
>+    glBindFramebuffer(GL_FRAMEBUFFER, targetFBO);
>+
>+    // Source FBO colors can be found in the middle of the target FBO.
>+    EXPECT_PIXEL_COLOR_EQ(7 * kWidth / 16, 7 * kHeight / 16, GLColor::red);
>+    EXPECT_PIXEL_COLOR_EQ(9 * kWidth / 16, 7 * kHeight / 16, GLColor::green);
>+    EXPECT_PIXEL_COLOR_EQ(9 * kWidth / 16, 9 * kHeight / 16, GLColor::red);
>+    EXPECT_PIXEL_COLOR_EQ(7 * kWidth / 16, 9 * kHeight / 16, GLColor::green);
>+
>+    // Clear color should remain around the edges of the target FBO (WebGL 2.0 spec explicitly
>+    // requires this and ANGLE is expected to follow that).
>+    EXPECT_PIXEL_COLOR_EQ(kWidth / 4, kHeight / 4, GLColor::black);
>+    EXPECT_PIXEL_COLOR_EQ(3 * kWidth / 4, kHeight / 4, GLColor::black);
>+    EXPECT_PIXEL_COLOR_EQ(3 * kWidth / 4, 3 * kHeight / 4, GLColor::black);
>+    EXPECT_PIXEL_COLOR_EQ(kWidth / 4, 3 * kHeight / 4, GLColor::black);
>+}
>+
>+// Test blitFramebuffer size overflow checks. WebGL 2.0 spec section 5.41. We do validation for
>+// overflows also in non-WebGL mode to avoid triggering driver bugs.
>+TEST_P(BlitFramebufferTest, BlitFramebufferSizeOverflow)
>+{
>+    GLTexture textures[2];
>+    glBindTexture(GL_TEXTURE_2D, textures[0]);
>+    glTexStorage2D(GL_TEXTURE_2D, 3, GL_RGBA8, 4, 4);
>+    glBindTexture(GL_TEXTURE_2D, textures[1]);
>+    glTexStorage2D(GL_TEXTURE_2D, 3, GL_RGBA8, 4, 4);
>+
>+    GLFramebuffer framebuffers[2];
>+    glBindFramebuffer(GL_READ_FRAMEBUFFER, framebuffers[0]);
>+    glBindFramebuffer(GL_DRAW_FRAMEBUFFER, framebuffers[1]);
>+
>+    ASSERT_GL_NO_ERROR();
>+
>+    glFramebufferTexture2D(GL_READ_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, textures[0],
>+                           0);
>+    glFramebufferTexture2D(GL_DRAW_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, textures[1],
>+                           0);
>+    ASSERT_GL_NO_ERROR();
>+
>+    // srcX
>+    glBlitFramebuffer(-1, 0, std::numeric_limits<GLint>::max(), 4, 0, 0, 4, 4, GL_COLOR_BUFFER_BIT,
>+                      GL_NEAREST);
>+    EXPECT_GL_ERROR(GL_INVALID_VALUE);
>+    glBlitFramebuffer(std::numeric_limits<GLint>::max(), 0, -1, 4, 0, 0, 4, 4, GL_COLOR_BUFFER_BIT,
>+                      GL_NEAREST);
>+    EXPECT_GL_ERROR(GL_INVALID_VALUE);
>+
>+    // srcY
>+    glBlitFramebuffer(0, -1, 4, std::numeric_limits<GLint>::max(), 0, 0, 4, 4, GL_COLOR_BUFFER_BIT,
>+                      GL_NEAREST);
>+    EXPECT_GL_ERROR(GL_INVALID_VALUE);
>+    glBlitFramebuffer(0, std::numeric_limits<GLint>::max(), 4, -1, 0, 0, 4, 4, GL_COLOR_BUFFER_BIT,
>+                      GL_NEAREST);
>+    EXPECT_GL_ERROR(GL_INVALID_VALUE);
>+
>+    // dstX
>+    glBlitFramebuffer(0, 0, 4, 4, -1, 0, std::numeric_limits<GLint>::max(), 4, GL_COLOR_BUFFER_BIT,
>+                      GL_NEAREST);
>+    EXPECT_GL_ERROR(GL_INVALID_VALUE);
>+    glBlitFramebuffer(0, 0, 4, 4, std::numeric_limits<GLint>::max(), 0, -1, 4, GL_COLOR_BUFFER_BIT,
>+                      GL_NEAREST);
>+    EXPECT_GL_ERROR(GL_INVALID_VALUE);
>+
>+    // dstY
>+    glBlitFramebuffer(0, 0, 4, 4, 0, -1, 4, std::numeric_limits<GLint>::max(), GL_COLOR_BUFFER_BIT,
>+                      GL_NEAREST);
>+    EXPECT_GL_ERROR(GL_INVALID_VALUE);
>+    glBlitFramebuffer(0, 0, 4, 4, 0, std::numeric_limits<GLint>::max(), 4, -1, GL_COLOR_BUFFER_BIT,
>+                      GL_NEAREST);
>+    EXPECT_GL_ERROR(GL_INVALID_VALUE);
>+}
>+
>+// Use this to select which configurations (e.g. which renderer, which GLES major version) these
>+// tests should be run against.
> ANGLE_INSTANTIATE_TEST(BlitFramebufferANGLETest,
>                        ES2_D3D9(),
>                        ES2_D3D11(EGL_EXPERIMENTAL_PRESENT_PATH_COPY_ANGLE),
>                        ES2_D3D11(EGL_EXPERIMENTAL_PRESENT_PATH_FAST_ANGLE),
>                        ES2_OPENGL(),
>-                       ES3_OPENGL());
>+                       ES3_OPENGL(),
>+                       ES2_VULKAN());
> 
>-ANGLE_INSTANTIATE_TEST(BlitFramebufferTest, ES3_D3D11());
>+// We're specifically testing GL 4.4 and GL 4.3 since on versions earlier than 4.4 FramebufferGL
>+// takes a different path for blitting SRGB textures.
>+ANGLE_INSTANTIATE_TEST(BlitFramebufferTest, ES3_D3D11(), ES3_OPENGL(4, 4), ES3_OPENGL(4, 3));
>diff --git a/Source/ThirdParty/ANGLE/src/tests/gl_tests/BufferDataTest.cpp b/Source/ThirdParty/ANGLE/src/tests/gl_tests/BufferDataTest.cpp
>index 6a3e5a4e593..658a6ada723 100644
>--- a/Source/ThirdParty/ANGLE/src/tests/gl_tests/BufferDataTest.cpp
>+++ b/Source/ThirdParty/ANGLE/src/tests/gl_tests/BufferDataTest.cpp
>@@ -7,7 +7,7 @@
> #include "test_utils/ANGLETest.h"
> #include "test_utils/gl_raii.h"
> 
>-#include "random_utils.h"
>+#include "util/random_utils.h"
> 
> #include <stdint.h>
> 
>@@ -26,8 +26,8 @@ class BufferDataTest : public ANGLETest
>         setConfigAlphaBits(8);
>         setConfigDepthBits(24);
> 
>-        mBuffer = 0;
>-        mProgram = 0;
>+        mBuffer         = 0;
>+        mProgram        = 0;
>         mAttribLocation = -1;
>     }
> 
>@@ -35,28 +35,26 @@ class BufferDataTest : public ANGLETest
>     {
>         ANGLETest::SetUp();
> 
>-        const char *vsSource =
>-            R"(attribute vec4 position;
>-            attribute float in_attrib;
>-            varying float v_attrib;
>-            void main()
>-            {
>-                v_attrib = in_attrib;
>-                gl_Position = position;
>-            })";
>-
>-        const char *fsSource =
>-            R"(precision mediump float;
>-            varying float v_attrib;
>-            void main()
>-            {
>-                gl_FragColor = vec4(v_attrib, 0, 0, 1);
>-            })";
>+        constexpr char kVS[] = R"(attribute vec4 position;
>+attribute float in_attrib;
>+varying float v_attrib;
>+void main()
>+{
>+    v_attrib = in_attrib;
>+    gl_Position = position;
>+})";
>+
>+        constexpr char kFS[] = R"(precision mediump float;
>+varying float v_attrib;
>+void main()
>+{
>+    gl_FragColor = vec4(v_attrib, 0, 0, 1);
>+})";
> 
>         glGenBuffers(1, &mBuffer);
>         ASSERT_NE(mBuffer, 0U);
> 
>-        mProgram = CompileProgram(vsSource, fsSource);
>+        mProgram = CompileProgram(kVS, kFS);
>         ASSERT_NE(mProgram, 0U);
> 
>         mAttribLocation = glGetAttribLocation(mProgram, "in_attrib");
>@@ -119,7 +117,7 @@ TEST_P(BufferDataTest, ZeroNonNULLData)
>     glBufferSubData(GL_ARRAY_BUFFER, 0, 0, zeroData);
>     EXPECT_GL_NO_ERROR();
> 
>-    delete [] zeroData;
>+    delete[] zeroData;
> }
> 
> TEST_P(BufferDataTest, NULLResolvedData)
>@@ -160,6 +158,67 @@ TEST_P(BufferDataTest, RepeatedDrawWithDynamic)
>     EXPECT_GL_NO_ERROR();
> }
> 
>+// Tests for a bug where vertex attribute translation was not being invalidated when switching to
>+// DYNAMIC
>+TEST_P(BufferDataTest, RepeatedDrawDynamicBug)
>+{
>+    // http://anglebug.com/2843: Seems to be an Intel driver bug.
>+    ANGLE_SKIP_TEST_IF(IsVulkan() && IsIntel() && IsWindows());
>+
>+    glUseProgram(mProgram);
>+
>+    GLint positionLocation = glGetAttribLocation(mProgram, "position");
>+    ASSERT_NE(-1, positionLocation);
>+
>+    auto quadVertices = GetQuadVertices();
>+    for (angle::Vector3 &vertex : quadVertices)
>+    {
>+        vertex.x() *= 1.0f;
>+        vertex.y() *= 1.0f;
>+        vertex.z() = 0.0f;
>+    }
>+
>+    // Set up quad vertices with DYNAMIC data
>+    GLBuffer positionBuffer;
>+    glBindBuffer(GL_ARRAY_BUFFER, positionBuffer);
>+    glBufferData(GL_ARRAY_BUFFER, sizeof(GLfloat) * quadVertices.size() * 3, quadVertices.data(),
>+                 GL_DYNAMIC_DRAW);
>+    glVertexAttribPointer(positionLocation, 3, GL_FLOAT, GL_FALSE, 0, nullptr);
>+    glEnableVertexAttribArray(positionLocation);
>+    glBindBuffer(GL_ARRAY_BUFFER, 0);
>+    EXPECT_GL_NO_ERROR();
>+
>+    // Set up color data so red is drawn
>+    std::vector<GLfloat> data(6, 1.0f);
>+
>+    // Set data to DYNAMIC
>+    glBindBuffer(GL_ARRAY_BUFFER, mBuffer);
>+    glBufferData(GL_ARRAY_BUFFER, sizeof(GLfloat) * data.size(), data.data(), GL_DYNAMIC_DRAW);
>+    glVertexAttribPointer(mAttribLocation, 1, GL_FLOAT, GL_FALSE, 0, nullptr);
>+    glEnableVertexAttribArray(mAttribLocation);
>+    EXPECT_GL_NO_ERROR();
>+
>+    // Draw enough times to promote data to DIRECT mode
>+    for (int i = 0; i < 20; i++)
>+    {
>+        glDrawArrays(GL_TRIANGLES, 0, 6);
>+    }
>+
>+    // Verify red was drawn
>+    EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::red);
>+
>+    // Set up color value so black is drawn
>+    std::fill(data.begin(), data.end(), 0.0f);
>+
>+    // Update the data, changing back to DYNAMIC mode.
>+    glBufferData(GL_ARRAY_BUFFER, sizeof(GLfloat) * data.size(), data.data(), GL_DYNAMIC_DRAW);
>+
>+    // This draw should produce a black quad
>+    glDrawArrays(GL_TRIANGLES, 0, 6);
>+    EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::black);
>+    EXPECT_GL_NO_ERROR();
>+}
>+
> class IndexedBufferCopyTest : public ANGLETest
> {
>   protected:
>@@ -178,23 +237,21 @@ class IndexedBufferCopyTest : public ANGLETest
>     {
>         ANGLETest::SetUp();
> 
>-        const char *vsSource =
>-            R"(attribute vec3 in_attrib;
>-            varying vec3 v_attrib;
>-            void main()
>-            {
>-                v_attrib = in_attrib;
>-                gl_Position = vec4(0.0, 0.0, 0.5, 1.0);
>-                gl_PointSize = 100.0;
>-            })";
>-
>-        const char *fsSource =
>-            R"(precision mediump float;
>-            varying vec3 v_attrib;
>-            void main()
>-            {
>-                gl_FragColor = vec4(v_attrib, 1);
>-            })";
>+        constexpr char kVS[] = R"(attribute vec3 in_attrib;
>+varying vec3 v_attrib;
>+void main()
>+{
>+    v_attrib = in_attrib;
>+    gl_Position = vec4(0.0, 0.0, 0.5, 1.0);
>+    gl_PointSize = 100.0;
>+})";
>+
>+        constexpr char kFS[] = R"(precision mediump float;
>+varying vec3 v_attrib;
>+void main()
>+{
>+    gl_FragColor = vec4(v_attrib, 1);
>+})";
> 
>         glGenBuffers(2, mBuffers);
>         ASSERT_NE(mBuffers[0], 0U);
>@@ -203,7 +260,7 @@ class IndexedBufferCopyTest : public ANGLETest
>         glGenBuffers(1, &mElementBuffer);
>         ASSERT_NE(mElementBuffer, 0U);
> 
>-        mProgram = CompileProgram(vsSource, fsSource);
>+        mProgram = CompileProgram(kVS, kFS);
>         ASSERT_NE(mProgram, 0U);
> 
>         mAttribLocation = glGetAttribLocation(mProgram, "in_attrib");
>@@ -237,14 +294,10 @@ class IndexedBufferCopyTest : public ANGLETest
> TEST_P(IndexedBufferCopyTest, IndexRangeBug)
> {
>     // TODO(geofflang): Figure out why this fails on AMD OpenGL (http://anglebug.com/1291)
>-    if (IsAMD() && getPlatformRenderer() == EGL_PLATFORM_ANGLE_TYPE_OPENGL_ANGLE)
>-    {
>-        std::cout << "Test disabled on AMD OpenGL." << std::endl;
>-        return;
>-    }
>+    ANGLE_SKIP_TEST_IF(IsAMD() && IsOpenGL());
> 
>-    unsigned char vertexData[] = { 255, 0, 0, 0, 0, 0 };
>-    unsigned int indexData[] = { 0, 1 };
>+    unsigned char vertexData[] = {255, 0, 0, 0, 0, 0};
>+    unsigned int indexData[]   = {0, 1};
> 
>     glBindBuffer(GL_ARRAY_BUFFER, mBuffers[0]);
>     glBufferData(GL_ARRAY_BUFFER, sizeof(char) * 6, vertexData, GL_STATIC_DRAW);
>@@ -279,18 +332,17 @@ TEST_P(IndexedBufferCopyTest, IndexRangeBug)
>     glClear(GL_COLOR_BUFFER_BIT);
>     EXPECT_PIXEL_EQ(0, 0, 0, 0, 0, 0);
> 
>-    unsigned char newData[] = { 0, 255, 0 };
>+    unsigned char newData[] = {0, 255, 0};
>     glBufferSubData(GL_ARRAY_BUFFER, 3, 3, newData);
> 
>     glDrawElements(GL_POINTS, 1, GL_UNSIGNED_INT, nullptr);
> 
>     EXPECT_GL_NO_ERROR();
>-    EXPECT_PIXEL_EQ(0, 0, 0, 255, 0, 255);
>+    EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::green);
> }
> 
> class BufferDataTestES3 : public BufferDataTest
>-{
>-};
>+{};
> 
> // The following test covers an ANGLE bug where the buffer storage
> // is not resized by Buffer11::getLatestBufferStorage when needed.
>@@ -301,13 +353,13 @@ TEST_P(BufferDataTestES3, BufferResizing)
>     ASSERT_GL_NO_ERROR();
> 
>     // Allocate a buffer with one byte
>-    uint8_t singleByte[] = { 0xaa };
>+    uint8_t singleByte[] = {0xaa};
>     glBufferData(GL_ARRAY_BUFFER, 1, singleByte, GL_STATIC_DRAW);
> 
>     // Resize the buffer
>     // To trigger the bug, the buffer need to be big enough because some hardware copy buffers
>     // by chunks of pages instead of the minimum number of bytes neeeded.
>-    const size_t numBytes = 4096*4;
>+    const size_t numBytes = 4096 * 4;
>     glBufferData(GL_ARRAY_BUFFER, numBytes, nullptr, GL_STATIC_DRAW);
> 
>     // Copy the original data to the buffer
>@@ -317,7 +369,8 @@ TEST_P(BufferDataTestES3, BufferResizing)
>         srcBytes[i] = static_cast<uint8_t>(i);
>     }
> 
>-    void *dest = glMapBufferRange(GL_ARRAY_BUFFER, 0, numBytes, GL_MAP_WRITE_BIT | GL_MAP_INVALIDATE_BUFFER_BIT);
>+    void *dest = glMapBufferRange(GL_ARRAY_BUFFER, 0, numBytes,
>+                                  GL_MAP_WRITE_BIT | GL_MAP_INVALIDATE_BUFFER_BIT);
> 
>     ASSERT_GL_NO_ERROR();
> 
>@@ -341,7 +394,8 @@ TEST_P(BufferDataTestES3, BufferResizing)
>     ASSERT_GL_NO_ERROR();
> 
>     // Read back the data and compare it to the original
>-    uint8_t *data = reinterpret_cast<uint8_t*>(glMapBufferRange(GL_COPY_WRITE_BUFFER, 0, numBytes, GL_MAP_READ_BIT));
>+    uint8_t *data = reinterpret_cast<uint8_t *>(
>+        glMapBufferRange(GL_COPY_WRITE_BUFFER, 0, numBytes, GL_MAP_READ_BIT));
> 
>     ASSERT_GL_NO_ERROR();
> 
>@@ -359,16 +413,16 @@ TEST_P(BufferDataTestES3, BufferResizing)
> // Verify OES_mapbuffer is present if EXT_map_buffer_range is.
> TEST_P(BufferDataTest, ExtensionDependency)
> {
>-    if (extensionEnabled("GL_EXT_map_buffer_range"))
>+    if (IsGLExtensionEnabled("GL_EXT_map_buffer_range"))
>     {
>-        ASSERT_TRUE(extensionEnabled("GL_OES_mapbuffer"));
>+        ASSERT_TRUE(IsGLExtensionEnabled("GL_OES_mapbuffer"));
>     }
> }
> 
> // Test mapping with the OES extension.
> TEST_P(BufferDataTest, MapBufferOES)
> {
>-    if (!extensionEnabled("GL_EXT_map_buffer_range"))
>+    if (!IsGLExtensionEnabled("GL_EXT_map_buffer_range"))
>     {
>         // Needed for test validation.
>         return;
>@@ -421,8 +475,14 @@ TEST_P(BufferDataTestES3, NoBufferInitDataCopyBug)
>     ASSERT_GL_NO_ERROR();
> }
> 
>-// Use this to select which configurations (e.g. which renderer, which GLES major version) these tests should be run against.
>-ANGLE_INSTANTIATE_TEST(BufferDataTest, ES2_D3D9(), ES2_D3D11(), ES2_OPENGL(), ES2_OPENGLES());
>+// Use this to select which configurations (e.g. which renderer, which GLES major version) these
>+// tests should be run against.
>+ANGLE_INSTANTIATE_TEST(BufferDataTest,
>+                       ES2_D3D9(),
>+                       ES2_D3D11(),
>+                       ES2_OPENGL(),
>+                       ES2_OPENGLES(),
>+                       ES2_VULKAN());
> ANGLE_INSTANTIATE_TEST(BufferDataTestES3, ES3_D3D11(), ES3_OPENGL(), ES3_OPENGLES());
> ANGLE_INSTANTIATE_TEST(IndexedBufferCopyTest, ES3_D3D11(), ES3_OPENGL(), ES3_OPENGLES());
> 
>@@ -435,16 +495,14 @@ ANGLE_INSTANTIATE_TEST(IndexedBufferCopyTest, ES3_D3D11(), ES3_OPENGL(), ES3_OPE
> class BufferDataOverflowTest : public ANGLETest
> {
>   protected:
>-    BufferDataOverflowTest()
>-    {
>-    }
>+    BufferDataOverflowTest() {}
> };
> 
> // See description above.
> TEST_P(BufferDataOverflowTest, VertexBufferIntegerOverflow)
> {
>     // These values are special, to trigger the rounding bug.
>-    unsigned int numItems = 0x7FFFFFE;
>+    unsigned int numItems       = 0x7FFFFFE;
>     constexpr GLsizei bufferCnt = 8;
> 
>     std::vector<GLBuffer> buffers(bufferCnt);
>@@ -469,13 +527,13 @@ TEST_P(BufferDataOverflowTest, VertexBufferIntegerOverflow)
> 
>     vertexShaderStr << "}";
> 
>-    const std::string &fragmentShader =
>+    constexpr char kFS[] =
>         "varying highp float v_attrib;\n"
>         "void main() {\n"
>         "  gl_FragColor = vec4(v_attrib, 0, 0, 1);\n"
>         "}";
> 
>-    ANGLE_GL_PROGRAM(program, vertexShaderStr.str(), fragmentShader);
>+    ANGLE_GL_PROGRAM(program, vertexShaderStr.str().c_str(), kFS);
>     glUseProgram(program.get());
> 
>     std::vector<GLfloat> data(numItems, 1.0f);
>@@ -503,6 +561,19 @@ TEST_P(BufferDataOverflowTest, VertexBufferIntegerOverflow)
>     EXPECT_GL_NO_ERROR();
>     glDrawArrays(GL_TRIANGLES, 0, numItems);
>     EXPECT_GL_ERROR(GL_OUT_OF_MEMORY);
>+
>+    // Test that a small draw still works.
>+    for (GLsizei bufferIndex = 0; bufferIndex < bufferCnt; ++bufferIndex)
>+    {
>+        std::stringstream attribNameStr;
>+        attribNameStr << "attrib" << bufferIndex;
>+        GLint attribLocation = glGetAttribLocation(program.get(), attribNameStr.str().c_str());
>+        ASSERT_NE(-1, attribLocation);
>+        glDisableVertexAttribArray(attribLocation);
>+    }
>+
>+    glDrawArrays(GL_TRIANGLES, 0, 3);
>+    EXPECT_GL_ERROR(GL_NO_ERROR);
> }
> 
> // Tests a security bug in our CopyBufferSubData validation (integer overflow).
>diff --git a/Source/ThirdParty/ANGLE/src/tests/gl_tests/BuiltinVariableTest.cpp b/Source/ThirdParty/ANGLE/src/tests/gl_tests/BuiltinVariableTest.cpp
>index cbb399dd6e8..fb6845223ca 100644
>--- a/Source/ThirdParty/ANGLE/src/tests/gl_tests/BuiltinVariableTest.cpp
>+++ b/Source/ThirdParty/ANGLE/src/tests/gl_tests/BuiltinVariableTest.cpp
>@@ -8,6 +8,7 @@
> //
> 
> #include "test_utils/ANGLETest.h"
>+#include "test_utils/gl_raii.h"
> 
> using namespace angle;
> 
>@@ -29,7 +30,7 @@ class BuiltinVariableVertexIdTest : public ANGLETest
>     {
>         ANGLETest::SetUp();
> 
>-        const std::string vsSource =
>+        constexpr char kVS[] =
>             "#version 300 es\n"
>             "precision highp float;\n"
>             "in vec4 position;\n"
>@@ -42,7 +43,7 @@ class BuiltinVariableVertexIdTest : public ANGLETest
>             "    color = vec4(gl_VertexID != expectedID, gl_VertexID == expectedID, 0.0, 1.0);"
>             "}\n";
> 
>-        const std::string fsSource =
>+        constexpr char kFS[] =
>             "#version 300 es\n"
>             "precision highp float;\n"
>             "in vec4 color;\n"
>@@ -52,7 +53,7 @@ class BuiltinVariableVertexIdTest : public ANGLETest
>             "    fragColor = color;\n"
>             "}\n";
> 
>-        mProgram = CompileProgram(vsSource, fsSource);
>+        mProgram = CompileProgram(kVS, kFS);
>         ASSERT_NE(0u, mProgram);
> 
>         mPositionLocation = glGetAttribLocation(mProgram, "position");
>@@ -60,13 +61,7 @@ class BuiltinVariableVertexIdTest : public ANGLETest
>         mExpectedIdLocation = glGetAttribLocation(mProgram, "expectedID");
>         ASSERT_NE(-1, mExpectedIdLocation);
> 
>-        static const float positions[] =
>-        {
>-             0.5,  0.5,
>-            -0.5,  0.5,
>-             0.5, -0.5,
>-            -0.5, -0.5
>-        };
>+        static const float positions[] = {0.5, 0.5, -0.5, 0.5, 0.5, -0.5, -0.5, -0.5};
>         glGenBuffers(1, &mPositionBuffer);
>         glBindBuffer(GL_ARRAY_BUFFER, mPositionBuffer);
>         glBufferData(GL_ARRAY_BUFFER, sizeof(positions), positions, GL_STATIC_DRAW);
>@@ -204,6 +199,105 @@ TEST_P(BuiltinVariableVertexIdTest, Triangles)
>     runTest(GL_TRIANGLES, indices, 6);
> }
> 
>-// Use this to select which configurations (e.g. which renderer, which GLES major version) these
>-// tests should be run against.
> ANGLE_INSTANTIATE_TEST(BuiltinVariableVertexIdTest, ES3_D3D11(), ES3_OPENGL(), ES3_OPENGLES());
>+
>+class BuiltinVariableFragDepthClampingFloatRBOTest : public ANGLETest
>+{
>+  protected:
>+    void SetUp() override
>+    {
>+        ANGLETest::SetUp();
>+
>+        // Writes a fixed detph value and green.
>+        // Section 15.2.3 of the GL 4.5 specification says that conversion is not
>+        // done but clamping is so the output depth should be in [0.0, 1.0]
>+        constexpr char kFS[] =
>+            R"(#version 300 es
>+            precision highp float;
>+            layout(location = 0) out vec4 fragColor;
>+            uniform float u_depth;
>+            void main(){
>+                gl_FragDepth = u_depth;
>+                fragColor = vec4(0.0, 1.0, 0.0, 1.0);
>+            })";
>+
>+        mProgram = CompileProgram(essl3_shaders::vs::Simple(), kFS);
>+        ASSERT_NE(0u, mProgram);
>+
>+        mDepthLocation = glGetUniformLocation(mProgram, "u_depth");
>+        ASSERT_NE(-1, mDepthLocation);
>+
>+        glBindTexture(GL_TEXTURE_2D, mColorTexture);
>+        glTexStorage2D(GL_TEXTURE_2D, 1, GL_RGBA8, 1, 1);
>+        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
>+        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
>+
>+        glBindTexture(GL_TEXTURE_2D, mDepthTexture);
>+        glTexStorage2D(GL_TEXTURE_2D, 1, GL_DEPTH_COMPONENT32F, 1, 1);
>+        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
>+        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
>+
>+        glBindFramebuffer(GL_FRAMEBUFFER, mFramebuffer);
>+        glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, mColorTexture,
>+                               0);
>+        glFramebufferTexture2D(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, GL_TEXTURE_2D, mDepthTexture,
>+                               0);
>+
>+        ASSERT_GLENUM_EQ(GL_FRAMEBUFFER_COMPLETE, glCheckFramebufferStatus(GL_FRAMEBUFFER));
>+        ASSERT_GL_NO_ERROR();
>+    }
>+
>+    void TearDown() override
>+    {
>+        glDeleteProgram(mProgram);
>+
>+        ANGLETest::TearDown();
>+    }
>+
>+    void CheckDepthWritten(float expectedDepth, float fsDepth)
>+    {
>+        glBindFramebuffer(GL_FRAMEBUFFER, mFramebuffer);
>+        glUseProgram(mProgram);
>+
>+        // Clear to red, the FS will write green on success
>+        glClearColor(1.0f, 0.0f, 0.0f, 0.0f);
>+        // Clear to the expected depth so it will be compared to the FS depth with
>+        // DepthFunc(GL_EQUAL)
>+        glClearDepthf(expectedDepth);
>+        glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
>+
>+        glUniform1f(mDepthLocation, fsDepth);
>+        glDepthFunc(GL_EQUAL);
>+        glEnable(GL_DEPTH_TEST);
>+
>+        drawQuad(mProgram, "a_position", 0.0f);
>+        EXPECT_GL_NO_ERROR();
>+
>+        EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::green);
>+    }
>+
>+  private:
>+    GLuint mProgram;
>+    GLint mDepthLocation;
>+
>+    GLTexture mColorTexture;
>+    GLTexture mDepthTexture;
>+    GLFramebuffer mFramebuffer;
>+};
>+
>+// Test that gl_FragDepth is clamped above 0
>+TEST_P(BuiltinVariableFragDepthClampingFloatRBOTest, Above0)
>+{
>+    CheckDepthWritten(0.0f, -1.0f);
>+}
>+
>+// Test that gl_FragDepth is clamped below 1
>+TEST_P(BuiltinVariableFragDepthClampingFloatRBOTest, Below1)
>+{
>+    CheckDepthWritten(1.0f, 42.0f);
>+}
>+
>+ANGLE_INSTANTIATE_TEST(BuiltinVariableFragDepthClampingFloatRBOTest,
>+                       ES3_D3D11(),
>+                       ES3_OPENGL(),
>+                       ES3_OPENGLES());
>diff --git a/Source/ThirdParty/ANGLE/src/tests/gl_tests/ClearTest.cpp b/Source/ThirdParty/ANGLE/src/tests/gl_tests/ClearTest.cpp
>index f2e806b2e8e..7fadc1626fd 100644
>--- a/Source/ThirdParty/ANGLE/src/tests/gl_tests/ClearTest.cpp
>+++ b/Source/ThirdParty/ANGLE/src/tests/gl_tests/ClearTest.cpp
>@@ -6,7 +6,10 @@
> 
> #include "test_utils/ANGLETest.h"
> 
>-#include "random_utils.h"
>+#include "platform/FeaturesVk.h"
>+#include "test_utils/gl_raii.h"
>+#include "util/random_utils.h"
>+#include "util/shader_utils.h"
> 
> using namespace angle;
> 
>@@ -30,12 +33,12 @@ GLColor Vec4ToColor(const Vector4 &vec)
>     color.B = static_cast<uint8_t>(vec.z() * 255.0f);
>     color.A = static_cast<uint8_t>(vec.w() * 255.0f);
>     return color;
>-};
>+}
> 
> class ClearTestBase : public ANGLETest
> {
>   protected:
>-    ClearTestBase() : mProgram(0)
>+    ClearTestBase()
>     {
>         setWindowWidth(128);
>         setWindowHeight(128);
>@@ -44,6 +47,7 @@ class ClearTestBase : public ANGLETest
>         setConfigBlueBits(8);
>         setConfigAlphaBits(8);
>         setConfigDepthBits(24);
>+        setConfigStencilBits(8);
>     }
> 
>     void SetUp() override
>@@ -58,8 +62,6 @@ class ClearTestBase : public ANGLETest
> 
>     void TearDown() override
>     {
>-        glDeleteProgram(mProgram);
>-
>         if (!mFBOs.empty())
>         {
>             glDeleteFramebuffers(static_cast<GLsizei>(mFBOs.size()), mFBOs.data());
>@@ -73,36 +75,248 @@ class ClearTestBase : public ANGLETest
>         ANGLETest::TearDown();
>     }
> 
>-    void setupDefaultProgram()
>+    std::vector<GLuint> mFBOs;
>+    std::vector<GLuint> mTextures;
>+};
>+
>+class ClearTest : public ClearTestBase
>+{};
>+
>+class ClearTestES3 : public ClearTestBase
>+{
>+  protected:
>+    void verifyDepth(float depthValue, uint32_t size)
>     {
>-        const std::string vertexShaderSource =
>-            R"(precision highp float;
>-            attribute vec4 position;
>+        // Use a small shader to verify depth.
>+        ANGLE_GL_PROGRAM(depthTestProgram, essl1_shaders::vs::Passthrough(),
>+                         essl1_shaders::fs::Blue());
>+        ANGLE_GL_PROGRAM(depthTestProgramFail, essl1_shaders::vs::Passthrough(),
>+                         essl1_shaders::fs::Red());
>+        glEnable(GL_DEPTH_TEST);
>+        glDepthFunc(GL_LESS);
>+        drawQuad(depthTestProgram, essl1_shaders::PositionAttrib(), depthValue * 2 - 1 - 0.01f);
>+        drawQuad(depthTestProgramFail, essl1_shaders::PositionAttrib(), depthValue * 2 - 1 + 0.01f);
>+        glDisable(GL_DEPTH_TEST);
>+        ASSERT_GL_NO_ERROR();
>+
>+        EXPECT_PIXEL_COLOR_NEAR(0, 0, GLColor::blue, 1);
>+        EXPECT_PIXEL_COLOR_NEAR(size - 1, 0, GLColor::blue, 1);
>+        EXPECT_PIXEL_COLOR_NEAR(0, size - 1, GLColor::blue, 1);
>+        EXPECT_PIXEL_COLOR_NEAR(size - 1, size - 1, GLColor::blue, 1);
>+    }
>+
>+    void verifyStencil(uint32_t stencilValue, uint32_t size)
>+    {
>+        // Use another small shader to verify stencil.
>+        ANGLE_GL_PROGRAM(stencilTestProgram, essl1_shaders::vs::Passthrough(),
>+                         essl1_shaders::fs::Green());
>+        glEnable(GL_STENCIL_TEST);
>+        glStencilFunc(GL_EQUAL, stencilValue, 0xFF);
>+        drawQuad(stencilTestProgram, essl1_shaders::PositionAttrib(), 0.0f);
>+        glDisable(GL_STENCIL_TEST);
>+        ASSERT_GL_NO_ERROR();
>+
>+        EXPECT_PIXEL_COLOR_NEAR(0, 0, GLColor::green, 1);
>+        EXPECT_PIXEL_COLOR_NEAR(size - 1, 0, GLColor::green, 1);
>+        EXPECT_PIXEL_COLOR_NEAR(0, size - 1, GLColor::green, 1);
>+        EXPECT_PIXEL_COLOR_NEAR(size - 1, size - 1, GLColor::green, 1);
>+    }
>+};
>+
>+class ClearTestRGB : public ANGLETest
>+{
>+  protected:
>+    ClearTestRGB()
>+    {
>+        setWindowWidth(128);
>+        setWindowHeight(128);
>+        setConfigRedBits(8);
>+        setConfigGreenBits(8);
>+        setConfigBlueBits(8);
>+    }
>+};
>+
>+// Each int parameter can have three values: don't clear, clear, or masked clear.  The bool
>+// parameter controls scissor.
>+using MaskedScissoredClearVariationsTestParams =
>+    std::tuple<angle::PlatformParameters, int, int, int, bool>;
>+
>+void ParseMaskedScissoredClearVariationsTestParams(
>+    const MaskedScissoredClearVariationsTestParams &params,
>+    bool *clearColor,
>+    bool *clearDepth,
>+    bool *clearStencil,
>+    bool *maskColor,
>+    bool *maskDepth,
>+    bool *maskStencil,
>+    bool *scissor)
>+{
>+    int colorClearInfo   = std::get<1>(params);
>+    int depthClearInfo   = std::get<2>(params);
>+    int stencilClearInfo = std::get<3>(params);
>+
>+    *clearColor   = colorClearInfo > 0;
>+    *clearDepth   = depthClearInfo > 0;
>+    *clearStencil = stencilClearInfo > 0;
>+
>+    *maskColor   = colorClearInfo > 1;
>+    *maskDepth   = depthClearInfo > 1;
>+    *maskStencil = stencilClearInfo > 1;
>+
>+    *scissor = std::get<4>(params);
>+}
>+
>+std::string MaskedScissoredClearVariationsTestPrint(
>+    const ::testing::TestParamInfo<MaskedScissoredClearVariationsTestParams> &paramsInfo)
>+{
>+    const MaskedScissoredClearVariationsTestParams &params = paramsInfo.param;
>+    std::ostringstream out;
> 
>-            void main()
>-            {
>-                gl_Position = position;
>-            })";
>+    out << std::get<0>(params);
> 
>-        const std::string fragmentShaderSource =
>-            R"(precision highp float;
>+    bool clearColor, clearDepth, clearStencil;
>+    bool maskColor, maskDepth, maskStencil;
>+    bool scissor;
> 
>-            void main()
>-            {
>-                gl_FragColor = vec4(1.0, 0.0, 0.0, 1.0);
>-            })";
>+    ParseMaskedScissoredClearVariationsTestParams(params, &clearColor, &clearDepth, &clearStencil,
>+                                                  &maskColor, &maskDepth, &maskStencil, &scissor);
> 
>-        mProgram = CompileProgram(vertexShaderSource, fragmentShaderSource);
>-        ASSERT_NE(0u, mProgram);
>+    if (scissor)
>+    {
>+        out << "_scissored";
>     }
> 
>-    GLuint mProgram;
>-    std::vector<GLuint> mFBOs;
>-    std::vector<GLuint> mTextures;
>+    if (clearColor || clearDepth || clearStencil)
>+    {
>+        out << "_clear_";
>+        if (clearColor)
>+        {
>+            out << "c";
>+        }
>+        if (clearDepth)
>+        {
>+            out << "d";
>+        }
>+        if (clearStencil)
>+        {
>+            out << "s";
>+        }
>+    }
>+
>+    if (maskColor || maskDepth || maskStencil)
>+    {
>+        out << "_mask_";
>+        if (maskColor)
>+        {
>+            out << "c";
>+        }
>+        if (maskDepth)
>+        {
>+            out << "d";
>+        }
>+        if (maskStencil)
>+        {
>+            out << "s";
>+        }
>+    }
>+
>+    return out.str();
>+}
>+
>+class MaskedScissoredClearTestBase
>+    : public ANGLETestWithParam<MaskedScissoredClearVariationsTestParams>
>+{
>+  protected:
>+    MaskedScissoredClearTestBase()
>+    {
>+        setWindowWidth(128);
>+        setWindowHeight(128);
>+        setConfigRedBits(8);
>+        setConfigGreenBits(8);
>+        setConfigBlueBits(8);
>+        setConfigAlphaBits(8);
>+        setConfigDepthBits(24);
>+        setConfigStencilBits(8);
>+    }
>+
>+    void MaskedScissoredColorDepthStencilClear(
>+        const MaskedScissoredClearVariationsTestParams &params);
>+
>+    bool mHasDepth   = true;
>+    bool mHasStencil = true;
> };
> 
>-class ClearTest : public ClearTestBase {};
>-class ClearTestES3 : public ClearTestBase {};
>+class MaskedScissoredClearTest : public MaskedScissoredClearTestBase
>+{};
>+
>+class VulkanClearTest : public MaskedScissoredClearTestBase
>+{
>+  protected:
>+    void SetUp() override
>+    {
>+        ANGLETestWithParam::SetUp();
>+
>+        glBindTexture(GL_TEXTURE_2D, mColorTexture);
>+        glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, getWindowWidth(), getWindowHeight(), 0, GL_RGBA,
>+                     GL_UNSIGNED_BYTE, nullptr);
>+
>+        // Setup Color/Stencil FBO with a stencil format that's emulated with packed depth/stencil.
>+        glBindFramebuffer(GL_FRAMEBUFFER, mColorStencilFBO);
>+
>+        glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, mColorTexture,
>+                               0);
>+        glBindRenderbuffer(GL_RENDERBUFFER, mStencilTexture);
>+        glRenderbufferStorage(GL_RENDERBUFFER, GL_STENCIL_INDEX8, getWindowWidth(),
>+                              getWindowHeight());
>+        glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_STENCIL_ATTACHMENT, GL_RENDERBUFFER,
>+                                  mStencilTexture);
>+
>+        ASSERT_GL_NO_ERROR();
>+
>+        // Note: GL_DEPTH_COMPONENT24 is not allowed in GLES2.
>+        if (getClientMajorVersion() >= 3)
>+        {
>+            // Setup Color/Depth FBO with a depth format that's emulated with packed depth/stencil.
>+            glBindFramebuffer(GL_FRAMEBUFFER, mColorDepthFBO);
>+
>+            glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D,
>+                                   mColorTexture, 0);
>+            glBindRenderbuffer(GL_RENDERBUFFER, mDepthTexture);
>+            glRenderbufferStorage(GL_RENDERBUFFER, GL_DEPTH_COMPONENT24, getWindowWidth(),
>+                                  getWindowHeight());
>+            glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, GL_RENDERBUFFER,
>+                                      mDepthTexture);
>+        }
>+
>+        ASSERT_GL_NO_ERROR();
>+    }
>+
>+    void bindColorStencilFBO()
>+    {
>+        glBindFramebuffer(GL_FRAMEBUFFER, mColorStencilFBO);
>+        mHasDepth = false;
>+    }
>+
>+    void bindColorDepthFBO()
>+    {
>+        glBindFramebuffer(GL_FRAMEBUFFER, mColorDepthFBO);
>+        mHasStencil = false;
>+    }
>+
>+    // Override a feature to force emulation of stencil-only and depth-only formats with a packed
>+    // depth/stencil format
>+    void overrideFeaturesVk(FeaturesVk *featuresVk) override
>+    {
>+        featuresVk->forceFallbackFormat = true;
>+    }
>+
>+  private:
>+    GLFramebuffer mColorStencilFBO;
>+    GLFramebuffer mColorDepthFBO;
>+    GLTexture mColorTexture;
>+    GLRenderbuffer mDepthTexture;
>+    GLRenderbuffer mStencilTexture;
>+};
> 
> // Test clearing the default framebuffer
> TEST_P(ClearTest, DefaultFramebuffer)
>@@ -112,13 +326,40 @@ TEST_P(ClearTest, DefaultFramebuffer)
>     EXPECT_PIXEL_NEAR(0, 0, 64, 128, 128, 128, 1.0);
> }
> 
>+// Test clearing the default framebuffer with scissor and mask
>+// This forces down path that uses draw to do clear
>+TEST_P(ClearTest, EmptyScissor)
>+{
>+    // These configs have bug that fails this test.
>+    // These configs are unmaintained so skipping.
>+    ANGLE_SKIP_TEST_IF(IsIntel() && IsD3D9());
>+    ANGLE_SKIP_TEST_IF(IsOSX());
>+    glClearColor(0.25f, 0.5f, 0.5f, 1.0f);
>+    glClear(GL_COLOR_BUFFER_BIT);
>+    glEnable(GL_SCISSOR_TEST);
>+    glScissor(-10, 0, 5, 5);
>+    glClearColor(0.5f, 0.25f, 0.75f, 0.5f);
>+    glColorMask(GL_TRUE, GL_FALSE, GL_TRUE, GL_TRUE);
>+    glClear(GL_COLOR_BUFFER_BIT);
>+    glDisable(GL_SCISSOR_TEST);
>+    glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE);
>+    EXPECT_PIXEL_NEAR(0, 0, 64, 128, 128, 255, 1.0);
>+}
>+
>+// Test clearing the RGB default framebuffer and verify that the alpha channel is not cleared
>+TEST_P(ClearTestRGB, DefaultFramebufferRGB)
>+{
>+    glClearColor(0.25f, 0.5f, 0.5f, 0.5f);
>+    glClear(GL_COLOR_BUFFER_BIT);
>+    EXPECT_PIXEL_NEAR(0, 0, 64, 128, 128, 255, 1.0);
>+}
>+
> // Test clearing a RGBA8 Framebuffer
> TEST_P(ClearTest, RGBA8Framebuffer)
> {
>     glBindFramebuffer(GL_FRAMEBUFFER, mFBOs[0]);
> 
>-    GLuint texture;
>-    glGenTextures(1, &texture);
>+    GLTexture texture;
> 
>     glBindTexture(GL_TEXTURE_2D, texture);
>     glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, getWindowWidth(), getWindowHeight(), 0, GL_RGBA,
>@@ -131,15 +372,93 @@ TEST_P(ClearTest, RGBA8Framebuffer)
>     EXPECT_PIXEL_NEAR(0, 0, 128, 128, 128, 128, 1.0);
> }
> 
>-TEST_P(ClearTest, ClearIssue)
>+// Test to validate that we can go from an RGBA framebuffer attachment, to an RGB one and still
>+// have a correct behavior after.
>+TEST_P(ClearTest, ChangeFramebufferAttachmentFromRGBAtoRGB)
> {
>-    // TODO(geofflang): Figure out why this is broken on Intel OpenGL
>-    if (IsIntel() && getPlatformRenderer() == EGL_PLATFORM_ANGLE_TYPE_OPENGL_ANGLE)
>-    {
>-        std::cout << "Test skipped on Intel OpenGL." << std::endl;
>-        return;
>-    }
>+    // http://anglebug.com/2689
>+    ANGLE_SKIP_TEST_IF(IsD3D9() || IsD3D11() || (IsOzone() && IsOpenGLES()));
>+    ANGLE_SKIP_TEST_IF(IsOSX() && (IsNVIDIA() || IsIntel()) && IsDesktopOpenGL());
>+    ANGLE_SKIP_TEST_IF(IsAndroid() && IsAdreno() && IsOpenGLES());
>+
>+    ANGLE_GL_PROGRAM(program, angle::essl1_shaders::vs::Simple(),
>+                     angle::essl1_shaders::fs::UniformColor());
>+    setupQuadVertexBuffer(0.5f, 1.0f);
>+    glUseProgram(program);
>+    GLint positionLocation = glGetAttribLocation(program, angle::essl1_shaders::PositionAttrib());
>+    ASSERT_NE(positionLocation, -1);
>+    glVertexAttribPointer(positionLocation, 3, GL_FLOAT, GL_FALSE, 0, nullptr);
>+    glEnableVertexAttribArray(positionLocation);
>+
>+    GLint colorUniformLocation =
>+        glGetUniformLocation(program, angle::essl1_shaders::ColorUniform());
>+    ASSERT_NE(colorUniformLocation, -1);
>+
>+    glUniform4f(colorUniformLocation, 1.0f, 1.0f, 1.0f, 0.5f);
>+
>+    glBindFramebuffer(GL_FRAMEBUFFER, mFBOs[0]);
>+
>+    GLTexture texture;
>+    glColorMask(GL_TRUE, GL_FALSE, GL_TRUE, GL_TRUE);
>+
>+    glBindTexture(GL_TEXTURE_2D, texture);
>+    glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, getWindowWidth(), getWindowHeight(), 0, GL_RGBA,
>+                 GL_UNSIGNED_BYTE, nullptr);
>+    glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, texture, 0);
>+
>+    glClearColor(0.5f, 0.5f, 0.5f, 0.75f);
>+    glClear(GL_COLOR_BUFFER_BIT);
>+    ASSERT_GL_NO_ERROR();
>+
>+    // So far so good, we have an RGBA framebuffer that we've cleared to 0.5 everywhere.
>+    EXPECT_PIXEL_NEAR(0, 0, 128, 0, 128, 192, 1.0);
>+
>+    // In the Vulkan backend, RGB textures are emulated with an RGBA texture format
>+    // underneath and we keep a special mask to know that we shouldn't touch the alpha
>+    // channel when we have that emulated texture. This test exists to validate that
>+    // this mask gets updated correctly when the framebuffer attachment changes.
>+    glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB, getWindowWidth(), getWindowHeight(), 0, GL_RGB,
>+                 GL_UNSIGNED_BYTE, nullptr);
>+    glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, texture, 0);
>+    ASSERT_GL_NO_ERROR();
>+
>+    glDrawArrays(GL_TRIANGLES, 0, 6);
>+    ASSERT_GL_NO_ERROR();
>+
>+    EXPECT_PIXEL_RECT_EQ(0, 0, getWindowWidth(), getWindowHeight(), GLColor::magenta);
>+}
>+
>+// Test clearing a RGB8 Framebuffer with a color mask.
>+TEST_P(ClearTest, RGB8WithMaskFramebuffer)
>+{
>+    glBindFramebuffer(GL_FRAMEBUFFER, mFBOs[0]);
>+
>+    GLTexture texture;
>+
>+    glBindTexture(GL_TEXTURE_2D, texture);
>+    glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB, getWindowWidth(), getWindowHeight(), 0, GL_RGB,
>+                 GL_UNSIGNED_BYTE, nullptr);
>+    glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, texture, 0);
>+
>+    glClearColor(0.2f, 0.4f, 0.6f, 0.8f);
>+    glClear(GL_COLOR_BUFFER_BIT);
>+
>+    // Since there's no alpha, we expect to get 255 back instead of the clear value (204).
>+    EXPECT_PIXEL_NEAR(0, 0, 51, 102, 153, 255, 1.0);
>+
>+    glColorMask(GL_TRUE, GL_TRUE, GL_FALSE, GL_TRUE);
>+    glClearColor(0.1f, 0.3f, 0.5f, 0.7f);
>+    glClear(GL_COLOR_BUFFER_BIT);
>+
>+    // The blue channel was masked so its value should be unchanged.
>+    EXPECT_PIXEL_NEAR(0, 0, 26, 77, 153, 255, 1.0);
> 
>+    // Restore default.
>+    glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE);
>+}
>+
>+TEST_P(ClearTest, ClearIssue)
>+{
>     glEnable(GL_DEPTH_TEST);
>     glDepthFunc(GL_LEQUAL);
> 
>@@ -151,8 +470,7 @@ TEST_P(ClearTest, ClearIssue)
> 
>     glBindFramebuffer(GL_FRAMEBUFFER, mFBOs[0]);
> 
>-    GLuint rbo;
>-    glGenRenderbuffers(1, &rbo);
>+    GLRenderbuffer rbo;
>     glBindRenderbuffer(GL_RENDERBUFFER, rbo);
>     glRenderbufferStorage(GL_RENDERBUFFER, GL_RGB565, 16, 16);
> 
>@@ -171,23 +489,516 @@ TEST_P(ClearTest, ClearIssue)
>     glBindFramebuffer(GL_FRAMEBUFFER, 0);
>     glBindBuffer(GL_ARRAY_BUFFER, 0);
> 
>-    setupDefaultProgram();
>-    drawQuad(mProgram, "position", 0.5f);
>+    ANGLE_GL_PROGRAM(blueProgram, essl1_shaders::vs::Simple(), essl1_shaders::fs::Blue());
>+    drawQuad(blueProgram, essl1_shaders::PositionAttrib(), 0.5f);
>+
>+    EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::green);
>+}
>+
>+// Regression test for a bug where "glClearDepthf"'s argument was not clamped
>+// In GLES 2 they where declared as GLclampf and the behaviour is the same in GLES 3.2
>+TEST_P(ClearTest, ClearIsClamped)
>+{
>+    glClearDepthf(5.0f);
>+
>+    GLfloat clear_depth;
>+    glGetFloatv(GL_DEPTH_CLEAR_VALUE, &clear_depth);
>+    EXPECT_EQ(1.0f, clear_depth);
>+}
>+
>+// Regression test for a bug where "glDepthRangef"'s arguments were not clamped
>+// In GLES 2 they where declared as GLclampf and the behaviour is the same in GLES 3.2
>+TEST_P(ClearTest, DepthRangefIsClamped)
>+{
>+    glDepthRangef(1.1f, -4.0f);
>+
>+    GLfloat depth_range[2];
>+    glGetFloatv(GL_DEPTH_RANGE, depth_range);
>+    EXPECT_EQ(1.0f, depth_range[0]);
>+    EXPECT_EQ(0.0f, depth_range[1]);
>+}
>+
>+// Test scissored clears on Depth16
>+TEST_P(ClearTest, Depth16Scissored)
>+{
>+    // Crashes on NVIDIA and Android in FramebufferVk::clearWithClearAttachments.
>+    // http://anglebug.com/3081
>+    ANGLE_SKIP_TEST_IF(IsNVIDIA() || IsAndroid() || IsFuchsia());
>+
>+    GLRenderbuffer renderbuffer;
>+    glBindRenderbuffer(GL_RENDERBUFFER, renderbuffer);
>+    constexpr int kRenderbufferSize = 64;
>+    glRenderbufferStorage(GL_RENDERBUFFER, GL_DEPTH_COMPONENT16, kRenderbufferSize,
>+                          kRenderbufferSize);
>+
>+    GLFramebuffer fbo;
>+    glBindFramebuffer(GL_FRAMEBUFFER, fbo);
>+    glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, GL_RENDERBUFFER, renderbuffer);
>+
>+    glClearDepthf(0.0f);
>+    glClear(GL_DEPTH_BUFFER_BIT);
>+
>+    glEnable(GL_SCISSOR_TEST);
>+    constexpr int kNumSteps = 13;
>+    for (int ndx = 1; ndx < kNumSteps; ndx++)
>+    {
>+        float perc = static_cast<float>(ndx) / static_cast<float>(kNumSteps);
>+        glScissor(0, 0, static_cast<int>(kRenderbufferSize * perc),
>+                  static_cast<int>(kRenderbufferSize * perc));
>+        glClearDepthf(perc);
>+        glClear(GL_DEPTH_BUFFER_BIT);
>+    }
>+}
>+
>+// Test scissored clears on Stencil8
>+TEST_P(ClearTest, Stencil8Scissored)
>+{
>+    // Crashes on NVIDIA and Android in FramebufferVk::clearWithClearAttachments.
>+    // http://anglebug.com/3081
>+    ANGLE_SKIP_TEST_IF(IsNVIDIA() || IsAndroid() || IsFuchsia());
>+
>+    GLRenderbuffer renderbuffer;
>+    glBindRenderbuffer(GL_RENDERBUFFER, renderbuffer);
>+    constexpr int kRenderbufferSize = 64;
>+    glRenderbufferStorage(GL_RENDERBUFFER, GL_STENCIL_INDEX8, kRenderbufferSize, kRenderbufferSize);
>+
>+    GLFramebuffer fbo;
>+    glBindFramebuffer(GL_FRAMEBUFFER, fbo);
>+    glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_STENCIL_ATTACHMENT, GL_RENDERBUFFER, renderbuffer);
>+
>+    glClearStencil(0);
>+    glClear(GL_STENCIL_BUFFER_BIT);
>+
>+    glEnable(GL_SCISSOR_TEST);
>+    constexpr int kNumSteps = 13;
>+    for (int ndx = 1; ndx < kNumSteps; ndx++)
>+    {
>+        float perc = static_cast<float>(ndx) / static_cast<float>(kNumSteps);
>+        glScissor(0, 0, static_cast<int>(kRenderbufferSize * perc),
>+                  static_cast<int>(kRenderbufferSize * perc));
>+        glClearStencil(static_cast<int>(perc * 255.0f));
>+        glClear(GL_STENCIL_BUFFER_BIT);
>+    }
>+}
>+
>+// Covers a bug in the Vulkan back-end where starting a new command buffer in
>+// the masked clear would not trigger descriptor sets to be re-bound.
>+TEST_P(ClearTest, MaskedClearThenDrawWithUniform)
>+{
>+    // Initialize a program with a uniform.
>+    ANGLE_GL_PROGRAM(program, essl1_shaders::vs::Simple(), essl1_shaders::fs::UniformColor());
>+    glUseProgram(program);
>+
>+    GLint uniLoc = glGetUniformLocation(program, essl1_shaders::ColorUniform());
>+    ASSERT_NE(-1, uniLoc);
>+    glUniform4f(uniLoc, 0.0f, 1.0f, 0.0f, 1.0f);
>+
>+    // Initialize position attribute.
>+    GLint posLoc = glGetAttribLocation(program, essl1_shaders::PositionAttrib());
>+    ASSERT_NE(-1, posLoc);
>+    setupQuadVertexBuffer(0.5f, 1.0f);
>+    glVertexAttribPointer(posLoc, 3, GL_FLOAT, GL_FALSE, 0, nullptr);
>+    glEnableVertexAttribArray(posLoc);
>+
>+    // Initialize a simple FBO.
>+    constexpr GLsizei kSize = 2;
>+    GLTexture clearTexture;
>+    glBindTexture(GL_TEXTURE_2D, clearTexture);
>+    glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, kSize, kSize, 0, GL_RGBA, GL_UNSIGNED_BYTE, nullptr);
>+
>+    GLFramebuffer fbo;
>+    glBindFramebuffer(GL_FRAMEBUFFER, fbo);
>+    glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, clearTexture, 0);
>+
>+    glViewport(0, 0, kSize, kSize);
>+
>+    // Clear and draw to flush out dirty bits.
>+    glClearColor(0.0f, 0.0f, 0.0f, 1.0f);
>+    glClear(GL_COLOR_BUFFER_BIT);
> 
>-    EXPECT_PIXEL_EQ(0, 0, 0, 255, 0, 255);
>+    glDrawArrays(GL_TRIANGLES, 0, 6);
>+
>+    // Flush to trigger a new serial.
>+    glFlush();
>+
>+    // Enable color mask and draw again to trigger the bug.
>+    glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_FALSE);
>+    glClearColor(1.0f, 0.0f, 0.0f, 0.0f);
>+    glClear(GL_COLOR_BUFFER_BIT);
>+
>+    glDrawArrays(GL_TRIANGLES, 0, 6);
>+
>+    ASSERT_GL_NO_ERROR();
>+    EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::green);
>+}
>+
>+// Test that clearing all buffers through glClearColor followed by a clear of a specific buffer
>+// clears to the correct values.
>+TEST_P(ClearTestES3, ClearMultipleAttachmentsFollowedBySpecificOne)
>+{
>+    constexpr uint32_t kSize            = 16;
>+    constexpr uint32_t kAttachmentCount = 5;
>+    std::vector<unsigned char> pixelData(kSize * kSize * 4, 255);
>+
>+    glBindFramebuffer(GL_FRAMEBUFFER, mFBOs[0]);
>+
>+    GLTexture textures[kAttachmentCount];
>+    GLenum drawBuffers[kAttachmentCount];
>+    GLColor clearValues[kAttachmentCount];
>+
>+    for (uint32_t i = 0; i < kAttachmentCount; ++i)
>+    {
>+        glBindTexture(GL_TEXTURE_2D, textures[i]);
>+        glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, kSize, kSize, 0, GL_RGBA, GL_UNSIGNED_BYTE,
>+                     pixelData.data());
>+        glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0 + i, GL_TEXTURE_2D, textures[i],
>+                               0);
>+        drawBuffers[i] = GL_COLOR_ATTACHMENT0 + i;
>+
>+        clearValues[i].R = static_cast<GLubyte>(1 + i * 20);
>+        clearValues[i].G = static_cast<GLubyte>(7 + i * 20);
>+        clearValues[i].B = static_cast<GLubyte>(12 + i * 20);
>+        clearValues[i].A = static_cast<GLubyte>(16 + i * 20);
>+    }
>+
>+    glDrawBuffers(kAttachmentCount, drawBuffers);
>+
>+    ASSERT_GL_NO_ERROR();
>+    EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::white);
>+
>+    // Clear all targets.
>+    angle::Vector4 clearColor = clearValues[0].toNormalizedVector();
>+    glClearColor(clearColor[0], clearColor[1], clearColor[2], clearColor[3]);
>+    glClear(GL_COLOR_BUFFER_BIT);
>+    ASSERT_GL_NO_ERROR();
>+
>+    // Clear odd targets individually.
>+    for (uint32_t i = 1; i < kAttachmentCount; i += 2)
>+    {
>+        clearColor = clearValues[i].toNormalizedVector();
>+        glClearBufferfv(GL_COLOR, i, clearColor.data());
>+    }
>+
>+    // Even attachments should be cleared to color 0, while odd attachments are cleared to their
>+    // respective color.
>+    for (uint32_t i = 0; i < kAttachmentCount; ++i)
>+    {
>+        glReadBuffer(GL_COLOR_ATTACHMENT0 + i);
>+        ASSERT_GL_NO_ERROR();
>+
>+        uint32_t clearIndex   = i % 2 == 0 ? 0 : i;
>+        const GLColor &expect = clearValues[clearIndex];
>+
>+        EXPECT_PIXEL_COLOR_EQ(0, 0, expect);
>+        EXPECT_PIXEL_COLOR_EQ(0, kSize - 1, expect);
>+        EXPECT_PIXEL_COLOR_EQ(kSize - 1, 0, expect);
>+        EXPECT_PIXEL_COLOR_EQ(kSize - 1, kSize - 1, expect);
>+    }
>+}
>+
>+// Test that clearing each render target individually works.  In the Vulkan backend, this should be
>+// done in a single render pass.
>+TEST_P(ClearTestES3, ClearMultipleAttachmentsIndividually)
>+{
>+    constexpr uint32_t kSize             = 16;
>+    constexpr uint32_t kAttachmentCount  = 2;
>+    constexpr float kDepthClearValue     = 0.125f;
>+    constexpr int32_t kStencilClearValue = 0x67;
>+    std::vector<unsigned char> pixelData(kSize * kSize * 4, 255);
>+
>+    glBindFramebuffer(GL_FRAMEBUFFER, mFBOs[0]);
>+
>+    GLTexture textures[kAttachmentCount];
>+    GLRenderbuffer depthStencil;
>+    GLenum drawBuffers[kAttachmentCount];
>+    GLColor clearValues[kAttachmentCount];
>+
>+    for (uint32_t i = 0; i < kAttachmentCount; ++i)
>+    {
>+        glBindTexture(GL_TEXTURE_2D, textures[i]);
>+        glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, kSize, kSize, 0, GL_RGBA, GL_UNSIGNED_BYTE,
>+                     pixelData.data());
>+        glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0 + i, GL_TEXTURE_2D, textures[i],
>+                               0);
>+        drawBuffers[i] = GL_COLOR_ATTACHMENT0 + i;
>+
>+        clearValues[i].R = static_cast<GLubyte>(1 + i * 20);
>+        clearValues[i].G = static_cast<GLubyte>(7 + i * 20);
>+        clearValues[i].B = static_cast<GLubyte>(12 + i * 20);
>+        clearValues[i].A = static_cast<GLubyte>(16 + i * 20);
>+    }
>+
>+    glBindRenderbuffer(GL_RENDERBUFFER, depthStencil);
>+    glRenderbufferStorage(GL_RENDERBUFFER, GL_DEPTH24_STENCIL8, kSize, kSize);
>+    glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_DEPTH_STENCIL_ATTACHMENT, GL_RENDERBUFFER,
>+                              depthStencil);
>+
>+    glDrawBuffers(kAttachmentCount, drawBuffers);
>+
>+    ASSERT_GL_NO_ERROR();
>+    EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::white);
>+
>+    for (uint32_t i = 0; i < kAttachmentCount; ++i)
>+    {
>+        glClearBufferfv(GL_COLOR, i, clearValues[i].toNormalizedVector().data());
>+    }
>+
>+    glClearBufferfv(GL_DEPTH, 0, &kDepthClearValue);
>+    glClearBufferiv(GL_STENCIL, 0, &kStencilClearValue);
>+    ASSERT_GL_NO_ERROR();
>+
>+    for (uint32_t i = 0; i < kAttachmentCount; ++i)
>+    {
>+        glReadBuffer(GL_COLOR_ATTACHMENT0 + i);
>+        ASSERT_GL_NO_ERROR();
>+
>+        const GLColor &expect = clearValues[i];
>+
>+        EXPECT_PIXEL_COLOR_EQ(0, 0, expect);
>+        EXPECT_PIXEL_COLOR_EQ(0, kSize - 1, expect);
>+        EXPECT_PIXEL_COLOR_EQ(kSize - 1, 0, expect);
>+        EXPECT_PIXEL_COLOR_EQ(kSize - 1, kSize - 1, expect);
>+    }
>+
>+    glReadBuffer(GL_COLOR_ATTACHMENT0);
>+    for (uint32_t i = 1; i < kAttachmentCount; ++i)
>+        drawBuffers[i] = GL_NONE;
>+    glDrawBuffers(kAttachmentCount, drawBuffers);
>+
>+    verifyDepth(kDepthClearValue, kSize);
>+    verifyStencil(kStencilClearValue, kSize);
>+}
>+
>+// Test that clearing multiple attachments in the presence of a color mask, scissor or both
>+// correctly clears all the attachments.
>+TEST_P(ClearTestES3, MaskedScissoredClearMultipleAttachments)
>+{
>+    constexpr uint32_t kSize            = 16;
>+    constexpr uint32_t kAttachmentCount = 2;
>+    std::vector<unsigned char> pixelData(kSize * kSize * 4, 255);
>+
>+    glBindFramebuffer(GL_FRAMEBUFFER, mFBOs[0]);
>+
>+    GLTexture textures[kAttachmentCount];
>+    GLenum drawBuffers[kAttachmentCount];
>+
>+    for (uint32_t i = 0; i < kAttachmentCount; ++i)
>+    {
>+        glBindTexture(GL_TEXTURE_2D, textures[i]);
>+        glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, kSize, kSize, 0, GL_RGBA, GL_UNSIGNED_BYTE,
>+                     pixelData.data());
>+        glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0 + i, GL_TEXTURE_2D, textures[i],
>+                               0);
>+        drawBuffers[i] = GL_COLOR_ATTACHMENT0 + i;
>+    }
>+
>+    glDrawBuffers(kAttachmentCount, drawBuffers);
>+
>+    ASSERT_GL_NO_ERROR();
>+    EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::white);
>+
>+    // Masked clear
>+    GLColor clearColorMasked(31, 63, 255, 191);
>+    angle::Vector4 clearColor = GLColor(31, 63, 127, 191).toNormalizedVector();
>+
>+    glColorMask(GL_TRUE, GL_TRUE, GL_FALSE, GL_TRUE);
>+    glClearColor(clearColor[0], clearColor[1], clearColor[2], clearColor[3]);
>+    glClear(GL_COLOR_BUFFER_BIT);
>+    ASSERT_GL_NO_ERROR();
>+
>+    // All attachments should be cleared, with the blue channel untouched
>+    for (uint32_t i = 0; i < kAttachmentCount; ++i)
>+    {
>+        glReadBuffer(GL_COLOR_ATTACHMENT0 + i);
>+        ASSERT_GL_NO_ERROR();
>+
>+        EXPECT_PIXEL_COLOR_EQ(0, 0, clearColorMasked);
>+        EXPECT_PIXEL_COLOR_EQ(0, kSize - 1, clearColorMasked);
>+        EXPECT_PIXEL_COLOR_EQ(kSize - 1, 0, clearColorMasked);
>+        EXPECT_PIXEL_COLOR_EQ(kSize - 1, kSize - 1, clearColorMasked);
>+        EXPECT_PIXEL_COLOR_EQ(kSize / 2, kSize / 2, clearColorMasked);
>+    }
>+
>+    // Masked scissored clear
>+    GLColor clearColorMaskedScissored(63, 127, 255, 31);
>+    clearColor = GLColor(63, 127, 191, 31).toNormalizedVector();
>+
>+    glClearColor(clearColor[0], clearColor[1], clearColor[2], clearColor[3]);
>+    glEnable(GL_SCISSOR_TEST);
>+    glScissor(kSize / 6, kSize / 6, kSize / 3, kSize / 3);
>+    glClear(GL_COLOR_BUFFER_BIT);
>+    ASSERT_GL_NO_ERROR();
>+
>+    // The corners should keep the previous value while the center is cleared, except its blue
>+    // channel.
>+    for (uint32_t i = 0; i < kAttachmentCount; ++i)
>+    {
>+        glReadBuffer(GL_COLOR_ATTACHMENT0 + i);
>+        ASSERT_GL_NO_ERROR();
>+
>+        EXPECT_PIXEL_COLOR_EQ(0, 0, clearColorMasked);
>+        EXPECT_PIXEL_COLOR_EQ(0, kSize - 1, clearColorMasked);
>+        EXPECT_PIXEL_COLOR_EQ(kSize - 1, 0, clearColorMasked);
>+        EXPECT_PIXEL_COLOR_EQ(kSize - 1, kSize - 1, clearColorMasked);
>+        EXPECT_PIXEL_COLOR_EQ(kSize / 3, 2 * kSize / 3, clearColorMasked);
>+        EXPECT_PIXEL_COLOR_EQ(2 * kSize / 3, kSize / 3, clearColorMasked);
>+        EXPECT_PIXEL_COLOR_EQ(2 * kSize / 3, 2 * kSize / 3, clearColorMasked);
>+
>+        EXPECT_PIXEL_COLOR_EQ(kSize / 3, kSize / 3, clearColorMaskedScissored);
>+    }
>+
>+    // Scissored clear
>+    GLColor clearColorScissored(127, 191, 31, 63);
>+    clearColor = GLColor(127, 191, 31, 63).toNormalizedVector();
>+
>+    glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE);
>+    glClearColor(clearColor[0], clearColor[1], clearColor[2], clearColor[3]);
>+    glClear(GL_COLOR_BUFFER_BIT);
>+    ASSERT_GL_NO_ERROR();
>+
>+    // The corners should keep the old value while all channels of the center are cleared.
>+    for (uint32_t i = 0; i < kAttachmentCount; ++i)
>+    {
>+        glReadBuffer(GL_COLOR_ATTACHMENT0 + i);
>+        ASSERT_GL_NO_ERROR();
>+
>+        EXPECT_PIXEL_COLOR_EQ(0, 0, clearColorMasked);
>+        EXPECT_PIXEL_COLOR_EQ(0, kSize - 1, clearColorMasked);
>+        EXPECT_PIXEL_COLOR_EQ(kSize - 1, 0, clearColorMasked);
>+        EXPECT_PIXEL_COLOR_EQ(kSize - 1, kSize - 1, clearColorMasked);
>+        EXPECT_PIXEL_COLOR_EQ(kSize / 3, 2 * kSize / 3, clearColorMasked);
>+        EXPECT_PIXEL_COLOR_EQ(2 * kSize / 3, kSize / 3, clearColorMasked);
>+        EXPECT_PIXEL_COLOR_EQ(2 * kSize / 3, 2 * kSize / 3, clearColorMasked);
>+
>+        EXPECT_PIXEL_COLOR_EQ(kSize / 3, kSize / 3, clearColorScissored);
>+    }
>+}
>+
>+// Test that clearing multiple attachments of different nature (float, int and uint) in the
>+// presence of a color mask works correctly.  In the Vulkan backend, this exercises clearWithDraw
>+// and the relevant internal shaders.
>+TEST_P(ClearTestES3, MaskedClearHeterogeneousAttachments)
>+{
>+    constexpr uint32_t kSize                              = 16;
>+    constexpr uint32_t kAttachmentCount                   = 3;
>+    constexpr float kDepthClearValue                      = 0.256f;
>+    constexpr int32_t kStencilClearValue                  = 0x1D;
>+    constexpr GLenum kAttachmentFormats[kAttachmentCount] = {
>+        GL_RGBA8,
>+        GL_RGBA8I,
>+        GL_RGBA8UI,
>+    };
>+    constexpr GLenum kDataFormats[kAttachmentCount] = {
>+        GL_RGBA,
>+        GL_RGBA_INTEGER,
>+        GL_RGBA_INTEGER,
>+    };
>+    constexpr GLenum kDataTypes[kAttachmentCount] = {
>+        GL_UNSIGNED_BYTE,
>+        GL_BYTE,
>+        GL_UNSIGNED_BYTE,
>+    };
>+
>+    std::vector<unsigned char> pixelData(kSize * kSize * 4, 0);
>+
>+    glBindFramebuffer(GL_FRAMEBUFFER, mFBOs[0]);
>+
>+    GLTexture textures[kAttachmentCount];
>+    GLRenderbuffer depthStencil;
>+    GLenum drawBuffers[kAttachmentCount];
>+
>+    for (uint32_t i = 0; i < kAttachmentCount; ++i)
>+    {
>+        glBindTexture(GL_TEXTURE_2D, textures[i]);
>+        glTexImage2D(GL_TEXTURE_2D, 0, kAttachmentFormats[i], kSize, kSize, 0, kDataFormats[i],
>+                     kDataTypes[i], pixelData.data());
>+        glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0 + i, GL_TEXTURE_2D, textures[i],
>+                               0);
>+        drawBuffers[i] = GL_COLOR_ATTACHMENT0 + i;
>+    }
>+
>+    glBindRenderbuffer(GL_RENDERBUFFER, depthStencil);
>+    glRenderbufferStorage(GL_RENDERBUFFER, GL_DEPTH24_STENCIL8, kSize, kSize);
>+    glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_DEPTH_STENCIL_ATTACHMENT, GL_RENDERBUFFER,
>+                              depthStencil);
>+
>+    glDrawBuffers(kAttachmentCount, drawBuffers);
>+
>+    ASSERT_GL_NO_ERROR();
>+    EXPECT_PIXEL_EQ(0, 0, 0, 0, 0, 0);
>+
>+    // Mask out red for all clears
>+    glColorMask(GL_FALSE, GL_TRUE, GL_TRUE, GL_TRUE);
>+
>+    glClearBufferfv(GL_DEPTH, 0, &kDepthClearValue);
>+    glClearBufferiv(GL_STENCIL, 0, &kStencilClearValue);
>+
>+    GLColor clearValuef = {25, 50, 75, 100};
>+    glClearBufferfv(GL_COLOR, 0, clearValuef.toNormalizedVector().data());
>+
>+    int clearValuei[4] = {10, -20, 30, -40};
>+    glClearBufferiv(GL_COLOR, 1, clearValuei);
>+
>+    uint32_t clearValueui[4] = {50, 60, 70, 80};
>+    glClearBufferuiv(GL_COLOR, 2, clearValueui);
>+
>+    ASSERT_GL_NO_ERROR();
>+
>+    {
>+        glReadBuffer(GL_COLOR_ATTACHMENT0);
>+        ASSERT_GL_NO_ERROR();
>+
>+        GLColor expect = clearValuef;
>+        expect.R       = 0;
>+
>+        EXPECT_PIXEL_COLOR_EQ(0, 0, expect);
>+        EXPECT_PIXEL_COLOR_EQ(0, kSize - 1, expect);
>+        EXPECT_PIXEL_COLOR_EQ(kSize - 1, 0, expect);
>+        EXPECT_PIXEL_COLOR_EQ(kSize - 1, kSize - 1, expect);
>+    }
>+
>+    {
>+        glReadBuffer(GL_COLOR_ATTACHMENT1);
>+        ASSERT_GL_NO_ERROR();
>+
>+        EXPECT_PIXEL_8I(0, 0, 0, clearValuei[1], clearValuei[2], clearValuei[3]);
>+        EXPECT_PIXEL_8I(0, kSize - 1, 0, clearValuei[1], clearValuei[2], clearValuei[3]);
>+        EXPECT_PIXEL_8I(kSize - 1, 0, 0, clearValuei[1], clearValuei[2], clearValuei[3]);
>+        EXPECT_PIXEL_8I(kSize - 1, kSize - 1, 0, clearValuei[1], clearValuei[2], clearValuei[3]);
>+    }
>+
>+    {
>+        glReadBuffer(GL_COLOR_ATTACHMENT2);
>+        ASSERT_GL_NO_ERROR();
>+
>+        EXPECT_PIXEL_8UI(0, 0, 0, clearValueui[1], clearValueui[2], clearValueui[3]);
>+        EXPECT_PIXEL_8UI(0, kSize - 1, 0, clearValueui[1], clearValueui[2], clearValueui[3]);
>+        EXPECT_PIXEL_8UI(kSize - 1, 0, 0, clearValueui[1], clearValueui[2], clearValueui[3]);
>+        EXPECT_PIXEL_8UI(kSize - 1, kSize - 1, 0, clearValueui[1], clearValueui[2],
>+                         clearValueui[3]);
>+    }
>+
>+    glReadBuffer(GL_COLOR_ATTACHMENT0);
>+    for (uint32_t i = 1; i < kAttachmentCount; ++i)
>+        drawBuffers[i] = GL_NONE;
>+    glDrawBuffers(kAttachmentCount, drawBuffers);
>+
>+    verifyDepth(kDepthClearValue, kSize);
>+    verifyStencil(kStencilClearValue, kSize);
> }
> 
>-// Requires ES3
> // This tests a bug where in a masked clear when calling "ClearBuffer", we would
> // mistakenly clear every channel (including the masked-out ones)
> TEST_P(ClearTestES3, MaskedClearBufferBug)
> {
>-    unsigned char pixelData[] = { 255, 255, 255, 255 };
>+    // Vulkan doesn't support gaps in render targets yet.  http://anglebug.com/2394
>+    ANGLE_SKIP_TEST_IF(IsVulkan());
>+
>+    unsigned char pixelData[] = {255, 255, 255, 255};
> 
>     glBindFramebuffer(GL_FRAMEBUFFER, mFBOs[0]);
> 
>-    GLuint textures[2];
>-    glGenTextures(2, &textures[0]);
>+    GLTexture textures[2];
> 
>     glBindTexture(GL_TEXTURE_2D, textures[0]);
>     glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, 1, 1, 0, GL_RGBA, GL_UNSIGNED_BYTE, pixelData);
>@@ -200,8 +1011,8 @@ TEST_P(ClearTestES3, MaskedClearBufferBug)
>     ASSERT_GL_NO_ERROR();
>     EXPECT_PIXEL_EQ(0, 0, 255, 255, 255, 255);
> 
>-    float clearValue[] = { 0, 0.5f, 0.5f, 1.0f };
>-    GLenum drawBuffers[] = { GL_NONE, GL_COLOR_ATTACHMENT1 };
>+    float clearValue[]   = {0, 0.5f, 0.5f, 1.0f};
>+    GLenum drawBuffers[] = {GL_NONE, GL_COLOR_ATTACHMENT1};
>     glDrawBuffers(2, drawBuffers);
>     glColorMask(GL_TRUE, GL_TRUE, GL_FALSE, GL_TRUE);
>     glClearBufferfv(GL_COLOR, 1, clearValue);
>@@ -213,8 +1024,6 @@ TEST_P(ClearTestES3, MaskedClearBufferBug)
>     ASSERT_GL_NO_ERROR();
> 
>     EXPECT_PIXEL_NEAR(0, 0, 0, 127, 255, 255, 1);
>-
>-    glDeleteTextures(2, textures);
> }
> 
> TEST_P(ClearTestES3, BadFBOSerialBug)
>@@ -222,29 +1031,26 @@ TEST_P(ClearTestES3, BadFBOSerialBug)
>     // First make a simple framebuffer, and clear it to green
>     glBindFramebuffer(GL_FRAMEBUFFER, mFBOs[0]);
> 
>-    GLuint textures[2];
>-    glGenTextures(2, &textures[0]);
>+    GLTexture textures[2];
> 
>     glBindTexture(GL_TEXTURE_2D, textures[0]);
>     glTexStorage2D(GL_TEXTURE_2D, 1, GL_RGBA8, getWindowWidth(), getWindowHeight());
>     glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, textures[0], 0);
> 
>-    GLenum drawBuffers[] = { GL_COLOR_ATTACHMENT0 };
>+    GLenum drawBuffers[] = {GL_COLOR_ATTACHMENT0};
>     glDrawBuffers(1, drawBuffers);
> 
>-    float clearValues1[] = { 0.0f, 1.0f, 0.0f, 1.0f };
>+    float clearValues1[] = {0.0f, 1.0f, 0.0f, 1.0f};
>     glClearBufferfv(GL_COLOR, 0, clearValues1);
> 
>     ASSERT_GL_NO_ERROR();
>-    EXPECT_PIXEL_EQ(0, 0, 0, 255, 0, 255);
>+    EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::green);
> 
>     // Next make a second framebuffer, and draw it to red
>     // (Triggers bad applied render target serial)
>-    GLuint fbo2;
>-    glGenFramebuffers(1, &fbo2);
>-    ASSERT_GL_NO_ERROR();
>-
>+    GLFramebuffer fbo2;
>     glBindFramebuffer(GL_FRAMEBUFFER, fbo2);
>+    ASSERT_GL_NO_ERROR();
> 
>     glBindTexture(GL_TEXTURE_2D, textures[1]);
>     glTexStorage2D(GL_TEXTURE_2D, 1, GL_RGBA8, getWindowWidth(), getWindowHeight());
>@@ -252,35 +1058,24 @@ TEST_P(ClearTestES3, BadFBOSerialBug)
> 
>     glDrawBuffers(1, drawBuffers);
> 
>-    setupDefaultProgram();
>-    drawQuad(mProgram, "position", 0.5f);
>+    ANGLE_GL_PROGRAM(blueProgram, essl1_shaders::vs::Simple(), essl1_shaders::fs::Red());
>+    drawQuad(blueProgram, essl1_shaders::PositionAttrib(), 0.5f);
> 
>     ASSERT_GL_NO_ERROR();
>-    EXPECT_PIXEL_EQ(0, 0, 255, 0, 0, 255);
>+    EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::red);
> 
>     // Check that the first framebuffer is still green.
>     glBindFramebuffer(GL_FRAMEBUFFER, mFBOs[0]);
>-    EXPECT_PIXEL_EQ(0, 0, 0, 255, 0, 255);
>-
>-    glDeleteTextures(2, textures);
>-    glDeleteFramebuffers(1, &fbo2);
>+    EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::green);
> }
> 
> // Test that SRGB framebuffers clear to the linearized clear color
> TEST_P(ClearTestES3, SRGBClear)
> {
>-    // TODO(jmadill): figure out why this fails
>-    if (IsIntel() && GetParam() == ES3_OPENGL())
>-    {
>-        std::cout << "Test skipped on Intel due to failures." << std::endl;
>-        return;
>-    }
>-
>     // First make a simple framebuffer, and clear it
>     glBindFramebuffer(GL_FRAMEBUFFER, mFBOs[0]);
> 
>-    GLuint texture;
>-    glGenTextures(1, &texture);
>+    GLTexture texture;
> 
>     glBindTexture(GL_TEXTURE_2D, texture);
>     glTexStorage2D(GL_TEXTURE_2D, 1, GL_SRGB8_ALPHA8, getWindowWidth(), getWindowHeight());
>@@ -296,26 +1091,9 @@ TEST_P(ClearTestES3, SRGBClear)
> // attachment
> TEST_P(ClearTestES3, MixedSRGBClear)
> {
>-    // TODO(cwallez) figure out why it is broken on Intel on Mac
>-#if defined(ANGLE_PLATFORM_APPLE)
>-    if (IsIntel() && getPlatformRenderer() == EGL_PLATFORM_ANGLE_TYPE_OPENGL_ANGLE)
>-    {
>-        std::cout << "Test skipped on Intel on Mac." << std::endl;
>-        return;
>-    }
>-#endif
>-
>-    // TODO(jmadill): figure out why this fails
>-    if (IsIntel() && GetParam() == ES3_OPENGL())
>-    {
>-        std::cout << "Test skipped on Intel due to failures." << std::endl;
>-        return;
>-    }
>-
>     glBindFramebuffer(GL_FRAMEBUFFER, mFBOs[0]);
> 
>-    GLuint textures[2];
>-    glGenTextures(2, &textures[0]);
>+    GLTexture textures[2];
> 
>     glBindTexture(GL_TEXTURE_2D, textures[0]);
>     glTexStorage2D(GL_TEXTURE_2D, 1, GL_SRGB8_ALPHA8, getWindowWidth(), getWindowHeight());
>@@ -351,7 +1129,10 @@ TEST_P(ClearTestES3, MixedSRGBClear)
> // flush or finish after ClearBufferfv or each draw.
> TEST_P(ClearTestES3, RepeatedClear)
> {
>-    const std::string &vertexSource =
>+    // ES3 shaders are not yet supported on Vulkan.
>+    ANGLE_SKIP_TEST_IF(IsVulkan());
>+
>+    constexpr char kVS[] =
>         "#version 300 es\n"
>         "in highp vec2 position;\n"
>         "out highp vec2 v_coord;\n"
>@@ -362,7 +1143,7 @@ TEST_P(ClearTestES3, RepeatedClear)
>         "    v_coord = texCoord;\n"
>         "}\n";
> 
>-    const std::string &fragmentSource =
>+    constexpr char kFS[] =
>         "#version 300 es\n"
>         "in highp vec2 v_coord;\n"
>         "out highp vec4 color;\n"
>@@ -372,8 +1153,7 @@ TEST_P(ClearTestES3, RepeatedClear)
>         "    color = texture(tex, v_coord);\n"
>         "}\n";
> 
>-    mProgram = CompileProgram(vertexSource, fragmentSource);
>-    ASSERT_NE(0u, mProgram);
>+    ANGLE_GL_PROGRAM(program, kVS, kFS);
> 
>     mTextures.resize(1, 0);
>     glGenTextures(1, mTextures.data());
>@@ -401,16 +1181,16 @@ TEST_P(ClearTestES3, RepeatedClear)
>     ASSERT_GLENUM_EQ(GL_FRAMEBUFFER_COMPLETE, glCheckFramebufferStatus(GL_FRAMEBUFFER));
> 
>     // larger fbo bound -- clear to transparent black
>-    glUseProgram(mProgram);
>-    GLint uniLoc = glGetUniformLocation(mProgram, "tex");
>+    glUseProgram(program);
>+    GLint uniLoc = glGetUniformLocation(program, "tex");
>     ASSERT_NE(-1, uniLoc);
>     glUniform1i(uniLoc, 0);
>     glBindTexture(GL_TEXTURE_2D, mTextures[0]);
> 
>-    GLint positionLocation = glGetAttribLocation(mProgram, "position");
>+    GLint positionLocation = glGetAttribLocation(program, "position");
>     ASSERT_NE(-1, positionLocation);
> 
>-    glUseProgram(mProgram);
>+    glUseProgram(program);
> 
>     for (int cellY = 0; cellY < numRowsCols; cellY++)
>     {
>@@ -426,7 +1206,7 @@ TEST_P(ClearTestES3, RepeatedClear)
> 
>             // Method 1: Set viewport and draw full-viewport quad
>             glViewport(cellX * cellSize, cellY * cellSize, cellSize, cellSize);
>-            drawQuad(mProgram, "position", 0.5f);
>+            drawQuad(program, "position", 0.5f);
> 
>             // Uncommenting the glFinish call seems to make the test pass.
>             // glFinish();
>@@ -444,7 +1224,7 @@ TEST_P(ClearTestES3, RepeatedClear)
>             const Vector4 color   = RandomVec4(seed, fmtValueMin, fmtValueMax);
>             GLColor expectedColor = Vec4ToColor(color);
> 
>-            int testN           = cellX * cellSize + cellY * backFBOSize * cellSize + backFBOSize + 1;
>+            int testN = cellX * cellSize + cellY * backFBOSize * cellSize + backFBOSize + 1;
>             GLColor actualColor = pixelData[testN];
>             EXPECT_NEAR(expectedColor.R, actualColor.R, 1);
>             EXPECT_NEAR(expectedColor.G, actualColor.G, 1);
>@@ -456,7 +1236,241 @@ TEST_P(ClearTestES3, RepeatedClear)
>     ASSERT_GL_NO_ERROR();
> }
> 
>-// Use this to select which configurations (e.g. which renderer, which GLES major version) these tests should be run against.
>+void MaskedScissoredClearTestBase::MaskedScissoredColorDepthStencilClear(
>+    const MaskedScissoredClearVariationsTestParams &params)
>+{
>+    // Flaky on Android Nexus 5x and Pixel 2, possible Qualcomm driver bug.
>+    // TODO(jmadill): Re-enable when possible. http://anglebug.com/2548
>+    ANGLE_SKIP_TEST_IF(IsOpenGLES() && IsAndroid());
>+
>+    const int w      = getWindowWidth();
>+    const int h      = getWindowHeight();
>+    const int wthird = w / 3;
>+    const int hthird = h / 3;
>+
>+    constexpr float kPreClearDepth     = 0.9f;
>+    constexpr float kClearDepth        = 0.5f;
>+    constexpr uint8_t kPreClearStencil = 0xFF;
>+    constexpr uint8_t kClearStencil    = 0x16;
>+    constexpr uint8_t kStencilMask     = 0x59;
>+    constexpr uint8_t kMaskedClearStencil =
>+        (kPreClearStencil & ~kStencilMask) | (kClearStencil & kStencilMask);
>+
>+    bool clearColor, clearDepth, clearStencil;
>+    bool maskColor, maskDepth, maskStencil;
>+    bool scissor;
>+
>+    ParseMaskedScissoredClearVariationsTestParams(params, &clearColor, &clearDepth, &clearStencil,
>+                                                  &maskColor, &maskDepth, &maskStencil, &scissor);
>+
>+    // Clear to a random color, 0.9 depth and 0x00 stencil
>+    Vector4 color1(0.1f, 0.2f, 0.3f, 0.4f);
>+    GLColor color1RGB(color1);
>+
>+    glClearColor(color1[0], color1[1], color1[2], color1[3]);
>+    glClearDepthf(kPreClearDepth);
>+    glClearStencil(kPreClearStencil);
>+
>+    if (!clearColor)
>+    {
>+        // If not asked to clear color, clear it anyway, but individually.  The clear value is
>+        // still used to verify that the depth/stencil clear happened correctly.  This allows
>+        // testing for depth/stencil-only clear implementations.
>+        glClear(GL_COLOR_BUFFER_BIT);
>+    }
>+
>+    glClear((clearColor ? GL_COLOR_BUFFER_BIT : 0) | (clearDepth ? GL_DEPTH_BUFFER_BIT : 0) |
>+            (clearStencil ? GL_STENCIL_BUFFER_BIT : 0));
>+    ASSERT_GL_NO_ERROR();
>+
>+    // Verify color was cleared correctly.
>+    EXPECT_PIXEL_COLOR_NEAR(0, 0, color1RGB, 1);
>+
>+    if (scissor)
>+    {
>+        glEnable(GL_SCISSOR_TEST);
>+        glScissor(wthird / 2, hthird / 2, wthird, hthird);
>+    }
>+
>+    // Use color and stencil masks to clear to a second color, 0.5 depth and 0x59 stencil.
>+    Vector4 color2(0.2f, 0.4f, 0.6f, 0.8f);
>+    GLColor color2RGB(color2);
>+    glClearColor(color2[0], color2[1], color2[2], color2[3]);
>+    glClearDepthf(kClearDepth);
>+    glClearStencil(kClearStencil);
>+    if (maskColor)
>+    {
>+        glColorMask(GL_TRUE, GL_FALSE, GL_TRUE, GL_FALSE);
>+    }
>+    if (maskDepth)
>+    {
>+        glDepthMask(GL_FALSE);
>+    }
>+    if (maskStencil)
>+    {
>+        glStencilMask(kStencilMask);
>+    }
>+    glClear((clearColor ? GL_COLOR_BUFFER_BIT : 0) | (clearDepth ? GL_DEPTH_BUFFER_BIT : 0) |
>+            (clearStencil ? GL_STENCIL_BUFFER_BIT : 0));
>+    glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE);
>+    glDepthMask(GL_TRUE);
>+    glStencilMask(0xFF);
>+    glDisable(GL_DEPTH_TEST);
>+    glDisable(GL_STENCIL_TEST);
>+    glDisable(GL_SCISSOR_TEST);
>+    ASSERT_GL_NO_ERROR();
>+
>+    GLColor color2MaskedRGB(color2RGB[0], color1RGB[1], color2RGB[2], color1RGB[3]);
>+
>+    // If not clearing color, the original color should be left both in the center and corners.  If
>+    // using a scissor, the corners should be left to the original color, while the center is
>+    // possibly changed.  If using a mask, the center (and corners if not scissored), changes to
>+    // the masked results.
>+    GLColor expectedCenterColorRGB =
>+        !clearColor ? color1RGB : maskColor ? color2MaskedRGB : color2RGB;
>+    GLColor expectedCornerColorRGB = scissor ? color1RGB : expectedCenterColorRGB;
>+
>+    // Verify second clear color mask worked as expected.
>+    EXPECT_PIXEL_COLOR_NEAR(wthird, hthird, expectedCenterColorRGB, 1);
>+
>+    EXPECT_PIXEL_COLOR_NEAR(0, 0, expectedCornerColorRGB, 1);
>+    EXPECT_PIXEL_COLOR_NEAR(w - 1, 0, expectedCornerColorRGB, 1);
>+    EXPECT_PIXEL_COLOR_NEAR(0, h - 1, expectedCornerColorRGB, 1);
>+    EXPECT_PIXEL_COLOR_NEAR(w - 1, h - 1, expectedCornerColorRGB, 1);
>+    EXPECT_PIXEL_COLOR_NEAR(wthird, 2 * hthird, expectedCornerColorRGB, 1);
>+    EXPECT_PIXEL_COLOR_NEAR(2 * wthird, hthird, expectedCornerColorRGB, 1);
>+    EXPECT_PIXEL_COLOR_NEAR(2 * wthird, 2 * hthird, expectedCornerColorRGB, 1);
>+
>+    // If there is depth, but depth is not asked to be cleared, the depth buffer contains garbage,
>+    // so no particular behavior can be expected.
>+    if (clearDepth || !mHasDepth)
>+    {
>+        // We use a small shader to verify depth.
>+        ANGLE_GL_PROGRAM(depthTestProgram, essl1_shaders::vs::Passthrough(),
>+                         essl1_shaders::fs::Blue());
>+        glEnable(GL_DEPTH_TEST);
>+        glDepthFunc(maskDepth ? GL_GREATER : GL_EQUAL);
>+        // - If depth is cleared, but it's masked, kPreClearDepth should be in the depth buffer.
>+        // - If depth is cleared, but it's not masked, kClearDepth should be in the depth buffer.
>+        // - If depth is not cleared, the if above ensures there is no depth buffer at all,
>+        //   which means depth test will always pass.
>+        drawQuad(depthTestProgram, essl1_shaders::PositionAttrib(), maskDepth ? 1.0f : 0.0f);
>+        glDisable(GL_DEPTH_TEST);
>+        ASSERT_GL_NO_ERROR();
>+
>+        // Either way, we expect blue to be written to the center.
>+        expectedCenterColorRGB = GLColor::blue;
>+        // If there is no depth, depth test always passes so the whole image must be blue.  Same if
>+        // depth write is masked.
>+        expectedCornerColorRGB =
>+            mHasDepth && scissor && !maskDepth ? expectedCornerColorRGB : GLColor::blue;
>+
>+        EXPECT_PIXEL_COLOR_NEAR(wthird, hthird, expectedCenterColorRGB, 1);
>+
>+        EXPECT_PIXEL_COLOR_NEAR(0, 0, expectedCornerColorRGB, 1);
>+        EXPECT_PIXEL_COLOR_NEAR(w - 1, 0, expectedCornerColorRGB, 1);
>+        EXPECT_PIXEL_COLOR_NEAR(0, h - 1, expectedCornerColorRGB, 1);
>+        EXPECT_PIXEL_COLOR_NEAR(w - 1, h - 1, expectedCornerColorRGB, 1);
>+        EXPECT_PIXEL_COLOR_NEAR(wthird, 2 * hthird, expectedCornerColorRGB, 1);
>+        EXPECT_PIXEL_COLOR_NEAR(2 * wthird, hthird, expectedCornerColorRGB, 1);
>+        EXPECT_PIXEL_COLOR_NEAR(2 * wthird, 2 * hthird, expectedCornerColorRGB, 1);
>+    }
>+
>+    // If there is stencil, but it's not asked to be cleared, there is similarly no expectation.
>+    if (clearStencil || !mHasStencil)
>+    {
>+        // And another small shader to verify stencil.
>+        ANGLE_GL_PROGRAM(stencilTestProgram, essl1_shaders::vs::Passthrough(),
>+                         essl1_shaders::fs::Green());
>+        glEnable(GL_STENCIL_TEST);
>+        // - If stencil is cleared, but it's masked, kMaskedClearStencil should be in the stencil
>+        //   buffer.
>+        // - If stencil is cleared, but it's not masked, kClearStencil should be in the stencil
>+        //   buffer.
>+        // - If stencil is not cleared, the if above ensures there is no stencil buffer at all,
>+        //   which means stencil test will always pass.
>+        glStencilFunc(GL_EQUAL, maskStencil ? kMaskedClearStencil : kClearStencil, 0xFF);
>+        drawQuad(stencilTestProgram, essl1_shaders::PositionAttrib(), 0.0f);
>+        glDisable(GL_STENCIL_TEST);
>+        ASSERT_GL_NO_ERROR();
>+
>+        // Either way, we expect green to be written to the center.
>+        expectedCenterColorRGB = GLColor::green;
>+        // If there is no stencil, stencil test always passes so the whole image must be green.
>+        expectedCornerColorRGB = mHasStencil && scissor ? expectedCornerColorRGB : GLColor::green;
>+
>+        EXPECT_PIXEL_COLOR_NEAR(wthird, hthird, expectedCenterColorRGB, 1);
>+
>+        EXPECT_PIXEL_COLOR_NEAR(0, 0, expectedCornerColorRGB, 1);
>+        EXPECT_PIXEL_COLOR_NEAR(w - 1, 0, expectedCornerColorRGB, 1);
>+        EXPECT_PIXEL_COLOR_NEAR(0, h - 1, expectedCornerColorRGB, 1);
>+        EXPECT_PIXEL_COLOR_NEAR(w - 1, h - 1, expectedCornerColorRGB, 1);
>+        EXPECT_PIXEL_COLOR_NEAR(wthird, 2 * hthird, expectedCornerColorRGB, 1);
>+        EXPECT_PIXEL_COLOR_NEAR(2 * wthird, hthird, expectedCornerColorRGB, 1);
>+        EXPECT_PIXEL_COLOR_NEAR(2 * wthird, 2 * hthird, expectedCornerColorRGB, 1);
>+    }
>+}
>+
>+// Tests combinations of color, depth, stencil clears with or without masks or scissor.
>+TEST_P(MaskedScissoredClearTest, Test)
>+{
>+    MaskedScissoredColorDepthStencilClear(GetParam());
>+}
>+
>+// Tests combinations of color, depth, stencil clears with or without masks or scissor.
>+//
>+// This uses depth/stencil attachments that are single-channel, but are emulated with a format
>+// that has both channels.
>+TEST_P(VulkanClearTest, Test)
>+{
>+    bool clearColor, clearDepth, clearStencil;
>+    bool maskColor, maskDepth, maskStencil;
>+    bool scissor;
>+
>+    ParseMaskedScissoredClearVariationsTestParams(GetParam(), &clearColor, &clearDepth,
>+                                                  &clearStencil, &maskColor, &maskDepth,
>+                                                  &maskStencil, &scissor);
>+
>+    // We only care about clearing depth xor stencil.
>+    if (clearDepth == clearStencil)
>+    {
>+        return;
>+    }
>+
>+    if (clearDepth)
>+    {
>+        // Creating a depth-only renderbuffer is an ES3 feature.
>+        ANGLE_SKIP_TEST_IF(getClientMajorVersion() < 3);
>+        bindColorDepthFBO();
>+    }
>+    else
>+    {
>+        bindColorStencilFBO();
>+    }
>+
>+    MaskedScissoredColorDepthStencilClear(GetParam());
>+}
>+
>+// Test that just clearing a nonexistent drawbuffer of the default framebuffer doesn't cause an
>+// assert.
>+TEST_P(ClearTestES3, ClearBuffer1OnDefaultFramebufferNoAssert)
>+{
>+    std::vector<GLuint> testUint(4);
>+    glClearBufferuiv(GL_COLOR, 1, testUint.data());
>+    std::vector<GLint> testInt(4);
>+    glClearBufferiv(GL_COLOR, 1, testInt.data());
>+    std::vector<GLfloat> testFloat(4);
>+    glClearBufferfv(GL_COLOR, 1, testFloat.data());
>+    EXPECT_GL_NO_ERROR();
>+}
>+
>+#ifdef Bool
>+// X11 craziness.
>+#    undef Bool
>+#endif
>+
>+// Use this to select which configurations (e.g. which renderer, which GLES major version) these
>+// tests should be run against.
> ANGLE_INSTANTIATE_TEST(ClearTest,
>                        ES2_D3D9(),
>                        ES2_D3D11(),
>@@ -464,7 +1478,35 @@ ANGLE_INSTANTIATE_TEST(ClearTest,
>                        ES2_OPENGL(),
>                        ES3_OPENGL(),
>                        ES2_OPENGLES(),
>-                       ES3_OPENGLES());
>-ANGLE_INSTANTIATE_TEST(ClearTestES3, ES3_D3D11(), ES3_OPENGL(), ES3_OPENGLES());
>+                       ES3_OPENGLES(),
>+                       ES2_VULKAN(),
>+                       ES3_VULKAN());
>+ANGLE_INSTANTIATE_TEST(ClearTestES3, ES3_D3D11(), ES3_OPENGL(), ES3_OPENGLES(), ES3_VULKAN());
>+ANGLE_INSTANTIATE_TEST_COMBINE_4(MaskedScissoredClearTest,
>+                                 MaskedScissoredClearVariationsTestPrint,
>+                                 testing::Range(0, 3),
>+                                 testing::Range(0, 3),
>+                                 testing::Range(0, 3),
>+                                 testing::Bool(),
>+                                 ES2_D3D9(),
>+                                 ES2_D3D11(),
>+                                 ES3_D3D11(),
>+                                 ES2_OPENGL(),
>+                                 ES3_OPENGL(),
>+                                 ES2_OPENGLES(),
>+                                 ES3_OPENGLES(),
>+                                 ES2_VULKAN(),
>+                                 ES3_VULKAN());
>+ANGLE_INSTANTIATE_TEST_COMBINE_4(VulkanClearTest,
>+                                 MaskedScissoredClearVariationsTestPrint,
>+                                 testing::Range(0, 3),
>+                                 testing::Range(0, 3),
>+                                 testing::Range(0, 3),
>+                                 testing::Bool(),
>+                                 ES2_VULKAN(),
>+                                 ES3_VULKAN());
>+
>+// Not all ANGLE backends support RGB backbuffers
>+ANGLE_INSTANTIATE_TEST(ClearTestRGB, ES2_D3D11(), ES3_D3D11(), ES2_VULKAN(), ES3_VULKAN());
> 
> }  // anonymous namespace
>diff --git a/Source/ThirdParty/ANGLE/src/tests/gl_tests/ClientArraysTest.cpp b/Source/ThirdParty/ANGLE/src/tests/gl_tests/ClientArraysTest.cpp
>index a88821ed595..3f5712dc5dd 100644
>--- a/Source/ThirdParty/ANGLE/src/tests/gl_tests/ClientArraysTest.cpp
>+++ b/Source/ThirdParty/ANGLE/src/tests/gl_tests/ClientArraysTest.cpp
>@@ -32,7 +32,7 @@ class ClientArraysTest : public ANGLETest
> // the GL extension should always be present
> TEST_P(ClientArraysTest, ExtensionStringExposed)
> {
>-    EXPECT_TRUE(extensionEnabled("GL_ANGLE_client_arrays"));
>+    EXPECT_TRUE(IsGLExtensionEnabled("GL_ANGLE_client_arrays"));
> }
> 
> // Verify that GL_CLIENT_ARRAYS_ANGLE can be queried but not changed
>@@ -51,7 +51,7 @@ TEST_P(ClientArraysTest, QueryValidation)
>     GLboolean boolValue = GL_TRUE;
>     glGetBooleanv(GL_CLIENT_ARRAYS_ANGLE, &boolValue);
>     EXPECT_GL_NO_ERROR();
>-    EXPECT_GL_FALSE(GL_FALSE);
>+    EXPECT_GL_FALSE(boolValue);
> 
>     EXPECT_GL_FALSE(glIsEnabled(GL_CLIENT_ARRAYS_ANGLE));
>     EXPECT_GL_NO_ERROR();
>@@ -76,21 +76,14 @@ TEST_P(ClientArraysTest, ForbidsClientSideElementBuffer)
> {
>     ASSERT_GL_FALSE(glIsEnabled(GL_CLIENT_ARRAYS_ANGLE));
> 
>-    const std::string &vert =
>+    constexpr char kVS[] =
>         "attribute vec3 a_pos;\n"
>         "void main()\n"
>         "{\n"
>         "    gl_Position = vec4(a_pos, 1.0);\n"
>         "}\n";
> 
>-    const std::string &frag =
>-        "precision highp float;\n"
>-        "void main()\n"
>-        "{\n"
>-        "    gl_FragColor = vec4(1.0);\n"
>-        "}\n";
>-
>-    ANGLE_GL_PROGRAM(program, vert, frag);
>+    ANGLE_GL_PROGRAM(program, kVS, essl1_shaders::fs::Red());
> 
>     GLint posLocation = glGetAttribLocation(program.get(), "a_pos");
>     ASSERT_NE(-1, posLocation);
>@@ -123,5 +116,6 @@ ANGLE_INSTANTIATE_TEST(ClientArraysTest,
>                        ES2_OPENGL(),
>                        ES3_OPENGL(),
>                        ES2_OPENGLES(),
>-                       ES3_OPENGLES());
>-}  // namespace
>+                       ES3_OPENGLES(),
>+                       ES2_VULKAN());
>+}  // namespace angle
>diff --git a/Source/ThirdParty/ANGLE/src/tests/gl_tests/ColorMaskTest.cpp b/Source/ThirdParty/ANGLE/src/tests/gl_tests/ColorMaskTest.cpp
>index d2ad638aa8a..b3bee1dbf36 100644
>--- a/Source/ThirdParty/ANGLE/src/tests/gl_tests/ColorMaskTest.cpp
>+++ b/Source/ThirdParty/ANGLE/src/tests/gl_tests/ColorMaskTest.cpp
>@@ -29,28 +29,10 @@ class ColorMaskTest : public ANGLETest
>     {
>         ANGLETest::SetUp();
> 
>-        const std::string vsSource =
>-            "precision highp float;\n"
>-            "attribute vec4 position;\n"
>-            "\n"
>-            "void main()\n"
>-            "{\n"
>-            "    gl_Position = position;\n"
>-            "}\n";
>-
>-        const std::string fsSource =
>-            "precision highp float;\n"
>-            "uniform vec4 color;\n"
>-            "\n"
>-            "void main()\n"
>-            "{\n"
>-            "    gl_FragColor = color;\n"
>-            "}\n";
>-
>-        mProgram = CompileProgram(vsSource, fsSource);
>+        mProgram = CompileProgram(essl1_shaders::vs::Simple(), essl1_shaders::fs::UniformColor());
>         ASSERT_NE(0u, mProgram) << "shader compilation failed.";
> 
>-        mColorUniform = glGetUniformLocation(mProgram, "color");
>+        mColorUniform = glGetUniformLocation(mProgram, essl1_shaders::ColorUniform());
>     }
> 
>     void TearDown() override
>@@ -82,7 +64,7 @@ TEST_P(ColorMaskTest, AMDZeroColorMaskBug)
>     glUseProgram(mProgram);
>     glUniform4f(mColorUniform, 1.0f, 0.0f, 0.0f, 0.0f);
>     EXPECT_GL_NO_ERROR();
>-    drawQuad(mProgram, "position", 0.5f);
>+    drawQuad(mProgram, essl1_shaders::PositionAttrib(), 0.5f);
>     EXPECT_PIXEL_EQ(x, y, 0, 0, 255, 255);
> 
>     // Re-enable the color mask, should be red (with blend disabled, the red should overwrite
>@@ -91,7 +73,7 @@ TEST_P(ColorMaskTest, AMDZeroColorMaskBug)
>     glUseProgram(mProgram);
>     glUniform4f(mColorUniform, 1.0f, 0.0f, 0.0f, 0.0f);
>     EXPECT_GL_NO_ERROR();
>-    drawQuad(mProgram, "position", 0.5f);
>+    drawQuad(mProgram, essl1_shaders::PositionAttrib(), 0.5f);
>     EXPECT_PIXEL_EQ(x, y, 255, 0, 0, 0);
> }
> 
>@@ -105,6 +87,7 @@ ANGLE_INSTANTIATE_TEST(ColorMaskTest,
>                        ES2_OPENGL(),
>                        ES3_OPENGL(),
>                        ES2_OPENGLES(),
>-                       ES3_OPENGLES());
>+                       ES3_OPENGLES(),
>+                       ES2_VULKAN());
> 
> }  // namespace angle
>diff --git a/Source/ThirdParty/ANGLE/src/tests/gl_tests/ComputeShaderTest.cpp b/Source/ThirdParty/ANGLE/src/tests/gl_tests/ComputeShaderTest.cpp
>index d516ef113d8..db4b23e6938 100644
>--- a/Source/ThirdParty/ANGLE/src/tests/gl_tests/ComputeShaderTest.cpp
>+++ b/Source/ThirdParty/ANGLE/src/tests/gl_tests/ComputeShaderTest.cpp
>@@ -6,9 +6,9 @@
> // ComputeShaderTest:
> //   Compute shader specific tests.
> 
>+#include <vector>
> #include "test_utils/ANGLETest.h"
> #include "test_utils/gl_raii.h"
>-#include <vector>
> 
> using namespace angle;
> 
>@@ -19,6 +19,58 @@ class ComputeShaderTest : public ANGLETest
> {
>   protected:
>     ComputeShaderTest() {}
>+
>+    template <class T, GLint kWidth, GLint kHeight>
>+    void runSharedMemoryTest(const char *kCS,
>+                             GLenum internalFormat,
>+                             GLenum format,
>+                             const std::array<T, kWidth * kHeight> &inputData,
>+                             const std::array<T, kWidth * kHeight> &expectedValues)
>+    {
>+        GLTexture texture[2];
>+        GLFramebuffer framebuffer;
>+
>+        glBindTexture(GL_TEXTURE_2D, texture[0]);
>+        glTexStorage2D(GL_TEXTURE_2D, 1, internalFormat, kWidth, kHeight);
>+        glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, kWidth, kHeight, GL_RED_INTEGER, format,
>+                        inputData.data());
>+        EXPECT_GL_NO_ERROR();
>+
>+        constexpr T initData[kWidth * kHeight] = {};
>+        glBindTexture(GL_TEXTURE_2D, texture[1]);
>+        glTexStorage2D(GL_TEXTURE_2D, 1, internalFormat, kWidth, kHeight);
>+        glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, kWidth, kHeight, GL_RED_INTEGER, format, initData);
>+        EXPECT_GL_NO_ERROR();
>+
>+        ANGLE_GL_COMPUTE_PROGRAM(program, kCS);
>+        glUseProgram(program.get());
>+
>+        glBindImageTexture(0, texture[0], 0, GL_FALSE, 0, GL_READ_ONLY, internalFormat);
>+        EXPECT_GL_NO_ERROR();
>+
>+        glBindImageTexture(1, texture[1], 0, GL_FALSE, 0, GL_WRITE_ONLY, internalFormat);
>+        EXPECT_GL_NO_ERROR();
>+
>+        glDispatchCompute(1, 1, 1);
>+        EXPECT_GL_NO_ERROR();
>+
>+        glMemoryBarrier(GL_TEXTURE_UPDATE_BARRIER_BIT);
>+
>+        T outputValues[kWidth * kHeight] = {};
>+        glUseProgram(0);
>+        glBindFramebuffer(GL_READ_FRAMEBUFFER, framebuffer);
>+
>+        glFramebufferTexture2D(GL_READ_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, texture[1],
>+                               0);
>+        EXPECT_GL_NO_ERROR();
>+        glReadPixels(0, 0, kWidth, kHeight, GL_RED_INTEGER, format, outputValues);
>+        EXPECT_GL_NO_ERROR();
>+
>+        for (int i = 0; i < kWidth * kHeight; i++)
>+        {
>+            EXPECT_EQ(expectedValues[i], outputValues[i]);
>+        }
>+    }
> };
> 
> class ComputeShaderTestES3 : public ANGLETest
>@@ -27,17 +79,22 @@ class ComputeShaderTestES3 : public ANGLETest
>     ComputeShaderTestES3() {}
> };
> 
>+class WebGL2ComputeTest : public ComputeShaderTest
>+{
>+  protected:
>+    WebGL2ComputeTest() { setWebGLCompatibilityEnabled(true); }
>+};
>+
> // link a simple compute program. It should be successful.
> TEST_P(ComputeShaderTest, LinkComputeProgram)
> {
>-    const std::string csSource =
>-        R"(#version 310 es
>-        layout(local_size_x=1) in;
>-        void main()
>-        {\
>-        })";
>+    constexpr char kCS[] = R"(#version 310 es
>+layout(local_size_x=1) in;
>+void main()
>+{
>+})";
> 
>-    ANGLE_GL_COMPUTE_PROGRAM(program, csSource);
>+    ANGLE_GL_COMPUTE_PROGRAM(program, kCS);
> 
>     EXPECT_GL_NO_ERROR();
> }
>@@ -46,16 +103,15 @@ TEST_P(ComputeShaderTest, LinkComputeProgram)
> // It should be successful.
> TEST_P(ComputeShaderTest, DetachShaderAfterLinkSuccess)
> {
>-    const std::string csSource =
>-        R"(#version 310 es
>-        layout(local_size_x=1) in;
>-        void main()
>-        {
>-        })";
>+    constexpr char kCS[] = R"(#version 310 es
>+layout(local_size_x=1) in;
>+void main()
>+{
>+})";
> 
>     GLuint program = glCreateProgram();
> 
>-    GLuint cs = CompileShader(GL_COMPUTE_SHADER, csSource);
>+    GLuint cs = CompileShader(GL_COMPUTE_SHADER, kCS);
>     EXPECT_NE(0u, cs);
> 
>     glAttachShader(program, cs);
>@@ -64,7 +120,7 @@ TEST_P(ComputeShaderTest, DetachShaderAfterLinkSuccess)
>     glLinkProgram(program);
>     GLint linkStatus;
>     glGetProgramiv(program, GL_LINK_STATUS, &linkStatus);
>-    EXPECT_EQ(GL_TRUE, linkStatus);
>+    EXPECT_GL_TRUE(linkStatus);
> 
>     glDetachShader(program, cs);
>     EXPECT_GL_NO_ERROR();
>@@ -77,13 +133,12 @@ TEST_P(ComputeShaderTest, DetachShaderAfterLinkSuccess)
> // link a simple compute program. There is no local size and linking should fail.
> TEST_P(ComputeShaderTest, LinkComputeProgramNoLocalSizeLinkError)
> {
>-    const std::string csSource =
>-        R"(#version 310 es
>-        void main()
>-        {
>-        })";
>+    constexpr char kCS[] = R"(#version 310 es
>+void main()
>+{
>+})";
> 
>-    GLuint program = CompileComputeProgram(csSource, false);
>+    GLuint program = CompileComputeProgram(kCS, false);
>     EXPECT_EQ(0u, program);
> 
>     glDeleteProgram(program);
>@@ -95,21 +150,20 @@ TEST_P(ComputeShaderTest, LinkComputeProgramNoLocalSizeLinkError)
> // make sure that uniforms and uniform samplers get recorded
> TEST_P(ComputeShaderTest, LinkComputeProgramWithUniforms)
> {
>-    const std::string csSource =
>-        R"(#version 310 es
>-        precision mediump sampler2D;
>-        layout(local_size_x=1) in;
>-        uniform int myUniformInt;
>-        uniform sampler2D myUniformSampler;
>-        layout(rgba32i) uniform highp writeonly iimage2D imageOut;
>-        void main()
>-        {
>-            int q = myUniformInt;
>-            vec4 v = textureLod(myUniformSampler, vec2(0.0), 0.0);
>-            imageStore(imageOut, ivec2(0), ivec4(v) * q);
>-        })";
>+    constexpr char kCS[] = R"(#version 310 es
>+precision mediump sampler2D;
>+layout(local_size_x=1) in;
>+uniform int myUniformInt;
>+uniform sampler2D myUniformSampler;
>+layout(rgba32i) uniform highp writeonly iimage2D imageOut;
>+void main()
>+{
>+    int q = myUniformInt;
>+    vec4 v = textureLod(myUniformSampler, vec2(0.0), 0.0);
>+    imageStore(imageOut, ivec2(0), ivec4(v) * q);
>+})";
> 
>-    ANGLE_GL_COMPUTE_PROGRAM(program, csSource);
>+    ANGLE_GL_COMPUTE_PROGRAM(program, kCS);
> 
>     GLint uniformLoc = glGetUniformLocation(program.get(), "myUniformInt");
>     EXPECT_NE(-1, uniformLoc);
>@@ -124,30 +178,27 @@ TEST_P(ComputeShaderTest, LinkComputeProgramWithUniforms)
> // OpenGL ES 3.10, 7.3 Program Objects
> TEST_P(ComputeShaderTest, AttachMultipleShaders)
> {
>-    const std::string csSource =
>-        R"(#version 310 es
>-        layout(local_size_x=1) in;
>-        void main()
>-        {
>-        })";
>+    constexpr char kCS[] = R"(#version 310 es
>+layout(local_size_x=1) in;
>+void main()
>+{
>+})";
> 
>-    const std::string vsSource =
>-        R"(#version 310 es
>-        void main()
>-        {
>-        })";
>+    constexpr char kVS[] = R"(#version 310 es
>+void main()
>+{
>+})";
> 
>-    const std::string fsSource =
>-        R"(#version 310 es
>-        void main()
>-        {
>-        })";
>+    constexpr char kFS[] = R"(#version 310 es
>+void main()
>+{
>+})";
> 
>     GLuint program = glCreateProgram();
> 
>-    GLuint vs = CompileShader(GL_VERTEX_SHADER, vsSource);
>-    GLuint fs = CompileShader(GL_FRAGMENT_SHADER, fsSource);
>-    GLuint cs = CompileShader(GL_COMPUTE_SHADER, csSource);
>+    GLuint vs = CompileShader(GL_VERTEX_SHADER, kVS);
>+    GLuint fs = CompileShader(GL_FRAGMENT_SHADER, kFS);
>+    GLuint cs = CompileShader(GL_COMPUTE_SHADER, kCS);
> 
>     EXPECT_NE(0u, vs);
>     EXPECT_NE(0u, fs);
>@@ -167,7 +218,7 @@ TEST_P(ComputeShaderTest, AttachMultipleShaders)
>     GLint linkStatus;
>     glGetProgramiv(program, GL_LINK_STATUS, &linkStatus);
> 
>-    EXPECT_EQ(GL_FALSE, linkStatus);
>+    EXPECT_GL_FALSE(linkStatus);
> 
>     EXPECT_GL_NO_ERROR();
> }
>@@ -176,30 +227,27 @@ TEST_P(ComputeShaderTest, AttachMultipleShaders)
> // Query for the number of attached shaders and check the count.
> TEST_P(ComputeShaderTest, AttachmentCount)
> {
>-    const std::string csSource =
>-        R"(#version 310 es
>-        layout(local_size_x=1) in;
>-        void main()
>-        {
>-        })";
>+    constexpr char kCS[] = R"(#version 310 es
>+layout(local_size_x=1) in;
>+void main()
>+{
>+})";
> 
>-    const std::string vsSource =
>-        R"(#version 310 es
>-        void main()
>-        {
>-        })";
>+    constexpr char kVS[] = R"(#version 310 es
>+void main()
>+{
>+})";
> 
>-    const std::string fsSource =
>-        R"(#version 310 es
>-        void main()
>-        {
>-        })";
>+    constexpr char kFS[] = R"(#version 310 es
>+void main()
>+{
>+})";
> 
>     GLuint program = glCreateProgram();
> 
>-    GLuint vs = CompileShader(GL_VERTEX_SHADER, vsSource);
>-    GLuint fs = CompileShader(GL_FRAGMENT_SHADER, fsSource);
>-    GLuint cs = CompileShader(GL_COMPUTE_SHADER, csSource);
>+    GLuint vs = CompileShader(GL_VERTEX_SHADER, kVS);
>+    GLuint fs = CompileShader(GL_FRAGMENT_SHADER, kFS);
>+    GLuint cs = CompileShader(GL_COMPUTE_SHADER, kCS);
> 
>     EXPECT_NE(0u, vs);
>     EXPECT_NE(0u, fs);
>@@ -227,14 +275,13 @@ TEST_P(ComputeShaderTest, AttachmentCount)
> // Attach a compute shader and link, but start rendering.
> TEST_P(ComputeShaderTest, StartRenderingWithComputeProgram)
> {
>-    const std::string csSource =
>-        R"(#version 310 es
>-        layout(local_size_x=1) in;
>-        void main()
>-        {
>-        })";
>+    constexpr char kCS[] = R"(#version 310 es
>+layout(local_size_x=1) in;
>+void main()
>+{
>+})";
> 
>-    ANGLE_GL_COMPUTE_PROGRAM(program, csSource);
>+    ANGLE_GL_COMPUTE_PROGRAM(program, kCS);
>     EXPECT_GL_NO_ERROR();
> 
>     glUseProgram(program);
>@@ -245,22 +292,16 @@ TEST_P(ComputeShaderTest, StartRenderingWithComputeProgram)
> // Attach a vertex and fragment shader and link, but dispatch compute.
> TEST_P(ComputeShaderTest, DispatchComputeWithRenderingProgram)
> {
>-    const std::string vsSource =
>-        R"(#version 310 es
>-        void main()
>-        {
>-        })";
>+    constexpr char kVS[] = R"(#version 310 es
>+void main() {})";
> 
>-    const std::string fsSource =
>-        R"(#version 310 es
>-        void main()
>-        {
>-        })";
>+    constexpr char kFS[] = R"(#version 310 es
>+void main() {})";
> 
>     GLuint program = glCreateProgram();
> 
>-    GLuint vs = CompileShader(GL_VERTEX_SHADER, vsSource);
>-    GLuint fs = CompileShader(GL_FRAGMENT_SHADER, fsSource);
>+    GLuint vs = CompileShader(GL_VERTEX_SHADER, kVS);
>+    GLuint fs = CompileShader(GL_FRAGMENT_SHADER, kFS);
> 
>     EXPECT_NE(0u, vs);
>     EXPECT_NE(0u, fs);
>@@ -275,7 +316,7 @@ TEST_P(ComputeShaderTest, DispatchComputeWithRenderingProgram)
> 
>     GLint linkStatus;
>     glGetProgramiv(program, GL_LINK_STATUS, &linkStatus);
>-    EXPECT_EQ(GL_TRUE, linkStatus);
>+    EXPECT_GL_TRUE(linkStatus);
> 
>     EXPECT_GL_NO_ERROR();
> 
>@@ -287,85 +328,137 @@ TEST_P(ComputeShaderTest, DispatchComputeWithRenderingProgram)
> // Access all compute shader special variables.
> TEST_P(ComputeShaderTest, AccessAllSpecialVariables)
> {
>-    const std::string csSource =
>-        R"(#version 310 es
>-        layout(local_size_x=4, local_size_y=3, local_size_z=2) in;
>-        layout(rgba32ui) uniform highp writeonly uimage2D imageOut;
>-        void main()
>-        {
>-            uvec3 temp1 = gl_NumWorkGroups;
>-            uvec3 temp2 = gl_WorkGroupSize;
>-            uvec3 temp3 = gl_WorkGroupID;
>-            uvec3 temp4 = gl_LocalInvocationID;
>-            uvec3 temp5 = gl_GlobalInvocationID;
>-            uint  temp6 = gl_LocalInvocationIndex;
>-            imageStore(imageOut, ivec2(gl_LocalInvocationIndex, 0), uvec4(temp1 + temp2 + temp3 + temp4 + temp5, temp6));
>-        })";
>-
>-    ANGLE_GL_COMPUTE_PROGRAM(program, csSource);
>+    constexpr char kCS[] = R"(#version 310 es
>+layout(local_size_x=4, local_size_y=3, local_size_z=2) in;
>+layout(rgba32ui) uniform highp writeonly uimage2D imageOut;
>+void main()
>+{
>+    uvec3 temp1 = gl_NumWorkGroups;
>+    uvec3 temp2 = gl_WorkGroupSize;
>+    uvec3 temp3 = gl_WorkGroupID;
>+    uvec3 temp4 = gl_LocalInvocationID;
>+    uvec3 temp5 = gl_GlobalInvocationID;
>+    uint  temp6 = gl_LocalInvocationIndex;
>+    imageStore(imageOut, ivec2(gl_LocalInvocationIndex, 0), uvec4(temp1 + temp2 + temp3 + temp4 + temp5, temp6));
>+})";
>+
>+    ANGLE_GL_COMPUTE_PROGRAM(program, kCS);
> }
> 
> // Access part compute shader special variables.
> TEST_P(ComputeShaderTest, AccessPartSpecialVariables)
> {
>-    const std::string csSource =
>-        R"(#version 310 es
>-        layout(local_size_x=4, local_size_y=3, local_size_z=2) in;
>-        layout(rgba32ui) uniform highp writeonly uimage2D imageOut;
>-        void main()
>-        {
>-            uvec3 temp1 = gl_WorkGroupSize;
>-            uvec3 temp2 = gl_WorkGroupID;
>-            uint  temp3 = gl_LocalInvocationIndex;
>-            imageStore(imageOut, ivec2(gl_LocalInvocationIndex, 0), uvec4(temp1 + temp2, temp3));
>-        })";
>+    constexpr char kCS[] = R"(#version 310 es
>+layout(local_size_x=4, local_size_y=3, local_size_z=2) in;
>+layout(rgba32ui) uniform highp writeonly uimage2D imageOut;
>+void main()
>+{
>+    uvec3 temp1 = gl_WorkGroupSize;
>+    uvec3 temp2 = gl_WorkGroupID;
>+    uint  temp3 = gl_LocalInvocationIndex;
>+    imageStore(imageOut, ivec2(gl_LocalInvocationIndex, 0), uvec4(temp1 + temp2, temp3));
>+})";
> 
>-    ANGLE_GL_COMPUTE_PROGRAM(program, csSource);
>+    ANGLE_GL_COMPUTE_PROGRAM(program, kCS);
> }
> 
> // Use glDispatchCompute to define work group count.
> TEST_P(ComputeShaderTest, DispatchCompute)
> {
>-    const std::string csSource =
>-        R"(#version 310 es
>-        layout(local_size_x=4, local_size_y=3, local_size_z=2) in;
>-        layout(rgba32ui) uniform highp writeonly uimage2D imageOut;
>-        void main()
>-        {
>-            uvec3 temp = gl_NumWorkGroups;
>-            imageStore(imageOut, ivec2(0), uvec4(temp, 0u));
>-        })";
>+    constexpr char kCS[] = R"(#version 310 es
>+layout(local_size_x=4, local_size_y=3, local_size_z=2) in;
>+layout(rgba32ui) uniform highp writeonly uimage2D imageOut;
>+void main()
>+{
>+    uvec3 temp = gl_NumWorkGroups;
>+    imageStore(imageOut, ivec2(0), uvec4(temp, 0u));
>+})";
> 
>-    ANGLE_GL_COMPUTE_PROGRAM(program, csSource);
>+    ANGLE_GL_COMPUTE_PROGRAM(program, kCS);
> 
>     glUseProgram(program.get());
>     glDispatchCompute(8, 4, 2);
>     EXPECT_GL_NO_ERROR();
> }
> 
>+// Basic test for DispatchComputeIndirect.
>+TEST_P(ComputeShaderTest, DispatchComputeIndirect)
>+{
>+    // Flaky crash on teardown, see http://anglebug.com/3349
>+    ANGLE_SKIP_TEST_IF(IsD3D11() && IsIntel() && IsWindows());
>+
>+    GLTexture texture;
>+    GLFramebuffer framebuffer;
>+    const char kCSSource[] = R"(#version 310 es
>+layout(local_size_x=1, local_size_y=1, local_size_z=1) in;
>+layout(r32ui, binding = 0) uniform highp uimage2D uImage;
>+void main()
>+{
>+    imageStore(uImage, ivec2(gl_WorkGroupID.x, gl_WorkGroupID.y), uvec4(100, 0, 0, 0));
>+})";
>+
>+    ANGLE_GL_COMPUTE_PROGRAM(program, kCSSource);
>+    glUseProgram(program.get());
>+    const int kWidth = 4, kHeight = 6;
>+    GLuint inputValues[] = {0};
>+
>+    GLBuffer buffer;
>+    glBindBuffer(GL_DISPATCH_INDIRECT_BUFFER, buffer);
>+    GLuint params[] = {kWidth, kHeight, 1};
>+    glBufferData(GL_DISPATCH_INDIRECT_BUFFER, sizeof(params), params, GL_STATIC_DRAW);
>+
>+    glBindTexture(GL_TEXTURE_2D, texture);
>+    glTexStorage2D(GL_TEXTURE_2D, 1, GL_R32UI, kWidth, kHeight);
>+    glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, kWidth, kHeight, GL_RED_INTEGER, GL_UNSIGNED_INT,
>+                    inputValues);
>+    EXPECT_GL_NO_ERROR();
>+
>+    glBindImageTexture(0, texture, 0, GL_FALSE, 0, GL_WRITE_ONLY, GL_R32UI);
>+    EXPECT_GL_NO_ERROR();
>+
>+    glDispatchComputeIndirect(0);
>+    EXPECT_GL_NO_ERROR();
>+
>+    glMemoryBarrier(GL_TEXTURE_UPDATE_BARRIER_BIT);
>+    glUseProgram(0);
>+    GLuint outputValues[kWidth][kHeight];
>+    GLuint expectedValue = 100u;
>+    glBindFramebuffer(GL_READ_FRAMEBUFFER, framebuffer);
>+
>+    glFramebufferTexture2D(GL_READ_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, texture, 0);
>+    EXPECT_GL_NO_ERROR();
>+    glReadPixels(0, 0, kWidth, kHeight, GL_RED_INTEGER, GL_UNSIGNED_INT, outputValues);
>+    EXPECT_GL_NO_ERROR();
>+
>+    for (int i = 0; i < kWidth; i++)
>+    {
>+        for (int j = 0; j < kHeight; j++)
>+        {
>+            EXPECT_EQ(expectedValue, outputValues[i][j]);
>+        }
>+    }
>+}
>+
> // Use image uniform to write texture in compute shader, and verify the content is expected.
> TEST_P(ComputeShaderTest, BindImageTexture)
> {
>-    ANGLE_SKIP_TEST_IF(IsD3D11());
>-
>     GLTexture mTexture[2];
>     GLFramebuffer mFramebuffer;
>-    const std::string csSource =
>-        R"(#version 310 es
>-        layout(local_size_x=2, local_size_y=2, local_size_z=1) in;
>-        layout(r32ui, binding = 0) writeonly uniform highp uimage2D uImage[2];
>-        void main()
>-        {
>-            imageStore(uImage[0], ivec2(gl_LocalInvocationIndex, gl_WorkGroupID.x), uvec4(100, 0,
>-        0, 0));
>-            imageStore(uImage[1], ivec2(gl_LocalInvocationIndex, gl_WorkGroupID.x), uvec4(100, 0,
>-        0, 0));
>-        })";
>+    constexpr char kCS[] = R"(#version 310 es
>+layout(local_size_x=1, local_size_y=1, local_size_z=1) in;
>+layout(r32ui, binding = 0) writeonly uniform highp uimage2D uImage[2];
>+void main()
>+{
>+    imageStore(uImage[0], ivec2(gl_LocalInvocationIndex, gl_WorkGroupID.x), uvec4(100, 0,
>+0, 0));
>+    imageStore(uImage[1], ivec2(gl_LocalInvocationIndex, gl_WorkGroupID.x), uvec4(100, 0,
>+0, 0));
>+})";
> 
>-    ANGLE_GL_COMPUTE_PROGRAM(program, csSource);
>+    ANGLE_GL_COMPUTE_PROGRAM(program, kCS);
>     glUseProgram(program.get());
>-    int width = 4, height = 2;
>-    GLuint inputValues[] = {200, 200, 200, 200, 200, 200, 200, 200};
>+    int width = 1, height = 1;
>+    GLuint inputValues[] = {200};
> 
>     glBindTexture(GL_TEXTURE_2D, mTexture[0]);
>     glTexStorage2D(GL_TEXTURE_2D, 1, GL_R32UI, width, height);
>@@ -385,11 +478,12 @@ TEST_P(ComputeShaderTest, BindImageTexture)
>     glBindImageTexture(1, mTexture[1], 0, GL_FALSE, 0, GL_WRITE_ONLY, GL_R32UI);
>     EXPECT_GL_NO_ERROR();
> 
>-    glDispatchCompute(2, 1, 1);
>+    glDispatchCompute(1, 1, 1);
>     EXPECT_GL_NO_ERROR();
> 
>+    glMemoryBarrier(GL_TEXTURE_UPDATE_BARRIER_BIT);
>     glUseProgram(0);
>-    GLuint outputValues[2][8];
>+    GLuint outputValues[2][1];
>     GLuint expectedValue = 100;
>     glBindFramebuffer(GL_READ_FRAMEBUFFER, mFramebuffer);
> 
>@@ -423,20 +517,19 @@ TEST_P(ComputeShaderTest, ImageArrayWithoutBindingQualifier)
> 
>     GLTexture mTexture;
>     GLFramebuffer mFramebuffer;
>-    const std::string csSource =
>-        R"(#version 310 es
>-        layout(local_size_x=2, local_size_y=2, local_size_z=1) in;
>-        layout(r32ui) writeonly uniform highp uimage2D uImage[2];
>-        void main()
>-        {
>-            imageStore(uImage[0], ivec2(gl_LocalInvocationIndex, 0), uvec4(100, 0, 0, 0));
>-            imageStore(uImage[1], ivec2(gl_LocalInvocationIndex, 1), uvec4(100, 0, 0, 0));
>-        })";
>+    constexpr char kCS[] = R"(#version 310 es
>+layout(local_size_x=1, local_size_y=1, local_size_z=1) in;
>+layout(r32ui) writeonly uniform highp uimage2D uImage[2];
>+void main()
>+{
>+    imageStore(uImage[0], ivec2(gl_LocalInvocationIndex, 0), uvec4(100, 0, 0, 0));
>+    imageStore(uImage[1], ivec2(gl_LocalInvocationIndex, 1), uvec4(100, 0, 0, 0));
>+})";
> 
>-    ANGLE_GL_COMPUTE_PROGRAM(program, csSource);
>+    ANGLE_GL_COMPUTE_PROGRAM(program, kCS);
>     glUseProgram(program.get());
>-    constexpr int kTextureWidth = 4, kTextureHeight = 2;
>-    GLuint inputValues[] = {200, 200, 200, 200, 200, 200, 200, 200};
>+    constexpr int kTextureWidth = 1, kTextureHeight = 2;
>+    GLuint inputValues[] = {200, 200};
> 
>     glBindTexture(GL_TEXTURE_2D, mTexture);
>     glTexStorage2D(GL_TEXTURE_2D, 1, GL_R32UI, kTextureWidth, kTextureHeight);
>@@ -448,11 +541,12 @@ TEST_P(ComputeShaderTest, ImageArrayWithoutBindingQualifier)
>     glDispatchCompute(1, 1, 1);
>     EXPECT_GL_NO_ERROR();
> 
>+    glMemoryBarrier(GL_TEXTURE_UPDATE_BARRIER_BIT);
>     glUseProgram(0);
>     glBindFramebuffer(GL_READ_FRAMEBUFFER, mFramebuffer);
> 
>     glFramebufferTexture2D(GL_READ_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, mTexture, 0);
>-    GLuint outputValues[8];
>+    GLuint outputValues[kTextureWidth * kTextureHeight];
>     glReadPixels(0, 0, kTextureWidth, kTextureHeight, GL_RED_INTEGER, GL_UNSIGNED_INT,
>                  outputValues);
>     EXPECT_GL_NO_ERROR();
>@@ -467,77 +561,2438 @@ TEST_P(ComputeShaderTest, ImageArrayWithoutBindingQualifier)
> // imageLoad functions
> TEST_P(ComputeShaderTest, ImageLoad)
> {
>-    const std::string csSource =
>-        R"(#version 310 es
>-        layout(local_size_x=8) in;
>-        layout(rgba8) uniform highp readonly image2D mImage2DInput;
>-        layout(rgba16i) uniform highp readonly iimageCube mImageCubeInput;
>-        layout(rgba32ui) uniform highp readonly uimage3D mImage3DInput;
>-        layout(r32i) uniform highp writeonly iimage2D imageOut;
>-        void main()
>-        {
>-            vec4 result2d = imageLoad(mImage2DInput, ivec2(gl_LocalInvocationID.xy));
>-            ivec4 resultCube = imageLoad(mImageCubeInput, ivec3(gl_LocalInvocationID.xyz));
>-            uvec4 result3d = imageLoad(mImage3DInput, ivec3(gl_LocalInvocationID.xyz));
>-            imageStore(imageOut, ivec2(gl_LocalInvocationIndex, 0), ivec4(result2d) + resultCube + ivec4(result3d));
>-        })";
>+    constexpr char kCS[] = R"(#version 310 es
>+layout(local_size_x=8) in;
>+layout(rgba8) uniform highp readonly image2D mImage2DInput;
>+layout(rgba16i) uniform highp readonly iimageCube mImageCubeInput;
>+layout(rgba32ui) uniform highp readonly uimage3D mImage3DInput;
>+layout(r32i) uniform highp writeonly iimage2D imageOut;
>+void main()
>+{
>+    vec4 result2d = imageLoad(mImage2DInput, ivec2(gl_LocalInvocationID.xy));
>+    ivec4 resultCube = imageLoad(mImageCubeInput, ivec3(gl_LocalInvocationID.xyz));
>+    uvec4 result3d = imageLoad(mImage3DInput, ivec3(gl_LocalInvocationID.xyz));
>+    imageStore(imageOut, ivec2(gl_LocalInvocationIndex, 0), ivec4(result2d) + resultCube + ivec4(result3d));
>+})";
> 
>-    ANGLE_GL_COMPUTE_PROGRAM(program, csSource);
>+    ANGLE_GL_COMPUTE_PROGRAM(program, kCS);
>     EXPECT_GL_NO_ERROR();
> }
> 
> // imageStore functions
> TEST_P(ComputeShaderTest, ImageStore)
> {
>-    const std::string csSource =
>-        R"(#version 310 es
>-        layout(local_size_x=8) in;
>-        layout(rgba16f) uniform highp writeonly imageCube mImageCubeOutput;
>-        layout(r32f) uniform highp writeonly image3D mImage3DOutput;
>-        layout(rgba8ui) uniform highp writeonly uimage2DArray mImage2DArrayOutput;
>-        void main()
>-        {
>-            imageStore(mImageCubeOutput, ivec3(gl_LocalInvocationID.xyz), vec4(0.0));
>-            imageStore(mImage3DOutput, ivec3(gl_LocalInvocationID.xyz), vec4(0.0));
>-            imageStore(mImage2DArrayOutput, ivec3(gl_LocalInvocationID.xyz), uvec4(0));
>-        })";
>+    constexpr char kCS[] = R"(#version 310 es
>+layout(local_size_x=8) in;
>+layout(rgba16f) uniform highp writeonly imageCube mImageCubeOutput;
>+layout(r32f) uniform highp writeonly image3D mImage3DOutput;
>+layout(rgba8ui) uniform highp writeonly uimage2DArray mImage2DArrayOutput;
>+void main()
>+{
>+    imageStore(mImageCubeOutput, ivec3(gl_LocalInvocationID.xyz), vec4(0.0));
>+    imageStore(mImage3DOutput, ivec3(gl_LocalInvocationID.xyz), vec4(0.0));
>+    imageStore(mImage2DArrayOutput, ivec3(gl_LocalInvocationID.xyz), uvec4(0));
>+})";
> 
>-    ANGLE_GL_COMPUTE_PROGRAM(program, csSource);
>+    ANGLE_GL_COMPUTE_PROGRAM(program, kCS);
>     EXPECT_GL_NO_ERROR();
> }
> 
> // imageSize functions
> TEST_P(ComputeShaderTest, ImageSize)
> {
>-    const std::string csSource =
>-        R"(#version 310 es
>-        layout(local_size_x=8) in;
>-        layout(rgba8) uniform highp readonly imageCube mImageCubeInput;
>-        layout(r32i) uniform highp readonly iimage2D mImage2DInput;
>-        layout(rgba16ui) uniform highp readonly uimage2DArray mImage2DArrayInput;
>-        layout(r32i) uniform highp writeonly iimage2D imageOut;
>-        void main()
>+    constexpr char kCS[] = R"(#version 310 es
>+layout(local_size_x=8) in;
>+layout(rgba8) uniform highp readonly imageCube mImageCubeInput;
>+layout(r32i) uniform highp readonly iimage2D mImage2DInput;
>+layout(rgba16ui) uniform highp readonly uimage2DArray mImage2DArrayInput;
>+layout(r32i) uniform highp writeonly iimage2D imageOut;
>+void main()
>+{
>+    ivec2 sizeCube = imageSize(mImageCubeInput);
>+    ivec2 size2D = imageSize(mImage2DInput);
>+    ivec3 size2DArray = imageSize(mImage2DArrayInput);
>+    imageStore(imageOut, ivec2(gl_LocalInvocationIndex, 0), ivec4(sizeCube, size2D.x, size2DArray.x));
>+})";
>+
>+    ANGLE_GL_COMPUTE_PROGRAM(program, kCS);
>+    EXPECT_GL_NO_ERROR();
>+}
>+
>+// Test that texelFetch works well in compute shader.
>+TEST_P(ComputeShaderTest, TexelFetchFunction)
>+{
>+    constexpr char kCS[] = R"(#version 310 es
>+layout(local_size_x=16, local_size_y=16) in;
>+precision highp usampler2D;
>+uniform usampler2D tex;
>+layout(std140, binding = 0) buffer buf {
>+    uint outData[16][16];
>+};
>+
>+void main()
>+{
>+    uint x = gl_LocalInvocationID.x;
>+    uint y = gl_LocalInvocationID.y;
>+    outData[y][x] = texelFetch(tex, ivec2(x, y), 0).x;
>+})";
>+
>+    constexpr unsigned int kWidth  = 16;
>+    constexpr unsigned int kHeight = 16;
>+    GLTexture tex;
>+    glBindTexture(GL_TEXTURE_2D, tex);
>+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
>+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
>+    glTexStorage2D(GL_TEXTURE_2D, 1, GL_R32UI, kWidth, kHeight);
>+    GLuint texels[kHeight][kWidth] = {{0}};
>+    for (unsigned int y = 0; y < kHeight; ++y)
>+    {
>+        for (unsigned int x = 0; x < kWidth; ++x)
>         {
>-            ivec2 sizeCube = imageSize(mImageCubeInput);
>-            ivec2 size2D = imageSize(mImage2DInput);
>-            ivec3 size2DArray = imageSize(mImage2DArrayInput);
>-            imageStore(imageOut, ivec2(gl_LocalInvocationIndex, 0), ivec4(sizeCube, size2D.x, size2DArray.x));
>-        })";
>+            texels[y][x] = x + y * kWidth;
>+        }
>+    }
>+    glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
>+    glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, kWidth, kHeight, GL_RED_INTEGER, GL_UNSIGNED_INT,
>+                    texels);
>+    glBindTexture(GL_TEXTURE_2D, 0);
>+
>+    // The array stride are rounded up to the base alignment of a vec4 for std140 layout.
>+    constexpr unsigned int kArrayStride = 16;
>+    GLBuffer ssbo;
>+    glBindBuffer(GL_SHADER_STORAGE_BUFFER, ssbo);
>+    glBufferData(GL_SHADER_STORAGE_BUFFER, kWidth * kHeight * kArrayStride, nullptr,
>+                 GL_STREAM_DRAW);
>+    glBindBuffer(GL_SHADER_STORAGE_BUFFER, 0);
>+    EXPECT_GL_NO_ERROR();
> 
>-    ANGLE_GL_COMPUTE_PROGRAM(program, csSource);
>+    ANGLE_GL_COMPUTE_PROGRAM(program, kCS);
>+    glUseProgram(program);
>+
>+    glActiveTexture(GL_TEXTURE0);
>+    glBindTexture(GL_TEXTURE_2D, tex);
>+    glUniform1i(glGetUniformLocation(program, "tex"), 0);
>+    glBindBuffer(GL_SHADER_STORAGE_BUFFER, ssbo);
>+    glBindBufferBase(GL_SHADER_STORAGE_BUFFER, 0, ssbo);
>+
>+    glDispatchCompute(1, 1, 1);
>+
>+    glBindBuffer(GL_SHADER_STORAGE_BUFFER, ssbo);
>+    const GLuint *ptr = reinterpret_cast<const GLuint *>(glMapBufferRange(
>+        GL_SHADER_STORAGE_BUFFER, 0, kWidth * kHeight * kArrayStride, GL_MAP_READ_BIT));
>     EXPECT_GL_NO_ERROR();
>+    for (unsigned int idx = 0; idx < kWidth * kHeight; idx++)
>+    {
>+        EXPECT_EQ(idx, *(ptr + idx * kArrayStride / 4));
>+    }
> }
> 
>-// Check that it is not possible to create a compute shader when the context does not support ES
>-// 3.10
>-TEST_P(ComputeShaderTestES3, NotSupported)
>+// Test that texture function works well in compute shader.
>+TEST_P(ComputeShaderTest, TextureFunction)
> {
>-    GLuint computeShaderHandle = glCreateShader(GL_COMPUTE_SHADER);
>-    EXPECT_EQ(0u, computeShaderHandle);
>-    EXPECT_GL_ERROR(GL_INVALID_ENUM);
>+    constexpr char kCS[] = R"(#version 310 es
>+layout(local_size_x=16, local_size_y=16) in;
>+precision highp usampler2D;
>+uniform usampler2D tex;
>+layout(std140, binding = 0) buffer buf {
>+    uint outData[16][16];
>+};
>+
>+void main()
>+{
>+    uint x = gl_LocalInvocationID.x;
>+    uint y = gl_LocalInvocationID.y;
>+    float xCoord = float(x) / float(16);
>+    float yCoord = float(y) / float(16);
>+    outData[y][x] = texture(tex, vec2(xCoord, yCoord)).x;
>+})";
>+
>+    constexpr unsigned int kWidth  = 16;
>+    constexpr unsigned int kHeight = 16;
>+    GLTexture tex;
>+    glBindTexture(GL_TEXTURE_2D, tex);
>+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
>+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
>+    glTexStorage2D(GL_TEXTURE_2D, 1, GL_R32UI, kWidth, kHeight);
>+    GLuint texels[kHeight][kWidth] = {{0}};
>+    for (unsigned int y = 0; y < kHeight; ++y)
>+    {
>+        for (unsigned int x = 0; x < kWidth; ++x)
>+        {
>+            texels[y][x] = x + y * kWidth;
>+        }
>+    }
>+    glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
>+    glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, kWidth, kHeight, GL_RED_INTEGER, GL_UNSIGNED_INT,
>+                    texels);
>+    glBindTexture(GL_TEXTURE_2D, 0);
>+
>+    // The array stride are rounded up to the base alignment of a vec4 for std140 layout.
>+    constexpr unsigned int kArrayStride = 16;
>+    GLBuffer ssbo;
>+    glBindBuffer(GL_SHADER_STORAGE_BUFFER, ssbo);
>+    glBufferData(GL_SHADER_STORAGE_BUFFER, kWidth * kHeight * kArrayStride, nullptr,
>+                 GL_STREAM_DRAW);
>+    glBindBuffer(GL_SHADER_STORAGE_BUFFER, 0);
>+    EXPECT_GL_NO_ERROR();
>+
>+    ANGLE_GL_COMPUTE_PROGRAM(program, kCS);
>+    glUseProgram(program);
>+
>+    glActiveTexture(GL_TEXTURE0);
>+    glBindTexture(GL_TEXTURE_2D, tex);
>+    glUniform1i(glGetUniformLocation(program, "tex"), 0);
>+    glBindBuffer(GL_SHADER_STORAGE_BUFFER, ssbo);
>+    glBindBufferBase(GL_SHADER_STORAGE_BUFFER, 0, ssbo);
>+
>+    glDispatchCompute(1, 1, 1);
>+
>+    glBindBuffer(GL_SHADER_STORAGE_BUFFER, ssbo);
>+    const GLuint *ptr = reinterpret_cast<const GLuint *>(glMapBufferRange(
>+        GL_SHADER_STORAGE_BUFFER, 0, kWidth * kHeight * kArrayStride, GL_MAP_READ_BIT));
>+    EXPECT_GL_NO_ERROR();
>+    for (unsigned int idx = 0; idx < kWidth * kHeight; idx++)
>+    {
>+        EXPECT_EQ(idx, *(ptr + idx * kArrayStride / 4));
>+    }
> }
> 
>-ANGLE_INSTANTIATE_TEST(ComputeShaderTest, ES31_OPENGL(), ES31_OPENGLES(), ES31_D3D11());
>-ANGLE_INSTANTIATE_TEST(ComputeShaderTestES3, ES3_OPENGL(), ES3_OPENGLES());
>+// Test mixed use of sampler and image.
>+TEST_P(ComputeShaderTest, SamplingAndImageReadWrite)
>+{
>+    GLTexture texture[3];
>+    GLFramebuffer framebuffer;
>+    constexpr char kCS[] = R"(#version 310 es
>+layout(local_size_x=1, local_size_y=1, local_size_z=1) in;
>+layout(r32ui, binding = 0) readonly uniform highp uimage2D uImage_1;
>+layout(r32ui, binding = 1) writeonly uniform highp uimage2D uImage_2;
>+precision highp usampler2D;
>+uniform usampler2D tex;
>+void main()
>+{
>+    uvec4 value_1 = texelFetch(tex, ivec2(gl_LocalInvocationID.xy), 0);
>+    uvec4 value_2 = imageLoad(uImage_1, ivec2(gl_LocalInvocationID.xy));
>+    imageStore(uImage_2, ivec2(gl_LocalInvocationID.xy), value_1 + value_2);
>+})";
>+
>+    constexpr int kWidth = 1, kHeight = 1;
>+    constexpr GLuint kInputValues[3][1] = {{50}, {100}, {20}};
>+
>+    glBindTexture(GL_TEXTURE_2D, texture[0]);
>+    glTexStorage2D(GL_TEXTURE_2D, 1, GL_R32UI, kWidth, kHeight);
>+    glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, kWidth, kHeight, GL_RED_INTEGER, GL_UNSIGNED_INT,
>+                    kInputValues[0]);
>+    glBindTexture(GL_TEXTURE_2D, texture[2]);
>+    glTexStorage2D(GL_TEXTURE_2D, 1, GL_R32UI, kWidth, kHeight);
>+    glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, kWidth, kHeight, GL_RED_INTEGER, GL_UNSIGNED_INT,
>+                    kInputValues[2]);
>+    EXPECT_GL_NO_ERROR();
>+    glBindTexture(GL_TEXTURE_2D, 0);
>+
>+    glBindTexture(GL_TEXTURE_2D, texture[1]);
>+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
>+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
>+    glTexStorage2D(GL_TEXTURE_2D, 1, GL_R32UI, kWidth, kHeight);
>+    glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
>+    glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, kWidth, kHeight, GL_RED_INTEGER, GL_UNSIGNED_INT,
>+                    kInputValues[1]);
>+
>+    EXPECT_GL_NO_ERROR();
>+
>+    ANGLE_GL_COMPUTE_PROGRAM(program, kCS);
>+    glUseProgram(program.get());
>+
>+    glBindImageTexture(0, texture[0], 0, GL_FALSE, 0, GL_READ_ONLY, GL_R32UI);
>+    glBindImageTexture(1, texture[2], 0, GL_FALSE, 0, GL_WRITE_ONLY, GL_R32UI);
>+    EXPECT_GL_NO_ERROR();
>+
>+    glDispatchCompute(1, 1, 1);
>+    EXPECT_GL_NO_ERROR();
>+
>+    glMemoryBarrier(GL_TEXTURE_UPDATE_BARRIER_BIT);
>+    GLuint outputValues[kWidth * kHeight];
>+    constexpr GLuint expectedValue = 150;
>+    glUseProgram(0);
>+    glBindFramebuffer(GL_READ_FRAMEBUFFER, framebuffer);
>+
>+    glFramebufferTexture2D(GL_READ_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, texture[2], 0);
>+    EXPECT_GL_NO_ERROR();
>+    glReadPixels(0, 0, kWidth, kHeight, GL_RED_INTEGER, GL_UNSIGNED_INT, outputValues);
>+    EXPECT_GL_NO_ERROR();
>+
>+    for (int i = 0; i < kWidth * kHeight; i++)
>+    {
>+        EXPECT_EQ(expectedValue, outputValues[i]);
>+    }
>+}
> 
>+// Use image uniform to read and write Texture2D in compute shader, and verify the contents.
>+TEST_P(ComputeShaderTest, BindImageTextureWithTexture2D)
>+{
>+    GLTexture texture[2];
>+    GLFramebuffer framebuffer;
>+    constexpr char kCS[] = R"(#version 310 es
>+layout(local_size_x=1, local_size_y=1, local_size_z=1) in;
>+layout(r32ui, binding = 0) readonly uniform highp uimage2D uImage_1;
>+layout(r32ui, binding = 1) writeonly uniform highp uimage2D uImage_2;
>+void main()
>+{
>+    uvec4 value = imageLoad(uImage_1, ivec2(gl_LocalInvocationID.xy));
>+    imageStore(uImage_2, ivec2(gl_LocalInvocationID.xy), value);
>+})";
>+
>+    constexpr int kWidth = 1, kHeight = 1;
>+    constexpr GLuint kInputValues[2][1] = {{200}, {100}};
>+
>+    glBindTexture(GL_TEXTURE_2D, texture[0]);
>+    glTexStorage2D(GL_TEXTURE_2D, 1, GL_R32UI, kWidth, kHeight);
>+    glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, kWidth, kHeight, GL_RED_INTEGER, GL_UNSIGNED_INT,
>+                    kInputValues[0]);
>+    EXPECT_GL_NO_ERROR();
>+
>+    glBindTexture(GL_TEXTURE_2D, texture[1]);
>+    glTexStorage2D(GL_TEXTURE_2D, 1, GL_R32UI, kWidth, kHeight);
>+    glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, kWidth, kHeight, GL_RED_INTEGER, GL_UNSIGNED_INT,
>+                    kInputValues[1]);
>+    EXPECT_GL_NO_ERROR();
>+
>+    ANGLE_GL_COMPUTE_PROGRAM(program, kCS);
>+    glUseProgram(program.get());
>+
>+    glBindImageTexture(0, texture[0], 0, GL_FALSE, 0, GL_READ_ONLY, GL_R32UI);
>+    EXPECT_GL_NO_ERROR();
>+
>+    glBindImageTexture(1, texture[1], 0, GL_FALSE, 0, GL_WRITE_ONLY, GL_R32UI);
>+    EXPECT_GL_NO_ERROR();
>+
>+    glDispatchCompute(1, 1, 1);
>+    EXPECT_GL_NO_ERROR();
>+
>+    glMemoryBarrier(GL_TEXTURE_UPDATE_BARRIER_BIT);
>+    GLuint outputValues[kWidth * kHeight];
>+    constexpr GLuint expectedValue = 200;
>+    glUseProgram(0);
>+    glBindFramebuffer(GL_READ_FRAMEBUFFER, framebuffer);
>+
>+    glFramebufferTexture2D(GL_READ_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, texture[1], 0);
>+    EXPECT_GL_NO_ERROR();
>+    glReadPixels(0, 0, kWidth, kHeight, GL_RED_INTEGER, GL_UNSIGNED_INT, outputValues);
>+    EXPECT_GL_NO_ERROR();
>+
>+    for (int i = 0; i < kWidth * kHeight; i++)
>+    {
>+        EXPECT_EQ(expectedValue, outputValues[i]);
>+    }
>+}
>+
>+// Use image uniform to read and write Texture2DArray in compute shader, and verify the contents.
>+TEST_P(ComputeShaderTest, BindImageTextureWithTexture2DArray)
>+{
>+    GLTexture texture[2];
>+    GLFramebuffer framebuffer;
>+    constexpr char kCS[] = R"(#version 310 es
>+layout(local_size_x=2, local_size_y=2, local_size_z=2) in;
>+layout(r32ui, binding = 0) readonly uniform highp uimage2DArray uImage_1;
>+layout(r32ui, binding = 1) writeonly uniform highp uimage2DArray uImage_2;
>+void main()
>+{
>+    uvec4 value = imageLoad(uImage_1, ivec3(gl_LocalInvocationID.xyz));
>+    imageStore(uImage_2, ivec3(gl_LocalInvocationID.xyz), value);
>+})";
>+
>+    constexpr int kWidth = 1, kHeight = 1, kDepth = 2;
>+    constexpr GLuint kInputValues[2][2] = {{200, 200}, {100, 100}};
>+
>+    glBindTexture(GL_TEXTURE_2D_ARRAY, texture[0]);
>+    glTexStorage3D(GL_TEXTURE_2D_ARRAY, 1, GL_R32UI, kWidth, kHeight, kDepth);
>+    glTexSubImage3D(GL_TEXTURE_2D_ARRAY, 0, 0, 0, 0, kWidth, kHeight, kDepth, GL_RED_INTEGER,
>+                    GL_UNSIGNED_INT, kInputValues[0]);
>+    EXPECT_GL_NO_ERROR();
>+
>+    glBindTexture(GL_TEXTURE_2D_ARRAY, texture[1]);
>+    glTexStorage3D(GL_TEXTURE_2D_ARRAY, 1, GL_R32UI, kWidth, kHeight, kDepth);
>+    glTexSubImage3D(GL_TEXTURE_2D_ARRAY, 0, 0, 0, 0, kWidth, kHeight, kDepth, GL_RED_INTEGER,
>+                    GL_UNSIGNED_INT, kInputValues[1]);
>+    EXPECT_GL_NO_ERROR();
>+
>+    ANGLE_GL_COMPUTE_PROGRAM(program, kCS);
>+    glUseProgram(program.get());
>+
>+    glBindImageTexture(0, texture[0], 0, GL_TRUE, 0, GL_READ_ONLY, GL_R32UI);
>+    EXPECT_GL_NO_ERROR();
>+
>+    glBindImageTexture(1, texture[1], 0, GL_TRUE, 0, GL_WRITE_ONLY, GL_R32UI);
>+    EXPECT_GL_NO_ERROR();
>+
>+    glDispatchCompute(1, 1, 1);
>+    EXPECT_GL_NO_ERROR();
>+
>+    glMemoryBarrier(GL_TEXTURE_UPDATE_BARRIER_BIT);
>+    GLuint outputValues[kWidth * kHeight];
>+    constexpr GLuint expectedValue = 200;
>+    glUseProgram(0);
>+    glBindFramebuffer(GL_READ_FRAMEBUFFER, framebuffer);
>+
>+    glFramebufferTextureLayer(GL_READ_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, texture[1], 0, 0);
>+    glFramebufferTextureLayer(GL_READ_FRAMEBUFFER, GL_COLOR_ATTACHMENT1, texture[1], 0, 1);
>+    EXPECT_GL_NO_ERROR();
>+    glReadBuffer(GL_COLOR_ATTACHMENT0);
>+    glReadPixels(0, 0, kWidth, kHeight, GL_RED_INTEGER, GL_UNSIGNED_INT, outputValues);
>+    EXPECT_GL_NO_ERROR();
>+    for (int i = 0; i < kWidth * kHeight; i++)
>+    {
>+        EXPECT_EQ(expectedValue, outputValues[i]);
>+    }
>+    glReadBuffer(GL_COLOR_ATTACHMENT1);
>+    glReadPixels(0, 0, kWidth, kHeight, GL_RED_INTEGER, GL_UNSIGNED_INT, outputValues);
>+    EXPECT_GL_NO_ERROR();
>+    for (int i = 0; i < kWidth * kHeight; i++)
>+    {
>+        EXPECT_EQ(expectedValue, outputValues[i]);
>+    }
>+}
>+
>+// Use image uniform to read and write Texture3D in compute shader, and verify the contents.
>+TEST_P(ComputeShaderTest, BindImageTextureWithTexture3D)
>+{
>+    GLTexture texture[2];
>+    GLFramebuffer framebuffer;
>+    constexpr char kCS[] = R"(#version 310 es
>+layout(local_size_x=1, local_size_y=1, local_size_z=2) in;
>+layout(r32ui, binding = 0) readonly uniform highp uimage3D uImage_1;
>+layout(r32ui, binding = 1) writeonly uniform highp uimage3D uImage_2;
>+void main()
>+{
>+    uvec4 value = imageLoad(uImage_1, ivec3(gl_LocalInvocationID.xyz));
>+    imageStore(uImage_2, ivec3(gl_LocalInvocationID.xyz), value);
>+})";
>+
>+    constexpr int kWidth = 1, kHeight = 1, kDepth = 2;
>+    constexpr GLuint kInputValues[2][2] = {{200, 200}, {100, 100}};
>+
>+    glBindTexture(GL_TEXTURE_3D, texture[0]);
>+    glTexStorage3D(GL_TEXTURE_3D, 1, GL_R32UI, kWidth, kHeight, kDepth);
>+    glTexSubImage3D(GL_TEXTURE_3D, 0, 0, 0, 0, kWidth, kHeight, kDepth, GL_RED_INTEGER,
>+                    GL_UNSIGNED_INT, kInputValues[0]);
>+    EXPECT_GL_NO_ERROR();
>+
>+    glBindTexture(GL_TEXTURE_3D, texture[1]);
>+    glTexStorage3D(GL_TEXTURE_3D, 1, GL_R32UI, kWidth, kHeight, kDepth);
>+    glTexSubImage3D(GL_TEXTURE_3D, 0, 0, 0, 0, kWidth, kHeight, kDepth, GL_RED_INTEGER,
>+                    GL_UNSIGNED_INT, kInputValues[1]);
>+    EXPECT_GL_NO_ERROR();
>+
>+    ANGLE_GL_COMPUTE_PROGRAM(program, kCS);
>+    glUseProgram(program.get());
>+
>+    glBindImageTexture(0, texture[0], 0, GL_TRUE, 0, GL_READ_ONLY, GL_R32UI);
>+    EXPECT_GL_NO_ERROR();
>+
>+    glBindImageTexture(1, texture[1], 0, GL_TRUE, 0, GL_WRITE_ONLY, GL_R32UI);
>+    EXPECT_GL_NO_ERROR();
>+
>+    glDispatchCompute(1, 1, 1);
>+    EXPECT_GL_NO_ERROR();
>+
>+    glMemoryBarrier(GL_TEXTURE_UPDATE_BARRIER_BIT);
>+    GLuint outputValues[kWidth * kHeight];
>+    constexpr GLuint expectedValue = 200;
>+    glUseProgram(0);
>+    glBindFramebuffer(GL_READ_FRAMEBUFFER, framebuffer);
>+
>+    glFramebufferTextureLayer(GL_READ_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, texture[1], 0, 0);
>+    glFramebufferTextureLayer(GL_READ_FRAMEBUFFER, GL_COLOR_ATTACHMENT1, texture[1], 0, 1);
>+    EXPECT_GL_NO_ERROR();
>+    glReadBuffer(GL_COLOR_ATTACHMENT0);
>+    glReadPixels(0, 0, kWidth, kHeight, GL_RED_INTEGER, GL_UNSIGNED_INT, outputValues);
>+    EXPECT_GL_NO_ERROR();
>+    for (int i = 0; i < kWidth * kHeight; i++)
>+    {
>+        EXPECT_EQ(expectedValue, outputValues[i]);
>+    }
>+    glReadBuffer(GL_COLOR_ATTACHMENT1);
>+    glReadPixels(0, 0, kWidth, kHeight, GL_RED_INTEGER, GL_UNSIGNED_INT, outputValues);
>+    EXPECT_GL_NO_ERROR();
>+    for (int i = 0; i < kWidth * kHeight; i++)
>+    {
>+        EXPECT_EQ(expectedValue, outputValues[i]);
>+    }
>+}
>+
>+// Use image uniform to read and write TextureCube in compute shader, and verify the contents.
>+TEST_P(ComputeShaderTest, BindImageTextureWithTextureCube)
>+{
>+    GLTexture texture[2];
>+    GLFramebuffer framebuffer;
>+    constexpr char kCS[] = R"(#version 310 es
>+layout(local_size_x=1, local_size_y=1, local_size_z=1) in;
>+layout(r32ui, binding = 0) readonly uniform highp uimageCube uImage_1;
>+layout(r32ui, binding = 1) writeonly uniform highp uimageCube uImage_2;
>+void main()
>+{
>+    for (int i = 0; i < 6; i++)
>+    {
>+        uvec4 value = imageLoad(uImage_1, ivec3(gl_LocalInvocationID.xy, i));
>+        imageStore(uImage_2, ivec3(gl_LocalInvocationID.xy, i), value);
>+    }
>+})";
>+
>+    constexpr int kWidth = 1, kHeight = 1;
>+    constexpr GLuint kInputValues[2][1] = {{200}, {100}};
>+
>+    glBindTexture(GL_TEXTURE_CUBE_MAP, texture[0]);
>+    glTexStorage2D(GL_TEXTURE_CUBE_MAP, 1, GL_R32UI, kWidth, kHeight);
>+    for (GLenum face = GL_TEXTURE_CUBE_MAP_POSITIVE_X; face <= GL_TEXTURE_CUBE_MAP_NEGATIVE_Z;
>+         face++)
>+    {
>+        glTexSubImage2D(face, 0, 0, 0, kWidth, kHeight, GL_RED_INTEGER, GL_UNSIGNED_INT,
>+                        kInputValues[0]);
>+    }
>+    EXPECT_GL_NO_ERROR();
>+
>+    glBindTexture(GL_TEXTURE_CUBE_MAP, texture[1]);
>+    glTexStorage2D(GL_TEXTURE_CUBE_MAP, 1, GL_R32UI, kWidth, kHeight);
>+    for (GLenum face = GL_TEXTURE_CUBE_MAP_POSITIVE_X; face <= GL_TEXTURE_CUBE_MAP_NEGATIVE_Z;
>+         face++)
>+    {
>+        glTexSubImage2D(face, 0, 0, 0, kWidth, kHeight, GL_RED_INTEGER, GL_UNSIGNED_INT,
>+                        kInputValues[1]);
>+    }
>+    EXPECT_GL_NO_ERROR();
>+
>+    ANGLE_GL_COMPUTE_PROGRAM(program, kCS);
>+    glUseProgram(program.get());
>+
>+    glBindImageTexture(0, texture[0], 0, GL_TRUE, 0, GL_READ_ONLY, GL_R32UI);
>+    EXPECT_GL_NO_ERROR();
>+
>+    glBindImageTexture(1, texture[1], 0, GL_TRUE, 0, GL_WRITE_ONLY, GL_R32UI);
>+    EXPECT_GL_NO_ERROR();
>+
>+    glDispatchCompute(1, 1, 1);
>+    EXPECT_GL_NO_ERROR();
>+
>+    glMemoryBarrier(GL_TEXTURE_UPDATE_BARRIER_BIT);
>+    GLuint outputValues[kWidth * kHeight];
>+    constexpr GLuint expectedValue = 200;
>+    glUseProgram(0);
>+    glBindFramebuffer(GL_READ_FRAMEBUFFER, framebuffer);
>+
>+    for (GLenum face = 0; face < 6; face++)
>+    {
>+        glFramebufferTexture2D(GL_READ_FRAMEBUFFER, GL_COLOR_ATTACHMENT0,
>+                               GL_TEXTURE_CUBE_MAP_POSITIVE_X + face, texture[1], 0);
>+        EXPECT_GL_NO_ERROR();
>+        glReadPixels(0, 0, kWidth, kHeight, GL_RED_INTEGER, GL_UNSIGNED_INT, outputValues);
>+        EXPECT_GL_NO_ERROR();
>+
>+        for (int i = 0; i < kWidth * kHeight; i++)
>+        {
>+            EXPECT_EQ(expectedValue, outputValues[i]);
>+        }
>+    }
>+}
>+
>+// Use image uniform to read and write one layer of Texture2DArray in compute shader, and verify the
>+// contents.
>+TEST_P(ComputeShaderTest, BindImageTextureWithOneLayerTexture2DArray)
>+{
>+    GLTexture texture[2];
>+    GLFramebuffer framebuffer;
>+    constexpr char kCS[] = R"(#version 310 es
>+layout(local_size_x=1, local_size_y=1, local_size_z=1) in;
>+layout(r32ui, binding = 0) readonly uniform highp uimage2D uImage_1;
>+layout(r32ui, binding = 1) writeonly uniform highp uimage2D uImage_2;
>+void main()
>+{
>+    uvec4 value = imageLoad(uImage_1, ivec2(gl_LocalInvocationID.xy));
>+    imageStore(uImage_2, ivec2(gl_LocalInvocationID.xy), value);
>+})";
>+
>+    constexpr int kWidth = 1, kHeight = 1, kDepth = 2;
>+    constexpr int kResultSize           = kWidth * kHeight;
>+    constexpr GLuint kInputValues[2][2] = {{200, 150}, {100, 50}};
>+    constexpr GLuint expectedValue_1    = 200;
>+    constexpr GLuint expectedValue_2    = 100;
>+    GLuint outputValues[kResultSize];
>+
>+    glBindTexture(GL_TEXTURE_2D_ARRAY, texture[0]);
>+    glTexStorage3D(GL_TEXTURE_2D_ARRAY, 1, GL_R32UI, kWidth, kHeight, kDepth);
>+    glTexSubImage3D(GL_TEXTURE_2D_ARRAY, 0, 0, 0, 0, kWidth, kHeight, kDepth, GL_RED_INTEGER,
>+                    GL_UNSIGNED_INT, kInputValues[0]);
>+    EXPECT_GL_NO_ERROR();
>+
>+    glBindTexture(GL_TEXTURE_2D_ARRAY, texture[1]);
>+    glTexStorage3D(GL_TEXTURE_2D_ARRAY, 1, GL_R32UI, kWidth, kHeight, kDepth);
>+    glTexSubImage3D(GL_TEXTURE_2D_ARRAY, 0, 0, 0, 0, kWidth, kHeight, kDepth, GL_RED_INTEGER,
>+                    GL_UNSIGNED_INT, kInputValues[1]);
>+    EXPECT_GL_NO_ERROR();
>+
>+    ANGLE_GL_COMPUTE_PROGRAM(program, kCS);
>+    glUseProgram(program.get());
>+
>+    glBindImageTexture(0, texture[0], 0, GL_FALSE, 0, GL_READ_ONLY, GL_R32UI);
>+    EXPECT_GL_NO_ERROR();
>+    glBindImageTexture(1, texture[1], 0, GL_FALSE, 1, GL_WRITE_ONLY, GL_R32UI);
>+    EXPECT_GL_NO_ERROR();
>+    glDispatchCompute(1, 1, 1);
>+    EXPECT_GL_NO_ERROR();
>+
>+    glMemoryBarrier(GL_TEXTURE_UPDATE_BARRIER_BIT);
>+    glUseProgram(0);
>+    glBindFramebuffer(GL_READ_FRAMEBUFFER, framebuffer);
>+    glFramebufferTextureLayer(GL_READ_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, texture[1], 0, 0);
>+    glFramebufferTextureLayer(GL_READ_FRAMEBUFFER, GL_COLOR_ATTACHMENT1, texture[1], 0, 1);
>+    EXPECT_GL_NO_ERROR();
>+    glReadBuffer(GL_COLOR_ATTACHMENT0);
>+    glReadPixels(0, 0, kWidth, kHeight, GL_RED_INTEGER, GL_UNSIGNED_INT, outputValues);
>+    EXPECT_GL_NO_ERROR();
>+    for (int i = 0; i < kResultSize; i++)
>+    {
>+        EXPECT_EQ(expectedValue_2, outputValues[i]);
>+    }
>+    glReadBuffer(GL_COLOR_ATTACHMENT1);
>+    glReadPixels(0, 0, kWidth, kHeight, GL_RED_INTEGER, GL_UNSIGNED_INT, outputValues);
>+    EXPECT_GL_NO_ERROR();
>+    for (int i = 0; i < kResultSize; i++)
>+    {
>+        EXPECT_EQ(expectedValue_1, outputValues[i]);
>+    }
>+}
>+
>+// Use image uniform to read and write one layer of Texture3D in compute shader, and verify the
>+// contents.
>+TEST_P(ComputeShaderTest, BindImageTextureWithOneLayerTexture3D)
>+{
>+    GLTexture texture[2];
>+    GLFramebuffer framebuffer;
>+    constexpr char kCS[] = R"(#version 310 es
>+layout(local_size_x=1, local_size_y=1, local_size_z=1) in;
>+layout(r32ui, binding = 0) readonly uniform highp uimage2D uImage_1;
>+layout(r32ui, binding = 1) writeonly uniform highp uimage2D uImage_2;
>+void main()
>+{
>+    uvec4 value = imageLoad(uImage_1, ivec2(gl_LocalInvocationID.xy));
>+    imageStore(uImage_2, ivec2(gl_LocalInvocationID.xy), value);
>+})";
>+
>+    constexpr int kWidth = 1, kHeight = 1, kDepth = 2;
>+    constexpr int kResultSize           = kWidth * kHeight;
>+    constexpr GLuint kInputValues[2][2] = {{200, 150}, {100, 50}};
>+    constexpr GLuint expectedValue_1    = 150;
>+    constexpr GLuint expectedValue_2    = 50;
>+    GLuint outputValues[kResultSize];
>+
>+    glBindTexture(GL_TEXTURE_3D, texture[0]);
>+    glTexStorage3D(GL_TEXTURE_3D, 1, GL_R32UI, kWidth, kHeight, kDepth);
>+    glTexSubImage3D(GL_TEXTURE_3D, 0, 0, 0, 0, kWidth, kHeight, kDepth, GL_RED_INTEGER,
>+                    GL_UNSIGNED_INT, kInputValues[0]);
>+    EXPECT_GL_NO_ERROR();
>+
>+    glBindTexture(GL_TEXTURE_3D, texture[1]);
>+    glTexStorage3D(GL_TEXTURE_3D, 1, GL_R32UI, kWidth, kHeight, kDepth);
>+    glTexSubImage3D(GL_TEXTURE_3D, 0, 0, 0, 0, kWidth, kHeight, kDepth, GL_RED_INTEGER,
>+                    GL_UNSIGNED_INT, kInputValues[1]);
>+    EXPECT_GL_NO_ERROR();
>+
>+    ANGLE_GL_COMPUTE_PROGRAM(program, kCS);
>+    glUseProgram(program.get());
>+
>+    glBindImageTexture(0, texture[0], 0, GL_FALSE, 1, GL_READ_ONLY, GL_R32UI);
>+    EXPECT_GL_NO_ERROR();
>+    glBindImageTexture(1, texture[1], 0, GL_FALSE, 0, GL_WRITE_ONLY, GL_R32UI);
>+    EXPECT_GL_NO_ERROR();
>+    glDispatchCompute(1, 1, 1);
>+    EXPECT_GL_NO_ERROR();
>+
>+    glMemoryBarrier(GL_TEXTURE_UPDATE_BARRIER_BIT);
>+    glUseProgram(0);
>+    glBindFramebuffer(GL_READ_FRAMEBUFFER, framebuffer);
>+    glFramebufferTextureLayer(GL_READ_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, texture[1], 0, 0);
>+    glFramebufferTextureLayer(GL_READ_FRAMEBUFFER, GL_COLOR_ATTACHMENT1, texture[1], 0, 1);
>+    EXPECT_GL_NO_ERROR();
>+    glReadBuffer(GL_COLOR_ATTACHMENT0);
>+    glReadPixels(0, 0, kWidth, kHeight, GL_RED_INTEGER, GL_UNSIGNED_INT, outputValues);
>+    EXPECT_GL_NO_ERROR();
>+    for (int i = 0; i < kResultSize; i++)
>+    {
>+        EXPECT_EQ(expectedValue_1, outputValues[i]);
>+    }
>+    glReadBuffer(GL_COLOR_ATTACHMENT1);
>+    glReadPixels(0, 0, kWidth, kHeight, GL_RED_INTEGER, GL_UNSIGNED_INT, outputValues);
>+    EXPECT_GL_NO_ERROR();
>+    for (int i = 0; i < kResultSize; i++)
>+    {
>+        EXPECT_EQ(expectedValue_2, outputValues[i]);
>+    }
>+}
>+
>+// Use image uniform to read and write one layer of TextureCube in compute shader, and verify the
>+// contents.
>+TEST_P(ComputeShaderTest, BindImageTextureWithOneLayerTextureCube)
>+{
>+    GLTexture texture[2];
>+    GLFramebuffer framebuffer;
>+    constexpr char kCS[] = R"(#version 310 es
>+layout(local_size_x=1, local_size_y=1, local_size_z=1) in;
>+layout(r32ui, binding = 0) readonly uniform highp uimage2D uImage_1;
>+layout(r32ui, binding = 1) writeonly uniform highp uimage2D uImage_2;
>+void main()
>+{
>+    uvec4 value = imageLoad(uImage_1, ivec2(gl_LocalInvocationID.xy));
>+    imageStore(uImage_2, ivec2(gl_LocalInvocationID.xy), value);
>+})";
>+
>+    constexpr int kWidth = 1, kHeight = 1;
>+    constexpr int kResultSize           = kWidth * kHeight;
>+    constexpr GLuint kInputValues[2][1] = {{200}, {100}};
>+    constexpr GLuint expectedValue_1    = 200;
>+    constexpr GLuint expectedValue_2    = 100;
>+    GLuint outputValues[kResultSize];
>+
>+    glBindTexture(GL_TEXTURE_CUBE_MAP, texture[0]);
>+    glTexStorage2D(GL_TEXTURE_CUBE_MAP, 1, GL_R32UI, kWidth, kHeight);
>+    for (GLenum face = GL_TEXTURE_CUBE_MAP_POSITIVE_X; face <= GL_TEXTURE_CUBE_MAP_NEGATIVE_Z;
>+         face++)
>+    {
>+        glTexSubImage2D(face, 0, 0, 0, kWidth, kHeight, GL_RED_INTEGER, GL_UNSIGNED_INT,
>+                        kInputValues[0]);
>+    }
>+    EXPECT_GL_NO_ERROR();
>+
>+    glBindTexture(GL_TEXTURE_CUBE_MAP, texture[1]);
>+    glTexStorage2D(GL_TEXTURE_CUBE_MAP, 1, GL_R32UI, kWidth, kHeight);
>+    for (GLenum face = GL_TEXTURE_CUBE_MAP_POSITIVE_X; face <= GL_TEXTURE_CUBE_MAP_NEGATIVE_Z;
>+         face++)
>+    {
>+        glTexSubImage2D(face, 0, 0, 0, kWidth, kHeight, GL_RED_INTEGER, GL_UNSIGNED_INT,
>+                        kInputValues[1]);
>+    }
>+    EXPECT_GL_NO_ERROR();
>+
>+    ANGLE_GL_COMPUTE_PROGRAM(program, kCS);
>+    glUseProgram(program.get());
>+
>+    glBindImageTexture(0, texture[0], 0, GL_FALSE, 3, GL_READ_ONLY, GL_R32UI);
>+    EXPECT_GL_NO_ERROR();
>+    glBindImageTexture(1, texture[1], 0, GL_FALSE, 4, GL_WRITE_ONLY, GL_R32UI);
>+    EXPECT_GL_NO_ERROR();
>+    glDispatchCompute(1, 1, 1);
>+    EXPECT_GL_NO_ERROR();
>+
>+    glMemoryBarrier(GL_TEXTURE_UPDATE_BARRIER_BIT);
>+    glUseProgram(0);
>+    glBindFramebuffer(GL_READ_FRAMEBUFFER, framebuffer);
>+
>+    for (GLenum face = 0; face < 6; face++)
>+    {
>+        glFramebufferTexture2D(GL_READ_FRAMEBUFFER, GL_COLOR_ATTACHMENT0,
>+                               GL_TEXTURE_CUBE_MAP_POSITIVE_X + face, texture[1], 0);
>+        EXPECT_GL_NO_ERROR();
>+        glReadPixels(0, 0, kWidth, kHeight, GL_RED_INTEGER, GL_UNSIGNED_INT, outputValues);
>+        EXPECT_GL_NO_ERROR();
>+
>+        if (face == 4)
>+        {
>+            for (int i = 0; i < kResultSize; i++)
>+            {
>+                EXPECT_EQ(expectedValue_1, outputValues[i]);
>+            }
>+        }
>+        else
>+        {
>+            for (int i = 0; i < kResultSize; i++)
>+            {
>+                EXPECT_EQ(expectedValue_2, outputValues[i]);
>+            }
>+        }
>+    }
>+}
>+
>+// Test to bind kinds of texture types, bind either the entire texture
>+// level or a single layer or face of the face level.
>+TEST_P(ComputeShaderTest, BindImageTextureWithMixTextureTypes)
>+{
>+    GLTexture texture[4];
>+    GLFramebuffer framebuffer;
>+    const char csSource[] =
>+        R"(#version 310 es
>+        layout(local_size_x=1, local_size_y=1, local_size_z=1) in;
>+        layout(r32ui, binding = 0) readonly uniform highp uimage2D uImage_1;
>+        layout(r32ui, binding = 1) readonly uniform highp uimage2D uImage_2;
>+        layout(r32ui, binding = 2) readonly uniform highp uimage3D uImage_3;
>+        layout(r32ui, binding = 3) writeonly uniform highp uimage2D uImage_4;
>+        void main()
>+        {
>+            uvec4 value_1 = imageLoad(uImage_1, ivec2(gl_LocalInvocationID.xy));
>+            uvec4 value_2 = imageLoad(uImage_2, ivec2(gl_LocalInvocationID.xy));
>+            uvec4 value_3 = imageLoad(uImage_3, ivec3(gl_LocalInvocationID.xyz));
>+            imageStore(uImage_4, ivec2(gl_LocalInvocationID.xy), value_1 + value_2 + value_3);
>+        })";
>+
>+    constexpr int kWidth = 1, kHeight = 1, kDepth = 2;
>+    constexpr int kResultSize               = kWidth * kHeight;
>+    constexpr GLuint kInputValues2D[1]      = {11};
>+    constexpr GLuint KInputValues2DArray[2] = {23, 35};
>+    constexpr GLuint KInputValues3D[2]      = {102, 67};
>+    constexpr GLuint KInputValuesCube[1]    = {232};
>+
>+    constexpr GLuint expectedValue_1 = 148;
>+    constexpr GLuint expectedValue_2 = 232;
>+    GLuint outputValues[kResultSize];
>+
>+    glBindTexture(GL_TEXTURE_2D, texture[0]);
>+    glTexStorage2D(GL_TEXTURE_2D, 1, GL_R32UI, kWidth, kHeight);
>+    glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, kWidth, kHeight, GL_RED_INTEGER, GL_UNSIGNED_INT,
>+                    kInputValues2D);
>+    EXPECT_GL_NO_ERROR();
>+
>+    glBindTexture(GL_TEXTURE_2D_ARRAY, texture[1]);
>+    glTexStorage3D(GL_TEXTURE_2D_ARRAY, 1, GL_R32UI, kWidth, kHeight, kDepth);
>+    glTexSubImage3D(GL_TEXTURE_2D_ARRAY, 0, 0, 0, 0, kWidth, kHeight, kDepth, GL_RED_INTEGER,
>+                    GL_UNSIGNED_INT, KInputValues2DArray);
>+    EXPECT_GL_NO_ERROR();
>+
>+    glBindTexture(GL_TEXTURE_3D, texture[2]);
>+    glTexStorage3D(GL_TEXTURE_3D, 1, GL_R32UI, kWidth, kHeight, kDepth);
>+    glTexSubImage3D(GL_TEXTURE_3D, 0, 0, 0, 0, kWidth, kHeight, kDepth, GL_RED_INTEGER,
>+                    GL_UNSIGNED_INT, KInputValues3D);
>+    EXPECT_GL_NO_ERROR();
>+
>+    glBindTexture(GL_TEXTURE_CUBE_MAP, texture[3]);
>+    glTexStorage2D(GL_TEXTURE_CUBE_MAP, 1, GL_R32UI, kWidth, kHeight);
>+    for (GLenum face = GL_TEXTURE_CUBE_MAP_POSITIVE_X; face <= GL_TEXTURE_CUBE_MAP_NEGATIVE_Z;
>+         face++)
>+    {
>+        glTexSubImage2D(face, 0, 0, 0, kWidth, kHeight, GL_RED_INTEGER, GL_UNSIGNED_INT,
>+                        KInputValuesCube);
>+    }
>+    EXPECT_GL_NO_ERROR();
>+
>+    ANGLE_GL_COMPUTE_PROGRAM(program, csSource);
>+    glUseProgram(program.get());
>+
>+    glBindImageTexture(0, texture[0], 0, GL_TRUE, 0, GL_READ_ONLY, GL_R32UI);
>+    EXPECT_GL_NO_ERROR();
>+    glBindImageTexture(1, texture[1], 0, GL_FALSE, 1, GL_READ_ONLY, GL_R32UI);
>+    EXPECT_GL_NO_ERROR();
>+    glBindImageTexture(2, texture[2], 0, GL_TRUE, 0, GL_READ_ONLY, GL_R32UI);
>+    EXPECT_GL_NO_ERROR();
>+    glBindImageTexture(3, texture[3], 0, GL_FALSE, 4, GL_WRITE_ONLY, GL_R32UI);
>+    EXPECT_GL_NO_ERROR();
>+    glDispatchCompute(1, 1, 1);
>+    EXPECT_GL_NO_ERROR();
>+
>+    glMemoryBarrier(GL_TEXTURE_UPDATE_BARRIER_BIT);
>+    glUseProgram(0);
>+    glBindFramebuffer(GL_READ_FRAMEBUFFER, framebuffer);
>+
>+    for (GLenum face = 0; face < 6; face++)
>+    {
>+        glFramebufferTexture2D(GL_READ_FRAMEBUFFER, GL_COLOR_ATTACHMENT0,
>+                               GL_TEXTURE_CUBE_MAP_POSITIVE_X + face, texture[3], 0);
>+        EXPECT_GL_NO_ERROR();
>+        glReadPixels(0, 0, kWidth, kHeight, GL_RED_INTEGER, GL_UNSIGNED_INT, outputValues);
>+        EXPECT_GL_NO_ERROR();
>+
>+        if (face == 4)
>+        {
>+            for (int i = 0; i < kResultSize; i++)
>+            {
>+                EXPECT_EQ(expectedValue_1, outputValues[i]);
>+            }
>+        }
>+        else
>+        {
>+            for (int i = 0; i < kResultSize; i++)
>+            {
>+                EXPECT_EQ(expectedValue_2, outputValues[i]);
>+            }
>+        }
>+    }
>+}
>+
>+// Verify an INVALID_OPERATION error is reported when querying GL_COMPUTE_WORK_GROUP_SIZE for a
>+// program which has not been linked successfully or which does not contain objects to form a
>+// compute shader.
>+TEST_P(ComputeShaderTest, QueryComputeWorkGroupSize)
>+{
>+    constexpr char kVS[] = R"(#version 310 es
>+void main()
>+{
>+})";
>+
>+    constexpr char kFS[] = R"(#version 310 es
>+void main()
>+{
>+})";
>+
>+    GLint workGroupSize[3];
>+
>+    ANGLE_GL_PROGRAM(graphicsProgram, kVS, kFS);
>+    glGetProgramiv(graphicsProgram, GL_COMPUTE_WORK_GROUP_SIZE, workGroupSize);
>+    EXPECT_GL_ERROR(GL_INVALID_OPERATION);
>+
>+    GLuint computeProgram = glCreateProgram();
>+    GLShader computeShader(GL_COMPUTE_SHADER);
>+    glAttachShader(computeProgram, computeShader);
>+    glLinkProgram(computeProgram);
>+    glDetachShader(computeProgram, computeShader);
>+
>+    GLint linkStatus;
>+    glGetProgramiv(computeProgram, GL_LINK_STATUS, &linkStatus);
>+    ASSERT_GL_FALSE(linkStatus);
>+
>+    glGetProgramiv(computeProgram, GL_COMPUTE_WORK_GROUP_SIZE, workGroupSize);
>+    EXPECT_GL_ERROR(GL_INVALID_OPERATION);
>+
>+    glDeleteProgram(computeProgram);
>+
>+    ASSERT_GL_NO_ERROR();
>+}
>+
>+// Use groupMemoryBarrier and barrier to sync reads/writes order and the execution
>+// order of multiple shader invocations in compute shader.
>+TEST_P(ComputeShaderTest, groupMemoryBarrierAndBarrierTest)
>+{
>+    // TODO(xinghua.cao@intel.com): Figure out why we get this error message
>+    // that shader uses features not recognized by this D3D version.
>+    ANGLE_SKIP_TEST_IF((IsAMD() || IsNVIDIA()) && IsD3D11());
>+
>+    GLTexture texture;
>+    GLFramebuffer framebuffer;
>+
>+    // Each invocation first stores a single value in an image, then each invocation sums up
>+    // all the values in the image and stores the sum in the image. groupMemoryBarrier is
>+    // used to order reads/writes to variables stored in memory accessible to other shader
>+    // invocations, and barrier is used to control the relative execution order of multiple
>+    // shader invocations used to process a local work group.
>+    constexpr char kCS[] = R"(#version 310 es
>+layout(local_size_x=2, local_size_y=2, local_size_z=1) in;
>+layout(r32i, binding = 0) uniform highp iimage2D image;
>+void main()
>+{
>+    uint x = gl_LocalInvocationID.x;
>+    uint y = gl_LocalInvocationID.y;
>+    imageStore(image, ivec2(gl_LocalInvocationID.xy), ivec4(x + y));
>+    groupMemoryBarrier();
>+    barrier();
>+    int sum = 0;
>+    for (int i = 0; i < 2; i++)
>+    {
>+        for(int j = 0; j < 2; j++)
>+        {
>+            sum += imageLoad(image, ivec2(i, j)).x;
>+        }
>+    }
>+    groupMemoryBarrier();
>+    barrier();
>+    imageStore(image, ivec2(gl_LocalInvocationID.xy), ivec4(sum));
>+})";
>+
>+    constexpr int kWidth = 2, kHeight = 2;
>+    glBindTexture(GL_TEXTURE_2D, texture);
>+    glTexStorage2D(GL_TEXTURE_2D, 1, GL_R32I, kWidth, kHeight);
>+    EXPECT_GL_NO_ERROR();
>+
>+    ANGLE_GL_COMPUTE_PROGRAM(program, kCS);
>+    glUseProgram(program.get());
>+
>+    glBindImageTexture(0, texture, 0, GL_FALSE, 0, GL_READ_WRITE, GL_R32I);
>+    EXPECT_GL_NO_ERROR();
>+
>+    glDispatchCompute(1, 1, 1);
>+    EXPECT_GL_NO_ERROR();
>+
>+    glMemoryBarrier(GL_TEXTURE_UPDATE_BARRIER_BIT);
>+    GLuint outputValues[kWidth * kHeight];
>+    constexpr GLuint kExpectedValue = 4;
>+    glUseProgram(0);
>+    glBindFramebuffer(GL_READ_FRAMEBUFFER, framebuffer);
>+
>+    glFramebufferTexture2D(GL_READ_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, texture, 0);
>+    EXPECT_GL_NO_ERROR();
>+    glReadPixels(0, 0, kWidth, kHeight, GL_RED_INTEGER, GL_INT, outputValues);
>+    EXPECT_GL_NO_ERROR();
>+
>+    for (int i = 0; i < kWidth * kHeight; i++)
>+    {
>+        EXPECT_EQ(kExpectedValue, outputValues[i]);
>+    }
>+}
>+
>+// Verify that a link error is generated when the sum of the number of active image uniforms and
>+// active shader storage blocks in a compute shader exceeds GL_MAX_COMBINED_SHADER_OUTPUT_RESOURCES.
>+TEST_P(ComputeShaderTest, ExceedCombinedShaderOutputResourcesInCS)
>+{
>+    GLint maxCombinedShaderOutputResources;
>+    GLint maxComputeShaderStorageBlocks;
>+    GLint maxComputeImageUniforms;
>+
>+    glGetIntegerv(GL_MAX_COMBINED_SHADER_OUTPUT_RESOURCES, &maxCombinedShaderOutputResources);
>+    glGetIntegerv(GL_MAX_COMPUTE_SHADER_STORAGE_BLOCKS, &maxComputeShaderStorageBlocks);
>+    glGetIntegerv(GL_MAX_COMPUTE_IMAGE_UNIFORMS, &maxComputeImageUniforms);
>+
>+    ANGLE_SKIP_TEST_IF(maxCombinedShaderOutputResources >=
>+                       maxComputeShaderStorageBlocks + maxComputeImageUniforms);
>+
>+    std::ostringstream computeShaderStream;
>+    computeShaderStream << "#version 310 es\n"
>+                           "layout(local_size_x = 3, local_size_y = 1, local_size_z = 1) in;\n"
>+                           "layout(shared, binding = 0) buffer blockName"
>+                           "{\n"
>+                           "    uint data;\n"
>+                           "} instance["
>+                        << maxComputeShaderStorageBlocks << "];\n";
>+
>+    ASSERT_GE(maxComputeImageUniforms, 4);
>+    int numImagesInArray  = maxComputeImageUniforms / 2;
>+    int numImagesNonArray = maxComputeImageUniforms - numImagesInArray;
>+    for (int i = 0; i < numImagesNonArray; ++i)
>+    {
>+        computeShaderStream << "layout(r32f, binding = " << i << ") uniform highp image2D image"
>+                            << i << ";\n";
>+    }
>+
>+    computeShaderStream << "layout(r32f, binding = " << numImagesNonArray
>+                        << ") uniform highp image2D imageArray[" << numImagesInArray << "];\n";
>+
>+    computeShaderStream << "void main()\n"
>+                           "{\n"
>+                           "    uint val = 0u;\n"
>+                           "    vec4 val2 = vec4(0.0);\n";
>+
>+    for (int i = 0; i < maxComputeShaderStorageBlocks; ++i)
>+    {
>+        computeShaderStream << "    val += instance[" << i << "].data; \n";
>+    }
>+
>+    for (int i = 0; i < numImagesNonArray; ++i)
>+    {
>+        computeShaderStream << "    val2 += imageLoad(image" << i
>+                            << ", ivec2(gl_LocalInvocationID.xy)); \n";
>+    }
>+
>+    for (int i = 0; i < numImagesInArray; ++i)
>+    {
>+        computeShaderStream << "    val2 += imageLoad(imageArray[" << i << "]"
>+                            << ", ivec2(gl_LocalInvocationID.xy)); \n";
>+    }
>+
>+    computeShaderStream << "    instance[0].data = val + uint(val2.x);\n"
>+                           "}\n";
>+
>+    GLuint computeProgram = CompileComputeProgram(computeShaderStream.str().c_str());
>+    EXPECT_EQ(0u, computeProgram);
>+}
>+
>+// Test that uniform block with struct member in compute shader is supported.
>+TEST_P(ComputeShaderTest, UniformBlockWithStructMember)
>+{
>+    constexpr char kCS[] = R"(#version 310 es
>+layout(local_size_x=8) in;
>+layout(rgba8) uniform highp readonly image2D mImage2DInput;
>+layout(rgba8) uniform highp writeonly image2D mImage2DOutput;
>+struct S {
>+    ivec3 a;
>+    ivec2 b;
>+};
>+
>+layout(std140, binding=0) uniform blockName {
>+    S bd;
>+} instanceName;
>+void main()
>+{
>+    ivec2 t1 = instanceName.bd.b;
>+    vec4 result2d = imageLoad(mImage2DInput, t1);
>+    imageStore(mImage2DOutput, ivec2(gl_LocalInvocationID.xy), result2d);
>+})";
>+
>+    ANGLE_GL_COMPUTE_PROGRAM(program, kCS);
>+    EXPECT_GL_NO_ERROR();
>+}
>+
>+// Verify shared non-array variables can work correctly.
>+TEST_P(ComputeShaderTest, NonArraySharedVariable)
>+{
>+    const char kCSShader[] = R"(#version 310 es
>+layout (local_size_x = 2, local_size_y = 2, local_size_z = 1) in;
>+layout (r32ui, binding = 0) readonly uniform highp uimage2D srcImage;
>+layout (r32ui, binding = 1) writeonly uniform highp uimage2D dstImage;
>+shared uint temp;
>+void main()
>+{
>+    if (gl_LocalInvocationID == uvec3(0, 0, 0))
>+    {
>+        temp = imageLoad(srcImage, ivec2(gl_LocalInvocationID.xy)).x;
>+    }
>+    groupMemoryBarrier();
>+    barrier();
>+    if (gl_LocalInvocationID == uvec3(1, 1, 0))
>+    {
>+        imageStore(dstImage, ivec2(gl_LocalInvocationID.xy), uvec4(temp));
>+    }
>+    else
>+    {
>+        uint inputValue = imageLoad(srcImage, ivec2(gl_LocalInvocationID.xy)).x;
>+        imageStore(dstImage, ivec2(gl_LocalInvocationID.xy), uvec4(inputValue));
>+    }
>+})";
>+
>+    const std::array<GLuint, 4> inputData      = {{250, 200, 150, 100}};
>+    const std::array<GLuint, 4> expectedValues = {{250, 200, 150, 250}};
>+    runSharedMemoryTest<GLuint, 2, 2>(kCSShader, GL_R32UI, GL_UNSIGNED_INT, inputData,
>+                                      expectedValues);
>+}
>+
>+// Verify shared non-struct array variables can work correctly.
>+TEST_P(ComputeShaderTest, NonStructArrayAsSharedVariable)
>+{
>+    const char kCSShader[] = R"(#version 310 es
>+layout (local_size_x = 2, local_size_y = 2, local_size_z = 1) in;
>+layout (r32ui, binding = 0) readonly uniform highp uimage2D srcImage;
>+layout (r32ui, binding = 1) writeonly uniform highp uimage2D dstImage;
>+shared uint sharedData[2][2];
>+void main()
>+{
>+    uint inputData = imageLoad(srcImage, ivec2(gl_LocalInvocationID.xy)).x;
>+    sharedData[gl_LocalInvocationID.x][gl_LocalInvocationID.y] = inputData;
>+    groupMemoryBarrier();
>+    barrier();
>+    imageStore(dstImage, ivec2(gl_LocalInvocationID.xy),
>+                uvec4(sharedData[gl_LocalInvocationID.y][gl_LocalInvocationID.x]));
>+})";
>+
>+    const std::array<GLuint, 4> inputData      = {{250, 200, 150, 100}};
>+    const std::array<GLuint, 4> expectedValues = {{250, 150, 200, 100}};
>+    runSharedMemoryTest<GLuint, 2, 2>(kCSShader, GL_R32UI, GL_UNSIGNED_INT, inputData,
>+                                      expectedValues);
>+}
>+
>+// Verify shared struct array variables work correctly.
>+TEST_P(ComputeShaderTest, StructArrayAsSharedVariable)
>+{
>+    const char kCSShader[] = R"(#version 310 es
>+layout (local_size_x = 2, local_size_y = 2, local_size_z = 1) in;
>+layout (r32ui, binding = 0) readonly uniform highp uimage2D srcImage;
>+layout (r32ui, binding = 1) writeonly uniform highp uimage2D dstImage;
>+struct SharedStruct
>+{
>+    uint data;
>+};
>+shared SharedStruct sharedData[2][2];
>+void main()
>+{
>+    uint inputData = imageLoad(srcImage, ivec2(gl_LocalInvocationID.xy)).x;
>+    sharedData[gl_LocalInvocationID.x][gl_LocalInvocationID.y].data = inputData;
>+    groupMemoryBarrier();
>+    barrier();
>+    imageStore(dstImage, ivec2(gl_LocalInvocationID.xy),
>+                uvec4(sharedData[gl_LocalInvocationID.y][gl_LocalInvocationID.x].data));
>+})";
>+
>+    const std::array<GLuint, 4> inputData      = {{250, 200, 150, 100}};
>+    const std::array<GLuint, 4> expectedValues = {{250, 150, 200, 100}};
>+    runSharedMemoryTest<GLuint, 2, 2>(kCSShader, GL_R32UI, GL_UNSIGNED_INT, inputData,
>+                                      expectedValues);
>+}
>+
>+// Verify using atomic functions without return value can work correctly.
>+TEST_P(ComputeShaderTest, AtomicFunctionsNoReturnValue)
>+{
>+    // TODO(jiawei.shao@intel.com): find out why this shader causes a link error on Android Nexus 5
>+    // bot.
>+    ANGLE_SKIP_TEST_IF(IsAndroid());
>+
>+    const char kCSShader[] = R"(#version 310 es
>+layout (local_size_x = 8, local_size_y = 1, local_size_z = 1) in;
>+layout (r32ui, binding = 0) readonly uniform highp uimage2D srcImage;
>+layout (r32ui, binding = 1) writeonly uniform highp uimage2D dstImage;
>+
>+const uint kSumIndex = 0u;
>+const uint kMinIndex = 1u;
>+const uint kMaxIndex = 2u;
>+const uint kOrIndex = 3u;
>+const uint kAndIndex = 4u;
>+const uint kXorIndex = 5u;
>+const uint kExchangeIndex = 6u;
>+const uint kCompSwapIndex = 7u;
>+
>+shared highp uint results[8];
>+
>+void main()
>+{
>+    if (gl_LocalInvocationID.x == kMinIndex || gl_LocalInvocationID.x == kAndIndex)
>+    {
>+        results[gl_LocalInvocationID.x] = 0xFFFFu;
>+    }
>+    else if (gl_LocalInvocationID.x == kCompSwapIndex)
>+    {
>+        results[gl_LocalInvocationID.x] = 1u;
>+    }
>+    else
>+    {
>+        results[gl_LocalInvocationID.x] = 0u;
>+    }
>+    memoryBarrierShared();
>+    barrier();
>+
>+    uint value = imageLoad(srcImage, ivec2(gl_LocalInvocationID.xy)).x;
>+    atomicAdd(results[kSumIndex], value);
>+    atomicMin(results[kMinIndex], value);
>+    atomicMax(results[kMaxIndex], value);
>+    atomicOr(results[kOrIndex], value);
>+    atomicAnd(results[kAndIndex], value);
>+    atomicXor(results[kXorIndex], value);
>+    atomicExchange(results[kExchangeIndex], value);
>+    atomicCompSwap(results[kCompSwapIndex], value, 256u);
>+    memoryBarrierShared();
>+    barrier();
>+
>+    imageStore(dstImage, ivec2(gl_LocalInvocationID.xy),
>+                uvec4(results[gl_LocalInvocationID.x]));
>+})";
>+
>+    const std::array<GLuint, 8> inputData      = {{1, 2, 4, 8, 16, 32, 64, 128}};
>+    const std::array<GLuint, 8> expectedValues = {{255, 1, 128, 255, 0, 255, 128, 256}};
>+    runSharedMemoryTest<GLuint, 8, 1>(kCSShader, GL_R32UI, GL_UNSIGNED_INT, inputData,
>+                                      expectedValues);
>+}
>+
>+// Verify using atomic functions in a non-initializer single assignment can work correctly.
>+TEST_P(ComputeShaderTest, AtomicFunctionsInNonInitializerSingleAssignment)
>+{
>+    const char kCSShader[] = R"(#version 310 es
>+layout (local_size_x = 9, local_size_y = 1, local_size_z = 1) in;
>+layout (r32i, binding = 0) readonly uniform highp iimage2D srcImage;
>+layout (r32i, binding = 1) writeonly uniform highp iimage2D dstImage;
>+
>+shared highp int sharedVariable;
>+
>+shared highp int inputData[9];
>+shared highp int outputData[9];
>+
>+void main()
>+{
>+    int inputValue = imageLoad(srcImage, ivec2(gl_LocalInvocationID.xy)).x;
>+    inputData[gl_LocalInvocationID.x] = inputValue;
>+    memoryBarrierShared();
>+    barrier();
>+
>+    if (gl_LocalInvocationID.x == 0u)
>+    {
>+        sharedVariable = 0;
>+
>+        outputData[0] = atomicAdd(sharedVariable, inputData[0]);
>+        outputData[1] = atomicMin(sharedVariable, inputData[1]);
>+        outputData[2] = atomicMax(sharedVariable, inputData[2]);
>+        outputData[3] = atomicAnd(sharedVariable, inputData[3]);
>+        outputData[4] = atomicOr(sharedVariable, inputData[4]);
>+        outputData[5] = atomicXor(sharedVariable, inputData[5]);
>+        outputData[6] = atomicExchange(sharedVariable, inputData[6]);
>+        outputData[7] = atomicCompSwap(sharedVariable, 64, inputData[7]);
>+        outputData[8] = atomicAdd(sharedVariable, inputData[8]);
>+    }
>+    memoryBarrierShared();
>+    barrier();
>+
>+    imageStore(dstImage, ivec2(gl_LocalInvocationID.xy),
>+                ivec4(outputData[gl_LocalInvocationID.x]));
>+})";
>+
>+    const std::array<GLint, 9> inputData      = {{1, 2, 4, 8, 16, 32, 64, 128, 1}};
>+    const std::array<GLint, 9> expectedValues = {{0, 1, 1, 4, 0, 16, 48, 64, 128}};
>+    runSharedMemoryTest<GLint, 9, 1>(kCSShader, GL_R32I, GL_INT, inputData, expectedValues);
>+}
>+
>+// Verify using atomic functions in an initializers and using unsigned int works correctly.
>+TEST_P(ComputeShaderTest, AtomicFunctionsInitializerWithUnsigned)
>+{
>+    constexpr char kCShader[] = R"(#version 310 es
>+layout (local_size_x = 9, local_size_y = 1, local_size_z = 1) in;
>+layout (r32ui, binding = 0) readonly uniform highp uimage2D srcImage;
>+layout (r32ui, binding = 1) writeonly uniform highp uimage2D dstImage;
>+
>+shared highp uint sharedVariable;
>+
>+shared highp uint inputData[9];
>+shared highp uint outputData[9];
>+
>+void main()
>+{
>+    uint inputValue = imageLoad(srcImage, ivec2(gl_LocalInvocationID.xy)).x;
>+    inputData[gl_LocalInvocationID.x] = inputValue;
>+    memoryBarrierShared();
>+    barrier();
>+
>+    if (gl_LocalInvocationID.x == 0u)
>+    {
>+        sharedVariable = 0u;
>+
>+        uint addValue = atomicAdd(sharedVariable, inputData[0]);
>+        outputData[0] = addValue;
>+        uint minValue = atomicMin(sharedVariable, inputData[1]);
>+        outputData[1] = minValue;
>+        uint maxValue = atomicMax(sharedVariable, inputData[2]);
>+        outputData[2] = maxValue;
>+        uint andValue = atomicAnd(sharedVariable, inputData[3]);
>+        outputData[3] = andValue;
>+        uint orValue = atomicOr(sharedVariable, inputData[4]);
>+        outputData[4] = orValue;
>+        uint xorValue = atomicXor(sharedVariable, inputData[5]);
>+        outputData[5] = xorValue;
>+        uint exchangeValue = atomicExchange(sharedVariable, inputData[6]);
>+        outputData[6] = exchangeValue;
>+        uint compSwapValue = atomicCompSwap(sharedVariable, 64u, inputData[7]);
>+        outputData[7] = compSwapValue;
>+        uint sharedVariable = atomicAdd(sharedVariable, inputData[8]);
>+        outputData[8] = sharedVariable;
>+
>+    }
>+    memoryBarrierShared();
>+    barrier();
>+
>+    imageStore(dstImage, ivec2(gl_LocalInvocationID.xy),
>+                uvec4(outputData[gl_LocalInvocationID.x]));
>+})";
>+
>+    constexpr std::array<GLuint, 9> kInputData      = {{1, 2, 4, 8, 16, 32, 64, 128, 1}};
>+    constexpr std::array<GLuint, 9> kExpectedValues = {{0, 1, 1, 4, 0, 16, 48, 64, 128}};
>+    runSharedMemoryTest<GLuint, 9, 1>(kCShader, GL_R32UI, GL_UNSIGNED_INT, kInputData,
>+                                      kExpectedValues);
>+}
>+
>+// Verify using atomic functions inside expressions as unsigned int.
>+TEST_P(ComputeShaderTest, AtomicFunctionsReturnWithUnsigned)
>+{
>+    constexpr char kCShader[] = R"(#version 310 es
>+layout (local_size_x = 9, local_size_y = 1, local_size_z = 1) in;
>+layout (r32ui, binding = 0) readonly uniform highp uimage2D srcImage;
>+layout (r32ui, binding = 1) writeonly uniform highp uimage2D dstImage;
>+
>+shared highp uint sharedVariable;
>+
>+shared highp uint inputData[9];
>+shared highp uint outputData[9];
>+
>+void main()
>+{
>+    uint inputValue = imageLoad(srcImage, ivec2(gl_LocalInvocationID.xy)).x;
>+    inputData[gl_LocalInvocationID.x] = inputValue;
>+    memoryBarrierShared();
>+    barrier();
>+
>+    if (gl_LocalInvocationID.x == 0u)
>+    {
>+        sharedVariable = 0u;
>+
>+        outputData[0] = 1u + atomicAdd(sharedVariable, inputData[0]);
>+        outputData[1] = 1u + atomicMin(sharedVariable, inputData[1]);
>+        outputData[2] = 1u + atomicMax(sharedVariable, inputData[2]);
>+        outputData[3] = 1u + atomicAnd(sharedVariable, inputData[3]);
>+        outputData[4] = 1u + atomicOr(sharedVariable, inputData[4]);
>+        outputData[5] = 1u + atomicXor(sharedVariable, inputData[5]);
>+        outputData[6] = 1u + atomicExchange(sharedVariable, inputData[6]);
>+        outputData[7] = 1u + atomicCompSwap(sharedVariable, 64u, inputData[7]);
>+        outputData[8] = 1u + atomicAdd(sharedVariable, inputData[8]);
>+    }
>+    memoryBarrierShared();
>+    barrier();
>+
>+    imageStore(dstImage, ivec2(gl_LocalInvocationID.xy),
>+                uvec4(outputData[gl_LocalInvocationID.x]));
>+})";
>+
>+    constexpr std::array<GLuint, 9> kInputData      = {{1, 2, 4, 8, 16, 32, 64, 128, 1}};
>+    constexpr std::array<GLuint, 9> kExpectedValues = {{1, 2, 2, 5, 1, 17, 49, 65, 129}};
>+    runSharedMemoryTest<GLuint, 9, 1>(kCShader, GL_R32UI, GL_UNSIGNED_INT, kInputData,
>+                                      kExpectedValues);
>+}
>+
>+// Verify using nested atomic functions in expressions.
>+TEST_P(ComputeShaderTest, AtomicFunctionsReturnWithMultipleTypes)
>+{
>+    constexpr char kCShader[] = R"(#version 310 es
>+layout (local_size_x = 4, local_size_y = 1, local_size_z = 1) in;
>+layout (r32ui, binding = 0) readonly uniform highp uimage2D srcImage;
>+layout (r32ui, binding = 1) writeonly uniform highp uimage2D dstImage;
>+
>+shared highp uint sharedVariable;
>+shared highp int  indexVariable;
>+
>+shared highp uint inputData[4];
>+shared highp uint outputData[4];
>+
>+void main()
>+{
>+    uint inputValue = imageLoad(srcImage, ivec2(gl_LocalInvocationID.xy)).x;
>+    inputData[gl_LocalInvocationID.x] = inputValue;
>+    memoryBarrierShared();
>+    barrier();
>+
>+    if (gl_LocalInvocationID.x == 0u)
>+    {
>+        sharedVariable = 0u;
>+        indexVariable = 2;
>+
>+        outputData[0] = 1u + atomicAdd(sharedVariable, inputData[atomicAdd(indexVariable, -1)]);
>+        outputData[1] = 1u + atomicAdd(sharedVariable, inputData[atomicAdd(indexVariable, -1)]);
>+        outputData[2] = 1u + atomicAdd(sharedVariable, inputData[atomicAdd(indexVariable, -1)]);
>+        outputData[3] = atomicAdd(sharedVariable, 0u);
>+
>+    }
>+    memoryBarrierShared();
>+    barrier();
>+
>+    imageStore(dstImage, ivec2(gl_LocalInvocationID.xy),
>+                uvec4(outputData[gl_LocalInvocationID.x]));
>+})";
>+
>+    constexpr std::array<GLuint, 4> kInputData      = {{1, 2, 3, 0}};
>+    constexpr std::array<GLuint, 4> kExpectedValues = {{1, 4, 6, 6}};
>+    runSharedMemoryTest<GLuint, 4, 1>(kCShader, GL_R32UI, GL_UNSIGNED_INT, kInputData,
>+                                      kExpectedValues);
>+}
>+
>+// Basic uniform buffer functionality.
>+TEST_P(ComputeShaderTest, UniformBuffer)
>+{
>+    GLTexture texture;
>+    GLBuffer buffer;
>+    GLFramebuffer framebuffer;
>+    constexpr char kCS[] = R"(#version 310 es
>+layout(local_size_x=1, local_size_y=1, local_size_z=1) in;
>+uniform uni
>+{
>+    uvec4 value;
>+};
>+layout(rgba32ui, binding = 0) writeonly uniform highp uimage2D uImage;
>+void main()
>+{
>+    imageStore(uImage, ivec2(gl_LocalInvocationID.xy), value);
>+})";
>+
>+    constexpr int kWidth = 1, kHeight = 1;
>+    constexpr GLuint kInputValues[4] = {56, 57, 58, 59};
>+
>+    glBindTexture(GL_TEXTURE_2D, texture);
>+    glTexStorage2D(GL_TEXTURE_2D, 1, GL_RGBA32UI, kWidth, kHeight);
>+    glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, kWidth, kHeight, GL_RGBA_INTEGER, GL_UNSIGNED_INT,
>+                    kInputValues);
>+    EXPECT_GL_NO_ERROR();
>+
>+    ANGLE_GL_COMPUTE_PROGRAM(program, kCS);
>+    glUseProgram(program.get());
>+
>+    GLint uniformBufferIndex = glGetUniformBlockIndex(program, "uni");
>+    EXPECT_NE(uniformBufferIndex, -1);
>+    GLuint data[4] = {201, 202, 203, 204};
>+    glBindBuffer(GL_UNIFORM_BUFFER, buffer);
>+    glBufferData(GL_UNIFORM_BUFFER, sizeof(GLuint) * 4, data, GL_STATIC_DRAW);
>+    glBindBufferBase(GL_UNIFORM_BUFFER, 0, buffer);
>+    glUniformBlockBinding(program, uniformBufferIndex, 0);
>+    EXPECT_GL_NO_ERROR();
>+
>+    glBindImageTexture(0, texture, 0, GL_FALSE, 0, GL_WRITE_ONLY, GL_RGBA32UI);
>+    EXPECT_GL_NO_ERROR();
>+
>+    glDispatchCompute(1, 1, 1);
>+    EXPECT_GL_NO_ERROR();
>+
>+    glMemoryBarrier(GL_TEXTURE_UPDATE_BARRIER_BIT);
>+    GLuint outputValues[kWidth * kHeight * 4];
>+    glUseProgram(0);
>+    glBindFramebuffer(GL_READ_FRAMEBUFFER, framebuffer);
>+
>+    glFramebufferTexture2D(GL_READ_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, texture, 0);
>+    EXPECT_GL_NO_ERROR();
>+    glReadPixels(0, 0, kWidth, kHeight, GL_RGBA_INTEGER, GL_UNSIGNED_INT, outputValues);
>+    EXPECT_GL_NO_ERROR();
>+
>+    for (int i = 0; i < kWidth * kHeight * 4; i++)
>+    {
>+        EXPECT_EQ(data[i], outputValues[i]);
>+    }
>+}
>+
>+// Test that storing data to image and then loading the same image data works correctly.
>+TEST_P(ComputeShaderTest, StoreImageThenLoad)
>+{
>+    const char kCSSource[] = R"(#version 310 es
>+layout(local_size_x=1, local_size_y=1, local_size_z=1) in;
>+layout(r32ui, binding = 0) readonly uniform highp uimage2D uImage_1;
>+layout(r32ui, binding = 1) writeonly uniform highp uimage2D uImage_2;
>+void main()
>+{
>+    uvec4 value = imageLoad(uImage_1, ivec2(gl_LocalInvocationID.xy));
>+    imageStore(uImage_2, ivec2(gl_LocalInvocationID.xy), value);
>+})";
>+
>+    constexpr GLuint kInputValues[3][1] = {{300}, {200}, {100}};
>+    GLTexture texture[3];
>+    glBindTexture(GL_TEXTURE_2D, texture[0]);
>+    glTexStorage2D(GL_TEXTURE_2D, 1, GL_R32UI, 1, 1);
>+    glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, 1, 1, GL_RED_INTEGER, GL_UNSIGNED_INT, kInputValues[0]);
>+    EXPECT_GL_NO_ERROR();
>+
>+    glBindTexture(GL_TEXTURE_2D, texture[1]);
>+    glTexStorage2D(GL_TEXTURE_2D, 1, GL_R32UI, 1, 1);
>+    glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, 1, 1, GL_RED_INTEGER, GL_UNSIGNED_INT, kInputValues[1]);
>+    EXPECT_GL_NO_ERROR();
>+
>+    glBindTexture(GL_TEXTURE_2D, texture[2]);
>+    glTexStorage2D(GL_TEXTURE_2D, 1, GL_R32UI, 1, 1);
>+    glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, 1, 1, GL_RED_INTEGER, GL_UNSIGNED_INT, kInputValues[2]);
>+    EXPECT_GL_NO_ERROR();
>+
>+    ANGLE_GL_COMPUTE_PROGRAM(program, kCSSource);
>+    glUseProgram(program.get());
>+
>+    glBindImageTexture(0, texture[0], 0, GL_FALSE, 0, GL_READ_ONLY, GL_R32UI);
>+    glBindImageTexture(1, texture[1], 0, GL_FALSE, 0, GL_WRITE_ONLY, GL_R32UI);
>+
>+    glDispatchCompute(1, 1, 1);
>+    glMemoryBarrier(GL_TEXTURE_UPDATE_BARRIER_BIT);
>+    EXPECT_GL_NO_ERROR();
>+
>+    glBindImageTexture(0, texture[1], 0, GL_FALSE, 0, GL_READ_ONLY, GL_R32UI);
>+    glBindImageTexture(1, texture[2], 0, GL_FALSE, 0, GL_WRITE_ONLY, GL_R32UI);
>+
>+    glDispatchCompute(1, 1, 1);
>+    glMemoryBarrier(GL_TEXTURE_UPDATE_BARRIER_BIT);
>+    EXPECT_GL_NO_ERROR();
>+
>+    GLuint outputValue;
>+    GLFramebuffer framebuffer;
>+    glBindFramebuffer(GL_READ_FRAMEBUFFER, framebuffer);
>+    glFramebufferTexture2D(GL_READ_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, texture[2], 0);
>+    glReadPixels(0, 0, 1, 1, GL_RED_INTEGER, GL_UNSIGNED_INT, &outputValue);
>+    EXPECT_GL_NO_ERROR();
>+
>+    EXPECT_EQ(300u, outputValue);
>+}
>+
>+// Test that loading image data and then storing data to the same image works correctly.
>+TEST_P(ComputeShaderTest, LoadImageThenStore)
>+{
>+    const char kCSSource[] = R"(#version 310 es
>+layout(local_size_x=1, local_size_y=1, local_size_z=1) in;
>+layout(r32ui, binding = 0) readonly uniform highp uimage2D uImage_1;
>+layout(r32ui, binding = 1) writeonly uniform highp uimage2D uImage_2;
>+void main()
>+{
>+    uvec4 value = imageLoad(uImage_1, ivec2(gl_LocalInvocationID.xy));
>+    imageStore(uImage_2, ivec2(gl_LocalInvocationID.xy), value);
>+})";
>+
>+    constexpr GLuint kInputValues[3][1] = {{300}, {200}, {100}};
>+    GLTexture texture[3];
>+    glBindTexture(GL_TEXTURE_2D, texture[0]);
>+    glTexStorage2D(GL_TEXTURE_2D, 1, GL_R32UI, 1, 1);
>+    glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, 1, 1, GL_RED_INTEGER, GL_UNSIGNED_INT, kInputValues[0]);
>+    EXPECT_GL_NO_ERROR();
>+
>+    glBindTexture(GL_TEXTURE_2D, texture[1]);
>+    glTexStorage2D(GL_TEXTURE_2D, 1, GL_R32UI, 1, 1);
>+    glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, 1, 1, GL_RED_INTEGER, GL_UNSIGNED_INT, kInputValues[1]);
>+    EXPECT_GL_NO_ERROR();
>+
>+    glBindTexture(GL_TEXTURE_2D, texture[2]);
>+    glTexStorage2D(GL_TEXTURE_2D, 1, GL_R32UI, 1, 1);
>+    glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, 1, 1, GL_RED_INTEGER, GL_UNSIGNED_INT, kInputValues[2]);
>+    EXPECT_GL_NO_ERROR();
>+
>+    ANGLE_GL_COMPUTE_PROGRAM(program, kCSSource);
>+    glUseProgram(program.get());
>+
>+    glBindImageTexture(0, texture[0], 0, GL_FALSE, 0, GL_READ_ONLY, GL_R32UI);
>+    glBindImageTexture(1, texture[1], 0, GL_FALSE, 0, GL_WRITE_ONLY, GL_R32UI);
>+
>+    glDispatchCompute(1, 1, 1);
>+    glMemoryBarrier(GL_TEXTURE_UPDATE_BARRIER_BIT);
>+    EXPECT_GL_NO_ERROR();
>+
>+    glBindImageTexture(0, texture[2], 0, GL_FALSE, 0, GL_READ_ONLY, GL_R32UI);
>+    glBindImageTexture(1, texture[0], 0, GL_FALSE, 0, GL_WRITE_ONLY, GL_R32UI);
>+
>+    glDispatchCompute(1, 1, 1);
>+    glMemoryBarrier(GL_TEXTURE_UPDATE_BARRIER_BIT);
>+    EXPECT_GL_NO_ERROR();
>+
>+    GLuint outputValue;
>+    GLFramebuffer framebuffer;
>+    glBindFramebuffer(GL_READ_FRAMEBUFFER, framebuffer);
>+    glFramebufferTexture2D(GL_READ_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, texture[0], 0);
>+    glReadPixels(0, 0, 1, 1, GL_RED_INTEGER, GL_UNSIGNED_INT, &outputValue);
>+    EXPECT_GL_NO_ERROR();
>+
>+    EXPECT_EQ(100u, outputValue);
>+}
>+
>+// Test that scalar buffer variables are supported.
>+TEST_P(ComputeShaderTest, ShaderStorageBlocksScalar)
>+{
>+    const char kCSSource[] = R"(#version 310 es
>+layout(local_size_x=1) in;
>+layout(std140, binding = 0) buffer blockA {
>+    uvec3 uv;
>+    float f;
>+} instanceA;
>+layout(std140, binding = 1) buffer blockB {
>+    vec2 v;
>+    uint u[3];
>+    float f;
>+};
>+void main()
>+{
>+    f = instanceA.f;
>+})";
>+
>+    ANGLE_GL_COMPUTE_PROGRAM(program, kCSSource);
>+    EXPECT_GL_NO_ERROR();
>+}
>+
>+// Test that vector buffer variables are supported.
>+TEST_P(ComputeShaderTest, ShaderStorageBlocksVector)
>+{
>+    const char kCSSource[] = R"(#version 310 es
>+layout(local_size_x=1) in;
>+layout(std140, binding = 0) buffer blockA {
>+    vec2 f;
>+} instanceA;
>+layout(std140, binding = 1) buffer blockB {
>+    vec3 f;
>+};
>+void main()
>+{
>+    f[1] = instanceA.f[0];
>+})";
>+
>+    ANGLE_GL_COMPUTE_PROGRAM(program, kCSSource);
>+    EXPECT_GL_NO_ERROR();
>+}
>+
>+// Test that matrix buffer variables are supported.
>+TEST_P(ComputeShaderTest, ShaderStorageBlocksMatrix)
>+{
>+    const char kCSSource[] = R"(#version 310 es
>+layout(local_size_x=1) in;
>+layout(std140, binding = 0) buffer blockA {
>+    mat3x4 m;
>+} instanceA;
>+layout(std140, binding = 1) buffer blockB {
>+    mat3x4 m;
>+};
>+void main()
>+{
>+    m[0][1] = instanceA.m[0][1];
>+})";
>+
>+    ANGLE_GL_COMPUTE_PROGRAM(program, kCSSource);
>+    EXPECT_GL_NO_ERROR();
>+}
>+
>+// Test that scalar array buffer variables are supported.
>+TEST_P(ComputeShaderTest, ShaderStorageBlocksScalarArray)
>+{
>+    const char kCSSource[] = R"(#version 310 es
>+layout(local_size_x=8) in;
>+layout(std140, binding = 0) buffer blockA {
>+    float f[8];
>+} instanceA;
>+layout(std140, binding = 1) buffer blockB {
>+    float f[8];
>+};
>+void main()
>+{
>+    f[gl_LocalInvocationIndex] = instanceA.f[gl_LocalInvocationIndex];
>+})";
>+
>+    ANGLE_GL_COMPUTE_PROGRAM(program, kCSSource);
>+    EXPECT_GL_NO_ERROR();
>+}
>+
>+// Test that vector array buffer variables are supported.
>+TEST_P(ComputeShaderTest, ShaderStorageBlocksVectorArray)
>+{
>+    const char kCSSource[] = R"(#version 310 es
>+layout(local_size_x=4) in;
>+layout(std140, binding = 0) buffer blockA {
>+    vec2 v[4];
>+} instanceA;
>+layout(std140, binding = 1) buffer blockB {
>+    vec4 v[4];
>+};
>+void main()
>+{
>+    v[0][gl_LocalInvocationIndex] = instanceA.v[gl_LocalInvocationIndex][1];
>+})";
>+
>+    ANGLE_GL_COMPUTE_PROGRAM(program, kCSSource);
>+    EXPECT_GL_NO_ERROR();
>+}
>+
>+// Test that matrix array buffer variables are supported.
>+TEST_P(ComputeShaderTest, ShaderStorageBlocksMatrixArray)
>+{
>+    const char kCSSource[] = R"(#version 310 es
>+layout(local_size_x=8) in;
>+layout(std140, binding = 0) buffer blockA {
>+    float v1[5];
>+    mat4 m[8];
>+} instanceA;
>+layout(std140, binding = 1) buffer blockB {
>+    vec2 v1[3];
>+    mat4 m[8];
>+};
>+void main()
>+{
>+    float data = instanceA.m[gl_LocalInvocationIndex][0][0];
>+    m[gl_LocalInvocationIndex][gl_LocalInvocationIndex][gl_LocalInvocationIndex] = data;
>+})";
>+
>+    ANGLE_GL_COMPUTE_PROGRAM(program, kCSSource);
>+    EXPECT_GL_NO_ERROR();
>+}
>+
>+// Test that shader storage blocks only in assignment right is supported.
>+TEST_P(ComputeShaderTest, ShaderStorageBlocksInAssignmentRight)
>+{
>+    const char kCSSource[] = R"(#version 310 es
>+layout(local_size_x=8) in;
>+layout(std140, binding = 0) buffer blockA {
>+    float data[8];
>+} instanceA;
>+layout(r32f, binding = 0) writeonly uniform highp image2D imageOut;
>+
>+void main()
>+{
>+    float data = 1.0;
>+    data = instanceA.data[gl_LocalInvocationIndex];
>+    imageStore(imageOut, ivec2(gl_LocalInvocationID.xy), vec4(data));
>+})";
>+
>+    ANGLE_GL_COMPUTE_PROGRAM(program, kCSSource);
>+    EXPECT_GL_NO_ERROR();
>+}
>+
>+// Test that shader storage blocks with unsized array are supported.
>+TEST_P(ComputeShaderTest, ShaderStorageBlocksWithUnsizedArray)
>+{
>+    const char kCSSource[] = R"(#version 310 es
>+layout(local_size_x=8) in;
>+layout(std140, binding = 0) buffer blockA {
>+    float v[];
>+} instanceA;
>+layout(std140, binding = 0) buffer blockB {
>+    float v[];
>+} instanceB[1];
>+
>+void main()
>+{
>+    float data = instanceA.v[gl_LocalInvocationIndex];
>+    instanceB[0].v[gl_LocalInvocationIndex * 2u + 1u] = data;
>+}
>+)";
>+
>+    ANGLE_GL_COMPUTE_PROGRAM(program, kCSSource);
>+    EXPECT_GL_NO_ERROR();
>+}
>+
>+// Test that EOpIndexDirect/EOpIndexIndirect/EOpIndexDirectStruct nodes in ssbo EOpIndexInDirect
>+// don't need to calculate the offset and should be translated by OutputHLSL directly.
>+TEST_P(ComputeShaderTest, IndexAndDotOperatorsInSSBOIndexIndirectOperator)
>+{
>+    constexpr char kComputeShaderSource[] = R"(#version 310 es
>+layout(local_size_x=1) in;
>+layout(std140, binding = 0) buffer blockA {
>+    float v[4];
>+};
>+layout(std140, binding = 1) buffer blockB {
>+    float v[4];
>+} instanceB[1];
>+struct S
>+{
>+    uvec4 index[2];
>+} s;
>+void main()
>+{
>+        s.index[0] = uvec4(0u, 1u, 2u, 3u);
>+    float data = v[s.index[0].y];
>+    instanceB[0].v[s.index[0].x] = data;
>+})";
>+
>+    ANGLE_GL_COMPUTE_PROGRAM(program, kComputeShaderSource);
>+    EXPECT_GL_NO_ERROR();
>+}
>+
>+// Test that swizzle node in non-SSBO symbol works well.
>+TEST_P(ComputeShaderTest, ShaderStorageBlocksWithNonSSBOSwizzle)
>+{
>+    constexpr char kComputeShaderSource[] = R"(#version 310 es
>+layout(local_size_x=8) in;
>+layout(std140, binding = 0) buffer blockA {
>+    float v[8];
>+};
>+layout(std140, binding = 1) buffer blockB {
>+    float v[8];
>+} instanceB[1];
>+
>+void main()
>+{
>+    float data = v[gl_GlobalInvocationID.x];
>+    instanceB[0].v[gl_GlobalInvocationID.x] = data;
>+})";
>+
>+    ANGLE_GL_COMPUTE_PROGRAM(program, kComputeShaderSource);
>+    EXPECT_GL_NO_ERROR();
>+}
>+
>+// Test that swizzle node in SSBO symbol works well.
>+TEST_P(ComputeShaderTest, ShaderStorageBlocksWithSSBOSwizzle)
>+{
>+    constexpr char kComputeShaderSource[] = R"(#version 310 es
>+layout(local_size_x=1) in;
>+layout(std140, binding = 0) buffer blockA {
>+    vec2 v;
>+};
>+layout(std140, binding = 1) buffer blockB {
>+    float v;
>+} instanceB[1];
>+
>+void main()
>+{
>+    instanceB[0].v = v.x;
>+})";
>+
>+    ANGLE_GL_COMPUTE_PROGRAM(program, kComputeShaderSource);
>+    EXPECT_GL_NO_ERROR();
>+}
>+
>+// Check that it is not possible to create a compute shader when the context does not support ES
>+// 3.10
>+TEST_P(ComputeShaderTestES3, NotSupported)
>+{
>+    GLuint computeShaderHandle = glCreateShader(GL_COMPUTE_SHADER);
>+    EXPECT_EQ(0u, computeShaderHandle);
>+    EXPECT_GL_ERROR(GL_INVALID_ENUM);
>+}
>+
>+// The contents of shared variables should be cleared to zero at the beginning of shader execution.
>+TEST_P(WebGL2ComputeTest, sharedVariablesShouldBeZero)
>+{
>+    // http://anglebug.com/3226
>+    ANGLE_SKIP_TEST_IF(IsD3D11());
>+    const char kCSShader[] = R"(#version 310 es
>+layout (local_size_x = 4, local_size_y = 4, local_size_z = 1) in;
>+layout (r32ui, binding = 0) readonly uniform highp uimage2D srcImage;
>+layout (r32ui, binding = 1) writeonly uniform highp uimage2D dstImage;
>+struct S {
>+    float f;
>+    int i;
>+    uint u;
>+    bool b;
>+    vec4 v[64];
>+};
>+
>+shared S vars[16];
>+void main()
>+{
>+    S zeroS;
>+    zeroS.f = 0.0f;
>+    zeroS.i = 0;
>+    zeroS.u = 0u;
>+    zeroS.b = false;
>+    for (int i = 0; i < 64; i++)
>+    {
>+        zeroS.v[i] = vec4(0.0f);
>+    }
>+
>+    uint tid = gl_LocalInvocationID.x + gl_LocalInvocationID.y * 4u;
>+    uint value = (zeroS == vars[tid] ? 127u : 0u);
>+    imageStore(dstImage, ivec2(gl_LocalInvocationID.xy), uvec4(value));
>+})";
>+
>+    const std::array<GLuint, 16> inputData = {{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}};
>+    const std::array<GLuint, 16> expectedValues = {
>+        {127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127}};
>+    runSharedMemoryTest<GLuint, 4, 4>(kCSShader, GL_R32UI, GL_UNSIGNED_INT, inputData,
>+                                      expectedValues);
>+}
>+
>+// Test uniform dirty in compute shader, and verify the contents.
>+TEST_P(ComputeShaderTest, UniformDirty)
>+{
>+    GLTexture texture[2];
>+    GLFramebuffer framebuffer;
>+    constexpr char kCS[] = R"(#version 310 es
>+layout(local_size_x=1, local_size_y=1, local_size_z=1) in;
>+layout(r32ui, binding = 0) readonly uniform highp uimage2D uImage_1;
>+layout(r32ui, binding = 1) writeonly uniform highp uimage2D uImage_2;
>+uniform uint factor;
>+void main()
>+{
>+    uvec4 value = imageLoad(uImage_1, ivec2(gl_LocalInvocationID.xy));
>+    imageStore(uImage_2, ivec2(gl_LocalInvocationID.xy), value * factor);
>+})";
>+
>+    constexpr int kWidth = 1, kHeight = 1;
>+    constexpr GLuint kInputValues[2][1] = {{200}, {100}};
>+
>+    glBindTexture(GL_TEXTURE_2D, texture[0]);
>+    glTexStorage2D(GL_TEXTURE_2D, 1, GL_R32UI, kWidth, kHeight);
>+    glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, kWidth, kHeight, GL_RED_INTEGER, GL_UNSIGNED_INT,
>+                    kInputValues[0]);
>+    EXPECT_GL_NO_ERROR();
>+
>+    glBindTexture(GL_TEXTURE_2D, texture[1]);
>+    glTexStorage2D(GL_TEXTURE_2D, 1, GL_R32UI, kWidth, kHeight);
>+    glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, kWidth, kHeight, GL_RED_INTEGER, GL_UNSIGNED_INT,
>+                    kInputValues[1]);
>+    EXPECT_GL_NO_ERROR();
>+
>+    ANGLE_GL_COMPUTE_PROGRAM(program, kCS);
>+    glUseProgram(program);
>+
>+    glBindImageTexture(0, texture[0], 0, GL_FALSE, 0, GL_READ_ONLY, GL_R32UI);
>+    EXPECT_GL_NO_ERROR();
>+
>+    glBindImageTexture(1, texture[1], 0, GL_FALSE, 0, GL_WRITE_ONLY, GL_R32UI);
>+    EXPECT_GL_NO_ERROR();
>+
>+    glUniform1ui(glGetUniformLocation(program, "factor"), 2);
>+    EXPECT_GL_NO_ERROR();
>+
>+    glDispatchCompute(1, 1, 1);
>+    EXPECT_GL_NO_ERROR();
>+
>+    glMemoryBarrier(GL_TEXTURE_UPDATE_BARRIER_BIT);
>+
>+    glUniform1ui(glGetUniformLocation(program, "factor"), 3);
>+    EXPECT_GL_NO_ERROR();
>+
>+    glDispatchCompute(1, 1, 1);
>+    EXPECT_GL_NO_ERROR();
>+
>+    glMemoryBarrier(GL_TEXTURE_UPDATE_BARRIER_BIT);
>+    GLuint outputValues[kWidth * kHeight];
>+    GLuint expectedValue = 600;
>+    glUseProgram(0);
>+    glBindFramebuffer(GL_READ_FRAMEBUFFER, framebuffer);
>+
>+    glFramebufferTexture2D(GL_READ_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, texture[1], 0);
>+    EXPECT_GL_NO_ERROR();
>+    glReadPixels(0, 0, kWidth, kHeight, GL_RED_INTEGER, GL_UNSIGNED_INT, outputValues);
>+    EXPECT_GL_NO_ERROR();
>+
>+    for (int i = 0; i < kWidth * kHeight; i++)
>+    {
>+        EXPECT_EQ(expectedValue, outputValues[i]);
>+    }
>+}
>+
>+// Test storage buffer bound is unchanged, shader writes it, buffer content should be updated.
>+TEST_P(ComputeShaderTest, StorageBufferBoundUnchanged)
>+{
>+    constexpr char kCS[] = R"(#version 310 es
>+layout(local_size_x=16, local_size_y=16) in;
>+precision highp usampler2D;
>+uniform usampler2D tex;
>+uniform uint factor;
>+layout(std140, binding = 0) buffer buf {
>+    uint outData[16][16];
>+};
>+
>+void main()
>+{
>+    uint x = gl_LocalInvocationID.x;
>+    uint y = gl_LocalInvocationID.y;
>+    float xCoord = float(x) / float(16);
>+    float yCoord = float(y) / float(16);
>+    outData[y][x] = texture(tex, vec2(xCoord, yCoord)).x + factor;
>+})";
>+
>+    constexpr unsigned int kWidth  = 16;
>+    constexpr unsigned int kHeight = 16;
>+    GLTexture tex;
>+    glBindTexture(GL_TEXTURE_2D, tex);
>+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
>+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
>+    glTexStorage2D(GL_TEXTURE_2D, 1, GL_R32UI, kWidth, kHeight);
>+    GLuint texels[kHeight][kWidth] = {{0}};
>+    for (unsigned int y = 0; y < kHeight; ++y)
>+    {
>+        for (unsigned int x = 0; x < kWidth; ++x)
>+        {
>+            texels[y][x] = x + y * kWidth;
>+        }
>+    }
>+    glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
>+    glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, kWidth, kHeight, GL_RED_INTEGER, GL_UNSIGNED_INT,
>+                    texels);
>+    glBindTexture(GL_TEXTURE_2D, 0);
>+
>+    // The array stride are rounded up to the base alignment of a vec4 for std140 layout.
>+    constexpr unsigned int kArrayStride = 16;
>+    GLBuffer ssbo;
>+    glBindBuffer(GL_SHADER_STORAGE_BUFFER, ssbo);
>+    glBufferData(GL_SHADER_STORAGE_BUFFER, kWidth * kHeight * kArrayStride, nullptr,
>+                 GL_STREAM_DRAW);
>+    glBindBuffer(GL_SHADER_STORAGE_BUFFER, 0);
>+    EXPECT_GL_NO_ERROR();
>+
>+    ANGLE_GL_COMPUTE_PROGRAM(program, kCS);
>+    glUseProgram(program);
>+
>+    glActiveTexture(GL_TEXTURE0);
>+    glBindTexture(GL_TEXTURE_2D, tex);
>+    glUniform1i(glGetUniformLocation(program, "tex"), 0);
>+    glUniform1ui(glGetUniformLocation(program, "factor"), 2);
>+    glBindBuffer(GL_SHADER_STORAGE_BUFFER, ssbo);
>+    glBindBufferBase(GL_SHADER_STORAGE_BUFFER, 0, ssbo);
>+
>+    glDispatchCompute(1, 1, 1);
>+
>+    const GLuint *ptr1 = reinterpret_cast<const GLuint *>(glMapBufferRange(
>+        GL_SHADER_STORAGE_BUFFER, 0, kWidth * kHeight * kArrayStride, GL_MAP_READ_BIT));
>+    EXPECT_GL_NO_ERROR();
>+    for (unsigned int idx = 0; idx < kWidth * kHeight; idx++)
>+    {
>+        EXPECT_EQ(idx + 2, *(ptr1 + idx * kArrayStride / 4));
>+    }
>+    glUnmapBuffer(GL_SHADER_STORAGE_BUFFER);
>+    glUniform1ui(glGetUniformLocation(program, "factor"), 3);
>+    glDispatchCompute(1, 1, 1);
>+
>+    const GLuint *ptr2 = reinterpret_cast<const GLuint *>(glMapBufferRange(
>+        GL_SHADER_STORAGE_BUFFER, 0, kWidth * kHeight * kArrayStride, GL_MAP_READ_BIT));
>+    EXPECT_GL_NO_ERROR();
>+    for (unsigned int idx = 0; idx < kWidth * kHeight; idx++)
>+    {
>+        EXPECT_EQ(idx + 3, *(ptr2 + idx * kArrayStride / 4));
>+    }
>+}
>+
>+// Test imageSize to access mipmap slice.
>+TEST_P(ComputeShaderTest, ImageSizeMipmapSlice)
>+{
>+    // TODO(xinghua.cao@intel.com): http://anglebug.com/3100
>+    ANGLE_SKIP_TEST_IF(IsNVIDIA() && IsD3D11());
>+
>+    // TODO(xinghua.cao@intel.com): http://anglebug.com/3101
>+    ANGLE_SKIP_TEST_IF(IsIntel() && IsLinux());
>+
>+    GLTexture texture[2];
>+    GLFramebuffer framebuffer;
>+    const char kCS[] = R"(#version 310 es
>+layout(local_size_x=1, local_size_y=1, local_size_z=1) in;
>+layout(r32ui, binding = 0) readonly uniform highp uimage2D uImage_1;
>+layout(rgba32ui, binding = 1) writeonly uniform highp uimage2D uImage_2;
>+void main()
>+{
>+    ivec2 size = imageSize(uImage_1);
>+    imageStore(uImage_2, ivec2(gl_LocalInvocationID.xy), uvec4(size, 0, 0));
>+})";
>+
>+    constexpr int kWidth1 = 8, kHeight1 = 4, kWidth2 = 1, kHeight2 = 1;
>+    constexpr GLuint kInputValues[] = {0, 0, 0, 0};
>+
>+    glBindTexture(GL_TEXTURE_2D, texture[0]);
>+    glTexStorage2D(GL_TEXTURE_2D, 2, GL_R32UI, kWidth1, kHeight1);
>+    EXPECT_GL_NO_ERROR();
>+
>+    glBindTexture(GL_TEXTURE_2D, texture[1]);
>+    glTexStorage2D(GL_TEXTURE_2D, 1, GL_RGBA32UI, kWidth2, kHeight2);
>+    glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, kWidth2, kHeight2, GL_RGBA_INTEGER, GL_UNSIGNED_INT,
>+                    kInputValues);
>+    EXPECT_GL_NO_ERROR();
>+
>+    ANGLE_GL_COMPUTE_PROGRAM(program, kCS);
>+    glUseProgram(program);
>+
>+    glBindImageTexture(0, texture[0], 1, GL_FALSE, 0, GL_READ_ONLY, GL_R32UI);
>+    glBindImageTexture(1, texture[1], 0, GL_FALSE, 0, GL_WRITE_ONLY, GL_RGBA32UI);
>+
>+    glDispatchCompute(1, 1, 1);
>+    EXPECT_GL_NO_ERROR();
>+
>+    glMemoryBarrier(GL_TEXTURE_UPDATE_BARRIER_BIT);
>+    GLuint outputValues[kWidth2 * kHeight2 * 4];
>+    constexpr GLuint expectedValue[] = {4, 2};
>+    glUseProgram(0);
>+    glBindFramebuffer(GL_READ_FRAMEBUFFER, framebuffer);
>+
>+    glFramebufferTexture2D(GL_READ_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, texture[1], 0);
>+    EXPECT_GL_NO_ERROR();
>+    glReadPixels(0, 0, kWidth2, kHeight2, GL_RGBA_INTEGER, GL_UNSIGNED_INT, outputValues);
>+    EXPECT_GL_NO_ERROR();
>+
>+    for (int i = 0; i < kWidth2 * kHeight2; i++)
>+    {
>+        EXPECT_EQ(expectedValue[i], outputValues[i]);
>+        EXPECT_EQ(expectedValue[i + 1], outputValues[i + 1]);
>+    }
>+}
>+
>+// Test imageLoad to access mipmap slice.
>+TEST_P(ComputeShaderTest, ImageLoadMipmapSlice)
>+{
>+    // TODO(xinghua.cao@intel.com): http://anglebug.com/3101
>+    ANGLE_SKIP_TEST_IF(IsIntel() && IsLinux());
>+
>+    GLTexture texture[2];
>+    GLFramebuffer framebuffer;
>+    constexpr char kCS[] = R"(#version 310 es
>+layout(local_size_x=1, local_size_y=1, local_size_z=1) in;
>+layout(r32ui, binding = 0) readonly uniform highp uimage2D uImage_1;
>+layout(r32ui, binding = 1) writeonly uniform highp uimage2D uImage_2;
>+void main()
>+{
>+    uvec4 value = imageLoad(uImage_1, ivec2(gl_LocalInvocationID.xy));
>+    imageStore(uImage_2, ivec2(gl_LocalInvocationID.xy), value);
>+})";
>+
>+    constexpr int kWidth1 = 2, kHeight1 = 2, kWidth2 = 1, kHeight2 = 1;
>+    constexpr GLuint kInputValues11[] = {3, 3, 3, 3};
>+    constexpr GLuint kInputValues12[] = {2};
>+    constexpr GLuint kInputValues2[]  = {1};
>+
>+    glBindTexture(GL_TEXTURE_2D, texture[0]);
>+    glTexStorage2D(GL_TEXTURE_2D, 2, GL_R32UI, kWidth1, kHeight1);
>+    glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, kWidth1, kHeight1, GL_RED_INTEGER, GL_UNSIGNED_INT,
>+                    kInputValues11);
>+    glTexSubImage2D(GL_TEXTURE_2D, 1, 0, 0, kWidth2, kHeight2, GL_RED_INTEGER, GL_UNSIGNED_INT,
>+                    kInputValues12);
>+    EXPECT_GL_NO_ERROR();
>+
>+    glBindTexture(GL_TEXTURE_2D, texture[1]);
>+    glTexStorage2D(GL_TEXTURE_2D, 1, GL_R32UI, kWidth2, kHeight2);
>+    glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, kWidth2, kHeight2, GL_RED_INTEGER, GL_UNSIGNED_INT,
>+                    kInputValues2);
>+    EXPECT_GL_NO_ERROR();
>+
>+    ANGLE_GL_COMPUTE_PROGRAM(program, kCS);
>+    glUseProgram(program);
>+
>+    glBindImageTexture(0, texture[0], 1, GL_FALSE, 0, GL_READ_ONLY, GL_R32UI);
>+    glBindImageTexture(1, texture[1], 0, GL_FALSE, 0, GL_WRITE_ONLY, GL_R32UI);
>+
>+    glDispatchCompute(1, 1, 1);
>+    EXPECT_GL_NO_ERROR();
>+
>+    glMemoryBarrier(GL_TEXTURE_UPDATE_BARRIER_BIT);
>+    GLuint outputValues;
>+    constexpr GLuint expectedValue = 2;
>+    glUseProgram(0);
>+    glBindFramebuffer(GL_READ_FRAMEBUFFER, framebuffer);
>+
>+    glFramebufferTexture2D(GL_READ_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, texture[1], 0);
>+    EXPECT_GL_NO_ERROR();
>+    glReadPixels(0, 0, kWidth2, kHeight2, GL_RED_INTEGER, GL_UNSIGNED_INT, &outputValues);
>+    EXPECT_GL_NO_ERROR();
>+    EXPECT_EQ(expectedValue, outputValues);
>+}
>+
>+// Test imageStore to access mipmap slice.
>+TEST_P(ComputeShaderTest, ImageStoreMipmapSlice)
>+{
>+    // TODO(xinghua.cao@intel.com): http://anglebug.com/3101
>+    ANGLE_SKIP_TEST_IF(IsIntel() && IsLinux());
>+
>+    GLTexture texture[2];
>+    GLFramebuffer framebuffer;
>+    constexpr char kCS[] = R"(#version 310 es
>+layout(local_size_x=1, local_size_y=1, local_size_z=1) in;
>+layout(r32ui, binding = 0) readonly uniform highp uimage2D uImage_1;
>+layout(r32ui, binding = 1) writeonly uniform highp uimage2D uImage_2;
>+void main()
>+{
>+    uvec4 value = imageLoad(uImage_1, ivec2(gl_LocalInvocationID.xy));
>+    imageStore(uImage_2, ivec2(gl_LocalInvocationID.xy), value);
>+})";
>+
>+    constexpr int kWidth1 = 1, kHeight1 = 1, kWidth2 = 2, kHeight2 = 2;
>+    constexpr GLuint kInputValues1[]  = {3};
>+    constexpr GLuint kInputValues21[] = {2, 2, 2, 2};
>+    constexpr GLuint kInputValues22[] = {1};
>+
>+    glBindTexture(GL_TEXTURE_2D, texture[0]);
>+    glTexStorage2D(GL_TEXTURE_2D, 1, GL_R32UI, kWidth1, kHeight1);
>+    glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, kWidth1, kHeight1, GL_RED_INTEGER, GL_UNSIGNED_INT,
>+                    kInputValues1);
>+    EXPECT_GL_NO_ERROR();
>+
>+    glBindTexture(GL_TEXTURE_2D, texture[1]);
>+    glTexStorage2D(GL_TEXTURE_2D, 2, GL_R32UI, kWidth2, kHeight2);
>+    glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, kWidth2, kHeight2, GL_RED_INTEGER, GL_UNSIGNED_INT,
>+                    kInputValues21);
>+    glTexSubImage2D(GL_TEXTURE_2D, 1, 0, 0, kWidth1, kHeight1, GL_RED_INTEGER, GL_UNSIGNED_INT,
>+                    kInputValues22);
>+    EXPECT_GL_NO_ERROR();
>+
>+    ANGLE_GL_COMPUTE_PROGRAM(program, kCS);
>+    glUseProgram(program);
>+
>+    glBindImageTexture(0, texture[0], 0, GL_FALSE, 0, GL_READ_ONLY, GL_R32UI);
>+    glBindImageTexture(1, texture[1], 1, GL_FALSE, 0, GL_WRITE_ONLY, GL_R32UI);
>+
>+    glDispatchCompute(1, 1, 1);
>+    EXPECT_GL_NO_ERROR();
>+
>+    glMemoryBarrier(GL_TEXTURE_UPDATE_BARRIER_BIT);
>+    GLuint outputValues;
>+    constexpr GLuint expectedValue = 3;
>+    glUseProgram(0);
>+    glBindFramebuffer(GL_READ_FRAMEBUFFER, framebuffer);
>+
>+    glFramebufferTexture2D(GL_READ_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, texture[1], 1);
>+    EXPECT_GL_NO_ERROR();
>+    glReadPixels(0, 0, kWidth1, kHeight1, GL_RED_INTEGER, GL_UNSIGNED_INT, &outputValues);
>+    EXPECT_GL_NO_ERROR();
>+    EXPECT_EQ(expectedValue, outputValues);
>+}
>+
>+// Test that render pipeline and compute pipeline access to the same texture.
>+// Steps:
>+//   1. DispatchCompute.
>+//   2. DrawArrays.
>+TEST_P(ComputeShaderTest, DispatchDraw)
>+{
>+    // TODO(xinghua.cao@intel.com): http://anglebug.com/3152
>+    ANGLE_SKIP_TEST_IF(IsD3D11());
>+
>+    const char kCSSource[] = R"(#version 310 es
>+layout(local_size_x=1, local_size_y=1, local_size_z=1) in;
>+layout(rgba32f, binding = 0) writeonly uniform highp image2D image;
>+void main()
>+{
>+    imageStore(image, ivec2(gl_LocalInvocationID.xy), vec4(0.0, 0.0, 1.0, 1.0));
>+})";
>+
>+    const char kVSSource[] = R"(#version 310 es
>+layout (location = 0) in vec2 pos;
>+out vec2 texCoord;
>+void main(void) {
>+    texCoord = 0.5*pos + 0.5;
>+    gl_Position = vec4(pos, 0.0, 1.0);
>+})";
>+
>+    const char kFSSource[] = R"(#version 310 es
>+precision highp float;
>+uniform sampler2D tex;
>+in vec2 texCoord;
>+out vec4 fragColor;
>+void main(void) {
>+    fragColor = texture(tex, texCoord);
>+})";
>+
>+    GLuint aPosLoc = 0;
>+    ANGLE_GL_PROGRAM(program, kVSSource, kFSSource);
>+    glBindAttribLocation(program, aPosLoc, "pos");
>+    GLuint buffer;
>+    glGenBuffers(1, &buffer);
>+    glBindBuffer(GL_ARRAY_BUFFER, buffer);
>+    GLfloat vertices[] = {-1, -1, 1, -1, -1, 1, 1, 1};
>+    glBufferData(GL_ARRAY_BUFFER, sizeof(GLfloat) * 8, vertices, GL_STATIC_DRAW);
>+    glVertexAttribPointer(aPosLoc, 2, GL_FLOAT, GL_FALSE, 0, 0);
>+    glEnableVertexAttribArray(aPosLoc);
>+
>+    constexpr GLfloat kInputValues[4] = {1.0, 0.0, 0.0, 1.0};
>+    GLTexture texture;
>+    glBindTexture(GL_TEXTURE_2D, texture);
>+    glTexStorage2D(GL_TEXTURE_2D, 1, GL_RGBA32F, 1, 1);
>+    glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, 1, 1, GL_RGBA, GL_FLOAT, kInputValues);
>+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
>+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
>+    EXPECT_GL_NO_ERROR();
>+
>+    ANGLE_GL_COMPUTE_PROGRAM(csProgram, kCSSource);
>+    glUseProgram(csProgram);
>+
>+    glBindImageTexture(0, texture, 0, GL_FALSE, 0, GL_WRITE_ONLY, GL_RGBA32F);
>+
>+    glDispatchCompute(1, 1, 1);
>+    glMemoryBarrier(GL_TEXTURE_UPDATE_BARRIER_BIT);
>+    EXPECT_GL_NO_ERROR();
>+
>+    glUseProgram(program);
>+    glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
>+    EXPECT_PIXEL_COLOR_EQ(1, 1, GLColor::blue);
>+}
>+
>+// Test that render pipeline and compute pipeline access to the same texture.
>+// Steps:
>+//   1. DrawArrays.
>+//   2. DispatchCompute.
>+//   3. DispatchCompute.
>+//   4. DrawArrays.
>+TEST_P(ComputeShaderTest, DrawDispachDispatchDraw)
>+{
>+    // TODO(xinghua.cao@intel.com): http://anglebug.com/3152
>+    ANGLE_SKIP_TEST_IF(IsD3D11());
>+
>+    const char kCSSource[] = R"(#version 310 es
>+layout(local_size_x=1, local_size_y=1, local_size_z=1) in;
>+layout(rgba32f, binding = 0) writeonly uniform highp image2D image;
>+uniform float factor;
>+void main()
>+{
>+    imageStore(image, ivec2(gl_LocalInvocationID.xy), vec4(factor, 0.0, 1.0, 1.0));
>+})";
>+
>+    const char kVSSource[] = R"(#version 310 es
>+layout (location = 0) in vec2 pos;
>+out vec2 texCoord;
>+void main(void) {
>+    texCoord = 0.5*pos + 0.5;
>+    gl_Position = vec4(pos, 0.0, 1.0);
>+})";
>+
>+    const char kFSSource[] = R"(#version 310 es
>+precision highp float;
>+uniform sampler2D tex;
>+in vec2 texCoord;
>+out vec4 fragColor;
>+void main(void) {
>+    fragColor = texture(tex, texCoord);
>+})";
>+
>+    GLuint aPosLoc = 0;
>+    ANGLE_GL_PROGRAM(program, kVSSource, kFSSource);
>+    glBindAttribLocation(program, aPosLoc, "pos");
>+    GLuint buffer;
>+    glGenBuffers(1, &buffer);
>+    glBindBuffer(GL_ARRAY_BUFFER, buffer);
>+    GLfloat vertices[] = {-1, -1, 1, -1, -1, 1, 1, 1};
>+    glBufferData(GL_ARRAY_BUFFER, sizeof(GLfloat) * 8, vertices, GL_STATIC_DRAW);
>+    glVertexAttribPointer(aPosLoc, 2, GL_FLOAT, GL_FALSE, 0, 0);
>+    glEnableVertexAttribArray(aPosLoc);
>+
>+    constexpr GLfloat kInputValues[4] = {1.0, 0.0, 0.0, 1.0};
>+    GLTexture texture;
>+    glBindTexture(GL_TEXTURE_2D, texture);
>+    glTexStorage2D(GL_TEXTURE_2D, 1, GL_RGBA32F, 1, 1);
>+    glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, 1, 1, GL_RGBA, GL_FLOAT, kInputValues);
>+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
>+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
>+    glUseProgram(program);
>+    glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
>+    EXPECT_GL_NO_ERROR();
>+
>+    ANGLE_GL_COMPUTE_PROGRAM(csProgram, kCSSource);
>+    glUseProgram(csProgram);
>+    glUniform1f(glGetUniformLocation(csProgram, "factor"), 0.0);
>+    glBindImageTexture(0, texture, 0, GL_FALSE, 0, GL_WRITE_ONLY, GL_RGBA32F);
>+    EXPECT_GL_NO_ERROR();
>+
>+    glDispatchCompute(1, 1, 1);
>+    glMemoryBarrier(GL_TEXTURE_UPDATE_BARRIER_BIT);
>+    EXPECT_GL_NO_ERROR();
>+
>+    glUniform1f(glGetUniformLocation(csProgram, "factor"), 1.0);
>+    glDispatchCompute(1, 1, 1);
>+    glMemoryBarrier(GL_TEXTURE_UPDATE_BARRIER_BIT);
>+    EXPECT_GL_NO_ERROR();
>+
>+    glUseProgram(program);
>+    glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
>+    EXPECT_PIXEL_COLOR_EQ(1, 1, GLColor::magenta);
>+}
>+
>+// Test that render pipeline and compute pipeline access to the same texture.
>+// Steps:
>+//   1. DispatchCompute.
>+//   2. DrawArrays.
>+//   3. DrawArrays.
>+//   4. DispatchCompute.
>+TEST_P(ComputeShaderTest, DispatchDrawDrawDispatch)
>+{
>+    // TODO(xinghua.cao@intel.com): http://anglebug.com/3152
>+    ANGLE_SKIP_TEST_IF(IsD3D11());
>+
>+    const char kCSSource[] = R"(#version 310 es
>+layout(local_size_x=1, local_size_y=1, local_size_z=1) in;
>+layout(rgba32f, binding = 0) writeonly uniform highp image2D image;
>+
>+void main()
>+{
>+    imageStore(image, ivec2(gl_LocalInvocationID.xy), vec4(0.0, 0.0, 1.0, 1.0));
>+})";
>+
>+    const char kVSSource[] = R"(#version 310 es
>+layout (location = 0) in vec2 pos;
>+out vec2 texCoord;
>+void main(void) {
>+    texCoord = 0.5*pos + 0.5;
>+    gl_Position = vec4(pos, 0.0, 1.0);
>+})";
>+
>+    const char kFSSource[] = R"(#version 310 es
>+precision highp float;
>+uniform sampler2D tex;
>+in vec2 texCoord;
>+uniform float factor;
>+out vec4 fragColor;
>+void main(void) {
>+    fragColor = texture(tex, texCoord) + vec4(factor, 0.0, 0.0, 0.0);
>+})";
>+
>+    GLuint aPosLoc = 0;
>+    ANGLE_GL_PROGRAM(program, kVSSource, kFSSource);
>+    glBindAttribLocation(program, aPosLoc, "pos");
>+    GLuint buffer;
>+    glGenBuffers(1, &buffer);
>+    glBindBuffer(GL_ARRAY_BUFFER, buffer);
>+    GLfloat vertices[] = {-1, -1, 1, -1, -1, 1, 1, 1};
>+    glBufferData(GL_ARRAY_BUFFER, sizeof(GLfloat) * 8, vertices, GL_STATIC_DRAW);
>+    glVertexAttribPointer(aPosLoc, 2, GL_FLOAT, GL_FALSE, 0, 0);
>+    glEnableVertexAttribArray(aPosLoc);
>+
>+    constexpr GLfloat kInputValues[4] = {1.0, 0.0, 0.0, 1.0};
>+    GLTexture texture;
>+    glBindTexture(GL_TEXTURE_2D, texture);
>+    glTexStorage2D(GL_TEXTURE_2D, 1, GL_RGBA32F, 1, 1);
>+    glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, 1, 1, GL_RGBA, GL_FLOAT, kInputValues);
>+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
>+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
>+
>+    ANGLE_GL_COMPUTE_PROGRAM(csProgram, kCSSource);
>+    glUseProgram(csProgram);
>+    glBindImageTexture(0, texture, 0, GL_FALSE, 0, GL_WRITE_ONLY, GL_RGBA32F);
>+
>+    glDispatchCompute(1, 1, 1);
>+    glMemoryBarrier(GL_TEXTURE_UPDATE_BARRIER_BIT);
>+    EXPECT_GL_NO_ERROR();
>+
>+    glUseProgram(program);
>+    glUniform1f(glGetUniformLocation(program, "factor"), 0.0);
>+    glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
>+    EXPECT_GL_NO_ERROR();
>+
>+    glUniform1f(glGetUniformLocation(program, "factor"), 1.0);
>+    glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
>+    EXPECT_GL_NO_ERROR();
>+
>+    glUseProgram(csProgram);
>+    glDispatchCompute(1, 1, 1);
>+    glMemoryBarrier(GL_TEXTURE_UPDATE_BARRIER_BIT);
>+    EXPECT_GL_NO_ERROR();
>+
>+    glUseProgram(program);
>+    glUniform1f(glGetUniformLocation(program, "factor"), 0.0);
>+    glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
>+    EXPECT_PIXEL_COLOR_EQ(1, 1, GLColor::blue);
>+}
>+
>+// Test that invalid memory barrier will produce an error.
>+TEST_P(ComputeShaderTest, InvalidMemoryBarrier)
>+{
>+    GLbitfield barriers = 0;
>+    glMemoryBarrier(barriers);
>+    EXPECT_GL_ERROR(GL_INVALID_VALUE);
>+}
>+
>+ANGLE_INSTANTIATE_TEST(ComputeShaderTest, ES31_OPENGL(), ES31_OPENGLES(), ES31_D3D11());
>+ANGLE_INSTANTIATE_TEST(ComputeShaderTestES3, ES3_OPENGL(), ES3_OPENGLES());
>+ANGLE_INSTANTIATE_TEST(WebGL2ComputeTest, ES31_D3D11());
> }  // namespace
>diff --git a/Source/ThirdParty/ANGLE/src/tests/gl_tests/ContextLostTest.cpp b/Source/ThirdParty/ANGLE/src/tests/gl_tests/ContextLostTest.cpp
>new file mode 100644
>index 00000000000..c2277ba91e1
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/tests/gl_tests/ContextLostTest.cpp
>@@ -0,0 +1,117 @@
>+//
>+// Copyright 2015 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+
>+// BindGeneratesResourceTest.cpp : Tests of the GL_CHROMIUM_bind_generates_resource extension.
>+
>+#include "test_utils/ANGLETest.h"
>+
>+namespace angle
>+{
>+class ContextLostTest : public ANGLETest
>+{
>+  protected:
>+    ContextLostTest() { setContextResetStrategy(EGL_LOSE_CONTEXT_ON_RESET_EXT); }
>+};
>+
>+// GL_CHROMIUM_lose_context is implemented in the frontend
>+TEST_P(ContextLostTest, ExtensionStringExposed)
>+{
>+    EXPECT_TRUE(EnsureGLExtensionEnabled("GL_CHROMIUM_lose_context"));
>+}
>+
>+// Use GL_CHROMIUM_lose_context to lose a context and verify
>+TEST_P(ContextLostTest, BasicUsage)
>+{
>+    ANGLE_SKIP_TEST_IF(!EnsureGLExtensionEnabled("GL_CHROMIUM_lose_context"));
>+    ANGLE_SKIP_TEST_IF(!EnsureGLExtensionEnabled("GL_EXT_robustness"));
>+
>+    glLoseContextCHROMIUM(GL_GUILTY_CONTEXT_RESET, GL_INNOCENT_CONTEXT_RESET);
>+    EXPECT_GL_NO_ERROR();
>+    EXPECT_GLENUM_EQ(glGetGraphicsResetStatusEXT(), GL_GUILTY_CONTEXT_RESET);
>+
>+    glBindTexture(GL_TEXTURE_2D, 0);
>+    EXPECT_GL_ERROR(GL_OUT_OF_MEMORY);
>+}
>+
>+// When context is lost, polling queries such as glGetSynciv with GL_SYNC_STATUS should always
>+// return GL_SIGNALED
>+TEST_P(ContextLostTest, PollingQuery)
>+{
>+    ANGLE_SKIP_TEST_IF(!EnsureGLExtensionEnabled("GL_CHROMIUM_lose_context"));
>+    ANGLE_SKIP_TEST_IF(getClientMajorVersion() < 3);
>+
>+    GLsync sync = glFenceSync(GL_SYNC_GPU_COMMANDS_COMPLETE, 0);
>+    EXPECT_GL_NO_ERROR();
>+
>+    glLoseContextCHROMIUM(GL_GUILTY_CONTEXT_RESET, GL_INNOCENT_CONTEXT_RESET);
>+    EXPECT_GL_NO_ERROR();
>+
>+    GLint syncStatus = 0;
>+    glGetSynciv(sync, GL_SYNC_STATUS, 1, nullptr, &syncStatus);
>+    EXPECT_GL_ERROR(GL_CONTEXT_LOST);
>+    EXPECT_GLENUM_EQ(syncStatus, GL_SIGNALED);
>+
>+    // Check that the query fails and the result is unmodified for other queries
>+    GLint syncCondition = 0xBADF00D;
>+    glGetSynciv(sync, GL_SYNC_CONDITION, 1, nullptr, &syncCondition);
>+    EXPECT_GL_ERROR(GL_CONTEXT_LOST);
>+    EXPECT_GLENUM_EQ(syncCondition, 0xBADF00D);
>+}
>+
>+// When context is lost, polling queries such as glGetSynciv with GL_SYNC_STATUS should always
>+// return GL_SIGNALED
>+TEST_P(ContextLostTest, ParallelCompileReadyQuery)
>+{
>+    ANGLE_SKIP_TEST_IF(!EnsureGLExtensionEnabled("GL_CHROMIUM_lose_context"));
>+    ANGLE_SKIP_TEST_IF(!EnsureGLExtensionEnabled("GL_KHR_parallel_shader_compile"));
>+
>+    GLuint vs = CompileShader(GL_VERTEX_SHADER, essl1_shaders::vs::Simple());
>+    GLuint fs = CompileShader(GL_FRAGMENT_SHADER, essl1_shaders::fs::UniformColor());
>+
>+    GLuint program = glCreateProgram();
>+    glAttachShader(program, vs);
>+    glAttachShader(program, fs);
>+    glLinkProgram(program);
>+
>+    EXPECT_GL_NO_ERROR();
>+
>+    glLoseContextCHROMIUM(GL_GUILTY_CONTEXT_RESET, GL_INNOCENT_CONTEXT_RESET);
>+    EXPECT_GL_NO_ERROR();
>+
>+    GLint shaderCompletionStatus = 0;
>+    glGetShaderiv(vs, GL_COMPLETION_STATUS_KHR, &shaderCompletionStatus);
>+    EXPECT_GL_ERROR(GL_CONTEXT_LOST);
>+    EXPECT_GLENUM_EQ(shaderCompletionStatus, GL_TRUE);
>+
>+    GLint programCompletionStatus = 0;
>+    glGetProgramiv(program, GL_COMPLETION_STATUS_KHR, &programCompletionStatus);
>+    EXPECT_GL_ERROR(GL_CONTEXT_LOST);
>+    EXPECT_GLENUM_EQ(programCompletionStatus, GL_TRUE);
>+
>+    // Check that the query fails and the result is unmodified for other queries
>+    GLint shaderType = 0xBADF00D;
>+    glGetShaderiv(vs, GL_SHADER_TYPE, &shaderType);
>+    EXPECT_GL_ERROR(GL_CONTEXT_LOST);
>+    EXPECT_GLENUM_EQ(shaderType, 0xBADF00D);
>+
>+    GLint linkStatus = 0xBADF00D;
>+    glGetProgramiv(program, GL_LINK_STATUS, &linkStatus);
>+    EXPECT_GL_ERROR(GL_CONTEXT_LOST);
>+    EXPECT_GLENUM_EQ(linkStatus, 0xBADF00D);
>+}
>+
>+// Use this to select which configurations (e.g. which renderer, which GLES major version) these
>+// tests should be run against.
>+ANGLE_INSTANTIATE_TEST(ContextLostTest,
>+                       ES2_NULL(),
>+                       ES2_D3D9(),
>+                       ES2_D3D11(),
>+                       ES3_D3D11(),
>+                       ES2_D3D11_FL9_3(),
>+                       ES2_VULKAN(),
>+                       ES3_VULKAN());
>+
>+}  // namespace angle
>diff --git a/Source/ThirdParty/ANGLE/src/tests/gl_tests/CopyCompressedTextureTest.cpp b/Source/ThirdParty/ANGLE/src/tests/gl_tests/CopyCompressedTextureTest.cpp
>index 4d4151949dd..4c96d2bd57d 100644
>--- a/Source/ThirdParty/ANGLE/src/tests/gl_tests/CopyCompressedTextureTest.cpp
>+++ b/Source/ThirdParty/ANGLE/src/tests/gl_tests/CopyCompressedTextureTest.cpp
>@@ -30,24 +30,28 @@ class CopyCompressedTextureTest : public ANGLETest
> 
>         glGenTextures(2, mTextures);
> 
>-        mProgram = CompileProgram(
>+        constexpr char kVS[] =
>             "attribute vec2 a_position;\n"
>             "varying vec2 v_texcoord;\n"
>             "void main()\n"
>             "{\n"
>             "   gl_Position = vec4(a_position, 0.0, 1.0);\n"
>             "   v_texcoord = (a_position + 1.0) * 0.5;\n"
>-            "}\n",
>+            "}\n";
>+
>+        constexpr char kFS[] =
>             "precision mediump float;\n"
>             "uniform sampler2D u_texture;\n"
>             "varying vec2 v_texcoord;\n"
>             "void main()\n"
>             "{\n"
>             "    gl_FragColor = texture2D(u_texture, v_texcoord);\n"
>-            "}\n");
>+            "}\n";
>+
>+        mProgram = CompileProgram(kVS, kFS);
>         ASSERT_NE(0u, mProgram);
> 
>-        if (extensionEnabled("GL_CHROMIUM_copy_compressed_texture"))
>+        if (IsGLExtensionEnabled("GL_CHROMIUM_copy_compressed_texture"))
>         {
>             glCompressedCopyTextureCHROMIUM =
>                 reinterpret_cast<PFNGLCOMPRESSEDCOPYTEXTURECHROMIUMPROC>(
>@@ -65,7 +69,7 @@ class CopyCompressedTextureTest : public ANGLETest
> 
>     bool checkExtensions() const
>     {
>-        if (!extensionEnabled("GL_CHROMIUM_copy_compressed_texture"))
>+        if (!IsGLExtensionEnabled("GL_CHROMIUM_copy_compressed_texture"))
>         {
>             std::cout
>                 << "Test skipped because GL_CHROMIUM_copy_compressed_texture is not available."
>@@ -120,17 +124,9 @@ const uint8_t CompressedImageETC1[8] = {0x0, 0x0, 0xf8, 0x2, 0xff, 0xff, 0x0, 0x
> // Test to ensure that the basic functionality of the extension works.
> TEST_P(CopyCompressedTextureTest, Basic)
> {
>-    if (!checkExtensions())
>-    {
>-        return;
>-    }
>+    ANGLE_SKIP_TEST_IF(!checkExtensions());
> 
>-    if (!extensionEnabled("GL_EXT_texture_compression_dxt1"))
>-    {
>-        std::cout << "Test skipped because GL_EXT_texture_compression_dxt1 is not available."
>-                  << std::endl;
>-        return;
>-    }
>+    ANGLE_SKIP_TEST_IF(!IsGLExtensionEnabled("GL_EXT_texture_compression_dxt1"));
> 
>     glBindTexture(GL_TEXTURE_2D, mTextures[0]);
>     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
>@@ -180,29 +176,28 @@ TEST_P(CopyCompressedTextureTest, InternalFormat)
>         Data() : Data(GL_NONE, nullptr, 0) {}
>         Data(GLint format, const uint8_t *data, GLsizei dataSize)
>             : format(format), data(data), dataSize(dataSize)
>-        {
>-        }
>+        {}
>     };
>     std::vector<Data> supportedFormats;
> 
>-    if (extensionEnabled("GL_AMD_compressed_ATC_texture"))
>+    if (IsGLExtensionEnabled("GL_AMD_compressed_ATC_texture"))
>     {
>         supportedFormats.push_back(
>             Data(GL_ATC_RGB_AMD, CompressedImageATC, sizeof(CompressedImageATC)));
>         supportedFormats.push_back(Data(GL_ATC_RGBA_INTERPOLATED_ALPHA_AMD, CompressedImageATCIA,
>                                         sizeof(CompressedImageATCIA)));
>     }
>-    if (extensionEnabled("GL_EXT_texture_compression_dxt1"))
>+    if (IsGLExtensionEnabled("GL_EXT_texture_compression_dxt1"))
>     {
>         supportedFormats.push_back(Data(GL_COMPRESSED_RGB_S3TC_DXT1_EXT, CompressedImageDXT1,
>                                         sizeof(CompressedImageDXT1)));
>     }
>-    if (extensionEnabled("GL_ANGLE_texture_compression_dxt5"))
>+    if (IsGLExtensionEnabled("GL_ANGLE_texture_compression_dxt5"))
>     {
>         supportedFormats.push_back(Data(GL_COMPRESSED_RGBA_S3TC_DXT5_EXT, CompressedImageDXT5,
>                                         sizeof(CompressedImageDXT5)));
>     }
>-    if (extensionEnabled("GL_OES_compressed_ETC1_RGB8_texture"))
>+    if (IsGLExtensionEnabled("GL_OES_compressed_ETC1_RGB8_texture"))
>     {
>         supportedFormats.push_back(
>             Data(GL_ETC1_RGB8_OES, CompressedImageETC1, sizeof(CompressedImageETC1)));
>@@ -265,6 +260,8 @@ TEST_P(CopyCompressedTextureTest, InvalidTextureIds)
>         return;
>     }
> 
>+    ANGLE_SKIP_TEST_IF(!IsGLExtensionEnabled("GL_EXT_texture_compression_dxt1"));
>+
>     glBindTexture(GL_TEXTURE_2D, mTextures[0]);
>     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
>     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
>@@ -302,6 +299,8 @@ TEST_P(CopyCompressedTextureTest, BindingPoints)
>         return;
>     }
> 
>+    ANGLE_SKIP_TEST_IF(!IsGLExtensionEnabled("GL_EXT_texture_compression_dxt1"));
>+
>     glBindTexture(GL_TEXTURE_CUBE_MAP, mTextures[0]);
>     glTexParameteri(GL_TEXTURE_CUBE_MAP, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
>     glTexParameteri(GL_TEXTURE_CUBE_MAP, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
>@@ -364,6 +363,7 @@ ANGLE_INSTANTIATE_TEST(CopyCompressedTextureTest,
>                        ES2_OPENGL(),
>                        ES3_OPENGL(),
>                        ES2_OPENGLES(),
>-                       ES3_OPENGLES());
>+                       ES3_OPENGLES(),
>+                       ES2_VULKAN());
> 
> }  // namespace angle
>diff --git a/Source/ThirdParty/ANGLE/src/tests/gl_tests/CopyTexImageTest.cpp b/Source/ThirdParty/ANGLE/src/tests/gl_tests/CopyTexImageTest.cpp
>index ca780be0790..45b230e9d51 100644
>--- a/Source/ThirdParty/ANGLE/src/tests/gl_tests/CopyTexImageTest.cpp
>+++ b/Source/ThirdParty/ANGLE/src/tests/gl_tests/CopyTexImageTest.cpp
>@@ -15,79 +15,19 @@ class CopyTexImageTest : public ANGLETest
>   protected:
>     CopyTexImageTest()
>     {
>-        setWindowWidth(16);
>-        setWindowHeight(16);
>+        setWindowWidth(32);
>+        setWindowHeight(32);
>         setConfigRedBits(8);
>         setConfigGreenBits(8);
>         setConfigBlueBits(8);
>         setConfigAlphaBits(8);
>     }
> 
>-    GLuint createFramebuffer(GLenum format, GLenum type, GLfloat color[4]) const
>-    {
>-        GLuint fbo;
>-        glGenFramebuffers(1, &fbo);
>-        glBindFramebuffer(GL_FRAMEBUFFER, fbo);
>-
>-        GLuint texture = createTexture(format, type);
>-        glBindTexture(GL_TEXTURE_2D, texture);
>-        glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, texture, 0);
>-
>-        glClearColor(color[0], color[1], color[2], color[3]);
>-        glClear(GL_COLOR_BUFFER_BIT);
>-
>-        return fbo;
>-    }
>-
>-    GLuint createTexture(GLenum format, GLenum type) const
>-    {
>-        GLuint tex;
>-        glGenTextures(1, &tex);
>-        glBindTexture(GL_TEXTURE_2D, tex);
>-        glTexImage2D(GL_TEXTURE_2D, 0, format, 16, 16, 0, format, type, nullptr);
>-
>-        // Disable mipmapping
>-        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
>-        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
>-
>-        return tex;
>-    }
>-
>-    GLuint createTextureFromCopyTexImage(GLuint fbo, GLenum format) const
>-    {
>-        GLuint tex;
>-        glGenTextures(1, &tex);
>-        glBindTexture(GL_TEXTURE_2D, tex);
>-
>-        glBindFramebuffer(GL_FRAMEBUFFER, fbo);
>-        glCopyTexImage2D(GL_TEXTURE_2D, 0, format, 0, 0, 16, 16, 0);
>-
>-        // Disable mipmapping
>-        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
>-        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
>-
>-        return tex;
>-    }
>-
>-    void copyTextureWithCopyTexSubImage(GLuint fbo,
>-                                        GLuint texture,
>-                                        GLint xoffset,
>-                                        GLint yoffset,
>-                                        GLint x,
>-                                        GLint y,
>-                                        GLsizei w,
>-                                        GLsizei h) const
>-    {
>-        glBindTexture(GL_TEXTURE_2D, texture);
>-        glBindFramebuffer(GL_FRAMEBUFFER, fbo);
>-        glCopyTexSubImage2D(GL_TEXTURE_2D, 0, xoffset, yoffset, x, y, w, h);
>-    }
>-
>     void SetUp() override
>     {
>         ANGLETest::SetUp();
> 
>-        const std::string vsSource =
>+        constexpr char kVS[] =
>             "precision highp float;\n"
>             "attribute vec4 position;\n"
>             "varying vec2 texcoord;\n"
>@@ -96,10 +36,9 @@ class CopyTexImageTest : public ANGLETest
>             "{\n"
>             "    gl_Position = position;\n"
>             "    texcoord = (position.xy * 0.5) + 0.5;\n"
>-            "    texcoord.y = 1.0 - texcoord.y;\n"
>             "}\n";
> 
>-        const std::string textureFSSource =
>+        constexpr char kFS[] =
>             "precision highp float;\n"
>             "uniform sampler2D tex;\n"
>             "varying vec2 texcoord;\n"
>@@ -109,7 +48,7 @@ class CopyTexImageTest : public ANGLETest
>             "    gl_FragColor = texture2D(tex, texcoord);\n"
>             "}\n";
> 
>-        mTextureProgram = CompileProgram(vsSource, textureFSSource);
>+        mTextureProgram = CompileProgram(kVS, kFS);
>         if (mTextureProgram == 0)
>         {
>             FAIL() << "shader compilation failed.";
>@@ -127,9 +66,38 @@ class CopyTexImageTest : public ANGLETest
>         ANGLETest::TearDown();
>     }
> 
>-    void verifyResults(GLuint texture, GLubyte data[4], GLint x, GLint y)
>+    void initializeResources(GLenum format, GLenum type)
>+    {
>+        for (size_t i = 0; i < kFboCount; ++i)
>+        {
>+            glBindTexture(GL_TEXTURE_2D, mFboTextures[i]);
>+            glTexImage2D(GL_TEXTURE_2D, 0, format, kFboSizes[i], kFboSizes[i], 0, format, type,
>+                         nullptr);
>+
>+            // Disable mipmapping
>+            glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
>+            glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
>+
>+            glBindFramebuffer(GL_FRAMEBUFFER, mFbos[i]);
>+            glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D,
>+                                   mFboTextures[i], 0);
>+
>+            glClearColor(kFboColors[i][0], kFboColors[i][1], kFboColors[i][2], kFboColors[i][3]);
>+            glClear(GL_COLOR_BUFFER_BIT);
>+        }
>+
>+        ASSERT_GL_NO_ERROR();
>+    }
>+
>+    void verifyResults(GLuint texture,
>+                       GLubyte data[4],
>+                       GLint fboSize,
>+                       GLint xs,
>+                       GLint ys,
>+                       GLint xe,
>+                       GLint ye)
>     {
>-        glViewport(0, 0, 16, 16);
>+        glViewport(0, 0, fboSize, fboSize);
> 
>         glBindFramebuffer(GL_FRAMEBUFFER, 0);
> 
>@@ -141,162 +109,236 @@ class CopyTexImageTest : public ANGLETest
>         drawQuad(mTextureProgram, "position", 0.5f);
> 
>         // Expect that the rendered quad has the same color as the source texture
>-        EXPECT_PIXEL_NEAR(x, y, data[0], data[1], data[2], data[3], 1.0);
>+        EXPECT_PIXEL_NEAR(xs, ys, data[0], data[1], data[2], data[3], 1.0);
>+        EXPECT_PIXEL_NEAR(xs, ye - 1, data[0], data[1], data[2], data[3], 1.0);
>+        EXPECT_PIXEL_NEAR(xe - 1, ys, data[0], data[1], data[2], data[3], 1.0);
>+        EXPECT_PIXEL_NEAR(xe - 1, ye - 1, data[0], data[1], data[2], data[3], 1.0);
>+        EXPECT_PIXEL_NEAR((xs + xe) / 2, (ys + ye) / 2, data[0], data[1], data[2], data[3], 1.0);
>+    }
>+
>+    void runCopyTexImageTest(GLenum format, GLubyte expected[3][4])
>+    {
>+        GLTexture tex;
>+        glBindTexture(GL_TEXTURE_2D, tex);
>+
>+        // Disable mipmapping
>+        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
>+        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
>+
>+        // Perform the copy multiple times.
>+        //
>+        // - The first time, a new texture is created
>+        // - The second time, as the fbo size is the same as previous, the texture storage is not
>+        //   recreated.
>+        // - The third time, the fbo size is different, so a new texture is created.
>+        for (size_t i = 0; i < kFboCount; ++i)
>+        {
>+            glBindFramebuffer(GL_FRAMEBUFFER, mFbos[i]);
>+
>+            glCopyTexImage2D(GL_TEXTURE_2D, 0, format, 0, 0, kFboSizes[i], kFboSizes[i], 0);
>+            ASSERT_GL_NO_ERROR();
>+
>+            verifyResults(tex, expected[i], kFboSizes[i], 0, 0, kFboSizes[i], kFboSizes[i]);
>+        }
>+    }
>+
>+    void runCopyTexSubImageTest(GLenum format, GLubyte expected[3][4])
>+    {
>+        GLTexture tex;
>+        glBindTexture(GL_TEXTURE_2D, tex);
>+
>+        // Disable mipmapping
>+        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
>+        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
>+
>+        // Create the texture with copy of the first fbo.
>+        glBindFramebuffer(GL_FRAMEBUFFER, mFbos[0]);
>+        glCopyTexImage2D(GL_TEXTURE_2D, 0, format, 0, 0, kFboSizes[0], kFboSizes[0], 0);
>+        ASSERT_GL_NO_ERROR();
>+
>+        verifyResults(tex, expected[0], kFboSizes[0], 0, 0, kFboSizes[0], kFboSizes[0]);
>+
>+        // Make sure out-of-bound writes to the texture return invalid value.
>+        glBindFramebuffer(GL_FRAMEBUFFER, mFbos[1]);
>+
>+        // xoffset < 0 and yoffset < 0
>+        glCopyTexSubImage2D(GL_TEXTURE_2D, 0, -1, -1, 0, 0, kFboSizes[0], kFboSizes[0]);
>+        ASSERT_GL_ERROR(GL_INVALID_VALUE);
>+
>+        // xoffset + width > w and yoffset + height > h
>+        glCopyTexSubImage2D(GL_TEXTURE_2D, 0, 1, 1, 0, 0, kFboSizes[0], kFboSizes[0]);
>+        ASSERT_GL_ERROR(GL_INVALID_VALUE);
>+
>+        // Copy the second fbo over a portion of the image.
>+        GLint offset = kFboSizes[0] / 2;
>+        GLint extent = kFboSizes[0] - offset;
>+
>+        glCopyTexSubImage2D(GL_TEXTURE_2D, 0, offset, offset, kFboSizes[1] / 2, kFboSizes[1] / 2,
>+                            extent, extent);
>+        ASSERT_GL_NO_ERROR();
>+
>+        verifyResults(tex, expected[1], kFboSizes[0], offset, offset, kFboSizes[0], kFboSizes[0]);
>+
>+        // The rest of the image should be untouched
>+        verifyResults(tex, expected[0], kFboSizes[0], 0, 0, offset, offset);
>+        verifyResults(tex, expected[0], kFboSizes[0], offset, 0, kFboSizes[0], offset);
>+        verifyResults(tex, expected[0], kFboSizes[0], 0, offset, offset, kFboSizes[0]);
>+
>+        // Copy the third fbo over another portion of the image.
>+        glBindFramebuffer(GL_FRAMEBUFFER, mFbos[2]);
>+
>+        offset = kFboSizes[0] / 4;
>+        extent = kFboSizes[0] - offset;
>+
>+        // While width and height are set as 3/4 of the size, the fbo offset is given such that
>+        // after clipping, width and height are effectively 1/2 of the size.
>+        GLint srcOffset       = kFboSizes[2] - kFboSizes[0] / 2;
>+        GLint effectiveExtent = kFboSizes[0] / 2;
>+
>+        glCopyTexSubImage2D(GL_TEXTURE_2D, 0, offset, offset, srcOffset, srcOffset, extent, extent);
>+        ASSERT_GL_NO_ERROR();
>+
>+        verifyResults(tex, expected[2], kFboSizes[0], offset, offset, effectiveExtent,
>+                      effectiveExtent);
>+
>+        // The rest of the image should be untouched
>+        verifyResults(tex, expected[1], kFboSizes[0], offset + effectiveExtent, kFboSizes[0] / 2,
>+                      kFboSizes[0], kFboSizes[0]);
>+        verifyResults(tex, expected[1], kFboSizes[0], kFboSizes[0] / 2, offset + effectiveExtent,
>+                      kFboSizes[0], kFboSizes[0]);
>+
>+        verifyResults(tex, expected[0], kFboSizes[0], 0, 0, kFboSizes[0], offset);
>+        verifyResults(tex, expected[0], kFboSizes[0], 0, 0, offset, kFboSizes[0]);
>+        verifyResults(tex, expected[0], kFboSizes[0], offset + effectiveExtent, 0, kFboSizes[0],
>+                      kFboSizes[0] / 2);
>+        verifyResults(tex, expected[0], kFboSizes[0], 0, offset + effectiveExtent, kFboSizes[0] / 2,
>+                      kFboSizes[0]);
>     }
> 
>     GLuint mTextureProgram;
>     GLint mTextureUniformLocation;
>+
>+    static constexpr uint32_t kFboCount = 3;
>+    GLFramebuffer mFbos[kFboCount];
>+    GLTexture mFboTextures[kFboCount];
>+
>+    static constexpr uint32_t kFboSizes[kFboCount]    = {16, 16, 32};
>+    static constexpr GLfloat kFboColors[kFboCount][4] = {{0.25f, 1.0f, 0.75f, 0.5f},
>+                                                         {1.0f, 0.75f, 0.5f, 0.25f},
>+                                                         {0.5f, 0.25f, 1.0f, 0.75f}};
> };
> 
>-TEST_P(CopyTexImageTest, RGBAToL)
>+// Until C++17, need to redundantly declare the constexpr members outside the class (only the
>+// arrays, because the others are already const-propagated and not needed by the linker).
>+constexpr uint32_t CopyTexImageTest::kFboSizes[];
>+constexpr GLfloat CopyTexImageTest::kFboColors[][4];
>+
>+TEST_P(CopyTexImageTest, RGBAToRGB)
> {
>-    GLfloat color[] = {
>-        0.25f, 1.0f, 0.75f, 0.5f,
>+    GLubyte expected[3][4] = {
>+        {64, 255, 191, 255},
>+        {255, 191, 127, 255},
>+        {127, 64, 255, 255},
>     };
> 
>-    GLuint fbo = createFramebuffer(GL_RGBA, GL_UNSIGNED_BYTE, color);
>-    GLuint tex = createTextureFromCopyTexImage(fbo, GL_LUMINANCE);
>+    initializeResources(GL_RGBA, GL_UNSIGNED_BYTE);
>+    runCopyTexImageTest(GL_RGB, expected);
>+}
> 
>-    GLubyte expected[] = {
>-        64, 64, 64, 255,
>+TEST_P(CopyTexImageTest, RGBAToL)
>+{
>+    GLubyte expected[3][4] = {
>+        {64, 64, 64, 255},
>+        {255, 255, 255, 255},
>+        {127, 127, 127, 255},
>     };
>-    verifyResults(tex, expected, 0, 0);
>+
>+    initializeResources(GL_RGBA, GL_UNSIGNED_BYTE);
>+    runCopyTexImageTest(GL_LUMINANCE, expected);
> }
> 
> TEST_P(CopyTexImageTest, RGBToL)
> {
>-    // TODO (geofflang): Figure out why CopyTex[Sub]Image doesn't work with
>-    // RGB->L on older Intel chips
>-    if (IsIntel() && getPlatformRenderer() == EGL_PLATFORM_ANGLE_TYPE_OPENGL_ANGLE)
>-    {
>-        std::cout << "Test skipped on Intel OpenGL." << std::endl;
>-        return;
>-    }
>-
>-    GLfloat color[] = {
>-        0.25f, 1.0f, 0.75f, 0.5f,
>+    GLubyte expected[3][4] = {
>+        {64, 64, 64, 255},
>+        {255, 255, 255, 255},
>+        {127, 127, 127, 255},
>     };
> 
>-    GLuint fbo = createFramebuffer(GL_RGB, GL_UNSIGNED_BYTE, color);
>-    GLuint tex = createTextureFromCopyTexImage(fbo, GL_LUMINANCE);
>-
>-    GLubyte expected[] = {
>-        64, 64, 64, 255,
>-    };
>-    verifyResults(tex, expected, 0, 0);
>+    initializeResources(GL_RGB, GL_UNSIGNED_BYTE);
>+    runCopyTexImageTest(GL_LUMINANCE, expected);
> }
> 
> TEST_P(CopyTexImageTest, RGBAToLA)
> {
>-    GLfloat color[] = {
>-        0.25f, 1.0f, 0.75f, 0.5f,
>+    GLubyte expected[3][4] = {
>+        {64, 64, 64, 127},
>+        {255, 255, 255, 64},
>+        {127, 127, 127, 191},
>     };
> 
>-    GLuint fbo = createFramebuffer(GL_RGBA, GL_UNSIGNED_BYTE, color);
>-    GLuint tex = createTextureFromCopyTexImage(fbo, GL_LUMINANCE_ALPHA);
>-
>-    GLubyte expected[] = {
>-        64, 64, 64, 127,
>-    };
>-    verifyResults(tex, expected, 0, 0);
>+    initializeResources(GL_RGBA, GL_UNSIGNED_BYTE);
>+    runCopyTexImageTest(GL_LUMINANCE_ALPHA, expected);
> }
> 
> TEST_P(CopyTexImageTest, RGBAToA)
> {
>-    GLfloat color[] = {
>-        0.25f, 1.0f, 0.75f, 0.5f,
>+    GLubyte expected[3][4] = {
>+        {0, 0, 0, 127},
>+        {0, 0, 0, 64},
>+        {0, 0, 0, 191},
>     };
> 
>-    GLuint fbo = createFramebuffer(GL_RGBA, GL_UNSIGNED_BYTE, color);
>-    GLuint tex = createTextureFromCopyTexImage(fbo, GL_ALPHA);
>-
>-    GLubyte expected[] = {
>-        0, 0, 0, 127,
>-    };
>-    verifyResults(tex, expected, 0, 0);
>+    initializeResources(GL_RGBA, GL_UNSIGNED_BYTE);
>+    runCopyTexImageTest(GL_ALPHA, expected);
> }
> 
>-TEST_P(CopyTexImageTest, SubImageRGBAToL)
>+TEST_P(CopyTexImageTest, SubImageRGBAToRGB)
> {
>-    GLfloat color0[] = {
>-        0.25f, 1.0f, 0.75f, 0.5f,
>+    GLubyte expected[3][4] = {
>+        {64, 255, 191, 255},
>+        {255, 191, 127, 255},
>+        {127, 64, 255, 255},
>     };
>-    GLuint fbo0 = createFramebuffer(GL_RGBA, GL_UNSIGNED_BYTE, color0);
>-    GLuint tex  = createTextureFromCopyTexImage(fbo0, GL_LUMINANCE);
> 
>-    GLfloat color1[] = {
>-        0.5f, 0.25f, 1.0f, 0.75f,
>-    };
>-    GLuint fbo1 = createFramebuffer(GL_RGBA, GL_UNSIGNED_BYTE, color1);
>-    copyTextureWithCopyTexSubImage(fbo1, tex, 2, 4, 5, 6, 8, 8);
>+    initializeResources(GL_RGBA, GL_UNSIGNED_BYTE);
>+    runCopyTexSubImageTest(GL_RGB, expected);
>+}
> 
>-    GLubyte expected0[] = {
>-        64, 64, 64, 255,
>+TEST_P(CopyTexImageTest, SubImageRGBAToL)
>+{
>+    GLubyte expected[3][4] = {
>+        {64, 64, 64, 255},
>+        {255, 255, 255, 255},
>+        {127, 127, 127, 255},
>     };
>-    verifyResults(tex, expected0, 0, 0);
> 
>-    GLubyte expected1[] = {
>-        127, 127, 127, 255,
>-    };
>-    verifyResults(tex, expected1, 7, 7);
>+    initializeResources(GL_RGBA, GL_UNSIGNED_BYTE);
>+    runCopyTexSubImageTest(GL_LUMINANCE, expected);
> }
> 
> TEST_P(CopyTexImageTest, SubImageRGBAToLA)
> {
>-    GLfloat color0[] = {
>-        0.25f, 1.0f, 0.75f, 0.5f,
>+    GLubyte expected[3][4] = {
>+        {64, 64, 64, 127},
>+        {255, 255, 255, 64},
>+        {127, 127, 127, 191},
>     };
>-    GLuint fbo0 = createFramebuffer(GL_RGBA, GL_UNSIGNED_BYTE, color0);
>-    GLuint tex  = createTextureFromCopyTexImage(fbo0, GL_LUMINANCE_ALPHA);
> 
>-    GLfloat color1[] = {
>-        0.5f, 0.25f, 1.0f, 0.75f,
>-    };
>-    GLuint fbo1 = createFramebuffer(GL_RGBA, GL_UNSIGNED_BYTE, color1);
>-    copyTextureWithCopyTexSubImage(fbo1, tex, 2, 4, 5, 6, 8, 8);
>-
>-    GLubyte expected0[] = {
>-        64, 64, 64, 127,
>-    };
>-    verifyResults(tex, expected0, 0, 0);
>-
>-    GLubyte expected1[] = {
>-        127, 127, 127, 192,
>-    };
>-    verifyResults(tex, expected1, 7, 7);
>+    initializeResources(GL_RGBA, GL_UNSIGNED_BYTE);
>+    runCopyTexSubImageTest(GL_LUMINANCE_ALPHA, expected);
> }
> 
> TEST_P(CopyTexImageTest, SubImageRGBToL)
> {
>-    // TODO (geofflang): Figure out why CopyTex[Sub]Image doesn't work with
>-    // RGB->L on older Intel chips
>-    if (IsIntel() && getPlatformRenderer() == EGL_PLATFORM_ANGLE_TYPE_OPENGL_ANGLE)
>-    {
>-        std::cout << "Test skipped on Intel OpenGL." << std::endl;
>-        return;
>-    }
>-
>-    GLfloat color0[] = {
>-        0.25f, 1.0f, 0.75f, 0.5f,
>+    GLubyte expected[3][4] = {
>+        {64, 64, 64, 255},
>+        {255, 255, 255, 255},
>+        {127, 127, 127, 255},
>     };
>-    GLuint fbo0 = createFramebuffer(GL_RGB, GL_UNSIGNED_BYTE, color0);
>-    GLuint tex  = createTextureFromCopyTexImage(fbo0, GL_LUMINANCE);
> 
>-    GLfloat color1[] = {
>-        0.5f, 0.25f, 1.0f, 0.75f,
>-    };
>-    GLuint fbo1 = createFramebuffer(GL_RGB, GL_UNSIGNED_BYTE, color1);
>-    copyTextureWithCopyTexSubImage(fbo1, tex, 2, 4, 5, 6, 8, 8);
>-
>-    GLubyte expected0[] = {
>-        64, 64, 64, 255,
>-    };
>-    verifyResults(tex, expected0, 0, 0);
>-
>-    GLubyte expected1[] = {
>-        127, 127, 127, 255,
>-    };
>-    verifyResults(tex, expected1, 7, 7);
>+    initializeResources(GL_RGB, GL_UNSIGNED_BYTE);
>+    runCopyTexSubImageTest(GL_LUMINANCE, expected);
> }
> 
> // Read default framebuffer with glCopyTexImage2D().
>@@ -329,35 +371,179 @@ TEST_P(CopyTexImageTest, SubDefaultFramebuffer)
>     EXPECT_GL_NO_ERROR();
> }
> 
>+// Calling CopyTexSubImage from cubeMap texture.
>+TEST_P(CopyTexImageTest, CopyTexSubImageFromCubeMap)
>+{
>+    // TODO: Diagnose and fix. http://anglebug.com/2954
>+    ANGLE_SKIP_TEST_IF(IsVulkan() && IsIntel());
>+
>+    constexpr GLsizei kCubeMapFaceCount = 6;
>+
>+    // The framebuffer will be a face of a cube map with a different colors for each face.  Each
>+    // glCopyTexSubImage2D will take one face of this image to copy over a pixel in a 1x6
>+    // framebuffer.
>+    GLColor fboPixels[kCubeMapFaceCount]   = {GLColor::red,  GLColor::yellow, GLColor::green,
>+                                            GLColor::cyan, GLColor::blue,   GLColor::magenta};
>+    GLColor whitePixels[kCubeMapFaceCount] = {GLColor::white, GLColor::white, GLColor::white,
>+                                              GLColor::white, GLColor::white, GLColor::white};
>+
>+    GLTexture fboTex;
>+    glBindTexture(GL_TEXTURE_CUBE_MAP, fboTex);
>+    for (GLenum face = GL_TEXTURE_CUBE_MAP_POSITIVE_X; face <= GL_TEXTURE_CUBE_MAP_NEGATIVE_Z;
>+         face++)
>+    {
>+        GLsizei faceIndex = face - GL_TEXTURE_CUBE_MAP_POSITIVE_X;
>+
>+        glTexImage2D(face, 0, GL_RGBA, 1, 1, 0, GL_RGBA, GL_UNSIGNED_BYTE, &fboPixels[faceIndex]);
>+    }
>+
>+    GLTexture dstTex;
>+    glBindTexture(GL_TEXTURE_2D, dstTex);
>+    glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, kCubeMapFaceCount, 1, 0, GL_RGBA, GL_UNSIGNED_BYTE,
>+                 whitePixels);
>+
>+    GLFramebuffer fbo;
>+    glBindFramebuffer(GL_FRAMEBUFFER, fbo);
>+
>+    for (GLenum face = GL_TEXTURE_CUBE_MAP_POSITIVE_X; face <= GL_TEXTURE_CUBE_MAP_NEGATIVE_Z;
>+         face++)
>+    {
>+        GLsizei faceIndex = face - GL_TEXTURE_CUBE_MAP_POSITIVE_X;
>+
>+        glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, face, fboTex, 0);
>+
>+        ASSERT_GL_NO_ERROR();
>+        ASSERT_GLENUM_EQ(GL_FRAMEBUFFER_COMPLETE, glCheckFramebufferStatus(GL_FRAMEBUFFER));
>+
>+        // Copy the fbo (a cube map face) into a pixel of the destination texture.
>+        glCopyTexSubImage2D(GL_TEXTURE_2D, 0, faceIndex, 0, 0, 0, 1, 1);
>+    }
>+
>+    // Make sure all the copies are done correctly.
>+    glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, dstTex, 0);
>+
>+    ASSERT_GL_NO_ERROR();
>+    ASSERT_GLENUM_EQ(GL_FRAMEBUFFER_COMPLETE, glCheckFramebufferStatus(GL_FRAMEBUFFER));
>+
>+    for (GLsizei faceIndex = 0; faceIndex < kCubeMapFaceCount; ++faceIndex)
>+    {
>+        EXPECT_PIXEL_COLOR_EQ(faceIndex, 0, fboPixels[faceIndex]);
>+    }
>+}
>+
>+// Calling CopyTexSubImage to a non-cube-complete texture.
>+TEST_P(CopyTexImageTest, CopyTexSubImageToNonCubeCompleteDestination)
>+{
>+    constexpr GLsizei kCubeMapFaceCount = 6;
>+
>+    // The framebuffer will be a 1x6 image with 6 different colors.  Each glCopyTexSubImage2D will
>+    // take one pixel of this image to copy over each face of a cube map.
>+    GLColor fboPixels[kCubeMapFaceCount] = {GLColor::red,  GLColor::yellow, GLColor::green,
>+                                            GLColor::cyan, GLColor::blue,   GLColor::magenta};
>+    GLColor whitePixel                   = GLColor::white;
>+
>+    GLTexture fboTex;
>+    glBindTexture(GL_TEXTURE_2D, fboTex);
>+    glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, kCubeMapFaceCount, 1, 0, GL_RGBA, GL_UNSIGNED_BYTE,
>+                 fboPixels);
>+
>+    GLFramebuffer fbo;
>+    glBindFramebuffer(GL_FRAMEBUFFER, fbo);
>+    glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, fboTex, 0);
>+
>+    ASSERT_GL_NO_ERROR();
>+    ASSERT_GLENUM_EQ(GL_FRAMEBUFFER_COMPLETE, glCheckFramebufferStatus(GL_FRAMEBUFFER));
>+
>+    GLTexture cubeMap;
>+    glBindTexture(GL_TEXTURE_CUBE_MAP, cubeMap);
>+
>+    for (GLenum face = GL_TEXTURE_CUBE_MAP_POSITIVE_X; face <= GL_TEXTURE_CUBE_MAP_NEGATIVE_Z;
>+         face++)
>+    {
>+        GLsizei faceIndex = face - GL_TEXTURE_CUBE_MAP_POSITIVE_X;
>+
>+        // Initialize the face with a color not found in the fbo.
>+        glTexImage2D(face, 0, GL_RGBA, 1, 1, 0, GL_RGBA, GL_UNSIGNED_BYTE, &whitePixel);
>+
>+        // Copy one pixel from the fbo into this face.  The first 5 copies are done on a
>+        // non-cube-complete texture.
>+        glCopyTexSubImage2D(face, 0, 0, 0, faceIndex, 0, 1, 1);
>+    }
>+
>+    // Make sure all the copies are done correctly.
>+    for (GLenum face = GL_TEXTURE_CUBE_MAP_POSITIVE_X; face <= GL_TEXTURE_CUBE_MAP_NEGATIVE_Z;
>+         face++)
>+    {
>+        GLsizei faceIndex = face - GL_TEXTURE_CUBE_MAP_POSITIVE_X;
>+
>+        glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, face, cubeMap, 0);
>+
>+        ASSERT_GL_NO_ERROR();
>+        ASSERT_GLENUM_EQ(GL_FRAMEBUFFER_COMPLETE, glCheckFramebufferStatus(GL_FRAMEBUFFER));
>+
>+        EXPECT_PIXEL_COLOR_EQ(0, 0, fboPixels[faceIndex]);
>+    }
>+}
>+
> // specialization of CopyTexImageTest is added so that some tests can be explicitly run with an ES3
> // context
> class CopyTexImageTestES3 : public CopyTexImageTest
>-{
>-};
>+{};
> 
> //  The test verifies that glCopyTexSubImage2D generates a GL_INVALID_OPERATION error
> //  when the read buffer is GL_NONE.
> //  Reference: GLES 3.0.4, Section 3.8.5 Alternate Texture Image Specification Commands
> TEST_P(CopyTexImageTestES3, ReadBufferIsNone)
> {
>-    GLfloat color[] = {
>-        0.25f, 1.0f, 0.75f, 0.5f,
>-    };
>+    initializeResources(GL_RGBA, GL_UNSIGNED_BYTE);
> 
>-    GLuint fbo = createFramebuffer(GL_RGBA, GL_UNSIGNED_BYTE, color);
>-    GLuint tex = createTextureFromCopyTexImage(fbo, GL_RGBA);
>-
>-    glBindFramebuffer(GL_FRAMEBUFFER, fbo);
>+    GLTexture tex;
>     glBindTexture(GL_TEXTURE_2D, tex);
>+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
>+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
>+
>+    glBindFramebuffer(GL_FRAMEBUFFER, mFbos[0]);
>+    glCopyTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, 0, 0, kFboSizes[0], kFboSizes[0], 0);
> 
>     glReadBuffer(GL_NONE);
> 
>     EXPECT_GL_NO_ERROR();
>     glCopyTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, 0, 0, 4, 4);
>     EXPECT_GL_ERROR(GL_INVALID_OPERATION);
>+}
> 
>-    glDeleteFramebuffers(1, &fbo);
>-    glDeleteTextures(1, &tex);
>+// Test CopyTexImage3D with some simple parameters with a 2D array texture.
>+TEST_P(CopyTexImageTestES3, 2DArraySubImage)
>+{
>+    // Seems to fail on AMD OpenGL Windows.
>+    ANGLE_SKIP_TEST_IF(IsAMD() && IsOpenGL() & IsWindows());
>+
>+    GLTexture tex;
>+    glBindTexture(GL_TEXTURE_2D_ARRAY, tex);
>+
>+    constexpr GLsizei kTexSize     = 4;
>+    constexpr GLsizei kLayerOffset = 1;
>+    constexpr GLsizei kLayers      = 2;
>+
>+    // Clear screen to green.
>+    glClearColor(0, 1, 0, 1);
>+    glClear(GL_COLOR_BUFFER_BIT);
>+
>+    // Initialize a two-layer 2D array texture with red.
>+    std::vector<GLColor> red(kTexSize * kTexSize * kLayers, GLColor::red);
>+    glTexImage3D(GL_TEXTURE_2D_ARRAY, 0, GL_RGBA8, kTexSize, kTexSize, kLayers, 0, GL_RGBA,
>+                 GL_UNSIGNED_BYTE, red.data());
>+    glCopyTexSubImage3D(GL_TEXTURE_2D_ARRAY, 0, 0, 0, kLayerOffset, 0, 0, kTexSize, kTexSize);
>+    ASSERT_GL_NO_ERROR();
>+
>+    // Check level 0 (red from image data) and 1 (green from backbuffer clear).
>+    GLFramebuffer fbo;
>+    glBindFramebuffer(GL_FRAMEBUFFER, fbo);
>+    glFramebufferTextureLayer(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, tex, 0, 0);
>+    EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::red);
>+    glFramebufferTextureLayer(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, tex, 0, 1);
>+    EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::green);
>+    ASSERT_GL_NO_ERROR();
> }
> 
> // Use this to select which configurations (e.g. which renderer, which GLES major version) these
>@@ -368,7 +554,8 @@ ANGLE_INSTANTIATE_TEST(CopyTexImageTest,
>                        ES2_D3D11(EGL_EXPERIMENTAL_PRESENT_PATH_FAST_ANGLE),
>                        ES2_OPENGL(),
>                        ES2_OPENGL(3, 3),
>-                       ES2_OPENGLES());
>+                       ES2_OPENGLES(),
>+                       ES2_VULKAN());
> 
> ANGLE_INSTANTIATE_TEST(CopyTexImageTestES3, ES3_D3D11(), ES3_OPENGL(), ES3_OPENGLES());
>-}
>+}  // namespace angle
>diff --git a/Source/ThirdParty/ANGLE/src/tests/gl_tests/CopyTexture3DTest.cpp b/Source/ThirdParty/ANGLE/src/tests/gl_tests/CopyTexture3DTest.cpp
>new file mode 100644
>index 00000000000..b97a2d263be
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/tests/gl_tests/CopyTexture3DTest.cpp
>@@ -0,0 +1,1742 @@
>+//
>+// Copyright 2018 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+
>+// CopyTexture3DTest.cpp: Tests of the GL_ANGLE_copy_texture_3d extension
>+
>+#include "test_utils/ANGLETest.h"
>+
>+#include "test_utils/gl_raii.h"
>+
>+namespace angle
>+{
>+
>+class CopyTexture3DTest : public ANGLETest
>+{
>+  protected:
>+    CopyTexture3DTest()
>+    {
>+        setWindowWidth(256);
>+        setWindowHeight(256);
>+        setConfigRedBits(8);
>+        setConfigGreenBits(8);
>+        setConfigBlueBits(8);
>+        setConfigAlphaBits(8);
>+    }
>+
>+    void SetUp() override
>+    {
>+        ANGLETest::SetUp();
>+
>+        const char *vertexShaderSource   = getVertexShaderSource();
>+        const char *fragmentShaderSource = getFragmentShaderSource();
>+
>+        mProgram = CompileProgram(vertexShaderSource, fragmentShaderSource);
>+        ASSERT_NE(0u, mProgram);
>+
>+        glUseProgram(mProgram);
>+
>+        ASSERT_GL_NO_ERROR();
>+    }
>+
>+    const char *getVertexShaderSource()
>+    {
>+        return "#version 300 es\n"
>+               "out vec3 texcoord;\n"
>+               "in vec4 position;\n"
>+               "void main()\n"
>+               "{\n"
>+               "    gl_Position = vec4(position.xy, 0.0, 1.0);\n"
>+               "    texcoord = (position.xyz * 0.5) + 0.5;\n"
>+               "}\n";
>+    }
>+
>+    void TearDown() override { ANGLETest::TearDown(); }
>+
>+    bool checkExtensions() const
>+    {
>+        if (!IsGLExtensionEnabled("GL_ANGLE_copy_texture_3d"))
>+        {
>+            std::cout << "Test skipped because GL_ANGLE_copy_texture_3d is not available."
>+                      << std::endl;
>+            return false;
>+        }
>+
>+        EXPECT_NE(nullptr, glCopyTexture3DANGLE);
>+        EXPECT_NE(nullptr, glCopySubTexture3DANGLE);
>+        return true;
>+    }
>+
>+    void testCopy(const GLenum testTarget,
>+                  const GLColor &sourceColor,
>+                  GLenum destInternalFormat,
>+                  GLenum destType,
>+                  bool flipY,
>+                  bool premultiplyAlpha,
>+                  bool unmultiplyAlpha,
>+                  const GLColor &expectedColor)
>+    {
>+        std::vector<GLColor> texDataColor(2u * 2u * 2u, sourceColor);
>+
>+        glBindTexture(testTarget, sourceTexture.get());
>+        glTexImage3D(testTarget, 0, GL_RGBA, 2, 2, 2, 0, GL_RGBA, GL_UNSIGNED_BYTE,
>+                     texDataColor.data());
>+        glTexParameteri(testTarget, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
>+        glTexParameteri(testTarget, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
>+        glTexParameteri(testTarget, GL_TEXTURE_BASE_LEVEL, 0);
>+        glTexParameteri(testTarget, GL_TEXTURE_MAX_LEVEL, 0);
>+        EXPECT_GL_NO_ERROR();
>+
>+        glActiveTexture(GL_TEXTURE0);
>+        glBindTexture(testTarget, destTexture.get());
>+        glCopyTexture3DANGLE(sourceTexture.get(), 0, testTarget, destTexture.get(), 0,
>+                             destInternalFormat, destType, flipY, premultiplyAlpha,
>+                             unmultiplyAlpha);
>+        EXPECT_GL_NO_ERROR();
>+
>+        GLRenderbuffer rbo;
>+        glBindRenderbuffer(GL_RENDERBUFFER, rbo);
>+
>+        GLenum renderType = 0;
>+
>+        switch (destInternalFormat)
>+        {
>+            case GL_RGB:
>+            case GL_RGBA:
>+            case GL_LUMINANCE:
>+            case GL_LUMINANCE_ALPHA:
>+            case GL_ALPHA:
>+            case GL_R8:
>+            case GL_RG:
>+            case GL_RG8:
>+            case GL_RGB8:
>+            case GL_RGBA8:
>+            case GL_SRGB8:
>+            case GL_RGB565:
>+            case GL_SRGB8_ALPHA8:
>+            case GL_RGB5_A1:
>+            case GL_RGBA4:
>+            case GL_R8_SNORM:
>+            case GL_RG8_SNORM:
>+            case GL_RGB8_SNORM:
>+            case GL_RGBA8_SNORM:
>+            case GL_RGB10_A2:
>+                renderType = GL_RGBA8;
>+                break;
>+            case GL_R8I:
>+            case GL_R16I:
>+            case GL_R32I:
>+            case GL_RG8I:
>+            case GL_RG16I:
>+            case GL_RG32I:
>+            case GL_RGB8I:
>+            case GL_RGB16I:
>+            case GL_RGB32I:
>+            case GL_RGBA8I:
>+            case GL_RGBA16I:
>+            case GL_RGBA32I:
>+                renderType = GL_RGBA8I;
>+                break;
>+            case GL_R8UI:
>+            case GL_R16UI:
>+            case GL_R32UI:
>+            case GL_RG8UI:
>+            case GL_RG16UI:
>+            case GL_RG32UI:
>+            case GL_RGB8UI:
>+            case GL_RGB16UI:
>+            case GL_RGB32UI:
>+            case GL_RGBA8UI:
>+            case GL_RGBA16UI:
>+            case GL_RGBA32UI:
>+            case GL_RGB10_A2UI:
>+                renderType = GL_RGBA8UI;
>+                break;
>+            case GL_R16F:
>+            case GL_RGB16F:
>+            case GL_RGB32F:
>+            case GL_R32F:
>+            case GL_RG16F:
>+            case GL_RG32F:
>+            case GL_RGBA16F:
>+            case GL_RGBA32F:
>+            case GL_R11F_G11F_B10F:
>+            case GL_RGB9_E5:
>+                renderType = GL_RGBA32F;
>+                break;
>+            default:
>+                ASSERT_TRUE(false);
>+        }
>+
>+        glRenderbufferStorage(GL_RENDERBUFFER, renderType, 1, 1);
>+
>+        GLFramebuffer fbo;
>+        glBindFramebuffer(GL_FRAMEBUFFER, fbo);
>+        glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_RENDERBUFFER, rbo);
>+
>+        glTexParameteri(testTarget, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
>+        glTexParameteri(testTarget, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
>+        glTexParameteri(testTarget, GL_TEXTURE_BASE_LEVEL, 0);
>+        glTexParameteri(testTarget, GL_TEXTURE_MAX_LEVEL, 0);
>+
>+        drawQuad(mProgram, "position", 0.5f);
>+        EXPECT_GL_NO_ERROR();
>+
>+        if (renderType == GL_RGBA8)
>+        {
>+            GLColor actual;
>+            glReadPixels(0, 0, 1, 1, GL_RGBA, GL_UNSIGNED_BYTE, &actual.R);
>+            EXPECT_GL_NO_ERROR();
>+            EXPECT_COLOR_NEAR(expectedColor, actual, 1);
>+            return;
>+        }
>+        else if (renderType == GL_RGBA32F)
>+        {
>+            float expectedColorFloat[4] = {static_cast<float>(expectedColor.R) / 255,
>+                                           static_cast<float>(expectedColor.G) / 255,
>+                                           static_cast<float>(expectedColor.B) / 255,
>+                                           static_cast<float>(expectedColor.A) / 255};
>+            EXPECT_PIXEL_COLOR32F_NEAR(0, 0,
>+                                       GLColor32F(expectedColorFloat[0], expectedColorFloat[1],
>+                                                  expectedColorFloat[2], expectedColorFloat[3]),
>+                                       0.01);
>+            return;
>+        }
>+        else if (renderType == GL_RGBA8UI)
>+        {
>+            GLuint pixel[4] = {0};
>+            glReadPixels(0, 0, 1, 1, GL_RGBA_INTEGER, GL_UNSIGNED_INT, pixel);
>+            EXPECT_COLOR_NEAR(
>+                expectedColor,
>+                GLColor(static_cast<GLubyte>(pixel[0]), static_cast<GLubyte>(pixel[1]),
>+                        static_cast<GLubyte>(pixel[2]), static_cast<GLubyte>(pixel[3])),
>+                0.2);
>+        }
>+        else if (renderType == GL_RGBA8I)
>+        {
>+            GLint pixel[4] = {0};
>+            glReadPixels(0, 0, 1, 1, GL_RGBA_INTEGER, GL_INT, pixel);
>+            EXPECT_COLOR_NEAR(
>+                expectedColor,
>+                GLColor(static_cast<GLubyte>(pixel[0]), static_cast<GLubyte>(pixel[1]),
>+                        static_cast<GLubyte>(pixel[2]), static_cast<GLubyte>(pixel[3])),
>+                0.2);
>+        }
>+        else
>+        {
>+            ASSERT_TRUE(false);
>+        }
>+    }
>+
>+    virtual const char *getFragmentShaderSource() = 0;
>+
>+    GLuint mProgram = 0;
>+    GLTexture sourceTexture;
>+    GLTexture destTexture;
>+};
>+
>+class Texture3DCopy : public CopyTexture3DTest
>+{
>+  protected:
>+    Texture3DCopy() {}
>+
>+    const char *getFragmentShaderSource() override
>+    {
>+        return "#version 300 es\n"
>+               "precision highp float;\n"
>+               "uniform highp sampler3D tex3D;\n"
>+               "in vec3 texcoord;\n"
>+               "out vec4 fragColor;\n"
>+               "void main()\n"
>+               "{\n"
>+               "    fragColor = texture(tex3D, vec3(texcoord.x, texcoord.z, texcoord.y));\n"
>+               "}\n";
>+    }
>+};
>+
>+class Texture2DArrayCopy : public CopyTexture3DTest
>+{
>+  protected:
>+    Texture2DArrayCopy() {}
>+
>+    const char *getFragmentShaderSource() override
>+    {
>+        return "#version 300 es\n"
>+               "precision highp float;\n"
>+               "uniform highp sampler2DArray tex2DArray;\n"
>+               "in vec3 texcoord;\n"
>+               "out vec4 fragColor;\n"
>+               "void main()\n"
>+               "{\n"
>+               "    fragColor = texture(tex2DArray, vec3(texcoord.x, texcoord.z, texcoord.y));\n"
>+               "}\n";
>+    }
>+};
>+
>+// Test that glCopySubTexture3DANGLE correctly copies to and from a GL_TEXTURE_3D texture.
>+TEST_P(Texture3DCopy, CopySubTexture)
>+{
>+    ANGLE_SKIP_TEST_IF(!checkExtensions());
>+
>+    sourceTexture.get();
>+    std::vector<GLColor> texDataGreen(2u * 2u * 2u, GLColor::green);
>+    std::vector<GLColor> texDataRed(2u * 2u * 2u, GLColor::red);
>+
>+    glBindTexture(GL_TEXTURE_3D, sourceTexture.get());
>+    glTexImage3D(GL_TEXTURE_3D, 0, GL_RGBA, 2, 2, 2, 0, GL_RGBA, GL_UNSIGNED_BYTE,
>+                 texDataGreen.data());
>+    glTexParameteri(GL_TEXTURE_3D, GL_TEXTURE_BASE_LEVEL, 0);
>+    glTexParameteri(GL_TEXTURE_3D, GL_TEXTURE_MAX_LEVEL, 0);
>+    EXPECT_GL_NO_ERROR();
>+
>+    glActiveTexture(GL_TEXTURE0);
>+    glBindTexture(GL_TEXTURE_3D, destTexture.get());
>+    glTexImage3D(GL_TEXTURE_3D, 0, GL_RGBA, 2, 2, 2, 0, GL_RGBA, GL_UNSIGNED_BYTE,
>+                 texDataRed.data());
>+    glTexParameteri(GL_TEXTURE_3D, GL_TEXTURE_BASE_LEVEL, 0);
>+    glTexParameteri(GL_TEXTURE_3D, GL_TEXTURE_MAX_LEVEL, 0);
>+    EXPECT_GL_NO_ERROR();
>+    glCopySubTexture3DANGLE(sourceTexture.get(), 0, GL_TEXTURE_3D, destTexture.get(), 0, 0, 0, 0, 0,
>+                            0, 0, 2, 2, 2, false, false, false);
>+    glBindTexture(GL_TEXTURE_3D, destTexture.get());
>+    EXPECT_GL_NO_ERROR();
>+    drawQuad(mProgram, "position", 0.5f);
>+
>+    EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::green);
>+}
>+
>+// Test that glCopyTexture3DANGLE correctly copies from a non-zero mipmap on a GL_TEXTURE_3D
>+// texture.
>+TEST_P(Texture3DCopy, CopyFromMipmap)
>+{
>+    ANGLE_SKIP_TEST_IF(!checkExtensions());
>+
>+    std::vector<GLColor> texDataGreen(4u * 4u * 4u, GLColor::green);
>+
>+    glBindTexture(GL_TEXTURE_3D, sourceTexture.get());
>+    glTexImage3D(GL_TEXTURE_3D, 0, GL_RGBA, 4, 4, 4, 0, GL_RGBA, GL_UNSIGNED_BYTE,
>+                 texDataGreen.data());
>+    glTexImage3D(GL_TEXTURE_3D, 1, GL_RGBA, 2, 2, 2, 0, GL_RGBA, GL_UNSIGNED_BYTE,
>+                 texDataGreen.data());
>+    glTexParameteri(GL_TEXTURE_3D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
>+    glTexParameteri(GL_TEXTURE_3D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR);
>+    glTexParameteri(GL_TEXTURE_3D, GL_TEXTURE_BASE_LEVEL, 1);
>+    glTexParameteri(GL_TEXTURE_3D, GL_TEXTURE_MAX_LEVEL, 1);
>+
>+    EXPECT_GL_NO_ERROR();
>+
>+    glActiveTexture(GL_TEXTURE0);
>+    glBindTexture(GL_TEXTURE_3D, destTexture.get());
>+    glTexImage3D(GL_TEXTURE_3D, 0, GL_RGBA, 2, 2, 2, 0, GL_RGBA, GL_UNSIGNED_BYTE, nullptr);
>+    glTexParameteri(GL_TEXTURE_3D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
>+    glTexParameteri(GL_TEXTURE_3D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR);
>+    glTexParameteri(GL_TEXTURE_3D, GL_TEXTURE_BASE_LEVEL, 0);
>+    glTexParameteri(GL_TEXTURE_3D, GL_TEXTURE_MAX_LEVEL, 0);
>+    EXPECT_GL_NO_ERROR();
>+
>+    glCopyTexture3DANGLE(sourceTexture.get(), 1, GL_TEXTURE_3D, destTexture.get(), 0, GL_RGBA,
>+                         GL_UNSIGNED_BYTE, false, false, false);
>+    glBindTexture(GL_TEXTURE_3D, destTexture.get());
>+    EXPECT_GL_NO_ERROR();
>+    drawQuad(mProgram, "position", 0.5f);
>+
>+    EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::green);
>+}
>+
>+// Test that glCopySubTexture3DANGLE's offset and dimension parameters work correctly with a
>+// GL_TEXTURE_3D texture.
>+TEST_P(Texture3DCopy, OffsetSubCopy)
>+{
>+    ANGLE_SKIP_TEST_IF(!checkExtensions());
>+
>+    GLColor rgbaPixels[27];
>+
>+    // Create pixel data for a 3x3x3 red cube
>+    for (int i = 0; i < 27; i++)
>+    {
>+        rgbaPixels[i] = GLColor(255u, 0u, 0u, 255u);
>+    }
>+
>+    // Change a pixel to create a 1x1x1 blue cube at (0, 0, 0)
>+    rgbaPixels[0] = GLColor(0u, 0u, 255u, 255u);
>+
>+    // Change some pixels to green to create a 2x2x2 cube starting at (1, 1, 1)
>+    rgbaPixels[13] = GLColor(0u, 255u, 0u, 255u);
>+    rgbaPixels[14] = GLColor(0u, 255u, 0u, 255u);
>+    rgbaPixels[16] = GLColor(0u, 255u, 0u, 255u);
>+    rgbaPixels[17] = GLColor(0u, 255u, 0u, 255u);
>+    rgbaPixels[22] = GLColor(0u, 255u, 0u, 255u);
>+    rgbaPixels[23] = GLColor(0u, 255u, 0u, 255u);
>+    rgbaPixels[25] = GLColor(0u, 255u, 0u, 255u);
>+    rgbaPixels[26] = GLColor(0u, 255u, 0u, 255u);
>+
>+    glBindTexture(GL_TEXTURE_3D, sourceTexture.get());
>+    glTexImage3D(GL_TEXTURE_3D, 0, GL_RGBA, 3, 3, 3, 0, GL_RGBA, GL_UNSIGNED_BYTE, rgbaPixels);
>+    glTexParameteri(GL_TEXTURE_3D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
>+    glTexParameteri(GL_TEXTURE_3D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
>+    glTexParameteri(GL_TEXTURE_3D, GL_TEXTURE_BASE_LEVEL, 0);
>+    glTexParameteri(GL_TEXTURE_3D, GL_TEXTURE_MAX_LEVEL, 0);
>+    EXPECT_GL_NO_ERROR();
>+
>+    glActiveTexture(GL_TEXTURE0);
>+    glBindTexture(GL_TEXTURE_3D, destTexture.get());
>+    glTexImage3D(GL_TEXTURE_3D, 0, GL_RGBA, 2, 2, 2, 0, GL_RGBA, GL_UNSIGNED_BYTE, nullptr);
>+    glTexParameteri(GL_TEXTURE_3D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
>+    glTexParameteri(GL_TEXTURE_3D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
>+    glTexParameteri(GL_TEXTURE_3D, GL_TEXTURE_BASE_LEVEL, 0);
>+    glTexParameteri(GL_TEXTURE_3D, GL_TEXTURE_MAX_LEVEL, 0);
>+    glTexParameteri(GL_TEXTURE_3D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
>+    glTexParameteri(GL_TEXTURE_3D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
>+    glTexParameteri(GL_TEXTURE_3D, GL_TEXTURE_WRAP_R, GL_CLAMP_TO_EDGE);
>+
>+    EXPECT_GL_NO_ERROR();
>+    // Copy the 2x2x2 green cube into a new texture
>+    glCopySubTexture3DANGLE(sourceTexture.get(), 0, GL_TEXTURE_3D, destTexture.get(), 0, 0, 0, 0, 1,
>+                            1, 1, 2, 2, 2, false, false, false);
>+    glBindTexture(GL_TEXTURE_3D, destTexture.get());
>+    EXPECT_GL_NO_ERROR();
>+    drawQuad(mProgram, "position", 1.0f);
>+    int width  = getWindowWidth() - 1;
>+    int height = getWindowHeight() - 1;
>+
>+    EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::green);
>+    EXPECT_PIXEL_COLOR_EQ(width, 0, GLColor::green);
>+    EXPECT_PIXEL_COLOR_EQ(0, height, GLColor::green);
>+    EXPECT_PIXEL_COLOR_EQ(width, height, GLColor::green);
>+
>+    // Copy the 1x1x1 blue cube into the the 2x2x2 green cube at location (1, 1, 1)
>+    glCopySubTexture3DANGLE(sourceTexture.get(), 0, GL_TEXTURE_3D, destTexture.get(), 0, 1, 1, 1, 0,
>+                            0, 0, 1, 1, 1, false, false, false);
>+    EXPECT_GL_NO_ERROR();
>+    drawQuad(mProgram, "position", 1.0f);
>+    EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::green);
>+    EXPECT_PIXEL_COLOR_EQ(width, 0, GLColor::green);
>+    EXPECT_PIXEL_COLOR_EQ(0, height, GLColor::green);
>+    EXPECT_PIXEL_COLOR_EQ(width, height, GLColor::blue);
>+}
>+
>+// Test that the flipY parameter works with a GL_TEXTURE_3D texture.
>+TEST_P(Texture3DCopy, FlipY)
>+{
>+    ANGLE_SKIP_TEST_IF(!checkExtensions());
>+
>+    // Create a 2x2x2 cube. The top half is red. The bottom half is green.
>+    GLColor rgbaPixels[8] = {GLColor::green, GLColor::green, GLColor::red, GLColor::red,
>+                             GLColor::green, GLColor::green, GLColor::red, GLColor::red};
>+
>+    glBindTexture(GL_TEXTURE_3D, sourceTexture.get());
>+    glTexImage3D(GL_TEXTURE_3D, 0, GL_RGBA, 2, 2, 2, 0, GL_RGBA, GL_UNSIGNED_BYTE, rgbaPixels);
>+    glTexParameteri(GL_TEXTURE_3D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
>+    glTexParameteri(GL_TEXTURE_3D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
>+    glTexParameteri(GL_TEXTURE_3D, GL_TEXTURE_BASE_LEVEL, 0);
>+    glTexParameteri(GL_TEXTURE_3D, GL_TEXTURE_MAX_LEVEL, 0);
>+    glTexParameteri(GL_TEXTURE_3D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
>+    glTexParameteri(GL_TEXTURE_3D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
>+    glTexParameteri(GL_TEXTURE_3D, GL_TEXTURE_WRAP_R, GL_CLAMP_TO_EDGE);
>+
>+    // mProgram creates a quad with the colors from the top (y-direction) layer of the 3D texture.
>+    // 3D pixel (<x>, <y>, <z>) is drawn to 2D pixel (<x>, <z>) for <y> = 1.
>+    drawQuad(mProgram, "position", 1.0f);
>+
>+    int width  = getWindowWidth() - 1;
>+    int height = getWindowHeight() - 1;
>+
>+    EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::red);
>+    EXPECT_PIXEL_COLOR_EQ(width, 0, GLColor::red);
>+    EXPECT_PIXEL_COLOR_EQ(0, height, GLColor::red);
>+    EXPECT_PIXEL_COLOR_EQ(width, height, GLColor::red);
>+
>+    EXPECT_GL_NO_ERROR();
>+
>+    glActiveTexture(GL_TEXTURE0);
>+    glBindTexture(GL_TEXTURE_3D, destTexture.get());
>+    glTexImage3D(GL_TEXTURE_3D, 0, GL_RGBA, 1, 1, 1, 0, GL_RGBA, GL_UNSIGNED_BYTE, nullptr);
>+    glTexParameteri(GL_TEXTURE_3D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
>+    glTexParameteri(GL_TEXTURE_3D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
>+    glTexParameteri(GL_TEXTURE_3D, GL_TEXTURE_BASE_LEVEL, 0);
>+    glTexParameteri(GL_TEXTURE_3D, GL_TEXTURE_MAX_LEVEL, 0);
>+    glTexParameteri(GL_TEXTURE_3D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
>+    glTexParameteri(GL_TEXTURE_3D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
>+    glTexParameteri(GL_TEXTURE_3D, GL_TEXTURE_WRAP_R, GL_CLAMP_TO_EDGE);
>+    EXPECT_GL_NO_ERROR();
>+
>+    // Flip the y coordinate. This will put the greem half on top, and the red half on the bottom.
>+    glCopyTexture3DANGLE(sourceTexture.get(), 0, GL_TEXTURE_3D, destTexture.get(), 0, GL_RGBA,
>+                         GL_UNSIGNED_BYTE, true, false, false);
>+
>+    glBindTexture(GL_TEXTURE_3D, destTexture.get());
>+    EXPECT_GL_NO_ERROR();
>+    drawQuad(mProgram, "position", 1.0f);
>+
>+    EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::green);
>+    EXPECT_PIXEL_COLOR_EQ(0, height, GLColor::green);
>+    EXPECT_PIXEL_COLOR_EQ(width, 0, GLColor::green);
>+    EXPECT_PIXEL_COLOR_EQ(width, height, GLColor::green);
>+}
>+
>+// Test passthrough, premultiply alpha, and unmultiply alpha copies for GL_TEXTURE_3D with unsized
>+// formats.
>+TEST_P(Texture3DCopy, UnsizedFormats)
>+{
>+    ANGLE_SKIP_TEST_IF(!checkExtensions());
>+
>+    testCopy(GL_TEXTURE_3D, GLColor(250, 200, 150, 100), GL_RGB, GL_UNSIGNED_BYTE, false, false,
>+             false, GLColor(250, 200, 150, 255));
>+    testCopy(GL_TEXTURE_3D, GLColor(250, 200, 150, 100), GL_RGB, GL_UNSIGNED_BYTE, false, true,
>+             false, GLColor(98, 78, 59, 255));
>+    testCopy(GL_TEXTURE_3D, GLColor(100, 150, 200, 200), GL_RGB, GL_UNSIGNED_BYTE, false, false,
>+             true, GLColor(128, 191, 255, 255));
>+
>+    testCopy(GL_TEXTURE_3D, GLColor(250, 200, 150, 100), GL_RGB, GL_UNSIGNED_SHORT_5_6_5, false,
>+             false, false, GLColor(247, 199, 148, 255));
>+    testCopy(GL_TEXTURE_3D, GLColor(250, 200, 150, 100), GL_RGB, GL_UNSIGNED_SHORT_5_6_5, false,
>+             true, false, GLColor(99, 77, 57, 255));
>+    testCopy(GL_TEXTURE_3D, GLColor(100, 150, 200, 200), GL_RGB, GL_UNSIGNED_SHORT_5_6_5, false,
>+             false, true, GLColor(132, 190, 255, 255));
>+
>+    testCopy(GL_TEXTURE_3D, GLColor(250, 200, 150, 100), GL_RGBA, GL_UNSIGNED_BYTE, false, false,
>+             false, GLColor(250, 200, 150, 100));
>+    testCopy(GL_TEXTURE_3D, GLColor(250, 200, 150, 100), GL_RGBA, GL_UNSIGNED_BYTE, false, true,
>+             false, GLColor(98, 78, 59, 100));
>+    testCopy(GL_TEXTURE_3D, GLColor(100, 150, 200, 200), GL_RGBA, GL_UNSIGNED_BYTE, false, false,
>+             true, GLColor(128, 191, 255, 200));
>+
>+    testCopy(GL_TEXTURE_3D, GLColor(250, 200, 150, 100), GL_RGBA, GL_UNSIGNED_SHORT_4_4_4_4, false,
>+             false, false, GLColor(255, 204, 153, 102));
>+    testCopy(GL_TEXTURE_3D, GLColor(250, 200, 150, 100), GL_RGBA, GL_UNSIGNED_SHORT_4_4_4_4, false,
>+             true, false, GLColor(102, 85, 51, 102));
>+    testCopy(GL_TEXTURE_3D, GLColor(100, 150, 200, 200), GL_RGBA, GL_UNSIGNED_SHORT_4_4_4_4, false,
>+             false, true, GLColor(136, 187, 255, 204));
>+
>+    testCopy(GL_TEXTURE_3D, GLColor(250, 200, 150, 100), GL_RGBA, GL_UNSIGNED_SHORT_5_5_5_1, false,
>+             false, false, GLColor(247, 198, 148, 0));
>+    testCopy(GL_TEXTURE_3D, GLColor(250, 200, 150, 100), GL_RGBA, GL_UNSIGNED_SHORT_5_5_5_1, false,
>+             true, false, GLColor(99, 82, 57, 0));
>+    testCopy(GL_TEXTURE_3D, GLColor(100, 150, 200, 200), GL_RGBA, GL_UNSIGNED_SHORT_5_5_5_1, false,
>+             false, true, GLColor(132, 189, 255, 255));
>+
>+    testCopy(GL_TEXTURE_3D, GLColor(250, 200, 150, 100), GL_LUMINANCE, GL_UNSIGNED_BYTE, false,
>+             false, false, GLColor(250, 250, 250, 255));
>+    testCopy(GL_TEXTURE_3D, GLColor(250, 200, 150, 100), GL_LUMINANCE, GL_UNSIGNED_BYTE, false,
>+             true, false, GLColor(98, 98, 98, 255));
>+    testCopy(GL_TEXTURE_3D, GLColor(100, 150, 200, 200), GL_LUMINANCE, GL_UNSIGNED_BYTE, false,
>+             false, true, GLColor(128, 128, 128, 255));
>+
>+    testCopy(GL_TEXTURE_3D, GLColor(250, 200, 150, 100), GL_LUMINANCE_ALPHA, GL_UNSIGNED_BYTE,
>+             false, false, false, GLColor(250, 250, 250, 100));
>+    testCopy(GL_TEXTURE_3D, GLColor(250, 200, 150, 100), GL_LUMINANCE_ALPHA, GL_UNSIGNED_BYTE,
>+             false, true, false, GLColor(98, 98, 98, 100));
>+    testCopy(GL_TEXTURE_3D, GLColor(100, 150, 200, 200), GL_LUMINANCE_ALPHA, GL_UNSIGNED_BYTE,
>+             false, false, true, GLColor(128, 128, 128, 200));
>+
>+    testCopy(GL_TEXTURE_3D, GLColor(250, 200, 150, 100), GL_ALPHA, GL_UNSIGNED_BYTE, false, false,
>+             false, GLColor(0, 0, 0, 100));
>+    testCopy(GL_TEXTURE_3D, GLColor(250, 200, 150, 100), GL_ALPHA, GL_UNSIGNED_BYTE, false, false,
>+             false, GLColor(0, 0, 0, 100));
>+    testCopy(GL_TEXTURE_3D, GLColor(250, 200, 150, 100), GL_ALPHA, GL_UNSIGNED_BYTE, false, false,
>+             false, GLColor(0, 0, 0, 100));
>+}
>+
>+// Test passthrough, premultiply alpha, and unmultiply alpha copies for GL_TEXTURE_3D with snorm
>+// formats.
>+TEST_P(Texture3DCopy, SnormFormats)
>+{
>+    ANGLE_SKIP_TEST_IF(!checkExtensions());
>+
>+    testCopy(GL_TEXTURE_3D, GLColor(250, 200, 150, 190), GL_R8_SNORM, GL_BYTE, false, false, false,
>+             GLColor(251, 0, 0, 255));
>+    testCopy(GL_TEXTURE_3D, GLColor(250, 200, 150, 190), GL_R8_SNORM, GL_BYTE, false, true, false,
>+             GLColor(187, 0, 0, 255));
>+    testCopy(GL_TEXTURE_3D, GLColor(200, 150, 100, 230), GL_R8_SNORM, GL_BYTE, false, false, true,
>+             GLColor(221, 0, 0, 255));
>+
>+    testCopy(GL_TEXTURE_3D, GLColor(250, 200, 150, 190), GL_RG8_SNORM, GL_BYTE, false, false, false,
>+             GLColor(251, 201, 0, 255));
>+    testCopy(GL_TEXTURE_3D, GLColor(250, 200, 150, 190), GL_RG8_SNORM, GL_BYTE, false, true, false,
>+             GLColor(187, 149, 0, 255));
>+    testCopy(GL_TEXTURE_3D, GLColor(200, 150, 100, 230), GL_RG8_SNORM, GL_BYTE, false, false, true,
>+             GLColor(221, 167, 0, 255));
>+
>+    testCopy(GL_TEXTURE_3D, GLColor(250, 200, 150, 190), GL_RGB8_SNORM, GL_BYTE, false, false,
>+             false, GLColor(251, 201, 151, 255));
>+    testCopy(GL_TEXTURE_3D, GLColor(250, 200, 150, 190), GL_RGB8_SNORM, GL_BYTE, false, true, false,
>+             GLColor(187, 149, 112, 255));
>+    testCopy(GL_TEXTURE_3D, GLColor(200, 150, 100, 230), GL_RGB8_SNORM, GL_BYTE, false, false, true,
>+             GLColor(221, 167, 110, 255));
>+
>+    testCopy(GL_TEXTURE_3D, GLColor(250, 200, 150, 190), GL_RGBA8_SNORM, GL_BYTE, false, false,
>+             false, GLColor(251, 201, 151, 191));
>+    testCopy(GL_TEXTURE_3D, GLColor(250, 200, 150, 190), GL_RGBA8_SNORM, GL_BYTE, false, true,
>+             false, GLColor(187, 149, 112, 191));
>+    testCopy(GL_TEXTURE_3D, GLColor(200, 150, 100, 230), GL_RGBA8_SNORM, GL_BYTE, false, false,
>+             true, GLColor(221, 167, 110, 231));
>+
>+    testCopy(GL_TEXTURE_3D, GLColor(250, 200, 150, 100), GL_RGB10_A2,
>+             GL_UNSIGNED_INT_2_10_10_10_REV, false, false, false, GLColor(250, 200, 150, 85));
>+    testCopy(GL_TEXTURE_3D, GLColor(250, 200, 150, 200), GL_RGB10_A2,
>+             GL_UNSIGNED_INT_2_10_10_10_REV, false, true, false, GLColor(196, 157, 118, 170));
>+    testCopy(GL_TEXTURE_3D, GLColor(100, 150, 250, 200), GL_RGB10_A2,
>+             GL_UNSIGNED_INT_2_10_10_10_REV, false, false, true, GLColor(128, 191, 255, 170));
>+}
>+
>+// Test passthrough, premultiply alpha, and unmultiply alpha copies for GL_TEXTURE_3D with unsigned
>+// byte formats.
>+TEST_P(Texture3DCopy, UnsignedByteFormats)
>+{
>+    ANGLE_SKIP_TEST_IF(!checkExtensions());
>+
>+    testCopy(GL_TEXTURE_3D, GLColor(250, 200, 150, 100), GL_R8, GL_UNSIGNED_BYTE, false, false,
>+             false, GLColor(250, 0, 0, 255));
>+    testCopy(GL_TEXTURE_3D, GLColor(250, 200, 150, 100), GL_R8, GL_UNSIGNED_BYTE, false, true,
>+             false, GLColor(98, 0, 0, 255));
>+    testCopy(GL_TEXTURE_3D, GLColor(250, 200, 150, 100), GL_R8, GL_UNSIGNED_BYTE, false, false,
>+             true, GLColor(255, 0, 0, 255));
>+
>+    testCopy(GL_TEXTURE_3D, GLColor(250, 200, 150, 100), GL_RG8, GL_UNSIGNED_BYTE, false, false,
>+             false, GLColor(250, 200, 0, 255));
>+    testCopy(GL_TEXTURE_3D, GLColor(250, 200, 150, 100), GL_RG8, GL_UNSIGNED_BYTE, false, true,
>+             false, GLColor(98, 78, 0, 255));
>+    testCopy(GL_TEXTURE_3D, GLColor(250, 200, 150, 100), GL_RG8, GL_UNSIGNED_BYTE, false, false,
>+             true, GLColor(255, 255, 0, 255));
>+
>+    testCopy(GL_TEXTURE_3D, GLColor(250, 200, 150, 100), GL_RGB8, GL_UNSIGNED_BYTE, false, false,
>+             false, GLColor(250, 200, 150, 255));
>+    testCopy(GL_TEXTURE_3D, GLColor(250, 200, 150, 100), GL_RGB8, GL_UNSIGNED_BYTE, false, true,
>+             false, GLColor(98, 78, 59, 255));
>+    testCopy(GL_TEXTURE_3D, GLColor(250, 200, 150, 100), GL_RGB8, GL_UNSIGNED_BYTE, false, false,
>+             true, GLColor(255, 255, 255, 255));
>+
>+    testCopy(GL_TEXTURE_3D, GLColor(250, 200, 150, 100), GL_RGBA8, GL_UNSIGNED_BYTE, false, false,
>+             false, GLColor(250, 200, 150, 100));
>+    testCopy(GL_TEXTURE_3D, GLColor(250, 200, 150, 100), GL_RGBA8, GL_UNSIGNED_BYTE, false, true,
>+             false, GLColor(98, 78, 59, 100));
>+    testCopy(GL_TEXTURE_3D, GLColor(250, 200, 150, 100), GL_RGBA8, GL_UNSIGNED_BYTE, false, false,
>+             true, GLColor(255, 255, 255, 100));
>+
>+    testCopy(GL_TEXTURE_3D, GLColor(250, 200, 150, 100), GL_RGBA4, GL_UNSIGNED_BYTE, false, false,
>+             false, GLColor(255, 204, 153, 102));
>+    testCopy(GL_TEXTURE_3D, GLColor(250, 200, 150, 100), GL_RGBA4, GL_UNSIGNED_BYTE, false, true,
>+             false, GLColor(102, 85, 51, 102));
>+    testCopy(GL_TEXTURE_3D, GLColor(100, 150, 200, 210), GL_RGBA4, GL_UNSIGNED_BYTE, false, false,
>+             true, GLColor(119, 187, 238, 204));
>+
>+    testCopy(GL_TEXTURE_3D, GLColor(250, 200, 150, 100), GL_RGBA4, GL_UNSIGNED_SHORT_4_4_4_4, false,
>+             false, false, GLColor(255, 204, 153, 102));
>+    testCopy(GL_TEXTURE_3D, GLColor(250, 200, 150, 100), GL_RGBA4, GL_UNSIGNED_SHORT_4_4_4_4, false,
>+             true, false, GLColor(102, 85, 51, 102));
>+    testCopy(GL_TEXTURE_3D, GLColor(100, 150, 200, 210), GL_RGBA4, GL_UNSIGNED_SHORT_4_4_4_4, false,
>+             false, true, GLColor(119, 187, 238, 204));
>+
>+    testCopy(GL_TEXTURE_3D, GLColor(250, 200, 150, 100), GL_SRGB8, GL_UNSIGNED_BYTE, false, false,
>+             false, GLColor(244, 148, 78, 255));
>+    testCopy(GL_TEXTURE_3D, GLColor(250, 200, 150, 100), GL_SRGB8, GL_UNSIGNED_BYTE, false, true,
>+             false, GLColor(31, 19, 11, 255));
>+    testCopy(GL_TEXTURE_3D, GLColor(250, 200, 150, 100), GL_SRGB8, GL_UNSIGNED_BYTE, false, false,
>+             true, GLColor(52, 253, 53, 255));
>+
>+    testCopy(GL_TEXTURE_3D, GLColor(250, 200, 150, 100), GL_SRGB8_ALPHA8, GL_UNSIGNED_BYTE, false,
>+             false, false, GLColor(244, 148, 78, 100));
>+    testCopy(GL_TEXTURE_3D, GLColor(250, 200, 150, 100), GL_SRGB8_ALPHA8, GL_UNSIGNED_BYTE, false,
>+             true, false, GLColor(31, 19, 11, 100));
>+    testCopy(GL_TEXTURE_3D, GLColor(250, 200, 150, 100), GL_SRGB8_ALPHA8, GL_UNSIGNED_BYTE, false,
>+             false, true, GLColor(52, 253, 53, 100));
>+
>+    testCopy(GL_TEXTURE_3D, GLColor(250, 200, 150, 200), GL_RGB5_A1, GL_UNSIGNED_BYTE, false, false,
>+             false, GLColor(247, 198, 148, 255));
>+    testCopy(GL_TEXTURE_3D, GLColor(250, 200, 150, 100), GL_RGB5_A1, GL_UNSIGNED_BYTE, false, true,
>+             false, GLColor(99, 82, 57, 0));
>+    testCopy(GL_TEXTURE_3D, GLColor(250, 200, 150, 100), GL_RGB5_A1, GL_UNSIGNED_BYTE, false, false,
>+             true, GLColor(255, 255, 255, 0));
>+
>+    testCopy(GL_TEXTURE_3D, GLColor(250, 200, 150, 200), GL_RGB5_A1, GL_UNSIGNED_INT_2_10_10_10_REV,
>+             false, false, false, GLColor(247, 198, 148, 255));
>+    testCopy(GL_TEXTURE_3D, GLColor(250, 200, 150, 200), GL_RGB5_A1, GL_UNSIGNED_INT_2_10_10_10_REV,
>+             false, true, false, GLColor(198, 156, 115, 255));
>+    testCopy(GL_TEXTURE_3D, GLColor(100, 150, 250, 200), GL_RGB5_A1, GL_UNSIGNED_INT_2_10_10_10_REV,
>+             false, false, true, GLColor(132, 189, 255, 255));
>+
>+    testCopy(GL_TEXTURE_3D, GLColor(250, 200, 150, 200), GL_RGB5_A1, GL_UNSIGNED_SHORT_5_5_5_1,
>+             false, false, false, GLColor(247, 198, 148, 255));
>+    testCopy(GL_TEXTURE_3D, GLColor(250, 200, 150, 200), GL_RGB5_A1, GL_UNSIGNED_SHORT_5_5_5_1,
>+             false, true, false, GLColor(198, 156, 115, 255));
>+    testCopy(GL_TEXTURE_3D, GLColor(100, 150, 250, 200), GL_RGB5_A1, GL_UNSIGNED_SHORT_5_5_5_1,
>+             false, false, true, GLColor(132, 189, 255, 255));
>+
>+    testCopy(GL_TEXTURE_3D, GLColor(250, 200, 150, 200), GL_RGB565, GL_UNSIGNED_BYTE, false, false,
>+             false, GLColor(247, 199, 148, 255));
>+    testCopy(GL_TEXTURE_3D, GLColor(250, 200, 150, 200), GL_RGB565, GL_UNSIGNED_BYTE, false, true,
>+             false, GLColor(198, 158, 115, 255));
>+    testCopy(GL_TEXTURE_3D, GLColor(100, 150, 250, 200), GL_RGB565, GL_UNSIGNED_BYTE, false, false,
>+             true, GLColor(132, 190, 255, 255));
>+
>+    testCopy(GL_TEXTURE_3D, GLColor(250, 200, 150, 200), GL_RGB565, GL_UNSIGNED_SHORT_5_6_5, false,
>+             false, false, GLColor(247, 199, 148, 255));
>+    testCopy(GL_TEXTURE_3D, GLColor(250, 200, 150, 200), GL_RGB565, GL_UNSIGNED_SHORT_5_6_5, false,
>+             true, false, GLColor(198, 158, 115, 255));
>+    testCopy(GL_TEXTURE_3D, GLColor(100, 150, 250, 200), GL_RGB565, GL_UNSIGNED_SHORT_5_6_5, false,
>+             false, true, GLColor(132, 190, 255, 255));
>+}
>+
>+// Test passthrough, premultiply alpha, and unmultiply alpha copies for GL_TEXTURE_3D with float
>+// formats.
>+TEST_P(Texture3DCopy, FloatFormats)
>+{
>+    ANGLE_SKIP_TEST_IF(!checkExtensions());
>+
>+    std::vector<GLenum> floatTypes = {GL_FLOAT, GL_HALF_FLOAT, GL_UNSIGNED_INT_10F_11F_11F_REV,
>+                                      GL_UNSIGNED_INT_5_9_9_9_REV};
>+
>+    for (GLenum floatType : floatTypes)
>+    {
>+        if (floatType != GL_UNSIGNED_INT_5_9_9_9_REV &&
>+            floatType != GL_UNSIGNED_INT_10F_11F_11F_REV)
>+        {
>+            testCopy(GL_TEXTURE_3D, GLColor(210, 200, 150, 235), GL_R16F, floatType, false, false,
>+                     false, GLColor(210, 0, 0, 255));
>+            testCopy(GL_TEXTURE_3D, GLColor(210, 200, 150, 235), GL_R16F, floatType, false, true,
>+                     false, GLColor(191, 0, 0, 255));
>+            testCopy(GL_TEXTURE_3D, GLColor(210, 200, 150, 235), GL_R16F, floatType, false, false,
>+                     true, GLColor(227, 0, 0, 255));
>+
>+            testCopy(GL_TEXTURE_3D, GLColor(210, 200, 150, 235), GL_RG16F, floatType, false, false,
>+                     false, GLColor(210, 200, 0, 255));
>+            testCopy(GL_TEXTURE_3D, GLColor(210, 200, 150, 235), GL_RG16F, floatType, false, true,
>+                     false, GLColor(191, 184, 0, 255));
>+            testCopy(GL_TEXTURE_3D, GLColor(210, 200, 150, 235), GL_RG16F, floatType, false, false,
>+                     true, GLColor(227, 217, 0, 255));
>+
>+            testCopy(GL_TEXTURE_3D, GLColor(210, 200, 150, 235), GL_RGB16F, floatType, false, false,
>+                     false, GLColor(210, 200, 150, 255));
>+            testCopy(GL_TEXTURE_3D, GLColor(210, 200, 150, 235), GL_RGB16F, floatType, false, true,
>+                     false, GLColor(191, 184, 138, 255));
>+            testCopy(GL_TEXTURE_3D, GLColor(210, 200, 150, 235), GL_RGB16F, floatType, false, false,
>+                     true, GLColor(227, 217, 161, 255));
>+
>+            testCopy(GL_TEXTURE_3D, GLColor(210, 200, 150, 235), GL_RGBA16F, floatType, false,
>+                     false, false, GLColor(210, 200, 150, 235));
>+            testCopy(GL_TEXTURE_3D, GLColor(210, 200, 150, 235), GL_RGBA16F, floatType, false, true,
>+                     false, GLColor(191, 184, 138, 235));
>+            testCopy(GL_TEXTURE_3D, GLColor(210, 200, 150, 235), GL_RGBA16F, floatType, false,
>+                     false, true, GLColor(227, 217, 161, 235));
>+        }
>+
>+        if (floatType != GL_UNSIGNED_INT_5_9_9_9_REV)
>+        {
>+            testCopy(GL_TEXTURE_3D, GLColor(210, 200, 150, 235), GL_R11F_G11F_B10F, floatType,
>+                     false, false, false, GLColor(210, 200, 148, 255));
>+            testCopy(GL_TEXTURE_3D, GLColor(210, 200, 150, 235), GL_R11F_G11F_B10F, floatType,
>+                     false, true, false, GLColor(191, 184, 138, 255));
>+            testCopy(GL_TEXTURE_3D, GLColor(210, 200, 150, 235), GL_R11F_G11F_B10F, floatType,
>+                     false, false, true, GLColor(227, 217, 161, 255));
>+        }
>+
>+        if (floatType != GL_UNSIGNED_INT_10F_11F_11F_REV)
>+        {
>+            testCopy(GL_TEXTURE_3D, GLColor(210, 200, 150, 235), GL_RGB9_E5, floatType, false,
>+                     false, false, GLColor(210, 200, 148, 255));
>+            testCopy(GL_TEXTURE_3D, GLColor(210, 200, 150, 235), GL_RGB9_E5, floatType, false, true,
>+                     false, GLColor(192, 184, 138, 255));
>+            testCopy(GL_TEXTURE_3D, GLColor(210, 200, 150, 235), GL_RGB9_E5, floatType, false,
>+                     false, true, GLColor(227, 217, 161, 255));
>+        }
>+    }
>+
>+    testCopy(GL_TEXTURE_3D, GLColor(210, 200, 150, 235), GL_R32F, GL_FLOAT, false, false, false,
>+             GLColor(210, 0, 0, 255));
>+    testCopy(GL_TEXTURE_3D, GLColor(210, 200, 150, 235), GL_R32F, GL_FLOAT, false, true, false,
>+             GLColor(191, 0, 0, 255));
>+    testCopy(GL_TEXTURE_3D, GLColor(210, 200, 150, 235), GL_R32F, GL_FLOAT, false, false, true,
>+             GLColor(227, 0, 0, 255));
>+
>+    testCopy(GL_TEXTURE_3D, GLColor(210, 200, 150, 235), GL_RG32F, GL_FLOAT, false, false, false,
>+             GLColor(210, 200, 0, 255));
>+    testCopy(GL_TEXTURE_3D, GLColor(210, 200, 150, 235), GL_RG32F, GL_FLOAT, false, true, false,
>+             GLColor(191, 184, 0, 255));
>+    testCopy(GL_TEXTURE_3D, GLColor(210, 200, 150, 235), GL_RG32F, GL_FLOAT, false, false, true,
>+             GLColor(227, 217, 0, 255));
>+
>+    testCopy(GL_TEXTURE_3D, GLColor(210, 200, 150, 235), GL_RGB32F, GL_FLOAT, false, false, false,
>+             GLColor(210, 200, 150, 255));
>+    testCopy(GL_TEXTURE_3D, GLColor(210, 200, 150, 235), GL_RGB32F, GL_FLOAT, false, true, false,
>+             GLColor(191, 184, 138, 255));
>+    testCopy(GL_TEXTURE_3D, GLColor(210, 200, 150, 235), GL_RGB32F, GL_FLOAT, false, false, true,
>+             GLColor(227, 217, 161, 255));
>+
>+    testCopy(GL_TEXTURE_3D, GLColor(210, 200, 150, 235), GL_RGBA32F, GL_FLOAT, false, false, false,
>+             GLColor(210, 200, 150, 235));
>+    testCopy(GL_TEXTURE_3D, GLColor(210, 200, 150, 235), GL_RGBA32F, GL_FLOAT, false, true, false,
>+             GLColor(191, 184, 138, 235));
>+    testCopy(GL_TEXTURE_3D, GLColor(210, 200, 150, 235), GL_RGBA32F, GL_FLOAT, false, false, true,
>+             GLColor(227, 217, 161, 235));
>+}
>+
>+// Test passthrough, premultiply alpha, and unmultiply alpha copies for GL_TEXTURE_3D with integer
>+// formats.
>+TEST_P(Texture3DCopy, IntFormats)
>+{
>+    ANGLE_SKIP_TEST_IF(!checkExtensions());
>+
>+    constexpr char kFS[] =
>+        "#version 300 es\n"
>+        "precision highp float;\n"
>+        "uniform highp isampler3D tex3D;\n"
>+        "in vec3 texcoord;\n"
>+        "out ivec4 fragColor;\n"
>+        "void main()\n"
>+        "{\n"
>+        "    fragColor = texture(tex3D, vec3(texcoord.x, texcoord.z, texcoord.y));\n"
>+        "}\n";
>+
>+    mProgram = CompileProgram(getVertexShaderSource(), kFS);
>+    ASSERT_NE(0u, mProgram);
>+    ASSERT_GL_NO_ERROR();
>+
>+    glUseProgram(mProgram);
>+
>+    // Pixels will be read as if the most significant bit is data, not the sign. The expected colors
>+    // reflect this.
>+    testCopy(GL_TEXTURE_3D, GLColor(255, 140, 150, 230), GL_R8I, GL_BYTE, false, false, false,
>+             GLColor(127, 0, 0, 1));
>+    testCopy(GL_TEXTURE_3D, GLColor(255, 140, 150, 230), GL_R8I, GL_BYTE, false, true, false,
>+             GLColor(115, 0, 0, 1));
>+    testCopy(GL_TEXTURE_3D, GLColor(255, 140, 150, 230), GL_R8I, GL_BYTE, false, false, true,
>+             GLColor(127, 0, 0, 1));
>+
>+    testCopy(GL_TEXTURE_3D, GLColor(255, 140, 150, 230), GL_R16I, GL_SHORT, false, false, false,
>+             GLColor(127, 0, 0, 1));
>+    testCopy(GL_TEXTURE_3D, GLColor(255, 140, 150, 230), GL_R16I, GL_SHORT, false, true, false,
>+             GLColor(115, 0, 0, 1));
>+    testCopy(GL_TEXTURE_3D, GLColor(255, 140, 150, 230), GL_R16I, GL_SHORT, false, false, true,
>+             GLColor(127, 0, 0, 1));
>+
>+    testCopy(GL_TEXTURE_3D, GLColor(255, 140, 150, 230), GL_R32I, GL_INT, false, false, false,
>+             GLColor(127, 0, 0, 1));
>+    testCopy(GL_TEXTURE_3D, GLColor(255, 140, 150, 230), GL_R32I, GL_INT, false, true, false,
>+             GLColor(115, 0, 0, 1));
>+    testCopy(GL_TEXTURE_3D, GLColor(255, 140, 150, 230), GL_R32I, GL_INT, false, false, true,
>+             GLColor(127, 0, 0, 1));
>+
>+    testCopy(GL_TEXTURE_3D, GLColor(255, 140, 150, 230), GL_RG8I, GL_BYTE, false, false, false,
>+             GLColor(127, 70, 0, 1));
>+    testCopy(GL_TEXTURE_3D, GLColor(255, 140, 150, 230), GL_RG8I, GL_BYTE, false, true, false,
>+             GLColor(115, 63, 0, 1));
>+    testCopy(GL_TEXTURE_3D, GLColor(255, 140, 150, 230), GL_RG8I, GL_BYTE, false, false, true,
>+             GLColor(127, 77, 0, 1));
>+
>+    testCopy(GL_TEXTURE_3D, GLColor(255, 140, 150, 230), GL_RG16I, GL_SHORT, false, false, false,
>+             GLColor(127, 70, 0, 1));
>+    testCopy(GL_TEXTURE_3D, GLColor(255, 140, 150, 230), GL_RG16I, GL_SHORT, false, true, false,
>+             GLColor(115, 63, 0, 1));
>+    testCopy(GL_TEXTURE_3D, GLColor(255, 140, 150, 230), GL_RG16I, GL_SHORT, false, false, true,
>+             GLColor(127, 77, 0, 1));
>+
>+    testCopy(GL_TEXTURE_3D, GLColor(255, 140, 150, 230), GL_RG32I, GL_INT, false, false, false,
>+             GLColor(127, 70, 0, 1));
>+    testCopy(GL_TEXTURE_3D, GLColor(255, 140, 150, 230), GL_RG32I, GL_INT, false, true, false,
>+             GLColor(115, 63, 0, 1));
>+    testCopy(GL_TEXTURE_3D, GLColor(255, 140, 150, 230), GL_RG32I, GL_INT, false, false, true,
>+             GLColor(127, 77, 0, 1));
>+
>+    testCopy(GL_TEXTURE_3D, GLColor(255, 140, 150, 230), GL_RGB8I, GL_BYTE, false, false, false,
>+             GLColor(127, 70, 75, 1));
>+    testCopy(GL_TEXTURE_3D, GLColor(255, 140, 150, 230), GL_RGB8I, GL_BYTE, false, true, false,
>+             GLColor(115, 63, 67, 1));
>+    testCopy(GL_TEXTURE_3D, GLColor(255, 140, 150, 230), GL_RGB8I, GL_BYTE, false, false, true,
>+             GLColor(127, 77, 83, 1));
>+
>+    testCopy(GL_TEXTURE_3D, GLColor(255, 140, 150, 230), GL_RGB16I, GL_SHORT, false, false, false,
>+             GLColor(127, 70, 75, 1));
>+    testCopy(GL_TEXTURE_3D, GLColor(255, 140, 150, 230), GL_RGB16I, GL_SHORT, false, true, false,
>+             GLColor(115, 63, 67, 1));
>+    testCopy(GL_TEXTURE_3D, GLColor(255, 140, 150, 230), GL_RGB16I, GL_SHORT, false, false, true,
>+             GLColor(127, 77, 83, 1));
>+
>+    testCopy(GL_TEXTURE_3D, GLColor(255, 140, 150, 230), GL_RGB32I, GL_INT, false, false, false,
>+             GLColor(127, 70, 75, 1));
>+    testCopy(GL_TEXTURE_3D, GLColor(255, 140, 150, 230), GL_RGB32I, GL_INT, false, true, false,
>+             GLColor(115, 63, 67, 1));
>+    testCopy(GL_TEXTURE_3D, GLColor(255, 140, 150, 230), GL_RGB32I, GL_INT, false, false, true,
>+             GLColor(127, 77, 83, 1));
>+
>+    testCopy(GL_TEXTURE_3D, GLColor(255, 140, 150, 230), GL_RGBA8I, GL_BYTE, false, false, false,
>+             GLColor(127, 70, 75, 115));
>+    testCopy(GL_TEXTURE_3D, GLColor(255, 140, 150, 230), GL_RGBA8I, GL_BYTE, false, true, false,
>+             GLColor(115, 63, 67, 115));
>+    testCopy(GL_TEXTURE_3D, GLColor(255, 140, 150, 230), GL_RGBA8I, GL_BYTE, false, false, true,
>+             GLColor(127, 77, 83, 115));
>+
>+    testCopy(GL_TEXTURE_3D, GLColor(255, 140, 150, 230), GL_RGBA16I, GL_SHORT, false, false, false,
>+             GLColor(127, 70, 75, 115));
>+    testCopy(GL_TEXTURE_3D, GLColor(255, 140, 150, 230), GL_RGBA16I, GL_SHORT, false, true, false,
>+             GLColor(115, 63, 67, 115));
>+    testCopy(GL_TEXTURE_3D, GLColor(255, 140, 150, 230), GL_RGBA16I, GL_SHORT, false, false, true,
>+             GLColor(127, 77, 83, 115));
>+
>+    testCopy(GL_TEXTURE_3D, GLColor(255, 140, 150, 230), GL_RGBA32I, GL_INT, false, false, false,
>+             GLColor(127, 70, 75, 115));
>+    testCopy(GL_TEXTURE_3D, GLColor(255, 140, 150, 230), GL_RGBA32I, GL_INT, false, true, false,
>+             GLColor(115, 63, 67, 115));
>+    testCopy(GL_TEXTURE_3D, GLColor(255, 140, 150, 230), GL_RGBA32I, GL_INT, false, false, true,
>+             GLColor(127, 77, 83, 115));
>+}
>+
>+// Test passthrough, premultiply alpha, and unmultiply alpha copies for GL_TEXTURE_3D with unsigned
>+// integer formats.
>+TEST_P(Texture3DCopy, UintFormats)
>+{
>+    ANGLE_SKIP_TEST_IF(!checkExtensions());
>+
>+    constexpr char kFS[] =
>+        "#version 300 es\n"
>+        "precision highp float;\n"
>+        "uniform highp usampler3D tex3D;\n"
>+        "in vec3 texcoord;\n"
>+        "out uvec4 fragColor;\n"
>+        "void main()\n"
>+        "{\n"
>+        "    fragColor = texture(tex3D, vec3(texcoord.x, texcoord.z, texcoord.y));\n"
>+        "}\n";
>+
>+    mProgram = CompileProgram(getVertexShaderSource(), kFS);
>+    ASSERT_NE(0u, mProgram);
>+    ASSERT_GL_NO_ERROR();
>+
>+    glUseProgram(mProgram);
>+
>+    testCopy(GL_TEXTURE_3D, GLColor(128, 84, 32, 100), GL_R8UI, GL_UNSIGNED_BYTE, false, false,
>+             false, GLColor(128, 0, 0, 1));
>+    testCopy(GL_TEXTURE_3D, GLColor(128, 84, 32, 100), GL_R8UI, GL_UNSIGNED_BYTE, false, true,
>+             false, GLColor(50, 0, 0, 1));
>+    testCopy(GL_TEXTURE_3D, GLColor(128, 84, 32, 100), GL_R8UI, GL_UNSIGNED_BYTE, false, false,
>+             true, GLColor(255, 0, 0, 1));
>+
>+    testCopy(GL_TEXTURE_3D, GLColor(128, 84, 32, 100), GL_R16UI, GL_UNSIGNED_SHORT, false, false,
>+             false, GLColor(128, 0, 0, 1));
>+    testCopy(GL_TEXTURE_3D, GLColor(128, 84, 32, 100), GL_R16UI, GL_UNSIGNED_SHORT, false, true,
>+             false, GLColor(50, 0, 0, 1));
>+    testCopy(GL_TEXTURE_3D, GLColor(128, 84, 32, 100), GL_R16UI, GL_UNSIGNED_SHORT, false, false,
>+             true, GLColor(255, 0, 0, 1));
>+
>+    testCopy(GL_TEXTURE_3D, GLColor(128, 84, 32, 100), GL_R32UI, GL_UNSIGNED_INT, false, false,
>+             false, GLColor(128, 0, 0, 1));
>+    testCopy(GL_TEXTURE_3D, GLColor(128, 84, 32, 100), GL_R32UI, GL_UNSIGNED_INT, false, true,
>+             false, GLColor(50, 0, 0, 1));
>+    testCopy(GL_TEXTURE_3D, GLColor(128, 84, 32, 100), GL_R32UI, GL_UNSIGNED_INT, false, false,
>+             true, GLColor(255, 0, 0, 1));
>+
>+    testCopy(GL_TEXTURE_3D, GLColor(128, 84, 32, 100), GL_RG8UI, GL_UNSIGNED_BYTE, false, false,
>+             false, GLColor(128, 84, 0, 1));
>+    testCopy(GL_TEXTURE_3D, GLColor(128, 84, 32, 100), GL_RG8UI, GL_UNSIGNED_BYTE, false, true,
>+             false, GLColor(50, 32, 0, 1));
>+    testCopy(GL_TEXTURE_3D, GLColor(128, 84, 32, 100), GL_RG8UI, GL_UNSIGNED_BYTE, false, false,
>+             true, GLColor(255, 214, 0, 1));
>+
>+    testCopy(GL_TEXTURE_3D, GLColor(128, 84, 32, 100), GL_RG16UI, GL_UNSIGNED_SHORT, false, false,
>+             false, GLColor(128, 84, 0, 1));
>+    testCopy(GL_TEXTURE_3D, GLColor(128, 84, 32, 100), GL_RG16UI, GL_UNSIGNED_SHORT, false, true,
>+             false, GLColor(50, 32, 0, 1));
>+    testCopy(GL_TEXTURE_3D, GLColor(128, 84, 32, 100), GL_RG16UI, GL_UNSIGNED_SHORT, false, false,
>+             true, GLColor(255, 214, 0, 1));
>+
>+    testCopy(GL_TEXTURE_3D, GLColor(128, 84, 32, 100), GL_RG32UI, GL_UNSIGNED_INT, false, false,
>+             false, GLColor(128, 84, 0, 1));
>+    testCopy(GL_TEXTURE_3D, GLColor(128, 84, 32, 100), GL_RG32UI, GL_UNSIGNED_INT, false, true,
>+             false, GLColor(50, 32, 0, 1));
>+    testCopy(GL_TEXTURE_3D, GLColor(128, 84, 32, 100), GL_RG32UI, GL_UNSIGNED_INT, false, false,
>+             true, GLColor(255, 214, 0, 1));
>+
>+    testCopy(GL_TEXTURE_3D, GLColor(128, 84, 32, 100), GL_RGB8UI, GL_UNSIGNED_BYTE, false, false,
>+             false, GLColor(128, 84, 32, 1));
>+    testCopy(GL_TEXTURE_3D, GLColor(128, 84, 32, 100), GL_RGB8UI, GL_UNSIGNED_BYTE, false, true,
>+             false, GLColor(50, 32, 12, 1));
>+    testCopy(GL_TEXTURE_3D, GLColor(128, 84, 32, 100), GL_RGB8UI, GL_UNSIGNED_BYTE, false, false,
>+             true, GLColor(255, 214, 81, 1));
>+
>+    testCopy(GL_TEXTURE_3D, GLColor(128, 84, 32, 100), GL_RGB16UI, GL_UNSIGNED_SHORT, false, false,
>+             false, GLColor(128, 84, 32, 1));
>+    testCopy(GL_TEXTURE_3D, GLColor(128, 84, 32, 100), GL_RGB16UI, GL_UNSIGNED_SHORT, false, true,
>+             false, GLColor(50, 32, 12, 1));
>+    testCopy(GL_TEXTURE_3D, GLColor(128, 84, 32, 100), GL_RGB16UI, GL_UNSIGNED_SHORT, false, false,
>+             true, GLColor(255, 214, 81, 1));
>+
>+    testCopy(GL_TEXTURE_3D, GLColor(128, 84, 32, 100), GL_RGB32UI, GL_UNSIGNED_INT, false, false,
>+             false, GLColor(128, 84, 32, 1));
>+    testCopy(GL_TEXTURE_3D, GLColor(128, 84, 32, 100), GL_RGB32UI, GL_UNSIGNED_INT, false, true,
>+             false, GLColor(50, 32, 12, 1));
>+    testCopy(GL_TEXTURE_3D, GLColor(128, 84, 32, 100), GL_RGB32UI, GL_UNSIGNED_INT, false, false,
>+             true, GLColor(255, 214, 81, 1));
>+
>+    testCopy(GL_TEXTURE_3D, GLColor(128, 84, 32, 100), GL_RGBA8UI, GL_UNSIGNED_BYTE, false, false,
>+             false, GLColor(128, 84, 32, 100));
>+    testCopy(GL_TEXTURE_3D, GLColor(128, 84, 32, 100), GL_RGBA8UI, GL_UNSIGNED_BYTE, false, true,
>+             false, GLColor(50, 32, 12, 100));
>+    testCopy(GL_TEXTURE_3D, GLColor(128, 84, 32, 100), GL_RGBA8UI, GL_UNSIGNED_BYTE, false, false,
>+             true, GLColor(255, 214, 81, 100));
>+
>+    testCopy(GL_TEXTURE_3D, GLColor(128, 84, 32, 100), GL_RGBA16UI, GL_UNSIGNED_SHORT, false, false,
>+             false, GLColor(128, 84, 32, 100));
>+    testCopy(GL_TEXTURE_3D, GLColor(128, 84, 32, 100), GL_RGBA16UI, GL_UNSIGNED_SHORT, false, true,
>+             false, GLColor(50, 32, 12, 100));
>+    testCopy(GL_TEXTURE_3D, GLColor(128, 84, 32, 100), GL_RGBA16UI, GL_UNSIGNED_SHORT, false, false,
>+             true, GLColor(255, 214, 81, 100));
>+
>+    testCopy(GL_TEXTURE_3D, GLColor(128, 84, 32, 100), GL_RGBA32UI, GL_UNSIGNED_INT, false, false,
>+             false, GLColor(128, 84, 32, 100));
>+    testCopy(GL_TEXTURE_3D, GLColor(128, 84, 32, 100), GL_RGBA32UI, GL_UNSIGNED_INT, false, true,
>+             false, GLColor(50, 32, 12, 100));
>+    testCopy(GL_TEXTURE_3D, GLColor(128, 84, 32, 100), GL_RGBA32UI, GL_UNSIGNED_INT, false, false,
>+             true, GLColor(255, 214, 81, 100));
>+
>+    testCopy(GL_TEXTURE_3D, GLColor(128, 84, 32, 100), GL_RGB10_A2UI,
>+             GL_UNSIGNED_INT_2_10_10_10_REV, false, false, false, GLColor(128, 84, 32, 3));
>+    testCopy(GL_TEXTURE_3D, GLColor(128, 84, 32, 100), GL_RGB10_A2UI,
>+             GL_UNSIGNED_INT_2_10_10_10_REV, false, true, false, GLColor(50, 32, 12, 3));
>+    testCopy(GL_TEXTURE_3D, GLColor(128, 84, 32, 100), GL_RGB10_A2UI,
>+             GL_UNSIGNED_INT_2_10_10_10_REV, false, false, true, GLColor(255, 214, 81, 3));
>+}
>+
>+// Test that glCopySubTexture3DANGLE correctly copies to and from a GL_TEXTURE_2D_ARRAY texture.
>+TEST_P(Texture2DArrayCopy, CopySubTexture)
>+{
>+    ANGLE_SKIP_TEST_IF(!checkExtensions());
>+
>+    std::vector<GLColor> texDataGreen(2u * 2u * 2u, GLColor::green);
>+    std::vector<GLColor> texDataRed(2u * 2u * 2u, GLColor::red);
>+
>+    glBindTexture(GL_TEXTURE_2D_ARRAY, sourceTexture.get());
>+    EXPECT_GL_NO_ERROR();
>+    glTexImage3D(GL_TEXTURE_2D_ARRAY, 0, GL_RGBA, 2, 2, 2, 0, GL_RGBA, GL_UNSIGNED_BYTE,
>+                 texDataGreen.data());
>+    EXPECT_GL_NO_ERROR();
>+    glTexParameteri(GL_TEXTURE_2D_ARRAY, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
>+    glTexParameteri(GL_TEXTURE_2D_ARRAY, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR);
>+    glTexParameteri(GL_TEXTURE_2D_ARRAY, GL_TEXTURE_BASE_LEVEL, 0);
>+    glTexParameteri(GL_TEXTURE_2D_ARRAY, GL_TEXTURE_MAX_LEVEL, 0);
>+    EXPECT_GL_NO_ERROR();
>+
>+    glActiveTexture(GL_TEXTURE0);
>+    glBindTexture(GL_TEXTURE_2D_ARRAY, destTexture.get());
>+    glTexImage3D(GL_TEXTURE_2D_ARRAY, 0, GL_RGBA, 2, 2, 2, 0, GL_RGBA, GL_UNSIGNED_BYTE,
>+                 texDataRed.data());
>+    glTexParameteri(GL_TEXTURE_2D_ARRAY, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
>+    glTexParameteri(GL_TEXTURE_2D_ARRAY, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR);
>+    glTexParameteri(GL_TEXTURE_2D_ARRAY, GL_TEXTURE_BASE_LEVEL, 0);
>+    glTexParameteri(GL_TEXTURE_2D_ARRAY, GL_TEXTURE_MAX_LEVEL, 0);
>+    EXPECT_GL_NO_ERROR();
>+    glCopySubTexture3DANGLE(sourceTexture.get(), 0, GL_TEXTURE_2D_ARRAY, destTexture.get(), 0, 0, 0,
>+                            0, 0, 0, 0, 2, 2, 2, false, false, false);
>+    EXPECT_GL_NO_ERROR();
>+    drawQuad(mProgram, "position", 0.5f);
>+
>+    EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::green);
>+}
>+
>+// Test that glCopyTexture3DANGLE correctly copies from a non-zero mipmap on a GL_TEXTURE_2D_ARRAY
>+// texture.
>+TEST_P(Texture2DArrayCopy, CopyFromMipmap)
>+{
>+    ANGLE_SKIP_TEST_IF(!checkExtensions());
>+
>+    std::vector<GLColor> texDataGreen4(4u * 4u * 4u, GLColor::green);
>+    std::vector<GLColor> texDataGreen2(2u * 2u * 2u, GLColor::green);
>+    std::vector<GLColor> texDataRed2(2u * 2u * 2u, GLColor::red);
>+
>+    glBindTexture(GL_TEXTURE_2D_ARRAY, sourceTexture.get());
>+    glTexImage3D(GL_TEXTURE_2D_ARRAY, 0, GL_RGBA, 4, 4, 4, 0, GL_RGBA, GL_UNSIGNED_BYTE,
>+                 texDataGreen4.data());
>+    glTexImage3D(GL_TEXTURE_2D_ARRAY, 1, GL_RGBA, 2, 2, 2, 0, GL_RGBA, GL_UNSIGNED_BYTE,
>+                 texDataGreen2.data());
>+    EXPECT_GL_NO_ERROR();
>+    glTexParameteri(GL_TEXTURE_2D_ARRAY, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
>+    glTexParameteri(GL_TEXTURE_2D_ARRAY, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
>+    glTexParameteri(GL_TEXTURE_2D_ARRAY, GL_TEXTURE_BASE_LEVEL, 1);
>+    glTexParameteri(GL_TEXTURE_2D_ARRAY, GL_TEXTURE_MAX_LEVEL, 1);
>+    EXPECT_GL_NO_ERROR();
>+
>+    glActiveTexture(GL_TEXTURE0);
>+    glBindTexture(GL_TEXTURE_2D_ARRAY, destTexture.get());
>+    glTexImage3D(GL_TEXTURE_2D_ARRAY, 0, GL_RGBA, 2, 2, 2, 0, GL_RGBA, GL_UNSIGNED_BYTE, nullptr);
>+    glTexParameteri(GL_TEXTURE_2D_ARRAY, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
>+    glTexParameteri(GL_TEXTURE_2D_ARRAY, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
>+    glTexParameteri(GL_TEXTURE_2D_ARRAY, GL_TEXTURE_BASE_LEVEL, 0);
>+    glTexParameteri(GL_TEXTURE_2D_ARRAY, GL_TEXTURE_MAX_LEVEL, 0);
>+
>+    EXPECT_GL_NO_ERROR();
>+    glCopyTexture3DANGLE(sourceTexture.get(), 1, GL_TEXTURE_2D_ARRAY, destTexture.get(), 0, GL_RGBA,
>+                         GL_UNSIGNED_BYTE, false, false, false);
>+
>+    EXPECT_GL_NO_ERROR();
>+    drawQuad(mProgram, "position", 1.0f);
>+
>+    EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::green);
>+}
>+
>+// Test that glCopySubTexture3DANGLE's offset and dimension parameters work correctly with a
>+// GL_TEXTURE_2D_ARRAY texture.
>+TEST_P(Texture2DArrayCopy, OffsetSubCopy)
>+{
>+    ANGLE_SKIP_TEST_IF(!checkExtensions());
>+
>+    GLColor rgbaPixels[27];
>+
>+    // Create pixel data for a 3x3x3 red cube
>+    for (int i = 0; i < 27; i++)
>+    {
>+        rgbaPixels[i] = GLColor(255u, 0u, 0u, 255u);
>+    }
>+
>+    // Change a pixel to create a 1x1x1 blue cube at (0, 0, 0)
>+    rgbaPixels[0] = GLColor(0u, 0u, 255u, 255u);
>+
>+    // Change some pixels to green to create a 2x2x2 cube starting at (1, 1, 1)
>+    rgbaPixels[13] = GLColor(0u, 255u, 0u, 255u);
>+    rgbaPixels[14] = GLColor(0u, 255u, 0u, 255u);
>+    rgbaPixels[16] = GLColor(0u, 255u, 0u, 255u);
>+    rgbaPixels[17] = GLColor(0u, 255u, 0u, 255u);
>+    rgbaPixels[22] = GLColor(0u, 255u, 0u, 255u);
>+    rgbaPixels[23] = GLColor(0u, 255u, 0u, 255u);
>+    rgbaPixels[25] = GLColor(0u, 255u, 0u, 255u);
>+    rgbaPixels[26] = GLColor(0u, 255u, 0u, 255u);
>+
>+    glBindTexture(GL_TEXTURE_2D_ARRAY, sourceTexture.get());
>+    glTexImage3D(GL_TEXTURE_2D_ARRAY, 0, GL_RGBA, 3, 3, 3, 0, GL_RGBA, GL_UNSIGNED_BYTE,
>+                 rgbaPixels);
>+    glTexParameteri(GL_TEXTURE_2D_ARRAY, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
>+    glTexParameteri(GL_TEXTURE_2D_ARRAY, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
>+    glTexParameteri(GL_TEXTURE_2D_ARRAY, GL_TEXTURE_BASE_LEVEL, 0);
>+    glTexParameteri(GL_TEXTURE_2D_ARRAY, GL_TEXTURE_MAX_LEVEL, 0);
>+    EXPECT_GL_NO_ERROR();
>+
>+    glActiveTexture(GL_TEXTURE0);
>+    glBindTexture(GL_TEXTURE_2D_ARRAY, destTexture.get());
>+    glTexImage3D(GL_TEXTURE_2D_ARRAY, 0, GL_RGBA, 2, 2, 2, 0, GL_RGBA, GL_UNSIGNED_BYTE, nullptr);
>+    glTexParameteri(GL_TEXTURE_2D_ARRAY, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
>+    glTexParameteri(GL_TEXTURE_2D_ARRAY, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
>+    glTexParameteri(GL_TEXTURE_2D_ARRAY, GL_TEXTURE_BASE_LEVEL, 0);
>+    glTexParameteri(GL_TEXTURE_2D_ARRAY, GL_TEXTURE_MAX_LEVEL, 0);
>+    glTexParameteri(GL_TEXTURE_2D_ARRAY, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
>+    glTexParameteri(GL_TEXTURE_2D_ARRAY, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
>+    glTexParameteri(GL_TEXTURE_2D_ARRAY, GL_TEXTURE_WRAP_R, GL_CLAMP_TO_EDGE);
>+
>+    EXPECT_GL_NO_ERROR();
>+    // Copy the 2x2x2 green cube into a new texture
>+    glCopySubTexture3DANGLE(sourceTexture.get(), 0, GL_TEXTURE_2D_ARRAY, destTexture.get(), 0, 0, 0,
>+                            0, 1, 1, 1, 2, 2, 2, false, false, false);
>+    glBindTexture(GL_TEXTURE_2D_ARRAY, destTexture.get());
>+    EXPECT_GL_NO_ERROR();
>+    drawQuad(mProgram, "position", 1.0f);
>+    int width  = getWindowWidth() - 1;
>+    int height = getWindowHeight() - 1;
>+
>+    EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::green);
>+    EXPECT_PIXEL_COLOR_EQ(width, 0, GLColor::green);
>+    EXPECT_PIXEL_COLOR_EQ(0, height, GLColor::green);
>+    EXPECT_PIXEL_COLOR_EQ(width, height, GLColor::green);
>+
>+    // Copy the 1x1x1 blue cube into the the 2x2x2 green cube at location (1, 1, 1)
>+    glCopySubTexture3DANGLE(sourceTexture.get(), 0, GL_TEXTURE_2D_ARRAY, destTexture.get(), 0, 1, 1,
>+                            1, 0, 0, 0, 1, 1, 1, false, false, false);
>+    EXPECT_GL_NO_ERROR();
>+    drawQuad(mProgram, "position", 1.0f);
>+    EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::green);
>+    EXPECT_PIXEL_COLOR_EQ(width, 0, GLColor::green);
>+    EXPECT_PIXEL_COLOR_EQ(0, height, GLColor::green);
>+    EXPECT_PIXEL_COLOR_EQ(width, height, GLColor::blue);
>+}
>+
>+// Test that the flipY parameter works with a GL_TEXTURE_2D_ARRAY texture.
>+TEST_P(Texture2DArrayCopy, FlipY)
>+{
>+    ANGLE_SKIP_TEST_IF(!checkExtensions());
>+
>+    // Create a 2x2x2 cube. The top half is red. The bottom half is green.
>+    GLColor rgbaPixels[8] = {GLColor::green, GLColor::green, GLColor::red, GLColor::red,
>+                             GLColor::green, GLColor::green, GLColor::red, GLColor::red};
>+
>+    glBindTexture(GL_TEXTURE_2D_ARRAY, sourceTexture.get());
>+    glTexImage3D(GL_TEXTURE_2D_ARRAY, 0, GL_RGBA, 2, 2, 2, 0, GL_RGBA, GL_UNSIGNED_BYTE,
>+                 rgbaPixels);
>+    glTexParameteri(GL_TEXTURE_2D_ARRAY, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
>+    glTexParameteri(GL_TEXTURE_2D_ARRAY, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
>+    glTexParameteri(GL_TEXTURE_2D_ARRAY, GL_TEXTURE_BASE_LEVEL, 0);
>+    glTexParameteri(GL_TEXTURE_2D_ARRAY, GL_TEXTURE_MAX_LEVEL, 0);
>+    glTexParameteri(GL_TEXTURE_2D_ARRAY, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
>+    glTexParameteri(GL_TEXTURE_2D_ARRAY, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
>+    glTexParameteri(GL_TEXTURE_2D_ARRAY, GL_TEXTURE_WRAP_R, GL_CLAMP_TO_EDGE);
>+
>+    drawQuad(mProgram, "position", 1.0f);
>+
>+    int width  = getWindowWidth() - 1;
>+    int height = getWindowHeight() - 1;
>+
>+    EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::red);
>+    EXPECT_PIXEL_COLOR_EQ(width, 0, GLColor::red);
>+    EXPECT_PIXEL_COLOR_EQ(0, height, GLColor::red);
>+    EXPECT_PIXEL_COLOR_EQ(width, height, GLColor::red);
>+
>+    EXPECT_GL_NO_ERROR();
>+
>+    glActiveTexture(GL_TEXTURE0);
>+    glBindTexture(GL_TEXTURE_2D_ARRAY, destTexture.get());
>+    glTexImage3D(GL_TEXTURE_2D_ARRAY, 0, GL_RGBA, 1, 1, 1, 0, GL_RGBA, GL_UNSIGNED_BYTE, nullptr);
>+    glTexParameteri(GL_TEXTURE_2D_ARRAY, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
>+    glTexParameteri(GL_TEXTURE_2D_ARRAY, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
>+    glTexParameteri(GL_TEXTURE_2D_ARRAY, GL_TEXTURE_BASE_LEVEL, 0);
>+    glTexParameteri(GL_TEXTURE_2D_ARRAY, GL_TEXTURE_MAX_LEVEL, 0);
>+    glTexParameteri(GL_TEXTURE_2D_ARRAY, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
>+    glTexParameteri(GL_TEXTURE_2D_ARRAY, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
>+    glTexParameteri(GL_TEXTURE_2D_ARRAY, GL_TEXTURE_WRAP_R, GL_CLAMP_TO_EDGE);
>+    EXPECT_GL_NO_ERROR();
>+
>+    // Flip the y coordinate. This will put the greem half on top, and the red half on the bottom.
>+    glCopyTexture3DANGLE(sourceTexture.get(), 0, GL_TEXTURE_2D_ARRAY, destTexture.get(), 0, GL_RGBA,
>+                         GL_UNSIGNED_BYTE, true, false, false);
>+
>+    glBindTexture(GL_TEXTURE_2D_ARRAY, destTexture.get());
>+    EXPECT_GL_NO_ERROR();
>+    drawQuad(mProgram, "position", 1.0f);
>+
>+    EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::green);
>+    EXPECT_PIXEL_COLOR_EQ(0, height, GLColor::green);
>+    EXPECT_PIXEL_COLOR_EQ(width, 0, GLColor::green);
>+    EXPECT_PIXEL_COLOR_EQ(width, height, GLColor::green);
>+}
>+
>+// Test passthrough, premultiply alpha, and unmultiply alpha copies for GL_TEXTURE_2D_ARRAY with
>+// unsized formats.
>+TEST_P(Texture2DArrayCopy, UnsizedFormats)
>+{
>+    ANGLE_SKIP_TEST_IF(!checkExtensions());
>+
>+    testCopy(GL_TEXTURE_2D_ARRAY, GLColor(250, 200, 150, 100), GL_RGB, GL_UNSIGNED_BYTE, false,
>+             false, false, GLColor(250, 200, 150, 255));
>+    testCopy(GL_TEXTURE_2D_ARRAY, GLColor(250, 200, 150, 100), GL_RGB, GL_UNSIGNED_BYTE, false,
>+             true, false, GLColor(98, 78, 59, 255));
>+    testCopy(GL_TEXTURE_2D_ARRAY, GLColor(100, 150, 200, 200), GL_RGB, GL_UNSIGNED_BYTE, false,
>+             false, true, GLColor(128, 191, 255, 255));
>+
>+    testCopy(GL_TEXTURE_2D_ARRAY, GLColor(250, 200, 150, 100), GL_RGB, GL_UNSIGNED_SHORT_5_6_5,
>+             false, false, false, GLColor(247, 199, 148, 255));
>+    testCopy(GL_TEXTURE_2D_ARRAY, GLColor(250, 200, 150, 100), GL_RGB, GL_UNSIGNED_SHORT_5_6_5,
>+             false, true, false, GLColor(99, 77, 57, 255));
>+    testCopy(GL_TEXTURE_2D_ARRAY, GLColor(100, 150, 200, 200), GL_RGB, GL_UNSIGNED_SHORT_5_6_5,
>+             false, false, true, GLColor(132, 190, 255, 255));
>+
>+    testCopy(GL_TEXTURE_2D_ARRAY, GLColor(250, 200, 150, 100), GL_RGBA, GL_UNSIGNED_BYTE, false,
>+             false, false, GLColor(250, 200, 150, 100));
>+    testCopy(GL_TEXTURE_2D_ARRAY, GLColor(250, 200, 150, 100), GL_RGBA, GL_UNSIGNED_BYTE, false,
>+             true, false, GLColor(98, 78, 59, 100));
>+    testCopy(GL_TEXTURE_2D_ARRAY, GLColor(100, 150, 200, 200), GL_RGBA, GL_UNSIGNED_BYTE, false,
>+             false, true, GLColor(128, 191, 255, 200));
>+
>+    testCopy(GL_TEXTURE_2D_ARRAY, GLColor(250, 200, 150, 100), GL_RGBA, GL_UNSIGNED_SHORT_4_4_4_4,
>+             false, false, false, GLColor(255, 204, 153, 102));
>+    testCopy(GL_TEXTURE_2D_ARRAY, GLColor(250, 200, 150, 100), GL_RGBA, GL_UNSIGNED_SHORT_4_4_4_4,
>+             false, true, false, GLColor(102, 85, 51, 102));
>+    testCopy(GL_TEXTURE_2D_ARRAY, GLColor(100, 150, 200, 200), GL_RGBA, GL_UNSIGNED_SHORT_4_4_4_4,
>+             false, false, true, GLColor(136, 187, 255, 204));
>+
>+    testCopy(GL_TEXTURE_2D_ARRAY, GLColor(250, 200, 150, 100), GL_RGBA, GL_UNSIGNED_SHORT_5_5_5_1,
>+             false, false, false, GLColor(247, 198, 148, 0));
>+    testCopy(GL_TEXTURE_2D_ARRAY, GLColor(250, 200, 150, 100), GL_RGBA, GL_UNSIGNED_SHORT_5_5_5_1,
>+             false, true, false, GLColor(99, 82, 57, 0));
>+    testCopy(GL_TEXTURE_2D_ARRAY, GLColor(100, 150, 200, 200), GL_RGBA, GL_UNSIGNED_SHORT_5_5_5_1,
>+             false, false, true, GLColor(132, 189, 255, 255));
>+
>+    testCopy(GL_TEXTURE_2D_ARRAY, GLColor(250, 200, 150, 100), GL_LUMINANCE, GL_UNSIGNED_BYTE,
>+             false, false, false, GLColor(250, 250, 250, 255));
>+    testCopy(GL_TEXTURE_2D_ARRAY, GLColor(250, 200, 150, 100), GL_LUMINANCE, GL_UNSIGNED_BYTE,
>+             false, true, false, GLColor(98, 98, 98, 255));
>+    testCopy(GL_TEXTURE_2D_ARRAY, GLColor(100, 150, 200, 200), GL_LUMINANCE, GL_UNSIGNED_BYTE,
>+             false, false, true, GLColor(128, 128, 128, 255));
>+
>+    testCopy(GL_TEXTURE_2D_ARRAY, GLColor(250, 200, 150, 100), GL_LUMINANCE_ALPHA, GL_UNSIGNED_BYTE,
>+             false, false, false, GLColor(250, 250, 250, 100));
>+    testCopy(GL_TEXTURE_2D_ARRAY, GLColor(250, 200, 150, 100), GL_LUMINANCE_ALPHA, GL_UNSIGNED_BYTE,
>+             false, true, false, GLColor(98, 98, 98, 100));
>+    testCopy(GL_TEXTURE_2D_ARRAY, GLColor(100, 150, 200, 200), GL_LUMINANCE_ALPHA, GL_UNSIGNED_BYTE,
>+             false, false, true, GLColor(128, 128, 128, 200));
>+
>+    testCopy(GL_TEXTURE_2D_ARRAY, GLColor(250, 200, 150, 100), GL_ALPHA, GL_UNSIGNED_BYTE, false,
>+             false, false, GLColor(0, 0, 0, 100));
>+    testCopy(GL_TEXTURE_2D_ARRAY, GLColor(250, 200, 150, 100), GL_ALPHA, GL_UNSIGNED_BYTE, false,
>+             false, false, GLColor(0, 0, 0, 100));
>+    testCopy(GL_TEXTURE_2D_ARRAY, GLColor(250, 200, 150, 100), GL_ALPHA, GL_UNSIGNED_BYTE, false,
>+             false, false, GLColor(0, 0, 0, 100));
>+}
>+
>+// Test passthrough, premultiply alpha, and unmultiply alpha copies for GL_TEXTURE_2D_ARRAY with
>+// snorm formats.
>+TEST_P(Texture2DArrayCopy, SnormFormats)
>+{
>+    ANGLE_SKIP_TEST_IF(!checkExtensions());
>+
>+    // http://anglebug.com/2865
>+    ANGLE_SKIP_TEST_IF(IsWindows() && IsNVIDIA() && IsD3D11());
>+
>+    testCopy(GL_TEXTURE_2D_ARRAY, GLColor(250, 200, 150, 190), GL_R8_SNORM, GL_BYTE, false, false,
>+             false, GLColor(251, 0, 0, 255));
>+    testCopy(GL_TEXTURE_2D_ARRAY, GLColor(250, 200, 150, 190), GL_R8_SNORM, GL_BYTE, false, true,
>+             false, GLColor(187, 0, 0, 255));
>+    testCopy(GL_TEXTURE_2D_ARRAY, GLColor(200, 150, 100, 230), GL_R8_SNORM, GL_BYTE, false, false,
>+             true, GLColor(221, 0, 0, 255));
>+
>+    testCopy(GL_TEXTURE_2D_ARRAY, GLColor(250, 200, 150, 190), GL_RG8_SNORM, GL_BYTE, false, false,
>+             false, GLColor(251, 201, 0, 255));
>+    testCopy(GL_TEXTURE_2D_ARRAY, GLColor(250, 200, 150, 190), GL_RG8_SNORM, GL_BYTE, false, true,
>+             false, GLColor(187, 149, 0, 255));
>+    testCopy(GL_TEXTURE_2D_ARRAY, GLColor(200, 150, 100, 230), GL_RG8_SNORM, GL_BYTE, false, false,
>+             true, GLColor(221, 167, 0, 255));
>+
>+    testCopy(GL_TEXTURE_2D_ARRAY, GLColor(250, 200, 150, 190), GL_RGB8_SNORM, GL_BYTE, false, false,
>+             false, GLColor(251, 201, 151, 255));
>+    testCopy(GL_TEXTURE_2D_ARRAY, GLColor(250, 200, 150, 190), GL_RGB8_SNORM, GL_BYTE, false, true,
>+             false, GLColor(187, 149, 112, 255));
>+    testCopy(GL_TEXTURE_2D_ARRAY, GLColor(200, 150, 100, 230), GL_RGB8_SNORM, GL_BYTE, false, false,
>+             true, GLColor(221, 167, 110, 255));
>+
>+    testCopy(GL_TEXTURE_2D_ARRAY, GLColor(250, 200, 150, 190), GL_RGBA8_SNORM, GL_BYTE, false,
>+             false, false, GLColor(251, 201, 151, 191));
>+    testCopy(GL_TEXTURE_2D_ARRAY, GLColor(250, 200, 150, 190), GL_RGBA8_SNORM, GL_BYTE, false, true,
>+             false, GLColor(187, 149, 112, 191));
>+    testCopy(GL_TEXTURE_2D_ARRAY, GLColor(200, 150, 100, 230), GL_RGBA8_SNORM, GL_BYTE, false,
>+             false, true, GLColor(221, 167, 110, 231));
>+
>+    testCopy(GL_TEXTURE_2D_ARRAY, GLColor(250, 200, 150, 100), GL_RGB10_A2,
>+             GL_UNSIGNED_INT_2_10_10_10_REV, false, false, false, GLColor(250, 200, 150, 85));
>+    testCopy(GL_TEXTURE_2D_ARRAY, GLColor(250, 200, 150, 200), GL_RGB10_A2,
>+             GL_UNSIGNED_INT_2_10_10_10_REV, false, true, false, GLColor(196, 157, 118, 170));
>+    testCopy(GL_TEXTURE_2D_ARRAY, GLColor(100, 150, 250, 200), GL_RGB10_A2,
>+             GL_UNSIGNED_INT_2_10_10_10_REV, false, false, true, GLColor(128, 191, 255, 170));
>+}
>+
>+// Test passthrough, premultiply alpha, and unmultiply alpha copies for GL_TEXTURE_2D_ARRAY with
>+// unsigned byte formats.
>+TEST_P(Texture2DArrayCopy, UnsignedByteFormats)
>+{
>+    ANGLE_SKIP_TEST_IF(!checkExtensions());
>+
>+    // Flay on Windows D3D11. http://anglebug.com/2896
>+    ANGLE_SKIP_TEST_IF(IsWindows() && IsD3D11());
>+
>+    testCopy(GL_TEXTURE_2D_ARRAY, GLColor(250, 200, 150, 100), GL_R8, GL_UNSIGNED_BYTE, false,
>+             false, false, GLColor(250, 0, 0, 255));
>+    testCopy(GL_TEXTURE_2D_ARRAY, GLColor(250, 200, 150, 100), GL_R8, GL_UNSIGNED_BYTE, false, true,
>+             false, GLColor(98, 0, 0, 255));
>+    testCopy(GL_TEXTURE_2D_ARRAY, GLColor(250, 200, 150, 100), GL_R8, GL_UNSIGNED_BYTE, false,
>+             false, true, GLColor(255, 0, 0, 255));
>+
>+    testCopy(GL_TEXTURE_2D_ARRAY, GLColor(250, 200, 150, 100), GL_RG8, GL_UNSIGNED_BYTE, false,
>+             false, false, GLColor(250, 200, 0, 255));
>+    testCopy(GL_TEXTURE_2D_ARRAY, GLColor(250, 200, 150, 100), GL_RG8, GL_UNSIGNED_BYTE, false,
>+             true, false, GLColor(98, 78, 0, 255));
>+    testCopy(GL_TEXTURE_2D_ARRAY, GLColor(250, 200, 150, 100), GL_RG8, GL_UNSIGNED_BYTE, false,
>+             false, true, GLColor(255, 255, 0, 255));
>+
>+    testCopy(GL_TEXTURE_2D_ARRAY, GLColor(250, 200, 150, 100), GL_RGB8, GL_UNSIGNED_BYTE, false,
>+             false, false, GLColor(250, 200, 150, 255));
>+    testCopy(GL_TEXTURE_2D_ARRAY, GLColor(250, 200, 150, 100), GL_RGB8, GL_UNSIGNED_BYTE, false,
>+             true, false, GLColor(98, 78, 59, 255));
>+    testCopy(GL_TEXTURE_2D_ARRAY, GLColor(250, 200, 150, 100), GL_RGB8, GL_UNSIGNED_BYTE, false,
>+             false, true, GLColor(255, 255, 255, 255));
>+
>+    testCopy(GL_TEXTURE_2D_ARRAY, GLColor(250, 200, 150, 100), GL_RGBA8, GL_UNSIGNED_BYTE, false,
>+             false, false, GLColor(250, 200, 150, 100));
>+    testCopy(GL_TEXTURE_2D_ARRAY, GLColor(250, 200, 150, 100), GL_RGBA8, GL_UNSIGNED_BYTE, false,
>+             true, false, GLColor(98, 78, 59, 100));
>+    testCopy(GL_TEXTURE_2D_ARRAY, GLColor(250, 200, 150, 100), GL_RGBA8, GL_UNSIGNED_BYTE, false,
>+             false, true, GLColor(255, 255, 255, 100));
>+
>+    testCopy(GL_TEXTURE_2D_ARRAY, GLColor(250, 200, 150, 100), GL_RGBA4, GL_UNSIGNED_BYTE, false,
>+             false, false, GLColor(255, 204, 153, 102));
>+    testCopy(GL_TEXTURE_2D_ARRAY, GLColor(250, 200, 150, 100), GL_RGBA4, GL_UNSIGNED_BYTE, false,
>+             true, false, GLColor(102, 85, 51, 102));
>+    testCopy(GL_TEXTURE_2D_ARRAY, GLColor(100, 150, 200, 210), GL_RGBA4, GL_UNSIGNED_BYTE, false,
>+             false, true, GLColor(119, 187, 238, 204));
>+
>+    testCopy(GL_TEXTURE_2D_ARRAY, GLColor(250, 200, 150, 100), GL_RGBA4, GL_UNSIGNED_SHORT_4_4_4_4,
>+             false, false, false, GLColor(255, 204, 153, 102));
>+    testCopy(GL_TEXTURE_2D_ARRAY, GLColor(250, 200, 150, 100), GL_RGBA4, GL_UNSIGNED_SHORT_4_4_4_4,
>+             false, true, false, GLColor(102, 85, 51, 102));
>+    testCopy(GL_TEXTURE_2D_ARRAY, GLColor(100, 150, 200, 210), GL_RGBA4, GL_UNSIGNED_SHORT_4_4_4_4,
>+             false, false, true, GLColor(119, 187, 238, 204));
>+
>+    testCopy(GL_TEXTURE_2D_ARRAY, GLColor(250, 200, 150, 200), GL_RGB5_A1, GL_UNSIGNED_BYTE, false,
>+             false, false, GLColor(247, 198, 148, 255));
>+    testCopy(GL_TEXTURE_2D_ARRAY, GLColor(250, 200, 150, 100), GL_RGB5_A1, GL_UNSIGNED_BYTE, false,
>+             true, false, GLColor(99, 82, 57, 0));
>+    testCopy(GL_TEXTURE_2D_ARRAY, GLColor(250, 200, 150, 100), GL_RGB5_A1, GL_UNSIGNED_BYTE, false,
>+             false, true, GLColor(255, 255, 255, 0));
>+
>+    testCopy(GL_TEXTURE_2D_ARRAY, GLColor(250, 200, 150, 200), GL_RGB5_A1,
>+             GL_UNSIGNED_INT_2_10_10_10_REV, false, false, false, GLColor(247, 198, 148, 255));
>+    testCopy(GL_TEXTURE_2D_ARRAY, GLColor(250, 200, 150, 200), GL_RGB5_A1,
>+             GL_UNSIGNED_INT_2_10_10_10_REV, false, true, false, GLColor(198, 156, 115, 255));
>+    testCopy(GL_TEXTURE_2D_ARRAY, GLColor(100, 150, 250, 200), GL_RGB5_A1,
>+             GL_UNSIGNED_INT_2_10_10_10_REV, false, false, true, GLColor(132, 189, 255, 255));
>+
>+    testCopy(GL_TEXTURE_2D_ARRAY, GLColor(250, 200, 150, 200), GL_RGB5_A1,
>+             GL_UNSIGNED_SHORT_5_5_5_1, false, false, false, GLColor(247, 198, 148, 255));
>+    testCopy(GL_TEXTURE_2D_ARRAY, GLColor(250, 200, 150, 200), GL_RGB5_A1,
>+             GL_UNSIGNED_SHORT_5_5_5_1, false, true, false, GLColor(198, 156, 115, 255));
>+    testCopy(GL_TEXTURE_2D_ARRAY, GLColor(100, 150, 250, 200), GL_RGB5_A1,
>+             GL_UNSIGNED_SHORT_5_5_5_1, false, false, true, GLColor(132, 189, 255, 255));
>+
>+    testCopy(GL_TEXTURE_2D_ARRAY, GLColor(250, 200, 150, 200), GL_RGB565, GL_UNSIGNED_BYTE, false,
>+             false, false, GLColor(247, 199, 148, 255));
>+    testCopy(GL_TEXTURE_2D_ARRAY, GLColor(250, 200, 150, 200), GL_RGB565, GL_UNSIGNED_BYTE, false,
>+             true, false, GLColor(198, 158, 115, 255));
>+    testCopy(GL_TEXTURE_2D_ARRAY, GLColor(100, 150, 250, 200), GL_RGB565, GL_UNSIGNED_BYTE, false,
>+             false, true, GLColor(132, 190, 255, 255));
>+
>+    testCopy(GL_TEXTURE_2D_ARRAY, GLColor(250, 200, 150, 200), GL_RGB565, GL_UNSIGNED_SHORT_5_6_5,
>+             false, false, false, GLColor(247, 199, 148, 255));
>+    testCopy(GL_TEXTURE_2D_ARRAY, GLColor(250, 200, 150, 200), GL_RGB565, GL_UNSIGNED_SHORT_5_6_5,
>+             false, true, false, GLColor(198, 158, 115, 255));
>+    testCopy(GL_TEXTURE_2D_ARRAY, GLColor(100, 150, 250, 200), GL_RGB565, GL_UNSIGNED_SHORT_5_6_5,
>+             false, false, true, GLColor(132, 190, 255, 255));
>+
>+    ANGLE_SKIP_TEST_IF(IsAMD() && IsWindows() && IsD3D11());
>+
>+    testCopy(GL_TEXTURE_2D_ARRAY, GLColor(250, 200, 150, 100), GL_SRGB8, GL_UNSIGNED_BYTE, false,
>+             false, false, GLColor(244, 148, 78, 255));
>+    testCopy(GL_TEXTURE_2D_ARRAY, GLColor(250, 200, 150, 100), GL_SRGB8, GL_UNSIGNED_BYTE, false,
>+             true, false, GLColor(31, 19, 11, 255));
>+    testCopy(GL_TEXTURE_2D_ARRAY, GLColor(250, 200, 150, 100), GL_SRGB8, GL_UNSIGNED_BYTE, false,
>+             false, true, GLColor(52, 253, 53, 255));
>+
>+    testCopy(GL_TEXTURE_2D_ARRAY, GLColor(250, 200, 150, 100), GL_SRGB8_ALPHA8, GL_UNSIGNED_BYTE,
>+             false, false, false, GLColor(244, 148, 78, 100));
>+    testCopy(GL_TEXTURE_2D_ARRAY, GLColor(250, 200, 150, 100), GL_SRGB8_ALPHA8, GL_UNSIGNED_BYTE,
>+             false, true, false, GLColor(31, 19, 11, 100));
>+    testCopy(GL_TEXTURE_2D_ARRAY, GLColor(250, 200, 150, 100), GL_SRGB8_ALPHA8, GL_UNSIGNED_BYTE,
>+             false, false, true, GLColor(52, 253, 53, 100));
>+}
>+
>+// Test passthrough, premultiply alpha, and unmultiply alpha copies for GL_TEXTURE_2D_ARRAY with
>+// float formats.
>+TEST_P(Texture2DArrayCopy, FloatFormats)
>+{
>+    ANGLE_SKIP_TEST_IF(!checkExtensions());
>+
>+    // http://anglebug.com/2865
>+    ANGLE_SKIP_TEST_IF(IsWindows() && IsNVIDIA() && IsD3D11());
>+
>+    std::vector<GLenum> floatTypes = {GL_FLOAT, GL_HALF_FLOAT, GL_UNSIGNED_INT_10F_11F_11F_REV,
>+                                      GL_UNSIGNED_INT_5_9_9_9_REV};
>+
>+    for (GLenum floatType : floatTypes)
>+    {
>+        if (floatType != GL_UNSIGNED_INT_5_9_9_9_REV &&
>+            floatType != GL_UNSIGNED_INT_10F_11F_11F_REV)
>+        {
>+            testCopy(GL_TEXTURE_2D_ARRAY, GLColor(210, 200, 150, 235), GL_R16F, floatType, false,
>+                     false, false, GLColor(210, 0, 0, 255));
>+            testCopy(GL_TEXTURE_2D_ARRAY, GLColor(210, 200, 150, 235), GL_R16F, floatType, false,
>+                     true, false, GLColor(191, 0, 0, 255));
>+            testCopy(GL_TEXTURE_2D_ARRAY, GLColor(210, 200, 150, 235), GL_R16F, floatType, false,
>+                     false, true, GLColor(227, 0, 0, 255));
>+
>+            testCopy(GL_TEXTURE_2D_ARRAY, GLColor(210, 200, 150, 235), GL_RG16F, floatType, false,
>+                     false, false, GLColor(210, 200, 0, 255));
>+            testCopy(GL_TEXTURE_2D_ARRAY, GLColor(210, 200, 150, 235), GL_RG16F, floatType, false,
>+                     true, false, GLColor(191, 184, 0, 255));
>+            testCopy(GL_TEXTURE_2D_ARRAY, GLColor(210, 200, 150, 235), GL_RG16F, floatType, false,
>+                     false, true, GLColor(227, 217, 0, 255));
>+
>+            testCopy(GL_TEXTURE_2D_ARRAY, GLColor(210, 200, 150, 235), GL_RGB16F, floatType, false,
>+                     false, false, GLColor(210, 200, 150, 255));
>+            testCopy(GL_TEXTURE_2D_ARRAY, GLColor(210, 200, 150, 235), GL_RGB16F, floatType, false,
>+                     true, false, GLColor(191, 184, 138, 255));
>+            testCopy(GL_TEXTURE_2D_ARRAY, GLColor(210, 200, 150, 235), GL_RGB16F, floatType, false,
>+                     false, true, GLColor(227, 217, 161, 255));
>+
>+            testCopy(GL_TEXTURE_2D_ARRAY, GLColor(210, 200, 150, 235), GL_RGBA16F, floatType, false,
>+                     false, false, GLColor(210, 200, 150, 235));
>+            testCopy(GL_TEXTURE_2D_ARRAY, GLColor(210, 200, 150, 235), GL_RGBA16F, floatType, false,
>+                     true, false, GLColor(191, 184, 138, 235));
>+            testCopy(GL_TEXTURE_2D_ARRAY, GLColor(210, 200, 150, 235), GL_RGBA16F, floatType, false,
>+                     false, true, GLColor(227, 217, 161, 235));
>+        }
>+
>+        if (floatType != GL_UNSIGNED_INT_5_9_9_9_REV)
>+        {
>+            testCopy(GL_TEXTURE_2D_ARRAY, GLColor(210, 200, 150, 235), GL_R11F_G11F_B10F, floatType,
>+                     false, false, false, GLColor(210, 200, 148, 255));
>+            testCopy(GL_TEXTURE_2D_ARRAY, GLColor(210, 200, 150, 235), GL_R11F_G11F_B10F, floatType,
>+                     false, true, false, GLColor(191, 184, 138, 255));
>+            testCopy(GL_TEXTURE_2D_ARRAY, GLColor(210, 200, 150, 235), GL_R11F_G11F_B10F, floatType,
>+                     false, false, true, GLColor(227, 217, 161, 255));
>+        }
>+
>+        if (floatType != GL_UNSIGNED_INT_10F_11F_11F_REV)
>+        {
>+            testCopy(GL_TEXTURE_2D_ARRAY, GLColor(210, 200, 150, 235), GL_RGB9_E5, floatType, false,
>+                     false, false, GLColor(210, 200, 148, 255));
>+            testCopy(GL_TEXTURE_2D_ARRAY, GLColor(210, 200, 150, 235), GL_RGB9_E5, floatType, false,
>+                     true, false, GLColor(192, 184, 138, 255));
>+            testCopy(GL_TEXTURE_2D_ARRAY, GLColor(210, 200, 150, 235), GL_RGB9_E5, floatType, false,
>+                     false, true, GLColor(227, 217, 161, 255));
>+        }
>+    }
>+
>+    testCopy(GL_TEXTURE_2D_ARRAY, GLColor(210, 200, 150, 235), GL_R32F, GL_FLOAT, false, false,
>+             false, GLColor(210, 0, 0, 255));
>+    testCopy(GL_TEXTURE_2D_ARRAY, GLColor(210, 200, 150, 235), GL_R32F, GL_FLOAT, false, true,
>+             false, GLColor(191, 0, 0, 255));
>+    testCopy(GL_TEXTURE_2D_ARRAY, GLColor(210, 200, 150, 235), GL_R32F, GL_FLOAT, false, false,
>+             true, GLColor(227, 0, 0, 255));
>+
>+    testCopy(GL_TEXTURE_2D_ARRAY, GLColor(210, 200, 150, 235), GL_RG32F, GL_FLOAT, false, false,
>+             false, GLColor(210, 200, 0, 255));
>+    testCopy(GL_TEXTURE_2D_ARRAY, GLColor(210, 200, 150, 235), GL_RG32F, GL_FLOAT, false, true,
>+             false, GLColor(191, 184, 0, 255));
>+    testCopy(GL_TEXTURE_2D_ARRAY, GLColor(210, 200, 150, 235), GL_RG32F, GL_FLOAT, false, false,
>+             true, GLColor(227, 217, 0, 255));
>+
>+    testCopy(GL_TEXTURE_2D_ARRAY, GLColor(210, 200, 150, 235), GL_RGB32F, GL_FLOAT, false, false,
>+             false, GLColor(210, 200, 150, 255));
>+    testCopy(GL_TEXTURE_2D_ARRAY, GLColor(210, 200, 150, 235), GL_RGB32F, GL_FLOAT, false, true,
>+             false, GLColor(191, 184, 138, 255));
>+    testCopy(GL_TEXTURE_2D_ARRAY, GLColor(210, 200, 150, 235), GL_RGB32F, GL_FLOAT, false, false,
>+             true, GLColor(227, 217, 161, 255));
>+
>+    testCopy(GL_TEXTURE_2D_ARRAY, GLColor(210, 200, 150, 235), GL_RGBA32F, GL_FLOAT, false, false,
>+             false, GLColor(210, 200, 150, 235));
>+    testCopy(GL_TEXTURE_2D_ARRAY, GLColor(210, 200, 150, 235), GL_RGBA32F, GL_FLOAT, false, true,
>+             false, GLColor(191, 184, 138, 235));
>+    testCopy(GL_TEXTURE_2D_ARRAY, GLColor(210, 200, 150, 235), GL_RGBA32F, GL_FLOAT, false, false,
>+             true, GLColor(227, 217, 161, 235));
>+}
>+
>+// Test passthrough, premultiply alpha, and unmultiply alpha copies for GL_TEXTURE_2D_ARRAY with
>+// integer formats.
>+TEST_P(Texture2DArrayCopy, IntFormats)
>+{
>+    ANGLE_SKIP_TEST_IF(!checkExtensions());
>+
>+    constexpr char kFS[] =
>+        "#version 300 es\n"
>+        "precision highp float;\n"
>+        "uniform highp isampler2DArray tex2DArray;\n"
>+        "in vec3 texcoord;\n"
>+        "out ivec4 fragColor;\n"
>+        "void main()\n"
>+        "{\n"
>+        "    fragColor = texture(tex2DArray, vec3(texcoord.x, texcoord.z, texcoord.y));\n"
>+        "}\n";
>+
>+    mProgram = CompileProgram(getVertexShaderSource(), kFS);
>+    ASSERT_NE(0u, mProgram);
>+    ASSERT_GL_NO_ERROR();
>+
>+    glUseProgram(mProgram);
>+
>+    // Pixels will be read as if the most significant bit is data, not the sign. The expected colors
>+    // reflect this.
>+    testCopy(GL_TEXTURE_2D_ARRAY, GLColor(255, 140, 150, 230), GL_R8I, GL_BYTE, false, false, false,
>+             GLColor(127, 0, 0, 1));
>+    testCopy(GL_TEXTURE_2D_ARRAY, GLColor(255, 140, 150, 230), GL_R8I, GL_BYTE, false, true, false,
>+             GLColor(115, 0, 0, 1));
>+    testCopy(GL_TEXTURE_2D_ARRAY, GLColor(255, 140, 150, 230), GL_R8I, GL_BYTE, false, false, true,
>+             GLColor(127, 0, 0, 1));
>+
>+    testCopy(GL_TEXTURE_2D_ARRAY, GLColor(255, 140, 150, 230), GL_R16I, GL_SHORT, false, false,
>+             false, GLColor(127, 0, 0, 1));
>+    testCopy(GL_TEXTURE_2D_ARRAY, GLColor(255, 140, 150, 230), GL_R16I, GL_SHORT, false, true,
>+             false, GLColor(115, 0, 0, 1));
>+    testCopy(GL_TEXTURE_2D_ARRAY, GLColor(255, 140, 150, 230), GL_R16I, GL_SHORT, false, false,
>+             true, GLColor(127, 0, 0, 1));
>+
>+    testCopy(GL_TEXTURE_2D_ARRAY, GLColor(255, 140, 150, 230), GL_R32I, GL_INT, false, false, false,
>+             GLColor(127, 0, 0, 1));
>+    testCopy(GL_TEXTURE_2D_ARRAY, GLColor(255, 140, 150, 230), GL_R32I, GL_INT, false, true, false,
>+             GLColor(115, 0, 0, 1));
>+    testCopy(GL_TEXTURE_2D_ARRAY, GLColor(255, 140, 150, 230), GL_R32I, GL_INT, false, false, true,
>+             GLColor(127, 0, 0, 1));
>+
>+    testCopy(GL_TEXTURE_2D_ARRAY, GLColor(255, 140, 150, 230), GL_RG8I, GL_BYTE, false, false,
>+             false, GLColor(127, 70, 0, 1));
>+    testCopy(GL_TEXTURE_2D_ARRAY, GLColor(255, 140, 150, 230), GL_RG8I, GL_BYTE, false, true, false,
>+             GLColor(115, 63, 0, 1));
>+    testCopy(GL_TEXTURE_2D_ARRAY, GLColor(255, 140, 150, 230), GL_RG8I, GL_BYTE, false, false, true,
>+             GLColor(127, 77, 0, 1));
>+
>+    testCopy(GL_TEXTURE_2D_ARRAY, GLColor(255, 140, 150, 230), GL_RG16I, GL_SHORT, false, false,
>+             false, GLColor(127, 70, 0, 1));
>+    testCopy(GL_TEXTURE_2D_ARRAY, GLColor(255, 140, 150, 230), GL_RG16I, GL_SHORT, false, true,
>+             false, GLColor(115, 63, 0, 1));
>+    testCopy(GL_TEXTURE_2D_ARRAY, GLColor(255, 140, 150, 230), GL_RG16I, GL_SHORT, false, false,
>+             true, GLColor(127, 77, 0, 1));
>+
>+    testCopy(GL_TEXTURE_2D_ARRAY, GLColor(255, 140, 150, 230), GL_RG32I, GL_INT, false, false,
>+             false, GLColor(127, 70, 0, 1));
>+    testCopy(GL_TEXTURE_2D_ARRAY, GLColor(255, 140, 150, 230), GL_RG32I, GL_INT, false, true, false,
>+             GLColor(115, 63, 0, 1));
>+    testCopy(GL_TEXTURE_2D_ARRAY, GLColor(255, 140, 150, 230), GL_RG32I, GL_INT, false, false, true,
>+             GLColor(127, 77, 0, 1));
>+
>+    testCopy(GL_TEXTURE_2D_ARRAY, GLColor(255, 140, 150, 230), GL_RGB8I, GL_BYTE, false, false,
>+             false, GLColor(127, 70, 75, 1));
>+    testCopy(GL_TEXTURE_2D_ARRAY, GLColor(255, 140, 150, 230), GL_RGB8I, GL_BYTE, false, true,
>+             false, GLColor(115, 63, 67, 1));
>+    testCopy(GL_TEXTURE_2D_ARRAY, GLColor(255, 140, 150, 230), GL_RGB8I, GL_BYTE, false, false,
>+             true, GLColor(127, 77, 83, 1));
>+
>+    testCopy(GL_TEXTURE_2D_ARRAY, GLColor(255, 140, 150, 230), GL_RGB16I, GL_SHORT, false, false,
>+             false, GLColor(127, 70, 75, 1));
>+    testCopy(GL_TEXTURE_2D_ARRAY, GLColor(255, 140, 150, 230), GL_RGB16I, GL_SHORT, false, true,
>+             false, GLColor(115, 63, 67, 1));
>+    testCopy(GL_TEXTURE_2D_ARRAY, GLColor(255, 140, 150, 230), GL_RGB16I, GL_SHORT, false, false,
>+             true, GLColor(127, 77, 83, 1));
>+
>+    testCopy(GL_TEXTURE_2D_ARRAY, GLColor(255, 140, 150, 230), GL_RGB32I, GL_INT, false, false,
>+             false, GLColor(127, 70, 75, 1));
>+    testCopy(GL_TEXTURE_2D_ARRAY, GLColor(255, 140, 150, 230), GL_RGB32I, GL_INT, false, true,
>+             false, GLColor(115, 63, 67, 1));
>+    testCopy(GL_TEXTURE_2D_ARRAY, GLColor(255, 140, 150, 230), GL_RGB32I, GL_INT, false, false,
>+             true, GLColor(127, 77, 83, 1));
>+
>+    testCopy(GL_TEXTURE_2D_ARRAY, GLColor(255, 140, 150, 230), GL_RGBA8I, GL_BYTE, false, false,
>+             false, GLColor(127, 70, 75, 115));
>+    testCopy(GL_TEXTURE_2D_ARRAY, GLColor(255, 140, 150, 230), GL_RGBA8I, GL_BYTE, false, true,
>+             false, GLColor(115, 63, 67, 115));
>+    testCopy(GL_TEXTURE_2D_ARRAY, GLColor(255, 140, 150, 230), GL_RGBA8I, GL_BYTE, false, false,
>+             true, GLColor(127, 77, 83, 115));
>+
>+    testCopy(GL_TEXTURE_2D_ARRAY, GLColor(255, 140, 150, 230), GL_RGBA16I, GL_SHORT, false, false,
>+             false, GLColor(127, 70, 75, 115));
>+    testCopy(GL_TEXTURE_2D_ARRAY, GLColor(255, 140, 150, 230), GL_RGBA16I, GL_SHORT, false, true,
>+             false, GLColor(115, 63, 67, 115));
>+    testCopy(GL_TEXTURE_2D_ARRAY, GLColor(255, 140, 150, 230), GL_RGBA16I, GL_SHORT, false, false,
>+             true, GLColor(127, 77, 83, 115));
>+
>+    testCopy(GL_TEXTURE_2D_ARRAY, GLColor(255, 140, 150, 230), GL_RGBA32I, GL_INT, false, false,
>+             false, GLColor(127, 70, 75, 115));
>+    testCopy(GL_TEXTURE_2D_ARRAY, GLColor(255, 140, 150, 230), GL_RGBA32I, GL_INT, false, true,
>+             false, GLColor(115, 63, 67, 115));
>+    testCopy(GL_TEXTURE_2D_ARRAY, GLColor(255, 140, 150, 230), GL_RGBA32I, GL_INT, false, false,
>+             true, GLColor(127, 77, 83, 115));
>+}
>+
>+// Test passthrough, premultiply alpha, and unmultiply alpha copies for GL_TEXTURE_2D_ARRAY with
>+// unsigned integer formats.
>+TEST_P(Texture2DArrayCopy, UintFormats)
>+{
>+    ANGLE_SKIP_TEST_IF(!checkExtensions());
>+
>+    constexpr char kFS[] =
>+        "#version 300 es\n"
>+        "precision highp float;\n"
>+        "uniform highp usampler2DArray tex2DArray;\n"
>+        "in vec3 texcoord;\n"
>+        "out uvec4 fragColor;\n"
>+        "void main()\n"
>+        "{\n"
>+        "    fragColor = texture(tex2DArray, vec3(texcoord.x, texcoord.z, texcoord.y));\n"
>+        "}\n";
>+
>+    mProgram = CompileProgram(getVertexShaderSource(), kFS);
>+    ASSERT_NE(0u, mProgram);
>+    ASSERT_GL_NO_ERROR();
>+
>+    glUseProgram(mProgram);
>+
>+    testCopy(GL_TEXTURE_2D_ARRAY, GLColor(128, 84, 32, 100), GL_R8UI, GL_UNSIGNED_BYTE, false,
>+             false, false, GLColor(128, 0, 0, 1));
>+    testCopy(GL_TEXTURE_2D_ARRAY, GLColor(128, 84, 32, 100), GL_R8UI, GL_UNSIGNED_BYTE, false, true,
>+             false, GLColor(50, 0, 0, 1));
>+    testCopy(GL_TEXTURE_2D_ARRAY, GLColor(128, 84, 32, 100), GL_R8UI, GL_UNSIGNED_BYTE, false,
>+             false, true, GLColor(255, 0, 0, 1));
>+
>+    testCopy(GL_TEXTURE_2D_ARRAY, GLColor(128, 84, 32, 100), GL_R16UI, GL_UNSIGNED_SHORT, false,
>+             false, false, GLColor(128, 0, 0, 1));
>+    testCopy(GL_TEXTURE_2D_ARRAY, GLColor(128, 84, 32, 100), GL_R16UI, GL_UNSIGNED_SHORT, false,
>+             true, false, GLColor(50, 0, 0, 1));
>+    testCopy(GL_TEXTURE_2D_ARRAY, GLColor(128, 84, 32, 100), GL_R16UI, GL_UNSIGNED_SHORT, false,
>+             false, true, GLColor(255, 0, 0, 1));
>+
>+    testCopy(GL_TEXTURE_2D_ARRAY, GLColor(128, 84, 32, 100), GL_R32UI, GL_UNSIGNED_INT, false,
>+             false, false, GLColor(128, 0, 0, 1));
>+    testCopy(GL_TEXTURE_2D_ARRAY, GLColor(128, 84, 32, 100), GL_R32UI, GL_UNSIGNED_INT, false, true,
>+             false, GLColor(50, 0, 0, 1));
>+    testCopy(GL_TEXTURE_2D_ARRAY, GLColor(128, 84, 32, 100), GL_R32UI, GL_UNSIGNED_INT, false,
>+             false, true, GLColor(255, 0, 0, 1));
>+
>+    testCopy(GL_TEXTURE_2D_ARRAY, GLColor(128, 84, 32, 100), GL_RG8UI, GL_UNSIGNED_BYTE, false,
>+             false, false, GLColor(128, 84, 0, 1));
>+    testCopy(GL_TEXTURE_2D_ARRAY, GLColor(128, 84, 32, 100), GL_RG8UI, GL_UNSIGNED_BYTE, false,
>+             true, false, GLColor(50, 32, 0, 1));
>+    testCopy(GL_TEXTURE_2D_ARRAY, GLColor(128, 84, 32, 100), GL_RG8UI, GL_UNSIGNED_BYTE, false,
>+             false, true, GLColor(255, 214, 0, 1));
>+
>+    testCopy(GL_TEXTURE_2D_ARRAY, GLColor(128, 84, 32, 100), GL_RG16UI, GL_UNSIGNED_SHORT, false,
>+             false, false, GLColor(128, 84, 0, 1));
>+    testCopy(GL_TEXTURE_2D_ARRAY, GLColor(128, 84, 32, 100), GL_RG16UI, GL_UNSIGNED_SHORT, false,
>+             true, false, GLColor(50, 32, 0, 1));
>+    testCopy(GL_TEXTURE_2D_ARRAY, GLColor(128, 84, 32, 100), GL_RG16UI, GL_UNSIGNED_SHORT, false,
>+             false, true, GLColor(255, 214, 0, 1));
>+
>+    testCopy(GL_TEXTURE_2D_ARRAY, GLColor(128, 84, 32, 100), GL_RG32UI, GL_UNSIGNED_INT, false,
>+             false, false, GLColor(128, 84, 0, 1));
>+    testCopy(GL_TEXTURE_2D_ARRAY, GLColor(128, 84, 32, 100), GL_RG32UI, GL_UNSIGNED_INT, false,
>+             true, false, GLColor(50, 32, 0, 1));
>+    testCopy(GL_TEXTURE_2D_ARRAY, GLColor(128, 84, 32, 100), GL_RG32UI, GL_UNSIGNED_INT, false,
>+             false, true, GLColor(255, 214, 0, 1));
>+
>+    testCopy(GL_TEXTURE_2D_ARRAY, GLColor(128, 84, 32, 100), GL_RGB8UI, GL_UNSIGNED_BYTE, false,
>+             false, false, GLColor(128, 84, 32, 1));
>+    testCopy(GL_TEXTURE_2D_ARRAY, GLColor(128, 84, 32, 100), GL_RGB8UI, GL_UNSIGNED_BYTE, false,
>+             true, false, GLColor(50, 32, 12, 1));
>+    testCopy(GL_TEXTURE_2D_ARRAY, GLColor(128, 84, 32, 100), GL_RGB8UI, GL_UNSIGNED_BYTE, false,
>+             false, true, GLColor(255, 214, 81, 1));
>+
>+    testCopy(GL_TEXTURE_2D_ARRAY, GLColor(128, 84, 32, 100), GL_RGB16UI, GL_UNSIGNED_SHORT, false,
>+             false, false, GLColor(128, 84, 32, 1));
>+    testCopy(GL_TEXTURE_2D_ARRAY, GLColor(128, 84, 32, 100), GL_RGB16UI, GL_UNSIGNED_SHORT, false,
>+             true, false, GLColor(50, 32, 12, 1));
>+    testCopy(GL_TEXTURE_2D_ARRAY, GLColor(128, 84, 32, 100), GL_RGB16UI, GL_UNSIGNED_SHORT, false,
>+             false, true, GLColor(255, 214, 81, 1));
>+
>+    testCopy(GL_TEXTURE_2D_ARRAY, GLColor(128, 84, 32, 100), GL_RGB32UI, GL_UNSIGNED_INT, false,
>+             false, false, GLColor(128, 84, 32, 1));
>+    testCopy(GL_TEXTURE_2D_ARRAY, GLColor(128, 84, 32, 100), GL_RGB32UI, GL_UNSIGNED_INT, false,
>+             true, false, GLColor(50, 32, 12, 1));
>+    testCopy(GL_TEXTURE_2D_ARRAY, GLColor(128, 84, 32, 100), GL_RGB32UI, GL_UNSIGNED_INT, false,
>+             false, true, GLColor(255, 214, 81, 1));
>+
>+    testCopy(GL_TEXTURE_2D_ARRAY, GLColor(128, 84, 32, 100), GL_RGBA8UI, GL_UNSIGNED_BYTE, false,
>+             false, false, GLColor(128, 84, 32, 100));
>+    testCopy(GL_TEXTURE_2D_ARRAY, GLColor(128, 84, 32, 100), GL_RGBA8UI, GL_UNSIGNED_BYTE, false,
>+             true, false, GLColor(50, 32, 12, 100));
>+    testCopy(GL_TEXTURE_2D_ARRAY, GLColor(128, 84, 32, 100), GL_RGBA8UI, GL_UNSIGNED_BYTE, false,
>+             false, true, GLColor(255, 214, 81, 100));
>+
>+    testCopy(GL_TEXTURE_2D_ARRAY, GLColor(128, 84, 32, 100), GL_RGBA16UI, GL_UNSIGNED_SHORT, false,
>+             false, false, GLColor(128, 84, 32, 100));
>+    testCopy(GL_TEXTURE_2D_ARRAY, GLColor(128, 84, 32, 100), GL_RGBA16UI, GL_UNSIGNED_SHORT, false,
>+             true, false, GLColor(50, 32, 12, 100));
>+    testCopy(GL_TEXTURE_2D_ARRAY, GLColor(128, 84, 32, 100), GL_RGBA16UI, GL_UNSIGNED_SHORT, false,
>+             false, true, GLColor(255, 214, 81, 100));
>+
>+    testCopy(GL_TEXTURE_2D_ARRAY, GLColor(128, 84, 32, 100), GL_RGBA32UI, GL_UNSIGNED_INT, false,
>+             false, false, GLColor(128, 84, 32, 100));
>+    testCopy(GL_TEXTURE_2D_ARRAY, GLColor(128, 84, 32, 100), GL_RGBA32UI, GL_UNSIGNED_INT, false,
>+             true, false, GLColor(50, 32, 12, 100));
>+    testCopy(GL_TEXTURE_2D_ARRAY, GLColor(128, 84, 32, 100), GL_RGBA32UI, GL_UNSIGNED_INT, false,
>+             false, true, GLColor(255, 214, 81, 100));
>+
>+    testCopy(GL_TEXTURE_2D_ARRAY, GLColor(128, 84, 32, 100), GL_RGB10_A2UI,
>+             GL_UNSIGNED_INT_2_10_10_10_REV, false, false, false, GLColor(128, 84, 32, 3));
>+    testCopy(GL_TEXTURE_2D_ARRAY, GLColor(128, 84, 32, 100), GL_RGB10_A2UI,
>+             GL_UNSIGNED_INT_2_10_10_10_REV, false, true, false, GLColor(50, 32, 12, 3));
>+    testCopy(GL_TEXTURE_2D_ARRAY, GLColor(128, 84, 32, 100), GL_RGB10_A2UI,
>+             GL_UNSIGNED_INT_2_10_10_10_REV, false, false, true, GLColor(255, 214, 81, 3));
>+}
>+
>+ANGLE_INSTANTIATE_TEST(Texture3DCopy, ES3_D3D11());
>+ANGLE_INSTANTIATE_TEST(Texture2DArrayCopy, ES3_D3D11());
>+
>+}  // namespace angle
>diff --git a/Source/ThirdParty/ANGLE/src/tests/gl_tests/CopyTextureTest.cpp b/Source/ThirdParty/ANGLE/src/tests/gl_tests/CopyTextureTest.cpp
>index c8c6d136699..2f1fac5cf96 100644
>--- a/Source/ThirdParty/ANGLE/src/tests/gl_tests/CopyTextureTest.cpp
>+++ b/Source/ThirdParty/ANGLE/src/tests/gl_tests/CopyTextureTest.cpp
>@@ -43,7 +43,7 @@ class CopyTextureTest : public ANGLETest
>         glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, mTextures[1],
>                                0);
> 
>-        if (extensionEnabled("GL_CHROMIUM_copy_texture"))
>+        if (IsGLExtensionEnabled("GL_CHROMIUM_copy_texture"))
>         {
>             glCopyTextureCHROMIUM = reinterpret_cast<PFNGLCOPYTEXTURECHROMIUMPROC>(
>                 eglGetProcAddress("glCopyTextureCHROMIUM"));
>@@ -62,7 +62,7 @@ class CopyTextureTest : public ANGLETest
> 
>     bool checkExtensions() const
>     {
>-        if (!extensionEnabled("GL_CHROMIUM_copy_texture"))
>+        if (!IsGLExtensionEnabled("GL_CHROMIUM_copy_texture"))
>         {
>             std::cout << "Test skipped because GL_CHROMIUM_copy_texture is not available."
>                       << std::endl;
>@@ -74,8 +74,54 @@ class CopyTextureTest : public ANGLETest
>         return true;
>     }
> 
>+    void testGradientDownsampleUniqueValues(GLenum destFormat,
>+                                            GLenum destType,
>+                                            const std::array<size_t, 4> &expectedUniqueValues)
>+    {
>+        std::array<GLColor, 256> sourceGradient;
>+        for (size_t i = 0; i < sourceGradient.size(); i++)
>+        {
>+            GLubyte value     = static_cast<GLubyte>(i);
>+            sourceGradient[i] = GLColor(value, value, value, value);
>+        }
>+        GLTexture sourceTexture;
>+        glBindTexture(GL_TEXTURE_2D, sourceTexture);
>+        glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, 256, 1, 0, GL_RGBA, GL_UNSIGNED_BYTE,
>+                     sourceGradient.data());
>+
>+        GLTexture destTexture;
>+        glBindTexture(GL_TEXTURE_2D, destTexture);
>+        glCopyTextureCHROMIUM(sourceTexture, 0, GL_TEXTURE_2D, destTexture, 0, destFormat, destType,
>+                              GL_FALSE, GL_FALSE, GL_FALSE);
>+        EXPECT_GL_NO_ERROR();
>+
>+        GLFramebuffer fbo;
>+        glBindFramebuffer(GL_FRAMEBUFFER, fbo);
>+        glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, destTexture, 0);
>+
>+        std::array<GLColor, 256> destData;
>+        glReadPixels(0, 0, 256, 1, GL_RGBA, GL_UNSIGNED_BYTE, destData.data());
>+        EXPECT_GL_NO_ERROR();
>+
>+        std::set<GLubyte> uniqueValues[4];
>+        for (size_t i = 0; i < destData.size(); i++)
>+        {
>+            GLColor color = destData[i];
>+            uniqueValues[0].insert(color.R);
>+            uniqueValues[1].insert(color.G);
>+            uniqueValues[2].insert(color.B);
>+            uniqueValues[3].insert(color.A);
>+        }
>+
>+        EXPECT_EQ(expectedUniqueValues[0], uniqueValues[0].size());
>+        EXPECT_EQ(expectedUniqueValues[1], uniqueValues[1].size());
>+        EXPECT_EQ(expectedUniqueValues[2], uniqueValues[2].size());
>+        EXPECT_EQ(expectedUniqueValues[3], uniqueValues[3].size());
>+    }
>+
>     GLuint mTextures[2] = {
>-        0, 0,
>+        0,
>+        0,
>     };
>     GLuint mFramebuffer = 0;
> 
>@@ -83,63 +129,444 @@ class CopyTextureTest : public ANGLETest
>     PFNGLCOPYSUBTEXTURECHROMIUMPROC glCopySubTextureCHROMIUM = nullptr;
> };
> 
>-class CopyTextureTestDest : public CopyTextureTest
>-{
>-};
>+using CopyTextureVariationsTestParams =
>+    std::tuple<angle::PlatformParameters, GLenum, GLenum, bool, bool, bool>;
> 
>-class CopyTextureTestES3 : public CopyTextureTest
>+std::string CopyTextureVariationsTestPrint(
>+    const ::testing::TestParamInfo<CopyTextureVariationsTestParams> &paramsInfo)
> {
>-};
>+    const CopyTextureVariationsTestParams &params = paramsInfo.param;
>+    std::ostringstream out;
> 
>-// Test to ensure that the basic functionality of the extension works.
>-TEST_P(CopyTextureTest, BasicCopyTexture)
>-{
>-    if (!checkExtensions())
>+    out << std::get<0>(params) << '_';
>+
>+    switch (std::get<1>(params))
>     {
>-        return;
>+        case GL_ALPHA:
>+            out << "A";
>+            break;
>+        case GL_RGB:
>+            out << "RGB";
>+            break;
>+        case GL_RGBA:
>+            out << "RGBA";
>+            break;
>+        case GL_LUMINANCE:
>+            out << "L";
>+            break;
>+        case GL_LUMINANCE_ALPHA:
>+            out << "LA";
>+            break;
>+        case GL_BGRA_EXT:
>+            out << "BGRA";
>+            break;
>+        default:
>+            out << "UPDATE_THIS_SWITCH";
>     }
> 
>-    GLColor pixels = GLColor::red;
>-
>-    glBindTexture(GL_TEXTURE_2D, mTextures[0]);
>-    glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, 1, 1, 0, GL_RGBA, GL_UNSIGNED_BYTE, &pixels);
>+    out << "To";
> 
>-    glCopyTextureCHROMIUM(mTextures[0], 0, GL_TEXTURE_2D, mTextures[1], 0, GL_RGBA,
>-                          GL_UNSIGNED_BYTE, false, false, false);
>+    switch (std::get<2>(params))
>+    {
>+        case GL_RGB:
>+            out << "RGB";
>+            break;
>+        case GL_RGBA:
>+            out << "RGBA";
>+            break;
>+        case GL_BGRA_EXT:
>+            out << "BGRA";
>+            break;
>+        default:
>+            out << "UPDATE_THIS_SWITCH";
>+    }
> 
>-    EXPECT_GL_NO_ERROR();
>+    if (std::get<3>(params))
>+    {
>+        out << "FlipY";
>+    }
>+    if (std::get<4>(params))
>+    {
>+        out << "PremultiplyAlpha";
>+    }
>+    if (std::get<5>(params))
>+    {
>+        out << "UnmultiplyAlpha";
>+    }
> 
>-    EXPECT_PIXEL_COLOR_EQ(0, 0, pixels);
>+    return out.str();
> }
> 
>-// Test to ensure that the basic functionality of the extension works.
>-TEST_P(CopyTextureTest, BasicCopySubTexture)
>+class CopyTextureVariationsTest : public ANGLETestWithParam<CopyTextureVariationsTestParams>
> {
>-    if (!checkExtensions())
>+  protected:
>+    CopyTextureVariationsTest()
>     {
>-        return;
>+        setWindowWidth(256);
>+        setWindowHeight(256);
>+        setConfigRedBits(8);
>+        setConfigGreenBits(8);
>+        setConfigBlueBits(8);
>+        setConfigAlphaBits(8);
>     }
> 
>-    GLColor pixels = GLColor::red;
>+    void SetUp() override
>+    {
>+        ANGLETestWithParam::SetUp();
> 
>-    glBindTexture(GL_TEXTURE_2D, mTextures[0]);
>-    glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, 1, 1, 0, GL_RGBA, GL_UNSIGNED_BYTE, &pixels);
>+        glGenTextures(2, mTextures);
>+        glBindTexture(GL_TEXTURE_2D, mTextures[1]);
> 
>-    glBindTexture(GL_TEXTURE_2D, mTextures[1]);
>-    glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, 1, 1, 0, GL_RGBA, GL_UNSIGNED_BYTE, nullptr);
>+        glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
>+        glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
>+        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
>+        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
> 
>-    glCopySubTextureCHROMIUM(mTextures[0], 0, GL_TEXTURE_2D, mTextures[1], 0, 0, 0, 0, 0, 1, 1,
>-                             false, false, false);
>+        glGenFramebuffers(1, &mFramebuffer);
>+        glBindFramebuffer(GL_FRAMEBUFFER, mFramebuffer);
>+        glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, mTextures[1],
>+                               0);
> 
>-    EXPECT_GL_NO_ERROR();
>+        if (IsGLExtensionEnabled("GL_CHROMIUM_copy_texture"))
>+        {
>+            glCopyTextureCHROMIUM = reinterpret_cast<PFNGLCOPYTEXTURECHROMIUMPROC>(
>+                eglGetProcAddress("glCopyTextureCHROMIUM"));
>+            glCopySubTextureCHROMIUM = reinterpret_cast<PFNGLCOPYSUBTEXTURECHROMIUMPROC>(
>+                eglGetProcAddress("glCopySubTextureCHROMIUM"));
>+        }
>+    }
> 
>-    // Check that FB is complete.
>-    EXPECT_GLENUM_EQ(GL_FRAMEBUFFER_COMPLETE, glCheckFramebufferStatus(GL_FRAMEBUFFER));
>+    void TearDown() override
>+    {
>+        glDeleteTextures(2, mTextures);
>+        glDeleteFramebuffers(1, &mFramebuffer);
> 
>-    EXPECT_PIXEL_COLOR_EQ(0, 0, pixels);
>+        ANGLETestWithParam::TearDown();
>+    }
> 
>-    EXPECT_GL_NO_ERROR();
>-}
>+    bool checkExtensions(GLenum sourceFormat, GLenum destFormat) const
>+    {
>+        if (!IsGLExtensionEnabled("GL_CHROMIUM_copy_texture"))
>+        {
>+            std::cout << "Test skipped because GL_CHROMIUM_copy_texture is not available."
>+                      << std::endl;
>+            return false;
>+        }
>+
>+        if ((sourceFormat == GL_BGRA_EXT || destFormat == GL_BGRA_EXT) &&
>+            !IsGLExtensionEnabled("GL_EXT_texture_format_BGRA8888"))
>+        {
>+            return false;
>+        }
>+
>+        EXPECT_NE(nullptr, glCopyTextureCHROMIUM);
>+        EXPECT_NE(nullptr, glCopySubTextureCHROMIUM);
>+        return true;
>+    }
>+
>+    void calculateCopyTextureResults(GLenum sourceFormat,
>+                                     GLenum destFormat,
>+                                     bool premultiplyAlpha,
>+                                     bool unmultiplyAlpha,
>+                                     const uint8_t *sourceColor,
>+                                     GLColor *destColor)
>+    {
>+        GLColor color;
>+
>+        switch (sourceFormat)
>+        {
>+            case GL_RGB:
>+                color = GLColor(sourceColor[0], sourceColor[1], sourceColor[2], 255);
>+                break;
>+            case GL_RGBA:
>+                color = GLColor(sourceColor[0], sourceColor[1], sourceColor[2], sourceColor[3]);
>+                break;
>+            case GL_LUMINANCE:
>+                color = GLColor(sourceColor[0], sourceColor[0], sourceColor[0], 255);
>+                break;
>+            case GL_ALPHA:
>+                color = GLColor(0, 0, 0, sourceColor[0]);
>+                break;
>+            case GL_LUMINANCE_ALPHA:
>+                color = GLColor(sourceColor[0], sourceColor[0], sourceColor[0], sourceColor[1]);
>+                break;
>+            case GL_BGRA_EXT:
>+                color = GLColor(sourceColor[2], sourceColor[1], sourceColor[0], sourceColor[3]);
>+                break;
>+            default:
>+                EXPECT_EQ(true, false);
>+        }
>+
>+        if (premultiplyAlpha != unmultiplyAlpha)
>+        {
>+            float alpha = color.A / 255.0f;
>+            if (premultiplyAlpha)
>+            {
>+                color.R = static_cast<GLubyte>(static_cast<float>(color.R) * alpha);
>+                color.G = static_cast<GLubyte>(static_cast<float>(color.G) * alpha);
>+                color.B = static_cast<GLubyte>(static_cast<float>(color.B) * alpha);
>+            }
>+            else if (unmultiplyAlpha && color.A != 0)
>+            {
>+                color.R = static_cast<GLubyte>(static_cast<float>(color.R) / alpha);
>+                color.G = static_cast<GLubyte>(static_cast<float>(color.G) / alpha);
>+                color.B = static_cast<GLubyte>(static_cast<float>(color.B) / alpha);
>+            }
>+        }
>+
>+        switch (destFormat)
>+        {
>+            case GL_RGB:
>+                color.A = 255;
>+                break;
>+            case GL_RGBA:
>+            case GL_BGRA_EXT:
>+                break;
>+            default:
>+                EXPECT_EQ(true, false);
>+        }
>+
>+        *destColor = color;
>+    }
>+
>+    const uint8_t *getSourceColors(GLenum sourceFormat, size_t *colorCount, uint8_t *componentCount)
>+    {
>+        // Note: in all the following values, alpha is larger than RGB so unmultiply alpha doesn't
>+        // overflow
>+        constexpr static uint8_t kRgbaColors[7 * 4] = {
>+            255u, 127u, 63u,  255u,  // 0
>+            31u,  127u, 63u,  127u,  // 1
>+            31u,  63u,  127u, 255u,  // 2
>+            15u,  127u, 31u,  127u,  // 3
>+            127u, 255u, 63u,  0u,    // 4
>+            31u,  63u,  127u, 0u,    // 5
>+            15u,  31u,  63u,  63u,   // 6
>+        };
>+
>+        constexpr static uint8_t kRgbColors[7 * 3] = {
>+            255u, 127u, 63u,   // 0
>+            31u,  127u, 63u,   // 1
>+            31u,  63u,  127u,  // 2
>+            15u,  127u, 31u,   // 3
>+            127u, 255u, 63u,   // 4
>+            31u,  63u,  127u,  // 5
>+            15u,  31u,  63u,   // 6
>+        };
>+
>+        constexpr static uint8_t kLumColors[7 * 1] = {
>+            255u,  // 0
>+            163u,  // 1
>+            78u,   // 2
>+            114u,  // 3
>+            51u,   // 4
>+            0u,    // 5
>+            217u,  // 6
>+        };
>+
>+        constexpr static uint8_t kLumaColors[7 * 2] = {
>+            255u, 255u,  // 0
>+            67u,  163u,  // 1
>+            78u,  231u,  // 2
>+            8u,   114u,  // 3
>+            51u,  199u,  // 4
>+            0u,   173u,  // 5
>+            34u,  217u,  // 6
>+        };
>+
>+        constexpr static uint8_t kAlphaColors[7 * 1] = {
>+            255u,  // 0
>+            67u,   // 1
>+            231u,  // 2
>+            8u,    // 3
>+            199u,  // 4
>+            173u,  // 5
>+            34u,   // 6
>+        };
>+
>+        *colorCount = 7;
>+
>+        switch (sourceFormat)
>+        {
>+            case GL_RGB:
>+                *componentCount = 3;
>+                return kRgbColors;
>+            case GL_RGBA:
>+            case GL_BGRA_EXT:
>+                *componentCount = 4;
>+                return kRgbaColors;
>+            case GL_LUMINANCE:
>+                *componentCount = 1;
>+                return kLumColors;
>+            case GL_ALPHA:
>+                *componentCount = 1;
>+                return kAlphaColors;
>+            case GL_LUMINANCE_ALPHA:
>+                *componentCount = 2;
>+                return kLumaColors;
>+            default:
>+                EXPECT_EQ(true, false);
>+                return nullptr;
>+        }
>+    }
>+
>+    void initializeSourceTexture(GLenum sourceFormat,
>+                                 const uint8_t *srcColors,
>+                                 uint8_t componentCount)
>+    {
>+        // The texture is initialized as 2x2.  If the componentCount is 1 or 3, then the input data
>+        // will have a row pitch of 2 or 6, which needs to be padded to 4 or 8 respectively.
>+        uint8_t srcColorsPadded[4 * 4];
>+        size_t srcRowPitch =
>+            2 * componentCount + (componentCount == 1 || componentCount == 3 ? 2 : 0);
>+        size_t inputRowPitch = 2 * componentCount;
>+        for (size_t row = 0; row < 2; ++row)
>+        {
>+            memcpy(&srcColorsPadded[row * srcRowPitch], &srcColors[row * inputRowPitch],
>+                   inputRowPitch);
>+            memset(&srcColorsPadded[row * srcRowPitch + inputRowPitch], 0,
>+                   srcRowPitch - inputRowPitch);
>+        }
>+
>+        glBindTexture(GL_TEXTURE_2D, mTextures[0]);
>+        glTexImage2D(GL_TEXTURE_2D, 0, sourceFormat, 2, 2, 0, sourceFormat, GL_UNSIGNED_BYTE,
>+                     srcColorsPadded);
>+    }
>+
>+    void testCopyTexture(GLenum sourceFormat,
>+                         GLenum destFormat,
>+                         bool flipY,
>+                         bool premultiplyAlpha,
>+                         bool unmultiplyAlpha)
>+    {
>+        if (!checkExtensions(sourceFormat, destFormat))
>+        {
>+            return;
>+        }
>+
>+        size_t colorCount;
>+        uint8_t componentCount;
>+        const uint8_t *srcColors = getSourceColors(sourceFormat, &colorCount, &componentCount);
>+
>+        std::vector<GLColor> destColors(colorCount);
>+        for (size_t i = 0; i < colorCount; ++i)
>+        {
>+            calculateCopyTextureResults(sourceFormat, destFormat, premultiplyAlpha, unmultiplyAlpha,
>+                                        &srcColors[i * componentCount], &destColors[i]);
>+        }
>+
>+        for (size_t i = 0; i < colorCount - 3; ++i)
>+        {
>+            initializeSourceTexture(sourceFormat, &srcColors[i * componentCount], componentCount);
>+
>+            glCopyTextureCHROMIUM(mTextures[0], 0, GL_TEXTURE_2D, mTextures[1], 0, destFormat,
>+                                  GL_UNSIGNED_BYTE, flipY, premultiplyAlpha, unmultiplyAlpha);
>+
>+            EXPECT_GL_NO_ERROR();
>+
>+            // Check that FB is complete.
>+            EXPECT_GLENUM_EQ(GL_FRAMEBUFFER_COMPLETE, glCheckFramebufferStatus(GL_FRAMEBUFFER));
>+
>+            if (flipY)
>+            {
>+                EXPECT_PIXEL_COLOR_NEAR(0, 0, destColors[i + 2], 1.0);
>+                EXPECT_PIXEL_COLOR_NEAR(1, 0, destColors[i + 3], 1.0);
>+                EXPECT_PIXEL_COLOR_NEAR(0, 1, destColors[i + 0], 1.0);
>+                EXPECT_PIXEL_COLOR_NEAR(1, 1, destColors[i + 1], 1.0);
>+            }
>+            else
>+            {
>+                EXPECT_PIXEL_COLOR_NEAR(0, 0, destColors[i + 0], 1.0);
>+                EXPECT_PIXEL_COLOR_NEAR(1, 0, destColors[i + 1], 1.0);
>+                EXPECT_PIXEL_COLOR_NEAR(0, 1, destColors[i + 2], 1.0);
>+                EXPECT_PIXEL_COLOR_NEAR(1, 1, destColors[i + 3], 1.0);
>+            }
>+
>+            EXPECT_GL_NO_ERROR();
>+        }
>+    }
>+
>+    void testCopySubTexture(GLenum sourceFormat,
>+                            GLenum destFormat,
>+                            bool flipY,
>+                            bool premultiplyAlpha,
>+                            bool unmultiplyAlpha)
>+    {
>+        if (!checkExtensions(sourceFormat, destFormat))
>+        {
>+            return;
>+        }
>+
>+        size_t colorCount;
>+        uint8_t componentCount;
>+        const uint8_t *srcColors = getSourceColors(sourceFormat, &colorCount, &componentCount);
>+
>+        std::vector<GLColor> destColors(colorCount);
>+        for (size_t i = 0; i < colorCount; ++i)
>+        {
>+            calculateCopyTextureResults(sourceFormat, destFormat, premultiplyAlpha, unmultiplyAlpha,
>+                                        &srcColors[i * componentCount], &destColors[i]);
>+        }
>+
>+        for (size_t i = 0; i < colorCount - 3; ++i)
>+        {
>+            initializeSourceTexture(sourceFormat, &srcColors[i * componentCount], componentCount);
>+
>+            glBindTexture(GL_TEXTURE_2D, mTextures[1]);
>+            glTexImage2D(GL_TEXTURE_2D, 0, destFormat, 2, 2, 0, destFormat, GL_UNSIGNED_BYTE,
>+                         nullptr);
>+
>+            glCopySubTextureCHROMIUM(mTextures[0], 0, GL_TEXTURE_2D, mTextures[1], 0, 0, 0, 0, 0, 2,
>+                                     2, flipY, premultiplyAlpha, unmultiplyAlpha);
>+
>+            EXPECT_GL_NO_ERROR();
>+
>+            if (sourceFormat != GL_LUMINANCE && sourceFormat != GL_LUMINANCE_ALPHA &&
>+                sourceFormat != GL_ALPHA)
>+            {
>+                // Check that FB is complete.
>+                EXPECT_GLENUM_EQ(GL_FRAMEBUFFER_COMPLETE, glCheckFramebufferStatus(GL_FRAMEBUFFER));
>+            }
>+
>+            if (flipY)
>+            {
>+                EXPECT_PIXEL_COLOR_NEAR(0, 0, destColors[i + 2], 1.0);
>+                EXPECT_PIXEL_COLOR_NEAR(1, 0, destColors[i + 3], 1.0);
>+                EXPECT_PIXEL_COLOR_NEAR(0, 1, destColors[i + 0], 1.0);
>+                EXPECT_PIXEL_COLOR_NEAR(1, 1, destColors[i + 1], 1.0);
>+            }
>+            else
>+            {
>+                EXPECT_PIXEL_COLOR_NEAR(0, 0, destColors[i + 0], 1.0);
>+                EXPECT_PIXEL_COLOR_NEAR(1, 0, destColors[i + 1], 1.0);
>+                EXPECT_PIXEL_COLOR_NEAR(0, 1, destColors[i + 2], 1.0);
>+                EXPECT_PIXEL_COLOR_NEAR(1, 1, destColors[i + 3], 1.0);
>+            }
>+
>+            EXPECT_GL_NO_ERROR();
>+        }
>+    }
>+
>+    GLuint mTextures[2] = {
>+        0,
>+        0,
>+    };
>+    GLuint mFramebuffer = 0;
>+
>+    PFNGLCOPYTEXTURECHROMIUMPROC glCopyTextureCHROMIUM       = nullptr;
>+    PFNGLCOPYSUBTEXTURECHROMIUMPROC glCopySubTextureCHROMIUM = nullptr;
>+};
>+
>+class CopyTextureTestDest : public CopyTextureTest
>+{};
>+
>+class CopyTextureTestWebGL : public CopyTextureTest
>+{
>+  protected:
>+    CopyTextureTestWebGL() : CopyTextureTest() { setWebGLCompatibilityEnabled(true); }
>+};
>+
>+class CopyTextureTestES3 : public CopyTextureTest
>+{};
> 
> // Test that CopyTexture cannot redefine an immutable texture and CopySubTexture can copy data to
> // immutable textures
>@@ -150,14 +577,9 @@ TEST_P(CopyTextureTest, ImmutableTexture)
>         return;
>     }
> 
>-    if (getClientMajorVersion() < 3 &&
>-        (!extensionEnabled("GL_EXT_texture_storage") || !extensionEnabled("GL_OES_rgb8_rgba8")))
>-    {
>-        std::cout
>-            << "Test skipped due to missing ES3 or GL_EXT_texture_storage or GL_OES_rgb8_rgba8"
>-            << std::endl;
>-        return;
>-    }
>+    ANGLE_SKIP_TEST_IF(getClientMajorVersion() < 3 &&
>+                       (!IsGLExtensionEnabled("GL_EXT_texture_storage") ||
>+                        !IsGLExtensionEnabled("GL_OES_rgb8_rgba8")));
> 
>     GLColor pixels = GLColor::red;
> 
>@@ -207,7 +629,7 @@ TEST_P(CopyTextureTest, InternalFormat)
>     destFormats.push_back(GL_RGB);
>     destFormats.push_back(GL_RGBA);
> 
>-    if (extensionEnabled("GL_EXT_texture_format_BGRA8888"))
>+    if (IsGLExtensionEnabled("GL_EXT_texture_format_BGRA8888"))
>     {
>         sourceFormats.push_back(GL_BGRA_EXT);
>         destFormats.push_back(GL_BGRA_EXT);
>@@ -257,7 +679,7 @@ TEST_P(CopyTextureTest, InternalFormat)
> TEST_P(CopyTextureTest, RedefineDestinationTexture)
> {
>     ANGLE_SKIP_TEST_IF(!checkExtensions());
>-    ANGLE_SKIP_TEST_IF(!extensionEnabled("GL_EXT_texture_format_BGRA8888"));
>+    ANGLE_SKIP_TEST_IF(!IsGLExtensionEnabled("GL_EXT_texture_format_BGRA8888"));
> 
>     GLColor pixels[4] = {GLColor::red, GLColor::red, GLColor::red, GLColor::red};
> 
>@@ -435,244 +857,281 @@ TEST_P(CopyTextureTest, CopySubTextureOffset)
>     glBindTexture(GL_TEXTURE_2D, mTextures[1]);
>     glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, 2, 2, 0, GL_RGBA, GL_UNSIGNED_BYTE, transparentPixels);
> 
>+    // Check that FB is complete.
>+    EXPECT_GLENUM_EQ(GL_FRAMEBUFFER_COMPLETE, glCheckFramebufferStatus(GL_FRAMEBUFFER));
>+
>     glCopySubTextureCHROMIUM(mTextures[0], 0, GL_TEXTURE_2D, mTextures[1], 0, 1, 1, 0, 0, 1, 1,
>                              false, false, false);
>     EXPECT_GL_NO_ERROR();
>+    EXPECT_PIXEL_COLOR_EQ(1, 1, GLColor::red);
>+
>     glCopySubTextureCHROMIUM(mTextures[0], 0, GL_TEXTURE_2D, mTextures[1], 0, 1, 0, 1, 0, 1, 1,
>                              false, false, false);
>     EXPECT_GL_NO_ERROR();
>+    EXPECT_PIXEL_COLOR_EQ(1, 0, GLColor::green);
>+
>     glCopySubTextureCHROMIUM(mTextures[0], 0, GL_TEXTURE_2D, mTextures[1], 0, 0, 1, 0, 1, 1, 1,
>                              false, false, false);
>     EXPECT_GL_NO_ERROR();
>-
>-    // Check that FB is complete.
>-    EXPECT_GLENUM_EQ(GL_FRAMEBUFFER_COMPLETE, glCheckFramebufferStatus(GL_FRAMEBUFFER));
>+    EXPECT_PIXEL_COLOR_EQ(0, 1, GLColor::blue);
> 
>     EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::transparentBlack);
>-    EXPECT_PIXEL_COLOR_EQ(1, 1, GLColor::red);
>-    EXPECT_PIXEL_COLOR_EQ(1, 0, GLColor::green);
>-    EXPECT_PIXEL_COLOR_EQ(0, 1, GLColor::blue);
>     EXPECT_GL_NO_ERROR();
> }
> 
>-// Test that flipping the Y component works correctly
>-TEST_P(CopyTextureTest, FlipY)
>+// Test every combination of copy [sub]texture parameters:
>+// source: ALPHA, RGB, RGBA, LUMINANCE, LUMINANCE_ALPHA, BGRA_EXT
>+// destination: RGB, RGBA, BGRA_EXT
>+// flipY: false, true
>+// premultiplyAlpha: false, true
>+// unmultiplyAlpha: false, true
>+namespace
> {
>-    if (!checkExtensions())
>-    {
>-        return;
>-    }
>+constexpr GLenum kCopyTextureVariationsSrcFormats[] = {
>+    GL_ALPHA, GL_RGB, GL_RGBA, GL_LUMINANCE, GL_LUMINANCE_ALPHA, GL_BGRA_EXT};
>+constexpr GLenum kCopyTextureVariationsDstFormats[] = {GL_RGB, GL_RGBA, GL_BGRA_EXT};
>+}  // anonymous namespace
> 
>-    GLColor rgbaPixels[4] = {GLColor(255u, 255u, 255u, 255u), GLColor(127u, 127u, 127u, 127u),
>-                             GLColor(63u, 63u, 63u, 127u), GLColor(255u, 255u, 255u, 0u)};
>-
>-    glBindTexture(GL_TEXTURE_2D, mTextures[0]);
>-    glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, 2, 2, 0, GL_RGBA, GL_UNSIGNED_BYTE, rgbaPixels);
>-
>-    glCopyTextureCHROMIUM(mTextures[0], 0, GL_TEXTURE_2D, mTextures[1], 0, GL_RGBA,
>-                          GL_UNSIGNED_BYTE, GL_TRUE, GL_FALSE, GL_FALSE);
>-    EXPECT_GL_NO_ERROR();
>-
>-    // Check that FB is complete.
>-    EXPECT_GLENUM_EQ(GL_FRAMEBUFFER_COMPLETE, glCheckFramebufferStatus(GL_FRAMEBUFFER));
>+TEST_P(CopyTextureVariationsTest, CopyTexture)
>+{
>+    testCopyTexture(std::get<1>(GetParam()), std::get<2>(GetParam()), std::get<3>(GetParam()),
>+                    std::get<4>(GetParam()), std::get<5>(GetParam()));
>+}
> 
>-    EXPECT_PIXEL_COLOR_EQ(0, 0, rgbaPixels[2]);
>-    EXPECT_PIXEL_COLOR_EQ(1, 0, rgbaPixels[3]);
>-    EXPECT_PIXEL_COLOR_EQ(0, 1, rgbaPixels[0]);
>-    EXPECT_PIXEL_COLOR_EQ(1, 1, rgbaPixels[1]);
>-    EXPECT_GL_NO_ERROR();
>+TEST_P(CopyTextureVariationsTest, CopySubTexture)
>+{
>+    testCopySubTexture(std::get<1>(GetParam()), std::get<2>(GetParam()), std::get<3>(GetParam()),
>+                       std::get<4>(GetParam()), std::get<5>(GetParam()));
> }
> 
>-// Test that premultipying the alpha on copy works correctly
>-TEST_P(CopyTextureTest, PremultiplyAlpha)
>+// Test that copying to cube maps works
>+TEST_P(CopyTextureTest, CubeMapTarget)
> {
>     if (!checkExtensions())
>     {
>         return;
>     }
> 
>-    GLColor rgbaPixels[4] = {GLColor(255u, 255u, 255u, 255u), GLColor(255u, 255u, 255u, 127u),
>-                             GLColor(127u, 127u, 127u, 127u), GLColor(255u, 255u, 255u, 0u)};
>+    // http://anglebug.com/1932
>+    ANGLE_SKIP_TEST_IF(IsOSX() && IsIntel() && IsDesktopOpenGL());
> 
>-    glBindTexture(GL_TEXTURE_2D, mTextures[0]);
>-    glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, 2, 2, 0, GL_RGBA, GL_UNSIGNED_BYTE, rgbaPixels);
>+    // http://anglebug.com/3145
>+    ANGLE_SKIP_TEST_IF(IsFuchsia() && IsIntel() && IsVulkan());
> 
>-    glCopyTextureCHROMIUM(mTextures[0], 0, GL_TEXTURE_2D, mTextures[1], 0, GL_RGBA,
>-                          GL_UNSIGNED_BYTE, GL_FALSE, GL_TRUE, GL_FALSE);
>-    EXPECT_GL_NO_ERROR();
>-
>-    // Check that FB is complete.
>-    EXPECT_GLENUM_EQ(GL_FRAMEBUFFER_COMPLETE, glCheckFramebufferStatus(GL_FRAMEBUFFER));
>+    GLColor pixels[7] = {
>+        GLColor(10u, 13u, 16u, 19u), GLColor(20u, 23u, 26u, 29u), GLColor(30u, 33u, 36u, 39u),
>+        GLColor(40u, 43u, 46u, 49u), GLColor(50u, 53u, 56u, 59u), GLColor(60u, 63u, 66u, 69u),
>+        GLColor(70u, 73u, 76u, 79u),
>+    };
> 
>-    EXPECT_PIXEL_COLOR_NEAR(0, 0, GLColor(255, 255, 255, 255), 1.0);
>-    EXPECT_PIXEL_COLOR_NEAR(1, 0, GLColor(127, 127, 127, 127), 1.0);
>-    EXPECT_PIXEL_COLOR_NEAR(0, 1, GLColor(63, 63, 63, 127), 1.0);
>-    EXPECT_PIXEL_COLOR_NEAR(1, 1, GLColor(0, 0, 0, 0), 1.0);
>-    EXPECT_GL_NO_ERROR();
>-}
>+    GLTexture textures[2];
> 
>-// Test that unmultipying the alpha on copy works correctly
>-TEST_P(CopyTextureTest, UnmultiplyAlpha)
>-{
>-    if (!checkExtensions())
>+    glBindTexture(GL_TEXTURE_CUBE_MAP, textures[1]);
>+    for (GLenum face = GL_TEXTURE_CUBE_MAP_POSITIVE_X; face <= GL_TEXTURE_CUBE_MAP_NEGATIVE_Z;
>+         face++)
>     {
>-        return;
>+        glTexImage2D(face, 0, GL_RGBA, 1, 1, 0, GL_RGBA, GL_UNSIGNED_BYTE, nullptr);
>     }
> 
>-    GLColor rgbaPixels[4] = {GLColor(255u, 255u, 255u, 255u), GLColor(127u, 127u, 127u, 127u),
>-                             GLColor(63u, 63u, 63u, 127u), GLColor(255u, 255u, 255u, 0u)};
>+    for (size_t i = 0; i < 2; ++i)
>+    {
>+        for (GLenum face = GL_TEXTURE_CUBE_MAP_POSITIVE_X; face <= GL_TEXTURE_CUBE_MAP_NEGATIVE_Z;
>+             face++)
>+        {
>+            glBindTexture(GL_TEXTURE_2D, textures[0]);
>+            glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, 1, 1, 0, GL_RGBA, GL_UNSIGNED_BYTE,
>+                         &pixels[face - GL_TEXTURE_CUBE_MAP_POSITIVE_X + i]);
> 
>-    glBindTexture(GL_TEXTURE_2D, mTextures[0]);
>-    glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, 2, 2, 0, GL_RGBA, GL_UNSIGNED_BYTE, rgbaPixels);
>+            glCopySubTextureCHROMIUM(textures[0], 0, face, textures[1], 0, 0, 0, 0, 0, 1, 1, false,
>+                                     false, false);
>+        }
> 
>-    glCopyTextureCHROMIUM(mTextures[0], 0, GL_TEXTURE_2D, mTextures[1], 0, GL_RGBA,
>-                          GL_UNSIGNED_BYTE, GL_FALSE, GL_FALSE, GL_TRUE);
>-    EXPECT_GL_NO_ERROR();
>+        EXPECT_GL_NO_ERROR();
> 
>-    // Check that FB is complete.
>-    EXPECT_GLENUM_EQ(GL_FRAMEBUFFER_COMPLETE, glCheckFramebufferStatus(GL_FRAMEBUFFER));
>+        GLFramebuffer fbo;
>+        glBindFramebuffer(GL_FRAMEBUFFER, fbo);
> 
>-    EXPECT_PIXEL_COLOR_NEAR(0, 0, GLColor(255, 255, 255, 255), 1.0);
>-    EXPECT_PIXEL_COLOR_NEAR(1, 0, GLColor(255, 255, 255, 127), 1.0);
>-    EXPECT_PIXEL_COLOR_NEAR(0, 1, GLColor(127, 127, 127, 127), 1.0);
>-    EXPECT_PIXEL_COLOR_NEAR(1, 1, GLColor(255, 255, 255, 0), 1.0);
>-    EXPECT_GL_NO_ERROR();
>+        for (GLenum face = GL_TEXTURE_CUBE_MAP_POSITIVE_X; face <= GL_TEXTURE_CUBE_MAP_NEGATIVE_Z;
>+             face++)
>+        {
>+            glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, face, textures[1], 0);
>+
>+            // Check that FB is complete.
>+            EXPECT_GLENUM_EQ(GL_FRAMEBUFFER_COMPLETE, glCheckFramebufferStatus(GL_FRAMEBUFFER));
>+
>+            EXPECT_PIXEL_COLOR_EQ(0, 0, pixels[face - GL_TEXTURE_CUBE_MAP_POSITIVE_X + i]);
>+
>+            EXPECT_GL_NO_ERROR();
>+        }
>+    }
> }
> 
>-// Test that unmultipying and premultiplying the alpha is the same as doing neither
>-TEST_P(CopyTextureTest, UnmultiplyAndPremultiplyAlpha)
>+// Test that we can successfully copy into incomplete cube maps. Regression test for
>+// http://anglebug.com/3384
>+TEST_P(CopyTextureTest, IncompleteCubeMap)
> {
>     if (!checkExtensions())
>     {
>         return;
>     }
> 
>-    GLColor rgbaPixels[4] = {GLColor(255u, 255u, 255u, 255u), GLColor(127u, 127u, 127u, 127u),
>-                             GLColor(63u, 63u, 63u, 127u), GLColor(255u, 255u, 255u, 0u)};
>-
>-    glBindTexture(GL_TEXTURE_2D, mTextures[0]);
>+    GLTexture texture2D;
>+    GLColor rgbaPixels[4 * 4] = {GLColor::red, GLColor::green, GLColor::blue, GLColor::black};
>+    glBindTexture(GL_TEXTURE_2D, texture2D);
>     glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, 2, 2, 0, GL_RGBA, GL_UNSIGNED_BYTE, rgbaPixels);
> 
>-    glCopyTextureCHROMIUM(mTextures[0], 0, GL_TEXTURE_2D, mTextures[1], 0, GL_RGBA,
>-                          GL_UNSIGNED_BYTE, GL_FALSE, GL_TRUE, GL_TRUE);
>-    EXPECT_GL_NO_ERROR();
>+    GLTexture textureCube;
>+    glBindTexture(GL_TEXTURE_CUBE_MAP, textureCube);
>+    for (GLenum face = GL_TEXTURE_CUBE_MAP_POSITIVE_X; face <= GL_TEXTURE_CUBE_MAP_NEGATIVE_Z;
>+         face++)
>+    {
>+        glTexImage2D(face, 0, GL_RGBA, 1, 1, 0, GL_RGBA, GL_UNSIGNED_BYTE, nullptr);
>+    }
> 
>-    // Check that FB is complete.
>-    EXPECT_GLENUM_EQ(GL_FRAMEBUFFER_COMPLETE, glCheckFramebufferStatus(GL_FRAMEBUFFER));
>+    // Set one face to 2x2
>+    glTexImage2D(GL_TEXTURE_CUBE_MAP_NEGATIVE_X, 0, GL_RGBA, 2, 2, 0, GL_RGBA, GL_UNSIGNED_BYTE,
>+                 rgbaPixels);
> 
>-    EXPECT_PIXEL_COLOR_NEAR(0, 0, GLColor(255, 255, 255, 255), 1.0);
>-    EXPECT_PIXEL_COLOR_NEAR(1, 0, GLColor(127, 127, 127, 127), 1.0);
>-    EXPECT_PIXEL_COLOR_NEAR(0, 1, GLColor(63, 63, 63, 127), 1.0);
>-    EXPECT_PIXEL_COLOR_NEAR(1, 1, GLColor(255, 255, 255, 0), 1.0);
>+    // Copy into the incomplete face
>+    glCopySubTextureCHROMIUM(texture2D, 0, GL_TEXTURE_CUBE_MAP_NEGATIVE_X, textureCube, 0, 0, 0, 0,
>+                             0, 2, 2, false, false, false);
>     EXPECT_GL_NO_ERROR();
> }
> 
>-// Test to ensure that CopyTexture works with LUMINANCE_ALPHA texture
>-TEST_P(CopyTextureTest, LuminanceAlpha)
>+// Test BGRA to RGBA cube map copy
>+TEST_P(CopyTextureTest, CubeMapTargetBGRA)
> {
>     if (!checkExtensions())
>     {
>         return;
>     }
> 
>-    uint8_t originalPixels[] = {163u, 67u};
>-    GLColor expectedPixels(163u, 163u, 163u, 67u);
>-
>-    glBindTexture(GL_TEXTURE_2D, mTextures[0]);
>-    glTexImage2D(GL_TEXTURE_2D, 0, GL_LUMINANCE_ALPHA, 1, 1, 0, GL_LUMINANCE_ALPHA,
>-                 GL_UNSIGNED_BYTE, &originalPixels);
>-
>-    glCopyTextureCHROMIUM(mTextures[0], 0, GL_TEXTURE_2D, mTextures[1], 0, GL_RGBA,
>-                          GL_UNSIGNED_BYTE, false, false, false);
>-
>-    EXPECT_GL_NO_ERROR();
>-
>-    EXPECT_PIXEL_COLOR_EQ(0, 0, expectedPixels);
>-}
>-
>-// Test to ensure that CopyTexture works with LUMINANCE texture
>-TEST_P(CopyTextureTest, Luminance)
>-{
>-    if (!checkExtensions())
>+    if (!IsGLExtensionEnabled("GL_EXT_texture_format_BGRA8888"))
>     {
>         return;
>     }
> 
>-    uint8_t originalPixels[] = {57u};
>-    GLColor expectedPixels(57u, 57u, 57u, 255u);
>-
>-    glBindTexture(GL_TEXTURE_2D, mTextures[0]);
>-    glTexImage2D(GL_TEXTURE_2D, 0, GL_LUMINANCE, 1, 1, 0, GL_LUMINANCE, GL_UNSIGNED_BYTE,
>-                 &originalPixels);
>-
>-    glCopyTextureCHROMIUM(mTextures[0], 0, GL_TEXTURE_2D, mTextures[1], 0, GL_RGBA,
>-                          GL_UNSIGNED_BYTE, false, false, false);
>+    // http://anglebug.com/3145
>+    ANGLE_SKIP_TEST_IF(IsFuchsia() && IsIntel() && IsVulkan());
> 
>-    EXPECT_GL_NO_ERROR();
>+    GLColor pixels[7] = {
>+        GLColor(10u, 13u, 16u, 19u), GLColor(20u, 23u, 26u, 29u), GLColor(30u, 33u, 36u, 39u),
>+        GLColor(40u, 43u, 46u, 49u), GLColor(50u, 53u, 56u, 59u), GLColor(60u, 63u, 66u, 69u),
>+        GLColor(70u, 73u, 76u, 79u),
>+    };
> 
>-    EXPECT_PIXEL_COLOR_EQ(0, 0, expectedPixels);
>-}
>+    GLTexture textures[2];
> 
>-// Test to ensure that CopyTexture works with ALPHA texture
>-TEST_P(CopyTextureTest, Alpha)
>-{
>-    if (!checkExtensions())
>+    glBindTexture(GL_TEXTURE_CUBE_MAP, textures[1]);
>+    for (GLenum face = GL_TEXTURE_CUBE_MAP_POSITIVE_X; face <= GL_TEXTURE_CUBE_MAP_NEGATIVE_Z;
>+         face++)
>     {
>-        return;
>+        glTexImage2D(face, 0, GL_RGBA, 1, 1, 0, GL_RGBA, GL_UNSIGNED_BYTE, nullptr);
>     }
> 
>-    uint8_t originalPixels[] = {77u};
>-    GLColor expectedPixels(0u, 0u, 0u, 77u);
>+    for (size_t i = 0; i < 2; ++i)
>+    {
>+        for (GLenum face = GL_TEXTURE_CUBE_MAP_POSITIVE_X; face <= GL_TEXTURE_CUBE_MAP_NEGATIVE_Z;
>+             face++)
>+        {
>+            glBindTexture(GL_TEXTURE_2D, textures[0]);
>+            glTexImage2D(GL_TEXTURE_2D, 0, GL_BGRA_EXT, 1, 1, 0, GL_BGRA_EXT, GL_UNSIGNED_BYTE,
>+                         &pixels[face - GL_TEXTURE_CUBE_MAP_POSITIVE_X + i]);
> 
>-    glBindTexture(GL_TEXTURE_2D, mTextures[0]);
>-    glTexImage2D(GL_TEXTURE_2D, 0, GL_ALPHA, 1, 1, 0, GL_ALPHA, GL_UNSIGNED_BYTE, &originalPixels);
>+            glCopySubTextureCHROMIUM(textures[0], 0, face, textures[1], 0, 0, 0, 0, 0, 1, 1, false,
>+                                     false, false);
>+        }
> 
>-    glCopyTextureCHROMIUM(mTextures[0], 0, GL_TEXTURE_2D, mTextures[1], 0, GL_RGBA,
>-                          GL_UNSIGNED_BYTE, false, false, false);
>+        EXPECT_GL_NO_ERROR();
> 
>-    EXPECT_GL_NO_ERROR();
>+        GLFramebuffer fbo;
>+        glBindFramebuffer(GL_FRAMEBUFFER, fbo);
> 
>-    EXPECT_PIXEL_COLOR_EQ(0, 0, expectedPixels);
>+        for (GLenum face = GL_TEXTURE_CUBE_MAP_POSITIVE_X; face <= GL_TEXTURE_CUBE_MAP_NEGATIVE_Z;
>+             face++)
>+        {
>+            glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, face, textures[1], 0);
>+
>+            // Check that FB is complete.
>+            EXPECT_GLENUM_EQ(GL_FRAMEBUFFER_COMPLETE, glCheckFramebufferStatus(GL_FRAMEBUFFER));
>+
>+            GLColor converted = pixels[face - GL_TEXTURE_CUBE_MAP_POSITIVE_X + i];
>+            std::swap(converted.R, converted.B);
>+            EXPECT_PIXEL_COLOR_EQ(0, 0, converted);
>+
>+            EXPECT_GL_NO_ERROR();
>+        }
>+    }
> }
> 
>-// Test that copying to cube maps works
>-TEST_P(CopyTextureTest, CubeMapTarget)
>+// Test cube map copies with RGB format
>+TEST_P(CopyTextureTest, CubeMapTargetRGB)
> {
>     if (!checkExtensions())
>     {
>         return;
>     }
> 
>-    GLColor pixels = GLColor::red;
>+    // http://anglebug.com/1932
>+    ANGLE_SKIP_TEST_IF(IsOSX() && IsIntel() && IsDesktopOpenGL());
> 
>-    GLTexture textures[2];
>+    // http://anglebug.com/3145
>+    ANGLE_SKIP_TEST_IF(IsFuchsia() && IsIntel() && IsVulkan());
> 
>-    glBindTexture(GL_TEXTURE_2D, textures[0]);
>-    glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, 1, 1, 0, GL_RGBA, GL_UNSIGNED_BYTE, &pixels);
>+    constexpr uint8_t pixels[16 * 7] = {
>+        0u,   3u,   6u,   10u,  13u,  16u,  0, 0, 20u,  23u,  26u,  30u,  33u,  36u,  0, 0,  // 2x2
>+        40u,  43u,  46u,  50u,  53u,  56u,  0, 0, 60u,  63u,  66u,  70u,  73u,  76u,  0, 0,  // 2x2
>+        80u,  83u,  86u,  90u,  93u,  96u,  0, 0, 100u, 103u, 106u, 110u, 113u, 116u, 0, 0,  // 2x2
>+        120u, 123u, 126u, 130u, 133u, 136u, 0, 0, 140u, 143u, 146u, 160u, 163u, 166u, 0, 0,  // 2x2
>+        170u, 173u, 176u, 180u, 183u, 186u, 0, 0, 190u, 193u, 196u, 200u, 203u, 206u, 0, 0,  // 2x2
>+        210u, 213u, 216u, 220u, 223u, 226u, 0, 0, 230u, 233u, 236u, 240u, 243u, 246u, 0, 0,  // 2x2
>+        10u,  50u,  100u, 30u,  80u,  130u, 0, 0, 60u,  110u, 160u, 90u,  140u, 200u, 0, 0,  // 2x2
>+    };
>+
>+    GLTexture textures[2];
> 
>     glBindTexture(GL_TEXTURE_CUBE_MAP, textures[1]);
>     for (GLenum face = GL_TEXTURE_CUBE_MAP_POSITIVE_X; face <= GL_TEXTURE_CUBE_MAP_NEGATIVE_Z;
>          face++)
>     {
>-        glTexImage2D(face, 0, GL_RGBA, 1, 1, 0, GL_RGBA, GL_UNSIGNED_BYTE, nullptr);
>+        glTexImage2D(face, 0, GL_RGB, 2, 2, 0, GL_RGB, GL_UNSIGNED_BYTE, nullptr);
>     }
> 
>-    glCopySubTextureCHROMIUM(textures[0], 0, GL_TEXTURE_CUBE_MAP_POSITIVE_X, textures[1], 0, 0, 0,
>-                             0, 0, 1, 1, false, false, false);
>+    for (size_t i = 0; i < 2; ++i)
>+    {
>+        for (GLenum face = GL_TEXTURE_CUBE_MAP_POSITIVE_X; face <= GL_TEXTURE_CUBE_MAP_NEGATIVE_Z;
>+             face++)
>+        {
>+            glBindTexture(GL_TEXTURE_2D, textures[0]);
>+            glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB, 2, 2, 0, GL_RGB, GL_UNSIGNED_BYTE,
>+                         &pixels[(face - GL_TEXTURE_CUBE_MAP_POSITIVE_X + i) * 16]);
> 
>-    EXPECT_GL_NO_ERROR();
>+            glCopySubTextureCHROMIUM(textures[0], 0, face, textures[1], 0, 0, 0, 0, 0, 2, 2, false,
>+                                     false, false);
>+        }
> 
>-    GLFramebuffer fbo;
>-    glBindFramebuffer(GL_FRAMEBUFFER, fbo);
>-    glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_CUBE_MAP_POSITIVE_X,
>-                           textures[1], 0);
>+        EXPECT_GL_NO_ERROR();
> 
>-    // Check that FB is complete.
>-    EXPECT_GLENUM_EQ(GL_FRAMEBUFFER_COMPLETE, glCheckFramebufferStatus(GL_FRAMEBUFFER));
>+        GLFramebuffer fbo;
>+        glBindFramebuffer(GL_FRAMEBUFFER, fbo);
> 
>-    EXPECT_PIXEL_COLOR_EQ(0, 0, pixels);
>+        for (GLenum face = GL_TEXTURE_CUBE_MAP_POSITIVE_X; face <= GL_TEXTURE_CUBE_MAP_NEGATIVE_Z;
>+             face++)
>+        {
>+            glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, face, textures[1], 0);
> 
>-    EXPECT_GL_NO_ERROR();
>+            // Check that FB is complete.
>+            EXPECT_GLENUM_EQ(GL_FRAMEBUFFER_COMPLETE, glCheckFramebufferStatus(GL_FRAMEBUFFER));
>+
>+            const uint8_t *faceData = &pixels[(face - GL_TEXTURE_CUBE_MAP_POSITIVE_X + i) * 16];
>+            EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor(faceData[0], faceData[1], faceData[2], 255));
>+            EXPECT_PIXEL_COLOR_EQ(1, 0, GLColor(faceData[3], faceData[4], faceData[5], 255));
>+            EXPECT_PIXEL_COLOR_EQ(0, 1, GLColor(faceData[8], faceData[9], faceData[10], 255));
>+            EXPECT_PIXEL_COLOR_EQ(1, 1, GLColor(faceData[11], faceData[12], faceData[13], 255));
>+
>+            EXPECT_GL_NO_ERROR();
>+        }
>+    }
> }
> 
> // Test that copying to non-zero mipmaps works
>@@ -683,18 +1142,10 @@ TEST_P(CopyTextureTest, CopyToMipmap)
>         return;
>     }
> 
>-    if (getClientMajorVersion() < 3 && !extensionEnabled("GL_OES_fbo_render_mipmap"))
>-    {
>-        std::cout << "Test skipped because ES3 or GL_OES_fbo_render_mipmap is missing."
>-                  << std::endl;
>-        return;
>-    }
>+    ANGLE_SKIP_TEST_IF(getClientMajorVersion() < 3 &&
>+                       !IsGLExtensionEnabled("GL_OES_fbo_render_mipmap"));
> 
>-    if (IsOSX() && IsIntel())
>-    {
>-        std::cout << "Test skipped on Mac Intel." << std::endl;
>-        return;
>-    }
>+    ANGLE_SKIP_TEST_IF(IsOSX() && IsIntel());
> 
>     GLColor pixels[] = {GLColor::red, GLColor::red, GLColor::red, GLColor::red};
> 
>@@ -742,6 +1193,98 @@ TEST_P(CopyTextureTest, CopyToMipmap)
>     }
> }
> 
>+// Test that copying from an RGBA8 texture to RGBA4 results in exactly 4-bit precision in the result
>+TEST_P(CopyTextureTest, DownsampleRGBA4444)
>+{
>+    // Downsampling on copy is only guarenteed on D3D11
>+    ANGLE_SKIP_TEST_IF(!IsD3D11());
>+
>+    GLTexture textures[2];
>+
>+    GLColor pixels[] = {GLColor(0, 5, 6, 7), GLColor(17, 22, 25, 24), GLColor(34, 35, 36, 36),
>+                        GLColor(51, 53, 55, 55)};
>+
>+    glBindTexture(GL_TEXTURE_2D, textures[0]);
>+    glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, 2, 2, 0, GL_RGBA, GL_UNSIGNED_BYTE, pixels);
>+
>+    glBindTexture(GL_TEXTURE_2D, textures[1]);
>+    glCopyTextureCHROMIUM(textures[0], 0, GL_TEXTURE_2D, textures[1], 0, GL_RGBA,
>+                          GL_UNSIGNED_SHORT_4_4_4_4, GL_FALSE, GL_FALSE, GL_FALSE);
>+
>+    GLFramebuffer fbo;
>+    glBindFramebuffer(GL_FRAMEBUFFER, fbo);
>+    glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, textures[1], 0);
>+
>+    EXPECT_PIXEL_COLOR_NEAR(0, 0, GLColor(0, 0, 0, 0), 1.0);
>+    EXPECT_PIXEL_COLOR_NEAR(1, 0, GLColor(17, 17, 17, 17), 1.0);
>+    EXPECT_PIXEL_COLOR_NEAR(0, 1, GLColor(34, 34, 34, 34), 1.0);
>+    EXPECT_PIXEL_COLOR_NEAR(1, 1, GLColor(51, 51, 51, 51), 1.0);
>+
>+    testGradientDownsampleUniqueValues(GL_RGBA, GL_UNSIGNED_SHORT_4_4_4_4, {16, 16, 16, 16});
>+}
>+
>+// Test that copying from an RGBA8 texture to RGB565 results in exactly 4-bit precision in the
>+// result
>+TEST_P(CopyTextureTest, DownsampleRGB565)
>+{
>+    // Downsampling on copy is only guarenteed on D3D11
>+    ANGLE_SKIP_TEST_IF(!IsD3D11());
>+
>+    GLTexture textures[2];
>+
>+    GLColor pixels[] = {GLColor(0, 5, 2, 14), GLColor(17, 22, 25, 30), GLColor(34, 33, 36, 46),
>+                        GLColor(50, 54, 49, 60)};
>+
>+    glBindTexture(GL_TEXTURE_2D, textures[0]);
>+    glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, 2, 2, 0, GL_RGBA, GL_UNSIGNED_BYTE, pixels);
>+
>+    glBindTexture(GL_TEXTURE_2D, textures[1]);
>+    glCopyTextureCHROMIUM(textures[0], 0, GL_TEXTURE_2D, textures[1], 0, GL_RGB,
>+                          GL_UNSIGNED_SHORT_5_6_5, GL_FALSE, GL_FALSE, GL_FALSE);
>+
>+    GLFramebuffer fbo;
>+    glBindFramebuffer(GL_FRAMEBUFFER, fbo);
>+    glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, textures[1], 0);
>+
>+    EXPECT_PIXEL_COLOR_NEAR(0, 0, GLColor(0, 4, 0, 255), 1.0);
>+    EXPECT_PIXEL_COLOR_NEAR(1, 0, GLColor(16, 20, 25, 255), 1.0);
>+    EXPECT_PIXEL_COLOR_NEAR(0, 1, GLColor(33, 32, 33, 255), 1.0);
>+    EXPECT_PIXEL_COLOR_NEAR(1, 1, GLColor(49, 53, 49, 255), 1.0);
>+
>+    testGradientDownsampleUniqueValues(GL_RGB, GL_UNSIGNED_SHORT_5_6_5, {32, 64, 32, 1});
>+}
>+
>+// Test that copying from an RGBA8 texture to RGBA5551 results in exactly 4-bit precision in the
>+// result
>+TEST_P(CopyTextureTest, DownsampleRGBA5551)
>+{
>+    // Downsampling on copy is only guarenteed on D3D11
>+    ANGLE_SKIP_TEST_IF(!IsD3D11());
>+
>+    GLTexture textures[2];
>+
>+    GLColor pixels[] = {GLColor(0, 1, 2, 3), GLColor(14, 16, 17, 18), GLColor(33, 34, 36, 46),
>+                        GLColor(50, 51, 52, 255)};
>+
>+    glBindTexture(GL_TEXTURE_2D, textures[0]);
>+    glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, 2, 2, 0, GL_RGBA, GL_UNSIGNED_BYTE, pixels);
>+
>+    glBindTexture(GL_TEXTURE_2D, textures[1]);
>+    glCopyTextureCHROMIUM(textures[0], 0, GL_TEXTURE_2D, textures[1], 0, GL_RGBA,
>+                          GL_UNSIGNED_SHORT_5_5_5_1, GL_FALSE, GL_FALSE, GL_FALSE);
>+
>+    GLFramebuffer fbo;
>+    glBindFramebuffer(GL_FRAMEBUFFER, fbo);
>+    glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, textures[1], 0);
>+
>+    EXPECT_PIXEL_COLOR_NEAR(0, 0, GLColor(0, 0, 0, 0), 1.0);
>+    EXPECT_PIXEL_COLOR_NEAR(1, 0, GLColor(16, 16, 16, 0), 1.0);
>+    EXPECT_PIXEL_COLOR_NEAR(0, 1, GLColor(33, 33, 33, 0), 1.0);
>+    EXPECT_PIXEL_COLOR_NEAR(1, 1, GLColor(49, 49, 49, 255), 1.0);
>+
>+    testGradientDownsampleUniqueValues(GL_RGBA, GL_UNSIGNED_SHORT_5_5_5_1, {32, 32, 32, 2});
>+}
>+
> // Test to ensure that CopyTexture works with LUMINANCE texture as a destination
> TEST_P(CopyTextureTestDest, Luminance)
> {
>@@ -1055,6 +1598,35 @@ TEST_P(CopyTextureTestDest, AlphaCopyWithRGB)
>     EXPECT_PIXEL_COLOR_EQ(0, 0, expectedPixels);
> }
> 
>+// Test to ensure that CopyTexture will fail with a non-zero level and NPOT texture in WebGL
>+TEST_P(CopyTextureTestWebGL, NPOT)
>+{
>+    if (IsGLExtensionRequestable("GL_CHROMIUM_copy_texture"))
>+    {
>+        glRequestExtensionANGLE("GL_CHROMIUM_copy_texture");
>+    }
>+    ANGLE_SKIP_TEST_IF(!IsGLExtensionEnabled("GL_CHROMIUM_copy_texture"));
>+
>+    std::vector<GLColor> pixelData(10 * 10, GLColor::red);
>+
>+    glBindTexture(GL_TEXTURE_2D, mTextures[0]);
>+    glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, 10, 10, 0, GL_RGBA, GL_UNSIGNED_BYTE, pixelData.data());
>+
>+    // Do a basic copy to make sure things work
>+    glCopyTextureCHROMIUM(mTextures[0], 0, GL_TEXTURE_2D, mTextures[1], 0, GL_RGBA,
>+                          GL_UNSIGNED_BYTE, false, false, false);
>+
>+    EXPECT_GL_NO_ERROR();
>+
>+    EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::red);
>+
>+    // Do the same operation with destLevel 1, which should fail
>+    glCopyTextureCHROMIUM(mTextures[0], 0, GL_TEXTURE_2D, mTextures[1], 1, GL_RGBA,
>+                          GL_UNSIGNED_BYTE, false, false, false);
>+
>+    EXPECT_GL_ERROR(GL_INVALID_VALUE);
>+}
>+
> // Test the newly added ES3 unorm formats
> TEST_P(CopyTextureTestES3, ES3UnormFormats)
> {
>@@ -1064,7 +1636,7 @@ TEST_P(CopyTextureTestES3, ES3UnormFormats)
>     }
> 
>     auto testOutput = [this](GLuint texture, const GLColor &expectedColor) {
>-        const std::string vs =
>+        constexpr char kVS[] =
>             "#version 300 es\n"
>             "in vec4 position;\n"
>             "out vec2 texcoord;\n"
>@@ -1074,7 +1646,7 @@ TEST_P(CopyTextureTestES3, ES3UnormFormats)
>             "    texcoord = (position.xy * 0.5) + 0.5;\n"
>             "}\n";
> 
>-        const std::string fs =
>+        constexpr char kFS[] =
>             "#version 300 es\n"
>             "precision mediump float;\n"
>             "uniform sampler2D tex;\n"
>@@ -1085,7 +1657,7 @@ TEST_P(CopyTextureTestES3, ES3UnormFormats)
>             "    color = texture(tex, texcoord);\n"
>             "}\n";
> 
>-        ANGLE_GL_PROGRAM(program, vs, fs);
>+        ANGLE_GL_PROGRAM(program, kVS, kFS);
>         glUseProgram(program);
> 
>         GLRenderbuffer rbo;
>@@ -1113,7 +1685,6 @@ TEST_P(CopyTextureTestES3, ES3UnormFormats)
>                                                   bool flipY, bool premultiplyAlpha,
>                                                   bool unmultiplyAlpha,
>                                                   const GLColor &expectedColor) {
>-
>         GLTexture sourceTexture;
>         glBindTexture(GL_TEXTURE_2D, sourceTexture);
>         glTexImage2D(GL_TEXTURE_2D, 0, sourceInternalFormat, 1, 1, 0, sourceFormat, sourceType,
>@@ -1129,6 +1700,28 @@ TEST_P(CopyTextureTestES3, ES3UnormFormats)
>         testOutput(destTexture, expectedColor);
>     };
> 
>+    auto testSubCopyCombination = [this, testOutput](
>+                                      GLenum sourceInternalFormat, GLenum sourceFormat,
>+                                      GLenum sourceType, const GLColor &sourceColor,
>+                                      GLenum destInternalFormat, GLenum destFormat, GLenum destType,
>+                                      bool flipY, bool premultiplyAlpha, bool unmultiplyAlpha,
>+                                      const GLColor &expectedColor) {
>+        GLTexture sourceTexture;
>+        glBindTexture(GL_TEXTURE_2D, sourceTexture);
>+        glTexImage2D(GL_TEXTURE_2D, 0, sourceInternalFormat, 1, 1, 0, sourceFormat, sourceType,
>+                     &sourceColor);
>+
>+        GLTexture destTexture;
>+        glBindTexture(GL_TEXTURE_2D, destTexture);
>+
>+        glTexImage2D(GL_TEXTURE_2D, 0, destInternalFormat, 1, 1, 0, destFormat, destType, nullptr);
>+        glCopySubTextureCHROMIUM(sourceTexture, 0, GL_TEXTURE_2D, destTexture, 0, 0, 0, 0, 0, 1, 1,
>+                                 flipY, premultiplyAlpha, unmultiplyAlpha);
>+        ASSERT_GL_NO_ERROR();
>+
>+        testOutput(destTexture, expectedColor);
>+    };
>+
>     // New LUMA source formats
>     testCopyCombination(GL_LUMINANCE, GL_LUMINANCE, GL_UNSIGNED_BYTE, GLColor(128, 0, 0, 0), GL_RGB,
>                         GL_UNSIGNED_BYTE, false, false, false, GLColor(128, 128, 128, 255));
>@@ -1149,33 +1742,40 @@ TEST_P(CopyTextureTestES3, ES3UnormFormats)
>                         GL_UNSIGNED_BYTE, false, true, false, GLColor(0, 0, 0, 128));
> 
>     // New sRGB dest formats
>-    testCopyCombination(GL_RGBA, GL_RGBA, GL_UNSIGNED_BYTE, GLColor(128, 64, 32, 128), GL_SRGB,
>-                        GL_UNSIGNED_BYTE, false, false, false, GLColor(55, 13, 4, 255));
>-    testCopyCombination(GL_RGBA, GL_RGBA, GL_UNSIGNED_BYTE, GLColor(128, 64, 32, 128), GL_SRGB,
>-                        GL_UNSIGNED_BYTE, false, true, false, GLColor(13, 4, 1, 255));
>-    testCopyCombination(GL_RGBA, GL_RGBA, GL_UNSIGNED_BYTE, GLColor(128, 64, 32, 128),
>-                        GL_SRGB_ALPHA_EXT, GL_UNSIGNED_BYTE, false, false, false,
>-                        GLColor(55, 13, 4, 128));
>+    if (IsGLExtensionEnabled("GL_EXT_sRGB"))
>+    {
>+        testCopyCombination(GL_RGBA, GL_RGBA, GL_UNSIGNED_BYTE, GLColor(128, 64, 32, 128), GL_SRGB,
>+                            GL_UNSIGNED_BYTE, false, false, false, GLColor(55, 13, 4, 255));
>+        testCopyCombination(GL_RGBA, GL_RGBA, GL_UNSIGNED_BYTE, GLColor(128, 64, 32, 128), GL_SRGB,
>+                            GL_UNSIGNED_BYTE, false, true, false, GLColor(13, 4, 1, 255));
>+        testCopyCombination(GL_RGBA, GL_RGBA, GL_UNSIGNED_BYTE, GLColor(128, 64, 32, 128),
>+                            GL_SRGB_ALPHA_EXT, GL_UNSIGNED_BYTE, false, false, false,
>+                            GLColor(55, 13, 4, 128));
>+
>+        testSubCopyCombination(GL_RGBA, GL_RGBA, GL_UNSIGNED_BYTE, GLColor(128, 64, 32, 128),
>+                               GL_SRGB, GL_SRGB, GL_UNSIGNED_BYTE, false, false, false,
>+                               GLColor(55, 13, 4, 255));
>+        testSubCopyCombination(GL_RGBA, GL_RGBA, GL_UNSIGNED_BYTE, GLColor(128, 64, 32, 128),
>+                               GL_SRGB, GL_SRGB, GL_UNSIGNED_BYTE, false, true, false,
>+                               GLColor(13, 4, 1, 255));
>+        testSubCopyCombination(GL_RGBA, GL_RGBA, GL_UNSIGNED_BYTE, GLColor(128, 64, 32, 128),
>+                               GL_SRGB_ALPHA_EXT, GL_SRGB_ALPHA_EXT, GL_UNSIGNED_BYTE, false, false,
>+                               false, GLColor(55, 13, 4, 128));
>+    }
> }
> 
> // Test the newly added ES3 float formats
> TEST_P(CopyTextureTestES3, ES3FloatFormats)
> {
>-    ANGLE_SKIP_TEST_IF(IsIntel() && IsWindows() && IsOpenGL());
>-
>     if (!checkExtensions())
>     {
>         return;
>     }
> 
>-    if (!extensionEnabled("GL_EXT_color_buffer_float"))
>-    {
>-        std::cout << "Test skipped due to missing GL_EXT_color_buffer_float." << std::endl;
>-        return;
>-    }
>+    ANGLE_SKIP_TEST_IF(!IsGLExtensionEnabled("GL_EXT_color_buffer_float"));
> 
>     auto testOutput = [this](GLuint texture, const GLColor32F &expectedColor) {
>-        const std::string vs =
>+        constexpr char kVS[] =
>             "#version 300 es\n"
>             "in vec4 position;\n"
>             "out vec2 texcoord;\n"
>@@ -1185,7 +1785,7 @@ TEST_P(CopyTextureTestES3, ES3FloatFormats)
>             "    texcoord = (position.xy * 0.5) + 0.5;\n"
>             "}\n";
> 
>-        const std::string fs =
>+        constexpr char kFS[] =
>             "#version 300 es\n"
>             "precision mediump float;\n"
>             "uniform sampler2D tex;\n"
>@@ -1196,7 +1796,7 @@ TEST_P(CopyTextureTestES3, ES3FloatFormats)
>             "    color = texture(tex, texcoord);\n"
>             "}\n";
> 
>-        ANGLE_GL_PROGRAM(program, vs, fs);
>+        ANGLE_GL_PROGRAM(program, kVS, kFS);
>         glUseProgram(program);
> 
>         GLRenderbuffer rbo;
>@@ -1224,7 +1824,6 @@ TEST_P(CopyTextureTestES3, ES3FloatFormats)
>                                                   bool flipY, bool premultiplyAlpha,
>                                                   bool unmultiplyAlpha,
>                                                   const GLColor32F &expectedColor) {
>-
>         GLTexture sourceTexture;
>         glBindTexture(GL_TEXTURE_2D, sourceTexture);
>         glTexImage2D(GL_TEXTURE_2D, 0, sourceInternalFormat, 1, 1, 0, sourceFormat, sourceType,
>@@ -1299,7 +1898,7 @@ TEST_P(CopyTextureTestES3, ES3UintFormats)
>     using GLColor32U = std::tuple<GLuint, GLuint, GLuint, GLuint>;
> 
>     auto testOutput = [this](GLuint texture, const GLColor32U &expectedColor) {
>-        const std::string vs =
>+        constexpr char kVS[] =
>             "#version 300 es\n"
>             "in vec4 position;\n"
>             "out vec2 texcoord;\n"
>@@ -1309,7 +1908,7 @@ TEST_P(CopyTextureTestES3, ES3UintFormats)
>             "    texcoord = (position.xy * 0.5) + 0.5;\n"
>             "}\n";
> 
>-        std::string fs =
>+        constexpr char kFS[] =
>             "#version 300 es\n"
>             "precision mediump float;\n"
>             "precision mediump usampler2D;\n"
>@@ -1321,7 +1920,7 @@ TEST_P(CopyTextureTestES3, ES3UintFormats)
>             "    color = texture(tex, texcoord);\n"
>             "}\n";
> 
>-        ANGLE_GL_PROGRAM(program, vs, fs);
>+        ANGLE_GL_PROGRAM(program, kVS, kFS);
>         glUseProgram(program);
> 
>         GLRenderbuffer rbo;
>@@ -1356,7 +1955,6 @@ TEST_P(CopyTextureTestES3, ES3UintFormats)
>                                                   bool flipY, bool premultiplyAlpha,
>                                                   bool unmultiplyAlpha,
>                                                   const GLColor32U &expectedColor) {
>-
>         GLTexture sourceTexture;
>         glBindTexture(GL_TEXTURE_2D, sourceTexture);
>         glTexImage2D(GL_TEXTURE_2D, 0, sourceInternalFormat, 1, 1, 0, sourceFormat, sourceType,
>@@ -1401,9 +1999,37 @@ TEST_P(CopyTextureTestES3, ES3UintFormats)
>                         GL_UNSIGNED_BYTE, false, false, true, GLColor32U(240, 0, 0, 1));
> }
> 
>+#ifdef Bool
>+// X11 craziness.
>+#    undef Bool
>+#endif
>+
> // Use this to select which configurations (e.g. which renderer, which GLES major version) these
> // tests should be run against.
>-ANGLE_INSTANTIATE_TEST(CopyTextureTest, ES2_D3D9(), ES2_D3D11(), ES2_OPENGL(), ES2_OPENGLES());
>+ANGLE_INSTANTIATE_TEST(CopyTextureTest,
>+                       ES2_D3D9(),
>+                       ES2_D3D11(),
>+                       ES2_OPENGL(),
>+                       ES2_OPENGLES(),
>+                       ES2_VULKAN());
>+ANGLE_INSTANTIATE_TEST_COMBINE_5(CopyTextureVariationsTest,
>+                                 CopyTextureVariationsTestPrint,
>+                                 testing::ValuesIn(kCopyTextureVariationsSrcFormats),
>+                                 testing::ValuesIn(kCopyTextureVariationsDstFormats),
>+                                 testing::Bool(),  // flipY
>+                                 testing::Bool(),  // premultiplyAlpha
>+                                 testing::Bool(),  // unmultiplyAlpha
>+                                 ES2_D3D9(),
>+                                 ES2_D3D11(),
>+                                 ES2_OPENGL(),
>+                                 ES2_OPENGLES(),
>+                                 ES2_VULKAN());
>+ANGLE_INSTANTIATE_TEST(CopyTextureTestWebGL,
>+                       ES2_D3D9(),
>+                       ES2_D3D11(),
>+                       ES2_OPENGL(),
>+                       ES2_OPENGLES(),
>+                       ES2_VULKAN());
> ANGLE_INSTANTIATE_TEST(CopyTextureTestDest, ES2_D3D11());
> ANGLE_INSTANTIATE_TEST(CopyTextureTestES3, ES3_D3D11(), ES3_OPENGL(), ES3_OPENGLES());
> 
>diff --git a/Source/ThirdParty/ANGLE/src/tests/gl_tests/CubeMapTextureTest.cpp b/Source/ThirdParty/ANGLE/src/tests/gl_tests/CubeMapTextureTest.cpp
>index f6ceae0f6b2..fac12a4ab1f 100644
>--- a/Source/ThirdParty/ANGLE/src/tests/gl_tests/CubeMapTextureTest.cpp
>+++ b/Source/ThirdParty/ANGLE/src/tests/gl_tests/CubeMapTextureTest.cpp
>@@ -25,27 +25,13 @@ class CubeMapTextureTest : public ANGLETest
>     {
>         ANGLETest::SetUp();
> 
>-        const std::string vsSource =
>-            R"(attribute highp vec4 position;
>-            void main(void)
>-            {
>-                gl_Position = position;
>-            })";
>-
>-        const std::string fsSource =
>-            R"(uniform highp vec4 color;
>-            void main(void)
>-            {
>-                gl_FragColor = color;
>-            })";
>-
>-        mProgram = CompileProgram(vsSource, fsSource);
>+        mProgram = CompileProgram(essl1_shaders::vs::Simple(), essl1_shaders::fs::UniformColor());
>         if (mProgram == 0)
>         {
>             FAIL() << "shader compilation failed.";
>         }
> 
>-        mColorLocation = glGetUniformLocation(mProgram, "color");
>+        mColorLocation = glGetUniformLocation(mProgram, essl1_shaders::ColorUniform());
> 
>         glUseProgram(mProgram);
> 
>@@ -70,17 +56,19 @@ class CubeMapTextureTest : public ANGLETest
>     GLint mColorLocation;
> };
> 
>-// Verify that rendering to the faces of a cube map consecutively will correctly render to each face.
>+// Verify that rendering to the faces of a cube map consecutively will correctly render to each
>+// face.
> TEST_P(CubeMapTextureTest, RenderToFacesConsecutively)
> {
>-    const GLfloat faceColors[] =
>-    {
>-        1.0f, 0.0f, 0.0f, 1.0f,
>-        0.0f, 1.0f, 0.0f, 1.0f,
>-        0.0f, 0.0f, 1.0f, 1.0f,
>-        1.0f, 1.0f, 0.0f, 1.0f,
>-        1.0f, 0.0f, 1.0f, 1.0f,
>-        0.0f, 1.0f, 1.0f, 1.0f,
>+    // TODO: Diagnose and fix. http://anglebug.com/2954
>+    ANGLE_SKIP_TEST_IF(IsVulkan() && IsIntel() && IsWindows());
>+
>+    // http://anglebug.com/3145
>+    ANGLE_SKIP_TEST_IF(IsVulkan() && IsIntel() && IsFuchsia());
>+
>+    const GLfloat faceColors[] = {
>+        1.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f, 0.0f, 1.0f, 0.0f, 0.0f, 1.0f, 1.0f,
>+        1.0f, 1.0f, 0.0f, 1.0f, 1.0f, 0.0f, 1.0f, 1.0f, 0.0f, 1.0f, 1.0f, 1.0f,
>     };
> 
>     GLuint tex = 0;
>@@ -100,7 +88,8 @@ TEST_P(CubeMapTextureTest, RenderToFacesConsecutively)
> 
>     for (GLenum face = 0; face < 6; face++)
>     {
>-        glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_CUBE_MAP_POSITIVE_X + face, tex, 0);
>+        glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0,
>+                               GL_TEXTURE_CUBE_MAP_POSITIVE_X + face, tex, 0);
>         EXPECT_GL_NO_ERROR();
> 
>         glUseProgram(mProgram);
>@@ -108,17 +97,19 @@ TEST_P(CubeMapTextureTest, RenderToFacesConsecutively)
>         const GLfloat *faceColor = faceColors + (face * 4);
>         glUniform4f(mColorLocation, faceColor[0], faceColor[1], faceColor[2], faceColor[3]);
> 
>-        drawQuad(mProgram, "position", 0.5f);
>+        drawQuad(mProgram, essl1_shaders::PositionAttrib(), 0.5f);
>         EXPECT_GL_NO_ERROR();
>     }
> 
>     for (GLenum face = 0; face < 6; face++)
>     {
>-        glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_CUBE_MAP_POSITIVE_X + face, tex, 0);
>+        glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0,
>+                               GL_TEXTURE_CUBE_MAP_POSITIVE_X + face, tex, 0);
>         EXPECT_GL_NO_ERROR();
> 
>         const GLfloat *faceColor = faceColors + (face * 4);
>-        EXPECT_PIXEL_EQ(0, 0, faceColor[0] * 255, faceColor[1] * 255, faceColor[2] * 255, faceColor[3] * 255);
>+        EXPECT_PIXEL_EQ(0, 0, faceColor[0] * 255, faceColor[1] * 255, faceColor[2] * 255,
>+                        faceColor[3] * 255);
>         EXPECT_GL_NO_ERROR();
>     }
> 
>@@ -128,7 +119,8 @@ TEST_P(CubeMapTextureTest, RenderToFacesConsecutively)
>     EXPECT_GL_NO_ERROR();
> }
> 
>-// Use this to select which configurations (e.g. which renderer, which GLES major version) these tests should be run against.
>+// Use this to select which configurations (e.g. which renderer, which GLES major version) these
>+// tests should be run against.
> ANGLE_INSTANTIATE_TEST(CubeMapTextureTest,
>                        ES2_D3D11(),
>                        ES2_D3D11_FL10_0(),
>@@ -136,4 +128,5 @@ ANGLE_INSTANTIATE_TEST(CubeMapTextureTest,
>                        ES2_OPENGL(),
>                        ES3_OPENGL(),
>                        ES2_OPENGLES(),
>-                       ES3_OPENGLES());
>+                       ES3_OPENGLES(),
>+                       ES2_VULKAN());
>diff --git a/Source/ThirdParty/ANGLE/src/tests/gl_tests/D3D11EmulatedIndexedBufferTest.cpp b/Source/ThirdParty/ANGLE/src/tests/gl_tests/D3D11EmulatedIndexedBufferTest.cpp
>index ad20579de31..7cc5e39391a 100644
>--- a/Source/ThirdParty/ANGLE/src/tests/gl_tests/D3D11EmulatedIndexedBufferTest.cpp
>+++ b/Source/ThirdParty/ANGLE/src/tests/gl_tests/D3D11EmulatedIndexedBufferTest.cpp
>@@ -8,14 +8,15 @@
> //   vertex buffer.
> //
> 
>-#include "libANGLE/angletypes.h"
> #include "libANGLE/Context.h"
>+#include "libANGLE/angletypes.h"
>+#include "libANGLE/renderer/d3d/IndexDataManager.h"
> #include "libANGLE/renderer/d3d/d3d11/Buffer11.h"
> #include "libANGLE/renderer/d3d/d3d11/Context11.h"
> #include "libANGLE/renderer/d3d/d3d11/Renderer11.h"
>-#include "libANGLE/renderer/d3d/IndexDataManager.h"
> #include "test_utils/ANGLETest.h"
> #include "test_utils/angle_test_instantiate.h"
>+#include "util/EGLWindow.h"
> 
> using namespace angle;
> 
>@@ -25,25 +26,24 @@ namespace
> class D3D11EmulatedIndexedBufferTest : public ANGLETest
> {
>   protected:
>-
>     void SetUp() override
>     {
>         ANGLETest::SetUp();
>         ASSERT_EQ(EGL_PLATFORM_ANGLE_TYPE_D3D11_ANGLE, GetParam().getRenderer());
> 
>-        mContext                 = reinterpret_cast<gl::Context *>(getEGLWindow()->getContext());
>+        mContext                 = static_cast<gl::Context *>(getEGLWindow()->getContext());
>         rx::Context11 *context11 = rx::GetImplAs<rx::Context11>(mContext);
>         mRenderer                = context11->getRenderer();
> 
>-        mSourceBuffer      = new rx::Buffer11(mBufferState, mRenderer);
>-        GLfloat testData[] = { 1.0f, 2.0f, 3.0f, 4.0f, 5.0f, 6.0f };
>-        gl::Error error    = mSourceBuffer->setData(nullptr, gl::BufferBinding::Array, testData,
>-                                                 sizeof(testData), gl::BufferUsage::StaticDraw);
>-        ASSERT_FALSE(error.isError());
>+        mSourceBuffer       = new rx::Buffer11(mBufferState, mRenderer);
>+        GLfloat testData[]  = {1.0f, 2.0f, 3.0f, 4.0f, 5.0f, 6.0f};
>+        angle::Result error = mSourceBuffer->setData(nullptr, gl::BufferBinding::Array, testData,
>+                                                     sizeof(testData), gl::BufferUsage::StaticDraw);
>+        ASSERT_EQ(angle::Result::Continue, error);
> 
>         mTranslatedAttribute.baseOffset            = 0;
>         mTranslatedAttribute.usesFirstVertexOffset = false;
>-        mTranslatedAttribute.stride = sizeof(GLfloat);
>+        mTranslatedAttribute.stride                = sizeof(GLfloat);
> 
>         GLubyte indices[] = {0, 0, 3, 4, 2, 1, 1};
> 
>@@ -62,30 +62,33 @@ class D3D11EmulatedIndexedBufferTest : public ANGLETest
>         ANGLETest::TearDown();
>     }
> 
>-    void createMappableCompareBufferFromEmulatedBuffer(ID3D11Buffer *sourceBuffer, GLuint size, ID3D11Buffer **mappableBuffer)
>+    void createMappableCompareBufferFromEmulatedBuffer(ID3D11Buffer *sourceBuffer,
>+                                                       GLuint size,
>+                                                       ID3D11Buffer **mappableBuffer)
>     {
>         *mappableBuffer = nullptr;
> 
>         D3D11_BUFFER_DESC bufferDesc;
>-        bufferDesc.ByteWidth = size;
>-        bufferDesc.MiscFlags = 0;
>+        bufferDesc.ByteWidth           = size;
>+        bufferDesc.MiscFlags           = 0;
>         bufferDesc.StructureByteStride = 0;
>-        bufferDesc.Usage = D3D11_USAGE_STAGING;
>-        bufferDesc.BindFlags = 0;
>-        bufferDesc.CPUAccessFlags = D3D11_CPU_ACCESS_READ | D3D11_CPU_ACCESS_WRITE;
>+        bufferDesc.Usage               = D3D11_USAGE_STAGING;
>+        bufferDesc.BindFlags           = 0;
>+        bufferDesc.CPUAccessFlags      = D3D11_CPU_ACCESS_READ | D3D11_CPU_ACCESS_WRITE;
> 
>         HRESULT hr = mRenderer->getDevice()->CreateBuffer(&bufferDesc, nullptr, mappableBuffer);
>         ASSERT_TRUE(SUCCEEDED(hr));
> 
>         D3D11_BOX srcBox;
>-        srcBox.left = 0;
>-        srcBox.right = size;
>-        srcBox.top = 0;
>+        srcBox.left   = 0;
>+        srcBox.right  = size;
>+        srcBox.top    = 0;
>         srcBox.bottom = 1;
>-        srcBox.front = 0;
>-        srcBox.back = 1;
>+        srcBox.front  = 0;
>+        srcBox.back   = 1;
> 
>-        mRenderer->getDeviceContext()->CopySubresourceRegion(*mappableBuffer, 0, 0, 0, 0, sourceBuffer, 0, &srcBox);
>+        mRenderer->getDeviceContext()->CopySubresourceRegion(*mappableBuffer, 0, 0, 0, 0,
>+                                                             sourceBuffer, 0, &srcBox);
>     }
> 
>     void compareContents(ID3D11Buffer *actual)
>@@ -96,10 +99,11 @@ class D3D11EmulatedIndexedBufferTest : public ANGLETest
>             &compareBuffer);
> 
>         D3D11_MAPPED_SUBRESOURCE mappedResource;
>-        HRESULT hr = mRenderer->getDeviceContext()->Map(compareBuffer, 0, D3D11_MAP_READ, 0, &mappedResource);
>+        HRESULT hr = mRenderer->getDeviceContext()->Map(compareBuffer, 0, D3D11_MAP_READ, 0,
>+                                                        &mappedResource);
>         ASSERT_TRUE(SUCCEEDED(hr));
> 
>-        GLfloat* compareData = static_cast<GLfloat*>(mappedResource.pData);
>+        GLfloat *compareData = static_cast<GLfloat *>(mappedResource.pData);
>         for (size_t i = 0; i < mExpectedExpandedData.size(); i++)
>         {
>             EXPECT_EQ(mExpectedExpandedData[i], compareData[i]);
>@@ -111,10 +115,10 @@ class D3D11EmulatedIndexedBufferTest : public ANGLETest
> 
>     void emulateAndCompare(rx::SourceIndexData *srcData)
>     {
>-        auto bufferOrError =
>-            mSourceBuffer->getEmulatedIndexedBuffer(mContext, srcData, mTranslatedAttribute, 0);
>-        ASSERT_FALSE(bufferOrError.isError());
>-        ID3D11Buffer *emulatedBuffer = bufferOrError.getResult();
>+        ID3D11Buffer *emulatedBuffer = nullptr;
>+        angle::Result error          = mSourceBuffer->getEmulatedIndexedBuffer(
>+            mContext, srcData, mTranslatedAttribute, 0, &emulatedBuffer);
>+        ASSERT_EQ(angle::Result::Continue, error);
>         ASSERT_TRUE(emulatedBuffer != nullptr);
>         compareContents(emulatedBuffer);
>     }
>@@ -137,7 +141,7 @@ TEST_P(D3D11EmulatedIndexedBufferTest, TestNativeToExpandedUsingGLubyteIndices)
> {
>     rx::SourceIndexData srcData = {nullptr, mubyteIndices.data(),
>                                    static_cast<unsigned int>(mubyteIndices.size()),
>-                                   GL_UNSIGNED_BYTE, false};
>+                                   gl::DrawElementsType::UnsignedByte, false};
>     emulateAndCompare(&srcData);
> }
> 
>@@ -147,7 +151,7 @@ TEST_P(D3D11EmulatedIndexedBufferTest, TestNativeToExpandedUsingGLushortIndices)
> {
>     rx::SourceIndexData srcData = {nullptr, mushortIndices.data(),
>                                    static_cast<unsigned int>(mushortIndices.size()),
>-                                   GL_UNSIGNED_SHORT, false};
>+                                   gl::DrawElementsType::UnsignedShort, false};
>     emulateAndCompare(&srcData);
> }
> 
>@@ -156,43 +160,38 @@ TEST_P(D3D11EmulatedIndexedBufferTest, TestNativeToExpandedUsingGLushortIndices)
> TEST_P(D3D11EmulatedIndexedBufferTest, TestNativeToExpandedUsingGLuintIndices)
> {
>     rx::SourceIndexData srcData = {nullptr, muintIndices.data(),
>-                                   static_cast<unsigned int>(muintIndices.size()), GL_UNSIGNED_INT,
>-                                   false};
>+                                   static_cast<unsigned int>(muintIndices.size()),
>+                                   gl::DrawElementsType::UnsignedInt, false};
>     emulateAndCompare(&srcData);
> }
> 
>-// This tests verifies that a Buffer11 contents remain unchanged after calling getEmulatedIndexedBuffer
>+// This tests verifies that a Buffer11 contents remain unchanged after calling
>+// getEmulatedIndexedBuffer
> TEST_P(D3D11EmulatedIndexedBufferTest, TestSourceBufferRemainsUntouchedAfterExpandOperation)
> {
>     // Copy the original source buffer before any expand calls have been made
>     gl::BufferState cleanSourceState;
>     rx::Buffer11 *cleanSourceBuffer = new rx::Buffer11(cleanSourceState, mRenderer);
>-    ASSERT_FALSE(
>-        cleanSourceBuffer->copySubData(nullptr, mSourceBuffer, 0, 0, mSourceBuffer->getSize())
>-            .isError());
>+    ASSERT_EQ(angle::Result::Continue, cleanSourceBuffer->copySubData(nullptr, mSourceBuffer, 0, 0,
>+                                                                      mSourceBuffer->getSize()));
> 
>     // Do a basic exanded and compare test.
>     rx::SourceIndexData srcData = {nullptr, muintIndices.data(),
>-                                   static_cast<unsigned int>(muintIndices.size()), GL_UNSIGNED_INT,
>-                                   false};
>+                                   static_cast<unsigned int>(muintIndices.size()),
>+                                   gl::DrawElementsType::UnsignedInt, false};
>     emulateAndCompare(&srcData);
> 
>     const uint8_t *sourceBufferMem = nullptr;
>-    const uint8_t *cleanBufferMem = nullptr;
>-
>-    gl::Error error = mSourceBuffer->getData(mContext, &sourceBufferMem);
>-    ASSERT_FALSE(error.isError());
>+    const uint8_t *cleanBufferMem  = nullptr;
> 
>-    error = cleanSourceBuffer->getData(mContext, &cleanBufferMem);
>-    ASSERT_FALSE(error.isError());
>+    ASSERT_EQ(angle::Result::Continue, mSourceBuffer->getData(mContext, &sourceBufferMem));
>+    ASSERT_EQ(angle::Result::Continue, cleanSourceBuffer->getData(mContext, &cleanBufferMem));
> 
>-    int result = memcmp(sourceBufferMem, cleanBufferMem, cleanSourceBuffer->getSize());
>-    ASSERT_EQ(result, 0);
>+    ASSERT_EQ(0, memcmp(sourceBufferMem, cleanBufferMem, cleanSourceBuffer->getSize()));
> 
>     SafeDelete(cleanSourceBuffer);
> }
> 
>-ANGLE_INSTANTIATE_TEST(D3D11EmulatedIndexedBufferTest,
>-                       ES2_D3D11());
>+ANGLE_INSTANTIATE_TEST(D3D11EmulatedIndexedBufferTest, ES2_D3D11());
> 
>-} // anonymous namespace
>+}  // anonymous namespace
>diff --git a/Source/ThirdParty/ANGLE/src/tests/gl_tests/D3D11FormatTablesTest.cpp b/Source/ThirdParty/ANGLE/src/tests/gl_tests/D3D11FormatTablesTest.cpp
>index d85385ebae5..ae349261c7b 100644
>--- a/Source/ThirdParty/ANGLE/src/tests/gl_tests/D3D11FormatTablesTest.cpp
>+++ b/Source/ThirdParty/ANGLE/src/tests/gl_tests/D3D11FormatTablesTest.cpp
>@@ -7,16 +7,18 @@
> //   Tests to validate our D3D11 support tables match hardware support.
> //
> 
>-#include "libANGLE/angletypes.h"
>+#include "common/debug.h"
> #include "libANGLE/Context.h"
>+#include "libANGLE/angletypes.h"
> #include "libANGLE/formatutils.h"
> #include "libANGLE/renderer/d3d/d3d11/Context11.h"
>+#include "libANGLE/renderer/d3d/d3d11/Renderer11.h"
> #include "libANGLE/renderer/d3d/d3d11/dxgi_support_table.h"
> #include "libANGLE/renderer/d3d/d3d11/formatutils11.h"
>-#include "libANGLE/renderer/d3d/d3d11/Renderer11.h"
> #include "libANGLE/renderer/d3d/d3d11/texture_format_table.h"
>-#include "test_utils/angle_test_instantiate.h"
> #include "test_utils/ANGLETest.h"
>+#include "test_utils/angle_test_instantiate.h"
>+#include "util/EGLWindow.h"
> 
> using namespace angle;
> 
>@@ -24,9 +26,7 @@ namespace
> {
> 
> class D3D11FormatTablesTest : public ANGLETest
>-{
>-
>-};
>+{};
> 
> // This test enumerates all GL formats - for each, it queries the D3D support for
> // using it as a texture, a render target, and sampling from it in the shader. It
>@@ -39,7 +39,7 @@ TEST_P(D3D11FormatTablesTest, TestFormatSupport)
>     ASSERT_EQ(EGL_PLATFORM_ANGLE_TYPE_D3D11_ANGLE, GetParam().getRenderer());
> 
>     // Hack the angle!
>-    gl::Context *context = reinterpret_cast<gl::Context *>(getEGLWindow()->getContext());
>+    gl::Context *context     = static_cast<gl::Context *>(getEGLWindow()->getContext());
>     rx::Context11 *context11 = rx::GetImplAs<rx::Context11>(context);
>     rx::Renderer11 *renderer = context11->getRenderer();
>     const auto &textureCaps  = renderer->getNativeTextureCaps();
>@@ -70,7 +70,7 @@ TEST_P(D3D11FormatTablesTest, TestFormatSupport)
>         UINT texSupport  = 0;
>         bool texSuccess  = SUCCEEDED(device->CheckFormatSupport(formatInfo.texFormat, &texSupport));
>         bool textureable = texSuccess && ((texSupport & texSupportMask) == texSupportMask);
>-        EXPECT_EQ(textureable, textureInfo.texturable) << "for 0x" << std::hex << internalFormat;
>+        EXPECT_EQ(textureable, textureInfo.texturable) << " for " << gl::FmtHex(internalFormat);
> 
>         // Bits for mipmap auto-gen.
>         bool expectedMipGen = texSuccess && ((texSupport & D3D11_FORMAT_SUPPORT_MIP_AUTOGEN) != 0);
>@@ -79,18 +79,19 @@ TEST_P(D3D11FormatTablesTest, TestFormatSupport)
>         bool actualMipGen =
>             ((dxgiSupport.alwaysSupportedFlags & D3D11_FORMAT_SUPPORT_MIP_AUTOGEN) != 0);
>         EXPECT_EQ(0u, dxgiSupport.optionallySupportedFlags & D3D11_FORMAT_SUPPORT_MIP_AUTOGEN)
>-            << "for 0x" << std::hex << internalFormat;
>-        EXPECT_EQ(expectedMipGen, actualMipGen) << "for 0x" << std::hex << internalFormat;
>+            << " for " << gl::FmtHex(internalFormat);
>+        EXPECT_EQ(expectedMipGen, actualMipGen) << " for " << gl::FmtHex(internalFormat);
> 
>         // Bits for filtering
>         UINT filterSupport = 0;
>         bool filterSuccess =
>             SUCCEEDED(device->CheckFormatSupport(formatInfo.srvFormat, &filterSupport));
>-        bool filterable = filterSuccess && ((filterSupport & D3D11_FORMAT_SUPPORT_SHADER_SAMPLE) != 0);
>-        EXPECT_EQ(filterable, textureInfo.filterable) << "for 0x" << std::hex << internalFormat;
>+        bool filterable =
>+            filterSuccess && ((filterSupport & D3D11_FORMAT_SUPPORT_SHADER_SAMPLE) != 0);
>+        EXPECT_EQ(filterable, textureInfo.filterable) << " for " << gl::FmtHex(internalFormat);
> 
>         // Bits for renderable
>-        bool renderable = false;
>+        bool renderable          = false;
>         UINT renderSupport       = 0u;
>         DXGI_FORMAT renderFormat = DXGI_FORMAT_UNKNOWN;
>         if (internalFormatInfo.depthBits > 0 || internalFormatInfo.stencilBits > 0)
>@@ -103,7 +104,7 @@ TEST_P(D3D11FormatTablesTest, TestFormatSupport)
>             if (renderable)
>             {
>                 EXPECT_NE(DXGI_FORMAT_UNKNOWN, formatInfo.dsvFormat)
>-                    << "for 0x" << std::hex << internalFormat;
>+                    << " for " << gl::FmtHex(internalFormat);
>             }
>         }
>         else
>@@ -115,13 +116,15 @@ TEST_P(D3D11FormatTablesTest, TestFormatSupport)
>             if (renderable)
>             {
>                 EXPECT_NE(DXGI_FORMAT_UNKNOWN, formatInfo.rtvFormat)
>-                    << "for 0x" << std::hex << internalFormat;
>+                    << " for " << gl::FmtHex(internalFormat);
>             }
>         }
>-        EXPECT_EQ(renderable, textureInfo.renderable) << "for 0x" << std::hex << internalFormat;
>+        EXPECT_EQ(renderable, textureInfo.textureAttachment)
>+            << " for " << gl::FmtHex(internalFormat);
>+        EXPECT_EQ(renderable, textureInfo.renderbuffer) << " for " << gl::FmtHex(internalFormat);
>         if (!textureInfo.sampleCounts.empty())
>         {
>-            EXPECT_TRUE(renderable) << "for 0x" << std::hex << internalFormat;
>+            EXPECT_TRUE(renderable) << " for " << gl::FmtHex(internalFormat);
>         }
> 
>         // Multisample counts
>@@ -133,18 +136,18 @@ TEST_P(D3D11FormatTablesTest, TestFormatSupport)
>                 for (unsigned int sampleCount = 1;
>                      sampleCount <= D3D11_MAX_MULTISAMPLE_SAMPLE_COUNT; sampleCount *= 2)
>                 {
>-                    UINT qualityCount  = 0;
>-                    bool sampleSuccess = SUCCEEDED(device->CheckMultisampleQualityLevels(
>+                    UINT qualityCount    = 0;
>+                    bool sampleSuccess   = SUCCEEDED(device->CheckMultisampleQualityLevels(
>                         renderFormat, sampleCount, &qualityCount));
>                     GLuint expectedCount = (!sampleSuccess || qualityCount == 0) ? 0 : 1;
>                     EXPECT_EQ(expectedCount, textureInfo.sampleCounts.count(sampleCount))
>-                        << "for 0x" << std::hex << internalFormat;
>+                        << " for " << gl::FmtHex(internalFormat);
>                 }
>             }
>             else
>             {
>                 EXPECT_TRUE(textureInfo.sampleCounts.empty())
>-                    << "for 0x" << std::hex << internalFormat;
>+                    << " for " << gl::FmtHex(internalFormat);
>             }
>         }
>     }
>@@ -156,4 +159,4 @@ ANGLE_INSTANTIATE_TEST(D3D11FormatTablesTest,
>                        ES2_D3D11_FL10_1(),
>                        ES2_D3D11_FL11_0());
> 
>-} // anonymous namespace
>+}  // anonymous namespace
>diff --git a/Source/ThirdParty/ANGLE/src/tests/gl_tests/D3D11InputLayoutCacheTest.cpp b/Source/ThirdParty/ANGLE/src/tests/gl_tests/D3D11InputLayoutCacheTest.cpp
>index 118d10600aa..bca78303e8a 100644
>--- a/Source/ThirdParty/ANGLE/src/tests/gl_tests/D3D11InputLayoutCacheTest.cpp
>+++ b/Source/ThirdParty/ANGLE/src/tests/gl_tests/D3D11InputLayoutCacheTest.cpp
>@@ -14,6 +14,7 @@
> #include "libANGLE/renderer/d3d/d3d11/Renderer11.h"
> #include "test_utils/ANGLETest.h"
> #include "test_utils/angle_test_instantiate.h"
>+#include "util/EGLWindow.h"
> 
> using namespace angle;
> 
>@@ -47,16 +48,15 @@ class D3D11InputLayoutCacheTest : public ANGLETest
>         {
>             strstr << "    v += a" << attribIndex << ";" << std::endl;
>         }
>-        strstr << "    gl_Position = vec4(position, 0.0, 1.0);" << std::endl
>-               << "}" << std::endl;
>+        strstr << "    gl_Position = vec4(position, 0.0, 1.0);" << std::endl << "}" << std::endl;
> 
>-        const std::string basicFragmentShader =
>+        constexpr char kFS[] =
>             "varying highp float v;\n"
>             "void main() {"
>             "   gl_FragColor = vec4(v / 255.0, 0.0, 0.0, 1.0);\n"
>             "}\n";
> 
>-        return CompileProgram(strstr.str(), basicFragmentShader);
>+        return CompileProgram(strstr.str().c_str(), kFS);
>     }
> };
> 
>@@ -65,9 +65,9 @@ class D3D11InputLayoutCacheTest : public ANGLETest
> TEST_P(D3D11InputLayoutCacheTest, StressTest)
> {
>     // Hack the ANGLE!
>-    gl::Context *context = reinterpret_cast<gl::Context *>(getEGLWindow()->getContext());
>-    rx::Context11 *context11               = rx::GetImplAs<rx::Context11>(context);
>-    rx::Renderer11 *renderer11             = context11->getRenderer();
>+    gl::Context *context       = static_cast<gl::Context *>(getEGLWindow()->getContext());
>+    rx::Context11 *context11   = rx::GetImplAs<rx::Context11>(context);
>+    rx::Renderer11 *renderer11 = context11->getRenderer();
>     rx::InputLayoutCache *inputLayoutCache = renderer11->getStateManager()->getInputLayoutCache();
> 
>     // Clamp the cache size to something tiny
>diff --git a/Source/ThirdParty/ANGLE/src/tests/gl_tests/D3DImageFormatConversionTest.cpp b/Source/ThirdParty/ANGLE/src/tests/gl_tests/D3DImageFormatConversionTest.cpp
>index a1ba257d0ab..2866694e05b 100644
>--- a/Source/ThirdParty/ANGLE/src/tests/gl_tests/D3DImageFormatConversionTest.cpp
>+++ b/Source/ThirdParty/ANGLE/src/tests/gl_tests/D3DImageFormatConversionTest.cpp
>@@ -32,28 +32,26 @@ class D3DImageFormatConversionTest : public ANGLETest
>     {
>         ANGLETest::SetUp();
> 
>-        const std::string vertexShaderSource =
>-            R"(precision highp float;
>-            attribute vec4 position;
>-            varying vec2 texcoord;
>-
>-            void main()
>-            {
>-                gl_Position = vec4(position.xy, 0.0, 1.0);
>-                texcoord = (position.xy * 0.5) + 0.5;
>-            })";
>-
>-        const std::string fragmentShaderSource2D =
>-            R"(precision highp float;
>-            uniform sampler2D tex;
>-            varying vec2 texcoord;
>-
>-            void main()
>-            {
>-                gl_FragColor = texture2D(tex, texcoord);
>-            })";
>-
>-        m2DProgram = CompileProgram(vertexShaderSource, fragmentShaderSource2D);
>+        constexpr char kVS[] = R"(precision highp float;
>+attribute vec4 position;
>+varying vec2 texcoord;
>+
>+void main()
>+{
>+    gl_Position = vec4(position.xy, 0.0, 1.0);
>+    texcoord = (position.xy * 0.5) + 0.5;
>+})";
>+
>+        constexpr char kFS[] = R"(precision highp float;
>+uniform sampler2D tex;
>+varying vec2 texcoord;
>+
>+void main()
>+{
>+    gl_FragColor = texture2D(tex, texcoord);
>+})";
>+
>+        m2DProgram                = CompileProgram(kVS, kFS);
>         mTexture2DUniformLocation = glGetUniformLocation(m2DProgram, "tex");
>     }
> 
>@@ -64,8 +62,9 @@ class D3DImageFormatConversionTest : public ANGLETest
>         ANGLETest::TearDown();
>     }
> 
>-    // Uses ColorStructType::writeColor to populate initial data for a texture, pass it to glTexImage2D, then render with it.
>-    // The resulting colors should match the colors passed into ::writeColor.
>+    // Uses ColorStructType::writeColor to populate initial data for a texture, pass it to
>+    // glTexImage2D, then render with it. The resulting colors should match the colors passed into
>+    // ::writeColor.
>     template <typename ColorStructType>
>     void runTest(GLenum tex2DFormat, GLenum tex2DType)
>     {
>@@ -78,10 +77,22 @@ class D3DImageFormatConversionTest : public ANGLETest
>         glGenFramebuffers(1, &fbo);
>         EXPECT_GL_NO_ERROR();
> 
>-        srcColorF[0].red = 1.0f; srcColorF[0].green = 0.0f; srcColorF[0].blue = 0.0f; srcColorF[0].alpha = 1.0f; // Red
>-        srcColorF[1].red = 0.0f; srcColorF[1].green = 1.0f; srcColorF[1].blue = 0.0f; srcColorF[1].alpha = 1.0f; // Green
>-        srcColorF[2].red = 0.0f; srcColorF[2].green = 0.0f; srcColorF[2].blue = 1.0f; srcColorF[2].alpha = 1.0f; // Blue
>-        srcColorF[3].red = 1.0f; srcColorF[3].green = 1.0f; srcColorF[3].blue = 0.0f; srcColorF[3].alpha = 1.0f; // Red + Green (Yellow)
>+        srcColorF[0].red   = 1.0f;
>+        srcColorF[0].green = 0.0f;
>+        srcColorF[0].blue  = 0.0f;
>+        srcColorF[0].alpha = 1.0f;  // Red
>+        srcColorF[1].red   = 0.0f;
>+        srcColorF[1].green = 1.0f;
>+        srcColorF[1].blue  = 0.0f;
>+        srcColorF[1].alpha = 1.0f;  // Green
>+        srcColorF[2].red   = 0.0f;
>+        srcColorF[2].green = 0.0f;
>+        srcColorF[2].blue  = 1.0f;
>+        srcColorF[2].alpha = 1.0f;  // Blue
>+        srcColorF[3].red   = 1.0f;
>+        srcColorF[3].green = 1.0f;
>+        srcColorF[3].blue  = 0.0f;
>+        srcColorF[3].alpha = 1.0f;  // Red + Green (Yellow)
> 
>         // Convert the ColorF into the pixels that will be fed to glTexImage2D
>         for (unsigned int i = 0; i < 4; i++)
>@@ -105,10 +116,10 @@ class D3DImageFormatConversionTest : public ANGLETest
>         EXPECT_GL_NO_ERROR();
> 
>         // Check that the pixel colors match srcColorF
>-        EXPECT_PIXEL_EQ(                    0,                    0, 255,   0,   0, 255);
>-        EXPECT_PIXEL_EQ(getWindowHeight() - 1,                    0,   0, 255,   0, 255);
>-        EXPECT_PIXEL_EQ(                    0, getWindowWidth() - 1,   0,   0, 255, 255);
>-        EXPECT_PIXEL_EQ(getWindowHeight() - 1, getWindowWidth() - 1, 255, 255,   0, 255);
>+        EXPECT_PIXEL_EQ(0, 0, 255, 0, 0, 255);
>+        EXPECT_PIXEL_EQ(getWindowHeight() - 1, 0, 0, 255, 0, 255);
>+        EXPECT_PIXEL_EQ(0, getWindowWidth() - 1, 0, 0, 255, 255);
>+        EXPECT_PIXEL_EQ(getWindowHeight() - 1, getWindowWidth() - 1, 255, 255, 0, 255);
>         swapBuffers();
> 
>         glDeleteFramebuffers(1, &fbo);
>@@ -150,9 +161,16 @@ TEST_P(D3DImageFormatConversionTest, WriteColorFunctionR8G8B8)
>     runTest<R8G8B8>(GL_RGB, GL_UNSIGNED_BYTE);
> }
> 
>-// Use this to select which configurations (e.g. which renderer, which GLES major version) these tests should be run against.
>-// Even though this test is only run on Windows (since it includes imageformats.h from the D3D renderer), we can still run the test
>-// against OpenGL. This is valuable, since it provides extra validation using a renderer that doesn't use imageformats.h itself.
>-ANGLE_INSTANTIATE_TEST(D3DImageFormatConversionTest, ES2_D3D9(), ES2_D3D11(), ES2_D3D11_FL9_3(), ES2_OPENGL());
>-
>-} // namespace
>+// Use this to select which configurations (e.g. which renderer, which GLES major version) these
>+// tests should be run against. Even though this test is only run on Windows (since it includes
>+// imageformats.h from the D3D renderer), we can still run the test against OpenGL. This is
>+// valuable, since it provides extra validation using a renderer that doesn't use imageformats.h
>+// itself.
>+ANGLE_INSTANTIATE_TEST(D3DImageFormatConversionTest,
>+                       ES2_D3D9(),
>+                       ES2_D3D11(),
>+                       ES2_D3D11_FL9_3(),
>+                       ES2_OPENGL(),
>+                       ES2_VULKAN());
>+
>+}  // namespace
>diff --git a/Source/ThirdParty/ANGLE/src/tests/gl_tests/D3DTextureTest.cpp b/Source/ThirdParty/ANGLE/src/tests/gl_tests/D3DTextureTest.cpp
>index dfbf16fbd2b..b786a1a24e8 100644
>--- a/Source/ThirdParty/ANGLE/src/tests/gl_tests/D3DTextureTest.cpp
>+++ b/Source/ThirdParty/ANGLE/src/tests/gl_tests/D3DTextureTest.cpp
>@@ -12,7 +12,8 @@
> #include <d3d11.h>
> #include <windows.h>
> 
>-#include "com_utils.h"
>+#include "util/EGLWindow.h"
>+#include "util/com_utils.h"
> 
> namespace angle
> {
>@@ -36,7 +37,7 @@ class D3DTextureTest : public ANGLETest
>     {
>         ANGLETest::SetUp();
> 
>-        const std::string vsSource =
>+        constexpr char kVS[] =
>             R"(precision highp float;
>             attribute vec4 position;
>             varying vec2 texcoord;
>@@ -48,7 +49,7 @@ class D3DTextureTest : public ANGLETest
>                 texcoord.y = 1.0 - texcoord.y;
>             })";
> 
>-        const std::string textureFSSource =
>+        constexpr char kTextureFS[] =
>             R"(precision highp float;
>             uniform sampler2D tex;
>             varying vec2 texcoord;
>@@ -58,7 +59,7 @@ class D3DTextureTest : public ANGLETest
>                 gl_FragColor = texture2D(tex, texcoord);
>             })";
> 
>-        const std::string textureFSSourceNoSampling =
>+        constexpr char kTextureFSNoSampling[] =
>             R"(precision highp float;
> 
>             void main()
>@@ -66,13 +67,13 @@ class D3DTextureTest : public ANGLETest
>                 gl_FragColor = vec4(1.0, 0.0, 1.0, 1.0);
>             })";
> 
>-        mTextureProgram = CompileProgram(vsSource, textureFSSource);
>+        mTextureProgram = CompileProgram(kVS, kTextureFS);
>         ASSERT_NE(0u, mTextureProgram) << "shader compilation failed.";
> 
>         mTextureUniformLocation = glGetUniformLocation(mTextureProgram, "tex");
>         ASSERT_NE(-1, mTextureUniformLocation);
> 
>-        mTextureProgramNoSampling = CompileProgram(vsSource, textureFSSourceNoSampling);
>+        mTextureProgramNoSampling = CompileProgram(kVS, kTextureFSNoSampling);
>         ASSERT_NE(0u, mTextureProgramNoSampling) << "shader compilation failed.";
> 
>         mD3D11Module = LoadLibrary(TEXT("d3d11.dll"));
>@@ -83,7 +84,7 @@ class D3DTextureTest : public ANGLETest
> 
>         EGLWindow *window  = getEGLWindow();
>         EGLDisplay display = window->getDisplay();
>-        if (eglDisplayExtensionEnabled(display, "EGL_EXT_device_query"))
>+        if (IsEGLDisplayExtensionEnabled(display, "EGL_EXT_device_query"))
>         {
>             PFNEGLQUERYDISPLAYATTRIBEXTPROC eglQueryDisplayAttribEXT =
>                 reinterpret_cast<PFNEGLQUERYDISPLAYATTRIBEXTPROC>(
>@@ -99,7 +100,7 @@ class D3DTextureTest : public ANGLETest
>                 device = reinterpret_cast<EGLDeviceEXT>(result);
>             }
> 
>-            if (eglDeviceExtensionEnabled(device, "EGL_ANGLE_device_d3d"))
>+            if (IsEGLDeviceExtensionEnabled(device, "EGL_ANGLE_device_d3d"))
>             {
>                 EGLAttrib result = 0;
>                 if (eglQueryDeviceAttribEXT(device, EGL_D3D11_DEVICE_ANGLE, &result))
>@@ -146,23 +147,17 @@ class D3DTextureTest : public ANGLETest
> 
>     EGLSurface createD3D11PBuffer(size_t width,
>                                   size_t height,
>-                                  EGLint eglTextureFormat,
>-                                  EGLint eglTextureTarget,
>                                   UINT sampleCount,
>                                   UINT sampleQuality,
>                                   UINT bindFlags,
>-                                  DXGI_FORMAT format)
>+                                  DXGI_FORMAT format,
>+                                  const EGLint *attribs)
>     {
>         EGLWindow *window  = getEGLWindow();
>         EGLDisplay display = window->getDisplay();
>         EGLConfig config   = window->getConfig();
> 
>-        EGLint attribs[] = {
>-            EGL_TEXTURE_FORMAT, eglTextureFormat, EGL_TEXTURE_TARGET,
>-            eglTextureTarget,   EGL_NONE,         EGL_NONE,
>-        };
>-
>-        ASSERT(mD3D11Device);
>+        EXPECT_TRUE(mD3D11Device != nullptr);
>         ID3D11Texture2D *texture = nullptr;
>         CD3D11_TEXTURE2D_DESC desc(format, static_cast<UINT>(width), static_cast<UINT>(height), 1,
>                                    1, bindFlags);
>@@ -178,6 +173,23 @@ class D3DTextureTest : public ANGLETest
>         return pbuffer;
>     }
> 
>+    EGLSurface createD3D11PBuffer(size_t width,
>+                                  size_t height,
>+                                  EGLint eglTextureFormat,
>+                                  EGLint eglTextureTarget,
>+                                  UINT sampleCount,
>+                                  UINT sampleQuality,
>+                                  UINT bindFlags,
>+                                  DXGI_FORMAT format)
>+    {
>+        EGLint attribs[] = {
>+            EGL_TEXTURE_FORMAT, eglTextureFormat, EGL_TEXTURE_TARGET,
>+            eglTextureTarget,   EGL_NONE,         EGL_NONE,
>+        };
>+        return createD3D11PBuffer(width, height, sampleCount, sampleQuality, bindFlags, format,
>+                                  attribs);
>+    }
>+
>     EGLSurface createPBuffer(size_t width,
>                              size_t height,
>                              EGLint eglTextureFormat,
>@@ -204,8 +216,8 @@ class D3DTextureTest : public ANGLETest
>             };
> 
>             // Multisampled textures are not supported on D3D9.
>-            ASSERT(sampleCount <= 1);
>-            ASSERT(sampleQuality == 0);
>+            EXPECT_TRUE(sampleCount <= 1);
>+            EXPECT_TRUE(sampleQuality == 0);
> 
>             IDirect3DTexture9 *texture = nullptr;
>             EXPECT_TRUE(SUCCEEDED(mD3D9Device->CreateTexture(
>@@ -229,7 +241,7 @@ class D3DTextureTest : public ANGLETest
>     {
>         EGLWindow *window  = getEGLWindow();
>         EGLDisplay display = window->getDisplay();
>-        if (!eglDisplayExtensionEnabled(display, "EGL_ANGLE_d3d_texture_client_buffer"))
>+        if (!IsEGLDisplayExtensionEnabled(display, "EGL_ANGLE_d3d_texture_client_buffer"))
>         {
>             std::cout << "Test skipped due to missing EGL_ANGLE_d3d_texture_client_buffer"
>                       << std::endl;
>@@ -256,6 +268,34 @@ class D3DTextureTest : public ANGLETest
>         return true;
>     }
> 
>+    void testTextureSamplesAs50PercentGreen(GLuint texture)
>+    {
>+        GLFramebuffer scratchFbo;
>+        glBindFramebuffer(GL_FRAMEBUFFER, scratchFbo);
>+        GLTexture scratchTexture;
>+        glBindTexture(GL_TEXTURE_2D, scratchTexture);
>+        glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, 32, 32, 0, GL_RGBA, GL_UNSIGNED_BYTE, nullptr);
>+        glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, scratchTexture,
>+                               0);
>+
>+        glClearColor(1.0f, 0.0f, 0.0f, 1.0f);
>+        glClear(GL_COLOR_BUFFER_BIT);
>+
>+        glUseProgram(mTextureProgram);
>+        glUniform1i(mTextureUniformLocation, 0);
>+        glActiveTexture(GL_TEXTURE0);
>+        glBindTexture(GL_TEXTURE_2D, texture);
>+        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
>+        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
>+        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
>+        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
>+
>+        drawQuad(mTextureProgram, "position", 0.5f);
>+        ASSERT_GL_NO_ERROR();
>+
>+        EXPECT_PIXEL_COLOR_NEAR(0, 0, GLColor(0u, 127u, 0u, 255u), 2);
>+    }
>+
>     GLuint mTextureProgram;
>     GLuint mTextureProgramNoSampling;
>     GLint mTextureUniformLocation;
>@@ -266,31 +306,433 @@ class D3DTextureTest : public ANGLETest
>     IDirect3DDevice9 *mD3D9Device = nullptr;
> };
> 
>-// Test creating pbuffer from textures with several
>-// different DXGI formats.
>-TEST_P(D3DTextureTest, TestD3D11SupportedFormats)
>+// Test creating pbuffer from textures with several different DXGI formats.
>+TEST_P(D3DTextureTest, TestD3D11SupportedFormatsSurface)
> {
>-    ANGLE_SKIP_TEST_IF(!valid() || !IsD3D11());
>+    bool srgbSupported = IsGLExtensionEnabled("GL_EXT_sRGB") || getClientMajorVersion() == 3;
>+    ANGLE_SKIP_TEST_IF(!valid() || !mD3D11Device || !srgbSupported);
> 
>     const DXGI_FORMAT formats[] = {DXGI_FORMAT_R8G8B8A8_UNORM, DXGI_FORMAT_R8G8B8A8_UNORM_SRGB,
>                                    DXGI_FORMAT_B8G8R8A8_UNORM, DXGI_FORMAT_B8G8R8A8_UNORM_SRGB};
>     for (size_t i = 0; i < 4; ++i)
>     {
>+        if (formats[i] == DXGI_FORMAT_B8G8R8A8_UNORM_SRGB)
>+        {
>+            if (IsOpenGL())
>+            {
>+                // This generates an invalid format error when calling wglDXRegisterObjectNV().
>+                // Reproducible at least on NVIDIA driver 390.65 on Windows 10.
>+                std::cout << "DXGI_FORMAT_B8G8R8A8_UNORM_SRGB subtest skipped: IsOpenGL().\n";
>+                continue;
>+            }
>+        }
>+
>         EGLSurface pbuffer = createD3D11PBuffer(32, 32, EGL_TEXTURE_RGBA, EGL_TEXTURE_2D, 1, 0,
>                                                 D3D11_BIND_RENDER_TARGET, formats[i]);
>         ASSERT_EGL_SUCCESS();
>-        ASSERT_NE(pbuffer, EGL_NO_SURFACE);
>+        ASSERT_NE(EGL_NO_SURFACE, pbuffer);
> 
>         EGLWindow *window  = getEGLWindow();
>         EGLDisplay display = window->getDisplay();
>+
>+        EGLint colorspace = EGL_NONE;
>+        eglQuerySurface(display, pbuffer, EGL_GL_COLORSPACE, &colorspace);
>+
>+        if (formats[i] == DXGI_FORMAT_R8G8B8A8_UNORM_SRGB ||
>+            formats[i] == DXGI_FORMAT_B8G8R8A8_UNORM_SRGB)
>+        {
>+            EXPECT_EQ(EGL_GL_COLORSPACE_SRGB, colorspace);
>+        }
>+        else
>+        {
>+            EXPECT_EQ(EGL_GL_COLORSPACE_LINEAR, colorspace);
>+        }
>+
>         eglMakeCurrent(display, pbuffer, pbuffer, window->getContext());
>         ASSERT_EGL_SUCCESS();
>-
>         window->makeCurrent();
>         eglDestroySurface(display, pbuffer);
>     }
> }
> 
>+// Test binding a pbuffer created from a D3D texture as a texture image with several different DXGI
>+// formats. The test renders to and samples from the pbuffer.
>+TEST_P(D3DTextureTest, TestD3D11SupportedFormatsTexture)
>+{
>+    bool srgb8alpha8TextureAttachmentSupported = getClientMajorVersion() >= 3;
>+    ANGLE_SKIP_TEST_IF(!valid() || !mD3D11Device || !srgb8alpha8TextureAttachmentSupported);
>+
>+    bool srgbWriteControlSupported =
>+        IsGLExtensionEnabled("GL_EXT_sRGB_write_control") && !IsOpenGL();
>+
>+    const DXGI_FORMAT formats[] = {DXGI_FORMAT_R8G8B8A8_UNORM, DXGI_FORMAT_B8G8R8A8_UNORM,
>+                                   DXGI_FORMAT_R8G8B8A8_UNORM_SRGB,
>+                                   DXGI_FORMAT_B8G8R8A8_UNORM_SRGB};
>+    for (size_t i = 0; i < 4; ++i)
>+    {
>+        if (formats[i] == DXGI_FORMAT_B8G8R8A8_UNORM_SRGB)
>+        {
>+            if (IsOpenGL())
>+            {
>+                // This generates an invalid format error when calling wglDXRegisterObjectNV().
>+                // Reproducible at least on NVIDIA driver 390.65 on Windows 10.
>+                std::cout << "DXGI_FORMAT_B8G8R8A8_UNORM_SRGB subtest skipped: IsOpenGL().\n";
>+                continue;
>+            }
>+        }
>+
>+        SCOPED_TRACE(std::string("Test case:") + std::to_string(i));
>+        EGLWindow *window  = getEGLWindow();
>+        EGLDisplay display = window->getDisplay();
>+
>+        EGLSurface pbuffer =
>+            createD3D11PBuffer(32, 32, EGL_TEXTURE_RGBA, EGL_TEXTURE_2D, 1, 0,
>+                               D3D11_BIND_RENDER_TARGET | D3D11_BIND_SHADER_RESOURCE, formats[i]);
>+        ASSERT_EGL_SUCCESS();
>+        ASSERT_NE(EGL_NO_SURFACE, pbuffer);
>+
>+        EGLint colorspace = EGL_NONE;
>+        eglQuerySurface(display, pbuffer, EGL_GL_COLORSPACE, &colorspace);
>+
>+        GLuint texture = 0u;
>+        glGenTextures(1, &texture);
>+        glBindTexture(GL_TEXTURE_2D, texture);
>+        EGLBoolean result = eglBindTexImage(display, pbuffer, EGL_BACK_BUFFER);
>+        ASSERT_EGL_SUCCESS();
>+        ASSERT_EGL_TRUE(result);
>+
>+        GLuint fbo = 0u;
>+        glGenFramebuffers(1, &fbo);
>+        glBindFramebuffer(GL_FRAMEBUFFER, fbo);
>+        glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, texture, 0);
>+        glViewport(0, 0, 32, 32);
>+
>+        GLint colorEncoding = 0;
>+        glGetFramebufferAttachmentParameteriv(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0,
>+                                              GL_FRAMEBUFFER_ATTACHMENT_COLOR_ENCODING_EXT,
>+                                              &colorEncoding);
>+
>+        if (formats[i] == DXGI_FORMAT_R8G8B8A8_UNORM_SRGB ||
>+            formats[i] == DXGI_FORMAT_B8G8R8A8_UNORM_SRGB)
>+        {
>+            EXPECT_EQ(EGL_GL_COLORSPACE_SRGB, colorspace);
>+            EXPECT_EQ(GL_SRGB_EXT, colorEncoding);
>+        }
>+        else
>+        {
>+            EXPECT_EQ(EGL_GL_COLORSPACE_LINEAR, colorspace);
>+            EXPECT_EQ(GL_LINEAR, colorEncoding);
>+        }
>+
>+        // Clear the texture with 50% green and check that the color value written is correct.
>+        glClearColor(0.0f, 0.5f, 0.0f, 1.0f);
>+
>+        if (colorEncoding == GL_SRGB_EXT)
>+        {
>+            glClear(GL_COLOR_BUFFER_BIT);
>+            EXPECT_PIXEL_COLOR_NEAR(0, 0, GLColor(0u, 188u, 0u, 255u), 2);
>+            // Disable SRGB and run the non-sRGB test case.
>+            if (srgbWriteControlSupported)
>+                glDisable(GL_FRAMEBUFFER_SRGB_EXT);
>+        }
>+
>+        if (colorEncoding == GL_LINEAR || srgbWriteControlSupported)
>+        {
>+            glClear(GL_COLOR_BUFFER_BIT);
>+            EXPECT_PIXEL_COLOR_NEAR(0, 0, GLColor(0u, 127u, 0u, 255u), 2);
>+        }
>+
>+        // Draw with the texture to a linear framebuffer and check that the color value written is
>+        // correct.
>+        testTextureSamplesAs50PercentGreen(texture);
>+
>+        glBindFramebuffer(GL_FRAMEBUFFER, 0u);
>+        glBindTexture(GL_TEXTURE_2D, 0u);
>+        glDeleteTextures(1, &texture);
>+        glDeleteFramebuffers(1, &fbo);
>+        eglDestroySurface(display, pbuffer);
>+    }
>+}
>+
>+// Test binding a pbuffer created from a D3D texture as a texture image with typeless texture
>+// formats.
>+TEST_P(D3DTextureTest, TestD3D11TypelessTexture)
>+{
>+    EGLWindow *window  = getEGLWindow();
>+    EGLDisplay display = window->getDisplay();
>+
>+    ANGLE_SKIP_TEST_IF(!valid());
>+
>+    // Typeless formats are optional in the spec and currently only supported on D3D11 backend.
>+    ANGLE_SKIP_TEST_IF(!IsD3D11());
>+
>+    // GL_SRGB8_ALPHA8 texture attachment support is required.
>+    ANGLE_SKIP_TEST_IF(getClientMajorVersion() < 3);
>+
>+    const std::array<EGLint, 2> eglGlColorspaces = {EGL_GL_COLORSPACE_LINEAR,
>+                                                    EGL_GL_COLORSPACE_SRGB};
>+    const std::array<DXGI_FORMAT, 2> dxgiFormats = {DXGI_FORMAT_R8G8B8A8_TYPELESS,
>+                                                    DXGI_FORMAT_B8G8R8A8_TYPELESS};
>+    for (auto eglGlColorspace : eglGlColorspaces)
>+    {
>+        for (auto dxgiFormat : dxgiFormats)
>+        {
>+            SCOPED_TRACE(std::string("Test case:") + std::to_string(eglGlColorspace) + " / " +
>+                         std::to_string(dxgiFormat));
>+
>+            EGLint attribs[] = {
>+                EGL_TEXTURE_FORMAT, EGL_TEXTURE_RGBA, EGL_TEXTURE_TARGET, EGL_TEXTURE_2D,
>+                EGL_GL_COLORSPACE,  eglGlColorspace,  EGL_NONE,           EGL_NONE,
>+            };
>+
>+            EGLSurface pbuffer = createD3D11PBuffer(
>+                32, 32, 1, 0, D3D11_BIND_RENDER_TARGET | D3D11_BIND_SHADER_RESOURCE, dxgiFormat,
>+                attribs);
>+
>+            ASSERT_EGL_SUCCESS();
>+            ASSERT_NE(EGL_NO_SURFACE, pbuffer);
>+
>+            EGLint colorspace = EGL_NONE;
>+            eglQuerySurface(display, pbuffer, EGL_GL_COLORSPACE, &colorspace);
>+
>+            GLuint texture = 0u;
>+            glGenTextures(1, &texture);
>+            glBindTexture(GL_TEXTURE_2D, texture);
>+            EGLBoolean result = eglBindTexImage(display, pbuffer, EGL_BACK_BUFFER);
>+            ASSERT_EGL_SUCCESS();
>+            ASSERT_EGL_TRUE(result);
>+
>+            GLuint fbo = 0u;
>+            glGenFramebuffers(1, &fbo);
>+            glBindFramebuffer(GL_FRAMEBUFFER, fbo);
>+            glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, texture, 0);
>+            glViewport(0, 0, 32, 32);
>+
>+            GLint colorEncoding = 0;
>+            glGetFramebufferAttachmentParameteriv(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0,
>+                                                  GL_FRAMEBUFFER_ATTACHMENT_COLOR_ENCODING_EXT,
>+                                                  &colorEncoding);
>+
>+            if (eglGlColorspace == EGL_GL_COLORSPACE_LINEAR)
>+            {
>+                EXPECT_EQ(EGL_GL_COLORSPACE_LINEAR, colorspace);
>+                EXPECT_EQ(GL_LINEAR, colorEncoding);
>+            }
>+            else
>+            {
>+                EXPECT_EQ(EGL_GL_COLORSPACE_SRGB, colorspace);
>+                EXPECT_EQ(GL_SRGB_EXT, colorEncoding);
>+            }
>+
>+            // Clear the texture with 50% green and check that the color value written is correct.
>+            glClearColor(0.0f, 0.5f, 0.0f, 1.0f);
>+
>+            if (colorEncoding == GL_SRGB_EXT)
>+            {
>+                glClear(GL_COLOR_BUFFER_BIT);
>+                EXPECT_PIXEL_COLOR_NEAR(0, 0, GLColor(0u, 188u, 0u, 255u), 2);
>+            }
>+            if (colorEncoding == GL_LINEAR)
>+            {
>+                glClear(GL_COLOR_BUFFER_BIT);
>+                EXPECT_PIXEL_COLOR_NEAR(0, 0, GLColor(0u, 127u, 0u, 255u), 2);
>+            }
>+
>+            // Draw with the texture to a linear framebuffer and check that the color value written
>+            // is correct.
>+            testTextureSamplesAs50PercentGreen(texture);
>+
>+            glBindFramebuffer(GL_FRAMEBUFFER, 0u);
>+            glBindTexture(GL_TEXTURE_2D, 0u);
>+            glDeleteTextures(1, &texture);
>+            glDeleteFramebuffers(1, &fbo);
>+            eglDestroySurface(display, pbuffer);
>+        }
>+    }
>+}
>+
>+class D3DTextureTestES3 : public D3DTextureTest
>+{
>+  protected:
>+    D3DTextureTestES3() : D3DTextureTest() {}
>+};
>+
>+// Test swizzling a pbuffer created from a D3D texture as a texture image with typeless texture
>+// formats.
>+TEST_P(D3DTextureTestES3, TestD3D11TypelessTextureSwizzle)
>+{
>+    EGLWindow *window  = getEGLWindow();
>+    EGLDisplay display = window->getDisplay();
>+
>+    ANGLE_SKIP_TEST_IF(!valid());
>+
>+    // Typeless formats are optional in the spec and currently only supported on D3D11 backend.
>+    ANGLE_SKIP_TEST_IF(!IsD3D11());
>+
>+    const std::array<EGLint, 2> eglGlColorspaces = {EGL_GL_COLORSPACE_LINEAR,
>+                                                    EGL_GL_COLORSPACE_SRGB};
>+    const std::array<DXGI_FORMAT, 2> dxgiFormats = {DXGI_FORMAT_R8G8B8A8_TYPELESS,
>+                                                    DXGI_FORMAT_B8G8R8A8_TYPELESS};
>+    for (auto eglGlColorspace : eglGlColorspaces)
>+    {
>+        for (auto dxgiFormat : dxgiFormats)
>+        {
>+            SCOPED_TRACE(std::string("Test case:") + std::to_string(eglGlColorspace) + " / " +
>+                         std::to_string(dxgiFormat));
>+
>+            EGLint attribs[] = {
>+                EGL_TEXTURE_FORMAT, EGL_TEXTURE_RGBA, EGL_TEXTURE_TARGET, EGL_TEXTURE_2D,
>+                EGL_GL_COLORSPACE,  eglGlColorspace,  EGL_NONE,           EGL_NONE,
>+            };
>+
>+            EGLSurface pbuffer = createD3D11PBuffer(
>+                32, 32, 1, 0, D3D11_BIND_RENDER_TARGET | D3D11_BIND_SHADER_RESOURCE, dxgiFormat,
>+                attribs);
>+
>+            ASSERT_EGL_SUCCESS();
>+            ASSERT_NE(EGL_NO_SURFACE, pbuffer);
>+
>+            EGLint colorspace = EGL_NONE;
>+            eglQuerySurface(display, pbuffer, EGL_GL_COLORSPACE, &colorspace);
>+
>+            GLuint texture = 0u;
>+            glGenTextures(1, &texture);
>+            glBindTexture(GL_TEXTURE_2D, texture);
>+            EGLBoolean result = eglBindTexImage(display, pbuffer, EGL_BACK_BUFFER);
>+            ASSERT_EGL_SUCCESS();
>+            ASSERT_EGL_TRUE(result);
>+
>+            GLuint fbo = 0u;
>+            glGenFramebuffers(1, &fbo);
>+            glBindFramebuffer(GL_FRAMEBUFFER, fbo);
>+            glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, texture, 0);
>+            glViewport(0, 0, 32, 32);
>+
>+            GLint colorEncoding = 0;
>+            glGetFramebufferAttachmentParameteriv(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0,
>+                                                  GL_FRAMEBUFFER_ATTACHMENT_COLOR_ENCODING_EXT,
>+                                                  &colorEncoding);
>+
>+            // Clear the texture with 50% blue and check that the color value written is correct.
>+            glClearColor(0.0f, 0.0f, 0.5f, 1.0f);
>+
>+            if (colorEncoding == GL_SRGB_EXT)
>+            {
>+                glClear(GL_COLOR_BUFFER_BIT);
>+                EXPECT_PIXEL_COLOR_NEAR(0, 0, GLColor(0u, 0u, 188u, 255u), 2);
>+            }
>+            if (colorEncoding == GL_LINEAR)
>+            {
>+                glClear(GL_COLOR_BUFFER_BIT);
>+                EXPECT_PIXEL_COLOR_NEAR(0, 0, GLColor(0u, 0u, 127u, 255u), 2);
>+            }
>+
>+            // Swizzle the green channel to be sampled from the blue channel of the texture and vice
>+            // versa.
>+            glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_SWIZZLE_G, GL_BLUE);
>+            glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_SWIZZLE_B, GL_GREEN);
>+            ASSERT_GL_NO_ERROR();
>+
>+            // Draw with the texture to a linear framebuffer and check that the color value written
>+            // is correct.
>+            testTextureSamplesAs50PercentGreen(texture);
>+
>+            glBindFramebuffer(GL_FRAMEBUFFER, 0u);
>+            glBindTexture(GL_TEXTURE_2D, 0u);
>+            glDeleteTextures(1, &texture);
>+            glDeleteFramebuffers(1, &fbo);
>+            eglDestroySurface(display, pbuffer);
>+        }
>+    }
>+}
>+
>+// Test that EGL_GL_COLORSPACE attrib is not allowed for typed D3D textures.
>+TEST_P(D3DTextureTest, GlColorspaceNotAllowedForTypedD3DTexture)
>+{
>+    ANGLE_SKIP_TEST_IF(!valid());
>+
>+    // D3D11 device is required to be able to create the texture.
>+    ANGLE_SKIP_TEST_IF(!mD3D11Device);
>+
>+    // SRGB support is required.
>+    ANGLE_SKIP_TEST_IF(!IsGLExtensionEnabled("GL_EXT_sRGB") && getClientMajorVersion() < 3);
>+
>+    EGLint attribsExplicitColorspace[] = {
>+        EGL_TEXTURE_FORMAT, EGL_TEXTURE_RGBA,       EGL_TEXTURE_TARGET, EGL_TEXTURE_2D,
>+        EGL_GL_COLORSPACE,  EGL_GL_COLORSPACE_SRGB, EGL_NONE,           EGL_NONE,
>+    };
>+    EGLSurface pbuffer =
>+        createD3D11PBuffer(32, 32, 1, 0, D3D11_BIND_RENDER_TARGET | D3D11_BIND_SHADER_RESOURCE,
>+                           DXGI_FORMAT_R8G8B8A8_UNORM, attribsExplicitColorspace);
>+
>+    ASSERT_EGL_ERROR(EGL_BAD_MATCH);
>+    ASSERT_EQ(EGL_NO_SURFACE, pbuffer);
>+}
>+
>+// Test that trying to create a pbuffer from a typeless texture fails as expected on the backends
>+// where they are known not to be supported.
>+TEST_P(D3DTextureTest, TypelessD3DTextureNotSupported)
>+{
>+    ANGLE_SKIP_TEST_IF(!valid());
>+
>+    // D3D11 device is required to be able to create the texture.
>+    ANGLE_SKIP_TEST_IF(!mD3D11Device);
>+
>+    // Currently typeless textures are supported on the D3D11 backend. We're testing the backends
>+    // where there is no support.
>+    ANGLE_SKIP_TEST_IF(IsD3D11());
>+
>+    // SRGB support is required.
>+    ANGLE_SKIP_TEST_IF(!IsGLExtensionEnabled("GL_EXT_sRGB") && getClientMajorVersion() < 3);
>+
>+    EGLint attribs[] = {
>+        EGL_TEXTURE_FORMAT, EGL_TEXTURE_RGBA, EGL_TEXTURE_TARGET,
>+        EGL_TEXTURE_2D,     EGL_NONE,         EGL_NONE,
>+    };
>+    EGLSurface pbuffer =
>+        createD3D11PBuffer(32, 32, 1, 0, D3D11_BIND_RENDER_TARGET | D3D11_BIND_SHADER_RESOURCE,
>+                           DXGI_FORMAT_R8G8B8A8_TYPELESS, attribs);
>+    ASSERT_EGL_ERROR(EGL_BAD_PARAMETER);
>+    ASSERT_EQ(EGL_NO_SURFACE, pbuffer);
>+}
>+
>+// Test creating a pbuffer with unnecessary EGL_WIDTH and EGL_HEIGHT attributes because that's what
>+// Chromium does. This is a regression test for crbug.com/794086
>+TEST_P(D3DTextureTest, UnnecessaryWidthHeightAttributes)
>+{
>+    ANGLE_SKIP_TEST_IF(!valid() || !IsD3D11());
>+    ASSERT_TRUE(mD3D11Device != nullptr);
>+    ID3D11Texture2D *texture = nullptr;
>+    CD3D11_TEXTURE2D_DESC desc(DXGI_FORMAT_R8G8B8A8_UNORM, 1, 1, 1, 1, D3D11_BIND_RENDER_TARGET);
>+    desc.SampleDesc.Count   = 1;
>+    desc.SampleDesc.Quality = 0;
>+    EXPECT_TRUE(SUCCEEDED(mD3D11Device->CreateTexture2D(&desc, nullptr, &texture)));
>+
>+    EGLint attribs[] = {
>+        EGL_TEXTURE_FORMAT, EGL_TEXTURE_RGBA,
>+        EGL_TEXTURE_TARGET, EGL_TEXTURE_2D,
>+        EGL_WIDTH,          1,
>+        EGL_HEIGHT,         1,
>+        EGL_NONE,           EGL_NONE,
>+    };
>+
>+    EGLWindow *window  = getEGLWindow();
>+    EGLDisplay display = window->getDisplay();
>+    EGLConfig config   = window->getConfig();
>+
>+    EGLSurface pbuffer =
>+        eglCreatePbufferFromClientBuffer(display, EGL_D3D_TEXTURE_ANGLE, texture, config, attribs);
>+
>+    ASSERT_EGL_SUCCESS();
>+    ASSERT_NE(pbuffer, EGL_NO_SURFACE);
>+
>+    texture->Release();
>+
>+    // Make current with fixture EGL to ensure the Surface can be released immediately.
>+    getEGLWindow()->makeCurrent();
>+    eglDestroySurface(display, pbuffer);
>+}
>+
> // Test creating a pbuffer from a d3d surface and clearing it
> TEST_P(D3DTextureTest, Clear)
> {
>@@ -385,7 +827,7 @@ TEST_P(D3DTextureTest, BindTexImage)
>         return;
>     }
> 
>-    EGLWindow *window = getEGLWindow();
>+    EGLWindow *window  = getEGLWindow();
>     EGLDisplay display = window->getDisplay();
> 
>     const size_t bufferSize = 32;
>@@ -455,10 +897,7 @@ TEST_P(D3DTextureTest, CheckSampleMismatch)
>     }
> 
>     // Multisampling is not supported on D3D9 or OpenGL.
>-    if (IsD3D9() || IsOpenGL())
>-    {
>-        return;
>-    }
>+    ANGLE_SKIP_TEST_IF(IsD3D9() || IsOpenGL());
> 
>     constexpr size_t bufferSize = 32;
> 
>@@ -677,8 +1116,93 @@ TEST_P(D3DTextureTestMS, DepthStencil)
>     eglDestroySurface(display, pbuffer);
> }
> 
>+// Test copyTexImage2D with a multisampled resource
>+TEST_P(D3DTextureTestMS, CopyTexImage2DTest)
>+{
>+    EGLWindow *window  = getEGLWindow();
>+    EGLDisplay display = window->getDisplay();
>+
>+    constexpr size_t bufferSize = 32;
>+
>+    EGLSurface pbuffer = createPBuffer(bufferSize, bufferSize, EGL_NO_TEXTURE, EGL_NO_TEXTURE, 4,
>+                                       static_cast<UINT>(D3D11_STANDARD_MULTISAMPLE_PATTERN));
>+    ASSERT_EGL_SUCCESS();
>+    ASSERT_NE(EGL_NO_SURFACE, pbuffer);
>+
>+    // Apply the Pbuffer and clear it to magenta and verify
>+    eglMakeCurrent(display, pbuffer, pbuffer, window->getContext());
>+    ASSERT_EGL_SUCCESS();
>+
>+    glViewport(0, 0, static_cast<GLsizei>(bufferSize), static_cast<GLsizei>(bufferSize));
>+    glClearColor(1.0f, 0.0f, 1.0f, 1.0f);
>+    glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
>+    ASSERT_GL_NO_ERROR();
>+
>+    glUseProgram(mTextureProgram);
>+    glUniform1i(mTextureUniformLocation, 0);
>+
>+    // Specify a 2D texture and set it to green
>+    glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, 1, 1, 0, GL_RGBA, GL_UNSIGNED_BYTE, &GLColor::green);
>+
>+    // Copy from the multisampled framebuffer to the 2D texture
>+    glCopyTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, 0, 0, 1, 1, 0);
>+
>+    // Draw a quad and verify the color is magenta, not green
>+    drawQuad(mTextureProgram, "position", 1.0f);
>+    EXPECT_PIXEL_COLOR_EQ(static_cast<GLint>(bufferSize) / 2, static_cast<GLint>(bufferSize) / 2,
>+                          GLColor::magenta);
>+    ASSERT_GL_NO_ERROR();
>+
>+    // Make current with fixture EGL to ensure the Surface can be released immediately.
>+    getEGLWindow()->makeCurrent();
>+    eglDestroySurface(display, pbuffer);
>+}
>+
>+// Test copyTexSubImage2D with a multisampled resource
>+TEST_P(D3DTextureTestMS, CopyTexSubImage2DTest)
>+{
>+    EGLWindow *window  = getEGLWindow();
>+    EGLDisplay display = window->getDisplay();
>+
>+    constexpr size_t bufferSize = 32;
>+
>+    EGLSurface pbuffer = createPBuffer(bufferSize, bufferSize, EGL_NO_TEXTURE, EGL_NO_TEXTURE, 4,
>+                                       static_cast<UINT>(D3D11_STANDARD_MULTISAMPLE_PATTERN));
>+    ASSERT_EGL_SUCCESS();
>+    ASSERT_NE(EGL_NO_SURFACE, pbuffer);
>+
>+    // Apply the Pbuffer and clear it to magenta and verify
>+    eglMakeCurrent(display, pbuffer, pbuffer, window->getContext());
>+    ASSERT_EGL_SUCCESS();
>+
>+    glViewport(0, 0, static_cast<GLsizei>(bufferSize), static_cast<GLsizei>(bufferSize));
>+    glClearColor(1.0f, 0.0f, 1.0f, 1.0f);
>+    glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
>+    ASSERT_GL_NO_ERROR();
>+
>+    glUseProgram(mTextureProgram);
>+    glUniform1i(mTextureUniformLocation, 0);
>+
>+    // Specify a 2D texture and set it to green
>+    glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, 1, 1, 0, GL_RGBA, GL_UNSIGNED_BYTE, &GLColor::green);
>+
>+    // Copy from the multisampled framebuffer to the 2D texture
>+    glCopyTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, 0, 0, 1, 1);
>+
>+    // Draw a quad and verify the color is magenta, not green
>+    drawQuad(mTextureProgram, "position", 1.0f);
>+    EXPECT_PIXEL_COLOR_EQ(static_cast<GLint>(bufferSize) / 2, static_cast<GLint>(bufferSize) / 2,
>+                          GLColor::magenta);
>+    ASSERT_GL_NO_ERROR();
>+
>+    // Make current with fixture EGL to ensure the Surface can be released immediately.
>+    getEGLWindow()->makeCurrent();
>+    eglDestroySurface(display, pbuffer);
>+}
>+
> // Use this to select which configurations (e.g. which renderer, which GLES major version) these
> // tests should be run against.
>-ANGLE_INSTANTIATE_TEST(D3DTextureTest, ES2_D3D9(), ES2_D3D11(), ES2_OPENGL());
>+ANGLE_INSTANTIATE_TEST(D3DTextureTest, ES2_D3D9(), ES2_D3D11(), ES2_OPENGL(), ES2_VULKAN());
>+ANGLE_INSTANTIATE_TEST(D3DTextureTestES3, ES3_D3D11(), ES3_OPENGL());
> ANGLE_INSTANTIATE_TEST(D3DTextureTestMS, ES2_D3D11());
>-}  // namespace
>+}  // namespace angle
>diff --git a/Source/ThirdParty/ANGLE/src/tests/gl_tests/DXT1CompressedTextureTest.cpp b/Source/ThirdParty/ANGLE/src/tests/gl_tests/DXT1CompressedTextureTest.cpp
>index fae32ca887b..1bd9afa1785 100644
>--- a/Source/ThirdParty/ANGLE/src/tests/gl_tests/DXT1CompressedTextureTest.cpp
>+++ b/Source/ThirdParty/ANGLE/src/tests/gl_tests/DXT1CompressedTextureTest.cpp
>@@ -28,29 +28,27 @@ class DXT1CompressedTextureTest : public ANGLETest
>     {
>         ANGLETest::SetUp();
> 
>-        const std::string vsSource =
>-            R"(precision highp float;
>-            attribute vec4 position;
>-            varying vec2 texcoord;
>-
>-            void main()
>-            {
>-                gl_Position = position;
>-                texcoord = (position.xy * 0.5) + 0.5;
>-                texcoord.y = 1.0 - texcoord.y;
>-            })";
>-
>-        const std::string textureFSSource =
>-            R"(precision highp float;
>-            uniform sampler2D tex;
>-            varying vec2 texcoord;
>-
>-            void main()
>-            {
>-                gl_FragColor = texture2D(tex, texcoord);
>-            })";
>-
>-        mTextureProgram = CompileProgram(vsSource, textureFSSource);
>+        constexpr char kVS[] = R"(precision highp float;
>+attribute vec4 position;
>+varying vec2 texcoord;
>+
>+void main()
>+{
>+    gl_Position = position;
>+    texcoord = (position.xy * 0.5) + 0.5;
>+    texcoord.y = 1.0 - texcoord.y;
>+})";
>+
>+        constexpr char kFS[] = R"(precision highp float;
>+uniform sampler2D tex;
>+varying vec2 texcoord;
>+
>+void main()
>+{
>+    gl_FragColor = texture2D(tex, texcoord);
>+})";
>+
>+        mTextureProgram = CompileProgram(kVS, kFS);
>         if (mTextureProgram == 0)
>         {
>             FAIL() << "shader compilation failed.";
>@@ -74,11 +72,7 @@ class DXT1CompressedTextureTest : public ANGLETest
> 
> TEST_P(DXT1CompressedTextureTest, CompressedTexImage)
> {
>-    if (!extensionEnabled("GL_EXT_texture_compression_dxt1"))
>-    {
>-        std::cout << "Test skipped because GL_EXT_texture_compression_dxt1 is not available." << std::endl;
>-        return;
>-    }
>+    ANGLE_SKIP_TEST_IF(!IsGLExtensionEnabled("GL_EXT_texture_compression_dxt1"));
> 
>     GLuint texture;
>     glGenTextures(1, &texture);
>@@ -88,16 +82,26 @@ TEST_P(DXT1CompressedTextureTest, CompressedTexImage)
>     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
>     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
> 
>-    glCompressedTexImage2D(GL_TEXTURE_2D, 0, GL_COMPRESSED_RGBA_S3TC_DXT1_EXT, pixel_0_width, pixel_0_height, 0, pixel_0_size, pixel_0_data);
>-    glCompressedTexImage2D(GL_TEXTURE_2D, 1, GL_COMPRESSED_RGBA_S3TC_DXT1_EXT, pixel_1_width, pixel_1_height, 0, pixel_1_size, pixel_1_data);
>-    glCompressedTexImage2D(GL_TEXTURE_2D, 2, GL_COMPRESSED_RGBA_S3TC_DXT1_EXT, pixel_2_width, pixel_2_height, 0, pixel_2_size, pixel_2_data);
>-    glCompressedTexImage2D(GL_TEXTURE_2D, 3, GL_COMPRESSED_RGBA_S3TC_DXT1_EXT, pixel_3_width, pixel_3_height, 0, pixel_3_size, pixel_3_data);
>-    glCompressedTexImage2D(GL_TEXTURE_2D, 4, GL_COMPRESSED_RGBA_S3TC_DXT1_EXT, pixel_4_width, pixel_4_height, 0, pixel_4_size, pixel_4_data);
>-    glCompressedTexImage2D(GL_TEXTURE_2D, 5, GL_COMPRESSED_RGBA_S3TC_DXT1_EXT, pixel_5_width, pixel_5_height, 0, pixel_5_size, pixel_5_data);
>-    glCompressedTexImage2D(GL_TEXTURE_2D, 6, GL_COMPRESSED_RGBA_S3TC_DXT1_EXT, pixel_6_width, pixel_6_height, 0, pixel_6_size, pixel_6_data);
>-    glCompressedTexImage2D(GL_TEXTURE_2D, 7, GL_COMPRESSED_RGBA_S3TC_DXT1_EXT, pixel_7_width, pixel_7_height, 0, pixel_7_size, pixel_7_data);
>-    glCompressedTexImage2D(GL_TEXTURE_2D, 8, GL_COMPRESSED_RGBA_S3TC_DXT1_EXT, pixel_8_width, pixel_8_height, 0, pixel_8_size, pixel_8_data);
>-    glCompressedTexImage2D(GL_TEXTURE_2D, 9, GL_COMPRESSED_RGBA_S3TC_DXT1_EXT, pixel_9_width, pixel_9_height, 0, pixel_9_size, pixel_9_data);
>+    glCompressedTexImage2D(GL_TEXTURE_2D, 0, GL_COMPRESSED_RGBA_S3TC_DXT1_EXT, pixel_0_width,
>+                           pixel_0_height, 0, pixel_0_size, pixel_0_data);
>+    glCompressedTexImage2D(GL_TEXTURE_2D, 1, GL_COMPRESSED_RGBA_S3TC_DXT1_EXT, pixel_1_width,
>+                           pixel_1_height, 0, pixel_1_size, pixel_1_data);
>+    glCompressedTexImage2D(GL_TEXTURE_2D, 2, GL_COMPRESSED_RGBA_S3TC_DXT1_EXT, pixel_2_width,
>+                           pixel_2_height, 0, pixel_2_size, pixel_2_data);
>+    glCompressedTexImage2D(GL_TEXTURE_2D, 3, GL_COMPRESSED_RGBA_S3TC_DXT1_EXT, pixel_3_width,
>+                           pixel_3_height, 0, pixel_3_size, pixel_3_data);
>+    glCompressedTexImage2D(GL_TEXTURE_2D, 4, GL_COMPRESSED_RGBA_S3TC_DXT1_EXT, pixel_4_width,
>+                           pixel_4_height, 0, pixel_4_size, pixel_4_data);
>+    glCompressedTexImage2D(GL_TEXTURE_2D, 5, GL_COMPRESSED_RGBA_S3TC_DXT1_EXT, pixel_5_width,
>+                           pixel_5_height, 0, pixel_5_size, pixel_5_data);
>+    glCompressedTexImage2D(GL_TEXTURE_2D, 6, GL_COMPRESSED_RGBA_S3TC_DXT1_EXT, pixel_6_width,
>+                           pixel_6_height, 0, pixel_6_size, pixel_6_data);
>+    glCompressedTexImage2D(GL_TEXTURE_2D, 7, GL_COMPRESSED_RGBA_S3TC_DXT1_EXT, pixel_7_width,
>+                           pixel_7_height, 0, pixel_7_size, pixel_7_data);
>+    glCompressedTexImage2D(GL_TEXTURE_2D, 8, GL_COMPRESSED_RGBA_S3TC_DXT1_EXT, pixel_8_width,
>+                           pixel_8_height, 0, pixel_8_size, pixel_8_data);
>+    glCompressedTexImage2D(GL_TEXTURE_2D, 9, GL_COMPRESSED_RGBA_S3TC_DXT1_EXT, pixel_9_width,
>+                           pixel_9_height, 0, pixel_9_size, pixel_9_data);
> 
>     EXPECT_GL_NO_ERROR();
> 
>@@ -115,18 +119,11 @@ TEST_P(DXT1CompressedTextureTest, CompressedTexImage)
> 
> TEST_P(DXT1CompressedTextureTest, CompressedTexStorage)
> {
>-    if (!extensionEnabled("GL_EXT_texture_compression_dxt1"))
>-    {
>-        std::cout << "Test skipped due to missing GL_EXT_texture_compression_dxt1" << std::endl;
>-        return;
>-    }
>+    ANGLE_SKIP_TEST_IF(!IsGLExtensionEnabled("GL_EXT_texture_compression_dxt1"));
> 
>-    if (getClientMajorVersion() < 3 &&
>-        (!extensionEnabled("GL_EXT_texture_storage") || !extensionEnabled("GL_OES_rgb8_rgba8")))
>-    {
>-        std::cout << "Test skipped due to missing ES3 or GL_EXT_texture_storage or GL_OES_rgb8_rgba8" << std::endl;
>-        return;
>-    }
>+    ANGLE_SKIP_TEST_IF(getClientMajorVersion() < 3 &&
>+                       (!IsGLExtensionEnabled("GL_EXT_texture_storage") ||
>+                        !IsGLExtensionEnabled("GL_OES_rgb8_rgba8")));
> 
>     GLuint texture;
>     glGenTextures(1, &texture);
>@@ -138,24 +135,36 @@ TEST_P(DXT1CompressedTextureTest, CompressedTexStorage)
> 
>     if (getClientMajorVersion() < 3)
>     {
>-        glTexStorage2DEXT(GL_TEXTURE_2D, pixel_levels, GL_COMPRESSED_RGBA_S3TC_DXT1_EXT, pixel_0_width, pixel_0_height);
>+        glTexStorage2DEXT(GL_TEXTURE_2D, pixel_levels, GL_COMPRESSED_RGBA_S3TC_DXT1_EXT,
>+                          pixel_0_width, pixel_0_height);
>     }
>     else
>     {
>-        glTexStorage2D(GL_TEXTURE_2D, pixel_levels, GL_COMPRESSED_RGBA_S3TC_DXT1_EXT, pixel_0_width, pixel_0_height);
>+        glTexStorage2D(GL_TEXTURE_2D, pixel_levels, GL_COMPRESSED_RGBA_S3TC_DXT1_EXT, pixel_0_width,
>+                       pixel_0_height);
>     }
>     EXPECT_GL_NO_ERROR();
> 
>-    glCompressedTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, pixel_0_width, pixel_0_height, GL_COMPRESSED_RGBA_S3TC_DXT1_EXT, pixel_0_size, pixel_0_data);
>-    glCompressedTexSubImage2D(GL_TEXTURE_2D, 1, 0, 0, pixel_1_width, pixel_1_height, GL_COMPRESSED_RGBA_S3TC_DXT1_EXT, pixel_1_size, pixel_1_data);
>-    glCompressedTexSubImage2D(GL_TEXTURE_2D, 2, 0, 0, pixel_2_width, pixel_2_height, GL_COMPRESSED_RGBA_S3TC_DXT1_EXT, pixel_2_size, pixel_2_data);
>-    glCompressedTexSubImage2D(GL_TEXTURE_2D, 3, 0, 0, pixel_3_width, pixel_3_height, GL_COMPRESSED_RGBA_S3TC_DXT1_EXT, pixel_3_size, pixel_3_data);
>-    glCompressedTexSubImage2D(GL_TEXTURE_2D, 4, 0, 0, pixel_4_width, pixel_4_height, GL_COMPRESSED_RGBA_S3TC_DXT1_EXT, pixel_4_size, pixel_4_data);
>-    glCompressedTexSubImage2D(GL_TEXTURE_2D, 5, 0, 0, pixel_5_width, pixel_5_height, GL_COMPRESSED_RGBA_S3TC_DXT1_EXT, pixel_5_size, pixel_5_data);
>-    glCompressedTexSubImage2D(GL_TEXTURE_2D, 6, 0, 0, pixel_6_width, pixel_6_height, GL_COMPRESSED_RGBA_S3TC_DXT1_EXT, pixel_6_size, pixel_6_data);
>-    glCompressedTexSubImage2D(GL_TEXTURE_2D, 7, 0, 0, pixel_7_width, pixel_7_height, GL_COMPRESSED_RGBA_S3TC_DXT1_EXT, pixel_7_size, pixel_7_data);
>-    glCompressedTexSubImage2D(GL_TEXTURE_2D, 8, 0, 0, pixel_8_width, pixel_8_height, GL_COMPRESSED_RGBA_S3TC_DXT1_EXT, pixel_8_size, pixel_8_data);
>-    glCompressedTexSubImage2D(GL_TEXTURE_2D, 9, 0, 0, pixel_9_width, pixel_9_height, GL_COMPRESSED_RGBA_S3TC_DXT1_EXT, pixel_9_size, pixel_9_data);
>+    glCompressedTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, pixel_0_width, pixel_0_height,
>+                              GL_COMPRESSED_RGBA_S3TC_DXT1_EXT, pixel_0_size, pixel_0_data);
>+    glCompressedTexSubImage2D(GL_TEXTURE_2D, 1, 0, 0, pixel_1_width, pixel_1_height,
>+                              GL_COMPRESSED_RGBA_S3TC_DXT1_EXT, pixel_1_size, pixel_1_data);
>+    glCompressedTexSubImage2D(GL_TEXTURE_2D, 2, 0, 0, pixel_2_width, pixel_2_height,
>+                              GL_COMPRESSED_RGBA_S3TC_DXT1_EXT, pixel_2_size, pixel_2_data);
>+    glCompressedTexSubImage2D(GL_TEXTURE_2D, 3, 0, 0, pixel_3_width, pixel_3_height,
>+                              GL_COMPRESSED_RGBA_S3TC_DXT1_EXT, pixel_3_size, pixel_3_data);
>+    glCompressedTexSubImage2D(GL_TEXTURE_2D, 4, 0, 0, pixel_4_width, pixel_4_height,
>+                              GL_COMPRESSED_RGBA_S3TC_DXT1_EXT, pixel_4_size, pixel_4_data);
>+    glCompressedTexSubImage2D(GL_TEXTURE_2D, 5, 0, 0, pixel_5_width, pixel_5_height,
>+                              GL_COMPRESSED_RGBA_S3TC_DXT1_EXT, pixel_5_size, pixel_5_data);
>+    glCompressedTexSubImage2D(GL_TEXTURE_2D, 6, 0, 0, pixel_6_width, pixel_6_height,
>+                              GL_COMPRESSED_RGBA_S3TC_DXT1_EXT, pixel_6_size, pixel_6_data);
>+    glCompressedTexSubImage2D(GL_TEXTURE_2D, 7, 0, 0, pixel_7_width, pixel_7_height,
>+                              GL_COMPRESSED_RGBA_S3TC_DXT1_EXT, pixel_7_size, pixel_7_data);
>+    glCompressedTexSubImage2D(GL_TEXTURE_2D, 8, 0, 0, pixel_8_width, pixel_8_height,
>+                              GL_COMPRESSED_RGBA_S3TC_DXT1_EXT, pixel_8_size, pixel_8_data);
>+    glCompressedTexSubImage2D(GL_TEXTURE_2D, 9, 0, 0, pixel_9_width, pixel_9_height,
>+                              GL_COMPRESSED_RGBA_S3TC_DXT1_EXT, pixel_9_size, pixel_9_data);
> 
>     EXPECT_GL_NO_ERROR();
> 
>@@ -174,11 +183,7 @@ TEST_P(DXT1CompressedTextureTest, CompressedTexStorage)
> // Test validation of glCompressedTexSubImage2D with DXT formats
> TEST_P(DXT1CompressedTextureTest, CompressedTexSubImageValidation)
> {
>-    if (!extensionEnabled("GL_EXT_texture_compression_dxt1"))
>-    {
>-        std::cout << "Test skipped due to missing GL_EXT_texture_compression_dxt1" << std::endl;
>-        return;
>-    }
>+    ANGLE_SKIP_TEST_IF(!IsGLExtensionEnabled("GL_EXT_texture_compression_dxt1"));
> 
>     GLTexture texture;
>     glBindTexture(GL_TEXTURE_2D, texture.get());
>@@ -206,7 +211,7 @@ TEST_P(DXT1CompressedTextureTest, CompressedTexSubImageValidation)
> // Test that it's not possible to call CopyTexSubImage2D on a compressed texture
> TEST_P(DXT1CompressedTextureTest, CopyTexSubImage2DDisallowed)
> {
>-    ANGLE_SKIP_TEST_IF(!extensionEnabled("GL_EXT_texture_compression_dxt1"));
>+    ANGLE_SKIP_TEST_IF(!IsGLExtensionEnabled("GL_EXT_texture_compression_dxt1"));
> 
>     GLTexture texture;
>     glBindTexture(GL_TEXTURE_2D, texture.get());
>@@ -219,18 +224,94 @@ TEST_P(DXT1CompressedTextureTest, CopyTexSubImage2DDisallowed)
>     ASSERT_GL_ERROR(GL_INVALID_OPERATION);
> }
> 
>-class DXT1CompressedTextureTestES3 : public DXT1CompressedTextureTest { };
>+TEST_P(DXT1CompressedTextureTest, PBOCompressedTexStorage)
>+{
>+    ANGLE_SKIP_TEST_IF(!IsGLExtensionEnabled("GL_EXT_texture_compression_dxt1"));
> 
>-class DXT1CompressedTextureTestD3D11 : public DXT1CompressedTextureTest { };
>+    ANGLE_SKIP_TEST_IF(getClientMajorVersion() < 3 &&
>+                       !IsGLExtensionEnabled("GL_NV_pixel_buffer_object"));
> 
>-TEST_P(DXT1CompressedTextureTestES3, PBOCompressedTexImage)
>-{
>-    if (!extensionEnabled("GL_EXT_texture_compression_dxt1"))
>+    ANGLE_SKIP_TEST_IF(getClientMajorVersion() < 3 &&
>+                       (!IsGLExtensionEnabled("GL_EXT_texture_storage") ||
>+                        !IsGLExtensionEnabled("GL_OES_rgb8_rgba8")));
>+
>+    GLuint texture;
>+    glGenTextures(1, &texture);
>+    glBindTexture(GL_TEXTURE_2D, texture);
>+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
>+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
>+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
>+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
>+
>+    if (getClientMajorVersion() < 3)
>+    {
>+        glTexStorage2DEXT(GL_TEXTURE_2D, pixel_levels, GL_COMPRESSED_RGBA_S3TC_DXT1_EXT,
>+                          pixel_0_width, pixel_0_height);
>+    }
>+    else
>     {
>-        std::cout << "Test skipped because GL_EXT_texture_compression_dxt1 is not available."
>-                  << std::endl;
>-        return;
>+        glTexStorage2D(GL_TEXTURE_2D, pixel_levels, GL_COMPRESSED_RGBA_S3TC_DXT1_EXT, pixel_0_width,
>+                       pixel_0_height);
>     }
>+    EXPECT_GL_NO_ERROR();
>+
>+    GLuint buffer;
>+    glGenBuffers(1, &buffer);
>+    glBindBuffer(GL_PIXEL_UNPACK_BUFFER, buffer);
>+    glBufferData(GL_PIXEL_UNPACK_BUFFER, pixel_0_size, nullptr, GL_STREAM_DRAW);
>+    EXPECT_GL_NO_ERROR();
>+
>+    glBufferSubData(GL_PIXEL_UNPACK_BUFFER, 0, pixel_0_size, pixel_0_data);
>+    glCompressedTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, pixel_0_width, pixel_0_height,
>+                              GL_COMPRESSED_RGBA_S3TC_DXT1_EXT, pixel_0_size, nullptr);
>+    glBufferSubData(GL_PIXEL_UNPACK_BUFFER, 0, pixel_1_size, pixel_1_data);
>+    glCompressedTexSubImage2D(GL_TEXTURE_2D, 1, 0, 0, pixel_1_width, pixel_1_height,
>+                              GL_COMPRESSED_RGBA_S3TC_DXT1_EXT, pixel_1_size, nullptr);
>+    glBufferSubData(GL_PIXEL_UNPACK_BUFFER, 0, pixel_2_size, pixel_2_data);
>+    glCompressedTexSubImage2D(GL_TEXTURE_2D, 2, 0, 0, pixel_2_width, pixel_2_height,
>+                              GL_COMPRESSED_RGBA_S3TC_DXT1_EXT, pixel_2_size, nullptr);
>+    glBufferSubData(GL_PIXEL_UNPACK_BUFFER, 0, pixel_3_size, pixel_3_data);
>+    glCompressedTexSubImage2D(GL_TEXTURE_2D, 3, 0, 0, pixel_3_width, pixel_3_height,
>+                              GL_COMPRESSED_RGBA_S3TC_DXT1_EXT, pixel_3_size, nullptr);
>+    glBufferSubData(GL_PIXEL_UNPACK_BUFFER, 0, pixel_4_size, pixel_4_data);
>+    glCompressedTexSubImage2D(GL_TEXTURE_2D, 4, 0, 0, pixel_4_width, pixel_4_height,
>+                              GL_COMPRESSED_RGBA_S3TC_DXT1_EXT, pixel_4_size, nullptr);
>+    glBufferSubData(GL_PIXEL_UNPACK_BUFFER, 0, pixel_5_size, pixel_5_data);
>+    glCompressedTexSubImage2D(GL_TEXTURE_2D, 5, 0, 0, pixel_5_width, pixel_5_height,
>+                              GL_COMPRESSED_RGBA_S3TC_DXT1_EXT, pixel_5_size, nullptr);
>+    glBufferSubData(GL_PIXEL_UNPACK_BUFFER, 0, pixel_6_size, pixel_6_data);
>+    glCompressedTexSubImage2D(GL_TEXTURE_2D, 6, 0, 0, pixel_6_width, pixel_6_height,
>+                              GL_COMPRESSED_RGBA_S3TC_DXT1_EXT, pixel_6_size, nullptr);
>+    glBufferSubData(GL_PIXEL_UNPACK_BUFFER, 0, pixel_7_size, pixel_7_data);
>+    glCompressedTexSubImage2D(GL_TEXTURE_2D, 7, 0, 0, pixel_7_width, pixel_7_height,
>+                              GL_COMPRESSED_RGBA_S3TC_DXT1_EXT, pixel_7_size, nullptr);
>+    glBufferSubData(GL_PIXEL_UNPACK_BUFFER, 0, pixel_8_size, pixel_8_data);
>+    glCompressedTexSubImage2D(GL_TEXTURE_2D, 8, 0, 0, pixel_8_width, pixel_8_height,
>+                              GL_COMPRESSED_RGBA_S3TC_DXT1_EXT, pixel_8_size, nullptr);
>+    glBufferSubData(GL_PIXEL_UNPACK_BUFFER, 0, pixel_9_size, pixel_9_data);
>+    glCompressedTexSubImage2D(GL_TEXTURE_2D, 9, 0, 0, pixel_9_width, pixel_9_height,
>+                              GL_COMPRESSED_RGBA_S3TC_DXT1_EXT, pixel_9_size, nullptr);
>+
>+    EXPECT_GL_NO_ERROR();
>+
>+    glUseProgram(mTextureProgram);
>+    glUniform1i(mTextureUniformLocation, 0);
>+
>+    drawQuad(mTextureProgram, "position", 0.5f);
>+
>+    EXPECT_GL_NO_ERROR();
>+
>+    glDeleteTextures(1, &texture);
>+
>+    EXPECT_GL_NO_ERROR();
>+}
>+
>+class DXT1CompressedTextureTestES3 : public DXT1CompressedTextureTest
>+{};
>+
>+TEST_P(DXT1CompressedTextureTestES3, PBOCompressedTexImage)
>+{
>+    ANGLE_SKIP_TEST_IF(!IsGLExtensionEnabled("GL_EXT_texture_compression_dxt1"));
> 
>     GLuint texture;
>     glGenTextures(1, &texture);
>@@ -295,7 +376,7 @@ TEST_P(DXT1CompressedTextureTestES3, PBOCompressedTexImage)
> // Test validation of glCompressedTexSubImage3D with DXT formats
> TEST_P(DXT1CompressedTextureTestES3, CompressedTexSubImageValidation)
> {
>-    ANGLE_SKIP_TEST_IF(!extensionEnabled("GL_EXT_texture_compression_dxt1"));
>+    ANGLE_SKIP_TEST_IF(!IsGLExtensionEnabled("GL_EXT_texture_compression_dxt1"));
> 
>     GLTexture texture;
>     glBindTexture(GL_TEXTURE_2D_ARRAY, texture.get());
>@@ -319,92 +400,10 @@ TEST_P(DXT1CompressedTextureTestES3, CompressedTexSubImageValidation)
>     ASSERT_GL_ERROR(GL_INVALID_VALUE);
> }
> 
>-TEST_P(DXT1CompressedTextureTestD3D11, PBOCompressedTexStorage)
>-{
>-    if (getClientMajorVersion() < 3 && !extensionEnabled("GL_EXT_texture_compression_dxt1"))
>-    {
>-        return;
>-    }
>-
>-    if (getClientMajorVersion() < 3 &&
>-        (!extensionEnabled("GL_EXT_texture_storage") || !extensionEnabled("GL_OES_rgb8_rgba8")))
>-    {
>-        return;
>-    }
>-
>-    GLuint texture;
>-    glGenTextures(1, &texture);
>-    glBindTexture(GL_TEXTURE_2D, texture);
>-    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
>-    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
>-    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
>-    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
>-
>-    if (getClientMajorVersion() < 3)
>-    {
>-        glTexStorage2DEXT(GL_TEXTURE_2D, pixel_levels, GL_COMPRESSED_RGBA_S3TC_DXT1_EXT, pixel_0_width, pixel_0_height);
>-    }
>-    else
>-    {
>-        glTexStorage2D(GL_TEXTURE_2D, pixel_levels, GL_COMPRESSED_RGBA_S3TC_DXT1_EXT, pixel_0_width, pixel_0_height);
>-    }
>-    EXPECT_GL_NO_ERROR();
>-
>-    GLuint buffer;
>-    glGenBuffers(1, &buffer);
>-    glBindBuffer(GL_PIXEL_UNPACK_BUFFER, buffer);
>-    glBufferData(GL_PIXEL_UNPACK_BUFFER, pixel_0_size, nullptr, GL_STREAM_DRAW);
>-    EXPECT_GL_NO_ERROR();
>-
>-    glBufferSubData(GL_PIXEL_UNPACK_BUFFER, 0, pixel_0_size, pixel_0_data);
>-    glCompressedTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, pixel_0_width, pixel_0_height,
>-                              GL_COMPRESSED_RGBA_S3TC_DXT1_EXT, pixel_0_size, nullptr);
>-    glBufferSubData(GL_PIXEL_UNPACK_BUFFER, 0, pixel_1_size, pixel_1_data);
>-    glCompressedTexSubImage2D(GL_TEXTURE_2D, 1, 0, 0, pixel_1_width, pixel_1_height,
>-                              GL_COMPRESSED_RGBA_S3TC_DXT1_EXT, pixel_1_size, nullptr);
>-    glBufferSubData(GL_PIXEL_UNPACK_BUFFER, 0, pixel_2_size, pixel_2_data);
>-    glCompressedTexSubImage2D(GL_TEXTURE_2D, 2, 0, 0, pixel_2_width, pixel_2_height,
>-                              GL_COMPRESSED_RGBA_S3TC_DXT1_EXT, pixel_2_size, nullptr);
>-    glBufferSubData(GL_PIXEL_UNPACK_BUFFER, 0, pixel_3_size, pixel_3_data);
>-    glCompressedTexSubImage2D(GL_TEXTURE_2D, 3, 0, 0, pixel_3_width, pixel_3_height,
>-                              GL_COMPRESSED_RGBA_S3TC_DXT1_EXT, pixel_3_size, nullptr);
>-    glBufferSubData(GL_PIXEL_UNPACK_BUFFER, 0, pixel_4_size, pixel_4_data);
>-    glCompressedTexSubImage2D(GL_TEXTURE_2D, 4, 0, 0, pixel_4_width, pixel_4_height,
>-                              GL_COMPRESSED_RGBA_S3TC_DXT1_EXT, pixel_4_size, nullptr);
>-    glBufferSubData(GL_PIXEL_UNPACK_BUFFER, 0, pixel_5_size, pixel_5_data);
>-    glCompressedTexSubImage2D(GL_TEXTURE_2D, 5, 0, 0, pixel_5_width, pixel_5_height,
>-                              GL_COMPRESSED_RGBA_S3TC_DXT1_EXT, pixel_5_size, nullptr);
>-    glBufferSubData(GL_PIXEL_UNPACK_BUFFER, 0, pixel_6_size, pixel_6_data);
>-    glCompressedTexSubImage2D(GL_TEXTURE_2D, 6, 0, 0, pixel_6_width, pixel_6_height,
>-                              GL_COMPRESSED_RGBA_S3TC_DXT1_EXT, pixel_6_size, nullptr);
>-    glBufferSubData(GL_PIXEL_UNPACK_BUFFER, 0, pixel_7_size, pixel_7_data);
>-    glCompressedTexSubImage2D(GL_TEXTURE_2D, 7, 0, 0, pixel_7_width, pixel_7_height,
>-                              GL_COMPRESSED_RGBA_S3TC_DXT1_EXT, pixel_7_size, nullptr);
>-    glBufferSubData(GL_PIXEL_UNPACK_BUFFER, 0, pixel_8_size, pixel_8_data);
>-    glCompressedTexSubImage2D(GL_TEXTURE_2D, 8, 0, 0, pixel_8_width, pixel_8_height,
>-                              GL_COMPRESSED_RGBA_S3TC_DXT1_EXT, pixel_8_size, nullptr);
>-    glBufferSubData(GL_PIXEL_UNPACK_BUFFER, 0, pixel_9_size, pixel_9_data);
>-    glCompressedTexSubImage2D(GL_TEXTURE_2D, 9, 0, 0, pixel_9_width, pixel_9_height,
>-                              GL_COMPRESSED_RGBA_S3TC_DXT1_EXT, pixel_9_size, nullptr);
>-
>-    EXPECT_GL_NO_ERROR();
>-
>-    glUseProgram(mTextureProgram);
>-    glUniform1i(mTextureUniformLocation, 0);
>-
>-    drawQuad(mTextureProgram, "position", 0.5f);
>-
>-    EXPECT_GL_NO_ERROR();
>-
>-    glDeleteTextures(1, &texture);
>-
>-    EXPECT_GL_NO_ERROR();
>-}
>-
> // Test validation of glCompressedTexSubImage3D with DXT formats
> TEST_P(DXT1CompressedTextureTestES3, CopyTexSubImage3DDisallowed)
> {
>-    ANGLE_SKIP_TEST_IF(!extensionEnabled("GL_EXT_texture_compression_dxt1"));
>+    ANGLE_SKIP_TEST_IF(!IsGLExtensionEnabled("GL_EXT_texture_compression_dxt1"));
> 
>     GLTexture texture;
>     glBindTexture(GL_TEXTURE_2D_ARRAY, texture.get());
>@@ -418,7 +417,8 @@ TEST_P(DXT1CompressedTextureTestES3, CopyTexSubImage3DDisallowed)
>     ASSERT_GL_ERROR(GL_INVALID_OPERATION);
> }
> 
>-// Use this to select which configurations (e.g. which renderer, which GLES major version) these tests should be run against.
>+// Use this to select which configurations (e.g. which renderer, which GLES major version) these
>+// tests should be run against.
> ANGLE_INSTANTIATE_TEST(DXT1CompressedTextureTest,
>                        ES2_D3D9(),
>                        ES2_D3D11(),
>@@ -426,9 +426,9 @@ ANGLE_INSTANTIATE_TEST(DXT1CompressedTextureTest,
>                        ES2_OPENGL(),
>                        ES3_OPENGL(),
>                        ES2_OPENGLES(),
>-                       ES3_OPENGLES());
>+                       ES3_OPENGLES(),
>+                       ES2_VULKAN());
> 
>-// Use this to select which configurations (e.g. which renderer, which GLES major version) these tests should be run against.
>+// Use this to select which configurations (e.g. which renderer, which GLES major version) these
>+// tests should be run against.
> ANGLE_INSTANTIATE_TEST(DXT1CompressedTextureTestES3, ES3_D3D11(), ES3_OPENGL(), ES3_OPENGLES());
>-
>-ANGLE_INSTANTIATE_TEST(DXT1CompressedTextureTestD3D11, ES2_D3D11(), ES3_D3D11(), ES2_D3D11_FL9_3());
>diff --git a/Source/ThirdParty/ANGLE/src/tests/gl_tests/DXTSRGBCompressedTextureTest.cpp b/Source/ThirdParty/ANGLE/src/tests/gl_tests/DXTSRGBCompressedTextureTest.cpp
>index 0aa94220b9f..2415fbf8220 100644
>--- a/Source/ThirdParty/ANGLE/src/tests/gl_tests/DXTSRGBCompressedTextureTest.cpp
>+++ b/Source/ThirdParty/ANGLE/src/tests/gl_tests/DXTSRGBCompressedTextureTest.cpp
>@@ -35,7 +35,7 @@ class DXTSRGBCompressedTextureTest : public ANGLETest
>     {
>         ANGLETest::SetUp();
> 
>-        const std::string vsSource = std::string(
>+        constexpr char kVS[] =
>             "precision highp float;\n"
>             "attribute vec4 position;\n"
>             "varying vec2 texcoord;\n"
>@@ -43,17 +43,17 @@ class DXTSRGBCompressedTextureTest : public ANGLETest
>             "    gl_Position = position;\n"
>             "    texcoord = (position.xy * 0.5) + 0.5;\n"
>             "    texcoord.y = 1.0 - texcoord.y;\n"
>-            "}");
>+            "}";
> 
>-        const std::string textureFSSource = std::string(
>+        constexpr char kFS[] =
>             "precision highp float;\n"
>             "uniform sampler2D tex;\n"
>             "varying vec2 texcoord;\n"
>             "void main() {\n"
>             "    gl_FragColor = texture2D(tex, texcoord);\n"
>-            "}\n");
>+            "}\n";
> 
>-        mTextureProgram = CompileProgram(vsSource, textureFSSource);
>+        mTextureProgram = CompileProgram(kVS, kFS);
>         ASSERT_NE(0u, mTextureProgram);
> 
>         mTextureUniformLocation = glGetUniformLocation(mTextureProgram, "tex");
>@@ -93,13 +93,7 @@ class DXTSRGBCompressedTextureTest : public ANGLETest
> 
>     void runTest(GLenum format)
>     {
>-        if (!extensionEnabled("GL_EXT_texture_compression_s3tc_srgb"))
>-        {
>-            std::cout
>-                << "Test skipped because GL_EXT_texture_compression_s3tc_srgb is not available."
>-                << std::endl;
>-            return;
>-        }
>+        ANGLE_SKIP_TEST_IF(!IsGLExtensionEnabled("GL_EXT_texture_compression_s3tc_srgb"));
> 
>         const TestCase &test = kTests.at(format);
> 
>@@ -167,4 +161,5 @@ ANGLE_INSTANTIATE_TEST(DXTSRGBCompressedTextureTest,
>                        ES2_OPENGL(),
>                        ES3_OPENGL(),
>                        ES2_OPENGLES(),
>-                       ES3_OPENGLES());
>+                       ES3_OPENGLES(),
>+                       ES2_VULKAN());
>diff --git a/Source/ThirdParty/ANGLE/src/tests/gl_tests/DebugMarkerTest.cpp b/Source/ThirdParty/ANGLE/src/tests/gl_tests/DebugMarkerTest.cpp
>index bafee8eb802..009d3c08efb 100644
>--- a/Source/ThirdParty/ANGLE/src/tests/gl_tests/DebugMarkerTest.cpp
>+++ b/Source/ThirdParty/ANGLE/src/tests/gl_tests/DebugMarkerTest.cpp
>@@ -31,11 +31,7 @@ class DebugMarkerTest : public ANGLETest
> // The debug markers can be validated by capturing this test under PIX/Graphics Diagnostics.
> TEST_P(DebugMarkerTest, BasicValidation)
> {
>-    if (!extensionEnabled("GL_EXT_debug_marker"))
>-    {
>-        std::cout << "Test skipped due to missing GL_EXT_debug_marker" << std::endl;
>-        return;
>-    }
>+    ANGLE_SKIP_TEST_IF(!IsGLExtensionEnabled("GL_EXT_debug_marker"));
> 
>     std::string eventMarkerCaption = "Test event marker caption";
>     std::string groupMarkerCaption = "Test group marker caption";
>@@ -65,7 +61,13 @@ TEST_P(DebugMarkerTest, BasicValidation)
>     ASSERT_GL_NO_ERROR();
> }
> 
>-// Use this to select which configurations (e.g. which renderer, which GLES major version) these tests should be run against.
>-ANGLE_INSTANTIATE_TEST(DebugMarkerTest, ES2_D3D9(), ES2_D3D11(), ES2_OPENGL(), ES2_OPENGLES());
>+// Use this to select which configurations (e.g. which renderer, which GLES major version) these
>+// tests should be run against.
>+ANGLE_INSTANTIATE_TEST(DebugMarkerTest,
>+                       ES2_D3D9(),
>+                       ES2_D3D11(),
>+                       ES2_OPENGL(),
>+                       ES2_OPENGLES(),
>+                       ES2_VULKAN());
> 
>-} // namespace
>+}  // namespace
>diff --git a/Source/ThirdParty/ANGLE/src/tests/gl_tests/DebugTest.cpp b/Source/ThirdParty/ANGLE/src/tests/gl_tests/DebugTest.cpp
>index c07aceac436..906da4e5011 100644
>--- a/Source/ThirdParty/ANGLE/src/tests/gl_tests/DebugTest.cpp
>+++ b/Source/ThirdParty/ANGLE/src/tests/gl_tests/DebugTest.cpp
>@@ -30,7 +30,7 @@ class DebugTest : public ANGLETest
>     {
>         ANGLETest::SetUp();
> 
>-        mDebugExtensionAvailable = extensionEnabled("GL_KHR_debug");
>+        mDebugExtensionAvailable = IsGLExtensionEnabled("GL_KHR_debug");
>         if (mDebugExtensionAvailable)
>         {
>             glEnable(GL_DEBUG_OUTPUT);
>@@ -73,11 +73,7 @@ TEST_P(DebugTest, Enabled)
> // Test that when debug output is disabled, no message are outputted
> TEST_P(DebugTest, DisabledOutput)
> {
>-    if (!mDebugExtensionAvailable)
>-    {
>-        std::cout << "Test skipped because GL_KHR_debug is not available." << std::endl;
>-        return;
>-    }
>+    ANGLE_SKIP_TEST_IF(!mDebugExtensionAvailable);
> 
>     glDisable(GL_DEBUG_OUTPUT);
> 
>@@ -98,11 +94,7 @@ TEST_P(DebugTest, DisabledOutput)
> // Test a basic flow of inserting a message and reading it back
> TEST_P(DebugTest, InsertMessage)
> {
>-    if (!mDebugExtensionAvailable)
>-    {
>-        std::cout << "Test skipped because GL_KHR_debug is not available." << std::endl;
>-        return;
>-    }
>+    ANGLE_SKIP_TEST_IF(!mDebugExtensionAvailable);
> 
>     const GLenum source       = GL_DEBUG_SOURCE_APPLICATION;
>     const GLenum type         = GL_DEBUG_TYPE_OTHER;
>@@ -124,7 +116,7 @@ TEST_P(DebugTest, InsertMessage)
>     GLenum typeBuf     = 0;
>     GLenum idBuf       = 0;
>     GLenum severityBuf = 0;
>-    GLsizei lengthBuf = 0;
>+    GLsizei lengthBuf  = 0;
>     std::vector<char> messageBuf(messageLength + 1);
>     GLuint ret =
>         glGetDebugMessageLogKHR(1, static_cast<GLsizei>(messageBuf.size()), &sourceBuf, &typeBuf,
>@@ -146,11 +138,7 @@ TEST_P(DebugTest, InsertMessage)
> // Test inserting multiple messages
> TEST_P(DebugTest, InsertMessageMultiple)
> {
>-    if (!mDebugExtensionAvailable)
>-    {
>-        std::cout << "Test skipped because GL_KHR_debug is not available." << std::endl;
>-        return;
>-    }
>+    ANGLE_SKIP_TEST_IF(!mDebugExtensionAvailable);
> 
>     const GLenum source          = GL_DEBUG_SOURCE_APPLICATION;
>     const GLenum type            = GL_DEBUG_TYPE_OTHER;
>@@ -185,7 +173,7 @@ TEST_P(DebugTest, InsertMessageMultiple)
>         GLenum typeBuf     = 0;
>         GLenum idBuf       = 0;
>         GLenum severityBuf = 0;
>-        GLsizei lengthBuf = 0;
>+        GLsizei lengthBuf  = 0;
>         std::vector<char> messageBuf(messageLength + 1);
>         GLuint ret =
>             glGetDebugMessageLogKHR(1, static_cast<GLsizei>(messageBuf.size()), &sourceBuf,
>@@ -208,11 +196,7 @@ TEST_P(DebugTest, InsertMessageMultiple)
> // Test using a debug callback
> TEST_P(DebugTest, DebugCallback)
> {
>-    if (!mDebugExtensionAvailable)
>-    {
>-        std::cout << "Test skipped because GL_KHR_debug is not available." << std::endl;
>-        return;
>-    }
>+    ANGLE_SKIP_TEST_IF(!mDebugExtensionAvailable);
> 
>     std::vector<Message> messages;
> 
>@@ -246,11 +230,7 @@ TEST_P(DebugTest, DebugCallback)
> // Test the glGetPointervKHR entry point
> TEST_P(DebugTest, GetPointer)
> {
>-    if (!mDebugExtensionAvailable)
>-    {
>-        std::cout << "Test skipped because GL_KHR_debug is not available." << std::endl;
>-        return;
>-    }
>+    ANGLE_SKIP_TEST_IF(!mDebugExtensionAvailable);
> 
>     std::vector<Message> messages;
> 
>@@ -268,11 +248,7 @@ TEST_P(DebugTest, GetPointer)
> // Test usage of message control.  Example taken from GL_KHR_debug spec.
> TEST_P(DebugTest, MessageControl1)
> {
>-    if (!mDebugExtensionAvailable)
>-    {
>-        std::cout << "Test skipped because GL_KHR_debug is not available." << std::endl;
>-        return;
>-    }
>+    ANGLE_SKIP_TEST_IF(!mDebugExtensionAvailable);
> 
>     std::vector<Message> messages;
> 
>@@ -320,11 +296,7 @@ TEST_P(DebugTest, MessageControl1)
> // Test usage of message control.  Example taken from GL_KHR_debug spec.
> TEST_P(DebugTest, MessageControl2)
> {
>-    if (!mDebugExtensionAvailable)
>-    {
>-        std::cout << "Test skipped because GL_KHR_debug is not available." << std::endl;
>-        return;
>-    }
>+    ANGLE_SKIP_TEST_IF(!mDebugExtensionAvailable);
> 
>     std::vector<Message> messages;
> 
>@@ -372,11 +344,7 @@ TEST_P(DebugTest, MessageControl2)
> // Test basic usage of setting and getting labels
> TEST_P(DebugTest, ObjectLabels)
> {
>-    if (!mDebugExtensionAvailable)
>-    {
>-        std::cout << "Test skipped because GL_KHR_debug is not available." << std::endl;
>-        return;
>-    }
>+    ANGLE_SKIP_TEST_IF(!mDebugExtensionAvailable);
> 
>     GLuint renderbuffer = 0;
>     glGenRenderbuffers(1, &renderbuffer);
>@@ -408,11 +376,7 @@ TEST_P(DebugTest, ObjectLabels)
> // Test basic usage of setting and getting labels
> TEST_P(DebugTest, ObjectPtrLabels)
> {
>-    if (!mDebugExtensionAvailable || getClientMajorVersion() < 3)
>-    {
>-        std::cout << "Test skipped because GL_KHR_debug or ES3 is not available." << std::endl;
>-        return;
>-    }
>+    ANGLE_SKIP_TEST_IF(!mDebugExtensionAvailable || getClientMajorVersion() < 3);
> 
>     GLsync sync = glFenceSync(GL_SYNC_GPU_COMMANDS_COMPLETE, 0);
> 
>@@ -446,6 +410,7 @@ ANGLE_INSTANTIATE_TEST(DebugTest,
>                        ES2_D3D11(),
>                        ES3_D3D11(),
>                        ES2_OPENGL(),
>-                       ES3_OPENGL());
>+                       ES3_OPENGL(),
>+                       ES2_VULKAN());
> 
> }  // namespace angle
>diff --git a/Source/ThirdParty/ANGLE/src/tests/gl_tests/DepthStencilFormatsTest.cpp b/Source/ThirdParty/ANGLE/src/tests/gl_tests/DepthStencilFormatsTest.cpp
>index fe99445c7a1..6304f444d64 100644
>--- a/Source/ThirdParty/ANGLE/src/tests/gl_tests/DepthStencilFormatsTest.cpp
>+++ b/Source/ThirdParty/ANGLE/src/tests/gl_tests/DepthStencilFormatsTest.cpp
>@@ -68,28 +68,26 @@ class DepthStencilFormatsTestBase : public ANGLETest
>     {
>         ANGLETest::SetUp();
> 
>-        const std::string vertexShaderSource =
>-            R"(precision highp float;
>-            attribute vec4 position;
>-            varying vec2 texcoord;
>-
>-            void main()
>-            {
>-                gl_Position = position;
>-                texcoord = (position.xy * 0.5) + 0.5;
>-            })";
>-
>-        const std::string fragmentShaderSource =
>-            R"(precision highp float;
>-            uniform sampler2D tex;
>-            varying vec2 texcoord;
>-
>-            void main()
>-            {
>-                gl_FragColor = texture2D(tex, texcoord);
>-            })";
>-
>-        mProgram = CompileProgram(vertexShaderSource, fragmentShaderSource);
>+        constexpr char kVS[] = R"(precision highp float;
>+attribute vec4 position;
>+varying vec2 texcoord;
>+
>+void main()
>+{
>+    gl_Position = position;
>+    texcoord = (position.xy * 0.5) + 0.5;
>+})";
>+
>+        constexpr char kFS[] = R"(precision highp float;
>+uniform sampler2D tex;
>+varying vec2 texcoord;
>+
>+void main()
>+{
>+    gl_FragColor = texture2D(tex, texcoord);
>+})";
>+
>+        mProgram = CompileProgram(kVS, kFS);
>         if (mProgram == 0)
>         {
>             FAIL() << "shader compilation failed.";
>@@ -123,11 +121,13 @@ class DepthStencilFormatsTestES3 : public DepthStencilFormatsTestBase
> 
> TEST_P(DepthStencilFormatsTest, DepthTexture)
> {
>-    bool shouldHaveTextureSupport = extensionEnabled("GL_ANGLE_depth_texture");
>-    EXPECT_EQ(shouldHaveTextureSupport, checkTexImageFormatSupport(GL_DEPTH_COMPONENT, GL_UNSIGNED_SHORT));
>-    EXPECT_EQ(shouldHaveTextureSupport, checkTexImageFormatSupport(GL_DEPTH_COMPONENT, GL_UNSIGNED_INT));
>+    bool shouldHaveTextureSupport = IsGLExtensionEnabled("GL_ANGLE_depth_texture");
>+    EXPECT_EQ(shouldHaveTextureSupport,
>+              checkTexImageFormatSupport(GL_DEPTH_COMPONENT, GL_UNSIGNED_SHORT));
>+    EXPECT_EQ(shouldHaveTextureSupport,
>+              checkTexImageFormatSupport(GL_DEPTH_COMPONENT, GL_UNSIGNED_INT));
> 
>-    if (extensionEnabled("GL_EXT_texture_storage"))
>+    if (IsGLExtensionEnabled("GL_EXT_texture_storage"))
>     {
>         EXPECT_EQ(shouldHaveTextureSupport, checkTexStorageFormatSupport(GL_DEPTH_COMPONENT16));
>         EXPECT_EQ(shouldHaveTextureSupport, checkTexStorageFormatSupport(GL_DEPTH_COMPONENT32_OES));
>@@ -137,16 +137,19 @@ TEST_P(DepthStencilFormatsTest, DepthTexture)
> TEST_P(DepthStencilFormatsTest, PackedDepthStencil)
> {
>     // Expected to fail in D3D9 if GL_OES_packed_depth_stencil is not present.
>-    // Expected to fail in D3D11 if GL_OES_packed_depth_stencil or GL_ANGLE_depth_texture is not present.
>+    // Expected to fail in D3D11 if GL_OES_packed_depth_stencil or GL_ANGLE_depth_texture is not
>+    // present.
> 
>-    bool shouldHaveRenderbufferSupport = extensionEnabled("GL_OES_packed_depth_stencil");
>-    EXPECT_EQ(shouldHaveRenderbufferSupport, checkRenderbufferFormatSupport(GL_DEPTH24_STENCIL8_OES));
>+    bool shouldHaveRenderbufferSupport = IsGLExtensionEnabled("GL_OES_packed_depth_stencil");
>+    EXPECT_EQ(shouldHaveRenderbufferSupport,
>+              checkRenderbufferFormatSupport(GL_DEPTH24_STENCIL8_OES));
> 
>-    bool shouldHaveTextureSupport = extensionEnabled("GL_OES_packed_depth_stencil") &&
>-                                    extensionEnabled("GL_ANGLE_depth_texture");
>-    EXPECT_EQ(shouldHaveTextureSupport, checkTexImageFormatSupport(GL_DEPTH_STENCIL_OES, GL_UNSIGNED_INT_24_8_OES));
>+    bool shouldHaveTextureSupport = IsGLExtensionEnabled("GL_OES_packed_depth_stencil") &&
>+                                    IsGLExtensionEnabled("GL_ANGLE_depth_texture");
>+    EXPECT_EQ(shouldHaveTextureSupport,
>+              checkTexImageFormatSupport(GL_DEPTH_STENCIL_OES, GL_UNSIGNED_INT_24_8_OES));
> 
>-    if (extensionEnabled("GL_EXT_texture_storage"))
>+    if (IsGLExtensionEnabled("GL_EXT_texture_storage"))
>     {
>         EXPECT_EQ(shouldHaveTextureSupport, checkTexStorageFormatSupport(GL_DEPTH24_STENCIL8_OES));
>     }
>@@ -183,12 +186,71 @@ TEST_P(DepthStencilFormatsTestES3, DrawWithDepthStencil)
>     ASSERT_EQ(255, pixel[3]);
> }
> 
>-// Use this to select which configurations (e.g. which renderer, which GLES major version) these tests should be run against.
>+// This test reproduces a driver bug on Intel windows platforms on driver version
>+// from 4815 to 4901.
>+// When rendering with Stencil buffer enabled and depth buffer disabled, large
>+// viewport will lead to memory leak and driver crash. And the pixel result
>+// is a random value.
>+TEST_P(DepthStencilFormatsTestES3, DrawWithLargeViewport)
>+{
>+    ANGLE_SKIP_TEST_IF(IsIntel() && (IsOSX() || IsWindows()));
>+
>+    ANGLE_GL_PROGRAM(program, essl1_shaders::vs::Simple(), essl1_shaders::fs::Red());
>+
>+    glEnable(GL_STENCIL_TEST);
>+    glDisable(GL_DEPTH_TEST);
>+
>+    // The iteration is to reproduce memory leak when rendering several times.
>+    for (int i = 0; i < 10; ++i)
>+    {
>+        // Create offscreen fbo and its color attachment and depth stencil attachment.
>+        GLTexture framebufferColorTexture;
>+        glBindTexture(GL_TEXTURE_2D, framebufferColorTexture);
>+        glTexStorage2D(GL_TEXTURE_2D, 1, GL_RGBA8, getWindowWidth(), getWindowHeight());
>+        ASSERT_GL_NO_ERROR();
>+
>+        GLTexture framebufferStencilTexture;
>+        glBindTexture(GL_TEXTURE_2D, framebufferStencilTexture);
>+        glTexStorage2D(GL_TEXTURE_2D, 1, GL_DEPTH24_STENCIL8, getWindowWidth(), getWindowHeight());
>+        ASSERT_GL_NO_ERROR();
>+
>+        GLFramebuffer fb;
>+        glBindFramebuffer(GL_FRAMEBUFFER, fb);
>+        glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D,
>+                               framebufferColorTexture, 0);
>+        glFramebufferTexture2D(GL_FRAMEBUFFER, GL_DEPTH_STENCIL_ATTACHMENT, GL_TEXTURE_2D,
>+                               framebufferStencilTexture, 0);
>+
>+        EXPECT_GLENUM_EQ(GL_FRAMEBUFFER_COMPLETE, glCheckFramebufferStatus(GL_FRAMEBUFFER));
>+        ASSERT_GL_NO_ERROR();
>+
>+        GLint kStencilRef = 4;
>+        glStencilOp(GL_REPLACE, GL_REPLACE, GL_REPLACE);
>+        glStencilFunc(GL_ALWAYS, kStencilRef, 0xFF);
>+
>+        float viewport[2];
>+        glGetFloatv(GL_MAX_VIEWPORT_DIMS, viewport);
>+
>+        glViewport(0, 0, static_cast<GLsizei>(viewport[0]), static_cast<GLsizei>(viewport[1]));
>+        glBindFramebuffer(GL_DRAW_FRAMEBUFFER, fb);
>+
>+        drawQuad(program.get(), essl1_shaders::PositionAttrib(), 0.0f);
>+        ASSERT_GL_NO_ERROR();
>+
>+        glBindFramebuffer(GL_READ_FRAMEBUFFER, fb);
>+        EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::red);
>+        ASSERT_GL_NO_ERROR();
>+    }
>+}
>+
>+// Use this to select which configurations (e.g. which renderer, which GLES major version) these
>+// tests should be run against.
> ANGLE_INSTANTIATE_TEST(DepthStencilFormatsTest,
>                        ES2_D3D9(),
>                        ES2_D3D11(),
>                        ES2_OPENGL(),
>-                       ES2_OPENGLES());
>+                       ES2_OPENGLES(),
>+                       ES2_VULKAN());
> ANGLE_INSTANTIATE_TEST(DepthStencilFormatsTestES3, ES3_D3D11(), ES3_OPENGL(), ES3_OPENGLES());
> 
> class TinyDepthStencilWorkaroundTest : public ANGLETest
>@@ -215,22 +277,16 @@ class TinyDepthStencilWorkaroundTest : public ANGLETest
> // http://anglebug.com/1664
> TEST_P(TinyDepthStencilWorkaroundTest, DepthTexturesStick)
> {
>-    const std::string &drawVS =
>+    constexpr char kDrawVS[] =
>         "#version 100\n"
>         "attribute vec3 vertex;\n"
>         "void main () {\n"
>         "  gl_Position = vec4(vertex.x, vertex.y, vertex.z * 2.0 - 1.0, 1);\n"
>         "}\n";
> 
>-    const std::string &drawFS =
>-        "#version 100\n"
>-        "void main () {\n"
>-        "  gl_FragColor = vec4 (1.);\n"
>-        "}\n";
>-
>-    ANGLE_GL_PROGRAM(drawProgram, drawVS, drawFS);
>+    ANGLE_GL_PROGRAM(drawProgram, kDrawVS, essl1_shaders::fs::Red());
> 
>-    const std::string &blitVS =
>+    constexpr char kBlitVS[] =
>         "#version 100\n"
>         "attribute vec2 vertex;\n"
>         "varying vec2 position;\n"
>@@ -239,7 +295,7 @@ TEST_P(TinyDepthStencilWorkaroundTest, DepthTexturesStick)
>         "  gl_Position = vec4(vertex, 0, 1);\n"
>         "}\n";
> 
>-    const std::string &blitFS =
>+    constexpr char kBlitFS[] =
>         "#version 100\n"
>         "precision mediump float;\n"
>         "uniform sampler2D texture;\n"
>@@ -248,7 +304,7 @@ TEST_P(TinyDepthStencilWorkaroundTest, DepthTexturesStick)
>         "  gl_FragColor = vec4 (texture2D (texture, position).rrr, 1.);\n"
>         "}\n";
> 
>-    ANGLE_GL_PROGRAM(blitProgram, blitVS, blitFS);
>+    ANGLE_GL_PROGRAM(blitProgram, kBlitVS, kBlitFS);
> 
>     GLint blitTextureLocation = glGetUniformLocation(blitProgram.get(), "texture");
>     ASSERT_NE(-1, blitTextureLocation);
>diff --git a/Source/ThirdParty/ANGLE/src/tests/gl_tests/DepthStencilTest.cpp b/Source/ThirdParty/ANGLE/src/tests/gl_tests/DepthStencilTest.cpp
>new file mode 100644
>index 00000000000..65d1ba3ea35
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/tests/gl_tests/DepthStencilTest.cpp
>@@ -0,0 +1,265 @@
>+//
>+// Copyright 2018 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// DepthStencilTest:
>+//   Tests covering depth- or stencil-only rendering to make sure the other non-existing aspect is
>+//   not affecting the results (since the format may be emulated with one that has both aspects).
>+//
>+
>+#include "test_utils/ANGLETest.h"
>+
>+#include "platform/FeaturesVk.h"
>+#include "test_utils/gl_raii.h"
>+
>+using namespace angle;
>+
>+namespace
>+{
>+
>+class DepthStencilTest : public ANGLETest
>+{
>+  protected:
>+    DepthStencilTest()
>+    {
>+        setWindowWidth(128);
>+        setWindowHeight(128);
>+        setConfigRedBits(8);
>+        setConfigGreenBits(8);
>+        setConfigBlueBits(8);
>+        setConfigAlphaBits(8);
>+        setConfigDepthBits(24);
>+        setConfigStencilBits(8);
>+    }
>+
>+    void SetUp() override
>+    {
>+        ANGLETest::SetUp();
>+
>+        glBindTexture(GL_TEXTURE_2D, mColorTexture);
>+        glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, getWindowWidth(), getWindowHeight(), 0, GL_RGBA,
>+                     GL_UNSIGNED_BYTE, nullptr);
>+
>+        // Setup Color/Stencil FBO with a stencil format that's emulated with packed depth/stencil.
>+        glBindFramebuffer(GL_FRAMEBUFFER, mColorStencilFBO);
>+
>+        glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, mColorTexture,
>+                               0);
>+        glBindRenderbuffer(GL_RENDERBUFFER, mStencilTexture);
>+        glRenderbufferStorage(GL_RENDERBUFFER, GL_STENCIL_INDEX8, getWindowWidth(),
>+                              getWindowHeight());
>+        glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_STENCIL_ATTACHMENT, GL_RENDERBUFFER,
>+                                  mStencilTexture);
>+
>+        ASSERT_GL_NO_ERROR();
>+
>+        // Note: GL_DEPTH_COMPONENT24 is not allowed in GLES2.
>+        if (getClientMajorVersion() >= 3)
>+        {
>+            // Setup Color/Depth FBO with a depth format that's emulated with packed depth/stencil.
>+            glBindFramebuffer(GL_FRAMEBUFFER, mColorDepthFBO);
>+
>+            glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D,
>+                                   mColorTexture, 0);
>+            glBindRenderbuffer(GL_RENDERBUFFER, mDepthTexture);
>+            glRenderbufferStorage(GL_RENDERBUFFER, GL_DEPTH_COMPONENT24, getWindowWidth(),
>+                                  getWindowHeight());
>+            glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, GL_RENDERBUFFER,
>+                                      mDepthTexture);
>+        }
>+
>+        ASSERT_GL_NO_ERROR();
>+    }
>+
>+    void TearDown() override { ANGLETest::TearDown(); }
>+
>+    void bindColorStencilFBO()
>+    {
>+        glBindFramebuffer(GL_FRAMEBUFFER, mColorStencilFBO);
>+        mHasDepth = false;
>+    }
>+
>+    void bindColorDepthFBO()
>+    {
>+        glBindFramebuffer(GL_FRAMEBUFFER, mColorDepthFBO);
>+        mHasStencil = false;
>+    }
>+
>+    // Override a feature to force emulation of stencil-only and depth-only formats with a packed
>+    // depth/stencil format
>+    void overrideFeaturesVk(FeaturesVk *featuresVk) override
>+    {
>+        featuresVk->forceFallbackFormat = true;
>+    }
>+
>+    void prepareSingleEmulatedWithPacked();
>+    void ensureColor(GLColor color);
>+    void ensureDepthUnaffected();
>+    void ensureStencilUnaffected();
>+
>+  private:
>+    GLFramebuffer mColorStencilFBO;
>+    GLFramebuffer mColorDepthFBO;
>+    GLTexture mColorTexture;
>+    GLRenderbuffer mDepthTexture;
>+    GLRenderbuffer mStencilTexture;
>+
>+    bool mHasDepth   = true;
>+    bool mHasStencil = true;
>+};
>+
>+void DepthStencilTest::ensureColor(GLColor color)
>+{
>+    const int width  = getWindowWidth();
>+    const int height = getWindowHeight();
>+
>+    std::vector<GLColor> pixelData(width * height);
>+    glReadPixels(0, 0, width, height, GL_RGBA, GL_UNSIGNED_BYTE, pixelData.data());
>+
>+    for (int i = 0; i < width * height; i += 16)
>+    {
>+        GLColor actualColor = pixelData[i];
>+        EXPECT_NEAR(color.R, actualColor.R, 1);
>+        EXPECT_NEAR(color.G, actualColor.G, 1);
>+        EXPECT_NEAR(color.B, actualColor.B, 1);
>+        EXPECT_NEAR(color.A, actualColor.A, 1);
>+
>+        if (i % width == 0)
>+            i += 16 * width;
>+    }
>+}
>+
>+void DepthStencilTest::ensureDepthUnaffected()
>+{
>+    ANGLE_GL_PROGRAM(depthTestProgram, essl1_shaders::vs::Passthrough(), essl1_shaders::fs::Blue());
>+    glEnable(GL_DEPTH_TEST);
>+    glDepthFunc(GL_EQUAL);
>+    drawQuad(depthTestProgram, essl1_shaders::PositionAttrib(), 0.123f);
>+    glDisable(GL_DEPTH_TEST);
>+    ASSERT_GL_NO_ERROR();
>+
>+    // Since depth shouldn't exist, the drawQuad above should succeed in turning the whole image
>+    // blue.
>+    ensureColor(GLColor::blue);
>+}
>+
>+void DepthStencilTest::ensureStencilUnaffected()
>+{
>+    ANGLE_GL_PROGRAM(stencilTestProgram, essl1_shaders::vs::Passthrough(),
>+                     essl1_shaders::fs::Green());
>+    glEnable(GL_STENCIL_TEST);
>+    glStencilFunc(GL_EQUAL, 0x1B, 0xFF);
>+    drawQuad(stencilTestProgram, essl1_shaders::PositionAttrib(), 0.0f);
>+    glDisable(GL_STENCIL_TEST);
>+    ASSERT_GL_NO_ERROR();
>+
>+    // Since stencil shouldn't exist, the drawQuad above should succeed in turning the whole image
>+    // green.
>+    ensureColor(GLColor::green);
>+}
>+
>+void DepthStencilTest::prepareSingleEmulatedWithPacked()
>+{
>+    const int w     = getWindowWidth();
>+    const int h     = getWindowHeight();
>+    const int whalf = w >> 1;
>+    const int hhalf = h >> 1;
>+
>+    // Clear to a random color, 0.75 depth and 0x36 stencil
>+    Vector4 color1(0.1f, 0.2f, 0.3f, 0.4f);
>+    GLColor color1RGB(color1);
>+
>+    glClearColor(color1[0], color1[1], color1[2], color1[3]);
>+    glClearDepthf(0.75f);
>+    glClearStencil(0x36);
>+    glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT);
>+    ASSERT_GL_NO_ERROR();
>+
>+    // Verify color was cleared correctly.
>+    EXPECT_PIXEL_COLOR_NEAR(0, 0, color1RGB, 1);
>+
>+    // Use masked color to clear two channels of the image to a second color, 0.25 depth and 0x59
>+    // stencil.
>+    Vector4 color2(0.2f, 0.4f, 0.6f, 0.8f);
>+    glClearColor(color2[0], color2[1], color2[2], color2[3]);
>+    glClearDepthf(0.25f);
>+    glClearStencil(0x59);
>+    glColorMask(GL_TRUE, GL_FALSE, GL_TRUE, GL_FALSE);
>+    glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT);
>+    glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE);
>+    ASSERT_GL_NO_ERROR();
>+
>+    GLColor color2RGB(Vector4(color2[0], color1[1], color2[2], color1[3]));
>+
>+    EXPECT_PIXEL_COLOR_NEAR(whalf, hhalf, color2RGB, 1);
>+
>+    EXPECT_PIXEL_COLOR_NEAR(0, 0, color2RGB, 1);
>+    EXPECT_PIXEL_COLOR_NEAR(w - 1, 0, color2RGB, 1);
>+    EXPECT_PIXEL_COLOR_NEAR(0, h - 1, color2RGB, 1);
>+    EXPECT_PIXEL_COLOR_NEAR(w - 1, h - 1, color2RGB, 1);
>+
>+    // Use scissor to clear the center to a third color, 0.5 depth and 0xA9 stencil.
>+    glEnable(GL_SCISSOR_TEST);
>+    glScissor(whalf / 2, hhalf / 2, whalf, hhalf);
>+
>+    Vector4 color3(0.3f, 0.5f, 0.7f, 0.9f);
>+    GLColor color3RGB(color3);
>+    glClearColor(color3[0], color3[1], color3[2], color3[3]);
>+    glClearDepthf(0.5f);
>+    glClearStencil(0xA9);
>+    glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT);
>+    glDisable(GL_SCISSOR_TEST);
>+    ASSERT_GL_NO_ERROR();
>+
>+    EXPECT_PIXEL_COLOR_NEAR(whalf, hhalf, color3RGB, 1);
>+
>+    EXPECT_PIXEL_COLOR_NEAR(0, 0, color2RGB, 1);
>+    EXPECT_PIXEL_COLOR_NEAR(w - 1, 0, color2RGB, 1);
>+    EXPECT_PIXEL_COLOR_NEAR(0, h - 1, color2RGB, 1);
>+    EXPECT_PIXEL_COLOR_NEAR(w - 1, h - 1, color2RGB, 1);
>+
>+    // Use scissor to draw to the right half of the image with a fourth color, 0.6 depth and 0x84
>+    // stencil.
>+    glEnable(GL_SCISSOR_TEST);
>+    glScissor(whalf, 0, whalf, h);
>+
>+    ANGLE_GL_PROGRAM(redProgram, essl1_shaders::vs::Simple(), essl1_shaders::fs::Red());
>+    glEnable(GL_STENCIL_TEST);
>+    glStencilFunc(GL_ALWAYS, 0x84, 0xFF);
>+    glStencilOp(GL_KEEP, GL_KEEP, GL_REPLACE);
>+    glStencilMask(0xFF);
>+    drawQuad(redProgram, essl1_shaders::PositionAttrib(), 0.2f);
>+
>+    glDisable(GL_STENCIL_TEST);
>+    glDisable(GL_SCISSOR_TEST);
>+}
>+
>+// Tests that clearing or rendering into a depth-only format doesn't affect stencil.
>+TEST_P(DepthStencilTest, DepthOnlyEmulatedWithPacked)
>+{
>+    ANGLE_SKIP_TEST_IF(getClientMajorVersion() < 3);
>+
>+    bindColorDepthFBO();
>+    prepareSingleEmulatedWithPacked();
>+    ensureStencilUnaffected();
>+}
>+
>+// Tests that clearing or rendering into a stencil-only format doesn't affect depth.
>+TEST_P(DepthStencilTest, StencilOnlyEmulatedWithPacked)
>+{
>+    bindColorStencilFBO();
>+    prepareSingleEmulatedWithPacked();
>+    ensureDepthUnaffected();
>+}
>+
>+ANGLE_INSTANTIATE_TEST(DepthStencilTest,
>+                       ES2_D3D11(),
>+                       ES3_D3D11(),
>+                       ES2_OPENGL(),
>+                       ES3_OPENGL(),
>+                       ES2_OPENGLES(),
>+                       ES3_OPENGLES(),
>+                       ES2_VULKAN());
>+
>+}  // anonymous namespace
>diff --git a/Source/ThirdParty/ANGLE/src/tests/gl_tests/DifferentStencilMasksTest.cpp b/Source/ThirdParty/ANGLE/src/tests/gl_tests/DifferentStencilMasksTest.cpp
>index b3b2279e14d..028dfe9d08c 100644
>--- a/Source/ThirdParty/ANGLE/src/tests/gl_tests/DifferentStencilMasksTest.cpp
>+++ b/Source/ThirdParty/ANGLE/src/tests/gl_tests/DifferentStencilMasksTest.cpp
>@@ -8,6 +8,7 @@
> //
> 
> #include "test_utils/ANGLETest.h"
>+#include "test_utils/gl_raii.h"
> 
> using namespace angle;
> 
>@@ -26,30 +27,15 @@ class DifferentStencilMasksTest : public ANGLETest
>         setConfigAlphaBits(8);
>         setConfigDepthBits(24);
>         setConfigStencilBits(8);
>+
>+        setWebGLCompatibilityEnabled(true);
>     }
> 
>     void SetUp() override
>     {
>         ANGLETest::SetUp();
> 
>-        const std::string vertexShaderSource =
>-            R"(precision highp float;
>-            attribute vec4 position;
>-
>-            void main()
>-            {
>-                gl_Position = position;
>-            })";
>-
>-        const std::string fragmentShaderSource =
>-            R"(precision highp float;
>-
>-            void main()
>-            {
>-                gl_FragColor = vec4(0.0, 0.0, 1.0, 1.0);
>-            })";
>-
>-        mProgram = CompileProgram(vertexShaderSource, fragmentShaderSource);
>+        mProgram = CompileProgram(essl1_shaders::vs::Zero(), essl1_shaders::fs::Blue());
>         ASSERT_NE(0u, mProgram);
> 
>         glEnable(GL_STENCIL_TEST);
>@@ -77,7 +63,7 @@ TEST_P(DifferentStencilMasksTest, DrawWithSameEffectiveMask)
> 
>     glUseProgram(mProgram);
> 
>-    drawQuad(mProgram, "position", 0.5f);
>+    glDrawArrays(GL_TRIANGLES, 0, 3);
> 
>     EXPECT_GL_NO_ERROR();
> }
>@@ -90,81 +76,39 @@ TEST_P(DifferentStencilMasksTest, DrawWithDifferentMask)
> 
>     glUseProgram(mProgram);
> 
>-    drawQuad(mProgram, "position", 0.5f);
>+    glDrawArrays(GL_TRIANGLES, 0, 3);
> 
>     EXPECT_GL_ERROR(GL_INVALID_OPERATION);
> }
> 
>-class DifferentStencilMasksWithoutStencilBufferTest : public ANGLETest
>+// Tests that effectively different front and back masks, without stencil bits, are legal.
>+TEST_P(DifferentStencilMasksTest, DrawWithDifferentMask_NoStencilBuffer)
> {
>-  protected:
>-    DifferentStencilMasksWithoutStencilBufferTest() : mProgram(0)
>-    {
>-        setWindowWidth(128);
>-        setWindowHeight(128);
>-        setConfigRedBits(8);
>-        setConfigGreenBits(8);
>-        setConfigBlueBits(8);
>-        setConfigAlphaBits(8);
>-        setConfigDepthBits(0);
>-        setConfigStencilBits(0);
>-    }
>-
>-    void SetUp() override
>-    {
>-        ANGLETest::SetUp();
>-
>-        const std::string vertexShaderSource =
>-            R"(precision highp float;
>-            attribute vec4 position;
>-
>-            void main()
>-            {
>-                gl_Position = position;
>-            })";
>+    GLTexture texture;
>+    glBindTexture(GL_TEXTURE_2D, texture.get());
>+    glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, 64, 64, 0, GL_RGBA, GL_UNSIGNED_BYTE, nullptr);
> 
>-        const std::string fragmentShaderSource =
>-            R"(precision highp float;
>+    GLFramebuffer framebuffer;
>+    glBindFramebuffer(GL_FRAMEBUFFER, framebuffer.get());
>+    glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, texture.get(), 0);
> 
>-            void main()
>-            {
>-                gl_FragColor = vec4(0.0, 0.0, 1.0, 1.0);
>-            })";
>-
>-        mProgram = CompileProgram(vertexShaderSource, fragmentShaderSource);
>-        ASSERT_NE(0u, mProgram);
>-
>-        glEnable(GL_STENCIL_TEST);
>-        ASSERT_GL_NO_ERROR();
>-    }
>-
>-    void TearDown() override
>-    {
>-        glDisable(GL_STENCIL_TEST);
>-        if (mProgram != 0)
>-            glDeleteProgram(mProgram);
>-
>-        ANGLETest::TearDown();
>-    }
>-
>-    GLuint mProgram;
>-};
>-
>-// Tests that effectively different front and back masks, without stencil bits, are legal.
>-TEST_P(DifferentStencilMasksWithoutStencilBufferTest, DrawWithDifferentMask)
>-{
>     glStencilMaskSeparate(GL_FRONT, 0x0001);
>     glStencilMaskSeparate(GL_BACK, 0x0002);
> 
>     glUseProgram(mProgram);
> 
>-    drawQuad(mProgram, "position", 0.5f);
>+    glDrawArrays(GL_TRIANGLES, 0, 3);
> 
>     EXPECT_GL_NO_ERROR();
> }
> 
> // Use this to select which configurations (e.g. which renderer, which GLES major version) these
> // tests should be run against.
>-ANGLE_INSTANTIATE_TEST(DifferentStencilMasksTest, ES2_D3D9(), ES2_D3D11(), ES3_D3D11(), ES2_OPENGL(), ES3_OPENGL());
>-ANGLE_INSTANTIATE_TEST(DifferentStencilMasksWithoutStencilBufferTest, ES2_D3D9(), ES2_D3D11(), ES3_D3D11(), ES2_OPENGL(), ES3_OPENGL());
>-} // anonymous namespace
>+ANGLE_INSTANTIATE_TEST(DifferentStencilMasksTest,
>+                       ES2_D3D9(),
>+                       ES2_D3D11(),
>+                       ES3_D3D11(),
>+                       ES2_OPENGL(),
>+                       ES3_OPENGL(),
>+                       ES2_VULKAN());
>+}  // anonymous namespace
>diff --git a/Source/ThirdParty/ANGLE/src/tests/gl_tests/DiscardFramebufferEXTTest.cpp b/Source/ThirdParty/ANGLE/src/tests/gl_tests/DiscardFramebufferEXTTest.cpp
>index 0e91b0db030..e0235b4e345 100644
>--- a/Source/ThirdParty/ANGLE/src/tests/gl_tests/DiscardFramebufferEXTTest.cpp
>+++ b/Source/ThirdParty/ANGLE/src/tests/gl_tests/DiscardFramebufferEXTTest.cpp
>@@ -10,7 +10,7 @@ using namespace angle;
> 
> class DiscardFramebufferEXTTest : public ANGLETest
> {
>-protected:
>+  protected:
>     DiscardFramebufferEXTTest()
>     {
>         setWindowWidth(256);
>@@ -26,50 +26,42 @@ protected:
> 
> TEST_P(DiscardFramebufferEXTTest, DefaultFramebuffer)
> {
>-    if (!extensionEnabled("EXT_discard_framebuffer"))
>-    {
>-        std::cout << "Test skipped because EXT_discard_framebuffer is not available." << std::endl;
>-        return;
>-    }
>+    ANGLE_SKIP_TEST_IF(!IsGLExtensionEnabled("EXT_discard_framebuffer"));
> 
>     // These should succeed on the default framebuffer
>-    const GLenum discards1[] = { GL_COLOR_EXT };
>+    const GLenum discards1[] = {GL_COLOR_EXT};
>     glDiscardFramebufferEXT(GL_FRAMEBUFFER, 1, discards1);
>     EXPECT_GL_NO_ERROR();
> 
>-    const GLenum discards2[] = { GL_DEPTH_EXT };
>+    const GLenum discards2[] = {GL_DEPTH_EXT};
>     glDiscardFramebufferEXT(GL_FRAMEBUFFER, 1, discards2);
>     EXPECT_GL_NO_ERROR();
> 
>-    const GLenum discards3[] = { GL_STENCIL_EXT };
>+    const GLenum discards3[] = {GL_STENCIL_EXT};
>     glDiscardFramebufferEXT(GL_FRAMEBUFFER, 1, discards3);
>     EXPECT_GL_NO_ERROR();
> 
>-    const GLenum discards4[] = { GL_STENCIL_EXT, GL_COLOR_EXT, GL_DEPTH_EXT };
>+    const GLenum discards4[] = {GL_STENCIL_EXT, GL_COLOR_EXT, GL_DEPTH_EXT};
>     glDiscardFramebufferEXT(GL_FRAMEBUFFER, 3, discards4);
>     EXPECT_GL_NO_ERROR();
> 
>     // These should fail on the default framebuffer
>-    const GLenum discards5[] = { GL_COLOR_ATTACHMENT0 };
>+    const GLenum discards5[] = {GL_COLOR_ATTACHMENT0};
>     glDiscardFramebufferEXT(GL_FRAMEBUFFER, 1, discards5);
>     EXPECT_GL_ERROR(GL_INVALID_ENUM);
> 
>-    const GLenum discards6[] = { GL_DEPTH_ATTACHMENT };
>+    const GLenum discards6[] = {GL_DEPTH_ATTACHMENT};
>     glDiscardFramebufferEXT(GL_FRAMEBUFFER, 1, discards6);
>     EXPECT_GL_ERROR(GL_INVALID_ENUM);
> 
>-    const GLenum discards7[] = { GL_STENCIL_ATTACHMENT };
>+    const GLenum discards7[] = {GL_STENCIL_ATTACHMENT};
>     glDiscardFramebufferEXT(GL_FRAMEBUFFER, 1, discards7);
>     EXPECT_GL_ERROR(GL_INVALID_ENUM);
> }
> 
> TEST_P(DiscardFramebufferEXTTest, NonDefaultFramebuffer)
> {
>-    if (!extensionEnabled("EXT_discard_framebuffer"))
>-    {
>-        std::cout << "Test skipped because EXT_discard_framebuffer is not available." << std::endl;
>-        return;
>-    }
>+    ANGLE_SKIP_TEST_IF(!IsGLExtensionEnabled("EXT_discard_framebuffer"));
> 
>     GLuint tex2D;
>     GLuint framebuffer;
>@@ -88,37 +80,38 @@ TEST_P(DiscardFramebufferEXTTest, NonDefaultFramebuffer)
>     ASSERT_GLENUM_EQ(GL_FRAMEBUFFER_COMPLETE, glCheckFramebufferStatus(GL_FRAMEBUFFER));
> 
>     // These should fail on the non-default framebuffer
>-    const GLenum discards1[] = { GL_COLOR_EXT };
>+    const GLenum discards1[] = {GL_COLOR_EXT};
>     glDiscardFramebufferEXT(GL_FRAMEBUFFER, 1, discards1);
>     EXPECT_GL_ERROR(GL_INVALID_ENUM);
> 
>-    const GLenum discards2[] = { GL_DEPTH_EXT };
>+    const GLenum discards2[] = {GL_DEPTH_EXT};
>     glDiscardFramebufferEXT(GL_FRAMEBUFFER, 1, discards2);
>     EXPECT_GL_ERROR(GL_INVALID_ENUM);
> 
>-    const GLenum discards3[] = { GL_STENCIL_EXT };
>+    const GLenum discards3[] = {GL_STENCIL_EXT};
>     glDiscardFramebufferEXT(GL_FRAMEBUFFER, 1, discards3);
>     EXPECT_GL_ERROR(GL_INVALID_ENUM);
> 
>-    const GLenum discards4[] = { GL_STENCIL_EXT, GL_COLOR_EXT, GL_DEPTH_EXT };
>+    const GLenum discards4[] = {GL_STENCIL_EXT, GL_COLOR_EXT, GL_DEPTH_EXT};
>     glDiscardFramebufferEXT(GL_FRAMEBUFFER, 3, discards4);
>     EXPECT_GL_ERROR(GL_INVALID_ENUM);
> 
>     // These should succeed on the non-default framebuffer
>-    const GLenum discards5[] = { GL_COLOR_ATTACHMENT0 };
>+    const GLenum discards5[] = {GL_COLOR_ATTACHMENT0};
>     glDiscardFramebufferEXT(GL_FRAMEBUFFER, 1, discards5);
>     EXPECT_GL_NO_ERROR();
> 
>-    const GLenum discards6[] = { GL_DEPTH_ATTACHMENT };
>+    const GLenum discards6[] = {GL_DEPTH_ATTACHMENT};
>     glDiscardFramebufferEXT(GL_FRAMEBUFFER, 1, discards6);
>     EXPECT_GL_NO_ERROR();
> 
>-    const GLenum discards7[] = { GL_STENCIL_ATTACHMENT };
>+    const GLenum discards7[] = {GL_STENCIL_ATTACHMENT};
>     glDiscardFramebufferEXT(GL_FRAMEBUFFER, 1, discards7);
>     EXPECT_GL_NO_ERROR();
> }
> 
>-// Use this to select which configurations (e.g. which renderer, which GLES major version) these tests should be run against.
>+// Use this to select which configurations (e.g. which renderer, which GLES major version) these
>+// tests should be run against.
> ANGLE_INSTANTIATE_TEST(DiscardFramebufferEXTTest,
>                        ES2_D3D9(),
>                        ES2_D3D11(),
>@@ -126,4 +119,5 @@ ANGLE_INSTANTIATE_TEST(DiscardFramebufferEXTTest,
>                        ES2_OPENGL(),
>                        ES3_OPENGL(),
>                        ES2_OPENGLES(),
>-                       ES3_OPENGLES());
>+                       ES3_OPENGLES(),
>+                       ES2_VULKAN());
>diff --git a/Source/ThirdParty/ANGLE/src/tests/gl_tests/DrawBuffersTest.cpp b/Source/ThirdParty/ANGLE/src/tests/gl_tests/DrawBuffersTest.cpp
>index 1a788ad92c0..87cf4bd3175 100644
>--- a/Source/ThirdParty/ANGLE/src/tests/gl_tests/DrawBuffersTest.cpp
>+++ b/Source/ThirdParty/ANGLE/src/tests/gl_tests/DrawBuffersTest.cpp
>@@ -21,39 +21,12 @@ class DrawBuffersTest : public ANGLETest
>         setConfigBlueBits(8);
>         setConfigAlphaBits(8);
>         setConfigDepthBits(24);
>-        mMaxDrawBuffers = 0;
>-    }
>-
>-    void SetUp() override
>-    {
>-        ANGLETest::SetUp();
>-
>-        // This test seems to fail on an nVidia machine when the window is hidden
>-        SetWindowVisible(true);
>-
>-        glGenFramebuffers(1, &mFBO);
>-        glBindFramebuffer(GL_FRAMEBUFFER, mFBO);
>-
>-        glGenTextures(4, mTextures);
>-
>-        for (size_t texIndex = 0; texIndex < ArraySize(mTextures); texIndex++)
>-        {
>-            glBindTexture(GL_TEXTURE_2D, mTextures[texIndex]);
>-            glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, getWindowWidth(), getWindowHeight(), 0, GL_RGBA,
>-                         GL_UNSIGNED_BYTE, nullptr);
>-        }
>-
>-        if (checkSupport())
>-        {
>-            glGetIntegerv(GL_MAX_DRAW_BUFFERS, &mMaxDrawBuffers);
>-        }
>-
>-        ASSERT_GL_NO_ERROR();
>     }
> 
>     void TearDown() override
>     {
>         glDeleteFramebuffers(1, &mFBO);
>+        glDeleteFramebuffers(1, &mReadFramebuffer);
>         glDeleteTextures(4, mTextures);
> 
>         ANGLETest::TearDown();
>@@ -63,7 +36,7 @@ class DrawBuffersTest : public ANGLETest
>     // method instead of calling on directly.
>     void setDrawBuffers(GLsizei n, const GLenum *drawBufs)
>     {
>-        if (extensionEnabled("GL_EXT_draw_buffers"))
>+        if (IsGLExtensionEnabled("GL_EXT_draw_buffers"))
>         {
>             glDrawBuffersEXT(n, drawBufs);
>         }
>@@ -75,20 +48,39 @@ class DrawBuffersTest : public ANGLETest
>     }
> 
>     // Use this method to filter if we can support these tests.
>-    bool checkSupport()
>+    bool setupTest()
>     {
>-        return (getClientMajorVersion() >= 3 || extensionEnabled("GL_EXT_draw_buffers"));
>+        if (getClientMajorVersion() < 3 && (!EnsureGLExtensionEnabled("GL_EXT_draw_buffers") ||
>+                                            !EnsureGLExtensionEnabled("GL_ANGLE_framebuffer_blit")))
>+        {
>+            return false;
>+        }
>+
>+        // This test seems to fail on an nVidia machine when the window is hidden
>+        setWindowVisible(true);
>+
>+        glGenFramebuffers(1, &mFBO);
>+        glBindFramebuffer(GL_DRAW_FRAMEBUFFER, mFBO);
>+
>+        glGenTextures(4, mTextures);
>+
>+        for (size_t texIndex = 0; texIndex < ArraySize(mTextures); texIndex++)
>+        {
>+            glBindTexture(GL_TEXTURE_2D, mTextures[texIndex]);
>+            glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, getWindowWidth(), getWindowHeight(), 0, GL_RGBA,
>+                         GL_UNSIGNED_BYTE, nullptr);
>+        }
>+
>+        glGetIntegerv(GL_MAX_DRAW_BUFFERS, &mMaxDrawBuffers);
>+
>+        glGenFramebuffers(1, &mReadFramebuffer);
>+        glBindFramebuffer(GL_READ_FRAMEBUFFER, mReadFramebuffer);
>+
>+        return true;
>     }
> 
>     void setupMRTProgramESSL3(bool bufferEnabled[8], GLuint *programOut)
>     {
>-        const std::string vertexShaderSource =
>-            "#version 300 es\n"
>-            "in vec4 position;\n"
>-            "void main() {\n"
>-            "    gl_Position = position;\n"
>-            "}\n";
>-
>         std::stringstream strstr;
> 
>         strstr << "#version 300 es\n"
>@@ -98,8 +90,10 @@ class DrawBuffersTest : public ANGLETest
>         {
>             if (bufferEnabled[index])
>             {
>-                strstr << "layout(location = " << index << ") "
>-                          "out vec4 value" << index << ";\n";
>+                strstr << "layout(location = " << index
>+                       << ") "
>+                          "out vec4 value"
>+                       << index << ";\n";
>             }
>         }
> 
>@@ -114,15 +108,14 @@ class DrawBuffersTest : public ANGLETest
>                 unsigned int g = (index + 1) & 2;
>                 unsigned int b = (index + 1) & 4;
> 
>-                strstr << "    value" << index << " = vec4("
>-                       << r << ".0, " << g << ".0, "
>-                       << b << ".0, 1.0);\n";
>+                strstr << "    value" << index << " = vec4(" << r << ".0, " << g << ".0, " << b
>+                       << ".0, 1.0);\n";
>             }
>         }
> 
>         strstr << "}\n";
> 
>-        *programOut = CompileProgram(vertexShaderSource, strstr.str());
>+        *programOut = CompileProgram(essl3_shaders::vs::Simple(), strstr.str().c_str());
>         if (*programOut == 0)
>         {
>             FAIL() << "shader compilation failed.";
>@@ -131,12 +124,6 @@ class DrawBuffersTest : public ANGLETest
> 
>     void setupMRTProgramESSL1(bool bufferEnabled[8], GLuint *programOut)
>     {
>-        const std::string vertexShaderSource =
>-            "attribute vec4 position;\n"
>-            "void main() {\n"
>-            "    gl_Position = position;\n"
>-            "}\n";
>-
>         std::stringstream strstr;
> 
>         strstr << "#extension GL_EXT_draw_buffers : enable\n"
>@@ -152,15 +139,14 @@ class DrawBuffersTest : public ANGLETest
>                 unsigned int g = (index + 1) & 2;
>                 unsigned int b = (index + 1) & 4;
> 
>-                strstr << "    gl_FragData[" << index << "] = vec4("
>-                    << r << ".0, " << g << ".0, "
>-                    << b << ".0, 1.0);\n";
>+                strstr << "    gl_FragData[" << index << "] = vec4(" << r << ".0, " << g << ".0, "
>+                       << b << ".0, 1.0);\n";
>             }
>         }
> 
>         strstr << "}\n";
> 
>-        *programOut = CompileProgram(vertexShaderSource, strstr.str());
>+        *programOut = CompileProgram(essl1_shaders::vs::Simple(), strstr.str().c_str());
>         if (*programOut == 0)
>         {
>             FAIL() << "shader compilation failed.";
>@@ -180,6 +166,18 @@ class DrawBuffersTest : public ANGLETest
>         }
>     }
> 
>+    const char *positionAttrib()
>+    {
>+        if (getClientMajorVersion() == 3)
>+        {
>+            return essl3_shaders::PositionAttrib();
>+        }
>+        else
>+        {
>+            return essl1_shaders::PositionAttrib();
>+        }
>+    }
>+
>     static GLColor getColorForIndex(unsigned int index)
>     {
>         GLubyte r = (((index + 1) & 1) > 0) ? 255 : 0;
>@@ -188,91 +186,89 @@ class DrawBuffersTest : public ANGLETest
>         return GLColor(r, g, b, 255u);
>     }
> 
>-    void verifyAttachment2D(unsigned int index, GLuint textureName, GLenum target, GLint level)
>+    void verifyAttachment2DColor(unsigned int index,
>+                                 GLuint textureName,
>+                                 GLenum target,
>+                                 GLint level,
>+                                 GLColor color)
>     {
>-        for (GLint colorAttachment = 0; colorAttachment < mMaxDrawBuffers; colorAttachment++)
>-        {
>-            glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0 + colorAttachment, GL_TEXTURE_2D, 0, 0);
>-        }
>+        glFramebufferTexture2D(GL_READ_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, target, textureName,
>+                               level);
>+        EXPECT_PIXEL_COLOR_EQ(getWindowWidth() / 2, getWindowHeight() / 2, color)
>+            << "index " << index;
>+    }
> 
>-        glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, target, textureName, level);
>+    void verifyAttachment2DUnwritten(unsigned int index, GLuint texture, GLenum target, GLint level)
>+    {
>+        verifyAttachment2DColor(index, texture, target, level, GLColor::transparentBlack);
>+    }
> 
>-        EXPECT_PIXEL_COLOR_EQ(getWindowWidth() / 2, getWindowHeight() / 2, getColorForIndex(index));
>+    void verifyAttachment2D(unsigned int index, GLuint texture, GLenum target, GLint level)
>+    {
>+        verifyAttachment2DColor(index, texture, target, level, getColorForIndex(index));
>     }
> 
>     void verifyAttachmentLayer(unsigned int index, GLuint texture, GLint level, GLint layer)
>     {
>-        for (GLint colorAttachment = 0; colorAttachment < mMaxDrawBuffers; colorAttachment++)
>-        {
>-            glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0 + colorAttachment,
>-                                   GL_TEXTURE_2D, 0, 0);
>-        }
>-
>-        glFramebufferTextureLayer(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, texture, level, layer);
>-
>+        glFramebufferTextureLayer(GL_READ_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, texture, level, layer);
>         EXPECT_PIXEL_COLOR_EQ(getWindowWidth() / 2, getWindowHeight() / 2, getColorForIndex(index));
>     }
> 
>-    GLuint mFBO;
>-    GLuint mTextures[4];
>-    GLint mMaxDrawBuffers;
>+    GLuint mFBO             = 0;
>+    GLuint mReadFramebuffer = 0;
>+    GLuint mTextures[4]     = {};
>+    GLint mMaxDrawBuffers   = 0;
>+};
>+
>+class DrawBuffersWebGL2Test : public DrawBuffersTest
>+{
>+  public:
>+    DrawBuffersWebGL2Test()
>+    {
>+        setWebGLCompatibilityEnabled(true);
>+        setRobustResourceInit(true);
>+    }
> };
> 
> // Verify that GL_MAX_DRAW_BUFFERS returns the expected values for D3D11
> TEST_P(DrawBuffersTest, VerifyD3DLimits)
> {
>     EGLPlatformParameters platform = GetParam().eglParameters;
>-    if (platform.renderer == EGL_PLATFORM_ANGLE_TYPE_D3D11_ANGLE)
>+
>+    ANGLE_SKIP_TEST_IF(platform.renderer != EGL_PLATFORM_ANGLE_TYPE_D3D11_ANGLE);
>+
>+    glGetIntegerv(GL_MAX_DRAW_BUFFERS, &mMaxDrawBuffers);
>+
>+    if (platform.majorVersion == 9 && platform.minorVersion == 3)
>     {
>-        if (platform.majorVersion == 9 && platform.minorVersion == 3)
>-        {
>-            // D3D11 Feature Level 9_3 supports 4 draw buffers
>-            ASSERT_EQ(mMaxDrawBuffers, 4);
>-        }
>-        else
>-        {
>-            // D3D11 Feature Level 10_0+ supports 8 draw buffers
>-            ASSERT_EQ(mMaxDrawBuffers, 8);
>-        }
>+        // D3D11 Feature Level 9_3 supports 4 draw buffers
>+        ASSERT_EQ(mMaxDrawBuffers, 4);
>     }
>     else
>     {
>-        std::cout << "Test skipped for non-D3D11 renderers." << std::endl;
>-        return;
>+        // D3D11 Feature Level 10_0+ supports 8 draw buffers
>+        ASSERT_EQ(mMaxDrawBuffers, 8);
>     }
> }
> 
> TEST_P(DrawBuffersTest, Gaps)
> {
>-    if (!checkSupport())
>-    {
>-        std::cout << "Test skipped because ES3 or GL_EXT_draw_buffers is not available."
>-                  << std::endl;
>-        return;
>-    }
>+    ANGLE_SKIP_TEST_IF(!setupTest());
> 
>-    if (IsWindows() && IsAMD() && IsDesktopOpenGL())
>-    {
>-        // TODO(ynovikov): Investigate the failure (http://anglebug.com/1535)
>-        std::cout << "Test disabled on Windows AMD OpenGL." << std::endl;
>-        return;
>-    }
>+    // TODO(ynovikov): Investigate the failure (http://anglebug.com/1535)
>+    ANGLE_SKIP_TEST_IF(IsWindows() && IsAMD() && IsDesktopOpenGL());
> 
>     glBindTexture(GL_TEXTURE_2D, mTextures[0]);
>     glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT1, GL_TEXTURE_2D, mTextures[0], 0);
> 
>-    bool flags[8] = { false, true };
>+    bool flags[8] = {false, true};
> 
>     GLuint program;
>     setupMRTProgram(flags, &program);
> 
>-    const GLenum bufs[] =
>-    {
>-        GL_NONE,
>-        GL_COLOR_ATTACHMENT1
>-    };
>+    const GLenum bufs[] = {GL_NONE, GL_COLOR_ATTACHMENT1};
>     setDrawBuffers(2, bufs);
>-    drawQuad(program, "position", 0.5);
>+    drawQuad(program, positionAttrib(), 0.5);
> 
>     verifyAttachment2D(1, mTextures[0], GL_TEXTURE_2D, 0);
> 
>@@ -281,19 +277,10 @@ TEST_P(DrawBuffersTest, Gaps)
> 
> TEST_P(DrawBuffersTest, FirstAndLast)
> {
>-    if (!checkSupport())
>-    {
>-        std::cout << "Test skipped because ES3 or GL_EXT_draw_buffers is not available."
>-                  << std::endl;
>-        return;
>-    }
>+    ANGLE_SKIP_TEST_IF(!setupTest());
> 
>-    if (IsWindows() && IsAMD() && IsDesktopOpenGL())
>-    {
>-        // TODO(ynovikov): Investigate the failure (https://anglebug.com/1533)
>-        std::cout << "Test disabled on Windows AMD OpenGL." << std::endl;
>-        return;
>-    }
>+    // TODO(ynovikov): Investigate the failure (https://anglebug.com/1533)
>+    ANGLE_SKIP_TEST_IF(IsWindows() && IsAMD() && IsDesktopOpenGL());
> 
>     glBindTexture(GL_TEXTURE_2D, mTextures[0]);
>     glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, mTextures[0], 0);
>@@ -301,21 +288,15 @@ TEST_P(DrawBuffersTest, FirstAndLast)
>     glBindTexture(GL_TEXTURE_2D, mTextures[1]);
>     glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT3, GL_TEXTURE_2D, mTextures[1], 0);
> 
>-    bool flags[8] = { true, false, false, true };
>+    bool flags[8] = {true, false, false, true};
> 
>     GLuint program;
>     setupMRTProgram(flags, &program);
> 
>-    const GLenum bufs[] =
>-    {
>-        GL_COLOR_ATTACHMENT0,
>-        GL_NONE,
>-        GL_NONE,
>-        GL_COLOR_ATTACHMENT3
>-    };
>+    const GLenum bufs[] = {GL_COLOR_ATTACHMENT0, GL_NONE, GL_NONE, GL_COLOR_ATTACHMENT3};
> 
>     setDrawBuffers(4, bufs);
>-    drawQuad(program, "position", 0.5);
>+    drawQuad(program, positionAttrib(), 0.5);
> 
>     verifyAttachment2D(0, mTextures[0], GL_TEXTURE_2D, 0);
>     verifyAttachment2D(3, mTextures[1], GL_TEXTURE_2D, 0);
>@@ -327,38 +308,30 @@ TEST_P(DrawBuffersTest, FirstAndLast)
> 
> TEST_P(DrawBuffersTest, FirstHalfNULL)
> {
>-    if (!checkSupport())
>-    {
>-        std::cout << "Test skipped because ES3 or GL_EXT_draw_buffers is not available."
>-                  << std::endl;
>-        return;
>-    }
>+    ANGLE_SKIP_TEST_IF(!setupTest());
> 
>-    if (IsWindows() && IsAMD() && IsDesktopOpenGL())
>-    {
>-        // TODO(ynovikov): Investigate the failure (https://anglebug.com/1533)
>-        std::cout << "Test disabled on Windows AMD OpenGL." << std::endl;
>-        return;
>-    }
>+    // TODO(ynovikov): Investigate the failure (https://anglebug.com/1533)
>+    ANGLE_SKIP_TEST_IF(IsWindows() && IsAMD() && IsDesktopOpenGL());
> 
>-    bool flags[8] = { false };
>-    GLenum bufs[8] = { GL_NONE };
>+    bool flags[8]  = {false};
>+    GLenum bufs[8] = {GL_NONE};
> 
>     GLuint halfMaxDrawBuffers = static_cast<GLuint>(mMaxDrawBuffers) / 2;
> 
>     for (GLuint texIndex = 0; texIndex < halfMaxDrawBuffers; texIndex++)
>     {
>         glBindTexture(GL_TEXTURE_2D, mTextures[texIndex]);
>-        glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0 + halfMaxDrawBuffers + texIndex, GL_TEXTURE_2D, mTextures[texIndex], 0);
>+        glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0 + halfMaxDrawBuffers + texIndex,
>+                               GL_TEXTURE_2D, mTextures[texIndex], 0);
>         flags[texIndex + halfMaxDrawBuffers] = true;
>-        bufs[texIndex + halfMaxDrawBuffers] = GL_COLOR_ATTACHMENT0 + halfMaxDrawBuffers + texIndex;
>+        bufs[texIndex + halfMaxDrawBuffers]  = GL_COLOR_ATTACHMENT0 + halfMaxDrawBuffers + texIndex;
>     }
> 
>     GLuint program;
>     setupMRTProgram(flags, &program);
> 
>     setDrawBuffers(mMaxDrawBuffers, bufs);
>-    drawQuad(program, "position", 0.5);
>+    drawQuad(program, positionAttrib(), 0.5);
> 
>     for (GLuint texIndex = 0; texIndex < halfMaxDrawBuffers; texIndex++)
>     {
>@@ -370,15 +343,108 @@ TEST_P(DrawBuffersTest, FirstHalfNULL)
>     glDeleteProgram(program);
> }
> 
>-TEST_P(DrawBuffersTest, UnwrittenOutputVariablesShouldNotCrash)
>+// Test that non-zero draw buffers can be queried on the default framebuffer
>+TEST_P(DrawBuffersTest, DefaultFramebufferDrawBufferQuery)
>+{
>+    ANGLE_SKIP_TEST_IF(!setupTest());
>+
>+    glBindFramebuffer(GL_FRAMEBUFFER, 0);
>+
>+    GLint drawbuffer = 0;
>+    glGetIntegerv(GL_DRAW_BUFFER1, &drawbuffer);
>+    EXPECT_GL_NO_ERROR();
>+
>+    EXPECT_EQ(GL_NONE, drawbuffer);
>+}
>+
>+// Same as above but adds a state change from a program with different masks after a clear.
>+TEST_P(DrawBuffersWebGL2Test, TwoProgramsWithDifferentOutputsAndClear)
> {
>-    if (!checkSupport())
>+    // TODO(http://anglebug.com/2872): Broken on the GL back-end.
>+    ANGLE_SKIP_TEST_IF(IsOpenGL());
>+
>+    // TODO(ynovikov): Investigate the failure (https://anglebug.com/1533)
>+    ANGLE_SKIP_TEST_IF(IsWindows() && IsAMD() && IsDesktopOpenGL());
>+
>+    ANGLE_SKIP_TEST_IF(!setupTest());
>+
>+    glGetIntegerv(GL_MAX_DRAW_BUFFERS, &mMaxDrawBuffers);
>+    ASSERT_GE(mMaxDrawBuffers, 4);
>+
>+    bool flags[8]      = {false};
>+    GLenum someBufs[4] = {GL_NONE};
>+    GLenum allBufs[4]  = {GL_COLOR_ATTACHMENT0, GL_COLOR_ATTACHMENT1, GL_COLOR_ATTACHMENT2,
>+                         GL_COLOR_ATTACHMENT3};
>+
>+    constexpr GLuint kMaxBuffers     = 4;
>+    constexpr GLuint kHalfMaxBuffers = 2;
>+
>+    // Enable all draw buffers.
>+    for (GLuint texIndex = 0; texIndex < kMaxBuffers; texIndex++)
>     {
>-        std::cout << "Test skipped because ES3 or GL_EXT_draw_buffers is not available."
>-                  << std::endl;
>-        return;
>+        glBindTexture(GL_TEXTURE_2D, mTextures[texIndex]);
>+        glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0 + texIndex, GL_TEXTURE_2D,
>+                               mTextures[texIndex], 0);
>+        someBufs[texIndex] =
>+            texIndex >= kHalfMaxBuffers ? GL_COLOR_ATTACHMENT0 + texIndex : GL_NONE;
>+
>+        // Mask out the first two buffers.
>+        flags[texIndex] = texIndex >= kHalfMaxBuffers;
>     }
> 
>+    GLuint program;
>+    setupMRTProgram(flags, &program);
>+
>+    // Now set up a second simple program that draws to FragColor. Should be broadcast.
>+    ANGLE_GL_PROGRAM(simpleProgram, essl1_shaders::vs::Simple(), essl1_shaders::fs::Red());
>+
>+    // Draw with simple program.
>+    drawQuad(simpleProgram, essl1_shaders::PositionAttrib(), 0.5f, 1.0f, true);
>+    ASSERT_GL_NO_ERROR();
>+
>+    // Clear draw buffers.
>+    setDrawBuffers(kMaxBuffers, someBufs);
>+    glClearColor(0.0f, 1.0f, 0.0f, 1.0f);
>+    glClear(GL_COLOR_BUFFER_BIT);
>+
>+    ASSERT_GL_NO_ERROR();
>+
>+    // Verify first is drawn red, second is untouched, and last two are cleared green.
>+    verifyAttachment2DColor(0, mTextures[0], GL_TEXTURE_2D, 0, GLColor::red);
>+    verifyAttachment2DColor(1, mTextures[1], GL_TEXTURE_2D, 0, GLColor::transparentBlack);
>+    verifyAttachment2DColor(2, mTextures[2], GL_TEXTURE_2D, 0, GLColor::green);
>+    verifyAttachment2DColor(3, mTextures[3], GL_TEXTURE_2D, 0, GLColor::green);
>+
>+    // Draw with MRT program.
>+    setDrawBuffers(kMaxBuffers, someBufs);
>+    drawQuad(program, positionAttrib(), 0.5, 1.0f, true);
>+    ASSERT_GL_NO_ERROR();
>+
>+    // Only the last two attachments should be updated.
>+    verifyAttachment2DColor(0, mTextures[0], GL_TEXTURE_2D, 0, GLColor::red);
>+    verifyAttachment2DColor(1, mTextures[1], GL_TEXTURE_2D, 0, GLColor::transparentBlack);
>+    verifyAttachment2D(2, mTextures[2], GL_TEXTURE_2D, 0);
>+    verifyAttachment2D(3, mTextures[3], GL_TEXTURE_2D, 0);
>+
>+    // Active draw buffers with no fragment output is not allowed.
>+    setDrawBuffers(kMaxBuffers, allBufs);
>+    drawQuad(program, positionAttrib(), 0.5, 1.0f, true);
>+    ASSERT_GL_ERROR(GL_INVALID_OPERATION);
>+
>+    // Clear again. All attachments should be cleared.
>+    glClear(GL_COLOR_BUFFER_BIT);
>+    verifyAttachment2DColor(0, mTextures[0], GL_TEXTURE_2D, 0, GLColor::green);
>+    verifyAttachment2DColor(1, mTextures[1], GL_TEXTURE_2D, 0, GLColor::green);
>+    verifyAttachment2DColor(2, mTextures[2], GL_TEXTURE_2D, 0, GLColor::green);
>+    verifyAttachment2DColor(3, mTextures[3], GL_TEXTURE_2D, 0, GLColor::green);
>+
>+    glDeleteProgram(program);
>+}
>+
>+TEST_P(DrawBuffersTest, UnwrittenOutputVariablesShouldNotCrash)
>+{
>+    ANGLE_SKIP_TEST_IF(!setupTest());
>+
>     // Bind two render targets but use a shader which writes only to the first one.
>     glBindTexture(GL_TEXTURE_2D, mTextures[0]);
>     glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, mTextures[0], 0);
>@@ -386,13 +452,12 @@ TEST_P(DrawBuffersTest, UnwrittenOutputVariablesShouldNotCrash)
>     glBindTexture(GL_TEXTURE_2D, mTextures[1]);
>     glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT1, GL_TEXTURE_2D, mTextures[1], 0);
> 
>-    bool flags[8] = { true, false };
>+    bool flags[8] = {true, false};
> 
>     GLuint program;
>     setupMRTProgram(flags, &program);
> 
>-    const GLenum bufs[] =
>-    {
>+    const GLenum bufs[] = {
>         GL_COLOR_ATTACHMENT0,
>         GL_COLOR_ATTACHMENT1,
>         GL_NONE,
>@@ -402,7 +467,7 @@ TEST_P(DrawBuffersTest, UnwrittenOutputVariablesShouldNotCrash)
>     setDrawBuffers(4, bufs);
> 
>     // This call should not crash when we dynamically generate the HLSL code.
>-    drawQuad(program, "position", 0.5);
>+    drawQuad(program, positionAttrib(), 0.5);
> 
>     verifyAttachment2D(0, mTextures[0], GL_TEXTURE_2D, 0);
> 
>@@ -413,11 +478,9 @@ TEST_P(DrawBuffersTest, UnwrittenOutputVariablesShouldNotCrash)
> 
> TEST_P(DrawBuffersTest, BroadcastGLFragColor)
> {
>-    if (!extensionEnabled("GL_EXT_draw_buffers"))
>-    {
>-        std::cout << "Test skipped because EGL_EXT_draw_buffers is not enabled." << std::endl;
>-        return;
>-    }
>+    // Broadcast is not supported on GLES 3.0.
>+    ANGLE_SKIP_TEST_IF(getClientMajorVersion() >= 3);
>+    ANGLE_SKIP_TEST_IF(!setupTest());
> 
>     // Bind two render targets. gl_FragColor should be broadcast to both.
>     glBindTexture(GL_TEXTURE_2D, mTextures[0]);
>@@ -428,13 +491,7 @@ TEST_P(DrawBuffersTest, BroadcastGLFragColor)
> 
>     const GLenum bufs[] = {GL_COLOR_ATTACHMENT0, GL_COLOR_ATTACHMENT1};
> 
>-    const std::string vertexShaderSource =
>-        "attribute vec4 position;\n"
>-        "void main() {\n"
>-        "    gl_Position = position;\n"
>-        "}\n";
>-
>-    const std::string fragmentShaderSource =
>+    constexpr char kFS[] =
>         "#extension GL_EXT_draw_buffers : enable\n"
>         "precision highp float;\n"
>         "uniform float u_zero;\n"
>@@ -447,14 +504,14 @@ TEST_P(DrawBuffersTest, BroadcastGLFragColor)
>         "    }\n"
>         "}\n";
> 
>-    GLuint program = CompileProgram(vertexShaderSource, fragmentShaderSource);
>+    GLuint program = CompileProgram(essl1_shaders::vs::Simple(), kFS);
>     if (program == 0)
>     {
>         FAIL() << "shader compilation failed.";
>     }
> 
>     setDrawBuffers(2, bufs);
>-    drawQuad(program, "position", 0.5);
>+    drawQuad(program, essl1_shaders::PositionAttrib(), 0.5);
> 
>     verifyAttachment2D(0, mTextures[0], GL_TEXTURE_2D, 0);
>     verifyAttachment2D(0, mTextures[1], GL_TEXTURE_2D, 0);
>@@ -465,12 +522,13 @@ TEST_P(DrawBuffersTest, BroadcastGLFragColor)
> }
> 
> class DrawBuffersTestES3 : public DrawBuffersTest
>-{
>-};
>+{};
> 
> // Test that binding multiple layers of a 3D texture works correctly
> TEST_P(DrawBuffersTestES3, 3DTextures)
> {
>+    ANGLE_SKIP_TEST_IF(!setupTest());
>+
>     GLTexture texture;
>     glBindTexture(GL_TEXTURE_3D, texture.get());
>     glTexImage3D(GL_TEXTURE_3D, 0, GL_RGBA, getWindowWidth(), getWindowHeight(), getWindowWidth(),
>@@ -487,11 +545,14 @@ TEST_P(DrawBuffersTestES3, 3DTextures)
>     setupMRTProgram(flags, &program);
> 
>     const GLenum bufs[] = {
>-        GL_COLOR_ATTACHMENT0, GL_COLOR_ATTACHMENT1, GL_COLOR_ATTACHMENT2, GL_COLOR_ATTACHMENT3,
>+        GL_COLOR_ATTACHMENT0,
>+        GL_COLOR_ATTACHMENT1,
>+        GL_COLOR_ATTACHMENT2,
>+        GL_COLOR_ATTACHMENT3,
>     };
> 
>     glDrawBuffers(4, bufs);
>-    drawQuad(program, "position", 0.5);
>+    drawQuad(program, positionAttrib(), 0.5);
> 
>     verifyAttachmentLayer(0, texture.get(), 0, 0);
>     verifyAttachmentLayer(1, texture.get(), 0, 1);
>@@ -506,6 +567,8 @@ TEST_P(DrawBuffersTestES3, 3DTextures)
> // Test that binding multiple layers of a 2D array texture works correctly
> TEST_P(DrawBuffersTestES3, 2DArrayTextures)
> {
>+    ANGLE_SKIP_TEST_IF(!setupTest());
>+
>     GLTexture texture;
>     glBindTexture(GL_TEXTURE_2D_ARRAY, texture.get());
>     glTexImage3D(GL_TEXTURE_2D_ARRAY, 0, GL_RGBA, getWindowWidth(), getWindowHeight(),
>@@ -522,11 +585,14 @@ TEST_P(DrawBuffersTestES3, 2DArrayTextures)
>     setupMRTProgram(flags, &program);
> 
>     const GLenum bufs[] = {
>-        GL_COLOR_ATTACHMENT0, GL_COLOR_ATTACHMENT1, GL_COLOR_ATTACHMENT2, GL_COLOR_ATTACHMENT3,
>+        GL_COLOR_ATTACHMENT0,
>+        GL_COLOR_ATTACHMENT1,
>+        GL_COLOR_ATTACHMENT2,
>+        GL_COLOR_ATTACHMENT3,
>     };
> 
>     glDrawBuffers(4, bufs);
>-    drawQuad(program, "position", 0.5);
>+    drawQuad(program, positionAttrib(), 0.5);
> 
>     verifyAttachmentLayer(0, texture.get(), 0, 0);
>     verifyAttachmentLayer(1, texture.get(), 0, 1);
>@@ -538,14 +604,17 @@ TEST_P(DrawBuffersTestES3, 2DArrayTextures)
>     glDeleteProgram(program);
> }
> 
>-// Use this to select which configurations (e.g. which renderer, which GLES major version) these tests should be run against.
>+// Use this to select which configurations (e.g. which renderer, which GLES major version) these
>+// tests should be run against.
> ANGLE_INSTANTIATE_TEST(DrawBuffersTest,
>                        ES2_D3D11(),
>                        ES3_D3D11(),
>-                       ES2_D3D11_FL9_3(),
>                        ES2_OPENGL(),
>                        ES3_OPENGL(),
>                        ES2_OPENGLES(),
>-                       ES3_OPENGLES());
>+                       ES3_OPENGLES(),
>+                       ES2_VULKAN());
>+
>+ANGLE_INSTANTIATE_TEST(DrawBuffersWebGL2Test, ES3_D3D11(), ES3_OPENGL());
> 
> ANGLE_INSTANTIATE_TEST(DrawBuffersTestES3, ES3_D3D11(), ES3_OPENGL(), ES3_OPENGLES());
>diff --git a/Source/ThirdParty/ANGLE/src/tests/gl_tests/DrawElementsTest.cpp b/Source/ThirdParty/ANGLE/src/tests/gl_tests/DrawElementsTest.cpp
>index d1d0444e344..9a401e59328 100644
>--- a/Source/ThirdParty/ANGLE/src/tests/gl_tests/DrawElementsTest.cpp
>+++ b/Source/ThirdParty/ANGLE/src/tests/gl_tests/DrawElementsTest.cpp
>@@ -64,24 +64,23 @@ class DrawElementsTest : public ANGLETest
>     GLuint mProgram;
> };
> 
>+class WebGLDrawElementsTest : public DrawElementsTest
>+{
>+  public:
>+    WebGLDrawElementsTest() { setWebGLCompatibilityEnabled(true); }
>+};
>+
> // Test no error is generated when using client-side arrays, indices = nullptr and count = 0
> TEST_P(DrawElementsTest, ClientSideNullptrArrayZeroCount)
> {
>-    const std::string &vert =
>+    constexpr char kVS[] =
>         "attribute vec3 a_pos;\n"
>         "void main()\n"
>         "{\n"
>         "    gl_Position = vec4(a_pos, 1.0);\n"
>         "}\n";
> 
>-    const std::string &frag =
>-        "precision highp float;\n"
>-        "void main()\n"
>-        "{\n"
>-        "    gl_FragColor = vec4(1.0);\n"
>-        "}\n";
>-
>-    ANGLE_GL_PROGRAM(program, vert, frag);
>+    ANGLE_GL_PROGRAM(program, kVS, essl1_shaders::fs::Blue());
> 
>     GLint posLocation = glGetAttribLocation(program.get(), "a_pos");
>     ASSERT_NE(-1, posLocation);
>@@ -98,9 +97,12 @@ TEST_P(DrawElementsTest, ClientSideNullptrArrayZeroCount)
>     glEnableVertexAttribArray(posLocation);
>     ASSERT_GL_NO_ERROR();
> 
>+    // "If drawElements is called with a count greater than zero, and no WebGLBuffer is bound to the
>+    // ELEMENT_ARRAY_BUFFER binding point, an INVALID_OPERATION error is generated."
>     glDrawElements(GL_TRIANGLES, 1, GL_UNSIGNED_BYTE, nullptr);
>     EXPECT_GL_ERROR(GL_INVALID_OPERATION);
> 
>+    // count == 0 so it's fine to have no element array buffer bound.
>     glDrawElements(GL_TRIANGLES, 0, GL_UNSIGNED_BYTE, nullptr);
>     ASSERT_GL_NO_ERROR();
> }
>@@ -110,7 +112,7 @@ TEST_P(DrawElementsTest, ClientSideNullptrArrayZeroCount)
> TEST_P(DrawElementsTest, DeletingAfterStreamingIndexes)
> {
>     // Init program
>-    const std::string &vertexShader =
>+    constexpr char kVS[] =
>         "attribute vec2 position;\n"
>         "attribute vec2 testFlag;\n"
>         "varying vec2 v_data;\n"
>@@ -119,13 +121,13 @@ TEST_P(DrawElementsTest, DeletingAfterStreamingIndexes)
>         "  v_data = testFlag;\n"
>         "}";
> 
>-    const std::string &fragmentShader =
>+    constexpr char kFS[] =
>         "varying highp vec2 v_data;\n"
>         "void main() {\n"
>         "  gl_FragColor = vec4(v_data, 0, 1);\n"
>         "}";
> 
>-    mProgram = CompileProgram(vertexShader, fragmentShader);
>+    mProgram = CompileProgram(kVS, kFS);
>     ASSERT_NE(0u, mProgram);
>     glUseProgram(mProgram);
> 
>@@ -264,23 +266,16 @@ TEST_P(DrawElementsTest, DeletingAfterStreamingIndexes)
>     ASSERT_GL_NO_ERROR();
> }
> // Test that the offset in the index buffer is forced to be a multiple of the element size
>-TEST_P(DrawElementsTest, DrawElementsTypeAlignment)
>+TEST_P(WebGLDrawElementsTest, DrawElementsTypeAlignment)
> {
>-    const std::string &vert =
>+    constexpr char kVS[] =
>         "attribute vec3 a_pos;\n"
>         "void main()\n"
>         "{\n"
>         "    gl_Position = vec4(a_pos, 1.0);\n"
>         "}\n";
> 
>-    const std::string &frag =
>-        "precision highp float;\n"
>-        "void main()\n"
>-        "{\n"
>-        "    gl_FragColor = vec4(1.0);\n"
>-        "}\n";
>-
>-    ANGLE_GL_PROGRAM(program, vert, frag);
>+    ANGLE_GL_PROGRAM(program, kVS, essl1_shaders::fs::Blue());
> 
>     GLint posLocation = glGetAttribLocation(program, "a_pos");
>     ASSERT_NE(-1, posLocation);
>@@ -308,7 +303,7 @@ TEST_P(DrawElementsTest, DrawElementsTypeAlignment)
>     glDrawElements(GL_TRIANGLES, 3, GL_UNSIGNED_SHORT, zeroIndices);
>     ASSERT_GL_NO_ERROR();
> 
>-    const GLubyte indices2[] = {0, 0, 0, 0, 0};
>+    const GLushort indices2[] = {0, 0, 0, 0, 0, 0};
>     glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, indexBuffer);
>     glBufferData(GL_ELEMENT_ARRAY_BUFFER, sizeof(indices2), indices2, GL_STATIC_DRAW);
> 
>@@ -317,4 +312,5 @@ TEST_P(DrawElementsTest, DrawElementsTypeAlignment)
> }
> 
> ANGLE_INSTANTIATE_TEST(DrawElementsTest, ES3_OPENGL(), ES3_OPENGLES());
>-}
>+ANGLE_INSTANTIATE_TEST(WebGLDrawElementsTest, ES2_OPENGL(), ES2_OPENGLES());
>+}  // namespace
>diff --git a/Source/ThirdParty/ANGLE/src/tests/gl_tests/ETCTextureTest.cpp b/Source/ThirdParty/ANGLE/src/tests/gl_tests/ETCTextureTest.cpp
>index 1d2c55c6fdc..942e23b0fa6 100644
>--- a/Source/ThirdParty/ANGLE/src/tests/gl_tests/ETCTextureTest.cpp
>+++ b/Source/ThirdParty/ANGLE/src/tests/gl_tests/ETCTextureTest.cpp
>@@ -48,11 +48,11 @@ class ETCTextureTest : public ANGLETest
> // Tests a texture with ETC1 lossy decode format
> TEST_P(ETCTextureTest, ETC1Validation)
> {
>-    bool supported = extensionEnabled("GL_ANGLE_lossy_etc_decode");
>+    bool supported = IsGLExtensionEnabled("GL_ANGLE_lossy_etc_decode");
> 
>     glBindTexture(GL_TEXTURE_2D, mTexture);
> 
>-    GLubyte pixel[8] = { 0x0, 0x0, 0xf8, 0x2, 0x43, 0xff, 0x4, 0x12 };
>+    GLubyte pixel[8] = {0x0, 0x0, 0xf8, 0x2, 0x43, 0xff, 0x4, 0x12};
>     glCompressedTexImage2D(GL_TEXTURE_2D, 0, GL_ETC1_RGB8_LOSSY_DECODE_ANGLE, 4, 4, 0,
>                            sizeof(pixel), pixel);
>     if (supported)
>@@ -80,7 +80,7 @@ TEST_P(ETCTextureTest, ETC1Validation)
> // Tests a texture with ETC2 RGB8 lossy decode format
> TEST_P(ETCTextureTest, ETC2RGB8Validation)
> {
>-    bool supported = extensionEnabled("GL_ANGLE_lossy_etc_decode");
>+    bool supported = IsGLExtensionEnabled("GL_ANGLE_lossy_etc_decode");
> 
>     glBindTexture(GL_TEXTURE_2D, mTexture);
> 
>@@ -123,7 +123,7 @@ TEST_P(ETCTextureTest, ETC2RGB8Validation)
> // Tests a texture with ETC2 SRGB8 lossy decode format
> TEST_P(ETCTextureTest, ETC2SRGB8Validation)
> {
>-    bool supported = extensionEnabled("GL_ANGLE_lossy_etc_decode");
>+    bool supported = IsGLExtensionEnabled("GL_ANGLE_lossy_etc_decode");
> 
>     glBindTexture(GL_TEXTURE_2D, mTexture);
> 
>@@ -167,7 +167,7 @@ TEST_P(ETCTextureTest, ETC2SRGB8Validation)
> // Tests a texture with ETC2 RGB8 punchthrough A1 lossy decode format
> TEST_P(ETCTextureTest, ETC2RGB8A1Validation)
> {
>-    bool supported = extensionEnabled("GL_ANGLE_lossy_etc_decode");
>+    bool supported = IsGLExtensionEnabled("GL_ANGLE_lossy_etc_decode");
> 
>     glBindTexture(GL_TEXTURE_2D, mTexture);
> 
>@@ -215,7 +215,7 @@ TEST_P(ETCTextureTest, ETC2RGB8A1Validation)
> // Tests a texture with ETC2 SRGB8 punchthrough A1 lossy decode format
> TEST_P(ETCTextureTest, ETC2SRGB8A1Validation)
> {
>-    bool supported = extensionEnabled("GL_ANGLE_lossy_etc_decode");
>+    bool supported = IsGLExtensionEnabled("GL_ANGLE_lossy_etc_decode");
> 
>     glBindTexture(GL_TEXTURE_2D, mTexture);
> 
>@@ -266,5 +266,6 @@ ANGLE_INSTANTIATE_TEST(ETCTextureTest,
>                        ES2_D3D11_FL9_3(),
>                        ES3_D3D11(),
>                        ES2_OPENGL(),
>-                       ES3_OPENGL());
>+                       ES3_OPENGL(),
>+                       ES2_VULKAN());
> }  // anonymous namespace
>diff --git a/Source/ThirdParty/ANGLE/src/tests/gl_tests/ErrorMessages.cpp b/Source/ThirdParty/ANGLE/src/tests/gl_tests/ErrorMessages.cpp
>index ddd3d583ec1..552ff62e200 100644
>--- a/Source/ThirdParty/ANGLE/src/tests/gl_tests/ErrorMessages.cpp
>+++ b/Source/ThirdParty/ANGLE/src/tests/gl_tests/ErrorMessages.cpp
>@@ -75,15 +75,9 @@ class ErrorMessagesTest : public ANGLETest
> // Verify functionality of WebGL specific errors using KHR_debug
> TEST_P(ErrorMessagesTest, ErrorMessages)
> {
>-    if (extensionEnabled("GL_KHR_debug"))
>-    {
>-        glEnable(GL_DEBUG_OUTPUT);
>-    }
>-    else
>-    {
>-        std::cout << "Test skipped because GL_KHR_debug is not available." << std::endl;
>-        return;
>-    }
>+    ANGLE_SKIP_TEST_IF(!IsGLExtensionEnabled("GL_KHR_debug"));
>+
>+    glEnable(GL_DEBUG_OUTPUT);
> 
>     std::vector<Message> messages;
>     glDebugMessageCallbackKHR(Callback, &messages);
>@@ -93,7 +87,7 @@ TEST_P(ErrorMessagesTest, ErrorMessages)
>     constexpr GLenum type      = GL_DEBUG_TYPE_ERROR;
>     constexpr GLenum severity  = GL_DEBUG_SEVERITY_HIGH;
>     constexpr GLuint id1       = 1282;
>-    const std::string message1 = gl::kErrorWebglBindAttribLocationReservedPrefix;
>+    const std::string message1 = gl::err::kWebglBindAttribLocationReservedPrefix;
>     Message expectedMessage;
> 
>     GLint numMessages = 0;
>@@ -123,5 +117,6 @@ ANGLE_INSTANTIATE_TEST(ErrorMessagesTest,
>                        ES2_OPENGL(),
>                        ES3_OPENGL(),
>                        ES2_OPENGLES(),
>-                       ES3_OPENGLES());
>-}  // namespace
>+                       ES3_OPENGLES(),
>+                       ES2_VULKAN());
>+}  // namespace angle
>diff --git a/Source/ThirdParty/ANGLE/src/tests/gl_tests/ExplicitContextTest.cpp b/Source/ThirdParty/ANGLE/src/tests/gl_tests/ExplicitContextTest.cpp
>new file mode 100644
>index 00000000000..f1cb10d6e0a
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/tests/gl_tests/ExplicitContextTest.cpp
>@@ -0,0 +1,97 @@
>+//
>+// Copyright 2018 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+
>+// ExplicitContextTest.cpp: Tests of the EGL_ANGLE_explicit_context extension
>+
>+#include "test_utils/ANGLETest.h"
>+
>+#include "test_utils/gl_raii.h"
>+#include "util/EGLWindow.h"
>+
>+namespace angle
>+{
>+
>+class ExplicitContextTest : public ANGLETest
>+{
>+  protected:
>+    ExplicitContextTest()
>+    {
>+        setWindowWidth(256);
>+        setWindowHeight(256);
>+        setConfigRedBits(8);
>+        setConfigGreenBits(8);
>+        setConfigBlueBits(8);
>+        setConfigAlphaBits(8);
>+    }
>+};
>+
>+// Test to ensure that the basic functionality of the extension works.
>+TEST_P(ExplicitContextTest, BasicTest)
>+{
>+    ANGLE_SKIP_TEST_IF(!IsGLExtensionEnabled("GL_ANGLE_explicit_context") ||
>+                       !IsGLExtensionEnabled("GL_ANGLE_explicit_context_gles1"));
>+
>+    EGLContext context = getEGLWindow()->getContext();
>+
>+    // Clear to green
>+    glClearColorContextANGLE(context, 0.0f, 1.0f, 0.0f, 1.0f);
>+    glClearContextANGLE(context, GL_COLOR_BUFFER_BIT);
>+
>+    // Check for green
>+    EXPECT_PIXEL_EQ(0, 0, 0, 255, 0, 255);
>+    ASSERT_GL_NO_ERROR();
>+}
>+
>+// Test to ensure that extension works with eglGetProcAddress
>+TEST_P(ExplicitContextTest, GetProcAddress)
>+{
>+    ANGLE_SKIP_TEST_IF(!IsGLExtensionEnabled("GL_ANGLE_explicit_context") ||
>+                       !IsGLExtensionEnabled("GL_ANGLE_explicit_context_gles1"));
>+
>+    EGLContext context = getEGLWindow()->getContext();
>+
>+    // Clear to green
>+    glClearColorContextANGLE(context, 1.0f, 0, 0, 1.0f);
>+    glClearContextANGLE(context, GL_COLOR_BUFFER_BIT);
>+
>+    // Check for green
>+    EXPECT_PIXEL_EQ(0, 0, 255, 0, 0, 255);
>+    EXPECT_GL_NO_ERROR();
>+}
>+
>+// Test to ensure that a passed context of null results in a no-op
>+TEST_P(ExplicitContextTest, NullContext)
>+{
>+    ANGLE_SKIP_TEST_IF(!IsGLExtensionEnabled("GL_ANGLE_explicit_context") ||
>+                       !IsGLExtensionEnabled("GL_ANGLE_explicit_context_gles1"));
>+
>+    EGLContext context = getEGLWindow()->getContext();
>+
>+    // Set clear color to red
>+    glClearColorContextANGLE(context, 1.0f, 0, 0, 1.0f);
>+    // Clear to red
>+    glClearContextANGLE(context, GL_COLOR_BUFFER_BIT);
>+
>+    // Set clear color to green
>+    glClearColorContextANGLE(context, 0.0f, 1.0f, 0.0f, 1.0f);
>+    // Call clear with null context, which should perform a silent no-op
>+    glClearContextANGLE(nullptr, GL_COLOR_BUFFER_BIT);
>+
>+    // Check that the color is red
>+    EXPECT_PIXEL_EQ(0, 0, 255, 0, 0, 255);
>+    EXPECT_GL_NO_ERROR();
>+}
>+
>+// Use this to select which configurations (e.g. which renderer, which GLES major version) these
>+// tests should be run against.
>+ANGLE_INSTANTIATE_TEST(ExplicitContextTest,
>+                       ES2_D3D9(),
>+                       ES2_D3D11(),
>+                       ES2_OPENGL(),
>+                       ES2_OPENGLES(),
>+                       ES2_VULKAN());
>+
>+}  // namespace angle
>diff --git a/Source/ThirdParty/ANGLE/src/tests/gl_tests/FenceSyncTests.cpp b/Source/ThirdParty/ANGLE/src/tests/gl_tests/FenceSyncTests.cpp
>index c4ecf11255b..b201ddc6df8 100644
>--- a/Source/ThirdParty/ANGLE/src/tests/gl_tests/FenceSyncTests.cpp
>+++ b/Source/ThirdParty/ANGLE/src/tests/gl_tests/FenceSyncTests.cpp
>@@ -41,42 +41,35 @@ class FenceSyncTest : public ANGLETest
> // FenceNV objects should respond false to glIsFenceNV until they've been set
> TEST_P(FenceNVTest, IsFence)
> {
>-    if (!extensionEnabled("GL_NV_fence"))
>-    {
>-        std::cout << "Test skipped due to missing GL_NV_fence extension." << std::endl;
>-        return;
>-    }
>+    ANGLE_SKIP_TEST_IF(!IsGLExtensionEnabled("GL_NV_fence"));
> 
>     GLuint fence = 0;
>     glGenFencesNV(1, &fence);
>     EXPECT_GL_NO_ERROR();
> 
>-    EXPECT_EQ(GL_FALSE, glIsFenceNV(fence));
>+    EXPECT_GL_FALSE(glIsFenceNV(fence));
>     EXPECT_GL_NO_ERROR();
> 
>     glSetFenceNV(fence, GL_ALL_COMPLETED_NV);
>     EXPECT_GL_NO_ERROR();
> 
>-    EXPECT_EQ(GL_TRUE, glIsFenceNV(fence));
>+    EXPECT_GL_TRUE(glIsFenceNV(fence));
>     EXPECT_GL_NO_ERROR();
> }
> 
> // Test error cases for all FenceNV functions
> TEST_P(FenceNVTest, Errors)
> {
>-    if (!extensionEnabled("GL_NV_fence"))
>-    {
>-        std::cout << "Test skipped due to missing GL_NV_fence extension." << std::endl;
>-        return;
>-    }
>+    ANGLE_SKIP_TEST_IF(!IsGLExtensionEnabled("GL_NV_fence"));
> 
>-    // glTestFenceNV should still return TRUE for an invalid fence and generate an INVALID_OPERATION
>-    EXPECT_EQ(GL_TRUE, glTestFenceNV(10));
>+    EXPECT_GL_TRUE(glTestFenceNV(10)) << "glTestFenceNV should still return TRUE for an invalid "
>+                                         "fence and generate an INVALID_OPERATION";
>     EXPECT_GL_ERROR(GL_INVALID_OPERATION);
> 
>     GLuint fence = 20;
> 
>-    // glGenFencesNV should generate INVALID_VALUE for a negative n and not write anything to the fences pointer
>+    // glGenFencesNV should generate INVALID_VALUE for a negative n and not write anything to the
>+    // fences pointer
>     glGenFencesNV(-1, &fence);
>     EXPECT_GL_ERROR(GL_INVALID_VALUE);
>     EXPECT_EQ(20u, fence);
>@@ -85,11 +78,12 @@ TEST_P(FenceNVTest, Errors)
>     glGenFencesNV(1, &fence);
>     EXPECT_GL_NO_ERROR();
> 
>-    // glTestFenceNV should still return TRUE for a fence that is not started and generate an INVALID_OPERATION
>-    EXPECT_EQ(GL_TRUE, glTestFenceNV(fence));
>+    EXPECT_GL_TRUE(glTestFenceNV(fence)) << "glTestFenceNV should still return TRUE for a fence "
>+                                            "that is not started and generate an INVALID_OPERATION";
>     EXPECT_GL_ERROR(GL_INVALID_OPERATION);
> 
>-    // glGetFenceivNV should generate an INVALID_OPERATION for an invalid or unstarted fence and not modify the params
>+    // glGetFenceivNV should generate an INVALID_OPERATION for an invalid or unstarted fence and not
>+    // modify the params
>     GLint result = 30;
>     glGetFenceivNV(10, GL_FENCE_STATUS_NV, &result);
>     EXPECT_GL_ERROR(GL_INVALID_OPERATION);
>@@ -111,26 +105,23 @@ TEST_P(FenceNVTest, Errors)
> // Test that basic usage works and doesn't generate errors or crash
> TEST_P(FenceNVTest, BasicOperations)
> {
>-    if (!extensionEnabled("GL_NV_fence"))
>-    {
>-        std::cout << "Test skipped due to missing GL_NV_fence extension." << std::endl;
>-        return;
>-    }
>+    ANGLE_SKIP_TEST_IF(!IsGLExtensionEnabled("GL_NV_fence"));
> 
>     glClearColor(1.0f, 0.0f, 1.0f, 1.0f);
> 
>-    GLuint fences[20] = { 0 };
>+    constexpr size_t kFenceCount = 20;
>+    GLuint fences[kFenceCount]   = {0};
>     glGenFencesNV(static_cast<GLsizei>(ArraySize(fences)), fences);
>     EXPECT_GL_NO_ERROR();
> 
>     for (GLuint fence : fences)
>     {
>-        glSetFenceNV(fence, GL_ALL_COMPLETED_NV);
>-
>         glClear(GL_COLOR_BUFFER_BIT);
>+        glSetFenceNV(fence, GL_ALL_COMPLETED_NV);
>     }
> 
>-    glFinish();
>+    // Finish the last fence, all fences before should be marked complete
>+    glFinishFenceNV(fences[kFenceCount - 1]);
> 
>     for (GLuint fence : fences)
>     {
>@@ -139,7 +130,7 @@ TEST_P(FenceNVTest, BasicOperations)
>         EXPECT_GL_NO_ERROR();
> 
>         // Fence should be complete now that Finish has been called
>-        EXPECT_EQ(GL_TRUE, status);
>+        EXPECT_GL_TRUE(status);
>     }
> 
>     EXPECT_PIXEL_EQ(0, 0, 255, 0, 255, 255);
>@@ -151,8 +142,8 @@ TEST_P(FenceSyncTest, IsSync)
>     GLsync sync = glFenceSync(GL_SYNC_GPU_COMMANDS_COMPLETE, 0);
>     EXPECT_GL_NO_ERROR();
> 
>-    EXPECT_EQ(GL_TRUE, glIsSync(sync));
>-    EXPECT_EQ(GL_FALSE, glIsSync(reinterpret_cast<GLsync>(40)));
>+    EXPECT_GL_TRUE(glIsSync(sync));
>+    EXPECT_GL_FALSE(glIsSync(reinterpret_cast<GLsync>(40)));
> }
> 
> // Test error cases for all Sync function
>@@ -172,12 +163,15 @@ TEST_P(FenceSyncTest, Errors)
>     EXPECT_EQ(0, glFenceSync(GL_SYNC_GPU_COMMANDS_COMPLETE, 10));
>     EXPECT_GL_ERROR(GL_INVALID_VALUE);
> 
>-    // glClientWaitSync generates GL_INVALID_VALUE and returns GL_WAIT_FAILED if flags contains more than just GL_SYNC_FLUSH_COMMANDS_BIT
>+    // glClientWaitSync generates GL_INVALID_VALUE and returns GL_WAIT_FAILED if flags contains more
>+    // than just GL_SYNC_FLUSH_COMMANDS_BIT
>     EXPECT_GLENUM_EQ(GL_WAIT_FAILED, glClientWaitSync(sync, GL_SYNC_FLUSH_COMMANDS_BIT | 0x2, 0));
>     EXPECT_GL_ERROR(GL_INVALID_VALUE);
> 
>-    // glClientWaitSync generates GL_INVALID_VALUE and returns GL_WAIT_FAILED if the sync object is not valid
>-    EXPECT_GLENUM_EQ(GL_WAIT_FAILED, glClientWaitSync(reinterpret_cast<GLsync>(30), GL_SYNC_FLUSH_COMMANDS_BIT, 0));
>+    // glClientWaitSync generates GL_INVALID_VALUE and returns GL_WAIT_FAILED if the sync object is
>+    // not valid
>+    EXPECT_GLENUM_EQ(GL_WAIT_FAILED,
>+                     glClientWaitSync(reinterpret_cast<GLsync>(30), GL_SYNC_FLUSH_COMMANDS_BIT, 0));
>     EXPECT_GL_ERROR(GL_INVALID_VALUE);
> 
>     // glWaitSync generates GL_INVALID_VALUE if flags is non-zero
>@@ -192,15 +186,17 @@ TEST_P(FenceSyncTest, Errors)
>     glWaitSync(reinterpret_cast<GLsync>(30), 0, GL_TIMEOUT_IGNORED);
>     EXPECT_GL_ERROR(GL_INVALID_VALUE);
> 
>-    // glGetSynciv generates GL_INVALID_VALUE if bufSize is less than zero, results should be untouched
>+    // glGetSynciv generates GL_INVALID_VALUE if bufSize is less than zero, results should be
>+    // untouched
>     GLsizei length = 20;
>-    GLint value = 30;
>+    GLint value    = 30;
>     glGetSynciv(sync, GL_OBJECT_TYPE, -1, &length, &value);
>     EXPECT_GL_ERROR(GL_INVALID_VALUE);
>     EXPECT_EQ(20, length);
>     EXPECT_EQ(30, value);
> 
>-    // glGetSynciv generates GL_INVALID_VALUE if the sync object tis not valid, results should be untouched
>+    // glGetSynciv generates GL_INVALID_VALUE if the sync object tis not valid, results should be
>+    // untouched
>     glGetSynciv(reinterpret_cast<GLsync>(30), GL_OBJECT_TYPE, 1, &length, &value);
>     EXPECT_GL_ERROR(GL_INVALID_VALUE);
>     EXPECT_EQ(20, length);
>@@ -211,8 +207,8 @@ TEST_P(FenceSyncTest, Errors)
> TEST_P(FenceSyncTest, BasicQueries)
> {
>     GLsizei length = 0;
>-    GLint value = 0;
>-    GLsync sync = glFenceSync(GL_SYNC_GPU_COMMANDS_COMPLETE, 0);
>+    GLint value    = 0;
>+    GLsync sync    = glFenceSync(GL_SYNC_GPU_COMMANDS_COMPLETE, 0);
> 
>     glGetSynciv(sync, GL_SYNC_CONDITION, 1, &length, &value);
>     EXPECT_GL_NO_ERROR();
>@@ -230,13 +226,6 @@ TEST_P(FenceSyncTest, BasicQueries)
> // Test that basic usage works and doesn't generate errors or crash
> TEST_P(FenceSyncTest, BasicOperations)
> {
>-    // TODO(geofflang): Figure out why this is broken on Intel OpenGL
>-    if (IsIntel() && getPlatformRenderer() == EGL_PLATFORM_ANGLE_TYPE_OPENGL_ANGLE)
>-    {
>-        std::cout << "Test skipped on Intel OpenGL." << std::endl;
>-        return;
>-    }
>-
>     glClearColor(1.0f, 0.0f, 1.0f, 1.0f);
> 
>     GLsync sync = glFenceSync(GL_SYNC_GPU_COMMANDS_COMPLETE, 0);
>@@ -245,8 +234,8 @@ TEST_P(FenceSyncTest, BasicOperations)
>     glWaitSync(sync, 0, GL_TIMEOUT_IGNORED);
>     EXPECT_GL_NO_ERROR();
> 
>-    GLsizei length = 0;
>-    GLint value = 0;
>+    GLsizei length         = 0;
>+    GLint value            = 0;
>     unsigned int loopCount = 0;
> 
>     glFlush();
>@@ -270,7 +259,8 @@ TEST_P(FenceSyncTest, BasicOperations)
>     }
> }
> 
>-// Use this to select which configurations (e.g. which renderer, which GLES major version) these tests should be run against.
>+// Use this to select which configurations (e.g. which renderer, which GLES major version) these
>+// tests should be run against.
> ANGLE_INSTANTIATE_TEST(FenceNVTest,
>                        ES2_D3D9(),
>                        ES2_D3D11(),
>@@ -278,5 +268,6 @@ ANGLE_INSTANTIATE_TEST(FenceNVTest,
>                        ES2_OPENGL(),
>                        ES3_OPENGL(),
>                        ES2_OPENGLES(),
>-                       ES3_OPENGLES());
>-ANGLE_INSTANTIATE_TEST(FenceSyncTest, ES3_D3D11(), ES3_OPENGL(), ES3_OPENGLES());
>+                       ES3_OPENGLES(),
>+                       ES2_VULKAN());
>+ANGLE_INSTANTIATE_TEST(FenceSyncTest, ES3_D3D11(), ES3_OPENGL(), ES3_OPENGLES(), ES3_VULKAN());
>diff --git a/Source/ThirdParty/ANGLE/src/tests/gl_tests/FloatingPointSurfaceTest.cpp b/Source/ThirdParty/ANGLE/src/tests/gl_tests/FloatingPointSurfaceTest.cpp
>index 8d579841846..c8d12ee9e0c 100644
>--- a/Source/ThirdParty/ANGLE/src/tests/gl_tests/FloatingPointSurfaceTest.cpp
>+++ b/Source/ThirdParty/ANGLE/src/tests/gl_tests/FloatingPointSurfaceTest.cpp
>@@ -28,22 +28,14 @@ class FloatingPointSurfaceTest : public ANGLETest
>     {
>         ANGLETest::SetUp();
> 
>-        const std::string vsSource =
>-            "precision highp float;\n"
>-            "attribute vec4 position;\n"
>-            "void main()\n"
>-            "{\n"
>-            "   gl_Position = position;\n"
>-            "}\n";
>-
>-        const std::string fsSource =
>+        constexpr char kFS[] =
>             "precision highp float;\n"
>             "void main()\n"
>             "{\n"
>             "   gl_FragColor = vec4(1.0, 2.0, 3.0, 4.0);\n"
>             "}\n";
> 
>-        mProgram = CompileProgram(vsSource, fsSource);
>+        mProgram = CompileProgram(essl1_shaders::vs::Simple(), kFS);
>         ASSERT_NE(0u, mProgram) << "shader compilation failed.";
> 
>         ASSERT_GL_NO_ERROR();
>@@ -74,7 +66,7 @@ TEST_P(FloatingPointSurfaceTest, Clearing)
> TEST_P(FloatingPointSurfaceTest, Drawing)
> {
>     glUseProgram(mProgram);
>-    drawQuad(mProgram, "position", 0.5f);
>+    drawQuad(mProgram, essl1_shaders::PositionAttrib(), 0.5f);
> 
>     EXPECT_PIXEL_32F_EQ(0, 0, 1.0f, 2.0f, 3.0f, 4.0f);
> }
>diff --git a/Source/ThirdParty/ANGLE/src/tests/gl_tests/FramebufferMixedSamplesTest.cpp b/Source/ThirdParty/ANGLE/src/tests/gl_tests/FramebufferMixedSamplesTest.cpp
>index 9a16345edac..0736719b0b7 100644
>--- a/Source/ThirdParty/ANGLE/src/tests/gl_tests/FramebufferMixedSamplesTest.cpp
>+++ b/Source/ThirdParty/ANGLE/src/tests/gl_tests/FramebufferMixedSamplesTest.cpp
>@@ -9,7 +9,6 @@
> //   sample counts for different render buffers (stencil, depth, color)
> 
> #include "test_utils/ANGLETest.h"
>-#include "shader_utils.h"
> 
> using namespace angle;
> 
>@@ -30,32 +29,18 @@ class CHROMIUMFramebufferMixedSamplesTest : public ANGLETest
> 
>     bool isApplicable() const
>     {
>-        return extensionEnabled("GL_CHROMIUM_framebuffer_mixed_samples") &&
>-               extensionEnabled("GL_OES_rgb8_rgba8");
>+        return IsGLExtensionEnabled("GL_CHROMIUM_framebuffer_mixed_samples") &&
>+               IsGLExtensionEnabled("GL_OES_rgb8_rgba8");
>     }
> 
>     void SetUp() override
>     {
>         ANGLETest::SetUp();
> 
>-        // clang-format off
>-        static const char* kVertexShaderSource =
>-            "attribute mediump vec4 position;\n"
>-            "void main() {\n"
>-            "  gl_Position = position;\n"
>-            "}\n";
>+        mProgram = CompileProgram(essl1_shaders::vs::Simple(), essl1_shaders::fs::UniformColor());
> 
>-        static const char* kFragmentShaderSource =
>-            "uniform mediump vec4 color;\n"
>-            "void main() {\n"
>-            "  gl_FragColor = color;\n"
>-            "}\n";
>-
>-        // clang-format on
>-        mProgram = CompileProgram(kVertexShaderSource, kFragmentShaderSource);
>-
>-        GLuint position_loc = glGetAttribLocation(mProgram, "position");
>-        mColorLoc           = glGetUniformLocation(mProgram, "color");
>+        GLuint position_loc = glGetAttribLocation(mProgram, essl1_shaders::PositionAttrib());
>+        mColorLoc           = glGetUniformLocation(mProgram, essl1_shaders::ColorUniform());
> 
>         glGenBuffers(1, &mVBO);
>         glBindBuffer(GL_ARRAY_BUFFER, mVBO);
>@@ -158,7 +143,7 @@ class CHROMIUMFramebufferMixedSamplesTest : public ANGLETest
>     GLint mColorLoc;
> };
> 
>-}  //
>+}  // namespace
> 
> TEST_P(CHROMIUMFramebufferMixedSamplesTest, StateSettingTest)
> {
>@@ -288,4 +273,5 @@ TEST_P(CHROMIUMFramebufferMixedSamplesTest, MultisampleStencilEffective)
> ANGLE_INSTANTIATE_TEST(CHROMIUMFramebufferMixedSamplesTest,
>                        ES2_OPENGL(),
>                        ES2_OPENGLES(),
>-                       ES3_OPENGL());
>+                       ES3_OPENGL(),
>+                       ES2_VULKAN());
>diff --git a/Source/ThirdParty/ANGLE/src/tests/gl_tests/FramebufferMultiviewTest.cpp b/Source/ThirdParty/ANGLE/src/tests/gl_tests/FramebufferMultiviewTest.cpp
>index 182a5aed141..bffa7e50dd4 100644
>--- a/Source/ThirdParty/ANGLE/src/tests/gl_tests/FramebufferMultiviewTest.cpp
>+++ b/Source/ThirdParty/ANGLE/src/tests/gl_tests/FramebufferMultiviewTest.cpp
>@@ -7,7 +7,7 @@
> // The tests modify and examine the multiview state.
> //
> 
>-#include "test_utils/ANGLETest.h"
>+#include "test_utils/MultiviewTest.h"
> #include "test_utils/gl_raii.h"
> 
> using namespace angle;
>@@ -26,149 +26,50 @@ std::vector<GLenum> GetDrawBufferRange(size_t numColorAttachments)
> }
> }  // namespace
> 
>-class FramebufferMultiviewTest : public ANGLETest
>+// Base class for tests that care mostly about draw call validity and not rendering results.
>+class FramebufferMultiviewTest : public MultiviewTest
> {
>   protected:
>-    FramebufferMultiviewTest()
>-    {
>-        setWindowWidth(128);
>-        setWindowHeight(128);
>-        setWebGLCompatibilityEnabled(true);
>-    }
>-
>-    void SetUp() override
>-    {
>-        ANGLETest::SetUp();
>-        glRequestExtensionANGLE = reinterpret_cast<PFNGLREQUESTEXTENSIONANGLEPROC>(
>-            eglGetProcAddress("glRequestExtensionANGLE"));
>-    }
>-
>-    // Requests the ANGLE_multiview extension and returns true if the operation succeeds.
>-    bool requestMultiviewExtension()
>-    {
>-        if (extensionRequestable("GL_ANGLE_multiview"))
>-        {
>-            glRequestExtensionANGLE("GL_ANGLE_multiview");
>-        }
>-
>-        if (!extensionEnabled("GL_ANGLE_multiview"))
>-        {
>-            std::cout << "Test skipped due to missing GL_ANGLE_multiview." << std::endl;
>-            return false;
>-        }
>-        return true;
>-    }
>-
>-    PFNGLREQUESTEXTENSIONANGLEPROC glRequestExtensionANGLE = nullptr;
>+    FramebufferMultiviewTest() : MultiviewTest() {}
> };
> 
>-class FramebufferMultiviewSideBySideClearTest : public FramebufferMultiviewTest
>+class FramebufferMultiviewLayeredClearTest : public FramebufferMultiviewTest
> {
>   protected:
>-    FramebufferMultiviewSideBySideClearTest() {}
>+    FramebufferMultiviewLayeredClearTest() : mMultiviewFBO(0), mDepthTex(0), mDepthStencilTex(0) {}
> 
>-    void initializeFBOs(size_t numColorBuffers, bool stencil, bool depth)
>+    void TearDown() override
>     {
>-        const std::vector<GLenum> &drawBuffers = GetDrawBufferRange(2);
>-
>-        // Generate textures.
>-        mColorTex.resize(numColorBuffers);
>-        for (size_t i = 0u; i < numColorBuffers; ++i)
>+        if (mMultiviewFBO != 0)
>         {
>-            glBindTexture(GL_TEXTURE_2D, mColorTex[i]);
>-            glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA8, 4, 2, 0, GL_RGBA, GL_UNSIGNED_BYTE, nullptr);
>+            glDeleteFramebuffers(1, &mMultiviewFBO);
>+            mMultiviewFBO = 0u;
>         }
>-
>-        if (stencil)
>+        if (!mNonMultiviewFBO.empty())
>         {
>-            glBindTexture(GL_TEXTURE_2D, mStencilTex);
>-            glTexImage2D(GL_TEXTURE_2D, 0, GL_DEPTH24_STENCIL8, 4, 2, 0, GL_DEPTH_STENCIL,
>-                         GL_UNSIGNED_INT_24_8, nullptr);
>+            GLsizei textureCount = static_cast<GLsizei>(mNonMultiviewFBO.size());
>+            glDeleteTextures(textureCount, mNonMultiviewFBO.data());
>+            mNonMultiviewFBO.clear();
>         }
>-        else if (depth)
>+        if (!mColorTex.empty())
>         {
>-            glBindTexture(GL_TEXTURE_2D, mDepthTex);
>-            glTexImage2D(GL_TEXTURE_2D, 0, GL_DEPTH_COMPONENT32F, 4, 2, 0, GL_DEPTH_COMPONENT,
>-                         GL_FLOAT, nullptr);
>+            GLsizei textureCount = static_cast<GLsizei>(mColorTex.size());
>+            glDeleteTextures(textureCount, mColorTex.data());
>+            mColorTex.clear();
>         }
>-
>-        // Generate multiview fbo and attach textures.
>-        const GLint kViewportOffsets[4] = {1, 0, 3, 0};
>-        glBindFramebuffer(GL_FRAMEBUFFER, mMultiviewFBO);
>-        const size_t kBase = static_cast<size_t>(GL_COLOR_ATTACHMENT0);
>-        for (size_t i = 0u; i < numColorBuffers; ++i)
>+        if (mDepthStencilTex != 0u)
>         {
>-            glFramebufferTextureMultiviewSideBySideANGLE(GL_FRAMEBUFFER,
>-                                                         static_cast<GLenum>(kBase + i),
>-                                                         mColorTex[i], 0, 2, &kViewportOffsets[0]);
>+            glDeleteTextures(1, &mDepthStencilTex);
>+            mDepthStencilTex = 0u;
>         }
>-
>-        if (stencil)
>+        if (mDepthTex != 0u)
>         {
>-            glFramebufferTextureMultiviewSideBySideANGLE(GL_FRAMEBUFFER,
>-                                                         GL_DEPTH_STENCIL_ATTACHMENT, mStencilTex,
>-                                                         0, 2, &kViewportOffsets[0]);
>+            glDeleteTextures(1, &mDepthTex);
>+            mDepthTex = 0u;
>         }
>-        else if (depth)
>-        {
>-            glFramebufferTextureMultiviewSideBySideANGLE(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT,
>-                                                         mDepthTex, 0, 2, &kViewportOffsets[0]);
>-        }
>-        glDrawBuffers(static_cast<GLsizei>(drawBuffers.size()), drawBuffers.data());
>-
>-        // Generate non-multiview fbo and attach textures.
>-        glBindFramebuffer(GL_FRAMEBUFFER, mNonMultiviewFBO);
>-        for (size_t i = 0u; i < numColorBuffers; ++i)
>-        {
>-            glFramebufferTexture2D(GL_FRAMEBUFFER, static_cast<GLenum>(kBase + i), GL_TEXTURE_2D,
>-                                   mColorTex[i], 0);
>-        }
>-        if (stencil)
>-        {
>-            glFramebufferTexture2D(GL_FRAMEBUFFER, GL_DEPTH_STENCIL_ATTACHMENT, GL_TEXTURE_2D,
>-                                   mStencilTex, 0);
>-        }
>-        else if (depth)
>-        {
>-            glFramebufferTexture2D(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, GL_TEXTURE_2D, mDepthTex,
>-                                   0);
>-        }
>-        glDrawBuffers(static_cast<GLsizei>(drawBuffers.size()), drawBuffers.data());
>-
>-        ASSERT_GL_NO_ERROR();
>-    }
>-
>-    void checkAlternatingColumnsOfRedAndGreenInFBO()
>-    {
>-        // column 0
>-        EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::red);
>-        EXPECT_PIXEL_COLOR_EQ(0, 1, GLColor::red);
>-
>-        // column 1
>-        EXPECT_PIXEL_COLOR_EQ(1, 0, GLColor::green);
>-        EXPECT_PIXEL_COLOR_EQ(1, 1, GLColor::green);
>-
>-        // column 2
>-        EXPECT_PIXEL_COLOR_EQ(2, 0, GLColor::red);
>-        EXPECT_PIXEL_COLOR_EQ(2, 1, GLColor::red);
>-
>-        // column 3
>-        EXPECT_PIXEL_COLOR_EQ(3, 0, GLColor::green);
>-        EXPECT_PIXEL_COLOR_EQ(3, 1, GLColor::green);
>+        MultiviewTest::TearDown();
>     }
> 
>-    GLFramebuffer mMultiviewFBO;
>-    GLFramebuffer mNonMultiviewFBO;
>-    std::vector<GLTexture> mColorTex;
>-    GLTexture mDepthTex;
>-    GLTexture mStencilTex;
>-};
>-
>-class FramebufferMultiviewLayeredClearTest : public FramebufferMultiviewTest
>-{
>-  protected:
>-    FramebufferMultiviewLayeredClearTest() {}
>-
>     void initializeFBOs(int width,
>                         int height,
>                         int numLayers,
>@@ -178,55 +79,41 @@ class FramebufferMultiviewLayeredClearTest : public FramebufferMultiviewTest
>                         bool stencil,
>                         bool depth)
>     {
>-        ASSERT(baseViewIndex + numViews <= numLayers);
>+        ASSERT_TRUE(mColorTex.empty());
>+        ASSERT_EQ(0u, mDepthStencilTex);
>+        ASSERT_EQ(0u, mDepthTex);
>+        ASSERT_LE(baseViewIndex + numViews, numLayers);
> 
>         // Generate textures.
>         mColorTex.resize(numColorAttachments);
>-        for (int i = 0; i < numColorAttachments; ++i)
>-        {
>-            glBindTexture(GL_TEXTURE_2D_ARRAY, mColorTex[i]);
>-            glTexImage3D(GL_TEXTURE_2D_ARRAY, 0, GL_RGBA8, width, height, numLayers, 0, GL_RGBA,
>-                         GL_UNSIGNED_BYTE, nullptr);
>-        }
>-
>+        GLsizei textureCount = static_cast<GLsizei>(mColorTex.size());
>+        glGenTextures(textureCount, mColorTex.data());
>         if (stencil)
>         {
>-            glBindTexture(GL_TEXTURE_2D_ARRAY, mStencilTex);
>-            glTexImage3D(GL_TEXTURE_2D_ARRAY, 0, GL_DEPTH24_STENCIL8, width, height, numLayers, 0,
>-                         GL_DEPTH_STENCIL, GL_UNSIGNED_INT_24_8, nullptr);
>+            glGenTextures(1, &mDepthStencilTex);
>         }
>         else if (depth)
>         {
>-            glBindTexture(GL_TEXTURE_2D_ARRAY, mDepthTex);
>-            glTexImage3D(GL_TEXTURE_2D_ARRAY, 0, GL_DEPTH_COMPONENT32F, width, height, numLayers, 0,
>-                         GL_DEPTH_COMPONENT, GL_FLOAT, nullptr);
>+            glGenTextures(1, &mDepthTex);
>         }
> 
>+        CreateMultiviewBackingTextures(0, width, height, numLayers, mColorTex, mDepthTex,
>+                                       mDepthStencilTex);
>+
>+        glGenFramebuffers(1, &mMultiviewFBO);
>+
>         // Generate multiview FBO and attach textures.
>         glBindFramebuffer(GL_FRAMEBUFFER, mMultiviewFBO);
>-        for (int i = 0; i < numColorAttachments; ++i)
>-        {
>-            glFramebufferTextureMultiviewLayeredANGLE(GL_FRAMEBUFFER,
>-                                                      static_cast<GLenum>(GL_COLOR_ATTACHMENT0 + i),
>-                                                      mColorTex[i], 0, baseViewIndex, numViews);
>-        }
>-
>-        if (stencil)
>-        {
>-            glFramebufferTextureMultiviewLayeredANGLE(GL_FRAMEBUFFER, GL_DEPTH_STENCIL_ATTACHMENT,
>-                                                      mStencilTex, 0, baseViewIndex, numViews);
>-        }
>-        else if (depth)
>-        {
>-            glFramebufferTextureMultiviewLayeredANGLE(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT,
>-                                                      mDepthTex, 0, baseViewIndex, numViews);
>-        }
>+        AttachMultiviewTextures(GL_FRAMEBUFFER, width, numViews, baseViewIndex, mColorTex,
>+                                mDepthTex, mDepthStencilTex);
> 
>         const auto &drawBuffers = GetDrawBufferRange(numColorAttachments);
>         glDrawBuffers(numColorAttachments, drawBuffers.data());
> 
>         // Generate non-multiview FBOs and attach textures.
>         mNonMultiviewFBO.resize(numLayers);
>+        GLsizei framebufferCount = static_cast<GLsizei>(mNonMultiviewFBO.size());
>+        glGenFramebuffers(framebufferCount, mNonMultiviewFBO.data());
>         for (int i = 0; i < numLayers; ++i)
>         {
>             glBindFramebuffer(GL_FRAMEBUFFER, mNonMultiviewFBO[i]);
>@@ -238,17 +125,14 @@ class FramebufferMultiviewLayeredClearTest : public FramebufferMultiviewTest
>             }
>             if (stencil)
>             {
>-                glFramebufferTextureLayer(GL_FRAMEBUFFER, GL_DEPTH_STENCIL_ATTACHMENT, mStencilTex,
>-                                          0, i);
>+                glFramebufferTextureLayer(GL_FRAMEBUFFER, GL_DEPTH_STENCIL_ATTACHMENT,
>+                                          mDepthStencilTex, 0, i);
>             }
>             else if (depth)
>             {
>                 glFramebufferTextureLayer(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, mDepthTex, 0, i);
>             }
>             glDrawBuffers(numColorAttachments, drawBuffers.data());
>-
>-            glClearColor(1, 0, 0, 1);
>-            glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT);
>         }
> 
>         ASSERT_GL_NO_ERROR();
>@@ -256,7 +140,7 @@ class FramebufferMultiviewLayeredClearTest : public FramebufferMultiviewTest
> 
>     GLColor getLayerColor(size_t layer, GLenum attachment, GLint x, GLint y)
>     {
>-        ASSERT(layer < mNonMultiviewFBO.size());
>+        EXPECT_LT(layer, mNonMultiviewFBO.size());
>         glBindFramebuffer(GL_FRAMEBUFFER, mNonMultiviewFBO[layer]);
>         glReadBuffer(attachment);
>         return angle::ReadColor(x, y);
>@@ -267,21 +151,20 @@ class FramebufferMultiviewLayeredClearTest : public FramebufferMultiviewTest
>         return getLayerColor(layer, attachment, 0, 0);
>     }
> 
>-    GLFramebuffer mMultiviewFBO;
>-    std::vector<GLFramebuffer> mNonMultiviewFBO;
>-    std::vector<GLTexture> mColorTex;
>-    GLTexture mDepthTex;
>-    GLTexture mStencilTex;
>+    GLuint mMultiviewFBO;
>+    std::vector<GLuint> mNonMultiviewFBO;
>+
>+  private:
>+    std::vector<GLuint> mColorTex;
>+    GLuint mDepthTex;
>+    GLuint mDepthStencilTex;
> };
> 
>-// Test that the framebuffer tokens introduced by ANGLE_multiview can be used to query the
>+// Test that the framebuffer tokens introduced by OVR_multiview2 can be used to query the
> // framebuffer state and that their corresponding default values are correctly set.
> TEST_P(FramebufferMultiviewTest, DefaultState)
> {
>-    if (!requestMultiviewExtension())
>-    {
>-        return;
>-    }
>+    ANGLE_SKIP_TEST_IF(!requestMultiviewExtension());
> 
>     GLFramebuffer fbo;
>     glBindFramebuffer(GL_FRAMEBUFFER, fbo);
>@@ -293,36 +176,21 @@ TEST_P(FramebufferMultiviewTest, DefaultState)
> 
>     GLint numViews = -1;
>     glGetFramebufferAttachmentParameteriv(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0,
>-                                          GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_NUM_VIEWS_ANGLE,
>+                                          GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_NUM_VIEWS_OVR,
>                                           &numViews);
>     ASSERT_GL_NO_ERROR();
>     EXPECT_EQ(1, numViews);
> 
>     GLint baseViewIndex = -1;
>     glGetFramebufferAttachmentParameteriv(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0,
>-                                          GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_BASE_VIEW_INDEX_ANGLE,
>+                                          GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_BASE_VIEW_INDEX_OVR,
>                                           &baseViewIndex);
>     ASSERT_GL_NO_ERROR();
>     EXPECT_EQ(0, baseViewIndex);
>-
>-    GLint multiviewLayout = GL_FRAMEBUFFER_MULTIVIEW_SIDE_BY_SIDE_ANGLE;
>-    glGetFramebufferAttachmentParameteriv(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0,
>-                                          GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_MULTIVIEW_LAYOUT_ANGLE,
>-                                          &multiviewLayout);
>-    ASSERT_GL_NO_ERROR();
>-    EXPECT_EQ(GL_NONE, multiviewLayout);
>-
>-    GLint viewportOffsets[2] = {-1, -1};
>-    glGetFramebufferAttachmentParameteriv(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0,
>-                                          GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_VIEWPORT_OFFSETS_ANGLE,
>-                                          &viewportOffsets[0]);
>-    ASSERT_GL_NO_ERROR();
>-    EXPECT_EQ(0, viewportOffsets[0]);
>-    EXPECT_EQ(0, viewportOffsets[1]);
> }
> 
>-// Test that without having the ANGLE_multiview extension, querying for the framebuffer state using
>-// the ANGLE_multiview tokens results in an INVALID_ENUM error.
>+// Test that without having the OVR_multiview2 extension, querying for the framebuffer state using
>+// the OVR_multiview2 tokens results in an INVALID_ENUM error.
> TEST_P(FramebufferMultiviewTest, NegativeFramebufferStateQueries)
> {
>     GLFramebuffer fbo;
>@@ -335,67 +203,22 @@ TEST_P(FramebufferMultiviewTest, NegativeFramebufferStateQueries)
> 
>     GLint numViews = -1;
>     glGetFramebufferAttachmentParameteriv(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0,
>-                                          GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_NUM_VIEWS_ANGLE,
>+                                          GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_NUM_VIEWS_OVR,
>                                           &numViews);
>     EXPECT_GL_ERROR(GL_INVALID_ENUM);
> 
>     GLint baseViewIndex = -1;
>     glGetFramebufferAttachmentParameteriv(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0,
>-                                          GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_BASE_VIEW_INDEX_ANGLE,
>+                                          GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_BASE_VIEW_INDEX_OVR,
>                                           &baseViewIndex);
>     EXPECT_GL_ERROR(GL_INVALID_ENUM);
>-
>-    GLint multiviewLayout = GL_FRAMEBUFFER_MULTIVIEW_SIDE_BY_SIDE_ANGLE;
>-    glGetFramebufferAttachmentParameteriv(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0,
>-                                          GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_MULTIVIEW_LAYOUT_ANGLE,
>-                                          &multiviewLayout);
>-    EXPECT_GL_ERROR(GL_INVALID_ENUM);
>-
>-    GLint viewportOffsets[2] = {-1, -1};
>-    glGetFramebufferAttachmentParameteriv(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0,
>-                                          GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_VIEWPORT_OFFSETS_ANGLE,
>-                                          &viewportOffsets[0]);
>-    EXPECT_GL_ERROR(GL_INVALID_ENUM);
>-}
>-
>-// Test that the correct errors are generated whenever glFramebufferTextureMultiviewSideBySideANGLE
>-// is called with invalid arguments.
>-TEST_P(FramebufferMultiviewTest, InvalidMultiviewSideBySideArguments)
>-{
>-    if (!requestMultiviewExtension())
>-    {
>-        return;
>-    }
>-
>-    GLFramebuffer fbo;
>-    glBindFramebuffer(GL_FRAMEBUFFER, fbo);
>-
>-    GLTexture tex;
>-    glBindTexture(GL_TEXTURE_2D, tex);
>-    glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA8, 1, 1, 0, GL_RGBA, GL_UNSIGNED_BYTE, nullptr);
>-
>-    // Negative offsets.
>-    GLint viewportOffsets[2] = {-1};
>-    glFramebufferTextureMultiviewSideBySideANGLE(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, tex, 0, 1,
>-                                                 &viewportOffsets[0]);
>-    EXPECT_GL_ERROR(GL_INVALID_VALUE);
>-
>-    // Negative number of views.
>-    viewportOffsets[0] = 0;
>-    viewportOffsets[1] = 0;
>-    glFramebufferTextureMultiviewSideBySideANGLE(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, tex, 0, -1,
>-                                                 &viewportOffsets[0]);
>-    EXPECT_GL_ERROR(GL_INVALID_VALUE);
> }
> 
>-// Test that the correct errors are generated whenever glFramebufferTextureMultiviewLayeredANGLE is
>+// Test that the correct errors are generated whenever glFramebufferTextureMultiviewOVR is
> // called with invalid arguments.
> TEST_P(FramebufferMultiviewTest, InvalidMultiviewLayeredArguments)
> {
>-    if (!requestMultiviewExtension())
>-    {
>-        return;
>-    }
>+    ANGLE_SKIP_TEST_IF(!requestMultiviewExtension());
> 
>     GLFramebuffer fbo;
>     glBindFramebuffer(GL_FRAMEBUFFER, fbo);
>@@ -406,18 +229,18 @@ TEST_P(FramebufferMultiviewTest, InvalidMultiviewLayeredArguments)
>     ASSERT_GL_NO_ERROR();
> 
>     // Negative base view index.
>-    glFramebufferTextureMultiviewLayeredANGLE(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, tex, 0, -1, 1);
>+    glFramebufferTextureMultiviewOVR(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, tex, 0, -1, 1);
>     EXPECT_GL_ERROR(GL_INVALID_VALUE);
> 
>     // baseViewIndex + numViews is greater than MAX_TEXTURE_LAYERS.
>     GLint maxTextureLayers = 0;
>     glGetIntegerv(GL_MAX_ARRAY_TEXTURE_LAYERS, &maxTextureLayers);
>-    glFramebufferTextureMultiviewLayeredANGLE(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, tex, 0,
>-                                              maxTextureLayers, 1);
>+    glFramebufferTextureMultiviewOVR(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, tex, 0, maxTextureLayers,
>+                                     1);
>     EXPECT_GL_ERROR(GL_INVALID_VALUE);
> }
> 
>-// Test that an INVALID_OPERATION error is generated whenever the ANGLE_multiview extension is not
>+// Test that an INVALID_OPERATION error is generated whenever the OVR_multiview2 extension is not
> // available.
> TEST_P(FramebufferMultiviewTest, ExtensionNotAvailableCheck)
> {
>@@ -429,195 +252,55 @@ TEST_P(FramebufferMultiviewTest, ExtensionNotAvailableCheck)
>     glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA8, 1, 1, 0, GL_RGBA, GL_UNSIGNED_BYTE, nullptr);
> 
>     ASSERT_GL_NO_ERROR();
>-    const GLint kViewportOffsets[2] = {0};
>-    glFramebufferTextureMultiviewSideBySideANGLE(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, tex, 0, 1,
>-                                                 &kViewportOffsets[0]);
>+    glFramebufferTextureMultiviewOVR(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, tex, 0, 1, 1);
>     EXPECT_GL_ERROR(GL_INVALID_OPERATION);
> }
> 
>-// Test that glFramebufferTextureMultiviewSideBySideANGLE modifies the internal multiview state.
>-TEST_P(FramebufferMultiviewTest, ModifySideBySideState)
>+// Test that the active read framebuffer can be read with glCopyTex* if it only has one layered
>+// view.
>+TEST_P(FramebufferMultiviewTest, CopyTex)
> {
>-    if (!requestMultiviewExtension())
>-    {
>-        return;
>-    }
>+    ANGLE_SKIP_TEST_IF(!requestMultiviewExtension());
> 
>     GLFramebuffer fbo;
>     glBindFramebuffer(GL_FRAMEBUFFER, fbo);
> 
>     GLTexture tex;
>-    glBindTexture(GL_TEXTURE_2D, tex);
>-    glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA8, 1, 1, 0, GL_RGBA, GL_UNSIGNED_BYTE, nullptr);
>-
>-    const GLint kViewportOffsets[4] = {0, 0, 1, 2};
>-    glFramebufferTextureMultiviewSideBySideANGLE(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, tex, 0, 2,
>-                                                 &kViewportOffsets[0]);
>-    ASSERT_GL_NO_ERROR();
>-
>-    GLint numViews = -1;
>-    glGetFramebufferAttachmentParameteriv(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0,
>-                                          GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_NUM_VIEWS_ANGLE,
>-                                          &numViews);
>-    ASSERT_GL_NO_ERROR();
>-    EXPECT_EQ(2, numViews);
>-
>-    GLint baseViewIndex = -1;
>-    glGetFramebufferAttachmentParameteriv(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0,
>-                                          GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_BASE_VIEW_INDEX_ANGLE,
>-                                          &baseViewIndex);
>-    ASSERT_GL_NO_ERROR();
>-    EXPECT_EQ(0, baseViewIndex);
>-
>-    GLint multiviewLayout = GL_NONE;
>-    glGetFramebufferAttachmentParameteriv(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0,
>-                                          GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_MULTIVIEW_LAYOUT_ANGLE,
>-                                          &multiviewLayout);
>-    ASSERT_GL_NO_ERROR();
>-    EXPECT_EQ(GL_FRAMEBUFFER_MULTIVIEW_SIDE_BY_SIDE_ANGLE, multiviewLayout);
>-
>-    GLint internalViewportOffsets[4] = {-1};
>-    glGetFramebufferAttachmentParameteriv(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0,
>-                                          GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_VIEWPORT_OFFSETS_ANGLE,
>-                                          &internalViewportOffsets[0]);
>-    ASSERT_GL_NO_ERROR();
>-    for (size_t i = 0u; i < 4u; ++i)
>-    {
>-        EXPECT_EQ(kViewportOffsets[i], internalViewportOffsets[i]);
>-    }
>-}
>-
>-// Test framebuffer completeness status of a side-by-side framebuffer with color and depth
>-// attachments.
>-TEST_P(FramebufferMultiviewTest, IncompleteViewTargetsSideBySide)
>-{
>-    if (!requestMultiviewExtension())
>-    {
>-        return;
>-    }
>-
>-    GLFramebuffer fbo;
>-    glBindFramebuffer(GL_FRAMEBUFFER, fbo);
>-
>-    GLTexture tex;
>-    glBindTexture(GL_TEXTURE_2D, tex);
>-    glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA8, 1, 1, 0, GL_RGBA, GL_UNSIGNED_BYTE, nullptr);
>-
>-    const GLint kViewportOffsets[4]      = {0, 0, 2, 0};
>-    const GLint kOtherViewportOffsets[4] = {2, 0, 4, 0};
>+    glBindTexture(GL_TEXTURE_2D_ARRAY, tex);
>+    glTexImage3D(GL_TEXTURE_2D_ARRAY, 0, GL_RGBA8, 1, 1, 2, 0, GL_RGBA, GL_UNSIGNED_BYTE, nullptr);
> 
>-    // Set the 0th attachment and keep it as it is till the end of the test. The 1st or depth
>-    // attachment will be modified to change the framebuffer's status.
>-    glFramebufferTextureMultiviewSideBySideANGLE(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, tex, 0, 2,
>-                                                 &kViewportOffsets[0]);
>+    glFramebufferTextureMultiviewOVR(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, tex, 0, 0, 1);
>+    ASSERT_GLENUM_EQ(GL_FRAMEBUFFER_COMPLETE, glCheckFramebufferStatus(GL_FRAMEBUFFER));
>     ASSERT_GL_NO_ERROR();
> 
>-    // Color attachment 1.
>+    // Test glCopyTexImage2D and glCopyTexSubImage2D.
>     {
>-        GLTexture otherTex;
>-        glBindTexture(GL_TEXTURE_2D, otherTex);
>+        GLTexture tex2;
>+        glBindTexture(GL_TEXTURE_2D, tex2);
>         glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA8, 1, 1, 0, GL_RGBA, GL_UNSIGNED_BYTE, nullptr);
> 
>-        // Test framebuffer completeness when the number of views differ.
>-        glFramebufferTextureMultiviewSideBySideANGLE(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT1, otherTex,
>-                                                     0, 1, &kViewportOffsets[0]);
>-        ASSERT_GL_NO_ERROR();
>-        EXPECT_GLENUM_EQ(GL_FRAMEBUFFER_INCOMPLETE_VIEW_TARGETS_ANGLE,
>-                         glCheckFramebufferStatus(GL_FRAMEBUFFER));
>-
>-        // Test framebuffer completeness when the viewport offsets differ.
>-        glFramebufferTextureMultiviewSideBySideANGLE(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT1, otherTex,
>-                                                     0, 2, &kOtherViewportOffsets[0]);
>-        ASSERT_GL_NO_ERROR();
>-        EXPECT_GLENUM_EQ(GL_FRAMEBUFFER_INCOMPLETE_VIEW_TARGETS_ANGLE,
>-                         glCheckFramebufferStatus(GL_FRAMEBUFFER));
>+        glBindFramebuffer(GL_FRAMEBUFFER, fbo);
>+        glClearColor(0.0f, 1.0f, 0.0f, 1.0f);
>+        glClear(GL_COLOR_BUFFER_BIT);
> 
>-        // Test framebuffer completeness when attachment layouts differ.
>-        glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT1, GL_TEXTURE_2D, otherTex, 0);
>-        ASSERT_GL_NO_ERROR();
>-        EXPECT_GLENUM_EQ(GL_FRAMEBUFFER_INCOMPLETE_VIEW_TARGETS_ANGLE,
>-                         glCheckFramebufferStatus(GL_FRAMEBUFFER));
>-
>-        // Test that framebuffer is complete when the number of views, viewport offsets and layouts
>-        // are the same.
>-        glFramebufferTextureMultiviewSideBySideANGLE(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT1, otherTex,
>-                                                     0, 2, &kViewportOffsets[0]);
>-        ASSERT_GL_NO_ERROR();
>-        EXPECT_GLENUM_EQ(GL_FRAMEBUFFER_COMPLETE, glCheckFramebufferStatus(GL_FRAMEBUFFER));
>-
>-        // Reset attachment 1
>-        glFramebufferTextureMultiviewSideBySideANGLE(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT1, 0, 0, 1,
>-                                                     &kViewportOffsets[0]);
>-    }
>-
>-    // Depth attachment.
>-    {
>-        GLTexture depthTex;
>-        glBindTexture(GL_TEXTURE_2D, depthTex);
>-        glTexImage2D(GL_TEXTURE_2D, 0, GL_DEPTH_COMPONENT32F, 1, 1, 0, GL_DEPTH_COMPONENT, GL_FLOAT,
>-                     nullptr);
>-
>-        // Test framebuffer completeness when the number of views differ.
>-        glFramebufferTextureMultiviewSideBySideANGLE(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, depthTex,
>-                                                     0, 1, &kViewportOffsets[0]);
>+        glCopyTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA8, 0, 0, 1, 1, 0);
>         ASSERT_GL_NO_ERROR();
>-        EXPECT_GLENUM_EQ(GL_FRAMEBUFFER_INCOMPLETE_VIEW_TARGETS_ANGLE,
>-                         glCheckFramebufferStatus(GL_FRAMEBUFFER));
> 
>-        // Test framebuffer completeness when the viewport offsets differ.
>-        glFramebufferTextureMultiviewSideBySideANGLE(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, depthTex,
>-                                                     0, 2, &kOtherViewportOffsets[0]);
>-        ASSERT_GL_NO_ERROR();
>-        EXPECT_GLENUM_EQ(GL_FRAMEBUFFER_INCOMPLETE_VIEW_TARGETS_ANGLE,
>-                         glCheckFramebufferStatus(GL_FRAMEBUFFER));
>+        // Test texture contents.
>+        glBindFramebuffer(GL_FRAMEBUFFER, 0);
>+        draw2DTexturedQuad(0.0f, 1.0f, true);
>+        EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::green);
> 
>-        // Test framebuffer completeness when attachment layouts differ.
>-        glFramebufferTexture2D(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, GL_TEXTURE_2D, depthTex, 0);
>-        ASSERT_GL_NO_ERROR();
>-        EXPECT_GLENUM_EQ(GL_FRAMEBUFFER_INCOMPLETE_VIEW_TARGETS_ANGLE,
>-                         glCheckFramebufferStatus(GL_FRAMEBUFFER));
>+        glBindFramebuffer(GL_FRAMEBUFFER, fbo);
>+        glClearColor(0.0f, 1.0f, 1.0f, 1.0f);
>+        glClear(GL_COLOR_BUFFER_BIT);
> 
>-        // Test that framebuffer is complete when the number of views, viewport offsets and layouts
>-        // are the same.
>-        glFramebufferTextureMultiviewSideBySideANGLE(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, depthTex,
>-                                                     0, 2, &kViewportOffsets[0]);
>+        glCopyTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, 0, 0, 1, 1);
>         ASSERT_GL_NO_ERROR();
>-        EXPECT_GLENUM_EQ(GL_FRAMEBUFFER_COMPLETE, glCheckFramebufferStatus(GL_FRAMEBUFFER));
>-    }
>-}
>-
>-// Test that the active read framebuffer cannot be read from through glCopyTex* if it has multi-view
>-// attachments.
>-TEST_P(FramebufferMultiviewTest, InvalidCopyTex)
>-{
>-    if (!requestMultiviewExtension())
>-    {
>-        return;
>-    }
>-
>-    GLFramebuffer fbo;
>-    glBindFramebuffer(GL_FRAMEBUFFER, fbo);
>-
>-    GLTexture tex;
>-    glBindTexture(GL_TEXTURE_2D, tex);
>-    glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA8, 1, 1, 0, GL_RGBA, GL_UNSIGNED_BYTE, nullptr);
> 
>-    const GLint kViewportOffsets[2] = {0};
>-    glFramebufferTextureMultiviewSideBySideANGLE(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, tex, 0, 1,
>-                                                 &kViewportOffsets[0]);
>-    ASSERT_GL_NO_ERROR();
>-
>-    // Test glCopyTexImage2D and glCopyTexSubImage2D.
>-    {
>-        GLTexture tex2;
>-        glBindTexture(GL_TEXTURE_2D, tex2);
>-        glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA8, 1, 1, 0, GL_RGBA, GL_UNSIGNED_BYTE, nullptr);
>-
>-        glCopyTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA8, 0, 0, 1, 1, 0);
>-        EXPECT_GL_ERROR(GL_INVALID_FRAMEBUFFER_OPERATION);
>-
>-        glCopyTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, 0, 0, 1, 1);
>-        EXPECT_GL_ERROR(GL_INVALID_FRAMEBUFFER_OPERATION);
>+        glBindFramebuffer(GL_FRAMEBUFFER, 0);
>+        draw2DTexturedQuad(0.0f, 1.0f, true);
>+        EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::cyan);
>     }
> 
>     // Test glCopyTexSubImage3D.
>@@ -626,113 +309,78 @@ TEST_P(FramebufferMultiviewTest, InvalidCopyTex)
>         glBindTexture(GL_TEXTURE_3D, tex2);
>         glTexImage3D(GL_TEXTURE_3D, 0, GL_RGBA8, 1, 1, 1, 0, GL_RGBA, GL_UNSIGNED_BYTE, nullptr);
> 
>+        glBindFramebuffer(GL_FRAMEBUFFER, fbo);
>+        glClearColor(1.0f, 1.0f, 0.0f, 1.0f);
>+        glClear(GL_COLOR_BUFFER_BIT);
>         glCopyTexSubImage3D(GL_TEXTURE_3D, 0, 0, 0, 0, 0, 0, 1, 1);
>-        EXPECT_GL_ERROR(GL_INVALID_FRAMEBUFFER_OPERATION);
>+        ASSERT_GL_NO_ERROR();
>+
>+        glBindFramebuffer(GL_FRAMEBUFFER, 0);
>+        draw3DTexturedQuad(0.0f, 1.0f, true, 0.0f);
>+        EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::yellow);
>     }
> }
> 
>-// Test that glBlitFramebuffer generates an invalid framebuffer operation when either the current
>-// draw framebuffer, or current read framebuffer have multiview attachments.
>-TEST_P(FramebufferMultiviewTest, InvalidBlit)
>+// Test that glBlitFramebuffer succeeds if the current read framebuffer has just one layered view.
>+TEST_P(FramebufferMultiviewTest, Blit)
> {
>-    if (!requestMultiviewExtension())
>-    {
>-        return;
>-    }
>+    ANGLE_SKIP_TEST_IF(!requestMultiviewExtension());
>+
>+    glClearColor(1.0f, 0.0f, 0.0f, 1.0f);
>+    glClear(GL_COLOR_BUFFER_BIT);
> 
>     GLFramebuffer fbo;
>     glBindFramebuffer(GL_FRAMEBUFFER, fbo);
> 
>     GLTexture tex;
>-    glBindTexture(GL_TEXTURE_2D, tex);
>-    glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA8, 1, 1, 0, GL_RGBA, GL_UNSIGNED_BYTE, nullptr);
>+    glBindTexture(GL_TEXTURE_2D_ARRAY, tex);
>+    glTexImage3D(GL_TEXTURE_2D_ARRAY, 0, GL_RGBA8, 1, 1, 2, 0, GL_RGBA, GL_UNSIGNED_BYTE, nullptr);
> 
>-    const GLint kViewportOffsets[2] = {0};
>-    glFramebufferTextureMultiviewSideBySideANGLE(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, tex, 0, 1,
>-                                                 &kViewportOffsets[0]);
>+    glFramebufferTextureMultiviewOVR(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, tex, 0, 0, 1);
>     ASSERT_GLENUM_EQ(GL_FRAMEBUFFER_COMPLETE, glCheckFramebufferStatus(GL_FRAMEBUFFER));
>     ASSERT_GL_NO_ERROR();
> 
>-    // Blit with the active read framebuffer having multiview attachments.
>-    {
>-        glBindFramebuffer(GL_READ_FRAMEBUFFER, fbo);
>-        glBindFramebuffer(GL_DRAW_FRAMEBUFFER, 0);
>-        glBlitFramebuffer(0, 0, 1, 1, 0, 0, 1, 1, GL_COLOR_BUFFER_BIT, GL_NEAREST);
>-        EXPECT_GL_ERROR(GL_INVALID_FRAMEBUFFER_OPERATION);
>-    }
>+    glClearColor(0.0f, 1.0f, 0.0f, 1.0f);
>+    glClear(GL_COLOR_BUFFER_BIT);
> 
>-    // Blit with the active draw framebuffer having multiview attachments.
>-    {
>-        glBindFramebuffer(GL_READ_FRAMEBUFFER, 0);
>-        glBindFramebuffer(GL_DRAW_FRAMEBUFFER, fbo);
>-        glBlitFramebuffer(0, 0, 1, 1, 0, 0, 1, 1, GL_COLOR_BUFFER_BIT, GL_NEAREST);
>-        EXPECT_GL_ERROR(GL_INVALID_FRAMEBUFFER_OPERATION);
>-    }
>+    glBindFramebuffer(GL_READ_FRAMEBUFFER, fbo);
>+    glBindFramebuffer(GL_DRAW_FRAMEBUFFER, 0);
>+    glBlitFramebuffer(0, 0, 1, 1, 0, 0, 1, 1, GL_COLOR_BUFFER_BIT, GL_NEAREST);
>+    ASSERT_GL_NO_ERROR();
>+
>+    glBindFramebuffer(GL_READ_FRAMEBUFFER, 0);
>+    EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::green);
> }
> 
>-// Test that glReadPixels generates an invalid framebuffer operation error if the current read
>-// framebuffer has a multi-view layout.
>-TEST_P(FramebufferMultiviewTest, InvalidReadPixels)
>+// Test that glReadPixels succeeds from a layered multiview framebuffer with just one view.
>+TEST_P(FramebufferMultiviewTest, ReadPixels)
> {
>-    if (!requestMultiviewExtension())
>-    {
>-        return;
>-    }
>+    ANGLE_SKIP_TEST_IF(!requestMultiviewExtension());
> 
>     GLFramebuffer fbo;
>     glBindFramebuffer(GL_FRAMEBUFFER, fbo);
> 
>     GLTexture tex;
>-    glBindTexture(GL_TEXTURE_2D, tex);
>-    glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA8, 1, 1, 0, GL_RGBA, GL_UNSIGNED_BYTE, nullptr);
>+    glBindTexture(GL_TEXTURE_2D_ARRAY, tex);
>+    glTexImage3D(GL_TEXTURE_2D_ARRAY, 0, GL_RGBA8, 1, 1, 2, 0, GL_RGBA, GL_UNSIGNED_BYTE, nullptr);
> 
>-    const GLint kViewportOffsets[2] = {0};
>-    glFramebufferTextureMultiviewSideBySideANGLE(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, tex, 0, 1,
>-                                                 &kViewportOffsets[0]);
>+    glFramebufferTextureMultiviewOVR(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, tex, 0, 0, 1);
>     ASSERT_GLENUM_EQ(GL_FRAMEBUFFER_COMPLETE, glCheckFramebufferStatus(GL_FRAMEBUFFER));
>     ASSERT_GL_NO_ERROR();
> 
>-    GLColor pixelColor;
>-    glReadPixels(0, 0, 1, 1, GL_RGBA, GL_UNSIGNED_BYTE, &pixelColor.R);
>-    EXPECT_GL_ERROR(GL_INVALID_FRAMEBUFFER_OPERATION);
>-}
>-
>-// Test that glClear clears only the contents of each view if the scissor test is enabled.
>-TEST_P(FramebufferMultiviewSideBySideClearTest, ColorBufferClear)
>-{
>-    if (!requestMultiviewExtension())
>-    {
>-        return;
>-    }
>-
>-    initializeFBOs(1, false, false);
>-
>-    // Clear the contents of the texture.
>-    glBindFramebuffer(GL_FRAMEBUFFER, mNonMultiviewFBO);
>-    glClearColor(1, 0, 0, 1);
>+    glClearColor(0.0f, 1.0f, 0.0f, 1.0f);
>     glClear(GL_COLOR_BUFFER_BIT);
> 
>-    // Bind and specify viewport/scissor dimensions for each view.
>-    glBindFramebuffer(GL_FRAMEBUFFER, mMultiviewFBO);
>-    glViewport(0, 0, 1, 2);
>-    glScissor(0, 0, 1, 2);
>-    glEnable(GL_SCISSOR_TEST);
>-
>-    glClearColor(0, 1, 0, 1);
>-    glClear(GL_COLOR_BUFFER_BIT);
>-
>-    glBindFramebuffer(GL_FRAMEBUFFER, mNonMultiviewFBO);
>-
>-    checkAlternatingColumnsOfRedAndGreenInFBO();
>+    GLColor pixelColor;
>+    glReadPixels(0, 0, 1, 1, GL_RGBA, GL_UNSIGNED_BYTE, &pixelColor.R);
>+    ASSERT_GL_NO_ERROR();
>+    EXPECT_COLOR_NEAR(GLColor::green, pixelColor, 2);
> }
> 
>-// Test that glFramebufferTextureMultiviewLayeredANGLE modifies the internal multiview state.
>+// Test that glFramebufferTextureMultiviewOVR modifies the internal multiview state.
> TEST_P(FramebufferMultiviewTest, ModifyLayeredState)
> {
>-    if (!requestMultiviewExtension())
>-    {
>-        return;
>-    }
>+    ANGLE_SKIP_TEST_IF(!requestMultiviewExtension());
> 
>     GLFramebuffer multiviewFBO;
>     glBindFramebuffer(GL_FRAMEBUFFER, multiviewFBO);
>@@ -742,46 +390,28 @@ TEST_P(FramebufferMultiviewTest, ModifyLayeredState)
>     glTexImage3D(GL_TEXTURE_2D_ARRAY, 0, GL_RGBA8, 1, 1, 4, 0, GL_RGBA, GL_UNSIGNED_BYTE, nullptr);
>     ASSERT_GL_NO_ERROR();
> 
>-    glFramebufferTextureMultiviewLayeredANGLE(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, tex, 0, 1, 2);
>+    glFramebufferTextureMultiviewOVR(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, tex, 0, 1, 2);
>     ASSERT_GL_NO_ERROR();
> 
>     GLint numViews = -1;
>     glGetFramebufferAttachmentParameteriv(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0,
>-                                          GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_NUM_VIEWS_ANGLE,
>+                                          GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_NUM_VIEWS_OVR,
>                                           &numViews);
>     ASSERT_GL_NO_ERROR();
>     EXPECT_EQ(2, numViews);
> 
>     GLint baseViewIndex = -1;
>     glGetFramebufferAttachmentParameteriv(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0,
>-                                          GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_BASE_VIEW_INDEX_ANGLE,
>+                                          GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_BASE_VIEW_INDEX_OVR,
>                                           &baseViewIndex);
>     ASSERT_GL_NO_ERROR();
>     EXPECT_EQ(1, baseViewIndex);
>-
>-    GLint multiviewLayout = GL_NONE;
>-    glGetFramebufferAttachmentParameteriv(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0,
>-                                          GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_MULTIVIEW_LAYOUT_ANGLE,
>-                                          &multiviewLayout);
>-    ASSERT_GL_NO_ERROR();
>-    EXPECT_EQ(GL_FRAMEBUFFER_MULTIVIEW_LAYERED_ANGLE, multiviewLayout);
>-
>-    GLint internalViewportOffsets[2] = {-1};
>-    glGetFramebufferAttachmentParameteriv(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0,
>-                                          GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_VIEWPORT_OFFSETS_ANGLE,
>-                                          &internalViewportOffsets[0]);
>-    ASSERT_GL_NO_ERROR();
>-    EXPECT_EQ(0, internalViewportOffsets[0]);
>-    EXPECT_EQ(0, internalViewportOffsets[1]);
> }
> 
> // Test framebuffer completeness status of a layered framebuffer with color attachments.
> TEST_P(FramebufferMultiviewTest, IncompleteViewTargetsLayered)
> {
>-    if (!requestMultiviewExtension())
>-    {
>-        return;
>-    }
>+    ANGLE_SKIP_TEST_IF(!requestMultiviewExtension());
> 
>     GLFramebuffer fbo;
>     glBindFramebuffer(GL_FRAMEBUFFER, fbo);
>@@ -792,7 +422,7 @@ TEST_P(FramebufferMultiviewTest, IncompleteViewTargetsLayered)
> 
>     // Set the 0th attachment and keep it as it is till the end of the test. The 1st color
>     // attachment will be modified to change the framebuffer's status.
>-    glFramebufferTextureMultiviewLayeredANGLE(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, tex, 0, 0, 2);
>+    glFramebufferTextureMultiviewOVR(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, tex, 0, 0, 2);
>     ASSERT_GL_NO_ERROR();
> 
>     GLTexture otherTexLayered;
>@@ -800,240 +430,31 @@ TEST_P(FramebufferMultiviewTest, IncompleteViewTargetsLayered)
>     glTexImage3D(GL_TEXTURE_2D_ARRAY, 0, GL_RGBA8, 1, 1, 4, 0, GL_RGBA, GL_UNSIGNED_BYTE, nullptr);
> 
>     // Test framebuffer completeness when the base view index differs.
>-    glFramebufferTextureMultiviewLayeredANGLE(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT1, otherTexLayered,
>-                                              0, 1, 2);
>-    ASSERT_GL_NO_ERROR();
>-    EXPECT_GLENUM_EQ(GL_FRAMEBUFFER_INCOMPLETE_VIEW_TARGETS_ANGLE,
>-                     glCheckFramebufferStatus(GL_FRAMEBUFFER));
>-
>-    // Test framebuffer completeness when the 1st attachment has a side-by-side layout.
>-    const int kViewportOffsets[4] = {0, 0, 0, 0};
>-    GLTexture otherTex2D;
>-    glBindTexture(GL_TEXTURE_2D, otherTex2D);
>-    glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA8, 4, 2, 0, GL_RGBA, GL_UNSIGNED_BYTE, nullptr);
>-    glFramebufferTextureMultiviewSideBySideANGLE(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT1, otherTex2D,
>-                                                 0, 2, kViewportOffsets);
>+    glFramebufferTextureMultiviewOVR(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT1, otherTexLayered, 0, 1,
>+                                     2);
>     ASSERT_GL_NO_ERROR();
>-    EXPECT_GLENUM_EQ(GL_FRAMEBUFFER_INCOMPLETE_VIEW_TARGETS_ANGLE,
>+    EXPECT_GLENUM_EQ(GL_FRAMEBUFFER_INCOMPLETE_VIEW_TARGETS_OVR,
>                      glCheckFramebufferStatus(GL_FRAMEBUFFER));
> 
>     // Test framebuffer completeness when the 1st attachment has a non-multiview layout.
>     glFramebufferTextureLayer(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT1, otherTexLayered, 0, 0);
>     ASSERT_GL_NO_ERROR();
>-    EXPECT_GLENUM_EQ(GL_FRAMEBUFFER_INCOMPLETE_VIEW_TARGETS_ANGLE,
>+    EXPECT_GLENUM_EQ(GL_FRAMEBUFFER_INCOMPLETE_VIEW_TARGETS_OVR,
>                      glCheckFramebufferStatus(GL_FRAMEBUFFER));
> 
>     // Test that framebuffer is complete when the number of views, base view index and layouts are
>     // the same.
>-    glFramebufferTextureMultiviewLayeredANGLE(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT1, otherTexLayered,
>-                                              0, 0, 2);
>+    glFramebufferTextureMultiviewOVR(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT1, otherTexLayered, 0, 0,
>+                                     2);
>     ASSERT_GL_NO_ERROR();
>     EXPECT_GLENUM_EQ(GL_FRAMEBUFFER_COMPLETE, glCheckFramebufferStatus(GL_FRAMEBUFFER));
> }
> 
>-// Test that glClear clears all of the contents if the scissor test is disabled.
>-TEST_P(FramebufferMultiviewSideBySideClearTest, ClearWithDisabledScissorTest)
>-{
>-    if (!requestMultiviewExtension())
>-    {
>-        return;
>-    }
>-
>-    initializeFBOs(1, false, false);
>-
>-    // Clear the contents of the texture.
>-    glBindFramebuffer(GL_FRAMEBUFFER, mNonMultiviewFBO);
>-    glClearColor(0, 0, 0, 1);
>-    glClear(GL_COLOR_BUFFER_BIT);
>-
>-    // Bind and specify viewport/scissor dimensions for each view.
>-    glBindFramebuffer(GL_FRAMEBUFFER, mMultiviewFBO);
>-    glViewport(0, 0, 1, 2);
>-    glScissor(0, 0, 1, 2);
>-
>-    glClearColor(1, 0, 0, 1);
>-    glClear(GL_COLOR_BUFFER_BIT);
>-
>-    glBindFramebuffer(GL_FRAMEBUFFER, mNonMultiviewFBO);
>-
>-    for (int i = 0; i < 4; ++i)
>-    {
>-        for (int j = 0; j < 2; ++j)
>-        {
>-            EXPECT_PIXEL_COLOR_EQ(i, j, GLColor::red);
>-        }
>-    }
>-}
>-
>-// Test that glClear clears the depth buffer of each view.
>-TEST_P(FramebufferMultiviewSideBySideClearTest, DepthBufferClear)
>-{
>-    if (!requestMultiviewExtension())
>-    {
>-        return;
>-    }
>-
>-    // Create program to draw a quad.
>-    const std::string &vs =
>-        "#version 300 es\n"
>-        "in vec3 vPos;\n"
>-        "void main(){\n"
>-        "   gl_Position = vec4(vPos, 1.);\n"
>-        "}\n";
>-    const std::string &fs =
>-        "#version 300 es\n"
>-        "precision mediump float;\n"
>-        "uniform vec3 uCol;\n"
>-        "out vec4 col;\n"
>-        "void main(){\n"
>-        "   col = vec4(uCol,1.);\n"
>-        "}\n";
>-    ANGLE_GL_PROGRAM(program, vs, fs);
>-    glUseProgram(program);
>-    GLuint mColorUniformLoc = glGetUniformLocation(program, "uCol");
>-
>-    initializeFBOs(1, false, true);
>-    glEnable(GL_DEPTH_TEST);
>-
>-    // Clear the contents of the texture.
>-    glBindFramebuffer(GL_FRAMEBUFFER, mNonMultiviewFBO);
>-    glClearColor(0, 0, 0, 0);
>-    glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
>-
>-    // Dirty the depth and color buffers.
>-    glUniform3f(mColorUniformLoc, 1.0f, 0.0f, 0.0f);
>-    drawQuad(program, "vPos", 0.0f, 1.0f, true);
>-
>-    // Switch to the multi-view framebuffer and clear only the rectangles covered by the views.
>-    glBindFramebuffer(GL_FRAMEBUFFER, mMultiviewFBO);
>-    glViewport(0, 0, 1, 2);
>-    glScissor(0, 0, 1, 2);
>-    glEnable(GL_SCISSOR_TEST);
>-    glClear(GL_DEPTH_BUFFER_BIT);
>-
>-    // Draw a fullscreen quad to fill the cleared regions.
>-    glBindFramebuffer(GL_FRAMEBUFFER, mNonMultiviewFBO);
>-    glViewport(0, 0, 4, 2);
>-    glScissor(0, 0, 4, 2);
>-    glUniform3f(mColorUniformLoc, 0.0f, 1.0f, 0.0f);
>-    drawQuad(program, "vPos", 0.5f, 1.0f, true);
>-
>-    checkAlternatingColumnsOfRedAndGreenInFBO();
>-}
>-
>-// Test that glClear clears the stencil buffer of each view.
>-TEST_P(FramebufferMultiviewSideBySideClearTest, StencilBufferClear)
>-{
>-    if (!requestMultiviewExtension())
>-    {
>-        return;
>-    }
>-
>-    // Create program to draw a quad.
>-    const std::string &vs =
>-        "#version 300 es\n"
>-        "in vec3 vPos;\n"
>-        "void main(){\n"
>-        "   gl_Position = vec4(vPos, 1.);\n"
>-        "}\n";
>-    const std::string &fs =
>-        "#version 300 es\n"
>-        "precision mediump float;\n"
>-        "uniform vec3 uCol;\n"
>-        "out vec4 col;\n"
>-        "void main(){\n"
>-        "   col = vec4(uCol,1.);\n"
>-        "}\n";
>-    ANGLE_GL_PROGRAM(program, vs, fs);
>-    glUseProgram(program);
>-    GLuint mColorUniformLoc = glGetUniformLocation(program, "uCol");
>-
>-    initializeFBOs(1, true, false);
>-    glEnable(GL_STENCIL_TEST);
>-    glDisable(GL_DEPTH_TEST);
>-
>-    // Set clear values and clear the whole framebuffer.
>-    glBindFramebuffer(GL_FRAMEBUFFER, mNonMultiviewFBO);
>-    glClearColor(0, 0, 0, 0);
>-    glClearStencil(0);
>-    glClear(GL_COLOR_BUFFER_BIT | GL_STENCIL_BUFFER_BIT);
>-
>-    // Update stencil test to always replace the stencil value with 0xFF.
>-    glStencilOp(GL_KEEP, GL_KEEP, GL_REPLACE);
>-    glStencilFunc(GL_ALWAYS, 0xFF, 0);
>-
>-    // Draw a quad which covers the whole texture.
>-    glUniform3f(mColorUniformLoc, 1.0f, 0.0f, 0.0f);
>-    drawQuad(program, "vPos", 0.0f, 1.0f, true);
>-
>-    // Switch to multiview framebuffer and clear portions of the texture.
>-    glBindFramebuffer(GL_FRAMEBUFFER, mMultiviewFBO);
>-    glViewport(0, 0, 1, 2);
>-    glScissor(0, 0, 1, 2);
>-    glEnable(GL_SCISSOR_TEST);
>-    glClear(GL_STENCIL_BUFFER_BIT);
>-
>-    // Draw a fullscreen quad, but adjust the stencil function so that only the cleared regions pass
>-    // the test.
>-    glBindFramebuffer(GL_FRAMEBUFFER, mNonMultiviewFBO);
>-    glViewport(0, 0, 4, 2);
>-    glScissor(0, 0, 4, 2);
>-    glStencilFunc(GL_EQUAL, 0x00, 0xFF);
>-    glUniform3f(mColorUniformLoc, 0.0f, 1.0f, 0.0f);
>-    drawQuad(program, "vPos", 0.0f, 1.0f, true);
>-
>-    checkAlternatingColumnsOfRedAndGreenInFBO();
>-}
>-
>-// Test that glClearBufferf clears the color buffer of each view.
>-TEST_P(FramebufferMultiviewSideBySideClearTest, ClearBufferF)
>-{
>-    if (!requestMultiviewExtension())
>-    {
>-        return;
>-    }
>-
>-    initializeFBOs(2, false, false);
>-
>-    // Clear the contents of the texture.
>-    glBindFramebuffer(GL_FRAMEBUFFER, mNonMultiviewFBO);
>-    glClearColor(1, 0, 0, 1);
>-    glClear(GL_COLOR_BUFFER_BIT);
>-
>-    // Bind and specify viewport/scissor dimensions for each view.
>-    glBindFramebuffer(GL_FRAMEBUFFER, mMultiviewFBO);
>-    glViewport(0, 0, 1, 2);
>-    glScissor(0, 0, 1, 2);
>-    glEnable(GL_SCISSOR_TEST);
>-
>-    float kClearValues[4] = {0.f, 1.f, 0.f, 1.f};
>-    glClearBufferfv(GL_COLOR, 1, kClearValues);
>-
>-    glBindFramebuffer(GL_FRAMEBUFFER, mNonMultiviewFBO);
>-
>-    // Check that glClearBufferfv has not modified the 0th color attachment.
>-    glReadBuffer(GL_COLOR_ATTACHMENT0);
>-    for (int i = 0; i < 4; ++i)
>-    {
>-        for (int j = 0; j < 2; ++j)
>-        {
>-            EXPECT_PIXEL_COLOR_EQ(i, j, GLColor::red);
>-        }
>-    }
>-
>-    // Check that glClearBufferfv has correctly modified the 1th color attachment.
>-    glReadBuffer(GL_COLOR_ATTACHMENT1);
>-    checkAlternatingColumnsOfRedAndGreenInFBO();
>-}
>-
> // Test that glClear clears the contents of the color buffer for only the attached layers to a
> // layered FBO.
> TEST_P(FramebufferMultiviewLayeredClearTest, ColorBufferClear)
> {
>-    if (!requestMultiviewExtension())
>-    {
>-        return;
>-    }
>+    ANGLE_SKIP_TEST_IF(!requestMultiviewExtension());
> 
>     initializeFBOs(1, 1, 4, 1, 2, 1, false, false);
> 
>@@ -1043,19 +464,16 @@ TEST_P(FramebufferMultiviewLayeredClearTest, ColorBufferClear)
>     glClearColor(0, 1, 0, 1);
>     glClear(GL_COLOR_BUFFER_BIT);
> 
>-    EXPECT_EQ(GLColor::red, getLayerColor(0, GL_COLOR_ATTACHMENT0));
>+    EXPECT_EQ(GLColor::transparentBlack, getLayerColor(0, GL_COLOR_ATTACHMENT0));
>     EXPECT_EQ(GLColor::green, getLayerColor(1, GL_COLOR_ATTACHMENT0));
>     EXPECT_EQ(GLColor::green, getLayerColor(2, GL_COLOR_ATTACHMENT0));
>-    EXPECT_EQ(GLColor::red, getLayerColor(3, GL_COLOR_ATTACHMENT0));
>+    EXPECT_EQ(GLColor::transparentBlack, getLayerColor(3, GL_COLOR_ATTACHMENT0));
> }
> 
> // Test that glClearBufferfv can be used to clear individual color buffers of a layered FBO.
> TEST_P(FramebufferMultiviewLayeredClearTest, ClearIndividualColorBuffer)
> {
>-    if (!requestMultiviewExtension())
>-    {
>-        return;
>-    }
>+    ANGLE_SKIP_TEST_IF(!requestMultiviewExtension());
> 
>     initializeFBOs(1, 1, 4, 1, 2, 2, false, false);
> 
>@@ -1064,7 +482,7 @@ TEST_P(FramebufferMultiviewLayeredClearTest, ClearIndividualColorBuffer)
>         for (int layer = 0; layer < 4; ++layer)
>         {
>             GLenum colorAttachment = static_cast<GLenum>(GL_COLOR_ATTACHMENT0 + i);
>-            EXPECT_EQ(GLColor::red, getLayerColor(layer, colorAttachment));
>+            EXPECT_EQ(GLColor::transparentBlack, getLayerColor(layer, colorAttachment));
>         }
>     }
> 
>@@ -1076,34 +494,31 @@ TEST_P(FramebufferMultiviewLayeredClearTest, ClearIndividualColorBuffer)
>     float clearValues1[4] = {0.f, 1.f, 0.f, 1.f};
>     glClearBufferfv(GL_COLOR, 1, clearValues1);
> 
>-    EXPECT_EQ(GLColor::red, getLayerColor(0, GL_COLOR_ATTACHMENT0));
>+    EXPECT_EQ(GLColor::transparentBlack, getLayerColor(0, GL_COLOR_ATTACHMENT0));
>     EXPECT_EQ(GLColor::blue, getLayerColor(1, GL_COLOR_ATTACHMENT0));
>     EXPECT_EQ(GLColor::blue, getLayerColor(2, GL_COLOR_ATTACHMENT0));
>-    EXPECT_EQ(GLColor::red, getLayerColor(3, GL_COLOR_ATTACHMENT0));
>+    EXPECT_EQ(GLColor::transparentBlack, getLayerColor(3, GL_COLOR_ATTACHMENT0));
> 
>-    EXPECT_EQ(GLColor::red, getLayerColor(0, GL_COLOR_ATTACHMENT1));
>+    EXPECT_EQ(GLColor::transparentBlack, getLayerColor(0, GL_COLOR_ATTACHMENT1));
>     EXPECT_EQ(GLColor::green, getLayerColor(1, GL_COLOR_ATTACHMENT1));
>     EXPECT_EQ(GLColor::green, getLayerColor(2, GL_COLOR_ATTACHMENT1));
>-    EXPECT_EQ(GLColor::red, getLayerColor(3, GL_COLOR_ATTACHMENT1));
>+    EXPECT_EQ(GLColor::transparentBlack, getLayerColor(3, GL_COLOR_ATTACHMENT1));
> }
> 
> // Test that glClearBufferfi clears the contents of the stencil buffer for only the attached layers
> // to a layered FBO.
> TEST_P(FramebufferMultiviewLayeredClearTest, ClearBufferfi)
> {
>-    if (!requestMultiviewExtension())
>-    {
>-        return;
>-    }
>+    ANGLE_SKIP_TEST_IF(!requestMultiviewExtension());
> 
>     // Create program to draw a quad.
>-    const std::string &vs =
>+    constexpr char kVS[] =
>         "#version 300 es\n"
>         "in vec3 vPos;\n"
>         "void main(){\n"
>         "   gl_Position = vec4(vPos, 1.);\n"
>         "}\n";
>-    const std::string &fs =
>+    constexpr char kFS[] =
>         "#version 300 es\n"
>         "precision mediump float;\n"
>         "uniform vec3 uCol;\n"
>@@ -1111,7 +526,7 @@ TEST_P(FramebufferMultiviewLayeredClearTest, ClearBufferfi)
>         "void main(){\n"
>         "   col = vec4(uCol,1.);\n"
>         "}\n";
>-    ANGLE_GL_PROGRAM(program, vs, fs);
>+    ANGLE_GL_PROGRAM(program, kVS, kFS);
>     glUseProgram(program);
>     GLuint mColorUniformLoc = glGetUniformLocation(program, "uCol");
> 
>@@ -1153,10 +568,7 @@ TEST_P(FramebufferMultiviewLayeredClearTest, ClearBufferfi)
> // Test that glClear does not clear the content of a detached texture.
> TEST_P(FramebufferMultiviewLayeredClearTest, UnmodifiedDetachedTexture)
> {
>-    if (!requestMultiviewExtension())
>-    {
>-        return;
>-    }
>+    ANGLE_SKIP_TEST_IF(!requestMultiviewExtension());
> 
>     initializeFBOs(1, 1, 4, 1, 2, 2, false, false);
> 
>@@ -1168,38 +580,35 @@ TEST_P(FramebufferMultiviewLayeredClearTest, UnmodifiedDetachedTexture)
>     for (int i = 0; i < 2; ++i)
>     {
>         GLenum colorAttachment = static_cast<GLenum>(GL_COLOR_ATTACHMENT0 + i);
>-        EXPECT_EQ(GLColor::red, getLayerColor(0, colorAttachment));
>+        EXPECT_EQ(GLColor::transparentBlack, getLayerColor(0, colorAttachment));
>         EXPECT_EQ(GLColor::green, getLayerColor(1, colorAttachment));
>         EXPECT_EQ(GLColor::green, getLayerColor(2, colorAttachment));
>-        EXPECT_EQ(GLColor::red, getLayerColor(3, colorAttachment));
>+        EXPECT_EQ(GLColor::transparentBlack, getLayerColor(3, colorAttachment));
>     }
> 
>     // Detach and clear again.
>     glBindFramebuffer(GL_FRAMEBUFFER, mMultiviewFBO);
>-    glFramebufferTextureMultiviewLayeredANGLE(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT1, 0, 0, 1, 2);
>+    glFramebufferTextureMultiviewOVR(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT1, 0, 0, 1, 2);
>     glClearColor(1, 1, 0, 1);
>     glClear(GL_COLOR_BUFFER_BIT);
> 
>     // Check that color attachment 0 is modified.
>-    EXPECT_EQ(GLColor::red, getLayerColor(0, GL_COLOR_ATTACHMENT0));
>+    EXPECT_EQ(GLColor::transparentBlack, getLayerColor(0, GL_COLOR_ATTACHMENT0));
>     EXPECT_EQ(GLColor::yellow, getLayerColor(1, GL_COLOR_ATTACHMENT0));
>     EXPECT_EQ(GLColor::yellow, getLayerColor(2, GL_COLOR_ATTACHMENT0));
>-    EXPECT_EQ(GLColor::red, getLayerColor(3, GL_COLOR_ATTACHMENT0));
>+    EXPECT_EQ(GLColor::transparentBlack, getLayerColor(3, GL_COLOR_ATTACHMENT0));
> 
>     // Check that color attachment 1 is unmodified.
>-    EXPECT_EQ(GLColor::red, getLayerColor(0, GL_COLOR_ATTACHMENT1));
>+    EXPECT_EQ(GLColor::transparentBlack, getLayerColor(0, GL_COLOR_ATTACHMENT1));
>     EXPECT_EQ(GLColor::green, getLayerColor(1, GL_COLOR_ATTACHMENT1));
>     EXPECT_EQ(GLColor::green, getLayerColor(2, GL_COLOR_ATTACHMENT1));
>-    EXPECT_EQ(GLColor::red, getLayerColor(3, GL_COLOR_ATTACHMENT1));
>+    EXPECT_EQ(GLColor::transparentBlack, getLayerColor(3, GL_COLOR_ATTACHMENT1));
> }
> 
> // Test that glClear clears only the contents within the scissor rectangle of the attached layers.
> TEST_P(FramebufferMultiviewLayeredClearTest, ScissoredClear)
> {
>-    if (!requestMultiviewExtension())
>-    {
>-        return;
>-    }
>+    ANGLE_SKIP_TEST_IF(!requestMultiviewExtension());
> 
>     initializeFBOs(2, 1, 4, 1, 2, 1, false, false);
> 
>@@ -1211,36 +620,33 @@ TEST_P(FramebufferMultiviewLayeredClearTest, ScissoredClear)
>     glClearColor(0, 1, 0, 1);
>     glClear(GL_COLOR_BUFFER_BIT);
> 
>-    EXPECT_EQ(GLColor::red, getLayerColor(0, GL_COLOR_ATTACHMENT0, 0, 0));
>-    EXPECT_EQ(GLColor::red, getLayerColor(0, GL_COLOR_ATTACHMENT0, 1, 0));
>+    EXPECT_EQ(GLColor::transparentBlack, getLayerColor(0, GL_COLOR_ATTACHMENT0, 0, 0));
>+    EXPECT_EQ(GLColor::transparentBlack, getLayerColor(0, GL_COLOR_ATTACHMENT0, 1, 0));
> 
>-    EXPECT_EQ(GLColor::red, getLayerColor(1, GL_COLOR_ATTACHMENT0, 0, 0));
>+    EXPECT_EQ(GLColor::transparentBlack, getLayerColor(1, GL_COLOR_ATTACHMENT0, 0, 0));
>     EXPECT_EQ(GLColor::green, getLayerColor(1, GL_COLOR_ATTACHMENT0, 1, 0));
> 
>-    EXPECT_EQ(GLColor::red, getLayerColor(2, GL_COLOR_ATTACHMENT0, 0, 0));
>+    EXPECT_EQ(GLColor::transparentBlack, getLayerColor(2, GL_COLOR_ATTACHMENT0, 0, 0));
>     EXPECT_EQ(GLColor::green, getLayerColor(2, GL_COLOR_ATTACHMENT0, 1, 0));
> 
>-    EXPECT_EQ(GLColor::red, getLayerColor(3, GL_COLOR_ATTACHMENT0, 0, 0));
>-    EXPECT_EQ(GLColor::red, getLayerColor(3, GL_COLOR_ATTACHMENT0, 1, 0));
>+    EXPECT_EQ(GLColor::transparentBlack, getLayerColor(3, GL_COLOR_ATTACHMENT0, 0, 0));
>+    EXPECT_EQ(GLColor::transparentBlack, getLayerColor(3, GL_COLOR_ATTACHMENT0, 1, 0));
> }
> 
> // Test that glClearBufferfi clears the contents of the stencil buffer for only the attached layers
> // to a layered FBO.
> TEST_P(FramebufferMultiviewLayeredClearTest, ScissoredClearBufferfi)
> {
>-    if (!requestMultiviewExtension())
>-    {
>-        return;
>-    }
>+    ANGLE_SKIP_TEST_IF(!requestMultiviewExtension());
> 
>     // Create program to draw a quad.
>-    const std::string &vs =
>+    constexpr char kVS[] =
>         "#version 300 es\n"
>         "in vec3 vPos;\n"
>         "void main(){\n"
>         "   gl_Position = vec4(vPos, 1.);\n"
>         "}\n";
>-    const std::string &fs =
>+    constexpr char kFS[] =
>         "#version 300 es\n"
>         "precision mediump float;\n"
>         "uniform vec3 uCol;\n"
>@@ -1248,7 +654,7 @@ TEST_P(FramebufferMultiviewLayeredClearTest, ScissoredClearBufferfi)
>         "void main(){\n"
>         "   col = vec4(uCol,1.);\n"
>         "}\n";
>-    ANGLE_GL_PROGRAM(program, vs, fs);
>+    ANGLE_GL_PROGRAM(program, kVS, kFS);
>     glUseProgram(program);
>     GLuint mColorUniformLoc = glGetUniformLocation(program, "uCol");
> 
>@@ -1278,10 +684,10 @@ TEST_P(FramebufferMultiviewLayeredClearTest, ScissoredClearBufferfi)
>     // the test.
>     glStencilOp(GL_KEEP, GL_KEEP, GL_REPLACE);
>     glStencilFunc(GL_EQUAL, 0x00, 0xFF);
>+    glUniform3f(mColorUniformLoc, 0.0f, 1.0f, 0.0f);
>     for (size_t i = 0u; i < mNonMultiviewFBO.size(); ++i)
>     {
>         glBindFramebuffer(GL_FRAMEBUFFER, mNonMultiviewFBO[i]);
>-        glUniform3f(mColorUniformLoc, 0.0f, 1.0f, 0.0f);
>         drawQuad(program, "vPos", 0.0f, 1.0f, true);
>     }
>     EXPECT_EQ(GLColor::red, getLayerColor(0, GL_COLOR_ATTACHMENT0, 0, 0));
>@@ -1298,32 +704,17 @@ TEST_P(FramebufferMultiviewLayeredClearTest, ScissoredClearBufferfi)
> // arguments are invalid.
> TEST_P(FramebufferMultiviewTest, InvalidMultiviewArgumentsOnDetach)
> {
>-    if (!requestMultiviewExtension())
>-    {
>-        return;
>-    }
>+    ANGLE_SKIP_TEST_IF(!requestMultiviewExtension());
> 
>     GLFramebuffer fbo;
>     glBindFramebuffer(GL_FRAMEBUFFER, fbo);
> 
>     // Invalid base view index.
>-    glFramebufferTextureMultiviewLayeredANGLE(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, 0, 0, -1, 1);
>-    EXPECT_GL_NO_ERROR();
>-
>-    // Invalid number of views.
>-    glFramebufferTextureMultiviewLayeredANGLE(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, 0, 0, 0, 0);
>+    glFramebufferTextureMultiviewOVR(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, 0, 0, -1, 1);
>     EXPECT_GL_NO_ERROR();
> 
>     // Invalid number of views.
>-    const GLint kValidViewportOffsets[2] = {0, 0};
>-    glFramebufferTextureMultiviewSideBySideANGLE(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, 0, 0, 0,
>-                                                 kValidViewportOffsets);
>-    EXPECT_GL_NO_ERROR();
>-
>-    // Invalid viewport offsets.
>-    const GLint kInvalidViewportOffsets[2] = {-1, -1};
>-    glFramebufferTextureMultiviewSideBySideANGLE(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, 0, 0, 1,
>-                                                 kInvalidViewportOffsets);
>+    glFramebufferTextureMultiviewOVR(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, 0, 0, 0, 0);
>     EXPECT_GL_NO_ERROR();
> }
> 
>@@ -1331,10 +722,7 @@ TEST_P(FramebufferMultiviewTest, InvalidMultiviewArgumentsOnDetach)
> // array are attached. The test is added because a special fast code path is used for this case.
> TEST_P(FramebufferMultiviewLayeredClearTest, ColorBufferClearAllLayersAttached)
> {
>-    if (!requestMultiviewExtension())
>-    {
>-        return;
>-    }
>+    ANGLE_SKIP_TEST_IF(!requestMultiviewExtension());
> 
>     initializeFBOs(1, 1, 2, 0, 2, 1, false, false);
> 
>@@ -1346,6 +734,29 @@ TEST_P(FramebufferMultiviewLayeredClearTest, ColorBufferClearAllLayersAttached)
>     EXPECT_EQ(GLColor::green, getLayerColor(1, GL_COLOR_ATTACHMENT0));
> }
> 
>-ANGLE_INSTANTIATE_TEST(FramebufferMultiviewTest, ES3_OPENGL());
>-ANGLE_INSTANTIATE_TEST(FramebufferMultiviewSideBySideClearTest, ES3_OPENGL(), ES3_D3D11());
>-ANGLE_INSTANTIATE_TEST(FramebufferMultiviewLayeredClearTest, ES3_OPENGL(), ES3_D3D11());
>\ No newline at end of file
>+// Test that attaching a multisampled texture array is not possible if all the required extensions
>+// are not enabled.
>+TEST_P(FramebufferMultiviewTest, NegativeMultisampledFramebufferTest)
>+{
>+    ANGLE_SKIP_TEST_IF(!requestMultiviewExtension());
>+
>+    ANGLE_SKIP_TEST_IF(!EnsureGLExtensionEnabled("GL_OES_texture_storage_multisample_2d_array"));
>+
>+    // We don't enable OVR_multiview2_multisample
>+
>+    GLTexture multisampleTexture;
>+    glBindTexture(GL_TEXTURE_2D_MULTISAMPLE_ARRAY_OES, multisampleTexture);
>+
>+    GLFramebuffer fbo;
>+    glBindFramebuffer(GL_FRAMEBUFFER, fbo);
>+    glFramebufferTextureMultiviewOVR(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, multisampleTexture, 0, 0,
>+                                     2);
>+    // From the extension spec: "An INVALID_OPERATION error is generated if texture is not zero, and
>+    // does not name an existing texture object of type TEXTURE_2D_ARRAY."
>+    EXPECT_GL_ERROR(GL_INVALID_OPERATION);
>+}
>+
>+ANGLE_INSTANTIATE_TEST(FramebufferMultiviewTest, VertexShaderOpenGL(3, 0), GeomShaderD3D11(3, 0));
>+ANGLE_INSTANTIATE_TEST(FramebufferMultiviewLayeredClearTest,
>+                       VertexShaderOpenGL(3, 0),
>+                       GeomShaderD3D11(3, 0));
>diff --git a/Source/ThirdParty/ANGLE/src/tests/gl_tests/FramebufferRenderMipmapTest.cpp b/Source/ThirdParty/ANGLE/src/tests/gl_tests/FramebufferRenderMipmapTest.cpp
>index d46c736029e..5cb7487e10b 100644
>--- a/Source/ThirdParty/ANGLE/src/tests/gl_tests/FramebufferRenderMipmapTest.cpp
>+++ b/Source/ThirdParty/ANGLE/src/tests/gl_tests/FramebufferRenderMipmapTest.cpp
>@@ -25,27 +25,13 @@ class FramebufferRenderMipmapTest : public ANGLETest
>     {
>         ANGLETest::SetUp();
> 
>-        const std::string vsSource =
>-            R"(attribute highp vec4 position;
>-            void main(void)
>-            {
>-                gl_Position = position;
>-            })";
>-
>-        const std::string fsSource =
>-            R"(uniform highp vec4 color;
>-            void main(void)
>-            {
>-                gl_FragColor = color;
>-            })";
>-
>-        mProgram = CompileProgram(vsSource, fsSource);
>+        mProgram = CompileProgram(essl1_shaders::vs::Simple(), essl1_shaders::fs::UniformColor());
>         if (mProgram == 0)
>         {
>             FAIL() << "shader compilation failed.";
>         }
> 
>-        mColorLocation = glGetUniformLocation(mProgram, "color");
>+        mColorLocation = glGetUniformLocation(mProgram, essl1_shaders::ColorUniform());
> 
>         glUseProgram(mProgram);
> 
>@@ -75,7 +61,7 @@ class FramebufferRenderMipmapTest : public ANGLETest
> TEST_P(FramebufferRenderMipmapTest, Validation)
> {
>     bool renderToMipmapSupported =
>-        extensionEnabled("GL_OES_fbo_render_mipmap") || getClientMajorVersion() > 2;
>+        IsGLExtensionEnabled("GL_OES_fbo_render_mipmap") || getClientMajorVersion() > 2;
> 
>     GLuint tex = 0;
>     glGenTextures(1, &tex);
>@@ -114,32 +100,17 @@ TEST_P(FramebufferRenderMipmapTest, Validation)
>     glDeleteTextures(1, &tex);
> }
> 
>-// Render to various levels of a texture and check that they have the correct color data via ReadPixels
>+// Render to various levels of a texture and check that they have the correct color data via
>+// ReadPixels
> TEST_P(FramebufferRenderMipmapTest, RenderToMipmap)
> {
>-    // TODO(geofflang): Figure out why this is broken on Intel OpenGL
>-    if (IsIntel() && getPlatformRenderer() == EGL_PLATFORM_ANGLE_TYPE_OPENGL_ANGLE)
>-    {
>-        std::cout << "Test skipped on Intel OpenGL." << std::endl;
>-        return;
>-    }
>-
>     bool renderToMipmapSupported =
>-        extensionEnabled("GL_OES_fbo_render_mipmap") || getClientMajorVersion() > 2;
>-    if (!renderToMipmapSupported)
>-    {
>-        std::cout << "Test skipped because GL_OES_fbo_render_mipmap or ES3 is not available." << std::endl;
>-        return;
>-    }
>+        IsGLExtensionEnabled("GL_OES_fbo_render_mipmap") || getClientMajorVersion() > 2;
>+    ANGLE_SKIP_TEST_IF(!renderToMipmapSupported);
> 
>-    const GLfloat levelColors[] =
>-    {
>-        1.0f, 0.0f, 0.0f, 1.0f,
>-        0.0f, 1.0f, 0.0f, 1.0f,
>-        0.0f, 0.0f, 1.0f, 1.0f,
>-        1.0f, 1.0f, 0.0f, 1.0f,
>-        1.0f, 0.0f, 1.0f, 1.0f,
>-        0.0f, 1.0f, 1.0f, 1.0f,
>+    const GLfloat levelColors[] = {
>+        1.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f, 0.0f, 1.0f, 0.0f, 0.0f, 1.0f, 1.0f,
>+        1.0f, 1.0f, 0.0f, 1.0f, 1.0f, 0.0f, 1.0f, 1.0f, 0.0f, 1.0f, 1.0f, 1.0f,
>     };
>     const GLint testLevels = static_cast<GLint>(ArraySize(levelColors) / 4);
> 
>@@ -169,7 +140,7 @@ TEST_P(FramebufferRenderMipmapTest, RenderToMipmap)
>         glUseProgram(mProgram);
>         glUniform4fv(mColorLocation, 1, levelColors + (i * 4));
> 
>-        drawQuad(mProgram, "position", 0.5f);
>+        drawQuad(mProgram, essl1_shaders::PositionAttrib(), 0.5f);
>         EXPECT_GL_NO_ERROR();
>     }
> 
>@@ -189,7 +160,8 @@ TEST_P(FramebufferRenderMipmapTest, RenderToMipmap)
>     EXPECT_GL_NO_ERROR();
> }
> 
>-// Use this to select which configurations (e.g. which renderer, which GLES major version) these tests should be run against.
>+// Use this to select which configurations (e.g. which renderer, which GLES major version) these
>+// tests should be run against.
> ANGLE_INSTANTIATE_TEST(FramebufferRenderMipmapTest,
>                        ES2_D3D9(),
>                        ES2_D3D11(),
>@@ -197,4 +169,5 @@ ANGLE_INSTANTIATE_TEST(FramebufferRenderMipmapTest,
>                        ES2_OPENGL(),
>                        ES3_OPENGL(),
>                        ES2_OPENGLES(),
>-                       ES3_OPENGLES());
>+                       ES3_OPENGLES(),
>+                       ES2_VULKAN());
>diff --git a/Source/ThirdParty/ANGLE/src/tests/gl_tests/FramebufferTest.cpp b/Source/ThirdParty/ANGLE/src/tests/gl_tests/FramebufferTest.cpp
>index cec9c3c4af9..0fa31828bbe 100644
>--- a/Source/ThirdParty/ANGLE/src/tests/gl_tests/FramebufferTest.cpp
>+++ b/Source/ThirdParty/ANGLE/src/tests/gl_tests/FramebufferTest.cpp
>@@ -7,6 +7,7 @@
> //   Various tests related for Frambuffers.
> //
> 
>+#include "platform/WorkaroundsD3D.h"
> #include "test_utils/ANGLETest.h"
> #include "test_utils/gl_raii.h"
> 
>@@ -96,13 +97,6 @@ class FramebufferFormatsTest : public ANGLETest
>                                            GLenum attachmentType,
>                                            GLenum internalFormat)
>     {
>-        // TODO(geofflang): Figure out why this is broken on Intel OpenGL
>-        if (IsIntel() && getPlatformRenderer() == EGL_PLATFORM_ANGLE_TYPE_OPENGL_ANGLE)
>-        {
>-            std::cout << "Test skipped on Intel OpenGL." << std::endl;
>-            return;
>-        }
>-
>         int clientVersion = getClientMajorVersion();
>         if (clientVersion < minESVersion)
>         {
>@@ -114,7 +108,7 @@ class FramebufferFormatsTest : public ANGLETest
> 
>         if (clientVersion == 2)
>         {
>-            if (extensionEnabled("ANGLE_framebuffer_multisample"))
>+            if (IsGLExtensionEnabled("ANGLE_framebuffer_multisample"))
>             {
>                 int maxSamples;
>                 glGetIntegerv(GL_MAX_SAMPLES_ANGLE, &maxSamples);
>@@ -199,64 +193,43 @@ class FramebufferFormatsTest : public ANGLETest
> 
> TEST_P(FramebufferFormatsTest, RGBA4)
> {
>-    if (getClientMajorVersion() < 3 && !extensionEnabled("GL_EXT_texture_storage"))
>-    {
>-        std::cout << "Test skipped due to missing ES3 or GL_EXT_texture_storage." << std::endl;
>-        return;
>-    }
>+    ANGLE_SKIP_TEST_IF(getClientMajorVersion() < 3 &&
>+                       !IsGLExtensionEnabled("GL_EXT_texture_storage"));
> 
>     testTextureFormat(GL_RGBA4, 4, 4, 4, 4);
> }
> 
> TEST_P(FramebufferFormatsTest, RGB565)
> {
>-    if (getClientMajorVersion() < 3 && !extensionEnabled("GL_EXT_texture_storage"))
>-    {
>-        std::cout << "Test skipped due to missing ES3 or GL_EXT_texture_storage." << std::endl;
>-        return;
>-    }
>+    ANGLE_SKIP_TEST_IF(getClientMajorVersion() < 3 &&
>+                       !IsGLExtensionEnabled("GL_EXT_texture_storage"));
> 
>     testTextureFormat(GL_RGB565, 5, 6, 5, 0);
> }
> 
> TEST_P(FramebufferFormatsTest, RGB8)
> {
>-    if (getClientMajorVersion() < 3 &&
>-        (!extensionEnabled("GL_OES_rgb8_rgba8") || !extensionEnabled("GL_EXT_texture_storage")))
>-    {
>-        std::cout
>-            << "Test skipped due to missing ES3 or GL_OES_rgb8_rgba8 and GL_EXT_texture_storage."
>-            << std::endl;
>-        return;
>-    }
>+    ANGLE_SKIP_TEST_IF(getClientMajorVersion() < 3 &&
>+                       (!IsGLExtensionEnabled("GL_OES_rgb8_rgba8") ||
>+                        !IsGLExtensionEnabled("GL_EXT_texture_storage")));
> 
>     testTextureFormat(GL_RGB8_OES, 8, 8, 8, 0);
> }
> 
> TEST_P(FramebufferFormatsTest, BGRA8)
> {
>-    if (!extensionEnabled("GL_EXT_texture_format_BGRA8888") ||
>-        (getClientMajorVersion() < 3 && !extensionEnabled("GL_EXT_texture_storage")))
>-    {
>-        std::cout << "Test skipped due to missing GL_EXT_texture_format_BGRA8888 or "
>-                     "GL_EXT_texture_storage."
>-                  << std::endl;
>-        return;
>-    }
>+    ANGLE_SKIP_TEST_IF(
>+        !IsGLExtensionEnabled("GL_EXT_texture_format_BGRA8888") ||
>+        (getClientMajorVersion() < 3 && !IsGLExtensionEnabled("GL_EXT_texture_storage")));
> 
>     testTextureFormat(GL_BGRA8_EXT, 8, 8, 8, 8);
> }
> 
> TEST_P(FramebufferFormatsTest, RGBA8)
> {
>-    if (getClientMajorVersion() < 3 &&
>-        (!extensionEnabled("GL_OES_rgb8_rgba8") || !extensionEnabled("GL_EXT_texture_storage")))
>-    {
>-        std::cout
>-            << "Test skipped due to missing ES3 or GL_OES_rgb8_rgba8 and GL_EXT_texture_storage."
>-            << std::endl;
>-        return;
>-    }
>+    ANGLE_SKIP_TEST_IF(getClientMajorVersion() < 3 &&
>+                       (!IsGLExtensionEnabled("GL_OES_rgb8_rgba8") ||
>+                        !IsGLExtensionEnabled("GL_EXT_texture_storage")));
> 
>     testTextureFormat(GL_RGBA8_OES, 8, 8, 8, 8);
> }
>@@ -273,11 +246,7 @@ TEST_P(FramebufferFormatsTest, RenderbufferMultisample_DEPTH24)
> 
> TEST_P(FramebufferFormatsTest, RenderbufferMultisample_DEPTH32F)
> {
>-    if (getClientMajorVersion() < 3)
>-    {
>-        std::cout << "Test skipped due to missing ES3." << std::endl;
>-        return;
>-    }
>+    ANGLE_SKIP_TEST_IF(getClientMajorVersion() < 3);
> 
>     testRenderbufferMultisampleFormat(3, GL_DEPTH_ATTACHMENT, GL_DEPTH_COMPONENT32F);
> }
>@@ -289,11 +258,7 @@ TEST_P(FramebufferFormatsTest, RenderbufferMultisample_DEPTH24_STENCIL8)
> 
> TEST_P(FramebufferFormatsTest, RenderbufferMultisample_DEPTH32F_STENCIL8)
> {
>-    if (getClientMajorVersion() < 3)
>-    {
>-        std::cout << "Test skipped due to missing ES3." << std::endl;
>-        return;
>-    }
>+    ANGLE_SKIP_TEST_IF(getClientMajorVersion() < 3);
> 
>     testRenderbufferMultisampleFormat(3, GL_DEPTH_STENCIL_ATTACHMENT, GL_DEPTH32F_STENCIL8);
> }
>@@ -301,11 +266,7 @@ TEST_P(FramebufferFormatsTest, RenderbufferMultisample_DEPTH32F_STENCIL8)
> TEST_P(FramebufferFormatsTest, RenderbufferMultisample_STENCIL_INDEX8)
> {
>     // TODO(geofflang): Figure out how to support GLSTENCIL_INDEX8 on desktop GL
>-    if (GetParam().getRenderer() == EGL_PLATFORM_ANGLE_TYPE_OPENGL_ANGLE)
>-    {
>-        std::cout << "Test skipped on Desktop OpenGL." << std::endl;
>-        return;
>-    }
>+    ANGLE_SKIP_TEST_IF(IsDesktopOpenGL());
> 
>     testRenderbufferMultisampleFormat(2, GL_STENCIL_ATTACHMENT, GL_STENCIL_INDEX8);
> }
>@@ -313,6 +274,9 @@ TEST_P(FramebufferFormatsTest, RenderbufferMultisample_STENCIL_INDEX8)
> // Test that binding an incomplete cube map is rejected by ANGLE.
> TEST_P(FramebufferFormatsTest, IncompleteCubeMap)
> {
>+    // http://anglebug.com/3145
>+    ANGLE_SKIP_TEST_IF(IsFuchsia() && IsIntel() && IsVulkan());
>+
>     // First make a complete CubeMap.
>     glGenTextures(1, &mTexture);
>     glBindTexture(GL_TEXTURE_CUBE_MAP, mTexture);
>@@ -345,30 +309,67 @@ TEST_P(FramebufferFormatsTest, IncompleteCubeMap)
>     ASSERT_GLENUM_EQ(GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT,
>                      glCheckFramebufferStatus(GL_FRAMEBUFFER));
> 
>+    ASSERT_GL_NO_ERROR();
>+
>     // Verify drawing with the incomplete framebuffer produces a GL error
>-    const std::string &vs = "attribute vec4 position; void main() { gl_Position = position; }";
>-    const std::string &ps = "void main() { gl_FragColor = vec4(1, 0, 0, 1); }";
>-    mProgram = CompileProgram(vs, ps);
>+    mProgram = CompileProgram(essl1_shaders::vs::Simple(), essl1_shaders::fs::Red());
>     ASSERT_NE(0u, mProgram);
>-    drawQuad(mProgram, "position", 0.5f);
>+    drawQuad(mProgram, essl1_shaders::PositionAttrib(), 0.5f);
>     ASSERT_GL_ERROR(GL_INVALID_FRAMEBUFFER_OPERATION);
> }
> 
> // Test that a renderbuffer with zero height but nonzero width is handled without crashes/asserts.
> TEST_P(FramebufferFormatsTest, ZeroHeightRenderbuffer)
> {
>-    if (getClientMajorVersion() < 3)
>-    {
>-        std::cout << "Test skipped due to missing ES3" << std::endl;
>-        return;
>-    }
>+    ANGLE_SKIP_TEST_IF(getClientMajorVersion() < 3);
> 
>     testZeroHeightRenderbuffer();
> }
> 
>+// Test to cover a bug where the read framebuffer affects the completeness of the draw framebuffer.
>+TEST_P(FramebufferFormatsTest, ReadDrawCompleteness)
>+{
>+    ANGLE_SKIP_TEST_IF(getClientMajorVersion() < 3);
>+
>+    GLTexture incompleteTexture;
>+    glBindTexture(GL_TEXTURE_2D, incompleteTexture);
>+
>+    GLFramebuffer incompleteFBO;
>+    glBindFramebuffer(GL_FRAMEBUFFER, incompleteFBO);
>+    glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, incompleteTexture,
>+                           0);
>+    EXPECT_GLENUM_EQ(GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT,
>+                     glCheckFramebufferStatus(GL_FRAMEBUFFER));
>+
>+    GLTexture completeTexture;
>+    glBindTexture(GL_TEXTURE_2D, completeTexture);
>+    glTexStorage2D(GL_TEXTURE_2D, 1, GL_RGBA8, getWindowWidth(), getWindowHeight());
>+
>+    GLFramebuffer completeFBO;
>+    glBindFramebuffer(GL_DRAW_FRAMEBUFFER, completeFBO);
>+    glFramebufferTexture2D(GL_DRAW_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D,
>+                           completeTexture, 0);
>+
>+    EXPECT_GLENUM_EQ(GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT,
>+                     glCheckFramebufferStatus(GL_READ_FRAMEBUFFER));
>+    EXPECT_GLENUM_EQ(GL_FRAMEBUFFER_COMPLETE, glCheckFramebufferStatus(GL_DRAW_FRAMEBUFFER));
>+
>+    ASSERT_GL_NO_ERROR();
>+
>+    // Simple draw program.
>+    ANGLE_GL_PROGRAM(program, essl1_shaders::vs::Simple(), essl1_shaders::fs::Red());
>+
>+    drawQuad(program, essl1_shaders::PositionAttrib(), 0.5f, 1.0f, true);
>+    EXPECT_GL_NO_ERROR();
>+
>+    glBindFramebuffer(GL_READ_FRAMEBUFFER, completeFBO);
>+    EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::red);
>+}
>+
> // Use this to select which configurations (e.g. which renderer, which GLES major version) these
> // tests should be run against.
> ANGLE_INSTANTIATE_TEST(FramebufferFormatsTest,
>+                       ES2_VULKAN(),
>                        ES2_D3D9(),
>                        ES2_D3D11(),
>                        ES3_D3D11(),
>@@ -378,8 +379,7 @@ ANGLE_INSTANTIATE_TEST(FramebufferFormatsTest,
>                        ES3_OPENGLES());
> 
> class FramebufferTest_ES3 : public ANGLETest
>-{
>-};
>+{};
> 
> // Covers invalidating an incomplete framebuffer. This should be a no-op, but should not error.
> TEST_P(FramebufferTest_ES3, InvalidateIncomplete)
>@@ -536,6 +536,119 @@ TEST_P(FramebufferTest_ES3, AttachmentWith3DLayers)
>     EXPECT_GL_NO_ERROR();
> }
> 
>+// Test that clearing the stencil buffer when the framebuffer only has a color attachment does not
>+// crash.
>+TEST_P(FramebufferTest_ES3, ClearNonexistentStencil)
>+{
>+    GLRenderbuffer rbo;
>+    glBindRenderbuffer(GL_RENDERBUFFER, rbo);
>+    glRenderbufferStorage(GL_RENDERBUFFER, GL_RGBA8, 1, 1);
>+
>+    GLFramebuffer fbo;
>+    glBindFramebuffer(GL_FRAMEBUFFER, fbo);
>+    glFramebufferRenderbuffer(GL_READ_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_RENDERBUFFER, rbo);
>+
>+    GLint clearValue = 0;
>+    glClearBufferiv(GL_STENCIL, 0, &clearValue);
>+
>+    // There's no error specified for clearing nonexistent buffers, it's simply a no-op.
>+    EXPECT_GL_NO_ERROR();
>+}
>+
>+// Test that clearing the depth buffer when the framebuffer only has a color attachment does not
>+// crash.
>+TEST_P(FramebufferTest_ES3, ClearNonexistentDepth)
>+{
>+    GLRenderbuffer rbo;
>+    glBindRenderbuffer(GL_RENDERBUFFER, rbo);
>+    glRenderbufferStorage(GL_RENDERBUFFER, GL_RGBA8, 1, 1);
>+
>+    GLFramebuffer fbo;
>+    glBindFramebuffer(GL_FRAMEBUFFER, fbo);
>+    glFramebufferRenderbuffer(GL_READ_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_RENDERBUFFER, rbo);
>+
>+    GLfloat clearValue = 0.0f;
>+    glClearBufferfv(GL_DEPTH, 0, &clearValue);
>+
>+    // There's no error specified for clearing nonexistent buffers, it's simply a no-op.
>+    EXPECT_GL_NO_ERROR();
>+}
>+
>+// Test that clearing a nonexistent color attachment does not crash.
>+TEST_P(FramebufferTest_ES3, ClearNonexistentColor)
>+{
>+    GLRenderbuffer rbo;
>+    glBindRenderbuffer(GL_RENDERBUFFER, rbo);
>+    glRenderbufferStorage(GL_RENDERBUFFER, GL_RGBA8, 1, 1);
>+
>+    GLFramebuffer fbo;
>+    glBindFramebuffer(GL_FRAMEBUFFER, fbo);
>+    glFramebufferRenderbuffer(GL_READ_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_RENDERBUFFER, rbo);
>+
>+    std::vector<GLfloat> clearValue = {{0.0f, 1.0f, 0.0f, 1.0f}};
>+    glClearBufferfv(GL_COLOR, 1, clearValue.data());
>+
>+    // There's no error specified for clearing nonexistent buffers, it's simply a no-op.
>+    EXPECT_GL_NO_ERROR();
>+}
>+
>+// Test that clearing the depth and stencil buffers when the framebuffer only has a color attachment
>+// does not crash.
>+TEST_P(FramebufferTest_ES3, ClearNonexistentDepthStencil)
>+{
>+    GLRenderbuffer rbo;
>+    glBindRenderbuffer(GL_RENDERBUFFER, rbo);
>+    glRenderbufferStorage(GL_RENDERBUFFER, GL_RGBA8, 1, 1);
>+
>+    GLFramebuffer fbo;
>+    glBindFramebuffer(GL_FRAMEBUFFER, fbo);
>+    glFramebufferRenderbuffer(GL_READ_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_RENDERBUFFER, rbo);
>+
>+    glClearBufferfi(GL_DEPTH_STENCIL, 0, 0.0f, 0);
>+
>+    // There's no error specified for clearing nonexistent buffers, it's simply a no-op.
>+    EXPECT_GL_NO_ERROR();
>+}
>+
>+// Test that clearing a color attachment that has been deleted doesn't crash.
>+TEST_P(FramebufferTest_ES3, ClearDeletedAttachment)
>+{
>+    // An INVALID_FRAMEBUFFER_OPERATION error was seen in this test on Mac, not sure where it might
>+    // be originating from. http://anglebug.com/2834
>+    ANGLE_SKIP_TEST_IF(IsOSX() && IsOpenGL());
>+
>+    GLFramebuffer fbo;
>+    glBindFramebuffer(GL_FRAMEBUFFER, fbo);
>+
>+    // There used to be a bug where some draw buffer state used to remain set even after the
>+    // attachment was detached via deletion. That's why we create, attach and delete this RBO here.
>+    GLuint rbo = 0u;
>+    glGenRenderbuffers(1, &rbo);
>+    glBindRenderbuffer(GL_RENDERBUFFER, rbo);
>+    glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_RENDERBUFFER, rbo);
>+    glDeleteRenderbuffers(1, &rbo);
>+
>+    // There needs to be at least one color attachment to prevent early out from the clear calls.
>+    GLRenderbuffer rbo2;
>+    glBindRenderbuffer(GL_RENDERBUFFER, rbo2);
>+    glRenderbufferStorage(GL_RENDERBUFFER, GL_RGBA8, 1, 1);
>+    glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT1, GL_RENDERBUFFER, rbo2);
>+
>+    ASSERT_GL_NO_ERROR();
>+
>+    // There's no error specified for clearing nonexistent buffers, it's simply a no-op, so we
>+    // expect no GL errors below.
>+    std::array<GLfloat, 4> floatClearValue = {0.0f, 0.0f, 0.0f, 0.0f};
>+    glClearBufferfv(GL_COLOR, 0, floatClearValue.data());
>+    EXPECT_GL_NO_ERROR();
>+    std::array<GLuint, 4> uintClearValue = {0u, 0u, 0u, 0u};
>+    glClearBufferuiv(GL_COLOR, 0, uintClearValue.data());
>+    EXPECT_GL_NO_ERROR();
>+    std::array<GLint, 4> intClearValue = {0, 0, 0, 0};
>+    glClearBufferiv(GL_COLOR, 0, intClearValue.data());
>+    EXPECT_GL_NO_ERROR();
>+}
>+
> ANGLE_INSTANTIATE_TEST(FramebufferTest_ES3, ES3_D3D11(), ES3_OPENGL(), ES3_OPENGLES());
> 
> class FramebufferTest_ES31 : public ANGLETest
>@@ -692,27 +805,45 @@ TEST_P(FramebufferTest_ES31, RenderingLimitToDefaultFBOSizeWithNoAttachments)
>     // anglebug.com/2253
>     ANGLE_SKIP_TEST_IF(IsLinux() && IsAMD() && IsDesktopOpenGL());
> 
>-    const std::string &vertexShader =
>-        "#version 310 es\n"
>-        "in layout(location = 0) highp vec2 a_position;\n\n"
>-        "void main()\n"
>-        "{\n"
>-        "   gl_Position = vec4(a_position, 0.0, 1.0);\n"
>-        "}\n";
>-    const std::string &fragShader =
>-        "#version 310 es\n"
>-        "uniform layout(location = 0) highp ivec2 u_expectedSize;\n"
>-        "out layout(location = 5) mediump vec4 f_color;\n\n"
>-        "void main()\n"
>-        "{\n"
>-        "   if (ivec2(gl_FragCoord.xy) != u_expectedSize) discard;\n"
>-        "   f_color = vec4(1.0, 0.5, 0.25, 1.0);\n"
>-        "}\n";
>-
>-    GLuint program = CompileProgram(vertexShader, fragShader);
>-    ASSERT_NE(program, 0u);
>-
>-    glUseProgram(program);
>+    constexpr char kVS1[] = R"(#version 310 es
>+in layout(location = 0) highp vec2 a_position;
>+void main()
>+{
>+    gl_Position = vec4(a_position, 0.0, 1.0);
>+})";
>+
>+    constexpr char kFS1[] = R"(#version 310 es
>+uniform layout(location = 0) highp ivec2 u_expectedSize;
>+out layout(location = 5) mediump vec4 f_color;
>+void main()
>+{
>+    if (ivec2(gl_FragCoord.xy) != u_expectedSize) discard;
>+    f_color = vec4(1.0, 0.5, 0.25, 1.0);
>+})";
>+
>+    constexpr char kVS2[] = R"(#version 310 es
>+in layout(location = 0) highp vec2 a_position;
>+void main()
>+{
>+    gl_Position = vec4(a_position, 0.0, 1.0);
>+})";
>+
>+    constexpr char kFS2[] = R"(#version 310 es
>+uniform layout(location = 0) highp ivec2 u_expectedSize;
>+out layout(location = 2) mediump vec4 f_color;
>+void main()
>+{
>+    if (ivec2(gl_FragCoord.xy) != u_expectedSize) discard;
>+    f_color = vec4(1.0, 0.5, 0.25, 1.0);
>+})";
>+
>+    GLuint program1 = CompileProgram(kVS1, kFS1);
>+    ASSERT_NE(program1, 0u);
>+
>+    GLuint program2 = CompileProgram(kVS2, kFS2);
>+    ASSERT_NE(program2, 0u);
>+
>+    glUseProgram(program1);
> 
>     GLFramebuffer mFramebuffer;
>     glBindFramebuffer(GL_DRAW_FRAMEBUFFER, mFramebuffer);
>@@ -746,6 +877,10 @@ TEST_P(FramebufferTest_ES31, RenderingLimitToDefaultFBOSizeWithNoAttachments)
> 
>     validateSamplePass(query, passedCount, defaultWidth, defaultHeight);
> 
>+    glUseProgram(program2);
>+    validateSamplePass(query, passedCount, defaultWidth, defaultHeight);
>+
>+    glUseProgram(program1);
>     // If fbo has attachments, the rendering size should be the same as its attachment.
>     GLTexture mTexture;
>     GLuint width  = 2;
>@@ -779,3 +914,39 @@ TEST_P(FramebufferTest_ES31, RenderingLimitToDefaultFBOSizeWithNoAttachments)
> }
> 
> ANGLE_INSTANTIATE_TEST(FramebufferTest_ES31, ES31_D3D11(), ES31_OPENGL(), ES31_OPENGLES());
>+
>+class AddDummyTextureNoRenderTargetTest : public ANGLETest
>+{
>+  public:
>+    AddDummyTextureNoRenderTargetTest()
>+    {
>+        setWindowWidth(512);
>+        setWindowHeight(512);
>+        setConfigRedBits(8);
>+        setConfigGreenBits(8);
>+        setConfigBlueBits(8);
>+        setConfigAlphaBits(8);
>+    }
>+
>+    void overrideWorkaroundsD3D(WorkaroundsD3D *workarounds) override
>+    {
>+        workarounds->addDummyTextureNoRenderTarget = true;
>+    }
>+};
>+
>+// Test to verify workaround succeeds when no program outputs exist http://anglebug.com/2283
>+TEST_P(AddDummyTextureNoRenderTargetTest, NoProgramOutputWorkaround)
>+{
>+    constexpr char kVS[] = "void main() {}";
>+    constexpr char kFS[] = "void main() {}";
>+
>+    ANGLE_GL_PROGRAM(drawProgram, kVS, kFS);
>+
>+    glUseProgram(drawProgram);
>+
>+    glDrawArrays(GL_TRIANGLES, 0, 6);
>+
>+    ASSERT_GL_NO_ERROR();
>+}
>+
>+ANGLE_INSTANTIATE_TEST(AddDummyTextureNoRenderTargetTest, ES2_D3D11());
>diff --git a/Source/ThirdParty/ANGLE/src/tests/gl_tests/GLSLTest.cpp b/Source/ThirdParty/ANGLE/src/tests/gl_tests/GLSLTest.cpp
>index d130d632e8c..b20fcbac630 100644
>--- a/Source/ThirdParty/ANGLE/src/tests/gl_tests/GLSLTest.cpp
>+++ b/Source/ThirdParty/ANGLE/src/tests/gl_tests/GLSLTest.cpp
>@@ -26,17 +26,7 @@ class GLSLTest : public ANGLETest
>         setConfigAlphaBits(8);
>     }
> 
>-    virtual void SetUp()
>-    {
>-        ANGLETest::SetUp();
>-
>-        mSimpleVSSource =
>-            R"(attribute vec4 inputAttribute;
>-            void main()
>-            {
>-                gl_Position = inputAttribute;
>-            })";
>-    }
>+    virtual void SetUp() { ANGLETest::SetUp(); }
> 
>     std::string GenerateVaryingType(GLint vectorSize)
>     {
>@@ -64,7 +54,8 @@ class GLSLTest : public ANGLETest
>         }
>         else
>         {
>-            sprintf(buff, "varying %s v%d[%d];\n", GenerateVaryingType(vectorSize).c_str(), id, arraySize);
>+            sprintf(buff, "varying %s v%d[%d];\n", GenerateVaryingType(vectorSize).c_str(), id,
>+                    arraySize);
>         }
> 
>         return std::string(buff);
>@@ -84,7 +75,8 @@ class GLSLTest : public ANGLETest
>         {
>             for (int i = 0; i < arraySize; i++)
>             {
>-                sprintf(buff, "\t v%d[%d] = %s(1.0);\n", id, i, GenerateVaryingType(vectorSize).c_str());
>+                sprintf(buff, "\t v%d[%d] = %s(1.0);\n", id, i,
>+                        GenerateVaryingType(vectorSize).c_str());
>                 returnString += buff;
>             }
>         }
>@@ -113,11 +105,22 @@ class GLSLTest : public ANGLETest
>         }
>     }
> 
>-    void GenerateGLSLWithVaryings(GLint floatCount, GLint floatArrayCount, GLint vec2Count, GLint vec2ArrayCount, GLint vec3Count, GLint vec3ArrayCount,
>-                                  GLint vec4Count, GLint vec4ArrayCount, bool useFragCoord, bool usePointCoord, bool usePointSize,
>-                                  std::string* fragmentShader, std::string* vertexShader)
>+    void GenerateGLSLWithVaryings(GLint floatCount,
>+                                  GLint floatArrayCount,
>+                                  GLint vec2Count,
>+                                  GLint vec2ArrayCount,
>+                                  GLint vec3Count,
>+                                  GLint vec3ArrayCount,
>+                                  GLint vec4Count,
>+                                  GLint vec4ArrayCount,
>+                                  bool useFragCoord,
>+                                  bool usePointCoord,
>+                                  bool usePointSize,
>+                                  std::string *fragmentShader,
>+                                  std::string *vertexShader)
>     {
>-        // Generate a string declaring the varyings, to share between the fragment shader and the vertex shader.
>+        // Generate a string declaring the varyings, to share between the fragment shader and the
>+        // vertex shader.
>         std::string varyingDeclaration;
> 
>         unsigned int varyingCount = 0;
>@@ -310,7 +313,7 @@ class GLSLTest : public ANGLETest
> 
>         // Set gl_FragColor, and use special variables if requested
>         fragmentShader->append("\tgl_FragColor = retColor");
>-        
>+
>         if (useFragCoord)
>         {
>             fragmentShader->append(" + gl_FragCoord");
>@@ -324,17 +327,28 @@ class GLSLTest : public ANGLETest
>         fragmentShader->append(";\n}");
>     }
> 
>-    void VaryingTestBase(GLint floatCount, GLint floatArrayCount, GLint vec2Count, GLint vec2ArrayCount, GLint vec3Count, GLint vec3ArrayCount,
>-                         GLint vec4Count, GLint vec4ArrayCount, bool useFragCoord, bool usePointCoord, bool usePointSize, bool expectSuccess)
>+    void VaryingTestBase(GLint floatCount,
>+                         GLint floatArrayCount,
>+                         GLint vec2Count,
>+                         GLint vec2ArrayCount,
>+                         GLint vec3Count,
>+                         GLint vec3ArrayCount,
>+                         GLint vec4Count,
>+                         GLint vec4ArrayCount,
>+                         bool useFragCoord,
>+                         bool usePointCoord,
>+                         bool usePointSize,
>+                         bool expectSuccess)
>     {
>         std::string fragmentShaderSource;
>         std::string vertexShaderSource;
> 
>-        GenerateGLSLWithVaryings(floatCount, floatArrayCount, vec2Count, vec2ArrayCount, vec3Count, vec3ArrayCount,
>-                                 vec4Count, vec4ArrayCount, useFragCoord, usePointCoord, usePointSize,
>-                                 &fragmentShaderSource, &vertexShaderSource);
>+        GenerateGLSLWithVaryings(floatCount, floatArrayCount, vec2Count, vec2ArrayCount, vec3Count,
>+                                 vec3ArrayCount, vec4Count, vec4ArrayCount, useFragCoord,
>+                                 usePointCoord, usePointSize, &fragmentShaderSource,
>+                                 &vertexShaderSource);
> 
>-        GLuint program = CompileProgram(vertexShaderSource, fragmentShaderSource);
>+        GLuint program = CompileProgram(vertexShaderSource.c_str(), fragmentShaderSource.c_str());
> 
>         if (expectSuccess)
>         {
>@@ -419,7 +433,7 @@ class GLSLTest : public ANGLETest
> 
>         fragmentShader << "}\n";
> 
>-        GLuint program = CompileProgram(vertexShader.str(), fragmentShader.str());
>+        GLuint program = CompileProgram(vertexShader.str().c_str(), fragmentShader.str().c_str());
> 
>         if (expectSuccess)
>         {
>@@ -431,7 +445,51 @@ class GLSLTest : public ANGLETest
>         }
>     }
> 
>-    std::string mSimpleVSSource;
>+    std::string QueryErrorMessage(GLuint program)
>+    {
>+        GLint infoLogLength;
>+        glGetProgramiv(program, GL_INFO_LOG_LENGTH, &infoLogLength);
>+        EXPECT_GL_NO_ERROR();
>+
>+        if (infoLogLength >= 1)
>+        {
>+            std::vector<GLchar> infoLog(infoLogLength);
>+            glGetProgramInfoLog(program, static_cast<GLsizei>(infoLog.size()), nullptr,
>+                                infoLog.data());
>+            EXPECT_GL_NO_ERROR();
>+            return infoLog.data();
>+        }
>+
>+        return "";
>+    }
>+
>+    void validateComponentsInErrorMessage(const char *vertexShader,
>+                                          const char *fragmentShader,
>+                                          const char *expectedErrorType,
>+                                          const char *expectedVariableFullName)
>+    {
>+        GLuint vs = CompileShader(GL_VERTEX_SHADER, vertexShader);
>+        GLuint fs = CompileShader(GL_FRAGMENT_SHADER, fragmentShader);
>+
>+        GLuint program = glCreateProgram();
>+        glAttachShader(program, vs);
>+        glAttachShader(program, fs);
>+        glLinkProgram(program);
>+
>+        glDetachShader(program, vs);
>+        glDetachShader(program, fs);
>+        glDeleteShader(vs);
>+        glDeleteShader(fs);
>+
>+        const std::string &errorMessage = QueryErrorMessage(program);
>+        printf("%s\n", errorMessage.c_str());
>+
>+        EXPECT_NE(std::string::npos, errorMessage.find(expectedErrorType));
>+        EXPECT_NE(std::string::npos, errorMessage.find(expectedVariableFullName));
>+
>+        glDeleteProgram(program);
>+        ASSERT_GL_NO_ERROR();
>+    }
> };
> 
> class GLSLTestNoValidation : public GLSLTest
>@@ -442,53 +500,29 @@ class GLSLTestNoValidation : public GLSLTest
> 
> class GLSLTest_ES3 : public GLSLTest
> {
>-    void SetUp() override
>-    {
>-        ANGLETest::SetUp();
>-
>-        mSimpleVSSource =
>-            R"(#version 300 es
>-            in vec4 inputAttribute;
>-            void main()
>-            {
>-                gl_Position = inputAttribute;
>-            })";
>-    }
>+    void SetUp() override { ANGLETest::SetUp(); }
> };
> 
> class GLSLTest_ES31 : public GLSLTest
> {
>-    void SetUp() override
>-    {
>-        ANGLETest::SetUp();
>-
>-        mSimpleVSSource =
>-            R"(#version 310 es
>-            in vec4 inputAttribute;
>-            void main()
>-            {
>-                gl_Position = inputAttribute;
>-            })";
>-    }
>+    void SetUp() override { ANGLETest::SetUp(); }
> };
> 
> TEST_P(GLSLTest, NamelessScopedStructs)
> {
>-    const std::string fragmentShaderSource =
>-        R"(precision mediump float;
>-        void main()
>-        {
>-            struct
>-            {
>-                float q;
>-            } b;
>+    constexpr char kFS[] = R"(precision mediump float;
>+void main()
>+{
>+    struct
>+    {
>+        float q;
>+    } b;
> 
>-            gl_FragColor = vec4(1, 0, 0, 1);
>-            gl_FragColor.a += b.q;
>-        })";
>+    gl_FragColor = vec4(1, 0, 0, 1);
>+    gl_FragColor.a += b.q;
>+})";
> 
>-    GLuint program = CompileProgram(mSimpleVSSource, fragmentShaderSource);
>-    EXPECT_NE(0u, program);
>+    ANGLE_GL_PROGRAM(program, essl1_shaders::vs::Simple(), kFS);
> }
> 
> TEST_P(GLSLTest, ScopedStructsOrderBug)
>@@ -497,98 +531,250 @@ TEST_P(GLSLTest, ScopedStructsOrderBug)
>     // (http://anglebug.com/1292)
>     // TODO(geofflang): Find out why this doesn't compile on AMD OpenGL drivers
>     // (http://anglebug.com/1291)
>-    if (IsDesktopOpenGL() && (IsOSX() || !IsNVIDIA()))
>-    {
>-        std::cout << "Test disabled on this OpenGL configuration." << std::endl;
>-        return;
>-    }
>+    ANGLE_SKIP_TEST_IF(IsDesktopOpenGL() && (IsOSX() || !IsNVIDIA()));
> 
>-    const std::string fragmentShaderSource =
>-        R"(precision mediump float;
>+    constexpr char kFS[] = R"(precision mediump float;
> 
>-        struct T
>-        {
>-            float f;
>-        };
>+struct T
>+{
>+    float f;
>+};
> 
>-        void main()
>-        {
>-            T a;
>+void main()
>+{
>+    T a;
> 
>-            struct T
>-            {
>-                float q;
>-            };
>+    struct T
>+    {
>+        float q;
>+    };
> 
>-            T b;
>+    T b;
> 
>-            gl_FragColor = vec4(1, 0, 0, 1);
>-            gl_FragColor.a += a.f;
>-            gl_FragColor.a += b.q;
>-        })";
>+    gl_FragColor = vec4(1, 0, 0, 1);
>+    gl_FragColor.a += a.f;
>+    gl_FragColor.a += b.q;
>+})";
> 
>-    GLuint program = CompileProgram(mSimpleVSSource, fragmentShaderSource);
>-    EXPECT_NE(0u, program);
>+    ANGLE_GL_PROGRAM(program, essl1_shaders::vs::Simple(), kFS);
> }
> 
> TEST_P(GLSLTest, ScopedStructsBug)
> {
>-    const std::string fragmentShaderSource =
>-        R"(precision mediump float;
>+    constexpr char kFS[] = R"(precision mediump float;
> 
>-        struct T_0
>-        {
>-            float f;
>-        };
>+struct T_0
>+{
>+    float f;
>+};
> 
>-        void main()
>-        {
>-            gl_FragColor = vec4(1, 0, 0, 1);
>+void main()
>+{
>+    gl_FragColor = vec4(1, 0, 0, 1);
> 
>-            struct T
>-            {
>-                vec2 v;
>-            };
>+    struct T
>+    {
>+        vec2 v;
>+    };
> 
>-            T_0 a;
>-            T b;
>+    T_0 a;
>+    T b;
> 
>-            gl_FragColor.a += a.f;
>-            gl_FragColor.a += b.v.x;
>-        })";
>+    gl_FragColor.a += a.f;
>+    gl_FragColor.a += b.v.x;
>+})";
> 
>-    GLuint program = CompileProgram(mSimpleVSSource, fragmentShaderSource);
>-    EXPECT_NE(0u, program);
>+    ANGLE_GL_PROGRAM(program, essl1_shaders::vs::Simple(), kFS);
> }
> 
> TEST_P(GLSLTest, DxPositionBug)
> {
>-    const std::string &vertexShaderSource =
>-        R"(attribute vec4 inputAttribute;
>-        varying float dx_Position;
>-        void main()
>-        {
>-            gl_Position = vec4(inputAttribute);
>-            dx_Position = 0.0;
>-        })";
>+    constexpr char kVS[] = R"(attribute vec4 inputAttribute;
>+varying float dx_Position;
>+void main()
>+{
>+    gl_Position = vec4(inputAttribute);
>+    dx_Position = 0.0;
>+})";
>+
>+    constexpr char kFS[] = R"(precision mediump float;
>+
>+varying float dx_Position;
>+
>+void main()
>+{
>+    gl_FragColor = vec4(dx_Position, 0, 0, 1);
>+})";
>+
>+    ANGLE_GL_PROGRAM(program, kVS, kFS);
>+}
>+
>+// Draw an array of points with the first vertex offset at 0 using gl_VertexID
>+TEST_P(GLSLTest_ES3, GLVertexIDOffsetZeroDrawArray)
>+{
>+    // TODO(syoussefi): missing ES3 shader feature support.  http://anglebug.com/3221
>+    ANGLE_SKIP_TEST_IF(IsVulkan());
> 
>-    const std::string &fragmentShaderSource =
>-        R"(precision mediump float;
>+    constexpr int kStartIndex  = 0;
>+    constexpr int kArrayLength = 5;
>+    constexpr char kVS[]       = R"(#version 300 es
>+precision highp float;
>+void main() {
>+    gl_Position = vec4(float(gl_VertexID)/10.0, 0, 0, 1);
>+    gl_PointSize = 3.0;
>+})";
> 
>-        varying float dx_Position;
>+    constexpr char kFS[] = R"(#version 300 es
>+precision highp float;
>+out vec4 outColor;
>+void main() {
>+    outColor = vec4(255.0, 0.0, 0.0, 1.0);
>+})";
> 
>-        void main()
>+    ANGLE_GL_PROGRAM(program, kVS, kFS);
>+
>+    glUseProgram(program);
>+    glDrawArrays(GL_POINTS, kStartIndex, kArrayLength);
>+
>+    double pointCenterX = static_cast<double>(getWindowWidth()) / 2.0;
>+    double pointCenterY = static_cast<double>(getWindowHeight()) / 2.0;
>+    for (int i = kStartIndex; i < kStartIndex + kArrayLength; i++)
>+    {
>+        double pointOffsetX = static_cast<double>(i * getWindowWidth()) / 20.0;
>+        EXPECT_PIXEL_COLOR_EQ(static_cast<int>(pointCenterX + pointOffsetX),
>+                              static_cast<int>(pointCenterY), GLColor::red);
>+    }
>+}
>+
>+// Helper function for the GLVertexIDIntegerTextureDrawArrays test
>+void GLVertexIDIntegerTextureDrawArrays_helper(int first, int count, GLenum err)
>+{
>+    glDrawArrays(GL_POINTS, first, count);
>+
>+    int pixel[4];
>+    glReadPixels(0, 0, 1, 1, GL_RGBA_INTEGER, GL_INT, pixel);
>+    // If we call this function with err as GL_NO_ERROR, then we expect no error and check the
>+    // pixels.
>+    if (err == static_cast<GLenum>(GL_NO_ERROR))
>+    {
>+        EXPECT_GL_NO_ERROR();
>+        EXPECT_EQ(pixel[0], first + count - 1);
>+    }
>+    else
>+    {
>+        // If we call this function with err set, we will allow the error, but check the pixels if
>+        // the error hasn't occurred.
>+        GLenum glError = glGetError();
>+        if (glError == err || glError == static_cast<GLenum>(GL_NO_ERROR))
>         {
>-            gl_FragColor = vec4(dx_Position, 0, 0, 1);
>-        })";
>+            EXPECT_EQ(pixel[0], first + count - 1);
>+        }
>+    }
>+}
> 
>-    GLuint program = CompileProgram(vertexShaderSource, fragmentShaderSource);
>-    EXPECT_NE(0u, program);
>+// Ensure gl_VertexID gets passed to an integer texture properly when drawArrays is called. This
>+// is based off the WebGL test:
>+// https://github.com/KhronosGroup/WebGL/blob/master/sdk/tests/conformance2/rendering/vertex-id.html
>+TEST_P(GLSLTest_ES3, GLVertexIDIntegerTextureDrawArrays)
>+{
>+    // TODO(syoussefi): missing ES3 shader feature support.  http://anglebug.com/3221
>+    ANGLE_SKIP_TEST_IF(IsVulkan());
>+
>+    // Have to set a large point size because the window size is much larger than the texture
>+    constexpr char kVS[] = R"(#version 300 es
>+flat out highp int vVertexID;
>+void main() {
>+    vVertexID = gl_VertexID;
>+    gl_Position = vec4(0,0,0,1);
>+    gl_PointSize = 1000.0;
>+})";
>+
>+    constexpr char kFS[] = R"(#version 300 es
>+flat in highp int vVertexID;
>+out highp int oVertexID;
>+void main() {
>+    oVertexID = vVertexID;
>+})";
>+
>+    ANGLE_GL_PROGRAM(program, kVS, kFS);
>+    glUseProgram(program);
>+
>+    GLTexture texture;
>+    glBindTexture(GL_TEXTURE_2D, texture);
>+    glTexStorage2D(GL_TEXTURE_2D, 1, GL_R32I, 1, 1);
>+    GLFramebuffer fbo;
>+    glBindFramebuffer(GL_FRAMEBUFFER, fbo);
>+    glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, texture, 0);
>+    ASSERT_GLENUM_EQ(GL_FRAMEBUFFER_COMPLETE, glCheckFramebufferStatus(GL_FRAMEBUFFER));
>+    EXPECT_GL_NO_ERROR();
>+
>+    // Clear the texture to 42 to ensure the first test case doesn't accidentally pass
>+    GLint val = 42;
>+    glClearBufferiv(GL_COLOR, 0, &val);
>+    int pixel[4];
>+    glReadPixels(0, 0, 1, 1, GL_RGBA_INTEGER, GL_INT, pixel);
>+    EXPECT_EQ(pixel[0], val);
>+
>+    GLVertexIDIntegerTextureDrawArrays_helper(0, 1, GL_NO_ERROR);
>+    GLVertexIDIntegerTextureDrawArrays_helper(1, 1, GL_NO_ERROR);
>+    GLVertexIDIntegerTextureDrawArrays_helper(10000, 1, GL_NO_ERROR);
>+    GLVertexIDIntegerTextureDrawArrays_helper(100000, 1, GL_NO_ERROR);
>+    GLVertexIDIntegerTextureDrawArrays_helper(1000000, 1, GL_NO_ERROR);
>+    GLVertexIDIntegerTextureDrawArrays_helper(0, 2, GL_NO_ERROR);
>+    GLVertexIDIntegerTextureDrawArrays_helper(1, 2, GL_NO_ERROR);
>+    GLVertexIDIntegerTextureDrawArrays_helper(10000, 2, GL_NO_ERROR);
>+    GLVertexIDIntegerTextureDrawArrays_helper(100000, 2, GL_NO_ERROR);
>+    GLVertexIDIntegerTextureDrawArrays_helper(1000000, 2, GL_NO_ERROR);
>+
>+    int32_t int32Max = 0x7FFFFFFF;
>+    GLVertexIDIntegerTextureDrawArrays_helper(int32Max - 2, 1, GL_OUT_OF_MEMORY);
>+    GLVertexIDIntegerTextureDrawArrays_helper(int32Max - 1, 1, GL_OUT_OF_MEMORY);
>+    GLVertexIDIntegerTextureDrawArrays_helper(int32Max, 1, GL_OUT_OF_MEMORY);
>+}
>+
>+// Draw an array of points with the first vertex offset at 5 using gl_VertexID
>+TEST_P(GLSLTest_ES3, GLVertexIDOffsetFiveDrawArray)
>+{
>+    // Bug in Nexus drivers, offset does not work. (anglebug.com/3264)
>+    ANGLE_SKIP_TEST_IF((IsNexus5X() || IsNexus6P()) && IsOpenGLES());
>+
>+    // TODO(syoussefi): missing ES3 shader feature support.  http://anglebug.com/3221
>+    ANGLE_SKIP_TEST_IF(IsVulkan());
>+
>+    constexpr int kStartIndex  = 5;
>+    constexpr int kArrayLength = 5;
>+    constexpr char kVS[]       = R"(#version 300 es
>+precision highp float;
>+void main() {
>+    gl_Position = vec4(float(gl_VertexID)/10.0, 0, 0, 1);
>+    gl_PointSize = 3.0;
>+})";
>+
>+    constexpr char kFS[] = R"(#version 300 es
>+precision highp float;
>+out vec4 outColor;
>+void main() {
>+    outColor = vec4(255.0, 0.0, 0.0, 1.0);
>+})";
>+
>+    ANGLE_GL_PROGRAM(program, kVS, kFS);
>+
>+    glUseProgram(program);
>+    glDrawArrays(GL_POINTS, kStartIndex, kArrayLength);
>+
>+    double pointCenterX = static_cast<double>(getWindowWidth()) / 2.0;
>+    double pointCenterY = static_cast<double>(getWindowHeight()) / 2.0;
>+    for (int i = kStartIndex; i < kStartIndex + kArrayLength; i++)
>+    {
>+        double pointOffsetX = static_cast<double>(i * getWindowWidth()) / 20.0;
>+        EXPECT_PIXEL_COLOR_EQ(static_cast<int>(pointCenterX + pointOffsetX),
>+                              static_cast<int>(pointCenterY), GLColor::red);
>+    }
> }
> 
> TEST_P(GLSLTest, ElseIfRewriting)
> {
>-    const std::string &vertexShaderSource =
>+    constexpr char kVS[] =
>         "attribute vec4 a_position;\n"
>         "varying float v;\n"
>         "void main() {\n"
>@@ -601,7 +787,7 @@ TEST_P(GLSLTest, ElseIfRewriting)
>         "  }\n"
>         "}\n";
> 
>-    const std::string &fragmentShaderSource =
>+    constexpr char kFS[] =
>         "precision highp float;\n"
>         "varying float v;\n"
>         "void main() {\n"
>@@ -611,18 +797,17 @@ TEST_P(GLSLTest, ElseIfRewriting)
>         "  gl_FragColor = color;\n"
>         "}\n";
> 
>-    GLuint program = CompileProgram(vertexShaderSource, fragmentShaderSource);
>-    ASSERT_NE(0u, program);
>+    ANGLE_GL_PROGRAM(program, kVS, kFS);
> 
>     drawQuad(program, "a_position", 0.5f);
> 
>     EXPECT_PIXEL_EQ(0, 0, 255, 0, 0, 255);
>-    EXPECT_PIXEL_EQ(getWindowWidth()-1, 0, 0, 255, 0, 255);
>+    EXPECT_PIXEL_EQ(getWindowWidth() - 1, 0, 0, 255, 0, 255);
> }
> 
> TEST_P(GLSLTest, TwoElseIfRewriting)
> {
>-    const std::string &vertexShaderSource =
>+    constexpr char kVS[] =
>         "attribute vec4 a_position;\n"
>         "varying float v;\n"
>         "void main() {\n"
>@@ -636,49 +821,46 @@ TEST_P(GLSLTest, TwoElseIfRewriting)
>         "  }\n"
>         "}\n";
> 
>-    const std::string &fragmentShaderSource =
>+    constexpr char kFS[] =
>         "precision highp float;\n"
>         "varying float v;\n"
>         "void main() {\n"
>         "  gl_FragColor = vec4(v, 0.0, 0.0, 1.0);\n"
>         "}\n";
> 
>-    GLuint program = CompileProgram(vertexShaderSource, fragmentShaderSource);
>-    EXPECT_NE(0u, program);
>+    ANGLE_GL_PROGRAM(program, kVS, kFS);
> }
> 
> TEST_P(GLSLTest, FrontFacingAndVarying)
> {
>     EGLPlatformParameters platform = GetParam().eglParameters;
> 
>-    const std::string vertexShaderSource =
>-        R"(attribute vec4 a_position;
>-        varying float v_varying;
>-        void main()
>-        {
>-            v_varying = a_position.x;
>-            gl_Position = a_position;
>-        })";
>-
>-    const std::string fragmentShaderSource =
>-        R"(precision mediump float;
>-        varying float v_varying;
>-        void main()
>-        {
>-            vec4 c;
>+    constexpr char kVS[] = R"(attribute vec4 a_position;
>+varying float v_varying;
>+void main()
>+{
>+    v_varying = a_position.x;
>+    gl_Position = a_position;
>+})";
> 
>-            if (gl_FrontFacing)
>-            {
>-                c = vec4(v_varying, 0, 0, 1.0);
>-            }
>-            else
>-            {
>-                c = vec4(0, v_varying, 0, 1.0);
>-            }
>-            gl_FragColor = c;
>-        })";
>+    constexpr char kFS[] = R"(precision mediump float;
>+varying float v_varying;
>+void main()
>+{
>+    vec4 c;
>+
>+    if (gl_FrontFacing)
>+    {
>+        c = vec4(v_varying, 0, 0, 1.0);
>+    }
>+    else
>+    {
>+        c = vec4(0, v_varying, 0, 1.0);
>+    }
>+    gl_FragColor = c;
>+})";
> 
>-    GLuint program = CompileProgram(vertexShaderSource, fragmentShaderSource);
>+    GLuint program = CompileProgram(kVS, kFS);
> 
>     // Compilation should fail on D3D11 feature level 9_3, since gl_FrontFacing isn't supported.
>     if (platform.renderer == EGL_PLATFORM_ANGLE_TYPE_D3D11_ANGLE)
>@@ -697,13 +879,9 @@ TEST_P(GLSLTest, FrontFacingAndVarying)
> // Test that we can release the shader compiler and still compile things properly.
> TEST_P(GLSLTest, ReleaseCompilerThenCompile)
> {
>-    const std::string &simpleVS =
>-        "attribute vec4 position; void main() { gl_Position = position; }";
>-    const std::string &simpleFS = "void main() { gl_FragColor = vec4(1, 0, 0, 1); }";
>-
>     // Draw with the first program.
>-    ANGLE_GL_PROGRAM(program1, simpleVS, simpleFS);
>-    drawQuad(program1, "position", 0.5f);
>+    ANGLE_GL_PROGRAM(program1, essl1_shaders::vs::Simple(), essl1_shaders::fs::Red());
>+    drawQuad(program1, essl1_shaders::PositionAttrib(), 0.5f);
>     ASSERT_GL_NO_ERROR();
>     EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::red);
> 
>@@ -715,8 +893,8 @@ TEST_P(GLSLTest, ReleaseCompilerThenCompile)
>     ASSERT_GL_NO_ERROR();
> 
>     // Draw with a second program.
>-    ANGLE_GL_PROGRAM(program2, simpleVS, simpleFS);
>-    drawQuad(program2, "position", 0.5f);
>+    ANGLE_GL_PROGRAM(program2, essl1_shaders::vs::Simple(), essl1_shaders::fs::Red());
>+    drawQuad(program2, essl1_shaders::PositionAttrib(), 0.5f);
>     ASSERT_GL_NO_ERROR();
>     EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::red);
> }
>@@ -724,50 +902,27 @@ TEST_P(GLSLTest, ReleaseCompilerThenCompile)
> // Verify that linking shaders declaring different shading language versions fails.
> TEST_P(GLSLTest_ES3, VersionMismatch)
> {
>-    const std::string fragmentShaderSource100 =
>-        "precision mediump float;\n"
>-        "varying float v_varying;\n"
>-        "void main() { gl_FragColor = vec4(v_varying, 0, 0, 1.0); }\n";
>-
>-    const std::string vertexShaderSource100 =
>-        "attribute vec4 a_position;\n"
>-        "varying float v_varying;\n"
>-        "void main() { v_varying = a_position.x; gl_Position = a_position; }\n";
>-
>-    const std::string fragmentShaderSource300 =
>-        "#version 300 es\n"
>-        "precision mediump float;\n"
>-        "in float v_varying;\n"
>-        "out vec4 my_FragColor;\n"
>-        "void main() { my_FragColor = vec4(v_varying, 0, 0, 1.0); }\n";
>-
>-    const std::string vertexShaderSource300 =
>-        "#version 300 es\n"
>-        "in vec4 a_position;\n"
>-        "out float v_varying;\n"
>-        "void main() { v_varying = a_position.x; gl_Position = a_position; }\n";
>-
>-    GLuint program = CompileProgram(vertexShaderSource300, fragmentShaderSource100);
>+    GLuint program = CompileProgram(essl3_shaders::vs::Simple(), essl1_shaders::fs::Red());
>     EXPECT_EQ(0u, program);
> 
>-    program = CompileProgram(vertexShaderSource100, fragmentShaderSource300);
>+    program = CompileProgram(essl1_shaders::vs::Simple(), essl3_shaders::fs::Red());
>     EXPECT_EQ(0u, program);
> }
> 
> // Verify that declaring varying as invariant only in vertex shader fails in ESSL 1.00.
> TEST_P(GLSLTest, InvariantVaryingOut)
> {
>-    const std::string fragmentShaderSource =
>+    constexpr char kFS[] =
>         "precision mediump float;\n"
>         "varying float v_varying;\n"
>         "void main() { gl_FragColor = vec4(v_varying, 0, 0, 1.0); }\n";
> 
>-    const std::string vertexShaderSource =
>+    constexpr char kVS[] =
>         "attribute vec4 a_position;\n"
>         "invariant varying float v_varying;\n"
>         "void main() { v_varying = a_position.x; gl_Position = a_position; }\n";
> 
>-    GLuint program = CompileProgram(vertexShaderSource, fragmentShaderSource);
>+    GLuint program = CompileProgram(kVS, kFS);
>     EXPECT_EQ(0u, program);
> }
> 
>@@ -776,139 +931,135 @@ TEST_P(GLSLTest_ES3, InvariantVaryingOut)
> {
>     // TODO: ESSL 3.00 -> GLSL 1.20 translation should add "invariant" in fragment shader
>     // for varyings which are invariant in vertex shader (http://anglebug.com/1293)
>-    if (IsDesktopOpenGL())
>-    {
>-        std::cout << "Test disabled on OpenGL." << std::endl;
>-        return;
>-    }
>+    ANGLE_SKIP_TEST_IF(IsDesktopOpenGL());
> 
>-    const std::string fragmentShaderSource =
>+    constexpr char kFS[] =
>         "#version 300 es\n"
>         "precision mediump float;\n"
>         "in float v_varying;\n"
>         "out vec4 my_FragColor;\n"
>         "void main() { my_FragColor = vec4(v_varying, 0, 0, 1.0); }\n";
> 
>-    const std::string vertexShaderSource =
>+    constexpr char kVS[] =
>         "#version 300 es\n"
>         "in vec4 a_position;\n"
>         "invariant out float v_varying;\n"
>         "void main() { v_varying = a_position.x; gl_Position = a_position; }\n";
> 
>-    GLuint program = CompileProgram(vertexShaderSource, fragmentShaderSource);
>+    GLuint program = CompileProgram(kVS, kFS);
>     EXPECT_NE(0u, program);
> }
> 
> // Verify that declaring varying as invariant only in fragment shader fails in ESSL 1.00.
> TEST_P(GLSLTest, InvariantVaryingIn)
> {
>-    const std::string fragmentShaderSource =
>+    constexpr char kFS[] =
>         "precision mediump float;\n"
>         "invariant varying float v_varying;\n"
>         "void main() { gl_FragColor = vec4(v_varying, 0, 0, 1.0); }\n";
> 
>-    const std::string vertexShaderSource =
>+    constexpr char kVS[] =
>         "attribute vec4 a_position;\n"
>         "varying float v_varying;\n"
>         "void main() { v_varying = a_position.x; gl_Position = a_position; }\n";
> 
>-    GLuint program = CompileProgram(vertexShaderSource, fragmentShaderSource);
>+    GLuint program = CompileProgram(kVS, kFS);
>     EXPECT_EQ(0u, program);
> }
> 
> // Verify that declaring varying as invariant only in fragment shader fails in ESSL 3.00.
> TEST_P(GLSLTest_ES3, InvariantVaryingIn)
> {
>-    const std::string fragmentShaderSource =
>+    constexpr char kFS[] =
>         "#version 300 es\n"
>         "precision mediump float;\n"
>         "invariant in float v_varying;\n"
>         "out vec4 my_FragColor;\n"
>         "void main() { my_FragColor = vec4(v_varying, 0, 0, 1.0); }\n";
> 
>-    const std::string vertexShaderSource =
>+    constexpr char kVS[] =
>         "#version 300 es\n"
>         "in vec4 a_position;\n"
>         "out float v_varying;\n"
>         "void main() { v_varying = a_position.x; gl_Position = a_position; }\n";
> 
>-    GLuint program = CompileProgram(vertexShaderSource, fragmentShaderSource);
>+    GLuint program = CompileProgram(kVS, kFS);
>     EXPECT_EQ(0u, program);
> }
> 
> // Verify that declaring varying as invariant in both shaders succeeds in ESSL 1.00.
> TEST_P(GLSLTest, InvariantVaryingBoth)
> {
>-    const std::string fragmentShaderSource =
>+    constexpr char kFS[] =
>         "precision mediump float;\n"
>         "invariant varying float v_varying;\n"
>         "void main() { gl_FragColor = vec4(v_varying, 0, 0, 1.0); }\n";
> 
>-    const std::string vertexShaderSource =
>+    constexpr char kVS[] =
>         "attribute vec4 a_position;\n"
>         "invariant varying float v_varying;\n"
>         "void main() { v_varying = a_position.x; gl_Position = a_position; }\n";
> 
>-    GLuint program = CompileProgram(vertexShaderSource, fragmentShaderSource);
>+    GLuint program = CompileProgram(kVS, kFS);
>     EXPECT_NE(0u, program);
> }
> 
> // Verify that declaring varying as invariant in both shaders fails in ESSL 3.00.
> TEST_P(GLSLTest_ES3, InvariantVaryingBoth)
> {
>-    const std::string fragmentShaderSource =
>+    constexpr char kFS[] =
>         "#version 300 es\n"
>         "precision mediump float;\n"
>         "invariant in float v_varying;\n"
>         "out vec4 my_FragColor;\n"
>         "void main() { my_FragColor = vec4(v_varying, 0, 0, 1.0); }\n";
> 
>-    const std::string vertexShaderSource =
>+    constexpr char kVS[] =
>         "#version 300 es\n"
>         "in vec4 a_position;\n"
>         "invariant out float v_varying;\n"
>         "void main() { v_varying = a_position.x; gl_Position = a_position; }\n";
> 
>-    GLuint program = CompileProgram(vertexShaderSource, fragmentShaderSource);
>+    GLuint program = CompileProgram(kVS, kFS);
>     EXPECT_EQ(0u, program);
> }
> 
> // Verify that declaring gl_Position as invariant succeeds in ESSL 1.00.
> TEST_P(GLSLTest, InvariantGLPosition)
> {
>-    const std::string fragmentShaderSource =
>+    constexpr char kFS[] =
>         "precision mediump float;\n"
>         "varying float v_varying;\n"
>         "void main() { gl_FragColor = vec4(v_varying, 0, 0, 1.0); }\n";
> 
>-    const std::string vertexShaderSource =
>+    constexpr char kVS[] =
>         "attribute vec4 a_position;\n"
>         "invariant gl_Position;\n"
>         "varying float v_varying;\n"
>         "void main() { v_varying = a_position.x; gl_Position = a_position; }\n";
> 
>-    GLuint program = CompileProgram(vertexShaderSource, fragmentShaderSource);
>+    GLuint program = CompileProgram(kVS, kFS);
>     EXPECT_NE(0u, program);
> }
> 
> // Verify that declaring gl_Position as invariant succeeds in ESSL 3.00.
> TEST_P(GLSLTest_ES3, InvariantGLPosition)
> {
>-    const std::string fragmentShaderSource =
>+    constexpr char kFS[] =
>         "#version 300 es\n"
>         "precision mediump float;\n"
>         "in float v_varying;\n"
>         "out vec4 my_FragColor;\n"
>         "void main() { my_FragColor = vec4(v_varying, 0, 0, 1.0); }\n";
> 
>-    const std::string vertexShaderSource =
>+    constexpr char kVS[] =
>         "#version 300 es\n"
>         "in vec4 a_position;\n"
>         "invariant gl_Position;\n"
>         "out float v_varying;\n"
>         "void main() { v_varying = a_position.x; gl_Position = a_position; }\n";
> 
>-    GLuint program = CompileProgram(vertexShaderSource, fragmentShaderSource);
>+    GLuint program = CompileProgram(kVS, kFS);
>     EXPECT_NE(0u, program);
> }
> 
>@@ -918,164 +1069,126 @@ TEST_P(GLSLTest, InvariantAllBoth)
>     // TODO: ESSL 1.00 -> GLSL 1.20 translation should add "invariant" in fragment shader
>     // for varyings which are invariant in vertex shader individually,
>     // and remove invariant(all) from fragment shader (http://anglebug.com/1293)
>-    if (IsDesktopOpenGL())
>-    {
>-        std::cout << "Test disabled on OpenGL." << std::endl;
>-        return;
>-    }
>+    ANGLE_SKIP_TEST_IF(IsDesktopOpenGL());
> 
>-    const std::string fragmentShaderSource =
>+    constexpr char kFS[] =
>         "#pragma STDGL invariant(all)\n"
>         "precision mediump float;\n"
>         "varying float v_varying;\n"
>         "void main() { gl_FragColor = vec4(v_varying, 0, 0, 1.0); }\n";
> 
>-    const std::string vertexShaderSource =
>+    constexpr char kVS[] =
>         "#pragma STDGL invariant(all)\n"
>         "attribute vec4 a_position;\n"
>         "varying float v_varying;\n"
>         "void main() { v_varying = a_position.x; gl_Position = a_position; }\n";
> 
>-    GLuint program = CompileProgram(vertexShaderSource, fragmentShaderSource);
>+    GLuint program = CompileProgram(kVS, kFS);
>     EXPECT_NE(0u, program);
> }
> 
> // Verify that functions without return statements still compile
> TEST_P(GLSLTest, MissingReturnFloat)
> {
>-    const std::string vertexShaderSource =
>+    constexpr char kVS[] =
>         "varying float v_varying;\n"
>         "float f() { if (v_varying > 0.0) return 1.0; }\n"
>         "void main() { gl_Position = vec4(f(), 0, 0, 1); }\n";
> 
>-    const std::string fragmentShaderSource =
>-        "precision mediump float;\n"
>-        "void main() { gl_FragColor = vec4(0, 0, 0, 1); }\n";
>-
>-    GLuint program = CompileProgram(vertexShaderSource, fragmentShaderSource);
>+    GLuint program = CompileProgram(kVS, essl1_shaders::fs::Red());
>     EXPECT_NE(0u, program);
> }
> 
> // Verify that functions without return statements still compile
> TEST_P(GLSLTest, MissingReturnVec2)
> {
>-    const std::string vertexShaderSource =
>+    constexpr char kVS[] =
>         "varying float v_varying;\n"
>         "vec2 f() { if (v_varying > 0.0) return vec2(1.0, 1.0); }\n"
>         "void main() { gl_Position = vec4(f().x, 0, 0, 1); }\n";
> 
>-    const std::string fragmentShaderSource =
>-        "precision mediump float;\n"
>-        "void main() { gl_FragColor = vec4(0, 0, 0, 1); }\n";
>-
>-    GLuint program = CompileProgram(vertexShaderSource, fragmentShaderSource);
>+    GLuint program = CompileProgram(kVS, essl1_shaders::fs::Red());
>     EXPECT_NE(0u, program);
> }
> 
> // Verify that functions without return statements still compile
> TEST_P(GLSLTest, MissingReturnVec3)
> {
>-    const std::string vertexShaderSource =
>+    constexpr char kVS[] =
>         "varying float v_varying;\n"
>         "vec3 f() { if (v_varying > 0.0) return vec3(1.0, 1.0, 1.0); }\n"
>         "void main() { gl_Position = vec4(f().x, 0, 0, 1); }\n";
> 
>-    const std::string fragmentShaderSource =
>-        "precision mediump float;\n"
>-        "void main() { gl_FragColor = vec4(0, 0, 0, 1); }\n";
>-
>-    GLuint program = CompileProgram(vertexShaderSource, fragmentShaderSource);
>+    GLuint program = CompileProgram(kVS, essl1_shaders::fs::Red());
>     EXPECT_NE(0u, program);
> }
> 
> // Verify that functions without return statements still compile
> TEST_P(GLSLTest, MissingReturnVec4)
> {
>-    const std::string vertexShaderSource =
>+    constexpr char kVS[] =
>         "varying float v_varying;\n"
>         "vec4 f() { if (v_varying > 0.0) return vec4(1.0, 1.0, 1.0, 1.0); }\n"
>         "void main() { gl_Position = vec4(f().x, 0, 0, 1); }\n";
> 
>-    const std::string fragmentShaderSource =
>-        "precision mediump float;\n"
>-        "void main() { gl_FragColor = vec4(0, 0, 0, 1); }\n";
>-
>-    GLuint program = CompileProgram(vertexShaderSource, fragmentShaderSource);
>+    GLuint program = CompileProgram(kVS, essl1_shaders::fs::Red());
>     EXPECT_NE(0u, program);
> }
> 
> // Verify that functions without return statements still compile
> TEST_P(GLSLTest, MissingReturnIVec4)
> {
>-    const std::string vertexShaderSource =
>+    constexpr char kVS[] =
>         "varying float v_varying;\n"
>         "ivec4 f() { if (v_varying > 0.0) return ivec4(1, 1, 1, 1); }\n"
>         "void main() { gl_Position = vec4(f().x, 0, 0, 1); }\n";
> 
>-    const std::string fragmentShaderSource =
>-        "precision mediump float;\n"
>-        "void main() { gl_FragColor = vec4(0, 0, 0, 1); }\n";
>-
>-    GLuint program = CompileProgram(vertexShaderSource, fragmentShaderSource);
>+    GLuint program = CompileProgram(kVS, essl1_shaders::fs::Red());
>     EXPECT_NE(0u, program);
> }
> 
> // Verify that functions without return statements still compile
> TEST_P(GLSLTest, MissingReturnMat4)
> {
>-    const std::string vertexShaderSource =
>+    constexpr char kVS[] =
>         "varying float v_varying;\n"
>         "mat4 f() { if (v_varying > 0.0) return mat4(1.0); }\n"
>         "void main() { gl_Position = vec4(f()[0][0], 0, 0, 1); }\n";
> 
>-    const std::string fragmentShaderSource =
>-        "precision mediump float;\n"
>-        "void main() { gl_FragColor = vec4(0, 0, 0, 1); }\n";
>-
>-    GLuint program = CompileProgram(vertexShaderSource, fragmentShaderSource);
>+    GLuint program = CompileProgram(kVS, essl1_shaders::fs::Red());
>     EXPECT_NE(0u, program);
> }
> 
> // Verify that functions without return statements still compile
> TEST_P(GLSLTest, MissingReturnStruct)
> {
>-    const std::string vertexShaderSource =
>+    constexpr char kVS[] =
>         "varying float v_varying;\n"
>         "struct s { float a; int b; vec2 c; };\n"
>         "s f() { if (v_varying > 0.0) return s(1.0, 1, vec2(1.0, 1.0)); }\n"
>         "void main() { gl_Position = vec4(f().a, 0, 0, 1); }\n";
> 
>-    const std::string fragmentShaderSource =
>-        "precision mediump float;\n"
>-        "void main() { gl_FragColor = vec4(0, 0, 0, 1); }\n";
>-
>-    GLuint program = CompileProgram(vertexShaderSource, fragmentShaderSource);
>+    GLuint program = CompileProgram(kVS, essl1_shaders::fs::Red());
>     EXPECT_NE(0u, program);
> }
> 
> // Verify that functions without return statements still compile
> TEST_P(GLSLTest_ES3, MissingReturnArray)
> {
>-    const std::string vertexShaderSource =
>+    constexpr char kVS[] =
>         "#version 300 es\n"
>         "in float v_varying;\n"
>         "vec2[2] f() { if (v_varying > 0.0) { return vec2[2](vec2(1.0, 1.0), vec2(1.0, 1.0)); } }\n"
>         "void main() { gl_Position = vec4(f()[0].x, 0, 0, 1); }\n";
> 
>-    const std::string fragmentShaderSource =
>-        "#version 300 es\n"
>-        "precision mediump float;\n"
>-        "out vec4 my_FragColor;\n"
>-        "void main() { my_FragColor = vec4(0, 0, 0, 1); }\n";
>-
>-    GLuint program = CompileProgram(vertexShaderSource, fragmentShaderSource);
>+    GLuint program = CompileProgram(kVS, essl3_shaders::fs::Red());
>     EXPECT_NE(0u, program);
> }
> 
> // Verify that functions without return statements still compile
> TEST_P(GLSLTest_ES3, MissingReturnArrayOfStructs)
> {
>-    const std::string vertexShaderSource =
>+    constexpr char kVS[] =
>         "#version 300 es\n"
>         "in float v_varying;\n"
>         "struct s { float a; int b; vec2 c; };\n"
>@@ -1083,13 +1196,7 @@ TEST_P(GLSLTest_ES3, MissingReturnArrayOfStructs)
>         "vec2(1.0, 1.0))); } }\n"
>         "void main() { gl_Position = vec4(f()[0].a, 0, 0, 1); }\n";
> 
>-    const std::string fragmentShaderSource =
>-        "#version 300 es\n"
>-        "precision mediump float;\n"
>-        "out vec4 my_FragColor;\n"
>-        "void main() { my_FragColor = vec4(0, 0, 0, 1); }\n";
>-
>-    GLuint program = CompileProgram(vertexShaderSource, fragmentShaderSource);
>+    GLuint program = CompileProgram(kVS, essl3_shaders::fs::Red());
>     EXPECT_NE(0u, program);
> }
> 
>@@ -1099,15 +1206,10 @@ TEST_P(GLSLTest_ES3, MissingReturnStructOfArrays)
>     // TODO(cwallez) remove the suppression once NVIDIA drivers are updated across trybots, drivers
>     // since late 2016 should have the fix. Last check on 2017-05-30 revealed that the Windows
>     // Server 2008 bots still had the old, failing drivers.
>-    if (IsNVIDIA() && IsOpenGLES())
>-    {
>-        std::cout << "Test skipped on NVIDIA OpenGL ES because it disallows returning "
>-                     "structure of arrays"
>-                  << std::endl;
>-        return;
>-    }
>+    // It disallows returning structure of arrays on NVIDIA OpenGL ES.
>+    ANGLE_SKIP_TEST_IF(IsNVIDIA() && IsOpenGLES());
> 
>-    const std::string vertexShaderSource =
>+    constexpr char kVS[] =
>         "#version 300 es\n"
>         "in float v_varying;\n"
>         "struct s { float a[2]; int b[2]; vec2 c[2]; };\n"
>@@ -1115,20 +1217,14 @@ TEST_P(GLSLTest_ES3, MissingReturnStructOfArrays)
>         "vec2[2](vec2(1.0, 1.0), vec2(1.0, 1.0))); } }\n"
>         "void main() { gl_Position = vec4(f().a[0], 0, 0, 1); }\n";
> 
>-    const std::string fragmentShaderSource =
>-        "#version 300 es\n"
>-        "precision mediump float;\n"
>-        "out vec4 my_FragColor;\n"
>-        "void main() { my_FragColor = vec4(0, 0, 0, 1); }\n";
>-
>-    GLuint program = CompileProgram(vertexShaderSource, fragmentShaderSource);
>+    GLuint program = CompileProgram(kVS, essl3_shaders::fs::Red());
>     EXPECT_NE(0u, program);
> }
> 
> // Verify that using invariant(all) in both shaders fails in ESSL 3.00.
> TEST_P(GLSLTest_ES3, InvariantAllBoth)
> {
>-    const std::string fragmentShaderSource =
>+    constexpr char kFS[] =
>         "#version 300 es\n"
>         "#pragma STDGL invariant(all)\n"
>         "precision mediump float;\n"
>@@ -1136,39 +1232,39 @@ TEST_P(GLSLTest_ES3, InvariantAllBoth)
>         "out vec4 my_FragColor;\n"
>         "void main() { my_FragColor = vec4(v_varying, 0, 0, 1.0); }\n";
> 
>-    const std::string vertexShaderSource =
>+    constexpr char kVS[] =
>         "#version 300 es\n"
>         "#pragma STDGL invariant(all)\n"
>         "in vec4 a_position;\n"
>         "out float v_varying;\n"
>         "void main() { v_varying = a_position.x; gl_Position = a_position; }\n";
> 
>-    GLuint program = CompileProgram(vertexShaderSource, fragmentShaderSource);
>+    GLuint program = CompileProgram(kVS, kFS);
>     EXPECT_EQ(0u, program);
> }
> 
> // Verify that using invariant(all) only in fragment shader fails in ESSL 1.00.
> TEST_P(GLSLTest, InvariantAllIn)
> {
>-    const std::string fragmentShaderSource =
>+    constexpr char kFS[] =
>         "#pragma STDGL invariant(all)\n"
>         "precision mediump float;\n"
>         "varying float v_varying;\n"
>         "void main() { gl_FragColor = vec4(v_varying, 0, 0, 1.0); }\n";
> 
>-    const std::string vertexShaderSource =
>+    constexpr char kVS[] =
>         "attribute vec4 a_position;\n"
>         "varying float v_varying;\n"
>         "void main() { v_varying = a_position.x; gl_Position = a_position; }\n";
> 
>-    GLuint program = CompileProgram(vertexShaderSource, fragmentShaderSource);
>+    GLuint program = CompileProgram(kVS, kFS);
>     EXPECT_EQ(0u, program);
> }
> 
> // Verify that using invariant(all) only in fragment shader fails in ESSL 3.00.
> TEST_P(GLSLTest_ES3, InvariantAllIn)
> {
>-    const std::string fragmentShaderSource =
>+    constexpr char kFS[] =
>         "#version 300 es\n"
>         "#pragma STDGL invariant(all)\n"
>         "precision mediump float;\n"
>@@ -1176,31 +1272,31 @@ TEST_P(GLSLTest_ES3, InvariantAllIn)
>         "out vec4 my_FragColor;\n"
>         "void main() { my_FragColor = vec4(v_varying, 0, 0, 1.0); }\n";
> 
>-    const std::string vertexShaderSource =
>+    constexpr char kVS[] =
>         "#version 300 es\n"
>         "in vec4 a_position;\n"
>         "out float v_varying;\n"
>         "void main() { v_varying = a_position.x; gl_Position = a_position; }\n";
> 
>-    GLuint program = CompileProgram(vertexShaderSource, fragmentShaderSource);
>+    GLuint program = CompileProgram(kVS, kFS);
>     EXPECT_EQ(0u, program);
> }
> 
> // Verify that using invariant(all) only in vertex shader fails in ESSL 1.00.
> TEST_P(GLSLTest, InvariantAllOut)
> {
>-    const std::string fragmentShaderSource =
>+    constexpr char kFS[] =
>         "precision mediump float;\n"
>         "varying float v_varying;\n"
>         "void main() { gl_FragColor = vec4(v_varying, 0, 0, 1.0); }\n";
> 
>-    const std::string vertexShaderSource =
>+    constexpr char kVS[] =
>         "#pragma STDGL invariant(all)\n"
>         "attribute vec4 a_position;\n"
>         "varying float v_varying;\n"
>         "void main() { v_varying = a_position.x; gl_Position = a_position; }\n";
> 
>-    GLuint program = CompileProgram(vertexShaderSource, fragmentShaderSource);
>+    GLuint program = CompileProgram(kVS, kFS);
>     EXPECT_EQ(0u, program);
> }
> 
>@@ -1210,41 +1306,31 @@ TEST_P(GLSLTest_ES3, InvariantAllOut)
>     // TODO: ESSL 3.00 -> GLSL 1.20 translation should add "invariant" in fragment shader
>     // for varyings which are invariant in vertex shader,
>     // because of invariant(all) being used in vertex shader (http://anglebug.com/1293)
>-    if (IsDesktopOpenGL())
>-    {
>-        std::cout << "Test disabled on OpenGL." << std::endl;
>-        return;
>-    }
>+    ANGLE_SKIP_TEST_IF(IsDesktopOpenGL());
> 
>-    const std::string fragmentShaderSource =
>+    constexpr char kFS[] =
>         "#version 300 es\n"
>         "precision mediump float;\n"
>         "in float v_varying;\n"
>         "out vec4 my_FragColor;\n"
>         "void main() { my_FragColor = vec4(v_varying, 0, 0, 1.0); }\n";
> 
>-    const std::string vertexShaderSource =
>+    constexpr char kVS[] =
>         "#version 300 es\n"
>         "#pragma STDGL invariant(all)\n"
>         "in vec4 a_position;\n"
>         "out float v_varying;\n"
>         "void main() { v_varying = a_position.x; gl_Position = a_position; }\n";
> 
>-    GLuint program = CompileProgram(vertexShaderSource, fragmentShaderSource);
>+    GLuint program = CompileProgram(kVS, kFS);
>     EXPECT_NE(0u, program);
> }
> 
> TEST_P(GLSLTest, MaxVaryingVec4)
> {
>-#if defined(__APPLE__)
>-    // TODO(geofflang): Find out why this doesn't compile on Apple AND OpenGL drivers
>+    // TODO(geofflang): Find out why this doesn't compile on Apple AMD OpenGL drivers
>     // (http://anglebug.com/1291)
>-    if (IsAMD() && getPlatformRenderer() == EGL_PLATFORM_ANGLE_TYPE_OPENGL_ANGLE)
>-    {
>-        std::cout << "Test disabled on Apple AMD OpenGL." << std::endl;
>-        return;
>-    }
>-#endif
>+    ANGLE_SKIP_TEST_IF(IsOSX() && IsAMD() && IsOpenGL());
> 
>     GLint maxVaryings = 0;
>     glGetIntegerv(GL_MAX_VARYING_VECTORS, &maxVaryings);
>@@ -1252,29 +1338,62 @@ TEST_P(GLSLTest, MaxVaryingVec4)
>     VaryingTestBase(0, 0, 0, 0, 0, 0, maxVaryings, 0, false, false, false, true);
> }
> 
>-TEST_P(GLSLTest, MaxMinusTwoVaryingVec4PlusTwoSpecialVariables)
>+// Verify we can pack registers with one builtin varying.
>+TEST_P(GLSLTest, MaxVaryingVec4_OneBuiltin)
> {
>     GLint maxVaryings = 0;
>     glGetIntegerv(GL_MAX_VARYING_VECTORS, &maxVaryings);
> 
>-    // Generate shader code that uses gl_FragCoord and gl_PointCoord, two special fragment shader variables.
>-    VaryingTestBase(0, 0, 0, 0, 0, 0, maxVaryings - 2, 0, true, true, false, true);
>+    // Generate shader code that uses gl_FragCoord.
>+    VaryingTestBase(0, 0, 0, 0, 0, 0, maxVaryings - 1, 0, true, false, false, true);
> }
> 
>-TEST_P(GLSLTest, MaxMinusTwoVaryingVec4PlusThreeSpecialVariables)
>+// Verify we can pack registers with two builtin varyings.
>+TEST_P(GLSLTest, MaxVaryingVec4_TwoBuiltins)
> {
>-    // TODO(geofflang): Figure out why this fails on OpenGL AMD (http://anglebug.com/1291)
>-    if (IsAMD() && getPlatformRenderer() == EGL_PLATFORM_ANGLE_TYPE_OPENGL_ANGLE)
>-    {
>-        std::cout << "Test disabled on OpenGL." << std::endl;
>-        return;
>-    }
>+    GLint maxVaryings = 0;
>+    glGetIntegerv(GL_MAX_VARYING_VECTORS, &maxVaryings);
> 
>+    // Generate shader code that uses gl_FragCoord and gl_PointCoord.
>+    VaryingTestBase(0, 0, 0, 0, 0, 0, maxVaryings - 2, 0, true, true, false, true);
>+}
>+
>+// Verify we can pack registers with three builtin varyings.
>+TEST_P(GLSLTest, MaxVaryingVec4_ThreeBuiltins)
>+{
>     GLint maxVaryings = 0;
>     glGetIntegerv(GL_MAX_VARYING_VECTORS, &maxVaryings);
> 
>     // Generate shader code that uses gl_FragCoord, gl_PointCoord and gl_PointSize.
>-    VaryingTestBase(0, 0, 0, 0, 0, 0, maxVaryings - 2, 0, true, true, true, true);
>+    VaryingTestBase(0, 0, 0, 0, 0, 0, maxVaryings - 3, 0, true, true, true, true);
>+}
>+
>+// This covers a problematic case in D3D9 - we are limited by the number of available semantics,
>+// rather than total register use.
>+TEST_P(GLSLTest, MaxVaryingsSpecialCases)
>+{
>+    ANGLE_SKIP_TEST_IF(!IsD3D9());
>+
>+    GLint maxVaryings = 0;
>+    glGetIntegerv(GL_MAX_VARYING_VECTORS, &maxVaryings);
>+
>+    VaryingTestBase(maxVaryings, 0, 0, 0, 0, 0, 0, 0, true, false, false, false);
>+    VaryingTestBase(maxVaryings - 1, 0, 0, 0, 0, 0, 0, 0, true, true, false, false);
>+    VaryingTestBase(maxVaryings - 2, 0, 0, 0, 0, 0, 0, 0, true, true, false, true);
>+
>+    // Special case for gl_PointSize: we get it for free on D3D9.
>+    VaryingTestBase(maxVaryings - 2, 0, 0, 0, 0, 0, 0, 0, true, true, true, true);
>+}
>+
>+// This covers a problematic case in D3D9 - we are limited by the number of available semantics,
>+// rather than total register use.
>+TEST_P(GLSLTest, MaxMinusTwoVaryingVec2PlusOneSpecialVariable)
>+{
>+    GLint maxVaryings = 0;
>+    glGetIntegerv(GL_MAX_VARYING_VECTORS, &maxVaryings);
>+
>+    // Generate shader code that uses gl_FragCoord.
>+    VaryingTestBase(0, 0, maxVaryings, 0, 0, 0, 0, 0, true, false, false, !IsD3D9());
> }
> 
> TEST_P(GLSLTest, MaxVaryingVec3)
>@@ -1293,93 +1412,51 @@ TEST_P(GLSLTest, MaxVaryingVec3Array)
>     VaryingTestBase(0, 0, 0, 0, 0, maxVaryings / 2, 0, 0, false, false, false, true);
> }
> 
>-// Disabled because of a failure in D3D9
>+// Only fails on D3D9 because of packing limitations.
> TEST_P(GLSLTest, MaxVaryingVec3AndOneFloat)
> {
>-    if (IsD3D9())
>-    {
>-        std::cout << "Test disabled on D3D9." << std::endl;
>-        return;
>-    }
>-
>     GLint maxVaryings = 0;
>     glGetIntegerv(GL_MAX_VARYING_VECTORS, &maxVaryings);
> 
>-    VaryingTestBase(1, 0, 0, 0, maxVaryings, 0, 0, 0, false, false, false, true);
>+    VaryingTestBase(1, 0, 0, 0, maxVaryings, 0, 0, 0, false, false, false, !IsD3D9());
> }
> 
>-// Disabled because of a failure in D3D9
>+// Only fails on D3D9 because of packing limitations.
> TEST_P(GLSLTest, MaxVaryingVec3ArrayAndOneFloatArray)
> {
>-    if (IsD3D9())
>-    {
>-        std::cout << "Test disabled on D3D9." << std::endl;
>-        return;
>-    }
>-
>     GLint maxVaryings = 0;
>     glGetIntegerv(GL_MAX_VARYING_VECTORS, &maxVaryings);
> 
>-    VaryingTestBase(0, 1, 0, 0, 0, maxVaryings / 2, 0, 0, false, false, false, true);
>+    VaryingTestBase(0, 1, 0, 0, 0, maxVaryings / 2, 0, 0, false, false, false, !IsD3D9());
> }
> 
>-// Disabled because of a failure in D3D9
>+// Only fails on D3D9 because of packing limitations.
> TEST_P(GLSLTest, TwiceMaxVaryingVec2)
> {
>-    if (IsD3D9())
>-    {
>-        std::cout << "Test disabled on D3D9." << std::endl;
>-        return;
>-    }
>+    // TODO(geofflang): Figure out why this fails on NVIDIA's GLES driver
>+    ANGLE_SKIP_TEST_IF(IsNVIDIA() && IsOpenGLES());
> 
>-    if (getPlatformRenderer() == EGL_PLATFORM_ANGLE_TYPE_OPENGLES_ANGLE)
>-    {
>-        // TODO(geofflang): Figure out why this fails on NVIDIA's GLES driver
>-        std::cout << "Test disabled on OpenGL ES." << std::endl;
>-        return;
>-    }
>-
>-#if defined(__APPLE__)
>-    // TODO(geofflang): Find out why this doesn't compile on Apple AND OpenGL drivers
>+    // TODO(geofflang): Find out why this doesn't compile on Apple AMD OpenGL drivers
>     // (http://anglebug.com/1291)
>-    if (IsAMD() && getPlatformRenderer() == EGL_PLATFORM_ANGLE_TYPE_OPENGL_ANGLE)
>-    {
>-        std::cout << "Test disabled on Apple AMD OpenGL." << std::endl;
>-        return;
>-    }
>-#endif
>+    ANGLE_SKIP_TEST_IF(IsOSX() && IsAMD() && IsOpenGL());
> 
>     GLint maxVaryings = 0;
>     glGetIntegerv(GL_MAX_VARYING_VECTORS, &maxVaryings);
> 
>-    VaryingTestBase(0, 0, 2 * maxVaryings, 0, 0, 0, 0, 0, false, false, false, true);
>+    VaryingTestBase(0, 0, 2 * maxVaryings, 0, 0, 0, 0, 0, false, false, false, !IsD3D9());
> }
> 
> // Disabled because of a failure in D3D9
> TEST_P(GLSLTest, MaxVaryingVec2Arrays)
> {
>-    if (IsD3DSM3())
>-    {
>-        std::cout << "Test disabled on SM3." << std::endl;
>-        return;
>-    }
>+    ANGLE_SKIP_TEST_IF(IsD3DSM3());
> 
>-    if (getPlatformRenderer() == EGL_PLATFORM_ANGLE_TYPE_OPENGLES_ANGLE)
>-    {
>-        // TODO(geofflang): Figure out why this fails on NVIDIA's GLES driver
>-        std::cout << "Test disabled on OpenGL ES." << std::endl;
>-        return;
>-    }
>+    // TODO(geofflang): Figure out why this fails on NVIDIA's GLES driver
>+    ANGLE_SKIP_TEST_IF(IsOpenGLES());
> 
>-#if defined(__APPLE__)
>-    // TODO(geofflang): Find out why this doesn't compile on Apple AND OpenGL drivers
>+    // TODO(geofflang): Find out why this doesn't compile on Apple AMD OpenGL drivers
>     // (http://anglebug.com/1291)
>-    if (IsAMD() && getPlatformRenderer() == EGL_PLATFORM_ANGLE_TYPE_OPENGL_ANGLE)
>-    {
>-        std::cout << "Test disabled on Apple AMD OpenGL." << std::endl;
>-        return;
>-    }
>-#endif
>+    ANGLE_SKIP_TEST_IF(IsOSX() && IsAMD() && IsOpenGL());
> 
>     GLint maxVaryings = 0;
>     glGetIntegerv(GL_MAX_VARYING_VECTORS, &maxVaryings);
>@@ -1392,15 +1469,16 @@ TEST_P(GLSLTest, MaxVaryingVec2Arrays)
>     VaryingTestBase(0, 0, 0, maxVec2Arrays, 0, 0, 0, 0, false, false, false, true);
> }
> 
>-// Verify shader source with a fixed length that is less than the null-terminated length will compile.
>+// Verify shader source with a fixed length that is less than the null-terminated length will
>+// compile.
> TEST_P(GLSLTest, FixedShaderLength)
> {
>     GLuint shader = glCreateShader(GL_FRAGMENT_SHADER);
> 
>     const std::string appendGarbage = "abcasdfasdfasdfasdfasdf";
>-    const std::string source = "void main() { gl_FragColor = vec4(0, 0, 0, 0); }" + appendGarbage;
>-    const char *sourceArray[1] = { source.c_str() };
>-    GLint lengths[1] = { static_cast<GLint>(source.length() - appendGarbage.length()) };
>+    const std::string source   = "void main() { gl_FragColor = vec4(0, 0, 0, 0); }" + appendGarbage;
>+    const char *sourceArray[1] = {source.c_str()};
>+    GLint lengths[1]           = {static_cast<GLint>(source.length() - appendGarbage.length())};
>     glShaderSource(shader, static_cast<GLsizei>(ArraySize(sourceArray)), sourceArray, lengths);
>     glCompileShader(shader);
> 
>@@ -1414,8 +1492,8 @@ TEST_P(GLSLTest, NegativeShaderLength)
> {
>     GLuint shader = glCreateShader(GL_FRAGMENT_SHADER);
> 
>-    const char *sourceArray[1] = { "void main() { gl_FragColor = vec4(0, 0, 0, 0); }" };
>-    GLint lengths[1] = { -10 };
>+    const char *sourceArray[1] = {essl1_shaders::fs::Red()};
>+    GLint lengths[1]           = {-10};
>     glShaderSource(shader, static_cast<GLsizei>(ArraySize(sourceArray)), sourceArray, lengths);
>     glCompileShader(shader);
> 
>@@ -1442,15 +1520,13 @@ TEST_P(GLSLTest, MixedShaderLengths)
> {
>     GLuint shader = glCreateShader(GL_FRAGMENT_SHADER);
> 
>-    const char *sourceArray[] =
>-    {
>+    const char *sourceArray[] = {
>         "void main()",
>         "{",
>         "    gl_FragColor = vec4(0, 0, 0, 0);",
>         "}",
>     };
>-    GLint lengths[] =
>-    {
>+    GLint lengths[] = {
>         -10,
>         1,
>         static_cast<GLint>(strlen(sourceArray[2])),
>@@ -1471,21 +1547,11 @@ TEST_P(GLSLTest, ZeroShaderLength)
> {
>     GLuint shader = glCreateShader(GL_FRAGMENT_SHADER);
> 
>-    const char *sourceArray[] =
>-    {
>-        "adfasdf",
>-        "34534",
>-        "void main() { gl_FragColor = vec4(0, 0, 0, 0); }",
>-        "",
>-        "asdfasdfsdsdf",
>+    const char *sourceArray[] = {
>+        "adfasdf", "34534", "void main() { gl_FragColor = vec4(0, 0, 0, 0); }", "", "asdfasdfsdsdf",
>     };
>-    GLint lengths[] =
>-    {
>-        0,
>-        0,
>-        -1,
>-        0,
>-        0,
>+    GLint lengths[] = {
>+        0, 0, -1, 0, 0,
>     };
>     ASSERT_EQ(ArraySize(sourceArray), ArraySize(lengths));
> 
>@@ -1501,7 +1567,7 @@ TEST_P(GLSLTest, ZeroShaderLength)
> // https://code.google.com/p/angleproject/issues/detail?id=857
> TEST_P(GLSLTest, BadIndexBug)
> {
>-    const std::string &fragmentShaderSourceVec =
>+    constexpr char kFSSourceVec[] =
>         "precision mediump float;\n"
>         "uniform vec4 uniformVec;\n"
>         "void main()\n"
>@@ -1509,7 +1575,7 @@ TEST_P(GLSLTest, BadIndexBug)
>         "    gl_FragColor = vec4(uniformVec[int()]);\n"
>         "}";
> 
>-    GLuint shader = CompileShader(GL_FRAGMENT_SHADER, fragmentShaderSourceVec);
>+    GLuint shader = CompileShader(GL_FRAGMENT_SHADER, kFSSourceVec);
>     EXPECT_EQ(0u, shader);
> 
>     if (shader != 0)
>@@ -1517,7 +1583,7 @@ TEST_P(GLSLTest, BadIndexBug)
>         glDeleteShader(shader);
>     }
> 
>-    const std::string &fragmentShaderSourceMat =
>+    constexpr char kFSSourceMat[] =
>         "precision mediump float;\n"
>         "uniform mat4 uniformMat;\n"
>         "void main()\n"
>@@ -1525,7 +1591,7 @@ TEST_P(GLSLTest, BadIndexBug)
>         "    gl_FragColor = vec4(uniformMat[int()]);\n"
>         "}";
> 
>-    shader = CompileShader(GL_FRAGMENT_SHADER, fragmentShaderSourceMat);
>+    shader = CompileShader(GL_FRAGMENT_SHADER, kFSSourceMat);
>     EXPECT_EQ(0u, shader);
> 
>     if (shader != 0)
>@@ -1533,7 +1599,7 @@ TEST_P(GLSLTest, BadIndexBug)
>         glDeleteShader(shader);
>     }
> 
>-    const std::string &fragmentShaderSourceArray =
>+    constexpr char kFSSourceArray[] =
>         "precision mediump float;\n"
>         "uniform vec4 uniformArray;\n"
>         "void main()\n"
>@@ -1541,7 +1607,7 @@ TEST_P(GLSLTest, BadIndexBug)
>         "    gl_FragColor = vec4(uniformArray[int()]);\n"
>         "}";
> 
>-    shader = CompileShader(GL_FRAGMENT_SHADER, fragmentShaderSourceArray);
>+    shader = CompileShader(GL_FRAGMENT_SHADER, kFSSourceArray);
>     EXPECT_EQ(0u, shader);
> 
>     if (shader != 0)
>@@ -1553,48 +1619,117 @@ TEST_P(GLSLTest, BadIndexBug)
> // Test that structs defined in uniforms are translated correctly.
> TEST_P(GLSLTest, StructSpecifiersUniforms)
> {
>-    const std::string fragmentShaderSource =
>-        R"(precision mediump float;
>+    constexpr char kFS[] = R"(precision mediump float;
> 
>-        uniform struct S { float field;} s;
>+uniform struct S { float field; } s;
> 
>-        void main()
>-        {
>-            gl_FragColor = vec4(1, 0, 0, 1);
>-            gl_FragColor.a += s.field;
>-        })";
>+void main()
>+{
>+    gl_FragColor = vec4(1, 0, 0, 1);
>+    gl_FragColor.a += s.field;
>+})";
> 
>-    GLuint program = CompileProgram(mSimpleVSSource, fragmentShaderSource);
>+    GLuint program = CompileProgram(essl1_shaders::vs::Simple(), kFS);
>     EXPECT_NE(0u, program);
> }
> 
>-// Test that gl_DepthRange is not stored as a uniform location. Since uniforms
>-// beginning with "gl_" are filtered out by our validation logic, we must
>-// bypass the validation to test the behaviour of the implementation.
>-// (note this test is still Impl-independent)
>-TEST_P(GLSLTestNoValidation, DepthRangeUniforms)
>+// Test that structs declaration followed directly by an initialization is translated correctly.
>+TEST_P(GLSLTest, StructWithInitializer)
> {
>-    const std::string fragmentShaderSource =
>-        R"(precision mediump float;
>+    constexpr char kFS[] = R"(precision mediump float;
> 
>-        void main()
>-        {
>-            gl_FragColor = vec4(gl_DepthRange.near, gl_DepthRange.far, gl_DepthRange.diff, 1);
>-        })";
>+struct S { float a; } s = S(1.0);
> 
>-    ANGLE_GL_PROGRAM(program, mSimpleVSSource, fragmentShaderSource);
>+void main()
>+{
>+    gl_FragColor = vec4(0, 0, 0, 1);
>+    gl_FragColor.r += s.a;
>+})";
> 
>-    // We need to bypass validation for this call.
>-    GLint nearIndex = glGetUniformLocation(program.get(), "gl_DepthRange.near");
>-    EXPECT_EQ(-1, nearIndex);
>+    ANGLE_GL_PROGRAM(program, essl1_shaders::vs::Simple(), kFS);
>+    glUseProgram(program);
> 
>-    // Test drawing does not throw an exception.
>-    drawQuad(program.get(), "inputAttribute", 0.5f);
>+    // Test drawing, should be red.
>+    drawQuad(program.get(), essl1_shaders::PositionAttrib(), 0.5f);
> 
>+    EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::red);
>     EXPECT_GL_NO_ERROR();
> }
> 
>-std::string GenerateSmallPowShader(double base, double exponent)
>+// Test that structs without initializer, followed by a uniform usage works as expected.
>+TEST_P(GLSLTest, UniformStructWithoutInitializer)
>+{
>+    constexpr char kFS[] = R"(precision mediump float;
>+
>+struct S { float a; };
>+uniform S u_s;
>+
>+void main()
>+{
>+    gl_FragColor = vec4(u_s.a);
>+})";
>+
>+    ANGLE_GL_PROGRAM(program, essl1_shaders::vs::Simple(), kFS);
>+    glUseProgram(program);
>+
>+    // Test drawing, should be red.
>+    drawQuad(program.get(), essl1_shaders::PositionAttrib(), 0.5f);
>+
>+    EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::transparentBlack);
>+    EXPECT_GL_NO_ERROR();
>+}
>+
>+// Test that structs declaration followed directly by an initialization in a uniform.
>+TEST_P(GLSLTest, StructWithUniformInitializer)
>+{
>+    constexpr char kFS[] = R"(precision mediump float;
>+
>+struct S { float a; } s = S(1.0);
>+uniform S us;
>+
>+void main()
>+{
>+    gl_FragColor = vec4(0, 0, 0, 1);
>+    gl_FragColor.r += s.a;
>+    gl_FragColor.g += us.a;
>+})";
>+
>+    ANGLE_GL_PROGRAM(program, essl1_shaders::vs::Simple(), kFS);
>+    glUseProgram(program);
>+
>+    // Test drawing, should be red.
>+    drawQuad(program.get(), essl1_shaders::PositionAttrib(), 0.5f);
>+
>+    EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::red);
>+    EXPECT_GL_NO_ERROR();
>+}
>+
>+// Test that gl_DepthRange is not stored as a uniform location. Since uniforms
>+// beginning with "gl_" are filtered out by our validation logic, we must
>+// bypass the validation to test the behaviour of the implementation.
>+// (note this test is still Impl-independent)
>+TEST_P(GLSLTestNoValidation, DepthRangeUniforms)
>+{
>+    constexpr char kFS[] = R"(precision mediump float;
>+
>+void main()
>+{
>+    gl_FragColor = vec4(gl_DepthRange.near, gl_DepthRange.far, gl_DepthRange.diff, 1);
>+})";
>+
>+    ANGLE_GL_PROGRAM(program, essl1_shaders::vs::Simple(), kFS);
>+
>+    // We need to bypass validation for this call.
>+    GLint nearIndex = glGetUniformLocation(program.get(), "gl_DepthRange.near");
>+    EXPECT_EQ(-1, nearIndex);
>+
>+    // Test drawing does not throw an exception.
>+    drawQuad(program.get(), essl1_shaders::PositionAttrib(), 0.5f);
>+
>+    EXPECT_GL_NO_ERROR();
>+}
>+
>+std::string GenerateSmallPowShader(double base, double exponent)
> {
>     std::stringstream stream;
> 
>@@ -1629,26 +1764,32 @@ std::string GenerateSmallPowShader(double base, double exponent)
> // See http://anglebug.com/851
> TEST_P(GLSLTest, PowOfSmallConstant)
> {
>-    std::vector<double> bads;
>-    for (int eps = -1; eps <= 1; ++eps)
>+    // Test with problematic exponents that are close to an integer.
>+    std::vector<double> testExponents;
>+    std::array<double, 5> epsilonMultipliers = {-100.0, -1.0, 0.0, 1.0, 100.0};
>+    for (double epsilonMultiplier : epsilonMultipliers)
>     {
>         for (int i = -4; i <= 5; ++i)
>         {
>             if (i >= -1 && i <= 1)
>                 continue;
>             const double epsilon = 1.0e-8;
>-            double bad           = static_cast<double>(i) + static_cast<double>(eps) * epsilon;
>-            bads.push_back(bad);
>+            double bad           = static_cast<double>(i) + epsilonMultiplier * epsilon;
>+            testExponents.push_back(bad);
>         }
>     }
> 
>-    for (double bad : bads)
>+    // Also test with a few exponents that are not close to an integer.
>+    testExponents.push_back(3.6);
>+    testExponents.push_back(3.4);
>+
>+    for (double testExponent : testExponents)
>     {
>-        const std::string &fragmentShaderSource = GenerateSmallPowShader(1.0e-6, bad);
>+        const std::string &fragmentShaderSource = GenerateSmallPowShader(1.0e-6, testExponent);
> 
>-        ANGLE_GL_PROGRAM(program, mSimpleVSSource, fragmentShaderSource);
>+        ANGLE_GL_PROGRAM(program, essl1_shaders::vs::Simple(), fragmentShaderSource.c_str());
> 
>-        drawQuad(program.get(), "inputAttribute", 0.5f);
>+        drawQuad(program.get(), essl1_shaders::PositionAttrib(), 0.5f);
> 
>         EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::green);
>         EXPECT_GL_NO_ERROR();
>@@ -1662,26 +1803,25 @@ TEST_P(GLSLTest, PowOfSmallConstant)
> // than FL9_3.
> TEST_P(GLSLTest, LoopIndexingValidation)
> {
>-    const std::string fragmentShaderSource =
>-        R"(precision mediump float;
>+    constexpr char kFS[] = R"(precision mediump float;
> 
>-        uniform float loopMax;
>+uniform float loopMax;
> 
>-        void main()
>+void main()
>+{
>+    gl_FragColor = vec4(1, 0, 0, 1);
>+    for (float l = 0.0; l < loopMax; l++)
>+    {
>+        if (loopMax > 3.0)
>         {
>-            gl_FragColor = vec4(1, 0, 0, 1);
>-            for (float l = 0.0; l < loopMax; l++)
>-            {
>-                if (loopMax > 3.0)
>-                {
>-                    gl_FragColor.a += 0.1;
>-                }
>-            }
>-        })";
>+            gl_FragColor.a += 0.1;
>+        }
>+    }
>+})";
> 
>     GLuint shader = glCreateShader(GL_FRAGMENT_SHADER);
> 
>-    const char *sourceArray[1] = {fragmentShaderSource.c_str()};
>+    const char *sourceArray[1] = {kFS};
>     glShaderSource(shader, 1, sourceArray, nullptr);
>     glCompileShader(shader);
> 
>@@ -1728,11 +1868,8 @@ TEST_P(GLSLTest, LoopIndexingValidation)
> // can actually be used.
> TEST_P(GLSLTest, VerifyMaxVertexUniformVectors)
> {
>-    if (IsLinux() && IsIntel())
>-    {
>-        std::cout << "Test timed out on Linux Intel. See crbug.com/680631." << std::endl;
>-        return;
>-    }
>+    // crbug.com/680631
>+    ANGLE_SKIP_TEST_IF(IsOzone() && IsIntel());
> 
>     int maxUniforms = 10000;
>     glGetIntegerv(GL_MAX_VERTEX_UNIFORM_VECTORS, &maxUniforms);
>@@ -1746,12 +1883,7 @@ TEST_P(GLSLTest, VerifyMaxVertexUniformVectors)
> // can actually be used along with the maximum number of texture samplers.
> TEST_P(GLSLTest, VerifyMaxVertexUniformVectorsWithSamplers)
> {
>-    if (GetParam().eglParameters.renderer == EGL_PLATFORM_ANGLE_TYPE_OPENGL_ANGLE ||
>-        GetParam().eglParameters.renderer == EGL_PLATFORM_ANGLE_TYPE_OPENGLES_ANGLE)
>-    {
>-        std::cout << "Test disabled on OpenGL." << std::endl;
>-        return;
>-    }
>+    ANGLE_SKIP_TEST_IF(IsOpenGL() || IsOpenGLES());
> 
>     int maxUniforms = 10000;
>     glGetIntegerv(GL_MAX_VERTEX_UNIFORM_VECTORS, &maxUniforms);
>@@ -1780,11 +1912,8 @@ TEST_P(GLSLTest, VerifyMaxVertexUniformVectorsExceeded)
> // can actually be used.
> TEST_P(GLSLTest, VerifyMaxFragmentUniformVectors)
> {
>-    if (IsLinux() && IsIntel())
>-    {
>-        std::cout << "Test timed out on Linux Intel. See crbug.com/680631." << std::endl;
>-        return;
>-    }
>+    // crbug.com/680631
>+    ANGLE_SKIP_TEST_IF(IsOzone() && IsIntel());
> 
>     int maxUniforms = 10000;
>     glGetIntegerv(GL_MAX_FRAGMENT_UNIFORM_VECTORS, &maxUniforms);
>@@ -1798,12 +1927,7 @@ TEST_P(GLSLTest, VerifyMaxFragmentUniformVectors)
> // can actually be used along with the maximum number of texture samplers.
> TEST_P(GLSLTest, VerifyMaxFragmentUniformVectorsWithSamplers)
> {
>-    if (GetParam().eglParameters.renderer == EGL_PLATFORM_ANGLE_TYPE_OPENGL_ANGLE ||
>-        GetParam().eglParameters.renderer == EGL_PLATFORM_ANGLE_TYPE_OPENGLES_ANGLE)
>-    {
>-        std::cout << "Test disabled on OpenGL." << std::endl;
>-        return;
>-    }
>+    ANGLE_SKIP_TEST_IF(IsOpenGL() || IsOpenGLES());
> 
>     int maxUniforms = 10000;
>     glGetIntegerv(GL_MAX_FRAGMENT_UNIFORM_VECTORS, &maxUniforms);
>@@ -1831,13 +1955,9 @@ TEST_P(GLSLTest, VerifyMaxFragmentUniformVectorsExceeded)
> // Test compiling shaders using the GL_EXT_shader_texture_lod extension
> TEST_P(GLSLTest, TextureLOD)
> {
>-    if (!extensionEnabled("GL_EXT_shader_texture_lod"))
>-    {
>-        std::cout << "Test skipped due to missing GL_EXT_shader_texture_lod." << std::endl;
>-        return;
>-    }
>+    ANGLE_SKIP_TEST_IF(!IsGLExtensionEnabled("GL_EXT_shader_texture_lod"));
> 
>-    const std::string source =
>+    constexpr char kFS[] =
>         "#extension GL_EXT_shader_texture_lod : require\n"
>         "uniform sampler2D u_texture;\n"
>         "void main() {\n"
>@@ -1845,25 +1965,54 @@ TEST_P(GLSLTest, TextureLOD)
>         "0.0));\n"
>         "}\n";
> 
>-    GLuint shader = CompileShader(GL_FRAGMENT_SHADER, source);
>+    GLuint shader = CompileShader(GL_FRAGMENT_SHADER, kFS);
>     ASSERT_NE(0u, shader);
>     glDeleteShader(shader);
> }
> 
>+// Test to verify the a shader can have a sampler unused in a vertex shader
>+// but used in the fragment shader.
>+TEST_P(GLSLTest, VerifySamplerInBothVertexAndFragmentShaders)
>+{
>+    constexpr char kVS[] = R"(
>+attribute vec2 position;
>+varying mediump vec2 texCoord;
>+uniform sampler2D tex;
>+void main()
>+{
>+    gl_Position = vec4(position, 0, 1);
>+    texCoord = position * 0.5 + vec2(0.5);
>+})";
>+
>+    constexpr char kFS[] = R"(
>+varying mediump vec2 texCoord;
>+uniform sampler2D tex;
>+void main()
>+{
>+    gl_FragColor = texture2D(tex, texCoord);
>+})";
>+
>+    ANGLE_GL_PROGRAM(program, kVS, kFS);
>+
>+    // Initialize basic red texture.
>+    const std::vector<GLColor> redColors(4, GLColor::red);
>+    GLTexture texture;
>+    glBindTexture(GL_TEXTURE_2D, texture);
>+    glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, 2, 2, 0, GL_RGBA, GL_UNSIGNED_BYTE, redColors.data());
>+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
>+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
>+    ASSERT_GL_NO_ERROR();
>+
>+    drawQuad(program, "position", 0.0f);
>+
>+    EXPECT_PIXEL_RECT_EQ(0, 0, getWindowWidth(), getWindowHeight(), GLColor::red);
>+}
>+
> // Test that two constructors which have vec4 and mat2 parameters get disambiguated (issue in
> // HLSL).
> TEST_P(GLSLTest_ES3, AmbiguousConstructorCall2x2)
> {
>-    const std::string fragmentShaderSource =
>-        "#version 300 es\n"
>-        "precision highp float;\n"
>-        "out vec4 my_FragColor;\n"
>-        "void main()\n"
>-        "{\n"
>-        "    my_FragColor = vec4(0.0);\n"
>-        "}";
>-
>-    const std::string vertexShaderSource =
>+    constexpr char kVS[] =
>         "#version 300 es\n"
>         "precision highp float;\n"
>         "in vec4 a_vec;\n"
>@@ -1873,7 +2022,7 @@ TEST_P(GLSLTest_ES3, AmbiguousConstructorCall2x2)
>         "    gl_Position = vec4(a_vec) + vec4(a_mat);\n"
>         "}";
> 
>-    GLuint program = CompileProgram(vertexShaderSource, fragmentShaderSource);
>+    GLuint program = CompileProgram(kVS, essl3_shaders::fs::Red());
>     EXPECT_NE(0u, program);
> }
> 
>@@ -1882,16 +2031,7 @@ TEST_P(GLSLTest_ES3, AmbiguousConstructorCall2x2)
> // the function signatures in this case.
> TEST_P(GLSLTest_ES3, AmbiguousConstructorCall2x3)
> {
>-    const std::string fragmentShaderSource =
>-        "#version 300 es\n"
>-        "precision highp float;\n"
>-        "out vec4 my_FragColor;\n"
>-        "void main()\n"
>-        "{\n"
>-        "    my_FragColor = vec4(0.0);\n"
>-        "}";
>-
>-    const std::string vertexShaderSource =
>+    constexpr char kVS[] =
>         "#version 300 es\n"
>         "precision highp float;\n"
>         "in mat3x2 a_matA;\n"
>@@ -1901,23 +2041,14 @@ TEST_P(GLSLTest_ES3, AmbiguousConstructorCall2x3)
>         "    gl_Position = vec4(a_matA) + vec4(a_matB);\n"
>         "}";
> 
>-    GLuint program = CompileProgram(vertexShaderSource, fragmentShaderSource);
>+    GLuint program = CompileProgram(kVS, essl3_shaders::fs::Red());
>     EXPECT_NE(0u, program);
> }
> 
> // Test that two functions which have vec4 and mat2 parameters get disambiguated (issue in HLSL).
> TEST_P(GLSLTest_ES3, AmbiguousFunctionCall2x2)
> {
>-    const std::string fragmentShaderSource =
>-        "#version 300 es\n"
>-        "precision highp float;\n"
>-        "out vec4 my_FragColor;\n"
>-        "void main()\n"
>-        "{\n"
>-        "    my_FragColor = vec4(0.0);\n"
>-        "}";
>-
>-    const std::string vertexShaderSource =
>+    constexpr char kVS[] =
>         "#version 300 es\n"
>         "precision highp float;\n"
>         "in vec4 a_vec;\n"
>@@ -1935,7 +2066,7 @@ TEST_P(GLSLTest_ES3, AmbiguousFunctionCall2x2)
>         "    gl_Position = foo(a_vec) + foo(a_mat);\n"
>         "}";
> 
>-    GLuint program = CompileProgram(vertexShaderSource, fragmentShaderSource);
>+    GLuint program = CompileProgram(kVS, essl3_shaders::fs::Red());
>     EXPECT_NE(0u, program);
> }
> 
>@@ -1943,15 +2074,6 @@ TEST_P(GLSLTest_ES3, AmbiguousFunctionCall2x2)
> // the function name being too long.
> TEST_P(GLSLTest_ES3, LargeNumberOfFloat4Parameters)
> {
>-    const std::string fragmentShaderSource =
>-        "#version 300 es\n"
>-        "precision highp float;\n"
>-        "out vec4 my_FragColor;\n"
>-        "void main()\n"
>-        "{\n"
>-        "    my_FragColor = vec4(0.0);\n"
>-        "}";
>-
>     std::stringstream vertexShaderStream;
>     const unsigned int paramCount = 1024u;
> 
>@@ -1965,12 +2087,13 @@ TEST_P(GLSLTest_ES3, LargeNumberOfFloat4Parameters)
>     }
>     vertexShaderStream << "vec4 aLast)\n"
>                           "{\n"
>-                          "    return ";
>+                          "    vec4 sum = vec4(0.0, 0.0, 0.0, 0.0);\n";
>     for (unsigned int i = 0; i < paramCount; ++i)
>     {
>-        vertexShaderStream << "a" << i << " + ";
>+        vertexShaderStream << "    sum += a" << i << ";\n";
>     }
>-    vertexShaderStream << "aLast;\n"
>+    vertexShaderStream << "    sum += aLast;\n"
>+                          "    return sum;\n "
>                           "}\n"
>                           "void main()\n"
>                           "{\n"
>@@ -1982,7 +2105,7 @@ TEST_P(GLSLTest_ES3, LargeNumberOfFloat4Parameters)
>     vertexShaderStream << "a_vec);\n"
>                           "}";
> 
>-    GLuint program = CompileProgram(vertexShaderStream.str(), fragmentShaderSource);
>+    GLuint program = CompileProgram(vertexShaderStream.str().c_str(), essl3_shaders::fs::Red());
>     EXPECT_NE(0u, program);
> }
> 
>@@ -1996,22 +2119,9 @@ TEST_P(GLSLTest_ES3, LargeNumberOfFloat4Parameters)
> TEST_P(GLSLTest_ES3, InitGlobalArrayWithArrayIndexing)
> {
>     // TODO(ynovikov): re-enable once root cause of http://anglebug.com/1428 is fixed
>-    if (IsAndroid() && IsAdreno() && IsOpenGLES())
>-    {
>-        std::cout << "Test skipped on Adreno OpenGLES on Android." << std::endl;
>-        return;
>-    }
>-
>-    const std::string vertexShaderSource =
>-        "#version 300 es\n"
>-        "precision highp float;\n"
>-        "in vec4 a_vec;\n"
>-        "void main()\n"
>-        "{\n"
>-        "    gl_Position = vec4(a_vec);\n"
>-        "}";
>+    ANGLE_SKIP_TEST_IF(IsAndroid() && IsAdreno() && IsOpenGLES());
> 
>-    const std::string fragmentShaderSource =
>+    constexpr char kFS[] =
>         "#version 300 es\n"
>         "precision highp float;\n"
>         "out vec4 my_FragColor;\n"
>@@ -2022,26 +2132,16 @@ TEST_P(GLSLTest_ES3, InitGlobalArrayWithArrayIndexing)
>         "    my_FragColor = vec4(h[1]);\n"
>         "}";
> 
>-    GLuint program = CompileProgram(vertexShaderSource, fragmentShaderSource);
>+    GLuint program = CompileProgram(essl3_shaders::vs::Simple(), kFS);
>     EXPECT_NE(0u, program);
> }
> 
> // Test that index-constant sampler array indexing is supported.
> TEST_P(GLSLTest, IndexConstantSamplerArrayIndexing)
> {
>-    if (IsD3D11_FL93()) {
>-        std::cout << "Test skipped on D3D11 FL 9.3." << std::endl;
>-        return;
>-    }
>-
>-    const std::string vertexShaderSource =
>-        "attribute vec4 vPosition;\n"
>-        "void main()\n"
>-        "{\n"
>-        "      gl_Position = vPosition;\n"
>-        "}";
>+    ANGLE_SKIP_TEST_IF(IsD3D11_FL93());
> 
>-    const std::string fragmentShaderSource =
>+    constexpr char kFS[] =
>         "precision mediump float;\n"
>         "uniform sampler2D uni[2];\n"
>         "\n"
>@@ -2066,7 +2166,7 @@ TEST_P(GLSLTest, IndexConstantSamplerArrayIndexing)
>         "    gl_FragColor = c;\n"
>         "}";
> 
>-    GLuint program = CompileProgram(vertexShaderSource, fragmentShaderSource);
>+    GLuint program = CompileProgram(essl1_shaders::vs::Simple(), kFS);
>     EXPECT_NE(0u, program);
> }
> 
>@@ -2075,21 +2175,14 @@ TEST_P(GLSLTest, IndexConstantSamplerArrayIndexing)
> // want to test its behavior, so don't use any varyings.
> TEST_P(GLSLTest, PragmaDirective)
> {
>-    const std::string vertexShaderSource =
>+    constexpr char kVS[] =
>         "#pragma STDGL invariant(all)\n"
>         "void main()\n"
>         "{\n"
>         "    gl_Position = vec4(1.0, 0.0, 0.0, 1.0);\n"
>         "}\n";
> 
>-    const std::string fragmentShaderSource =
>-        "precision mediump float;\n"
>-        "void main()\n"
>-        "{\n"
>-        "    gl_FragColor = vec4(1.0);\n"
>-        "}\n";
>-
>-    GLuint program = CompileProgram(vertexShaderSource, fragmentShaderSource);
>+    GLuint program = CompileProgram(kVS, essl1_shaders::fs::Red());
>     EXPECT_NE(0u, program);
> }
> 
>@@ -2098,7 +2191,7 @@ TEST_P(GLSLTest, PragmaDirective)
> // return the correct value (true).
> TEST_P(GLSLTest_ES3, SequenceOperatorEvaluationOrderArray)
> {
>-    const std::string &fragmentShaderSource =
>+    constexpr char kFS[] =
>         "#version 300 es\n"
>         "precision mediump float;\n"
>         "out vec4 my_FragColor; \n"
>@@ -2115,10 +2208,10 @@ TEST_P(GLSLTest_ES3, SequenceOperatorEvaluationOrderArray)
>         "    my_FragColor = vec4(0.0, (result ? 1.0 : 0.0), 0.0, 1.0);\n"
>         "}\n";
> 
>-    GLuint program = CompileProgram(mSimpleVSSource, fragmentShaderSource);
>+    GLuint program = CompileProgram(essl3_shaders::vs::Simple(), kFS);
>     ASSERT_NE(0u, program);
> 
>-    drawQuad(program, "inputAttribute", 0.5f);
>+    drawQuad(program, essl3_shaders::PositionAttrib(), 0.5f);
> 
>     EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::green);
> }
>@@ -2128,7 +2221,7 @@ TEST_P(GLSLTest_ES3, SequenceOperatorEvaluationOrderArray)
> // correct value (true).
> TEST_P(GLSLTest_ES3, SequenceOperatorEvaluationOrderShortCircuit)
> {
>-    const std::string &fragmentShaderSource =
>+    constexpr char kFS[] =
>         "#version 300 es\n"
>         "precision mediump float;\n"
>         "out vec4 my_FragColor; \n"
>@@ -2138,10 +2231,10 @@ TEST_P(GLSLTest_ES3, SequenceOperatorEvaluationOrderShortCircuit)
>         "    my_FragColor = vec4(0.0, ((result && j == 1) ? 1.0 : 0.0), 0.0, 1.0);\n"
>         "}\n";
> 
>-    GLuint program = CompileProgram(mSimpleVSSource, fragmentShaderSource);
>+    GLuint program = CompileProgram(essl3_shaders::vs::Simple(), kFS);
>     ASSERT_NE(0u, program);
> 
>-    drawQuad(program, "inputAttribute", 0.5f);
>+    drawQuad(program, essl3_shaders::PositionAttrib(), 0.5f);
> 
>     EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::green);
> }
>@@ -2150,7 +2243,7 @@ TEST_P(GLSLTest_ES3, SequenceOperatorEvaluationOrderShortCircuit)
> // Indexing the vector needs to be evaluated after func() for the right result.
> TEST_P(GLSLTest_ES3, SequenceOperatorEvaluationOrderDynamicVectorIndexingInLValue)
> {
>-    const std::string &fragmentShaderSource =
>+    constexpr char kFS[] =
>         "#version 300 es\n"
>         "precision mediump float;\n"
>         "out vec4 my_FragColor;\n"
>@@ -2167,10 +2260,10 @@ TEST_P(GLSLTest_ES3, SequenceOperatorEvaluationOrderDynamicVectorIndexingInLValu
>         "    my_FragColor = vec4(0.0, (green ? 1.0 : 0.0), 0.0, 1.0);\n"
>         "}\n";
> 
>-    GLuint program = CompileProgram(mSimpleVSSource, fragmentShaderSource);
>+    GLuint program = CompileProgram(essl3_shaders::vs::Simple(), kFS);
>     ASSERT_NE(0u, program);
> 
>-    drawQuad(program, "inputAttribute", 0.5f);
>+    drawQuad(program, essl3_shaders::PositionAttrib(), 0.5f);
> 
>     EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::green);
> }
>@@ -2180,21 +2273,21 @@ TEST_P(GLSLTest_ES3, SequenceOperatorEvaluationOrderDynamicVectorIndexingInLValu
> // See http://anglebug.com/1380
> TEST_P(GLSLTest, RenderTrisWithPointCoord)
> {
>-    const std::string &vert =
>+    constexpr char kVS[] =
>         "attribute vec2 aPosition;\n"
>         "void main()\n"
>         "{\n"
>         "    gl_Position = vec4(aPosition, 0, 1);\n"
>         "    gl_PointSize = 1.0;\n"
>         "}";
>-    const std::string &frag =
>+    constexpr char kFS[] =
>         "void main()\n"
>         "{\n"
>         "    gl_FragColor = vec4(gl_PointCoord.xy, 0, 1);\n"
>         "    gl_FragColor = vec4(0, 1, 0, 1);\n"
>         "}";
> 
>-    ANGLE_GL_PROGRAM(prog, vert, frag);
>+    ANGLE_GL_PROGRAM(prog, kVS, kFS);
>     drawQuad(prog.get(), "aPosition", 0.5f);
>     EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::green);
> }
>@@ -2202,13 +2295,7 @@ TEST_P(GLSLTest, RenderTrisWithPointCoord)
> // Convers a bug with the integer pow statement workaround.
> TEST_P(GLSLTest, NestedPowStatements)
> {
>-    const std::string &vert =
>-        "attribute vec2 position;\n"
>-        "void main()\n"
>-        "{\n"
>-        "    gl_Position = vec4(position, 0, 1);\n"
>-        "}";
>-    const std::string &frag =
>+    constexpr char kFS[] =
>         "precision mediump float;\n"
>         "float func(float v)\n"
>         "{\n"
>@@ -2221,21 +2308,15 @@ TEST_P(GLSLTest, NestedPowStatements)
>         "    gl_FragColor = abs(v - 36.0) < 0.001 ? vec4(0, 1, 0, 1) : vec4(1, 0, 0, 1);\n"
>         "}";
> 
>-    ANGLE_GL_PROGRAM(prog, vert, frag);
>-    drawQuad(prog.get(), "position", 0.5f);
>+    ANGLE_GL_PROGRAM(prog, essl1_shaders::vs::Simple(), kFS);
>+    drawQuad(prog.get(), essl1_shaders::PositionAttrib(), 0.5f);
>     EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::green);
> }
> 
> // Test that -float calculation is correct.
> TEST_P(GLSLTest_ES3, UnaryMinusOperatorFloat)
> {
>-    const std::string &vert =
>-        "#version 300 es\n"
>-        "in highp vec4 position;\n"
>-        "void main() {\n"
>-        "    gl_Position = position;\n"
>-        "}\n";
>-    const std::string &frag =
>+    constexpr char kFS[] =
>         "#version 300 es\n"
>         "out highp vec4 o_color;\n"
>         "void main() {\n"
>@@ -2245,21 +2326,15 @@ TEST_P(GLSLTest_ES3, UnaryMinusOperatorFloat)
>         "    o_color = abs(v - 0.5) < 0.001 ? vec4(0, 1, 0, 1) : vec4(1, 0, 0, 1);\n"
>         "}\n";
> 
>-    ANGLE_GL_PROGRAM(prog, vert, frag);
>-    drawQuad(prog.get(), "position", 0.5f);
>+    ANGLE_GL_PROGRAM(prog, essl3_shaders::vs::Simple(), kFS);
>+    drawQuad(prog.get(), essl3_shaders::PositionAttrib(), 0.5f);
>     EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::green);
> }
> 
> // Test that atan(vec2, vec2) calculation is correct.
> TEST_P(GLSLTest_ES3, AtanVec2)
> {
>-    const std::string &vert =
>-        "#version 300 es\n"
>-        "in highp vec4 position;\n"
>-        "void main() {\n"
>-        "    gl_Position = position;\n"
>-        "}\n";
>-    const std::string &frag =
>+    constexpr char kFS[] =
>         "#version 300 es\n"
>         "out highp vec4 o_color;\n"
>         "void main() {\n"
>@@ -2270,15 +2345,15 @@ TEST_P(GLSLTest_ES3, AtanVec2)
>         "vec4(1, 0, 0, 1);\n"
>         "}\n";
> 
>-    ANGLE_GL_PROGRAM(prog, vert, frag);
>-    drawQuad(prog.get(), "position", 0.5f);
>+    ANGLE_GL_PROGRAM(prog, essl3_shaders::vs::Simple(), kFS);
>+    drawQuad(prog.get(), essl3_shaders::PositionAttrib(), 0.5f);
>     EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::green);
> }
> 
> // Convers a bug with the unary minus operator on signed integer workaround.
> TEST_P(GLSLTest_ES3, UnaryMinusOperatorSignedInt)
> {
>-    const std::string &vert =
>+    constexpr char kVS[] =
>         "#version 300 es\n"
>         "in highp vec4 position;\n"
>         "out mediump vec4 v_color;\n"
>@@ -2297,7 +2372,7 @@ TEST_P(GLSLTest_ES3, UnaryMinusOperatorSignedInt)
>         "    v_color = (result == 2) ? vec4(0, 1, 0, 1) : vec4(1, 0, 0, 1);\n"
>         "    gl_Position = position;\n"
>         "}\n";
>-    const std::string &frag =
>+    constexpr char kFS[] =
>         "#version 300 es\n"
>         "in mediump vec4 v_color;\n"
>         "layout(location=0) out mediump vec4 o_color;\n"
>@@ -2305,7 +2380,7 @@ TEST_P(GLSLTest_ES3, UnaryMinusOperatorSignedInt)
>         "    o_color = v_color;\n"
>         "}\n";
> 
>-    ANGLE_GL_PROGRAM(prog, vert, frag);
>+    ANGLE_GL_PROGRAM(prog, kVS, kFS);
> 
>     GLint oneIndex = glGetUniformLocation(prog.get(), "ui_one");
>     ASSERT_NE(-1, oneIndex);
>@@ -2325,7 +2400,11 @@ TEST_P(GLSLTest_ES3, UnaryMinusOperatorSignedInt)
> // Convers a bug with the unary minus operator on unsigned integer workaround.
> TEST_P(GLSLTest_ES3, UnaryMinusOperatorUnsignedInt)
> {
>-    const std::string &vert =
>+    // TODO(syoussefi): missing [gs]etUniform support with unsigned formats.
>+    // http://anglebug.com/2392
>+    ANGLE_SKIP_TEST_IF(IsVulkan());
>+
>+    constexpr char kVS[] =
>         "#version 300 es\n"
>         "in highp vec4 position;\n"
>         "out mediump vec4 v_color;\n"
>@@ -2344,7 +2423,7 @@ TEST_P(GLSLTest_ES3, UnaryMinusOperatorUnsignedInt)
>         "    v_color = (result == 2u) ? vec4(0, 1, 0, 1) : vec4(1, 0, 0, 1);\n"
>         "    gl_Position = position;\n"
>         "}\n";
>-    const std::string &frag =
>+    constexpr char kFS[] =
>         "#version 300 es\n"
>         "in mediump vec4 v_color;\n"
>         "layout(location=0) out mediump vec4 o_color;\n"
>@@ -2352,7 +2431,7 @@ TEST_P(GLSLTest_ES3, UnaryMinusOperatorUnsignedInt)
>         "    o_color = v_color;\n"
>         "}\n";
> 
>-    ANGLE_GL_PROGRAM(prog, vert, frag);
>+    ANGLE_GL_PROGRAM(prog, kVS, kFS);
> 
>     GLint oneIndex = glGetUniformLocation(prog.get(), "ui_one");
>     ASSERT_NE(-1, oneIndex);
>@@ -2373,16 +2452,9 @@ TEST_P(GLSLTest_ES3, UnaryMinusOperatorUnsignedInt)
> // intended to be such that it gets converted to an if statement on the HLSL backend.
> TEST_P(GLSLTest, NestedSequenceOperatorWithTernaryInside)
> {
>-    const std::string &vert =
>-        "attribute vec2 position;\n"
>-        "void main()\n"
>-        "{\n"
>-        "    gl_Position = vec4(position, 0, 1);\n"
>-        "}";
>-
>     // Note that the uniform keep_flop_positive doesn't need to be set - the test expects it to have
>     // its default value false.
>-    const std::string &frag =
>+    constexpr char kFS[] =
>         "precision mediump float;\n"
>         "uniform bool keep_flop_positive;\n"
>         "float flop;\n"
>@@ -2393,41 +2465,34 @@ TEST_P(GLSLTest, NestedSequenceOperatorWithTernaryInside)
>         "    gl_FragColor = vec4(0, -flop, 0, 1);\n"
>         "}";
> 
>-    ANGLE_GL_PROGRAM(prog, vert, frag);
>-    drawQuad(prog.get(), "position", 0.5f);
>+    ANGLE_GL_PROGRAM(prog, essl1_shaders::vs::Simple(), kFS);
>+    drawQuad(prog.get(), essl1_shaders::PositionAttrib(), 0.5f);
>     EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::green);
> }
> 
> // Test that using a sampler2D and samplerExternalOES in the same shader works (anglebug.com/1534)
> TEST_P(GLSLTest, ExternalAnd2DSampler)
> {
>-    if (!extensionEnabled("GL_OES_EGL_image_external"))
>-    {
>-        std::cout << "Test skipped because GL_OES_EGL_image_external is not available."
>-                  << std::endl;
>-        return;
>-    }
>+    ANGLE_SKIP_TEST_IF(!IsGLExtensionEnabled("GL_OES_EGL_image_external"));
> 
>-    const std::string fragmentShader =
>-        R"(
>-        #extension GL_OES_EGL_image_external : enable
>-        precision mediump float;
>-        uniform samplerExternalOES tex0;
>-        uniform sampler2D tex1;
>-        void main(void)
>-        {
>-            vec2 uv = vec2(0.0, 0.0);
>-            gl_FragColor = texture2D(tex0, uv) + texture2D(tex1, uv);
>-        })";
>+    constexpr char kFS[] = R"(#extension GL_OES_EGL_image_external : enable
>+precision mediump float;
>+uniform samplerExternalOES tex0;
>+uniform sampler2D tex1;
>+void main(void)
>+{
>+    vec2 uv = vec2(0.0, 0.0);
>+    gl_FragColor = texture2D(tex0, uv) + texture2D(tex1, uv);
>+})";
> 
>-    ANGLE_GL_PROGRAM(program, mSimpleVSSource, fragmentShader);
>+    ANGLE_GL_PROGRAM(program, essl1_shaders::vs::Simple(), kFS);
> }
> 
> // Test that literal infinity can be written out from the shader translator.
> // A similar test can't be made for NaNs, since ESSL 3.00.6 requirements for NaNs are very loose.
> TEST_P(GLSLTest_ES3, LiteralInfinityOutput)
> {
>-    const std::string &fragmentShader =
>+    constexpr char kFS[] =
>         "#version 300 es\n"
>         "precision highp float;\n"
>         "out vec4 out_color;\n"
>@@ -2439,8 +2504,8 @@ TEST_P(GLSLTest_ES3, LiteralInfinityOutput)
>         "   out_color = correct ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0);\n"
>         "}\n";
> 
>-    ANGLE_GL_PROGRAM(program, mSimpleVSSource, fragmentShader);
>-    drawQuad(program.get(), "inputAttribute", 0.5f);
>+    ANGLE_GL_PROGRAM(program, essl3_shaders::vs::Simple(), kFS);
>+    drawQuad(program.get(), essl3_shaders::PositionAttrib(), 0.5f);
>     EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::green);
> }
> 
>@@ -2448,7 +2513,7 @@ TEST_P(GLSLTest_ES3, LiteralInfinityOutput)
> // A similar test can't be made for NaNs, since ESSL 3.00.6 requirements for NaNs are very loose.
> TEST_P(GLSLTest_ES3, LiteralNegativeInfinityOutput)
> {
>-    const std::string &fragmentShader =
>+    constexpr char kFS[] =
>         "#version 300 es\n"
>         "precision highp float;\n"
>         "out vec4 out_color;\n"
>@@ -2460,8 +2525,8 @@ TEST_P(GLSLTest_ES3, LiteralNegativeInfinityOutput)
>         "   out_color = correct ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0);\n"
>         "}\n";
> 
>-    ANGLE_GL_PROGRAM(program, mSimpleVSSource, fragmentShader);
>-    drawQuad(program.get(), "inputAttribute", 0.5f);
>+    ANGLE_GL_PROGRAM(program, essl3_shaders::vs::Simple(), kFS);
>+    drawQuad(program.get(), essl3_shaders::PositionAttrib(), 0.5f);
>     EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::green);
> }
> 
>@@ -2473,61 +2538,59 @@ TEST_P(GLSLTest_ES3, LiteralNegativeInfinityOutput)
> // Test that passes splitting multiple declarations and comma operators are correctly ordered.
> TEST_P(GLSLTest_ES3, MultipleDeclarationWithCommaOperator)
> {
>-    const std::string &fragmentShader =
>-        R"(#version 300 es
>-        precision mediump float;
>-        out vec4 color;
>+    constexpr char kFS[] = R"(#version 300 es
>+precision mediump float;
>+out vec4 color;
> 
>-        uniform float u;
>-        float c = 0.0;
>-        float sideEffect()
>-        {
>-            c = u;
>-            return c;
>-        }
>+uniform float u;
>+float c = 0.0;
>+float sideEffect()
>+{
>+    c = u;
>+    return c;
>+}
> 
>-        void main(void)
>-        {
>-            float a = 0.0, b = ((gl_FragCoord.x < 0.5 ? a : sideEffect()), a);
>-            color = vec4(b + c);
>-        })";
>+void main(void)
>+{
>+    float a = 0.0, b = ((gl_FragCoord.x < 0.5 ? a : sideEffect()), a);
>+    color = vec4(b + c);
>+})";
> 
>-    ANGLE_GL_PROGRAM(program, mSimpleVSSource, fragmentShader);
>+    ANGLE_GL_PROGRAM(program, essl3_shaders::vs::Simple(), kFS);
> }
> 
> // Test that passes splitting multiple declarations and comma operators and for loops are
> // correctly ordered.
> TEST_P(GLSLTest_ES3, MultipleDeclarationWithCommaOperatorInForLoop)
> {
>-    const std::string &fragmentShader =
>-        R"(#version 300 es
>-        precision mediump float;
>-        out vec4 color;
>+    constexpr char kFS[] = R"(#version 300 es
>+precision mediump float;
>+out vec4 color;
> 
>-        uniform float u;
>-        float c = 0.0;
>-        float sideEffect()
>-        {
>-            c = u;
>-            return c;
>-        }
>+uniform float u;
>+float c = 0.0;
>+float sideEffect()
>+{
>+    c = u;
>+    return c;
>+}
> 
>-        void main(void)
>-        {
>-            for(float a = 0.0, b = ((gl_FragCoord.x < 0.5 ? a : sideEffect()), a); a < 10.0; a++)
>-            {
>-                b += 1.0;
>-                color = vec4(b);
>-            }
>-        })";
>+void main(void)
>+{
>+    for(float a = 0.0, b = ((gl_FragCoord.x < 0.5 ? a : sideEffect()), a); a < 10.0; a++)
>+    {
>+        b += 1.0;
>+        color = vec4(b);
>+    }
>+})";
> 
>-    ANGLE_GL_PROGRAM(program, mSimpleVSSource, fragmentShader);
>+    ANGLE_GL_PROGRAM(program, essl3_shaders::vs::Simple(), kFS);
> }
> 
> // Test that splitting multiple declaration in for loops works with no loop condition
> TEST_P(GLSLTest_ES3, MultipleDeclarationInForLoopEmptyCondition)
> {
>-    const std::string &fragmentShader =
>+    constexpr char kFS[] =
>         "#version 300 es\n"
>         "precision mediump float;\n"
>         "out vec4 color;\n"
>@@ -2541,13 +2604,13 @@ TEST_P(GLSLTest_ES3, MultipleDeclarationInForLoopEmptyCondition)
>         " }\n"
>         "}\n";
> 
>-    ANGLE_GL_PROGRAM(program, mSimpleVSSource, fragmentShader);
>+    ANGLE_GL_PROGRAM(program, essl3_shaders::vs::Simple(), kFS);
> }
> 
> // Test that splitting multiple declaration in for loops works with no loop expression
> TEST_P(GLSLTest_ES3, MultipleDeclarationInForLoopEmptyExpression)
> {
>-    const std::string &fragmentShader =
>+    constexpr char kFS[] =
>         "#version 300 es\n"
>         "precision mediump float;\n"
>         "out vec4 color;\n"
>@@ -2561,14 +2624,14 @@ TEST_P(GLSLTest_ES3, MultipleDeclarationInForLoopEmptyExpression)
>         " }\n"
>         "}\n";
> 
>-    ANGLE_GL_PROGRAM(program, mSimpleVSSource, fragmentShader);
>+    ANGLE_GL_PROGRAM(program, essl3_shaders::vs::Simple(), kFS);
> }
> 
> // Test that dynamic indexing of a matrix inside a dynamic indexing of a vector in an l-value works
> // correctly.
> TEST_P(GLSLTest_ES3, NestedDynamicIndexingInLValue)
> {
>-    const std::string &fragmentShader =
>+    constexpr char kFS[] =
>         "#version 300 es\n"
>         "precision mediump float;\n"
>         "out vec4 my_FragColor;\n"
>@@ -2580,8 +2643,8 @@ TEST_P(GLSLTest_ES3, NestedDynamicIndexingInLValue)
>         "    my_FragColor = vec4(1.0 - f, f, 0.0, 1.0);\n"
>         "}\n";
> 
>-    ANGLE_GL_PROGRAM(program, mSimpleVSSource, fragmentShader);
>-    drawQuad(program.get(), "inputAttribute", 0.5f);
>+    ANGLE_GL_PROGRAM(program, essl3_shaders::vs::Simple(), kFS);
>+    drawQuad(program.get(), essl3_shaders::PositionAttrib(), 0.5f);
>     EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::green);
> }
> 
>@@ -2658,13 +2721,12 @@ TEST_P(WebGLGLSLTest, MaxVaryingVec3ArrayAndMaxPlusOneFloatArray)
> TEST_P(GLSLTest_ES31, FindMSBAndFindLSBCornerCases)
> {
>     // Suspecting AMD driver bug - failure seen on bots running on AMD R5 230.
>-    if (IsAMD() && IsOpenGL() && IsLinux())
>-    {
>-        std::cout << "Test skipped on AMD OpenGL Linux" << std::endl;
>-        return;
>-    }
>+    ANGLE_SKIP_TEST_IF(IsAMD() && IsOpenGL() && IsLinux());
> 
>-    const std::string &fragmentShader =
>+    // Failing on N5X Oreo http://anglebug.com/2304
>+    ANGLE_SKIP_TEST_IF(IsAndroid() && IsAdreno() && IsOpenGLES());
>+
>+    constexpr char kFS[] =
>         "#version 310 es\n"
>         "precision mediump float;\n"
>         "out vec4 my_FragColor;\n"
>@@ -2680,26 +2742,21 @@ TEST_P(GLSLTest_ES31, FindMSBAndFindLSBCornerCases)
>         "    }\n"
>         "}\n";
> 
>-    ANGLE_GL_PROGRAM(program, mSimpleVSSource, fragmentShader);
>-    drawQuad(program.get(), "inputAttribute", 0.5f);
>+    ANGLE_GL_PROGRAM(program, essl31_shaders::vs::Simple(), kFS);
>+    drawQuad(program.get(), essl31_shaders::PositionAttrib(), 0.5f);
>     EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::green);
> }
> 
> // Test that writing into a swizzled vector that is dynamically indexed succeeds.
> TEST_P(GLSLTest_ES3, WriteIntoDynamicIndexingOfSwizzledVector)
> {
>-    if (IsOpenGL())
>-    {
>-        // http://anglebug.com/1924
>-        std::cout << "Test skipped on all OpenGL configurations because it has incorrect results"
>-                  << std::endl;
>-        return;
>-    }
>+    // http://anglebug.com/1924
>+    ANGLE_SKIP_TEST_IF(IsOpenGL());
> 
>     // The shader first assigns v.x to v.z (1.0)
>     // Then v.y to v.y (2.0)
>     // Then v.z to v.x (1.0)
>-    const std::string &fragmentShader =
>+    constexpr char kFS[] =
>         "#version 300 es\n"
>         "precision highp float;\n"
>         "out vec4 my_FragColor;\n"
>@@ -2712,8 +2769,8 @@ TEST_P(GLSLTest_ES3, WriteIntoDynamicIndexingOfSwizzledVector)
>         "0, 0, 1);\n"
>         "}\n";
> 
>-    ANGLE_GL_PROGRAM(program, mSimpleVSSource, fragmentShader);
>-    drawQuad(program.get(), "inputAttribute", 0.5f);
>+    ANGLE_GL_PROGRAM(program, essl3_shaders::vs::Simple(), kFS);
>+    drawQuad(program.get(), essl3_shaders::PositionAttrib(), 0.5f);
>     EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::green);
> }
> 
>@@ -2723,13 +2780,10 @@ TEST_P(GLSLTest_ES3, NestedSamplingOperation)
> {
>     // This seems to be bugged on some version of Android. Might not affect the newest versions.
>     // TODO(jmadill): Lift suppression when Chromium bots are upgraded.
>-    if (IsAndroid() && IsOpenGLES())
>-    {
>-        std::cout << "Test skipped on Android because of bug with Nexus 5X." << std::endl;
>-        return;
>-    }
>+    // Test skipped on Android because of bug with Nexus 5X.
>+    ANGLE_SKIP_TEST_IF(IsAndroid() && IsOpenGLES());
> 
>-    const std::string &vertexShader =
>+    constexpr char kVS[] =
>         "#version 300 es\n"
>         "out vec2 texCoord;\n"
>         "in vec2 position;\n"
>@@ -2739,7 +2793,7 @@ TEST_P(GLSLTest_ES3, NestedSamplingOperation)
>         "    texCoord = position * 0.5 + vec2(0.5);\n"
>         "}\n";
> 
>-    const std::string &simpleFragmentShader =
>+    constexpr char kSimpleFS[] =
>         "#version 300 es\n"
>         "in mediump vec2 texCoord;\n"
>         "out mediump vec4 fragColor;\n"
>@@ -2748,7 +2802,7 @@ TEST_P(GLSLTest_ES3, NestedSamplingOperation)
>         "    fragColor = vec4(texCoord, 0, 1);\n"
>         "}\n";
> 
>-    const std::string &nestedFragmentShader =
>+    constexpr char kNestedFS[] =
>         "#version 300 es\n"
>         "uniform mediump sampler2D samplerA;\n"
>         "uniform mediump sampler2D samplerB;\n"
>@@ -2759,8 +2813,8 @@ TEST_P(GLSLTest_ES3, NestedSamplingOperation)
>         "    fragColor = texture(samplerB, texture(samplerA, texCoord).xy);\n"
>         "}\n";
> 
>-    ANGLE_GL_PROGRAM(initProg, vertexShader, simpleFragmentShader);
>-    ANGLE_GL_PROGRAM(nestedProg, vertexShader, nestedFragmentShader);
>+    ANGLE_GL_PROGRAM(initProg, kVS, kSimpleFS);
>+    ANGLE_GL_PROGRAM(nestedProg, kVS, kNestedFS);
> 
>     // Initialize a first texture with default texCoord data.
>     GLTexture texA;
>@@ -2821,14 +2875,14 @@ TEST_P(GLSLTest_ES3, NestedSamplingOperation)
> // doesn't crash.
> TEST_P(GLSLTest, ConstantStatementInForLoop)
> {
>-    const std::string &vertexShader =
>+    constexpr char kVS[] =
>         "void main()\n"
>         "{\n"
>         "    for (int i = 0; i < 10; ++i)\n"
>         "        const int b = 0;\n"
>         "}\n";
> 
>-    GLuint shader = CompileShader(GL_VERTEX_SHADER, vertexShader);
>+    GLuint shader = CompileShader(GL_VERTEX_SHADER, kVS);
>     EXPECT_NE(0u, shader);
>     glDeleteShader(shader);
> }
>@@ -2837,13 +2891,13 @@ TEST_P(GLSLTest, ConstantStatementInForLoop)
> // test doesn't work on D3D9 due to looping limitations, so it is only run on ES3.
> TEST_P(GLSLTest_ES3, ConstantStatementAsLoopInit)
> {
>-    const std::string &vertexShader =
>+    constexpr char kVS[] =
>         "void main()\n"
>         "{\n"
>         "    for (const int i = 0; i < 0;) {}\n"
>         "}\n";
> 
>-    GLuint shader = CompileShader(GL_VERTEX_SHADER, vertexShader);
>+    GLuint shader = CompileShader(GL_VERTEX_SHADER, kVS);
>     EXPECT_NE(0u, shader);
>     glDeleteShader(shader);
> }
>@@ -2851,16 +2905,11 @@ TEST_P(GLSLTest_ES3, ConstantStatementAsLoopInit)
> // Test that uninitialized local variables are initialized to 0.
> TEST_P(GLSLTest_ES3, InitUninitializedLocals)
> {
>-    if (IsAndroid() && IsOpenGLES())
>-    {
>-        // http://anglebug.com/2046
>-        std::cout
>-            << "Test skipped on Android GLES because local variable initialization is disabled."
>-            << std::endl;
>-        return;
>-    }
>+    // Test skipped on Android GLES because local variable initialization is disabled.
>+    // http://anglebug.com/2046
>+    ANGLE_SKIP_TEST_IF(IsAndroid() && IsOpenGLES());
> 
>-    const std::string &fragmentShader =
>+    constexpr char kFS[] =
>         "#version 300 es\n"
>         "precision mediump float;\n"
>         "out vec4 my_FragColor;\n"
>@@ -2884,8 +2933,8 @@ TEST_P(GLSLTest_ES3, InitUninitializedLocals)
>         "    }\n"
>         "}\n";
> 
>-    ANGLE_GL_PROGRAM(program, mSimpleVSSource, fragmentShader);
>-    drawQuad(program.get(), "inputAttribute", 0.5f);
>+    ANGLE_GL_PROGRAM(program, essl3_shaders::vs::Simple(), kFS);
>+    drawQuad(program.get(), essl3_shaders::PositionAttrib(), 0.5f);
>     EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::green);
> }
> 
>@@ -2893,24 +2942,11 @@ TEST_P(GLSLTest_ES3, InitUninitializedLocals)
> // specifically tests with two different struct variables declared in the same block.
> TEST_P(GLSLTest, InitUninitializedStructContainingArrays)
> {
>-    if (IsAndroid() && IsOpenGLES())
>-    {
>-        // http://anglebug.com/2046
>-        std::cout
>-            << "Test skipped on Android GLES because local variable initialization is disabled."
>-            << std::endl;
>-        return;
>-    }
>-
>-    if (IsOSX() && IsOpenGL())
>-    {
>-        // http://anglebug.com/2041
>-        std::cout << "Test skipped on Mac OpenGL because local variable initialization is disabled."
>-                  << std::endl;
>-        return;
>-    }
>+    // Test skipped on Android GLES because local variable initialization is disabled.
>+    // http://anglebug.com/2046
>+    ANGLE_SKIP_TEST_IF(IsAndroid() && IsOpenGLES());
> 
>-    const std::string &fragmentShader =
>+    constexpr char kFS[] =
>         "precision mediump float;\n"
>         "struct T\n"
>         "{\n"
>@@ -2934,8 +2970,8 @@ TEST_P(GLSLTest, InitUninitializedStructContainingArrays)
>         "    }\n"
>         "}\n";
> 
>-    ANGLE_GL_PROGRAM(program, mSimpleVSSource, fragmentShader);
>-    drawQuad(program.get(), "inputAttribute", 0.5f);
>+    ANGLE_GL_PROGRAM(program, essl1_shaders::vs::Simple(), kFS);
>+    drawQuad(program.get(), essl1_shaders::PositionAttrib(), 0.5f);
>     EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::green);
> }
> 
>@@ -2990,24 +3026,11 @@ TEST_P(GLSLTest, StructureNameMatchingTest)
> // Test that an uninitialized nameless struct inside a for loop init statement works.
> TEST_P(GLSLTest_ES3, UninitializedNamelessStructInForInitStatement)
> {
>-    if (IsAndroid() && IsOpenGLES())
>-    {
>-        // http://anglebug.com/2046
>-        std::cout
>-            << "Test skipped on Android GLES because local variable initialization is disabled."
>-            << std::endl;
>-        return;
>-    }
>-
>-    if (IsOSX() && IsOpenGL())
>-    {
>-        // http://anglebug.com/2041
>-        std::cout << "Test skipped on Mac OpenGL because local variable initialization is disabled."
>-                  << std::endl;
>-        return;
>-    }
>+    // Test skipped on Android GLES because local variable initialization is disabled.
>+    // http://anglebug.com/2046
>+    ANGLE_SKIP_TEST_IF(IsAndroid() && IsOpenGLES());
> 
>-    const std::string &fragmentShader =
>+    constexpr char kFS[] =
>         "#version 300 es\n"
>         "precision highp float;\n"
>         "out vec4 my_FragColor;\n"
>@@ -3019,15 +3042,18 @@ TEST_P(GLSLTest_ES3, UninitializedNamelessStructInForInitStatement)
>         "    }\n"
>         "}\n";
> 
>-    ANGLE_GL_PROGRAM(program, mSimpleVSSource, fragmentShader);
>-    drawQuad(program.get(), "inputAttribute", 0.5f);
>+    ANGLE_GL_PROGRAM(program, essl3_shaders::vs::Simple(), kFS);
>+    drawQuad(program.get(), essl3_shaders::PositionAttrib(), 0.5f);
>     EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::green);
> }
> 
> // Test that uninitialized global variables are initialized to 0.
> TEST_P(WebGLGLSLTest, InitUninitializedGlobals)
> {
>-    const std::string &fragmentShader =
>+    // http://anglebug.com/2862
>+    ANGLE_SKIP_TEST_IF(IsAndroid() && IsAdreno() && IsOpenGLES());
>+
>+    constexpr char kFS[] =
>         "precision mediump float;\n"
>         "int result;\n"
>         "int i[2], j = i[0] + 1;\n"
>@@ -3044,15 +3070,15 @@ TEST_P(WebGLGLSLTest, InitUninitializedGlobals)
>         "    }\n"
>         "}\n";
> 
>-    ANGLE_GL_PROGRAM(program, mSimpleVSSource, fragmentShader);
>-    drawQuad(program.get(), "inputAttribute", 0.5f, 1.0f, true);
>+    ANGLE_GL_PROGRAM(program, essl1_shaders::vs::Simple(), kFS);
>+    drawQuad(program.get(), essl1_shaders::PositionAttrib(), 0.5f, 1.0f, true);
>     EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::green);
> }
> 
> // Test that an uninitialized nameless struct in the global scope works.
> TEST_P(WebGLGLSLTest, UninitializedNamelessStructInGlobalScope)
> {
>-    const std::string &fragmentShader =
>+    constexpr char kFS[] =
>         "precision mediump float;\n"
>         "struct { float q; } b;\n"
>         "void main()\n"
>@@ -3064,68 +3090,175 @@ TEST_P(WebGLGLSLTest, UninitializedNamelessStructInGlobalScope)
>         "    }\n"
>         "}\n";
> 
>-    ANGLE_GL_PROGRAM(program, mSimpleVSSource, fragmentShader);
>-    drawQuad(program.get(), "inputAttribute", 0.5f, 1.0f, true);
>+    ANGLE_GL_PROGRAM(program, essl1_shaders::vs::Simple(), kFS);
>+    drawQuad(program.get(), essl1_shaders::PositionAttrib(), 0.5f, 1.0f, true);
>     EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::green);
> }
> 
>-// Test that a loop condition that has an initializer declares a variable.
>-TEST_P(GLSLTest_ES3, ConditionInitializerDeclaresVariable)
>+// Tests nameless struct uniforms.
>+TEST_P(GLSLTest, EmbeddedStructUniform)
> {
>-    const std::string &fragmentShader =
>-        "#version 300 es\n"
>-        "precision highp float;\n"
>-        "out vec4 my_FragColor;\n"
>-        "void main()\n"
>-        "{\n"
>-        "    float i = 0.0;\n"
>-        "    while (bool foo = (i < 1.5))\n"
>-        "    {\n"
>-        "        if (!foo)\n"
>-        "        {\n"
>-        "            ++i;\n"
>-        "        }\n"
>-        "        if (i > 3.5)\n"
>-        "        {\n"
>-        "            break;\n"
>-        "        }\n"
>-        "        ++i;\n"
>-        "    }\n"
>-        "    my_FragColor = vec4(i * 0.5 - 1.0, i * 0.5, 0.0, 1.0);\n"
>-        "}\n";
>+    const char kFragmentShader[] = R"(precision mediump float;
>+uniform struct { float q; } b;
>+void main()
>+{
>+    gl_FragColor = vec4(1, 0, 0, 1);
>+    if (b.q == 0.5)
>+    {
>+        gl_FragColor = vec4(0, 1, 0, 1);
>+    }
>+})";
> 
>-    ANGLE_GL_PROGRAM(program, mSimpleVSSource, fragmentShader);
>-    drawQuad(program.get(), "inputAttribute", 0.5f);
>+    ANGLE_GL_PROGRAM(program, essl1_shaders::vs::Simple(), kFragmentShader);
>+    glUseProgram(program);
>+    GLint uniLoc = glGetUniformLocation(program, "b.q");
>+    ASSERT_NE(-1, uniLoc);
>+    glUniform1f(uniLoc, 0.5f);
>+
>+    drawQuad(program.get(), essl1_shaders::PositionAttrib(), 0.5f, 1.0f, true);
>     EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::green);
> }
> 
>-// Test that a variable hides a user-defined function with the same name after its initializer.
>-// GLSL ES 1.00.17 section 4.2.2: "A variable declaration is visible immediately following the
>-// initializer if present, otherwise immediately following the identifier"
>-TEST_P(GLSLTest, VariableHidesUserDefinedFunctionAfterInitializer)
>+// Tests that rewriting samplers in structs doesn't mess up indexing.
>+TEST_P(GLSLTest, SamplerInStructMemberIndexing)
> {
>-    const std::string &fragmentShader =
>-        "precision mediump float;\n"
>-        "uniform vec4 u;\n"
>-        "vec4 foo()\n"
>-        "{\n"
>-        "    return u;\n"
>-        "}\n"
>-        "void main()\n"
>-        "{\n"
>-        "    vec4 foo = foo();\n"
>-        "    gl_FragColor = foo + vec4(0, 1, 0, 1);\n"
>-        "}\n";
>-
>-    ANGLE_GL_PROGRAM(program, mSimpleVSSource, fragmentShader);
>-    drawQuad(program.get(), "inputAttribute", 0.5f);
>-    EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::green);
>-}
>+    const char kVertexShader[] = R"(attribute vec2 position;
>+varying vec2 texCoord;
>+void main()
>+{
>+    gl_Position = vec4(position, 0, 1);
>+    texCoord = position * 0.5 + vec2(0.5);
>+})";
>+
>+    const char kFragmentShader[] = R"(precision mediump float;
>+struct S { sampler2D samp; bool b; };
>+uniform S uni;
>+varying vec2 texCoord;
>+void main()
>+{
>+    if (uni.b)
>+    {
>+        gl_FragColor = texture2D(uni.samp, texCoord);
>+    }
>+    else
>+    {
>+        gl_FragColor = vec4(1, 0, 0, 1);
>+    }
>+})";
>+
>+    ANGLE_GL_PROGRAM(program, kVertexShader, kFragmentShader);
>+    glUseProgram(program);
>+
>+    GLint bLoc = glGetUniformLocation(program, "uni.b");
>+    ASSERT_NE(-1, bLoc);
>+    GLint sampLoc = glGetUniformLocation(program, "uni.samp");
>+    ASSERT_NE(-1, sampLoc);
>+
>+    glUniform1i(bLoc, 1);
>+
>+    std::array<GLColor, 4> kGreenPixels = {
>+        {GLColor::green, GLColor::green, GLColor::green, GLColor::green}};
>+
>+    GLTexture tex;
>+    glBindTexture(GL_TEXTURE_2D, tex);
>+    glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, 2, 2, 0, GL_RGBA, GL_UNSIGNED_BYTE,
>+                 kGreenPixels.data());
>+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
>+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
>+    ASSERT_GL_NO_ERROR();
>+
>+    drawQuad(program, "position", 0.5f);
>+    ASSERT_GL_NO_ERROR();
>+
>+    EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::green);
>+}
>+
>+// Tests two nameless struct uniforms.
>+TEST_P(GLSLTest, TwoEmbeddedStructUniforms)
>+{
>+    const char kFragmentShader[] = R"(precision mediump float;
>+uniform struct { float q; } b, c;
>+void main()
>+{
>+    gl_FragColor = vec4(1, 0, 0, 1);
>+    if (b.q == 0.5 && c.q == 1.0)
>+    {
>+        gl_FragColor = vec4(0, 1, 0, 1);
>+    }
>+})";
>+
>+    ANGLE_GL_PROGRAM(program, essl1_shaders::vs::Simple(), kFragmentShader);
>+    glUseProgram(program);
>+
>+    GLint uniLocB = glGetUniformLocation(program, "b.q");
>+    ASSERT_NE(-1, uniLocB);
>+    glUniform1f(uniLocB, 0.5f);
>+
>+    GLint uniLocC = glGetUniformLocation(program, "c.q");
>+    ASSERT_NE(-1, uniLocC);
>+    glUniform1f(uniLocC, 1.0f);
>+
>+    drawQuad(program.get(), essl1_shaders::PositionAttrib(), 0.5f, 1.0f, true);
>+    EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::green);
>+}
>+
>+// Test that a loop condition that has an initializer declares a variable.
>+TEST_P(GLSLTest_ES3, ConditionInitializerDeclaresVariable)
>+{
>+    constexpr char kFS[] =
>+        "#version 300 es\n"
>+        "precision highp float;\n"
>+        "out vec4 my_FragColor;\n"
>+        "void main()\n"
>+        "{\n"
>+        "    float i = 0.0;\n"
>+        "    while (bool foo = (i < 1.5))\n"
>+        "    {\n"
>+        "        if (!foo)\n"
>+        "        {\n"
>+        "            ++i;\n"
>+        "        }\n"
>+        "        if (i > 3.5)\n"
>+        "        {\n"
>+        "            break;\n"
>+        "        }\n"
>+        "        ++i;\n"
>+        "    }\n"
>+        "    my_FragColor = vec4(i * 0.5 - 1.0, i * 0.5, 0.0, 1.0);\n"
>+        "}\n";
>+
>+    ANGLE_GL_PROGRAM(program, essl3_shaders::vs::Simple(), kFS);
>+    drawQuad(program.get(), essl3_shaders::PositionAttrib(), 0.5f);
>+    EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::green);
>+}
>+
>+// Test that a variable hides a user-defined function with the same name after its initializer.
>+// GLSL ES 1.00.17 section 4.2.2: "A variable declaration is visible immediately following the
>+// initializer if present, otherwise immediately following the identifier"
>+TEST_P(GLSLTest, VariableHidesUserDefinedFunctionAfterInitializer)
>+{
>+    constexpr char kFS[] =
>+        "precision mediump float;\n"
>+        "uniform vec4 u;\n"
>+        "vec4 foo()\n"
>+        "{\n"
>+        "    return u;\n"
>+        "}\n"
>+        "void main()\n"
>+        "{\n"
>+        "    vec4 foo = foo();\n"
>+        "    gl_FragColor = foo + vec4(0, 1, 0, 1);\n"
>+        "}\n";
>+
>+    ANGLE_GL_PROGRAM(program, essl1_shaders::vs::Simple(), kFS);
>+    drawQuad(program.get(), essl1_shaders::PositionAttrib(), 0.5f);
>+    EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::green);
>+}
> 
> // Test that structs with identical members are not ambiguous as function arguments.
> TEST_P(GLSLTest, StructsWithSameMembersDisambiguatedByName)
> {
>-    const std::string &fragmentShader =
>+    constexpr char kFS[] =
>         "precision mediump float;\n"
>         "uniform float u_zero;\n"
>         "struct S { float foo; };\n"
>@@ -3141,8 +3274,8 @@ TEST_P(GLSLTest, StructsWithSameMembersDisambiguatedByName)
>         "    gl_FragColor = vec4(0.0, get(s) + get(s2), 0.0, 1.0);\n"
>         "}\n";
> 
>-    ANGLE_GL_PROGRAM(program, mSimpleVSSource, fragmentShader);
>-    drawQuad(program.get(), "inputAttribute", 0.5f);
>+    ANGLE_GL_PROGRAM(program, essl1_shaders::vs::Simple(), kFS);
>+    drawQuad(program.get(), essl1_shaders::PositionAttrib(), 0.5f);
>     EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::green);
> }
> 
>@@ -3150,7 +3283,7 @@ TEST_P(GLSLTest, StructsWithSameMembersDisambiguatedByName)
> // GLSL ES 3.00.6 section 4.3.10.
> TEST_P(GLSLTest_ES3, VaryingStructNotStaticallyUsedInFragmentShader)
> {
>-    const std::string &vertexShader =
>+    constexpr char kVS[] =
>         "#version 300 es\n"
>         "struct S {\n"
>         "    vec4 field;\n"
>@@ -3162,7 +3295,7 @@ TEST_P(GLSLTest_ES3, VaryingStructNotStaticallyUsedInFragmentShader)
>         "    varStruct.field = vec4(0.0, 0.5, 0.0, 0.0);\n"
>         "}\n";
> 
>-    const std::string &fragmentShader =
>+    constexpr char kFS[] =
>         "#version 300 es\n"
>         "precision mediump float;\n"
>         "struct S {\n"
>@@ -3175,14 +3308,14 @@ TEST_P(GLSLTest_ES3, VaryingStructNotStaticallyUsedInFragmentShader)
>         "    col = vec4(1.0);\n"
>         "}\n";
> 
>-    ANGLE_GL_PROGRAM(program, vertexShader, fragmentShader);
>+    ANGLE_GL_PROGRAM(program, kVS, kFS);
> }
> 
> // Test that a varying struct that's not declared in the fragment shader links successfully.
> // GLSL ES 3.00.6 section 4.3.10.
> TEST_P(GLSLTest_ES3, VaryingStructNotDeclaredInFragmentShader)
> {
>-    const std::string &vertexShader =
>+    constexpr char kVS[] =
>         "#version 300 es\n"
>         "struct S {\n"
>         "    vec4 field;\n"
>@@ -3194,7 +3327,7 @@ TEST_P(GLSLTest_ES3, VaryingStructNotDeclaredInFragmentShader)
>         "    varStruct.field = vec4(0.0, 0.5, 0.0, 0.0);\n"
>         "}\n";
> 
>-    const std::string &fragmentShader =
>+    constexpr char kFS[] =
>         "#version 300 es\n"
>         "precision mediump float;\n"
>         "out vec4 col;\n"
>@@ -3203,13 +3336,17 @@ TEST_P(GLSLTest_ES3, VaryingStructNotDeclaredInFragmentShader)
>         "    col = vec4(1.0);\n"
>         "}\n";
> 
>-    ANGLE_GL_PROGRAM(program, vertexShader, fragmentShader);
>+    ANGLE_GL_PROGRAM(program, kVS, kFS);
> }
> 
> // Test that a varying struct that gets used in the fragment shader works.
> TEST_P(GLSLTest_ES3, VaryingStructUsedInFragmentShader)
> {
>-    const std::string &vertexShader =
>+    // TODO(syoussefi): missing ES3 shader feature support.
>+    // http://anglebug.com/3199
>+    ANGLE_SKIP_TEST_IF(IsVulkan());
>+
>+    constexpr char kVS[] =
>         "#version 300 es\n"
>         "in vec4 inputAttribute;\n"
>         "struct S {\n"
>@@ -3222,7 +3359,7 @@ TEST_P(GLSLTest_ES3, VaryingStructUsedInFragmentShader)
>         "    varStruct.field = vec4(0.0, 1.0, 0.0, 1.0);\n"
>         "}\n";
> 
>-    const std::string &fragmentShader =
>+    constexpr char kFS[] =
>         "#version 300 es\n"
>         "precision mediump float;\n"
>         "out vec4 col;\n"
>@@ -3235,29 +3372,110 @@ TEST_P(GLSLTest_ES3, VaryingStructUsedInFragmentShader)
>         "    col = varStruct.field;\n"
>         "}\n";
> 
>-    ANGLE_GL_PROGRAM(program, vertexShader, fragmentShader);
>+    ANGLE_GL_PROGRAM(program, kVS, kFS);
>     drawQuad(program.get(), "inputAttribute", 0.5f);
>     EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::green);
> }
> 
>+// This test covers passing a struct containing a sampler as a function argument.
>+TEST_P(GLSLTest, StructsWithSamplersAsFunctionArg)
>+{
>+    // Shader failed to compile on Nexus devices. http://anglebug.com/2114
>+    ANGLE_SKIP_TEST_IF((IsNexus5X() || IsNexus6P()) && IsAdreno() && IsOpenGLES());
>+
>+    const char kFragmentShader[] = R"(precision mediump float;
>+struct S { sampler2D samplerMember; };
>+uniform S uStruct;
>+uniform vec2 uTexCoord;
>+vec4 foo(S structVar)
>+{
>+    return texture2D(structVar.samplerMember, uTexCoord);
>+}
>+void main()
>+{
>+    gl_FragColor = foo(uStruct);
>+})";
>+
>+    ANGLE_GL_PROGRAM(program, essl1_shaders::vs::Simple(), kFragmentShader);
>+
>+    // Initialize the texture with green.
>+    GLTexture tex;
>+    glActiveTexture(GL_TEXTURE0);
>+    glBindTexture(GL_TEXTURE_2D, tex);
>+    GLubyte texData[] = {0u, 255u, 0u, 255u};
>+    glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, 1, 1, 0, GL_RGBA, GL_UNSIGNED_BYTE, texData);
>+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
>+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
>+    ASSERT_GL_NO_ERROR();
>+
>+    // Draw
>+    glUseProgram(program);
>+    GLint samplerMemberLoc = glGetUniformLocation(program, "uStruct.samplerMember");
>+    ASSERT_NE(-1, samplerMemberLoc);
>+    glUniform1i(samplerMemberLoc, 0);
>+    GLint texCoordLoc = glGetUniformLocation(program, "uTexCoord");
>+    ASSERT_NE(-1, texCoordLoc);
>+    glUniform2f(texCoordLoc, 0.5f, 0.5f);
>+
>+    drawQuad(program, essl1_shaders::PositionAttrib(), 0.5f);
>+    ASSERT_GL_NO_ERROR();
>+
>+    EXPECT_PIXEL_COLOR_EQ(1, 1, GLColor::green);
>+}
>+
>+// This test covers passing a struct containing a sampler as a function argument.
>+TEST_P(GLSLTest, StructsWithSamplersAsFunctionArgWithPrototype)
>+{
>+    // Shader failed to compile on Android. http://anglebug.com/2114
>+    ANGLE_SKIP_TEST_IF(IsAndroid() && IsAdreno() && IsOpenGLES());
>+
>+    const char kFragmentShader[] = R"(precision mediump float;
>+struct S { sampler2D samplerMember; };
>+uniform S uStruct;
>+uniform vec2 uTexCoord;
>+vec4 foo(S structVar);
>+vec4 foo(S structVar)
>+{
>+    return texture2D(structVar.samplerMember, uTexCoord);
>+}
>+void main()
>+{
>+    gl_FragColor = foo(uStruct);
>+})";
>+
>+    ANGLE_GL_PROGRAM(program, essl1_shaders::vs::Simple(), kFragmentShader);
>+
>+    // Initialize the texture with green.
>+    GLTexture tex;
>+    glActiveTexture(GL_TEXTURE0);
>+    glBindTexture(GL_TEXTURE_2D, tex);
>+    GLubyte texData[] = {0u, 255u, 0u, 255u};
>+    glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, 1, 1, 0, GL_RGBA, GL_UNSIGNED_BYTE, texData);
>+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
>+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
>+    ASSERT_GL_NO_ERROR();
>+
>+    // Draw
>+    glUseProgram(program);
>+    GLint samplerMemberLoc = glGetUniformLocation(program, "uStruct.samplerMember");
>+    ASSERT_NE(-1, samplerMemberLoc);
>+    glUniform1i(samplerMemberLoc, 0);
>+    GLint texCoordLoc = glGetUniformLocation(program, "uTexCoord");
>+    ASSERT_NE(-1, texCoordLoc);
>+    glUniform2f(texCoordLoc, 0.5f, 0.5f);
>+
>+    drawQuad(program, essl1_shaders::PositionAttrib(), 0.5f);
>+    ASSERT_GL_NO_ERROR();
>+
>+    EXPECT_PIXEL_COLOR_EQ(1, 1, GLColor::green);
>+}
> // This test covers passing an array of structs containing samplers as a function argument.
> TEST_P(GLSLTest, ArrayOfStructsWithSamplersAsFunctionArg)
> {
>-    if (IsAndroid() && IsAdreno() && IsOpenGLES())
>-    {
>-        // Shader failed to compile on Android. http://anglebug.com/2114
>-        std::cout << "Test skipped on Adreno OpenGLES on Android." << std::endl;
>-        return;
>-    }
>-
>-    const std::string &vertexShader =
>-        "attribute vec2 position;\n"
>-        "void main()\n"
>-        "{\n"
>-        "    gl_Position = vec4(position, 0, 1);\n"
>-        "}\n";
>+    // Shader failed to compile on Nexus devices. http://anglebug.com/2114
>+    ANGLE_SKIP_TEST_IF((IsNexus5X() || IsNexus6P()) && IsAdreno() && IsOpenGLES());
> 
>-    const std::string &fragmentShader =
>+    constexpr char kFS[] =
>         "precision mediump float;\n"
>         "struct S\n"
>         "{\n"
>@@ -3275,7 +3493,7 @@ TEST_P(GLSLTest, ArrayOfStructsWithSamplersAsFunctionArg)
>         "    gl_FragColor = foo(uStructs);\n"
>         "}\n";
> 
>-    ANGLE_GL_PROGRAM(program, vertexShader, fragmentShader);
>+    ANGLE_GL_PROGRAM(program, essl1_shaders::vs::Simple(), kFS);
> 
>     // Initialize the texture with green.
>     GLTexture tex;
>@@ -3296,7 +3514,7 @@ TEST_P(GLSLTest, ArrayOfStructsWithSamplersAsFunctionArg)
>     ASSERT_NE(-1, texCoordLoc);
>     glUniform2f(texCoordLoc, 0.5f, 0.5f);
> 
>-    drawQuad(program, "position", 0.5f);
>+    drawQuad(program, essl1_shaders::PositionAttrib(), 0.5f);
>     ASSERT_GL_NO_ERROR();
> 
>     EXPECT_PIXEL_COLOR_EQ(1, 1, GLColor::green);
>@@ -3305,21 +3523,13 @@ TEST_P(GLSLTest, ArrayOfStructsWithSamplersAsFunctionArg)
> // This test covers passing a struct containing an array of samplers as a function argument.
> TEST_P(GLSLTest, StructWithSamplerArrayAsFunctionArg)
> {
>-    if (IsAndroid() && IsAdreno() && IsOpenGLES())
>-    {
>-        // Shader failed to compile on Android. http://anglebug.com/2114
>-        std::cout << "Test skipped on Adreno OpenGLES on Android." << std::endl;
>-        return;
>-    }
>+    // Shader failed to compile on Nexus devices. http://anglebug.com/2114
>+    ANGLE_SKIP_TEST_IF((IsNexus5X() || IsNexus6P()) && IsAdreno() && IsOpenGLES());
> 
>-    const std::string &vertexShader =
>-        "attribute vec2 position;\n"
>-        "void main()\n"
>-        "{\n"
>-        "    gl_Position = vec4(position, 0, 1);\n"
>-        "}\n";
>+    // TODO(jmadill): Fix on Android/vulkan if possible. http://anglebug.com/2703
>+    ANGLE_SKIP_TEST_IF(IsAndroid() && IsVulkan());
> 
>-    const std::string &fragmentShader =
>+    constexpr char kFS[] =
>         "precision mediump float;\n"
>         "struct S\n"
>         "{\n"
>@@ -3337,7 +3547,7 @@ TEST_P(GLSLTest, StructWithSamplerArrayAsFunctionArg)
>         "    gl_FragColor = foo(uStruct);\n"
>         "}\n";
> 
>-    ANGLE_GL_PROGRAM(program, vertexShader, fragmentShader);
>+    ANGLE_GL_PROGRAM(program, essl1_shaders::vs::Simple(), kFS);
> 
>     // Initialize the texture with green.
>     GLTexture tex;
>@@ -3358,287 +3568,506 @@ TEST_P(GLSLTest, StructWithSamplerArrayAsFunctionArg)
>     ASSERT_NE(-1, texCoordLoc);
>     glUniform2f(texCoordLoc, 0.5f, 0.5f);
> 
>-    drawQuad(program, "position", 0.5f);
>+    drawQuad(program, essl1_shaders::PositionAttrib(), 0.5f);
>     ASSERT_GL_NO_ERROR();
> 
>     EXPECT_PIXEL_COLOR_EQ(1, 1, GLColor::green);
> }
> 
>-// Test that a global variable declared after main() works. This is a regression test for an issue
>-// in global variable initialization.
>-TEST_P(WebGLGLSLTest, GlobalVariableDeclaredAfterMain)
>+// This test covers passing nested structs containing a sampler as a function argument.
>+TEST_P(GLSLTest, NestedStructsWithSamplersAsFunctionArg)
> {
>-    const std::string &fragmentShader =
>-        "precision mediump float;\n"
>-        "int getFoo();\n"
>-        "uniform int u_zero;\n"
>-        "void main()\n"
>-        "{\n"
>-        "    gl_FragColor = vec4(1, 0, 0, 1);\n"
>-        "    if (getFoo() == 0)\n"
>-        "    {\n"
>-        "        gl_FragColor = vec4(0, 1, 0, 1);\n"
>-        "    }\n"
>-        "}\n"
>-        "int foo;\n"
>-        "int getFoo()\n"
>-        "{\n"
>-        "    foo = u_zero;\n"
>-        "    return foo;\n"
>-        "}\n";
>+    // Shader failed to compile on Nexus devices. http://anglebug.com/2114
>+    ANGLE_SKIP_TEST_IF((IsNexus5X() || IsNexus6P()) && IsAdreno() && IsOpenGLES());
> 
>-    ANGLE_GL_PROGRAM(program, mSimpleVSSource, fragmentShader);
>-    drawQuad(program.get(), "inputAttribute", 0.5f, 1.0f, true);
>-    EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::green);
>+    const char kFragmentShader[] = R"(precision mediump float;
>+struct S { sampler2D samplerMember; };
>+struct T { S nest; };
>+uniform T uStruct;
>+uniform vec2 uTexCoord;
>+vec4 foo2(S structVar)
>+{
>+    return texture2D(structVar.samplerMember, uTexCoord);
> }
>-
>-// Test calling array length() with a "this" expression having side effects inside a loop condition.
>-// The spec says that sequence operator operands need to run in sequence.
>-TEST_P(GLSLTest_ES3, ArrayLengthOnExpressionWithSideEffectsInLoopCondition)
>+vec4 foo(T structVar)
> {
>-    // "a" gets doubled three times in the below program.
>-    const std::string &fragmentShader =
>-        R"(#version 300 es
>-        precision highp float;
>-        out vec4 my_FragColor;
>-        uniform int u_zero;
>-        int a;
>-        int[2] doubleA()
>-        {
>-            a *= 2;
>-            return int[2](a, a);
>-        }
>-        void main()
>-        {
>-            a = u_zero + 1;
>-            for (int i = 0; i < doubleA().length(); ++i)
>-            {}
>-            if (a == 8)
>-            {
>-                my_FragColor = vec4(0, 1, 0, 1);
>-            }
>-            else
>-            {
>-                my_FragColor = vec4(1, 0, 0, 1);
>-            }
>-        })";
>-
>-    ANGLE_GL_PROGRAM(program, mSimpleVSSource, fragmentShader);
>-    drawQuad(program.get(), "inputAttribute", 0.5f);
>-    EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::green);
>+    return foo2(structVar.nest);
> }
>-
>-// Test calling array length() with a "this" expression having side effects that interact with side
>-// effects of another operand of the same sequence operator. The spec says that sequence operator
>-// operands need to run in order from left to right (ESSL 3.00.6 section 5.9).
>-TEST_P(GLSLTest_ES3, ArrayLengthOnExpressionWithSideEffectsInSequence)
>+void main()
> {
>-    const std::string &fragmentShader =
>-        R"(#version 300 es
>-        precision highp float;
>-        out vec4 my_FragColor;
>-        uniform int u_zero;
>-        int a;
>-        int[3] doubleA()
>-        {
>-            a *= 2;
>-            return int[3](a, a, a);
>-        }
>-        void main()
>-        {
>-            a = u_zero;
>-            int b = (a++, doubleA().length());
>-            if (b == 3 && a == 2)
>-            {
>-                my_FragColor = vec4(0, 1, 0, 1);
>-            }
>-            else
>-            {
>-                my_FragColor = vec4(1, 0, 0, 1);
>-            }
>-        })";
>+    gl_FragColor = foo(uStruct);
>+})";
> 
>-    ANGLE_GL_PROGRAM(program, mSimpleVSSource, fragmentShader);
>-    drawQuad(program.get(), "inputAttribute", 0.5f);
>-    EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::green);
>-}
>+    ANGLE_GL_PROGRAM(program, essl1_shaders::vs::Simple(), kFragmentShader);
> 
>-// Test calling array length() with a "this" expression that also contains a call of array length().
>-// Both "this" expressions also have side effects.
>-TEST_P(GLSLTest_ES3, NestedArrayLengthMethodsWithSideEffects)
>-{
>-    const std::string &fragmentShader =
>-        R"(#version 300 es
>-        precision highp float;
>-        out vec4 my_FragColor;
>-        uniform int u_zero;
>-        int a;
>-        int[3] multiplyA(int multiplier)
>-        {
>-            a *= multiplier;
>-            return int[3](a, a, a);
>-        }
>-        void main()
>-        {
>-            a = u_zero + 1;
>-            int b = multiplyA(multiplyA(2).length()).length();
>-            if (b == 3 && a == 6)
>-            {
>-                my_FragColor = vec4(0, 1, 0, 1);
>-            }
>-            else
>-            {
>-                my_FragColor = vec4(1, 0, 0, 1);
>-            }
>-        })";
>+    // Initialize the texture with green.
>+    GLTexture tex;
>+    glActiveTexture(GL_TEXTURE0);
>+    glBindTexture(GL_TEXTURE_2D, tex);
>+    GLubyte texData[] = {0u, 255u, 0u, 255u};
>+    glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, 1, 1, 0, GL_RGBA, GL_UNSIGNED_BYTE, texData);
>+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
>+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
>+    ASSERT_GL_NO_ERROR();
> 
>-    ANGLE_GL_PROGRAM(program, mSimpleVSSource, fragmentShader);
>-    drawQuad(program.get(), "inputAttribute", 0.5f);
>-    EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::green);
>+    // Draw
>+    glUseProgram(program);
>+    GLint samplerMemberLoc = glGetUniformLocation(program, "uStruct.nest.samplerMember");
>+    ASSERT_NE(-1, samplerMemberLoc);
>+    glUniform1i(samplerMemberLoc, 0);
>+    GLint texCoordLoc = glGetUniformLocation(program, "uTexCoord");
>+    ASSERT_NE(-1, texCoordLoc);
>+    glUniform2f(texCoordLoc, 0.5f, 0.5f);
>+
>+    drawQuad(program, essl1_shaders::PositionAttrib(), 0.5f);
>+    ASSERT_GL_NO_ERROR();
>+
>+    EXPECT_PIXEL_COLOR_EQ(1, 1, GLColor::green);
> }
> 
>-// Test that statements inside switch() get translated to correct HLSL.
>-TEST_P(GLSLTest_ES3, DifferentStatementsInsideSwitch)
>+// This test covers passing a compound structs containing a sampler as a function argument.
>+TEST_P(GLSLTest, CompoundStructsWithSamplersAsFunctionArg)
> {
>-    const std::string &fragmentShader =
>-        R"(#version 300 es
>+    // Shader failed to compile on Nexus devices. http://anglebug.com/2114
>+    ANGLE_SKIP_TEST_IF((IsNexus5X() || IsNexus6P()) && IsAdreno() && IsOpenGLES());
> 
>-        precision highp float;
>+    const char kFragmentShader[] = R"(precision mediump float;
>+struct S { sampler2D samplerMember; bool b; };
>+uniform S uStruct;
>+uniform vec2 uTexCoord;
>+vec4 foo(S structVar)
>+{
>+    if (structVar.b)
>+        return texture2D(structVar.samplerMember, uTexCoord);
>+    else
>+        return vec4(1, 0, 0, 1);
>+}
>+void main()
>+{
>+    gl_FragColor = foo(uStruct);
>+})";
> 
>-        uniform int u;
>+    ANGLE_GL_PROGRAM(program, essl1_shaders::vs::Simple(), kFragmentShader);
> 
>-        void main()
>-        {
>-            switch (u)
>-            {
>-                case 0:
>-                    ivec2 i;
>-                    i.yx;
>-            }
>-        })";
>-    ANGLE_GL_PROGRAM(program, mSimpleVSSource, fragmentShader);
>+    // Initialize the texture with green.
>+    GLTexture tex;
>+    glActiveTexture(GL_TEXTURE0);
>+    glBindTexture(GL_TEXTURE_2D, tex);
>+    GLubyte texData[] = {0u, 255u, 0u, 255u};
>+    glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, 1, 1, 0, GL_RGBA, GL_UNSIGNED_BYTE, texData);
>+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
>+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
>+    ASSERT_GL_NO_ERROR();
>+
>+    // Draw
>+    glUseProgram(program);
>+    GLint samplerMemberLoc = glGetUniformLocation(program, "uStruct.samplerMember");
>+    ASSERT_NE(-1, samplerMemberLoc);
>+    glUniform1i(samplerMemberLoc, 0);
>+    GLint texCoordLoc = glGetUniformLocation(program, "uTexCoord");
>+    ASSERT_NE(-1, texCoordLoc);
>+    glUniform2f(texCoordLoc, 0.5f, 0.5f);
>+    GLint bLoc = glGetUniformLocation(program, "uStruct.b");
>+    ASSERT_NE(-1, bLoc);
>+    glUniform1i(bLoc, 1);
>+
>+    drawQuad(program, essl1_shaders::PositionAttrib(), 0.5f);
>+    ASSERT_GL_NO_ERROR();
>+
>+    EXPECT_PIXEL_COLOR_EQ(1, 1, GLColor::green);
> }
> 
>-// Test that switch fall-through works correctly.
>-// This is a regression test for http://anglebug.com/2178
>-TEST_P(GLSLTest_ES3, SwitchFallThroughCodeDuplication)
>+// This test covers passing nested compound structs containing a sampler as a function argument.
>+TEST_P(GLSLTest, NestedCompoundStructsWithSamplersAsFunctionArg)
>+{
>+    // Shader failed to compile on Nexus devices. http://anglebug.com/2114
>+    ANGLE_SKIP_TEST_IF((IsNexus5X() || IsNexus6P()) && IsAdreno() && IsOpenGLES());
>+
>+    const char kFragmentShader[] = R"(precision mediump float;
>+struct S { sampler2D samplerMember; bool b; };
>+struct T { S nest; bool b; };
>+uniform T uStruct;
>+uniform vec2 uTexCoord;
>+vec4 foo2(S structVar)
>+{
>+    if (structVar.b)
>+        return texture2D(structVar.samplerMember, uTexCoord);
>+    else
>+        return vec4(1, 0, 0, 1);
>+}
>+vec4 foo(T structVar)
>+{
>+    if (structVar.b)
>+        return foo2(structVar.nest);
>+    else
>+        return vec4(1, 0, 0, 1);
>+}
>+void main()
> {
>-    const std::string &fragmentShader =
>-        R"(#version 300 es
>+    gl_FragColor = foo(uStruct);
>+})";
>+
>+    ANGLE_GL_PROGRAM(program, essl1_shaders::vs::Simple(), kFragmentShader);
>+
>+    // Initialize the texture with green.
>+    GLTexture tex;
>+    glActiveTexture(GL_TEXTURE0);
>+    glBindTexture(GL_TEXTURE_2D, tex);
>+    GLubyte texData[] = {0u, 255u, 0u, 255u};
>+    glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, 1, 1, 0, GL_RGBA, GL_UNSIGNED_BYTE, texData);
>+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
>+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
>+    ASSERT_GL_NO_ERROR();
> 
>-        precision highp float;
>+    // Draw
>+    glUseProgram(program);
>+    GLint samplerMemberLoc = glGetUniformLocation(program, "uStruct.nest.samplerMember");
>+    ASSERT_NE(-1, samplerMemberLoc);
>+    glUniform1i(samplerMemberLoc, 0);
>+    GLint texCoordLoc = glGetUniformLocation(program, "uTexCoord");
>+    ASSERT_NE(-1, texCoordLoc);
>+    glUniform2f(texCoordLoc, 0.5f, 0.5f);
> 
>-        out vec4 my_FragColor;
>+    GLint bLoc = glGetUniformLocation(program, "uStruct.b");
>+    ASSERT_NE(-1, bLoc);
>+    glUniform1i(bLoc, 1);
> 
>-        uniform int u_zero;
>+    GLint nestbLoc = glGetUniformLocation(program, "uStruct.nest.b");
>+    ASSERT_NE(-1, nestbLoc);
>+    glUniform1i(nestbLoc, 1);
> 
>-        void main()
>-        {
>-            int i = 0;
>-            // switch should fall through both cases.
>-            switch(u_zero)
>-            {
>-                case 0:
>-                    i += 1;
>-                case 1:
>-                    i += 2;
>-            }
>-            if (i == 3)
>-            {
>-                my_FragColor = vec4(0, 1, 0, 1);
>-            }
>-            else
>-            {
>-                my_FragColor = vec4(1, 0, 0, 1);
>-            }
>-        })";
>+    drawQuad(program, essl1_shaders::PositionAttrib(), 0.5f);
>+    ASSERT_GL_NO_ERROR();
> 
>-    ANGLE_GL_PROGRAM(program, mSimpleVSSource, fragmentShader);
>-    drawQuad(program.get(), "inputAttribute", 0.5f);
>+    EXPECT_PIXEL_COLOR_EQ(1, 1, GLColor::green);
>+}
>+
>+// Same as the prior test but with reordered struct members.
>+TEST_P(GLSLTest, MoreNestedCompoundStructsWithSamplersAsFunctionArg)
>+{
>+    // Shader failed to compile on Nexus devices. http://anglebug.com/2114
>+    ANGLE_SKIP_TEST_IF((IsNexus5X() || IsNexus6P()) && IsAdreno() && IsOpenGLES());
>+
>+    const char kFragmentShader[] = R"(precision mediump float;
>+struct S { bool b; sampler2D samplerMember; };
>+struct T { bool b; S nest; };
>+uniform T uStruct;
>+uniform vec2 uTexCoord;
>+vec4 foo2(S structVar)
>+{
>+    if (structVar.b)
>+        return texture2D(structVar.samplerMember, uTexCoord);
>+    else
>+        return vec4(1, 0, 0, 1);
>+}
>+vec4 foo(T structVar)
>+{
>+    if (structVar.b)
>+        return foo2(structVar.nest);
>+    else
>+        return vec4(1, 0, 0, 1);
>+}
>+void main()
>+{
>+    gl_FragColor = foo(uStruct);
>+})";
>+
>+    ANGLE_GL_PROGRAM(program, essl1_shaders::vs::Simple(), kFragmentShader);
>+
>+    // Initialize the texture with green.
>+    GLTexture tex;
>+    glActiveTexture(GL_TEXTURE0);
>+    glBindTexture(GL_TEXTURE_2D, tex);
>+    GLubyte texData[] = {0u, 255u, 0u, 255u};
>+    glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, 1, 1, 0, GL_RGBA, GL_UNSIGNED_BYTE, texData);
>+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
>+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
>+    ASSERT_GL_NO_ERROR();
>+
>+    // Draw
>+    glUseProgram(program);
>+    GLint samplerMemberLoc = glGetUniformLocation(program, "uStruct.nest.samplerMember");
>+    ASSERT_NE(-1, samplerMemberLoc);
>+    glUniform1i(samplerMemberLoc, 0);
>+    GLint texCoordLoc = glGetUniformLocation(program, "uTexCoord");
>+    ASSERT_NE(-1, texCoordLoc);
>+    glUniform2f(texCoordLoc, 0.5f, 0.5f);
>+
>+    GLint bLoc = glGetUniformLocation(program, "uStruct.b");
>+    ASSERT_NE(-1, bLoc);
>+    glUniform1i(bLoc, 1);
>+
>+    GLint nestbLoc = glGetUniformLocation(program, "uStruct.nest.b");
>+    ASSERT_NE(-1, nestbLoc);
>+    glUniform1i(nestbLoc, 1);
>+
>+    drawQuad(program, essl1_shaders::PositionAttrib(), 0.5f);
>+    ASSERT_GL_NO_ERROR();
>+
>+    EXPECT_PIXEL_COLOR_EQ(1, 1, GLColor::green);
>+}
>+// Test that a global variable declared after main() works. This is a regression test for an issue
>+// in global variable initialization.
>+TEST_P(WebGLGLSLTest, GlobalVariableDeclaredAfterMain)
>+{
>+    constexpr char kFS[] =
>+        "precision mediump float;\n"
>+        "int getFoo();\n"
>+        "uniform int u_zero;\n"
>+        "void main()\n"
>+        "{\n"
>+        "    gl_FragColor = vec4(1, 0, 0, 1);\n"
>+        "    if (getFoo() == 0)\n"
>+        "    {\n"
>+        "        gl_FragColor = vec4(0, 1, 0, 1);\n"
>+        "    }\n"
>+        "}\n"
>+        "int foo;\n"
>+        "int getFoo()\n"
>+        "{\n"
>+        "    foo = u_zero;\n"
>+        "    return foo;\n"
>+        "}\n";
>+
>+    ANGLE_GL_PROGRAM(program, essl1_shaders::vs::Simple(), kFS);
>+    drawQuad(program.get(), essl1_shaders::PositionAttrib(), 0.5f, 1.0f, true);
>+    EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::green);
>+}
>+
>+// Test calling array length() with a "this" expression having side effects inside a loop condition.
>+// The spec says that sequence operator operands need to run in sequence.
>+TEST_P(GLSLTest_ES3, ArrayLengthOnExpressionWithSideEffectsInLoopCondition)
>+{
>+    // "a" gets doubled three times in the below program.
>+    constexpr char kFS[] = R"(#version 300 es
>+precision highp float;
>+out vec4 my_FragColor;
>+uniform int u_zero;
>+int a;
>+int[2] doubleA()
>+{
>+    a *= 2;
>+    return int[2](a, a);
>+}
>+void main()
>+{
>+    a = u_zero + 1;
>+    for (int i = 0; i < doubleA().length(); ++i)
>+    {}
>+    if (a == 8)
>+    {
>+        my_FragColor = vec4(0, 1, 0, 1);
>+    }
>+    else
>+    {
>+        my_FragColor = vec4(1, 0, 0, 1);
>+    }
>+})";
>+
>+    ANGLE_GL_PROGRAM(program, essl3_shaders::vs::Simple(), kFS);
>+    drawQuad(program.get(), essl3_shaders::PositionAttrib(), 0.5f);
>+    EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::green);
>+}
>+
>+// Test calling array length() with a "this" expression having side effects that interact with side
>+// effects of another operand of the same sequence operator. The spec says that sequence operator
>+// operands need to run in order from left to right (ESSL 3.00.6 section 5.9).
>+TEST_P(GLSLTest_ES3, ArrayLengthOnExpressionWithSideEffectsInSequence)
>+{
>+    constexpr char kFS[] = R"(#version 300 es
>+precision highp float;
>+out vec4 my_FragColor;
>+uniform int u_zero;
>+int a;
>+int[3] doubleA()
>+{
>+    a *= 2;
>+    return int[3](a, a, a);
>+}
>+void main()
>+{
>+    a = u_zero;
>+    int b = (a++, doubleA().length());
>+    if (b == 3 && a == 2)
>+    {
>+        my_FragColor = vec4(0, 1, 0, 1);
>+    }
>+    else
>+    {
>+        my_FragColor = vec4(1, 0, 0, 1);
>+    }
>+})";
>+
>+    ANGLE_GL_PROGRAM(program, essl3_shaders::vs::Simple(), kFS);
>+    drawQuad(program.get(), essl3_shaders::PositionAttrib(), 0.5f);
>+    EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::green);
>+}
>+
>+// Test calling array length() with a "this" expression that also contains a call of array length().
>+// Both "this" expressions also have side effects.
>+TEST_P(GLSLTest_ES3, NestedArrayLengthMethodsWithSideEffects)
>+{
>+    constexpr char kFS[] = R"(#version 300 es
>+precision highp float;
>+out vec4 my_FragColor;
>+uniform int u_zero;
>+int a;
>+int[3] multiplyA(int multiplier)
>+{
>+    a *= multiplier;
>+    return int[3](a, a, a);
>+}
>+void main()
>+{
>+    a = u_zero + 1;
>+    int b = multiplyA(multiplyA(2).length()).length();
>+    if (b == 3 && a == 6)
>+    {
>+        my_FragColor = vec4(0, 1, 0, 1);
>+    }
>+    else
>+    {
>+        my_FragColor = vec4(1, 0, 0, 1);
>+    }
>+})";
>+
>+    ANGLE_GL_PROGRAM(program, essl3_shaders::vs::Simple(), kFS);
>+    drawQuad(program.get(), essl3_shaders::PositionAttrib(), 0.5f);
>+    EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::green);
>+}
>+
>+// Test that statements inside switch() get translated to correct HLSL.
>+TEST_P(GLSLTest_ES3, DifferentStatementsInsideSwitch)
>+{
>+    constexpr char kFS[] = R"(#version 300 es
>+precision highp float;
>+uniform int u;
>+void main()
>+{
>+    switch (u)
>+    {
>+        case 0:
>+            ivec2 i;
>+            i.yx;
>+    }
>+})";
>+
>+    ANGLE_GL_PROGRAM(program, essl3_shaders::vs::Simple(), kFS);
>+}
>+
>+// Test that switch fall-through works correctly.
>+// This is a regression test for http://anglebug.com/2178
>+TEST_P(GLSLTest_ES3, SwitchFallThroughCodeDuplication)
>+{
>+    constexpr char kFS[] = R"(#version 300 es
>+precision highp float;
>+out vec4 my_FragColor;
>+uniform int u_zero;
>+
>+void main()
>+{
>+    int i = 0;
>+    // switch should fall through both cases.
>+    switch(u_zero)
>+    {
>+        case 0:
>+            i += 1;
>+        case 1:
>+            i += 2;
>+    }
>+    if (i == 3)
>+    {
>+        my_FragColor = vec4(0, 1, 0, 1);
>+    }
>+    else
>+    {
>+        my_FragColor = vec4(1, 0, 0, 1);
>+    }
>+})";
>+
>+    ANGLE_GL_PROGRAM(program, essl3_shaders::vs::Simple(), kFS);
>+    drawQuad(program.get(), essl3_shaders::PositionAttrib(), 0.5f);
>     EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::green);
> }
> 
> // Test that a switch statement with an empty block inside as a final statement compiles.
> TEST_P(GLSLTest_ES3, SwitchFinalCaseHasEmptyBlock)
> {
>-    const std::string &fragmentShader =
>-        R"(#version 300 es
>+    constexpr char kFS[] = R"(#version 300 es
> 
>-        precision mediump float;
>-        uniform int i;
>-        void main()
>-        {
>-            switch (i)
>-            {
>-                case 0:
>-                    break;
>-                default:
>-                    {}
>-            }
>-        })";
>-    ANGLE_GL_PROGRAM(program, mSimpleVSSource, fragmentShader);
>+precision mediump float;
>+uniform int i;
>+void main()
>+{
>+    switch (i)
>+    {
>+        case 0:
>+            break;
>+        default:
>+            {}
>+    }
>+})";
>+    ANGLE_GL_PROGRAM(program, essl3_shaders::vs::Simple(), kFS);
> }
> 
> // Test that a switch statement with an empty declaration inside as a final statement compiles.
> TEST_P(GLSLTest_ES3, SwitchFinalCaseHasEmptyDeclaration)
> {
>-    const std::string &fragmentShader =
>-        R"(#version 300 es
>+    constexpr char kFS[] = R"(#version 300 es
> 
>-        precision mediump float;
>-        uniform int i;
>-        void main()
>-        {
>-            switch (i)
>-            {
>-                case 0:
>-                    break;
>-                default:
>-                    float;
>-            }
>-        })";
>-    ANGLE_GL_PROGRAM(program, mSimpleVSSource, fragmentShader);
>+precision mediump float;
>+uniform int i;
>+void main()
>+{
>+    switch (i)
>+    {
>+        case 0:
>+            break;
>+        default:
>+            float;
>+    }
>+})";
>+    ANGLE_GL_PROGRAM(program, essl3_shaders::vs::Simple(), kFS);
> }
> 
> // Test switch/case where break/return statements are within blocks.
> TEST_P(GLSLTest_ES3, SwitchBreakOrReturnInsideBlocks)
> {
>-    const std::string &fragmentShader =
>-        R"(#version 300 es
>+    constexpr char kFS[] = R"(#version 300 es
> 
>-        precision highp float;
>+precision highp float;
> 
>-        uniform int u_zero;
>-        out vec4 my_FragColor;
>+uniform int u_zero;
>+out vec4 my_FragColor;
> 
>-        bool test(int n)
>+bool test(int n)
>+{
>+    switch(n) {
>+        case 0:
>         {
>-            switch(n) {
>-                case 0:
>-                {
>-                    {
>-                        break;
>-                    }
>-                }
>-                case 1:
>-                {
>-                    return true;
>-                }
>-                case 2:
>-                {
>-                    n++;
>-                }
>+            {
>+                break;
>             }
>-            return false;
>         }
>-
>-        void main()
>+        case 1:
>+        {
>+            return true;
>+        }
>+        case 2:
>         {
>-            my_FragColor = test(u_zero + 1) ? vec4(0, 1, 0, 1) : vec4(1, 0, 0, 1);
>-        })";
>+            n++;
>+        }
>+    }
>+    return false;
>+}
> 
>-    ANGLE_GL_PROGRAM(program, mSimpleVSSource, fragmentShader);
>-    drawQuad(program.get(), "inputAttribute", 0.5f);
>+void main()
>+{
>+    my_FragColor = test(u_zero + 1) ? vec4(0, 1, 0, 1) : vec4(1, 0, 0, 1);
>+})";
>+
>+    ANGLE_GL_PROGRAM(program, essl3_shaders::vs::Simple(), kFS);
>+    drawQuad(program.get(), essl3_shaders::PositionAttrib(), 0.5f);
>     EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::green);
> }
> 
>@@ -3646,29 +4075,28 @@ TEST_P(GLSLTest_ES3, SwitchBreakOrReturnInsideBlocks)
> // subsequent case.
> TEST_P(GLSLTest_ES3, SwitchWithVariableDeclarationInside)
> {
>-    const std::string &fragmentShader =
>-        R"(#version 300 es
>+    constexpr char kFS[] = R"(#version 300 es
> 
>-        precision highp float;
>-        out vec4 my_FragColor;
>+precision highp float;
>+out vec4 my_FragColor;
> 
>-        uniform int u_zero;
>+uniform int u_zero;
> 
>-        void main()
>-        {
>-            my_FragColor = vec4(1, 0, 0, 1);
>-            switch (u_zero)
>-            {
>-                case 0:
>-                    ivec2 i;
>-                    i = ivec2(1, 0);
>-                default:
>-                    my_FragColor = vec4(0, i[0], 0, 1);
>-            }
>-        })";
>+void main()
>+{
>+    my_FragColor = vec4(1, 0, 0, 1);
>+    switch (u_zero)
>+    {
>+        case 0:
>+            ivec2 i;
>+            i = ivec2(1, 0);
>+        default:
>+            my_FragColor = vec4(0, i[0], 0, 1);
>+    }
>+})";
> 
>-    ANGLE_GL_PROGRAM(program, mSimpleVSSource, fragmentShader);
>-    drawQuad(program.get(), "inputAttribute", 0.5f);
>+    ANGLE_GL_PROGRAM(program, essl3_shaders::vs::Simple(), kFS);
>+    drawQuad(program.get(), essl3_shaders::PositionAttrib(), 0.5f);
>     EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::green);
> }
> 
>@@ -3676,38 +4104,37 @@ TEST_P(GLSLTest_ES3, SwitchWithVariableDeclarationInside)
> // subsequent case.
> TEST_P(GLSLTest_ES3, NestedSwitchWithVariableDeclarationInside)
> {
>-    const std::string &fragmentShader =
>-        R"(#version 300 es
>+    constexpr char kFS[] = R"(#version 300 es
> 
>-        precision highp float;
>-        out vec4 my_FragColor;
>+precision highp float;
>+out vec4 my_FragColor;
> 
>-        uniform int u_zero;
>-        uniform int u_zero2;
>+uniform int u_zero;
>+uniform int u_zero2;
> 
>-        void main()
>-        {
>-            my_FragColor = vec4(1, 0, 0, 1);
>-            switch (u_zero)
>+void main()
>+{
>+    my_FragColor = vec4(1, 0, 0, 1);
>+    switch (u_zero)
>+    {
>+        case 0:
>+            ivec2 i;
>+            i = ivec2(1, 0);
>+            switch (u_zero2)
>             {
>                 case 0:
>-                    ivec2 i;
>-                    i = ivec2(1, 0);
>-                    switch (u_zero2)
>-                    {
>-                        case 0:
>-                            int j;
>-                        default:
>-                            j = 1;
>-                            i *= j;
>-                    }
>+                    int j;
>                 default:
>-                    my_FragColor = vec4(0, i[0], 0, 1);
>+                    j = 1;
>+                    i *= j;
>             }
>-        })";
>+        default:
>+            my_FragColor = vec4(0, i[0], 0, 1);
>+    }
>+})";
> 
>-    ANGLE_GL_PROGRAM(program, mSimpleVSSource, fragmentShader);
>-    drawQuad(program.get(), "inputAttribute", 0.5f);
>+    ANGLE_GL_PROGRAM(program, essl3_shaders::vs::Simple(), kFS);
>+    drawQuad(program.get(), essl3_shaders::PositionAttrib(), 0.5f);
>     EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::green);
> }
> 
>@@ -3715,23 +4142,22 @@ TEST_P(GLSLTest_ES3, NestedSwitchWithVariableDeclarationInside)
> // init-statement.
> TEST_P(GLSLTest_ES3, EmptySwitch)
> {
>-    const std::string &fragmentShader =
>-        R"(#version 300 es
>+    constexpr char kFS[] = R"(#version 300 es
> 
>-        precision highp float;
>+precision highp float;
> 
>-        uniform int u_zero;
>-        out vec4 my_FragColor;
>+uniform int u_zero;
>+out vec4 my_FragColor;
> 
>-        void main()
>-        {
>-            int i = u_zero;
>-            switch(++i) {}
>-            my_FragColor = (i == 1) ? vec4(0, 1, 0, 1) : vec4(1, 0, 0, 1);
>-        })";
>+void main()
>+{
>+    int i = u_zero;
>+    switch(++i) {}
>+    my_FragColor = (i == 1) ? vec4(0, 1, 0, 1) : vec4(1, 0, 0, 1);
>+})";
> 
>-    ANGLE_GL_PROGRAM(program, mSimpleVSSource, fragmentShader);
>-    drawQuad(program.get(), "inputAttribute", 0.5f);
>+    ANGLE_GL_PROGRAM(program, essl3_shaders::vs::Simple(), kFS);
>+    drawQuad(program.get(), essl3_shaders::PositionAttrib(), 0.5f);
>     EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::green);
> }
> 
>@@ -3741,77 +4167,78 @@ TEST_P(GLSLTest_ES3, ConstStructInsideExpression)
>     // Incorrect output color was seen on Android. http://anglebug.com/2226
>     ANGLE_SKIP_TEST_IF(IsAndroid() && !IsNVIDIA() && IsOpenGLES());
> 
>-    const std::string &fragmentShader =
>-        R"(#version 300 es
>+    constexpr char kFS[] = R"(#version 300 es
> 
>-        precision highp float;
>-        out vec4 my_FragColor;
>+precision highp float;
>+out vec4 my_FragColor;
> 
>-        uniform float u_zero;
>+uniform float u_zero;
> 
>-        struct S
>-        {
>-            float field;
>-        };
>+struct S
>+{
>+    float field;
>+};
> 
>-        void main()
>-        {
>-            const S constS = S(1.0);
>-            S nonConstS = constS;
>-            nonConstS.field = u_zero;
>-            bool fail = (constS == nonConstS);
>-            my_FragColor = vec4(0, 1, 0, 1);
>-            if (fail)
>-            {
>-                my_FragColor = vec4(1, 0, 0, 1);
>-            }
>-        })";
>+void main()
>+{
>+    const S constS = S(1.0);
>+    S nonConstS = constS;
>+    nonConstS.field = u_zero;
>+    bool fail = (constS == nonConstS);
>+    my_FragColor = vec4(0, 1, 0, 1);
>+    if (fail)
>+    {
>+        my_FragColor = vec4(1, 0, 0, 1);
>+    }
>+})";
> 
>-    ANGLE_GL_PROGRAM(program, mSimpleVSSource, fragmentShader);
>-    drawQuad(program.get(), "inputAttribute", 0.5f);
>+    ANGLE_GL_PROGRAM(program, essl3_shaders::vs::Simple(), kFS);
>+    drawQuad(program.get(), essl3_shaders::PositionAttrib(), 0.5f);
>     EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::green);
> }
> 
> // Test that a varying struct that's defined as a part of the declaration is handled correctly.
> TEST_P(GLSLTest_ES3, VaryingStructWithInlineDefinition)
> {
>-    const std::string &vertexShader =
>-        R"(#version 300 es
>-            in vec4 inputAttribute;
>+    // TODO(syoussefi): missing ES3 shader feature support.
>+    // http://anglebug.com/3199
>+    ANGLE_SKIP_TEST_IF(IsVulkan());
> 
>-            flat out struct S
>-            {
>-                int field;
>-            } v_s;
>+    constexpr char kVS[] = R"(#version 300 es
>+in vec4 inputAttribute;
> 
>-            void main()
>-            {
>-                v_s.field = 1;
>-                gl_Position = inputAttribute;
>-            })";
>+flat out struct S
>+{
>+    int field;
>+} v_s;
> 
>-    const std::string &fragmentShader =
>-        R"(#version 300 es
>+void main()
>+{
>+    v_s.field = 1;
>+    gl_Position = inputAttribute;
>+})";
> 
>-        precision highp float;
>-        out vec4 my_FragColor;
>+    constexpr char kFS[] = R"(#version 300 es
> 
>-        flat in struct S
>-        {
>-            int field;
>-        } v_s;
>+precision highp float;
>+out vec4 my_FragColor;
> 
>-        void main()
>-        {
>-            bool success = (v_s.field == 1);
>-            my_FragColor = vec4(1, 0, 0, 1);
>-            if (success)
>-            {
>-                my_FragColor = vec4(0, 1, 0, 1);
>-            }
>-        })";
>+flat in struct S
>+{
>+    int field;
>+} v_s;
> 
>-    ANGLE_GL_PROGRAM(program, vertexShader, fragmentShader);
>+void main()
>+{
>+    bool success = (v_s.field == 1);
>+    my_FragColor = vec4(1, 0, 0, 1);
>+    if (success)
>+    {
>+        my_FragColor = vec4(0, 1, 0, 1);
>+    }
>+})";
>+
>+    ANGLE_GL_PROGRAM(program, kVS, kFS);
>     drawQuad(program.get(), "inputAttribute", 0.5f);
>     EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::green);
> }
>@@ -3821,27 +4248,24 @@ TEST_P(GLSLTest_ES3, VaryingStructWithInlineDefinition)
> // VectorizeVectorScalarArithmetic AST transform.
> TEST_P(GLSLTest, VectorScalarMultiplyAndAddInLoop)
> {
>-    const std::string &fragmentShader =
>-        R"(
>-
>-        precision mediump float;
>+    constexpr char kFS[] = R"(precision mediump float;
> 
>-        void main() {
>-            gl_FragColor = vec4(0.0, 0.0, 0.0, 0.0);
>-            for (int i = 0; i < 2; i++)
>-            {
>-                gl_FragColor += (2.0 * gl_FragCoord.x);
>-            }
>-            if (gl_FragColor.g == gl_FragColor.r &&
>-                gl_FragColor.b == gl_FragColor.r &&
>-                gl_FragColor.a == gl_FragColor.r)
>-            {
>-                gl_FragColor = vec4(0, 1, 0, 1);
>-            }
>-        })";
>+void main() {
>+    gl_FragColor = vec4(0.0, 0.0, 0.0, 0.0);
>+    for (int i = 0; i < 2; i++)
>+    {
>+        gl_FragColor += (2.0 * gl_FragCoord.x);
>+    }
>+    if (gl_FragColor.g == gl_FragColor.r &&
>+        gl_FragColor.b == gl_FragColor.r &&
>+        gl_FragColor.a == gl_FragColor.r)
>+    {
>+        gl_FragColor = vec4(0, 1, 0, 1);
>+    }
>+})";
> 
>-    ANGLE_GL_PROGRAM(program, mSimpleVSSource, fragmentShader);
>-    drawQuad(program.get(), "inputAttribute", 0.5f);
>+    ANGLE_GL_PROGRAM(program, essl1_shaders::vs::Simple(), kFS);
>+    drawQuad(program.get(), essl1_shaders::PositionAttrib(), 0.5f);
>     EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::green);
> }
> 
>@@ -3850,32 +4274,1047 @@ TEST_P(GLSLTest, VectorScalarMultiplyAndAddInLoop)
> // VectorizeVectorScalarArithmetic AST transform.
> TEST_P(GLSLTest, VectorScalarDivideAndAddInLoop)
> {
>-    const std::string &fragmentShader =
>-        R"(
>+    constexpr char kFS[] = R"(precision mediump float;
>+
>+void main() {
>+    gl_FragColor = vec4(0.0, 0.0, 0.0, 0.0);
>+    for (int i = 0; i < 2; i++)
>+    {
>+        float x = gl_FragCoord.x;
>+        gl_FragColor = gl_FragColor + (x /= 2.0);
>+    }
>+    if (gl_FragColor.g == gl_FragColor.r &&
>+        gl_FragColor.b == gl_FragColor.r &&
>+        gl_FragColor.a == gl_FragColor.r)
>+    {
>+        gl_FragColor = vec4(0, 1, 0, 1);
>+    }
>+})";
>+
>+    ANGLE_GL_PROGRAM(program, essl1_shaders::vs::Simple(), kFS);
>+    drawQuad(program.get(), essl1_shaders::PositionAttrib(), 0.5f);
>+    EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::green);
>+}
>+
>+// Test that a varying with a flat qualifier that is used as an operand of a folded ternary operator
>+// is handled correctly.
>+TEST_P(GLSLTest_ES3, FlatVaryingUsedInFoldedTernary)
>+{
>+    // TODO(syoussefi): missing ES3 shader feature support.
>+    // http://anglebug.com/3219
>+    ANGLE_SKIP_TEST_IF(IsVulkan());
> 
>-        precision mediump float;
>+    constexpr char kVS[] = R"(#version 300 es
> 
>-        void main() {
>-            gl_FragColor = vec4(0.0, 0.0, 0.0, 0.0);
>-            for (int i = 0; i < 2; i++)
>-            {
>-                float x = gl_FragCoord.x;
>-                gl_FragColor = gl_FragColor + (x /= 2.0);
>-            }
>-            if (gl_FragColor.g == gl_FragColor.r &&
>-                gl_FragColor.b == gl_FragColor.r &&
>-                gl_FragColor.a == gl_FragColor.r)
>-            {
>-                gl_FragColor = vec4(0, 1, 0, 1);
>-            }
>-        })";
>+in vec4 inputAttribute;
>+
>+flat out int v;
>+
>+void main()
>+{
>+    v = 1;
>+    gl_Position = inputAttribute;
>+})";
>+
>+    constexpr char kFS[] = R"(#version 300 es
>+
>+precision highp float;
>+out vec4 my_FragColor;
>+
>+flat in int v;
>+
>+void main()
>+{
>+    my_FragColor = vec4(0, (true ? v : 0), 0, 1);
>+})";
> 
>-    ANGLE_GL_PROGRAM(program, mSimpleVSSource, fragmentShader);
>+    ANGLE_GL_PROGRAM(program, kVS, kFS);
>     drawQuad(program.get(), "inputAttribute", 0.5f);
>     EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::green);
> }
> 
>-// Use this to select which configurations (e.g. which renderer, which GLES major version) these tests should be run against.
>+// Verify that the link error message from last link failure is cleared when the new link is
>+// finished.
>+TEST_P(GLSLTest, ClearLinkErrorLog)
>+{
>+    constexpr char kVS[] = R"(attribute vec4 vert_in;
>+varying vec4 vert_out;
>+void main()
>+{
>+    gl_Position = vert_in;
>+    vert_out = vert_in;
>+})";
>+
>+    constexpr char kFS[] = R"(precision mediump float;
>+varying vec4 frag_in;
>+void main()
>+{
>+    gl_FragColor = frag_in;
>+})";
>+
>+    GLuint vs = CompileShader(GL_VERTEX_SHADER, kVS);
>+    GLuint fs = CompileShader(GL_FRAGMENT_SHADER, kFS);
>+
>+    GLuint program = glCreateProgram();
>+
>+    // The first time the program link fails because of lack of fragment shader.
>+    glAttachShader(program, vs);
>+    glLinkProgram(program);
>+    GLint linkStatus = GL_TRUE;
>+    glGetProgramiv(program, GL_LINK_STATUS, &linkStatus);
>+    ASSERT_FALSE(linkStatus);
>+
>+    const std::string &lackOfFragmentShader = QueryErrorMessage(program);
>+
>+    // The second time the program link fails because of the mismatch of the varying types.
>+    glAttachShader(program, fs);
>+    glLinkProgram(program);
>+    linkStatus = GL_TRUE;
>+    glGetProgramiv(program, GL_LINK_STATUS, &linkStatus);
>+    ASSERT_FALSE(linkStatus);
>+
>+    const std::string &varyingTypeMismatch = QueryErrorMessage(program);
>+
>+    EXPECT_EQ(std::string::npos, varyingTypeMismatch.find(lackOfFragmentShader));
>+
>+    glDetachShader(program, vs);
>+    glDetachShader(program, fs);
>+    glDeleteShader(vs);
>+    glDeleteShader(fs);
>+    glDeleteProgram(program);
>+
>+    ASSERT_GL_NO_ERROR();
>+}
>+
>+// Validate error messages when the link mismatch occurs on the type of a non-struct varying.
>+TEST_P(GLSLTest, ErrorMessageOfVaryingMismatch)
>+{
>+    constexpr char kVS[] = R"(attribute vec4 inputAttribute;
>+varying vec4 vertex_out;
>+void main()
>+{
>+    vertex_out = inputAttribute;
>+    gl_Position = inputAttribute;
>+})";
>+
>+    constexpr char kFS[] = R"(precision mediump float;
>+varying float vertex_out;
>+void main()
>+{
>+    gl_FragColor = vec4(vertex_out, 0.0, 0.0, 1.0);
>+})";
>+
>+    validateComponentsInErrorMessage(kVS, kFS, "Types", "varying 'vertex_out'");
>+}
>+
>+// Validate error messages when the link mismatch occurs on the name of a varying field.
>+TEST_P(GLSLTest_ES3, ErrorMessageOfVaryingStructFieldNameMismatch)
>+{
>+    constexpr char kVS[] = R"(#version 300 es
>+in vec4 inputAttribute;
>+struct S {
>+    float val1;
>+    vec4 val2;
>+};
>+out S vertex_out;
>+void main()
>+{
>+    vertex_out.val2 = inputAttribute;
>+    vertex_out.val1 = inputAttribute[0];
>+    gl_Position = inputAttribute;
>+})";
>+
>+    constexpr char kFS[] = R"(#version 300 es
>+precision mediump float;
>+struct S {
>+    float val1;
>+    vec4 val3;
>+};
>+in S vertex_out;
>+layout (location = 0) out vec4 frag_out;
>+void main()
>+{
>+    frag_out = vec4(vertex_out.val1, 0.0, 0.0, 1.0);
>+})";
>+
>+    validateComponentsInErrorMessage(kVS, kFS, "Field names", "varying 'vertex_out'");
>+}
>+
>+// Validate error messages when the link mismatch occurs on the type of a varying field.
>+TEST_P(GLSLTest_ES3, ErrorMessageOfVaryingStructFieldMismatch)
>+{
>+    constexpr char kVS[] = R"(#version 300 es
>+in vec4 inputAttribute;
>+struct S {
>+    float val1;
>+    vec4 val2;
>+};
>+out S vertex_out;
>+void main()
>+{
>+    vertex_out.val2 = inputAttribute;
>+    vertex_out.val1 = inputAttribute[0];
>+    gl_Position = inputAttribute;
>+})";
>+
>+    constexpr char kFS[] = R"(#version 300 es
>+precision mediump float;
>+struct S {
>+    float val1;
>+    vec2 val2;
>+};
>+in S vertex_out;
>+layout (location = 0) out vec4 frag_out;
>+void main()
>+{
>+    frag_out = vec4(vertex_out.val1, 0.0, 0.0, 1.0);
>+})";
>+
>+    validateComponentsInErrorMessage(kVS, kFS, "Types",
>+                                     "varying 'vertex_out' member 'vertex_out.val2'");
>+}
>+
>+// Validate error messages when the link mismatch occurs on the name of a struct member of a uniform
>+// field.
>+TEST_P(GLSLTest, ErrorMessageOfLinkUniformStructFieldNameMismatch)
>+{
>+    constexpr char kVS[] = R"(
>+struct T
>+{
>+    vec2 t1;
>+    vec3 t2;
>+};
>+struct S {
>+    T val1;
>+    vec4 val2;
>+};
>+uniform S uni;
>+
>+attribute vec4 inputAttribute;
>+varying vec4 vertex_out;
>+void main()
>+{
>+    vertex_out = uni.val2;
>+    gl_Position = inputAttribute;
>+})";
>+
>+    constexpr char kFS[] = R"(precision highp float;
>+struct T
>+{
>+    vec2 t1;
>+    vec3 t3;
>+};
>+struct S {
>+    T val1;
>+    vec4 val2;
>+};
>+uniform S uni;
>+
>+varying vec4 vertex_out;
>+void main()
>+{
>+    gl_FragColor = vec4(uni.val1.t1[0], 0.0, 0.0, 1.0);
>+})";
>+
>+    validateComponentsInErrorMessage(kVS, kFS, "Field names", "uniform 'uni' member 'uni.val1'");
>+}
>+
>+// Validate error messages  when the link mismatch occurs on the type of a non-struct uniform block
>+// field.
>+TEST_P(GLSLTest_ES3, ErrorMessageOfLinkInterfaceBlockFieldMismatch)
>+{
>+    // TODO(syoussefi): missing ES3 shader feature support.
>+    // http://anglebug.com/3199
>+    ANGLE_SKIP_TEST_IF(IsVulkan());
>+
>+    constexpr char kVS[] = R"(#version 300 es
>+uniform S {
>+    vec2 val1;
>+    vec4 val2;
>+} uni;
>+
>+in vec4 inputAttribute;
>+out vec4 vertex_out;
>+void main()
>+{
>+    vertex_out = uni.val2;
>+    gl_Position = inputAttribute;
>+})";
>+
>+    constexpr char kFS[] = R"(#version 300 es
>+precision highp float;
>+uniform S {
>+    vec2 val1;
>+    vec3 val2;
>+} uni;
>+
>+in vec4 vertex_out;
>+layout (location = 0) out vec4 frag_out;
>+void main()
>+{
>+    frag_out = vec4(uni.val1[0], 0.0, 0.0, 1.0);
>+})";
>+
>+    validateComponentsInErrorMessage(kVS, kFS, "Types", "uniform block 'S' member 'S.val2'");
>+}
>+
>+// Validate error messages  when the link mismatch occurs on the type of a member of a uniform block
>+// struct field.
>+TEST_P(GLSLTest_ES3, ErrorMessageOfLinkInterfaceBlockStructFieldMismatch)
>+{
>+    // TODO(syoussefi): missing ES3 shader feature support.
>+    // http://anglebug.com/3199
>+    ANGLE_SKIP_TEST_IF(IsVulkan());
>+
>+    constexpr char kVS[] = R"(#version 300 es
>+struct T
>+{
>+    vec2 t1;
>+    vec3 t2;
>+};
>+uniform S {
>+    T val1;
>+    vec4 val2;
>+} uni;
>+
>+in vec4 inputAttribute;
>+out vec4 vertex_out;
>+void main()
>+{
>+    vertex_out = uni.val2;
>+    gl_Position = inputAttribute;
>+})";
>+
>+    constexpr char kFS[] = R"(#version 300 es
>+precision highp float;
>+struct T
>+{
>+    vec2 t1;
>+    vec4 t2;
>+};
>+uniform S {
>+    T val1;
>+    vec4 val2;
>+} uni;
>+
>+in vec4 vertex_out;
>+layout (location = 0) out vec4 frag_out;
>+void main()
>+{
>+    frag_out = vec4(uni.val1.t1[0], 0.0, 0.0, 1.0);
>+})";
>+
>+    validateComponentsInErrorMessage(kVS, kFS, "Types", "uniform block 'S' member 'S.val1.t2'");
>+}
>+
>+// Test a vertex shader that doesn't declare any varyings with a fragment shader that statically
>+// uses a varying, but in a statement that gets trivially optimized out by the compiler.
>+TEST_P(GLSLTest_ES3, FragmentShaderStaticallyUsesVaryingMissingFromVertex)
>+{
>+    constexpr char kVS[] = R"(#version 300 es
>+precision mediump float;
>+
>+void main()
>+{
>+    gl_Position = vec4(0, 1, 0, 1);
>+})";
>+
>+    constexpr char kFS[] = R"(#version 300 es
>+precision mediump float;
>+in float foo;
>+out vec4 my_FragColor;
>+
>+void main()
>+{
>+    if (false)
>+    {
>+        float unreferenced = foo;
>+    }
>+    my_FragColor = vec4(0, 1, 0, 1);
>+})";
>+
>+    validateComponentsInErrorMessage(kVS, kFS, "does not match any", "foo");
>+}
>+
>+// Test a varying that is statically used but not active in the fragment shader.
>+TEST_P(GLSLTest_ES3, VaryingStaticallyUsedButNotActiveInFragmentShader)
>+{
>+    constexpr char kVS[] = R"(#version 300 es
>+precision mediump float;
>+in vec4 iv;
>+out vec4 v;
>+void main()
>+{
>+    gl_Position = iv;
>+    v = iv;
>+})";
>+
>+    constexpr char kFS[] = R"(#version 300 es
>+precision mediump float;
>+in vec4 v;
>+out vec4 color;
>+void main()
>+{
>+    color = true ? vec4(0.0) : v;
>+})";
>+
>+    ANGLE_GL_PROGRAM(program, kVS, kFS);
>+}
>+
>+// Test nesting floor() calls with a large multiplier inside.
>+TEST_P(GLSLTest_ES3, NestedFloorWithLargeMultiplierInside)
>+{
>+    // D3D11 seems to ignore the floor() calls in this particular case, so one of the corners ends
>+    // up red. http://crbug.com/838885
>+    ANGLE_SKIP_TEST_IF(IsD3D11());
>+
>+    constexpr char kFS[] = R"(#version 300 es
>+precision highp float;
>+out vec4 my_FragColor;
>+void main()
>+{
>+    vec2 coord = gl_FragCoord.xy / 500.0;
>+    my_FragColor = vec4(1, 0, 0, 1);
>+    if (coord.y + 0.1 > floor(1e-6 * floor(coord.x*4e5)))
>+    {
>+        my_FragColor = vec4(0, 1, 0, 1);
>+    }
>+})";
>+
>+    ANGLE_GL_PROGRAM(program, essl3_shaders::vs::Simple(), kFS);
>+    drawQuad(program.get(), essl3_shaders::PositionAttrib(), 0.5f);
>+    // Verify that all the corners of the rendered result are green.
>+    EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::green);
>+    EXPECT_PIXEL_COLOR_EQ(getWindowWidth() - 1, getWindowHeight() - 1, GLColor::green);
>+    EXPECT_PIXEL_COLOR_EQ(getWindowWidth() - 1, 0, GLColor::green);
>+    EXPECT_PIXEL_COLOR_EQ(0, getWindowHeight() - 1, GLColor::green);
>+}
>+
>+// Verify that a link error is generated when the sum of the number of active image uniforms and
>+// active shader storage blocks in a rendering pipeline exceeds
>+// GL_MAX_COMBINED_SHADER_OUTPUT_RESOURCES.
>+TEST_P(GLSLTest_ES31, ExceedCombinedShaderOutputResourcesInVSAndFS)
>+{
>+    // TODO(jiawei.shao@intel.com): enable this test when shader storage buffer is supported on
>+    // D3D11 back-ends.
>+    ANGLE_SKIP_TEST_IF(IsD3D11());
>+
>+    GLint maxVertexShaderStorageBlocks;
>+    GLint maxVertexImageUniforms;
>+    GLint maxFragmentShaderStorageBlocks;
>+    GLint maxFragmentImageUniforms;
>+    GLint maxCombinedShaderStorageBlocks;
>+    GLint maxCombinedImageUniforms;
>+    glGetIntegerv(GL_MAX_VERTEX_SHADER_STORAGE_BLOCKS, &maxVertexShaderStorageBlocks);
>+    glGetIntegerv(GL_MAX_VERTEX_IMAGE_UNIFORMS, &maxVertexImageUniforms);
>+    glGetIntegerv(GL_MAX_FRAGMENT_SHADER_STORAGE_BLOCKS, &maxFragmentShaderStorageBlocks);
>+    glGetIntegerv(GL_MAX_FRAGMENT_IMAGE_UNIFORMS, &maxFragmentImageUniforms);
>+    glGetIntegerv(GL_MAX_COMBINED_SHADER_STORAGE_BLOCKS, &maxCombinedShaderStorageBlocks);
>+    glGetIntegerv(GL_MAX_COMBINED_IMAGE_UNIFORMS, &maxCombinedImageUniforms);
>+
>+    ASSERT_GE(maxCombinedShaderStorageBlocks, maxVertexShaderStorageBlocks);
>+    ASSERT_GE(maxCombinedShaderStorageBlocks, maxFragmentShaderStorageBlocks);
>+    ASSERT_GE(maxCombinedImageUniforms, maxVertexImageUniforms);
>+    ASSERT_GE(maxCombinedImageUniforms, maxFragmentImageUniforms);
>+
>+    GLint vertexSSBOs   = maxVertexShaderStorageBlocks;
>+    GLint fragmentSSBOs = maxFragmentShaderStorageBlocks;
>+    // Limit the sum of ssbos in vertex and fragment shaders to maxCombinedShaderStorageBlocks.
>+    if (vertexSSBOs + fragmentSSBOs > maxCombinedShaderStorageBlocks)
>+    {
>+        fragmentSSBOs = maxCombinedShaderStorageBlocks - vertexSSBOs;
>+    }
>+
>+    GLint vertexImages   = maxVertexImageUniforms;
>+    GLint fragmentImages = maxFragmentImageUniforms;
>+    // Limit the sum of images in vertex and fragment shaders to maxCombinedImageUniforms.
>+    if (vertexImages + fragmentImages > maxCombinedImageUniforms)
>+    {
>+        vertexImages = maxCombinedImageUniforms - fragmentImages;
>+    }
>+
>+    GLint maxDrawBuffers;
>+    glGetIntegerv(GL_MAX_DRAW_BUFFERS, &maxDrawBuffers);
>+
>+    GLint maxCombinedShaderOutputResources;
>+    glGetIntegerv(GL_MAX_COMBINED_SHADER_OUTPUT_RESOURCES, &maxCombinedShaderOutputResources);
>+    ASSERT_GL_NO_ERROR();
>+
>+    ANGLE_SKIP_TEST_IF(vertexSSBOs + fragmentSSBOs + vertexImages + fragmentImages +
>+                           maxDrawBuffers <=
>+                       maxCombinedShaderOutputResources);
>+
>+    std::ostringstream vertexStream;
>+    vertexStream << "#version 310 es\n";
>+    for (int i = 0; i < vertexSSBOs; ++i)
>+    {
>+        vertexStream << "layout(shared, binding = " << i << ") buffer blockName" << i
>+                     << "{\n"
>+                        "    float data;\n"
>+                        "} ssbo"
>+                     << i << ";\n";
>+    }
>+    vertexStream << "layout(r32f, binding = 0) uniform highp image2D imageArray[" << vertexImages
>+                 << "];\n";
>+    vertexStream << "void main()\n"
>+                    "{\n"
>+                    "    float val = 0.1;\n"
>+                    "    vec4 val2 = vec4(0.0);\n";
>+    for (int i = 0; i < vertexSSBOs; ++i)
>+    {
>+        vertexStream << "    val += ssbo" << i << ".data; \n";
>+    }
>+    for (int i = 0; i < vertexImages; ++i)
>+    {
>+        vertexStream << "    val2 += imageLoad(imageArray[" << i << "], ivec2(0, 0)); \n";
>+    }
>+    vertexStream << "    gl_Position = vec4(val, val2);\n"
>+                    "}\n";
>+
>+    std::ostringstream fragmentStream;
>+    fragmentStream << "#version 310 es\n"
>+                   << "precision highp float;\n";
>+    for (int i = 0; i < fragmentSSBOs; ++i)
>+    {
>+        fragmentStream << "layout(shared, binding = " << i << ") buffer blockName" << i
>+                       << "{\n"
>+                          "    float data;\n"
>+                          "} ssbo"
>+                       << i << ";\n";
>+    }
>+    fragmentStream << "layout(r32f, binding = 0) uniform highp image2D imageArray["
>+                   << fragmentImages << "];\n";
>+    fragmentStream << "layout (location = 0) out vec4 foutput[" << maxDrawBuffers << "];\n";
>+
>+    fragmentStream << "void main()\n"
>+                      "{\n"
>+                      "    float val = 0.1;\n"
>+                      "    vec4 val2 = vec4(0.0);\n";
>+    for (int i = 0; i < fragmentSSBOs; ++i)
>+    {
>+        fragmentStream << "    val += ssbo" << i << ".data; \n";
>+    }
>+    for (int i = 0; i < fragmentImages; ++i)
>+    {
>+        fragmentStream << "    val2 += imageLoad(imageArray[" << i << "], ivec2(0, 0)); \n";
>+    }
>+    for (int i = 0; i < maxDrawBuffers; ++i)
>+    {
>+        fragmentStream << "    foutput[" << i << "] = vec4(val, val2);\n";
>+    }
>+    fragmentStream << "}\n";
>+
>+    GLuint program = CompileProgram(vertexStream.str().c_str(), fragmentStream.str().c_str());
>+    EXPECT_EQ(0u, program);
>+
>+    ASSERT_GL_NO_ERROR();
>+}
>+
>+// Test that assigning an assignment expression to a swizzled vector field in a user-defined
>+// function works correctly.
>+TEST_P(GLSLTest_ES3, AssignAssignmentToSwizzled)
>+{
>+    constexpr char kFS[] = R"(#version 300 es
>+precision highp float;
>+out vec4 my_FragColor;
>+
>+uniform float uzero;
>+
>+vec3 fun(float s, float v)
>+{
>+    vec3 r = vec3(0);
>+    if (s < 1.0) {
>+        r.x = r.y = r.z = v;
>+        return r;
>+    }
>+    return r;
>+}
>+
>+void main()
>+{
>+    my_FragColor.a = 1.0;
>+    my_FragColor.rgb = fun(uzero, 1.0);
>+})";
>+
>+    ANGLE_GL_PROGRAM(program, essl3_shaders::vs::Simple(), kFS);
>+    drawQuad(program.get(), essl3_shaders::PositionAttrib(), 0.5f);
>+    EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::white);
>+}
>+
>+// Test a fragment shader that returns inside if (that being the only branch that actually gets
>+// executed). Regression test for http://anglebug.com/2325
>+TEST_P(GLSLTest, IfElseIfAndReturn)
>+{
>+    constexpr char kVS[] = R"(attribute vec4 a_position;
>+varying vec2 vPos;
>+void main()
>+{
>+    gl_Position = a_position;
>+    vPos = a_position.xy;
>+})";
>+
>+    constexpr char kFS[] = R"(precision mediump float;
>+varying vec2 vPos;
>+void main()
>+{
>+    if (vPos.x < 1.0) // This colors the whole canvas green
>+    {
>+        gl_FragColor = vec4(0, 1, 0, 1);
>+        return;
>+    }
>+    else if (vPos.x < 1.1) // This should have no effect
>+    {
>+        gl_FragColor = vec4(1, 0, 0, 1);
>+    }
>+})";
>+
>+    ANGLE_GL_PROGRAM(program, kVS, kFS);
>+    drawQuad(program.get(), "a_position", 0.5f);
>+    EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::green);
>+}
>+
>+// Tests that PointCoord behaves the same betweeen a user FBO and the back buffer.
>+TEST_P(GLSLTest, PointCoordConsistency)
>+{
>+    // On Intel Windows OpenGL drivers PointCoord appears to be flipped when drawing to the
>+    // default framebuffer. http://anglebug.com/2805
>+    ANGLE_SKIP_TEST_IF(IsIntel() && IsWindows() && IsOpenGL());
>+
>+    // AMD's OpenGL drivers may have the same issue. http://anglebug.com/1643
>+    ANGLE_SKIP_TEST_IF(IsAMD() && IsWindows() && IsOpenGL());
>+
>+    constexpr char kPointCoordVS[] = R"(attribute vec2 position;
>+uniform vec2 viewportSize;
>+void main()
>+{
>+   gl_Position = vec4(position, 0, 1);
>+   gl_PointSize = viewportSize.x;
>+})";
>+
>+    constexpr char kPointCoordFS[] = R"(void main()
>+{
>+    gl_FragColor = vec4(gl_PointCoord.xy, 0, 1);
>+})";
>+
>+    ANGLE_GL_PROGRAM(program, kPointCoordVS, kPointCoordFS);
>+    glUseProgram(program);
>+
>+    GLint uniLoc = glGetUniformLocation(program, "viewportSize");
>+    ASSERT_NE(-1, uniLoc);
>+    glUniform2f(uniLoc, static_cast<GLfloat>(getWindowWidth()),
>+                static_cast<GLfloat>(getWindowHeight()));
>+
>+    // Draw to backbuffer.
>+    glDrawArrays(GL_POINTS, 0, 1);
>+    ASSERT_GL_NO_ERROR();
>+
>+    std::vector<GLColor> backbufferData(getWindowWidth() * getWindowHeight());
>+    glReadPixels(0, 0, getWindowWidth(), getWindowHeight(), GL_RGBA, GL_UNSIGNED_BYTE,
>+                 backbufferData.data());
>+
>+    GLTexture tex;
>+    glBindTexture(GL_TEXTURE_2D, tex);
>+    glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, getWindowWidth(), getWindowHeight(), 0, GL_RGBA,
>+                 GL_UNSIGNED_BYTE, nullptr);
>+
>+    GLFramebuffer fbo;
>+    glBindFramebuffer(GL_FRAMEBUFFER, fbo);
>+    glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, tex, 0);
>+    ASSERT_GL_NO_ERROR();
>+    ASSERT_GLENUM_EQ(GL_FRAMEBUFFER_COMPLETE, glCheckFramebufferStatus(GL_FRAMEBUFFER));
>+
>+    // Draw to user FBO.
>+    glDrawArrays(GL_POINTS, 0, 1);
>+    ASSERT_GL_NO_ERROR();
>+
>+    std::vector<GLColor> userFBOData(getWindowWidth() * getWindowHeight());
>+    glReadPixels(0, 0, getWindowWidth(), getWindowHeight(), GL_RGBA, GL_UNSIGNED_BYTE,
>+                 userFBOData.data());
>+
>+    ASSERT_GL_NO_ERROR();
>+    ASSERT_EQ(userFBOData.size(), backbufferData.size());
>+    EXPECT_EQ(userFBOData, backbufferData);
>+}
>+
>+bool SubrectEquals(const std::vector<GLColor> &bigArray,
>+                   const std::vector<GLColor> &smallArray,
>+                   int bigSize,
>+                   int offset,
>+                   int smallSize)
>+{
>+    int badPixels = 0;
>+    for (int y = 0; y < smallSize; y++)
>+    {
>+        for (int x = 0; x < smallSize; x++)
>+        {
>+            int bigOffset   = (y + offset) * bigSize + x + offset;
>+            int smallOffset = y * smallSize + x;
>+            if (bigArray[bigOffset] != smallArray[smallOffset])
>+                badPixels++;
>+        }
>+    }
>+    return badPixels == 0;
>+}
>+
>+// Tests that FragCoord behaves the same betweeen a user FBO and the back buffer.
>+TEST_P(GLSLTest, FragCoordConsistency)
>+{
>+    constexpr char kFragCoordShader[] = R"(uniform mediump vec2 viewportSize;
>+void main()
>+{
>+    gl_FragColor = vec4(gl_FragCoord.xy / viewportSize, 0, 1);
>+})";
>+
>+    ANGLE_GL_PROGRAM(program, essl1_shaders::vs::Simple(), kFragCoordShader);
>+    glUseProgram(program);
>+
>+    GLint uniLoc = glGetUniformLocation(program, "viewportSize");
>+    ASSERT_NE(-1, uniLoc);
>+    glUniform2f(uniLoc, static_cast<GLfloat>(getWindowWidth()),
>+                static_cast<GLfloat>(getWindowHeight()));
>+
>+    // Draw to backbuffer.
>+    drawQuad(program, essl1_shaders::PositionAttrib(), 0.5);
>+    ASSERT_GL_NO_ERROR();
>+
>+    std::vector<GLColor> backbufferData(getWindowWidth() * getWindowHeight());
>+    glReadPixels(0, 0, getWindowWidth(), getWindowHeight(), GL_RGBA, GL_UNSIGNED_BYTE,
>+                 backbufferData.data());
>+
>+    GLTexture tex;
>+    glBindTexture(GL_TEXTURE_2D, tex);
>+    glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, getWindowWidth(), getWindowHeight(), 0, GL_RGBA,
>+                 GL_UNSIGNED_BYTE, nullptr);
>+
>+    GLFramebuffer fbo;
>+    glBindFramebuffer(GL_FRAMEBUFFER, fbo);
>+    glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, tex, 0);
>+    ASSERT_GL_NO_ERROR();
>+    ASSERT_GLENUM_EQ(GL_FRAMEBUFFER_COMPLETE, glCheckFramebufferStatus(GL_FRAMEBUFFER));
>+
>+    // Draw to user FBO.
>+    drawQuad(program, essl1_shaders::PositionAttrib(), 0.5);
>+    ASSERT_GL_NO_ERROR();
>+
>+    std::vector<GLColor> userFBOData(getWindowWidth() * getWindowHeight());
>+    glReadPixels(0, 0, getWindowWidth(), getWindowHeight(), GL_RGBA, GL_UNSIGNED_BYTE,
>+                 userFBOData.data());
>+
>+    ASSERT_GL_NO_ERROR();
>+    ASSERT_EQ(userFBOData.size(), backbufferData.size());
>+    EXPECT_EQ(userFBOData, backbufferData)
>+        << "FragCoord should be the same to default and user FBO";
>+
>+    // Repeat the same test but with a smaller viewport.
>+    ASSERT_EQ(getWindowHeight(), getWindowWidth());
>+    const int kQuarterSize = getWindowWidth() >> 2;
>+    glViewport(kQuarterSize, kQuarterSize, kQuarterSize * 2, kQuarterSize * 2);
>+
>+    glClearColor(1.0f, 0.0f, 0.0f, 1.0f);
>+    glClear(GL_COLOR_BUFFER_BIT);
>+    drawQuad(program, essl1_shaders::PositionAttrib(), 0.5);
>+
>+    std::vector<GLColor> userFBOViewportData(kQuarterSize * kQuarterSize * 4);
>+    glReadPixels(kQuarterSize, kQuarterSize, kQuarterSize * 2, kQuarterSize * 2, GL_RGBA,
>+                 GL_UNSIGNED_BYTE, userFBOViewportData.data());
>+
>+    glBindFramebuffer(GL_FRAMEBUFFER, 0);
>+    glClear(GL_COLOR_BUFFER_BIT);
>+    drawQuad(program, essl1_shaders::PositionAttrib(), 0.5);
>+
>+    std::vector<GLColor> defaultFBOViewportData(kQuarterSize * kQuarterSize * 4);
>+    glReadPixels(kQuarterSize, kQuarterSize, kQuarterSize * 2, kQuarterSize * 2, GL_RGBA,
>+                 GL_UNSIGNED_BYTE, defaultFBOViewportData.data());
>+    ASSERT_GL_NO_ERROR();
>+    EXPECT_EQ(userFBOViewportData, defaultFBOViewportData)
>+        << "FragCoord should be the same to default and user FBO even with a custom viewport";
>+
>+    // Check that the subrectangles are the same between the viewport and non-viewport modes.
>+    EXPECT_TRUE(SubrectEquals(userFBOData, userFBOViewportData, getWindowWidth(), kQuarterSize,
>+                              kQuarterSize * 2));
>+    EXPECT_TRUE(SubrectEquals(backbufferData, defaultFBOViewportData, getWindowWidth(),
>+                              kQuarterSize, kQuarterSize * 2));
>+}
>+
>+// Ensure that using defined in a macro works in this simple case. This mirrors a dEQP test.
>+TEST_P(GLSLTest, DefinedInMacroSucceeds)
>+{
>+    constexpr char kVS[] = R"(precision mediump float;
>+attribute highp vec4 position;
>+varying vec2 out0;
>+
>+void main()
>+{
>+#define AAA defined(BBB)
>+
>+#if !AAA
>+    out0 = vec2(0.0, 1.0);
>+#else
>+    out0 = vec2(1.0, 0.0);
>+#endif
>+    gl_Position = position;
>+})";
>+
>+    constexpr char kFS[] = R"(precision mediump float;
>+varying vec2 out0;
>+void main()
>+{
>+    gl_FragColor = vec4(out0, 0, 1);
>+})";
>+
>+    ANGLE_GL_PROGRAM(program, kVS, kFS);
>+    drawQuad(program, "position", 0.5f);
>+    EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::green);
>+}
>+
>+// Validate the defined operator is evaluated when the macro is called, not when defined.
>+TEST_P(GLSLTest, DefinedInMacroWithUndef)
>+{
>+    constexpr char kVS[] = R"(precision mediump float;
>+attribute highp vec4 position;
>+varying vec2 out0;
>+
>+void main()
>+{
>+#define BBB 1
>+#define AAA defined(BBB)
>+#undef BBB
>+
>+#if AAA
>+    out0 = vec2(1.0, 0.0);
>+#else
>+    out0 = vec2(0.0, 1.0);
>+#endif
>+    gl_Position = position;
>+})";
>+
>+    constexpr char kFS[] = R"(precision mediump float;
>+varying vec2 out0;
>+void main()
>+{
>+    gl_FragColor = vec4(out0, 0, 1);
>+})";
>+
>+    ANGLE_GL_PROGRAM(program, kVS, kFS);
>+    drawQuad(program, "position", 0.5f);
>+    EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::green);
>+}
>+
>+// Validate the defined operator is evaluated when the macro is called, not when defined.
>+TEST_P(GLSLTest, DefinedAfterMacroUsage)
>+{
>+    constexpr char kVS[] = R"(precision mediump float;
>+attribute highp vec4 position;
>+varying vec2 out0;
>+
>+void main()
>+{
>+#define AAA defined(BBB)
>+#define BBB 1
>+
>+#if AAA
>+    out0 = vec2(0.0, 1.0);
>+#else
>+    out0 = vec2(1.0, 0.0);
>+#endif
>+    gl_Position = position;
>+})";
>+
>+    constexpr char kFS[] = R"(precision mediump float;
>+varying vec2 out0;
>+void main()
>+{
>+    gl_FragColor = vec4(out0, 0, 1);
>+})";
>+
>+    ANGLE_GL_PROGRAM(program, kVS, kFS);
>+    drawQuad(program, "position", 0.5f);
>+    EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::green);
>+}
>+
>+// Test generating "defined" by concatenation when a macro is called. This is not allowed.
>+TEST_P(GLSLTest, DefinedInMacroConcatenationNotAllowed)
>+{
>+    constexpr char kVS[] = R"(precision mediump float;
>+attribute highp vec4 position;
>+varying vec2 out0;
>+
>+void main()
>+{
>+#define BBB 1
>+#define AAA(defi, ned) defi ## ned(BBB)
>+
>+#if AAA(defi, ned)
>+    out0 = vec2(0.0, 1.0);
>+#else
>+    out0 = vec2(1.0, 0.0);
>+#endif
>+    gl_Position = position;
>+})";
>+
>+    constexpr char kFS[] = R"(precision mediump float;
>+varying vec2 out0;
>+void main()
>+{
>+    gl_FragColor = vec4(out0, 0, 1);
>+})";
>+
>+    GLuint program = CompileProgram(kVS, kFS);
>+    EXPECT_EQ(0u, program);
>+    glDeleteProgram(program);
>+}
>+
>+// Test using defined in a macro parameter name. This is not allowed.
>+TEST_P(GLSLTest, DefinedAsParameterNameNotAllowed)
>+{
>+    constexpr char kVS[] = R"(precision mediump float;
>+attribute highp vec4 position;
>+varying vec2 out0;
>+
>+void main()
>+{
>+#define BBB 1
>+#define AAA(defined) defined(BBB)
>+
>+#if AAA(defined)
>+    out0 = vec2(0.0, 1.0);
>+#else
>+    out0 = vec2(1.0, 0.0);
>+#endif
>+    gl_Position = position;
>+})";
>+
>+    constexpr char kFS[] = R"(precision mediump float;
>+varying vec2 out0;
>+void main()
>+{
>+    gl_FragColor = vec4(out0, 0, 1);
>+})";
>+
>+    GLuint program = CompileProgram(kVS, kFS);
>+    EXPECT_EQ(0u, program);
>+    glDeleteProgram(program);
>+}
>+
>+// Ensure that defined in a macro is no accepted in WebGL.
>+TEST_P(WebGLGLSLTest, DefinedInMacroFails)
>+{
>+    constexpr char kVS[] = R"(precision mediump float;
>+attribute highp vec4 position;
>+varying float out0;
>+
>+void main()
>+{
>+#define AAA defined(BBB)
>+
>+#if !AAA
>+    out0 = 1.0;
>+#else
>+    out0 = 0.0;
>+#endif
>+    gl_Position = dEQP_Position;
>+})";
>+
>+    constexpr char kFS[] = R"(precision mediump float;
>+varying float out0;
>+void main()
>+{
>+    gl_FragColor = vec4(out0, 0, 0, 1);
>+})";
>+
>+    GLuint program = CompileProgram(kVS, kFS);
>+    EXPECT_EQ(0u, program);
>+    glDeleteProgram(program);
>+}
>+
>+// Simple test using a define macro in WebGL.
>+TEST_P(WebGLGLSLTest, DefinedGLESSymbol)
>+{
>+    constexpr char kVS[] = R"(void main()
>+{
>+    gl_Position = vec4(1, 0, 0, 1);
>+})";
>+
>+    constexpr char kFS[] = R"(#if defined(GL_ES)
>+precision mediump float;
>+void main()
>+{
>+    gl_FragColor = vec4(0.0, 0.0, 0.0, 1.0);
>+}
>+#else
>+foo
>+#endif
>+)";
>+
>+    ANGLE_GL_PROGRAM(program, kVS, kFS);
>+}
>+
>+// Tests constant folding of non-square 'matrixCompMult'.
>+TEST_P(GLSLTest_ES3, NonSquareMatrixCompMult)
>+{
>+    constexpr char kFS[] = R"(#version 300 es
>+precision mediump float;
>+
>+const mat4x2 matA = mat4x2(2.0, 4.0, 8.0, 16.0, 32.0, 64.0, 128.0, 256.0);
>+const mat4x2 matB = mat4x2(1.0/2.0, 1.0/4.0, 1.0/8.0, 1.0/16.0, 1.0/32.0, 1.0/64.0, 1.0/128.0, 1.0/256.0);
>+
>+out vec4 color;
>+
>+void main()
>+{
>+    mat4x2 result = matrixCompMult(matA, matB);
>+    vec2 vresult = result * vec4(1.0, 1.0, 1.0, 1.0);
>+    if (vresult == vec2(4.0, 4.0))
>+    {
>+        color = vec4(0.0, 1.0, 0.0, 1.0);
>+    }
>+    else
>+    {
>+        color = vec4(1.0, 0.0, 0.0, 1.0);
>+    }
>+})";
>+
>+    ANGLE_GL_PROGRAM(program, essl3_shaders::vs::Simple(), kFS);
>+    drawQuad(program, essl3_shaders::PositionAttrib(), 0.5f, 1.0f, true);
>+    EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::green);
>+}
>+
>+// Test initializing an array with the same name of previously declared array
>+TEST_P(GLSLTest_ES3, InitSameNameArray)
>+{
>+    constexpr char kFS[] = R"(#version 300 es
>+      precision highp float;
>+      out vec4 my_FragColor;
>+
>+      void main()
>+      {
>+          float arr[2] = float[2](1.0, 1.0);
>+          {
>+              float arr[2] = arr;
>+              my_FragColor = vec4(0.0, arr[0], 0.0, arr[1]);
>+          }
>+      })";
>+
>+    ANGLE_GL_PROGRAM(program, essl3_shaders::vs::Simple(), kFS);
>+    drawQuad(program, essl31_shaders::PositionAttrib(), 0.5f, 1.0f, true);
>+    EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::green);
>+}
>+
>+// Tests using gl_FragData[0] instead of gl_FragColor.
>+TEST_P(GLSLTest, FragData)
>+{
>+    // Ensures that we don't regress and emit Vulkan layer warnings.
>+    treatPlatformWarningsAsErrors();
>+
>+    constexpr char kFS[] = R"(void main() { gl_FragData[0] = vec4(1, 0, 0, 1); })";
>+    ANGLE_GL_PROGRAM(program, essl1_shaders::vs::Simple(), kFS);
>+    drawQuad(program, essl1_shaders::PositionAttrib(), 0.5f);
>+    EXPECT_GL_NO_ERROR();
>+    EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::red);
>+}
>+
>+// Use this to select which configurations (e.g. which renderer, which GLES major version) these
>+// tests should be run against.
> ANGLE_INSTANTIATE_TEST(GLSLTest,
>                        ES2_D3D9(),
>                        ES2_D3D11(),
>@@ -3883,11 +5322,23 @@ ANGLE_INSTANTIATE_TEST(GLSLTest,
>                        ES2_OPENGL(),
>                        ES3_OPENGL(),
>                        ES2_OPENGLES(),
>-                       ES3_OPENGLES());
>+                       ES3_OPENGLES(),
>+                       ES2_VULKAN());
>+
>+ANGLE_INSTANTIATE_TEST(GLSLTestNoValidation,
>+                       ES2_D3D9(),
>+                       ES2_D3D11(),
>+                       ES2_D3D11_FL9_3(),
>+                       ES2_OPENGL(),
>+                       ES3_OPENGL(),
>+                       ES2_OPENGLES(),
>+                       ES3_OPENGLES(),
>+                       ES2_VULKAN());
> 
>-// Use this to select which configurations (e.g. which renderer, which GLES major version) these tests should be run against.
>-ANGLE_INSTANTIATE_TEST(GLSLTest_ES3, ES3_D3D11(), ES3_OPENGL(), ES3_OPENGLES());
>+// Use this to select which configurations (e.g. which renderer, which GLES major version) these
>+// tests should be run against.
>+ANGLE_INSTANTIATE_TEST(GLSLTest_ES3, ES3_D3D11(), ES3_OPENGL(), ES3_OPENGLES(), ES3_VULKAN());
> 
>-ANGLE_INSTANTIATE_TEST(WebGLGLSLTest, ES2_D3D11(), ES2_OPENGL(), ES2_OPENGLES());
>+ANGLE_INSTANTIATE_TEST(WebGLGLSLTest, ES2_D3D11(), ES2_OPENGL(), ES2_OPENGLES(), ES2_VULKAN());
> 
> ANGLE_INSTANTIATE_TEST(GLSLTest_ES31, ES31_D3D11(), ES31_OPENGL(), ES31_OPENGLES());
>diff --git a/Source/ThirdParty/ANGLE/src/tests/gl_tests/GeometryShaderTest.cpp b/Source/ThirdParty/ANGLE/src/tests/gl_tests/GeometryShaderTest.cpp
>index 62bf20563bd..6d313091f6c 100644
>--- a/Source/ThirdParty/ANGLE/src/tests/gl_tests/GeometryShaderTest.cpp
>+++ b/Source/ThirdParty/ANGLE/src/tests/gl_tests/GeometryShaderTest.cpp
>@@ -7,6 +7,7 @@
> // GeometryShaderTest.cpp : Tests of the implementation of geometry shader
> 
> #include "test_utils/ANGLETest.h"
>+#include "test_utils/gl_raii.h"
> 
> using namespace angle;
> 
>@@ -15,16 +16,45 @@ namespace
> 
> class GeometryShaderTest : public ANGLETest
> {
>+  protected:
>+    static std::string CreateEmptyGeometryShader(const std::string &inputPrimitive,
>+                                                 const std::string &outputPrimitive,
>+                                                 int invocations,
>+                                                 int maxVertices)
>+    {
>+        std::ostringstream ostream;
>+        ostream << "#version 310 es\n"
>+                   "#extension GL_EXT_geometry_shader : require\n";
>+        if (!inputPrimitive.empty())
>+        {
>+            ostream << "layout (" << inputPrimitive << ") in;\n";
>+        }
>+        if (!outputPrimitive.empty())
>+        {
>+            ostream << "layout (" << outputPrimitive << ") out;\n";
>+        }
>+        if (invocations > 0)
>+        {
>+            ostream << "layout (invocations = " << invocations << ") in;\n";
>+        }
>+        if (maxVertices >= 0)
>+        {
>+            ostream << "layout (max_vertices = " << maxVertices << ") out;\n";
>+        }
>+        ostream << "void main()\n"
>+                   "{\n"
>+                   "}";
>+        return ostream.str();
>+    }
> };
> 
> class GeometryShaderTestES3 : public ANGLETest
>-{
>-};
>+{};
> 
> // Verify that Geometry Shader cannot be created in an OpenGL ES 3.0 context.
> TEST_P(GeometryShaderTestES3, CreateGeometryShaderInES3)
> {
>-    EXPECT_TRUE(!extensionEnabled("GL_EXT_geometry_shader"));
>+    EXPECT_TRUE(!IsGLExtensionEnabled("GL_EXT_geometry_shader"));
>     GLuint geometryShader = glCreateShader(GL_GEOMETRY_SHADER_EXT);
>     EXPECT_EQ(0u, geometryShader);
>     EXPECT_GL_ERROR(GL_INVALID_ENUM);
>@@ -33,29 +63,28 @@ TEST_P(GeometryShaderTestES3, CreateGeometryShaderInES3)
> // Verify that Geometry Shader can be created and attached to a program.
> TEST_P(GeometryShaderTest, CreateAndAttachGeometryShader)
> {
>-    ANGLE_SKIP_TEST_IF(!extensionEnabled("GL_EXT_geometry_shader"));
>+    ANGLE_SKIP_TEST_IF(!IsGLExtensionEnabled("GL_EXT_geometry_shader"));
> 
>-    const std::string &geometryShaderSource =
>-        R"(#version 310 es
>-        #extension GL_EXT_geometry_shader : require
>-        layout (invocations = 3, triangles) in;
>-        layout (triangle_strip, max_vertices = 3) out;
>-        in vec4 texcoord[];
>-        out vec4 o_texcoord;
>-        void main()
>-        {
>-            int n;
>-            for (n = 0; n < gl_in.length(); n++)
>-            {
>-                gl_Position = gl_in[n].gl_Position;
>-                gl_Layer   = gl_InvocationID;
>-                o_texcoord = texcoord[n];
>-                EmitVertex();
>-            }
>-            EndPrimitive();
>-        })";
>-
>-    GLuint geometryShader = CompileShader(GL_GEOMETRY_SHADER_EXT, geometryShaderSource);
>+    constexpr char kGS[] = R"(#version 310 es
>+#extension GL_EXT_geometry_shader : require
>+layout (invocations = 3, triangles) in;
>+layout (triangle_strip, max_vertices = 3) out;
>+in vec4 texcoord[];
>+out vec4 o_texcoord;
>+void main()
>+{
>+    int n;
>+    for (n = 0; n < gl_in.length(); n++)
>+    {
>+        gl_Position = gl_in[n].gl_Position;
>+        gl_Layer   = gl_InvocationID;
>+        o_texcoord = texcoord[n];
>+        EmitVertex();
>+    }
>+    EndPrimitive();
>+})";
>+
>+    GLuint geometryShader = CompileShader(GL_GEOMETRY_SHADER_EXT, kGS);
> 
>     EXPECT_NE(0u, geometryShader);
> 
>@@ -69,6 +98,727 @@ TEST_P(GeometryShaderTest, CreateAndAttachGeometryShader)
>     EXPECT_GL_NO_ERROR();
> }
> 
>+// Verify that all the implementation dependent geometry shader related resource limits meet the
>+// requirement of GL_EXT_geometry_shader SPEC.
>+TEST_P(GeometryShaderTest, GeometryShaderImplementationDependentLimits)
>+{
>+    ANGLE_SKIP_TEST_IF(!IsGLExtensionEnabled("GL_EXT_geometry_shader"));
>+
>+    const std::map<GLenum, int> limits = {{GL_MAX_FRAMEBUFFER_LAYERS_EXT, 256},
>+                                          {GL_MAX_GEOMETRY_UNIFORM_COMPONENTS_EXT, 1024},
>+                                          {GL_MAX_GEOMETRY_UNIFORM_BLOCKS_EXT, 12},
>+                                          {GL_MAX_GEOMETRY_INPUT_COMPONENTS_EXT, 64},
>+                                          {GL_MAX_GEOMETRY_OUTPUT_COMPONENTS_EXT, 64},
>+                                          {GL_MAX_GEOMETRY_OUTPUT_VERTICES_EXT, 256},
>+                                          {GL_MAX_GEOMETRY_TOTAL_OUTPUT_COMPONENTS_EXT, 1024},
>+                                          {GL_MAX_GEOMETRY_TEXTURE_IMAGE_UNITS_EXT, 16},
>+                                          {GL_MAX_GEOMETRY_ATOMIC_COUNTER_BUFFERS_EXT, 0},
>+                                          {GL_MAX_GEOMETRY_ATOMIC_COUNTERS_EXT, 0},
>+                                          {GL_MAX_GEOMETRY_SHADER_STORAGE_BLOCKS_EXT, 0},
>+                                          {GL_MAX_GEOMETRY_IMAGE_UNIFORMS_EXT, 0},
>+                                          {GL_MAX_GEOMETRY_SHADER_INVOCATIONS_EXT, 32}};
>+
>+    GLint value;
>+    for (const auto &limit : limits)
>+    {
>+        value = 0;
>+        glGetIntegerv(limit.first, &value);
>+        EXPECT_GL_NO_ERROR();
>+        EXPECT_GE(value, limit.second);
>+    }
>+
>+    value = 0;
>+    glGetIntegerv(GL_LAYER_PROVOKING_VERTEX_EXT, &value);
>+    EXPECT_GL_NO_ERROR();
>+    EXPECT_TRUE(value == GL_FIRST_VERTEX_CONVENTION_EXT || value == GL_LAST_VERTEX_CONVENTION_EXT ||
>+                value == GL_UNDEFINED_VERTEX_EXT);
>+}
>+
>+// Verify that all the combined resource limits meet the requirement of GL_EXT_geometry_shader SPEC.
>+TEST_P(GeometryShaderTest, CombinedResourceLimits)
>+{
>+    ANGLE_SKIP_TEST_IF(!IsGLExtensionEnabled("GL_EXT_geometry_shader"));
>+
>+    // See http://anglebug.com/2261.
>+    ANGLE_SKIP_TEST_IF(IsAndroid());
>+
>+    const std::map<GLenum, int> limits = {{GL_MAX_UNIFORM_BUFFER_BINDINGS, 48},
>+                                          {GL_MAX_COMBINED_UNIFORM_BLOCKS, 36},
>+                                          {GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS, 64}};
>+
>+    GLint value;
>+    for (const auto &limit : limits)
>+    {
>+        value = 0;
>+        glGetIntegerv(limit.first, &value);
>+        EXPECT_GL_NO_ERROR();
>+        EXPECT_GE(value, limit.second);
>+    }
>+}
>+
>+// Verify that linking a program with an uncompiled geometry shader causes a link failure.
>+TEST_P(GeometryShaderTest, LinkWithUncompiledGeometryShader)
>+{
>+    ANGLE_SKIP_TEST_IF(!IsGLExtensionEnabled("GL_EXT_geometry_shader"));
>+
>+    GLuint vertexShader   = CompileShader(GL_VERTEX_SHADER, essl31_shaders::vs::Simple());
>+    GLuint fragmentShader = CompileShader(GL_FRAGMENT_SHADER, essl31_shaders::fs::Red());
>+    ASSERT_NE(0u, vertexShader);
>+    ASSERT_NE(0u, fragmentShader);
>+
>+    GLuint geometryShader = glCreateShader(GL_GEOMETRY_SHADER_EXT);
>+
>+    GLuint program = glCreateProgram();
>+    glAttachShader(program, vertexShader);
>+    glAttachShader(program, fragmentShader);
>+    glAttachShader(program, geometryShader);
>+    glDeleteShader(vertexShader);
>+    glDeleteShader(fragmentShader);
>+    glDeleteShader(geometryShader);
>+
>+    glLinkProgram(program);
>+
>+    GLint linkStatus;
>+    glGetProgramiv(program, GL_LINK_STATUS, &linkStatus);
>+    EXPECT_EQ(0, linkStatus);
>+
>+    glDeleteProgram(program);
>+    ASSERT_GL_NO_ERROR();
>+}
>+
>+// Verify that linking a program with geometry shader whose version is different from other shaders
>+// in this program causes a link error.
>+TEST_P(GeometryShaderTest, LinkWhenShaderVersionMismatch)
>+{
>+    ANGLE_SKIP_TEST_IF(!IsGLExtensionEnabled("GL_EXT_geometry_shader"));
>+
>+    const std::string &emptyGeometryShader = CreateEmptyGeometryShader("points", "points", 2, 1);
>+
>+    GLuint program = CompileProgramWithGS(essl3_shaders::vs::Simple(), emptyGeometryShader.c_str(),
>+                                          essl3_shaders::fs::Red());
>+    EXPECT_EQ(0u, program);
>+}
>+
>+// Verify that linking a program with geometry shader that lacks input primitive,
>+// output primitive, or declaration on 'max_vertices' causes a link failure.
>+TEST_P(GeometryShaderTest, LinkValidationOnGeometryShaderLayouts)
>+{
>+    ANGLE_SKIP_TEST_IF(!IsGLExtensionEnabled("GL_EXT_geometry_shader"));
>+
>+    const std::string gsWithoutInputPrimitive  = CreateEmptyGeometryShader("", "points", 2, 1);
>+    const std::string gsWithoutOutputPrimitive = CreateEmptyGeometryShader("points", "", 2, 1);
>+    const std::string gsWithoutInvocations = CreateEmptyGeometryShader("points", "points", -1, 1);
>+    const std::string gsWithoutMaxVertices = CreateEmptyGeometryShader("points", "points", 2, -1);
>+
>+    // Linking a program with a geometry shader that only lacks 'invocations' should not cause a
>+    // link failure.
>+    GLuint program = CompileProgramWithGS(essl31_shaders::vs::Simple(),
>+                                          gsWithoutInvocations.c_str(), essl31_shaders::fs::Red());
>+    EXPECT_NE(0u, program);
>+
>+    glDeleteProgram(program);
>+
>+    // Linking a program with a geometry shader that lacks input primitive, output primitive or
>+    // 'max_vertices' causes a link failure.
>+    program = CompileProgramWithGS(essl31_shaders::vs::Simple(), gsWithoutInputPrimitive.c_str(),
>+                                   essl31_shaders::fs::Red());
>+    EXPECT_EQ(0u, program);
>+
>+    program = CompileProgramWithGS(essl31_shaders::vs::Simple(), gsWithoutOutputPrimitive.c_str(),
>+                                   essl31_shaders::fs::Red());
>+    EXPECT_EQ(0u, program);
>+
>+    program = CompileProgramWithGS(essl31_shaders::vs::Simple(), gsWithoutMaxVertices.c_str(),
>+                                   essl31_shaders::fs::Red());
>+    EXPECT_EQ(0u, program);
>+
>+    ASSERT_GL_NO_ERROR();
>+}
>+
>+// Verify that an link error occurs when the vertex shader has an array output and there is a
>+// geometry shader in the program.
>+TEST_P(GeometryShaderTest, VertexShaderArrayOutput)
>+{
>+    ANGLE_SKIP_TEST_IF(!IsGLExtensionEnabled("GL_EXT_geometry_shader"));
>+
>+    constexpr char kVS[] = R"(#version 310 es
>+in vec4 vertex_in;
>+out vec4 vertex_out[3];
>+void main()
>+{
>+    gl_Position = vertex_in;
>+    vertex_out[0] = vec4(1.0, 0.0, 0.0, 1.0);
>+    vertex_out[1] = vec4(0.0, 1.0, 0.0, 1.0);
>+    vertex_out[2] = vec4(0.0, 0.0, 1.0, 1.0);
>+})";
>+
>+    constexpr char kGS[] = R"(#version 310 es
>+#extension GL_EXT_geometry_shader : require
>+layout (invocations = 3, triangles) in;
>+layout (points, max_vertices = 3) out;
>+in vec4 vertex_out[];
>+out vec4 geometry_color;
>+void main()
>+{
>+    gl_Position = gl_in[0].gl_Position;
>+    geometry_color = vertex_out[0];
>+    EmitVertex();
>+})";
>+
>+    constexpr char kFS[] = R"(#version 310 es
>+precision mediump float;
>+in vec4 geometry_color;
>+layout (location = 0) out vec4 output_color;
>+void main()
>+{
>+    output_color = geometry_color;
>+})";
>+
>+    GLuint program = CompileProgramWithGS(kVS, kGS, kFS);
>+    EXPECT_EQ(0u, program);
>+
>+    EXPECT_GL_NO_ERROR();
>+}
>+
>+// Verify that an link error occurs when the definition of a unform in fragment shader is different
>+// from those in a geometry shader.
>+TEST_P(GeometryShaderTest, UniformMismatchBetweenGeometryAndFragmentShader)
>+{
>+    ANGLE_SKIP_TEST_IF(!IsGLExtensionEnabled("GL_EXT_geometry_shader"));
>+
>+    constexpr char kVS[] = R"(#version 310 es
>+uniform highp vec4 uniform_value_vert;
>+in vec4 vertex_in;
>+out vec4 vertex_out;
>+void main()
>+{
>+    gl_Position = vertex_in;
>+    vertex_out = uniform_value_vert;
>+})";
>+
>+    constexpr char kGS[] = R"(#version 310 es
>+#extension GL_EXT_geometry_shader : require
>+uniform vec4 uniform_value;
>+layout (invocations = 3, triangles) in;
>+layout (points, max_vertices = 3) out;
>+in vec4 vertex_out[];
>+out vec4 geometry_color;
>+void main()
>+{
>+    gl_Position = gl_in[0].gl_Position;
>+    geometry_color = vertex_out[0] + uniform_value;
>+    EmitVertex();
>+})";
>+
>+    constexpr char kFS[] = R"(#version 310 es
>+precision highp float;
>+uniform float uniform_value;
>+in vec4 geometry_color;
>+layout (location = 0) out vec4 output_color;
>+void main()
>+{
>+    output_color = vec4(geometry_color.rgb, uniform_value);
>+})";
>+
>+    GLuint program = CompileProgramWithGS(kVS, kGS, kFS);
>+    EXPECT_EQ(0u, program);
>+
>+    EXPECT_GL_NO_ERROR();
>+}
>+
>+// Verify that an link error occurs when the number of uniform blocks in a geometry shader exceeds
>+// MAX_GEOMETRY_UNIFORM_BLOCKS_EXT.
>+TEST_P(GeometryShaderTest, TooManyUniformBlocks)
>+{
>+    ANGLE_SKIP_TEST_IF(!IsGLExtensionEnabled("GL_EXT_geometry_shader"));
>+
>+    GLint maxGeometryUniformBlocks = 0;
>+    glGetIntegerv(GL_MAX_GEOMETRY_UNIFORM_BLOCKS_EXT, &maxGeometryUniformBlocks);
>+
>+    GLint numUniformBlocks = maxGeometryUniformBlocks + 1;
>+    std::ostringstream stream;
>+    stream << "#version 310 es\n"
>+              "#extension GL_EXT_geometry_shader : require\n"
>+              "uniform ubo\n"
>+              "{\n"
>+              "    vec4 value1;\n"
>+              "} block0["
>+           << numUniformBlocks
>+           << "];\n"
>+              "layout (triangles) in;\n"
>+              "layout (points, max_vertices = 1) out;\n"
>+              "void main()\n"
>+              "{\n"
>+              "    gl_Position = gl_in[0].gl_Position;\n";
>+
>+    for (GLint i = 0; i < numUniformBlocks; ++i)
>+    {
>+        stream << "    gl_Position += block0[" << i << "].value1;\n";
>+    }
>+    stream << "    EmitVertex();\n"
>+              "}\n";
>+
>+    GLuint program = CompileProgramWithGS(essl31_shaders::vs::Simple(), stream.str().c_str(),
>+                                          essl31_shaders::fs::Red());
>+    EXPECT_EQ(0u, program);
>+
>+    EXPECT_GL_NO_ERROR();
>+}
>+
>+// Verify that an link error occurs when the number of shader storage blocks in a geometry shader
>+// exceeds MAX_GEOMETRY_SHADER_STORAGE_BLOCKS_EXT.
>+TEST_P(GeometryShaderTest, TooManyShaderStorageBlocks)
>+{
>+    ANGLE_SKIP_TEST_IF(!IsGLExtensionEnabled("GL_EXT_geometry_shader"));
>+
>+    GLint maxGeometryShaderStorageBlocks = 0;
>+    glGetIntegerv(GL_MAX_GEOMETRY_SHADER_STORAGE_BLOCKS_EXT, &maxGeometryShaderStorageBlocks);
>+
>+    GLint numSSBOs = maxGeometryShaderStorageBlocks + 1;
>+    std::ostringstream stream;
>+    stream << "#version 310 es\n"
>+              "#extension GL_EXT_geometry_shader : require\n"
>+              "buffer ssbo\n"
>+              "{\n"
>+              "    vec4 value1;\n"
>+              "} block0["
>+           << numSSBOs
>+           << "];\n"
>+              "layout (triangles) in;\n"
>+              "layout (points, max_vertices = 1) out;\n"
>+              "void main()\n"
>+              "{\n"
>+              "    gl_Position = gl_in[0].gl_Position;\n";
>+
>+    for (GLint i = 0; i < numSSBOs; ++i)
>+    {
>+        stream << "    gl_Position += block0[" << i << "].value1;\n";
>+    }
>+    stream << "    EmitVertex();\n"
>+              "}\n";
>+
>+    GLuint program = CompileProgramWithGS(essl31_shaders::vs::Simple(), stream.str().c_str(),
>+                                          essl31_shaders::fs::Red());
>+    EXPECT_EQ(0u, program);
>+
>+    EXPECT_GL_NO_ERROR();
>+}
>+
>+// Verify that an link error occurs when the definition of a unform block in the vertex shader is
>+// different from that in a geometry shader.
>+TEST_P(GeometryShaderTest, UniformBlockMismatchBetweenVertexAndGeometryShader)
>+{
>+    ANGLE_SKIP_TEST_IF(!IsGLExtensionEnabled("GL_EXT_geometry_shader"));
>+
>+    constexpr char kVS[] = R"(#version 310 es
>+uniform ubo
>+{
>+    vec4 uniform_value_vert;
>+} block0;
>+in vec4 vertex_in;
>+out vec4 vertex_out;
>+void main()
>+{
>+    gl_Position = vertex_in;
>+    vertex_out = block0.uniform_value_vert;
>+})";
>+
>+    constexpr char kGS[] = R"(#version 310 es
>+#extension GL_EXT_geometry_shader : require
>+uniform ubo
>+{
>+    vec4 uniform_value_geom;
>+} block0;
>+layout (triangles) in;
>+layout (points, max_vertices = 1) out;
>+in vec4 vertex_out[];
>+void main()
>+{
>+    gl_Position = gl_in[0].gl_Position + vertex_out[0];
>+    gl_Position += block0.uniform_value_geom;
>+    EmitVertex();
>+})";
>+
>+    GLuint program = CompileProgramWithGS(kVS, kGS, essl31_shaders::fs::Red());
>+    EXPECT_EQ(0u, program);
>+
>+    EXPECT_GL_NO_ERROR();
>+}
>+
>+// Verify that an link error occurs when the definition of a shader storage block in the geometry
>+// shader is different from that in a fragment shader.
>+TEST_P(GeometryShaderTest, ShaderStorageBlockMismatchBetweenGeometryAndFragmentShader)
>+{
>+    ANGLE_SKIP_TEST_IF(!IsGLExtensionEnabled("GL_EXT_geometry_shader"));
>+
>+    GLint maxGeometryShaderStorageBlocks = 0;
>+    glGetIntegerv(GL_MAX_GEOMETRY_SHADER_STORAGE_BLOCKS_EXT, &maxGeometryShaderStorageBlocks);
>+
>+    // The minimun value of MAX_GEOMETRY_SHADER_STORAGE_BLOCKS_EXT can be 0.
>+    // [EXT_geometry_shader] Table 20.43gs
>+    ANGLE_SKIP_TEST_IF(maxGeometryShaderStorageBlocks == 0);
>+
>+    GLint maxFragmentShaderStorageBlocks = 0;
>+    glGetIntegerv(GL_MAX_FRAGMENT_SHADER_STORAGE_BLOCKS, &maxFragmentShaderStorageBlocks);
>+
>+    // The minimun value of MAX_FRAGMENT_SHADER_STORAGE_BLOCKS can be 0.
>+    // [OpenGL ES 3.1] Table 20.44
>+    ANGLE_SKIP_TEST_IF(maxFragmentShaderStorageBlocks == 0);
>+
>+    constexpr char kGS[] = R"(#version 310 es
>+#extension GL_EXT_geometry_shader : require
>+buffer ssbo
>+{
>+    vec4 ssbo_value;
>+} block0;
>+layout (triangles) in;
>+layout (points, max_vertices = 1) out;
>+void main()
>+{
>+    gl_Position = gl_in[0].gl_Position + block0.ssbo_value;
>+    EmitVertex();
>+})";
>+
>+    constexpr char kFS[] = R"(#version 310 es
>+precision highp float;
>+buffer ssbo
>+{
>+    vec3 ssbo_value;
>+} block0;
>+layout (location = 0) out vec4 output_color;
>+void main()
>+{
>+    output_color = vec4(block0.ssbo_value, 1);
>+})";
>+
>+    GLuint program = CompileProgramWithGS(essl31_shaders::vs::Simple(), kGS, kFS);
>+    EXPECT_EQ(0u, program);
>+
>+    EXPECT_GL_NO_ERROR();
>+}
>+
>+// Verify GL_REFERENCED_BY_GEOMETRY_SHADER_EXT cannot be used on platforms that don't support
>+// EXT_geometry_shader, or we will get an INVALID_ENUM error.
>+TEST_P(GeometryShaderTest, ReferencedByGeometryShaderWithoutExtensionEnabled)
>+{
>+    ANGLE_SKIP_TEST_IF(IsGLExtensionEnabled("GL_EXT_geometry_shader"));
>+
>+    constexpr char kFS[] = R"(#version 310 es
>+precision highp float;
>+uniform vec4 color;
>+layout(location = 0) out vec4 oColor;
>+void main()
>+{
>+    oColor = color;
>+})";
>+
>+    ANGLE_GL_PROGRAM(program, essl31_shaders::vs::Simple(), kFS);
>+
>+    const GLuint index = glGetProgramResourceIndex(program, GL_UNIFORM, "color");
>+    ASSERT_GL_NO_ERROR();
>+    ASSERT_NE(GL_INVALID_INDEX, index);
>+
>+    constexpr GLenum kProps[]    = {GL_REFERENCED_BY_GEOMETRY_SHADER_EXT};
>+    constexpr GLsizei kPropCount = static_cast<GLsizei>(ArraySize(kProps));
>+    GLint params[ArraySize(kProps)];
>+    GLsizei length;
>+
>+    glGetProgramResourceiv(program, GL_UNIFORM, index, kPropCount, kProps, kPropCount, &length,
>+                           params);
>+    EXPECT_GL_ERROR(GL_INVALID_ENUM);
>+}
>+
>+// Verify GL_REFERENCED_BY_GEOMETRY_SHADER_EXT can work correctly on platforms that support
>+// EXT_geometry_shader.
>+TEST_P(GeometryShaderTest, ReferencedByGeometryShader)
>+{
>+    ANGLE_SKIP_TEST_IF(!IsGLExtensionEnabled("GL_EXT_geometry_shader"));
>+
>+    constexpr char kVS[] = R"(#version 310 es
>+precision highp float;
>+layout(location = 0) in highp vec4 position;
>+void main()
>+{
>+    gl_Position = position;
>+})";
>+
>+    constexpr char kGS[] = R"(#version 310 es
>+#extension GL_EXT_geometry_shader : require
>+layout (binding = 3) uniform ubo0
>+{
>+    vec4 ubo0_location;
>+} block0;
>+layout (binding = 4) uniform ubo1
>+{
>+    vec4 ubo1_location;
>+} block1;
>+uniform vec4 u_color;
>+layout (triangles) in;
>+layout (points, max_vertices = 1) out;
>+out vec4 gs_out;
>+void main()
>+{
>+    gl_Position = gl_in[0].gl_Position;
>+    gl_Position += block0.ubo0_location + block1.ubo1_location;
>+    gs_out = u_color;
>+    EmitVertex();
>+})";
>+
>+    constexpr char kFS[] = R"(#version 310 es
>+precision highp float;
>+in vec4 gs_out;
>+layout(location = 0) out vec4 oColor;
>+void main()
>+{
>+    oColor = gs_out;
>+})";
>+
>+    ANGLE_GL_PROGRAM_WITH_GS(program, kVS, kGS, kFS);
>+
>+    constexpr GLenum kProps[]    = {GL_REFERENCED_BY_GEOMETRY_SHADER_EXT};
>+    constexpr GLsizei kPropCount = static_cast<GLsizei>(ArraySize(kProps));
>+    std::array<GLint, ArraySize(kProps)> params;
>+    GLsizei length;
>+
>+    params.fill(1);
>+    GLuint index = glGetProgramResourceIndex(program, GL_PROGRAM_INPUT, "position");
>+    glGetProgramResourceiv(program, GL_PROGRAM_INPUT, index, kPropCount, kProps, kPropCount,
>+                           &length, params.data());
>+    EXPECT_GL_NO_ERROR();
>+    EXPECT_EQ(0, params[0]);
>+
>+    params.fill(1);
>+    index = glGetProgramResourceIndex(program, GL_PROGRAM_OUTPUT, "oColor");
>+    glGetProgramResourceiv(program, GL_PROGRAM_OUTPUT, index, kPropCount, kProps, kPropCount,
>+                           &length, params.data());
>+    EXPECT_GL_NO_ERROR();
>+    EXPECT_EQ(0, params[0]);
>+
>+    index = glGetProgramResourceIndex(program, GL_UNIFORM, "u_color");
>+    glGetProgramResourceiv(program, GL_UNIFORM, index, kPropCount, kProps, kPropCount, &length,
>+                           params.data());
>+    EXPECT_GL_NO_ERROR();
>+    EXPECT_EQ(1, params[0]);
>+
>+    params.fill(0);
>+    index = glGetProgramResourceIndex(program, GL_UNIFORM_BLOCK, "ubo1");
>+    glGetProgramResourceiv(program, GL_UNIFORM_BLOCK, index, kPropCount, kProps, kPropCount,
>+                           &length, params.data());
>+    EXPECT_GL_NO_ERROR();
>+    EXPECT_EQ(1, params[0]);
>+
>+    GLint maxGeometryShaderStorageBlocks = 0;
>+    glGetIntegerv(GL_MAX_GEOMETRY_SHADER_STORAGE_BLOCKS_EXT, &maxGeometryShaderStorageBlocks);
>+    // The maximum number of shader storage blocks in a geometry shader can be 0.
>+    // [EXT_geometry_shader] Table 20.43gs
>+    if (maxGeometryShaderStorageBlocks > 0)
>+    {
>+        constexpr char kGSWithSSBO[] = R"(#version 310 es
>+#extension GL_EXT_geometry_shader : require
>+layout (binding = 2) buffer ssbo
>+{
>+    vec4 ssbo_value;
>+} block0;
>+layout (triangles) in;
>+layout (points, max_vertices = 1) out;
>+out vec4 gs_out;
>+void main()
>+{
>+    gl_Position = gl_in[0].gl_Position + block0.ssbo_value;
>+    gs_out = block0.ssbo_value;
>+    EmitVertex();
>+})";
>+
>+        ANGLE_GL_PROGRAM_WITH_GS(programWithSSBO, kVS, kGSWithSSBO, kFS);
>+
>+        params.fill(0);
>+        index = glGetProgramResourceIndex(programWithSSBO, GL_SHADER_STORAGE_BLOCK, "ssbo");
>+        glGetProgramResourceiv(programWithSSBO, GL_SHADER_STORAGE_BLOCK, index, kPropCount, kProps,
>+                               kPropCount, &length, params.data());
>+        EXPECT_GL_NO_ERROR();
>+        EXPECT_EQ(1, params[0]);
>+
>+        params.fill(0);
>+        index = glGetProgramResourceIndex(programWithSSBO, GL_BUFFER_VARIABLE, "ssbo.ssbo_value");
>+        glGetProgramResourceiv(programWithSSBO, GL_BUFFER_VARIABLE, index, kPropCount, kProps,
>+                               kPropCount, &length, params.data());
>+        EXPECT_GL_NO_ERROR();
>+        EXPECT_EQ(1, params[0]);
>+    }
>+
>+    GLint maxGeometryAtomicCounterBuffers = 0;
>+    glGetIntegerv(GL_MAX_GEOMETRY_ATOMIC_COUNTER_BUFFERS_EXT, &maxGeometryAtomicCounterBuffers);
>+    // The maximum number of atomic counter buffers in a geometry shader can be 0.
>+    // [EXT_geometry_shader] Table 20.43gs
>+    if (maxGeometryAtomicCounterBuffers > 0)
>+    {
>+        constexpr char kGSWithAtomicCounters[] = R"(#version 310 es
>+#extension GL_EXT_geometry_shader : require
>+layout(binding = 1, offset = 0) uniform atomic_uint gs_counter;
>+layout (triangles) in;
>+layout (points, max_vertices = 1) out;
>+out vec4 gs_out;
>+void main()
>+{
>+    atomicCounterIncrement(gs_counter);
>+    gl_Position = gl_in[0].gl_Position;
>+    gs_out = vec4(1.0, 0.0, 0.0, 1.0);
>+    EmitVertex();
>+})";
>+
>+        ANGLE_GL_PROGRAM_WITH_GS(programWithAtomicCounter, kVS, kGSWithAtomicCounters, kFS);
>+
>+        params.fill(0);
>+        index = glGetProgramResourceIndex(programWithAtomicCounter, GL_UNIFORM, "gs_counter");
>+        EXPECT_GL_NO_ERROR();
>+        glGetProgramResourceiv(programWithAtomicCounter, GL_ATOMIC_COUNTER_BUFFER, index,
>+                               kPropCount, kProps, kPropCount, &length, params.data());
>+        EXPECT_GL_NO_ERROR();
>+        EXPECT_EQ(1, params[0]);
>+    }
>+}
>+
>+// Verify correct errors can be reported when we use illegal parameters on FramebufferTextureEXT.
>+TEST_P(GeometryShaderTest, NegativeFramebufferTextureEXT)
>+{
>+    ANGLE_SKIP_TEST_IF(!IsGLExtensionEnabled("GL_EXT_geometry_shader"));
>+
>+    GLFramebuffer fbo;
>+    glBindFramebuffer(GL_FRAMEBUFFER, fbo);
>+
>+    GLTexture tex;
>+    glBindTexture(GL_TEXTURE_3D, tex);
>+    glTexImage3D(GL_TEXTURE_3D, 0, GL_RGBA8, 32, 32, 32, 0, GL_RGBA, GL_UNSIGNED_BYTE, nullptr);
>+
>+    // [EXT_geometry_shader] Section 9.2.8, "Attaching Texture Images to a Framebuffer"
>+    // An INVALID_ENUM error is generated if <target> is not DRAW_FRAMEBUFFER, READ_FRAMEBUFFER, or
>+    // FRAMEBUFFER.
>+    glFramebufferTextureEXT(GL_TEXTURE_2D, GL_COLOR_ATTACHMENT0, tex, 0);
>+    EXPECT_GL_ERROR(GL_INVALID_ENUM);
>+
>+    // An INVALID_ENUM error is generated if <attachment> is not one of the attachments in Table
>+    // 9.1.
>+    glFramebufferTextureEXT(GL_FRAMEBUFFER, GL_TEXTURE_2D, tex, 0);
>+    EXPECT_GL_ERROR(GL_INVALID_ENUM);
>+
>+    // An INVALID_OPERATION error is generated if zero is bound to <target>.
>+    glBindFramebuffer(GL_FRAMEBUFFER, 0);
>+    glFramebufferTextureEXT(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, tex, 0);
>+    EXPECT_GL_ERROR(GL_INVALID_OPERATION);
>+
>+    glBindFramebuffer(GL_FRAMEBUFFER, fbo);
>+
>+    // An INVALID_VALUE error is generated if <texture> is not the name of a texture object, or if
>+    // <level> is not a supported texture level for <texture>.
>+    GLuint tex2;
>+    glGenTextures(1, &tex2);
>+    glDeleteTextures(1, &tex2);
>+    ASSERT_FALSE(glIsTexture(tex2));
>+    glFramebufferTextureEXT(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, tex2, 0);
>+    EXPECT_GL_ERROR(GL_INVALID_VALUE);
>+
>+    GLint max3DSize;
>+    glGetIntegerv(GL_MAX_3D_TEXTURE_SIZE, &max3DSize);
>+    GLint max3DLevel = static_cast<GLint>(std::log2(max3DSize));
>+    glFramebufferTextureEXT(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, tex, max3DLevel + 1);
>+    EXPECT_GL_ERROR(GL_INVALID_VALUE);
>+}
>+
>+// Verify CheckFramebufferStatus can work correctly on layered depth and stencil attachments.
>+TEST_P(GeometryShaderTest, LayeredFramebufferCompletenessWithDepthAttachment)
>+{
>+    ANGLE_SKIP_TEST_IF(!IsGLExtensionEnabled("GL_EXT_geometry_shader"));
>+
>+    GLint maxFramebufferLayers;
>+    glGetIntegerv(GL_MAX_FRAMEBUFFER_LAYERS_EXT, &maxFramebufferLayers);
>+
>+    constexpr GLint kTexLayers = 2;
>+    ASSERT_LT(kTexLayers, maxFramebufferLayers);
>+
>+    GLTexture layeredColorTex;
>+    glBindTexture(GL_TEXTURE_3D, layeredColorTex);
>+    glTexImage3D(GL_TEXTURE_3D, 0, GL_RGBA8, 32, 32, kTexLayers, 0, GL_RGBA, GL_UNSIGNED_BYTE,
>+                 nullptr);
>+
>+    // [EXT_geometry_shader] section 9.4.1, "Framebuffer Completeness"
>+    // If any framebuffer attachment is layered, all populated attachments must be layered.
>+    // {FRAMEBUFFER_INCOMPLETE_LAYER_TARGETS_EXT }
>+    GLTexture layeredDepthStencilTex;
>+    glBindTexture(GL_TEXTURE_2D_ARRAY, layeredDepthStencilTex);
>+    glTexImage3D(GL_TEXTURE_2D_ARRAY, 0, GL_DEPTH24_STENCIL8, 32, 32, kTexLayers, 0,
>+                 GL_DEPTH_STENCIL, GL_UNSIGNED_INT_24_8, nullptr);
>+
>+    // 1. Color attachment is layered, while depth attachment is not layered.
>+    GLFramebuffer fbo1;
>+    glBindFramebuffer(GL_FRAMEBUFFER, fbo1);
>+    glFramebufferTextureEXT(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, layeredColorTex, 0);
>+    glFramebufferTextureLayer(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, layeredDepthStencilTex, 0, 0);
>+    GLenum status1 = glCheckFramebufferStatus(GL_FRAMEBUFFER);
>+    ASSERT_GL_NO_ERROR();
>+    EXPECT_GLENUM_EQ(GL_FRAMEBUFFER_INCOMPLETE_LAYER_TARGETS_EXT, status1);
>+
>+    // 2. Color attachment is not layered, while depth attachment is layered.
>+    GLFramebuffer fbo2;
>+    glBindFramebuffer(GL_FRAMEBUFFER, fbo2);
>+    glFramebufferTextureLayer(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, layeredColorTex, 0, 0);
>+    glFramebufferTextureEXT(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, layeredDepthStencilTex, 0);
>+    GLenum status2 = glCheckFramebufferStatus(GL_FRAMEBUFFER);
>+    ASSERT_GL_NO_ERROR();
>+    EXPECT_GLENUM_EQ(GL_FRAMEBUFFER_INCOMPLETE_LAYER_TARGETS_EXT, status2);
>+
>+    // 3. Color attachment is not layered, while stencil attachment is layered.
>+    GLFramebuffer fbo3;
>+    glBindFramebuffer(GL_FRAMEBUFFER, fbo3);
>+    glFramebufferTextureLayer(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, layeredColorTex, 0, 0);
>+    glFramebufferTextureEXT(GL_FRAMEBUFFER, GL_STENCIL_ATTACHMENT, layeredDepthStencilTex, 0);
>+    GLenum status3 = glCheckFramebufferStatus(GL_FRAMEBUFFER);
>+    ASSERT_GL_NO_ERROR();
>+    EXPECT_GLENUM_EQ(GL_FRAMEBUFFER_INCOMPLETE_LAYER_TARGETS_EXT, status3);
>+
>+    // [EXT_geometry_shader] section 9.4.1, "Framebuffer Completeness"
>+    // If <image> is a three-dimensional texture or a two-dimensional array texture and the
>+    // attachment is layered, the depth or layer count, respectively, of the texture is less than or
>+    // equal to the value of MAX_FRAMEBUFFER_LAYERS_EXT.
>+    GLint maxArrayTextureLayers;
>+    glGetIntegerv(GL_MAX_ARRAY_TEXTURE_LAYERS, &maxArrayTextureLayers);
>+    GLint depthTexLayer4 = maxFramebufferLayers + 1;
>+    ANGLE_SKIP_TEST_IF(maxArrayTextureLayers < depthTexLayer4);
>+
>+    // Use a depth attachment whose layer count exceeds MAX_FRAMEBUFFER_LAYERS
>+    GLTexture depthTex4;
>+    glBindTexture(GL_TEXTURE_2D_ARRAY, depthTex4);
>+    glTexImage3D(GL_TEXTURE_2D_ARRAY, 0, GL_DEPTH24_STENCIL8, 32, 32, depthTexLayer4, 0,
>+                 GL_DEPTH_STENCIL, GL_UNSIGNED_INT_24_8, nullptr);
>+    GLFramebuffer fbo4;
>+    glBindFramebuffer(GL_FRAMEBUFFER, fbo4);
>+    glFramebufferTextureEXT(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, depthTex4, 0);
>+    GLenum status4 = glCheckFramebufferStatus(GL_FRAMEBUFFER);
>+    ASSERT_GL_NO_ERROR();
>+    EXPECT_GLENUM_EQ(GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT, status4);
>+}
>+
>+// Verify correct errors can be reported when we use layered cube map attachments on a framebuffer.
>+TEST_P(GeometryShaderTest, NegativeLayeredFramebufferCompletenessWithCubeMapTextures)
>+{
>+    ANGLE_SKIP_TEST_IF(!IsGLExtensionEnabled("GL_EXT_geometry_shader"));
>+
>+    GLTexture tex;
>+    glBindTexture(GL_TEXTURE_CUBE_MAP, tex);
>+
>+    GLFramebuffer fbo;
>+    glBindFramebuffer(GL_FRAMEBUFFER, fbo);
>+    glFramebufferTextureEXT(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, tex, 0);
>+    GLenum status = glCheckFramebufferStatus(GL_FRAMEBUFFER);
>+    ASSERT_GL_NO_ERROR();
>+    EXPECT_GLENUM_EQ(GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT, status);
>+
>+    glTexImage2D(GL_TEXTURE_CUBE_MAP_POSITIVE_Y, 0, GL_RGBA8, 64, 64, 0, GL_RGBA, GL_UNSIGNED_BYTE,
>+                 nullptr);
>+    glFramebufferTextureEXT(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, tex, 0);
>+    ASSERT_GL_NO_ERROR();
>+    EXPECT_GLENUM_EQ(GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT, status);
>+}
>+
> ANGLE_INSTANTIATE_TEST(GeometryShaderTestES3, ES3_OPENGL(), ES3_OPENGLES(), ES3_D3D11());
> ANGLE_INSTANTIATE_TEST(GeometryShaderTest, ES31_OPENGL(), ES31_OPENGLES(), ES31_D3D11());
>-}
>+}  // namespace
>diff --git a/Source/ThirdParty/ANGLE/src/tests/gl_tests/ImageTest.cpp b/Source/ThirdParty/ANGLE/src/tests/gl_tests/ImageTest.cpp
>index cb88c489d58..fb3cce6193e 100644
>--- a/Source/ThirdParty/ANGLE/src/tests/gl_tests/ImageTest.cpp
>+++ b/Source/ThirdParty/ANGLE/src/tests/gl_tests/ImageTest.cpp
>@@ -8,9 +8,24 @@
> //
> 
> #include "test_utils/ANGLETest.h"
>+#include "test_utils/gl_raii.h"
>+#include "util/EGLWindow.h"
> 
> namespace angle
> {
>+namespace
>+{
>+constexpr char kOESExt[]           = "GL_OES_EGL_image";
>+constexpr char kExternalExt[]      = "GL_OES_EGL_image_external";
>+constexpr char kExternalESSL3Ext[] = "GL_OES_EGL_image_external_essl3";
>+constexpr char kBaseExt[]          = "EGL_KHR_image_base";
>+constexpr char k2DTextureExt[]     = "EGL_KHR_gl_texture_2D_image";
>+constexpr char k3DTextureExt[]     = "EGL_KHR_gl_texture_3D_image";
>+constexpr char kPixmapExt[]        = "EGL_KHR_image_pixmap";
>+constexpr char kRenderbufferExt[]  = "EGL_KHR_gl_renderbuffer_image";
>+constexpr char kCubemapExt[]       = "EGL_KHR_gl_texture_cubemap_image";
>+}  // anonymous namespace
>+
> class ImageTest : public ANGLETest
> {
>   protected:
>@@ -29,7 +44,7 @@ class ImageTest : public ANGLETest
>     {
>         ANGLETest::SetUp();
> 
>-        const std::string vsSource =
>+        constexpr char kVS[] =
>             "precision highp float;\n"
>             "attribute vec4 position;\n"
>             "varying vec2 texcoord;\n"
>@@ -40,7 +55,7 @@ class ImageTest : public ANGLETest
>             "    texcoord = (position.xy * 0.5) + 0.5;\n"
>             "    texcoord.y = 1.0 - texcoord.y;\n"
>             "}\n";
>-        const std::string vsESSL3Source =
>+        constexpr char kVSESSL3[] =
>             "#version 300 es\n"
>             "precision highp float;\n"
>             "in vec4 position;\n"
>@@ -53,7 +68,7 @@ class ImageTest : public ANGLETest
>             "    texcoord.y = 1.0 - texcoord.y;\n"
>             "}\n";
> 
>-        const std::string textureFSSource =
>+        constexpr char kTextureFS[] =
>             "precision highp float;\n"
>             "uniform sampler2D tex;\n"
>             "varying vec2 texcoord;\n"
>@@ -62,7 +77,7 @@ class ImageTest : public ANGLETest
>             "{\n"
>             "    gl_FragColor = texture2D(tex, texcoord);\n"
>             "}\n";
>-        const std::string textureExternalFSSource =
>+        constexpr char kTextureExternalFS[] =
>             "#extension GL_OES_EGL_image_external : require\n"
>             "precision highp float;\n"
>             "uniform samplerExternalOES tex;\n"
>@@ -72,7 +87,7 @@ class ImageTest : public ANGLETest
>             "{\n"
>             "    gl_FragColor = texture2D(tex, texcoord);\n"
>             "}\n";
>-        const std::string textureExternalESSL3FSSource =
>+        constexpr char kTextureExternalESSL3FS[] =
>             "#version 300 es\n"
>             "#extension GL_OES_EGL_image_external_essl3 : require\n"
>             "precision highp float;\n"
>@@ -85,7 +100,7 @@ class ImageTest : public ANGLETest
>             "    color = texture(tex, texcoord);\n"
>             "}\n";
> 
>-        mTextureProgram = CompileProgram(vsSource, textureFSSource);
>+        mTextureProgram = CompileProgram(kVS, kTextureFS);
>         if (mTextureProgram == 0)
>         {
>             FAIL() << "shader compilation failed.";
>@@ -93,18 +108,17 @@ class ImageTest : public ANGLETest
> 
>         mTextureUniformLocation = glGetUniformLocation(mTextureProgram, "tex");
> 
>-        if (extensionEnabled("GL_OES_EGL_image_external"))
>+        if (IsGLExtensionEnabled("GL_OES_EGL_image_external"))
>         {
>-            mTextureExternalProgram = CompileProgram(vsSource, textureExternalFSSource);
>+            mTextureExternalProgram = CompileProgram(kVS, kTextureExternalFS);
>             ASSERT_NE(0u, mTextureExternalProgram) << "shader compilation failed.";
> 
>             mTextureExternalUniformLocation = glGetUniformLocation(mTextureExternalProgram, "tex");
>         }
> 
>-        if (extensionEnabled("GL_OES_EGL_image_external_essl3"))
>+        if (IsGLExtensionEnabled("GL_OES_EGL_image_external_essl3"))
>         {
>-            mTextureExternalESSL3Program =
>-                CompileProgram(vsESSL3Source, textureExternalESSL3FSSource);
>+            mTextureExternalESSL3Program = CompileProgram(kVSESSL3, kTextureExternalESSL3FS);
>             ASSERT_NE(0u, mTextureExternalESSL3Program) << "shader compilation failed.";
> 
>             mTextureExternalESSL3UniformLocation =
>@@ -152,9 +166,16 @@ class ImageTest : public ANGLETest
> 
>         // Create an image from the source texture
>         EGLWindow *window = getEGLWindow();
>+
>+        EGLint attribs[] = {
>+            EGL_IMAGE_PRESERVED,
>+            EGL_TRUE,
>+            EGL_NONE,
>+        };
>+
>         EGLImageKHR image =
>             eglCreateImageKHR(window->getDisplay(), window->getContext(), EGL_GL_TEXTURE_2D_KHR,
>-                              reinterpretHelper<EGLClientBuffer>(source), nullptr);
>+                              reinterpretHelper<EGLClientBuffer>(source), attribs);
> 
>         ASSERT_EGL_SUCCESS();
> 
>@@ -192,9 +213,16 @@ class ImageTest : public ANGLETest
> 
>         // Create an image from the source texture
>         EGLWindow *window = getEGLWindow();
>+
>+        EGLint attribs[] = {
>+            EGL_IMAGE_PRESERVED,
>+            EGL_TRUE,
>+            EGL_NONE,
>+        };
>+
>         EGLImageKHR image =
>             eglCreateImageKHR(window->getDisplay(), window->getContext(), imageTarget,
>-                              reinterpretHelper<EGLClientBuffer>(source), nullptr);
>+                              reinterpretHelper<EGLClientBuffer>(source), attribs);
> 
>         ASSERT_EGL_SUCCESS();
> 
>@@ -231,7 +259,11 @@ class ImageTest : public ANGLETest
>         EGLWindow *window = getEGLWindow();
> 
>         EGLint attribs[] = {
>-            EGL_GL_TEXTURE_ZOFFSET_KHR, static_cast<EGLint>(imageLayer), EGL_NONE,
>+            EGL_GL_TEXTURE_ZOFFSET_KHR,
>+            static_cast<EGLint>(imageLayer),
>+            EGL_IMAGE_PRESERVED,
>+            EGL_TRUE,
>+            EGL_NONE,
>         };
>         EGLImageKHR image =
>             eglCreateImageKHR(window->getDisplay(), window->getContext(), EGL_GL_TEXTURE_3D_KHR,
>@@ -272,9 +304,16 @@ class ImageTest : public ANGLETest
> 
>         // Create an image from the source renderbuffer
>         EGLWindow *window = getEGLWindow();
>+
>+        EGLint attribs[] = {
>+            EGL_IMAGE_PRESERVED,
>+            EGL_TRUE,
>+            EGL_NONE,
>+        };
>+
>         EGLImageKHR image =
>             eglCreateImageKHR(window->getDisplay(), window->getContext(), EGL_GL_RENDERBUFFER_KHR,
>-                              reinterpretHelper<EGLClientBuffer>(source), nullptr);
>+                              reinterpretHelper<EGLClientBuffer>(source), attribs);
> 
>         ASSERT_EGL_SUCCESS();
> 
>@@ -388,6 +427,42 @@ class ImageTest : public ANGLETest
>         return reinterpret_cast<destType>(sourceSizeT);
>     }
> 
>+    bool hasOESExt() const { return IsGLExtensionEnabled(kOESExt); }
>+
>+    bool hasExternalExt() const { return IsGLExtensionEnabled(kExternalExt); }
>+
>+    bool hasExternalESSL3Ext() const { return IsGLExtensionEnabled(kExternalESSL3Ext); }
>+
>+    bool hasBaseExt() const
>+    {
>+        return IsEGLDisplayExtensionEnabled(getEGLWindow()->getDisplay(), kBaseExt);
>+    }
>+
>+    bool has2DTextureExt() const
>+    {
>+        return IsEGLDisplayExtensionEnabled(getEGLWindow()->getDisplay(), k2DTextureExt);
>+    }
>+
>+    bool has3DTextureExt() const
>+    {
>+        return IsEGLDisplayExtensionEnabled(getEGLWindow()->getDisplay(), k3DTextureExt);
>+    }
>+
>+    bool hasPixmapExt() const
>+    {
>+        return IsEGLDisplayExtensionEnabled(getEGLWindow()->getDisplay(), kPixmapExt);
>+    }
>+
>+    bool hasRenderbufferExt() const
>+    {
>+        return IsEGLDisplayExtensionEnabled(getEGLWindow()->getDisplay(), kRenderbufferExt);
>+    }
>+
>+    bool hasCubemapExt() const
>+    {
>+        return IsEGLDisplayExtensionEnabled(getEGLWindow()->getDisplay(), kCubemapExt);
>+    }
>+
>     GLuint mTextureProgram;
>     GLint mTextureUniformLocation;
> 
>@@ -402,22 +477,75 @@ class ImageTest : public ANGLETest
> };
> 
> class ImageTestES3 : public ImageTest
>+{};
>+
>+// Tests that the extension is exposed on the platforms we think it should be. Please modify this as
>+// you change extension availability.
>+TEST_P(ImageTest, ANGLEExtensionAvailability)
> {
>-};
>+    // EGL support is based on driver extension availability.
>+    ANGLE_SKIP_TEST_IF(IsOpenGLES() && IsAndroid());
>+    ANGLE_SKIP_TEST_IF(IsOpenGLES() && IsOzone());
>+
>+    if (IsD3D11() || IsD3D9())
>+    {
>+        EXPECT_TRUE(hasOESExt());
>+        EXPECT_TRUE(hasExternalExt());
>+        EXPECT_TRUE(hasBaseExt());
>+        EXPECT_TRUE(has2DTextureExt());
>+        EXPECT_TRUE(hasRenderbufferExt());
>+
>+        if (IsD3D11())
>+        {
>+            EXPECT_TRUE(hasCubemapExt());
>+
>+            if (getClientMajorVersion() >= 3)
>+            {
>+                EXPECT_TRUE(hasExternalESSL3Ext());
>+            }
>+            else
>+            {
>+                EXPECT_FALSE(hasExternalESSL3Ext());
>+            }
>+        }
>+        else
>+        {
>+            EXPECT_FALSE(hasCubemapExt());
>+            EXPECT_FALSE(hasExternalESSL3Ext());
>+        }
>+    }
>+    else if (IsVulkan())
>+    {
>+        EXPECT_TRUE(hasOESExt());
>+        EXPECT_TRUE(hasExternalExt());
>+        EXPECT_TRUE(hasBaseExt());
>+        EXPECT_TRUE(has2DTextureExt());
>+        EXPECT_TRUE(hasCubemapExt());
>+        EXPECT_TRUE(hasRenderbufferExt());
>+        // TODO(geofflang): Support GL_OES_EGL_image_external_essl3. http://anglebug.com/2668
>+        EXPECT_FALSE(hasExternalESSL3Ext());
>+    }
>+    else
>+    {
>+        EXPECT_FALSE(hasOESExt());
>+        EXPECT_FALSE(hasExternalExt());
>+        EXPECT_FALSE(hasExternalESSL3Ext());
>+        EXPECT_FALSE(hasBaseExt());
>+        EXPECT_FALSE(has2DTextureExt());
>+        EXPECT_FALSE(has3DTextureExt());
>+        EXPECT_FALSE(hasRenderbufferExt());
>+    }
>+
>+    // These extensions are not yet available on any platform.
>+    EXPECT_FALSE(hasPixmapExt());
>+    EXPECT_FALSE(has3DTextureExt());
>+}
> 
> // Check validation from the EGL_KHR_image_base extension
> TEST_P(ImageTest, ValidationImageBase)
> {
>     EGLWindow *window = getEGLWindow();
>-    if (!extensionEnabled("OES_EGL_image") ||
>-        !eglDisplayExtensionEnabled(window->getDisplay(), "EGL_KHR_image_base") ||
>-        !eglDisplayExtensionEnabled(window->getDisplay(), "EGL_KHR_gl_texture_2D_image"))
>-    {
>-        std::cout << "Test skipped because OES_EGL_image, EGL_KHR_image_base or "
>-                     "EGL_KHR_gl_texture_2D_image is not available."
>-                  << std::endl;
>-        return;
>-    }
>+    ANGLE_SKIP_TEST_IF(!hasOESExt() || !hasBaseExt() || !has2DTextureExt());
> 
>     GLuint glTexture2D;
>     glGenTextures(1, &glTexture2D);
>@@ -454,7 +582,9 @@ TEST_P(ImageTest, ValidationImageBase)
>     // If an attribute specified in <attrib_list> is not one of the attributes listed in Table bbb,
>     // the error EGL_BAD_PARAMETER is generated.
>     EGLint badAttributes[] = {
>-        static_cast<EGLint>(0xDEADBEEF), 0, EGL_NONE,
>+        static_cast<EGLint>(0xDEADBEEF),
>+        0,
>+        EGL_NONE,
>     };
> 
>     image = eglCreateImageKHR(display, context, EGL_GL_TEXTURE_2D_KHR, texture2D, badAttributes);
>@@ -534,33 +664,18 @@ TEST_P(ImageTest, ValidationImageBase)
>     EXPECT_GL_NO_ERROR();
> }
> 
>-// Check validation from the EGL_KHR_gl_texture_2D_image extension
>-TEST_P(ImageTest, ValidationImagePixmap)
>-{
>-    // This extension is not implemented anywhere yet.  This makes sure that it is tested once it is
>-    // added.
>-    EGLWindow *window = getEGLWindow();
>-    EXPECT_FALSE(eglDisplayExtensionEnabled(window->getDisplay(), "EGL_KHR_image_pixmap"));
>-}
>-
> // Check validation from the EGL_KHR_gl_texture_2D_image, EGL_KHR_gl_texture_cubemap_image,
> // EGL_KHR_gl_texture_3D_image and EGL_KHR_gl_renderbuffer_image extensions
> TEST_P(ImageTest, ValidationGLImage)
> {
>     EGLWindow *window = getEGLWindow();
>-    if (!extensionEnabled("OES_EGL_image") ||
>-        !eglDisplayExtensionEnabled(window->getDisplay(), "EGL_KHR_image_base"))
>-    {
>-        std::cout << "Test skipped because OES_EGL_image or EGL_KHR_image_base is not available."
>-                  << std::endl;
>-        return;
>-    }
>+    ANGLE_SKIP_TEST_IF(!hasOESExt() || !hasBaseExt());
> 
>     EGLDisplay display = window->getDisplay();
>     EGLContext context = window->getContext();
>     EGLImageKHR image  = EGL_NO_IMAGE_KHR;
> 
>-    if (eglDisplayExtensionEnabled(window->getDisplay(), "EGL_KHR_gl_texture_2D_image"))
>+    if (has2DTextureExt())
>     {
>         // If <target> is EGL_GL_TEXTURE_2D_KHR, EGL_GL_TEXTURE_CUBE_MAP_*_KHR or
>         // EGL_GL_TEXTURE_3D_KHR and <buffer> is not the name of a texture object of type <target>,
>@@ -590,7 +705,9 @@ TEST_P(ImageTest, ValidationGLImage)
>         glTexImage2D(GL_TEXTURE_2D, 1, GL_RGBA, 2, 2, 0, GL_RGBA, GL_UNSIGNED_BYTE, nullptr);
> 
>         EGLint level0Attribute[] = {
>-            EGL_GL_TEXTURE_LEVEL_KHR, 0, EGL_NONE,
>+            EGL_GL_TEXTURE_LEVEL_KHR,
>+            0,
>+            EGL_NONE,
>         };
>         image = eglCreateImageKHR(display, context, EGL_GL_TEXTURE_2D_KHR,
>                                   reinterpretHelper<EGLClientBuffer>(incompleteTexture),
>@@ -620,7 +737,9 @@ TEST_P(ImageTest, ValidationGLImage)
>         // EGL_GL_TEXTURE_LEVEL_KHR is not a valid mipmap level for the specified GL texture object
>         // <buffer>, the error EGL_BAD_MATCH is generated.
>         EGLint level2Attribute[] = {
>-            EGL_GL_TEXTURE_LEVEL_KHR, 2, EGL_NONE,
>+            EGL_GL_TEXTURE_LEVEL_KHR,
>+            2,
>+            EGL_NONE,
>         };
>         image = eglCreateImageKHR(display, context, EGL_GL_TEXTURE_2D_KHR,
>                                   reinterpretHelper<EGLClientBuffer>(incompleteTexture),
>@@ -644,7 +763,7 @@ TEST_P(ImageTest, ValidationGLImage)
>         EXPECT_EGL_ERROR(EGL_BAD_PARAMETER);
>     }
> 
>-    if (eglDisplayExtensionEnabled(window->getDisplay(), "EGL_KHR_gl_texture_cubemap_image"))
>+    if (hasCubemapExt())
>     {
>         // If EGL_GL_TEXTURE_LEVEL_KHR is 0, <target> is EGL_GL_TEXTURE_CUBE_MAP_*_KHR, <buffer> is
>         // not the name of a complete GL texture object, and one or more faces do not have mipmap
>@@ -664,7 +783,9 @@ TEST_P(ImageTest, ValidationGLImage)
>                      nullptr);
> 
>         EGLint level0Attribute[] = {
>-            EGL_GL_TEXTURE_LEVEL_KHR, 0, EGL_NONE,
>+            EGL_GL_TEXTURE_LEVEL_KHR,
>+            0,
>+            EGL_NONE,
>         };
>         image = eglCreateImageKHR(display, context, EGL_GL_TEXTURE_CUBE_MAP_POSITIVE_X_KHR,
>                                   reinterpretHelper<EGLClientBuffer>(incompleteTextureCube),
>@@ -692,8 +813,7 @@ TEST_P(ImageTest, ValidationGLImage)
>         EXPECT_EGL_ERROR(EGL_BAD_PARAMETER);
>     }
> 
>-    if (eglDisplayExtensionEnabled(window->getDisplay(), "EGL_KHR_gl_texture_3D_image") &&
>-        getClientMajorVersion() >= 3)
>+    if (has3DTextureExt() && getClientMajorVersion() >= 3)
>     {
>         // If <target> is EGL_GL_TEXTURE_3D_KHR, and the value specified in <attr_list> for
>         // EGL_GL_TEXTURE_ZOFFSET_KHR exceeds the depth of the specified mipmap level - of - detail
>@@ -704,7 +824,9 @@ TEST_P(ImageTest, ValidationGLImage)
>         glTexImage3D(GL_TEXTURE_3D, 0, GL_RGBA, 2, 2, 2, 0, GL_RGBA, GL_UNSIGNED_BYTE, nullptr);
> 
>         EGLint zOffset3Parameter[] = {
>-            EGL_GL_TEXTURE_ZOFFSET_KHR, 3, EGL_NONE,
>+            EGL_GL_TEXTURE_ZOFFSET_KHR,
>+            3,
>+            EGL_NONE,
>         };
>         image = eglCreateImageKHR(display, context, EGL_GL_TEXTURE_3D_KHR,
>                                   reinterpretHelper<EGLClientBuffer>(texture3D), zOffset3Parameter);
>@@ -712,7 +834,9 @@ TEST_P(ImageTest, ValidationGLImage)
>         EXPECT_EGL_ERROR(EGL_BAD_PARAMETER);
> 
>         EGLint zOffsetNegative1Parameter[] = {
>-            EGL_GL_TEXTURE_ZOFFSET_KHR, -1, EGL_NONE,
>+            EGL_GL_TEXTURE_ZOFFSET_KHR,
>+            -1,
>+            EGL_NONE,
>         };
>         image = eglCreateImageKHR(display, context, EGL_GL_TEXTURE_3D_KHR,
>                                   reinterpretHelper<EGLClientBuffer>(texture3D),
>@@ -722,7 +846,7 @@ TEST_P(ImageTest, ValidationGLImage)
>     }
>     else
>     {
>-        if (eglDisplayExtensionEnabled(window->getDisplay(), "EGL_KHR_gl_texture_2D_image"))
>+        if (has2DTextureExt())
>         {
>             GLuint texture2D;
>             glGenTextures(1, &texture2D);
>@@ -731,7 +855,9 @@ TEST_P(ImageTest, ValidationGLImage)
> 
>             // Verify EGL_GL_TEXTURE_ZOFFSET_KHR is not a valid parameter
>             EGLint zOffset0Parameter[] = {
>-                EGL_GL_TEXTURE_ZOFFSET_KHR, 0, EGL_NONE,
>+                EGL_GL_TEXTURE_ZOFFSET_KHR,
>+                0,
>+                EGL_NONE,
>             };
> 
>             image =
>@@ -758,7 +884,7 @@ TEST_P(ImageTest, ValidationGLImage)
>         }
>     }
> 
>-    if (eglDisplayExtensionEnabled(window->getDisplay(), "EGL_KHR_gl_renderbuffer_image"))
>+    if (hasRenderbufferExt())
>     {
>         // If <target> is EGL_GL_RENDERBUFFER_KHR and <buffer> is not the name of a renderbuffer
>         // object, or if <buffer> is the name of a multisampled renderbuffer object, the error
>@@ -768,7 +894,7 @@ TEST_P(ImageTest, ValidationGLImage)
>         EXPECT_EQ(image, EGL_NO_IMAGE_KHR);
>         EXPECT_EGL_ERROR(EGL_BAD_PARAMETER);
> 
>-        if (extensionEnabled("GL_ANGLE_framebuffer_multisample"))
>+        if (IsGLExtensionEnabled("GL_ANGLE_framebuffer_multisample"))
>         {
>             GLuint renderbuffer;
>             glGenRenderbuffers(1, &renderbuffer);
>@@ -802,16 +928,7 @@ TEST_P(ImageTest, ValidationGLImage)
> // Check validation from the GL_OES_EGL_image extension
> TEST_P(ImageTest, ValidationGLEGLImage)
> {
>-    EGLWindow *window = getEGLWindow();
>-    if (!extensionEnabled("OES_EGL_image") ||
>-        !eglDisplayExtensionEnabled(window->getDisplay(), "EGL_KHR_image_base") ||
>-        !eglDisplayExtensionEnabled(window->getDisplay(), "EGL_KHR_gl_texture_2D_image"))
>-    {
>-        std::cout << "Test skipped because OES_EGL_image, EGL_KHR_image_base or "
>-                     "EGL_KHR_gl_texture_2D_image is not available."
>-                  << std::endl;
>-        return;
>-    }
>+    ANGLE_SKIP_TEST_IF(!hasOESExt() || !hasBaseExt() || !has2DTextureExt());
> 
>     GLubyte data[4] = {255, 0, 255, 255};
> 
>@@ -850,7 +967,7 @@ TEST_P(ImageTest, ValidationGLEGLImage)
> 
>     // Clean up
>     glDeleteTextures(1, &source);
>-    eglDestroyImageKHR(window->getDisplay(), image);
>+    eglDestroyImageKHR(getEGLWindow()->getDisplay(), image);
>     glDeleteTextures(1, &texture);
>     glDeleteRenderbuffers(1, &renderbuffer);
> }
>@@ -858,12 +975,7 @@ TEST_P(ImageTest, ValidationGLEGLImage)
> // Check validation from the GL_OES_EGL_image_external extension
> TEST_P(ImageTest, ValidationGLEGLImageExternal)
> {
>-    if (!extensionEnabled("GL_OES_EGL_image_external"))
>-    {
>-        std::cout << "Test skipped because GL_OES_EGL_image_external is not available."
>-                  << std::endl;
>-        return;
>-    }
>+    ANGLE_SKIP_TEST_IF(!hasExternalExt());
> 
>     GLuint texture;
>     glGenTextures(1, &texture);
>@@ -872,8 +984,7 @@ TEST_P(ImageTest, ValidationGLEGLImageExternal)
>     // In the initial state of a TEXTURE_EXTERNAL_OES texture object, the value assigned to
>     // TEXTURE_MIN_FILTER and TEXTURE_MAG_FILTER is LINEAR, and the s and t wrap modes are both set
>     // to CLAMP_TO_EDGE
>-    auto getTexParam = [](GLenum target, GLenum pname)
>-    {
>+    auto getTexParam = [](GLenum target, GLenum pname) {
>         GLint value = 0;
>         glGetTexParameteriv(target, pname, &value);
>         EXPECT_GL_NO_ERROR();
>@@ -890,7 +1001,8 @@ TEST_P(ImageTest, ValidationGLEGLImageExternal)
>     // TEXTURE_MIN_FILTER, TEXTURE_WRAP_S, TEXTURE_WRAP_T, or GENERATE_MIPMAP will result in an
>     // INVALID_ENUM error.
>     GLenum validMinFilters[]{
>-        GL_NEAREST, GL_LINEAR,
>+        GL_NEAREST,
>+        GL_LINEAR,
>     };
>     for (auto minFilter : validMinFilters)
>     {
>@@ -899,7 +1011,9 @@ TEST_P(ImageTest, ValidationGLEGLImageExternal)
>     }
> 
>     GLenum invalidMinFilters[]{
>-        GL_NEAREST_MIPMAP_LINEAR, GL_NEAREST_MIPMAP_NEAREST, GL_LINEAR_MIPMAP_LINEAR,
>+        GL_NEAREST_MIPMAP_LINEAR,
>+        GL_NEAREST_MIPMAP_NEAREST,
>+        GL_LINEAR_MIPMAP_LINEAR,
>         GL_LINEAR_MIPMAP_NEAREST,
>     };
>     for (auto minFilter : invalidMinFilters)
>@@ -920,7 +1034,8 @@ TEST_P(ImageTest, ValidationGLEGLImageExternal)
>     }
> 
>     GLenum invalidWrapModes[]{
>-        GL_REPEAT, GL_MIRRORED_REPEAT,
>+        GL_REPEAT,
>+        GL_MIRRORED_REPEAT,
>     };
>     for (auto minFilter : invalidWrapModes)
>     {
>@@ -941,12 +1056,7 @@ TEST_P(ImageTest, ValidationGLEGLImageExternal)
> // Check validation from the GL_OES_EGL_image_external_essl3 extension
> TEST_P(ImageTest, ValidationGLEGLImageExternalESSL3)
> {
>-    if (!extensionEnabled("GL_OES_EGL_image_external_essl3"))
>-    {
>-        std::cout << "Test skipped because GL_OES_EGL_image_external is not available."
>-                  << std::endl;
>-        return;
>-    }
>+    ANGLE_SKIP_TEST_IF(!hasExternalESSL3Ext());
> 
>     // Make sure this extension is not exposed without ES3.
>     ASSERT_GE(getClientMajorVersion(), 3);
>@@ -971,15 +1081,7 @@ TEST_P(ImageTest, ValidationGLEGLImageExternalESSL3)
> TEST_P(ImageTest, Source2DTarget2D)
> {
>     EGLWindow *window = getEGLWindow();
>-    if (!extensionEnabled("OES_EGL_image") ||
>-        !eglDisplayExtensionEnabled(window->getDisplay(), "EGL_KHR_image_base") ||
>-        !eglDisplayExtensionEnabled(window->getDisplay(), "EGL_KHR_gl_texture_2D_image"))
>-    {
>-        std::cout << "Test skipped because OES_EGL_image, EGL_KHR_image_base or "
>-                     "EGL_KHR_gl_texture_2D_image is not available."
>-                  << std::endl;
>-        return;
>-    }
>+    ANGLE_SKIP_TEST_IF(!hasOESExt() || !hasBaseExt() || !has2DTextureExt());
> 
>     GLubyte data[4] = {255, 0, 255, 255};
> 
>@@ -1004,15 +1106,7 @@ TEST_P(ImageTest, Source2DTarget2D)
> TEST_P(ImageTest, Source2DTargetRenderbuffer)
> {
>     EGLWindow *window = getEGLWindow();
>-    if (!extensionEnabled("OES_EGL_image") ||
>-        !eglDisplayExtensionEnabled(window->getDisplay(), "EGL_KHR_image_base") ||
>-        !eglDisplayExtensionEnabled(window->getDisplay(), "EGL_KHR_gl_texture_2D_image"))
>-    {
>-        std::cout << "Test skipped because OES_EGL_image, EGL_KHR_image_base or "
>-                     "EGL_KHR_gl_texture_2D_image is not available."
>-                  << std::endl;
>-        return;
>-    }
>+    ANGLE_SKIP_TEST_IF(!hasOESExt() || !hasBaseExt() || !has2DTextureExt());
> 
>     GLubyte data[4] = {255, 0, 255, 255};
> 
>@@ -1037,16 +1131,10 @@ TEST_P(ImageTest, Source2DTargetRenderbuffer)
> TEST_P(ImageTest, Source2DTargetExternal)
> {
>     EGLWindow *window = getEGLWindow();
>-    if (!extensionEnabled("OES_EGL_image") || !extensionEnabled("OES_EGL_image_external") ||
>-        !eglDisplayExtensionEnabled(window->getDisplay(), "EGL_KHR_image_base") ||
>-        !eglDisplayExtensionEnabled(window->getDisplay(), "EGL_KHR_gl_texture_2D_image"))
>-    {
>-        std::cout
>-            << "Test skipped because OES_EGL_image, OES_EGL_image_external, EGL_KHR_image_base or "
>-               "EGL_KHR_gl_texture_2D_image is not available."
>-            << std::endl;
>-        return;
>-    }
>+    ANGLE_SKIP_TEST_IF(!hasOESExt() || !hasBaseExt() || !has2DTextureExt() || !hasExternalExt());
>+
>+    // Ozone only supports external target for images created with EGL_EXT_image_dma_buf_import
>+    ANGLE_SKIP_TEST_IF(IsOzone());
> 
>     GLubyte data[4] = {255, 0, 255, 255};
> 
>@@ -1071,16 +1159,8 @@ TEST_P(ImageTest, Source2DTargetExternal)
> TEST_P(ImageTestES3, Source2DTargetExternalESSL3)
> {
>     EGLWindow *window = getEGLWindow();
>-    if (!extensionEnabled("OES_EGL_image") || !extensionEnabled("OES_EGL_image_external_essl3") ||
>-        !eglDisplayExtensionEnabled(window->getDisplay(), "EGL_KHR_image_base") ||
>-        !eglDisplayExtensionEnabled(window->getDisplay(), "EGL_KHR_gl_texture_2D_image"))
>-    {
>-        std::cout << "Test skipped because OES_EGL_image, OES_EGL_image_external_essl3, "
>-                     "EGL_KHR_image_base or "
>-                     "EGL_KHR_gl_texture_2D_image is not available."
>-                  << std::endl;
>-        return;
>-    }
>+    ANGLE_SKIP_TEST_IF(!hasOESExt() || !hasBaseExt() || !has2DTextureExt() ||
>+                       !hasExternalESSL3Ext());
> 
>     GLubyte data[4] = {255, 0, 255, 255};
> 
>@@ -1105,15 +1185,7 @@ TEST_P(ImageTestES3, Source2DTargetExternalESSL3)
> TEST_P(ImageTest, SourceCubeTarget2D)
> {
>     EGLWindow *window = getEGLWindow();
>-    if (!extensionEnabled("OES_EGL_image") ||
>-        !eglDisplayExtensionEnabled(window->getDisplay(), "EGL_KHR_image_base") ||
>-        !eglDisplayExtensionEnabled(window->getDisplay(), "EGL_KHR_gl_texture_cubemap_image"))
>-    {
>-        std::cout << "Test skipped because OES_EGL_image, EGL_KHR_image_base or "
>-                     "EGL_KHR_gl_texture_cubemap_image is not available."
>-                  << std::endl;
>-        return;
>-    }
>+    ANGLE_SKIP_TEST_IF(!hasOESExt() || !hasBaseExt() || !hasCubemapExt());
> 
>     GLubyte data[24] = {
>         255, 0, 255, 255, 255, 255, 255, 255, 255, 0, 0, 255,
>@@ -1146,15 +1218,10 @@ TEST_P(ImageTest, SourceCubeTarget2D)
> TEST_P(ImageTest, SourceCubeTargetRenderbuffer)
> {
>     EGLWindow *window = getEGLWindow();
>-    if (!extensionEnabled("OES_EGL_image") ||
>-        !eglDisplayExtensionEnabled(window->getDisplay(), "EGL_KHR_image_base") ||
>-        !eglDisplayExtensionEnabled(window->getDisplay(), "EGL_KHR_gl_texture_cubemap_image"))
>-    {
>-        std::cout << "Test skipped because OES_EGL_image, EGL_KHR_image_base or "
>-                     "EGL_KHR_gl_texture_cubemap_image is not available."
>-                  << std::endl;
>-        return;
>-    }
>+    ANGLE_SKIP_TEST_IF(!hasOESExt() || !hasBaseExt() || !hasCubemapExt());
>+
>+    // http://anglebug.com/3145
>+    ANGLE_SKIP_TEST_IF(IsVulkan() && IsIntel() && IsFuchsia());
> 
>     GLubyte data[24] = {
>         255, 0, 255, 255, 255, 255, 255, 255, 255, 0, 0, 255,
>@@ -1188,16 +1255,10 @@ TEST_P(ImageTest, SourceCubeTargetRenderbuffer)
> TEST_P(ImageTest, SourceCubeTargetExternal)
> {
>     EGLWindow *window = getEGLWindow();
>-    if (!extensionEnabled("OES_EGL_image") || !extensionEnabled("OES_EGL_image_external") ||
>-        !eglDisplayExtensionEnabled(window->getDisplay(), "EGL_KHR_image_base") ||
>-        !eglDisplayExtensionEnabled(window->getDisplay(), "EGL_KHR_gl_texture_cubemap_image"))
>-    {
>-        std::cout
>-            << "Test skipped because OES_EGL_image, OES_EGL_image_external, EGL_KHR_image_base or "
>-               "EGL_KHR_gl_texture_cubemap_image is not available."
>-            << std::endl;
>-        return;
>-    }
>+    ANGLE_SKIP_TEST_IF(!hasOESExt() || !hasBaseExt() || !hasCubemapExt() || !hasExternalExt());
>+
>+    // Ozone only supports external target for images created with EGL_EXT_image_dma_buf_import
>+    ANGLE_SKIP_TEST_IF(IsOzone());
> 
>     GLubyte data[24] = {
>         255, 0, 255, 255, 255, 255, 255, 255, 255, 0, 0, 255,
>@@ -1231,16 +1292,7 @@ TEST_P(ImageTest, SourceCubeTargetExternal)
> TEST_P(ImageTestES3, SourceCubeTargetExternalESSL3)
> {
>     EGLWindow *window = getEGLWindow();
>-    if (!extensionEnabled("OES_EGL_image") || !extensionEnabled("OES_EGL_image_external_essl3") ||
>-        !eglDisplayExtensionEnabled(window->getDisplay(), "EGL_KHR_image_base") ||
>-        !eglDisplayExtensionEnabled(window->getDisplay(), "EGL_KHR_gl_texture_cubemap_image"))
>-    {
>-        std::cout << "Test skipped because OES_EGL_image, OES_EGL_image_external_essl3, "
>-                     "EGL_KHR_image_base or "
>-                     "EGL_KHR_gl_texture_cubemap_image is not available."
>-                  << std::endl;
>-        return;
>-    }
>+    ANGLE_SKIP_TEST_IF(!hasOESExt() || !hasExternalESSL3Ext() || !hasBaseExt() || !hasCubemapExt());
> 
>     GLubyte data[24] = {
>         255, 0, 255, 255, 255, 255, 255, 255, 255, 0, 0, 255,
>@@ -1273,21 +1325,9 @@ TEST_P(ImageTestES3, SourceCubeTargetExternalESSL3)
> TEST_P(ImageTest, Source3DTargetTexture)
> {
>     EGLWindow *window = getEGLWindow();
>-    if (!extensionEnabled("OES_EGL_image") ||
>-        !eglDisplayExtensionEnabled(window->getDisplay(), "EGL_KHR_image_base") ||
>-        !eglDisplayExtensionEnabled(window->getDisplay(), "EGL_KHR_gl_texture_3D_image"))
>-    {
>-        std::cout << "Test skipped because OES_EGL_image, EGL_KHR_image_base or "
>-                     "EGL_KHR_gl_texture_3D_image is not available."
>-                  << std::endl;
>-        return;
>-    }
>+    ANGLE_SKIP_TEST_IF(!hasOESExt() || !hasBaseExt() || !has3DTextureExt());
> 
>-    if (getClientMajorVersion() < 3 && !extensionEnabled("GL_OES_texture_3D"))
>-    {
>-        std::cout << "Test skipped because 3D textures are not available." << std::endl;
>-        return;
>-    }
>+    ANGLE_SKIP_TEST_IF(getClientMajorVersion() < 3 && !IsGLExtensionEnabled("GL_OES_texture_3D"));
> 
>     const size_t depth      = 2;
>     GLubyte data[4 * depth] = {
>@@ -1318,22 +1358,14 @@ TEST_P(ImageTest, Source3DTargetTexture)
> 
> TEST_P(ImageTest, Source3DTargetRenderbuffer)
> {
>+    // Qualcom drivers appear to always bind the 0 layer of the source 3D texture when the target is
>+    // a renderbuffer. They work correctly when the target is a 2D texture. http://anglebug.com/2745
>+    ANGLE_SKIP_TEST_IF(IsAndroid() && IsOpenGLES());
>+
>     EGLWindow *window = getEGLWindow();
>-    if (!extensionEnabled("OES_EGL_image") ||
>-        !eglDisplayExtensionEnabled(window->getDisplay(), "EGL_KHR_image_base") ||
>-        !eglDisplayExtensionEnabled(window->getDisplay(), "EGL_KHR_gl_texture_3D_image"))
>-    {
>-        std::cout << "Test skipped because OES_EGL_image, EGL_KHR_image_base or "
>-                     "EGL_KHR_gl_texture_3D_image is not available."
>-                  << std::endl;
>-        return;
>-    }
>+    ANGLE_SKIP_TEST_IF(!hasOESExt() || !hasBaseExt() || !has3DTextureExt());
> 
>-    if (getClientMajorVersion() < 3 && !extensionEnabled("GL_OES_texture_3D"))
>-    {
>-        std::cout << "Test skipped because 3D textures are not available." << std::endl;
>-        return;
>-    }
>+    ANGLE_SKIP_TEST_IF(getClientMajorVersion() < 3 && !IsGLExtensionEnabled("GL_OES_texture_3D"));
> 
>     const size_t depth      = 2;
>     GLubyte data[4 * depth] = {
>@@ -1366,22 +1398,9 @@ TEST_P(ImageTest, Source3DTargetRenderbuffer)
> TEST_P(ImageTest, Source3DTargetExternal)
> {
>     EGLWindow *window = getEGLWindow();
>-    if (!extensionEnabled("OES_EGL_image") || !extensionEnabled("OES_EGL_image_external") ||
>-        !eglDisplayExtensionEnabled(window->getDisplay(), "EGL_KHR_image_base") ||
>-        !eglDisplayExtensionEnabled(window->getDisplay(), "EGL_KHR_gl_texture_3D_image"))
>-    {
>-        std::cout
>-            << "Test skipped because OES_EGL_image, OES_EGL_image_external, EGL_KHR_image_base or "
>-               "EGL_KHR_gl_texture_3D_image is not available."
>-            << std::endl;
>-        return;
>-    }
>+    ANGLE_SKIP_TEST_IF(!hasOESExt() || !hasExternalExt() || !hasBaseExt() || !has3DTextureExt());
> 
>-    if (getClientMajorVersion() < 3 && !extensionEnabled("GL_OES_texture_3D"))
>-    {
>-        std::cout << "Test skipped because 3D textures are not available." << std::endl;
>-        return;
>-    }
>+    ANGLE_SKIP_TEST_IF(getClientMajorVersion() < 3 && !IsGLExtensionEnabled("GL_OES_texture_3D"));
> 
>     const size_t depth      = 2;
>     GLubyte data[4 * depth] = {
>@@ -1414,22 +1433,10 @@ TEST_P(ImageTest, Source3DTargetExternal)
> TEST_P(ImageTestES3, Source3DTargetExternalESSL3)
> {
>     EGLWindow *window = getEGLWindow();
>-    if (!extensionEnabled("OES_EGL_image") || !extensionEnabled("OES_EGL_image_external_essl3") ||
>-        !eglDisplayExtensionEnabled(window->getDisplay(), "EGL_KHR_image_base") ||
>-        !eglDisplayExtensionEnabled(window->getDisplay(), "EGL_KHR_gl_texture_3D_image"))
>-    {
>-        std::cout << "Test skipped because OES_EGL_image, OES_EGL_image_external_essl3, "
>-                     "EGL_KHR_image_base or "
>-                     "EGL_KHR_gl_texture_3D_image is not available."
>-                  << std::endl;
>-        return;
>-    }
>+    ANGLE_SKIP_TEST_IF(!hasOESExt() || !hasExternalESSL3Ext() || !hasBaseExt() ||
>+                       !has3DTextureExt());
> 
>-    if (getClientMajorVersion() < 3 && !extensionEnabled("GL_OES_texture_3D"))
>-    {
>-        std::cout << "Test skipped because 3D textures are not available." << std::endl;
>-        return;
>-    }
>+    ANGLE_SKIP_TEST_IF(getClientMajorVersion() < 3 && !IsGLExtensionEnabled("GL_OES_texture_3D"));
> 
>     const size_t depth      = 2;
>     GLubyte data[4 * depth] = {
>@@ -1461,15 +1468,7 @@ TEST_P(ImageTestES3, Source3DTargetExternalESSL3)
> TEST_P(ImageTest, SourceRenderbufferTargetTexture)
> {
>     EGLWindow *window = getEGLWindow();
>-    if (!extensionEnabled("OES_EGL_image") ||
>-        !eglDisplayExtensionEnabled(window->getDisplay(), "EGL_KHR_image_base") ||
>-        !eglDisplayExtensionEnabled(window->getDisplay(), "EGL_KHR_gl_renderbuffer_image"))
>-    {
>-        std::cout << "Test skipped because OES_EGL_image, EGL_KHR_image_base or "
>-                     "EGL_KHR_gl_renderbuffer_image is not available."
>-                  << std::endl;
>-        return;
>-    }
>+    ANGLE_SKIP_TEST_IF(!hasOESExt() || !hasBaseExt() || !hasRenderbufferExt());
> 
>     GLubyte data[4] = {255, 0, 255, 255};
> 
>@@ -1495,16 +1494,10 @@ TEST_P(ImageTest, SourceRenderbufferTargetTexture)
> TEST_P(ImageTest, SourceRenderbufferTargetTextureExternal)
> {
>     EGLWindow *window = getEGLWindow();
>-    if (!extensionEnabled("OES_EGL_image") || !extensionEnabled("OES_EGL_image_external") ||
>-        !eglDisplayExtensionEnabled(window->getDisplay(), "EGL_KHR_image_base") ||
>-        !eglDisplayExtensionEnabled(window->getDisplay(), "EGL_KHR_gl_renderbuffer_image"))
>-    {
>-        std::cout
>-            << "Test skipped because OES_EGL_image, OES_EGL_image_external, EGL_KHR_image_base or "
>-               "EGL_KHR_gl_renderbuffer_image is not available."
>-            << std::endl;
>-        return;
>-    }
>+    ANGLE_SKIP_TEST_IF(!hasOESExt() || !hasExternalExt() || !hasBaseExt() || !hasRenderbufferExt());
>+
>+    // Ozone only supports external target for images created with EGL_EXT_image_dma_buf_import
>+    ANGLE_SKIP_TEST_IF(IsOzone());
> 
>     GLubyte data[4] = {255, 0, 255, 255};
> 
>@@ -1530,16 +1523,8 @@ TEST_P(ImageTest, SourceRenderbufferTargetTextureExternal)
> TEST_P(ImageTestES3, SourceRenderbufferTargetTextureExternalESSL3)
> {
>     EGLWindow *window = getEGLWindow();
>-    if (!extensionEnabled("OES_EGL_image") || !extensionEnabled("OES_EGL_image_external_essl3") ||
>-        !eglDisplayExtensionEnabled(window->getDisplay(), "EGL_KHR_image_base") ||
>-        !eglDisplayExtensionEnabled(window->getDisplay(), "EGL_KHR_gl_renderbuffer_image"))
>-    {
>-        std::cout
>-            << "Test skipped because OES_EGL_image, OES_EGL_image_external, EGL_KHR_image_base or "
>-               "EGL_KHR_gl_renderbuffer_image is not available."
>-            << std::endl;
>-        return;
>-    }
>+    ANGLE_SKIP_TEST_IF(!hasOESExt() || !hasExternalESSL3Ext() || !hasBaseExt() ||
>+                       !hasRenderbufferExt());
> 
>     GLubyte data[4] = {255, 0, 255, 255};
> 
>@@ -1564,15 +1549,7 @@ TEST_P(ImageTestES3, SourceRenderbufferTargetTextureExternalESSL3)
> TEST_P(ImageTest, SourceRenderbufferTargetRenderbuffer)
> {
>     EGLWindow *window = getEGLWindow();
>-    if (!extensionEnabled("OES_EGL_image") ||
>-        !eglDisplayExtensionEnabled(window->getDisplay(), "EGL_KHR_image_base") ||
>-        !eglDisplayExtensionEnabled(window->getDisplay(), "EGL_KHR_gl_renderbuffer_image"))
>-    {
>-        std::cout << "Test skipped because OES_EGL_image, EGL_KHR_image_base or "
>-                     "EGL_KHR_gl_renderbuffer_image is not available."
>-                  << std::endl;
>-        return;
>-    }
>+    ANGLE_SKIP_TEST_IF(!hasOESExt() || !hasBaseExt() || !hasRenderbufferExt());
> 
>     GLubyte data[4] = {255, 0, 255, 255};
> 
>@@ -1600,15 +1577,7 @@ TEST_P(ImageTest, SourceRenderbufferTargetRenderbuffer)
> TEST_P(ImageTest, Deletion)
> {
>     EGLWindow *window = getEGLWindow();
>-    if (!extensionEnabled("OES_EGL_image") ||
>-        !eglDisplayExtensionEnabled(window->getDisplay(), "EGL_KHR_image_base") ||
>-        !eglDisplayExtensionEnabled(window->getDisplay(), "EGL_KHR_gl_texture_2D_image"))
>-    {
>-        std::cout << "Test skipped because OES_EGL_image, EGL_KHR_image_base or "
>-                     "EGL_KHR_gl_texture_2D_image is not available."
>-                  << std::endl;
>-        return;
>-    }
>+    ANGLE_SKIP_TEST_IF(!hasOESExt() || !hasBaseExt() || !has2DTextureExt());
> 
>     GLubyte originalData[4] = {255, 0, 255, 255};
>     GLubyte updateData[4]   = {0, 255, 0, 255};
>@@ -1660,24 +1629,26 @@ TEST_P(ImageTest, Deletion)
> 
> TEST_P(ImageTest, MipLevels)
> {
>+    // Driver returns OOM in read pixels, some internal error.
>+    ANGLE_SKIP_TEST_IF(IsOzone() && IsOpenGLES());
>+    // Also fails on NVIDIA Shield TV bot.
>+    ANGLE_SKIP_TEST_IF(IsNVIDIAShield() && IsOpenGLES());
>+    // On Vulkan, the clear operation in the loop is optimized with a render pass loadOp=Clear.  On
>+    // Linux/Intel, that operation is mistakenly clearing the rest of the mips to 0.
>+    // http://anglebug.com/3284
>+    ANGLE_SKIP_TEST_IF(IsVulkan() && IsLinux() && IsIntel());
>+
>     EGLWindow *window = getEGLWindow();
>-    if (!extensionEnabled("OES_EGL_image") ||
>-        !eglDisplayExtensionEnabled(window->getDisplay(), "EGL_KHR_image_base") ||
>-        !eglDisplayExtensionEnabled(window->getDisplay(), "EGL_KHR_gl_texture_2D_image"))
>-    {
>-        std::cout << "Test skipped because OES_EGL_image, EGL_KHR_image_base or "
>-                     "EGL_KHR_gl_texture_2D_image is not available."
>-                  << std::endl;
>-        return;
>-    }
>+    ANGLE_SKIP_TEST_IF(!hasOESExt() || !hasBaseExt() || !has2DTextureExt());
> 
>     const size_t mipLevels   = 3;
>     const size_t textureSize = 4;
>-    std::vector<GLuint> mip0Data(textureSize * textureSize, 0xFFFF0000);
>-    std::vector<GLuint> mip1Data(mip0Data.size() << 1, 0xFF00FF00);
>-    std::vector<GLuint> mip2Data(mip0Data.size() << 2, 0xFF0000FF);
>+    std::vector<GLColor> mip0Data(textureSize * textureSize, GLColor::red);
>+    std::vector<GLColor> mip1Data(mip0Data.size() << 1, GLColor::green);
>+    std::vector<GLColor> mip2Data(mip0Data.size() << 2, GLColor::blue);
>     GLubyte *data[mipLevels] = {
>-        reinterpret_cast<GLubyte *>(&mip0Data[0]), reinterpret_cast<GLubyte *>(&mip1Data[0]),
>+        reinterpret_cast<GLubyte *>(&mip0Data[0]),
>+        reinterpret_cast<GLubyte *>(&mip1Data[0]),
>         reinterpret_cast<GLubyte *>(&mip2Data[0]),
>     };
> 
>@@ -1697,7 +1668,9 @@ TEST_P(ImageTest, MipLevels)
>     {
>         // Create the Image
>         EGLint attribs[] = {
>-            EGL_GL_TEXTURE_LEVEL_KHR, static_cast<EGLint>(level), EGL_NONE,
>+            EGL_GL_TEXTURE_LEVEL_KHR,
>+            static_cast<EGLint>(level),
>+            EGL_NONE,
>         };
>         EGLImageKHR image =
>             eglCreateImageKHR(window->getDisplay(), window->getContext(), EGL_GL_TEXTURE_2D_KHR,
>@@ -1720,6 +1693,36 @@ TEST_P(ImageTest, MipLevels)
>         verifyResults2D(textureTarget, data[level]);
>         verifyResultsRenderbuffer(renderbufferTarget, data[level]);
> 
>+        // Update the data by uploading data to the texture
>+        std::vector<GLuint> textureUpdateData(textureSize * textureSize, level);
>+        glBindTexture(GL_TEXTURE_2D, textureTarget);
>+        glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, textureSize >> level, textureSize >> level, GL_RGBA,
>+                        GL_UNSIGNED_BYTE, textureUpdateData.data());
>+        ASSERT_GL_NO_ERROR();
>+
>+        // Expect that both the texture and renderbuffer see the updated texture data
>+        verifyResults2D(textureTarget, reinterpret_cast<GLubyte *>(textureUpdateData.data()));
>+        verifyResultsRenderbuffer(renderbufferTarget,
>+                                  reinterpret_cast<GLubyte *>(textureUpdateData.data()));
>+
>+        // Update the renderbuffer by clearing it
>+        GLFramebuffer fbo;
>+        glBindFramebuffer(GL_FRAMEBUFFER, fbo);
>+        glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_RENDERBUFFER,
>+                                  renderbufferTarget);
>+
>+        GLubyte clearValue = static_cast<GLubyte>(level);
>+        GLubyte renderbufferClearData[4]{clearValue, clearValue, clearValue, clearValue};
>+        glClearColor(renderbufferClearData[0] / 255.0f, renderbufferClearData[1] / 255.0f,
>+                     renderbufferClearData[2] / 255.0f, renderbufferClearData[3] / 255.0f);
>+        glClear(GL_COLOR_BUFFER_BIT);
>+        glBindFramebuffer(GL_FRAMEBUFFER, 0);
>+        ASSERT_GL_NO_ERROR();
>+
>+        // Expect that both the texture and renderbuffer see the cleared renderbuffer data
>+        verifyResults2D(textureTarget, renderbufferClearData);
>+        verifyResultsRenderbuffer(renderbufferTarget, renderbufferClearData);
>+
>         // Clean up
>         eglDestroyImageKHR(window->getDisplay(), image);
>         glDeleteTextures(1, &textureTarget);
>@@ -1733,16 +1736,13 @@ TEST_P(ImageTest, MipLevels)
> // Respecify the source texture, orphaning it.  The target texture should not have updated data.
> TEST_P(ImageTest, Respecification)
> {
>+    // Respecification of textures that does not change the size of the level attached to the EGL
>+    // image does not cause orphaning on Qualcomm devices. http://anglebug.com/2744
>+    ANGLE_SKIP_TEST_IF(IsAndroid() && IsOpenGLES());
>+    ANGLE_SKIP_TEST_IF(IsOzone() && IsOpenGLES());
>+
>     EGLWindow *window = getEGLWindow();
>-    if (!extensionEnabled("OES_EGL_image") ||
>-        !eglDisplayExtensionEnabled(window->getDisplay(), "EGL_KHR_image_base") ||
>-        !eglDisplayExtensionEnabled(window->getDisplay(), "EGL_KHR_gl_texture_2D_image"))
>-    {
>-        std::cout << "Test skipped because OES_EGL_image, EGL_KHR_image_base or "
>-                     "EGL_KHR_gl_texture_2D_image is not available."
>-                  << std::endl;
>-        return;
>-    }
>+    ANGLE_SKIP_TEST_IF(!hasOESExt() || !hasBaseExt() || !has2DTextureExt());
> 
>     GLubyte originalData[4] = {255, 0, 255, 255};
>     GLubyte updateData[4]   = {0, 255, 0, 255};
>@@ -1772,34 +1772,49 @@ TEST_P(ImageTest, Respecification)
>     glDeleteTextures(1, &target);
> }
> 
>+// Respecify the source texture with a different size, orphaning it.  The target texture should not
>+// have updated data.
>+TEST_P(ImageTest, RespecificationDifferentSize)
>+{
>+    EGLWindow *window = getEGLWindow();
>+    ANGLE_SKIP_TEST_IF(!hasOESExt() || !hasBaseExt() || !has2DTextureExt());
>+
>+    GLubyte originalData[4] = {255, 0, 255, 255};
>+    GLubyte updateData[16]  = {0, 255, 0, 255, 0, 255, 0, 255, 0, 255, 0, 255, 0, 255, 0, 255};
>+
>+    // Create the Image
>+    GLuint source;
>+    EGLImageKHR image;
>+    createEGLImage2DTextureSource(1, 1, GL_RGBA, GL_UNSIGNED_BYTE, originalData, &source, &image);
>+
>+    // Create the target
>+    GLuint target;
>+    createEGLImageTargetTexture2D(image, &target);
>+
>+    // Respecify source
>+    glBindTexture(GL_TEXTURE_2D, source);
>+    glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, 2, 2, 0, GL_RGBA, GL_UNSIGNED_BYTE, updateData);
>+
>+    // Expect that the target texture has the original data
>+    verifyResults2D(target, originalData);
>+
>+    // Expect that the source texture has the updated data
>+    verifyResults2D(source, updateData);
>+
>+    // Clean up
>+    glDeleteTextures(1, &source);
>+    eglDestroyImageKHR(window->getDisplay(), image);
>+    glDeleteTextures(1, &target);
>+}
>+
> // First render to a target texture, then respecify the source texture, orphaning it.
> // The target texture's FBO should be notified of the target texture's orphaning.
> TEST_P(ImageTest, RespecificationWithFBO)
> {
>     EGLWindow *window = getEGLWindow();
>-    if (!extensionEnabled("OES_EGL_image") ||
>-        !eglDisplayExtensionEnabled(window->getDisplay(), "EGL_KHR_image_base") ||
>-        !eglDisplayExtensionEnabled(window->getDisplay(), "EGL_KHR_gl_texture_2D_image"))
>-    {
>-        std::cout << "Test skipped because OES_EGL_image, EGL_KHR_image_base or "
>-                     "EGL_KHR_gl_texture_2D_image is not available."
>-                  << std::endl;
>-        return;
>-    }
>+    ANGLE_SKIP_TEST_IF(!hasOESExt() || !hasBaseExt() || !has2DTextureExt());
> 
>-    // Simple shader
>-    const std::string &vertexSource =
>-        "attribute vec2 position;\n"
>-        "void main()\n"
>-        "{\n"
>-        "    gl_Position = vec4(position, 0, 1);\n"
>-        "}";
>-    const std::string &fragmentSource =
>-        "void main()\n"
>-        "{\n"
>-        "    gl_FragColor = vec4(0.0, 0.0, 1.0, 1.0);\n"
>-        "}";
>-    GLuint program = CompileProgram(vertexSource, fragmentSource);
>+    GLuint program = CompileProgram(essl1_shaders::vs::Simple(), essl1_shaders::fs::Blue());
>     ASSERT_NE(0u, program);
> 
>     GLubyte originalData[4] = {255, 0, 255, 255};
>@@ -1819,8 +1834,8 @@ TEST_P(ImageTest, RespecificationWithFBO)
>     glGenFramebuffers(1, &fbo);
>     glBindFramebuffer(GL_FRAMEBUFFER, fbo);
>     glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, target, 0);
>-    drawQuad(program, "position", 0.5f);
>-    EXPECT_PIXEL_EQ(0, 0, 0, 0, 255, 255);
>+    drawQuad(program, essl1_shaders::PositionAttrib(), 0.5f);
>+    EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::blue);
> 
>     // Respecify source with same parameters. This should not change the texture storage in D3D11.
>     glBindTexture(GL_TEXTURE_2D, source);
>@@ -1830,8 +1845,8 @@ TEST_P(ImageTest, RespecificationWithFBO)
>     verifyResults2D(source, updateData);
> 
>     // Render to the target texture again and verify it gets the rendered pixels.
>-    drawQuad(program, "position", 0.5f);
>-    EXPECT_PIXEL_EQ(0, 0, 0, 0, 255, 255);
>+    drawQuad(program, essl1_shaders::PositionAttrib(), 0.5f);
>+    EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::blue);
> 
>     // Clean up
>     glDeleteTextures(1, &source);
>@@ -1845,16 +1860,16 @@ TEST_P(ImageTest, RespecificationWithFBO)
> // data
> TEST_P(ImageTest, RespecificationOfOtherLevel)
> {
>+    // Respecification of textures that does not change the size of the level attached to the EGL
>+    // image does not cause orphaning on Qualcomm devices. http://anglebug.com/2744
>+    ANGLE_SKIP_TEST_IF(IsAndroid() && IsOpenGLES());
>+
>+    // It is undefined what happens to the mip 0 of the dest texture after it is orphaned. Some
>+    // backends explicitly copy the data but Vulkan does not.
>+    ANGLE_SKIP_TEST_IF(IsVulkan());
>+
>     EGLWindow *window = getEGLWindow();
>-    if (!extensionEnabled("OES_EGL_image") ||
>-        !eglDisplayExtensionEnabled(window->getDisplay(), "EGL_KHR_image_base") ||
>-        !eglDisplayExtensionEnabled(window->getDisplay(), "EGL_KHR_gl_texture_2D_image"))
>-    {
>-        std::cout << "Test skipped because OES_EGL_image, EGL_KHR_image_base or "
>-                     "EGL_KHR_gl_texture_2D_image is not available."
>-                  << std::endl;
>-        return;
>-    }
>+    ANGLE_SKIP_TEST_IF(!hasOESExt() || !hasBaseExt() || !has2DTextureExt());
> 
>     GLubyte originalData[2 * 2 * 4] = {
>         255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255,
>@@ -1904,15 +1919,7 @@ TEST_P(ImageTest, RespecificationOfOtherLevel)
> TEST_P(ImageTest, UpdatedData)
> {
>     EGLWindow *window = getEGLWindow();
>-    if (!extensionEnabled("OES_EGL_image") ||
>-        !eglDisplayExtensionEnabled(window->getDisplay(), "EGL_KHR_image_base") ||
>-        !eglDisplayExtensionEnabled(window->getDisplay(), "EGL_KHR_gl_texture_2D_image"))
>-    {
>-        std::cout << "Test skipped because OES_EGL_image, EGL_KHR_image_base or "
>-                     "EGL_KHR_gl_texture_2D_image is not available."
>-                  << std::endl;
>-        return;
>-    }
>+    ANGLE_SKIP_TEST_IF(!hasOESExt() || !hasBaseExt() || !has2DTextureExt());
> 
>     GLubyte originalData[4] = {255, 0, 255, 255};
>     GLubyte updateData[4]   = {0, 255, 0, 255};
>@@ -1968,6 +1975,7 @@ ANGLE_INSTANTIATE_TEST(ImageTest,
>                        ES2_OPENGL(),
>                        ES3_OPENGL(),
>                        ES2_OPENGLES(),
>-                       ES3_OPENGLES());
>+                       ES3_OPENGLES(),
>+                       ES2_VULKAN());
> ANGLE_INSTANTIATE_TEST(ImageTestES3, ES3_D3D11(), ES3_OPENGL(), ES3_OPENGLES());
>-}
>+}  // namespace angle
>diff --git a/Source/ThirdParty/ANGLE/src/tests/gl_tests/IncompleteTextureTest.cpp b/Source/ThirdParty/ANGLE/src/tests/gl_tests/IncompleteTextureTest.cpp
>index 5ee77ae3948..a2b24ed16a2 100644
>--- a/Source/ThirdParty/ANGLE/src/tests/gl_tests/IncompleteTextureTest.cpp
>+++ b/Source/ThirdParty/ANGLE/src/tests/gl_tests/IncompleteTextureTest.cpp
>@@ -28,28 +28,26 @@ class IncompleteTextureTest : public ANGLETest
>     {
>         ANGLETest::SetUp();
> 
>-        const std::string vertexShaderSource =
>-            R"(precision highp float;
>-            attribute vec4 position;
>-            varying vec2 texcoord;
>-
>-            void main()
>-            {
>-                gl_Position = position;
>-                texcoord = (position.xy * 0.5) + 0.5;
>-            })";
>-
>-        const std::string fragmentShaderSource =
>-            R"(precision highp float;
>-            uniform sampler2D tex;
>-            varying vec2 texcoord;
>-
>-            void main()
>-            {
>-                gl_FragColor = texture2D(tex, texcoord);
>-            })";
>-
>-        mProgram = CompileProgram(vertexShaderSource, fragmentShaderSource);
>+        constexpr char kVS[] = R"(precision highp float;
>+attribute vec4 position;
>+varying vec2 texcoord;
>+
>+void main()
>+{
>+    gl_Position = position;
>+    texcoord = (position.xy * 0.5) + 0.5;
>+})";
>+
>+        constexpr char kFS[] = R"(precision highp float;
>+uniform sampler2D tex;
>+varying vec2 texcoord;
>+
>+void main()
>+{
>+    gl_FragColor = texture2D(tex, texcoord);
>+})";
>+
>+        mProgram = CompileProgram(kVS, kFS);
>         if (mProgram == 0)
>         {
>             FAIL() << "shader compilation failed.";
>@@ -69,6 +67,20 @@ class IncompleteTextureTest : public ANGLETest
>     GLint mTextureUniformLocation;
> };
> 
>+class IncompleteTextureTestES3 : public ANGLETest
>+{
>+  protected:
>+    IncompleteTextureTestES3()
>+    {
>+        setWindowWidth(128);
>+        setWindowHeight(128);
>+        setConfigRedBits(8);
>+        setConfigGreenBits(8);
>+        setConfigBlueBits(8);
>+        setConfigAlphaBits(8);
>+    }
>+};
>+
> class IncompleteTextureTestES31 : public ANGLETest
> {
>   protected:
>@@ -163,20 +175,34 @@ TEST_P(IncompleteTextureTest, UpdateTexture)
>                           GLColor::green);
> }
> 
>+// Tests that incomplete textures don't get initialized with the unpack buffer contents.
>+TEST_P(IncompleteTextureTestES3, UnpackBufferBound)
>+{
>+    std::vector<GLColor> red(16, GLColor::red);
>+
>+    GLBuffer unpackBuffer;
>+    glBindBuffer(GL_PIXEL_UNPACK_BUFFER, unpackBuffer);
>+    glBufferData(GL_PIXEL_UNPACK_BUFFER, red.size() * sizeof(GLColor), red.data(), GL_STATIC_DRAW);
>+
>+    draw2DTexturedQuad(0.5f, 1.0f, true);
>+    ASSERT_GL_NO_ERROR();
>+
>+    EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::black);
>+}
>+
> // Tests that the incomplete multisample texture has the correct alpha value.
> TEST_P(IncompleteTextureTestES31, MultisampleTexture)
> {
>-    const std::string vertexShader = R"(#version 310 es
>+    constexpr char kVS[] = R"(#version 310 es
> in vec2 position;
> out vec2 texCoord;
> void main()
> {
>     gl_Position = vec4(position, 0, 1);
>     texCoord = (position * 0.5) + 0.5;
>-}
>-)";
>+})";
> 
>-    const std::string fragmentShader = R"(#version 310 es
>+    constexpr char kFS[] = R"(#version 310 es
> precision mediump float;
> in vec2 texCoord;
> out vec4 color;
>@@ -186,26 +212,27 @@ void main()
>     ivec2 texSize = textureSize(tex);
>     ivec2 texel = ivec2(vec2(texSize) * texCoord);
>     color = texelFetch(tex, texel, 0);
>-}
>-)";
>+})";
> 
>     glClearColor(1.0f, 0.0f, 0.0f, 1.0f);
>     glClear(GL_COLOR_BUFFER_BIT);
>     EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::red);
> 
>     // The zero texture will be incomplete by default.
>-    ANGLE_GL_PROGRAM(program, vertexShader, fragmentShader);
>+    ANGLE_GL_PROGRAM(program, kVS, kFS);
>     drawQuad(program, "position", 0.5f);
>     ASSERT_GL_NO_ERROR();
> 
>     EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::black);
> }
> 
>-// Use this to select which configurations (e.g. which renderer, which GLES major version) these tests should be run against.
>+// Use this to select which configurations (e.g. which renderer, which GLES major version) these
>+// tests should be run against.
> ANGLE_INSTANTIATE_TEST(IncompleteTextureTest,
>                        ES2_D3D9(),
>                        ES2_D3D11(),
>                        ES2_OPENGL(),
>-                       ES2_OPENGLES());
>-
>+                       ES2_OPENGLES(),
>+                       ES2_VULKAN());
>+ANGLE_INSTANTIATE_TEST(IncompleteTextureTestES3, ES3_D3D11(), ES3_OPENGL(), ES3_OPENGLES());
> ANGLE_INSTANTIATE_TEST(IncompleteTextureTestES31, ES31_D3D11(), ES31_OPENGL(), ES31_OPENGLES());
>diff --git a/Source/ThirdParty/ANGLE/src/tests/gl_tests/IndexBufferOffsetTest.cpp b/Source/ThirdParty/ANGLE/src/tests/gl_tests/IndexBufferOffsetTest.cpp
>index d344c17a0ae..cc9575bbcd3 100644
>--- a/Source/ThirdParty/ANGLE/src/tests/gl_tests/IndexBufferOffsetTest.cpp
>+++ b/Source/ThirdParty/ANGLE/src/tests/gl_tests/IndexBufferOffsetTest.cpp
>@@ -6,8 +6,8 @@
> 
> // IndexBufferOffsetTest.cpp: Test glDrawElements with an offset and an index buffer
> 
>-#include "system_utils.h"
> #include "test_utils/ANGLETest.h"
>+#include "util/system_utils.h"
> 
> using namespace angle;
> 
>@@ -28,7 +28,7 @@ class IndexBufferOffsetTest : public ANGLETest
>     {
>         ANGLETest::SetUp();
> 
>-        const std::string vertexShaderSource =
>+        constexpr char kVS[] =
>             R"(precision highp float;
>             attribute vec2 position;
> 
>@@ -37,7 +37,7 @@ class IndexBufferOffsetTest : public ANGLETest
>                 gl_Position = vec4(position, 0.0, 1.0);
>             })";
> 
>-        const std::string fragmentShaderSource =
>+        constexpr char kFS[] =
>             R"(precision highp float;
>             uniform vec4 color;
> 
>@@ -46,7 +46,7 @@ class IndexBufferOffsetTest : public ANGLETest
>                 gl_FragColor = color;
>             })";
> 
>-        mProgram = CompileProgram(vertexShaderSource, fragmentShaderSource);
>+        mProgram = CompileProgram(kVS, kFS);
>         ASSERT_NE(0u, mProgram);
> 
>         mColorUniformLocation      = glGetUniformLocation(mProgram, "color");
>@@ -125,6 +125,11 @@ TEST_P(IndexBufferOffsetTest, UInt8Index)
> // Test using an offset for an UInt16 index buffer
> TEST_P(IndexBufferOffsetTest, UInt16Index)
> {
>+    // TODO(jie.a.chen@intel.com): Re-enable the test once the driver fix is
>+    // available in public release.
>+    // http://anglebug.com/2663
>+    ANGLE_SKIP_TEST_IF(IsIntel() && IsVulkan());
>+
>     GLushort indexData[] = {0, 1, 2, 1, 2, 3};
>     runTest(GL_UNSIGNED_SHORT, 2, indexData);
> }
>@@ -132,17 +137,77 @@ TEST_P(IndexBufferOffsetTest, UInt16Index)
> // Test using an offset for an UInt32 index buffer
> TEST_P(IndexBufferOffsetTest, UInt32Index)
> {
>-    if (getClientMajorVersion() < 3 && !extensionEnabled("GL_OES_element_index_uint"))
>-    {
>-        std::cout << "Test skipped because ES3 or GL_OES_element_index_uint is not available."
>-                  << std::endl;
>-        return;
>-    }
>+    ANGLE_SKIP_TEST_IF(getClientMajorVersion() < 3 &&
>+                       !IsGLExtensionEnabled("GL_OES_element_index_uint"));
> 
>     GLuint indexData[] = {0, 1, 2, 1, 2, 3};
>     runTest(GL_UNSIGNED_INT, 4, indexData);
> }
> 
>+// Uses index buffer offset and 2 drawElement calls one of the other, makes sure the second
>+// drawElement call will use the correct offset.
>+TEST_P(IndexBufferOffsetTest, DrawAtDifferentOffsets)
>+{
>+    GLushort indexData[] = {0, 1, 2, 1, 2, 3};
>+    glClearColor(0.0f, 0.0f, 0.0f, 1.0f);
>+    glClear(GL_COLOR_BUFFER_BIT);
>+
>+    size_t indexDataWidth = 6 * sizeof(GLushort);
>+
>+    glBufferData(GL_ELEMENT_ARRAY_BUFFER, indexDataWidth, indexData, GL_DYNAMIC_DRAW);
>+    glUseProgram(mProgram);
>+
>+    glBindBuffer(GL_ARRAY_BUFFER, mVertexBuffer);
>+    glVertexAttribPointer(mPositionAttributeLocation, 2, GL_FLOAT, GL_FALSE, 0, 0);
>+    glEnableVertexAttribArray(mPositionAttributeLocation);
>+
>+    glUniform4f(mColorUniformLocation, 1.0f, 0.0f, 0.0f, 1.0f);
>+
>+    glDrawElements(GL_TRIANGLES, 3, GL_UNSIGNED_SHORT, 0);
>+    glDrawElements(GL_TRIANGLES, 3, GL_UNSIGNED_SHORT,
>+                   reinterpret_cast<void *>(indexDataWidth / 2));
>+
>+    // Check the upper left triangle
>+    EXPECT_PIXEL_COLOR_EQ(0, getWindowHeight() / 4, GLColor::red);
>+
>+    // Check the down right triangle
>+    EXPECT_PIXEL_COLOR_EQ(getWindowWidth() - 1, getWindowHeight() - 1, GLColor::red);
>+
>+    EXPECT_GL_NO_ERROR();
>+}
>+
>+// Uses index buffer offset and 2 drawElement calls one of the other with different counts,
>+// makes sure the second drawElement call will have its data available.
>+TEST_P(IndexBufferOffsetTest, DrawWithDifferentCountsSameOffset)
>+{
>+    GLubyte indexData[] = {99, 0, 1, 2, 1, 2, 3};
>+    glClearColor(0.0f, 0.0f, 0.0f, 1.0f);
>+    glClear(GL_COLOR_BUFFER_BIT);
>+
>+    size_t indexDataWidth = 7 * sizeof(GLubyte);
>+
>+    glBufferData(GL_ELEMENT_ARRAY_BUFFER, indexDataWidth, indexData, GL_DYNAMIC_DRAW);
>+    glUseProgram(mProgram);
>+
>+    glBindBuffer(GL_ARRAY_BUFFER, mVertexBuffer);
>+    glVertexAttribPointer(mPositionAttributeLocation, 2, GL_FLOAT, GL_FALSE, 0, 0);
>+    glEnableVertexAttribArray(mPositionAttributeLocation);
>+
>+    glUniform4f(mColorUniformLocation, 1.0f, 0.0f, 0.0f, 1.0f);
>+
>+    // The first draw draws the first triangle, and the second draws a quad.
>+    glDrawElements(GL_TRIANGLES, 3, GL_UNSIGNED_BYTE, reinterpret_cast<void *>(1));
>+    glDrawElements(GL_TRIANGLES, 6, GL_UNSIGNED_BYTE, reinterpret_cast<void *>(1));
>+
>+    // Check the upper left triangle
>+    EXPECT_PIXEL_COLOR_EQ(0, getWindowHeight() / 4, GLColor::red);
>+
>+    // Check the down right triangle
>+    EXPECT_PIXEL_COLOR_EQ(getWindowWidth() - 1, getWindowHeight() - 1, GLColor::red);
>+
>+    EXPECT_GL_NO_ERROR();
>+}
>+
> ANGLE_INSTANTIATE_TEST(IndexBufferOffsetTest,
>                        ES2_D3D9(),
>                        ES2_D3D11(),
>@@ -150,4 +215,5 @@ ANGLE_INSTANTIATE_TEST(IndexBufferOffsetTest,
>                        ES2_OPENGL(),
>                        ES3_OPENGL(),
>                        ES2_OPENGLES(),
>-                       ES3_OPENGLES());
>+                       ES3_OPENGLES(),
>+                       ES2_VULKAN());
>diff --git a/Source/ThirdParty/ANGLE/src/tests/gl_tests/IndexedPointsTest.cpp b/Source/ThirdParty/ANGLE/src/tests/gl_tests/IndexedPointsTest.cpp
>index 919994795bc..9e945faf25d 100644
>--- a/Source/ThirdParty/ANGLE/src/tests/gl_tests/IndexedPointsTest.cpp
>+++ b/Source/ThirdParty/ANGLE/src/tests/gl_tests/IndexedPointsTest.cpp
>@@ -27,52 +27,47 @@ class IndexedPointsTest : public ANGLETest
> 
>     float getIndexPositionY(size_t idx) { return (idx == 2 || idx == 3) ? -0.5f : 0.5f; }
> 
>-    virtual void SetUp()
>+    void SetUp() override
>     {
>         ANGLETest::SetUp();
> 
>-        const std::string vertexShaderSource =
>-            R"(precision highp float;
>-            attribute vec2 position;
>+        constexpr char kVS[] = R"(precision highp float;
>+attribute vec2 position;
> 
>-            void main() {
>-                gl_PointSize = 5.0;
>-                gl_Position  = vec4(position, 0.0, 1.0);
>-            })";
>+void main() {
>+    gl_PointSize = 5.0;
>+    gl_Position  = vec4(position, 0.0, 1.0);
>+})";
> 
>-        const std::string fragmentShaderSource =
>-            R"(precision highp float;
>-
>-            void main()
>-            {
>-                gl_FragColor = vec4(1.0, 0.0, 0.0, 1.0);
>-            })";
>+        constexpr char kFS[] = R"(precision highp float;
>+void main()
>+{
>+    gl_FragColor = vec4(1.0, 0.0, 0.0, 1.0);
>+})";
> 
>-        mProgram = CompileProgram(vertexShaderSource, fragmentShaderSource);
>+        mProgram = CompileProgram(kVS, kFS);
>         ASSERT_NE(0u, mProgram);
> 
>-        const std::string vertexShaderSource2 =
>-            R"(precision highp float;
>-            attribute vec2 position;
>-            attribute vec4 color;
>-            varying vec4 vcolor;
>+        constexpr char kVS2[] = R"(precision highp float;
>+attribute vec2 position;
>+attribute vec4 color;
>+varying vec4 vcolor;
> 
>-            void main() {
>-                gl_PointSize = 5.0;
>-                gl_Position  = vec4(position, 0.0, 1.0);
>-                vcolor       = color;
>-            })";
>+void main() {
>+    gl_PointSize = 5.0;
>+    gl_Position  = vec4(position, 0.0, 1.0);
>+    vcolor       = color;
>+})";
> 
>-        const std::string fragmentShaderSource2 =
>-            R"(precision highp float;
>-            varying vec4 vcolor;
>+        constexpr char kFS2[] = R"(precision highp float;
>+varying vec4 vcolor;
> 
>-            void main()
>-            {
>-                gl_FragColor = vec4(vcolor.xyz, 1.0);
>-            })";
>+void main()
>+{
>+    gl_FragColor = vec4(vcolor.xyz, 1.0);
>+})";
> 
>-        mVertexWithColorBufferProgram = CompileProgram(vertexShaderSource2, fragmentShaderSource2);
>+        mVertexWithColorBufferProgram = CompileProgram(kVS2, kFS2);
>         ASSERT_NE(0u, mVertexWithColorBufferProgram);
> 
>         // Construct a vertex buffer of position values and color values
>@@ -105,7 +100,7 @@ class IndexedPointsTest : public ANGLETest
>         glBufferData(GL_ELEMENT_ARRAY_BUFFER, sizeof(indices), &indices[0], GL_STATIC_DRAW);
>     }
> 
>-    virtual void TearDown()
>+    void TearDown() override
>     {
>         glDeleteBuffers(1, &mVertexBuffer);
>         glDeleteBuffers(1, &mIndexBuffer);
>@@ -222,21 +217,33 @@ TEST_P(IndexedPointsTestUByte, UnsignedByteOffset3)
> 
> TEST_P(IndexedPointsTestUByte, VertexWithColorUnsignedByteOffset0)
> {
>+    // TODO(fjhenigman): Fix with buffer offset http://anglebug.com/2848
>+    ANGLE_SKIP_TEST_IF(IsVulkan() && IsAMD());
>+
>     runTest(0, true);
> }
> 
> TEST_P(IndexedPointsTestUByte, VertexWithColorUnsignedByteOffset1)
> {
>+    // TODO(fjhenigman): Fix with buffer offset http://anglebug.com/2848
>+    ANGLE_SKIP_TEST_IF(IsVulkan() && IsAMD());
>+
>     runTest(1, true);
> }
> 
> TEST_P(IndexedPointsTestUByte, VertexWithColorUnsignedByteOffset2)
> {
>+    // TODO(fjhenigman): Fix with buffer offset http://anglebug.com/2848
>+    ANGLE_SKIP_TEST_IF(IsVulkan() && IsAMD());
>+
>     runTest(2, true);
> }
> 
> TEST_P(IndexedPointsTestUByte, VertexWithColorUnsignedByteOffset3)
> {
>+    // TODO(fjhenigman): Fix with buffer offset http://anglebug.com/2848
>+    ANGLE_SKIP_TEST_IF(IsVulkan() && IsAMD());
>+
>     runTest(3, true);
> }
> 
>@@ -264,32 +271,43 @@ TEST_P(IndexedPointsTestUShort, UnsignedShortOffset3)
> 
> TEST_P(IndexedPointsTestUShort, VertexWithColorUnsignedShortOffset0)
> {
>+    // TODO(fjhenigman): Fix with buffer offset http://anglebug.com/2848
>+    ANGLE_SKIP_TEST_IF(IsVulkan() && IsAMD());
>+
>     runTest(0, true);
> }
> 
> TEST_P(IndexedPointsTestUShort, VertexWithColorUnsignedShortOffset1)
> {
>+    // TODO(fjhenigman): Fix with buffer offset http://anglebug.com/2848
>+    ANGLE_SKIP_TEST_IF(IsVulkan() && IsAMD());
>+
>     runTest(1, true);
> }
> 
> TEST_P(IndexedPointsTestUShort, VertexWithColorUnsignedShortOffset2)
> {
>+    // TODO(fjhenigman): Fix with buffer offset http://anglebug.com/2848
>+    ANGLE_SKIP_TEST_IF(IsVulkan() && IsAMD());
>+
>     runTest(2, true);
> }
> 
> TEST_P(IndexedPointsTestUShort, VertexWithColorUnsignedShortOffset3)
> {
>+    // TODO(fjhenigman): Fix with buffer offset http://anglebug.com/2848
>+    ANGLE_SKIP_TEST_IF(IsVulkan() && IsAMD());
>+
>     runTest(3, true);
> }
> 
> TEST_P(IndexedPointsTestUShort, VertexWithColorUnsignedShortOffsetChangingIndices)
> {
>+    // TODO(fjhenigman): Fix with buffer offset http://anglebug.com/2848
>+    ANGLE_SKIP_TEST_IF(IsVulkan() && IsAMD());
>+
>     // TODO(fjhenigman): Figure out why this fails on Ozone Intel.
>-    if (IsOzone() && IsIntel() && IsOpenGLES())
>-    {
>-        std::cout << "Test skipped on Ozone Intel." << std::endl;
>-        return;
>-    }
>+    ANGLE_SKIP_TEST_IF(IsOzone() && IsIntel() && IsOpenGLES());
> 
>     runTest(3, true);
>     runTest(1, true);
>@@ -301,7 +319,7 @@ typedef IndexedPointsTest<GLuint, GL_UNSIGNED_INT> IndexedPointsTestUInt;
> 
> TEST_P(IndexedPointsTestUInt, UnsignedIntOffset0)
> {
>-    if (getClientMajorVersion() < 3 && !extensionEnabled("GL_OES_element_index_uint"))
>+    if (getClientMajorVersion() < 3 && !IsGLExtensionEnabled("GL_OES_element_index_uint"))
>     {
>         return;
>     }
>@@ -311,7 +329,7 @@ TEST_P(IndexedPointsTestUInt, UnsignedIntOffset0)
> 
> TEST_P(IndexedPointsTestUInt, UnsignedIntOffset1)
> {
>-    if (getClientMajorVersion() < 3 && !extensionEnabled("GL_OES_element_index_uint"))
>+    if (getClientMajorVersion() < 3 && !IsGLExtensionEnabled("GL_OES_element_index_uint"))
>     {
>         return;
>     }
>@@ -321,7 +339,7 @@ TEST_P(IndexedPointsTestUInt, UnsignedIntOffset1)
> 
> TEST_P(IndexedPointsTestUInt, UnsignedIntOffset2)
> {
>-    if (getClientMajorVersion() < 3 && !extensionEnabled("GL_OES_element_index_uint"))
>+    if (getClientMajorVersion() < 3 && !IsGLExtensionEnabled("GL_OES_element_index_uint"))
>     {
>         return;
>     }
>@@ -331,7 +349,7 @@ TEST_P(IndexedPointsTestUInt, UnsignedIntOffset2)
> 
> TEST_P(IndexedPointsTestUInt, UnsignedIntOffset3)
> {
>-    if (getClientMajorVersion() < 3 && !extensionEnabled("GL_OES_element_index_uint"))
>+    if (getClientMajorVersion() < 3 && !IsGLExtensionEnabled("GL_OES_element_index_uint"))
>     {
>         return;
>     }
>@@ -341,7 +359,7 @@ TEST_P(IndexedPointsTestUInt, UnsignedIntOffset3)
> 
> TEST_P(IndexedPointsTestUInt, VertexWithColorUnsignedIntOffset0)
> {
>-    if (getClientMajorVersion() < 3 && !extensionEnabled("GL_OES_element_index_uint"))
>+    if (getClientMajorVersion() < 3 && !IsGLExtensionEnabled("GL_OES_element_index_uint"))
>     {
>         return;
>     }
>@@ -351,7 +369,7 @@ TEST_P(IndexedPointsTestUInt, VertexWithColorUnsignedIntOffset0)
> 
> TEST_P(IndexedPointsTestUInt, VertexWithColorUnsignedIntOffset1)
> {
>-    if (getClientMajorVersion() < 3 && !extensionEnabled("GL_OES_element_index_uint"))
>+    if (getClientMajorVersion() < 3 && !IsGLExtensionEnabled("GL_OES_element_index_uint"))
>     {
>         return;
>     }
>@@ -361,7 +379,7 @@ TEST_P(IndexedPointsTestUInt, VertexWithColorUnsignedIntOffset1)
> 
> TEST_P(IndexedPointsTestUInt, VertexWithColorUnsignedIntOffset2)
> {
>-    if (getClientMajorVersion() < 3 && !extensionEnabled("GL_OES_element_index_uint"))
>+    if (getClientMajorVersion() < 3 && !IsGLExtensionEnabled("GL_OES_element_index_uint"))
>     {
>         return;
>     }
>@@ -371,7 +389,7 @@ TEST_P(IndexedPointsTestUInt, VertexWithColorUnsignedIntOffset2)
> 
> TEST_P(IndexedPointsTestUInt, VertexWithColorUnsignedIntOffset3)
> {
>-    if (getClientMajorVersion() < 3 && !extensionEnabled("GL_OES_element_index_uint"))
>+    if (getClientMajorVersion() < 3 && !IsGLExtensionEnabled("GL_OES_element_index_uint"))
>     {
>         return;
>     }
>@@ -379,19 +397,25 @@ TEST_P(IndexedPointsTestUInt, VertexWithColorUnsignedIntOffset3)
>     runTest(3, false);
> }
> 
>+// TODO(lucferron): Diagnose and fix the UByte tests below for Vulkan.
>+// http://anglebug.com/2646
>+
> // TODO(geofflang): Figure out why this test fails on Intel OpenGL
> ANGLE_INSTANTIATE_TEST(IndexedPointsTestUByte,
>                        ES2_D3D11(),
>                        ES2_D3D11_FL9_3(),
>                        ES2_OPENGL(),
>-                       ES2_OPENGLES());
>+                       ES2_OPENGLES(),
>+                       ES2_VULKAN());
> ANGLE_INSTANTIATE_TEST(IndexedPointsTestUShort,
>                        ES2_D3D11(),
>                        ES2_D3D11_FL9_3(),
>                        ES2_OPENGL(),
>-                       ES2_OPENGLES());
>+                       ES2_OPENGLES(),
>+                       ES2_VULKAN());
> ANGLE_INSTANTIATE_TEST(IndexedPointsTestUInt,
>                        ES2_D3D11(),
>                        ES2_D3D11_FL9_3(),
>                        ES2_OPENGL(),
>-                       ES2_OPENGLES());
>+                       ES2_OPENGLES(),
>+                       ES2_VULKAN());
>\ No newline at end of file
>diff --git a/Source/ThirdParty/ANGLE/src/tests/gl_tests/InstancingTest.cpp b/Source/ThirdParty/ANGLE/src/tests/gl_tests/InstancingTest.cpp
>index 0532e73fbb9..85fb034b91b 100644
>--- a/Source/ThirdParty/ANGLE/src/tests/gl_tests/InstancingTest.cpp
>+++ b/Source/ThirdParty/ANGLE/src/tests/gl_tests/InstancingTest.cpp
>@@ -9,10 +9,34 @@
> 
> using namespace angle;
> 
>+namespace
>+{
>+enum Geometry
>+{
>+    Quad,
>+    Point
>+};
>+enum Storage
>+{
>+    Buffer,
>+    Memory
>+};
>+enum Draw
>+{
>+    Indexed,
>+    NonIndexed
>+};
>+enum Vendor
>+{
>+    Angle,
>+    Ext
>+};
>+}  // namespace
>+
> class InstancingTest : public ANGLETest
> {
>   protected:
>-    InstancingTest() : mProgram(0), mVertexBuffer(0)
>+    InstancingTest()
>     {
>         setWindowWidth(256);
>         setWindowHeight(256);
>@@ -22,429 +46,353 @@ class InstancingTest : public ANGLETest
>         setConfigAlphaBits(8);
>     }
> 
>-    ~InstancingTest() override
>+    void TearDown() override
>     {
>-        glDeleteBuffers(1, &mVertexBuffer);
>-        glDeleteProgram(mProgram);
>+        glDeleteBuffers(1, &mInstanceBuffer);
>+        glDeleteProgram(mProgram[0]);
>+        glDeleteProgram(mProgram[1]);
>+
>+        ANGLETest::TearDown();
>     }
> 
>     void SetUp() override
>     {
>         ANGLETest::SetUp();
> 
>-        mVertexAttribDivisorANGLE   = nullptr;
>-        mDrawArraysInstancedANGLE   = nullptr;
>-        mDrawElementsInstancedANGLE = nullptr;
>-
>-        const char *extensionString = reinterpret_cast<const char *>(glGetString(GL_EXTENSIONS));
>-        if (strstr(extensionString, "GL_ANGLE_instanced_arrays"))
>-        {
>-            mVertexAttribDivisorANGLE =
>-                (PFNGLVERTEXATTRIBDIVISORANGLEPROC)eglGetProcAddress("glVertexAttribDivisorANGLE");
>-            mDrawArraysInstancedANGLE =
>-                (PFNGLDRAWARRAYSINSTANCEDANGLEPROC)eglGetProcAddress("glDrawArraysInstancedANGLE");
>-            mDrawElementsInstancedANGLE = (PFNGLDRAWELEMENTSINSTANCEDANGLEPROC)eglGetProcAddress(
>-                "glDrawElementsInstancedANGLE");
>-        }
>-
>-        ASSERT_NE(nullptr, mVertexAttribDivisorANGLE);
>-        ASSERT_NE(nullptr, mDrawArraysInstancedANGLE);
>-        ASSERT_NE(nullptr, mDrawElementsInstancedANGLE);
>-
>-        // Initialize the vertex and index vectors
>-        constexpr GLfloat qvertex1[3] = {-quadRadius, quadRadius, 0.0f};
>-        constexpr GLfloat qvertex2[3] = {-quadRadius, -quadRadius, 0.0f};
>-        constexpr GLfloat qvertex3[3] = {quadRadius, -quadRadius, 0.0f};
>-        constexpr GLfloat qvertex4[3] = {quadRadius, quadRadius, 0.0f};
>-        mQuadVertices.insert(mQuadVertices.end(), qvertex1, qvertex1 + 3);
>-        mQuadVertices.insert(mQuadVertices.end(), qvertex2, qvertex2 + 3);
>-        mQuadVertices.insert(mQuadVertices.end(), qvertex3, qvertex3 + 3);
>-        mQuadVertices.insert(mQuadVertices.end(), qvertex4, qvertex4 + 3);
>-
>-        constexpr GLfloat coord1[2] = {0.0f, 0.0f};
>-        constexpr GLfloat coord2[2] = {0.0f, 1.0f};
>-        constexpr GLfloat coord3[2] = {1.0f, 1.0f};
>-        constexpr GLfloat coord4[2] = {1.0f, 0.0f};
>-        mTexcoords.insert(mTexcoords.end(), coord1, coord1 + 2);
>-        mTexcoords.insert(mTexcoords.end(), coord2, coord2 + 2);
>-        mTexcoords.insert(mTexcoords.end(), coord3, coord3 + 2);
>-        mTexcoords.insert(mTexcoords.end(), coord4, coord4 + 2);
>-
>-        mIndices.push_back(0);
>-        mIndices.push_back(1);
>-        mIndices.push_back(2);
>-        mIndices.push_back(0);
>-        mIndices.push_back(2);
>-        mIndices.push_back(3);
>-
>-        for (size_t vertexIndex = 0; vertexIndex < 6; ++vertexIndex)
>+        for (unsigned i = 0; i < kMaxDrawn; ++i)
>         {
>-            mNonIndexedVertices.insert(mNonIndexedVertices.end(),
>-                                       mQuadVertices.begin() + mIndices[vertexIndex] * 3,
>-                                       mQuadVertices.begin() + mIndices[vertexIndex] * 3 + 3);
>-        }
>-
>-        for (size_t vertexIndex = 0; vertexIndex < 6; ++vertexIndex)
>-        {
>-            mNonIndexedVertices.insert(mNonIndexedVertices.end(),
>-                                       mQuadVertices.begin() + mIndices[vertexIndex] * 3,
>-                                       mQuadVertices.begin() + mIndices[vertexIndex] * 3 + 3);
>+            mInstanceData[i] = i * kDrawSize;
>         }
>+        glGenBuffers(1, &mInstanceBuffer);
>+        glBindBuffer(GL_ARRAY_BUFFER, mInstanceBuffer);
>+        glBufferData(GL_ARRAY_BUFFER, sizeof(mInstanceData), mInstanceData, GL_STATIC_DRAW);
>+        glBindBuffer(GL_ARRAY_BUFFER, 0);
> 
>-        // Tile a 2x2 grid of the tiles
>-        for (float y = -1.0f + quadRadius; y < 1.0f - quadRadius; y += quadRadius * 3)
>-        {
>-            for (float x = -1.0f + quadRadius; x < 1.0f - quadRadius; x += quadRadius * 3)
>+        const std::string inst = "attribute float a_instance;";
>+        const std::string pos  = "attribute vec2 a_position;";
>+        const std::string main = R"(
>+            void main()
>             {
>-                const GLfloat instance[3] = {x + quadRadius, y + quadRadius, 0.0f};
>-                mInstances.insert(mInstances.end(), instance, instance + 3);
>+                gl_PointSize = 6.0;
>+                gl_Position = vec4(a_position.x, a_position.y + a_instance, 0, 1);
>             }
>-        }
>-
>-        glClearColor(0.0f, 0.0f, 0.0f, 1.0f);
>-
>-        glGenBuffers(1, &mVertexBuffer);
>-
>-        ASSERT_GL_NO_ERROR();
>+        )";
>+
>+        // attrib 0 is instanced
>+        const std::string inst0 = inst + pos + main;
>+        mProgram[0]             = CompileProgram(inst0.c_str(), essl1_shaders::fs::Red());
>+        ASSERT_NE(0u, mProgram[0]);
>+        ASSERT_EQ(0, glGetAttribLocation(mProgram[0], "a_instance"));
>+        ASSERT_EQ(1, glGetAttribLocation(mProgram[0], "a_position"));
>+
>+        // attrib 1 is instanced
>+        const std::string inst1 = pos + inst + main;
>+        mProgram[1]             = CompileProgram(inst1.c_str(), essl1_shaders::fs::Red());
>+        ASSERT_NE(0u, mProgram[1]);
>+        ASSERT_EQ(1, glGetAttribLocation(mProgram[1], "a_instance"));
>+        ASSERT_EQ(0, glGetAttribLocation(mProgram[1], "a_position"));
>+
>+        glClearColor(0.0f, 0.0f, 1.0f, 1.0f);
>     }
> 
>-    void setupDrawArraysTest(const std::string &vs)
>+    void runTest(unsigned numInstance,
>+                 unsigned divisor,
>+                 const int instanceAttrib,  // which attrib is instanced: 0 or 1
>+                 Geometry geometry,
>+                 Draw draw,
>+                 Storage storage,
>+                 Vendor vendor,
>+                 unsigned offset)  // for NonIndexed/DrawArrays only
>     {
>-        const std::string fs =
>-            "precision mediump float;\n"
>-            "void main()\n"
>-            "{\n"
>-            "    gl_FragColor = vec4(1.0, 0, 0, 1.0);\n"
>-            "}\n";
>+        if (vendor == Angle)
>+        {
>+            ANGLE_SKIP_TEST_IF(!IsGLExtensionEnabled("GL_ANGLE_instanced_arrays"));
>+        }
>+        else if (vendor == Ext)
>+        {
>+            ANGLE_SKIP_TEST_IF(!IsGLExtensionEnabled("GL_EXT_instanced_arrays"));
>+        }
> 
>-        mProgram = CompileProgram(vs, fs);
>-        ASSERT_NE(0u, mProgram);
>+        // TODO: Fix these.  http://anglebug.com/3129
>+        ANGLE_SKIP_TEST_IF(IsD3D9() && draw == Indexed && geometry == Point);
>+        ANGLE_SKIP_TEST_IF(IsD3D9() && IsAMD());
> 
>-        // Set the viewport
>-        glViewport(0, 0, getWindowWidth(), getWindowHeight());
>+        // D3D11 FL9_3 has a special codepath that emulates instanced points rendering
>+        // but it has bugs and was only implemented for vertex positions in a buffer object,
>+        // not client memory as used in this test.
>+        ANGLE_SKIP_TEST_IF(IsD3D11_FL93() && geometry == Point);
> 
>-        // Clear the color buffer
>-        glClear(GL_COLOR_BUFFER_BIT);
>+        // Unknown problem.  FL9_3 is not officially supported anyway.
>+        ANGLE_SKIP_TEST_IF(IsD3D11_FL93() && geometry == Quad && draw == NonIndexed);
> 
>-        // Use the program object
>-        glUseProgram(mProgram);
>-    }
>+        // The window is divided into kMaxDrawn slices of size kDrawSize.
>+        // The slice drawn into is determined by the instance datum.
>+        // The instance data array selects all the slices in order.
>+        // 'lastDrawn' is the index (zero-based) of the last slice into which we draw.
>+        const unsigned lastDrawn = (numInstance - 1) / divisor;
> 
>-    void setupInstancedPointsTest()
>-    {
>-        mIndices.clear();
>-        mIndices.push_back(0);
>-        mIndices.push_back(1);
>-        mIndices.push_back(2);
>-        mIndices.push_back(3);
>-
>-        // clang-format off
>-        const std::string vs =
>-            "attribute vec3 a_position;\n"
>-            "attribute vec3 a_instancePos;\n"
>-            "void main()\n"
>-            "{\n"
>-            "    gl_Position  = vec4(a_position.xyz, 1.0);\n"
>-            "    gl_Position  = vec4(a_instancePos.xyz, 1.0);\n"
>-            "    gl_PointSize = 6.0;\n"
>-            "}\n";
>-
>-        const std::string fs =
>-            "precision mediump float;\n"
>-            "void main()\n"
>-            "{\n"
>-            "    gl_FragColor = vec4(1.0, 0, 0, 1.0);\n"
>-            "}\n";
>-        // clang-format on
>-
>-        mProgram = CompileProgram(vs, fs);
>-        ASSERT_NE(0u, mProgram);
>-
>-        // Set the viewport
>-        glViewport(0, 0, getWindowWidth(), getWindowHeight());
>-
>-        // Clear the color buffer
>-        glClear(GL_COLOR_BUFFER_BIT);
>+        // Ensure the numInstance and divisor parameters are valid.
>+        ASSERT_TRUE(lastDrawn < kMaxDrawn);
> 
>-        // Use the program object
>-        glUseProgram(mProgram);
>-    }
>+        ASSERT_TRUE(instanceAttrib == 0 || instanceAttrib == 1);
>+        const int positionAttrib = 1 - instanceAttrib;
> 
>-    void runDrawArraysTest(GLint first, GLsizei count, GLsizei instanceCount, const float *offset)
>-    {
>-        glBindBuffer(GL_ARRAY_BUFFER, mVertexBuffer);
>-        glBufferData(GL_ARRAY_BUFFER, mInstances.size() * sizeof(mInstances[0]), &mInstances[0],
>-                     GL_STATIC_DRAW);
>-        glBindBuffer(GL_ARRAY_BUFFER, 0);
>+        glUseProgram(mProgram[instanceAttrib]);
> 
>-        // Get the attribute locations
>-        GLint positionLoc    = glGetAttribLocation(mProgram, "a_position");
>-        GLint instancePosLoc = glGetAttribLocation(mProgram, "a_instancePos");
>+        glBindBuffer(GL_ARRAY_BUFFER, storage == Buffer ? mInstanceBuffer : 0);
>+        glVertexAttribPointer(instanceAttrib, 1, GL_FLOAT, GL_FALSE, 0,
>+                              storage == Buffer ? nullptr : mInstanceData);
>+        glEnableVertexAttribArray(instanceAttrib);
>+        if (vendor == Angle)
>+            glVertexAttribDivisorANGLE(instanceAttrib, divisor);
>+        else if (vendor == Ext)
>+            glVertexAttribDivisorEXT(instanceAttrib, divisor);
> 
>-        // Load the vertex position
>-        glVertexAttribPointer(positionLoc, 3, GL_FLOAT, GL_FALSE, 0, mNonIndexedVertices.data());
>-        glEnableVertexAttribArray(positionLoc);
>-
>-        // Load the instance position
>-        glBindBuffer(GL_ARRAY_BUFFER, mVertexBuffer);
>-        glVertexAttribPointer(instancePosLoc, 3, GL_FLOAT, GL_FALSE, 0, 0);
>         glBindBuffer(GL_ARRAY_BUFFER, 0);
>-        glEnableVertexAttribArray(instancePosLoc);
>-
>-        // Enable instancing
>-        mVertexAttribDivisorANGLE(instancePosLoc, 1);
>-
>-        // Offset
>-        GLint uniformLoc = glGetUniformLocation(mProgram, "u_offset");
>-        ASSERT_NE(-1, uniformLoc);
>-        glUniform3fv(uniformLoc, 1, offset);
>-
>-        // Do the instanced draw
>-        mDrawArraysInstancedANGLE(GL_TRIANGLES, first, count, instanceCount);
>-
>-        ASSERT_GL_NO_ERROR();
>-    }
>+        glVertexAttribPointer(positionAttrib, 2, GL_FLOAT, GL_FALSE, 0,
>+                              geometry == Point ? kPointVertices : kQuadVertices);
>+        glEnableVertexAttribArray(positionAttrib);
>+        if (vendor == Angle)
>+            glVertexAttribDivisorANGLE(positionAttrib, 0);
>+        else if (vendor == Ext)
>+            glVertexAttribDivisorEXT(positionAttrib, 0);
> 
>-    virtual void runDrawElementsTest(std::string vs, bool shouldAttribZeroBeInstanced)
>-    {
>-        const std::string fs =
>-            "precision mediump float;\n"
>-            "void main()\n"
>-            "{\n"
>-            "    gl_FragColor = vec4(1.0, 0, 0, 1.0);\n"
>-            "}\n";
>-
>-        ANGLE_GL_PROGRAM(program, vs, fs);
>-
>-        // Get the attribute locations
>-        GLint positionLoc    = glGetAttribLocation(program, "a_position");
>-        GLint instancePosLoc = glGetAttribLocation(program, "a_instancePos");
>-
>-        // If this ASSERT fails then the vertex shader code should be refactored
>-        ASSERT_EQ(shouldAttribZeroBeInstanced, (instancePosLoc == 0));
>-
>-        // Set the viewport
>-        glViewport(0, 0, getWindowWidth(), getWindowHeight());
>-
>-        // Clear the color buffer
>         glClear(GL_COLOR_BUFFER_BIT);
> 
>-        // Use the program object
>-        glUseProgram(program);
>-
>-        // Load the vertex position
>-        glVertexAttribPointer(positionLoc, 3, GL_FLOAT, GL_FALSE, 0, mQuadVertices.data());
>-        glEnableVertexAttribArray(positionLoc);
>-
>-        // Load the instance position
>-        glVertexAttribPointer(instancePosLoc, 3, GL_FLOAT, GL_FALSE, 0, mInstances.data());
>-        glEnableVertexAttribArray(instancePosLoc);
>-
>-        // Enable instancing
>-        mVertexAttribDivisorANGLE(instancePosLoc, 1);
>-
>-        // Do the instanced draw
>-        mDrawElementsInstancedANGLE(GL_TRIANGLES, static_cast<GLsizei>(mIndices.size()),
>-                                    GL_UNSIGNED_SHORT, mIndices.data(),
>-                                    static_cast<GLsizei>(mInstances.size()) / 3);
>+        if (geometry == Point)
>+        {
>+            if (draw == Indexed)
>+                if (vendor == Angle)
>+                    glDrawElementsInstancedANGLE(GL_POINTS, ArraySize(kPointIndices),
>+                                                 GL_UNSIGNED_SHORT, kPointIndices, numInstance);
>+                else
>+                    glDrawElementsInstancedEXT(GL_POINTS, ArraySize(kPointIndices),
>+                                               GL_UNSIGNED_SHORT, kPointIndices, numInstance);
>+            else if (vendor == Angle)
>+                glDrawArraysInstancedANGLE(GL_POINTS, offset, 4 /*vertices*/, numInstance);
>+            else
>+                glDrawArraysInstancedEXT(GL_POINTS, offset, 4 /*vertices*/, numInstance);
>+        }
>+        else
>+        {
>+            if (draw == Indexed)
>+                if (vendor == Angle)
>+                    glDrawElementsInstancedANGLE(GL_TRIANGLES, ArraySize(kQuadIndices),
>+                                                 GL_UNSIGNED_SHORT, kQuadIndices, numInstance);
>+                else
>+                    glDrawElementsInstancedEXT(GL_TRIANGLES, ArraySize(kQuadIndices),
>+                                               GL_UNSIGNED_SHORT, kQuadIndices, numInstance);
>+            else if (vendor == Angle)
>+                glDrawArraysInstancedANGLE(GL_TRIANGLES, offset, 6 /*vertices*/, numInstance);
>+            else
>+                glDrawArraysInstancedEXT(GL_TRIANGLES, offset, 6 /*vertices*/, numInstance);
>+        }
> 
>         ASSERT_GL_NO_ERROR();
>-
>-        checkQuads();
>+        checkDrawing(lastDrawn);
>     }
> 
>-    void checkQuads()
>+    void checkDrawing(unsigned lastDrawn)
>     {
>-        // Check that various pixels are the expected color.
>-        for (unsigned int quadIndex = 0; quadIndex < 4; ++quadIndex)
>+        for (unsigned i = 0; i < kMaxDrawn; ++i)
>         {
>-            unsigned int baseOffset = quadIndex * 3;
>-
>-            int quadx =
>-                static_cast<int>(((mInstances[baseOffset + 0]) * 0.5f + 0.5f) * getWindowWidth());
>-            int quady =
>-                static_cast<int>(((mInstances[baseOffset + 1]) * 0.5f + 0.5f) * getWindowHeight());
>-
>-            EXPECT_PIXEL_EQ(quadx, quady, 255, 0, 0, 255);
>+            float y =
>+                -1.0f + static_cast<float>(kDrawSize) / 2.0f + static_cast<float>(i * kDrawSize);
>+            int iy = static_cast<int>((y + 1.0f) / 2.0f * getWindowHeight());
>+            for (unsigned j = 0; j < 8; j += 2)
>+            {
>+                int ix = static_cast<int>((kPointVertices[j] + 1.0f) / 2.0f * getWindowWidth());
>+                EXPECT_PIXEL_COLOR_EQ(ix, iy, i <= lastDrawn ? GLColor::red : GLColor::blue)
>+                    << std::endl;
>+            }
>         }
>     }
> 
>-    // Loaded entry points
>-    PFNGLVERTEXATTRIBDIVISORANGLEPROC mVertexAttribDivisorANGLE;
>-    PFNGLDRAWARRAYSINSTANCEDANGLEPROC mDrawArraysInstancedANGLE;
>-    PFNGLDRAWELEMENTSINSTANCEDANGLEPROC mDrawElementsInstancedANGLE;
>-
>-    // Vertex data
>-    std::vector<GLfloat> mQuadVertices;
>-    std::vector<GLfloat> mNonIndexedVertices;
>-    std::vector<GLfloat> mTexcoords;
>-    std::vector<GLfloat> mInstances;
>-    std::vector<GLushort> mIndices;
>-
>-    static constexpr GLfloat quadRadius = 0.30f;
>-
>-    GLuint mProgram;
>-    GLuint mVertexBuffer;
>+    GLuint mProgram[2];
>+    GLuint mInstanceBuffer;
>+
>+    static constexpr unsigned kMaxDrawn = 16;
>+    static constexpr float kDrawSize    = 2.0 / kMaxDrawn;
>+    GLfloat mInstanceData[kMaxDrawn];
>+
>+    // clang-format off
>+
>+    // Vertices 0-5 are two triangles that form a quad filling the first "slice" of the window.
>+    // See above about slices.  Vertices 4-9 are the same two triangles.
>+    static constexpr GLfloat kQuadVertices[] = {
>+        -1, -1,
>+         1, -1,
>+        -1, -1 + kDrawSize,
>+         1, -1,
>+         1, -1 + kDrawSize,
>+        -1, -1 + kDrawSize,
>+         1, -1,
>+         1, -1,
>+        -1, -1 + kDrawSize,
>+        -1, -1,
>+    };
>+
>+    // Points 0-3 are spread across the first "slice."
>+    // Points 2-4 are the same.
>+    static constexpr GLfloat kPointVertices[] = {
>+        -0.6f, -1 + kDrawSize / 2.0,
>+        -0.2f, -1 + kDrawSize / 2.0,
>+         0.2f, -1 + kDrawSize / 2.0,
>+         0.6f, -1 + kDrawSize / 2.0,
>+        -0.2f, -1 + kDrawSize / 2.0,
>+        -0.6f, -1 + kDrawSize / 2.0,
>+    };
>+    // clang-format on
>+
>+    // Same two triangles as described above.
>+    static constexpr GLushort kQuadIndices[] = {2, 9, 7, 5, 6, 4};
>+
>+    // Same four points as described above.
>+    static constexpr GLushort kPointIndices[] = {1, 5, 3, 2};
> };
> 
>-class InstancingTestAllConfigs : public InstancingTest
>-{
>-  protected:
>-    InstancingTestAllConfigs() {}
>-};
>-
>-class InstancingTestNo9_3 : public InstancingTest
>-{
>-  protected:
>-    InstancingTestNo9_3() {}
>-};
>-
>-class InstancingTestPoints : public InstancingTest
>-{
>-  protected:
>-    InstancingTestPoints() {}
>-};
>-
>-// This test uses a vertex shader with the first attribute (attribute zero) instanced.
>-// On D3D9 and D3D11 FL9_3, this triggers a special codepath that rearranges the input layout sent
>-// to D3D, to ensure that slot/stream zero of the input layout doesn't contain per-instance data.
>-TEST_P(InstancingTestAllConfigs, AttributeZeroInstanced)
>-{
>-    const std::string vs =
>-        "attribute vec3 a_instancePos;\n"
>-        "attribute vec3 a_position;\n"
>-        "void main()\n"
>-        "{\n"
>-        "    gl_Position = vec4(a_position.xyz + a_instancePos.xyz, 1.0);\n"
>-        "}\n";
>-
>-    runDrawElementsTest(vs, true);
>-}
>-
>-// Same as AttributeZeroInstanced, but attribute zero is not instanced.
>-// This ensures the general instancing codepath (i.e. without rearranging the input layout) works as
>-// expected.
>-TEST_P(InstancingTestAllConfigs, AttributeZeroNotInstanced)
>-{
>-    const std::string vs =
>-        "attribute vec3 a_position;\n"
>-        "attribute vec3 a_instancePos;\n"
>-        "void main()\n"
>-        "{\n"
>-        "    gl_Position = vec4(a_position.xyz + a_instancePos.xyz, 1.0);\n"
>-        "}\n";
>-
>-    runDrawElementsTest(vs, false);
>-}
>-
>-// Tests that the "first" parameter to glDrawArraysInstancedANGLE is only an offset into
>-// the non-instanced vertex attributes.
>-TEST_P(InstancingTestNo9_3, DrawArraysWithOffset)
>-{
>-    const std::string vs =
>-        "attribute vec3 a_position;\n"
>-        "attribute vec3 a_instancePos;\n"
>-        "uniform vec3 u_offset;\n"
>-        "void main()\n"
>-        "{\n"
>-        "    gl_Position = vec4(a_position.xyz + a_instancePos.xyz + u_offset, 1.0);\n"
>-        "}\n";
>-
>-    setupDrawArraysTest(vs);
>-
>-    constexpr float offset1[3] = {0, 0, 0};
>-    runDrawArraysTest(0, 6, 2, offset1);
>-
>-    constexpr float offset2[3] = {0.0f, 1.0f, 0};
>-    runDrawArraysTest(6, 6, 2, offset2);
>-
>-    checkQuads();
>-}
>-
>-// This test verifies instancing with GL_POINTS with glDrawArraysInstanced works.
>-// On D3D11 FL9_3, this triggers a special codepath that emulates instanced points rendering.
>-TEST_P(InstancingTestPoints, DrawArrays)
>-{
>-    // Disable D3D11 SDK Layers warnings checks, see ANGLE issue 667 for details
>-    // On Win7, the D3D SDK Layers emits a false warning for these tests.
>-    // This doesn't occur on Windows 10 (Version 1511) though.
>-    ignoreD3D11SDKLayersWarnings();
>-
>-    setupInstancedPointsTest();
>-
>-    glBindBuffer(GL_ARRAY_BUFFER, mVertexBuffer);
>-    glBufferData(GL_ARRAY_BUFFER, mInstances.size() * sizeof(mInstances[0]), &mInstances[0],
>-                 GL_STATIC_DRAW);
>-    glBindBuffer(GL_ARRAY_BUFFER, 0);
>-
>-    // Get the attribute locations
>-    GLint positionLoc    = glGetAttribLocation(mProgram, "a_position");
>-    GLint instancePosLoc = glGetAttribLocation(mProgram, "a_instancePos");
>-
>-    // Load the vertex position
>-    constexpr GLfloat pos[3] = {0, 0, 0};
>-    glVertexAttribPointer(positionLoc, 3, GL_FLOAT, GL_FALSE, 0, pos);
>-    glEnableVertexAttribArray(positionLoc);
>-
>-    // Load the instance position
>-    glBindBuffer(GL_ARRAY_BUFFER, mVertexBuffer);
>-    glVertexAttribPointer(instancePosLoc, 3, GL_FLOAT, GL_FALSE, 0, 0);
>-    glBindBuffer(GL_ARRAY_BUFFER, 0);
>-    glEnableVertexAttribArray(instancePosLoc);
>-
>-    // Enable instancing
>-    mVertexAttribDivisorANGLE(instancePosLoc, 1);
>-
>-    // Do the instanced draw
>-    mDrawArraysInstancedANGLE(GL_POINTS, 0, 1, static_cast<GLsizei>(mInstances.size()) / 3);
>+constexpr unsigned InstancingTest::kMaxDrawn;
>+constexpr float InstancingTest::kDrawSize;
>+constexpr GLfloat InstancingTest::kQuadVertices[];
>+constexpr GLfloat InstancingTest::kPointVertices[];
>+constexpr GLushort InstancingTest::kQuadIndices[];
>+constexpr GLushort InstancingTest::kPointIndices[];
>+
>+#define TEST_INDEXED(attrib, geometry, storage, vendor)                      \
>+    TEST_P(InstancingTest, IndexedAttrib##attrib##geometry##storage##vendor) \
>+    {                                                                        \
>+        runTest(11, 2, attrib, geometry, Indexed, storage, vendor, 0);       \
>+    }
> 
>-    ASSERT_GL_NO_ERROR();
>+#define TEST_NONINDEXED(attrib, geometry, storage, vendor, offset)                              \
>+    TEST_P(InstancingTest, NonIndexedAttrib##attrib##geometry##storage##vendor##Offset##offset) \
>+    {                                                                                           \
>+        runTest(11, 2, attrib, geometry, NonIndexed, storage, vendor, offset);                  \
>+    }
> 
>-    checkQuads();
>-}
>+#define TEST_DIVISOR(numInstance, divisor)                                    \
>+    TEST_P(InstancingTest, Instances##numInstance##Divisor##divisor)          \
>+    {                                                                         \
>+        runTest(numInstance, divisor, 1, Quad, NonIndexed, Buffer, Angle, 0); \
>+    }
> 
>-// This test verifies instancing with GL_POINTS with glDrawElementsInstanced works.
>-// On D3D11 FL9_3, this triggers a special codepath that emulates instanced points rendering.
>-TEST_P(InstancingTestPoints, DrawElements)
>+// D3D9 and D3D11 FL9_3, have a special codepath that rearranges the input layout sent to D3D,
>+// to ensure that slot/stream zero of the input layout doesn't contain per-instance data, so
>+// we test with attribute 0 being instanced, as will as attribute 1 being instanced.
>+//
>+// Tests with a non-zero 'offset' check that "first" parameter to glDrawArraysInstancedANGLE is only
>+// an offset into the non-instanced vertex attributes.
>+TEST_INDEXED(0, Quad, Buffer, Angle)
>+TEST_INDEXED(0, Quad, Memory, Angle)
>+TEST_INDEXED(1, Quad, Buffer, Angle)
>+TEST_INDEXED(1, Quad, Memory, Angle)
>+TEST_INDEXED(0, Point, Buffer, Angle)
>+TEST_INDEXED(0, Point, Memory, Angle)
>+TEST_INDEXED(1, Point, Buffer, Angle)
>+TEST_INDEXED(1, Point, Memory, Angle)
>+TEST_INDEXED(0, Quad, Buffer, Ext)
>+TEST_INDEXED(0, Quad, Memory, Ext)
>+TEST_INDEXED(1, Quad, Buffer, Ext)
>+TEST_INDEXED(1, Quad, Memory, Ext)
>+TEST_INDEXED(0, Point, Buffer, Ext)
>+TEST_INDEXED(0, Point, Memory, Ext)
>+TEST_INDEXED(1, Point, Buffer, Ext)
>+TEST_INDEXED(1, Point, Memory, Ext)
>+
>+// offset should be 0 or 4 for quads
>+TEST_NONINDEXED(0, Quad, Buffer, Angle, 0)
>+TEST_NONINDEXED(0, Quad, Buffer, Angle, 4)
>+TEST_NONINDEXED(0, Quad, Memory, Angle, 0)
>+TEST_NONINDEXED(0, Quad, Memory, Angle, 4)
>+TEST_NONINDEXED(1, Quad, Buffer, Angle, 0)
>+TEST_NONINDEXED(1, Quad, Buffer, Angle, 4)
>+TEST_NONINDEXED(1, Quad, Memory, Angle, 0)
>+TEST_NONINDEXED(1, Quad, Memory, Angle, 4)
>+TEST_NONINDEXED(0, Quad, Buffer, Ext, 0)
>+TEST_NONINDEXED(0, Quad, Buffer, Ext, 4)
>+TEST_NONINDEXED(0, Quad, Memory, Ext, 0)
>+TEST_NONINDEXED(0, Quad, Memory, Ext, 4)
>+TEST_NONINDEXED(1, Quad, Buffer, Ext, 0)
>+TEST_NONINDEXED(1, Quad, Buffer, Ext, 4)
>+TEST_NONINDEXED(1, Quad, Memory, Ext, 0)
>+TEST_NONINDEXED(1, Quad, Memory, Ext, 4)
>+
>+// offset should be 0 or 2 for points
>+TEST_NONINDEXED(0, Point, Buffer, Angle, 0)
>+TEST_NONINDEXED(0, Point, Buffer, Angle, 2)
>+TEST_NONINDEXED(0, Point, Memory, Angle, 0)
>+TEST_NONINDEXED(0, Point, Memory, Angle, 2)
>+TEST_NONINDEXED(1, Point, Buffer, Angle, 0)
>+TEST_NONINDEXED(1, Point, Buffer, Angle, 2)
>+TEST_NONINDEXED(1, Point, Memory, Angle, 0)
>+TEST_NONINDEXED(1, Point, Memory, Angle, 2)
>+TEST_NONINDEXED(0, Point, Buffer, Ext, 0)
>+TEST_NONINDEXED(0, Point, Buffer, Ext, 2)
>+TEST_NONINDEXED(0, Point, Memory, Ext, 0)
>+TEST_NONINDEXED(0, Point, Memory, Ext, 2)
>+TEST_NONINDEXED(1, Point, Buffer, Ext, 0)
>+TEST_NONINDEXED(1, Point, Buffer, Ext, 2)
>+TEST_NONINDEXED(1, Point, Memory, Ext, 0)
>+TEST_NONINDEXED(1, Point, Memory, Ext, 2)
>+
>+// The following tests produce each value of 'lastDrawn' in runTest() from 1 to kMaxDrawn, a few
>+// different ways.
>+TEST_DIVISOR(1, 1)
>+TEST_DIVISOR(1, 2)
>+TEST_DIVISOR(2, 1)
>+TEST_DIVISOR(3, 1)
>+TEST_DIVISOR(3, 2)
>+TEST_DIVISOR(4, 1)
>+TEST_DIVISOR(5, 1)
>+TEST_DIVISOR(5, 2)
>+TEST_DIVISOR(6, 1)
>+TEST_DIVISOR(6, 2)
>+TEST_DIVISOR(7, 1)
>+TEST_DIVISOR(7, 2)
>+TEST_DIVISOR(8, 1)
>+TEST_DIVISOR(8, 2)
>+TEST_DIVISOR(8, 4)
>+TEST_DIVISOR(9, 1)
>+TEST_DIVISOR(9, 2)
>+TEST_DIVISOR(10, 1)
>+TEST_DIVISOR(11, 1)
>+TEST_DIVISOR(11, 2)
>+TEST_DIVISOR(12, 1)
>+TEST_DIVISOR(12, 11)
>+TEST_DIVISOR(13, 1)
>+TEST_DIVISOR(13, 2)
>+TEST_DIVISOR(14, 1)
>+TEST_DIVISOR(15, 1)
>+TEST_DIVISOR(15, 2)
>+TEST_DIVISOR(16, 1)
>+TEST_DIVISOR(16, 3)
>+TEST_DIVISOR(16, 7)
>+TEST_DIVISOR(17, 2)
>+TEST_DIVISOR(20, 2)
>+TEST_DIVISOR(21, 2)
>+TEST_DIVISOR(23, 2)
>+TEST_DIVISOR(25, 5)
>+TEST_DIVISOR(25, 33)
>+TEST_DIVISOR(26, 2)
>+TEST_DIVISOR(26, 3)
>+TEST_DIVISOR(27, 2)
>+TEST_DIVISOR(27, 4)
>+TEST_DIVISOR(28, 3)
>+TEST_DIVISOR(29, 2)
>+TEST_DIVISOR(29, 11)
>+TEST_DIVISOR(30, 4)
>+TEST_DIVISOR(31, 6)
>+TEST_DIVISOR(32, 2)
>+TEST_DIVISOR(32, 3)
>+TEST_DIVISOR(32, 8)
>+TEST_DIVISOR(34, 3)
>+TEST_DIVISOR(34, 30)
>+
>+class InstancingTestES3 : public InstancingTest
> {
>-    // Disable D3D11 SDK Layers warnings checks, see ANGLE issue 667 for details
>-    // On Win7, the D3D SDK Layers emits a false warning for these tests.
>-    // This doesn't occur on Windows 10 (Version 1511) though.
>-    ignoreD3D11SDKLayersWarnings();
>-
>-    setupInstancedPointsTest();
>-
>-    glBindBuffer(GL_ARRAY_BUFFER, mVertexBuffer);
>-    glBufferData(GL_ARRAY_BUFFER, mInstances.size() * sizeof(mInstances[0]), &mInstances[0],
>-                 GL_STATIC_DRAW);
>-    glBindBuffer(GL_ARRAY_BUFFER, 0);
>-
>-    // Get the attribute locations
>-    GLint positionLoc    = glGetAttribLocation(mProgram, "a_position");
>-    GLint instancePosLoc = glGetAttribLocation(mProgram, "a_instancePos");
>-
>-    // Load the vertex position
>-    const Vector3 pos[] = {Vector3(0), Vector3(0), Vector3(0), Vector3(0)};
>-    glVertexAttribPointer(positionLoc, 3, GL_FLOAT, GL_FALSE, 0, pos);
>-    glEnableVertexAttribArray(positionLoc);
>-
>-    // Load the instance position
>-    glBindBuffer(GL_ARRAY_BUFFER, mVertexBuffer);
>-    glVertexAttribPointer(instancePosLoc, 3, GL_FLOAT, GL_FALSE, 0, 0);
>-    glBindBuffer(GL_ARRAY_BUFFER, 0);
>-    glEnableVertexAttribArray(instancePosLoc);
>-
>-    // Enable instancing
>-    mVertexAttribDivisorANGLE(instancePosLoc, 1);
>-
>-    // Do the instanced draw
>-    mDrawElementsInstancedANGLE(GL_POINTS, static_cast<GLsizei>(mIndices.size()), GL_UNSIGNED_SHORT,
>-                                mIndices.data(), static_cast<GLsizei>(mInstances.size()) / 3);
>-
>-    ASSERT_GL_NO_ERROR();
>-
>-    checkQuads();
>-}
>+  public:
>+    InstancingTestES3() {}
>+};
> 
> class InstancingTestES31 : public InstancingTest
> {
>@@ -455,29 +403,13 @@ class InstancingTestES31 : public InstancingTest
> // Verify that VertexAttribDivisor can update both binding divisor and attribBinding.
> TEST_P(InstancingTestES31, UpdateAttribBindingByVertexAttribDivisor)
> {
>-    const std::string vs =
>-        "attribute vec3 a_instancePos;\n"
>-        "attribute vec3 a_position;\n"
>-        "void main()\n"
>-        "{\n"
>-        "    gl_Position = vec4(a_position.xyz + a_instancePos.xyz, 1.0);\n"
>-        "}\n";
>-
>-    const std::string fs =
>-        "precision mediump float;\n"
>-        "void main()\n"
>-        "{\n"
>-        "    gl_FragColor = vec4(1.0, 0, 0, 1.0);\n"
>-        "}\n";
>-
>-    constexpr GLsizei kFloatStride = 4;
>-
>-    ANGLE_GL_PROGRAM(program, vs, fs);
>-    glUseProgram(program);
>+    ANGLE_SKIP_TEST_IF(!IsGLExtensionEnabled("GL_ANGLE_instanced_arrays"));
>+
>+    glUseProgram(mProgram[0]);
> 
>     // Get the attribute locations
>-    GLint positionLoc    = glGetAttribLocation(program, "a_position");
>-    GLint instancePosLoc = glGetAttribLocation(program, "a_instancePos");
>+    GLint positionLoc    = glGetAttribLocation(mProgram[0], "a_position");
>+    GLint instancePosLoc = glGetAttribLocation(mProgram[0], "a_instance");
>     ASSERT_NE(-1, positionLoc);
>     ASSERT_NE(-1, instancePosLoc);
>     ASSERT_GL_NO_ERROR();
>@@ -488,16 +420,18 @@ TEST_P(InstancingTestES31, UpdateAttribBindingByVertexAttribDivisor)
> 
>     GLBuffer quadBuffer;
>     glBindBuffer(GL_ARRAY_BUFFER, quadBuffer);
>-    glBufferData(GL_ARRAY_BUFFER, mQuadVertices.size() * kFloatStride, mQuadVertices.data(),
>-                 GL_STATIC_DRAW);
>-    GLBuffer instancesBuffer;
>-    glBindBuffer(GL_ARRAY_BUFFER, instancesBuffer);
>-    glBufferData(GL_ARRAY_BUFFER, mInstances.size() * kFloatStride, mInstances.data(),
>-                 GL_STATIC_DRAW);
>+    glBufferData(GL_ARRAY_BUFFER, sizeof(kQuadVertices), kQuadVertices, GL_STATIC_DRAW);
>+
>+    const unsigned numInstance = 4;
>+    const unsigned divisor     = 1;
>+    const unsigned lastDrawn   = (numInstance - 1) / divisor;
>+
>+    // Ensure the numInstance and divisor parameters are valid.
>+    ASSERT_TRUE(lastDrawn < kMaxDrawn);
> 
>     // Set the formats by VertexAttribFormat
>-    glVertexAttribFormat(positionLoc, 3, GL_FLOAT, GL_FALSE, 0);
>-    glVertexAttribFormat(instancePosLoc, 3, GL_FLOAT, GL_FALSE, 0);
>+    glVertexAttribFormat(positionLoc, 2, GL_FLOAT, GL_FALSE, 0);
>+    glVertexAttribFormat(instancePosLoc, 1, GL_FLOAT, GL_FALSE, 0);
>     glEnableVertexAttribArray(positionLoc);
>     glEnableVertexAttribArray(instancePosLoc);
> 
>@@ -506,8 +440,8 @@ TEST_P(InstancingTestES31, UpdateAttribBindingByVertexAttribDivisor)
> 
>     // Load the vertex position into the binding indexed positionBinding (== instancePosLoc)
>     // Load the instance position into the binding indexed instanceBinding (== positionLoc)
>-    glBindVertexBuffer(positionBinding, quadBuffer, 0, kFloatStride * 3);
>-    glBindVertexBuffer(instanceBinding, instancesBuffer, 0, kFloatStride * 3);
>+    glBindVertexBuffer(positionBinding, quadBuffer, 0, 2 * sizeof(kQuadVertices[0]));
>+    glBindVertexBuffer(instanceBinding, mInstanceBuffer, 0, sizeof(mInstanceData[0]));
> 
>     // The attribute indexed positionLoc is using the binding indexed positionBinding
>     // The attribute indexed instancePosLoc is using the binding indexed instanceBinding
>@@ -515,48 +449,158 @@ TEST_P(InstancingTestES31, UpdateAttribBindingByVertexAttribDivisor)
>     glVertexAttribBinding(instancePosLoc, instanceBinding);
> 
>     // Enable instancing on the binding indexed instanceBinding
>-    glVertexBindingDivisor(instanceBinding, 1);
>+    glVertexBindingDivisor(instanceBinding, divisor);
> 
>     // Do the first instanced draw
>-    glDrawElementsInstanced(GL_TRIANGLES, static_cast<GLsizei>(mIndices.size()), GL_UNSIGNED_SHORT,
>-                            mIndices.data(), static_cast<GLsizei>(mInstances.size()) / 3);
>-    checkQuads();
>+    glClear(GL_COLOR_BUFFER_BIT);
>+    glDrawElementsInstanced(GL_TRIANGLES, ArraySize(kQuadIndices), GL_UNSIGNED_SHORT, kQuadIndices,
>+                            numInstance);
>+    checkDrawing(lastDrawn);
>+
>+    // Disable instancing.
>+    glVertexBindingDivisor(instanceBinding, 0);
> 
>     // Load the vertex position into the binding indexed positionLoc.
>     // Load the instance position into the binding indexed instancePosLoc.
>-    glBindVertexBuffer(positionLoc, quadBuffer, 0, kFloatStride * 3);
>-    glBindVertexBuffer(instancePosLoc, instancesBuffer, 0, kFloatStride * 3);
>+    glBindVertexBuffer(positionLoc, quadBuffer, 0, 2 * sizeof(kQuadVertices[0]));
>+    glBindVertexBuffer(instancePosLoc, mInstanceBuffer, 0, sizeof(mInstanceData[0]));
> 
>     // The attribute indexed positionLoc is using the binding indexed positionLoc.
>     glVertexAttribBinding(positionLoc, positionLoc);
> 
>     // Call VertexAttribDivisor to both enable instancing on instancePosLoc and set the attribute
>     // indexed instancePosLoc using the binding indexed instancePosLoc.
>-    glVertexAttribDivisor(instancePosLoc, 1);
>+    glVertexAttribDivisor(instancePosLoc, divisor);
> 
>     // Do the second instanced draw
>-    glDrawElementsInstanced(GL_TRIANGLES, static_cast<GLsizei>(mIndices.size()), GL_UNSIGNED_SHORT,
>-                            mIndices.data(), static_cast<GLsizei>(mInstances.size()) / 3);
>-    checkQuads();
>+    glClear(GL_COLOR_BUFFER_BIT);
>+    glDrawElementsInstanced(GL_TRIANGLES, ArraySize(kQuadIndices), GL_UNSIGNED_SHORT, kQuadIndices,
>+                            numInstance);
>+    checkDrawing(lastDrawn);
> 
>     glDeleteVertexArrays(1, &vao);
> }
> 
>-// Use this to select which configurations (e.g. which renderer, which GLES major version) these
>-// tests should be run against. We test on D3D9 and D3D11 9_3 because they use special codepaths
>-// when attribute zero is instanced, unlike D3D11.
>-ANGLE_INSTANTIATE_TEST(InstancingTestAllConfigs,
>+// Verify that a large divisor that also changes doesn't cause issues and renders correctly.
>+TEST_P(InstancingTestES3, LargeDivisor)
>+{
>+    constexpr char kVS[] = R"(#version 300 es
>+layout(location = 0) in vec4 a_position;
>+layout(location = 1) in vec4 a_color;
>+out vec4 v_color;
>+void main()
>+{
>+    gl_Position = a_position;
>+    gl_PointSize = 4.0f;
>+    v_color = a_color;
>+})";
>+
>+    constexpr char kFS[] = R"(#version 300 es
>+precision highp float;
>+in vec4 v_color;
>+out vec4 my_FragColor;
>+void main()
>+{
>+    my_FragColor = v_color;
>+})";
>+
>+    ANGLE_GL_PROGRAM(program, kVS, kFS);
>+    glUseProgram(program);
>+
>+    glClearColor(0.0f, 0.0f, 1.0f, 1.0f);
>+
>+    GLBuffer buf;
>+    glBindBuffer(GL_ARRAY_BUFFER, buf);
>+    std::vector<GLfloat> vertices;
>+    for (size_t i = 0u; i < 4u; ++i)
>+    {
>+        vertices.push_back(0.0f + i * 0.25f);
>+        vertices.push_back(0.0f);
>+        vertices.push_back(0.0f);
>+        vertices.push_back(1.0f);
>+    }
>+    glBufferData(GL_ARRAY_BUFFER, vertices.size() * 4u, vertices.data(), GL_DYNAMIC_DRAW);
>+
>+    glEnableVertexAttribArray(0);
>+    glVertexAttribPointer(0, 4, GL_FLOAT, false, 0, nullptr);
>+    ASSERT_GL_NO_ERROR();
>+
>+    GLBuffer colorBuf;
>+    glBindBuffer(GL_ARRAY_BUFFER, colorBuf);
>+
>+    std::array<GLColor, 4> ubyteColors = {GLColor::red, GLColor::green};
>+    std::vector<float> floatColors;
>+    for (const GLColor &color : ubyteColors)
>+    {
>+        floatColors.push_back(color.R / 255.0f);
>+        floatColors.push_back(color.G / 255.0f);
>+        floatColors.push_back(color.B / 255.0f);
>+        floatColors.push_back(color.A / 255.0f);
>+    }
>+    glBufferData(GL_ARRAY_BUFFER, floatColors.size() * 4u, floatColors.data(), GL_DYNAMIC_DRAW);
>+
>+    const GLuint kColorDivisor = 65536u * 2u;
>+    glEnableVertexAttribArray(1);
>+    glVertexAttribPointer(1, 4, GL_FLOAT, false, 0, nullptr);
>+    glVertexAttribDivisor(1, kColorDivisor);
>+
>+    std::array<GLuint, 1u> indices       = {0u};
>+    std::array<GLuint, 3u> divisorsToTry = {256u, 65536u, 65536u * 2u};
>+
>+    for (GLuint divisorToTry : divisorsToTry)
>+    {
>+        glClear(GL_COLOR_BUFFER_BIT);
>+        glVertexAttribDivisor(0, divisorToTry);
>+
>+        GLuint instanceCount        = divisorToTry + 1u;
>+        unsigned int pointsRendered = (instanceCount - 1u) / divisorToTry + 1u;
>+
>+        glDrawElementsInstanced(GL_POINTS, indices.size(), GL_UNSIGNED_INT, indices.data(),
>+                                instanceCount);
>+        ASSERT_GL_NO_ERROR();
>+
>+        // Check that the intended number of points has been rendered.
>+        for (unsigned int pointIndex = 0u; pointIndex < pointsRendered + 1u; ++pointIndex)
>+        {
>+            GLint pointx = static_cast<GLint>((pointIndex * 0.125f + 0.5f) * getWindowWidth());
>+            GLint pointy = static_cast<GLint>(0.5f * getWindowHeight());
>+
>+            if (pointIndex < pointsRendered)
>+            {
>+                GLuint pointColorIndex = (pointIndex * divisorToTry) / kColorDivisor;
>+                EXPECT_PIXEL_COLOR_EQ(pointx, pointy, ubyteColors[pointColorIndex]);
>+            }
>+            else
>+            {
>+                // Clear color.
>+                EXPECT_PIXEL_COLOR_EQ(pointx, pointy, GLColor::blue);
>+            }
>+        }
>+    }
>+}
>+
>+// This is a regression test. If VertexAttribDivisor was returned as a signed integer, it would be
>+// incorrectly clamped down to the maximum signed integer.
>+TEST_P(InstancingTestES3, LargestDivisor)
>+{
>+    constexpr GLuint kLargeDivisor = std::numeric_limits<GLuint>::max();
>+    glVertexAttribDivisor(0, kLargeDivisor);
>+
>+    GLuint divisor = 0;
>+    glGetVertexAttribIuiv(0, GL_VERTEX_ATTRIB_ARRAY_DIVISOR, &divisor);
>+    EXPECT_EQ(kLargeDivisor, divisor)
>+        << "Vertex attrib divisor read was not the same that was passed in.";
>+}
>+
>+ANGLE_INSTANTIATE_TEST(InstancingTestES3, ES3_OPENGL(), ES3_OPENGLES(), ES3_D3D11());
>+
>+ANGLE_INSTANTIATE_TEST(InstancingTestES31, ES31_OPENGL(), ES31_OPENGLES(), ES31_D3D11());
>+
>+ANGLE_INSTANTIATE_TEST(InstancingTest,
>                        ES2_D3D9(),
>                        ES2_D3D11(),
>                        ES2_D3D11_FL9_3(),
>+                       ES2_OPENGL(3, 0),
>                        ES2_OPENGL(),
>-                       ES2_OPENGLES());
>-
>-// TODO(jmadill): Figure out the situation with DrawInstanced on FL 9_3
>-ANGLE_INSTANTIATE_TEST(InstancingTestNo9_3, ES2_D3D9(), ES2_D3D11());
>-
>-ANGLE_INSTANTIATE_TEST(InstancingTestPoints, ES2_D3D11(), ES2_D3D11_FL9_3());
>-
>-// TODO(jiawei.shao@intel.com): Add D3D11 when Vertex Attrib Binding is supported on D3D11
>-// back-ends.
>-ANGLE_INSTANTIATE_TEST(InstancingTestES31, ES31_OPENGL(), ES31_OPENGLES());
>+                       ES2_OPENGLES(),
>+                       ES2_VULKAN());
>diff --git a/Source/ThirdParty/ANGLE/src/tests/gl_tests/LineLoopTest.cpp b/Source/ThirdParty/ANGLE/src/tests/gl_tests/LineLoopTest.cpp
>index 4566a37d204..4b27ac6d6f2 100644
>--- a/Source/ThirdParty/ANGLE/src/tests/gl_tests/LineLoopTest.cpp
>+++ b/Source/ThirdParty/ANGLE/src/tests/gl_tests/LineLoopTest.cpp
>@@ -6,6 +6,8 @@
> 
> #include "test_utils/ANGLETest.h"
> 
>+#include "test_utils/gl_raii.h"
>+
> using namespace angle;
> 
> class LineLoopTest : public ANGLETest
>@@ -25,28 +27,14 @@ class LineLoopTest : public ANGLETest
>     {
>         ANGLETest::SetUp();
> 
>-        const std::string vsSource =
>-            R"(attribute highp vec4 position;
>-            void main(void)
>-            {
>-                gl_Position = position;
>-            })";
>-
>-        const std::string fsSource =
>-            R"(uniform highp vec4 color;
>-            void main(void)
>-            {
>-                gl_FragColor = color;
>-            })";
>-
>-        mProgram = CompileProgram(vsSource, fsSource);
>+        mProgram = CompileProgram(essl1_shaders::vs::Simple(), essl1_shaders::fs::UniformColor());
>         if (mProgram == 0)
>         {
>             FAIL() << "shader compilation failed.";
>         }
> 
>-        mPositionLocation = glGetAttribLocation(mProgram, "position");
>-        mColorLocation    = glGetUniformLocation(mProgram, "color");
>+        mPositionLocation = glGetAttribLocation(mProgram, essl1_shaders::PositionAttrib());
>+        mColorLocation    = glGetUniformLocation(mProgram, essl1_shaders::ColorUniform());
> 
>         glBlendFunc(GL_ONE, GL_ONE);
>         glEnable(GL_BLEND);
>@@ -72,7 +60,7 @@ class LineLoopTest : public ANGLETest
> 
>         static const GLfloat stripPositions[] = {-0.5f, -0.5f, -0.5f, 0.5f,
>                                                  0.5f,  0.5f,  0.5f,  -0.5f};
>-        static const GLubyte stripIndices[] = {1, 0, 3, 2, 1};
>+        static const GLubyte stripIndices[]   = {1, 0, 3, 2, 1};
> 
>         glUseProgram(mProgram);
>         glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, indexBuffer);
>@@ -132,7 +120,7 @@ TEST_P(LineLoopTest, LineLoopUShortIndices)
> 
> TEST_P(LineLoopTest, LineLoopUIntIndices)
> {
>-    if (!extensionEnabled("GL_OES_element_index_uint"))
>+    if (!IsGLExtensionEnabled("GL_OES_element_index_uint"))
>     {
>         return;
>     }
>@@ -180,7 +168,7 @@ TEST_P(LineLoopTest, LineLoopUShortIndexBuffer)
> 
> TEST_P(LineLoopTest, LineLoopUIntIndexBuffer)
> {
>-    if (!extensionEnabled("GL_OES_element_index_uint"))
>+    if (!IsGLExtensionEnabled("GL_OES_element_index_uint"))
>     {
>         return;
>     }
>@@ -200,6 +188,27 @@ TEST_P(LineLoopTest, LineLoopUIntIndexBuffer)
>     glDeleteBuffers(1, &buf);
> }
> 
>+// Tests an edge case with a very large line loop element count.
>+// Disabled because it is slow and triggers an internal error.
>+TEST_P(LineLoopTest, DISABLED_DrawArraysWithLargeCount)
>+{
>+    constexpr char kVS[] = "void main() { gl_Position = vec4(0); }";
>+    constexpr char kFS[] = "void main() { gl_FragColor = vec4(0, 1, 0, 1); }";
>+
>+    ANGLE_GL_PROGRAM(program, kVS, kFS);
>+    glUseProgram(program);
>+    glDrawArrays(GL_LINE_LOOP, 0, 0x3FFFFFFE);
>+    EXPECT_GL_ERROR(GL_OUT_OF_MEMORY);
>+
>+    glDrawArrays(GL_LINE_LOOP, 0, 0x1FFFFFFE);
>+    EXPECT_GL_NO_ERROR();
>+}
>+
> // Use this to select which configurations (e.g. which renderer, which GLES major version) these
> // tests should be run against.
>-ANGLE_INSTANTIATE_TEST(LineLoopTest, ES2_D3D9(), ES2_D3D11(), ES2_OPENGL(), ES2_OPENGLES());
>+ANGLE_INSTANTIATE_TEST(LineLoopTest,
>+                       ES2_D3D9(),
>+                       ES2_D3D11(),
>+                       ES2_OPENGL(),
>+                       ES2_OPENGLES(),
>+                       ES2_VULKAN());
>diff --git a/Source/ThirdParty/ANGLE/src/tests/gl_tests/LinkAndRelinkTest.cpp b/Source/ThirdParty/ANGLE/src/tests/gl_tests/LinkAndRelinkTest.cpp
>new file mode 100644
>index 00000000000..11d645d1692
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/tests/gl_tests/LinkAndRelinkTest.cpp
>@@ -0,0 +1,418 @@
>+//
>+// Copyright 2017 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// LinkAndRelinkFailureTest:
>+//   Link and relink failure tests for rendering pipeline and compute pipeline.
>+
>+#include <vector>
>+#include "test_utils/ANGLETest.h"
>+#include "test_utils/gl_raii.h"
>+
>+using namespace angle;
>+
>+namespace
>+{
>+
>+class LinkAndRelinkTest : public ANGLETest
>+{
>+  protected:
>+    LinkAndRelinkTest() {}
>+};
>+
>+class LinkAndRelinkTestES31 : public ANGLETest
>+{
>+  protected:
>+    LinkAndRelinkTestES31() {}
>+};
>+
>+// When a program link or relink fails, if you try to install the unsuccessfully
>+// linked program (via UseProgram) and start rendering or dispatch compute,
>+// We can not always report INVALID_OPERATION for rendering/compute pipeline.
>+// The result depends on the previous state: Whether a valid program is
>+// installed in current GL state before the link.
>+// If a program successfully relinks when it is in use, the program might
>+// change from a rendering program to a compute program in theory,
>+// or vice versa.
>+
>+// When program link fails and no valid rendering program is installed in the GL
>+// state before the link, it should report an error for UseProgram and
>+// DrawArrays/DrawElements.
>+TEST_P(LinkAndRelinkTest, RenderingProgramFailsWithoutProgramInstalled)
>+{
>+    glUseProgram(0);
>+    GLuint program = glCreateProgram();
>+
>+    glLinkProgram(program);
>+    GLint linkStatus;
>+    glGetProgramiv(program, GL_LINK_STATUS, &linkStatus);
>+    EXPECT_GL_FALSE(linkStatus);
>+
>+    glUseProgram(program);
>+    EXPECT_GL_ERROR(GL_INVALID_OPERATION);
>+
>+    glDrawArrays(GL_POINTS, 0, 1);
>+    EXPECT_GL_ERROR(GL_INVALID_OPERATION);
>+}
>+
>+// When program link or relink fails and a valid rendering program is installed
>+// in the GL state before the link, using the failed program via UseProgram
>+// should report an error, but starting rendering should succeed.
>+// However, dispatching compute always fails.
>+TEST_P(LinkAndRelinkTest, RenderingProgramFailsWithProgramInstalled)
>+{
>+    // Install a render program in current GL state via UseProgram, then render.
>+    // It should succeed.
>+    constexpr char kVS[] = "void main() {}";
>+    constexpr char kFS[] = "void main() {}";
>+
>+    GLuint program = glCreateProgram();
>+
>+    GLuint vs = CompileShader(GL_VERTEX_SHADER, kVS);
>+    GLuint fs = CompileShader(GL_FRAGMENT_SHADER, kFS);
>+
>+    EXPECT_NE(0u, vs);
>+    EXPECT_NE(0u, fs);
>+
>+    glAttachShader(program, vs);
>+    glDeleteShader(vs);
>+
>+    glAttachShader(program, fs);
>+    glDeleteShader(fs);
>+
>+    glLinkProgram(program);
>+
>+    GLint linkStatus;
>+    glGetProgramiv(program, GL_LINK_STATUS, &linkStatus);
>+    EXPECT_GL_TRUE(linkStatus);
>+
>+    EXPECT_GL_NO_ERROR();
>+
>+    glUseProgram(program);
>+    EXPECT_GL_NO_ERROR();
>+    glDrawArrays(GL_POINTS, 0, 1);
>+    EXPECT_GL_NO_ERROR();
>+
>+    glDispatchCompute(8, 4, 2);
>+    EXPECT_GL_ERROR(GL_INVALID_OPERATION);
>+
>+    // Link failure, and a valid program has been installed in the GL state.
>+    GLuint programNull = glCreateProgram();
>+
>+    glLinkProgram(programNull);
>+    glGetProgramiv(programNull, GL_LINK_STATUS, &linkStatus);
>+    EXPECT_GL_FALSE(linkStatus);
>+
>+    // Starting rendering should succeed.
>+    glDrawArrays(GL_POINTS, 0, 1);
>+    EXPECT_GL_NO_ERROR();
>+
>+    glDispatchCompute(8, 4, 2);
>+    EXPECT_GL_ERROR(GL_INVALID_OPERATION);
>+
>+    // Using the unsuccessfully linked program should report an error.
>+    glUseProgram(programNull);
>+    EXPECT_GL_ERROR(GL_INVALID_OPERATION);
>+
>+    // Using the unsuccessfully linked program, that program should not
>+    // replace the program binary residing in the GL state. It will not make
>+    // the installed program invalid either, like what UseProgram(0) can do.
>+    // So, starting rendering should succeed.
>+    glDrawArrays(GL_POINTS, 0, 1);
>+    EXPECT_GL_NO_ERROR();
>+
>+    glDispatchCompute(8, 4, 2);
>+    EXPECT_GL_ERROR(GL_INVALID_OPERATION);
>+
>+    // We try to relink the installed program, but make it fail.
>+
>+    // No vertex shader, relink fails.
>+    glDetachShader(program, vs);
>+    glLinkProgram(program);
>+    glGetProgramiv(program, GL_LINK_STATUS, &linkStatus);
>+    EXPECT_GL_FALSE(linkStatus);
>+    EXPECT_GL_NO_ERROR();
>+
>+    // Starting rendering should succeed.
>+    glDrawArrays(GL_POINTS, 0, 1);
>+    EXPECT_GL_NO_ERROR();
>+
>+    glDispatchCompute(8, 4, 2);
>+    EXPECT_GL_ERROR(GL_INVALID_OPERATION);
>+
>+    // Using the unsuccessfully relinked program should report an error.
>+    glUseProgram(program);
>+    EXPECT_GL_ERROR(GL_INVALID_OPERATION);
>+
>+    // Using the unsuccessfully relinked program, that program should not
>+    // replace the program binary residing in the GL state. It will not make
>+    // the installed program invalid either, like what UseProgram(0) can do.
>+    // So, starting rendering should succeed.
>+    glDrawArrays(GL_POINTS, 0, 1);
>+    EXPECT_GL_NO_ERROR();
>+
>+    glDispatchCompute(8, 4, 2);
>+    EXPECT_GL_ERROR(GL_INVALID_OPERATION);
>+}
>+
>+// When program link fails and no valid compute program is installed in the GL
>+// state before the link, it should report an error for UseProgram and
>+// DispatchCompute.
>+TEST_P(LinkAndRelinkTestES31, ComputeProgramFailsWithoutProgramInstalled)
>+{
>+    glUseProgram(0);
>+    GLuint program = glCreateProgram();
>+
>+    glLinkProgram(program);
>+    GLint linkStatus;
>+    glGetProgramiv(program, GL_LINK_STATUS, &linkStatus);
>+    EXPECT_GL_FALSE(linkStatus);
>+
>+    glUseProgram(program);
>+    EXPECT_GL_ERROR(GL_INVALID_OPERATION);
>+
>+    glDispatchCompute(8, 4, 2);
>+    EXPECT_GL_ERROR(GL_INVALID_OPERATION);
>+}
>+
>+// When program link or relink fails and a valid compute program is installed in
>+// the GL state before the link, using the failed program via UseProgram should
>+// report an error, but dispatching compute should succeed.
>+// However, starting rendering always fails.
>+TEST_P(LinkAndRelinkTestES31, ComputeProgramFailsWithProgramInstalled)
>+{
>+    // Install a compute program in the GL state via UseProgram, then dispatch
>+    // compute. It should succeed.
>+    constexpr char kCS[] =
>+        R"(#version 310 es
>+        layout(local_size_x=1) in;
>+        void main()
>+        {
>+        })";
>+
>+    GLuint program = glCreateProgram();
>+
>+    GLuint cs = CompileShader(GL_COMPUTE_SHADER, kCS);
>+    EXPECT_NE(0u, cs);
>+
>+    glAttachShader(program, cs);
>+    glDeleteShader(cs);
>+
>+    glLinkProgram(program);
>+    GLint linkStatus;
>+    glGetProgramiv(program, GL_LINK_STATUS, &linkStatus);
>+    EXPECT_GL_TRUE(linkStatus);
>+
>+    EXPECT_GL_NO_ERROR();
>+
>+    glUseProgram(program);
>+    EXPECT_GL_NO_ERROR();
>+    glDispatchCompute(8, 4, 2);
>+    EXPECT_GL_NO_ERROR();
>+
>+    glDrawArrays(GL_POINTS, 0, 1);
>+    EXPECT_GL_ERROR(GL_INVALID_OPERATION);
>+
>+    // Link failure, and a valid program has been installed in the GL state.
>+    GLuint programNull = glCreateProgram();
>+
>+    glLinkProgram(programNull);
>+    glGetProgramiv(programNull, GL_LINK_STATUS, &linkStatus);
>+    EXPECT_GL_FALSE(linkStatus);
>+
>+    // Dispatching compute should succeed.
>+    glDispatchCompute(8, 4, 2);
>+    EXPECT_GL_NO_ERROR();
>+
>+    glDrawArrays(GL_POINTS, 0, 1);
>+    EXPECT_GL_ERROR(GL_INVALID_OPERATION);
>+
>+    // Using the unsuccessfully linked program should report an error.
>+    glUseProgram(programNull);
>+    EXPECT_GL_ERROR(GL_INVALID_OPERATION);
>+
>+    // Using the unsuccessfully linked program, that program should not
>+    // replace the program binary residing in the GL state. It will not make
>+    // the installed program invalid either, like what UseProgram(0) can do.
>+    // So, dispatching compute should succeed.
>+    glDispatchCompute(8, 4, 2);
>+    EXPECT_GL_NO_ERROR();
>+
>+    glDrawArrays(GL_POINTS, 0, 1);
>+    EXPECT_GL_ERROR(GL_INVALID_OPERATION);
>+
>+    // We try to relink the installed program, but make it fail.
>+
>+    // No compute shader, relink fails.
>+    glDetachShader(program, cs);
>+    glLinkProgram(program);
>+    glGetProgramiv(program, GL_LINK_STATUS, &linkStatus);
>+    EXPECT_GL_FALSE(linkStatus);
>+    EXPECT_GL_NO_ERROR();
>+
>+    // Dispatching compute should succeed.
>+    glDispatchCompute(8, 4, 2);
>+    EXPECT_GL_NO_ERROR();
>+
>+    glDrawArrays(GL_POINTS, 0, 1);
>+    EXPECT_GL_ERROR(GL_INVALID_OPERATION);
>+
>+    // Using the unsuccessfully relinked program should report an error.
>+    glUseProgram(program);
>+    EXPECT_GL_ERROR(GL_INVALID_OPERATION);
>+
>+    // Using the unsuccessfully relinked program, that program should not
>+    // replace the program binary residing in the GL state. It will not make
>+    // the installed program invalid either, like what UseProgram(0) can do.
>+    // So, dispatching compute should succeed.
>+    glDispatchCompute(8, 4, 2);
>+    EXPECT_GL_NO_ERROR();
>+
>+    glDrawArrays(GL_POINTS, 0, 1);
>+    EXPECT_GL_ERROR(GL_INVALID_OPERATION);
>+}
>+
>+// If you compile and link a compute program successfully and use the program,
>+// then dispatching compute can succeed, while starting rendering will fail.
>+// If you relink the compute program to a rendering program when it is in use,
>+// then dispatching compute will fail, but starting rendering can succeed.
>+TEST_P(LinkAndRelinkTestES31, RelinkProgramSucceedsFromComputeToRendering)
>+{
>+    constexpr char kCS[] = R"(#version 310 es
>+layout(local_size_x=1) in;
>+void main()
>+{
>+})";
>+
>+    GLuint program = glCreateProgram();
>+
>+    GLuint cs = CompileShader(GL_COMPUTE_SHADER, kCS);
>+    EXPECT_NE(0u, cs);
>+
>+    glAttachShader(program, cs);
>+    glDeleteShader(cs);
>+
>+    glLinkProgram(program);
>+    glDetachShader(program, cs);
>+    GLint linkStatus;
>+    glGetProgramiv(program, GL_LINK_STATUS, &linkStatus);
>+    EXPECT_GL_TRUE(linkStatus);
>+
>+    EXPECT_GL_NO_ERROR();
>+
>+    glUseProgram(program);
>+    EXPECT_GL_NO_ERROR();
>+    glDispatchCompute(8, 4, 2);
>+    EXPECT_GL_NO_ERROR();
>+
>+    glDrawArrays(GL_POINTS, 0, 1);
>+    EXPECT_GL_ERROR(GL_INVALID_OPERATION);
>+
>+    constexpr char kVS[] = "void main() {}";
>+    constexpr char kFS[] = "void main() {}";
>+
>+    GLuint vs = CompileShader(GL_VERTEX_SHADER, kVS);
>+    GLuint fs = CompileShader(GL_FRAGMENT_SHADER, kFS);
>+    EXPECT_NE(0u, vs);
>+    EXPECT_NE(0u, fs);
>+
>+    glAttachShader(program, vs);
>+    glDeleteShader(vs);
>+
>+    glAttachShader(program, fs);
>+    glDeleteShader(fs);
>+
>+    glLinkProgram(program);
>+    glDetachShader(program, vs);
>+    glDetachShader(program, fs);
>+    glGetProgramiv(program, GL_LINK_STATUS, &linkStatus);
>+    EXPECT_GL_TRUE(linkStatus);
>+
>+    EXPECT_GL_NO_ERROR();
>+
>+    glDrawArrays(GL_POINTS, 0, 1);
>+    EXPECT_GL_NO_ERROR();
>+
>+    glDispatchCompute(8, 4, 2);
>+    EXPECT_GL_ERROR(GL_INVALID_OPERATION);
>+}
>+
>+// If you compile and link a rendering program successfully and use the program,
>+// then starting rendering can succeed, while dispatching compute will fail.
>+// If you relink the rendering program to a compute program when it is in use,
>+// then starting rendering will fail, but dispatching compute can succeed.
>+TEST_P(LinkAndRelinkTestES31, RelinkProgramSucceedsFromRenderingToCompute)
>+{
>+    constexpr char kVS[] = "void main() {}";
>+    constexpr char kFS[] = "void main() {}";
>+
>+    GLuint program = glCreateProgram();
>+
>+    GLuint vs = CompileShader(GL_VERTEX_SHADER, kVS);
>+    GLuint fs = CompileShader(GL_FRAGMENT_SHADER, kFS);
>+
>+    EXPECT_NE(0u, vs);
>+    EXPECT_NE(0u, fs);
>+
>+    glAttachShader(program, vs);
>+    glDeleteShader(vs);
>+
>+    glAttachShader(program, fs);
>+    glDeleteShader(fs);
>+
>+    glLinkProgram(program);
>+    glDetachShader(program, vs);
>+    glDetachShader(program, fs);
>+    GLint linkStatus;
>+    glGetProgramiv(program, GL_LINK_STATUS, &linkStatus);
>+    EXPECT_GL_TRUE(linkStatus);
>+
>+    EXPECT_GL_NO_ERROR();
>+
>+    glUseProgram(program);
>+    EXPECT_GL_NO_ERROR();
>+    glDrawArrays(GL_POINTS, 0, 1);
>+    EXPECT_GL_NO_ERROR();
>+
>+    glDispatchCompute(8, 4, 2);
>+    EXPECT_GL_ERROR(GL_INVALID_OPERATION);
>+
>+    constexpr char kCS[] = R"(#version 310 es
>+layout(local_size_x=1) in;
>+void main()
>+{
>+})";
>+
>+    GLuint cs = CompileShader(GL_COMPUTE_SHADER, kCS);
>+    EXPECT_NE(0u, cs);
>+
>+    glAttachShader(program, cs);
>+    glDeleteShader(cs);
>+
>+    glLinkProgram(program);
>+    glDetachShader(program, cs);
>+    glGetProgramiv(program, GL_LINK_STATUS, &linkStatus);
>+    EXPECT_GL_TRUE(linkStatus);
>+
>+    EXPECT_GL_NO_ERROR();
>+
>+    glDispatchCompute(8, 4, 2);
>+    EXPECT_GL_NO_ERROR();
>+
>+    glDrawArrays(GL_POINTS, 0, 1);
>+    EXPECT_GL_ERROR(GL_INVALID_OPERATION);
>+}
>+
>+ANGLE_INSTANTIATE_TEST(LinkAndRelinkTest,
>+                       ES2_OPENGL(),
>+                       ES2_OPENGLES(),
>+                       ES2_D3D9(),
>+                       ES2_D3D11(),
>+                       ES3_OPENGL(),
>+                       ES3_OPENGLES(),
>+                       ES3_D3D11(),
>+                       ES2_VULKAN());
>+ANGLE_INSTANTIATE_TEST(LinkAndRelinkTestES31, ES31_OPENGL(), ES31_OPENGLES());
>+
>+}  // namespace
>diff --git a/Source/ThirdParty/ANGLE/src/tests/gl_tests/MaxTextureSizeTest.cpp b/Source/ThirdParty/ANGLE/src/tests/gl_tests/MaxTextureSizeTest.cpp
>index 7686134199d..f1b2048213b 100644
>--- a/Source/ThirdParty/ANGLE/src/tests/gl_tests/MaxTextureSizeTest.cpp
>+++ b/Source/ThirdParty/ANGLE/src/tests/gl_tests/MaxTextureSizeTest.cpp
>@@ -25,37 +25,33 @@ class MaxTextureSizeTest : public ANGLETest
>     {
>         ANGLETest::SetUp();
> 
>-        const std::string vsSource =
>-            R"(precision highp float;
>-            attribute vec4 position;
>-            varying vec2 texcoord;
>-
>-            void main()
>-            {
>-                gl_Position = position;
>-                texcoord = (position.xy * 0.5) + 0.5;
>-            })";
>-
>-        const std::string textureFSSource =
>-            R"(precision highp float;
>-            uniform sampler2D tex;
>-            varying vec2 texcoord;
>-
>-            void main()
>-            {
>-                gl_FragColor = texture2D(tex, texcoord);
>-            })";
>-
>-        const std::string blueFSSource =
>-            R"(precision highp float;
>-
>-            void main()
>-            {
>-                gl_FragColor = vec4(0.0, 0.0, 1.0, 1.0);
>-            })";
>-
>-        mTextureProgram = CompileProgram(vsSource, textureFSSource);
>-        mBlueProgram = CompileProgram(vsSource, blueFSSource);
>+        constexpr char kVS[] = R"(precision highp float;
>+attribute vec4 position;
>+varying vec2 texcoord;
>+
>+void main()
>+{
>+    gl_Position = position;
>+    texcoord = (position.xy * 0.5) + 0.5;
>+})";
>+
>+        constexpr char kTextureFS[] = R"(precision highp float;
>+uniform sampler2D tex;
>+varying vec2 texcoord;
>+
>+void main()
>+{
>+    gl_FragColor = texture2D(tex, texcoord);
>+})";
>+
>+        constexpr char kBlueFS[] = R"(precision highp float;
>+void main()
>+{
>+    gl_FragColor = vec4(0.0, 0.0, 1.0, 1.0);
>+})";
>+
>+        mTextureProgram = CompileProgram(kVS, kTextureFS);
>+        mBlueProgram    = CompileProgram(kVS, kBlueFS);
>         if (mTextureProgram == 0 || mBlueProgram == 0)
>         {
>             FAIL() << "shader compilation failed.";
>@@ -90,6 +86,9 @@ class MaxTextureSizeTest : public ANGLETest
> 
> TEST_P(MaxTextureSizeTest, SpecificationTexImage)
> {
>+    // http://anglebug.com/2690
>+    ANGLE_SKIP_TEST_IF(IsWindows() && IsIntel() && IsVulkan());
>+
>     GLuint tex;
>     glGenTextures(1, &tex);
>     glBindTexture(GL_TEXTURE_2D, tex);
>@@ -99,7 +98,7 @@ TEST_P(MaxTextureSizeTest, SpecificationTexImage)
>     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
>     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
> 
>-    GLsizei textureWidth = mMaxTexture2DSize;
>+    GLsizei textureWidth  = mMaxTexture2DSize;
>     GLsizei textureHeight = 64;
> 
>     std::vector<GLubyte> data(textureWidth * textureHeight * 4);
>@@ -107,7 +106,7 @@ TEST_P(MaxTextureSizeTest, SpecificationTexImage)
>     {
>         for (int x = 0; x < textureWidth; x++)
>         {
>-            GLubyte* pixel = &data[0] + ((y * textureWidth + x) * 4);
>+            GLubyte *pixel = &data[0] + ((y * textureWidth + x) * 4);
> 
>             // Draw a gradient, red in direction, green in y direction
>             pixel[0] = static_cast<GLubyte>((float(x) / textureWidth) * 255);
>@@ -117,7 +116,8 @@ TEST_P(MaxTextureSizeTest, SpecificationTexImage)
>         }
>     }
> 
>-    glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, textureWidth, textureHeight, 0, GL_RGBA, GL_UNSIGNED_BYTE, &data[0]);
>+    glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, textureWidth, textureHeight, 0, GL_RGBA,
>+                 GL_UNSIGNED_BYTE, &data[0]);
>     EXPECT_GL_NO_ERROR();
> 
>     glUseProgram(mTextureProgram);
>@@ -132,8 +132,8 @@ TEST_P(MaxTextureSizeTest, SpecificationTexImage)
>     {
>         for (int x = 1; x < getWindowWidth(); x++)
>         {
>-            const GLubyte* prevPixel = &pixels[0] + (((y - 1) * getWindowWidth() + (x - 1)) * 4);
>-            const GLubyte* curPixel = &pixels[0] + ((y * getWindowWidth() + x) * 4);
>+            const GLubyte *prevPixel = &pixels[0] + (((y - 1) * getWindowWidth() + (x - 1)) * 4);
>+            const GLubyte *curPixel  = &pixels[0] + ((y * getWindowWidth() + x) * 4);
> 
>             EXPECT_GE(curPixel[0], prevPixel[0]);
>             EXPECT_GE(curPixel[1], prevPixel[1]);
>@@ -145,8 +145,8 @@ TEST_P(MaxTextureSizeTest, SpecificationTexImage)
> 
> TEST_P(MaxTextureSizeTest, SpecificationTexStorage)
> {
>-    if (getClientMajorVersion() < 3 &&
>-        (!extensionEnabled("GL_EXT_texture_storage") || !extensionEnabled("GL_OES_rgb8_rgba8")))
>+    if (getClientMajorVersion() < 3 && (!IsGLExtensionEnabled("GL_EXT_texture_storage") ||
>+                                        !IsGLExtensionEnabled("GL_OES_rgb8_rgba8")))
>     {
>         return;
>     }
>@@ -160,7 +160,7 @@ TEST_P(MaxTextureSizeTest, SpecificationTexStorage)
>     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
>     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
> 
>-    GLsizei textureWidth = 64;
>+    GLsizei textureWidth  = 64;
>     GLsizei textureHeight = mMaxTexture2DSize;
> 
>     std::vector<GLubyte> data(textureWidth * textureHeight * 4);
>@@ -168,7 +168,7 @@ TEST_P(MaxTextureSizeTest, SpecificationTexStorage)
>     {
>         for (int x = 0; x < textureWidth; x++)
>         {
>-            GLubyte* pixel = &data[0] + ((y * textureWidth + x) * 4);
>+            GLubyte *pixel = &data[0] + ((y * textureWidth + x) * 4);
> 
>             // Draw a gradient, red in direction, green in y direction
>             pixel[0] = static_cast<GLubyte>((float(x) / textureWidth) * 255);
>@@ -188,7 +188,8 @@ TEST_P(MaxTextureSizeTest, SpecificationTexStorage)
>     }
>     EXPECT_GL_NO_ERROR();
> 
>-    glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, textureWidth, textureHeight, GL_RGBA, GL_UNSIGNED_BYTE, &data[0]);
>+    glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, textureWidth, textureHeight, GL_RGBA, GL_UNSIGNED_BYTE,
>+                    &data[0]);
>     EXPECT_GL_NO_ERROR();
> 
>     glUseProgram(mTextureProgram);
>@@ -203,8 +204,8 @@ TEST_P(MaxTextureSizeTest, SpecificationTexStorage)
>     {
>         for (int x = 1; x < getWindowWidth(); x++)
>         {
>-            const GLubyte* prevPixel = &pixels[0] + (((y - 1) * getWindowWidth() + (x - 1)) * 4);
>-            const GLubyte* curPixel = &pixels[0] + ((y * getWindowWidth() + x) * 4);
>+            const GLubyte *prevPixel = &pixels[0] + (((y - 1) * getWindowWidth() + (x - 1)) * 4);
>+            const GLubyte *curPixel  = &pixels[0] + ((y * getWindowWidth() + x) * 4);
> 
>             EXPECT_GE(curPixel[0], prevPixel[0]);
>             EXPECT_GE(curPixel[1], prevPixel[1]);
>@@ -216,19 +217,16 @@ TEST_P(MaxTextureSizeTest, SpecificationTexStorage)
> 
> TEST_P(MaxTextureSizeTest, RenderToTexture)
> {
>-    if (getClientMajorVersion() < 3 && (!extensionEnabled("GL_ANGLE_framebuffer_blit")))
>-    {
>-        std::cout << "Test skipped due to missing glBlitFramebuffer[ANGLE] support." << std::endl;
>-        return;
>-    }
>+    ANGLE_SKIP_TEST_IF(getClientMajorVersion() < 3 &&
>+                       (!IsGLExtensionEnabled("GL_ANGLE_framebuffer_blit")));
> 
>-    GLuint fbo = 0;
>+    GLuint fbo       = 0;
>     GLuint textureId = 0;
>     // create a 1-level texture at maximum size
>     glGenTextures(1, &textureId);
>     glBindTexture(GL_TEXTURE_2D, textureId);
> 
>-    GLsizei textureWidth = 64;
>+    GLsizei textureWidth  = 64;
>     GLsizei textureHeight = mMaxTexture2DSize;
> 
>     // texture setup code
>@@ -254,9 +252,9 @@ TEST_P(MaxTextureSizeTest, RenderToTexture)
>         // clear the screen
>         glBindFramebuffer(GL_FRAMEBUFFER, 0);
> 
>-        GLubyte clearRed = static_cast<GLubyte>((float(i) / frameCount) * 255);
>+        GLubyte clearRed   = static_cast<GLubyte>((float(i) / frameCount) * 255);
>         GLubyte clearGreen = 255 - clearRed;
>-        GLubyte clearBlue = 0;
>+        GLubyte clearBlue  = 0;
> 
>         glClearColor(clearRed / 255.0f, clearGreen / 255.0f, clearBlue / 255.0f, 1.0f);
>         glClear(GL_COLOR_BUFFER_BIT);
>@@ -268,14 +266,15 @@ TEST_P(MaxTextureSizeTest, RenderToTexture)
>         // copy corner of texture to LL corner of window
>         glBindFramebuffer(GL_DRAW_FRAMEBUFFER_ANGLE, 0);
>         glBindFramebuffer(GL_READ_FRAMEBUFFER_ANGLE, fbo);
>-        glBlitFramebufferANGLE(0, 0, textureWidth - 1, getWindowHeight() - 1,
>-                               0, 0, textureWidth - 1, getWindowHeight() - 1,
>-                               GL_COLOR_BUFFER_BIT, GL_NEAREST);
>+        glBlitFramebufferANGLE(0, 0, textureWidth - 1, getWindowHeight() - 1, 0, 0,
>+                               textureWidth - 1, getWindowHeight() - 1, GL_COLOR_BUFFER_BIT,
>+                               GL_NEAREST);
>         glBindFramebuffer(GL_READ_FRAMEBUFFER_ANGLE, 0);
>         EXPECT_GL_NO_ERROR();
> 
>         EXPECT_PIXEL_EQ(textureWidth / 2, getWindowHeight() / 2, 0, 0, 255, 255);
>-        EXPECT_PIXEL_EQ(textureWidth + 10, getWindowHeight() / 2, clearRed, clearGreen, clearBlue, 255);
>+        EXPECT_PIXEL_EQ(textureWidth + 10, getWindowHeight() / 2, clearRed, clearGreen, clearBlue,
>+                        255);
> 
>         swapBuffers();
>     }
>@@ -290,5 +289,10 @@ TEST_P(MaxTextureSizeTest, RenderToTexture)
> // TODO(geofflang): Fix the dependence on glBlitFramebufferANGLE without checks and assuming the
> // default framebuffer is BGRA to enable the GL and GLES backends. (http://anglebug.com/1289)
> 
>-// Use this to select which configurations (e.g. which renderer, which GLES major version) these tests should be run against.
>-ANGLE_INSTANTIATE_TEST(MaxTextureSizeTest, ES2_D3D9(), ES2_D3D11(), ES2_D3D11_FL9_3());
>+// Use this to select which configurations (e.g. which renderer, which GLES major version) these
>+// tests should be run against.
>+ANGLE_INSTANTIATE_TEST(MaxTextureSizeTest,
>+                       ES2_D3D9(),
>+                       ES2_D3D11(),
>+                       ES2_D3D11_FL9_3(),
>+                       ES2_VULKAN());
>diff --git a/Source/ThirdParty/ANGLE/src/tests/gl_tests/MemoryObjectTest.cpp b/Source/ThirdParty/ANGLE/src/tests/gl_tests/MemoryObjectTest.cpp
>new file mode 100644
>index 00000000000..c137c178b20
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/tests/gl_tests/MemoryObjectTest.cpp
>@@ -0,0 +1,79 @@
>+//
>+// Copyright 2019 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+
>+// MemoryObjectTest.cpp : Tests of the GL_EXT_memory_object extension.
>+
>+#include "test_utils/ANGLETest.h"
>+
>+#include "test_utils/gl_raii.h"
>+
>+namespace angle
>+{
>+
>+class MemoryObjectTest : public ANGLETest
>+{
>+  protected:
>+    MemoryObjectTest()
>+    {
>+        setWindowWidth(1);
>+        setWindowHeight(1);
>+        setConfigRedBits(8);
>+        setConfigGreenBits(8);
>+        setConfigBlueBits(8);
>+        setConfigAlphaBits(8);
>+    }
>+};
>+
>+// glIsMemoryObjectEXT must identify memory objects.
>+TEST_P(MemoryObjectTest, MemoryObjectShouldBeMemoryObject)
>+{
>+    ANGLE_SKIP_TEST_IF(!EnsureGLExtensionEnabled("GL_EXT_memory_object"));
>+
>+    constexpr GLsizei kMemoryObjectCount = 2;
>+    GLuint memoryObjects[kMemoryObjectCount];
>+    glCreateMemoryObjectsEXT(kMemoryObjectCount, memoryObjects);
>+
>+    EXPECT_FALSE(glIsMemoryObjectEXT(0));
>+
>+    for (GLsizei i = 0; i < kMemoryObjectCount; ++i)
>+    {
>+        EXPECT_TRUE(glIsMemoryObjectEXT(memoryObjects[i]));
>+    }
>+
>+    glDeleteMemoryObjectsEXT(kMemoryObjectCount, memoryObjects);
>+
>+    EXPECT_GL_NO_ERROR();
>+}
>+
>+// glImportMemoryFdEXT must fail for handle types that are not file descriptors.
>+TEST_P(MemoryObjectTest, ShouldFailValidationOnImportFdUnsupportedHandleType)
>+{
>+    ANGLE_SKIP_TEST_IF(!EnsureGLExtensionEnabled("GL_EXT_memory_object_fd"));
>+
>+    {
>+        GLMemoryObject memoryObject;
>+        GLsizei deviceMemorySize = 1;
>+        int fd                   = -1;
>+        glImportMemoryFdEXT(memoryObject, deviceMemorySize, GL_HANDLE_TYPE_OPAQUE_WIN32_EXT, fd);
>+        EXPECT_GL_ERROR(GL_INVALID_ENUM);
>+    }
>+
>+    EXPECT_GL_NO_ERROR();
>+}
>+
>+// Use this to select which configurations (e.g. which renderer, which GLES major version) these
>+// tests should be run against.
>+ANGLE_INSTANTIATE_TEST(MemoryObjectTest,
>+                       ES2_D3D9(),
>+                       ES2_D3D11(),
>+                       ES3_D3D11(),
>+                       ES2_OPENGL(),
>+                       ES3_OPENGL(),
>+                       ES2_OPENGLES(),
>+                       ES3_OPENGLES(),
>+                       ES2_VULKAN());
>+
>+}  // namespace angle
>diff --git a/Source/ThirdParty/ANGLE/src/tests/gl_tests/MemorySizeTest.cpp b/Source/ThirdParty/ANGLE/src/tests/gl_tests/MemorySizeTest.cpp
>new file mode 100644
>index 00000000000..59941b8c126
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/tests/gl_tests/MemorySizeTest.cpp
>@@ -0,0 +1,144 @@
>+//
>+// Copyright 2018 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+
>+// MemorySizeTest.cpp : Tests of the GL_ANGLE_memory_size extension.
>+
>+#include "test_utils/ANGLETest.h"
>+
>+#include "test_utils/gl_raii.h"
>+
>+namespace angle
>+{
>+
>+class MemorySizeTest : public ANGLETest
>+{
>+  protected:
>+    MemorySizeTest()
>+    {
>+        setWindowWidth(128);
>+        setWindowHeight(128);
>+        setConfigRedBits(8);
>+        setConfigGreenBits(8);
>+        setConfigBlueBits(8);
>+        setConfigAlphaBits(8);
>+    }
>+};
>+
>+// GL_ANGLE_memory_size is implemented in the front-end and should always be exposed.
>+TEST_P(MemorySizeTest, ExtensionStringExposed)
>+{
>+    EXPECT_TRUE(EnsureGLExtensionEnabled("GL_ANGLE_memory_size"));
>+}
>+
>+// Test basic queries of textures
>+TEST_P(MemorySizeTest, BasicUsageTexture)
>+{
>+    ANGLE_SKIP_TEST_IF(!EnsureGLExtensionEnabled("GL_ANGLE_memory_size"));
>+
>+    GLTexture texture;
>+    glBindTexture(GL_TEXTURE_2D, texture);
>+
>+    GLint result;
>+    glGetTexParameteriv(GL_TEXTURE_2D, GL_MEMORY_SIZE_ANGLE, &result);
>+    EXPECT_GL_NO_ERROR();
>+    EXPECT_EQ(0, result);
>+
>+    glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, 2, 2, 0, GL_RGBA, GL_UNSIGNED_BYTE, nullptr);
>+    glGetTexParameteriv(GL_TEXTURE_2D, GL_MEMORY_SIZE_ANGLE, &result);
>+    EXPECT_GL_NO_ERROR();
>+    EXPECT_GT(result, 0);
>+
>+    if (getClientMajorVersion() > 3)
>+    {
>+        glGetTexLevelParameteriv(GL_TEXTURE_2D, 1, GL_MEMORY_SIZE_ANGLE, &result);
>+        EXPECT_GL_NO_ERROR();
>+        EXPECT_EQ(0, result);
>+
>+        glGetTexLevelParameteriv(GL_TEXTURE_2D, 0, GL_MEMORY_SIZE_ANGLE, &result);
>+        EXPECT_GL_NO_ERROR();
>+        EXPECT_GT(result, 0);
>+    }
>+}
>+
>+// Test basic queries of buffers
>+TEST_P(MemorySizeTest, BasicUsageBuffer)
>+{
>+    ANGLE_SKIP_TEST_IF(!EnsureGLExtensionEnabled("GL_ANGLE_memory_size"));
>+
>+    GLBuffer buffer;
>+    glBindBuffer(GL_ARRAY_BUFFER, buffer);
>+
>+    GLint result;
>+    glGetBufferParameteriv(GL_ARRAY_BUFFER, GL_MEMORY_SIZE_ANGLE, &result);
>+    EXPECT_GL_NO_ERROR();
>+    EXPECT_EQ(0, result);
>+
>+    if (getClientMajorVersion() > 3)
>+    {
>+        GLint64 result64;
>+        glGetBufferParameteri64v(GL_ARRAY_BUFFER, GL_MEMORY_SIZE_ANGLE, &result64);
>+        EXPECT_GL_NO_ERROR();
>+        EXPECT_EQ(0, result64);
>+    }
>+
>+    constexpr GLsizeiptr kBufSize = 16;
>+    std::array<uint8_t, kBufSize> buf;
>+    glBufferData(GL_ARRAY_BUFFER, kBufSize, buf.data(), GL_STATIC_DRAW);
>+    glGetBufferParameteriv(GL_ARRAY_BUFFER, GL_MEMORY_SIZE_ANGLE, &result);
>+    EXPECT_GL_NO_ERROR();
>+
>+    // This value may have to be reset to 1 if some backend delays allocations or compresses
>+    // buffers.
>+    constexpr GLint kExpectedMinBufMemorySize = 15;
>+
>+    EXPECT_GT(result, kExpectedMinBufMemorySize);
>+
>+    if (getClientMajorVersion() > 3)
>+    {
>+        GLint64 result64;
>+        glGetBufferParameteri64v(GL_ARRAY_BUFFER, GL_MEMORY_SIZE_ANGLE, &result64);
>+        EXPECT_GL_NO_ERROR();
>+        EXPECT_GT(result64, static_cast<GLint64>(kExpectedMinBufMemorySize));
>+    }
>+
>+    // No way to easily test the GLint64 to GLint64 clamping behaviour of glGetBufferParameteriv
>+    // without allocating a buffer >2gb.
>+}
>+
>+// Test basic queries of renderbuffers
>+TEST_P(MemorySizeTest, BasicUsageRenderbuffer)
>+{
>+    ANGLE_SKIP_TEST_IF(!EnsureGLExtensionEnabled("GL_ANGLE_memory_size"));
>+
>+    GLRenderbuffer renderbuffer;
>+    glBindRenderbuffer(GL_RENDERBUFFER, renderbuffer);
>+
>+    GLint result;
>+    glGetRenderbufferParameteriv(GL_RENDERBUFFER, GL_MEMORY_SIZE_ANGLE, &result);
>+    EXPECT_GL_NO_ERROR();
>+    EXPECT_EQ(0, result);
>+
>+    glRenderbufferStorage(GL_RENDERBUFFER, GL_RGBA4, 4, 4);
>+    glGetRenderbufferParameteriv(GL_RENDERBUFFER, GL_MEMORY_SIZE_ANGLE, &result);
>+    EXPECT_GL_NO_ERROR();
>+    EXPECT_GT(result, 0);
>+}
>+
>+// No errors specific to GL_ANGLE_memory_size to test for.
>+
>+// Use this to select which configurations (e.g. which renderer, which GLES major version) these
>+// tests should be run against.
>+ANGLE_INSTANTIATE_TEST(MemorySizeTest,
>+                       ES2_D3D9(),
>+                       ES2_D3D11(),
>+                       ES3_D3D11(),
>+                       ES2_D3D11_FL9_3(),
>+                       ES2_OPENGL(),
>+                       ES3_OPENGL(),
>+                       ES2_OPENGLES(),
>+                       ES3_OPENGLES(),
>+                       ES2_VULKAN());
>+}  // namespace angle
>diff --git a/Source/ThirdParty/ANGLE/src/tests/gl_tests/MipmapTest.cpp b/Source/ThirdParty/ANGLE/src/tests/gl_tests/MipmapTest.cpp
>index 9fde0bfdee8..a5419a91526 100644
>--- a/Source/ThirdParty/ANGLE/src/tests/gl_tests/MipmapTest.cpp
>+++ b/Source/ThirdParty/ANGLE/src/tests/gl_tests/MipmapTest.cpp
>@@ -58,10 +58,10 @@ class MipmapTest : public BaseMipmapTest
>           mCubeProgram(0),
>           mTexture2D(0),
>           mTextureCube(0),
>-          mLevelZeroBlueInitData(nullptr),
>-          mLevelZeroWhiteInitData(nullptr),
>-          mLevelOneInitData(nullptr),
>-          mLevelTwoInitData(nullptr),
>+          mLevelZeroBlueInitData(),
>+          mLevelZeroWhiteInitData(),
>+          mLevelOneGreenInitData(),
>+          mLevelTwoRedInitData(),
>           mOffscreenFramebuffer(0)
>     {
>         setWindowWidth(128);
>@@ -75,56 +75,51 @@ class MipmapTest : public BaseMipmapTest
>     void setUp2DProgram()
>     {
>         // Vertex Shader source
>-        const std::string vs =
>-            R"(attribute vec4 position;
>-            varying vec2 vTexCoord;
>+        constexpr char kVS[] = R"(attribute vec4 position;
>+varying vec2 vTexCoord;
> 
>-            void main()
>-            {
>-                gl_Position = position;
>-                vTexCoord   = (position.xy * 0.5) + 0.5;
>-            })";
>+void main()
>+{
>+    gl_Position = position;
>+    vTexCoord   = (position.xy * 0.5) + 0.5;
>+})";
> 
>         // Fragment Shader source
>-        const std::string fs =
>-            R"(precision mediump float;
>-
>-            uniform sampler2D uTexture;
>-            varying vec2 vTexCoord;
>+        constexpr char kFS[] = R"(precision mediump float;
>+uniform sampler2D uTexture;
>+varying vec2 vTexCoord;
> 
>-            void main()
>-            {
>-                gl_FragColor = texture2D(uTexture, vTexCoord);
>-            })";
>+void main()
>+{
>+    gl_FragColor = texture2D(uTexture, vTexCoord);
>+})";
> 
>-        m2DProgram = CompileProgram(vs, fs);
>+        m2DProgram = CompileProgram(kVS, kFS);
>         ASSERT_NE(0u, m2DProgram);
>     }
> 
>     void setUpCubeProgram()
>     {
>         // A simple vertex shader for the texture cube
>-        const std::string cubeVS =
>-            R"(attribute vec4 position;
>-            varying vec4 vPosition;
>-            void main()
>-            {
>-                gl_Position = position;
>-                vPosition = position;
>-            })";
>+        constexpr char kVS[] = R"(attribute vec4 position;
>+varying vec4 vPosition;
>+void main()
>+{
>+    gl_Position = position;
>+    vPosition = position;
>+})";
> 
>         // A very simple fragment shader to sample from the negative-Y face of a texture cube.
>-        const std::string cubeFS =
>-            R"(precision mediump float;
>-            uniform samplerCube uTexture;
>-            varying vec4 vPosition;
>+        constexpr char kFS[] = R"(precision mediump float;
>+uniform samplerCube uTexture;
>+varying vec4 vPosition;
> 
>-            void main()
>-            {
>-                gl_FragColor = textureCube(uTexture, vec3(vPosition.x, -1, vPosition.y));
>-            })";
>+void main()
>+{
>+    gl_FragColor = textureCube(uTexture, vec3(vPosition.x, -1, vPosition.y));
>+})";
> 
>-        mCubeProgram = CompileProgram(cubeVS, cubeFS);
>+        mCubeProgram = CompileProgram(kVS, kFS);
>         ASSERT_NE(0u, mCubeProgram);
>     }
> 
>@@ -136,10 +131,14 @@ class MipmapTest : public BaseMipmapTest
> 
>         setUpCubeProgram();
> 
>-        mLevelZeroBlueInitData = createRGBInitData(getWindowWidth(), getWindowHeight(), 0, 0, 255); // Blue
>-        mLevelZeroWhiteInitData = createRGBInitData(getWindowWidth(), getWindowHeight(), 255, 255, 255); // White
>-        mLevelOneInitData = createRGBInitData((getWindowWidth() / 2), (getWindowHeight() / 2), 0, 255, 0);   // Green
>-        mLevelTwoInitData = createRGBInitData((getWindowWidth() / 4), (getWindowHeight() / 4), 255, 0, 0);   // Red
>+        mLevelZeroBlueInitData =
>+            createRGBInitData(getWindowWidth(), getWindowHeight(), 0, 0, 255);  // Blue
>+        mLevelZeroWhiteInitData =
>+            createRGBInitData(getWindowWidth(), getWindowHeight(), 255, 255, 255);  // White
>+        mLevelOneGreenInitData =
>+            createRGBInitData((getWindowWidth() / 2), (getWindowHeight() / 2), 0, 255, 0);  // Green
>+        mLevelTwoRedInitData =
>+            createRGBInitData((getWindowWidth() / 4), (getWindowHeight() / 4), 255, 0, 0);  // Red
> 
>         glGenFramebuffers(1, &mOffscreenFramebuffer);
>         glGenTextures(1, &mTexture2D);
>@@ -158,7 +157,7 @@ class MipmapTest : public BaseMipmapTest
>         glBindTexture(GL_TEXTURE_CUBE_MAP, mTextureCube);
>         TexImageCubeMapFaces(0, GL_RGB, getWindowWidth(), GL_RGB, GL_UNSIGNED_BYTE, nullptr);
>         glTexImage2D(GL_TEXTURE_CUBE_MAP_NEGATIVE_Y, 0, GL_RGB, getWindowWidth(), getWindowWidth(),
>-                     0, GL_RGB, GL_UNSIGNED_BYTE, mLevelZeroBlueInitData);
>+                     0, GL_RGB, GL_UNSIGNED_BYTE, mLevelZeroBlueInitData.data());
> 
>         // Complete the texture cube without mipmaps to start with.
>         glTexParameteri(GL_TEXTURE_CUBE_MAP, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
>@@ -175,19 +174,14 @@ class MipmapTest : public BaseMipmapTest
>         glDeleteTextures(1, &mTexture2D);
>         glDeleteTextures(1, &mTextureCube);
> 
>-        SafeDeleteArray(mLevelZeroBlueInitData);
>-        SafeDeleteArray(mLevelZeroWhiteInitData);
>-        SafeDeleteArray(mLevelOneInitData);
>-        SafeDeleteArray(mLevelTwoInitData);
>-
>         ANGLETest::TearDown();
>     }
> 
>-    GLubyte *createRGBInitData(GLint width, GLint height, GLint r, GLint g, GLint b)
>+    std::vector<GLubyte> createRGBInitData(GLint width, GLint height, GLint r, GLint g, GLint b)
>     {
>-        GLubyte *data = new GLubyte[3 * width * height];
>+        std::vector<GLubyte> data(3 * width * height);
> 
>-        for (int i = 0; i < width * height; i+=1)
>+        for (int i = 0; i < width * height; i += 1)
>         {
>             data[3 * i + 0] = static_cast<GLubyte>(r);
>             data[3 * i + 1] = static_cast<GLubyte>(g);
>@@ -217,10 +211,10 @@ class MipmapTest : public BaseMipmapTest
>     GLuint mTexture2D;
>     GLuint mTextureCube;
> 
>-    GLubyte* mLevelZeroBlueInitData;
>-    GLubyte* mLevelZeroWhiteInitData;
>-    GLubyte* mLevelOneInitData;
>-    GLubyte* mLevelTwoInitData;
>+    std::vector<GLubyte> mLevelZeroBlueInitData;
>+    std::vector<GLubyte> mLevelZeroWhiteInitData;
>+    std::vector<GLubyte> mLevelOneGreenInitData;
>+    std::vector<GLubyte> mLevelTwoRedInitData;
> 
>   private:
>     GLuint mOffscreenFramebuffer;
>@@ -247,40 +241,39 @@ class MipmapTestES3 : public BaseMipmapTest
>         setConfigAlphaBits(8);
>     }
> 
>-    std::string vertexShaderSource()
>+    const char *vertexShaderSource()
>     {
>         // Don't put "#version ..." on its own line. See [cpp]p1:
>         // "If there are sequences of preprocessing tokens within the list of arguments that
>         //  would otherwise act as preprocessing directives, the behavior is undefined"
>         return
>             R"(#version 300 es
>-            precision highp float;
>-            in vec4 position;
>-            out vec2 texcoord;
>-
>-            void main()
>-            {
>-                gl_Position = vec4(position.xy, 0.0, 1.0);
>-                texcoord = (position.xy * 0.5) + 0.5;
>-            })";
>+precision highp float;
>+in vec4 position;
>+out vec2 texcoord;
>+
>+void main()
>+{
>+    gl_Position = vec4(position.xy, 0.0, 1.0);
>+    texcoord = (position.xy * 0.5) + 0.5;
>+})";
>     }
> 
>     void setUpArrayProgram()
>     {
>-        const std::string fragmentShaderSourceArray =
>-            R"(#version 300 es
>-            precision highp float;
>-            uniform highp sampler2DArray tex;
>-            uniform int slice;
>-            in vec2 texcoord;
>-            out vec4 out_FragColor;
>-
>-            void main()
>-            {
>-                out_FragColor = texture(tex, vec3(texcoord, float(slice)));
>-            })";
>-
>-        mArrayProgram = CompileProgram(vertexShaderSource(), fragmentShaderSourceArray);
>+        constexpr char kFS[] = R"(#version 300 es
>+precision highp float;
>+uniform highp sampler2DArray tex;
>+uniform int slice;
>+in vec2 texcoord;
>+out vec4 out_FragColor;
>+
>+void main()
>+{
>+    out_FragColor = texture(tex, vec3(texcoord, float(slice)));
>+})";
>+
>+        mArrayProgram = CompileProgram(vertexShaderSource(), kFS);
>         if (mArrayProgram == 0)
>         {
>             FAIL() << "shader compilation failed.";
>@@ -296,21 +289,20 @@ class MipmapTestES3 : public BaseMipmapTest
> 
>     void setUp3DProgram()
>     {
>-        const std::string fragmentShaderSource3D =
>-            R"(#version 300 es
>-            precision highp float;
>-            uniform highp sampler3D tex;
>-            uniform float slice;
>-            uniform float lod;
>-            in vec2 texcoord;
>-            out vec4 out_FragColor;
>-
>-            void main()
>-            {
>-                out_FragColor = textureLod(tex, vec3(texcoord, slice), lod);
>-            })";
>-
>-        m3DProgram = CompileProgram(vertexShaderSource(), fragmentShaderSource3D);
>+        constexpr char kFS[] = R"(#version 300 es
>+precision highp float;
>+uniform highp sampler3D tex;
>+uniform float slice;
>+uniform float lod;
>+in vec2 texcoord;
>+out vec4 out_FragColor;
>+
>+void main()
>+{
>+    out_FragColor = textureLod(tex, vec3(texcoord, slice), lod);
>+})";
>+
>+        m3DProgram = CompileProgram(vertexShaderSource(), kFS);
>         if (m3DProgram == 0)
>         {
>             FAIL() << "shader compilation failed.";
>@@ -330,19 +322,18 @@ class MipmapTestES3 : public BaseMipmapTest
> 
>     void setUp2DProgram()
>     {
>-        const std::string fragmentShaderSource2D =
>-            R"(#version 300 es
>-            precision highp float;
>-            uniform highp sampler2D tex;
>-            in vec2 texcoord;
>-            out vec4 out_FragColor;
>+        constexpr char kFS[] = R"(#version 300 es
>+precision highp float;
>+uniform highp sampler2D tex;
>+in vec2 texcoord;
>+out vec4 out_FragColor;
> 
>-            void main()
>-            {
>-                out_FragColor = texture(tex, texcoord);
>-            })";
>+void main()
>+{
>+    out_FragColor = texture(tex, texcoord);
>+})";
> 
>-        m2DProgram = CompileProgram(vertexShaderSource(), fragmentShaderSource2D);
>+        m2DProgram = CompileProgram(vertexShaderSource(), kFS);
>         ASSERT_NE(0u, m2DProgram);
> 
>         ASSERT_GL_NO_ERROR();
>@@ -351,19 +342,18 @@ class MipmapTestES3 : public BaseMipmapTest
>     void setUpCubeProgram()
>     {
>         // A very simple fragment shader to sample from the negative-Y face of a texture cube.
>-        const std::string cubeFS =
>-            R"(#version 300 es
>-            precision mediump float;
>-            uniform samplerCube uTexture;
>-            in vec2 texcoord;
>-            out vec4 out_FragColor;
>+        constexpr char kFS[] = R"(#version 300 es
>+precision mediump float;
>+uniform samplerCube uTexture;
>+in vec2 texcoord;
>+out vec4 out_FragColor;
> 
>-            void main()
>-            {
>-                out_FragColor = texture(uTexture, vec3(texcoord.x, -1, texcoord.y));
>-            })";
>+void main()
>+{
>+    out_FragColor = texture(uTexture, vec3(texcoord.x, -1, texcoord.y));
>+})";
> 
>-        mCubeProgram = CompileProgram(vertexShaderSource(), cubeFS);
>+        mCubeProgram = CompileProgram(vertexShaderSource(), kFS);
>         ASSERT_NE(0u, mCubeProgram);
> 
>         ASSERT_GL_NO_ERROR();
>@@ -408,14 +398,16 @@ class MipmapTestES3 : public BaseMipmapTest
>     GLuint mCubeProgram;
> };
> 
>-// This test uses init data for the first three levels of the texture. It passes the level 0 data in, then renders, then level 1, then renders, etc.
>-// This ensures that renderers using the zero LOD workaround (e.g. D3D11 FL9_3) correctly pass init data to the mipmapped texture,
>-// even if the the zero-LOD texture is currently in use.
>+// This test uses init data for the first three levels of the texture. It passes the level 0 data
>+// in, then renders, then level 1, then renders, etc. This ensures that renderers using the zero LOD
>+// workaround (e.g. D3D11 FL9_3) correctly pass init data to the mipmapped texture, even if the the
>+// zero-LOD texture is currently in use.
> TEST_P(MipmapTest, DISABLED_ThreeLevelsInitData)
> {
>     // Pass in level zero init data.
>     glBindTexture(GL_TEXTURE_2D, mTexture2D);
>-    glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB, getWindowWidth(), getWindowHeight(), 0, GL_RGB, GL_UNSIGNED_BYTE, mLevelZeroBlueInitData);
>+    glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB, getWindowWidth(), getWindowHeight(), 0, GL_RGB,
>+                 GL_UNSIGNED_BYTE, mLevelZeroBlueInitData.data());
>     ASSERT_GL_NO_ERROR();
> 
>     // Disable mips.
>@@ -440,18 +432,20 @@ TEST_P(MipmapTest, DISABLED_ThreeLevelsInitData)
>         glTexImage2D(GL_TEXTURE_2D, n, GL_RGB, getWindowWidth() / (1U << n),
>                      getWindowWidth() / (1U << n), 0, GL_RGB, GL_UNSIGNED_BYTE, nullptr);
>         ASSERT_GL_NO_ERROR();
>-        n+=1;
>+        n += 1;
>     }
> 
>     // Pass in level one init data.
>-    glTexImage2D(GL_TEXTURE_2D, 1, GL_RGB, getWindowWidth() / 2, getWindowHeight() / 2, 0, GL_RGB, GL_UNSIGNED_BYTE, mLevelOneInitData);
>+    glTexImage2D(GL_TEXTURE_2D, 1, GL_RGB, getWindowWidth() / 2, getWindowHeight() / 2, 0, GL_RGB,
>+                 GL_UNSIGNED_BYTE, mLevelOneGreenInitData.data());
>     ASSERT_GL_NO_ERROR();
> 
>     // Draw a full-sized quad, and check it's blue.
>     clearAndDrawQuad(m2DProgram, getWindowWidth(), getWindowHeight());
>     EXPECT_PIXEL_COLOR_EQ(getWindowWidth() / 2, getWindowHeight() / 2, GLColor::blue);
> 
>-    // Draw a half-sized quad, and check it's blue. We've not enabled mipmaps yet, so our init data for level one shouldn't be used.
>+    // Draw a half-sized quad, and check it's blue. We've not enabled mipmaps yet, so our init data
>+    // for level one shouldn't be used.
>     clearAndDrawQuad(m2DProgram, getWindowWidth() / 2, getWindowHeight() / 2);
>     EXPECT_PIXEL_COLOR_EQ(getWindowWidth() / 4, getWindowHeight() / 4, GLColor::blue);
> 
>@@ -462,12 +456,14 @@ TEST_P(MipmapTest, DISABLED_ThreeLevelsInitData)
>     clearAndDrawQuad(m2DProgram, getWindowWidth() / 2, getWindowHeight() / 2);
>     EXPECT_PIXEL_COLOR_EQ(getWindowWidth() / 4, getWindowHeight() / 4, GLColor::green);
> 
>-    // Draw a quarter-sized quad, and check it's black, since we've not passed any init data for level two.
>+    // Draw a quarter-sized quad, and check it's black, since we've not passed any init data for
>+    // level two.
>     clearAndDrawQuad(m2DProgram, getWindowWidth() / 4, getWindowHeight() / 4);
>     EXPECT_PIXEL_COLOR_EQ(getWindowWidth() / 8, getWindowHeight() / 8, GLColor::black);
> 
>     // Pass in level two init data.
>-    glTexImage2D(GL_TEXTURE_2D, 2, GL_RGB, getWindowWidth() / 4, getWindowHeight() / 4, 0, GL_RGB, GL_UNSIGNED_BYTE, mLevelTwoInitData);
>+    glTexImage2D(GL_TEXTURE_2D, 2, GL_RGB, getWindowWidth() / 4, getWindowHeight() / 4, 0, GL_RGB,
>+                 GL_UNSIGNED_BYTE, mLevelTwoRedInitData.data());
>     ASSERT_GL_NO_ERROR();
> 
>     // Draw a full-sized quad, and check it's blue.
>@@ -482,7 +478,8 @@ TEST_P(MipmapTest, DISABLED_ThreeLevelsInitData)
>     clearAndDrawQuad(m2DProgram, getWindowWidth() / 4, getWindowHeight() / 4);
>     EXPECT_PIXEL_COLOR_EQ(getWindowWidth() / 8, getWindowHeight() / 8, GLColor::red);
> 
>-    // Now disable mipmaps again, and render multiple sized quads. They should all be blue, since level 0 is blue.
>+    // Now disable mipmaps again, and render multiple sized quads. They should all be blue, since
>+    // level 0 is blue.
>     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
>     clearAndDrawQuad(m2DProgram, getWindowWidth(), getWindowHeight());
>     EXPECT_PIXEL_COLOR_EQ(getWindowWidth() / 2, getWindowHeight() / 2, GLColor::blue);
>@@ -491,8 +488,10 @@ TEST_P(MipmapTest, DISABLED_ThreeLevelsInitData)
>     clearAndDrawQuad(m2DProgram, getWindowWidth() / 4, getWindowHeight() / 4);
>     EXPECT_PIXEL_COLOR_EQ(getWindowWidth() / 8, getWindowHeight() / 8, GLColor::blue);
> 
>-    // Now reset level 0 to white, keeping mipmaps disabled. Then, render various sized quads. They should be white.
>-    glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB, getWindowWidth(), getWindowHeight(), 0, GL_RGB, GL_UNSIGNED_BYTE, mLevelZeroWhiteInitData);
>+    // Now reset level 0 to white, keeping mipmaps disabled. Then, render various sized quads. They
>+    // should be white.
>+    glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB, getWindowWidth(), getWindowHeight(), 0, GL_RGB,
>+                 GL_UNSIGNED_BYTE, mLevelZeroWhiteInitData.data());
>     ASSERT_GL_NO_ERROR();
> 
>     clearAndDrawQuad(m2DProgram, getWindowWidth(), getWindowHeight());
>@@ -513,16 +512,18 @@ TEST_P(MipmapTest, DISABLED_ThreeLevelsInitData)
>     EXPECT_PIXEL_COLOR_EQ(getWindowWidth() / 8, getWindowHeight() / 8, GLColor::red);
> }
> 
>-// This test generates (and uses) mipmaps on a texture using init data. D3D11 will use a non-renderable TextureStorage for this.
>-// The test then disables mips, renders to level zero of the texture, and reenables mips before using the texture again.
>-// To do this, D3D11 has to convert the TextureStorage into a renderable one.
>-// This test ensures that the conversion works correctly.
>-// In particular, on D3D11 Feature Level 9_3 it ensures that both the zero LOD workaround texture AND the 'normal' texture are copied during conversion.
>+// This test generates (and uses) mipmaps on a texture using init data. D3D11 will use a
>+// non-renderable TextureStorage for this. The test then disables mips, renders to level zero of the
>+// texture, and reenables mips before using the texture again. To do this, D3D11 has to convert the
>+// TextureStorage into a renderable one. This test ensures that the conversion works correctly. In
>+// particular, on D3D11 Feature Level 9_3 it ensures that both the zero LOD workaround texture AND
>+// the 'normal' texture are copied during conversion.
> TEST_P(MipmapTest, GenerateMipmapFromInitDataThenRender)
> {
>     // Pass in initial data so the texture is blue.
>     glBindTexture(GL_TEXTURE_2D, mTexture2D);
>-    glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB, getWindowWidth(), getWindowHeight(), 0, GL_RGB, GL_UNSIGNED_BYTE, mLevelZeroBlueInitData);
>+    glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB, getWindowWidth(), getWindowHeight(), 0, GL_RGB,
>+                 GL_UNSIGNED_BYTE, mLevelZeroBlueInitData.data());
> 
>     // Then generate the mips.
>     glGenerateMipmap(GL_TEXTURE_2D);
>@@ -570,8 +571,9 @@ TEST_P(MipmapTest, GenerateMipmapFromInitDataThenRender)
> }
> 
> // This test ensures that mips are correctly generated from a rendered image.
>-// In particular, on D3D11 Feature Level 9_3, the clear call will be performed on the zero-level texture, rather than the mipped one.
>-// The test ensures that the zero-level texture is correctly copied into the mipped texture before the mipmaps are generated.
>+// In particular, on D3D11 Feature Level 9_3, the clear call will be performed on the zero-level
>+// texture, rather than the mipped one. The test ensures that the zero-level texture is correctly
>+// copied into the mipped texture before the mipmaps are generated.
> TEST_P(MipmapTest, GenerateMipmapFromRenderedImage)
> {
>     glBindTexture(GL_TEXTURE_2D, mTexture2D);
>@@ -598,24 +600,21 @@ TEST_P(MipmapTest, GenerateMipmapFromRenderedImage)
>     EXPECT_PIXEL_COLOR_EQ(getWindowWidth() / 8, getWindowHeight() / 8, GLColor::blue);
> }
> 
>-// Test to ensure that rendering to a mipmapped texture works, regardless of whether mipmaps are enabled or not.
>+// Test to ensure that rendering to a mipmapped texture works, regardless of whether mipmaps are
>+// enabled or not.
> // TODO: This test hits a texture rebind bug in the D3D11 renderer. Fix this.
> TEST_P(MipmapTest, RenderOntoLevelZeroAfterGenerateMipmap)
> {
>     // TODO(geofflang): Figure out why this is broken on AMD OpenGL
>-    if ((IsAMD() || IsIntel()) && getPlatformRenderer() == EGL_PLATFORM_ANGLE_TYPE_OPENGL_ANGLE)
>-    {
>-        std::cout << "Test skipped on Intel/AMD OpenGL." << std::endl;
>-        return;
>-    }
>+    ANGLE_SKIP_TEST_IF(IsAMD() && IsOpenGL());
> 
>     glBindTexture(GL_TEXTURE_2D, mTexture2D);
> 
>     // Clear the texture to blue.
>     clearTextureLevel0(GL_TEXTURE_2D, mTexture2D, 0.0f, 0.0f, 1.0f, 1.0f);
> 
>-    // Now, draw the texture to a quad that's the same size as the texture. This draws to the default framebuffer.
>-    // The quad should be blue.
>+    // Now, draw the texture to a quad that's the same size as the texture. This draws to the
>+    // default framebuffer. The quad should be blue.
>     clearAndDrawQuad(m2DProgram, getWindowWidth(), getWindowHeight());
>     EXPECT_PIXEL_COLOR_EQ(getWindowWidth() / 2, getWindowHeight() / 2, GLColor::blue);
> 
>@@ -636,18 +635,22 @@ TEST_P(MipmapTest, RenderOntoLevelZeroAfterGenerateMipmap)
>     clearAndDrawQuad(m2DProgram, getWindowWidth(), getWindowHeight());
>     EXPECT_PIXEL_COLOR_EQ(getWindowWidth() / 2, getWindowHeight() / 2, GLColor::blue);
> 
>-    // Now render the textured quad to an area smaller than the texture (i.e. to force minification). This should be blue.
>+    // Now render the textured quad to an area smaller than the texture (i.e. to force
>+    // minification). This should be blue.
>     clearAndDrawQuad(m2DProgram, getWindowWidth() / 4, getWindowHeight() / 4);
>     EXPECT_PIXEL_COLOR_EQ(getWindowWidth() / 8, getWindowHeight() / 8, GLColor::blue);
> 
>-    // Now clear the texture to green. This just clears the top level. The lower mips should remain blue.
>+    // Now clear the texture to green. This just clears the top level. The lower mips should remain
>+    // blue.
>     clearTextureLevel0(GL_TEXTURE_2D, mTexture2D, 0.0f, 1.0f, 0.0f, 1.0f);
> 
>-    // Render a textured quad equal in size to the texture. This should be green, since we just cleared level 0.
>+    // Render a textured quad equal in size to the texture. This should be green, since we just
>+    // cleared level 0.
>     clearAndDrawQuad(m2DProgram, getWindowWidth(), getWindowHeight());
>     EXPECT_PIXEL_COLOR_EQ(getWindowWidth() / 2, getWindowHeight() / 2, GLColor::green);
> 
>-    // Render a small textured quad. This forces minification, so should render blue (the color of levels 1+).
>+    // Render a small textured quad. This forces minification, so should render blue (the color of
>+    // levels 1+).
>     clearAndDrawQuad(m2DProgram, getWindowWidth() / 4, getWindowHeight() / 4);
>     EXPECT_PIXEL_COLOR_EQ(getWindowWidth() / 8, getWindowHeight() / 8, GLColor::blue);
> 
>@@ -655,27 +658,104 @@ TEST_P(MipmapTest, RenderOntoLevelZeroAfterGenerateMipmap)
>     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
>     ASSERT_GL_NO_ERROR();
> 
>-    // Render a textured quad equal in size to the texture. This should be green, the color of level 0 in the texture.
>+    // Render a textured quad equal in size to the texture. This should be green, the color of level
>+    // 0 in the texture.
>     clearAndDrawQuad(m2DProgram, getWindowWidth(), getWindowHeight());
>     EXPECT_PIXEL_COLOR_EQ(getWindowWidth() / 2, getWindowHeight() / 2, GLColor::green);
> 
>-    // Render a small textured quad. This would force minification if mips were enabled, but they're not. Therefore, this should be green.
>+    // Render a small textured quad. This would force minification if mips were enabled, but they're
>+    // not. Therefore, this should be green.
>     clearAndDrawQuad(m2DProgram, getWindowWidth() / 4, getWindowHeight() / 4);
>     EXPECT_PIXEL_COLOR_EQ(getWindowWidth() / 8, getWindowHeight() / 8, GLColor::green);
> }
> 
>-// Regression test for a bug that cause mipmaps to only generate using the top left corner as input.
>-TEST_P(MipmapTest, MipMapGenerationD3D9Bug)
>+// This test defines a valid mipchain manually, with an extra level that's unused on the first few
>+// draws. Later on, it redefines the whole mipchain but this time, uses the last mip that was
>+// already uploaded before. The test expects that mip to be usable.
>+TEST_P(MipmapTest, DefineValidExtraLevelAndUseItLater)
> {
>-    if (!extensionEnabled("GL_EXT_texture_storage") || !extensionEnabled("GL_OES_rgb8_rgba8") ||
>-        !extensionEnabled("GL_ANGLE_texture_usage"))
>+    glBindTexture(GL_TEXTURE_2D, mTexture2D);
>+
>+    GLubyte *levels[] = {mLevelZeroBlueInitData.data(), mLevelOneGreenInitData.data(),
>+                         mLevelTwoRedInitData.data()};
>+
>+    int maxLevel = 1 + static_cast<int>(floor(log2(std::max(getWindowWidth(), getWindowHeight()))));
>+
>+    for (int i = 0; i < maxLevel; i++)
>+    {
>+        glTexImage2D(GL_TEXTURE_2D, i, GL_RGB, getWindowWidth() >> i, getWindowHeight() >> i, 0,
>+                     GL_RGB, GL_UNSIGNED_BYTE, levels[i % 3]);
>+    }
>+
>+    // Define an extra level that won't be used for now
>+    std::vector<GLubyte> magentaExtraLevelData =
>+        createRGBInitData(getWindowWidth() * 2, getWindowHeight() * 2, 255, 0, 255);
>+    glTexImage2D(GL_TEXTURE_2D, maxLevel, GL_RGB, 1, 1, 0, GL_RGB, GL_UNSIGNED_BYTE,
>+                 magentaExtraLevelData.data());
>+
>+    ASSERT_GL_NO_ERROR();
>+
>+    // Enable mipmaps.
>+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_NEAREST);
>+
>+    // Draw a full-sized quad using mip 0, and check it's blue.
>+    clearAndDrawQuad(m2DProgram, getWindowWidth(), getWindowHeight());
>+    EXPECT_PIXEL_COLOR_EQ(getWindowWidth() / 2, getWindowHeight() / 2, GLColor::blue);
>+
>+    // Draw a full-sized quad using mip 1, and check it's green.
>+    clearAndDrawQuad(m2DProgram, getWindowWidth() / 2, getWindowHeight() / 2);
>+    EXPECT_PIXEL_COLOR_EQ(getWindowWidth() / 4, getWindowHeight() / 4, GLColor::green);
>+
>+    // Draw a full-sized quad using mip 2, and check it's red.
>+    clearAndDrawQuad(m2DProgram, getWindowWidth() / 4, getWindowHeight() / 4);
>+    EXPECT_PIXEL_COLOR_EQ(getWindowWidth() / 8, getWindowHeight() / 8, GLColor::red);
>+
>+    // Draw a full-sized quad using the last mip, and check it's green.
>+    clearAndDrawQuad(m2DProgram, 1, 1);
>+    EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::green);
>+
>+    // Now redefine everything above level 8 to be a mipcomplete chain again.
>+    std::vector<GLubyte> levelDoubleSizeYellowInitData =
>+        createRGBInitData(getWindowWidth() * 2, getWindowHeight() * 2, 255, 255, 0);
>+
>+    glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB, getWindowWidth() * 2, getWindowHeight() * 2, 0, GL_RGB,
>+                 GL_UNSIGNED_BYTE, levelDoubleSizeYellowInitData.data());  // 256
>+
>+    for (int i = 0; i < maxLevel - 1; i++)
>     {
>-        std::cout << "Test skipped due to missing extensions." << std::endl;
>-        return;
>+        glTexImage2D(GL_TEXTURE_2D, i + 1, GL_RGB, getWindowWidth() >> i, getWindowHeight() >> i, 0,
>+                     GL_RGB, GL_UNSIGNED_BYTE, levels[i % 3]);
>     }
> 
>+    // At this point we have a valid mip chain, the last level being magenta if we draw 1x1 pixel.
>+    clearAndDrawQuad(m2DProgram, 1, 1);
>+    EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::magenta);
>+
>+    // Draw a full-sized quad using mip 0, and check it's yellow.
>+    clearAndDrawQuad(m2DProgram, getWindowWidth() * 2, getWindowHeight() * 2);
>+    EXPECT_PIXEL_COLOR_EQ(getWindowWidth() / 2, getWindowHeight() / 2, GLColor::yellow);
>+
>+    // Draw a full-sized quad using mip 1, and check it's blue.
>+    clearAndDrawQuad(m2DProgram, getWindowWidth(), getWindowHeight());
>+    EXPECT_PIXEL_COLOR_EQ(getWindowWidth() / 4, getWindowHeight() / 4, GLColor::blue);
>+
>+    // Draw a full-sized quad using mip 2, and check it's green.
>+    clearAndDrawQuad(m2DProgram, getWindowWidth() / 2, getWindowHeight() / 2);
>+    EXPECT_PIXEL_COLOR_EQ(getWindowWidth() / 8, getWindowHeight() / 8, GLColor::green);
>+}
>+
>+// Regression test for a bug that cause mipmaps to only generate using the top left corner as input.
>+TEST_P(MipmapTest, MipMapGenerationD3D9Bug)
>+{
>+    ANGLE_SKIP_TEST_IF(!IsGLExtensionEnabled("GL_EXT_texture_storage") ||
>+                       !IsGLExtensionEnabled("GL_OES_rgb8_rgba8") ||
>+                       !IsGLExtensionEnabled("GL_ANGLE_texture_usage"));
>+
>     const GLColor mip0Color[4] = {
>-        GLColor::red, GLColor::green, GLColor::red, GLColor::green,
>+        GLColor::red,
>+        GLColor::green,
>+        GLColor::red,
>+        GLColor::green,
>     };
>     const GLColor mip1Color = GLColor(127, 127, 0, 255);
> 
>@@ -693,9 +773,16 @@ TEST_P(MipmapTest, MipMapGenerationD3D9Bug)
> }
> 
> // This test ensures that the level-zero workaround for TextureCubes (on D3D11 Feature Level 9_3)
>-// works as expected. It tests enabling/disabling mipmaps, generating mipmaps, and rendering to level zero.
>+// works as expected. It tests enabling/disabling mipmaps, generating mipmaps, and rendering to
>+// level zero.
> TEST_P(MipmapTest, TextureCubeGeneralLevelZero)
> {
>+    // http://anglebug.com/3145
>+    ANGLE_SKIP_TEST_IF(IsFuchsia() && IsIntel() && IsVulkan());
>+
>+    // http://anglebug.com/2822
>+    ANGLE_SKIP_TEST_IF(IsWindows() && IsIntel() && IsVulkan());
>+
>     glBindTexture(GL_TEXTURE_CUBE_MAP, mTextureCube);
> 
>     // Draw. Since the negative-Y face's is blue, this should be blue.
>@@ -708,7 +795,8 @@ TEST_P(MipmapTest, TextureCubeGeneralLevelZero)
>     clearAndDrawQuad(mCubeProgram, getWindowWidth(), getWindowHeight());
>     EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::blue);
> 
>-    // Draw using a smaller viewport (to force a lower LOD of the texture). This should still be blue.
>+    // Draw using a smaller viewport (to force a lower LOD of the texture). This should still be
>+    // blue.
>     clearAndDrawQuad(mCubeProgram, getWindowWidth() / 4, getWindowHeight() / 4);
>     EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::blue);
> 
>@@ -719,8 +807,8 @@ TEST_P(MipmapTest, TextureCubeGeneralLevelZero)
>     clearAndDrawQuad(mCubeProgram, getWindowWidth(), getWindowHeight());
>     EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::red);
> 
>-    // Draw using a quarter-size viewport, to force a lower LOD. This should be *BLUE*, since we only cleared level zero
>-    // of the negative-Y face to red, and left its mipmaps blue.
>+    // Draw using a quarter-size viewport, to force a lower LOD. This should be *BLUE*, since we
>+    // only cleared level zero of the negative-Y face to red, and left its mipmaps blue.
>     clearAndDrawQuad(mCubeProgram, getWindowWidth() / 4, getWindowHeight() / 4);
>     EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::blue);
> 
>@@ -734,6 +822,12 @@ TEST_P(MipmapTest, TextureCubeGeneralLevelZero)
> // This test ensures that rendering to level-zero of a TextureCube works as expected.
> TEST_P(MipmapTest, TextureCubeRenderToLevelZero)
> {
>+    // http://anglebug.com/3145
>+    ANGLE_SKIP_TEST_IF(IsFuchsia() && IsIntel() && IsVulkan());
>+
>+    // http://anglebug.com/2822
>+    ANGLE_SKIP_TEST_IF(IsWindows() && IsIntel() && IsVulkan());
>+
>     glBindTexture(GL_TEXTURE_CUBE_MAP, mTextureCube);
> 
>     // Draw. Since the negative-Y face's is blue, this should be blue.
>@@ -919,12 +1013,8 @@ TEST_P(MipmapTestES3, MipmapsForTexture3D)
> // the levelbase array, are left unchanged by this computation."
> TEST_P(MipmapTestES3, GenerateMipmapBaseLevel)
> {
>-    if (IsAMD() && IsDesktopOpenGL())
>-    {
>-        // Observed incorrect rendering on AMD, sampling level 2 returns black.
>-        std::cout << "Test skipped on AMD OpenGL." << std::endl;
>-        return;
>-    }
>+    // Observed incorrect rendering on AMD, sampling level 2 returns black.
>+    ANGLE_SKIP_TEST_IF(IsAMD() && IsDesktopOpenGL());
> 
>     glBindTexture(GL_TEXTURE_2D, mTexture);
> 
>@@ -974,12 +1064,8 @@ TEST_P(MipmapTestES3, GenerateMipmapBaseLevel)
> // the levelbase array, are left unchanged by this computation."
> TEST_P(MipmapTestES3, GenerateMipmapCubeBaseLevel)
> {
>-    if (IsAMD() && IsDesktopOpenGL())
>-    {
>-        // Observed incorrect rendering on AMD, sampling level 2 returns black.
>-        std::cout << "Test skipped on AMD OpenGL." << std::endl;
>-        return;
>-    }
>+    // Observed incorrect rendering on AMD, sampling level 2 returns black.
>+    ANGLE_SKIP_TEST_IF(IsAMD() && IsDesktopOpenGL());
> 
>     ASSERT_EQ(getWindowWidth(), getWindowHeight());
> 
>@@ -1013,13 +1099,9 @@ TEST_P(MipmapTestES3, GenerateMipmapCubeBaseLevel)
>     clearAndDrawQuad(mCubeProgram, getWindowWidth() / 4, getWindowHeight() / 4);
>     EXPECT_PIXEL_COLOR_EQ(getWindowWidth() / 8, getWindowHeight() / 8, GLColor::red);
> 
>-    if (IsNVIDIA() && IsOpenGL())
>-    {
>-        // Observed incorrect rendering on NVIDIA, level zero seems to be incorrectly affected by
>-        // GenerateMipmap.
>-        std::cout << "Test partially skipped on NVIDIA OpenGL." << std::endl;
>-        return;
>-    }
>+    // Observed incorrect rendering on NVIDIA, level zero seems to be incorrectly affected by
>+    // GenerateMipmap.
>+    ANGLE_SKIP_TEST_IF(IsNVIDIA() && IsOpenGL());
> 
>     // Draw using level 0. It should still be blue.
>     glTexParameteri(GL_TEXTURE_CUBE_MAP, GL_TEXTURE_BASE_LEVEL, 0);
>@@ -1133,25 +1215,17 @@ TEST_P(MipmapTestES3, GenerateMipmapBaseLevelOutOfRangeImmutableTexture)
> // A native version of the WebGL2 test tex-base-level-bug.html
> TEST_P(MipmapTestES3, BaseLevelTextureBug)
> {
>-    if (IsOpenGL() && IsAMD())
>-    {
>-        std::cout << "Test skipped on Windows AMD OpenGL." << std::endl;
>-        return;
>-    }
>+    ANGLE_SKIP_TEST_IF(IsOpenGL() && IsAMD());
> 
>-#if defined(ANGLE_PLATFORM_APPLE)
>     // Regression in 10.12.4 needing workaround -- crbug.com/705865.
>     // Seems to be passing on AMD GPUs. Definitely not NVIDIA.
>     // Probably not Intel.
>-    if (IsNVIDIA() || IsIntel())
>-    {
>-        std::cout << "Test skipped on macOS with NVIDIA and Intel GPUs." << std::endl;
>-        return;
>-    }
>-#endif
>+    ANGLE_SKIP_TEST_IF(IsOSX() && (IsNVIDIA() || IsIntel()));
>+
>+    std::vector<GLColor> texDataRed(2u * 2u, GLColor::red);
> 
>     glBindTexture(GL_TEXTURE_2D, mTexture);
>-    glTexImage2D(GL_TEXTURE_2D, 2, GL_RGBA, 2, 2, 0, GL_RGBA, GL_UNSIGNED_BYTE, &GLColor::red);
>+    glTexImage2D(GL_TEXTURE_2D, 2, GL_RGBA, 2, 2, 0, GL_RGBA, GL_UNSIGNED_BYTE, texDataRed.data());
>     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_BASE_LEVEL, 2);
>     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
>     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
>@@ -1167,8 +1241,9 @@ TEST_P(MipmapTestES3, BaseLevelTextureBug)
>     EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::red);
> }
> 
>-// Use this to select which configurations (e.g. which renderer, which GLES major version) these tests should be run against.
>-// Note: we run these tests against 9_3 on WARP due to hardware driver issues on Win7
>+// Use this to select which configurations (e.g. which renderer, which GLES major version) these
>+// tests should be run against. Note: we run these tests against 9_3 on WARP due to hardware driver
>+// issues on Win7
> ANGLE_INSTANTIATE_TEST(MipmapTest,
>                        ES2_D3D9(),
>                        ES2_D3D11(EGL_EXPERIMENTAL_PRESENT_PATH_COPY_ANGLE),
>@@ -1177,5 +1252,6 @@ ANGLE_INSTANTIATE_TEST(MipmapTest,
>                        ES2_OPENGL(),
>                        ES3_OPENGL(),
>                        ES2_OPENGLES(),
>-                       ES3_OPENGLES());
>+                       ES3_OPENGLES(),
>+                       ES2_VULKAN());
> ANGLE_INSTANTIATE_TEST(MipmapTestES3, ES3_D3D11(), ES3_OPENGL(), ES3_OPENGLES());
>diff --git a/Source/ThirdParty/ANGLE/src/tests/gl_tests/MultiDrawTest.cpp b/Source/ThirdParty/ANGLE/src/tests/gl_tests/MultiDrawTest.cpp
>new file mode 100644
>index 00000000000..d3564823803
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/tests/gl_tests/MultiDrawTest.cpp
>@@ -0,0 +1,533 @@
>+//
>+// Copyright 2018 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+
>+// MultiDrawTest: Tests of GL_ANGLE_multi_draw
>+
>+#include "test_utils/ANGLETest.h"
>+#include "test_utils/gl_raii.h"
>+
>+using namespace angle;
>+
>+namespace
>+{
>+
>+// Create a kWidth * kHeight canvas equally split into kCountX * kCountY tiles
>+// each containing a quad partially coverting each tile
>+constexpr uint32_t kWidth                  = 256;
>+constexpr uint32_t kHeight                 = 256;
>+constexpr uint32_t kCountX                 = 8;
>+constexpr uint32_t kCountY                 = 8;
>+constexpr uint32_t kQuadCount              = kCountX * kCountY;
>+constexpr uint32_t kTriCount               = kQuadCount * 2;
>+constexpr std::array<GLfloat, 2> kTileSize = {
>+    1.f / static_cast<GLfloat>(kCountX),
>+    1.f / static_cast<GLfloat>(kCountY),
>+};
>+constexpr std::array<uint32_t, 2> kTilePixelSize  = {kWidth / kCountX, kHeight / kCountY};
>+constexpr std::array<GLfloat, 2> kQuadRadius      = {0.25f * kTileSize[0], 0.25f * kTileSize[1]};
>+constexpr std::array<uint32_t, 2> kPixelCheckSize = {
>+    static_cast<uint32_t>(kQuadRadius[0] * kWidth),
>+    static_cast<uint32_t>(kQuadRadius[1] * kHeight)};
>+
>+constexpr std::array<GLfloat, 2> getTileCenter(uint32_t x, uint32_t y)
>+{
>+    return {
>+        kTileSize[0] * (0.5f + static_cast<GLfloat>(x)),
>+        kTileSize[1] * (0.5f + static_cast<GLfloat>(y)),
>+    };
>+}
>+constexpr std::array<std::array<GLfloat, 3>, 4> getQuadVertices(uint32_t x, uint32_t y)
>+{
>+    const auto center = getTileCenter(x, y);
>+    return {
>+        std::array<GLfloat, 3>{center[0] - kQuadRadius[0], center[1] - kQuadRadius[1], 0.0f},
>+        std::array<GLfloat, 3>{center[0] + kQuadRadius[0], center[1] - kQuadRadius[1], 0.0f},
>+        std::array<GLfloat, 3>{center[0] + kQuadRadius[0], center[1] + kQuadRadius[1], 0.0f},
>+        std::array<GLfloat, 3>{center[0] - kQuadRadius[0], center[1] + kQuadRadius[1], 0.0f},
>+    };
>+}
>+
>+enum class DrawIDOption
>+{
>+    NoDrawID,
>+    UseDrawID,
>+};
>+
>+enum class InstancingOption
>+{
>+    NoInstancing,
>+    UseInstancing,
>+};
>+
>+using MultiDrawTestParams = std::tuple<angle::PlatformParameters, DrawIDOption, InstancingOption>;
>+
>+struct PrintToStringParamName
>+{
>+    std::string operator()(const ::testing::TestParamInfo<MultiDrawTestParams> &info) const
>+    {
>+        ::std::stringstream ss;
>+        ss << (std::get<2>(info.param) == InstancingOption::UseInstancing ? "Instanced_" : "")
>+           << (std::get<1>(info.param) == DrawIDOption::UseDrawID ? "DrawID_" : "")
>+           << std::get<0>(info.param);
>+        return ss.str();
>+    }
>+};
>+
>+// These tests check correctness of the ANGLE_multi_draw extension.
>+// An array of quads is drawn across the screen.
>+// gl_DrawID is checked by using it to select the color of the draw.
>+// MultiDraw*Instanced entrypoints use the existing instancing APIs which are
>+// more fully tested in InstancingTest.cpp.
>+// Correct interaction with the instancing APIs is tested here by using scaling
>+// and then instancing the array of quads over four quadrants on the screen.
>+class MultiDrawTest : public ANGLETestBase, public ::testing::TestWithParam<MultiDrawTestParams>
>+{
>+  protected:
>+    MultiDrawTest()
>+        : ANGLETestBase(std::get<0>(GetParam())),
>+          mNonIndexedVertexBuffer(0u),
>+          mVertexBuffer(0u),
>+          mIndexBuffer(0u),
>+          mInstanceBuffer(0u),
>+          mProgram(0u)
>+    {
>+        setWindowWidth(kWidth);
>+        setWindowHeight(kHeight);
>+        setConfigRedBits(8);
>+        setConfigGreenBits(8);
>+        setConfigBlueBits(8);
>+        setConfigAlphaBits(8);
>+    }
>+
>+    void SetUp() override { ANGLETestBase::ANGLETestSetUp(); }
>+
>+    bool IsDrawIDTest() const { return std::get<1>(GetParam()) == DrawIDOption::UseDrawID; }
>+
>+    bool IsInstancedTest() const
>+    {
>+        return std::get<2>(GetParam()) == InstancingOption::UseInstancing;
>+    }
>+
>+    std::string VertexShaderSource()
>+    {
>+
>+        std::stringstream shader;
>+        shader << (IsDrawIDTest() ? "#extension GL_ANGLE_multi_draw : require\n" : "")
>+               << (IsInstancedTest() ? "attribute float vInstance;" : "") << R"(
>+attribute vec2 vPosition;
>+varying vec4 color;
>+void main()
>+{
>+    int id = )" << (IsDrawIDTest() ? "gl_DrawID" : "0")
>+               << ";"
>+               << R"(
>+    float quad_id = float(id / 2);
>+    float color_id = quad_id - (3.0 * floor(quad_id / 3.0));
>+    if (color_id == 0.0) {
>+      color = vec4(1, 0, 0, 1);
>+    } else if (color_id == 1.0) {
>+      color = vec4(0, 1, 0, 1);
>+    } else {
>+      color = vec4(0, 0, 1, 1);
>+    }
>+
>+    mat3 transform = mat3(1.0);
>+)"
>+               << (IsInstancedTest() ? R"(
>+    transform[0][0] = 0.5;
>+    transform[1][1] = 0.5;
>+    if (vInstance == 0.0) {
>+
>+    } else if (vInstance == 1.0) {
>+        transform[2][0] = 0.5;
>+    } else if (vInstance == 2.0) {
>+        transform[2][1] = 0.5;
>+    } else if (vInstance == 3.0) {
>+        transform[2][0] = 0.5;
>+        transform[2][1] = 0.5;
>+    }
>+)"
>+                                     : "")
>+               << R"(
>+    gl_Position = vec4(transform * vec3(vPosition, 1.0) * 2.0 - 1.0, 1);
>+})";
>+
>+        return shader.str();
>+    }
>+
>+    std::string FragmentShaderSource()
>+    {
>+        return
>+            R"(precision mediump float;
>+            varying vec4 color;
>+            void main()
>+            {
>+                gl_FragColor = color;
>+            })";
>+    }
>+
>+    void SetupProgram()
>+    {
>+        mProgram = CompileProgram(VertexShaderSource().c_str(), FragmentShaderSource().c_str());
>+        EXPECT_GL_NO_ERROR();
>+        ASSERT_GE(mProgram, 1u);
>+        glUseProgram(mProgram);
>+        mPositionLoc = glGetAttribLocation(mProgram, "vPosition");
>+        mInstanceLoc = glGetAttribLocation(mProgram, "vInstance");
>+    }
>+
>+    void SetupBuffers()
>+    {
>+        for (uint32_t y = 0; y < kCountY; ++y)
>+        {
>+            for (uint32_t x = 0; x < kCountX; ++x)
>+            {
>+                // v3 ---- v2
>+                // |       |
>+                // |       |
>+                // v0 ---- v1
>+                uint32_t quadIndex         = y * kCountX + x;
>+                GLushort starting_index    = static_cast<GLushort>(4 * quadIndex);
>+                std::array<GLushort, 6> is = {0, 1, 2, 0, 2, 3};
>+                const auto vs              = getQuadVertices(x, y);
>+                for (GLushort i : is)
>+                {
>+                    mIndices.push_back(starting_index + i);
>+                }
>+
>+                for (const auto &v : vs)
>+                {
>+                    mVertices.insert(mVertices.end(), v.begin(), v.end());
>+                }
>+
>+                for (GLushort i : is)
>+                {
>+                    mNonIndexedVertices.insert(mNonIndexedVertices.end(), vs[i].begin(),
>+                                               vs[i].end());
>+                }
>+            }
>+        }
>+
>+        std::array<GLfloat, 4> instances{0, 1, 2, 3};
>+
>+        glGenBuffers(1, &mNonIndexedVertexBuffer);
>+        glBindBuffer(GL_ARRAY_BUFFER, mNonIndexedVertexBuffer);
>+        glBufferData(GL_ARRAY_BUFFER, sizeof(GLfloat) * mNonIndexedVertices.size(),
>+                     mNonIndexedVertices.data(), GL_STATIC_DRAW);
>+
>+        glGenBuffers(1, &mVertexBuffer);
>+        glBindBuffer(GL_ARRAY_BUFFER, mVertexBuffer);
>+        glBufferData(GL_ARRAY_BUFFER, sizeof(GLfloat) * mVertices.size(), mVertices.data(),
>+                     GL_STATIC_DRAW);
>+
>+        glGenBuffers(1, &mIndexBuffer);
>+        glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, mIndexBuffer);
>+        glBufferData(GL_ELEMENT_ARRAY_BUFFER, sizeof(GLushort) * mIndices.size(), mIndices.data(),
>+                     GL_STATIC_DRAW);
>+
>+        glGenBuffers(1, &mInstanceBuffer);
>+        glBindBuffer(GL_ARRAY_BUFFER, mInstanceBuffer);
>+        glBufferData(GL_ARRAY_BUFFER, sizeof(GLfloat) * instances.size(), instances.data(),
>+                     GL_STATIC_DRAW);
>+
>+        ASSERT_GL_NO_ERROR();
>+    }
>+
>+    void DoVertexAttribDivisor(GLint location, GLuint divisor)
>+    {
>+        if (getClientMajorVersion() <= 2)
>+        {
>+            ASSERT_TRUE(IsGLExtensionEnabled("GL_ANGLE_instanced_arrays"));
>+            glVertexAttribDivisorANGLE(location, divisor);
>+        }
>+        else
>+        {
>+            glVertexAttribDivisor(location, divisor);
>+        }
>+    }
>+
>+    void DoDrawArrays()
>+    {
>+        glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
>+        glBindBuffer(GL_ARRAY_BUFFER, mNonIndexedVertexBuffer);
>+        glEnableVertexAttribArray(mPositionLoc);
>+        glVertexAttribPointer(mPositionLoc, 3, GL_FLOAT, GL_FALSE, 0, 0);
>+
>+        std::vector<GLint> firsts(kTriCount);
>+        std::vector<GLsizei> counts(kTriCount, 3);
>+        for (uint32_t i = 0; i < kTriCount; ++i)
>+            firsts[i] = i * 3;
>+
>+        if (IsInstancedTest())
>+        {
>+            glBindBuffer(GL_ARRAY_BUFFER, mInstanceBuffer);
>+            glEnableVertexAttribArray(mInstanceLoc);
>+            glVertexAttribPointer(mInstanceLoc, 1, GL_FLOAT, GL_FALSE, 0, 0);
>+            DoVertexAttribDivisor(mInstanceLoc, 1);
>+            std::vector<GLsizei> instanceCounts(kTriCount, 4);
>+            glMultiDrawArraysInstancedANGLE(GL_TRIANGLES, firsts.data(), counts.data(),
>+                                            instanceCounts.data(), kTriCount);
>+        }
>+        else
>+        {
>+            glMultiDrawArraysANGLE(GL_TRIANGLES, firsts.data(), counts.data(), kTriCount);
>+        }
>+    }
>+
>+    void DoDrawElements()
>+    {
>+        glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
>+        glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, mIndexBuffer);
>+        glBindBuffer(GL_ARRAY_BUFFER, mVertexBuffer);
>+        glEnableVertexAttribArray(mPositionLoc);
>+        glVertexAttribPointer(mPositionLoc, 3, GL_FLOAT, GL_FALSE, 0, 0);
>+
>+        std::vector<GLsizei> counts(kTriCount, 3);
>+        std::vector<const GLvoid *> indices(kTriCount);
>+        for (uint32_t i = 0; i < kTriCount; ++i)
>+            indices[i] = reinterpret_cast<GLvoid *>(static_cast<uintptr_t>(i * 3 * 2));
>+
>+        if (IsInstancedTest())
>+        {
>+            glBindBuffer(GL_ARRAY_BUFFER, mInstanceBuffer);
>+            glEnableVertexAttribArray(mInstanceLoc);
>+            glVertexAttribPointer(mInstanceLoc, 1, GL_FLOAT, GL_FALSE, 0, 0);
>+            DoVertexAttribDivisor(mInstanceLoc, 1);
>+            std::vector<GLsizei> instanceCounts(kTriCount, 4);
>+            glMultiDrawElementsInstancedANGLE(GL_TRIANGLES, counts.data(), GL_UNSIGNED_SHORT,
>+                                              indices.data(), instanceCounts.data(), kTriCount);
>+        }
>+        else
>+        {
>+            glMultiDrawElementsANGLE(GL_TRIANGLES, counts.data(), GL_UNSIGNED_SHORT, indices.data(),
>+                                     kTriCount);
>+        }
>+    }
>+
>+    void CheckDrawResult()
>+    {
>+        for (uint32_t y = 0; y < kCountY; ++y)
>+        {
>+            for (uint32_t x = 0; x < kCountX; ++x)
>+            {
>+                uint32_t center_x             = x * kTilePixelSize[0] + kTilePixelSize[0] / 2;
>+                uint32_t center_y             = y * kTilePixelSize[1] + kTilePixelSize[1] / 2;
>+                uint32_t quadID               = IsDrawIDTest() ? y * kCountX + x : 0;
>+                uint32_t colorID              = quadID % 3u;
>+                std::array<GLColor, 3> colors = {GLColor(255, 0, 0, 255), GLColor(0, 255, 0, 255),
>+                                                 GLColor(0, 0, 255, 255)};
>+                GLColor expected              = colors[colorID];
>+
>+                if (IsInstancedTest())
>+                {
>+                    EXPECT_PIXEL_RECT_EQ(center_x / 2 - kPixelCheckSize[0] / 4,
>+                                         center_y / 2 - kPixelCheckSize[1] / 4,
>+                                         kPixelCheckSize[0] / 2, kPixelCheckSize[1] / 2, expected);
>+                    EXPECT_PIXEL_RECT_EQ(center_x / 2 - kPixelCheckSize[0] / 4 + kWidth / 2,
>+                                         center_y / 2 - kPixelCheckSize[1] / 4,
>+                                         kPixelCheckSize[0] / 2, kPixelCheckSize[1] / 2, expected);
>+                    EXPECT_PIXEL_RECT_EQ(center_x / 2 - kPixelCheckSize[0] / 4,
>+                                         center_y / 2 - kPixelCheckSize[1] / 4 + kHeight / 2,
>+                                         kPixelCheckSize[0] / 2, kPixelCheckSize[1] / 2, expected);
>+                    EXPECT_PIXEL_RECT_EQ(center_x / 2 - kPixelCheckSize[0] / 4 + kWidth / 2,
>+                                         center_y / 2 - kPixelCheckSize[1] / 4 + kHeight / 2,
>+                                         kPixelCheckSize[0] / 2, kPixelCheckSize[1] / 2, expected);
>+                }
>+                else
>+                {
>+                    EXPECT_PIXEL_RECT_EQ(center_x - kPixelCheckSize[0] / 2,
>+                                         center_y - kPixelCheckSize[1] / 2, kPixelCheckSize[0],
>+                                         kPixelCheckSize[1], expected);
>+                }
>+            }
>+        }
>+    }
>+
>+    void TearDown() override
>+    {
>+        if (mNonIndexedVertexBuffer != 0u)
>+        {
>+            glDeleteBuffers(1, &mNonIndexedVertexBuffer);
>+        }
>+        if (mVertexBuffer != 0u)
>+        {
>+            glDeleteBuffers(1, &mVertexBuffer);
>+        }
>+        if (mIndexBuffer != 0u)
>+        {
>+            glDeleteBuffers(1, &mIndexBuffer);
>+        }
>+        if (mInstanceBuffer != 0u)
>+        {
>+            glDeleteBuffers(1, &mInstanceBuffer);
>+        }
>+        if (mProgram != 0)
>+        {
>+            glDeleteProgram(mProgram);
>+        }
>+        ANGLETestBase::ANGLETestTearDown();
>+    }
>+
>+    bool requestMultiDrawExtension()
>+    {
>+        if (IsGLExtensionRequestable("GL_ANGLE_multi_draw"))
>+        {
>+            glRequestExtensionANGLE("GL_ANGLE_multi_draw");
>+        }
>+
>+        if (!IsGLExtensionEnabled("GL_ANGLE_multi_draw"))
>+        {
>+            return false;
>+        }
>+
>+        return true;
>+    }
>+
>+    bool requestInstancedExtension()
>+    {
>+        if (IsGLExtensionRequestable("GL_ANGLE_instanced_arrays"))
>+        {
>+            glRequestExtensionANGLE("GL_ANGLE_instanced_arrays");
>+        }
>+
>+        if (!IsGLExtensionEnabled("GL_ANGLE_instanced_arrays"))
>+        {
>+            return false;
>+        }
>+
>+        return true;
>+    }
>+
>+    bool requestExtensions()
>+    {
>+        if (IsInstancedTest() && getClientMajorVersion() <= 2)
>+        {
>+            if (!requestInstancedExtension())
>+            {
>+                return false;
>+            }
>+        }
>+        return requestMultiDrawExtension();
>+    }
>+
>+    std::vector<GLushort> mIndices;
>+    std::vector<GLfloat> mVertices;
>+    std::vector<GLfloat> mNonIndexedVertices;
>+    GLuint mNonIndexedVertexBuffer;
>+    GLuint mVertexBuffer;
>+    GLuint mIndexBuffer;
>+    GLuint mInstanceBuffer;
>+    GLuint mProgram;
>+    GLint mPositionLoc;
>+    GLint mInstanceLoc;
>+};
>+
>+class MultiDrawNoInstancingSupportTest : public MultiDrawTest
>+{
>+    void SetUp() override
>+    {
>+        ASSERT_LE(getClientMajorVersion(), 2);
>+        ASSERT_TRUE(IsInstancedTest());
>+        MultiDrawTest::SetUp();
>+    }
>+};
>+
>+// glMultiDraw*ANGLE are emulated and should always be available
>+TEST_P(MultiDrawTest, RequestExtension)
>+{
>+    EXPECT_TRUE(requestMultiDrawExtension());
>+}
>+
>+// Test that compile a program with the extension succeeds
>+TEST_P(MultiDrawTest, CanCompile)
>+{
>+    ANGLE_SKIP_TEST_IF(!requestExtensions());
>+    SetupProgram();
>+}
>+
>+// Tests basic functionality of glMultiDrawArraysANGLE
>+TEST_P(MultiDrawTest, MultiDrawArrays)
>+{
>+    ANGLE_SKIP_TEST_IF(!requestExtensions());
>+    SetupBuffers();
>+    SetupProgram();
>+    DoDrawArrays();
>+    EXPECT_GL_NO_ERROR();
>+    CheckDrawResult();
>+}
>+
>+// Tests basic functionality of glMultiDrawElementsANGLE
>+TEST_P(MultiDrawTest, MultiDrawElements)
>+{
>+    ANGLE_SKIP_TEST_IF(!requestExtensions());
>+    SetupBuffers();
>+    SetupProgram();
>+    DoDrawElements();
>+    EXPECT_GL_NO_ERROR();
>+    CheckDrawResult();
>+}
>+
>+// Check that glMultiDraw*Instanced without instancing support results in GL_INVALID_OPERATION
>+TEST_P(MultiDrawNoInstancingSupportTest, InvalidOperation)
>+{
>+    ANGLE_SKIP_TEST_IF(IsGLExtensionEnabled("GL_ANGLE_instanced_arrays"));
>+    requestMultiDrawExtension();
>+    SetupBuffers();
>+    SetupProgram();
>+
>+    GLint first       = 0;
>+    GLsizei count     = 3;
>+    GLvoid *indices   = 0;
>+    GLsizei instances = 1;
>+
>+    glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
>+    glBindBuffer(GL_ARRAY_BUFFER, mNonIndexedVertexBuffer);
>+    glEnableVertexAttribArray(mPositionLoc);
>+    glVertexAttribPointer(mPositionLoc, 3, GL_FLOAT, GL_FALSE, 0, 0);
>+    glMultiDrawArraysInstancedANGLE(GL_TRIANGLES, &first, &count, &instances, 1);
>+    EXPECT_GL_ERROR(GL_INVALID_OPERATION);
>+
>+    glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
>+    glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, mIndexBuffer);
>+    glBindBuffer(GL_ARRAY_BUFFER, mVertexBuffer);
>+    glEnableVertexAttribArray(mPositionLoc);
>+    glVertexAttribPointer(mPositionLoc, 3, GL_FLOAT, GL_FALSE, 0, 0);
>+    glMultiDrawElementsInstancedANGLE(GL_TRIANGLES, &count, GL_UNSIGNED_SHORT, &indices, &instances,
>+                                      1);
>+    EXPECT_GL_ERROR(GL_INVALID_OPERATION);
>+}
>+
>+const angle::PlatformParameters platforms[] = {
>+    ES2_D3D9(),  ES2_OPENGL(), ES2_OPENGLES(), ES2_VULKAN(),
>+    ES3_D3D11(), ES3_OPENGL(), ES3_OPENGLES(),
>+};
>+
>+const angle::PlatformParameters es2_platforms[] = {
>+    ES2_D3D9(),
>+    ES2_OPENGL(),
>+    ES2_OPENGLES(),
>+    ES2_VULKAN(),
>+};
>+
>+INSTANTIATE_TEST_SUITE_P(
>+    ,
>+    MultiDrawTest,
>+    testing::Combine(testing::ValuesIn(::angle::FilterTestParams(platforms, ArraySize(platforms))),
>+                     testing::Values(DrawIDOption::NoDrawID, DrawIDOption::UseDrawID),
>+                     testing::Values(InstancingOption::NoInstancing,
>+                                     InstancingOption::UseInstancing)),
>+    PrintToStringParamName());
>+
>+INSTANTIATE_TEST_SUITE_P(
>+    ,
>+    MultiDrawNoInstancingSupportTest,
>+    testing::Combine(testing::ValuesIn(::angle::FilterTestParams(es2_platforms,
>+                                                                 ArraySize(es2_platforms))),
>+                     testing::Values(DrawIDOption::NoDrawID, DrawIDOption::UseDrawID),
>+                     testing::Values(InstancingOption::UseInstancing)),
>+    PrintToStringParamName());
>+
>+}  // namespace
>diff --git a/Source/ThirdParty/ANGLE/src/tests/gl_tests/MultisampleCompatibilityTest.cpp b/Source/ThirdParty/ANGLE/src/tests/gl_tests/MultisampleCompatibilityTest.cpp
>index e2203be41f6..f3821881936 100644
>--- a/Source/ThirdParty/ANGLE/src/tests/gl_tests/MultisampleCompatibilityTest.cpp
>+++ b/Source/ThirdParty/ANGLE/src/tests/gl_tests/MultisampleCompatibilityTest.cpp
>@@ -9,21 +9,20 @@
> 
> #include "test_utils/ANGLETest.h"
> #include "test_utils/gl_raii.h"
>-#include "shader_utils.h"
> 
> using namespace angle;
> 
> namespace
> {
> 
>-const GLint kWidth = 64;
>+const GLint kWidth  = 64;
> const GLint kHeight = 64;
> 
> // test drawing with GL_MULTISAMPLE_EXT enabled/disabled.
> class EXTMultisampleCompatibilityTest : public ANGLETest
> {
> 
>-protected:
>+  protected:
>     EXTMultisampleCompatibilityTest()
>     {
>         setWindowWidth(64);
>@@ -37,20 +36,10 @@ protected:
>     {
>         ANGLETest::SetUp();
> 
>-        static const char* v_shader_str =
>-            "attribute vec4 a_Position;\n"
>-            "void main()\n"
>-            "{ gl_Position = a_Position; }";
>-
>-        static const char* f_shader_str =
>-            "precision mediump float;\n"
>-            "uniform vec4 color;"
>-            "void main() { gl_FragColor = color; }";
>-
>-        mProgram = CompileProgram(v_shader_str, f_shader_str);
>+        mProgram = CompileProgram(essl1_shaders::vs::Simple(), essl1_shaders::fs::UniformColor());
> 
>-        GLuint position_loc = glGetAttribLocation(mProgram, "a_Position");
>-        mColorLoc = glGetUniformLocation(mProgram, "color");
>+        GLuint position_loc = glGetAttribLocation(mProgram, essl1_shaders::PositionAttrib());
>+        mColorLoc           = glGetUniformLocation(mProgram, essl1_shaders::ColorUniform());
> 
>         glGenBuffers(1, &mVBO);
>         glBindBuffer(GL_ARRAY_BUFFER, mVBO);
>@@ -80,19 +69,17 @@ protected:
> 
>         glGenRenderbuffers(1, &mSampleRB);
>         glBindRenderbuffer(GL_RENDERBUFFER, mSampleRB);
>-        glRenderbufferStorageMultisampleANGLE(GL_RENDERBUFFER, num_samples,
>-                                             GL_RGBA8_OES, kWidth, kHeight);
>+        glRenderbufferStorageMultisampleANGLE(GL_RENDERBUFFER, num_samples, GL_RGBA8_OES, kWidth,
>+                                              kHeight);
>         GLint param = 0;
>-        glGetRenderbufferParameteriv(GL_RENDERBUFFER, GL_RENDERBUFFER_SAMPLES,
>-                                 &param);
>+        glGetRenderbufferParameteriv(GL_RENDERBUFFER, GL_RENDERBUFFER_SAMPLES, &param);
>         EXPECT_GE(param, num_samples);
> 
>         glGenFramebuffers(1, &mSampleFBO);
>         glBindFramebuffer(GL_FRAMEBUFFER, mSampleFBO);
>-        glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0,
>-                              GL_RENDERBUFFER, mSampleRB);
>+        glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_RENDERBUFFER, mSampleRB);
>         EXPECT_EQ(static_cast<GLenum>(GL_FRAMEBUFFER_COMPLETE),
>-          glCheckFramebufferStatus(GL_FRAMEBUFFER));
>+                  glCheckFramebufferStatus(GL_FRAMEBUFFER));
>         glBindFramebuffer(GL_FRAMEBUFFER, 0);
> 
>         // Create another FBO to resolve the multisample buffer into.
>@@ -106,10 +93,9 @@ protected:
>         glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
>         glGenFramebuffers(1, &mResolveFBO);
>         glBindFramebuffer(GL_FRAMEBUFFER, mResolveFBO);
>-        glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D,
>-                           mResolveTex, 0);
>+        glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, mResolveTex, 0);
>         EXPECT_EQ(static_cast<GLenum>(GL_FRAMEBUFFER_COMPLETE),
>-          glCheckFramebufferStatus(GL_FRAMEBUFFER));
>+                  glCheckFramebufferStatus(GL_FRAMEBUFFER));
> 
>         glUseProgram(mProgram);
>         glViewport(0, 0, kWidth, kHeight);
>@@ -127,8 +113,8 @@ protected:
>         glBindFramebuffer(GL_DRAW_FRAMEBUFFER, mResolveFBO);
>         glClearColor(1.0f, 0.0f, 0.0f, 0.0f);
>         glClear(GL_COLOR_BUFFER_BIT);
>-        glBlitFramebufferANGLE(0, 0, kWidth, kHeight, 0, 0, kWidth, kHeight,
>-          GL_COLOR_BUFFER_BIT, GL_NEAREST);
>+        glBlitFramebufferANGLE(0, 0, kWidth, kHeight, 0, 0, kWidth, kHeight, GL_COLOR_BUFFER_BIT,
>+                               GL_NEAREST);
>         glBindFramebuffer(GL_READ_FRAMEBUFFER, mResolveFBO);
> 
>         ASSERT_GL_NO_ERROR();
>@@ -143,15 +129,13 @@ protected:
>         glDeleteRenderbuffers(1, &mSampleRB);
> 
>         ASSERT_GL_NO_ERROR();
>-
>     }
> 
>     bool isApplicable() const
>     {
>-        return extensionEnabled("GL_EXT_multisample_compatibility") &&
>-             extensionEnabled("GL_ANGLE_framebuffer_multisample") &&
>-             extensionEnabled("GL_OES_rgb8_rgba8") &&
>-             !IsAMD();
>+        return IsGLExtensionEnabled("GL_EXT_multisample_compatibility") &&
>+               IsGLExtensionEnabled("GL_ANGLE_framebuffer_multisample") &&
>+               IsGLExtensionEnabled("GL_OES_rgb8_rgba8") && !IsAMD();
>     }
>     GLuint mSampleFBO;
>     GLuint mResolveFBO;
>@@ -163,7 +147,7 @@ protected:
>     GLuint mVBO;
> };
> 
>-} //
>+}  // namespace
> 
> // Test simple state tracking
> TEST_P(EXTMultisampleCompatibilityTest, TestStateTracking)
>@@ -192,9 +176,9 @@ TEST_P(EXTMultisampleCompatibilityTest, DrawAndResolve)
>     if (!isApplicable())
>         return;
> 
>-    static const float kBlue[] = {0.0f, 0.0f, 1.0f, 1.0f};
>+    static const float kBlue[]  = {0.0f, 0.0f, 1.0f, 1.0f};
>     static const float kGreen[] = {0.0f, 1.0f, 0.0f, 1.0f};
>-    static const float kRed[] = {1.0f, 0.0f, 0.0f, 1.0f};
>+    static const float kRed[]   = {1.0f, 0.0f, 0.0f, 1.0f};
> 
>     // Different drivers seem to behave differently with respect to resulting
>     // values. These might be due to different MSAA sample counts causing
>@@ -227,8 +211,7 @@ TEST_P(EXTMultisampleCompatibilityTest, DrawAndResolve)
>         prepareForVerify();
>         results[pass].reset(new uint8_t[kResultSize]);
>         memset(results[pass].get(), 123u, kResultSize);
>-        glReadPixels(0, 0, kWidth, kHeight, GL_RGBA, GL_UNSIGNED_BYTE,
>-                   results[pass].get());
>+        glReadPixels(0, 0, kWidth, kHeight, GL_RGBA, GL_UNSIGNED_BYTE, results[pass].get());
> 
>         cleanup();
>     }
>@@ -244,19 +227,12 @@ TEST_P(EXTMultisampleCompatibilityTest, DrawAlphaOneAndResolve)
>     if (!isApplicable())
>         return;
> 
>-    // TODO: Figure out why this fails on Android.
>-    if (IsAndroid())
>-    {
>-        std::cout << "Test skipped on Android." << std::endl;
>-        return;
>-    }
>-
>     // SAMPLE_ALPHA_TO_ONE is specified to transform alpha values of
>     // covered samples to 1.0. In order to detect it, we use non-1.0
>     // alpha.
>-    static const float kBlue[] = {0.0f, 0.0f, 1.0f, 0.5f};
>+    static const float kBlue[]  = {0.0f, 0.0f, 1.0f, 0.5f};
>     static const float kGreen[] = {0.0f, 1.0f, 0.0f, 0.5f};
>-    static const float kRed[] = {1.0f, 0.0f, 0.0f, 0.5f};
>+    static const float kRed[]   = {1.0f, 0.0f, 0.0f, 0.5f};
> 
>     // Different drivers seem to behave differently with respect to resulting
>     // alpha value. These might be due to different MSAA sample counts causing
>@@ -288,8 +264,7 @@ TEST_P(EXTMultisampleCompatibilityTest, DrawAlphaOneAndResolve)
>         prepareForVerify();
>         results[pass].reset(new uint8_t[kResultSize]);
>         memset(results[pass].get(), 123u, kResultSize);
>-        glReadPixels(0, 0, kWidth, kHeight, GL_RGBA, GL_UNSIGNED_BYTE,
>-            results[pass].get());
>+        glReadPixels(0, 0, kWidth, kHeight, GL_RGBA, GL_UNSIGNED_BYTE, results[pass].get());
>         if (pass == 1)
>         {
>             glDisable(GL_SAMPLE_ALPHA_TO_ONE_EXT);
>@@ -303,7 +278,11 @@ TEST_P(EXTMultisampleCompatibilityTest, DrawAlphaOneAndResolve)
>     EXPECT_EQ(0, memcmp(results[0].get(), results[2].get(), kResultSize));
> }
> 
>-ANGLE_INSTANTIATE_TEST(EXTMultisampleCompatibilityTest, ES2_OPENGL(), ES2_OPENGLES(), ES3_OPENGL());
>+ANGLE_INSTANTIATE_TEST(EXTMultisampleCompatibilityTest,
>+                       ES2_OPENGL(),
>+                       ES2_OPENGLES(),
>+                       ES3_OPENGL(),
>+                       ES2_VULKAN());
> 
> class MultisampleCompatibilityTest : public ANGLETest
> {
>@@ -380,8 +359,8 @@ class MultisampleCompatibilityTest : public ANGLETest
> 
>     bool isApplicable() const
>     {
>-        return extensionEnabled("GL_ANGLE_framebuffer_multisample") &&
>-               extensionEnabled("GL_OES_rgb8_rgba8");
>+        return IsGLExtensionEnabled("GL_ANGLE_framebuffer_multisample") &&
>+               IsGLExtensionEnabled("GL_OES_rgb8_rgba8");
>     }
> 
>     GLuint mSampleFBO;
>@@ -397,21 +376,9 @@ TEST_P(MultisampleCompatibilityTest, DrawCoverageAndResolve)
>         return;
> 
>     // TODO: Figure out why this fails on Android.
>-    if (IsAndroid())
>-    {
>-        std::cout << "Test skipped on Android." << std::endl;
>-        return;
>-    }
>-
>-    const std::string &vertex =
>-        "attribute vec4 position;\n"
>-        "void main()\n"
>-        "{ gl_Position = position; }";
>-    const std::string &fragment =
>-        "void main()\n"
>-        "{ gl_FragColor =  vec4(1.0, 0.0, 0.0, 1.0); }";
>+    ANGLE_SKIP_TEST_IF(IsAndroid() && IsOpenGLES());
> 
>-    ANGLE_GL_PROGRAM(drawRed, vertex, fragment);
>+    ANGLE_GL_PROGRAM(drawRed, essl1_shaders::vs::Simple(), essl1_shaders::fs::Red());
> 
>     GLsizei maxSamples = 0;
>     glGetIntegerv(GL_MAX_SAMPLES, &maxSamples);
>@@ -421,7 +388,7 @@ TEST_P(MultisampleCompatibilityTest, DrawCoverageAndResolve)
>         prepareForDraw(samples);
>         glEnable(GL_SAMPLE_COVERAGE);
>         glSampleCoverage(1.0, false);
>-        drawQuad(drawRed.get(), "position", 0.5f);
>+        drawQuad(drawRed.get(), essl1_shaders::PositionAttrib(), 0.5f);
> 
>         prepareForVerify();
>         GLsizei pixelCount = kWidth * kHeight;
>@@ -441,4 +408,5 @@ ANGLE_INSTANTIATE_TEST(MultisampleCompatibilityTest,
>                        ES2_OPENGLES(),
>                        ES3_D3D11(),
>                        ES3_OPENGL(),
>-                       ES3_OPENGLES());
>+                       ES3_OPENGLES(),
>+                       ES2_VULKAN());
>diff --git a/Source/ThirdParty/ANGLE/src/tests/gl_tests/MultithreadingTest.cpp b/Source/ThirdParty/ANGLE/src/tests/gl_tests/MultithreadingTest.cpp
>new file mode 100644
>index 00000000000..19fc9d2ea4f
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/tests/gl_tests/MultithreadingTest.cpp
>@@ -0,0 +1,165 @@
>+//
>+// Copyright 2018 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// MulithreadingTest.cpp : Tests of multithreaded rendering
>+
>+#include "test_utils/ANGLETest.h"
>+
>+#include "test_utils/gl_raii.h"
>+#include "util/EGLWindow.h"
>+
>+#include <mutex>
>+#include <thread>
>+
>+namespace angle
>+{
>+
>+class MultithreadingTest : public ANGLETest
>+{
>+  protected:
>+    MultithreadingTest()
>+    {
>+        setWindowWidth(128);
>+        setWindowHeight(128);
>+        setConfigRedBits(8);
>+        setConfigGreenBits(8);
>+        setConfigBlueBits(8);
>+        setConfigAlphaBits(8);
>+    }
>+
>+    bool platformSupportsMultithreading() const { return (IsOpenGLES() && IsAndroid()); }
>+};
>+
>+// Test that it's possible to make one context current on different threads
>+TEST_P(MultithreadingTest, MakeCurrentSingleContext)
>+{
>+    ANGLE_SKIP_TEST_IF(!platformSupportsMultithreading());
>+
>+    std::mutex mutex;
>+
>+    EGLWindow *window  = getEGLWindow();
>+    EGLDisplay dpy     = window->getDisplay();
>+    EGLContext ctx     = window->getContext();
>+    EGLSurface surface = window->getSurface();
>+
>+    EXPECT_EGL_TRUE(eglMakeCurrent(dpy, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT));
>+    EXPECT_EGL_SUCCESS();
>+
>+    constexpr size_t kThreadCount = 16;
>+    std::array<std::thread, kThreadCount> threads;
>+    for (std::thread &thread : threads)
>+    {
>+        thread = std::thread([&]() {
>+            std::lock_guard<decltype(mutex)> lock(mutex);
>+
>+            EXPECT_EGL_TRUE(eglMakeCurrent(dpy, surface, surface, ctx));
>+            EXPECT_EGL_SUCCESS();
>+
>+            EXPECT_EGL_TRUE(eglSwapBuffers(dpy, surface));
>+            EXPECT_EGL_SUCCESS();
>+
>+            EXPECT_EGL_TRUE(eglMakeCurrent(dpy, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT));
>+            EXPECT_EGL_SUCCESS();
>+        });
>+    }
>+
>+    for (std::thread &thread : threads)
>+    {
>+        thread.join();
>+    }
>+
>+    EXPECT_EGL_TRUE(eglMakeCurrent(dpy, surface, surface, ctx));
>+    EXPECT_EGL_SUCCESS();
>+}
>+
>+// Test that it's possible to make one multiple contexts current on different threads simultaneously
>+TEST_P(MultithreadingTest, MakeCurrentMultiContext)
>+{
>+    ANGLE_SKIP_TEST_IF(!platformSupportsMultithreading());
>+    ANGLE_SKIP_TEST_IF(IsWindows() && IsOpenGL() && IsAMD());
>+
>+    std::mutex mutex;
>+
>+    EGLWindow *window = getEGLWindow();
>+    EGLDisplay dpy    = window->getDisplay();
>+    EGLConfig config  = window->getConfig();
>+
>+    constexpr size_t kThreadCount         = 16;
>+    constexpr size_t kIterationsPerThread = 16;
>+
>+    constexpr EGLint kPBufferSize = 256;
>+
>+    std::array<std::thread, kThreadCount> threads;
>+    for (size_t thread = 0; thread < kThreadCount; thread++)
>+    {
>+        threads[thread] = std::thread([&, thread]() {
>+            EGLSurface pbuffer = EGL_NO_SURFACE;
>+            EGLConfig ctx      = EGL_NO_CONTEXT;
>+
>+            {
>+                std::lock_guard<decltype(mutex)> lock(mutex);
>+
>+                // Initialize the pbuffer and context
>+                EGLint pbufferAttributes[] = {
>+                    EGL_WIDTH, kPBufferSize, EGL_HEIGHT, kPBufferSize, EGL_NONE, EGL_NONE,
>+                };
>+                pbuffer = eglCreatePbufferSurface(dpy, config, pbufferAttributes);
>+                EXPECT_EGL_SUCCESS();
>+
>+                ctx = window->createContext(EGL_NO_CONTEXT);
>+                EXPECT_NE(EGL_NO_CONTEXT, ctx);
>+
>+                EXPECT_EGL_TRUE(eglMakeCurrent(dpy, pbuffer, pbuffer, ctx));
>+                EXPECT_EGL_SUCCESS();
>+            }
>+
>+            for (size_t iteration = 0; iteration < kIterationsPerThread; iteration++)
>+            {
>+                std::lock_guard<decltype(mutex)> lock(mutex);
>+
>+                // Base the clear color on the thread and iteration indexes so every clear color is
>+                // unique
>+                const GLColor color(static_cast<GLubyte>(thread), static_cast<GLubyte>(iteration),
>+                                    0, 255);
>+                const angle::Vector4 floatColor = color.toNormalizedVector();
>+
>+                glClearColor(floatColor[0], floatColor[1], floatColor[2], floatColor[3]);
>+                EXPECT_GL_NO_ERROR();
>+
>+                glClear(GL_COLOR_BUFFER_BIT);
>+                EXPECT_GL_NO_ERROR();
>+
>+                EXPECT_PIXEL_COLOR_EQ(0, 0, color);
>+            }
>+
>+            {
>+                std::lock_guard<decltype(mutex)> lock(mutex);
>+
>+                // Clean up
>+                EXPECT_EGL_TRUE(
>+                    eglMakeCurrent(dpy, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT));
>+                EXPECT_EGL_SUCCESS();
>+
>+                eglDestroySurface(dpy, pbuffer);
>+                eglDestroyContext(dpy, ctx);
>+            }
>+        });
>+    }
>+
>+    for (std::thread &thread : threads)
>+    {
>+        thread.join();
>+    }
>+}
>+
>+// TODO(geofflang): Test sharing a program between multiple shared contexts on multiple threads
>+
>+ANGLE_INSTANTIATE_TEST(MultithreadingTest,
>+                       WithNoVirtualContexts(ES2_OPENGL()),
>+                       WithNoVirtualContexts(ES3_OPENGL()),
>+                       WithNoVirtualContexts(ES2_OPENGLES()),
>+                       WithNoVirtualContexts(ES3_OPENGLES()));
>+
>+}  // namespace angle
>diff --git a/Source/ThirdParty/ANGLE/src/tests/gl_tests/MultiviewDrawTest.cpp b/Source/ThirdParty/ANGLE/src/tests/gl_tests/MultiviewDrawTest.cpp
>index 6052f70d84c..003cea33ba4 100644
>--- a/Source/ThirdParty/ANGLE/src/tests/gl_tests/MultiviewDrawTest.cpp
>+++ b/Source/ThirdParty/ANGLE/src/tests/gl_tests/MultiviewDrawTest.cpp
>@@ -8,39 +8,13 @@
> //
> 
> #include "platform/WorkaroundsD3D.h"
>-#include "test_utils/ANGLETest.h"
>+#include "test_utils/MultiviewTest.h"
> #include "test_utils/gl_raii.h"
> 
> using namespace angle;
> 
> namespace
> {
>-GLuint CreateSimplePassthroughProgram(int numViews)
>-{
>-    const std::string vsSource =
>-        "#version 300 es\n"
>-        "#extension GL_OVR_multiview : require\n"
>-        "layout(num_views = " +
>-        ToString(numViews) +
>-        ") in;\n"
>-        "layout(location=0) in vec2 vPosition;\n"
>-        "void main()\n"
>-        "{\n"
>-        "   gl_PointSize = 1.;\n"
>-        "   gl_Position = vec4(vPosition.xy, 0.0, 1.0);\n"
>-        "}\n";
>-
>-    const std::string fsSource =
>-        "#version 300 es\n"
>-        "#extension GL_OVR_multiview : require\n"
>-        "precision mediump float;\n"
>-        "out vec4 col;\n"
>-        "void main()\n"
>-        "{\n"
>-        "   col = vec4(0,1,0,1);\n"
>-        "}\n";
>-    return CompileProgram(vsSource, fsSource);
>-}
> 
> std::vector<Vector2> ConvertPixelCoordinatesToClipSpace(const std::vector<Vector2I> &pixels,
>                                                         int width,
>@@ -60,312 +34,215 @@ std::vector<Vector2> ConvertPixelCoordinatesToClipSpace(const std::vector<Vector
> }
> }  // namespace
> 
>-struct MultiviewImplementationParams : public PlatformParameters
>+struct MultiviewRenderTestParams final : public MultiviewImplementationParams
> {
>-    MultiviewImplementationParams(bool forceUseGeometryShaderOnD3D,
>-                                  const EGLPlatformParameters &eglPlatformParameters)
>-        : PlatformParameters(3, 0, eglPlatformParameters),
>-          mForceUseGeometryShaderOnD3D(forceUseGeometryShaderOnD3D)
>-    {
>-    }
>-    bool mForceUseGeometryShaderOnD3D;
>+    MultiviewRenderTestParams(int samples,
>+                              const MultiviewImplementationParams &implementationParams)
>+        : MultiviewImplementationParams(implementationParams), mSamples(samples)
>+    {}
>+    int mSamples;
> };
> 
>-std::ostream &operator<<(std::ostream &os, const MultiviewImplementationParams &params)
>-{
>-    const PlatformParameters &base = static_cast<const PlatformParameters &>(params);
>-    os << base;
>-    if (params.mForceUseGeometryShaderOnD3D)
>-    {
>-        os << "_force_geom_shader";
>-    }
>-    else
>-    {
>-        os << "_vertex_shader";
>-    }
>-    return os;
>-}
>-
>-struct MultiviewTestParams final : public MultiviewImplementationParams
>-{
>-    MultiviewTestParams(GLenum multiviewLayout,
>-                        const MultiviewImplementationParams &implementationParams)
>-        : MultiviewImplementationParams(implementationParams), mMultiviewLayout(multiviewLayout)
>-    {
>-        ASSERT(multiviewLayout == GL_FRAMEBUFFER_MULTIVIEW_LAYERED_ANGLE ||
>-               multiviewLayout == GL_FRAMEBUFFER_MULTIVIEW_SIDE_BY_SIDE_ANGLE);
>-    }
>-    GLenum mMultiviewLayout;
>-};
>-
>-std::ostream &operator<<(std::ostream &os, const MultiviewTestParams &params)
>+std::ostream &operator<<(std::ostream &os, const MultiviewRenderTestParams &params)
> {
>     const MultiviewImplementationParams &base =
>         static_cast<const MultiviewImplementationParams &>(params);
>     os << base;
>-    switch (params.mMultiviewLayout)
>+    os << "_layered";
>+
>+    if (params.mSamples > 0)
>     {
>-        case GL_FRAMEBUFFER_MULTIVIEW_LAYERED_ANGLE:
>-            os << "_layered";
>-            break;
>-        case GL_FRAMEBUFFER_MULTIVIEW_SIDE_BY_SIDE_ANGLE:
>-            os << "_side_by_side";
>-            break;
>-        default:
>-            UNREACHABLE();
>+        os << "_samples_" << params.mSamples;
>     }
>     return os;
> }
> 
>-class MultiviewDrawTest : public ANGLETestBase
>+class MultiviewFramebufferTestBase : public MultiviewTestBase
> {
>   protected:
>-    MultiviewDrawTest(const PlatformParameters &params) : ANGLETestBase(params)
>-    {
>-        setWindowWidth(128);
>-        setWindowHeight(128);
>-        setWebGLCompatibilityEnabled(true);
>-    }
>-    virtual ~MultiviewDrawTest() {}
>+    MultiviewFramebufferTestBase(const PlatformParameters &params, int samples)
>+        : MultiviewTestBase(params),
>+          mViewWidth(0),
>+          mViewHeight(0),
>+          mNumViews(0),
>+          mColorTexture(0u),
>+          mDepthTexture(0u),
>+          mDrawFramebuffer(0u),
>+          mSamples(samples),
>+          mResolveTexture(0u)
>+    {}
> 
>-    void DrawTestSetUp()
>-    {
>-        ANGLETestBase::ANGLETestSetUp();
>+    void FramebufferTestSetUp() { MultiviewTestBase::MultiviewTestBaseSetUp(); }
> 
>-        glRequestExtensionANGLE = reinterpret_cast<PFNGLREQUESTEXTENSIONANGLEPROC>(
>-            eglGetProcAddress("glRequestExtensionANGLE"));
>-    }
>-
>-    // Requests the ANGLE_multiview extension and returns true if the operation succeeds.
>-    bool requestMultiviewExtension()
>+    void FramebufferTestTearDown()
>     {
>-        if (extensionRequestable("GL_ANGLE_multiview"))
>-        {
>-            glRequestExtensionANGLE("GL_ANGLE_multiview");
>-        }
>-
>-        if (!extensionEnabled("GL_ANGLE_multiview"))
>-        {
>-            std::cout << "Test skipped due to missing GL_ANGLE_multiview." << std::endl;
>-            return false;
>-        }
>-        return true;
>+        freeFBOs();
>+        MultiviewTestBase::MultiviewTestBaseTearDown();
>     }
> 
>-    PFNGLREQUESTEXTENSIONANGLEPROC glRequestExtensionANGLE = nullptr;
>-};
>-
>-class MultiviewDrawValidationTest : public MultiviewDrawTest,
>-                                    public ::testing::TestWithParam<PlatformParameters>
>-{
>-  protected:
>-    MultiviewDrawValidationTest() : MultiviewDrawTest(GetParam()) {}
>-
>-    void SetUp() override
>+    void updateFBOs(int viewWidth, int height, int numViews, int numLayers, int baseViewIndex)
>     {
>-        MultiviewDrawTest::DrawTestSetUp();
>-
>-        glBindFramebuffer(GL_FRAMEBUFFER, mFramebuffer);
>-
>-        glBindTexture(GL_TEXTURE_2D, mTex2d);
>-        glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA8, 1, 1, 0, GL_RGBA, GL_UNSIGNED_BYTE, nullptr);
>+        ASSERT_TRUE(numViews + baseViewIndex <= numLayers);
> 
>-        glBindVertexArray(mVao);
>-
>-        const float kVertexData[3] = {0.0f};
>-        glBindBuffer(GL_ARRAY_BUFFER, mVbo);
>-        glBufferData(GL_ARRAY_BUFFER, sizeof(float) * 3u, &kVertexData[0], GL_STATIC_DRAW);
>-
>-        const unsigned int kIndices[3] = {0u, 1u, 2u};
>-        glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, mIbo);
>-        glBufferData(GL_ELEMENT_ARRAY_BUFFER, sizeof(unsigned int) * 3, &kIndices[0],
>-                     GL_STATIC_DRAW);
>-        ASSERT_GL_NO_ERROR();
>-    }
>-
>-    GLTexture mTex2d;
>-    GLVertexArray mVao;
>-    GLBuffer mVbo;
>-    GLBuffer mIbo;
>-    GLFramebuffer mFramebuffer;
>-};
>-
>-class MultiviewRenderTestBase : public MultiviewDrawTest
>-{
>-  protected:
>-    MultiviewRenderTestBase(const PlatformParameters &params, GLenum multiviewLayout)
>-        : MultiviewDrawTest(params),
>-          mMultiviewLayout(multiviewLayout),
>-          mViewWidth(0),
>-          mViewHeight(0),
>-          mNumViews(0)
>-    {
>-    }
>-    void RenderTestSetUp() { MultiviewDrawTest::DrawTestSetUp(); }
>-    void createFBO(int viewWidth, int height, int numViews, int numLayers, int baseViewIndex)
>-    {
>-        ASSERT(numViews + baseViewIndex <= numLayers);
>+        freeFBOs();
> 
>         mViewWidth  = viewWidth;
>         mViewHeight = height;
>         mNumViews   = numViews;
> 
>-        mColorTexture.reset();
>-        mDepthTexture.reset();
>-        mDrawFramebuffer.reset();
>-        mReadFramebuffer.clear();
>+        glGenTextures(1, &mColorTexture);
>+        glGenTextures(1, &mDepthTexture);
> 
>-        // Create color and depth textures.
>-        switch (mMultiviewLayout)
>-        {
>-            case GL_FRAMEBUFFER_MULTIVIEW_SIDE_BY_SIDE_ANGLE:
>-            {
>-                int textureWidth = viewWidth * numViews;
>-                glBindTexture(GL_TEXTURE_2D, mColorTexture);
>-                glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA8, textureWidth, height, 0, GL_RGBA,
>-                             GL_UNSIGNED_BYTE, NULL);
>-                glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
>-                glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
>-
>-                glBindTexture(GL_TEXTURE_2D, mDepthTexture);
>-                glTexImage2D(GL_TEXTURE_2D, 0, GL_DEPTH_COMPONENT32F, textureWidth, height, 0,
>-                             GL_DEPTH_COMPONENT, GL_FLOAT, NULL);
>-                glBindTexture(GL_TEXTURE_2D, 0);
>-                break;
>-            }
>-            case GL_FRAMEBUFFER_MULTIVIEW_LAYERED_ANGLE:
>-                glBindTexture(GL_TEXTURE_2D_ARRAY, mColorTexture);
>-                glTexImage3D(GL_TEXTURE_2D_ARRAY, 0, GL_RGBA8, viewWidth, height, numLayers, 0,
>-                             GL_RGBA, GL_UNSIGNED_BYTE, NULL);
>-                glTexParameteri(GL_TEXTURE_2D_ARRAY, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
>-                glTexParameteri(GL_TEXTURE_2D_ARRAY, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
>-
>-                glBindTexture(GL_TEXTURE_2D_ARRAY, mDepthTexture);
>-                glTexImage3D(GL_TEXTURE_2D_ARRAY, 0, GL_DEPTH_COMPONENT32F, viewWidth, height,
>-                             numLayers, 0, GL_DEPTH_COMPONENT, GL_FLOAT, NULL);
>-                glBindTexture(GL_TEXTURE_2D_ARRAY, 0);
>-                break;
>-            default:
>-                UNREACHABLE();
>-        }
>-        ASSERT_GL_NO_ERROR();
>+        CreateMultiviewBackingTextures(mSamples, viewWidth, height, numLayers, mColorTexture,
>+                                       mDepthTexture, 0u);
>+
>+        glGenFramebuffers(1, &mDrawFramebuffer);
> 
>         // Create draw framebuffer to be used for multiview rendering.
>         glBindFramebuffer(GL_DRAW_FRAMEBUFFER, mDrawFramebuffer);
>-        switch (mMultiviewLayout)
>-        {
>-            case GL_FRAMEBUFFER_MULTIVIEW_SIDE_BY_SIDE_ANGLE:
>-            {
>-                std::vector<GLint> viewportOffsets(numViews * 2);
>-                for (int i = 0u; i < numViews; ++i)
>-                {
>-                    viewportOffsets[i * 2]     = i * viewWidth;
>-                    viewportOffsets[i * 2 + 1] = 0;
>-                }
>-                glFramebufferTextureMultiviewSideBySideANGLE(GL_DRAW_FRAMEBUFFER,
>-                                                             GL_COLOR_ATTACHMENT0, mColorTexture, 0,
>-                                                             numViews, &viewportOffsets[0]);
>-                glFramebufferTextureMultiviewSideBySideANGLE(GL_DRAW_FRAMEBUFFER,
>-                                                             GL_DEPTH_ATTACHMENT, mDepthTexture, 0,
>-                                                             numViews, &viewportOffsets[0]);
>-                break;
>-            }
>-            case GL_FRAMEBUFFER_MULTIVIEW_LAYERED_ANGLE:
>-                glFramebufferTextureMultiviewLayeredANGLE(GL_DRAW_FRAMEBUFFER, GL_COLOR_ATTACHMENT0,
>-                                                          mColorTexture, 0, baseViewIndex,
>-                                                          numViews);
>-                glFramebufferTextureMultiviewLayeredANGLE(GL_DRAW_FRAMEBUFFER, GL_DEPTH_ATTACHMENT,
>-                                                          mDepthTexture, 0, baseViewIndex,
>-                                                          numViews);
>-                break;
>-            default:
>-                UNREACHABLE();
>-        }
>+        AttachMultiviewTextures(GL_DRAW_FRAMEBUFFER, viewWidth, numViews, baseViewIndex,
>+                                mColorTexture, mDepthTexture, 0u);
> 
>-        GLenum DrawBuffers[1] = {GL_COLOR_ATTACHMENT0};
>-        glDrawBuffers(1, DrawBuffers);
>-        ASSERT_GL_NO_ERROR();
>         ASSERT_GLENUM_EQ(GL_FRAMEBUFFER_COMPLETE, glCheckFramebufferStatus(GL_DRAW_FRAMEBUFFER));
> 
>         // Create read framebuffer to be used to retrieve the pixel information for testing
>         // purposes.
>-        switch (mMultiviewLayout)
>+        mReadFramebuffer.resize(numLayers);
>+        glGenFramebuffers(static_cast<GLsizei>(mReadFramebuffer.size()), mReadFramebuffer.data());
>+        for (int i = 0; i < numLayers; ++i)
>         {
>-            case GL_FRAMEBUFFER_MULTIVIEW_SIDE_BY_SIDE_ANGLE:
>-                mReadFramebuffer.resize(1);
>-                glBindFramebuffer(GL_READ_FRAMEBUFFER, mReadFramebuffer[0]);
>-                glFramebufferTexture2D(GL_READ_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D,
>-                                       mColorTexture, 0);
>-                ASSERT_GLENUM_EQ(GL_FRAMEBUFFER_COMPLETE,
>-                                 glCheckFramebufferStatus(GL_READ_FRAMEBUFFER));
>-                break;
>-            case GL_FRAMEBUFFER_MULTIVIEW_LAYERED_ANGLE:
>-                mReadFramebuffer.resize(numLayers);
>-                for (int i = 0; i < numLayers; ++i)
>-                {
>-                    glBindFramebuffer(GL_FRAMEBUFFER, mReadFramebuffer[i]);
>-                    glFramebufferTextureLayer(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, mColorTexture,
>-                                              0, i);
>-                    glClearColor(0, 0, 0, 0);
>-                    glClear(GL_COLOR_BUFFER_BIT);
>-                    ASSERT_GLENUM_EQ(GL_FRAMEBUFFER_COMPLETE,
>-                                     glCheckFramebufferStatus(GL_READ_FRAMEBUFFER));
>-                }
>-                glBindFramebuffer(GL_DRAW_FRAMEBUFFER, mDrawFramebuffer);
>-                break;
>-            default:
>-                UNREACHABLE();
>+            glBindFramebuffer(GL_READ_FRAMEBUFFER, mReadFramebuffer[i]);
>+            glFramebufferTextureLayer(GL_READ_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, mColorTexture, 0,
>+                                      i);
>+            ASSERT_GLENUM_EQ(GL_FRAMEBUFFER_COMPLETE,
>+                             glCheckFramebufferStatus(GL_READ_FRAMEBUFFER));
>         }
> 
>         // Clear the buffers.
>         glViewport(0, 0, viewWidth, height);
>-        if (mMultiviewLayout == GL_FRAMEBUFFER_MULTIVIEW_SIDE_BY_SIDE_ANGLE)
>-        {
>-            // Enable the scissor test only for side-by-side framebuffers.
>-            glEnable(GL_SCISSOR_TEST);
>-            glScissor(0, 0, viewWidth, height);
>-        }
>-        glClearColor(0, 0, 0, 1);
>-        glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
>     }
> 
>-    void createFBO(int viewWidth, int height, int numViews)
>+    void updateFBOs(int viewWidth, int height, int numViews)
>     {
>-        createFBO(viewWidth, height, numViews, numViews, 0);
>+        updateFBOs(viewWidth, height, numViews, numViews, 0);
>+    }
>+
>+    void bindMemberDrawFramebuffer() { glBindFramebuffer(GL_DRAW_FRAMEBUFFER, mDrawFramebuffer); }
>+
>+    // In case we have a multisampled framebuffer, creates and binds a resolve framebuffer as the
>+    // draw framebuffer, and resolves the read framebuffer to it.
>+    void resolveMultisampledFBO()
>+    {
>+        if (mSamples == 0)
>+        {
>+            return;
>+        }
>+        int numLayers = mReadFramebuffer.size();
>+        if (mResolveFramebuffer.empty())
>+        {
>+            ASSERT_TRUE(mResolveTexture == 0u);
>+            glGenTextures(1, &mResolveTexture);
>+            CreateMultiviewBackingTextures(0, mViewWidth, mViewHeight, numLayers, mResolveTexture,
>+                                           0u, 0u);
>+
>+            mResolveFramebuffer.resize(numLayers);
>+            glGenFramebuffers(static_cast<GLsizei>(mResolveFramebuffer.size()),
>+                              mResolveFramebuffer.data());
>+            for (int i = 0; i < numLayers; ++i)
>+            {
>+                glBindFramebuffer(GL_DRAW_FRAMEBUFFER, mResolveFramebuffer[i]);
>+                glFramebufferTextureLayer(GL_DRAW_FRAMEBUFFER, GL_COLOR_ATTACHMENT0,
>+                                          mResolveTexture, 0, i);
>+                ASSERT_GLENUM_EQ(GL_FRAMEBUFFER_COMPLETE,
>+                                 glCheckFramebufferStatus(GL_DRAW_FRAMEBUFFER));
>+            }
>+        }
>+        for (int i = 0; i < numLayers; ++i)
>+        {
>+            glBindFramebuffer(GL_READ_FRAMEBUFFER, mReadFramebuffer[i]);
>+            glBindFramebuffer(GL_DRAW_FRAMEBUFFER, mResolveFramebuffer[i]);
>+            glBlitFramebuffer(0, 0, mViewWidth, mViewHeight, 0, 0, mViewWidth, mViewHeight,
>+                              GL_COLOR_BUFFER_BIT, GL_NEAREST);
>+        }
>     }
> 
>     GLColor GetViewColor(int x, int y, int view)
>     {
>-        switch (mMultiviewLayout)
>+        EXPECT_TRUE(static_cast<size_t>(view) < mReadFramebuffer.size());
>+        if (mSamples > 0)
>         {
>-            case GL_FRAMEBUFFER_MULTIVIEW_SIDE_BY_SIDE_ANGLE:
>-                return ReadColor(view * mViewWidth + x, y);
>-            case GL_FRAMEBUFFER_MULTIVIEW_LAYERED_ANGLE:
>-                ASSERT(static_cast<size_t>(view) < mReadFramebuffer.size());
>-                glBindFramebuffer(GL_READ_FRAMEBUFFER, mReadFramebuffer[view]);
>-                return ReadColor(x, y);
>-            default:
>-                UNREACHABLE();
>+            EXPECT_TRUE(static_cast<size_t>(view) < mResolveFramebuffer.size());
>+            glBindFramebuffer(GL_READ_FRAMEBUFFER, mResolveFramebuffer[view]);
>         }
>-        return GLColor(0, 0, 0, 0);
>+        else
>+        {
>+            glBindFramebuffer(GL_READ_FRAMEBUFFER, mReadFramebuffer[view]);
>+        }
>+        return ReadColor(x, y);
>     }
> 
>-    GLTexture mColorTexture;
>-    GLTexture mDepthTexture;
>-    GLFramebuffer mDrawFramebuffer;
>-    std::vector<GLFramebuffer> mReadFramebuffer;
>-    GLenum mMultiviewLayout;
>+    bool isMultisampled() { return mSamples > 0; }
>+
>     int mViewWidth;
>     int mViewHeight;
>     int mNumViews;
>+
>+    GLuint mColorTexture;
>+    GLuint mDepthTexture;
>+
>+  private:
>+    GLuint mDrawFramebuffer;
>+    std::vector<GLuint> mReadFramebuffer;
>+    int mSamples;
>+
>+    // For reading back multisampled framebuffer.
>+    std::vector<GLuint> mResolveFramebuffer;
>+    GLuint mResolveTexture;
>+
>+    void freeFBOs()
>+    {
>+        if (mDrawFramebuffer)
>+        {
>+            glDeleteFramebuffers(1, &mDrawFramebuffer);
>+            mDrawFramebuffer = 0;
>+        }
>+        if (!mReadFramebuffer.empty())
>+        {
>+            GLsizei framebufferCount = static_cast<GLsizei>(mReadFramebuffer.size());
>+            glDeleteFramebuffers(framebufferCount, mReadFramebuffer.data());
>+            mReadFramebuffer.clear();
>+        }
>+        if (!mResolveFramebuffer.empty())
>+        {
>+            GLsizei framebufferCount = static_cast<GLsizei>(mResolveFramebuffer.size());
>+            glDeleteFramebuffers(framebufferCount, mResolveFramebuffer.data());
>+            mResolveFramebuffer.clear();
>+        }
>+        if (mDepthTexture)
>+        {
>+            glDeleteTextures(1, &mDepthTexture);
>+            mDepthTexture = 0;
>+        }
>+        if (mColorTexture)
>+        {
>+            glDeleteTextures(1, &mColorTexture);
>+            mColorTexture = 0;
>+        }
>+        if (mResolveTexture)
>+        {
>+            glDeleteTextures(1, &mResolveTexture);
>+            mResolveTexture = 0;
>+        }
>+    }
> };
> 
>-class MultiviewRenderTest : public MultiviewRenderTestBase,
>-                            public ::testing::TestWithParam<MultiviewTestParams>
>+class MultiviewRenderTest : public MultiviewFramebufferTestBase,
>+                            public ::testing::TestWithParam<MultiviewRenderTestParams>
> {
>   protected:
>-    MultiviewRenderTest() : MultiviewRenderTestBase(GetParam(), GetParam().mMultiviewLayout) {}
>-    void SetUp() override { MultiviewRenderTestBase::RenderTestSetUp(); }
>+    MultiviewRenderTest() : MultiviewFramebufferTestBase(GetParam(), GetParam().mSamples) {}
>+    void SetUp() override { MultiviewFramebufferTestBase::FramebufferTestSetUp(); }
>+    void TearDown() override { MultiviewFramebufferTestBase::FramebufferTestTearDown(); }
> 
>     void overrideWorkaroundsD3D(WorkaroundsD3D *workarounds) override
>     {
>@@ -373,66 +250,107 @@ class MultiviewRenderTest : public MultiviewRenderTestBase,
>     }
> };
> 
>+constexpr char kDualViewVSSource[] = R"(#version 300 es
>+#extension GL_OVR_multiview2 : require
>+layout(num_views = 2) in;
>+in vec4 vPosition;
>+void main()
>+{
>+   gl_Position.x = (gl_ViewID_OVR == 0u ? vPosition.x * 0.5 + 0.5 : vPosition.x * 0.5 - 0.5);
>+   gl_Position.yzw = vPosition.yzw;
>+})";
>+
>+constexpr char kDualViewFSSource[] = R"(#version 300 es
>+#extension GL_OVR_multiview2 : require
>+precision mediump float;
>+out vec4 col;
>+void main()
>+{
>+   col = vec4(0,1,0,1);
>+})";
>+
> class MultiviewRenderDualViewTest : public MultiviewRenderTest
> {
>   protected:
>     MultiviewRenderDualViewTest() : mProgram(0u) {}
>-    ~MultiviewRenderDualViewTest()
>-    {
>-        if (mProgram != 0u)
>-        {
>-            glDeleteProgram(mProgram);
>-        }
>-    }
> 
>     void SetUp() override
>     {
>         MultiviewRenderTest::SetUp();
> 
>-        if (!requestMultiviewExtension())
>+        if (!requestMultiviewExtension(isMultisampled()))
>         {
>             return;
>         }
> 
>-        const std::string vsSource =
>-            "#version 300 es\n"
>-            "#extension GL_OVR_multiview : require\n"
>-            "layout(num_views = 2) in;\n"
>-            "in vec4 vPosition;\n"
>-            "void main()\n"
>-            "{\n"
>-            "   gl_Position.x = (gl_ViewID_OVR == 0u ? vPosition.x*0.5 + 0.5 : vPosition.x*0.5);\n"
>-            "   gl_Position.yzw = vPosition.yzw;\n"
>-            "}\n";
>-
>-        const std::string fsSource =
>-            "#version 300 es\n"
>-            "#extension GL_OVR_multiview : require\n"
>-            "precision mediump float;\n"
>-            "out vec4 col;\n"
>-            "void main()\n"
>-            "{\n"
>-            "   col = vec4(0,1,0,1);\n"
>-            "}\n";
>-
>-        createFBO(2, 1, 2);
>-        mProgram = CompileProgram(vsSource, fsSource);
>+        updateFBOs(2, 1, 2);
>+        mProgram = CompileProgram(kDualViewVSSource, kDualViewFSSource);
>         ASSERT_NE(mProgram, 0u);
>         glUseProgram(mProgram);
>         ASSERT_GL_NO_ERROR();
>     }
> 
>+    void TearDown() override
>+    {
>+        if (mProgram != 0u)
>+        {
>+            glDeleteProgram(mProgram);
>+            mProgram = 0u;
>+        }
>+
>+        MultiviewRenderTest::TearDown();
>+    }
>+
>     void checkOutput()
>     {
>-        EXPECT_EQ(GLColor::black, GetViewColor(0, 0, 0));
>+        resolveMultisampledFBO();
>+        EXPECT_EQ(GLColor::transparentBlack, GetViewColor(0, 0, 0));
>         EXPECT_EQ(GLColor::green, GetViewColor(1, 0, 0));
>         EXPECT_EQ(GLColor::green, GetViewColor(0, 0, 1));
>-        EXPECT_EQ(GLColor::black, GetViewColor(1, 0, 1));
>+        EXPECT_EQ(GLColor::transparentBlack, GetViewColor(1, 0, 1));
>     }
> 
>     GLuint mProgram;
> };
> 
>+// Base class for tests that care mostly about draw call validity and not rendering results.
>+class MultiviewDrawValidationTest : public MultiviewTest
>+{
>+  protected:
>+    MultiviewDrawValidationTest() : MultiviewTest() {}
>+
>+    void initOnePixelColorTexture2DSingleLayered(GLuint texId)
>+    {
>+        glBindTexture(GL_TEXTURE_2D_ARRAY, texId);
>+        glTexImage3D(GL_TEXTURE_2D_ARRAY, 0, GL_RGBA8, 1, 1, 1, 0, GL_RGBA, GL_UNSIGNED_BYTE,
>+                     nullptr);
>+    }
>+
>+    void initOnePixelColorTexture2DMultiLayered(GLuint texId)
>+    {
>+        glBindTexture(GL_TEXTURE_2D_ARRAY, texId);
>+        glTexImage3D(GL_TEXTURE_2D_ARRAY, 0, GL_RGBA8, 1, 1, 2, 0, GL_RGBA, GL_UNSIGNED_BYTE,
>+                     nullptr);
>+    }
>+
>+    // This initializes a simple VAO with a valid vertex buffer and index buffer with three
>+    // vertices.
>+    void initVAO(GLuint vao, GLuint vertexBuffer, GLuint indexBuffer)
>+    {
>+        glBindVertexArray(vao);
>+
>+        const float kVertexData[3] = {0.0f};
>+        glBindBuffer(GL_ARRAY_BUFFER, vertexBuffer);
>+        glBufferData(GL_ARRAY_BUFFER, sizeof(float) * 3u, &kVertexData[0], GL_STATIC_DRAW);
>+
>+        const unsigned int kIndices[3] = {0u, 1u, 2u};
>+        glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, indexBuffer);
>+        glBufferData(GL_ELEMENT_ARRAY_BUFFER, sizeof(unsigned int) * 3, &kIndices[0],
>+                     GL_STATIC_DRAW);
>+        ASSERT_GL_NO_ERROR();
>+    }
>+};
>+
> class MultiviewOcclusionQueryTest : public MultiviewRenderTest
> {
>   protected:
>@@ -440,12 +358,12 @@ class MultiviewOcclusionQueryTest : public MultiviewRenderTest
> 
>     bool requestOcclusionQueryExtension()
>     {
>-        if (extensionRequestable("GL_EXT_occlusion_query_boolean"))
>+        if (IsGLExtensionRequestable("GL_EXT_occlusion_query_boolean"))
>         {
>             glRequestExtensionANGLE("GL_EXT_occlusion_query_boolean");
>         }
> 
>-        if (!extensionEnabled("GL_EXT_occlusion_query_boolean"))
>+        if (!IsGLExtensionEnabled("GL_EXT_occlusion_query_boolean"))
>         {
>             std::cout << "Test skipped due to missing GL_EXT_occlusion_query_boolean." << std::endl;
>             return false;
>@@ -466,7 +384,7 @@ class MultiviewOcclusionQueryTest : public MultiviewRenderTest
>     }
> };
> 
>-class MultiviewProgramGenerationTest : public MultiviewRenderTest
>+class MultiviewProgramGenerationTest : public MultiviewTest
> {
>   protected:
>     MultiviewProgramGenerationTest() {}
>@@ -475,7 +393,23 @@ class MultiviewProgramGenerationTest : public MultiviewRenderTest
> class MultiviewRenderPrimitiveTest : public MultiviewRenderTest
> {
>   protected:
>-    MultiviewRenderPrimitiveTest() {}
>+    MultiviewRenderPrimitiveTest() : mVBO(0u) {}
>+
>+    void SetUp() override
>+    {
>+        MultiviewRenderTest::SetUp();
>+        glGenBuffers(1, &mVBO);
>+    }
>+
>+    void TearDown() override
>+    {
>+        if (mVBO)
>+        {
>+            glDeleteBuffers(1, &mVBO);
>+            mVBO = 0u;
>+        }
>+        MultiviewRenderTest::TearDown();
>+    }
> 
>     void setupGeometry(const std::vector<Vector2> &vertexData)
>     {
>@@ -483,7 +417,7 @@ class MultiviewRenderPrimitiveTest : public MultiviewRenderTest
>         glBufferData(GL_ARRAY_BUFFER, vertexData.size() * sizeof(Vector2), vertexData.data(),
>                      GL_STATIC_DRAW);
>         glEnableVertexAttribArray(0);
>-        glVertexAttribPointer(0, 2, GL_FLOAT, GL_FALSE, 0, NULL);
>+        glVertexAttribPointer(0, 2, GL_FLOAT, GL_FALSE, 0, nullptr);
>     }
> 
>     void checkGreenChannel(const GLubyte expectedGreenChannelData[])
>@@ -496,64 +430,49 @@ class MultiviewRenderPrimitiveTest : public MultiviewRenderTest
>                 {
>                     size_t flatIndex =
>                         static_cast<size_t>(view * mViewWidth * mViewHeight + mViewWidth * h + w);
>-                    EXPECT_EQ(GLColor(0, expectedGreenChannelData[flatIndex], 0, 255),
>+                    EXPECT_EQ(GLColor(0, expectedGreenChannelData[flatIndex], 0,
>+                                      expectedGreenChannelData[flatIndex]),
>                               GetViewColor(w, h, view));
>                 }
>             }
>         }
>     }
>-    GLBuffer mVBO;
>-};
>-
>-class MultiviewSideBySideRenderTest : public MultiviewRenderTestBase,
>-                                      public ::testing::TestWithParam<MultiviewImplementationParams>
>-{
>-  protected:
>-    MultiviewSideBySideRenderTest()
>-        : MultiviewRenderTestBase(GetParam(), GL_FRAMEBUFFER_MULTIVIEW_SIDE_BY_SIDE_ANGLE)
>-    {
>-    }
>-    void SetUp() override { MultiviewRenderTestBase::RenderTestSetUp(); }
>-    void overrideWorkaroundsD3D(WorkaroundsD3D *workarounds) override
>-    {
>-        workarounds->selectViewInGeometryShader = GetParam().mForceUseGeometryShaderOnD3D;
>-    }
>+    GLuint mVBO;
> };
> 
>-class MultiviewLayeredRenderTest : public MultiviewRenderTestBase,
>+class MultiviewLayeredRenderTest : public MultiviewFramebufferTestBase,
>                                    public ::testing::TestWithParam<MultiviewImplementationParams>
> {
>   protected:
>-    MultiviewLayeredRenderTest()
>-        : MultiviewRenderTestBase(GetParam(), GL_FRAMEBUFFER_MULTIVIEW_LAYERED_ANGLE)
>-    {
>-    }
>-    void SetUp() override { MultiviewRenderTestBase::RenderTestSetUp(); }
>-    void overrideWorkaroundsD3D(WorkaroundsD3D *workarounds) override
>+    MultiviewLayeredRenderTest() : MultiviewFramebufferTestBase(GetParam(), 0) {}
>+    void SetUp() final { MultiviewFramebufferTestBase::FramebufferTestSetUp(); }
>+    void TearDown() final { MultiviewFramebufferTestBase::FramebufferTestTearDown(); }
>+    void overrideWorkaroundsD3D(WorkaroundsD3D *workarounds) final
>     {
>         workarounds->selectViewInGeometryShader = GetParam().mForceUseGeometryShaderOnD3D;
>     }
> };
> 
>-// The test verifies that glDraw*Indirect:
>-// 1) generates an INVALID_OPERATION error if the number of views in the draw framebuffer is greater
>-// than 1.
>-// 2) does not generate any error if the draw framebuffer has exactly 1 view.
>+// The test verifies that glDraw*Indirect works for any number of views.
> TEST_P(MultiviewDrawValidationTest, IndirectDraw)
> {
>-    if (!requestMultiviewExtension())
>-    {
>-        return;
>-    }
>-
>-    const GLint viewportOffsets[4] = {0, 0, 2, 0};
>+    ANGLE_SKIP_TEST_IF(!requestMultiviewExtension());
> 
>-    const std::string fsSource =
>+    constexpr char kFS[] =
>         "#version 300 es\n"
>-        "#extension GL_OVR_multiview : require\n"
>+        "#extension GL_OVR_multiview2 : require\n"
>         "precision mediump float;\n"
>+        "out vec4 color;\n"
>         "void main()\n"
>-        "{}\n";
>+        "{color = vec4(1);}\n";
>+
>+    GLVertexArray vao;
>+    GLBuffer vertexBuffer;
>+    GLBuffer indexBuffer;
>+    initVAO(vao, vertexBuffer, indexBuffer);
>+
>+    GLFramebuffer fbo;
>+    glBindFramebuffer(GL_FRAMEBUFFER, fbo);
> 
>     GLBuffer commandBuffer;
>     glBindBuffer(GL_DRAW_INDIRECT_BUFFER, commandBuffer);
>@@ -561,40 +480,44 @@ TEST_P(MultiviewDrawValidationTest, IndirectDraw)
>     glBufferData(GL_DRAW_INDIRECT_BUFFER, sizeof(GLuint) * 5u, &commandData[0], GL_STATIC_DRAW);
>     ASSERT_GL_NO_ERROR();
> 
>-    // Check for a GL_INVALID_OPERATION error with the framebuffer having 2 views.
>+    // Check that no errors are generated with the framebuffer having 2 views.
>     {
>-        const std::string &vsSource =
>+        constexpr char kVS[] =
>             "#version 300 es\n"
>-            "#extension GL_OVR_multiview : require\n"
>+            "#extension GL_OVR_multiview2 : require\n"
>             "layout(num_views = 2) in;\n"
>             "void main()\n"
>             "{}\n";
>-        ANGLE_GL_PROGRAM(program, vsSource, fsSource);
>+        ANGLE_GL_PROGRAM(program, kVS, kFS);
>         glUseProgram(program);
> 
>-        glFramebufferTextureMultiviewSideBySideANGLE(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, mTex2d,
>-                                                     0, 2, &viewportOffsets[0]);
>+        GLTexture tex2DArray;
>+        initOnePixelColorTexture2DMultiLayered(tex2DArray);
>+
>+        glFramebufferTextureMultiviewOVR(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, tex2DArray, 0, 0, 2);
> 
>         glDrawArraysIndirect(GL_TRIANGLES, nullptr);
>-        EXPECT_GL_ERROR(GL_INVALID_OPERATION);
>+        EXPECT_GL_NO_ERROR();
> 
>         glDrawElementsIndirect(GL_TRIANGLES, GL_UNSIGNED_INT, nullptr);
>-        EXPECT_GL_ERROR(GL_INVALID_OPERATION);
>+        EXPECT_GL_NO_ERROR();
>     }
> 
>     // Check that no errors are generated if the number of views is 1.
>     {
>-        const std::string &vsSource =
>+        constexpr char kVS[] =
>             "#version 300 es\n"
>-            "#extension GL_OVR_multiview : require\n"
>+            "#extension GL_OVR_multiview2 : require\n"
>             "layout(num_views = 1) in;\n"
>             "void main()\n"
>             "{}\n";
>-        ANGLE_GL_PROGRAM(program, vsSource, fsSource);
>+        ANGLE_GL_PROGRAM(program, kVS, kFS);
>         glUseProgram(program);
> 
>-        glFramebufferTextureMultiviewSideBySideANGLE(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, mTex2d,
>-                                                     0, 1, &viewportOffsets[0]);
>+        GLTexture tex2D;
>+        initOnePixelColorTexture2DSingleLayered(tex2D);
>+
>+        glFramebufferTextureMultiviewOVR(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, tex2D, 0, 0, 1);
> 
>         glDrawArraysIndirect(GL_TRIANGLES, nullptr);
>         EXPECT_GL_NO_ERROR();
>@@ -610,34 +533,40 @@ TEST_P(MultiviewDrawValidationTest, IndirectDraw)
> // 2) does not generate any error if the number of views is the same.
> TEST_P(MultiviewDrawValidationTest, NumViewsMismatch)
> {
>-    if (!requestMultiviewExtension())
>-    {
>-        return;
>-    }
>-
>-    const GLint viewportOffsets[4] = {0, 0, 2, 0};
>+    ANGLE_SKIP_TEST_IF(!requestMultiviewExtension());
> 
>-    const std::string &vsSource =
>+    constexpr char kVS[] =
>         "#version 300 es\n"
>-        "#extension GL_OVR_multiview : require\n"
>+        "#extension GL_OVR_multiview2 : require\n"
>         "layout(num_views = 2) in;\n"
>         "void main()\n"
>         "{}\n";
>-    const std::string &fsSource =
>+    constexpr char kFS[] =
>         "#version 300 es\n"
>-        "#extension GL_OVR_multiview : require\n"
>+        "#extension GL_OVR_multiview2 : require\n"
>         "precision mediump float;\n"
>+        "out vec4 color;\n"
>         "void main()\n"
>-        "{}\n";
>-    ANGLE_GL_PROGRAM(program, vsSource, fsSource);
>+        "{color = vec4(1);}\n";
>+    ANGLE_GL_PROGRAM(program, kVS, kFS);
>     glUseProgram(program);
> 
>+    GLVertexArray vao;
>+    GLBuffer vertexBuffer;
>+    GLBuffer indexBuffer;
>+    initVAO(vao, vertexBuffer, indexBuffer);
>+
>+    GLFramebuffer fbo;
>+    glBindFramebuffer(GL_FRAMEBUFFER, fbo);
>+
>     // Check for a GL_INVALID_OPERATION error with the framebuffer and program having different
>     // number of views.
>     {
>+        GLTexture tex2D;
>+        initOnePixelColorTexture2DSingleLayered(tex2D);
>+
>         // The framebuffer has only 1 view.
>-        glFramebufferTextureMultiviewSideBySideANGLE(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, mTex2d,
>-                                                     0, 1, &viewportOffsets[0]);
>+        glFramebufferTextureMultiviewOVR(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, tex2D, 0, 0, 1);
> 
>         glDrawArrays(GL_TRIANGLES, 0, 3);
>         EXPECT_GL_ERROR(GL_INVALID_OPERATION);
>@@ -649,8 +578,10 @@ TEST_P(MultiviewDrawValidationTest, NumViewsMismatch)
>     // Check that no errors are generated if the number of views in both program and draw
>     // framebuffer matches.
>     {
>-        glFramebufferTextureMultiviewSideBySideANGLE(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, mTex2d,
>-                                                     0, 2, &viewportOffsets[0]);
>+        GLTexture tex2DArray;
>+        initOnePixelColorTexture2DMultiLayered(tex2DArray);
>+
>+        glFramebufferTextureMultiviewOVR(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, tex2DArray, 0, 0, 2);
> 
>         glDrawArrays(GL_TRIANGLES, 0, 3);
>         EXPECT_GL_NO_ERROR();
>@@ -669,21 +600,30 @@ TEST_P(MultiviewDrawValidationTest, NumViewsMismatchForNonMultiviewProgram)
>         return;
>     }
> 
>-    const std::string &vsSourceNoMultiview =
>+    constexpr char kVS[] =
>         "#version 300 es\n"
>         "void main()\n"
>         "{}\n";
>-    const std::string &fsSourceNoMultiview =
>+    constexpr char kFS[] =
>         "#version 300 es\n"
>         "precision mediump float;\n"
>         "void main()\n"
>         "{}\n";
>-    ANGLE_GL_PROGRAM(programNoMultiview, vsSourceNoMultiview, fsSourceNoMultiview);
>+    ANGLE_GL_PROGRAM(programNoMultiview, kVS, kFS);
>     glUseProgram(programNoMultiview);
> 
>-    const GLint viewportOffsets[4] = {0, 0, 2, 0};
>-    glFramebufferTextureMultiviewSideBySideANGLE(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, mTex2d, 0, 2,
>-                                                 &viewportOffsets[0]);
>+    GLVertexArray vao;
>+    GLBuffer vertexBuffer;
>+    GLBuffer indexBuffer;
>+    initVAO(vao, vertexBuffer, indexBuffer);
>+
>+    GLFramebuffer fbo;
>+    glBindFramebuffer(GL_FRAMEBUFFER, fbo);
>+
>+    GLTexture tex2DArray;
>+    initOnePixelColorTexture2DMultiLayered(tex2DArray);
>+
>+    glFramebufferTextureMultiviewOVR(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, tex2DArray, 0, 0, 2);
> 
>     glDrawArrays(GL_TRIANGLES, 0, 3);
>     EXPECT_GL_ERROR(GL_INVALID_OPERATION);
>@@ -694,61 +634,109 @@ TEST_P(MultiviewDrawValidationTest, NumViewsMismatchForNonMultiviewProgram)
> 
> // The test verifies that glDraw*:
> // 1) generates an INVALID_OPERATION error if the number of views in the active draw framebuffer is
>-// greater than 1 and there is an active transform feedback object.
>+// greater than 1 and there is an active not paused transform feedback object.
> // 2) does not generate any error if the number of views in the draw framebuffer is 1.
> TEST_P(MultiviewDrawValidationTest, ActiveTransformFeedback)
> {
>-    if (!requestMultiviewExtension())
>-    {
>-        return;
>-    }
>+    ANGLE_SKIP_TEST_IF(!requestMultiviewExtension());
> 
>-    const GLint viewportOffsets[4] = {0, 0, 2, 0};
>+    constexpr char kVS[] = R"(#version 300 es
>+out float tfVarying;
>+void main()
>+{
>+    tfVarying = 1.0;
>+})";
>+
>+    constexpr char kFS[] = R"(#version 300 es
>+precision mediump float;
>+void main()
>+{})";
> 
>-    const std::string &vsSource =
>-        R"(#version 300 es
>-        out float tfVarying;
>-        void main()
>-        {
>-            tfVarying = 1.0;
>-        })";
>-    const std::string &fsSource =
>-        R"(#version 300 es
>-        precision mediump float;
>-        void main()
>-        {})";
>     std::vector<std::string> tfVaryings;
>-    tfVaryings.push_back(std::string("tfVarying"));
>-    ANGLE_GL_PROGRAM_TRANSFORM_FEEDBACK(program, vsSource, fsSource, tfVaryings,
>+    tfVaryings.emplace_back("tfVarying");
>+    ANGLE_GL_PROGRAM_TRANSFORM_FEEDBACK(singleViewProgram, kVS, kFS, tfVaryings,
>                                         GL_SEPARATE_ATTRIBS);
>-    glUseProgram(program);
>+
>+    std::vector<std::string> dualViewTFVaryings;
>+    dualViewTFVaryings.emplace_back("gl_Position");
>+    ANGLE_GL_PROGRAM_TRANSFORM_FEEDBACK(dualViewProgram, kDualViewVSSource, kDualViewFSSource,
>+                                        dualViewTFVaryings, GL_SEPARATE_ATTRIBS);
>+
>+    GLVertexArray vao;
>+    GLBuffer vertexBuffer;
>+    GLBuffer indexBuffer;
>+    initVAO(vao, vertexBuffer, indexBuffer);
> 
>     GLBuffer tbo;
>     glBindBuffer(GL_TRANSFORM_FEEDBACK_BUFFER, tbo);
>-    glBufferData(GL_TRANSFORM_FEEDBACK_BUFFER, sizeof(float) * 4u, nullptr, GL_STATIC_DRAW);
>+    glBufferData(GL_TRANSFORM_FEEDBACK_BUFFER, sizeof(float) * 16u, nullptr, GL_STATIC_DRAW);
> 
>     GLTransformFeedback transformFeedback;
>     glBindTransformFeedback(GL_TRANSFORM_FEEDBACK, transformFeedback);
> 
>     glBindBufferBase(GL_TRANSFORM_FEEDBACK_BUFFER, 0, tbo);
> 
>+    glUseProgram(dualViewProgram);
>     glBeginTransformFeedback(GL_TRIANGLES);
>     ASSERT_GL_NO_ERROR();
> 
>+    GLFramebuffer fbo;
>+    glBindFramebuffer(GL_FRAMEBUFFER, fbo);
>+
>+    GLTexture tex2DArray;
>+    initOnePixelColorTexture2DMultiLayered(tex2DArray);
>+
>+    GLenum bufs[] = {GL_NONE};
>+    glDrawBuffers(1, bufs);
>+
>     // Check that drawArrays generates an error when there is an active transform feedback object
>     // and the number of views in the draw framebuffer is greater than 1.
>     {
>-        glFramebufferTextureMultiviewSideBySideANGLE(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, mTex2d,
>-                                                     0, 2, &viewportOffsets[0]);
>+        glFramebufferTextureMultiviewOVR(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, tex2DArray, 0, 0, 2);
>         glDrawArrays(GL_TRIANGLES, 0, 3);
>         EXPECT_GL_ERROR(GL_INVALID_OPERATION);
>     }
> 
>+    glEndTransformFeedback();
>+
>+    // Ending transform feedback should allow the draw to succeed.
>+    {
>+        glDrawArrays(GL_TRIANGLES, 0, 3);
>+        EXPECT_GL_NO_ERROR();
>+    }
>+
>+    // A paused transform feedback should not trigger an error.
>+    glBeginTransformFeedback(GL_TRIANGLES);
>+    glPauseTransformFeedback();
>+    ASSERT_GL_NO_ERROR();
>+
>+    glDrawArrays(GL_TRIANGLES, 0, 3);
>+    ASSERT_GL_NO_ERROR();
>+
>+    // Unbind transform feedback - should succeed.
>+    glBindTransformFeedback(GL_TRANSFORM_FEEDBACK, 0);
>+    glDrawArrays(GL_TRIANGLES, 0, 3);
>+    ASSERT_GL_NO_ERROR();
>+
>+    // Rebind paused transform feedback - should succeed.
>+    glBindTransformFeedback(GL_TRANSFORM_FEEDBACK, transformFeedback);
>+    glDrawArrays(GL_TRIANGLES, 0, 3);
>+    ASSERT_GL_NO_ERROR();
>+
>+    glResumeTransformFeedback();
>+    glEndTransformFeedback();
>+
>+    glUseProgram(singleViewProgram);
>+    glBeginTransformFeedback(GL_TRIANGLES);
>+    ASSERT_GL_NO_ERROR();
>+
>+    GLTexture tex2D;
>+    initOnePixelColorTexture2DSingleLayered(tex2D);
>+
>     // Check that drawArrays does not generate an error when the number of views in the draw
>     // framebuffer is 1.
>     {
>-        glFramebufferTextureMultiviewSideBySideANGLE(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, mTex2d,
>-                                                     0, 1, &viewportOffsets[0]);
>+        glFramebufferTextureMultiviewOVR(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, tex2D, 0, 0, 1);
>         glDrawArrays(GL_TRIANGLES, 0, 3);
>         EXPECT_GL_NO_ERROR();
>     }
>@@ -762,62 +750,95 @@ TEST_P(MultiviewDrawValidationTest, ActiveTransformFeedback)
> // 2) does not generate any error if the number of views in the draw framebuffer is 1.
> TEST_P(MultiviewDrawValidationTest, ActiveTimeElapsedQuery)
> {
>-    if (!requestMultiviewExtension())
>-    {
>-        return;
>-    }
>+    ANGLE_SKIP_TEST_IF(!requestMultiviewExtension());
>+    ANGLE_SKIP_TEST_IF(!EnsureGLExtensionEnabled("GL_EXT_disjoint_timer_query"));
> 
>-    if (!extensionEnabled("GL_EXT_disjoint_timer_query"))
>-    {
>-        std::cout << "Test skipped because GL_EXT_disjoint_timer_query is not available."
>-                  << std::endl;
>-        return;
>-    }
>+    ANGLE_GL_PROGRAM(dualViewProgram, kDualViewVSSource, kDualViewFSSource);
> 
>-    const GLint viewportOffsets[4] = {0, 0, 2, 0};
>-    const std::string &vsSource =
>+    constexpr char kVS[] =
>         "#version 300 es\n"
>         "void main()\n"
>         "{}\n";
>-    const std::string &fsSource =
>+    constexpr char kFS[] =
>         "#version 300 es\n"
>         "precision mediump float;\n"
>         "void main()\n"
>         "{}\n";
>-    ANGLE_GL_PROGRAM(program, vsSource, fsSource);
>-    glUseProgram(program);
>+    ANGLE_GL_PROGRAM(singleViewProgram, kVS, kFS);
>+    glUseProgram(singleViewProgram);
>+
>+    GLVertexArray vao;
>+    GLBuffer vertexBuffer;
>+    GLBuffer indexBuffer;
>+    initVAO(vao, vertexBuffer, indexBuffer);
> 
>     GLuint query = 0u;
>     glGenQueriesEXT(1, &query);
>     glBeginQueryEXT(GL_TIME_ELAPSED_EXT, query);
> 
>+    GLFramebuffer fbo;
>+    glBindFramebuffer(GL_FRAMEBUFFER, fbo);
>+
>+    GLTexture tex2DArr;
>+    initOnePixelColorTexture2DMultiLayered(tex2DArr);
>+
>+    GLenum bufs[] = {GL_NONE};
>+    glDrawBuffers(1, bufs);
>+
>     // Check first case.
>     {
>-        glFramebufferTextureMultiviewSideBySideANGLE(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, mTex2d,
>-                                                     0, 2, &viewportOffsets[0]);
>+        glUseProgram(dualViewProgram);
>+        glFramebufferTextureMultiviewOVR(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, tex2DArr, 0, 0, 2);
>+        glClear(GL_COLOR_BUFFER_BIT);
>+        EXPECT_GL_ERROR(GL_INVALID_OPERATION);
>         glDrawArrays(GL_TRIANGLES, 0, 3);
>         EXPECT_GL_ERROR(GL_INVALID_OPERATION);
>     }
> 
>+    GLTexture tex2D;
>+    initOnePixelColorTexture2DSingleLayered(tex2D);
>+
>     // Check second case.
>     {
>-        glFramebufferTextureMultiviewSideBySideANGLE(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, mTex2d,
>-                                                     0, 1, &viewportOffsets[0]);
>+        glUseProgram(singleViewProgram);
>+        glFramebufferTextureMultiviewOVR(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, tex2D, 0, 0, 1);
>+        glClear(GL_COLOR_BUFFER_BIT);
>+        EXPECT_GL_NO_ERROR();
>         glDrawArrays(GL_TRIANGLES, 0, 3);
>         EXPECT_GL_NO_ERROR();
>     }
> 
>     glEndQueryEXT(GL_TIME_ELAPSED_EXT);
>     glDeleteQueries(1, &query);
>+
>+    // Check starting a query after a successful draw.
>+    {
>+        glUseProgram(dualViewProgram);
>+        glFramebufferTextureMultiviewOVR(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, tex2DArr, 0, 0, 2);
>+        glClear(GL_COLOR_BUFFER_BIT);
>+        EXPECT_GL_NO_ERROR();
>+        glDrawArrays(GL_TRIANGLES, 0, 3);
>+        EXPECT_GL_NO_ERROR();
>+
>+        glGenQueriesEXT(1, &query);
>+        glBeginQueryEXT(GL_TIME_ELAPSED_EXT, query);
>+
>+        glDrawArrays(GL_TRIANGLES, 0, 3);
>+        EXPECT_GL_ERROR(GL_INVALID_OPERATION);
>+
>+        glEndQueryEXT(GL_TIME_ELAPSED_EXT);
>+        glDrawArrays(GL_TRIANGLES, 0, 3);
>+        EXPECT_GL_NO_ERROR();
>+
>+        glDeleteQueries(1, &query);
>+    }
> }
> 
> // The test checks that glDrawArrays can be used to render into two views.
> TEST_P(MultiviewRenderDualViewTest, DrawArrays)
> {
>-    if (!requestMultiviewExtension())
>-    {
>-        return;
>-    }
>+    ANGLE_SKIP_TEST_IF(!requestMultiviewExtension(isMultisampled()));
>+
>     drawQuad(mProgram, "vPosition", 0.0f, 1.0f, true);
>     ASSERT_GL_NO_ERROR();
> 
>@@ -827,10 +848,8 @@ TEST_P(MultiviewRenderDualViewTest, DrawArrays)
> // The test checks that glDrawElements can be used to render into two views.
> TEST_P(MultiviewRenderDualViewTest, DrawElements)
> {
>-    if (!requestMultiviewExtension())
>-    {
>-        return;
>-    }
>+    ANGLE_SKIP_TEST_IF(!requestMultiviewExtension(isMultisampled()));
>+
>     drawIndexedQuad(mProgram, "vPosition", 0.0f, 1.0f, true);
>     ASSERT_GL_NO_ERROR();
> 
>@@ -840,10 +859,8 @@ TEST_P(MultiviewRenderDualViewTest, DrawElements)
> // The test checks that glDrawRangeElements can be used to render into two views.
> TEST_P(MultiviewRenderDualViewTest, DrawRangeElements)
> {
>-    if (!requestMultiviewExtension())
>-    {
>-        return;
>-    }
>+    ANGLE_SKIP_TEST_IF(!requestMultiviewExtension(isMultisampled()));
>+
>     drawIndexedQuad(mProgram, "vPosition", 0.0f, 1.0f, true, true);
>     ASSERT_GL_NO_ERROR();
> 
>@@ -853,14 +870,11 @@ TEST_P(MultiviewRenderDualViewTest, DrawRangeElements)
> // The test checks that glDrawArrays can be used to render into four views.
> TEST_P(MultiviewRenderTest, DrawArraysFourViews)
> {
>-    if (!requestMultiviewExtension())
>-    {
>-        return;
>-    }
>+    ANGLE_SKIP_TEST_IF(!requestMultiviewExtension(isMultisampled()));
> 
>-    const std::string vsSource =
>+    constexpr char kVS[] =
>         "#version 300 es\n"
>-        "#extension GL_OVR_multiview : require\n"
>+        "#extension GL_OVR_multiview2 : require\n"
>         "layout(num_views = 4) in;\n"
>         "in vec4 vPosition;\n"
>         "void main()\n"
>@@ -877,9 +891,9 @@ TEST_P(MultiviewRenderTest, DrawArraysFourViews)
>         "   gl_Position.yzw = vPosition.yzw;\n"
>         "}\n";
> 
>-    const std::string fsSource =
>+    constexpr char kFS[] =
>         "#version 300 es\n"
>-        "#extension GL_OVR_multiview : require\n"
>+        "#extension GL_OVR_multiview2 : require\n"
>         "precision mediump float;\n"
>         "out vec4 col;\n"
>         "void main()\n"
>@@ -887,12 +901,13 @@ TEST_P(MultiviewRenderTest, DrawArraysFourViews)
>         "    col = vec4(0,1,0,1);\n"
>         "}\n";
> 
>-    createFBO(4, 1, 4);
>-    ANGLE_GL_PROGRAM(program, vsSource, fsSource);
>+    updateFBOs(4, 1, 4);
>+    ANGLE_GL_PROGRAM(program, kVS, kFS);
> 
>     drawQuad(program, "vPosition", 0.0f, 1.0f, true);
>     ASSERT_GL_NO_ERROR();
> 
>+    resolveMultisampledFBO();
>     for (int i = 0; i < 4; ++i)
>     {
>         for (int j = 0; j < 4; ++j)
>@@ -903,7 +918,7 @@ TEST_P(MultiviewRenderTest, DrawArraysFourViews)
>             }
>             else
>             {
>-                EXPECT_EQ(GLColor::black, GetViewColor(j, 0, i));
>+                EXPECT_EQ(GLColor::transparentBlack, GetViewColor(j, 0, i));
>             }
>         }
>     }
>@@ -913,31 +928,28 @@ TEST_P(MultiviewRenderTest, DrawArraysFourViews)
> // The test checks that glDrawArraysInstanced can be used to render into two views.
> TEST_P(MultiviewRenderTest, DrawArraysInstanced)
> {
>-    if (!requestMultiviewExtension())
>-    {
>-        return;
>-    }
>+    ANGLE_SKIP_TEST_IF(!requestMultiviewExtension(isMultisampled()));
> 
>-    const std::string vsSource =
>+    constexpr char kVS[] =
>         "#version 300 es\n"
>-        "#extension GL_OVR_multiview : require\n"
>+        "#extension GL_OVR_multiview2 : require\n"
>         "layout(num_views = 2) in;\n"
>         "in vec4 vPosition;\n"
>         "void main()\n"
>         "{\n"
>         "       vec4 p = vPosition;\n"
>         "       if (gl_InstanceID == 1){\n"
>-        "               p.y = .5*p.y + .5;\n"
>+        "               p.y = p.y * 0.5 + 0.5;\n"
>         "       } else {\n"
>-        "               p.y = p.y*.5;\n"
>+        "               p.y = p.y * 0.5 - 0.5;\n"
>         "       }\n"
>-        "       gl_Position.x = (gl_ViewID_OVR == 0u ? p.x*0.5 + 0.5 : p.x*0.5);\n"
>+        "       gl_Position.x = (gl_ViewID_OVR == 0u ? p.x * 0.5 + 0.5 : p.x * 0.5 - 0.5);\n"
>         "       gl_Position.yzw = p.yzw;\n"
>         "}\n";
> 
>-    const std::string fsSource =
>+    constexpr char kFS[] =
>         "#version 300 es\n"
>-        "#extension GL_OVR_multiview : require\n"
>+        "#extension GL_OVR_multiview2 : require\n"
>         "precision mediump float;\n"
>         "out vec4 col;\n"
>         "void main()\n"
>@@ -948,12 +960,14 @@ TEST_P(MultiviewRenderTest, DrawArraysInstanced)
>     const int kViewWidth  = 2;
>     const int kViewHeight = 2;
>     const int kNumViews   = 2;
>-    createFBO(kViewWidth, kViewHeight, kNumViews);
>-    ANGLE_GL_PROGRAM(program, vsSource, fsSource);
>+    updateFBOs(kViewWidth, kViewHeight, kNumViews);
>+    ANGLE_GL_PROGRAM(program, kVS, kFS);
> 
>     drawQuadInstanced(program, "vPosition", 0.0f, 1.0f, true, 2u);
>     ASSERT_GL_NO_ERROR();
> 
>+    resolveMultisampledFBO();
>+
>     const GLubyte expectedGreenChannel[kNumViews][kViewHeight][kViewWidth] = {{{0, 255}, {0, 255}},
>                                                                               {{255, 0}, {255, 0}}};
> 
>@@ -963,7 +977,8 @@ TEST_P(MultiviewRenderTest, DrawArraysInstanced)
>         {
>             for (int x = 0; x < 2; ++x)
>             {
>-                EXPECT_EQ(GLColor(0, expectedGreenChannel[view][y][x], 0, 255),
>+                EXPECT_EQ(GLColor(0, expectedGreenChannel[view][y][x], 0,
>+                                  expectedGreenChannel[view][y][x]),
>                           GetViewColor(x, y, view));
>             }
>         }
>@@ -979,14 +994,18 @@ TEST_P(MultiviewRenderTest, DrawArraysInstanced)
> // not by 3.
> TEST_P(MultiviewRenderTest, AttribDivisor)
> {
>-    if (!requestMultiviewExtension())
>+    ANGLE_SKIP_TEST_IF(!requestMultiviewExtension(isMultisampled()));
>+
>+    // Looks like an incorrect D3D debug layer message is generated on Windows AMD and NVIDIA.
>+    // May be specific to Windows 7 / Windows Server 2008. http://anglebug.com/2778
>+    if (IsWindows() && IsD3D11())
>     {
>-        return;
>+        ignoreD3D11SDKLayersWarnings();
>     }
> 
>-    const std::string &vsSource =
>+    constexpr char kVS[] =
>         "#version 300 es\n"
>-        "#extension GL_OVR_multiview : require\n"
>+        "#extension GL_OVR_multiview2 : require\n"
>         "layout(num_views = 2) in;\n"
>         "in vec3 vPosition;\n"
>         "in float offsetX;\n"
>@@ -999,9 +1018,9 @@ TEST_P(MultiviewRenderTest, AttribDivisor)
>         "       gl_Position.yzw = p.yzw;\n"
>         "}\n";
> 
>-    const std::string &fsSource =
>+    constexpr char kFS[] =
>         "#version 300 es\n"
>-        "#extension GL_OVR_multiview : require\n"
>+        "#extension GL_OVR_multiview2 : require\n"
>         "precision mediump float;\n"
>         "out vec4 col;\n"
>         "void main()\n"
>@@ -1012,8 +1031,8 @@ TEST_P(MultiviewRenderTest, AttribDivisor)
>     const int kViewWidth  = 4;
>     const int kViewHeight = 4;
>     const int kNumViews   = 2;
>-    createFBO(kViewWidth, kViewHeight, kNumViews);
>-    ANGLE_GL_PROGRAM(program, vsSource, fsSource);
>+    updateFBOs(kViewWidth, kViewHeight, kNumViews);
>+    ANGLE_GL_PROGRAM(program, kVS, kFS);
> 
>     GLBuffer xOffsetVBO;
>     glBindBuffer(GL_ARRAY_BUFFER, xOffsetVBO);
>@@ -1036,6 +1055,8 @@ TEST_P(MultiviewRenderTest, AttribDivisor)
>     drawQuadInstanced(program, "vPosition", 0.0f, 1.0f, true, 4u);
>     ASSERT_GL_NO_ERROR();
> 
>+    resolveMultisampledFBO();
>+
>     const GLubyte expectedGreenChannel[kNumViews][kViewHeight][kViewWidth] = {
>         {{255, 0, 0, 0}, {255, 0, 0, 0}, {255, 0, 0, 0}, {0, 255, 0, 0}},
>         {{0, 0, 255, 0}, {0, 0, 255, 0}, {0, 0, 255, 0}, {0, 0, 0, 255}}};
>@@ -1045,7 +1066,8 @@ TEST_P(MultiviewRenderTest, AttribDivisor)
>         {
>             for (int col = 0; col < 4; ++col)
>             {
>-                EXPECT_EQ(GLColor(0, expectedGreenChannel[view][row][col], 0, 255),
>+                EXPECT_EQ(GLColor(0, expectedGreenChannel[view][row][col], 0,
>+                                  expectedGreenChannel[view][row][col]),
>                           GetViewColor(col, row, view));
>             }
>         }
>@@ -1056,17 +1078,14 @@ TEST_P(MultiviewRenderTest, AttribDivisor)
> // multi-view context propagate the correct divisor to the driver.
> TEST_P(MultiviewRenderTest, DivisorOrderOfOperation)
> {
>-    if (!requestMultiviewExtension())
>-    {
>-        return;
>-    }
>+    ANGLE_SKIP_TEST_IF(!requestMultiviewExtension(isMultisampled()));
> 
>-    createFBO(1, 1, 2);
>+    updateFBOs(1, 1, 2);
> 
>     // Create multiview program.
>-    const std::string &vs =
>+    constexpr char kVS[] =
>         "#version 300 es\n"
>-        "#extension GL_OVR_multiview : require\n"
>+        "#extension GL_OVR_multiview2 : require\n"
>         "layout(num_views = 2) in;\n"
>         "layout(location = 0) in vec2 vPosition;\n"
>         "layout(location = 1) in float offsetX;\n"
>@@ -1077,9 +1096,9 @@ TEST_P(MultiviewRenderTest, DivisorOrderOfOperation)
>         "       gl_Position = p;\n"
>         "}\n";
> 
>-    const std::string &fs =
>+    constexpr char kFS[] =
>         "#version 300 es\n"
>-        "#extension GL_OVR_multiview : require\n"
>+        "#extension GL_OVR_multiview2 : require\n"
>         "precision mediump float;\n"
>         "out vec4 col;\n"
>         "void main()\n"
>@@ -1087,9 +1106,9 @@ TEST_P(MultiviewRenderTest, DivisorOrderOfOperation)
>         "    col = vec4(0,1,0,1);\n"
>         "}\n";
> 
>-    ANGLE_GL_PROGRAM(program, vs, fs);
>+    ANGLE_GL_PROGRAM(program, kVS, kFS);
> 
>-    const std::string &dummyVS =
>+    constexpr char kDummyVS[] =
>         "#version 300 es\n"
>         "layout(location = 0) in vec2 vPosition;\n"
>         "layout(location = 1) in float offsetX;\n"
>@@ -1098,7 +1117,7 @@ TEST_P(MultiviewRenderTest, DivisorOrderOfOperation)
>         "       gl_Position = vec4(vPosition, 0.0, 1.0);\n"
>         "}\n";
> 
>-    const std::string &dummyFS =
>+    constexpr char kDummyFS[] =
>         "#version 300 es\n"
>         "precision mediump float;\n"
>         "out vec4 col;\n"
>@@ -1107,7 +1126,7 @@ TEST_P(MultiviewRenderTest, DivisorOrderOfOperation)
>         "    col = vec4(0,0,0,1);\n"
>         "}\n";
> 
>-    ANGLE_GL_PROGRAM(dummyProgram, dummyVS, dummyFS);
>+    ANGLE_GL_PROGRAM(dummyProgram, kDummyVS, kDummyFS);
> 
>     GLBuffer xOffsetVBO;
>     glBindBuffer(GL_ARRAY_BUFFER, xOffsetVBO);
>@@ -1154,11 +1173,13 @@ TEST_P(MultiviewRenderTest, DivisorOrderOfOperation)
>     ASSERT_GL_NO_ERROR();
> 
>     // Check that vertexAttribDivisor uses the number of views to update the divisor.
>-    glBindFramebuffer(GL_DRAW_FRAMEBUFFER, mDrawFramebuffer);
>+    bindMemberDrawFramebuffer();
>     glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
>     glUseProgram(program);
>     glVertexAttribDivisor(1, 1);
>     glDrawArraysInstanced(GL_TRIANGLES, 0, 6, 1);
>+
>+    resolveMultisampledFBO();
>     EXPECT_EQ(GLColor::green, GetViewColor(0, 0, 0));
>     EXPECT_EQ(GLColor::green, GetViewColor(0, 0, 1));
> 
>@@ -1174,10 +1195,12 @@ TEST_P(MultiviewRenderTest, DivisorOrderOfOperation)
>     ASSERT_GL_NO_ERROR();
> 
>     // Check that useProgram uses the number of views to update the divisor.
>-    glBindFramebuffer(GL_DRAW_FRAMEBUFFER, mDrawFramebuffer);
>+    bindMemberDrawFramebuffer();
>     glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
>     glUseProgram(program);
>     glDrawArraysInstanced(GL_TRIANGLES, 0, 6, 1);
>+
>+    resolveMultisampledFBO();
>     EXPECT_EQ(GLColor::green, GetViewColor(0, 0, 0));
>     EXPECT_EQ(GLColor::green, GetViewColor(0, 0, 1));
> 
>@@ -1194,7 +1217,7 @@ TEST_P(MultiviewRenderTest, DivisorOrderOfOperation)
>     {
>         // Call useProgram with vao[1] being active to guarantee that useProgram will adjust the
>         // divisor for vao[1] only.
>-        glBindFramebuffer(GL_DRAW_FRAMEBUFFER, mDrawFramebuffer);
>+        bindMemberDrawFramebuffer();
>         glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
>         glBindVertexArray(vao[1]);
>         glUseProgram(program);
>@@ -1207,6 +1230,8 @@ TEST_P(MultiviewRenderTest, DivisorOrderOfOperation)
>     glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
>     glBindVertexArray(vao[0]);
>     glDrawArraysInstanced(GL_TRIANGLES, 0, 6, 1);
>+
>+    resolveMultisampledFBO();
>     EXPECT_EQ(GLColor::green, GetViewColor(0, 0, 0));
>     EXPECT_EQ(GLColor::green, GetViewColor(0, 0, 1));
> }
>@@ -1218,9 +1243,9 @@ TEST_P(MultiviewOcclusionQueryTest, OcclusionQueryNothingVisible)
>     ANGLE_SKIP_TEST_IF(!requestMultiviewExtension());
>     ANGLE_SKIP_TEST_IF(!requestOcclusionQueryExtension());
> 
>-    const std::string vsSource =
>+    constexpr char kVS[] =
>         "#version 300 es\n"
>-        "#extension GL_OVR_multiview : require\n"
>+        "#extension GL_OVR_multiview2 : require\n"
>         "layout(num_views = 2) in;\n"
>         "in vec3 vPosition;\n"
>         "void main()\n"
>@@ -1229,17 +1254,17 @@ TEST_P(MultiviewOcclusionQueryTest, OcclusionQueryNothingVisible)
>         "       gl_Position.yzw = vec3(vPosition.yz, 1.);\n"
>         "}\n";
> 
>-    const std::string fsSource =
>+    constexpr char kFS[] =
>         "#version 300 es\n"
>-        "#extension GL_OVR_multiview : require\n"
>+        "#extension GL_OVR_multiview2 : require\n"
>         "precision mediump float;\n"
>         "out vec4 col;\n"
>         "void main()\n"
>         "{\n"
>         "    col = vec4(1,0,0,0);\n"
>         "}\n";
>-    ANGLE_GL_PROGRAM(program, vsSource, fsSource);
>-    createFBO(1, 1, 2);
>+    ANGLE_GL_PROGRAM(program, kVS, kFS);
>+    updateFBOs(1, 1, 2);
> 
>     GLuint result = drawAndRetrieveOcclusionQueryResult(program);
>     ASSERT_GL_NO_ERROR();
>@@ -1253,9 +1278,9 @@ TEST_P(MultiviewOcclusionQueryTest, OcclusionQueryOnlyLeftVisible)
>     ANGLE_SKIP_TEST_IF(!requestMultiviewExtension());
>     ANGLE_SKIP_TEST_IF(!requestOcclusionQueryExtension());
> 
>-    const std::string vsSource =
>+    constexpr char kVS[] =
>         "#version 300 es\n"
>-        "#extension GL_OVR_multiview : require\n"
>+        "#extension GL_OVR_multiview2 : require\n"
>         "layout(num_views = 2) in;\n"
>         "in vec3 vPosition;\n"
>         "void main()\n"
>@@ -1264,17 +1289,17 @@ TEST_P(MultiviewOcclusionQueryTest, OcclusionQueryOnlyLeftVisible)
>         "       gl_Position.yzw = vec3(vPosition.yz, 1.);\n"
>         "}\n";
> 
>-    const std::string fsSource =
>+    constexpr char kFS[] =
>         "#version 300 es\n"
>-        "#extension GL_OVR_multiview : require\n"
>+        "#extension GL_OVR_multiview2 : require\n"
>         "precision mediump float;\n"
>         "out vec4 col;\n"
>         "void main()\n"
>         "{\n"
>         "    col = vec4(1,0,0,0);\n"
>         "}\n";
>-    ANGLE_GL_PROGRAM(program, vsSource, fsSource);
>-    createFBO(1, 1, 2);
>+    ANGLE_GL_PROGRAM(program, kVS, kFS);
>+    updateFBOs(1, 1, 2);
> 
>     GLuint result = drawAndRetrieveOcclusionQueryResult(program);
>     ASSERT_GL_NO_ERROR();
>@@ -1288,9 +1313,9 @@ TEST_P(MultiviewOcclusionQueryTest, OcclusionQueryOnlyRightVisible)
>     ANGLE_SKIP_TEST_IF(!requestMultiviewExtension());
>     ANGLE_SKIP_TEST_IF(!requestOcclusionQueryExtension());
> 
>-    const std::string vsSource =
>+    constexpr char kVS[] =
>         "#version 300 es\n"
>-        "#extension GL_OVR_multiview : require\n"
>+        "#extension GL_OVR_multiview2 : require\n"
>         "layout(num_views = 2) in;\n"
>         "in vec3 vPosition;\n"
>         "void main()\n"
>@@ -1299,17 +1324,17 @@ TEST_P(MultiviewOcclusionQueryTest, OcclusionQueryOnlyRightVisible)
>         "       gl_Position.yzw = vec3(vPosition.yz, 1.);\n"
>         "}\n";
> 
>-    const std::string fsSource =
>+    constexpr char kFS[] =
>         "#version 300 es\n"
>-        "#extension GL_OVR_multiview : require\n"
>+        "#extension GL_OVR_multiview2 : require\n"
>         "precision mediump float;\n"
>         "out vec4 col;\n"
>         "void main()\n"
>         "{\n"
>         "    col = vec4(1,0,0,0);\n"
>         "}\n";
>-    ANGLE_GL_PROGRAM(program, vsSource, fsSource);
>-    createFBO(1, 1, 2);
>+    ANGLE_GL_PROGRAM(program, kVS, kFS);
>+    updateFBOs(1, 1, 2);
> 
>     GLuint result = drawAndRetrieveOcclusionQueryResult(program);
>     ASSERT_GL_NO_ERROR();
>@@ -1325,23 +1350,23 @@ TEST_P(MultiviewProgramGenerationTest, SimpleProgram)
>         return;
>     }
> 
>-    const std::string vsSource =
>+    constexpr char kVS[] =
>         "#version 300 es\n"
>-        "#extension GL_OVR_multiview : require\n"
>+        "#extension GL_OVR_multiview2 : require\n"
>         "layout(num_views = 2) in;\n"
>         "void main()\n"
>         "{\n"
>         "}\n";
> 
>-    const std::string fsSource =
>+    constexpr char kFS[] =
>         "#version 300 es\n"
>-        "#extension GL_OVR_multiview : require\n"
>+        "#extension GL_OVR_multiview2 : require\n"
>         "precision mediump float;\n"
>         "void main()\n"
>         "{\n"
>         "}\n";
> 
>-    ANGLE_GL_PROGRAM(program, vsSource, fsSource);
>+    ANGLE_GL_PROGRAM(program, kVS, kFS);
>     glUseProgram(program);
> 
>     EXPECT_GL_NO_ERROR();
>@@ -1356,9 +1381,9 @@ TEST_P(MultiviewProgramGenerationTest, UseViewIDInVertexShader)
>         return;
>     }
> 
>-    const std::string vsSource =
>+    constexpr char kVS[] =
>         "#version 300 es\n"
>-        "#extension GL_OVR_multiview : require\n"
>+        "#extension GL_OVR_multiview2 : require\n"
>         "layout(num_views = 2) in;\n"
>         "void main()\n"
>         "{\n"
>@@ -1369,15 +1394,15 @@ TEST_P(MultiviewProgramGenerationTest, UseViewIDInVertexShader)
>         "   }\n"
>         "}\n";
> 
>-    const std::string fsSource =
>+    constexpr char kFS[] =
>         "#version 300 es\n"
>-        "#extension GL_OVR_multiview : require\n"
>+        "#extension GL_OVR_multiview2 : require\n"
>         "precision mediump float;\n"
>         "void main()\n"
>         "{\n"
>         "}\n";
> 
>-    ANGLE_GL_PROGRAM(program, vsSource, fsSource);
>+    ANGLE_GL_PROGRAM(program, kVS, kFS);
>     glUseProgram(program);
> 
>     EXPECT_GL_NO_ERROR();
>@@ -1392,17 +1417,17 @@ TEST_P(MultiviewProgramGenerationTest, UseViewIDInFragmentShader)
>         return;
>     }
> 
>-    const std::string vsSource =
>+    constexpr char kVS[] =
>         "#version 300 es\n"
>-        "#extension GL_OVR_multiview : require\n"
>+        "#extension GL_OVR_multiview2 : require\n"
>         "layout(num_views = 2) in;\n"
>         "void main()\n"
>         "{\n"
>         "}\n";
> 
>-    const std::string fsSource =
>+    constexpr char kFS[] =
>         "#version 300 es\n"
>-        "#extension GL_OVR_multiview : require\n"
>+        "#extension GL_OVR_multiview2 : require\n"
>         "precision mediump float;\n"
>         "out vec4 col;\n"
>         "void main()\n"
>@@ -1414,7 +1439,7 @@ TEST_P(MultiviewProgramGenerationTest, UseViewIDInFragmentShader)
>         "   }\n"
>         "}\n";
> 
>-    ANGLE_GL_PROGRAM(program, vsSource, fsSource);
>+    ANGLE_GL_PROGRAM(program, kVS, kFS);
>     glUseProgram(program);
> 
>     EXPECT_GL_NO_ERROR();
>@@ -1431,9 +1456,9 @@ TEST_P(MultiviewRenderPrimitiveTest, Points)
>     // Test failing on P400 graphics card (anglebug.com/2228)
>     ANGLE_SKIP_TEST_IF(IsWindows() && IsD3D11() && IsNVIDIA());
> 
>-    const std::string vsSource =
>+    constexpr char kVS[] =
>         "#version 300 es\n"
>-        "#extension GL_OVR_multiview : require\n"
>+        "#extension GL_OVR_multiview2 : require\n"
>         "layout(num_views = 2) in;\n"
>         "layout(location=0) in vec2 vPosition;\n"
>         "void main()\n"
>@@ -1442,22 +1467,22 @@ TEST_P(MultiviewRenderPrimitiveTest, Points)
>         "   gl_Position = vec4(vPosition.xy, 0.0, 1.0);\n"
>         "}\n";
> 
>-    const std::string fsSource =
>+    constexpr char kFS[] =
>         "#version 300 es\n"
>-        "#extension GL_OVR_multiview : require\n"
>+        "#extension GL_OVR_multiview2 : require\n"
>         "precision mediump float;\n"
>         "out vec4 col;\n"
>         "void main()\n"
>         "{\n"
>         "   col = vec4(0,1,0,1);\n"
>         "}\n";
>-    ANGLE_GL_PROGRAM(program, vsSource, fsSource);
>+    ANGLE_GL_PROGRAM(program, kVS, kFS);
>     glUseProgram(program);
> 
>     const int kViewWidth  = 4;
>     const int kViewHeight = 2;
>     const int kNumViews   = 2;
>-    createFBO(kViewWidth, kViewHeight, kNumViews);
>+    updateFBOs(kViewWidth, kViewHeight, kNumViews);
> 
>     std::vector<Vector2I> windowCoordinates = {Vector2I(0, 0), Vector2I(3, 1)};
>     std::vector<Vector2> vertexDataInClipSpace =
>@@ -1492,7 +1517,7 @@ TEST_P(MultiviewRenderPrimitiveTest, Lines)
>     const int kViewWidth  = 4;
>     const int kViewHeight = 2;
>     const int kNumViews   = 2;
>-    createFBO(kViewWidth, kViewHeight, kNumViews);
>+    updateFBOs(kViewWidth, kViewHeight, kNumViews);
> 
>     std::vector<Vector2I> windowCoordinates = {Vector2I(0, 0), Vector2I(4, 0)};
>     std::vector<Vector2> vertexDataInClipSpace =
>@@ -1529,7 +1554,7 @@ TEST_P(MultiviewRenderPrimitiveTest, LineStrip)
>     const int kViewWidth  = 4;
>     const int kViewHeight = 2;
>     const int kNumViews   = 2;
>-    createFBO(kViewWidth, kViewHeight, kNumViews);
>+    updateFBOs(kViewWidth, kViewHeight, kNumViews);
> 
>     std::vector<Vector2I> windowCoordinates = {Vector2I(0, 0), Vector2I(3, 0), Vector2I(3, 2)};
>     std::vector<Vector2> vertexDataInClipSpace =
>@@ -1566,7 +1591,7 @@ TEST_P(MultiviewRenderPrimitiveTest, LineLoop)
>     const int kViewWidth  = 4;
>     const int kViewHeight = 4;
>     const int kNumViews   = 2;
>-    createFBO(kViewWidth, kViewHeight, kNumViews);
>+    updateFBOs(kViewWidth, kViewHeight, kNumViews);
> 
>     std::vector<Vector2I> windowCoordinates = {Vector2I(0, 0), Vector2I(3, 0), Vector2I(3, 3),
>                                                Vector2I(0, 3)};
>@@ -1604,7 +1629,7 @@ TEST_P(MultiviewRenderPrimitiveTest, TriangleStrip)
>     const int kViewWidth  = 2;
>     const int kViewHeight = 2;
>     const int kNumViews   = 2;
>-    createFBO(kViewWidth, kViewHeight, kNumViews);
>+    updateFBOs(kViewWidth, kViewHeight, kNumViews);
> 
>     glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
> 
>@@ -1635,7 +1660,7 @@ TEST_P(MultiviewRenderPrimitiveTest, TriangleFan)
>     const int kViewWidth  = 2;
>     const int kViewHeight = 2;
>     const int kNumViews   = 2;
>-    createFBO(kViewWidth, kViewHeight, kNumViews);
>+    updateFBOs(kViewWidth, kViewHeight, kNumViews);
> 
>     glDrawArrays(GL_TRIANGLE_FAN, 0, 4);
> 
>@@ -1646,104 +1671,30 @@ TEST_P(MultiviewRenderPrimitiveTest, TriangleFan)
>     glDeleteProgram(program);
> }
> 
>-// Test that rendering enlarged points and lines does not leak fragments outside of the views'
>-// bounds. The test does not rely on the actual line width being greater than 1.0.
>-TEST_P(MultiviewSideBySideRenderTest, NoLeakingFragments)
>-{
>-    if (!requestMultiviewExtension())
>-    {
>-        return;
>-    }
>-
>-    createFBO(2, 1, 2);
>-
>-    GLint viewportOffsets[4] = {1, 0, 3, 0};
>-    glFramebufferTextureMultiviewSideBySideANGLE(GL_DRAW_FRAMEBUFFER, GL_COLOR_ATTACHMENT0,
>-                                                 mColorTexture, 0, 2, &viewportOffsets[0]);
>-    glFramebufferTextureMultiviewSideBySideANGLE(GL_DRAW_FRAMEBUFFER, GL_DEPTH_ATTACHMENT,
>-                                                 mDepthTexture, 0, 2, &viewportOffsets[0]);
>-
>-    glViewport(0, 0, 1, 1);
>-    glScissor(0, 0, 1, 1);
>-    glEnable(GL_SCISSOR_TEST);
>-
>-    const std::string vsSource =
>-        "#version 300 es\n"
>-        "#extension GL_OVR_multiview : require\n"
>-        "layout(num_views = 2) in;\n"
>-        "layout(location=0) in vec2 vPosition;\n"
>-        "void main()\n"
>-        "{\n"
>-        "   gl_PointSize = 10.0;\n"
>-        "   gl_Position = vec4(vPosition.xy, 0.0, 1.0);\n"
>-        "}\n";
>-
>-    const std::string fsSource =
>-        "#version 300 es\n"
>-        "#extension GL_OVR_multiview : require\n"
>-        "precision mediump float;\n"
>-        "out vec4 col;\n"
>-        "void main()\n"
>-        "{\n"
>-        "   if (gl_ViewID_OVR == 0u) {\n"
>-        "       col = vec4(1,0,0,1);\n"
>-        "   } else {\n"
>-        "       col = vec4(0,1,0,1);\n"
>-        "   }\n"
>-        "}\n";
>-    ANGLE_GL_PROGRAM(program, vsSource, fsSource);
>-    glUseProgram(program);
>-
>-    const std::vector<Vector2I> &windowCoordinates = {Vector2I(0, 0), Vector2I(2, 0)};
>-    const std::vector<Vector2> &vertexDataInClipSpace =
>-        ConvertPixelCoordinatesToClipSpace(windowCoordinates, 1, 1);
>-
>-    GLBuffer vbo;
>-    glBindBuffer(GL_ARRAY_BUFFER, vbo);
>-    glBufferData(GL_ARRAY_BUFFER, vertexDataInClipSpace.size() * sizeof(Vector2),
>-                 vertexDataInClipSpace.data(), GL_STATIC_DRAW);
>-    glEnableVertexAttribArray(0);
>-    glVertexAttribPointer(0, 2, GL_FLOAT, GL_FALSE, 0, NULL);
>-
>-    // Test rendering points.
>-    {
>-        glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
>-        glDrawArrays(GL_POINTS, 0, 2);
>-        EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::black);
>-        EXPECT_PIXEL_COLOR_EQ(1, 0, GLColor::red);
>-        EXPECT_PIXEL_COLOR_EQ(2, 0, GLColor::black);
>-        EXPECT_PIXEL_COLOR_EQ(3, 0, GLColor::green);
>-    }
>-
>-    // Test rendering lines.
>-    {
>-        glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
>-        glLineWidth(10.f);
>-        glDrawArrays(GL_LINES, 0, 2);
>-        EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::black);
>-        EXPECT_PIXEL_COLOR_EQ(1, 0, GLColor::red);
>-        EXPECT_PIXEL_COLOR_EQ(2, 0, GLColor::black);
>-        EXPECT_PIXEL_COLOR_EQ(3, 0, GLColor::green);
>-    }
>-}
>-
> // Verify that re-linking a program adjusts the attribute divisor.
> // The test uses instacing to draw for each view a strips of two red quads and two blue quads next
> // to each other. The quads' position and color depend on the corresponding attribute divisors.
> TEST_P(MultiviewRenderTest, ProgramRelinkUpdatesAttribDivisor)
> {
>-    if (!requestMultiviewExtension())
>+    if (!requestMultiviewExtension(isMultisampled()))
>     {
>         return;
>     }
> 
>+    // Looks like an incorrect D3D debug layer message is generated on Windows AMD and NVIDIA.
>+    // May be specific to Windows 7 / Windows Server 2008. http://anglebug.com/2778
>+    if (IsWindows() && IsD3D11())
>+    {
>+        ignoreD3D11SDKLayersWarnings();
>+    }
>+
>     const int kViewWidth  = 4;
>     const int kViewHeight = 1;
>     const int kNumViews   = 2;
> 
>-    const std::string &fsSource =
>+    constexpr char kFS[] =
>         "#version 300 es\n"
>-        "#extension GL_OVR_multiview : require\n"
>+        "#extension GL_OVR_multiview2 : require\n"
>         "precision mediump float;\n"
>         "in vec4 oColor;\n"
>         "out vec4 col;\n"
>@@ -1755,7 +1706,7 @@ TEST_P(MultiviewRenderTest, ProgramRelinkUpdatesAttribDivisor)
>     auto generateVertexShaderSource = [](int numViews) -> std::string {
>         std::string source =
>             "#version 300 es\n"
>-            "#extension GL_OVR_multiview : require\n"
>+            "#extension GL_OVR_multiview2 : require\n"
>             "layout(num_views = " +
>             ToString(numViews) +
>             ") in;\n"
>@@ -1774,7 +1725,7 @@ TEST_P(MultiviewRenderTest, ProgramRelinkUpdatesAttribDivisor)
>     };
> 
>     std::string vsSource = generateVertexShaderSource(kNumViews);
>-    ANGLE_GL_PROGRAM(program, vsSource, fsSource);
>+    ANGLE_GL_PROGRAM(program, vsSource.c_str(), kFS);
>     glUseProgram(program);
> 
>     GLint positionLoc;
>@@ -1805,11 +1756,12 @@ TEST_P(MultiviewRenderTest, ProgramRelinkUpdatesAttribDivisor)
>     }
> 
>     {
>-        createFBO(kViewWidth, kViewHeight, kNumViews);
>+        updateFBOs(kViewWidth, kViewHeight, kNumViews);
> 
>         drawQuadInstanced(program, "vPosition", 0.0f, 1.0f, true, 4u);
>         ASSERT_GL_NO_ERROR();
> 
>+        resolveMultisampledFBO();
>         EXPECT_EQ(GLColor::red, GetViewColor(0, 0, 0));
>         EXPECT_EQ(GLColor::red, GetViewColor(1, 0, 0));
>         EXPECT_EQ(GLColor::blue, GetViewColor(2, 0, 0));
>@@ -1819,11 +1771,11 @@ TEST_P(MultiviewRenderTest, ProgramRelinkUpdatesAttribDivisor)
>     {
>         const int kNewNumViews = 3;
>         vsSource               = generateVertexShaderSource(kNewNumViews);
>-        createFBO(kViewWidth, kViewHeight, kNewNumViews);
>+        updateFBOs(kViewWidth, kViewHeight, kNewNumViews);
> 
>-        GLuint vs = CompileShader(GL_VERTEX_SHADER, vsSource);
>+        GLuint vs = CompileShader(GL_VERTEX_SHADER, vsSource.c_str());
>         ASSERT_NE(0u, vs);
>-        GLuint fs = CompileShader(GL_FRAGMENT_SHADER, fsSource);
>+        GLuint fs = CompileShader(GL_FRAGMENT_SHADER, kFS);
>         ASSERT_NE(0u, fs);
> 
>         GLint numAttachedShaders = 0;
>@@ -1851,6 +1803,7 @@ TEST_P(MultiviewRenderTest, ProgramRelinkUpdatesAttribDivisor)
>         drawQuadInstanced(program, "vPosition", 0.0f, 1.0f, true, 4u);
>         ASSERT_GL_NO_ERROR();
> 
>+        resolveMultisampledFBO();
>         for (int i = 0; i < kNewNumViews; ++i)
>         {
>             EXPECT_EQ(GLColor::red, GetViewColor(0, 0, i));
>@@ -1865,7 +1818,7 @@ TEST_P(MultiviewRenderTest, ProgramRelinkUpdatesAttribDivisor)
> // divisor.
> TEST_P(MultiviewRenderTest, DivisorUpdatedOnProgramChange)
> {
>-    if (!requestMultiviewExtension())
>+    if (!requestMultiviewExtension(isMultisampled()))
>     {
>         return;
>     }
>@@ -1873,6 +1826,13 @@ TEST_P(MultiviewRenderTest, DivisorUpdatedOnProgramChange)
>     // Test failing on P400 graphics card (anglebug.com/2228)
>     ANGLE_SKIP_TEST_IF(IsWindows() && IsD3D11() && IsNVIDIA());
> 
>+    // Looks like an incorrect D3D debug layer message is generated on Windows / AMD.
>+    // May be specific to Windows 7 / Windows Server 2008. http://anglebug.com/2778
>+    if (IsWindows() && IsD3D11())
>+    {
>+        ignoreD3D11SDKLayersWarnings();
>+    }
>+
>     GLVertexArray vao;
>     glBindVertexArray(vao);
>     GLBuffer vbo;
>@@ -1892,7 +1852,7 @@ TEST_P(MultiviewRenderTest, DivisorUpdatedOnProgramChange)
>     // Create a program and fbo with N views and draw N instances of a point horizontally.
>     for (int numViews = 2; numViews <= 4; ++numViews)
>     {
>-        createFBO(4, 1, numViews);
>+        updateFBOs(4, 1, numViews);
>         ASSERT_GL_NO_ERROR();
> 
>         GLuint program = CreateSimplePassthroughProgram(numViews);
>@@ -1902,6 +1862,7 @@ TEST_P(MultiviewRenderTest, DivisorUpdatedOnProgramChange)
> 
>         glDrawArraysInstanced(GL_POINTS, 0, 1, numViews);
> 
>+        resolveMultisampledFBO();
>         for (int view = 0; view < numViews; ++view)
>         {
>             for (int j = 0; j < numViews; ++j)
>@@ -1910,7 +1871,7 @@ TEST_P(MultiviewRenderTest, DivisorUpdatedOnProgramChange)
>             }
>             for (int j = numViews; j < 4; ++j)
>             {
>-                EXPECT_EQ(GLColor::black, GetViewColor(j, 0, view));
>+                EXPECT_EQ(GLColor::transparentBlack, GetViewColor(j, 0, view));
>             }
>         }
> 
>@@ -1921,14 +1882,14 @@ TEST_P(MultiviewRenderTest, DivisorUpdatedOnProgramChange)
> // The test checks that gl_ViewID_OVR is correctly propagated to the fragment shader.
> TEST_P(MultiviewRenderTest, SelectColorBasedOnViewIDOVR)
> {
>-    if (!requestMultiviewExtension())
>+    if (!requestMultiviewExtension(isMultisampled()))
>     {
>         return;
>     }
> 
>-    const std::string vsSource =
>+    constexpr char kVS[] =
>         "#version 300 es\n"
>-        "#extension GL_OVR_multiview : require\n"
>+        "#extension GL_OVR_multiview2 : require\n"
>         "layout(num_views = 3) in;\n"
>         "in vec3 vPosition;\n"
>         "void main()\n"
>@@ -1936,9 +1897,9 @@ TEST_P(MultiviewRenderTest, SelectColorBasedOnViewIDOVR)
>         "   gl_Position = vec4(vPosition, 1.);\n"
>         "}\n";
> 
>-    const std::string fsSource =
>+    constexpr char kFS[] =
>         "#version 300 es\n"
>-        "#extension GL_OVR_multiview : require\n"
>+        "#extension GL_OVR_multiview2 : require\n"
>         "precision mediump float;\n"
>         "out vec4 col;\n"
>         "void main()\n"
>@@ -1954,12 +1915,13 @@ TEST_P(MultiviewRenderTest, SelectColorBasedOnViewIDOVR)
>         "    }\n"
>         "}\n";
> 
>-    createFBO(1, 1, 3);
>-    ANGLE_GL_PROGRAM(program, vsSource, fsSource);
>+    updateFBOs(1, 1, 3);
>+    ANGLE_GL_PROGRAM(program, kVS, kFS);
> 
>     drawQuad(program, "vPosition", 0.0f, 1.0f, true);
>     ASSERT_GL_NO_ERROR();
> 
>+    resolveMultisampledFBO();
>     EXPECT_EQ(GLColor::red, GetViewColor(0, 0, 0));
>     EXPECT_EQ(GLColor::green, GetViewColor(0, 0, 1));
>     EXPECT_EQ(GLColor::blue, GetViewColor(0, 0, 2));
>@@ -1967,16 +1929,16 @@ TEST_P(MultiviewRenderTest, SelectColorBasedOnViewIDOVR)
> 
> // The test checks that the inactive layers of a 2D texture array are not written to by a
> // multi-view program.
>-TEST_P(MultiviewLayeredRenderTest, RenderToSubrageOfLayers)
>+TEST_P(MultiviewLayeredRenderTest, RenderToSubrangeOfLayers)
> {
>     if (!requestMultiviewExtension())
>     {
>         return;
>     }
> 
>-    const std::string vsSource =
>+    constexpr char kVS[] =
>         "#version 300 es\n"
>-        "#extension GL_OVR_multiview : require\n"
>+        "#extension GL_OVR_multiview2 : require\n"
>         "layout(num_views = 2) in;\n"
>         "in vec3 vPosition;\n"
>         "void main()\n"
>@@ -1984,9 +1946,9 @@ TEST_P(MultiviewLayeredRenderTest, RenderToSubrageOfLayers)
>         "   gl_Position = vec4(vPosition, 1.);\n"
>         "}\n";
> 
>-    const std::string fsSource =
>+    constexpr char kFS[] =
>         "#version 300 es\n"
>-        "#extension GL_OVR_multiview : require\n"
>+        "#extension GL_OVR_multiview2 : require\n"
>         "precision mediump float;\n"
>         "out vec4 col;\n"
>         "void main()\n"
>@@ -1994,12 +1956,13 @@ TEST_P(MultiviewLayeredRenderTest, RenderToSubrageOfLayers)
>         "     col = vec4(0,1,0,1);\n"
>         "}\n";
> 
>-    createFBO(1, 1, 2, 4, 1);
>-    ANGLE_GL_PROGRAM(program, vsSource, fsSource);
>+    updateFBOs(1, 1, 2, 4, 1);
>+    ANGLE_GL_PROGRAM(program, kVS, kFS);
> 
>     drawQuad(program, "vPosition", 0.0f, 1.0f, true);
>     ASSERT_GL_NO_ERROR();
> 
>+    resolveMultisampledFBO();
>     EXPECT_EQ(GLColor::transparentBlack, GetViewColor(0, 0, 0));
>     EXPECT_EQ(GLColor::green, GetViewColor(0, 0, 1));
>     EXPECT_EQ(GLColor::green, GetViewColor(0, 0, 2));
>@@ -2014,21 +1977,14 @@ TEST_P(MultiviewLayeredRenderTest, RenderToSubrageOfLayers)
> // green for view 1.
> TEST_P(MultiviewRenderTest, FlatInterpolation)
> {
>-    if (!requestMultiviewExtension())
>+    if (!requestMultiviewExtension(isMultisampled()))
>     {
>         return;
>     }
> 
>-    // Test failing on P400 graphics card (anglebug.com/2228)
>-    ANGLE_SKIP_TEST_IF(IsWindows() && IsD3D11() && IsNVIDIA());
>-
>-    // TODO(mradev): Find out why this fails on Win10 Intel HD 630 D3D11
>-    // (http://anglebug.com/2062)
>-    ANGLE_SKIP_TEST_IF(IsWindows() && IsIntel() && IsD3D11());
>-
>-    const std::string vsSource =
>+    constexpr char kVS[] =
>         "#version 300 es\n"
>-        "#extension GL_OVR_multiview : require\n"
>+        "#extension GL_OVR_multiview2 : require\n"
>         "layout(num_views = 2) in;\n"
>         "in vec3 vPosition;\n"
>         "flat out int oInstanceID;\n"
>@@ -2038,9 +1994,9 @@ TEST_P(MultiviewRenderTest, FlatInterpolation)
>         "   oInstanceID = gl_InstanceID;\n"
>         "}\n";
> 
>-    const std::string fsSource =
>+    constexpr char kFS[] =
>         "#version 300 es\n"
>-        "#extension GL_OVR_multiview : require\n"
>+        "#extension GL_OVR_multiview2 : require\n"
>         "precision mediump float;\n"
>         "flat in int oInstanceID;\n"
>         "out vec4 col;\n"
>@@ -2056,149 +2012,114 @@ TEST_P(MultiviewRenderTest, FlatInterpolation)
>         "    }\n"
>         "}\n";
> 
>-    createFBO(1, 1, 2);
>-    ANGLE_GL_PROGRAM(program, vsSource, fsSource);
>+    updateFBOs(1, 1, 2);
>+    ANGLE_GL_PROGRAM(program, kVS, kFS);
> 
>     drawQuad(program, "vPosition", 0.0f, 1.0f, true);
>     ASSERT_GL_NO_ERROR();
> 
>+    resolveMultisampledFBO();
>     EXPECT_EQ(GLColor::red, GetViewColor(0, 0, 0));
>     EXPECT_EQ(GLColor::green, GetViewColor(0, 0, 1));
> }
> 
>-// The test is added to cover a bug which resulted in the viewport/scissor and viewport offsets not
>-// being correctly applied.
>-TEST_P(MultiviewSideBySideRenderTest, ViewportOffsetsAppliedBugCoverage)
>+// This test assigns gl_ViewID_OVR to a flat int varying and then sets the color based on that
>+// varying in the fragment shader.
>+TEST_P(MultiviewRenderTest, FlatInterpolation2)
> {
>-    if (!requestMultiviewExtension())
>+    if (!requestMultiviewExtension(isMultisampled()))
>     {
>         return;
>     }
> 
>-    createFBO(1, 1, 2);
>-
>-    // Create multiview program.
>-    const std::string &vs =
>+    constexpr char kVS[] =
>         "#version 300 es\n"
>-        "#extension GL_OVR_multiview : require\n"
>+        "#extension GL_OVR_multiview2 : require\n"
>         "layout(num_views = 2) in;\n"
>-        "layout(location = 0) in vec3 vPosition;\n"
>+        "in vec3 vPosition;\n"
>+        "flat out int flatVarying;\n"
>         "void main()\n"
>         "{\n"
>-        "       gl_Position = vec4(vPosition, 1.0);\n"
>+        "   gl_Position = vec4(vPosition, 1.);\n"
>+        "   flatVarying = int(gl_ViewID_OVR);\n"
>         "}\n";
> 
>-    const std::string &fs =
>+    constexpr char kFS[] =
>         "#version 300 es\n"
>-        "#extension GL_OVR_multiview : require\n"
>+        "#extension GL_OVR_multiview2 : require\n"
>         "precision mediump float;\n"
>+        "flat in int flatVarying;\n"
>         "out vec4 col;\n"
>         "void main()\n"
>         "{\n"
>-        "    col = vec4(0,1,0,1);\n"
>+        "    if (flatVarying == 0) {\n"
>+        "       col = vec4(1,0,0,1);\n"
>+        "    } else {\n"
>+        "       col = vec4(0,1,0,1);\n"
>+        "    }\n"
>         "}\n";
> 
>-    ANGLE_GL_PROGRAM(program, vs, fs);
>-
>-    glViewport(0, 0, 1, 1);
>-    glScissor(0, 0, 1, 1);
>-    glEnable(GL_SCISSOR_TEST);
>-    glClearColor(0, 0, 0, 1);
>+    updateFBOs(1, 1, 2);
>+    ANGLE_GL_PROGRAM(program, kVS, kFS);
> 
>-    // Bind the default FBO and make sure that the state is synchronized.
>-    glBindFramebuffer(GL_DRAW_FRAMEBUFFER, 0);
>-    glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
>+    drawQuad(program, "vPosition", 0.0f, 1.0f, true);
>     ASSERT_GL_NO_ERROR();
> 
>-    // Draw and check that both views are rendered to.
>-    glBindFramebuffer(GL_DRAW_FRAMEBUFFER, mDrawFramebuffer);
>-    glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
>-
>-    drawQuad(program, "vPosition", 0.0f, 1.0f, true);
>-    EXPECT_EQ(GLColor::green, GetViewColor(0, 0, 0));
>+    resolveMultisampledFBO();
>+    EXPECT_EQ(GLColor::red, GetViewColor(0, 0, 0));
>     EXPECT_EQ(GLColor::green, GetViewColor(0, 0, 1));
> }
> 
>-MultiviewImplementationParams VertexShaderOpenGL()
>-{
>-    return MultiviewImplementationParams(false, egl_platform::OPENGL());
>-}
>-
>-MultiviewImplementationParams VertexShaderD3D11()
>-{
>-    return MultiviewImplementationParams(false, egl_platform::D3D11());
>-}
>-
>-MultiviewImplementationParams GeomShaderD3D11()
>-{
>-    return MultiviewImplementationParams(true, egl_platform::D3D11());
>-}
>-
>-MultiviewTestParams SideBySideVertexShaderOpenGL()
>-{
>-    return MultiviewTestParams(GL_FRAMEBUFFER_MULTIVIEW_SIDE_BY_SIDE_ANGLE, VertexShaderOpenGL());
>-}
>-
>-MultiviewTestParams LayeredVertexShaderOpenGL()
>+MultiviewRenderTestParams VertexShaderOpenGL()
> {
>-    return MultiviewTestParams(GL_FRAMEBUFFER_MULTIVIEW_LAYERED_ANGLE, VertexShaderOpenGL());
>+    return MultiviewRenderTestParams(0, VertexShaderOpenGL(3, 0));
> }
> 
>-MultiviewTestParams SideBySideGeomShaderD3D11()
>+MultiviewRenderTestParams GeomShaderD3D11()
> {
>-    return MultiviewTestParams(GL_FRAMEBUFFER_MULTIVIEW_SIDE_BY_SIDE_ANGLE, GeomShaderD3D11());
>+    return MultiviewRenderTestParams(0, GeomShaderD3D11(3, 0));
> }
> 
>-MultiviewTestParams LayeredGeomShaderD3D11()
>+MultiviewRenderTestParams VertexShaderD3D11()
> {
>-    return MultiviewTestParams(GL_FRAMEBUFFER_MULTIVIEW_LAYERED_ANGLE, GeomShaderD3D11());
>+    return MultiviewRenderTestParams(0, VertexShaderD3D11(3, 0));
> }
> 
>-MultiviewTestParams SideBySideVertexShaderD3D11()
>+MultiviewRenderTestParams MultisampledVertexShaderOpenGL()
> {
>-    return MultiviewTestParams(GL_FRAMEBUFFER_MULTIVIEW_SIDE_BY_SIDE_ANGLE, VertexShaderD3D11());
>+    return MultiviewRenderTestParams(2, VertexShaderOpenGL(3, 1));
> }
> 
>-MultiviewTestParams LayeredVertexShaderD3D11()
>+MultiviewRenderTestParams MultisampledVertexShaderD3D11()
> {
>-    return MultiviewTestParams(GL_FRAMEBUFFER_MULTIVIEW_LAYERED_ANGLE, VertexShaderD3D11());
>+    return MultiviewRenderTestParams(2, VertexShaderD3D11(3, 1));
> }
> 
>-ANGLE_INSTANTIATE_TEST(MultiviewDrawValidationTest, ES31_OPENGL());
>+ANGLE_INSTANTIATE_TEST(MultiviewDrawValidationTest,
>+                       VertexShaderOpenGL(3, 1),
>+                       VertexShaderD3D11(3, 1));
> ANGLE_INSTANTIATE_TEST(MultiviewRenderDualViewTest,
>-                       SideBySideVertexShaderOpenGL(),
>-                       LayeredVertexShaderOpenGL(),
>-                       SideBySideGeomShaderD3D11(),
>-                       SideBySideVertexShaderD3D11(),
>-                       LayeredGeomShaderD3D11(),
>-                       LayeredVertexShaderD3D11());
>+                       VertexShaderOpenGL(),
>+                       MultisampledVertexShaderOpenGL(),
>+                       GeomShaderD3D11(),
>+                       VertexShaderD3D11(),
>+                       MultisampledVertexShaderD3D11());
> ANGLE_INSTANTIATE_TEST(MultiviewRenderTest,
>-                       SideBySideVertexShaderOpenGL(),
>-                       LayeredVertexShaderOpenGL(),
>-                       SideBySideGeomShaderD3D11(),
>-                       SideBySideVertexShaderD3D11(),
>-                       LayeredGeomShaderD3D11(),
>-                       LayeredVertexShaderD3D11());
>+                       VertexShaderOpenGL(),
>+                       MultisampledVertexShaderOpenGL(),
>+                       GeomShaderD3D11(),
>+                       VertexShaderD3D11(),
>+                       MultisampledVertexShaderD3D11());
> ANGLE_INSTANTIATE_TEST(MultiviewOcclusionQueryTest,
>-                       SideBySideVertexShaderOpenGL(),
>-                       LayeredVertexShaderOpenGL(),
>-                       SideBySideGeomShaderD3D11(),
>-                       SideBySideVertexShaderD3D11(),
>-                       LayeredGeomShaderD3D11(),
>-                       LayeredVertexShaderD3D11());
>+                       VertexShaderOpenGL(),
>+                       GeomShaderD3D11(),
>+                       VertexShaderD3D11());
> ANGLE_INSTANTIATE_TEST(MultiviewProgramGenerationTest,
>-                       SideBySideVertexShaderOpenGL(),
>-                       LayeredVertexShaderOpenGL(),
>-                       SideBySideGeomShaderD3D11(),
>-                       SideBySideVertexShaderD3D11(),
>-                       LayeredGeomShaderD3D11(),
>-                       LayeredVertexShaderD3D11());
>+                       VertexShaderOpenGL(3, 0),
>+                       GeomShaderD3D11(3, 0),
>+                       VertexShaderD3D11(3, 0));
> ANGLE_INSTANTIATE_TEST(MultiviewRenderPrimitiveTest,
>-                       SideBySideVertexShaderOpenGL(),
>-                       LayeredVertexShaderOpenGL(),
>-                       SideBySideGeomShaderD3D11(),
>-                       SideBySideVertexShaderD3D11(),
>-                       LayeredGeomShaderD3D11(),
>-                       LayeredVertexShaderD3D11());
>-ANGLE_INSTANTIATE_TEST(MultiviewSideBySideRenderTest, VertexShaderOpenGL(), GeomShaderD3D11());
>-ANGLE_INSTANTIATE_TEST(MultiviewLayeredRenderTest, VertexShaderOpenGL(), GeomShaderD3D11());
>+                       VertexShaderOpenGL(),
>+                       GeomShaderD3D11(),
>+                       VertexShaderD3D11());
>+ANGLE_INSTANTIATE_TEST(MultiviewLayeredRenderTest, VertexShaderOpenGL(3, 0), GeomShaderD3D11(3, 0));
>diff --git a/Source/ThirdParty/ANGLE/src/tests/gl_tests/OcclusionQueriesTest.cpp b/Source/ThirdParty/ANGLE/src/tests/gl_tests/OcclusionQueriesTest.cpp
>index e33429fb3ba..05b761432a2 100644
>--- a/Source/ThirdParty/ANGLE/src/tests/gl_tests/OcclusionQueriesTest.cpp
>+++ b/Source/ThirdParty/ANGLE/src/tests/gl_tests/OcclusionQueriesTest.cpp
>@@ -4,9 +4,10 @@
> // found in the LICENSE file.
> //
> 
>-#include "system_utils.h"
> #include "test_utils/ANGLETest.h"
>-#include "random_utils.h"
>+#include "util/EGLWindow.h"
>+#include "util/random_utils.h"
>+#include "util/system_utils.h"
> 
> using namespace angle;
> 
>@@ -28,21 +29,7 @@ class OcclusionQueriesTest : public ANGLETest
>     {
>         ANGLETest::SetUp();
> 
>-        const std::string passthroughVS =
>-            R"(attribute highp vec4 position;
>-            void main(void)
>-            {
>-                gl_Position = position;
>-            })";
>-
>-        const std::string passthroughPS =
>-            R"(precision highp float;
>-            void main(void)
>-            {
>-               gl_FragColor = vec4(1.0, 1.0, 1.0, 1.0);
>-            })";
>-
>-        mProgram = CompileProgram(passthroughVS, passthroughPS);
>+        mProgram = CompileProgram(essl1_shaders::vs::Simple(), essl1_shaders::fs::Red());
>         ASSERT_NE(0u, mProgram);
>     }
> 
>@@ -59,12 +46,8 @@ class OcclusionQueriesTest : public ANGLETest
> 
> TEST_P(OcclusionQueriesTest, IsOccluded)
> {
>-    if (getClientMajorVersion() < 3 && !extensionEnabled("GL_EXT_occlusion_query_boolean"))
>-    {
>-        std::cout << "Test skipped because ES3 or GL_EXT_occlusion_query_boolean are not available."
>-                  << std::endl;
>-        return;
>-    }
>+    ANGLE_SKIP_TEST_IF(getClientMajorVersion() < 3 &&
>+                       !IsGLExtensionEnabled("GL_EXT_occlusion_query_boolean"));
> 
>     glDepthMask(GL_TRUE);
>     glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT);
>@@ -72,7 +55,7 @@ TEST_P(OcclusionQueriesTest, IsOccluded)
>     // draw a quad at depth 0.3
>     glEnable(GL_DEPTH_TEST);
>     glUseProgram(mProgram);
>-    drawQuad(mProgram, "position", 0.3f);
>+    drawQuad(mProgram, essl1_shaders::PositionAttrib(), 0.3f);
>     glUseProgram(0);
> 
>     EXPECT_GL_NO_ERROR();
>@@ -80,7 +63,8 @@ TEST_P(OcclusionQueriesTest, IsOccluded)
>     GLuint query = 0;
>     glGenQueriesEXT(1, &query);
>     glBeginQueryEXT(GL_ANY_SAMPLES_PASSED_EXT, query);
>-    drawQuad(mProgram, "position", 0.8f); // this quad should be occluded by first quad
>+    drawQuad(mProgram, essl1_shaders::PositionAttrib(),
>+             0.8f);  // this quad should be occluded by first quad
>     glEndQueryEXT(GL_ANY_SAMPLES_PASSED_EXT);
> 
>     EXPECT_GL_NO_ERROR();
>@@ -101,17 +85,17 @@ TEST_P(OcclusionQueriesTest, IsOccluded)
> 
>     glDeleteQueriesEXT(1, &query);
> 
>-    EXPECT_GLENUM_EQ(GL_FALSE, result);
>+    EXPECT_GL_FALSE(result);
> }
> 
> TEST_P(OcclusionQueriesTest, IsNotOccluded)
> {
>-    if (getClientMajorVersion() < 3 && !extensionEnabled("GL_EXT_occlusion_query_boolean"))
>-    {
>-        std::cout << "Test skipped because ES3 or GL_EXT_occlusion_query_boolean are not available."
>-                  << std::endl;
>-        return;
>-    }
>+    ANGLE_SKIP_TEST_IF(getClientMajorVersion() < 3 &&
>+                       !IsGLExtensionEnabled("GL_EXT_occlusion_query_boolean"));
>+
>+    // TODO(syoussefi): Using render pass ops to clear the framebuffer attachment results in
>+    // AMD/Windows misbehaving in this test.  http://anglebug.com/3286
>+    ANGLE_SKIP_TEST_IF(IsWindows() && IsAMD() && IsVulkan());
> 
>     glDepthMask(GL_TRUE);
>     glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT);
>@@ -121,7 +105,7 @@ TEST_P(OcclusionQueriesTest, IsNotOccluded)
>     GLuint query = 0;
>     glGenQueriesEXT(1, &query);
>     glBeginQueryEXT(GL_ANY_SAMPLES_PASSED_EXT, query);
>-    drawQuad(mProgram, "position", 0.8f); // this quad should not be occluded
>+    drawQuad(mProgram, essl1_shaders::PositionAttrib(), 0.8f);  // this quad should not be occluded
>     glEndQueryEXT(GL_ANY_SAMPLES_PASSED_EXT);
> 
>     EXPECT_GL_NO_ERROR();
>@@ -129,64 +113,65 @@ TEST_P(OcclusionQueriesTest, IsNotOccluded)
>     swapBuffers();
> 
>     GLuint result = GL_TRUE;
>-    glGetQueryObjectuivEXT(query, GL_QUERY_RESULT_EXT, &result); // will block waiting for result
>+    glGetQueryObjectuivEXT(query, GL_QUERY_RESULT_EXT, &result);  // will block waiting for result
> 
>     EXPECT_GL_NO_ERROR();
> 
>     glDeleteQueriesEXT(1, &query);
> 
>-    EXPECT_GLENUM_EQ(GL_TRUE, result);
>+    EXPECT_GL_TRUE(result);
> }
> 
> TEST_P(OcclusionQueriesTest, Errors)
> {
>-    if (getClientMajorVersion() < 3 && !extensionEnabled("GL_EXT_occlusion_query_boolean"))
>-    {
>-        std::cout << "Test skipped because ES3 or GL_EXT_occlusion_query_boolean are not available."
>-                  << std::endl;
>-        return;
>-    }
>+    ANGLE_SKIP_TEST_IF(getClientMajorVersion() < 3 &&
>+                       !IsGLExtensionEnabled("GL_EXT_occlusion_query_boolean"));
> 
>     glDepthMask(GL_TRUE);
>     glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT);
> 
>     EXPECT_GL_NO_ERROR();
> 
>-    GLuint query = 0;
>+    GLuint query  = 0;
>     GLuint query2 = 0;
>     glGenQueriesEXT(1, &query);
> 
>-    EXPECT_EQ(glIsQueryEXT(query), GL_FALSE);
>-    EXPECT_EQ(glIsQueryEXT(query2), GL_FALSE);
>+    EXPECT_GL_FALSE(glIsQueryEXT(query));
>+    EXPECT_GL_FALSE(glIsQueryEXT(query2));
> 
>-    glBeginQueryEXT(GL_ANY_SAMPLES_PASSED_EXT, 0); // can't pass 0 as query id
>+    glBeginQueryEXT(GL_ANY_SAMPLES_PASSED_EXT, 0);  // can't pass 0 as query id
>     EXPECT_GL_ERROR(GL_INVALID_OPERATION);
> 
>     glBeginQueryEXT(GL_ANY_SAMPLES_PASSED_EXT, query);
>-    glBeginQueryEXT(GL_ANY_SAMPLES_PASSED_CONSERVATIVE_EXT, query2); // can't initiate a query while one's already active
>+    glBeginQueryEXT(GL_ANY_SAMPLES_PASSED_CONSERVATIVE_EXT,
>+                    query2);  // can't initiate a query while one's already active
>     EXPECT_GL_ERROR(GL_INVALID_OPERATION);
> 
>-    EXPECT_EQ(glIsQueryEXT(query), GL_TRUE);
>-    EXPECT_EQ(glIsQueryEXT(query2), GL_FALSE); // have not called begin
>+    EXPECT_GL_TRUE(glIsQueryEXT(query));
>+    EXPECT_GL_FALSE(glIsQueryEXT(query2));  // have not called begin
> 
>-    drawQuad(mProgram, "position", 0.8f); // this quad should not be occluded
>-    glEndQueryEXT(GL_ANY_SAMPLES_PASSED_CONSERVATIVE_EXT); // no active query for this target
>+    drawQuad(mProgram, essl1_shaders::PositionAttrib(), 0.8f);  // this quad should not be occluded
>+    glEndQueryEXT(GL_ANY_SAMPLES_PASSED_CONSERVATIVE_EXT);      // no active query for this target
>     EXPECT_GL_ERROR(GL_INVALID_OPERATION);
>     glEndQueryEXT(GL_ANY_SAMPLES_PASSED_EXT);
> 
>-    glBeginQueryEXT(GL_ANY_SAMPLES_PASSED_CONSERVATIVE_EXT, query); // can't begin a query as a different type than previously used
>+    glBeginQueryEXT(GL_ANY_SAMPLES_PASSED_CONSERVATIVE_EXT,
>+                    query);  // can't begin a query as a different type than previously used
>     EXPECT_GL_ERROR(GL_INVALID_OPERATION);
> 
>-    glBeginQueryEXT(GL_ANY_SAMPLES_PASSED_CONSERVATIVE_EXT, query2); // have to call genqueries first
>+    glBeginQueryEXT(GL_ANY_SAMPLES_PASSED_CONSERVATIVE_EXT,
>+                    query2);  // have to call genqueries first
>     EXPECT_GL_ERROR(GL_INVALID_OPERATION);
> 
>     glGenQueriesEXT(1, &query2);
>-    glBeginQueryEXT(GL_ANY_SAMPLES_PASSED_CONSERVATIVE_EXT, query2); // should be ok now
>-    EXPECT_EQ(glIsQueryEXT(query2), GL_TRUE);
>-
>-    drawQuad(mProgram, "position", 0.3f); // this should draw in front of other quad
>-    glDeleteQueriesEXT(1, &query2); // should delete when query becomes inactive
>-    glEndQueryEXT(GL_ANY_SAMPLES_PASSED_CONSERVATIVE_EXT); // should not incur error; should delete query + 1 at end of execution.
>+    glBeginQueryEXT(GL_ANY_SAMPLES_PASSED_CONSERVATIVE_EXT, query2);  // should be ok now
>+    EXPECT_GL_TRUE(glIsQueryEXT(query2));
>+
>+    drawQuad(mProgram, essl1_shaders::PositionAttrib(),
>+             0.3f);                  // this should draw in front of other quad
>+    glDeleteQueriesEXT(1, &query2);  // should delete when query becomes inactive
>+    glEndQueryEXT(GL_ANY_SAMPLES_PASSED_CONSERVATIVE_EXT);  // should not incur error; should delete
>+                                                            // query + 1 at end of execution.
>     EXPECT_GL_NO_ERROR();
> 
>     swapBuffers();
>@@ -194,7 +179,8 @@ TEST_P(OcclusionQueriesTest, Errors)
>     EXPECT_GL_NO_ERROR();
> 
>     GLuint ready = GL_FALSE;
>-    glGetQueryObjectuivEXT(query2, GL_QUERY_RESULT_AVAILABLE_EXT, &ready); // this query is now deleted
>+    glGetQueryObjectuivEXT(query2, GL_QUERY_RESULT_AVAILABLE_EXT,
>+                           &ready);  // this query is now deleted
>     EXPECT_GL_ERROR(GL_INVALID_OPERATION);
> 
>     EXPECT_GL_NO_ERROR();
>@@ -204,27 +190,23 @@ TEST_P(OcclusionQueriesTest, Errors)
> // result for each query.  Helps expose bugs in ANGLE's virtual contexts.
> TEST_P(OcclusionQueriesTest, MultiContext)
> {
>-    if (getClientMajorVersion() < 3 && !extensionEnabled("GL_EXT_occlusion_query_boolean"))
>-    {
>-        std::cout << "Test skipped because ES3 or GL_EXT_occlusion_query_boolean are not available."
>-                  << std::endl;
>-        return;
>-    }
>+    ANGLE_SKIP_TEST_IF(getClientMajorVersion() < 3 &&
>+                       !IsGLExtensionEnabled("GL_EXT_occlusion_query_boolean"));
> 
>-    if (GetParam() == ES2_D3D9() || GetParam() == ES2_D3D11() || GetParam() == ES3_D3D11())
>-    {
>-        std::cout << "Test skipped because the D3D backends cannot support simultaneous queries on "
>-                     "multiple contexts yet."
>-                  << std::endl;
>-        return;
>-    }
>+    // TODO(cwallez@chromium.org): Suppression for http://anglebug.com/3080
>+    ANGLE_SKIP_TEST_IF(IsWindows() && IsNVIDIA() && IsVulkan());
>+
>+    // Test skipped because the D3D backends cannot support simultaneous queries on multiple
>+    // contexts yet.  Same with the Vulkan backend.
>+    ANGLE_SKIP_TEST_IF(GetParam() == ES2_D3D9() || GetParam() == ES2_D3D11() ||
>+                       GetParam() == ES3_D3D11() || GetParam() == ES2_VULKAN());
> 
>     glDepthMask(GL_TRUE);
>     glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT);
> 
>     // draw a quad at depth 0.5
>     glEnable(GL_DEPTH_TEST);
>-    drawQuad(mProgram, "position", 0.5f);
>+    drawQuad(mProgram, essl1_shaders::PositionAttrib(), 0.5f);
> 
>     EGLWindow *window = getEGLWindow();
> 
>@@ -252,28 +234,60 @@ TEST_P(OcclusionQueriesTest, MultiContext)
> 
>     ContextInfo contexts[] = {
>         {
>-            EGL_NO_CONTEXT, 0, 0, {false, false, false, false, false}, false,
>+            EGL_NO_CONTEXT,
>+            0,
>+            0,
>+            {false, false, false, false, false},
>+            false,
>         },
>         {
>-            EGL_NO_CONTEXT, 0, 0, {false, true, false, true, false}, true,
>+            EGL_NO_CONTEXT,
>+            0,
>+            0,
>+            {false, true, false, true, false},
>+            true,
>         },
>         {
>-            EGL_NO_CONTEXT, 0, 0, {false, false, false, false, false}, false,
>+            EGL_NO_CONTEXT,
>+            0,
>+            0,
>+            {false, false, false, false, false},
>+            false,
>         },
>         {
>-            EGL_NO_CONTEXT, 0, 0, {true, true, false, true, true}, true,
>+            EGL_NO_CONTEXT,
>+            0,
>+            0,
>+            {true, true, false, true, true},
>+            true,
>         },
>         {
>-            EGL_NO_CONTEXT, 0, 0, {false, true, true, true, true}, true,
>+            EGL_NO_CONTEXT,
>+            0,
>+            0,
>+            {false, true, true, true, true},
>+            true,
>         },
>         {
>-            EGL_NO_CONTEXT, 0, 0, {true, false, false, true, false}, true,
>+            EGL_NO_CONTEXT,
>+            0,
>+            0,
>+            {true, false, false, true, false},
>+            true,
>         },
>         {
>-            EGL_NO_CONTEXT, 0, 0, {false, false, false, false, false}, false,
>+            EGL_NO_CONTEXT,
>+            0,
>+            0,
>+            {false, false, false, false, false},
>+            false,
>         },
>         {
>-            EGL_NO_CONTEXT, 0, 0, {false, false, false, false, false}, false,
>+            EGL_NO_CONTEXT,
>+            0,
>+            0,
>+            {false, false, false, false, false},
>+            false,
>         },
>     };
> 
>@@ -284,21 +298,7 @@ TEST_P(OcclusionQueriesTest, MultiContext)
> 
>         eglMakeCurrent(display, surface, surface, context.context);
> 
>-        const std::string passthroughVS =
>-            R"(attribute highp vec4 position;
>-            void main(void)
>-            {
>-                gl_Position = position;
>-            })";
>-
>-        const std::string passthroughPS =
>-            R"(precision highp float;
>-            void main(void)
>-            {
>-               gl_FragColor = vec4(1.0, 1.0, 1.0, 1.0);
>-            })";
>-
>-        context.program = CompileProgram(passthroughVS, passthroughPS);
>+        context.program = CompileProgram(essl1_shaders::vs::Simple(), essl1_shaders::fs::Red());
>         ASSERT_NE(context.program, 0u);
> 
>         glDepthMask(GL_FALSE);
>@@ -318,7 +318,7 @@ TEST_P(OcclusionQueriesTest, MultiContext)
> 
>             float depth = context.visiblePasses[pass] ? mRNG.randomFloatBetween(0.0f, 0.4f)
>                                                       : mRNG.randomFloatBetween(0.6f, 1.0f);
>-            drawQuad(context.program, "position", depth);
>+            drawQuad(context.program, essl1_shaders::PositionAttrib(), depth);
> 
>             EXPECT_GL_NO_ERROR();
>         }
>@@ -347,7 +347,8 @@ TEST_P(OcclusionQueriesTest, MultiContext)
>     }
> }
> 
>-// Use this to select which configurations (e.g. which renderer, which GLES major version) these tests should be run against.
>+// Use this to select which configurations (e.g. which renderer, which GLES major version) these
>+// tests should be run against.
> ANGLE_INSTANTIATE_TEST(OcclusionQueriesTest,
>                        ES2_D3D9(),
>                        ES2_D3D11(),
>@@ -355,4 +356,5 @@ ANGLE_INSTANTIATE_TEST(OcclusionQueriesTest,
>                        ES2_OPENGL(),
>                        ES3_OPENGL(),
>                        ES2_OPENGLES(),
>-                       ES3_OPENGLES());
>+                       ES3_OPENGLES(),
>+                       ES2_VULKAN());
>diff --git a/Source/ThirdParty/ANGLE/src/tests/gl_tests/PBOExtensionTest.cpp b/Source/ThirdParty/ANGLE/src/tests/gl_tests/PBOExtensionTest.cpp
>index baa63a4e868..8ebf19abe22 100644
>--- a/Source/ThirdParty/ANGLE/src/tests/gl_tests/PBOExtensionTest.cpp
>+++ b/Source/ThirdParty/ANGLE/src/tests/gl_tests/PBOExtensionTest.cpp
>@@ -8,6 +8,27 @@
> 
> using namespace angle;
> 
>+namespace
>+{
>+constexpr char kVS[] = R"(attribute vec4 aTest;
>+attribute vec2 aPosition;
>+varying vec4 vTest;
>+
>+void main()
>+{
>+    vTest        = aTest;
>+    gl_Position  = vec4(aPosition, 0.0, 1.0);
>+    gl_PointSize = 1.0;
>+})";
>+
>+constexpr char kFS[] = R"(precision mediump float;
>+varying vec4 vTest;
>+void main()
>+{
>+    gl_FragColor = vTest;
>+})";
>+}  // namespace
>+
> class PBOExtensionTest : public ANGLETest
> {
>   protected:
>@@ -21,11 +42,11 @@ class PBOExtensionTest : public ANGLETest
>         setConfigAlphaBits(8);
>     }
> 
>-    virtual void SetUp()
>+    void SetUp() override
>     {
>         ANGLETest::SetUp();
> 
>-        if (extensionEnabled("NV_pixel_buffer_object"))
>+        if (IsGLExtensionEnabled("NV_pixel_buffer_object"))
>         {
>             glGenBuffers(1, &mPBO);
>             glBindBuffer(GL_PIXEL_PACK_BUFFER, mPBO);
>@@ -33,27 +54,7 @@ class PBOExtensionTest : public ANGLETest
>                          GL_STATIC_DRAW);
>             glBindBuffer(GL_PIXEL_PACK_BUFFER, 0);
> 
>-            const char *vertexShaderSrc =
>-                R"(attribute vec4 aTest;
>-                attribute vec2 aPosition;
>-                varying vec4 vTest;
>-
>-                void main()
>-                {
>-                    vTest        = aTest;
>-                    gl_Position  = vec4(aPosition, 0.0, 1.0);
>-                    gl_PointSize = 1.0;
>-                })";
>-
>-            const char *fragmentShaderSrc =
>-                R"(precision mediump float;
>-                varying vec4 vTest;
>-                void main()
>-                {
>-                    gl_FragColor = vTest;
>-                })";
>-
>-            mProgram = CompileProgram(vertexShaderSrc, fragmentShaderSrc);
>+            mProgram = CompileProgram(kVS, kFS);
> 
>             glGenBuffers(1, &mPositionVBO);
>             glBindBuffer(GL_ARRAY_BUFFER, mPositionVBO);
>@@ -63,7 +64,7 @@ class PBOExtensionTest : public ANGLETest
>         ASSERT_GL_NO_ERROR();
>     }
> 
>-    virtual void TearDown()
>+    void TearDown() override
>     {
>         ANGLETest::TearDown();
> 
>@@ -78,7 +79,7 @@ class PBOExtensionTest : public ANGLETest
> 
> TEST_P(PBOExtensionTest, PBOWithOtherTarget)
> {
>-    if (extensionEnabled("NV_pixel_buffer_object"))
>+    if (IsGLExtensionEnabled("NV_pixel_buffer_object"))
>     {
>         glClearColor(1.0f, 0.0f, 0.0f, 1.0f);
>         glClear(GL_COLOR_BUFFER_BIT);
>@@ -106,7 +107,7 @@ TEST_P(PBOExtensionTest, PBOWithOtherTarget)
> 
> TEST_P(PBOExtensionTest, PBOWithExistingData)
> {
>-    if (extensionEnabled("NV_pixel_buffer_object"))
>+    if (IsGLExtensionEnabled("NV_pixel_buffer_object"))
>     {
>         // Clear backbuffer to red
>         glClearColor(1.0f, 0.0f, 0.0f, 1.0f);
>diff --git a/Source/ThirdParty/ANGLE/src/tests/gl_tests/PackUnpackTest.cpp b/Source/ThirdParty/ANGLE/src/tests/gl_tests/PackUnpackTest.cpp
>index d86f5262aa4..b39a0e7bb54 100644
>--- a/Source/ThirdParty/ANGLE/src/tests/gl_tests/PackUnpackTest.cpp
>+++ b/Source/ThirdParty/ANGLE/src/tests/gl_tests/PackUnpackTest.cpp
>@@ -31,62 +31,48 @@ class PackUnpackTest : public ANGLETest
>     {
>         ANGLETest::SetUp();
> 
>-        // Vertex Shader source
>-        const std::string vs =
>-            R"(#version 300 es
>-            precision mediump float;
>-            in vec4 position;
>+        // Fragment Shader source
>+        constexpr char kSNormFS[] = R"(#version 300 es
>+precision mediump float;
>+uniform mediump vec2 v;
>+layout(location = 0) out mediump vec4 fragColor;
> 
>-            void main()
>-            {
>-                gl_Position = position;
>-            })";
>+void main()
>+{
>+    uint u = packSnorm2x16(v);
>+    vec2 r = unpackSnorm2x16(u);
>+    fragColor = vec4(r, 0.0, 1.0);
>+})";
> 
>         // Fragment Shader source
>-        const std::string sNormFS =
>-            R"(#version 300 es
>-            precision mediump float;
>-            uniform mediump vec2 v;
>-            layout(location = 0) out mediump vec4 fragColor;
>-
>-            void main()
>-            {
>-                uint u = packSnorm2x16(v);
>-                vec2 r = unpackSnorm2x16(u);
>-                fragColor = vec4(r, 0.0, 1.0);
>-            })";
>+        constexpr char kUNormFS[] = R"(#version 300 es
>+precision mediump float;
>+uniform mediump vec2 v;
>+layout(location = 0) out mediump vec4 fragColor;
> 
>-        // Fragment Shader source
>-        const std::string uNormFS =
>-            R"(#version 300 es
>-            precision mediump float;
>-            uniform mediump vec2 v;
>-            layout(location = 0) out mediump vec4 fragColor;
>-
>-            void main()
>-            {
>-                uint u = packUnorm2x16(v);
>-                vec2 r = unpackUnorm2x16(u);
>-                fragColor = vec4(r, 0.0, 1.0);
>-            })";
>+void main()
>+{
>+    uint u = packUnorm2x16(v);
>+    vec2 r = unpackUnorm2x16(u);
>+    fragColor = vec4(r, 0.0, 1.0);
>+})";
> 
>         // Fragment Shader source
>-        const std::string halfFS =
>-            R"(#version 300 es
>-            precision mediump float;
>-            uniform mediump vec2 v;
>-            layout(location = 0) out mediump vec4 fragColor;
>-
>-             void main()
>-             {
>-                 uint u = packHalf2x16(v);
>-                 vec2 r = unpackHalf2x16(u);
>-                 fragColor = vec4(r, 0.0, 1.0);
>-             })";
>-
>-        mSNormProgram = CompileProgram(vs, sNormFS);
>-        mUNormProgram = CompileProgram(vs, uNormFS);
>-        mHalfProgram = CompileProgram(vs, halfFS);
>+        constexpr char kHalfFS[] = R"(#version 300 es
>+precision mediump float;
>+uniform mediump vec2 v;
>+layout(location = 0) out mediump vec4 fragColor;
>+
>+void main()
>+{
>+    uint u = packHalf2x16(v);
>+    vec2 r = unpackHalf2x16(u);
>+    fragColor = vec4(r, 0.0, 1.0);
>+})";
>+
>+        mSNormProgram = CompileProgram(essl3_shaders::vs::Simple(), kSNormFS);
>+        mUNormProgram = CompileProgram(essl3_shaders::vs::Simple(), kUNormFS);
>+        mHalfProgram  = CompileProgram(essl3_shaders::vs::Simple(), kHalfFS);
>         if (mSNormProgram == 0 || mUNormProgram == 0 || mHalfProgram == 0)
>         {
>             FAIL() << "shader compilation failed.";
>@@ -98,11 +84,12 @@ class PackUnpackTest : public ANGLETest
> 
>         glGenFramebuffers(1, &mOffscreenFramebuffer);
>         glBindFramebuffer(GL_FRAMEBUFFER, mOffscreenFramebuffer);
>-        glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, mOffscreenTexture2D, 0);
>+        glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D,
>+                               mOffscreenTexture2D, 0);
> 
>         glViewport(0, 0, 16, 16);
> 
>-        const GLfloat color[] = { 1.0f, 1.0f, 0.0f, 1.0f };
>+        const GLfloat color[] = {1.0f, 1.0f, 0.0f, 1.0f};
>         glClearBufferfv(GL_COLOR, 0, color);
>     }
> 
>@@ -122,18 +109,22 @@ class PackUnpackTest : public ANGLETest
>         compareBeforeAfter(program, input1, input2, input1, input2);
>     }
> 
>-    void compareBeforeAfter(GLuint program, float input1, float input2, float expect1, float expect2)
>+    void compareBeforeAfter(GLuint program,
>+                            float input1,
>+                            float input2,
>+                            float expect1,
>+                            float expect2)
>     {
>         GLint vec2Location = glGetUniformLocation(program, "v");
> 
>         glUseProgram(program);
>         glUniform2f(vec2Location, input1, input2);
> 
>-        drawQuad(program, "position", 0.5f);
>+        drawQuad(program, essl3_shaders::PositionAttrib(), 0.5f);
> 
>         ASSERT_GL_NO_ERROR();
> 
>-        GLfloat p[2] = { 0 };
>+        GLfloat p[2] = {0};
>         glReadPixels(8, 8, 1, 1, GL_RG, GL_FLOAT, p);
> 
>         ASSERT_GL_NO_ERROR();
>@@ -150,7 +141,8 @@ class PackUnpackTest : public ANGLETest
>     GLuint mOffscreenTexture2D;
> };
> 
>-// Test the correctness of packSnorm2x16 and unpackSnorm2x16 functions calculating normal floating numbers.
>+// Test the correctness of packSnorm2x16 and unpackSnorm2x16 functions calculating normal floating
>+// numbers.
> TEST_P(PackUnpackTest, PackUnpackSnormNormal)
> {
>     // Expect the shader to output the same value as the input
>@@ -171,18 +163,10 @@ TEST_P(PackUnpackTest, PackUnpackUnormNormal)
>     compareBeforeAfter(mUNormProgram, 1.0f, 0.00392f, 1.0f, 0.00392f);
> }
> 
>-// Test the correctness of packHalf2x16 and unpackHalf2x16 functions calculating normal floating numbers.
>+// Test the correctness of packHalf2x16 and unpackHalf2x16 functions calculating normal floating
>+// numbers.
> TEST_P(PackUnpackTest, PackUnpackHalfNormal)
> {
>-    // TODO(cwallez) figure out why it is broken on Intel on Mac
>-#if defined(ANGLE_PLATFORM_APPLE)
>-    if (IsIntel() && getPlatformRenderer() == EGL_PLATFORM_ANGLE_TYPE_OPENGL_ANGLE)
>-    {
>-        std::cout << "Test skipped on Intel on Mac." << std::endl;
>-        return;
>-    }
>-#endif
>-
>     // Expect the shader to output the same value as the input
>     compareBeforeAfter(mHalfProgram, 0.5f, -0.2f);
>     compareBeforeAfter(mHalfProgram, -0.35f, 0.75f);
>@@ -190,7 +174,8 @@ TEST_P(PackUnpackTest, PackUnpackHalfNormal)
>     compareBeforeAfter(mHalfProgram, 1.0f, -0.00392f);
> }
> 
>-// Test the correctness of packSnorm2x16 and unpackSnorm2x16 functions calculating subnormal floating numbers.
>+// Test the correctness of packSnorm2x16 and unpackSnorm2x16 functions calculating subnormal
>+// floating numbers.
> TEST_P(PackUnpackTest, PackUnpackSnormSubnormal)
> {
>     // Expect the shader to output the same value as the input
>@@ -206,14 +191,16 @@ TEST_P(PackUnpackTest, PackUnpackUnormSubnormal)
>     compareBeforeAfter(mUNormProgram, 0.00001f, -0.00001f, 0.00001f, 0.0f);
> }
> 
>-// Test the correctness of packHalf2x16 and unpackHalf2x16 functions calculating subnormal floating numbers.
>+// Test the correctness of packHalf2x16 and unpackHalf2x16 functions calculating subnormal floating
>+// numbers.
> TEST_P(PackUnpackTest, PackUnpackHalfSubnormal)
> {
>     // Expect the shader to output the same value as the input
>     compareBeforeAfter(mHalfProgram, 0.00001f, -0.00001f);
> }
> 
>-// Test the correctness of packSnorm2x16 and unpackSnorm2x16 functions calculating zero floating numbers.
>+// Test the correctness of packSnorm2x16 and unpackSnorm2x16 functions calculating zero floating
>+// numbers.
> TEST_P(PackUnpackTest, PackUnpackSnormZero)
> {
>     // Expect the shader to output the same value as the input
>@@ -227,7 +214,8 @@ TEST_P(PackUnpackTest, PackUnpackUnormZero)
>     compareBeforeAfter(mUNormProgram, 0.00000f, -0.00000f, 0.00000f, 0.00000f);
> }
> 
>-// Test the correctness of packHalf2x16 and unpackHalf2x16 functions calculating zero floating numbers.
>+// Test the correctness of packHalf2x16 and unpackHalf2x16 functions calculating zero floating
>+// numbers.
> TEST_P(PackUnpackTest, PackUnpackHalfZero)
> {
>     // Expect the shader to output the same value as the input
>@@ -242,14 +230,16 @@ TEST_P(PackUnpackTest, PackUnpackUnormOverflow)
>     compareBeforeAfter(mUNormProgram, 67000.0f, -67000.0f, 1.0f, 0.0f);
> }
> 
>-// Test the correctness of packSnorm2x16 and unpackSnorm2x16 functions calculating overflow floating numbers.
>+// Test the correctness of packSnorm2x16 and unpackSnorm2x16 functions calculating overflow floating
>+// numbers.
> TEST_P(PackUnpackTest, PackUnpackSnormOverflow)
> {
>     // Expect the shader to clamp the input to [-1, 1]
>     compareBeforeAfter(mSNormProgram, 67000.0f, -67000.0f, 1.0f, -1.0f);
> }
> 
>-// Use this to select which configurations (e.g. which renderer, which GLES major version) these tests should be run against.
>+// Use this to select which configurations (e.g. which renderer, which GLES major version) these
>+// tests should be run against.
> ANGLE_INSTANTIATE_TEST(PackUnpackTest,
>                        ES3_OPENGL(3, 3),
>                        ES3_OPENGL(4, 0),
>@@ -259,4 +249,4 @@ ANGLE_INSTANTIATE_TEST(PackUnpackTest,
>                        ES3_OPENGL(4, 4),
>                        ES3_OPENGL(4, 5),
>                        ES3_OPENGLES());
>-}
>+}  // namespace
>diff --git a/Source/ThirdParty/ANGLE/src/tests/gl_tests/ParallelShaderCompileTest.cpp b/Source/ThirdParty/ANGLE/src/tests/gl_tests/ParallelShaderCompileTest.cpp
>new file mode 100644
>index 00000000000..b38f035192b
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/tests/gl_tests/ParallelShaderCompileTest.cpp
>@@ -0,0 +1,405 @@
>+//
>+// Copyright 2018 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+
>+// ParallelShaderCompileTest.cpp : Tests of the GL_KHR_parallel_shader_compile extension.
>+
>+#include "test_utils/ANGLETest.h"
>+#include "test_utils/gl_raii.h"
>+
>+#include "util/random_utils.h"
>+
>+using namespace angle;
>+
>+namespace
>+{
>+
>+namespace
>+{
>+
>+constexpr int kTaskCount             = 32;
>+constexpr unsigned int kPollInterval = 100;
>+
>+}  // anonymous namespace
>+
>+class ParallelShaderCompileTest : public ANGLETest
>+{
>+  protected:
>+    ParallelShaderCompileTest()
>+    {
>+        setWindowWidth(128);
>+        setWindowHeight(128);
>+        setConfigRedBits(8);
>+        setConfigGreenBits(8);
>+        setConfigBlueBits(8);
>+        setConfigAlphaBits(8);
>+    }
>+
>+    void SetUp() override { ANGLETest::SetUp(); }
>+
>+    void TearDown() override { ANGLETest::TearDown(); }
>+
>+    bool ensureParallelShaderCompileExtensionAvailable()
>+    {
>+        if (IsGLExtensionRequestable("GL_KHR_parallel_shader_compile"))
>+        {
>+            glRequestExtensionANGLE("GL_KHR_parallel_shader_compile");
>+        }
>+
>+        if (!IsGLExtensionEnabled("GL_KHR_parallel_shader_compile"))
>+        {
>+            return false;
>+        }
>+        return true;
>+    }
>+
>+    class Task
>+    {
>+      public:
>+        Task(int id) : mID(id) {}
>+        virtual ~Task() {}
>+
>+        virtual bool compile()                                     = 0;
>+        virtual bool isCompileCompleted()                          = 0;
>+        virtual bool link()                                        = 0;
>+        virtual void runAndVerify(ParallelShaderCompileTest *test) = 0;
>+
>+        bool isLinkCompleted()
>+        {
>+            GLint status;
>+            glGetProgramiv(mProgram, GL_COMPLETION_STATUS_KHR, &status);
>+            return (status == GL_TRUE);
>+        }
>+
>+      protected:
>+        std::string insertRandomString(const std::string &source)
>+        {
>+            RNG rng;
>+            std::ostringstream ostream;
>+            ostream << source << "\n// Random string to fool program cache: " << rng.randomInt()
>+                    << "\n";
>+            return ostream.str();
>+        }
>+
>+        GLuint CompileShader(GLenum type, const std::string &source)
>+        {
>+            GLuint shader = glCreateShader(type);
>+
>+            const char *sourceArray[1] = {source.c_str()};
>+            glShaderSource(shader, 1, sourceArray, nullptr);
>+            glCompileShader(shader);
>+            return shader;
>+        }
>+
>+        bool checkShader(GLuint shader)
>+        {
>+            GLint compileResult;
>+            glGetShaderiv(shader, GL_COMPILE_STATUS, &compileResult);
>+
>+            if (compileResult == 0)
>+            {
>+                GLint infoLogLength;
>+                glGetShaderiv(shader, GL_INFO_LOG_LENGTH, &infoLogLength);
>+
>+                // Info log length includes the null terminator, so 1 means that the info log is an
>+                // empty string.
>+                if (infoLogLength > 1)
>+                {
>+                    std::vector<GLchar> infoLog(infoLogLength);
>+                    glGetShaderInfoLog(shader, static_cast<GLsizei>(infoLog.size()), nullptr,
>+                                       &infoLog[0]);
>+                    std::cerr << "shader compilation failed: " << &infoLog[0];
>+                }
>+                else
>+                {
>+                    std::cerr << "shader compilation failed. <Empty log message>";
>+                }
>+                std::cerr << std::endl;
>+            }
>+            return (compileResult == GL_TRUE);
>+        }
>+
>+        GLuint mProgram;
>+        int mID;
>+    };
>+
>+    template <typename T>
>+    class TaskRunner
>+    {
>+      public:
>+        TaskRunner() {}
>+        ~TaskRunner() {}
>+
>+        void run(ParallelShaderCompileTest *test)
>+        {
>+
>+            std::vector<std::unique_ptr<T>> compileTasks;
>+            for (int i = 0; i < kTaskCount; ++i)
>+            {
>+                std::unique_ptr<T> task(new T(i));
>+                bool isCompiling = task->compile();
>+                ASSERT_TRUE(isCompiling);
>+                compileTasks.push_back(std::move(task));
>+            }
>+
>+            std::vector<std::unique_ptr<T>> linkTasks;
>+            while (!compileTasks.empty())
>+            {
>+                for (unsigned int i = 0; i < compileTasks.size();)
>+                {
>+                    auto &task = compileTasks[i];
>+
>+                    if (task->isCompileCompleted())
>+                    {
>+                        bool isLinking = task->link();
>+                        ASSERT_TRUE(isLinking);
>+                        linkTasks.push_back(std::move(task));
>+                        compileTasks.erase(compileTasks.begin() + i);
>+                        continue;
>+                    }
>+                    ++i;
>+                }
>+                Sleep(kPollInterval);
>+            }
>+
>+            while (!linkTasks.empty())
>+            {
>+                for (unsigned int i = 0; i < linkTasks.size();)
>+                {
>+                    auto &task = linkTasks[i];
>+
>+                    if (task->isLinkCompleted())
>+                    {
>+                        task->runAndVerify(test);
>+                        linkTasks.erase(linkTasks.begin() + i);
>+                        continue;
>+                    }
>+                    ++i;
>+                }
>+                Sleep(kPollInterval);
>+            }
>+        }
>+    };
>+
>+    class ClearColorWithDraw : public Task
>+    {
>+      public:
>+        ClearColorWithDraw(int taskID) : Task(taskID)
>+        {
>+            auto color = static_cast<GLubyte>(taskID * 255 / kTaskCount);
>+            mColor     = {color, color, color, 255};
>+        }
>+
>+        bool compile() override
>+        {
>+            mVertexShader =
>+                CompileShader(GL_VERTEX_SHADER, insertRandomString(essl1_shaders::vs::Simple()));
>+            mFragmentShader = CompileShader(GL_FRAGMENT_SHADER,
>+                                            insertRandomString(essl1_shaders::fs::UniformColor()));
>+            return (mVertexShader != 0 && mFragmentShader != 0);
>+        }
>+
>+        bool isCompileCompleted() override
>+        {
>+            GLint status;
>+            glGetShaderiv(mVertexShader, GL_COMPLETION_STATUS_KHR, &status);
>+            if (status == GL_TRUE)
>+            {
>+                glGetShaderiv(mFragmentShader, GL_COMPLETION_STATUS_KHR, &status);
>+                return (status == GL_TRUE);
>+            }
>+            return false;
>+        }
>+
>+        bool link() override
>+        {
>+            mProgram = 0;
>+            if (checkShader(mVertexShader) && checkShader(mFragmentShader))
>+            {
>+                mProgram = glCreateProgram();
>+                glAttachShader(mProgram, mVertexShader);
>+                glAttachShader(mProgram, mFragmentShader);
>+                glLinkProgram(mProgram);
>+            }
>+            glDeleteShader(mVertexShader);
>+            glDeleteShader(mFragmentShader);
>+            return (mProgram != 0);
>+        }
>+
>+        void runAndVerify(ParallelShaderCompileTest *test) override
>+        {
>+            glClearColor(0, 0, 0, 0);
>+            glClear(GL_COLOR_BUFFER_BIT);
>+            glDisable(GL_DEPTH_TEST);
>+            glUseProgram(mProgram);
>+            ASSERT_GL_NO_ERROR();
>+            GLint colorUniformLocation =
>+                glGetUniformLocation(mProgram, essl1_shaders::ColorUniform());
>+            ASSERT_NE(colorUniformLocation, -1);
>+            auto normalizeColor = mColor.toNormalizedVector();
>+            glUniform4fv(colorUniformLocation, 1, normalizeColor.data());
>+            test->drawQuad(mProgram, essl1_shaders::PositionAttrib(), 0.5f);
>+            EXPECT_PIXEL_COLOR_EQ(test->getWindowWidth() / 2, test->getWindowHeight() / 2, mColor);
>+            glUseProgram(0);
>+            glDeleteProgram(mProgram);
>+            ASSERT_GL_NO_ERROR();
>+        }
>+
>+      private:
>+        GLColor mColor;
>+        GLuint mVertexShader;
>+        GLuint mFragmentShader;
>+    };
>+
>+    class ImageLoadStore : public Task
>+    {
>+      public:
>+        ImageLoadStore(int taskID) : Task(taskID) {}
>+        ~ImageLoadStore() {}
>+
>+        bool compile() override
>+        {
>+            const char kCSSource[] = R"(#version 310 es
>+layout(local_size_x=1, local_size_y=1, local_size_z=1) in;
>+layout(r32ui, binding = 0) readonly uniform highp uimage2D uImage_1;
>+layout(r32ui, binding = 1) writeonly uniform highp uimage2D uImage_2;
>+void main()
>+{
>+    uvec4 value = imageLoad(uImage_1, ivec2(gl_LocalInvocationID.xy));
>+    imageStore(uImage_2, ivec2(gl_LocalInvocationID.xy), value);
>+})";
>+
>+            mShader = CompileShader(GL_COMPUTE_SHADER, insertRandomString(kCSSource));
>+            return mShader != 0;
>+        }
>+
>+        bool isCompileCompleted() override
>+        {
>+            GLint status;
>+            glGetShaderiv(mShader, GL_COMPLETION_STATUS_KHR, &status);
>+            return status == GL_TRUE;
>+        }
>+
>+        bool link() override
>+        {
>+            mProgram = 0;
>+            if (checkShader(mShader))
>+            {
>+                mProgram = glCreateProgram();
>+                glAttachShader(mProgram, mShader);
>+                glLinkProgram(mProgram);
>+            }
>+            glDeleteShader(mShader);
>+            return mProgram != 0;
>+        }
>+
>+        void runAndVerify(ParallelShaderCompileTest *test) override
>+        {
>+            // Taken from ComputeShaderTest.StoreImageThenLoad.
>+            constexpr GLuint kInputValues[3][1] = {{300}, {200}, {100}};
>+            GLTexture texture[3];
>+            glBindTexture(GL_TEXTURE_2D, texture[0]);
>+            glTexStorage2D(GL_TEXTURE_2D, 1, GL_R32UI, 1, 1);
>+            glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, 1, 1, GL_RED_INTEGER, GL_UNSIGNED_INT,
>+                            kInputValues[0]);
>+            EXPECT_GL_NO_ERROR();
>+
>+            glBindTexture(GL_TEXTURE_2D, texture[1]);
>+            glTexStorage2D(GL_TEXTURE_2D, 1, GL_R32UI, 1, 1);
>+            glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, 1, 1, GL_RED_INTEGER, GL_UNSIGNED_INT,
>+                            kInputValues[1]);
>+            EXPECT_GL_NO_ERROR();
>+
>+            glBindTexture(GL_TEXTURE_2D, texture[2]);
>+            glTexStorage2D(GL_TEXTURE_2D, 1, GL_R32UI, 1, 1);
>+            glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, 1, 1, GL_RED_INTEGER, GL_UNSIGNED_INT,
>+                            kInputValues[2]);
>+            EXPECT_GL_NO_ERROR();
>+
>+            glUseProgram(mProgram);
>+
>+            glBindImageTexture(0, texture[0], 0, GL_FALSE, 0, GL_READ_ONLY, GL_R32UI);
>+            glBindImageTexture(1, texture[1], 0, GL_FALSE, 0, GL_WRITE_ONLY, GL_R32UI);
>+
>+            glDispatchCompute(1, 1, 1);
>+            glMemoryBarrier(GL_TEXTURE_UPDATE_BARRIER_BIT);
>+            EXPECT_GL_NO_ERROR();
>+
>+            glBindImageTexture(0, texture[1], 0, GL_FALSE, 0, GL_READ_ONLY, GL_R32UI);
>+            glBindImageTexture(1, texture[2], 0, GL_FALSE, 0, GL_WRITE_ONLY, GL_R32UI);
>+
>+            glDispatchCompute(1, 1, 1);
>+            glMemoryBarrier(GL_TEXTURE_UPDATE_BARRIER_BIT);
>+            EXPECT_GL_NO_ERROR();
>+
>+            GLuint outputValue;
>+            GLFramebuffer framebuffer;
>+            glBindFramebuffer(GL_READ_FRAMEBUFFER, framebuffer);
>+            glFramebufferTexture2D(GL_READ_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D,
>+                                   texture[2], 0);
>+            glReadPixels(0, 0, 1, 1, GL_RED_INTEGER, GL_UNSIGNED_INT, &outputValue);
>+            EXPECT_GL_NO_ERROR();
>+
>+            EXPECT_EQ(300u, outputValue);
>+
>+            glUseProgram(0);
>+            glDeleteProgram(mProgram);
>+            ASSERT_GL_NO_ERROR();
>+        }
>+
>+      private:
>+        GLuint mShader;
>+    };
>+};
>+
>+// Test basic functionality of GL_KHR_parallel_shader_compile
>+TEST_P(ParallelShaderCompileTest, Basic)
>+{
>+    ANGLE_SKIP_TEST_IF(!ensureParallelShaderCompileExtensionAvailable());
>+
>+    GLint count = 0;
>+    glMaxShaderCompilerThreadsKHR(8);
>+    EXPECT_GL_NO_ERROR();
>+    glGetIntegerv(GL_MAX_SHADER_COMPILER_THREADS_KHR, &count);
>+    EXPECT_GL_NO_ERROR();
>+    EXPECT_EQ(8, count);
>+}
>+
>+// Test to compile and link many programs in parallel.
>+TEST_P(ParallelShaderCompileTest, LinkAndDrawManyPrograms)
>+{
>+    ANGLE_SKIP_TEST_IF(!ensureParallelShaderCompileExtensionAvailable());
>+
>+    TaskRunner<ClearColorWithDraw> runner;
>+    runner.run(this);
>+}
>+
>+class ParallelShaderCompileTestES31 : public ParallelShaderCompileTest
>+{};
>+
>+// Test to compile and link many computing programs in parallel.
>+TEST_P(ParallelShaderCompileTestES31, LinkAndDispatchManyPrograms)
>+{
>+    // Flaky on Win NVIDIA D3D11. http://anglebug.com/3359
>+    // Suspectable to the flakyness of http://anglebug.com/3349.
>+    ANGLE_SKIP_TEST_IF(IsWindows() && IsD3D11());
>+
>+    ANGLE_SKIP_TEST_IF(!ensureParallelShaderCompileExtensionAvailable());
>+
>+    TaskRunner<ImageLoadStore> runner;
>+    runner.run(this);
>+}
>+
>+ANGLE_INSTANTIATE_TEST(ParallelShaderCompileTest,
>+                       ES2_D3D9(),
>+                       ES2_D3D11(),
>+                       ES2_D3D11_FL9_3(),
>+                       ES2_OPENGL(),
>+                       ES2_OPENGLES(),
>+                       ES2_VULKAN());
>+
>+ANGLE_INSTANTIATE_TEST(ParallelShaderCompileTestES31, ES31_OPENGL(), ES31_OPENGLES(), ES31_D3D11());
>+
>+}  // namespace
>diff --git a/Source/ThirdParty/ANGLE/src/tests/gl_tests/PathRenderingTest.cpp b/Source/ThirdParty/ANGLE/src/tests/gl_tests/PathRenderingTest.cpp
>index 62f38b396dd..8b560c513e6 100644
>--- a/Source/ThirdParty/ANGLE/src/tests/gl_tests/PathRenderingTest.cpp
>+++ b/Source/ThirdParty/ANGLE/src/tests/gl_tests/PathRenderingTest.cpp
>@@ -8,13 +8,13 @@
> //   This extension allows to render geometric paths as first class GL objects.
> 
> #include "test_utils/ANGLETest.h"
>-#include "shader_utils.h"
> 
> #include "common/angleutils.h"
>+#include "util/shader_utils.h"
> 
> #include <cmath>
>-#include <cstring>
> #include <cstddef>
>+#include <cstring>
> #include <fstream>
> 
> using namespace angle;
>@@ -75,7 +75,7 @@ class CHROMIUMPathRenderingTest : public ANGLETest
>         setConfigStencilBits(8);
>     }
> 
>-    bool isApplicable() const { return extensionEnabled("GL_CHROMIUM_path_rendering"); }
>+    bool isApplicable() const { return IsGLExtensionEnabled("GL_CHROMIUM_path_rendering"); }
> 
>     void tryAllDrawFunctions(GLuint path, GLenum err)
>     {
>@@ -205,7 +205,7 @@ TEST_P(CHROMIUMPathRenderingTest, TestGenDelete)
>     ASSERT_GL_NO_ERROR();
> 
>     GLsizei big_range = 0xffff;
>-    first_path = glGenPathsCHROMIUM(big_range);
>+    first_path        = glGenPathsCHROMIUM(big_range);
>     EXPECT_NE(0u, first_path);
>     glDeletePathsCHROMIUM(first_path, big_range);
>     ASSERT_GL_NO_ERROR();
>@@ -218,7 +218,7 @@ TEST_P(CHROMIUMPathRenderingTest, TestGenDelete)
> 
>     // specify the data.
>     GLubyte commands[] = {GL_MOVE_TO_CHROMIUM, GL_CLOSE_PATH_CHROMIUM};
>-    GLfloat coords[] = {50.0f, 50.0f};
>+    GLfloat coords[]   = {50.0f, 50.0f};
>     glPathCommandsCHROMIUM(path, 2, commands, 2, GL_FLOAT, coords);
>     ASSERT_TRUE(glIsPathCHROMIUM(path) == GL_TRUE);
>     glDeletePathsCHROMIUM(path, 1);
>@@ -259,10 +259,10 @@ TEST_P(CHROMIUMPathRenderingTest, TestPathParameter)
> 
>     // specify the data.
>     GLubyte commands[] = {GL_MOVE_TO_CHROMIUM, GL_CLOSE_PATH_CHROMIUM};
>-    GLfloat coords[] = {50.0f, 50.0f};
>+    GLfloat coords[]   = {50.0f, 50.0f};
>     glPathCommandsCHROMIUM(path, 2, commands, 2, GL_FLOAT, coords);
>     ASSERT_GL_NO_ERROR();
>-    EXPECT_TRUE(glIsPathCHROMIUM(path) == GL_TRUE);
>+    EXPECT_GL_TRUE(glIsPathCHROMIUM(path));
> 
>     static const GLenum kEndCaps[] = {GL_FLAT_CHROMIUM, GL_SQUARE_CHROMIUM, GL_ROUND_CHROMIUM};
>     for (std::size_t i = 0; i < 3; ++i)
>@@ -360,7 +360,7 @@ TEST_P(CHROMIUMPathRenderingTest, TestPathObjectState)
>     GLuint non_existing_paths[] = {0, 55, 74744};
>     for (auto &p : non_existing_paths)
>     {
>-        EXPECT_TRUE(glIsPathCHROMIUM(p) == GL_FALSE);
>+        EXPECT_GL_FALSE(glIsPathCHROMIUM(p));
>         ASSERT_GL_NO_ERROR();
>         tryAllDrawFunctions(p, GL_NO_ERROR);
>     }
>@@ -368,7 +368,7 @@ TEST_P(CHROMIUMPathRenderingTest, TestPathObjectState)
>     // Path name marked as used but without path object state causes
>     // a GL error upon any draw command.
>     GLuint path = glGenPathsCHROMIUM(1);
>-    EXPECT_TRUE(glIsPathCHROMIUM(path) == GL_FALSE);
>+    EXPECT_GL_FALSE(glIsPathCHROMIUM(path));
>     tryAllDrawFunctions(path, GL_INVALID_OPERATION);
>     glDeletePathsCHROMIUM(path, 1);
> 
>@@ -377,15 +377,15 @@ TEST_P(CHROMIUMPathRenderingTest, TestPathObjectState)
>     // Path name that had path object state, but then was "cleared", still has a
>     // path object state, even though the state is empty.
>     path = glGenPathsCHROMIUM(1);
>-    EXPECT_TRUE(glIsPathCHROMIUM(path) == GL_FALSE);
>+    EXPECT_GL_FALSE(glIsPathCHROMIUM(path));
> 
>     GLubyte commands[] = {GL_MOVE_TO_CHROMIUM, GL_CLOSE_PATH_CHROMIUM};
>-    GLfloat coords[] = {50.0f, 50.0f};
>+    GLfloat coords[]   = {50.0f, 50.0f};
>     glPathCommandsCHROMIUM(path, 2, commands, 2, GL_FLOAT, coords);
>-    EXPECT_TRUE(glIsPathCHROMIUM(path) == GL_TRUE);
>+    EXPECT_GL_TRUE(glIsPathCHROMIUM(path));
> 
>     glPathCommandsCHROMIUM(path, 0, nullptr, 0, GL_FLOAT, nullptr);
>-    EXPECT_TRUE(glIsPathCHROMIUM(path) == GL_TRUE);  // The surprise.
>+    EXPECT_GL_TRUE(glIsPathCHROMIUM(path));  // The surprise.
> 
>     tryAllDrawFunctions(path, GL_NO_ERROR);
>     glDeletePathsCHROMIUM(path, 1);
>@@ -407,7 +407,7 @@ TEST_P(CHROMIUMPathRenderingTest, TestUnnamedPathsErrors)
>     // produces error.  (Not a error in real NV_path_rendering).
>     ASSERT_GL_NO_ERROR();
>     GLubyte commands[] = {GL_MOVE_TO_CHROMIUM, GL_CLOSE_PATH_CHROMIUM};
>-    GLfloat coords[] = {50.0f, 50.0f};
>+    GLfloat coords[]   = {50.0f, 50.0f};
>     glPathCommandsCHROMIUM(555, 2, commands, 2, GL_FLOAT, coords);
>     EXPECT_GL_ERROR(GL_INVALID_OPERATION);
> 
>@@ -700,7 +700,7 @@ class CHROMIUMPathRenderingDrawTest : public ANGLETest
>         setConfigStencilBits(8);
>     }
> 
>-    bool isApplicable() const { return extensionEnabled("GL_CHROMIUM_path_rendering"); }
>+    bool isApplicable() const { return IsGLExtensionEnabled("GL_CHROMIUM_path_rendering"); }
> 
>     void setupStateForTestPattern()
>     {
>@@ -711,12 +711,12 @@ class CHROMIUMPathRenderingDrawTest : public ANGLETest
>         glClear(GL_COLOR_BUFFER_BIT | GL_STENCIL_BUFFER_BIT);
>         glEnable(GL_STENCIL_TEST);
> 
>-        static const char *kVertexShaderSource =
>+        constexpr char kVertexShaderSource[] =
>             "void main() {\n"
>             "  gl_Position = vec4(1.0); \n"
>             "}";
> 
>-        static const char *kFragmentShaderSource =
>+        constexpr char kFragmentShaderSource[] =
>             "precision mediump float;\n"
>             "uniform vec4 color;\n"
>             "void main() {\n"
>@@ -1031,7 +1031,6 @@ TEST_P(CHROMIUMPathRenderingDrawTest, TestPathRenderingThenFunctionsInstanced)
>     verifyTestPatternStroke(kShapeSize, kShapeSize);
> }
> 
>-
> // This class implements a test that draws a grid of v-shapes. The grid is
> // drawn so that even rows (from the bottom) are drawn with DrawArrays and odd
> // rows are drawn with path rendering.  It can be used to test various texturing
>@@ -1054,7 +1053,7 @@ class CHROMIUMPathRenderingWithTexturingTest : public ANGLETest
>         setConfigStencilBits(8);
>     }
> 
>-    bool isApplicable() const { return extensionEnabled("GL_CHROMIUM_path_rendering"); }
>+    bool isApplicable() const { return IsGLExtensionEnabled("GL_CHROMIUM_path_rendering"); }
> 
>     void TearDown() override
>     {
>@@ -1086,7 +1085,7 @@ class CHROMIUMPathRenderingWithTexturingTest : public ANGLETest
>     //  varying vec4 color;
>     //
>     //  (? can be anything)
>-    void compileProgram(const char *vertexShaderSource, const char *fragmentShaderSource)
>+    void CompileProgram(const char *vertexShaderSource, const char *fragmentShaderSource)
>     {
>         glViewport(0, 0, kResolution, kResolution);
>         glClearColor(0.0f, 0.0f, 0.0f, 0.0f);
>@@ -1098,8 +1097,8 @@ class CHROMIUMPathRenderingWithTexturingTest : public ANGLETest
> 
>         ASSERT_GL_NO_ERROR();
> 
>-        GLuint vShader = compileShader(GL_VERTEX_SHADER, vertexShaderSource);
>-        GLuint fShader = compileShader(GL_FRAGMENT_SHADER, fragmentShaderSource);
>+        GLuint vShader = CompileShader(GL_VERTEX_SHADER, vertexShaderSource);
>+        GLuint fShader = CompileShader(GL_FRAGMENT_SHADER, fragmentShaderSource);
>         ASSERT_NE(0u, vShader);
>         ASSERT_NE(0u, fShader);
> 
>@@ -1168,7 +1167,7 @@ class CHROMIUMPathRenderingWithTexturingTest : public ANGLETest
> 
>         GLuint path = glGenPathsCHROMIUM(1);
>         glPathCommandsCHROMIUM(path, static_cast<GLsizei>(ArraySize(kCommands)), kCommands,
>-            static_cast<GLsizei>(ArraySize(kCoords)), GL_FLOAT, kCoords);
>+                               static_cast<GLsizei>(ArraySize(kCoords)), GL_FLOAT, kCoords);
>         ASSERT_GL_NO_ERROR();
> 
>         GLfloat path_model_translate[16] = {
>@@ -1267,7 +1266,7 @@ TEST_P(CHROMIUMPathRenderingWithTexturingTest, TestBindFragmentInputLocation)
>         "}\n";
> 
>     // clang-format on
>-    compileProgram(kVertexShaderSource, kFragmentShaderSource);
>+    CompileProgram(kVertexShaderSource, kFragmentShaderSource);
> 
>     enum kBindLocations
>     {
>@@ -1338,27 +1337,45 @@ TEST_P(CHROMIUMPathRenderingWithTexturingTest, TestProgramPathFragmentInputGenCH
>         "}\n";
>     // clang-format on
> 
>-    compileProgram(kVertexShaderSource, kFragmentShaderSource);
>+    CompileProgram(kVertexShaderSource, kFragmentShaderSource);
>     bindProgram();
>     ASSERT_TRUE(linkProgram() == true);
> 
>     glUniformMatrix4fv(kViewMatrixLocation, 1, GL_FALSE, kProjectionMatrix);
> 
>-    static const GLfloat kColorMatrix[16] = {
>-        1.0f / kResolution, 0.0f, 0.0f, 0.0f,
>-        0.0f, 1.0f / kResolution, 0.0f, 0.0f,
>-        0.0f, 0.0f, 0.0f, 0.0f,
>-        0.0f, 0.0f, 0.0f, 0.0f};
>+    static const GLfloat kColorMatrix[16] = {1.0f / kResolution,
>+                                             0.0f,
>+                                             0.0f,
>+                                             0.0f,
>+                                             0.0f,
>+                                             1.0f / kResolution,
>+                                             0.0f,
>+                                             0.0f,
>+                                             0.0f,
>+                                             0.0f,
>+                                             0.0f,
>+                                             0.0f,
>+                                             0.0f,
>+                                             0.0f,
>+                                             0.0f,
>+                                             0.0f};
> 
>     glUniformMatrix4fv(kColorMatrixLocation, 1, GL_FALSE, kColorMatrix);
> 
>     // This is the functionality we are testing: ProgramPathFragmentInputGen
>     // does the same work as the color transform in vertex shader.
>-    static const GLfloat kColorCoefficients[12] = {
>-        1.0f / kResolution, 0.0f, 0.0f,
>-        0.0f, 0.0f, 1.0f / kResolution,
>-        0.0f, 0.0f, 0.0f,
>-        0.0f, 0.0f, 0.0f};
>+    static const GLfloat kColorCoefficients[12] = {1.0f / kResolution,
>+                                                   0.0f,
>+                                                   0.0f,
>+                                                   0.0f,
>+                                                   0.0f,
>+                                                   1.0f / kResolution,
>+                                                   0.0f,
>+                                                   0.0f,
>+                                                   0.0f,
>+                                                   0.0f,
>+                                                   0.0f,
>+                                                   0.0f};
>     glProgramPathFragmentInputGenCHROMIUM(mProgram, kColorFragmentInputLocation,
>                                           GL_EYE_LINEAR_CHROMIUM, 3, kColorCoefficients);
>     ASSERT_GL_NO_ERROR();
>@@ -1417,17 +1434,28 @@ TEST_P(CHROMIUMPathRenderingWithTexturingTest, TestProgramPathFragmentInputGenCH
>         "}";
>     // clang-format on
> 
>-    compileProgram(kVertexShaderSource, kFragmentShaderSource);
>+    CompileProgram(kVertexShaderSource, kFragmentShaderSource);
>     bindProgram();
>     ASSERT_TRUE(linkProgram() == true);
> 
>     glUniformMatrix4fv(kViewMatrixLocation, 1, GL_FALSE, kProjectionMatrix);
> 
>-    static const GLfloat kColorMatrix[16] = {
>-        1.0f / kShapeWidth, 0.0f, 0.0f, 0.0f,
>-        0.0f, 1.0f / kShapeHeight, 0.0f, 0.0f,
>-        0.0f, 0.0f, 0.0f, 0.0f,
>-        0.0f, 0.0f, 0.0f, 0.0f };
>+    static const GLfloat kColorMatrix[16] = {1.0f / kShapeWidth,
>+                                             0.0f,
>+                                             0.0f,
>+                                             0.0f,
>+                                             0.0f,
>+                                             1.0f / kShapeHeight,
>+                                             0.0f,
>+                                             0.0f,
>+                                             0.0f,
>+                                             0.0f,
>+                                             0.0f,
>+                                             0.0f,
>+                                             0.0f,
>+                                             0.0f,
>+                                             0.0f,
>+                                             0.0f};
>     glUniformMatrix4fv(kColorMatrixLocation, 1, GL_FALSE, kColorMatrix);
> 
>     // This is the functionality we are testing: ProgramPathFragmentInputGen
>@@ -1536,7 +1564,7 @@ TEST_P(CHROMIUMPathRenderingWithTexturingTest, TestProgramPathFragmentInputGenAr
>         {kMat4Location, "mat4_var", -1},
>     };
> 
>-    compileProgram(kVertexShaderSource, kFragmentShaderSource);
>+    CompileProgram(kVertexShaderSource, kFragmentShaderSource);
> 
>     for (size_t i = 0; i < ArraySize(variables); ++i)
>     {
>@@ -1552,7 +1580,7 @@ TEST_P(CHROMIUMPathRenderingWithTexturingTest, TestProgramPathFragmentInputGenAr
> 
>     const GLfloat kCoefficients16[] = {1.0f, 2.0f,  3.0f,  4.0f,  5.0f,  6.0f,  7.0f,  8.0f,
>                                        9.0f, 10.0f, 11.0f, 12.0f, 13.0f, 14.0f, 15.0f, 16.0f};
>-    const GLenum kGenModes[] = {GL_NONE, GL_EYE_LINEAR_CHROMIUM, GL_OBJECT_LINEAR_CHROMIUM,
>+    const GLenum kGenModes[]        = {GL_NONE, GL_EYE_LINEAR_CHROMIUM, GL_OBJECT_LINEAR_CHROMIUM,
>                                 GL_CONSTANT_CHROMIUM};
> 
>     for (size_t variable = 0; variable < ArraySize(variables); ++variable)
>@@ -1634,7 +1662,7 @@ TEST_P(CHROMIUMPathRenderingWithTexturingTest, TestProgramPathFragmentInputGenAr
>     glDeleteProgram(mProgram);
> 
>     // Test that using invalid (deleted) program is an invalid operation.
>-    EXPECT_FALSE(glIsProgram(mProgram) == GL_FALSE);
>+    EXPECT_GL_TRUE(glIsProgram(mProgram));
> 
>     glProgramPathFragmentInputGenCHROMIUM(mProgram, -1, kValidGenMode, kValidComponents,
>                                           kCoefficients16);
>@@ -1685,7 +1713,7 @@ TEST_P(CHROMIUMPathRenderingWithTexturingTest, TestConflictingBind)
>     const GLint kColorALocation = 3;
>     const GLint kColorBLocation = 4;
> 
>-    compileProgram(kVertexShaderSource, kFragmentShaderSource);
>+    CompileProgram(kVertexShaderSource, kFragmentShaderSource);
> 
>     glBindFragmentInputLocationCHROMIUM(mProgram, kColorALocation, "colorA");
>     // Bind colorB to location a, causing conflicts. Linking should fail.
>@@ -1717,7 +1745,7 @@ TEST_P(CHROMIUMPathRenderingWithTexturingTest, BindFragmentInputArray)
>         return;
> 
>     //clang-format off
>-    const char* kVertexShaderSource =
>+    const char *kVertexShaderSource =
>         "uniform mat4 view_matrix;\n"
>         "uniform mat4 color_matrix;\n"
>         "uniform vec2 model_translate;\n"
>@@ -1734,7 +1762,7 @@ TEST_P(CHROMIUMPathRenderingWithTexturingTest, BindFragmentInputArray)
>         "  color = vec4(10.0);\n"
>         "}";
> 
>-    const char* kFragmentShaderSource =
>+    const char *kFragmentShaderSource =
>         "precision mediump float;\n"
>         "varying vec4 color;\n"
>         "varying vec4 colorA[4];\n"
>@@ -1751,7 +1779,7 @@ TEST_P(CHROMIUMPathRenderingWithTexturingTest, BindFragmentInputArray)
> 
>     for (int pass = 0; pass < 2; ++pass)
>     {
>-        compileProgram(kVertexShaderSource, kFragmentShaderSource);
>+        CompileProgram(kVertexShaderSource, kFragmentShaderSource);
>         if (pass == 0)
>         {
>             glBindFragmentInputLocationCHROMIUM(mProgram, kUnusedLocation, "colorA[0]");
>@@ -1768,8 +1796,10 @@ TEST_P(CHROMIUMPathRenderingWithTexturingTest, BindFragmentInputArray)
>         ASSERT_TRUE(linkProgram() == true);
> 
>         glUniformMatrix4fv(kViewMatrixLocation, 1, GL_FALSE, kProjectionMatrix);
>-        glProgramPathFragmentInputGenCHROMIUM(mProgram, kColorA0Location, GL_CONSTANT_CHROMIUM, 4, kColorA0);
>-        glProgramPathFragmentInputGenCHROMIUM(mProgram, kColorFragmentInputLocation, GL_CONSTANT_CHROMIUM, 4, kColor);
>+        glProgramPathFragmentInputGenCHROMIUM(mProgram, kColorA0Location, GL_CONSTANT_CHROMIUM, 4,
>+                                              kColorA0);
>+        glProgramPathFragmentInputGenCHROMIUM(mProgram, kColorFragmentInputLocation,
>+                                              GL_CONSTANT_CHROMIUM, 4, kColor);
>         ASSERT_GL_NO_ERROR();
> 
>         drawTestPattern();
>@@ -1801,8 +1831,7 @@ TEST_P(CHROMIUMPathRenderingWithTexturingTest, BindFragmentInputArray)
> // Test binding array variables. This is like BindFragmentInputArray.
> // Currently disabled since it seems there's a driver bug with the
> // older drivers. This should work with driver >= 364.12
>-TEST_P(CHROMIUMPathRenderingWithTexturingTest,
>-    DISABLED_BindFragmentInputArrayNonZeroIndex)
>+TEST_P(CHROMIUMPathRenderingWithTexturingTest, DISABLED_BindFragmentInputArrayNonZeroIndex)
> {
>     if (!isApplicable())
>         return;
>@@ -1839,15 +1868,15 @@ TEST_P(CHROMIUMPathRenderingWithTexturingTest,
>     const GLint kColorA1Location = 1;
>     const GLint kColorA2Location = 2;
>     const GLint kColorA3Location = 3;
>-    const GLint kUnusedLocation = 5;
>-    const GLfloat kColorA0[] = {0.0f, 0.1f, 0.0f, 0.1f};
>-    const GLfloat kColorA1[] = {0.0f, 1.0f, 0.0f, 1.0f};
>-    const GLfloat kColorA2[] = {0.0f, 0.8f, 0.0f, 0.8f};
>-    const GLfloat kColorA3[] = {0.0f, 0.5f, 0.0f, 0.5f};
>-    const GLfloat kColor[] = {0.2f, 0.2f, 0.2f, 0.2f};
>+    const GLint kUnusedLocation  = 5;
>+    const GLfloat kColorA0[]     = {0.0f, 0.1f, 0.0f, 0.1f};
>+    const GLfloat kColorA1[]     = {0.0f, 1.0f, 0.0f, 1.0f};
>+    const GLfloat kColorA2[]     = {0.0f, 0.8f, 0.0f, 0.8f};
>+    const GLfloat kColorA3[]     = {0.0f, 0.5f, 0.0f, 0.5f};
>+    const GLfloat kColor[]       = {0.2f, 0.2f, 0.2f, 0.2f};
>     const GLfloat kFillCoords[6] = {59.0f, 50.0f, 50.0f, 28.0f, 66.0f, 63.0f};
> 
>-    compileProgram(kVertexShaderSource, kFragmentShaderSource);
>+    CompileProgram(kVertexShaderSource, kFragmentShaderSource);
> 
>     glBindFragmentInputLocationCHROMIUM(mProgram, kUnusedLocation, "colorA[0]");
>     glBindFragmentInputLocationCHROMIUM(mProgram, kColorA1Location, "colorA[1]");
>@@ -1861,12 +1890,16 @@ TEST_P(CHROMIUMPathRenderingWithTexturingTest,
> 
>     glUniformMatrix4fv(kViewMatrixLocation, 1, GL_FALSE, kProjectionMatrix);
> 
>-    glProgramPathFragmentInputGenCHROMIUM(mProgram, kColorA0Location, GL_CONSTANT_CHROMIUM, 4, kColorA0);
>-    glProgramPathFragmentInputGenCHROMIUM(mProgram, kColorA1Location, GL_CONSTANT_CHROMIUM, 4, kColorA1);
>-    glProgramPathFragmentInputGenCHROMIUM(mProgram, kColorA2Location, GL_CONSTANT_CHROMIUM, 4, kColorA2);
>-    glProgramPathFragmentInputGenCHROMIUM(mProgram, kColorA3Location, GL_CONSTANT_CHROMIUM, 4, kColorA3);
>+    glProgramPathFragmentInputGenCHROMIUM(mProgram, kColorA0Location, GL_CONSTANT_CHROMIUM, 4,
>+                                          kColorA0);
>+    glProgramPathFragmentInputGenCHROMIUM(mProgram, kColorA1Location, GL_CONSTANT_CHROMIUM, 4,
>+                                          kColorA1);
>+    glProgramPathFragmentInputGenCHROMIUM(mProgram, kColorA2Location, GL_CONSTANT_CHROMIUM, 4,
>+                                          kColorA2);
>+    glProgramPathFragmentInputGenCHROMIUM(mProgram, kColorA3Location, GL_CONSTANT_CHROMIUM, 4,
>+                                          kColorA3);
>     glProgramPathFragmentInputGenCHROMIUM(mProgram, kColorFragmentInputLocation,
>-        GL_CONSTANT_CHROMIUM, 4, kColor);
>+                                          GL_CONSTANT_CHROMIUM, 4, kColor);
>     ASSERT_GL_NO_ERROR();
> 
>     drawTestPattern();
>@@ -1899,7 +1932,7 @@ TEST_P(CHROMIUMPathRenderingWithTexturingTest, UnusedFragmentInputUpdate)
>     if (!isApplicable())
>         return;
> 
>-  // clang-format off
>+    // clang-format off
>     const char* kVertexShaderString =
>         "attribute vec4 a_position;\n"
>         "void main() {\n"
>@@ -1916,11 +1949,11 @@ TEST_P(CHROMIUMPathRenderingWithTexturingTest, UnusedFragmentInputUpdate)
>         "}";
>     // clang-format on
> 
>-    const GLint kColorULocation = 1;
>+    const GLint kColorULocation      = 1;
>     const GLint kNonexistingLocation = 5;
>-    const GLint kUnboundLocation = 6;
>+    const GLint kUnboundLocation     = 6;
> 
>-    compileProgram(kVertexShaderString, kFragmentShaderString);
>+    CompileProgram(kVertexShaderString, kFragmentShaderString);
> 
>     glBindFragmentInputLocationCHROMIUM(mProgram, kColorULocation, "u_colorU");
> 
>@@ -1934,13 +1967,15 @@ TEST_P(CHROMIUMPathRenderingWithTexturingTest, UnusedFragmentInputUpdate)
> 
>     // No errors on bound locations, since caller does not know
>     // if the driver optimizes them away or not.
>-    glProgramPathFragmentInputGenCHROMIUM(mProgram, kColorULocation, GL_CONSTANT_CHROMIUM, 1, kColor);
>+    glProgramPathFragmentInputGenCHROMIUM(mProgram, kColorULocation, GL_CONSTANT_CHROMIUM, 1,
>+                                          kColor);
>     ASSERT_GL_NO_ERROR();
> 
>     // No errors on bound locations of names that do not exist
>     // in the shader. Otherwise it would be inconsistent wrt the
>     // optimization case.
>-    glProgramPathFragmentInputGenCHROMIUM(mProgram, kNonexistingLocation, GL_CONSTANT_CHROMIUM, 1, kColor);
>+    glProgramPathFragmentInputGenCHROMIUM(mProgram, kNonexistingLocation, GL_CONSTANT_CHROMIUM, 1,
>+                                          kColor);
>     ASSERT_GL_NO_ERROR();
> 
>     // The above are equal to updating -1.
>@@ -1949,36 +1984,41 @@ TEST_P(CHROMIUMPathRenderingWithTexturingTest, UnusedFragmentInputUpdate)
> 
>     // No errors when updating with other type either.
>     // The type can not be known with the non-existing case.
>-    glProgramPathFragmentInputGenCHROMIUM(mProgram, kColorULocation, GL_CONSTANT_CHROMIUM, 4, kColor);
>+    glProgramPathFragmentInputGenCHROMIUM(mProgram, kColorULocation, GL_CONSTANT_CHROMIUM, 4,
>+                                          kColor);
>     ASSERT_GL_NO_ERROR();
> 
>-    glProgramPathFragmentInputGenCHROMIUM(mProgram, kNonexistingLocation, GL_CONSTANT_CHROMIUM, 4, kColor);
>+    glProgramPathFragmentInputGenCHROMIUM(mProgram, kNonexistingLocation, GL_CONSTANT_CHROMIUM, 4,
>+                                          kColor);
>     ASSERT_GL_NO_ERROR();
> 
>     glProgramPathFragmentInputGenCHROMIUM(mProgram, -1, GL_CONSTANT_CHROMIUM, 4, kColor);
>     ASSERT_GL_NO_ERROR();
> 
>     // Updating an unbound, non-existing location still causes an error.
>-    glProgramPathFragmentInputGenCHROMIUM(mProgram, kUnboundLocation, GL_CONSTANT_CHROMIUM, 4, kColor);
>+    glProgramPathFragmentInputGenCHROMIUM(mProgram, kUnboundLocation, GL_CONSTANT_CHROMIUM, 4,
>+                                          kColor);
>     ASSERT_GL_ERROR(GL_INVALID_OPERATION);
> }
> 
>-
> }  // namespace
> 
> ANGLE_INSTANTIATE_TEST(CHROMIUMPathRenderingTest,
>                        ES2_OPENGL(),
>                        ES2_OPENGLES(),
>                        ES3_OPENGL(),
>-                       ES3_OPENGLES());
>+                       ES3_OPENGLES(),
>+                       ES2_VULKAN());
> ANGLE_INSTANTIATE_TEST(CHROMIUMPathRenderingDrawTest,
>                        ES2_OPENGL(),
>                        ES2_OPENGLES(),
>                        ES3_OPENGL(),
>-                       ES3_OPENGLES());
>+                       ES3_OPENGLES(),
>+                       ES2_VULKAN());
> 
> ANGLE_INSTANTIATE_TEST(CHROMIUMPathRenderingWithTexturingTest,
>                        ES2_OPENGL(),
>                        ES2_OPENGLES(),
>                        ES3_OPENGL(),
>-                       ES3_OPENGLES());
>\ No newline at end of file
>+                       ES3_OPENGLES(),
>+                       ES2_VULKAN());
>diff --git a/Source/ThirdParty/ANGLE/src/tests/gl_tests/PbufferTest.cpp b/Source/ThirdParty/ANGLE/src/tests/gl_tests/PbufferTest.cpp
>index 19a174a8bcb..1f8b9f64816 100644
>--- a/Source/ThirdParty/ANGLE/src/tests/gl_tests/PbufferTest.cpp
>+++ b/Source/ThirdParty/ANGLE/src/tests/gl_tests/PbufferTest.cpp
>@@ -6,6 +6,7 @@
> 
> #include "test_utils/ANGLETest.h"
> #include "test_utils/gl_raii.h"
>+#include "util/EGLWindow.h"
> 
> using namespace angle;
> 
>@@ -26,7 +27,7 @@ class PbufferTest : public ANGLETest
>     {
>         ANGLETest::SetUp();
> 
>-        const std::string vsSource =
>+        constexpr char kVS[] =
>             R"(precision highp float;
>             attribute vec4 position;
>             varying vec2 texcoord;
>@@ -38,7 +39,7 @@ class PbufferTest : public ANGLETest
>                 texcoord.y = 1.0 - texcoord.y;
>             })";
> 
>-        const std::string textureFSSource =
>+        constexpr char kFS[] =
>             R"(precision highp float;
>             uniform sampler2D tex;
>             varying vec2 texcoord;
>@@ -48,7 +49,7 @@ class PbufferTest : public ANGLETest
>                 gl_FragColor = texture2D(tex, texcoord);
>             })";
> 
>-        mTextureProgram = CompileProgram(vsSource, textureFSSource);
>+        mTextureProgram = CompileProgram(kVS, kFS);
>         if (mTextureProgram == 0)
>         {
>             FAIL() << "shader compilation failed.";
>@@ -59,23 +60,25 @@ class PbufferTest : public ANGLETest
>         EGLWindow *window = getEGLWindow();
> 
>         EGLint surfaceType = 0;
>-        eglGetConfigAttrib(window->getDisplay(), window->getConfig(), EGL_SURFACE_TYPE, &surfaceType);
>+        eglGetConfigAttrib(window->getDisplay(), window->getConfig(), EGL_SURFACE_TYPE,
>+                           &surfaceType);
>         mSupportsPbuffers = (surfaceType & EGL_PBUFFER_BIT) != 0;
> 
>         EGLint bindToTextureRGBA = 0;
>-        eglGetConfigAttrib(window->getDisplay(), window->getConfig(), EGL_BIND_TO_TEXTURE_RGBA, &bindToTextureRGBA);
>+        eglGetConfigAttrib(window->getDisplay(), window->getConfig(), EGL_BIND_TO_TEXTURE_RGBA,
>+                           &bindToTextureRGBA);
>         mSupportsBindTexImage = (bindToTextureRGBA == EGL_TRUE);
> 
>-        const EGLint pBufferAttributes[] =
>-        {
>-            EGL_WIDTH, static_cast<EGLint>(mPbufferSize),
>-            EGL_HEIGHT, static_cast<EGLint>(mPbufferSize),
>+        const EGLint pBufferAttributes[] = {
>+            EGL_WIDTH,          static_cast<EGLint>(mPbufferSize),
>+            EGL_HEIGHT,         static_cast<EGLint>(mPbufferSize),
>             EGL_TEXTURE_FORMAT, mSupportsBindTexImage ? EGL_TEXTURE_RGBA : EGL_NO_TEXTURE,
>             EGL_TEXTURE_TARGET, mSupportsBindTexImage ? EGL_TEXTURE_2D : EGL_NO_TEXTURE,
>-            EGL_NONE, EGL_NONE,
>+            EGL_NONE,           EGL_NONE,
>         };
> 
>-        mPbuffer = eglCreatePbufferSurface(window->getDisplay(), window->getConfig(), pBufferAttributes);
>+        mPbuffer =
>+            eglCreatePbufferSurface(window->getDisplay(), window->getConfig(), pBufferAttributes);
>         if (mSupportsPbuffers)
>         {
>             ASSERT_NE(mPbuffer, EGL_NO_SURFACE);
>@@ -112,11 +115,7 @@ class PbufferTest : public ANGLETest
> // Test clearing a Pbuffer and checking the color is correct
> TEST_P(PbufferTest, Clearing)
> {
>-    if (!mSupportsPbuffers)
>-    {
>-        std::cout << "Test skipped because Pbuffers are not supported." << std::endl;
>-        return;
>-    }
>+    ANGLE_SKIP_TEST_IF(!mSupportsPbuffers);
> 
>     EGLWindow *window = getEGLWindow();
> 
>@@ -149,17 +148,9 @@ TEST_P(PbufferTest, Clearing)
> // Bind the Pbuffer to a texture and verify it renders correctly
> TEST_P(PbufferTest, BindTexImage)
> {
>-    if (!mSupportsPbuffers)
>-    {
>-        std::cout << "Test skipped because Pbuffers are not supported." << std::endl;
>-        return;
>-    }
>-
>-    if (!mSupportsBindTexImage)
>-    {
>-        std::cout << "Test skipped because Pbuffer does not support binding to RGBA textures." << std::endl;
>-        return;
>-    }
>+    // Test skipped because Pbuffers are not supported or Pbuffer does not support binding to RGBA
>+    // textures.
>+    ANGLE_SKIP_TEST_IF(!mSupportsPbuffers || !mSupportsBindTexImage);
> 
>     EGLWindow *window = getEGLWindow();
> 
>@@ -260,17 +251,9 @@ TEST_P(PbufferTest, TextureSizeReset)
> // Bind a Pbuffer, redefine the texture, and verify it renders correctly
> TEST_P(PbufferTest, BindTexImageAndRedefineTexture)
> {
>-    if (!mSupportsPbuffers)
>-    {
>-        std::cout << "Test skipped because Pbuffers are not supported." << std::endl;
>-        return;
>-    }
>-
>-    if (!mSupportsBindTexImage)
>-    {
>-        std::cout << "Test skipped because Pbuffer does not support binding to RGBA textures." << std::endl;
>-        return;
>-    }
>+    // Test skipped because Pbuffers are not supported or Pbuffer does not support binding to RGBA
>+    // textures.
>+    ANGLE_SKIP_TEST_IF(!mSupportsPbuffers || !mSupportsBindTexImage);
> 
>     EGLWindow *window = getEGLWindow();
> 
>@@ -306,7 +289,8 @@ TEST_P(PbufferTest, BindTexImageAndRedefineTexture)
>     // Redefine the texture
>     unsigned int pixelValue = 0xFFFF00FF;
>     std::vector<unsigned int> pixelData(getWindowWidth() * getWindowHeight(), pixelValue);
>-    glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, getWindowWidth(), getWindowHeight(), 0, GL_RGBA, GL_UNSIGNED_BYTE, &pixelData[0]);
>+    glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, getWindowWidth(), getWindowHeight(), 0, GL_RGBA,
>+                 GL_UNSIGNED_BYTE, &pixelData[0]);
> 
>     // Draw a quad and verify that it is magenta
>     glUseProgram(mTextureProgram);
>@@ -321,11 +305,12 @@ TEST_P(PbufferTest, BindTexImageAndRedefineTexture)
>     glDeleteTextures(1, &texture);
> }
> 
>-// Use this to select which configurations (e.g. which renderer, which GLES major version) these tests should be run against.
>+// Use this to select which configurations (e.g. which renderer, which GLES major version) these
>+// tests should be run against.
> ANGLE_INSTANTIATE_TEST(PbufferTest,
>                        ES2_D3D9(),
>                        ES2_D3D11(),
>                        ES2_OPENGL(),
>                        ES2_D3D11_WARP(),
>-                       ES2_D3D11_REFERENCE(),
>-                       ES2_OPENGLES());
>+                       ES2_OPENGLES(),
>+                       ES2_VULKAN());
>diff --git a/Source/ThirdParty/ANGLE/src/tests/gl_tests/PointSpritesTest.cpp b/Source/ThirdParty/ANGLE/src/tests/gl_tests/PointSpritesTest.cpp
>index 36a43deb8cf..298eff4bd2e 100644
>--- a/Source/ThirdParty/ANGLE/src/tests/gl_tests/PointSpritesTest.cpp
>+++ b/Source/ThirdParty/ANGLE/src/tests/gl_tests/PointSpritesTest.cpp
>@@ -13,6 +13,18 @@
> 
> using namespace angle;
> 
>+constexpr char kVertexShaderSource[] =
>+    R"(attribute vec4 vPosition;
>+        uniform float uPointSize;
>+        void main()
>+        {
>+            gl_PointSize = uPointSize;
>+            gl_Position  = vPosition;
>+        })";
>+
>+// TODO(ynovikov): Improve the tests to work with point size 1. http://anglebug.com/2553
>+constexpr GLfloat kMinMaxPointSize = 2.0f;
>+
> class PointSpritesTest : public ANGLETest
> {
>   protected:
>@@ -31,137 +43,148 @@ class PointSpritesTest : public ANGLETest
>     virtual void SetUp() { ANGLETest::SetUp(); }
> 
>     float s2p(float s) { return (s + 1.0f) * 0.5f * (GLfloat)windowWidth; }
>-};
> 
>-// Checks gl_PointCoord and gl_PointSize
>-// https://www.khronos.org/registry/webgl/sdk/tests/conformance/glsl/variables/gl-pointcoord.html
>-TEST_P(PointSpritesTest, PointCoordAndPointSizeCompliance)
>-{
>-    // TODO(jmadill): Investigate potential AMD driver bug.
>-    // http://anglebug.com/1643
>-    if (IsAMD() && IsDesktopOpenGL() && IsWindows())
>+    void testPointCoordAndPointSizeCompliance(GLProgram program)
>     {
>-        std::cout << "Test skipped on desktop GL AMD Windows." << std::endl;
>-        return;
>-    }
>-
>-    const std::string fs =
>-        R"(precision mediump float;
>-        void main()
>-        {
>-            gl_FragColor = vec4(gl_PointCoord.x, gl_PointCoord.y, 0, 1);
>-        })";
>-
>-    const std::string vs =
>-        R"(attribute vec4 vPosition;
>-        uniform float uPointSize;
>-        void main()
>-        {
>-            gl_PointSize = uPointSize;
>-            gl_Position  = vPosition;
>-        })";
>-
>-    ANGLE_GL_PROGRAM(program, vs, fs);
>-
>-    glUseProgram(program);
>+        glUseProgram(program);
> 
>-    GLfloat pointSizeRange[2] = {};
>-    glGetFloatv(GL_ALIASED_POINT_SIZE_RANGE, pointSizeRange);
>+        GLfloat pointSizeRange[2] = {};
>+        glGetFloatv(GL_ALIASED_POINT_SIZE_RANGE, pointSizeRange);
> 
>-    GLfloat maxPointSize = pointSizeRange[1];
>+        GLfloat maxPointSize = pointSizeRange[1];
> 
>-    ASSERT_TRUE(maxPointSize >= 1);
>-    maxPointSize = floorf(maxPointSize);
>-    ASSERT_TRUE((int)maxPointSize % 1 == 0);
>+        ASSERT_TRUE(maxPointSize >= 1);
>+        maxPointSize = floorf(maxPointSize);
>+        ASSERT_TRUE((int)maxPointSize % 1 == 0);
> 
>-    maxPointSize       = std::min(maxPointSize, 64.0f);
>-    GLfloat pointWidth = maxPointSize / windowWidth;
>-    GLint step         = static_cast<GLint>(floorf(maxPointSize / 4));
>-    GLint pointStep    = std::max<GLint>(1, step);
>+        maxPointSize       = std::min(maxPointSize, 64.0f);
>+        GLfloat pointWidth = maxPointSize / windowWidth;
>+        GLint step         = static_cast<GLint>(floorf(maxPointSize / 4));
>+        GLint pointStep    = std::max<GLint>(1, step);
> 
>-    GLint pointSizeLoc = glGetUniformLocation(program, "uPointSize");
>-    ASSERT_GL_NO_ERROR();
>+        GLint pointSizeLoc = glGetUniformLocation(program, "uPointSize");
>+        ASSERT_GL_NO_ERROR();
> 
>-    glUniform1f(pointSizeLoc, maxPointSize);
>-    ASSERT_GL_NO_ERROR();
>+        glUniform1f(pointSizeLoc, maxPointSize);
>+        ASSERT_GL_NO_ERROR();
> 
>-    GLfloat pixelOffset = ((int)maxPointSize % 2) ? (1.0f / (GLfloat)windowWidth) : 0;
>-    GLBuffer vertexObject;
>+        GLfloat pixelOffset = ((int)maxPointSize % 2) ? (1.0f / (GLfloat)windowWidth) : 0;
>+        GLBuffer vertexObject;
> 
>-    glBindBuffer(GL_ARRAY_BUFFER, vertexObject.get());
>-    ASSERT_GL_NO_ERROR();
>+        glBindBuffer(GL_ARRAY_BUFFER, vertexObject.get());
>+        ASSERT_GL_NO_ERROR();
> 
>-    GLfloat thePoints[] = {-0.5f + pixelOffset, -0.5f + pixelOffset, 0.5f + pixelOffset,
>-                           -0.5f + pixelOffset, -0.5f + pixelOffset, 0.5f + pixelOffset,
>-                           0.5f + pixelOffset,  0.5f + pixelOffset};
>+        GLfloat thePoints[] = {-0.5f + pixelOffset, -0.5f + pixelOffset, 0.5f + pixelOffset,
>+                               -0.5f + pixelOffset, -0.5f + pixelOffset, 0.5f + pixelOffset,
>+                               0.5f + pixelOffset,  0.5f + pixelOffset};
> 
>-    glBufferData(GL_ARRAY_BUFFER, sizeof(thePoints), thePoints, GL_STATIC_DRAW);
>-    ASSERT_GL_NO_ERROR();
>+        glBufferData(GL_ARRAY_BUFFER, sizeof(thePoints), thePoints, GL_STATIC_DRAW);
>+        ASSERT_GL_NO_ERROR();
> 
>-    glEnableVertexAttribArray(0);
>-    glVertexAttribPointer(0, 2, GL_FLOAT, GL_FALSE, 0, 0);
>+        glEnableVertexAttribArray(0);
>+        glVertexAttribPointer(0, 2, GL_FLOAT, GL_FALSE, 0, 0);
> 
>-    glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
>+        glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
> 
>-    glDrawArrays(GL_POINTS, 0, 4);
>-    ASSERT_GL_NO_ERROR();
>+        glDrawArrays(GL_POINTS, 0, 4);
>+        ASSERT_GL_NO_ERROR();
> 
>-    std::string debugText;
>-    for (float py = 0; py < 2; ++py)
>-    {
>-        for (float px = 0; px < 2; ++px)
>+        for (float py = 0; py < 2; ++py)
>         {
>-            float pointX = -0.5f + px + pixelOffset;
>-            float pointY = -0.5f + py + pixelOffset;
>-            for (int yy = 0; yy < maxPointSize; yy += pointStep)
>+            for (float px = 0; px < 2; ++px)
>             {
>-                for (int xx = 0; xx < maxPointSize; xx += pointStep)
>+                float pointX = -0.5f + px + pixelOffset;
>+                float pointY = -0.5f + py + pixelOffset;
>+                for (int yy = 0; yy < maxPointSize; yy += pointStep)
>                 {
>-                    // formula for s and t from OpenGL ES 2.0 spec section 3.3
>-                    float xw         = s2p(pointX);
>-                    float yw         = s2p(pointY);
>-                    float u          = xx / maxPointSize * 2 - 1;
>-                    float v          = yy / maxPointSize * 2 - 1;
>-                    int xf           = static_cast<int>(floorf(s2p(pointX + u * pointWidth)));
>-                    int yf           = static_cast<int>(floorf(s2p(pointY + v * pointWidth)));
>-                    float s          = 0.5f + (xf + 0.5f - xw) / maxPointSize;
>-                    float t          = 0.5f + (yf + 0.5f - yw) / maxPointSize;
>-                    GLubyte color[4] = {static_cast<GLubyte>(floorf(s * 255)),
>-                                        static_cast<GLubyte>(floorf((1 - t) * 255)), 0, 255};
>-                    EXPECT_PIXEL_NEAR(xf, yf, color[0], color[1], color[2], color[3], 4);
>+                    for (int xx = 0; xx < maxPointSize; xx += pointStep)
>+                    {
>+                        // formula for s and t from OpenGL ES 2.0 spec section 3.3
>+                        float xw         = s2p(pointX);
>+                        float yw         = s2p(pointY);
>+                        float u          = xx / maxPointSize * 2 - 1;
>+                        float v          = yy / maxPointSize * 2 - 1;
>+                        int xf           = static_cast<int>(floorf(s2p(pointX + u * pointWidth)));
>+                        int yf           = static_cast<int>(floorf(s2p(pointY + v * pointWidth)));
>+                        float s          = 0.5f + (xf + 0.5f - xw) / maxPointSize;
>+                        float t          = 0.5f + (yf + 0.5f - yw) / maxPointSize;
>+                        GLubyte color[4] = {static_cast<GLubyte>(floorf(s * 255)),
>+                                            static_cast<GLubyte>(floorf((1 - t) * 255)), 0, 255};
>+                        EXPECT_PIXEL_NEAR(xf, yf, color[0], color[1], color[2], color[3], 4);
>+                    }
>                 }
>             }
>         }
>     }
>-}
>+};
> 
>-// Verify that drawing a point without enabling any attributes succeeds
>-// https://www.khronos.org/registry/webgl/sdk/tests/conformance/rendering/point-no-attributes.html
>-TEST_P(PointSpritesTest, PointWithoutAttributesCompliance)
>+// Checks gl_PointCoord and gl_PointSize
>+// https://www.khronos.org/registry/webgl/sdk/tests/conformance/glsl/variables/gl-pointcoord.html
>+TEST_P(PointSpritesTest, PointCoordAndPointSizeCompliance)
> {
>     // TODO(jmadill): Investigate potential AMD driver bug.
>     // http://anglebug.com/1643
>-    if (IsAMD() && IsDesktopOpenGL() && IsWindows())
>-    {
>-        std::cout << "Test skipped on desktop GL AMD Windows." << std::endl;
>-        return;
>-    }
>+    ANGLE_SKIP_TEST_IF(IsAMD() && IsDesktopOpenGL() && IsWindows());
> 
>-    const std::string fs =
>+    constexpr char fs[] =
>         R"(precision mediump float;
>         void main()
>         {
>-            gl_FragColor = vec4(0.0, 1.0, 0.0, 1.0);
>+            gl_FragColor = vec4(gl_PointCoord.x, gl_PointCoord.y, 0, 1);
>         })";
> 
>-    const std::string vs =
>-        R"(void main()
>+    ANGLE_GL_PROGRAM(program, kVertexShaderSource, fs);
>+
>+    testPointCoordAndPointSizeCompliance(program);
>+}
>+
>+// Checks gl_PointCoord and gl_PointSize, but use the gl_PointCoord inside a function.
>+// In Vulkan, we need to inject some code into the shader to flip the Y coordinate, and we
>+// need to make sure this code injection works even if someone uses gl_PointCoord outside the
>+// main function.
>+TEST_P(PointSpritesTest, UsingPointCoordInsideFunction)
>+{
>+    // TODO(jmadill): Investigate potential AMD driver bug.
>+    // http://anglebug.com/1643
>+    ANGLE_SKIP_TEST_IF(IsAMD() && IsDesktopOpenGL() && IsWindows());
>+
>+    constexpr char fs[] =
>+        R"(precision mediump float;
>+        void foo() 
>         {
>-            gl_PointSize = 2.0;
>-            gl_Position = vec4(0.0, 0.0, 0.0, 1.0);
>+            gl_FragColor = vec4(gl_PointCoord.x, gl_PointCoord.y, 0, 1);
>+        }
>+
>+        void main()
>+        {
>+            foo();
>         })";
> 
>-    ANGLE_GL_PROGRAM(program, vs, fs);
>+    ANGLE_GL_PROGRAM(program, kVertexShaderSource, fs);
>+
>+    testPointCoordAndPointSizeCompliance(program);
>+}
>+
>+// Verify that drawing a point without enabling any attributes succeeds
>+// https://www.khronos.org/registry/webgl/sdk/tests/conformance/rendering/point-no-attributes.html
>+TEST_P(PointSpritesTest, PointWithoutAttributesCompliance)
>+{
>+    // TODO(jmadill): Investigate potential AMD driver bug.
>+    // http://anglebug.com/1643
>+    ANGLE_SKIP_TEST_IF(IsAMD() && IsDesktopOpenGL() && IsWindows());
>+
>+    GLfloat pointSizeRange[2] = {};
>+    glGetFloatv(GL_ALIASED_POINT_SIZE_RANGE, pointSizeRange);
>+    GLfloat maxPointSize = pointSizeRange[1];
>+    ANGLE_SKIP_TEST_IF(maxPointSize < kMinMaxPointSize);
>+
>+    constexpr char kVS[] = R"(void main()
>+{
>+    gl_PointSize = 2.0;
>+    gl_Position = vec4(0.0, 0.0, 0.0, 1.0);
>+})";
>+
>+    ANGLE_GL_PROGRAM(program, kVS, essl1_shaders::fs::Blue());
>     ASSERT_GL_NO_ERROR();
> 
>     glUseProgram(program);
>@@ -169,8 +192,8 @@ TEST_P(PointSpritesTest, PointWithoutAttributesCompliance)
>     glDrawArrays(GL_POINTS, 0, 1);
>     ASSERT_GL_NO_ERROR();
> 
>-    // expect the center pixel to be green
>-    EXPECT_PIXEL_EQ((windowWidth - 1) / 2, (windowHeight - 1) / 2, 0, 255, 0, 255);
>+    // expect the center pixel to be blue
>+    EXPECT_PIXEL_COLOR_EQ((windowWidth - 1) / 2, (windowHeight - 1) / 2, GLColor::blue);
> }
> 
> // This is a regression test for a graphics driver bug affecting end caps on roads in MapsGL
>@@ -179,52 +202,44 @@ TEST_P(PointSpritesTest, PointCoordRegressionTest)
> {
>     // TODO(jmadill): Investigate potential AMD driver bug.
>     // http://anglebug.com/1643
>-    if (IsAMD() && IsDesktopOpenGL() && IsWindows())
>-    {
>-        std::cout << "Test skipped on desktop GL AMD Windows." << std::endl;
>-        return;
>-    }
>+    ANGLE_SKIP_TEST_IF(IsAMD() && IsDesktopOpenGL() && IsWindows());
> 
>-    const std::string fs =
>-        R"(precision mediump float;
>-        varying vec4 v_color;
>-        void main()
>-        {
>-            // It seems as long as this mathematical expression references
>-            // gl_PointCoord, the fragment's color is incorrect.
>-            vec2 diff = gl_PointCoord - vec2(.5, .5);
>-            if (length(diff) > 0.5)
>-                discard;
>-
>-            // The point should be a solid color.
>-            gl_FragColor = v_color;
>-        })";
>+    GLfloat pointSizeRange[2] = {};
>+    glGetFloatv(GL_ALIASED_POINT_SIZE_RANGE, pointSizeRange);
>+    GLfloat maxPointSize = pointSizeRange[1];
>+    ANGLE_SKIP_TEST_IF(maxPointSize < kMinMaxPointSize);
> 
>-    const std::string vs =
>-        R"(varying vec4 v_color;
>-        // The X and Y coordinates of the center of the point.
>-        attribute vec2 a_vertex;
>-        uniform float u_pointSize;
>-        void main()
>-        {
>-            gl_PointSize = u_pointSize;
>-            gl_Position  = vec4(a_vertex, 0.0, 1.0);
>-            // The color of the point.
>-            v_color = vec4(0.0, 1.0, 0.0, 1.0);
>-        })";
>+    constexpr char kFS[] = R"(precision mediump float;
>+varying vec4 v_color;
>+void main()
>+{
>+    // It seems as long as this mathematical expression references
>+    // gl_PointCoord, the fragment's color is incorrect.
>+    vec2 diff = gl_PointCoord - vec2(.5, .5);
>+    if (length(diff) > 0.5)
>+        discard;
>+
>+    // The point should be a solid color.
>+    gl_FragColor = v_color;
>+})";
>+
>+    constexpr char kVS[] = R"(varying vec4 v_color;
>+// The X and Y coordinates of the center of the point.
>+attribute vec2 a_vertex;
>+uniform float u_pointSize;
>+void main()
>+{
>+    gl_PointSize = u_pointSize;
>+    gl_Position  = vec4(a_vertex, 0.0, 1.0);
>+    // The color of the point.
>+    v_color = vec4(0.0, 1.0, 0.0, 1.0);
>+})";
> 
>-    ANGLE_GL_PROGRAM(program, vs, fs);
>+    ANGLE_GL_PROGRAM(program, kVS, kFS);
>     ASSERT_GL_NO_ERROR();
> 
>     glUseProgram(program);
> 
>-    GLfloat pointSizeRange[2] = {};
>-    glGetFloatv(GL_ALIASED_POINT_SIZE_RANGE, pointSizeRange);
>-
>-    GLfloat maxPointSize = pointSizeRange[1];
>-
>-    ASSERT_TRUE(maxPointSize > 2);
>-
>     glClearColor(0, 0, 0, 1);
>     glDisable(GL_DEPTH_TEST);
>     glClear(GL_COLOR_BUFFER_BIT);
>@@ -263,38 +278,32 @@ TEST_P(PointSpritesTest, PointSizeEnabledCompliance)
> {
>     // TODO(jmadill): Investigate potential AMD driver bug.
>     // http://anglebug.com/1643
>-    if (IsAMD() && IsDesktopOpenGL() && IsWindows())
>-    {
>-        std::cout << "Test skipped on desktop GL AMD Windows." << std::endl;
>-        return;
>-    }
>+    ANGLE_SKIP_TEST_IF(IsAMD() && IsDesktopOpenGL() && IsWindows());
> 
>-    const std::string fs =
>-        R"(precision mediump float;
>-        varying vec4 color;
>+    constexpr char kFS[] = R"(precision mediump float;
>+varying vec4 color;
> 
>-        void main()
>-        {
>-            gl_FragColor = color;
>-        })";
>+void main()
>+{
>+    gl_FragColor = color;
>+})";
> 
>-    const std::string vs =
>-        R"(attribute vec3 pos;
>-        attribute vec4 colorIn;
>-        uniform float pointSize;
>-        varying vec4 color;
>+    constexpr char kVS[] = R"(attribute vec3 pos;
>+attribute vec4 colorIn;
>+uniform float pointSize;
>+varying vec4 color;
> 
>-        void main()
>-        {
>-            gl_PointSize = pointSize;
>-            color        = colorIn;
>-            gl_Position  = vec4(pos, 1.0);
>-        })";
>+void main()
>+{
>+    gl_PointSize = pointSize;
>+    color        = colorIn;
>+    gl_Position  = vec4(pos, 1.0);
>+})";
> 
>     // The WebGL test is drawn on a 2x2 canvas. Emulate this by setting a 2x2 viewport.
>     glViewport(0, 0, 2, 2);
> 
>-    ANGLE_GL_PROGRAM(program, vs, fs);
>+    ANGLE_GL_PROGRAM(program, kVS, kFS);
>     ASSERT_GL_NO_ERROR();
> 
>     glUseProgram(program);
>@@ -387,22 +396,14 @@ TEST_P(PointSpritesTest, PointSizeEnabledCompliance)
> // Verify that rendering works correctly when gl_PointSize is declared in a shader but isn't used
> TEST_P(PointSpritesTest, PointSizeDeclaredButUnused)
> {
>-    const std::string vs =
>-        R"(attribute highp vec4 position;
>-
>-        void main(void)
>-        {
>-            gl_PointSize = 1.0;
>-            gl_Position  = position;
>-        })";
>-
>-    const std::string fs =
>-        R"(void main(void)
>-        {
>-            gl_FragColor = vec4(1.0, 0.0, 0.0, 1.0);
>-        })";
>+    constexpr char kVS[] = R"(attribute highp vec4 position;
>+void main(void)
>+{
>+    gl_PointSize = 1.0;
>+    gl_Position  = position;
>+})";
> 
>-    ANGLE_GL_PROGRAM(program, vs, fs);
>+    ANGLE_GL_PROGRAM(program, kVS, essl1_shaders::fs::Red());
>     ASSERT_GL_NO_ERROR();
> 
>     glUseProgram(program);
>@@ -418,38 +419,21 @@ TEST_P(PointSpritesTest, PointSizeDeclaredButUnused)
> // spites.
> TEST_P(PointSpritesTest, PointSpriteAlternatingDrawTypes)
> {
>-    const std::string pointFS =
>-        R"(precision mediump float;
>-        void main()
>-        {
>-            gl_FragColor = vec4(0.0, 1.0, 0.0, 1.0);
>-        })";
>-
>-    const std::string pointVS =
>-        R"(void main()
>-        {
>-            gl_PointSize = 16.0;
>-            gl_Position = vec4(0.0, 0.0, 0.0, 1.0);
>-        })";
>-
>-    const std::string quadFS =
>-        R"(precision mediump float;
>-        void main()
>-        {
>-            gl_FragColor = vec4(1.0, 0.0, 0.0, 1.0);
>-        })";
>+    GLfloat pointSizeRange[2] = {};
>+    glGetFloatv(GL_ALIASED_POINT_SIZE_RANGE, pointSizeRange);
>+    GLfloat maxPointSize = pointSizeRange[1];
>+    ANGLE_SKIP_TEST_IF(maxPointSize < kMinMaxPointSize);
> 
>-    const std::string quadVS =
>-        R"(precision mediump float;
>-        attribute vec4 pos;
>-        void main()
>-        {
>-            gl_Position = pos;
>-        })";
>+    constexpr char kVS[] = R"(uniform float u_pointSize;
>+void main()
>+{
>+    gl_PointSize = u_pointSize;
>+    gl_Position = vec4(0.0, 0.0, 0.0, 1.0);
>+})";
> 
>-    ANGLE_GL_PROGRAM(pointProgram, pointVS, pointFS);
>+    ANGLE_GL_PROGRAM(pointProgram, kVS, essl1_shaders::fs::Blue());
> 
>-    ANGLE_GL_PROGRAM(quadProgram, quadVS, quadFS);
>+    ANGLE_GL_PROGRAM(quadProgram, essl1_shaders::vs::Simple(), essl1_shaders::fs::Red());
>     ASSERT_GL_NO_ERROR();
> 
>     glEnable(GL_CULL_FACE);
>@@ -462,17 +446,23 @@ TEST_P(PointSpritesTest, PointSpriteAlternatingDrawTypes)
>     };
> 
>     glUseProgram(quadProgram);
>-    GLint positionLocation = glGetAttribLocation(quadProgram, "pos");
>+    GLint positionLocation = glGetAttribLocation(quadProgram, essl1_shaders::PositionAttrib());
>     glVertexAttribPointer(positionLocation, 3, GL_FLOAT, GL_FALSE, 0, quadVertices);
>     glEnableVertexAttribArray(positionLocation);
>     glDrawArrays(GL_TRIANGLES, 0, 6);
> 
>     glUseProgram(pointProgram);
>+    GLint pointSizeLoc = glGetUniformLocation(pointProgram, "u_pointSize");
>+    ASSERT_GL_NO_ERROR();
>+    GLfloat pointSize = std::min<GLfloat>(16.0f, maxPointSize);
>+    glUniform1f(pointSizeLoc, pointSize);
>+    ASSERT_GL_NO_ERROR();
>+
>     glDrawArrays(GL_POINTS, 0, 1);
>     ASSERT_GL_NO_ERROR();
> 
>-    // expect the center pixel to be green
>-    EXPECT_PIXEL_EQ(getWindowWidth() / 2, getWindowHeight() / 2, 0, 255, 0, 255);
>+    // expect the center pixel to be blue
>+    EXPECT_PIXEL_COLOR_EQ(getWindowWidth() / 2, getWindowHeight() / 2, GLColor::blue);
> }
> 
> // This checks for an NVIDIA driver bug where points larger than the maximum reported point size can
>@@ -480,21 +470,17 @@ TEST_P(PointSpritesTest, PointSpriteAlternatingDrawTypes)
> // 3.4.
> TEST_P(PointSpritesTest, PointSizeAboveMaxIsClamped)
> {
>-    if (IsD3D9())
>-    {
>-        // Failed on NVIDIA GeForce GTX 1080 - no pixels from the point were detected in the
>-        // framebuffer. http://anglebug.com/2111
>-        std::cout << "Test skipped on D3D9." << std::endl;
>-        return;
>-    }
>+    // Failed on NVIDIA GeForce GTX 1080 - no pixels from the point were detected in the
>+    // framebuffer. http://anglebug.com/2111
>+    ANGLE_SKIP_TEST_IF(IsD3D9());
> 
>-    if (IsAMD() && IsOpenGL())
>-    {
>-        // Failed on AMD OSX and Windows trybots - no pixels from the point were detected in the
>-        // framebuffer. http://anglebug.com/2113
>-        std::cout << "Test skipped on AMD OpenGL." << std::endl;
>-        return;
>-    }
>+    // Failed on AMD OSX and Windows trybots - no pixels from the point were detected in the
>+    // framebuffer. http://anglebug.com/2113
>+    ANGLE_SKIP_TEST_IF(IsAMD() && IsOpenGL());
>+
>+    // If the center of the point ends up being outside the renderable surface, no point gets
>+    // rendered at all on AMD. http://anglebug.com/2113
>+    ANGLE_SKIP_TEST_IF(IsAMD() && IsVulkan());
> 
>     GLfloat pointSizeRange[2] = {};
>     glGetFloatv(GL_ALIASED_POINT_SIZE_RANGE, pointSizeRange);
>@@ -506,7 +492,7 @@ TEST_P(PointSpritesTest, PointSizeAboveMaxIsClamped)
>         return;
>     }
> 
>-    const std::string &vs =
>+    constexpr char kVS[] =
>         "attribute vec4 vPosition;\n"
>         "uniform float uPointSize;\n"
>         "void main()\n"
>@@ -514,13 +500,7 @@ TEST_P(PointSpritesTest, PointSizeAboveMaxIsClamped)
>         "    gl_PointSize = uPointSize;\n"
>         "    gl_Position  = vPosition;\n"
>         "}\n";
>-    const std::string &fs =
>-        "precision mediump float;\n"
>-        "void main()\n"
>-        "{\n"
>-        "    gl_FragColor = vec4(1, 0, 0, 1);\n"
>-        "}\n";
>-    ANGLE_GL_PROGRAM(program, vs, fs);
>+    ANGLE_GL_PROGRAM(program, kVS, essl1_shaders::fs::Red());
>     glUseProgram(program);
>     ASSERT_GL_NO_ERROR();
> 
>@@ -568,4 +548,5 @@ ANGLE_INSTANTIATE_TEST(PointSpritesTest,
>                        ES2_D3D11(),
>                        ES2_D3D11_FL9_3(),
>                        ES2_OPENGL(),
>-                       ES2_OPENGLES());
>+                       ES2_OPENGLES(),
>+                       ES2_VULKAN());
>diff --git a/Source/ThirdParty/ANGLE/src/tests/gl_tests/ProgramBinaryTest.cpp b/Source/ThirdParty/ANGLE/src/tests/gl_tests/ProgramBinaryTest.cpp
>index 298c9b1c167..3e9fd036afa 100644
>--- a/Source/ThirdParty/ANGLE/src/tests/gl_tests/ProgramBinaryTest.cpp
>+++ b/Source/ThirdParty/ANGLE/src/tests/gl_tests/ProgramBinaryTest.cpp
>@@ -6,14 +6,14 @@
> 
> #include "test_utils/ANGLETest.h"
> 
>-#include <memory>
> #include <stdint.h>
>+#include <memory>
> 
>-#include "EGLWindow.h"
>-#include "OSWindow.h"
> #include "common/string_utils.h"
> #include "test_utils/angle_test_configs.h"
> #include "test_utils/gl_raii.h"
>+#include "util/EGLWindow.h"
>+#include "util/OSWindow.h"
> 
> using namespace angle;
> 
>@@ -28,26 +28,16 @@ class ProgramBinaryTest : public ANGLETest
>         setConfigGreenBits(8);
>         setConfigBlueBits(8);
>         setConfigAlphaBits(8);
>+
>+        // Test flakiness was noticed when reusing displays.
>+        forceNewDisplay();
>     }
> 
>     void SetUp() override
>     {
>         ANGLETest::SetUp();
> 
>-        const std::string vertexShaderSource =
>-            R"(attribute vec4 inputAttribute;
>-            void main()
>-            {
>-                gl_Position = inputAttribute;
>-            })";
>-
>-        const std::string fragmentShaderSource =
>-            R"(void main()
>-            {
>-                gl_FragColor = vec4(1,0,0,1);
>-            })";
>-
>-        mProgram = CompileProgram(vertexShaderSource, fragmentShaderSource);
>+        mProgram = CompileProgram(essl1_shaders::vs::Simple(), essl1_shaders::fs::Red());
>         if (mProgram == 0)
>         {
>             FAIL() << "shader compilation failed.";
>@@ -65,7 +55,6 @@ class ProgramBinaryTest : public ANGLETest
>     {
>         glDeleteProgram(mProgram);
>         glDeleteBuffers(1, &mBuffer);
>-
>         ANGLETest::TearDown();
>     }
> 
>@@ -78,7 +67,7 @@ class ProgramBinaryTest : public ANGLETest
> 
>     bool supported() const
>     {
>-        if (!extensionEnabled("GL_OES_get_program_binary"))
>+        if (!IsGLExtensionEnabled("GL_OES_get_program_binary"))
>         {
>             std::cout << "Test skipped because GL_OES_get_program_binary is not available."
>                       << std::endl;
>@@ -140,7 +129,7 @@ TEST_P(ProgramBinaryTest, DynamicShadersSignatureBug)
>     glUseProgram(mProgram);
>     glBindBuffer(GL_ARRAY_BUFFER, mBuffer);
> 
>-    GLint attribLocation = glGetAttribLocation(mProgram, "inputAttribute");
>+    GLint attribLocation = glGetAttribLocation(mProgram, essl1_shaders::PositionAttrib());
>     ASSERT_NE(-1, attribLocation);
>     glEnableVertexAttribArray(attribLocation);
> 
>@@ -244,21 +233,40 @@ TEST_P(ProgramBinaryTest, CallProgramBinaryBeforeLink)
>     ANGLE_GL_BINARY_OES_PROGRAM(binaryProgram, binaryBlob, binaryFormat);
>     ASSERT_GL_NO_ERROR();
> 
>-    drawQuad(binaryProgram, "inputAttribute", 0.5f);
>+    drawQuad(binaryProgram, essl1_shaders::PositionAttrib(), 0.5f);
>     ASSERT_GL_NO_ERROR();
> }
> 
>-// Use this to select which configurations (e.g. which renderer, which GLES major version) these tests should be run against.
>+// Test that unlinked programs have a binary size of 0
>+TEST_P(ProgramBinaryTest, ZeroSizedUnlinkedBinary)
>+{
>+    ANGLE_SKIP_TEST_IF(!supported());
>+
>+    ANGLE_GL_EMPTY_PROGRAM(program);
>+    GLsizei length = 0;
>+    glGetProgramiv(program, GL_PROGRAM_BINARY_LENGTH, &length);
>+    ASSERT_EQ(0, length);
>+}
>+
>+// Use this to select which configurations (e.g. which renderer, which GLES major version) these
>+// tests should be run against.
> ANGLE_INSTANTIATE_TEST(ProgramBinaryTest,
>                        ES2_D3D9(),
>                        ES2_D3D11(),
>                        ES3_D3D11(),
>                        ES2_OPENGL(),
>-                       ES3_OPENGL());
>+                       ES3_OPENGL(),
>+                       ES2_VULKAN());
> 
> class ProgramBinaryES3Test : public ANGLETest
> {
>   protected:
>+    ProgramBinaryES3Test()
>+    {
>+        // Test flakiness was noticed when reusing displays.
>+        forceNewDisplay();
>+    }
>+
>     void testBinaryAndUBOBlockIndexes(bool drawWithProgramFirst);
> };
> 
>@@ -267,13 +275,9 @@ void ProgramBinaryES3Test::testBinaryAndUBOBlockIndexes(bool drawWithProgramFirs
>     // We can't run the test if no program binary formats are supported.
>     GLint binaryFormatCount = 0;
>     glGetIntegerv(GL_NUM_PROGRAM_BINARY_FORMATS, &binaryFormatCount);
>-    if (binaryFormatCount == 0)
>-    {
>-        std::cout << "Test skipped because no program binary formats available." << std::endl;
>-        return;
>-    }
>+    ANGLE_SKIP_TEST_IF(!binaryFormatCount);
> 
>-    const std::string &vertexShader =
>+    constexpr char kVS[] =
>         "#version 300 es\n"
>         "uniform block {\n"
>         "    float f;\n"
>@@ -284,7 +288,8 @@ void ProgramBinaryES3Test::testBinaryAndUBOBlockIndexes(bool drawWithProgramFirs
>         "    gl_Position = position;\n"
>         "    color = vec4(f, f, f, 1);\n"
>         "}";
>-    const std::string &fragmentShader =
>+
>+    constexpr char kFS[] =
>         "#version 300 es\n"
>         "precision mediump float;\n"
>         "in vec4 color;\n"
>@@ -294,7 +299,7 @@ void ProgramBinaryES3Test::testBinaryAndUBOBlockIndexes(bool drawWithProgramFirs
>         "}";
> 
>     // Init and draw with the program.
>-    ANGLE_GL_PROGRAM(program, vertexShader, fragmentShader);
>+    ANGLE_GL_PROGRAM(program, kVS, kFS);
> 
>     float fData[4]   = {1.0f, 1.0f, 1.0f, 1.0f};
>     GLuint bindIndex = 2;
>@@ -355,14 +360,6 @@ TEST_P(ProgramBinaryES3Test, UniformBlockBindingWithDraw)
> // http://anglebug.com/1637
> TEST_P(ProgramBinaryES3Test, UniformBlockBindingNoDraw)
> {
>-    // TODO(jmadill): Investigate Intel failure.
>-    // http://anglebug.com/1637
>-    if (IsWindows() && IsOpenGL() && IsIntel())
>-    {
>-        std::cout << "Test skipped on Windows Intel OpenGL." << std::endl;
>-        return;
>-    }
>-
>     testBinaryAndUBOBlockIndexes(false);
> }
> 
>@@ -379,6 +376,9 @@ class ProgramBinaryES31Test : public ANGLETest
>         setConfigGreenBits(8);
>         setConfigBlueBits(8);
>         setConfigAlphaBits(8);
>+
>+        // Test flakiness was noticed when reusing displays.
>+        forceNewDisplay();
>     }
> };
> 
>@@ -388,13 +388,9 @@ TEST_P(ProgramBinaryES31Test, ProgramBinaryWithComputeShader)
>     // We can't run the test if no program binary formats are supported.
>     GLint binaryFormatCount = 0;
>     glGetIntegerv(GL_NUM_PROGRAM_BINARY_FORMATS, &binaryFormatCount);
>-    if (binaryFormatCount == 0)
>-    {
>-        std::cout << "Test skipped because no program binary formats available." << std::endl;
>-        return;
>-    }
>+    ANGLE_SKIP_TEST_IF(!binaryFormatCount);
> 
>-    const std::string &computeShader =
>+    constexpr char kCS[] =
>         "#version 310 es\n"
>         "layout(local_size_x=4, local_size_y=3, local_size_z=1) in;\n"
>         "uniform block {\n"
>@@ -406,7 +402,7 @@ TEST_P(ProgramBinaryES31Test, ProgramBinaryWithComputeShader)
>         "    vec4 color = texture(tex, f + g);\n"
>         "}";
> 
>-    ANGLE_GL_COMPUTE_PROGRAM(program, computeShader);
>+    ANGLE_GL_COMPUTE_PROGRAM(program, kCS);
> 
>     // Read back the binary.
>     GLint programLength = 0;
>@@ -431,6 +427,129 @@ TEST_P(ProgramBinaryES31Test, ProgramBinaryWithComputeShader)
>     ASSERT_GL_NO_ERROR();
> }
> 
>+// Tests that saving and loading a program attached with computer shader.
>+TEST_P(ProgramBinaryES31Test, ProgramBinaryWithAtomicCounterComputeShader)
>+{
>+    // We can't run the test if no program binary formats are supported.
>+    GLint binaryFormatCount = 0;
>+    glGetIntegerv(GL_NUM_PROGRAM_BINARY_FORMATS, &binaryFormatCount);
>+    ANGLE_SKIP_TEST_IF(binaryFormatCount == 0);
>+
>+    constexpr char kComputeShader[] = R"(#version 310 es
>+layout(local_size_x=1, local_size_y=1, local_size_z=1) in;
>+layout(binding = 0, offset = 4) uniform atomic_uint ac[2];
>+void main() {
>+    atomicCounterIncrement(ac[0]);
>+    atomicCounterDecrement(ac[1]);
>+})";
>+
>+    ANGLE_GL_COMPUTE_PROGRAM(program, kComputeShader);
>+
>+    // Read back the binary.
>+    GLint programLength = 0;
>+    glGetProgramiv(program, GL_PROGRAM_BINARY_LENGTH, &programLength);
>+    ASSERT_GL_NO_ERROR();
>+
>+    GLsizei readLength  = 0;
>+    GLenum binaryFormat = GL_NONE;
>+    std::vector<uint8_t> binary(programLength);
>+    glGetProgramBinary(program, programLength, &readLength, &binaryFormat, binary.data());
>+    ASSERT_GL_NO_ERROR();
>+
>+    EXPECT_EQ(static_cast<GLsizei>(programLength), readLength);
>+
>+    // Load a new program with the binary.
>+    ANGLE_GL_BINARY_ES3_PROGRAM(binaryProgram, binary, binaryFormat);
>+    ASSERT_GL_NO_ERROR();
>+
>+    // Dispatch compute with the loaded binary program
>+    glUseProgram(binaryProgram);
>+
>+    // The initial value of 'ac[0]' is 3u, 'ac[1]' is 1u.
>+    unsigned int bufferData[3] = {11u, 3u, 1u};
>+    GLBuffer atomicCounterBuffer;
>+    glBindBuffer(GL_ATOMIC_COUNTER_BUFFER, atomicCounterBuffer);
>+    glBufferData(GL_ATOMIC_COUNTER_BUFFER, sizeof(bufferData), bufferData, GL_STATIC_DRAW);
>+
>+    glBindBufferBase(GL_ATOMIC_COUNTER_BUFFER, 0, atomicCounterBuffer);
>+
>+    glDispatchCompute(1, 1, 1);
>+    EXPECT_GL_NO_ERROR();
>+
>+    glMemoryBarrier(GL_ATOMIC_COUNTER_BARRIER_BIT);
>+
>+    glBindBuffer(GL_ATOMIC_COUNTER_BUFFER, atomicCounterBuffer);
>+    void *mappedBuffer =
>+        glMapBufferRange(GL_ATOMIC_COUNTER_BUFFER, 0, sizeof(GLuint) * 3, GL_MAP_READ_BIT);
>+    memcpy(bufferData, mappedBuffer, sizeof(bufferData));
>+    glUnmapBuffer(GL_ATOMIC_COUNTER_BUFFER);
>+
>+    EXPECT_EQ(11u, bufferData[0]);
>+    EXPECT_EQ(4u, bufferData[1]);
>+    EXPECT_EQ(0u, bufferData[2]);
>+    ASSERT_GL_NO_ERROR();
>+}
>+
>+// Tests that image texture works correctly when loading a program from binary.
>+TEST_P(ProgramBinaryES31Test, ImageTextureBinding)
>+{
>+    // We can't run the test if no program binary formats are supported.
>+    GLint binaryFormatCount = 0;
>+    glGetIntegerv(GL_NUM_PROGRAM_BINARY_FORMATS, &binaryFormatCount);
>+    ANGLE_SKIP_TEST_IF(!binaryFormatCount);
>+
>+    const char kComputeShader[] =
>+        R"(#version 310 es
>+        layout(local_size_x=1, local_size_y=1, local_size_z=1) in;
>+        layout(r32ui, binding = 1) writeonly uniform highp uimage2D writeImage;
>+        void main()
>+        {
>+            imageStore(writeImage, ivec2(gl_LocalInvocationID.xy), uvec4(200u));
>+        })";
>+
>+    ANGLE_GL_COMPUTE_PROGRAM(program, kComputeShader);
>+
>+    // Read back the binary.
>+    GLint programLength = 0;
>+    glGetProgramiv(program.get(), GL_PROGRAM_BINARY_LENGTH, &programLength);
>+    ASSERT_GL_NO_ERROR();
>+
>+    GLsizei readLength  = 0;
>+    GLenum binaryFormat = GL_NONE;
>+    std::vector<uint8_t> binary(programLength);
>+    glGetProgramBinary(program.get(), programLength, &readLength, &binaryFormat, binary.data());
>+    ASSERT_GL_NO_ERROR();
>+
>+    EXPECT_EQ(static_cast<GLsizei>(programLength), readLength);
>+
>+    // Load a new program with the binary.
>+    ANGLE_GL_BINARY_ES3_PROGRAM(binaryProgram, binary, binaryFormat);
>+    ASSERT_GL_NO_ERROR();
>+
>+    // Dispatch compute with the loaded binary program
>+    glUseProgram(binaryProgram.get());
>+    GLTexture texture;
>+    glBindTexture(GL_TEXTURE_2D, texture);
>+    glTexStorage2D(GL_TEXTURE_2D, 1, GL_R32UI, 1, 1);
>+    constexpr GLuint kInputValue = 100u;
>+    glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, 1, 1, GL_RED_INTEGER, GL_UNSIGNED_INT, &kInputValue);
>+    EXPECT_GL_NO_ERROR();
>+
>+    glBindImageTexture(1, texture, 0, GL_FALSE, 0, GL_WRITE_ONLY, GL_R32UI);
>+
>+    glDispatchCompute(1, 1, 1);
>+    EXPECT_GL_NO_ERROR();
>+
>+    GLFramebuffer framebuffer;
>+    glBindFramebuffer(GL_READ_FRAMEBUFFER, framebuffer);
>+    glFramebufferTexture2D(GL_READ_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, texture, 0);
>+
>+    GLuint outputValue;
>+    glReadPixels(0, 0, 1, 1, GL_RED_INTEGER, GL_UNSIGNED_INT, &outputValue);
>+    EXPECT_EQ(200u, outputValue);
>+    ASSERT_GL_NO_ERROR();
>+}
>+
> ANGLE_INSTANTIATE_TEST(ProgramBinaryES31Test, ES31_D3D11(), ES31_OPENGL(), ES31_OPENGLES());
> 
> class ProgramBinaryTransformFeedbackTest : public ANGLETest
>@@ -450,30 +569,27 @@ class ProgramBinaryTransformFeedbackTest : public ANGLETest
>     {
>         ANGLETest::SetUp();
> 
>-        const std::string vertexShaderSource =
>-            R"(#version 300 es
>-            in vec4 inputAttribute;
>-            out vec4 outputVarying;
>-            void main()
>-            {
>-                outputVarying = inputAttribute;
>-            })";
>-
>-        const std::string fragmentShaderSource =
>-            R"(#version 300 es
>-            precision highp float;
>-            out vec4 outputColor;
>-            void main()
>-            {
>-                outputColor = vec4(1,0,0,1);
>-            })";
>+        constexpr char kVS[] = R"(#version 300 es
>+in vec4 inputAttribute;
>+out vec4 outputVarying;
>+void main()
>+{
>+    outputVarying = inputAttribute;
>+})";
>+
>+        constexpr char kFS[] = R"(#version 300 es
>+precision highp float;
>+out vec4 outputColor;
>+void main()
>+{
>+    outputColor = vec4(1,0,0,1);
>+})";
> 
>         std::vector<std::string> transformFeedbackVaryings;
>         transformFeedbackVaryings.push_back("outputVarying");
> 
>-        mProgram = CompileProgramWithTransformFeedback(
>-            vertexShaderSource, fragmentShaderSource, transformFeedbackVaryings,
>-            GL_SEPARATE_ATTRIBS);
>+        mProgram = CompileProgramWithTransformFeedback(kVS, kFS, transformFeedbackVaryings,
>+                                                       GL_SEPARATE_ATTRIBS);
>         if (mProgram == 0)
>         {
>             FAIL() << "shader compilation failed.";
>@@ -503,18 +619,9 @@ class ProgramBinaryTransformFeedbackTest : public ANGLETest
> // should not internally cause a vertex shader recompile (for conversion).
> TEST_P(ProgramBinaryTransformFeedbackTest, GetTransformFeedbackVarying)
> {
>-    if (!extensionEnabled("GL_OES_get_program_binary"))
>-    {
>-        std::cout << "Test skipped because GL_OES_get_program_binary is not available."
>-                  << std::endl;
>-        return;
>-    }
>+    ANGLE_SKIP_TEST_IF(!IsGLExtensionEnabled("GL_OES_get_program_binary"));
> 
>-    if (getAvailableProgramBinaryFormatCount() == 0)
>-    {
>-        std::cout << "Test skipped because no program binary formats are available." << std::endl;
>-        return;
>-    }
>+    ANGLE_SKIP_TEST_IF(!getAvailableProgramBinaryFormatCount());
> 
>     std::vector<uint8_t> binary(0);
>     GLint programLength = 0;
>@@ -542,9 +649,10 @@ TEST_P(ProgramBinaryTransformFeedbackTest, GetTransformFeedbackVarying)
>     // Query information about the transform feedback varying
>     char varyingName[64];
>     GLsizei varyingSize = 0;
>-    GLenum varyingType = GL_NONE;
>+    GLenum varyingType  = GL_NONE;
> 
>-    glGetTransformFeedbackVarying(mProgram, 0, 64, &writtenLength, &varyingSize, &varyingType, varyingName);
>+    glGetTransformFeedbackVarying(mProgram, 0, 64, &writtenLength, &varyingSize, &varyingType,
>+                                  varyingName);
>     EXPECT_GL_NO_ERROR();
> 
>     EXPECT_EQ(13, writtenLength);
>@@ -555,23 +663,25 @@ TEST_P(ProgramBinaryTransformFeedbackTest, GetTransformFeedbackVarying)
>     EXPECT_GL_NO_ERROR();
> }
> 
>-// Use this to select which configurations (e.g. which renderer, which GLES major version) these tests should be run against.
>-ANGLE_INSTANTIATE_TEST(ProgramBinaryTransformFeedbackTest,
>-                       ES3_D3D11(),
>-                       ES3_OPENGL());
>+// Use this to select which configurations (e.g. which renderer, which GLES major version) these
>+// tests should be run against.
>+ANGLE_INSTANTIATE_TEST(ProgramBinaryTransformFeedbackTest, ES3_D3D11(), ES3_OPENGL());
> 
> // For the ProgramBinariesAcrossPlatforms tests, we need two sets of params:
> // - a set to save the program binary
> // - a set to load the program binary
>-// We combine these into one struct extending PlatformParameters so we can reuse existing ANGLE test macros
>+// We combine these into one struct extending PlatformParameters so we can reuse existing ANGLE test
>+// macros
> struct PlatformsWithLinkResult : PlatformParameters
> {
>-    PlatformsWithLinkResult(PlatformParameters saveParams, PlatformParameters loadParamsIn, bool expectedLinkResultIn)
>-    {
>-        majorVersion = saveParams.majorVersion;
>-        minorVersion = saveParams.minorVersion;
>-        eglParameters = saveParams.eglParameters;
>-        loadParams = loadParamsIn;
>+    PlatformsWithLinkResult(PlatformParameters saveParams,
>+                            PlatformParameters loadParamsIn,
>+                            bool expectedLinkResultIn)
>+    {
>+        majorVersion       = saveParams.majorVersion;
>+        minorVersion       = saveParams.minorVersion;
>+        eglParameters      = saveParams.eglParameters;
>+        loadParams         = loadParamsIn;
>         expectedLinkResult = expectedLinkResultIn;
>     }
> 
>@@ -583,7 +693,7 @@ struct PlatformsWithLinkResult : PlatformParameters
> // to avoid returning the same parameter name twice. Such a conflict would happen
> // between ES2_D3D11_to_ES2D3D11 and ES2_D3D11_to_ES3D3D11 as they were both
> // named ES2_D3D11
>-std::ostream &operator<<(std::ostream& stream, const PlatformsWithLinkResult &platform)
>+std::ostream &operator<<(std::ostream &stream, const PlatformsWithLinkResult &platform)
> {
>     const PlatformParameters &platform1 = platform;
>     const PlatformParameters &platform2 = platform.loadParams;
>@@ -596,26 +706,30 @@ class ProgramBinariesAcrossPlatforms : public testing::TestWithParam<PlatformsWi
>   public:
>     void SetUp() override
>     {
>-        mOSWindow = CreateOSWindow();
>+        mOSWindow   = OSWindow::New();
>         bool result = mOSWindow->initialize("ProgramBinariesAcrossRenderersTests", 100, 100);
> 
>         if (result == false)
>         {
>             FAIL() << "Failed to create OS window";
>         }
>+
>+        mEntryPointsLib.reset(angle::OpenSharedLibrary(ANGLE_EGL_LIBRARY_NAME));
>     }
> 
>     EGLWindow *createAndInitEGLWindow(angle::PlatformParameters &param)
>     {
>-        EGLWindow *eglWindow =
>-            new EGLWindow(param.majorVersion, param.minorVersion, param.eglParameters);
>-        bool result = eglWindow->initializeGL(mOSWindow);
>-        if (result == false)
>+        EGLWindow *eglWindow = EGLWindow::New(param.majorVersion, param.minorVersion);
>+        ConfigParameters configParams;
>+        bool result = eglWindow->initializeGL(mOSWindow, mEntryPointsLib.get(), param.eglParameters,
>+                                              configParams);
>+        if (!result)
>         {
>-            SafeDelete(eglWindow);
>-            eglWindow = nullptr;
>+            EGLWindow::Delete(&eglWindow);
>         }
> 
>+        angle::LoadGLES(eglGetProcAddress);
>+
>         return eglWindow;
>     }
> 
>@@ -623,52 +737,17 @@ class ProgramBinariesAcrossPlatforms : public testing::TestWithParam<PlatformsWi
>     {
>         ASSERT_NE(nullptr, *eglWindow);
>         (*eglWindow)->destroyGL();
>-        SafeDelete(*eglWindow);
>-        *eglWindow = nullptr;
>+        EGLWindow::Delete(eglWindow);
>     }
> 
>     GLuint createES2ProgramFromSource()
>     {
>-        const std::string testVertexShaderSource =
>-            R"(attribute highp vec4 position;
>-
>-            void main(void)
>-            {
>-                gl_Position = position;
>-            })";
>-
>-        const std::string testFragmentShaderSource =
>-            R"(void main(void)
>-            {
>-                gl_FragColor = vec4(1.0, 0.0, 0.0, 1.0);
>-            })";
>-
>-        return CompileProgram(testVertexShaderSource, testFragmentShaderSource);
>+        return CompileProgram(essl1_shaders::vs::Simple(), essl1_shaders::fs::Red());
>     }
> 
>     GLuint createES3ProgramFromSource()
>     {
>-        const std::string testVertexShaderSource =
>-            R"(#version 300 es
>-            precision highp float;
>-            in highp vec4 position;
>-
>-            void main(void)
>-            {
>-                gl_Position = position;
>-            })";
>-
>-        const std::string testFragmentShaderSource =
>-            R"(#version 300 es
>-            precision highp float;
>-            out vec4 out_FragColor;
>-
>-            void main(void)
>-            {
>-                out_FragColor = vec4(1.0, 0.0, 0.0, 1.0);
>-            })";
>-
>-        return CompileProgram(testVertexShaderSource, testFragmentShaderSource);
>+        return CompileProgram(essl3_shaders::vs::Simple(), essl3_shaders::fs::Red());
>     }
> 
>     void drawWithProgram(GLuint program)
>@@ -676,19 +755,14 @@ class ProgramBinariesAcrossPlatforms : public testing::TestWithParam<PlatformsWi
>         glClearColor(0, 0, 0, 1);
>         glClear(GL_COLOR_BUFFER_BIT);
> 
>-        GLint positionLocation = glGetAttribLocation(program, "position");
>+        GLint positionLocation = glGetAttribLocation(program, essl1_shaders::PositionAttrib());
> 
>         glUseProgram(program);
> 
>-        const GLfloat vertices[] =
>-        {
>-            -1.0f,  1.0f, 0.5f,
>-            -1.0f, -1.0f, 0.5f,
>-             1.0f, -1.0f, 0.5f,
>+        const GLfloat vertices[] = {
>+            -1.0f, 1.0f, 0.5f, -1.0f, -1.0f, 0.5f, 1.0f, -1.0f, 0.5f,
> 
>-            -1.0f,  1.0f, 0.5f,
>-             1.0f, -1.0f, 0.5f,
>-             1.0f,  1.0f, 0.5f,
>+            -1.0f, 1.0f, 0.5f, 1.0f,  -1.0f, 0.5f, 1.0f, 1.0f,  0.5f,
>         };
> 
>         glVertexAttribPointer(positionLocation, 3, GL_FLOAT, GL_FALSE, 0, vertices);
>@@ -705,30 +779,26 @@ class ProgramBinariesAcrossPlatforms : public testing::TestWithParam<PlatformsWi
>     void TearDown() override
>     {
>         mOSWindow->destroy();
>-        SafeDelete(mOSWindow);
>+        OSWindow::Delete(&mOSWindow);
>     }
> 
>-    OSWindow *mOSWindow;
>+    OSWindow *mOSWindow = nullptr;
>+    std::unique_ptr<angle::Library> mEntryPointsLib;
> };
> 
>-// Tries to create a program binary using one set of platform params, then load it using a different sent of params
>+// Tries to create a program binary using one set of platform params, then load it using a different
>+// sent of params
> TEST_P(ProgramBinariesAcrossPlatforms, CreateAndReloadBinary)
> {
>     angle::PlatformParameters firstRenderer  = GetParam();
>     angle::PlatformParameters secondRenderer = GetParam().loadParams;
>     bool expectedLinkResult                  = GetParam().expectedLinkResult;
> 
>-    if (!(IsPlatformAvailable(firstRenderer)))
>-    {
>-        std::cout << "First renderer not supported, skipping test";
>-        return;
>-    }
>+    // First renderer not supported, skipping test.
>+    ANGLE_SKIP_TEST_IF(!(IsPlatformAvailable(firstRenderer)));
> 
>-    if (!(IsPlatformAvailable(secondRenderer)))
>-    {
>-        std::cout << "Second renderer not supported, skipping test";
>-        return;
>-    }
>+    // Second renderer not supported, skipping test.
>+    ANGLE_SKIP_TEST_IF(!(IsPlatformAvailable(secondRenderer)));
> 
>     EGLWindow *eglWindow = nullptr;
>     std::vector<uint8_t> binary(0);
>@@ -748,22 +818,20 @@ TEST_P(ProgramBinariesAcrossPlatforms, CreateAndReloadBinary)
> 
>     // If the test is trying to use both the default GPU and WARP, but the default GPU *IS* WARP,
>     // then our expectations for the test results will be invalid.
>-    if (firstRenderer.eglParameters.deviceType != EGL_PLATFORM_ANGLE_DEVICE_TYPE_WARP_ANGLE &&
>-        secondRenderer.eglParameters.deviceType == EGL_PLATFORM_ANGLE_DEVICE_TYPE_WARP_ANGLE)
>+    if (firstRenderer.eglParameters.deviceType != EGL_PLATFORM_ANGLE_DEVICE_TYPE_D3D_WARP_ANGLE &&
>+        secondRenderer.eglParameters.deviceType == EGL_PLATFORM_ANGLE_DEVICE_TYPE_D3D_WARP_ANGLE)
>     {
>-        std::string rendererString = std::string(reinterpret_cast<const char*>(glGetString(GL_RENDERER)));
>+        std::string rendererString =
>+            std::string(reinterpret_cast<const char *>(glGetString(GL_RENDERER)));
>         angle::ToLower(&rendererString);
> 
>-        auto basicRenderPos = rendererString.find(std::string("microsoft basic render"));
>+        auto basicRenderPos     = rendererString.find(std::string("microsoft basic render"));
>         auto softwareAdapterPos = rendererString.find(std::string("software adapter"));
> 
>-        if (basicRenderPos != std::string::npos || softwareAdapterPos != std::string::npos)
>-        {
>-            // The first renderer is using WARP, even though we didn't explictly request it
>-            // We should skip this test
>-            std::cout << "Test skipped on when default GPU is WARP." << std::endl;
>-            return;
>-        }
>+        // The first renderer is using WARP, even though we didn't explictly request it
>+        // We should skip this test
>+        ANGLE_SKIP_TEST_IF(basicRenderPos != std::string::npos ||
>+                           softwareAdapterPos != std::string::npos);
>     }
> 
>     // Create a program
>@@ -814,7 +882,8 @@ TEST_P(ProgramBinariesAcrossPlatforms, CreateAndReloadBinary)
> 
>     if (linkStatus != 0)
>     {
>-        // If the link was successful, then we should try to draw using the program to ensure it works as expected
>+        // If the link was successful, then we should try to draw using the program to ensure it
>+        // works as expected
>         drawWithProgram(program);
>         EXPECT_GL_NO_ERROR();
>     }
>diff --git a/Source/ThirdParty/ANGLE/src/tests/gl_tests/ProgramInterfaceTest.cpp b/Source/ThirdParty/ANGLE/src/tests/gl_tests/ProgramInterfaceTest.cpp
>index cb597c7e474..aa1e74d5576 100644
>--- a/Source/ThirdParty/ANGLE/src/tests/gl_tests/ProgramInterfaceTest.cpp
>+++ b/Source/ThirdParty/ANGLE/src/tests/gl_tests/ProgramInterfaceTest.cpp
>@@ -6,6 +6,7 @@
> 
> // ProgramInterfaceTest: Tests of program interfaces.
> 
>+#include "common/string_utils.h"
> #include "test_utils/ANGLETest.h"
> #include "test_utils/gl_raii.h"
> 
>@@ -31,16 +32,7 @@ class ProgramInterfaceTestES31 : public ANGLETest
> // Tests glGetProgramResourceIndex.
> TEST_P(ProgramInterfaceTestES31, GetResourceIndex)
> {
>-    const std::string &vertexShaderSource =
>-        "#version 310 es\n"
>-        "precision highp float;\n"
>-        "in highp vec4 position;\n"
>-        "void main()\n"
>-        "{\n"
>-        "    gl_Position = position;\n"
>-        "}";
>-
>-    const std::string &fragmentShaderSource =
>+    constexpr char kFS[] =
>         "#version 310 es\n"
>         "precision highp float;\n"
>         "uniform vec4 color;\n"
>@@ -50,9 +42,10 @@ TEST_P(ProgramInterfaceTestES31, GetResourceIndex)
>         "    oColor = color;\n"
>         "}";
> 
>-    ANGLE_GL_PROGRAM(program, vertexShaderSource, fragmentShaderSource);
>+    ANGLE_GL_PROGRAM(program, essl31_shaders::vs::Simple(), kFS);
> 
>-    GLuint index = glGetProgramResourceIndex(program, GL_PROGRAM_INPUT, "position");
>+    GLuint index =
>+        glGetProgramResourceIndex(program, GL_PROGRAM_INPUT, essl31_shaders::PositionAttrib());
>     EXPECT_GL_NO_ERROR();
>     EXPECT_NE(GL_INVALID_INDEX, index);
> 
>@@ -75,16 +68,7 @@ TEST_P(ProgramInterfaceTestES31, GetResourceIndex)
> // Tests glGetProgramResourceName.
> TEST_P(ProgramInterfaceTestES31, GetResourceName)
> {
>-    const std::string &vertexShaderSource =
>-        "#version 310 es\n"
>-        "precision highp float;\n"
>-        "in highp vec4 position;\n"
>-        "void main()\n"
>-        "{\n"
>-        "    gl_Position = position;\n"
>-        "}";
>-
>-    const std::string &fragmentShaderSource =
>+    constexpr char kFS[] =
>         "#version 310 es\n"
>         "precision highp float;\n"
>         "uniform vec4 color;\n"
>@@ -94,9 +78,10 @@ TEST_P(ProgramInterfaceTestES31, GetResourceName)
>         "    oColor[0] = color;\n"
>         "}";
> 
>-    ANGLE_GL_PROGRAM(program, vertexShaderSource, fragmentShaderSource);
>+    ANGLE_GL_PROGRAM(program, essl31_shaders::vs::Simple(), kFS);
> 
>-    GLuint index = glGetProgramResourceIndex(program, GL_PROGRAM_INPUT, "position");
>+    GLuint index =
>+        glGetProgramResourceIndex(program, GL_PROGRAM_INPUT, essl31_shaders::PositionAttrib());
>     EXPECT_GL_NO_ERROR();
>     EXPECT_NE(GL_INVALID_INDEX, index);
> 
>@@ -104,13 +89,13 @@ TEST_P(ProgramInterfaceTestES31, GetResourceName)
>     GLsizei length;
>     glGetProgramResourceName(program, GL_PROGRAM_INPUT, index, sizeof(name), &length, name);
>     EXPECT_GL_NO_ERROR();
>-    EXPECT_EQ(8, length);
>-    EXPECT_EQ("position", std::string(name));
>+    EXPECT_EQ(static_cast<int>(strlen(essl31_shaders::PositionAttrib())), length);
>+    EXPECT_EQ(essl31_shaders::PositionAttrib(), std::string(name));
> 
>     glGetProgramResourceName(program, GL_PROGRAM_INPUT, index, 4, &length, name);
>     EXPECT_GL_NO_ERROR();
>     EXPECT_EQ(3, length);
>-    EXPECT_EQ("pos", std::string(name));
>+    EXPECT_TRUE(angle::BeginsWith(essl31_shaders::PositionAttrib(), name));
> 
>     glGetProgramResourceName(program, GL_PROGRAM_INPUT, index, -1, &length, name);
>     EXPECT_GL_ERROR(GL_INVALID_VALUE);
>@@ -137,7 +122,7 @@ TEST_P(ProgramInterfaceTestES31, GetResourceName)
> // Tests glGetProgramResourceLocation.
> TEST_P(ProgramInterfaceTestES31, GetResourceLocation)
> {
>-    const std::string &vertexShaderSource =
>+    constexpr char kVS[] =
>         "#version 310 es\n"
>         "precision highp float;\n"
>         "layout(location = 3) in highp vec4 position;\n"
>@@ -147,7 +132,7 @@ TEST_P(ProgramInterfaceTestES31, GetResourceLocation)
>         "    gl_Position = position;\n"
>         "}";
> 
>-    const std::string &fragmentShaderSource =
>+    constexpr char kFS[] =
>         "#version 310 es\n"
>         "precision highp float;\n"
>         "uniform vec4 color;\n"
>@@ -157,7 +142,7 @@ TEST_P(ProgramInterfaceTestES31, GetResourceLocation)
>         "    oColor[0] = color;\n"
>         "}";
> 
>-    ANGLE_GL_PROGRAM(program, vertexShaderSource, fragmentShaderSource);
>+    ANGLE_GL_PROGRAM(program, kVS, kFS);
> 
>     GLenum invalidInterfaces[] = {GL_UNIFORM_BLOCK, GL_TRANSFORM_FEEDBACK_VARYING,
>                                   GL_BUFFER_VARIABLE, GL_SHADER_STORAGE_BLOCK,
>@@ -196,7 +181,7 @@ TEST_P(ProgramInterfaceTestES31, GetResourceLocation)
> // Tests glGetProgramResource.
> TEST_P(ProgramInterfaceTestES31, GetResource)
> {
>-    const std::string &vertexShaderSource =
>+    constexpr char kVS[] =
>         "#version 310 es\n"
>         "precision highp float;\n"
>         "layout(location = 3) in highp vec4 position;\n"
>@@ -205,7 +190,7 @@ TEST_P(ProgramInterfaceTestES31, GetResource)
>         "    gl_Position = position;\n"
>         "}";
> 
>-    const std::string &fragmentShaderSource =
>+    constexpr char kFS[] =
>         "#version 310 es\n"
>         "precision highp float;\n"
>         "uniform vec4 color;\n"
>@@ -215,7 +200,7 @@ TEST_P(ProgramInterfaceTestES31, GetResource)
>         "    oColor[0] = color;\n"
>         "}";
> 
>-    ANGLE_GL_PROGRAM(program, vertexShaderSource, fragmentShaderSource);
>+    ANGLE_GL_PROGRAM(program, kVS, kFS);
> 
>     GLuint index = glGetProgramResourceIndex(program, GL_PROGRAM_INPUT, "position");
>     EXPECT_GL_NO_ERROR();
>@@ -268,16 +253,11 @@ TEST_P(ProgramInterfaceTestES31, GetResource)
> // Tests glGetProgramInterfaceiv.
> TEST_P(ProgramInterfaceTestES31, GetProgramInterface)
> {
>-    const std::string &vertexShaderSource =
>-        "#version 310 es\n"
>-        "precision highp float;\n"
>-        "in highp vec4 position;\n"
>-        "void main()\n"
>-        "{\n"
>-        "    gl_Position = position;\n"
>-        "}";
>+    // TODO(jiajia.qin@intel.com): Don't skip this test once SSBO are supported on render pipeline.
>+    // http://anglebug.com/1951
>+    ANGLE_SKIP_TEST_IF(IsD3D11());
> 
>-    const std::string &fragmentShaderSource =
>+    constexpr char kFS[] =
>         "#version 310 es\n"
>         "precision highp float;\n"
>         "uniform vec4 color;\n"
>@@ -286,12 +266,20 @@ TEST_P(ProgramInterfaceTestES31, GetProgramInterface)
>         "    vec4 mem0;\n"
>         "    vec4 mem1;\n"
>         "} instance;\n"
>+        "layout(std430) buffer shaderStorageBlock1 {\n"
>+        "    vec3 target;\n"
>+        "};\n"
>+        "layout(std430) buffer shaderStorageBlock2 {\n"
>+        "    vec3 target;\n"
>+        "} blockInstance2[1];\n"
>         "void main()\n"
>         "{\n"
>         "    oColor = color;\n"
>+        "    target = vec3(0, 0, 0);\n"
>+        "    blockInstance2[0].target = vec3(1, 1, 1);\n"
>         "}";
> 
>-    ANGLE_GL_PROGRAM(program, vertexShaderSource, fragmentShaderSource);
>+    ANGLE_GL_PROGRAM(program, essl31_shaders::vs::Simple(), kFS);
> 
>     GLint num;
>     glGetProgramInterfaceiv(program, GL_PROGRAM_INPUT, GL_ACTIVE_RESOURCES, &num);
>@@ -300,7 +288,7 @@ TEST_P(ProgramInterfaceTestES31, GetProgramInterface)
> 
>     glGetProgramInterfaceiv(program, GL_PROGRAM_INPUT, GL_MAX_NAME_LENGTH, &num);
>     EXPECT_GL_NO_ERROR();
>-    EXPECT_EQ(9, num);
>+    EXPECT_EQ(static_cast<GLint>(strlen(essl3_shaders::PositionAttrib())) + 1, num);
> 
>     glGetProgramInterfaceiv(program, GL_PROGRAM_INPUT, GL_MAX_NUM_ACTIVE_VARIABLES, &num);
>     EXPECT_GL_ERROR(GL_INVALID_OPERATION);
>@@ -338,12 +326,28 @@ TEST_P(ProgramInterfaceTestES31, GetProgramInterface)
> 
>     glGetProgramInterfaceiv(program, GL_UNIFORM, GL_MAX_NUM_ACTIVE_VARIABLES, &num);
>     EXPECT_GL_ERROR(GL_INVALID_OPERATION);
>+
>+    glGetProgramInterfaceiv(program, GL_SHADER_STORAGE_BLOCK, GL_ACTIVE_RESOURCES, &num);
>+    EXPECT_GL_NO_ERROR();
>+    EXPECT_EQ(2, num);
>+
>+    glGetProgramInterfaceiv(program, GL_SHADER_STORAGE_BLOCK, GL_MAX_NAME_LENGTH, &num);
>+    EXPECT_GL_NO_ERROR();
>+    EXPECT_EQ(23, num);  // "shaderStorageBlock2[0]"
>+
>+    glGetProgramInterfaceiv(program, GL_SHADER_STORAGE_BLOCK, GL_MAX_NUM_ACTIVE_VARIABLES, &num);
>+    EXPECT_GL_NO_ERROR();
>+    EXPECT_EQ(1, num);
> }
> 
> // Tests the resource property query for uniform can be done correctly.
> TEST_P(ProgramInterfaceTestES31, GetUniformProperties)
> {
>-    const std::string &vertexShaderSource =
>+    // TODO(jiajia.qin@intel.com): Don't skip this test once atomic counter is supported on d3d
>+    // backend. http://anglebug.com/1729
>+    ANGLE_SKIP_TEST_IF(IsD3D11());
>+
>+    constexpr char kVS[] =
>         "#version 310 es\n"
>         "precision highp float;\n"
>         "uniform layout(location=12) vec4 color;\n"
>@@ -353,7 +357,7 @@ TEST_P(ProgramInterfaceTestES31, GetUniformProperties)
>         "    atomicCounterIncrement(foo);\n"
>         "}";
> 
>-    const std::string &fragmentShaderSource =
>+    constexpr char kFS[] =
>         "#version 310 es\n"
>         "precision highp float;\n"
>         "uniform vec4 color;\n"
>@@ -363,7 +367,7 @@ TEST_P(ProgramInterfaceTestES31, GetUniformProperties)
>         "    oColor = color;\n"
>         "}";
> 
>-    ANGLE_GL_PROGRAM(program, vertexShaderSource, fragmentShaderSource);
>+    ANGLE_GL_PROGRAM(program, kVS, kFS);
> 
>     GLuint index = glGetProgramResourceIndex(program, GL_UNIFORM, "color");
>     EXPECT_GL_NO_ERROR();
>@@ -448,7 +452,7 @@ TEST_P(ProgramInterfaceTestES31, GetUniformProperties)
> // Tests the resource property query for uniform block can be done correctly.
> TEST_P(ProgramInterfaceTestES31, GetUniformBlockProperties)
> {
>-    const std::string &vertexShaderSource =
>+    constexpr char kVS[] =
>         "#version 310 es\n"
>         "in vec2 position;\n"
>         "out vec2 v;\n"
>@@ -461,7 +465,7 @@ TEST_P(ProgramInterfaceTestES31, GetUniformBlockProperties)
>         "  gl_Position = vec4(position, 0, 1);\n"
>         "}";
> 
>-    const std::string &fragmentShaderSource =
>+    constexpr char kFS[] =
>         "#version 310 es\n"
>         "precision highp float;\n"
>         "in vec2 v;\n"
>@@ -470,7 +474,7 @@ TEST_P(ProgramInterfaceTestES31, GetUniformBlockProperties)
>         "  color = vec4(v, 0, 1);\n"
>         "}";
> 
>-    ANGLE_GL_PROGRAM(program, vertexShaderSource, fragmentShaderSource);
>+    ANGLE_GL_PROGRAM(program, kVS, kFS);
> 
>     GLuint index = glGetProgramResourceIndex(program, GL_UNIFORM_BLOCK, "blockName");
>     EXPECT_GL_NO_ERROR();
>@@ -532,7 +536,11 @@ TEST_P(ProgramInterfaceTestES31, GetUniformBlockProperties)
> // Tests atomic counter buffer qeury works correctly.
> TEST_P(ProgramInterfaceTestES31, QueryAtomicCounteBuffer)
> {
>-    const std::string &vertShader =
>+    // TODO(jiajia.qin@intel.com): Don't skip this test once atomic counter is supported on d3d
>+    // backend. http://anglebug.com/1729
>+    ANGLE_SKIP_TEST_IF(IsD3D11());
>+
>+    constexpr char kVS[] =
>         "#version 310 es\n"
>         "precision highp float;\n"
>         "layout(binding = 2, offset = 0) uniform atomic_uint vcounter;\n"
>@@ -543,7 +551,7 @@ TEST_P(ProgramInterfaceTestES31, QueryAtomicCounteBuffer)
>         "    gl_Position = a_position;\n"
>         "}\n";
> 
>-    const std::string &fragShader =
>+    constexpr char kFS[] =
>         "#version 310 es\n"
>         "precision highp float;\n"
>         "layout(binding = 2, offset = 4) uniform atomic_uint fcounter;\n"
>@@ -554,7 +562,7 @@ TEST_P(ProgramInterfaceTestES31, QueryAtomicCounteBuffer)
>         "    my_color = vec4(0.0);\n"
>         "}\n";
> 
>-    ANGLE_GL_PROGRAM(program, vertShader, fragShader);
>+    ANGLE_GL_PROGRAM(program, kVS, kFS);
>     GLint num;
>     glGetProgramInterfaceiv(program, GL_ATOMIC_COUNTER_BUFFER, GL_ACTIVE_RESOURCES, &num);
>     EXPECT_GL_NO_ERROR();
>@@ -583,7 +591,11 @@ TEST_P(ProgramInterfaceTestES31, QueryAtomicCounteBuffer)
> // Tests the resource property query for buffer variable can be done correctly.
> TEST_P(ProgramInterfaceTestES31, GetBufferVariableProperties)
> {
>-    const std::string &vertexShaderSource =
>+    // TODO(jiajia.qin@intel.com): Don't skip this test once non-simple SSBO sentences are supported
>+    // on d3d backend. http://anglebug.com/1951
>+    ANGLE_SKIP_TEST_IF(IsD3D11());
>+
>+    constexpr char kVS[] =
>         "#version 310 es\n"
>         "precision highp float;\n"
>         "struct S {\n"
>@@ -605,7 +617,7 @@ TEST_P(ProgramInterfaceTestES31, GetBufferVariableProperties)
>         "    gl_Position = vec4(instanceName1[0].f1, s1[0].a);\n"
>         "}\n";
> 
>-    const std::string &fragmentShaderSource =
>+    constexpr char kFS[] =
>         "#version 310 es\n"
>         "precision highp float;\n"
>         "layout(binding = 1) buffer blockName1 {\n"
>@@ -618,7 +630,7 @@ TEST_P(ProgramInterfaceTestES31, GetBufferVariableProperties)
>         "    oColor = vec4(instanceName1[0].f1, 0, 0, 1);\n"
>         "}";
> 
>-    ANGLE_GL_PROGRAM(program, vertexShaderSource, fragmentShaderSource);
>+    ANGLE_GL_PROGRAM(program, kVS, kFS);
> 
>     GLuint index = glGetProgramResourceIndex(program, GL_BUFFER_VARIABLE, "blockName1.f1");
>     EXPECT_GL_NO_ERROR();
>@@ -660,10 +672,9 @@ TEST_P(ProgramInterfaceTestES31, GetBufferVariableProperties)
>     EXPECT_EQ(14, params[5]);  // name_length
>     EXPECT_LE(0, params[6]);   // offset
> 
>-    // TODO(jiajia.qin@intel.com): Enable them once the block member staticUse are implemented.
>-    // EXPECT_EQ(1, params[7]);  // referenced_by_vertex_shader
>-    // EXPECT_EQ(1, params[8]);  // referenced_by_fragment_shader
>-    // EXPECT_EQ(0, params[9]);  // referenced_by_compute_shader
>+    EXPECT_EQ(1, params[7]);  // referenced_by_vertex_shader
>+    EXPECT_EQ(1, params[8]);  // referenced_by_fragment_shader
>+    EXPECT_EQ(0, params[9]);  // referenced_by_compute_shader
> 
>     EXPECT_EQ(1, params[10]);  // top_level_array_size
>     EXPECT_LE(0, params[11]);  // top_level_array_stride
>@@ -691,10 +702,9 @@ TEST_P(ProgramInterfaceTestES31, GetBufferVariableProperties)
>     EXPECT_EQ(8, params[5]);  // name_length
>     EXPECT_LE(0, params[6]);  // offset
> 
>-    // TODO(jiajia.qin@intel.com): Enable them once the block member staticUse are implemented.
>-    // EXPECT_EQ(1, params[7]);  // referenced_by_vertex_shader
>-    // EXPECT_EQ(0, params[8]);  // referenced_by_fragment_shader
>-    // EXPECT_EQ(0, params[9]);  // referenced_by_compute_shader
>+    EXPECT_EQ(1, params[7]);  // referenced_by_vertex_shader
>+    EXPECT_EQ(0, params[8]);  // referenced_by_fragment_shader
>+    EXPECT_EQ(0, params[9]);  // referenced_by_compute_shader
> 
>     EXPECT_EQ(2, params[10]);   // top_level_array_size
>     EXPECT_EQ(80, params[11]);  // top_level_array_stride
>@@ -702,10 +712,239 @@ TEST_P(ProgramInterfaceTestES31, GetBufferVariableProperties)
>     EXPECT_EQ(GL_FLOAT_VEC3, params[12]);  // type
> }
> 
>+// Tests the resource property querying for buffer variable in std430 SSBO works correctly.
>+TEST_P(ProgramInterfaceTestES31, GetStd430BufferVariableProperties)
>+{
>+    ANGLE_SKIP_TEST_IF(IsAMD() && IsWindows() && IsOpenGL());
>+
>+    constexpr char kComputeShaderSource[] =
>+        R"(#version 310 es
>+layout(local_size_x=1, local_size_y=1, local_size_z=1) in;
>+struct S
>+{
>+    uvec2 v;
>+    mat2 m;
>+};
>+layout(std430, binding = 0) buffer blockIn {
>+    uint u;
>+    uint a[2];
>+    S s;
>+} instanceIn;
>+layout(std430, binding = 1) buffer blockOut {
>+    uint u;
>+    uint a[2];
>+    S s;
>+} instanceOut;
>+void main()
>+{
>+    instanceOut.u = instanceIn.u;
>+    instanceOut.a[0] = instanceIn.a[0];
>+    instanceOut.a[1] = instanceIn.a[1];
>+    instanceOut.s.v = instanceIn.s.v;
>+    instanceOut.s.m = instanceIn.s.m;
>+}
>+)";
>+
>+    ANGLE_GL_COMPUTE_PROGRAM(program, kComputeShaderSource);
>+
>+    GLuint index = glGetProgramResourceIndex(program, GL_BUFFER_VARIABLE, "blockIn.a");
>+    EXPECT_GL_NO_ERROR();
>+    EXPECT_NE(GL_INVALID_INDEX, index);
>+
>+    GLchar name[64];
>+    GLsizei length;
>+    glGetProgramResourceName(program, GL_BUFFER_VARIABLE, index, sizeof(name), &length, name);
>+    EXPECT_GL_NO_ERROR();
>+    EXPECT_EQ(12, length);
>+    EXPECT_EQ("blockIn.a[0]", std::string(name));
>+
>+    GLenum props[]         = {GL_ARRAY_SIZE,
>+                      GL_ARRAY_STRIDE,
>+                      GL_BLOCK_INDEX,
>+                      GL_IS_ROW_MAJOR,
>+                      GL_MATRIX_STRIDE,
>+                      GL_NAME_LENGTH,
>+                      GL_OFFSET,
>+                      GL_REFERENCED_BY_VERTEX_SHADER,
>+                      GL_REFERENCED_BY_FRAGMENT_SHADER,
>+                      GL_REFERENCED_BY_COMPUTE_SHADER,
>+                      GL_TOP_LEVEL_ARRAY_SIZE,
>+                      GL_TOP_LEVEL_ARRAY_STRIDE,
>+                      GL_TYPE};
>+    GLsizei propCount      = static_cast<GLsizei>(ArraySize(props));
>+    constexpr int kBufSize = 256;
>+    GLint params[kBufSize];
>+
>+    glGetProgramResourceiv(program, GL_BUFFER_VARIABLE, index, propCount, props, kBufSize, &length,
>+                           params);
>+    EXPECT_GL_NO_ERROR();
>+    EXPECT_EQ(propCount, length);
>+    EXPECT_EQ(2, params[0]);   // array_size
>+    EXPECT_LE(4, params[1]);   // array_stride
>+    EXPECT_LE(0, params[2]);   // block_index
>+    EXPECT_EQ(0, params[3]);   // is_row_major
>+    EXPECT_EQ(0, params[4]);   // matrix_stride
>+    EXPECT_EQ(13, params[5]);  // name_length
>+    EXPECT_EQ(4, params[6]);   // offset
>+
>+    EXPECT_EQ(0, params[7]);  // referenced_by_vertex_shader
>+    EXPECT_EQ(0, params[8]);  // referenced_by_fragment_shader
>+    EXPECT_EQ(1, params[9]);  // referenced_by_compute_shader
>+
>+    EXPECT_EQ(1, params[10]);                // top_level_array_size
>+    EXPECT_EQ(0, params[11]);                // top_level_array_stride
>+    EXPECT_EQ(GL_UNSIGNED_INT, params[12]);  // type
>+
>+    index = glGetProgramResourceIndex(program, GL_BUFFER_VARIABLE, "blockIn.s.m");
>+    EXPECT_GL_NO_ERROR();
>+    EXPECT_NE(GL_INVALID_INDEX, index);
>+
>+    glGetProgramResourceName(program, GL_BUFFER_VARIABLE, index, sizeof(name), &length, name);
>+    EXPECT_GL_NO_ERROR();
>+    EXPECT_EQ(11, length);
>+    EXPECT_EQ("blockIn.s.m", std::string(name));
>+
>+    glGetProgramResourceiv(program, GL_BUFFER_VARIABLE, index, propCount, props, kBufSize, &length,
>+                           params);
>+    EXPECT_GL_NO_ERROR();
>+    EXPECT_EQ(propCount, length);
>+    EXPECT_EQ(1, params[0]);   // array_size
>+    EXPECT_LE(0, params[1]);   // array_stride
>+    EXPECT_LE(0, params[2]);   // block_index
>+    EXPECT_EQ(0, params[3]);   // is_row_major
>+    EXPECT_EQ(8, params[4]);   // matrix_stride
>+    EXPECT_EQ(12, params[5]);  // name_length
>+    EXPECT_EQ(24, params[6]);  // offset
>+
>+    EXPECT_EQ(0, params[7]);  // referenced_by_vertex_shader
>+    EXPECT_EQ(0, params[8]);  // referenced_by_fragment_shader
>+    // TODO(jiajia.qin@intel.com): referenced_by_compute_shader is not
>+    // correctly handled. http://anglebug.com/1920.
>+    // EXPECT_EQ(1, params[9]);   // referenced_by_compute_shader
>+
>+    EXPECT_EQ(1, params[10]);              // top_level_array_size
>+    EXPECT_EQ(0, params[11]);              // top_level_array_stride
>+    EXPECT_EQ(GL_FLOAT_MAT2, params[12]);  // type
>+}
>+
>+// Test that TOP_LEVEL_ARRAY_STRIDE for buffer variable with aggregate type works correctly.
>+TEST_P(ProgramInterfaceTestES31, TopLevelArrayStrideWithAggregateType)
>+{
>+    constexpr char kComputeShaderSource[] =
>+        R"(#version 310 es
>+layout(local_size_x=1, local_size_y=1, local_size_z=1) in;
>+struct S
>+{
>+    uvec2 v;
>+    mat2 m;
>+};
>+layout(std430, binding = 0) buffer blockIn {
>+    uint u;
>+    uint a[2];
>+    S s;
>+} instanceIn;
>+layout(std430, binding = 1) buffer blockOut {
>+    uint u;
>+    uint a[4][3];
>+    S s[3][2];
>+} instanceOut;
>+void main()
>+{
>+    instanceOut.u = instanceIn.u;
>+    instanceOut.a[0][0] = instanceIn.a[0];
>+    instanceOut.a[0][1] = instanceIn.a[1];
>+    instanceOut.s[0][0].v = instanceIn.s.v;
>+    instanceOut.s[0][0].m = instanceIn.s.m;
>+}
>+)";
>+
>+    ANGLE_GL_COMPUTE_PROGRAM(program, kComputeShaderSource);
>+
>+    GLuint index = glGetProgramResourceIndex(program, GL_BUFFER_VARIABLE, "blockOut.s[0][0].m");
>+    EXPECT_GL_NO_ERROR();
>+    EXPECT_NE(GL_INVALID_INDEX, index);
>+
>+    GLchar name[64];
>+    GLsizei length;
>+    glGetProgramResourceName(program, GL_BUFFER_VARIABLE, index, sizeof(name), &length, name);
>+    EXPECT_GL_NO_ERROR();
>+    EXPECT_EQ(18, length);
>+    EXPECT_EQ("blockOut.s[0][0].m", std::string(name));
>+
>+    GLenum props[]         = {GL_ARRAY_SIZE,
>+                      GL_ARRAY_STRIDE,
>+                      GL_BLOCK_INDEX,
>+                      GL_IS_ROW_MAJOR,
>+                      GL_MATRIX_STRIDE,
>+                      GL_NAME_LENGTH,
>+                      GL_OFFSET,
>+                      GL_REFERENCED_BY_VERTEX_SHADER,
>+                      GL_REFERENCED_BY_FRAGMENT_SHADER,
>+                      GL_REFERENCED_BY_COMPUTE_SHADER,
>+                      GL_TOP_LEVEL_ARRAY_SIZE,
>+                      GL_TOP_LEVEL_ARRAY_STRIDE,
>+                      GL_TYPE};
>+    GLsizei propCount      = static_cast<GLsizei>(ArraySize(props));
>+    constexpr int kBufSize = 256;
>+    GLint params[kBufSize];
>+    glGetProgramResourceiv(program, GL_BUFFER_VARIABLE, index, propCount, props, kBufSize, &length,
>+                           params);
>+    EXPECT_GL_NO_ERROR();
>+    EXPECT_EQ(propCount, length);
>+    EXPECT_EQ(1, params[0]);   // array_size
>+    EXPECT_LE(0, params[1]);   // array_stride
>+    EXPECT_LE(0, params[2]);   // block_index
>+    EXPECT_EQ(0, params[3]);   // is_row_major
>+    EXPECT_EQ(8, params[4]);   // matrix_stride
>+    EXPECT_EQ(19, params[5]);  // name_length
>+    EXPECT_EQ(64, params[6]);  // offset
>+
>+    EXPECT_EQ(0, params[7]);  // referenced_by_vertex_shader
>+    EXPECT_EQ(0, params[8]);  // referenced_by_fragment_shader
>+    // TODO(jiajia.qin@intel.com): referenced_by_compute_shader is not
>+    // correctly handled. http://anglebug.com/1920.
>+    // EXPECT_EQ(1, params[9]);   // referenced_by_compute_shader
>+    EXPECT_EQ(3, params[10]);              // top_level_array_size
>+    EXPECT_EQ(48, params[11]);             // top_level_array_stride
>+    EXPECT_EQ(GL_FLOAT_MAT2, params[12]);  // type
>+
>+    index = glGetProgramResourceIndex(program, GL_BUFFER_VARIABLE, "blockOut.a[0][0]");
>+    EXPECT_GL_NO_ERROR();
>+    EXPECT_NE(GL_INVALID_INDEX, index);
>+
>+    glGetProgramResourceName(program, GL_BUFFER_VARIABLE, index, sizeof(name), &length, name);
>+    EXPECT_GL_NO_ERROR();
>+    EXPECT_EQ(16, length);
>+    EXPECT_EQ("blockOut.a[0][0]", std::string(name));
>+
>+    glGetProgramResourceiv(program, GL_BUFFER_VARIABLE, index, propCount, props, kBufSize, &length,
>+                           params);
>+    EXPECT_GL_NO_ERROR();
>+    EXPECT_EQ(propCount, length);
>+    EXPECT_EQ(3, params[0]);   // array_size
>+    EXPECT_LE(0, params[1]);   // array_stride
>+    EXPECT_LE(0, params[2]);   // block_index
>+    EXPECT_EQ(0, params[3]);   // is_row_major
>+    EXPECT_EQ(0, params[4]);   // matrix_stride
>+    EXPECT_EQ(17, params[5]);  // name_length
>+    EXPECT_EQ(4, params[6]);   // offset
>+
>+    EXPECT_EQ(0, params[7]);                 // referenced_by_vertex_shader
>+    EXPECT_EQ(0, params[8]);                 // referenced_by_fragment_shader
>+    EXPECT_EQ(1, params[9]);                 // referenced_by_compute_shader
>+    EXPECT_EQ(4, params[10]);                // top_level_array_size
>+    EXPECT_EQ(12, params[11]);               // top_level_array_stride
>+    EXPECT_EQ(GL_UNSIGNED_INT, params[12]);  // type
>+}
>+
> // Tests the resource property query for shader storage block can be done correctly.
> TEST_P(ProgramInterfaceTestES31, GetShaderStorageBlockProperties)
> {
>-    const std::string &vertexShaderSource =
>+    // TODO(jiajia.qin@intel.com): Don't skip this test once non-simple SSBO sentences are supported
>+    // on d3d backend. http://anglebug.com/1951
>+    ANGLE_SKIP_TEST_IF(IsD3D11());
>+
>+    constexpr char kVS[] =
>         "#version 310 es\n"
>         "precision highp float;\n"
>         "struct S {\n"
>@@ -731,7 +970,7 @@ TEST_P(ProgramInterfaceTestES31, GetShaderStorageBlockProperties)
>         "    gl_Position = vec4(instanceName1[0].f1, s1[0].a);\n"
>         "}\n";
> 
>-    const std::string &fragmentShaderSource =
>+    constexpr char kFS[] =
>         "#version 310 es\n"
>         "precision highp float;\n"
>         "uniform vec4 color;\n"
>@@ -741,7 +980,7 @@ TEST_P(ProgramInterfaceTestES31, GetShaderStorageBlockProperties)
>         "    oColor = color;\n"
>         "}";
> 
>-    ANGLE_GL_PROGRAM(program, vertexShaderSource, fragmentShaderSource);
>+    ANGLE_GL_PROGRAM(program, kVS, kFS);
> 
>     GLuint index = glGetProgramResourceIndex(program, GL_SHADER_STORAGE_BLOCK, "blockName0");
>     EXPECT_GL_NO_ERROR();
>@@ -795,6 +1034,167 @@ TEST_P(ProgramInterfaceTestES31, GetShaderStorageBlockProperties)
>     EXPECT_EQ("blockName1[0]", std::string(name));
> }
> 
>-ANGLE_INSTANTIATE_TEST(ProgramInterfaceTestES31, ES31_OPENGL(), ES31_OPENGLES());
>+// Tests querying the program resources of atomic counter buffers.
>+TEST_P(ProgramInterfaceTestES31, GetAtomicCounterProperties)
>+{
>+    constexpr char kCSSource[] = R"(#version 310 es
>+layout(local_size_x=1, local_size_y=1, local_size_z=1) in;
>+layout(binding = 0) uniform atomic_uint acbase;
>+layout(binding = 0, offset = 8) uniform atomic_uint ac[1];
>+layout(binding = 0) uniform atomic_uint ac2;
>+
>+void main()
>+{
>+    atomicCounter(acbase);
>+    atomicCounter(ac[0]);
>+    atomicCounter(ac2);
>+})";
>+
>+    ANGLE_GL_COMPUTE_PROGRAM(program, kCSSource);
>+
>+    GLuint index = glGetProgramResourceIndex(program, GL_UNIFORM, "ac");
>+    EXPECT_GL_NO_ERROR();
>+    EXPECT_NE(GL_INVALID_INDEX, index);
>+
>+    GLenum props[]    = {GL_ATOMIC_COUNTER_BUFFER_INDEX};
>+    GLsizei propCount = static_cast<GLsizei>(ArraySize(props));
>+    GLint atomicIndex;
>+    GLsizei length;
>+
>+    glGetProgramResourceiv(program, GL_UNIFORM, index, propCount, props, 1, &length, &atomicIndex);
>+    EXPECT_GL_NO_ERROR();
>+    EXPECT_EQ(1, length);
>+    EXPECT_LE(0, atomicIndex);
>+
>+    GLenum atomicProps[] = {GL_ACTIVE_VARIABLES,
>+                            GL_BUFFER_BINDING,
>+                            GL_NUM_ACTIVE_VARIABLES,
>+                            GL_BUFFER_DATA_SIZE,
>+                            GL_REFERENCED_BY_VERTEX_SHADER,
>+                            GL_REFERENCED_BY_FRAGMENT_SHADER,
>+                            GL_REFERENCED_BY_COMPUTE_SHADER};
>+
>+    GLsizei atomicPropsCount = static_cast<GLsizei>(ArraySize(atomicProps));
>+    constexpr int kBufSize   = 256;
>+    GLint params[kBufSize];
>+    GLsizei length2;
>+
>+    glGetProgramResourceiv(program, GL_ATOMIC_COUNTER_BUFFER, atomicIndex, atomicPropsCount,
>+                           atomicProps, kBufSize, &length2, params);
>+    EXPECT_GL_NO_ERROR();
>+    EXPECT_EQ(9, length2);
>+
>+    EXPECT_LE(0, params[0]);   // active_variables acbase
>+    EXPECT_LE(0, params[1]);   // active_variables ac[1]
>+    EXPECT_LE(0, params[2]);   // active_variables ac2
>+    EXPECT_EQ(0, params[3]);   // buffer_binding
>+    EXPECT_EQ(3, params[4]);   // num_active_variables
>+    EXPECT_EQ(16, params[5]);  // buffer_data_size
>+
>+    EXPECT_EQ(0, params[6]);  // referenced_by_vertex_shader
>+    EXPECT_EQ(0, params[7]);  // referenced_by_fragment_shader
>+    EXPECT_EQ(1, params[8]);  // referenced_by_compute_shader
>+}
>+
>+// Tests transform feedback varying qeury works correctly.
>+TEST_P(ProgramInterfaceTestES31, QueryTransformFeedbackVarying)
>+{
>+    constexpr char kVS[] = R"(#version 310 es
>+in vec3 position;
>+out float outSingleType;
>+out vec2 outWholeArray[2];
>+out vec3 outArrayElements[16];
>+void main() {
>+    outSingleType = 0.0;
>+    outWholeArray[0] = vec2(position);
>+    outArrayElements[7] = vec3(0, 0, 0);
>+    outArrayElements[15] = position;
>+    gl_Position = vec4(position, 1);
>+})";
>+
>+    constexpr char kFS[] = R"(#version 310 es
>+precision mediump float;
>+out vec4 color;
>+in float outSingleType;
>+in vec2 outWholeArray[2];
>+in vec3 outArrayElements[16];
>+void main() {
>+    color = vec4(0);
>+})";
>+
>+    std::vector<std::string> tfVaryings;
>+    tfVaryings.push_back("outArrayElements[7]");
>+    tfVaryings.push_back("outArrayElements[15]");
>+    tfVaryings.push_back("outSingleType");
>+    tfVaryings.push_back("outWholeArray");
>+
>+    GLuint program =
>+        CompileProgramWithTransformFeedback(kVS, kFS, tfVaryings, GL_INTERLEAVED_ATTRIBS);
>+    ASSERT_NE(0u, program);
>+
>+    GLint num;
>+    glGetProgramInterfaceiv(program, GL_TRANSFORM_FEEDBACK_VARYING, GL_ACTIVE_RESOURCES, &num);
>+    EXPECT_GL_NO_ERROR();
>+    EXPECT_EQ(4, num);
>+
>+    glGetProgramInterfaceiv(program, GL_TRANSFORM_FEEDBACK_VARYING, GL_MAX_NAME_LENGTH, &num);
>+    EXPECT_GL_NO_ERROR();
>+    EXPECT_EQ(21, num);  // outArrayElements[15]
>+
>+    // GLES 3.10, Page 77:
>+    // For TRANSFORM_FEEDBACK_VARYING, the active resource list will use the variable order
>+    // specified in the most recent call to TransformFeedbackVaryings before the last call to
>+    // LinkProgram.
>+    GLuint index =
>+        glGetProgramResourceIndex(program, GL_TRANSFORM_FEEDBACK_VARYING, "outArrayElements[7]");
>+    EXPECT_GL_NO_ERROR();
>+    EXPECT_EQ(0u, index);
>+    index =
>+        glGetProgramResourceIndex(program, GL_TRANSFORM_FEEDBACK_VARYING, "outArrayElements[15]");
>+    EXPECT_GL_NO_ERROR();
>+    EXPECT_EQ(1u, index);
>+    index = glGetProgramResourceIndex(program, GL_TRANSFORM_FEEDBACK_VARYING, "outSingleType");
>+    EXPECT_GL_NO_ERROR();
>+    EXPECT_EQ(2u, index);
>+    index = glGetProgramResourceIndex(program, GL_TRANSFORM_FEEDBACK_VARYING, "outWholeArray");
>+    EXPECT_GL_NO_ERROR();
>+    EXPECT_EQ(3u, index);
>+
>+    // GLES 3.10, Page 80:
>+    // For TRANSFORM_FEEDBACK_VARYING resources, name must match one of the variables to be captured
>+    // as specified by a previous call to TransformFeedbackVaryings. Otherwise, INVALID_INDEX is
>+    // returned.
>+    // If name does not match a resource as described above, the value INVALID_INDEX is returned,
>+    // but no GL error is generated.
>+    index = glGetProgramResourceIndex(program, GL_TRANSFORM_FEEDBACK_VARYING, "outWholeArray[0]");
>+    EXPECT_GL_NO_ERROR();
>+    EXPECT_EQ(GL_INVALID_INDEX, index);
>+
>+    GLenum props[]    = {GL_TYPE, GL_ARRAY_SIZE, GL_NAME_LENGTH};
>+    GLsizei propCount = static_cast<GLsizei>(ArraySize(props));
>+    GLint params[ArraySize(props)];
>+    GLsizei length = 0;
>+    // Query properties of 'outArrayElements[15]'.
>+    glGetProgramResourceiv(program, GL_TRANSFORM_FEEDBACK_VARYING, 1, propCount, props, propCount,
>+                           &length, params);
>+    EXPECT_GL_NO_ERROR();
>+    EXPECT_EQ(propCount, length);
>+    EXPECT_EQ(GL_FLOAT_VEC3, params[0]);  // type
>+    EXPECT_EQ(1, params[1]);              // array_size
>+    EXPECT_EQ(21, params[2]);             // name_length
>+
>+    // Query properties of 'outWholeArray'.
>+    glGetProgramResourceiv(program, GL_TRANSFORM_FEEDBACK_VARYING, 3, propCount, props, propCount,
>+                           &length, params);
>+    EXPECT_GL_NO_ERROR();
>+    EXPECT_EQ(propCount, length);
>+    EXPECT_EQ(GL_FLOAT_VEC2, params[0]);  // type
>+    EXPECT_EQ(2, params[1]);              // array_size
>+    EXPECT_EQ(14, params[2]);             // name_length
>+
>+    glDeleteProgram(program);
>+}
>+
>+ANGLE_INSTANTIATE_TEST(ProgramInterfaceTestES31, ES31_OPENGL(), ES31_OPENGLES(), ES31_D3D11());
> 
> }  // anonymous namespace
>diff --git a/Source/ThirdParty/ANGLE/src/tests/gl_tests/ProgramParameterTest.cpp b/Source/ThirdParty/ANGLE/src/tests/gl_tests/ProgramParameterTest.cpp
>index 18a1a6f9cc7..fe6c88eae6f 100644
>--- a/Source/ThirdParty/ANGLE/src/tests/gl_tests/ProgramParameterTest.cpp
>+++ b/Source/ThirdParty/ANGLE/src/tests/gl_tests/ProgramParameterTest.cpp
>@@ -78,4 +78,4 @@ ANGLE_INSTANTIATE_TEST(ProgramParameterTest,
>                        ES31_OPENGLES(),
>                        ES31_D3D11());
> ANGLE_INSTANTIATE_TEST(ProgramParameterTestES31, ES31_OPENGL(), ES31_OPENGLES(), ES31_D3D11());
>-}
>+}  // namespace
>diff --git a/Source/ThirdParty/ANGLE/src/tests/gl_tests/ProgramPipelineTest.cpp b/Source/ThirdParty/ANGLE/src/tests/gl_tests/ProgramPipelineTest.cpp
>index 059b5038e06..ae4f6cd4926 100644
>--- a/Source/ThirdParty/ANGLE/src/tests/gl_tests/ProgramPipelineTest.cpp
>+++ b/Source/ThirdParty/ANGLE/src/tests/gl_tests/ProgramPipelineTest.cpp
>@@ -48,8 +48,7 @@ TEST_P(ProgramPipelineTest, GenerateProgramPipelineObject)
> }
> 
> class ProgramPipelineTest31 : public ProgramPipelineTest
>-{
>-};
>+{};
> 
> // Test generate or delete program pipeline.
> TEST_P(ProgramPipelineTest31, GenOrDeleteProgramPipelineTest)
>@@ -88,21 +87,21 @@ TEST_P(ProgramPipelineTest31, BindProgramPipelineTest)
> // Test IsProgramPipeline
> TEST_P(ProgramPipelineTest31, IsProgramPipelineTest)
> {
>-    EXPECT_EQ(GL_FALSE, glIsProgramPipeline(0));
>+    EXPECT_GL_FALSE(glIsProgramPipeline(0));
>     EXPECT_GL_NO_ERROR();
> 
>-    EXPECT_EQ(GL_FALSE, glIsProgramPipeline(2));
>+    EXPECT_GL_FALSE(glIsProgramPipeline(2));
>     EXPECT_GL_NO_ERROR();
> 
>     GLuint pipeline;
>     glGenProgramPipelines(1, &pipeline);
>     glBindProgramPipeline(pipeline);
>-    EXPECT_EQ(GL_TRUE, glIsProgramPipeline(pipeline));
>+    EXPECT_GL_TRUE(glIsProgramPipeline(pipeline));
>     EXPECT_GL_NO_ERROR();
> 
>     glBindProgramPipeline(0);
>     glDeleteProgramPipelines(1, &pipeline);
>-    EXPECT_EQ(GL_FALSE, glIsProgramPipeline(pipeline));
>+    EXPECT_GL_FALSE(glIsProgramPipeline(pipeline));
>     EXPECT_GL_NO_ERROR();
> }
> 
>diff --git a/Source/ThirdParty/ANGLE/src/tests/gl_tests/ProvokingVertexTest.cpp b/Source/ThirdParty/ANGLE/src/tests/gl_tests/ProvokingVertexTest.cpp
>index 15c4c9dfec6..148aa2186f7 100644
>--- a/Source/ThirdParty/ANGLE/src/tests/gl_tests/ProvokingVertexTest.cpp
>+++ b/Source/ThirdParty/ANGLE/src/tests/gl_tests/ProvokingVertexTest.cpp
>@@ -40,7 +40,7 @@ class ProvokingVertexTest : public ANGLETest
>     {
>         ANGLETest::SetUp();
> 
>-        const std::string &vertexShader =
>+        constexpr char kVS[] =
>             "#version 300 es\n"
>             "in int intAttrib;\n"
>             "in vec2 position;\n"
>@@ -50,7 +50,7 @@ class ProvokingVertexTest : public ANGLETest
>             "  attrib = intAttrib;\n"
>             "}";
> 
>-        const std::string &fragmentShader =
>+        constexpr char kFS[] =
>             "#version 300 es\n"
>             "flat in int attrib;\n"
>             "out int fragColor;\n"
>@@ -60,8 +60,7 @@ class ProvokingVertexTest : public ANGLETest
> 
>         std::vector<std::string> tfVaryings;
>         tfVaryings.push_back("attrib");
>-        mProgram = CompileProgramWithTransformFeedback(vertexShader, fragmentShader, tfVaryings,
>-                                                       GL_SEPARATE_ATTRIBS);
>+        mProgram = CompileProgramWithTransformFeedback(kVS, kFS, tfVaryings, GL_SEPARATE_ATTRIBS);
>         ASSERT_NE(0u, mProgram);
> 
>         glGenTextures(1, &mTexture);
>@@ -140,14 +139,8 @@ TEST_P(ProvokingVertexTest, FlatTriangle)
> // Ensure that any provoking vertex shenanigans still gives correct vertex streams.
> TEST_P(ProvokingVertexTest, FlatTriWithTransformFeedback)
> {
>-// TODO(cwallez) figure out why it is broken on AMD on Mac
>-#if defined(ANGLE_PLATFORM_APPLE)
>-    if (IsAMD())
>-    {
>-        std::cout << "Test skipped on AMD on Mac." << std::endl;
>-        return;
>-    }
>-#endif
>+    // TODO(cwallez) figure out why it is broken on AMD on Mac
>+    ANGLE_SKIP_TEST_IF(IsOSX() && IsAMD());
> 
>     glGenTransformFeedbacks(1, &mTransformFeedback);
>     glBindTransformFeedback(GL_TRANSFORM_FEEDBACK, mTransformFeedback);
>@@ -255,11 +248,7 @@ TEST_P(ProvokingVertexTest, FlatTriStrip)
> TEST_P(ProvokingVertexTest, FlatTriStripPrimitiveRestart)
> {
>     // TODO(jmadill): Implement on the D3D back-end.
>-    if (IsD3D11())
>-    {
>-        std::cout << "Test disabled on D3D11." << std::endl;
>-        return;
>-    }
>+    ANGLE_SKIP_TEST_IF(IsD3D11());
> 
>     GLint indexData[]      = {0, 1, 2, -1, 1, 2, 3, 4, -1, 3, 4, 5};
>     GLint vertexData[]     = {1, 2, 3, 4, 5, 6};
>@@ -311,6 +300,48 @@ TEST_P(ProvokingVertexTest, FlatTriStripPrimitiveRestart)
>     }
> }
> 
>+// Test with FRONT_CONVENTION if we have ANGLE_provoking_vertex.
>+TEST_P(ProvokingVertexTest, ANGLEProvokingVertex)
>+{
>+    int32_t vertexData[] = {1, 2, 3};
>+    float positionData[] = {-1.0f, -1.0f, 3.0f, -1.0f, -1.0f, 3.0f};
>+
>+    glEnableVertexAttribArray(mIntAttribLocation);
>+    glVertexAttribIPointer(mIntAttribLocation, 1, GL_INT, 0, vertexData);
>+
>+    GLint positionLocation = glGetAttribLocation(mProgram, "position");
>+    glEnableVertexAttribArray(positionLocation);
>+    glVertexAttribPointer(positionLocation, 2, GL_FLOAT, GL_FALSE, 0, positionData);
>+
>+    glUseProgram(mProgram);
>+    ASSERT_GL_NO_ERROR();
>+
>+    const auto &fnExpectId = [&](int id) {
>+        const int32_t zero[4] = {};
>+        glClearBufferiv(GL_COLOR, 0, zero);
>+        glDrawArrays(GL_TRIANGLES, 0, 3);
>+
>+        int32_t pixelValue = 0;
>+        glReadPixels(0, 0, 1, 1, GL_RED_INTEGER, GL_INT, &pixelValue);
>+
>+        ASSERT_GL_NO_ERROR();
>+        EXPECT_EQ(vertexData[id], pixelValue);
>+    };
>+
>+    fnExpectId(2);
>+
>+    const bool hasExt = IsGLExtensionEnabled("GL_ANGLE_provoking_vertex");
>+    if (IsD3D11())
>+    {
>+        EXPECT_TRUE(hasExt);
>+    }
>+    if (hasExt)
>+    {
>+        glProvokingVertexANGLE(GL_FIRST_VERTEX_CONVENTION);
>+        fnExpectId(0);
>+    }
>+}
>+
> ANGLE_INSTANTIATE_TEST(ProvokingVertexTest, ES3_D3D11(), ES3_OPENGL(), ES3_OPENGLES());
> 
> }  // anonymous namespace
>diff --git a/Source/ThirdParty/ANGLE/src/tests/gl_tests/ReadPixelsTest.cpp b/Source/ThirdParty/ANGLE/src/tests/gl_tests/ReadPixelsTest.cpp
>index 802f5d94159..649ef3b7788 100644
>--- a/Source/ThirdParty/ANGLE/src/tests/gl_tests/ReadPixelsTest.cpp
>+++ b/Source/ThirdParty/ANGLE/src/tests/gl_tests/ReadPixelsTest.cpp
>@@ -11,7 +11,7 @@
> 
> #include <array>
> 
>-#include "random_utils.h"
>+#include "util/random_utils.h"
> 
> using namespace angle;
> 
>@@ -36,11 +36,7 @@ class ReadPixelsTest : public ANGLETest
> TEST_P(ReadPixelsTest, OutOfBounds)
> {
>     // TODO: re-enable once root cause of http://anglebug.com/1413 is fixed
>-    if (IsAndroid() && IsAdreno() && IsOpenGLES())
>-    {
>-        std::cout << "Test skipped on Adreno OpenGLES on Android." << std::endl;
>-        return;
>-    }
>+    ANGLE_SKIP_TEST_IF(IsAndroid() && IsAdreno() && IsOpenGLES());
> 
>     glClearColor(1.0f, 0.0f, 0.0f, 1.0f);
>     glClear(GL_COLOR_BUFFER_BIT);
>@@ -188,11 +184,7 @@ TEST_P(ReadPixelsPBOTest, ArrayBufferTarget)
> TEST_P(ReadPixelsPBOTest, ExistingDataPreserved)
> {
>     // TODO(geofflang): Figure out why this fails on AMD OpenGL (http://anglebug.com/1291)
>-    if (IsAMD() && getPlatformRenderer() == EGL_PLATFORM_ANGLE_TYPE_OPENGL_ANGLE)
>-    {
>-        std::cout << "Test disabled on AMD OpenGL." << std::endl;
>-        return;
>-    }
>+    ANGLE_SKIP_TEST_IF(IsAMD() && IsOpenGL());
> 
>     // Clear backbuffer to red
>     glClearColor(1.0f, 0.0f, 0.0f, 1.0f);
>@@ -257,7 +249,7 @@ TEST_P(ReadPixelsPBOTest, SubDataPreservesContents)
> TEST_P(ReadPixelsPBOTest, SubDataOffsetPreservesContents)
> {
>     // anglebug.com/1415
>-    ANGLE_SKIP_TEST_IF(IsAndroid() && IsAdreno() && IsOpenGLES());
>+    ANGLE_SKIP_TEST_IF((IsNexus5X() || IsNexus6P()) && IsAdreno() && IsOpenGLES());
>     // anglebug.com/2185
>     ANGLE_SKIP_TEST_IF(IsOSX() && IsNVIDIA() && IsDesktopOpenGL());
> 
>@@ -294,7 +286,7 @@ class ReadPixelsPBODrawTest : public ReadPixelsPBOTest
>     {
>         ReadPixelsPBOTest::SetUp();
> 
>-        const char *vertexShaderSrc =
>+        constexpr char kVS[] =
>             "attribute vec4 aTest; attribute vec2 aPosition; varying vec4 vTest;\n"
>             "void main()\n"
>             "{\n"
>@@ -303,14 +295,14 @@ class ReadPixelsPBODrawTest : public ReadPixelsPBOTest
>             "    gl_PointSize = 1.0;\n"
>             "}";
> 
>-        const char *fragmentShaderSrc =
>+        constexpr char kFS[] =
>             "precision mediump float; varying vec4 vTest;\n"
>             "void main()\n"
>             "{\n"
>             "    gl_FragColor = vTest;\n"
>             "}";
> 
>-        mProgram = CompileProgram(vertexShaderSrc, fragmentShaderSrc);
>+        mProgram = CompileProgram(kVS, kFS);
>         ASSERT_NE(0u, mProgram);
> 
>         glGenBuffers(1, &mPositionVBO);
>@@ -420,7 +412,7 @@ class ReadPixelsMultisampleTest : public ReadPixelsTest
> // Test ReadPixels from a multisampled framebuffer.
> TEST_P(ReadPixelsMultisampleTest, BasicClear)
> {
>-    if (getClientMajorVersion() < 3 && !extensionEnabled("GL_ANGLE_framebuffer_multisample"))
>+    if (getClientMajorVersion() < 3 && !IsGLExtensionEnabled("GL_ANGLE_framebuffer_multisample"))
>     {
>         std::cout
>             << "Test skipped because ES3 or GL_ANGLE_framebuffer_multisample is not available."
>@@ -428,7 +420,7 @@ TEST_P(ReadPixelsMultisampleTest, BasicClear)
>         return;
>     }
> 
>-    if (extensionEnabled("GL_ANGLE_framebuffer_multisample"))
>+    if (IsGLExtensionEnabled("GL_ANGLE_framebuffer_multisample"))
>     {
>         glRenderbufferStorageMultisampleANGLE(GL_RENDERBUFFER, 2, GL_RGBA8, 4, 4);
>     }
>@@ -719,7 +711,7 @@ TEST_P(ReadPixelsErrorTest, ReadBufferIsNone)
> 
> // Use this to select which configurations (e.g. which renderer, which GLES major version) these
> // tests should be run against.
>-ANGLE_INSTANTIATE_TEST(ReadPixelsTest, ES2_D3D11(), ES2_OPENGL(), ES2_OPENGLES());
>+ANGLE_INSTANTIATE_TEST(ReadPixelsTest, ES2_D3D11(), ES2_OPENGL(), ES2_OPENGLES(), ES2_VULKAN());
> ANGLE_INSTANTIATE_TEST(ReadPixelsPBOTest, ES3_D3D11(), ES3_OPENGL(), ES3_OPENGLES());
> ANGLE_INSTANTIATE_TEST(ReadPixelsPBODrawTest, ES3_D3D11(), ES3_OPENGL(), ES3_OPENGLES());
> ANGLE_INSTANTIATE_TEST(ReadPixelsMultisampleTest, ES3_D3D11(), ES3_OPENGL(), ES3_OPENGLES());
>diff --git a/Source/ThirdParty/ANGLE/src/tests/gl_tests/RenderbufferMultisampleTest.cpp b/Source/ThirdParty/ANGLE/src/tests/gl_tests/RenderbufferMultisampleTest.cpp
>new file mode 100644
>index 00000000000..688a958da31
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/tests/gl_tests/RenderbufferMultisampleTest.cpp
>@@ -0,0 +1,88 @@
>+//
>+// Copyright 2018 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+
>+// RenderbufferMultisampleTest: Tests of multisampled renderbuffer
>+
>+#include "test_utils/ANGLETest.h"
>+#include "test_utils/gl_raii.h"
>+
>+using namespace angle;
>+
>+namespace
>+{
>+
>+class RenderbufferMultisampleTest : public ANGLETest
>+{
>+  protected:
>+    RenderbufferMultisampleTest()
>+    {
>+        setWindowWidth(64);
>+        setWindowHeight(64);
>+        setConfigRedBits(8);
>+        setConfigGreenBits(8);
>+        setConfigBlueBits(8);
>+        setConfigAlphaBits(8);
>+    }
>+
>+    void SetUp() override
>+    {
>+        ANGLETest::SetUp();
>+
>+        glGenRenderbuffers(1, &mRenderbuffer);
>+
>+        ASSERT_GL_NO_ERROR();
>+    }
>+
>+    void TearDown() override
>+    {
>+        glDeleteRenderbuffers(1, &mRenderbuffer);
>+        mRenderbuffer = 0;
>+
>+        ANGLETest::TearDown();
>+    }
>+
>+    GLuint mRenderbuffer = 0;
>+};
>+
>+// In GLES 3.0, if internalformat is integer (signed or unsigned), to allocate multisample
>+// renderbuffer storage for that internalformat is not supported. An INVALID_OPERATION is
>+// generated. In GLES 3.1, it is OK to allocate multisample renderbuffer storage for interger
>+// internalformat, but the max samples should be less than MAX_INTEGER_SAMPLES.
>+// MAX_INTEGER_SAMPLES should be at least 1.
>+TEST_P(RenderbufferMultisampleTest, IntegerInternalformat)
>+{
>+    glBindRenderbuffer(GL_RENDERBUFFER, mRenderbuffer);
>+    glRenderbufferStorageMultisample(GL_RENDERBUFFER, 1, GL_RGBA8I, 64, 64);
>+    if (getClientMajorVersion() < 3 || getClientMinorVersion() < 1)
>+    {
>+        ASSERT_GL_ERROR(GL_INVALID_OPERATION);
>+    }
>+    else
>+    {
>+        ASSERT_GL_NO_ERROR();
>+
>+        GLint maxSamplesRGBA8I = 0;
>+        glGetInternalformativ(GL_RENDERBUFFER, GL_RGBA8I, GL_SAMPLES, 1, &maxSamplesRGBA8I);
>+        GLint maxIntegerSamples = 0;
>+        glGetIntegerv(GL_MAX_INTEGER_SAMPLES, &maxIntegerSamples);
>+        ASSERT_GL_NO_ERROR();
>+        EXPECT_GE(maxIntegerSamples, 1);
>+
>+        glRenderbufferStorageMultisample(GL_RENDERBUFFER, maxSamplesRGBA8I + 1, GL_RGBA8I, 64, 64);
>+        ASSERT_GL_ERROR(GL_INVALID_OPERATION);
>+        glRenderbufferStorageMultisample(GL_RENDERBUFFER, maxIntegerSamples + 1, GL_RGBA8I, 64, 64);
>+        ASSERT_GL_ERROR(GL_INVALID_OPERATION);
>+    }
>+}
>+
>+ANGLE_INSTANTIATE_TEST(RenderbufferMultisampleTest,
>+                       ES3_D3D11(),
>+                       ES3_OPENGL(),
>+                       ES3_OPENGLES(),
>+                       ES31_D3D11(),
>+                       ES31_OPENGL(),
>+                       ES31_OPENGLES());
>+}  // namespace
>diff --git a/Source/ThirdParty/ANGLE/src/tests/gl_tests/RendererTest.cpp b/Source/ThirdParty/ANGLE/src/tests/gl_tests/RendererTest.cpp
>index 310beb5de63..83e11b614bc 100644
>--- a/Source/ThirdParty/ANGLE/src/tests/gl_tests/RendererTest.cpp
>+++ b/Source/ThirdParty/ANGLE/src/tests/gl_tests/RendererTest.cpp
>@@ -4,9 +4,10 @@
> // found in the LICENSE file.
> //
> // RendererTest:
>-//   These tests are designed to ensure that the various configurations of the test fixtures work as expected.
>-//   If one of these tests fails, then it is likely that some of the other tests are being configured incorrectly.
>-//   For example, they might be using the D3D11 renderer when the test is meant to be using the D3D9 renderer.
>+//   These tests are designed to ensure that the various configurations of the test fixtures work as
>+//   expected. If one of these tests fails, then it is likely that some of the other tests are being
>+//   configured incorrectly. For example, they might be using the D3D11 renderer when the test is
>+//   meant to be using the D3D9 renderer.
> 
> #include "test_utils/ANGLETest.h"
> 
>@@ -27,12 +28,24 @@ class RendererTest : public ANGLETest
>     }
> };
> 
>+// Print vendor, renderer, version and extension strings. Useful for debugging.
>+TEST_P(RendererTest, Strings)
>+{
>+    std::cout << "Renderer: " << glGetString(GL_RENDERER) << std::endl;
>+    std::cout << "Vendor: " << glGetString(GL_VENDOR) << std::endl;
>+    std::cout << "Version: " << glGetString(GL_VERSION) << std::endl;
>+    std::cout << "Extensions: " << glGetString(GL_EXTENSIONS) << std::endl;
>+    EXPECT_GL_NO_ERROR();
>+}
>+
> TEST_P(RendererTest, RequestedRendererCreated)
> {
>-    std::string rendererString = std::string(reinterpret_cast<const char*>(glGetString(GL_RENDERER)));
>+    std::string rendererString =
>+        std::string(reinterpret_cast<const char *>(glGetString(GL_RENDERER)));
>     angle::ToLower(&rendererString);
> 
>-    std::string versionString = std::string(reinterpret_cast<const char*>(glGetString(GL_VERSION)));
>+    std::string versionString =
>+        std::string(reinterpret_cast<const char *>(glGetString(GL_VERSION)));
>     angle::ToLower(&versionString);
> 
>     const EGLPlatformParameters &platform = GetParam().eglParameters;
>@@ -53,18 +66,20 @@ TEST_P(RendererTest, RequestedRendererCreated)
>     if (platform.renderer == EGL_PLATFORM_ANGLE_TYPE_D3D11_ANGLE)
>     {
>         // Ensure that the renderer uses WARP, if we requested it.
>-        if (platform.deviceType == EGL_PLATFORM_ANGLE_DEVICE_TYPE_WARP_ANGLE)
>+        if (platform.deviceType == EGL_PLATFORM_ANGLE_DEVICE_TYPE_D3D_WARP_ANGLE)
>         {
>-            auto basicRenderPos = rendererString.find(std::string("microsoft basic render"));
>+            auto basicRenderPos     = rendererString.find(std::string("microsoft basic render"));
>             auto softwareAdapterPos = rendererString.find(std::string("software adapter"));
>-            ASSERT_TRUE(basicRenderPos != std::string::npos || softwareAdapterPos != std::string::npos);
>+            ASSERT_TRUE(basicRenderPos != std::string::npos ||
>+                        softwareAdapterPos != std::string::npos);
>         }
> 
>         std::vector<std::string> acceptableShaderModels;
> 
>-        // When no specific major/minor version is requested, then ANGLE should return the highest possible feature level by default.
>-        // The current hardware driver might not support Feature Level 11_0, but WARP always does.
>-        // Therefore if WARP is specified but no major/minor version is specified, then we test to check that ANGLE returns FL11_0.
>+        // When no specific major/minor version is requested, then ANGLE should return the highest
>+        // possible feature level by default. The current hardware driver might not support Feature
>+        // Level 11_0, but WARP always does. Therefore if WARP is specified but no major/minor
>+        // version is specified, then we test to check that ANGLE returns FL11_0.
>         if (platform.majorVersion >= 11 || platform.majorVersion == EGL_DONT_CARE)
>         {
>             // Feature Level 10_0 corresponds to shader model 5_0
>@@ -154,12 +169,12 @@ TEST_P(RendererTest, SimpleOperation)
>     ASSERT_GL_NO_ERROR();
> }
> 
>-// Select configurations (e.g. which renderer, which GLES major version) these tests should be run against.
>+// Select configurations (e.g. which renderer, which GLES major version) these tests should be run
>+// against.
> 
> ANGLE_INSTANTIATE_TEST(RendererTest,
>                        // ES2 on top of D3D9
>                        ES2_D3D9(),
>-                       ES2_D3D9_REFERENCE(),
> 
>                        // ES2 on top of D3D11 feature level 9.3 to 11.0
>                        ES2_D3D11(),
>@@ -175,13 +190,6 @@ ANGLE_INSTANTIATE_TEST(RendererTest,
>                        ES2_D3D11_FL10_0_WARP(),
>                        ES2_D3D11_FL9_3_WARP(),
> 
>-                       // ES2 on top of D3D11 reference feature level 9.3 to 11.0
>-                       ES2_D3D11_REFERENCE(),
>-                       ES2_D3D11_FL11_0_REFERENCE(),
>-                       ES2_D3D11_FL10_1_REFERENCE(),
>-                       ES2_D3D11_FL10_0_REFERENCE(),
>-                       ES2_D3D11_FL9_3_REFERENCE(),
>-
>                        // ES3 on top of D3D11.
>                        ES3_D3D11(),
>                        ES3_D3D11_FL11_0(),
>@@ -192,11 +200,6 @@ ANGLE_INSTANTIATE_TEST(RendererTest,
>                        ES3_D3D11_FL11_0_WARP(),
>                        ES3_D3D11_FL10_1_WARP(),
> 
>-                       // ES3 on top of the D3D11 reference rasterizer.
>-                       ES3_D3D11_REFERENCE(),
>-                       ES3_D3D11_FL11_0_REFERENCE(),
>-                       ES3_D3D11_FL10_1_REFERENCE(),
>-
>                        // ES2 on top of desktop OpenGL versions 2.1 to 4.5
>                        ES2_OPENGL(),
>                        ES2_OPENGL(2, 1),
>diff --git a/Source/ThirdParty/ANGLE/src/tests/gl_tests/RequestExtensionTest.cpp b/Source/ThirdParty/ANGLE/src/tests/gl_tests/RequestExtensionTest.cpp
>new file mode 100644
>index 00000000000..0d87cd0647e
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/tests/gl_tests/RequestExtensionTest.cpp
>@@ -0,0 +1,81 @@
>+//
>+// Copyright 2018 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// RequestExtensionTest:
>+//   Tests that extensions can be requested and are disabled by default when using
>+//   EGL_ANGLE_request_extension
>+//
>+
>+#include "test_utils/ANGLETest.h"
>+
>+#include "util/EGLWindow.h"
>+
>+namespace angle
>+{
>+
>+class RequestExtensionTest : public ANGLETest
>+{
>+  protected:
>+    RequestExtensionTest() { setExtensionsEnabled(false); }
>+};
>+
>+// Test that a known requestable extension is disabled by default and make sure it can be requested
>+// if possible
>+TEST_P(RequestExtensionTest, ExtensionsDisabledByDefault)
>+{
>+    EXPECT_TRUE(IsEGLDisplayExtensionEnabled(getEGLWindow()->getDisplay(),
>+                                             "EGL_ANGLE_create_context_extensions_enabled"));
>+    EXPECT_FALSE(IsGLExtensionEnabled("GL_OES_rgb8_rgba8"));
>+
>+    if (IsGLExtensionRequestable("GL_OES_rgb8_rgba8"))
>+    {
>+        glRequestExtensionANGLE("GL_OES_rgb8_rgba8");
>+        EXPECT_TRUE(IsGLExtensionEnabled("GL_OES_rgb8_rgba8"));
>+    }
>+}
>+
>+// Test the queries for the requestable extension strings
>+TEST_P(RequestExtensionTest, Queries)
>+{
>+    ANGLE_SKIP_TEST_IF(!IsGLExtensionEnabled("GL_ANGLE_request_extension"));
>+
>+    const GLubyte *requestableExtString = glGetString(GL_REQUESTABLE_EXTENSIONS_ANGLE);
>+    EXPECT_GL_NO_ERROR();
>+    EXPECT_NE(nullptr, requestableExtString);
>+
>+    if (getClientMajorVersion() >= 3)
>+    {
>+        GLint numExtensions = 0;
>+        glGetIntegerv(GL_NUM_REQUESTABLE_EXTENSIONS_ANGLE, &numExtensions);
>+        EXPECT_GL_NO_ERROR();
>+
>+        for (GLint extIdx = 0; extIdx < numExtensions; extIdx++)
>+        {
>+            const GLubyte *requestableExtIndexedString =
>+                glGetStringi(GL_REQUESTABLE_EXTENSIONS_ANGLE, extIdx);
>+            EXPECT_GL_NO_ERROR();
>+            EXPECT_NE(nullptr, requestableExtIndexedString);
>+        }
>+
>+        // Request beyond the end of the array
>+        const GLubyte *requestableExtIndexedString =
>+            glGetStringi(GL_REQUESTABLE_EXTENSIONS_ANGLE, numExtensions);
>+        EXPECT_GL_ERROR(GL_INVALID_VALUE);
>+        EXPECT_EQ(nullptr, requestableExtIndexedString);
>+    }
>+}
>+
>+// Use this to select which configurations (e.g. which renderer, which GLES major version) these
>+// tests should be run against.
>+ANGLE_INSTANTIATE_TEST(RequestExtensionTest,
>+                       ES2_D3D11(),
>+                       ES3_D3D11(),
>+                       ES2_OPENGL(),
>+                       ES3_OPENGL(),
>+                       ES2_OPENGLES(),
>+                       ES3_OPENGLES(),
>+                       ES2_VULKAN());
>+
>+}  // namespace angle
>diff --git a/Source/ThirdParty/ANGLE/src/tests/gl_tests/RobustBufferAccessBehaviorTest.cpp b/Source/ThirdParty/ANGLE/src/tests/gl_tests/RobustBufferAccessBehaviorTest.cpp
>index 4506d1f20b3..2d20f9a5672 100644
>--- a/Source/ThirdParty/ANGLE/src/tests/gl_tests/RobustBufferAccessBehaviorTest.cpp
>+++ b/Source/ThirdParty/ANGLE/src/tests/gl_tests/RobustBufferAccessBehaviorTest.cpp
>@@ -9,6 +9,9 @@
> 
> #include "test_utils/ANGLETest.h"
> #include "test_utils/gl_raii.h"
>+#include "util/EGLWindow.h"
>+
>+#include <array>
> 
> using namespace angle;
> 
>@@ -26,6 +29,9 @@ class RobustBufferAccessBehaviorTest : public ANGLETest
>         setConfigGreenBits(8);
>         setConfigBlueBits(8);
>         setConfigAlphaBits(8);
>+
>+        // Test flakiness was noticed when reusing displays.
>+        forceNewDisplay();
>     }
> 
>     void TearDown() override
>@@ -38,7 +44,7 @@ class RobustBufferAccessBehaviorTest : public ANGLETest
>     {
>         EGLWindow *window  = getEGLWindow();
>         EGLDisplay display = window->getDisplay();
>-        if (!eglDisplayExtensionEnabled(display, "EGL_EXT_create_context_robustness"))
>+        if (!IsEGLDisplayExtensionEnabled(display, "EGL_EXT_create_context_robustness"))
>         {
>             return false;
>         }
>@@ -46,7 +52,7 @@ class RobustBufferAccessBehaviorTest : public ANGLETest
>         ANGLETest::TearDown();
>         setRobustAccess(true);
>         ANGLETest::SetUp();
>-        if (!extensionEnabled("GL_KHR_robust_buffer_access_behavior"))
>+        if (!IsGLExtensionEnabled("GL_KHR_robust_buffer_access_behavior"))
>         {
>             return false;
>         }
>@@ -55,7 +61,7 @@ class RobustBufferAccessBehaviorTest : public ANGLETest
> 
>     void initBasicProgram()
>     {
>-        const std::string &vsCheckOutOfBounds =
>+        constexpr char kVS[] =
>             "precision mediump float;\n"
>             "attribute vec4 position;\n"
>             "attribute vec4 vecRandom;\n"
>@@ -78,14 +84,14 @@ class RobustBufferAccessBehaviorTest : public ANGLETest
>             "    gl_Position = position;\n"
>             "}\n";
> 
>-        const std::string &fragmentShaderSource =
>+        constexpr char kFS[] =
>             "precision mediump float;\n"
>             "varying vec4 v_color;\n"
>             "void main() {\n"
>             "    gl_FragColor = v_color;\n"
>             "}\n";
> 
>-        mProgram = CompileProgram(vsCheckOutOfBounds, fragmentShaderSource);
>+        mProgram = CompileProgram(kVS, kFS);
>         ASSERT_NE(0u, mProgram);
> 
>         mTestAttrib = glGetAttribLocation(mProgram, "vecRandom");
>@@ -149,6 +155,11 @@ class RobustBufferAccessBehaviorTest : public ANGLETest
> TEST_P(RobustBufferAccessBehaviorTest, DrawElementsIndexOutOfRangeWithStaticDraw)
> {
>     ANGLE_SKIP_TEST_IF(IsNVIDIA() && IsWindows() && IsOpenGL());
>+
>+    // Failing on NV after changing shard count of angle_end2end_tests. http://anglebug.com/2799
>+    // Also failing on AMD after a validation change. http://anglebug.com/3042
>+    ANGLE_SKIP_TEST_IF(IsD3D11_FL93());
>+
>     ANGLE_SKIP_TEST_IF(!initExtension());
> 
>     runIndexOutOfRangeTests(GL_STATIC_DRAW);
>@@ -165,6 +176,401 @@ TEST_P(RobustBufferAccessBehaviorTest, DrawElementsIndexOutOfRangeWithDynamicDra
>     runIndexOutOfRangeTests(GL_DYNAMIC_DRAW);
> }
> 
>+// Test that vertex buffers are rebound with the correct offsets in subsequent calls in the D3D11
>+// backend.  http://crbug.com/837002
>+TEST_P(RobustBufferAccessBehaviorTest, D3D11StateSynchronizationOrderBug)
>+{
>+    ANGLE_SKIP_TEST_IF(!initExtension());
>+
>+    glDisable(GL_DEPTH_TEST);
>+
>+    // 2 quads, the first one red, the second one green
>+    const std::array<angle::Vector4, 16> vertices{
>+        angle::Vector4(-1.0f, 1.0f, 0.5f, 1.0f),   // v0
>+        angle::Vector4(1.0f, 0.0f, 0.0f, 1.0f),    // c0
>+        angle::Vector4(-1.0f, -1.0f, 0.5f, 1.0f),  // v1
>+        angle::Vector4(1.0f, 0.0f, 0.0f, 1.0f),    // c1
>+        angle::Vector4(1.0f, -1.0f, 0.5f, 1.0f),   // v2
>+        angle::Vector4(1.0f, 0.0f, 0.0f, 1.0f),    // c2
>+        angle::Vector4(1.0f, 1.0f, 0.5f, 1.0f),    // v3
>+        angle::Vector4(1.0f, 0.0f, 0.0f, 1.0f),    // c3
>+
>+        angle::Vector4(-1.0f, 1.0f, 0.5f, 1.0f),   // v4
>+        angle::Vector4(0.0f, 1.0f, 0.0f, 1.0f),    // c4
>+        angle::Vector4(-1.0f, -1.0f, 0.5f, 1.0f),  // v5
>+        angle::Vector4(0.0f, 1.0f, 0.0f, 1.0f),    // c5
>+        angle::Vector4(1.0f, -1.0f, 0.5f, 1.0f),   // v6
>+        angle::Vector4(0.0f, 1.0f, 0.0f, 1.0f),    // c6
>+        angle::Vector4(1.0f, 1.0f, 0.5f, 1.0f),    // v7
>+        angle::Vector4(0.0f, 1.0f, 0.0f, 1.0f),    // c7
>+    };
>+
>+    GLBuffer vb;
>+    glBindBuffer(GL_ARRAY_BUFFER, vb);
>+    glBufferData(GL_ARRAY_BUFFER, sizeof(vertices), vertices.data(), GL_STATIC_DRAW);
>+
>+    const std::array<GLushort, 12> indicies{
>+        0, 1, 2, 0, 2, 3,  // quad0
>+        4, 5, 6, 4, 6, 7,  // quad1
>+    };
>+
>+    GLBuffer ib;
>+    glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, ib);
>+    glBufferData(GL_ELEMENT_ARRAY_BUFFER, sizeof(indicies), indicies.data(), GL_STATIC_DRAW);
>+
>+    constexpr char kVS[] = R"(
>+precision highp float;
>+attribute vec4 a_position;
>+attribute vec4 a_color;
>+
>+varying vec4 v_color;
>+
>+void main()
>+{
>+    gl_Position = a_position;
>+    v_color = a_color;
>+})";
>+
>+    constexpr char kFS[] = R"(
>+precision highp float;
>+varying vec4 v_color;
>+
>+void main()
>+{
>+    gl_FragColor = v_color;
>+})";
>+
>+    ANGLE_GL_PROGRAM(program, kVS, kFS);
>+    glUseProgram(program);
>+
>+    GLint positionLocation = glGetAttribLocation(program, "a_position");
>+    glEnableVertexAttribArray(positionLocation);
>+    glVertexAttribPointer(positionLocation, 4, GL_FLOAT, GL_FALSE, sizeof(angle::Vector4) * 2, 0);
>+
>+    GLint colorLocation = glGetAttribLocation(program, "a_color");
>+    glEnableVertexAttribArray(colorLocation);
>+    glVertexAttribPointer(colorLocation, 4, GL_FLOAT, GL_FALSE, sizeof(angle::Vector4) * 2,
>+                          reinterpret_cast<const void *>(sizeof(angle::Vector4)));
>+
>+    glDrawElements(GL_TRIANGLES, 6, GL_UNSIGNED_SHORT, 0);
>+    EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::red);
>+
>+    glDrawElements(GL_TRIANGLES, 6, GL_UNSIGNED_SHORT,
>+                   reinterpret_cast<const void *>(sizeof(GLshort) * 6));
>+    EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::green);
>+
>+    glDrawElements(GL_TRIANGLES, 6, GL_UNSIGNED_SHORT, 0);
>+    EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::red);
>+
>+    glDrawElements(GL_TRIANGLES, 6, GL_UNSIGNED_SHORT,
>+                   reinterpret_cast<const void *>(sizeof(GLshort) * 6));
>+    EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::green);
>+}
>+
>+// Covers drawing with a very large vertex range which overflows GLsizei. http://crbug.com/842028
>+TEST_P(RobustBufferAccessBehaviorTest, VeryLargeVertexCountWithDynamicVertexData)
>+{
>+    ANGLE_SKIP_TEST_IF(!initExtension());
>+    ANGLE_SKIP_TEST_IF(!IsGLExtensionEnabled("GL_OES_element_index_uint"));
>+
>+    constexpr GLsizei kIndexCount           = 32;
>+    std::array<GLuint, kIndexCount> indices = {{}};
>+    for (GLsizei index = 0; index < kIndexCount; ++index)
>+    {
>+        indices[index] = ((std::numeric_limits<GLuint>::max() - 2) / kIndexCount) * index;
>+    }
>+
>+    GLBuffer indexBuffer;
>+    glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, indexBuffer);
>+    glBufferData(GL_ELEMENT_ARRAY_BUFFER, indices.size() * sizeof(GLuint), indices.data(),
>+                 GL_STATIC_DRAW);
>+
>+    std::array<GLfloat, 256> vertexData = {{}};
>+
>+    GLBuffer vertexBuffer;
>+    glBindBuffer(GL_ARRAY_BUFFER, vertexBuffer);
>+    glBufferData(GL_ARRAY_BUFFER, vertexData.size() * sizeof(GLfloat), vertexData.data(),
>+                 GL_DYNAMIC_DRAW);
>+
>+    ANGLE_GL_PROGRAM(program, essl1_shaders::vs::Simple(), essl1_shaders::fs::Red());
>+    glUseProgram(program);
>+
>+    GLint attribLoc = glGetAttribLocation(program, essl1_shaders::PositionAttrib());
>+    ASSERT_NE(-1, attribLoc);
>+
>+    glVertexAttribPointer(attribLoc, 2, GL_FLOAT, GL_FALSE, 0, nullptr);
>+    glEnableVertexAttribArray(attribLoc);
>+    ASSERT_GL_NO_ERROR();
>+
>+    glDrawElements(GL_TRIANGLES, kIndexCount, GL_UNSIGNED_INT, nullptr);
>+
>+    // This may or may not generate an error, but it should not crash.
>+}
>+
>+// Test that robust access works even if there's no data uploaded to the vertex buffer at all.
>+TEST_P(RobustBufferAccessBehaviorTest, NoBufferData)
>+{
>+    // http://crbug.com/889303: Possible driver bug on NVIDIA Shield TV.
>+    // http://anglebug.com/2861: Fails abnormally on Android
>+    ANGLE_SKIP_TEST_IF(IsAndroid() && IsOpenGLES());
>+
>+    ANGLE_SKIP_TEST_IF(!initExtension());
>+    ANGLE_GL_PROGRAM(program, essl1_shaders::vs::Simple(), essl1_shaders::fs::Red());
>+    glUseProgram(program);
>+
>+    glEnableVertexAttribArray(0);
>+    GLBuffer buf;
>+    glBindBuffer(GL_ARRAY_BUFFER, buf);
>+
>+    glVertexAttribPointer(0, 1, GL_FLOAT, false, 0, nullptr);
>+    ASSERT_GL_NO_ERROR();
>+
>+    std::array<GLubyte, 1u> indices = {0};
>+    glDrawElements(GL_POINTS, indices.size(), GL_UNSIGNED_BYTE, indices.data());
>+    ASSERT_GL_NO_ERROR();
>+}
>+
>+constexpr char kWebGLVS[] = R"(attribute vec2 position;
>+attribute vec4 aOne;
>+attribute vec4 aTwo;
>+varying vec4 v;
>+uniform vec2 comparison;
>+
>+bool isRobust(vec4 value) {
>+    // The valid buffer range is filled with this value.
>+    if (value.xy == comparison)
>+        return true;
>+    // Checking the w value is a bit complex.
>+    return (value.xyz == vec3(0, 0, 0));
>+}
>+
>+void main() {
>+    gl_Position = vec4(position, 0, 1);
>+    if (isRobust(aOne) && isRobust(aTwo)) {
>+        v = vec4(0, 1, 0, 1);
>+    } else {
>+        v = vec4(1, 0, 0, 1);
>+    }
>+})";
>+
>+constexpr char kWebGLFS[] = R"(precision mediump float;
>+varying vec4 v;
>+void main() {
>+    gl_FragColor = v;
>+})";
>+
>+// Test buffer with interleaved (3+2) float vectors. Adapted from WebGL test
>+// conformance/rendering/draw-arrays-out-of-bounds.html
>+TEST_P(RobustBufferAccessBehaviorTest, InterleavedAttributes)
>+{
>+    ANGLE_SKIP_TEST_IF(!initExtension());
>+
>+    ANGLE_GL_PROGRAM(program, kWebGLVS, kWebGLFS);
>+    glUseProgram(program);
>+
>+    constexpr GLint kPosLoc = 0;
>+    constexpr GLint kOneLoc = 1;
>+    constexpr GLint kTwoLoc = 2;
>+
>+    ASSERT_EQ(kPosLoc, glGetAttribLocation(program, "position"));
>+    ASSERT_EQ(kOneLoc, glGetAttribLocation(program, "aOne"));
>+    ASSERT_EQ(kTwoLoc, glGetAttribLocation(program, "aTwo"));
>+
>+    // Create a buffer of 200 valid sets of quad lists.
>+    constexpr size_t kNumQuads = 200;
>+    using QuadVerts            = std::array<Vector3, 6>;
>+    std::vector<QuadVerts> quadVerts(kNumQuads, GetQuadVertices());
>+
>+    GLBuffer positionBuf;
>+    glBindBuffer(GL_ARRAY_BUFFER, positionBuf);
>+    glBufferData(GL_ARRAY_BUFFER, kNumQuads * sizeof(QuadVerts), quadVerts.data(), GL_STATIC_DRAW);
>+    glVertexAttribPointer(kPosLoc, 3, GL_FLOAT, GL_FALSE, 0, nullptr);
>+    glEnableVertexAttribArray(kPosLoc);
>+
>+    constexpr GLfloat kDefaultFloat = 0.2f;
>+    std::vector<Vector4> defaultFloats(kNumQuads * 2, Vector4(kDefaultFloat));
>+
>+    GLBuffer vbo;
>+    glBindBuffer(GL_ARRAY_BUFFER, vbo);
>+
>+    // enough for 9 vertices, so 3 triangles
>+    glBufferData(GL_ARRAY_BUFFER, 9 * 5 * sizeof(GLfloat), defaultFloats.data(), GL_STATIC_DRAW);
>+
>+    // bind first 3 elements, with a stride of 5 float elements
>+    glVertexAttribPointer(kOneLoc, 3, GL_FLOAT, GL_FALSE, 5 * 4, 0);
>+    // bind 2 elements, starting after the first 3; same stride of 5 float elements
>+    glVertexAttribPointer(kTwoLoc, 2, GL_FLOAT, GL_FALSE, 5 * 4,
>+                          reinterpret_cast<const GLvoid *>(3 * 4));
>+
>+    glEnableVertexAttribArray(kOneLoc);
>+    glEnableVertexAttribArray(kTwoLoc);
>+
>+    // set test uniform
>+    GLint uniLoc = glGetUniformLocation(program, "comparison");
>+    ASSERT_NE(-1, uniLoc);
>+    glUniform2f(uniLoc, kDefaultFloat, kDefaultFloat);
>+
>+    // Draw out of bounds.
>+    glDrawArrays(GL_TRIANGLES, 0, 10000);
>+    GLenum err = glGetError();
>+    if (err == GL_NO_ERROR)
>+    {
>+        EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::green);
>+    }
>+    else
>+    {
>+        EXPECT_GLENUM_EQ(GL_INVALID_OPERATION, err);
>+    }
>+
>+    glDrawArrays(GL_TRIANGLES, (kNumQuads - 1) * 6, 6);
>+    err = glGetError();
>+    if (err == GL_NO_ERROR)
>+    {
>+        EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::green);
>+    }
>+    else
>+    {
>+        EXPECT_GLENUM_EQ(GL_INVALID_OPERATION, err);
>+    }
>+}
>+
>+// Tests redefining an empty buffer. Adapted from WebGL test
>+// conformance/rendering/draw-arrays-out-of-bounds.html
>+TEST_P(RobustBufferAccessBehaviorTest, EmptyBuffer)
>+{
>+    ANGLE_SKIP_TEST_IF(!initExtension());
>+
>+    // AMD GL does not support robustness. http://anglebug.com/3099
>+    ANGLE_SKIP_TEST_IF(IsAMD() && IsOpenGL());
>+
>+    // http://anglebug.com/2861: Fails abnormally on Android
>+    ANGLE_SKIP_TEST_IF(IsAndroid() && IsOpenGLES());
>+
>+    ANGLE_GL_PROGRAM(program, kWebGLVS, kWebGLFS);
>+    glUseProgram(program);
>+
>+    constexpr GLint kPosLoc = 0;
>+    constexpr GLint kOneLoc = 1;
>+    constexpr GLint kTwoLoc = 2;
>+
>+    ASSERT_EQ(kPosLoc, glGetAttribLocation(program, "position"));
>+    ASSERT_EQ(kOneLoc, glGetAttribLocation(program, "aOne"));
>+    ASSERT_EQ(kTwoLoc, glGetAttribLocation(program, "aTwo"));
>+
>+    // Create a buffer of 200 valid sets of quad lists.
>+    constexpr size_t kNumQuads = 200;
>+    using QuadVerts            = std::array<Vector3, 6>;
>+    std::vector<QuadVerts> quadVerts(kNumQuads, GetQuadVertices());
>+
>+    GLBuffer positionBuf;
>+    glBindBuffer(GL_ARRAY_BUFFER, positionBuf);
>+    glBufferData(GL_ARRAY_BUFFER, kNumQuads * sizeof(QuadVerts), quadVerts.data(), GL_STATIC_DRAW);
>+    glVertexAttribPointer(kPosLoc, 3, GL_FLOAT, GL_FALSE, 0, nullptr);
>+    glEnableVertexAttribArray(kPosLoc);
>+
>+    // set test uniform
>+    GLint uniLoc = glGetUniformLocation(program, "comparison");
>+    ASSERT_NE(-1, uniLoc);
>+    glUniform2f(uniLoc, 0, 0);
>+
>+    // Define empty buffer.
>+    GLBuffer buffer;
>+    glBindBuffer(GL_ARRAY_BUFFER, buffer);
>+    glBufferData(GL_ARRAY_BUFFER, 0, nullptr, GL_STATIC_DRAW);
>+    glVertexAttribPointer(kOneLoc, 3, GL_FLOAT, GL_FALSE, 0, nullptr);
>+    glEnableVertexAttribArray(kOneLoc);
>+    glDrawArrays(GL_TRIANGLES, 0, 3);
>+    GLenum err = glGetError();
>+    if (err == GL_NO_ERROR)
>+    {
>+        EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::green);
>+    }
>+    else
>+    {
>+        EXPECT_GLENUM_EQ(GL_INVALID_OPERATION, err);
>+    }
>+
>+    // Redefine buffer with 3 float vectors.
>+    constexpr GLfloat kFloats[] = {0, 0.5, 0, -0.5, -0.5, 0, 0.5, -0.5, 0};
>+    glBufferData(GL_ARRAY_BUFFER, sizeof(kFloats), kFloats, GL_STATIC_DRAW);
>+    glDrawArrays(GL_TRIANGLES, 0, 3);
>+    ASSERT_GL_NO_ERROR();
>+}
>+
>+// Tests robust buffer access with dynamic buffer usage.
>+TEST_P(RobustBufferAccessBehaviorTest, DynamicBuffer)
>+{
>+    ANGLE_SKIP_TEST_IF(!initExtension());
>+
>+    ANGLE_GL_PROGRAM(program, kWebGLVS, kWebGLFS);
>+    glUseProgram(program);
>+
>+    constexpr GLint kPosLoc = 0;
>+    constexpr GLint kOneLoc = 1;
>+    constexpr GLint kTwoLoc = 2;
>+
>+    ASSERT_EQ(kPosLoc, glGetAttribLocation(program, "position"));
>+    ASSERT_EQ(kOneLoc, glGetAttribLocation(program, "aOne"));
>+    ASSERT_EQ(kTwoLoc, glGetAttribLocation(program, "aTwo"));
>+
>+    // Create a buffer of 200 valid sets of quad lists.
>+    constexpr size_t kNumQuads = 200;
>+    using QuadVerts            = std::array<Vector3, 6>;
>+    std::vector<QuadVerts> quadVerts(kNumQuads, GetQuadVertices());
>+
>+    GLBuffer positionBuf;
>+    glBindBuffer(GL_ARRAY_BUFFER, positionBuf);
>+    glBufferData(GL_ARRAY_BUFFER, kNumQuads * sizeof(QuadVerts), quadVerts.data(), GL_STATIC_DRAW);
>+    glVertexAttribPointer(kPosLoc, 3, GL_FLOAT, GL_FALSE, 0, nullptr);
>+    glEnableVertexAttribArray(kPosLoc);
>+
>+    constexpr GLfloat kDefaultFloat = 0.2f;
>+    std::vector<Vector4> defaultFloats(kNumQuads * 2, Vector4(kDefaultFloat));
>+
>+    GLBuffer vbo;
>+    glBindBuffer(GL_ARRAY_BUFFER, vbo);
>+
>+    // enough for 9 vertices, so 3 triangles
>+    glBufferData(GL_ARRAY_BUFFER, 9 * 5 * sizeof(GLfloat), defaultFloats.data(), GL_DYNAMIC_DRAW);
>+
>+    // bind first 3 elements, with a stride of 5 float elements
>+    glVertexAttribPointer(kOneLoc, 3, GL_FLOAT, GL_FALSE, 5 * 4, 0);
>+    // bind 2 elements, starting after the first 3; same stride of 5 float elements
>+    glVertexAttribPointer(kTwoLoc, 2, GL_FLOAT, GL_FALSE, 5 * 4,
>+                          reinterpret_cast<const GLvoid *>(3 * 4));
>+
>+    glEnableVertexAttribArray(kOneLoc);
>+    glEnableVertexAttribArray(kTwoLoc);
>+
>+    // set test uniform
>+    GLint uniLoc = glGetUniformLocation(program, "comparison");
>+    ASSERT_NE(-1, uniLoc);
>+    glUniform2f(uniLoc, kDefaultFloat, kDefaultFloat);
>+
>+    // Draw out of bounds.
>+    glDrawArrays(GL_TRIANGLES, 0, 10000);
>+    GLenum err = glGetError();
>+    if (err == GL_NO_ERROR)
>+    {
>+        EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::green);
>+    }
>+    else
>+    {
>+        EXPECT_GLENUM_EQ(GL_INVALID_OPERATION, err);
>+    }
>+
>+    glDrawArrays(GL_TRIANGLES, (kNumQuads - 1) * 6, 6);
>+    err = glGetError();
>+    if (err == GL_NO_ERROR)
>+    {
>+        EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::green);
>+    }
>+    else
>+    {
>+        EXPECT_GLENUM_EQ(GL_INVALID_OPERATION, err);
>+    }
>+}
>+
> ANGLE_INSTANTIATE_TEST(RobustBufferAccessBehaviorTest,
>                        ES2_D3D9(),
>                        ES2_D3D11_FL9_3(),
>@@ -176,6 +582,7 @@ ANGLE_INSTANTIATE_TEST(RobustBufferAccessBehaviorTest,
>                        ES31_OPENGL(),
>                        ES2_OPENGLES(),
>                        ES3_OPENGLES(),
>-                       ES31_OPENGLES());
>+                       ES31_OPENGLES(),
>+                       ES2_VULKAN());
> 
> }  // namespace
>diff --git a/Source/ThirdParty/ANGLE/src/tests/gl_tests/RobustClientMemoryTest.cpp b/Source/ThirdParty/ANGLE/src/tests/gl_tests/RobustClientMemoryTest.cpp
>index 62ea8e9d1fa..04b81f0bef6 100644
>--- a/Source/ThirdParty/ANGLE/src/tests/gl_tests/RobustClientMemoryTest.cpp
>+++ b/Source/ThirdParty/ANGLE/src/tests/gl_tests/RobustClientMemoryTest.cpp
>@@ -28,151 +28,9 @@ class RobustClientMemoryTest : public ANGLETest
>         setConfigAlphaBits(8);
>     }
> 
>-    void SetUp() override
>-    {
>-        ANGLETest::SetUp();
>-
>-        glGetBooleanvRobustANGLE = reinterpret_cast<PFNGLGETBOOLEANVROBUSTANGLE>(
>-            eglGetProcAddress("glGetBooleanvRobustANGLE"));
>-        glGetBufferParameterivRobustANGLE = reinterpret_cast<PFNGLGETBUFFERPARAMETERIVROBUSTANGLE>(
>-            eglGetProcAddress("glGetBufferParameterivRobustANGLE"));
>-        glGetFloatvRobustANGLE = reinterpret_cast<PFNGLGETFLOATVROBUSTANGLE>(
>-            eglGetProcAddress("glGetFloatvRobustANGLE"));
>-        glGetFramebufferAttachmentParameterivRobustANGLE =
>-            reinterpret_cast<PFNGLGETFRAMEBUFFERATTACHMENTPARAMETERIVROBUSTANGLE>(
>-                eglGetProcAddress("glGetFramebufferAttachmentParameterivRobustANGLE"));
>-        glGetIntegervRobustANGLE = reinterpret_cast<PFNGLGETINTEGERVROBUSTANGLE>(
>-            eglGetProcAddress("glGetIntegervRobustANGLE"));
>-        glGetProgramivRobustANGLE = reinterpret_cast<PFNGLGETPROGRAMIVROBUSTANGLE>(
>-            eglGetProcAddress("glGetProgramivRobustANGLE"));
>-        glGetRenderbufferParameterivRobustANGLE =
>-            reinterpret_cast<PFNGLGETRENDERBUFFERPARAMETERIVROBUSTANGLE>(
>-                eglGetProcAddress("glGetRenderbufferParameterivRobustANGLE"));
>-        glGetShaderivRobustANGLE = reinterpret_cast<PFNGLGETSHADERIVROBUSTANGLE>(
>-            eglGetProcAddress("glGetShaderivRobustANGLE"));
>-        glGetTexParameterfvRobustANGLE = reinterpret_cast<PFNGLGETTEXPARAMETERFVROBUSTANGLE>(
>-            eglGetProcAddress("glGetTexParameterfvRobustANGLE"));
>-        glGetTexParameterivRobustANGLE = reinterpret_cast<PFNGLGETTEXPARAMETERIVROBUSTANGLE>(
>-            eglGetProcAddress("glGetTexParameterivRobustANGLE"));
>-        glGetUniformfvRobustANGLE = reinterpret_cast<PFNGLGETUNIFORMFVROBUSTANGLE>(
>-            eglGetProcAddress("glGetUniformfvRobustANGLE"));
>-        glGetUniformivRobustANGLE = reinterpret_cast<PFNGLGETUNIFORMIVROBUSTANGLE>(
>-            eglGetProcAddress("glGetUniformivRobustANGLE"));
>-        glGetVertexAttribfvRobustANGLE = reinterpret_cast<PFNGLGETVERTEXATTRIBFVROBUSTANGLE>(
>-            eglGetProcAddress("glGetVertexAttribfvRobustANGLE"));
>-        glGetVertexAttribivRobustANGLE = reinterpret_cast<PFNGLGETVERTEXATTRIBIVROBUSTANGLE>(
>-            eglGetProcAddress("glGetVertexAttribivRobustANGLE"));
>-        glGetVertexAttribPointervRobustANGLE =
>-            reinterpret_cast<PFNGLGETVERTEXATTRIBPOINTERVROBUSTANGLE>(
>-                eglGetProcAddress("glGetVertexAttribPointervRobustANGLE"));
>-        glReadPixelsRobustANGLE = reinterpret_cast<PFNGLREADPIXELSROBUSTANGLE>(
>-            eglGetProcAddress("glReadPixelsRobustANGLE"));
>-        glTexImage2DRobustANGLE = reinterpret_cast<PFNGLTEXIMAGE2DROBUSTANGLE>(
>-            eglGetProcAddress("glTexImage2DRobustANGLE"));
>-        glTexParameterfvRobustANGLE = reinterpret_cast<PFNGLTEXPARAMETERFVROBUSTANGLE>(
>-            eglGetProcAddress("glTexParameterfvRobustANGLE"));
>-        glTexParameterivRobustANGLE = reinterpret_cast<PFNGLTEXPARAMETERIVROBUSTANGLE>(
>-            eglGetProcAddress("glTexParameterivRobustANGLE"));
>-        glTexSubImage2DRobustANGLE = reinterpret_cast<PFNGLTEXSUBIMAGE2DROBUSTANGLE>(
>-            eglGetProcAddress("glTexSubImage2DRobustANGLE"));
>-        glTexImage3DRobustANGLE = reinterpret_cast<PFNGLTEXIMAGE3DROBUSTANGLE>(
>-            eglGetProcAddress("glTexImage3DRobustANGLE"));
>-        glTexSubImage3DRobustANGLE = reinterpret_cast<PFNGLTEXSUBIMAGE3DROBUSTANGLE>(
>-            eglGetProcAddress("glTexSubImage3DRobustANGLE"));
>-        glGetQueryivRobustANGLE = reinterpret_cast<PFNGLGETQUERYIVROBUSTANGLE>(
>-            eglGetProcAddress("glGetQueryivRobustANGLE"));
>-        glGetQueryObjectuivRobustANGLE = reinterpret_cast<PFNGLGETQUERYOBJECTUIVROBUSTANGLE>(
>-            eglGetProcAddress("glGetQueryObjectuivRobustANGLE"));
>-        glGetBufferPointervRobustANGLE = reinterpret_cast<PFNGLGETBUFFERPOINTERVROBUSTANGLE>(
>-            eglGetProcAddress("glGetBufferPointervRobustANGLE"));
>-        glGetIntegeri_vRobustANGLE = reinterpret_cast<PFNGLGETINTEGERI_VROBUSTANGLE>(
>-            eglGetProcAddress("glGetIntegeri_vRobustANGLE"));
>-        glGetInternalformativRobustANGLE = reinterpret_cast<PFNGETINTERNALFORMATIVROBUSTANGLE>(
>-            eglGetProcAddress("glGetInternalformativRobustANGLE"));
>-        glGetVertexAttribIivRobustANGLE = reinterpret_cast<PFNGLGETVERTEXATTRIBIIVROBUSTANGLE>(
>-            eglGetProcAddress("glGetVertexAttribIivRobustANGLE"));
>-        glGetVertexAttribIuivRobustANGLE = reinterpret_cast<PFNGLGETVERTEXATTRIBIUIVROBUSTANGLE>(
>-            eglGetProcAddress("glGetVertexAttribIuivRobustANGLE"));
>-        glGetUniformuivRobustANGLE = reinterpret_cast<PFNGLGETUNIFORMUIVROBUSTANGLE>(
>-            eglGetProcAddress("glGetUniformuivRobustANGLE"));
>-        glGetActiveUniformBlockivRobustANGLE =
>-            reinterpret_cast<PFNGLGETACTIVEUNIFORMBLOCKIVROBUSTANGLE>(
>-                eglGetProcAddress("glGetActiveUniformBlockivRobustANGLE"));
>-        glGetInteger64vRobustANGLE = reinterpret_cast<PFNGLGETINTEGER64VROBUSTANGLE>(
>-            eglGetProcAddress("glGetInteger64vRobustANGLE"));
>-        glGetInteger64i_vRobustANGLE = reinterpret_cast<PFNGLGETINTEGER64I_VROBUSTANGLE>(
>-            eglGetProcAddress("glGetInteger64i_vRobustANGLE"));
>-        glGetBufferParameteri64vRobustANGLE =
>-            reinterpret_cast<PFNGLGETBUFFERPARAMETERI64VROBUSTANGLE>(
>-                eglGetProcAddress("glGetBufferParameteri64vRobustANGLE"));
>-        glSamplerParameterivRobustANGLE = reinterpret_cast<PFNGLSAMPLERPARAMETERIVROBUSTANGLE>(
>-            eglGetProcAddress("glSamplerParameterivRobustANGLE"));
>-        glSamplerParameterfvRobustANGLE = reinterpret_cast<PFNGLSAMPLERPARAMETERFVROBUSTANGLE>(
>-            eglGetProcAddress("glSamplerParameterfvRobustANGLE"));
>-        glGetSamplerParameterivRobustANGLE =
>-            reinterpret_cast<PFNGLGETSAMPLERPARAMETERIVROBUSTANGLE>(
>-                eglGetProcAddress("glGetSamplerParameterivRobustANGLE"));
>-        glGetSamplerParameterfvRobustANGLE =
>-            reinterpret_cast<PFNGLGETSAMPLERPARAMETERFVROBUSTANGLE>(
>-                eglGetProcAddress("glGetSamplerParameterfvRobustANGLE"));
>-        glGetFramebufferParameterivRobustANGLE =
>-            reinterpret_cast<PFNGLGETFRAMEBUFFERPARAMETERIVROBUSTANGLE>(
>-                eglGetProcAddress("glGetFramebufferParameterivRobustANGLE"));
>-        glGetProgramInterfaceivRobustANGLE =
>-            reinterpret_cast<PFNGLGETPROGRAMINTERFACEIVROBUSTANGLE>(
>-                eglGetProcAddress("glGetProgramInterfaceivRobustANGLE"));
>-        glGetBooleani_vRobustANGLE = reinterpret_cast<PFNGLGETBOOLEANI_VROBUSTANGLE>(
>-            eglGetProcAddress("glGetBooleani_vRobustANGLE"));
>-        glGetMultisamplefvRobustANGLE = reinterpret_cast<PFNGLGETMULTISAMPLEFVROBUSTANGLE>(
>-            eglGetProcAddress("glGetMultisamplefvRobustANGLE"));
>-        glGetTexLevelParameterivRobustANGLE =
>-            reinterpret_cast<PFNGLGETTEXLEVELPARAMETERIVROBUSTANGLE>(
>-                eglGetProcAddress("glGetTexLevelParameterivRobustANGLE"));
>-        glGetTexLevelParameterfvRobustANGLE =
>-            reinterpret_cast<PFNGLGETTEXLEVELPARAMETERFVROBUSTANGLE>(
>-                eglGetProcAddress("glGetTexLevelParameterfvRobustANGLE"));
>-        glGetPointervRobustANGLERobustANGLE =
>-            reinterpret_cast<PFNGLGETPOINTERVROBUSTANGLEROBUSTANGLE>(
>-                eglGetProcAddress("glGetPointervRobustANGLERobustANGLE"));
>-        glReadnPixelsRobustANGLE = reinterpret_cast<PFNGLREADNPIXELSROBUSTANGLE>(
>-            eglGetProcAddress("glReadnPixelsRobustANGLE"));
>-        glGetnUniformfvRobustANGLE = reinterpret_cast<PFNGLGETNUNIFORMFVROBUSTANGLE>(
>-            eglGetProcAddress("glGetnUniformfvRobustANGLE"));
>-        glGetnUniformivRobustANGLE = reinterpret_cast<PFNGLGETNUNIFORMIVROBUSTANGLE>(
>-            eglGetProcAddress("glGetnUniformivRobustANGLE"));
>-        glGetnUniformuivRobustANGLE = reinterpret_cast<PFNGLGETNUNIFORMUIVROBUSTANGLE>(
>-            eglGetProcAddress("glGetnUniformuivRobustANGLE"));
>-        glTexParameterIivRobustANGLE = reinterpret_cast<PFNGLTEXPARAMETERIIVROBUSTANGLE>(
>-            eglGetProcAddress("glTexParameterIivRobustANGLE"));
>-        glTexParameterIuivRobustANGLE = reinterpret_cast<PFNGLTEXPARAMETERIUIVROBUSTANGLE>(
>-            eglGetProcAddress("glTexParameterIuivRobustANGLE"));
>-        glGetTexParameterIivRobustANGLE = reinterpret_cast<PFNGLGETTEXPARAMETERIIVROBUSTANGLE>(
>-            eglGetProcAddress("glGetTexParameterIivRobustANGLE"));
>-        glGetTexParameterIuivRobustANGLE = reinterpret_cast<PFNGLGETTEXPARAMETERIUIVROBUSTANGLE>(
>-            eglGetProcAddress("glGetTexParameterIuivRobustANGLE"));
>-        glSamplerParameterIivRobustANGLE = reinterpret_cast<PFNGLSAMPLERPARAMETERIIVROBUSTANGLE>(
>-            eglGetProcAddress("glSamplerParameterIivRobustANGLE"));
>-        glSamplerParameterIuivRobustANGLE = reinterpret_cast<PFNGLSAMPLERPARAMETERIUIVROBUSTANGLE>(
>-            eglGetProcAddress("glSamplerParameterIuivRobustANGLE"));
>-        glGetSamplerParameterIivRobustANGLE =
>-            reinterpret_cast<PFNGLGETSAMPLERPARAMETERIIVROBUSTANGLE>(
>-                eglGetProcAddress("glGetSamplerParameterIivRobustANGLE"));
>-        glGetSamplerParameterIuivRobustANGLE =
>-            reinterpret_cast<PFNGLGETSAMPLERPARAMETERIUIVROBUSTANGLE>(
>-                eglGetProcAddress("glGetSamplerParameterIuivRobustANGLE"));
>-        glGetQueryObjectivRobustANGLE = reinterpret_cast<PFNGLGETQUERYOBJECTIVROBUSTANGLE>(
>-            eglGetProcAddress("glGetQueryObjectivRobustANGLE"));
>-        glGetQueryObjecti64vRobustANGLE = reinterpret_cast<PFNGLGETQUERYOBJECTI64VROBUSTANGLE>(
>-            eglGetProcAddress("glGetQueryObjecti64vRobustANGLE"));
>-        glGetQueryObjectui64vRobustANGLE = reinterpret_cast<PFNGLGETQUERYOBJECTUI64VROBUSTANGLE>(
>-            eglGetProcAddress("glGetQueryObjectui64vRobustANGLE"));
>-    }
>-
>-    void TearDown() override { ANGLETest::TearDown(); }
>-
>     bool extensionsPresent() const
>     {
>-        if (!extensionEnabled("GL_ANGLE_robust_client_memory"))
>+        if (!IsGLExtensionEnabled("GL_ANGLE_robust_client_memory"))
>         {
>             std::cout << "Test skipped because GL_ANGLE_robust_client_memory is not available.";
>             return false;
>@@ -180,68 +38,6 @@ class RobustClientMemoryTest : public ANGLETest
> 
>         return true;
>     }
>-
>-    PFNGLGETBOOLEANVROBUSTANGLE glGetBooleanvRobustANGLE                   = nullptr;
>-    PFNGLGETBUFFERPARAMETERIVROBUSTANGLE glGetBufferParameterivRobustANGLE = nullptr;
>-    PFNGLGETFLOATVROBUSTANGLE glGetFloatvRobustANGLE                       = nullptr;
>-    PFNGLGETFRAMEBUFFERATTACHMENTPARAMETERIVROBUSTANGLE
>-    glGetFramebufferAttachmentParameterivRobustANGLE                                   = nullptr;
>-    PFNGLGETINTEGERVROBUSTANGLE glGetIntegervRobustANGLE                               = nullptr;
>-    PFNGLGETPROGRAMIVROBUSTANGLE glGetProgramivRobustANGLE                             = nullptr;
>-    PFNGLGETRENDERBUFFERPARAMETERIVROBUSTANGLE glGetRenderbufferParameterivRobustANGLE = nullptr;
>-    PFNGLGETSHADERIVROBUSTANGLE glGetShaderivRobustANGLE                               = nullptr;
>-    PFNGLGETTEXPARAMETERFVROBUSTANGLE glGetTexParameterfvRobustANGLE                   = nullptr;
>-    PFNGLGETTEXPARAMETERIVROBUSTANGLE glGetTexParameterivRobustANGLE                   = nullptr;
>-    PFNGLGETUNIFORMFVROBUSTANGLE glGetUniformfvRobustANGLE                             = nullptr;
>-    PFNGLGETUNIFORMIVROBUSTANGLE glGetUniformivRobustANGLE                             = nullptr;
>-    PFNGLGETVERTEXATTRIBFVROBUSTANGLE glGetVertexAttribfvRobustANGLE                   = nullptr;
>-    PFNGLGETVERTEXATTRIBIVROBUSTANGLE glGetVertexAttribivRobustANGLE                   = nullptr;
>-    PFNGLGETVERTEXATTRIBPOINTERVROBUSTANGLE glGetVertexAttribPointervRobustANGLE       = nullptr;
>-    PFNGLREADPIXELSROBUSTANGLE glReadPixelsRobustANGLE                                 = nullptr;
>-    PFNGLTEXIMAGE2DROBUSTANGLE glTexImage2DRobustANGLE                                 = nullptr;
>-    PFNGLTEXPARAMETERFVROBUSTANGLE glTexParameterfvRobustANGLE                         = nullptr;
>-    PFNGLTEXPARAMETERIVROBUSTANGLE glTexParameterivRobustANGLE                         = nullptr;
>-    PFNGLTEXSUBIMAGE2DROBUSTANGLE glTexSubImage2DRobustANGLE                           = nullptr;
>-    PFNGLTEXIMAGE3DROBUSTANGLE glTexImage3DRobustANGLE                                 = nullptr;
>-    PFNGLTEXSUBIMAGE3DROBUSTANGLE glTexSubImage3DRobustANGLE                           = nullptr;
>-    PFNGLGETQUERYIVROBUSTANGLE glGetQueryivRobustANGLE                                 = nullptr;
>-    PFNGLGETQUERYOBJECTUIVROBUSTANGLE glGetQueryObjectuivRobustANGLE                   = nullptr;
>-    PFNGLGETBUFFERPOINTERVROBUSTANGLE glGetBufferPointervRobustANGLE                   = nullptr;
>-    PFNGLGETINTEGERI_VROBUSTANGLE glGetIntegeri_vRobustANGLE                           = nullptr;
>-    PFNGETINTERNALFORMATIVROBUSTANGLE glGetInternalformativRobustANGLE                 = nullptr;
>-    PFNGLGETVERTEXATTRIBIIVROBUSTANGLE glGetVertexAttribIivRobustANGLE                 = nullptr;
>-    PFNGLGETVERTEXATTRIBIUIVROBUSTANGLE glGetVertexAttribIuivRobustANGLE               = nullptr;
>-    PFNGLGETUNIFORMUIVROBUSTANGLE glGetUniformuivRobustANGLE                           = nullptr;
>-    PFNGLGETACTIVEUNIFORMBLOCKIVROBUSTANGLE glGetActiveUniformBlockivRobustANGLE       = nullptr;
>-    PFNGLGETINTEGER64VROBUSTANGLE glGetInteger64vRobustANGLE                           = nullptr;
>-    PFNGLGETINTEGER64I_VROBUSTANGLE glGetInteger64i_vRobustANGLE                       = nullptr;
>-    PFNGLGETBUFFERPARAMETERI64VROBUSTANGLE glGetBufferParameteri64vRobustANGLE         = nullptr;
>-    PFNGLSAMPLERPARAMETERIVROBUSTANGLE glSamplerParameterivRobustANGLE                 = nullptr;
>-    PFNGLSAMPLERPARAMETERFVROBUSTANGLE glSamplerParameterfvRobustANGLE                 = nullptr;
>-    PFNGLGETSAMPLERPARAMETERIVROBUSTANGLE glGetSamplerParameterivRobustANGLE           = nullptr;
>-    PFNGLGETSAMPLERPARAMETERFVROBUSTANGLE glGetSamplerParameterfvRobustANGLE           = nullptr;
>-    PFNGLGETFRAMEBUFFERPARAMETERIVROBUSTANGLE glGetFramebufferParameterivRobustANGLE   = nullptr;
>-    PFNGLGETPROGRAMINTERFACEIVROBUSTANGLE glGetProgramInterfaceivRobustANGLE           = nullptr;
>-    PFNGLGETBOOLEANI_VROBUSTANGLE glGetBooleani_vRobustANGLE                           = nullptr;
>-    PFNGLGETMULTISAMPLEFVROBUSTANGLE glGetMultisamplefvRobustANGLE                     = nullptr;
>-    PFNGLGETTEXLEVELPARAMETERIVROBUSTANGLE glGetTexLevelParameterivRobustANGLE         = nullptr;
>-    PFNGLGETTEXLEVELPARAMETERFVROBUSTANGLE glGetTexLevelParameterfvRobustANGLE         = nullptr;
>-    PFNGLGETPOINTERVROBUSTANGLEROBUSTANGLE glGetPointervRobustANGLERobustANGLE         = nullptr;
>-    PFNGLREADNPIXELSROBUSTANGLE glReadnPixelsRobustANGLE                               = nullptr;
>-    PFNGLGETNUNIFORMFVROBUSTANGLE glGetnUniformfvRobustANGLE                           = nullptr;
>-    PFNGLGETNUNIFORMIVROBUSTANGLE glGetnUniformivRobustANGLE                           = nullptr;
>-    PFNGLGETNUNIFORMUIVROBUSTANGLE glGetnUniformuivRobustANGLE                         = nullptr;
>-    PFNGLTEXPARAMETERIIVROBUSTANGLE glTexParameterIivRobustANGLE                       = nullptr;
>-    PFNGLTEXPARAMETERIUIVROBUSTANGLE glTexParameterIuivRobustANGLE                     = nullptr;
>-    PFNGLGETTEXPARAMETERIIVROBUSTANGLE glGetTexParameterIivRobustANGLE                 = nullptr;
>-    PFNGLGETTEXPARAMETERIUIVROBUSTANGLE glGetTexParameterIuivRobustANGLE               = nullptr;
>-    PFNGLSAMPLERPARAMETERIIVROBUSTANGLE glSamplerParameterIivRobustANGLE               = nullptr;
>-    PFNGLSAMPLERPARAMETERIUIVROBUSTANGLE glSamplerParameterIuivRobustANGLE             = nullptr;
>-    PFNGLGETSAMPLERPARAMETERIIVROBUSTANGLE glGetSamplerParameterIivRobustANGLE         = nullptr;
>-    PFNGLGETSAMPLERPARAMETERIUIVROBUSTANGLE glGetSamplerParameterIuivRobustANGLE       = nullptr;
>-    PFNGLGETQUERYOBJECTIVROBUSTANGLE glGetQueryObjectivRobustANGLE                     = nullptr;
>-    PFNGLGETQUERYOBJECTI64VROBUSTANGLE glGetQueryObjecti64vRobustANGLE                 = nullptr;
>-    PFNGLGETQUERYOBJECTUI64VROBUSTANGLE glGetQueryObjectui64vRobustANGLE               = nullptr;
> };
> 
> // Test basic usage and validation of glGetIntegervRobustANGLE
>@@ -359,11 +155,7 @@ TEST_P(RobustClientMemoryTest, ReadPixels)
>     }
> 
>     // TODO(ynovikov): Looks like a driver bug on Intel HD 530 http://anglebug.com/1877
>-    if (IsLinux() && IsIntel() && IsDesktopOpenGL())
>-    {
>-        std::cout << "Test skipped on Intel OpenGL on Linux." << std::endl;
>-        return;
>-    }
>+    ANGLE_SKIP_TEST_IF(IsLinux() && IsIntel() && IsDesktopOpenGL());
> 
>     GLsizei dataDimension = 16;
>     std::vector<GLubyte> rgbaData(dataDimension * dataDimension * 4);
>@@ -416,6 +208,7 @@ ANGLE_INSTANTIATE_TEST(RobustClientMemoryTest,
>                        ES2_OPENGL(),
>                        ES3_OPENGL(),
>                        ES2_OPENGLES(),
>-                       ES3_OPENGLES());
>+                       ES3_OPENGLES(),
>+                       ES2_VULKAN());
> 
>-}  // namespace
>+}  // namespace angle
>diff --git a/Source/ThirdParty/ANGLE/src/tests/gl_tests/RobustResourceInitTest.cpp b/Source/ThirdParty/ANGLE/src/tests/gl_tests/RobustResourceInitTest.cpp
>index 7d07e3a138b..a7bf1c23f9b 100644
>--- a/Source/ThirdParty/ANGLE/src/tests/gl_tests/RobustResourceInitTest.cpp
>+++ b/Source/ThirdParty/ANGLE/src/tests/gl_tests/RobustResourceInitTest.cpp
>@@ -8,9 +8,19 @@
> #include "test_utils/ANGLETest.h"
> 
> #include "test_utils/gl_raii.h"
>+#include "util/EGLWindow.h"
> 
> namespace angle
> {
>+constexpr char kSimpleTextureVertexShader[] =
>+    "#version 300 es\n"
>+    "in vec4 position;\n"
>+    "out vec2 texcoord;\n"
>+    "void main()\n"
>+    "{\n"
>+    "    gl_Position = position;\n"
>+    "    texcoord = vec2(position.xy * 0.5 - 0.5);\n"
>+    "}";
> 
> // TODO(jmadill): Would be useful in a shared place in a utils folder.
> void UncompressDXTBlock(int destX,
>@@ -41,12 +51,12 @@ void UncompressDXTBlock(int destX,
>     };
>     bool isDXT1 =
>         (format == GL_COMPRESSED_RGB_S3TC_DXT1_EXT) || (format == GL_COMPRESSED_RGBA_S3TC_DXT1_EXT);
>-    int colorOffset = srcOffset + (isDXT1 ? 0 : 8);
>-    int color0      = make565(colorOffset + 0);
>-    int color1      = make565(colorOffset + 2);
>-    bool c0gtc1     = color0 > color1 || !isDXT1;
>-    GLColor rgba0   = make8888From565(color0);
>-    GLColor rgba1   = make8888From565(color1);
>+    int colorOffset               = srcOffset + (isDXT1 ? 0 : 8);
>+    int color0                    = make565(colorOffset + 0);
>+    int color1                    = make565(colorOffset + 2);
>+    bool c0gtc1                   = color0 > color1 || !isDXT1;
>+    GLColor rgba0                 = make8888From565(color0);
>+    GLColor rgba1                 = make8888From565(color1);
>     std::array<GLColor, 4> colors = {{rgba0, rgba1,
>                                       c0gtc1 ? mix(2, rgba0, rgba1, 3) : mix(1, rgba0, rgba1, 2),
>                                       c0gtc1 ? mix(2, rgba1, rgba0, 3) : GLColor::black}};
>@@ -190,20 +200,37 @@ class RobustResourceInitTest : public ANGLETest
>         setConfigGreenBits(8);
>         setConfigBlueBits(8);
>         setConfigAlphaBits(8);
>+        setConfigDepthBits(24);
>+        setConfigStencilBits(8);
> 
>         setRobustResourceInit(true);
>+
>+        // Test flakiness was noticed when reusing displays.
>+        forceNewDisplay();
>     }
> 
>     bool hasGLExtension()
>     {
>-        // Skip all tests on the OpenGL backend. It is not fully implemented but still needs to be
>-        // exposed to test in Chromium.
>-        if (IsDesktopOpenGL() || IsOpenGLES())
>+        return IsGLExtensionEnabled("GL_ANGLE_robust_resource_initialization");
>+    }
>+
>+    bool hasEGLExtension()
>+    {
>+        return IsEGLDisplayExtensionEnabled(getEGLWindow()->getDisplay(),
>+                                            "EGL_ANGLE_robust_resource_initialization");
>+    }
>+
>+    bool hasRobustSurfaceInit()
>+    {
>+        if (!hasEGLExtension())
>         {
>             return false;
>         }
> 
>-        return extensionEnabled("GL_ANGLE_robust_resource_initialization");
>+        EGLint robustSurfaceInit = EGL_FALSE;
>+        eglQuerySurface(getEGLWindow()->getDisplay(), getEGLWindow()->getSurface(),
>+                        EGL_ROBUST_RESOURCE_INITIALIZATION_ANGLE, &robustSurfaceInit);
>+        return robustSurfaceInit;
>     }
> 
>     void setupTexture(GLTexture *tex);
>@@ -237,16 +264,6 @@ class RobustResourceInitTest : public ANGLETest
>                                              int skipHeight,
>                                              const GLColor &skip);
> 
>-    const std::string kSimpleTextureVertexShader =
>-        "#version 300 es\n"
>-        "in vec4 position;\n"
>-        "out vec2 texcoord;\n"
>-        "void main()\n"
>-        "{\n"
>-        "    gl_Position = position;\n"
>-        "    texcoord = vec2(position.xy * 0.5 - 0.5);\n"
>-        "}";
>-
>     static std::string GetSimpleTextureFragmentShader(const char *samplerType)
>     {
>         std::stringstream fragmentStream;
>@@ -286,19 +303,25 @@ class RobustResourceInitTestES3 : public RobustResourceInitTest
>                                 GLenum type);
> };
> 
>+class RobustResourceInitTestES31 : public RobustResourceInitTest
>+{};
>+
> // Robust resource initialization is not based on hardware support or native extensions, check that
> // it only works on the implemented renderers
> TEST_P(RobustResourceInitTest, ExpectedRendererSupport)
> {
>-    bool shouldHaveSupport = IsD3D11() || IsD3D11_FL93() || IsD3D9();
>+    bool shouldHaveSupport =
>+        IsD3D11() || IsD3D11_FL93() || IsD3D9() || IsOpenGL() || IsOpenGLES() || IsVulkan();
>     EXPECT_EQ(shouldHaveSupport, hasGLExtension());
>+    EXPECT_EQ(shouldHaveSupport, hasEGLExtension());
>+    EXPECT_EQ(shouldHaveSupport, hasRobustSurfaceInit());
> }
> 
> // Tests of the GL_ROBUST_RESOURCE_INITIALIZATION_ANGLE query.
> TEST_P(RobustResourceInitTest, Queries)
> {
>     // If context extension string exposed, check queries.
>-    if (extensionEnabled("GL_ANGLE_robust_resource_initialization"))
>+    if (IsGLExtensionEnabled("GL_ANGLE_robust_resource_initialization"))
>     {
>         GLboolean enabled = 0;
>         glGetBooleanv(GL_ROBUST_RESOURCE_INITIALIZATION_ANGLE, &enabled);
>@@ -326,7 +349,7 @@ TEST_P(RobustResourceInitTest, BufferData)
>     glBufferData(GL_ARRAY_BUFFER, getWindowWidth() * getWindowHeight() * sizeof(GLfloat), nullptr,
>                  GL_STATIC_DRAW);
> 
>-    const std::string &vertexShader =
>+    constexpr char kVS[] =
>         "attribute vec2 position;\n"
>         "attribute float testValue;\n"
>         "varying vec4 colorOut;\n"
>@@ -334,13 +357,13 @@ TEST_P(RobustResourceInitTest, BufferData)
>         "    gl_Position = vec4(position, 0, 1);\n"
>         "    colorOut = testValue == 0.0 ? vec4(0, 1, 0, 1) : vec4(1, 0, 0, 1);\n"
>         "}";
>-    const std::string &fragmentShader =
>+    constexpr char kFS[] =
>         "varying mediump vec4 colorOut;\n"
>         "void main() {\n"
>         "    gl_FragColor = colorOut;\n"
>         "}";
> 
>-    ANGLE_GL_PROGRAM(program, vertexShader, fragmentShader);
>+    ANGLE_GL_PROGRAM(program, kVS, kFS);
> 
>     GLint testValueLoc = glGetAttribLocation(program.get(), "testValue");
>     ASSERT_NE(-1, testValueLoc);
>@@ -488,7 +511,7 @@ void RobustResourceInitTest::checkCustomFramebufferNonZeroPixels(int fboWidth,
>             int index = (y * fboWidth + x);
>             if (x >= skipX && x < skipX + skipWidth && y >= skipY && y < skipY + skipHeight)
>             {
>-                ASSERT_EQ(skip, data[index]);
>+                ASSERT_EQ(skip, data[index]) << " at pixel " << x << ", " << y;
>             }
>             else
>             {
>@@ -518,6 +541,9 @@ TEST_P(RobustResourceInitTest, ReuploadingClearsTexture)
> {
>     ANGLE_SKIP_TEST_IF(!hasGLExtension());
> 
>+    // crbug.com/826576
>+    ANGLE_SKIP_TEST_IF(IsOSX() && IsNVIDIA() && IsDesktopOpenGL());
>+
>     // Put some data into the texture
>     std::array<GLColor, kWidth * kHeight> data;
>     data.fill(GLColor::white);
>@@ -539,6 +565,9 @@ TEST_P(RobustResourceInitTest, TexImageThenSubImage)
> {
>     ANGLE_SKIP_TEST_IF(!hasGLExtension());
> 
>+    // http://anglebug.com/2407, but only fails on Nexus devices
>+    ANGLE_SKIP_TEST_IF((IsNexus5X() || IsNexus6P()) && IsOpenGLES());
>+
>     // Put some data into the texture
> 
>     GLTexture tex;
>@@ -623,12 +652,13 @@ TEST_P(RobustResourceInitTestES3, BindTexImage)
> 
>     EGLint surfaceType = 0;
>     eglGetConfigAttrib(display, config, EGL_SURFACE_TYPE, &surfaceType);
>-    if ((surfaceType & EGL_PBUFFER_BIT) == 0)
>-    {
>-        std::cout << "Test skipped because EGL config cannot be used to create pbuffers."
>-                  << std::endl;
>-        return;
>-    }
>+    // Test skipped because EGL config cannot be used to create pbuffers.
>+    ANGLE_SKIP_TEST_IF((surfaceType & EGL_PBUFFER_BIT) == 0);
>+
>+    EGLint bindToSurfaceRGBA = 0;
>+    eglGetConfigAttrib(display, config, EGL_BIND_TO_TEXTURE_RGBA, &bindToSurfaceRGBA);
>+    // Test skipped because EGL config cannot be used to create pbuffers.
>+    ANGLE_SKIP_TEST_IF(bindToSurfaceRGBA == EGL_FALSE);
> 
>     EGLint attribs[] = {
>         EGL_WIDTH,          32,
>@@ -658,7 +688,14 @@ TEST_P(RobustResourceInitTestES3, BindTexImage)
>     GLFramebuffer fbo;
>     glBindFramebuffer(GL_FRAMEBUFFER, fbo);
>     glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, texture, 0);
>-    EXPECT_PIXEL_COLOR_EQ(0, 0, clearColor);
>+    if (glCheckFramebufferStatus(GL_FRAMEBUFFER) == GL_FRAMEBUFFER_COMPLETE)
>+    {
>+        EXPECT_PIXEL_COLOR_EQ(0, 0, clearColor);
>+    }
>+    else
>+    {
>+        std::cout << "Read pixels check skipped because framebuffer was not complete." << std::endl;
>+    }
> 
>     eglDestroySurface(display, pbuffer);
> }
>@@ -674,14 +711,14 @@ TEST_P(RobustResourceInitTest, DrawWithTexture)
>     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
>     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
> 
>-    const std::string &vertexShader =
>+    constexpr char kVS[] =
>         "attribute vec2 position;\n"
>         "varying vec2 texCoord;\n"
>         "void main() {\n"
>         "    gl_Position = vec4(position, 0, 1);\n"
>         "    texCoord = (position * 0.5) + 0.5;\n"
>         "}";
>-    const std::string &fragmentShader =
>+    constexpr char kFS[] =
>         "precision mediump float;\n"
>         "varying vec2 texCoord;\n"
>         "uniform sampler2D tex;\n"
>@@ -689,7 +726,7 @@ TEST_P(RobustResourceInitTest, DrawWithTexture)
>         "    gl_FragColor = texture2D(tex, texCoord);\n"
>         "}";
> 
>-    ANGLE_GL_PROGRAM(program, vertexShader, fragmentShader);
>+    ANGLE_GL_PROGRAM(program, kVS, kFS);
>     drawQuad(program, "position", 0.5f);
> 
>     checkFramebufferNonZeroPixels(0, 0, 0, 0, GLColor::black);
>@@ -701,6 +738,9 @@ TEST_P(RobustResourceInitTest, ReadingPartiallyInitializedTexture)
> {
>     ANGLE_SKIP_TEST_IF(!hasGLExtension());
> 
>+    // http://anglebug.com/2407, but only fails on Nexus devices
>+    ANGLE_SKIP_TEST_IF((IsNexus5X() || IsNexus6P()) && IsOpenGLES());
>+
>     GLTexture tex;
>     setupTexture(&tex);
>     glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, kWidth, kHeight, 0, GL_RGBA, GL_UNSIGNED_BYTE, nullptr);
>@@ -735,9 +775,70 @@ TEST_P(RobustResourceInitTest, UninitializedPartsOfCopied2DTexturesAreBlack)
>     EXPECT_GL_NO_ERROR();
> }
> 
>+// Reading an uninitialized portion of a texture (copyTexImage2D with negative x and y) should
>+// succeed with all bytes set to 0. Regression test for a bug where the zeroing out of the
>+// texture was done via the same code path as glTexImage2D, causing the PIXEL_UNPACK_BUFFER
>+// to be used.
>+TEST_P(RobustResourceInitTestES3, ReadingOutOfBoundsCopiedTextureWithUnpackBuffer)
>+{
>+    ANGLE_SKIP_TEST_IF(!hasGLExtension());
>+    // TODO(geofflang@chromium.org): CopyTexImage from GL_RGBA4444 to GL_ALPHA fails when looking
>+    // up which resulting format the texture should have.
>+    ANGLE_SKIP_TEST_IF(IsOpenGL());
>+
>+    // GL_ALPHA texture can't be read with glReadPixels, for convenience this test uses
>+    // glCopyTextureCHROMIUM to copy GL_ALPHA into GL_RGBA
>+    ANGLE_SKIP_TEST_IF(!IsGLExtensionEnabled("GL_CHROMIUM_copy_texture"));
>+    PFNGLCOPYTEXTURECHROMIUMPROC glCopyTextureCHROMIUM =
>+        reinterpret_cast<PFNGLCOPYTEXTURECHROMIUMPROC>(eglGetProcAddress("glCopyTextureCHROMIUM"));
>+
>+    GLFramebuffer fbo;
>+    glBindFramebuffer(GL_FRAMEBUFFER, fbo);
>+    GLRenderbuffer rbo;
>+    glBindRenderbuffer(GL_RENDERBUFFER, rbo);
>+    constexpr int fboWidth  = 16;
>+    constexpr int fboHeight = 16;
>+    glRenderbufferStorage(GL_RENDERBUFFER, GL_RGBA4, fboWidth, fboHeight);
>+    glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_RENDERBUFFER, rbo);
>+    EXPECT_GLENUM_EQ(GL_FRAMEBUFFER_COMPLETE, glCheckFramebufferStatus(GL_FRAMEBUFFER));
>+    glClearColor(1.0, 0.0, 0.0, 1.0);
>+    glClear(GL_COLOR_BUFFER_BIT);
>+    EXPECT_GL_NO_ERROR();
>+    constexpr int x = -8;
>+    constexpr int y = -8;
>+
>+    GLBuffer buffer;
>+    glBindBuffer(GL_PIXEL_UNPACK_BUFFER, buffer);
>+    std::vector<GLColor> bunchOfGreen(fboWidth * fboHeight, GLColor::green);
>+    glBufferData(GL_PIXEL_UNPACK_BUFFER, sizeof(bunchOfGreen), bunchOfGreen.data(), GL_STATIC_DRAW);
>+    EXPECT_GL_NO_ERROR();
>+
>+    // Use non-multiple-of-4 dimensions to make sure unpack alignment is set in the backends
>+    // (http://crbug.com/836131)
>+    constexpr int kTextureWidth  = 127;
>+    constexpr int kTextureHeight = 127;
>+
>+    // Use GL_ALPHA to force a CPU readback in the D3D11 backend
>+    GLTexture texAlpha;
>+    glBindTexture(GL_TEXTURE_2D, texAlpha);
>+    glCopyTexImage2D(GL_TEXTURE_2D, 0, GL_ALPHA, x, y, kTextureWidth, kTextureHeight, 0);
>+    EXPECT_GL_NO_ERROR();
>+
>+    // GL_ALPHA cannot be glReadPixels, so copy into a GL_RGBA texture
>+    GLTexture texRGBA;
>+    glBindBuffer(GL_PIXEL_UNPACK_BUFFER, 0);
>+    setupTexture(&texRGBA);
>+    glCopyTextureCHROMIUM(texAlpha, 0, GL_TEXTURE_2D, texRGBA, 0, GL_RGBA, GL_UNSIGNED_BYTE,
>+                          GL_FALSE, GL_FALSE, GL_FALSE);
>+    EXPECT_GL_NO_ERROR();
>+
>+    checkNonZeroPixels(&texRGBA, -x, -y, fboWidth, fboHeight, GLColor(0, 0, 0, 255));
>+    EXPECT_GL_NO_ERROR();
>+}
>+
> // Reading an uninitialized portion of a texture (copyTexImage2D with negative x and y) should
> // succeed with all bytes set to 0.
>-TEST_P(RobustResourceInitTest, ReadingOutOfboundsCopiedTexture)
>+TEST_P(RobustResourceInitTest, ReadingOutOfBoundsCopiedTexture)
> {
>     ANGLE_SKIP_TEST_IF(!hasGLExtension());
> 
>@@ -767,9 +868,10 @@ TEST_P(RobustResourceInitTestES3, MultisampledDepthInitializedCorrectly)
> {
>     ANGLE_SKIP_TEST_IF(!hasGLExtension());
> 
>-    const std::string vs = "attribute vec4 position; void main() { gl_Position = position; }";
>-    const std::string fs = "void main() { gl_FragColor = vec4(1, 0, 0, 1); }";
>-    ANGLE_GL_PROGRAM(program, vs, fs);
>+    // http://anglebug.com/2407
>+    ANGLE_SKIP_TEST_IF(IsAndroid() && IsOpenGLES());
>+
>+    ANGLE_GL_PROGRAM(program, essl1_shaders::vs::Simple(), essl1_shaders::fs::Red());
> 
>     // Make the destination non-multisampled depth FBO.
>     GLTexture color;
>@@ -812,7 +914,7 @@ TEST_P(RobustResourceInitTestES3, MultisampledDepthInitializedCorrectly)
>     glDepthMask(GL_FALSE);
>     glEnable(GL_DEPTH_TEST);
>     glDepthFunc(GL_EQUAL);
>-    drawQuad(program, "position", 1.0f);
>+    drawQuad(program, essl1_shaders::PositionAttrib(), 1.0f);
>     ASSERT_GL_NO_ERROR();
>     EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::red);
> }
>@@ -840,8 +942,9 @@ void RobustResourceInitTestES3::testIntegerTextureInit(const char *samplerType,
> {
>     ANGLE_SKIP_TEST_IF(!hasGLExtension());
> 
>-    ANGLE_GL_PROGRAM(program, kSimpleTextureVertexShader,
>-                     GetSimpleTextureFragmentShader(samplerType));
>+    std::string fs = GetSimpleTextureFragmentShader(samplerType);
>+
>+    ANGLE_GL_PROGRAM(program, kSimpleTextureVertexShader, fs.c_str());
> 
>     // Make an RGBA framebuffer.
>     GLTexture framebufferTexture;
>@@ -912,6 +1015,56 @@ TEST_P(RobustResourceInitTestES3, TextureInit_IntRGB32)
>     testIntegerTextureInit<int32_t>("i", GL_RGBA32I, GL_RGB32I, GL_INT);
> }
> 
>+// Test that uninitialized image texture works well.
>+TEST_P(RobustResourceInitTestES31, ImageTextureInit_R32UI)
>+{
>+    ANGLE_SKIP_TEST_IF(!hasGLExtension());
>+    constexpr char kCS[] =
>+        R"(#version 310 es
>+        layout(local_size_x=1, local_size_y=1, local_size_z=1) in;
>+        layout(r32ui, binding = 1) writeonly uniform highp uimage2D writeImage;
>+        void main()
>+        {
>+            imageStore(writeImage, ivec2(gl_LocalInvocationID.xy), uvec4(200u));
>+        })";
>+
>+    GLTexture texture;
>+    // Don't upload data to texture.
>+    glBindTexture(GL_TEXTURE_2D, texture);
>+    glTexStorage2D(GL_TEXTURE_2D, 1, GL_R32UI, 1, 1);
>+    EXPECT_GL_NO_ERROR();
>+
>+    ANGLE_GL_COMPUTE_PROGRAM(program, kCS);
>+    glUseProgram(program.get());
>+
>+    glBindImageTexture(1, texture, 0, GL_FALSE, 0, GL_WRITE_ONLY, GL_R32UI);
>+
>+    glDispatchCompute(1, 1, 1);
>+    EXPECT_GL_NO_ERROR();
>+
>+    GLFramebuffer framebuffer;
>+    glBindFramebuffer(GL_READ_FRAMEBUFFER, framebuffer);
>+    glFramebufferTexture2D(GL_READ_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, texture, 0);
>+
>+    GLuint outputValue;
>+    glReadPixels(0, 0, 1, 1, GL_RED_INTEGER, GL_UNSIGNED_INT, &outputValue);
>+    EXPECT_GL_NO_ERROR();
>+
>+    EXPECT_EQ(200u, outputValue);
>+
>+    outputValue = 0u;
>+    // Write to another uninitialized texture.
>+    GLTexture texture2;
>+    glBindTexture(GL_TEXTURE_2D, texture2);
>+    glTexStorage2D(GL_TEXTURE_2D, 1, GL_R32UI, 1, 1);
>+    EXPECT_GL_NO_ERROR();
>+    glBindImageTexture(1, texture2, 0, GL_FALSE, 0, GL_WRITE_ONLY, GL_R32UI);
>+    glDispatchCompute(1, 1, 1);
>+    glFramebufferTexture2D(GL_READ_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, texture2, 0);
>+    glReadPixels(0, 0, 1, 1, GL_RED_INTEGER, GL_UNSIGNED_INT, &outputValue);
>+    EXPECT_EQ(200u, outputValue);
>+}
>+
> // Basic test that renderbuffers are initialized correctly.
> TEST_P(RobustResourceInitTest, Renderbuffer)
> {
>@@ -943,7 +1096,8 @@ TEST_P(RobustResourceInitTestES3, GenerateMipmap)
>     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST_MIPMAP_NEAREST);
>     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
> 
>-    ANGLE_GL_PROGRAM(program, kSimpleTextureVertexShader, GetSimpleTextureFragmentShader(""));
>+    std::string shader = GetSimpleTextureFragmentShader("");
>+    ANGLE_GL_PROGRAM(program, kSimpleTextureVertexShader, shader.c_str());
> 
>     // Generate mipmaps and verify all the mips.
>     glGenerateMipmap(GL_TEXTURE_2D);
>@@ -961,11 +1115,51 @@ TEST_P(RobustResourceInitTestES3, GenerateMipmap)
>     EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::transparentBlack);
> }
> 
>+// Tests creating mipmaps for cube maps with robust resource init.
>+TEST_P(RobustResourceInitTestES3, GenerateMipmapCubeMap)
>+{
>+    ANGLE_SKIP_TEST_IF(!hasGLExtension());
>+
>+    constexpr GLint kTextureSize   = 16;
>+    constexpr GLint kTextureLevels = 5;
>+
>+    // Initialize a 16x16 RGBA8 texture with no data.
>+    GLTexture tex;
>+    glBindTexture(GL_TEXTURE_CUBE_MAP, tex);
>+    for (GLenum target = GL_TEXTURE_CUBE_MAP_POSITIVE_X; target <= GL_TEXTURE_CUBE_MAP_NEGATIVE_Z;
>+         ++target)
>+    {
>+        glTexImage2D(target, 0, GL_RGBA, kTextureSize, kTextureSize, 0, GL_RGBA, GL_UNSIGNED_BYTE,
>+                     nullptr);
>+    }
>+    glTexParameteri(GL_TEXTURE_CUBE_MAP, GL_TEXTURE_MIN_FILTER, GL_NEAREST_MIPMAP_NEAREST);
>+    glTexParameteri(GL_TEXTURE_CUBE_MAP, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
>+
>+    // Generate mipmaps and verify all the mips.
>+    glGenerateMipmap(GL_TEXTURE_CUBE_MAP);
>+    ASSERT_GL_NO_ERROR();
>+
>+    GLFramebuffer fbo;
>+    glBindFramebuffer(GL_FRAMEBUFFER, fbo);
>+    for (GLenum target = GL_TEXTURE_CUBE_MAP_POSITIVE_X; target <= GL_TEXTURE_CUBE_MAP_NEGATIVE_Z;
>+         ++target)
>+    {
>+        for (GLint level = 0; level < kTextureLevels; ++level)
>+        {
>+            glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, target, tex, level);
>+            EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::transparentBlack);
>+        }
>+    }
>+}
>+
> // Test blitting a framebuffer out-of-bounds. Multiple iterations.
> TEST_P(RobustResourceInitTestES3, BlitFramebufferOutOfBounds)
> {
>     ANGLE_SKIP_TEST_IF(!hasGLExtension());
> 
>+    // http://anglebug.com/2408
>+    ANGLE_SKIP_TEST_IF(IsOSX() && IsAMD());
>+
>     // Initiate data to read framebuffer
>     constexpr int size                = 8;
>     constexpr GLenum readbufferFormat = GL_RGBA8;
>@@ -1005,8 +1199,7 @@ TEST_P(RobustResourceInitTestES3, BlitFramebufferOutOfBounds)
>     {
>         constexpr Test(const Region &read, const Region &draw, const Region &real)
>             : readRegion(read), drawRegion(draw), realRegion(real)
>-        {
>-        }
>+        {}
> 
>         Region readRegion;
>         Region drawRegion;
>@@ -1095,16 +1288,13 @@ void RobustResourceInitTest::maskedDepthClear(ClearFunc clearFunc)
>     glEnable(GL_DEPTH_TEST);
>     glDepthFunc(GL_EQUAL);
> 
>-    const std::string vertexShader =
>-        "attribute vec4 position; void main() { gl_Position = position; }";
>-    const std::string fragmentShader = "void main() { gl_FragColor = vec4(1, 0, 0, 1); }";
>-    ANGLE_GL_PROGRAM(program, vertexShader, fragmentShader);
>+    ANGLE_GL_PROGRAM(program, essl1_shaders::vs::Simple(), essl1_shaders::fs::Red());
> 
>-    drawQuad(program, "position", 0.5f);
>+    drawQuad(program, essl1_shaders::PositionAttrib(), 0.5f);
>     ASSERT_GL_NO_ERROR();
>     EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::black) << "depth should not be 0.5f";
> 
>-    drawQuad(program, "position", 1.0f);
>+    drawQuad(program, essl1_shaders::PositionAttrib(), 1.0f);
>     EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::red) << "depth should be initialized to 1.0f";
> }
> 
>@@ -1113,6 +1303,9 @@ TEST_P(RobustResourceInitTest, MaskedDepthClear)
> {
>     ANGLE_SKIP_TEST_IF(!hasGLExtension());
> 
>+    // http://anglebug.com/2407
>+    ANGLE_SKIP_TEST_IF(IsAndroid() && IsOpenGLES());
>+
>     auto clearFunc = [](float depth) {
>         glClearColor(0.0f, 0.0f, 0.0f, 1.0f);
>         glClearDepthf(depth);
>@@ -1127,6 +1320,9 @@ TEST_P(RobustResourceInitTestES3, MaskedDepthClearBuffer)
> {
>     ANGLE_SKIP_TEST_IF(!hasGLExtension());
> 
>+    // http://anglebug.com/2407
>+    ANGLE_SKIP_TEST_IF(IsAndroid() && IsOpenGLES());
>+
>     auto clearFunc = [](float depth) {
>         glClearColor(0.0f, 0.0f, 0.0f, 1.0f);
>         glClear(GL_COLOR_BUFFER_BIT);
>@@ -1170,12 +1366,9 @@ void RobustResourceInitTest::maskedStencilClear(ClearFunc clearFunc)
>     glStencilFunc(GL_EQUAL, 0x00, 0xFF);
>     glStencilOp(GL_KEEP, GL_KEEP, GL_KEEP);
> 
>-    const std::string vertexShader =
>-        "attribute vec4 position; void main() { gl_Position = position; }";
>-    const std::string fragmentShader = "void main() { gl_FragColor = vec4(1, 0, 0, 1); }";
>-    ANGLE_GL_PROGRAM(program, vertexShader, fragmentShader);
>+    ANGLE_GL_PROGRAM(program, essl1_shaders::vs::Simple(), essl1_shaders::fs::Red());
> 
>-    drawQuad(program, "position", 0.5f);
>+    drawQuad(program, essl1_shaders::PositionAttrib(), 0.5f);
>     ASSERT_GL_NO_ERROR();
>     EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::red) << "stencil should be equal to zero";
> }
>@@ -1186,6 +1379,9 @@ TEST_P(RobustResourceInitTest, MaskedStencilClear)
>     ANGLE_SKIP_TEST_IF(!hasGLExtension());
>     ANGLE_SKIP_TEST_IF(IsD3D11_FL93());
> 
>+    // http://anglebug.com/2407, but only fails on Nexus devices
>+    ANGLE_SKIP_TEST_IF((IsNexus5X() || IsNexus6P()) && IsOpenGLES());
>+
>     auto clearFunc = [](GLint clearValue) {
>         glClearColor(0.0f, 0.0f, 0.0f, 1.0f);
>         glClearStencil(clearValue);
>@@ -1200,6 +1396,14 @@ TEST_P(RobustResourceInitTestES3, MaskedStencilClearBuffer)
> {
>     ANGLE_SKIP_TEST_IF(!hasGLExtension());
> 
>+    // http://anglebug.com/2408
>+    ANGLE_SKIP_TEST_IF(IsOSX() && IsOpenGL() && (IsIntel() || IsNVIDIA()));
>+
>+    ANGLE_SKIP_TEST_IF(IsLinux() && IsOpenGL());
>+
>+    // http://anglebug.com/2407, but only fails on Nexus devices
>+    ANGLE_SKIP_TEST_IF((IsNexus5X() || IsNexus6P()) && IsOpenGLES());
>+
>     auto clearFunc = [](GLint clearValue) {
>         glClearColor(0.0f, 0.0f, 0.0f, 1.0f);
>         glClear(GL_COLOR_BUFFER_BIT);
>@@ -1239,9 +1443,9 @@ TEST_P(RobustResourceInitTest, CopyTexSubImage2D)
>     ANGLE_SKIP_TEST_IF(!hasGLExtension());
>     ANGLE_SKIP_TEST_IF(IsD3D11_FL93());
> 
>-    constexpr int kDestSize = 4;
>-    constexpr int kSrcSize  = kDestSize / 2;
>-    constexpr int kOffset   = kSrcSize / 2;
>+    static constexpr int kDestSize = 4;
>+    constexpr int kSrcSize         = kDestSize / 2;
>+    static constexpr int kOffset   = kSrcSize / 2;
> 
>     std::vector<GLColor> redColors(kDestSize * kDestSize, GLColor::red);
> 
>@@ -1271,7 +1475,7 @@ TEST_P(RobustResourceInitTest, CopyTexSubImage2D)
>     glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, destTexture, 0);
>     ASSERT_GL_NO_ERROR();
> 
>-    auto srcInitTest = [kOffset, kDestSize](int x, int y) {
>+    auto srcInitTest = [](int x, int y) {
>         return (x >= kOffset) && x < (kDestSize - kOffset) && (y >= kOffset) &&
>                y < (kDestSize - kOffset);
>     };
>@@ -1306,9 +1510,9 @@ TEST_P(RobustResourceInitTestES3, CopyTexSubImage3D)
> {
>     ANGLE_SKIP_TEST_IF(!hasGLExtension());
> 
>-    constexpr int kDestSize = 4;
>-    constexpr int kSrcSize  = kDestSize / 2;
>-    constexpr int kOffset   = kSrcSize / 2;
>+    static constexpr int kDestSize = 4;
>+    constexpr int kSrcSize         = kDestSize / 2;
>+    static constexpr int kOffset   = kSrcSize / 2;
> 
>     std::vector<GLColor> redColors(kDestSize * kDestSize * kDestSize, GLColor::red);
> 
>@@ -1339,7 +1543,7 @@ TEST_P(RobustResourceInitTestES3, CopyTexSubImage3D)
>     glFramebufferTextureLayer(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, destTexture, 0, 0);
>     ASSERT_GL_NO_ERROR();
> 
>-    auto srcInitTest = [kOffset, kDestSize](int x, int y) {
>+    auto srcInitTest = [](int x, int y) {
>         return (x >= kOffset) && x < (kDestSize - kOffset) && (y >= kOffset) &&
>                y < (kDestSize - kOffset);
>     };
>@@ -1399,7 +1603,7 @@ TEST_P(RobustResourceInitTestES3, Texture2DArray)
> TEST_P(RobustResourceInitTestES3, CompressedSubImage)
> {
>     ANGLE_SKIP_TEST_IF(!hasGLExtension());
>-    ANGLE_SKIP_TEST_IF(!extensionEnabled("GL_EXT_texture_compression_dxt1"));
>+    ANGLE_SKIP_TEST_IF(!IsGLExtensionEnabled("GL_EXT_texture_compression_dxt1"));
> 
>     constexpr int width     = 8;
>     constexpr int height    = 8;
>@@ -1504,6 +1708,148 @@ TEST_P(RobustResourceInitTest, ClearWithScissor)
>     EXPECT_PIXEL_COLOR_EQ(kSize - 1, 0, GLColor::transparentBlack);
> }
> 
>+// Tests that surfaces are initialized when they are created
>+TEST_P(RobustResourceInitTest, SurfaceInitialized)
>+{
>+    ANGLE_SKIP_TEST_IF(!hasRobustSurfaceInit());
>+
>+    checkFramebufferNonZeroPixels(0, 0, 0, 0, GLColor::black);
>+}
>+
>+// Tests that surfaces are initialized after swapping if they are not preserved
>+TEST_P(RobustResourceInitTest, SurfaceInitializedAfterSwap)
>+{
>+    ANGLE_SKIP_TEST_IF(!hasRobustSurfaceInit());
>+
>+    EGLint swapBehaviour = 0;
>+    ASSERT_TRUE(eglQuerySurface(getEGLWindow()->getDisplay(), getEGLWindow()->getSurface(),
>+                                EGL_SWAP_BEHAVIOR, &swapBehaviour));
>+
>+    const std::array<GLColor, 4> clearColors = {{
>+        GLColor::blue,
>+        GLColor::cyan,
>+        GLColor::red,
>+        GLColor::yellow,
>+    }};
>+    for (size_t i = 0; i < clearColors.size(); i++)
>+    {
>+        if (swapBehaviour == EGL_BUFFER_PRESERVED && i > 0)
>+        {
>+            EXPECT_PIXEL_COLOR_EQ(0, 0, clearColors[i - 1]);
>+        }
>+        else
>+        {
>+            checkFramebufferNonZeroPixels(0, 0, 0, 0, GLColor::black);
>+        }
>+
>+        angle::Vector4 clearColor = clearColors[i].toNormalizedVector();
>+        glClearColor(clearColor[0], clearColor[1], clearColor[2], clearColor[3]);
>+        glClear(GL_COLOR_BUFFER_BIT);
>+        EXPECT_GL_NO_ERROR();
>+
>+        swapBuffers();
>+    }
>+}
>+
>+// Test that multisampled 2D textures are initialized.
>+TEST_P(RobustResourceInitTestES31, Multisample2DTexture)
>+{
>+    ANGLE_SKIP_TEST_IF(!hasGLExtension());
>+
>+    GLTexture texture;
>+    glBindTexture(GL_TEXTURE_2D_MULTISAMPLE, texture);
>+    glTexStorage2DMultisample(GL_TEXTURE_2D_MULTISAMPLE, 2, GL_RGBA8, kWidth, kHeight, false);
>+
>+    GLFramebuffer framebuffer;
>+    glBindFramebuffer(GL_READ_FRAMEBUFFER, framebuffer);
>+    glFramebufferTexture2D(GL_READ_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D_MULTISAMPLE,
>+                           texture, 0);
>+
>+    GLTexture resolveTexture;
>+    glBindTexture(GL_TEXTURE_2D, resolveTexture);
>+    glTexStorage2D(GL_TEXTURE_2D, 1, GL_RGBA8, kWidth, kHeight);
>+
>+    GLFramebuffer resolveFramebuffer;
>+    glBindFramebuffer(GL_DRAW_FRAMEBUFFER, resolveFramebuffer);
>+    glFramebufferTexture2D(GL_DRAW_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, resolveTexture,
>+                           0);
>+    ASSERT_GL_NO_ERROR();
>+
>+    glBlitFramebuffer(0, 0, kWidth, kHeight, 0, 0, kWidth, kHeight, GL_COLOR_BUFFER_BIT,
>+                      GL_NEAREST);
>+    ASSERT_GL_NO_ERROR();
>+
>+    glBindFramebuffer(GL_READ_FRAMEBUFFER, resolveFramebuffer);
>+    EXPECT_PIXEL_RECT_EQ(0, 0, kWidth, kHeight, GLColor::transparentBlack);
>+}
>+
>+// Test that multisampled 2D texture arrays from OES_texture_storage_multisample_2d_array are
>+// initialized.
>+TEST_P(RobustResourceInitTestES31, Multisample2DTextureArray)
>+{
>+    ANGLE_SKIP_TEST_IF(!hasGLExtension());
>+
>+    if (IsGLExtensionRequestable("GL_OES_texture_storage_multisample_2d_array"))
>+    {
>+        glRequestExtensionANGLE("GL_OES_texture_storage_multisample_2d_array");
>+    }
>+    ANGLE_SKIP_TEST_IF(!IsGLExtensionEnabled("GL_OES_texture_storage_multisample_2d_array"));
>+
>+    const GLsizei kLayers = 4;
>+
>+    GLTexture texture;
>+    glBindTexture(GL_TEXTURE_2D_MULTISAMPLE_ARRAY_OES, texture);
>+    glTexStorage3DMultisampleOES(GL_TEXTURE_2D_MULTISAMPLE_ARRAY_OES, 2, GL_RGBA8, kWidth, kHeight,
>+                                 kLayers, false);
>+
>+    GLTexture resolveTexture;
>+    glBindTexture(GL_TEXTURE_2D, resolveTexture);
>+    glTexStorage2D(GL_TEXTURE_2D, 1, GL_RGBA8, kWidth, kHeight);
>+
>+    GLFramebuffer resolveFramebuffer;
>+    glBindFramebuffer(GL_DRAW_FRAMEBUFFER, resolveFramebuffer);
>+    glFramebufferTexture2D(GL_DRAW_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, resolveTexture,
>+                           0);
>+    ASSERT_GL_NO_ERROR();
>+
>+    for (GLsizei layerIndex = 0; layerIndex < kLayers; ++layerIndex)
>+    {
>+        GLFramebuffer framebuffer;
>+        glBindFramebuffer(GL_READ_FRAMEBUFFER, framebuffer);
>+        glFramebufferTextureLayer(GL_READ_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, texture, 0,
>+                                  layerIndex);
>+
>+        glBlitFramebuffer(0, 0, kWidth, kHeight, 0, 0, kWidth, kHeight, GL_COLOR_BUFFER_BIT,
>+                          GL_NEAREST);
>+        ASSERT_GL_NO_ERROR();
>+
>+        glBindFramebuffer(GL_READ_FRAMEBUFFER, resolveFramebuffer);
>+        EXPECT_PIXEL_RECT_EQ(0, 0, kWidth, kHeight, GLColor::transparentBlack);
>+    }
>+}
>+
>+// Tests that using an out of bounds draw offset with a dynamic array succeeds.
>+TEST_P(RobustResourceInitTest, DynamicVertexArrayOffsetOutOfBounds)
>+{
>+    // Not implemented on Vulkan.  http://anglebug.com/3350
>+    ANGLE_SKIP_TEST_IF(IsVulkan());
>+
>+    ANGLE_GL_PROGRAM(program, essl1_shaders::vs::Simple(), essl1_shaders::fs::Red());
>+    glUseProgram(program);
>+
>+    GLint posLoc = glGetAttribLocation(program, essl1_shaders::PositionAttrib());
>+    ASSERT_NE(-1, posLoc);
>+
>+    glEnableVertexAttribArray(posLoc);
>+    GLBuffer buf;
>+    glBindBuffer(GL_ARRAY_BUFFER, buf);
>+    glVertexAttribPointer(posLoc, 4, GL_FLOAT, GL_FALSE, 0, reinterpret_cast<const void *>(500));
>+    glBufferData(GL_ARRAY_BUFFER, 100, nullptr, GL_DYNAMIC_DRAW);
>+    glDrawArrays(GL_TRIANGLES, 0, 3);
>+
>+    // Either no error or invalid operation is okay.
>+}
>+
> ANGLE_INSTANTIATE_TEST(RobustResourceInitTest,
>                        ES2_D3D9(),
>                        ES2_D3D11(),
>@@ -1512,8 +1858,11 @@ ANGLE_INSTANTIATE_TEST(RobustResourceInitTest,
>                        ES2_OPENGL(),
>                        ES3_OPENGL(),
>                        ES2_OPENGLES(),
>-                       ES3_OPENGLES());
>+                       ES3_OPENGLES(),
>+                       ES2_VULKAN());
> 
> ANGLE_INSTANTIATE_TEST(RobustResourceInitTestES3, ES3_D3D11(), ES3_OPENGL(), ES3_OPENGLES());
> 
>-}  // namespace
>+ANGLE_INSTANTIATE_TEST(RobustResourceInitTestES31, ES31_OPENGL(), ES31_D3D11());
>+
>+}  // namespace angle
>diff --git a/Source/ThirdParty/ANGLE/src/tests/gl_tests/SRGBFramebufferTest.cpp b/Source/ThirdParty/ANGLE/src/tests/gl_tests/SRGBFramebufferTest.cpp
>index 47ff2f3e052..9afb372551e 100644
>--- a/Source/ThirdParty/ANGLE/src/tests/gl_tests/SRGBFramebufferTest.cpp
>+++ b/Source/ThirdParty/ANGLE/src/tests/gl_tests/SRGBFramebufferTest.cpp
>@@ -29,26 +29,10 @@ class SRGBFramebufferTest : public ANGLETest
>     {
>         ANGLETest::SetUp();
> 
>-        const std::string vs =
>-            "precision highp float;\n"
>-            "attribute vec4 position;\n"
>-            "void main()\n"
>-            "{\n"
>-            "   gl_Position = vec4(position.xy, 0.0, 1.0);\n"
>-            "}\n";
>-
>-        const std::string fs =
>-            "precision highp float;\n"
>-            "uniform vec4 color;\n"
>-            "void main()\n"
>-            "{\n"
>-            "   gl_FragColor = color;\n"
>-            "}\n";
>-
>-        mProgram = CompileProgram(vs, fs);
>+        mProgram = CompileProgram(essl1_shaders::vs::Simple(), essl1_shaders::fs::UniformColor());
>         ASSERT_NE(0u, mProgram);
> 
>-        mColorLocation = glGetUniformLocation(mProgram, "color");
>+        mColorLocation = glGetUniformLocation(mProgram, essl1_shaders::ColorUniform());
>         ASSERT_NE(-1, mColorLocation);
>     }
> 
>@@ -67,7 +51,7 @@ class SRGBFramebufferTest : public ANGLETest
> TEST_P(SRGBFramebufferTest, Validation)
> {
>     GLenum expectedError =
>-        extensionEnabled("GL_EXT_sRGB_write_control") ? GL_NO_ERROR : GL_INVALID_ENUM;
>+        IsGLExtensionEnabled("GL_EXT_sRGB_write_control") ? GL_NO_ERROR : GL_INVALID_ENUM;
> 
>     GLboolean value = GL_FALSE;
>     glEnable(GL_FRAMEBUFFER_SRGB_EXT);
>@@ -77,7 +61,7 @@ TEST_P(SRGBFramebufferTest, Validation)
>     EXPECT_GL_ERROR(expectedError);
>     if (expectedError == GL_NO_ERROR)
>     {
>-        EXPECT_EQ(GL_TRUE, value);
>+        EXPECT_GL_TRUE(value);
>     }
> 
>     glDisable(GL_FRAMEBUFFER_SRGB_EXT);
>@@ -87,15 +71,15 @@ TEST_P(SRGBFramebufferTest, Validation)
>     EXPECT_GL_ERROR(expectedError);
>     if (expectedError == GL_NO_ERROR)
>     {
>-        EXPECT_EQ(GL_FALSE, value);
>+        EXPECT_GL_FALSE(value);
>     }
> }
> 
> // Test basic functionality of GL_EXT_sRGB_write_control
> TEST_P(SRGBFramebufferTest, BasicUsage)
> {
>-    if (!extensionEnabled("GL_EXT_sRGB_write_control") ||
>-        (!extensionEnabled("GL_EXT_sRGB") && getClientMajorVersion() < 3))
>+    if (!IsGLExtensionEnabled("GL_EXT_sRGB_write_control") ||
>+        (!IsGLExtensionEnabled("GL_EXT_sRGB") && getClientMajorVersion() < 3))
>     {
>         std::cout
>             << "Test skipped because GL_EXT_sRGB_write_control and GL_EXT_sRGB are not available."
>@@ -119,11 +103,11 @@ TEST_P(SRGBFramebufferTest, BasicUsage)
>     glUniform4fv(mColorLocation, 1, srgbColor.toNormalizedVector().data());
> 
>     glEnable(GL_FRAMEBUFFER_SRGB_EXT);
>-    drawQuad(mProgram, "position", 0.5f);
>+    drawQuad(mProgram, essl1_shaders::PositionAttrib(), 0.5f);
>     EXPECT_PIXEL_COLOR_NEAR(0, 0, linearColor, 1.0);
> 
>     glDisable(GL_FRAMEBUFFER_SRGB_EXT);
>-    drawQuad(mProgram, "position", 0.5f);
>+    drawQuad(mProgram, essl1_shaders::PositionAttrib(), 0.5f);
>     EXPECT_PIXEL_COLOR_NEAR(0, 0, srgbColor, 1.0);
> }
> 
>@@ -136,6 +120,7 @@ ANGLE_INSTANTIATE_TEST(SRGBFramebufferTest,
>                        ES2_OPENGL(),
>                        ES3_OPENGL(),
>                        ES2_OPENGLES(),
>-                       ES3_OPENGLES());
>+                       ES3_OPENGLES(),
>+                       ES2_VULKAN());
> 
> }  // namespace angle
>diff --git a/Source/ThirdParty/ANGLE/src/tests/gl_tests/SRGBTextureTest.cpp b/Source/ThirdParty/ANGLE/src/tests/gl_tests/SRGBTextureTest.cpp
>index 251d7872862..95927235c30 100644
>--- a/Source/ThirdParty/ANGLE/src/tests/gl_tests/SRGBTextureTest.cpp
>+++ b/Source/ThirdParty/ANGLE/src/tests/gl_tests/SRGBTextureTest.cpp
>@@ -27,7 +27,7 @@ class SRGBTextureTest : public ANGLETest
>     {
>         ANGLETest::SetUp();
> 
>-        const std::string vs =
>+        constexpr char kVS[] =
>             "precision highp float;\n"
>             "attribute vec4 position;\n"
>             "varying vec2 texcoord;\n"
>@@ -38,7 +38,7 @@ class SRGBTextureTest : public ANGLETest
>             "   texcoord = (position.xy * 0.5) + 0.5;\n"
>             "}\n";
> 
>-        const std::string fs =
>+        constexpr char kFS[] =
>             "precision highp float;\n"
>             "uniform sampler2D tex;\n"
>             "varying vec2 texcoord;\n"
>@@ -48,7 +48,7 @@ class SRGBTextureTest : public ANGLETest
>             "   gl_FragColor = texture2D(tex, texcoord);\n"
>             "}\n";
> 
>-        mProgram = CompileProgram(vs, fs);
>+        mProgram = CompileProgram(kVS, kFS);
>         ASSERT_NE(0u, mProgram);
> 
>         mTextureLocation = glGetUniformLocation(mProgram, "tex");
>@@ -62,34 +62,55 @@ class SRGBTextureTest : public ANGLETest
>         ANGLETest::TearDown();
>     }
> 
>+    GLenum getSRGBA8TextureInternalFormat() const
>+    {
>+        return getClientMajorVersion() >= 3 ? GL_SRGB8_ALPHA8 : GL_SRGB_ALPHA_EXT;
>+    }
>+
>+    GLenum getSRGBA8TextureFormat() const
>+    {
>+        return getClientMajorVersion() >= 3 ? GL_RGBA : GL_SRGB_ALPHA_EXT;
>+    }
>+
>+    GLenum getSRGB8TextureInternalFormat() const
>+    {
>+        return getClientMajorVersion() >= 3 ? GL_SRGB8 : GL_SRGB_EXT;
>+    }
>+
>+    GLenum getSRGB8TextureFormat() const
>+    {
>+        return getClientMajorVersion() >= 3 ? GL_RGB : GL_SRGB_EXT;
>+    }
>+
>     GLuint mProgram        = 0;
>     GLint mTextureLocation = -1;
> };
> 
>+// GenerateMipmaps should generate INVALID_OPERATION in ES 2.0 / WebGL 1.0 with EXT_sRGB.
>+// https://bugs.chromium.org/p/chromium/issues/detail?id=769989
> TEST_P(SRGBTextureTest, SRGBValidation)
> {
>     // TODO(fjhenigman): Figure out why this fails on Ozone Intel.
>-    if (IsOzone() && IsIntel() && IsOpenGLES())
>-    {
>-        std::cout << "Test skipped on Ozone Intel." << std::endl;
>-        return;
>-    }
>+    ANGLE_SKIP_TEST_IF(IsOzone() && IsIntel() && IsOpenGLES());
> 
>-    bool supported = extensionEnabled("GL_EXT_sRGB") || getClientMajorVersion() == 3;
>+    bool supported = IsGLExtensionEnabled("GL_EXT_sRGB") || getClientMajorVersion() == 3;
> 
>     GLuint tex = 0;
>     glGenTextures(1, &tex);
>     glBindTexture(GL_TEXTURE_2D, tex);
> 
>-    GLubyte pixel[3] = { 0 };
>-    glTexImage2D(GL_TEXTURE_2D, 0, GL_SRGB, 1, 1, 0, GL_SRGB, GL_UNSIGNED_BYTE, pixel);
>+    GLubyte pixel[3] = {0};
>+    glTexImage2D(GL_TEXTURE_2D, 0, getSRGB8TextureInternalFormat(), 1, 1, 0,
>+                 getSRGB8TextureFormat(), GL_UNSIGNED_BYTE, pixel);
>     if (supported)
>     {
>         EXPECT_GL_NO_ERROR();
> 
>-        glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, 0, 0, GL_SRGB, GL_UNSIGNED_BYTE, pixel);
>+        glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, 0, 0, getSRGB8TextureFormat(), GL_UNSIGNED_BYTE,
>+                        pixel);
>         EXPECT_GL_NO_ERROR();
> 
>+        // Mipmap generation always generates errors for SRGB unsized in ES2 or SRGB8 sized in ES3.
>         glGenerateMipmap(GL_TEXTURE_2D);
>         EXPECT_GL_ERROR(GL_INVALID_OPERATION);
>     }
>@@ -104,29 +125,27 @@ TEST_P(SRGBTextureTest, SRGBValidation)
> TEST_P(SRGBTextureTest, SRGBAValidation)
> {
>     // TODO(fjhenigman): Figure out why this fails on Ozone Intel.
>-    if (IsOzone() && IsIntel() && IsOpenGLES())
>-    {
>-        std::cout << "Test skipped on Ozone Intel." << std::endl;
>-        return;
>-    }
>+    ANGLE_SKIP_TEST_IF(IsOzone() && IsIntel() && IsOpenGLES());
> 
>-    bool supported = extensionEnabled("GL_EXT_sRGB") || getClientMajorVersion() == 3;
>+    bool supported = IsGLExtensionEnabled("GL_EXT_sRGB") || getClientMajorVersion() == 3;
> 
>     GLuint tex = 0;
>     glGenTextures(1, &tex);
>     glBindTexture(GL_TEXTURE_2D, tex);
> 
>-    GLubyte pixel[4] = { 0 };
>-    glTexImage2D(GL_TEXTURE_2D, 0, GL_SRGB_ALPHA_EXT, 1, 1, 0, GL_SRGB_ALPHA_EXT, GL_UNSIGNED_BYTE, pixel);
>+    GLubyte pixel[4] = {0};
>+    glTexImage2D(GL_TEXTURE_2D, 0, getSRGBA8TextureInternalFormat(), 1, 1, 0,
>+                 getSRGBA8TextureFormat(), GL_UNSIGNED_BYTE, pixel);
>     if (supported)
>     {
>         EXPECT_GL_NO_ERROR();
> 
>-        glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, 0, 0, GL_SRGB_ALPHA_EXT, GL_UNSIGNED_BYTE, pixel);
>+        glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, 0, 0, getSRGBA8TextureFormat(), GL_UNSIGNED_BYTE,
>+                        pixel);
>         EXPECT_GL_NO_ERROR();
> 
>         glGenerateMipmap(GL_TEXTURE_2D);
>-        if (getClientMajorVersion() == 2)
>+        if (getClientMajorVersion() < 3)
>         {
>             EXPECT_GL_ERROR(GL_INVALID_OPERATION);
>         }
>@@ -143,9 +162,34 @@ TEST_P(SRGBTextureTest, SRGBAValidation)
>     glDeleteTextures(1, &tex);
> }
> 
>+// Test that sized SRGBA formats allow generating mipmaps
>+TEST_P(SRGBTextureTest, SRGBASizedValidation)
>+{
>+    // TODO(fjhenigman): Figure out why this fails on Ozone Intel.
>+    ANGLE_SKIP_TEST_IF(IsOzone() && IsIntel() && IsOpenGLES());
>+
>+    // ES3 required for sized SRGB textures
>+    ANGLE_SKIP_TEST_IF(getClientMajorVersion() < 3);
>+
>+    GLTexture tex;
>+    glBindTexture(GL_TEXTURE_2D, tex);
>+
>+    GLubyte pixel[4] = {0};
>+    glTexImage2D(GL_TEXTURE_2D, 0, getSRGBA8TextureInternalFormat(), 1, 1, 0,
>+                 getSRGBA8TextureFormat(), GL_UNSIGNED_BYTE, pixel);
>+
>+    EXPECT_GL_NO_ERROR();
>+
>+    glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, 0, 0, GL_RGBA, GL_UNSIGNED_BYTE, pixel);
>+    EXPECT_GL_NO_ERROR();
>+
>+    glGenerateMipmap(GL_TEXTURE_2D);
>+    EXPECT_GL_NO_ERROR();
>+}
>+
> TEST_P(SRGBTextureTest, SRGBARenderbuffer)
> {
>-    bool supported = extensionEnabled("GL_EXT_sRGB") || getClientMajorVersion() == 3;
>+    bool supported = IsGLExtensionEnabled("GL_EXT_sRGB") || getClientMajorVersion() == 3;
> 
>     GLuint rbo = 0;
>     glGenRenderbuffers(1, &rbo);
>@@ -173,7 +217,8 @@ TEST_P(SRGBTextureTest, SRGBARenderbuffer)
> 
>     GLint colorEncoding = 0;
>     glGetFramebufferAttachmentParameteriv(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0,
>-                                          GL_FRAMEBUFFER_ATTACHMENT_COLOR_ENCODING_EXT, &colorEncoding);
>+                                          GL_FRAMEBUFFER_ATTACHMENT_COLOR_ENCODING_EXT,
>+                                          &colorEncoding);
>     if (supported)
>     {
>         EXPECT_GL_NO_ERROR();
>@@ -191,10 +236,10 @@ TEST_P(SRGBTextureTest, SRGBARenderbuffer)
> // Verify that if the srgb decode extension is available, srgb textures are too
> TEST_P(SRGBTextureTest, SRGBDecodeExtensionAvailability)
> {
>-    bool hasSRGBDecode = extensionEnabled("GL_EXT_texture_sRGB_decode");
>+    bool hasSRGBDecode = IsGLExtensionEnabled("GL_EXT_texture_sRGB_decode");
>     if (hasSRGBDecode)
>     {
>-        bool hasSRGBTextures = extensionEnabled("GL_EXT_sRGB") || getClientMajorVersion() >= 3;
>+        bool hasSRGBTextures = IsGLExtensionEnabled("GL_EXT_sRGB") || getClientMajorVersion() >= 3;
>         EXPECT_TRUE(hasSRGBTextures);
>     }
> }
>@@ -203,26 +248,17 @@ TEST_P(SRGBTextureTest, SRGBDecodeExtensionAvailability)
> TEST_P(SRGBTextureTest, SRGBDecodeTextureParameter)
> {
>     // TODO(fjhenigman): Figure out why this fails on Ozone Intel.
>-    if (IsOzone() && IsIntel() && IsOpenGLES())
>-    {
>-        std::cout << "Test skipped on Ozone Intel." << std::endl;
>-        return;
>-    }
>+    ANGLE_SKIP_TEST_IF(IsOzone() && IsIntel() && IsOpenGLES());
> 
>-    if (!extensionEnabled("GL_EXT_texture_sRGB_decode"))
>-    {
>-        std::cout << "Test skipped because GL_EXT_texture_sRGB_decode is not available."
>-                  << std::endl;
>-        return;
>-    }
>+    ANGLE_SKIP_TEST_IF(!IsGLExtensionEnabled("GL_EXT_texture_sRGB_decode"));
> 
>     GLColor linearColor(64, 127, 191, 255);
>     GLColor srgbColor(13, 54, 133, 255);
> 
>     GLTexture tex;
>     glBindTexture(GL_TEXTURE_2D, tex.get());
>-    glTexImage2D(GL_TEXTURE_2D, 0, GL_SRGB_ALPHA_EXT, 1, 1, 0, GL_SRGB_ALPHA_EXT, GL_UNSIGNED_BYTE,
>-                 &linearColor);
>+    glTexImage2D(GL_TEXTURE_2D, 0, getSRGBA8TextureInternalFormat(), 1, 1, 0,
>+                 getSRGBA8TextureFormat(), GL_UNSIGNED_BYTE, &linearColor);
>     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_SRGB_DECODE_EXT, GL_DECODE_EXT);
>     ASSERT_GL_NO_ERROR();
> 
>@@ -243,20 +279,16 @@ TEST_P(SRGBTextureTest, SRGBDecodeTextureParameter)
> // Test basic functionality of SRGB decode using the sampler parameter
> TEST_P(SRGBTextureTest, SRGBDecodeSamplerParameter)
> {
>-    if (!extensionEnabled("GL_EXT_texture_sRGB_decode") || getClientMajorVersion() < 3)
>-    {
>-        std::cout << "Test skipped because GL_EXT_texture_sRGB_decode or ES3 is not available."
>-                  << std::endl;
>-        return;
>-    }
>+    ANGLE_SKIP_TEST_IF(!IsGLExtensionEnabled("GL_EXT_texture_sRGB_decode") ||
>+                       getClientMajorVersion() < 3);
> 
>     GLColor linearColor(64, 127, 191, 255);
>     GLColor srgbColor(13, 54, 133, 255);
> 
>     GLTexture tex;
>     glBindTexture(GL_TEXTURE_2D, tex.get());
>-    glTexImage2D(GL_TEXTURE_2D, 0, GL_SRGB_ALPHA_EXT, 1, 1, 0, GL_SRGB_ALPHA_EXT, GL_UNSIGNED_BYTE,
>-                 &linearColor);
>+    glTexImage2D(GL_TEXTURE_2D, 0, getSRGBA8TextureInternalFormat(), 1, 1, 0,
>+                 getSRGBA8TextureFormat(), GL_UNSIGNED_BYTE, &linearColor);
>     ASSERT_GL_NO_ERROR();
> 
>     GLSampler sampler;
>@@ -280,17 +312,9 @@ TEST_P(SRGBTextureTest, SRGBDecodeSamplerParameter)
> // Test that mipmaps are generated correctly for sRGB textures
> TEST_P(SRGBTextureTest, GenerateMipmaps)
> {
>-    if (getClientMajorVersion() < 3)
>-    {
>-        std::cout << "Test skipped because ES3 is not available." << std::endl;
>-        return;
>-    }
>+    ANGLE_SKIP_TEST_IF(getClientMajorVersion() < 3);
> 
>-    if (IsOpenGL() && (IsIntel() || IsAMD()))
>-    {
>-        std::cout << "Test skipped on Intel and AMD OpenGL drivers." << std::endl;
>-        return;
>-    }
>+    ANGLE_SKIP_TEST_IF(IsOpenGL() && ((IsIntel() && IsOSX()) || IsAMD()));
> 
>     auto createAndReadBackTexture = [this](GLenum internalFormat, const GLColor &color) {
>         constexpr GLsizei width  = 128;
>@@ -344,7 +368,8 @@ TEST_P(SRGBTextureTest, GenerateMipmaps)
>     }
> }
> 
>-// Use this to select which configurations (e.g. which renderer, which GLES major version) these tests should be run against.
>+// Use this to select which configurations (e.g. which renderer, which GLES major version) these
>+// tests should be run against.
> ANGLE_INSTANTIATE_TEST(SRGBTextureTest,
>                        ES2_D3D9(),
>                        ES2_D3D11(),
>@@ -352,6 +377,7 @@ ANGLE_INSTANTIATE_TEST(SRGBTextureTest,
>                        ES2_OPENGL(),
>                        ES3_OPENGL(),
>                        ES2_OPENGLES(),
>-                       ES3_OPENGLES());
>+                       ES3_OPENGLES(),
>+                       ES2_VULKAN());
> 
>-} // namespace
>+}  // namespace angle
>diff --git a/Source/ThirdParty/ANGLE/src/tests/gl_tests/SamplersTest.cpp b/Source/ThirdParty/ANGLE/src/tests/gl_tests/SamplersTest.cpp
>new file mode 100644
>index 00000000000..7e061f84dc1
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/tests/gl_tests/SamplersTest.cpp
>@@ -0,0 +1,86 @@
>+//
>+// Copyright 2017 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+
>+// SamplerTest.cpp : Tests for samplers.
>+
>+#include "test_utils/ANGLETest.h"
>+
>+#include "test_utils/gl_raii.h"
>+
>+namespace angle
>+{
>+
>+class SamplersTest : public ANGLETest
>+{
>+  protected:
>+    SamplersTest() {}
>+
>+    // Sets a value for GL_TEXTURE_MAX_ANISOTROPY_EXT and expects it to fail.
>+    void validateInvalidAnisotropy(GLSampler &sampler, float invalidValue)
>+    {
>+        glSamplerParameterf(sampler, GL_TEXTURE_MAX_ANISOTROPY_EXT, invalidValue);
>+        EXPECT_GL_ERROR(GL_INVALID_VALUE);
>+    }
>+
>+    // Sets a value for GL_TEXTURE_MAX_ANISOTROPY_EXT and expects it to work.
>+    void validateValidAnisotropy(GLSampler &sampler, float validValue)
>+    {
>+        glSamplerParameterf(sampler, GL_TEXTURE_MAX_ANISOTROPY_EXT, validValue);
>+        EXPECT_GL_NO_ERROR();
>+
>+        GLfloat valueToVerify = 0.0f;
>+        glGetSamplerParameterfv(sampler, GL_TEXTURE_MAX_ANISOTROPY_EXT, &valueToVerify);
>+        ASSERT_EQ(valueToVerify, validValue);
>+    }
>+};
>+
>+// Verify that samplerParameterf supports TEXTURE_MAX_ANISOTROPY_EXT valid values.
>+TEST_P(SamplersTest, ValidTextureSamplerMaxAnisotropyExt)
>+{
>+    GLSampler sampler;
>+
>+    // Exact min
>+    validateValidAnisotropy(sampler, 1.0f);
>+
>+    GLfloat maxValue = 0.0f;
>+    glGetFloatv(GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT, &maxValue);
>+
>+    // Max value
>+    validateValidAnisotropy(sampler, maxValue - 1);
>+
>+    // In-between
>+    GLfloat between = (1.0f + maxValue) / 2;
>+    validateValidAnisotropy(sampler, between);
>+}
>+
>+// Verify an error is thrown if we try to go under the minimum value for
>+// GL_TEXTURE_MAX_ANISOTROPY_EXT
>+TEST_P(SamplersTest, InvalidUnderTextureSamplerMaxAnisotropyExt)
>+{
>+    GLSampler sampler;
>+
>+    // Under min
>+    validateInvalidAnisotropy(sampler, 0.0f);
>+}
>+
>+// Verify an error is thrown if we try to go over the max value for
>+// GL_TEXTURE_MAX_ANISOTROPY_EXT
>+TEST_P(SamplersTest, InvalidOverTextureSamplerMaxAnisotropyExt)
>+{
>+    GLSampler sampler;
>+
>+    GLfloat maxValue = 0.0f;
>+    glGetFloatv(GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT, &maxValue);
>+    maxValue += 1;
>+
>+    validateInvalidAnisotropy(sampler, maxValue);
>+}
>+
>+// Use this to select which configurations (e.g. which renderer, which GLES major version) these
>+// tests should be run against.
>+// Samplers are only supported on ES3.
>+ANGLE_INSTANTIATE_TEST(SamplersTest, ES3_D3D11(), ES3_OPENGL(), ES3_OPENGLES(), ES3_VULKAN());
>+}  // namespace angle
>diff --git a/Source/ThirdParty/ANGLE/src/tests/gl_tests/ShaderStorageBufferTest.cpp b/Source/ThirdParty/ANGLE/src/tests/gl_tests/ShaderStorageBufferTest.cpp
>index c45a2c41e90..ef5dc314552 100644
>--- a/Source/ThirdParty/ANGLE/src/tests/gl_tests/ShaderStorageBufferTest.cpp
>+++ b/Source/ThirdParty/ANGLE/src/tests/gl_tests/ShaderStorageBufferTest.cpp
>@@ -15,6 +15,45 @@ using namespace angle;
> namespace
> {
> 
>+struct MatrixCase
>+{
>+    MatrixCase(unsigned cols,
>+               unsigned rows,
>+               unsigned matrixStride,
>+               const char *computeShaderSource,
>+               const float *inputData)
>+        : mColumns(cols),
>+          mRows(rows),
>+          mMatrixStride(matrixStride),
>+          mComputeShaderSource(computeShaderSource),
>+          mInputdata(inputData)
>+    {}
>+    unsigned int mColumns;
>+    unsigned int mRows;
>+    unsigned int mMatrixStride;
>+    const char *mComputeShaderSource;
>+    const float *mInputdata;
>+    const unsigned int kBytesPerComponent = sizeof(float);
>+};
>+
>+struct VectorCase
>+{
>+    VectorCase(unsigned components,
>+               const char *computeShaderSource,
>+               const GLuint *inputData,
>+               const GLuint *expectedData)
>+        : mComponents(components),
>+          mComputeShaderSource(computeShaderSource),
>+          mInputdata(inputData),
>+          mExpectedData(expectedData)
>+    {}
>+    unsigned int mComponents;
>+    const char *mComputeShaderSource;
>+    const GLuint *mInputdata;
>+    const GLuint *mExpectedData;
>+    const unsigned int kBytesPerComponent = sizeof(GLuint);
>+};
>+
> class ShaderStorageBufferTest31 : public ANGLETest
> {
>   protected:
>@@ -26,6 +65,89 @@ class ShaderStorageBufferTest31 : public ANGLETest
>         setConfigGreenBits(8);
>         setConfigBlueBits(8);
>         setConfigAlphaBits(8);
>+
>+        // Test flakiness was noticed when reusing displays.
>+        forceNewDisplay();
>+    }
>+
>+    void runMatrixTest(const MatrixCase &matrixCase)
>+    {
>+        ANGLE_GL_COMPUTE_PROGRAM(program, matrixCase.mComputeShaderSource);
>+        glUseProgram(program);
>+
>+        // Create shader storage buffer
>+        GLBuffer shaderStorageBuffer[2];
>+        glBindBuffer(GL_SHADER_STORAGE_BUFFER, shaderStorageBuffer[0]);
>+        glBufferData(GL_SHADER_STORAGE_BUFFER, matrixCase.mRows * matrixCase.mMatrixStride,
>+                     matrixCase.mInputdata, GL_STATIC_DRAW);
>+        glBindBuffer(GL_SHADER_STORAGE_BUFFER, shaderStorageBuffer[1]);
>+        glBufferData(GL_SHADER_STORAGE_BUFFER, matrixCase.mRows * matrixCase.mMatrixStride, nullptr,
>+                     GL_STATIC_DRAW);
>+
>+        // Bind shader storage buffer
>+        glBindBufferBase(GL_SHADER_STORAGE_BUFFER, 0, shaderStorageBuffer[0]);
>+        glBindBufferBase(GL_SHADER_STORAGE_BUFFER, 1, shaderStorageBuffer[1]);
>+
>+        glDispatchCompute(1, 1, 1);
>+        glFinish();
>+
>+        // Read back shader storage buffer
>+        glBindBuffer(GL_SHADER_STORAGE_BUFFER, shaderStorageBuffer[1]);
>+        const GLfloat *ptr = reinterpret_cast<const GLfloat *>(
>+            glMapBufferRange(GL_SHADER_STORAGE_BUFFER, 0,
>+                             matrixCase.mRows * matrixCase.mMatrixStride, GL_MAP_READ_BIT));
>+
>+        for (unsigned int row = 0; row < matrixCase.mRows; row++)
>+        {
>+            for (unsigned int col = 0; col < matrixCase.mColumns; col++)
>+            {
>+                GLfloat expected = matrixCase.mInputdata[row * (matrixCase.mMatrixStride /
>+                                                                matrixCase.kBytesPerComponent) +
>+                                                         col];
>+                GLfloat actual =
>+                    *(ptr + row * (matrixCase.mMatrixStride / matrixCase.kBytesPerComponent) + col);
>+
>+                EXPECT_EQ(expected, actual) << " at row " << row << " and column " << col;
>+            }
>+        }
>+
>+        EXPECT_GL_NO_ERROR();
>+    }
>+
>+    void runVectorTest(const VectorCase &vectorCase)
>+    {
>+        ANGLE_GL_COMPUTE_PROGRAM(program, vectorCase.mComputeShaderSource);
>+        glUseProgram(program);
>+
>+        // Create shader storage buffer
>+        GLBuffer shaderStorageBuffer[2];
>+        glBindBuffer(GL_SHADER_STORAGE_BUFFER, shaderStorageBuffer[0]);
>+        glBufferData(GL_SHADER_STORAGE_BUFFER,
>+                     vectorCase.mComponents * vectorCase.kBytesPerComponent, vectorCase.mInputdata,
>+                     GL_STATIC_DRAW);
>+        glBindBuffer(GL_SHADER_STORAGE_BUFFER, shaderStorageBuffer[1]);
>+        glBufferData(GL_SHADER_STORAGE_BUFFER,
>+                     vectorCase.mComponents * vectorCase.kBytesPerComponent, nullptr,
>+                     GL_STATIC_DRAW);
>+
>+        // Bind shader storage buffer
>+        glBindBufferBase(GL_SHADER_STORAGE_BUFFER, 0, shaderStorageBuffer[0]);
>+        glBindBufferBase(GL_SHADER_STORAGE_BUFFER, 1, shaderStorageBuffer[1]);
>+
>+        glDispatchCompute(1, 1, 1);
>+        glFinish();
>+
>+        // Read back shader storage buffer
>+        glBindBuffer(GL_SHADER_STORAGE_BUFFER, shaderStorageBuffer[1]);
>+        const GLuint *ptr = reinterpret_cast<const GLuint *>(glMapBufferRange(
>+            GL_SHADER_STORAGE_BUFFER, 0, vectorCase.mComponents * vectorCase.kBytesPerComponent,
>+            GL_MAP_READ_BIT));
>+        for (unsigned int idx = 0; idx < vectorCase.mComponents; idx++)
>+        {
>+            EXPECT_EQ(vectorCase.mExpectedData[idx], *(ptr + idx));
>+        }
>+
>+        EXPECT_GL_NO_ERROR();
>     }
> };
> 
>@@ -33,7 +155,7 @@ class ShaderStorageBufferTest31 : public ANGLETest
> // declarations with the same sequence of types.
> TEST_P(ShaderStorageBufferTest31, MatchedBlockNameWithDifferentMemberType)
> {
>-    const std::string &vertexShaderSource =
>+    constexpr char kVS[] =
>         "#version 310 es\n"
>         "buffer blockName {\n"
>         "    float data;\n"
>@@ -41,7 +163,7 @@ TEST_P(ShaderStorageBufferTest31, MatchedBlockNameWithDifferentMemberType)
>         "void main()\n"
>         "{\n"
>         "}\n";
>-    const std::string &fragmentShaderSource =
>+    constexpr char kFS[] =
>         "#version 310 es\n"
>         "buffer blockName {\n"
>         "    uint data;\n"
>@@ -50,7 +172,7 @@ TEST_P(ShaderStorageBufferTest31, MatchedBlockNameWithDifferentMemberType)
>         "{\n"
>         "}\n";
> 
>-    GLuint program = CompileProgram(vertexShaderSource, fragmentShaderSource);
>+    GLuint program = CompileProgram(kVS, kFS);
>     EXPECT_EQ(0u, program);
> }
> 
>@@ -58,8 +180,9 @@ TEST_P(ShaderStorageBufferTest31, MatchedBlockNameWithDifferentMemberType)
> TEST_P(ShaderStorageBufferTest31, ExceedMaxVertexShaderStorageBlocks)
> {
>     std::ostringstream instanceCount;
>-    GLint maxVertexShaderStorageBlocks;
>+    GLint maxVertexShaderStorageBlocks = 0;
>     glGetIntegerv(GL_MAX_VERTEX_SHADER_STORAGE_BLOCKS, &maxVertexShaderStorageBlocks);
>+    EXPECT_GL_NO_ERROR();
>     instanceCount << maxVertexShaderStorageBlocks;
> 
>     const std::string &vertexShaderSource =
>@@ -72,47 +195,97 @@ TEST_P(ShaderStorageBufferTest31, ExceedMaxVertexShaderStorageBlocks)
>         "void main()\n"
>         "{\n"
>         "}\n";
>+    constexpr char kFS[] =
>+        "#version 310 es\n"
>+        "void main()\n"
>+        "{\n"
>+        "}\n";
>+
>+    GLuint program = CompileProgram(vertexShaderSource.c_str(), kFS);
>+    EXPECT_EQ(0u, program);
>+}
>+
>+// Linking should fail if the sum of the number of active shader storage blocks exceeds
>+// MAX_COMBINED_SHADER_STORAGE_BLOCKS.
>+TEST_P(ShaderStorageBufferTest31, ExceedMaxCombinedShaderStorageBlocks)
>+{
>+    std::ostringstream vertexInstanceCount;
>+    GLint maxVertexShaderStorageBlocks = 0;
>+    glGetIntegerv(GL_MAX_VERTEX_SHADER_STORAGE_BLOCKS, &maxVertexShaderStorageBlocks);
>+    vertexInstanceCount << maxVertexShaderStorageBlocks;
>+
>+    GLint maxFragmentShaderStorageBlocks = 0;
>+    glGetIntegerv(GL_MAX_FRAGMENT_SHADER_STORAGE_BLOCKS, &maxFragmentShaderStorageBlocks);
>+
>+    GLint maxCombinedShaderStorageBlocks = 0;
>+    glGetIntegerv(GL_MAX_COMBINED_SHADER_STORAGE_BLOCKS, &maxCombinedShaderStorageBlocks);
>+    EXPECT_GL_NO_ERROR();
>+
>+    ASSERT_GE(maxCombinedShaderStorageBlocks, maxVertexShaderStorageBlocks);
>+    ASSERT_GE(maxCombinedShaderStorageBlocks, maxFragmentShaderStorageBlocks);
>+
>+    // As SPEC allows MAX_VERTEX_SHADER_STORAGE_BLOCKS and MAX_FRAGMENT_SHADER_STORAGE_BLOCKS to be
>+    // 0, in this situation we should skip this test to prevent these unexpected compile errors.
>+    ANGLE_SKIP_TEST_IF(maxVertexShaderStorageBlocks == 0 || maxFragmentShaderStorageBlocks == 0);
>+
>+    GLint fragmentShaderStorageBlocks =
>+        maxCombinedShaderStorageBlocks - maxVertexShaderStorageBlocks + 1;
>+    ANGLE_SKIP_TEST_IF(fragmentShaderStorageBlocks > maxFragmentShaderStorageBlocks);
>+
>+    std::ostringstream fragmentInstanceCount;
>+    fragmentInstanceCount << fragmentShaderStorageBlocks;
>+
>+    const std::string &vertexShaderSource =
>+        "#version 310 es\n"
>+        "layout(shared) buffer blockName0 {\n"
>+        "    uint data;\n"
>+        "} instance0[" +
>+        vertexInstanceCount.str() +
>+        "];\n"
>+        "void main()\n"
>+        "{\n"
>+        "}\n";
>     const std::string &fragmentShaderSource =
>         "#version 310 es\n"
>+        "layout(shared) buffer blockName1 {\n"
>+        "    uint data;\n"
>+        "} instance1[" +
>+        fragmentInstanceCount.str() +
>+        "];\n"
>         "void main()\n"
>         "{\n"
>         "}\n";
> 
>-    GLuint program = CompileProgram(vertexShaderSource, fragmentShaderSource);
>+    GLuint program = CompileProgram(vertexShaderSource.c_str(), fragmentShaderSource.c_str());
>     EXPECT_EQ(0u, program);
> }
> 
> // Test shader storage buffer read write.
> TEST_P(ShaderStorageBufferTest31, ShaderStorageBufferReadWrite)
> {
>-    // TODO(jiajia.qin@intel.com): Figure out why it fails on AMD platform.
>-    ANGLE_SKIP_TEST_IF(IsAMD() && IsDesktopOpenGL());
>-    ANGLE_SKIP_TEST_IF(IsLinux() && IsIntel() && IsOpenGL());
>-
>-    const std::string &csSource =
>+    constexpr char kCS[] =
>         "#version 310 es\n"
>         "layout(local_size_x=1, local_size_y=1, local_size_z=1) in;\n"
>-        "layout(binding = 1) buffer blockName {\n"
>+        "layout(std140, binding = 1) buffer blockName {\n"
>         "    uint data[2];\n"
>         "} instanceName;\n"
>         "void main()\n"
>         "{\n"
>         "    instanceName.data[0] = 3u;\n"
>-        "    if (instanceName.data[0] == 3u)\n"
>-        "        instanceName.data[1] = 4u;\n"
>-        "    else\n"
>-        "        instanceName.data[1] = 5u;\n"
>+        "    instanceName.data[1] = 4u;\n"
>         "}\n";
> 
>-    ANGLE_GL_COMPUTE_PROGRAM(program, csSource);
>+    ANGLE_GL_COMPUTE_PROGRAM(program, kCS);
> 
>     glUseProgram(program.get());
> 
>-    unsigned int bufferData[2] = {0u};
>+    constexpr unsigned int kElementCount = 2;
>+    // The array stride are rounded up to the base alignment of a vec4 for std140 layout.
>+    constexpr unsigned int kArrayStride = 16;
>     // Create shader storage buffer
>     GLBuffer shaderStorageBuffer;
>     glBindBuffer(GL_SHADER_STORAGE_BUFFER, shaderStorageBuffer);
>-    glBufferData(GL_SHADER_STORAGE_BUFFER, sizeof(bufferData), nullptr, GL_STATIC_DRAW);
>+    glBufferData(GL_SHADER_STORAGE_BUFFER, kElementCount * kArrayStride, nullptr, GL_STATIC_DRAW);
> 
>     // Bind shader storage buffer
>     glBindBufferBase(GL_SHADER_STORAGE_BUFFER, 1, shaderStorageBuffer);
>@@ -123,72 +296,1782 @@ TEST_P(ShaderStorageBufferTest31, ShaderStorageBufferReadWrite)
>     glFinish();
> 
>     // Read back shader storage buffer
>+    constexpr unsigned int kExpectedValues[2] = {3u, 4u};
>     glBindBuffer(GL_SHADER_STORAGE_BUFFER, shaderStorageBuffer);
>-    void *ptr = glMapBufferRange(GL_SHADER_STORAGE_BUFFER, 0, sizeof(bufferData), GL_MAP_READ_BIT);
>-    memcpy(bufferData, ptr, sizeof(bufferData));
>+    void *ptr = glMapBufferRange(GL_SHADER_STORAGE_BUFFER, 0, kElementCount * kArrayStride,
>+                                 GL_MAP_READ_BIT);
>+    for (unsigned int idx = 0; idx < kElementCount; idx++)
>+    {
>+        EXPECT_EQ(kExpectedValues[idx],
>+                  *(reinterpret_cast<const GLuint *>(reinterpret_cast<const GLbyte *>(ptr) +
>+                                                     idx * kArrayStride)));
>+    }
>     glUnmapBuffer(GL_SHADER_STORAGE_BUFFER);
>     glBindBuffer(GL_SHADER_STORAGE_BUFFER, 0);
>-    EXPECT_EQ(3u, bufferData[0]);
>-    EXPECT_EQ(4u, bufferData[1]);
> 
>     EXPECT_GL_NO_ERROR();
> }
> 
>-// Test atomic memory functions.
>-TEST_P(ShaderStorageBufferTest31, AtomicMemoryFunctions)
>+// Tests modifying an existing shader storage buffer
>+TEST_P(ShaderStorageBufferTest31, ShaderStorageBufferReadWriteSame)
> {
>-    ANGLE_SKIP_TEST_IF(IsAMD() && IsDesktopOpenGL() && IsWindows());
>-    ANGLE_SKIP_TEST_IF(IsLinux() && IsIntel() && IsOpenGL());
>-    // anglebug.com/2255
>-    ANGLE_SKIP_TEST_IF(IsLinux() && IsAMD() && IsDesktopOpenGL());
>-
>-    const std::string &csSource =
>+    constexpr char kComputeShaderSource[] =
>         R"(#version 310 es
>+layout(local_size_x=1, local_size_y=1, local_size_z=1) in;
>+layout(std140, binding = 0) buffer block {
>+    uint data;
>+} instance;
>+void main()
>+{
>+    uint temp = instance.data;
>+    instance.data = temp + 1u;
>+}
>+)";
> 
>-        layout(local_size_x=1, local_size_y=1, local_size_z=1) in;
>-        layout(binding = 1) buffer blockName {
>-            uint data[2];
>-        } instanceName;
>+    ANGLE_GL_COMPUTE_PROGRAM(program, kComputeShaderSource);
> 
>-        void main()
>-        {
>-            instanceName.data[0] = 0u;
>-            instanceName.data[1] = 0u;
>-            atomicAdd(instanceName.data[0], 5u);
>-            atomicMax(instanceName.data[1], 7u);
>+    glUseProgram(program);
> 
>-        })";
>+    constexpr unsigned int kBytesPerComponent = sizeof(GLuint);
>+    constexpr unsigned int kInitialData       = 123u;
> 
>-    ANGLE_GL_COMPUTE_PROGRAM(program, csSource);
>+    // Create shader storage buffer
>+    GLBuffer shaderStorageBuffer;
> 
>-    glUseProgram(program.get());
>+    glBindBuffer(GL_SHADER_STORAGE_BUFFER, shaderStorageBuffer);
>+    glBufferData(GL_SHADER_STORAGE_BUFFER, kBytesPerComponent, &kInitialData, GL_STATIC_DRAW);
>+
>+    // Bind shader storage buffer
>+    glBindBufferBase(GL_SHADER_STORAGE_BUFFER, 0, shaderStorageBuffer);
>+
>+    glDispatchCompute(1, 1, 1);
>+
>+    glMemoryBarrier(GL_SHADER_STORAGE_BARRIER_BIT);
>+
>+    glBindBuffer(GL_SHADER_STORAGE_BUFFER, shaderStorageBuffer);
>+    const void *bufferData =
>+        glMapBufferRange(GL_SHADER_STORAGE_BUFFER, 0, kBytesPerComponent, GL_MAP_READ_BIT);
>+
>+    constexpr unsigned int kExpectedData = 124u;
>+    EXPECT_EQ(kExpectedData, *static_cast<const GLuint *>(bufferData));
>+    glUnmapBuffer(GL_SHADER_STORAGE_BUFFER);
>+
>+    // Running shader twice to make sure that the buffer gets updated correctly 123->124->125
>+    glDispatchCompute(1, 1, 1);
>+
>+    glMemoryBarrier(GL_SHADER_STORAGE_BARRIER_BIT);
>+
>+    bufferData = glMapBufferRange(GL_SHADER_STORAGE_BUFFER, 0, kBytesPerComponent, GL_MAP_READ_BIT);
>+
>+    constexpr unsigned int kExpectedData2 = 125u;
>+    EXPECT_EQ(kExpectedData2, *static_cast<const GLuint *>(bufferData));
>+
>+    // Verify re-using the SSBO buffer with a PBO contains expected data.
>+    // This will read-back from FBO using a PBO into the same SSBO buffer.
>+
>+    glUnmapBuffer(GL_SHADER_STORAGE_BUFFER);
>+
>+    GLTexture texture;
>+    glBindTexture(GL_TEXTURE_2D, texture);
>+    glTexStorage2D(GL_TEXTURE_2D, 1, GL_RGBA8, getWindowWidth(), getWindowHeight());
>+
>+    GLFramebuffer framebuffer;
>+    glBindFramebuffer(GL_FRAMEBUFFER, framebuffer);
>+    glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, texture, 0);
>+
>+    glClearColor(1.0f, 0.0f, 0.0f, 1.0f);
>+    glClear(GL_COLOR_BUFFER_BIT);
>+
>+    glBindBuffer(GL_PIXEL_PACK_BUFFER, shaderStorageBuffer);
>+    glReadPixels(0, 0, 1, 1, GL_RGBA, GL_UNSIGNED_BYTE, 0);
>+    EXPECT_GL_NO_ERROR();
>+
>+    void *mappedPtr =
>+        glMapBufferRange(GL_PIXEL_PACK_BUFFER, 0, kBytesPerComponent, GL_MAP_READ_BIT);
>+    GLColor *dataColor = static_cast<GLColor *>(mappedPtr);
>+    EXPECT_GL_NO_ERROR();
>+
>+    EXPECT_EQ(GLColor::red, dataColor[0]);
>+    glUnmapBuffer(GL_PIXEL_PACK_BUFFER);
>+    EXPECT_GL_NO_ERROR();
>+
>+    // Verify that binding the buffer back to the SSBO keeps the expected data.
>+
>+    glBindBuffer(GL_PIXEL_PACK_BUFFER, 0);
> 
>-    unsigned int bufferData[2] = {0u};
>+    glBindBuffer(GL_SHADER_STORAGE_BUFFER, shaderStorageBuffer);
>+    const GLColor *ptr = reinterpret_cast<GLColor *>(
>+        glMapBufferRange(GL_SHADER_STORAGE_BUFFER, 0, kBytesPerComponent, GL_MAP_READ_BIT));
>+    EXPECT_EQ(GLColor::red, *ptr);
>+
>+    EXPECT_GL_NO_ERROR();
>+}
>+
>+// Tests reading and writing to a shader storage buffer bound at an offset.
>+TEST_P(ShaderStorageBufferTest31, ShaderStorageBufferReadWriteOffset)
>+{
>+    constexpr char kCS[] = R"(#version 310 es
>+layout(local_size_x=1, local_size_y=1, local_size_z=1) in;
>+
>+layout(std140, binding = 0) buffer block0 {
>+    uint data[2];
>+} instance0;
>+
>+void main()
>+{
>+    instance0.data[0] = 3u;
>+    instance0.data[1] = 4u;
>+}
>+)";
>+
>+    ANGLE_GL_COMPUTE_PROGRAM(program, kCS);
>+
>+    glUseProgram(program);
>+
>+    constexpr unsigned int kElementCount = 2;
>+    // The array stride are rounded up to the base alignment of a vec4 for std140 layout.
>+    constexpr unsigned int kArrayStride = 16;
>     // Create shader storage buffer
>     GLBuffer shaderStorageBuffer;
>     glBindBuffer(GL_SHADER_STORAGE_BUFFER, shaderStorageBuffer);
>-    glBufferData(GL_SHADER_STORAGE_BUFFER, sizeof(bufferData), nullptr, GL_STATIC_DRAW);
> 
>-    // Bind shader storage buffer
>-    glBindBufferBase(GL_SHADER_STORAGE_BUFFER, 1, shaderStorageBuffer);
>+    int bufferAlignOffset;
>+    glGetIntegerv(GL_SHADER_STORAGE_BUFFER_OFFSET_ALIGNMENT, &bufferAlignOffset);
>+
>+    constexpr int kBufferSize = kElementCount * kArrayStride;
>+    const int kBufferOffset   = kBufferSize + (kBufferSize % bufferAlignOffset);
>+
>+    glBufferData(GL_SHADER_STORAGE_BUFFER, kBufferOffset + kBufferSize, nullptr, GL_STATIC_DRAW);
>+
>+    // Bind shader storage buffer at an offset
>+    glBindBufferRange(GL_SHADER_STORAGE_BUFFER, 0, shaderStorageBuffer, kBufferOffset, kBufferSize);
>+    EXPECT_GL_NO_ERROR();
> 
>-    // Dispath compute
>     glDispatchCompute(1, 1, 1);
>+    glMemoryBarrier(GL_SHADER_STORAGE_BARRIER_BIT);
> 
>-    glFinish();
>+    glBindBuffer(GL_SHADER_STORAGE_BUFFER, shaderStorageBuffer);
>+
>+    // Bind the buffer at a separate location
>+    glBindBufferRange(GL_SHADER_STORAGE_BUFFER, 0, shaderStorageBuffer, 0, kBufferSize);
>+    EXPECT_GL_NO_ERROR();
>+
>+    glDispatchCompute(1, 1, 1);
>+    glMemoryBarrier(GL_SHADER_STORAGE_BARRIER_BIT);
> 
>     // Read back shader storage buffer
>+    constexpr unsigned int kExpectedValues[2] = {3u, 4u};
>     glBindBuffer(GL_SHADER_STORAGE_BUFFER, shaderStorageBuffer);
>-    void *ptr = glMapBufferRange(GL_SHADER_STORAGE_BUFFER, 0, sizeof(bufferData), GL_MAP_READ_BIT);
>-    memcpy(bufferData, ptr, sizeof(bufferData));
>+    void *ptr = glMapBufferRange(GL_SHADER_STORAGE_BUFFER, 0, kBufferSize, GL_MAP_READ_BIT);
>+    for (unsigned int idx = 0; idx < kElementCount; idx++)
>+    {
>+        EXPECT_EQ(kExpectedValues[idx],
>+                  *(reinterpret_cast<const GLuint *>(reinterpret_cast<const GLbyte *>(ptr) +
>+                                                     idx * kArrayStride)));
>+    }
>     glUnmapBuffer(GL_SHADER_STORAGE_BUFFER);
>-    glBindBuffer(GL_SHADER_STORAGE_BUFFER, 0);
>-    EXPECT_EQ(5u, bufferData[0]);
>-    EXPECT_EQ(7u, bufferData[1]);
> 
>+    ptr = glMapBufferRange(GL_SHADER_STORAGE_BUFFER, kBufferOffset, kBufferSize, GL_MAP_READ_BIT);
>+    for (unsigned int idx = 0; idx < kElementCount; idx++)
>+    {
>+        EXPECT_EQ(kExpectedValues[idx],
>+                  *(reinterpret_cast<const GLuint *>(reinterpret_cast<const GLbyte *>(ptr) +
>+                                                     idx * kArrayStride)));
>+    }
>+    glUnmapBuffer(GL_SHADER_STORAGE_BUFFER);
>+
>+    EXPECT_GL_NO_ERROR();
>+}
>+
>+// Test that access/write to vector data in shader storage buffer.
>+TEST_P(ShaderStorageBufferTest31, ShaderStorageBufferVector)
>+{
>+    constexpr char kComputeShaderSource[] =
>+        R"(#version 310 es
>+ layout(local_size_x=1, local_size_y=1, local_size_z=1) in;
>+ layout(std140, binding = 0) buffer blockIn {
>+     uvec2 data;
>+ } instanceIn;
>+ layout(std140, binding = 1) buffer blockOut {
>+     uvec2 data;
>+ } instanceOut;
>+ void main()
>+ {
>+     instanceOut.data[0] = instanceIn.data[0];
>+     instanceOut.data[1] = instanceIn.data[1];
>+ }
>+ )";
>+
>+    constexpr unsigned int kComponentCount         = 2;
>+    constexpr GLuint kInputValues[kComponentCount] = {3u, 4u};
>+
>+    VectorCase vectorCase(kComponentCount, kComputeShaderSource, kInputValues, kInputValues);
>+    runVectorTest(vectorCase);
>+}
>+
>+// Test that the shader works well with an active SSBO but not statically used.
>+TEST_P(ShaderStorageBufferTest31, ActiveSSBOButNotStaticallyUsed)
>+{
>+    constexpr char kComputeShaderSource[] =
>+        R"(#version 310 es
>+ layout(local_size_x=1, local_size_y=1, local_size_z=1) in;
>+ layout(std140, binding = 0) buffer blockIn {
>+     uvec2 data;
>+ } instanceIn;
>+ layout(std140, binding = 1) buffer blockOut {
>+     uvec2 data;
>+ } instanceOut;
>+ layout(std140, binding = 2) buffer blockC {
>+     uvec2 data;
>+ } instanceC;
>+ void main()
>+ {
>+     instanceOut.data[0] = instanceIn.data[0];
>+     instanceOut.data[1] = instanceIn.data[1];
>+ }
>+ )";
>+
>+    GLBuffer shaderStorageBufferC;
>+    glBindBuffer(GL_SHADER_STORAGE_BUFFER, shaderStorageBufferC);
>+    glBufferData(GL_SHADER_STORAGE_BUFFER, 32, nullptr, GL_STATIC_DRAW);
>+    glBindBufferBase(GL_SHADER_STORAGE_BUFFER, 2, shaderStorageBufferC);
>+
>+    constexpr unsigned int kComponentCount         = 2;
>+    constexpr GLuint kInputValues[kComponentCount] = {3u, 4u};
>+
>+    VectorCase vectorCase(kComponentCount, kComputeShaderSource, kInputValues, kInputValues);
>+    runVectorTest(vectorCase);
>+}
>+
>+// Test that access/write to swizzle scalar data in shader storage block.
>+TEST_P(ShaderStorageBufferTest31, ScalarSwizzleTest)
>+{
>+    constexpr char kComputeShaderSource[] =
>+        R"(#version 310 es
>+ layout(local_size_x=1, local_size_y=1, local_size_z=1) in;
>+ layout(std140, binding = 0) buffer blockIn {
>+     uvec2 data;
>+ } instanceIn;
>+ layout(std140, binding = 1) buffer blockOut {
>+     uvec2 data;
>+ } instanceOut;
>+ void main()
>+ {
>+     instanceOut.data.x = instanceIn.data.y;
>+     instanceOut.data.y = instanceIn.data.x;
>+ }
>+ )";
>+
>+    constexpr unsigned int kComponentCount            = 2;
>+    constexpr GLuint kInputValues[kComponentCount]    = {3u, 4u};
>+    constexpr GLuint kExpectedValues[kComponentCount] = {4u, 3u};
>+
>+    VectorCase vectorCase(kComponentCount, kComputeShaderSource, kInputValues, kExpectedValues);
>+    runVectorTest(vectorCase);
>+}
>+
>+// Test that access/write to swizzle vector data in shader storage block.
>+TEST_P(ShaderStorageBufferTest31, VectorSwizzleTest)
>+{
>+    constexpr char kComputeShaderSource[] =
>+        R"(#version 310 es
>+ layout(local_size_x=1, local_size_y=1, local_size_z=1) in;
>+ layout(std140, binding = 0) buffer blockIn {
>+     uvec2 data;
>+ } instanceIn;
>+ layout(std140, binding = 1) buffer blockOut {
>+     uvec2 data;
>+ } instanceOut;
>+ void main()
>+ {
>+     instanceOut.data.yx = instanceIn.data.xy;
>+ }
>+ )";
>+
>+    constexpr unsigned int kComponentCount            = 2;
>+    constexpr GLuint kInputValues[kComponentCount]    = {3u, 4u};
>+    constexpr GLuint kExpectedValues[kComponentCount] = {4u, 3u};
>+
>+    VectorCase vectorCase(kComponentCount, kComputeShaderSource, kInputValues, kExpectedValues);
>+    runVectorTest(vectorCase);
>+}
>+
>+// Test that access/write to swizzle vector data in column_major matrix in shader storage block.
>+TEST_P(ShaderStorageBufferTest31, VectorSwizzleInColumnMajorMatrixTest)
>+{
>+    constexpr char kComputeShaderSource[] =
>+        R"(#version 310 es
>+ layout(local_size_x=1, local_size_y=1, local_size_z=1) in;
>+ layout(std140, binding = 0) buffer blockIn {
>+     layout(column_major) mat2x3 data;
>+ } instanceIn;
>+ layout(std140, binding = 1) buffer blockOut {
>+     layout(column_major) mat2x3 data;
>+ } instanceOut;
>+ void main()
>+ {
>+     instanceOut.data[0].xyz = instanceIn.data[0].xyz;
>+     instanceOut.data[1].xyz = instanceIn.data[1].xyz;
>+ }
>+ )";
>+
>+    constexpr unsigned int kColumns                                             = 2;
>+    constexpr unsigned int kRows                                                = 3;
>+    constexpr unsigned int kBytesPerComponent                                   = sizeof(float);
>+    constexpr unsigned int kMatrixStride                                        = 16;
>+    constexpr float kInputDada[kColumns * (kMatrixStride / kBytesPerComponent)] = {
>+        0.1, 0.2, 0.3, 0.0, 0.4, 0.5, 0.6, 0.0};
>+    MatrixCase matrixCase(kRows, kColumns, kMatrixStride, kComputeShaderSource, kInputDada);
>+    runMatrixTest(matrixCase);
>+}
>+
>+// Test that access/write to swizzle vector data in row_major matrix in shader storage block.
>+TEST_P(ShaderStorageBufferTest31, VectorSwizzleInRowMajorMatrixTest)
>+{
>+    ANGLE_SKIP_TEST_IF(IsAndroid());
>+
>+    constexpr char kComputeShaderSource[] =
>+        R"(#version 310 es
>+ layout(local_size_x=1, local_size_y=1, local_size_z=1) in;
>+ layout(std140, binding = 0) buffer blockIn {
>+     layout(row_major) mat2x3 data;
>+ } instanceIn;
>+ layout(std140, binding = 1) buffer blockOut {
>+     layout(row_major) mat2x3 data;
>+ } instanceOut;
>+ void main()
>+ {
>+     instanceOut.data[0].xyz = instanceIn.data[0].xyz;
>+     instanceOut.data[1].xyz = instanceIn.data[1].xyz;
>+ }
>+ )";
>+
>+    constexpr unsigned int kColumns           = 2;
>+    constexpr unsigned int kRows              = 3;
>+    constexpr unsigned int kBytesPerComponent = sizeof(float);
>+    // std140 layout requires that base alignment and stride of arrays of scalars and vectors are
>+    // rounded up a multiple of the base alignment of a vec4.
>+    constexpr unsigned int kMatrixStride                                     = 16;
>+    constexpr float kInputDada[kRows * (kMatrixStride / kBytesPerComponent)] = {
>+        0.1, 0.2, 0.0, 0.0, 0.3, 0.4, 0.0, 0.0, 0.5, 0.6, 0.0, 0.0};
>+    MatrixCase matrixCase(kColumns, kRows, kMatrixStride, kComputeShaderSource, kInputDada);
>+    runMatrixTest(matrixCase);
>+}
>+
>+// Test that access/write to scalar data in matrix in shader storage block with row major.
>+TEST_P(ShaderStorageBufferTest31, ScalarDataInMatrixInSSBOWithRowMajorQualifier)
>+{
>+    // TODO(jiajia.qin@intel.com): Figure out why it fails on Intel Linux platform.
>+    // http://anglebug.com/1951
>+    ANGLE_SKIP_TEST_IF(IsIntel() && IsLinux());
>+    ANGLE_SKIP_TEST_IF(IsAndroid());
>+
>+    constexpr char kComputeShaderSource[] =
>+        R"(#version 310 es
>+layout(local_size_x=1, local_size_y=1, local_size_z=1) in;
>+layout(std140, binding = 0) buffer blockIn {
>+    layout(row_major) mat2x3 data;
>+} instanceIn;
>+layout(std140, binding = 1) buffer blockOut {
>+    layout(row_major) mat2x3 data;
>+} instanceOut;
>+void main()
>+{
>+    instanceOut.data[0][0] = instanceIn.data[0][0];
>+    instanceOut.data[0][1] = instanceIn.data[0][1];
>+    instanceOut.data[0][2] = instanceIn.data[0][2];
>+    instanceOut.data[1][0] = instanceIn.data[1][0];
>+    instanceOut.data[1][1] = instanceIn.data[1][1];
>+    instanceOut.data[1][2] = instanceIn.data[1][2];
>+}
>+)";
>+
>+    constexpr unsigned int kColumns           = 2;
>+    constexpr unsigned int kRows              = 3;
>+    constexpr unsigned int kBytesPerComponent = sizeof(float);
>+    // std140 layout requires that base alignment and stride of arrays of scalars and vectors are
>+    // rounded up a multiple of the base alignment of a vec4.
>+    constexpr unsigned int kMatrixStride                                     = 16;
>+    constexpr float kInputDada[kRows * (kMatrixStride / kBytesPerComponent)] = {
>+        0.1, 0.2, 0.0, 0.0, 0.3, 0.4, 0.0, 0.0, 0.5, 0.6, 0.0, 0.0};
>+    MatrixCase matrixCase(kColumns, kRows, kMatrixStride, kComputeShaderSource, kInputDada);
>+    runMatrixTest(matrixCase);
>+}
>+
>+TEST_P(ShaderStorageBufferTest31, VectorDataInMatrixInSSBOWithRowMajorQualifier)
>+{
>+    ANGLE_SKIP_TEST_IF(IsAndroid());
>+
>+    constexpr char kComputeShaderSource[] =
>+        R"(#version 310 es
>+layout(local_size_x=1, local_size_y=1, local_size_z=1) in;
>+layout(std140, binding = 0) buffer blockIn {
>+    layout(row_major) mat2x3 data;
>+} instanceIn;
>+layout(std140, binding = 1) buffer blockOut {
>+    layout(row_major) mat2x3 data;
>+} instanceOut;
>+void main()
>+{
>+    instanceOut.data[0] = instanceIn.data[0];
>+    instanceOut.data[1] = instanceIn.data[1];
>+}
>+)";
>+
>+    constexpr unsigned int kColumns           = 2;
>+    constexpr unsigned int kRows              = 3;
>+    constexpr unsigned int kBytesPerComponent = sizeof(float);
>+    // std140 layout requires that base alignment and stride of arrays of scalars and vectors are
>+    // rounded up a multiple of the base alignment of a vec4.
>+    constexpr unsigned int kMatrixStride                                     = 16;
>+    constexpr float kInputDada[kRows * (kMatrixStride / kBytesPerComponent)] = {
>+        0.1, 0.2, 0.0, 0.0, 0.3, 0.4, 0.0, 0.0, 0.5, 0.6, 0.0, 0.0};
>+    MatrixCase matrixCase(kColumns, kRows, kMatrixStride, kComputeShaderSource, kInputDada);
>+    runMatrixTest(matrixCase);
>+}
>+
>+TEST_P(ShaderStorageBufferTest31, MatrixDataInSSBOWithRowMajorQualifier)
>+{
>+    ANGLE_SKIP_TEST_IF(IsAMD() && IsWindows() && IsOpenGL());
>+
>+    constexpr char kComputeShaderSource[] =
>+        R"(#version 310 es
>+layout(local_size_x=1, local_size_y=1, local_size_z=1) in;
>+layout(std140, binding = 0) buffer blockIn {
>+    layout(row_major) mat2x3 data;
>+} instanceIn;
>+layout(std140, binding = 1) buffer blockOut {
>+    layout(row_major) mat2x3 data;
>+} instanceOut;
>+void main()
>+{
>+    instanceOut.data = instanceIn.data;
>+}
>+)";
>+
>+    constexpr unsigned int kColumns           = 2;
>+    constexpr unsigned int kRows              = 3;
>+    constexpr unsigned int kBytesPerComponent = sizeof(float);
>+    // std140 layout requires that base alignment and stride of arrays of scalars and vectors are
>+    // rounded up a multiple of the base alignment of a vec4.
>+    constexpr unsigned int kMatrixStride                                     = 16;
>+    constexpr float kInputDada[kRows * (kMatrixStride / kBytesPerComponent)] = {
>+        0.1, 0.2, 0.0, 0.0, 0.3, 0.4, 0.0, 0.0, 0.5, 0.6, 0.0, 0.0};
>+    MatrixCase matrixCase(kColumns, kRows, kMatrixStride, kComputeShaderSource, kInputDada);
>+    runMatrixTest(matrixCase);
>+}
>+
>+// Test that access/write to scalar data in structure matrix in shader storage block with row major.
>+TEST_P(ShaderStorageBufferTest31, ScalarDataInMatrixInStructureInSSBOWithRowMajorQualifier)
>+{
>+    // TODO(jiajia.qin@intel.com): Figure out why it fails on Intel Linux platform.
>+    // http://anglebug.com/1951
>+    ANGLE_SKIP_TEST_IF(IsIntel() && IsLinux());
>+    ANGLE_SKIP_TEST_IF(IsAndroid());
>+
>+    constexpr char kComputeShaderSource[] =
>+        R"(#version 310 es
>+layout(local_size_x=1, local_size_y=1, local_size_z=1) in;
>+struct S
>+{
>+    mat2x3 data;
>+};
>+layout(std140, binding = 0) buffer blockIn {
>+    layout(row_major) S s;
>+} instanceIn;
>+layout(std140, binding = 1) buffer blockOut {
>+    layout(row_major) S s;
>+} instanceOut;
>+void main()
>+{
>+    instanceOut.s.data[0][0] = instanceIn.s.data[0][0];
>+    instanceOut.s.data[0][1] = instanceIn.s.data[0][1];
>+    instanceOut.s.data[0][2] = instanceIn.s.data[0][2];
>+    instanceOut.s.data[1][0] = instanceIn.s.data[1][0];
>+    instanceOut.s.data[1][1] = instanceIn.s.data[1][1];
>+    instanceOut.s.data[1][2] = instanceIn.s.data[1][2];
>+}
>+)";
>+
>+    constexpr unsigned int kColumns           = 2;
>+    constexpr unsigned int kRows              = 3;
>+    constexpr unsigned int kBytesPerComponent = sizeof(float);
>+    // std140 layout requires that base alignment and stride of arrays of scalars and vectors are
>+    // rounded up a multiple of the base alignment of a vec4.
>+    constexpr unsigned int kMatrixStride                                     = 16;
>+    constexpr float kInputDada[kRows * (kMatrixStride / kBytesPerComponent)] = {
>+        0.1, 0.2, 0.0, 0.0, 0.3, 0.4, 0.0, 0.0, 0.5, 0.6, 0.0, 0.0};
>+    MatrixCase matrixCase(kColumns, kRows, kMatrixStride, kComputeShaderSource, kInputDada);
>+    runMatrixTest(matrixCase);
>+}
>+
>+// Test that access/write to column major matrix data in shader storage buffer.
>+TEST_P(ShaderStorageBufferTest31, ScalarDataInMatrixInSSBO)
>+{
>+    constexpr char kComputeShaderSource[] =
>+        R"(#version 310 es
>+layout(local_size_x=1, local_size_y=1, local_size_z=1) in;
>+layout(std140, binding = 0) buffer blockIn {
>+    mat2x3 data;
>+} instanceIn;
>+layout(std140, binding = 1) buffer blockOut {
>+    mat2x3 data;
>+} instanceOut;
>+void main()
>+{
>+    instanceOut.data[0][0] = instanceIn.data[0][0];
>+    instanceOut.data[0][1] = instanceIn.data[0][1];
>+    instanceOut.data[0][2] = instanceIn.data[0][2];
>+    instanceOut.data[1][0] = instanceIn.data[1][0];
>+    instanceOut.data[1][1] = instanceIn.data[1][1];
>+    instanceOut.data[1][2] = instanceIn.data[1][2];
>+}
>+)";
>+
>+    constexpr unsigned int kColumns                                             = 2;
>+    constexpr unsigned int kRows                                                = 3;
>+    constexpr unsigned int kBytesPerComponent                                   = sizeof(float);
>+    constexpr unsigned int kMatrixStride                                        = 16;
>+    constexpr float kInputDada[kColumns * (kMatrixStride / kBytesPerComponent)] = {
>+        0.1, 0.2, 0.3, 0.0, 0.4, 0.5, 0.6, 0.0};
>+    MatrixCase matrixCase(kRows, kColumns, kMatrixStride, kComputeShaderSource, kInputDada);
>+    runMatrixTest(matrixCase);
>+}
>+
>+TEST_P(ShaderStorageBufferTest31, VectorDataInMatrixInSSBOWithColumnMajorQualifier)
>+{
>+    constexpr char kComputeShaderSource[] =
>+        R"(#version 310 es
>+layout(local_size_x=1, local_size_y=1, local_size_z=1) in;
>+layout(std140, binding = 0) buffer blockIn {
>+    layout(column_major) mat2x3 data;
>+} instanceIn;
>+layout(std140, binding = 1) buffer blockOut {
>+    layout(column_major) mat2x3 data;
>+} instanceOut;
>+void main()
>+{
>+    instanceOut.data[0] = instanceIn.data[0];
>+    instanceOut.data[1] = instanceIn.data[1];
>+}
>+)";
>+
>+    constexpr unsigned int kColumns                                             = 2;
>+    constexpr unsigned int kRows                                                = 3;
>+    constexpr unsigned int kBytesPerComponent                                   = sizeof(float);
>+    constexpr unsigned int kMatrixStride                                        = 16;
>+    constexpr float kInputDada[kColumns * (kMatrixStride / kBytesPerComponent)] = {
>+        0.1, 0.2, 0.3, 0.0, 0.4, 0.5, 0.6, 0.0};
>+    MatrixCase matrixCase(kRows, kColumns, kMatrixStride, kComputeShaderSource, kInputDada);
>+    runMatrixTest(matrixCase);
>+}
>+
>+TEST_P(ShaderStorageBufferTest31, MatrixDataInSSBOWithColumnMajorQualifier)
>+{
>+    constexpr char kComputeShaderSource[] =
>+        R"(#version 310 es
>+layout(local_size_x=1, local_size_y=1, local_size_z=1) in;
>+layout(std140, binding = 0) buffer blockIn {
>+    layout(column_major) mat2x3 data;
>+} instanceIn;
>+layout(std140, binding = 1) buffer blockOut {
>+    layout(column_major) mat2x3 data;
>+} instanceOut;
>+void main()
>+{
>+    instanceOut.data = instanceIn.data;
>+}
>+)";
>+
>+    constexpr unsigned int kColumns                                             = 2;
>+    constexpr unsigned int kRows                                                = 3;
>+    constexpr unsigned int kBytesPerComponent                                   = sizeof(float);
>+    constexpr unsigned int kMatrixStride                                        = 16;
>+    constexpr float kInputDada[kColumns * (kMatrixStride / kBytesPerComponent)] = {
>+        0.1, 0.2, 0.3, 0.0, 0.4, 0.5, 0.6, 0.0};
>+    MatrixCase matrixCase(kRows, kColumns, kMatrixStride, kComputeShaderSource, kInputDada);
>+    runMatrixTest(matrixCase);
>+}
>+
>+// Test that access/write to structure data in shader storage buffer.
>+TEST_P(ShaderStorageBufferTest31, ShaderStorageBufferStructureArray)
>+{
>+    constexpr char kComputeShaderSource[] =
>+        R"(#version 310 es
>+layout(local_size_x=1, local_size_y=1, local_size_z=1) in;
>+struct S
>+{
>+    uvec2 uvData;
>+    uint uiData[2];
>+};
>+layout(std140, binding = 0) buffer blockIn {
>+    S s[2];
>+    uint lastData;
>+} instanceIn;
>+layout(std140, binding = 1) buffer blockOut {
>+    S s[2];
>+    uint lastData;
>+} instanceOut;
>+void main()
>+{
>+    instanceOut.s[0].uvData = instanceIn.s[0].uvData;
>+    instanceOut.s[0].uiData[0] = instanceIn.s[0].uiData[0];
>+    instanceOut.s[0].uiData[1] = instanceIn.s[0].uiData[1];
>+    instanceOut.s[1].uvData = instanceIn.s[1].uvData;
>+    instanceOut.s[1].uiData[0] = instanceIn.s[1].uiData[0];
>+    instanceOut.s[1].uiData[1] = instanceIn.s[1].uiData[1];
>+    instanceOut.lastData = instanceIn.lastData;
>+}
>+)";
>+
>+    ANGLE_GL_COMPUTE_PROGRAM(program, kComputeShaderSource);
>+
>+    glUseProgram(program);
>+
>+    std::array<GLuint, 4> kUVData = {{
>+        1u,
>+        2u,
>+        0u,
>+        0u,
>+    }};
>+    std::array<GLuint, 8> kUIData = {{
>+        3u,
>+        0u,
>+        0u,
>+        0u,
>+        4u,
>+        0u,
>+        0u,
>+        0u,
>+    }};
>+    GLuint kLastData              = 5u;
>+
>+    constexpr unsigned int kBytesPerComponent = sizeof(GLuint);
>+    constexpr unsigned int kStructureStride   = 48;
>+    constexpr unsigned int totalSize          = kStructureStride * 2 + sizeof(kLastData);
>+
>+    // Create shader storage buffer
>+    GLBuffer shaderStorageBuffer[2];
>+    glBindBuffer(GL_SHADER_STORAGE_BUFFER, shaderStorageBuffer[0]);
>+    glBufferData(GL_SHADER_STORAGE_BUFFER, totalSize, nullptr, GL_STATIC_DRAW);
>+    GLint offset = 0;
>+    // upload data to instanceIn.s[0]
>+    glBufferSubData(GL_SHADER_STORAGE_BUFFER, offset, kUVData.size() * kBytesPerComponent,
>+                    kUVData.data());
>+    offset += (kUVData.size() * kBytesPerComponent);
>+    glBufferSubData(GL_SHADER_STORAGE_BUFFER, offset, kUIData.size() * kBytesPerComponent,
>+                    kUIData.data());
>+    offset += (kUIData.size() * kBytesPerComponent);
>+    // upload data to instanceIn.s[1]
>+    glBufferSubData(GL_SHADER_STORAGE_BUFFER, offset, kUVData.size() * kBytesPerComponent,
>+                    kUVData.data());
>+    offset += (kUVData.size() * kBytesPerComponent);
>+    glBufferSubData(GL_SHADER_STORAGE_BUFFER, offset, kUIData.size() * kBytesPerComponent,
>+                    kUIData.data());
>+    offset += (kUIData.size() * kBytesPerComponent);
>+    // upload data to instanceIn.lastData
>+    glBufferSubData(GL_SHADER_STORAGE_BUFFER, offset, sizeof(kLastData), &kLastData);
>+
>+    glBindBuffer(GL_SHADER_STORAGE_BUFFER, shaderStorageBuffer[1]);
>+    glBufferData(GL_SHADER_STORAGE_BUFFER, totalSize, nullptr, GL_STATIC_DRAW);
>+
>+    // Bind shader storage buffer
>+    glBindBufferBase(GL_SHADER_STORAGE_BUFFER, 0, shaderStorageBuffer[0]);
>+    glBindBufferBase(GL_SHADER_STORAGE_BUFFER, 1, shaderStorageBuffer[1]);
>+
>+    glDispatchCompute(1, 1, 1);
>+    glFinish();
>+
>+    // Read back shader storage buffer
>+    glBindBuffer(GL_SHADER_STORAGE_BUFFER, shaderStorageBuffer[1]);
>+    constexpr float kExpectedValues[5] = {1u, 2u, 3u, 4u, 5u};
>+    const GLuint *ptr                  = reinterpret_cast<const GLuint *>(
>+        glMapBufferRange(GL_SHADER_STORAGE_BUFFER, 0, totalSize, GL_MAP_READ_BIT));
>+    // instanceOut.s[0]
>+    EXPECT_EQ(kExpectedValues[0], *ptr);
>+    EXPECT_EQ(kExpectedValues[1], *(ptr + 1));
>+    EXPECT_EQ(kExpectedValues[2], *(ptr + 4));
>+    EXPECT_EQ(kExpectedValues[3], *(ptr + 8));
>+    // instanceOut.s[1]
>+    ptr += kStructureStride / kBytesPerComponent;
>+    EXPECT_EQ(kExpectedValues[0], *ptr);
>+    EXPECT_EQ(kExpectedValues[1], *(ptr + 1));
>+    EXPECT_EQ(kExpectedValues[2], *(ptr + 4));
>+    EXPECT_EQ(kExpectedValues[3], *(ptr + 8));
>+    // instanceOut.lastData
>+    ptr += kStructureStride / kBytesPerComponent;
>+    EXPECT_EQ(kExpectedValues[4], *(ptr));
>+
>+    EXPECT_GL_NO_ERROR();
>+}
>+
>+// Test that access/write to array of array structure data in shader storage buffer.
>+TEST_P(ShaderStorageBufferTest31, ShaderStorageBufferStructureArrayOfArray)
>+{
>+    constexpr char kComputeShaderSource[] = R"(#version 310 es
>+layout(local_size_x=1, local_size_y=1, local_size_z=1) in;
>+struct S
>+{
>+    uvec2 uvData;
>+    uint uiData[2];
>+};
>+layout(std140, binding = 0) buffer blockIn {
>+    S s[3][2];
>+    uint lastData;
>+} instanceIn;
>+layout(std140, binding = 1) buffer blockOut {
>+    S s[3][2];
>+    uint lastData;
>+} instanceOut;
>+void main()
>+{
>+    instanceOut.s[1][0].uvData = instanceIn.s[1][0].uvData;
>+    instanceOut.s[1][0].uiData[0] = instanceIn.s[1][0].uiData[0];
>+    instanceOut.s[1][0].uiData[1] = instanceIn.s[1][0].uiData[1];
>+    instanceOut.s[1][1].uvData = instanceIn.s[1][1].uvData;
>+    instanceOut.s[1][1].uiData[0] = instanceIn.s[1][1].uiData[0];
>+    instanceOut.s[1][1].uiData[1] = instanceIn.s[1][1].uiData[1];
>+
>+    instanceOut.lastData = instanceIn.lastData;
>+}
>+)";
>+
>+    ANGLE_GL_COMPUTE_PROGRAM(program, kComputeShaderSource);
>+
>+    glUseProgram(program);
>+
>+    std::array<GLuint, 4> kUVData = {{
>+        1u,
>+        2u,
>+        0u,
>+        0u,
>+    }};
>+    std::array<GLuint, 8> kUIData = {{
>+        3u,
>+        0u,
>+        0u,
>+        0u,
>+        4u,
>+        0u,
>+        0u,
>+        0u,
>+    }};
>+    GLuint kLastData              = 5u;
>+
>+    constexpr unsigned int kBytesPerComponent        = sizeof(GLuint);
>+    constexpr unsigned int kStructureStride          = 48;
>+    constexpr unsigned int kStructureArrayDimension0 = 3;
>+    constexpr unsigned int kStructureArrayDimension1 = 2;
>+    constexpr unsigned int kLastDataOffset =
>+        kStructureStride * kStructureArrayDimension0 * kStructureArrayDimension1;
>+    constexpr unsigned int totalSize = kLastDataOffset + sizeof(kLastData);
>+
>+    GLBuffer shaderStorageBuffer[2];
>+    glBindBuffer(GL_SHADER_STORAGE_BUFFER, shaderStorageBuffer[0]);
>+    glBufferData(GL_SHADER_STORAGE_BUFFER, totalSize, nullptr, GL_STATIC_DRAW);
>+    // offset of instanceIn.s[1][0]
>+    GLint offset      = kStructureStride * (kStructureArrayDimension1 * 1 + 0);
>+    GLuint uintOffset = offset / kBytesPerComponent;
>+    // upload data to instanceIn.s[1][0]
>+    glBufferSubData(GL_SHADER_STORAGE_BUFFER, offset, kUVData.size() * kBytesPerComponent,
>+                    kUVData.data());
>+    offset += (kUVData.size() * kBytesPerComponent);
>+    glBufferSubData(GL_SHADER_STORAGE_BUFFER, offset, kUIData.size() * kBytesPerComponent,
>+                    kUIData.data());
>+    offset += (kUIData.size() * kBytesPerComponent);
>+    // upload data to instanceIn.s[1][1]
>+    glBufferSubData(GL_SHADER_STORAGE_BUFFER, offset, kUVData.size() * kBytesPerComponent,
>+                    kUVData.data());
>+    offset += (kUVData.size() * kBytesPerComponent);
>+    glBufferSubData(GL_SHADER_STORAGE_BUFFER, offset, kUIData.size() * kBytesPerComponent,
>+                    kUIData.data());
>+    // upload data to instanceIn.lastData
>+    glBufferSubData(GL_SHADER_STORAGE_BUFFER, kLastDataOffset, sizeof(kLastData), &kLastData);
>+
>+    glBindBuffer(GL_SHADER_STORAGE_BUFFER, shaderStorageBuffer[1]);
>+    glBufferData(GL_SHADER_STORAGE_BUFFER, totalSize, nullptr, GL_STATIC_DRAW);
>+
>+    glBindBufferBase(GL_SHADER_STORAGE_BUFFER, 0, shaderStorageBuffer[0]);
>+    glBindBufferBase(GL_SHADER_STORAGE_BUFFER, 1, shaderStorageBuffer[1]);
>+
>+    glDispatchCompute(1, 1, 1);
>+    glFinish();
>+
>+    // Read back shader storage buffer
>+    glBindBuffer(GL_SHADER_STORAGE_BUFFER, shaderStorageBuffer[1]);
>+    constexpr float kExpectedValues[5] = {1u, 2u, 3u, 4u, 5u};
>+    const GLuint *ptr                  = reinterpret_cast<const GLuint *>(
>+        glMapBufferRange(GL_SHADER_STORAGE_BUFFER, 0, totalSize, GL_MAP_READ_BIT));
>+
>+    // instanceOut.s[0][0]
>+    EXPECT_EQ(kExpectedValues[0], *(ptr + uintOffset));
>+    EXPECT_EQ(kExpectedValues[1], *(ptr + uintOffset + 1));
>+    EXPECT_EQ(kExpectedValues[2], *(ptr + uintOffset + 4));
>+    EXPECT_EQ(kExpectedValues[3], *(ptr + uintOffset + 8));
>+
>+    // instanceOut.s[0][1]
>+    EXPECT_EQ(kExpectedValues[0], *(ptr + uintOffset + 12));
>+    EXPECT_EQ(kExpectedValues[1], *(ptr + uintOffset + 13));
>+    EXPECT_EQ(kExpectedValues[2], *(ptr + uintOffset + 16));
>+    EXPECT_EQ(kExpectedValues[3], *(ptr + uintOffset + 20));
>+
>+    // instanceOut.lastData
>+    EXPECT_EQ(kExpectedValues[4], *(ptr + (kLastDataOffset / kBytesPerComponent)));
>+
>+    EXPECT_GL_NO_ERROR();
>+}
>+
>+// Test that access/write to vector data in std430 shader storage block.
>+TEST_P(ShaderStorageBufferTest31, VectorArrayInSSBOWithStd430Qualifier)
>+{
>+    constexpr char kComputeShaderSource[] = R"(#version 310 es
>+layout(local_size_x=1, local_size_y=1, local_size_z=1) in;
>+layout(std430, binding = 0) buffer blockIn {
>+    uvec2 data[2];
>+} instanceIn;
>+layout(std430, binding = 1) buffer blockOut {
>+    uvec2 data[2];
>+} instanceOut;
>+void main()
>+{
>+    instanceOut.data[0] = instanceIn.data[0];
>+    instanceOut.data[1] = instanceIn.data[1];
>+}
>+)";
>+
>+    ANGLE_GL_COMPUTE_PROGRAM(program, kComputeShaderSource);
>+
>+    glUseProgram(program);
>+
>+    constexpr unsigned int kElementCount      = 2;
>+    constexpr unsigned int kBytesPerComponent = sizeof(unsigned int);
>+    constexpr unsigned int kArrayStride       = 8;
>+    constexpr unsigned int kComponentCount    = kArrayStride / kBytesPerComponent;
>+    constexpr unsigned int kExpectedValues[kElementCount][kComponentCount] = {{1u, 2u}, {3u, 4u}};
>+    // Create shader storage buffer
>+    GLBuffer shaderStorageBuffer[2];
>+    glBindBuffer(GL_SHADER_STORAGE_BUFFER, shaderStorageBuffer[0]);
>+    glBufferData(GL_SHADER_STORAGE_BUFFER, kElementCount * kArrayStride, kExpectedValues,
>+                 GL_STATIC_DRAW);
>+    glBindBuffer(GL_SHADER_STORAGE_BUFFER, shaderStorageBuffer[1]);
>+    glBufferData(GL_SHADER_STORAGE_BUFFER, kElementCount * kArrayStride, nullptr, GL_STATIC_DRAW);
>+
>+    // Bind shader storage buffer
>+    glBindBufferBase(GL_SHADER_STORAGE_BUFFER, 0, shaderStorageBuffer[0]);
>+    glBindBufferBase(GL_SHADER_STORAGE_BUFFER, 1, shaderStorageBuffer[1]);
>+
>+    glDispatchCompute(1, 1, 1);
>+
>+    glFinish();
>+
>+    // Read back shader storage buffer
>+    glBindBuffer(GL_SHADER_STORAGE_BUFFER, shaderStorageBuffer[1]);
>+    const GLuint *ptr = reinterpret_cast<const GLuint *>(glMapBufferRange(
>+        GL_SHADER_STORAGE_BUFFER, 0, kElementCount * kArrayStride, GL_MAP_READ_BIT));
>+    for (unsigned int idx = 0; idx < kElementCount; idx++)
>+    {
>+        for (unsigned int idy = 0; idy < kComponentCount; idy++)
>+        {
>+            EXPECT_EQ(kExpectedValues[idx][idy], *(ptr + idx * kComponentCount + idy));
>+        }
>+    }
>+
>+    EXPECT_GL_NO_ERROR();
>+}
>+
>+// Test that access/write to matrix data in std430 shader storage block.
>+TEST_P(ShaderStorageBufferTest31, MatrixInSSBOWithStd430Qualifier)
>+{
>+    constexpr char kComputeShaderSource[] = R"(#version 310 es
>+layout(local_size_x=1, local_size_y=1, local_size_z=1) in;
>+layout(std430, binding = 0) buffer blockIn {
>+    mat2 data;
>+} instanceIn;
>+layout(std430, binding = 1) buffer blockOut {
>+    mat2 data;
>+} instanceOut;
>+void main()
>+{
>+    instanceOut.data = instanceIn.data;
>+}
>+)";
>+
>+    ANGLE_GL_COMPUTE_PROGRAM(program, kComputeShaderSource);
>+
>+    glUseProgram(program);
>+
>+    constexpr unsigned int kColumns              = 2;
>+    constexpr unsigned int kRows                 = 2;
>+    constexpr unsigned int kBytesPerComponent    = sizeof(float);
>+    constexpr unsigned int kMatrixStride         = kRows * kBytesPerComponent;
>+    constexpr float kInputDada[kColumns * kRows] = {0.1, 0.2, 0.4, 0.5};
>+    MatrixCase matrixCase(kRows, kColumns, kMatrixStride, kComputeShaderSource, kInputDada);
>+    runMatrixTest(matrixCase);
>+}
>+
>+// Test that access/write to structure data in std430 shader storage block.
>+TEST_P(ShaderStorageBufferTest31, StructureInSSBOWithStd430Qualifier)
>+{
>+    constexpr char kComputeShaderSource[] = R"(#version 310 es
>+layout(local_size_x=1, local_size_y=1, local_size_z=1) in;
>+struct S
>+{
>+    uvec2 u;
>+};
>+layout(std430, binding = 0) buffer blockIn {
>+    uint i1;
>+    S s;
>+    uint i2;
>+} instanceIn;
>+layout(std430, binding = 1) buffer blockOut {
>+    uint i1;
>+    S s;
>+    uint i2;
>+} instanceOut;
>+void main()
>+{
>+    instanceOut.i1 = instanceIn.i1;
>+    instanceOut.s.u = instanceIn.s.u;
>+    instanceOut.i2 = instanceIn.i2;
>+}
>+)";
>+
>+    ANGLE_GL_COMPUTE_PROGRAM(program, kComputeShaderSource);
>+    glUseProgram(program);
>+
>+    GLuint kI1Data               = 1u;
>+    std::array<GLuint, 2> kUData = {{
>+        2u,
>+        3u,
>+    }};
>+    GLuint kI2Data               = 4u;
>+
>+    constexpr unsigned int kBytesPerComponent    = sizeof(GLuint);
>+    constexpr unsigned int kStructureStartOffset = 8;
>+    constexpr unsigned int kStructureSize        = 8;
>+    constexpr unsigned int kTotalSize = kStructureStartOffset + kStructureSize + kBytesPerComponent;
>+
>+    // Create shader storage buffer
>+    GLBuffer shaderStorageBuffer[2];
>+    glBindBuffer(GL_SHADER_STORAGE_BUFFER, shaderStorageBuffer[0]);
>+    glBufferData(GL_SHADER_STORAGE_BUFFER, kTotalSize, nullptr, GL_STATIC_DRAW);
>+    // upload data to instanceIn.i1
>+    glBufferSubData(GL_SHADER_STORAGE_BUFFER, 0, kBytesPerComponent, &kI1Data);
>+    // upload data to instanceIn.s.u
>+    glBufferSubData(GL_SHADER_STORAGE_BUFFER, kStructureStartOffset, kStructureSize, kUData.data());
>+    // upload data to instanceIn.i2
>+    glBufferSubData(GL_SHADER_STORAGE_BUFFER, kStructureStartOffset + kStructureSize,
>+                    kBytesPerComponent, &kI2Data);
>+
>+    glBindBuffer(GL_SHADER_STORAGE_BUFFER, shaderStorageBuffer[1]);
>+    glBufferData(GL_SHADER_STORAGE_BUFFER, kTotalSize, nullptr, GL_STATIC_DRAW);
>+
>+    // Bind shader storage buffer
>+    glBindBufferBase(GL_SHADER_STORAGE_BUFFER, 0, shaderStorageBuffer[0]);
>+    glBindBufferBase(GL_SHADER_STORAGE_BUFFER, 1, shaderStorageBuffer[1]);
>+
>+    glDispatchCompute(1, 1, 1);
>+    glFinish();
>+
>+    // Read back shader storage buffer
>+    glBindBuffer(GL_SHADER_STORAGE_BUFFER, shaderStorageBuffer[1]);
>+    GLuint kExpectedValues[4] = {1u, 2u, 3u, 4u};
>+    const GLuint *ptr         = reinterpret_cast<const GLuint *>(
>+        glMapBufferRange(GL_SHADER_STORAGE_BUFFER, 0, kTotalSize, GL_MAP_READ_BIT));
>+    EXPECT_EQ(kExpectedValues[0], *ptr);
>+    ptr += (kStructureStartOffset / kBytesPerComponent);
>+    EXPECT_EQ(kExpectedValues[1], *ptr);
>+    EXPECT_EQ(kExpectedValues[2], *(ptr + 1));
>+    ptr += (kStructureSize / kBytesPerComponent);
>+    EXPECT_EQ(kExpectedValues[3], *ptr);
>+
>+    EXPECT_GL_NO_ERROR();
>+}
>+
>+// Test that access/write to structure of structure data in std430 shader storage block.
>+TEST_P(ShaderStorageBufferTest31, StructureOfStructureInSSBOWithStd430Qualifier)
>+{
>+    constexpr char kComputeShaderSource[] = R"(#version 310 es
>+layout(local_size_x=1, local_size_y=1, local_size_z=1) in;
>+struct S2
>+{
>+    uvec3 u2;
>+};
>+struct S1
>+{
>+    uvec2 u1;
>+    S2 s2;
>+};
>+layout(std430, binding = 0) buffer blockIn {
>+    uint i1;
>+    S1 s1;
>+    uint i2;
>+} instanceIn;
>+layout(std430, binding = 1) buffer blockOut {
>+    uint i1;
>+    S1 s1;
>+    uint i2;
>+} instanceOut;
>+void main()
>+{
>+    instanceOut.i1 = instanceIn.i1;
>+    instanceOut.s1.u1 = instanceIn.s1.u1;
>+    instanceOut.s1.s2.u2 = instanceIn.s1.s2.u2;
>+    instanceOut.i2 = instanceIn.i2;
>+}
>+)";
>+
>+    ANGLE_GL_COMPUTE_PROGRAM(program, kComputeShaderSource);
>+    glUseProgram(program);
>+
>+    constexpr unsigned int kBytesPerComponent      = sizeof(GLuint);
>+    constexpr unsigned int kStructureS1StartOffset = 16;
>+    constexpr unsigned int kStructureS2StartOffset = 32;
>+    constexpr unsigned int kStructureS1Size        = 32;
>+    constexpr unsigned int kTotalSize =
>+        kStructureS1StartOffset + kStructureS1Size + kBytesPerComponent;
>+
>+    GLuint kI1Data                = 1u;
>+    std::array<GLuint, 2> kU1Data = {{2u, 3u}};
>+    std::array<GLuint, 3> kU2Data = {{4u, 5u, 6u}};
>+    GLuint kI2Data                = 7u;
>+
>+    // Create shader storage buffer
>+    GLBuffer shaderStorageBuffer[2];
>+    glBindBuffer(GL_SHADER_STORAGE_BUFFER, shaderStorageBuffer[0]);
>+    glBufferData(GL_SHADER_STORAGE_BUFFER, kTotalSize, nullptr, GL_STATIC_DRAW);
>+    // upload data to instanceIn.i1
>+    glBufferSubData(GL_SHADER_STORAGE_BUFFER, 0, kBytesPerComponent, &kI1Data);
>+    // upload data to instanceIn.s1.u1
>+    glBufferSubData(GL_SHADER_STORAGE_BUFFER, kStructureS1StartOffset,
>+                    kU1Data.size() * kBytesPerComponent, kU1Data.data());
>+    // upload data to instanceIn.s1.s2.u2
>+    glBufferSubData(GL_SHADER_STORAGE_BUFFER, kStructureS2StartOffset,
>+                    kU2Data.size() * kBytesPerComponent, kU2Data.data());
>+    // upload data to instanceIn.i2
>+    glBufferSubData(GL_SHADER_STORAGE_BUFFER, kStructureS1StartOffset + kStructureS1Size,
>+                    kBytesPerComponent, &kI2Data);
>+
>+    glBindBuffer(GL_SHADER_STORAGE_BUFFER, shaderStorageBuffer[1]);
>+    glBufferData(GL_SHADER_STORAGE_BUFFER, kTotalSize, nullptr, GL_STATIC_DRAW);
>+
>+    // Bind shader storage buffer
>+    glBindBufferBase(GL_SHADER_STORAGE_BUFFER, 0, shaderStorageBuffer[0]);
>+    glBindBufferBase(GL_SHADER_STORAGE_BUFFER, 1, shaderStorageBuffer[1]);
>+
>+    glDispatchCompute(1, 1, 1);
>+    glFinish();
>+
>+    // Read back shader storage buffer
>+    GLuint kExpectedValues[7] = {1u, 2u, 3u, 4u, 5u, 6u, 7u};
>+    glBindBuffer(GL_SHADER_STORAGE_BUFFER, shaderStorageBuffer[1]);
>+    const GLuint *ptr = reinterpret_cast<const GLuint *>(
>+        glMapBufferRange(GL_SHADER_STORAGE_BUFFER, 0, kTotalSize, GL_MAP_READ_BIT));
>+    EXPECT_EQ(kExpectedValues[0], *ptr);
>+    ptr += (kStructureS1StartOffset / kBytesPerComponent);
>+    EXPECT_EQ(kExpectedValues[1], *ptr);
>+    EXPECT_EQ(kExpectedValues[2], *(ptr + 1));
>+    ptr += ((kStructureS2StartOffset - kStructureS1StartOffset) / kBytesPerComponent);
>+    EXPECT_EQ(kExpectedValues[3], *ptr);
>+    EXPECT_EQ(kExpectedValues[4], *(ptr + 1));
>+    EXPECT_EQ(kExpectedValues[5], *(ptr + 2));
>+    ptr += ((kStructureS1Size - kStructureS2StartOffset) / kBytesPerComponent);
>+    EXPECT_EQ(kExpectedValues[6], *(ptr + 4));
>+
>+    EXPECT_GL_NO_ERROR();
>+}
>+
>+// Test atomic memory functions.
>+TEST_P(ShaderStorageBufferTest31, AtomicMemoryFunctions)
>+{
>+    constexpr char kCS[] = R"(#version 310 es
>+layout(local_size_x=1, local_size_y=1, local_size_z=1) in;
>+layout(std140, binding = 1) buffer blockName {
>+    uint data[2];
>+} instanceName;
>+
>+void main()
>+{
>+    instanceName.data[0] = 0u;
>+    instanceName.data[1] = 0u;
>+    atomicAdd(instanceName.data[0], 5u);
>+    atomicMax(instanceName.data[1], 7u);
>+})";
>+
>+    ANGLE_GL_COMPUTE_PROGRAM(program, kCS);
>+
>+    glUseProgram(program.get());
>+
>+    constexpr unsigned int kElementCount = 2;
>+    // The array stride are rounded up to the base alignment of a vec4 for std140 layout.
>+    constexpr unsigned int kArrayStride = 16;
>+    // Create shader storage buffer
>+    GLBuffer shaderStorageBuffer;
>+    glBindBuffer(GL_SHADER_STORAGE_BUFFER, shaderStorageBuffer);
>+    glBufferData(GL_SHADER_STORAGE_BUFFER, kElementCount * kArrayStride, nullptr, GL_STATIC_DRAW);
>+
>+    // Bind shader storage buffer
>+    glBindBufferBase(GL_SHADER_STORAGE_BUFFER, 1, shaderStorageBuffer);
>+
>+    // Dispath compute
>+    glDispatchCompute(1, 1, 1);
>+
>+    glFinish();
>+
>+    // Read back shader storage buffer
>+    constexpr unsigned int kExpectedValues[2] = {5u, 7u};
>+    glBindBuffer(GL_SHADER_STORAGE_BUFFER, shaderStorageBuffer);
>+    void *ptr = glMapBufferRange(GL_SHADER_STORAGE_BUFFER, 0, kElementCount * kArrayStride,
>+                                 GL_MAP_READ_BIT);
>+    for (unsigned int idx = 0; idx < kElementCount; idx++)
>+    {
>+        EXPECT_EQ(kExpectedValues[idx],
>+                  *(reinterpret_cast<const GLuint *>(reinterpret_cast<const GLbyte *>(ptr) +
>+                                                     idx * kArrayStride)));
>+    }
>+    glUnmapBuffer(GL_SHADER_STORAGE_BUFFER);
>+    glBindBuffer(GL_SHADER_STORAGE_BUFFER, 0);
>+
>+    EXPECT_GL_NO_ERROR();
>+}
>+
>+// Test multiple storage buffers work correctly when program switching. In angle, storage buffer
>+// bindings are updated accord to current program. If switch program, need to update storage buffer
>+// bindings again.
>+TEST_P(ShaderStorageBufferTest31, MultiStorageBuffersForMultiPrograms)
>+{
>+    constexpr char kCS1[] = R"(#version 310 es
>+layout(local_size_x=3, local_size_y=1, local_size_z=1) in;
>+layout(binding = 1) buffer Output {
>+    uint result1[];
>+} sb_out1;
>+void main()
>+{
>+    highp uint offset = gl_LocalInvocationID.x;
>+    sb_out1.result1[gl_LocalInvocationIndex] = gl_LocalInvocationIndex + 1u;
>+})";
>+
>+    constexpr char kCS2[] = R"(#version 310 es
>+layout(local_size_x=3, local_size_y=1, local_size_z=1) in;
>+layout(binding = 2) buffer Output {
>+    uint result2[];
>+} sb_out2;
>+void main()
>+{
>+    highp uint offset = gl_LocalInvocationID.x;
>+    sb_out2.result2[gl_LocalInvocationIndex] = gl_LocalInvocationIndex + 2u;
>+})";
>+
>+    constexpr unsigned int numInvocations = 3;
>+    int arrayStride1 = 0, arrayStride2 = 0;
>+    GLenum props[] = {GL_ARRAY_STRIDE};
>+    GLBuffer shaderStorageBuffer1, shaderStorageBuffer2;
>+
>+    ANGLE_GL_COMPUTE_PROGRAM(program1, kCS1);
>+    ANGLE_GL_COMPUTE_PROGRAM(program2, kCS2);
>+    EXPECT_GL_NO_ERROR();
>+
>+    unsigned int outVarIndex1 =
>+        glGetProgramResourceIndex(program1.get(), GL_BUFFER_VARIABLE, "Output.result1");
>+    glGetProgramResourceiv(program1.get(), GL_BUFFER_VARIABLE, outVarIndex1, 1, props, 1, 0,
>+                           &arrayStride1);
>+    glBindBuffer(GL_SHADER_STORAGE_BUFFER, shaderStorageBuffer1);
>+    glBufferData(GL_SHADER_STORAGE_BUFFER, numInvocations * arrayStride1, nullptr, GL_STREAM_READ);
>+    glBindBufferBase(GL_SHADER_STORAGE_BUFFER, 1, shaderStorageBuffer1);
>+    EXPECT_GL_NO_ERROR();
>+
>+    unsigned int outVarIndex2 =
>+        glGetProgramResourceIndex(program2.get(), GL_BUFFER_VARIABLE, "Output.result2");
>+    glGetProgramResourceiv(program2.get(), GL_BUFFER_VARIABLE, outVarIndex2, 1, props, 1, 0,
>+                           &arrayStride2);
>+    glBindBuffer(GL_SHADER_STORAGE_BUFFER, shaderStorageBuffer2);
>+    glBufferData(GL_SHADER_STORAGE_BUFFER, numInvocations * arrayStride2, nullptr, GL_STREAM_READ);
>+    glBindBufferBase(GL_SHADER_STORAGE_BUFFER, 2, shaderStorageBuffer2);
>+    EXPECT_GL_NO_ERROR();
>+
>+    glUseProgram(program1.get());
>+    glDispatchCompute(1, 1, 1);
>+    EXPECT_GL_NO_ERROR();
>+    glUseProgram(program2.get());
>+    glDispatchCompute(1, 1, 1);
>+    EXPECT_GL_NO_ERROR();
>+
>+    glBindBuffer(GL_SHADER_STORAGE_BUFFER, shaderStorageBuffer1);
>+    const void *ptr1 =
>+        glMapBufferRange(GL_SHADER_STORAGE_BUFFER, 0, 3 * arrayStride1, GL_MAP_READ_BIT);
>+    for (unsigned int idx = 0; idx < numInvocations; idx++)
>+    {
>+        EXPECT_EQ(idx + 1, *((const GLuint *)((const GLbyte *)ptr1 + idx * arrayStride1)));
>+    }
>+    glUnmapBuffer(GL_SHADER_STORAGE_BUFFER);
>+    EXPECT_GL_NO_ERROR();
>+
>+    glBindBuffer(GL_SHADER_STORAGE_BUFFER, shaderStorageBuffer2);
>+    const void *ptr2 =
>+        glMapBufferRange(GL_SHADER_STORAGE_BUFFER, 0, 3 * arrayStride2, GL_MAP_READ_BIT);
>+    EXPECT_GL_NO_ERROR();
>+    for (unsigned int idx = 0; idx < numInvocations; idx++)
>+    {
>+        EXPECT_EQ(idx + 2, *((const GLuint *)((const GLbyte *)ptr2 + idx * arrayStride2)));
>+    }
>+    glUnmapBuffer(GL_SHADER_STORAGE_BUFFER);
>+    EXPECT_GL_NO_ERROR();
>+
>+    glBindBuffer(GL_SHADER_STORAGE_BUFFER, 0);
>+    EXPECT_GL_NO_ERROR();
>+}
>+
>+// Test that function calling is supported in SSBO access chain.
>+TEST_P(ShaderStorageBufferTest31, FunctionCallInSSBOAccessChain)
>+{
>+    constexpr char kComputeShaderSource[] = R"(#version 310 es
>+layout (local_size_x=4) in;
>+highp uint getIndex (in highp uvec2 localID, uint element)
>+{
>+    return localID.x + element;
>+}
>+layout(binding=0, std430) buffer Storage
>+{
>+    highp uint values[];
>+} sb_store;
>+
>+void main()
>+{
>+    sb_store.values[getIndex(gl_LocalInvocationID.xy, 0u)] = gl_LocalInvocationIndex;
>+}
>+)";
>+
>+    ANGLE_GL_COMPUTE_PROGRAM(program, kComputeShaderSource);
>+    EXPECT_GL_NO_ERROR();
>+}
>+
>+// Test that unary operator is supported in SSBO access chain.
>+TEST_P(ShaderStorageBufferTest31, UnaryOperatorInSSBOAccessChain)
>+{
>+    constexpr char kComputeShaderSource[] = R"(#version 310 es
>+layout (local_size_x=4) in;
>+layout(binding=0, std430) buffer Storage
>+{
>+    highp uint values[];
>+} sb_store;
>+
>+void main()
>+{
>+    uint invocationNdx = gl_LocalInvocationIndex;
>+    sb_store.values[++invocationNdx] = invocationNdx;
>+}
>+)";
>+
>+    ANGLE_GL_COMPUTE_PROGRAM(program, kComputeShaderSource);
>+    EXPECT_GL_NO_ERROR();
>+}
>+
>+// Test that ternary operator is supported in SSBO access chain.
>+TEST_P(ShaderStorageBufferTest31, TernaryOperatorInSSBOAccessChain)
>+{
>+    constexpr char kComputeShaderSource[] = R"(#version 310 es
>+layout (local_size_x=4) in;
>+layout(binding=0, std430) buffer Storage
>+{
>+    highp uint values[];
>+} sb_store;
>+
>+void main()
>+{
>+    sb_store.values[gl_LocalInvocationIndex > 2u ? gl_NumWorkGroups.x : gl_NumWorkGroups.y]
>+            = gl_LocalInvocationIndex;
>+}
>+)";
>+
>+    ANGLE_GL_COMPUTE_PROGRAM(program, kComputeShaderSource);
>+    EXPECT_GL_NO_ERROR();
>+}
>+
>+TEST_P(ShaderStorageBufferTest31, LoadAndStoreBooleanValue)
>+{
>+    // TODO(jiajia.qin@intel.com): Figure out why it fails on Intel Linux platform.
>+    // http://anglebug.com/1951
>+    ANGLE_SKIP_TEST_IF(IsIntel() && IsLinux());
>+
>+    // Seems to fail on Windows NVIDIA GL when tests are run without interruption.
>+    ANGLE_SKIP_TEST_IF(IsWindows() && IsNVIDIA() && IsOpenGL());
>+
>+    constexpr char kComputeShaderSource[] = R"(#version 310 es
>+layout (local_size_x=1) in;
>+layout(binding=0, std140) buffer Storage0
>+{
>+    bool b1;
>+    bvec2 b2;
>+} sb_load;
>+layout(binding=1, std140) buffer Storage1
>+{
>+    bool b1;
>+    bvec2 b2;
>+} sb_store;
>+void main()
>+{
>+   sb_store.b1 = sb_load.b1;
>+   sb_store.b2 = sb_load.b2;
>+}
>+)";
>+
>+    ANGLE_GL_COMPUTE_PROGRAM(program, kComputeShaderSource);
>+    EXPECT_GL_NO_ERROR();
>+
>+    glUseProgram(program);
>+
>+    constexpr GLuint kB1Value                 = 1u;
>+    constexpr GLuint kB2Value[2]              = {0u, 1u};
>+    constexpr unsigned int kBytesPerComponent = sizeof(GLuint);
>+    // Create shader storage buffer
>+    GLBuffer shaderStorageBuffer[2];
>+    glBindBuffer(GL_SHADER_STORAGE_BUFFER, shaderStorageBuffer[0]);
>+    glBufferData(GL_SHADER_STORAGE_BUFFER, 3 * kBytesPerComponent, nullptr, GL_STATIC_DRAW);
>+    GLint offset = 0;
>+    // upload data to sb_load.b1
>+    glBufferSubData(GL_SHADER_STORAGE_BUFFER, offset, kBytesPerComponent, &kB1Value);
>+    offset += kBytesPerComponent;
>+    // upload data to sb_load.b2
>+    glBufferSubData(GL_SHADER_STORAGE_BUFFER, offset, 2 * kBytesPerComponent, kB2Value);
>+
>+    glBindBuffer(GL_SHADER_STORAGE_BUFFER, shaderStorageBuffer[1]);
>+    glBufferData(GL_SHADER_STORAGE_BUFFER, 3 * kBytesPerComponent, nullptr, GL_STATIC_DRAW);
>+
>+    // Bind shader storage buffer
>+    glBindBufferBase(GL_SHADER_STORAGE_BUFFER, 0, shaderStorageBuffer[0]);
>+    glBindBufferBase(GL_SHADER_STORAGE_BUFFER, 1, shaderStorageBuffer[1]);
>+
>+    glDispatchCompute(1, 1, 1);
>+    glFinish();
>+
>+    // Read back shader storage buffer
>+    glBindBuffer(GL_SHADER_STORAGE_BUFFER, shaderStorageBuffer[1]);
>+    const GLboolean *ptr = reinterpret_cast<const GLboolean *>(
>+        glMapBufferRange(GL_SHADER_STORAGE_BUFFER, 0, 3 * kBytesPerComponent, GL_MAP_READ_BIT));
>+    EXPECT_EQ(GL_TRUE, *ptr);
>+    ptr += kBytesPerComponent;
>+    EXPECT_EQ(GL_FALSE, *ptr);
>+    ptr += kBytesPerComponent;
>+    EXPECT_EQ(GL_TRUE, *ptr);
>+
>+    EXPECT_GL_NO_ERROR();
>+}
>+
>+// Test that non-structure array of arrays is supported in SSBO.
>+TEST_P(ShaderStorageBufferTest31, SimpleArrayOfArrays)
>+{
>+    constexpr char kComputeShaderSource[] = R"(#version 310 es
>+layout (local_size_x=1) in;
>+layout(binding=0, std140) buffer Storage0
>+{
>+    uint a[2][2][2];
>+    uint b;
>+} sb_load;
>+layout(binding=1, std140) buffer Storage1
>+{
>+    uint a[2][2][2];
>+    uint b;
>+} sb_store;
>+void main()
>+{
>+   sb_store.a[0][0][0] = sb_load.a[0][0][0];
>+   sb_store.a[0][0][1] = sb_load.a[0][0][1];
>+   sb_store.a[0][1][0] = sb_load.a[0][1][0];
>+   sb_store.a[0][1][1] = sb_load.a[0][1][1];
>+   sb_store.a[1][0][0] = sb_load.a[1][0][0];
>+   sb_store.a[1][0][1] = sb_load.a[1][0][1];
>+   sb_store.a[1][1][0] = sb_load.a[1][1][0];
>+   sb_store.a[1][1][1] = sb_load.a[1][1][1];
>+   sb_store.b = sb_load.b;
>+}
>+)";
>+
>+    ANGLE_GL_COMPUTE_PROGRAM(program, kComputeShaderSource);
>+    glUseProgram(program);
>+
>+    constexpr unsigned int kBytesPerComponent = sizeof(GLuint);
>+    // The array stride are rounded up to the base alignment of a vec4 for std140 layout.
>+    constexpr unsigned int kArrayStride                 = 16;
>+    constexpr unsigned int kDimension0                  = 2;
>+    constexpr unsigned int kDimension1                  = 2;
>+    constexpr unsigned int kDimension2                  = 2;
>+    constexpr unsigned int kAElementCount               = kDimension0 * kDimension1 * kDimension2;
>+    constexpr unsigned int kAComponentCountPerDimension = kArrayStride / kBytesPerComponent;
>+    constexpr unsigned int kTotalSize = kArrayStride * kAElementCount + kBytesPerComponent;
>+
>+    constexpr GLuint kInputADatas[kAElementCount * kAComponentCountPerDimension] = {
>+        1u, 0u, 0u, 0u, 2u, 0u, 0u, 0u, 3u, 0u, 0u, 0u, 4u, 0u, 0u, 0u,
>+        5u, 0u, 0u, 0u, 6u, 0u, 0u, 0u, 7u, 0u, 0u, 0u, 8u, 0u, 0u, 0u};
>+    constexpr GLuint kInputBData = 9u;
>+
>+    // Create shader storage buffer
>+    GLBuffer shaderStorageBuffer[2];
>+    glBindBuffer(GL_SHADER_STORAGE_BUFFER, shaderStorageBuffer[0]);
>+    glBufferData(GL_SHADER_STORAGE_BUFFER, kTotalSize, nullptr, GL_STATIC_DRAW);
>+    GLint offset = 0;
>+    // upload data to sb_load.a
>+    glBufferSubData(GL_SHADER_STORAGE_BUFFER, offset, kAElementCount * kArrayStride, kInputADatas);
>+    offset += (kAElementCount * kArrayStride);
>+    // upload data to sb_load.b
>+    glBufferSubData(GL_SHADER_STORAGE_BUFFER, offset, kBytesPerComponent, &kInputBData);
>+
>+    glBindBuffer(GL_SHADER_STORAGE_BUFFER, shaderStorageBuffer[1]);
>+    glBufferData(GL_SHADER_STORAGE_BUFFER, kTotalSize, nullptr, GL_STATIC_DRAW);
>+
>+    // Bind shader storage buffer
>+    glBindBufferBase(GL_SHADER_STORAGE_BUFFER, 0, shaderStorageBuffer[0]);
>+    glBindBufferBase(GL_SHADER_STORAGE_BUFFER, 1, shaderStorageBuffer[1]);
>+
>+    glDispatchCompute(1, 1, 1);
>+    glFinish();
>+
>+    // Read back shader storage buffer
>+    glBindBuffer(GL_SHADER_STORAGE_BUFFER, shaderStorageBuffer[1]);
>+    constexpr GLuint kExpectedADatas[kAElementCount] = {1u, 2u, 3u, 4u, 5u, 6u, 7u, 8u};
>+    const GLuint *ptr                                = reinterpret_cast<const GLuint *>(
>+        glMapBufferRange(GL_SHADER_STORAGE_BUFFER, 0, kTotalSize, GL_MAP_READ_BIT));
>+    for (unsigned i = 0u; i < kDimension0; i++)
>+    {
>+        for (unsigned j = 0u; j < kDimension1; j++)
>+        {
>+            for (unsigned k = 0u; k < kDimension2; k++)
>+            {
>+                unsigned index = i * (kDimension1 * kDimension2) + j * kDimension2 + k;
>+                EXPECT_EQ(kExpectedADatas[index],
>+                          *(ptr + index * (kArrayStride / kBytesPerComponent)));
>+            }
>+        }
>+    }
>+
>+    ptr += (kAElementCount * (kArrayStride / kBytesPerComponent));
>+    EXPECT_EQ(kInputBData, *ptr);
>+
>+    EXPECT_GL_NO_ERROR();
>+}
>+
>+// Test that the length of unsized array is supported.
>+TEST_P(ShaderStorageBufferTest31, UnsizedArrayLength)
>+{
>+    constexpr char kComputeShaderSource[] =
>+        R"(#version 310 es
>+layout (local_size_x=1) in;
>+layout(std430, binding = 0) buffer Storage0 {
>+  uint buf1[2];
>+  uint buf2[];
>+} sb_load;
>+layout(std430, binding = 1) buffer Storage1 {
>+  int unsizedArrayLength;
>+  uint buf1[2];
>+  uint buf2[];
>+} sb_store;
>+
>+void main()
>+{
>+  sb_store.unsizedArrayLength = sb_store.buf2.length();
>+  for (int i = 0; i < sb_load.buf1.length(); i++) {
>+    sb_store.buf1[i] = sb_load.buf1[i];
>+  }
>+  for (int i = 0; i < sb_load.buf2.length(); i++) {
>+    sb_store.buf2[i] = sb_load.buf2[i];
>+  }
>+}
>+)";
>+
>+    ANGLE_GL_COMPUTE_PROGRAM(program, kComputeShaderSource);
>+    glUseProgram(program);
>+
>+    constexpr unsigned int kBytesPerComponent                       = sizeof(unsigned int);
>+    constexpr unsigned int kLoadBlockElementCount                   = 5;
>+    constexpr unsigned int kStoreBlockElementCount                  = 6;
>+    constexpr unsigned int kInputValues[kLoadBlockElementCount]     = {1u, 2u, 3u, 4u, 5u};
>+    constexpr unsigned int kExpectedValues[kStoreBlockElementCount] = {3u, 1u, 2u, 3u, 4u, 5u};
>+    GLBuffer shaderStorageBuffer[2];
>+    glBindBuffer(GL_SHADER_STORAGE_BUFFER, shaderStorageBuffer[0]);
>+    glBufferData(GL_SHADER_STORAGE_BUFFER, kLoadBlockElementCount * kBytesPerComponent,
>+                 &kInputValues, GL_STATIC_DRAW);
>+    glBindBuffer(GL_SHADER_STORAGE_BUFFER, shaderStorageBuffer[1]);
>+    glBufferData(GL_SHADER_STORAGE_BUFFER, kStoreBlockElementCount * kBytesPerComponent, nullptr,
>+                 GL_STATIC_DRAW);
>+
>+    glBindBufferBase(GL_SHADER_STORAGE_BUFFER, 0, shaderStorageBuffer[0]);
>+    glBindBufferBase(GL_SHADER_STORAGE_BUFFER, 1, shaderStorageBuffer[1]);
>+
>+    glDispatchCompute(1, 1, 1);
>+    glFinish();
>+
>+    glBindBuffer(GL_SHADER_STORAGE_BUFFER, shaderStorageBuffer[1]);
>+    const GLuint *ptr = reinterpret_cast<const GLuint *>(
>+        glMapBufferRange(GL_SHADER_STORAGE_BUFFER, 0, kStoreBlockElementCount * kBytesPerComponent,
>+                         GL_MAP_READ_BIT));
>+    for (unsigned int i = 0; i < kStoreBlockElementCount; i++)
>+    {
>+        EXPECT_EQ(kExpectedValues[i], *(ptr + i));
>+    }
>+
>+    EXPECT_GL_NO_ERROR();
>+}
>+
>+// Test that compond assignment operator for buffer variable is correctly handled.
>+TEST_P(ShaderStorageBufferTest31, CompoundAssignmentOperator)
>+{
>+    // http://anglebug.com/2990
>+    ANGLE_SKIP_TEST_IF(IsD3D11());
>+
>+    constexpr char kComputeShaderSource[] =
>+        R"(#version 310 es
>+layout (local_size_x=1) in;
>+layout(binding=0, std140) buffer Storage0
>+{
>+    uint b;
>+} sb_load;
>+layout(binding=1, std140) buffer Storage1
>+{
>+    uint b;
>+} sb_store;
>+void main()
>+{
>+    uint temp = 2u;
>+    temp += sb_load.b;
>+    sb_store.b += temp;
>+    sb_store.b += sb_load.b;
>+}
>+)";
>+
>+    ANGLE_GL_COMPUTE_PROGRAM(program, kComputeShaderSource);
>+    glUseProgram(program);
>+
>+    constexpr unsigned int kBytesPerComponent = sizeof(unsigned int);
>+    constexpr unsigned int kInputValue        = 1u;
>+    constexpr unsigned int kExpectedValue     = 5u;
>+    GLBuffer shaderStorageBuffer[2];
>+    glBindBuffer(GL_SHADER_STORAGE_BUFFER, shaderStorageBuffer[0]);
>+    glBufferData(GL_SHADER_STORAGE_BUFFER, kBytesPerComponent, &kInputValue, GL_STATIC_DRAW);
>+    glBindBuffer(GL_SHADER_STORAGE_BUFFER, shaderStorageBuffer[1]);
>+    glBufferData(GL_SHADER_STORAGE_BUFFER, kBytesPerComponent, &kInputValue, GL_STATIC_DRAW);
>+
>+    glBindBufferBase(GL_SHADER_STORAGE_BUFFER, 0, shaderStorageBuffer[0]);
>+    glBindBufferBase(GL_SHADER_STORAGE_BUFFER, 1, shaderStorageBuffer[1]);
>+
>+    glDispatchCompute(1, 1, 1);
>+    glFinish();
>+
>+    glBindBuffer(GL_SHADER_STORAGE_BUFFER, shaderStorageBuffer[1]);
>+    const GLuint *ptr = reinterpret_cast<const GLuint *>(
>+        glMapBufferRange(GL_SHADER_STORAGE_BUFFER, 0, kBytesPerComponent, GL_MAP_READ_BIT));
>+    EXPECT_EQ(kExpectedValue, *ptr);
>+
>+    EXPECT_GL_NO_ERROR();
>+}
>+
>+// Test that readonly binary operator for buffer variable is correctly handled.
>+TEST_P(ShaderStorageBufferTest31, ReadonlyBinaryOperator)
>+{
>+    constexpr char kComputeShaderSource[] =
>+        R"(#version 310 es
>+ layout(local_size_x=1, local_size_y=1, local_size_z=1) in;
>+ layout(std430, binding = 0) buffer blockIn1 {
>+     uvec2 data1;
>+ };
>+ layout(std430, binding = 1) buffer blockIn2 {
>+     uvec2 data2;
>+ };
>+ layout(std430, binding = 2) buffer blockIn3 {
>+     uvec2 data;
>+ } instanceIn3;
>+ layout(std430, binding = 3) buffer blockOut {
>+     uvec2 data;
>+ } instanceOut;
>+ void main()
>+ {
>+     instanceOut.data = data1 + data2 + instanceIn3.data;
>+ }
>+ )";
>+
>+    ANGLE_GL_COMPUTE_PROGRAM(program, kComputeShaderSource);
>+    glUseProgram(program);
>+
>+    constexpr unsigned int kComponentCount                = 2;
>+    constexpr unsigned int kBytesPerComponent             = sizeof(unsigned int);
>+    constexpr unsigned int kInputValues1[kComponentCount] = {1u, 2u};
>+    constexpr unsigned int kInputValues2[kComponentCount] = {3u, 4u};
>+    constexpr unsigned int kInputValues3[kComponentCount] = {5u, 6u};
>+    // Create shader storage buffer
>+    GLBuffer shaderStorageBuffer[4];
>+    glBindBuffer(GL_SHADER_STORAGE_BUFFER, shaderStorageBuffer[0]);
>+    glBufferData(GL_SHADER_STORAGE_BUFFER, kComponentCount * kBytesPerComponent, kInputValues1,
>+                 GL_STATIC_DRAW);
>+    glBindBuffer(GL_SHADER_STORAGE_BUFFER, shaderStorageBuffer[1]);
>+    glBufferData(GL_SHADER_STORAGE_BUFFER, kComponentCount * kBytesPerComponent, kInputValues2,
>+                 GL_STATIC_DRAW);
>+    glBindBuffer(GL_SHADER_STORAGE_BUFFER, shaderStorageBuffer[2]);
>+    glBufferData(GL_SHADER_STORAGE_BUFFER, kComponentCount * kBytesPerComponent, kInputValues3,
>+                 GL_STATIC_DRAW);
>+    glBindBuffer(GL_SHADER_STORAGE_BUFFER, shaderStorageBuffer[3]);
>+    glBufferData(GL_SHADER_STORAGE_BUFFER, kComponentCount * kBytesPerComponent, nullptr,
>+                 GL_STATIC_DRAW);
>+
>+    // Bind shader storage buffer
>+    glBindBufferBase(GL_SHADER_STORAGE_BUFFER, 0, shaderStorageBuffer[0]);
>+    glBindBufferBase(GL_SHADER_STORAGE_BUFFER, 1, shaderStorageBuffer[1]);
>+    glBindBufferBase(GL_SHADER_STORAGE_BUFFER, 2, shaderStorageBuffer[2]);
>+    glBindBufferBase(GL_SHADER_STORAGE_BUFFER, 3, shaderStorageBuffer[3]);
>+
>+    glDispatchCompute(1, 1, 1);
>+    glFinish();
>+
>+    // Read back shader storage buffer
>+    constexpr unsigned int kExpectedValues[kComponentCount] = {9u, 12u};
>+    glBindBuffer(GL_SHADER_STORAGE_BUFFER, shaderStorageBuffer[3]);
>+    const GLuint *ptr = reinterpret_cast<const GLuint *>(glMapBufferRange(
>+        GL_SHADER_STORAGE_BUFFER, 0, kComponentCount * kBytesPerComponent, GL_MAP_READ_BIT));
>+    for (unsigned int idx = 0; idx < kComponentCount; idx++)
>+    {
>+        EXPECT_EQ(kExpectedValues[idx], *(ptr + idx));
>+    }
>+
>+    EXPECT_GL_NO_ERROR();
>+}
>+
>+// Test that ssbo as an argument of a function can be translated.
>+TEST_P(ShaderStorageBufferTest31, SSBOAsFunctionArgument)
>+{
>+    // http://anglebug.com/2990
>+    ANGLE_SKIP_TEST_IF(IsD3D11());
>+
>+    constexpr char kComputeShaderSource[] =
>+        R"(#version 310 es
>+layout(local_size_x = 1) in;
>+
>+layout(std430, binding = 0) buffer Block
>+{
>+    uint var1;
>+    uint var2;
>+};
>+
>+bool compare(uint a, uint b)
>+{
>+    return a == b;
>+}
>+
>+uint increase(inout uint a)
>+{
>+    a++;
>+    return a;
>+}
>+
>+void main(void)
>+{
>+    bool isEqual = compare(var1, 2u);
>+    if (isEqual)
>+    {
>+        var2 += increase(var1);
>+    }
>+}
>+)";
>+
>+    ANGLE_GL_COMPUTE_PROGRAM(program, kComputeShaderSource);
>+    glUseProgram(program);
>+
>+    constexpr unsigned int kBytesPerComponent = sizeof(unsigned int);
>+    constexpr unsigned int kInputValues[2]    = {2u, 2u};
>+    constexpr unsigned int kExpectedValues[2] = {3u, 5u};
>+    GLBuffer shaderStorageBuffer;
>+    glBindBuffer(GL_SHADER_STORAGE_BUFFER, shaderStorageBuffer);
>+    glBufferData(GL_SHADER_STORAGE_BUFFER, 2 * kBytesPerComponent, &kInputValues, GL_STATIC_DRAW);
>+
>+    glBindBufferBase(GL_SHADER_STORAGE_BUFFER, 0, shaderStorageBuffer);
>+
>+    glDispatchCompute(1, 1, 1);
>+    glFinish();
>+
>+    glBindBuffer(GL_SHADER_STORAGE_BUFFER, shaderStorageBuffer);
>+    const GLuint *ptr = reinterpret_cast<const GLuint *>(
>+        glMapBufferRange(GL_SHADER_STORAGE_BUFFER, 0, 2 * kBytesPerComponent, GL_MAP_READ_BIT));
>+    EXPECT_EQ(kExpectedValues[0], *ptr);
>+    EXPECT_EQ(kExpectedValues[1], *(ptr + 1));
>+
>+    EXPECT_GL_NO_ERROR();
>+}
>+
>+// Test that ssbo as unary operand works well.
>+TEST_P(ShaderStorageBufferTest31, SSBOAsUnaryOperand)
>+{
>+    // http://anglebug.com/2990
>+    ANGLE_SKIP_TEST_IF(IsD3D11());
>+
>+    constexpr char kComputeShaderSource[] =
>+        R"(#version 310 es
>+layout (local_size_x=1) in;
>+layout(binding=0, std140) buffer Storage0
>+{
>+    uint b;
>+} sb_load;
>+layout(binding=1, std140) buffer Storage1
>+{
>+    uint i;
>+} sb_store;
>+void main()
>+{
>+    sb_store.i = +sb_load.b;
>+    ++sb_store.i;
>+}
>+)";
>+
>+    ANGLE_GL_COMPUTE_PROGRAM(program, kComputeShaderSource);
>+    glUseProgram(program);
>+
>+    constexpr unsigned int kBytesPerComponent = sizeof(unsigned int);
>+    constexpr unsigned kInputValue            = 1u;
>+    constexpr unsigned int kExpectedValue     = 2u;
>+    GLBuffer shaderStorageBuffer[2];
>+    glBindBuffer(GL_SHADER_STORAGE_BUFFER, shaderStorageBuffer[0]);
>+    glBufferData(GL_SHADER_STORAGE_BUFFER, kBytesPerComponent, &kInputValue, GL_STATIC_DRAW);
>+    glBindBuffer(GL_SHADER_STORAGE_BUFFER, shaderStorageBuffer[1]);
>+    glBufferData(GL_SHADER_STORAGE_BUFFER, kBytesPerComponent, &kInputValue, GL_STATIC_DRAW);
>+
>+    glBindBufferBase(GL_SHADER_STORAGE_BUFFER, 0, shaderStorageBuffer[0]);
>+    glBindBufferBase(GL_SHADER_STORAGE_BUFFER, 1, shaderStorageBuffer[1]);
>+
>+    glDispatchCompute(1, 1, 1);
>+    glFinish();
>+
>+    glBindBuffer(GL_SHADER_STORAGE_BUFFER, shaderStorageBuffer[1]);
>+    const GLuint *ptr = reinterpret_cast<const GLuint *>(
>+        glMapBufferRange(GL_SHADER_STORAGE_BUFFER, 0, kBytesPerComponent, GL_MAP_READ_BIT));
>+    EXPECT_EQ(kExpectedValue, *ptr);
>+
>+    EXPECT_GL_NO_ERROR();
>+}
>+
>+// Test that uniform can be used as the index of buffer variable.
>+TEST_P(ShaderStorageBufferTest31, UniformUsedAsIndexOfBufferVariable)
>+{
>+    constexpr char kComputeShaderSource[] =
>+        R"(#version 310 es
>+layout (local_size_x=4) in;
>+layout(std140, binding = 0) uniform CB
>+{
>+    uint index;
>+} cb;
>+
>+layout(binding=0, std140) buffer Storage0
>+{
>+    uint data[];
>+} sb_load;
>+layout(binding=1, std140) buffer Storage1
>+{
>+    uint data[];
>+} sb_store;
>+void main()
>+{
>+    sb_store.data[gl_LocalInvocationIndex] = sb_load.data[gl_LocalInvocationID.x + cb.index];
>+}
>+)";
>+
>+    ANGLE_GL_COMPUTE_PROGRAM(program, kComputeShaderSource);
>     EXPECT_GL_NO_ERROR();
> }
> 
>-ANGLE_INSTANTIATE_TEST(ShaderStorageBufferTest31, ES31_OPENGL(), ES31_OPENGLES());
>+ANGLE_INSTANTIATE_TEST(ShaderStorageBufferTest31, ES31_OPENGL(), ES31_OPENGLES(), ES31_D3D11());
> 
> }  // namespace
>diff --git a/Source/ThirdParty/ANGLE/src/tests/gl_tests/SimpleOperationTest.cpp b/Source/ThirdParty/ANGLE/src/tests/gl_tests/SimpleOperationTest.cpp
>index 7701ac4fb37..62848d5793e 100644
>--- a/Source/ThirdParty/ANGLE/src/tests/gl_tests/SimpleOperationTest.cpp
>+++ b/Source/ThirdParty/ANGLE/src/tests/gl_tests/SimpleOperationTest.cpp
>@@ -10,13 +10,31 @@
> 
> #include <vector>
> 
>-#include "random_utils.h"
> #include "test_utils/gl_raii.h"
>+#include "util/EGLWindow.h"
>+#include "util/random_utils.h"
> 
> using namespace angle;
> 
> namespace
> {
>+constexpr char kBasicVertexShader[] =
>+    R"(attribute vec3 position;
>+void main()
>+{
>+    gl_Position = vec4(position, 1);
>+})";
>+
>+constexpr char kGreenFragmentShader[] =
>+    R"(void main()
>+{
>+    gl_FragColor = vec4(0, 1, 0, 1);
>+})";
>+
>+constexpr std::array<GLenum, 6> kCubeFaces = {
>+    {GL_TEXTURE_CUBE_MAP_POSITIVE_X, GL_TEXTURE_CUBE_MAP_NEGATIVE_X, GL_TEXTURE_CUBE_MAP_POSITIVE_Y,
>+     GL_TEXTURE_CUBE_MAP_NEGATIVE_Y, GL_TEXTURE_CUBE_MAP_POSITIVE_Z,
>+     GL_TEXTURE_CUBE_MAP_NEGATIVE_Z}};
> 
> class SimpleOperationTest : public ANGLETest
> {
>@@ -32,11 +50,16 @@ class SimpleOperationTest : public ANGLETest
>     }
> 
>     void verifyBuffer(const std::vector<uint8_t> &data, GLenum binding);
>+
>+    template <typename T>
>+    void testDrawElementsLineLoopUsingClientSideMemory(GLenum indexType,
>+                                                       int windowWidth,
>+                                                       int windowHeight);
> };
> 
> void SimpleOperationTest::verifyBuffer(const std::vector<uint8_t> &data, GLenum binding)
> {
>-    if (!extensionEnabled("GL_EXT_map_buffer_range"))
>+    if (!IsGLExtensionEnabled("GL_EXT_map_buffer_range"))
>     {
>         return;
>     }
>@@ -52,111 +75,192 @@ void SimpleOperationTest::verifyBuffer(const std::vector<uint8_t> &data, GLenum
>     EXPECT_EQ(data, readbackData);
> }
> 
>-TEST_P(SimpleOperationTest, CompileVertexShader)
>+// Validates if culling rasterization states work. Simply draws a quad with
>+// cull face enabled and make sure we still render correctly.
>+TEST_P(SimpleOperationTest, CullFaceEnabledState)
> {
>-    const std::string source =
>-        R"(attribute vec4 a_input;
>-        void main()
>-        {
>-            gl_Position = a_input;
>-        })";
>+    ANGLE_GL_PROGRAM(program, kBasicVertexShader, kGreenFragmentShader);
>+    glUseProgram(program);
>+
>+    glClear(GL_COLOR_BUFFER_BIT);
>+    glEnable(GL_CULL_FACE);
>+
>+    drawQuad(program.get(), "position", 0.0f, 1.0f, true);
>+
>+    ASSERT_GL_NO_ERROR();
>+
>+    EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::green);
>+}
>+
>+// Validates if culling rasterization states work. Simply draws a quad with
>+// cull face enabled with cullface front and make sure the face have not been rendered.
>+TEST_P(SimpleOperationTest, CullFaceFrontEnabledState)
>+{
>+    ANGLE_GL_PROGRAM(program, kBasicVertexShader, kGreenFragmentShader);
>+    glUseProgram(program);
>+
>+    glClear(GL_COLOR_BUFFER_BIT);
>+    glEnable(GL_CULL_FACE);
>+
>+    // Should make the quad disappear since we draw it front facing.
>+    glCullFace(GL_FRONT);
>+
>+    drawQuad(program.get(), "position", 0.0f, 1.0f, true);
>+
>+    ASSERT_GL_NO_ERROR();
>+
>+    EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::transparentBlack);
>+}
>+
>+// Validates if blending render states work. Simply draws twice and verify the color have been
>+// added in the final output.
>+TEST_P(SimpleOperationTest, BlendingRenderState)
>+{
>+    // The precision when blending isn't perfect and some tests fail with a color of 254 instead
>+    // of 255 on the green component. This is why we need 0.51 green instead of .5
>+    constexpr char halfGreenFragmentShader[] =
>+        R"(void main()
>+{
>+    gl_FragColor = vec4(0, 0.51, 0, 1);
>+})";
>+
>+    ANGLE_GL_PROGRAM(program, kBasicVertexShader, halfGreenFragmentShader);
>+    glUseProgram(program);
>+
>+    glClear(GL_COLOR_BUFFER_BIT);
>+    glEnable(GL_BLEND);
>+    glBlendFunc(GL_ONE, GL_ONE);
>+    glBlendEquation(GL_FUNC_ADD);
>+
>+    auto vertices = GetQuadVertices();
>+
>+    const GLint positionLocation = glGetAttribLocation(program, "position");
>+    ASSERT_NE(-1, positionLocation);
>+
>+    GLBuffer vertexBuffer;
>+    glBindBuffer(GL_ARRAY_BUFFER, vertexBuffer.get());
>+    glBufferData(GL_ARRAY_BUFFER, sizeof(vertices[0]) * vertices.size(), vertices.data(),
>+                 GL_STATIC_DRAW);
>+    glVertexAttribPointer(positionLocation, 3, GL_FLOAT, GL_FALSE, 0, 0);
>+
>+    glEnableVertexAttribArray(positionLocation);
>+
>+    // Drawing a quad once will give 0.51 green, but if we enable blending
>+    // with additive function we should end up with full green of 1.0 with
>+    // a clamping func of 1.0.
>+    glDrawArrays(GL_TRIANGLES, 0, static_cast<GLsizei>(vertices.size()));
>+    glDrawArrays(GL_TRIANGLES, 0, static_cast<GLsizei>(vertices.size()));
>+
>+    ASSERT_GL_NO_ERROR();
>+
>+    EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::green);
>+}
> 
>-    GLuint shader = CompileShader(GL_VERTEX_SHADER, source);
>+TEST_P(SimpleOperationTest, CompileVertexShader)
>+{
>+    GLuint shader = CompileShader(GL_VERTEX_SHADER, kBasicVertexShader);
>     EXPECT_NE(shader, 0u);
>     glDeleteShader(shader);
> 
>-    EXPECT_GL_NO_ERROR();
>+    ASSERT_GL_NO_ERROR();
> }
> 
>-TEST_P(SimpleOperationTest, CompileFragmentShader)
>+TEST_P(SimpleOperationTest, CompileFragmentShaderSingleVaryingInput)
> {
>-    const std::string source =
>-        R"(precision mediump float;
>-        varying vec4 v_input;
>-        void main()
>-        {
>-            gl_FragColor = v_input;
>-        })";
>+    constexpr char kFS[] = R"(precision mediump float;
>+varying vec4 v_input;
>+void main()
>+{
>+    gl_FragColor = v_input;
>+})";
> 
>-    GLuint shader = CompileShader(GL_FRAGMENT_SHADER, source);
>+    GLuint shader = CompileShader(GL_FRAGMENT_SHADER, kFS);
>     EXPECT_NE(shader, 0u);
>     glDeleteShader(shader);
> 
>-    EXPECT_GL_NO_ERROR();
>+    ASSERT_GL_NO_ERROR();
> }
> 
>-TEST_P(SimpleOperationTest, LinkProgram)
>+// Covers a simple bug in Vulkan to do with dependencies between the Surface and the default
>+// Framebuffer.
>+TEST_P(SimpleOperationTest, ClearAndSwap)
> {
>-    const std::string vsSource =
>-        R"(void main()
>-        {
>-            gl_Position = vec4(1.0, 1.0, 1.0, 1.0);
>-        })";
>+    glClearColor(1.0, 0.0, 0.0, 1.0);
>+    glClear(GL_COLOR_BUFFER_BIT);
>+    swapBuffers();
> 
>-    const std::string fsSource =
>-        R"(void main()
>-        {
>-            gl_FragColor = vec4(1.0, 1.0, 1.0, 1.0);
>-        })";
>+    // Can't check the pixel result after the swap, and checking the pixel result affects the
>+    // behaviour of the test on the Vulkan back-end, so don't bother checking correctness.
>+    ASSERT_GL_NO_ERROR();
>+    ASSERT_FALSE(getGLWindow()->hasError());
>+}
> 
>-    GLuint program = CompileProgram(vsSource, fsSource);
>-    EXPECT_NE(program, 0u);
>-    glDeleteProgram(program);
>+// Simple case of setting a scissor, enabled or disabled.
>+TEST_P(SimpleOperationTest, ScissorTest)
>+{
>+    ANGLE_GL_PROGRAM(program, kBasicVertexShader, kGreenFragmentShader);
> 
>-    EXPECT_GL_NO_ERROR();
>+    glClear(GL_COLOR_BUFFER_BIT);
>+    glEnable(GL_SCISSOR_TEST);
>+    glScissor(getWindowWidth() / 4, getWindowHeight() / 4, getWindowWidth() / 2,
>+              getWindowHeight() / 2);
>+
>+    // Fill the whole screen with a quad.
>+    drawQuad(program.get(), "position", 0.0f, 1.0f, true);
>+
>+    ASSERT_GL_NO_ERROR();
>+
>+    // Test outside the scissor test, pitch black.
>+    EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::transparentBlack);
>+
>+    // Test inside, green of the fragment shader.
>+    EXPECT_PIXEL_COLOR_EQ(getWindowWidth() / 2, getWindowHeight() / 2, GLColor::green);
> }
> 
>-TEST_P(SimpleOperationTest, LinkProgramWithUniforms)
>+TEST_P(SimpleOperationTest, LinkProgramShadersNoInputs)
> {
>-    const std::string vsSource =
>-        R"(void main()
>-        {
>-            gl_Position = vec4(1.0, 1.0, 1.0, 1.0);
>-        })";
>+    constexpr char kVS[] = "void main() { gl_Position = vec4(1.0, 1.0, 1.0, 1.0); }";
>+    constexpr char kFS[] = "void main() { gl_FragColor = vec4(1.0, 1.0, 1.0, 1.0); }";
> 
>-    const std::string fsSource =
>-        R"(precision mediump float;
>-        uniform vec4 u_input;
>-        void main()
>-        {
>-            gl_FragColor = u_input;
>-        })";
>+    ANGLE_GL_PROGRAM(program, kVS, kFS);
>+    ASSERT_GL_NO_ERROR();
>+}
>+
>+TEST_P(SimpleOperationTest, LinkProgramWithUniforms)
>+{
>+    constexpr char kVS[] = R"(void main()
>+{
>+    gl_Position = vec4(1.0, 1.0, 1.0, 1.0);
>+})";
>+    constexpr char kFS[] = R"(precision mediump float;
>+uniform vec4 u_input;
>+void main()
>+{
>+    gl_FragColor = u_input;
>+})";
> 
>-    GLuint program = CompileProgram(vsSource, fsSource);
>-    EXPECT_NE(program, 0u);
>+    ANGLE_GL_PROGRAM(program, kVS, kFS);
> 
>-    GLint uniformLoc = glGetUniformLocation(program, "u_input");
>+    const GLint uniformLoc = glGetUniformLocation(program, "u_input");
>     EXPECT_NE(-1, uniformLoc);
> 
>-    glDeleteProgram(program);
>-
>-    EXPECT_GL_NO_ERROR();
>+    ASSERT_GL_NO_ERROR();
> }
> 
> TEST_P(SimpleOperationTest, LinkProgramWithAttributes)
> {
>-    const std::string vsSource =
>-        R"(attribute vec4 a_input;
>-        void main()
>-        {
>-            gl_Position = a_input;
>-        })";
>-
>-    const std::string fsSource =
>-        R"(void main()
>-        {
>-            gl_FragColor = vec4(1.0, 1.0, 1.0, 1.0);
>-        })";
>+    constexpr char kVS[] = R"(attribute vec4 a_input;
>+void main()
>+{
>+    gl_Position = a_input;
>+})";
> 
>-    GLuint program = CompileProgram(vsSource, fsSource);
>-    EXPECT_NE(program, 0u);
>+    ANGLE_GL_PROGRAM(program, kVS, kGreenFragmentShader);
> 
>-    GLint attribLoc = glGetAttribLocation(program, "a_input");
>+    const GLint attribLoc = glGetAttribLocation(program, "a_input");
>     EXPECT_NE(-1, attribLoc);
> 
>-    glDeleteProgram(program);
>-
>-    EXPECT_GL_NO_ERROR();
>+    ASSERT_GL_NO_ERROR();
> }
> 
> TEST_P(SimpleOperationTest, BufferDataWithData)
>@@ -170,7 +274,7 @@ TEST_P(SimpleOperationTest, BufferDataWithData)
> 
>     verifyBuffer(data, GL_ARRAY_BUFFER);
> 
>-    EXPECT_GL_NO_ERROR();
>+    ASSERT_GL_NO_ERROR();
> }
> 
> TEST_P(SimpleOperationTest, BufferDataWithNoData)
>@@ -179,7 +283,7 @@ TEST_P(SimpleOperationTest, BufferDataWithNoData)
>     glBindBuffer(GL_ARRAY_BUFFER, buffer.get());
>     glBufferData(GL_ARRAY_BUFFER, 1024, nullptr, GL_STATIC_DRAW);
> 
>-    EXPECT_GL_NO_ERROR();
>+    ASSERT_GL_NO_ERROR();
> }
> 
> TEST_P(SimpleOperationTest, BufferSubData)
>@@ -203,96 +307,276 @@ TEST_P(SimpleOperationTest, BufferSubData)
> 
>     verifyBuffer(data, GL_ARRAY_BUFFER);
> 
>-    EXPECT_GL_NO_ERROR();
>+    ASSERT_GL_NO_ERROR();
> }
> 
> // Simple quad test.
> TEST_P(SimpleOperationTest, DrawQuad)
> {
>-    const std::string &vertexShader =
>-        "attribute vec3 position;\n"
>-        "void main()\n"
>-        "{\n"
>-        "    gl_Position = vec4(position, 1);\n"
>-        "}";
>-    const std::string &fragmentShader =
>-        "void main()\n"
>-        "{\n"
>-        "    gl_FragColor = vec4(0, 1, 0, 1);\n"
>-        "}";
>-    ANGLE_GL_PROGRAM(program, vertexShader, fragmentShader);
>+    ANGLE_GL_PROGRAM(program, kBasicVertexShader, kGreenFragmentShader);
> 
>     drawQuad(program.get(), "position", 0.5f, 1.0f, true);
> 
>-    EXPECT_GL_NO_ERROR();
>+    ASSERT_GL_NO_ERROR();
>+
>+    EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::green);
>+}
>+
>+// Simple quad test with data in client memory, not vertex buffer.
>+TEST_P(SimpleOperationTest, DrawQuadFromClientMemory)
>+{
>+    ANGLE_GL_PROGRAM(program, kBasicVertexShader, kGreenFragmentShader);
>+
>+    drawQuad(program.get(), "position", 0.5f, 1.0f, false);
>+
>+    ASSERT_GL_NO_ERROR();
>+
>     EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::green);
> }
> 
>+// Simple double quad test.
>+TEST_P(SimpleOperationTest, DrawQuadTwice)
>+{
>+    ANGLE_GL_PROGRAM(program, kBasicVertexShader, kGreenFragmentShader);
>+
>+    drawQuad(program.get(), "position", 0.5f, 1.0f, true);
>+    drawQuad(program.get(), "position", 0.5f, 1.0f, true);
>+
>+    ASSERT_GL_NO_ERROR();
>+
>+    EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::green);
>+}
>+
>+// Simple line test.
>+TEST_P(SimpleOperationTest, DrawLine)
>+{
>+    // We assume in the test the width and height are equal and we are tracing
>+    // the line from bottom left to top right. Verify that all pixels along that line
>+    // have been traced with green.
>+    ASSERT_EQ(getWindowWidth(), getWindowHeight());
>+
>+    ANGLE_GL_PROGRAM(program, kBasicVertexShader, kGreenFragmentShader);
>+    glUseProgram(program);
>+
>+    std::vector<Vector3> vertices = {{-1.0f, -1.0f, 0.0f}, {1.0f, 1.0f, 0.0f}};
>+
>+    const GLint positionLocation = glGetAttribLocation(program, "position");
>+    ASSERT_NE(-1, positionLocation);
>+
>+    GLBuffer vertexBuffer;
>+    glBindBuffer(GL_ARRAY_BUFFER, vertexBuffer);
>+    glBufferData(GL_ARRAY_BUFFER, sizeof(vertices[0]) * vertices.size(), vertices.data(),
>+                 GL_STATIC_DRAW);
>+    glVertexAttribPointer(positionLocation, 3, GL_FLOAT, GL_FALSE, 0, nullptr);
>+    glEnableVertexAttribArray(positionLocation);
>+
>+    glClear(GL_COLOR_BUFFER_BIT);
>+    glDrawArrays(GL_LINES, 0, static_cast<GLsizei>(vertices.size()));
>+
>+    glDisableVertexAttribArray(positionLocation);
>+
>+    ASSERT_GL_NO_ERROR();
>+
>+    for (auto x = 0; x < getWindowWidth(); x++)
>+    {
>+        EXPECT_PIXEL_COLOR_EQ(x, x, GLColor::green);
>+    }
>+}
>+
>+// Simple line test that will use a very large offset in the vertex attributes.
>+TEST_P(SimpleOperationTest, DrawLineWithLargeAttribPointerOffset)
>+{
>+    // We assume in the test the width and height are equal and we are tracing
>+    // the line from bottom left to top right. Verify that all pixels along that line
>+    // have been traced with green.
>+    ASSERT_EQ(getWindowWidth(), getWindowHeight());
>+
>+    ANGLE_GL_PROGRAM(program, kBasicVertexShader, kGreenFragmentShader);
>+    glUseProgram(program);
>+
>+    int kOffset = 3315;
>+    std::vector<Vector3> vertices(kOffset);
>+    Vector3 vector1{-1.0f, -1.0f, 0.0f};
>+    Vector3 vector2{1.0f, 1.0f, 0.0f};
>+    vertices.emplace_back(vector1);
>+    vertices.emplace_back(vector2);
>+
>+    const GLint positionLocation = glGetAttribLocation(program, "position");
>+    ASSERT_NE(-1, positionLocation);
>+
>+    GLBuffer vertexBuffer;
>+    glBindBuffer(GL_ARRAY_BUFFER, vertexBuffer);
>+    glBufferData(GL_ARRAY_BUFFER, sizeof(vertices[0]) * vertices.size(), vertices.data(),
>+                 GL_STATIC_DRAW);
>+    glVertexAttribPointer(positionLocation, 3, GL_FLOAT, GL_FALSE, 0,
>+                          reinterpret_cast<const void *>(kOffset * sizeof(vertices[0])));
>+    glEnableVertexAttribArray(positionLocation);
>+
>+    glClear(GL_COLOR_BUFFER_BIT);
>+    glDrawArrays(GL_LINES, 0, 2);
>+
>+    glDisableVertexAttribArray(positionLocation);
>+
>+    ASSERT_GL_NO_ERROR();
>+
>+    for (auto x = 0; x < getWindowWidth(); x++)
>+    {
>+        EXPECT_PIXEL_COLOR_EQ(x, x, GLColor::green);
>+    }
>+}
>+
>+// Simple line strip test.
>+TEST_P(SimpleOperationTest, DrawLineStrip)
>+{
>+    // We assume in the test the width and height are equal and we are tracing
>+    // the line from bottom left to center, then from center to bottom right.
>+    // Verify that all pixels along these lines have been traced with green.
>+    ASSERT_EQ(getWindowWidth(), getWindowHeight());
>+
>+    ANGLE_GL_PROGRAM(program, kBasicVertexShader, kGreenFragmentShader);
>+    glUseProgram(program);
>+
>+    auto vertices =
>+        std::vector<Vector3>{{-1.0f, -1.0f, 0.0f}, {0.0f, 0.0f, 0.0f}, {1.0f, -1.0f, 0.0f}};
>+
>+    const GLint positionLocation = glGetAttribLocation(program, "position");
>+    ASSERT_NE(-1, positionLocation);
>+
>+    GLBuffer vertexBuffer;
>+    glBindBuffer(GL_ARRAY_BUFFER, vertexBuffer.get());
>+    glBufferData(GL_ARRAY_BUFFER, sizeof(vertices[0]) * vertices.size(), vertices.data(),
>+                 GL_STATIC_DRAW);
>+    glVertexAttribPointer(positionLocation, 3, GL_FLOAT, GL_FALSE, 0, 0);
>+
>+    glEnableVertexAttribArray(positionLocation);
>+
>+    glClear(GL_COLOR_BUFFER_BIT);
>+    glDrawArrays(GL_LINE_STRIP, 0, static_cast<GLsizei>(vertices.size()));
>+
>+    ASSERT_GL_NO_ERROR();
>+
>+    const auto centerX = getWindowWidth() / 2;
>+    const auto centerY = getWindowHeight() / 2;
>+
>+    for (auto x = 0; x < centerX; x++)
>+    {
>+        EXPECT_PIXEL_COLOR_EQ(x, x, GLColor::green);
>+    }
>+
>+    for (auto x = centerX, y = centerY - 1; x < getWindowWidth() && y >= 0; x++, y--)
>+    {
>+        EXPECT_PIXEL_COLOR_EQ(x, y, GLColor::green);
>+    }
>+}
>+
>+// Simple triangle fans test.
>+TEST_P(SimpleOperationTest, DrawTriangleFan)
>+{
>+    // We assume in the test the width and height are equal and we are tracing
>+    // 2 triangles to cover half the surface like this:
>+    ASSERT_EQ(getWindowWidth(), getWindowHeight());
>+
>+    ANGLE_GL_PROGRAM(program, kBasicVertexShader, kGreenFragmentShader);
>+    glUseProgram(program);
>+
>+    auto vertices = std::vector<Vector3>{
>+        {-1.0f, -1.0f, 0.0f}, {0.0f, 0.0f, 0.0f}, {1.0f, -1.0f, 0.0f}, {1.0f, 1.0f, 0.0f}};
>+
>+    const GLint positionLocation = glGetAttribLocation(program, "position");
>+    ASSERT_NE(-1, positionLocation);
>+
>+    GLBuffer vertexBuffer;
>+    glBindBuffer(GL_ARRAY_BUFFER, vertexBuffer.get());
>+    glBufferData(GL_ARRAY_BUFFER, sizeof(vertices[0]) * vertices.size(), vertices.data(),
>+                 GL_STATIC_DRAW);
>+    glVertexAttribPointer(positionLocation, 3, GL_FLOAT, GL_FALSE, 0, 0);
>+    glEnableVertexAttribArray(positionLocation);
>+
>+    glClear(GL_COLOR_BUFFER_BIT);
>+    glDrawArrays(GL_TRIANGLE_FAN, 0, static_cast<GLsizei>(vertices.size()));
>+
>+    glDisableVertexAttribArray(positionLocation);
>+
>+    EXPECT_GL_NO_ERROR();
>+
>+    // Check 4 lines accross de triangles to make sure we filled it.
>+    // Don't check every pixel as it would slow down our tests.
>+    for (auto x = 0; x < getWindowWidth(); x++)
>+    {
>+        EXPECT_PIXEL_COLOR_EQ(x, x, GLColor::green);
>+    }
>+
>+    for (auto x = getWindowWidth() / 3, y = 0; x < getWindowWidth(); x++, y++)
>+    {
>+        EXPECT_PIXEL_COLOR_EQ(x, y, GLColor::green);
>+    }
>+
>+    for (auto x = getWindowWidth() / 2, y = 0; x < getWindowWidth(); x++, y++)
>+    {
>+        EXPECT_PIXEL_COLOR_EQ(x, y, GLColor::green);
>+    }
>+
>+    for (auto x = (getWindowWidth() / 4) * 3, y = 0; x < getWindowWidth(); x++, y++)
>+    {
>+        EXPECT_PIXEL_COLOR_EQ(x, y, GLColor::green);
>+    }
>+}
>+
> // Simple repeated draw and swap test.
> TEST_P(SimpleOperationTest, DrawQuadAndSwap)
> {
>-    const std::string &vertexShader =
>-        "attribute vec3 position;\n"
>-        "void main()\n"
>-        "{\n"
>-        "    gl_Position = vec4(position, 1);\n"
>-        "}";
>-    const std::string &fragmentShader =
>-        "void main()\n"
>-        "{\n"
>-        "    gl_FragColor = vec4(0, 1, 0, 1);\n"
>-        "}";
>-    ANGLE_GL_PROGRAM(program, vertexShader, fragmentShader);
>+    ANGLE_GL_PROGRAM(program, kBasicVertexShader, kGreenFragmentShader);
> 
>     for (int i = 0; i < 8; ++i)
>     {
>         drawQuad(program.get(), "position", 0.5f, 1.0f, true);
>-        EXPECT_GL_NO_ERROR();
>+        ASSERT_GL_NO_ERROR();
>         EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::green);
>         swapBuffers();
>     }
> 
>-    EXPECT_GL_NO_ERROR();
>+    ASSERT_GL_NO_ERROR();
> }
> 
> // Simple indexed quad test.
> TEST_P(SimpleOperationTest, DrawIndexedQuad)
> {
>-    const std::string vertexShader =
>-        "attribute vec3 position;\n"
>-        "void main()\n"
>-        "{\n"
>-        "    gl_Position = vec4(position, 1);\n"
>-        "}";
>-    const std::string fragmentShader =
>-        "void main()\n"
>-        "{\n"
>-        "    gl_FragColor = vec4(0, 1, 0, 1);\n"
>-        "}";
>-    ANGLE_GL_PROGRAM(program, vertexShader, fragmentShader);
>+    ANGLE_GL_PROGRAM(program, kBasicVertexShader, kGreenFragmentShader);
> 
>     drawIndexedQuad(program.get(), "position", 0.5f, 1.0f, true);
> 
>-    EXPECT_GL_NO_ERROR();
>+    ASSERT_GL_NO_ERROR();
>     EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::green);
> }
> 
>+// Simple repeated indexed draw and swap test.
>+TEST_P(SimpleOperationTest, DrawIndexedQuadAndSwap)
>+{
>+    ANGLE_GL_PROGRAM(program, kBasicVertexShader, kGreenFragmentShader);
>+
>+    // 32 iterations is an arbitrary number. The more iterations, the more flaky syncronization
>+    // issues will reproduce consistently.
>+    for (int i = 0; i < 32; ++i)
>+    {
>+        drawIndexedQuad(program.get(), "position", 0.5f, 1.0f, true);
>+        ASSERT_GL_NO_ERROR();
>+        EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::green);
>+        swapBuffers();
>+    }
>+
>+    ASSERT_GL_NO_ERROR();
>+}
>+
> // Draw with a fragment uniform.
> TEST_P(SimpleOperationTest, DrawQuadWithFragmentUniform)
> {
>-    const std::string &vertexShader =
>-        "attribute vec3 position;\n"
>-        "void main()\n"
>-        "{\n"
>-        "    gl_Position = vec4(position, 1);\n"
>-        "}";
>-    const std::string &fragmentShader =
>+    constexpr char kFS[] =
>         "uniform mediump vec4 color;\n"
>         "void main()\n"
>         "{\n"
>         "    gl_FragColor = color;\n"
>         "}";
>-    ANGLE_GL_PROGRAM(program, vertexShader, fragmentShader);
>+    ANGLE_GL_PROGRAM(program, kBasicVertexShader, kFS);
> 
>     GLint location = glGetUniformLocation(program, "color");
>     ASSERT_NE(-1, location);
>@@ -302,14 +586,14 @@ TEST_P(SimpleOperationTest, DrawQuadWithFragmentUniform)
> 
>     drawQuad(program.get(), "position", 0.5f, 1.0f, true);
> 
>-    EXPECT_GL_NO_ERROR();
>+    ASSERT_GL_NO_ERROR();
>     EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::green);
> }
> 
> // Draw with a vertex uniform.
> TEST_P(SimpleOperationTest, DrawQuadWithVertexUniform)
> {
>-    const std::string &vertexShader =
>+    constexpr char kVS[] =
>         "attribute vec3 position;\n"
>         "uniform vec4 color;\n"
>         "varying vec4 vcolor;\n"
>@@ -318,15 +602,15 @@ TEST_P(SimpleOperationTest, DrawQuadWithVertexUniform)
>         "    gl_Position = vec4(position, 1);\n"
>         "    vcolor = color;\n"
>         "}";
>-    const std::string &fragmentShader =
>+    constexpr char kFS[] =
>         "varying mediump vec4 vcolor;\n"
>         "void main()\n"
>         "{\n"
>         "    gl_FragColor = vcolor;\n"
>         "}";
>-    ANGLE_GL_PROGRAM(program, vertexShader, fragmentShader);
>+    ANGLE_GL_PROGRAM(program, kVS, kFS);
> 
>-    GLint location = glGetUniformLocation(program, "color");
>+    const GLint location = glGetUniformLocation(program, "color");
>     ASSERT_NE(-1, location);
> 
>     glUseProgram(program);
>@@ -334,14 +618,14 @@ TEST_P(SimpleOperationTest, DrawQuadWithVertexUniform)
> 
>     drawQuad(program.get(), "position", 0.5f, 1.0f, true);
> 
>-    EXPECT_GL_NO_ERROR();
>+    ASSERT_GL_NO_ERROR();
>     EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::green);
> }
> 
> // Draw with two uniforms.
> TEST_P(SimpleOperationTest, DrawQuadWithTwoUniforms)
> {
>-    const std::string &vertexShader =
>+    constexpr char kVS[] =
>         "attribute vec3 position;\n"
>         "uniform vec4 color1;\n"
>         "varying vec4 vcolor1;\n"
>@@ -350,19 +634,19 @@ TEST_P(SimpleOperationTest, DrawQuadWithTwoUniforms)
>         "    gl_Position = vec4(position, 1);\n"
>         "    vcolor1 = color1;\n"
>         "}";
>-    const std::string &fragmentShader =
>+    constexpr char kFS[] =
>         "uniform mediump vec4 color2;\n"
>         "varying mediump vec4 vcolor1;\n"
>         "void main()\n"
>         "{\n"
>         "    gl_FragColor = vcolor1 + color2;\n"
>         "}";
>-    ANGLE_GL_PROGRAM(program, vertexShader, fragmentShader);
>+    ANGLE_GL_PROGRAM(program, kVS, kFS);
> 
>-    GLint location1 = glGetUniformLocation(program, "color1");
>+    const GLint location1 = glGetUniformLocation(program, "color1");
>     ASSERT_NE(-1, location1);
> 
>-    GLint location2 = glGetUniformLocation(program, "color2");
>+    const GLint location2 = glGetUniformLocation(program, "color2");
>     ASSERT_NE(-1, location2);
> 
>     glUseProgram(program);
>@@ -371,15 +655,14 @@ TEST_P(SimpleOperationTest, DrawQuadWithTwoUniforms)
> 
>     drawQuad(program.get(), "position", 0.5f, 1.0f, true);
> 
>-    EXPECT_GL_NO_ERROR();
>+    ASSERT_GL_NO_ERROR();
>     EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::yellow);
> }
> 
> // Tests a shader program with more than one vertex attribute, with vertex buffers.
> TEST_P(SimpleOperationTest, ThreeVertexAttributes)
> {
>-    const std::string vertexShader =
>-        R"(attribute vec2 position;
>+    constexpr char kVS[] = R"(attribute vec2 position;
> attribute vec4 color1;
> attribute vec4 color2;
> varying vec4 color;
>@@ -389,8 +672,7 @@ void main()
>     color = color1 + color2;
> })";
> 
>-    const std::string fragmentShader =
>-        R"(precision mediump float;
>+    constexpr char kFS[] = R"(precision mediump float;
> varying vec4 color;
> void main()
> {
>@@ -398,12 +680,12 @@ void main()
> }
> )";
> 
>-    ANGLE_GL_PROGRAM(program, vertexShader, fragmentShader);
>+    ANGLE_GL_PROGRAM(program, kVS, kFS);
> 
>     glUseProgram(program);
> 
>-    GLint color1Loc = glGetAttribLocation(program, "color1");
>-    GLint color2Loc = glGetAttribLocation(program, "color2");
>+    const GLint color1Loc = glGetAttribLocation(program, "color1");
>+    const GLint color2Loc = glGetAttribLocation(program, "color2");
>     ASSERT_NE(-1, color1Loc);
>     ASSERT_NE(-1, color2Loc);
> 
>@@ -443,7 +725,7 @@ void main()
>     EXPECT_PIXEL_RECT_EQ(0, 0, getWindowWidth(), getWindowHeight(), GLColor::yellow);
> }
> 
>-// Creates a texture, no other operations.
>+// Creates a 2D texture, no other operations.
> TEST_P(SimpleOperationTest, CreateTexture2DNoData)
> {
>     GLTexture texture;
>@@ -452,7 +734,7 @@ TEST_P(SimpleOperationTest, CreateTexture2DNoData)
>     ASSERT_GL_NO_ERROR();
> }
> 
>-// Creates a texture, no other operations.
>+// Creates a 2D texture, no other operations.
> TEST_P(SimpleOperationTest, CreateTexture2DWithData)
> {
>     std::vector<GLColor> colors(16 * 16, GLColor::red);
>@@ -463,15 +745,41 @@ TEST_P(SimpleOperationTest, CreateTexture2DWithData)
>     ASSERT_GL_NO_ERROR();
> }
> 
>+// Creates a cube texture, no other operations.
>+TEST_P(SimpleOperationTest, CreateTextureCubeNoData)
>+{
>+    GLTexture texture;
>+    glBindTexture(GL_TEXTURE_CUBE_MAP, texture);
>+    for (GLenum cubeFace : kCubeFaces)
>+    {
>+        glTexImage2D(cubeFace, 0, GL_RGBA, 16, 16, 0, GL_RGBA, GL_UNSIGNED_BYTE, nullptr);
>+    }
>+    ASSERT_GL_NO_ERROR();
>+}
>+
>+// Creates a cube texture, no other operations.
>+TEST_P(SimpleOperationTest, CreateTextureCubeWithData)
>+{
>+    std::vector<GLColor> colors(16 * 16, GLColor::red);
>+
>+    GLTexture texture;
>+    glBindTexture(GL_TEXTURE_CUBE_MAP, texture);
>+    for (GLenum cubeFace : kCubeFaces)
>+    {
>+        glTexImage2D(cubeFace, 0, GL_RGBA, 16, 16, 0, GL_RGBA, GL_UNSIGNED_BYTE, colors.data());
>+    }
>+    ASSERT_GL_NO_ERROR();
>+}
>+
> // Creates a program with a texture.
> TEST_P(SimpleOperationTest, LinkProgramWithTexture)
> {
>     ASSERT_NE(0u, get2DTexturedQuadProgram());
>-    EXPECT_GL_NO_ERROR();
>+    ASSERT_GL_NO_ERROR();
> }
> 
>-// Creates a program with a texture and renders with it.
>-TEST_P(SimpleOperationTest, DrawWithTexture)
>+// Creates a program with a 2D texture and renders with it.
>+TEST_P(SimpleOperationTest, DrawWith2DTexture)
> {
>     std::array<GLColor, 4> colors = {
>         {GLColor::red, GLColor::green, GLColor::blue, GLColor::yellow}};
>@@ -483,7 +791,7 @@ TEST_P(SimpleOperationTest, DrawWithTexture)
>     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
> 
>     draw2DTexturedQuad(0.5f, 1.0f, true);
>-    EXPECT_GL_NO_ERROR();
>+    ASSERT_GL_NO_ERROR();
> 
>     int w = getWindowWidth() - 2;
>     int h = getWindowHeight() - 2;
>@@ -494,6 +802,201 @@ TEST_P(SimpleOperationTest, DrawWithTexture)
>     EXPECT_PIXEL_COLOR_EQ(w, h, GLColor::yellow);
> }
> 
>+template <typename T>
>+void SimpleOperationTest::testDrawElementsLineLoopUsingClientSideMemory(GLenum indexType,
>+                                                                        int windowWidth,
>+                                                                        int windowHeight)
>+{
>+    ANGLE_GL_PROGRAM(program, kBasicVertexShader, kGreenFragmentShader);
>+    glUseProgram(program);
>+
>+    // We expect to draw a square with these 4 vertices with a drawArray call.
>+    std::vector<Vector3> vertices;
>+    CreatePixelCenterWindowCoords({{32, 96}, {32, 32}, {96, 32}, {96, 96}}, windowWidth,
>+                                  windowHeight, &vertices);
>+
>+    // If we use these indices to draw however, we should be drawing an hourglass.
>+    std::vector<T> indices{3, 2, 1, 0};
>+
>+    GLint positionLocation = glGetAttribLocation(program, "position");
>+    ASSERT_NE(-1, positionLocation);
>+
>+    GLBuffer vertexBuffer;
>+    glBindBuffer(GL_ARRAY_BUFFER, vertexBuffer);
>+    glBufferData(GL_ARRAY_BUFFER, sizeof(vertices[0]) * vertices.size(), vertices.data(),
>+                 GL_STATIC_DRAW);
>+
>+    glVertexAttribPointer(positionLocation, 3, GL_FLOAT, GL_FALSE, 0, nullptr);
>+    glEnableVertexAttribArray(positionLocation);
>+    glClear(GL_COLOR_BUFFER_BIT);
>+    glDrawElements(GL_LINE_LOOP, 4, indexType, indices.data());
>+    glDisableVertexAttribArray(positionLocation);
>+
>+    ASSERT_GL_NO_ERROR();
>+
>+    int quarterWidth  = windowWidth / 4;
>+    int quarterHeight = windowHeight / 4;
>+
>+    // Bottom left
>+    EXPECT_PIXEL_COLOR_EQ(quarterWidth, quarterHeight, GLColor::green);
>+
>+    // Top left
>+    EXPECT_PIXEL_COLOR_EQ(quarterWidth, (quarterHeight * 3), GLColor::green);
>+
>+    // Top right
>+    EXPECT_PIXEL_COLOR_EQ((quarterWidth * 3), (quarterHeight * 3) - 1, GLColor::green);
>+
>+    // Verify line is closed between the 2 last vertices
>+    EXPECT_PIXEL_COLOR_EQ((quarterWidth * 2), quarterHeight, GLColor::green);
>+}
>+
>+// Draw a line loop using a drawElement call and client side memory.
>+TEST_P(SimpleOperationTest, DrawElementsLineLoopUsingUShortClientSideMemory)
>+{
>+    testDrawElementsLineLoopUsingClientSideMemory<GLushort>(GL_UNSIGNED_SHORT, getWindowWidth(),
>+                                                            getWindowHeight());
>+}
>+
>+// Draw a line loop using a drawElement call and client side memory.
>+TEST_P(SimpleOperationTest, DrawElementsLineLoopUsingUByteClientSideMemory)
>+{
>+    testDrawElementsLineLoopUsingClientSideMemory<GLubyte>(GL_UNSIGNED_BYTE, getWindowWidth(),
>+                                                           getWindowHeight());
>+}
>+
>+// Creates a program with a cube texture and renders with it.
>+TEST_P(SimpleOperationTest, DrawWithCubeTexture)
>+{
>+    std::array<Vector2, 6 * 4> positions = {{
>+        {0, 1}, {1, 1}, {1, 2}, {0, 2} /* first face */,
>+        {1, 0}, {2, 0}, {2, 1}, {1, 1} /* second face */,
>+        {1, 1}, {2, 1}, {2, 2}, {1, 2} /* third face */,
>+        {1, 2}, {2, 2}, {2, 3}, {1, 3} /* fourth face */,
>+        {2, 1}, {3, 1}, {3, 2}, {2, 2} /* fifth face */,
>+        {3, 1}, {4, 1}, {4, 2}, {3, 2} /* sixth face */,
>+    }};
>+
>+    const float w4 = 1.0f / 4.0f;
>+    const float h3 = 1.0f / 3.0f;
>+
>+    // This draws a "T" shape based on the four faces of the cube. The window is divided into four
>+    // tiles horizontally and three tiles vertically (hence the w4 and h3 variable naming).
>+    for (Vector2 &pos : positions)
>+    {
>+        pos.data()[0] = pos.data()[0] * w4 * 2.0f - 1.0f;
>+        pos.data()[1] = pos.data()[1] * h3 * 2.0f - 1.0f;
>+    }
>+
>+    const Vector3 posX(1, 0, 0);
>+    const Vector3 negX(-1, 0, 0);
>+    const Vector3 posY(0, 1, 0);
>+    const Vector3 negY(0, -1, 0);
>+    const Vector3 posZ(0, 0, 1);
>+    const Vector3 negZ(0, 0, -1);
>+
>+    std::array<Vector3, 6 * 4> coords = {{
>+        posX, posX, posX, posX /* first face */, negX, negX, negX, negX /* second face */,
>+        posY, posY, posY, posY /* third face */, negY, negY, negY, negY /* fourth face */,
>+        posZ, posZ, posZ, posZ /* fifth face */, negZ, negZ, negZ, negZ /* sixth face */,
>+    }};
>+
>+    const std::array<std::array<GLColor, 4>, 6> colors = {{
>+        {GLColor::red, GLColor::red, GLColor::red, GLColor::red},
>+        {GLColor::green, GLColor::green, GLColor::green, GLColor::green},
>+        {GLColor::blue, GLColor::blue, GLColor::blue, GLColor::blue},
>+        {GLColor::yellow, GLColor::yellow, GLColor::yellow, GLColor::yellow},
>+        {GLColor::cyan, GLColor::cyan, GLColor::cyan, GLColor::cyan},
>+        {GLColor::magenta, GLColor::magenta, GLColor::magenta, GLColor::magenta},
>+    }};
>+
>+    GLTexture texture;
>+    glBindTexture(GL_TEXTURE_CUBE_MAP, texture);
>+
>+    for (size_t faceIndex = 0; faceIndex < kCubeFaces.size(); ++faceIndex)
>+    {
>+        glTexImage2D(kCubeFaces[faceIndex], 0, GL_RGBA, 2, 2, 0, GL_RGBA, GL_UNSIGNED_BYTE,
>+                     colors[faceIndex].data());
>+    }
>+    glTexParameteri(GL_TEXTURE_CUBE_MAP, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
>+    glTexParameteri(GL_TEXTURE_CUBE_MAP, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
>+
>+    constexpr char kVertexShader[] = R"(attribute vec2 pos;
>+attribute vec3 coord;
>+varying vec3 texCoord;
>+void main()
>+{
>+    gl_Position = vec4(pos, 0, 1);
>+    texCoord = coord;
>+})";
>+
>+    constexpr char kFragmentShader[] = R"(precision mediump float;
>+varying vec3 texCoord;
>+uniform samplerCube tex;
>+void main()
>+{
>+    gl_FragColor = textureCube(tex, texCoord);
>+})";
>+
>+    ANGLE_GL_PROGRAM(program, kVertexShader, kFragmentShader);
>+    GLint samplerLoc = glGetUniformLocation(program, "tex");
>+    ASSERT_EQ(samplerLoc, 0);
>+
>+    glUseProgram(program);
>+
>+    GLint posLoc = glGetAttribLocation(program, "pos");
>+    ASSERT_NE(-1, posLoc);
>+
>+    GLint coordLoc = glGetAttribLocation(program, "coord");
>+    ASSERT_NE(-1, coordLoc);
>+
>+    GLBuffer posBuffer;
>+    glBindBuffer(GL_ARRAY_BUFFER, posBuffer);
>+    glBufferData(GL_ARRAY_BUFFER, positions.size() * sizeof(Vector2), positions.data(),
>+                 GL_STATIC_DRAW);
>+    glVertexAttribPointer(posLoc, 2, GL_FLOAT, GL_FALSE, 0, nullptr);
>+    glEnableVertexAttribArray(posLoc);
>+
>+    GLBuffer coordBuffer;
>+    glBindBuffer(GL_ARRAY_BUFFER, coordBuffer);
>+    glBufferData(GL_ARRAY_BUFFER, coords.size() * sizeof(Vector3), coords.data(), GL_STATIC_DRAW);
>+    glVertexAttribPointer(coordLoc, 3, GL_FLOAT, GL_FALSE, 0, nullptr);
>+    glEnableVertexAttribArray(coordLoc);
>+
>+    auto quadIndices = GetQuadIndices();
>+    std::array<GLushort, 6 * 6> kElementsData;
>+    for (GLushort quadIndex = 0; quadIndex < 6; ++quadIndex)
>+    {
>+        for (GLushort elementIndex = 0; elementIndex < 6; ++elementIndex)
>+        {
>+            kElementsData[quadIndex * 6 + elementIndex] = quadIndices[elementIndex] + 4 * quadIndex;
>+        }
>+    }
>+
>+    glClearColor(0.0f, 0.0f, 0.0f, 1.0f);
>+    glClear(GL_COLOR_BUFFER_BIT);
>+
>+    GLBuffer elementBuffer;
>+    glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, elementBuffer);
>+    glBufferData(GL_ELEMENT_ARRAY_BUFFER, kElementsData.size() * sizeof(GLushort),
>+                 kElementsData.data(), GL_STATIC_DRAW);
>+    glDrawElements(GL_TRIANGLES, static_cast<GLsizei>(kElementsData.size()), GL_UNSIGNED_SHORT,
>+                   nullptr);
>+    ASSERT_GL_NO_ERROR();
>+
>+    for (int faceIndex = 0; faceIndex < 6; ++faceIndex)
>+    {
>+        int index      = faceIndex * 4;
>+        Vector2 center = (positions[index] + positions[index + 1] + positions[index + 2] +
>+                          positions[index + 3]) /
>+                         4.0f;
>+        center *= 0.5f;
>+        center += Vector2(0.5f);
>+        center *= Vector2(getWindowWidth(), getWindowHeight());
>+        EXPECT_PIXEL_COLOR_EQ(static_cast<GLint>(center.x()), static_cast<GLint>(center.y()),
>+                              colors[faceIndex][0]);
>+    }
>+}
>+
> // Tests rendering to a user framebuffer.
> TEST_P(SimpleOperationTest, RenderToTexture)
> {
>@@ -512,24 +1015,76 @@ TEST_P(SimpleOperationTest, RenderToTexture)
> 
>     glViewport(0, 0, kSize, kSize);
> 
>-    const std::string &vertexShader =
>-        "attribute vec3 position;\n"
>-        "void main()\n"
>-        "{\n"
>-        "    gl_Position = vec4(position, 1);\n"
>-        "}";
>-    const std::string &fragmentShader =
>-        "void main()\n"
>-        "{\n"
>-        "    gl_FragColor = vec4(0, 1, 0, 1);\n"
>-        "}";
>-    ANGLE_GL_PROGRAM(program, vertexShader, fragmentShader);
>+    ANGLE_GL_PROGRAM(program, kBasicVertexShader, kGreenFragmentShader);
>     drawQuad(program, "position", 0.5f, 1.0f, true);
>     ASSERT_GL_NO_ERROR();
>     EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::green);
> }
> 
>-// Use this to select which configurations (e.g. which renderer, which GLES major version) these tests should be run against.
>+// Create a simple basic Renderbuffer.
>+TEST_P(SimpleOperationTest, CreateRenderbuffer)
>+{
>+    GLRenderbuffer renderbuffer;
>+    glBindRenderbuffer(GL_RENDERBUFFER, renderbuffer);
>+    glRenderbufferStorage(GL_RENDERBUFFER, GL_RGBA8, 16, 16);
>+    ASSERT_GL_NO_ERROR();
>+}
>+
>+// Render to a simple color Renderbuffer.
>+TEST_P(SimpleOperationTest, RenderbufferAttachment)
>+{
>+    constexpr int kSize = 16;
>+
>+    GLRenderbuffer renderbuffer;
>+    glBindRenderbuffer(GL_RENDERBUFFER, renderbuffer);
>+    glRenderbufferStorage(GL_RENDERBUFFER, GL_RGBA8, kSize, kSize);
>+
>+    GLFramebuffer framebuffer;
>+    glBindFramebuffer(GL_FRAMEBUFFER, framebuffer);
>+    glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_RENDERBUFFER, renderbuffer);
>+    ASSERT_GL_NO_ERROR();
>+    ASSERT_GLENUM_EQ(GL_FRAMEBUFFER_COMPLETE, glCheckFramebufferStatus(GL_FRAMEBUFFER));
>+
>+    glViewport(0, 0, kSize, kSize);
>+
>+    ANGLE_GL_PROGRAM(program, kBasicVertexShader, kGreenFragmentShader);
>+    drawQuad(program, "position", 0.5f, 1.0f, true);
>+    ASSERT_GL_NO_ERROR();
>+    EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::green);
>+}
>+
>+// Tests that using desktop GL_QUADS/GL_POLYGONS enums generate the correct error.
>+TEST_P(SimpleOperationTest, PrimitiveModeNegativeTest)
>+{
>+    // Draw a correct quad.
>+    ANGLE_GL_PROGRAM(program, kBasicVertexShader, kGreenFragmentShader);
>+    glUseProgram(program);
>+
>+    GLint positionLocation = glGetAttribLocation(program, "position");
>+    ASSERT_NE(-1, positionLocation);
>+
>+    setupQuadVertexBuffer(0.5f, 1.0f);
>+    glVertexAttribPointer(positionLocation, 3, GL_FLOAT, GL_FALSE, 0, 0);
>+    glEnableVertexAttribArray(positionLocation);
>+
>+    // Tests that TRIANGLES works.
>+    glDrawArrays(GL_TRIANGLES, 0, 6);
>+    ASSERT_GL_NO_ERROR();
>+    EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::green);
>+
>+    // Tests that specific invalid enums don't work.
>+    glDrawArrays(static_cast<GLenum>(7), 0, 6);
>+    EXPECT_GL_ERROR(GL_INVALID_ENUM);
>+
>+    glDrawArrays(static_cast<GLenum>(8), 0, 6);
>+    EXPECT_GL_ERROR(GL_INVALID_ENUM);
>+
>+    glDrawArrays(static_cast<GLenum>(9), 0, 6);
>+    EXPECT_GL_ERROR(GL_INVALID_ENUM);
>+}
>+
>+// Use this to select which configurations (e.g. which renderer, which GLES major version) these
>+// tests should be run against.
> ANGLE_INSTANTIATE_TEST(SimpleOperationTest,
>                        ES2_D3D9(),
>                        ES2_D3D11(EGL_EXPERIMENTAL_PRESENT_PATH_COPY_ANGLE),
>@@ -541,4 +1096,4 @@ ANGLE_INSTANTIATE_TEST(SimpleOperationTest,
>                        ES3_OPENGLES(),
>                        ES2_VULKAN());
> 
>-} // namespace
>+}  // namespace
>diff --git a/Source/ThirdParty/ANGLE/src/tests/gl_tests/SixteenBppTextureTest.cpp b/Source/ThirdParty/ANGLE/src/tests/gl_tests/SixteenBppTextureTest.cpp
>index 93ed8b1a756..95346c3dd9a 100644
>--- a/Source/ThirdParty/ANGLE/src/tests/gl_tests/SixteenBppTextureTest.cpp
>+++ b/Source/ThirdParty/ANGLE/src/tests/gl_tests/SixteenBppTextureTest.cpp
>@@ -50,28 +50,26 @@ class SixteenBppTextureTest : public ANGLETest
>     {
>         ANGLETest::SetUp();
> 
>-        const std::string vertexShaderSource =
>-            R"(precision highp float;
>-            attribute vec4 position;
>-            varying vec2 texcoord;
>-
>-            void main()
>-            {
>-                gl_Position = vec4(position.xy, 0.0, 1.0);
>-                texcoord = (position.xy * 0.5) + 0.5;
>-            })";
>-
>-        const std::string fragmentShaderSource2D =
>-            R"(precision highp float;
>-            uniform sampler2D tex;
>-            varying vec2 texcoord;
>-
>-            void main()
>-            {
>-                gl_FragColor = texture2D(tex, texcoord);
>-            })";
>-
>-        m2DProgram = CompileProgram(vertexShaderSource, fragmentShaderSource2D);
>+        constexpr char kVS[] = R"(precision highp float;
>+attribute vec4 position;
>+varying vec2 texcoord;
>+
>+void main()
>+{
>+    gl_Position = vec4(position.xy, 0.0, 1.0);
>+    texcoord = (position.xy * 0.5) + 0.5;
>+})";
>+
>+        constexpr char kFS[] = R"(precision highp float;
>+uniform sampler2D tex;
>+varying vec2 texcoord;
>+
>+void main()
>+{
>+    gl_FragColor = texture2D(tex, texcoord);
>+})";
>+
>+        m2DProgram                = CompileProgram(kVS, kFS);
>         mTexture2DUniformLocation = glGetUniformLocation(m2DProgram, "tex");
>     }
> 
>@@ -142,8 +140,7 @@ class SixteenBppTextureTest : public ANGLETest
> };
> 
> class SixteenBppTextureTestES3 : public SixteenBppTextureTest
>-{
>-};
>+{};
> 
> // Simple validation test for GL_RGB565 textures.
> // Samples from the texture, renders to it, generates mipmaps etc.
>@@ -176,12 +173,11 @@ TEST_P(SixteenBppTextureTest, RGB565Validation)
> // Samples from the texture, renders to it, generates mipmaps etc.
> TEST_P(SixteenBppTextureTest, RGBA5551Validation)
> {
>-    GLushort pixels[4] =
>-    {
>-        0xF801, // Red
>-        0x07C1, // Green
>-        0x003F, // Blue
>-        0xFFC1  // Red + Green
>+    GLushort pixels[4] = {
>+        0xF801,  // Red
>+        0x07C1,  // Green
>+        0x003F,  // Blue
>+        0xFFC1   // Red + Green
>     };
> 
>     // Create a simple 5551 texture
>@@ -237,12 +233,11 @@ TEST_P(SixteenBppTextureTest, RGBA5551ClearAlpha)
> // Samples from the texture, renders to it, generates mipmaps etc.
> TEST_P(SixteenBppTextureTest, RGBA4444Validation)
> {
>-    GLushort pixels[4] =
>-    {
>-        0xF00F, // Red
>-        0x0F0F, // Green
>-        0x00FF, // Blue
>-        0xFF0F  // Red + Green
>+    GLushort pixels[4] = {
>+        0xF00F,  // Red
>+        0x0F0F,  // Green
>+        0x00FF,  // Blue
>+        0xFF0F   // Red + Green
>     };
> 
>     glClearColor(0, 0, 0, 0);
>@@ -358,11 +353,7 @@ TEST_P(SixteenBppTextureTestES3, RGB5A1UploadRGB10A2)
> TEST_P(SixteenBppTextureTestES3, RGBA4FramebufferReadback)
> {
>     // TODO(jmadill): Fix bug with GLES
>-    if (IsOpenGLES())
>-    {
>-        std::cout << "Test skipped on GLES." << std::endl;
>-        return;
>-    }
>+    ANGLE_SKIP_TEST_IF(IsOpenGLES());
> 
>     Vector4 rawColor(0.5f, 0.7f, 1.0f, 0.0f);
>     GLColor expectedColor(rawColor);
>@@ -416,11 +407,7 @@ TEST_P(SixteenBppTextureTestES3, RGBA4FramebufferReadback)
> TEST_P(SixteenBppTextureTestES3, RGB565FramebufferReadback)
> {
>     // TODO(jmadill): Fix bug with GLES
>-    if (IsOpenGLES())
>-    {
>-        std::cout << "Test skipped on GLES." << std::endl;
>-        return;
>-    }
>+    ANGLE_SKIP_TEST_IF(IsOpenGLES());
> 
>     GLFramebuffer fbo;
>     glBindFramebuffer(GL_FRAMEBUFFER, fbo.get());
>@@ -431,7 +418,7 @@ TEST_P(SixteenBppTextureTestES3, RGB565FramebufferReadback)
>     fourColors.push_back(GLColor::blue);
>     fourColors.push_back(GLColor::white);
> 
>-    const std::string &vertexShader =
>+    constexpr char kVS[] =
>         "#version 300 es\n"
>         "in vec4 color;\n"
>         "in vec2 position;\n"
>@@ -440,7 +427,7 @@ TEST_P(SixteenBppTextureTestES3, RGB565FramebufferReadback)
>         "    fcolor = color;\n"
>         "    gl_Position = vec4(position, 0.5, 1.0);\n"
>         "}";
>-    const std::string &fragmentShader =
>+    constexpr char kFS[] =
>         "#version 300 es\n"
>         "in mediump vec4 fcolor;\n"
>         "out mediump vec4 color;\n"
>@@ -448,7 +435,7 @@ TEST_P(SixteenBppTextureTestES3, RGB565FramebufferReadback)
>         "    color = fcolor;\n"
>         "}";
> 
>-    GLuint program = CompileProgram(vertexShader, fragmentShader);
>+    GLuint program = CompileProgram(kVS, kFS);
>     glUseProgram(program);
> 
>     GLint colorLocation = glGetAttribLocation(program, "color");
>@@ -496,14 +483,16 @@ TEST_P(SixteenBppTextureTestES3, RGB565FramebufferReadback)
>     glDeleteProgram(program);
> }
> 
>-// Use this to select which configurations (e.g. which renderer, which GLES major version) these tests should be run against.
>+// Use this to select which configurations (e.g. which renderer, which GLES major version) these
>+// tests should be run against.
> ANGLE_INSTANTIATE_TEST(SixteenBppTextureTest,
>                        ES2_D3D9(),
>                        ES2_D3D11(),
>                        ES2_D3D11_FL9_3(),
>                        ES2_OPENGL(),
>-                       ES2_OPENGLES());
>+                       ES2_OPENGLES(),
>+                       ES2_VULKAN());
> 
> ANGLE_INSTANTIATE_TEST(SixteenBppTextureTestES3, ES3_D3D11(), ES3_OPENGL(), ES3_OPENGLES());
> 
>-} // namespace
>+}  // namespace
>diff --git a/Source/ThirdParty/ANGLE/src/tests/gl_tests/StateChangeTest.cpp b/Source/ThirdParty/ANGLE/src/tests/gl_tests/StateChangeTest.cpp
>index 5c21beeffe6..5f829ad97d0 100644
>--- a/Source/ThirdParty/ANGLE/src/tests/gl_tests/StateChangeTest.cpp
>+++ b/Source/ThirdParty/ANGLE/src/tests/gl_tests/StateChangeTest.cpp
>@@ -76,12 +76,8 @@ class StateChangeTestES3 : public StateChangeTest
> // Ensure that CopyTexImage2D syncs framebuffer changes.
> TEST_P(StateChangeTest, CopyTexImage2DSync)
> {
>-    if (IsAMD() && getPlatformRenderer() == EGL_PLATFORM_ANGLE_TYPE_OPENGL_ANGLE)
>-    {
>-        // TODO(geofflang): Fix on Linux AMD drivers (http://anglebug.com/1291)
>-        std::cout << "Test disabled on AMD OpenGL." << std::endl;
>-        return;
>-    }
>+    // TODO(geofflang): Fix on Linux AMD drivers (http://anglebug.com/1291)
>+    ANGLE_SKIP_TEST_IF(IsAMD() && IsOpenGL());
> 
>     glBindFramebuffer(GL_FRAMEBUFFER, mFramebuffer);
> 
>@@ -162,11 +158,7 @@ TEST_P(StateChangeTest, FramebufferIncompleteColorAttachment)
> // Test that caching works when color attachments change with TexStorage.
> TEST_P(StateChangeTest, FramebufferIncompleteWithTexStorage)
> {
>-    if (!extensionEnabled("GL_EXT_texture_storage"))
>-    {
>-        std::cout << "Test skipped because TexStorage2DEXT not available." << std::endl;
>-        return;
>-    }
>+    ANGLE_SKIP_TEST_IF(!IsGLExtensionEnabled("GL_EXT_texture_storage"));
> 
>     glBindFramebuffer(GL_FRAMEBUFFER, mFramebuffer);
>     glBindTexture(GL_TEXTURE_2D, mTextures[0]);
>@@ -261,18 +253,8 @@ TEST_P(StateChangeTest, FramebufferIncompleteStencilAttachment)
> // Test that Framebuffer completeness caching works when depth-stencil attachments change.
> TEST_P(StateChangeTest, FramebufferIncompleteDepthStencilAttachment)
> {
>-    if (getClientMajorVersion() < 3 && !extensionEnabled("GL_OES_packed_depth_stencil"))
>-    {
>-        std::cout << "Test skipped because packed depth+stencil not availble." << std::endl;
>-        return;
>-    }
>-
>-    if (IsWindows() && IsIntel() && IsOpenGL())
>-    {
>-        // TODO(jmadill): Investigate the failure (https://anglebug.com/1388)
>-        std::cout << "Test disabled on Windows Intel OpenGL." << std::endl;
>-        return;
>-    }
>+    ANGLE_SKIP_TEST_IF(getClientMajorVersion() < 3 &&
>+                       !IsGLExtensionEnabled("GL_OES_packed_depth_stencil"));
> 
>     glBindFramebuffer(GL_FRAMEBUFFER, mFramebuffer);
>     glBindTexture(GL_TEXTURE_2D, mTextures[0]);
>@@ -292,6 +274,190 @@ TEST_P(StateChangeTest, FramebufferIncompleteDepthStencilAttachment)
>     ASSERT_GL_NO_ERROR();
> }
> 
>+const char kSimpleAttributeVS[] = R"(attribute vec2 position;
>+attribute vec4 testAttrib;
>+varying vec4 testVarying;
>+void main()
>+{
>+    gl_Position = vec4(position, 0, 1);
>+    testVarying = testAttrib;
>+})";
>+
>+const char kSimpleAttributeFS[] = R"(precision mediump float;
>+varying vec4 testVarying;
>+void main()
>+{
>+    gl_FragColor = testVarying;
>+})";
>+
>+// Tests that using a buffered attribute, then disabling it and using current value, works.
>+TEST_P(StateChangeTest, DisablingBufferedVertexAttribute)
>+{
>+    ANGLE_GL_PROGRAM(program, kSimpleAttributeVS, kSimpleAttributeFS);
>+    glUseProgram(program);
>+    GLint attribLoc   = glGetAttribLocation(program, "testAttrib");
>+    GLint positionLoc = glGetAttribLocation(program, "position");
>+    ASSERT_NE(-1, attribLoc);
>+    ASSERT_NE(-1, positionLoc);
>+
>+    // Set up the buffered attribute.
>+    std::vector<GLColor> red(6, GLColor::red);
>+    GLBuffer attribBuffer;
>+    glBindBuffer(GL_ARRAY_BUFFER, attribBuffer);
>+    glBufferData(GL_ARRAY_BUFFER, red.size() * sizeof(GLColor), red.data(), GL_STATIC_DRAW);
>+    glEnableVertexAttribArray(attribLoc);
>+    glVertexAttribPointer(attribLoc, 4, GL_UNSIGNED_BYTE, GL_TRUE, 0, nullptr);
>+
>+    // Also set the current value to green now.
>+    glVertexAttrib4f(attribLoc, 0.0f, 1.0f, 0.0f, 1.0f);
>+
>+    // Set up the position attribute as well.
>+    setupQuadVertexBuffer(0.5f, 1.0f);
>+    glEnableVertexAttribArray(positionLoc);
>+    glVertexAttribPointer(positionLoc, 3, GL_FLOAT, GL_FALSE, 0, nullptr);
>+
>+    // Draw with the buffered attribute. Verify red.
>+    glDrawArrays(GL_TRIANGLES, 0, 6);
>+    EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::red);
>+
>+    // Draw with the disabled "current value attribute". Verify green.
>+    glDisableVertexAttribArray(attribLoc);
>+    glDrawArrays(GL_TRIANGLES, 0, 6);
>+    EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::green);
>+
>+    // Verify setting buffer data on the disabled buffer doesn't change anything.
>+    std::vector<GLColor> blue(128, GLColor::blue);
>+    glBindBuffer(GL_ARRAY_BUFFER, attribBuffer);
>+    glBufferData(GL_ARRAY_BUFFER, blue.size() * sizeof(GLColor), blue.data(), GL_STATIC_DRAW);
>+    glDrawArrays(GL_TRIANGLES, 0, 6);
>+    EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::green);
>+}
>+
>+// Tests that setting value for a subset of default attributes doesn't affect others.
>+TEST_P(StateChangeTest, SetCurrentAttribute)
>+{
>+    constexpr char kVS[] = R"(attribute vec4 position;
>+attribute mat4 testAttrib;  // Note that this generates 4 attributes
>+varying vec4 testVarying;
>+void main (void)
>+{
>+    gl_Position = position;
>+
>+    testVarying = position.y < 0.0 ?
>+                    position.x < 0.0 ? testAttrib[0] : testAttrib[1] :
>+                    position.x < 0.0 ? testAttrib[2] : testAttrib[3];
>+})";
>+
>+    ANGLE_GL_PROGRAM(program, kVS, kSimpleAttributeFS);
>+    glUseProgram(program);
>+    GLint attribLoc   = glGetAttribLocation(program, "testAttrib");
>+    GLint positionLoc = glGetAttribLocation(program, "position");
>+    ASSERT_NE(-1, attribLoc);
>+    ASSERT_NE(-1, positionLoc);
>+
>+    // Set the current value of two of the test attributes, while leaving the other two as default.
>+    glVertexAttrib4f(attribLoc + 1, 0.0f, 1.0f, 0.0f, 1.0f);
>+    glVertexAttrib4f(attribLoc + 2, 0.0f, 0.0f, 1.0f, 1.0f);
>+
>+    // Set up the position attribute.
>+    setupQuadVertexBuffer(0.5f, 1.0f);
>+    glEnableVertexAttribArray(positionLoc);
>+    glVertexAttribPointer(positionLoc, 3, GL_FLOAT, GL_FALSE, 0, nullptr);
>+
>+    // Draw and verify the four section in the output:
>+    //
>+    //  +---------------+
>+    //  | Black | Green |
>+    //  +-------+-------+
>+    //  | Blue  | Black |
>+    //  +---------------+
>+    //
>+    glDrawArrays(GL_TRIANGLES, 0, 6);
>+
>+    const int w                            = getWindowWidth();
>+    const int h                            = getWindowHeight();
>+    constexpr unsigned int kPixelTolerance = 5u;
>+    EXPECT_PIXEL_COLOR_NEAR(0, 0, GLColor::black, kPixelTolerance);
>+    EXPECT_PIXEL_COLOR_NEAR(w - 1, 0, GLColor::green, kPixelTolerance);
>+    EXPECT_PIXEL_COLOR_NEAR(0, h - 1, GLColor::blue, kPixelTolerance);
>+    EXPECT_PIXEL_COLOR_NEAR(w - 1, h - 1, GLColor::black, kPixelTolerance);
>+}
>+
>+// Tests that vertex attribute value is preserved across context switches.
>+TEST_P(StateChangeTest, MultiContextVertexAttribute)
>+{
>+    EGLWindow *window   = getEGLWindow();
>+    EGLDisplay display  = window->getDisplay();
>+    EGLConfig config    = window->getConfig();
>+    EGLSurface surface  = window->getSurface();
>+    EGLContext context1 = window->getContext();
>+
>+    // Set up program in primary context
>+    ANGLE_GL_PROGRAM(program1, kSimpleAttributeVS, kSimpleAttributeFS);
>+    glUseProgram(program1);
>+    GLint attribLoc   = glGetAttribLocation(program1, "testAttrib");
>+    GLint positionLoc = glGetAttribLocation(program1, "position");
>+    ASSERT_NE(-1, attribLoc);
>+    ASSERT_NE(-1, positionLoc);
>+
>+    // Set up the position attribute in primary context
>+    setupQuadVertexBuffer(0.5f, 1.0f);
>+    glEnableVertexAttribArray(positionLoc);
>+    glVertexAttribPointer(positionLoc, 3, GL_FLOAT, GL_FALSE, 0, nullptr);
>+
>+    // Set primary context attribute to green and draw quad
>+    glVertexAttrib4f(attribLoc, 0.0f, 1.0f, 0.0f, 1.0f);
>+    glDrawArrays(GL_TRIANGLES, 0, 6);
>+    EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::green);
>+
>+    // Set up and switch to secondary context
>+    EGLint contextAttributes[] = {
>+        EGL_CONTEXT_MAJOR_VERSION_KHR,
>+        GetParam().majorVersion,
>+        EGL_CONTEXT_MINOR_VERSION_KHR,
>+        GetParam().minorVersion,
>+        EGL_NONE,
>+    };
>+    EGLContext context2 = eglCreateContext(display, config, EGL_NO_CONTEXT, contextAttributes);
>+    ASSERT_NE(context2, EGL_NO_CONTEXT);
>+    eglMakeCurrent(display, surface, surface, context2);
>+
>+    // Set up program in secondary context
>+    ANGLE_GL_PROGRAM(program2, kSimpleAttributeVS, kSimpleAttributeFS);
>+    glUseProgram(program2);
>+    ASSERT_EQ(attribLoc, glGetAttribLocation(program2, "testAttrib"));
>+    ASSERT_EQ(positionLoc, glGetAttribLocation(program2, "position"));
>+
>+    // Set up the position attribute in secondary context
>+    setupQuadVertexBuffer(0.5f, 1.0f);
>+    glEnableVertexAttribArray(positionLoc);
>+    glVertexAttribPointer(positionLoc, 3, GL_FLOAT, GL_FALSE, 0, nullptr);
>+
>+    // attribLoc current value should be default - (0,0,0,1)
>+    glDrawArrays(GL_TRIANGLES, 0, 6);
>+    EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::black);
>+
>+    // Restore primary context
>+    eglMakeCurrent(display, surface, surface, context1);
>+    // ReadPixels to ensure context is switched
>+    EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::black);
>+
>+    // Switch to secondary context second time
>+    eglMakeCurrent(display, surface, surface, context2);
>+    // Check that it still draws black
>+    glDrawArrays(GL_TRIANGLES, 0, 6);
>+    EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::black);
>+
>+    // Restore primary context second time
>+    eglMakeCurrent(display, surface, surface, context1);
>+    // Check if it still draws green
>+    glDrawArrays(GL_TRIANGLES, 0, 6);
>+    EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::green);
>+
>+    // Clean up
>+    eglDestroyContext(display, context2);
>+}
>+
> // Ensure that CopyTexSubImage3D syncs framebuffer changes.
> TEST_P(StateChangeTestES3, CopyTexSubImage3DSync)
> {
>@@ -445,18 +611,18 @@ class StateChangeRenderTest : public StateChangeTest
>     {
>         StateChangeTest::SetUp();
> 
>-        const std::string vertexShaderSource =
>+        constexpr char kVS[] =
>             "attribute vec2 position;\n"
>             "void main() {\n"
>             "    gl_Position = vec4(position, 0, 1);\n"
>             "}";
>-        const std::string fragmentShaderSource =
>+        constexpr char kFS[] =
>             "uniform highp vec4 uniformColor;\n"
>             "void main() {\n"
>             "    gl_FragColor = uniformColor;\n"
>             "}";
> 
>-        mProgram = CompileProgram(vertexShaderSource, fragmentShaderSource);
>+        mProgram = CompileProgram(kVS, kFS);
>         ASSERT_NE(0u, mProgram);
> 
>         glGenRenderbuffers(1, &mRenderbuffer);
>@@ -474,7 +640,7 @@ class StateChangeRenderTest : public StateChangeTest
>     {
>         glUseProgram(mProgram);
>         const Vector4 &normalizedColor = color.toNormalizedVector();
>-        GLint uniformLocation = glGetUniformLocation(mProgram, "uniformColor");
>+        GLint uniformLocation          = glGetUniformLocation(mProgram, "uniformColor");
>         ASSERT_NE(-1, uniformLocation);
>         glUniform4fv(uniformLocation, 1, normalizedColor.data());
>     }
>@@ -486,13 +652,6 @@ class StateChangeRenderTest : public StateChangeTest
> // Test that re-creating a currently attached texture works as expected.
> TEST_P(StateChangeRenderTest, RecreateTexture)
> {
>-    if (IsIntel() && IsLinux())
>-    {
>-        // TODO(cwallez): Fix on Linux Intel drivers (http://anglebug.com/1346)
>-        std::cout << "Test disabled on Linux Intel OpenGL." << std::endl;
>-        return;
>-    }
>-
>     glBindFramebuffer(GL_FRAMEBUFFER, mFramebuffer);
> 
>     glBindTexture(GL_TEXTURE_2D, mTextures[0]);
>@@ -599,10 +758,73 @@ TEST_P(StateChangeRenderTest, GenerateMipmap)
>     EXPECT_GL_NO_ERROR();
> }
> 
>+// Tests that gl_DepthRange syncs correctly after a change.
>+TEST_P(StateChangeRenderTest, DepthRangeUpdates)
>+{
>+    // http://anglebug.com/2598: Seems to be an Intel driver bug.
>+    ANGLE_SKIP_TEST_IF(IsIntel() && IsOpenGL() && IsWindows());
>+
>+    constexpr char kFragCoordShader[] = R"(void main()
>+{
>+    if (gl_DepthRange.near == 0.2)
>+    {
>+        gl_FragColor = vec4(1, 0, 0, 1);
>+    }
>+    else if (gl_DepthRange.near == 0.5)
>+    {
>+        gl_FragColor = vec4(0, 1, 0, 1);
>+    }
>+    else
>+    {
>+        gl_FragColor = vec4(0, 0, 1, 1);
>+    }
>+})";
>+
>+    ANGLE_GL_PROGRAM(program, essl1_shaders::vs::Simple(), kFragCoordShader);
>+    glUseProgram(program);
>+
>+    const auto &quadVertices = GetQuadVertices();
>+
>+    ASSERT_EQ(0, glGetAttribLocation(program, essl1_shaders::PositionAttrib()));
>+
>+    GLBuffer vertexBuffer;
>+    glBindBuffer(GL_ARRAY_BUFFER, vertexBuffer);
>+    glBufferData(GL_ARRAY_BUFFER, quadVertices.size() * sizeof(quadVertices[0]),
>+                 quadVertices.data(), GL_STATIC_DRAW);
>+    glVertexAttribPointer(0u, 3, GL_FLOAT, GL_FALSE, 0, nullptr);
>+    glEnableVertexAttribArray(0u);
>+
>+    // First, clear.
>+    glClearColor(0.0f, 0.0f, 0.0f, 1.0f);
>+    glClear(GL_COLOR_BUFFER_BIT);
>+
>+    // Draw to left half viewport with a first depth range.
>+    glDepthRangef(0.2f, 1.0f);
>+    glViewport(0, 0, getWindowWidth() / 2, getWindowHeight());
>+    glDrawArrays(GL_TRIANGLES, 0, 6);
>+    ASSERT_GL_NO_ERROR();
>+
>+    // Draw to right half viewport with a second depth range.
>+    glDepthRangef(0.5f, 1.0f);
>+    glViewport(getWindowWidth() / 2, 0, getWindowWidth() / 2, getWindowHeight());
>+    glDrawArrays(GL_TRIANGLES, 0, 6);
>+    ASSERT_GL_NO_ERROR();
>+
>+    // Verify left half of the framebuffer is red and right half is green.
>+    EXPECT_PIXEL_RECT_EQ(0, 0, getWindowWidth() / 2, getWindowHeight(), GLColor::red);
>+    EXPECT_PIXEL_RECT_EQ(getWindowWidth() / 2, 0, getWindowWidth() / 2, getWindowHeight(),
>+                         GLColor::green);
>+}
>+
> // Tests that D3D11 dirty bit updates don't forget about BufferSubData attrib updates.
> TEST_P(StateChangeTest, VertexBufferUpdatedAfterDraw)
> {
>-    const std::string vs =
>+    // TODO(jie.a.chen@intel.com): Re-enable the test once the driver fix is
>+    // available in public release.
>+    // http://anglebug.com/2664.
>+    ANGLE_SKIP_TEST_IF(IsVulkan() && IsIntel());
>+
>+    constexpr char kVS[] =
>         "attribute vec2 position;\n"
>         "attribute vec4 color;\n"
>         "varying vec4 outcolor;\n"
>@@ -611,14 +833,14 @@ TEST_P(StateChangeTest, VertexBufferUpdatedAfterDraw)
>         "    gl_Position = vec4(position, 0, 1);\n"
>         "    outcolor = color;\n"
>         "}";
>-    const std::string fs =
>+    constexpr char kFS[] =
>         "varying mediump vec4 outcolor;\n"
>         "void main()\n"
>         "{\n"
>         "    gl_FragColor = outcolor;\n"
>         "}";
> 
>-    ANGLE_GL_PROGRAM(program, vs, fs);
>+    ANGLE_GL_PROGRAM(program, kVS, kFS);
>     glUseProgram(program);
> 
>     GLint colorLoc = glGetAttribLocation(program, "color");
>@@ -658,12 +880,11 @@ TEST_P(StateChangeTest, VertexBufferUpdatedAfterDraw)
> // Test that switching VAOs keeps the disabled "current value" attributes up-to-date.
> TEST_P(StateChangeTestES3, VertexArrayObjectAndDisabledAttributes)
> {
>-    const std::string singleVertexShader =
>-        "attribute vec4 position; void main() { gl_Position = position; }";
>-    const std::string singleFragmentShader = "void main() { gl_FragColor = vec4(1, 0, 0, 1); }";
>-    ANGLE_GL_PROGRAM(singleProgram, singleVertexShader, singleFragmentShader);
>+    constexpr char kSingleVS[] = "attribute vec4 position; void main() { gl_Position = position; }";
>+    constexpr char kSingleFS[] = "void main() { gl_FragColor = vec4(1, 0, 0, 1); }";
>+    ANGLE_GL_PROGRAM(singleProgram, kSingleVS, kSingleFS);
> 
>-    const std::string dualVertexShader =
>+    constexpr char kDualVS[] =
>         "#version 300 es\n"
>         "in vec4 position;\n"
>         "in vec4 color;\n"
>@@ -673,7 +894,7 @@ TEST_P(StateChangeTestES3, VertexArrayObjectAndDisabledAttributes)
>         "    gl_Position = position;\n"
>         "    varyColor = color;\n"
>         "}";
>-    const std::string dualFragmentShader =
>+    constexpr char kDualFS[] =
>         "#version 300 es\n"
>         "precision mediump float;\n"
>         "in vec4 varyColor;\n"
>@@ -682,7 +903,7 @@ TEST_P(StateChangeTestES3, VertexArrayObjectAndDisabledAttributes)
>         "{\n"
>         "    colorOut = varyColor;\n"
>         "}";
>-    ANGLE_GL_PROGRAM(dualProgram, dualVertexShader, dualFragmentShader);
>+    ANGLE_GL_PROGRAM(dualProgram, kDualVS, kDualFS);
>     GLint positionLocation = glGetAttribLocation(dualProgram, "position");
>     ASSERT_NE(-1, positionLocation);
>     GLint colorLocation = glGetAttribLocation(dualProgram, "color");
>@@ -738,312 +959,2592 @@ TEST_P(StateChangeTestES3, VertexArrayObjectAndDisabledAttributes)
>     EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::black);
> }
> 
>-// Simple state change tests, primarily focused on basic object lifetime and dependency management
>-// with back-ends that don't support that automatically (i.e. Vulkan).
>-class SimpleStateChangeTest : public ANGLETest
>+const char kSamplerMetadataVertexShader0[] = R"(#version 300 es
>+precision mediump float;
>+out vec4 color;
>+uniform sampler2D texture;
>+void main()
> {
>-  protected:
>-    SimpleStateChangeTest()
>-    {
>-        setWindowWidth(64);
>-        setWindowHeight(64);
>-        setConfigRedBits(8);
>-        setConfigGreenBits(8);
>-        setConfigBlueBits(8);
>-        setConfigAlphaBits(8);
>-    }
>-
>-    void simpleDrawWithBuffer(GLBuffer *buffer);
>-    void simpleDrawWithColor(const GLColor &color);
>-};
>+    vec2 size = vec2(textureSize(texture, 0));
>+    color = size.x != 0.0 ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 0.0);
>+    vec2 pos = vec2(0.0);
>+    switch (gl_VertexID) {
>+        case 0: pos = vec2(-1.0, -1.0); break;
>+        case 1: pos = vec2(3.0, -1.0); break;
>+        case 2: pos = vec2(-1.0, 3.0); break;
>+    };
>+    gl_Position = vec4(pos, 0.0, 1.0);
>+})";
> 
>-constexpr char kSimpleVertexShader[] = R"(attribute vec2 position;
>-attribute vec4 color;
>-varying vec4 vColor;
>+const char kSamplerMetadataVertexShader1[] = R"(#version 300 es
>+precision mediump float;
>+out vec4 color;
>+uniform sampler2D texture1;
>+uniform sampler2D texture2;
> void main()
> {
>-    gl_Position = vec4(position, 0, 1);
>-    vColor = color;
>-}
>-)";
>+    vec2 size1 = vec2(textureSize(texture1, 0));
>+    vec2 size2 = vec2(textureSize(texture2, 0));
>+    color = size1.x * size2.x != 0.0 ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 0.0);
>+    vec2 pos = vec2(0.0);
>+    switch (gl_VertexID) {
>+        case 0: pos = vec2(-1.0, -1.0); break;
>+        case 1: pos = vec2(3.0, -1.0); break;
>+        case 2: pos = vec2(-1.0, 3.0); break;
>+    };
>+    gl_Position = vec4(pos, 0.0, 1.0);
>+})";
> 
>-constexpr char kSimpleFragmentShader[] = R"(precision mediump float;
>-varying vec4 vColor;
>+const char kSamplerMetadataFragmentShader[] = R"(#version 300 es
>+precision mediump float;
>+in vec4 color;
>+out vec4 result;
> void main()
> {
>-    gl_FragColor = vColor;
>-}
>-)";
>+    result = color;
>+})";
> 
>-void SimpleStateChangeTest::simpleDrawWithBuffer(GLBuffer *buffer)
>+// Tests that changing an active program invalidates the sampler metadata properly.
>+TEST_P(StateChangeTestES3, SamplerMetadataUpdateOnSetProgram)
> {
>-    ANGLE_GL_PROGRAM(program, kSimpleVertexShader, kSimpleFragmentShader);
>-    glUseProgram(program);
>+    GLVertexArray vertexArray;
>+    glBindVertexArray(vertexArray);
> 
>-    GLint colorLoc = glGetAttribLocation(program, "color");
>-    ASSERT_NE(-1, colorLoc);
>+    // Create a simple framebuffer.
>+    GLTexture texture1, texture2;
>+    glActiveTexture(GL_TEXTURE0);
>+    glBindTexture(GL_TEXTURE_2D, texture1);
>+    glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, 2, 2, 0, GL_RGBA, GL_UNSIGNED_BYTE, nullptr);
>+    glActiveTexture(GL_TEXTURE1);
>+    glBindTexture(GL_TEXTURE_2D, texture2);
>+    glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, 3, 3, 0, GL_RGBA, GL_UNSIGNED_BYTE, nullptr);
>+
>+    // Create 2 shader programs differing only in the number of active samplers.
>+    ANGLE_GL_PROGRAM(program1, kSamplerMetadataVertexShader0, kSamplerMetadataFragmentShader);
>+    glUseProgram(program1);
>+    glUniform1i(glGetUniformLocation(program1, "texture"), 0);
>+    ANGLE_GL_PROGRAM(program2, kSamplerMetadataVertexShader1, kSamplerMetadataFragmentShader);
>+    glUseProgram(program2);
>+    glUniform1i(glGetUniformLocation(program2, "texture1"), 0);
>+    glUniform1i(glGetUniformLocation(program2, "texture2"), 0);
>+
>+    // Draw a solid green color to the framebuffer.
>+    glUseProgram(program1);
>+    glDrawArrays(GL_TRIANGLES, 0, 3);
>+    // Test that our first program is good.
>+    EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::green);
> 
>-    glBindBuffer(GL_ARRAY_BUFFER, *buffer);
>-    glVertexAttribPointer(colorLoc, 4, GL_UNSIGNED_BYTE, GL_TRUE, 0, nullptr);
>-    glEnableVertexAttribArray(colorLoc);
>+    // Bind a different program that uses more samplers.
>+    // Draw another quad that depends on the sampler metadata.
>+    glUseProgram(program2);
>+    glDrawArrays(GL_TRIANGLES, 0, 3);
>+    // Flush via ReadPixels and check that it's still green.
>+    EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::green);
> 
>-    drawQuad(program, "position", 0.5f, 1.0f, true);
>     ASSERT_GL_NO_ERROR();
> }
> 
>-void SimpleStateChangeTest::simpleDrawWithColor(const GLColor &color)
>+// Tests that redefining Buffer storage syncs with the Transform Feedback object.
>+TEST_P(StateChangeTestES3, RedefineTransformFeedbackBuffer)
> {
>-    std::vector<GLColor> colors(6, color);
>-    GLBuffer colorBuffer;
>-    glBindBuffer(GL_ARRAY_BUFFER, colorBuffer);
>-    glBufferData(GL_ARRAY_BUFFER, colors.size() * sizeof(GLColor), colors.data(), GL_STATIC_DRAW);
>-    simpleDrawWithBuffer(&colorBuffer);
>-}
>+    // Create the most simple program possible - simple a passthrough for a float attribute.
>+    constexpr char kVertexShader[] = R"(#version 300 es
>+in float valueIn;
>+out float valueOut;
>+void main()
>+{
>+    gl_Position = vec4(0, 0, 0, 0);
>+    valueOut = valueIn;
>+})";
> 
>-// Handles deleting a Buffer when it's being used.
>-TEST_P(SimpleStateChangeTest, DeleteBufferInUse)
>+    constexpr char kFragmentShader[] = R"(#version 300 es
>+out mediump float dummy;
>+void main()
> {
>-    std::vector<GLColor> colorData(6, GLColor::red);
>+    dummy = 1.0;
>+})";
> 
>-    GLBuffer buffer;
>-    glBindBuffer(GL_ARRAY_BUFFER, buffer);
>-    glBufferData(GL_ARRAY_BUFFER, sizeof(GLColor) * colorData.size(), colorData.data(),
>-                 GL_STATIC_DRAW);
>+    std::vector<std::string> tfVaryings = {"valueOut"};
>+    ANGLE_GL_PROGRAM_TRANSFORM_FEEDBACK(program, kVertexShader, kFragmentShader, tfVaryings,
>+                                        GL_SEPARATE_ATTRIBS);
>+    glUseProgram(program);
> 
>-    simpleDrawWithBuffer(&buffer);
>+    GLint attribLoc = glGetAttribLocation(program, "valueIn");
>+    ASSERT_NE(-1, attribLoc);
> 
>-    buffer.reset();
>-    EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::red);
>-}
>+    // Disable rasterization - we're not interested in the framebuffer.
>+    glEnable(GL_RASTERIZER_DISCARD);
> 
>-// Tests that resizing a Buffer during a draw works as expected.
>-TEST_P(SimpleStateChangeTest, RedefineBufferInUse)
>-{
>-    std::vector<GLColor> redColorData(6, GLColor::red);
>+    // Initialize a float vertex buffer with 1.0.
>+    std::vector<GLfloat> data1(16, 1.0);
>+    GLsizei size1 = static_cast<GLsizei>(sizeof(GLfloat) * data1.size());
> 
>-    GLBuffer buffer;
>-    glBindBuffer(GL_ARRAY_BUFFER, buffer);
>-    glBufferData(GL_ARRAY_BUFFER, sizeof(GLColor) * redColorData.size(), redColorData.data(),
>-                 GL_STATIC_DRAW);
>+    GLBuffer vertexBuffer;
>+    glBindBuffer(GL_ARRAY_BUFFER, vertexBuffer);
>+    glBufferData(GL_ARRAY_BUFFER, size1, data1.data(), GL_STATIC_DRAW);
>+    glVertexAttribPointer(attribLoc, 1, GL_FLOAT, GL_FALSE, 0, nullptr);
>+    glEnableVertexAttribArray(attribLoc);
> 
>-    // Trigger a pull from the buffer.
>-    simpleDrawWithBuffer(&buffer);
>+    ASSERT_GL_NO_ERROR();
> 
>-    // Redefine the buffer that's in-flight.
>-    std::vector<GLColor> greenColorData(1024, GLColor::green);
>-    glBufferData(GL_ARRAY_BUFFER, sizeof(GLColor) * greenColorData.size(), greenColorData.data(),
>-                 GL_STATIC_DRAW);
>+    // Initialize a same-sized XFB buffer.
>+    GLBuffer xfbBuffer;
>+    glBindBuffer(GL_TRANSFORM_FEEDBACK_BUFFER, xfbBuffer);
>+    glBufferData(GL_TRANSFORM_FEEDBACK_BUFFER, size1, nullptr, GL_STATIC_DRAW);
> 
>-    // Trigger the flush and verify the first draw worked.
>-    EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::red);
>+    // Draw with XFB enabled.
>+    GLTransformFeedback xfb;
>+    glBindTransformFeedback(GL_TRANSFORM_FEEDBACK, xfb);
>+    glBindBufferBase(GL_TRANSFORM_FEEDBACK_BUFFER, 0, xfbBuffer);
> 
>-    // Draw again and verify the new data is correct.
>-    simpleDrawWithBuffer(&buffer);
>-    EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::green);
>-}
>+    glBeginTransformFeedback(GL_POINTS);
>+    glDrawArrays(GL_POINTS, 0, 16);
>+    glEndTransformFeedback();
> 
>-// Tests updating a buffer's contents while in use, without redefining it.
>-TEST_P(SimpleStateChangeTest, UpdateBufferInUse)
>-{
>-    std::vector<GLColor> redColorData(6, GLColor::red);
>+    ASSERT_GL_NO_ERROR();
> 
>-    GLBuffer buffer;
>-    glBindBuffer(GL_ARRAY_BUFFER, buffer);
>-    glBufferData(GL_ARRAY_BUFFER, sizeof(GLColor) * redColorData.size(), redColorData.data(),
>-                 GL_STATIC_DRAW);
>+    // Verify the XFB stage caught the 1.0 attribute values.
>+    void *mapped1     = glMapBufferRange(GL_TRANSFORM_FEEDBACK_BUFFER, 0, size1, GL_MAP_READ_BIT);
>+    GLfloat *asFloat1 = reinterpret_cast<GLfloat *>(mapped1);
>+    std::vector<GLfloat> actualData1(asFloat1, asFloat1 + data1.size());
>+    EXPECT_EQ(data1, actualData1);
>+    glUnmapBuffer(GL_TRANSFORM_FEEDBACK_BUFFER);
> 
>-    // Trigger a pull from the buffer.
>-    simpleDrawWithBuffer(&buffer);
>+    // Now, reinitialize the XFB buffer to a larger size, and draw with 2.0.
>+    std::vector<GLfloat> data2(128, 2.0);
>+    const GLsizei size2 = static_cast<GLsizei>(sizeof(GLfloat) * data2.size());
>+    glBufferData(GL_ARRAY_BUFFER, size2, data2.data(), GL_STATIC_DRAW);
>+    glBufferData(GL_TRANSFORM_FEEDBACK_BUFFER, size2, nullptr, GL_STATIC_DRAW);
> 
>-    // Update the buffer that's in-flight.
>-    std::vector<GLColor> greenColorData(6, GLColor::green);
>-    glBufferSubData(GL_ARRAY_BUFFER, 0, sizeof(GLColor) * greenColorData.size(),
>-                    greenColorData.data());
>+    glBeginTransformFeedback(GL_POINTS);
>+    glDrawArrays(GL_POINTS, 0, 128);
>+    glEndTransformFeedback();
> 
>-    // Trigger the flush and verify the first draw worked.
>-    EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::red);
>+    ASSERT_GL_NO_ERROR();
> 
>-    // Draw again and verify the new data is correct.
>-    simpleDrawWithBuffer(&buffer);
>-    EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::green);
>+    // Verify the XFB stage caught the 2.0 attribute values.
>+    void *mapped2     = glMapBufferRange(GL_TRANSFORM_FEEDBACK_BUFFER, 0, size2, GL_MAP_READ_BIT);
>+    GLfloat *asFloat2 = reinterpret_cast<GLfloat *>(mapped2);
>+    std::vector<GLfloat> actualData2(asFloat2, asFloat2 + data2.size());
>+    EXPECT_EQ(data2, actualData2);
>+    glUnmapBuffer(GL_TRANSFORM_FEEDBACK_BUFFER);
> }
> 
>-// Tests that deleting an in-flight Texture does not immediately delete the resource.
>-TEST_P(SimpleStateChangeTest, DeleteTextureInUse)
>+// Simple state change tests for line loop drawing. There is some very specific handling of line
>+// line loops in Vulkan and we need to test switching between drawElements and drawArrays calls to
>+// validate every edge cases.
>+class LineLoopStateChangeTest : public StateChangeTest
> {
>-    std::array<GLColor, 4> colors = {
>-        {GLColor::red, GLColor::green, GLColor::blue, GLColor::yellow}};
>+  protected:
>+    LineLoopStateChangeTest()
>+    {
>+        setWindowWidth(32);
>+        setWindowHeight(32);
>+        setConfigRedBits(8);
>+        setConfigGreenBits(8);
>+        setConfigBlueBits(8);
>+        setConfigAlphaBits(8);
>+    }
> 
>-    GLTexture tex;
>-    glBindTexture(GL_TEXTURE_2D, tex);
>-    glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, 2, 2, 0, GL_RGBA, GL_UNSIGNED_BYTE, colors.data());
>-    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
>-    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
>+    void validateSquareAndHourglass() const
>+    {
>+        ASSERT_GL_NO_ERROR();
> 
>-    draw2DTexturedQuad(0.5f, 1.0f, true);
>-    tex.reset();
>-    EXPECT_GL_NO_ERROR();
>+        int quarterWidth  = getWindowWidth() / 4;
>+        int quarterHeight = getWindowHeight() / 4;
> 
>-    int w = getWindowWidth() - 2;
>-    int h = getWindowHeight() - 2;
>+        // Bottom left
>+        EXPECT_PIXEL_COLOR_EQ(quarterWidth, quarterHeight, GLColor::blue);
> 
>-    EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::red);
>+        // Top left
>+        EXPECT_PIXEL_COLOR_EQ(quarterWidth, (quarterHeight * 3), GLColor::blue);
>+
>+        // Top right
>+        // The last pixel isn't filled on a line loop so we check the pixel right before.
>+        EXPECT_PIXEL_COLOR_EQ((quarterWidth * 3), (quarterHeight * 3) - 1, GLColor::blue);
>+
>+        // dead center to validate the hourglass.
>+        EXPECT_PIXEL_COLOR_EQ((quarterWidth * 2), quarterHeight * 2, GLColor::blue);
>+
>+        // Verify line is closed between the 2 last vertices
>+        EXPECT_PIXEL_COLOR_EQ((quarterWidth * 2), quarterHeight, GLColor::blue);
>+    }
>+};
>+
>+// Draw an hourglass with a drawElements call followed by a square with drawArrays.
>+TEST_P(LineLoopStateChangeTest, DrawElementsThenDrawArrays)
>+{
>+    // http://anglebug.com/3361
>+    ANGLE_SKIP_TEST_IF(IsAMD() && IsVulkan() && IsWindows());
>+
>+    ANGLE_GL_PROGRAM(program, essl1_shaders::vs::Simple(), essl1_shaders::fs::Blue());
>+    glUseProgram(program);
>+
>+    // We expect to draw a square with these 4 vertices with a drawArray call.
>+    std::vector<Vector3> vertices;
>+    CreatePixelCenterWindowCoords({{8, 8}, {8, 24}, {24, 24}, {24, 8}}, getWindowWidth(),
>+                                  getWindowHeight(), &vertices);
>+
>+    // If we use these indices to draw however, we should be drawing an hourglass.
>+    auto indices = std::vector<GLushort>{0, 2, 1, 3};
>+
>+    GLint mPositionLocation = glGetAttribLocation(program, essl1_shaders::PositionAttrib());
>+    ASSERT_NE(-1, mPositionLocation);
>+
>+    GLBuffer vertexBuffer;
>+    glBindBuffer(GL_ARRAY_BUFFER, vertexBuffer);
>+    glBufferData(GL_ARRAY_BUFFER, sizeof(vertices[0]) * vertices.size(), vertices.data(),
>+                 GL_STATIC_DRAW);
>+
>+    GLBuffer indexBuffer;
>+    glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, indexBuffer);
>+    glBufferData(GL_ELEMENT_ARRAY_BUFFER, indices.size() * sizeof(GLushort), &indices[0],
>+                 GL_STATIC_DRAW);
>+
>+    glVertexAttribPointer(mPositionLocation, 3, GL_FLOAT, GL_FALSE, 0, nullptr);
>+    glEnableVertexAttribArray(mPositionLocation);
>+    glClear(GL_COLOR_BUFFER_BIT);
>+    glDrawElements(GL_LINE_LOOP, 4, GL_UNSIGNED_SHORT, nullptr);  // hourglass
>+    glDrawArrays(GL_LINE_LOOP, 0, 4);                             // square
>+    glDisableVertexAttribArray(mPositionLocation);
>+
>+    validateSquareAndHourglass();
>+}
>+
>+// Draw line loop using a drawArrays followed by an hourglass with drawElements.
>+TEST_P(LineLoopStateChangeTest, DrawArraysThenDrawElements)
>+{
>+    // http://anglebug.com/2856: Seems to fail on older drivers and pass on newer.
>+    // Tested failing on 18.3.3 and passing on 18.9.2.
>+    ANGLE_SKIP_TEST_IF(IsAMD() && IsVulkan() && IsWindows());
>+
>+    ANGLE_GL_PROGRAM(program, essl1_shaders::vs::Simple(), essl1_shaders::fs::Blue());
>+    glUseProgram(program);
>+
>+    // We expect to draw a square with these 4 vertices with a drawArray call.
>+    std::vector<Vector3> vertices;
>+    CreatePixelCenterWindowCoords({{8, 8}, {8, 24}, {24, 24}, {24, 8}}, getWindowWidth(),
>+                                  getWindowHeight(), &vertices);
>+
>+    // If we use these indices to draw however, we should be drawing an hourglass.
>+    auto indices = std::vector<GLushort>{0, 2, 1, 3};
>+
>+    GLint mPositionLocation = glGetAttribLocation(program, essl1_shaders::PositionAttrib());
>+    ASSERT_NE(-1, mPositionLocation);
>+
>+    GLBuffer vertexBuffer;
>+    glBindBuffer(GL_ARRAY_BUFFER, vertexBuffer);
>+    glBufferData(GL_ARRAY_BUFFER, sizeof(vertices[0]) * vertices.size(), vertices.data(),
>+                 GL_STATIC_DRAW);
>+
>+    GLBuffer indexBuffer;
>+    glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, indexBuffer);
>+    glBufferData(GL_ELEMENT_ARRAY_BUFFER, indices.size() * sizeof(GLushort), &indices[0],
>+                 GL_STATIC_DRAW);
>+
>+    glVertexAttribPointer(mPositionLocation, 3, GL_FLOAT, GL_FALSE, 0, nullptr);
>+    glEnableVertexAttribArray(mPositionLocation);
>+    glClear(GL_COLOR_BUFFER_BIT);
>+    glDrawArrays(GL_LINE_LOOP, 0, 4);                             // square
>+    glDrawElements(GL_LINE_LOOP, 4, GL_UNSIGNED_SHORT, nullptr);  // hourglass
>+    glDisableVertexAttribArray(mPositionLocation);
>+
>+    validateSquareAndHourglass();
>+}
>+
>+// Simple state change tests, primarily focused on basic object lifetime and dependency management
>+// with back-ends that don't support that automatically (i.e. Vulkan).
>+class SimpleStateChangeTest : public ANGLETest
>+{
>+  protected:
>+    static constexpr int kWindowSize = 64;
>+
>+    SimpleStateChangeTest()
>+    {
>+        setWindowWidth(kWindowSize);
>+        setWindowHeight(kWindowSize);
>+        setConfigRedBits(8);
>+        setConfigGreenBits(8);
>+        setConfigBlueBits(8);
>+        setConfigAlphaBits(8);
>+    }
>+
>+    void simpleDrawWithBuffer(GLBuffer *buffer);
>+    void simpleDrawWithColor(const GLColor &color);
>+};
>+
>+class SimpleStateChangeTestES3 : public SimpleStateChangeTest
>+{};
>+
>+class SimpleStateChangeTestES31 : public SimpleStateChangeTest
>+{
>+  protected:
>+    void SetUp() override
>+    {
>+        ANGLETest::SetUp();
>+
>+        glGenFramebuffers(1, &mFramebuffer);
>+        glGenTextures(1, &mTexture);
>+
>+        glBindTexture(GL_TEXTURE_2D, mTexture);
>+        glTexStorage2D(GL_TEXTURE_2D, 1, GL_RGBA8, 2, 2);
>+        EXPECT_GL_NO_ERROR();
>+
>+        constexpr char kCS[] = R"(#version 310 es
>+layout(local_size_x=2, local_size_y=2) in;
>+layout (rgba8, binding = 0) readonly uniform highp image2D srcImage;
>+layout (rgba8, binding = 1) writeonly uniform highp image2D dstImage;
>+void main()
>+{
>+    imageStore(dstImage, ivec2(gl_LocalInvocationID.xy),
>+               imageLoad(srcImage, ivec2(gl_LocalInvocationID.xy)));
>+})";
>+
>+        mProgram = CompileComputeProgram(kCS);
>+        ASSERT_NE(mProgram, 0u);
>+
>+        glBindImageTexture(1, mTexture, 0, GL_FALSE, 0, GL_WRITE_ONLY, GL_RGBA8);
>+
>+        glBindFramebuffer(GL_READ_FRAMEBUFFER, mFramebuffer);
>+        glFramebufferTexture2D(GL_READ_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, mTexture,
>+                               0);
>+
>+        ASSERT_GL_NO_ERROR();
>+    }
>+
>+    void TearDown() override
>+    {
>+        if (mFramebuffer != 0)
>+        {
>+            glDeleteFramebuffers(1, &mFramebuffer);
>+            mFramebuffer = 0;
>+        }
>+
>+        if (mTexture != 0)
>+        {
>+            glDeleteTextures(1, &mTexture);
>+            mTexture = 0;
>+        }
>+        glDeleteProgram(mProgram);
>+        ANGLETest::TearDown();
>+    }
>+
>+    GLuint mProgram;
>+    GLuint mFramebuffer = 0;
>+    GLuint mTexture     = 0;
>+};
>+
>+constexpr char kSimpleVertexShader[] = R"(attribute vec2 position;
>+attribute vec4 color;
>+varying vec4 vColor;
>+void main()
>+{
>+    gl_Position = vec4(position, 0, 1);
>+    vColor = color;
>+}
>+)";
>+
>+constexpr char kSimpleFragmentShader[] = R"(precision mediump float;
>+varying vec4 vColor;
>+void main()
>+{
>+    gl_FragColor = vColor;
>+}
>+)";
>+
>+void SimpleStateChangeTest::simpleDrawWithBuffer(GLBuffer *buffer)
>+{
>+    ANGLE_GL_PROGRAM(program, kSimpleVertexShader, kSimpleFragmentShader);
>+    glUseProgram(program);
>+
>+    GLint colorLoc = glGetAttribLocation(program, "color");
>+    ASSERT_NE(-1, colorLoc);
>+
>+    glBindBuffer(GL_ARRAY_BUFFER, *buffer);
>+    glVertexAttribPointer(colorLoc, 4, GL_UNSIGNED_BYTE, GL_TRUE, 0, nullptr);
>+    glEnableVertexAttribArray(colorLoc);
>+
>+    drawQuad(program, "position", 0.5f, 1.0f, true);
>+    ASSERT_GL_NO_ERROR();
>+}
>+
>+void SimpleStateChangeTest::simpleDrawWithColor(const GLColor &color)
>+{
>+    std::vector<GLColor> colors(6, color);
>+    GLBuffer colorBuffer;
>+    glBindBuffer(GL_ARRAY_BUFFER, colorBuffer);
>+    glBufferData(GL_ARRAY_BUFFER, colors.size() * sizeof(GLColor), colors.data(), GL_STATIC_DRAW);
>+    simpleDrawWithBuffer(&colorBuffer);
>+}
>+
>+// Test that we can do a drawElements call successfully after making a drawArrays call in the same
>+// frame.
>+TEST_P(SimpleStateChangeTest, DrawArraysThenDrawElements)
>+{
>+    ANGLE_GL_PROGRAM(program, essl1_shaders::vs::Simple(), essl1_shaders::fs::Blue());
>+    glUseProgram(program);
>+
>+    // We expect to draw a triangle with the first 3 points to the left, then another triangle with
>+    // the last 3 vertices using a drawElements call.
>+    auto vertices = std::vector<Vector3>{{-1.0f, -1.0f, 0.0f},
>+                                         {-1.0f, 1.0f, 0.0f},
>+                                         {0.0f, 0.0f, 0.0f},
>+                                         {1.0f, 1.0f, 0.0f},
>+                                         {1.0f, -1.0f, 0.0f}};
>+
>+    // If we use these indices to draw we'll be using the last 2 vertex only to draw.
>+    auto indices = std::vector<GLushort>{2, 3, 4};
>+
>+    GLint positionLocation = glGetAttribLocation(program, essl1_shaders::PositionAttrib());
>+    ASSERT_NE(-1, positionLocation);
>+
>+    GLBuffer vertexBuffer;
>+    glBindBuffer(GL_ARRAY_BUFFER, vertexBuffer);
>+    glBufferData(GL_ARRAY_BUFFER, sizeof(vertices[0]) * vertices.size(), vertices.data(),
>+                 GL_STATIC_DRAW);
>+
>+    GLBuffer indexBuffer;
>+    glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, indexBuffer);
>+    glBufferData(GL_ELEMENT_ARRAY_BUFFER, indices.size() * sizeof(GLushort), &indices[0],
>+                 GL_STATIC_DRAW);
>+
>+    glVertexAttribPointer(positionLocation, 3, GL_FLOAT, GL_FALSE, 0, nullptr);
>+    glEnableVertexAttribArray(positionLocation);
>+
>+    for (int i = 0; i < 10; i++)
>+    {
>+        glClear(GL_COLOR_BUFFER_BIT);
>+        glDrawArrays(GL_TRIANGLES, 0, 3);                             // triangle to the left
>+        glDrawElements(GL_TRIANGLES, 3, GL_UNSIGNED_SHORT, nullptr);  // triangle to the right
>+        swapBuffers();
>+    }
>+    glDisableVertexAttribArray(positionLocation);
>+
>+    ASSERT_GL_NO_ERROR();
>+
>+    int quarterWidth = getWindowWidth() / 4;
>+    int halfHeight   = getWindowHeight() / 2;
>+
>+    // Validate triangle to the left
>+    EXPECT_PIXEL_COLOR_EQ(quarterWidth, halfHeight, GLColor::blue);
>+
>+    // Validate triangle to the right
>+    EXPECT_PIXEL_COLOR_EQ((quarterWidth * 3), halfHeight, GLColor::blue);
>+}
>+
>+// Handles deleting a Buffer when it's being used.
>+TEST_P(SimpleStateChangeTest, DeleteBufferInUse)
>+{
>+    std::vector<GLColor> colorData(6, GLColor::red);
>+
>+    GLBuffer buffer;
>+    glBindBuffer(GL_ARRAY_BUFFER, buffer);
>+    glBufferData(GL_ARRAY_BUFFER, sizeof(GLColor) * colorData.size(), colorData.data(),
>+                 GL_STATIC_DRAW);
>+
>+    simpleDrawWithBuffer(&buffer);
>+
>+    buffer.reset();
>+    EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::red);
>+}
>+
>+// Tests that resizing a Buffer during a draw works as expected.
>+TEST_P(SimpleStateChangeTest, RedefineBufferInUse)
>+{
>+    std::vector<GLColor> redColorData(6, GLColor::red);
>+
>+    GLBuffer buffer;
>+    glBindBuffer(GL_ARRAY_BUFFER, buffer);
>+    glBufferData(GL_ARRAY_BUFFER, sizeof(GLColor) * redColorData.size(), redColorData.data(),
>+                 GL_STATIC_DRAW);
>+
>+    // Trigger a pull from the buffer.
>+    simpleDrawWithBuffer(&buffer);
>+
>+    // Redefine the buffer that's in-flight.
>+    std::vector<GLColor> greenColorData(1024, GLColor::green);
>+    glBufferData(GL_ARRAY_BUFFER, sizeof(GLColor) * greenColorData.size(), greenColorData.data(),
>+                 GL_STATIC_DRAW);
>+
>+    // Trigger the flush and verify the first draw worked.
>+    EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::red);
>+
>+    // Draw again and verify the new data is correct.
>+    simpleDrawWithBuffer(&buffer);
>+    EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::green);
>+}
>+
>+// Tests updating a buffer's contents while in use, without redefining it.
>+TEST_P(SimpleStateChangeTest, UpdateBufferInUse)
>+{
>+    // tobine: Started failing w/ custom cmd buffers. http://anglebug.com/3255
>+    ANGLE_SKIP_TEST_IF(IsAMD() && IsWindows() && IsVulkan());
>+    std::vector<GLColor> redColorData(6, GLColor::red);
>+
>+    GLBuffer buffer;
>+    glBindBuffer(GL_ARRAY_BUFFER, buffer);
>+    glBufferData(GL_ARRAY_BUFFER, sizeof(GLColor) * redColorData.size(), redColorData.data(),
>+                 GL_STATIC_DRAW);
>+
>+    // Trigger a pull from the buffer.
>+    simpleDrawWithBuffer(&buffer);
>+
>+    // Update the buffer that's in-flight.
>+    std::vector<GLColor> greenColorData(6, GLColor::green);
>+    glBufferSubData(GL_ARRAY_BUFFER, 0, sizeof(GLColor) * greenColorData.size(),
>+                    greenColorData.data());
>+
>+    // Trigger the flush and verify the first draw worked.
>+    EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::red);
>+
>+    // Draw again and verify the new data is correct.
>+    simpleDrawWithBuffer(&buffer);
>+    EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::green);
>+}
>+
>+// Tests that deleting an in-flight Texture does not immediately delete the resource.
>+TEST_P(SimpleStateChangeTest, DeleteTextureInUse)
>+{
>+    std::array<GLColor, 4> colors = {
>+        {GLColor::red, GLColor::green, GLColor::blue, GLColor::yellow}};
>+
>+    GLTexture tex;
>+    glBindTexture(GL_TEXTURE_2D, tex);
>+    glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, 2, 2, 0, GL_RGBA, GL_UNSIGNED_BYTE, colors.data());
>+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
>+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
>+
>+    draw2DTexturedQuad(0.5f, 1.0f, true);
>+    tex.reset();
>+    EXPECT_GL_NO_ERROR();
>+
>+    int w = getWindowWidth() - 2;
>+    int h = getWindowHeight() - 2;
>+
>+    EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::red);
>     EXPECT_PIXEL_COLOR_EQ(w, 0, GLColor::green);
>     EXPECT_PIXEL_COLOR_EQ(0, h, GLColor::blue);
>     EXPECT_PIXEL_COLOR_EQ(w, h, GLColor::yellow);
> }
> 
>-// Tests that redefining an in-flight Texture does not affect the in-flight resource.
>-TEST_P(SimpleStateChangeTest, RedefineTextureInUse)
>+// Tests that modifying a texture parameter in-flight does not cause problems.
>+TEST_P(SimpleStateChangeTest, ChangeTextureFilterModeBetweenTwoDraws)
>+{
>+    std::array<GLColor, 4> colors = {
>+        {GLColor::black, GLColor::white, GLColor::black, GLColor::white}};
>+
>+    GLTexture tex;
>+    glBindTexture(GL_TEXTURE_2D, tex);
>+    glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, 2, 2, 0, GL_RGBA, GL_UNSIGNED_BYTE, colors.data());
>+
>+    glClearColor(1.0f, 0.0f, 0.0f, 1.0f);
>+    glClear(GL_COLOR_BUFFER_BIT);
>+
>+    // Draw to the left side of the window only with NEAREST.
>+    glViewport(0, 0, getWindowWidth() / 2, getWindowHeight());
>+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
>+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
>+    draw2DTexturedQuad(0.5f, 1.0f, true);
>+
>+    // Draw to the right side of the window only with LINEAR.
>+    glViewport(getWindowWidth() / 2, 0, getWindowWidth() / 2, getWindowHeight());
>+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
>+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
>+    draw2DTexturedQuad(0.5f, 1.0f, true);
>+    EXPECT_GL_NO_ERROR();
>+
>+    glViewport(0, 0, getWindowWidth(), getWindowHeight());
>+
>+    // The first half (left) should be only black followed by plain white.
>+    EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::black);
>+    EXPECT_PIXEL_COLOR_EQ(1, 0, GLColor::black);
>+    EXPECT_PIXEL_COLOR_EQ((getWindowWidth() / 2) - 3, 0, GLColor::white);
>+    EXPECT_PIXEL_COLOR_EQ((getWindowWidth() / 2) - 4, 0, GLColor::white);
>+
>+    // The second half (right) should be a gradient so we shouldn't find plain black/white in the
>+    // middle.
>+    EXPECT_NE(angle::ReadColor((getWindowWidth() / 4) * 3, 0), GLColor::black);
>+    EXPECT_NE(angle::ReadColor((getWindowWidth() / 4) * 3, 0), GLColor::white);
>+}
>+
>+// Tests that bind the same texture all the time between different draw calls.
>+TEST_P(SimpleStateChangeTest, RebindTextureDrawAgain)
>+{
>+    GLuint program = get2DTexturedQuadProgram();
>+    glUseProgram(program);
>+
>+    std::array<GLColor, 4> colors = {{GLColor::cyan, GLColor::cyan, GLColor::cyan, GLColor::cyan}};
>+
>+    // Setup the texture
>+    GLTexture tex;
>+    glBindTexture(GL_TEXTURE_2D, tex);
>+    glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, 2, 2, 0, GL_RGBA, GL_UNSIGNED_BYTE, colors.data());
>+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
>+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
>+
>+    // Setup the vertex array to draw a quad.
>+    GLint positionLocation = glGetAttribLocation(program, "position");
>+    setupQuadVertexBuffer(1.0f, 1.0f);
>+    glVertexAttribPointer(positionLocation, 3, GL_FLOAT, GL_FALSE, 0, 0);
>+    glEnableVertexAttribArray(positionLocation);
>+
>+    // Draw quad
>+    glDrawArrays(GL_TRIANGLES, 0, 6);
>+    ASSERT_GL_NO_ERROR();
>+
>+    // Bind again
>+    glBindTexture(GL_TEXTURE_2D, tex);
>+    ASSERT_GL_NO_ERROR();
>+
>+    // Draw again, should still work.
>+    glDrawArrays(GL_TRIANGLES, 0, 6);
>+    ASSERT_GL_NO_ERROR();
>+
>+    // Validate whole surface is filled with cyan.
>+    int h = getWindowHeight() - 1;
>+    int w = getWindowWidth() - 1;
>+
>+    EXPECT_PIXEL_RECT_EQ(0, 0, w, h, GLColor::cyan);
>+}
>+
>+// Tests that we can draw with a texture, modify the texture with a texSubImage, and then draw again
>+// correctly.
>+TEST_P(SimpleStateChangeTest, DrawWithTextureTexSubImageThenDrawAgain)
>+{
>+    GLuint program = get2DTexturedQuadProgram();
>+    ASSERT_NE(0u, program);
>+    glUseProgram(program);
>+
>+    std::array<GLColor, 4> colors    = {{GLColor::red, GLColor::red, GLColor::red, GLColor::red}};
>+    std::array<GLColor, 4> subColors = {
>+        {GLColor::green, GLColor::green, GLColor::green, GLColor::green}};
>+
>+    // Setup the texture
>+    GLTexture tex;
>+    glBindTexture(GL_TEXTURE_2D, tex);
>+    glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, 2, 2, 0, GL_RGBA, GL_UNSIGNED_BYTE, colors.data());
>+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
>+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
>+
>+    // Setup the vertex array to draw a quad.
>+    GLint positionLocation = glGetAttribLocation(program, "position");
>+    setupQuadVertexBuffer(1.0f, 1.0f);
>+    glVertexAttribPointer(positionLocation, 3, GL_FLOAT, GL_FALSE, 0, 0);
>+    glEnableVertexAttribArray(positionLocation);
>+
>+    // Draw quad
>+    glDrawArrays(GL_TRIANGLES, 0, 6);
>+    ASSERT_GL_NO_ERROR();
>+
>+    // Update bottom-half of texture with green.
>+    glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, 2, 1, GL_RGBA, GL_UNSIGNED_BYTE, subColors.data());
>+    ASSERT_GL_NO_ERROR();
>+
>+    // Draw again, should still work.
>+    glDrawArrays(GL_TRIANGLES, 0, 6);
>+    ASSERT_GL_NO_ERROR();
>+
>+    // Validate first half of the screen is red and the bottom is green.
>+    EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::green);
>+    EXPECT_PIXEL_COLOR_EQ(0, getWindowHeight() / 4 * 3, GLColor::red);
>+}
>+
>+// Test that we can alternate between textures between different draws.
>+TEST_P(SimpleStateChangeTest, DrawTextureAThenTextureBThenTextureA)
>+{
>+    GLuint program = get2DTexturedQuadProgram();
>+    glUseProgram(program);
>+
>+    std::array<GLColor, 4> colorsTex1 = {
>+        {GLColor::cyan, GLColor::cyan, GLColor::cyan, GLColor::cyan}};
>+
>+    std::array<GLColor, 4> colorsTex2 = {
>+        {GLColor::magenta, GLColor::magenta, GLColor::magenta, GLColor::magenta}};
>+
>+    // Setup the texture
>+    GLTexture tex1;
>+    glBindTexture(GL_TEXTURE_2D, tex1);
>+    glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, 2, 2, 0, GL_RGBA, GL_UNSIGNED_BYTE, colorsTex1.data());
>+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
>+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
>+
>+    GLTexture tex2;
>+    glBindTexture(GL_TEXTURE_2D, tex2);
>+    glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, 2, 2, 0, GL_RGBA, GL_UNSIGNED_BYTE, colorsTex2.data());
>+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
>+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
>+
>+    // Setup the vertex array to draw a quad.
>+    GLint positionLocation = glGetAttribLocation(program, "position");
>+    setupQuadVertexBuffer(1.0f, 1.0f);
>+    glVertexAttribPointer(positionLocation, 3, GL_FLOAT, GL_FALSE, 0, 0);
>+    glEnableVertexAttribArray(positionLocation);
>+
>+    // Draw quad
>+    glBindTexture(GL_TEXTURE_2D, tex1);
>+    glDrawArrays(GL_TRIANGLES, 0, 6);
>+    ASSERT_GL_NO_ERROR();
>+
>+    // Bind again, draw again
>+    glBindTexture(GL_TEXTURE_2D, tex2);
>+    glDrawArrays(GL_TRIANGLES, 0, 6);
>+    ASSERT_GL_NO_ERROR();
>+
>+    // Bind again, draw again
>+    glBindTexture(GL_TEXTURE_2D, tex1);
>+    glDrawArrays(GL_TRIANGLES, 0, 6);
>+
>+    // Validate whole surface is filled with cyan.
>+    int h = getWindowHeight() - 1;
>+    int w = getWindowWidth() - 1;
>+
>+    EXPECT_PIXEL_RECT_EQ(0, 0, w, h, GLColor::cyan);
>+}
>+
>+// Tests that redefining an in-flight Texture does not affect the in-flight resource.
>+TEST_P(SimpleStateChangeTest, RedefineTextureInUse)
>+{
>+    std::array<GLColor, 4> colors = {
>+        {GLColor::red, GLColor::green, GLColor::blue, GLColor::yellow}};
>+
>+    GLTexture tex;
>+    glBindTexture(GL_TEXTURE_2D, tex);
>+    glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, 2, 2, 0, GL_RGBA, GL_UNSIGNED_BYTE, colors.data());
>+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
>+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
>+
>+    // Draw with the first texture.
>+    draw2DTexturedQuad(0.5f, 1.0f, true);
>+
>+    // Redefine the in-flight texture.
>+    constexpr int kBigSize = 32;
>+    std::vector<GLColor> bigColors;
>+    for (int y = 0; y < kBigSize; ++y)
>+    {
>+        for (int x = 0; x < kBigSize; ++x)
>+        {
>+            bool xComp = x < kBigSize / 2;
>+            bool yComp = y < kBigSize / 2;
>+            if (yComp)
>+            {
>+                bigColors.push_back(xComp ? GLColor::cyan : GLColor::magenta);
>+            }
>+            else
>+            {
>+                bigColors.push_back(xComp ? GLColor::yellow : GLColor::white);
>+            }
>+        }
>+    }
>+
>+    glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, 32, 32, 0, GL_RGBA, GL_UNSIGNED_BYTE, bigColors.data());
>+    EXPECT_GL_NO_ERROR();
>+
>+    // Verify the first draw had the correct data via ReadPixels.
>+    int w = getWindowWidth() - 2;
>+    int h = getWindowHeight() - 2;
>+
>+    EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::red);
>+    EXPECT_PIXEL_COLOR_EQ(w, 0, GLColor::green);
>+    EXPECT_PIXEL_COLOR_EQ(0, h, GLColor::blue);
>+    EXPECT_PIXEL_COLOR_EQ(w, h, GLColor::yellow);
>+
>+    // Draw and verify with the redefined data.
>+    draw2DTexturedQuad(0.5f, 1.0f, true);
>+    EXPECT_GL_NO_ERROR();
>+
>+    EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::cyan);
>+    EXPECT_PIXEL_COLOR_EQ(w, 0, GLColor::magenta);
>+    EXPECT_PIXEL_COLOR_EQ(0, h, GLColor::yellow);
>+    EXPECT_PIXEL_COLOR_EQ(w, h, GLColor::white);
>+}
>+
>+// Test updating a Texture's contents while in use by GL works as expected.
>+TEST_P(SimpleStateChangeTest, UpdateTextureInUse)
>+{
>+    std::array<GLColor, 4> rgby = {{GLColor::red, GLColor::green, GLColor::blue, GLColor::yellow}};
>+
>+    GLTexture tex;
>+    glBindTexture(GL_TEXTURE_2D, tex);
>+    glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, 2, 2, 0, GL_RGBA, GL_UNSIGNED_BYTE, rgby.data());
>+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
>+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
>+
>+    // Draw RGBY to the Framebuffer. The texture is now in-use by GL.
>+    draw2DTexturedQuad(0.5f, 1.0f, true);
>+
>+    // Update the texture to be YBGR, while the Texture is in-use. Should not affect the draw.
>+    std::array<GLColor, 4> ybgr = {{GLColor::yellow, GLColor::blue, GLColor::green, GLColor::red}};
>+    glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, 2, 2, GL_RGBA, GL_UNSIGNED_BYTE, ybgr.data());
>+    ASSERT_GL_NO_ERROR();
>+
>+    // Check the Framebuffer. The draw call should have completed with the original RGBY data.
>+    int w = getWindowWidth() - 2;
>+    int h = getWindowHeight() - 2;
>+
>+    EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::red);
>+    EXPECT_PIXEL_COLOR_EQ(w, 0, GLColor::green);
>+    EXPECT_PIXEL_COLOR_EQ(0, h, GLColor::blue);
>+    EXPECT_PIXEL_COLOR_EQ(w, h, GLColor::yellow);
>+
>+    // Draw again to the Framebuffer. The second draw call should use the updated YBGR data.
>+    draw2DTexturedQuad(0.5f, 1.0f, true);
>+
>+    EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::yellow);
>+    EXPECT_PIXEL_COLOR_EQ(w, 0, GLColor::blue);
>+    EXPECT_PIXEL_COLOR_EQ(0, h, GLColor::green);
>+    EXPECT_PIXEL_COLOR_EQ(w, h, GLColor::red);
>+    ASSERT_GL_NO_ERROR();
>+}
>+
>+// Tests deleting a Framebuffer that is in use.
>+TEST_P(SimpleStateChangeTest, DeleteFramebufferInUse)
>+{
>+    constexpr int kSize = 16;
>+
>+    // Create a simple framebuffer.
>+    GLTexture texture;
>+    glBindTexture(GL_TEXTURE_2D, texture);
>+    glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, kSize, kSize, 0, GL_RGBA, GL_UNSIGNED_BYTE, nullptr);
>+
>+    GLFramebuffer framebuffer;
>+    glBindFramebuffer(GL_FRAMEBUFFER, framebuffer);
>+    glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, texture, 0);
>+    ASSERT_GLENUM_EQ(GL_FRAMEBUFFER_COMPLETE, glCheckFramebufferStatus(GL_FRAMEBUFFER));
>+
>+    glViewport(0, 0, kSize, kSize);
>+
>+    // Draw a solid red color to the framebuffer.
>+    ANGLE_GL_PROGRAM(program, essl1_shaders::vs::Simple(), essl1_shaders::fs::Red());
>+    drawQuad(program, essl1_shaders::PositionAttrib(), 0.5f, 1.0f, true);
>+
>+    // Delete the framebuffer while the call is in flight.
>+    framebuffer.reset();
>+
>+    // Make a new framebuffer so we can read back the texture.
>+    glBindFramebuffer(GL_FRAMEBUFFER, framebuffer);
>+    glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, texture, 0);
>+    ASSERT_GLENUM_EQ(GL_FRAMEBUFFER_COMPLETE, glCheckFramebufferStatus(GL_FRAMEBUFFER));
>+
>+    // Flush via ReadPixels and check red was drawn.
>+    EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::red);
>+    ASSERT_GL_NO_ERROR();
>+}
>+
>+// This test was made to reproduce a specific issue with our Vulkan backend where were releasing
>+// buffers too early. The test has 2 textures, we first create a texture and update it with
>+// multiple updates, but we don't use it right away, we instead draw using another texture
>+// then we bind the first texture and draw with it.
>+TEST_P(SimpleStateChangeTest, DynamicAllocationOfMemoryForTextures)
>+{
>+    constexpr int kSize = 64;
>+
>+    GLuint program = get2DTexturedQuadProgram();
>+    glUseProgram(program);
>+
>+    std::vector<GLColor> greenPixels(kSize * kSize, GLColor::green);
>+    std::vector<GLColor> redPixels(kSize * kSize, GLColor::red);
>+    GLTexture texture1;
>+    glBindTexture(GL_TEXTURE_2D, texture1);
>+    glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, kSize, kSize, 0, GL_RGBA, GL_UNSIGNED_BYTE, nullptr);
>+
>+    for (int i = 0; i < 100; i++)
>+    {
>+        // We do this a lot of time to make sure we use multiple buffers in the vulkan backend.
>+        glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, kSize, kSize, GL_RGBA, GL_UNSIGNED_BYTE,
>+                        greenPixels.data());
>+    }
>+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
>+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
>+
>+    ASSERT_GL_NO_ERROR();
>+
>+    GLTexture texture2;
>+    glBindTexture(GL_TEXTURE_2D, texture2);
>+    glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, 2, 2, 0, GL_RGBA, GL_UNSIGNED_BYTE, redPixels.data());
>+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
>+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
>+
>+    // Setup the vertex array to draw a quad.
>+    GLint positionLocation = glGetAttribLocation(program, "position");
>+    setupQuadVertexBuffer(1.0f, 1.0f);
>+    glVertexAttribPointer(positionLocation, 3, GL_FLOAT, GL_FALSE, 0, 0);
>+    glEnableVertexAttribArray(positionLocation);
>+
>+    // Draw quad with texture 2 while texture 1 has "staged" changes that have not been flushed yet.
>+    glBindTexture(GL_TEXTURE_2D, texture2);
>+    glDrawArrays(GL_TRIANGLES, 0, 6);
>+    ASSERT_GL_NO_ERROR();
>+    EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::red);
>+
>+    // If we now try to draw with texture1, we should trigger the issue.
>+    glBindTexture(GL_TEXTURE_2D, texture1);
>+    glDrawArrays(GL_TRIANGLES, 0, 6);
>+    ASSERT_GL_NO_ERROR();
>+
>+    EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::green);
>+}
>+
>+// Tests deleting a Framebuffer that is in use.
>+TEST_P(SimpleStateChangeTest, RedefineFramebufferInUse)
>+{
>+    constexpr int kSize = 16;
>+
>+    // Create a simple framebuffer.
>+    GLTexture texture;
>+    glBindTexture(GL_TEXTURE_2D, texture);
>+    glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, kSize, kSize, 0, GL_RGBA, GL_UNSIGNED_BYTE, nullptr);
>+
>+    GLFramebuffer framebuffer;
>+    glBindFramebuffer(GL_FRAMEBUFFER, framebuffer);
>+    glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, texture, 0);
>+    ASSERT_GLENUM_EQ(GL_FRAMEBUFFER_COMPLETE, glCheckFramebufferStatus(GL_FRAMEBUFFER));
>+
>+    glViewport(0, 0, kSize, kSize);
>+
>+    // Draw red to the framebuffer.
>+    simpleDrawWithColor(GLColor::red);
>+
>+    // Change the framebuffer while the call is in flight to a new texture.
>+    GLTexture otherTexture;
>+    glBindTexture(GL_TEXTURE_2D, otherTexture);
>+    glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, kSize, kSize, 0, GL_RGBA, GL_UNSIGNED_BYTE, nullptr);
>+
>+    glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, otherTexture, 0);
>+    ASSERT_GLENUM_EQ(GL_FRAMEBUFFER_COMPLETE, glCheckFramebufferStatus(GL_FRAMEBUFFER));
>+
>+    // Draw green to the framebuffer. Verify the color.
>+    simpleDrawWithColor(GLColor::green);
>+    EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::green);
>+
>+    // Make a new framebuffer so we can read back the first texture and verify red.
>+    glBindFramebuffer(GL_FRAMEBUFFER, framebuffer);
>+    glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, texture, 0);
>+    ASSERT_GLENUM_EQ(GL_FRAMEBUFFER_COMPLETE, glCheckFramebufferStatus(GL_FRAMEBUFFER));
>+
>+    EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::red);
>+    ASSERT_GL_NO_ERROR();
>+}
>+
>+// Tests that redefining a Framebuffer Texture Attachment works as expected.
>+TEST_P(SimpleStateChangeTest, RedefineFramebufferTexture)
>+{
>+    GLFramebuffer framebuffer;
>+    glBindFramebuffer(GL_FRAMEBUFFER, framebuffer);
>+
>+    // Bind a simple 8x8 texture to the framebuffer, draw red.
>+    GLTexture texture;
>+    glBindTexture(GL_TEXTURE_2D, texture);
>+    glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, 8, 8, 0, GL_RGBA, GL_UNSIGNED_BYTE, nullptr);
>+    glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, texture, 0);
>+
>+    glViewport(0, 0, 8, 8);
>+    simpleDrawWithColor(GLColor::red);
>+    ASSERT_GL_NO_ERROR();
>+    EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::red) << "first draw should be red";
>+
>+    // Redefine the texture to 32x32, draw green. Verify we get what we expect.
>+    glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, 32, 32, 0, GL_RGBA, GL_UNSIGNED_BYTE, nullptr);
>+    glViewport(0, 0, 32, 32);
>+    simpleDrawWithColor(GLColor::green);
>+    ASSERT_GL_NO_ERROR();
>+    EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::green) << "second draw should be green";
>+}
>+
>+// Validates disabling cull face really disables it.
>+TEST_P(SimpleStateChangeTest, EnableAndDisableCullFace)
>+{
>+    ANGLE_GL_PROGRAM(program, essl1_shaders::vs::Simple(), essl1_shaders::fs::Red());
>+    glUseProgram(program);
>+
>+    glClear(GL_COLOR_BUFFER_BIT);
>+    glEnable(GL_CULL_FACE);
>+
>+    glCullFace(GL_FRONT);
>+
>+    drawQuad(program.get(), essl1_shaders::PositionAttrib(), 0.0f, 1.0f, true);
>+
>+    ASSERT_GL_NO_ERROR();
>+
>+    EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::transparentBlack);
>+
>+    // Disable cull face and redraw, then make sure we have the quad drawn.
>+    glDisable(GL_CULL_FACE);
>+
>+    drawQuad(program.get(), essl1_shaders::PositionAttrib(), 0.0f, 1.0f, true);
>+
>+    ASSERT_GL_NO_ERROR();
>+
>+    EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::red);
>+}
>+
>+TEST_P(SimpleStateChangeTest, ScissorTest)
>+{
>+    // This test validates this order of state changes:
>+    // 1- Set scissor but don't enable it, validate its not used.
>+    // 2- Enable it and validate its working.
>+    // 3- Disable the scissor validate its not used anymore.
>+
>+    ANGLE_GL_PROGRAM(program, essl1_shaders::vs::Simple(), essl1_shaders::fs::Red());
>+
>+    glClear(GL_COLOR_BUFFER_BIT);
>+
>+    // Set the scissor region, but don't enable it yet.
>+    glScissor(getWindowWidth() / 4, getWindowHeight() / 4, getWindowWidth() / 2,
>+              getWindowHeight() / 2);
>+
>+    // Fill the whole screen with a quad.
>+    drawQuad(program.get(), essl1_shaders::PositionAttrib(), 0.0f, 1.0f, true);
>+
>+    ASSERT_GL_NO_ERROR();
>+
>+    // Test outside, scissor isnt enabled so its red.
>+    EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::red);
>+
>+    // Test inside, red of the fragment shader.
>+    EXPECT_PIXEL_COLOR_EQ(getWindowWidth() / 2, getWindowHeight() / 2, GLColor::red);
>+
>+    // Clear everything and start over with the test enabled.
>+    glClear(GL_COLOR_BUFFER_BIT);
>+    glEnable(GL_SCISSOR_TEST);
>+
>+    drawQuad(program.get(), essl1_shaders::PositionAttrib(), 0.0f, 1.0f, true);
>+
>+    ASSERT_GL_NO_ERROR();
>+
>+    // Test outside the scissor test, pitch black.
>+    EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::transparentBlack);
>+
>+    // Test inside, red of the fragment shader.
>+    EXPECT_PIXEL_COLOR_EQ(getWindowWidth() / 2, getWindowHeight() / 2, GLColor::red);
>+
>+    // Now disable the scissor test, do it again, and verify the region isn't used
>+    // for the scissor test.
>+    glDisable(GL_SCISSOR_TEST);
>+
>+    // Clear everything and start over with the test enabled.
>+    glClear(GL_COLOR_BUFFER_BIT);
>+
>+    drawQuad(program.get(), essl1_shaders::PositionAttrib(), 0.0f, 1.0f, true);
>+
>+    ASSERT_GL_NO_ERROR();
>+
>+    // Test outside, scissor isnt enabled so its red.
>+    EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::red);
>+
>+    // Test inside, red of the fragment shader.
>+    EXPECT_PIXEL_COLOR_EQ(getWindowWidth() / 2, getWindowHeight() / 2, GLColor::red);
>+}
>+
>+// This test validates we are able to change the valid of a uniform dynamically.
>+TEST_P(SimpleStateChangeTest, UniformUpdateTest)
>+{
>+    constexpr char kPositionUniformVertexShader[] = R"(
>+precision mediump float;
>+attribute vec2 position;
>+uniform vec2 uniPosModifier;
>+void main()
>+{
>+    gl_Position = vec4(position + uniPosModifier, 0, 1);
>+})";
>+
>+    ANGLE_GL_PROGRAM(program, kPositionUniformVertexShader, essl1_shaders::fs::UniformColor());
>+    glUseProgram(program);
>+
>+    glClearColor(0.0f, 0.0f, 0.0f, 1.0f);
>+    glClear(GL_COLOR_BUFFER_BIT);
>+
>+    GLint posUniformLocation = glGetUniformLocation(program, "uniPosModifier");
>+    ASSERT_NE(posUniformLocation, -1);
>+    GLint colorUniformLocation = glGetUniformLocation(program, essl1_shaders::ColorUniform());
>+    ASSERT_NE(colorUniformLocation, -1);
>+
>+    // draw a red quad to the left side.
>+    glUniform2f(posUniformLocation, -0.5, 0.0);
>+    glUniform4f(colorUniformLocation, 1.0, 0.0, 0.0, 1.0);
>+    drawQuad(program.get(), "position", 0.0f, 0.5f, true);
>+
>+    // draw a green quad to the right side.
>+    glUniform2f(posUniformLocation, 0.5, 0.0);
>+    glUniform4f(colorUniformLocation, 0.0, 1.0, 0.0, 1.0);
>+    drawQuad(program.get(), "position", 0.0f, 0.5f, true);
>+
>+    ASSERT_GL_NO_ERROR();
>+
>+    // Test the center of the left quad. Should be red.
>+    EXPECT_PIXEL_COLOR_EQ(getWindowWidth() / 4, getWindowHeight() / 2, GLColor::red);
>+
>+    // Test the center of the right quad. Should be green.
>+    EXPECT_PIXEL_COLOR_EQ(getWindowWidth() / 4 * 3, getWindowHeight() / 2, GLColor::green);
>+}
>+
>+// Tests that changing the storage of a Renderbuffer currently in use by GL works as expected.
>+TEST_P(SimpleStateChangeTest, RedefineRenderbufferInUse)
>+{
>+    GLRenderbuffer renderbuffer;
>+    glBindRenderbuffer(GL_RENDERBUFFER, renderbuffer);
>+    glRenderbufferStorage(GL_RENDERBUFFER, GL_RGBA8, 16, 16);
>+
>+    GLFramebuffer framebuffer;
>+    glBindFramebuffer(GL_FRAMEBUFFER, framebuffer);
>+    glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_RENDERBUFFER, renderbuffer);
>+
>+    ASSERT_GL_NO_ERROR();
>+    ASSERT_GLENUM_EQ(GL_FRAMEBUFFER_COMPLETE, glCheckFramebufferStatus(GL_FRAMEBUFFER));
>+
>+    ANGLE_GL_PROGRAM(program, kSimpleVertexShader, kSimpleFragmentShader);
>+    GLint colorLoc = glGetAttribLocation(program, "color");
>+    ASSERT_NE(-1, colorLoc);
>+
>+    // Set up and draw red to the left half the screen.
>+    std::vector<GLColor> redData(6, GLColor::red);
>+    GLBuffer vertexBufferRed;
>+    glBindBuffer(GL_ARRAY_BUFFER, vertexBufferRed);
>+    glBufferData(GL_ARRAY_BUFFER, redData.size() * sizeof(GLColor), redData.data(), GL_STATIC_DRAW);
>+    glVertexAttribPointer(colorLoc, 4, GL_UNSIGNED_BYTE, GL_TRUE, 0, nullptr);
>+    glEnableVertexAttribArray(colorLoc);
>+
>+    glViewport(0, 0, 16, 16);
>+    drawQuad(program, "position", 0.5f, 1.0f, true);
>+
>+    // Immediately redefine the Renderbuffer.
>+    glRenderbufferStorage(GL_RENDERBUFFER, GL_RGBA8, 64, 64);
>+
>+    // Set up and draw green to the right half of the screen.
>+    std::vector<GLColor> greenData(6, GLColor::green);
>+    GLBuffer vertexBufferGreen;
>+    glBindBuffer(GL_ARRAY_BUFFER, vertexBufferGreen);
>+    glBufferData(GL_ARRAY_BUFFER, greenData.size() * sizeof(GLColor), greenData.data(),
>+                 GL_STATIC_DRAW);
>+    glVertexAttribPointer(colorLoc, 4, GL_UNSIGNED_BYTE, GL_TRUE, 0, nullptr);
>+    glEnableVertexAttribArray(colorLoc);
>+
>+    glViewport(0, 0, 64, 64);
>+    drawQuad(program, "position", 0.5f, 1.0f, true);
>+
>+    ASSERT_GL_NO_ERROR();
>+    EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::green);
>+}
>+
>+// Validate that we can draw -> change frame buffer size -> draw and we'll be rendering
>+// at the full size of the new framebuffer.
>+TEST_P(SimpleStateChangeTest, ChangeFramebufferSizeBetweenTwoDraws)
>+{
>+    constexpr size_t kSmallTextureSize = 2;
>+    constexpr size_t kBigTextureSize   = 4;
>+
>+    // Create 2 textures, one of 2x2 and the other 4x4
>+    GLTexture texture1;
>+    glBindTexture(GL_TEXTURE_2D, texture1);
>+    glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, kSmallTextureSize, kSmallTextureSize, 0, GL_RGBA,
>+                 GL_UNSIGNED_BYTE, nullptr);
>+    ASSERT_GL_NO_ERROR();
>+
>+    GLTexture texture2;
>+    glBindTexture(GL_TEXTURE_2D, texture2);
>+    glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, kBigTextureSize, kBigTextureSize, 0, GL_RGBA,
>+                 GL_UNSIGNED_BYTE, nullptr);
>+    ASSERT_GL_NO_ERROR();
>+
>+    // A framebuffer for each texture to draw on.
>+    GLFramebuffer framebuffer1;
>+    glBindFramebuffer(GL_FRAMEBUFFER, framebuffer1);
>+    glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, texture1, 0);
>+    ASSERT_GL_NO_ERROR();
>+    ASSERT_GLENUM_EQ(GL_FRAMEBUFFER_COMPLETE, glCheckFramebufferStatus(GL_FRAMEBUFFER));
>+
>+    GLFramebuffer framebuffer2;
>+    glBindFramebuffer(GL_FRAMEBUFFER, framebuffer2);
>+    glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, texture2, 0);
>+    ASSERT_GL_NO_ERROR();
>+    ASSERT_GLENUM_EQ(GL_FRAMEBUFFER_COMPLETE, glCheckFramebufferStatus(GL_FRAMEBUFFER));
>+
>+    ANGLE_GL_PROGRAM(program, essl1_shaders::vs::Simple(), essl1_shaders::fs::UniformColor());
>+    glUseProgram(program);
>+    GLint uniformLocation = glGetUniformLocation(program, essl1_shaders::ColorUniform());
>+    ASSERT_NE(uniformLocation, -1);
>+
>+    // Bind to the first framebuffer for drawing.
>+    glBindFramebuffer(GL_FRAMEBUFFER, framebuffer1);
>+
>+    // Set a scissor, that will trigger setting the internal scissor state in Vulkan to
>+    // (0,0,framebuffer.width, framebuffer.height) size since the scissor isn't enabled.
>+    glScissor(0, 0, 16, 16);
>+    ASSERT_GL_NO_ERROR();
>+
>+    // Set color to red.
>+    glUniform4f(uniformLocation, 1.0f, 0.0f, 0.0f, 1.0f);
>+    glViewport(0, 0, kSmallTextureSize, kSmallTextureSize);
>+
>+    // Draw a full sized red quad
>+    drawQuad(program, essl1_shaders::PositionAttrib(), 1.0f, 1.0f, true);
>+    ASSERT_GL_NO_ERROR();
>+
>+    // Bind to the second (bigger) framebuffer
>+    glBindFramebuffer(GL_FRAMEBUFFER, framebuffer2);
>+    glViewport(0, 0, kBigTextureSize, kBigTextureSize);
>+
>+    ASSERT_GL_NO_ERROR();
>+
>+    // Set color to green.
>+    glUniform4f(uniformLocation, 0.0f, 1.0f, 0.0f, 1.0f);
>+
>+    // Draw again and we should fill everything with green and expect everything to be green.
>+    drawQuad(program, essl1_shaders::PositionAttrib(), 1.0f, 1.0f, true);
>+    ASSERT_GL_NO_ERROR();
>+
>+    EXPECT_PIXEL_RECT_EQ(0, 0, kBigTextureSize, kBigTextureSize, GLColor::green);
>+}
>+
>+// Tries to relink a program in use and use it again to draw something else.
>+TEST_P(SimpleStateChangeTest, RelinkProgram)
>+{
>+    const GLuint program = glCreateProgram();
>+
>+    GLuint vs     = CompileShader(GL_VERTEX_SHADER, essl1_shaders::vs::Simple());
>+    GLuint blueFs = CompileShader(GL_FRAGMENT_SHADER, essl1_shaders::fs::Blue());
>+    GLuint redFs  = CompileShader(GL_FRAGMENT_SHADER, essl1_shaders::fs::Red());
>+
>+    glAttachShader(program, vs);
>+    glAttachShader(program, blueFs);
>+
>+    glLinkProgram(program);
>+    CheckLinkStatusAndReturnProgram(program, true);
>+
>+    glClear(GL_COLOR_BUFFER_BIT);
>+    std::vector<Vector3> vertices = {{-1.0f, -1.0f, 0.0f}, {1.0f, 1.0f, 0.0f}, {1.0f, -1.0f, 0.0f},
>+                                     {-1.0f, -1.0f, 0.0f}, {1.0f, 1.0f, 0.0f}, {-1.0, 1.0f, 0.0f}};
>+    GLBuffer vertexBuffer;
>+    glBindBuffer(GL_ARRAY_BUFFER, vertexBuffer);
>+    glBufferData(GL_ARRAY_BUFFER, sizeof(vertices[0]) * vertices.size(), vertices.data(),
>+                 GL_STATIC_DRAW);
>+    const GLint positionLocation = glGetAttribLocation(program, essl1_shaders::PositionAttrib());
>+    ASSERT_NE(-1, positionLocation);
>+    glVertexAttribPointer(positionLocation, 3, GL_FLOAT, GL_FALSE, 0, nullptr);
>+    glEnableVertexAttribArray(positionLocation);
>+
>+    // Draw a blue triangle to the right
>+    glUseProgram(program);
>+    glDrawArrays(GL_TRIANGLES, 0, 3);
>+
>+    // Relink to draw red to the left
>+    glDetachShader(program, blueFs);
>+    glAttachShader(program, redFs);
>+
>+    glLinkProgram(program);
>+    CheckLinkStatusAndReturnProgram(program, true);
>+
>+    glDrawArrays(GL_TRIANGLES, 3, 3);
>+
>+    ASSERT_GL_NO_ERROR();
>+
>+    glDisableVertexAttribArray(positionLocation);
>+
>+    // Verify we drew red and green in the right places.
>+    EXPECT_PIXEL_COLOR_EQ(getWindowWidth() / 2, 0, GLColor::blue);
>+    EXPECT_PIXEL_COLOR_EQ(0, getWindowHeight() / 2, GLColor::red);
>+
>+    glDeleteShader(vs);
>+    glDeleteShader(blueFs);
>+    glDeleteShader(redFs);
>+    glDeleteProgram(program);
>+}
>+
>+// Creates a program that uses uniforms and then immediately release it and then use it. Should be
>+// valid.
>+TEST_P(SimpleStateChangeTest, ReleaseShaderInUseThatReadsFromUniforms)
>+{
>+    ANGLE_GL_PROGRAM(program, essl1_shaders::vs::Simple(), essl1_shaders::fs::UniformColor());
>+    glUseProgram(program);
>+
>+    const GLint uniformLoc = glGetUniformLocation(program, essl1_shaders::ColorUniform());
>+    EXPECT_NE(-1, uniformLoc);
>+
>+    // Set color to red.
>+    glUniform4f(uniformLoc, 1.0f, 0.0f, 0.0f, 1.0f);
>+
>+    glClear(GL_COLOR_BUFFER_BIT);
>+    std::vector<Vector3> vertices = {{-1.0f, -1.0f, 0.0f}, {1.0f, 1.0f, 0.0f}, {1.0f, -1.0f, 0.0f}};
>+    GLBuffer vertexBuffer;
>+    glBindBuffer(GL_ARRAY_BUFFER, vertexBuffer);
>+    glBufferData(GL_ARRAY_BUFFER, sizeof(vertices[0]) * vertices.size(), vertices.data(),
>+                 GL_STATIC_DRAW);
>+    const GLint positionLocation = glGetAttribLocation(program, essl1_shaders::PositionAttrib());
>+    ASSERT_NE(-1, positionLocation);
>+    glVertexAttribPointer(positionLocation, 3, GL_FLOAT, GL_FALSE, 0, nullptr);
>+    glEnableVertexAttribArray(positionLocation);
>+
>+    // Release program while its in use.
>+    glDeleteProgram(program);
>+
>+    // Draw a red triangle
>+    glDrawArrays(GL_TRIANGLES, 0, 3);
>+
>+    // Set color to green
>+    glUniform4f(uniformLoc, 1.0f, 0.0f, 0.0f, 1.0f);
>+
>+    // Draw a green triangle
>+    glDrawArrays(GL_TRIANGLES, 0, 3);
>+
>+    ASSERT_GL_NO_ERROR();
>+
>+    glDisableVertexAttribArray(positionLocation);
>+
>+    glUseProgram(0);
>+
>+    // Verify we drew red in the end since thats the last draw.
>+    EXPECT_PIXEL_COLOR_EQ(getWindowWidth() / 2, 0, GLColor::red);
>+}
>+
>+// Tests that sampler sync isn't masked by program textures.
>+TEST_P(SimpleStateChangeTestES3, SamplerSyncNotTiedToProgram)
>+{
>+    // Create a sampler with NEAREST filtering.
>+    GLSampler sampler;
>+    glBindSampler(0, sampler);
>+    glSamplerParameteri(sampler, GL_TEXTURE_WRAP_R, GL_CLAMP_TO_EDGE);
>+    glSamplerParameteri(sampler, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
>+    glSamplerParameteri(sampler, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
>+    glSamplerParameteri(sampler, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
>+    glSamplerParameteri(sampler, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
>+    ASSERT_GL_NO_ERROR();
>+
>+    // Draw with a program that uses no textures.
>+    ANGLE_GL_PROGRAM(program1, essl1_shaders::vs::Simple(), essl1_shaders::fs::Blue());
>+    drawQuad(program1, essl1_shaders::PositionAttrib(), 0.5f);
>+    ASSERT_GL_NO_ERROR();
>+    EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::blue);
>+
>+    // Create a simple texture with four colors and linear filtering.
>+    constexpr GLsizei kSize       = 2;
>+    std::array<GLColor, 4> pixels = {
>+        {GLColor::red, GLColor::green, GLColor::blue, GLColor::yellow}};
>+    GLTexture redTex;
>+    glBindTexture(GL_TEXTURE_2D, redTex);
>+    glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, kSize, kSize, 0, GL_RGBA, GL_UNSIGNED_BYTE,
>+                 pixels.data());
>+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_R, GL_CLAMP_TO_EDGE);
>+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
>+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
>+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
>+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
>+
>+    // Create a program that uses the texture.
>+    constexpr char kVS[] = R"(attribute vec4 position;
>+varying vec2 texCoord;
>+void main()
>+{
>+    gl_Position = position;
>+    texCoord = position.xy * 0.5 + vec2(0.5);
>+})";
>+
>+    constexpr char kFS[] = R"(precision mediump float;
>+varying vec2 texCoord;
>+uniform sampler2D tex;
>+void main()
>+{
>+    gl_FragColor = texture2D(tex, texCoord);
>+})";
>+
>+    // Draw. The sampler should override the clamp wrap mode with nearest.
>+    ANGLE_GL_PROGRAM(program2, kVS, kFS);
>+    ASSERT_EQ(0, glGetUniformLocation(program2, "tex"));
>+    drawQuad(program2, "position", 0.5f);
>+    ASSERT_GL_NO_ERROR();
>+
>+    constexpr int kHalfSize = kWindowSize / 2;
>+
>+    EXPECT_PIXEL_RECT_EQ(0, 0, kHalfSize, kHalfSize, GLColor::red);
>+    EXPECT_PIXEL_RECT_EQ(kHalfSize, 0, kHalfSize, kHalfSize, GLColor::green);
>+    EXPECT_PIXEL_RECT_EQ(0, kHalfSize, kHalfSize, kHalfSize, GLColor::blue);
>+    EXPECT_PIXEL_RECT_EQ(kHalfSize, kHalfSize, kHalfSize, kHalfSize, GLColor::yellow);
>+}
>+
>+// Tests that deleting an in-flight image texture does not immediately delete the resource.
>+TEST_P(SimpleStateChangeTestES31, DeleteImageTextureInUse)
>+{
>+    std::array<GLColor, 4> colors = {
>+        {GLColor::red, GLColor::green, GLColor::blue, GLColor::yellow}};
>+    GLTexture texRead;
>+    glBindTexture(GL_TEXTURE_2D, texRead);
>+    glTexStorage2D(GL_TEXTURE_2D, 1, GL_RGBA8, 2, 2);
>+    glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, 2, 2, GL_RGBA, GL_UNSIGNED_BYTE, colors.data());
>+    EXPECT_GL_NO_ERROR();
>+
>+    glUseProgram(mProgram);
>+
>+    glBindImageTexture(0, texRead, 0, GL_FALSE, 0, GL_READ_ONLY, GL_RGBA8);
>+    glDispatchCompute(1, 1, 1);
>+    texRead.reset();
>+
>+    std::array<GLColor, 4> results;
>+    glReadPixels(0, 0, 2, 2, GL_RGBA, GL_UNSIGNED_BYTE, results.data());
>+    EXPECT_GL_NO_ERROR();
>+
>+    for (int i = 0; i < 4; i++)
>+    {
>+        EXPECT_EQ(colors[i], results[i]);
>+    }
>+}
>+
>+// Tests that bind the same image texture all the time between different dispatch calls.
>+TEST_P(SimpleStateChangeTestES31, RebindImageTextureDispatchAgain)
>+{
>+    std::array<GLColor, 4> colors = {{GLColor::cyan, GLColor::cyan, GLColor::cyan, GLColor::cyan}};
>+    GLTexture texRead;
>+    glBindTexture(GL_TEXTURE_2D, texRead);
>+    glTexStorage2D(GL_TEXTURE_2D, 1, GL_RGBA8, 2, 2);
>+    glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, 2, 2, GL_RGBA, GL_UNSIGNED_BYTE, colors.data());
>+
>+    glUseProgram(mProgram);
>+
>+    glBindImageTexture(0, texRead, 0, GL_FALSE, 0, GL_READ_ONLY, GL_RGBA8);
>+    glDispatchCompute(1, 1, 1);
>+
>+    // Bind again
>+    glBindImageTexture(0, texRead, 0, GL_FALSE, 0, GL_READ_ONLY, GL_RGBA8);
>+    glDispatchCompute(1, 1, 1);
>+    EXPECT_GL_NO_ERROR();
>+
>+    EXPECT_PIXEL_RECT_EQ(0, 0, 2, 2, GLColor::cyan);
>+}
>+
>+// Tests that we can dispatch with an image texture, modify the image texture with a texSubImage,
>+// and then dispatch again correctly.
>+TEST_P(SimpleStateChangeTestES31, DispatchWithImageTextureTexSubImageThenDispatchAgain)
>+{
>+    std::array<GLColor, 4> colors    = {{GLColor::red, GLColor::red, GLColor::red, GLColor::red}};
>+    std::array<GLColor, 4> subColors = {
>+        {GLColor::green, GLColor::green, GLColor::green, GLColor::green}};
>+
>+    GLTexture texRead;
>+    glBindTexture(GL_TEXTURE_2D, texRead);
>+    glTexStorage2D(GL_TEXTURE_2D, 1, GL_RGBA8, 2, 2);
>+    glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, 2, 2, GL_RGBA, GL_UNSIGNED_BYTE, colors.data());
>+
>+    glUseProgram(mProgram);
>+
>+    glBindImageTexture(0, texRead, 0, GL_FALSE, 0, GL_READ_ONLY, GL_RGBA8);
>+    glDispatchCompute(1, 1, 1);
>+
>+    // Update bottom-half of image texture with green.
>+    glBindTexture(GL_TEXTURE_2D, texRead);
>+    glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, 2, 1, GL_RGBA, GL_UNSIGNED_BYTE, subColors.data());
>+    ASSERT_GL_NO_ERROR();
>+
>+    // Dispatch again, should still work.
>+    glDispatchCompute(1, 1, 1);
>+    ASSERT_GL_NO_ERROR();
>+
>+    // Validate first half of the image is red and the bottom is green.
>+    std::array<GLColor, 4> results;
>+    glReadPixels(0, 0, 2, 2, GL_RGBA, GL_UNSIGNED_BYTE, results.data());
>+    EXPECT_GL_NO_ERROR();
>+
>+    EXPECT_EQ(GLColor::green, results[0]);
>+    EXPECT_EQ(GLColor::green, results[1]);
>+    EXPECT_EQ(GLColor::red, results[2]);
>+    EXPECT_EQ(GLColor::red, results[3]);
>+}
>+
>+// Test updating an image texture's contents while in use by GL works as expected.
>+TEST_P(SimpleStateChangeTestES31, UpdateImageTextureInUse)
>+{
>+    std::array<GLColor, 4> rgby = {{GLColor::red, GLColor::green, GLColor::blue, GLColor::yellow}};
>+
>+    GLTexture texRead;
>+    glBindTexture(GL_TEXTURE_2D, texRead);
>+    glTexStorage2D(GL_TEXTURE_2D, 1, GL_RGBA8, 2, 2);
>+    glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, 2, 2, GL_RGBA, GL_UNSIGNED_BYTE, rgby.data());
>+
>+    glUseProgram(mProgram);
>+
>+    glBindImageTexture(0, texRead, 0, GL_FALSE, 0, GL_READ_ONLY, GL_RGBA8);
>+    glDispatchCompute(1, 1, 1);
>+
>+    // Update the texture to be YBGR, while the Texture is in-use. Should not affect the dispatch.
>+    std::array<GLColor, 4> ybgr = {{GLColor::yellow, GLColor::blue, GLColor::green, GLColor::red}};
>+    glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, 2, 2, GL_RGBA, GL_UNSIGNED_BYTE, ybgr.data());
>+    ASSERT_GL_NO_ERROR();
>+
>+    // Check the Framebuffer. The dispatch call should have completed with the original RGBY data.
>+    EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::red);
>+    EXPECT_PIXEL_COLOR_EQ(1, 0, GLColor::green);
>+    EXPECT_PIXEL_COLOR_EQ(0, 1, GLColor::blue);
>+    EXPECT_PIXEL_COLOR_EQ(1, 1, GLColor::yellow);
>+
>+    // Dispatch again. The second dispatch call should use the updated YBGR data.
>+    glDispatchCompute(1, 1, 1);
>+
>+    EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::yellow);
>+    EXPECT_PIXEL_COLOR_EQ(1, 0, GLColor::blue);
>+    EXPECT_PIXEL_COLOR_EQ(0, 1, GLColor::green);
>+    EXPECT_PIXEL_COLOR_EQ(1, 1, GLColor::red);
>+    ASSERT_GL_NO_ERROR();
>+}
>+
>+// Test that we can alternate between image textures between different dispatchs.
>+TEST_P(SimpleStateChangeTestES31, DispatchImageTextureAThenTextureBThenTextureA)
>+{
>+    // TODO(syoussefi): Flaky, needs investigation. http://anglebug.com/3044
>+    ANGLE_SKIP_TEST_IF(IsLinux() && IsIntel() && IsDesktopOpenGL());
>+
>+    std::array<GLColor, 4> colorsTexA = {
>+        {GLColor::cyan, GLColor::cyan, GLColor::cyan, GLColor::cyan}};
>+
>+    std::array<GLColor, 4> colorsTexB = {
>+        {GLColor::magenta, GLColor::magenta, GLColor::magenta, GLColor::magenta}};
>+
>+    GLTexture texA;
>+    glBindTexture(GL_TEXTURE_2D, texA);
>+    glTexStorage2D(GL_TEXTURE_2D, 1, GL_RGBA8, 2, 2);
>+    glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, 2, 2, GL_RGBA, GL_UNSIGNED_BYTE, colorsTexA.data());
>+    GLTexture texB;
>+    glBindTexture(GL_TEXTURE_2D, texB);
>+    glTexStorage2D(GL_TEXTURE_2D, 1, GL_RGBA8, 2, 2);
>+    glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, 2, 2, GL_RGBA, GL_UNSIGNED_BYTE, colorsTexB.data());
>+
>+    glUseProgram(mProgram);
>+
>+    glBindImageTexture(0, texA, 0, GL_FALSE, 0, GL_READ_ONLY, GL_RGBA8);
>+    glDispatchCompute(1, 1, 1);
>+
>+    glBindImageTexture(0, texB, 0, GL_FALSE, 0, GL_READ_ONLY, GL_RGBA8);
>+    glDispatchCompute(1, 1, 1);
>+
>+    glBindImageTexture(0, texA, 0, GL_FALSE, 0, GL_READ_ONLY, GL_RGBA8);
>+    glDispatchCompute(1, 1, 1);
>+
>+    EXPECT_PIXEL_RECT_EQ(0, 0, 2, 2, GLColor::cyan);
>+    ASSERT_GL_NO_ERROR();
>+}
>+
>+static constexpr char kColorVS[] = R"(attribute vec2 position;
>+attribute vec4 color;
>+varying vec4 vColor;
>+void main()
>+{
>+    gl_Position = vec4(position, 0, 1);
>+    vColor = color;
>+})";
>+
>+static constexpr char kColorFS[] = R"(precision mediump float;
>+varying vec4 vColor;
>+void main()
>+{
>+    gl_FragColor = vColor;
>+})";
>+
>+class ValidationStateChangeTest : public ANGLETest
>+{
>+  protected:
>+    ValidationStateChangeTest()
>+    {
>+        setWindowWidth(64);
>+        setWindowHeight(64);
>+        setConfigRedBits(8);
>+        setConfigGreenBits(8);
>+        setConfigBlueBits(8);
>+        setConfigAlphaBits(8);
>+    }
>+};
>+
>+class WebGL2ValidationStateChangeTest : public ValidationStateChangeTest
>+{
>+  protected:
>+    WebGL2ValidationStateChangeTest() { setWebGLCompatibilityEnabled(true); }
>+};
>+
>+class ValidationStateChangeTestES31 : public ANGLETest
>+{};
>+
>+class WebGLComputeValidationStateChangeTest : public ANGLETest
>+{
>+  public:
>+    WebGLComputeValidationStateChangeTest() { setWebGLCompatibilityEnabled(true); }
>+};
>+
>+// Tests that mapping and unmapping an array buffer in various ways causes rendering to fail.
>+// This isn't guaranteed to produce an error by GL. But we assume ANGLE always errors.
>+TEST_P(ValidationStateChangeTest, MapBufferAndDraw)
>+{
>+    // Initialize program and set up state.
>+    ANGLE_GL_PROGRAM(program, kColorVS, kColorFS);
>+
>+    glUseProgram(program);
>+    GLint positionLoc = glGetAttribLocation(program, "position");
>+    ASSERT_NE(-1, positionLoc);
>+    GLint colorLoc = glGetAttribLocation(program, "color");
>+    ASSERT_NE(-1, colorLoc);
>+
>+    const std::array<Vector3, 6> &quadVertices = GetQuadVertices();
>+    const size_t posBufferSize                 = quadVertices.size() * sizeof(Vector3);
>+
>+    GLBuffer posBuffer;
>+    glBindBuffer(GL_ARRAY_BUFFER, posBuffer);
>+    glBufferData(GL_ARRAY_BUFFER, posBufferSize, quadVertices.data(), GL_STATIC_DRAW);
>+
>+    // Start with position enabled.
>+    glVertexAttribPointer(positionLoc, 3, GL_FLOAT, GL_FALSE, 0, nullptr);
>+    glEnableVertexAttribArray(positionLoc);
>+
>+    std::vector<GLColor> colorVertices(6, GLColor::blue);
>+    const size_t colorBufferSize = sizeof(GLColor) * 6;
>+
>+    GLBuffer colorBuffer;
>+    glBindBuffer(GL_ARRAY_BUFFER, colorBuffer);
>+    glBufferData(GL_ARRAY_BUFFER, colorBufferSize, colorVertices.data(), GL_STATIC_DRAW);
>+
>+    // Start with color disabled.
>+    glVertexAttribPointer(colorLoc, 4, GL_UNSIGNED_BYTE, GL_TRUE, 0, nullptr);
>+    glDisableVertexAttribArray(colorLoc);
>+
>+    ASSERT_GL_NO_ERROR();
>+
>+    // Draw without a mapped buffer. Should succeed.
>+    glVertexAttrib4f(colorLoc, 0, 1, 0, 1);
>+    glDrawArrays(GL_TRIANGLES, 0, 6);
>+    ASSERT_GL_NO_ERROR();
>+    EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::green);
>+
>+    // Map position buffer and draw. Should fail.
>+    glBindBuffer(GL_ARRAY_BUFFER, posBuffer);
>+    glMapBufferRange(GL_ARRAY_BUFFER, 0, posBufferSize, GL_MAP_READ_BIT);
>+    ASSERT_GL_NO_ERROR();
>+
>+    glDrawArrays(GL_TRIANGLES, 0, 6);
>+    EXPECT_GL_ERROR(GL_INVALID_OPERATION) << "Map position buffer and draw should fail.";
>+    glUnmapBuffer(GL_ARRAY_BUFFER);
>+
>+    // Map then enable color buffer. Should fail.
>+    glBindBuffer(GL_ARRAY_BUFFER, colorBuffer);
>+    glMapBufferRange(GL_ARRAY_BUFFER, 0, colorBufferSize, GL_MAP_READ_BIT);
>+    glEnableVertexAttribArray(colorLoc);
>+    ASSERT_GL_NO_ERROR();
>+
>+    glDrawArrays(GL_TRIANGLES, 0, 6);
>+    EXPECT_GL_ERROR(GL_INVALID_OPERATION) << "Map then enable color buffer should fail.";
>+
>+    // Unmap then draw. Should succeed.
>+    glUnmapBuffer(GL_ARRAY_BUFFER);
>+    ASSERT_GL_NO_ERROR();
>+
>+    glDrawArrays(GL_TRIANGLES, 0, 6);
>+    ASSERT_GL_NO_ERROR();
>+    EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::blue);
>+}
>+
>+// Tests that changing a vertex binding with glVertexAttribDivisor updates the mapped buffer check.
>+TEST_P(ValidationStateChangeTestES31, MapBufferAndDrawWithDivisor)
>+{
>+    // Seems to trigger a GL error in some edge cases. http://anglebug.com/2755
>+    ANGLE_SKIP_TEST_IF(IsOpenGL() && IsNVIDIA());
>+
>+    // Initialize program and set up state.
>+    ANGLE_GL_PROGRAM(program, kColorVS, kColorFS);
>+
>+    glUseProgram(program);
>+    GLint positionLoc = glGetAttribLocation(program, "position");
>+    ASSERT_NE(-1, positionLoc);
>+    GLint colorLoc = glGetAttribLocation(program, "color");
>+    ASSERT_NE(-1, colorLoc);
>+
>+    // Create a user vertex array.
>+    GLVertexArray vao;
>+    glBindVertexArray(vao);
>+
>+    const std::array<Vector3, 6> &quadVertices = GetQuadVertices();
>+    const size_t posBufferSize                 = quadVertices.size() * sizeof(Vector3);
>+
>+    GLBuffer posBuffer;
>+    glBindBuffer(GL_ARRAY_BUFFER, posBuffer);
>+    glBufferData(GL_ARRAY_BUFFER, posBufferSize, quadVertices.data(), GL_STATIC_DRAW);
>+
>+    // Start with position enabled.
>+    glVertexAttribPointer(positionLoc, 3, GL_FLOAT, GL_FALSE, 0, nullptr);
>+    glEnableVertexAttribArray(positionLoc);
>+
>+    std::vector<GLColor> blueVertices(6, GLColor::blue);
>+    const size_t blueBufferSize = sizeof(GLColor) * 6;
>+
>+    GLBuffer blueBuffer;
>+    glBindBuffer(GL_ARRAY_BUFFER, blueBuffer);
>+    glBufferData(GL_ARRAY_BUFFER, blueBufferSize, blueVertices.data(), GL_STATIC_DRAW);
>+
>+    // Start with color enabled at an unused binding.
>+    constexpr GLint kUnusedBinding = 3;
>+    ASSERT_NE(colorLoc, kUnusedBinding);
>+    ASSERT_NE(positionLoc, kUnusedBinding);
>+    glVertexAttribFormat(colorLoc, 4, GL_UNSIGNED_BYTE, GL_TRUE, 0);
>+    glVertexAttribBinding(colorLoc, kUnusedBinding);
>+    glBindVertexBuffer(kUnusedBinding, blueBuffer, 0, sizeof(GLColor));
>+    glEnableVertexAttribArray(colorLoc);
>+
>+    // Make binding 'colorLoc' use a mapped buffer.
>+    std::vector<GLColor> greenVertices(6, GLColor::green);
>+    const size_t greenBufferSize = sizeof(GLColor) * 6;
>+    GLBuffer greenBuffer;
>+    glBindBuffer(GL_ARRAY_BUFFER, greenBuffer);
>+    glBufferData(GL_ARRAY_BUFFER, greenBufferSize, greenVertices.data(), GL_STATIC_DRAW);
>+    glMapBufferRange(GL_ARRAY_BUFFER, 0, greenBufferSize, GL_MAP_READ_BIT);
>+    glBindVertexBuffer(colorLoc, greenBuffer, 0, sizeof(GLColor));
>+
>+    ASSERT_GL_NO_ERROR();
>+
>+    // Draw without a mapped buffer. Should succeed.
>+    glDrawArrays(GL_TRIANGLES, 0, 6);
>+    ASSERT_GL_NO_ERROR();
>+    EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::blue);
>+
>+    // Change divisor with VertexAttribDivisor. Should fail.
>+    glVertexAttribDivisor(colorLoc, 0);
>+    ASSERT_GL_NO_ERROR();
>+    glDrawArrays(GL_TRIANGLES, 0, 6);
>+    EXPECT_GL_ERROR(GL_INVALID_OPERATION) << "draw with mapped buffer should fail.";
>+
>+    // Unmap the buffer. Should succeed.
>+    glUnmapBuffer(GL_ARRAY_BUFFER);
>+    glDrawArrays(GL_TRIANGLES, 0, 6);
>+    ASSERT_GL_NO_ERROR();
>+    EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::green);
>+}
>+
>+// Tests that changing a vertex binding with glVertexAttribDivisor updates the buffer size check.
>+TEST_P(WebGLComputeValidationStateChangeTest, DrawPastEndOfBufferWithDivisor)
>+{
>+    // Initialize program and set up state.
>+    ANGLE_GL_PROGRAM(program, kColorVS, kColorFS);
>+
>+    glUseProgram(program);
>+    GLint positionLoc = glGetAttribLocation(program, "position");
>+    ASSERT_NE(-1, positionLoc);
>+    GLint colorLoc = glGetAttribLocation(program, "color");
>+    ASSERT_NE(-1, colorLoc);
>+
>+    // Create a user vertex array.
>+    GLVertexArray vao;
>+    glBindVertexArray(vao);
>+
>+    const std::array<Vector3, 6> &quadVertices = GetQuadVertices();
>+    const size_t posBufferSize                 = quadVertices.size() * sizeof(Vector3);
>+
>+    GLBuffer posBuffer;
>+    glBindBuffer(GL_ARRAY_BUFFER, posBuffer);
>+    glBufferData(GL_ARRAY_BUFFER, posBufferSize, quadVertices.data(), GL_STATIC_DRAW);
>+
>+    // Start with position enabled.
>+    glVertexAttribPointer(positionLoc, 3, GL_FLOAT, GL_FALSE, 0, nullptr);
>+    glEnableVertexAttribArray(positionLoc);
>+
>+    std::vector<GLColor> blueVertices(6, GLColor::blue);
>+    const size_t blueBufferSize = sizeof(GLColor) * 6;
>+
>+    GLBuffer blueBuffer;
>+    glBindBuffer(GL_ARRAY_BUFFER, blueBuffer);
>+    glBufferData(GL_ARRAY_BUFFER, blueBufferSize, blueVertices.data(), GL_STATIC_DRAW);
>+
>+    // Start with color enabled at an unused binding.
>+    constexpr GLint kUnusedBinding = 3;
>+    ASSERT_NE(colorLoc, kUnusedBinding);
>+    ASSERT_NE(positionLoc, kUnusedBinding);
>+    glVertexAttribFormat(colorLoc, 4, GL_UNSIGNED_BYTE, GL_TRUE, 0);
>+    glVertexAttribBinding(colorLoc, kUnusedBinding);
>+    glBindVertexBuffer(kUnusedBinding, blueBuffer, 0, sizeof(GLColor));
>+    glEnableVertexAttribArray(colorLoc);
>+
>+    // Make binding 'colorLoc' use a small buffer.
>+    std::vector<GLColor> greenVertices(6, GLColor::green);
>+    const size_t greenBufferSize = sizeof(GLColor) * 3;
>+    GLBuffer greenBuffer;
>+    glBindBuffer(GL_ARRAY_BUFFER, greenBuffer);
>+    glBufferData(GL_ARRAY_BUFFER, greenBufferSize, greenVertices.data(), GL_STATIC_DRAW);
>+    glBindVertexBuffer(colorLoc, greenBuffer, 0, sizeof(GLColor));
>+
>+    ASSERT_GL_NO_ERROR();
>+
>+    // Draw without a mapped buffer. Should succeed.
>+    glDrawArrays(GL_TRIANGLES, 0, 6);
>+    ASSERT_GL_NO_ERROR();
>+    EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::blue);
>+
>+    // Change divisor with VertexAttribDivisor. Should fail.
>+    glVertexAttribDivisor(colorLoc, 0);
>+    ASSERT_GL_NO_ERROR();
>+    glDrawArrays(GL_TRIANGLES, 0, 6);
>+    EXPECT_GL_ERROR(GL_INVALID_OPERATION) << "draw with small buffer should fail.";
>+
>+    // Do a small draw. Should succeed.
>+    glDrawArrays(GL_TRIANGLES, 0, 3);
>+    ASSERT_GL_NO_ERROR();
>+    EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::green);
>+}
>+
>+// Tests state changes with uniform block validation.
>+TEST_P(ValidationStateChangeTest, UniformBlockNegativeAPI)
>+{
>+    constexpr char kVS[] = R"(#version 300 es
>+in vec2 position;
>+void main()
>+{
>+    gl_Position = vec4(position, 0, 1);
>+})";
>+
>+    constexpr char kFS[] = R"(#version 300 es
>+precision mediump float;
>+uniform uni { vec4 vec; };
>+out vec4 color;
>+void main()
>+{
>+    color = vec;
>+})";
>+
>+    ANGLE_GL_PROGRAM(program, kVS, kFS);
>+    glUseProgram(program);
>+
>+    GLuint blockIndex = glGetUniformBlockIndex(program, "uni");
>+    ASSERT_NE(GL_INVALID_INDEX, blockIndex);
>+
>+    glUniformBlockBinding(program, blockIndex, 0);
>+
>+    GLBuffer uniformBuffer;
>+    glBindBuffer(GL_UNIFORM_BUFFER, uniformBuffer);
>+    glBufferData(GL_UNIFORM_BUFFER, sizeof(GLColor32F), &kFloatGreen.R, GL_STATIC_DRAW);
>+    glBindBufferBase(GL_UNIFORM_BUFFER, 0, uniformBuffer);
>+
>+    const auto &quadVertices = GetQuadVertices();
>+
>+    GLBuffer positionBuffer;
>+    glBindBuffer(GL_ARRAY_BUFFER, positionBuffer);
>+    glBufferData(GL_ARRAY_BUFFER, quadVertices.size() * sizeof(Vector3), quadVertices.data(),
>+                 GL_STATIC_DRAW);
>+
>+    GLint positionLocation = glGetAttribLocation(program, "position");
>+    ASSERT_NE(-1, positionLocation);
>+
>+    glVertexAttribPointer(positionLocation, 3, GL_FLOAT, GL_FALSE, 0, nullptr);
>+    glEnableVertexAttribArray(positionLocation);
>+    ASSERT_GL_NO_ERROR();
>+
>+    // First draw should succeed.
>+    glDrawArrays(GL_TRIANGLES, 0, 6);
>+    ASSERT_GL_NO_ERROR();
>+    EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::green);
>+
>+    // Change the uniform block binding. Should fail.
>+    glUniformBlockBinding(program, blockIndex, 1);
>+    ASSERT_GL_NO_ERROR();
>+    glDrawArrays(GL_TRIANGLES, 0, 6);
>+    ASSERT_GL_ERROR(GL_INVALID_OPERATION) << "Invalid uniform block binding should fail";
>+
>+    // Reset to a correct state.
>+    glUniformBlockBinding(program, blockIndex, 0);
>+    glDrawArrays(GL_TRIANGLES, 0, 6);
>+    ASSERT_GL_NO_ERROR();
>+    EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::green);
>+
>+    // Change the buffer binding. Should fail.
>+    glBindBufferBase(GL_UNIFORM_BUFFER, 0, 0);
>+    ASSERT_GL_NO_ERROR();
>+    glDrawArrays(GL_TRIANGLES, 0, 6);
>+    ASSERT_GL_ERROR(GL_INVALID_OPERATION) << "Setting invalid uniform buffer should fail";
>+
>+    // Reset to a correct state.
>+    glBindBufferBase(GL_UNIFORM_BUFFER, 0, uniformBuffer);
>+    glDrawArrays(GL_TRIANGLES, 0, 6);
>+    ASSERT_GL_NO_ERROR();
>+    EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::green);
>+
>+    // Resize the buffer to be too small. Should fail.
>+    glBufferData(GL_UNIFORM_BUFFER, 1, nullptr, GL_STATIC_DRAW);
>+    glDrawArrays(GL_TRIANGLES, 0, 6);
>+    EXPECT_GL_ERROR(GL_INVALID_OPERATION) << "Invalid buffer size should fail";
>+}
>+
>+// Tests various state change effects on draw framebuffer validation.
>+TEST_P(WebGL2ValidationStateChangeTest, DrawFramebufferNegativeAPI)
>+{
>+    // Set up a simple draw from a Texture to a user Framebuffer.
>+    GLuint program = get2DTexturedQuadProgram();
>+    ASSERT_NE(0u, program);
>+    glUseProgram(program);
>+
>+    GLint posLoc = glGetAttribLocation(program, "position");
>+    ASSERT_NE(-1, posLoc);
>+
>+    const auto &quadVertices = GetQuadVertices();
>+
>+    GLBuffer positionBuffer;
>+    glBindBuffer(GL_ARRAY_BUFFER, positionBuffer);
>+    glBufferData(GL_ARRAY_BUFFER, sizeof(Vector3) * quadVertices.size(), quadVertices.data(),
>+                 GL_STATIC_DRAW);
>+
>+    glVertexAttribPointer(posLoc, 3, GL_FLOAT, GL_FALSE, 0, nullptr);
>+    glEnableVertexAttribArray(posLoc);
>+
>+    constexpr size_t kSize = 2;
>+
>+    GLTexture colorBufferTexture;
>+    glBindTexture(GL_TEXTURE_2D, colorBufferTexture);
>+    glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, kSize, kSize, 0, GL_RGBA, GL_UNSIGNED_BYTE, nullptr);
>+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
>+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
>+
>+    GLFramebuffer framebuffer;
>+    glBindFramebuffer(GL_FRAMEBUFFER, framebuffer);
>+    glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, colorBufferTexture,
>+                           0);
>+    ASSERT_GLENUM_EQ(GL_FRAMEBUFFER_COMPLETE, glCheckFramebufferStatus(GL_FRAMEBUFFER));
>+
>+    std::vector<GLColor> greenColor(kSize * kSize, GLColor::green);
>+
>+    GLTexture greenTexture;
>+    glBindTexture(GL_TEXTURE_2D, greenTexture);
>+    glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, kSize, kSize, 0, GL_RGBA, GL_UNSIGNED_BYTE,
>+                 greenColor.data());
>+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
>+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
>+
>+    // Second framebuffer with a feedback loop. Initially unbound.
>+    GLFramebuffer loopedFramebuffer;
>+    glBindFramebuffer(GL_FRAMEBUFFER, loopedFramebuffer);
>+    glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, greenTexture, 0);
>+    ASSERT_GLENUM_EQ(GL_FRAMEBUFFER_COMPLETE, glCheckFramebufferStatus(GL_FRAMEBUFFER));
>+    glBindFramebuffer(GL_FRAMEBUFFER, framebuffer);
>+
>+    ASSERT_GL_NO_ERROR();
>+
>+    glDrawArrays(GL_TRIANGLES, 0, 6);
>+    ASSERT_GL_NO_ERROR();
>+    EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::green);
>+
>+    // Create a rendering feedback loop. Should fail.
>+    glBindTexture(GL_TEXTURE_2D, colorBufferTexture);
>+    ASSERT_GL_NO_ERROR();
>+    glDrawArrays(GL_TRIANGLES, 0, 6);
>+    EXPECT_GL_ERROR(GL_INVALID_OPERATION);
>+
>+    // Reset to a valid state.
>+    glBindTexture(GL_TEXTURE_2D, greenTexture);
>+    glDrawArrays(GL_TRIANGLES, 0, 6);
>+    ASSERT_GL_NO_ERROR();
>+    EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::green);
>+
>+    // Bind a second framebuffer with a feedback loop.
>+    glBindFramebuffer(GL_FRAMEBUFFER, loopedFramebuffer);
>+    ASSERT_GL_NO_ERROR();
>+    glDrawArrays(GL_TRIANGLES, 0, 6);
>+    EXPECT_GL_ERROR(GL_INVALID_OPERATION);
>+
>+    // Update the framebuffer texture attachment. Should succeed.
>+    glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, colorBufferTexture,
>+                           0);
>+    glDrawArrays(GL_TRIANGLES, 0, 6);
>+    ASSERT_GL_NO_ERROR();
>+    EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::green);
>+}
>+
>+// Tests various state change effects on draw framebuffer validation with MRT.
>+TEST_P(WebGL2ValidationStateChangeTest, MultiAttachmentDrawFramebufferNegativeAPI)
>+{
>+    // Set up a program that writes to two outputs: one int and one float.
>+    constexpr char kVS[] = R"(#version 300 es
>+layout(location = 0) in vec2 position;
>+out vec2 texCoord;
>+void main()
>+{
>+    gl_Position = vec4(position, 0, 1);
>+    texCoord = position * 0.5 + vec2(0.5);
>+})";
>+
>+    constexpr char kFS[] = R"(#version 300 es
>+precision mediump float;
>+in vec2 texCoord;
>+layout(location = 0) out vec4 outFloat;
>+layout(location = 1) out uvec4 outInt;
>+void main()
>+{
>+    outFloat = vec4(0, 1, 0, 1);
>+    outInt = uvec4(0, 1, 0, 1);
>+})";
>+
>+    ANGLE_GL_PROGRAM(program, kVS, kFS);
>+    glUseProgram(program);
>+
>+    constexpr GLint kPosLoc = 0;
>+
>+    const auto &quadVertices = GetQuadVertices();
>+
>+    GLBuffer positionBuffer;
>+    glBindBuffer(GL_ARRAY_BUFFER, positionBuffer);
>+    glBufferData(GL_ARRAY_BUFFER, sizeof(Vector3) * quadVertices.size(), quadVertices.data(),
>+                 GL_STATIC_DRAW);
>+
>+    glVertexAttribPointer(kPosLoc, 3, GL_FLOAT, GL_FALSE, 0, nullptr);
>+    glEnableVertexAttribArray(kPosLoc);
>+
>+    constexpr size_t kSize = 2;
>+
>+    GLFramebuffer floatFramebuffer;
>+    glBindFramebuffer(GL_FRAMEBUFFER, floatFramebuffer);
>+
>+    GLTexture floatTextures[2];
>+    for (int i = 0; i < 2; ++i)
>+    {
>+        glBindTexture(GL_TEXTURE_2D, floatTextures[i]);
>+        glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, kSize, kSize, 0, GL_RGBA, GL_UNSIGNED_BYTE,
>+                     nullptr);
>+        glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0 + i, GL_TEXTURE_2D,
>+                               floatTextures[i], 0);
>+        ASSERT_GL_NO_ERROR();
>+    }
>+
>+    ASSERT_GLENUM_EQ(GL_FRAMEBUFFER_COMPLETE, glCheckFramebufferStatus(GL_FRAMEBUFFER));
>+
>+    GLFramebuffer intFramebuffer;
>+    glBindFramebuffer(GL_FRAMEBUFFER, intFramebuffer);
>+
>+    GLTexture intTextures[2];
>+    for (int i = 0; i < 2; ++i)
>+    {
>+        glBindTexture(GL_TEXTURE_2D, intTextures[i]);
>+        glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA8UI, kSize, kSize, 0, GL_RGBA_INTEGER,
>+                     GL_UNSIGNED_BYTE, nullptr);
>+        glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0 + i, GL_TEXTURE_2D,
>+                               intTextures[i], 0);
>+        ASSERT_GL_NO_ERROR();
>+    }
>+
>+    ASSERT_GLENUM_EQ(GL_FRAMEBUFFER_COMPLETE, glCheckFramebufferStatus(GL_FRAMEBUFFER));
>+
>+    ASSERT_GL_NO_ERROR();
>+
>+    constexpr GLenum kColor0Enabled[]     = {GL_COLOR_ATTACHMENT0, GL_NONE};
>+    constexpr GLenum kColor1Enabled[]     = {GL_NONE, GL_COLOR_ATTACHMENT1};
>+    constexpr GLenum kColor0And1Enabled[] = {GL_COLOR_ATTACHMENT0, GL_COLOR_ATTACHMENT1};
>+
>+    // Draw float. Should work.
>+    glBindFramebuffer(GL_FRAMEBUFFER, floatFramebuffer);
>+    glDrawBuffers(2, kColor0Enabled);
>+
>+    glDrawArrays(GL_TRIANGLES, 0, 6);
>+    ASSERT_GL_NO_ERROR() << "Draw to float texture with correct mask";
>+    EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::green);
>+
>+    // Set an invalid component write.
>+    glDrawBuffers(2, kColor0And1Enabled);
>+    ASSERT_GL_NO_ERROR() << "Draw to float texture with invalid mask";
>+    glDrawArrays(GL_TRIANGLES, 0, 6);
>+    EXPECT_GL_ERROR(GL_INVALID_OPERATION);
>+
>+    // Restore state.
>+    glDrawBuffers(2, kColor0Enabled);
>+    glDrawArrays(GL_TRIANGLES, 0, 6);
>+    ASSERT_GL_NO_ERROR() << "Draw to float texture with correct mask";
>+    EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::green);
>+
>+    // Bind an invalid framebuffer. Validate failure.
>+    glBindFramebuffer(GL_FRAMEBUFFER, intFramebuffer);
>+    ASSERT_GL_NO_ERROR();
>+    glDrawArrays(GL_TRIANGLES, 0, 6);
>+    EXPECT_GL_ERROR(GL_INVALID_OPERATION) << "Draw to int texture with default mask";
>+
>+    // Set draw mask to a valid mask. Validate success.
>+    glDrawBuffers(2, kColor1Enabled);
>+    glDrawArrays(GL_TRIANGLES, 0, 6);
>+    ASSERT_GL_NO_ERROR() << "Draw to int texture with correct mask";
>+}
>+
>+// Tests negative API state change cases with Transform Feedback bindings.
>+TEST_P(WebGL2ValidationStateChangeTest, TransformFeedbackNegativeAPI)
>+{
>+    ANGLE_SKIP_TEST_IF(IsAMD() && IsOSX());
>+
>+    constexpr char kFS[] = R"(#version 300 es
>+precision mediump float;
>+uniform block { vec4 color; };
>+out vec4 colorOut;
>+void main()
>+{
>+    colorOut = color;
>+})";
>+
>+    std::vector<std::string> tfVaryings = {"gl_Position"};
>+    ANGLE_GL_PROGRAM_TRANSFORM_FEEDBACK(program, essl3_shaders::vs::Simple(), kFS, tfVaryings,
>+                                        GL_INTERLEAVED_ATTRIBS);
>+    glUseProgram(program);
>+
>+    std::vector<Vector4> positionData;
>+    for (const Vector3 &quadVertex : GetQuadVertices())
>+    {
>+        positionData.emplace_back(quadVertex.x(), quadVertex.y(), quadVertex.z(), 1.0f);
>+    }
>+
>+    GLBuffer arrayBuffer;
>+    glBindBuffer(GL_ARRAY_BUFFER, arrayBuffer);
>+    glBufferData(GL_ARRAY_BUFFER, positionData.size() * sizeof(Vector4), positionData.data(),
>+                 GL_STATIC_DRAW);
>+
>+    GLint positionLoc = glGetAttribLocation(program, essl3_shaders::PositionAttrib());
>+    ASSERT_NE(-1, positionLoc);
>+
>+    glVertexAttribPointer(positionLoc, 4, GL_FLOAT, GL_FALSE, 0, nullptr);
>+    glEnableVertexAttribArray(positionLoc);
>+
>+    EXPECT_GL_NO_ERROR();
>+
>+    // Set up transform feedback.
>+    GLTransformFeedback transformFeedback;
>+    glBindTransformFeedback(GL_TRANSFORM_FEEDBACK, transformFeedback);
>+
>+    constexpr size_t kTransformFeedbackSize = 6 * sizeof(Vector4);
>+
>+    GLBuffer transformFeedbackBuffer;
>+    glBindBuffer(GL_TRANSFORM_FEEDBACK_BUFFER, transformFeedbackBuffer);
>+    glBufferData(GL_TRANSFORM_FEEDBACK_BUFFER, kTransformFeedbackSize * 2, nullptr, GL_STATIC_DRAW);
>+    glBindBufferBase(GL_TRANSFORM_FEEDBACK_BUFFER, 0, transformFeedbackBuffer);
>+
>+    // Set up uniform buffer.
>+    GLBuffer uniformBuffer;
>+    glBindBuffer(GL_UNIFORM_BUFFER, uniformBuffer);
>+    glBufferData(GL_UNIFORM_BUFFER, sizeof(GLColor32F), &kFloatGreen.R, GL_STATIC_DRAW);
>+    glBindBufferBase(GL_UNIFORM_BUFFER, 0, uniformBuffer);
>+
>+    ASSERT_GL_NO_ERROR();
>+
>+    // Do the draw operation. Should succeed.
>+    glBeginTransformFeedback(GL_TRIANGLES);
>+    glDrawArrays(GL_TRIANGLES, 0, 6);
>+    glEndTransformFeedback();
>+
>+    ASSERT_GL_NO_ERROR();
>+    EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::green);
>+
>+    const GLvoid *mapPointer =
>+        glMapBufferRange(GL_TRANSFORM_FEEDBACK_BUFFER, 0, kTransformFeedbackSize, GL_MAP_READ_BIT);
>+    ASSERT_GL_NO_ERROR();
>+    ASSERT_NE(nullptr, mapPointer);
>+    const Vector4 *typedMapPointer = reinterpret_cast<const Vector4 *>(mapPointer);
>+    std::vector<Vector4> actualData(typedMapPointer, typedMapPointer + 6);
>+    EXPECT_EQ(positionData, actualData);
>+    glUnmapBuffer(GL_TRANSFORM_FEEDBACK_BUFFER);
>+
>+    // Draw once to update validation cache.
>+    glBeginTransformFeedback(GL_TRIANGLES);
>+    glDrawArrays(GL_TRIANGLES, 0, 6);
>+
>+    // Bind transform feedback buffer to another binding point. Should cause a conflict.
>+    glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, transformFeedbackBuffer);
>+    ASSERT_GL_NO_ERROR();
>+    glDrawArrays(GL_TRIANGLES, 0, 6);
>+    glEndTransformFeedback();
>+    EXPECT_GL_ERROR(GL_INVALID_OPERATION) << "Simultaneous element buffer binding should fail";
>+
>+    // Reset to valid state.
>+    glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0);
>+    glBeginTransformFeedback(GL_TRIANGLES);
>+    glDrawArrays(GL_TRIANGLES, 0, 6);
>+    glEndTransformFeedback();
>+    ASSERT_GL_NO_ERROR();
>+
>+    // Simultaneous non-vertex-array binding. Should fail.
>+    glBeginTransformFeedback(GL_TRIANGLES);
>+    glDrawArrays(GL_TRIANGLES, 0, 6);
>+    ASSERT_GL_NO_ERROR();
>+    glBindBuffer(GL_PIXEL_PACK_BUFFER, transformFeedbackBuffer);
>+    ASSERT_GL_NO_ERROR();
>+    glDrawArrays(GL_TRIANGLES, 0, 6);
>+    glEndTransformFeedback();
>+    EXPECT_GL_ERROR(GL_INVALID_OPERATION) << "Simultaneous pack buffer binding should fail";
>+}
>+
>+// Test sampler format validation caching works.
>+TEST_P(WebGL2ValidationStateChangeTest, SamplerFormatCache)
>+{
>+    constexpr char kFS[] = R"(#version 300 es
>+precision mediump float;
>+uniform sampler2D sampler;
>+out vec4 colorOut;
>+void main()
> {
>+    colorOut = texture(sampler, vec2(0));
>+})";
>+
>+    std::vector<std::string> tfVaryings = {"gl_Position"};
>+    ANGLE_GL_PROGRAM(program, essl3_shaders::vs::Simple(), kFS);
>+    glUseProgram(program);
>+
>     std::array<GLColor, 4> colors = {
>         {GLColor::red, GLColor::green, GLColor::blue, GLColor::yellow}};
> 
>     GLTexture tex;
>     glBindTexture(GL_TEXTURE_2D, tex);
>     glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, 2, 2, 0, GL_RGBA, GL_UNSIGNED_BYTE, colors.data());
>-    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
>-    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
> 
>-    // Draw with the first texture.
>-    draw2DTexturedQuad(0.5f, 1.0f, true);
>+    const auto &quadVertices = GetQuadVertices();
> 
>-    // Redefine the in-flight texture.
>-    constexpr int kBigSize = 32;
>-    std::vector<GLColor> bigColors;
>-    for (int y = 0; y < kBigSize; ++y)
>+    GLBuffer arrayBuffer;
>+    glBindBuffer(GL_ARRAY_BUFFER, arrayBuffer);
>+    glBufferData(GL_ARRAY_BUFFER, quadVertices.size() * sizeof(Vector3), quadVertices.data(),
>+                 GL_STATIC_DRAW);
>+
>+    GLint samplerLoc = glGetUniformLocation(program, "sampler");
>+    ASSERT_NE(-1, samplerLoc);
>+    glUniform1i(samplerLoc, 0);
>+
>+    GLint positionLoc = glGetAttribLocation(program, essl3_shaders::PositionAttrib());
>+    ASSERT_NE(-1, positionLoc);
>+    glVertexAttribPointer(positionLoc, 3, GL_FLOAT, GL_FALSE, 0, nullptr);
>+    glEnableVertexAttribArray(positionLoc);
>+
>+    ASSERT_GL_NO_ERROR();
>+
>+    glDrawArrays(GL_TRIANGLES, 0, 6);
>+    ASSERT_GL_NO_ERROR();
>+
>+    // TexImage2D should update the sampler format cache.
>+    glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA8UI, 2, 2, 0, GL_RGBA_INTEGER, GL_UNSIGNED_BYTE,
>+                 colors.data());
>+    glDrawArrays(GL_TRIANGLES, 0, 6);
>+    EXPECT_GL_ERROR(GL_INVALID_OPERATION) << "Sampling integer texture with a float sampler.";
>+
>+    glTexImage2D(GL_TEXTURE_2D, 0, GL_DEPTH_COMPONENT24, 2, 2, 0, GL_DEPTH_COMPONENT,
>+                 GL_UNSIGNED_INT, colors.data());
>+    glDrawArrays(GL_TRIANGLES, 0, 6);
>+    ASSERT_GL_NO_ERROR() << "Depth texture with no compare mode.";
>+
>+    // TexParameteri should update the sampler format cache.
>+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_COMPARE_MODE, GL_COMPARE_REF_TO_TEXTURE);
>+    glDrawArrays(GL_TRIANGLES, 0, 6);
>+    EXPECT_GL_ERROR(GL_INVALID_OPERATION) << "Depth texture with compare mode set.";
>+}
>+
>+// Tests that we retain the correct draw mode settings with transform feedback changes.
>+TEST_P(ValidationStateChangeTest, TransformFeedbackDrawModes)
>+{
>+    ANGLE_SKIP_TEST_IF(IsAMD() && IsOSX());
>+
>+    std::vector<std::string> tfVaryings = {"gl_Position"};
>+    ANGLE_GL_PROGRAM_TRANSFORM_FEEDBACK(program, essl3_shaders::vs::Simple(),
>+                                        essl3_shaders::fs::Red(), tfVaryings,
>+                                        GL_INTERLEAVED_ATTRIBS);
>+    glUseProgram(program);
>+
>+    std::vector<Vector4> positionData;
>+    for (const Vector3 &quadVertex : GetQuadVertices())
>     {
>-        for (int x = 0; x < kBigSize; ++x)
>-        {
>-            bool xComp = x < kBigSize / 2;
>-            bool yComp = y < kBigSize / 2;
>-            if (yComp)
>-            {
>-                bigColors.push_back(xComp ? GLColor::cyan : GLColor::magenta);
>-            }
>-            else
>-            {
>-                bigColors.push_back(xComp ? GLColor::yellow : GLColor::white);
>-            }
>-        }
>+        positionData.emplace_back(quadVertex.x(), quadVertex.y(), quadVertex.z(), 1.0f);
>     }
> 
>-    glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, 32, 32, 0, GL_RGBA, GL_UNSIGNED_BYTE, bigColors.data());
>-    EXPECT_GL_NO_ERROR();
>+    GLBuffer arrayBuffer;
>+    glBindBuffer(GL_ARRAY_BUFFER, arrayBuffer);
>+    glBufferData(GL_ARRAY_BUFFER, positionData.size() * sizeof(Vector4), positionData.data(),
>+                 GL_STATIC_DRAW);
> 
>-    // Verify the first draw had the correct data via ReadPixels.
>-    int w = getWindowWidth() - 2;
>-    int h = getWindowHeight() - 2;
>+    GLint positionLoc = glGetAttribLocation(program, essl3_shaders::PositionAttrib());
>+    ASSERT_NE(-1, positionLoc);
> 
>-    EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::red);
>-    EXPECT_PIXEL_COLOR_EQ(w, 0, GLColor::green);
>-    EXPECT_PIXEL_COLOR_EQ(0, h, GLColor::blue);
>-    EXPECT_PIXEL_COLOR_EQ(w, h, GLColor::yellow);
>+    glVertexAttribPointer(positionLoc, 4, GL_FLOAT, GL_FALSE, 0, nullptr);
>+    glEnableVertexAttribArray(positionLoc);
> 
>-    // Draw and verify with the redefined data.
>-    draw2DTexturedQuad(0.5f, 1.0f, true);
>-    EXPECT_GL_NO_ERROR();
>+    // Set up transform feedback.
>+    GLTransformFeedback transformFeedback;
>+    glBindTransformFeedback(GL_TRANSFORM_FEEDBACK, transformFeedback);
> 
>-    EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::cyan);
>-    EXPECT_PIXEL_COLOR_EQ(w, 0, GLColor::magenta);
>-    EXPECT_PIXEL_COLOR_EQ(0, h, GLColor::yellow);
>-    EXPECT_PIXEL_COLOR_EQ(w, h, GLColor::white);
>+    constexpr size_t kTransformFeedbackSize = 6 * sizeof(Vector4);
>+
>+    GLBuffer transformFeedbackBuffer;
>+    glBindBuffer(GL_TRANSFORM_FEEDBACK_BUFFER, transformFeedbackBuffer);
>+    glBufferData(GL_TRANSFORM_FEEDBACK_BUFFER, kTransformFeedbackSize * 2, nullptr, GL_STATIC_DRAW);
>+    glBindBufferBase(GL_TRANSFORM_FEEDBACK_BUFFER, 0, transformFeedbackBuffer);
>+
>+    GLTransformFeedback pointsXFB;
>+    glBindTransformFeedback(GL_TRANSFORM_FEEDBACK, pointsXFB);
>+    GLBuffer pointsXFBBuffer;
>+    glBindBuffer(GL_TRANSFORM_FEEDBACK_BUFFER, pointsXFBBuffer);
>+    glBufferData(GL_TRANSFORM_FEEDBACK_BUFFER, 1024, nullptr, GL_STREAM_DRAW);
>+    glBindBufferBase(GL_TRANSFORM_FEEDBACK_BUFFER, 0, pointsXFBBuffer);
>+
>+    // Begin TRIANGLES, switch to paused POINTS, should be valid.
>+    glBeginTransformFeedback(GL_POINTS);
>+    glPauseTransformFeedback();
>+    ASSERT_GL_NO_ERROR() << "Starting point transform feedback should succeed";
>+
>+    glBindTransformFeedback(GL_TRANSFORM_FEEDBACK, transformFeedback);
>+    glBeginTransformFeedback(GL_TRIANGLES);
>+    glDrawArrays(GL_TRIANGLES, 0, 6);
>+    EXPECT_GL_NO_ERROR() << "Triangle rendering should succeed";
>+    glDrawArrays(GL_POINTS, 0, 6);
>+    EXPECT_GL_ERROR(GL_INVALID_OPERATION) << "Point rendering should fail";
>+    glDrawArrays(GL_LINES, 0, 6);
>+    EXPECT_GL_ERROR(GL_INVALID_OPERATION) << "Lines rendering should fail";
>+    glPauseTransformFeedback();
>+    glBindTransformFeedback(GL_TRANSFORM_FEEDBACK, pointsXFB);
>+    glResumeTransformFeedback();
>+    glDrawArrays(GL_POINTS, 0, 6);
>+    EXPECT_GL_NO_ERROR() << "Point rendering should succeed";
>+    glDrawArrays(GL_TRIANGLES, 0, 6);
>+    EXPECT_GL_ERROR(GL_INVALID_OPERATION) << "Triangle rendering should fail";
>+    glDrawArrays(GL_LINES, 0, 6);
>+    EXPECT_GL_ERROR(GL_INVALID_OPERATION) << "Lines rendering should fail";
>+
>+    glEndTransformFeedback();
>+    glBindTransformFeedback(GL_TRANSFORM_FEEDBACK, transformFeedback);
>+    glEndTransformFeedback();
>+    ASSERT_GL_NO_ERROR() << "Ending transform feeback should pass";
>+
>+    glBindTransformFeedback(GL_TRANSFORM_FEEDBACK, 0);
>+
>+    glDrawArrays(GL_POINTS, 0, 6);
>+    EXPECT_GL_NO_ERROR() << "Point rendering should succeed";
>+    glDrawArrays(GL_TRIANGLES, 0, 6);
>+    EXPECT_GL_NO_ERROR() << "Triangle rendering should succeed";
>+    glDrawArrays(GL_LINES, 0, 6);
>+    EXPECT_GL_NO_ERROR() << "Line rendering should succeed";
> }
> 
>-const char kSolidColorVertexShader[] = R"(attribute vec2 position;
>+// Tests a valid rendering setup with two textures. Followed by a draw with conflicting samplers.
>+TEST_P(ValidationStateChangeTest, TextureConflict)
>+{
>+    ANGLE_SKIP_TEST_IF(!IsGLExtensionEnabled("GL_EXT_texture_storage"));
>+
>+    GLint maxTextures = 0;
>+    glGetIntegerv(GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS, &maxTextures);
>+    ANGLE_SKIP_TEST_IF(maxTextures < 2);
>+
>+    // Set up state.
>+    constexpr GLint kSize = 2;
>+
>+    std::vector<GLColor> greenData(4, GLColor::green);
>+
>+    GLTexture textureA;
>+    glBindTexture(GL_TEXTURE_2D, textureA);
>+    glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, kSize, kSize, 0, GL_RGBA, GL_UNSIGNED_BYTE,
>+                 greenData.data());
>+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
>+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
>+
>+    glActiveTexture(GL_TEXTURE1);
>+
>+    GLTexture textureB;
>+    glBindTexture(GL_TEXTURE_CUBE_MAP, textureB);
>+    glTexImage2D(GL_TEXTURE_CUBE_MAP_NEGATIVE_X, 0, GL_RGBA8, kSize, kSize, 0, GL_RGBA,
>+                 GL_UNSIGNED_BYTE, greenData.data());
>+    glTexImage2D(GL_TEXTURE_CUBE_MAP_NEGATIVE_Y, 0, GL_RGBA8, kSize, kSize, 0, GL_RGBA,
>+                 GL_UNSIGNED_BYTE, greenData.data());
>+    glTexImage2D(GL_TEXTURE_CUBE_MAP_NEGATIVE_Z, 0, GL_RGBA8, kSize, kSize, 0, GL_RGBA,
>+                 GL_UNSIGNED_BYTE, greenData.data());
>+    glTexImage2D(GL_TEXTURE_CUBE_MAP_POSITIVE_X, 0, GL_RGBA8, kSize, kSize, 0, GL_RGBA,
>+                 GL_UNSIGNED_BYTE, greenData.data());
>+    glTexImage2D(GL_TEXTURE_CUBE_MAP_POSITIVE_Y, 0, GL_RGBA8, kSize, kSize, 0, GL_RGBA,
>+                 GL_UNSIGNED_BYTE, greenData.data());
>+    glTexImage2D(GL_TEXTURE_CUBE_MAP_POSITIVE_Z, 0, GL_RGBA8, kSize, kSize, 0, GL_RGBA,
>+                 GL_UNSIGNED_BYTE, greenData.data());
>+    glTexParameteri(GL_TEXTURE_CUBE_MAP, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
>+    glTexParameteri(GL_TEXTURE_CUBE_MAP, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
>+
>+    constexpr char kVS[] = R"(attribute vec2 position;
>+varying mediump vec2 texCoord;
> void main()
> {
>     gl_Position = vec4(position, 0, 1);
>+    texCoord = position * 0.5 + vec2(0.5);
> })";
> 
>-const char kSolidColorFragmentShader[] = R"(void main()
>+    constexpr char kFS[] = R"(varying mediump vec2 texCoord;
>+uniform sampler2D texA;
>+uniform samplerCube texB;
>+void main()
> {
>-    gl_FragColor = vec4(1, 0, 0, 1);
>+    gl_FragColor = texture2D(texA, texCoord) + textureCube(texB, vec3(1, 0, 0));
> })";
> 
>-// Tests deleting a Framebuffer that is in use.
>-TEST_P(SimpleStateChangeTest, DeleteFramebufferInUse)
>-{
>-    constexpr int kSize = 16;
>+    ANGLE_GL_PROGRAM(program, kVS, kFS);
>+    glUseProgram(program);
> 
>-    // Create a simple framebuffer.
>-    GLTexture texture;
>-    glBindTexture(GL_TEXTURE_2D, texture);
>-    glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, kSize, kSize, 0, GL_RGBA, GL_UNSIGNED_BYTE, nullptr);
>+    const auto &quadVertices = GetQuadVertices();
> 
>-    GLFramebuffer framebuffer;
>-    glBindFramebuffer(GL_FRAMEBUFFER, framebuffer);
>-    glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, texture, 0);
>-    ASSERT_GLENUM_EQ(GL_FRAMEBUFFER_COMPLETE, glCheckFramebufferStatus(GL_FRAMEBUFFER));
>+    GLBuffer arrayBuffer;
>+    glBindBuffer(GL_ARRAY_BUFFER, arrayBuffer);
>+    glBufferData(GL_ARRAY_BUFFER, quadVertices.size() * sizeof(Vector3), quadVertices.data(),
>+                 GL_STATIC_DRAW);
> 
>-    glViewport(0, 0, kSize, kSize);
>+    GLint positionLoc = glGetAttribLocation(program, "position");
>+    ASSERT_NE(-1, positionLoc);
> 
>-    // Draw a solid red color to the framebuffer.
>-    ANGLE_GL_PROGRAM(program, kSolidColorVertexShader, kSolidColorFragmentShader);
>-    drawQuad(program, "position", 0.5f, 1.0f, true);
>+    GLint texALoc = glGetUniformLocation(program, "texA");
>+    ASSERT_NE(-1, texALoc);
> 
>-    // Delete the framebuffer while the call is in flight.
>-    framebuffer.reset();
>+    GLint texBLoc = glGetUniformLocation(program, "texB");
>+    ASSERT_NE(-1, texBLoc);
> 
>-    // Make a new framebuffer so we can read back the texture.
>-    glBindFramebuffer(GL_FRAMEBUFFER, framebuffer);
>-    glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, texture, 0);
>-    ASSERT_GLENUM_EQ(GL_FRAMEBUFFER_COMPLETE, glCheckFramebufferStatus(GL_FRAMEBUFFER));
>+    glUniform1i(texALoc, 0);
>+    glUniform1i(texBLoc, 1);
> 
>-    // Flush via ReadPixels and check red was drawn.
>-    EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::red);
>+    glVertexAttribPointer(positionLoc, 3, GL_FLOAT, GL_FALSE, 0, nullptr);
>+    glEnableVertexAttribArray(positionLoc);
>+
>+    ASSERT_GL_NO_ERROR();
>+
>+    // First draw. Should succeed.
>+    glDrawArrays(GL_TRIANGLES, 0, 6);
>+    ASSERT_GL_NO_ERROR();
>+    EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::green);
>+
>+    // Second draw to ensure all state changes are flushed.
>+    glDrawArrays(GL_TRIANGLES, 0, 6);
>     ASSERT_GL_NO_ERROR();
>+
>+    // Make the uniform use an invalid texture binding.
>+    glUniform1i(texBLoc, 0);
>+    glDrawArrays(GL_TRIANGLES, 0, 6);
>+    EXPECT_GL_ERROR(GL_INVALID_OPERATION);
> }
> 
>-// Tests deleting a Framebuffer that is in use.
>-TEST_P(SimpleStateChangeTest, RedefineFramebufferInUse)
>+// Tests that mapping the element array buffer triggers errors.
>+TEST_P(ValidationStateChangeTest, MapElementArrayBuffer)
> {
>-    constexpr int kSize = 16;
>+    ANGLE_GL_PROGRAM(program, essl3_shaders::vs::Simple(), essl3_shaders::fs::Red());
>+    glUseProgram(program);
> 
>-    // Create a simple framebuffer.
>-    GLTexture texture;
>-    glBindTexture(GL_TEXTURE_2D, texture);
>-    glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, kSize, kSize, 0, GL_RGBA, GL_UNSIGNED_BYTE, nullptr);
>+    std::array<GLushort, 6> quadIndices = GetQuadIndices();
>+    std::array<Vector3, 4> quadVertices = GetIndexedQuadVertices();
> 
>-    GLFramebuffer framebuffer;
>-    glBindFramebuffer(GL_FRAMEBUFFER, framebuffer);
>-    glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, texture, 0);
>-    ASSERT_GLENUM_EQ(GL_FRAMEBUFFER_COMPLETE, glCheckFramebufferStatus(GL_FRAMEBUFFER));
>+    GLsizei elementBufferSize = sizeof(quadIndices[0]) * quadIndices.size();
> 
>-    glViewport(0, 0, kSize, kSize);
>+    GLBuffer elementArrayBuffer;
>+    glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, elementArrayBuffer);
>+    glBufferData(GL_ELEMENT_ARRAY_BUFFER, elementBufferSize, quadIndices.data(), GL_STATIC_DRAW);
> 
>-    // Draw red to the framebuffer.
>-    simpleDrawWithColor(GLColor::red);
>+    GLBuffer arrayBuffer;
>+    glBindBuffer(GL_ARRAY_BUFFER, arrayBuffer);
>+    glBufferData(GL_ARRAY_BUFFER, sizeof(quadVertices[0]) * quadVertices.size(),
>+                 quadVertices.data(), GL_STATIC_DRAW);
> 
>-    // Change the framebuffer while the call is in flight to a new texture.
>-    GLTexture otherTexture;
>-    glBindTexture(GL_TEXTURE_2D, otherTexture);
>-    glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, kSize, kSize, 0, GL_RGBA, GL_UNSIGNED_BYTE, nullptr);
>+    GLint positionLoc = glGetAttribLocation(program, essl3_shaders::PositionAttrib());
>+    ASSERT_NE(-1, positionLoc);
>+    glVertexAttribPointer(positionLoc, 3, GL_FLOAT, GL_FALSE, 0, nullptr);
>+    glEnableVertexAttribArray(positionLoc);
> 
>-    glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, otherTexture, 0);
>-    ASSERT_GLENUM_EQ(GL_FRAMEBUFFER_COMPLETE, glCheckFramebufferStatus(GL_FRAMEBUFFER));
>+    glDrawElements(GL_TRIANGLES, 6, GL_UNSIGNED_SHORT, nullptr);
>+    ASSERT_GL_NO_ERROR();
> 
>-    // Draw green to the framebuffer. Verify the color.
>-    simpleDrawWithColor(GLColor::green);
>-    EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::green);
>+    void *ptr = glMapBufferRange(GL_ELEMENT_ARRAY_BUFFER, 0, elementBufferSize, GL_MAP_READ_BIT);
>+    ASSERT_NE(nullptr, ptr);
> 
>-    // Make a new framebuffer so we can read back the first texture and verify red.
>-    glBindFramebuffer(GL_FRAMEBUFFER, framebuffer);
>-    glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, texture, 0);
>-    ASSERT_GLENUM_EQ(GL_FRAMEBUFFER_COMPLETE, glCheckFramebufferStatus(GL_FRAMEBUFFER));
>+    glDrawElements(GL_TRIANGLES, 6, GL_UNSIGNED_SHORT, nullptr);
>+    EXPECT_GL_ERROR(GL_INVALID_OPERATION);
>+
>+    glUnmapBuffer(GL_ELEMENT_ARRAY_BUFFER);
>+
>+    glDrawElements(GL_TRIANGLES, 6, GL_UNSIGNED_SHORT, nullptr);
>+    ASSERT_GL_NO_ERROR();
>+    EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::red);
>+}
>+
>+// Tests that deleting a non-active texture does not reset the current texture cache.
>+TEST_P(SimpleStateChangeTest, DeleteNonActiveTextureThenDraw)
>+{
>+    constexpr char kFS[] =
>+        "uniform sampler2D us; void main() { gl_FragColor = texture2D(us, vec2(0)); }";
>+    ANGLE_GL_PROGRAM(program, essl1_shaders::vs::Simple(), kFS);
>+    glUseProgram(program);
>+    GLint loc = glGetUniformLocation(program, "us");
>+    ASSERT_EQ(0, loc);
>+
>+    auto quadVertices = GetQuadVertices();
>+    GLint posLoc      = glGetAttribLocation(program, essl1_shaders::PositionAttrib());
>+    ASSERT_EQ(0, posLoc);
>+
>+    GLBuffer buffer;
>+    glBindBuffer(GL_ARRAY_BUFFER, buffer);
>+    glBufferData(GL_ARRAY_BUFFER, quadVertices.size() * sizeof(quadVertices[0]),
>+                 quadVertices.data(), GL_STATIC_DRAW);
>+    glVertexAttribPointer(posLoc, 3, GL_FLOAT, GL_FALSE, 0, nullptr);
>+    glEnableVertexAttribArray(posLoc);
>+
>+    constexpr size_t kSize = 2;
>+    std::vector<GLColor> red(kSize * kSize, GLColor::red);
>+
>+    GLTexture tex;
>+    glBindTexture(GL_TEXTURE_2D, tex);
>+    glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, kSize, kSize, 0, GL_RGBA, GL_UNSIGNED_BYTE, red.data());
>+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
>+    glUniform1i(loc, 0);
>+
>+    glDrawArrays(GL_TRIANGLES, 0, 3);
>+    ASSERT_GL_NO_ERROR();
>+    EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::red);
> 
>+    // Deleting TEXTURE_CUBE_MAP[0] should not affect TEXTURE_2D[0].
>+    GLTexture tex2;
>+    glBindTexture(GL_TEXTURE_CUBE_MAP, tex2);
>+    tex2.reset();
>+
>+    glDrawArrays(GL_TRIANGLES, 0, 3);
>+    ASSERT_GL_NO_ERROR();
>     EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::red);
>+
>+    // Deleting TEXTURE_2D[0] should start "sampling" from the default/zero texture.
>+    tex.reset();
>+
>+    glDrawArrays(GL_TRIANGLES, 0, 3);
>     ASSERT_GL_NO_ERROR();
>+    EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::black);
> }
> 
>+// Tests that deleting a texture successfully binds the zero texture.
>+TEST_P(SimpleStateChangeTest, DeleteTextureThenDraw)
>+{
>+    constexpr char kFS[] =
>+        "uniform sampler2D us; void main() { gl_FragColor = texture2D(us, vec2(0)); }";
>+    ANGLE_GL_PROGRAM(program, essl1_shaders::vs::Simple(), kFS);
>+    glUseProgram(program);
>+    GLint loc = glGetUniformLocation(program, "us");
>+    ASSERT_EQ(0, loc);
>+
>+    auto quadVertices = GetQuadVertices();
>+    GLint posLoc      = glGetAttribLocation(program, essl1_shaders::PositionAttrib());
>+    ASSERT_EQ(0, posLoc);
>+
>+    GLBuffer buffer;
>+    glBindBuffer(GL_ARRAY_BUFFER, buffer);
>+    glBufferData(GL_ARRAY_BUFFER, quadVertices.size() * sizeof(quadVertices[0]),
>+                 quadVertices.data(), GL_STATIC_DRAW);
>+    glVertexAttribPointer(posLoc, 3, GL_FLOAT, GL_FALSE, 0, nullptr);
>+    glEnableVertexAttribArray(posLoc);
>+
>+    constexpr size_t kSize = 2;
>+    std::vector<GLColor> red(kSize * kSize, GLColor::red);
>+
>+    GLTexture tex;
>+    glBindTexture(GL_TEXTURE_2D, tex);
>+    glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, kSize, kSize, 0, GL_RGBA, GL_UNSIGNED_BYTE, red.data());
>+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
>+    glUniform1i(loc, 1);
>+    tex.reset();
>+
>+    glDrawArrays(GL_TRIANGLES, 0, 3);
>+    ASSERT_GL_NO_ERROR();
>+    EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::black);
>+}
> }  // anonymous namespace
> 
>-ANGLE_INSTANTIATE_TEST(StateChangeTest, ES2_D3D9(), ES2_D3D11(), ES2_OPENGL());
>+ANGLE_INSTANTIATE_TEST(StateChangeTest, ES2_D3D9(), ES2_D3D11(), ES2_OPENGL(), ES2_VULKAN());
>+ANGLE_INSTANTIATE_TEST(LineLoopStateChangeTest,
>+                       ES2_D3D9(),
>+                       ES2_D3D11(),
>+                       ES2_OPENGL(),
>+                       ES2_VULKAN());
> ANGLE_INSTANTIATE_TEST(StateChangeRenderTest,
>                        ES2_D3D9(),
>                        ES2_D3D11(),
>                        ES2_OPENGL(),
>-                       ES2_D3D11_FL9_3());
>+                       ES2_D3D11_FL9_3(),
>+                       ES2_VULKAN());
> ANGLE_INSTANTIATE_TEST(StateChangeTestES3, ES3_D3D11(), ES3_OPENGL());
>-
>-ANGLE_INSTANTIATE_TEST(SimpleStateChangeTest, ES2_VULKAN(), ES2_OPENGL());
>+ANGLE_INSTANTIATE_TEST(SimpleStateChangeTest, ES2_D3D11(), ES2_VULKAN(), ES2_OPENGL());
>+ANGLE_INSTANTIATE_TEST(SimpleStateChangeTestES3, ES3_OPENGL(), ES3_D3D11());
>+ANGLE_INSTANTIATE_TEST(SimpleStateChangeTestES31, ES31_OPENGL(), ES31_D3D11());
>+ANGLE_INSTANTIATE_TEST(ValidationStateChangeTest, ES3_D3D11(), ES3_OPENGL());
>+ANGLE_INSTANTIATE_TEST(WebGL2ValidationStateChangeTest, ES3_D3D11(), ES3_OPENGL());
>+ANGLE_INSTANTIATE_TEST(ValidationStateChangeTestES31, ES31_OPENGL(), ES31_D3D11());
>+ANGLE_INSTANTIATE_TEST(WebGLComputeValidationStateChangeTest, ES31_D3D11(), ES31_OPENGL());
>diff --git a/Source/ThirdParty/ANGLE/src/tests/gl_tests/SwizzleTest.cpp b/Source/ThirdParty/ANGLE/src/tests/gl_tests/SwizzleTest.cpp
>index e82f11da4a4..ce052f15162 100644
>--- a/Source/ThirdParty/ANGLE/src/tests/gl_tests/SwizzleTest.cpp
>+++ b/Source/ThirdParty/ANGLE/src/tests/gl_tests/SwizzleTest.cpp
>@@ -64,28 +64,26 @@ class SwizzleTest : public ANGLETest
>     {
>         ANGLETest::SetUp();
> 
>-        const std::string vertexShaderSource =
>-            R"(precision highp float;
>-            attribute vec4 position;
>-            varying vec2 texcoord;
>+        constexpr char kVS[] = R"(precision highp float;
>+attribute vec4 position;
>+varying vec2 texcoord;
> 
>-            void main()
>-            {
>-                gl_Position = position;
>-                texcoord = (position.xy * 0.5) + 0.5;
>-            })";
>+void main()
>+{
>+    gl_Position = position;
>+    texcoord = (position.xy * 0.5) + 0.5;
>+})";
> 
>-        const std::string fragmentShaderSource =
>-            R"(precision highp float;
>-            uniform sampler2D tex;
>-            varying vec2 texcoord;
>+        constexpr char kFS[] = R"(precision highp float;
>+uniform sampler2D tex;
>+varying vec2 texcoord;
> 
>-            void main()
>-            {
>-                gl_FragColor = texture2D(tex, texcoord);
>-            })";
>+void main()
>+{
>+    gl_FragColor = texture2D(tex, texcoord);
>+})";
> 
>-        mProgram = CompileProgram(vertexShaderSource, fragmentShaderSource);
>+        mProgram = CompileProgram(kVS, kFS);
>         ASSERT_NE(0u, mProgram);
> 
>         mTextureUniformLocation = glGetUniformLocation(mProgram, "tex");
>@@ -104,7 +102,7 @@ class SwizzleTest : public ANGLETest
>     }
> 
>     template <typename T>
>-    void init2DTexture(GLenum internalFormat, GLenum dataFormat, GLenum dataType, const T* data)
>+    void init2DTexture(GLenum internalFormat, GLenum dataFormat, GLenum dataType, const T *data)
>     {
>         glGenTextures(1, &mTexture);
>         glBindTexture(GL_TEXTURE_2D, mTexture);
>@@ -114,11 +112,16 @@ class SwizzleTest : public ANGLETest
>         glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
>     }
> 
>-    void init2DCompressedTexture(GLenum internalFormat, GLsizei width, GLsizei height, GLsizei dataSize, const GLubyte* data)
>+    void init2DCompressedTexture(GLenum internalFormat,
>+                                 GLsizei width,
>+                                 GLsizei height,
>+                                 GLsizei dataSize,
>+                                 const GLubyte *data)
>     {
>         glGenTextures(1, &mTexture);
>         glBindTexture(GL_TEXTURE_2D, mTexture);
>-        glCompressedTexImage2D(GL_TEXTURE_2D, 0, GL_COMPRESSED_RGBA_S3TC_DXT1_EXT, width, height, 0, dataSize, data);
>+        glCompressedTexImage2D(GL_TEXTURE_2D, 0, GL_COMPRESSED_RGBA_S3TC_DXT1_EXT, width, height, 0,
>+                               dataSize, data);
> 
>         glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
>         glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
>@@ -128,25 +131,25 @@ class SwizzleTest : public ANGLETest
>     {
>         switch (swizzle)
>         {
>-          case GL_RED:   return unswizzled[0];
>-          case GL_GREEN: return unswizzled[1];
>-          case GL_BLUE:  return unswizzled[2];
>-          case GL_ALPHA: return unswizzled[3];
>-          case GL_ZERO:  return 0;
>-          case GL_ONE:   return 255;
>-          default:       return 0;
>+            case GL_RED:
>+                return unswizzled[0];
>+            case GL_GREEN:
>+                return unswizzled[1];
>+            case GL_BLUE:
>+                return unswizzled[2];
>+            case GL_ALPHA:
>+                return unswizzled[3];
>+            case GL_ZERO:
>+                return 0;
>+            case GL_ONE:
>+                return 255;
>+            default:
>+                return 0;
>         }
>     }
> 
>     void runTest2D()
>     {
>-        // TODO(jmadill): Figure out why this fails on Intel.
>-        if (IsIntel() && GetParam().getRenderer() == EGL_PLATFORM_ANGLE_TYPE_OPENGL_ANGLE)
>-        {
>-            std::cout << "Test skipped on Intel." << std::endl;
>-            return;
>-        }
>-
>         glUseProgram(mProgram);
>         glBindTexture(GL_TEXTURE_2D, mTexture);
>         glUniform1i(mTextureUniformLocation, 0);
>@@ -174,8 +177,7 @@ class SwizzleTest : public ANGLETest
>             glClear(GL_COLOR_BUFFER_BIT);
>             drawQuad(mProgram, "position", 0.5f);
> 
>-            EXPECT_PIXEL_EQ(0, 0,
>-                            getExpectedValue(permutation.swizzleRed, unswizzled),
>+            EXPECT_PIXEL_EQ(0, 0, getExpectedValue(permutation.swizzleRed, unswizzled),
>                             getExpectedValue(permutation.swizzleGreen, unswizzled),
>                             getExpectedValue(permutation.swizzleBlue, unswizzled),
>                             getExpectedValue(permutation.swizzleAlpha, unswizzled));
>@@ -206,7 +208,7 @@ class SwizzleIntegerTest : public SwizzleTest
>     {
>         ANGLETest::SetUp();
> 
>-        const std::string vertexShaderSource =
>+        constexpr char kVS[] =
>             "#version 300 es\n"
>             "precision highp float;\n"
>             "in vec4 position;\n"
>@@ -218,7 +220,7 @@ class SwizzleIntegerTest : public SwizzleTest
>             "    texcoord = (position.xy * 0.5) + 0.5;\n"
>             "}\n";
> 
>-        const std::string fragmentShaderSource =
>+        constexpr char kFS[] =
>             "#version 300 es\n"
>             "precision highp float;\n"
>             "precision highp usampler2D;\n"
>@@ -236,7 +238,7 @@ class SwizzleIntegerTest : public SwizzleTest
>             "    my_FragColor = vec4(s) / 255.0;\n"
>             "}\n";
> 
>-        mProgram = CompileProgram(vertexShaderSource, fragmentShaderSource);
>+        mProgram = CompileProgram(kVS, kFS);
>         ASSERT_NE(0u, mProgram);
> 
>         mTextureUniformLocation = glGetUniformLocation(mProgram, "tex");
>@@ -249,28 +251,28 @@ class SwizzleIntegerTest : public SwizzleTest
> 
> TEST_P(SwizzleTest, RGBA8_2D)
> {
>-    GLubyte data[] = { 1, 64, 128, 200 };
>+    GLubyte data[] = {1, 64, 128, 200};
>     init2DTexture(GL_RGBA8, GL_RGBA, GL_UNSIGNED_BYTE, data);
>     runTest2D();
> }
> 
> TEST_P(SwizzleTest, RGB8_2D)
> {
>-    GLubyte data[] = { 77, 66, 55 };
>+    GLubyte data[] = {77, 66, 55};
>     init2DTexture(GL_RGB8, GL_RGB, GL_UNSIGNED_BYTE, data);
>     runTest2D();
> }
> 
> TEST_P(SwizzleTest, RG8_2D)
> {
>-    GLubyte data[] = { 11, 99 };
>+    GLubyte data[] = {11, 99};
>     init2DTexture(GL_RG8, GL_RG, GL_UNSIGNED_BYTE, data);
>     runTest2D();
> }
> 
> TEST_P(SwizzleTest, R8_2D)
> {
>-    GLubyte data[] = { 2 };
>+    GLubyte data[] = {2};
>     init2DTexture(GL_R8, GL_RED, GL_UNSIGNED_BYTE, data);
>     runTest2D();
> }
>@@ -284,49 +286,49 @@ TEST_P(SwizzleTest, RGB10_A2_2D)
> 
> TEST_P(SwizzleTest, RGBA32F_2D)
> {
>-    GLfloat data[] = { 0.25f, 0.5f, 0.75f, 0.8f };
>+    GLfloat data[] = {0.25f, 0.5f, 0.75f, 0.8f};
>     init2DTexture(GL_RGBA32F, GL_RGBA, GL_FLOAT, data);
>     runTest2D();
> }
> 
> TEST_P(SwizzleTest, RGB32F_2D)
> {
>-    GLfloat data[] = { 0.1f, 0.2f, 0.3f };
>+    GLfloat data[] = {0.1f, 0.2f, 0.3f};
>     init2DTexture(GL_RGB32F, GL_RGB, GL_FLOAT, data);
>     runTest2D();
> }
> 
> TEST_P(SwizzleTest, RG32F_2D)
> {
>-    GLfloat data[] = { 0.9f, 0.1f  };
>+    GLfloat data[] = {0.9f, 0.1f};
>     init2DTexture(GL_RG32F, GL_RG, GL_FLOAT, data);
>     runTest2D();
> }
> 
> TEST_P(SwizzleTest, R32F_2D)
> {
>-    GLfloat data[] = { 0.5f };
>+    GLfloat data[] = {0.5f};
>     init2DTexture(GL_R32F, GL_RED, GL_FLOAT, data);
>     runTest2D();
> }
> 
> TEST_P(SwizzleTest, D32F_2D)
> {
>-    GLfloat data[] = { 0.5f };
>+    GLfloat data[] = {0.5f};
>     init2DTexture(GL_DEPTH_COMPONENT32F, GL_DEPTH_COMPONENT, GL_FLOAT, data);
>     runTest2D();
> }
> 
> TEST_P(SwizzleTest, D16_2D)
> {
>-    GLushort data[] = { 0xFF };
>+    GLushort data[] = {0xFF};
>     init2DTexture(GL_DEPTH_COMPONENT16, GL_DEPTH_COMPONENT, GL_UNSIGNED_SHORT, data);
>     runTest2D();
> }
> 
> TEST_P(SwizzleTest, D24_2D)
> {
>-    GLuint data[] = { 0xFFFF };
>+    GLuint data[] = {0xFFFF};
>     init2DTexture(GL_DEPTH_COMPONENT24, GL_DEPTH_COMPONENT, GL_UNSIGNED_INT, data);
>     runTest2D();
> }
>@@ -354,11 +356,7 @@ TEST_P(SwizzleTest, LA8_2D)
> 
> TEST_P(SwizzleTest, L32F_2D)
> {
>-    if (!extensionEnabled("GL_OES_texture_float"))
>-    {
>-        std::cout << "Test skipped due to missing GL_OES_texture_float." << std::endl;
>-        return;
>-    }
>+    ANGLE_SKIP_TEST_IF(!IsGLExtensionEnabled("GL_OES_texture_float"));
> 
>     GLfloat data[] = {0.7f};
>     init2DTexture(GL_LUMINANCE, GL_LUMINANCE, GL_FLOAT, data);
>@@ -367,11 +365,7 @@ TEST_P(SwizzleTest, L32F_2D)
> 
> TEST_P(SwizzleTest, A32F_2D)
> {
>-    if (!extensionEnabled("GL_OES_texture_float"))
>-    {
>-        std::cout << "Test skipped due to missing GL_OES_texture_float." << std::endl;
>-        return;
>-    }
>+    ANGLE_SKIP_TEST_IF(!IsGLExtensionEnabled("GL_OES_texture_float"));
> 
>     GLfloat data[] = {
>         0.4f,
>@@ -382,14 +376,11 @@ TEST_P(SwizzleTest, A32F_2D)
> 
> TEST_P(SwizzleTest, LA32F_2D)
> {
>-    if (!extensionEnabled("GL_OES_texture_float"))
>-    {
>-        std::cout << "Test skipped due to missing GL_OES_texture_float." << std::endl;
>-        return;
>-    }
>+    ANGLE_SKIP_TEST_IF(!IsGLExtensionEnabled("GL_OES_texture_float"));
> 
>     GLfloat data[] = {
>-        0.5f, 0.6f,
>+        0.5f,
>+        0.6f,
>     };
>     init2DTexture(GL_LUMINANCE_ALPHA, GL_LUMINANCE_ALPHA, GL_FLOAT, data);
>     runTest2D();
>@@ -399,13 +390,10 @@ TEST_P(SwizzleTest, LA32F_2D)
> 
> TEST_P(SwizzleTest, CompressedDXT_2D)
> {
>-    if (!extensionEnabled("GL_EXT_texture_compression_dxt1"))
>-    {
>-        std::cout << "Test skipped due to missing GL_EXT_texture_compression_dxt1." << std::endl;
>-        return;
>-    }
>+    ANGLE_SKIP_TEST_IF(!IsGLExtensionEnabled("GL_EXT_texture_compression_dxt1"));
> 
>-    init2DCompressedTexture(GL_COMPRESSED_RGBA_S3TC_DXT1_EXT, pixel_0_width, pixel_0_height, pixel_0_size, pixel_0_data);
>+    init2DCompressedTexture(GL_COMPRESSED_RGBA_S3TC_DXT1_EXT, pixel_0_width, pixel_0_height,
>+                            pixel_0_size, pixel_0_data);
>     runTest2D();
> }
> 
>@@ -447,7 +435,8 @@ TEST_P(SwizzleTest, SubUpdate)
>     EXPECT_PIXEL_COLOR_EQ(0, 0, expectedUpdateData);
> }
> 
>-// Use this to select which configurations (e.g. which renderer, which GLES major version) these tests should be run against.
>+// Use this to select which configurations (e.g. which renderer, which GLES major version) these
>+// tests should be run against.
> ANGLE_INSTANTIATE_TEST(SwizzleTest, ES3_D3D11(), ES3_OPENGL(), ES3_OPENGL(3, 3), ES3_OPENGLES());
> ANGLE_INSTANTIATE_TEST(SwizzleIntegerTest,
>                        ES3_D3D11(),
>@@ -455,4 +444,4 @@ ANGLE_INSTANTIATE_TEST(SwizzleIntegerTest,
>                        ES3_OPENGL(3, 3),
>                        ES3_OPENGLES());
> 
>-} // namespace
>+}  // namespace
>diff --git a/Source/ThirdParty/ANGLE/src/tests/gl_tests/SyncQueriesTest.cpp b/Source/ThirdParty/ANGLE/src/tests/gl_tests/SyncQueriesTest.cpp
>index b36311254e9..a58219bd5b4 100644
>--- a/Source/ThirdParty/ANGLE/src/tests/gl_tests/SyncQueriesTest.cpp
>+++ b/Source/ThirdParty/ANGLE/src/tests/gl_tests/SyncQueriesTest.cpp
>@@ -42,11 +42,7 @@ class SyncQueriesTest : public ANGLETest
> // Test basic usage of sync queries
> TEST_P(SyncQueriesTest, Basic)
> {
>-    if (!extensionEnabled("GL_CHROMIUM_sync_query"))
>-    {
>-        std::cout << "Test skipped because GL_CHROMIUM_sync_query is not available." << std::endl;
>-        return;
>-    }
>+    ANGLE_SKIP_TEST_IF(!IsGLExtensionEnabled("GL_CHROMIUM_sync_query"));
> 
>     glGenQueriesEXT(1, &mQuery);
>     glBeginQueryEXT(GL_COMMANDS_COMPLETED_CHROMIUM, mQuery);
>@@ -60,7 +56,7 @@ TEST_P(SyncQueriesTest, Basic)
>     glFlush();
>     GLuint result = 0;
>     glGetQueryObjectuivEXT(mQuery, GL_QUERY_RESULT_EXT, &result);
>-    EXPECT_EQ(static_cast<GLuint>(GL_TRUE), result);
>+    EXPECT_GL_TRUE(result);
>     EXPECT_GL_NO_ERROR();
> }
> 
>@@ -68,14 +64,9 @@ TEST_P(SyncQueriesTest, Basic)
> TEST_P(SyncQueriesTest, Validation)
> {
>     // Need the GL_EXT_occlusion_query_boolean extension for the entry points
>-    if (!extensionEnabled("GL_EXT_occlusion_query_boolean"))
>-    {
>-        std::cout << "Test skipped because GL_EXT_occlusion_query_boolean is not available."
>-                  << std::endl;
>-        return;
>-    }
>+    ANGLE_SKIP_TEST_IF(!IsGLExtensionEnabled("GL_EXT_occlusion_query_boolean"));
> 
>-    bool extensionAvailable = extensionEnabled("GL_CHROMIUM_sync_query");
>+    bool extensionAvailable = IsGLExtensionEnabled("GL_CHROMIUM_sync_query");
> 
>     glGenQueriesEXT(1, &mQuery);
> 
>@@ -103,6 +94,7 @@ ANGLE_INSTANTIATE_TEST(SyncQueriesTest,
>                        ES2_OPENGL(),
>                        ES3_OPENGL(),
>                        ES2_OPENGLES(),
>-                       ES3_OPENGLES());
>+                       ES3_OPENGLES(),
>+                       ES2_VULKAN());
> 
> }  // namespace angle
>diff --git a/Source/ThirdParty/ANGLE/src/tests/gl_tests/TextureMultisampleTest.cpp b/Source/ThirdParty/ANGLE/src/tests/gl_tests/TextureMultisampleTest.cpp
>index 903b97d6d69..6081605b5c8 100644
>--- a/Source/ThirdParty/ANGLE/src/tests/gl_tests/TextureMultisampleTest.cpp
>+++ b/Source/ThirdParty/ANGLE/src/tests/gl_tests/TextureMultisampleTest.cpp
>@@ -7,12 +7,27 @@
> // TextureMultisampleTest: Tests of multisampled texture
> 
> #include "test_utils/ANGLETest.h"
>+
> #include "test_utils/gl_raii.h"
>+#include "util/shader_utils.h"
> 
> using namespace angle;
> 
> namespace
> {
>+// Sample positions of d3d standard pattern. Some of the sample positions might not the same as
>+// opengl.
>+using SamplePositionsArray                                            = std::array<float, 32>;
>+static constexpr std::array<SamplePositionsArray, 5> kSamplePositions = {
>+    {{{0.5f, 0.5f}},
>+     {{0.75f, 0.75f, 0.25f, 0.25f}},
>+     {{0.375f, 0.125f, 0.875f, 0.375f, 0.125f, 0.625f, 0.625f, 0.875f}},
>+     {{0.5625f, 0.3125f, 0.4375f, 0.6875f, 0.8125f, 0.5625f, 0.3125f, 0.1875f, 0.1875f, 0.8125f,
>+       0.0625f, 0.4375f, 0.6875f, 0.9375f, 0.9375f, 0.0625f}},
>+     {{0.5625f, 0.5625f, 0.4375f, 0.3125f, 0.3125f, 0.625f,  0.75f,   0.4375f,
>+       0.1875f, 0.375f,  0.625f,  0.8125f, 0.8125f, 0.6875f, 0.6875f, 0.1875f,
>+       0.375f,  0.875f,  0.5f,    0.0625f, 0.25f,   0.125f,  0.125f,  0.75f,
>+       0.0f,    0.5f,    0.9375f, 0.25f,   0.875f,  0.9375f, 0.0625f, 0.0f}}}};
> 
> class TextureMultisampleTest : public ANGLETest
> {
>@@ -47,103 +62,302 @@ class TextureMultisampleTest : public ANGLETest
>         ANGLETest::TearDown();
>     }
> 
>+    void texStorageMultisample(GLenum target,
>+                               GLint samples,
>+                               GLenum format,
>+                               GLsizei width,
>+                               GLsizei height,
>+                               GLboolean fixedsamplelocations);
>+
>+    void getTexLevelParameterfv(GLenum target, GLint level, GLenum pname, GLfloat *params);
>+    void getTexLevelParameteriv(GLenum target, GLint level, GLenum pname, GLint *params);
>+
>+    void getMultisamplefv(GLenum pname, GLuint index, GLfloat *val);
>+    void sampleMaski(GLuint maskNumber, GLbitfield mask);
>+
>     GLuint mFramebuffer = 0;
>     GLuint mTexture     = 0;
>+
>+    // Returns a sample count that can be used with the given texture target for all the given
>+    // formats. Assumes that if format A supports a number of samples N and another format B
>+    // supports a number of samples M > N then format B also supports number of samples N.
>+    GLint getSamplesToUse(GLenum texTarget, const std::vector<GLenum> &formats)
>+    {
>+        GLint maxSamples = 65536;
>+        for (GLenum format : formats)
>+        {
>+            GLint maxSamplesFormat = 0;
>+            glGetInternalformativ(texTarget, format, GL_SAMPLES, 1, &maxSamplesFormat);
>+            maxSamples = std::min(maxSamples, maxSamplesFormat);
>+        }
>+        return maxSamples;
>+    }
>+
>+    bool lessThanES31MultisampleExtNotSupported()
>+    {
>+        return getClientMajorVersion() <= 3 && getClientMinorVersion() < 1 &&
>+               !EnsureGLExtensionEnabled("GL_ANGLE_texture_multisample");
>+    }
>+
>+    const char *multisampleTextureFragmentShader()
>+    {
>+        return R"(#version 300 es
>+#extension GL_ANGLE_texture_multisample : require
>+precision highp float;
>+precision highp int;
>+
>+uniform highp sampler2DMS tex;
>+uniform int sampleNum;
>+
>+in vec4 v_position;
>+out vec4 my_FragColor;
>+
>+void main() {
>+    ivec2 texSize = textureSize(tex);
>+    ivec2 sampleCoords = ivec2((v_position.xy * 0.5 + 0.5) * vec2(texSize.xy - 1));
>+    my_FragColor = texelFetch(tex, sampleCoords, sampleNum);
>+}
>+)";
>+    }
>+
>+    const char *blitArrayTextureLayerFragmentShader()
>+    {
>+        return R"(#version 310 es
>+#extension GL_OES_texture_storage_multisample_2d_array : require
>+precision highp float;
>+precision highp int;
>+
>+uniform highp sampler2DMSArray tex;
>+uniform int layer;
>+uniform int sampleNum;
>+
>+in vec4 v_position;
>+out vec4 my_FragColor;
>+
>+void main() {
>+    ivec3 texSize = textureSize(tex);
>+    ivec2 sampleCoords = ivec2((v_position.xy * 0.5 + 0.5) * vec2(texSize.xy - 1));
>+    my_FragColor = texelFetch(tex, ivec3(sampleCoords, layer), sampleNum);
>+}
>+)";
>+    }
>+
>+    const char *blitIntArrayTextureLayerFragmentShader()
>+    {
>+        return R"(#version 310 es
>+#extension GL_OES_texture_storage_multisample_2d_array : require
>+precision highp float;
>+precision highp int;
>+
>+uniform highp isampler2DMSArray tex;
>+uniform int layer;
>+uniform int sampleNum;
>+
>+in vec4 v_position;
>+out vec4 my_FragColor;
>+
>+void main() {
>+    ivec3 texSize = textureSize(tex);
>+    ivec2 sampleCoords = ivec2((v_position.xy * 0.5 + 0.5) * vec2(texSize.xy - 1));
>+    my_FragColor = vec4(texelFetch(tex, ivec3(sampleCoords, layer), sampleNum));
>+}
>+)";
>+    }
> };
> 
>-class TextureMultisampleTestES31 : public TextureMultisampleTest
>+class NegativeTextureMultisampleTest : public TextureMultisampleTest
> {
>   protected:
>-    TextureMultisampleTestES31() : TextureMultisampleTest() {}
>+    NegativeTextureMultisampleTest() : TextureMultisampleTest() {}
> };
> 
>-// Tests that if es version < 3.1, GL_TEXTURE_2D_MULTISAMPLE is not supported in
>-// GetInternalformativ.
>-TEST_P(TextureMultisampleTest, MultisampleTargetGetInternalFormativBase)
>+class TextureMultisampleArrayWebGLTest : public TextureMultisampleTest
> {
>-    GLint maxSamples = 0;
>-    glGetInternalformativ(GL_TEXTURE_2D_MULTISAMPLE, GL_R8, GL_SAMPLES, 1, &maxSamples);
>-    if (getClientMajorVersion() < 3 || getClientMinorVersion() < 1)
>+  protected:
>+    TextureMultisampleArrayWebGLTest() : TextureMultisampleTest()
>     {
>-        ASSERT_GL_ERROR(GL_INVALID_OPERATION);
>+        // These tests run in WebGL mode so we can test with both extension off and on.
>+        setWebGLCompatibilityEnabled(true);
>+    }
>+
>+    // Requests the ANGLE_texture_multisample_array extension and returns true if the operation
>+    // succeeds.
>+    bool requestArrayExtension()
>+    {
>+        if (IsGLExtensionRequestable("GL_OES_texture_storage_multisample_2d_array"))
>+        {
>+            glRequestExtensionANGLE("GL_OES_texture_storage_multisample_2d_array");
>+        }
>+
>+        if (!IsGLExtensionEnabled("GL_OES_texture_storage_multisample_2d_array"))
>+        {
>+            return false;
>+        }
>+        return true;
>+    }
>+};
>+
>+void TextureMultisampleTest::texStorageMultisample(GLenum target,
>+                                                   GLint samples,
>+                                                   GLenum internalformat,
>+                                                   GLsizei width,
>+                                                   GLsizei height,
>+                                                   GLboolean fixedsamplelocations)
>+{
>+    if (getClientMajorVersion() <= 3 && getClientMinorVersion() < 1 &&
>+        EnsureGLExtensionEnabled("GL_ANGLE_texture_multisample"))
>+    {
>+        glTexStorage2DMultisampleANGLE(target, samples, internalformat, width, height,
>+                                       fixedsamplelocations);
>     }
>     else
>     {
>-        ASSERT_GL_NO_ERROR();
>+        glTexStorage2DMultisample(target, samples, internalformat, width, height,
>+                                  fixedsamplelocations);
>     }
> }
> 
>-// Tests that if es version < 3.1, GL_TEXTURE_2D_MULTISAMPLE is not supported in
>-// FramebufferTexture2D.
>-TEST_P(TextureMultisampleTest, MultisampleTargetFramebufferTexture2D)
>+void TextureMultisampleTest::getTexLevelParameterfv(GLenum target,
>+                                                    GLint level,
>+                                                    GLenum pname,
>+                                                    GLfloat *params)
> {
>-    GLint samples = 1;
>-    glBindTexture(GL_TEXTURE_2D_MULTISAMPLE, mTexture);
>-    glTexStorage2DMultisample(GL_TEXTURE_2D_MULTISAMPLE, samples, GL_RGBA8, 64, 64, GL_FALSE);
>-    if (getClientMajorVersion() < 3 || getClientMinorVersion() < 1)
>+    if (getClientMajorVersion() <= 3 && getClientMinorVersion() < 1 &&
>+        EnsureGLExtensionEnabled("GL_ANGLE_texture_multisample"))
>     {
>-        ASSERT_GL_ERROR(GL_INVALID_ENUM);
>+        glGetTexLevelParameterfvANGLE(target, level, pname, params);
>     }
>     else
>     {
>-        ASSERT_GL_NO_ERROR();
>+        glGetTexLevelParameterfv(target, level, pname, params);
>     }
>+}
> 
>-    glBindFramebuffer(GL_FRAMEBUFFER, mFramebuffer);
>-    glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D_MULTISAMPLE,
>-                           mTexture, 0);
>-    if (getClientMajorVersion() < 3 || getClientMinorVersion() < 1)
>+void TextureMultisampleTest::getTexLevelParameteriv(GLenum target,
>+                                                    GLint level,
>+                                                    GLenum pname,
>+                                                    GLint *params)
>+{
>+    if (getClientMajorVersion() <= 3 && getClientMinorVersion() < 1 &&
>+        EnsureGLExtensionEnabled("GL_ANGLE_texture_multisample"))
>     {
>-        ASSERT_GL_ERROR(GL_INVALID_OPERATION);
>+        glGetTexLevelParameterivANGLE(target, level, pname, params);
>     }
>     else
>     {
>-        ASSERT_GL_NO_ERROR();
>+        glGetTexLevelParameteriv(target, level, pname, params);
>     }
> }
> 
>+void TextureMultisampleTest::getMultisamplefv(GLenum pname, GLuint index, GLfloat *val)
>+{
>+    if (getClientMajorVersion() <= 3 && getClientMinorVersion() < 1 &&
>+        EnsureGLExtensionEnabled("GL_ANGLE_texture_multisample"))
>+    {
>+        glGetMultisamplefvANGLE(pname, index, val);
>+    }
>+    else
>+    {
>+        glGetMultisamplefv(pname, index, val);
>+    }
>+}
>+
>+void TextureMultisampleTest::sampleMaski(GLuint maskNumber, GLbitfield mask)
>+{
>+    if (getClientMajorVersion() <= 3 && getClientMinorVersion() < 1 &&
>+        EnsureGLExtensionEnabled("GL_ANGLE_texture_multisample"))
>+    {
>+        glSampleMaskiANGLE(maskNumber, mask);
>+    }
>+    else
>+    {
>+        glSampleMaski(maskNumber, mask);
>+    }
>+}
>+
>+// Tests that if es version < 3.1, GL_TEXTURE_2D_MULTISAMPLE is not supported in
>+// GetInternalformativ. Checks that the number of samples returned is valid in case of ES >= 3.1.
>+TEST_P(TextureMultisampleTest, MultisampleTargetGetInternalFormativBase)
>+{
>+    ANGLE_SKIP_TEST_IF(lessThanES31MultisampleExtNotSupported());
>+
>+    // This query returns supported sample counts in descending order. If only one sample count is
>+    // queried, it should be the maximum one.
>+    GLint maxSamplesR8 = 0;
>+    glGetInternalformativ(GL_TEXTURE_2D_MULTISAMPLE, GL_R8, GL_SAMPLES, 1, &maxSamplesR8);
>+
>+    // GLES 3.1 section 19.3.1 specifies the required minimum of how many samples are supported.
>+    GLint maxColorTextureSamples;
>+    glGetIntegerv(GL_MAX_COLOR_TEXTURE_SAMPLES, &maxColorTextureSamples);
>+    GLint maxSamples;
>+    glGetIntegerv(GL_MAX_SAMPLES, &maxSamples);
>+    GLint maxSamplesR8Required = std::min(maxColorTextureSamples, maxSamples);
>+
>+    EXPECT_GE(maxSamplesR8, maxSamplesR8Required);
>+    ASSERT_GL_NO_ERROR();
>+}
>+
>+// Tests that if es version < 3.1 and multisample extension is unsupported,
>+// GL_TEXTURE_2D_MULTISAMPLE_ANGLE is not supported in FramebufferTexture2D.
>+TEST_P(TextureMultisampleTest, MultisampleTargetFramebufferTexture2D)
>+{
>+    ANGLE_SKIP_TEST_IF(lessThanES31MultisampleExtNotSupported());
>+    GLint samples = 1;
>+    glBindTexture(GL_TEXTURE_2D_MULTISAMPLE, mTexture);
>+    texStorageMultisample(GL_TEXTURE_2D_MULTISAMPLE, samples, GL_RGBA8, 64, 64, GL_FALSE);
>+
>+    glBindFramebuffer(GL_FRAMEBUFFER, mFramebuffer);
>+    glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D_MULTISAMPLE,
>+                           mTexture, 0);
>+
>+    ASSERT_GL_NO_ERROR();
>+}
>+
> // Tests basic functionality of glTexStorage2DMultisample.
>-TEST_P(TextureMultisampleTestES31, ValidateTextureStorageMultisampleParameters)
>+TEST_P(TextureMultisampleTest, ValidateTextureStorageMultisampleParameters)
> {
>+    ANGLE_SKIP_TEST_IF(lessThanES31MultisampleExtNotSupported());
>+
>     glBindTexture(GL_TEXTURE_2D_MULTISAMPLE, mTexture);
>-    glTexStorage2DMultisample(GL_TEXTURE_2D_MULTISAMPLE, 1, GL_RGBA8, 1, 1, GL_FALSE);
>+    texStorageMultisample(GL_TEXTURE_2D_MULTISAMPLE, 1, GL_RGBA8, 1, 1, GL_FALSE);
>     ASSERT_GL_NO_ERROR();
> 
>     GLint params = 0;
>     glGetTexParameteriv(GL_TEXTURE_2D_MULTISAMPLE, GL_TEXTURE_IMMUTABLE_FORMAT, &params);
>     EXPECT_EQ(1, params);
> 
>-    glTexStorage2DMultisample(GL_TEXTURE_2D, 1, GL_RGBA8, 1, 1, GL_FALSE);
>+    texStorageMultisample(GL_TEXTURE_2D, 1, GL_RGBA8, 1, 1, GL_FALSE);
>     ASSERT_GL_ERROR(GL_INVALID_ENUM);
> 
>-    glTexStorage2DMultisample(GL_TEXTURE_2D_MULTISAMPLE, 1, GL_RGBA8, 0, 0, GL_FALSE);
>+    texStorageMultisample(GL_TEXTURE_2D_MULTISAMPLE, 1, GL_RGBA8, 0, 0, GL_FALSE);
>     ASSERT_GL_ERROR(GL_INVALID_VALUE);
> 
>     GLint maxSize = 0;
>     glGetIntegerv(GL_MAX_TEXTURE_SIZE, &maxSize);
>-    glTexStorage2DMultisample(GL_TEXTURE_2D_MULTISAMPLE, 1, GL_RGBA8, maxSize + 1, 1, GL_FALSE);
>+    texStorageMultisample(GL_TEXTURE_2D_MULTISAMPLE, 1, GL_RGBA8, maxSize + 1, 1, GL_FALSE);
>     ASSERT_GL_ERROR(GL_INVALID_VALUE);
> 
>     GLint maxSamples = 0;
>     glGetInternalformativ(GL_TEXTURE_2D_MULTISAMPLE, GL_R8, GL_SAMPLES, 1, &maxSamples);
>-    glTexStorage2DMultisample(GL_TEXTURE_2D_MULTISAMPLE, maxSamples + 1, GL_RGBA8, 1, 1, GL_FALSE);
>+    texStorageMultisample(GL_TEXTURE_2D_MULTISAMPLE, maxSamples + 1, GL_RGBA8, 1, 1, GL_FALSE);
>     ASSERT_GL_ERROR(GL_INVALID_OPERATION);
> 
>-    glTexStorage2DMultisample(GL_TEXTURE_2D_MULTISAMPLE, 0, GL_RGBA8, 1, 1, GL_FALSE);
>+    texStorageMultisample(GL_TEXTURE_2D_MULTISAMPLE, 0, GL_RGBA8, 1, 1, GL_FALSE);
>     ASSERT_GL_ERROR(GL_INVALID_VALUE);
> 
>-    glTexStorage2DMultisample(GL_TEXTURE_2D_MULTISAMPLE, 1, GL_RGBA, 0, 0, GL_FALSE);
>+    texStorageMultisample(GL_TEXTURE_2D_MULTISAMPLE, 1, GL_RGBA, 0, 0, GL_FALSE);
>     ASSERT_GL_ERROR(GL_INVALID_VALUE);
> 
>     glBindTexture(GL_TEXTURE_2D_MULTISAMPLE, 0);
>-    glTexStorage2DMultisample(GL_TEXTURE_2D_MULTISAMPLE, 1, GL_RGBA8, 1, 1, GL_FALSE);
>+    texStorageMultisample(GL_TEXTURE_2D_MULTISAMPLE, 1, GL_RGBA8, 1, 1, GL_FALSE);
>     ASSERT_GL_ERROR(GL_INVALID_OPERATION);
> }
> 
> // Tests the value of MAX_INTEGER_SAMPLES is no less than 1.
> // [OpenGL ES 3.1 SPEC Table 20.40]
>-TEST_P(TextureMultisampleTestES31, MaxIntegerSamples)
>+TEST_P(TextureMultisampleTest, MaxIntegerSamples)
> {
>+    ANGLE_SKIP_TEST_IF(lessThanES31MultisampleExtNotSupported());
>     GLint maxIntegerSamples;
>     glGetIntegerv(GL_MAX_INTEGER_SAMPLES, &maxIntegerSamples);
>     EXPECT_GE(maxIntegerSamples, 1);
>@@ -152,8 +366,9 @@ TEST_P(TextureMultisampleTestES31, MaxIntegerSamples)
> 
> // Tests the value of MAX_COLOR_TEXTURE_SAMPLES is no less than 1.
> // [OpenGL ES 3.1 SPEC Table 20.40]
>-TEST_P(TextureMultisampleTestES31, MaxColorTextureSamples)
>+TEST_P(TextureMultisampleTest, MaxColorTextureSamples)
> {
>+    ANGLE_SKIP_TEST_IF(lessThanES31MultisampleExtNotSupported());
>     GLint maxColorTextureSamples;
>     glGetIntegerv(GL_MAX_COLOR_TEXTURE_SAMPLES, &maxColorTextureSamples);
>     EXPECT_GE(maxColorTextureSamples, 1);
>@@ -162,19 +377,669 @@ TEST_P(TextureMultisampleTestES31, MaxColorTextureSamples)
> 
> // Tests the value of MAX_DEPTH_TEXTURE_SAMPLES is no less than 1.
> // [OpenGL ES 3.1 SPEC Table 20.40]
>-TEST_P(TextureMultisampleTestES31, MaxDepthTextureSamples)
>+TEST_P(TextureMultisampleTest, MaxDepthTextureSamples)
> {
>+    ANGLE_SKIP_TEST_IF(lessThanES31MultisampleExtNotSupported());
>     GLint maxDepthTextureSamples;
>     glGetIntegerv(GL_MAX_DEPTH_TEXTURE_SAMPLES, &maxDepthTextureSamples);
>     EXPECT_GE(maxDepthTextureSamples, 1);
>     EXPECT_NE(std::numeric_limits<GLint>::max(), maxDepthTextureSamples);
> }
> 
>+// Tests that getTexLevelParameter is supported by ES 3.1 or ES 3.0 and ANGLE_texture_multisample
>+TEST_P(TextureMultisampleTest, GetTexLevelParameter)
>+{
>+    ANGLE_SKIP_TEST_IF(lessThanES31MultisampleExtNotSupported());
>+
>+    glBindTexture(GL_TEXTURE_2D_MULTISAMPLE, mTexture);
>+    texStorageMultisample(GL_TEXTURE_2D_MULTISAMPLE, 4, GL_RGBA8, 1, 1, GL_TRUE);
>+    ASSERT_GL_NO_ERROR();
>+
>+    GLfloat levelSamples = 0;
>+    getTexLevelParameterfv(GL_TEXTURE_2D_MULTISAMPLE, 0, GL_TEXTURE_SAMPLES, &levelSamples);
>+    EXPECT_EQ(levelSamples, 4);
>+
>+    GLint fixedSampleLocation = false;
>+    getTexLevelParameteriv(GL_TEXTURE_2D_MULTISAMPLE, 0, GL_TEXTURE_FIXED_SAMPLE_LOCATIONS,
>+                           &fixedSampleLocation);
>+    EXPECT_EQ(fixedSampleLocation, 1);
>+
>+    ASSERT_GL_NO_ERROR();
>+}
>+
>+// The value of sample position should be equal to standard pattern on D3D.
>+TEST_P(TextureMultisampleTest, CheckSamplePositions)
>+{
>+    ANGLE_SKIP_TEST_IF(!IsD3D11());
>+
>+    GLsizei maxSamples = 0;
>+    glGetIntegerv(GL_MAX_SAMPLES, &maxSamples);
>+
>+    GLfloat samplePosition[2];
>+
>+    glBindFramebuffer(GL_DRAW_FRAMEBUFFER, mFramebuffer);
>+
>+    for (int sampleCount = 1; sampleCount <= maxSamples; sampleCount++)
>+    {
>+        GLTexture texture;
>+        size_t indexKey = static_cast<size_t>(ceil(log2(sampleCount)));
>+        glBindTexture(GL_TEXTURE_2D_MULTISAMPLE, texture);
>+        texStorageMultisample(GL_TEXTURE_2D_MULTISAMPLE, sampleCount, GL_RGBA8, 1, 1, GL_TRUE);
>+        glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D_MULTISAMPLE,
>+                               texture, 0);
>+        EXPECT_GLENUM_EQ(GL_FRAMEBUFFER_COMPLETE, glCheckFramebufferStatus(GL_FRAMEBUFFER));
>+        ASSERT_GL_NO_ERROR();
>+
>+        for (int sampleIndex = 0; sampleIndex < sampleCount; sampleIndex++)
>+        {
>+            getMultisamplefv(GL_SAMPLE_POSITION, sampleIndex, samplePosition);
>+            EXPECT_EQ(samplePosition[0], kSamplePositions[indexKey][2 * sampleIndex]);
>+            EXPECT_EQ(samplePosition[1], kSamplePositions[indexKey][2 * sampleIndex + 1]);
>+        }
>+    }
>+
>+    ASSERT_GL_NO_ERROR();
>+}
>+
>+// Test textureSize and texelFetch when using ANGLE_texture_multisample extension
>+TEST_P(TextureMultisampleTest, SimpleTexelFetch)
>+{
>+    ANGLE_SKIP_TEST_IF(!EnsureGLExtensionEnabled("GL_ANGLE_texture_multisample"));
>+
>+    ANGLE_GL_PROGRAM(texelFetchProgram, essl3_shaders::vs::Passthrough(),
>+                     multisampleTextureFragmentShader());
>+
>+    GLint texLocation = glGetUniformLocation(texelFetchProgram, "tex");
>+    ASSERT_GE(texLocation, 0);
>+    GLint sampleNumLocation = glGetUniformLocation(texelFetchProgram, "sampleNum");
>+    ASSERT_GE(sampleNumLocation, 0);
>+
>+    const GLsizei kWidth  = 4;
>+    const GLsizei kHeight = 4;
>+
>+    std::vector<GLenum> testFormats = {GL_RGBA8};
>+    GLint samplesToUse              = getSamplesToUse(GL_TEXTURE_2D_MULTISAMPLE_ANGLE, testFormats);
>+
>+    glBindTexture(GL_TEXTURE_2D_MULTISAMPLE_ANGLE, mTexture);
>+    texStorageMultisample(GL_TEXTURE_2D_MULTISAMPLE_ANGLE, samplesToUse, GL_RGBA8, kWidth, kHeight,
>+                          GL_TRUE);
>+    ASSERT_GL_NO_ERROR();
>+
>+    // Clear texture zero to green.
>+    glBindFramebuffer(GL_FRAMEBUFFER, mFramebuffer);
>+    GLColor clearColor = GLColor::green;
>+
>+    glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D_MULTISAMPLE_ANGLE,
>+                           mTexture, 0);
>+    GLenum status = glCheckFramebufferStatus(GL_FRAMEBUFFER);
>+    ASSERT_GLENUM_EQ(GL_FRAMEBUFFER_COMPLETE, status);
>+    glClearColor(clearColor.R / 255.0f, clearColor.G / 255.0f, clearColor.B / 255.0f,
>+                 clearColor.A / 255.0f);
>+    glClear(GL_COLOR_BUFFER_BIT);
>+    ASSERT_GL_NO_ERROR();
>+
>+    glBindFramebuffer(GL_FRAMEBUFFER, 0);
>+    glUseProgram(texelFetchProgram);
>+    glViewport(0, 0, kWidth, kHeight);
>+
>+    for (GLint sampleNum = 0; sampleNum < samplesToUse; ++sampleNum)
>+    {
>+        glUniform1i(sampleNumLocation, sampleNum);
>+        drawQuad(texelFetchProgram, essl31_shaders::PositionAttrib(), 0.5f, 1.0f, true);
>+        ASSERT_GL_NO_ERROR();
>+        EXPECT_PIXEL_RECT_EQ(0, 0, kWidth, kHeight, clearColor);
>+    }
>+}
>+
>+TEST_P(TextureMultisampleTest, SampleMaski)
>+{
>+    ANGLE_SKIP_TEST_IF(lessThanES31MultisampleExtNotSupported());
>+
>+    GLint maxSampleMaskWords = 0;
>+    glGetIntegerv(GL_MAX_SAMPLE_MASK_WORDS, &maxSampleMaskWords);
>+    sampleMaski(maxSampleMaskWords - 1, 0x1);
>+    ASSERT_GL_NO_ERROR();
>+
>+    glGetIntegerv(GL_MAX_SAMPLE_MASK_WORDS, &maxSampleMaskWords);
>+    sampleMaski(maxSampleMaskWords, 0x1);
>+    ASSERT_GL_ERROR(GL_INVALID_VALUE);
>+}
>+
>+// Negative tests of multisample texture. When context less than ES 3.1 and ANGLE_texture_multsample
>+// not enabled, the feature isn't supported.
>+TEST_P(NegativeTextureMultisampleTest, Negtive)
>+{
>+    ANGLE_SKIP_TEST_IF(EnsureGLExtensionEnabled("GL_ANGLE_texture_multisample"));
>+
>+    GLint maxSamples = 0;
>+    glGetInternalformativ(GL_TEXTURE_2D_MULTISAMPLE, GL_R8, GL_SAMPLES, 1, &maxSamples);
>+    ASSERT_GL_ERROR(GL_INVALID_ENUM);
>+
>+    GLint maxColorTextureSamples;
>+    glGetIntegerv(GL_MAX_COLOR_TEXTURE_SAMPLES, &maxColorTextureSamples);
>+    ASSERT_GL_ERROR(GL_INVALID_ENUM);
>+
>+    GLint maxDepthTextureSamples;
>+    glGetIntegerv(GL_MAX_DEPTH_TEXTURE_SAMPLES, &maxDepthTextureSamples);
>+    ASSERT_GL_ERROR(GL_INVALID_ENUM);
>+
>+    glBindTexture(GL_TEXTURE_2D_MULTISAMPLE, mTexture);
>+    ASSERT_GL_ERROR(GL_INVALID_ENUM);
>+
>+    texStorageMultisample(GL_TEXTURE_2D_MULTISAMPLE, 4, GL_RGBA8, 64, 64, GL_FALSE);
>+    ASSERT_GL_ERROR(GL_INVALID_OPERATION);
>+
>+    glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D_MULTISAMPLE,
>+                           mTexture, 0);
>+    ASSERT_GL_ERROR(GL_INVALID_OPERATION);
>+
>+    GLint params = 0;
>+    glGetTexParameteriv(GL_TEXTURE_2D_MULTISAMPLE, GL_TEXTURE_IMMUTABLE_FORMAT, &params);
>+    ASSERT_GL_ERROR(GL_INVALID_ENUM);
>+
>+    GLfloat levelSamples = 0;
>+    getTexLevelParameterfv(GL_TEXTURE_2D_MULTISAMPLE, 0, GL_TEXTURE_SAMPLES, &levelSamples);
>+    ASSERT_GL_ERROR(GL_INVALID_OPERATION);
>+
>+    GLint fixedSampleLocation = false;
>+    getTexLevelParameteriv(GL_TEXTURE_2D_MULTISAMPLE, 0, GL_TEXTURE_FIXED_SAMPLE_LOCATIONS,
>+                           &fixedSampleLocation);
>+    ASSERT_GL_ERROR(GL_INVALID_OPERATION);
>+
>+    GLint maxSampleMaskWords = 0;
>+    glGetIntegerv(GL_MAX_SAMPLE_MASK_WORDS, &maxSampleMaskWords);
>+    ASSERT_GL_ERROR(GL_INVALID_ENUM);
>+    sampleMaski(maxSampleMaskWords - 1, 0x1);
>+    ASSERT_GL_ERROR(GL_INVALID_OPERATION);
>+}
>+
>+// Tests that GL_TEXTURE_2D_MULTISAMPLE_ARRAY is not supported in GetInternalformativ when the
>+// extension is not supported.
>+TEST_P(TextureMultisampleArrayWebGLTest, MultisampleArrayTargetGetInternalFormativWithoutExtension)
>+{
>+    GLint maxSamples = 0;
>+    glGetInternalformativ(GL_TEXTURE_2D_MULTISAMPLE_ARRAY_OES, GL_RGBA8, GL_SAMPLES, 1,
>+                          &maxSamples);
>+    ASSERT_GL_ERROR(GL_INVALID_ENUM);
>+}
>+
>+// Attempt to bind a texture to multisample array binding point when extension is not supported.
>+TEST_P(TextureMultisampleArrayWebGLTest, BindMultisampleArrayTextureWithoutExtension)
>+{
>+    glBindTexture(GL_TEXTURE_2D_MULTISAMPLE_ARRAY_OES, mTexture);
>+    ASSERT_GL_ERROR(GL_INVALID_ENUM);
>+}
>+
>+// Try to compile shaders using GL_OES_texture_storage_multisample_2d_array when the extension is
>+// not enabled.
>+TEST_P(TextureMultisampleArrayWebGLTest, ShaderWithoutExtension)
>+{
>+    constexpr char kFSRequiresExtension[] = R"(#version 310 es
>+#extension GL_OES_texture_storage_multisample_2d_array : require
>+out highp vec4 my_FragColor;
>+
>+void main() {
>+        my_FragColor = vec4(0.0);
>+})";
>+
>+    GLuint program = CompileProgram(essl31_shaders::vs::Simple(), kFSRequiresExtension);
>+    EXPECT_EQ(0u, program);
>+
>+    constexpr char kFSEnableAndUseExtension[] = R"(#version 310 es
>+#extension GL_OES_texture_storage_multisample_2d_array : enable
>+
>+uniform highp sampler2DMSArray tex;
>+out highp ivec4 outSize;
>+
>+void main() {
>+        outSize = ivec4(textureSize(tex), 0);
>+})";
>+
>+    program = CompileProgram(essl31_shaders::vs::Simple(), kFSEnableAndUseExtension);
>+    EXPECT_EQ(0u, program);
>+}
>+
>+// Tests that GL_TEXTURE_2D_MULTISAMPLE_ARRAY is supported in GetInternalformativ.
>+TEST_P(TextureMultisampleArrayWebGLTest, MultisampleArrayTargetGetInternalFormativ)
>+{
>+    ANGLE_SKIP_TEST_IF(!requestArrayExtension());
>+
>+    // This query returns supported sample counts in descending order. If only one sample count is
>+    // queried, it should be the maximum one.
>+    GLint maxSamplesRGBA8 = 0;
>+    glGetInternalformativ(GL_TEXTURE_2D_MULTISAMPLE_ARRAY_OES, GL_RGBA8, GL_SAMPLES, 1,
>+                          &maxSamplesRGBA8);
>+    GLint maxSamplesDepth = 0;
>+    glGetInternalformativ(GL_TEXTURE_2D_MULTISAMPLE_ARRAY_OES, GL_DEPTH_COMPONENT24, GL_SAMPLES, 1,
>+                          &maxSamplesDepth);
>+    ASSERT_GL_NO_ERROR();
>+
>+    // GLES 3.1 section 19.3.1 specifies the required minimum of how many samples are supported.
>+    GLint maxColorTextureSamples;
>+    glGetIntegerv(GL_MAX_COLOR_TEXTURE_SAMPLES, &maxColorTextureSamples);
>+    GLint maxDepthTextureSamples;
>+    glGetIntegerv(GL_MAX_DEPTH_TEXTURE_SAMPLES, &maxDepthTextureSamples);
>+    GLint maxSamples;
>+    glGetIntegerv(GL_MAX_SAMPLES, &maxSamples);
>+
>+    GLint maxSamplesRGBA8Required = std::min(maxColorTextureSamples, maxSamples);
>+    EXPECT_GE(maxSamplesRGBA8, maxSamplesRGBA8Required);
>+
>+    GLint maxSamplesDepthRequired = std::min(maxDepthTextureSamples, maxSamples);
>+    EXPECT_GE(maxSamplesDepth, maxSamplesDepthRequired);
>+}
>+
>+// Tests that TexImage3D call cannot be used for GL_TEXTURE_2D_MULTISAMPLE_ARRAY.
>+TEST_P(TextureMultisampleArrayWebGLTest, MultiSampleArrayTexImage)
>+{
>+    ANGLE_SKIP_TEST_IF(!requestArrayExtension());
>+
>+    glBindTexture(GL_TEXTURE_2D_MULTISAMPLE_ARRAY_OES, mTexture);
>+    ASSERT_GL_NO_ERROR();
>+
>+    glTexImage3D(GL_TEXTURE_2D_MULTISAMPLE_ARRAY_OES, 0, GL_RGBA8, 1, 1, 1, 0, GL_RGBA,
>+                 GL_UNSIGNED_BYTE, nullptr);
>+    EXPECT_GL_ERROR(GL_INVALID_ENUM);
>+}
>+
>+// Tests passing invalid parameters to TexStorage3DMultisample.
>+TEST_P(TextureMultisampleArrayWebGLTest, InvalidTexStorage3DMultisample)
>+{
>+    ANGLE_SKIP_TEST_IF(!requestArrayExtension());
>+
>+    glBindTexture(GL_TEXTURE_2D_MULTISAMPLE_ARRAY_OES, mTexture);
>+    ASSERT_GL_NO_ERROR();
>+
>+    // Invalid target
>+    glTexStorage3DMultisampleOES(GL_TEXTURE_2D_MULTISAMPLE, 2, GL_RGBA8, 1, 1, 1, GL_TRUE);
>+    EXPECT_GL_ERROR(GL_INVALID_ENUM);
>+
>+    // Samples 0
>+    glTexStorage3DMultisampleOES(GL_TEXTURE_2D_MULTISAMPLE_ARRAY_OES, 0, GL_RGBA8, 1, 1, 1,
>+                                 GL_TRUE);
>+    EXPECT_GL_ERROR(GL_INVALID_VALUE);
>+
>+    // Unsized internalformat
>+    glTexStorage3DMultisampleOES(GL_TEXTURE_2D_MULTISAMPLE_ARRAY_OES, 2, GL_RGBA, 1, 1, 1, GL_TRUE);
>+    EXPECT_GL_ERROR(GL_INVALID_ENUM);
>+
>+    // Width 0
>+    glTexStorage3DMultisampleOES(GL_TEXTURE_2D_MULTISAMPLE_ARRAY_OES, 2, GL_RGBA8, 0, 1, 1,
>+                                 GL_TRUE);
>+    EXPECT_GL_ERROR(GL_INVALID_VALUE);
>+
>+    // Height 0
>+    glTexStorage3DMultisampleOES(GL_TEXTURE_2D_MULTISAMPLE_ARRAY_OES, 2, GL_RGBA8, 1, 0, 1,
>+                                 GL_TRUE);
>+    EXPECT_GL_ERROR(GL_INVALID_VALUE);
>+
>+    // Depth 0
>+    glTexStorage3DMultisampleOES(GL_TEXTURE_2D_MULTISAMPLE_ARRAY_OES, 2, GL_RGBA8, 1, 1, 0,
>+                                 GL_TRUE);
>+    EXPECT_GL_ERROR(GL_INVALID_VALUE);
>+}
>+
>+// Tests passing invalid parameters to TexParameteri.
>+TEST_P(TextureMultisampleArrayWebGLTest, InvalidTexParameteri)
>+{
>+    ANGLE_SKIP_TEST_IF(!requestArrayExtension());
>+
>+    glBindTexture(GL_TEXTURE_2D_MULTISAMPLE_ARRAY_OES, mTexture);
>+    ASSERT_GL_NO_ERROR();
>+
>+    // None of the sampler parameters can be set on GL_TEXTURE_2D_MULTISAMPLE_ARRAY_OES.
>+    glTexParameteri(GL_TEXTURE_2D_MULTISAMPLE_ARRAY_OES, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
>+    EXPECT_GL_ERROR(GL_INVALID_ENUM);
>+    glTexParameteri(GL_TEXTURE_2D_MULTISAMPLE_ARRAY_OES, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
>+    EXPECT_GL_ERROR(GL_INVALID_ENUM);
>+
>+    glTexParameteri(GL_TEXTURE_2D_MULTISAMPLE_ARRAY_OES, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
>+    EXPECT_GL_ERROR(GL_INVALID_ENUM);
>+    glTexParameteri(GL_TEXTURE_2D_MULTISAMPLE_ARRAY_OES, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
>+    EXPECT_GL_ERROR(GL_INVALID_ENUM);
>+    glTexParameteri(GL_TEXTURE_2D_MULTISAMPLE_ARRAY_OES, GL_TEXTURE_WRAP_R, GL_CLAMP_TO_EDGE);
>+    EXPECT_GL_ERROR(GL_INVALID_ENUM);
>+
>+    glTexParameteri(GL_TEXTURE_2D_MULTISAMPLE_ARRAY_OES, GL_TEXTURE_MIN_LOD, 0);
>+    EXPECT_GL_ERROR(GL_INVALID_ENUM);
>+    glTexParameteri(GL_TEXTURE_2D_MULTISAMPLE_ARRAY_OES, GL_TEXTURE_MAX_LOD, 0);
>+    EXPECT_GL_ERROR(GL_INVALID_ENUM);
>+
>+    glTexParameteri(GL_TEXTURE_2D_MULTISAMPLE_ARRAY_OES, GL_TEXTURE_COMPARE_MODE, GL_NONE);
>+    EXPECT_GL_ERROR(GL_INVALID_ENUM);
>+    glTexParameteri(GL_TEXTURE_2D_MULTISAMPLE_ARRAY_OES, GL_TEXTURE_COMPARE_FUNC, GL_ALWAYS);
>+    EXPECT_GL_ERROR(GL_INVALID_ENUM);
>+
>+    // Only valid base level on GL_TEXTURE_2D_MULTISAMPLE_ARRAY_OES is 0.
>+    glTexParameteri(GL_TEXTURE_2D_MULTISAMPLE_ARRAY_OES, GL_TEXTURE_BASE_LEVEL, 1);
>+    EXPECT_GL_ERROR(GL_INVALID_OPERATION);
>+}
>+
>+// Test a valid TexStorage3DMultisample call and check that the queried texture level parameters
>+// match. Does not do any drawing.
>+TEST_P(TextureMultisampleArrayWebGLTest, TexStorage3DMultisample)
>+{
>+    ANGLE_SKIP_TEST_IF(!requestArrayExtension());
>+
>+    GLint maxSamplesRGBA8 = 0;
>+    glGetInternalformativ(GL_TEXTURE_2D_MULTISAMPLE_ARRAY_OES, GL_RGBA8, GL_SAMPLES, 1,
>+                          &maxSamplesRGBA8);
>+
>+    glBindTexture(GL_TEXTURE_2D_MULTISAMPLE_ARRAY_OES, mTexture);
>+    ASSERT_GL_NO_ERROR();
>+
>+    glTexStorage3DMultisampleOES(GL_TEXTURE_2D_MULTISAMPLE_ARRAY_OES, maxSamplesRGBA8, GL_RGBA8, 8,
>+                                 4, 2, GL_TRUE);
>+    ASSERT_GL_NO_ERROR();
>+
>+    GLint width = 0, height = 0, depth = 0, samples = 0;
>+    glGetTexLevelParameteriv(GL_TEXTURE_2D_MULTISAMPLE_ARRAY_OES, 0, GL_TEXTURE_WIDTH, &width);
>+    glGetTexLevelParameteriv(GL_TEXTURE_2D_MULTISAMPLE_ARRAY_OES, 0, GL_TEXTURE_HEIGHT, &height);
>+    glGetTexLevelParameteriv(GL_TEXTURE_2D_MULTISAMPLE_ARRAY_OES, 0, GL_TEXTURE_DEPTH, &depth);
>+    glGetTexLevelParameteriv(GL_TEXTURE_2D_MULTISAMPLE_ARRAY_OES, 0, GL_TEXTURE_SAMPLES, &samples);
>+    ASSERT_GL_NO_ERROR();
>+
>+    EXPECT_EQ(8, width);
>+    EXPECT_EQ(4, height);
>+    EXPECT_EQ(2, depth);
>+    EXPECT_EQ(maxSamplesRGBA8, samples);
>+}
>+
>+// Test for invalid FramebufferTextureLayer calls with GL_TEXTURE_2D_MULTISAMPLE_ARRAY_OES
>+// textures.
>+TEST_P(TextureMultisampleArrayWebGLTest, InvalidFramebufferTextureLayer)
>+{
>+    ANGLE_SKIP_TEST_IF(!requestArrayExtension());
>+
>+    GLint maxSamplesRGBA8 = 0;
>+    glGetInternalformativ(GL_TEXTURE_2D_MULTISAMPLE_ARRAY_OES, GL_RGBA8, GL_SAMPLES, 1,
>+                          &maxSamplesRGBA8);
>+
>+    GLint maxArrayTextureLayers;
>+    glGetIntegerv(GL_MAX_ARRAY_TEXTURE_LAYERS, &maxArrayTextureLayers);
>+
>+    // Test framebuffer status with just a color texture attached.
>+    glBindTexture(GL_TEXTURE_2D_MULTISAMPLE_ARRAY_OES, mTexture);
>+    glTexStorage3DMultisampleOES(GL_TEXTURE_2D_MULTISAMPLE_ARRAY_OES, maxSamplesRGBA8, GL_RGBA8, 4,
>+                                 4, 2, GL_TRUE);
>+    ASSERT_GL_NO_ERROR();
>+
>+    // Test with mip level 1 and -1 (only level 0 is valid for multisample textures).
>+    glBindFramebuffer(GL_FRAMEBUFFER, mFramebuffer);
>+    glFramebufferTextureLayer(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, mTexture, 1, 0);
>+    EXPECT_GL_ERROR(GL_INVALID_VALUE);
>+    glFramebufferTextureLayer(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, mTexture, -1, 0);
>+    EXPECT_GL_ERROR(GL_INVALID_VALUE);
>+
>+    // Test with layer -1 and layer == MAX_ARRAY_TEXTURE_LAYERS
>+    glBindFramebuffer(GL_FRAMEBUFFER, mFramebuffer);
>+    glFramebufferTextureLayer(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, mTexture, 0, -1);
>+    EXPECT_GL_ERROR(GL_INVALID_VALUE);
>+    glFramebufferTextureLayer(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, mTexture, 0,
>+                              maxArrayTextureLayers);
>+    EXPECT_GL_ERROR(GL_INVALID_VALUE);
>+}
>+
>+// Attach layers of TEXTURE_2D_MULTISAMPLE_ARRAY textures to a framebuffer and check for
>+// completeness.
>+TEST_P(TextureMultisampleArrayWebGLTest, FramebufferCompleteness)
>+{
>+    ANGLE_SKIP_TEST_IF(!requestArrayExtension());
>+
>+    std::vector<GLenum> testFormats = {{GL_RGBA8, GL_DEPTH_COMPONENT24, GL_DEPTH24_STENCIL8}};
>+    GLint samplesToUse = getSamplesToUse(GL_TEXTURE_2D_MULTISAMPLE_ARRAY_OES, testFormats);
>+
>+    // Test framebuffer status with just a color texture attached.
>+    glBindTexture(GL_TEXTURE_2D_MULTISAMPLE_ARRAY_OES, mTexture);
>+    glTexStorage3DMultisampleOES(GL_TEXTURE_2D_MULTISAMPLE_ARRAY_OES, samplesToUse, GL_RGBA8, 4, 4,
>+                                 2, GL_TRUE);
>+    ASSERT_GL_NO_ERROR();
>+
>+    glBindFramebuffer(GL_FRAMEBUFFER, mFramebuffer);
>+    glFramebufferTextureLayer(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, mTexture, 0, 0);
>+    ASSERT_GL_NO_ERROR();
>+
>+    GLenum status = glCheckFramebufferStatus(GL_FRAMEBUFFER);
>+    ASSERT_GLENUM_EQ(GL_FRAMEBUFFER_COMPLETE, status);
>+
>+    // Test framebuffer status with both color and depth textures attached.
>+    GLTexture depthTexture;
>+    glBindTexture(GL_TEXTURE_2D_MULTISAMPLE_ARRAY_OES, depthTexture);
>+    glTexStorage3DMultisampleOES(GL_TEXTURE_2D_MULTISAMPLE_ARRAY_OES, samplesToUse,
>+                                 GL_DEPTH_COMPONENT24, 4, 4, 2, GL_TRUE);
>+    ASSERT_GL_NO_ERROR();
>+
>+    glFramebufferTextureLayer(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, depthTexture, 0, 0);
>+    ASSERT_GL_NO_ERROR();
>+
>+    status = glCheckFramebufferStatus(GL_FRAMEBUFFER);
>+    ASSERT_GLENUM_EQ(GL_FRAMEBUFFER_COMPLETE, status);
>+
>+    // Test with color and depth/stencil textures attached.
>+    GLTexture depthStencilTexture;
>+    glBindTexture(GL_TEXTURE_2D_MULTISAMPLE_ARRAY_OES, depthStencilTexture);
>+    glTexStorage3DMultisampleOES(GL_TEXTURE_2D_MULTISAMPLE_ARRAY_OES, samplesToUse,
>+                                 GL_DEPTH24_STENCIL8, 4, 4, 2, GL_TRUE);
>+    ASSERT_GL_NO_ERROR();
>+
>+    glFramebufferTextureLayer(GL_FRAMEBUFFER, GL_DEPTH_STENCIL_ATTACHMENT, depthStencilTexture, 0,
>+                              0);
>+    ASSERT_GL_NO_ERROR();
>+
>+    status = glCheckFramebufferStatus(GL_FRAMEBUFFER);
>+    ASSERT_GLENUM_EQ(GL_FRAMEBUFFER_COMPLETE, status);
>+}
>+
>+// Attach a layer of TEXTURE_2D_MULTISAMPLE_ARRAY texture to a framebuffer, clear it, and resolve by
>+// blitting.
>+TEST_P(TextureMultisampleArrayWebGLTest, FramebufferColorClearAndBlit)
>+{
>+    ANGLE_SKIP_TEST_IF(!requestArrayExtension());
>+
>+    const GLsizei kWidth  = 4;
>+    const GLsizei kHeight = 4;
>+
>+    std::vector<GLenum> testFormats = {GL_RGBA8};
>+    GLint samplesToUse = getSamplesToUse(GL_TEXTURE_2D_MULTISAMPLE_ARRAY_OES, testFormats);
>+
>+    glBindTexture(GL_TEXTURE_2D_MULTISAMPLE_ARRAY_OES, mTexture);
>+    glTexStorage3DMultisampleOES(GL_TEXTURE_2D_MULTISAMPLE_ARRAY_OES, samplesToUse, GL_RGBA8,
>+                                 kWidth, kHeight, 2, GL_TRUE);
>+
>+    glBindFramebuffer(GL_FRAMEBUFFER, mFramebuffer);
>+    glFramebufferTextureLayer(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, mTexture, 0, 0);
>+
>+    GLenum status = glCheckFramebufferStatus(GL_FRAMEBUFFER);
>+    ASSERT_GL_NO_ERROR();
>+    ASSERT_GLENUM_EQ(GL_FRAMEBUFFER_COMPLETE, status);
>+
>+    glClearColor(0.0f, 1.0f, 0.0f, 1.0f);
>+    glClear(GL_COLOR_BUFFER_BIT);
>+
>+    GLFramebuffer resolveFramebuffer;
>+    GLTexture resolveTexture;
>+    glBindTexture(GL_TEXTURE_2D, resolveTexture);
>+    glTexStorage2D(GL_TEXTURE_2D, 1, GL_RGBA8, kWidth, kHeight);
>+    glBindFramebuffer(GL_DRAW_FRAMEBUFFER, resolveFramebuffer);
>+    glFramebufferTexture2D(GL_DRAW_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, resolveTexture,
>+                           0);
>+    glBlitFramebuffer(0, 0, kWidth, kHeight, 0, 0, kWidth, kHeight, GL_COLOR_BUFFER_BIT,
>+                      GL_NEAREST);
>+    ASSERT_GL_NO_ERROR();
>+
>+    glBindFramebuffer(GL_READ_FRAMEBUFFER, resolveFramebuffer);
>+    EXPECT_PIXEL_RECT_EQ(0, 0, kWidth, kHeight, GLColor::green);
>+}
>+
>+// Check the size of a multisample array texture in a shader.
>+TEST_P(TextureMultisampleArrayWebGLTest, TextureSizeInShader)
>+{
>+    ANGLE_SKIP_TEST_IF(!requestArrayExtension());
>+
>+    constexpr char kFS[] = R"(#version 310 es
>+#extension GL_OES_texture_storage_multisample_2d_array : require
>+
>+uniform highp sampler2DMSArray tex;
>+out highp vec4 my_FragColor;
>+
>+void main() {
>+        my_FragColor = (textureSize(tex) == ivec3(8, 4, 2)) ? vec4(0, 1, 0, 1) : vec4(1, 0, 0, 1);
>+})";
>+
>+    ANGLE_GL_PROGRAM(texSizeProgram, essl31_shaders::vs::Simple(), kFS);
>+
>+    GLint texLocation = glGetUniformLocation(texSizeProgram, "tex");
>+    ASSERT_GE(texLocation, 0);
>+
>+    const GLsizei kWidth  = 8;
>+    const GLsizei kHeight = 4;
>+
>+    std::vector<GLenum> testFormats = {GL_RGBA8};
>+    GLint samplesToUse = getSamplesToUse(GL_TEXTURE_2D_MULTISAMPLE_ARRAY_OES, testFormats);
>+
>+    glBindTexture(GL_TEXTURE_2D_MULTISAMPLE_ARRAY_OES, mTexture);
>+    glTexStorage3DMultisampleOES(GL_TEXTURE_2D_MULTISAMPLE_ARRAY_OES, samplesToUse, GL_RGBA8,
>+                                 kWidth, kHeight, 2, GL_TRUE);
>+    ASSERT_GL_NO_ERROR();
>+
>+    drawQuad(texSizeProgram, essl31_shaders::PositionAttrib(), 0.5f, 1.0f, true);
>+    ASSERT_GL_NO_ERROR();
>+
>+    EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::green);
>+}
>+
>+// Clear the layers of a multisample array texture, and then sample all the samples from all the
>+// layers in a shader.
>+TEST_P(TextureMultisampleArrayWebGLTest, SimpleTexelFetch)
>+{
>+    ANGLE_SKIP_TEST_IF(!requestArrayExtension());
>+
>+    ANGLE_GL_PROGRAM(texelFetchProgram, essl31_shaders::vs::Passthrough(),
>+                     blitArrayTextureLayerFragmentShader());
>+
>+    GLint texLocation = glGetUniformLocation(texelFetchProgram, "tex");
>+    ASSERT_GE(texLocation, 0);
>+    GLint layerLocation = glGetUniformLocation(texelFetchProgram, "layer");
>+    ASSERT_GE(layerLocation, 0);
>+    GLint sampleNumLocation = glGetUniformLocation(texelFetchProgram, "sampleNum");
>+    ASSERT_GE(layerLocation, 0);
>+
>+    const GLsizei kWidth      = 4;
>+    const GLsizei kHeight     = 4;
>+    const GLsizei kLayerCount = 2;
>+
>+    std::vector<GLenum> testFormats = {GL_RGBA8};
>+    GLint samplesToUse = getSamplesToUse(GL_TEXTURE_2D_MULTISAMPLE_ARRAY_OES, testFormats);
>+
>+    glBindTexture(GL_TEXTURE_2D_MULTISAMPLE_ARRAY_OES, mTexture);
>+    glTexStorage3DMultisampleOES(GL_TEXTURE_2D_MULTISAMPLE_ARRAY_OES, samplesToUse, GL_RGBA8,
>+                                 kWidth, kHeight, kLayerCount, GL_TRUE);
>+    ASSERT_GL_NO_ERROR();
>+
>+    // Clear layer zero to green and layer one to blue.
>+    glBindFramebuffer(GL_FRAMEBUFFER, mFramebuffer);
>+    std::vector<GLColor> clearColors = {{GLColor::green, GLColor::blue}};
>+    for (GLint i = 0; static_cast<GLsizei>(i) < kLayerCount; ++i)
>+    {
>+        glFramebufferTextureLayer(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, mTexture, 0, i);
>+        GLenum status = glCheckFramebufferStatus(GL_FRAMEBUFFER);
>+        ASSERT_GLENUM_EQ(GL_FRAMEBUFFER_COMPLETE, status);
>+        const GLColor &clearColor = clearColors[i];
>+        glClearColor(clearColor.R / 255.0f, clearColor.G / 255.0f, clearColor.B / 255.0f,
>+                     clearColor.A / 255.0f);
>+        glClear(GL_COLOR_BUFFER_BIT);
>+        ASSERT_GL_NO_ERROR();
>+    }
>+
>+    glBindFramebuffer(GL_FRAMEBUFFER, 0);
>+    glUseProgram(texelFetchProgram);
>+    glViewport(0, 0, kWidth, kHeight);
>+    for (GLint layer = 0; static_cast<GLsizei>(layer) < kLayerCount; ++layer)
>+    {
>+        glUniform1i(layerLocation, layer);
>+        for (GLint sampleNum = 0; sampleNum < samplesToUse; ++sampleNum)
>+        {
>+            glUniform1i(sampleNumLocation, sampleNum);
>+            drawQuad(texelFetchProgram, essl31_shaders::PositionAttrib(), 0.5f, 1.0f, true);
>+            ASSERT_GL_NO_ERROR();
>+            EXPECT_PIXEL_RECT_EQ(0, 0, kWidth, kHeight, clearColors[layer]);
>+        }
>+    }
>+}
>+
>+// Clear the layers of an integer multisample array texture, and then sample all the samples from
>+// all the layers in a shader.
>+TEST_P(TextureMultisampleArrayWebGLTest, IntegerTexelFetch)
>+{
>+    ANGLE_SKIP_TEST_IF(!requestArrayExtension());
>+
>+    ANGLE_GL_PROGRAM(texelFetchProgram, essl31_shaders::vs::Passthrough(),
>+                     blitIntArrayTextureLayerFragmentShader());
>+
>+    GLint texLocation = glGetUniformLocation(texelFetchProgram, "tex");
>+    ASSERT_GE(texLocation, 0);
>+    GLint layerLocation = glGetUniformLocation(texelFetchProgram, "layer");
>+    ASSERT_GE(layerLocation, 0);
>+    GLint sampleNumLocation = glGetUniformLocation(texelFetchProgram, "sampleNum");
>+    ASSERT_GE(layerLocation, 0);
>+
>+    const GLsizei kWidth      = 4;
>+    const GLsizei kHeight     = 4;
>+    const GLsizei kLayerCount = 2;
>+
>+    std::vector<GLenum> testFormats = {GL_RGBA8I};
>+    GLint samplesToUse = getSamplesToUse(GL_TEXTURE_2D_MULTISAMPLE_ARRAY_OES, testFormats);
>+
>+    glBindTexture(GL_TEXTURE_2D_MULTISAMPLE_ARRAY_OES, mTexture);
>+    glTexStorage3DMultisampleOES(GL_TEXTURE_2D_MULTISAMPLE_ARRAY_OES, samplesToUse, GL_RGBA8I,
>+                                 kWidth, kHeight, kLayerCount, GL_TRUE);
>+    ASSERT_GL_NO_ERROR();
>+
>+    // Clear layer zero to green and layer one to blue.
>+    glBindFramebuffer(GL_FRAMEBUFFER, mFramebuffer);
>+    std::vector<GLColor> clearColors = {{GLColor::green, GLColor::blue}};
>+    for (GLint i = 0; static_cast<GLsizei>(i) < kLayerCount; ++i)
>+    {
>+        glFramebufferTextureLayer(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, mTexture, 0, i);
>+        GLenum status = glCheckFramebufferStatus(GL_FRAMEBUFFER);
>+        ASSERT_GLENUM_EQ(GL_FRAMEBUFFER_COMPLETE, status);
>+        std::array<GLint, 4> intColor;
>+        for (size_t j = 0; j < intColor.size(); ++j)
>+        {
>+            intColor[j] = clearColors[i][j] / 255;
>+        }
>+        glClearBufferiv(GL_COLOR, 0, intColor.data());
>+        ASSERT_GL_NO_ERROR();
>+    }
>+
>+    glBindFramebuffer(GL_FRAMEBUFFER, 0);
>+    glUseProgram(texelFetchProgram);
>+    glViewport(0, 0, kWidth, kHeight);
>+    for (GLint layer = 0; static_cast<GLsizei>(layer) < kLayerCount; ++layer)
>+    {
>+        glUniform1i(layerLocation, layer);
>+        for (GLint sampleNum = 0; sampleNum < samplesToUse; ++sampleNum)
>+        {
>+            glClearColor(1.0f, 0.0f, 0.0f, 1.0f);
>+            glClear(GL_COLOR_BUFFER_BIT);
>+            glUniform1i(sampleNumLocation, sampleNum);
>+            drawQuad(texelFetchProgram, essl31_shaders::PositionAttrib(), 0.5f, 1.0f, true);
>+            ASSERT_GL_NO_ERROR();
>+            EXPECT_PIXEL_RECT_EQ(0, 0, kWidth, kHeight, clearColors[layer]);
>+        }
>+    }
>+}
>+
> ANGLE_INSTANTIATE_TEST(TextureMultisampleTest,
>+                       ES3_D3D11(),
>                        ES31_D3D11(),
>                        ES3_OPENGL(),
>                        ES3_OPENGLES(),
>                        ES31_OPENGL(),
>                        ES31_OPENGLES());
>-ANGLE_INSTANTIATE_TEST(TextureMultisampleTestES31, ES31_D3D11(), ES31_OPENGL(), ES31_OPENGLES());
>-}
>+ANGLE_INSTANTIATE_TEST(NegativeTextureMultisampleTest, ES3_D3D11(), ES3_OPENGL(), ES3_OPENGLES());
>+ANGLE_INSTANTIATE_TEST(TextureMultisampleArrayWebGLTest,
>+                       ES31_D3D11(),
>+                       ES31_OPENGL(),
>+                       ES31_OPENGLES());
>+}  // anonymous namespace
>diff --git a/Source/ThirdParty/ANGLE/src/tests/gl_tests/TextureRectangleTest.cpp b/Source/ThirdParty/ANGLE/src/tests/gl_tests/TextureRectangleTest.cpp
>index 10936cd8b02..cae6d34d07c 100644
>--- a/Source/ThirdParty/ANGLE/src/tests/gl_tests/TextureRectangleTest.cpp
>+++ b/Source/ThirdParty/ANGLE/src/tests/gl_tests/TextureRectangleTest.cpp
>@@ -29,7 +29,7 @@ class TextureRectangleTest : public ANGLETest
> 
>     bool checkExtensionSupported() const
>     {
>-        if (!extensionEnabled("GL_ANGLE_texture_rectangle"))
>+        if (!IsGLExtensionEnabled("GL_ANGLE_texture_rectangle"))
>         {
>             std::cout << "Test skipped because GL_ANGLE_texture_rectangle is not available."
>                       << std::endl;
>@@ -40,12 +40,10 @@ class TextureRectangleTest : public ANGLETest
> };
> 
> class TextureRectangleTestES3 : public TextureRectangleTest
>-{
>-};
>+{};
> 
> class TextureRectangleTestES31 : public TextureRectangleTest
>-{
>-};
>+{};
> 
> // Test using TexImage2D to define a rectangle texture
> TEST_P(TextureRectangleTest, TexImage2D)
>@@ -70,7 +68,7 @@ TEST_P(TextureRectangleTest, TexImage2D)
> 
>     // Defining a texture of the max size is allowed
>     {
>-        ScopedIgnorePlatformMessages ignore(this);
>+        ScopedIgnorePlatformMessages ignore;
> 
>         glTexImage2D(GL_TEXTURE_RECTANGLE_ANGLE, 0, GL_RGBA, maxSize, maxSize, 0, GL_RGBA,
>                      GL_UNSIGNED_BYTE, nullptr);
>@@ -91,7 +89,7 @@ TEST_P(TextureRectangleTest, TexImage2D)
> TEST_P(TextureRectangleTest, CompressedTexImage2DDisallowed)
> {
>     ANGLE_SKIP_TEST_IF(!checkExtensionSupported());
>-    ANGLE_SKIP_TEST_IF(!extensionEnabled("GL_EXT_texture_compression_dxt1"));
>+    ANGLE_SKIP_TEST_IF(!IsGLExtensionEnabled("GL_EXT_texture_compression_dxt1"));
> 
>     const char data[128] = {0};
> 
>@@ -118,7 +116,8 @@ TEST_P(TextureRectangleTest, CompressedTexImage2DDisallowed)
> TEST_P(TextureRectangleTest, TexStorage2D)
> {
>     ANGLE_SKIP_TEST_IF(!checkExtensionSupported());
>-    ANGLE_SKIP_TEST_IF(getClientMajorVersion() < 3 && !extensionEnabled("GL_EXT_texture_storage"));
>+    ANGLE_SKIP_TEST_IF(getClientMajorVersion() < 3 &&
>+                       !IsGLExtensionEnabled("GL_EXT_texture_storage"));
> 
>     bool useES3       = getClientMajorVersion() >= 3;
>     auto TexStorage2D = [useES3](GLenum target, GLint levels, GLenum format, GLint width,
>@@ -156,7 +155,7 @@ TEST_P(TextureRectangleTest, TexStorage2D)
> 
>     // Defining a texture of the max size is allowed but still allow for OOM
>     {
>-        ScopedIgnorePlatformMessages ignore(this);
>+        ScopedIgnorePlatformMessages ignore;
> 
>         GLTexture tex;
>         glBindTexture(GL_TEXTURE_RECTANGLE_ANGLE, tex);
>@@ -176,7 +175,7 @@ TEST_P(TextureRectangleTest, TexStorage2D)
>     }
> 
>     // Compressed formats are disallowed
>-    if (extensionEnabled("GL_EXT_texture_compression_dxt1"))
>+    if (IsGLExtensionEnabled("GL_EXT_texture_compression_dxt1"))
>     {
>         GLTexture tex;
>         glBindTexture(GL_TEXTURE_RECTANGLE_ANGLE, tex);
>@@ -281,8 +280,8 @@ TEST_P(TextureRectangleTest, FramebufferTexture2DLevel)
>     ASSERT_GL_ERROR(GL_INVALID_VALUE);
> }
> 
>-// Test sampling from a rectangle texture
>-TEST_P(TextureRectangleTest, SamplingFromRectangle)
>+// Test sampling from a rectangle texture using texture2DRect in ESSL1
>+TEST_P(TextureRectangleTest, SamplingFromRectangleESSL1)
> {
>     ANGLE_SKIP_TEST_IF(!checkExtensionSupported());
> 
>@@ -291,27 +290,60 @@ TEST_P(TextureRectangleTest, SamplingFromRectangle)
>     glTexImage2D(GL_TEXTURE_RECTANGLE_ANGLE, 0, GL_RGBA, 1, 1, 0, GL_RGBA, GL_UNSIGNED_BYTE,
>                  &GLColor::green);
> 
>-    const std::string vs =
>-        "attribute vec4 position;\n"
>+    constexpr char kFS[] =
>+        "#extension GL_ARB_texture_rectangle : require\n"
>+        "precision mediump float;\n"
>+        "uniform sampler2DRect tex;\n"
>         "void main()\n"
>         "{\n"
>-        "    gl_Position = vec4(position.xy, 0.0, 1.0);\n"
>+        "    gl_FragColor = texture2DRect(tex, vec2(0, 0));\n"
>         "}\n";
> 
>-    const std::string fs =
>+    ANGLE_GL_PROGRAM(program, essl1_shaders::vs::Simple(), kFS);
>+    glUseProgram(program);
>+
>+    GLint location = glGetUniformLocation(program, "tex");
>+    ASSERT_NE(-1, location);
>+    glUniform1i(location, 0);
>+
>+    glClearColor(0.0, 0.0, 0.0, 0.0);
>+    glClear(GL_COLOR_BUFFER_BIT);
>+    drawQuad(program, essl1_shaders::PositionAttrib(), 0.5f, 1.0f, false);
>+    EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::green);
>+    ASSERT_GL_NO_ERROR();
>+}
>+
>+// Test sampling from a rectangle texture using the texture overload in ESSL3
>+TEST_P(TextureRectangleTestES3, SamplingFromRectangleESSL3)
>+{
>+    ANGLE_SKIP_TEST_IF(!checkExtensionSupported());
>+
>+    GLTexture tex;
>+    glBindTexture(GL_TEXTURE_RECTANGLE_ANGLE, tex);
>+    glTexImage2D(GL_TEXTURE_RECTANGLE_ANGLE, 0, GL_RGBA, 1, 1, 0, GL_RGBA, GL_UNSIGNED_BYTE,
>+                 &GLColor::green);
>+
>+    constexpr char kFS[] =
>+        "#version 300 es\n"
>         "#extension GL_ARB_texture_rectangle : require\n"
>         "precision mediump float;\n"
>         "uniform sampler2DRect tex;\n"
>+        "out vec4 fragColor;\n"
>         "void main()\n"
>         "{\n"
>-        "    gl_FragColor = texture2DRect(tex, vec2(0, 0));\n"
>+        "    fragColor = texture(tex, vec2(0, 0));\n"
>         "}\n";
> 
>-    ANGLE_GL_PROGRAM(program, vs, fs);
>+    ANGLE_GL_PROGRAM(program, essl3_shaders::vs::Simple(), kFS);
>+    glUseProgram(program);
>+
>+    GLint location = glGetUniformLocation(program, "tex");
>+    ASSERT_NE(-1, location);
>+    glUniform1i(location, 0);
> 
>     glClearColor(0.0, 0.0, 0.0, 0.0);
>     glClear(GL_COLOR_BUFFER_BIT);
>-    drawQuad(program, "position", 0.5f, 1.0f, false);
>+    drawQuad(program, essl3_shaders::PositionAttrib(), 0.5f, 1.0f, false);
>     EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::green);
>     ASSERT_GL_NO_ERROR();
> }
>@@ -420,7 +452,7 @@ TEST_P(TextureRectangleTestES3, CopyTexSubImage)
>     ASSERT_GL_NO_ERROR();
> }
> 
>-ANGLE_INSTANTIATE_TEST(TextureRectangleTest, ES2_OPENGL(), ES3_OPENGL());
>+ANGLE_INSTANTIATE_TEST(TextureRectangleTest, ES2_OPENGL(), ES3_OPENGL(), ES2_VULKAN());
> ANGLE_INSTANTIATE_TEST(TextureRectangleTestES3, ES3_OPENGL());
> ANGLE_INSTANTIATE_TEST(TextureRectangleTestES31, ES31_OPENGL());
>-} // anonymous namespace
>+}  // anonymous namespace
>diff --git a/Source/ThirdParty/ANGLE/src/tests/gl_tests/TextureTest.cpp b/Source/ThirdParty/ANGLE/src/tests/gl_tests/TextureTest.cpp
>index a4b16fb0e6c..a436e50bfa2 100644
>--- a/Source/ThirdParty/ANGLE/src/tests/gl_tests/TextureTest.cpp
>+++ b/Source/ThirdParty/ANGLE/src/tests/gl_tests/TextureTest.cpp
>@@ -47,26 +47,25 @@ class TexCoordDrawTest : public ANGLETest
>         setConfigAlphaBits(8);
>     }
> 
>-    virtual std::string getVertexShaderSource()
>+    virtual const char *getVertexShaderSource()
>     {
>-        return
>-            R"(precision highp float;
>-            attribute vec4 position;
>-            varying vec2 texcoord;
>+        return R"(precision highp float;
>+attribute vec4 position;
>+varying vec2 texcoord;
> 
>-            void main()
>-            {
>-                gl_Position = vec4(position.xy, 0.0, 1.0);
>-                texcoord = (position.xy * 0.5) + 0.5;
>-            })";
>+void main()
>+{
>+    gl_Position = vec4(position.xy, 0.0, 1.0);
>+    texcoord = (position.xy * 0.5) + 0.5;
>+})";
>     }
> 
>-    virtual std::string getFragmentShaderSource() = 0;
>+    virtual const char *getFragmentShaderSource() = 0;
> 
>     virtual void setUpProgram()
>     {
>-        const std::string vertexShaderSource   = getVertexShaderSource();
>-        const std::string fragmentShaderSource = getFragmentShaderSource();
>+        const char *vertexShaderSource   = getVertexShaderSource();
>+        const char *fragmentShaderSource = getFragmentShaderSource();
> 
>         mProgram = CompileProgram(vertexShaderSource, fragmentShaderSource);
>         ASSERT_NE(0u, mProgram);
>@@ -135,17 +134,16 @@ class Texture2DTest : public TexCoordDrawTest
>   protected:
>     Texture2DTest() : TexCoordDrawTest(), mTexture2D(0), mTexture2DUniformLocation(-1) {}
> 
>-    std::string getFragmentShaderSource() override
>+    const char *getFragmentShaderSource() override
>     {
>-        return
>-            R"(precision highp float;
>-            uniform sampler2D tex;
>-            varying vec2 texcoord;
>+        return R"(precision highp float;
>+uniform sampler2D tex;
>+varying vec2 texcoord;
> 
>-            void main()
>-            {
>-                gl_FragColor = texture2D(tex, texcoord);
>-            })";
>+void main()
>+{
>+    gl_FragColor = texture2D(tex, texcoord);
>+})";
>     }
> 
>     virtual const char *getTextureUniformName() { return "tex"; }
>@@ -178,62 +176,29 @@ class Texture2DTest : public TexCoordDrawTest
> 
>         if (getClientMajorVersion() < 3)
>         {
>-            if (!extensionEnabled("GL_EXT_texture_storage"))
>-            {
>-                std::cout << "Test skipped due to missing GL_EXT_texture_storage." << std::endl;
>-                return;
>-            }
>+            ANGLE_SKIP_TEST_IF(!IsGLExtensionEnabled("GL_EXT_texture_storage") ||
>+                               !IsGLExtensionEnabled("GL_OES_texture_float"));
> 
>-            if (!extensionEnabled("GL_OES_texture_float"))
>-            {
>-                std::cout << "Test skipped due to missing GL_OES_texture_float." << std::endl;
>-                return;
>-            }
>-
>-            if ((sourceImageChannels < 3 || destImageChannels < 3) && !extensionEnabled("GL_EXT_texture_rg"))
>-            {
>-                std::cout << "Test skipped due to missing GL_EXT_texture_rg." << std::endl;
>-                return;
>-            }
>+            ANGLE_SKIP_TEST_IF((sourceImageChannels < 3 || destImageChannels < 3) &&
>+                               !IsGLExtensionEnabled("GL_EXT_texture_rg"));
> 
>-            if (destImageChannels == 3 && !extensionEnabled("GL_CHROMIUM_color_buffer_float_rgb"))
>-            {
>-                std::cout << "Test skipped due to missing GL_CHROMIUM_color_buffer_float_rgb."
>-                          << std::endl;
>-                return;
>-            }
>+            ANGLE_SKIP_TEST_IF(destImageChannels == 3 &&
>+                               !IsGLExtensionEnabled("GL_CHROMIUM_color_buffer_float_rgb"));
> 
>-            if (destImageChannels == 4 && !extensionEnabled("GL_CHROMIUM_color_buffer_float_rgba"))
>-            {
>-                std::cout << "Test skipped due to missing GL_CHROMIUM_color_buffer_float_rgb."
>-                          << std::endl;
>-                return;
>-            }
>+            ANGLE_SKIP_TEST_IF(destImageChannels == 4 &&
>+                               !IsGLExtensionEnabled("GL_CHROMIUM_color_buffer_float_rgba"));
> 
>-            if (destImageChannels <= 2)
>-            {
>-                std::cout << "Test skipped because no extensions grant renderability to 1 and 2 "
>-                             "channel floating point textures."
>-                          << std::endl;
>-                return;
>-            }
>+            ANGLE_SKIP_TEST_IF(destImageChannels <= 2);
>         }
>         else
>         {
>-            if (!extensionEnabled("GL_color_buffer_float"))
>-            {
>-                std::cout << "Test skipped due to missing GL_color_buffer_float." << std::endl;
>-                return;
>-            }
>+            ANGLE_SKIP_TEST_IF(!IsGLExtensionEnabled("GL_color_buffer_float"));
> 
>-            if (destImageChannels == 3 && !extensionEnabled("GL_CHROMIUM_color_buffer_float_rgb"))
>-            {
>-                std::cout << "Test skipped due to missing GL_CHROMIUM_color_buffer_float_rgb."
>-                          << std::endl;
>-                return;
>-            }
>+            ANGLE_SKIP_TEST_IF(destImageChannels == 3 &&
>+                               !IsGLExtensionEnabled("GL_CHROMIUM_color_buffer_float_rgb"));
>         }
> 
>+        // clang-format off
>         GLfloat sourceImageData[4][16] =
>         {
>             { // R
>@@ -261,17 +226,16 @@ class Texture2DTest : public TexCoordDrawTest
>                 1.0f, 1.0f, 0.0f, 1.0f
>             },
>         };
>+        // clang-format on
> 
>-        GLenum imageFormats[] =
>-        {
>+        GLenum imageFormats[] = {
>             GL_R32F,
>             GL_RG32F,
>             GL_RGB32F,
>             GL_RGBA32F,
>         };
> 
>-        GLenum sourceUnsizedFormats[] =
>-        {
>+        GLenum sourceUnsizedFormats[] = {
>             GL_RED,
>             GL_RG,
>             GL_RGB,
>@@ -282,10 +246,10 @@ class Texture2DTest : public TexCoordDrawTest
> 
>         glGenTextures(2, textures);
> 
>-        GLfloat *imageData = sourceImageData[sourceImageChannels - 1];
>-        GLenum sourceImageFormat = imageFormats[sourceImageChannels - 1];
>+        GLfloat *imageData         = sourceImageData[sourceImageChannels - 1];
>+        GLenum sourceImageFormat   = imageFormats[sourceImageChannels - 1];
>         GLenum sourceUnsizedFormat = sourceUnsizedFormats[sourceImageChannels - 1];
>-        GLenum destImageFormat = imageFormats[destImageChannels - 1];
>+        GLenum destImageFormat     = imageFormats[destImageChannels - 1];
> 
>         glBindTexture(GL_TEXTURE_2D, textures[0]);
>         if (getClientMajorVersion() >= 3)
>@@ -300,7 +264,7 @@ class Texture2DTest : public TexCoordDrawTest
>         glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
>         glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, 2, 2, sourceUnsizedFormat, GL_FLOAT, imageData);
> 
>-        if (sourceImageChannels < 3 && !extensionEnabled("GL_EXT_texture_rg"))
>+        if (sourceImageChannels < 3 && !IsGLExtensionEnabled("GL_EXT_texture_rg"))
>         {
>             // This is not supported
>             ASSERT_GL_ERROR(GL_INVALID_OPERATION);
>@@ -361,31 +325,29 @@ class Texture2DTestES3 : public Texture2DTest
>   protected:
>     Texture2DTestES3() : Texture2DTest() {}
> 
>-    std::string getVertexShaderSource() override
>+    const char *getVertexShaderSource() override
>     {
>-        return std::string(
>-            "#version 300 es\n"
>-            "out vec2 texcoord;\n"
>-            "in vec4 position;\n"
>-            "void main()\n"
>-            "{\n"
>-            "    gl_Position = vec4(position.xy, 0.0, 1.0);\n"
>-            "    texcoord = (position.xy * 0.5) + 0.5;\n"
>-            "}\n");
>+        return "#version 300 es\n"
>+               "out vec2 texcoord;\n"
>+               "in vec4 position;\n"
>+               "void main()\n"
>+               "{\n"
>+               "    gl_Position = vec4(position.xy, 0.0, 1.0);\n"
>+               "    texcoord = (position.xy * 0.5) + 0.5;\n"
>+               "}\n";
>     }
> 
>-    std::string getFragmentShaderSource() override
>+    const char *getFragmentShaderSource() override
>     {
>-        return std::string(
>-            "#version 300 es\n"
>-            "precision highp float;\n"
>-            "uniform highp sampler2D tex;\n"
>-            "in vec2 texcoord;\n"
>-            "out vec4 fragColor;\n"
>-            "void main()\n"
>-            "{\n"
>-            "    fragColor = texture(tex, texcoord);\n"
>-            "}\n");
>+        return "#version 300 es\n"
>+               "precision highp float;\n"
>+               "uniform highp sampler2D tex;\n"
>+               "in vec2 texcoord;\n"
>+               "out vec4 fragColor;\n"
>+               "void main()\n"
>+               "{\n"
>+               "    fragColor = texture(tex, texcoord);\n"
>+               "}\n";
>     }
> 
>     void SetUp() override
>@@ -400,33 +362,31 @@ class Texture2DIntegerAlpha1TestES3 : public Texture2DTest
>   protected:
>     Texture2DIntegerAlpha1TestES3() : Texture2DTest() {}
> 
>-    std::string getVertexShaderSource() override
>+    const char *getVertexShaderSource() override
>     {
>-        return std::string(
>-            "#version 300 es\n"
>-            "out vec2 texcoord;\n"
>-            "in vec4 position;\n"
>-            "void main()\n"
>-            "{\n"
>-            "    gl_Position = vec4(position.xy, 0.0, 1.0);\n"
>-            "    texcoord = (position.xy * 0.5) + 0.5;\n"
>-            "}\n");
>+        return "#version 300 es\n"
>+               "out vec2 texcoord;\n"
>+               "in vec4 position;\n"
>+               "void main()\n"
>+               "{\n"
>+               "    gl_Position = vec4(position.xy, 0.0, 1.0);\n"
>+               "    texcoord = (position.xy * 0.5) + 0.5;\n"
>+               "}\n";
>     }
> 
>-    std::string getFragmentShaderSource() override
>+    const char *getFragmentShaderSource() override
>     {
>-        return std::string(
>-            "#version 300 es\n"
>-            "precision highp float;\n"
>-            "uniform highp isampler2D tex;\n"
>-            "in vec2 texcoord;\n"
>-            "out vec4 fragColor;\n"
>-            "void main()\n"
>-            "{\n"
>-            "    vec4 green = vec4(0, 1, 0, 1);\n"
>-            "    vec4 black = vec4(0, 0, 0, 0);\n"
>-            "    fragColor = (texture(tex, texcoord).a == 1) ? green : black;\n"
>-            "}\n");
>+        return "#version 300 es\n"
>+               "precision highp float;\n"
>+               "uniform highp isampler2D tex;\n"
>+               "in vec2 texcoord;\n"
>+               "out vec4 fragColor;\n"
>+               "void main()\n"
>+               "{\n"
>+               "    vec4 green = vec4(0, 1, 0, 1);\n"
>+               "    vec4 black = vec4(0, 0, 0, 0);\n"
>+               "    fragColor = (texture(tex, texcoord).a == 1) ? green : black;\n"
>+               "}\n";
>     }
> 
>     void SetUp() override
>@@ -441,33 +401,31 @@ class Texture2DUnsignedIntegerAlpha1TestES3 : public Texture2DTest
>   protected:
>     Texture2DUnsignedIntegerAlpha1TestES3() : Texture2DTest() {}
> 
>-    std::string getVertexShaderSource() override
>+    const char *getVertexShaderSource() override
>     {
>-        return std::string(
>-            "#version 300 es\n"
>-            "out vec2 texcoord;\n"
>-            "in vec4 position;\n"
>-            "void main()\n"
>-            "{\n"
>-            "    gl_Position = vec4(position.xy, 0.0, 1.0);\n"
>-            "    texcoord = (position.xy * 0.5) + 0.5;\n"
>-            "}\n");
>+        return "#version 300 es\n"
>+               "out vec2 texcoord;\n"
>+               "in vec4 position;\n"
>+               "void main()\n"
>+               "{\n"
>+               "    gl_Position = vec4(position.xy, 0.0, 1.0);\n"
>+               "    texcoord = (position.xy * 0.5) + 0.5;\n"
>+               "}\n";
>     }
> 
>-    std::string getFragmentShaderSource() override
>+    const char *getFragmentShaderSource() override
>     {
>-        return std::string(
>-            "#version 300 es\n"
>-            "precision highp float;\n"
>-            "uniform highp usampler2D tex;\n"
>-            "in vec2 texcoord;\n"
>-            "out vec4 fragColor;\n"
>-            "void main()\n"
>-            "{\n"
>-            "    vec4 green = vec4(0, 1, 0, 1);\n"
>-            "    vec4 black = vec4(0, 0, 0, 0);\n"
>-            "    fragColor = (texture(tex, texcoord).a == 1u) ? green : black;\n"
>-            "}\n");
>+        return "#version 300 es\n"
>+               "precision highp float;\n"
>+               "uniform highp usampler2D tex;\n"
>+               "in vec2 texcoord;\n"
>+               "out vec4 fragColor;\n"
>+               "void main()\n"
>+               "{\n"
>+               "    vec4 green = vec4(0, 1, 0, 1);\n"
>+               "    vec4 black = vec4(0, 0, 0, 0);\n"
>+               "    fragColor = (texture(tex, texcoord).a == 1u) ? green : black;\n"
>+               "}\n";
>     }
> 
>     void SetUp() override
>@@ -482,7 +440,7 @@ class Texture2DTestWithDrawScale : public Texture2DTest
>   protected:
>     Texture2DTestWithDrawScale() : Texture2DTest(), mDrawScaleUniformLocation(-1) {}
> 
>-    std::string getVertexShaderSource() override
>+    const char *getVertexShaderSource() override
>     {
>         return
>             R"(precision highp float;
>@@ -521,7 +479,7 @@ class Sampler2DAsFunctionParameterTest : public Texture2DTest
>   protected:
>     Sampler2DAsFunctionParameterTest() : Texture2DTest() {}
> 
>-    std::string getFragmentShaderSource() override
>+    const char *getFragmentShaderSource() override
>     {
>         return
>             R"(precision highp float;
>@@ -555,10 +513,9 @@ class TextureCubeTest : public TexCoordDrawTest
>           mTextureCube(0),
>           mTexture2DUniformLocation(-1),
>           mTextureCubeUniformLocation(-1)
>-    {
>-    }
>+    {}
> 
>-    std::string getFragmentShaderSource() override
>+    const char *getFragmentShaderSource() override
>     {
>         return
>             R"(precision highp float;
>@@ -623,10 +580,9 @@ class SamplerArrayTest : public TexCoordDrawTest
>           mTexture2DB(0),
>           mTexture0UniformLocation(-1),
>           mTexture1UniformLocation(-1)
>-    {
>-    }
>+    {}
> 
>-    std::string getFragmentShaderSource() override
>+    const char *getFragmentShaderSource() override
>     {
>         return
>             R"(precision mediump float;
>@@ -695,13 +651,12 @@ class SamplerArrayTest : public TexCoordDrawTest
>     GLint mTexture1UniformLocation;
> };
> 
>-
> class SamplerArrayAsFunctionParameterTest : public SamplerArrayTest
> {
>   protected:
>     SamplerArrayAsFunctionParameterTest() : SamplerArrayTest() {}
> 
>-    std::string getFragmentShaderSource() override
>+    const char *getFragmentShaderSource() override
>     {
>         return
>             R"(precision mediump float;
>@@ -725,31 +680,29 @@ class Texture2DArrayTestES3 : public TexCoordDrawTest
>   protected:
>     Texture2DArrayTestES3() : TexCoordDrawTest(), m2DArrayTexture(0), mTextureArrayLocation(-1) {}
> 
>-    std::string getVertexShaderSource() override
>+    const char *getVertexShaderSource() override
>     {
>-        return std::string(
>-            "#version 300 es\n"
>-            "out vec2 texcoord;\n"
>-            "in vec4 position;\n"
>-            "void main()\n"
>-            "{\n"
>-            "    gl_Position = vec4(position.xy, 0.0, 1.0);\n"
>-            "    texcoord = (position.xy * 0.5) + 0.5;\n"
>-            "}\n");
>+        return "#version 300 es\n"
>+               "out vec2 texcoord;\n"
>+               "in vec4 position;\n"
>+               "void main()\n"
>+               "{\n"
>+               "    gl_Position = vec4(position.xy, 0.0, 1.0);\n"
>+               "    texcoord = (position.xy * 0.5) + 0.5;\n"
>+               "}\n";
>     }
> 
>-    std::string getFragmentShaderSource() override
>+    const char *getFragmentShaderSource() override
>     {
>-        return std::string(
>-            "#version 300 es\n"
>-            "precision highp float;\n"
>-            "uniform highp sampler2DArray tex2DArray;\n"
>-            "in vec2 texcoord;\n"
>-            "out vec4 fragColor;\n"
>-            "void main()\n"
>-            "{\n"
>-            "    fragColor = texture(tex2DArray, vec3(texcoord.x, texcoord.y, 0.0));\n"
>-            "}\n");
>+        return "#version 300 es\n"
>+               "precision highp float;\n"
>+               "uniform highp sampler2DArray tex2DArray;\n"
>+               "in vec2 texcoord;\n"
>+               "out vec4 fragColor;\n"
>+               "void main()\n"
>+               "{\n"
>+               "    fragColor = texture(tex2DArray, vec3(texcoord.x, texcoord.y, 0.0));\n"
>+               "}\n";
>     }
> 
>     void SetUp() override
>@@ -784,33 +737,22 @@ class TextureSizeTextureArrayTest : public TexCoordDrawTest
>           mTexture2DB(0),
>           mTexture0Location(-1),
>           mTexture1Location(-1)
>-    {
>-    }
>+    {}
> 
>-    std::string getVertexShaderSource() override
>-    {
>-        return std::string(
>-            "#version 300 es\n"
>-            "in vec4 position;\n"
>-            "void main()\n"
>-            "{\n"
>-            "    gl_Position = vec4(position.xy, 0.0, 1.0);\n"
>-            "}\n");
>-    }
>+    const char *getVertexShaderSource() override { return essl3_shaders::vs::Simple(); }
> 
>-    std::string getFragmentShaderSource() override
>+    const char *getFragmentShaderSource() override
>     {
>-        return std::string(
>-            "#version 300 es\n"
>-            "precision highp float;\n"
>-            "uniform highp sampler2D tex2DArray[2];\n"
>-            "out vec4 fragColor;\n"
>-            "void main()\n"
>-            "{\n"
>-            "    float red = float(textureSize(tex2DArray[0], 0).x) / 255.0;\n"
>-            "    float green = float(textureSize(tex2DArray[1], 0).x) / 255.0;\n"
>-            "    fragColor = vec4(red, green, 0.0, 1.0);\n"
>-            "}\n");
>+        return "#version 300 es\n"
>+               "precision highp float;\n"
>+               "uniform highp sampler2D tex2DArray[2];\n"
>+               "out vec4 fragColor;\n"
>+               "void main()\n"
>+               "{\n"
>+               "    float red = float(textureSize(tex2DArray[0], 0).x) / 255.0;\n"
>+               "    float green = float(textureSize(tex2DArray[1], 0).x) / 255.0;\n"
>+               "    fragColor = vec4(red, green, 0.0, 1.0);\n"
>+               "}\n";
>     }
> 
>     void SetUp() override
>@@ -847,31 +789,29 @@ class Texture3DTestES3 : public TexCoordDrawTest
>   protected:
>     Texture3DTestES3() : TexCoordDrawTest(), mTexture3D(0), mTexture3DUniformLocation(-1) {}
> 
>-    std::string getVertexShaderSource() override
>+    const char *getVertexShaderSource() override
>     {
>-        return std::string(
>-            "#version 300 es\n"
>-            "out vec2 texcoord;\n"
>-            "in vec4 position;\n"
>-            "void main()\n"
>-            "{\n"
>-            "    gl_Position = vec4(position.xy, 0.0, 1.0);\n"
>-            "    texcoord = (position.xy * 0.5) + 0.5;\n"
>-            "}\n");
>+        return "#version 300 es\n"
>+               "out vec2 texcoord;\n"
>+               "in vec4 position;\n"
>+               "void main()\n"
>+               "{\n"
>+               "    gl_Position = vec4(position.xy, 0.0, 1.0);\n"
>+               "    texcoord = (position.xy * 0.5) + 0.5;\n"
>+               "}\n";
>     }
> 
>-    std::string getFragmentShaderSource() override
>+    const char *getFragmentShaderSource() override
>     {
>-        return std::string(
>-            "#version 300 es\n"
>-            "precision highp float;\n"
>-            "uniform highp sampler3D tex3D;\n"
>-            "in vec2 texcoord;\n"
>-            "out vec4 fragColor;\n"
>-            "void main()\n"
>-            "{\n"
>-            "    fragColor = texture(tex3D, vec3(texcoord, 0.0));\n"
>-            "}\n");
>+        return "#version 300 es\n"
>+               "precision highp float;\n"
>+               "uniform highp sampler3D tex3D;\n"
>+               "in vec2 texcoord;\n"
>+               "out vec4 fragColor;\n"
>+               "void main()\n"
>+               "{\n"
>+               "    fragColor = texture(tex3D, vec3(texcoord, 0.0));\n"
>+               "}\n";
>     }
> 
>     void SetUp() override
>@@ -906,37 +846,34 @@ class ShadowSamplerPlusSampler3DTestES3 : public TexCoordDrawTest
>           mTextureShadowUniformLocation(-1),
>           mTexture3DUniformLocation(-1),
>           mDepthRefUniformLocation(-1)
>-    {
>-    }
>+    {}
> 
>-    std::string getVertexShaderSource() override
>+    const char *getVertexShaderSource() override
>     {
>-        return std::string(
>-            "#version 300 es\n"
>-            "out vec2 texcoord;\n"
>-            "in vec4 position;\n"
>-            "void main()\n"
>-            "{\n"
>-            "    gl_Position = vec4(position.xy, 0.0, 1.0);\n"
>-            "    texcoord = (position.xy * 0.5) + 0.5;\n"
>-            "}\n");
>+        return "#version 300 es\n"
>+               "out vec2 texcoord;\n"
>+               "in vec4 position;\n"
>+               "void main()\n"
>+               "{\n"
>+               "    gl_Position = vec4(position.xy, 0.0, 1.0);\n"
>+               "    texcoord = (position.xy * 0.5) + 0.5;\n"
>+               "}\n";
>     }
> 
>-    std::string getFragmentShaderSource() override
>+    const char *getFragmentShaderSource() override
>     {
>-        return std::string(
>-            "#version 300 es\n"
>-            "precision highp float;\n"
>-            "uniform highp sampler2DShadow tex2DShadow;\n"
>-            "uniform highp sampler3D tex3D;\n"
>-            "in vec2 texcoord;\n"
>-            "uniform float depthRef;\n"
>-            "out vec4 fragColor;\n"
>-            "void main()\n"
>-            "{\n"
>-            "    fragColor = vec4(texture(tex2DShadow, vec3(texcoord, depthRef)) * 0.5);\n"
>-            "    fragColor += texture(tex3D, vec3(texcoord, 0.0));\n"
>-            "}\n");
>+        return "#version 300 es\n"
>+               "precision highp float;\n"
>+               "uniform highp sampler2DShadow tex2DShadow;\n"
>+               "uniform highp sampler3D tex3D;\n"
>+               "in vec2 texcoord;\n"
>+               "uniform float depthRef;\n"
>+               "out vec4 fragColor;\n"
>+               "void main()\n"
>+               "{\n"
>+               "    fragColor = vec4(texture(tex2DShadow, vec3(texcoord, depthRef)) * 0.5);\n"
>+               "    fragColor += texture(tex3D, vec3(texcoord, 0.0));\n"
>+               "}\n";
>     }
> 
>     void SetUp() override
>@@ -987,42 +924,39 @@ class SamplerTypeMixTestES3 : public TexCoordDrawTest
>           mTexture2DShadowUniformLocation(-1),
>           mTextureCubeShadowUniformLocation(-1),
>           mDepthRefUniformLocation(-1)
>-    {
>-    }
>-
>-    std::string getVertexShaderSource() override
>-    {
>-        return std::string(
>-            "#version 300 es\n"
>-            "out vec2 texcoord;\n"
>-            "in vec4 position;\n"
>-            "void main()\n"
>-            "{\n"
>-            "    gl_Position = vec4(position.xy, 0.0, 1.0);\n"
>-            "    texcoord = (position.xy * 0.5) + 0.5;\n"
>-            "}\n");
>-    }
>-
>-    std::string getFragmentShaderSource() override
>-    {
>-        return std::string(
>-            "#version 300 es\n"
>-            "precision highp float;\n"
>-            "uniform highp sampler2D tex2D;\n"
>-            "uniform highp samplerCube texCube;\n"
>-            "uniform highp sampler2DShadow tex2DShadow;\n"
>-            "uniform highp samplerCubeShadow texCubeShadow;\n"
>-            "in vec2 texcoord;\n"
>-            "uniform float depthRef;\n"
>-            "out vec4 fragColor;\n"
>-            "void main()\n"
>-            "{\n"
>-            "    fragColor = texture(tex2D, texcoord);\n"
>-            "    fragColor += texture(texCube, vec3(1.0, 0.0, 0.0));\n"
>-            "    fragColor += vec4(texture(tex2DShadow, vec3(texcoord, depthRef)) * 0.25);\n"
>-            "    fragColor += vec4(texture(texCubeShadow, vec4(1.0, 0.0, 0.0, depthRef)) * "
>-            "0.125);\n"
>-            "}\n");
>+    {}
>+
>+    const char *getVertexShaderSource() override
>+    {
>+        return "#version 300 es\n"
>+               "out vec2 texcoord;\n"
>+               "in vec4 position;\n"
>+               "void main()\n"
>+               "{\n"
>+               "    gl_Position = vec4(position.xy, 0.0, 1.0);\n"
>+               "    texcoord = (position.xy * 0.5) + 0.5;\n"
>+               "}\n";
>+    }
>+
>+    const char *getFragmentShaderSource() override
>+    {
>+        return "#version 300 es\n"
>+               "precision highp float;\n"
>+               "uniform highp sampler2D tex2D;\n"
>+               "uniform highp samplerCube texCube;\n"
>+               "uniform highp sampler2DShadow tex2DShadow;\n"
>+               "uniform highp samplerCubeShadow texCubeShadow;\n"
>+               "in vec2 texcoord;\n"
>+               "uniform float depthRef;\n"
>+               "out vec4 fragColor;\n"
>+               "void main()\n"
>+               "{\n"
>+               "    fragColor = texture(tex2D, texcoord);\n"
>+               "    fragColor += texture(texCube, vec3(1.0, 0.0, 0.0));\n"
>+               "    fragColor += vec4(texture(tex2DShadow, vec3(texcoord, depthRef)) * 0.25);\n"
>+               "    fragColor += vec4(texture(texCubeShadow, vec4(1.0, 0.0, 0.0, depthRef)) * "
>+               "0.125);\n"
>+               "}\n";
>     }
> 
>     void SetUp() override
>@@ -1083,21 +1017,20 @@ class SamplerInStructTest : public Texture2DTest
> 
>     const char *getTextureUniformName() override { return "us.tex"; }
> 
>-    std::string getFragmentShaderSource() override
>+    const char *getFragmentShaderSource() override
>     {
>-        return std::string(
>-            "precision highp float;\n"
>-            "struct S\n"
>-            "{\n"
>-            "    vec4 a;\n"
>-            "    highp sampler2D tex;\n"
>-            "};\n"
>-            "uniform S us;\n"
>-            "varying vec2 texcoord;\n"
>-            "void main()\n"
>-            "{\n"
>-            "    gl_FragColor = texture2D(us.tex, texcoord + us.a.x);\n"
>-            "}\n");
>+        return "precision highp float;\n"
>+               "struct S\n"
>+               "{\n"
>+               "    vec4 a;\n"
>+               "    highp sampler2D tex;\n"
>+               "};\n"
>+               "uniform S us;\n"
>+               "varying vec2 texcoord;\n"
>+               "void main()\n"
>+               "{\n"
>+               "    gl_FragColor = texture2D(us.tex, texcoord + us.a.x);\n"
>+               "}\n";
>     }
> 
>     void runSamplerInStructTest()
>@@ -1118,24 +1051,23 @@ class SamplerInStructAsFunctionParameterTest : public SamplerInStructTest
>   protected:
>     SamplerInStructAsFunctionParameterTest() : SamplerInStructTest() {}
> 
>-    std::string getFragmentShaderSource() override
>-    {
>-        return std::string(
>-            "precision highp float;\n"
>-            "struct S\n"
>-            "{\n"
>-            "    vec4 a;\n"
>-            "    highp sampler2D tex;\n"
>-            "};\n"
>-            "uniform S us;\n"
>-            "varying vec2 texcoord;\n"
>-            "vec4 sampleFrom(S s) {\n"
>-            "    return texture2D(s.tex, texcoord + s.a.x);\n"
>-            "}\n"
>-            "void main()\n"
>-            "{\n"
>-            "    gl_FragColor = sampleFrom(us);\n"
>-            "}\n");
>+    const char *getFragmentShaderSource() override
>+    {
>+        return "precision highp float;\n"
>+               "struct S\n"
>+               "{\n"
>+               "    vec4 a;\n"
>+               "    highp sampler2D tex;\n"
>+               "};\n"
>+               "uniform S us;\n"
>+               "varying vec2 texcoord;\n"
>+               "vec4 sampleFrom(S s) {\n"
>+               "    return texture2D(s.tex, texcoord + s.a.x);\n"
>+               "}\n"
>+               "void main()\n"
>+               "{\n"
>+               "    gl_FragColor = sampleFrom(us);\n"
>+               "}\n";
>     }
> };
> 
>@@ -1146,24 +1078,23 @@ class SamplerInStructArrayAsFunctionParameterTest : public SamplerInStructTest
> 
>     const char *getTextureUniformName() override { return "us[0].tex"; }
> 
>-    std::string getFragmentShaderSource() override
>-    {
>-        return std::string(
>-            "precision highp float;\n"
>-            "struct S\n"
>-            "{\n"
>-            "    vec4 a;\n"
>-            "    highp sampler2D tex;\n"
>-            "};\n"
>-            "uniform S us[1];\n"
>-            "varying vec2 texcoord;\n"
>-            "vec4 sampleFrom(S s) {\n"
>-            "    return texture2D(s.tex, texcoord + s.a.x);\n"
>-            "}\n"
>-            "void main()\n"
>-            "{\n"
>-            "    gl_FragColor = sampleFrom(us[0]);\n"
>-            "}\n");
>+    const char *getFragmentShaderSource() override
>+    {
>+        return "precision highp float;\n"
>+               "struct S\n"
>+               "{\n"
>+               "    vec4 a;\n"
>+               "    highp sampler2D tex;\n"
>+               "};\n"
>+               "uniform S us[1];\n"
>+               "varying vec2 texcoord;\n"
>+               "vec4 sampleFrom(S s) {\n"
>+               "    return texture2D(s.tex, texcoord + s.a.x);\n"
>+               "}\n"
>+               "void main()\n"
>+               "{\n"
>+               "    gl_FragColor = sampleFrom(us[0]);\n"
>+               "}\n";
>     }
> };
> 
>@@ -1174,28 +1105,27 @@ class SamplerInNestedStructAsFunctionParameterTest : public SamplerInStructTest
> 
>     const char *getTextureUniformName() override { return "us[0].sub.tex"; }
> 
>-    std::string getFragmentShaderSource() override
>-    {
>-        return std::string(
>-            "precision highp float;\n"
>-            "struct SUB\n"
>-            "{\n"
>-            "    vec4 a;\n"
>-            "    highp sampler2D tex;\n"
>-            "};\n"
>-            "struct S\n"
>-            "{\n"
>-            "    SUB sub;\n"
>-            "};\n"
>-            "uniform S us[1];\n"
>-            "varying vec2 texcoord;\n"
>-            "vec4 sampleFrom(SUB s) {\n"
>-            "    return texture2D(s.tex, texcoord + s.a.x);\n"
>-            "}\n"
>-            "void main()\n"
>-            "{\n"
>-            "    gl_FragColor = sampleFrom(us[0].sub);\n"
>-            "}\n");
>+    const char *getFragmentShaderSource() override
>+    {
>+        return "precision highp float;\n"
>+               "struct SUB\n"
>+               "{\n"
>+               "    vec4 a;\n"
>+               "    highp sampler2D tex;\n"
>+               "};\n"
>+               "struct S\n"
>+               "{\n"
>+               "    SUB sub;\n"
>+               "};\n"
>+               "uniform S us[1];\n"
>+               "varying vec2 texcoord;\n"
>+               "vec4 sampleFrom(SUB s) {\n"
>+               "    return texture2D(s.tex, texcoord + s.a.x);\n"
>+               "}\n"
>+               "void main()\n"
>+               "{\n"
>+               "    gl_FragColor = sampleFrom(us[0].sub);\n"
>+               "}\n";
>     }
> };
> 
>@@ -1204,22 +1134,21 @@ class SamplerInStructAndOtherVariableTest : public SamplerInStructTest
>   protected:
>     SamplerInStructAndOtherVariableTest() : SamplerInStructTest() {}
> 
>-    std::string getFragmentShaderSource() override
>-    {
>-        return std::string(
>-            "precision highp float;\n"
>-            "struct S\n"
>-            "{\n"
>-            "    vec4 a;\n"
>-            "    highp sampler2D tex;\n"
>-            "};\n"
>-            "uniform S us;\n"
>-            "uniform float us_tex;\n"
>-            "varying vec2 texcoord;\n"
>-            "void main()\n"
>-            "{\n"
>-            "    gl_FragColor = texture2D(us.tex, texcoord + us.a.x + us_tex);\n"
>-            "}\n");
>+    const char *getFragmentShaderSource() override
>+    {
>+        return "precision highp float;\n"
>+               "struct S\n"
>+               "{\n"
>+               "    vec4 a;\n"
>+               "    highp sampler2D tex;\n"
>+               "};\n"
>+               "uniform S us;\n"
>+               "uniform float us_tex;\n"
>+               "varying vec2 texcoord;\n"
>+               "void main()\n"
>+               "{\n"
>+               "    gl_FragColor = texture2D(us.tex, texcoord + us.a.x + us_tex);\n"
>+               "}\n";
>     }
> };
> 
>@@ -1230,11 +1159,11 @@ TEST_P(Texture2DTest, NegativeAPISubImage)
> 
>     setUpProgram();
> 
>-    const GLubyte *pixels[20] = { 0 };
>+    const GLubyte *pixels[20] = {0};
>     glTexSubImage2D(GL_TEXTURE_2D, 0, 1, 1, 1, 1, GL_RGBA, GL_UNSIGNED_BYTE, pixels);
>     EXPECT_GL_ERROR(GL_INVALID_VALUE);
> 
>-    if (extensionEnabled("GL_EXT_texture_storage"))
>+    if (IsGLExtensionEnabled("GL_EXT_texture_storage"))
>     {
>         // Create a 1-level immutable texture.
>         glTexStorage2DEXT(GL_TEXTURE_2D, 1, GL_RGBA8, 2, 2);
>@@ -1257,8 +1186,8 @@ TEST_P(Texture2DTest, QueryBinding)
>     EXPECT_EQ(0, textureBinding);
> 
>     glGetIntegerv(GL_TEXTURE_BINDING_EXTERNAL_OES, &textureBinding);
>-    if (extensionEnabled("GL_OES_EGL_image_external") ||
>-        extensionEnabled("GL_NV_EGL_stream_consumer_external"))
>+    if (IsGLExtensionEnabled("GL_OES_EGL_image_external") ||
>+        IsGLExtensionEnabled("GL_NV_EGL_stream_consumer_external"))
>     {
>         EXPECT_GL_NO_ERROR();
>         EXPECT_EQ(0, textureBinding);
>@@ -1281,7 +1210,7 @@ TEST_P(Texture2DTest, ZeroSizedUploads)
>     glUniform1i(mTexture2DUniformLocation, 0);
>     drawQuad(mProgram, "position", 0.5f);
> 
>-    const GLubyte *pixel[4] = { 0 };
>+    const GLubyte *pixel[4] = {0};
> 
>     glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, 0, 0, GL_RGBA, GL_UNSIGNED_BYTE, pixel);
>     EXPECT_GL_NO_ERROR();
>@@ -1369,6 +1298,9 @@ TEST_P(SamplerArrayTest, SamplerArrayDraw)
> // user-defined function in the shader.
> TEST_P(SamplerArrayAsFunctionParameterTest, SamplerArrayAsFunctionParameter)
> {
>+    // TODO: Diagnose and fix. http://anglebug.com/2955
>+    ANGLE_SKIP_TEST_IF(IsVulkan() && IsAndroid());
>+
>     testSamplerArrayDraw();
> }
> 
>@@ -1417,31 +1349,101 @@ TEST_P(Texture2DTestWithDrawScale, MipmapsTwice)
> // https://code.google.com/p/angleproject/issues/detail?id=849
> TEST_P(TextureCubeTest, CubeMapFBO)
> {
>-    GLuint fbo;
>-    glGenFramebuffers(1, &fbo);
>+    // http://anglebug.com/3145
>+    ANGLE_SKIP_TEST_IF(IsFuchsia() && IsIntel() && IsVulkan());
>+
>+    // http://anglebug.com/2822
>+    ANGLE_SKIP_TEST_IF(IsWindows() && IsIntel() && IsVulkan());
>+
>+    GLFramebuffer fbo;
>     glBindFramebuffer(GL_FRAMEBUFFER, fbo);
> 
>     glBindTexture(GL_TEXTURE_CUBE_MAP, mTextureCube);
>-    glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_CUBE_MAP_POSITIVE_Y, mTextureCube, 0);
>+    glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_CUBE_MAP_POSITIVE_Y,
>+                           mTextureCube, 0);
> 
>     EXPECT_GLENUM_EQ(GL_FRAMEBUFFER_COMPLETE, glCheckFramebufferStatus(GL_FRAMEBUFFER));
>+    EXPECT_GL_NO_ERROR();
> 
>-    glDeleteFramebuffers(1, &fbo);
>+    // Test clearing the six mip faces individually.
>+    std::array<GLColor, 6> faceColors = {{GLColor::red, GLColor::green, GLColor::blue,
>+                                          GLColor::yellow, GLColor::cyan, GLColor::magenta}};
> 
>-    EXPECT_GL_NO_ERROR();
>+    for (size_t faceIndex = 0; faceIndex < 6; ++faceIndex)
>+    {
>+        glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0,
>+                               GL_TEXTURE_CUBE_MAP_POSITIVE_X + faceIndex, mTextureCube, 0);
>+
>+        Vector4 clearColorF = faceColors[faceIndex].toNormalizedVector();
>+        glClearColor(clearColorF.x(), clearColorF.y(), clearColorF.z(), clearColorF.w());
>+        glClear(GL_COLOR_BUFFER_BIT);
>+
>+        EXPECT_PIXEL_COLOR_EQ(0, 0, faceColors[faceIndex]);
>+    }
>+
>+    // Iterate the faces again to make sure the colors haven't changed.
>+    for (size_t faceIndex = 0; faceIndex < 6; ++faceIndex)
>+    {
>+        glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0,
>+                               GL_TEXTURE_CUBE_MAP_POSITIVE_X + faceIndex, mTextureCube, 0);
>+        EXPECT_PIXEL_COLOR_EQ(0, 0, faceColors[faceIndex])
>+            << "face color " << faceIndex << " shouldn't change";
>+    }
> }
> 
>-// Test that glTexSubImage2D works properly when glTexStorage2DEXT has initialized the image with a default color.
>-TEST_P(Texture2DTest, TexStorage)
>+// Tests clearing a cube map with a scissor enabled.
>+TEST_P(TextureCubeTest, CubeMapFBOScissoredClear)
> {
>-    if (getClientMajorVersion() < 3 && !extensionEnabled("GL_EXT_texture_storage"))
>+    // TODO(jie.a.chen): Diagnose and fix. http://anglebug.com/2822
>+    ANGLE_SKIP_TEST_IF(IsVulkan() && IsIntel() && IsWindows());
>+
>+    // http://anglebug.com/3145
>+    ANGLE_SKIP_TEST_IF(IsFuchsia() && IsIntel() && IsVulkan());
>+
>+    constexpr size_t kSize = 16;
>+
>+    GLFramebuffer fbo;
>+    glBindFramebuffer(GL_FRAMEBUFFER, fbo);
>+    glViewport(0, 0, kSize, kSize);
>+
>+    GLTexture texcube;
>+    glBindTexture(GL_TEXTURE_CUBE_MAP, texcube);
>+    for (GLenum face = 0; face < 6; face++)
>     {
>-        std::cout << "Test skipped because ES3 or GL_EXT_texture_storage not available."
>-                  << std::endl;
>-        return;
>+        glTexImage2D(GL_TEXTURE_CUBE_MAP_POSITIVE_X + face, 0, GL_RGBA, kSize, kSize, 0, GL_RGBA,
>+                     GL_UNSIGNED_BYTE, nullptr);
>     }
>+    ASSERT_GL_NO_ERROR();
>+
>+    glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_CUBE_MAP_POSITIVE_Y,
>+                           texcube, 0);
>+
>+    EXPECT_GLENUM_EQ(GL_FRAMEBUFFER_COMPLETE, glCheckFramebufferStatus(GL_FRAMEBUFFER));
>+    ASSERT_GL_NO_ERROR();
>+
>+    glClearColor(1.0f, 0.0f, 0.0f, 1.0f);
>+    glClear(GL_COLOR_BUFFER_BIT);
>+    EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::red);
>+
>+    glEnable(GL_SCISSOR_TEST);
>+    glScissor(kSize / 2, 0, kSize / 2, kSize);
>+    glClearColor(0.0f, 1.0f, 0.0f, 1.0f);
>+    glClear(GL_COLOR_BUFFER_BIT);
>+
>+    EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::red);
>+    EXPECT_PIXEL_COLOR_EQ(kSize / 2 + 1, 0, GLColor::green);
> 
>-    int width = getWindowWidth();
>+    ASSERT_GL_NO_ERROR();
>+}
>+
>+// Test that glTexSubImage2D works properly when glTexStorage2DEXT has initialized the image with a
>+// default color.
>+TEST_P(Texture2DTest, TexStorage)
>+{
>+    ANGLE_SKIP_TEST_IF(getClientMajorVersion() < 3 &&
>+                       !IsGLExtensionEnabled("GL_EXT_texture_storage"));
>+
>+    int width  = getWindowWidth();
>     int height = getWindowHeight();
> 
>     GLuint tex2D;
>@@ -1459,8 +1461,8 @@ TEST_P(Texture2DTest, TexStorage)
>     }
> 
>     // ANGLE internally uses RGBA as the DirectX format for RGB images
>-    // therefore glTexStorage2DEXT initializes the image to a default color to get a consistent alpha color.
>-    // The data is kept in a CPU-side image and the image is marked as dirty.
>+    // therefore glTexStorage2DEXT initializes the image to a default color to get a consistent
>+    // alpha color. The data is kept in a CPU-side image and the image is marked as dirty.
>     if (getClientMajorVersion() >= 3)
>     {
>         glTexStorage2D(GL_TEXTURE_2D, 1, GL_RGB8, 16, 16);
>@@ -1490,12 +1492,13 @@ TEST_P(Texture2DTest, TexStorage)
>     EXPECT_EQ(255, pixel.A);
> }
> 
>-// Test that glTexSubImage2D combined with a PBO works properly when glTexStorage2DEXT has initialized the image with a default color.
>+// Test that glTexSubImage2D combined with a PBO works properly when glTexStorage2DEXT has
>+// initialized the image with a default color.
> TEST_P(Texture2DTest, TexStorageWithPBO)
> {
>-    if (extensionEnabled("NV_pixel_buffer_object"))
>+    if (IsGLExtensionEnabled("NV_pixel_buffer_object"))
>     {
>-        int width = getWindowWidth();
>+        int width  = getWindowWidth();
>         int height = getWindowHeight();
> 
>         GLuint tex2D;
>@@ -1519,8 +1522,8 @@ TEST_P(Texture2DTest, TexStorageWithPBO)
>         glBufferData(GL_PIXEL_UNPACK_BUFFER, 3 * 16 * 16, pixels.data(), GL_STATIC_DRAW);
> 
>         // ANGLE internally uses RGBA as the DirectX format for RGB images
>-        // therefore glTexStorage2DEXT initializes the image to a default color to get a consistent alpha color.
>-        // The data is kept in a CPU-side image and the image is marked as dirty.
>+        // therefore glTexStorage2DEXT initializes the image to a default color to get a consistent
>+        // alpha color. The data is kept in a CPU-side image and the image is marked as dirty.
>         glTexStorage2DEXT(GL_TEXTURE_2D, 1, GL_RGB8, 16, 16);
> 
>         // Initializes the color of the upper-left 8x8 pixels, leaves the other pixels untouched.
>@@ -1560,43 +1563,21 @@ TEST_P(Texture2DTest, CopySubImageFloat_RG_RG)
> 
> TEST_P(Texture2DTest, CopySubImageFloat_RGB_R)
> {
>-    if (IsIntel() && IsLinux())
>-    {
>-        // TODO(cwallez): Fix on Linux Intel drivers (http://anglebug.com/1346)
>-        std::cout << "Test disabled on Linux Intel OpenGL." << std::endl;
>-        return;
>-    }
>-
>     testFloatCopySubImage(3, 1);
> }
> 
> TEST_P(Texture2DTest, CopySubImageFloat_RGB_RG)
> {
>-    if (IsIntel() && IsLinux())
>-    {
>-        // TODO(cwallez): Fix on Linux Intel drivers (http://anglebug.com/1346)
>-        std::cout << "Test disabled on Linux Intel OpenGL." << std::endl;
>-        return;
>-    }
>-
>     testFloatCopySubImage(3, 2);
> }
> 
> TEST_P(Texture2DTest, CopySubImageFloat_RGB_RGB)
> {
>-    if (IsIntel() && IsLinux())
>-    {
>-        // TODO(cwallez): Fix on Linux Intel drivers (http://anglebug.com/1346)
>-        std::cout << "Test disabled on Linux Intel OpenGL." << std::endl;
>-        return;
>-    }
>+    // TODO(cwallez): Fix on Linux Intel drivers (http://anglebug.com/1346)
>+    ANGLE_SKIP_TEST_IF(IsIntel() && IsLinux());
> 
>-    // TODO (bug 1284): Investigate RGBA32f D3D SDK Layers messages on D3D11_FL9_3
>-    if (IsD3D11_FL93())
>-    {
>-        std::cout << "Test skipped on Feature Level 9_3." << std::endl;
>-        return;
>-    }
>+    // Ignore SDK layers messages on D3D11 FL 9.3 (http://anglebug.com/1284)
>+    ANGLE_SKIP_TEST_IF(IsD3D11_FL93());
> 
>     testFloatCopySubImage(3, 3);
> }
>@@ -1613,37 +1594,35 @@ TEST_P(Texture2DTest, CopySubImageFloat_RGBA_RG)
> 
> TEST_P(Texture2DTest, CopySubImageFloat_RGBA_RGB)
> {
>-    // TODO (bug 1284): Investigate RGBA32f D3D SDK Layers messages on D3D11_FL9_3
>-    if (IsD3D11_FL93())
>-    {
>-        std::cout << "Test skipped on Feature Level 9_3." << std::endl;
>-        return;
>-    }
>+    // Ignore SDK layers messages on D3D11 FL 9.3 (http://anglebug.com/1284)
>+    ANGLE_SKIP_TEST_IF(IsD3D11_FL93());
> 
>     testFloatCopySubImage(4, 3);
> }
> 
> TEST_P(Texture2DTest, CopySubImageFloat_RGBA_RGBA)
> {
>-    // TODO (bug 1284): Investigate RGBA32f D3D SDK Layers messages on D3D11_FL9_3
>-    if (IsD3D11_FL93())
>-    {
>-        std::cout << "Test skipped on Feature Level 9_3." << std::endl;
>-        return;
>-    }
>+    // TODO(lucferron): This test fails only on linux and intel.
>+    // http://anglebug.com/2726
>+    ANGLE_SKIP_TEST_IF(IsVulkan() && IsLinux() && IsIntel());
>+
>+    // Ignore SDK layers messages on D3D11 FL 9.3 (http://anglebug.com/1284)
>+    ANGLE_SKIP_TEST_IF(IsD3D11_FL93());
> 
>     testFloatCopySubImage(4, 4);
> }
> 
>-// Port of https://www.khronos.org/registry/webgl/conformance-suites/1.0.3/conformance/textures/texture-npot.html
>-// Run against GL_ALPHA/UNSIGNED_BYTE format, to ensure that D3D11 Feature Level 9_3 correctly handles GL_ALPHA
>+// Port of
>+// https://www.khronos.org/registry/webgl/conformance-suites/1.0.3/conformance/textures/texture-npot.html
>+// Run against GL_ALPHA/UNSIGNED_BYTE format, to ensure that D3D11 Feature Level 9_3 correctly
>+// handles GL_ALPHA
> TEST_P(Texture2DTest, TextureNPOT_GL_ALPHA_UBYTE)
> {
>     const int npotTexSize = 5;
>-    const int potTexSize = 4; // Should be less than npotTexSize
>+    const int potTexSize  = 4;  // Should be less than npotTexSize
>     GLuint tex2D;
> 
>-    if (extensionEnabled("GL_OES_texture_npot"))
>+    if (IsGLExtensionEnabled("GL_OES_texture_npot"))
>     {
>         // This test isn't applicable if texture_npot is enabled
>         return;
>@@ -1660,21 +1639,19 @@ TEST_P(Texture2DTest, TextureNPOT_GL_ALPHA_UBYTE)
>     glGenTextures(1, &tex2D);
>     glBindTexture(GL_TEXTURE_2D, tex2D);
> 
>-    std::vector<GLubyte> pixels(1 * npotTexSize * npotTexSize);
>-    for (size_t pixelId = 0; pixelId < npotTexSize * npotTexSize; ++pixelId)
>-    {
>-        pixels[pixelId] = 64;
>-    }
>+    const std::vector<GLubyte> pixels(1 * npotTexSize * npotTexSize, 64);
> 
>     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
>     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
> 
>     // Check that an NPOT texture not on level 0 generates INVALID_VALUE
>-    glTexImage2D(GL_TEXTURE_2D, 1, GL_ALPHA, npotTexSize, npotTexSize, 0, GL_ALPHA, GL_UNSIGNED_BYTE, pixels.data());
>+    glTexImage2D(GL_TEXTURE_2D, 1, GL_ALPHA, npotTexSize, npotTexSize, 0, GL_ALPHA,
>+                 GL_UNSIGNED_BYTE, pixels.data());
>     EXPECT_GL_ERROR(GL_INVALID_VALUE);
> 
>     // Check that an NPOT texture on level 0 succeeds
>-    glTexImage2D(GL_TEXTURE_2D, 0, GL_ALPHA, npotTexSize, npotTexSize, 0, GL_ALPHA, GL_UNSIGNED_BYTE, pixels.data());
>+    glTexImage2D(GL_TEXTURE_2D, 0, GL_ALPHA, npotTexSize, npotTexSize, 0, GL_ALPHA,
>+                 GL_UNSIGNED_BYTE, pixels.data());
>     EXPECT_GL_NO_ERROR();
> 
>     // Check that generateMipmap fails on NPOT
>@@ -1705,7 +1682,8 @@ TEST_P(Texture2DTest, TextureNPOT_GL_ALPHA_UBYTE)
>     EXPECT_PIXEL_EQ(getWindowWidth() / 2, getWindowHeight() / 2, 0, 0, 0, 64);
> 
>     // Check that glTexImage2D for POT texture succeeds
>-    glTexImage2D(GL_TEXTURE_2D, 0, GL_ALPHA, potTexSize, potTexSize, 0, GL_ALPHA, GL_UNSIGNED_BYTE, pixels.data());
>+    glTexImage2D(GL_TEXTURE_2D, 0, GL_ALPHA, potTexSize, potTexSize, 0, GL_ALPHA, GL_UNSIGNED_BYTE,
>+                 pixels.data());
>     EXPECT_GL_NO_ERROR();
> 
>     // Check that generateMipmap for an POT texture succeeds
>@@ -1744,6 +1722,121 @@ TEST_P(Texture2DTest, NPOTSubImageParameters)
>     EXPECT_GL_NO_ERROR();
> }
> 
>+// Regression test for http://crbug.com/949985 to make sure dirty bits are propagated up from
>+// TextureImpl and the texture is synced before being used in a draw call.
>+TEST_P(Texture2DTestES3, TextureImplPropogatesDirtyBits)
>+{
>+    ANGLE_SKIP_TEST_IF(IsIntel() && IsOpenGL());
>+    // Flaky hangs on Win10 AMD RX 550 GL. http://anglebug.com/3371
>+    ANGLE_SKIP_TEST_IF(IsWindows() && IsAMD() && IsOpenGL());
>+
>+    // The workaround in the GL backend required to trigger this bug generates driver warning
>+    // messages.
>+    ScopedIgnorePlatformMessages ignoreMessages;
>+
>+    setUpProgram();
>+    glUseProgram(mProgram);
>+    glActiveTexture(GL_TEXTURE0 + mTexture2DUniformLocation);
>+
>+    GLTexture dest;
>+    glBindTexture(GL_TEXTURE_2D, dest);
>+
>+    GLTexture source;
>+    glBindTexture(GL_TEXTURE_2D, source);
>+
>+    // Put data in mip 0 and 1
>+    glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, 1, 1, 0, GL_RGBA, GL_UNSIGNED_BYTE,
>+                 GLColor::red.data());
>+    glTexImage2D(GL_TEXTURE_2D, 1, GL_RGBA, 1, 1, 0, GL_RGBA, GL_UNSIGNED_BYTE,
>+                 GLColor::green.data());
>+
>+    // Disable mipmapping so source is complete
>+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
>+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
>+
>+    // Force the dirty bits to be synchronized in source
>+    drawQuad(mProgram, "position", 1.0f);
>+
>+    // Copy from mip 1 of the source.  In the GL backend this internally sets the base level to mip
>+    // 1 and sets a dirty bit.
>+    glCopyTextureCHROMIUM(source, 1, GL_TEXTURE_2D, dest, 0, GL_RGBA, GL_UNSIGNED_BYTE, GL_FALSE,
>+                          GL_FALSE, GL_FALSE);
>+
>+    // Draw again, assertions are generated if the texture has internal dirty bits at draw time
>+    drawQuad(mProgram, "position", 1.0f);
>+}
>+
>+// This test case changes the base level of a texture that's attached to a framebuffer, clears every
>+// level to green, and then samples the texture when rendering. Test is taken from
>+// https://www.khronos.org/registry/webgl/sdk/tests/conformance2/rendering/framebuffer-texture-changing-base-level.html
>+TEST_P(Texture2DTestES3, FramebufferTextureChangingBaselevel)
>+{
>+    // TODO(geofflang): Investigate on D3D11. http://anglebug.com/2291
>+    ANGLE_SKIP_TEST_IF(IsD3D11());
>+
>+    setUpProgram();
>+
>+    constexpr GLint width  = 8;
>+    constexpr GLint height = 4;
>+
>+    GLTexture texture;
>+    glBindTexture(GL_TEXTURE_2D, texture);
>+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR);
>+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
>+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
>+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
>+
>+    // Create all mipmap levels for the texture from level 0 to the 1x1 pixel level.
>+    GLint level  = 0;
>+    GLint levelW = width;
>+    GLint levelH = height;
>+    glTexImage2D(GL_TEXTURE_2D, level, GL_RGBA, levelW, levelH, 0, GL_RGBA, GL_UNSIGNED_BYTE,
>+                 nullptr);
>+    while (levelW > 1 || levelH > 1)
>+    {
>+        ++level;
>+        levelW = static_cast<GLint>(std::max(1.0, std::floor(width / std::pow(2, level))));
>+        levelH = static_cast<GLint>(std::max(1.0, std::floor(height / std::pow(2, level))));
>+        glTexImage2D(GL_TEXTURE_2D, level, GL_RGBA, levelW, levelH, 0, GL_RGBA, GL_UNSIGNED_BYTE,
>+                     nullptr);
>+    }
>+
>+    // Clear each level of the texture using an FBO. Change the base level to match the level used
>+    // for the FBO on each iteration.
>+    GLFramebuffer fbo;
>+    glBindFramebuffer(GL_FRAMEBUFFER, fbo);
>+    level  = 0;
>+    levelW = width;
>+    levelH = height;
>+    while (levelW > 1 || levelH > 1)
>+    {
>+        levelW = static_cast<GLint>(std::floor(width / std::pow(2, level)));
>+        levelH = static_cast<GLint>(std::floor(height / std::pow(2, level)));
>+
>+        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_BASE_LEVEL, level);
>+        glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, texture, level);
>+
>+        EXPECT_GLENUM_EQ(GL_FRAMEBUFFER_COMPLETE, glCheckFramebufferStatus(GL_FRAMEBUFFER));
>+        EXPECT_GL_NO_ERROR();
>+
>+        glClearColor(0, 1, 0, 1);
>+        glClear(GL_COLOR_BUFFER_BIT);
>+
>+        EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::green);
>+
>+        ++level;
>+    }
>+
>+    glBindFramebuffer(GL_FRAMEBUFFER, 0);
>+    glViewport(0, 0, 16, 16);
>+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_BASE_LEVEL, 0);
>+
>+    drawQuad(mProgram, "position", 0.5f);
>+
>+    EXPECT_GL_NO_ERROR();
>+    EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::green);
>+}
>+
> // Test to check that texture completeness is determined correctly when the texture base level is
> // greater than 0, and also that level 0 is not sampled when base level is greater than 0.
> TEST_P(Texture2DTestES3, DrawWithBaseLevel1)
>@@ -1773,18 +1866,9 @@ TEST_P(Texture2DTestES3, DrawWithBaseLevel1)
> // have images defined.
> TEST_P(Texture2DTestES3, DrawWithLevelsOutsideRangeUndefined)
> {
>-    if (IsAMD() && getPlatformRenderer() == EGL_PLATFORM_ANGLE_TYPE_OPENGL_ANGLE)
>-    {
>-        // Observed crashing on AMD. Oddly the crash only happens with 2D textures, not 3D or array.
>-        std::cout << "Test skipped on AMD OpenGL." << std::endl;
>-        return;
>-    }
>-    if (IsOSX())
>-    {
>-        // Observed incorrect rendering on OSX.
>-        std::cout << "Test skipped on OSX." << std::endl;
>-        return;
>-    }
>+    // Observed crashing on AMD. Oddly the crash only happens with 2D textures, not 3D or array.
>+    ANGLE_SKIP_TEST_IF(IsAMD() && IsOpenGL());
>+
>     glActiveTexture(GL_TEXTURE0);
>     glBindTexture(GL_TEXTURE_2D, mTexture2D);
>     std::vector<GLColor> texDataGreen(2u * 2u, GLColor::green);
>@@ -1805,18 +1889,9 @@ TEST_P(Texture2DTestES3, DrawWithLevelsOutsideRangeUndefined)
> // Test that drawing works correctly when level 0 is undefined and base level is 1.
> TEST_P(Texture2DTestES3, DrawWithLevelZeroUndefined)
> {
>-    if (IsAMD() && getPlatformRenderer() == EGL_PLATFORM_ANGLE_TYPE_OPENGL_ANGLE)
>-    {
>-        // Observed crashing on AMD. Oddly the crash only happens with 2D textures, not 3D or array.
>-        std::cout << "Test skipped on AMD OpenGL." << std::endl;
>-        return;
>-    }
>-    if (IsOSX())
>-    {
>-        // Observed incorrect rendering on OSX.
>-        std::cout << "Test skipped on OSX." << std::endl;
>-        return;
>-    }
>+    // Observed crashing on AMD. Oddly the crash only happens with 2D textures, not 3D or array.
>+    ANGLE_SKIP_TEST_IF(IsAMD() && IsOpenGL());
>+
>     glActiveTexture(GL_TEXTURE0);
>     glBindTexture(GL_TEXTURE_2D, mTexture2D);
>     std::vector<GLColor> texDataGreen(2u * 2u, GLColor::green);
>@@ -1846,12 +1921,6 @@ TEST_P(Texture2DTestES3, DrawWithLevelZeroUndefined)
> // GLES 3.0.4 section 3.8.13 Texture completeness
> TEST_P(Texture2DTestES3, DrawWithLevelsOutsideRangeWithInconsistentDimensions)
> {
>-    if (IsOSX())
>-    {
>-        // Observed incorrect rendering on OSX.
>-        std::cout << "Test skipped on OSX." << std::endl;
>-        return;
>-    }
>     glActiveTexture(GL_TEXTURE0);
>     glBindTexture(GL_TEXTURE_2D, mTexture2D);
>     std::vector<GLColor> texDataRed(8u * 8u, GLColor::red);
>@@ -1879,13 +1948,7 @@ TEST_P(Texture2DTestES3, DrawWithLevelsOutsideRangeWithInconsistentDimensions)
> 
>     EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::green);
> 
>-    if (IsIntel() && getPlatformRenderer() == EGL_PLATFORM_ANGLE_TYPE_OPENGL_ANGLE)
>-    {
>-        // Intel was observed drawing color 0,0,0,0 instead of the texture color after the base
>-        // level was changed.
>-        std::cout << "Test partially skipped on Intel OpenGL." << std::endl;
>-        return;
>-    }
>+    ANGLE_SKIP_TEST_IF(IsIntel() && IsWindows() && IsOpenGL());
> 
>     // Switch the level that is being used to the cyan level 2.
>     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_BASE_LEVEL, 2);
>@@ -1902,12 +1965,6 @@ TEST_P(Texture2DTestES3, DrawWithLevelsOutsideRangeWithInconsistentDimensions)
> // have images defined.
> TEST_P(Texture3DTestES3, DrawWithLevelsOutsideRangeUndefined)
> {
>-    if (IsOSX())
>-    {
>-        // Observed incorrect rendering on OSX.
>-        std::cout << "Test skipped on OSX." << std::endl;
>-        return;
>-    }
>     glActiveTexture(GL_TEXTURE0);
>     glBindTexture(GL_TEXTURE_3D, mTexture3D);
>     std::vector<GLColor> texDataGreen(2u * 2u * 2u, GLColor::green);
>@@ -1930,12 +1987,6 @@ TEST_P(Texture3DTestES3, DrawWithLevelsOutsideRangeUndefined)
> // GLES 3.0.4 section 3.8.13 Texture completeness
> TEST_P(Texture3DTestES3, DrawWithLevelsOutsideRangeWithInconsistentDimensions)
> {
>-    if (IsOSX())
>-    {
>-        // Observed incorrect rendering on OSX.
>-        std::cout << "Test skipped on OSX." << std::endl;
>-        return;
>-    }
>     glActiveTexture(GL_TEXTURE0);
>     glBindTexture(GL_TEXTURE_3D, mTexture3D);
>     std::vector<GLColor> texDataRed(8u * 8u * 8u, GLColor::red);
>@@ -1964,13 +2015,7 @@ TEST_P(Texture3DTestES3, DrawWithLevelsOutsideRangeWithInconsistentDimensions)
> 
>     EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::green);
> 
>-    if (IsIntel() && getPlatformRenderer() == EGL_PLATFORM_ANGLE_TYPE_OPENGL_ANGLE)
>-    {
>-        // Intel was observed drawing color 0,0,0,0 instead of the texture color after the base
>-        // level was changed.
>-        std::cout << "Test partially skipped on Intel OpenGL." << std::endl;
>-        return;
>-    }
>+    ANGLE_SKIP_TEST_IF(IsIntel() && IsWindows() && IsOpenGL());
> 
>     // Switch the level that is being used to the cyan level 2.
>     glTexParameteri(GL_TEXTURE_3D, GL_TEXTURE_BASE_LEVEL, 2);
>@@ -1987,12 +2032,6 @@ TEST_P(Texture3DTestES3, DrawWithLevelsOutsideRangeWithInconsistentDimensions)
> // have images defined.
> TEST_P(Texture2DArrayTestES3, DrawWithLevelsOutsideRangeUndefined)
> {
>-    if (IsOSX())
>-    {
>-        // Observed incorrect rendering on OSX.
>-        std::cout << "Test skipped on OSX." << std::endl;
>-        return;
>-    }
>     glActiveTexture(GL_TEXTURE0);
>     glBindTexture(GL_TEXTURE_2D_ARRAY, m2DArrayTexture);
>     std::vector<GLColor> texDataGreen(2u * 2u * 2u, GLColor::green);
>@@ -2015,12 +2054,6 @@ TEST_P(Texture2DArrayTestES3, DrawWithLevelsOutsideRangeUndefined)
> // GLES 3.0.4 section 3.8.13 Texture completeness
> TEST_P(Texture2DArrayTestES3, DrawWithLevelsOutsideRangeWithInconsistentDimensions)
> {
>-    if (IsOSX())
>-    {
>-        // Observed incorrect rendering on OSX.
>-        std::cout << "Test skipped on OSX." << std::endl;
>-        return;
>-    }
>     glActiveTexture(GL_TEXTURE0);
>     glBindTexture(GL_TEXTURE_3D, m2DArrayTexture);
>     std::vector<GLColor> texDataRed(8u * 8u * 8u, GLColor::red);
>@@ -2049,21 +2082,11 @@ TEST_P(Texture2DArrayTestES3, DrawWithLevelsOutsideRangeWithInconsistentDimensio
> 
>     EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::green);
> 
>-    if (IsIntel() && getPlatformRenderer() == EGL_PLATFORM_ANGLE_TYPE_OPENGL_ANGLE)
>-    {
>-        // Intel was observed drawing color 0,0,0,0 instead of the texture color after the base
>-        // level was changed.
>-        std::cout << "Test partially skipped on Intel OpenGL." << std::endl;
>-        return;
>-    }
>-    if (IsNVIDIA() && (getPlatformRenderer() == EGL_PLATFORM_ANGLE_TYPE_OPENGL_ANGLE ||
>-                       getPlatformRenderer() == EGL_PLATFORM_ANGLE_TYPE_OPENGLES_ANGLE))
>-    {
>-        // NVIDIA was observed drawing color 0,0,0,0 instead of the texture color after the base
>-        // level was changed.
>-        std::cout << "Test partially skipped on NVIDIA OpenGL." << std::endl;
>-        return;
>-    }
>+    ANGLE_SKIP_TEST_IF(IsIntel() && IsWindows() && IsOpenGL());
>+
>+    // NVIDIA was observed drawing color 0,0,0,0 instead of the texture color after the base
>+    // level was changed.
>+    ANGLE_SKIP_TEST_IF(IsNVIDIA() && (IsOpenGL() || IsOpenGLES()));
> 
>     // Switch the level that is being used to the cyan level 2.
>     glTexParameteri(GL_TEXTURE_2D_ARRAY, GL_TEXTURE_BASE_LEVEL, 2);
>@@ -2080,20 +2103,6 @@ TEST_P(Texture2DArrayTestES3, DrawWithLevelsOutsideRangeWithInconsistentDimensio
> // GLES 3.0.4 section 3.8.13 Texture completeness
> TEST_P(Texture2DTestES3, TextureCompletenessChangesWithMaxLevel)
> {
>-    if (IsIntel() && getPlatformRenderer() == EGL_PLATFORM_ANGLE_TYPE_OPENGL_ANGLE)
>-    {
>-        // Intel was observed having wrong behavior after the texture is made incomplete by changing
>-        // the base level.
>-        std::cout << "Test skipped on Intel OpenGL." << std::endl;
>-        return;
>-    }
>-    if (IsOSX())
>-    {
>-        // Observed incorrect rendering on OSX.
>-        std::cout << "Test skipped on OSX." << std::endl;
>-        return;
>-    }
>-
>     glActiveTexture(GL_TEXTURE0);
>     glBindTexture(GL_TEXTURE_2D, mTexture2D);
>     std::vector<GLColor> texDataGreen(8u * 8u, GLColor::green);
>@@ -2133,20 +2142,6 @@ TEST_P(Texture2DTestES3, TextureCompletenessChangesWithMaxLevel)
> // GLES 3.0.4 section 3.8.13 Texture completeness
> TEST_P(Texture3DTestES3, Texture3DCompletenessChangesWithMaxLevel)
> {
>-    if (IsIntel() && getPlatformRenderer() == EGL_PLATFORM_ANGLE_TYPE_OPENGL_ANGLE)
>-    {
>-        // Intel was observed having wrong behavior after the texture is made incomplete by changing
>-        // the base level.
>-        std::cout << "Test skipped on Intel OpenGL." << std::endl;
>-        return;
>-    }
>-    if (IsOSX())
>-    {
>-        // Observed incorrect rendering on OSX.
>-        std::cout << "Test skipped on OSX." << std::endl;
>-        return;
>-    }
>-
>     glActiveTexture(GL_TEXTURE0);
>     glBindTexture(GL_TEXTURE_3D, mTexture3D);
>     std::vector<GLColor> texDataGreen(2u * 2u * 2u, GLColor::green);
>@@ -2186,14 +2181,6 @@ TEST_P(Texture3DTestES3, Texture3DCompletenessChangesWithMaxLevel)
> // GLES 3.0.4 section 3.8.13 Texture completeness
> TEST_P(Texture2DTestES3, TextureCompletenessChangesWithBaseLevel)
> {
>-    if (IsIntel() && getPlatformRenderer() == EGL_PLATFORM_ANGLE_TYPE_OPENGL_ANGLE)
>-    {
>-        // Intel was observed having wrong behavior after the texture is made incomplete by changing
>-        // the base level.
>-        std::cout << "Test skipped on Intel OpenGL." << std::endl;
>-        return;
>-    }
>-
>     glActiveTexture(GL_TEXTURE0);
>     glBindTexture(GL_TEXTURE_2D, mTexture2D);
>     std::vector<GLColor> texDataGreen(8u * 8u, GLColor::green);
>@@ -2235,14 +2222,6 @@ TEST_P(Texture2DTestES3, TextureCompletenessChangesWithBaseLevel)
> // GLES 3.0.4 section 3.8.13 Texture completeness
> TEST_P(Texture2DTestES3, TextureBaseLevelGreaterThanMaxLevel)
> {
>-    if (IsIntel() && getPlatformRenderer() == EGL_PLATFORM_ANGLE_TYPE_OPENGL_ANGLE)
>-    {
>-        // Intel Windows OpenGL driver crashes if the base level of a non-immutable texture is out
>-        // of range.
>-        std::cout << "Test skipped on Intel OpenGL." << std::endl;
>-        return;
>-    }
>-
>     glActiveTexture(GL_TEXTURE0);
>     glBindTexture(GL_TEXTURE_2D, mTexture2D);
> 
>@@ -2294,24 +2273,13 @@ TEST_P(Texture2DTestES3, ImmutableTextureBaseLevelOutOfRange)
> // Test that changing base level works when it affects the format of the texture.
> TEST_P(Texture2DTestES3, TextureFormatChangesWithBaseLevel)
> {
>-    if (IsNVIDIA() && IsOpenGL())
>-    {
>-        // Observed rendering corruption on NVIDIA OpenGL.
>-        std::cout << "Test skipped on NVIDIA OpenGL." << std::endl;
>-        return;
>-    }
>-    if (IsIntel() && IsDesktopOpenGL())
>-    {
>-        // Observed incorrect rendering on Intel OpenGL.
>-        std::cout << "Test skipped on Intel OpenGL." << std::endl;
>-        return;
>-    }
>-    if (IsAMD() && IsDesktopOpenGL())
>-    {
>-        // Observed incorrect rendering on AMD OpenGL.
>-        std::cout << "Test skipped on AMD OpenGL." << std::endl;
>-        return;
>-    }
>+    // Observed rendering corruption on NVIDIA OpenGL.
>+    ANGLE_SKIP_TEST_IF(IsNVIDIA() && IsOpenGL());
>+
>+    ANGLE_SKIP_TEST_IF(IsIntel() && IsWindows() && IsDesktopOpenGL());
>+
>+    // Observed incorrect rendering on AMD OpenGL.
>+    ANGLE_SKIP_TEST_IF(IsAMD() && IsDesktopOpenGL());
> 
>     glActiveTexture(GL_TEXTURE0);
>     glBindTexture(GL_TEXTURE_2D, mTexture2D);
>@@ -2374,9 +2342,9 @@ TEST_P(Texture2DTestES3, SetImageWhenBaseLevelOutOfRange)
>     EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::green);
> }
> 
>-// In the D3D11 renderer, we need to initialize some texture formats, to fill empty channels. EG RBA->RGBA8, with 1.0
>-// in the alpha channel. This test covers a bug where redefining array textures with these formats does not work as
>-// expected.
>+// In the D3D11 renderer, we need to initialize some texture formats, to fill empty channels. EG
>+// RBA->RGBA8, with 1.0 in the alpha channel. This test covers a bug where redefining array textures
>+// with these formats does not work as expected.
> TEST_P(Texture2DArrayTestES3, RedefineInittableArray)
> {
>     std::vector<GLubyte> pixelData;
>@@ -2392,7 +2360,8 @@ TEST_P(Texture2DArrayTestES3, RedefineInittableArray)
>     glUniform1i(mTextureArrayLocation, 0);
> 
>     // The first draw worked correctly.
>-    glTexImage3D(GL_TEXTURE_2D_ARRAY, 0, GL_RGB, 4, 4, 2, 0, GL_RGB, GL_UNSIGNED_BYTE, &pixelData[0]);
>+    glTexImage3D(GL_TEXTURE_2D_ARRAY, 0, GL_RGB, 4, 4, 2, 0, GL_RGB, GL_UNSIGNED_BYTE,
>+                 &pixelData[0]);
> 
>     glTexParameteri(GL_TEXTURE_2D_ARRAY, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
>     glTexParameteri(GL_TEXTURE_2D_ARRAY, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
>@@ -2402,7 +2371,8 @@ TEST_P(Texture2DArrayTestES3, RedefineInittableArray)
>     EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::green);
> 
>     // The dimension of the respecification must match the original exactly to trigger the bug.
>-    glTexImage3D(GL_TEXTURE_2D_ARRAY, 0, GL_RGB, 4, 4, 2, 0, GL_RGB, GL_UNSIGNED_BYTE, &pixelData[0]);
>+    glTexImage3D(GL_TEXTURE_2D_ARRAY, 0, GL_RGB, 4, 4, 2, 0, GL_RGB, GL_UNSIGNED_BYTE,
>+                 &pixelData[0]);
>     drawQuad(mProgram, "position", 1.0f);
>     EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::green);
> 
>@@ -2517,11 +2487,8 @@ TEST_P(SamplerTypeMixTestES3, SamplerTypeMixDraw)
> // Calling textureSize() on the samplers hits the D3D sampler metadata workaround.
> TEST_P(TextureSizeTextureArrayTest, BaseLevelVariesInTextureArray)
> {
>-    if (IsAMD() && IsD3D11())
>-    {
>-        std::cout << "Test skipped on AMD D3D." << std::endl;
>-        return;
>-    }
>+    ANGLE_SKIP_TEST_IF(IsAMD() && IsD3D11());
>+
>     glActiveTexture(GL_TEXTURE0);
>     glBindTexture(GL_TEXTURE_2D, mTexture2DA);
>     GLsizei size = 64;
>@@ -2553,7 +2520,7 @@ TEST_P(TextureSizeTextureArrayTest, BaseLevelVariesInTextureArray)
>     glUniform1i(mTexture0Location, 0);
>     glUniform1i(mTexture1Location, 1);
> 
>-    drawQuad(mProgram, "position", 0.5f);
>+    drawQuad(mProgram, essl3_shaders::PositionAttrib(), 0.5f);
>     EXPECT_GL_NO_ERROR();
>     // Red channel: width of level 1 of texture A: 32.
>     // Green channel: width of level 3 of texture B: 16.
>@@ -2576,8 +2543,10 @@ TEST_P(Texture2DTestES3, TextureRGBImplicitAlpha1)
> 
> // When sampling a texture without an alpha channel, "1" is returned as the alpha value.
> // ES 3.0.4 table 3.24
>-TEST_P(Texture2DTestES3, TextureLuminanceImplicitAlpha1)
>+TEST_P(Texture2DTest, TextureLuminanceImplicitAlpha1)
> {
>+    setUpProgram();
>+
>     glActiveTexture(GL_TEXTURE0);
>     glBindTexture(GL_TEXTURE_2D, mTexture2D);
>     glTexImage2D(GL_TEXTURE_2D, 0, GL_LUMINANCE, 1, 1, 0, GL_LUMINANCE, GL_UNSIGNED_BYTE, nullptr);
>@@ -2588,62 +2557,90 @@ TEST_P(Texture2DTestES3, TextureLuminanceImplicitAlpha1)
>     EXPECT_PIXEL_ALPHA_EQ(0, 0, 255);
> }
> 
>-// When sampling a texture without an alpha channel, "1" is returned as the alpha value.
>-// ES 3.0.4 table 3.24
>-TEST_P(Texture2DTestES3, TextureLuminance32ImplicitAlpha1)
>+// Validate that every component of the pixel will be equal to the luminance value we've set
>+// and that the alpha channel will be 1 (or 255 to be exact).
>+TEST_P(Texture2DTest, TextureLuminanceRGBSame)
> {
>-    if (extensionEnabled("GL_OES_texture_float"))
>-    {
>-        glActiveTexture(GL_TEXTURE0);
>-        glBindTexture(GL_TEXTURE_2D, mTexture2D);
>-        glTexImage2D(GL_TEXTURE_2D, 0, GL_LUMINANCE, 1, 1, 0, GL_LUMINANCE, GL_FLOAT, nullptr);
>-        EXPECT_GL_NO_ERROR();
>+    setUpProgram();
> 
>-        drawQuad(mProgram, "position", 0.5f);
>+    glActiveTexture(GL_TEXTURE0);
>+    glBindTexture(GL_TEXTURE_2D, mTexture2D);
>+    uint8_t pixel = 50;
>+    glTexImage2D(GL_TEXTURE_2D, 0, GL_LUMINANCE, 1, 1, 0, GL_LUMINANCE, GL_UNSIGNED_BYTE, &pixel);
>+    EXPECT_GL_NO_ERROR();
> 
>-        EXPECT_PIXEL_ALPHA_EQ(0, 0, 255);
>-    }
>+    drawQuad(mProgram, "position", 0.5f);
>+
>+    EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor(pixel, pixel, pixel, 255));
>+}
>+
>+// Validate that every component of the pixel will be equal to the luminance value we've set
>+// and that the alpha channel will be the second component.
>+TEST_P(Texture2DTest, TextureLuminanceAlphaRGBSame)
>+{
>+    setUpProgram();
>+
>+    glActiveTexture(GL_TEXTURE0);
>+    glBindTexture(GL_TEXTURE_2D, mTexture2D);
>+    uint8_t pixel[] = {50, 25};
>+    glTexImage2D(GL_TEXTURE_2D, 0, GL_LUMINANCE_ALPHA, 1, 1, 0, GL_LUMINANCE_ALPHA,
>+                 GL_UNSIGNED_BYTE, pixel);
>+    EXPECT_GL_NO_ERROR();
>+
>+    drawQuad(mProgram, "position", 0.5f);
>+
>+    EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor(pixel[0], pixel[0], pixel[0], pixel[1]));
> }
> 
> // When sampling a texture without an alpha channel, "1" is returned as the alpha value.
> // ES 3.0.4 table 3.24
>-TEST_P(Texture2DTestES3, TextureLuminance16ImplicitAlpha1)
>+TEST_P(Texture2DTest, TextureLuminance32ImplicitAlpha1)
> {
>-    if (extensionEnabled("GL_OES_texture_half_float"))
>-    {
>-        if (IsNVIDIA() && IsOpenGLES())
>-        {
>-            std::cout << "Test skipped on NVIDIA" << std::endl;
>-            return;
>-        }
>-        // TODO(ynovikov): re-enable once root cause of http://anglebug.com/1420 is fixed
>-        if (IsAndroid() && IsAdreno() && IsOpenGLES())
>-        {
>-            std::cout << "Test skipped on Adreno OpenGLES on Android." << std::endl;
>-            return;
>-        }
>+    ANGLE_SKIP_TEST_IF(!IsGLExtensionEnabled("GL_OES_texture_float"));
>+    ANGLE_SKIP_TEST_IF(IsD3D9());
>+    ANGLE_SKIP_TEST_IF(IsVulkan());
> 
>-        glActiveTexture(GL_TEXTURE0);
>-        glBindTexture(GL_TEXTURE_2D, mTexture2D);
>-        glTexImage2D(GL_TEXTURE_2D, 0, GL_LUMINANCE, 1, 1, 0, GL_LUMINANCE, GL_HALF_FLOAT_OES,
>-                     nullptr);
>-        EXPECT_GL_NO_ERROR();
>+    setUpProgram();
> 
>-        drawQuad(mProgram, "position", 0.5f);
>+    glActiveTexture(GL_TEXTURE0);
>+    glBindTexture(GL_TEXTURE_2D, mTexture2D);
>+    glTexImage2D(GL_TEXTURE_2D, 0, GL_LUMINANCE, 1, 1, 0, GL_LUMINANCE, GL_FLOAT, nullptr);
>+    EXPECT_GL_NO_ERROR();
> 
>-        EXPECT_PIXEL_ALPHA_EQ(0, 0, 255);
>-    }
>+    drawQuad(mProgram, "position", 0.5f);
>+
>+    EXPECT_PIXEL_ALPHA_EQ(0, 0, 255);
>+}
>+
>+// When sampling a texture without an alpha channel, "1" is returned as the alpha value.
>+// ES 3.0.4 table 3.24
>+TEST_P(Texture2DTest, TextureLuminance16ImplicitAlpha1)
>+{
>+    ANGLE_SKIP_TEST_IF(!IsGLExtensionEnabled("GL_OES_texture_float"));
>+    ANGLE_SKIP_TEST_IF(IsD3D9());
>+    ANGLE_SKIP_TEST_IF(IsVulkan());
>+    ANGLE_SKIP_TEST_IF(IsNVIDIA() && IsOpenGLES());
>+    // TODO(ynovikov): re-enable once root cause of http://anglebug.com/1420 is fixed
>+    ANGLE_SKIP_TEST_IF(IsAndroid() && IsAdreno() && IsOpenGLES());
>+
>+    setUpProgram();
>+
>+    glActiveTexture(GL_TEXTURE0);
>+    glBindTexture(GL_TEXTURE_2D, mTexture2D);
>+    glTexImage2D(GL_TEXTURE_2D, 0, GL_LUMINANCE, 1, 1, 0, GL_LUMINANCE, GL_HALF_FLOAT_OES, nullptr);
>+    EXPECT_GL_NO_ERROR();
>+
>+    drawQuad(mProgram, "position", 0.5f);
>+
>+    EXPECT_PIXEL_ALPHA_EQ(0, 0, 255);
> }
> 
> // When sampling a texture without an alpha channel, "1" is returned as the alpha value.
> // ES 3.0.4 table 3.24
> TEST_P(Texture2DUnsignedIntegerAlpha1TestES3, TextureRGB8UIImplicitAlpha1)
> {
>-    if (IsIntel())
>-    {
>-        std::cout << "Test disabled on Intel." << std::endl;
>-        return;
>-    }
>+    ANGLE_SKIP_TEST_IF(IsIntel() && IsOSX());
>+
>     glActiveTexture(GL_TEXTURE0);
>     glBindTexture(GL_TEXTURE_2D, mTexture2D);
>     glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB8UI, 1, 1, 0, GL_RGB_INTEGER, GL_UNSIGNED_BYTE, nullptr);
>@@ -2660,11 +2657,8 @@ TEST_P(Texture2DUnsignedIntegerAlpha1TestES3, TextureRGB8UIImplicitAlpha1)
> // ES 3.0.4 table 3.24
> TEST_P(Texture2DIntegerAlpha1TestES3, TextureRGB8IImplicitAlpha1)
> {
>-    if (IsIntel())
>-    {
>-        std::cout << "Test disabled on Intel." << std::endl;
>-        return;
>-    }
>+    ANGLE_SKIP_TEST_IF(IsIntel() && IsOSX());
>+
>     glActiveTexture(GL_TEXTURE0);
>     glBindTexture(GL_TEXTURE_2D, mTexture2D);
> 
>@@ -2682,11 +2676,8 @@ TEST_P(Texture2DIntegerAlpha1TestES3, TextureRGB8IImplicitAlpha1)
> // ES 3.0.4 table 3.24
> TEST_P(Texture2DUnsignedIntegerAlpha1TestES3, TextureRGB16UIImplicitAlpha1)
> {
>-    if (IsIntel())
>-    {
>-        std::cout << "Test disabled on Intel." << std::endl;
>-        return;
>-    }
>+    ANGLE_SKIP_TEST_IF(IsIntel() && IsOSX());
>+
>     glActiveTexture(GL_TEXTURE0);
>     glBindTexture(GL_TEXTURE_2D, mTexture2D);
>     glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB16UI, 1, 1, 0, GL_RGB_INTEGER, GL_UNSIGNED_SHORT, nullptr);
>@@ -2703,11 +2694,8 @@ TEST_P(Texture2DUnsignedIntegerAlpha1TestES3, TextureRGB16UIImplicitAlpha1)
> // ES 3.0.4 table 3.24
> TEST_P(Texture2DIntegerAlpha1TestES3, TextureRGB16IImplicitAlpha1)
> {
>-    if (IsIntel())
>-    {
>-        std::cout << "Test disabled on Intel." << std::endl;
>-        return;
>-    }
>+    ANGLE_SKIP_TEST_IF(IsIntel() && IsOSX());
>+
>     glActiveTexture(GL_TEXTURE0);
>     glBindTexture(GL_TEXTURE_2D, mTexture2D);
>     glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB16I, 1, 1, 0, GL_RGB_INTEGER, GL_SHORT, nullptr);
>@@ -2724,11 +2712,8 @@ TEST_P(Texture2DIntegerAlpha1TestES3, TextureRGB16IImplicitAlpha1)
> // ES 3.0.4 table 3.24
> TEST_P(Texture2DUnsignedIntegerAlpha1TestES3, TextureRGB32UIImplicitAlpha1)
> {
>-    if (IsIntel())
>-    {
>-        std::cout << "Test disabled on Intel." << std::endl;
>-        return;
>-    }
>+    ANGLE_SKIP_TEST_IF(IsIntel() && IsOSX());
>+
>     glActiveTexture(GL_TEXTURE0);
>     glBindTexture(GL_TEXTURE_2D, mTexture2D);
>     glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB32UI, 1, 1, 0, GL_RGB_INTEGER, GL_UNSIGNED_INT, nullptr);
>@@ -2745,11 +2730,8 @@ TEST_P(Texture2DUnsignedIntegerAlpha1TestES3, TextureRGB32UIImplicitAlpha1)
> // ES 3.0.4 table 3.24
> TEST_P(Texture2DIntegerAlpha1TestES3, TextureRGB32IImplicitAlpha1)
> {
>-    if (IsIntel())
>-    {
>-        std::cout << "Test disabled on Intel." << std::endl;
>-        return;
>-    }
>+    ANGLE_SKIP_TEST_IF(IsIntel() && IsOSX());
>+
>     glActiveTexture(GL_TEXTURE0);
>     glBindTexture(GL_TEXTURE_2D, mTexture2D);
>     glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB32I, 1, 1, 0, GL_RGB_INTEGER, GL_INT, nullptr);
>@@ -2795,12 +2777,11 @@ TEST_P(Texture2DTestES3, TextureRGB9E5ImplicitAlpha1)
> // ES 3.0.4 table 3.24
> TEST_P(Texture2DTestES3, TextureCOMPRESSEDRGB8ETC2ImplicitAlpha1)
> {
>-    if (IsOSX() && IsIntel() && IsOpenGL())
>-    {
>-        // Seems to fail on OSX 10.12 Intel.
>-        std::cout << "Test skipped on OSX Intel." << std::endl;
>-        return;
>-    }
>+    // Seems to fail on OSX 10.12 Intel.
>+    ANGLE_SKIP_TEST_IF(IsOSX() && IsIntel() && IsOpenGL());
>+
>+    // http://anglebug.com/2190
>+    ANGLE_SKIP_TEST_IF(IsOSX() && IsNVIDIA() && IsDesktopOpenGL());
> 
>     glActiveTexture(GL_TEXTURE0);
>     glBindTexture(GL_TEXTURE_2D, mTexture2D);
>@@ -2816,13 +2797,11 @@ TEST_P(Texture2DTestES3, TextureCOMPRESSEDRGB8ETC2ImplicitAlpha1)
> // ES 3.0.4 table 3.24
> TEST_P(Texture2DTestES3, TextureCOMPRESSEDSRGB8ETC2ImplicitAlpha1)
> {
>-    if (IsIntel() && IsOpenGL() && (IsLinux() || IsOSX()))
>-    {
>-        // TODO(cwallez): Fix on Linux Intel drivers (http://anglebug.com/1346)
>-        // Also seems to fail on OSX 10.12 Intel.
>-        std::cout << "Test disabled on Linux and OSX Intel OpenGL." << std::endl;
>-        return;
>-    }
>+    // Seems to fail on OSX 10.12 Intel.
>+    ANGLE_SKIP_TEST_IF(IsOSX() && IsIntel() && IsOpenGL());
>+
>+    // http://anglebug.com/2190
>+    ANGLE_SKIP_TEST_IF(IsOSX() && IsNVIDIA() && IsDesktopOpenGL());
> 
>     glActiveTexture(GL_TEXTURE0);
>     glBindTexture(GL_TEXTURE_2D, mTexture2D);
>@@ -2843,12 +2822,8 @@ TEST_P(SamplerInStructTest, SamplerInStruct)
> // Use a sampler in a uniform struct that's passed as a function parameter.
> TEST_P(SamplerInStructAsFunctionParameterTest, SamplerInStructAsFunctionParameter)
> {
>-    // TODO(ynovikov): re-enable once root cause of http://anglebug.com/1427 is fixed
>-    if (IsAndroid() && IsAdreno() && IsOpenGLES())
>-    {
>-        std::cout << "Test skipped on Adreno OpenGLES on Android." << std::endl;
>-        return;
>-    }
>+    // Fails on Nexus 5X due to a driver bug. http://anglebug.com/1427
>+    ANGLE_SKIP_TEST_IF((IsNexus5X() || IsNexus6P()) && IsOpenGLES());
> 
>     runSamplerInStructTest();
> }
>@@ -2857,12 +2832,9 @@ TEST_P(SamplerInStructAsFunctionParameterTest, SamplerInStructAsFunctionParamete
> // parameter.
> TEST_P(SamplerInStructArrayAsFunctionParameterTest, SamplerInStructArrayAsFunctionParameter)
> {
>-    // TODO(ynovikov): re-enable once root cause of http://anglebug.com/1427 is fixed
>-    if (IsAndroid() && IsAdreno() && IsOpenGLES())
>-    {
>-        std::cout << "Test skipped on Adreno OpenGLES on Android." << std::endl;
>-        return;
>-    }
>+    // Fails on Nexus 5X due to a driver bug. http://anglebug.com/1427
>+    ANGLE_SKIP_TEST_IF((IsNexus5X() || IsNexus6P()) && IsOpenGLES());
>+
>     runSamplerInStructTest();
> }
> 
>@@ -2870,12 +2842,9 @@ TEST_P(SamplerInStructArrayAsFunctionParameterTest, SamplerInStructArrayAsFuncti
> // parameter.
> TEST_P(SamplerInNestedStructAsFunctionParameterTest, SamplerInNestedStructAsFunctionParameter)
> {
>-    // TODO(ynovikov): re-enable once root cause of http://anglebug.com/1427 is fixed
>-    if (IsAndroid() && IsAdreno() && IsOpenGLES())
>-    {
>-        std::cout << "Test skipped on Adreno OpenGLES on Android." << std::endl;
>-        return;
>-    }
>+    // Fails on Nexus 5X due to a driver bug. http://anglebug.com/1427
>+    ANGLE_SKIP_TEST_IF((IsNexus5X() || IsNexus6P()) && IsOpenGLES());
>+
>     runSamplerInStructTest();
> }
> 
>@@ -2886,6 +2855,490 @@ TEST_P(SamplerInStructAndOtherVariableTest, SamplerInStructAndOtherVariable)
>     runSamplerInStructTest();
> }
> 
>+// GL_EXT_texture_filter_anisotropic
>+class TextureAnisotropyTest : public Texture2DTest
>+{
>+  protected:
>+    void uploadTexture()
>+    {
>+        glActiveTexture(GL_TEXTURE0);
>+        glBindTexture(GL_TEXTURE_2D, mTexture2D);
>+        GLColor texDataRed[1] = {GLColor::red};
>+        glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, 1, 1, 0, GL_RGBA, GL_UNSIGNED_BYTE, texDataRed);
>+        EXPECT_GL_NO_ERROR();
>+    }
>+};
>+
>+// Tests that setting anisotropic filtering doesn't cause failures at draw time.
>+TEST_P(TextureAnisotropyTest, AnisotropyFunctional)
>+{
>+    ANGLE_SKIP_TEST_IF(!IsGLExtensionEnabled("GL_EXT_texture_filter_anisotropic"));
>+
>+    setUpProgram();
>+
>+    uploadTexture();
>+
>+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
>+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
>+    glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAX_ANISOTROPY_EXT, 2.0f);
>+    EXPECT_GL_NO_ERROR();
>+
>+    drawQuad(mProgram, "position", 0.5f);
>+
>+    EXPECT_PIXEL_COLOR_EQ(getWindowWidth() / 2, getWindowHeight() / 2, GLColor::red);
>+    EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::red);
>+    EXPECT_PIXEL_COLOR_EQ(getWindowWidth() - 1, getWindowHeight() - 1, GLColor::red);
>+}
>+
>+// GL_OES_texture_border_clamp
>+class TextureBorderClampTest : public Texture2DTest
>+{
>+  protected:
>+    TextureBorderClampTest() : Texture2DTest() {}
>+
>+    const char *getVertexShaderSource() override
>+    {
>+        return
>+            R"(precision highp float;
>+            attribute vec4 position;
>+            varying vec2 texcoord;
>+
>+            void main()
>+            {
>+                gl_Position = vec4(position.xy, 0.0, 1.0);
>+                // texcoords in [-0.5, 1.5]
>+                texcoord = (position.xy) + 0.5;
>+            })";
>+    }
>+
>+    void uploadTexture()
>+    {
>+        glActiveTexture(GL_TEXTURE0);
>+        glBindTexture(GL_TEXTURE_2D, mTexture2D);
>+        std::vector<GLColor> texDataRed(1, GLColor::red);
>+        glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, 1, 1, 0, GL_RGBA, GL_UNSIGNED_BYTE,
>+                     texDataRed.data());
>+        EXPECT_GL_NO_ERROR();
>+    }
>+};
>+
>+// Test if the color set as GL_TEXTURE_BORDER_COLOR is used when sampling outside of the texture in
>+// GL_CLAMP_TO_BORDER wrap mode (set with glTexParameter).
>+TEST_P(TextureBorderClampTest, TextureBorderClampFunctional)
>+{
>+    ANGLE_SKIP_TEST_IF(!IsGLExtensionEnabled("GL_OES_texture_border_clamp"));
>+
>+    setUpProgram();
>+
>+    uploadTexture();
>+
>+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_BORDER);
>+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_BORDER);
>+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
>+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
>+    glTexParameterfv(GL_TEXTURE_2D, GL_TEXTURE_BORDER_COLOR, &kFloatGreen.R);
>+    EXPECT_GL_NO_ERROR();
>+
>+    drawQuad(mProgram, "position", 0.5f);
>+
>+    EXPECT_PIXEL_COLOR_EQ(getWindowWidth() / 2, getWindowHeight() / 2, GLColor::red);
>+    EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::green);
>+    EXPECT_PIXEL_COLOR_EQ(getWindowWidth() - 1, getWindowHeight() - 1, GLColor::green);
>+}
>+
>+// Test reading back GL_TEXTURE_BORDER_COLOR by glGetTexParameter.
>+TEST_P(TextureBorderClampTest, TextureBorderClampFunctional2)
>+{
>+    ANGLE_SKIP_TEST_IF(!IsGLExtensionEnabled("GL_OES_texture_border_clamp"));
>+
>+    glActiveTexture(GL_TEXTURE0);
>+    glBindTexture(GL_TEXTURE_2D, mTexture2D);
>+
>+    glTexParameterfv(GL_TEXTURE_2D, GL_TEXTURE_BORDER_COLOR, &kFloatGreen.R);
>+
>+    GLint colorFixedPoint[4] = {0};
>+    glGetTexParameteriv(GL_TEXTURE_2D, GL_TEXTURE_BORDER_COLOR, colorFixedPoint);
>+    constexpr GLint colorGreenFixedPoint[4] = {0, std::numeric_limits<GLint>::max(), 0,
>+                                               std::numeric_limits<GLint>::max()};
>+    EXPECT_EQ(colorFixedPoint[0], colorGreenFixedPoint[0]);
>+    EXPECT_EQ(colorFixedPoint[1], colorGreenFixedPoint[1]);
>+    EXPECT_EQ(colorFixedPoint[2], colorGreenFixedPoint[2]);
>+    EXPECT_EQ(colorFixedPoint[3], colorGreenFixedPoint[3]);
>+
>+    constexpr GLint colorBlueFixedPoint[4] = {0, 0, std::numeric_limits<GLint>::max(),
>+                                              std::numeric_limits<GLint>::max()};
>+    glTexParameteriv(GL_TEXTURE_2D, GL_TEXTURE_BORDER_COLOR, colorBlueFixedPoint);
>+
>+    GLfloat color[4] = {0.0f};
>+    glGetTexParameterfv(GL_TEXTURE_2D, GL_TEXTURE_BORDER_COLOR, color);
>+    EXPECT_EQ(color[0], kFloatBlue.R);
>+    EXPECT_EQ(color[1], kFloatBlue.G);
>+    EXPECT_EQ(color[2], kFloatBlue.B);
>+    EXPECT_EQ(color[3], kFloatBlue.A);
>+}
>+
>+// Test GL_TEXTURE_BORDER_COLOR parameter validation at glTexParameter.
>+TEST_P(TextureBorderClampTest, TextureBorderClampValidation)
>+{
>+    ANGLE_SKIP_TEST_IF(!IsGLExtensionEnabled("GL_OES_texture_border_clamp"));
>+
>+    glActiveTexture(GL_TEXTURE0);
>+    glBindTexture(GL_TEXTURE_2D, mTexture2D);
>+
>+    glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_BORDER_COLOR, 1.0f);
>+    EXPECT_GL_ERROR(GL_INVALID_ENUM);
>+
>+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_BORDER_COLOR, std::numeric_limits<GLint>::max());
>+    EXPECT_GL_ERROR(GL_INVALID_ENUM);
>+
>+    glTexParameterfv(GL_TEXTURE_2D_MULTISAMPLE, GL_TEXTURE_BORDER_COLOR, &kFloatGreen.R);
>+    EXPECT_GL_ERROR(GL_INVALID_ENUM);
>+
>+    GLint colorInt[4] = {0};
>+    glTexParameteriv(GL_TEXTURE_2D_MULTISAMPLE_ARRAY, GL_TEXTURE_BORDER_COLOR, colorInt);
>+    EXPECT_GL_ERROR(GL_INVALID_ENUM);
>+
>+    if (getClientMajorVersion() < 3)
>+    {
>+        glTexParameterIivOES(GL_TEXTURE_2D, GL_TEXTURE_BORDER_COLOR, colorInt);
>+        EXPECT_GL_ERROR(GL_INVALID_OPERATION);
>+        glGetTexParameterIivOES(GL_TEXTURE_2D, GL_TEXTURE_BORDER_COLOR, colorInt);
>+        EXPECT_GL_ERROR(GL_INVALID_OPERATION);
>+
>+        GLuint colorUInt[4] = {0};
>+        glTexParameterIuivOES(GL_TEXTURE_2D, GL_TEXTURE_BORDER_COLOR, colorUInt);
>+        EXPECT_GL_ERROR(GL_INVALID_OPERATION);
>+        glGetTexParameterIuivOES(GL_TEXTURE_2D, GL_TEXTURE_BORDER_COLOR, colorUInt);
>+        EXPECT_GL_ERROR(GL_INVALID_OPERATION);
>+
>+        GLSampler sampler;
>+        glSamplerParameterIivOES(sampler, GL_TEXTURE_BORDER_COLOR, colorInt);
>+        EXPECT_GL_ERROR(GL_INVALID_OPERATION);
>+        glGetSamplerParameterIivOES(sampler, GL_TEXTURE_BORDER_COLOR, colorInt);
>+        EXPECT_GL_ERROR(GL_INVALID_OPERATION);
>+
>+        glSamplerParameterIuivOES(sampler, GL_TEXTURE_BORDER_COLOR, colorUInt);
>+        EXPECT_GL_ERROR(GL_INVALID_OPERATION);
>+        glGetSamplerParameterIuivOES(sampler, GL_TEXTURE_BORDER_COLOR, colorUInt);
>+        EXPECT_GL_ERROR(GL_INVALID_OPERATION);
>+    }
>+}
>+
>+class TextureBorderClampTestES3 : public TextureBorderClampTest
>+{
>+  protected:
>+    TextureBorderClampTestES3() : TextureBorderClampTest() {}
>+};
>+
>+// Test if the color set as GL_TEXTURE_BORDER_COLOR is used when sampling outside of the texture in
>+// GL_CLAMP_TO_BORDER wrap mode (set with glSamplerParameter).
>+TEST_P(TextureBorderClampTestES3, TextureBorderClampES3Functional)
>+{
>+    ANGLE_SKIP_TEST_IF(!IsGLExtensionEnabled("GL_OES_texture_border_clamp"));
>+
>+    setUpProgram();
>+
>+    uploadTexture();
>+
>+    GLSampler sampler;
>+    glBindSampler(0, sampler);
>+    glSamplerParameteri(sampler, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_BORDER);
>+    glSamplerParameteri(sampler, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_BORDER);
>+    glSamplerParameteri(sampler, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
>+    glSamplerParameteri(sampler, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
>+    glSamplerParameterfv(sampler, GL_TEXTURE_BORDER_COLOR, &kFloatGreen.R);
>+    EXPECT_GL_NO_ERROR();
>+
>+    drawQuad(mProgram, "position", 0.5f);
>+
>+    EXPECT_PIXEL_COLOR_EQ(getWindowWidth() / 2, getWindowHeight() / 2, GLColor::red);
>+    EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::green);
>+    EXPECT_PIXEL_COLOR_EQ(getWindowWidth() - 1, getWindowHeight() - 1, GLColor::green);
>+}
>+
>+// Test reading back GL_TEXTURE_BORDER_COLOR by glGetSamplerParameter.
>+TEST_P(TextureBorderClampTestES3, TextureBorderClampES3Functional2)
>+{
>+    ANGLE_SKIP_TEST_IF(!IsGLExtensionEnabled("GL_OES_texture_border_clamp"));
>+
>+    glActiveTexture(GL_TEXTURE0);
>+
>+    GLSampler sampler;
>+    glBindSampler(0, sampler);
>+
>+    glSamplerParameterfv(sampler, GL_TEXTURE_BORDER_COLOR, &kFloatGreen.R);
>+
>+    GLint colorFixedPoint[4] = {0};
>+    glGetSamplerParameteriv(sampler, GL_TEXTURE_BORDER_COLOR, colorFixedPoint);
>+    constexpr GLint colorGreenFixedPoint[4] = {0, std::numeric_limits<GLint>::max(), 0,
>+                                               std::numeric_limits<GLint>::max()};
>+    EXPECT_EQ(colorFixedPoint[0], colorGreenFixedPoint[0]);
>+    EXPECT_EQ(colorFixedPoint[1], colorGreenFixedPoint[1]);
>+    EXPECT_EQ(colorFixedPoint[2], colorGreenFixedPoint[2]);
>+    EXPECT_EQ(colorFixedPoint[3], colorGreenFixedPoint[3]);
>+
>+    constexpr GLint colorBlueFixedPoint[4] = {0, 0, std::numeric_limits<GLint>::max(),
>+                                              std::numeric_limits<GLint>::max()};
>+    glSamplerParameteriv(sampler, GL_TEXTURE_BORDER_COLOR, colorBlueFixedPoint);
>+
>+    GLfloat color[4] = {0.0f};
>+    glGetSamplerParameterfv(sampler, GL_TEXTURE_BORDER_COLOR, color);
>+    EXPECT_EQ(color[0], kFloatBlue.R);
>+    EXPECT_EQ(color[1], kFloatBlue.G);
>+    EXPECT_EQ(color[2], kFloatBlue.B);
>+    EXPECT_EQ(color[3], kFloatBlue.A);
>+
>+    constexpr GLint colorSomewhatRedInt[4] = {500000, 0, 0, std::numeric_limits<GLint>::max()};
>+    glSamplerParameterIivOES(sampler, GL_TEXTURE_BORDER_COLOR, colorSomewhatRedInt);
>+    GLint colorInt[4] = {0};
>+    glGetSamplerParameterIivOES(sampler, GL_TEXTURE_BORDER_COLOR, colorInt);
>+    EXPECT_EQ(colorInt[0], colorSomewhatRedInt[0]);
>+    EXPECT_EQ(colorInt[1], colorSomewhatRedInt[1]);
>+    EXPECT_EQ(colorInt[2], colorSomewhatRedInt[2]);
>+    EXPECT_EQ(colorInt[3], colorSomewhatRedInt[3]);
>+
>+    constexpr GLuint colorSomewhatRedUInt[4] = {500000, 0, 0, std::numeric_limits<GLuint>::max()};
>+    glSamplerParameterIuivOES(sampler, GL_TEXTURE_BORDER_COLOR, colorSomewhatRedUInt);
>+    GLuint colorUInt[4] = {0};
>+    glGetSamplerParameterIuivOES(sampler, GL_TEXTURE_BORDER_COLOR, colorUInt);
>+    EXPECT_EQ(colorUInt[0], colorSomewhatRedUInt[0]);
>+    EXPECT_EQ(colorUInt[1], colorSomewhatRedUInt[1]);
>+    EXPECT_EQ(colorUInt[2], colorSomewhatRedUInt[2]);
>+    EXPECT_EQ(colorUInt[3], colorSomewhatRedUInt[3]);
>+
>+    glBindTexture(GL_TEXTURE_2D, mTexture2D);
>+
>+    constexpr GLint colorSomewhatGreenInt[4] = {0, 500000, 0, std::numeric_limits<GLint>::max()};
>+    glTexParameterIivOES(GL_TEXTURE_2D, GL_TEXTURE_BORDER_COLOR, colorSomewhatGreenInt);
>+    glGetTexParameterIivOES(GL_TEXTURE_2D, GL_TEXTURE_BORDER_COLOR, colorInt);
>+    EXPECT_EQ(colorInt[0], colorSomewhatGreenInt[0]);
>+    EXPECT_EQ(colorInt[1], colorSomewhatGreenInt[1]);
>+    EXPECT_EQ(colorInt[2], colorSomewhatGreenInt[2]);
>+    EXPECT_EQ(colorInt[3], colorSomewhatGreenInt[3]);
>+
>+    constexpr GLuint colorSomewhatGreenUInt[4] = {0, 500000, 0, std::numeric_limits<GLuint>::max()};
>+    glTexParameterIuivOES(GL_TEXTURE_2D, GL_TEXTURE_BORDER_COLOR, colorSomewhatGreenUInt);
>+    glGetTexParameterIuivOES(GL_TEXTURE_2D, GL_TEXTURE_BORDER_COLOR, colorUInt);
>+    EXPECT_EQ(colorUInt[0], colorSomewhatGreenUInt[0]);
>+    EXPECT_EQ(colorUInt[1], colorSomewhatGreenUInt[1]);
>+    EXPECT_EQ(colorUInt[2], colorSomewhatGreenUInt[2]);
>+    EXPECT_EQ(colorUInt[3], colorSomewhatGreenUInt[3]);
>+}
>+
>+// Test GL_TEXTURE_BORDER_COLOR parameter validation at glSamplerParameter.
>+TEST_P(TextureBorderClampTestES3, TextureBorderClampES3Validation)
>+{
>+    ANGLE_SKIP_TEST_IF(!IsGLExtensionEnabled("GL_OES_texture_border_clamp"));
>+
>+    glActiveTexture(GL_TEXTURE0);
>+
>+    GLSampler sampler;
>+    glBindSampler(0, sampler);
>+
>+    glSamplerParameterf(sampler, GL_TEXTURE_BORDER_COLOR, 1.0f);
>+    EXPECT_GL_ERROR(GL_INVALID_ENUM);
>+
>+    glSamplerParameteri(sampler, GL_TEXTURE_BORDER_COLOR, std::numeric_limits<GLint>::max());
>+    EXPECT_GL_ERROR(GL_INVALID_ENUM);
>+}
>+
>+class TextureBorderClampIntegerTestES3 : public Texture2DTest
>+{
>+  protected:
>+    TextureBorderClampIntegerTestES3() : Texture2DTest(), isUnsignedIntTest(false) {}
>+
>+    const char *getVertexShaderSource() override
>+    {
>+        return
>+            R"(#version 300 es
>+            out vec2 texcoord;
>+            in vec4 position;
>+
>+            void main()
>+            {
>+                gl_Position = vec4(position.xy, 0.0, 1.0);
>+                // texcoords in [-0.5, 1.5]
>+                texcoord = (position.xy) + 0.5;
>+            })";
>+    }
>+
>+    const char *getFragmentShaderSource() override
>+    {
>+        if (isUnsignedIntTest)
>+        {
>+            return "#version 300 es\n"
>+                   "precision highp float;\n"
>+                   "uniform highp usampler2D tex;\n"
>+                   "in vec2 texcoord;\n"
>+                   "out vec4 fragColor;\n"
>+
>+                   "void main()\n"
>+                   "{\n"
>+                   "vec4 red   = vec4(1.0, 0.0, 0.0, 1.0);\n"
>+                   "vec4 green = vec4(0.0, 1.0, 0.0, 1.0);\n"
>+                   "fragColor = (texture(tex, texcoord).r == 150u)"
>+                   "            ? green : red;\n"
>+                   "}\n";
>+        }
>+        else
>+        {
>+            return "#version 300 es\n"
>+                   "precision highp float;\n"
>+                   "uniform highp isampler2D tex;\n"
>+                   "in vec2 texcoord;\n"
>+                   "out vec4 fragColor;\n"
>+
>+                   "void main()\n"
>+                   "{\n"
>+                   "vec4 red   = vec4(1.0, 0.0, 0.0, 1.0);\n"
>+                   "vec4 green = vec4(0.0, 1.0, 0.0, 1.0);\n"
>+                   "fragColor = (texture(tex, texcoord).r == -50)"
>+                   "            ? green : red;\n"
>+                   "}\n";
>+        }
>+    }
>+
>+    void uploadTexture()
>+    {
>+        glActiveTexture(GL_TEXTURE0);
>+        glBindTexture(GL_TEXTURE_2D, mTexture2D);
>+        if (isUnsignedIntTest)
>+        {
>+            std::vector<GLubyte> texData(4, 100);
>+            glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA8UI, 1, 1, 0, GL_RGBA_INTEGER, GL_UNSIGNED_BYTE,
>+                         texData.data());
>+        }
>+        else
>+        {
>+            std::vector<GLbyte> texData(4, 100);
>+            glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA8I, 1, 1, 0, GL_RGBA_INTEGER, GL_BYTE,
>+                         texData.data());
>+        }
>+        EXPECT_GL_NO_ERROR();
>+    }
>+
>+    bool isUnsignedIntTest;
>+};
>+
>+// Test if the integer values set as GL_TEXTURE_BORDER_COLOR is used when sampling outside of the
>+// integer texture in GL_CLAMP_TO_BORDER wrap mode (set with glTexParameterIivOES).
>+TEST_P(TextureBorderClampIntegerTestES3, TextureBorderClampInteger)
>+{
>+    ANGLE_SKIP_TEST_IF(!IsGLExtensionEnabled("GL_OES_texture_border_clamp"));
>+
>+    setUpProgram();
>+
>+    uploadTexture();
>+
>+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_BORDER);
>+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_BORDER);
>+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
>+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
>+
>+    constexpr GLint borderColor[4] = {-50, -50, -50, -50};
>+    glTexParameterIivOES(GL_TEXTURE_2D, GL_TEXTURE_BORDER_COLOR, borderColor);
>+
>+    EXPECT_GL_NO_ERROR();
>+
>+    drawQuad(mProgram, "position", 0.5f);
>+
>+    EXPECT_PIXEL_COLOR_EQ(getWindowWidth() / 2, getWindowHeight() / 2, GLColor::red);
>+    EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::green);
>+    EXPECT_PIXEL_COLOR_EQ(getWindowWidth() - 1, getWindowHeight() - 1, GLColor::green);
>+}
>+
>+// Test if the integer values set as GL_TEXTURE_BORDER_COLOR is used when sampling outside of the
>+// integer texture in GL_CLAMP_TO_BORDER wrap mode (set with glTexParameterIivOES).
>+TEST_P(TextureBorderClampIntegerTestES3, TextureBorderClampInteger2)
>+{
>+    ANGLE_SKIP_TEST_IF(!IsGLExtensionEnabled("GL_OES_texture_border_clamp"));
>+
>+    setUpProgram();
>+
>+    uploadTexture();
>+
>+    GLSampler sampler;
>+    glBindSampler(0, sampler);
>+    glSamplerParameteri(sampler, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_BORDER);
>+    glSamplerParameteri(sampler, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_BORDER);
>+    glSamplerParameteri(sampler, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
>+    glSamplerParameteri(sampler, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
>+
>+    constexpr GLint borderColor[4] = {-50, -50, -50, -50};
>+    glSamplerParameterIivOES(sampler, GL_TEXTURE_BORDER_COLOR, borderColor);
>+
>+    EXPECT_GL_NO_ERROR();
>+
>+    drawQuad(mProgram, "position", 0.5f);
>+
>+    EXPECT_PIXEL_COLOR_EQ(getWindowWidth() / 2, getWindowHeight() / 2, GLColor::red);
>+    EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::green);
>+    EXPECT_PIXEL_COLOR_EQ(getWindowWidth() - 1, getWindowHeight() - 1, GLColor::green);
>+}
>+
>+// Test if the unsigned integer values set as GL_TEXTURE_BORDER_COLOR is used when sampling outside
>+// of the unsigned integer texture in GL_CLAMP_TO_BORDER wrap mode (set with glTexParameterIuivOES).
>+TEST_P(TextureBorderClampIntegerTestES3, TextureBorderClampIntegerUnsigned)
>+{
>+    ANGLE_SKIP_TEST_IF(!IsGLExtensionEnabled("GL_OES_texture_border_clamp"));
>+
>+    isUnsignedIntTest = true;
>+
>+    setUpProgram();
>+
>+    uploadTexture();
>+
>+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_BORDER);
>+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_BORDER);
>+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
>+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
>+
>+    constexpr GLuint borderColor[4] = {150, 150, 150, 150};
>+    glTexParameterIuivOES(GL_TEXTURE_2D, GL_TEXTURE_BORDER_COLOR, borderColor);
>+
>+    EXPECT_GL_NO_ERROR();
>+
>+    drawQuad(mProgram, "position", 0.5f);
>+
>+    EXPECT_PIXEL_COLOR_EQ(getWindowWidth() / 2, getWindowHeight() / 2, GLColor::red);
>+    EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::green);
>+    EXPECT_PIXEL_COLOR_EQ(getWindowWidth() - 1, getWindowHeight() - 1, GLColor::green);
>+}
>+
>+// Test if the unsigned integer values set as GL_TEXTURE_BORDER_COLOR is used when sampling outside
>+// of the unsigned integer texture in GL_CLAMP_TO_BORDER wrap mode (set with
>+// glSamplerParameterIuivOES).
>+TEST_P(TextureBorderClampIntegerTestES3, TextureBorderClampIntegerUnsigned2)
>+{
>+    ANGLE_SKIP_TEST_IF(!IsGLExtensionEnabled("GL_OES_texture_border_clamp"));
>+
>+    isUnsignedIntTest = true;
>+
>+    setUpProgram();
>+
>+    uploadTexture();
>+
>+    GLSampler sampler;
>+    glBindSampler(0, sampler);
>+    glSamplerParameteri(sampler, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_BORDER);
>+    glSamplerParameteri(sampler, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_BORDER);
>+    glSamplerParameteri(sampler, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
>+    glSamplerParameteri(sampler, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
>+
>+    constexpr GLuint borderColor[4] = {150, 150, 150, 150};
>+    glSamplerParameterIuivOES(sampler, GL_TEXTURE_BORDER_COLOR, borderColor);
>+
>+    EXPECT_GL_NO_ERROR();
>+
>+    drawQuad(mProgram, "position", 0.5f);
>+
>+    EXPECT_PIXEL_COLOR_EQ(getWindowWidth() / 2, getWindowHeight() / 2, GLColor::red);
>+    EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::green);
>+    EXPECT_PIXEL_COLOR_EQ(getWindowWidth() - 1, getWindowHeight() - 1, GLColor::green);
>+}
>+
>+// ~GL_OES_texture_border_clamp
>+
> class TextureLimitsTest : public ANGLETest
> {
>   protected:
>@@ -2905,7 +3358,18 @@ class TextureLimitsTest : public ANGLETest
>         setConfigAlphaBits(8);
>     }
> 
>-    ~TextureLimitsTest()
>+    void SetUp() override
>+    {
>+        ANGLETest::SetUp();
>+
>+        glGetIntegerv(GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS, &mMaxVertexTextures);
>+        glGetIntegerv(GL_MAX_TEXTURE_IMAGE_UNITS, &mMaxFragmentTextures);
>+        glGetIntegerv(GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS, &mMaxCombinedTextures);
>+
>+        ASSERT_GL_NO_ERROR();
>+    }
>+
>+    void TearDown() override
>     {
>         if (mProgram != 0)
>         {
>@@ -2917,17 +3381,8 @@ class TextureLimitsTest : public ANGLETest
>                 glDeleteTextures(static_cast<GLsizei>(mTextures.size()), &mTextures[0]);
>             }
>         }
>-    }
>-
>-    void SetUp() override
>-    {
>-        ANGLETest::SetUp();
> 
>-        glGetIntegerv(GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS, &mMaxVertexTextures);
>-        glGetIntegerv(GL_MAX_TEXTURE_IMAGE_UNITS, &mMaxFragmentTextures);
>-        glGetIntegerv(GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS, &mMaxCombinedTextures);
>-
>-        ASSERT_GL_NO_ERROR();
>+        ANGLETest::TearDown();
>     }
> 
>     void compileProgramWithTextureCounts(const std::string &vertexPrefix,
>@@ -2983,7 +3438,7 @@ class TextureLimitsTest : public ANGLETest
>         const std::string &vertexShaderSource   = vertexShaderStr.str();
>         const std::string &fragmentShaderSource = fragmentShaderStr.str();
> 
>-        mProgram = CompileProgram(vertexShaderSource, fragmentShaderSource);
>+        mProgram = CompileProgram(vertexShaderSource.c_str(), fragmentShaderSource.c_str());
>     }
> 
>     RGBA8 getPixel(GLint texIndex)
>@@ -3059,7 +3514,7 @@ class TextureLimitsTest : public ANGLETest
>             std::stringstream uniformNameStr;
>             uniformNameStr << vertexTexturePrefix << texIndex;
>             const std::string &uniformName = uniformNameStr.str();
>-            GLint location = glGetUniformLocation(mProgram, uniformName.c_str());
>+            GLint location                 = glGetUniformLocation(mProgram, uniformName.c_str());
>             ASSERT_NE(-1, location);
> 
>             glUniform1i(location, texIndex);
>@@ -3073,7 +3528,7 @@ class TextureLimitsTest : public ANGLETest
>             std::stringstream uniformNameStr;
>             uniformNameStr << fragmentTexturePrefix << texIndex;
>             const std::string &uniformName = uniformNameStr.str();
>-            GLint location = glGetUniformLocation(mProgram, uniformName.c_str());
>+            GLint location                 = glGetUniformLocation(mProgram, uniformName.c_str());
>             ASSERT_NE(-1, location);
> 
>             glUniform1i(location, texIndex + vertexTextureCount);
>@@ -3099,13 +3554,6 @@ class TextureLimitsTest : public ANGLETest
> // Test rendering with the maximum vertex texture units.
> TEST_P(TextureLimitsTest, MaxVertexTextures)
> {
>-    // TODO(jmadill): Figure out why this fails on Intel.
>-    if (IsIntel() && GetParam().getRenderer() == EGL_PLATFORM_ANGLE_TYPE_OPENGL_ANGLE)
>-    {
>-        std::cout << "Test skipped on Intel." << std::endl;
>-        return;
>-    }
>-
>     compileProgramWithTextureCounts("tex", mMaxVertexTextures, mMaxVertexTextures, "tex", 0, 0);
>     ASSERT_NE(0u, mProgram);
>     ASSERT_GL_NO_ERROR();
>@@ -3116,13 +3564,6 @@ TEST_P(TextureLimitsTest, MaxVertexTextures)
> // Test rendering with the maximum fragment texture units.
> TEST_P(TextureLimitsTest, MaxFragmentTextures)
> {
>-    // TODO(jmadill): Figure out why this fails on Intel.
>-    if (IsIntel() && GetParam().getRenderer() == EGL_PLATFORM_ANGLE_TYPE_OPENGL_ANGLE)
>-    {
>-        std::cout << "Test skipped on Intel." << std::endl;
>-        return;
>-    }
>-
>     compileProgramWithTextureCounts("tex", 0, 0, "tex", mMaxFragmentTextures, mMaxFragmentTextures);
>     ASSERT_NE(0u, mProgram);
>     ASSERT_GL_NO_ERROR();
>@@ -3133,13 +3574,6 @@ TEST_P(TextureLimitsTest, MaxFragmentTextures)
> // Test rendering with maximum combined texture units.
> TEST_P(TextureLimitsTest, MaxCombinedTextures)
> {
>-    // TODO(jmadill): Investigate workaround.
>-    if (IsIntel() && GetParam() == ES2_OPENGL())
>-    {
>-        std::cout << "Test skipped on Intel." << std::endl;
>-        return;
>-    }
>-
>     GLint vertexTextures = mMaxVertexTextures;
> 
>     if (vertexTextures + mMaxFragmentTextures > mMaxCombinedTextures)
>@@ -3174,13 +3608,6 @@ TEST_P(TextureLimitsTest, ExcessiveFragmentTextures)
> // Test active vertex textures under the limit, but excessive textures specified.
> TEST_P(TextureLimitsTest, MaxActiveVertexTextures)
> {
>-    // TODO(jmadill): Figure out why this fails on Intel.
>-    if (IsIntel() && GetParam().getRenderer() == EGL_PLATFORM_ANGLE_TYPE_OPENGL_ANGLE)
>-    {
>-        std::cout << "Test skipped on Intel." << std::endl;
>-        return;
>-    }
>-
>     compileProgramWithTextureCounts("tex", mMaxVertexTextures + 4, mMaxVertexTextures, "tex", 0, 0);
>     ASSERT_NE(0u, mProgram);
>     ASSERT_GL_NO_ERROR();
>@@ -3191,13 +3618,6 @@ TEST_P(TextureLimitsTest, MaxActiveVertexTextures)
> // Test active fragment textures under the limit, but excessive textures specified.
> TEST_P(TextureLimitsTest, MaxActiveFragmentTextures)
> {
>-    // TODO(jmadill): Figure out why this fails on Intel.
>-    if (IsIntel() && GetParam().getRenderer() == EGL_PLATFORM_ANGLE_TYPE_OPENGL_ANGLE)
>-    {
>-        std::cout << "Test skipped on Intel." << std::endl;
>-        return;
>-    }
>-
>     compileProgramWithTextureCounts("tex", 0, 0, "tex", mMaxFragmentTextures + 4,
>                                     mMaxFragmentTextures);
>     ASSERT_NE(0u, mProgram);
>@@ -3210,7 +3630,7 @@ TEST_P(TextureLimitsTest, MaxActiveFragmentTextures)
> // GLES 2.0.25 section 2.10.4 page 39.
> TEST_P(TextureLimitsTest, TextureTypeConflict)
> {
>-    const std::string &vertexShader =
>+    constexpr char kVS[] =
>         "attribute vec2 position;\n"
>         "varying float color;\n"
>         "uniform sampler2D tex2D;\n"
>@@ -3221,13 +3641,13 @@ TEST_P(TextureLimitsTest, TextureTypeConflict)
>         "  color = texture2D(tex2D, texCoord).x;\n"
>         "  color += textureCube(texCube, vec3(texCoord, 0)).x;\n"
>         "}";
>-    const std::string &fragmentShader =
>+    constexpr char kFS[] =
>         "varying mediump float color;\n"
>         "void main() {\n"
>         "  gl_FragColor = vec4(color, 0, 0, 1);\n"
>         "}";
> 
>-    mProgram = CompileProgram(vertexShader, fragmentShader);
>+    mProgram = CompileProgram(kVS, kFS);
>     ASSERT_NE(0u, mProgram);
> 
>     initTextures(1, 0);
>@@ -3304,9 +3724,9 @@ class Texture2DNorm16TestES3 : public Texture2DTestES3
> 
>         GLubyte expectedValue = (type == GL_SHORT) ? 0xFF : static_cast<GLubyte>(pixelValue >> 8);
> 
>-        EXPECT_PIXEL_COLOR_EQ(
>-            0, 0, SliceFormatColor(
>-                      format, GLColor(expectedValue, expectedValue, expectedValue, expectedValue)));
>+        EXPECT_PIXEL_COLOR_EQ(0, 0,
>+                              SliceFormatColor(format, GLColor(expectedValue, expectedValue,
>+                                                               expectedValue, expectedValue)));
> 
>         glBindFramebuffer(GL_FRAMEBUFFER, 0);
> 
>@@ -3315,7 +3735,7 @@ class Texture2DNorm16TestES3 : public Texture2DTestES3
> 
>     void testNorm16Render(GLint internalformat, GLenum format, GLenum type)
>     {
>-        GLushort pixelValue = 0x6A35;
>+        GLushort pixelValue  = 0x6A35;
>         GLushort imageData[] = {pixelValue, pixelValue, pixelValue, pixelValue};
> 
>         setUpProgram();
>@@ -3335,9 +3755,9 @@ class Texture2DNorm16TestES3 : public Texture2DTestES3
>         drawQuad(mProgram, "position", 0.5f);
> 
>         GLubyte expectedValue = static_cast<GLubyte>(pixelValue >> 8);
>-        EXPECT_PIXEL_COLOR_EQ(
>-            0, 0, SliceFormatColor(
>-                      format, GLColor(expectedValue, expectedValue, expectedValue, expectedValue)));
>+        EXPECT_PIXEL_COLOR_EQ(0, 0,
>+                              SliceFormatColor(format, GLColor(expectedValue, expectedValue,
>+                                                               expectedValue, expectedValue)));
> 
>         glBindRenderbuffer(GL_RENDERBUFFER, mRenderbuffer);
>         glRenderbufferStorage(GL_RENDERBUFFER, internalformat, 1, 1);
>@@ -3366,11 +3786,7 @@ class Texture2DNorm16TestES3 : public Texture2DTestES3
> // Test texture formats enabled by the GL_EXT_texture_norm16 extension.
> TEST_P(Texture2DNorm16TestES3, TextureNorm16Test)
> {
>-    if (!extensionEnabled("GL_EXT_texture_norm16"))
>-    {
>-        std::cout << "Test skipped due to missing GL_EXT_texture_norm16." << std::endl;
>-        return;
>-    }
>+    ANGLE_SKIP_TEST_IF(!IsGLExtensionEnabled("GL_EXT_texture_norm16"));
> 
>     testNorm16Texture(GL_R16_EXT, GL_RED, GL_UNSIGNED_SHORT);
>     testNorm16Texture(GL_RG16_EXT, GL_RG, GL_UNSIGNED_SHORT);
>@@ -3390,17 +3806,8 @@ TEST_P(Texture2DNorm16TestES3, TextureNorm16Test)
> // GLES 3.0.4 section 3.8.3.
> TEST_P(Texture2DTestES3, UnpackSkipImages2D)
> {
>-    if (IsIntel() && IsDesktopOpenGL())
>-    {
>-        std::cout << "Test skipped on Intel OpenGL." << std::endl;
>-        return;
>-    }
>-    // TODO(ynovikov): re-enable once root cause of http://anglebug.com/1429 is fixed
>-    if (IsAndroid() && IsAdreno() && IsOpenGLES())
>-    {
>-        std::cout << "Test skipped on Adreno OpenGLES on Android." << std::endl;
>-        return;
>-    }
>+    // Crashes on Nexus 5X due to a driver bug. http://anglebug.com/1429
>+    ANGLE_SKIP_TEST_IF((IsNexus5X() || IsNexus6P()) && IsOpenGLES());
> 
>     glBindTexture(GL_TEXTURE_2D, mTexture2D);
>     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
>@@ -3464,17 +3871,10 @@ TEST_P(Texture2DTestES3, UnpackSkipPixelsOutOfBounds)
> // Test that unpacking rows that overlap in a pixel unpack buffer works as expected.
> TEST_P(Texture2DTestES3, UnpackOverlappingRowsFromUnpackBuffer)
> {
>-    if (IsD3D11())
>-    {
>-        std::cout << "Test skipped on D3D." << std::endl;
>-        return;
>-    }
>-    if (IsOSX() && IsAMD())
>-    {
>-        // Incorrect rendering results seen on OSX AMD.
>-        std::cout << "Test skipped on OSX AMD." << std::endl;
>-        return;
>-    }
>+    ANGLE_SKIP_TEST_IF(IsD3D11());
>+
>+    // Incorrect rendering results seen on OSX AMD.
>+    ANGLE_SKIP_TEST_IF(IsOSX() && IsAMD());
> 
>     const GLuint width            = 8u;
>     const GLuint height           = 8u;
>@@ -3533,12 +3933,11 @@ TEST_P(Texture2DTestES3, DepthTexturesWithMipmaps)
> {
>     // TODO(cwallez) this is failing on Intel Win7 OpenGL.
>     // TODO(zmo) this is faling on Win Intel HD 530 Debug.
>-    // http://anglebugs.com/1706
>-    if (IsIntel() && IsWindows())
>-    {
>-        std::cout << "Test skipped on Win Intel." << std::endl;
>-        return;
>-    }
>+    // http://anglebug.com/1706
>+    ANGLE_SKIP_TEST_IF(IsIntel() && IsWindows() && IsOpenGL());
>+
>+    // Seems to fail on AMD D3D11. Possibly driver bug. http://anglebug.com/3342
>+    ANGLE_SKIP_TEST_IF(IsAMD() && IsWindows() && IsD3D11());
> 
>     const int size = getWindowWidth();
> 
>@@ -3589,9 +3988,6 @@ TEST_P(Texture2DTestES3, DepthTexturesWithMipmaps)
> // Tests unpacking into the unsized GL_ALPHA format.
> TEST_P(Texture2DTestES3, UnsizedAlphaUnpackBuffer)
> {
>-    // TODO(jmadill): Figure out why this fails on OSX.
>-    ANGLE_SKIP_TEST_IF(IsOSX());
>-
>     // Initialize the texure.
>     glBindTexture(GL_TEXTURE_2D, mTexture2D);
>     glTexImage2D(GL_TEXTURE_2D, 0, GL_ALPHA, getWindowWidth(), getWindowHeight(), 0, GL_ALPHA,
>@@ -3792,7 +4188,7 @@ TEST_P(Texture2DTestES3, SingleTextureMultipleSamplers)
>     EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::blue);
> 
>     // Simple multitexturing program.
>-    const std::string vs =
>+    constexpr char kVS[] =
>         "#version 300 es\n"
>         "in vec2 position;\n"
>         "out vec2 texCoord;\n"
>@@ -3801,7 +4197,8 @@ TEST_P(Texture2DTestES3, SingleTextureMultipleSamplers)
>         "    gl_Position = vec4(position, 0, 1);\n"
>         "    texCoord = position * 0.5 + vec2(0.5);\n"
>         "}";
>-    const std::string fs =
>+
>+    constexpr char kFS[] =
>         "#version 300 es\n"
>         "precision mediump float;\n"
>         "in vec2 texCoord;\n"
>@@ -3816,7 +4213,7 @@ TEST_P(Texture2DTestES3, SingleTextureMultipleSamplers)
>         "          +  texture(tex3, texCoord) + texture(tex4, texCoord)) * 0.25;\n"
>         "}";
> 
>-    ANGLE_GL_PROGRAM(program, vs, fs);
>+    ANGLE_GL_PROGRAM(program, kVS, kFS);
> 
>     std::array<GLint, 4> texLocations = {
>         {glGetUniformLocation(program, "tex1"), glGetUniformLocation(program, "tex2"),
>@@ -3894,13 +4291,10 @@ TEST_P(Texture2DTestES3, SingleTextureMultipleSamplers)
> // samples the cubemap using a direction vector (1,1,1).
> TEST_P(TextureCubeTestES3, SpecifyAndSampleFromBaseLevel1)
> {
>-    if (IsOSX())
>-    {
>-        // Check http://anglebug.com/2155.
>-        std::cout << "Test skipped on OSX." << std::endl;
>-        return;
>-    }
>-    const std::string vs =
>+    // Check http://anglebug.com/2155.
>+    ANGLE_SKIP_TEST_IF(IsOSX() && IsNVIDIA());
>+
>+    constexpr char kVS[] =
>         R"(#version 300 es
>         precision mediump float;
>         in vec3 pos;
>@@ -3908,7 +4302,7 @@ TEST_P(TextureCubeTestES3, SpecifyAndSampleFromBaseLevel1)
>             gl_Position = vec4(pos, 1.0);
>         })";
> 
>-    const std::string fs =
>+    constexpr char kFS[] =
>         R"(#version 300 es
>         precision mediump float;
>         out vec4 color;
>@@ -3916,7 +4310,8 @@ TEST_P(TextureCubeTestES3, SpecifyAndSampleFromBaseLevel1)
>         void main(){
>             color = texture(uTex, vec3(1.0));
>         })";
>-    ANGLE_GL_PROGRAM(program, vs, fs);
>+
>+    ANGLE_GL_PROGRAM(program, kVS, kFS);
>     glUseProgram(program);
> 
>     glUniform1i(glGetUniformLocation(program, "uTex"), 0);
>@@ -3953,45 +4348,143 @@ TEST_P(TextureCubeTestES3, SpecifyAndSampleFromBaseLevel1)
>     EXPECT_PIXEL_COLOR_EQ(0, 0, angle::GLColor::white);
> }
> 
>-// Use this to select which configurations (e.g. which renderer, which GLES major version) these tests should be run against.
>-// TODO(oetuaho): Enable all below tests on OpenGL. Requires a fix for ANGLE bug 1278.
>+// Verify that using negative texture base level and max level generates GL_INVALID_VALUE.
>+TEST_P(Texture2DTestES3, NegativeTextureBaseLevelAndMaxLevel)
>+{
>+    GLuint texture = create2DTexture();
>+
>+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_BASE_LEVEL, -1);
>+    EXPECT_GL_ERROR(GL_INVALID_VALUE);
>+
>+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAX_LEVEL, -1);
>+    EXPECT_GL_ERROR(GL_INVALID_VALUE);
>+
>+    glDeleteTextures(1, &texture);
>+    EXPECT_GL_NO_ERROR();
>+}
>+
>+// Test setting base level after calling generateMipmap on a LUMA texture.
>+// Covers http://anglebug.com/2498
>+TEST_P(Texture2DTestES3, GenerateMipmapAndBaseLevelLUMA)
>+{
>+    glActiveTexture(GL_TEXTURE0);
>+    glBindTexture(GL_TEXTURE_2D, mTexture2D);
>+
>+    constexpr const GLsizei kWidth  = 8;
>+    constexpr const GLsizei kHeight = 8;
>+    std::array<GLubyte, kWidth * kHeight * 2> whiteData;
>+    whiteData.fill(255u);
>+
>+    glTexImage2D(GL_TEXTURE_2D, 0, GL_LUMINANCE_ALPHA, kWidth, kHeight, 0, GL_LUMINANCE_ALPHA,
>+                 GL_UNSIGNED_BYTE, whiteData.data());
>+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_NEAREST);
>+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
>+    glGenerateMipmap(GL_TEXTURE_2D);
>+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_BASE_LEVEL, 1);
>+    EXPECT_GL_NO_ERROR();
>+
>+    drawQuad(mProgram, "position", 0.5f);
>+    EXPECT_PIXEL_COLOR_EQ(0, 0, angle::GLColor::white);
>+}
>+
>+// Covers a bug in the D3D11 backend: http://anglebug.com/2772
>+// When using a sampler the texture was created as if it has mipmaps,
>+// regardless what you specified in GL_TEXTURE_MIN_FILTER via
>+// glSamplerParameteri() -- mistakenly the default value
>+// GL_NEAREST_MIPMAP_LINEAR or the value set via glTexParameteri() was
>+// evaluated.
>+// If you didn't provide mipmaps and didn't let the driver generate them
>+// this led to not sampling your texture data when minification occurred.
>+TEST_P(Texture2DTestES3, MinificationWithSamplerNoMipmapping)
>+{
>+    constexpr char kVS[] =
>+        "#version 300 es\n"
>+        "out vec2 texcoord;\n"
>+        "in vec4 position;\n"
>+        "void main()\n"
>+        "{\n"
>+        "    gl_Position = vec4(position.xy * 0.1, 0.0, 1.0);\n"
>+        "    texcoord = (position.xy * 0.5) + 0.5;\n"
>+        "}\n";
>+
>+    constexpr char kFS[] =
>+        "#version 300 es\n"
>+        "precision highp float;\n"
>+        "uniform highp sampler2D tex;\n"
>+        "in vec2 texcoord;\n"
>+        "out vec4 fragColor;\n"
>+        "void main()\n"
>+        "{\n"
>+        "    fragColor = texture(tex, texcoord);\n"
>+        "}\n";
>+
>+    ANGLE_GL_PROGRAM(program, kVS, kFS);
>+
>+    GLSampler sampler;
>+    glBindSampler(0, sampler);
>+    glSamplerParameteri(sampler, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
>+    glSamplerParameteri(sampler, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
>+
>+    glActiveTexture(GL_TEXTURE0);
>+    glBindTexture(GL_TEXTURE_2D, mTexture2D);
>+
>+    const GLsizei texWidth  = getWindowWidth();
>+    const GLsizei texHeight = getWindowHeight();
>+    const std::vector<GLColor> whiteData(texWidth * texHeight, GLColor::white);
>+
>+    glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, texWidth, texHeight, 0, GL_RGBA, GL_UNSIGNED_BYTE,
>+                 whiteData.data());
>+    EXPECT_GL_NO_ERROR();
>+
>+    drawQuad(program, "position", 0.5f);
>+    EXPECT_PIXEL_COLOR_EQ(getWindowWidth() / 2, getWindowHeight() / 2, angle::GLColor::white);
>+}
>+
>+// Use this to select which configurations (e.g. which renderer, which GLES major version) these
>+// tests should be run against.
> ANGLE_INSTANTIATE_TEST(Texture2DTest,
>                        ES2_D3D9(),
>                        ES2_D3D11(),
>                        ES2_D3D11_FL9_3(),
>                        ES2_OPENGL(),
>-                       ES2_OPENGLES());
>+                       ES2_OPENGLES(),
>+                       ES2_VULKAN());
> ANGLE_INSTANTIATE_TEST(TextureCubeTest,
>                        ES2_D3D9(),
>                        ES2_D3D11(),
>                        ES2_D3D11_FL10_0(),
>                        ES2_D3D11_FL9_3(),
>                        ES2_OPENGL(),
>-                       ES2_OPENGLES());
>+                       ES2_OPENGLES(),
>+                       ES2_VULKAN());
> ANGLE_INSTANTIATE_TEST(Texture2DTestWithDrawScale,
>                        ES2_D3D9(),
>                        ES2_D3D11(),
>                        ES2_D3D11_FL9_3(),
>                        ES2_OPENGL(),
>-                       ES2_OPENGLES());
>+                       ES2_OPENGLES(),
>+                       ES2_VULKAN());
> ANGLE_INSTANTIATE_TEST(Sampler2DAsFunctionParameterTest,
>                        ES2_D3D9(),
>                        ES2_D3D11(),
>                        ES2_D3D11_FL9_3(),
>                        ES2_OPENGL(),
>-                       ES2_OPENGLES());
>+                       ES2_OPENGLES(),
>+                       ES2_VULKAN());
> ANGLE_INSTANTIATE_TEST(SamplerArrayTest,
>                        ES2_D3D9(),
>                        ES2_D3D11(),
>                        ES2_D3D11_FL9_3(),
>                        ES2_OPENGL(),
>-                       ES2_OPENGLES());
>+                       ES2_OPENGLES(),
>+                       ES2_VULKAN());
> ANGLE_INSTANTIATE_TEST(SamplerArrayAsFunctionParameterTest,
>                        ES2_D3D9(),
>                        ES2_D3D11(),
>                        ES2_D3D11_FL9_3(),
>                        ES2_OPENGL(),
>-                       ES2_OPENGLES());
>+                       ES2_OPENGLES(),
>+                       ES2_VULKAN());
> ANGLE_INSTANTIATE_TEST(Texture2DTestES3, ES3_D3D11(), ES3_OPENGL(), ES3_OPENGLES());
> ANGLE_INSTANTIATE_TEST(Texture3DTestES3, ES3_D3D11(), ES3_OPENGL(), ES3_OPENGLES());
> ANGLE_INSTANTIATE_TEST(Texture2DIntegerAlpha1TestES3, ES3_D3D11(), ES3_OPENGL(), ES3_OPENGLES());
>@@ -4011,32 +4504,51 @@ ANGLE_INSTANTIATE_TEST(SamplerInStructTest,
>                        ES2_D3D11_FL9_3(),
>                        ES2_D3D9(),
>                        ES2_OPENGL(),
>-                       ES2_OPENGLES());
>+                       ES2_OPENGLES(),
>+                       ES2_VULKAN());
> ANGLE_INSTANTIATE_TEST(SamplerInStructAsFunctionParameterTest,
>                        ES2_D3D11(),
>                        ES2_D3D11_FL9_3(),
>                        ES2_D3D9(),
>                        ES2_OPENGL(),
>-                       ES2_OPENGLES());
>+                       ES2_OPENGLES(),
>+                       ES2_VULKAN());
> ANGLE_INSTANTIATE_TEST(SamplerInStructArrayAsFunctionParameterTest,
>                        ES2_D3D11(),
>                        ES2_D3D11_FL9_3(),
>                        ES2_D3D9(),
>                        ES2_OPENGL(),
>-                       ES2_OPENGLES());
>+                       ES2_OPENGLES(),
>+                       ES2_VULKAN());
> ANGLE_INSTANTIATE_TEST(SamplerInNestedStructAsFunctionParameterTest,
>                        ES2_D3D11(),
>                        ES2_D3D11_FL9_3(),
>                        ES2_D3D9(),
>                        ES2_OPENGL(),
>-                       ES2_OPENGLES());
>+                       ES2_OPENGLES(),
>+                       ES2_VULKAN());
> ANGLE_INSTANTIATE_TEST(SamplerInStructAndOtherVariableTest,
>                        ES2_D3D11(),
>                        ES2_D3D11_FL9_3(),
>                        ES2_D3D9(),
>                        ES2_OPENGL(),
>-                       ES2_OPENGLES());
>-ANGLE_INSTANTIATE_TEST(TextureLimitsTest, ES2_D3D11(), ES2_OPENGL(), ES2_OPENGLES());
>+                       ES2_OPENGLES(),
>+                       ES2_VULKAN());
>+ANGLE_INSTANTIATE_TEST(TextureAnisotropyTest,
>+                       ES2_D3D11(),
>+                       ES2_D3D9(),
>+                       ES2_OPENGL(),
>+                       ES2_OPENGLES(),
>+                       ES2_VULKAN());
>+ANGLE_INSTANTIATE_TEST(TextureBorderClampTest,
>+                       ES2_D3D11(),
>+                       ES2_D3D9(),
>+                       ES2_OPENGL(),
>+                       ES2_OPENGLES(),
>+                       ES2_VULKAN());
>+ANGLE_INSTANTIATE_TEST(TextureBorderClampTestES3, ES3_D3D11(), ES3_OPENGL(), ES3_OPENGLES());
>+ANGLE_INSTANTIATE_TEST(TextureBorderClampIntegerTestES3, ES3_D3D11(), ES3_OPENGL(), ES3_OPENGLES());
>+ANGLE_INSTANTIATE_TEST(TextureLimitsTest, ES2_D3D11(), ES2_OPENGL(), ES2_OPENGLES(), ES2_VULKAN());
> ANGLE_INSTANTIATE_TEST(Texture2DNorm16TestES3, ES3_D3D11(), ES3_OPENGL(), ES3_OPENGLES());
> ANGLE_INSTANTIATE_TEST(TextureCubeTestES3, ES3_D3D11(), ES3_OPENGL(), ES3_OPENGLES());
> 
>diff --git a/Source/ThirdParty/ANGLE/src/tests/gl_tests/TextureUploadFormatTest.cpp b/Source/ThirdParty/ANGLE/src/tests/gl_tests/TextureUploadFormatTest.cpp
>index f5e4f69b373..8a003e5fc16 100644
>--- a/Source/ThirdParty/ANGLE/src/tests/gl_tests/TextureUploadFormatTest.cpp
>+++ b/Source/ThirdParty/ANGLE/src/tests/gl_tests/TextureUploadFormatTest.cpp
>@@ -17,8 +17,7 @@ namespace
> {
> 
> class TextureUploadFormatTest : public ANGLETest
>-{
>-};
>+{};
> 
> struct TexFormat final
> {
>@@ -163,46 +162,90 @@ struct SizedFloat
>         const auto sVal = static_cast<uint32_t>(v < 0.0f);
>         return Assemble(sVal, eVal, mVal);
>     }
>+
>+    static constexpr float Decode(const uint32_t sVal, const uint32_t eVal, const uint32_t mVal)
>+    {
>+        constexpr int eBias = (1 << (kEBits - 1)) - 1;
>+        constexpr int mDiv  = 1 << kMBits;
>+        float ret           = powf(-1.0f, static_cast<float>(sVal)) *
>+                    powf(2.0f, static_cast<float>(int(eVal) - eBias)) * (1.0f + float(mVal) / mDiv);
>+        return ret;
>+    }
> };
> using Float16  = SizedFloat<1, 5, 10>;
> using UFloat11 = SizedFloat<0, 5, 6>;
> using UFloat10 = SizedFloat<0, 5, 5>;
> 
>-uint32_t EncodeRGB9_E5_Rev(const float signedR, const float signedG, const float signedB)
>+struct RGB9_E5 final
> {
>-    const float r       = std::max(0.0f, signedR);
>-    const float g       = std::max(0.0f, signedG);
>-    const float b       = std::max(0.0f, signedB);
>-    const int eBits     = 5;
>-    const int eBias     = (1 << (eBits - 1)) - 1;  // 15
>-    const int eMax      = (1 << eBits) - 1;
>-    const int mBits     = 9;
>-    const uint32_t mMax = (1 << mBits) - 1;
>-    // Maximize mVal for one channel
>-    // => Find the lowest viable exponent
>-    int minViableActualExp                    = 1 << eBits;
>-    const auto fnMinimizeViableActualExponent = [&](const float v) {
>-        const auto cur = static_cast<int>(ceil(log2f(v / mMax)));
>-        if (cur < minViableActualExp)
>-        {
>-            minViableActualExp = cur;
>-        }
>-    };
>-    fnMinimizeViableActualExponent(r);
>-    fnMinimizeViableActualExponent(g);
>-    fnMinimizeViableActualExponent(b);
>-    const int eVal = std::max(0, std::min(minViableActualExp + eBias + mBits, eMax));
>-
>-    const auto fnM = [&](const float v) {
>-        const auto m = static_cast<uint32_t>(v * powf(2, static_cast<float>(mBits + eBias - eVal)));
>-        return std::min(m, mMax);
>-    };
>+    // GLES 3.0.5 p129
>+    static constexpr int N = 9;   // number of mantissa bits per component
>+    static constexpr int B = 15;  // exponent bias
> 
>-    const auto mR = fnM(r);
>-    const auto mG = fnM(g);
>-    const auto mB = fnM(b);
>-    return (mR << 0) | (mG << 9) | (mB << 18) | (eVal << 27);
>-}
>+    static uint32_t Encode(const float red, const float green, const float blue)
>+    {
>+        const auto floori = [](const float x) { return static_cast<int>(floor(x)); };
>+        // GLES 3.0.5 p129
>+        constexpr int eMax = 31;  // max allowed biased exponent value
>+
>+        const float twoToN       = powf(2.0f, static_cast<float>(N));
>+        const float sharedExpMax = (twoToN - 1.0f) / twoToN * powf(2.0f, eMax - B);
>+
>+        const auto fnClampColor = [&](const float color) {
>+            return std::max(0.0f, std::min(color, sharedExpMax));
>+        };
>+        const float redC   = fnClampColor(red);
>+        const float greenC = fnClampColor(green);
>+        const float blueC  = fnClampColor(blue);
>+
>+        const float maxC = std::max({redC, greenC, blueC});
>+        const int expP   = std::max(-B - 1, floori(log2f(maxC))) + 1 + B;
>+
>+        const auto fnColorS = [&](const float colorC, const float exp) {
>+            return floori(colorC / powf(2, exp - B - N) + 0.5f);
>+        };
>+        const int maxS = fnColorS(maxC, static_cast<float>(expP));
>+        const int expS = expP + ((maxS == (1 << N)) ? 1 : 0);
>+
>+        const int redS   = fnColorS(redC, static_cast<float>(expS));
>+        const int greenS = fnColorS(greenC, static_cast<float>(expS));
>+        const int blueS  = fnColorS(blueC, static_cast<float>(expS));
>+
>+        // Pack as u32 EGBR.
>+        uint32_t ret = expS & 0x1f;
>+        ret <<= 9;
>+        ret |= blueS & 0x1ff;
>+        ret <<= 9;
>+        ret |= greenS & 0x1ff;
>+        ret <<= 9;
>+        ret |= redS & 0x1ff;
>+        return ret;
>+    }
>+
>+    static void Decode(uint32_t packed,
>+                       float *const out_red,
>+                       float *const out_green,
>+                       float *const out_blue)
>+    {
>+        const auto redS = packed & 0x1ff;
>+        packed >>= 9;
>+        const auto greenS = packed & 0x1ff;
>+        packed >>= 9;
>+        const auto blueS = packed & 0x1ff;
>+        packed >>= 9;
>+        const auto expS = packed & 0x1f;
>+
>+        // These are *not* IEEE-like UFloat14s.
>+        // GLES 3.0.5 p165:
>+        // red = redS*pow(2,expS-B-N)
>+        const auto fnToFloat = [&](const uint32_t x) {
>+            return x * powf(2.0f, static_cast<float>(int(expS) - B - N));
>+        };
>+        *out_red   = fnToFloat(redS);
>+        *out_green = fnToFloat(greenS);
>+        *out_blue  = fnToFloat(blueS);
>+    }
>+};
> 
> }  // anonymous namespace
> 
>@@ -212,6 +255,9 @@ uint32_t EncodeRGB9_E5_Rev(const float signedR, const float signedG, const float
> // re-encode by hand.
> TEST(TextureUploadFormatTestInternals, Float16Encoding)
> {
>+    EXPECT_EQ(Float16::Decode(0, 0x0f, 0), 1.0f);
>+    EXPECT_EQ(Float16::Decode(0, 0x0f - 1, 0), 0.5f);
>+
>     EXPECT_EQ(Float16::Assemble(0, 0x0f, 0), Float16::Encode(1.0));
>     EXPECT_EQ(Float16::Assemble(0, 0x0f - 1, 0), Float16::Encode(1.0 / 2));
> 
>@@ -221,6 +267,20 @@ TEST(TextureUploadFormatTestInternals, Float16Encoding)
>     EXPECT_EQ(Float16::Assemble(0, 0x0f - 1, 1 << (Float16::kMBits - 2)), Float16::Encode(5.0 / 8));
> }
> 
>+// Ensure our RGB9_E5 encoding is reasonable, at least for our testcase.
>+TEST(TextureUploadFormatTestInternals, RGB9E5Encoding)
>+{
>+    const auto fnTest = [](const float refR, const float refG, const float refB) {
>+        const auto packed = RGB9_E5::Encode(refR, refG, refB);
>+        float testR, testG, testB;
>+        RGB9_E5::Decode(packed, &testR, &testG, &testB);
>+        EXPECT_EQ(testR, refR);
>+        EXPECT_EQ(testG, refG);
>+        EXPECT_EQ(testB, refB);
>+    };
>+    fnTest(0.125f, 0.250f, 0.625f);
>+}
>+
> namespace
> {
> 
>@@ -247,13 +307,12 @@ TEST_P(TextureUploadFormatTest, All)
> {
>     ANGLE_SKIP_TEST_IF(IsD3D9() || IsD3D11_FL93());
> 
>-    constexpr char kVertShader[] = R"(
>+    constexpr char kVertShaderES2[]     = R"(
>         void main()
>         {
>             gl_PointSize = 1.0;
>             gl_Position = vec4(0, 0, 0, 1);
>         })";
>-
>     constexpr char kFragShader_Floats[] = R"(
>         precision mediump float;
>         uniform sampler2D uTex;
>@@ -262,26 +321,7 @@ TEST_P(TextureUploadFormatTest, All)
>         {
>             gl_FragColor = texture2D(uTex, vec2(0,0));
>         })";
>-    constexpr char kFragShader_Ints[]   = R"(
>-        precision mediump float;
>-        uniform sampler2D uTex;
>-
>-        void main()
>-        {
>-            gl_FragColor = texture2D(uTex, vec2(0,0)) / 8.0;
>-        })";
>-    ANGLE_GL_PROGRAM(floatsProg, kVertShader, kFragShader_Floats);
>-    ANGLE_GL_PROGRAM(intsProg, kVertShader, kFragShader_Ints);
>-
>-    GLint uTex = glGetUniformLocation(floatsProg, "uTex");
>-    ASSERT_NE(uTex, -1);
>-    glUseProgram(floatsProg);
>-    glUniform1i(uTex, 0);
>-
>-    uTex = glGetUniformLocation(intsProg, "uTex");
>-    ASSERT_NE(uTex, -1);
>-    glUseProgram(intsProg);
>-    glUniform1i(uTex, 0);
>+    ANGLE_GL_PROGRAM(floatsProg, kVertShaderES2, kFragShader_Floats);
> 
>     glDisable(GL_DITHER);
> 
>@@ -306,6 +346,9 @@ TEST_P(TextureUploadFormatTest, All)
> 
>     GLTexture testTex;
>     glBindTexture(GL_TEXTURE_2D, testTex);
>+    // Must be nearest because some texture formats aren't filterable!
>+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
>+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
> 
>     ASSERT_GL_NO_ERROR();
> 
>@@ -330,7 +373,7 @@ TEST_P(TextureUploadFormatTest, All)
>         glTexImage2D(GL_TEXTURE_2D, 0, format.internalFormat, 1, 1, 0, format.unpackFormat,
>                      format.unpackType, data);
>         const auto uploadErr = glGetError();
>-        if (uploadErr)
>+        if (uploadErr)  // Format might not be supported. (e.g. on ES2)
>             return;
> 
>         glClearColor(1, 0, 1, 1);
>@@ -533,6 +576,36 @@ TEST_P(TextureUploadFormatTest, All)
>         fnTest({GL_DEPTH24_STENCIL8, GL_DEPTH_STENCIL, GL_UNSIGNED_INT_24_8}, {1, 0, 0, 0});
>     }
> 
>+    if (getClientMajorVersion() < 3)
>+        return;
>+
>+    constexpr char kVertShaderES3[]    = R"(#version 300 es
>+        void main()
>+        {
>+            gl_PointSize = 1.0;
>+            gl_Position = vec4(0, 0, 0, 1);
>+        })";
>+    constexpr char kFragShader_Ints[]  = R"(#version 300 es
>+        precision mediump float;
>+        uniform highp isampler2D uTex;
>+        out vec4 oFragColor;
>+
>+        void main()
>+        {
>+            oFragColor = vec4(texture(uTex, vec2(0,0))) / 8.0;
>+        })";
>+    constexpr char kFragShader_Uints[] = R"(#version 300 es
>+        precision mediump float;
>+        uniform highp usampler2D uTex;
>+        out vec4 oFragColor;
>+
>+        void main()
>+        {
>+            oFragColor = vec4(texture(uTex, vec2(0,0))) / 8.0;
>+        })";
>+    ANGLE_GL_PROGRAM(intsProg, kVertShaderES3, kFragShader_Ints);
>+    ANGLE_GL_PROGRAM(uintsProg, kVertShaderES3, kFragShader_Uints);
>+
>     // Non-normalized ints
>     glUseProgram(intsProg);
> 
>@@ -541,11 +614,6 @@ TEST_P(TextureUploadFormatTest, All)
>         constexpr uint8_t src[4] = {srcIntVals[0], srcIntVals[1], srcIntVals[2], srcIntVals[3]};
>         ZeroAndCopy(srcBuffer, src);
> 
>-        fnTest({GL_RGBA8UI, GL_RGBA_INTEGER, GL_UNSIGNED_BYTE}, {1, 1, 1, 1});
>-        fnTest({GL_RGB8UI, GL_RGB_INTEGER, GL_UNSIGNED_BYTE}, {1, 1, 1, 1});
>-        fnTest({GL_RG8UI, GL_RG_INTEGER, GL_UNSIGNED_BYTE}, {1, 1, 1, 1});
>-        fnTest({GL_R8UI, GL_RED_INTEGER, GL_UNSIGNED_BYTE}, {1, 1, 1, 1});
>-
>         fnTest({GL_RGBA8I, GL_RGBA_INTEGER, GL_BYTE}, {1, 1, 1, 1});
>         fnTest({GL_RGB8I, GL_RGB_INTEGER, GL_BYTE}, {1, 1, 1, 1});
>         fnTest({GL_RG8I, GL_RG_INTEGER, GL_BYTE}, {1, 1, 1, 1});
>@@ -557,11 +625,6 @@ TEST_P(TextureUploadFormatTest, All)
>         constexpr uint16_t src[4] = {srcIntVals[0], srcIntVals[1], srcIntVals[2], srcIntVals[3]};
>         ZeroAndCopy(srcBuffer, src);
> 
>-        fnTest({GL_RGBA16UI, GL_RGBA_INTEGER, GL_UNSIGNED_SHORT}, {1, 1, 1, 1});
>-        fnTest({GL_RGB16UI, GL_RGB_INTEGER, GL_UNSIGNED_SHORT}, {1, 1, 1, 1});
>-        fnTest({GL_RG16UI, GL_RG_INTEGER, GL_UNSIGNED_SHORT}, {1, 1, 1, 1});
>-        fnTest({GL_R16UI, GL_RED_INTEGER, GL_UNSIGNED_SHORT}, {1, 1, 1, 1});
>-
>         fnTest({GL_RGBA16I, GL_RGBA_INTEGER, GL_SHORT}, {1, 1, 1, 1});
>         fnTest({GL_RGB16I, GL_RGB_INTEGER, GL_SHORT}, {1, 1, 1, 1});
>         fnTest({GL_RG16I, GL_RG_INTEGER, GL_SHORT}, {1, 1, 1, 1});
>@@ -573,17 +636,48 @@ TEST_P(TextureUploadFormatTest, All)
>         constexpr uint32_t src[4] = {srcIntVals[0], srcIntVals[1], srcIntVals[2], srcIntVals[3]};
>         ZeroAndCopy(srcBuffer, src);
> 
>-        fnTest({GL_RGBA32UI, GL_RGBA_INTEGER, GL_UNSIGNED_INT}, {1, 1, 1, 1});
>-        fnTest({GL_RGB32UI, GL_RGB_INTEGER, GL_UNSIGNED_INT}, {1, 1, 1, 1});
>-        fnTest({GL_RG32UI, GL_RG_INTEGER, GL_UNSIGNED_INT}, {1, 1, 1, 1});
>-        fnTest({GL_R32UI, GL_RED_INTEGER, GL_UNSIGNED_INT}, {1, 1, 1, 1});
>-
>         fnTest({GL_RGBA32I, GL_RGBA_INTEGER, GL_INT}, {1, 1, 1, 1});
>         fnTest({GL_RGB32I, GL_RGB_INTEGER, GL_INT}, {1, 1, 1, 1});
>         fnTest({GL_RG32I, GL_RG_INTEGER, GL_INT}, {1, 1, 1, 1});
>         fnTest({GL_R32I, GL_RED_INTEGER, GL_INT}, {1, 1, 1, 1});
>     }
> 
>+    // Non-normalized uints
>+    glUseProgram(uintsProg);
>+
>+    // RGBA_INTEGER+UNSIGNED_BYTE
>+    {
>+        constexpr uint8_t src[4] = {srcIntVals[0], srcIntVals[1], srcIntVals[2], srcIntVals[3]};
>+        ZeroAndCopy(srcBuffer, src);
>+
>+        fnTest({GL_RGBA8UI, GL_RGBA_INTEGER, GL_UNSIGNED_BYTE}, {1, 1, 1, 1});
>+        fnTest({GL_RGB8UI, GL_RGB_INTEGER, GL_UNSIGNED_BYTE}, {1, 1, 1, 1});
>+        fnTest({GL_RG8UI, GL_RG_INTEGER, GL_UNSIGNED_BYTE}, {1, 1, 1, 1});
>+        fnTest({GL_R8UI, GL_RED_INTEGER, GL_UNSIGNED_BYTE}, {1, 1, 1, 1});
>+    }
>+
>+    // RGBA_INTEGER+UNSIGNED_SHORT
>+    {
>+        constexpr uint16_t src[4] = {srcIntVals[0], srcIntVals[1], srcIntVals[2], srcIntVals[3]};
>+        ZeroAndCopy(srcBuffer, src);
>+
>+        fnTest({GL_RGBA16UI, GL_RGBA_INTEGER, GL_UNSIGNED_SHORT}, {1, 1, 1, 1});
>+        fnTest({GL_RGB16UI, GL_RGB_INTEGER, GL_UNSIGNED_SHORT}, {1, 1, 1, 1});
>+        fnTest({GL_RG16UI, GL_RG_INTEGER, GL_UNSIGNED_SHORT}, {1, 1, 1, 1});
>+        fnTest({GL_R16UI, GL_RED_INTEGER, GL_UNSIGNED_SHORT}, {1, 1, 1, 1});
>+    }
>+
>+    // RGBA_INTEGER+UNSIGNED_INT
>+    {
>+        constexpr uint32_t src[4] = {srcIntVals[0], srcIntVals[1], srcIntVals[2], srcIntVals[3]};
>+        ZeroAndCopy(srcBuffer, src);
>+
>+        fnTest({GL_RGBA32UI, GL_RGBA_INTEGER, GL_UNSIGNED_INT}, {1, 1, 1, 1});
>+        fnTest({GL_RGB32UI, GL_RGB_INTEGER, GL_UNSIGNED_INT}, {1, 1, 1, 1});
>+        fnTest({GL_RG32UI, GL_RG_INTEGER, GL_UNSIGNED_INT}, {1, 1, 1, 1});
>+        fnTest({GL_R32UI, GL_RED_INTEGER, GL_UNSIGNED_INT}, {1, 1, 1, 1});
>+    }
>+
>     // RGBA_INTEGER+UNSIGNED_INT_2_10_10_10_REV
>     {
>         constexpr uint32_t src[] = {static_cast<uint32_t>(srcIntVals[0] << 0) |
>@@ -654,7 +748,7 @@ TEST_P(TextureUploadFormatTest, All)
> 
>     // UNSIGNED_INT_5_9_9_9_REV
>     {
>-        const uint32_t src[] = {EncodeRGB9_E5_Rev(srcVals[0], srcVals[1], srcVals[2])};
>+        const uint32_t src[] = {RGB9_E5::Encode(srcVals[0], srcVals[1], srcVals[2])};
>         ZeroAndCopy(srcBuffer, src);
> 
>         fnTest({GL_RGB9_E5, GL_RGB, GL_UNSIGNED_INT_5_9_9_9_REV}, {1, 1, 1, 0});
>@@ -675,8 +769,11 @@ TEST_P(TextureUploadFormatTest, All)
> }
> 
> ANGLE_INSTANTIATE_TEST(TextureUploadFormatTest,
>-                       ES2_D3D11(),
>+                       ES3_D3D11(),
>                        ES2_D3D11_FL9_3(),
>                        ES2_D3D9(),
>                        ES2_OPENGL(),
>-                       ES2_OPENGLES());
>+                       ES3_OPENGL(),
>+                       ES2_OPENGLES(),
>+                       ES3_OPENGLES(),
>+                       ES2_VULKAN());
>diff --git a/Source/ThirdParty/ANGLE/src/tests/gl_tests/TimerQueriesTest.cpp b/Source/ThirdParty/ANGLE/src/tests/gl_tests/TimerQueriesTest.cpp
>index 32500531f35..1f399fc8749 100644
>--- a/Source/ThirdParty/ANGLE/src/tests/gl_tests/TimerQueriesTest.cpp
>+++ b/Source/ThirdParty/ANGLE/src/tests/gl_tests/TimerQueriesTest.cpp
>@@ -7,9 +7,10 @@
> //   Various tests for EXT_disjoint_timer_query functionality and validation
> //
> 
>-#include "system_utils.h"
> #include "test_utils/ANGLETest.h"
>-#include "random_utils.h"
>+#include "util/EGLWindow.h"
>+#include "util/random_utils.h"
>+#include "util/system_utils.h"
> 
> using namespace angle;
> 
>@@ -31,26 +32,14 @@ class TimerQueriesTest : public ANGLETest
>     {
>         ANGLETest::SetUp();
> 
>-        const std::string passthroughVS =
>-            "attribute highp vec4 position; void main(void)\n"
>-            "{\n"
>-            "    gl_Position = position;\n"
>-            "}\n";
>-
>-        const std::string passthroughPS =
>-            "precision highp float; void main(void)\n"
>-            "{\n"
>-            "    gl_FragColor = vec4(1.0, 1.0, 1.0, 1.0);\n"
>-            "}\n";
>-
>-        const std::string costlyVS =
>+        constexpr char kCostlyVS[] =
>             "attribute highp vec4 position; varying highp vec4 testPos; void main(void)\n"
>             "{\n"
>             "    testPos     = position;\n"
>             "    gl_Position = position;\n"
>             "}\n";
> 
>-        const std::string costlyPS =
>+        constexpr char kCostlyFS[] =
>             "precision highp float; varying highp vec4 testPos; void main(void)\n"
>             "{\n"
>             "    vec4 test = testPos;\n"
>@@ -61,10 +50,10 @@ class TimerQueriesTest : public ANGLETest
>             "    gl_FragColor = test;\n"
>             "}\n";
> 
>-        mProgram = CompileProgram(passthroughVS, passthroughPS);
>+        mProgram = CompileProgram(essl1_shaders::vs::Simple(), essl1_shaders::fs::Red());
>         ASSERT_NE(0u, mProgram) << "shader compilation failed.";
> 
>-        mProgramCostly = CompileProgram(costlyVS, costlyPS);
>+        mProgramCostly = CompileProgram(kCostlyVS, kCostlyFS);
>         ASSERT_NE(0u, mProgramCostly) << "shader compilation failed.";
>     }
> 
>@@ -82,12 +71,7 @@ class TimerQueriesTest : public ANGLETest
> // Test that all proc addresses are loadable
> TEST_P(TimerQueriesTest, ProcAddresses)
> {
>-    if (!extensionEnabled("GL_EXT_disjoint_timer_query"))
>-    {
>-        std::cout << "Test skipped because GL_EXT_disjoint_timer_query is not available."
>-                  << std::endl;
>-        return;
>-    }
>+    ANGLE_SKIP_TEST_IF(!IsGLExtensionEnabled("GL_EXT_disjoint_timer_query"));
> 
>     ASSERT_NE(nullptr, eglGetProcAddress("glGenQueriesEXT"));
>     ASSERT_NE(nullptr, eglGetProcAddress("glDeleteQueriesEXT"));
>@@ -105,12 +89,7 @@ TEST_P(TimerQueriesTest, ProcAddresses)
> // Tests the time elapsed query
> TEST_P(TimerQueriesTest, TimeElapsed)
> {
>-    if (!extensionEnabled("GL_EXT_disjoint_timer_query"))
>-    {
>-        std::cout << "Test skipped because GL_EXT_disjoint_timer_query is not available."
>-                  << std::endl;
>-        return;
>-    }
>+    ANGLE_SKIP_TEST_IF(!IsGLExtensionEnabled("GL_EXT_disjoint_timer_query"));
> 
>     GLint queryTimeElapsedBits = 0;
>     glGetQueryivEXT(GL_TIME_ELAPSED_EXT, GL_QUERY_COUNTER_BITS_EXT, &queryTimeElapsedBits);
>@@ -119,11 +98,7 @@ TEST_P(TimerQueriesTest, TimeElapsed)
>     std::cout << "Time elapsed counter bits: " << queryTimeElapsedBits << std::endl;
> 
>     // Skip test if the number of bits is 0
>-    if (queryTimeElapsedBits == 0)
>-    {
>-        std::cout << "Test skipped because of 0 counter bits" << std::endl;
>-        return;
>-    }
>+    ANGLE_SKIP_TEST_IF(!queryTimeElapsedBits);
> 
>     glDepthMask(GL_TRUE);
>     glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT);
>@@ -135,7 +110,7 @@ TEST_P(TimerQueriesTest, TimeElapsed)
> 
>     // Test time elapsed for a single quad
>     glBeginQueryEXT(GL_TIME_ELAPSED_EXT, query1);
>-    drawQuad(mProgram, "position", 0.8f);
>+    drawQuad(mProgram, essl1_shaders::PositionAttrib(), 0.8f);
>     glEndQueryEXT(GL_TIME_ELAPSED_EXT);
>     ASSERT_GL_NO_ERROR();
> 
>@@ -183,6 +158,12 @@ TEST_P(TimerQueriesTest, TimeElapsed)
>     EXPECT_LT(0ul, result1);
>     EXPECT_LT(0ul, result2);
> 
>+    // The time elapsed should be less than a second.  Not an actual
>+    // requirement, but longer than a second to draw something basic hints at
>+    // an issue with the queries themselves.
>+    EXPECT_LT(result1, 1000000000ul);
>+    EXPECT_LT(result2, 1000000000ul);
>+
>     // TODO(geofflang): Re-enable this check when it is non-flaky
>     // The costly quad should take longer than the cheap quad
>     // EXPECT_LT(result1, result2);
>@@ -192,18 +173,9 @@ TEST_P(TimerQueriesTest, TimeElapsed)
> TEST_P(TimerQueriesTest, TimeElapsedTextureTest)
> {
>     // OSX drivers don't seem to properly time non-draw calls so we skip the test on Mac
>-    if (IsOSX())
>-    {
>-        std::cout << "Test skipped on OSX" << std::endl;
>-        return;
>-    }
>+    ANGLE_SKIP_TEST_IF(IsOSX());
> 
>-    if (!extensionEnabled("GL_EXT_disjoint_timer_query"))
>-    {
>-        std::cout << "Test skipped because GL_EXT_disjoint_timer_query is not available."
>-                  << std::endl;
>-        return;
>-    }
>+    ANGLE_SKIP_TEST_IF(!IsGLExtensionEnabled("GL_EXT_disjoint_timer_query"));
> 
>     GLint queryTimeElapsedBits = 0;
>     glGetQueryivEXT(GL_TIME_ELAPSED_EXT, GL_QUERY_COUNTER_BITS_EXT, &queryTimeElapsedBits);
>@@ -212,13 +184,9 @@ TEST_P(TimerQueriesTest, TimeElapsedTextureTest)
>     std::cout << "Time elapsed counter bits: " << queryTimeElapsedBits << std::endl;
> 
>     // Skip test if the number of bits is 0
>-    if (queryTimeElapsedBits == 0)
>-    {
>-        std::cout << "Test skipped because of 0 counter bits" << std::endl;
>-        return;
>-    }
>+    ANGLE_SKIP_TEST_IF(!queryTimeElapsedBits);
> 
>-    GLubyte pixels[] = {0, 0, 0, 255, 255, 255, 255, 255, 255, 0, 0, 0};
>+    std::vector<GLColor> texData{GLColor::black, GLColor::white, GLColor::white, GLColor::black};
> 
>     // Query and texture initialization
>     GLuint texture;
>@@ -230,7 +198,7 @@ TEST_P(TimerQueriesTest, TimeElapsedTextureTest)
>     glBeginQueryEXT(GL_TIME_ELAPSED_EXT, query);
>     glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT);
>     glBindTexture(GL_TEXTURE_2D, texture);
>-    glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB, 2, 2, 0, GL_RGB, GL_UNSIGNED_BYTE, pixels);
>+    glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB, 2, 2, 0, GL_RGB, GL_UNSIGNED_BYTE, texData.data());
>     glGenerateMipmap(GL_TEXTURE_2D);
>     glFinish();
>     glEndQueryEXT(GL_TIME_ELAPSED_EXT);
>@@ -255,17 +223,15 @@ TEST_P(TimerQueriesTest, TimeElapsedTextureTest)
> 
>     std::cout << "Elapsed time: " << result << std::endl;
>     EXPECT_LT(0ul, result);
>+
>+    // an issue with the queries themselves.
>+    EXPECT_LT(result, 1000000000ul);
> }
> 
> // Tests validation of query functions with respect to elapsed time query
> TEST_P(TimerQueriesTest, TimeElapsedValidationTest)
> {
>-    if (!extensionEnabled("GL_EXT_disjoint_timer_query"))
>-    {
>-        std::cout << "Test skipped because GL_EXT_disjoint_timer_query is not available."
>-                  << std::endl;
>-        return;
>-    }
>+    ANGLE_SKIP_TEST_IF(!IsGLExtensionEnabled("GL_EXT_disjoint_timer_query"));
> 
>     GLint queryTimeElapsedBits = 0;
>     glGetQueryivEXT(GL_TIME_ELAPSED_EXT, GL_QUERY_COUNTER_BITS_EXT, &queryTimeElapsedBits);
>@@ -274,11 +240,7 @@ TEST_P(TimerQueriesTest, TimeElapsedValidationTest)
>     std::cout << "Time elapsed counter bits: " << queryTimeElapsedBits << std::endl;
> 
>     // Skip test if the number of bits is 0
>-    if (queryTimeElapsedBits == 0)
>-    {
>-        std::cout << "Test skipped because of 0 counter bits" << std::endl;
>-        return;
>-    }
>+    ANGLE_SKIP_TEST_IF(!queryTimeElapsedBits);
> 
>     GLuint query = 0;
>     glGenQueriesEXT(-1, &query);
>@@ -312,20 +274,15 @@ TEST_P(TimerQueriesTest, TimeElapsedValidationTest)
> // Tests timer queries operating under multiple EGL contexts with mid-query switching
> TEST_P(TimerQueriesTest, TimeElapsedMulticontextTest)
> {
>-    if (IsAMD() && IsOpenGL())
>-    {
>-        // TODO(jmadill): Figure out why this test is flaky on AMD/OpenGL.
>-        // http://anglebug.com/1541
>-        std::cout << "Test skipped on AMD OpenGL." << std::endl;
>-        return;
>-    }
>+    // TODO(jmadill): Figure out why this test is flaky on AMD/OpenGL.
>+    // http://anglebug.com/1541
>+    ANGLE_SKIP_TEST_IF(IsAMD() && IsOpenGL());
> 
>-    if (!extensionEnabled("GL_EXT_disjoint_timer_query"))
>-    {
>-        std::cout << "Test skipped because GL_EXT_disjoint_timer_query is not available."
>-                  << std::endl;
>-        return;
>-    }
>+    ANGLE_SKIP_TEST_IF(!IsGLExtensionEnabled("GL_EXT_disjoint_timer_query"));
>+
>+    // Test skipped because the Vulkan backend doesn't account for (and remove) time spent in other
>+    // contexts.
>+    ANGLE_SKIP_TEST_IF(IsVulkan());
> 
>     GLint queryTimeElapsedBits = 0;
>     glGetQueryivEXT(GL_TIME_ELAPSED_EXT, GL_QUERY_COUNTER_BITS_EXT, &queryTimeElapsedBits);
>@@ -334,11 +291,7 @@ TEST_P(TimerQueriesTest, TimeElapsedMulticontextTest)
>     std::cout << "Time elapsed counter bits: " << queryTimeElapsedBits << std::endl;
> 
>     // Skip test if the number of bits is 0
>-    if (queryTimeElapsedBits == 0)
>-    {
>-        std::cout << "Test skipped because of 0 counter bits" << std::endl;
>-        return;
>-    }
>+    ANGLE_SKIP_TEST_IF(!queryTimeElapsedBits);
> 
>     // Without a glClear, the first draw call on GL takes a huge amount of time when run after the
>     // D3D test on certain NVIDIA drivers
>@@ -378,27 +331,14 @@ TEST_P(TimerQueriesTest, TimeElapsedMulticontextTest)
>     };
>     ContextInfo contexts[2];
> 
>-    // Shaders
>-    const std::string cheapVS =
>-        "attribute highp vec4 position; void main(void)\n"
>-        "{\n"
>-        "    gl_Position = position;\n"
>-        "}\n";
>-
>-    const std::string cheapPS =
>-        "precision highp float; void main(void)\n"
>-        "{\n"
>-        "    gl_FragColor = vec4(1.0, 1.0, 1.0, 1.0);\n"
>-        "}\n";
>-
>-    const std::string costlyVS =
>+    constexpr char kCostlyVS[] =
>         "attribute highp vec4 position; varying highp vec4 testPos; void main(void)\n"
>         "{\n"
>         "    testPos     = position;\n"
>         "    gl_Position = position;\n"
>         "}\n";
> 
>-    const std::string costlyPS =
>+    constexpr char kCostlyFS[] =
>         "precision highp float; varying highp vec4 testPos; void main(void)\n"
>         "{\n"
>         "    vec4 test = testPos;\n"
>@@ -414,7 +354,7 @@ TEST_P(TimerQueriesTest, TimeElapsedMulticontextTest)
>     contexts[0].display = display;
>     ASSERT_NE(contexts[0].context, EGL_NO_CONTEXT);
>     eglMakeCurrent(display, surface, surface, contexts[0].context);
>-    contexts[0].program = CompileProgram(cheapVS, cheapPS);
>+    contexts[0].program = CompileProgram(essl1_shaders::vs::Simple(), essl1_shaders::fs::Red());
>     glGenQueriesEXT(1, &contexts[0].query);
>     ASSERT_GL_NO_ERROR();
> 
>@@ -423,14 +363,14 @@ TEST_P(TimerQueriesTest, TimeElapsedMulticontextTest)
>     contexts[1].display = display;
>     ASSERT_NE(contexts[1].context, EGL_NO_CONTEXT);
>     eglMakeCurrent(display, surface, surface, contexts[1].context);
>-    contexts[1].program = CompileProgram(costlyVS, costlyPS);
>+    contexts[1].program = CompileProgram(kCostlyVS, kCostlyFS);
>     glGenQueriesEXT(1, &contexts[1].query);
>     ASSERT_GL_NO_ERROR();
> 
>     // Start the query and draw a quad on the first context without ending the query
>     eglMakeCurrent(display, surface, surface, contexts[0].context);
>     glBeginQueryEXT(GL_TIME_ELAPSED_EXT, contexts[0].query);
>-    drawQuad(contexts[0].program, "position", 0.8f);
>+    drawQuad(contexts[0].program, essl1_shaders::PositionAttrib(), 0.8f);
>     ASSERT_GL_NO_ERROR();
> 
>     // Switch contexts, draw the expensive quad and end its query
>@@ -467,18 +407,15 @@ TEST_P(TimerQueriesTest, TimeElapsedMulticontextTest)
>     std::cout << "Elapsed time: " << result2 << " costly quad" << std::endl;
>     EXPECT_LT(0ul, result1);
>     EXPECT_LT(0ul, result2);
>+    EXPECT_LT(result1, 1000000000ul);
>+    EXPECT_LT(result2, 1000000000ul);
>     EXPECT_LT(result1, result2);
> }
> 
> // Tests GPU timestamp functionality
> TEST_P(TimerQueriesTest, Timestamp)
> {
>-    if (!extensionEnabled("GL_EXT_disjoint_timer_query"))
>-    {
>-        std::cout << "Test skipped because GL_EXT_disjoint_timer_query is not available."
>-                  << std::endl;
>-        return;
>-    }
>+    ANGLE_SKIP_TEST_IF(!IsGLExtensionEnabled("GL_EXT_disjoint_timer_query"));
> 
>     GLint queryTimestampBits = 0;
>     glGetQueryivEXT(GL_TIMESTAMP_EXT, GL_QUERY_COUNTER_BITS_EXT, &queryTimestampBits);
>@@ -487,11 +424,7 @@ TEST_P(TimerQueriesTest, Timestamp)
>     std::cout << "Timestamp counter bits: " << queryTimestampBits << std::endl;
> 
>     // Macs for some reason return 0 bits so skip the test for now if either are 0
>-    if (queryTimestampBits == 0)
>-    {
>-        std::cout << "Test skipped because of 0 counter bits" << std::endl;
>-        return;
>-    }
>+    ANGLE_SKIP_TEST_IF(!queryTimestampBits);
> 
>     glDepthMask(GL_TRUE);
>     glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT);
>@@ -501,7 +434,7 @@ TEST_P(TimerQueriesTest, Timestamp)
>     glGenQueriesEXT(1, &query1);
>     glGenQueriesEXT(1, &query2);
>     glQueryCounterEXT(query1, GL_TIMESTAMP_EXT);
>-    drawQuad(mProgram, "position", 0.8f);
>+    drawQuad(mProgram, essl1_shaders::PositionAttrib(), 0.8f);
>     glQueryCounterEXT(query2, GL_TIMESTAMP_EXT);
> 
>     ASSERT_GL_NO_ERROR();
>@@ -542,18 +475,12 @@ TEST_P(TimerQueriesTest, Timestamp)
> }
> 
> class TimerQueriesTestES3 : public TimerQueriesTest
>-{
>-};
>+{};
> 
> // Tests getting timestamps via glGetInteger64v
> TEST_P(TimerQueriesTestES3, TimestampGetInteger64)
> {
>-    if (!extensionEnabled("GL_EXT_disjoint_timer_query"))
>-    {
>-        std::cout << "Test skipped because GL_EXT_disjoint_timer_query is not available."
>-                  << std::endl;
>-        return;
>-    }
>+    ANGLE_SKIP_TEST_IF(!IsGLExtensionEnabled("GL_EXT_disjoint_timer_query"));
> 
>     GLint queryTimestampBits = 0;
>     glGetQueryivEXT(GL_TIMESTAMP_EXT, GL_QUERY_COUNTER_BITS_EXT, &queryTimestampBits);
>@@ -561,11 +488,7 @@ TEST_P(TimerQueriesTestES3, TimestampGetInteger64)
> 
>     std::cout << "Timestamp counter bits: " << queryTimestampBits << std::endl;
> 
>-    if (queryTimestampBits == 0)
>-    {
>-        std::cout << "Test skipped because of 0 counter bits" << std::endl;
>-        return;
>-    }
>+    ANGLE_SKIP_TEST_IF(!queryTimestampBits);
> 
>     glDepthMask(GL_TRUE);
>     glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT);
>@@ -573,7 +496,7 @@ TEST_P(TimerQueriesTestES3, TimestampGetInteger64)
>     GLint64 result1 = 0;
>     GLint64 result2 = 0;
>     glGetInteger64v(GL_TIMESTAMP_EXT, &result1);
>-    drawQuad(mProgram, "position", 0.8f);
>+    drawQuad(mProgram, essl1_shaders::PositionAttrib(), 0.8f);
>     glGetInteger64v(GL_TIMESTAMP_EXT, &result2);
>     ASSERT_GL_NO_ERROR();
>     std::cout << "Timestamps (getInteger64v): " << result1 << " " << result2 << std::endl;
>@@ -587,6 +510,7 @@ ANGLE_INSTANTIATE_TEST(TimerQueriesTest,
>                        ES2_D3D11(),
>                        ES3_D3D11(),
>                        ES2_OPENGL(),
>-                       ES3_OPENGL());
>+                       ES3_OPENGL(),
>+                       ES2_VULKAN());
> 
> ANGLE_INSTANTIATE_TEST(TimerQueriesTestES3, ES3_D3D11(), ES3_OPENGL());
>diff --git a/Source/ThirdParty/ANGLE/src/tests/gl_tests/TransformFeedbackTest.cpp b/Source/ThirdParty/ANGLE/src/tests/gl_tests/TransformFeedbackTest.cpp
>index 60485d35f03..1ba3719b55c 100644
>--- a/Source/ThirdParty/ANGLE/src/tests/gl_tests/TransformFeedbackTest.cpp
>+++ b/Source/ThirdParty/ANGLE/src/tests/gl_tests/TransformFeedbackTest.cpp
>@@ -4,9 +4,11 @@
> // found in the LICENSE file.
> //
> 
>-#include "random_utils.h"
> #include "test_utils/ANGLETest.h"
> #include "test_utils/gl_raii.h"
>+#include "util/EGLWindow.h"
>+#include "util/gles_loader_autogen.h"
>+#include "util/random_utils.h"
> 
> using namespace angle;
> 
>@@ -77,25 +79,8 @@ class TransformFeedbackTest : public TransformFeedbackTestBase
>     {
>         ASSERT_EQ(0u, mProgram);
> 
>-        const std::string vertexShaderSource =
>-            R"(precision highp float;
>-            attribute vec4 position;
>-
>-            void main()
>-            {
>-                gl_Position = position;
>-            })";
>-
>-        const std::string fragmentShaderSource =
>-            R"(precision highp float;
>-
>-            void main()
>-            {
>-                gl_FragColor = vec4(1.0, 0.0, 0.0, 1.0);
>-            })";
>-
>-        mProgram = CompileProgramWithTransformFeedback(vertexShaderSource, fragmentShaderSource,
>-                                                       tfVaryings, bufferMode);
>+        mProgram = CompileProgramWithTransformFeedback(
>+            essl1_shaders::vs::Simple(), essl1_shaders::fs::Red(), tfVaryings, bufferMode);
>         ASSERT_NE(0u, mProgram);
>     }
> };
>@@ -122,7 +107,7 @@ TEST_P(TransformFeedbackTest, ZeroSizedViewport)
>     // a quad
>     glViewport(0, 0, 0, 0);
> 
>-    drawQuad(mProgram, "position", 0.5f);
>+    drawQuad(mProgram, essl1_shaders::PositionAttrib(), 0.5f);
> 
>     // End the query and transform feedkback
>     glEndQuery(GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN);
>@@ -175,7 +160,7 @@ TEST_P(TransformFeedbackTest, BufferRebinding)
>         glBeginTransformFeedback(GL_TRIANGLES);
> 
>         float z = (loopIdx + 1 == loopCount) ? finalZ : rng.randomFloatBetween(0.1f, 0.5f);
>-        drawQuad(mProgram, "position", z);
>+        drawQuad(mProgram, essl1_shaders::PositionAttrib(), z);
> 
>         glEndTransformFeedback();
>     }
>@@ -228,7 +213,7 @@ TEST_P(TransformFeedbackTest, RecordAndDraw)
> 
>     glUseProgram(mProgram);
> 
>-    GLint positionLocation = glGetAttribLocation(mProgram, "position");
>+    GLint positionLocation = glGetAttribLocation(mProgram, essl1_shaders::PositionAttrib());
> 
>     // First pass: draw 6 points to the XFB buffer
>     glEnable(GL_RASTERIZER_DISCARD);
>@@ -286,12 +271,72 @@ TEST_P(TransformFeedbackTest, RecordAndDraw)
>     EXPECT_GL_NO_ERROR();
> }
> 
>+// Test that XFB does not allow writing more vertices than fit in the bound buffers.
>+// TODO(jmadill): Enable this test after fixing the last case where the buffer size changes after
>+// calling glBeginTransformFeedback.
>+TEST_P(TransformFeedbackTest, DISABLED_TooSmallBuffers)
>+{
>+    glClearColor(0.0f, 0.0f, 0.0f, 0.0f);
>+    glClear(GL_COLOR_BUFFER_BIT);
>+    glEnable(GL_RASTERIZER_DISCARD);
>+
>+    // Set the program's transform feedback varyings (just gl_Position)
>+    std::vector<std::string> tfVaryings;
>+    tfVaryings.push_back("gl_Position");
>+    compileDefaultProgram(tfVaryings, GL_INTERLEAVED_ATTRIBS);
>+    GLint positionLocation = glGetAttribLocation(mProgram, essl1_shaders::PositionAttrib());
>+
>+    glUseProgram(mProgram);
>+
>+    const GLfloat vertices[] = {
>+        -1.0f, 1.0f, 0.5f, -1.0f, -1.0f, 0.5f, 1.0f, -1.0f, 0.5f,
>+
>+        -1.0f, 1.0f, 0.5f, 1.0f,  -1.0f, 0.5f, 1.0f, 1.0f,  0.5f,
>+    };
>+
>+    glVertexAttribPointer(positionLocation, 3, GL_FLOAT, GL_FALSE, 0, vertices);
>+    glEnableVertexAttribArray(positionLocation);
>+
>+    const size_t verticesToDraw = 6;
>+    const size_t stride         = sizeof(float) * 4;
>+    const size_t bytesNeeded    = stride * verticesToDraw;
>+
>+    glBindBufferBase(GL_TRANSFORM_FEEDBACK_BUFFER, 0, mTransformFeedbackBuffer);
>+
>+    // Set up the buffer to be the right size
>+    uint8_t tfData[stride * verticesToDraw] = {0};
>+    glBufferData(GL_TRANSFORM_FEEDBACK_BUFFER, bytesNeeded, &tfData, GL_STATIC_DRAW);
>+
>+    glBeginTransformFeedback(GL_POINTS);
>+    glDrawArrays(GL_POINTS, 0, verticesToDraw);
>+    EXPECT_GL_NO_ERROR();
>+    glEndTransformFeedback();
>+
>+    // Set up the buffer to be too small
>+    glBufferData(GL_TRANSFORM_FEEDBACK_BUFFER, bytesNeeded - 1, &tfData, GL_STATIC_DRAW);
>+
>+    glBeginTransformFeedback(GL_POINTS);
>+    EXPECT_GL_NO_ERROR();
>+    glDrawArrays(GL_POINTS, 0, verticesToDraw);
>+    EXPECT_GL_ERROR(GL_INVALID_OPERATION);
>+    glEndTransformFeedback();
>+
>+    // Set up the buffer to be the right size but make it smaller after glBeginTransformFeedback
>+    glBufferData(GL_TRANSFORM_FEEDBACK_BUFFER, bytesNeeded, &tfData, GL_STATIC_DRAW);
>+    glBeginTransformFeedback(GL_POINTS);
>+    glBufferData(GL_TRANSFORM_FEEDBACK_BUFFER, bytesNeeded - 1, &tfData, GL_STATIC_DRAW);
>+    EXPECT_GL_NO_ERROR();
>+    glDrawArrays(GL_POINTS, 0, verticesToDraw);
>+    EXPECT_GL_ERROR(GL_INVALID_OPERATION);
>+    glEndTransformFeedback();
>+}
>+
> // Test that buffer binding happens only on the current transform feedback object
> TEST_P(TransformFeedbackTest, BufferBinding)
> {
>     // Reset any state
>     glBindTransformFeedback(GL_TRANSFORM_FEEDBACK, 0);
>-    glBindBuffer(GL_TRANSFORM_FEEDBACK_BUFFER, 0);
>+    glBindBufferBase(GL_TRANSFORM_FEEDBACK_BUFFER, 0, 0);
> 
>     // Generate a new buffer
>     GLuint scratchBuffer = 0;
>@@ -301,7 +346,7 @@ TEST_P(TransformFeedbackTest, BufferBinding)
> 
>     // Bind TF 0 and a buffer
>     glBindTransformFeedback(GL_TRANSFORM_FEEDBACK, 0);
>-    glBindBuffer(GL_TRANSFORM_FEEDBACK_BUFFER, mTransformFeedbackBuffer);
>+    glBindBufferBase(GL_TRANSFORM_FEEDBACK_BUFFER, 0, mTransformFeedbackBuffer);
> 
>     EXPECT_GL_NO_ERROR();
> 
>@@ -310,14 +355,21 @@ TEST_P(TransformFeedbackTest, BufferBinding)
>     glGetIntegerv(GL_TRANSFORM_FEEDBACK_BUFFER_BINDING, &currentBufferBinding);
>     EXPECT_EQ(static_cast<GLuint>(currentBufferBinding), mTransformFeedbackBuffer);
> 
>+    glGetIntegeri_v(GL_TRANSFORM_FEEDBACK_BUFFER_BINDING, 0, &currentBufferBinding);
>+    EXPECT_EQ(static_cast<GLuint>(currentBufferBinding), mTransformFeedbackBuffer);
>+
>     EXPECT_GL_NO_ERROR();
> 
>     // Check that the buffer ID for the newly bound transform feedback is zero
>     glBindTransformFeedback(GL_TRANSFORM_FEEDBACK, mTransformFeedback);
> 
>-    glGetIntegerv(GL_TRANSFORM_FEEDBACK_BUFFER_BINDING, &currentBufferBinding);
>+    glGetIntegeri_v(GL_TRANSFORM_FEEDBACK_BUFFER_BINDING, 0, &currentBufferBinding);
>     EXPECT_EQ(0, currentBufferBinding);
> 
>+    // But the generic bind point is unaffected by glBindTransformFeedback.
>+    glGetIntegerv(GL_TRANSFORM_FEEDBACK_BUFFER_BINDING, &currentBufferBinding);
>+    EXPECT_EQ(static_cast<GLuint>(currentBufferBinding), mTransformFeedbackBuffer);
>+
>     EXPECT_GL_NO_ERROR();
> 
>     // Bind a buffer to this TF
>@@ -332,7 +384,7 @@ TEST_P(TransformFeedbackTest, BufferBinding)
>     glBindTransformFeedback(GL_TRANSFORM_FEEDBACK, 0);
> 
>     glGetIntegeri_v(GL_TRANSFORM_FEEDBACK_BUFFER_BINDING, 0, &currentBufferBinding);
>-    EXPECT_EQ(0, currentBufferBinding);
>+    EXPECT_EQ(static_cast<GLuint>(currentBufferBinding), mTransformFeedbackBuffer);
> 
>     EXPECT_GL_NO_ERROR();
> 
>@@ -343,7 +395,7 @@ TEST_P(TransformFeedbackTest, BufferBinding)
> // Test that we can capture varyings only used in the vertex shader.
> TEST_P(TransformFeedbackTest, VertexOnly)
> {
>-    const std::string &vertexShaderSource =
>+    constexpr char kVS[] =
>         "#version 300 es\n"
>         "in vec2 position;\n"
>         "in float attrib;\n"
>@@ -353,7 +405,7 @@ TEST_P(TransformFeedbackTest, VertexOnly)
>         "  varyingAttrib = attrib;\n"
>         "}";
> 
>-    const std::string &fragmentShaderSource =
>+    constexpr char kFS[] =
>         "#version 300 es\n"
>         "out mediump vec4 color;\n"
>         "void main() {\n"
>@@ -363,8 +415,7 @@ TEST_P(TransformFeedbackTest, VertexOnly)
>     std::vector<std::string> tfVaryings;
>     tfVaryings.push_back("varyingAttrib");
> 
>-    mProgram = CompileProgramWithTransformFeedback(vertexShaderSource, fragmentShaderSource,
>-                                                   tfVaryings, GL_INTERLEAVED_ATTRIBS);
>+    mProgram = CompileProgramWithTransformFeedback(kVS, kFS, tfVaryings, GL_INTERLEAVED_ATTRIBS);
>     ASSERT_NE(0u, mProgram);
> 
>     glUseProgram(mProgram);
>@@ -421,30 +472,27 @@ TEST_P(TransformFeedbackTest, MultiplePaused)
> 
>     const size_t transformFeedbackCount = 8;
> 
>-    const std::string vertexShaderSource =
>-        R"(#version 300 es
>-        in highp vec4 position;
>-        in float transformFeedbackInput;
>-        out float transformFeedbackOutput;
>-        void main(void)
>-        {
>-            gl_Position = position;
>-            transformFeedbackOutput = transformFeedbackInput;
>-        })";
>-
>-    const std::string fragmentShaderSource =
>-        R"(#version 300 es
>-        out mediump vec4 color;
>-        void main(void)
>-        {
>-            color = vec4(1.0, 1.0, 1.0, 1.0);
>-        })";
>+    constexpr char kVS[] = R"(#version 300 es
>+in highp vec4 position;
>+in float transformFeedbackInput;
>+out float transformFeedbackOutput;
>+void main(void)
>+{
>+    gl_Position = position;
>+    transformFeedbackOutput = transformFeedbackInput;
>+})";
>+
>+    constexpr char kFS[] = R"(#version 300 es
>+out mediump vec4 color;
>+void main(void)
>+{
>+    color = vec4(1.0, 1.0, 1.0, 1.0);
>+})";
> 
>     std::vector<std::string> tfVaryings;
>     tfVaryings.push_back("transformFeedbackOutput");
> 
>-    mProgram = CompileProgramWithTransformFeedback(vertexShaderSource, fragmentShaderSource,
>-                                                   tfVaryings, GL_INTERLEAVED_ATTRIBS);
>+    mProgram = CompileProgramWithTransformFeedback(kVS, kFS, tfVaryings, GL_INTERLEAVED_ATTRIBS);
>     ASSERT_NE(0u, mProgram);
>     glUseProgram(mProgram);
> 
>@@ -498,17 +546,10 @@ TEST_P(TransformFeedbackTest, MultiplePaused)
> // contexts returns the correct results.  Helps expose bugs in ANGLE's virtual contexts.
> TEST_P(TransformFeedbackTest, MultiContext)
> {
>-    if (IsOSX() && (IsNVIDIA() || IsAMD() || IsIntel()) && IsOpenGL())
>-    {
>-        std::cout << "Test skipped on NVIDIA, AMD and Intel OpenGL on OSX." << std::endl;
>-        return;
>-    }
>+    // These tests are flaky, do not lift these unless you find the root cause and the fix.
>+    ANGLE_SKIP_TEST_IF(IsOSX() && IsOpenGL());
> 
>-    if (IsLinux() && IsAMD() && IsOpenGL())
>-    {
>-        std::cout << "Test skipped on AMD OpenGL on Linux." << std::endl;
>-        return;
>-    }
>+    ANGLE_SKIP_TEST_IF(IsLinux() && IsAMD() && IsOpenGL());
> 
>     EGLint contextAttributes[] = {
>         EGL_CONTEXT_MAJOR_VERSION_KHR,
>@@ -547,37 +588,35 @@ TEST_P(TransformFeedbackTest, MultiContext)
>     size_t bufferSize = maxDrawSize * passCount;
>     std::vector<float> bufferInitialData(bufferSize, 0);
> 
>-    for (auto &context : contexts)
>+    constexpr char kVS[] = R"(#version 300 es
>+in highp vec4 position;
>+in float transformFeedbackInput;
>+out float transformFeedbackOutput;
>+void main(void)
>+{
>+    gl_Position = position;
>+    transformFeedbackOutput = transformFeedbackInput;
>+})";
>+
>+    constexpr char kFS[] = R"(#version 300 es
>+out mediump vec4 color;
>+void main(void)
>+{
>+    color = vec4(1.0, 1.0, 1.0, 1.0);
>+})";
>+
>+    for (ContextInfo &context : contexts)
>     {
>         context.context = eglCreateContext(display, config, EGL_NO_CONTEXT, contextAttributes);
>         ASSERT_NE(context.context, EGL_NO_CONTEXT);
> 
>         eglMakeCurrent(display, surface, surface, context.context);
> 
>-        const std::string vertexShaderSource =
>-            R"(#version 300 es
>-            in highp vec4 position;
>-            in float transformFeedbackInput;
>-            out float transformFeedbackOutput;
>-            void main(void)
>-            {
>-                gl_Position = position;
>-                transformFeedbackOutput = transformFeedbackInput;
>-            })";
>-
>-        const std::string fragmentShaderSource =
>-            R"(#version 300 es
>-            out mediump vec4 color;
>-            void main(void)
>-            {
>-                color = vec4(1.0, 1.0, 1.0, 1.0);
>-            })";
>-
>         std::vector<std::string> tfVaryings;
>         tfVaryings.push_back("transformFeedbackOutput");
> 
>-        context.program = CompileProgramWithTransformFeedback(
>-            vertexShaderSource, fragmentShaderSource, tfVaryings, GL_INTERLEAVED_ATTRIBS);
>+        context.program =
>+            CompileProgramWithTransformFeedback(kVS, kFS, tfVaryings, GL_INTERLEAVED_ATTRIBS);
>         ASSERT_NE(context.program, 0u);
>         glUseProgram(context.program);
> 
>@@ -681,7 +720,7 @@ TEST_P(TransformFeedbackTest, MultiContext)
> TEST_P(TransformFeedbackTest, PackingBug)
> {
>     // TODO(jmadill): With points and rasterizer discard?
>-    const std::string &vertexShaderSource =
>+    constexpr char kVS[] =
>         "#version 300 es\n"
>         "in vec2 inAttrib1;\n"
>         "in vec2 inAttrib2;\n"
>@@ -694,7 +733,7 @@ TEST_P(TransformFeedbackTest, PackingBug)
>         "  gl_Position = vec4(position, 0, 1);\n"
>         "}";
> 
>-    const std::string &fragmentShaderSource =
>+    constexpr char kFS[] =
>         "#version 300 es\n"
>         "precision mediump float;\n"
>         "out vec4 color;\n"
>@@ -706,8 +745,7 @@ TEST_P(TransformFeedbackTest, PackingBug)
>     tfVaryings.push_back("outAttrib1");
>     tfVaryings.push_back("outAttrib2");
> 
>-    mProgram = CompileProgramWithTransformFeedback(vertexShaderSource, fragmentShaderSource,
>-                                                   tfVaryings, GL_INTERLEAVED_ATTRIBS);
>+    mProgram = CompileProgramWithTransformFeedback(kVS, kFS, tfVaryings, GL_INTERLEAVED_ATTRIBS);
>     ASSERT_NE(0u, mProgram);
> 
>     glBindBuffer(GL_TRANSFORM_FEEDBACK_BUFFER, mTransformFeedbackBuffer);
>@@ -763,7 +801,7 @@ TEST_P(TransformFeedbackTest, PackingBug)
> // compilation to fail
> TEST_P(TransformFeedbackTest, OptimizedVaryings)
> {
>-    const std::string &vertexShaderSource =
>+    constexpr char kVS[] =
>         "#version 300 es\n"
>         "in vec4 a_vertex;\n"
>         "in vec3 a_normal; \n"
>@@ -785,7 +823,7 @@ TEST_P(TransformFeedbackTest, OptimizedVaryings)
>         "    gl_Position = u_projectionMatrix * ecPosition;\n"
>         "}\n";
> 
>-    const std::string &fragmentShaderSource =
>+    constexpr char kFS[] =
>         "#version 300 es\n"
>         "precision mediump float;\n"
>         "\n"
>@@ -803,8 +841,7 @@ TEST_P(TransformFeedbackTest, OptimizedVaryings)
>     tfVaryings.push_back("normal");
>     tfVaryings.push_back("ecPosition");
> 
>-    mProgram = CompileProgramWithTransformFeedback(vertexShaderSource, fragmentShaderSource,
>-                                                   tfVaryings, GL_INTERLEAVED_ATTRIBS);
>+    mProgram = CompileProgramWithTransformFeedback(kVS, kFS, tfVaryings, GL_INTERLEAVED_ATTRIBS);
>     ASSERT_NE(0u, mProgram);
> }
> 
>@@ -812,7 +849,7 @@ TEST_P(TransformFeedbackTest, OptimizedVaryings)
> TEST_P(TransformFeedbackTest, TwoUnreferencedInFragShader)
> {
>     // TODO(jmadill): With points and rasterizer discard?
>-    const std::string &vertexShaderSource =
>+    constexpr char kVS[] =
>         "#version 300 es\n"
>         "in vec3 position;\n"
>         "out vec3 outAttrib1;\n"
>@@ -823,7 +860,7 @@ TEST_P(TransformFeedbackTest, TwoUnreferencedInFragShader)
>         "  gl_Position = vec4(position, 1);\n"
>         "}";
> 
>-    const std::string &fragmentShaderSource =
>+    constexpr char kFS[] =
>         "#version 300 es\n"
>         "precision mediump float;\n"
>         "out vec4 color;\n"
>@@ -837,8 +874,7 @@ TEST_P(TransformFeedbackTest, TwoUnreferencedInFragShader)
>     tfVaryings.push_back("outAttrib1");
>     tfVaryings.push_back("outAttrib2");
> 
>-    mProgram = CompileProgramWithTransformFeedback(vertexShaderSource, fragmentShaderSource,
>-                                                   tfVaryings, GL_INTERLEAVED_ATTRIBS);
>+    mProgram = CompileProgramWithTransformFeedback(kVS, kFS, tfVaryings, GL_INTERLEAVED_ATTRIBS);
>     ASSERT_NE(0u, mProgram);
> 
>     glBindBuffer(GL_TRANSFORM_FEEDBACK_BUFFER, mTransformFeedbackBuffer);
>@@ -877,19 +913,11 @@ TEST_P(TransformFeedbackTest, TwoUnreferencedInFragShader)
> // glBeginTransformFeedback is called
> TEST_P(TransformFeedbackTest, OffsetResetOnBeginTransformFeedback)
> {
>-    if (IsOSX() && IsAMD())
>-    {
>-        std::cout << "Test skipped on Mac AMD." << std::endl;
>-        return;
>-    }
>+    ANGLE_SKIP_TEST_IF(IsOSX() && IsAMD());
> 
>-    if (IsAndroid())
>-    {
>-        std::cout << "Test skipped on Android." << std::endl;
>-        return;
>-    }
>+    ANGLE_SKIP_TEST_IF((IsNexus5X() || IsNexus6P()) && IsOpenGLES());
> 
>-    const std::string &vertexShaderSource =
>+    constexpr char kVS[] =
>         "#version 300 es\n"
>         "in vec4 position;\n"
>         "out vec4 outAttrib;\n"
>@@ -898,7 +926,7 @@ TEST_P(TransformFeedbackTest, OffsetResetOnBeginTransformFeedback)
>         "  gl_Position = vec4(0);\n"
>         "}";
> 
>-    const std::string &fragmentShaderSource =
>+    constexpr char kFS[] =
>         "#version 300 es\n"
>         "precision mediump float;\n"
>         "out vec4 color;\n"
>@@ -909,8 +937,7 @@ TEST_P(TransformFeedbackTest, OffsetResetOnBeginTransformFeedback)
>     std::vector<std::string> tfVaryings;
>     tfVaryings.push_back("outAttrib");
> 
>-    mProgram = CompileProgramWithTransformFeedback(vertexShaderSource, fragmentShaderSource,
>-                                                   tfVaryings, GL_INTERLEAVED_ATTRIBS);
>+    mProgram = CompileProgramWithTransformFeedback(kVS, kFS, tfVaryings, GL_INTERLEAVED_ATTRIBS);
>     ASSERT_NE(0u, mProgram);
> 
>     GLint positionLocation = glGetAttribLocation(mProgram, "position");
>@@ -974,7 +1001,7 @@ TEST_P(TransformFeedbackTest, CaptureAndCopy)
> 
>     glUseProgram(mProgram);
> 
>-    GLint positionLocation = glGetAttribLocation(mProgram, "position");
>+    GLint positionLocation = glGetAttribLocation(mProgram, essl1_shaders::PositionAttrib());
> 
>     glEnable(GL_RASTERIZER_DISCARD);
> 
>@@ -1058,19 +1085,19 @@ TEST_P(TransformFeedbackLifetimeTest, DeletedBuffer)
>     glUseProgram(mProgram);
> 
>     glBeginTransformFeedback(GL_TRIANGLES);
>-    drawQuad(mProgram, "position", 0.5f, 1.0f, true);
>+    drawQuad(mProgram, essl1_shaders::PositionAttrib(), 0.5f, 1.0f, true);
>     glEndTransformFeedback();
> 
>     glBindTransformFeedback(GL_TRANSFORM_FEEDBACK, 0);
> 
>     // TODO(jmadill): Remove this when http://anglebug.com/1351 is fixed.
>     glBindVertexArray(0);
>-    drawQuad(mProgram, "position", 0.5f);
>+    drawQuad(mProgram, essl1_shaders::PositionAttrib(), 0.5f);
>     glBindVertexArray(1);
> 
>     // Next, draw vertices with mTransformFeedbackBuffer. This will link to mVertexArray.
>     glBindBuffer(GL_ARRAY_BUFFER, mTransformFeedbackBuffer);
>-    GLint loc = glGetAttribLocation(mProgram, "position");
>+    GLint loc = glGetAttribLocation(mProgram, essl1_shaders::PositionAttrib());
>     ASSERT_NE(-1, loc);
>     glVertexAttribPointer(loc, 1, GL_FLOAT, GL_FALSE, 4, nullptr);
>     glEnableVertexAttribArray(loc);
>@@ -1086,7 +1113,7 @@ TEST_P(TransformFeedbackLifetimeTest, DeletedBuffer)
>     // Then draw again with transform feedback, dereferencing the stranded pointer.
>     glBindTransformFeedback(GL_TRANSFORM_FEEDBACK, mTransformFeedback);
>     glBeginTransformFeedback(GL_TRIANGLES);
>-    drawQuad(mProgram, "position", 0.5f, 1.0f, true);
>+    drawQuad(mProgram, essl1_shaders::PositionAttrib(), 0.5f, 1.0f, true);
>     glEndTransformFeedback();
>     glBindTransformFeedback(GL_TRANSFORM_FEEDBACK, 0);
> 
>@@ -1094,13 +1121,12 @@ TEST_P(TransformFeedbackLifetimeTest, DeletedBuffer)
> }
> 
> class TransformFeedbackTestES31 : public TransformFeedbackTestBase
>-{
>-};
>+{};
> 
> // Test that program link fails in case that transform feedback names including same array element.
> TEST_P(TransformFeedbackTestES31, SameArrayElementVaryings)
> {
>-    const std::string &vertexShaderSource =
>+    constexpr char kVS[] =
>         "#version 310 es\n"
>         "in vec3 position;\n"
>         "out vec3 outAttribs[3];\n"
>@@ -1111,7 +1137,7 @@ TEST_P(TransformFeedbackTestES31, SameArrayElementVaryings)
>         "  gl_Position = vec4(position, 1);\n"
>         "}";
> 
>-    const std::string &fragmentShaderSource =
>+    constexpr char kFS[] =
>         "#version 310 es\n"
>         "precision mediump float;\n"
>         "out vec4 color;\n"
>@@ -1124,15 +1150,72 @@ TEST_P(TransformFeedbackTestES31, SameArrayElementVaryings)
>     tfVaryings.push_back("outAttribs");
>     tfVaryings.push_back("outAttribs[1]");
> 
>-    mProgram = CompileProgramWithTransformFeedback(vertexShaderSource, fragmentShaderSource,
>-                                                   tfVaryings, GL_INTERLEAVED_ATTRIBS);
>+    mProgram = CompileProgramWithTransformFeedback(kVS, kFS, tfVaryings, GL_INTERLEAVED_ATTRIBS);
>+    ASSERT_EQ(0u, mProgram);
>+}
>+
>+// Test that program link fails in case to capture array element on a non-array varying.
>+TEST_P(TransformFeedbackTestES31, ElementCaptureOnNonArrayVarying)
>+{
>+    constexpr char kVS[] =
>+        "#version 310 es\n"
>+        "in vec3 position;\n"
>+        "out vec3 outAttrib;\n"
>+        "void main() {"
>+        "  outAttrib = position;\n"
>+        "  gl_Position = vec4(position, 1);\n"
>+        "}";
>+
>+    constexpr char kFS[] =
>+        "#version 310 es\n"
>+        "precision mediump float;\n"
>+        "out vec4 color;\n"
>+        "in vec3 outAttrib;\n"
>+        "void main() {\n"
>+        "  color = vec4(0);\n"
>+        "}";
>+
>+    std::vector<std::string> tfVaryings;
>+    tfVaryings.push_back("outAttrib[1]");
>+
>+    mProgram = CompileProgramWithTransformFeedback(kVS, kFS, tfVaryings, GL_INTERLEAVED_ATTRIBS);
>+    ASSERT_EQ(0u, mProgram);
>+}
>+
>+// Test that program link fails in case to capure an outbound array element.
>+TEST_P(TransformFeedbackTestES31, CaptureOutboundElement)
>+{
>+    constexpr char kVS[] =
>+        "#version 310 es\n"
>+        "in vec3 position;\n"
>+        "out vec3 outAttribs[3];\n"
>+        "void main() {"
>+        "  outAttribs[0] = position;\n"
>+        "  outAttribs[1] = vec3(0, 0, 0);\n"
>+        "  outAttribs[2] = position;\n"
>+        "  gl_Position = vec4(position, 1);\n"
>+        "}";
>+
>+    constexpr char kFS[] =
>+        "#version 310 es\n"
>+        "precision mediump float;\n"
>+        "out vec4 color;\n"
>+        "in vec3 outAttribs[3];\n"
>+        "void main() {\n"
>+        "  color = vec4(0);\n"
>+        "}";
>+
>+    std::vector<std::string> tfVaryings;
>+    tfVaryings.push_back("outAttribs[3]");
>+
>+    mProgram = CompileProgramWithTransformFeedback(kVS, kFS, tfVaryings, GL_INTERLEAVED_ATTRIBS);
>     ASSERT_EQ(0u, mProgram);
> }
> 
> // Test transform feedback names can be specified using array element.
> TEST_P(TransformFeedbackTestES31, DifferentArrayElementVaryings)
> {
>-    const std::string &vertexShaderSource =
>+    constexpr char kVS[] =
>         "#version 310 es\n"
>         "in vec3 position;\n"
>         "out vec3 outAttribs[3];\n"
>@@ -1143,7 +1226,7 @@ TEST_P(TransformFeedbackTestES31, DifferentArrayElementVaryings)
>         "  gl_Position = vec4(position, 1);\n"
>         "}";
> 
>-    const std::string &fragmentShaderSource =
>+    constexpr char kFS[] =
>         "#version 310 es\n"
>         "precision mediump float;\n"
>         "out vec4 color;\n"
>@@ -1156,8 +1239,7 @@ TEST_P(TransformFeedbackTestES31, DifferentArrayElementVaryings)
>     tfVaryings.push_back("outAttribs[0]");
>     tfVaryings.push_back("outAttribs[2]");
> 
>-    mProgram = CompileProgramWithTransformFeedback(vertexShaderSource, fragmentShaderSource,
>-                                                   tfVaryings, GL_INTERLEAVED_ATTRIBS);
>+    mProgram = CompileProgramWithTransformFeedback(kVS, kFS, tfVaryings, GL_INTERLEAVED_ATTRIBS);
>     ASSERT_NE(0u, mProgram);
> 
>     glBindBuffer(GL_TRANSFORM_FEEDBACK_BUFFER, mTransformFeedbackBuffer);
>@@ -1192,31 +1274,123 @@ TEST_P(TransformFeedbackTestES31, DifferentArrayElementVaryings)
>     ASSERT_GL_NO_ERROR();
> }
> 
>-// Test that nonexistent transform feedback varyings don't assert when linking.
>-TEST_P(TransformFeedbackTest, NonExistentTransformFeedbackVarying)
>+// Test transform feedback varying for base-level members of struct.
>+TEST_P(TransformFeedbackTestES31, StructMemberVaryings)
> {
>-    const std::string &vertexShaderSource =
>-        "#version 300 es\n"
>-        "in vec4 a_position;\n"
>-        "void main()\n"
>-        "{\n"
>-        "    gl_Position = a_position;\n"
>-        "}\n";
>+    constexpr char kVS[] = R"(#version 310 es
>+in vec3 position;
>+struct S {
>+    vec3 field0;
>+    vec3 field1;
>+    vec3 field2;
>+};
>+out S s;
>+
>+void main() {
>+    s.field0 = position;
>+    s.field1 = vec3(0, 0, 0);
>+    s.field2 = position;
>+    gl_Position = vec4(position, 1);
>+})";
>+
>+    constexpr char kFS[] = R"(#version 310 es
>+precision mediump float;
>+struct S {
>+    vec3 field0;
>+    vec3 field1;
>+    vec3 field2;
>+};
>+out vec4 color;
>+in S s;
> 
>-    const std::string &fragmentShaderSource =
>-        "#version 300 es\n"
>-        "precision mediump float;\n"
>-        "out vec4 fragColor;\n"
>-        "void main()\n"
>-        "{\n"
>-        "    fragColor = vec4(0);\n"
>-        "}\n";
>+void main() {
>+    color = vec4(s.field1, 1);
>+})";
>+
>+    std::vector<std::string> tfVaryings;
>+    tfVaryings.push_back("s.field0");
>+    tfVaryings.push_back("s.field2");
>+
>+    mProgram = CompileProgramWithTransformFeedback(kVS, kFS, tfVaryings, GL_INTERLEAVED_ATTRIBS);
>+    ASSERT_NE(0u, mProgram);
>+
>+    glBindBuffer(GL_TRANSFORM_FEEDBACK_BUFFER, mTransformFeedbackBuffer);
>+    glBufferData(GL_TRANSFORM_FEEDBACK_BUFFER, sizeof(Vector3) * 2 * 6, nullptr, GL_STREAM_DRAW);
> 
>+    glBindTransformFeedback(GL_TRANSFORM_FEEDBACK, mTransformFeedback);
>+    glBindBufferBase(GL_TRANSFORM_FEEDBACK_BUFFER, 0, mTransformFeedbackBuffer);
>+
>+    glUseProgram(mProgram);
>+    glBeginTransformFeedback(GL_TRIANGLES);
>+    drawQuad(mProgram, "position", 0.5f);
>+    glEndTransformFeedback();
>+    glUseProgram(0);
>+    ASSERT_GL_NO_ERROR();
>+
>+    const GLvoid *mapPointer =
>+        glMapBufferRange(GL_TRANSFORM_FEEDBACK_BUFFER, 0, sizeof(Vector3) * 2 * 6, GL_MAP_READ_BIT);
>+    ASSERT_NE(nullptr, mapPointer);
>+
>+    const auto &quadVertices = GetQuadVertices();
>+
>+    const Vector3 *vecPointer = static_cast<const Vector3 *>(mapPointer);
>+    for (unsigned int vectorIndex = 0; vectorIndex < 3; ++vectorIndex)
>+    {
>+        unsigned int stream1Index = vectorIndex * 2;
>+        unsigned int stream2Index = vectorIndex * 2 + 1;
>+        EXPECT_EQ(quadVertices[vectorIndex], vecPointer[stream1Index]);
>+        EXPECT_EQ(quadVertices[vectorIndex], vecPointer[stream2Index]);
>+    }
>+    glUnmapBuffer(GL_TRANSFORM_FEEDBACK_BUFFER);
>+
>+    ASSERT_GL_NO_ERROR();
>+}
>+
>+// Test transform feedback varying for struct is not allowed.
>+TEST_P(TransformFeedbackTestES31, InvalidStructVaryings)
>+{
>+    constexpr char kVS[] = R"(#version 310 es
>+in vec3 position;
>+struct S {
>+    vec3 field0;
>+    vec3 field1;
>+};
>+out S s;
>+
>+void main() {
>+    s.field0 = position;
>+    s.field1 = vec3(0, 0, 0);
>+    gl_Position = vec4(position, 1);
>+})";
>+
>+    constexpr char kFS[] = R"(#version 310 es
>+precision mediump float;
>+struct S {
>+    vec3 field0;
>+    vec3 field1;
>+};
>+out vec4 color;
>+in S s;
>+
>+void main() {
>+    color = vec4(s.field1, 1);
>+})";
>+
>+    std::vector<std::string> tfVaryings;
>+    tfVaryings.push_back("s");
>+
>+    mProgram = CompileProgramWithTransformFeedback(kVS, kFS, tfVaryings, GL_INTERLEAVED_ATTRIBS);
>+    ASSERT_EQ(0u, mProgram);
>+}
>+
>+// Test that nonexistent transform feedback varyings don't assert when linking.
>+TEST_P(TransformFeedbackTest, NonExistentTransformFeedbackVarying)
>+{
>     std::vector<std::string> tfVaryings;
>     tfVaryings.push_back("bogus");
> 
>-    mProgram = CompileProgramWithTransformFeedback(vertexShaderSource, fragmentShaderSource,
>-                                                   tfVaryings, GL_INTERLEAVED_ATTRIBS);
>+    mProgram = CompileProgramWithTransformFeedback(
>+        essl3_shaders::vs::Simple(), essl3_shaders::fs::Red(), tfVaryings, GL_INTERLEAVED_ATTRIBS);
>     ASSERT_EQ(0u, mProgram);
> }
> 
>@@ -1224,28 +1398,11 @@ TEST_P(TransformFeedbackTest, NonExistentTransformFeedbackVarying)
> // nonexistent varying is prefixed with "gl_".
> TEST_P(TransformFeedbackTest, NonExistentTransformFeedbackVaryingWithGLPrefix)
> {
>-    const std::string &vertexShaderSource =
>-        "#version 300 es\n"
>-        "in vec4 a_position;\n"
>-        "void main()\n"
>-        "{\n"
>-        "    gl_Position = a_position;\n"
>-        "}\n";
>-
>-    const std::string &fragmentShaderSource =
>-        "#version 300 es\n"
>-        "precision mediump float;\n"
>-        "out vec4 fragColor;\n"
>-        "void main()\n"
>-        "{\n"
>-        "    fragColor = vec4(0);\n"
>-        "}\n";
>-
>     std::vector<std::string> tfVaryings;
>     tfVaryings.push_back("gl_Bogus");
> 
>-    mProgram = CompileProgramWithTransformFeedback(vertexShaderSource, fragmentShaderSource,
>-                                                   tfVaryings, GL_INTERLEAVED_ATTRIBS);
>+    mProgram = CompileProgramWithTransformFeedback(
>+        essl3_shaders::vs::Simple(), essl3_shaders::fs::Red(), tfVaryings, GL_INTERLEAVED_ATTRIBS);
>     ASSERT_EQ(0u, mProgram);
> }
> 
>@@ -1253,7 +1410,7 @@ TEST_P(TransformFeedbackTest, NonExistentTransformFeedbackVaryingWithGLPrefix)
> // GLSL ES.
> TEST_P(TransformFeedbackTest, VaryingReservedOpenGLName)
> {
>-    const std::string &vertexShaderSource =
>+    constexpr char kVS[] =
>         "#version 300 es\n"
>         "in vec3 position;\n"
>         "out vec3 buffer;\n"
>@@ -1262,7 +1419,7 @@ TEST_P(TransformFeedbackTest, VaryingReservedOpenGLName)
>         "  gl_Position = vec4(position, 1);\n"
>         "}";
> 
>-    const std::string &fragmentShaderSource =
>+    constexpr char kFS[] =
>         "#version 300 es\n"
>         "precision highp float;\n"
>         "out vec4 color;\n"
>@@ -1274,8 +1431,7 @@ TEST_P(TransformFeedbackTest, VaryingReservedOpenGLName)
>     std::vector<std::string> tfVaryings;
>     tfVaryings.push_back("buffer");
> 
>-    mProgram = CompileProgramWithTransformFeedback(vertexShaderSource, fragmentShaderSource,
>-                                                   tfVaryings, GL_INTERLEAVED_ATTRIBS);
>+    mProgram = CompileProgramWithTransformFeedback(kVS, kFS, tfVaryings, GL_INTERLEAVED_ATTRIBS);
>     ASSERT_NE(0u, mProgram);
> 
>     glBindBuffer(GL_TRANSFORM_FEEDBACK_BUFFER, mTransformFeedbackBuffer);
>@@ -1324,24 +1480,7 @@ TEST_P(TransformFeedbackTest, NoCurrentProgram)
> // generate an INVALID_OPERATION error.
> TEST_P(TransformFeedbackTest, NoTransformFeedbackVaryingsInUse)
> {
>-    const std::string &vertexShaderSource =
>-        "#version 300 es\n"
>-        "in vec4 a_position;\n"
>-        "void main()\n"
>-        "{\n"
>-        "    gl_Position = a_position;\n"
>-        "}\n";
>-
>-    const std::string &fragmentShaderSource =
>-        "#version 300 es\n"
>-        "precision mediump float;\n"
>-        "out vec4 fragColor;\n"
>-        "void main()\n"
>-        "{\n"
>-        "    fragColor = vec4(0);\n"
>-        "}\n";
>-
>-    ANGLE_GL_PROGRAM(program, vertexShaderSource, fragmentShaderSource);
>+    ANGLE_GL_PROGRAM(program, essl3_shaders::vs::Simple(), essl3_shaders::fs::Red());
> 
>     glUseProgram(program);
>     glBeginTransformFeedback(GL_TRIANGLES);
>@@ -1353,6 +1492,162 @@ TEST_P(TransformFeedbackTest, NoTransformFeedbackVaryingsInUse)
>     EXPECT_GL_ERROR(GL_INVALID_OPERATION);
> }
> 
>+// Test that you can pause transform feedback without drawing first.
>+TEST_P(TransformFeedbackTest, SwitchProgramBeforeDraw)
>+{
>+    std::vector<std::string> tfVaryings;
>+    tfVaryings.push_back("gl_Position");
>+    compileDefaultProgram(tfVaryings, GL_INTERLEAVED_ATTRIBS);
>+    ANGLE_GL_PROGRAM(nonTFProgram, essl3_shaders::vs::Simple(), essl3_shaders::fs::Red());
>+
>+    // Set up transform feedback, but pause it.
>+    glBindTransformFeedback(GL_TRANSFORM_FEEDBACK, mTransformFeedback);
>+    glBindBufferBase(GL_TRANSFORM_FEEDBACK_BUFFER, 0, mTransformFeedbackBuffer);
>+    glUseProgram(mProgram);
>+    glBeginTransformFeedback(GL_TRIANGLES);
>+    glPauseTransformFeedback();
>+
>+    // Switch programs and draw while transform feedback is paused.
>+    glUseProgram(nonTFProgram);
>+    GLint positionLocation = glGetAttribLocation(nonTFProgram, essl1_shaders::PositionAttrib());
>+    glDisableVertexAttribArray(positionLocation);
>+    glVertexAttrib4f(positionLocation, 0.0f, 0.0f, 0.0f, 1.0f);
>+    glDrawArrays(GL_TRIANGLES, 0, 3);
>+
>+    glEndTransformFeedback();
>+
>+    ASSERT_GL_NO_ERROR();
>+}
>+
>+// Test that ending transform feedback with a different program bound does not cause internal
>+// errors.
>+TEST_P(TransformFeedbackTest, EndWithDifferentProgram)
>+{
>+    // AMD drivers fail because they perform transform feedback when it should be paused.
>+    ANGLE_SKIP_TEST_IF(IsAMD() && IsOpenGL());
>+
>+    std::vector<std::string> tfVaryings;
>+    tfVaryings.push_back("gl_Position");
>+    compileDefaultProgram(tfVaryings, GL_INTERLEAVED_ATTRIBS);
>+    ANGLE_GL_PROGRAM(nonTFProgram, essl3_shaders::vs::Simple(), essl3_shaders::fs::Red());
>+
>+    // Set up transform feedback, but pause it.
>+    glBindTransformFeedback(GL_TRANSFORM_FEEDBACK, mTransformFeedback);
>+    glBindBufferBase(GL_TRANSFORM_FEEDBACK_BUFFER, 0, mTransformFeedbackBuffer);
>+    // Make sure the buffer has zero'd data
>+    std::vector<float> data(mTransformFeedbackBufferSize / sizeof(float), 0.0f);
>+    glBufferData(GL_TRANSFORM_FEEDBACK_BUFFER, mTransformFeedbackBufferSize, data.data(),
>+                 GL_STATIC_DRAW);
>+    glUseProgram(mProgram);
>+    glBeginTransformFeedback(GL_TRIANGLES);
>+    glPauseTransformFeedback();
>+    // Transform feedback should not happen
>+    drawQuad(mProgram, essl1_shaders::PositionAttrib(), 0.5f, 1.0f, true);
>+
>+    // Draw using a different program.
>+    glUseProgram(nonTFProgram);
>+    GLint positionLocation = glGetAttribLocation(nonTFProgram, essl1_shaders::PositionAttrib());
>+    glDisableVertexAttribArray(positionLocation);
>+    glVertexAttrib4f(positionLocation, 0.0f, 0.0f, 0.0f, 1.0f);
>+    glDrawArrays(GL_TRIANGLES, 0, 3);
>+
>+    // End transform feedback without unpausing and with a different program bound. This triggers
>+    // the bug.
>+    glEndTransformFeedback();
>+
>+    glUseProgram(mProgram);
>+    glBeginTransformFeedback(GL_TRIANGLES);
>+    // On a buggy driver without the workaround this will cause a GL error because the driver
>+    // thinks transform feedback is still paused, but rendering will still write to the transform
>+    // feedback buffers.
>+    glPauseTransformFeedback();
>+    drawQuad(mProgram, essl1_shaders::PositionAttrib(), 0.5f, 1.0f, true);
>+    glEndTransformFeedback();
>+
>+    // Make sure that transform feedback did not happen. We always paused transform feedback before
>+    // rendering, but a buggy driver will fail to pause.
>+    const void *mapPointer =
>+        glMapBufferRange(GL_TRANSFORM_FEEDBACK_BUFFER, 0, sizeof(Vector4) * 4, GL_MAP_READ_BIT);
>+    ASSERT_NE(nullptr, mapPointer);
>+    const Vector4 *vecPointer = static_cast<const Vector4 *>(mapPointer);
>+    ASSERT_EQ(vecPointer[0], Vector4(0, 0, 0, 0));
>+    glUnmapBuffer(GL_TRANSFORM_FEEDBACK_BUFFER);
>+    ASSERT_GL_NO_ERROR();
>+}
>+
>+// Test that switching contexts with paused transform feedback does not cause internal errors.
>+TEST_P(TransformFeedbackTest, EndWithDifferentProgramContextSwitch)
>+{
>+    // AMD drivers fail because they perform transform feedback when it should be paused.
>+    ANGLE_SKIP_TEST_IF(IsAMD() && IsOpenGL());
>+
>+    std::vector<std::string> tfVaryings;
>+    tfVaryings.push_back("gl_Position");
>+    compileDefaultProgram(tfVaryings, GL_INTERLEAVED_ATTRIBS);
>+
>+    EGLWindow *window          = getEGLWindow();
>+    EGLDisplay display         = window->getDisplay();
>+    EGLConfig config           = window->getConfig();
>+    EGLSurface surface         = window->getSurface();
>+    EGLint contextAttributes[] = {
>+        EGL_CONTEXT_MAJOR_VERSION_KHR,
>+        GetParam().majorVersion,
>+        EGL_CONTEXT_MINOR_VERSION_KHR,
>+        GetParam().minorVersion,
>+        EGL_NONE,
>+    };
>+    auto context1 = eglGetCurrentContext();
>+    auto context2 = eglCreateContext(display, config, EGL_NO_CONTEXT, contextAttributes);
>+    ASSERT_NE(context2, EGL_NO_CONTEXT);
>+    // Compile a program on the second context.
>+    eglMakeCurrent(display, surface, surface, context2);
>+    ANGLE_GL_PROGRAM(nonTFProgram, essl3_shaders::vs::Simple(), essl3_shaders::fs::Red());
>+    eglMakeCurrent(display, surface, surface, context1);
>+
>+    // Set up transform feedback, but pause it.
>+    glBindTransformFeedback(GL_TRANSFORM_FEEDBACK, mTransformFeedback);
>+    glBindBufferBase(GL_TRANSFORM_FEEDBACK_BUFFER, 0, mTransformFeedbackBuffer);
>+    // Make sure the buffer has zero'd data
>+    std::vector<float> data(mTransformFeedbackBufferSize / sizeof(float), 0.0f);
>+    glBufferData(GL_TRANSFORM_FEEDBACK_BUFFER, mTransformFeedbackBufferSize, data.data(),
>+                 GL_STATIC_DRAW);
>+    glUseProgram(mProgram);
>+    glBeginTransformFeedback(GL_TRIANGLES);
>+    glPauseTransformFeedback();
>+    drawQuad(mProgram, essl1_shaders::PositionAttrib(), 0.5f, 1.0f, true);
>+    // Leave transform feedback active but paused while we switch to a second context and render
>+    // something.
>+    eglMakeCurrent(display, surface, surface, context2);
>+    glUseProgram(nonTFProgram);
>+    GLint positionLocation = glGetAttribLocation(nonTFProgram, essl1_shaders::PositionAttrib());
>+    glDisableVertexAttribArray(positionLocation);
>+    glVertexAttrib4f(positionLocation, 0.0f, 0.0f, 0.0f, 1.0f);
>+    glDrawArrays(GL_TRIANGLES, 0, 3);
>+    // Switch back to the first context and end transform feedback. On a buggy driver, this will
>+    // cause the transform feedback object to enter an invalid "inactive, but paused" state unless
>+    // the workaround is applied.
>+    eglMakeCurrent(display, surface, surface, context1);
>+    glEndTransformFeedback();
>+    glBeginTransformFeedback(GL_TRIANGLES);
>+    // On a buggy driver without the workaround this will cause a GL error because the driver
>+    // thinks transform feedback is still paused, but rendering will still write to the transform
>+    // feedback buffers.
>+    glPauseTransformFeedback();
>+    drawQuad(mProgram, essl1_shaders::PositionAttrib(), 0.5f, 1.0f, true);
>+    glEndTransformFeedback();
>+
>+    // Make sure that transform feedback did not happen. We always paused transform feedback before
>+    // rendering, but a buggy driver will fail to pause.
>+    const void *mapPointer =
>+        glMapBufferRange(GL_TRANSFORM_FEEDBACK_BUFFER, 0, sizeof(Vector4) * 4, GL_MAP_READ_BIT);
>+    ASSERT_NE(nullptr, mapPointer);
>+    const Vector4 *vecPointer = static_cast<const Vector4 *>(mapPointer);
>+    ASSERT_EQ(vecPointer[0], Vector4(0, 0, 0, 0));
>+    glUnmapBuffer(GL_TRANSFORM_FEEDBACK_BUFFER);
>+    eglDestroyContext(display, context2);
>+    ASSERT_GL_NO_ERROR();
>+}
>+
> // Use this to select which configurations (e.g. which renderer, which GLES major version) these
> // tests should be run against.
> ANGLE_INSTANTIATE_TEST(TransformFeedbackTest, ES3_D3D11(), ES3_OPENGL(), ES3_OPENGLES());
>diff --git a/Source/ThirdParty/ANGLE/src/tests/gl_tests/UniformBufferTest.cpp b/Source/ThirdParty/ANGLE/src/tests/gl_tests/UniformBufferTest.cpp
>index be525e30792..6b77cf70ab0 100644
>--- a/Source/ThirdParty/ANGLE/src/tests/gl_tests/UniformBufferTest.cpp
>+++ b/Source/ThirdParty/ANGLE/src/tests/gl_tests/UniformBufferTest.cpp
>@@ -29,25 +29,16 @@ class UniformBufferTest : public ANGLETest
>     {
>         ANGLETest::SetUp();
> 
>-        mVertexShaderSource =
>-            R"(#version 300 es
>-            in vec4 position;
>-            void main()
>-            {
>-                gl_Position = position;
>-            })";
>-
>-        mFragmentShaderSource =
>-            R"(#version 300 es
>-            precision highp float;
>-            uniform uni { vec4 color; };
>-            out vec4 fragColor;
>-            void main()
>-            {
>-                fragColor = color;
>-            })";
>-
>-        mProgram = CompileProgram(mVertexShaderSource, mFragmentShaderSource);
>+        mkFS = R"(#version 300 es
>+precision highp float;
>+uniform uni { vec4 color; };
>+out vec4 fragColor;
>+void main()
>+{
>+    fragColor = color;
>+})";
>+
>+        mProgram = CompileProgram(essl3_shaders::vs::Simple(), mkFS);
>         ASSERT_NE(mProgram, 0u);
> 
>         mUniformBufferIndex = glGetUniformBlockIndex(mProgram, "uni");
>@@ -65,8 +56,7 @@ class UniformBufferTest : public ANGLETest
>         ANGLETest::TearDown();
>     }
> 
>-    std::string mVertexShaderSource;
>-    std::string mFragmentShaderSource;
>+    const char *mkFS;
>     GLuint mProgram;
>     GLint mUniformBufferIndex;
>     GLuint mUniformBuffer;
>@@ -84,7 +74,7 @@ TEST_P(UniformBufferTest, Simple)
>     glBindBufferBase(GL_UNIFORM_BUFFER, 0, mUniformBuffer);
> 
>     glUniformBlockBinding(mProgram, mUniformBufferIndex, 0);
>-    drawQuad(mProgram, "position", 0.5f);
>+    drawQuad(mProgram, essl3_shaders::PositionAttrib(), 0.5f);
> 
>     ASSERT_GL_NO_ERROR();
>     EXPECT_PIXEL_NEAR(0, 0, 128, 191, 64, 255, 1);
>@@ -147,7 +137,7 @@ TEST_P(UniformBufferTest, UniformBufferRange)
>     // Use a size which is smaller than the alignment to check
>     // to check that this case is handle correctly in the conversion to 11.1.
>     glBindBufferRange(GL_UNIFORM_BUFFER, 0, mUniformBuffer, 0, vec4Size);
>-    drawQuad(mProgram, "position", 0.5f);
>+    drawQuad(mProgram, essl3_shaders::PositionAttrib(), 0.5f);
>     EXPECT_GL_NO_ERROR();
>     EXPECT_PIXEL_EQ(px, py, 10, 20, 30, 40);
> 
>@@ -156,7 +146,7 @@ TEST_P(UniformBufferTest, UniformBufferRange)
>     // (256 bytes) hence it will try to map the range [stride, 2 * stride] which is out-of-bound of
>     // the buffer bufferSize = stride + vec4Size < 2 * stride. Ensure that this behaviour works.
>     glBindBufferRange(GL_UNIFORM_BUFFER, 0, mUniformBuffer, stride, vec4Size);
>-    drawQuad(mProgram, "position", 0.5f);
>+    drawQuad(mProgram, essl3_shaders::PositionAttrib(), 0.5f);
>     EXPECT_GL_NO_ERROR();
>     EXPECT_PIXEL_EQ(px, py, 110, 120, 130, 140);
> }
>@@ -187,7 +177,7 @@ TEST_P(UniformBufferTest, UniformBufferBindings)
>     // Try to bind the buffer to binding point 2
>     glUniformBlockBinding(mProgram, mUniformBufferIndex, 2);
>     glBindBufferBase(GL_UNIFORM_BUFFER, 2, mUniformBuffer);
>-    drawQuad(mProgram, "position", 0.5f);
>+    drawQuad(mProgram, essl3_shaders::PositionAttrib(), 0.5f);
>     EXPECT_GL_NO_ERROR();
>     EXPECT_PIXEL_EQ(px, py, 10, 20, 30, 40);
> 
>@@ -199,21 +189,20 @@ TEST_P(UniformBufferTest, UniformBufferBindings)
>     // Try to bind the buffer to another binding point
>     glUniformBlockBinding(mProgram, mUniformBufferIndex, 5);
>     glBindBufferBase(GL_UNIFORM_BUFFER, 5, mUniformBuffer);
>-    drawQuad(mProgram, "position", 0.5f);
>+    drawQuad(mProgram, essl3_shaders::PositionAttrib(), 0.5f);
>     EXPECT_GL_NO_ERROR();
>     EXPECT_PIXEL_EQ(px, py, 10, 20, 30, 40);
> }
> 
>-// Test that ANGLE handles used but unbound UBO.
>-// TODO: A test case shouldn't depend on the error code of an undefined behaviour. Move this to unit
>-// tests of the validation layer.
>-TEST_P(UniformBufferTest, UnboundUniformBuffer)
>+// Test that ANGLE handles used but unbound UBO. Assumes we are running on ANGLE and produce
>+// optional but not mandatory errors.
>+TEST_P(UniformBufferTest, ANGLEUnboundUniformBuffer)
> {
>     glUniformBlockBinding(mProgram, mUniformBufferIndex, 0);
>     glBindBufferBase(GL_UNIFORM_BUFFER, 0, 0);
>     EXPECT_GL_NO_ERROR();
> 
>-    drawQuad(mProgram, "position", 0.5f);
>+    drawQuad(mProgram, essl3_shaders::PositionAttrib(), 0.5f);
>     EXPECT_GL_ERROR(GL_INVALID_OPERATION);
> }
> 
>@@ -221,12 +210,8 @@ TEST_P(UniformBufferTest, UnboundUniformBuffer)
> // https://code.google.com/p/angleproject/issues/detail?id=965
> TEST_P(UniformBufferTest, UniformBufferManyUpdates)
> {
>-    // TODO(jmadill): Figure out why this fails on Intel OpenGL.
>-    if (IsIntel() && IsOpenGL())
>-    {
>-        std::cout << "Test skipped on Intel OpenGL." << std::endl;
>-        return;
>-    }
>+    // TODO(jmadill): Figure out why this fails on OSX Intel OpenGL.
>+    ANGLE_SKIP_TEST_IF(IsIntel() && IsOSX() && IsOpenGL());
> 
>     int px = getWindowWidth() / 2;
>     int py = getWindowHeight() / 2;
>@@ -252,7 +237,7 @@ TEST_P(UniformBufferTest, UniformBufferManyUpdates)
> 
>         glBufferSubData(GL_UNIFORM_BUFFER, 0, sizeof(data), data);
> 
>-        drawQuad(mProgram, "position", 0.5f);
>+        drawQuad(mProgram, essl3_shaders::PositionAttrib(), 0.5f);
>         EXPECT_GL_NO_ERROR();
>         EXPECT_PIXEL_EQ(px, py, i + 10, i + 20, i + 30, i + 40);
>     }
>@@ -310,7 +295,7 @@ TEST_P(UniformBufferTest, ManyUniformBufferRange)
>     for (size_t i = 0; i < 8; ++i)
>     {
>         glBindBufferRange(GL_UNIFORM_BUFFER, 0, mUniformBuffer, i * stride, stride);
>-        drawQuad(mProgram, "position", 0.5f);
>+        drawQuad(mProgram, essl3_shaders::PositionAttrib(), 0.5f);
>         EXPECT_GL_NO_ERROR();
>         EXPECT_PIXEL_EQ(px, py, 10 + i, 20 + i, 30 + i, 40 + i);
>     }
>@@ -319,7 +304,7 @@ TEST_P(UniformBufferTest, ManyUniformBufferRange)
>     for (size_t i = 0; i < 7; ++i)
>     {
>         glBindBufferRange(GL_UNIFORM_BUFFER, 0, mUniformBuffer, i * stride, 2 * stride);
>-        drawQuad(mProgram, "position", 0.5f);
>+        drawQuad(mProgram, essl3_shaders::PositionAttrib(), 0.5f);
>         EXPECT_GL_NO_ERROR();
>         EXPECT_PIXEL_EQ(px, py, 10 + i, 20 + i, 30 + i, 40 + i);
>     }
>@@ -328,7 +313,7 @@ TEST_P(UniformBufferTest, ManyUniformBufferRange)
>     for (size_t i = 0; i < 5; ++i)
>     {
>         glBindBufferRange(GL_UNIFORM_BUFFER, 0, mUniformBuffer, i * stride, 4 * stride);
>-        drawQuad(mProgram, "position", 0.5f);
>+        drawQuad(mProgram, essl3_shaders::PositionAttrib(), 0.5f);
>         EXPECT_GL_NO_ERROR();
>         EXPECT_PIXEL_EQ(px, py, 10 + i, 20 + i, 30 + i, 40 + i);
>     }
>@@ -337,7 +322,7 @@ TEST_P(UniformBufferTest, ManyUniformBufferRange)
> // Tests that active uniforms have the right names.
> TEST_P(UniformBufferTest, ActiveUniformNames)
> {
>-    const std::string &vertexShaderSource =
>+    constexpr char kVS[] =
>         "#version 300 es\n"
>         "in vec2 position;\n"
>         "out vec2 v;\n"
>@@ -352,7 +337,7 @@ TEST_P(UniformBufferTest, ActiveUniformNames)
>         "  gl_Position = vec4(position, 0, 1);\n"
>         "}";
> 
>-    const std::string &fragmentShaderSource =
>+    constexpr char kFS[] =
>         "#version 300 es\n"
>         "precision highp float;\n"
>         "in vec2 v;\n"
>@@ -361,8 +346,7 @@ TEST_P(UniformBufferTest, ActiveUniformNames)
>         "  color = vec4(v, 0, 1);\n"
>         "}";
> 
>-    GLuint program = CompileProgram(vertexShaderSource, fragmentShaderSource);
>-    ASSERT_NE(0u, program);
>+    ANGLE_GL_PROGRAM(program, kVS, kFS);
> 
>     GLint activeUniformBlocks;
>     glGetProgramiv(program, GL_ACTIVE_UNIFORM_BLOCKS, &activeUniformBlocks);
>@@ -411,7 +395,7 @@ TEST_P(UniformBufferTest, ActiveUniformNames)
> // Tests active uniforms and blocks when the layout is std140, shared and packed.
> TEST_P(UniformBufferTest, ActiveUniformNumberAndName)
> {
>-    const std::string &vertexShaderSource =
>+    constexpr char kVS[] =
>         "#version 300 es\n"
>         "in vec2 position;\n"
>         "out float v;\n"
>@@ -440,7 +424,7 @@ TEST_P(UniformBufferTest, ActiveUniformNumberAndName)
>         "  gl_Position = vec4(position, 0, 1);\n"
>         "}";
> 
>-    const std::string &fragmentShaderSource =
>+    constexpr char kFS[] =
>         "#version 300 es\n"
>         "precision highp float;\n"
>         "in float v;\n"
>@@ -449,7 +433,7 @@ TEST_P(UniformBufferTest, ActiveUniformNumberAndName)
>         "  color = vec4(v, 0, 0, 1);\n"
>         "}";
> 
>-    ANGLE_GL_PROGRAM(program, vertexShaderSource, fragmentShaderSource);
>+    ANGLE_GL_PROGRAM(program, kVS, kFS);
> 
>     // Note that the packed |blockName3| might (or might not) be optimized out.
>     GLint activeUniforms;
>@@ -583,7 +567,7 @@ TEST_P(UniformBufferTest, VeryLarge)
>     glBindBufferBase(GL_UNIFORM_BUFFER, 0, mUniformBuffer);
> 
>     glUniformBlockBinding(mProgram, mUniformBufferIndex, 0);
>-    drawQuad(mProgram, "position", 0.5f);
>+    drawQuad(mProgram, essl3_shaders::PositionAttrib(), 0.5f);
> 
>     ASSERT_GL_NO_ERROR();
>     EXPECT_PIXEL_NEAR(0, 0, 128, 191, 64, 255, 1);
>@@ -607,7 +591,7 @@ TEST_P(UniformBufferTest, VeryLargeReadback)
>     glBufferData(GL_UNIFORM_BUFFER, bigSize, expectedData.data(), GL_STATIC_DRAW);
> 
>     // Do a small update.
>-    GLsizei smallSize = sizeof(float) * 4;
>+    GLsizei smallSize              = sizeof(float) * 4;
>     std::array<float, 4> floatData = {{0.5f, 0.75f, 0.25f, 1.0f}};
>     memcpy(expectedData.data(), floatData.data(), smallSize);
> 
>@@ -616,7 +600,7 @@ TEST_P(UniformBufferTest, VeryLargeReadback)
>     // Draw with the buffer.
>     glBindBufferBase(GL_UNIFORM_BUFFER, 0, mUniformBuffer);
>     glUniformBlockBinding(mProgram, mUniformBufferIndex, 0);
>-    drawQuad(mProgram, "position", 0.5f);
>+    drawQuad(mProgram, essl3_shaders::PositionAttrib(), 0.5f);
> 
>     ASSERT_GL_NO_ERROR();
>     EXPECT_PIXEL_NEAR(0, 0, 128, 191, 64, 255, 1);
>@@ -664,21 +648,21 @@ TEST_P(UniformBufferTest31, MaxUniformBufferBindingsExceeded)
>              "{\n"
>              "    gl_Position = position;\n"
>              "}";
>-    GLuint shader = CompileShader(GL_VERTEX_SHADER, source);
>+    GLuint shader = CompileShader(GL_VERTEX_SHADER, source.c_str());
>     EXPECT_EQ(0u, shader);
> }
> 
> // Test uniform block bindings specified by layout in shader work properly.
> TEST_P(UniformBufferTest31, UniformBufferBindings)
> {
>-    const std::string &vertexShaderSource =
>+    constexpr char kVS[] =
>         "#version 310 es\n"
>         "in vec4 position;\n"
>         "void main()\n"
>         "{\n"
>         "    gl_Position = position;\n"
>         "}";
>-    const std::string &fragmentShaderSource =
>+    constexpr char kFS[] =
>         "#version 310 es\n"
>         "precision highp float;\n"
>         "layout(binding = 2) uniform uni {\n"
>@@ -690,7 +674,7 @@ TEST_P(UniformBufferTest31, UniformBufferBindings)
>         "    fragColor = color;\n"
>         "}";
> 
>-    ANGLE_GL_PROGRAM(program, vertexShaderSource, fragmentShaderSource);
>+    ANGLE_GL_PROGRAM(program, kVS, kFS);
>     GLuint uniformBufferIndex = glGetUniformBlockIndex(program, "uni");
>     ASSERT_NE(GL_INVALID_INDEX, uniformBufferIndex);
>     GLBuffer uniformBuffer;
>@@ -736,14 +720,7 @@ TEST_P(UniformBufferTest31, UniformBufferBindings)
> // Test uniform blocks used as instanced array take next binding point for each subsequent element.
> TEST_P(UniformBufferTest31, ConsecutiveBindingsForBlockArray)
> {
>-    const std::string &vertexShaderSource =
>-        "#version 310 es\n"
>-        "in vec4 position;\n"
>-        "void main()\n"
>-        "{\n"
>-        "    gl_Position = position;\n"
>-        "}";
>-    const std::string &fragmentShaderSource =
>+    constexpr char kFS[] =
>         "#version 310 es\n"
>         "precision highp float;\n"
>         "layout(binding = 2) uniform uni {\n"
>@@ -755,7 +732,7 @@ TEST_P(UniformBufferTest31, ConsecutiveBindingsForBlockArray)
>         "    fragColor = blocks[0].color + blocks[1].color;\n"
>         "}";
> 
>-    ANGLE_GL_PROGRAM(program, vertexShaderSource, fragmentShaderSource);
>+    ANGLE_GL_PROGRAM(program, essl31_shaders::vs::Simple(), kFS);
>     std::array<GLBuffer, 2> uniformBuffers;
> 
>     int px = getWindowWidth() / 2;
>@@ -783,7 +760,7 @@ TEST_P(UniformBufferTest31, ConsecutiveBindingsForBlockArray)
>     EXPECT_GL_NO_ERROR();
>     glBindBufferBase(GL_UNIFORM_BUFFER, 3, uniformBuffers[1].get());
> 
>-    drawQuad(program, "position", 0.5f);
>+    drawQuad(program, essl31_shaders::PositionAttrib(), 0.5f);
>     EXPECT_GL_NO_ERROR();
>     EXPECT_PIXEL_EQ(px, py, 20, 40, 60, 80);
> }
>@@ -791,7 +768,7 @@ TEST_P(UniformBufferTest31, ConsecutiveBindingsForBlockArray)
> // Test the layout qualifier binding must be both specified(ESSL 3.10.4 section 9.2).
> TEST_P(UniformBufferTest31, BindingMustBeBothSpecified)
> {
>-    const std::string &vertexShaderSource =
>+    constexpr char kVS[] =
>         "#version 310 es\n"
>         "in vec4 position;\n"
>         "uniform uni\n"
>@@ -802,7 +779,7 @@ TEST_P(UniformBufferTest31, BindingMustBeBothSpecified)
>         "{\n"
>         "    gl_Position = position + block.color;\n"
>         "}";
>-    const std::string &fragmentShaderSource =
>+    constexpr char kFS[] =
>         "#version 310 es\n"
>         "precision highp float;\n"
>         "layout(binding = 0) uniform uni\n"
>@@ -814,14 +791,14 @@ TEST_P(UniformBufferTest31, BindingMustBeBothSpecified)
>         "{\n"
>         "    fragColor = block.color;\n"
>         "}";
>-    GLuint program = CompileProgram(vertexShaderSource, fragmentShaderSource);
>+    GLuint program = CompileProgram(kVS, kFS);
>     ASSERT_EQ(0u, program);
> }
> 
> // Test with a block containing an array of structs.
> TEST_P(UniformBufferTest, BlockContainingArrayOfStructs)
> {
>-    const std::string &fragmentShader =
>+    constexpr char kFS[] =
>         "#version 300 es\n"
>         "precision highp float;\n"
>         "out vec4 my_FragColor;\n"
>@@ -844,7 +821,7 @@ TEST_P(UniformBufferTest, BlockContainingArrayOfStructs)
>         "    my_FragColor = lighting;\n"
>         "}\n";
> 
>-    ANGLE_GL_PROGRAM(program, mVertexShaderSource, fragmentShader);
>+    ANGLE_GL_PROGRAM(program, essl3_shaders::vs::Simple(), kFS);
>     GLint uniformBufferIndex = glGetUniformBlockIndex(program, "lightData");
> 
>     glBindBuffer(GL_UNIFORM_BUFFER, mUniformBuffer);
>@@ -862,14 +839,14 @@ TEST_P(UniformBufferTest, BlockContainingArrayOfStructs)
> 
>     glBindBufferBase(GL_UNIFORM_BUFFER, 0, mUniformBuffer);
>     glUniformBlockBinding(program, uniformBufferIndex, 0);
>-    drawQuad(program.get(), "position", 0.5f);
>+    drawQuad(program.get(), essl3_shaders::PositionAttrib(), 0.5f);
>     EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::green);
> }
> 
> // Test with a block instance array containing an array of structs.
> TEST_P(UniformBufferTest, BlockArrayContainingArrayOfStructs)
> {
>-    const std::string &fragmentShader =
>+    constexpr char kFS[] =
>         R"(#version 300 es
> 
>         precision highp float;
>@@ -893,7 +870,7 @@ TEST_P(UniformBufferTest, BlockArrayContainingArrayOfStructs)
>             my_FragColor = lighting;
>         })";
> 
>-    ANGLE_GL_PROGRAM(program, mVertexShaderSource, fragmentShader);
>+    ANGLE_GL_PROGRAM(program, essl3_shaders::vs::Simple(), kFS);
>     GLint uniformBufferIndex  = glGetUniformBlockIndex(program, "lightData[0]");
>     GLint uniformBuffer2Index = glGetUniformBlockIndex(program, "lightData[1]");
> 
>@@ -922,14 +899,14 @@ TEST_P(UniformBufferTest, BlockArrayContainingArrayOfStructs)
>     glBindBufferBase(GL_UNIFORM_BUFFER, 1, uniformBuffer2);
>     glUniformBlockBinding(program, uniformBufferIndex, 0);
>     glUniformBlockBinding(program, uniformBuffer2Index, 1);
>-    drawQuad(program.get(), "position", 0.5f);
>+    drawQuad(program.get(), essl3_shaders::PositionAttrib(), 0.5f);
>     EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::green);
> }
> 
> // Test with a block containing an array of structs containing arrays.
> TEST_P(UniformBufferTest, BlockContainingArrayOfStructsContainingArrays)
> {
>-    const std::string &fragmentShader =
>+    constexpr char kFS[] =
>         R"(#version 300 es
>         precision highp float;
>         out vec4 my_FragColor;
>@@ -951,7 +928,7 @@ TEST_P(UniformBufferTest, BlockContainingArrayOfStructsContainingArrays)
>             my_FragColor = lighting;
>         })";
> 
>-    ANGLE_GL_PROGRAM(program, mVertexShaderSource, fragmentShader);
>+    ANGLE_GL_PROGRAM(program, essl3_shaders::vs::Simple(), kFS);
>     GLint uniformBufferIndex = glGetUniformBlockIndex(program, "lightData");
> 
>     glBindBuffer(GL_UNIFORM_BUFFER, mUniformBuffer);
>@@ -970,14 +947,14 @@ TEST_P(UniformBufferTest, BlockContainingArrayOfStructsContainingArrays)
>     glBufferData(GL_UNIFORM_BUFFER, kDataSize, v.data(), GL_STATIC_DRAW);
>     glBindBufferBase(GL_UNIFORM_BUFFER, 0, mUniformBuffer);
>     glUniformBlockBinding(program, uniformBufferIndex, 0);
>-    drawQuad(program.get(), "position", 0.5f);
>+    drawQuad(program.get(), essl3_shaders::PositionAttrib(), 0.5f);
>     EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::green);
> }
> 
> // Test with a block containing nested structs.
> TEST_P(UniformBufferTest, BlockContainingNestedStructs)
> {
>-    const std::string &fragmentShader =
>+    constexpr char kFS[] =
>         "#version 300 es\n"
>         "precision highp float;\n"
>         "out vec4 my_FragColor;\n"
>@@ -1003,7 +980,7 @@ TEST_P(UniformBufferTest, BlockContainingNestedStructs)
>         "    my_FragColor = lighting;\n"
>         "}\n";
> 
>-    ANGLE_GL_PROGRAM(program, mVertexShaderSource, fragmentShader);
>+    ANGLE_GL_PROGRAM(program, essl3_shaders::vs::Simple(), kFS);
>     GLint uniformBufferIndex = glGetUniformBlockIndex(program, "lightData");
> 
>     glBindBuffer(GL_UNIFORM_BUFFER, mUniformBuffer);
>@@ -1019,7 +996,7 @@ TEST_P(UniformBufferTest, BlockContainingNestedStructs)
>     glBufferData(GL_UNIFORM_BUFFER, kDataSize, v.data(), GL_STATIC_DRAW);
>     glBindBufferBase(GL_UNIFORM_BUFFER, 0, mUniformBuffer);
>     glUniformBlockBinding(program, uniformBufferIndex, 0);
>-    drawQuad(program.get(), "position", 0.5f);
>+    drawQuad(program.get(), essl3_shaders::PositionAttrib(), 0.5f);
>     EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::green);
> }
> 
>@@ -1034,7 +1011,7 @@ TEST_P(UniformBufferTest, GetUniformBlockIndexDefaultReturn)
> // Block names can be reserved names in GLSL, as long as they're not reserved in GLSL ES.
> TEST_P(UniformBufferTest, UniformBlockReservedOpenGLName)
> {
>-    const std::string &fragmentShader =
>+    constexpr char kFS[] =
>         "#version 300 es\n"
>         "precision highp float;\n"
>         "out vec4 my_FragColor;\n"
>@@ -1044,7 +1021,7 @@ TEST_P(UniformBufferTest, UniformBlockReservedOpenGLName)
>         "    my_FragColor = color;\n"
>         "}\n";
> 
>-    ANGLE_GL_PROGRAM(program, mVertexShaderSource, fragmentShader);
>+    ANGLE_GL_PROGRAM(program, essl3_shaders::vs::Simple(), kFS);
>     GLint uniformBufferIndex = glGetUniformBlockIndex(program, "buffer");
> 
>     glBindBuffer(GL_UNIFORM_BUFFER, mUniformBuffer);
>@@ -1060,14 +1037,14 @@ TEST_P(UniformBufferTest, UniformBlockReservedOpenGLName)
>     glBufferData(GL_UNIFORM_BUFFER, kDataSize, v.data(), GL_STATIC_DRAW);
>     glBindBufferBase(GL_UNIFORM_BUFFER, 0, mUniformBuffer);
>     glUniformBlockBinding(program, uniformBufferIndex, 0);
>-    drawQuad(program.get(), "position", 0.5f);
>+    drawQuad(program.get(), essl3_shaders::PositionAttrib(), 0.5f);
>     EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::green);
> }
> 
> // Block instance names can be reserved names in GLSL, as long as they're not reserved in GLSL ES.
> TEST_P(UniformBufferTest, UniformBlockInstanceReservedOpenGLName)
> {
>-    const std::string &fragmentShader =
>+    constexpr char kFS[] =
>         "#version 300 es\n"
>         "precision highp float;\n"
>         "out vec4 my_FragColor;\n"
>@@ -1077,7 +1054,7 @@ TEST_P(UniformBufferTest, UniformBlockInstanceReservedOpenGLName)
>         "    my_FragColor = buffer.color;\n"
>         "}\n";
> 
>-    ANGLE_GL_PROGRAM(program, mVertexShaderSource, fragmentShader);
>+    ANGLE_GL_PROGRAM(program, essl3_shaders::vs::Simple(), kFS);
>     GLint uniformBufferIndex = glGetUniformBlockIndex(program, "dmat2");
> 
>     glBindBuffer(GL_UNIFORM_BUFFER, mUniformBuffer);
>@@ -1093,7 +1070,7 @@ TEST_P(UniformBufferTest, UniformBlockInstanceReservedOpenGLName)
>     glBufferData(GL_UNIFORM_BUFFER, kDataSize, v.data(), GL_STATIC_DRAW);
>     glBindBufferBase(GL_UNIFORM_BUFFER, 0, mUniformBuffer);
>     glUniformBlockBinding(program, uniformBufferIndex, 0);
>-    drawQuad(program.get(), "position", 0.5f);
>+    drawQuad(program.get(), essl3_shaders::PositionAttrib(), 0.5f);
>     EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::green);
> }
> 
>@@ -1107,7 +1084,7 @@ TEST_P(UniformBufferTest, Std140UniformBlockInstanceWithNestedStructsContainingV
>     // http://anglebug.com/2217
>     ANGLE_SKIP_TEST_IF(IsAndroid() && !IsNVIDIA());
> 
>-    const std::string &fragmentShader =
>+    constexpr char kFS[] =
>         R"(#version 300 es
> 
>         precision highp float;
>@@ -1134,7 +1111,7 @@ TEST_P(UniformBufferTest, Std140UniformBlockInstanceWithNestedStructsContainingV
>             accessStruct(buffer.s);
>         })";
> 
>-    ANGLE_GL_PROGRAM(program, mVertexShaderSource, fragmentShader);
>+    ANGLE_GL_PROGRAM(program, essl3_shaders::vs::Simple(), kFS);
>     GLint uniformBufferIndex = glGetUniformBlockIndex(program, "structBuffer");
> 
>     glBindBuffer(GL_UNIFORM_BUFFER, mUniformBuffer);
>@@ -1152,7 +1129,7 @@ TEST_P(UniformBufferTest, Std140UniformBlockInstanceWithNestedStructsContainingV
>     glBufferData(GL_UNIFORM_BUFFER, kDataSize, v.data(), GL_STATIC_DRAW);
>     glBindBufferBase(GL_UNIFORM_BUFFER, 0, mUniformBuffer);
>     glUniformBlockBinding(program, uniformBufferIndex, 0);
>-    drawQuad(program.get(), "position", 0.5f);
>+    drawQuad(program.get(), essl3_shaders::PositionAttrib(), 0.5f);
>     EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::green);
> }
> 
>@@ -1160,21 +1137,21 @@ TEST_P(UniformBufferTest, Std140UniformBlockInstanceWithNestedStructsContainingV
> // This covers a bug in ANGLE's D3D back-end.
> TEST_P(UniformBufferTest, DetachShaders)
> {
>-    GLuint vertexShader = CompileShader(GL_VERTEX_SHADER, mVertexShaderSource);
>+    GLuint vertexShader = CompileShader(GL_VERTEX_SHADER, essl3_shaders::vs::Simple());
>     ASSERT_NE(0u, vertexShader);
>-    GLuint fragmentShader = CompileShader(GL_FRAGMENT_SHADER, mFragmentShaderSource);
>-    ASSERT_NE(0u, fragmentShader);
>+    GLuint kFS = CompileShader(GL_FRAGMENT_SHADER, mkFS);
>+    ASSERT_NE(0u, kFS);
> 
>     GLuint program = glCreateProgram();
>     glAttachShader(program, vertexShader);
>-    glAttachShader(program, fragmentShader);
>+    glAttachShader(program, kFS);
> 
>     ASSERT_TRUE(LinkAttachedProgram(program));
> 
>     glDetachShader(program, vertexShader);
>-    glDetachShader(program, fragmentShader);
>+    glDetachShader(program, kFS);
>     glDeleteShader(vertexShader);
>-    glDeleteShader(fragmentShader);
>+    glDeleteShader(kFS);
> 
>     glClear(GL_COLOR_BUFFER_BIT);
>     float floatData[4] = {0.5f, 0.75f, 0.25f, 1.0f};
>@@ -1188,7 +1165,7 @@ TEST_P(UniformBufferTest, DetachShaders)
>     ASSERT_NE(uniformBufferIndex, -1);
> 
>     glUniformBlockBinding(program, uniformBufferIndex, 0);
>-    drawQuad(program, "position", 0.5f);
>+    drawQuad(program, essl3_shaders::PositionAttrib(), 0.5f);
> 
>     ASSERT_GL_NO_ERROR();
>     EXPECT_PIXEL_NEAR(0, 0, 128, 191, 64, 255, 1);
>@@ -1196,13 +1173,356 @@ TEST_P(UniformBufferTest, DetachShaders)
>     glDeleteProgram(program);
> }
> 
>-// Use this to select which configurations (e.g. which renderer, which GLES major version) these tests should be run against.
>+// Test a uniform block where the whole block is set as row-major.
>+TEST_P(UniformBufferTest, Std140UniformBlockWithRowMajorQualifier)
>+{
>+    // AMD OpenGL driver doesn't seem to apply the row-major qualifier right.
>+    // http://anglebug.com/2273
>+    ANGLE_SKIP_TEST_IF(IsAMD() && IsOpenGL());
>+
>+    constexpr char kFS[] =
>+        R"(#version 300 es
>+
>+        precision highp float;
>+        out vec4 my_FragColor;
>+
>+        layout(std140, row_major) uniform matrixBuffer
>+        {
>+            mat2 m;
>+        } buffer;
>+
>+        void main()
>+        {
>+            // Vector constructor accesses elements in column-major order.
>+            my_FragColor = vec4(buffer.m);
>+        })";
>+
>+    ANGLE_GL_PROGRAM(program, essl3_shaders::vs::Simple(), kFS);
>+    GLint uniformBufferIndex = glGetUniformBlockIndex(program, "matrixBuffer");
>+
>+    glBindBuffer(GL_UNIFORM_BUFFER, mUniformBuffer);
>+    const GLsizei kElementsPerMatrix = 8;  // Each mat2 row gets padded into a vec4.
>+    const GLsizei kBytesPerElement   = 4;
>+    const GLsizei kDataSize          = kElementsPerMatrix * kBytesPerElement;
>+    std::vector<GLubyte> v(kDataSize, 0);
>+    float *vAsFloat = reinterpret_cast<float *>(v.data());
>+
>+    vAsFloat[0u] = 1.0f;
>+    vAsFloat[1u] = 128.0f / 255.0f;
>+    vAsFloat[4u] = 64.0f / 255.0f;
>+    vAsFloat[5u] = 32.0f / 255.0f;
>+
>+    glBufferData(GL_UNIFORM_BUFFER, kDataSize, v.data(), GL_STATIC_DRAW);
>+    glBindBufferBase(GL_UNIFORM_BUFFER, 0, mUniformBuffer);
>+    glUniformBlockBinding(program, uniformBufferIndex, 0);
>+    drawQuad(program.get(), essl3_shaders::PositionAttrib(), 0.5f);
>+    ASSERT_GL_NO_ERROR();
>+    EXPECT_PIXEL_COLOR_NEAR(0, 0, GLColor(255, 64, 128, 32), 5);
>+}
>+
>+// Test a uniform block where an individual matrix field is set as row-major whereas the whole block
>+// is set as column-major.
>+TEST_P(UniformBufferTest, Std140UniformBlockWithPerMemberRowMajorQualifier)
>+{
>+    // AMD OpenGL driver doesn't seem to apply the row-major qualifier right.
>+    // http://anglebug.com/2273
>+    ANGLE_SKIP_TEST_IF(IsAMD() && IsOpenGL());
>+
>+    constexpr char kFS[] =
>+        R"(#version 300 es
>+
>+        precision highp float;
>+        out vec4 my_FragColor;
>+
>+        layout(std140, column_major) uniform matrixBuffer
>+        {
>+            layout(row_major) mat2 m;
>+        } buffer;
>+
>+        void main()
>+        {
>+            // Vector constructor accesses elements in column-major order.
>+            my_FragColor = vec4(buffer.m);
>+        })";
>+
>+    ANGLE_GL_PROGRAM(program, essl3_shaders::vs::Simple(), kFS);
>+    GLint uniformBufferIndex = glGetUniformBlockIndex(program, "matrixBuffer");
>+
>+    glBindBuffer(GL_UNIFORM_BUFFER, mUniformBuffer);
>+    const GLsizei kElementsPerMatrix = 8;  // Each mat2 row gets padded into a vec4.
>+    const GLsizei kBytesPerElement   = 4;
>+    const GLsizei kDataSize          = kElementsPerMatrix * kBytesPerElement;
>+    std::vector<GLubyte> v(kDataSize, 0);
>+    float *vAsFloat = reinterpret_cast<float *>(v.data());
>+
>+    vAsFloat[0u] = 1.0f;
>+    vAsFloat[1u] = 128.0f / 255.0f;
>+    vAsFloat[4u] = 64.0f / 255.0f;
>+    vAsFloat[5u] = 32.0f / 255.0f;
>+
>+    glBufferData(GL_UNIFORM_BUFFER, kDataSize, v.data(), GL_STATIC_DRAW);
>+    glBindBufferBase(GL_UNIFORM_BUFFER, 0, mUniformBuffer);
>+    glUniformBlockBinding(program, uniformBufferIndex, 0);
>+    drawQuad(program.get(), essl3_shaders::PositionAttrib(), 0.5f);
>+    ASSERT_GL_NO_ERROR();
>+    EXPECT_PIXEL_COLOR_NEAR(0, 0, GLColor(255, 64, 128, 32), 5);
>+}
>+
>+// Test a uniform block where an individual matrix field is set as column-major whereas the whole
>+// block is set as row-major.
>+TEST_P(UniformBufferTest, Std140UniformBlockWithPerMemberColumnMajorQualifier)
>+{
>+    constexpr char kFS[] =
>+        R"(#version 300 es
>+
>+        precision highp float;
>+        out vec4 my_FragColor;
>+
>+        layout(std140, row_major) uniform matrixBuffer
>+        {
>+            // 2 columns, 3 rows.
>+            layout(column_major) mat2x3 m;
>+        } buffer;
>+
>+        void main()
>+        {
>+            // Vector constructor accesses elements in column-major order.
>+            my_FragColor = vec4(buffer.m);
>+        })";
>+
>+    ANGLE_GL_PROGRAM(program, essl3_shaders::vs::Simple(), kFS);
>+    GLint uniformBufferIndex = glGetUniformBlockIndex(program, "matrixBuffer");
>+
>+    glBindBuffer(GL_UNIFORM_BUFFER, mUniformBuffer);
>+    const GLsizei kElementsPerMatrix = 8;  // Each mat2x3 column gets padded into a vec4.
>+    const GLsizei kBytesPerElement   = 4;
>+    const GLsizei kDataSize          = kElementsPerMatrix * kBytesPerElement;
>+    std::vector<GLubyte> v(kDataSize, 0);
>+    float *vAsFloat = reinterpret_cast<float *>(v.data());
>+
>+    vAsFloat[0u] = 1.0f;
>+    vAsFloat[1u] = 192.0f / 255.0f;
>+    vAsFloat[2u] = 128.0f / 255.0f;
>+    vAsFloat[4u] = 96.0f / 255.0f;
>+    vAsFloat[5u] = 64.0f / 255.0f;
>+    vAsFloat[6u] = 32.0f / 255.0f;
>+
>+    glBufferData(GL_UNIFORM_BUFFER, kDataSize, v.data(), GL_STATIC_DRAW);
>+    glBindBufferBase(GL_UNIFORM_BUFFER, 0, mUniformBuffer);
>+    glUniformBlockBinding(program, uniformBufferIndex, 0);
>+    drawQuad(program.get(), essl3_shaders::PositionAttrib(), 0.5f);
>+    ASSERT_GL_NO_ERROR();
>+    EXPECT_PIXEL_COLOR_NEAR(0, 0, GLColor(255, 192, 128, 96), 5);
>+}
>+
>+// Test a uniform block where a struct field is set as row-major.
>+TEST_P(UniformBufferTest, Std140UniformBlockWithRowMajorQualifierOnStruct)
>+{
>+    // AMD OpenGL driver doesn't seem to apply the row-major qualifier right.
>+    // http://anglebug.com/2273
>+    ANGLE_SKIP_TEST_IF(IsAMD() && IsOpenGL());
>+
>+    constexpr char kFS[] =
>+        R"(#version 300 es
>+
>+        precision highp float;
>+        out vec4 my_FragColor;
>+
>+        struct S
>+        {
>+            mat2 m;
>+        };
>+
>+        layout(std140) uniform matrixBuffer
>+        {
>+            layout(row_major) S s;
>+        } buffer;
>+
>+        void main()
>+        {
>+            // Vector constructor accesses elements in column-major order.
>+            my_FragColor = vec4(buffer.s.m);
>+        })";
>+
>+    ANGLE_GL_PROGRAM(program, essl3_shaders::vs::Simple(), kFS);
>+    GLint uniformBufferIndex = glGetUniformBlockIndex(program, "matrixBuffer");
>+
>+    glBindBuffer(GL_UNIFORM_BUFFER, mUniformBuffer);
>+    const GLsizei kElementsPerMatrix = 8;  // Each mat2 row gets padded into a vec4.
>+    const GLsizei kBytesPerElement   = 4;
>+    const GLsizei kDataSize          = kElementsPerMatrix * kBytesPerElement;
>+    std::vector<GLubyte> v(kDataSize, 0);
>+    float *vAsFloat = reinterpret_cast<float *>(v.data());
>+
>+    vAsFloat[0u] = 1.0f;
>+    vAsFloat[1u] = 128.0f / 255.0f;
>+    vAsFloat[4u] = 64.0f / 255.0f;
>+    vAsFloat[5u] = 32.0f / 255.0f;
>+
>+    glBufferData(GL_UNIFORM_BUFFER, kDataSize, v.data(), GL_STATIC_DRAW);
>+    glBindBufferBase(GL_UNIFORM_BUFFER, 0, mUniformBuffer);
>+    glUniformBlockBinding(program, uniformBufferIndex, 0);
>+    drawQuad(program.get(), essl3_shaders::PositionAttrib(), 0.5f);
>+    ASSERT_GL_NO_ERROR();
>+    EXPECT_PIXEL_COLOR_NEAR(0, 0, GLColor(255, 64, 128, 32), 5);
>+}
>+
>+constexpr char kFragmentShader[] = R"(#version 300 es
>+precision mediump float;
>+
>+layout (std140) uniform color_ubo
>+{
>+  vec4 color;
>+};
>+
>+out vec4 fragColor;
>+void main()
>+{
>+  fragColor = color;
>+})";
>+
>+// Regression test for a dirty bit bug in ANGLE. See http://crbug.com/792966
>+TEST_P(UniformBufferTest, SimpleBindingChange)
>+{
>+    // http://anglebug.com/2287
>+    ANGLE_SKIP_TEST_IF(IsOSX() && IsNVIDIA() && IsDesktopOpenGL());
>+
>+    ANGLE_GL_PROGRAM(program, essl3_shaders::vs::Simple(), kFragmentShader);
>+
>+    glBindAttribLocation(program, 0, essl3_shaders::PositionAttrib());
>+    glUseProgram(program);
>+    GLint uboIndex = glGetUniformBlockIndex(program, "color_ubo");
>+
>+    std::array<GLfloat, 12> vertices{{-1, -1, 0, 1, -1, 0, -1, 1, 0, 1, 1, 0}};
>+    GLBuffer vertexBuf;
>+    glBindBuffer(GL_ARRAY_BUFFER, vertexBuf);
>+    glBufferData(GL_ARRAY_BUFFER, vertices.size() * sizeof(GLfloat), vertices.data(),
>+                 GL_STATIC_DRAW);
>+    glEnableVertexAttribArray(0);
>+    glVertexAttribPointer(0, 3, GL_FLOAT, false, 0, 0);
>+
>+    std::array<GLshort, 12> indexData = {{0, 1, 2, 2, 1, 3, 0, 1, 2, 2, 1, 3}};
>+
>+    GLBuffer indexBuf;
>+    glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, indexBuf);
>+    glBufferData(GL_ELEMENT_ARRAY_BUFFER, indexData.size() * sizeof(GLshort), indexData.data(),
>+                 GL_STATIC_DRAW);
>+
>+    // Bind a first buffer with red.
>+    GLBuffer uboBuf1;
>+    glBindBufferBase(GL_UNIFORM_BUFFER, 0, uboBuf1);
>+    glBufferData(GL_UNIFORM_BUFFER, sizeof(GLColor32F), &kFloatRed, GL_STATIC_DRAW);
>+    glUniformBlockBinding(program, uboIndex, 0);
>+
>+    glDrawElements(GL_TRIANGLES, 6, GL_UNSIGNED_SHORT, 0);
>+
>+    // Bind a second buffer with green, updating the buffer binding.
>+    GLBuffer uboBuf2;
>+    glBindBufferBase(GL_UNIFORM_BUFFER, 1, uboBuf2);
>+    glBufferData(GL_UNIFORM_BUFFER, sizeof(GLColor32F), &kFloatGreen, GL_STATIC_DRAW);
>+    glUniformBlockBinding(program, uboIndex, 1);
>+
>+    glDrawElements(GL_TRIANGLES, 6, GL_UNSIGNED_SHORT, reinterpret_cast<const GLvoid *>(12));
>+
>+    // Verify we get the second buffer.
>+    ASSERT_GL_NO_ERROR();
>+    EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::green);
>+}
>+
>+// Regression test for a dirty bit bug in ANGLE. Same as above but for the indexed bindings.
>+TEST_P(UniformBufferTest, SimpleBufferChange)
>+{
>+    ANGLE_GL_PROGRAM(program, essl3_shaders::vs::Simple(), kFragmentShader);
>+
>+    glBindAttribLocation(program, 0, essl3_shaders::PositionAttrib());
>+    glUseProgram(program);
>+    GLint uboIndex = glGetUniformBlockIndex(program, "color_ubo");
>+
>+    std::array<GLfloat, 12> vertices{{-1, -1, 0, 1, -1, 0, -1, 1, 0, 1, 1, 0}};
>+    GLBuffer vertexBuf;
>+    glBindBuffer(GL_ARRAY_BUFFER, vertexBuf);
>+    glBufferData(GL_ARRAY_BUFFER, vertices.size() * sizeof(GLfloat), vertices.data(),
>+                 GL_STATIC_DRAW);
>+    glEnableVertexAttribArray(0);
>+    glVertexAttribPointer(0, 3, GL_FLOAT, false, 0, 0);
>+
>+    std::array<GLshort, 12> indexData = {{0, 1, 2, 2, 1, 3, 0, 1, 2, 2, 1, 3}};
>+
>+    GLBuffer indexBuf;
>+    glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, indexBuf);
>+    glBufferData(GL_ELEMENT_ARRAY_BUFFER, indexData.size() * sizeof(GLshort), indexData.data(),
>+                 GL_STATIC_DRAW);
>+
>+    // Bind a first buffer with red.
>+    GLBuffer uboBuf1;
>+    glBindBufferBase(GL_UNIFORM_BUFFER, 0, uboBuf1);
>+    glBufferData(GL_UNIFORM_BUFFER, sizeof(GLColor32F), &kFloatRed, GL_STATIC_DRAW);
>+    glUniformBlockBinding(program, uboIndex, 0);
>+
>+    glDrawElements(GL_TRIANGLES, 6, GL_UNSIGNED_SHORT, 0);
>+
>+    // Bind a second buffer to the same binding point (0). This should set to draw green.
>+    GLBuffer uboBuf2;
>+    glBindBufferBase(GL_UNIFORM_BUFFER, 0, uboBuf2);
>+    glBufferData(GL_UNIFORM_BUFFER, sizeof(GLColor32F), &kFloatGreen, GL_STATIC_DRAW);
>+
>+    glDrawElements(GL_TRIANGLES, 6, GL_UNSIGNED_SHORT, reinterpret_cast<const GLvoid *>(12));
>+
>+    ASSERT_GL_NO_ERROR();
>+    EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::green);
>+}
>+
>+// Tests a bug in the D3D11 back-end where re-creating the buffer storage should trigger a state
>+// update in the State Manager class.
>+TEST_P(UniformBufferTest, DependentBufferChange)
>+{
>+    ANGLE_GL_PROGRAM(program, essl3_shaders::vs::Simple(), kFragmentShader);
>+
>+    glBindAttribLocation(program, 0, essl3_shaders::PositionAttrib());
>+    glUseProgram(program);
>+    GLint uboIndex = glGetUniformBlockIndex(program, "color_ubo");
>+
>+    std::array<GLfloat, 12> vertices{{-1, -1, 0, 1, -1, 0, -1, 1, 0, 1, 1, 0}};
>+    GLBuffer vertexBuf;
>+    glBindBuffer(GL_ARRAY_BUFFER, vertexBuf);
>+    glBufferData(GL_ARRAY_BUFFER, vertices.size() * sizeof(GLfloat), vertices.data(),
>+                 GL_STATIC_DRAW);
>+    glEnableVertexAttribArray(0);
>+    glVertexAttribPointer(0, 3, GL_FLOAT, false, 0, 0);
>+
>+    std::array<GLshort, 6> indexData = {{0, 1, 2, 2, 1, 3}};
>+
>+    GLBuffer indexBuf;
>+    glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, indexBuf);
>+    glBufferData(GL_ELEMENT_ARRAY_BUFFER, indexData.size() * sizeof(GLshort), indexData.data(),
>+                 GL_STATIC_DRAW);
>+
>+    GLBuffer ubo;
>+    glBindBufferBase(GL_UNIFORM_BUFFER, 0, ubo);
>+    glBufferData(GL_UNIFORM_BUFFER, sizeof(GLColor32F), &kFloatRed, GL_STATIC_DRAW);
>+    glUniformBlockBinding(program, uboIndex, 0);
>+
>+    glDrawElements(GL_TRIANGLES, 3, GL_UNSIGNED_SHORT, 0);
>+    ASSERT_GL_NO_ERROR();
>+    EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::red);
>+
>+    // Resize the buffer - triggers a re-allocation in the D3D11 back-end.
>+    std::vector<GLColor32F> bigData(128, kFloatGreen);
>+    glBufferData(GL_UNIFORM_BUFFER, sizeof(GLColor32F) * bigData.size(), bigData.data(),
>+                 GL_STATIC_DRAW);
>+
>+    glDrawElements(GL_TRIANGLES, 3, GL_UNSIGNED_SHORT, 0);
>+    ASSERT_GL_NO_ERROR();
>+    EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::green);
>+}
>+
>+// Use this to select which configurations (e.g. which renderer, which GLES major version) these
>+// tests should be run against.
> ANGLE_INSTANTIATE_TEST(UniformBufferTest,
>                        ES3_D3D11(),
>                        ES3_D3D11_FL11_1(),
>-                       ES3_D3D11_FL11_1_REFERENCE(),
>                        ES3_OPENGL(),
>                        ES3_OPENGLES());
> ANGLE_INSTANTIATE_TEST(UniformBufferTest31, ES31_D3D11(), ES31_OPENGL(), ES31_OPENGLES());
> 
>-} // namespace
>+}  // namespace
>diff --git a/Source/ThirdParty/ANGLE/src/tests/gl_tests/UniformTest.cpp b/Source/ThirdParty/ANGLE/src/tests/gl_tests/UniformTest.cpp
>index eee345486ce..6de5748ff5e 100644
>--- a/Source/ThirdParty/ANGLE/src/tests/gl_tests/UniformTest.cpp
>+++ b/Source/ThirdParty/ANGLE/src/tests/gl_tests/UniformTest.cpp
>@@ -15,6 +15,300 @@ using namespace angle;
> namespace
> {
> 
>+class SimpleUniformTest : public ANGLETest
>+{
>+  protected:
>+    SimpleUniformTest()
>+    {
>+        setWindowWidth(128);
>+        setWindowHeight(128);
>+        setConfigRedBits(8);
>+        setConfigGreenBits(8);
>+        setConfigBlueBits(8);
>+        setConfigAlphaBits(8);
>+    }
>+};
>+
>+// Test that we can get and set a float uniform successfully.
>+TEST_P(SimpleUniformTest, FloatUniformStateQuery)
>+{
>+    constexpr char kFragShader[] = R"(precision mediump float;
>+uniform float uniF;
>+void main() {
>+    gl_FragColor = vec4(uniF, 0.0, 0.0, 0.0);
>+})";
>+
>+    ANGLE_GL_PROGRAM(program, essl1_shaders::vs::Zero(), kFragShader);
>+    glUseProgram(program);
>+    GLint uniformLocation = glGetUniformLocation(program, "uniF");
>+    ASSERT_NE(uniformLocation, -1);
>+
>+    GLfloat expected = 1.02f;
>+    glUniform1f(uniformLocation, expected);
>+
>+    GLfloat f = 0.0f;
>+    glGetUniformfv(program, uniformLocation, &f);
>+    ASSERT_GL_NO_ERROR();
>+    ASSERT_EQ(f, expected);
>+}
>+
>+// Test that we can get and set an int uniform successfully.
>+TEST_P(SimpleUniformTest, IntUniformStateQuery)
>+{
>+    constexpr char kFragShader[] = R"(uniform int uniI;
>+void main() {
>+    gl_FragColor = vec4(uniI, 0.0, 0.0, 0.0);
>+})";
>+
>+    ANGLE_GL_PROGRAM(program, essl1_shaders::vs::Zero(), kFragShader);
>+    glUseProgram(program);
>+
>+    GLint uniformLocation = glGetUniformLocation(program, "uniI");
>+    ASSERT_NE(uniformLocation, -1);
>+
>+    GLint expected = 4;
>+    glUniform1i(uniformLocation, expected);
>+
>+    GLint i = 0;
>+    glGetUniformiv(program, uniformLocation, &i);
>+    ASSERT_GL_NO_ERROR();
>+    ASSERT_EQ(i, expected);
>+}
>+
>+// Test that we can get and set a vec2 uniform successfully.
>+TEST_P(SimpleUniformTest, FloatVec2UniformStateQuery)
>+{
>+    constexpr char kFragShader[] = R"(precision mediump float;
>+uniform vec2 uniVec2;
>+void main() {
>+    gl_FragColor = vec4(uniVec2, 0.0, 0.0);
>+})";
>+
>+    ANGLE_GL_PROGRAM(program, essl1_shaders::vs::Zero(), kFragShader);
>+    glUseProgram(program);
>+
>+    GLint uniformLocation = glGetUniformLocation(program, "uniVec2");
>+    ASSERT_NE(uniformLocation, -1);
>+
>+    std::vector<GLfloat> expected = {{1.0f, 0.5f}};
>+    glUniform2fv(uniformLocation, 1, expected.data());
>+
>+    std::vector<GLfloat> floats(2, 0);
>+    glGetUniformfv(program, uniformLocation, floats.data());
>+    ASSERT_GL_NO_ERROR();
>+    ASSERT_EQ(floats, expected);
>+}
>+
>+// Test that we can get and set a vec3 uniform successfully.
>+TEST_P(SimpleUniformTest, FloatVec3UniformStateQuery)
>+{
>+    constexpr char kFragShader[] = R"(precision mediump float;
>+uniform vec3 uniVec3;
>+void main() {
>+    gl_FragColor = vec4(uniVec3, 0.0);
>+})";
>+
>+    ANGLE_GL_PROGRAM(program, essl1_shaders::vs::Zero(), kFragShader);
>+    glUseProgram(program);
>+
>+    GLint uniformLocation = glGetUniformLocation(program, "uniVec3");
>+    ASSERT_NE(uniformLocation, -1);
>+
>+    std::vector<GLfloat> expected = {{1.0f, 0.5f, 0.2f}};
>+    glUniform3fv(uniformLocation, 1, expected.data());
>+
>+    std::vector<GLfloat> floats(3, 0);
>+    glGetUniformfv(program, uniformLocation, floats.data());
>+    ASSERT_GL_NO_ERROR();
>+    ASSERT_EQ(floats, expected);
>+}
>+
>+// Test that we can get and set a vec4 uniform successfully.
>+TEST_P(SimpleUniformTest, FloatVec4UniformStateQuery)
>+{
>+    constexpr char kFragShader[] = R"(precision mediump float;
>+uniform vec4 uniVec4;
>+void main() {
>+    gl_FragColor = uniVec4;
>+})";
>+
>+    ANGLE_GL_PROGRAM(program, essl1_shaders::vs::Zero(), kFragShader);
>+    glUseProgram(program);
>+
>+    GLint uniformLocation = glGetUniformLocation(program, "uniVec4");
>+    ASSERT_NE(uniformLocation, -1);
>+
>+    std::vector<GLfloat> expected = {{1.0f, 0.5f, 0.2f, -0.8f}};
>+    glUniform4fv(uniformLocation, 1, expected.data());
>+
>+    std::vector<GLfloat> floats(4, 0);
>+    glGetUniformfv(program, uniformLocation, floats.data());
>+    ASSERT_GL_NO_ERROR();
>+    ASSERT_EQ(floats, expected);
>+}
>+
>+// Test that we can get and set a 2x2 float Matrix uniform successfully.
>+TEST_P(SimpleUniformTest, FloatMatrix2UniformStateQuery)
>+{
>+    constexpr char kFragShader[] = R"(precision mediump float;
>+uniform mat2 umat2;
>+void main() {
>+    gl_FragColor = vec4(umat2);
>+})";
>+
>+    ANGLE_GL_PROGRAM(program, essl1_shaders::vs::Zero(), kFragShader);
>+    glUseProgram(program);
>+
>+    GLint uniformLocation = glGetUniformLocation(program, "umat2");
>+    ASSERT_NE(uniformLocation, -1);
>+
>+    std::vector<GLfloat> expected = {{1.0f, 0.5f, 0.2f, -0.8f}};
>+    glUniformMatrix2fv(uniformLocation, 1, false, expected.data());
>+
>+    std::vector<GLfloat> floats(4, 0);
>+    glGetUniformfv(program, uniformLocation, floats.data());
>+    ASSERT_GL_NO_ERROR();
>+    ASSERT_EQ(floats, expected);
>+}
>+
>+// Test that we can get and set a 3x3 float Matrix uniform successfully.
>+TEST_P(SimpleUniformTest, FloatMatrix3UniformStateQuery)
>+{
>+    constexpr char kFragShader[] = R"(precision mediump float;
>+uniform mat3 umat3;
>+void main() {
>+    gl_FragColor = vec4(umat3);
>+})";
>+
>+    ANGLE_GL_PROGRAM(program, essl1_shaders::vs::Zero(), kFragShader);
>+    glUseProgram(program);
>+
>+    GLint uniformLocation = glGetUniformLocation(program, "umat3");
>+    ASSERT_NE(uniformLocation, -1);
>+
>+    std::vector<GLfloat> expected = {{1.0f, 0.5f, 0.2f, -0.8f, -0.2f, 0.1f, 0.1f, 0.2f, 0.7f}};
>+    glUniformMatrix3fv(uniformLocation, 1, false, expected.data());
>+
>+    std::vector<GLfloat> floats(9, 0);
>+    glGetUniformfv(program, uniformLocation, floats.data());
>+    ASSERT_GL_NO_ERROR();
>+    ASSERT_EQ(floats, expected);
>+}
>+
>+// Test that we can get and set a 4x4 float Matrix uniform successfully.
>+TEST_P(SimpleUniformTest, FloatMatrix4UniformStateQuery)
>+{
>+    constexpr char kFragShader[] = R"(precision mediump float;
>+uniform mat4 umat4;
>+void main() {
>+    gl_FragColor = umat4 * vec4(1.0, 1.0, 1.0, 1.0);
>+})";
>+
>+    ANGLE_GL_PROGRAM(program, essl1_shaders::vs::Zero(), kFragShader);
>+    glUseProgram(program);
>+
>+    GLint uniformLocation = glGetUniformLocation(program, "umat4");
>+    ASSERT_NE(uniformLocation, -1);
>+
>+    std::vector<GLfloat> expected = {{1.0f, 0.5f, 0.2f, -0.8f, -0.2f, 0.1f, 0.1f, 0.2f, 0.7f, 0.1f,
>+                                      0.7f, 0.1f, 0.7f, 0.1f, 0.7f, 0.1f}};
>+    glUniformMatrix4fv(uniformLocation, 1, false, expected.data());
>+
>+    std::vector<GLfloat> floats(16, 0);
>+    glGetUniformfv(program, uniformLocation, floats.data());
>+    ASSERT_GL_NO_ERROR();
>+    ASSERT_EQ(floats, expected);
>+}
>+
>+// Test that we can get and set a float array of uniforms.
>+TEST_P(SimpleUniformTest, FloatArrayUniformStateQuery)
>+{
>+    constexpr char kFragShader[] = R"(
>+precision mediump float;
>+uniform float ufloats[4];
>+void main() {
>+    gl_FragColor = vec4(ufloats[0], ufloats[1], ufloats[2], ufloats[3]);
>+})";
>+
>+    ANGLE_GL_PROGRAM(program, essl1_shaders::vs::Zero(), kFragShader);
>+    glUseProgram(program);
>+    std::vector<GLfloat> expected = {{0.1f, 0.2f, 0.3f, 0.4f}};
>+
>+    for (size_t i = 0; i < expected.size(); i++)
>+    {
>+        std::string locationName = "ufloats[" + std::to_string(i) + "]";
>+        GLint uniformLocation    = glGetUniformLocation(program, locationName.c_str());
>+        glUniform1f(uniformLocation, expected[i]);
>+        ASSERT_GL_NO_ERROR();
>+        ASSERT_NE(uniformLocation, -1);
>+
>+        GLfloat result = 0;
>+        glGetUniformfv(program, uniformLocation, &result);
>+        ASSERT_GL_NO_ERROR();
>+        ASSERT_EQ(result, expected[i]);
>+    }
>+}
>+
>+// Test that we can get and set an array of matrices uniform.
>+TEST_P(SimpleUniformTest, ArrayOfMat3UniformStateQuery)
>+{
>+    constexpr char kFragShader[] = R"(
>+precision mediump float;
>+uniform mat3 umatarray[2];
>+void main() {
>+    gl_FragColor = vec4(umatarray[1]);
>+})";
>+
>+    ANGLE_GL_PROGRAM(program, essl1_shaders::vs::Zero(), kFragShader);
>+    glUseProgram(program);
>+    std::vector<std::vector<GLfloat>> expected = {
>+        {1.0f, 0.5f, 0.2f, -0.8f, -0.2f, 0.1f, 0.1f, 0.2f, 0.7f},
>+        {0.9f, 0.4f, 0.1f, -0.9f, -0.3f, 0.0f, 0.0f, 0.1f, 0.6f}};
>+
>+    for (size_t i = 0; i < expected.size(); i++)
>+    {
>+        std::string locationName = "umatarray[" + std::to_string(i) + "]";
>+        GLint uniformLocation    = glGetUniformLocation(program, locationName.c_str());
>+        glUniformMatrix3fv(uniformLocation, 1, false, expected[i].data());
>+        ASSERT_GL_NO_ERROR();
>+        ASSERT_NE(uniformLocation, -1);
>+
>+        std::vector<GLfloat> results(9, 0);
>+        glGetUniformfv(program, uniformLocation, results.data());
>+        ASSERT_GL_NO_ERROR();
>+        ASSERT_EQ(results, expected[i]);
>+    }
>+}
>+
>+// Test that we can get and set an int array of uniforms.
>+TEST_P(SimpleUniformTest, FloatIntUniformStateQuery)
>+{
>+    constexpr char kFragShader[] = R"(
>+precision mediump float;
>+uniform int uints[4];
>+void main() {
>+    gl_FragColor = vec4(uints[0], uints[1], uints[2], uints[3]);
>+})";
>+
>+    ANGLE_GL_PROGRAM(program, essl1_shaders::vs::Zero(), kFragShader);
>+    glUseProgram(program);
>+    std::vector<GLint> expected = {{1, 2, 3, 4}};
>+
>+    for (size_t i = 0; i < expected.size(); i++)
>+    {
>+        std::string locationName = "uints[" + std::to_string(i) + "]";
>+        GLint uniformLocation    = glGetUniformLocation(program, locationName.c_str());
>+        glUniform1i(uniformLocation, expected[i]);
>+        ASSERT_GL_NO_ERROR();
>+        ASSERT_NE(uniformLocation, -1);
>+
>+        GLint result = 0;
>+        glGetUniformiv(program, uniformLocation, &result);
>+        ASSERT_GL_NO_ERROR();
>+        ASSERT_EQ(result, expected[i]);
>+    }
>+}
>+
> class UniformTest : public ANGLETest
> {
>   protected:
>@@ -32,8 +326,8 @@ class UniformTest : public ANGLETest
>     {
>         ANGLETest::SetUp();
> 
>-        const std::string &vertexShader = "void main() { gl_Position = vec4(1); }";
>-        const std::string &fragShader =
>+        constexpr char kVS[] = "void main() { gl_Position = vec4(1); }";
>+        constexpr char kFS[] =
>             "precision mediump float;\n"
>             "uniform float uniF;\n"
>             "uniform int uniI;\n"
>@@ -48,7 +342,7 @@ class UniformTest : public ANGLETest
>             "  gl_FragColor += vec4(uniBArr[3] ? 1.0 : 0.0);\n"
>             "}";
> 
>-        mProgram = CompileProgram(vertexShader, fragShader);
>+        mProgram = CompileProgram(kVS, kFS);
>         ASSERT_NE(mProgram, 0u);
> 
>         mUniformFLocation = glGetUniformLocation(mProgram, "uniF");
>@@ -103,50 +397,39 @@ TEST_P(UniformTest, GetUniformNoCurrentProgram)
> 
> TEST_P(UniformTest, UniformArrayLocations)
> {
>-    // TODO(geofflang): Figure out why this is broken on Intel OpenGL
>-    if (IsIntel() && getPlatformRenderer() == EGL_PLATFORM_ANGLE_TYPE_OPENGL_ANGLE)
>-    {
>-        std::cout << "Test skipped on Intel OpenGL." << std::endl;
>-        return;
>-    }
>-
>-    const std::string vertexShader =
>-        R"(precision mediump float;
>-        uniform float uPosition[4];
>-        void main(void)
>-        {
>-            gl_Position = vec4(uPosition[0], uPosition[1], uPosition[2], uPosition[3]);
>-        })";
>+    constexpr char kVS[] = R"(precision mediump float;
>+uniform float uPosition[4];
>+void main(void)
>+{
>+    gl_Position = vec4(uPosition[0], uPosition[1], uPosition[2], uPosition[3]);
>+})";
> 
>-    const std::string fragShader =
>-        R"(precision mediump float;
>-        uniform float uColor[4];
>-        void main(void)
>-        {
>-            gl_FragColor = vec4(uColor[0], uColor[1], uColor[2], uColor[3]);
>-        })";
>+    constexpr char kFS[] = R"(precision mediump float;
>+uniform float uColor[4];
>+void main(void)
>+{
>+    gl_FragColor = vec4(uColor[0], uColor[1], uColor[2], uColor[3]);
>+})";
> 
>-    GLuint program = CompileProgram(vertexShader, fragShader);
>-    ASSERT_NE(program, 0u);
>+    ANGLE_GL_PROGRAM(program, kVS, kFS);
> 
>     // Array index zero should be equivalent to the un-indexed uniform
>     EXPECT_NE(-1, glGetUniformLocation(program, "uPosition"));
>-    EXPECT_EQ(glGetUniformLocation(program, "uPosition"), glGetUniformLocation(program, "uPosition[0]"));
>+    EXPECT_EQ(glGetUniformLocation(program, "uPosition"),
>+              glGetUniformLocation(program, "uPosition[0]"));
> 
>     EXPECT_NE(-1, glGetUniformLocation(program, "uColor"));
>     EXPECT_EQ(glGetUniformLocation(program, "uColor"), glGetUniformLocation(program, "uColor[0]"));
> 
>     // All array uniform locations should be unique
>-    GLint positionLocations[4] =
>-    {
>+    GLint positionLocations[4] = {
>         glGetUniformLocation(program, "uPosition[0]"),
>         glGetUniformLocation(program, "uPosition[1]"),
>         glGetUniformLocation(program, "uPosition[2]"),
>         glGetUniformLocation(program, "uPosition[3]"),
>     };
> 
>-    GLint colorLocations[4] =
>-    {
>+    GLint colorLocations[4] = {
>         glGetUniformLocation(program, "uColor[0]"),
>         glGetUniformLocation(program, "uColor[1]"),
>         glGetUniformLocation(program, "uColor[2]"),
>@@ -199,7 +482,7 @@ TEST_P(UniformTest, FloatUniformStateQuery)
>         expectedFValues.push_back(static_cast<GLfloat>(value));
> 
>         double clampedValue = std::max(intMinD, std::min(intMaxD, value));
>-        double rounded = round(clampedValue);
>+        double rounded      = round(clampedValue);
>         expectedIValues.push_back(static_cast<GLint>(rounded));
>     }
> 
>@@ -394,11 +677,6 @@ class UniformTestES3 : public ANGLETest
>   protected:
>     UniformTestES3() : mProgram(0) {}
> 
>-    void SetUp() override
>-    {
>-        ANGLETest::SetUp();
>-    }
>-
>     void TearDown() override
>     {
>         if (mProgram != 0)
>@@ -406,6 +684,8 @@ class UniformTestES3 : public ANGLETest
>             glDeleteProgram(mProgram);
>             mProgram = 0;
>         }
>+
>+        ANGLETest::TearDown();
>     }
> 
>     GLuint mProgram;
>@@ -414,10 +694,7 @@ class UniformTestES3 : public ANGLETest
> // Test queries for transposed arrays of non-square matrix uniforms.
> TEST_P(UniformTestES3, TransposedMatrixArrayUniformStateQuery)
> {
>-    const std::string &vertexShader =
>-        "#version 300 es\n"
>-        "void main() { gl_Position = vec4(1); }";
>-    const std::string &fragShader =
>+    constexpr char kFS[] =
>         "#version 300 es\n"
>         "precision mediump float;\n"
>         "uniform mat3x2 uniMat3x2[5];\n"
>@@ -430,7 +707,7 @@ TEST_P(UniformTestES3, TransposedMatrixArrayUniformStateQuery)
>         "  color += vec4(uniMat3x2[4][0][0]);\n"
>         "}";
> 
>-    mProgram = CompileProgram(vertexShader, fragShader);
>+    mProgram = CompileProgram(essl3_shaders::vs::Zero(), kFS);
>     ASSERT_NE(mProgram, 0u);
> 
>     glUseProgram(mProgram);
>@@ -458,7 +735,7 @@ TEST_P(UniformTestES3, TransposedMatrixArrayUniformStateQuery)
>         std::stringstream nameStr;
>         nameStr << "uniMat3x2[" << arrayElement << "]";
>         std::string name = nameStr.str();
>-        GLint location = glGetUniformLocation(mProgram, name.c_str());
>+        GLint location   = glGetUniformLocation(mProgram, name.c_str());
>         ASSERT_NE(-1, location);
> 
>         std::vector<GLfloat> sequentialValues(6, 0);
>@@ -476,10 +753,7 @@ TEST_P(UniformTestES3, TransposedMatrixArrayUniformStateQuery)
> // Check that trying setting too many elements of an array doesn't overflow
> TEST_P(UniformTestES3, OverflowArray)
> {
>-    const std::string &vertexShader =
>-        "#version 300 es\n"
>-        "void main() { gl_Position = vec4(1); }";
>-    const std::string &fragShader =
>+    constexpr char kFS[] =
>         "#version 300 es\n"
>         "precision mediump float;\n"
>         "uniform float uniF[5];\n"
>@@ -493,7 +767,7 @@ TEST_P(UniformTestES3, OverflowArray)
>         "  color = vec4(uniMat3x2[4][0][0] + uniF[4]);\n"
>         "}";
> 
>-    mProgram = CompileProgram(vertexShader, fragShader);
>+    mProgram = CompileProgram(essl3_shaders::vs::Zero(), kFS);
>     ASSERT_NE(mProgram, 0u);
> 
>     glUseProgram(mProgram);
>@@ -528,20 +802,20 @@ TEST_P(UniformTestES3, OverflowArray)
> // Check setting a sampler uniform
> TEST_P(UniformTest, Sampler)
> {
>-    const std::string &vertShader =
>+    constexpr char kVS[] =
>         "uniform sampler2D tex2D;\n"
>         "void main() {\n"
>         "  gl_Position = vec4(0, 0, 0, 1);\n"
>         "}";
> 
>-    const std::string &fragShader =
>+    constexpr char kFS[] =
>         "precision mediump float;\n"
>         "uniform sampler2D tex2D;\n"
>         "void main() {\n"
>         "  gl_FragColor = texture2D(tex2D, vec2(0, 0));\n"
>         "}";
> 
>-    ANGLE_GL_PROGRAM(program, vertShader, fragShader);
>+    ANGLE_GL_PROGRAM(program, kVS, kFS);
> 
>     GLint location = glGetUniformLocation(program.get(), "tex2D");
>     ASSERT_NE(-1, location);
>@@ -612,13 +886,10 @@ TEST_P(UniformTest, SamplerUniformsAppearOnce)
>     int maxVertexTextureImageUnits = 0;
>     glGetIntegerv(GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS, &maxVertexTextureImageUnits);
> 
>-    if (maxVertexTextureImageUnits == 0)
>-    {
>-        std::cout << "Renderer doesn't support vertex texture fetch, skipping test" << std::endl;
>-        return;
>-    }
>+    // Renderer doesn't support vertex texture fetch, skipping test.
>+    ANGLE_SKIP_TEST_IF(!maxVertexTextureImageUnits);
> 
>-    const std::string &vertShader =
>+    constexpr char kVS[] =
>         "attribute vec2 position;\n"
>         "uniform sampler2D tex2D;\n"
>         "varying vec4 color;\n"
>@@ -627,7 +898,7 @@ TEST_P(UniformTest, SamplerUniformsAppearOnce)
>         "  color = texture2D(tex2D, vec2(0));\n"
>         "}";
> 
>-    const std::string &fragShader =
>+    constexpr char kFS[] =
>         "precision mediump float;\n"
>         "varying vec4 color;\n"
>         "uniform sampler2D tex2D;\n"
>@@ -635,8 +906,7 @@ TEST_P(UniformTest, SamplerUniformsAppearOnce)
>         "  gl_FragColor = texture2D(tex2D, vec2(0)) + color;\n"
>         "}";
> 
>-    GLuint program = CompileProgram(vertShader, fragShader);
>-    ASSERT_NE(0u, program);
>+    ANGLE_GL_PROGRAM(program, kVS, kFS);
> 
>     GLint activeUniformsCount = 0;
>     glGetProgramiv(program, GL_ACTIVE_UNIFORMS, &activeUniformsCount);
>@@ -692,8 +962,7 @@ TEST_P(UniformTestES3, ReturnsOnlyOneArrayElement)
>     {
>         UniformArrayInfo(std::string type, std::string name, int components)
>             : type(type), name(name), components(components)
>-        {
>-        }
>+        {}
>         std::string type;
>         std::string name;
>         int components;
>@@ -731,15 +1000,15 @@ TEST_P(UniformTestES3, ReturnsOnlyOneArrayElement)
>         }
>     }
> 
>-    const std::string &vertexShader =
>-        "#version 300 es\n" +
>-        uniformStream.str() +
>-        "void main()\n"
>-        "{\n"
>-        "    gl_Position = vec4(1.0" + additionStream.str() + ");\n"
>-        "}";
>+    const std::string vertexShader = "#version 300 es\n" + uniformStream.str() +
>+                                     "void main()\n"
>+                                     "{\n"
>+                                     "    gl_Position = vec4(1.0" +
>+                                     additionStream.str() +
>+                                     ");\n"
>+                                     "}";
> 
>-    const std::string &fragmentShader =
>+    constexpr char kFS[] =
>         "#version 300 es\n"
>         "precision mediump float;\n"
>         "out vec4 color;\n"
>@@ -748,7 +1017,7 @@ TEST_P(UniformTestES3, ReturnsOnlyOneArrayElement)
>         "    color = vec4(1, 0, 0, 1);\n"
>         "}";
> 
>-    mProgram = CompileProgram(vertexShader, fragmentShader);
>+    mProgram = CompileProgram(vertexShader.c_str(), kFS);
>     ASSERT_NE(0u, mProgram);
> 
>     glUseProgram(mProgram);
>@@ -769,13 +1038,65 @@ TEST_P(UniformTestES3, ReturnsOnlyOneArrayElement)
>     }
> }
> 
>+// This test reproduces a regression when Intel windows driver upgrades to 4944. In some situation,
>+// when a boolean uniform with false value is used as the if and for condtions, the bug will be
>+// triggered. It seems that the shader doesn't get a right 'false' value from the uniform.
>+TEST_P(UniformTestES3, BooleanUniformAsIfAndForCondition)
>+{
>+    const char kFragShader[] =
>+        R"(#version 300 es
>+        precision mediump float;
>+        uniform bool u;
>+        out vec4 result;
>+        int sideEffectCounter;
>+
>+        bool foo() {
>+          ++sideEffectCounter;
>+          return true;
>+        }
>+
>+        void main() {
>+          sideEffectCounter = 0;
>+          bool condition = u;
>+          if (condition)
>+          {
>+            condition = foo();
>+          }
>+          for(int iterations = 0; condition;) {
>+            ++iterations;
>+            if (iterations >= 10) {
>+              break;
>+            }
>+
>+            if (condition)
>+            {
>+              condition = foo();
>+            }
>+          }
>+
>+          bool success = (!u && sideEffectCounter == 0);
>+          result = (success) ? vec4(0, 1.0, 0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0);
>+        })";
>+
>+    ANGLE_GL_PROGRAM(program, essl3_shaders::vs::Simple(), kFragShader);
>+
>+    glUseProgram(program.get());
>+
>+    GLint uniformLocation = glGetUniformLocation(program, "u");
>+    ASSERT_NE(uniformLocation, -1);
>+
>+    glUniform1i(uniformLocation, GL_FALSE);
>+
>+    drawQuad(program.get(), essl3_shaders::PositionAttrib(), 0.0f);
>+    ASSERT_GL_NO_ERROR();
>+    EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::green);
>+}
>+
> class UniformTestES31 : public ANGLETest
> {
>   protected:
>     UniformTestES31() : mProgram(0) {}
> 
>-    void SetUp() override { ANGLETest::SetUp(); }
>-
>     void TearDown() override
>     {
>         if (mProgram != 0)
>@@ -783,6 +1104,8 @@ class UniformTestES31 : public ANGLETest
>             glDeleteProgram(mProgram);
>             mProgram = 0;
>         }
>+
>+        ANGLETest::TearDown();
>     }
> 
>     GLuint mProgram;
>@@ -792,14 +1115,7 @@ class UniformTestES31 : public ANGLETest
> // ESSL 3.10.4 section 4.4.3.
> TEST_P(UniformTestES31, StructLocationLayoutQualifier)
> {
>-    const std::string &vertShader =
>-        "#version 310 es\n"
>-        "void main()\n"
>-        "{\n"
>-        "    gl_Position = vec4(0);\n"
>-        "}";
>-
>-    const std::string &fragShader =
>+    constexpr char kFS[] =
>         "#version 310 es\n"
>         "out highp vec4 my_FragColor;\n"
>         "struct S\n"
>@@ -813,7 +1129,7 @@ TEST_P(UniformTestES31, StructLocationLayoutQualifier)
>         "    my_FragColor = vec4(uS.f, uS.f2, 0, 1);\n"
>         "}";
> 
>-    ANGLE_GL_PROGRAM(program, vertShader, fragShader);
>+    ANGLE_GL_PROGRAM(program, essl31_shaders::vs::Zero(), kFS);
> 
>     EXPECT_EQ(12, glGetUniformLocation(program.get(), "uS.f"));
>     EXPECT_EQ(13, glGetUniformLocation(program.get(), "uS.f2"));
>@@ -823,7 +1139,7 @@ TEST_P(UniformTestES31, StructLocationLayoutQualifier)
> // the vertex shader, but doesn't have a location specified there.
> TEST_P(UniformTestES31, UniformLocationInFragmentShader)
> {
>-    const std::string &vertShader =
>+    constexpr char kVS[] =
>         "#version 310 es\n"
>         "uniform highp sampler2D tex2D;\n"
>         "void main()\n"
>@@ -831,7 +1147,7 @@ TEST_P(UniformTestES31, UniformLocationInFragmentShader)
>         "    gl_Position = texture(tex2D, vec2(0));\n"
>         "}";
> 
>-    const std::string &fragShader =
>+    constexpr char kFS[] =
>         "#version 310 es\n"
>         "precision mediump float;\n"
>         "out vec4 my_FragColor;\n"
>@@ -841,7 +1157,7 @@ TEST_P(UniformTestES31, UniformLocationInFragmentShader)
>         "    my_FragColor = texture(tex2D, vec2(0));\n"
>         "}";
> 
>-    ANGLE_GL_PROGRAM(program, vertShader, fragShader);
>+    ANGLE_GL_PROGRAM(program, kVS, kFS);
> 
>     EXPECT_EQ(12, glGetUniformLocation(program.get(), "tex2D"));
> }
>@@ -851,7 +1167,7 @@ TEST_P(UniformTestES31, UniformLocationInFragmentShader)
> // same location, even if they are unused, otherwise a compiler or linker error will be generated."
> TEST_P(UniformTestES31, UnusedUniformsConflictingLocation)
> {
>-    const std::string &vertShader =
>+    constexpr char kVS[] =
>         "#version 310 es\n"
>         "uniform layout(location=12) highp sampler2D texA;\n"
>         "void main()\n"
>@@ -859,7 +1175,7 @@ TEST_P(UniformTestES31, UnusedUniformsConflictingLocation)
>         "    gl_Position = vec4(0);\n"
>         "}";
> 
>-    const std::string &fragShader =
>+    constexpr char kFS[] =
>         "#version 310 es\n"
>         "out highp vec4 my_FragColor;\n"
>         "uniform layout(location=12) highp sampler2D texB;\n"
>@@ -868,7 +1184,7 @@ TEST_P(UniformTestES31, UnusedUniformsConflictingLocation)
>         "    my_FragColor = vec4(0);\n"
>         "}";
> 
>-    mProgram = CompileProgram(vertShader, fragShader);
>+    mProgram = CompileProgram(kVS, kFS);
>     EXPECT_EQ(0u, mProgram);
> }
> 
>@@ -878,7 +1194,7 @@ TEST_P(UniformTestES31, UnusedUniformsConflictingLocation)
> // same location, even if they are unused, otherwise a compiler or linker error will be generated."
> TEST_P(UniformTestES31, UnusedUniformArraysConflictingLocation)
> {
>-    const std::string &vertShader =
>+    constexpr char kVS[] =
>         "#version 310 es\n"
>         "uniform layout(location=11) highp vec4 uA[2];\n"
>         "void main()\n"
>@@ -886,7 +1202,7 @@ TEST_P(UniformTestES31, UnusedUniformArraysConflictingLocation)
>         "    gl_Position = vec4(0);\n"
>         "}";
> 
>-    const std::string &fragShader =
>+    constexpr char kFS[] =
>         "#version 310 es\n"
>         "out highp vec4 my_FragColor;\n"
>         "uniform layout(location=12) highp vec4 uB;\n"
>@@ -895,7 +1211,7 @@ TEST_P(UniformTestES31, UnusedUniformArraysConflictingLocation)
>         "    my_FragColor = vec4(0);\n"
>         "}";
> 
>-    mProgram = CompileProgram(vertShader, fragShader);
>+    mProgram = CompileProgram(kVS, kFS);
>     EXPECT_EQ(0u, mProgram);
> }
> 
>@@ -903,16 +1219,7 @@ TEST_P(UniformTestES31, UnusedUniformArraysConflictingLocation)
> // Minimal test case for a bug revealed by dEQP tests.
> TEST_P(UniformTestES3, StructWithNonSquareMatrixAndBool)
> {
>-    const std::string &vertShader =
>-        "#version 300 es\n"
>-        "precision highp float;\n"
>-        "in highp vec4 a_position;\n"
>-        "void main()\n"
>-        "{\n"
>-        "    gl_Position = a_position;\n"
>-        "}\n";
>-
>-    const std::string &fragShader =
>+    constexpr char kFS[] =
>         "#version 300 es\n"
>         "precision highp float;\n"
>         "out highp vec4 my_color;\n"
>@@ -928,7 +1235,7 @@ TEST_P(UniformTestES3, StructWithNonSquareMatrixAndBool)
>         "    if (!uni.b) { my_color.g = 0.0; }"
>         "}\n";
> 
>-    ANGLE_GL_PROGRAM(program, vertShader, fragShader);
>+    ANGLE_GL_PROGRAM(program, essl3_shaders::vs::Simple(), kFS);
> 
>     glUseProgram(program.get());
> 
>@@ -936,7 +1243,7 @@ TEST_P(UniformTestES3, StructWithNonSquareMatrixAndBool)
>     ASSERT_NE(-1, location);
>     glUniform1i(location, 1);
> 
>-    drawQuad(program.get(), "a_position", 0.0f);
>+    drawQuad(program.get(), essl3_shaders::PositionAttrib(), 0.0f);
> 
>     ASSERT_GL_NO_ERROR();
>     EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::white);
>@@ -945,20 +1252,14 @@ TEST_P(UniformTestES3, StructWithNonSquareMatrixAndBool)
> // Test that uniforms with reserved OpenGL names that aren't reserved in GL ES 2 work correctly.
> TEST_P(UniformTest, UniformWithReservedOpenGLName)
> {
>-    const char *vertexShader =
>-        "attribute highp vec4 a_position;\n"
>-        "void main()\n"
>-        "{\n"
>-        "    gl_Position = a_position;\n"
>-        "}\n";
>-    const char *fragShader =
>+    constexpr char kFS[] =
>         "precision mediump float;\n"
>         "uniform float buffer;"
>         "void main() {\n"
>         "    gl_FragColor = vec4(buffer);\n"
>         "}";
> 
>-    mProgram = CompileProgram(vertexShader, fragShader);
>+    mProgram = CompileProgram(essl1_shaders::vs::Simple(), kFS);
>     ASSERT_NE(mProgram, 0u);
> 
>     GLint location = glGetUniformLocation(mProgram, "buffer");
>@@ -967,20 +1268,32 @@ TEST_P(UniformTest, UniformWithReservedOpenGLName)
>     glUseProgram(mProgram);
>     glUniform1f(location, 1.0f);
> 
>-    drawQuad(mProgram, "a_position", 0.0f);
>+    drawQuad(mProgram, essl1_shaders::PositionAttrib(), 0.0f);
> 
>     ASSERT_GL_NO_ERROR();
>     EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::white);
> }
> 
>-// Use this to select which configurations (e.g. which renderer, which GLES major version) these tests should be run against.
>+// Use this to select which configurations (e.g. which renderer, which GLES major version) these
>+// tests should be run against.
>+ANGLE_INSTANTIATE_TEST(SimpleUniformTest,
>+                       ES2_D3D9(),
>+                       ES2_D3D11(),
>+                       ES2_D3D11_FL9_3(),
>+                       ES2_OPENGL(),
>+                       ES3_D3D11(),
>+                       ES3_OPENGL(),
>+                       ES3_OPENGLES(),
>+                       ES2_OPENGLES(),
>+                       ES2_VULKAN());
> ANGLE_INSTANTIATE_TEST(UniformTest,
>                        ES2_D3D9(),
>                        ES2_D3D11(),
>                        ES2_D3D11_FL9_3(),
>                        ES2_OPENGL(),
>-                       ES2_OPENGLES());
>+                       ES2_OPENGLES(),
>+                       ES2_VULKAN());
> ANGLE_INSTANTIATE_TEST(UniformTestES3, ES3_D3D11(), ES3_OPENGL(), ES3_OPENGLES());
> ANGLE_INSTANTIATE_TEST(UniformTestES31, ES31_D3D11(), ES31_OPENGL(), ES31_OPENGLES());
> 
>-} // namespace
>+}  // namespace
>diff --git a/Source/ThirdParty/ANGLE/src/tests/gl_tests/UnpackAlignmentTest.cpp b/Source/ThirdParty/ANGLE/src/tests/gl_tests/UnpackAlignmentTest.cpp
>index 056bfa1d1f1..ce5876c98f0 100644
>--- a/Source/ThirdParty/ANGLE/src/tests/gl_tests/UnpackAlignmentTest.cpp
>+++ b/Source/ThirdParty/ANGLE/src/tests/gl_tests/UnpackAlignmentTest.cpp
>@@ -31,24 +31,13 @@ class UnpackAlignmentTest : public ANGLETest
>     {
>         ANGLETest::SetUp();
> 
>-        const std::string vertexShaderSource =
>-            R"(precision highp float;
>-            attribute vec4 position;
>-
>-            void main()
>-            {
>-                gl_Position = position;
>-            })";
>-
>-        const std::string fragmentShaderSource =
>-            R"(uniform sampler2D tex;
>-
>-            void main()
>-            {
>-                gl_FragColor = texture2D(tex, vec2(0.0, 1.0));
>-            })";
>+        constexpr char kFS[] = R"(uniform sampler2D tex;
>+void main()
>+{
>+    gl_FragColor = texture2D(tex, vec2(0.0, 1.0));
>+})";
> 
>-        mProgram = CompileProgram(vertexShaderSource, fragmentShaderSource);
>+        mProgram = CompileProgram(essl1_shaders::vs::Simple(), kFS);
>         if (mProgram == 0)
>         {
>             FAIL() << "shader compilation failed.";
>@@ -62,44 +51,52 @@ class UnpackAlignmentTest : public ANGLETest
>         ANGLETest::TearDown();
>     }
> 
>-    void getPixelSize(GLenum format, GLenum type, unsigned int* size)
>+    void getPixelSize(GLenum format, GLenum type, unsigned int *size)
>     {
>         switch (type)
>         {
>-          case GL_UNSIGNED_SHORT_5_5_5_1:
>-          case GL_UNSIGNED_SHORT_5_6_5:
>-          case GL_UNSIGNED_SHORT_4_4_4_4:
>-            *size = sizeof(GLushort);
>-            break;
>+            case GL_UNSIGNED_SHORT_5_5_5_1:
>+            case GL_UNSIGNED_SHORT_5_6_5:
>+            case GL_UNSIGNED_SHORT_4_4_4_4:
>+                *size = sizeof(GLushort);
>+                break;
> 
>-          case GL_UNSIGNED_BYTE:
>+            case GL_UNSIGNED_BYTE:
>             {
>                 unsigned int compCount = 0;
>                 switch (format)
>                 {
>-                  case GL_RGBA:            compCount = 4; break;
>-                  case GL_RGB:             compCount = 3; break;
>-                  case GL_LUMINANCE_ALPHA: compCount = 2; break;
>-                  case GL_LUMINANCE:       compCount = 1; break;
>-                  case GL_ALPHA:           compCount = 1; break;
>-                  default:                 FAIL() << "unknown pixel format.";
>+                    case GL_RGBA:
>+                        compCount = 4;
>+                        break;
>+                    case GL_RGB:
>+                        compCount = 3;
>+                        break;
>+                    case GL_LUMINANCE_ALPHA:
>+                        compCount = 2;
>+                        break;
>+                    case GL_LUMINANCE:
>+                        compCount = 1;
>+                        break;
>+                    case GL_ALPHA:
>+                        compCount = 1;
>+                        break;
>+                    default:
>+                        FAIL() << "unknown pixel format.";
>                 }
>                 *size = sizeof(GLubyte) * compCount;
>             }
>             break;
>-          default:
>-            FAIL() << "unknown pixel type.";
>+            default:
>+                FAIL() << "unknown pixel type.";
>         }
>     }
> 
>-    bool formatHasRGB(GLenum format)
>-    {
>-        return (format != GL_ALPHA);
>-    }
>+    bool formatHasRGB(GLenum format) { return (format != GL_ALPHA); }
> 
>     void testAlignment(int alignment, unsigned int offset, GLenum format, GLenum type)
>     {
>-        static const unsigned int width = 7;
>+        static const unsigned int width  = 7;
>         static const unsigned int height = 2;
> 
>         glPixelStorei(GL_UNPACK_ALIGNMENT, alignment);
>@@ -115,7 +112,7 @@ class UnpackAlignmentTest : public ANGLETest
>         getPixelSize(format, type, &pixelSize);
>         for (unsigned int i = 0; i < pixelSize; i++)
>         {
>-            buf[offset+i] = 0xFF;
>+            buf[offset + i] = 0xFF;
>         }
> 
>         GLuint tex;
>@@ -127,7 +124,7 @@ class UnpackAlignmentTest : public ANGLETest
>         glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
>         glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
> 
>-        drawQuad(mProgram, "position", 0.5f);
>+        drawQuad(mProgram, essl1_shaders::PositionAttrib(), 0.5f);
> 
>         GLubyte expectedRGB = formatHasRGB(format) ? 255 : 0;
>         EXPECT_PIXEL_EQ(0, 0, expectedRGB, expectedRGB, expectedRGB, 255);
>@@ -145,7 +142,6 @@ TEST_P(UnpackAlignmentTest, DefaultAlignment)
>     EXPECT_EQ(defaultAlignment, 4);
> }
> 
>-
> TEST_P(UnpackAlignmentTest, Alignment1RGBAUByte)
> {
>     testAlignment(1, 7 * 4, GL_RGBA, GL_UNSIGNED_BYTE);
>@@ -186,7 +182,6 @@ TEST_P(UnpackAlignmentTest, Alignment1AUByte)
>     testAlignment(1, 7, GL_ALPHA, GL_UNSIGNED_BYTE);
> }
> 
>-
> TEST_P(UnpackAlignmentTest, Alignment2RGBAUByte)
> {
>     testAlignment(2, 7 * 4, GL_RGBA, GL_UNSIGNED_BYTE);
>@@ -227,7 +222,6 @@ TEST_P(UnpackAlignmentTest, Alignment2AUByte)
>     testAlignment(2, 7 + 1, GL_ALPHA, GL_UNSIGNED_BYTE);
> }
> 
>-
> TEST_P(UnpackAlignmentTest, Alignment4RGBAUByte)
> {
>     testAlignment(4, 7 * 4, GL_RGBA, GL_UNSIGNED_BYTE);
>@@ -268,7 +262,6 @@ TEST_P(UnpackAlignmentTest, Alignment4AUByte)
>     testAlignment(4, 7 + 1, GL_ALPHA, GL_UNSIGNED_BYTE);
> }
> 
>-
> TEST_P(UnpackAlignmentTest, Alignment8RGBAUByte)
> {
>     testAlignment(8, 7 * 4 + 4, GL_RGBA, GL_UNSIGNED_BYTE);
>@@ -309,13 +302,15 @@ TEST_P(UnpackAlignmentTest, Alignment8AUByte)
>     testAlignment(8, 7 + 1, GL_ALPHA, GL_UNSIGNED_BYTE);
> }
> 
>-// Use this to select which configurations (e.g. which renderer, which GLES major version) these tests should be run against.
>+// Use this to select which configurations (e.g. which renderer, which GLES major version) these
>+// tests should be run against.
> ANGLE_INSTANTIATE_TEST(UnpackAlignmentTest,
>                        ES2_D3D9(),
>                        ES2_D3D11(),
>                        ES2_OPENGL(),
>+                       ES2_VULKAN(),
>                        ES3_OPENGL(),
>                        ES2_OPENGLES(),
>                        ES3_OPENGLES());
> 
>-} // namespace
>+}  // namespace
>diff --git a/Source/ThirdParty/ANGLE/src/tests/gl_tests/UnpackRowLength.cpp b/Source/ThirdParty/ANGLE/src/tests/gl_tests/UnpackRowLength.cpp
>index bacd70f16c2..ffd09b93279 100644
>--- a/Source/ThirdParty/ANGLE/src/tests/gl_tests/UnpackRowLength.cpp
>+++ b/Source/ThirdParty/ANGLE/src/tests/gl_tests/UnpackRowLength.cpp
>@@ -31,24 +31,13 @@ class UnpackRowLengthTest : public ANGLETest
>     {
>         ANGLETest::SetUp();
> 
>-        const std::string vertexShaderSource =
>-            R"(precision highp float;
>-            attribute vec4 position;
>-
>-            void main()
>-            {
>-                gl_Position = position;
>-            })";
>-
>-        const std::string fragmentShaderSource =
>-            R"(uniform sampler2D tex;
>-
>-            void main()
>-            {
>-                gl_FragColor = texture2D(tex, vec2(0.0, 1.0));
>-            })";
>+        constexpr char kFS[] = R"(uniform sampler2D tex;
>+void main()
>+{
>+    gl_FragColor = texture2D(tex, vec2(0.0, 1.0));
>+})";
> 
>-        mProgram = CompileProgram(vertexShaderSource, fragmentShaderSource);
>+        mProgram = CompileProgram(essl1_shaders::vs::Simple(), kFS);
>         if (mProgram == 0)
>         {
>             FAIL() << "shader compilation failed.";
>@@ -66,10 +55,11 @@ class UnpackRowLengthTest : public ANGLETest
>     {
>         glPixelStorei(GL_UNPACK_ROW_LENGTH, rowLength);
> 
>-        if ((getClientMajorVersion() == 3) || extensionEnabled("GL_EXT_unpack_subimage"))
>+        if ((getClientMajorVersion() == 3) || IsGLExtensionEnabled("GL_EXT_unpack_subimage"))
>         {
>             // Only texSize * texSize region is filled as WHITE, other parts are BLACK.
>-            // If the UNPACK_ROW_LENGTH is implemented correctly, all texels inside this texture are WHITE.
>+            // If the UNPACK_ROW_LENGTH is implemented correctly, all texels inside this texture are
>+            // WHITE.
>             std::vector<GLubyte> buf(rowLength * texSize * 4);
>             for (int y = 0; y < texSize; y++)
>             {
>@@ -82,12 +72,13 @@ class UnpackRowLengthTest : public ANGLETest
>             glGenTextures(1, &tex);
>             glBindTexture(GL_TEXTURE_2D, tex);
> 
>-            glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, texSize, texSize, 0, GL_RGBA, GL_UNSIGNED_BYTE, &buf[0]);
>+            glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, texSize, texSize, 0, GL_RGBA, GL_UNSIGNED_BYTE,
>+                         &buf[0]);
>             glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
>             glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
>             glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
> 
>-            drawQuad(mProgram, "position", 0.5f);
>+            drawQuad(mProgram, essl1_shaders::PositionAttrib(), 0.5f);
> 
>             EXPECT_PIXEL_EQ(0, 0, 255, 255, 255, 255);
>             EXPECT_PIXEL_EQ(1, 0, 255, 255, 255, 255);
>@@ -113,7 +104,8 @@ TEST_P(UnpackRowLengthTest, RowLength1024)
>     testRowLength(128, 1024);
> }
> 
>-// Use this to select which configurations (e.g. which renderer, which GLES major version) these tests should be run against.
>+// Use this to select which configurations (e.g. which renderer, which GLES major version) these
>+// tests should be run against.
> ANGLE_INSTANTIATE_TEST(UnpackRowLengthTest,
>                        ES3_D3D11(),
>                        ES2_D3D11(),
>@@ -121,6 +113,7 @@ ANGLE_INSTANTIATE_TEST(UnpackRowLengthTest,
>                        ES2_OPENGL(),
>                        ES3_OPENGL(),
>                        ES2_OPENGLES(),
>-                       ES3_OPENGLES());
>+                       ES3_OPENGLES(),
>+                       ES2_VULKAN());
> 
>-} // namespace
>+}  // namespace
>diff --git a/Source/ThirdParty/ANGLE/src/tests/gl_tests/VertexAttributeTest.cpp b/Source/ThirdParty/ANGLE/src/tests/gl_tests/VertexAttributeTest.cpp
>index 7d7993a14fb..bedb61d80d4 100644
>--- a/Source/ThirdParty/ANGLE/src/tests/gl_tests/VertexAttributeTest.cpp
>+++ b/Source/ThirdParty/ANGLE/src/tests/gl_tests/VertexAttributeTest.cpp
>@@ -3,7 +3,8 @@
> // Use of this source code is governed by a BSD-style license that can be
> // found in the LICENSE file.
> //
>-
>+#include "anglebase/numerics/safe_conversions.h"
>+#include "platform/FeaturesVk.h"
> #include "test_utils/ANGLETest.h"
> #include "test_utils/gl_raii.h"
> 
>@@ -82,8 +83,7 @@ class VertexAttributeTest : public ANGLETest
>               source(sourceIn),
>               inputData(inputDataIn),
>               expectedData(expectedDataIn)
>-        {
>-        }
>+        {}
> 
>         GLenum type;
>         GLboolean normalized;
>@@ -163,11 +163,7 @@ class VertexAttributeTest : public ANGLETest
>     void runTest(const TestData &test, bool checkPixelEqual)
>     {
>         // TODO(geofflang): Figure out why this is broken on AMD OpenGL
>-        if (IsAMD() && getPlatformRenderer() == EGL_PLATFORM_ANGLE_TYPE_OPENGL_ANGLE)
>-        {
>-            std::cout << "Test skipped on AMD OpenGL." << std::endl;
>-            return;
>-        }
>+        ANGLE_SKIP_TEST_IF(IsAMD() && IsOpenGL());
> 
>         for (GLint i = 0; i < 4; i++)
>         {
>@@ -212,6 +208,12 @@ class VertexAttributeTest : public ANGLETest
>         ANGLETest::TearDown();
>     }
> 
>+    // Override a feature to force emulation of attribute formats.
>+    void overrideFeaturesVk(FeaturesVk *featuresVk) override
>+    {
>+        featuresVk->forceFallbackFormat = true;
>+    }
>+
>     GLuint compileMultiAttribProgram(GLint attribCount)
>     {
>         std::stringstream shaderStream;
>@@ -231,14 +233,14 @@ class VertexAttributeTest : public ANGLETest
>         }
>         shaderStream << "}" << std::endl;
> 
>-        const std::string testFragmentShaderSource =
>+        constexpr char kFS[] =
>             "varying mediump float color;\n"
>             "void main(void)\n"
>             "{\n"
>             "    gl_FragColor = vec4(color, 0.0, 0.0, 1.0);\n"
>             "}\n";
> 
>-        return CompileProgram(shaderStream.str(), testFragmentShaderSource);
>+        return CompileProgram(shaderStream.str().c_str(), kFS);
>     }
> 
>     void setupMultiAttribs(GLuint program, GLint attribCount, GLfloat value)
>@@ -257,7 +259,7 @@ class VertexAttributeTest : public ANGLETest
> 
>     void initBasicProgram()
>     {
>-        const std::string testVertexShaderSource =
>+        constexpr char kVS[] =
>             "attribute mediump vec4 position;\n"
>             "attribute mediump vec4 test;\n"
>             "attribute mediump vec4 expected;\n"
>@@ -269,14 +271,14 @@ class VertexAttributeTest : public ANGLETest
>             "    color = vec4(lessThanEqual(abs(test - expected), threshold));\n"
>             "}\n";
> 
>-        const std::string testFragmentShaderSource =
>+        constexpr char kFS[] =
>             "varying mediump vec4 color;\n"
>             "void main(void)\n"
>             "{\n"
>             "    gl_FragColor = color;\n"
>             "}\n";
> 
>-        mProgram = CompileProgram(testVertexShaderSource, testFragmentShaderSource);
>+        mProgram = CompileProgram(kVS, kFS);
>         ASSERT_NE(0u, mProgram);
> 
>         mTestAttrib = glGetAttribLocation(mProgram, "test");
>@@ -560,8 +562,8 @@ class VertexAttributeTestES3 : public VertexAttributeTest
> 
> TEST_P(VertexAttributeTestES3, IntUnnormalized)
> {
>-    GLint lo = std::numeric_limits<GLint>::min();
>-    GLint hi = std::numeric_limits<GLint>::max();
>+    GLint lo                                  = std::numeric_limits<GLint>::min();
>+    GLint hi                                  = std::numeric_limits<GLint>::max();
>     std::array<GLint, kVertexCount> inputData = {
>         {0, 1, 2, 3, -1, -2, -3, -4, -1, hi, hi - 1, lo, lo + 1}};
>     std::array<GLfloat, kVertexCount> expectedData;
>@@ -576,8 +578,8 @@ TEST_P(VertexAttributeTestES3, IntUnnormalized)
> 
> TEST_P(VertexAttributeTestES3, IntNormalized)
> {
>-    GLint lo = std::numeric_limits<GLint>::min();
>-    GLint hi = std::numeric_limits<GLint>::max();
>+    GLint lo                                  = std::numeric_limits<GLint>::min();
>+    GLint hi                                  = std::numeric_limits<GLint>::max();
>     std::array<GLint, kVertexCount> inputData = {
>         {0, 1, 2, 3, -1, -2, -3, -4, -1, hi, hi - 1, lo, lo + 1}};
>     std::array<GLfloat, kVertexCount> expectedData;
>@@ -592,8 +594,8 @@ TEST_P(VertexAttributeTestES3, IntNormalized)
> 
> TEST_P(VertexAttributeTestES3, UnsignedIntUnnormalized)
> {
>-    GLuint mid = std::numeric_limits<GLuint>::max() >> 1;
>-    GLuint hi  = std::numeric_limits<GLuint>::max();
>+    GLuint mid                                 = std::numeric_limits<GLuint>::max() >> 1;
>+    GLuint hi                                  = std::numeric_limits<GLuint>::max();
>     std::array<GLuint, kVertexCount> inputData = {
>         {0, 1, 2, 3, 254, 255, 256, mid - 1, mid, mid + 1, hi - 2, hi - 1, hi}};
>     std::array<GLfloat, kVertexCount> expectedData;
>@@ -608,8 +610,8 @@ TEST_P(VertexAttributeTestES3, UnsignedIntUnnormalized)
> 
> TEST_P(VertexAttributeTestES3, UnsignedIntNormalized)
> {
>-    GLuint mid = std::numeric_limits<GLuint>::max() >> 1;
>-    GLuint hi  = std::numeric_limits<GLuint>::max();
>+    GLuint mid                                 = std::numeric_limits<GLuint>::max() >> 1;
>+    GLuint hi                                  = std::numeric_limits<GLuint>::max();
>     std::array<GLuint, kVertexCount> inputData = {
>         {0, 1, 2, 3, 254, 255, 256, mid - 1, mid, mid + 1, hi - 2, hi - 1, hi}};
>     std::array<GLfloat, kVertexCount> expectedData;
>@@ -634,7 +636,7 @@ void SetupColorsForUnitQuad(GLint location, const GLColor32F &color, GLenum usag
> // Tests that rendering works as expected with VAOs.
> TEST_P(VertexAttributeTestES3, VertexArrayObjectRendering)
> {
>-    const std::string kVertexShader =
>+    constexpr char kVertexShader[] =
>         "attribute vec4 a_position;\n"
>         "attribute vec4 a_color;\n"
>         "varying vec4 v_color;\n"
>@@ -644,7 +646,7 @@ TEST_P(VertexAttributeTestES3, VertexArrayObjectRendering)
>         "   v_color = a_color;\n"
>         "}";
> 
>-    const std::string kFragmentShader =
>+    constexpr char kFragmentShader[] =
>         "precision mediump float;\n"
>         "varying vec4 v_color;\n"
>         "void main()\n"
>@@ -699,12 +701,11 @@ TEST_P(VertexAttributeTestES3, VertexArrayObjectRendering)
> // Validate that we can support GL_MAX_ATTRIBS attribs
> TEST_P(VertexAttributeTest, MaxAttribs)
> {
>-    // TODO(jmadill): Figure out why we get this error on AMD/OpenGL and Intel.
>-    if ((IsIntel() || IsAMD()) && GetParam().getRenderer() == EGL_PLATFORM_ANGLE_TYPE_OPENGL_ANGLE)
>-    {
>-        std::cout << "Test skipped on Intel and AMD." << std::endl;
>-        return;
>-    }
>+    // TODO(jmadill): Figure out why we get this error on AMD/OpenGL.
>+    ANGLE_SKIP_TEST_IF(IsAMD() && IsOpenGL());
>+
>+    // TODO: Support this test on Vulkan.  http://anglebug.com/2797
>+    ANGLE_SKIP_TEST_IF(IsLinux() && IsVulkan() && IsIntel());
> 
>     GLint maxAttribs;
>     glGetIntegerv(GL_MAX_VERTEX_ATTRIBS, &maxAttribs);
>@@ -727,11 +728,7 @@ TEST_P(VertexAttributeTest, MaxAttribs)
> TEST_P(VertexAttributeTest, MaxAttribsPlusOne)
> {
>     // TODO(jmadill): Figure out why we get this error on AMD/ES2/OpenGL
>-    if (IsAMD() && GetParam() == ES2_OPENGL())
>-    {
>-        std::cout << "Test disabled on AMD/ES2/OpenGL" << std::endl;
>-        return;
>-    }
>+    ANGLE_SKIP_TEST_IF(IsAMD() && GetParam() == ES2_OPENGL());
> 
>     GLint maxAttribs;
>     glGetIntegerv(GL_MAX_VERTEX_ATTRIBS, &maxAttribs);
>@@ -747,13 +744,6 @@ TEST_P(VertexAttributeTest, MaxAttribsPlusOne)
> // Simple test for when we use glBindAttribLocation
> TEST_P(VertexAttributeTest, SimpleBindAttribLocation)
> {
>-    // TODO(jmadill): Figure out why this fails on Intel.
>-    if (IsIntel() && GetParam().getRenderer() == EGL_PLATFORM_ANGLE_TYPE_OPENGL_ANGLE)
>-    {
>-        std::cout << "Test skipped on Intel." << std::endl;
>-        return;
>-    }
>-
>     // Re-use the multi-attrib program, binding attribute 0
>     GLuint program = compileMultiAttribProgram(1);
>     glBindAttribLocation(program, 2, "position");
>@@ -767,9 +757,23 @@ TEST_P(VertexAttributeTest, SimpleBindAttribLocation)
>     EXPECT_PIXEL_NEAR(0, 0, 128, 0, 0, 255, 1);
> }
> 
>+class VertexAttributeOORTest : public VertexAttributeTest
>+{
>+  public:
>+    VertexAttributeOORTest()
>+    {
>+        setWebGLCompatibilityEnabled(true);
>+        setRobustAccess(false);
>+    }
>+};
>+
> // Verify that drawing with a large out-of-range offset generates INVALID_OPERATION.
>-TEST_P(VertexAttributeTest, DrawArraysBufferTooSmall)
>+// Requires WebGL compatibility with robust access behaviour disabled.
>+TEST_P(VertexAttributeOORTest, ANGLEDrawArraysBufferTooSmall)
> {
>+    // Test skipped due to supporting GL_KHR_robust_buffer_access_behavior
>+    ANGLE_SKIP_TEST_IF(IsGLExtensionEnabled("GL_KHR_robust_buffer_access_behavior"));
>+
>     std::array<GLfloat, kVertexCount> inputData;
>     std::array<GLfloat, kVertexCount> expectedData;
>     InitTestData(inputData, expectedData);
>@@ -783,14 +787,11 @@ TEST_P(VertexAttributeTest, DrawArraysBufferTooSmall)
> }
> 
> // Verify that index draw with an out-of-range offset generates INVALID_OPERATION.
>-TEST_P(VertexAttributeTest, DrawElementsBufferTooSmall)
>+// Requires WebGL compatibility with robust access behaviour disabled.
>+TEST_P(VertexAttributeOORTest, ANGLEDrawElementsBufferTooSmall)
> {
>-    if (extensionEnabled("GL_KHR_robust_buffer_access_behavior"))
>-    {
>-        std::cout << "Test skipped due to supporting GL_KHR_robust_buffer_access_behavior"
>-                  << std::endl;
>-        return;
>-    }
>+    // Test skipped due to supporting GL_KHR_robust_buffer_access_behavior
>+    ANGLE_SKIP_TEST_IF(IsGLExtensionEnabled("GL_KHR_robust_buffer_access_behavior"));
> 
>     std::array<GLfloat, kVertexCount> inputData;
>     std::array<GLfloat, kVertexCount> expectedData;
>@@ -804,22 +805,36 @@ TEST_P(VertexAttributeTest, DrawElementsBufferTooSmall)
>     EXPECT_GL_ERROR(GL_INVALID_OPERATION);
> }
> 
>+// Verify that DrawArarys with an out-of-range offset generates INVALID_OPERATION.
>+// Requires WebGL compatibility with robust access behaviour disabled.
>+TEST_P(VertexAttributeOORTest, ANGLEDrawArraysOutOfBoundsCases)
>+{
>+    // Test skipped due to supporting GL_KHR_robust_buffer_access_behavior
>+    ANGLE_SKIP_TEST_IF(IsGLExtensionEnabled("GL_KHR_robust_buffer_access_behavior"));
>+
>+    initBasicProgram();
>+
>+    GLfloat singleFloat = 1.0f;
>+    GLsizei dataSize    = TypeStride(GL_FLOAT);
>+
>+    glBindBuffer(GL_ARRAY_BUFFER, mBuffer);
>+    glBufferData(GL_ARRAY_BUFFER, dataSize, &singleFloat, GL_STATIC_DRAW);
>+    glVertexAttribPointer(mTestAttrib, 2, GL_FLOAT, GL_FALSE, 8, 0);
>+    glEnableVertexAttribArray(mTestAttrib);
>+    glBindBuffer(GL_ARRAY_BUFFER, 0);
>+
>+    drawIndexedQuad(mProgram, "position", 0.5f);
>+    EXPECT_GL_ERROR(GL_INVALID_OPERATION);
>+}
>+
> // Verify that using a different start vertex doesn't mess up the draw.
> TEST_P(VertexAttributeTest, DrawArraysWithBufferOffset)
> {
>     // TODO(jmadill): Diagnose this failure.
>-    if (IsD3D11_FL93())
>-    {
>-        std::cout << "Test disabled on D3D11 FL 9_3" << std::endl;
>-        return;
>-    }
>+    ANGLE_SKIP_TEST_IF(IsD3D11_FL93());
> 
>     // TODO(geofflang): Figure out why this is broken on AMD OpenGL
>-    if (IsAMD() && getPlatformRenderer() == EGL_PLATFORM_ANGLE_TYPE_OPENGL_ANGLE)
>-    {
>-        std::cout << "Test skipped on AMD OpenGL." << std::endl;
>-        return;
>-    }
>+    ANGLE_SKIP_TEST_IF(IsAMD() && IsOpenGL());
> 
>     initBasicProgram();
>     glUseProgram(mProgram);
>@@ -895,7 +910,7 @@ TEST_P(VertexAttributeTest, DrawArraysWithDisabledAttribute)
>     glEnableVertexAttribArray(mExpectedAttrib);
> 
>     // mProgram2 adds an attribute 'disabled' on the basis of mProgram.
>-    const std::string testVertexShaderSource2 =
>+    constexpr char testVertexShaderSource2[] =
>         "attribute mediump vec4 position;\n"
>         "attribute mediump vec4 test;\n"
>         "attribute mediump vec4 expected;\n"
>@@ -908,7 +923,7 @@ TEST_P(VertexAttributeTest, DrawArraysWithDisabledAttribute)
>         "    color = vec4(lessThanEqual(abs(test - expected), threshold));\n"
>         "}\n";
> 
>-    const std::string testFragmentShaderSource =
>+    constexpr char testFragmentShaderSource[] =
>         "varying mediump vec4 color;\n"
>         "void main(void)\n"
>         "{\n"
>@@ -947,7 +962,10 @@ TEST_P(VertexAttributeTest, DisabledAttribArrays)
>     // Known failure on Retina MBP: http://crbug.com/635081
>     ANGLE_SKIP_TEST_IF(IsOSX() && IsNVIDIA());
> 
>-    const std::string vsSource =
>+    // TODO: Support this test on Vulkan.  http://anglebug.com/2797
>+    ANGLE_SKIP_TEST_IF(IsLinux() && IsVulkan() && IsIntel());
>+
>+    constexpr char kVS[] =
>         "attribute vec4 a_position;\n"
>         "attribute vec4 a_color;\n"
>         "varying vec4 v_color;\n"
>@@ -959,7 +977,7 @@ TEST_P(VertexAttributeTest, DisabledAttribArrays)
>         "    v_color = isCorrectColor(a_color) ? vec4(0, 1, 0, 1) : vec4(1, 0, 0, 1);\n"
>         "}";
> 
>-    const std::string fsSource =
>+    constexpr char kFS[] =
>         "varying mediump vec4 v_color;\n"
>         "void main() {\n"
>         "    gl_FragColor = v_color;\n"
>@@ -970,21 +988,10 @@ TEST_P(VertexAttributeTest, DisabledAttribArrays)
> 
>     for (GLint colorIndex = 0; colorIndex < maxVertexAttribs; ++colorIndex)
>     {
>-        GLuint vs = CompileShader(GL_VERTEX_SHADER, vsSource);
>-        ASSERT_NE(0u, vs);
>-        GLuint fs = CompileShader(GL_FRAGMENT_SHADER, fsSource);
>-        ASSERT_NE(0u, fs);
>-
>-        GLuint program = glCreateProgram();
>-        glBindAttribLocation(program, colorIndex, "a_color");
>-
>-        glAttachShader(program, vs);
>-        glDeleteShader(vs);
>-
>-        glAttachShader(program, fs);
>-        glDeleteShader(fs);
>-
>-        ASSERT_TRUE(LinkAttachedProgram(program));
>+        GLuint program = CompileProgram(kVS, kFS, [&](GLuint program) {
>+            glBindAttribLocation(program, colorIndex, "a_color");
>+        });
>+        ASSERT_NE(0u, program);
> 
>         drawQuad(program, "a_position", 0.5f);
>         ASSERT_GL_NO_ERROR();
>@@ -1042,29 +1049,30 @@ class VertexAttributeTestES31 : public VertexAttributeTestES3
>         glDeleteVertexArrays(1, &mVAO);
>     }
> 
>-    void drawArraysWithStrideAndOffset(GLint stride, GLsizeiptr offset)
>+    void drawArraysWithStrideAndRelativeOffset(GLint stride, GLuint relativeOffset)
>     {
>         initTest();
> 
>-        GLint floatStride      = stride ? (stride / kFloatStride) : 1;
>-        GLsizeiptr floatOffset = offset / kFloatStride;
>-        size_t floatCount      = static_cast<size_t>(floatOffset) + kVertexCount * floatStride;
>-        GLsizeiptr inputSize   = static_cast<GLsizeiptr>(floatCount) * kFloatStride;
>+        GLint floatStride          = std::max(stride / kFloatStride, 1);
>+        GLuint floatRelativeOffset = relativeOffset / kFloatStride;
>+        size_t floatCount = static_cast<size_t>(floatRelativeOffset) + kVertexCount * floatStride;
>+        GLsizeiptr inputSize = static_cast<GLsizeiptr>(floatCount) * kFloatStride;
> 
>         std::vector<GLfloat> inputData(floatCount);
>         for (size_t count = 0; count < kVertexCount; ++count)
>         {
>-            inputData[floatOffset + count * floatStride] = static_cast<GLfloat>(count);
>+            inputData[floatRelativeOffset + count * floatStride] = static_cast<GLfloat>(count);
>         }
> 
>         // Ensure inputSize, inputStride and inputOffset are multiples of TypeStride(GL_FLOAT).
>-        GLsizei inputStride    = stride ? floatStride * kFloatStride : 0;
>-        GLsizeiptr inputOffset = floatOffset * kFloatStride;
>+        GLsizei inputStride            = floatStride * kFloatStride;
>+        GLsizeiptr inputRelativeOffset = floatRelativeOffset * kFloatStride;
>         glBindBuffer(GL_ARRAY_BUFFER, mBuffer);
>         glBufferData(GL_ARRAY_BUFFER, inputSize, nullptr, GL_STATIC_DRAW);
>         glBufferSubData(GL_ARRAY_BUFFER, 0, inputSize, inputData.data());
>-        glVertexAttribPointer(mTestAttrib, 1, GL_FLOAT, GL_FALSE, inputStride,
>-                              reinterpret_cast<const void *>(inputOffset));
>+        glVertexAttribFormat(mTestAttrib, 1, GL_FLOAT, GL_FALSE,
>+                             base::checked_cast<GLuint>(inputRelativeOffset));
>+        glBindVertexBuffer(mTestAttrib, mBuffer, 0, inputStride);
>         glEnableVertexAttribArray(mTestAttrib);
> 
>         glDrawArrays(GL_TRIANGLES, 0, 6);
>@@ -1073,13 +1081,54 @@ class VertexAttributeTestES31 : public VertexAttributeTestES3
>         EXPECT_GL_NO_ERROR();
>     }
> 
>+    void initOnlyUpdateBindingTest(GLint bindingToUpdate)
>+    {
>+        initTest();
>+
>+        constexpr GLuint kTestFloatOffset1                               = kVertexCount;
>+        std::array<GLfloat, kTestFloatOffset1 + kVertexCount> inputData1 = {};
>+        for (size_t count = 0; count < kVertexCount; ++count)
>+        {
>+            GLfloat value                         = static_cast<GLfloat>(count);
>+            inputData1[kTestFloatOffset1 + count] = value;
>+        }
>+
>+        GLBuffer testBuffer1;
>+        glBindBuffer(GL_ARRAY_BUFFER, testBuffer1);
>+        glBufferData(GL_ARRAY_BUFFER, inputData1.size() * kFloatStride, inputData1.data(),
>+                     GL_STATIC_DRAW);
>+
>+        ASSERT_NE(bindingToUpdate, mTestAttrib);
>+        ASSERT_NE(bindingToUpdate, mExpectedAttrib);
>+
>+        // Set mTestAttrib using the binding bindingToUpdate.
>+        glVertexAttribFormat(mTestAttrib, 1, GL_FLOAT, GL_FALSE, 0);
>+        glBindVertexBuffer(bindingToUpdate, testBuffer1, kTestFloatOffset1 * kFloatStride,
>+                           kFloatStride);
>+        glVertexAttribBinding(mTestAttrib, bindingToUpdate);
>+        glEnableVertexAttribArray(mTestAttrib);
>+
>+        // In the first draw the current VAO states are set to driver.
>+        glDrawArrays(GL_TRIANGLES, 0, 6);
>+        checkPixels();
>+        EXPECT_GL_NO_ERROR();
>+
>+        // We need the second draw to ensure all VAO dirty bits are reset.
>+        // e.g. On D3D11 back-ends, Buffer11::resize is called in the first draw, where the related
>+        // binding is set to dirty again.
>+        glDrawArrays(GL_TRIANGLES, 0, 6);
>+        checkPixels();
>+        EXPECT_GL_NO_ERROR();
>+    }
>+
>     GLuint mVAO;
>     GLuint mExpectedBuffer;
> 
>     const GLsizei kFloatStride = TypeStride(GL_FLOAT);
> 
>-    // Set the maximum value for stride if the stride is too large.
>-    static constexpr GLint MAX_STRIDE_FOR_TEST = 4095;
>+    // Set the maximum value for stride and relativeOffset in case they are too large.
>+    const GLint MAX_STRIDE_FOR_TEST          = 4095;
>+    const GLint MAX_RELATIVE_OFFSET_FOR_TEST = 4095;
> };
> 
> // Verify that MAX_VERTEX_ATTRIB_STRIDE is no less than the minimum required value (2048) in ES3.1.
>@@ -1111,20 +1160,219 @@ TEST_P(VertexAttributeTestES31, DrawArraysWithLargeStride)
>     glGetIntegerv(GL_MAX_VERTEX_ATTRIB_STRIDE, &maxStride);
>     ASSERT_GL_NO_ERROR();
> 
>-    GLint largeStride = (maxStride < MAX_STRIDE_FOR_TEST) ? maxStride : MAX_STRIDE_FOR_TEST;
>-    drawArraysWithStrideAndOffset(largeStride, 0);
>+    GLint largeStride = std::min(maxStride, MAX_STRIDE_FOR_TEST);
>+    drawArraysWithStrideAndRelativeOffset(largeStride, 0);
> }
> 
>-// TODO(jiawei.shao@intel.com): Merge it into VertexAttributeTestES31 when Vertex Attrib
>-// Binding is supported on D3D11 back-ends.
>-class VertexAttributeTestES31_OpenGL : public VertexAttributeTestES31
>+// Verify using MAX_VERTEX_ATTRIB_RELATIVE_OFFSET as relativeOffset doesn't mess up the draw.
>+// Use default value if the value of MAX_VERTEX_ATTRIB_RELATIVE_OFFSSET is too large for this test.
>+TEST_P(VertexAttributeTestES31, DrawArraysWithLargeRelativeOffset)
> {
>-  protected:
>-    VertexAttributeTestES31_OpenGL() {}
>+    GLint maxRelativeOffset;
>+    glGetIntegerv(GL_MAX_VERTEX_ATTRIB_RELATIVE_OFFSET, &maxRelativeOffset);
>+    ASSERT_GL_NO_ERROR();
>+
>+    GLint largeRelativeOffset = std::min(maxRelativeOffset, MAX_RELATIVE_OFFSET_FOR_TEST);
>+    drawArraysWithStrideAndRelativeOffset(0, largeRelativeOffset);
>+}
>+
>+// Test that vertex array object works correctly when render pipeline and compute pipeline are
>+// crossly executed.
>+TEST_P(VertexAttributeTestES31, MixedComputeAndRenderPipelines)
>+{
>+    constexpr char kComputeShader[] =
>+        R"(#version 310 es
>+layout(local_size_x=1) in;
>+void main()
>+{
>+})";
>+    ANGLE_GL_COMPUTE_PROGRAM(computePogram, kComputeShader);
>+
>+    glViewport(0, 0, getWindowWidth(), getWindowHeight());
>+    glClearColor(0, 0, 0, 0);
>+
>+    constexpr char kVertexShader[] =
>+        R"(#version 310 es
>+precision mediump float;
>+layout(location = 0) in vec4 position;
>+layout(location = 2) in vec2 aOffset;
>+layout(location = 3) in vec4 aColor;
>+out vec4 vColor;
>+void main() {
>+    vColor = aColor;
>+    gl_Position = position + vec4(aOffset, 0.0, 0.0);
>+})";
>+
>+    constexpr char kFragmentShader[] =
>+        R"(#version 310 es
>+precision mediump float;
>+in vec4 vColor;
>+out vec4  color;
>+void main() {
>+    color = vColor;
>+})";
>+
>+    ANGLE_GL_PROGRAM(renderProgram, kVertexShader, kFragmentShader);
>+
>+    constexpr char kVertexShader1[] =
>+        R"(#version 310 es
>+precision mediump float;
>+layout(location = 1) in vec4 position;
>+layout(location = 2) in vec2 aOffset;
>+layout(location = 3) in vec4 aColor;
>+out vec4 vColor;
>+void main() {
>+    vColor = aColor;
>+    gl_Position = position + vec4(aOffset, 0.0, 0.0);
>+})";
>+
>+    ANGLE_GL_PROGRAM(renderProgram1, kVertexShader1, kFragmentShader);
>+
>+    std::array<GLfloat, 8> offsets = {
>+        -1.0, 1.0, 1.0, 1.0, -1.0, -1.0, 1.0, -1.0,
>+    };
>+    GLBuffer offsetBuffer;
>+    glBindBuffer(GL_ARRAY_BUFFER, offsetBuffer);
>+    glBufferData(GL_ARRAY_BUFFER, offsets.size() * sizeof(GLfloat), offsets.data(), GL_STATIC_DRAW);
>+
>+    std::array<GLfloat, 16> colors0 = {
>+        1.0, 0.0, 0.0, 1.0,  // Red
>+        0.0, 1.0, 0.0, 1.0,  // Green
>+        0.0, 0.0, 1.0, 1.0,  // Blue
>+        1.0, 1.0, 0.0, 1.0,  // Yellow
>+    };
>+    std::array<GLfloat, 16> colors1 = {
>+        1.0, 1.0, 0.0, 1.0,  // Yellow
>+        0.0, 0.0, 1.0, 1.0,  // Blue
>+        0.0, 1.0, 0.0, 1.0,  // Green
>+        1.0, 0.0, 0.0, 1.0,  // Red
>+    };
>+    GLBuffer colorBuffers[2];
>+    glBindBuffer(GL_ARRAY_BUFFER, colorBuffers[0]);
>+    glBufferData(GL_ARRAY_BUFFER, colors0.size() * sizeof(GLfloat), colors0.data(), GL_STATIC_DRAW);
>+    glBindBuffer(GL_ARRAY_BUFFER, colorBuffers[1]);
>+    glBufferData(GL_ARRAY_BUFFER, colors1.size() * sizeof(GLfloat), colors1.data(), GL_STATIC_DRAW);
>+
>+    std::array<GLfloat, 16> positions = {1.0, 1.0, -1.0, 1.0,  -1.0, -1.0,
>+                                         1.0, 1.0, -1.0, -1.0, 1.0,  -1.0};
>+    GLBuffer positionBuffer;
>+    glBindBuffer(GL_ARRAY_BUFFER, positionBuffer);
>+    glBufferData(GL_ARRAY_BUFFER, positions.size() * sizeof(GLfloat), positions.data(),
>+                 GL_STATIC_DRAW);
>+
>+    const int kInstanceCount = 4;
>+    GLVertexArray vao[2];
>+    for (size_t i = 0u; i < 2u; ++i)
>+    {
>+        glBindVertexArray(vao[i]);
>+
>+        glBindBuffer(GL_ARRAY_BUFFER, offsetBuffer);
>+        glEnableVertexAttribArray(2);
>+        glVertexAttribPointer(2, 2, GL_FLOAT, false, 0, 0);
>+        glVertexAttribDivisor(2, 1);
>+
>+        glBindBuffer(GL_ARRAY_BUFFER, colorBuffers[i]);
>+        glEnableVertexAttribArray(3);
>+        glVertexAttribPointer(3, 4, GL_FLOAT, false, 0, 0);
>+        glVertexAttribDivisor(3, 1);
>+
>+        glBindBuffer(GL_ARRAY_BUFFER, positionBuffer);
>+        glEnableVertexAttribArray(i);
>+        glVertexAttribPointer(i, 2, GL_FLOAT, false, 0, 0);
>+    }
>+
>+    glClear(GL_COLOR_BUFFER_BIT);
>+
>+    for (int i = 0; i < 3; i++)
>+    {
>+        glUseProgram(renderProgram.get());
>+        glBindVertexArray(vao[0]);
>+        glDrawArraysInstanced(GL_TRIANGLES, 0, 6, kInstanceCount);
>+
>+        EXPECT_GL_NO_ERROR();
>+        EXPECT_PIXEL_COLOR_EQ(0, getWindowHeight() / 2, GLColor::red);
>+        EXPECT_PIXEL_COLOR_EQ(getWindowWidth() / 2, getWindowHeight() / 2, GLColor::green);
>+        EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::blue);
>+        EXPECT_PIXEL_COLOR_EQ(getWindowWidth() / 2, 0, GLColor::yellow);
>+
>+        glBindVertexArray(vao[1]);
>+        glUseProgram(computePogram.get());
>+        glDispatchCompute(1, 1, 1);
>+
>+        glUseProgram(renderProgram1.get());
>+        glBindVertexArray(vao[1]);
>+        glDrawArraysInstanced(GL_TRIANGLES, 0, 6, kInstanceCount);
>+
>+        EXPECT_GL_NO_ERROR();
>+        EXPECT_PIXEL_COLOR_EQ(0, getWindowHeight() / 2, GLColor::yellow);
>+        EXPECT_PIXEL_COLOR_EQ(getWindowWidth() / 2, getWindowHeight() / 2, GLColor::blue);
>+        EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::green);
>+        EXPECT_PIXEL_COLOR_EQ(getWindowWidth() / 2, 0, GLColor::red);
>+    }
>+}
>+
>+TEST_P(VertexAttributeTestES31, UseComputeShaderToUpdateVertexBuffer)
>+{
>+    initTest();
>+    constexpr char kComputeShader[] =
>+        R"(#version 310 es
>+layout(local_size_x=24) in;
>+layout(std430, binding = 0) buffer buf {
>+    uint outData[24];
> };
>+void main()
>+{
>+    outData[gl_LocalInvocationIndex] = gl_LocalInvocationIndex;
>+})";
>+
>+    ANGLE_GL_COMPUTE_PROGRAM(computeProgram, kComputeShader);
>+    glUseProgram(mProgram);
>+
>+    GLuint mid                                 = std::numeric_limits<GLuint>::max() >> 1;
>+    GLuint hi                                  = std::numeric_limits<GLuint>::max();
>+    std::array<GLuint, kVertexCount> inputData = {
>+        {0, 1, 2, 3, 254, 255, 256, mid - 1, mid, mid + 1, hi - 2, hi - 1, hi}};
>+    std::array<GLfloat, kVertexCount> expectedData;
>+    for (size_t i = 0; i < kVertexCount; i++)
>+    {
>+        expectedData[i] = Normalize(inputData[i]);
>+    }
>+
>+    // Normalized unsigned int attribute will be classified as translated static attribute.
>+    TestData data(GL_UNSIGNED_INT, GL_TRUE, Source::BUFFER, inputData.data(), expectedData.data());
>+    GLint typeSize   = 4;
>+    GLsizei dataSize = kVertexCount * TypeStride(data.type);
>+    GLBuffer testBuffer;
>+    glBindBuffer(GL_ARRAY_BUFFER, testBuffer);
>+    glBufferData(GL_ARRAY_BUFFER, dataSize, data.inputData, GL_STATIC_DRAW);
>+    glVertexAttribPointer(mTestAttrib, typeSize, data.type, data.normalized, 0,
>+                          reinterpret_cast<void *>(data.bufferOffset));
>+    glEnableVertexAttribArray(mTestAttrib);
>+
>+    glBindBuffer(GL_ARRAY_BUFFER, mExpectedBuffer);
>+    glBufferData(GL_ARRAY_BUFFER, dataSize, data.expectedData, GL_STATIC_DRAW);
>+    glVertexAttribPointer(mExpectedAttrib, typeSize, GL_FLOAT, GL_FALSE, 0, nullptr);
>+
>+    // Draw twice to make sure that all static attributes dirty bits are synced.
>+    glDrawArrays(GL_TRIANGLES, 0, 6);
>+    glDrawArrays(GL_TRIANGLES, 0, 6);
>+    checkPixels();
>+
>+    // Modify the testBuffer using a raw buffer
>+    glUseProgram(computeProgram);
>+    glBindBufferBase(GL_SHADER_STORAGE_BUFFER, 0, testBuffer);
>+    glDispatchCompute(1, 1, 1);
>+    glMemoryBarrier(GL_SHADER_STORAGE_BARRIER_BIT);
>+
>+    // Draw again to verify that testBuffer has been changed.
>+    glUseProgram(mProgram);
>+    glDrawArrays(GL_TRIANGLES, 0, 6);
>+    EXPECT_GL_NO_ERROR();
>+    checkPixelsUnEqual();
>+}
> 
> // Verify that using VertexAttribBinding after VertexAttribPointer won't mess up the draw.
>-TEST_P(VertexAttributeTestES31_OpenGL, ChangeAttribBindingAfterVertexAttribPointer)
>+TEST_P(VertexAttributeTestES31, ChangeAttribBindingAfterVertexAttribPointer)
> {
>     initTest();
> 
>@@ -1174,7 +1422,7 @@ TEST_P(VertexAttributeTestES31_OpenGL, ChangeAttribBindingAfterVertexAttribPoint
> }
> 
> // Verify that using VertexAttribFormat after VertexAttribPointer won't mess up the draw.
>-TEST_P(VertexAttributeTestES31_OpenGL, ChangeAttribFormatAfterVertexAttribPointer)
>+TEST_P(VertexAttributeTestES31, ChangeAttribFormatAfterVertexAttribPointer)
> {
>     initTest();
> 
>@@ -1202,6 +1450,81 @@ TEST_P(VertexAttributeTestES31_OpenGL, ChangeAttribFormatAfterVertexAttribPointe
>     EXPECT_GL_NO_ERROR();
> }
> 
>+// Verify that only updating a binding without updating the bound format won't mess up this draw.
>+TEST_P(VertexAttributeTestES31, OnlyUpdateBindingByBindVertexBuffer)
>+{
>+    // Default binding index for test
>+    constexpr GLint kTestBinding = 10;
>+    initOnlyUpdateBindingTest(kTestBinding);
>+
>+    constexpr GLuint kTestFloatOffset2                               = kVertexCount * 2;
>+    std::array<GLfloat, kVertexCount> expectedData2                  = {};
>+    std::array<GLfloat, kTestFloatOffset2 + kVertexCount> inputData2 = {};
>+    for (size_t count = 0; count < kVertexCount; ++count)
>+    {
>+        GLfloat value2                        = static_cast<GLfloat>(count) * 2;
>+        expectedData2[count]                  = value2;
>+        inputData2[count + kTestFloatOffset2] = value2;
>+    }
>+
>+    // Set another set of data for mExpectedAttrib.
>+    GLBuffer expectedBuffer2;
>+    glBindBuffer(GL_ARRAY_BUFFER, expectedBuffer2);
>+    glBufferData(GL_ARRAY_BUFFER, expectedData2.size() * kFloatStride, expectedData2.data(),
>+                 GL_STATIC_DRAW);
>+    glVertexAttribPointer(mExpectedAttrib, 1, GL_FLOAT, GL_FALSE, 0, nullptr);
>+
>+    GLBuffer testBuffer2;
>+    glBindBuffer(GL_ARRAY_BUFFER, testBuffer2);
>+    glBufferData(GL_ARRAY_BUFFER, inputData2.size() * kFloatStride, inputData2.data(),
>+                 GL_STATIC_DRAW);
>+
>+    // Only update the binding kTestBinding in the second draw by BindVertexBuffer.
>+    glBindVertexBuffer(kTestBinding, testBuffer2, kTestFloatOffset2 * kFloatStride, kFloatStride);
>+
>+    glDrawArrays(GL_TRIANGLES, 0, 6);
>+    checkPixels();
>+    EXPECT_GL_NO_ERROR();
>+}
>+
>+// Verify that only updating a binding without updating the bound format won't mess up this draw.
>+TEST_P(VertexAttributeTestES31, OnlyUpdateBindingByVertexAttribPointer)
>+{
>+    // Default binding index for test
>+    constexpr GLint kTestBinding = 10;
>+    initOnlyUpdateBindingTest(kTestBinding);
>+
>+    constexpr GLuint kTestFloatOffset2                               = kVertexCount * 3;
>+    std::array<GLfloat, kVertexCount> expectedData2                  = {};
>+    std::array<GLfloat, kTestFloatOffset2 + kVertexCount> inputData2 = {};
>+    for (size_t count = 0; count < kVertexCount; ++count)
>+    {
>+        GLfloat value2                        = static_cast<GLfloat>(count) * 3;
>+        expectedData2[count]                  = value2;
>+        inputData2[count + kTestFloatOffset2] = value2;
>+    }
>+
>+    // Set another set of data for mExpectedAttrib.
>+    GLBuffer expectedBuffer2;
>+    glBindBuffer(GL_ARRAY_BUFFER, expectedBuffer2);
>+    glBufferData(GL_ARRAY_BUFFER, expectedData2.size() * kFloatStride, expectedData2.data(),
>+                 GL_STATIC_DRAW);
>+    glVertexAttribPointer(mExpectedAttrib, 1, GL_FLOAT, GL_FALSE, 0, nullptr);
>+
>+    GLBuffer testBuffer2;
>+    glBindBuffer(GL_ARRAY_BUFFER, testBuffer2);
>+    glBufferData(GL_ARRAY_BUFFER, inputData2.size() * kFloatStride, inputData2.data(),
>+                 GL_STATIC_DRAW);
>+
>+    // Only update the binding kTestBinding in the second draw by VertexAttribPointer.
>+    glVertexAttribPointer(kTestBinding, 1, GL_FLOAT, GL_FALSE, 0,
>+                          reinterpret_cast<const void *>(kTestFloatOffset2 * kFloatStride));
>+
>+    glDrawArrays(GL_TRIANGLES, 0, 6);
>+    checkPixels();
>+    EXPECT_GL_NO_ERROR();
>+}
>+
> class VertexAttributeCachingTest : public VertexAttributeTest
> {
>   protected:
>@@ -1216,7 +1539,7 @@ class VertexAttributeCachingTest : public VertexAttributeTest
> 
>     void initDoubleAttribProgram()
>     {
>-        const std::string testVertexShaderSource =
>+        constexpr char kVS[] =
>             "attribute mediump vec4 position;\n"
>             "attribute mediump vec4 test;\n"
>             "attribute mediump vec4 expected;\n"
>@@ -1232,14 +1555,14 @@ class VertexAttributeCachingTest : public VertexAttributeTest
>             "    color += vec4(lessThanEqual(abs(test2 - expected2), threshold2));\n"
>             "}\n";
> 
>-        const std::string testFragmentShaderSource =
>+        constexpr char kFS[] =
>             "varying mediump vec4 color;\n"
>             "void main(void)\n"
>             "{\n"
>             "    gl_FragColor = color;\n"
>             "}\n";
> 
>-        mProgram = CompileProgram(testVertexShaderSource, testFragmentShaderSource);
>+        mProgram = CompileProgram(kVS, kFS);
>         ASSERT_NE(0u, mProgram);
> 
>         mTestAttrib = glGetAttribLocation(mProgram, "test");
>@@ -1270,8 +1593,7 @@ VertexAttributeCachingTest::AttribData::AttribData(GLenum typeIn,
>                                                    GLboolean normalizedIn,
>                                                    GLsizei strideIn)
>     : type(typeIn), size(sizeIn), normalized(normalizedIn), stride(strideIn)
>-{
>-}
>+{}
> 
> // static
> template <typename DestT>
>@@ -1377,11 +1699,7 @@ void VertexAttributeCachingTest::SetUp()
> // to stress-test the caching code.
> TEST_P(VertexAttributeCachingTest, BufferMulticaching)
> {
>-    if (IsAMD() && IsDesktopOpenGL())
>-    {
>-        std::cout << "Test skipped on AMD OpenGL." << std::endl;
>-        return;
>-    }
>+    ANGLE_SKIP_TEST_IF(IsAMD() && IsDesktopOpenGL());
> 
>     initBasicProgram();
> 
>@@ -1415,11 +1733,7 @@ TEST_P(VertexAttributeCachingTest, BufferMulticaching)
> // after enough iterations. It validates the unchanged attributes don't get deleted incidentally.
> TEST_P(VertexAttributeCachingTest, BufferMulticachingWithOneUnchangedAttrib)
> {
>-    if (IsAMD() && IsDesktopOpenGL())
>-    {
>-        std::cout << "Test skipped on AMD OpenGL." << std::endl;
>-        return;
>-    }
>+    ANGLE_SKIP_TEST_IF(IsAMD() && IsDesktopOpenGL());
> 
>     initDoubleAttribProgram();
> 
>@@ -1462,6 +1776,61 @@ TEST_P(VertexAttributeCachingTest, BufferMulticachingWithOneUnchangedAttrib)
>     }
> }
> 
>+// Test that if there are gaps in the attribute indices, the attributes have their correct values.
>+TEST_P(VertexAttributeTest, UnusedVertexAttribWorks)
>+{
>+    constexpr char kVertexShader[] = R"(attribute vec2 position;
>+attribute float actualValue;
>+uniform float expectedValue;
>+varying float result;
>+void main()
>+{
>+    result = (actualValue == expectedValue) ? 1.0 : 0.0;
>+    gl_Position = vec4(position, 0, 1);
>+})";
>+
>+    constexpr char kFragmentShader[] = R"(varying mediump float result;
>+void main()
>+{
>+    gl_FragColor = result > 0.0 ? vec4(0, 1, 0, 1) : vec4(1, 0, 0, 1);
>+})";
>+
>+    ANGLE_GL_PROGRAM(program, kVertexShader, kFragmentShader);
>+
>+    // Force a gap in attributes by using location 0 and 3
>+    GLint positionLocation = 0;
>+    glBindAttribLocation(program, positionLocation, "position");
>+
>+    GLint attribLoc = 3;
>+    glBindAttribLocation(program, attribLoc, "actualValue");
>+
>+    // Re-link the program to update the attribute locations
>+    glLinkProgram(program);
>+    ASSERT_TRUE(CheckLinkStatusAndReturnProgram(program, true));
>+
>+    glUseProgram(program);
>+
>+    GLint uniLoc = glGetUniformLocation(program, "expectedValue");
>+    ASSERT_NE(-1, uniLoc);
>+
>+    glVertexAttribPointer(attribLoc, 1, GL_FLOAT, GL_FALSE, 0, nullptr);
>+
>+    ASSERT_NE(-1, positionLocation);
>+    setupQuadVertexBuffer(0.5f, 1.0f);
>+    glVertexAttribPointer(positionLocation, 3, GL_FLOAT, GL_FALSE, 0, 0);
>+    glEnableVertexAttribArray(positionLocation);
>+
>+    std::array<GLfloat, 4> testValues = {{1, 2, 3, 4}};
>+    for (GLfloat testValue : testValues)
>+    {
>+        glUniform1f(uniLoc, testValue);
>+        glVertexAttrib1f(attribLoc, testValue);
>+        glDrawArrays(GL_TRIANGLES, 0, 6);
>+        ASSERT_GL_NO_ERROR();
>+        EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::green);
>+    }
>+}
>+
> // Tests that repeatedly updating a disabled vertex attribute works as expected.
> // This covers an ANGLE bug where dirty bits for current values were ignoring repeated updates.
> TEST_P(VertexAttributeTest, DisabledAttribUpdates)
>@@ -1510,6 +1879,156 @@ void main()
>     }
> }
> 
>+// Test that even inactive attributes are taken into account when checking for aliasing in case the
>+// shader version is >= 3.00. GLSL ES 3.00.6 section 12.46.
>+TEST_P(VertexAttributeTestES3, InactiveAttributeAliasing)
>+{
>+    constexpr char vertexShader[] =
>+        R"(#version 300 es
>+        precision mediump float;
>+        in vec4 input_active;
>+        in vec4 input_unused;
>+        void main()
>+        {
>+            gl_Position = input_active;
>+        })";
>+
>+    constexpr char fragmentShader[] =
>+        R"(#version 300 es
>+        precision mediump float;
>+        out vec4 color;
>+        void main()
>+        {
>+            color = vec4(0.0);
>+        })";
>+
>+    ANGLE_GL_PROGRAM(program, vertexShader, fragmentShader);
>+    glBindAttribLocation(program, 0, "input_active");
>+    glBindAttribLocation(program, 0, "input_unused");
>+    glLinkProgram(program);
>+    EXPECT_GL_NO_ERROR();
>+    GLint linkStatus = 0;
>+    glGetProgramiv(program, GL_LINK_STATUS, &linkStatus);
>+    EXPECT_GL_FALSE(linkStatus);
>+}
>+
>+// Test that enabling inactive attributes doesn't cause a crash
>+// shader version is >= 3.00
>+TEST_P(VertexAttributeTestES3, EnabledButInactiveAttributes)
>+{
>+    // This is similar to runtest(), and the test is disabled there
>+    ANGLE_SKIP_TEST_IF(IsAMD() && IsOpenGL());
>+
>+    constexpr char testVertexShaderSource[] =
>+        R"(#version 300 es
>+precision mediump float;
>+in vec4 position;
>+layout(location = 1) in vec4 test;
>+layout(location = 2) in vec4 unused1;
>+layout(location = 3) in vec4 unused2;
>+layout(location = 4) in vec4 unused3;
>+layout(location = 5) in vec4 expected;
>+out vec4 color;
>+void main(void)
>+{
>+    gl_Position = position;
>+    vec4 threshold = max(abs(expected) * 0.01, 1.0 / 64.0);
>+    color = vec4(lessThanEqual(abs(test - expected), threshold));
>+})";
>+
>+    // Same as previous one, except it uses unused1/2 instead of test/expected, leaving unused3
>+    // unused
>+    constexpr char testVertexShader2Source[] =
>+        R"(#version 300 es
>+precision mediump float;
>+in vec4 position;
>+layout(location = 1) in vec4 test;
>+layout(location = 2) in vec4 unused1;
>+layout(location = 3) in vec4 unused2;
>+layout(location = 4) in vec4 unused3;
>+layout(location = 5) in vec4 expected;
>+out vec4 color;
>+void main(void)
>+{
>+    gl_Position = position;
>+    vec4 threshold = max(abs(unused2) * 0.01, 1.0 / 64.0);
>+    color = vec4(lessThanEqual(abs(unused1 - unused2), threshold));
>+})";
>+
>+    constexpr char testFragmentShaderSource[] =
>+        R"(#version 300 es
>+precision mediump float;
>+in vec4 color;
>+out vec4 out_color;
>+void main()
>+{
>+    out_color = color;
>+})";
>+
>+    std::array<GLubyte, kVertexCount> inputData = {
>+        {0, 1, 2, 3, 4, 5, 6, 7, 125, 126, 127, 128, 129, 250, 251, 252, 253, 254, 255}};
>+    std::array<GLubyte, kVertexCount> inputData2;
>+    std::array<GLfloat, kVertexCount> expectedData;
>+    std::array<GLfloat, kVertexCount> expectedData2;
>+    for (size_t i = 0; i < kVertexCount; i++)
>+    {
>+        expectedData[i]  = inputData[i];
>+        inputData2[i]    = inputData[i] > 128 ? inputData[i] - 1 : inputData[i] + 1;
>+        expectedData2[i] = inputData2[i];
>+    }
>+
>+    // Setup the program
>+    mProgram = CompileProgram(testVertexShaderSource, testFragmentShaderSource);
>+    ASSERT_NE(0u, mProgram);
>+
>+    mTestAttrib = glGetAttribLocation(mProgram, "test");
>+    ASSERT_EQ(1, mTestAttrib);
>+    mExpectedAttrib = glGetAttribLocation(mProgram, "expected");
>+    ASSERT_EQ(5, mExpectedAttrib);
>+
>+    GLint unused1Attrib = 2;
>+    GLint unused2Attrib = 3;
>+    GLint unused3Attrib = 4;
>+
>+    // Test enabling an unused attribute before glUseProgram
>+    glEnableVertexAttribArray(unused3Attrib);
>+
>+    glUseProgram(mProgram);
>+
>+    // Setup the test data
>+    TestData data(GL_UNSIGNED_BYTE, GL_FALSE, Source::IMMEDIATE, inputData.data(),
>+                  expectedData.data());
>+    setupTest(data, 1);
>+
>+    // Test enabling an unused attribute after glUseProgram
>+    glVertexAttribPointer(unused1Attrib, 1, data.type, data.normalized, 0, inputData2.data());
>+    glEnableVertexAttribArray(unused1Attrib);
>+
>+    glVertexAttribPointer(unused2Attrib, 1, GL_FLOAT, GL_FALSE, 0, expectedData2.data());
>+    glEnableVertexAttribArray(unused2Attrib);
>+
>+    // Run the test.  This shouldn't use the unused attributes.  Note that one of them is nullptr
>+    // which can cause a crash on certain platform-driver combination.
>+    drawQuad(mProgram, "position", 0.5f);
>+    checkPixels();
>+
>+    // Now test with the same attributes enabled, but with a program with different attributes
>+    // active
>+    mProgram = CompileProgram(testVertexShader2Source, testFragmentShaderSource);
>+    ASSERT_NE(0u, mProgram);
>+
>+    // Make sure all the attributes are in the same location
>+    ASSERT_EQ(glGetAttribLocation(mProgram, "unused1"), unused1Attrib);
>+    ASSERT_EQ(glGetAttribLocation(mProgram, "unused2"), unused2Attrib);
>+
>+    glUseProgram(mProgram);
>+
>+    // Run the test again.  unused1/2 were disabled in the previous run (as they were inactive in
>+    // the shader), but should be re-enabled now.
>+    drawQuad(mProgram, "position", 0.5f);
>+    checkPixels();
>+}
>+
> // Use this to select which configurations (e.g. which renderer, which GLES major version) these
> // tests should be run against.
> // D3D11 Feature Level 9_3 uses different D3D formats for vertex attribs compared to Feature Levels
>@@ -1521,14 +2040,20 @@ ANGLE_INSTANTIATE_TEST(VertexAttributeTest,
>                        ES2_OPENGL(),
>                        ES3_OPENGL(),
>                        ES2_OPENGLES(),
>-                       ES3_OPENGLES());
>+                       ES3_OPENGLES(),
>+                       ES2_VULKAN());
>+
>+ANGLE_INSTANTIATE_TEST(VertexAttributeOORTest,
>+                       ES2_D3D9(),
>+                       ES2_D3D11(),
>+                       ES2_OPENGL(),
>+                       ES2_OPENGLES(),
>+                       ES2_VULKAN());
> 
> ANGLE_INSTANTIATE_TEST(VertexAttributeTestES3, ES3_D3D11(), ES3_OPENGL(), ES3_OPENGLES());
> 
> ANGLE_INSTANTIATE_TEST(VertexAttributeTestES31, ES31_D3D11(), ES31_OPENGL(), ES31_OPENGLES());
> 
>-ANGLE_INSTANTIATE_TEST(VertexAttributeTestES31_OpenGL, ES31_OPENGL(), ES31_OPENGLES());
>-
> ANGLE_INSTANTIATE_TEST(VertexAttributeCachingTest,
>                        ES2_D3D9(),
>                        ES2_D3D11(),
>diff --git a/Source/ThirdParty/ANGLE/src/tests/gl_tests/ViewportTest.cpp b/Source/ThirdParty/ANGLE/src/tests/gl_tests/ViewportTest.cpp
>index 7e8da21a61f..81e3f96d2df 100644
>--- a/Source/ThirdParty/ANGLE/src/tests/gl_tests/ViewportTest.cpp
>+++ b/Source/ThirdParty/ANGLE/src/tests/gl_tests/ViewportTest.cpp
>@@ -5,6 +5,7 @@
> //
> 
> #include "test_utils/ANGLETest.h"
>+#include "test_utils/gl_raii.h"
> 
> using namespace angle;
> 
>@@ -58,8 +59,9 @@ class ViewportTest : public ANGLETest
>         glClearColor(0, 1, 0, 1);
>         glClear(GL_COLOR_BUFFER_BIT);
> 
>-        // Draw a red quad centered in the middle of the viewport, with dimensions 25% of the size of the viewport.
>-        drawQuad(mProgram, "position", 0.5f, 0.25f);
>+        // Draw a red quad centered in the middle of the viewport, with dimensions 25% of the size
>+        // of the viewport.
>+        drawQuad(mProgram, essl1_shaders::PositionAttrib(), 0.5f, 0.25f);
> 
>         GLint centerViewportX = viewportSize[0] + (viewportSize[2] / 2);
>         GLint centerViewportY = viewportSize[1] + (viewportSize[3] / 2);
>@@ -73,28 +75,29 @@ class ViewportTest : public ANGLETest
>         checkPixel(centerViewportX, centerViewportY, true);
> 
>         // Pixels just inside the red quad should be red.
>-        checkPixel(redQuadLeftSideX,      redQuadTopSideY,        true);
>-        checkPixel(redQuadLeftSideX,      redQuadBottomSideY - 1, true);
>-        checkPixel(redQuadRightSideX - 1, redQuadTopSideY,        true);
>+        checkPixel(redQuadLeftSideX, redQuadTopSideY, true);
>+        checkPixel(redQuadLeftSideX, redQuadBottomSideY - 1, true);
>+        checkPixel(redQuadRightSideX - 1, redQuadTopSideY, true);
>         checkPixel(redQuadRightSideX - 1, redQuadBottomSideY - 1, true);
> 
>         // Pixels just outside the red quad shouldn't be red.
>-        checkPixel(redQuadLeftSideX - 1,  redQuadTopSideY - 1, false);
>-        checkPixel(redQuadLeftSideX - 1,  redQuadBottomSideY,  false);
>-        checkPixel(redQuadRightSideX,     redQuadTopSideY - 1, false);
>-        checkPixel(redQuadRightSideX,     redQuadBottomSideY,  false);
>+        checkPixel(redQuadLeftSideX - 1, redQuadTopSideY - 1, false);
>+        checkPixel(redQuadLeftSideX - 1, redQuadBottomSideY, false);
>+        checkPixel(redQuadRightSideX, redQuadTopSideY - 1, false);
>+        checkPixel(redQuadRightSideX, redQuadBottomSideY, false);
> 
>         // Pixels just within the viewport shouldn't be red.
>-        checkPixel(viewportSize[0],                        viewportSize[1],                       false);
>-        checkPixel(viewportSize[0],                        viewportSize[1] + viewportSize[3] - 1, false);
>-        checkPixel(viewportSize[0] + viewportSize[2] - 1,  viewportSize[1],                       false);
>-        checkPixel(viewportSize[0] + viewportSize[2] - 1,  viewportSize[1] + viewportSize[3] - 1, false);
>+        checkPixel(viewportSize[0], viewportSize[1], false);
>+        checkPixel(viewportSize[0], viewportSize[1] + viewportSize[3] - 1, false);
>+        checkPixel(viewportSize[0] + viewportSize[2] - 1, viewportSize[1], false);
>+        checkPixel(viewportSize[0] + viewportSize[2] - 1, viewportSize[1] + viewportSize[3] - 1,
>+                   false);
>     }
> 
>     void checkPixel(GLint x, GLint y, GLboolean renderedRed)
>     {
>         // By default, expect the pixel to be black.
>-        GLint expectedRedChannel = 0;
>+        GLint expectedRedChannel   = 0;
>         GLint expectedGreenChannel = 0;
> 
>         GLint scissorSize[4];
>@@ -102,12 +105,13 @@ class ViewportTest : public ANGLETest
> 
>         EXPECT_GL_NO_ERROR();
> 
>-        if (scissorSize[0] <= x && x < scissorSize[0] + scissorSize[2]
>-            && scissorSize[1] <= y && y < scissorSize[1] + scissorSize[3])
>+        if (scissorSize[0] <= x && x < scissorSize[0] + scissorSize[2] && scissorSize[1] <= y &&
>+            y < scissorSize[1] + scissorSize[3])
>         {
>             // If the pixel lies within the scissor rect, then it should have been cleared to green.
>-            // If we rendered a red square on top of it, then the pixel should be red (the green channel will have been reset to 0).
>-            expectedRedChannel = renderedRed ? 255 : 0;
>+            // If we rendered a red square on top of it, then the pixel should be red (the green
>+            // channel will have been reset to 0).
>+            expectedRedChannel   = renderedRed ? 255 : 0;
>             expectedGreenChannel = renderedRed ? 0 : 255;
>         }
> 
>@@ -122,21 +126,7 @@ class ViewportTest : public ANGLETest
>     {
>         ANGLETest::SetUp();
> 
>-        const std::string testVertexShaderSource =
>-            R"(attribute highp vec4 position;
>-
>-            void main(void)
>-            {
>-                gl_Position = position;
>-            })";
>-
>-        const std::string testFragmentShaderSource =
>-            R"(void main(void)
>-            {
>-                gl_FragColor = vec4(1.0, 0.0, 0.0, 1.0);
>-            })";
>-
>-        mProgram = CompileProgram(testVertexShaderSource, testFragmentShaderSource);
>+        mProgram = CompileProgram(essl1_shaders::vs::Simple(), essl1_shaders::fs::Red());
>         if (mProgram == 0)
>         {
>             FAIL() << "shader compilation failed.";
>@@ -176,7 +166,8 @@ TEST_P(ViewportTest, QuarterWindow)
> 
> TEST_P(ViewportTest, QuarterWindowCentered)
> {
>-    glViewport(getWindowWidth() * 3 / 8, getWindowHeight() * 3 / 8, getWindowWidth() / 4, getWindowHeight() / 4);
>+    glViewport(getWindowWidth() * 3 / 8, getWindowHeight() * 3 / 8, getWindowWidth() / 4,
>+               getWindowHeight() / 4);
> 
>     runNonScissoredTest();
> 
>@@ -212,7 +203,8 @@ TEST_P(ViewportTest, DoubleWindow)
> 
> TEST_P(ViewportTest, DoubleWindowCentered)
> {
>-    glViewport(-getWindowWidth() / 2, -getWindowHeight() / 2, getWindowWidth() * 2, getWindowHeight() * 2);
>+    glViewport(-getWindowWidth() / 2, -getWindowHeight() / 2, getWindowWidth() * 2,
>+               getWindowHeight() * 2);
> 
>     runNonScissoredTest();
> 
>@@ -221,7 +213,8 @@ TEST_P(ViewportTest, DoubleWindowCentered)
> 
> TEST_P(ViewportTest, DoubleWindowOffCenter)
> {
>-    glViewport(-getWindowWidth() * 3 / 4, getWindowHeight() * 3 / 4, getWindowWidth(), getWindowHeight());
>+    glViewport(-getWindowWidth() * 3 / 4, getWindowHeight() * 3 / 4, getWindowWidth(),
>+               getWindowHeight());
> 
>     runNonScissoredTest();
> 
>@@ -248,21 +241,104 @@ TEST_P(ViewportTest, TripleWindowCentered)
> 
> TEST_P(ViewportTest, TripleWindowOffCenter)
> {
>-    glViewport(-getWindowWidth() * 3 / 2, -getWindowHeight() * 3 / 2, getWindowWidth() * 3, getWindowHeight() * 3);
>+    glViewport(-getWindowWidth() * 3 / 2, -getWindowHeight() * 3 / 2, getWindowWidth() * 3,
>+               getWindowHeight() * 3);
> 
>     runNonScissoredTest();
> 
>     runScissoredTest();
> }
> 
>-// Use this to select which configurations (e.g. which renderer, which GLES major version) these tests should be run against.
>-// D3D11 Feature Level 9 and D3D9 emulate large and negative viewports in the vertex shader. We should test both of these as well as D3D11 Feature Level 10_0+.
>+// Test line rendering with a non-standard viewport.
>+TEST_P(ViewportTest, DrawLineWithViewport)
>+{
>+    // We assume in the test the width and height are equal and we are tracing
>+    // the line from bottom left to top right. Verify that all pixels along that line
>+    // have been traced with green.
>+    ASSERT_EQ(getWindowWidth(), getWindowHeight());
>+
>+    ANGLE_GL_PROGRAM(program, essl1_shaders::vs::Simple(), essl1_shaders::fs::Green());
>+    glUseProgram(program);
>+
>+    std::vector<Vector3> vertices = {{-1.0f, -1.0f, 0.0f}, {1.0f, 1.0f, 0.0f}};
>+
>+    const GLint positionLocation = glGetAttribLocation(program, essl1_shaders::PositionAttrib());
>+    ASSERT_NE(-1, positionLocation);
>+
>+    GLBuffer vertexBuffer;
>+    glBindBuffer(GL_ARRAY_BUFFER, vertexBuffer);
>+    glBufferData(GL_ARRAY_BUFFER, sizeof(vertices[0]) * vertices.size(), vertices.data(),
>+                 GL_STATIC_DRAW);
>+    glVertexAttribPointer(positionLocation, 3, GL_FLOAT, GL_FALSE, 0, nullptr);
>+    glEnableVertexAttribArray(positionLocation);
>+
>+    // Set the viewport.
>+    GLint quarterWidth  = getWindowWidth() / 4;
>+    GLint quarterHeight = getWindowHeight() / 4;
>+    glViewport(quarterWidth, quarterHeight, quarterWidth, quarterHeight);
>+
>+    glClear(GL_COLOR_BUFFER_BIT);
>+    glDrawArrays(GL_LINES, 0, static_cast<GLsizei>(vertices.size()));
>+
>+    glDisableVertexAttribArray(positionLocation);
>+
>+    ASSERT_GL_NO_ERROR();
>+
>+    for (GLint x = quarterWidth; x < getWindowWidth() / 2; x++)
>+    {
>+        EXPECT_PIXEL_COLOR_EQ(x, x, GLColor::green);
>+    }
>+}
>+
>+// Test line rendering with an overly large viewport.
>+TEST_P(ViewportTest, DrawLineWithLargeViewport)
>+{
>+    // We assume in the test the width and height are equal and we are tracing
>+    // the line from bottom left to top right. Verify that all pixels along that line
>+    // have been traced with green.
>+    ASSERT_EQ(getWindowWidth(), getWindowHeight());
>+
>+    ANGLE_GL_PROGRAM(program, essl1_shaders::vs::Simple(), essl1_shaders::fs::Green());
>+    glUseProgram(program);
>+
>+    std::vector<Vector3> vertices = {{-1.0f, -1.0f, 0.0f}, {1.0f, 1.0f, 0.0f}};
>+
>+    const GLint positionLocation = glGetAttribLocation(program, essl1_shaders::PositionAttrib());
>+    ASSERT_NE(-1, positionLocation);
>+
>+    GLBuffer vertexBuffer;
>+    glBindBuffer(GL_ARRAY_BUFFER, vertexBuffer);
>+    glBufferData(GL_ARRAY_BUFFER, sizeof(vertices[0]) * vertices.size(), vertices.data(),
>+                 GL_STATIC_DRAW);
>+    glVertexAttribPointer(positionLocation, 3, GL_FLOAT, GL_FALSE, 0, nullptr);
>+    glEnableVertexAttribArray(positionLocation);
>+
>+    // Set the viewport.
>+    glViewport(0, 0, getWindowWidth() * 2, getWindowHeight() * 2);
>+
>+    glClear(GL_COLOR_BUFFER_BIT);
>+    glDrawArrays(GL_LINES, 0, static_cast<GLsizei>(vertices.size()));
>+
>+    glDisableVertexAttribArray(positionLocation);
>+
>+    ASSERT_GL_NO_ERROR();
>+
>+    for (GLint x = 0; x < getWindowWidth(); x++)
>+    {
>+        EXPECT_PIXEL_COLOR_EQ(x, x, GLColor::green);
>+    }
>+}
>+
>+// Use this to select which configurations (e.g. which renderer, which GLES major version) these
>+// tests should be run against. D3D11 Feature Level 9 and D3D9 emulate large and negative viewports
>+// in the vertex shader. We should test both of these as well as D3D11 Feature Level 10_0+.
> ANGLE_INSTANTIATE_TEST(ViewportTest,
>                        ES2_D3D9(),
>                        ES2_D3D11(EGL_EXPERIMENTAL_PRESENT_PATH_COPY_ANGLE),
>                        ES2_D3D11(EGL_EXPERIMENTAL_PRESENT_PATH_FAST_ANGLE),
>                        ES2_D3D11_FL9_3(),
>                        ES2_OPENGLES(),
>-                       ES3_OPENGLES());
>+                       ES3_OPENGLES(),
>+                       ES2_VULKAN());
> 
>-} // namespace
>+}  // namespace
>diff --git a/Source/ThirdParty/ANGLE/src/tests/gl_tests/VulkanExternalImageTest.cpp b/Source/ThirdParty/ANGLE/src/tests/gl_tests/VulkanExternalImageTest.cpp
>new file mode 100644
>index 00000000000..1f598808ac5
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/tests/gl_tests/VulkanExternalImageTest.cpp
>@@ -0,0 +1,155 @@
>+//
>+// Copyright 2019 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+
>+// VulkanExternalImageTest.cpp : Tests of images allocated externally using Vulkan.
>+
>+#include "test_utils/ANGLETest.h"
>+
>+#include "common/debug.h"
>+#include "test_utils/VulkanExternalHelper.h"
>+#include "test_utils/gl_raii.h"
>+
>+namespace angle
>+{
>+
>+namespace
>+{
>+
>+constexpr int kInvalidFd = -1;
>+
>+VkFormat ChooseAnyImageFormat(const VulkanExternalHelper &helper)
>+{
>+    static constexpr VkFormat kFormats[] = {
>+        VK_FORMAT_B8G8R8A8_UNORM,
>+        VK_FORMAT_R8G8B8A8_UNORM,
>+    };
>+
>+    for (VkFormat format : kFormats)
>+    {
>+        if (helper.canCreateImageOpaqueFd(format, VK_IMAGE_TYPE_2D, VK_IMAGE_TILING_OPTIMAL))
>+        {
>+            return format;
>+        }
>+    }
>+
>+    return VK_FORMAT_UNDEFINED;
>+}
>+
>+}  // namespace
>+
>+class VulkanExternalImageTest : public ANGLETest
>+{
>+  protected:
>+    VulkanExternalImageTest()
>+    {
>+        setWindowWidth(1);
>+        setWindowHeight(1);
>+        setConfigRedBits(8);
>+        setConfigGreenBits(8);
>+        setConfigBlueBits(8);
>+        setConfigAlphaBits(8);
>+    }
>+};
>+
>+// glImportMemoryFdEXT must be able to import a valid opaque fd.
>+TEST_P(VulkanExternalImageTest, ShouldImportOpaqueFd)
>+{
>+    ANGLE_SKIP_TEST_IF(!EnsureGLExtensionEnabled("GL_EXT_memory_object_fd"));
>+
>+    VulkanExternalHelper helper;
>+    helper.initialize();
>+
>+    VkFormat format = ChooseAnyImageFormat(helper);
>+    ANGLE_SKIP_TEST_IF(format == VK_FORMAT_UNDEFINED);
>+
>+    VkImage image                 = VK_NULL_HANDLE;
>+    VkDeviceMemory deviceMemory   = VK_NULL_HANDLE;
>+    VkDeviceSize deviceMemorySize = 0;
>+
>+    VkExtent3D extent = {1, 1, 1};
>+    VkResult result =
>+        helper.createImage2DOpaqueFd(format, extent, &image, &deviceMemory, &deviceMemorySize);
>+    EXPECT_EQ(result, VK_SUCCESS);
>+
>+    int fd = kInvalidFd;
>+    result = helper.exportMemoryOpaqueFd(deviceMemory, &fd);
>+    EXPECT_EQ(result, VK_SUCCESS);
>+    EXPECT_NE(fd, kInvalidFd);
>+
>+    {
>+        GLMemoryObject memoryObject;
>+        glImportMemoryFdEXT(memoryObject, deviceMemorySize, GL_HANDLE_TYPE_OPAQUE_FD_EXT, fd);
>+    }
>+
>+    EXPECT_GL_NO_ERROR();
>+
>+    vkDestroyImage(helper.getDevice(), image, nullptr);
>+    vkFreeMemory(helper.getDevice(), deviceMemory, nullptr);
>+}
>+
>+// Test creating and clearing a simple RGBA8 texture in a opaque fd.
>+TEST_P(VulkanExternalImageTest, ShouldClearOpaqueFdRGBA8)
>+{
>+    ANGLE_SKIP_TEST_IF(!EnsureGLExtensionEnabled("GL_EXT_memory_object_fd"));
>+
>+    VulkanExternalHelper helper;
>+    helper.initialize();
>+
>+    VkFormat format = VK_FORMAT_R8G8B8A8_UNORM;
>+    ANGLE_SKIP_TEST_IF(
>+        !helper.canCreateImageOpaqueFd(format, VK_IMAGE_TYPE_2D, VK_IMAGE_TILING_OPTIMAL));
>+
>+    VkImage image                 = VK_NULL_HANDLE;
>+    VkDeviceMemory deviceMemory   = VK_NULL_HANDLE;
>+    VkDeviceSize deviceMemorySize = 0;
>+
>+    VkExtent3D extent = {1, 1, 1};
>+    VkResult result =
>+        helper.createImage2DOpaqueFd(format, extent, &image, &deviceMemory, &deviceMemorySize);
>+    EXPECT_EQ(result, VK_SUCCESS);
>+
>+    int fd = kInvalidFd;
>+    result = helper.exportMemoryOpaqueFd(deviceMemory, &fd);
>+    EXPECT_EQ(result, VK_SUCCESS);
>+    EXPECT_NE(fd, kInvalidFd);
>+
>+    {
>+        GLMemoryObject memoryObject;
>+        glImportMemoryFdEXT(memoryObject, deviceMemorySize, GL_HANDLE_TYPE_OPAQUE_FD_EXT, fd);
>+
>+        GLTexture texture;
>+        glBindTexture(GL_TEXTURE_2D, texture);
>+        glTexStorageMem2DEXT(GL_TEXTURE_2D, 1, GL_RGBA8, 1, 1, memoryObject, 0);
>+
>+        GLFramebuffer framebuffer;
>+        glBindFramebuffer(GL_FRAMEBUFFER, framebuffer);
>+        glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, texture, 0);
>+
>+        glClearColor(0.5f, 0.5f, 0.5f, 0.5f);
>+        glClear(GL_COLOR_BUFFER_BIT);
>+
>+        EXPECT_PIXEL_NEAR(0, 0, 128, 128, 128, 128, 1.0);
>+    }
>+
>+    EXPECT_GL_NO_ERROR();
>+
>+    vkDestroyImage(helper.getDevice(), image, nullptr);
>+    vkFreeMemory(helper.getDevice(), deviceMemory, nullptr);
>+}
>+
>+// Use this to select which configurations (e.g. which renderer, which GLES major version) these
>+// tests should be run against.
>+ANGLE_INSTANTIATE_TEST(VulkanExternalImageTest,
>+                       ES2_D3D9(),
>+                       ES2_D3D11(),
>+                       ES3_D3D11(),
>+                       ES2_OPENGL(),
>+                       ES3_OPENGL(),
>+                       ES2_OPENGLES(),
>+                       ES3_OPENGLES(),
>+                       ES2_VULKAN());
>+
>+}  // namespace angle
>diff --git a/Source/ThirdParty/ANGLE/src/tests/gl_tests/VulkanFormatTablesTest.cpp b/Source/ThirdParty/ANGLE/src/tests/gl_tests/VulkanFormatTablesTest.cpp
>new file mode 100644
>index 00000000000..af2a854d3b0
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/tests/gl_tests/VulkanFormatTablesTest.cpp
>@@ -0,0 +1,117 @@
>+//
>+// Copyright 2018 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// VulkanFormatTablesTest:
>+//   Tests to validate our Vulkan support tables match hardware support.
>+//
>+
>+#include "test_utils/ANGLETest.h"
>+#include "test_utils/angle_test_instantiate.h"
>+// 'None' is defined as 'struct None {};' in
>+// third_party/googletest/src/googletest/include/gtest/internal/gtest-type-util.h.
>+// But 'None' is also defined as a numeric constant 0L in <X11/X.h>.
>+// So we need to include ANGLETest.h first to avoid this conflict.
>+
>+#include "libANGLE/Context.h"
>+#include "libANGLE/angletypes.h"
>+#include "libANGLE/formatutils.h"
>+#include "libANGLE/renderer/vulkan/ContextVk.h"
>+#include "libANGLE/renderer/vulkan/RendererVk.h"
>+#include "util/EGLWindow.h"
>+
>+using namespace angle;
>+
>+namespace
>+{
>+
>+class VulkanFormatTablesTest : public ANGLETest
>+{};
>+
>+struct ParametersToTest
>+{
>+    VkImageType imageType;
>+    VkImageCreateFlags createFlags;
>+};
>+
>+// This test enumerates all GL formats - for each, it queries the Vulkan support for
>+// using it as a texture, filterable, and a render target. It checks this against our
>+// speed-optimized baked tables, and validates they would give the same result.
>+TEST_P(VulkanFormatTablesTest, TestFormatSupport)
>+{
>+    ASSERT_TRUE(IsVulkan());
>+
>+    // Hack the angle!
>+    const gl::Context *context = static_cast<gl::Context *>(getEGLWindow()->getContext());
>+    auto *contextVk            = rx::GetImplAs<rx::ContextVk>(context);
>+    rx::RendererVk *renderer   = contextVk->getRenderer();
>+
>+    // We need to test normal 2D images as well as Cube images.
>+    const std::vector<ParametersToTest> parametersToTest = {
>+        {VK_IMAGE_TYPE_2D, 0}, {VK_IMAGE_TYPE_2D, VK_IMAGE_CREATE_CUBE_COMPATIBLE_BIT}};
>+
>+    const gl::FormatSet &allFormats = gl::GetAllSizedInternalFormats();
>+    for (GLenum internalFormat : allFormats)
>+    {
>+        const rx::vk::Format &vkFormat = renderer->getFormat(internalFormat);
>+
>+        // Similar loop as when we build caps in vk_caps_utils.cpp, but query using
>+        // vkGetPhysicalDeviceImageFormatProperties instead of vkGetPhysicalDeviceFormatProperties
>+        // and verify we have all the same caps.
>+        if (!vkFormat.valid())
>+        {
>+            // TODO(jmadill): Every angle format should be mapped to a vkFormat.
>+            // This hasn't been defined in our vk_format_map.json yet so the caps won't be filled.
>+            continue;
>+        }
>+
>+        const gl::TextureCaps &textureCaps = renderer->getNativeTextureCaps().get(internalFormat);
>+
>+        for (const ParametersToTest params : parametersToTest)
>+        {
>+            // Now lets verify that that agaisnt vulkan.
>+            VkFormatProperties formatProperties;
>+            vkGetPhysicalDeviceFormatProperties(renderer->getPhysicalDevice(),
>+                                                vkFormat.vkImageFormat, &formatProperties);
>+
>+            VkImageFormatProperties imageProperties;
>+
>+            // isTexturable?
>+            bool isTexturable =
>+                vkGetPhysicalDeviceImageFormatProperties(
>+                    renderer->getPhysicalDevice(), vkFormat.vkImageFormat, params.imageType,
>+                    VK_IMAGE_TILING_OPTIMAL, VK_IMAGE_USAGE_SAMPLED_BIT, params.createFlags,
>+                    &imageProperties) == VK_SUCCESS;
>+            EXPECT_EQ(isTexturable, textureCaps.texturable) << vkFormat.vkImageFormat;
>+
>+            // TODO(jmadill): Support ES3 textures.
>+
>+            // isFilterable?
>+            bool isFilterable = (formatProperties.optimalTilingFeatures &
>+                                 VK_FORMAT_FEATURE_SAMPLED_IMAGE_FILTER_LINEAR_BIT) ==
>+                                VK_FORMAT_FEATURE_SAMPLED_IMAGE_FILTER_LINEAR_BIT;
>+            EXPECT_EQ(isFilterable, textureCaps.filterable) << vkFormat.vkImageFormat;
>+
>+            // isRenderable?
>+            const bool isRenderableColor =
>+                (vkGetPhysicalDeviceImageFormatProperties(
>+                    renderer->getPhysicalDevice(), vkFormat.vkImageFormat, params.imageType,
>+                    VK_IMAGE_TILING_OPTIMAL, VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT,
>+                    params.createFlags, &imageProperties)) == VK_SUCCESS;
>+            const bool isRenderableDepthStencil =
>+                (vkGetPhysicalDeviceImageFormatProperties(
>+                    renderer->getPhysicalDevice(), vkFormat.vkImageFormat, params.imageType,
>+                    VK_IMAGE_TILING_OPTIMAL, VK_IMAGE_USAGE_DEPTH_STENCIL_ATTACHMENT_BIT,
>+                    params.createFlags, &imageProperties)) == VK_SUCCESS;
>+
>+            bool isRenderable = isRenderableColor || isRenderableDepthStencil;
>+            EXPECT_EQ(isRenderable, textureCaps.textureAttachment) << vkFormat.vkImageFormat;
>+            EXPECT_EQ(isRenderable, textureCaps.renderbuffer) << vkFormat.vkImageFormat;
>+        }
>+    }
>+}
>+
>+ANGLE_INSTANTIATE_TEST(VulkanFormatTablesTest, ES2_VULKAN());
>+
>+}  // anonymous namespace
>diff --git a/Source/ThirdParty/ANGLE/src/tests/gl_tests/VulkanUniformUpdatesTest.cpp b/Source/ThirdParty/ANGLE/src/tests/gl_tests/VulkanUniformUpdatesTest.cpp
>new file mode 100644
>index 00000000000..30be1d20c49
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/tests/gl_tests/VulkanUniformUpdatesTest.cpp
>@@ -0,0 +1,318 @@
>+//
>+// Copyright 2018 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// VulkanUniformUpdatesTest:
>+//   Tests to validate our Vulkan dynamic uniform updates are working as expected.
>+//
>+
>+#include "test_utils/ANGLETest.h"
>+#include "test_utils/angle_test_instantiate.h"
>+// 'None' is defined as 'struct None {};' in
>+// third_party/googletest/src/googletest/include/gtest/internal/gtest-type-util.h.
>+// But 'None' is also defined as a numeric constant 0L in <X11/X.h>.
>+// So we need to include ANGLETest.h first to avoid this conflict.
>+
>+#include "libANGLE/Context.h"
>+#include "libANGLE/angletypes.h"
>+#include "libANGLE/renderer/vulkan/ContextVk.h"
>+#include "libANGLE/renderer/vulkan/ProgramVk.h"
>+#include "test_utils/gl_raii.h"
>+#include "util/EGLWindow.h"
>+
>+using namespace angle;
>+
>+namespace
>+{
>+
>+class VulkanUniformUpdatesTest : public ANGLETest
>+{
>+  protected:
>+    rx::ContextVk *hackANGLE() const
>+    {
>+        // Hack the angle!
>+        const gl::Context *context = static_cast<gl::Context *>(getEGLWindow()->getContext());
>+        return rx::GetImplAs<rx::ContextVk>(context);
>+    }
>+
>+    rx::ProgramVk *hackProgram(GLuint handle) const
>+    {
>+        // Hack the angle!
>+        const gl::Context *context = static_cast<gl::Context *>(getEGLWindow()->getContext());
>+        const gl::Program *program = context->getProgramResolveLink(handle);
>+        return rx::vk::GetImpl(program);
>+    }
>+
>+    static constexpr uint32_t kMaxSetsForTesting = 32;
>+
>+    void limitMaxSets()
>+    {
>+        rx::ContextVk *contextVk = hackANGLE();
>+
>+        // Force a small limit on the max sets per pool to more easily trigger a new allocation.
>+        rx::vk::DynamicDescriptorPool *uniformPool =
>+            contextVk->getDynamicDescriptorPool(rx::kUniformsDescriptorSetIndex);
>+        uniformPool->setMaxSetsPerPoolForTesting(kMaxSetsForTesting);
>+        VkDescriptorPoolSize uniformSetSize = {VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER_DYNAMIC,
>+                                               rx::GetUniformBufferDescriptorCount()};
>+        (void)uniformPool->init(contextVk, &uniformSetSize, 1);
>+
>+        rx::vk::DynamicDescriptorPool *texturePool =
>+            contextVk->getDynamicDescriptorPool(rx::kTextureDescriptorSetIndex);
>+        texturePool->setMaxSetsPerPoolForTesting(kMaxSetsForTesting);
>+        VkDescriptorPoolSize textureSetSize = {VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER,
>+                                               contextVk->getRenderer()->getMaxActiveTextures()};
>+        (void)texturePool->init(contextVk, &textureSetSize, 1);
>+    }
>+};
>+
>+// This test updates a uniform until a new buffer is allocated and then make sure the uniform
>+// updates still work.
>+TEST_P(VulkanUniformUpdatesTest, UpdateUntilNewBufferIsAllocated)
>+{
>+    ASSERT_TRUE(IsVulkan());
>+
>+    limitMaxSets();
>+
>+    constexpr char kPositionUniformVertexShader[] = R"(attribute vec2 position;
>+uniform vec2 uniPosModifier;
>+void main()
>+{
>+    gl_Position = vec4(position + uniPosModifier, 0, 1);
>+})";
>+
>+    constexpr char kColorUniformFragmentShader[] = R"(precision mediump float;
>+uniform vec4 uniColor;
>+void main()
>+{
>+    gl_FragColor = uniColor;
>+})";
>+
>+    ANGLE_GL_PROGRAM(program, kPositionUniformVertexShader, kColorUniformFragmentShader);
>+    glUseProgram(program);
>+
>+    rx::ProgramVk *programVk = hackProgram(program);
>+
>+    // Set a really small min size so that uniform updates often allocates a new buffer.
>+    programVk->setDefaultUniformBlocksMinSizeForTesting(128);
>+
>+    GLint posUniformLocation = glGetUniformLocation(program, "uniPosModifier");
>+    ASSERT_NE(posUniformLocation, -1);
>+    GLint colorUniformLocation = glGetUniformLocation(program, "uniColor");
>+    ASSERT_NE(colorUniformLocation, -1);
>+
>+    // Sets both uniforms 10 times, it should certainly trigger new buffers creations by the
>+    // underlying StreamingBuffer.
>+    for (int i = 0; i < 100; i++)
>+    {
>+        glUniform2f(posUniformLocation, -0.5, 0.0);
>+        glUniform4f(colorUniformLocation, 1.0, 0.0, 0.0, 1.0);
>+        drawQuad(program, "position", 0.5f, 1.0f);
>+        swapBuffers();
>+        ASSERT_GL_NO_ERROR();
>+    }
>+}
>+
>+void InitTexture(GLColor color, GLTexture *texture)
>+{
>+    const std::vector<GLColor> colors(4, color);
>+    glBindTexture(GL_TEXTURE_2D, *texture);
>+    glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, 2, 2, 0, GL_RGBA, GL_UNSIGNED_BYTE, colors.data());
>+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
>+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
>+}
>+
>+// Force uniform updates until the dynamic descriptor pool wraps into a new pool allocation.
>+TEST_P(VulkanUniformUpdatesTest, DescriptorPoolUpdates)
>+{
>+    ASSERT_TRUE(IsVulkan());
>+
>+    // Force a small limit on the max sets per pool to more easily trigger a new allocation.
>+    limitMaxSets();
>+
>+    // Initialize texture program.
>+    GLuint program = get2DTexturedQuadProgram();
>+    ASSERT_NE(0u, program);
>+    glUseProgram(program);
>+
>+    GLint texLoc = glGetUniformLocation(program, "tex");
>+    ASSERT_NE(-1, texLoc);
>+
>+    // Initialize basic red texture.
>+    const std::vector<GLColor> redColors(4, GLColor::red);
>+    GLTexture texture;
>+    glBindTexture(GL_TEXTURE_2D, texture);
>+    glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, 2, 2, 0, GL_RGBA, GL_UNSIGNED_BYTE, redColors.data());
>+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
>+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
>+    ASSERT_GL_NO_ERROR();
>+
>+    // Draw multiple times, each iteration will create a new descriptor set.
>+    for (uint32_t iteration = 0; iteration < kMaxSetsForTesting * 8; ++iteration)
>+    {
>+        glUniform1i(texLoc, 0);
>+        drawQuad(program, "position", 0.5f, 1.0f, true);
>+        swapBuffers();
>+        ASSERT_GL_NO_ERROR();
>+    }
>+}
>+
>+// Uniform updates along with Texture updates.
>+TEST_P(VulkanUniformUpdatesTest, DescriptorPoolUniformAndTextureUpdates)
>+{
>+    ASSERT_TRUE(IsVulkan());
>+
>+    limitMaxSets();
>+
>+    // Initialize texture program.
>+    constexpr char kVS[] = R"(attribute vec2 position;
>+varying mediump vec2 texCoord;
>+void main()
>+{
>+    gl_Position = vec4(position, 0, 1);
>+    texCoord = position * 0.5 + vec2(0.5);
>+})";
>+
>+    constexpr char kFS[] = R"(varying mediump vec2 texCoord;
>+uniform sampler2D tex;
>+uniform mediump vec4 colorMask;
>+void main()
>+{
>+    gl_FragColor = texture2D(tex, texCoord) * colorMask;
>+})";
>+
>+    ANGLE_GL_PROGRAM(program, kVS, kFS);
>+    glUseProgram(program);
>+
>+    // Get uniform locations.
>+    GLint texLoc = glGetUniformLocation(program, "tex");
>+    ASSERT_NE(-1, texLoc);
>+
>+    GLint colorMaskLoc = glGetUniformLocation(program, "colorMask");
>+    ASSERT_NE(-1, colorMaskLoc);
>+
>+    // Initialize white texture.
>+    GLTexture whiteTexture;
>+    InitTexture(GLColor::white, &whiteTexture);
>+    ASSERT_GL_NO_ERROR();
>+
>+    glActiveTexture(GL_TEXTURE0);
>+    glBindTexture(GL_TEXTURE_2D, whiteTexture);
>+
>+    // Initialize magenta texture.
>+    GLTexture magentaTexture;
>+    InitTexture(GLColor::magenta, &magentaTexture);
>+    ASSERT_GL_NO_ERROR();
>+
>+    glActiveTexture(GL_TEXTURE1);
>+    glBindTexture(GL_TEXTURE_2D, magentaTexture);
>+
>+    // Draw multiple times, each iteration will create a new descriptor set.
>+    for (uint32_t iteration = 0; iteration < kMaxSetsForTesting * 2; ++iteration)
>+    {
>+        // Draw with white.
>+        glUniform1i(texLoc, 0);
>+        glUniform4f(colorMaskLoc, 1.0f, 1.0f, 1.0f, 1.0f);
>+        drawQuad(program, "position", 0.5f, 1.0f, true);
>+
>+        // Draw with white masking out red.
>+        glUniform4f(colorMaskLoc, 0.0f, 1.0f, 1.0f, 1.0f);
>+        drawQuad(program, "position", 0.5f, 1.0f, true);
>+
>+        // Draw with magenta.
>+        glUniform1i(texLoc, 1);
>+        glUniform4f(colorMaskLoc, 1.0f, 1.0f, 1.0f, 1.0f);
>+        drawQuad(program, "position", 0.5f, 1.0f, true);
>+
>+        // Draw with magenta masking out red.
>+        glUniform4f(colorMaskLoc, 0.0f, 1.0f, 1.0f, 1.0f);
>+        drawQuad(program, "position", 0.5f, 1.0f, true);
>+
>+        swapBuffers();
>+        ASSERT_GL_NO_ERROR();
>+    }
>+}
>+
>+// Uniform updates along with Texture updates.
>+TEST_P(VulkanUniformUpdatesTest, DescriptorPoolUniformAndTextureUpdatesTwoShaders)
>+{
>+    ASSERT_TRUE(IsVulkan());
>+
>+    // Force a small limit on the max sets per pool to more easily trigger a new allocation.
>+    limitMaxSets();
>+
>+    // Initialize program.
>+    constexpr char kVS[] = R"(attribute vec2 position;
>+varying mediump vec2 texCoord;
>+void main()
>+{
>+    gl_Position = vec4(position, 0, 1);
>+    texCoord = position * 0.5 + vec2(0.5);
>+})";
>+
>+    constexpr char kFS[] = R"(varying mediump vec2 texCoord;
>+uniform mediump vec4 colorMask;
>+void main()
>+{
>+    gl_FragColor = colorMask;
>+})";
>+
>+    ANGLE_GL_PROGRAM(program1, kVS, kFS);
>+    ANGLE_GL_PROGRAM(program2, kVS, kFS);
>+    glUseProgram(program1);
>+
>+    rx::ProgramVk *program1Vk = hackProgram(program1);
>+    rx::ProgramVk *program2Vk = hackProgram(program2);
>+
>+    // Set a really small min size so that uniform updates often allocates a new buffer.
>+    program1Vk->setDefaultUniformBlocksMinSizeForTesting(128);
>+    program2Vk->setDefaultUniformBlocksMinSizeForTesting(128);
>+
>+    // Get uniform locations.
>+    GLint colorMaskLoc1 = glGetUniformLocation(program1, "colorMask");
>+    ASSERT_NE(-1, colorMaskLoc1);
>+    GLint colorMaskLoc2 = glGetUniformLocation(program2, "colorMask");
>+    ASSERT_NE(-1, colorMaskLoc2);
>+
>+    // Draw with white using program1.
>+    glUniform4f(colorMaskLoc1, 1.0f, 1.0f, 1.0f, 1.0f);
>+    drawQuad(program1, "position", 0.5f, 1.0f, true);
>+    swapBuffers();
>+    ASSERT_GL_NO_ERROR();
>+
>+    // Now switch to use program2
>+    glUseProgram(program2);
>+    // Draw multiple times w/ program2, each iteration will create a new descriptor set.
>+    // This will cause the first descriptor pool to be cleaned up
>+    for (uint32_t iteration = 0; iteration < kMaxSetsForTesting * 2; ++iteration)
>+    {
>+        // Draw with white.
>+        glUniform4f(colorMaskLoc2, 1.0f, 1.0f, 1.0f, 1.0f);
>+        drawQuad(program2, "position", 0.5f, 1.0f, true);
>+
>+        // Draw with white masking out red.
>+        glUniform4f(colorMaskLoc2, 0.0f, 1.0f, 1.0f, 1.0f);
>+        drawQuad(program2, "position", 0.5f, 1.0f, true);
>+
>+        // Draw with magenta.
>+        glUniform4f(colorMaskLoc2, 1.0f, 1.0f, 1.0f, 1.0f);
>+        drawQuad(program2, "position", 0.5f, 1.0f, true);
>+
>+        // Draw with magenta masking out red.
>+        glUniform4f(colorMaskLoc2, 0.0f, 1.0f, 1.0f, 1.0f);
>+        drawQuad(program2, "position", 0.5f, 1.0f, true);
>+
>+        swapBuffers();
>+        ASSERT_GL_NO_ERROR();
>+    }
>+    // Finally, attempt to draw again with program1, with original uniform values.
>+    glUseProgram(program1);
>+    drawQuad(program1, "position", 0.5f, 1.0f, true);
>+    swapBuffers();
>+    ASSERT_GL_NO_ERROR();
>+}
>+
>+ANGLE_INSTANTIATE_TEST(VulkanUniformUpdatesTest, ES2_VULKAN());
>+
>+}  // anonymous namespace
>diff --git a/Source/ThirdParty/ANGLE/src/tests/gl_tests/WebGLCompatibilityTest.cpp b/Source/ThirdParty/ANGLE/src/tests/gl_tests/WebGLCompatibilityTest.cpp
>index 76ed9b77960..89392516fed 100644
>--- a/Source/ThirdParty/ANGLE/src/tests/gl_tests/WebGLCompatibilityTest.cpp
>+++ b/Source/ThirdParty/ANGLE/src/tests/gl_tests/WebGLCompatibilityTest.cpp
>@@ -43,6 +43,7 @@ constexpr const char *FloatingPointTextureExtensions[] = {
>     "GL_OES_texture_float",
>     "GL_OES_texture_float_linear",
>     "GL_EXT_color_buffer_float",
>+    "GL_EXT_float_blend",
>     "GL_CHROMIUM_color_buffer_float_rgba",
>     "GL_CHROMIUM_color_buffer_float_rgb",
> };
>@@ -85,45 +86,46 @@ class WebGLCompatibilityTest : public ANGLETest
>     {
>         ASSERT_GL_NO_ERROR();
> 
>-        const std::string samplingVs =
>-            "attribute vec4 position;\n"
>-            "varying vec2 texcoord;\n"
>-            "void main()\n"
>-            "{\n"
>-            "    gl_Position = vec4(position.xy, 0.0, 1.0);\n"
>-            "    texcoord = (position.xy * 0.5) + 0.5;\n"
>-            "}\n";
>-
>-        const std::string samplingFs =
>-            "precision mediump float;\n"
>-            "uniform sampler2D tex;\n"
>-            "uniform vec4 subtractor;\n"
>-            "varying vec2 texcoord;\n"
>-            "void main()\n"
>-            "{\n"
>-            "    vec4 color = texture2D(tex, texcoord);\n"
>-            "    if (abs(color.r - subtractor.r) +\n"
>-            "        abs(color.g - subtractor.g) +\n"
>-            "        abs(color.b - subtractor.b) +\n"
>-            "        abs(color.a - subtractor.a) < 8.0)\n"
>-            "    {\n"
>-            "        gl_FragColor = vec4(0.0, 1.0, 0.0, 1.0);\n"
>-            "    }\n"
>-            "    else\n"
>-            "    {\n"
>-            "        gl_FragColor = vec4(1.0, 0.0, 0.0, 1.0);\n"
>-            "    }\n"
>-            "}\n";
>-
>-        ANGLE_GL_PROGRAM(samplingProgram, samplingVs, samplingFs);
>+        constexpr char kVS[] =
>+            R"(attribute vec4 position;
>+varying vec2 texcoord;
>+void main()
>+{
>+    gl_Position = vec4(position.xy, 0.0, 1.0);
>+    texcoord = (position.xy * 0.5) + 0.5;
>+})";
>+
>+        constexpr char kFS[] =
>+            R"(precision mediump float;
>+uniform sampler2D tex;
>+uniform vec4 subtractor;
>+varying vec2 texcoord;
>+void main()
>+{
>+    vec4 color = texture2D(tex, texcoord);
>+    if (abs(color.r - subtractor.r) +
>+        abs(color.g - subtractor.g) +
>+        abs(color.b - subtractor.b) +
>+        abs(color.a - subtractor.a) < 8.0)
>+    {
>+        gl_FragColor = vec4(0.0, 1.0, 0.0, 1.0);
>+    }
>+    else
>+    {
>+        gl_FragColor = vec4(1.0, 0.0, 0.0, 1.0);
>+    }
>+})";
>+
>+        ANGLE_GL_PROGRAM(samplingProgram, kVS, kFS);
>         glUseProgram(samplingProgram.get());
> 
>         // Need RGBA8 renderbuffers for enough precision on the readback
>-        if (extensionRequestable("GL_OES_rgb8_rgba8"))
>+        if (IsGLExtensionRequestable("GL_OES_rgb8_rgba8"))
>         {
>             glRequestExtensionANGLE("GL_OES_rgb8_rgba8");
>         }
>-        ANGLE_SKIP_TEST_IF(!extensionEnabled("GL_OES_rgb8_rgba8") && getClientMajorVersion() < 3);
>+        ANGLE_SKIP_TEST_IF(!IsGLExtensionEnabled("GL_OES_rgb8_rgba8") &&
>+                           getClientMajorVersion() < 3);
>         ASSERT_GL_NO_ERROR();
> 
>         GLRenderbuffer rbo;
>@@ -149,7 +151,7 @@ class WebGLCompatibilityTest : public ANGLETest
>             }
>             else
>             {
>-                ASSERT_TRUE(extensionEnabled("GL_EXT_texture_storage"));
>+                ASSERT_TRUE(IsGLExtensionEnabled("GL_EXT_texture_storage"));
>                 glTexStorage2DEXT(GL_TEXTURE_2D, 1, internalFormat, 1, 1);
>             }
>             glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, 1, 1, format, type, textureData);
>@@ -197,34 +199,74 @@ class WebGLCompatibilityTest : public ANGLETest
>                              glCheckFramebufferStatus(GL_FRAMEBUFFER));
>             return;
>         }
>-        ASSERT_GLENUM_EQ(GL_FRAMEBUFFER_COMPLETE, glCheckFramebufferStatus(GL_FRAMEBUFFER));
> 
>-        const std::string renderingVs =
>-            "attribute vec4 position;\n"
>-            "void main()\n"
>-            "{\n"
>-            "    gl_Position = vec4(position.xy, 0.0, 1.0);\n"
>-            "}\n";
>-
>-        const std::string renderingFs =
>-            "precision mediump float;\n"
>-            "uniform vec4 writeValue;\n"
>-            "void main()\n"
>-            "{\n"
>-            "   gl_FragColor = writeValue;\n"
>-            "}\n";
>-
>-        ANGLE_GL_PROGRAM(renderingProgram, renderingVs, renderingFs);
>+        GLenum framebufferStatus = glCheckFramebufferStatus(GL_FRAMEBUFFER);
>+        if (framebufferStatus == GL_FRAMEBUFFER_UNSUPPORTED)
>+        {
>+            std::cout << "Framebuffer returned GL_FRAMEBUFFER_UNSUPPORTED, this is legal."
>+                      << std::endl;
>+            return;
>+        }
>+        ASSERT_GLENUM_EQ(GL_FRAMEBUFFER_COMPLETE, framebufferStatus);
>+
>+        ANGLE_GL_PROGRAM(renderingProgram, essl1_shaders::vs::Simple(),
>+                         essl1_shaders::fs::UniformColor());
>         glUseProgram(renderingProgram.get());
> 
>-        glUniform4fv(glGetUniformLocation(renderingProgram.get(), "writeValue"), 1, floatData);
>+        glUniform4fv(glGetUniformLocation(renderingProgram.get(), essl1_shaders::ColorUniform()), 1,
>+                     floatData);
> 
>-        drawQuad(renderingProgram.get(), "position", 0.5f, 1.0f, true);
>+        drawQuad(renderingProgram.get(), essl1_shaders::PositionAttrib(), 0.5f, 1.0f, true);
> 
>         EXPECT_PIXEL_COLOR32F_NEAR(
>             0, 0, GLColor32F(floatData[0], floatData[1], floatData[2], floatData[3]), 1.0f);
>     }
> 
>+    void TestExtFloatBlend(bool shouldBlend)
>+    {
>+        constexpr char kVS[] =
>+            R"(void main()
>+{
>+    gl_Position = vec4(0, 0, 0, 1);
>+})";
>+
>+        constexpr char kFS[] =
>+            R"(void main()
>+{
>+    gl_FragColor = vec4(0, 1, 0, 1);
>+})";
>+
>+        ANGLE_GL_PROGRAM(program, kVS, kFS);
>+        glUseProgram(program);
>+
>+        GLTexture texture;
>+        glBindTexture(GL_TEXTURE_2D, texture);
>+        glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA32F, 1, 1, 0, GL_RGBA, GL_FLOAT, nullptr);
>+        EXPECT_GL_NO_ERROR();
>+
>+        GLFramebuffer fbo;
>+        glBindFramebuffer(GL_FRAMEBUFFER, fbo);
>+        glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, texture, 0);
>+        ASSERT_EGLENUM_EQ(GL_FRAMEBUFFER_COMPLETE, glCheckFramebufferStatus(GL_FRAMEBUFFER));
>+
>+        glDisable(GL_BLEND);
>+        glDrawArrays(GL_POINTS, 0, 1);
>+        EXPECT_GL_NO_ERROR();
>+
>+        glEnable(GL_BLEND);
>+        glDrawArrays(GL_POINTS, 0, 1);
>+        if (shouldBlend)
>+        {
>+            EXPECT_GL_NO_ERROR();
>+        }
>+        else
>+        {
>+            EXPECT_GL_ERROR(GL_INVALID_OPERATION);
>+        }
>+    }
>+
>+    void TestDifferentStencilMaskAndRef(GLenum errIfMismatch);
>+
>     // Called from RenderingFeedbackLoopWithDrawBuffersEXT.
>     void drawBuffersEXTFeedbackLoop(GLuint program,
>                                     const std::array<GLenum, 2> &drawBuffers,
>@@ -248,20 +290,19 @@ class WebGLCompatibilityTest : public ANGLETest
> };
> 
> class WebGL2CompatibilityTest : public WebGLCompatibilityTest
>-{
>-};
>+{};
> 
> // Context creation would fail if EGL_ANGLE_create_context_webgl_compatibility was not available so
> // the GL extension should always be present
> TEST_P(WebGLCompatibilityTest, ExtensionStringExposed)
> {
>-    EXPECT_TRUE(extensionEnabled("GL_ANGLE_webgl_compatibility"));
>+    EXPECT_TRUE(IsGLExtensionEnabled("GL_ANGLE_webgl_compatibility"));
> }
> 
> // Verify that all extension entry points are available
> TEST_P(WebGLCompatibilityTest, EntryPoints)
> {
>-    if (extensionEnabled("GL_ANGLE_request_extension"))
>+    if (IsGLExtensionEnabled("GL_ANGLE_request_extension"))
>     {
>         EXPECT_NE(nullptr, eglGetProcAddress("glRequestExtensionANGLE"));
>     }
>@@ -299,7 +340,7 @@ TEST_P(WebGLCompatibilityTest, EnableExtensionUintIndices)
>         return;
>     }
> 
>-    EXPECT_FALSE(extensionEnabled("GL_OES_element_index_uint"));
>+    EXPECT_FALSE(IsGLExtensionEnabled("GL_OES_element_index_uint"));
> 
>     GLBuffer indexBuffer;
>     glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, indexBuffer.get());
>@@ -308,17 +349,17 @@ TEST_P(WebGLCompatibilityTest, EnableExtensionUintIndices)
>     glBufferData(GL_ELEMENT_ARRAY_BUFFER, sizeof(data), data, GL_STATIC_DRAW);
> 
>     ANGLE_GL_PROGRAM(program, "void main() { gl_Position = vec4(0, 0, 0, 1); }",
>-                     "void main() { gl_FragColor = vec4(0, 1, 0, 1); }")
>+                     "void main() { gl_FragColor = vec4(0, 1, 0, 1); }");
>     glUseProgram(program.get());
> 
>     glDrawElements(GL_TRIANGLES, 6, GL_UNSIGNED_INT, nullptr);
>     EXPECT_GL_ERROR(GL_INVALID_ENUM);
> 
>-    if (extensionRequestable("GL_OES_element_index_uint"))
>+    if (IsGLExtensionRequestable("GL_OES_element_index_uint"))
>     {
>         glRequestExtensionANGLE("GL_OES_element_index_uint");
>         EXPECT_GL_NO_ERROR();
>-        EXPECT_TRUE(extensionEnabled("GL_OES_element_index_uint"));
>+        EXPECT_TRUE(IsGLExtensionEnabled("GL_OES_element_index_uint"));
> 
>         glDrawElements(GL_TRIANGLES, 6, GL_UNSIGNED_INT, nullptr);
>         EXPECT_GL_NO_ERROR();
>@@ -328,20 +369,20 @@ TEST_P(WebGLCompatibilityTest, EnableExtensionUintIndices)
> // Test enabling the GL_OES_standard_derivatives extension
> TEST_P(WebGLCompatibilityTest, EnableExtensionStandardDerivitives)
> {
>-    EXPECT_FALSE(extensionEnabled("GL_OES_standard_derivatives"));
>+    EXPECT_FALSE(IsGLExtensionEnabled("GL_OES_standard_derivatives"));
> 
>-    const std::string source =
>-        "#extension GL_OES_standard_derivatives : require\n"
>-        "void main() { gl_FragColor = vec4(dFdx(vec2(1.0, 1.0)).x, 1, 0, 1); }\n";
>-    ASSERT_EQ(0u, CompileShader(GL_FRAGMENT_SHADER, source));
>+    constexpr char kFS[] =
>+        R"(#extension GL_OES_standard_derivatives : require
>+void main() { gl_FragColor = vec4(dFdx(vec2(1.0, 1.0)).x, 1, 0, 1); })";
>+    ASSERT_EQ(0u, CompileShader(GL_FRAGMENT_SHADER, kFS));
> 
>-    if (extensionRequestable("GL_OES_standard_derivatives"))
>+    if (IsGLExtensionRequestable("GL_OES_standard_derivatives"))
>     {
>         glRequestExtensionANGLE("GL_OES_standard_derivatives");
>         EXPECT_GL_NO_ERROR();
>-        EXPECT_TRUE(extensionEnabled("GL_OES_standard_derivatives"));
>+        EXPECT_TRUE(IsGLExtensionEnabled("GL_OES_standard_derivatives"));
> 
>-        GLuint shader = CompileShader(GL_FRAGMENT_SHADER, source);
>+        GLuint shader = CompileShader(GL_FRAGMENT_SHADER, kFS);
>         ASSERT_NE(0u, shader);
>         glDeleteShader(shader);
>     }
>@@ -350,24 +391,24 @@ TEST_P(WebGLCompatibilityTest, EnableExtensionStandardDerivitives)
> // Test enabling the GL_EXT_shader_texture_lod extension
> TEST_P(WebGLCompatibilityTest, EnableExtensionTextureLOD)
> {
>-    EXPECT_FALSE(extensionEnabled("GL_EXT_shader_texture_lod"));
>-
>-    const std::string source =
>-        "#extension GL_EXT_shader_texture_lod : require\n"
>-        "uniform sampler2D u_texture;\n"
>-        "void main() {\n"
>-        "    gl_FragColor = texture2DGradEXT(u_texture, vec2(0.0, 0.0), vec2(0.0, 0.0), vec2(0.0, "
>-        "0.0));\n"
>-        "}\n";
>-    ASSERT_EQ(0u, CompileShader(GL_FRAGMENT_SHADER, source));
>-
>-    if (extensionRequestable("GL_EXT_shader_texture_lod"))
>+    EXPECT_FALSE(IsGLExtensionEnabled("GL_EXT_shader_texture_lod"));
>+
>+    constexpr char kFS[] =
>+        R"(#extension GL_EXT_shader_texture_lod : require
>+uniform sampler2D u_texture;
>+void main() {
>+    gl_FragColor = texture2DGradEXT(u_texture, vec2(0.0, 0.0), vec2(0.0, 0.0), vec2(0.0,
>+0.0));
>+})";
>+    ASSERT_EQ(0u, CompileShader(GL_FRAGMENT_SHADER, kFS));
>+
>+    if (IsGLExtensionRequestable("GL_EXT_shader_texture_lod"))
>     {
>         glRequestExtensionANGLE("GL_EXT_shader_texture_lod");
>         EXPECT_GL_NO_ERROR();
>-        EXPECT_TRUE(extensionEnabled("GL_EXT_shader_texture_lod"));
>+        EXPECT_TRUE(IsGLExtensionEnabled("GL_EXT_shader_texture_lod"));
> 
>-        GLuint shader = CompileShader(GL_FRAGMENT_SHADER, source);
>+        GLuint shader = CompileShader(GL_FRAGMENT_SHADER, kFS);
>         ASSERT_NE(0u, shader);
>         glDeleteShader(shader);
>     }
>@@ -376,23 +417,23 @@ TEST_P(WebGLCompatibilityTest, EnableExtensionTextureLOD)
> // Test enabling the GL_EXT_frag_depth extension
> TEST_P(WebGLCompatibilityTest, EnableExtensionFragDepth)
> {
>-    EXPECT_FALSE(extensionEnabled("GL_EXT_frag_depth"));
>+    EXPECT_FALSE(IsGLExtensionEnabled("GL_EXT_frag_depth"));
> 
>-    const std::string source =
>-        "#extension GL_EXT_frag_depth : require\n"
>-        "void main() {\n"
>-        "    gl_FragColor = vec4(0.0, 0.0, 0.0, 1.0);\n"
>-        "    gl_FragDepthEXT = 1.0;\n"
>-        "}\n";
>-    ASSERT_EQ(0u, CompileShader(GL_FRAGMENT_SHADER, source));
>+    constexpr char kFS[] =
>+        R"(#extension GL_EXT_frag_depth : require
>+void main() {
>+    gl_FragColor = vec4(0.0, 0.0, 0.0, 1.0);
>+    gl_FragDepthEXT = 1.0;
>+})";
>+    ASSERT_EQ(0u, CompileShader(GL_FRAGMENT_SHADER, kFS));
> 
>-    if (extensionRequestable("GL_EXT_frag_depth"))
>+    if (IsGLExtensionRequestable("GL_EXT_frag_depth"))
>     {
>         glRequestExtensionANGLE("GL_EXT_frag_depth");
>         EXPECT_GL_NO_ERROR();
>-        EXPECT_TRUE(extensionEnabled("GL_EXT_frag_depth"));
>+        EXPECT_TRUE(IsGLExtensionEnabled("GL_EXT_frag_depth"));
> 
>-        GLuint shader = CompileShader(GL_FRAGMENT_SHADER, source);
>+        GLuint shader = CompileShader(GL_FRAGMENT_SHADER, kFS);
>         ASSERT_NE(0u, shader);
>         glDeleteShader(shader);
>     }
>@@ -401,7 +442,7 @@ TEST_P(WebGLCompatibilityTest, EnableExtensionFragDepth)
> // Test enabling the GL_EXT_texture_filter_anisotropic extension
> TEST_P(WebGLCompatibilityTest, EnableExtensionTextureFilterAnisotropic)
> {
>-    EXPECT_FALSE(extensionEnabled("GL_EXT_texture_filter_anisotropic"));
>+    EXPECT_FALSE(IsGLExtensionEnabled("GL_EXT_texture_filter_anisotropic"));
> 
>     GLfloat maxAnisotropy = 0.0f;
>     glGetFloatv(GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT, &maxAnisotropy);
>@@ -418,11 +459,11 @@ TEST_P(WebGLCompatibilityTest, EnableExtensionTextureFilterAnisotropic)
>     glGetTexParameterfv(GL_TEXTURE_2D, GL_TEXTURE_MAX_ANISOTROPY_EXT, &currentAnisotropy);
>     EXPECT_GL_ERROR(GL_INVALID_ENUM);
> 
>-    if (extensionRequestable("GL_EXT_texture_filter_anisotropic"))
>+    if (IsGLExtensionRequestable("GL_EXT_texture_filter_anisotropic"))
>     {
>         glRequestExtensionANGLE("GL_EXT_texture_filter_anisotropic");
>         EXPECT_GL_NO_ERROR();
>-        EXPECT_TRUE(extensionEnabled("GL_EXT_texture_filter_anisotropic"));
>+        EXPECT_TRUE(IsGLExtensionEnabled("GL_EXT_texture_filter_anisotropic"));
> 
>         glGetFloatv(GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT, &maxAnisotropy);
>         ASSERT_GL_NO_ERROR();
>@@ -437,29 +478,98 @@ TEST_P(WebGLCompatibilityTest, EnableExtensionTextureFilterAnisotropic)
>     }
> }
> 
>+// Test enabling the EGL image extensions
>+TEST_P(WebGLCompatibilityTest, EnableExtensionEGLImage)
>+{
>+    EXPECT_FALSE(IsGLExtensionEnabled("GL_OES_EGL_image"));
>+    EXPECT_FALSE(IsGLExtensionEnabled("GL_OES_EGL_image_external"));
>+    EXPECT_FALSE(IsGLExtensionEnabled("GL_OES_EGL_image_external_essl3"));
>+    EXPECT_FALSE(IsGLExtensionEnabled("NV_EGL_stream_consumer_external"));
>+
>+    constexpr char kFSES2[] =
>+        R"(#extension GL_OES_EGL_image_external : require
>+precision highp float;
>+uniform samplerExternalOES sampler;
>+void main()
>+{
>+    gl_FragColor = texture2D(sampler, vec2(0, 0));
>+})";
>+    EXPECT_EQ(0u, CompileShader(GL_FRAGMENT_SHADER, kFSES2));
>+
>+    constexpr char kFSES3[] =
>+        R"(#version 300 es
>+#extension GL_OES_EGL_image_external : require
>+precision highp float;
>+uniform samplerExternalOES sampler;
>+void main()
>+{
>+    gl_FragColor = texture(sampler, vec2(0, 0));
>+})";
>+    if (getClientMajorVersion() > 3)
>+    {
>+        EXPECT_EQ(0u, CompileShader(GL_FRAGMENT_SHADER, kFSES3));
>+    }
>+
>+    glBindTexture(GL_TEXTURE_EXTERNAL_OES, 0);
>+    EXPECT_GL_ERROR(GL_INVALID_ENUM);
>+
>+    GLint result;
>+    glGetIntegerv(GL_TEXTURE_BINDING_EXTERNAL_OES, &result);
>+    EXPECT_GL_ERROR(GL_INVALID_ENUM);
>+
>+    if (IsGLExtensionRequestable("GL_OES_EGL_image_external"))
>+    {
>+        glRequestExtensionANGLE("GL_OES_EGL_image_external");
>+        EXPECT_GL_NO_ERROR();
>+        EXPECT_TRUE(IsGLExtensionEnabled("GL_OES_EGL_image_external"));
>+
>+        EXPECT_NE(0u, CompileShader(GL_FRAGMENT_SHADER, kFSES2));
>+
>+        glBindTexture(GL_TEXTURE_EXTERNAL_OES, 0);
>+        EXPECT_GL_NO_ERROR();
>+
>+        glGetIntegerv(GL_TEXTURE_BINDING_EXTERNAL_OES, &result);
>+        EXPECT_GL_NO_ERROR();
>+
>+        if (getClientMajorVersion() > 3 &&
>+            IsGLExtensionRequestable("GL_OES_EGL_image_external_essl3"))
>+        {
>+            glRequestExtensionANGLE("GL_OES_EGL_image_external_essl3");
>+            EXPECT_GL_NO_ERROR();
>+            EXPECT_TRUE(IsGLExtensionEnabled("GL_OES_EGL_image_external_essl3"));
>+
>+            EXPECT_NE(0u, CompileShader(GL_FRAGMENT_SHADER, kFSES3));
>+        }
>+        else
>+        {
>+            EXPECT_EQ(0u, CompileShader(GL_FRAGMENT_SHADER, kFSES3));
>+        }
>+    }
>+}
>+
> // Verify that shaders are of a compatible spec when the extension is enabled.
> TEST_P(WebGLCompatibilityTest, ExtensionCompilerSpec)
> {
>-    EXPECT_TRUE(extensionEnabled("GL_ANGLE_webgl_compatibility"));
>+    EXPECT_TRUE(IsGLExtensionEnabled("GL_ANGLE_webgl_compatibility"));
> 
>     // Use of reserved _webgl prefix should fail when the shader specification is for WebGL.
>-    const std::string &vert =
>-        "struct Foo {\n"
>-        "    int _webgl_bar;\n"
>-        "};\n"
>-        "void main()\n"
>-        "{\n"
>-        "    Foo foo = Foo(1);\n"
>-        "}";
>+    constexpr char kVS[] =
>+        R"(struct Foo {
>+    int _webgl_bar;
>+};
>+void main()
>+{
>+    Foo foo = Foo(1);
>+})";
> 
>     // Default fragement shader.
>-    const std::string &frag =
>-        "void main()\n"
>-        "{\n"
>-        "    gl_FragColor = vec4(1.0,0.0,0.0,1.0);\n"
>-        "}";
>+    constexpr char kFS[] =
>+        R"(void main()
>+{
>+    gl_FragColor = vec4(1.0,0.0,0.0,1.0);
>+})";
> 
>-    GLuint program = CompileProgram(vert, frag);
>+    GLuint program = CompileProgram(kVS, kFS);
>     EXPECT_EQ(0u, program);
>     glDeleteProgram(program);
> }
>@@ -467,9 +577,9 @@ TEST_P(WebGLCompatibilityTest, ExtensionCompilerSpec)
> // Test enabling the GL_NV_pixel_buffer_object extension
> TEST_P(WebGLCompatibilityTest, EnablePixelBufferObjectExtensions)
> {
>-    EXPECT_FALSE(extensionEnabled("GL_NV_pixel_buffer_object"));
>-    EXPECT_FALSE(extensionEnabled("GL_OES_mapbuffer"));
>-    EXPECT_FALSE(extensionEnabled("GL_EXT_map_buffer_range"));
>+    EXPECT_FALSE(IsGLExtensionEnabled("GL_NV_pixel_buffer_object"));
>+    EXPECT_FALSE(IsGLExtensionEnabled("GL_OES_mapbuffer"));
>+    EXPECT_FALSE(IsGLExtensionEnabled("GL_EXT_map_buffer_range"));
> 
>     // These extensions become core in in ES3/WebGL2.
>     ANGLE_SKIP_TEST_IF(getClientMajorVersion() >= 3);
>@@ -478,7 +588,7 @@ TEST_P(WebGLCompatibilityTest, EnablePixelBufferObjectExtensions)
>     glBindBuffer(GL_PIXEL_PACK_BUFFER, buffer);
>     EXPECT_GL_ERROR(GL_INVALID_ENUM);
> 
>-    if (extensionRequestable("GL_NV_pixel_buffer_object"))
>+    if (IsGLExtensionRequestable("GL_NV_pixel_buffer_object"))
>     {
>         glRequestExtensionANGLE("GL_NV_pixel_buffer_object");
>         EXPECT_GL_NO_ERROR();
>@@ -492,11 +602,54 @@ TEST_P(WebGLCompatibilityTest, EnablePixelBufferObjectExtensions)
>     }
> }
> 
>+// Test enabling the GL_EXT_texture_storage extension
>+TEST_P(WebGLCompatibilityTest, EnableTextureStorage)
>+{
>+    EXPECT_FALSE(IsGLExtensionEnabled("GL_EXT_texture_storage"));
>+
>+    GLTexture texture;
>+    glBindTexture(GL_TEXTURE_2D, texture);
>+
>+    GLint result;
>+    glGetTexParameteriv(GL_TEXTURE_2D, GL_TEXTURE_IMMUTABLE_FORMAT, &result);
>+    if (getClientMajorVersion() >= 3)
>+    {
>+        EXPECT_GL_NO_ERROR();
>+    }
>+    else
>+    {
>+        EXPECT_GL_ERROR(GL_INVALID_ENUM);
>+    }
>+
>+    if (IsGLExtensionRequestable("GL_EXT_texture_storage"))
>+    {
>+        glRequestExtensionANGLE("GL_EXT_texture_storage");
>+        EXPECT_GL_NO_ERROR();
>+        EXPECT_TRUE(IsGLExtensionEnabled("GL_EXT_texture_storage"));
>+
>+        glGetTexParameteriv(GL_TEXTURE_2D, GL_TEXTURE_IMMUTABLE_FORMAT, &result);
>+        EXPECT_GL_NO_ERROR();
>+
>+        const GLenum alwaysAcceptableFormats[] = {
>+            GL_ALPHA8_EXT,
>+            GL_LUMINANCE8_EXT,
>+            GL_LUMINANCE8_ALPHA8_EXT,
>+        };
>+        for (const auto &acceptableFormat : alwaysAcceptableFormats)
>+        {
>+            GLTexture localTexture;
>+            glBindTexture(GL_TEXTURE_2D, localTexture);
>+            glTexStorage2DEXT(GL_TEXTURE_2D, 1, acceptableFormat, 1, 1);
>+            EXPECT_GL_NO_ERROR();
>+        }
>+    }
>+}
>+
> // Test enabling the GL_OES_mapbuffer and GL_EXT_map_buffer_range extensions
> TEST_P(WebGLCompatibilityTest, EnableMapBufferExtensions)
> {
>-    EXPECT_FALSE(extensionEnabled("GL_OES_mapbuffer"));
>-    EXPECT_FALSE(extensionEnabled("GL_EXT_map_buffer_range"));
>+    EXPECT_FALSE(IsGLExtensionEnabled("GL_OES_mapbuffer"));
>+    EXPECT_FALSE(IsGLExtensionEnabled("GL_EXT_map_buffer_range"));
> 
>     // These extensions become core in in ES3/WebGL2.
>     ANGLE_SKIP_TEST_IF(getClientMajorVersion() >= 3);
>@@ -515,7 +668,7 @@ TEST_P(WebGLCompatibilityTest, EnableMapBufferExtensions)
>     glGetBufferParameteriv(GL_ELEMENT_ARRAY_BUFFER, GL_BUFFER_ACCESS_OES, &access);
>     EXPECT_GL_ERROR(GL_INVALID_ENUM);
> 
>-    if (extensionRequestable("GL_OES_mapbuffer"))
>+    if (IsGLExtensionRequestable("GL_OES_mapbuffer"))
>     {
>         glRequestExtensionANGLE("GL_OES_mapbuffer");
>         EXPECT_GL_NO_ERROR();
>@@ -526,7 +679,7 @@ TEST_P(WebGLCompatibilityTest, EnableMapBufferExtensions)
>         EXPECT_GL_NO_ERROR();
>     }
> 
>-    if (extensionRequestable("GL_EXT_map_buffer_range"))
>+    if (IsGLExtensionRequestable("GL_EXT_map_buffer_range"))
>     {
>         glRequestExtensionANGLE("GL_EXT_map_buffer_range");
>         EXPECT_GL_NO_ERROR();
>@@ -541,7 +694,7 @@ TEST_P(WebGLCompatibilityTest, EnableMapBufferExtensions)
> // Test enabling the GL_OES_fbo_render_mipmap extension
> TEST_P(WebGLCompatibilityTest, EnableRenderMipmapExtension)
> {
>-    EXPECT_FALSE(extensionEnabled("GL_OES_fbo_render_mipmap"));
>+    EXPECT_FALSE(IsGLExtensionEnabled("GL_OES_fbo_render_mipmap"));
> 
>     // This extensions become core in in ES3/WebGL2.
>     ANGLE_SKIP_TEST_IF(getClientMajorVersion() >= 3);
>@@ -559,7 +712,7 @@ TEST_P(WebGLCompatibilityTest, EnableRenderMipmapExtension)
>     glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, texture, 1);
>     EXPECT_GL_ERROR(GL_INVALID_VALUE);
> 
>-    if (extensionRequestable("GL_OES_fbo_render_mipmap"))
>+    if (IsGLExtensionRequestable("GL_OES_fbo_render_mipmap"))
>     {
>         glRequestExtensionANGLE("GL_OES_fbo_render_mipmap");
>         EXPECT_GL_NO_ERROR();
>@@ -572,7 +725,7 @@ TEST_P(WebGLCompatibilityTest, EnableRenderMipmapExtension)
> // Test enabling the GL_EXT_blend_minmax extension
> TEST_P(WebGLCompatibilityTest, EnableBlendMinMaxExtension)
> {
>-    EXPECT_FALSE(extensionEnabled("GL_EXT_blend_minmax"));
>+    EXPECT_FALSE(IsGLExtensionEnabled("GL_EXT_blend_minmax"));
> 
>     // This extensions become core in in ES3/WebGL2.
>     ANGLE_SKIP_TEST_IF(getClientMajorVersion() >= 3);
>@@ -583,7 +736,7 @@ TEST_P(WebGLCompatibilityTest, EnableBlendMinMaxExtension)
>     glBlendEquation(GL_MAX);
>     EXPECT_GL_ERROR(GL_INVALID_ENUM);
> 
>-    if (extensionRequestable("GL_EXT_blend_minmax"))
>+    if (IsGLExtensionRequestable("GL_EXT_blend_minmax"))
>     {
>         glRequestExtensionANGLE("GL_EXT_blend_minmax");
>         EXPECT_GL_NO_ERROR();
>@@ -597,9 +750,12 @@ TEST_P(WebGLCompatibilityTest, EnableBlendMinMaxExtension)
> // Test enabling the query extensions
> TEST_P(WebGLCompatibilityTest, EnableQueryExtensions)
> {
>-    EXPECT_FALSE(extensionEnabled("GL_EXT_occlusion_query_boolean"));
>-    EXPECT_FALSE(extensionEnabled("GL_EXT_disjoint_timer_query"));
>-    EXPECT_FALSE(extensionEnabled("GL_CHROMIUM_sync_query"));
>+    // Seems to be causing a device lost. http://anglebug.com/2423
>+    ANGLE_SKIP_TEST_IF(IsAMD() && IsWindows() && IsOpenGL());
>+
>+    EXPECT_FALSE(IsGLExtensionEnabled("GL_EXT_occlusion_query_boolean"));
>+    EXPECT_FALSE(IsGLExtensionEnabled("GL_EXT_disjoint_timer_query"));
>+    EXPECT_FALSE(IsGLExtensionEnabled("GL_CHROMIUM_sync_query"));
> 
>     // This extensions become core in in ES3/WebGL2.
>     ANGLE_SKIP_TEST_IF(getClientMajorVersion() >= 3);
>@@ -621,7 +777,7 @@ TEST_P(WebGLCompatibilityTest, EnableQueryExtensions)
>     glBeginQueryEXT(GL_COMMANDS_COMPLETED_CHROMIUM, badQuery);
>     EXPECT_GL_ERROR(GL_INVALID_OPERATION);
> 
>-    if (extensionRequestable("GL_EXT_occlusion_query_boolean"))
>+    if (IsGLExtensionRequestable("GL_EXT_occlusion_query_boolean"))
>     {
>         glRequestExtensionANGLE("GL_EXT_occlusion_query_boolean");
>         EXPECT_GL_NO_ERROR();
>@@ -632,7 +788,7 @@ TEST_P(WebGLCompatibilityTest, EnableQueryExtensions)
>         EXPECT_GL_NO_ERROR();
>     }
> 
>-    if (extensionRequestable("GL_EXT_disjoint_timer_query"))
>+    if (IsGLExtensionRequestable("GL_EXT_disjoint_timer_query"))
>     {
>         glRequestExtensionANGLE("GL_EXT_disjoint_timer_query");
>         EXPECT_GL_NO_ERROR();
>@@ -647,7 +803,7 @@ TEST_P(WebGLCompatibilityTest, EnableQueryExtensions)
>         EXPECT_GL_NO_ERROR();
>     }
> 
>-    if (extensionRequestable("GL_CHROMIUM_sync_query"))
>+    if (IsGLExtensionRequestable("GL_CHROMIUM_sync_query"))
>     {
>         glRequestExtensionANGLE("GL_CHROMIUM_sync_query");
>         EXPECT_GL_NO_ERROR();
>@@ -662,7 +818,7 @@ TEST_P(WebGLCompatibilityTest, EnableQueryExtensions)
> // Test enabling the GL_ANGLE_framebuffer_multisample extension
> TEST_P(WebGLCompatibilityTest, EnableFramebufferMultisampleExtension)
> {
>-    EXPECT_FALSE(extensionEnabled("GL_ANGLE_framebuffer_multisample"));
>+    EXPECT_FALSE(IsGLExtensionEnabled("GL_ANGLE_framebuffer_multisample"));
> 
>     // This extensions become core in in ES3/WebGL2.
>     ANGLE_SKIP_TEST_IF(getClientMajorVersion() >= 3);
>@@ -676,7 +832,7 @@ TEST_P(WebGLCompatibilityTest, EnableFramebufferMultisampleExtension)
>     glRenderbufferStorageMultisampleANGLE(GL_RENDERBUFFER, 1, GL_RGBA4, 1, 1);
>     EXPECT_GL_ERROR(GL_INVALID_OPERATION);
> 
>-    if (extensionRequestable("GL_ANGLE_framebuffer_multisample"))
>+    if (IsGLExtensionRequestable("GL_ANGLE_framebuffer_multisample"))
>     {
>         glRequestExtensionANGLE("GL_ANGLE_framebuffer_multisample");
>         EXPECT_GL_NO_ERROR();
>@@ -690,9 +846,9 @@ TEST_P(WebGLCompatibilityTest, EnableFramebufferMultisampleExtension)
> }
> 
> // Test enabling the GL_ANGLE_instanced_arrays extension
>-TEST_P(WebGLCompatibilityTest, EnableInstancedArraysExtension)
>+TEST_P(WebGLCompatibilityTest, EnableInstancedArraysExtensionANGLE)
> {
>-    EXPECT_FALSE(extensionEnabled("GL_ANGLE_instanced_arrays"));
>+    EXPECT_FALSE(IsGLExtensionEnabled("GL_ANGLE_instanced_arrays"));
> 
>     // This extensions become core in in ES3/WebGL2.
>     ANGLE_SKIP_TEST_IF(getClientMajorVersion() >= 3);
>@@ -704,7 +860,7 @@ TEST_P(WebGLCompatibilityTest, EnableInstancedArraysExtension)
>     glVertexAttribDivisorANGLE(0, 1);
>     EXPECT_GL_ERROR(GL_INVALID_OPERATION);
> 
>-    if (extensionRequestable("GL_ANGLE_instanced_arrays"))
>+    if (IsGLExtensionRequestable("GL_ANGLE_instanced_arrays"))
>     {
>         glRequestExtensionANGLE("GL_ANGLE_instanced_arrays");
>         EXPECT_GL_NO_ERROR();
>@@ -715,10 +871,36 @@ TEST_P(WebGLCompatibilityTest, EnableInstancedArraysExtension)
>     }
> }
> 
>+// Test enabling the GL_EXT_instanced_arrays extension
>+TEST_P(WebGLCompatibilityTest, EnableInstancedArraysExtensionEXT)
>+{
>+    EXPECT_FALSE(IsGLExtensionEnabled("GL_EXT_instanced_arrays"));
>+
>+    // This extensions become core in in ES3/WebGL2.
>+    ANGLE_SKIP_TEST_IF(getClientMajorVersion() >= 3);
>+
>+    GLint divisor = 0;
>+    glGetVertexAttribiv(0, GL_VERTEX_ATTRIB_ARRAY_DIVISOR, &divisor);
>+    EXPECT_GL_ERROR(GL_INVALID_ENUM);
>+
>+    glVertexAttribDivisorEXT(0, 1);
>+    EXPECT_GL_ERROR(GL_INVALID_OPERATION);
>+
>+    if (IsGLExtensionRequestable("GL_EXT_instanced_arrays"))
>+    {
>+        glRequestExtensionANGLE("GL_EXT_instanced_arrays");
>+        EXPECT_GL_NO_ERROR();
>+
>+        glGetVertexAttribiv(0, GL_VERTEX_ATTRIB_ARRAY_DIVISOR, &divisor);
>+        glVertexAttribDivisorEXT(0, 1);
>+        EXPECT_GL_NO_ERROR();
>+    }
>+}
>+
> // Test enabling the GL_ANGLE_pack_reverse_row_order extension
> TEST_P(WebGLCompatibilityTest, EnablePackReverseRowOrderExtension)
> {
>-    EXPECT_FALSE(extensionEnabled("GL_ANGLE_pack_reverse_row_order"));
>+    EXPECT_FALSE(IsGLExtensionEnabled("GL_ANGLE_pack_reverse_row_order"));
> 
>     GLint result = 0;
>     glGetIntegerv(GL_PACK_REVERSE_ROW_ORDER_ANGLE, &result);
>@@ -727,7 +909,7 @@ TEST_P(WebGLCompatibilityTest, EnablePackReverseRowOrderExtension)
>     glPixelStorei(GL_PACK_REVERSE_ROW_ORDER_ANGLE, GL_TRUE);
>     EXPECT_GL_ERROR(GL_INVALID_ENUM);
> 
>-    if (extensionRequestable("GL_ANGLE_pack_reverse_row_order"))
>+    if (IsGLExtensionRequestable("GL_ANGLE_pack_reverse_row_order"))
>     {
>         glRequestExtensionANGLE("GL_ANGLE_pack_reverse_row_order");
>         EXPECT_GL_NO_ERROR();
>@@ -741,13 +923,15 @@ TEST_P(WebGLCompatibilityTest, EnablePackReverseRowOrderExtension)
> // Test enabling the GL_EXT_unpack_subimage extension
> TEST_P(WebGLCompatibilityTest, EnablePackUnpackSubImageExtension)
> {
>-    EXPECT_FALSE(extensionEnabled("GL_EXT_unpack_subimage"));
>+    EXPECT_FALSE(IsGLExtensionEnabled("GL_EXT_unpack_subimage"));
> 
>     // This extensions become core in in ES3/WebGL2.
>     ANGLE_SKIP_TEST_IF(getClientMajorVersion() >= 3);
> 
>     constexpr GLenum parameters[] = {
>-        GL_UNPACK_ROW_LENGTH_EXT, GL_UNPACK_SKIP_ROWS_EXT, GL_UNPACK_SKIP_PIXELS_EXT,
>+        GL_UNPACK_ROW_LENGTH_EXT,
>+        GL_UNPACK_SKIP_ROWS_EXT,
>+        GL_UNPACK_SKIP_PIXELS_EXT,
>     };
> 
>     for (GLenum param : parameters)
>@@ -764,7 +948,7 @@ TEST_P(WebGLCompatibilityTest, EnablePackUnpackSubImageExtension)
>         EXPECT_GL_ERROR(GL_INVALID_ENUM);
>     }
> 
>-    if (extensionRequestable("GL_EXT_unpack_subimage"))
>+    if (IsGLExtensionRequestable("GL_EXT_unpack_subimage"))
>     {
>         glRequestExtensionANGLE("GL_EXT_unpack_subimage");
>         EXPECT_GL_NO_ERROR();
>@@ -786,7 +970,7 @@ TEST_P(WebGLCompatibilityTest, EnablePackUnpackSubImageExtension)
> 
> TEST_P(WebGLCompatibilityTest, EnableTextureRectangle)
> {
>-    EXPECT_FALSE(extensionEnabled("GL_ANGLE_texture_rectangle"));
>+    EXPECT_FALSE(IsGLExtensionEnabled("GL_ANGLE_texture_rectangle"));
> 
>     GLTexture texture;
>     glBindTexture(GL_TEXTURE_RECTANGLE_ANGLE, texture);
>@@ -796,12 +980,12 @@ TEST_P(WebGLCompatibilityTest, EnableTextureRectangle)
>     glGetTexParameteriv(GL_TEXTURE_RECTANGLE_ANGLE, GL_TEXTURE_MIN_FILTER, &minFilter);
>     EXPECT_GL_ERROR(GL_INVALID_ENUM);
> 
>-    if (extensionRequestable("GL_ANGLE_texture_rectangle"))
>+    if (IsGLExtensionRequestable("GL_ANGLE_texture_rectangle"))
>     {
>         glRequestExtensionANGLE("GL_ANGLE_texture_rectangle");
>         EXPECT_GL_NO_ERROR();
> 
>-        EXPECT_TRUE(extensionEnabled("GL_ANGLE_texture_rectangle"));
>+        EXPECT_TRUE(IsGLExtensionEnabled("GL_ANGLE_texture_rectangle"));
> 
>         glBindTexture(GL_TEXTURE_RECTANGLE_ANGLE, texture);
>         EXPECT_GL_NO_ERROR();
>@@ -815,13 +999,15 @@ TEST_P(WebGLCompatibilityTest, EnableTextureRectangle)
> // Test enabling the GL_NV_pack_subimage extension
> TEST_P(WebGLCompatibilityTest, EnablePackPackSubImageExtension)
> {
>-    EXPECT_FALSE(extensionEnabled("GL_NV_pack_subimage"));
>+    EXPECT_FALSE(IsGLExtensionEnabled("GL_NV_pack_subimage"));
> 
>     // This extensions become core in in ES3/WebGL2.
>     ANGLE_SKIP_TEST_IF(getClientMajorVersion() >= 3);
> 
>     constexpr GLenum parameters[] = {
>-        GL_PACK_ROW_LENGTH, GL_PACK_SKIP_ROWS, GL_PACK_SKIP_PIXELS,
>+        GL_PACK_ROW_LENGTH,
>+        GL_PACK_SKIP_ROWS,
>+        GL_PACK_SKIP_PIXELS,
>     };
> 
>     for (GLenum param : parameters)
>@@ -838,7 +1024,7 @@ TEST_P(WebGLCompatibilityTest, EnablePackPackSubImageExtension)
>         EXPECT_GL_ERROR(GL_INVALID_ENUM);
>     }
> 
>-    if (extensionRequestable("GL_NV_pack_subimage"))
>+    if (IsGLExtensionRequestable("GL_NV_pack_subimage"))
>     {
>         glRequestExtensionANGLE("GL_NV_pack_subimage");
>         EXPECT_GL_NO_ERROR();
>@@ -860,7 +1046,7 @@ TEST_P(WebGLCompatibilityTest, EnablePackPackSubImageExtension)
> 
> TEST_P(WebGLCompatibilityTest, EnableRGB8RGBA8Extension)
> {
>-    EXPECT_FALSE(extensionEnabled("GL_OES_rgb8_rgba8"));
>+    EXPECT_FALSE(IsGLExtensionEnabled("GL_OES_rgb8_rgba8"));
> 
>     // This extensions become core in in ES3/WebGL2.
>     ANGLE_SKIP_TEST_IF(getClientMajorVersion() >= 3);
>@@ -875,12 +1061,12 @@ TEST_P(WebGLCompatibilityTest, EnableRGB8RGBA8Extension)
>     glRenderbufferStorage(GL_RENDERBUFFER, GL_RGBA8_OES, 1, 1);
>     EXPECT_GL_ERROR(GL_INVALID_ENUM);
> 
>-    if (extensionRequestable("GL_OES_rgb8_rgba8"))
>+    if (IsGLExtensionRequestable("GL_OES_rgb8_rgba8"))
>     {
>         glRequestExtensionANGLE("GL_OES_rgb8_rgba8");
>         EXPECT_GL_NO_ERROR();
> 
>-        EXPECT_TRUE(extensionEnabled("GL_OES_rgb8_rgba8"));
>+        EXPECT_TRUE(IsGLExtensionEnabled("GL_OES_rgb8_rgba8"));
> 
>         glRenderbufferStorage(GL_RENDERBUFFER, GL_RGB8_OES, 1, 1);
>         EXPECT_GL_NO_ERROR();
>@@ -893,7 +1079,7 @@ TEST_P(WebGLCompatibilityTest, EnableRGB8RGBA8Extension)
> // Test enabling the GL_ANGLE_framebuffer_blit extension
> TEST_P(WebGLCompatibilityTest, EnableFramebufferBlitExtension)
> {
>-    EXPECT_FALSE(extensionEnabled("GL_ANGLE_framebuffer_blit"));
>+    EXPECT_FALSE(IsGLExtensionEnabled("GL_ANGLE_framebuffer_blit"));
> 
>     // This extensions become core in in ES3/WebGL2.
>     ANGLE_SKIP_TEST_IF(getClientMajorVersion() >= 3);
>@@ -910,7 +1096,7 @@ TEST_P(WebGLCompatibilityTest, EnableFramebufferBlitExtension)
>     glBlitFramebufferANGLE(0, 0, 1, 1, 0, 0, 1, 1, GL_COLOR_BUFFER_BIT, GL_NEAREST);
>     EXPECT_GL_ERROR(GL_INVALID_OPERATION);
> 
>-    if (extensionRequestable("GL_ANGLE_framebuffer_blit"))
>+    if (IsGLExtensionRequestable("GL_ANGLE_framebuffer_blit"))
>     {
>         glRequestExtensionANGLE("GL_ANGLE_framebuffer_blit");
>         EXPECT_GL_NO_ERROR();
>@@ -924,7 +1110,7 @@ TEST_P(WebGLCompatibilityTest, EnableFramebufferBlitExtension)
> // Test enabling the GL_OES_get_program_binary extension
> TEST_P(WebGLCompatibilityTest, EnableProgramBinaryExtension)
> {
>-    EXPECT_FALSE(extensionEnabled("GL_OES_get_program_binary"));
>+    EXPECT_FALSE(IsGLExtensionEnabled("GL_OES_get_program_binary"));
> 
>     // This extensions become core in in ES3/WebGL2.
>     ANGLE_SKIP_TEST_IF(getClientMajorVersion() >= 3);
>@@ -936,18 +1122,18 @@ TEST_P(WebGLCompatibilityTest, EnableProgramBinaryExtension)
>     glGetIntegerv(GL_PROGRAM_BINARY_FORMATS, &result);
>     EXPECT_GL_ERROR(GL_INVALID_ENUM);
> 
>-    const std::string &vert =
>-        "void main()\n"
>-        "{\n"
>-        "    gl_Position = vec4(0.0, 0.0, 0.0, 1.0);\n"
>-        "}\n";
>-    const std::string &frag =
>-        "precision highp float;\n"
>-        "void main()\n"
>-        "{\n"
>-        "    gl_FragColor = vec4(1.0);\n"
>-        "}\n";
>-    ANGLE_GL_PROGRAM(program, vert, frag);
>+    constexpr char kVS[] =
>+        R"(void main()
>+{
>+    gl_Position = vec4(0.0, 0.0, 0.0, 1.0);
>+})";
>+    constexpr char kFS[] =
>+        R"(precision highp float;
>+void main()
>+{
>+    gl_FragColor = vec4(1.0);
>+})";
>+    ANGLE_GL_PROGRAM(program, kVS, kFS);
> 
>     glGetProgramiv(program, GL_PROGRAM_BINARY_LENGTH, &result);
>     EXPECT_GL_ERROR(GL_INVALID_ENUM);
>@@ -959,7 +1145,7 @@ TEST_P(WebGLCompatibilityTest, EnableProgramBinaryExtension)
>                           &tempFormat, tempArray);
>     EXPECT_GL_ERROR(GL_INVALID_OPERATION);
> 
>-    if (extensionRequestable("GL_OES_get_program_binary"))
>+    if (IsGLExtensionRequestable("GL_OES_get_program_binary"))
>     {
>         glRequestExtensionANGLE("GL_OES_get_program_binary");
>         EXPECT_GL_NO_ERROR();
>@@ -983,6 +1169,41 @@ TEST_P(WebGLCompatibilityTest, EnableProgramBinaryExtension)
>     }
> }
> 
>+// Test enabling the GL_OES_vertex_array_object extension
>+TEST_P(WebGLCompatibilityTest, EnableVertexArrayExtension)
>+{
>+    EXPECT_FALSE(IsGLExtensionEnabled("GL_OES_vertex_array_object"));
>+
>+    // This extensions become core in in ES3/WebGL2.
>+    ANGLE_SKIP_TEST_IF(getClientMajorVersion() >= 3);
>+
>+    GLint result = 0;
>+    glGetIntegerv(GL_VERTEX_ARRAY_BINDING, &result);
>+    EXPECT_GL_ERROR(GL_INVALID_ENUM);
>+
>+    // Expect that GL_OES_vertex_array_object is always available.  It is implemented in the GL
>+    // frontend.
>+    EXPECT_TRUE(IsGLExtensionRequestable("GL_OES_vertex_array_object"));
>+
>+    glRequestExtensionANGLE("GL_OES_vertex_array_object");
>+    EXPECT_GL_NO_ERROR();
>+
>+    EXPECT_TRUE(IsGLExtensionEnabled("GL_OES_vertex_array_object"));
>+
>+    glGetIntegerv(GL_VERTEX_ARRAY_BINDING, &result);
>+    EXPECT_GL_NO_ERROR();
>+
>+    GLuint vao = 0;
>+    glGenVertexArraysOES(0, &vao);
>+    EXPECT_GL_NO_ERROR();
>+
>+    glBindVertexArrayOES(vao);
>+    EXPECT_GL_NO_ERROR();
>+
>+    glDeleteVertexArraysOES(1, &vao);
>+    EXPECT_GL_NO_ERROR();
>+}
>+
> // Verify that the context generates the correct error when the framebuffer attachments are
> // different sizes
> TEST_P(WebGLCompatibilityTest, FramebufferAttachmentSizeMismatch)
>@@ -1007,11 +1228,11 @@ TEST_P(WebGLCompatibilityTest, FramebufferAttachmentSizeMismatch)
>     ASSERT_GLENUM_EQ(GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS,
>                      glCheckFramebufferStatus(GL_FRAMEBUFFER));
> 
>-    if (extensionRequestable("GL_EXT_draw_buffers"))
>+    if (IsGLExtensionRequestable("GL_EXT_draw_buffers"))
>     {
>         glRequestExtensionANGLE("GL_EXT_draw_buffers");
>         EXPECT_GL_NO_ERROR();
>-        EXPECT_TRUE(extensionEnabled("GL_EXT_draw_buffers"));
>+        EXPECT_TRUE(IsGLExtensionEnabled("GL_EXT_draw_buffers"));
> 
>         glBindTexture(GL_TEXTURE_2D, textures[1]);
>         glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, 2, 2, 0, GL_RGBA, GL_UNSIGNED_BYTE, nullptr);
>@@ -1038,21 +1259,21 @@ TEST_P(WebGLCompatibilityTest, FramebufferAttachmentSizeMismatch)
> // Test that client-side array buffers are forbidden in WebGL mode
> TEST_P(WebGLCompatibilityTest, ForbidsClientSideArrayBuffer)
> {
>-    const std::string &vert =
>-        "attribute vec3 a_pos;\n"
>-        "void main()\n"
>-        "{\n"
>-        "    gl_Position = vec4(a_pos, 1.0);\n"
>-        "}\n";
>+    constexpr char kVS[] =
>+        R"(attribute vec3 a_pos;
>+void main()
>+{
>+    gl_Position = vec4(a_pos, 1.0);
>+})";
> 
>-    const std::string &frag =
>-        "precision highp float;\n"
>-        "void main()\n"
>-        "{\n"
>-        "    gl_FragColor = vec4(1.0);\n"
>-        "}\n";
>+    constexpr char kFS[] =
>+        R"(precision highp float;
>+void main()
>+{
>+    gl_FragColor = vec4(1.0);
>+})";
> 
>-    ANGLE_GL_PROGRAM(program, vert, frag);
>+    ANGLE_GL_PROGRAM(program, kVS, kFS);
> 
>     GLint posLocation = glGetAttribLocation(program.get(), "a_pos");
>     ASSERT_NE(-1, posLocation);
>@@ -1070,21 +1291,21 @@ TEST_P(WebGLCompatibilityTest, ForbidsClientSideArrayBuffer)
> // Test that client-side element array buffers are forbidden in WebGL mode
> TEST_P(WebGLCompatibilityTest, ForbidsClientSideElementBuffer)
> {
>-    const std::string &vert =
>-        "attribute vec3 a_pos;\n"
>-        "void main()\n"
>-        "{\n"
>-        "    gl_Position = vec4(a_pos, 1.0);\n"
>-        "}\n";
>+    constexpr char kVS[] =
>+        R"(attribute vec3 a_pos;
>+void main()
>+{
>+    gl_Position = vec4(a_pos, 1.0);
>+})";
> 
>-    const std::string &frag =
>-        "precision highp float;\n"
>-        "void main()\n"
>-        "{\n"
>-        "    gl_FragColor = vec4(1.0);\n"
>-        "}\n";
>+    constexpr char kFS[] =
>+        R"(precision highp float;
>+void main()
>+{
>+    gl_FragColor = vec4(1.0);
>+})";
> 
>-    ANGLE_GL_PROGRAM(program, vert, frag);
>+    ANGLE_GL_PROGRAM(program, kVS, kFS);
> 
>     GLint posLocation = glGetAttribLocation(program.get(), "a_pos");
>     ASSERT_NE(-1, posLocation);
>@@ -1105,27 +1326,27 @@ TEST_P(WebGLCompatibilityTest, ForbidsClientSideElementBuffer)
>     // Use the pointer with value of 1 for indices instead of an actual pointer because WebGL also
>     // enforces that the top bit of indices must be 0 (i.e. offset >= 0) and would generate
>     // GL_INVALID_VALUE in that case. Using a null pointer gets caught by another check.
>-    glDrawElements(GL_TRIANGLES, 6, GL_UNSIGNED_BYTE, reinterpret_cast<const void*>(intptr_t(1)));
>+    glDrawElements(GL_TRIANGLES, 6, GL_UNSIGNED_BYTE, reinterpret_cast<const void *>(intptr_t(1)));
>     EXPECT_GL_ERROR(GL_INVALID_OPERATION);
> }
> 
> // Test that client-side array buffers are forbidden even if the program doesn't use the attribute
> TEST_P(WebGLCompatibilityTest, ForbidsClientSideArrayBufferEvenNotUsedOnes)
> {
>-    const std::string &vert =
>-        "void main()\n"
>-        "{\n"
>-        "    gl_Position = vec4(1.0);\n"
>-        "}\n";
>+    constexpr char kVS[] =
>+        R"(void main()
>+{
>+    gl_Position = vec4(1.0);
>+})";
> 
>-    const std::string &frag =
>-        "precision highp float;\n"
>-        "void main()\n"
>-        "{\n"
>-        "    gl_FragColor = vec4(1.0);\n"
>-        "}\n";
>+    constexpr char kFS[] =
>+        R"(precision highp float;
>+void main()
>+{
>+    gl_FragColor = vec4(1.0);
>+})";
> 
>-    ANGLE_GL_PROGRAM(program, vert, frag);
>+    ANGLE_GL_PROGRAM(program, kVS, kFS);
> 
>     glUseProgram(program.get());
> 
>@@ -1179,8 +1400,9 @@ TEST_P(WebGLCompatibilityTest, NullPixelDataForSubImage)
>     }
> }
> 
>-// Tests the WebGL requirement of having the same stencil mask, writemask and ref for fron and back
>-TEST_P(WebGLCompatibilityTest, RequiresSameStencilMaskAndRef)
>+// Tests the WebGL requirement of having the same stencil mask, writemask and ref for front and back
>+// (when stencil testing is enabled)
>+void WebGLCompatibilityTest::TestDifferentStencilMaskAndRef(GLenum errIfMismatch)
> {
>     // Run the test in an FBO to make sure we have some stencil bits.
>     GLRenderbuffer renderbuffer;
>@@ -1193,7 +1415,7 @@ TEST_P(WebGLCompatibilityTest, RequiresSameStencilMaskAndRef)
>                               renderbuffer.get());
> 
>     ANGLE_GL_PROGRAM(program, "void main() { gl_Position = vec4(0, 0, 0, 1); }",
>-                     "void main() { gl_FragColor = vec4(0, 1, 0, 1); }")
>+                     "void main() { gl_FragColor = vec4(0, 1, 0, 1); }");
>     glUseProgram(program.get());
>     ASSERT_GL_NO_ERROR();
> 
>@@ -1206,7 +1428,7 @@ TEST_P(WebGLCompatibilityTest, RequiresSameStencilMaskAndRef)
>     // Having a different front - back write mask generates an error.
>     glStencilMaskSeparate(GL_FRONT, 1);
>     glDrawArrays(GL_TRIANGLES, 0, 6);
>-    EXPECT_GL_ERROR(GL_INVALID_OPERATION);
>+    EXPECT_GL_ERROR(errIfMismatch);
> 
>     // Setting both write masks separately to the same value is valid.
>     glStencilMaskSeparate(GL_BACK, 1);
>@@ -1216,7 +1438,7 @@ TEST_P(WebGLCompatibilityTest, RequiresSameStencilMaskAndRef)
>     // Having a different stencil front - back mask generates an error
>     glStencilFuncSeparate(GL_FRONT, GL_ALWAYS, 0, 1);
>     glDrawArrays(GL_TRIANGLES, 0, 6);
>-    EXPECT_GL_ERROR(GL_INVALID_OPERATION);
>+    EXPECT_GL_ERROR(errIfMismatch);
> 
>     // Setting both masks separately to the same value is valid.
>     glStencilFuncSeparate(GL_BACK, GL_ALWAYS, 0, 1);
>@@ -1226,7 +1448,7 @@ TEST_P(WebGLCompatibilityTest, RequiresSameStencilMaskAndRef)
>     // Having a different stencil front - back reference generates an error
>     glStencilFuncSeparate(GL_FRONT, GL_ALWAYS, 255, 1);
>     glDrawArrays(GL_TRIANGLES, 0, 6);
>-    EXPECT_GL_ERROR(GL_INVALID_OPERATION);
>+    EXPECT_GL_ERROR(errIfMismatch);
> 
>     // Setting both references separately to the same value is valid.
>     glStencilFuncSeparate(GL_BACK, GL_ALWAYS, 255, 1);
>@@ -1239,6 +1461,18 @@ TEST_P(WebGLCompatibilityTest, RequiresSameStencilMaskAndRef)
>     ASSERT_GL_NO_ERROR();
> }
> 
>+TEST_P(WebGLCompatibilityTest, StencilTestEnabledDisallowsDifferentStencilMaskAndRef)
>+{
>+    glEnable(GL_STENCIL_TEST);
>+    TestDifferentStencilMaskAndRef(GL_INVALID_OPERATION);
>+}
>+
>+TEST_P(WebGLCompatibilityTest, StencilTestDisabledAllowsDifferentStencilMaskAndRef)
>+{
>+    glDisable(GL_STENCIL_TEST);
>+    TestDifferentStencilMaskAndRef(GL_NO_ERROR);
>+}
>+
> // Test that GL_FIXED is forbidden
> TEST_P(WebGLCompatibilityTest, ForbidsGLFixed)
> {
>@@ -1270,21 +1504,14 @@ TEST_P(WebGLCompatibilityTest, MaxStride)
> // Test the checks for OOB reads in the vertex buffers, non-instanced version
> TEST_P(WebGLCompatibilityTest, DrawArraysBufferOutOfBoundsNonInstanced)
> {
>-    const std::string &vert =
>-        "attribute float a_pos;\n"
>-        "void main()\n"
>-        "{\n"
>-        "    gl_Position = vec4(a_pos, a_pos, a_pos, 1.0);\n"
>-        "}\n";
>-
>-    const std::string &frag =
>-        "precision highp float;\n"
>-        "void main()\n"
>-        "{\n"
>-        "    gl_FragColor = vec4(1.0);\n"
>-        "}\n";
>-
>-    ANGLE_GL_PROGRAM(program, vert, frag);
>+    constexpr char kVS[] =
>+        R"(attribute float a_pos;
>+void main()
>+{
>+    gl_Position = vec4(a_pos, a_pos, a_pos, 1.0);
>+})";
>+
>+    ANGLE_GL_PROGRAM(program, kVS, essl1_shaders::fs::Red());
>     GLint posLocation = glGetAttribLocation(program.get(), "a_pos");
>     ASSERT_NE(-1, posLocation);
>     glUseProgram(program.get());
>@@ -1295,7 +1522,7 @@ TEST_P(WebGLCompatibilityTest, DrawArraysBufferOutOfBoundsNonInstanced)
> 
>     glEnableVertexAttribArray(posLocation);
> 
>-    const uint8_t* zeroOffset = nullptr;
>+    const uint8_t *zeroOffset = nullptr;
> 
>     // Test touching the last element is valid.
>     glVertexAttribPointer(posLocation, 1, GL_UNSIGNED_BYTE, GL_FALSE, 0, zeroOffset + 12);
>@@ -1329,27 +1556,88 @@ TEST_P(WebGLCompatibilityTest, DrawArraysBufferOutOfBoundsNonInstanced)
>     EXPECT_GL_ERROR(GL_INVALID_OPERATION);
> }
> 
>+// Test that index values outside of the 32-bit integer range do not read out of bounds
>+TEST_P(WebGLCompatibilityTest, LargeIndexRange)
>+{
>+    ANGLE_SKIP_TEST_IF(!EnsureGLExtensionEnabled("GL_OES_element_index_uint"));
>+
>+    constexpr char kVS[] =
>+        R"(attribute vec4 a_Position;
>+void main()
>+{
>+    gl_Position = a_Position;
>+})";
>+
>+    ANGLE_GL_PROGRAM(program, kVS, essl1_shaders::fs::Red());
>+    glUseProgram(program.get());
>+
>+    glEnableVertexAttribArray(glGetAttribLocation(program, "a_Position"));
>+
>+    constexpr float kVertexData[] = {
>+        1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f,
>+    };
>+
>+    GLBuffer vertexBuffer;
>+    glBindBuffer(GL_ARRAY_BUFFER, vertexBuffer);
>+    glBufferData(GL_ARRAY_BUFFER, sizeof(kVertexData), kVertexData, GL_STREAM_DRAW);
>+
>+    constexpr GLuint kMaxIntAsGLuint = static_cast<GLuint>(std::numeric_limits<GLint>::max());
>+    constexpr GLuint kIndexData[]    = {
>+        kMaxIntAsGLuint,
>+        kMaxIntAsGLuint + 1,
>+        kMaxIntAsGLuint + 2,
>+        kMaxIntAsGLuint + 3,
>+    };
>+
>+    GLBuffer indexBuffer;
>+    glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, vertexBuffer);
>+    glBufferData(GL_ELEMENT_ARRAY_BUFFER, sizeof(kIndexData), kIndexData, GL_DYNAMIC_DRAW);
>+
>+    EXPECT_GL_NO_ERROR();
>+
>+    // First index is representable as 32-bit int but second is not
>+    glDrawElements(GL_LINES, 2, GL_UNSIGNED_INT, 0);
>+    EXPECT_GL_ERROR(GL_INVALID_OPERATION);
>+
>+    // Neither index is representable as 32-bit int
>+    glDrawElements(GL_LINES, 2, GL_UNSIGNED_INT, reinterpret_cast<void *>(sizeof(GLuint) * 2));
>+    EXPECT_GL_ERROR(GL_INVALID_OPERATION);
>+}
>+
>+// Test for drawing with a null index buffer
>+TEST_P(WebGLCompatibilityTest, NullIndexBuffer)
>+{
>+    constexpr char kVS[] =
>+        R"(attribute float a_pos;
>+void main()
>+{
>+    gl_Position = vec4(a_pos, a_pos, a_pos, 1.0);
>+})";
>+
>+    ANGLE_GL_PROGRAM(program, kVS, essl1_shaders::fs::Red());
>+    glUseProgram(program.get());
>+
>+    glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0);
>+    glEnableVertexAttribArray(0);
>+
>+    glDrawElements(GL_TRIANGLES, 0, GL_UNSIGNED_BYTE, 0);
>+    EXPECT_GL_ERROR(GL_INVALID_OPERATION);
>+}
>+
> // Test the checks for OOB reads in the vertex buffers, instanced version
> TEST_P(WebGL2CompatibilityTest, DrawArraysBufferOutOfBoundsInstanced)
> {
>-    const std::string &vert =
>-        "attribute float a_pos;\n"
>-        "attribute float a_w;\n"
>-        "void main()\n"
>-        "{\n"
>-        "    gl_Position = vec4(a_pos, a_pos, a_pos, a_w);\n"
>-        "}\n";
>-
>-    const std::string &frag =
>-        "precision highp float;\n"
>-        "void main()\n"
>-        "{\n"
>-        "    gl_FragColor = vec4(1.0);\n"
>-        "}\n";
>-
>-    ANGLE_GL_PROGRAM(program, vert, frag);
>+    constexpr char kVS[] =
>+        R"(attribute float a_pos;
>+attribute float a_w;
>+void main()
>+{
>+    gl_Position = vec4(a_pos, a_pos, a_pos, a_w);
>+})";
>+
>+    ANGLE_GL_PROGRAM(program, kVS, essl1_shaders::fs::Red());
>     GLint posLocation = glGetAttribLocation(program.get(), "a_pos");
>-    GLint wLocation = glGetAttribLocation(program.get(), "a_w");
>+    GLint wLocation   = glGetAttribLocation(program.get(), "a_w");
>     ASSERT_NE(-1, posLocation);
>     ASSERT_NE(-1, wLocation);
>     glUseProgram(program.get());
>@@ -1365,7 +1653,7 @@ TEST_P(WebGL2CompatibilityTest, DrawArraysBufferOutOfBoundsInstanced)
>     glEnableVertexAttribArray(wLocation);
>     glVertexAttribDivisor(wLocation, 1);
> 
>-    const uint8_t* zeroOffset = nullptr;
>+    const uint8_t *zeroOffset = nullptr;
> 
>     // Test touching the last element is valid.
>     glVertexAttribPointer(wLocation, 1, GL_UNSIGNED_BYTE, GL_FALSE, 0, zeroOffset + 12);
>@@ -1401,28 +1689,21 @@ TEST_P(WebGL2CompatibilityTest, DrawArraysBufferOutOfBoundsInstanced)
> // Test the checks for OOB reads in the vertex buffers, ANGLE_instanced_arrays version
> TEST_P(WebGLCompatibilityTest, DrawArraysBufferOutOfBoundsInstancedANGLE)
> {
>-    ANGLE_SKIP_TEST_IF(!extensionRequestable("GL_ANGLE_instanced_arrays"));
>+    ANGLE_SKIP_TEST_IF(!IsGLExtensionRequestable("GL_ANGLE_instanced_arrays"));
>     glRequestExtensionANGLE("GL_ANGLE_instanced_arrays");
>     EXPECT_GL_NO_ERROR();
> 
>-    const std::string &vert =
>-        "attribute float a_pos;\n"
>-        "attribute float a_w;\n"
>-        "void main()\n"
>-        "{\n"
>-        "    gl_Position = vec4(a_pos, a_pos, a_pos, a_w);\n"
>-        "}\n";
>-
>-    const std::string &frag =
>-        "precision highp float;\n"
>-        "void main()\n"
>-        "{\n"
>-        "    gl_FragColor = vec4(1.0);\n"
>-        "}\n";
>-
>-    ANGLE_GL_PROGRAM(program, vert, frag);
>+    constexpr char kVS[] =
>+        R"(attribute float a_pos;
>+attribute float a_w;
>+void main()
>+{
>+    gl_Position = vec4(a_pos, a_pos, a_pos, a_w);
>+})";
>+
>+    ANGLE_GL_PROGRAM(program, kVS, essl1_shaders::fs::Red());
>     GLint posLocation = glGetAttribLocation(program.get(), "a_pos");
>-    GLint wLocation = glGetAttribLocation(program.get(), "a_w");
>+    GLint wLocation   = glGetAttribLocation(program.get(), "a_w");
>     ASSERT_NE(-1, posLocation);
>     ASSERT_NE(-1, wLocation);
>     glUseProgram(program.get());
>@@ -1438,57 +1719,50 @@ TEST_P(WebGLCompatibilityTest, DrawArraysBufferOutOfBoundsInstancedANGLE)
>     glEnableVertexAttribArray(wLocation);
>     glVertexAttribDivisorANGLE(wLocation, 1);
> 
>-    const uint8_t* zeroOffset = nullptr;
>+    const uint8_t *zeroOffset = nullptr;
> 
>     // Test touching the last element is valid.
>     glVertexAttribPointer(wLocation, 1, GL_UNSIGNED_BYTE, GL_FALSE, 0, zeroOffset + 12);
>     glDrawArraysInstancedANGLE(GL_POINTS, 0, 1, 4);
>-    ASSERT_GL_NO_ERROR();
>+    ASSERT_GL_NO_ERROR() << "touching the last element.";
> 
>     // Test touching the last element + 1 is invalid.
>     glVertexAttribPointer(wLocation, 1, GL_UNSIGNED_BYTE, GL_FALSE, 0, zeroOffset + 13);
>     glDrawArraysInstancedANGLE(GL_POINTS, 0, 1, 4);
>-    EXPECT_GL_ERROR(GL_INVALID_OPERATION);
>+    EXPECT_GL_ERROR(GL_INVALID_OPERATION) << "touching the last element + 1.";
> 
>     // Test touching the last element is valid, using a stride.
>     glVertexAttribPointer(wLocation, 1, GL_UNSIGNED_BYTE, GL_FALSE, 2, zeroOffset + 9);
>     glDrawArraysInstancedANGLE(GL_POINTS, 0, 1, 4);
>-    ASSERT_GL_NO_ERROR();
>+    ASSERT_GL_NO_ERROR() << "touching the last element using a stride.";
> 
>     // Test touching the last element + 1 is invalid, using a stride.
>     glVertexAttribPointer(wLocation, 1, GL_UNSIGNED_BYTE, GL_FALSE, 2, zeroOffset + 10);
>     glDrawArraysInstancedANGLE(GL_POINTS, 0, 1, 4);
>-    EXPECT_GL_ERROR(GL_INVALID_OPERATION);
>+    EXPECT_GL_ERROR(GL_INVALID_OPERATION) << "touching the last element + 1 using a stride.";
> 
>     // Test any offset is valid if no vertices are drawn.
>     glVertexAttribPointer(wLocation, 1, GL_UNSIGNED_BYTE, GL_FALSE, 0, zeroOffset + 32);
>     glDrawArraysInstancedANGLE(GL_POINTS, 0, 0, 1);
>-    ASSERT_GL_NO_ERROR();
>+    ASSERT_GL_NO_ERROR() << "any offset with no vertices.";
> 
>     // Test any offset is valid if no primitives are drawn.
>     glVertexAttribPointer(wLocation, 1, GL_UNSIGNED_BYTE, GL_FALSE, 0, zeroOffset + 32);
>     glDrawArraysInstancedANGLE(GL_POINTS, 0, 1, 0);
>-    ASSERT_GL_NO_ERROR();
>+    ASSERT_GL_NO_ERROR() << "any offset with primitives.";
> }
> 
> // Test the checks for OOB reads in the index buffer
> TEST_P(WebGLCompatibilityTest, DrawElementsBufferOutOfBoundsInIndexBuffer)
> {
>-    const std::string &vert =
>-        "attribute float a_pos;\n"
>-        "void main()\n"
>-        "{\n"
>-        "    gl_Position = vec4(a_pos, a_pos, a_pos, 1.0);\n"
>-        "}\n";
>-
>-    const std::string &frag =
>-        "precision highp float;\n"
>-        "void main()\n"
>-        "{\n"
>-        "    gl_FragColor = vec4(1.0);\n"
>-        "}\n";
>-
>-    ANGLE_GL_PROGRAM(program, vert, frag);
>+    constexpr char kVS[] =
>+        R"(attribute float a_pos;
>+void main()
>+{
>+    gl_Position = vec4(a_pos, a_pos, a_pos, 1.0);
>+})";
>+
>+    ANGLE_GL_PROGRAM(program, kVS, essl1_shaders::fs::Red());
>     GLint posLocation = glGetAttribLocation(program.get(), "a_pos");
>     ASSERT_NE(-1, posLocation);
>     glUseProgram(program.get());
>@@ -1534,21 +1808,14 @@ TEST_P(WebGLCompatibilityTest, DrawElementsBufferOutOfBoundsInIndexBuffer)
> // Test the checks for OOB in vertex buffers caused by indices, non-instanced version
> TEST_P(WebGLCompatibilityTest, DrawElementsBufferOutOfBoundsInVertexBuffer)
> {
>-    const std::string &vert =
>-        "attribute float a_pos;\n"
>-        "void main()\n"
>-        "{\n"
>-        "    gl_Position = vec4(a_pos, a_pos, a_pos, 1.0);\n"
>-        "}\n";
>-
>-    const std::string &frag =
>-        "precision highp float;\n"
>-        "void main()\n"
>-        "{\n"
>-        "    gl_FragColor = vec4(1.0);\n"
>-        "}\n";
>-
>-    ANGLE_GL_PROGRAM(program, vert, frag);
>+    constexpr char kVS[] =
>+        R"(attribute float a_pos;
>+void main()
>+{
>+    gl_Position = vec4(a_pos, a_pos, a_pos, 1.0);
>+})";
>+
>+    ANGLE_GL_PROGRAM(program, kVS, essl1_shaders::fs::Red());
>     GLint posLocation = glGetAttribLocation(program.get(), "a_pos");
>     ASSERT_NE(-1, posLocation);
>     glUseProgram(program.get());
>@@ -1658,27 +1925,27 @@ TEST_P(WebGLCompatibilityTest, InvalidAttributeAndUniformNames)
>     std::string vert = "attribute float ";
>     vert += validAttribName;
>     vert +=
>-        ";\n"
>-        "void main()\n"
>-        "{\n"
>-        "    gl_Position = vec4(1.0);\n"
>-        "}\n";
>+        R"(;
>+void main()
>+{
>+    gl_Position = vec4(1.0);
>+})";
> 
>     std::string frag =
>-        "precision highp float;\n"
>-        "uniform vec4 ";
>+        R"(precision highp float;
>+uniform vec4 )";
>     frag += validUniformName;
>     // Insert illegal characters into comments
>     frag +=
>-        ";\n"
>-        "    // $ \" @ /*\n"
>-        "void main()\n"
>-        "{/*\n"
>-        "    ` @ $\n"
>-        "    */gl_FragColor = vec4(1.0);\n"
>-        "}\n";
>-
>-    ANGLE_GL_PROGRAM(program, vert, frag);
>+        R"(;
>+    // $ \" @ /*
>+void main()
>+{/*
>+    ` @ $
>+    */gl_FragColor = vec4(1.0);
>+})";
>+
>+    ANGLE_GL_PROGRAM(program, vert.c_str(), frag.c_str());
>     EXPECT_GL_NO_ERROR();
> 
>     for (char invalidChar : invalidSet)
>@@ -1704,14 +1971,14 @@ TEST_P(WebGLCompatibilityTest, InvalidAttributeAndUniformNames)
>     for (char invalidChar : invalidSet)
>     {
>         std::string invalidAttribName = validAttribName + invalidChar;
>-        const char *invalidVert[] = {
>+        const char *invalidVert[]     = {
>             "attribute float ",
>             invalidAttribName.c_str(),
>-            ";\n",
>-            "void main()\n",
>-            "{\n",
>-            "    gl_Position = vec4(1.0);\n",
>-            "}\n",
>+            R"(;,
>+void main(),
>+{,
>+    gl_Position = vec4(1.0);,
>+})",
>         };
> 
>         GLuint shader = glCreateShader(GL_VERTEX_SHADER);
>@@ -1729,21 +1996,21 @@ TEST_P(WebGLCompatibilityTest, ShaderSourceLineContinuation)
>     ANGLE_SKIP_TEST_IF(getClientMajorVersion() >= 3);
> 
>     const char *validVert =
>-        "#define foo this is a test\n"
>-        "precision mediump float;\n"
>-        "void main()\n"
>-        "{\n"
>-        "    gl_Position = vec4(1.0);\n"
>-        "}\n";
>+        R"(#define foo this is a test
>+precision mediump float;
>+void main()
>+{
>+    gl_Position = vec4(1.0);
>+})";
> 
>     const char *invalidVert =
>-        "#define foo this \\n"
>-        "  is a test\n"
>-        "precision mediump float;\n"
>-        "void main()\n"
>-        "{\n"
>-        "    gl_Position = vec4(1.0);\n"
>-        "}\n";
>+        R"(#define foo this \
>+    is a test
>+precision mediump float;
>+void main()
>+{
>+    gl_Position = vec4(1.0);
>+})";
> 
>     GLuint shader = glCreateShader(GL_VERTEX_SHADER);
>     glShaderSource(shader, 1, &validVert, nullptr);
>@@ -1758,26 +2025,26 @@ TEST_P(WebGLCompatibilityTest, ShaderSourceLineContinuation)
> TEST_P(WebGL2CompatibilityTest, ShaderSourceLineContinuation)
> {
>     const char *validVert =
>-        "#version 300 es\n"
>-        "precision mediump float;\n"
>-        "\n"
>-        "void main ()\n"
>-        "{\n"
>-        "    float f\\\n"
>-        "oo = 1.0;\n"
>-        "    gl_Position = vec4(foo);\n"
>-        "}\n";
>+        R"(#version 300 es
>+precision mediump float;
>+
>+void main ()
>+{
>+    float f\
>+oo = 1.0;
>+    gl_Position = vec4(foo);
>+})";
> 
>     const char *invalidVert =
>-        "#version 300 es\n"
>-        "precision mediump float;\n"
>-        "\n"
>-        "void main ()\n"
>-        "{\n"
>-        "    float f\\$\n"
>-        "oo = 1.0;\n"
>-        "    gl_Position = vec4(foo);\n"
>-        "}\n";
>+        R"(#version 300 es
>+precision mediump float;
>+
>+void main ()
>+{
>+    float f\$
>+oo = 1.0;
>+    gl_Position = vec4(foo);
>+})";
> 
>     GLuint shader = glCreateShader(GL_VERTEX_SHADER);
>     glShaderSource(shader, 1, &validVert, nullptr);
>@@ -1805,21 +2072,14 @@ TEST_P(WebGLCompatibilityTest, BindAttribLocationLimitation)
> // Test that having no attributes with a zero divisor is valid in WebGL2
> TEST_P(WebGL2CompatibilityTest, InstancedDrawZeroDivisor)
> {
>-    const std::string &vert =
>-        "attribute float a_pos;\n"
>-        "void main()\n"
>-        "{\n"
>-        "    gl_Position = vec4(a_pos, a_pos, a_pos, 1.0);\n"
>-        "}\n";
>-
>-    const std::string &frag =
>-        "precision highp float;\n"
>-        "void main()\n"
>-        "{\n"
>-        "    gl_FragColor = vec4(1.0);\n"
>-        "}\n";
>+    constexpr char kVS[] =
>+        R"(attribute float a_pos;
>+void main()
>+{
>+    gl_Position = vec4(a_pos, a_pos, a_pos, 1.0);
>+})";
> 
>-    ANGLE_GL_PROGRAM(program, vert, frag);
>+    ANGLE_GL_PROGRAM(program, kVS, essl1_shaders::fs::Red());
> 
>     GLint posLocation = glGetAttribLocation(program.get(), "a_pos");
>     ASSERT_NE(-1, posLocation);
>@@ -1841,7 +2101,7 @@ TEST_P(WebGL2CompatibilityTest, InstancedDrawZeroDivisor)
> // Tests that NPOT is not enabled by default in WebGL 1 and that it can be enabled
> TEST_P(WebGLCompatibilityTest, NPOT)
> {
>-    EXPECT_FALSE(extensionEnabled("GL_OES_texture_npot"));
>+    EXPECT_FALSE(IsGLExtensionEnabled("GL_OES_texture_npot"));
> 
>     // Create a texture and set an NPOT mip 0, should always be acceptable.
>     GLTexture texture;
>@@ -1860,7 +2120,7 @@ TEST_P(WebGLCompatibilityTest, NPOT)
>         ASSERT_GL_NO_ERROR();
>     }
> 
>-    if (extensionRequestable("GL_OES_texture_npot"))
>+    if (IsGLExtensionRequestable("GL_OES_texture_npot"))
>     {
>         glRequestExtensionANGLE("GL_OES_texture_npot");
>         ASSERT_GL_NO_ERROR();
>@@ -1898,26 +2158,26 @@ TEST_P(WebGLCompatibilityTest, DefaultPosition)
>     // Draw a quad where each vertex is red if gl_Position is (0,0,0,0) before it is set,
>     // and green otherwise.  The center of each quadrant will be red if and only if all
>     // four corners are red.
>-    const std::string vertexShader =
>-        "attribute vec3 pos;\n"
>-        "varying vec4 color;\n"
>-        "void main() {\n"
>-        "    if (gl_Position == vec4(0,0,0,0)) {\n"
>-        "        color = vec4(1,0,0,1);\n"
>-        "    } else {\n"
>-        "        color = vec4(0,1,0,1);\n"
>-        "    }\n"
>-        "    gl_Position = vec4(pos,1);\n"
>-        "}\n";
>-
>-    const std::string fragmentShader =
>-        "precision mediump float;\n"
>-        "varying vec4 color;\n"
>-        "void main() {\n"
>-        "    gl_FragColor = color;\n"
>-        "}\n";
>-
>-    ANGLE_GL_PROGRAM(program, vertexShader, fragmentShader);
>+    constexpr char kVS[] =
>+        R"(attribute vec3 pos;
>+varying vec4 color;
>+void main() {
>+    if (gl_Position == vec4(0,0,0,0)) {
>+        color = vec4(1,0,0,1);
>+    } else {
>+        color = vec4(0,1,0,1);
>+    }
>+    gl_Position = vec4(pos,1);
>+})";
>+
>+    constexpr char kFS[] =
>+        R"(precision mediump float;
>+varying vec4 color;
>+void main() {
>+    gl_FragColor = color;
>+})";
>+
>+    ANGLE_GL_PROGRAM(program, kVS, kFS);
>     drawQuad(program.get(), "pos", 0.0f, 1.0f, true);
>     EXPECT_PIXEL_COLOR_EQ(getWindowWidth() * 1 / 4, getWindowHeight() * 1 / 4, GLColor::red);
>     EXPECT_PIXEL_COLOR_EQ(getWindowWidth() * 1 / 4, getWindowHeight() * 3 / 4, GLColor::red);
>@@ -1929,22 +2189,22 @@ TEST_P(WebGLCompatibilityTest, DefaultPosition)
> // Based on WebGL test conformance/renderbuffers/feedback-loop.html.
> TEST_P(WebGLCompatibilityTest, RenderingFeedbackLoop)
> {
>-    const std::string vertexShader =
>-        "attribute vec4 a_position;\n"
>-        "varying vec2 v_texCoord;\n"
>-        "void main() {\n"
>-        "    gl_Position = a_position;\n"
>-        "    v_texCoord = (a_position.xy * 0.5) + 0.5;\n"
>-        "}\n";
>-
>-    const std::string fragmentShader =
>-        "precision mediump float;\n"
>-        "varying vec2 v_texCoord;\n"
>-        "uniform sampler2D u_texture;\n"
>-        "void main() {\n"
>-        "    // Shader swizzles color channels so we can tell if the draw succeeded.\n"
>-        "    gl_FragColor = texture2D(u_texture, v_texCoord).gbra;\n"
>-        "}\n";
>+    constexpr char kVS[] =
>+        R"(attribute vec4 a_position;
>+varying vec2 v_texCoord;
>+void main() {
>+    gl_Position = a_position;
>+    v_texCoord = (a_position.xy * 0.5) + 0.5;
>+})";
>+
>+    constexpr char kFS[] =
>+        R"(precision mediump float;
>+varying vec2 v_texCoord;
>+uniform sampler2D u_texture;
>+void main() {
>+    // Shader swizzles color channels so we can tell if the draw succeeded.
>+    gl_FragColor = texture2D(u_texture, v_texCoord).gbra;
>+})";
> 
>     GLTexture texture;
>     FillTexture2D(texture.get(), 1, 1, GLColor::red, 0, GL_RGBA, GL_RGBA, GL_UNSIGNED_BYTE);
>@@ -1957,7 +2217,7 @@ TEST_P(WebGLCompatibilityTest, RenderingFeedbackLoop)
> 
>     ASSERT_GLENUM_EQ(GL_FRAMEBUFFER_COMPLETE, glCheckFramebufferStatus(GL_FRAMEBUFFER));
> 
>-    ANGLE_GL_PROGRAM(program, vertexShader, fragmentShader);
>+    ANGLE_GL_PROGRAM(program, kVS, kFS);
> 
>     GLint uniformLoc = glGetUniformLocation(program.get(), "u_texture");
>     ASSERT_NE(-1, uniformLoc);
>@@ -2012,11 +2272,11 @@ TEST_P(WebGLCompatibilityTest, MaxDrawBuffersAttachmentPoints)
> 
>     // Test that enabling the draw buffers extension will allow us to bind with a non-zero
>     // attachment point.
>-    if (extensionRequestable("GL_EXT_draw_buffers"))
>+    if (IsGLExtensionRequestable("GL_EXT_draw_buffers"))
>     {
>         glRequestExtensionANGLE("GL_EXT_draw_buffers");
>         EXPECT_GL_NO_ERROR();
>-        EXPECT_TRUE(extensionEnabled("GL_EXT_draw_buffers"));
>+        EXPECT_TRUE(IsGLExtensionEnabled("GL_EXT_draw_buffers"));
> 
>         glBindFramebuffer(GL_FRAMEBUFFER, fbo[1].get());
> 
>@@ -2032,21 +2292,14 @@ TEST_P(WebGLCompatibilityTest, MaxDrawBuffersAttachmentPoints)
> // Test that the offset in the index buffer is forced to be a multiple of the element size
> TEST_P(WebGLCompatibilityTest, DrawElementsOffsetRestriction)
> {
>-    const std::string &vert =
>-        "attribute vec3 a_pos;\n"
>-        "void main()\n"
>-        "{\n"
>-        "    gl_Position = vec4(a_pos, 1.0);\n"
>-        "}\n";
>-
>-    const std::string &frag =
>-        "precision highp float;\n"
>-        "void main()\n"
>-        "{\n"
>-        "    gl_FragColor = vec4(1.0);\n"
>-        "}\n";
>+    constexpr char kVS[] =
>+        R"(attribute vec3 a_pos;
>+void main()
>+{
>+    gl_Position = vec4(a_pos, 1.0);
>+})";
> 
>-    ANGLE_GL_PROGRAM(program, vert, frag);
>+    ANGLE_GL_PROGRAM(program, kVS, essl1_shaders::fs::Red());
> 
>     GLint posLocation = glGetAttribLocation(program.get(), "a_pos");
>     ASSERT_NE(-1, posLocation);
>@@ -2128,23 +2381,23 @@ void WebGLCompatibilityTest::drawBuffersEXTFeedbackLoop(GLuint program,
> // Based on WebGL test conformance/extensions/webgl-draw-buffers-feedback-loop.html
> TEST_P(WebGLCompatibilityTest, RenderingFeedbackLoopWithDrawBuffersEXT)
> {
>-    const std::string vertexShader =
>-        "attribute vec4 aPosition;\n"
>-        "varying vec2 texCoord;\n"
>-        "void main() {\n"
>-        "    gl_Position = aPosition;\n"
>-        "    texCoord = (aPosition.xy * 0.5) + 0.5;\n"
>-        "}\n";
>-
>-    const std::string fragmentShader =
>-        "#extension GL_EXT_draw_buffers : require\n"
>-        "precision mediump float;\n"
>-        "uniform sampler2D tex;\n"
>-        "varying vec2 texCoord;\n"
>-        "void main() {\n"
>-        "    gl_FragData[0] = texture2D(tex, texCoord);\n"
>-        "    gl_FragData[1] = texture2D(tex, texCoord);\n"
>-        "}\n";
>+    constexpr char kVS[] =
>+        R"(attribute vec4 aPosition;
>+varying vec2 texCoord;
>+void main() {
>+    gl_Position = aPosition;
>+    texCoord = (aPosition.xy * 0.5) + 0.5;
>+})";
>+
>+    constexpr char kFS[] =
>+        R"(#extension GL_EXT_draw_buffers : require
>+precision mediump float;
>+uniform sampler2D tex;
>+varying vec2 texCoord;
>+void main() {
>+    gl_FragData[0] = texture2D(tex, texCoord);
>+    gl_FragData[1] = texture2D(tex, texCoord);
>+})";
> 
>     GLsizei width  = 8;
>     GLsizei height = 8;
>@@ -2152,7 +2405,7 @@ TEST_P(WebGLCompatibilityTest, RenderingFeedbackLoopWithDrawBuffersEXT)
>     // This shader cannot be run in ES3, because WebGL 2 does not expose the draw buffers
>     // extension and gl_FragData semantics are changed to enforce indexing by zero always.
>     // TODO(jmadill): This extension should be disabled in WebGL 2 contexts.
>-    if (/*!extensionEnabled("GL_EXT_draw_buffers")*/ getClientMajorVersion() != 2)
>+    if (/*!IsGLExtensionEnabled("GL_EXT_draw_buffers")*/ getClientMajorVersion() != 2)
>     {
>         // No WEBGL_draw_buffers support -- this is legal.
>         return;
>@@ -2161,13 +2414,10 @@ TEST_P(WebGLCompatibilityTest, RenderingFeedbackLoopWithDrawBuffersEXT)
>     GLint maxDrawBuffers = 0;
>     glGetIntegerv(GL_MAX_DRAW_BUFFERS, &maxDrawBuffers);
> 
>-    if (maxDrawBuffers < 2)
>-    {
>-        std::cout << "Test skipped because MAX_DRAW_BUFFERS is too small." << std::endl;
>-        return;
>-    }
>+    // Test skipped because MAX_DRAW_BUFFERS is too small.
>+    ANGLE_SKIP_TEST_IF(maxDrawBuffers < 2);
> 
>-    ANGLE_GL_PROGRAM(program, vertexShader, fragmentShader);
>+    ANGLE_GL_PROGRAM(program, kVS, kFS);
>     glUseProgram(program.get());
>     glViewport(0, 0, width, height);
> 
>@@ -2193,13 +2443,18 @@ TEST_P(WebGLCompatibilityTest, RenderingFeedbackLoopWithDrawBuffersEXT)
>                                GL_INVALID_OPERATION);
>     drawBuffersEXTFeedbackLoop(program.get(), {{GL_COLOR_ATTACHMENT0, GL_COLOR_ATTACHMENT1}},
>                                GL_INVALID_OPERATION);
>-    drawBuffersEXTFeedbackLoop(program.get(), {{GL_COLOR_ATTACHMENT0, GL_NONE}}, GL_NO_ERROR);
>+    // A feedback loop is formed regardless of drawBuffers settings.
>+    drawBuffersEXTFeedbackLoop(program.get(), {{GL_COLOR_ATTACHMENT0, GL_NONE}},
>+                               GL_INVALID_OPERATION);
> }
> 
> // Test tests that texture copying feedback loops are properly rejected in WebGL.
> // Based on the WebGL test conformance/textures/misc/texture-copying-feedback-loops.html
> TEST_P(WebGLCompatibilityTest, TextureCopyingFeedbackLoops)
> {
>+    // Vulkan does not support copying from a texture to itself. http://anglebug.com/2914
>+    ANGLE_SKIP_TEST_IF(IsVulkan());
>+
>     GLTexture texture;
>     glBindTexture(GL_TEXTURE_2D, texture.get());
>     glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, 2, 2, 0, GL_RGBA, GL_UNSIGNED_BYTE, nullptr);
>@@ -2277,30 +2532,30 @@ void WebGLCompatibilityTest::drawBuffersFeedbackLoop(GLuint program,
> // Based on WebGL test conformance/glsl/misc/shaders-with-invariance.html.
> TEST_P(WebGLCompatibilityTest, BuiltInInvariant)
> {
>-    const std::string vertexShaderVariant =
>-        "varying vec4 v_varying;\n"
>-        "void main()\n"
>-        "{\n"
>-        "    gl_PointSize = 1.0;\n"
>-        "    gl_Position = v_varying;\n"
>-        "}";
>-    const std::string fragmentShaderInvariantGlFragCoord =
>-        "invariant gl_FragCoord;\n"
>-        "void main()\n"
>-        "{\n"
>-        "    gl_FragColor = gl_FragCoord;\n"
>-        "}";
>-    const std::string fragmentShaderInvariantGlPointCoord =
>-        "invariant gl_PointCoord;\n"
>-        "void main()\n"
>-        "{\n"
>-        "    gl_FragColor = vec4(gl_PointCoord, 0.0, 0.0);\n"
>-        "}";
>-
>-    GLuint program = CompileProgram(vertexShaderVariant, fragmentShaderInvariantGlFragCoord);
>+    constexpr char kVS[] =
>+        R"(varying vec4 v_varying;
>+void main()
>+{
>+    gl_PointSize = 1.0;
>+    gl_Position = v_varying;
>+})";
>+    constexpr char kFSInvariantGlFragCoord[] =
>+        R"(invariant gl_FragCoord;
>+void main()
>+{
>+    gl_FragColor = gl_FragCoord;
>+})";
>+    constexpr char kFSInvariantGlPointCoord[] =
>+        R"(invariant gl_PointCoord;
>+void main()
>+{
>+    gl_FragColor = vec4(gl_PointCoord, 0.0, 0.0);
>+})";
>+
>+    GLuint program = CompileProgram(kVS, kFSInvariantGlFragCoord);
>     EXPECT_EQ(0u, program);
> 
>-    program = CompileProgram(vertexShaderVariant, fragmentShaderInvariantGlPointCoord);
>+    program = CompileProgram(kVS, kFSInvariantGlPointCoord);
>     EXPECT_EQ(0u, program);
> }
> 
>@@ -2308,38 +2563,33 @@ TEST_P(WebGLCompatibilityTest, BuiltInInvariant)
> // Based on WebGL test conformance/glsl/misc/shaders-with-name-conflicts.html.
> TEST_P(WebGLCompatibilityTest, GlobalNamesConflict)
> {
>-    const std::string vertexShader =
>-        "attribute vec4 foo;\n"
>-        "void main()\n"
>-        "{\n"
>-        "    gl_Position = foo;\n"
>-        "}";
>-    const std::string fragmentShader =
>-        "precision mediump float;\n"
>-        "uniform vec4 foo;\n"
>-        "void main()\n"
>-        "{\n"
>-        "    gl_FragColor = foo;\n"
>-        "}";
>-
>-    GLuint program = CompileProgram(vertexShader, fragmentShader);
>+    constexpr char kVS[] =
>+        R"(attribute vec4 foo;
>+void main()
>+{
>+    gl_Position = foo;
>+})";
>+    constexpr char kFS[] =
>+        R"(precision mediump float;
>+uniform vec4 foo;
>+void main()
>+{
>+    gl_FragColor = foo;
>+})";
>+
>+    GLuint program = CompileProgram(kVS, kFS);
>     EXPECT_EQ(0u, program);
> }
> 
> // Test dimension and image size validation of compressed textures
> TEST_P(WebGLCompatibilityTest, CompressedTextureS3TC)
> {
>-    if (extensionRequestable("GL_EXT_texture_compression_dxt1"))
>+    if (IsGLExtensionRequestable("GL_EXT_texture_compression_dxt1"))
>     {
>         glRequestExtensionANGLE("GL_EXT_texture_compression_dxt1");
>     }
> 
>-    if (!extensionEnabled("GL_EXT_texture_compression_dxt1"))
>-    {
>-        std::cout << "Test skipped because GL_EXT_texture_compression_dxt1 is not available."
>-                  << std::endl;
>-        return;
>-    }
>+    ANGLE_SKIP_TEST_IF(!IsGLExtensionEnabled("GL_EXT_texture_compression_dxt1"));
> 
>     constexpr uint8_t CompressedImageDXT1[] = {0x00, 0xf8, 0x00, 0xf8, 0xaa, 0xaa, 0xaa, 0xaa};
> 
>@@ -2423,7 +2673,7 @@ TEST_P(WebGLCompatibilityTest, L32FTextures)
> 
>     for (auto extension : FloatingPointTextureExtensions)
>     {
>-        if (strlen(extension) > 0 && extensionRequestable(extension))
>+        if (strlen(extension) > 0 && IsGLExtensionRequestable(extension))
>         {
>             glRequestExtensionANGLE(extension);
>             ASSERT_GL_NO_ERROR();
>@@ -2431,19 +2681,19 @@ TEST_P(WebGLCompatibilityTest, L32FTextures)
> 
>         // Unsized L 32F
>         {
>-            bool texture = extensionEnabled("GL_OES_texture_float");
>-            bool filter  = extensionEnabled("GL_OES_texture_float_linear");
>+            bool texture = IsGLExtensionEnabled("GL_OES_texture_float");
>+            bool filter  = IsGLExtensionEnabled("GL_OES_texture_float_linear");
>             bool render  = false;
>             TestFloatTextureFormat(GL_LUMINANCE, GL_LUMINANCE, GL_FLOAT, texture, filter, render,
>                                    textureData, readPixelData);
>         }
> 
>-        if (getClientMajorVersion() >= 3 || extensionEnabled("GL_EXT_texture_storage"))
>+        if (getClientMajorVersion() >= 3 || IsGLExtensionEnabled("GL_EXT_texture_storage"))
>         {
>             // Sized L 32F
>-            bool texture = extensionEnabled("GL_OES_texture_float") &&
>-                           extensionEnabled("GL_EXT_texture_storage");
>-            bool filter = extensionEnabled("GL_OES_texture_float_linear");
>+            bool texture = IsGLExtensionEnabled("GL_OES_texture_float") &&
>+                           IsGLExtensionEnabled("GL_EXT_texture_storage");
>+            bool filter = IsGLExtensionEnabled("GL_OES_texture_float_linear");
>             bool render = false;
>             TestFloatTextureFormat(GL_LUMINANCE32F_EXT, GL_LUMINANCE, GL_FLOAT, texture, filter,
>                                    render, textureData, readPixelData);
>@@ -2458,7 +2708,7 @@ TEST_P(WebGLCompatibilityTest, A32FTextures)
> 
>     for (auto extension : FloatingPointTextureExtensions)
>     {
>-        if (strlen(extension) > 0 && extensionRequestable(extension))
>+        if (strlen(extension) > 0 && IsGLExtensionRequestable(extension))
>         {
>             glRequestExtensionANGLE(extension);
>             ASSERT_GL_NO_ERROR();
>@@ -2466,19 +2716,19 @@ TEST_P(WebGLCompatibilityTest, A32FTextures)
> 
>         // Unsized A 32F
>         {
>-            bool texture = extensionEnabled("GL_OES_texture_float");
>-            bool filter  = extensionEnabled("GL_OES_texture_float_linear");
>+            bool texture = IsGLExtensionEnabled("GL_OES_texture_float");
>+            bool filter  = IsGLExtensionEnabled("GL_OES_texture_float_linear");
>             bool render  = false;
>             TestFloatTextureFormat(GL_ALPHA, GL_ALPHA, GL_FLOAT, texture, filter, render,
>                                    textureData, readPixelData);
>         }
> 
>-        if (getClientMajorVersion() >= 3 || extensionEnabled("GL_EXT_texture_storage"))
>+        if (getClientMajorVersion() >= 3 || IsGLExtensionEnabled("GL_EXT_texture_storage"))
>         {
>             // Sized A 32F
>-            bool texture = extensionEnabled("GL_OES_texture_float") &&
>-                           extensionEnabled("GL_EXT_texture_storage");
>-            bool filter = extensionEnabled("GL_OES_texture_float_linear");
>+            bool texture = IsGLExtensionEnabled("GL_OES_texture_float") &&
>+                           IsGLExtensionEnabled("GL_EXT_texture_storage");
>+            bool filter = IsGLExtensionEnabled("GL_OES_texture_float_linear");
>             bool render = false;
>             TestFloatTextureFormat(GL_ALPHA32F_EXT, GL_ALPHA, GL_FLOAT, texture, filter, render,
>                                    textureData, readPixelData);
>@@ -2494,7 +2744,7 @@ TEST_P(WebGLCompatibilityTest, LA32FTextures)
> 
>     for (auto extension : FloatingPointTextureExtensions)
>     {
>-        if (strlen(extension) > 0 && extensionRequestable(extension))
>+        if (strlen(extension) > 0 && IsGLExtensionRequestable(extension))
>         {
>             glRequestExtensionANGLE(extension);
>             ASSERT_GL_NO_ERROR();
>@@ -2502,19 +2752,19 @@ TEST_P(WebGLCompatibilityTest, LA32FTextures)
> 
>         // Unsized LA 32F
>         {
>-            bool texture = extensionEnabled("GL_OES_texture_float");
>-            bool filter  = extensionEnabled("GL_OES_texture_float_linear");
>+            bool texture = IsGLExtensionEnabled("GL_OES_texture_float");
>+            bool filter  = IsGLExtensionEnabled("GL_OES_texture_float_linear");
>             bool render  = false;
>             TestFloatTextureFormat(GL_LUMINANCE_ALPHA, GL_LUMINANCE_ALPHA, GL_FLOAT, texture,
>                                    filter, render, textureData, readPixelData);
>         }
> 
>-        if (getClientMajorVersion() >= 3 || extensionEnabled("GL_EXT_texture_storage"))
>+        if (getClientMajorVersion() >= 3 || IsGLExtensionEnabled("GL_EXT_texture_storage"))
>         {
>             // Sized LA 32F
>-            bool texture = extensionEnabled("GL_OES_texture_float") &&
>-                           extensionEnabled("GL_EXT_texture_storage");
>-            bool filter = extensionEnabled("GL_OES_texture_float_linear");
>+            bool texture = IsGLExtensionEnabled("GL_OES_texture_float") &&
>+                           IsGLExtensionEnabled("GL_EXT_texture_storage");
>+            bool filter = IsGLExtensionEnabled("GL_OES_texture_float_linear");
>             bool render = false;
>             TestFloatTextureFormat(GL_LUMINANCE_ALPHA32F_EXT, GL_LUMINANCE_ALPHA, GL_FLOAT, texture,
>                                    filter, render, textureData, readPixelData);
>@@ -2528,7 +2778,7 @@ TEST_P(WebGLCompatibilityTest, R32FTextures)
> 
>     for (auto extension : FloatingPointTextureExtensions)
>     {
>-        if (strlen(extension) > 0 && extensionRequestable(extension))
>+        if (strlen(extension) > 0 && IsGLExtensionRequestable(extension))
>         {
>             glRequestExtensionANGLE(extension);
>             ASSERT_GL_NO_ERROR();
>@@ -2536,22 +2786,22 @@ TEST_P(WebGLCompatibilityTest, R32FTextures)
> 
>         // Unsized R 32F
>         {
>-            bool texture =
>-                extensionEnabled("GL_OES_texture_float") && extensionEnabled("GL_EXT_texture_rg");
>-            bool filter = extensionEnabled("GL_OES_texture_float_linear");
>-            bool render = extensionEnabled("GL_EXT_color_buffer_float");
>+            bool texture = IsGLExtensionEnabled("GL_OES_texture_float") &&
>+                           IsGLExtensionEnabled("GL_EXT_texture_rg");
>+            bool filter = IsGLExtensionEnabled("GL_OES_texture_float_linear");
>+            bool render = IsGLExtensionEnabled("GL_EXT_color_buffer_float");
>             TestFloatTextureFormat(GL_RED, GL_RED, GL_FLOAT, texture, filter, render, data, data);
>         }
> 
>-        if (getClientMajorVersion() >= 3 || extensionEnabled("GL_EXT_texture_storage"))
>+        if (getClientMajorVersion() >= 3 || IsGLExtensionEnabled("GL_EXT_texture_storage"))
>         {
>             // Sized R 32F
>             bool texture =
>-                (getClientMajorVersion() >= 3) || (extensionEnabled("GL_OES_texture_float") &&
>-                                                   extensionEnabled("GL_EXT_texture_rg") &&
>-                                                   extensionEnabled("GL_EXT_texture_storage"));
>-            bool filter = extensionEnabled("GL_OES_texture_float_linear");
>-            bool render = extensionEnabled("GL_EXT_color_buffer_float");
>+                (getClientMajorVersion() >= 3) || (IsGLExtensionEnabled("GL_OES_texture_float") &&
>+                                                   IsGLExtensionEnabled("GL_EXT_texture_rg") &&
>+                                                   IsGLExtensionEnabled("GL_EXT_texture_storage"));
>+            bool filter = IsGLExtensionEnabled("GL_OES_texture_float_linear");
>+            bool render = IsGLExtensionEnabled("GL_EXT_color_buffer_float");
>             TestFloatTextureFormat(GL_R32F, GL_RED, GL_FLOAT, texture, filter, render, data, data);
>         }
>     }
>@@ -2563,7 +2813,7 @@ TEST_P(WebGLCompatibilityTest, RG32FTextures)
> 
>     for (auto extension : FloatingPointTextureExtensions)
>     {
>-        if (strlen(extension) > 0 && extensionRequestable(extension))
>+        if (strlen(extension) > 0 && IsGLExtensionRequestable(extension))
>         {
>             glRequestExtensionANGLE(extension);
>             ASSERT_GL_NO_ERROR();
>@@ -2571,22 +2821,22 @@ TEST_P(WebGLCompatibilityTest, RG32FTextures)
> 
>         // Unsized RG 32F
>         {
>-            bool texture =
>-                (extensionEnabled("GL_OES_texture_float") && extensionEnabled("GL_EXT_texture_rg"));
>-            bool filter = extensionEnabled("GL_OES_texture_float_linear");
>-            bool render = extensionEnabled("GL_EXT_color_buffer_float");
>+            bool texture = (IsGLExtensionEnabled("GL_OES_texture_float") &&
>+                            IsGLExtensionEnabled("GL_EXT_texture_rg"));
>+            bool filter  = IsGLExtensionEnabled("GL_OES_texture_float_linear");
>+            bool render  = IsGLExtensionEnabled("GL_EXT_color_buffer_float");
>             TestFloatTextureFormat(GL_RG, GL_RG, GL_FLOAT, texture, filter, render, data, data);
>         }
> 
>-        if (getClientMajorVersion() >= 3 || extensionEnabled("GL_EXT_texture_storage"))
>+        if (getClientMajorVersion() >= 3 || IsGLExtensionEnabled("GL_EXT_texture_storage"))
>         {
>             // Sized RG 32F
>             bool texture =
>-                (getClientMajorVersion() >= 3) || (extensionEnabled("GL_OES_texture_float") &&
>-                                                   extensionEnabled("GL_EXT_texture_rg") &&
>-                                                   extensionEnabled("GL_EXT_texture_storage"));
>-            bool filter = extensionEnabled("GL_OES_texture_float_linear");
>-            bool render = extensionEnabled("GL_EXT_color_buffer_float");
>+                (getClientMajorVersion() >= 3) || (IsGLExtensionEnabled("GL_OES_texture_float") &&
>+                                                   IsGLExtensionEnabled("GL_EXT_texture_rg") &&
>+                                                   IsGLExtensionEnabled("GL_EXT_texture_storage"));
>+            bool filter = IsGLExtensionEnabled("GL_OES_texture_float_linear");
>+            bool render = IsGLExtensionEnabled("GL_EXT_color_buffer_float");
>             TestFloatTextureFormat(GL_RG32F, GL_RG, GL_FLOAT, texture, filter, render, data, data);
>         }
>     }
>@@ -2594,17 +2844,13 @@ TEST_P(WebGLCompatibilityTest, RG32FTextures)
> 
> TEST_P(WebGLCompatibilityTest, RGB32FTextures)
> {
>-    if (IsLinux() && IsIntel())
>-    {
>-        std::cout << "Test skipped on Linux Intel." << std::endl;
>-        return;
>-    }
>+    ANGLE_SKIP_TEST_IF(IsLinux() && IsIntel());
> 
>     constexpr float data[] = {1000.0f, -500.0f, 10.0f, 1.0f};
> 
>     for (auto extension : FloatingPointTextureExtensions)
>     {
>-        if (strlen(extension) > 0 && extensionRequestable(extension))
>+        if (strlen(extension) > 0 && IsGLExtensionRequestable(extension))
>         {
>             glRequestExtensionANGLE(extension);
>             ASSERT_GL_NO_ERROR();
>@@ -2612,20 +2858,20 @@ TEST_P(WebGLCompatibilityTest, RGB32FTextures)
> 
>         // Unsized RGB 32F
>         {
>-            bool texture = extensionEnabled("GL_OES_texture_float");
>-            bool filter  = extensionEnabled("GL_OES_texture_float_linear");
>-            bool render  = extensionEnabled("GL_CHROMIUM_color_buffer_float_rgb");
>+            bool texture = IsGLExtensionEnabled("GL_OES_texture_float");
>+            bool filter  = IsGLExtensionEnabled("GL_OES_texture_float_linear");
>+            bool render  = false;
>             TestFloatTextureFormat(GL_RGB, GL_RGB, GL_FLOAT, texture, filter, render, data, data);
>         }
> 
>-        if (getClientMajorVersion() >= 3 || extensionEnabled("GL_EXT_texture_storage"))
>+        if (getClientMajorVersion() >= 3 || IsGLExtensionEnabled("GL_EXT_texture_storage"))
>         {
>-            // Sized RGBA 32F
>+            // Sized RGB 32F
>             bool texture =
>-                (getClientMajorVersion() >= 3) || (extensionEnabled("GL_OES_texture_float") &&
>-                                                   extensionEnabled("GL_EXT_texture_storage"));
>-            bool filter = extensionEnabled("GL_OES_texture_float_linear");
>-            bool render = extensionEnabled("GL_CHROMIUM_color_buffer_float_rgb");
>+                (getClientMajorVersion() >= 3) || (IsGLExtensionEnabled("GL_OES_texture_float") &&
>+                                                   IsGLExtensionEnabled("GL_EXT_texture_storage"));
>+            bool filter = IsGLExtensionEnabled("GL_OES_texture_float_linear");
>+            bool render = IsGLExtensionEnabled("GL_CHROMIUM_color_buffer_float_rgb");
>             TestFloatTextureFormat(GL_RGB32F, GL_RGB, GL_FLOAT, texture, filter, render, data,
>                                    data);
>         }
>@@ -2638,7 +2884,7 @@ TEST_P(WebGLCompatibilityTest, RGBA32FTextures)
> 
>     for (auto extension : FloatingPointTextureExtensions)
>     {
>-        if (strlen(extension) > 0 && extensionRequestable(extension))
>+        if (strlen(extension) > 0 && IsGLExtensionRequestable(extension))
>         {
>             glRequestExtensionANGLE(extension);
>             ASSERT_GL_NO_ERROR();
>@@ -2646,28 +2892,255 @@ TEST_P(WebGLCompatibilityTest, RGBA32FTextures)
> 
>         // Unsized RGBA 32F
>         {
>-            bool texture = extensionEnabled("GL_OES_texture_float");
>-            bool filter  = extensionEnabled("GL_OES_texture_float_linear");
>-            bool render  = extensionEnabled("GL_EXT_color_buffer_float") ||
>-                          extensionEnabled("GL_CHROMIUM_color_buffer_float_rgba");
>+            bool texture = IsGLExtensionEnabled("GL_OES_texture_float");
>+            bool filter  = IsGLExtensionEnabled("GL_OES_texture_float_linear");
>+            bool render  = false;
>             TestFloatTextureFormat(GL_RGBA, GL_RGBA, GL_FLOAT, texture, filter, render, data, data);
>         }
> 
>-        if (getClientMajorVersion() >= 3 || extensionEnabled("GL_EXT_texture_storage"))
>+        if (getClientMajorVersion() >= 3 || IsGLExtensionEnabled("GL_EXT_texture_storage"))
>         {
>             // Sized RGBA 32F
>             bool texture =
>-                (getClientMajorVersion() >= 3) || (extensionEnabled("GL_OES_texture_float") &&
>-                                                   extensionEnabled("GL_EXT_texture_storage"));
>-            bool filter = extensionEnabled("GL_OES_texture_float_linear");
>-            bool render = extensionEnabled("GL_EXT_color_buffer_float") ||
>-                          extensionEnabled("GL_CHROMIUM_color_buffer_float_rgba");
>+                (getClientMajorVersion() >= 3) || (IsGLExtensionEnabled("GL_OES_texture_float") &&
>+                                                   IsGLExtensionEnabled("GL_EXT_texture_storage"));
>+            bool filter = IsGLExtensionEnabled("GL_OES_texture_float_linear");
>+            bool render = IsGLExtensionEnabled("GL_EXT_color_buffer_float") ||
>+                          IsGLExtensionEnabled("GL_CHROMIUM_color_buffer_float_rgba");
>             TestFloatTextureFormat(GL_RGBA32F, GL_RGBA, GL_FLOAT, texture, filter, render, data,
>                                    data);
>         }
>     }
> }
> 
>+// Test that has float color attachment caching works when color attachments change, by calling draw
>+// command when blending is enabled
>+TEST_P(WebGLCompatibilityTest, FramebufferFloatColorAttachment)
>+{
>+    if (getClientMajorVersion() >= 3)
>+    {
>+        ANGLE_SKIP_TEST_IF(!EnsureGLExtensionEnabled("GL_EXT_color_buffer_float"));
>+    }
>+    else
>+    {
>+        ANGLE_SKIP_TEST_IF(!EnsureGLExtensionEnabled("GL_OES_texture_float"));
>+        ANGLE_SKIP_TEST_IF(!EnsureGLExtensionEnabled("GL_CHROMIUM_color_buffer_float_rgba"));
>+    }
>+
>+    constexpr char kVS[] =
>+        R"(void main()
>+{
>+    gl_Position = vec4(0, 0, 0, 1);
>+})";
>+
>+    constexpr char kFS[] =
>+        R"(void main()
>+{
>+    gl_FragColor = vec4(0, 1, 0, 1);
>+})";
>+
>+    ANGLE_GL_PROGRAM(program, kVS, kFS);
>+    glUseProgram(program);
>+
>+    glEnable(GL_BLEND);
>+
>+    GLTexture texture1;
>+    glBindTexture(GL_TEXTURE_2D, texture1);
>+    glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, 1, 1, 0, GL_RGBA, GL_UNSIGNED_BYTE, nullptr);
>+    EXPECT_GL_NO_ERROR();
>+
>+    GLTexture texture2;
>+    glBindTexture(GL_TEXTURE_2D, texture2);
>+    glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA32F, 1, 1, 0, GL_RGBA, GL_FLOAT, nullptr);
>+    EXPECT_GL_NO_ERROR();
>+
>+    GLFramebuffer fbo1;
>+    glBindFramebuffer(GL_FRAMEBUFFER, fbo1);
>+    glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, texture1, 0);
>+    ASSERT_GLENUM_EQ(GL_FRAMEBUFFER_COMPLETE, glCheckFramebufferStatus(GL_FRAMEBUFFER));
>+
>+    GLFramebuffer fbo2;
>+    glBindFramebuffer(GL_FRAMEBUFFER, fbo2);
>+    glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, texture2, 0);
>+    ASSERT_GLENUM_EQ(GL_FRAMEBUFFER_COMPLETE, glCheckFramebufferStatus(GL_FRAMEBUFFER));
>+    glDrawArrays(GL_POINTS, 0, 1);
>+    EXPECT_GL_ERROR(GL_INVALID_OPERATION);
>+
>+    glDisable(GL_BLEND);
>+    glDrawArrays(GL_POINTS, 0, 1);
>+    EXPECT_GL_NO_ERROR();
>+    glEnable(GL_BLEND);
>+
>+    glBindFramebuffer(GL_FRAMEBUFFER, fbo1);
>+    glDrawArrays(GL_POINTS, 0, 1);
>+
>+    glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, 0,
>+                           0);  // test unbind
>+    glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, texture2, 0);
>+    ASSERT_GLENUM_EQ(GL_FRAMEBUFFER_COMPLETE, glCheckFramebufferStatus(GL_FRAMEBUFFER));
>+
>+    glDrawArrays(GL_POINTS, 0, 1);
>+    EXPECT_GL_ERROR(GL_INVALID_OPERATION);
>+
>+    glDisable(GL_BLEND);
>+    glDrawArrays(GL_POINTS, 0, 1);
>+    EXPECT_GL_NO_ERROR();
>+    glEnable(GL_BLEND);
>+
>+    glBindTexture(GL_TEXTURE_2D, texture2);
>+    glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, 1, 1, 0, GL_RGBA, GL_UNSIGNED_BYTE, nullptr);
>+
>+    glDrawArrays(GL_POINTS, 0, 1);
>+    EXPECT_GL_NO_ERROR();
>+}
>+
>+// Test that has float color attachment caching works with multiple color attachments bound to a
>+// Framebuffer
>+TEST_P(WebGLCompatibilityTest, FramebufferFloatColorAttachmentMRT)
>+{
>+    bool isWebGL2 = getClientMajorVersion() >= 3;
>+    if (isWebGL2)
>+    {
>+        ANGLE_SKIP_TEST_IF(!EnsureGLExtensionEnabled("GL_EXT_color_buffer_float"));
>+
>+        constexpr char kVS[] =
>+            R"(#version 300 es
>+void main()
>+{
>+    gl_Position = vec4(0, 0, 0, 1);
>+})";
>+
>+        constexpr char kFS[] =
>+            R"(#version 300 es
>+precision lowp float;
>+layout(location = 0) out vec4 o_color0;
>+layout(location = 1) out vec4 o_color1;
>+void main()
>+{
>+    o_color0 = vec4(1, 0, 0, 1);
>+    o_color1 = vec4(0, 1, 0, 1);
>+})";
>+
>+        ANGLE_GL_PROGRAM(program, kVS, kFS);
>+        glUseProgram(program);
>+    }
>+    else
>+    {
>+        ANGLE_SKIP_TEST_IF(!EnsureGLExtensionEnabled("GL_OES_texture_float"));
>+        ANGLE_SKIP_TEST_IF(!EnsureGLExtensionEnabled("GL_CHROMIUM_color_buffer_float_rgba"));
>+        ANGLE_SKIP_TEST_IF(!EnsureGLExtensionEnabled("GL_EXT_draw_buffers"));
>+
>+        constexpr char kVS[] =
>+            R"(void main()
>+{
>+    gl_Position = vec4(0, 0, 0, 1);
>+})";
>+
>+        constexpr char kFS[] =
>+            R"(#extension GL_EXT_draw_buffers : require
>+precision lowp float;
>+void main()
>+{
>+    gl_FragData[0] = vec4(1, 0, 0, 1);
>+    gl_FragData[1] = vec4(0, 1, 0, 1);
>+})";
>+
>+        ANGLE_GL_PROGRAM(program, kVS, kFS);
>+        glUseProgram(program);
>+    }
>+
>+    glEnable(GL_BLEND);
>+
>+    GLTexture texture1;
>+    glBindTexture(GL_TEXTURE_2D, texture1);
>+    glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, 1, 1, 0, GL_RGBA, GL_UNSIGNED_BYTE, nullptr);
>+    EXPECT_GL_NO_ERROR();
>+
>+    GLTexture texture2;
>+    glBindTexture(GL_TEXTURE_2D, texture2);
>+    glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, 1, 1, 0, GL_RGBA, GL_UNSIGNED_BYTE, nullptr);
>+    EXPECT_GL_NO_ERROR();
>+
>+    GLTexture textureF1;
>+    glBindTexture(GL_TEXTURE_2D, textureF1);
>+    glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA32F, 1, 1, 0, GL_RGBA, GL_FLOAT, nullptr);
>+    EXPECT_GL_NO_ERROR();
>+
>+    GLTexture textureF2;
>+    glBindTexture(GL_TEXTURE_2D, textureF2);
>+    glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA32F, 1, 1, 0, GL_RGBA, GL_FLOAT, nullptr);
>+    EXPECT_GL_NO_ERROR();
>+
>+    GLFramebuffer fbo;
>+    glBindFramebuffer(GL_FRAMEBUFFER, fbo);
>+    glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, texture1, 0);
>+    glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT1, GL_TEXTURE_2D, texture2, 0);
>+    ASSERT_GLENUM_EQ(GL_FRAMEBUFFER_COMPLETE, glCheckFramebufferStatus(GL_FRAMEBUFFER));
>+
>+    GLenum drawbuffers[] = {GL_COLOR_ATTACHMENT0, GL_COLOR_ATTACHMENT1};
>+    if (isWebGL2)
>+    {
>+        glDrawBuffers(2, drawbuffers);
>+    }
>+    else
>+    {
>+        glDrawBuffersEXT(2, drawbuffers);
>+    }
>+
>+    glDrawArrays(GL_POINTS, 0, 1);
>+    EXPECT_GL_NO_ERROR();
>+
>+    glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, textureF1, 0);
>+    glDrawArrays(GL_POINTS, 0, 1);
>+    EXPECT_GL_ERROR(GL_INVALID_OPERATION);
>+
>+    glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT1, GL_TEXTURE_2D, textureF2, 0);
>+    glDrawArrays(GL_POINTS, 0, 1);
>+    EXPECT_GL_ERROR(GL_INVALID_OPERATION);
>+
>+    glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, texture1, 0);
>+    glDrawArrays(GL_POINTS, 0, 1);
>+    EXPECT_GL_ERROR(GL_INVALID_OPERATION);
>+
>+    if (isWebGL2)
>+    {
>+        // WebGL 1 will report a FRAMEBUFFER_UNSUPPORTED for one unsigned_byte and one float
>+        // attachment bound to one FBO at the same time
>+        glDrawBuffers(1, drawbuffers);
>+        ASSERT_GLENUM_EQ(GL_FRAMEBUFFER_COMPLETE, glCheckFramebufferStatus(GL_FRAMEBUFFER));
>+        glDrawArrays(GL_POINTS, 0, 1);
>+        EXPECT_GL_NO_ERROR();
>+        glDrawBuffers(2, drawbuffers);
>+    }
>+
>+    glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT1, GL_TEXTURE_2D, texture2, 0);
>+    glDrawArrays(GL_POINTS, 0, 1);
>+    EXPECT_GL_NO_ERROR();
>+}
>+
>+// Test if blending of float32 color attachment generates GL_INVALID_OPERATION when
>+// GL_EXT_float_blend is not enabled
>+TEST_P(WebGLCompatibilityTest, FloatBlend)
>+{
>+    ANGLE_SKIP_TEST_IF(!IsGLExtensionRequestable("GL_EXT_float_blend"));
>+    if (getClientMajorVersion() >= 3)
>+    {
>+        ANGLE_SKIP_TEST_IF(!EnsureGLExtensionEnabled("GL_EXT_color_buffer_float"));
>+    }
>+    else
>+    {
>+        ANGLE_SKIP_TEST_IF(!EnsureGLExtensionEnabled("GL_OES_texture_float"));
>+        ANGLE_SKIP_TEST_IF(!EnsureGLExtensionEnabled("GL_CHROMIUM_color_buffer_float_rgba"));
>+    }
>+
>+    TestExtFloatBlend(false);
>+
>+    glRequestExtensionANGLE("GL_EXT_float_blend");
>+    ASSERT_GL_NO_ERROR();
>+
>+    TestExtFloatBlend(true);
>+}
>+
> TEST_P(WebGLCompatibilityTest, R16FTextures)
> {
>     constexpr float readPixelsData[] = {-5000.0f, 0.0f, 0.0f, 1.0f};
>@@ -2677,7 +3150,7 @@ TEST_P(WebGLCompatibilityTest, R16FTextures)
> 
>     for (auto extension : FloatingPointTextureExtensions)
>     {
>-        if (strlen(extension) > 0 && extensionRequestable(extension))
>+        if (strlen(extension) > 0 && IsGLExtensionRequestable(extension))
>         {
>             glRequestExtensionANGLE(extension);
>             ASSERT_GL_NO_ERROR();
>@@ -2685,11 +3158,10 @@ TEST_P(WebGLCompatibilityTest, R16FTextures)
> 
>         // Unsized R 16F (OES)
>         {
>-            bool texture = extensionEnabled("GL_OES_texture_half_float") &&
>-                           extensionEnabled("GL_EXT_texture_rg");
>-            bool filter = getClientMajorVersion() >= 3 ||
>-                          extensionEnabled("GL_OES_texture_half_float_linear");
>-            bool render = extensionEnabled("GL_EXT_color_buffer_half_float");
>+            bool texture = IsGLExtensionEnabled("GL_OES_texture_half_float") &&
>+                           IsGLExtensionEnabled("GL_EXT_texture_rg");
>+            bool filter = IsGLExtensionEnabled("GL_OES_texture_half_float_linear");
>+            bool render = false;
>             TestFloatTextureFormat(GL_RED, GL_RED, GL_HALF_FLOAT_OES, texture, filter, render,
>                                    textureData, readPixelsData);
>         }
>@@ -2703,17 +3175,25 @@ TEST_P(WebGLCompatibilityTest, R16FTextures)
>                                    textureData, readPixelsData);
>         }
> 
>-        if (getClientMajorVersion() >= 3 || extensionEnabled("GL_EXT_texture_storage"))
>+        if (getClientMajorVersion() >= 3)
>         {
>             // Sized R 16F
>-            bool texture = getClientMajorVersion() >= 3;
>-            bool filter  = getClientMajorVersion() >= 3 ||
>-                          extensionEnabled("GL_OES_texture_half_float_linear");
>-            bool render = extensionEnabled("GL_EXT_color_buffer_half_float") ||
>-                          extensionEnabled("GL_EXT_color_buffer_float");
>+            bool texture = true;
>+            bool filter  = true;
>+            bool render  = IsGLExtensionEnabled("GL_EXT_color_buffer_float");
>             TestFloatTextureFormat(GL_R16F, GL_RED, GL_HALF_FLOAT, texture, filter, render,
>                                    textureData, readPixelsData);
>         }
>+        else if (IsGLExtensionEnabled("GL_EXT_texture_storage"))
>+        {
>+            // Sized R 16F (OES)
>+            bool texture = IsGLExtensionEnabled("GL_OES_texture_half_float") &&
>+                           IsGLExtensionEnabled("GL_EXT_texture_rg");
>+            bool filter = IsGLExtensionEnabled("GL_OES_texture_half_float_linear");
>+            bool render = IsGLExtensionEnabled("GL_EXT_color_buffer_half_float");
>+            TestFloatTextureFormat(GL_R16F, GL_RED, GL_HALF_FLOAT_OES, texture, filter, render,
>+                                   textureData, readPixelsData);
>+        }
>     }
> }
> 
>@@ -2726,7 +3206,7 @@ TEST_P(WebGLCompatibilityTest, RG16FTextures)
> 
>     for (auto extension : FloatingPointTextureExtensions)
>     {
>-        if (strlen(extension) > 0 && extensionRequestable(extension))
>+        if (strlen(extension) > 0 && IsGLExtensionRequestable(extension))
>         {
>             glRequestExtensionANGLE(extension);
>             ASSERT_GL_NO_ERROR();
>@@ -2734,12 +3214,10 @@ TEST_P(WebGLCompatibilityTest, RG16FTextures)
> 
>         // Unsized RG 16F (OES)
>         {
>-            bool texture = extensionEnabled("GL_OES_texture_half_float") &&
>-                           extensionEnabled("GL_EXT_texture_rg");
>-            bool filter = getClientMajorVersion() >= 3 ||
>-                          extensionEnabled("GL_OES_texture_half_float_linear");
>-            bool render = extensionEnabled("GL_EXT_color_buffer_half_float") &&
>-                          extensionEnabled("GL_EXT_texture_rg");
>+            bool texture = IsGLExtensionEnabled("GL_OES_texture_half_float") &&
>+                           IsGLExtensionEnabled("GL_EXT_texture_rg");
>+            bool filter = IsGLExtensionEnabled("GL_OES_texture_half_float_linear");
>+            bool render = false;
>             TestFloatTextureFormat(GL_RG, GL_RG, GL_HALF_FLOAT_OES, texture, filter, render,
>                                    textureData, readPixelsData);
>         }
>@@ -2753,27 +3231,31 @@ TEST_P(WebGLCompatibilityTest, RG16FTextures)
>                                    textureData, readPixelsData);
>         }
> 
>-        if (getClientMajorVersion() >= 3 || extensionEnabled("GL_EXT_texture_storage"))
>+        if (getClientMajorVersion() >= 3)
>         {
>             // Sized RG 16F
>-            bool texture = getClientMajorVersion() >= 3;
>-            bool filter  = getClientMajorVersion() >= 3 ||
>-                          extensionEnabled("GL_OES_texture_half_float_linear");
>-            bool render = extensionEnabled("GL_EXT_color_buffer_half_float") ||
>-                          extensionEnabled("GL_EXT_color_buffer_float");
>+            bool texture = true;
>+            bool filter  = true;
>+            bool render  = IsGLExtensionEnabled("GL_EXT_color_buffer_float");
>             TestFloatTextureFormat(GL_RG16F, GL_RG, GL_HALF_FLOAT, texture, filter, render,
>                                    textureData, readPixelsData);
>         }
>+        else if (IsGLExtensionEnabled("GL_EXT_texture_storage"))
>+        {
>+            // Sized RG 16F (OES)
>+            bool texture = IsGLExtensionEnabled("GL_OES_texture_half_float") &&
>+                           IsGLExtensionEnabled("GL_EXT_texture_rg");
>+            bool filter = IsGLExtensionEnabled("GL_OES_texture_half_float_linear");
>+            bool render = IsGLExtensionEnabled("GL_EXT_color_buffer_half_float");
>+            TestFloatTextureFormat(GL_RG16F, GL_RG, GL_HALF_FLOAT_OES, texture, filter, render,
>+                                   textureData, readPixelsData);
>+        }
>     }
> }
> 
> TEST_P(WebGLCompatibilityTest, RGB16FTextures)
> {
>-    if (IsOzone() && IsIntel())
>-    {
>-        std::cout << "Test skipped on Intel Ozone." << std::endl;
>-        return;
>-    }
>+    ANGLE_SKIP_TEST_IF(IsOzone() && IsIntel());
> 
>     constexpr float readPixelsData[] = {7000.0f, 100.0f, 33.0f, 1.0f};
>     const GLushort textureData[]     = {
>@@ -2782,7 +3264,7 @@ TEST_P(WebGLCompatibilityTest, RGB16FTextures)
> 
>     for (auto extension : FloatingPointTextureExtensions)
>     {
>-        if (strlen(extension) > 0 && extensionRequestable(extension))
>+        if (strlen(extension) > 0 && IsGLExtensionRequestable(extension))
>         {
>             glRequestExtensionANGLE(extension);
>             ASSERT_GL_NO_ERROR();
>@@ -2790,10 +3272,11 @@ TEST_P(WebGLCompatibilityTest, RGB16FTextures)
> 
>         // Unsized RGB 16F (OES)
>         {
>-            bool texture = extensionEnabled("GL_OES_texture_half_float");
>-            bool filter  = getClientMajorVersion() >= 3 ||
>-                          extensionEnabled("GL_OES_texture_half_float_linear");
>-            bool render = extensionEnabled("GL_EXT_color_buffer_half_float");
>+            bool texture = IsGLExtensionEnabled("GL_OES_texture_half_float");
>+            bool filter  = IsGLExtensionEnabled("GL_OES_texture_half_float_linear");
>+            // WebGL says that Unsized RGB 16F (OES) can be renderable with
>+            // GL_EXT_color_buffer_half_float.
>+            bool render = IsGLExtensionEnabled("GL_EXT_color_buffer_half_float");
>             TestFloatTextureFormat(GL_RGB, GL_RGB, GL_HALF_FLOAT_OES, texture, filter, render,
>                                    textureData, readPixelsData);
>         }
>@@ -2807,26 +3290,33 @@ TEST_P(WebGLCompatibilityTest, RGB16FTextures)
>                                    textureData, readPixelsData);
>         }
> 
>-        if (getClientMajorVersion() >= 3 || extensionEnabled("GL_EXT_texture_storage"))
>+        if (getClientMajorVersion() >= 3)
>         {
>             // Sized RGB 16F
>-            bool texture = getClientMajorVersion() >= 3;
>-            bool filter  = getClientMajorVersion() >= 3 ||
>-                          extensionEnabled("GL_OES_texture_half_float_linear");
>-            bool render = extensionEnabled("GL_EXT_color_buffer_half_float");
>+            bool texture = true;
>+            bool filter  = true;
>+            // It is unclear how EXT_color_buffer_half_float applies to ES3.0 and above, however,
>+            // dEQP GLES3 es3fFboColorbufferTests.cpp verifies that texture attachment of GL_RGB16F
>+            // is possible, so assume that all GLES implementations support it.
>+            bool render = IsGLExtensionEnabled("GL_EXT_color_buffer_half_float");
>             TestFloatTextureFormat(GL_RGB16F, GL_RGB, GL_HALF_FLOAT, texture, filter, render,
>                                    textureData, readPixelsData);
>         }
>+        else if (IsGLExtensionEnabled("GL_EXT_texture_storage"))
>+        {
>+            // Sized RGB 16F (OES)
>+            bool texture = IsGLExtensionEnabled("GL_OES_texture_half_float");
>+            bool filter  = IsGLExtensionEnabled("GL_OES_texture_half_float_linear");
>+            bool render  = IsGLExtensionEnabled("GL_EXT_color_buffer_half_float");
>+            TestFloatTextureFormat(GL_RGB16F, GL_RGB, GL_HALF_FLOAT_OES, texture, filter, render,
>+                                   textureData, readPixelsData);
>+        }
>     }
> }
> 
> TEST_P(WebGLCompatibilityTest, RGBA16FTextures)
> {
>-    if (IsOzone() && IsIntel())
>-    {
>-        std::cout << "Test skipped on Intel Ozone." << std::endl;
>-        return;
>-    }
>+    ANGLE_SKIP_TEST_IF(IsOzone() && IsIntel());
> 
>     constexpr float readPixelsData[] = {7000.0f, 100.0f, 33.0f, -1.0f};
>     const GLushort textureData[]     = {
>@@ -2835,7 +3325,7 @@ TEST_P(WebGLCompatibilityTest, RGBA16FTextures)
> 
>     for (auto extension : FloatingPointTextureExtensions)
>     {
>-        if (strlen(extension) > 0 && extensionRequestable(extension))
>+        if (strlen(extension) > 0 && IsGLExtensionRequestable(extension))
>         {
>             glRequestExtensionANGLE(extension);
>             ASSERT_GL_NO_ERROR();
>@@ -2843,11 +3333,9 @@ TEST_P(WebGLCompatibilityTest, RGBA16FTextures)
> 
>         // Unsized RGBA 16F (OES)
>         {
>-            bool texture = extensionEnabled("GL_OES_texture_half_float");
>-            bool filter  = getClientMajorVersion() >= 3 ||
>-                          extensionEnabled("GL_OES_texture_half_float_linear");
>-            bool render = extensionEnabled("GL_EXT_color_buffer_half_float") ||
>-                          extensionEnabled("GL_EXT_color_buffer_float");
>+            bool texture = IsGLExtensionEnabled("GL_OES_texture_half_float");
>+            bool filter  = IsGLExtensionEnabled("GL_OES_texture_half_float_linear");
>+            bool render  = IsGLExtensionEnabled("GL_EXT_color_buffer_half_float");
>             TestFloatTextureFormat(GL_RGBA, GL_RGBA, GL_HALF_FLOAT_OES, texture, filter, render,
>                                    textureData, readPixelsData);
>         }
>@@ -2861,17 +3349,24 @@ TEST_P(WebGLCompatibilityTest, RGBA16FTextures)
>                                    textureData, readPixelsData);
>         }
> 
>-        if (getClientMajorVersion() >= 3 || extensionEnabled("GL_EXT_texture_storage"))
>+        if (getClientMajorVersion() >= 3)
>         {
>             // Sized RGBA 16F
>-            bool texture = getClientMajorVersion() >= 3;
>-            bool filter  = getClientMajorVersion() >= 3 ||
>-                          extensionEnabled("GL_OES_texture_half_float_linear");
>-            bool render = extensionEnabled("GL_EXT_color_buffer_half_float") ||
>-                          extensionEnabled("GL_EXT_color_buffer_float");
>+            bool texture = true;
>+            bool filter  = true;
>+            bool render  = IsGLExtensionEnabled("GL_EXT_color_buffer_float");
>             TestFloatTextureFormat(GL_RGBA16F, GL_RGBA, GL_HALF_FLOAT, texture, filter, render,
>                                    textureData, readPixelsData);
>         }
>+        else if (IsGLExtensionEnabled("GL_EXT_texture_storage"))
>+        {
>+            // Sized RGBA 16F (OES)
>+            bool texture = IsGLExtensionEnabled("GL_OES_texture_half_float");
>+            bool filter  = IsGLExtensionEnabled("GL_OES_texture_half_float_linear");
>+            bool render  = IsGLExtensionEnabled("GL_EXT_color_buffer_half_float");
>+            TestFloatTextureFormat(GL_RGBA16F, GL_RGBA, GL_HALF_FLOAT_OES, texture, filter, render,
>+                                   textureData, readPixelsData);
>+        }
>     }
> }
> 
>@@ -2879,17 +3374,11 @@ TEST_P(WebGLCompatibilityTest, RGBA16FTextures)
> // accepted by glTexImage2D
> TEST_P(WebGLCompatibilityTest, SizedRGBA32FFormats)
> {
>-    if (getClientMajorVersion() != 2)
>-    {
>-        std::cout << "Test skipped because it is only valid for WebGL1 contexts." << std::endl;
>-        return;
>-    }
>+    // Test skipped because it is only valid for WebGL1 contexts.
>+    ANGLE_SKIP_TEST_IF(getClientMajorVersion() != 2);
>+
>+    ANGLE_SKIP_TEST_IF(!IsGLExtensionRequestable("GL_OES_texture_float"));
> 
>-    if (!extensionRequestable("GL_OES_texture_float"))
>-    {
>-        std::cout << "Test skipped because GL_OES_texture_float is not requestable." << std::endl;
>-        return;
>-    }
>     glRequestExtensionANGLE("GL_OES_texture_float");
>     ASSERT_GL_NO_ERROR();
> 
>@@ -2897,12 +3386,14 @@ TEST_P(WebGLCompatibilityTest, SizedRGBA32FFormats)
>     glBindTexture(GL_TEXTURE_2D, texture);
> 
>     glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA32F, 1, 1, 0, GL_RGBA, GL_FLOAT, nullptr);
>-    EXPECT_GL_ERROR(GL_INVALID_OPERATION);
>+    // dEQP implicitly defines error code ordering
>+    EXPECT_GL_ERROR(GL_INVALID_ENUM);
> 
>     glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB32F, 1, 1, 0, GL_RGB, GL_FLOAT, nullptr);
>-    EXPECT_GL_ERROR(GL_INVALID_OPERATION);
>+    // dEQP implicitly defines error code ordering
>+    EXPECT_GL_ERROR(GL_INVALID_ENUM);
> 
>-    if (extensionRequestable("GL_CHROMIUM_color_buffer_float_rgba"))
>+    if (IsGLExtensionRequestable("GL_CHROMIUM_color_buffer_float_rgba"))
>     {
>         glRequestExtensionANGLE("GL_CHROMIUM_color_buffer_float_rgba");
>         ASSERT_GL_NO_ERROR();
>@@ -2911,7 +3402,7 @@ TEST_P(WebGLCompatibilityTest, SizedRGBA32FFormats)
>         EXPECT_GL_NO_ERROR();
>     }
> 
>-    if (extensionRequestable("GL_CHROMIUM_color_buffer_float_rgb"))
>+    if (IsGLExtensionRequestable("GL_CHROMIUM_color_buffer_float_rgb"))
>     {
>         glRequestExtensionANGLE("GL_CHROMIUM_color_buffer_float_rgb");
>         ASSERT_GL_NO_ERROR();
>@@ -2935,10 +3426,9 @@ TEST_P(WebGLCompatibilityTest, DepthStencilAttachment)
> 
>     glFramebufferTexture2D(GL_FRAMEBUFFER, GL_DEPTH_STENCIL_ATTACHMENT, GL_TEXTURE_2D, texture, 0);
> 
>-    GLint attachmentType;
>+    GLint attachmentType = 0;
>     glGetFramebufferAttachmentParameteriv(GL_FRAMEBUFFER, GL_DEPTH_STENCIL_ATTACHMENT,
>-                                          GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE,
>-                                          /*param*/ &attachmentType);
>+                                          GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE, &attachmentType);
>     EXPECT_GL_NO_ERROR();
>     EXPECT_GLENUM_EQ(GL_TEXTURE, attachmentType);
> 
>@@ -2947,33 +3437,80 @@ TEST_P(WebGLCompatibilityTest, DepthStencilAttachment)
>     glBindFramebuffer(GL_FRAMEBUFFER, fbo2);
> 
>     glGetFramebufferAttachmentParameteriv(GL_FRAMEBUFFER, GL_DEPTH_STENCIL_ATTACHMENT,
>-                                          GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME,
>-                                          /*param*/ &attachmentType);
>+                                          GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME, &attachmentType);
>     EXPECT_GL_ERROR(GL_INVALID_ENUM);
> }
> 
>+// Verify framebuffer attachments return expected types when in an inconsistant state.
>+TEST_P(WebGLCompatibilityTest, FramebufferAttachmentConsistancy)
>+{
>+    ANGLE_SKIP_TEST_IF(getClientMajorVersion() > 2);
>+
>+    GLFramebuffer fbo;
>+    glBindFramebuffer(GL_FRAMEBUFFER, fbo);
>+
>+    GLRenderbuffer rb1;
>+    glBindRenderbuffer(GL_RENDERBUFFER, rb1);
>+
>+    glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_STENCIL_ATTACHMENT, GL_RENDERBUFFER, rb1);
>+
>+    GLint attachmentType = 0;
>+    glGetFramebufferAttachmentParameteriv(GL_FRAMEBUFFER, GL_STENCIL_ATTACHMENT,
>+                                          GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE, &attachmentType);
>+
>+    EXPECT_GL_NO_ERROR();
>+    EXPECT_GLENUM_EQ(GL_RENDERBUFFER, attachmentType);
>+
>+    GLRenderbuffer rb2;
>+    glBindRenderbuffer(GL_RENDERBUFFER, rb2);
>+
>+    glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_DEPTH_STENCIL_ATTACHMENT, GL_RENDERBUFFER, rb2);
>+
>+    glGetFramebufferAttachmentParameteriv(GL_FRAMEBUFFER, GL_DEPTH_STENCIL_ATTACHMENT,
>+                                          GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE, &attachmentType);
>+
>+    EXPECT_GL_NO_ERROR();
>+    EXPECT_GLENUM_EQ(GL_RENDERBUFFER, attachmentType);
>+
>+    glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, GL_RENDERBUFFER, rb2);
>+
>+    glGetFramebufferAttachmentParameteriv(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT,
>+                                          GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE, &attachmentType);
>+
>+    EXPECT_GL_NO_ERROR();
>+    EXPECT_GLENUM_EQ(GL_RENDERBUFFER, attachmentType);
>+
>+    glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_STENCIL_ATTACHMENT, GL_RENDERBUFFER, rb2);
>+
>+    glGetFramebufferAttachmentParameteriv(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT,
>+                                          GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE, &attachmentType);
>+
>+    EXPECT_GL_NO_ERROR();
>+    EXPECT_GLENUM_EQ(GL_RENDERBUFFER, attachmentType);
>+}
>+
> // This tests that rendering feedback loops works as expected with WebGL 2.
> // Based on WebGL test conformance2/rendering/rendering-sampling-feedback-loop.html
> TEST_P(WebGL2CompatibilityTest, RenderingFeedbackLoopWithDrawBuffers)
> {
>-    const std::string vertexShader =
>-        "#version 300 es\n"
>-        "in vec4 aPosition;\n"
>-        "out vec2 texCoord;\n"
>-        "void main() {\n"
>-        "    gl_Position = aPosition;\n"
>-        "    texCoord = (aPosition.xy * 0.5) + 0.5;\n"
>-        "}\n";
>-
>-    const std::string fragmentShader =
>-        "#version 300 es\n"
>-        "precision mediump float;\n"
>-        "uniform sampler2D tex;\n"
>-        "in vec2 texCoord;\n"
>-        "out vec4 oColor;\n"
>-        "void main() {\n"
>-        "    oColor = texture(tex, texCoord);\n"
>-        "}\n";
>+    constexpr char kVS[] =
>+        R"(#version 300 es
>+in vec4 aPosition;
>+out vec2 texCoord;
>+void main() {
>+    gl_Position = aPosition;
>+    texCoord = (aPosition.xy * 0.5) + 0.5;
>+})";
>+
>+    constexpr char kFS[] =
>+        R"(#version 300 es
>+precision mediump float;
>+uniform sampler2D tex;
>+in vec2 texCoord;
>+out vec4 oColor;
>+void main() {
>+    oColor = texture(tex, texCoord);
>+})";
> 
>     GLsizei width  = 8;
>     GLsizei height = 8;
>@@ -2983,7 +3520,7 @@ TEST_P(WebGL2CompatibilityTest, RenderingFeedbackLoopWithDrawBuffers)
>     // ES3 requires a minimum value of 4 for MAX_DRAW_BUFFERS.
>     ASSERT_GE(maxDrawBuffers, 2);
> 
>-    ANGLE_GL_PROGRAM(program, vertexShader, fragmentShader);
>+    ANGLE_GL_PROGRAM(program, kVS, kFS);
>     glUseProgram(program.get());
>     glViewport(0, 0, width, height);
> 
>@@ -3008,36 +3545,37 @@ TEST_P(WebGL2CompatibilityTest, RenderingFeedbackLoopWithDrawBuffers)
>     drawBuffersFeedbackLoop(program.get(), {{GL_NONE, GL_COLOR_ATTACHMENT1}}, GL_INVALID_OPERATION);
>     drawBuffersFeedbackLoop(program.get(), {{GL_COLOR_ATTACHMENT0, GL_COLOR_ATTACHMENT1}},
>                             GL_INVALID_OPERATION);
>-    drawBuffersFeedbackLoop(program.get(), {{GL_COLOR_ATTACHMENT0, GL_NONE}}, GL_NO_ERROR);
>+    // A feedback loop is formed regardless of drawBuffers settings.
>+    drawBuffersFeedbackLoop(program.get(), {{GL_COLOR_ATTACHMENT0, GL_NONE}}, GL_INVALID_OPERATION);
> }
> 
> // This test covers detection of rendering feedback loops between the FBO and a depth Texture.
> // Based on WebGL test conformance2/rendering/depth-stencil-feedback-loop.html
> TEST_P(WebGL2CompatibilityTest, RenderingFeedbackLoopWithDepthStencil)
> {
>-    const std::string vertexShader =
>-        "#version 300 es\n"
>-        "in vec4 aPosition;\n"
>-        "out vec2 texCoord;\n"
>-        "void main() {\n"
>-        "    gl_Position = aPosition;\n"
>-        "    texCoord = (aPosition.xy * 0.5) + 0.5;\n"
>-        "}\n";
>-
>-    const std::string fragmentShader =
>-        "#version 300 es\n"
>-        "precision mediump float;\n"
>-        "uniform sampler2D tex;\n"
>-        "in vec2 texCoord;\n"
>-        "out vec4 oColor;\n"
>-        "void main() {\n"
>-        "    oColor = texture(tex, texCoord);\n"
>-        "}\n";
>+    constexpr char kVS[] =
>+        R"(#version 300 es
>+in vec4 aPosition;
>+out vec2 texCoord;
>+void main() {
>+    gl_Position = aPosition;
>+    texCoord = (aPosition.xy * 0.5) + 0.5;
>+})";
>+
>+    constexpr char kFS[] =
>+        R"(#version 300 es
>+precision mediump float;
>+uniform sampler2D tex;
>+in vec2 texCoord;
>+out vec4 oColor;
>+void main() {
>+    oColor = texture(tex, texCoord);
>+})";
> 
>     GLsizei width  = 8;
>     GLsizei height = 8;
> 
>-    ANGLE_GL_PROGRAM(program, vertexShader, fragmentShader);
>+    ANGLE_GL_PROGRAM(program, kVS, kFS);
>     glUseProgram(program.get());
> 
>     glViewport(0, 0, width, height);
>@@ -3048,12 +3586,12 @@ TEST_P(WebGL2CompatibilityTest, RenderingFeedbackLoopWithDepthStencil)
>     // Create textures and allocate storage
>     GLTexture tex0;
>     GLTexture tex1;
>-    GLRenderbuffer rb;
>+    GLTexture tex2;
>     FillTexture2D(tex0.get(), width, height, GLColor::black, 0, GL_RGBA, GL_RGBA, GL_UNSIGNED_BYTE);
>     FillTexture2D(tex1.get(), width, height, 0x80, 0, GL_DEPTH_COMPONENT16, GL_DEPTH_COMPONENT,
>                   GL_UNSIGNED_INT);
>-    glBindRenderbuffer(GL_RENDERBUFFER, rb.get());
>-    glRenderbufferStorage(GL_RENDERBUFFER, GL_STENCIL_INDEX8, width, height);
>+    FillTexture2D(tex2.get(), width, height, 0x40, 0, GL_DEPTH_STENCIL, GL_DEPTH_STENCIL,
>+                  GL_UNSIGNED_INT_24_8);
>     ASSERT_GL_NO_ERROR();
> 
>     GLFramebuffer fbo;
>@@ -3068,23 +3606,25 @@ TEST_P(WebGL2CompatibilityTest, RenderingFeedbackLoopWithDepthStencil)
>     // The same image is used as depth buffer during rendering.
>     glEnable(GL_DEPTH_TEST);
>     drawQuad(program.get(), "aPosition", 0.5f, 1.0f, true);
>-    EXPECT_GL_ERROR(GL_INVALID_OPERATION);
>+    EXPECT_GL_ERROR(GL_INVALID_OPERATION) << "Same image as depth buffer should fail";
> 
>     // The same image is used as depth buffer. But depth mask is false.
>+    // This is now considered a feedback loop and should generate an error. http://crbug.com/763695
>     glDepthMask(GL_FALSE);
>     drawQuad(program.get(), "aPosition", 0.5f, 1.0f, true);
>-    EXPECT_GL_NO_ERROR();
>+    EXPECT_GL_ERROR(GL_INVALID_OPERATION) << "Depth writes disabled should still fail";
> 
>     // The same image is used as depth buffer. But depth test is not enabled during rendering.
>+    // This is now considered a feedback loop and should generate an error. http://crbug.com/763695
>     glDepthMask(GL_TRUE);
>     glDisable(GL_DEPTH_TEST);
>     drawQuad(program.get(), "aPosition", 0.5f, 1.0f, true);
>-    EXPECT_GL_NO_ERROR();
>+    EXPECT_GL_ERROR(GL_INVALID_OPERATION) << "Depth read disabled should still fail";
> 
>     // Test rendering and sampling feedback loop for stencil buffer
>-    glBindTexture(GL_RENDERBUFFER, rb.get());
>+    glBindTexture(GL_TEXTURE_2D, tex2.get());
>     glFramebufferTexture2D(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, GL_TEXTURE_2D, 0, 0);
>-    glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_STENCIL_ATTACHMENT, GL_RENDERBUFFER, rb.get());
>+    glFramebufferTexture2D(GL_FRAMEBUFFER, GL_STENCIL_ATTACHMENT, GL_TEXTURE_2D, tex2.get(), 0);
>     ASSERT_GLENUM_EQ(GL_FRAMEBUFFER_COMPLETE, glCheckFramebufferStatus(GL_FRAMEBUFFER));
>     constexpr GLint stencilClearValue = 0x40;
>     glClearBufferiv(GL_STENCIL, 0, &stencilClearValue);
>@@ -3092,18 +3632,20 @@ TEST_P(WebGL2CompatibilityTest, RenderingFeedbackLoopWithDepthStencil)
>     // The same image is used as stencil buffer during rendering.
>     glEnable(GL_STENCIL_TEST);
>     drawQuad(program.get(), "aPosition", 0.5f, 1.0f, true);
>-    EXPECT_GL_ERROR(GL_INVALID_OPERATION);
>+    EXPECT_GL_ERROR(GL_INVALID_OPERATION) << "Same image as stencil buffer should fail";
> 
>     // The same image is used as stencil buffer. But stencil mask is zero.
>+    // This is now considered a feedback loop and should generate an error. http://crbug.com/763695
>     glStencilMask(0x0);
>     drawQuad(program.get(), "aPosition", 0.5f, 1.0f, true);
>-    EXPECT_GL_NO_ERROR();
>+    EXPECT_GL_ERROR(GL_INVALID_OPERATION) << "Stencil mask zero should still fail";
> 
>     // The same image is used as stencil buffer. But stencil test is not enabled during rendering.
>+    // This is now considered a feedback loop and should generate an error. http://crbug.com/763695
>     glStencilMask(0xffff);
>     glDisable(GL_STENCIL_TEST);
>     drawQuad(program.get(), "aPosition", 0.5f, 1.0f, true);
>-    EXPECT_GL_NO_ERROR();
>+    EXPECT_GL_ERROR(GL_INVALID_OPERATION) << "Stencil test disabled should still fail";
> }
> 
> // The source and the target for CopyTexSubImage3D are the same 3D texture.
>@@ -3167,11 +3709,8 @@ TEST_P(WebGL2CompatibilityTest, TextureCopyingFeedbackLoop3D)
> // the buffer type.
> TEST_P(WebGL2CompatibilityTest, ClearBufferTypeCompatibity)
> {
>-    if (IsD3D11())
>-    {
>-        std::cout << "Test skipped because it generates D3D11 runtime warnings." << std::endl;
>-        return;
>-    }
>+    // Test skipped for D3D11 because it generates D3D11 runtime warnings.
>+    ANGLE_SKIP_TEST_IF(IsD3D11());
> 
>     constexpr float clearFloat[]       = {0.0f, 0.0f, 0.0f, 0.0f};
>     constexpr int clearInt[]           = {0, 0, 0, 0};
>@@ -3219,12 +3758,12 @@ TEST_P(WebGL2CompatibilityTest, ClearBufferTypeCompatibity)
>     EXPECT_GL_ERROR(GL_INVALID_OPERATION);
> 
>     // Float buffer
>-    if (extensionRequestable("GL_EXT_color_buffer_float"))
>+    if (IsGLExtensionRequestable("GL_EXT_color_buffer_float"))
>     {
>         glRequestExtensionANGLE("GL_EXT_color_buffer_float");
>     }
> 
>-    if (extensionEnabled("GL_EXT_color_buffer_float"))
>+    if (IsGLExtensionEnabled("GL_EXT_color_buffer_float"))
>     {
>         glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA32F, 1, 1, 0, GL_RGBA, GL_FLOAT, nullptr);
>         ASSERT_GL_NO_ERROR();
>@@ -3353,25 +3892,25 @@ TEST_P(WebGL2CompatibilityTest, BlitFramebufferSameImage)
> // buffer types
> TEST_P(WebGL2CompatibilityTest, FragmentShaderColorBufferTypeMissmatch)
> {
>-    const std::string vertexShader =
>-        "#version 300 es\n"
>-        "void main() {\n"
>-        "    gl_Position = vec4(0, 0, 0, 1);\n"
>-        "}\n";
>-
>-    const std::string fragmentShader =
>-        "#version 300 es\n"
>-        "precision mediump float;\n"
>-        "layout(location = 0) out vec4 floatOutput;\n"
>-        "layout(location = 1) out uvec4 uintOutput;\n"
>-        "layout(location = 2) out ivec4 intOutput;\n"
>-        "void main() {\n"
>-        "    floatOutput = vec4(0, 0, 0, 1);\n"
>-        "    uintOutput = uvec4(0, 0, 0, 1);\n"
>-        "    intOutput = ivec4(0, 0, 0, 1);\n"
>-        "}\n";
>-
>-    ANGLE_GL_PROGRAM(program, vertexShader, fragmentShader);
>+    constexpr char kVS[] =
>+        R"(#version 300 es
>+void main() {
>+    gl_Position = vec4(0, 0, 0, 1);
>+})";
>+
>+    constexpr char kFS[] =
>+        R"(#version 300 es
>+precision mediump float;
>+layout(location = 0) out vec4 floatOutput;
>+layout(location = 1) out uvec4 uintOutput;
>+layout(location = 2) out ivec4 intOutput;
>+void main() {
>+    floatOutput = vec4(0, 0, 0, 1);
>+    uintOutput = uvec4(0, 0, 0, 1);
>+    intOutput = ivec4(0, 0, 0, 1);
>+})";
>+
>+    ANGLE_GL_PROGRAM(program, kVS, kFS);
>     glUseProgram(program.get());
> 
>     GLuint floatLocation = glGetFragDataLocation(program, "floatOutput");
>@@ -3445,24 +3984,24 @@ TEST_P(WebGL2CompatibilityTest, FragmentShaderColorBufferTypeMissmatch)
> // types
> TEST_P(WebGL2CompatibilityTest, VertexShaderAttributeTypeMismatch)
> {
>-    const std::string vertexShader =
>-        "#version 300 es\n"
>-        "in vec4 floatInput;\n"
>-        "in uvec4 uintInput;\n"
>-        "in ivec4 intInput;\n"
>-        "void main() {\n"
>-        "    gl_Position = vec4(floatInput.x, uintInput.x, intInput.x, 1);\n"
>-        "}\n";
>-
>-    const std::string fragmentShader =
>-        "#version 300 es\n"
>-        "precision mediump float;\n"
>-        "out vec4 outputColor;\n"
>-        "void main() {\n"
>-        "    outputColor = vec4(0, 0, 0, 1);"
>-        "}\n";
>-
>-    ANGLE_GL_PROGRAM(program, vertexShader, fragmentShader);
>+    constexpr char kVS[] =
>+        R"(#version 300 es
>+in vec4 floatInput;
>+in uvec4 uintInput;
>+in ivec4 intInput;
>+void main() {
>+    gl_Position = vec4(floatInput.x, uintInput.x, intInput.x, 1);
>+})";
>+
>+    constexpr char kFS[] =
>+        R"(#version 300 es
>+precision mediump float;
>+out vec4 outputColor;
>+void main() {
>+    outputColor = vec4(0, 0, 0, 1);
>+})";
>+
>+    ANGLE_GL_PROGRAM(program, kVS, kFS);
>     glUseProgram(program.get());
> 
>     GLint floatLocation = glGetAttribLocation(program, "floatInput");
>@@ -3510,7 +4049,7 @@ TEST_P(WebGL2CompatibilityTest, VertexShaderAttributeTypeMismatch)
> TEST_P(WebGLCompatibilityTest, FramebufferAttachmentQuery)
> {
>     ANGLE_SKIP_TEST_IF(getClientMajorVersion() > 2);
>-    ANGLE_SKIP_TEST_IF(extensionEnabled("GL_EXT_draw_buffers"));
>+    ANGLE_SKIP_TEST_IF(IsGLExtensionEnabled("GL_EXT_draw_buffers"));
> 
>     GLFramebuffer fbo;
>     glBindFramebuffer(GL_FRAMEBUFFER, fbo);
>@@ -3528,18 +4067,14 @@ TEST_P(WebGLCompatibilityTest, FramebufferAttachmentQuery)
>     EXPECT_GL_ERROR(GL_INVALID_ENUM);
> }
> 
>-// Tests the WebGL removal of undefined behavior when attachments aren't written to.
>+// Tests WebGL reports INVALID_OPERATION for mismatch of drawbuffers and fragment output
> TEST_P(WebGLCompatibilityTest, DrawBuffers)
> {
>     // Make sure we can use at least 4 attachments for the tests.
>     bool useEXT = false;
>     if (getClientMajorVersion() < 3)
>     {
>-        if (!extensionRequestable("GL_EXT_draw_buffers"))
>-        {
>-            std::cout << "Test skipped because draw buffers are not available" << std::endl;
>-            return;
>-        }
>+        ANGLE_SKIP_TEST_IF(!IsGLExtensionRequestable("GL_EXT_draw_buffers"));
> 
>         glRequestExtensionANGLE("GL_EXT_draw_buffers");
>         useEXT = true;
>@@ -3548,11 +4083,8 @@ TEST_P(WebGLCompatibilityTest, DrawBuffers)
> 
>     GLint maxDrawBuffers = 0;
>     glGetIntegerv(GL_MAX_DRAW_BUFFERS, &maxDrawBuffers);
>-    if (maxDrawBuffers < 4)
>-    {
>-        std::cout << "Test skipped because MAX_DRAW_BUFFERS is too small." << std::endl;
>-        return;
>-    }
>+    // Test skipped because MAX_DRAW_BUFFERS is too small.
>+    ANGLE_SKIP_TEST_IF(maxDrawBuffers < 4);
> 
>     // Clears all the renderbuffers to red.
>     auto ClearEverythingToRed = [](GLRenderbuffer *renderbuffers) {
>@@ -3613,60 +4145,34 @@ TEST_P(WebGLCompatibilityTest, DrawBuffers)
> 
>     ASSERT_GL_NO_ERROR();
> 
>-    const char *vertESSL1 =
>-        "attribute vec4 a_pos;\n"
>-        "void main()\n"
>-        "{\n"
>-        "    gl_Position = a_pos;\n"
>-        "}\n";
>-    const char *vertESSL3 =
>-        "#version 300 es\n"
>-        "in vec4 a_pos;\n"
>-        "void main()\n"
>-        "{\n"
>-        "    gl_Position = a_pos;\n"
>-        "}\n";
>-
>     GLenum allDrawBuffers[] = {
>-        GL_COLOR_ATTACHMENT0, GL_COLOR_ATTACHMENT1, GL_COLOR_ATTACHMENT2, GL_COLOR_ATTACHMENT3,
>+        GL_COLOR_ATTACHMENT0,
>+        GL_COLOR_ATTACHMENT1,
>+        GL_COLOR_ATTACHMENT2,
>+        GL_COLOR_ATTACHMENT3,
>     };
> 
>     GLenum halfDrawBuffers[] = {
>-        GL_NONE, GL_NONE, GL_COLOR_ATTACHMENT2, GL_COLOR_ATTACHMENT3,
>+        GL_NONE,
>+        GL_COLOR_ATTACHMENT1,
>+        GL_NONE,
>+        GL_COLOR_ATTACHMENT3,
>     };
> 
>-    // Test that when using gl_FragColor, only the first attachment is written to.
>+    // Test that when using gl_FragColor with no-array
>     const char *fragESSL1 =
>-        "precision highp float;\n"
>-        "void main()\n"
>-        "{\n"
>-        "    gl_FragColor = vec4(0.0, 1.0, 0.0, 1.0);\n"
>-        "}\n";
>-    ANGLE_GL_PROGRAM(programESSL1, vertESSL1, fragESSL1);
>+        R"(precision highp float;
>+void main()
>+{
>+    gl_FragColor = vec4(0.0, 1.0, 0.0, 1.0);
>+})";
>+    ANGLE_GL_PROGRAM(programESSL1, essl1_shaders::vs::Simple(), fragESSL1);
> 
>     {
>-        ClearEverythingToRed(renderbuffers);
>-
>         glBindFramebuffer(GL_FRAMEBUFFER, drawFBO);
>         DrawBuffers(useEXT, 4, allDrawBuffers);
>-        drawQuad(programESSL1, "a_pos", 0.5, 1.0, true);
>-        ASSERT_GL_NO_ERROR();
>-
>-        CheckColors(renderbuffers, 0b0001, GLColor::green);
>-        CheckColors(renderbuffers, 0b1110, GLColor::red);
>-    }
>-
>-    // Test that when using gl_FragColor, but the first draw buffer is 0, then no attachment is
>-    // written to.
>-    {
>-        ClearEverythingToRed(renderbuffers);
>-
>-        glBindFramebuffer(GL_FRAMEBUFFER, drawFBO);
>-        DrawBuffers(useEXT, 4, halfDrawBuffers);
>-        drawQuad(programESSL1, "a_pos", 0.5, 1.0, true);
>-        ASSERT_GL_NO_ERROR();
>-
>-        CheckColors(renderbuffers, 0b1111, GLColor::red);
>+        drawQuad(programESSL1, essl1_shaders::PositionAttrib(), 0.5, 1.0, true);
>+        EXPECT_GL_ERROR(GL_INVALID_OPERATION);
>     }
> 
>     // Test what happens when rendering to a subset of the outputs. There is a behavior difference
>@@ -3674,68 +4180,73 @@ TEST_P(WebGLCompatibilityTest, DrawBuffers)
>     // array of size MAX_DRAW_BUFFERS, so the WebGL spec stipulates that elements not written to
>     // should default to 0. On the contrary, in ES3 outputs are specified one by one, so
>     // attachments not declared in the shader should not be written to.
>+    const char *positionAttrib;
>     const char *writeOddOutputsVert;
>     const char *writeOddOutputsFrag;
>-    GLColor unwrittenColor;
>     if (useEXT)
>     {
>-        // In the extension, when an attachment isn't written to, it should get 0's
>-        unwrittenColor      = GLColor(0, 0, 0, 0);
>-        writeOddOutputsVert = vertESSL1;
>+        positionAttrib      = essl1_shaders::PositionAttrib();
>+        writeOddOutputsVert = essl1_shaders::vs::Simple();
>         writeOddOutputsFrag =
>-            "#extension GL_EXT_draw_buffers : require\n"
>-            "precision highp float;\n"
>-            "void main()\n"
>-            "{\n"
>-            "    gl_FragData[1] = vec4(0.0, 1.0, 0.0, 1.0);\n"
>-            "    gl_FragData[3] = vec4(0.0, 1.0, 0.0, 1.0);\n"
>-            "}\n";
>+            R"(#extension GL_EXT_draw_buffers : require
>+precision highp float;
>+void main()
>+{
>+    gl_FragData[1] = vec4(0.0, 1.0, 0.0, 1.0);
>+    gl_FragData[3] = vec4(0.0, 1.0, 0.0, 1.0);
>+})";
>     }
>     else
>     {
>-        // In ES3 if an attachment isn't declared, it shouldn't get written and should be red
>-        // because of the preceding clears.
>-        unwrittenColor      = GLColor::red;
>-        writeOddOutputsVert = vertESSL3;
>+        positionAttrib      = essl3_shaders::PositionAttrib();
>+        writeOddOutputsVert = essl3_shaders::vs::Simple();
>         writeOddOutputsFrag =
>-            "#version 300 es\n"
>-            "precision highp float;\n"
>-            "layout(location = 1) out vec4 output1;"
>-            "layout(location = 3) out vec4 output2;"
>-            "void main()\n"
>-            "{\n"
>-            "    output1 = vec4(0.0, 1.0, 0.0, 1.0);\n"
>-            "    output2 = vec4(0.0, 1.0, 0.0, 1.0);\n"
>-            "}\n";
>+            R"(#version 300 es
>+precision highp float;
>+layout(location = 1) out vec4 output1;
>+layout(location = 3) out vec4 output2;
>+void main()
>+{
>+    output1 = vec4(0.0, 1.0, 0.0, 1.0);
>+    output2 = vec4(0.0, 1.0, 0.0, 1.0);
>+})";
>     }
>     ANGLE_GL_PROGRAM(writeOddOutputsProgram, writeOddOutputsVert, writeOddOutputsFrag);
> 
>-    // Test that attachments not written to get the "unwritten" color
>+    // Test that attachments not written to get the "unwritten" color (useEXT)
>+    // Or INVALID_OPERATION is generated if there's active draw buffer receive no output
>     {
>         ClearEverythingToRed(renderbuffers);
> 
>         glBindFramebuffer(GL_FRAMEBUFFER, drawFBO);
>         DrawBuffers(useEXT, 4, allDrawBuffers);
>-        drawQuad(writeOddOutputsProgram, "a_pos", 0.5, 1.0, true);
>-        ASSERT_GL_NO_ERROR();
>+        drawQuad(writeOddOutputsProgram, positionAttrib, 0.5, 1.0, true);
> 
>-        CheckColors(renderbuffers, 0b1010, GLColor::green);
>-        CheckColors(renderbuffers, 0b0101, unwrittenColor);
>+        if (useEXT)
>+        {
>+            ASSERT_GL_NO_ERROR();
>+            CheckColors(renderbuffers, 0b1010, GLColor::green);
>+            // In the extension, when an attachment isn't written to, it should get 0's
>+            CheckColors(renderbuffers, 0b0101, GLColor(0, 0, 0, 0));
>+        }
>+        else
>+        {
>+            EXPECT_GL_ERROR(GL_INVALID_OPERATION);
>+        }
>     }
> 
>-    // Test that attachments not written to get the "unwritten" color but that even when the
>-    // extension is used, disabled attachments are not written at all and stay red.
>+    // Test that attachments written to get the correct color from shader output but that even when
>+    // the extension is used, disabled attachments are not written at all and stay red.
>     {
>         ClearEverythingToRed(renderbuffers);
> 
>         glBindFramebuffer(GL_FRAMEBUFFER, drawFBO);
>         DrawBuffers(useEXT, 4, halfDrawBuffers);
>-        drawQuad(writeOddOutputsProgram, "a_pos", 0.5, 1.0, true);
>+        drawQuad(writeOddOutputsProgram, positionAttrib, 0.5, 1.0, true);
>         ASSERT_GL_NO_ERROR();
> 
>-        CheckColors(renderbuffers, 0b1000, GLColor::green);
>-        CheckColors(renderbuffers, 0b0100, unwrittenColor);
>-        CheckColors(renderbuffers, 0b0011, GLColor::red);
>+        CheckColors(renderbuffers, 0b1010, GLColor::green);
>+        CheckColors(renderbuffers, 0b0101, GLColor::red);
>     }
> }
> 
>@@ -3743,19 +4254,22 @@ TEST_P(WebGLCompatibilityTest, DrawBuffers)
> // extensions have been enabled
> TEST_P(WebGLCompatibilityTest, GenerateMipmapUnsizedFloatingPointTexture)
> {
>-    if (extensionRequestable("GL_OES_texture_float"))
>+    if (IsGLExtensionRequestable("GL_OES_texture_float"))
>     {
>         glRequestExtensionANGLE("GL_OES_texture_float");
>     }
>-    ANGLE_SKIP_TEST_IF(!extensionEnabled("GL_OES_texture_float"));
>+    ANGLE_SKIP_TEST_IF(!IsGLExtensionEnabled("GL_OES_texture_float"));
> 
>     GLTexture texture;
>     glBindTexture(GL_TEXTURE_2D, texture);
> 
>     constexpr GLColor32F data[4] = {
>-        kFloatRed, kFloatRed, kFloatGreen, kFloatBlue,
>+        kFloatRed,
>+        kFloatRed,
>+        kFloatGreen,
>+        kFloatBlue,
>     };
>-    glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, 4, 4, 0, GL_RGBA, GL_FLOAT, data);
>+    glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, 2, 2, 0, GL_RGBA, GL_FLOAT, data);
>     ASSERT_GL_NO_ERROR();
> 
>     glGenerateMipmap(GL_TEXTURE_2D);
>@@ -3765,23 +4279,26 @@ TEST_P(WebGLCompatibilityTest, GenerateMipmapUnsizedFloatingPointTexture)
> // extensions have been enabled
> TEST_P(WebGLCompatibilityTest, GenerateMipmapSizedFloatingPointTexture)
> {
>-    if (extensionRequestable("GL_OES_texture_float"))
>+    if (IsGLExtensionRequestable("GL_OES_texture_float"))
>     {
>         glRequestExtensionANGLE("GL_OES_texture_float");
>     }
>-    ANGLE_SKIP_TEST_IF(!extensionEnabled("GL_OES_texture_float"));
>+    ANGLE_SKIP_TEST_IF(!IsGLExtensionEnabled("GL_OES_texture_float"));
> 
>-    if (extensionRequestable("GL_EXT_texture_storage"))
>+    if (IsGLExtensionRequestable("GL_EXT_texture_storage"))
>     {
>         glRequestExtensionANGLE("GL_EXT_texture_storage");
>     }
>-    ANGLE_SKIP_TEST_IF(!extensionEnabled("GL_EXT_texture_storage"));
>+    ANGLE_SKIP_TEST_IF(!IsGLExtensionEnabled("GL_EXT_texture_storage"));
> 
>     GLTexture texture;
>     glBindTexture(GL_TEXTURE_2D, texture);
> 
>     constexpr GLColor32F data[4] = {
>-        kFloatRed, kFloatRed, kFloatGreen, kFloatBlue,
>+        kFloatRed,
>+        kFloatRed,
>+        kFloatGreen,
>+        kFloatBlue,
>     };
>     glTexStorage2DEXT(GL_TEXTURE_2D, 2, GL_RGBA32F, 2, 2);
>     glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, 2, 2, GL_RGBA, GL_FLOAT, data);
>@@ -3790,7 +4307,7 @@ TEST_P(WebGLCompatibilityTest, GenerateMipmapSizedFloatingPointTexture)
>     glGenerateMipmap(GL_TEXTURE_2D);
>     EXPECT_GL_ERROR(GL_INVALID_OPERATION);
> 
>-    if (extensionRequestable("GL_EXT_color_buffer_float"))
>+    if (IsGLExtensionRequestable("GL_EXT_color_buffer_float"))
>     {
>         // Format is renderable but not filterable
>         glRequestExtensionANGLE("GL_EXT_color_buffer_float");
>@@ -3798,12 +4315,12 @@ TEST_P(WebGLCompatibilityTest, GenerateMipmapSizedFloatingPointTexture)
>         EXPECT_GL_ERROR(GL_INVALID_OPERATION);
>     }
> 
>-    if (extensionRequestable("GL_EXT_color_buffer_float_linear"))
>+    if (IsGLExtensionRequestable("GL_EXT_color_buffer_float_linear"))
>     {
>         // Format is renderable but not filterable
>         glRequestExtensionANGLE("GL_EXT_color_buffer_float_linear");
> 
>-        if (extensionEnabled("GL_EXT_color_buffer_float"))
>+        if (IsGLExtensionEnabled("GL_EXT_color_buffer_float"))
>         {
>             // Format is filterable and renderable
>             glGenerateMipmap(GL_TEXTURE_2D);
>@@ -3826,11 +4343,11 @@ void WebGLCompatibilityTest::validateTexImageExtensionFormat(GLenum format,
>     glTexImage2D(GL_TEXTURE_2D, 0, format, 1, 1, 0, format, GL_UNSIGNED_BYTE, nullptr);
>     EXPECT_GL_ERROR(GL_INVALID_ENUM);
> 
>-    if (extensionRequestable(extName))
>+    if (IsGLExtensionRequestable(extName))
>     {
>         // Verify texture format is allowed once extension is enabled.
>         glRequestExtensionANGLE(extName.c_str());
>-        EXPECT_TRUE(extensionEnabled(extName));
>+        EXPECT_TRUE(IsGLExtensionEnabled(extName));
> 
>         glTexImage2D(GL_TEXTURE_2D, 0, format, 1, 1, 0, format, GL_UNSIGNED_BYTE, nullptr);
>         ASSERT_GL_NO_ERROR();
>@@ -3880,11 +4397,11 @@ void WebGLCompatibilityTest::validateCompressedTexImageExtensionFormat(GLenum fo
>     glCompressedTexImage2D(GL_TEXTURE_2D, 0, format, width, height, 0, blockSize, data.data());
>     EXPECT_GL_ERROR(GL_INVALID_ENUM);
> 
>-    if (extensionRequestable(extName))
>+    if (IsGLExtensionRequestable(extName))
>     {
>         // Verify texture format is allowed once extension is enabled.
>         glRequestExtensionANGLE(extName.c_str());
>-        EXPECT_TRUE(extensionEnabled(extName));
>+        EXPECT_TRUE(IsGLExtensionEnabled(extName));
> 
>         glCompressedTexImage2D(GL_TEXTURE_2D, 0, format, width, height, 0, blockSize, data.data());
>         EXPECT_GL_NO_ERROR();
>@@ -3976,19 +4493,19 @@ TEST_P(WebGLCompatibilityTest, EnableCompressedTextureExtensionLossyDecode)
> // qualifiers.
> TEST_P(WebGL2CompatibilityTest, UniformBlockPrecisionMismatch)
> {
>-    const std::string vertexShader =
>-        "#version 300 es\n"
>-        "uniform Block { mediump vec4 val; };\n"
>-        "void main() { gl_Position = val; }\n";
>-    const std::string fragmentShader =
>-        "#version 300 es\n"
>-        "uniform Block { highp vec4 val; };\n"
>-        "out highp vec4 out_FragColor;\n"
>-        "void main() { out_FragColor = val; }\n";
>-
>-    GLuint vs = CompileShader(GL_VERTEX_SHADER, vertexShader);
>+    constexpr char kVS[] =
>+        R"(#version 300 es
>+uniform Block { mediump vec4 val; };
>+void main() { gl_Position = val; })";
>+    constexpr char kFS[] =
>+        R"(#version 300 es
>+uniform Block { highp vec4 val; };
>+out highp vec4 out_FragColor;
>+void main() { out_FragColor = val; })";
>+
>+    GLuint vs = CompileShader(GL_VERTEX_SHADER, kVS);
>     ASSERT_NE(0u, vs);
>-    GLuint fs = CompileShader(GL_FRAGMENT_SHADER, fragmentShader);
>+    GLuint fs = CompileShader(GL_FRAGMENT_SHADER, kFS);
>     ASSERT_NE(0u, fs);
> 
>     GLuint program = glCreateProgram();
>@@ -4009,29 +4526,21 @@ TEST_P(WebGL2CompatibilityTest, UniformBlockPrecisionMismatch)
> // Test no attribute vertex shaders
> TEST_P(WebGL2CompatibilityTest, NoAttributeVertexShader)
> {
>-    const std::string vertexShader =
>-        "#version 300 es\n"
>-        "void main()\n"
>-        "{\n"
>-        "\n"
>-        "    ivec2 xy = ivec2(gl_VertexID % 2, (gl_VertexID / 2 + gl_VertexID / 3) % 2);\n"
>-        "    gl_Position = vec4(vec2(xy) * 2. - 1., 0, 1);\n"
>-        "}";
>-    const std::string fragmentShader =
>-        "#version 300 es\n"
>-        "precision mediump float;\n"
>-        "out vec4 result;\n"
>-        "void main()\n"
>-        "{\n"
>-        "    result = vec4(0, 1, 0, 1);\n"
>-        "}";
>-
>-    ANGLE_GL_PROGRAM(program, vertexShader, fragmentShader);
>+    constexpr char kVS[] =
>+        R"(#version 300 es
>+void main()
>+{
>+
>+    ivec2 xy = ivec2(gl_VertexID % 2, (gl_VertexID / 2 + gl_VertexID / 3) % 2);
>+    gl_Position = vec4(vec2(xy) * 2. - 1., 0, 1);
>+})";
>+
>+    ANGLE_GL_PROGRAM(program, kVS, essl3_shaders::fs::Red());
>     glUseProgram(program);
> 
>     glDrawArrays(GL_TRIANGLES, 0, 6);
>     ASSERT_GL_NO_ERROR();
>-    EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::green);
>+    EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::red);
> }
> 
> // Tests bindAttribLocations for length limit
>@@ -4045,6 +4554,68 @@ TEST_P(WebGL2CompatibilityTest, BindAttribLocationLimitation)
>     EXPECT_GL_ERROR(GL_INVALID_VALUE);
> }
> 
>+// Covers a bug in transform feedback loop detection.
>+TEST_P(WebGL2CompatibilityTest, TransformFeedbackCheckNullDeref)
>+{
>+    constexpr char kVS[] = R"(attribute vec4 color; void main() { color.r; })";
>+    constexpr char kFS[] = R"(void main(){})";
>+    ANGLE_GL_PROGRAM(program, kVS, kFS);
>+    glUseProgram(program);
>+
>+    glEnableVertexAttribArray(0);
>+    glDrawArrays(GL_POINTS, 0, 1);
>+
>+    // This should fail because it is trying to pull a vertex with no buffer.
>+    EXPECT_GL_ERROR(GL_INVALID_OPERATION);
>+
>+    GLBuffer buffer;
>+    glBindBuffer(GL_ARRAY_BUFFER, buffer);
>+    glVertexAttribPointer(0, 4, GL_FLOAT, GL_FALSE, 0, nullptr);
>+
>+    // This should fail because it is trying to pull a vertex from an empty buffer.
>+    glDrawArrays(GL_POINTS, 0, 1);
>+    EXPECT_GL_ERROR(GL_INVALID_OPERATION);
>+}
>+
>+// We should forbid two transform feedback outputs going to the same buffer.
>+TEST_P(WebGL2CompatibilityTest, TransformFeedbackDoubleBinding)
>+{
>+    constexpr char kVS[] =
>+        R"(attribute float a; varying float b; varying float c; void main() { b = a; c = a; })";
>+    constexpr char kFS[] = R"(void main(){})";
>+    ANGLE_GL_PROGRAM(program, kVS, kFS);
>+    static const char *varyings[] = {"b", "c"};
>+    glTransformFeedbackVaryings(program, 2, varyings, GL_SEPARATE_ATTRIBS);
>+    glLinkProgram(program);
>+    glUseProgram(program);
>+    ASSERT_GL_NO_ERROR();
>+
>+    // Bind the transform feedback varyings to non-overlapping regions of the same buffer.
>+    GLBuffer buffer;
>+    glBindBufferRange(GL_TRANSFORM_FEEDBACK_BUFFER, 0, buffer, 0, 4);
>+    glBindBufferRange(GL_TRANSFORM_FEEDBACK_BUFFER, 1, buffer, 4, 4);
>+    glBufferData(GL_TRANSFORM_FEEDBACK_BUFFER, 8, nullptr, GL_STATIC_DRAW);
>+    ASSERT_GL_NO_ERROR();
>+    // Two varyings bound to the same buffer should be an error.
>+    glBeginTransformFeedback(GL_POINTS);
>+    EXPECT_GL_ERROR(GL_INVALID_OPERATION);
>+}
>+
>+// Check the return type of a given parameter upon getting the active uniforms.
>+TEST_P(WebGL2CompatibilityTest, UniformVariablesReturnTypes)
>+{
>+    ANGLE_GL_PROGRAM(program, essl1_shaders::vs::Simple(), essl1_shaders::fs::UniformColor());
>+
>+    std::vector<GLuint> validUniformIndices = {0};
>+    std::vector<GLint> uniformNameLengthBuf(validUniformIndices.size());
>+
>+    // This should fail because GL_UNIFORM_NAME_LENGTH cannot be used in WebGL2.
>+    glGetActiveUniformsiv(program, static_cast<GLsizei>(validUniformIndices.size()),
>+                          &validUniformIndices[0], GL_UNIFORM_NAME_LENGTH,
>+                          &uniformNameLengthBuf[0]);
>+    EXPECT_GL_ERROR(GL_INVALID_ENUM);
>+}
>+
> // Use this to select which configurations (e.g. which renderer, which GLES major version) these
> // tests should be run against.
> ANGLE_INSTANTIATE_TEST(WebGLCompatibilityTest,
>@@ -4054,7 +4625,8 @@ ANGLE_INSTANTIATE_TEST(WebGLCompatibilityTest,
>                        ES2_OPENGL(),
>                        ES3_OPENGL(),
>                        ES2_OPENGLES(),
>-                       ES3_OPENGLES());
>+                       ES3_OPENGLES(),
>+                       ES2_VULKAN());
> 
> ANGLE_INSTANTIATE_TEST(WebGL2CompatibilityTest, ES3_D3D11(), ES3_OPENGL(), ES3_OPENGLES());
>-}  // namespace
>+}  // namespace angle
>diff --git a/Source/ThirdParty/ANGLE/src/tests/gl_tests/WebGLFramebufferTest.cpp b/Source/ThirdParty/ANGLE/src/tests/gl_tests/WebGLFramebufferTest.cpp
>index 89365e776e6..795bcfb7517 100644
>--- a/Source/ThirdParty/ANGLE/src/tests/gl_tests/WebGLFramebufferTest.cpp
>+++ b/Source/ThirdParty/ANGLE/src/tests/gl_tests/WebGLFramebufferTest.cpp
>@@ -28,13 +28,6 @@ class WebGLFramebufferTest : public ANGLETest
>         setWebGLCompatibilityEnabled(true);
>     }
> 
>-    void SetUp() override
>-    {
>-        ANGLETest::SetUp();
>-        glRequestExtensionANGLE = reinterpret_cast<PFNGLREQUESTEXTENSIONANGLEPROC>(
>-            eglGetProcAddress("glRequestExtensionANGLE"));
>-    }
>-
>     void drawUByteColorQuad(GLuint program, GLint uniformLoc, const GLColor &color);
>     void testDepthStencilDepthStencil(GLint width, GLint height);
>     void testDepthStencilRenderbuffer(GLint width,
>@@ -44,8 +37,6 @@ class WebGLFramebufferTest : public ANGLETest
>     void testRenderingAndReading(GLuint program);
>     void testUsingIncompleteFramebuffer(GLenum depthFormat, GLenum depthAttachment);
>     void testDrawingMissingAttachment();
>-
>-    PFNGLREQUESTEXTENSIONANGLEPROC glRequestExtensionANGLE = nullptr;
> };
> 
> constexpr GLint ALLOW_COMPLETE              = 0x1;
>@@ -144,14 +135,17 @@ TEST_P(WebGLFramebufferTest, TestFramebufferRequiredCombinations)
>     checkBufferBits(GL_DEPTH_ATTACHMENT, GL_NONE);
>     glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, GL_RENDERBUFFER, 0);
> 
>-    // 3. COLOR_ATTACHMENT0 = RGBA/UNSIGNED_BYTE texture + DEPTH_STENCIL_ATTACHMENT = DEPTH_STENCIL
>-    // renderbuffer
>-    glRenderbufferStorage(GL_RENDERBUFFER, GL_DEPTH_STENCIL, width, height);
>-    glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_DEPTH_STENCIL_ATTACHMENT, GL_RENDERBUFFER,
>-                              renderbuffer);
>-    EXPECT_GL_NO_ERROR();
>-    checkFramebufferForAllowedStatuses(ALLOW_COMPLETE);
>-    checkBufferBits(GL_DEPTH_STENCIL_ATTACHMENT, GL_NONE);
>+    if (getClientMajorVersion() == 2)
>+    {
>+        // 3. COLOR_ATTACHMENT0 = RGBA/UNSIGNED_BYTE texture + DEPTH_STENCIL_ATTACHMENT =
>+        // DEPTH_STENCIL renderbuffer
>+        glRenderbufferStorage(GL_RENDERBUFFER, GL_DEPTH_STENCIL, width, height);
>+        glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_DEPTH_STENCIL_ATTACHMENT, GL_RENDERBUFFER,
>+                                  renderbuffer);
>+        EXPECT_GL_NO_ERROR();
>+        checkFramebufferForAllowedStatuses(ALLOW_COMPLETE);
>+        checkBufferBits(GL_DEPTH_STENCIL_ATTACHMENT, GL_NONE);
>+    }
> }
> 
> void testAttachment(GLint width,
>@@ -224,30 +218,18 @@ void WebGLFramebufferTest::drawUByteColorQuad(GLuint program,
>     Vector4 vecColor = color.toNormalizedVector();
>     glUseProgram(program);
>     glUniform4fv(uniformLoc, 1, vecColor.data());
>-    drawQuad(program, "position", 0.5f, 1.0f, true);
>+    drawQuad(program, essl1_shaders::PositionAttrib(), 0.5f, 1.0f, true);
> }
> 
> void WebGLFramebufferTest::testDepthStencilDepthStencil(GLint width, GLint height)
> {
>-    const std::string &vertexShader =
>-        "attribute vec4 position;\n"
>-        "void main() {\n"
>-        "    gl_Position = position;\n"
>-        "}";
>-    const std::string &fragmentShader =
>-        "precision mediump float;\n"
>-        "uniform vec4 color;\n"
>-        "void main() {\n"
>-        "    gl_FragColor = color;\n"
>-        "}";
>-
>     if (width == 0 || height == 0)
>     {
>         return;
>     }
> 
>-    ANGLE_GL_PROGRAM(program, vertexShader, fragmentShader);
>-    GLint uniformLoc = glGetUniformLocation(program.get(), "color");
>+    ANGLE_GL_PROGRAM(program, essl1_shaders::vs::Simple(), essl1_shaders::fs::UniformColor());
>+    GLint uniformLoc = glGetUniformLocation(program.get(), essl1_shaders::ColorUniform());
>     ASSERT_NE(-1, uniformLoc);
> 
>     struct TestInfo
>@@ -353,9 +335,13 @@ void WebGLFramebufferTest::testDepthStencilRenderbuffer(GLint width,
>     // OpenGL itself doesn't seem to guarantee that e.g. a 2 x 0
>     // renderbuffer will report 2 for its width when queried.
>     if (!(height == 0 && width > 0))
>+    {
>         EXPECT_EQ(width, getRenderbufferParameter(GL_RENDERBUFFER_WIDTH));
>+    }
>     if (!(width == 0 && height > 0))
>+    {
>         EXPECT_EQ(height, getRenderbufferParameter(GL_RENDERBUFFER_HEIGHT));
>+    }
>     EXPECT_EQ(GL_DEPTH_STENCIL, getRenderbufferParameter(GL_RENDERBUFFER_INTERNAL_FORMAT));
>     EXPECT_EQ(0, getRenderbufferParameter(GL_RENDERBUFFER_RED_SIZE));
>     EXPECT_EQ(0, getRenderbufferParameter(GL_RENDERBUFFER_GREEN_SIZE));
>@@ -378,6 +364,9 @@ void WebGLFramebufferTest::testDepthStencilRenderbuffer(GLint width,
> // Test various attachment combinations with WebGL framebuffers.
> TEST_P(WebGLFramebufferTest, TestAttachments)
> {
>+    // GL_DEPTH_STENCIL renderbuffer format is only valid for WebGL1
>+    ANGLE_SKIP_TEST_IF(getClientMajorVersion() != 2);
>+
>     for (GLint width = 2; width <= 2; width += 2)
>     {
>         for (GLint height = 2; height <= 2; height += 2)
>@@ -547,7 +536,7 @@ void WebGLFramebufferTest::testRenderingAndReading(GLuint program)
>     EXPECT_GL_NO_ERROR();
> 
>     // drawArrays with incomplete framebuffer
>-    drawQuad(program, "position", 0.5f, 1.0f, true);
>+    drawQuad(program, essl1_shaders::PositionAttrib(), 0.5f, 1.0f, true);
>     EXPECT_GL_ERROR(GL_INVALID_FRAMEBUFFER_OPERATION);
> 
>     // readPixels from incomplete framebuffer
>@@ -579,11 +568,7 @@ void WebGLFramebufferTest::testUsingIncompleteFramebuffer(GLenum depthFormat,
>                                                           GLenum depthAttachment)
> {
>     // Simple draw program.
>-    const std::string &vertexShader =
>-        "attribute vec4 position; void main() { gl_Position = position; }";
>-    const std::string &fragmentShader = "void main() { gl_FragColor = vec4(1, 0, 0, 1); }";
>-
>-    ANGLE_GL_PROGRAM(program, vertexShader, fragmentShader);
>+    ANGLE_GL_PROGRAM(program, essl1_shaders::vs::Simple(), essl1_shaders::fs::Red());
> 
>     GLFramebuffer fbo;
>     glBindFramebuffer(GL_FRAMEBUFFER, fbo);
>@@ -789,19 +774,17 @@ void TestReadingMissingAttachment(int size)
> void WebGLFramebufferTest::testDrawingMissingAttachment()
> {
>     // Simple draw program.
>-    const std::string &vertexShader   = "attribute vec4 pos; void main() { gl_Position = pos; }";
>-    const std::string &fragmentShader = "void main() { gl_FragColor = vec4(1, 0, 0, 1); }";
>-    ANGLE_GL_PROGRAM(program, vertexShader, fragmentShader);
>+    ANGLE_GL_PROGRAM(program, essl1_shaders::vs::Simple(), essl1_shaders::fs::Red());
> 
>     glClear(GL_COLOR_BUFFER_BIT);
>     EXPECT_GL_NO_ERROR();
> 
>     // try glDrawArrays
>-    drawQuad(program, "pos", 0.5f, 1.0f, true);
>+    drawQuad(program, essl1_shaders::PositionAttrib(), 0.5f, 1.0f, true);
>     EXPECT_GL_NO_ERROR();
> 
>     // try glDrawElements
>-    drawIndexedQuad(program, "pos", 0.5f, 1.0f, true);
>+    drawIndexedQuad(program, essl1_shaders::PositionAttrib(), 0.5f, 1.0f, true);
>     EXPECT_GL_NO_ERROR();
> }
> 
>@@ -842,16 +825,7 @@ TEST_P(WebGLFramebufferTest, CheckValidColorDepthCombination)
> // Test to cover a bug in preserving the texture image index for WebGL framebuffer attachments
> TEST_P(WebGLFramebufferTest, TextureAttachmentCommitBug)
> {
>-    if (extensionRequestable("GL_ANGLE_depth_texture"))
>-    {
>-        glRequestExtensionANGLE("GL_ANGLE_depth_texture");
>-    }
>-
>-    if (!extensionEnabled("GL_ANGLE_depth_texture"))
>-    {
>-        std::cout << "Test skipped because depth textures are not available.\n";
>-        return;
>-    }
>+    ANGLE_SKIP_TEST_IF(!EnsureGLExtensionEnabled("GL_ANGLE_depth_texture"));
> 
>     GLTexture depthTexture;
>     glBindTexture(GL_TEXTURE_2D, depthTexture.get());
>@@ -874,6 +848,10 @@ ANGLE_INSTANTIATE_TEST(WebGLFramebufferTest,
>                        ES2_D3D11(),
>                        ES2_D3D11_FL9_3(),
>                        ES2_OPENGL(),
>-                       ES2_OPENGLES());
>+                       ES2_OPENGLES(),
>+                       ES3_D3D11(),
>+                       ES3_OPENGL(),
>+                       ES3_OPENGLES(),
>+                       ES2_VULKAN());
> 
>-}  // namespace
>+}  // namespace angle
>diff --git a/Source/ThirdParty/ANGLE/src/tests/gl_tests/WebGLReadOutsideFramebufferTest.cpp b/Source/ThirdParty/ANGLE/src/tests/gl_tests/WebGLReadOutsideFramebufferTest.cpp
>index e8627d2b91d..c01bf803146 100644
>--- a/Source/ThirdParty/ANGLE/src/tests/gl_tests/WebGLReadOutsideFramebufferTest.cpp
>+++ b/Source/ThirdParty/ANGLE/src/tests/gl_tests/WebGLReadOutsideFramebufferTest.cpp
>@@ -53,7 +53,7 @@ class PixelRect
>         }
>         else
>         {
>-            ASSERT(target == GL_TEXTURE_2D);
>+            ASSERT_GLENUM_EQ(GL_TEXTURE_2D, target);
>             glTexImage2D(target, 0, GL_RGBA, mWidth, mHeight, 0, GL_RGBA, GL_UNSIGNED_BYTE,
>                          mData.data());
>         }
>@@ -208,11 +208,11 @@ class WebGLReadOutsideFramebufferTest : public ANGLETest
>     }
> 
>   protected:
>-    static constexpr int kFbWidth    = 128;
>-    static constexpr int kFbHeight   = 128;
>+    static constexpr int kFbWidth      = 128;
>+    static constexpr int kFbHeight     = 128;
>     static constexpr int kTextureDepth = 16;
>-    static constexpr int kReadWidth  = 4;
>-    static constexpr int kReadHeight = 4;
>+    static constexpr int kReadWidth    = 4;
>+    static constexpr int kReadHeight   = 4;
>     static constexpr int kReadLayer    = 2;
> 
>     // Tag the framebuffer pixels differently than the initial read buffer pixels, so we know for
>@@ -235,24 +235,22 @@ class WebGLReadOutsideFramebufferTest : public ANGLETest
>     {
>         ANGLETest::SetUp();
> 
>-        // TODO(fjhenigman): Factor out this shader and others like it in other tests, into
>-        // ANGLETest.
>-        const std::string vertexShader =
>-            "attribute vec3 a_position;\n"
>-            "varying vec2 v_texCoord;\n"
>-            "void main() {\n"
>-            "    v_texCoord = a_position.xy * 0.5 + 0.5;\n"
>-            "    gl_Position = vec4(a_position, 1);\n"
>-            "}\n";
>-        const std::string fragmentShader =
>-            "precision mediump float;\n"
>-            "varying vec2 v_texCoord;\n"
>-            "uniform sampler2D u_texture;\n"
>-            "void main() {\n"
>-            "    gl_FragColor = texture2D(u_texture, v_texCoord);\n"
>-            "}\n";
>-
>-        mProgram = CompileProgram(vertexShader, fragmentShader);
>+        constexpr char kVS[] = R"(
>+attribute vec3 a_position;
>+varying vec2 v_texCoord;
>+void main() {
>+    v_texCoord = a_position.xy * 0.5 + 0.5;
>+    gl_Position = vec4(a_position, 1);
>+})";
>+        constexpr char kFS[] = R"(
>+precision mediump float;
>+varying vec2 v_texCoord;
>+uniform sampler2D u_texture;
>+void main() {
>+    gl_FragColor = texture2D(u_texture, v_texCoord);
>+})";
>+
>+        mProgram = CompileProgram(kVS, kFS);
>         glUseProgram(mProgram);
>         GLint uniformLoc = glGetUniformLocation(mProgram, "u_texture");
>         ASSERT_NE(-1, uniformLoc);
>@@ -345,8 +343,7 @@ class WebGLReadOutsideFramebufferTest : public ANGLETest
> };
> 
> class WebGL2ReadOutsideFramebufferTest : public WebGLReadOutsideFramebufferTest
>-{
>-};
>+{};
> 
> // Check that readPixels does not set a destination pixel when
> // the corresponding source pixel is outside the framebuffer.
>@@ -361,14 +358,9 @@ TEST_P(WebGLReadOutsideFramebufferTest, CopyTexSubImage2D)
> {
>     Main2D(&WebGLReadOutsideFramebufferTest::TestCopyTexSubImage2D, false);
> 
>-#ifdef _WIN64
>     // TODO(fjhenigman): Figure out this failure.
>-    if (GetParam() == ES2_D3D11_FL9_3())
>-    {
>-        std::cout << "Cube map skipped on 64-bit " << GetParam() << "." << std::endl;
>-        return;
>-    }
>-#endif
>+    // Cube map skipped on 64-bit Windows with D3D FL 9.3
>+    ANGLE_SKIP_TEST_IF(GetParam() == ES2_D3D11_FL9_3());
> 
>     Main2D(&WebGLReadOutsideFramebufferTest::TestCopyTexSubImageCube, false);
> }
>@@ -378,14 +370,9 @@ TEST_P(WebGLReadOutsideFramebufferTest, CopyTexImage2D)
> {
>     Main2D(&WebGLReadOutsideFramebufferTest::TestCopyTexImage2D, true);
> 
>-#ifdef _WIN64
>     // TODO(fjhenigman): Figure out this failure.
>-    if (GetParam() == ES2_D3D11_FL9_3())
>-    {
>-        std::cout << "Cube map skipped on 64-bit " << GetParam() << "." << std::endl;
>-        return;
>-    }
>-#endif
>+    // Cube map skipped on 64-bit Windows with D3D FL 9.3
>+    ANGLE_SKIP_TEST_IF(GetParam() == ES2_D3D11_FL9_3());
> 
>     Main2D(&WebGLReadOutsideFramebufferTest::TestCopyTexImageCube, true);
> }
>@@ -394,12 +381,8 @@ TEST_P(WebGLReadOutsideFramebufferTest, CopyTexImage2D)
> // the corresponding source pixel is outside the framebuffer.
> TEST_P(WebGL2ReadOutsideFramebufferTest, CopyTexSubImage3D)
> {
>-    if (IsDesktopOpenGL() || IsOpenGLES())
>-    {
>-        std::cout << "Robust CopyTexSubImage3D behaviour is not implemented on OpenGL."
>-                  << std::endl;
>-        return;
>-    }
>+    // Robust CopyTexSubImage3D behaviour is not implemented on OpenGL.
>+    ANGLE_SKIP_TEST_IF(IsDesktopOpenGL() || IsOpenGLES());
> 
>     Main3D(&WebGLReadOutsideFramebufferTest::TestCopyTexSubImage3D, false);
> }
>@@ -420,4 +403,4 @@ ANGLE_INSTANTIATE_TEST(WebGL2ReadOutsideFramebufferTest,
>                        ES2_OPENGLES(),
>                        ES3_OPENGLES());
> 
>-}  // namespace
>+}  // namespace angle
>diff --git a/Source/ThirdParty/ANGLE/src/tests/gl_tests/gles1/AlphaFuncTest.cpp b/Source/ThirdParty/ANGLE/src/tests/gl_tests/gles1/AlphaFuncTest.cpp
>new file mode 100644
>index 00000000000..693755fca59
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/tests/gl_tests/gles1/AlphaFuncTest.cpp
>@@ -0,0 +1,96 @@
>+//
>+// Copyright 2018 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+
>+// AlphaFuncTest.cpp: Tests basic usage of glAlphaFunc.
>+
>+#include "test_utils/ANGLETest.h"
>+#include "test_utils/gl_raii.h"
>+
>+#include "util/random_utils.h"
>+
>+#include <stdint.h>
>+
>+using namespace angle;
>+
>+class AlphaFuncTest : public ANGLETest
>+{
>+  protected:
>+    AlphaFuncTest()
>+    {
>+        setWindowWidth(32);
>+        setWindowHeight(32);
>+        setConfigRedBits(8);
>+        setConfigGreenBits(8);
>+        setConfigBlueBits(8);
>+        setConfigAlphaBits(8);
>+        setConfigDepthBits(24);
>+    }
>+};
>+
>+// Checks that disable / enable works as expected.
>+TEST_P(AlphaFuncTest, EnableDisable)
>+{
>+    EXPECT_GL_FALSE(glIsEnabled(GL_ALPHA_TEST));
>+    EXPECT_GL_NO_ERROR();
>+
>+    glEnable(GL_ALPHA_TEST);
>+    EXPECT_GL_NO_ERROR();
>+
>+    EXPECT_GL_TRUE(glIsEnabled(GL_ALPHA_TEST));
>+    EXPECT_GL_NO_ERROR();
>+
>+    glDisable(GL_ALPHA_TEST);
>+    EXPECT_GL_NO_ERROR();
>+
>+    EXPECT_GL_FALSE(glIsEnabled(GL_ALPHA_TEST));
>+    EXPECT_GL_NO_ERROR();
>+}
>+
>+// Negative test: Checks that invalid enums for alpha test function generate the proper GL error.
>+TEST_P(AlphaFuncTest, SetFuncNegative)
>+{
>+    glAlphaFunc((GLenum)0, 0.0f);
>+    EXPECT_GL_ERROR(GL_INVALID_ENUM);
>+
>+    glAlphaFunc((GLenum)1, 0.0f);
>+    EXPECT_GL_ERROR(GL_INVALID_ENUM);
>+
>+    glAlphaFunc((GLenum)GL_ALPHA, 0.0f);
>+    EXPECT_GL_ERROR(GL_INVALID_ENUM);
>+}
>+
>+// Query test: Checks that the alpha test ref value can be obtained with glGetFloatv.
>+TEST_P(AlphaFuncTest, SetFuncGetFloat)
>+{
>+    GLfloat alphaTestVal = -1.0f;
>+    glAlphaFunc(GL_ALWAYS, 0.0f);
>+    glGetFloatv(GL_ALPHA_TEST_REF, &alphaTestVal);
>+    EXPECT_GL_NO_ERROR();
>+    EXPECT_EQ(0.0f, alphaTestVal);
>+
>+    glAlphaFunc(GL_ALWAYS, 0.4f);
>+    glGetFloatv(GL_ALPHA_TEST_REF, &alphaTestVal);
>+    EXPECT_GL_NO_ERROR();
>+    EXPECT_EQ(0.4f, alphaTestVal);
>+}
>+
>+// Query test: Checks that the alpha test ref value can be obtained with glGetIntegerv,
>+// with proper scaling.
>+TEST_P(AlphaFuncTest, SetFuncGetInt)
>+{
>+    GLint alphaTestVal = -1;
>+    glAlphaFunc(GL_ALWAYS, 0.0f);
>+    glGetIntegerv(GL_ALPHA_TEST_REF, &alphaTestVal);
>+    EXPECT_GL_NO_ERROR();
>+    EXPECT_EQ(0, alphaTestVal);
>+
>+    glAlphaFunc(GL_ALWAYS, 1.0f);
>+    glGetIntegerv(GL_ALPHA_TEST_REF, &alphaTestVal);
>+    EXPECT_GL_NO_ERROR();
>+    EXPECT_EQ(std::numeric_limits<GLint>::max(), alphaTestVal);
>+}
>+
>+ANGLE_INSTANTIATE_TEST(AlphaFuncTest, ES1_D3D11(), ES1_OPENGL(), ES1_OPENGLES());
>diff --git a/Source/ThirdParty/ANGLE/src/tests/gl_tests/gles1/BasicDrawTest.cpp b/Source/ThirdParty/ANGLE/src/tests/gl_tests/gles1/BasicDrawTest.cpp
>new file mode 100644
>index 00000000000..8d30b040bb8
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/tests/gl_tests/gles1/BasicDrawTest.cpp
>@@ -0,0 +1,83 @@
>+//
>+// Copyright 2018 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+
>+// BasicDrawTest.cpp: Tests basic fullscreen quad draw with and without
>+// GL_TEXTURE_2D enabled.
>+
>+#include "test_utils/ANGLETest.h"
>+#include "test_utils/gl_raii.h"
>+
>+#include <vector>
>+
>+using namespace angle;
>+
>+class BasicDrawTest : public ANGLETest
>+{
>+  protected:
>+    BasicDrawTest()
>+    {
>+        setWindowWidth(32);
>+        setWindowHeight(32);
>+        setConfigRedBits(8);
>+        setConfigGreenBits(8);
>+        setConfigBlueBits(8);
>+        setConfigAlphaBits(8);
>+        setConfigDepthBits(24);
>+    }
>+
>+    std::vector<float> mPositions = {
>+        -1.0f, -1.0f, 1.0f, -1.0f, -1.0f, 1.0f, -1.0f, 1.0f, 1.0f, -1.0f, 1.0f, 1.0f,
>+    };
>+
>+    void drawRedQuad()
>+    {
>+        glColor4f(1.0f, 0.0f, 0.0f, 1.0f);
>+        EXPECT_GL_NO_ERROR();
>+        glEnableClientState(GL_VERTEX_ARRAY);
>+        EXPECT_GL_NO_ERROR();
>+        glVertexPointer(2, GL_FLOAT, 0, mPositions.data());
>+        EXPECT_GL_NO_ERROR();
>+        glDrawArrays(GL_TRIANGLES, 0, 6);
>+        EXPECT_GL_NO_ERROR();
>+        EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::red);
>+    }
>+};
>+
>+// Draws a fullscreen quad with a certain color.
>+TEST_P(BasicDrawTest, DrawColor)
>+{
>+    drawRedQuad();
>+}
>+
>+// Checks that textures can be enabled or disabled.
>+TEST_P(BasicDrawTest, EnableDisableTexture)
>+{
>+    GLuint tex;
>+    glGenTextures(1, &tex);
>+    glBindTexture(GL_TEXTURE_2D, tex);
>+
>+    // Green
>+    GLubyte texture[] = {
>+        0x00,
>+        0xff,
>+        0x00,
>+    };
>+
>+    glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB, 1, 1, 0, GL_RGB, GL_UNSIGNED_BYTE, texture);
>+
>+    // Texturing is disabled; still red;
>+    drawRedQuad();
>+
>+    glColor4f(1.0f, 1.0f, 1.0f, 1.0f);
>+
>+    // Texturing enabled; is green (provided modulate w/ white)
>+    glEnable(GL_TEXTURE_2D);
>+    EXPECT_GL_NO_ERROR();
>+    glDrawArrays(GL_TRIANGLES, 0, 6);
>+    EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::green);
>+}
>+
>+ANGLE_INSTANTIATE_TEST(BasicDrawTest, ES1_D3D11(), ES1_OPENGL(), ES1_OPENGLES());
>diff --git a/Source/ThirdParty/ANGLE/src/tests/gl_tests/gles1/ClientActiveTextureTest.cpp b/Source/ThirdParty/ANGLE/src/tests/gl_tests/gles1/ClientActiveTextureTest.cpp
>new file mode 100644
>index 00000000000..948a27e2a2e
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/tests/gl_tests/gles1/ClientActiveTextureTest.cpp
>@@ -0,0 +1,80 @@
>+//
>+// Copyright 2018 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+
>+// ClientActiveTextureTest.cpp: Tests basic usage of glClientActiveTexture.
>+
>+#include "test_utils/ANGLETest.h"
>+#include "test_utils/gl_raii.h"
>+
>+#include "util/random_utils.h"
>+
>+#include <stdint.h>
>+
>+using namespace angle;
>+
>+class ClientActiveTextureTest : public ANGLETest
>+{
>+  protected:
>+    ClientActiveTextureTest()
>+    {
>+        setWindowWidth(32);
>+        setWindowHeight(32);
>+        setConfigRedBits(8);
>+        setConfigGreenBits(8);
>+        setConfigBlueBits(8);
>+        setConfigAlphaBits(8);
>+        setConfigDepthBits(24);
>+    }
>+};
>+
>+// State query: Checks the initial state is correct.
>+TEST_P(ClientActiveTextureTest, InitialState)
>+{
>+    GLint clientActiveTexture = 0;
>+    glGetIntegerv(GL_CLIENT_ACTIVE_TEXTURE, &clientActiveTexture);
>+    EXPECT_GL_NO_ERROR();
>+    EXPECT_GLENUM_EQ(GL_TEXTURE0, clientActiveTexture);
>+}
>+
>+// Negative test: Checks against invalid use of glClientActiveTexture.
>+TEST_P(ClientActiveTextureTest, Negative)
>+{
>+    glClientActiveTexture(0);
>+    EXPECT_GL_ERROR(GL_INVALID_ENUM);
>+
>+    GLint maxTextureUnits = 0;
>+    glGetIntegerv(GL_MAX_TEXTURE_UNITS, &maxTextureUnits);
>+
>+    glClientActiveTexture(GL_TEXTURE0 + maxTextureUnits);
>+    EXPECT_GL_ERROR(GL_INVALID_ENUM);
>+}
>+
>+// Checks that the number of multitexturing units is above spec minimum.
>+TEST_P(ClientActiveTextureTest, Limits)
>+{
>+    GLint maxTextureUnits = 0;
>+    glGetIntegerv(GL_MAX_TEXTURE_UNITS, &maxTextureUnits);
>+    EXPECT_GE(maxTextureUnits, 2);
>+}
>+
>+// Set test: Checks that GL_TEXTURE0..GL_TEXTURE[GL_MAX_TEXTURE_UNITS-1] can be set.
>+TEST_P(ClientActiveTextureTest, Set)
>+{
>+    GLint maxTextureUnits = 0;
>+    glGetIntegerv(GL_MAX_TEXTURE_UNITS, &maxTextureUnits);
>+
>+    for (GLint i = 0; i < maxTextureUnits; i++)
>+    {
>+        glClientActiveTexture(GL_TEXTURE0 + i);
>+        EXPECT_GL_NO_ERROR();
>+        GLint clientActiveTexture = 0;
>+        glGetIntegerv(GL_CLIENT_ACTIVE_TEXTURE, (GLint *)&clientActiveTexture);
>+        EXPECT_GL_NO_ERROR();
>+        EXPECT_GLENUM_EQ(GL_TEXTURE0 + i, clientActiveTexture);
>+    }
>+}
>+
>+ANGLE_INSTANTIATE_TEST(ClientActiveTextureTest, ES1_D3D11(), ES1_OPENGL(), ES1_OPENGLES());
>diff --git a/Source/ThirdParty/ANGLE/src/tests/gl_tests/gles1/ClientStateEnable.cpp b/Source/ThirdParty/ANGLE/src/tests/gl_tests/gles1/ClientStateEnable.cpp
>new file mode 100644
>index 00000000000..6ef12034ebb
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/tests/gl_tests/gles1/ClientStateEnable.cpp
>@@ -0,0 +1,92 @@
>+//
>+// Copyright 2018 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+
>+// ClientStateEnable.cpp: Tests basic usage of gl(Enable|Disable)ClientState.
>+
>+#include "test_utils/ANGLETest.h"
>+#include "test_utils/gl_raii.h"
>+
>+#include <vector>
>+
>+using namespace angle;
>+
>+class ClientStateEnable : public ANGLETest
>+{
>+  protected:
>+    ClientStateEnable()
>+    {
>+        setWindowWidth(32);
>+        setWindowHeight(32);
>+        setConfigRedBits(8);
>+        setConfigGreenBits(8);
>+        setConfigBlueBits(8);
>+        setConfigAlphaBits(8);
>+        setConfigDepthBits(24);
>+    }
>+
>+    std::vector<GLenum> mClientStates = {
>+        GL_VERTEX_ARRAY,         GL_NORMAL_ARRAY,        GL_COLOR_ARRAY,
>+        GL_POINT_SIZE_ARRAY_OES, GL_TEXTURE_COORD_ARRAY,
>+    };
>+};
>+
>+// Checks that all client vertex array states are disabled to start with.
>+TEST_P(ClientStateEnable, InitialState)
>+{
>+    for (auto clientState : mClientStates)
>+    {
>+        EXPECT_GL_FALSE(glIsEnabled(clientState));
>+        EXPECT_GL_NO_ERROR();
>+    }
>+}
>+
>+// Checks that glEnableClientState sets the state to be enabled,
>+// and glDisableClientState sets the state to be disabled.
>+TEST_P(ClientStateEnable, EnableState)
>+{
>+    for (auto clientState : mClientStates)
>+    {
>+        EXPECT_GL_FALSE(glIsEnabled(clientState));
>+        glEnableClientState(clientState);
>+        EXPECT_GL_NO_ERROR();
>+        EXPECT_GL_TRUE(glIsEnabled(clientState));
>+        glDisableClientState(clientState);
>+        EXPECT_GL_NO_ERROR();
>+        EXPECT_GL_FALSE(glIsEnabled(clientState));
>+    }
>+}
>+
>+// Negative test: Checks that invalid enums for client state generate the proper GL error.
>+TEST_P(ClientStateEnable, Negative)
>+{
>+    glEnableClientState(0);
>+    EXPECT_GL_ERROR(GL_INVALID_ENUM);
>+}
>+
>+// Checks that enable/disable states are different if we are in different client texture unit
>+// states.
>+TEST_P(ClientStateEnable, TextureUnit)
>+{
>+    glEnableClientState(GL_TEXTURE_COORD_ARRAY);
>+
>+    // Spec minimum lets us assume 2 multitexturing units.
>+    glClientActiveTexture(GL_TEXTURE1);
>+    EXPECT_GL_FALSE(glIsEnabled(GL_TEXTURE_COORD_ARRAY));
>+
>+    glEnableClientState(GL_TEXTURE_COORD_ARRAY);
>+    EXPECT_GL_TRUE(glIsEnabled(GL_TEXTURE_COORD_ARRAY));
>+
>+    glDisableClientState(GL_TEXTURE_COORD_ARRAY);
>+    EXPECT_GL_FALSE(glIsEnabled(GL_TEXTURE_COORD_ARRAY));
>+
>+    glClientActiveTexture(GL_TEXTURE0);
>+    EXPECT_GL_TRUE(glIsEnabled(GL_TEXTURE_COORD_ARRAY));
>+
>+    glDisableClientState(GL_TEXTURE_COORD_ARRAY);
>+    EXPECT_GL_FALSE(glIsEnabled(GL_TEXTURE_COORD_ARRAY));
>+}
>+
>+ANGLE_INSTANTIATE_TEST(ClientStateEnable, ES1_D3D11(), ES1_OPENGL(), ES1_OPENGLES());
>diff --git a/Source/ThirdParty/ANGLE/src/tests/gl_tests/gles1/ClipPlaneTest.cpp b/Source/ThirdParty/ANGLE/src/tests/gl_tests/gles1/ClipPlaneTest.cpp
>new file mode 100644
>index 00000000000..a77b6a541a4
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/tests/gl_tests/gles1/ClipPlaneTest.cpp
>@@ -0,0 +1,119 @@
>+//
>+// Copyright 2018 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+
>+// ClipPlaneTest.cpp: Tests basic usage of user clip planes.
>+
>+#include "test_utils/ANGLETest.h"
>+#include "test_utils/gl_raii.h"
>+
>+#include "util/random_utils.h"
>+
>+#include <stdint.h>
>+
>+using namespace angle;
>+
>+class ClipPlaneTest : public ANGLETest
>+{
>+  protected:
>+    ClipPlaneTest()
>+    {
>+        setWindowWidth(32);
>+        setWindowHeight(32);
>+        setConfigRedBits(8);
>+        setConfigGreenBits(8);
>+        setConfigBlueBits(8);
>+        setConfigAlphaBits(8);
>+        setConfigDepthBits(24);
>+    }
>+};
>+
>+// Checks that disable / enable works as expected.
>+TEST_P(ClipPlaneTest, InitialState)
>+{
>+    GLint planeCount = 0;
>+    glGetIntegerv(GL_MAX_CLIP_PLANES, &planeCount);
>+    EXPECT_GL_NO_ERROR();
>+
>+    EXPECT_GE(planeCount, 1);  // spec minimum
>+
>+    GLfloat clipPlane[4] = {};
>+
>+    for (int i = 0; i < planeCount; i++)
>+    {
>+        GLenum plane = GL_CLIP_PLANE0 + i;
>+
>+        EXPECT_GL_FALSE(glIsEnabled(plane));
>+        EXPECT_GL_NO_ERROR();
>+
>+        glGetClipPlanef(plane, clipPlane);
>+        EXPECT_GL_NO_ERROR();
>+
>+        EXPECT_EQ(0.0f, clipPlane[0]);
>+        EXPECT_EQ(0.0f, clipPlane[1]);
>+        EXPECT_EQ(0.0f, clipPlane[2]);
>+        EXPECT_EQ(0.0f, clipPlane[3]);
>+    }
>+}
>+
>+// Negative test for invalid clip planes.
>+TEST_P(ClipPlaneTest, Negative)
>+{
>+    GLint planeCount = 0;
>+    glGetIntegerv(GL_MAX_CLIP_PLANES, &planeCount);
>+    EXPECT_GL_NO_ERROR();
>+
>+    glClipPlanef(GL_CLIP_PLANE0 + planeCount, nullptr);
>+    EXPECT_GL_ERROR(GL_INVALID_ENUM);
>+
>+    glClipPlanef(GL_CLIP_PLANE0 - 1, nullptr);
>+    EXPECT_GL_ERROR(GL_INVALID_ENUM);
>+
>+    glGetClipPlanef(GL_CLIP_PLANE0 + planeCount, nullptr);
>+    EXPECT_GL_ERROR(GL_INVALID_ENUM);
>+
>+    glGetClipPlanef(GL_CLIP_PLANE0 - 1, nullptr);
>+    EXPECT_GL_ERROR(GL_INVALID_ENUM);
>+}
>+
>+// Test for setting clip plane values.
>+TEST_P(ClipPlaneTest, Set)
>+{
>+    GLint planeCount = 0;
>+    glGetIntegerv(GL_MAX_CLIP_PLANES, &planeCount);
>+    EXPECT_GL_NO_ERROR();
>+
>+    for (int i = 0; i < planeCount; i++)
>+    {
>+        GLenum plane = GL_CLIP_PLANE0 + i;
>+
>+        EXPECT_GL_FALSE(glIsEnabled(plane));
>+        EXPECT_GL_NO_ERROR();
>+
>+        GLfloat clipPlane[4] = {
>+            i + 0.0f,
>+            i + 1.0f,
>+            i + 2.0f,
>+            i + 3.0f,
>+        };
>+
>+        glClipPlanef(plane, clipPlane);
>+        EXPECT_GL_NO_ERROR();
>+
>+        GLfloat actualClipPlane[4] = {};
>+
>+        glGetClipPlanef(plane, actualClipPlane);
>+        EXPECT_EQ(clipPlane[0], actualClipPlane[0]);
>+        EXPECT_EQ(clipPlane[1], actualClipPlane[1]);
>+        EXPECT_EQ(clipPlane[2], actualClipPlane[2]);
>+        EXPECT_EQ(clipPlane[3], actualClipPlane[3]);
>+
>+        glEnable(plane);
>+        EXPECT_GL_NO_ERROR();
>+        EXPECT_GL_TRUE(glIsEnabled(plane));
>+    }
>+}
>+
>+ANGLE_INSTANTIATE_TEST(ClipPlaneTest, ES1_D3D11(), ES1_OPENGL(), ES1_OPENGLES());
>diff --git a/Source/ThirdParty/ANGLE/src/tests/gl_tests/gles1/CurrentColorTest.cpp b/Source/ThirdParty/ANGLE/src/tests/gl_tests/gles1/CurrentColorTest.cpp
>new file mode 100644
>index 00000000000..0bf6dc2e229
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/tests/gl_tests/gles1/CurrentColorTest.cpp
>@@ -0,0 +1,78 @@
>+//
>+// Copyright 2018 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+
>+// CurrentColorTest.cpp: Tests basic usage of glColor4(f|ub|x).
>+
>+#include "test_utils/ANGLETest.h"
>+#include "test_utils/gl_raii.h"
>+
>+#include "util/random_utils.h"
>+
>+#include <stdint.h>
>+
>+using namespace angle;
>+
>+class CurrentColorTest : public ANGLETest
>+{
>+  protected:
>+    CurrentColorTest()
>+    {
>+        setWindowWidth(32);
>+        setWindowHeight(32);
>+        setConfigRedBits(8);
>+        setConfigGreenBits(8);
>+        setConfigBlueBits(8);
>+        setConfigAlphaBits(8);
>+        setConfigDepthBits(24);
>+    }
>+};
>+
>+// State query: Checks the initial state is correct.
>+TEST_P(CurrentColorTest, InitialState)
>+{
>+    const GLColor32F kFloatWhite(1.0f, 1.0f, 1.0f, 1.0f);
>+    GLColor32F actualColor;
>+    glGetFloatv(GL_CURRENT_COLOR, &actualColor.R);
>+    EXPECT_GL_NO_ERROR();
>+    EXPECT_EQ(kFloatWhite, actualColor);
>+}
>+
>+// Set test: Checks that the current color is properly set and retrieved.
>+TEST_P(CurrentColorTest, Set)
>+{
>+    float epsilon = 0.00001f;
>+
>+    glColor4f(0.1f, 0.2f, 0.3f, 0.4f);
>+    EXPECT_GL_NO_ERROR();
>+
>+    GLColor32F floatColor;
>+    glGetFloatv(GL_CURRENT_COLOR, &floatColor.R);
>+    EXPECT_GL_NO_ERROR();
>+
>+    EXPECT_EQ(GLColor32F(0.1f, 0.2f, 0.3f, 0.4f), floatColor);
>+
>+    glColor4ub(0xff, 0x0, 0x55, 0x33);
>+
>+    glGetFloatv(GL_CURRENT_COLOR, &floatColor.R);
>+    EXPECT_GL_NO_ERROR();
>+
>+    EXPECT_NEAR(1.0f, floatColor.R, epsilon);
>+    EXPECT_NEAR(0.0f, floatColor.G, epsilon);
>+    EXPECT_NEAR(1.0f / 3.0f, floatColor.B, epsilon);
>+    EXPECT_NEAR(0.2f, floatColor.A, epsilon);
>+
>+    glColor4x(0x10000, 0x0, 0x3333, 0x5555);
>+
>+    glGetFloatv(GL_CURRENT_COLOR, &floatColor.R);
>+    EXPECT_GL_NO_ERROR();
>+
>+    EXPECT_NEAR(1.0f, floatColor.R, epsilon);
>+    EXPECT_NEAR(0.0f, floatColor.G, epsilon);
>+    EXPECT_NEAR(0.2f, floatColor.B, epsilon);
>+    EXPECT_NEAR(1.0f / 3.0f, floatColor.A, epsilon);
>+}
>+
>+ANGLE_INSTANTIATE_TEST(CurrentColorTest, ES1_D3D11(), ES1_OPENGL(), ES1_OPENGLES());
>diff --git a/Source/ThirdParty/ANGLE/src/tests/gl_tests/gles1/CurrentNormalTest.cpp b/Source/ThirdParty/ANGLE/src/tests/gl_tests/gles1/CurrentNormalTest.cpp
>new file mode 100644
>index 00000000000..e442c54dab4
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/tests/gl_tests/gles1/CurrentNormalTest.cpp
>@@ -0,0 +1,69 @@
>+//
>+// Copyright 2018 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+
>+// CurrentNormalTest.cpp: Tests basic usage of glNormal3(f|x).
>+
>+#include "test_utils/ANGLETest.h"
>+#include "test_utils/gl_raii.h"
>+
>+#include "util/random_utils.h"
>+
>+#include "common/vector_utils.h"
>+
>+#include <stdint.h>
>+
>+using namespace angle;
>+
>+class CurrentNormalTest : public ANGLETest
>+{
>+  protected:
>+    CurrentNormalTest()
>+    {
>+        setWindowWidth(32);
>+        setWindowHeight(32);
>+        setConfigRedBits(8);
>+        setConfigGreenBits(8);
>+        setConfigBlueBits(8);
>+        setConfigAlphaBits(8);
>+        setConfigDepthBits(24);
>+    }
>+};
>+
>+// State query: Checks the initial state is correct.
>+TEST_P(CurrentNormalTest, InitialState)
>+{
>+    const angle::Vector3 kUp(0.0f, 0.0f, 1.0f);
>+    angle::Vector3 actualNormal;
>+    glGetFloatv(GL_CURRENT_NORMAL, actualNormal.data());
>+    EXPECT_GL_NO_ERROR();
>+    EXPECT_EQ(kUp, actualNormal);
>+}
>+
>+// Set test: Checks that the current normal is properly set and retrieved.
>+TEST_P(CurrentNormalTest, Set)
>+{
>+    glNormal3f(0.1f, 0.2f, 0.3f);
>+    EXPECT_GL_NO_ERROR();
>+
>+    angle::Vector3 actualNormal;
>+
>+    glGetFloatv(GL_CURRENT_NORMAL, actualNormal.data());
>+    EXPECT_GL_NO_ERROR();
>+    EXPECT_EQ(angle::Vector3(0.1f, 0.2f, 0.3f), actualNormal);
>+
>+    float epsilon = 0.00001f;
>+
>+    glNormal3x(0x10000, 0x3333, 0x5555);
>+    EXPECT_GL_NO_ERROR();
>+
>+    glGetFloatv(GL_CURRENT_NORMAL, actualNormal.data());
>+    EXPECT_GL_NO_ERROR();
>+    EXPECT_NEAR(1.0f, actualNormal[0], epsilon);
>+    EXPECT_NEAR(0.2f, actualNormal[1], epsilon);
>+    EXPECT_NEAR(1.0f / 3.0f, actualNormal[2], epsilon);
>+}
>+
>+ANGLE_INSTANTIATE_TEST(CurrentNormalTest, ES1_D3D11(), ES1_OPENGL(), ES1_OPENGLES());
>diff --git a/Source/ThirdParty/ANGLE/src/tests/gl_tests/gles1/CurrentTextureCoordsTest.cpp b/Source/ThirdParty/ANGLE/src/tests/gl_tests/gles1/CurrentTextureCoordsTest.cpp
>new file mode 100644
>index 00000000000..900e234215b
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/tests/gl_tests/gles1/CurrentTextureCoordsTest.cpp
>@@ -0,0 +1,99 @@
>+//
>+// Copyright 2018 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+
>+// CurrentTextureCoordsTest.cpp: Tests basic usage of glMultiTexCoord4(f|x).
>+
>+#include "test_utils/ANGLETest.h"
>+
>+#include "common/vector_utils.h"
>+#include "test_utils/gl_raii.h"
>+#include "util/random_utils.h"
>+
>+#include <array>
>+
>+#include <stdint.h>
>+
>+using namespace angle;
>+
>+using TextureCoord = std::array<float, 4>;
>+
>+class CurrentTextureCoordsTest : public ANGLETest
>+{
>+  protected:
>+    CurrentTextureCoordsTest()
>+    {
>+        setWindowWidth(32);
>+        setWindowHeight(32);
>+        setConfigRedBits(8);
>+        setConfigGreenBits(8);
>+        setConfigBlueBits(8);
>+        setConfigAlphaBits(8);
>+        setConfigDepthBits(24);
>+    }
>+};
>+
>+// State query: Checks the initial state is correct.
>+TEST_P(CurrentTextureCoordsTest, InitialState)
>+{
>+    GLint maxUnits = 0;
>+    glGetIntegerv(GL_MAX_TEXTURE_UNITS, &maxUnits);
>+    EXPECT_GL_NO_ERROR();
>+
>+    const TextureCoord kZero = {0.0f, 0.0f, 0.0f, 0.0f};
>+    TextureCoord actualTexCoord;
>+
>+    for (GLint i = 0; i < maxUnits; i++)
>+    {
>+        glActiveTexture(GL_TEXTURE0 + i);
>+        EXPECT_GL_NO_ERROR();
>+        glGetFloatv(GL_CURRENT_TEXTURE_COORDS, actualTexCoord.data());
>+        EXPECT_GL_NO_ERROR();
>+        EXPECT_EQ(kZero, actualTexCoord);
>+    }
>+}
>+
>+// Checks that errors are generated if the texture unit specified is invalid.
>+TEST_P(CurrentTextureCoordsTest, Negative)
>+{
>+    GLint maxUnits = 0;
>+    glGetIntegerv(GL_MAX_TEXTURE_UNITS, &maxUnits);
>+    EXPECT_GL_NO_ERROR();
>+
>+    glMultiTexCoord4f(GL_TEXTURE0 - 1, 1.0f, 0.0f, 0.0f, 0.0f);
>+    EXPECT_GL_ERROR(GL_INVALID_ENUM);
>+
>+    glMultiTexCoord4f(GL_TEXTURE0 + maxUnits, 1.0f, 0.0f, 0.0f, 0.0f);
>+    EXPECT_GL_ERROR(GL_INVALID_ENUM);
>+}
>+
>+// Tests setting and getting the current texture coordinates for each unit and with float/fixed
>+// inputs.
>+TEST_P(CurrentTextureCoordsTest, Set)
>+{
>+    float epsilon  = 0.00001f;
>+    GLint maxUnits = 0;
>+    glGetIntegerv(GL_MAX_TEXTURE_UNITS, &maxUnits);
>+    EXPECT_GL_NO_ERROR();
>+
>+    TextureCoord actualTexCoord;
>+
>+    for (int i = 0; i < maxUnits; i++)
>+    {
>+        glActiveTexture(GL_TEXTURE0 + i);
>+        glMultiTexCoord4f(GL_TEXTURE0 + i, 0.1f, 0.2f, 0.3f, 0.4f);
>+        glGetFloatv(GL_CURRENT_TEXTURE_COORDS, actualTexCoord.data());
>+        EXPECT_EQ((TextureCoord{0.1f, 0.2f, 0.3f, 0.4f}), actualTexCoord);
>+
>+        glMultiTexCoord4x(GL_TEXTURE0 + i, 0x10000, 0x0, 0x3333, 0x5555);
>+        glGetFloatv(GL_CURRENT_TEXTURE_COORDS, actualTexCoord.data());
>+        EXPECT_NEAR(1.0f, actualTexCoord[0], epsilon);
>+        EXPECT_NEAR(0.0f, actualTexCoord[1], epsilon);
>+        EXPECT_NEAR(0.2f, actualTexCoord[2], epsilon);
>+        EXPECT_NEAR(1.0f / 3.0f, actualTexCoord[3], epsilon);
>+    }
>+}
>+
>+ANGLE_INSTANTIATE_TEST(CurrentTextureCoordsTest, ES1_D3D11(), ES1_OPENGL(), ES1_OPENGLES());
>diff --git a/Source/ThirdParty/ANGLE/src/tests/gl_tests/gles1/DrawTextureTest.cpp b/Source/ThirdParty/ANGLE/src/tests/gl_tests/gles1/DrawTextureTest.cpp
>new file mode 100644
>index 00000000000..5a39af5aebc
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/tests/gl_tests/gles1/DrawTextureTest.cpp
>@@ -0,0 +1,141 @@
>+//
>+// Copyright 2018 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+
>+// DrawTextureTest.cpp: Tests basic usage of glDrawTex*.
>+
>+#include "test_utils/ANGLETest.h"
>+#include "test_utils/gl_raii.h"
>+
>+#include <memory>
>+#include <vector>
>+
>+using namespace angle;
>+
>+class DrawTextureTest : public ANGLETest
>+{
>+  protected:
>+    DrawTextureTest()
>+    {
>+        setWindowWidth(32);
>+        setWindowHeight(32);
>+        setConfigRedBits(8);
>+        setConfigGreenBits(8);
>+        setConfigBlueBits(8);
>+        setConfigAlphaBits(8);
>+        setConfigDepthBits(24);
>+    }
>+
>+    void SetUp() override
>+    {
>+        ANGLETest::SetUp();
>+        mTexture.reset(new GLTexture());
>+        glEnable(GL_TEXTURE_2D);
>+        glBindTexture(GL_TEXTURE_2D, mTexture->get());
>+    }
>+
>+    void TearDown() override
>+    {
>+        mTexture.reset();
>+        ANGLETest::TearDown();
>+    }
>+
>+    std::unique_ptr<GLTexture> mTexture;
>+};
>+
>+// Negative test for invalid width/height values.
>+TEST_P(DrawTextureTest, NegativeValue)
>+{
>+    glDrawTexiOES(0, 0, 0, 0, 0);
>+    EXPECT_GL_ERROR(GL_INVALID_VALUE);
>+    glDrawTexiOES(0, 0, 0, -1, 0);
>+    EXPECT_GL_ERROR(GL_INVALID_VALUE);
>+    glDrawTexiOES(0, 0, 0, 0, -1);
>+    EXPECT_GL_ERROR(GL_INVALID_VALUE);
>+    glDrawTexiOES(0, 0, 0, -1, -1);
>+    EXPECT_GL_ERROR(GL_INVALID_VALUE);
>+}
>+
>+// Basic draw.
>+TEST_P(DrawTextureTest, Basic)
>+{
>+    glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, 1, 1, 0, GL_RGBA, GL_UNSIGNED_BYTE, &GLColor::green);
>+    glDrawTexiOES(0, 0, 0, 1, 1);
>+    EXPECT_GL_NO_ERROR();
>+    EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::green);
>+}
>+
>+// Tests that odd viewport dimensions are handled correctly.
>+// If the viewport dimension is even, then the incorrect way
>+// of getting the center screen coordinate by dividing by 2 and
>+// converting to integer will work in that case, but not if
>+// the viewport dimension is odd.
>+TEST_P(DrawTextureTest, CorrectNdcForOddViewportDimensions)
>+{
>+    glClearColor(0.0f, 0.0f, 0.0f, 1.0f);
>+    glClear(GL_COLOR_BUFFER_BIT);
>+
>+    // clang-format off
>+    std::array<GLColor, 2> textureData = {
>+        GLColor::green, GLColor::green
>+    };
>+    // clang-format on
>+
>+    glViewport(0, 0, 3, 3);
>+    glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, 2, 1, 0, GL_RGBA, GL_UNSIGNED_BYTE, textureData.data());
>+
>+    GLint cropRect[] = {0, 0, 2, 1};
>+    glTexParameteriv(GL_TEXTURE_2D, GL_TEXTURE_CROP_RECT_OES, cropRect);
>+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
>+    EXPECT_GL_NO_ERROR();
>+
>+    GLint x = 1;
>+    GLint y = 1;
>+    glDrawTexiOES(x, y, 0, 2, 1);
>+    EXPECT_GL_NO_ERROR();
>+
>+    EXPECT_PIXEL_COLOR_EQ(x, y, GLColor::green);
>+    EXPECT_PIXEL_COLOR_EQ(x + 1, y, GLColor::green);
>+
>+    EXPECT_PIXEL_COLOR_EQ(x, y + 1, GLColor::black);
>+    EXPECT_PIXEL_COLOR_EQ(x + 1, y + 1, GLColor::black);
>+    EXPECT_PIXEL_COLOR_EQ(x + 2, y, GLColor::black);
>+    EXPECT_PIXEL_COLOR_EQ(x + 3, y, GLColor::black);
>+}
>+
>+// Tests that vertex attributes enabled with fewer than 6 verts do not cause a crash.
>+TEST_P(DrawTextureTest, VertexAttributesNoCrash)
>+{
>+    glEnableClientState(GL_COLOR_ARRAY);
>+    glColorPointer(4, GL_FLOAT, 0, &GLColor::white);
>+
>+    glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, 1, 1, 0, GL_RGBA, GL_UNSIGNED_BYTE, &GLColor::green);
>+    EXPECT_GL_NO_ERROR();
>+
>+    glDrawTexiOES(0, 0, 0, 1, 1);
>+    EXPECT_GL_NO_ERROR();
>+    EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::green);
>+}
>+
>+// Tests that the color array, if enabled, is not used as the vertex color.
>+TEST_P(DrawTextureTest, ColorArrayNotUsed)
>+{
>+    glEnableClientState(GL_COLOR_ARRAY);
>+
>+    // This color is set to black on purpose to ensure that the color in the upcoming vertex array
>+    // is not used in the texture draw. If it is used, then the texture we want to read will be
>+    // modulated with the color in the vertex array instead of GL_CURRENT_COLOR (which at the moment
>+    // is white (1.0, 1.0, 1.0, 1.0).
>+    glColorPointer(4, GL_FLOAT, 0, &GLColor::black);
>+
>+    glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, 1, 1, 0, GL_RGBA, GL_UNSIGNED_BYTE, &GLColor::green);
>+    EXPECT_GL_NO_ERROR();
>+
>+    glDrawTexiOES(0, 0, 0, 1, 1);
>+    EXPECT_GL_NO_ERROR();
>+    EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::green);
>+}
>+
>+ANGLE_INSTANTIATE_TEST(DrawTextureTest, ES1_D3D11(), ES1_OPENGL(), ES1_OPENGLES());
>diff --git a/Source/ThirdParty/ANGLE/src/tests/gl_tests/gles1/FogTest.cpp b/Source/ThirdParty/ANGLE/src/tests/gl_tests/gles1/FogTest.cpp
>new file mode 100644
>index 00000000000..e147a093800
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/tests/gl_tests/gles1/FogTest.cpp
>@@ -0,0 +1,133 @@
>+//
>+// Copyright 2018 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+
>+// FogTest.cpp: Tests basic usage of glFog.
>+
>+#include "test_utils/ANGLETest.h"
>+#include "test_utils/gl_raii.h"
>+
>+#include "util/random_utils.h"
>+
>+#include <stdint.h>
>+
>+using namespace angle;
>+
>+class FogTest : public ANGLETest
>+{
>+  protected:
>+    FogTest()
>+    {
>+        setWindowWidth(32);
>+        setWindowHeight(32);
>+        setConfigRedBits(8);
>+        setConfigGreenBits(8);
>+        setConfigBlueBits(8);
>+        setConfigAlphaBits(8);
>+        setConfigDepthBits(24);
>+    }
>+};
>+
>+// Initial state check.
>+TEST_P(FogTest, InitialState)
>+{
>+    EXPECT_GL_FALSE(glIsEnabled(GL_FOG));
>+    EXPECT_GL_NO_ERROR();
>+
>+    GLint fogMode;
>+    glGetIntegerv(GL_FOG_MODE, &fogMode);
>+    EXPECT_GL_NO_ERROR();
>+    EXPECT_GLENUM_EQ(GL_EXP, fogMode);
>+
>+    GLfloat fogModeAsFloat;
>+    glGetFloatv(GL_FOG_MODE, &fogModeAsFloat);
>+    EXPECT_GL_NO_ERROR();
>+    EXPECT_GLENUM_EQ(GL_EXP, fogModeAsFloat);
>+
>+    GLfloat fogStart;
>+    GLfloat fogEnd;
>+    GLfloat fogDensity;
>+
>+    glGetFloatv(GL_FOG_START, &fogStart);
>+    EXPECT_GL_NO_ERROR();
>+    glGetFloatv(GL_FOG_END, &fogEnd);
>+    EXPECT_GL_NO_ERROR();
>+    glGetFloatv(GL_FOG_DENSITY, &fogDensity);
>+    EXPECT_GL_NO_ERROR();
>+
>+    EXPECT_EQ(0.0f, fogStart);
>+    EXPECT_EQ(1.0f, fogEnd);
>+    EXPECT_EQ(1.0f, fogDensity);
>+
>+    const GLColor32F kInitialFogColor(0.0f, 0.0f, 0.0f, 0.0f);
>+    GLColor32F initialFogColor;
>+    glGetFloatv(GL_FOG_COLOR, &initialFogColor.R);
>+    EXPECT_GL_NO_ERROR();
>+
>+    EXPECT_EQ(kInitialFogColor, initialFogColor);
>+}
>+
>+// Negative test for parameter names.
>+TEST_P(FogTest, NegativeParameter)
>+{
>+    glFogfv(0, nullptr);
>+    EXPECT_GL_ERROR(GL_INVALID_ENUM);
>+}
>+
>+// Negative test for parameter values.
>+TEST_P(FogTest, NegativeValues)
>+{
>+    glFogf(GL_FOG_MODE, 0.0f);
>+    EXPECT_GL_ERROR(GL_INVALID_VALUE);
>+
>+    glFogf(GL_FOG_DENSITY, -1.0f);
>+    EXPECT_GL_ERROR(GL_INVALID_VALUE);
>+}
>+
>+// Checks that fog state can be set.
>+TEST_P(FogTest, Set)
>+{
>+    GLfloat fogValue[4] = {};
>+
>+    glFogf(GL_FOG_MODE, GL_EXP2);
>+    EXPECT_GL_NO_ERROR();
>+
>+    glGetFloatv(GL_FOG_MODE, fogValue);
>+    EXPECT_GL_NO_ERROR();
>+    EXPECT_GLENUM_EQ(GL_EXP2, fogValue[0]);
>+
>+    glFogf(GL_FOG_DENSITY, 2.0f);
>+    EXPECT_GL_NO_ERROR();
>+
>+    glGetFloatv(GL_FOG_DENSITY, fogValue);
>+    EXPECT_GL_NO_ERROR();
>+    EXPECT_GLENUM_EQ(2.0f, fogValue[0]);
>+
>+    glFogf(GL_FOG_START, 2.0f);
>+    EXPECT_GL_NO_ERROR();
>+
>+    glGetFloatv(GL_FOG_START, fogValue);
>+    EXPECT_GL_NO_ERROR();
>+    EXPECT_GLENUM_EQ(2.0f, fogValue[0]);
>+
>+    glFogf(GL_FOG_END, 2.0f);
>+    EXPECT_GL_NO_ERROR();
>+
>+    glGetFloatv(GL_FOG_END, fogValue);
>+    EXPECT_GL_NO_ERROR();
>+    EXPECT_GLENUM_EQ(2.0f, fogValue[0]);
>+
>+    const GLColor32F testColor(0.1f, 0.2f, 0.3f, 0.4f);
>+    glFogfv(GL_FOG_COLOR, &testColor.R);
>+    EXPECT_GL_NO_ERROR();
>+    glGetFloatv(GL_FOG_COLOR, fogValue);
>+    EXPECT_GL_NO_ERROR();
>+    EXPECT_EQ(0.1f, fogValue[0]);
>+    EXPECT_EQ(0.2f, fogValue[1]);
>+    EXPECT_EQ(0.3f, fogValue[2]);
>+    EXPECT_EQ(0.4f, fogValue[3]);
>+}
>+
>+ANGLE_INSTANTIATE_TEST(FogTest, ES1_D3D11(), ES1_OPENGL(), ES1_OPENGLES());
>diff --git a/Source/ThirdParty/ANGLE/src/tests/gl_tests/gles1/LightsTest.cpp b/Source/ThirdParty/ANGLE/src/tests/gl_tests/gles1/LightsTest.cpp
>new file mode 100644
>index 00000000000..6a3125381b9
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/tests/gl_tests/gles1/LightsTest.cpp
>@@ -0,0 +1,317 @@
>+//
>+// Copyright 2018 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+
>+// LightsTest.cpp: Tests basic usage of glLight*.
>+
>+#include "test_utils/ANGLETest.h"
>+#include "test_utils/gl_raii.h"
>+
>+#include "common/matrix_utils.h"
>+#include "common/vector_utils.h"
>+#include "util/random_utils.h"
>+
>+#include <stdint.h>
>+
>+#include <vector>
>+
>+using namespace angle;
>+
>+class LightsTest : public ANGLETest
>+{
>+  protected:
>+    LightsTest()
>+    {
>+        setWindowWidth(32);
>+        setWindowHeight(32);
>+        setConfigRedBits(8);
>+        setConfigGreenBits(8);
>+        setConfigBlueBits(8);
>+        setConfigAlphaBits(8);
>+        setConfigDepthBits(24);
>+    }
>+};
>+
>+// Check that the initial lighting parameters state is correct,
>+// including spec minimum for light count.
>+TEST_P(LightsTest, InitialState)
>+{
>+    const GLColor32F kAmbientInitial(0.2f, 0.2f, 0.2f, 1.0f);
>+    GLboolean kLightModelTwoSideInitial = GL_FALSE;
>+
>+    GLColor32F lightModelAmbient;
>+    GLboolean lightModelTwoSide;
>+
>+    glGetFloatv(GL_LIGHT_MODEL_AMBIENT, &lightModelAmbient.R);
>+    EXPECT_GL_NO_ERROR();
>+    EXPECT_EQ(kAmbientInitial, lightModelAmbient);
>+
>+    glGetBooleanv(GL_LIGHT_MODEL_TWO_SIDE, &lightModelTwoSide);
>+    EXPECT_GL_NO_ERROR();
>+    EXPECT_EQ(kLightModelTwoSideInitial, lightModelTwoSide);
>+
>+    EXPECT_GL_FALSE(glIsEnabled(GL_LIGHTING));
>+    EXPECT_GL_NO_ERROR();
>+    EXPECT_GL_FALSE(glIsEnabled(GL_NORMALIZE));
>+    EXPECT_GL_NO_ERROR();
>+    EXPECT_GL_FALSE(glIsEnabled(GL_RESCALE_NORMAL));
>+    EXPECT_GL_NO_ERROR();
>+    EXPECT_GL_FALSE(glIsEnabled(GL_COLOR_MATERIAL));
>+    EXPECT_GL_NO_ERROR();
>+
>+    GLint maxLights = 0;
>+    glGetIntegerv(GL_MAX_LIGHTS, &maxLights);
>+    EXPECT_GL_NO_ERROR();
>+    EXPECT_GE(8, maxLights);
>+
>+    const GLColor32F kLightnAmbient(0.0f, 0.0f, 0.0f, 1.0f);
>+    const GLColor32F kLightnDiffuse(0.0f, 0.0f, 0.0f, 1.0f);
>+    const GLColor32F kLightnSpecular(0.0f, 0.0f, 0.0f, 1.0f);
>+    const GLColor32F kLight0Diffuse(1.0f, 1.0f, 1.0f, 1.0f);
>+    const GLColor32F kLight0Specular(1.0f, 1.0f, 1.0f, 1.0f);
>+    const angle::Vector4 kLightnPosition(0.0f, 0.0f, 1.0f, 0.0f);
>+    const angle::Vector3 kLightnDirection(0.0f, 0.0f, -1.0f);
>+    const GLfloat kLightnSpotlightExponent    = 0.0f;
>+    const GLfloat kLightnSpotlightCutoffAngle = 180.0f;
>+    const GLfloat kLightnAttenuationConst     = 1.0f;
>+    const GLfloat kLightnAttenuationLinear    = 0.0f;
>+    const GLfloat kLightnAttenuationQuadratic = 0.0f;
>+
>+    for (int i = 0; i < maxLights; i++)
>+    {
>+        EXPECT_GL_FALSE(glIsEnabled(GL_LIGHT0 + i));
>+        EXPECT_GL_NO_ERROR();
>+
>+        GLColor32F actualColor;
>+        angle::Vector4 actualPosition;
>+        angle::Vector3 actualDirection;
>+        GLfloat actualFloatValue;
>+
>+        glGetLightfv(GL_LIGHT0 + i, GL_AMBIENT, &actualColor.R);
>+        EXPECT_GL_NO_ERROR();
>+        EXPECT_EQ(kLightnAmbient, actualColor);
>+
>+        glGetLightfv(GL_LIGHT0 + i, GL_DIFFUSE, &actualColor.R);
>+        EXPECT_GL_NO_ERROR();
>+        EXPECT_EQ(i == 0 ? kLight0Diffuse : kLightnDiffuse, actualColor);
>+
>+        glGetLightfv(GL_LIGHT0 + i, GL_SPECULAR, &actualColor.R);
>+        EXPECT_GL_NO_ERROR();
>+        EXPECT_EQ(i == 0 ? kLight0Specular : kLightnSpecular, actualColor);
>+
>+        glGetLightfv(GL_LIGHT0 + i, GL_POSITION, actualPosition.data());
>+        EXPECT_GL_NO_ERROR();
>+        EXPECT_EQ(kLightnPosition, actualPosition);
>+
>+        glGetLightfv(GL_LIGHT0 + i, GL_SPOT_DIRECTION, actualDirection.data());
>+        EXPECT_GL_NO_ERROR();
>+        EXPECT_EQ(kLightnDirection, actualDirection);
>+
>+        glGetLightfv(GL_LIGHT0 + i, GL_SPOT_EXPONENT, &actualFloatValue);
>+        EXPECT_GL_NO_ERROR();
>+        EXPECT_EQ(kLightnSpotlightExponent, actualFloatValue);
>+
>+        glGetLightfv(GL_LIGHT0 + i, GL_SPOT_CUTOFF, &actualFloatValue);
>+        EXPECT_GL_NO_ERROR();
>+        EXPECT_EQ(kLightnSpotlightCutoffAngle, actualFloatValue);
>+
>+        glGetLightfv(GL_LIGHT0 + i, GL_CONSTANT_ATTENUATION, &actualFloatValue);
>+        EXPECT_GL_NO_ERROR();
>+        EXPECT_EQ(kLightnAttenuationConst, actualFloatValue);
>+
>+        glGetLightfv(GL_LIGHT0 + i, GL_LINEAR_ATTENUATION, &actualFloatValue);
>+        EXPECT_GL_NO_ERROR();
>+        EXPECT_EQ(kLightnAttenuationLinear, actualFloatValue);
>+
>+        glGetLightfv(GL_LIGHT0 + i, GL_QUADRATIC_ATTENUATION, &actualFloatValue);
>+        EXPECT_GL_NO_ERROR();
>+        EXPECT_EQ(kLightnAttenuationQuadratic, actualFloatValue);
>+    }
>+}
>+
>+// Negative test for invalid parameter names.
>+TEST_P(LightsTest, NegativeInvalidEnum)
>+{
>+    GLint maxLights = 0;
>+    glGetIntegerv(GL_MAX_LIGHTS, &maxLights);
>+
>+    glIsEnabled(GL_LIGHT0 + maxLights);
>+    EXPECT_GL_ERROR(GL_INVALID_ENUM);
>+
>+    glLightfv(GL_LIGHT0 + maxLights, GL_AMBIENT, nullptr);
>+    EXPECT_GL_ERROR(GL_INVALID_ENUM);
>+
>+    glLightModelfv(GL_LIGHT0, nullptr);
>+    EXPECT_GL_ERROR(GL_INVALID_ENUM);
>+
>+    glLightModelf(GL_LIGHT0, 0.0f);
>+    EXPECT_GL_ERROR(GL_INVALID_ENUM);
>+
>+    for (int i = 0; i < maxLights; i++)
>+    {
>+        glLightf(GL_LIGHT0 + i, GL_TEXTURE_2D, 0.0f);
>+        EXPECT_GL_ERROR(GL_INVALID_ENUM);
>+
>+        glLightfv(GL_LIGHT0 + i, GL_TEXTURE_2D, nullptr);
>+        EXPECT_GL_ERROR(GL_INVALID_ENUM);
>+    }
>+}
>+
>+// Negative test for invalid parameter values.
>+TEST_P(LightsTest, NegativeInvalidValue)
>+{
>+    GLint maxLights = 0;
>+    glGetIntegerv(GL_MAX_LIGHTS, &maxLights);
>+
>+    std::vector<GLenum> attenuationParams = {
>+        GL_CONSTANT_ATTENUATION,
>+        GL_LINEAR_ATTENUATION,
>+        GL_QUADRATIC_ATTENUATION,
>+    };
>+
>+    for (int i = 0; i < maxLights; i++)
>+    {
>+        glLightf(GL_LIGHT0 + i, GL_SPOT_EXPONENT, -1.0f);
>+        EXPECT_GL_ERROR(GL_INVALID_VALUE);
>+        GLfloat previousVal = -1.0f;
>+        glGetLightfv(GL_LIGHT0 + i, GL_SPOT_EXPONENT, &previousVal);
>+        EXPECT_NE(-1.0f, previousVal);
>+
>+        glLightf(GL_LIGHT0 + i, GL_SPOT_EXPONENT, 128.1f);
>+        EXPECT_GL_ERROR(GL_INVALID_VALUE);
>+        previousVal = 128.1f;
>+        glGetLightfv(GL_LIGHT0 + i, GL_SPOT_EXPONENT, &previousVal);
>+        EXPECT_NE(128.1f, previousVal);
>+
>+        glLightf(GL_LIGHT0 + i, GL_SPOT_CUTOFF, -1.0f);
>+        EXPECT_GL_ERROR(GL_INVALID_VALUE);
>+        previousVal = -1.0f;
>+        glGetLightfv(GL_LIGHT0 + i, GL_SPOT_CUTOFF, &previousVal);
>+        EXPECT_NE(-1.0f, previousVal);
>+
>+        glLightf(GL_LIGHT0 + i, GL_SPOT_CUTOFF, 90.1f);
>+        EXPECT_GL_ERROR(GL_INVALID_VALUE);
>+        previousVal = 90.1f;
>+        glGetLightfv(GL_LIGHT0 + i, GL_SPOT_CUTOFF, &previousVal);
>+        EXPECT_NE(90.1f, previousVal);
>+
>+        for (GLenum pname : attenuationParams)
>+        {
>+            glLightf(GL_LIGHT0 + i, pname, -1.0f);
>+            EXPECT_GL_ERROR(GL_INVALID_VALUE);
>+            previousVal = -1.0f;
>+            glGetLightfv(GL_LIGHT0 + i, pname, &previousVal);
>+            EXPECT_NE(-1.0f, previousVal);
>+        }
>+    }
>+}
>+
>+// Test to see if we can set and retrieve the light parameters.
>+TEST_P(LightsTest, Set)
>+{
>+    angle::RNG rng(0);
>+
>+    GLint maxLights = 0;
>+    glGetIntegerv(GL_MAX_LIGHTS, &maxLights);
>+
>+    constexpr int kNumTrials = 100;
>+
>+    GLColor32F actualColor;
>+    angle::Vector4 actualPosition;
>+    angle::Vector3 actualDirection;
>+    GLfloat actualFloatValue;
>+    GLboolean actualBooleanValue;
>+
>+    for (int k = 0; k < kNumTrials; ++k)
>+    {
>+        const GLColor32F lightModelAmbient(rng.randomFloat(), rng.randomFloat(), rng.randomFloat(),
>+                                           rng.randomFloat());
>+        const GLfloat lightModelTwoSide = rng.randomBool() ? 1.0f : 0.0f;
>+
>+        glLightModelfv(GL_LIGHT_MODEL_AMBIENT, &lightModelAmbient.R);
>+        EXPECT_GL_NO_ERROR();
>+        glGetFloatv(GL_LIGHT_MODEL_AMBIENT, &actualColor.R);
>+        EXPECT_EQ(lightModelAmbient, actualColor);
>+
>+        glLightModelf(GL_LIGHT_MODEL_TWO_SIDE, lightModelTwoSide);
>+        EXPECT_GL_NO_ERROR();
>+        glGetFloatv(GL_LIGHT_MODEL_TWO_SIDE, &actualFloatValue);
>+        EXPECT_EQ(lightModelTwoSide, actualFloatValue);
>+        glGetBooleanv(GL_LIGHT_MODEL_TWO_SIDE, &actualBooleanValue);
>+        EXPECT_EQ(lightModelTwoSide == 1.0f ? GL_TRUE : GL_FALSE, actualBooleanValue);
>+
>+        for (int i = 0; i < maxLights; i++)
>+        {
>+
>+            const GLColor32F ambient(rng.randomFloat(), rng.randomFloat(), rng.randomFloat(),
>+                                     rng.randomFloat());
>+            const GLColor32F diffuse(rng.randomFloat(), rng.randomFloat(), rng.randomFloat(),
>+                                     rng.randomFloat());
>+            const GLColor32F specular(rng.randomFloat(), rng.randomFloat(), rng.randomFloat(),
>+                                      rng.randomFloat());
>+            const angle::Vector4 position(rng.randomFloat(), rng.randomFloat(), rng.randomFloat(),
>+                                          rng.randomFloat());
>+            const angle::Vector3 direction(rng.randomFloat(), rng.randomFloat(), rng.randomFloat());
>+            const GLfloat spotlightExponent = rng.randomFloatBetween(0.0f, 128.0f);
>+            const GLfloat spotlightCutoffAngle =
>+                rng.randomBool() ? rng.randomFloatBetween(0.0f, 90.0f) : 180.0f;
>+            const GLfloat attenuationConst     = rng.randomFloatNonnegative();
>+            const GLfloat attenuationLinear    = rng.randomFloatNonnegative();
>+            const GLfloat attenuationQuadratic = rng.randomFloatNonnegative();
>+
>+            glLightfv(GL_LIGHT0 + i, GL_AMBIENT, &ambient.R);
>+            EXPECT_GL_NO_ERROR();
>+            glGetLightfv(GL_LIGHT0 + i, GL_AMBIENT, &actualColor.R);
>+            EXPECT_EQ(ambient, actualColor);
>+
>+            glLightfv(GL_LIGHT0 + i, GL_DIFFUSE, &diffuse.R);
>+            EXPECT_GL_NO_ERROR();
>+            glGetLightfv(GL_LIGHT0 + i, GL_DIFFUSE, &actualColor.R);
>+            EXPECT_EQ(diffuse, actualColor);
>+
>+            glLightfv(GL_LIGHT0 + i, GL_SPECULAR, &specular.R);
>+            EXPECT_GL_NO_ERROR();
>+            glGetLightfv(GL_LIGHT0 + i, GL_SPECULAR, &actualColor.R);
>+            EXPECT_EQ(specular, actualColor);
>+
>+            glLightfv(GL_LIGHT0 + i, GL_POSITION, position.data());
>+            EXPECT_GL_NO_ERROR();
>+            glGetLightfv(GL_LIGHT0 + i, GL_POSITION, actualPosition.data());
>+            EXPECT_EQ(position, actualPosition);
>+
>+            glLightfv(GL_LIGHT0 + i, GL_SPOT_DIRECTION, direction.data());
>+            EXPECT_GL_NO_ERROR();
>+            glGetLightfv(GL_LIGHT0 + i, GL_SPOT_DIRECTION, actualDirection.data());
>+            EXPECT_EQ(direction, actualDirection);
>+
>+            glLightfv(GL_LIGHT0 + i, GL_SPOT_EXPONENT, &spotlightExponent);
>+            EXPECT_GL_NO_ERROR();
>+            glGetLightfv(GL_LIGHT0 + i, GL_SPOT_EXPONENT, &actualFloatValue);
>+            EXPECT_EQ(spotlightExponent, actualFloatValue);
>+
>+            glLightfv(GL_LIGHT0 + i, GL_SPOT_CUTOFF, &spotlightCutoffAngle);
>+            EXPECT_GL_NO_ERROR();
>+            glGetLightfv(GL_LIGHT0 + i, GL_SPOT_CUTOFF, &actualFloatValue);
>+            EXPECT_EQ(spotlightCutoffAngle, actualFloatValue);
>+
>+            glLightfv(GL_LIGHT0 + i, GL_CONSTANT_ATTENUATION, &attenuationConst);
>+            EXPECT_GL_NO_ERROR();
>+            glGetLightfv(GL_LIGHT0 + i, GL_CONSTANT_ATTENUATION, &actualFloatValue);
>+            EXPECT_EQ(attenuationConst, actualFloatValue);
>+
>+            glLightfv(GL_LIGHT0 + i, GL_LINEAR_ATTENUATION, &attenuationLinear);
>+            EXPECT_GL_NO_ERROR();
>+            glGetLightfv(GL_LIGHT0 + i, GL_LINEAR_ATTENUATION, &actualFloatValue);
>+            EXPECT_EQ(attenuationLinear, actualFloatValue);
>+
>+            glLightfv(GL_LIGHT0 + i, GL_LINEAR_ATTENUATION, &attenuationQuadratic);
>+            EXPECT_GL_NO_ERROR();
>+            glGetLightfv(GL_LIGHT0 + i, GL_LINEAR_ATTENUATION, &actualFloatValue);
>+            EXPECT_EQ(attenuationQuadratic, actualFloatValue);
>+        }
>+    }
>+}
>+
>+ANGLE_INSTANTIATE_TEST(LightsTest, ES1_D3D11(), ES1_OPENGL(), ES1_OPENGLES());
>diff --git a/Source/ThirdParty/ANGLE/src/tests/gl_tests/gles1/MaterialsTest.cpp b/Source/ThirdParty/ANGLE/src/tests/gl_tests/gles1/MaterialsTest.cpp
>new file mode 100644
>index 00000000000..c0ed07b125f
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/tests/gl_tests/gles1/MaterialsTest.cpp
>@@ -0,0 +1,131 @@
>+//
>+// Copyright 2018 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+
>+// MaterialsTest.cpp: Tests basic usage of glMaterial*.
>+
>+#include "test_utils/ANGLETest.h"
>+#include "test_utils/gl_raii.h"
>+
>+#include "util/random_utils.h"
>+
>+#include <stdint.h>
>+
>+#include <vector>
>+
>+using namespace angle;
>+
>+class MaterialsTest : public ANGLETest
>+{
>+  protected:
>+    MaterialsTest()
>+    {
>+        setWindowWidth(32);
>+        setWindowHeight(32);
>+        setConfigRedBits(8);
>+        setConfigGreenBits(8);
>+        setConfigBlueBits(8);
>+        setConfigAlphaBits(8);
>+        setConfigDepthBits(24);
>+    }
>+};
>+
>+// Check that the initial material state is correct.
>+TEST_P(MaterialsTest, InitialState)
>+{
>+    const GLColor32F kAmbientInitial(0.2f, 0.2f, 0.2f, 1.0f);
>+    const GLColor32F kDiffuseInitial(0.8f, 0.8f, 0.8f, 1.0f);
>+    const GLColor32F kSpecularInitial(0.0f, 0.0f, 0.0f, 1.0f);
>+    const GLColor32F kEmissiveInitial(0.0f, 0.0f, 0.0f, 1.0f);
>+    const float kShininessInitial = 0.0f;
>+
>+    GLColor32F actualColor;
>+    float actualShininess;
>+
>+    std::vector<GLenum> pnames = {
>+        GL_AMBIENT,
>+        GL_DIFFUSE,
>+        GL_SPECULAR,
>+        GL_EMISSION,
>+    };
>+
>+    std::vector<GLColor32F> colors = {
>+        kAmbientInitial,
>+        kDiffuseInitial,
>+        kSpecularInitial,
>+        kEmissiveInitial,
>+    };
>+
>+    for (size_t i = 0; i < pnames.size(); i++)
>+    {
>+        glGetMaterialfv(GL_FRONT, pnames[i], &actualColor.R);
>+        EXPECT_GL_NO_ERROR();
>+        EXPECT_EQ(colors[i], actualColor);
>+    }
>+
>+    glGetMaterialfv(GL_FRONT, GL_SHININESS, &actualShininess);
>+    EXPECT_GL_NO_ERROR();
>+    EXPECT_EQ(kShininessInitial, actualShininess);
>+}
>+
>+// Check for invalid parameter names.
>+TEST_P(MaterialsTest, InvalidParameter)
>+{
>+    glGetMaterialfv(GL_FRONT, 0, nullptr);
>+    EXPECT_GL_ERROR(GL_INVALID_ENUM);
>+
>+    glGetMaterialfv(GL_FRONT_AND_BACK, GL_AMBIENT, nullptr);
>+    EXPECT_GL_ERROR(GL_INVALID_ENUM);
>+
>+    glMaterialf(GL_FRONT_AND_BACK, GL_AMBIENT, 0.0f);
>+    EXPECT_GL_ERROR(GL_INVALID_ENUM);
>+
>+    glMaterialfv(GL_FRONT, GL_AMBIENT, nullptr);
>+    EXPECT_GL_ERROR(GL_INVALID_ENUM);
>+}
>+
>+// Check that material parameters can be set.
>+TEST_P(MaterialsTest, SetParameters)
>+{
>+    const GLColor32F kAmbientTestValue(1.0f, 1.0f, 1.0f, 1.0f);
>+    const GLColor32F kDiffuseTestValue(0.0f, 0.0f, 0.0f, 0.0f);
>+    const GLColor32F kSpecularTestValue(0.5f, 0.5f, 0.5f, 0.5f);
>+    const GLColor32F kEmissiveTestValue(0.4f, 0.4f, 0.4f, 0.4f);
>+    const float kShininessTestValue = 1.0f;
>+
>+    std::vector<GLenum> pnames = {
>+        GL_AMBIENT,
>+        GL_DIFFUSE,
>+        GL_SPECULAR,
>+        GL_EMISSION,
>+    };
>+
>+    std::vector<GLColor32F> colors = {
>+        kAmbientTestValue,
>+        kDiffuseTestValue,
>+        kSpecularTestValue,
>+        kEmissiveTestValue,
>+    };
>+
>+    GLColor32F actualColor;
>+    float actualShininess;
>+
>+    for (size_t i = 0; i < pnames.size(); i++)
>+    {
>+        glMaterialfv(GL_FRONT_AND_BACK, pnames[i], &colors[i].R);
>+        EXPECT_GL_NO_ERROR();
>+        glGetMaterialfv(GL_FRONT, pnames[i], &actualColor.R);
>+        EXPECT_GL_NO_ERROR();
>+        EXPECT_EQ(colors[i], actualColor);
>+    }
>+
>+    glMaterialf(GL_FRONT_AND_BACK, GL_SHININESS, kShininessTestValue);
>+    EXPECT_GL_NO_ERROR();
>+    glGetMaterialfv(GL_FRONT, GL_SHININESS, &actualShininess);
>+    EXPECT_GL_NO_ERROR();
>+    EXPECT_EQ(kShininessTestValue, actualShininess);
>+}
>+
>+ANGLE_INSTANTIATE_TEST(MaterialsTest, ES1_D3D11(), ES1_OPENGL(), ES1_OPENGLES());
>diff --git a/Source/ThirdParty/ANGLE/src/tests/gl_tests/gles1/MatrixBuiltinsTest.cpp b/Source/ThirdParty/ANGLE/src/tests/gl_tests/gles1/MatrixBuiltinsTest.cpp
>new file mode 100644
>index 00000000000..adf4c9214f6
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/tests/gl_tests/gles1/MatrixBuiltinsTest.cpp
>@@ -0,0 +1,176 @@
>+//
>+// Copyright 2018 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+
>+// MatrixBuiltinsTest.cpp: Tests basic usage of builtin matrix operations.
>+
>+#include "test_utils/ANGLETest.h"
>+#include "test_utils/gl_raii.h"
>+
>+#include "common/matrix_utils.h"
>+#include "util/random_utils.h"
>+
>+#include <stdint.h>
>+
>+using namespace angle;
>+
>+class MatrixBuiltinsTest : public ANGLETest
>+{
>+  protected:
>+    MatrixBuiltinsTest()
>+    {
>+        setWindowWidth(32);
>+        setWindowHeight(32);
>+        setConfigRedBits(8);
>+        setConfigGreenBits(8);
>+        setConfigBlueBits(8);
>+        setConfigAlphaBits(8);
>+        setConfigDepthBits(24);
>+    }
>+};
>+
>+// Test rotation and check the matrix for closeness to a rotation matrix.
>+TEST_P(MatrixBuiltinsTest, Rotate)
>+{
>+    constexpr float angle = 90.0f;
>+    constexpr float x     = 1.0f;
>+    constexpr float y     = 1.0f;
>+    constexpr float z     = 1.0f;
>+
>+    angle::Mat4 testMatrix = angle::Mat4::Rotate(angle, angle::Vector3(x, y, z));
>+
>+    glRotatef(angle, x, y, z);
>+    EXPECT_GL_NO_ERROR();
>+
>+    angle::Mat4 outputMatrix;
>+    glGetFloatv(GL_MODELVIEW_MATRIX, outputMatrix.data());
>+    EXPECT_GL_NO_ERROR();
>+
>+    EXPECT_TRUE(testMatrix.nearlyEqual(0.00001f, outputMatrix));
>+}
>+
>+// Test translation and check the matrix for closeness to a translation matrix.
>+TEST_P(MatrixBuiltinsTest, Translate)
>+{
>+    constexpr float x = 1.0f;
>+    constexpr float y = 1.0f;
>+    constexpr float z = 1.0f;
>+
>+    angle::Mat4 testMatrix = angle::Mat4::Translate(angle::Vector3(x, y, z));
>+
>+    glTranslatef(1.0f, 0.0f, 0.0f);
>+    glTranslatef(0.0f, 1.0f, 0.0f);
>+    glTranslatef(0.0f, 0.0f, 1.0f);
>+    EXPECT_GL_NO_ERROR();
>+
>+    angle::Mat4 outputMatrix;
>+    glGetFloatv(GL_MODELVIEW_MATRIX, outputMatrix.data());
>+    EXPECT_GL_NO_ERROR();
>+
>+    EXPECT_TRUE(testMatrix.nearlyEqual(0.00001f, outputMatrix));
>+}
>+
>+// Test scale and check the matrix for closeness to a scale matrix.
>+TEST_P(MatrixBuiltinsTest, Scale)
>+{
>+    constexpr float x = 3.0f;
>+    constexpr float y = 9.0f;
>+    constexpr float z = 27.0f;
>+
>+    angle::Mat4 testMatrix = angle::Mat4::Scale(angle::Vector3(x, y, z));
>+
>+    glScalef(3.0f, 3.0f, 3.0f);
>+    glScalef(1.0f, 3.0f, 3.0f);
>+    glScalef(1.0f, 1.0f, 3.0f);
>+    EXPECT_GL_NO_ERROR();
>+
>+    angle::Mat4 outputMatrix;
>+    glGetFloatv(GL_MODELVIEW_MATRIX, outputMatrix.data());
>+    EXPECT_GL_NO_ERROR();
>+
>+    EXPECT_TRUE(testMatrix.nearlyEqual(0.00001f, outputMatrix));
>+}
>+
>+// Test frustum projection and check the matrix values.
>+TEST_P(MatrixBuiltinsTest, Frustum)
>+{
>+
>+    constexpr float l = -1.0f;
>+    constexpr float r = 1.0f;
>+    constexpr float b = -1.0f;
>+    constexpr float t = 1.0f;
>+    constexpr float n = 0.1f;
>+    constexpr float f = 1.0f;
>+
>+    angle::Mat4 testMatrix = angle::Mat4::Frustum(l, r, b, t, n, f);
>+
>+    glFrustumf(l, r, b, t, n, f);
>+    EXPECT_GL_NO_ERROR();
>+
>+    angle::Mat4 outputMatrix;
>+    glGetFloatv(GL_MODELVIEW_MATRIX, outputMatrix.data());
>+    EXPECT_GL_NO_ERROR();
>+
>+    EXPECT_TRUE(testMatrix.nearlyEqual(0.00001f, outputMatrix));
>+}
>+
>+// Test orthographic projection and check the matrix values.
>+TEST_P(MatrixBuiltinsTest, Ortho)
>+{
>+    constexpr float l = -1.0f;
>+    constexpr float r = 1.0f;
>+    constexpr float b = -1.0f;
>+    constexpr float t = 1.0f;
>+    constexpr float n = 0.1f;
>+    constexpr float f = 1.0f;
>+
>+    angle::Mat4 testMatrix = angle::Mat4::Ortho(l, r, b, t, n, f);
>+
>+    glOrthof(l, r, b, t, n, f);
>+    EXPECT_GL_NO_ERROR();
>+
>+    angle::Mat4 outputMatrix;
>+    glGetFloatv(GL_MODELVIEW_MATRIX, outputMatrix.data());
>+    EXPECT_GL_NO_ERROR();
>+
>+    EXPECT_TRUE(testMatrix.nearlyEqual(0.00001f, outputMatrix));
>+}
>+
>+// Test that GL_INVALID_VALUE is issued if potential divide by zero situations happen for
>+// glFrustumf.
>+TEST_P(MatrixBuiltinsTest, FrustumNegative)
>+{
>+    glFrustumf(1.0f, 1.0f, 0.0f, 1.0f, 0.1f, 1.0f);
>+    EXPECT_GL_ERROR(GL_INVALID_VALUE);
>+    glFrustumf(0.0f, 1.0f, 1.0f, 1.0f, 0.1f, 1.0f);
>+    EXPECT_GL_ERROR(GL_INVALID_VALUE);
>+    glFrustumf(0.0f, 1.0f, 0.0f, 1.0f, 1.0f, 1.0f);
>+    EXPECT_GL_ERROR(GL_INVALID_VALUE);
>+    glFrustumf(0.0f, 1.0f, 0.0f, 1.0f, 0.0f, 1.0f);
>+    EXPECT_GL_ERROR(GL_INVALID_VALUE);
>+    glFrustumf(0.0f, 1.0f, 0.0f, 1.0f, 1.0f, 0.0f);
>+    EXPECT_GL_ERROR(GL_INVALID_VALUE);
>+    glFrustumf(0.0f, 1.0f, 0.0f, 1.0f, -1.0f, 1.0f);
>+    EXPECT_GL_ERROR(GL_INVALID_VALUE);
>+}
>+
>+// Test that GL_INVALID_VALUE is issued if potential divide by zero situations happen for glOrthof.
>+TEST_P(MatrixBuiltinsTest, OrthoNegative)
>+{
>+    glOrthof(1.0f, 1.0f, 0.0f, 1.0f, 0.1f, 1.0f);
>+    EXPECT_GL_ERROR(GL_INVALID_VALUE);
>+    glOrthof(0.0f, 1.0f, 1.0f, 1.0f, 0.1f, 1.0f);
>+    EXPECT_GL_ERROR(GL_INVALID_VALUE);
>+    glOrthof(0.0f, 1.0f, 0.0f, 1.0f, 1.0f, 1.0f);
>+    EXPECT_GL_ERROR(GL_INVALID_VALUE);
>+    glOrthof(0.0f, 1.0f, 0.0f, 1.0f, 0.0f, 1.0f);
>+    EXPECT_GL_ERROR(GL_INVALID_VALUE);
>+    glOrthof(0.0f, 1.0f, 0.0f, 1.0f, 1.0f, 0.0f);
>+    EXPECT_GL_ERROR(GL_INVALID_VALUE);
>+    glOrthof(0.0f, 1.0f, 0.0f, 1.0f, -1.0f, 1.0f);
>+    EXPECT_GL_ERROR(GL_INVALID_VALUE);
>+}
>+
>+ANGLE_INSTANTIATE_TEST(MatrixBuiltinsTest, ES1_D3D11(), ES1_OPENGL(), ES1_OPENGLES());
>diff --git a/Source/ThirdParty/ANGLE/src/tests/gl_tests/gles1/MatrixLoadTest.cpp b/Source/ThirdParty/ANGLE/src/tests/gl_tests/gles1/MatrixLoadTest.cpp
>new file mode 100644
>index 00000000000..39b6981e150
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/tests/gl_tests/gles1/MatrixLoadTest.cpp
>@@ -0,0 +1,105 @@
>+//
>+// Copyright 2018 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+
>+// MatrixLoadTest.cpp: Tests basic usage of glColor4(f|ub|x).
>+
>+#include "test_utils/ANGLETest.h"
>+#include "test_utils/gl_raii.h"
>+
>+#include "common/matrix_utils.h"
>+#include "util/random_utils.h"
>+
>+#include <stdint.h>
>+
>+using namespace angle;
>+
>+class MatrixLoadTest : public ANGLETest
>+{
>+  protected:
>+    MatrixLoadTest()
>+    {
>+        setWindowWidth(32);
>+        setWindowHeight(32);
>+        setConfigRedBits(8);
>+        setConfigGreenBits(8);
>+        setConfigBlueBits(8);
>+        setConfigAlphaBits(8);
>+        setConfigDepthBits(24);
>+    }
>+};
>+
>+// Checks that a matrix can be loaded.
>+TEST_P(MatrixLoadTest, Basic)
>+{
>+    angle::Mat4 testMatrix(0.0f, 4.0f, 8.0f, 12.0f, 1.0f, 5.0f, 9.0f, 10.0f, 2.0f, 6.0f, 10.0f,
>+                           14.0f, 3.0f, 7.0f, 11.0f, 15.0f);
>+
>+    angle::Mat4 outputMatrix;
>+
>+    glLoadMatrixf(testMatrix.data());
>+    EXPECT_GL_NO_ERROR();
>+
>+    glGetFloatv(GL_MODELVIEW_MATRIX, outputMatrix.data());
>+    EXPECT_GL_NO_ERROR();
>+
>+    EXPECT_EQ(testMatrix, outputMatrix);
>+}
>+
>+// Checks that loading a matrix doesn't affect the matrix below in the stack.
>+TEST_P(MatrixLoadTest, PushPop)
>+{
>+    glPushMatrix();
>+
>+    angle::Mat4 testMatrix(0.0f, 4.0f, 8.0f, 12.0f, 1.0f, 5.0f, 9.0f, 10.0f, 2.0f, 6.0f, 10.0f,
>+                           14.0f, 3.0f, 7.0f, 11.0f, 15.0f);
>+
>+    angle::Mat4 outputMatrix;
>+
>+    glLoadMatrixf(testMatrix.data());
>+    EXPECT_GL_NO_ERROR();
>+
>+    glGetFloatv(GL_MODELVIEW_MATRIX, outputMatrix.data());
>+    EXPECT_GL_NO_ERROR();
>+
>+    EXPECT_EQ(testMatrix, outputMatrix);
>+
>+    glPopMatrix();
>+
>+    glGetFloatv(GL_MODELVIEW_MATRIX, outputMatrix.data());
>+    EXPECT_GL_NO_ERROR();
>+    EXPECT_EQ(angle::Mat4(), outputMatrix);
>+}
>+
>+// Checks that matrices can be loaded for each type of matrix.
>+TEST_P(MatrixLoadTest, Modes)
>+{
>+    angle::Mat4 testMatrix(0.0f, 4.0f, 8.0f, 12.0f, 1.0f, 5.0f, 9.0f, 10.0f, 2.0f, 6.0f, 10.0f,
>+                           14.0f, 3.0f, 7.0f, 11.0f, 15.0f);
>+    angle::Mat4 outputMatrix;
>+
>+    std::vector<std::pair<GLenum, GLenum>> modeTypes = {{GL_PROJECTION, GL_PROJECTION_MATRIX},
>+                                                        {GL_MODELVIEW, GL_MODELVIEW_MATRIX},
>+                                                        {GL_TEXTURE, GL_TEXTURE_MATRIX}};
>+
>+    for (auto modeType : modeTypes)
>+    {
>+        auto mode       = modeType.first;
>+        auto matrixType = modeType.second;
>+
>+        glMatrixMode(mode);
>+        EXPECT_GL_NO_ERROR();
>+        glGetFloatv(matrixType, outputMatrix.data());
>+        EXPECT_GL_NO_ERROR();
>+        EXPECT_EQ(angle::Mat4(), outputMatrix);
>+
>+        glLoadMatrixf(testMatrix.data());
>+        glGetFloatv(matrixType, outputMatrix.data());
>+        EXPECT_GL_NO_ERROR();
>+        EXPECT_EQ(testMatrix, outputMatrix);
>+    }
>+}
>+
>+ANGLE_INSTANTIATE_TEST(MatrixLoadTest, ES1_D3D11(), ES1_OPENGL(), ES1_OPENGLES());
>diff --git a/Source/ThirdParty/ANGLE/src/tests/gl_tests/gles1/MatrixModeTest.cpp b/Source/ThirdParty/ANGLE/src/tests/gl_tests/gles1/MatrixModeTest.cpp
>new file mode 100644
>index 00000000000..954055f53b8
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/tests/gl_tests/gles1/MatrixModeTest.cpp
>@@ -0,0 +1,65 @@
>+//
>+// Copyright 2018 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+
>+// MatrixModeTest.cpp: Tests basic usage of glMatrixMode.
>+
>+#include "test_utils/ANGLETest.h"
>+#include "test_utils/gl_raii.h"
>+
>+#include <vector>
>+
>+using namespace angle;
>+
>+class MatrixModeTest : public ANGLETest
>+{
>+  protected:
>+    MatrixModeTest()
>+    {
>+        setWindowWidth(32);
>+        setWindowHeight(32);
>+        setConfigRedBits(8);
>+        setConfigGreenBits(8);
>+        setConfigBlueBits(8);
>+        setConfigAlphaBits(8);
>+        setConfigDepthBits(24);
>+    }
>+};
>+
>+// State query: Checks the initial state is correct.
>+TEST_P(MatrixModeTest, InitialState)
>+{
>+    GLint matrixMode;
>+    glGetIntegerv(GL_MATRIX_MODE, &matrixMode);
>+    EXPECT_GL_NO_ERROR();
>+    EXPECT_GLENUM_EQ(GL_MODELVIEW, matrixMode);
>+}
>+
>+// Checks for error-generating cases.
>+TEST_P(MatrixModeTest, Negative)
>+{
>+    glMatrixMode(0);
>+    EXPECT_GL_ERROR(GL_INVALID_ENUM);
>+    glMatrixMode(GL_TEXTURE_2D);
>+    EXPECT_GL_ERROR(GL_INVALID_ENUM);
>+}
>+
>+// Checks that matrix mode can be set.
>+TEST_P(MatrixModeTest, Set)
>+{
>+    GLint matrixMode;
>+
>+    std::vector<GLenum> modes = {GL_PROJECTION, GL_MODELVIEW, GL_TEXTURE};
>+
>+    for (auto mode : modes)
>+    {
>+        glMatrixMode(mode);
>+        EXPECT_GL_NO_ERROR();
>+        glGetIntegerv(GL_MATRIX_MODE, &matrixMode);
>+        EXPECT_GLENUM_EQ(mode, matrixMode);
>+    }
>+}
>+
>+ANGLE_INSTANTIATE_TEST(MatrixModeTest, ES1_D3D11(), ES1_OPENGL(), ES1_OPENGLES());
>diff --git a/Source/ThirdParty/ANGLE/src/tests/gl_tests/gles1/MatrixMultTest.cpp b/Source/ThirdParty/ANGLE/src/tests/gl_tests/gles1/MatrixMultTest.cpp
>new file mode 100644
>index 00000000000..7e6a0925b42
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/tests/gl_tests/gles1/MatrixMultTest.cpp
>@@ -0,0 +1,77 @@
>+//
>+// Copyright 2018 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+
>+// MatrixMultTest.cpp: Tests basic usage of glMultMatrix(f|x).
>+
>+#include "test_utils/ANGLETest.h"
>+#include "test_utils/gl_raii.h"
>+
>+#include "common/matrix_utils.h"
>+#include "util/random_utils.h"
>+
>+#include <stdint.h>
>+
>+using namespace angle;
>+
>+class MatrixMultTest : public ANGLETest
>+{
>+  protected:
>+    MatrixMultTest()
>+    {
>+        setWindowWidth(32);
>+        setWindowHeight(32);
>+        setConfigRedBits(8);
>+        setConfigGreenBits(8);
>+        setConfigBlueBits(8);
>+        setConfigAlphaBits(8);
>+        setConfigDepthBits(24);
>+    }
>+};
>+
>+// Multiplies identity matrix with itself.
>+TEST_P(MatrixMultTest, Identity)
>+{
>+    angle::Mat4 testMatrix;
>+    angle::Mat4 outputMatrix;
>+
>+    glMultMatrixf(testMatrix.data());
>+    EXPECT_GL_NO_ERROR();
>+
>+    glGetFloatv(GL_MODELVIEW_MATRIX, outputMatrix.data());
>+    EXPECT_GL_NO_ERROR();
>+
>+    EXPECT_EQ(angle::Mat4(), outputMatrix);
>+}
>+
>+// Multiplies translation matrix and checks matrix underneath in stack is not affected.
>+TEST_P(MatrixMultTest, Translation)
>+{
>+    glPushMatrix();
>+
>+    angle::Mat4 testMatrix = angle::Mat4::Translate(angle::Vector3(1.0f, 0.0f, 0.0f));
>+
>+    angle::Mat4 outputMatrix;
>+
>+    glMultMatrixf(testMatrix.data());
>+    EXPECT_GL_NO_ERROR();
>+
>+    glMultMatrixf(testMatrix.data());
>+    EXPECT_GL_NO_ERROR();
>+
>+    glGetFloatv(GL_MODELVIEW_MATRIX, outputMatrix.data());
>+    EXPECT_GL_NO_ERROR();
>+
>+    EXPECT_EQ(angle::Mat4::Translate(angle::Vector3(2.0f, 0.0f, 0.0f)), outputMatrix);
>+
>+    glPopMatrix();
>+
>+    glGetFloatv(GL_MODELVIEW_MATRIX, outputMatrix.data());
>+    EXPECT_GL_NO_ERROR();
>+
>+    EXPECT_EQ(angle::Mat4(), outputMatrix);
>+}
>+
>+ANGLE_INSTANTIATE_TEST(MatrixMultTest, ES1_D3D11(), ES1_OPENGL(), ES1_OPENGLES());
>diff --git a/Source/ThirdParty/ANGLE/src/tests/gl_tests/gles1/MatrixStackTest.cpp b/Source/ThirdParty/ANGLE/src/tests/gl_tests/gles1/MatrixStackTest.cpp
>new file mode 100644
>index 00000000000..d70f78599e1
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/tests/gl_tests/gles1/MatrixStackTest.cpp
>@@ -0,0 +1,115 @@
>+//
>+// Copyright 2018 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+
>+// MatrixStackTest.cpp: Tests basic usage of gl(Push|Pop)Matrix.
>+
>+#include "test_utils/ANGLETest.h"
>+#include "test_utils/gl_raii.h"
>+
>+#include <vector>
>+
>+using namespace angle;
>+
>+class MatrixStackTest : public ANGLETest
>+{
>+  protected:
>+    MatrixStackTest()
>+    {
>+        setWindowWidth(32);
>+        setWindowHeight(32);
>+        setConfigRedBits(8);
>+        setConfigGreenBits(8);
>+        setConfigBlueBits(8);
>+        setConfigAlphaBits(8);
>+        setConfigDepthBits(24);
>+    }
>+};
>+
>+// State query: Checks the initial state is correct; that there is only one matrix on the stack.
>+TEST_P(MatrixStackTest, InitialState)
>+{
>+    glMatrixMode(GL_MODELVIEW);
>+    glPopMatrix();
>+    EXPECT_GL_ERROR(GL_STACK_UNDERFLOW);
>+
>+    glMatrixMode(GL_PROJECTION);
>+    glPopMatrix();
>+    EXPECT_GL_ERROR(GL_STACK_UNDERFLOW);
>+
>+    glMatrixMode(GL_TEXTURE);
>+    glPopMatrix();
>+    EXPECT_GL_ERROR(GL_STACK_UNDERFLOW);
>+}
>+
>+// Tests that caps are greater than or equal to spec minimums and that we can actually push them
>+// that much.
>+TEST_P(MatrixStackTest, Limits)
>+{
>+    GLint modelviewMatrixMax;
>+    GLint projectionMatrixMax;
>+    GLint textureMatrixMax;
>+    GLint textureUnits;  // For iterating over texture matrices
>+
>+    glGetIntegerv(GL_MAX_MODELVIEW_STACK_DEPTH, &modelviewMatrixMax);
>+    glGetIntegerv(GL_MAX_PROJECTION_STACK_DEPTH, &projectionMatrixMax);
>+    glGetIntegerv(GL_MAX_TEXTURE_STACK_DEPTH, &textureMatrixMax);
>+    glGetIntegerv(GL_MAX_TEXTURE_UNITS, &textureUnits);
>+
>+    EXPECT_GE(modelviewMatrixMax, 16);
>+    EXPECT_GE(projectionMatrixMax, 2);
>+    EXPECT_GE(textureMatrixMax, 2);
>+
>+    glMatrixMode(GL_MODELVIEW);
>+
>+    for (int i = 0; i < modelviewMatrixMax; i++)
>+    {
>+        glPushMatrix();
>+        if (i == modelviewMatrixMax - 1)
>+        {
>+            EXPECT_GL_ERROR(GL_STACK_OVERFLOW);
>+        }
>+        else
>+        {
>+            EXPECT_GL_NO_ERROR();
>+        }
>+    }
>+
>+    glMatrixMode(GL_PROJECTION);
>+
>+    for (int i = 0; i < projectionMatrixMax; i++)
>+    {
>+        glPushMatrix();
>+        if (i == projectionMatrixMax - 1)
>+        {
>+            EXPECT_GL_ERROR(GL_STACK_OVERFLOW);
>+        }
>+        else
>+        {
>+            EXPECT_GL_NO_ERROR();
>+        }
>+    }
>+
>+    glMatrixMode(GL_TEXTURE);
>+
>+    for (int i = 0; i < textureUnits; i++)
>+    {
>+        glActiveTexture(GL_TEXTURE0 + i);
>+        for (int j = 0; j < textureMatrixMax; j++)
>+        {
>+            glPushMatrix();
>+            if (j == textureMatrixMax - 1)
>+            {
>+                EXPECT_GL_ERROR(GL_STACK_OVERFLOW);
>+            }
>+            else
>+            {
>+                EXPECT_GL_NO_ERROR();
>+            }
>+        }
>+    }
>+}
>+
>+ANGLE_INSTANTIATE_TEST(MatrixStackTest, ES1_D3D11(), ES1_OPENGL(), ES1_OPENGLES());
>diff --git a/Source/ThirdParty/ANGLE/src/tests/gl_tests/gles1/PointParameterTest.cpp b/Source/ThirdParty/ANGLE/src/tests/gl_tests/gles1/PointParameterTest.cpp
>new file mode 100644
>index 00000000000..208d75d5b6e
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/tests/gl_tests/gles1/PointParameterTest.cpp
>@@ -0,0 +1,156 @@
>+//
>+// Copyright 2018 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+
>+// PointParameterTest.cpp: Tests basic usage of GLES1 point parameters.
>+
>+#include "test_utils/ANGLETest.h"
>+#include "test_utils/gl_raii.h"
>+
>+#include "util/random_utils.h"
>+
>+#include <stdint.h>
>+
>+using namespace angle;
>+
>+class PointParameterTest : public ANGLETest
>+{
>+  protected:
>+    PointParameterTest()
>+    {
>+        setWindowWidth(32);
>+        setWindowHeight(32);
>+        setConfigRedBits(8);
>+        setConfigGreenBits(8);
>+        setConfigBlueBits(8);
>+        setConfigAlphaBits(8);
>+        setConfigDepthBits(24);
>+    }
>+};
>+
>+// Checks that disable / enable works as expected.
>+TEST_P(PointParameterTest, InitialState)
>+{
>+    GLfloat params[3] = {};
>+    glGetFloatv(GL_POINT_SIZE, params);
>+    EXPECT_GL_NO_ERROR();
>+    EXPECT_EQ(1.0f, params[0]);
>+
>+    EXPECT_GL_FALSE(glIsEnabled(GL_POINT_SMOOTH));
>+    EXPECT_GL_NO_ERROR();
>+
>+    glGetFloatv(GL_POINT_SIZE_MIN, params);
>+    EXPECT_GL_NO_ERROR();
>+    EXPECT_EQ(0.0f, params[0]);
>+
>+    // The user-specified point size, GL_POINT_SIZE_MAX,
>+    // is initially equal to the implementation maximum.
>+    GLfloat range[2] = {};
>+    glGetFloatv(GL_ALIASED_POINT_SIZE_RANGE, range);
>+    EXPECT_GL_NO_ERROR();
>+
>+    glGetFloatv(GL_POINT_SIZE_MAX, params);
>+    EXPECT_GL_NO_ERROR();
>+    EXPECT_EQ(range[1], params[0]);
>+
>+    glGetFloatv(GL_POINT_FADE_THRESHOLD_SIZE, params);
>+    EXPECT_GL_NO_ERROR();
>+    EXPECT_EQ(1.0f, params[0]);
>+
>+    glGetFloatv(GL_POINT_DISTANCE_ATTENUATION, params);
>+    EXPECT_GL_NO_ERROR();
>+    EXPECT_EQ(1.0f, params[0]);
>+    EXPECT_EQ(0.0f, params[1]);
>+    EXPECT_EQ(0.0f, params[2]);
>+
>+    EXPECT_GL_FALSE(glIsEnabled(GL_POINT_SPRITE_OES));
>+    EXPECT_GL_NO_ERROR();
>+}
>+
>+// Negative test for parameter names
>+TEST_P(PointParameterTest, NegativeEnum)
>+{
>+    glPointParameterf(0, 0.0f);
>+    EXPECT_GL_ERROR(GL_INVALID_ENUM);
>+
>+    glPointParameterfv(0, nullptr);
>+    EXPECT_GL_ERROR(GL_INVALID_ENUM);
>+
>+    glPointParameterf(GL_POINT_DISTANCE_ATTENUATION, 0.0f);
>+    EXPECT_GL_ERROR(GL_INVALID_ENUM);
>+}
>+
>+// Negative test for parameter values
>+TEST_P(PointParameterTest, NegativeValue)
>+{
>+    glPointParameterf(GL_POINT_SIZE_MIN, -1.0f);
>+    EXPECT_GL_ERROR(GL_INVALID_VALUE);
>+
>+    glPointParameterf(GL_POINT_SIZE_MAX, -1.0f);
>+    EXPECT_GL_ERROR(GL_INVALID_VALUE);
>+
>+    glPointParameterf(GL_POINT_FADE_THRESHOLD_SIZE, -1.0f);
>+    EXPECT_GL_ERROR(GL_INVALID_VALUE);
>+
>+    GLfloat badPointDistanceAttenuation[3] = {1.0f, -1.0f, 1.0f};
>+    glPointParameterfv(GL_POINT_DISTANCE_ATTENUATION, badPointDistanceAttenuation);
>+    EXPECT_GL_ERROR(GL_INVALID_VALUE);
>+
>+    glPointSize(-1.0f);
>+    EXPECT_GL_ERROR(GL_INVALID_VALUE);
>+}
>+
>+// Tests that point parameters can be set.
>+TEST_P(PointParameterTest, Set)
>+{
>+    GLfloat params[3] = {};
>+
>+    GLfloat range[2] = {};
>+    glGetFloatv(GL_ALIASED_POINT_SIZE_RANGE, range);
>+    EXPECT_GL_NO_ERROR();
>+
>+    if (range[0] != range[1])
>+    {
>+        glPointSize(range[0]);
>+        EXPECT_GL_NO_ERROR();
>+        glGetFloatv(GL_POINT_SIZE, params);
>+        EXPECT_GL_NO_ERROR();
>+        EXPECT_EQ(range[0], params[0]);
>+
>+        glPointSize(range[1]);
>+        EXPECT_GL_NO_ERROR();
>+        glGetFloatv(GL_POINT_SIZE, params);
>+        EXPECT_GL_NO_ERROR();
>+        EXPECT_EQ(range[1], params[0]);
>+    }
>+
>+    glPointParameterf(GL_POINT_SIZE_MIN, 1.0f);
>+    EXPECT_GL_NO_ERROR();
>+    glPointParameterf(GL_POINT_SIZE_MAX, 10.0f);
>+    EXPECT_GL_NO_ERROR();
>+
>+    glGetFloatv(GL_POINT_SIZE_MIN, params);
>+    EXPECT_GL_NO_ERROR();
>+    EXPECT_EQ(1.0f, params[0]);
>+
>+    glGetFloatv(GL_POINT_SIZE_MAX, params);
>+    EXPECT_GL_NO_ERROR();
>+    EXPECT_EQ(10.0f, params[0]);
>+
>+    glPointParameterf(GL_POINT_FADE_THRESHOLD_SIZE, 5.0f);
>+    EXPECT_GL_NO_ERROR();
>+    glGetFloatv(GL_POINT_FADE_THRESHOLD_SIZE, params);
>+    EXPECT_EQ(5.0f, params[0]);
>+
>+    GLfloat distanceAttenuation[3] = {1.0f, 2.0f, 3.0f};
>+    glPointParameterfv(GL_POINT_DISTANCE_ATTENUATION, distanceAttenuation);
>+    EXPECT_GL_NO_ERROR();
>+    glGetFloatv(GL_POINT_DISTANCE_ATTENUATION, params);
>+    EXPECT_EQ(1.0f, params[0]);
>+    EXPECT_EQ(2.0f, params[1]);
>+    EXPECT_EQ(3.0f, params[2]);
>+}
>+
>+ANGLE_INSTANTIATE_TEST(PointParameterTest, ES1_D3D11(), ES1_OPENGL(), ES1_OPENGLES());
>diff --git a/Source/ThirdParty/ANGLE/src/tests/gl_tests/gles1/PointSpriteTest.cpp b/Source/ThirdParty/ANGLE/src/tests/gl_tests/gles1/PointSpriteTest.cpp
>new file mode 100644
>index 00000000000..5091ae17708
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/tests/gl_tests/gles1/PointSpriteTest.cpp
>@@ -0,0 +1,87 @@
>+//
>+// Copyright 2018 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+
>+// PointSpriteTest.cpp: Tests basic usage of GLES1 point sprites.
>+
>+#include "test_utils/ANGLETest.h"
>+#include "test_utils/gl_raii.h"
>+
>+#include "util/random_utils.h"
>+
>+#include <stdint.h>
>+
>+using namespace angle;
>+
>+class PointSpriteTest : public ANGLETest
>+{
>+  protected:
>+    PointSpriteTest()
>+    {
>+        setWindowWidth(1);
>+        setWindowHeight(1);
>+        setConfigRedBits(8);
>+        setConfigGreenBits(8);
>+        setConfigBlueBits(8);
>+        setConfigAlphaBits(8);
>+        setConfigDepthBits(24);
>+    }
>+};
>+
>+// Checks that triangles are not treated as point sprites, and that cached state
>+// is properly invalidated when the primitive mode changes.
>+TEST_P(PointSpriteTest, TrianglesNotTreatedAsPointSprites)
>+{
>+    glClearColor(0.0f, 0.0f, 0.0f, 1.0f);
>+
>+    glEnable(GL_POINT_SPRITE_OES);
>+    glTexEnvi(GL_POINT_SPRITE_OES, GL_COORD_REPLACE_OES, GL_TRUE);
>+
>+    glEnable(GL_TEXTURE_2D);
>+
>+    GLuint tex;
>+    glGenTextures(1, &tex);
>+    glBindTexture(GL_TEXTURE_2D, tex);
>+
>+    // A 3x3 texture where the top right corner is green. Rendered with
>+    // triangles + texture coordinate 1,1 this is always green, but rendered as
>+    // a point sprite, red will be used as we are using nearest filtering and we
>+    // would be favoring only the red parts of the image in point coordinates.
>+    GLubyte texture[] = {
>+        0xff, 0x00, 0x00, 0xff, 0x00, 0x00, 0xff, 0x00, 0x00, 0xff, 0x00, 0x00, 0xff, 0x00,
>+        0x00, 0xff, 0x00, 0x00, 0xff, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0xff, 0x00,
>+    };
>+
>+    glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
>+    glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB, 3, 3, 0, GL_RGB, GL_UNSIGNED_BYTE, texture);
>+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
>+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
>+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
>+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
>+
>+    // The first coordinate, 0.9f 0.9f should be sufficiently shifted to the right
>+    // that the green part of the point sprite is hidden.
>+    std::vector<float> mPositions = {
>+        0.9f, 0.9f, -0.9f, 0.9f, 0.9f, -0.9f,
>+    };
>+
>+    glEnableClientState(GL_VERTEX_ARRAY);
>+    glMultiTexCoord4f(GL_TEXTURE0, 1.0f, 1.0f, 0.0f, 0.0f);
>+    glVertexPointer(2, GL_FLOAT, 0, mPositions.data());
>+
>+    glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
>+
>+    glDrawArrays(GL_TRIANGLES, 0, 3);
>+
>+    EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::green);
>+
>+    glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
>+
>+    glDrawArrays(GL_POINTS, 0, 1);
>+
>+    EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::red);
>+}
>+
>+ANGLE_INSTANTIATE_TEST(PointSpriteTest, ES1_D3D11(), ES1_OPENGL(), ES1_OPENGLES());
>\ No newline at end of file
>diff --git a/Source/ThirdParty/ANGLE/src/tests/gl_tests/gles1/ShadeModelTest.cpp b/Source/ThirdParty/ANGLE/src/tests/gl_tests/gles1/ShadeModelTest.cpp
>new file mode 100644
>index 00000000000..711de47e7a7
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/tests/gl_tests/gles1/ShadeModelTest.cpp
>@@ -0,0 +1,71 @@
>+//
>+// Copyright 2018 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+
>+// ShadeModelTest.cpp: Tests the shade model API.
>+
>+#include "test_utils/ANGLETest.h"
>+#include "test_utils/gl_raii.h"
>+
>+#include "util/random_utils.h"
>+
>+#include <stdint.h>
>+
>+using namespace angle;
>+
>+class ShadeModelTest : public ANGLETest
>+{
>+  protected:
>+    ShadeModelTest()
>+    {
>+        setWindowWidth(32);
>+        setWindowHeight(32);
>+        setConfigRedBits(8);
>+        setConfigGreenBits(8);
>+        setConfigBlueBits(8);
>+        setConfigAlphaBits(8);
>+        setConfigDepthBits(24);
>+    }
>+};
>+
>+// Checks that the initial state is correct.
>+TEST_P(ShadeModelTest, InitialState)
>+{
>+    GLint shadeModel = 0;
>+    glGetIntegerv(GL_SHADE_MODEL, &shadeModel);
>+    EXPECT_GL_NO_ERROR();
>+
>+    EXPECT_GLENUM_EQ(GL_SMOOTH, shadeModel);
>+}
>+
>+// Negative test for shade model.
>+TEST_P(ShadeModelTest, Negative)
>+{
>+    glShadeModel(GL_TEXTURE_2D);
>+    EXPECT_GL_ERROR(GL_INVALID_ENUM);
>+}
>+
>+// Checks that the state can be set.
>+TEST_P(ShadeModelTest, Set)
>+{
>+    glShadeModel(GL_FLAT);
>+    EXPECT_GL_NO_ERROR();
>+
>+    GLint shadeModel;
>+    glGetIntegerv(GL_SHADE_MODEL, &shadeModel);
>+    EXPECT_GL_NO_ERROR();
>+
>+    EXPECT_GLENUM_EQ(GL_FLAT, shadeModel);
>+
>+    glShadeModel(GL_SMOOTH);
>+    EXPECT_GL_NO_ERROR();
>+
>+    glGetIntegerv(GL_SHADE_MODEL, &shadeModel);
>+    EXPECT_GL_NO_ERROR();
>+
>+    EXPECT_GLENUM_EQ(GL_SMOOTH, shadeModel);
>+}
>+
>+ANGLE_INSTANTIATE_TEST(ShadeModelTest, ES1_D3D11(), ES1_OPENGL(), ES1_OPENGLES());
>diff --git a/Source/ThirdParty/ANGLE/src/tests/gl_tests/gles1/TextureEnvTest.cpp b/Source/ThirdParty/ANGLE/src/tests/gl_tests/gles1/TextureEnvTest.cpp
>new file mode 100644
>index 00000000000..9e4fa8db824
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/tests/gl_tests/gles1/TextureEnvTest.cpp
>@@ -0,0 +1,375 @@
>+//
>+// Copyright 2018 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+
>+// TextureEnvTest.cpp: Tests basic usage of texture environments.
>+
>+#include "test_utils/ANGLETest.h"
>+#include "test_utils/gl_raii.h"
>+
>+#include "util/random_utils.h"
>+
>+#include <stdint.h>
>+
>+using namespace angle;
>+
>+class TextureEnvTest : public ANGLETest
>+{
>+  protected:
>+    TextureEnvTest()
>+    {
>+        setWindowWidth(32);
>+        setWindowHeight(32);
>+        setConfigRedBits(8);
>+        setConfigGreenBits(8);
>+        setConfigBlueBits(8);
>+        setConfigAlphaBits(8);
>+        setConfigDepthBits(24);
>+    }
>+
>+    void verifyEnvironment(GLenum mode,
>+                           GLenum combineRgb,
>+                           GLenum combineAlpha,
>+                           GLenum src0Rgb,
>+                           GLenum src0Alpha,
>+                           GLenum src1Rgb,
>+                           GLenum src1Alpha,
>+                           GLenum src2Rgb,
>+                           GLenum src2Alpha,
>+                           GLenum op0Rgb,
>+                           GLenum op0Alpha,
>+                           GLenum op1Rgb,
>+                           GLenum op1Alpha,
>+                           GLenum op2Rgb,
>+                           GLenum op2Alpha,
>+                           const GLColor32F &envColor,
>+                           GLfloat rgbScale,
>+                           GLfloat alphaScale)
>+    {
>+
>+        GLfloat actualParams[4] = {};
>+
>+        glGetTexEnvfv(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, actualParams);
>+        EXPECT_GL_NO_ERROR();
>+        EXPECT_GLENUM_EQ(mode, actualParams[0]);
>+
>+        glGetTexEnvfv(GL_TEXTURE_ENV, GL_COMBINE_RGB, actualParams);
>+        EXPECT_GL_NO_ERROR();
>+        EXPECT_GLENUM_EQ(combineRgb, actualParams[0]);
>+
>+        glGetTexEnvfv(GL_TEXTURE_ENV, GL_COMBINE_ALPHA, actualParams);
>+        EXPECT_GL_NO_ERROR();
>+        EXPECT_GLENUM_EQ(combineAlpha, actualParams[0]);
>+
>+        glGetTexEnvfv(GL_TEXTURE_ENV, GL_SRC0_RGB, actualParams);
>+        EXPECT_GL_NO_ERROR();
>+        EXPECT_GLENUM_EQ(src0Rgb, actualParams[0]);
>+
>+        glGetTexEnvfv(GL_TEXTURE_ENV, GL_SRC0_ALPHA, actualParams);
>+        EXPECT_GL_NO_ERROR();
>+        EXPECT_GLENUM_EQ(src0Alpha, actualParams[0]);
>+
>+        glGetTexEnvfv(GL_TEXTURE_ENV, GL_SRC1_RGB, actualParams);
>+        EXPECT_GL_NO_ERROR();
>+        EXPECT_GLENUM_EQ(src1Rgb, actualParams[0]);
>+
>+        glGetTexEnvfv(GL_TEXTURE_ENV, GL_SRC1_ALPHA, actualParams);
>+        EXPECT_GL_NO_ERROR();
>+        EXPECT_GLENUM_EQ(src1Alpha, actualParams[0]);
>+
>+        glGetTexEnvfv(GL_TEXTURE_ENV, GL_SRC2_RGB, actualParams);
>+        EXPECT_GL_NO_ERROR();
>+        EXPECT_GLENUM_EQ(src2Rgb, actualParams[0]);
>+
>+        glGetTexEnvfv(GL_TEXTURE_ENV, GL_SRC2_ALPHA, actualParams);
>+        EXPECT_GL_NO_ERROR();
>+        EXPECT_GLENUM_EQ(src2Alpha, actualParams[0]);
>+
>+        glGetTexEnvfv(GL_TEXTURE_ENV, GL_OPERAND0_RGB, actualParams);
>+        EXPECT_GL_NO_ERROR();
>+        EXPECT_GLENUM_EQ(op0Rgb, actualParams[0]);
>+
>+        glGetTexEnvfv(GL_TEXTURE_ENV, GL_OPERAND0_ALPHA, actualParams);
>+        EXPECT_GL_NO_ERROR();
>+        EXPECT_GLENUM_EQ(op0Alpha, actualParams[0]);
>+
>+        glGetTexEnvfv(GL_TEXTURE_ENV, GL_OPERAND1_RGB, actualParams);
>+        EXPECT_GL_NO_ERROR();
>+        EXPECT_GLENUM_EQ(op1Rgb, actualParams[0]);
>+
>+        glGetTexEnvfv(GL_TEXTURE_ENV, GL_OPERAND1_ALPHA, actualParams);
>+        EXPECT_GL_NO_ERROR();
>+        EXPECT_GLENUM_EQ(op1Alpha, actualParams[0]);
>+
>+        glGetTexEnvfv(GL_TEXTURE_ENV, GL_OPERAND2_RGB, actualParams);
>+        EXPECT_GL_NO_ERROR();
>+        EXPECT_GLENUM_EQ(op2Rgb, actualParams[0]);
>+
>+        glGetTexEnvfv(GL_TEXTURE_ENV, GL_OPERAND2_ALPHA, actualParams);
>+        EXPECT_GL_NO_ERROR();
>+        EXPECT_GLENUM_EQ(op2Alpha, actualParams[0]);
>+
>+        glGetTexEnvfv(GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, actualParams);
>+        EXPECT_GL_NO_ERROR();
>+        EXPECT_EQ(envColor.R, actualParams[0]);
>+        EXPECT_EQ(envColor.G, actualParams[1]);
>+        EXPECT_EQ(envColor.B, actualParams[2]);
>+        EXPECT_EQ(envColor.A, actualParams[3]);
>+
>+        glGetTexEnvfv(GL_TEXTURE_ENV, GL_RGB_SCALE, actualParams);
>+        EXPECT_GL_NO_ERROR();
>+        EXPECT_EQ(rgbScale, actualParams[0]);
>+
>+        glGetTexEnvfv(GL_TEXTURE_ENV, GL_ALPHA_SCALE, actualParams);
>+        EXPECT_GL_NO_ERROR();
>+        EXPECT_EQ(alphaScale, actualParams[0]);
>+    }
>+};
>+
>+// Initial state check.
>+TEST_P(TextureEnvTest, InitialState)
>+{
>+    GLint numUnits;
>+    glGetIntegerv(GL_MAX_TEXTURE_UNITS, &numUnits);
>+    EXPECT_GL_NO_ERROR();
>+
>+    for (int i = 0; i < numUnits; i++)
>+    {
>+        glActiveTexture(GL_TEXTURE0 + i);
>+        EXPECT_GL_NO_ERROR();
>+
>+        verifyEnvironment(GL_MODULATE,                         // envMode
>+                          GL_MODULATE,                         // combineRgb
>+                          GL_MODULATE,                         // combineAlpha
>+                          GL_TEXTURE,                          // src0Rgb
>+                          GL_TEXTURE,                          // src0Alpha
>+                          GL_PREVIOUS,                         // src1Rgb
>+                          GL_PREVIOUS,                         // src1Alpha
>+                          GL_CONSTANT,                         // src2Rgb
>+                          GL_CONSTANT,                         // src2Alpha
>+                          GL_SRC_COLOR,                        // op0Rgb
>+                          GL_SRC_ALPHA,                        // op0Alpha
>+                          GL_SRC_COLOR,                        // op1Rgb
>+                          GL_SRC_ALPHA,                        // op1Alpha
>+                          GL_SRC_ALPHA,                        // op2Rgb
>+                          GL_SRC_ALPHA,                        // op2Alpha
>+                          GLColor32F(0.0f, 0.0f, 0.0f, 0.0f),  // envColor
>+                          1.0f,                                // rgbScale
>+                          1.0f                                 // alphaScale
>+        );
>+    }
>+}
>+
>+// Negative test for parameter names.
>+TEST_P(TextureEnvTest, NegativeParameter)
>+{
>+    glTexEnvfv(0, GL_ALPHA_SCALE, nullptr);
>+    EXPECT_GL_ERROR(GL_INVALID_ENUM);
>+    glTexEnvfv(GL_ALPHA_SCALE, GL_ALPHA_SCALE, nullptr);
>+    EXPECT_GL_ERROR(GL_INVALID_ENUM);
>+    glTexEnvfv(GL_TEXTURE_ENV, 0, nullptr);
>+    EXPECT_GL_ERROR(GL_INVALID_ENUM);
>+}
>+
>+// Negative test for parameter values.
>+TEST_P(TextureEnvTest, NegativeValues)
>+{
>+    glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, 0.0f);
>+    EXPECT_GL_ERROR(GL_INVALID_VALUE);
>+
>+    glTexEnvf(GL_TEXTURE_ENV, GL_COMBINE_RGB, 0.0f);
>+    EXPECT_GL_ERROR(GL_INVALID_VALUE);
>+
>+    glTexEnvf(GL_TEXTURE_ENV, GL_COMBINE_ALPHA, 0.0f);
>+    EXPECT_GL_ERROR(GL_INVALID_VALUE);
>+
>+    glTexEnvf(GL_TEXTURE_ENV, GL_SRC0_RGB, 0.0f);
>+    EXPECT_GL_ERROR(GL_INVALID_VALUE);
>+    glTexEnvf(GL_TEXTURE_ENV, GL_SRC1_RGB, 0.0f);
>+    EXPECT_GL_ERROR(GL_INVALID_VALUE);
>+    glTexEnvf(GL_TEXTURE_ENV, GL_SRC2_RGB, 0.0f);
>+    EXPECT_GL_ERROR(GL_INVALID_VALUE);
>+    glTexEnvf(GL_TEXTURE_ENV, GL_SRC0_ALPHA, 0.0f);
>+    EXPECT_GL_ERROR(GL_INVALID_VALUE);
>+    glTexEnvf(GL_TEXTURE_ENV, GL_SRC1_ALPHA, 0.0f);
>+    EXPECT_GL_ERROR(GL_INVALID_VALUE);
>+    glTexEnvf(GL_TEXTURE_ENV, GL_SRC2_ALPHA, 0.0f);
>+    EXPECT_GL_ERROR(GL_INVALID_VALUE);
>+
>+    glTexEnvf(GL_TEXTURE_ENV, GL_OPERAND0_RGB, 0.0f);
>+    EXPECT_GL_ERROR(GL_INVALID_VALUE);
>+    glTexEnvf(GL_TEXTURE_ENV, GL_OPERAND1_RGB, 0.0f);
>+    EXPECT_GL_ERROR(GL_INVALID_VALUE);
>+    glTexEnvf(GL_TEXTURE_ENV, GL_OPERAND2_RGB, 0.0f);
>+    EXPECT_GL_ERROR(GL_INVALID_VALUE);
>+    glTexEnvf(GL_TEXTURE_ENV, GL_OPERAND0_ALPHA, 0.0f);
>+    EXPECT_GL_ERROR(GL_INVALID_VALUE);
>+    glTexEnvf(GL_TEXTURE_ENV, GL_OPERAND1_ALPHA, 0.0f);
>+    EXPECT_GL_ERROR(GL_INVALID_VALUE);
>+    glTexEnvf(GL_TEXTURE_ENV, GL_OPERAND2_ALPHA, 0.0f);
>+    EXPECT_GL_ERROR(GL_INVALID_VALUE);
>+
>+    glTexEnvf(GL_TEXTURE_ENV, GL_COMBINE_ALPHA, (GLfloat)GL_DOT3_RGB);
>+    EXPECT_GL_ERROR(GL_INVALID_VALUE);
>+    glTexEnvf(GL_TEXTURE_ENV, GL_COMBINE_ALPHA, (GLfloat)GL_DOT3_RGBA);
>+    EXPECT_GL_ERROR(GL_INVALID_VALUE);
>+
>+    glTexEnvf(GL_TEXTURE_ENV, GL_OPERAND0_ALPHA, (GLfloat)GL_SRC_COLOR);
>+    EXPECT_GL_ERROR(GL_INVALID_VALUE);
>+    glTexEnvf(GL_TEXTURE_ENV, GL_OPERAND0_ALPHA, (GLfloat)GL_ONE_MINUS_SRC_COLOR);
>+    EXPECT_GL_ERROR(GL_INVALID_VALUE);
>+    glTexEnvf(GL_TEXTURE_ENV, GL_OPERAND1_ALPHA, (GLfloat)GL_SRC_COLOR);
>+    EXPECT_GL_ERROR(GL_INVALID_VALUE);
>+    glTexEnvf(GL_TEXTURE_ENV, GL_OPERAND1_ALPHA, (GLfloat)GL_ONE_MINUS_SRC_COLOR);
>+    EXPECT_GL_ERROR(GL_INVALID_VALUE);
>+    glTexEnvf(GL_TEXTURE_ENV, GL_OPERAND2_ALPHA, (GLfloat)GL_SRC_COLOR);
>+    EXPECT_GL_ERROR(GL_INVALID_VALUE);
>+    glTexEnvf(GL_TEXTURE_ENV, GL_OPERAND2_ALPHA, (GLfloat)GL_ONE_MINUS_SRC_COLOR);
>+    EXPECT_GL_ERROR(GL_INVALID_VALUE);
>+
>+    glTexEnvf(GL_TEXTURE_ENV, GL_RGB_SCALE, 0.5f);
>+    EXPECT_GL_ERROR(GL_INVALID_VALUE);
>+    glTexEnvf(GL_TEXTURE_ENV, GL_RGB_SCALE, 3.0f);
>+    EXPECT_GL_ERROR(GL_INVALID_VALUE);
>+    glTexEnvf(GL_TEXTURE_ENV, GL_ALPHA_SCALE, 0.5f);
>+    EXPECT_GL_ERROR(GL_INVALID_VALUE);
>+    glTexEnvf(GL_TEXTURE_ENV, GL_ALPHA_SCALE, 3.0f);
>+    EXPECT_GL_ERROR(GL_INVALID_VALUE);
>+}
>+
>+// Checks that texture environment state can be set.
>+TEST_P(TextureEnvTest, Set)
>+{
>+    const int kTrials = 1000;
>+
>+    angle::RNG rng(0);
>+
>+    GLint numUnits;
>+    glGetIntegerv(GL_MAX_TEXTURE_UNITS, &numUnits);
>+    EXPECT_GL_NO_ERROR();
>+
>+    std::vector<GLenum> validUnits(numUnits);
>+    for (int i = 0; i < numUnits; i++)
>+    {
>+        validUnits[i] = GL_TEXTURE0 + i;
>+    }
>+
>+    std::vector<GLenum> validEnvModes = {
>+        GL_ADD, GL_BLEND, GL_COMBINE, GL_DECAL, GL_MODULATE, GL_REPLACE,
>+    };
>+
>+    std::vector<GLenum> validCombineRgbs = {
>+        GL_MODULATE, GL_REPLACE,     GL_ADD,      GL_ADD_SIGNED,
>+        GL_SUBTRACT, GL_INTERPOLATE, GL_DOT3_RGB, GL_DOT3_RGBA,
>+    };
>+
>+    std::vector<GLenum> validCombineAlphas = {
>+        GL_MODULATE, GL_REPLACE, GL_ADD, GL_ADD_SIGNED, GL_SUBTRACT, GL_INTERPOLATE,
>+    };
>+
>+    std::vector<GLenum> validSrcs = {
>+        GL_CONSTANT,
>+        GL_PREVIOUS,
>+        GL_PRIMARY_COLOR,
>+        GL_TEXTURE,
>+    };
>+
>+    std::vector<GLenum> validOpRgbs = {
>+        GL_SRC_COLOR,
>+        GL_ONE_MINUS_SRC_COLOR,
>+        GL_SRC_ALPHA,
>+        GL_ONE_MINUS_SRC_ALPHA,
>+    };
>+
>+    std::vector<GLenum> validOpAlphas = {
>+        GL_SRC_ALPHA,
>+        GL_ONE_MINUS_SRC_ALPHA,
>+    };
>+
>+    std::vector<GLfloat> validScales = {
>+        1.0f,
>+        2.0f,
>+        4.0f,
>+    };
>+
>+    for (int i = 0; i < kTrials; i++)
>+    {
>+        GLenum textureUnit  = rng.randomSelect(validUnits);
>+        GLenum mode         = rng.randomSelect(validEnvModes);
>+        GLenum combineRgb   = rng.randomSelect(validCombineRgbs);
>+        GLenum combineAlpha = rng.randomSelect(validCombineAlphas);
>+
>+        GLenum src0Rgb   = rng.randomSelect(validSrcs);
>+        GLenum src0Alpha = rng.randomSelect(validSrcs);
>+        GLenum src1Rgb   = rng.randomSelect(validSrcs);
>+        GLenum src1Alpha = rng.randomSelect(validSrcs);
>+        GLenum src2Rgb   = rng.randomSelect(validSrcs);
>+        GLenum src2Alpha = rng.randomSelect(validSrcs);
>+
>+        GLenum op0Rgb   = rng.randomSelect(validOpRgbs);
>+        GLenum op0Alpha = rng.randomSelect(validOpAlphas);
>+        GLenum op1Rgb   = rng.randomSelect(validOpRgbs);
>+        GLenum op1Alpha = rng.randomSelect(validOpAlphas);
>+        GLenum op2Rgb   = rng.randomSelect(validOpRgbs);
>+        GLenum op2Alpha = rng.randomSelect(validOpAlphas);
>+
>+        GLColor32F envColor(rng.randomFloatBetween(0.0f, 1.0f), rng.randomFloatBetween(0.0f, 1.0f),
>+                            rng.randomFloatBetween(0.0f, 1.0f), rng.randomFloatBetween(0.0f, 1.0f));
>+
>+        GLfloat rgbScale   = rng.randomSelect(validScales);
>+        GLfloat alphaScale = rng.randomSelect(validScales);
>+
>+        glActiveTexture(textureUnit);
>+        EXPECT_GL_NO_ERROR();
>+
>+        glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, mode);
>+        EXPECT_GL_NO_ERROR();
>+        glTexEnvi(GL_TEXTURE_ENV, GL_COMBINE_RGB, combineRgb);
>+        EXPECT_GL_NO_ERROR();
>+        glTexEnvi(GL_TEXTURE_ENV, GL_COMBINE_ALPHA, combineAlpha);
>+        EXPECT_GL_NO_ERROR();
>+
>+        glTexEnvi(GL_TEXTURE_ENV, GL_SRC0_RGB, src0Rgb);
>+        EXPECT_GL_NO_ERROR();
>+        glTexEnvi(GL_TEXTURE_ENV, GL_SRC0_ALPHA, src0Alpha);
>+        EXPECT_GL_NO_ERROR();
>+        glTexEnvi(GL_TEXTURE_ENV, GL_SRC1_RGB, src1Rgb);
>+        EXPECT_GL_NO_ERROR();
>+        glTexEnvi(GL_TEXTURE_ENV, GL_SRC1_ALPHA, src1Alpha);
>+        EXPECT_GL_NO_ERROR();
>+        glTexEnvi(GL_TEXTURE_ENV, GL_SRC2_RGB, src2Rgb);
>+        EXPECT_GL_NO_ERROR();
>+        glTexEnvi(GL_TEXTURE_ENV, GL_SRC2_ALPHA, src2Alpha);
>+        EXPECT_GL_NO_ERROR();
>+
>+        glTexEnvi(GL_TEXTURE_ENV, GL_OPERAND0_RGB, op0Rgb);
>+        EXPECT_GL_NO_ERROR();
>+        glTexEnvi(GL_TEXTURE_ENV, GL_OPERAND0_ALPHA, op0Alpha);
>+        EXPECT_GL_NO_ERROR();
>+        glTexEnvi(GL_TEXTURE_ENV, GL_OPERAND1_RGB, op1Rgb);
>+        EXPECT_GL_NO_ERROR();
>+        glTexEnvi(GL_TEXTURE_ENV, GL_OPERAND1_ALPHA, op1Alpha);
>+        EXPECT_GL_NO_ERROR();
>+        glTexEnvi(GL_TEXTURE_ENV, GL_OPERAND2_RGB, op2Rgb);
>+        EXPECT_GL_NO_ERROR();
>+        glTexEnvi(GL_TEXTURE_ENV, GL_OPERAND2_ALPHA, op2Alpha);
>+        EXPECT_GL_NO_ERROR();
>+
>+        glTexEnvfv(GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, &envColor.R);
>+        EXPECT_GL_NO_ERROR();
>+
>+        glTexEnvf(GL_TEXTURE_ENV, GL_RGB_SCALE, rgbScale);
>+        EXPECT_GL_NO_ERROR();
>+
>+        glTexEnvf(GL_TEXTURE_ENV, GL_ALPHA_SCALE, alphaScale);
>+        EXPECT_GL_NO_ERROR();
>+
>+        verifyEnvironment(mode, combineRgb, combineAlpha, src0Rgb, src0Alpha, src1Rgb, src1Alpha,
>+                          src2Rgb, src2Alpha, op0Rgb, op0Alpha, op1Rgb, op1Alpha, op2Rgb, op2Alpha,
>+                          envColor, rgbScale, alphaScale);
>+    }
>+}
>+
>+ANGLE_INSTANTIATE_TEST(TextureEnvTest, ES1_D3D11(), ES1_OPENGL(), ES1_OPENGLES());
>diff --git a/Source/ThirdParty/ANGLE/src/tests/gl_tests/gles1/TextureParameterTest.cpp b/Source/ThirdParty/ANGLE/src/tests/gl_tests/gles1/TextureParameterTest.cpp
>new file mode 100644
>index 00000000000..c8162950c88
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/tests/gl_tests/gles1/TextureParameterTest.cpp
>@@ -0,0 +1,114 @@
>+//
>+// Copyright 2018 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+
>+// TextureParameterTest.cpp: Tests GLES1-specific usage of glTexParameter.
>+
>+#include "test_utils/ANGLETest.h"
>+#include "test_utils/gl_raii.h"
>+
>+#include "util/random_utils.h"
>+
>+#include <stdint.h>
>+
>+using namespace angle;
>+
>+class TextureParameterTest : public ANGLETest
>+{
>+  protected:
>+    TextureParameterTest()
>+    {
>+        setWindowWidth(32);
>+        setWindowHeight(32);
>+        setConfigRedBits(8);
>+        setConfigGreenBits(8);
>+        setConfigBlueBits(8);
>+        setConfigAlphaBits(8);
>+        setConfigDepthBits(24);
>+    }
>+};
>+
>+// Initial state check
>+TEST_P(TextureParameterTest, InitialState)
>+{
>+    GLint params[4] = {};
>+
>+    glGetTexParameteriv(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, params);
>+    EXPECT_GL_NO_ERROR();
>+    EXPECT_EQ(GL_NEAREST_MIPMAP_LINEAR, params[0]);
>+
>+    glGetTexParameteriv(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, params);
>+    EXPECT_GL_NO_ERROR();
>+    EXPECT_EQ(GL_LINEAR, params[0]);
>+
>+    glGetTexParameteriv(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, params);
>+    EXPECT_GL_NO_ERROR();
>+    EXPECT_EQ(GL_REPEAT, params[0]);
>+
>+    glGetTexParameteriv(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, params);
>+    EXPECT_GL_NO_ERROR();
>+    EXPECT_EQ(GL_REPEAT, params[0]);
>+
>+    glGetTexParameteriv(GL_TEXTURE_2D, GL_GENERATE_MIPMAP, params);
>+    EXPECT_GL_NO_ERROR();
>+    EXPECT_GL_FALSE(params[0]);
>+
>+    glGetTexParameteriv(GL_TEXTURE_2D, GL_TEXTURE_CROP_RECT_OES, params);
>+    EXPECT_GL_NO_ERROR();
>+
>+    EXPECT_EQ(0, params[0]);
>+    EXPECT_EQ(0, params[1]);
>+    EXPECT_EQ(0, params[2]);
>+    EXPECT_EQ(0, params[3]);
>+}
>+
>+// Negative test: invalid enum / operation
>+TEST_P(TextureParameterTest, NegativeEnum)
>+{
>+    // Invalid target (not supported)
>+    glGetTexParameteriv(GL_TEXTURE_3D, GL_TEXTURE_MIN_FILTER, nullptr);
>+    EXPECT_GL_ERROR(GL_INVALID_ENUM);
>+
>+    // Invalid parameter name
>+    glGetTexParameteriv(GL_TEXTURE_2D, 0, nullptr);
>+    EXPECT_GL_ERROR(GL_INVALID_ENUM);
>+
>+    // Not enough buffer
>+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_CROP_RECT_OES, 3);
>+    EXPECT_GL_ERROR(GL_INVALID_OPERATION);
>+
>+    // Not supported in GLES1
>+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_BASE_LEVEL, 0);
>+    EXPECT_GL_ERROR(GL_INVALID_ENUM);
>+}
>+
>+// Checks that GLES1-specific texture parameters can be set.
>+TEST_P(TextureParameterTest, Set)
>+{
>+    GLint params[4] = {};
>+
>+    glTexParameteri(GL_TEXTURE_2D, GL_GENERATE_MIPMAP, GL_TRUE);
>+    EXPECT_GL_NO_ERROR();
>+
>+    glGetTexParameteriv(GL_TEXTURE_2D, GL_GENERATE_MIPMAP, params);
>+    EXPECT_GL_NO_ERROR();
>+
>+    EXPECT_GL_TRUE(params[0]);
>+
>+    GLint cropRect[4] = {10, 20, 30, 40};
>+
>+    glTexParameteriv(GL_TEXTURE_2D, GL_TEXTURE_CROP_RECT_OES, cropRect);
>+    EXPECT_GL_NO_ERROR();
>+
>+    glGetTexParameteriv(GL_TEXTURE_2D, GL_TEXTURE_CROP_RECT_OES, params);
>+    EXPECT_GL_NO_ERROR();
>+
>+    for (int i = 0; i < 4; i++)
>+    {
>+        EXPECT_EQ(cropRect[i], params[i]);
>+    }
>+}
>+
>+ANGLE_INSTANTIATE_TEST(TextureParameterTest, ES1_D3D11(), ES1_OPENGL(), ES1_OPENGLES());
>diff --git a/Source/ThirdParty/ANGLE/src/tests/gl_tests/gles1/TextureTargetEnableTest.cpp b/Source/ThirdParty/ANGLE/src/tests/gl_tests/gles1/TextureTargetEnableTest.cpp
>new file mode 100644
>index 00000000000..5d7c87ef60e
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/tests/gl_tests/gles1/TextureTargetEnableTest.cpp
>@@ -0,0 +1,79 @@
>+//
>+// Copyright 2018 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+
>+// TextureTargetEnableTest.cpp: Tests basic usage of built-in vertex attributes of GLES1.
>+
>+#include "test_utils/ANGLETest.h"
>+#include "test_utils/gl_raii.h"
>+
>+using namespace angle;
>+
>+class TextureTargetEnableTest : public ANGLETest
>+{
>+  protected:
>+    TextureTargetEnableTest()
>+    {
>+        setWindowWidth(32);
>+        setWindowHeight(32);
>+        setConfigRedBits(8);
>+        setConfigGreenBits(8);
>+        setConfigBlueBits(8);
>+        setConfigAlphaBits(8);
>+        setConfigDepthBits(24);
>+    }
>+};
>+
>+// Checks that 2D/Cube targets are disabled initially.
>+TEST_P(TextureTargetEnableTest, InitialState)
>+{
>+    EXPECT_GL_FALSE(glIsEnabled(GL_TEXTURE_2D));
>+    EXPECT_GL_NO_ERROR();
>+    EXPECT_GL_FALSE(glIsEnabled(GL_TEXTURE_CUBE_MAP));
>+    EXPECT_GL_NO_ERROR();
>+}
>+
>+// Checks that 2D/cube targets can be set to enabled or disabled.
>+TEST_P(TextureTargetEnableTest, Set)
>+{
>+    glEnable(GL_TEXTURE_2D);
>+    EXPECT_GL_NO_ERROR();
>+    EXPECT_GL_TRUE(glIsEnabled(GL_TEXTURE_2D));
>+
>+    glEnable(GL_TEXTURE_CUBE_MAP);
>+    EXPECT_GL_NO_ERROR();
>+    EXPECT_GL_TRUE(glIsEnabled(GL_TEXTURE_CUBE_MAP));
>+}
>+
>+// Checks that targets can be set to enabled or disabled and it does not affect the setting of
>+// other texture units.
>+TEST_P(TextureTargetEnableTest, SetSeparateUnits)
>+{
>+    GLint units;
>+    glGetIntegerv(GL_MAX_TEXTURE_UNITS, &units);
>+
>+    for (int i = 0; i < units; i++)
>+    {
>+
>+        glActiveTexture(GL_TEXTURE0 + i);
>+        EXPECT_GL_NO_ERROR();
>+
>+        EXPECT_GL_FALSE(glIsEnabled(GL_TEXTURE_2D));
>+        EXPECT_GL_NO_ERROR();
>+
>+        EXPECT_GL_FALSE(glIsEnabled(GL_TEXTURE_CUBE_MAP));
>+        EXPECT_GL_NO_ERROR();
>+
>+        glEnable(GL_TEXTURE_2D);
>+        EXPECT_GL_NO_ERROR();
>+        EXPECT_GL_TRUE(glIsEnabled(GL_TEXTURE_2D));
>+
>+        glEnable(GL_TEXTURE_CUBE_MAP);
>+        EXPECT_GL_NO_ERROR();
>+        EXPECT_GL_TRUE(glIsEnabled(GL_TEXTURE_CUBE_MAP));
>+    }
>+}
>+
>+ANGLE_INSTANTIATE_TEST(TextureTargetEnableTest, ES1_D3D11(), ES1_OPENGL(), ES1_OPENGLES());
>diff --git a/Source/ThirdParty/ANGLE/src/tests/gl_tests/gles1/VertexPointerTest.cpp b/Source/ThirdParty/ANGLE/src/tests/gl_tests/gles1/VertexPointerTest.cpp
>new file mode 100644
>index 00000000000..24ad64120b5
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/tests/gl_tests/gles1/VertexPointerTest.cpp
>@@ -0,0 +1,67 @@
>+//
>+// Copyright 2018 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+
>+// VertexPointerTest.cpp: Tests basic usage of built-in vertex attributes of GLES1.
>+
>+#include "test_utils/ANGLETest.h"
>+#include "test_utils/gl_raii.h"
>+
>+using namespace angle;
>+
>+class VertexPointerTest : public ANGLETest
>+{
>+  protected:
>+    VertexPointerTest()
>+    {
>+        setWindowWidth(32);
>+        setWindowHeight(32);
>+        setConfigRedBits(8);
>+        setConfigGreenBits(8);
>+        setConfigBlueBits(8);
>+        setConfigAlphaBits(8);
>+        setConfigDepthBits(24);
>+    }
>+};
>+
>+// Checks that we can assign to client side vertex arrays
>+TEST_P(VertexPointerTest, AssignRetrieve)
>+{
>+    std::vector<float> testVertexAttribute = {
>+        1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f,
>+        1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f,
>+    };
>+
>+    glVertexPointer(4, GL_FLOAT, 0, testVertexAttribute.data());
>+    EXPECT_GL_NO_ERROR();
>+
>+    void *ptr = nullptr;
>+    glGetPointerv(GL_VERTEX_ARRAY_POINTER, &ptr);
>+    EXPECT_EQ(testVertexAttribute.data(), ptr);
>+
>+    glColorPointer(4, GL_FLOAT, 0, testVertexAttribute.data() + 4);
>+    glGetPointerv(GL_COLOR_ARRAY_POINTER, &ptr);
>+    EXPECT_EQ(testVertexAttribute.data() + 4, ptr);
>+
>+    glNormalPointer(GL_FLOAT, 0, testVertexAttribute.data() + 8);
>+    glGetPointerv(GL_NORMAL_ARRAY_POINTER, &ptr);
>+    EXPECT_EQ(testVertexAttribute.data() + 8, ptr);
>+
>+    glPointSizePointerOES(GL_FLOAT, 0, testVertexAttribute.data() + 8);
>+    glGetPointerv(GL_POINT_SIZE_ARRAY_POINTER_OES, &ptr);
>+    EXPECT_EQ(testVertexAttribute.data() + 8, ptr);
>+
>+    GLint maxTextureUnits;
>+    glGetIntegerv(GL_MAX_TEXTURE_UNITS, &maxTextureUnits);
>+    for (int i = 0; i < maxTextureUnits; i++)
>+    {
>+        glClientActiveTexture(GL_TEXTURE0 + i);
>+        glTexCoordPointer(4, GL_FLOAT, 0, testVertexAttribute.data() + i * 4);
>+        glGetPointerv(GL_TEXTURE_COORD_ARRAY_POINTER, &ptr);
>+        EXPECT_EQ(testVertexAttribute.data() + i * 4, ptr);
>+    }
>+}
>+
>+ANGLE_INSTANTIATE_TEST(VertexPointerTest, ES1_D3D11(), ES1_OPENGL(), ES1_OPENGLES());
>diff --git a/Source/ThirdParty/ANGLE/src/tests/gles1_conformance_tests/ConformanceTests.cpp b/Source/ThirdParty/ANGLE/src/tests/gles1_conformance_tests/ConformanceTests.cpp
>new file mode 100644
>index 00000000000..92872d8688c
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/tests/gles1_conformance_tests/ConformanceTests.cpp
>@@ -0,0 +1,551 @@
>+//
>+// Copyright 2017 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// ConformanceTests.cpp:
>+//   GLES1 conformance tests.
>+//   Function prototypes taken from tproto.h and turned into gtest tests using a macro.
>+//
>+
>+#include "test_utils/ANGLETest.h"
>+#include "test_utils/gl_raii.h"
>+
>+#ifdef __cplusplus
>+extern "C" {
>+#endif
>+
>+// ES 1.0
>+extern long AmbLightExec(void);
>+extern long AmbMatExec(void);
>+extern long AmbSceneExec(void);
>+extern long APFuncExec(void);
>+extern long AtnConstExec(void);
>+extern long AtnPosExec(void);
>+extern long BClearExec(void);
>+extern long BColorExec(void);
>+extern long BCornerExec(void);
>+extern long BlendExec(void);
>+extern long ClipExec(void);
>+extern long ColRampExec(void);
>+extern long CopyTexExec(void);
>+extern long DifLightExec(void);
>+extern long DifMatExec(void);
>+extern long DifMatNormExec(void);
>+extern long DifMatPosExec(void);
>+extern long DitherExec(void);
>+extern long DivZeroExec(void);
>+extern long EmitMatExec(void);
>+extern long FogExpExec(void);
>+extern long FogLinExec(void);
>+extern long LineAntiAliasExec(void);
>+extern long LineHVExec(void);
>+extern long LineRasterExec(void);
>+extern long LogicOpExec(void);
>+extern long MipExec(void);
>+extern long MipLevelsExec(void);
>+extern long MipLinExec(void);
>+extern long MipSelectExec(void);
>+extern long MaskExec(void);
>+extern long MatrixStackExec(void);
>+extern long MultiTexExec(void);
>+extern long MustPassExec(void);
>+extern long PackedPixelsExec(void);
>+extern long PointAntiAliasExec(void);
>+extern long PointRasterExec(void);
>+extern long PolyCullExec(void);
>+extern long ReadFormatExec(void);
>+extern long RescaleNormalExec(void);
>+extern long ScissorExec(void);
>+extern long SPClearExec(void);
>+extern long SPCornerExec(void);
>+extern long SpecExpExec(void);
>+extern long SpecExpNormExec(void);
>+extern long SpecLightExec(void);
>+extern long SpecMatExec(void);
>+extern long SpecNormExec(void);
>+extern long SPFuncExec(void);
>+extern long SPOpExec(void);
>+extern long SpotPosExec(void);
>+extern long SpotExpPosExec(void);
>+extern long SpotExpDirExec(void);
>+extern long TexDecalExec(void);
>+extern long TexPaletExec(void);
>+extern long TextureEdgeClampExec(void);
>+extern long TriRasterExec(void);
>+extern long TriTileExec(void);
>+extern long VertexOrderExec(void);
>+extern long ViewportClampExec(void);
>+extern long XFormExec(void);
>+extern long XFormMixExec(void);
>+extern long XFormNormalExec(void);
>+extern long XFormViewportExec(void);
>+extern long XFormHomogenousExec(void);
>+extern long ZBClearExec(void);
>+extern long ZBFuncExec(void);
>+
>+// GL_OES_draw_texture
>+extern long DrawTexExec(void);
>+
>+// GL_OES_query_matrix
>+extern long MatrixQueryExec(void);
>+
>+// ES 1.1
>+extern long BufferObjectExec(void);
>+extern long PointSizeArrayExec(void);
>+extern long PointSpriteExec(void);
>+extern long UserClipExec(void);
>+extern long MatrixGetTestExec(void);
>+extern long GetsExec(void);
>+extern long TexCombineExec(void);
>+
>+// GL_OES_matrix_palette
>+extern long MatrixPaletteExec(void);
>+
>+// Test driver setup
>+extern void ExtTestDriverSetup(void);
>+
>+#define CONFORMANCE_TEST_ERROR (-1)
>+
>+#ifdef __cplusplus
>+}
>+
>+#endif
>+namespace angle
>+{
>+class GLES1ConformanceTest : public ANGLETest
>+{
>+  protected:
>+    GLES1ConformanceTest()
>+    {
>+        setWindowWidth(48);
>+        setWindowHeight(48);
>+        setConfigRedBits(8);
>+        setConfigGreenBits(8);
>+        setConfigBlueBits(8);
>+        setConfigAlphaBits(8);
>+        setConfigDepthBits(24);
>+        setConfigStencilBits(8);
>+    }
>+
>+    void SetUp() override
>+    {
>+        ANGLETest::SetUp();
>+        ExtTestDriverSetup();
>+    }
>+};
>+
>+TEST_P(GLES1ConformanceTest, AmbLight)
>+{
>+    ASSERT_NE(CONFORMANCE_TEST_ERROR, AmbLightExec());
>+}
>+
>+TEST_P(GLES1ConformanceTest, AmbMat)
>+{
>+    ASSERT_NE(CONFORMANCE_TEST_ERROR, AmbMatExec());
>+}
>+
>+TEST_P(GLES1ConformanceTest, AmbScene)
>+{
>+    ASSERT_NE(CONFORMANCE_TEST_ERROR, AmbSceneExec());
>+}
>+
>+TEST_P(GLES1ConformanceTest, APFunc)
>+{
>+    ASSERT_NE(CONFORMANCE_TEST_ERROR, APFuncExec());
>+}
>+
>+TEST_P(GLES1ConformanceTest, AtnConst)
>+{
>+    ASSERT_NE(CONFORMANCE_TEST_ERROR, AtnConstExec());
>+}
>+
>+TEST_P(GLES1ConformanceTest, AtnPos)
>+{
>+    ASSERT_NE(CONFORMANCE_TEST_ERROR, AtnPosExec());
>+}
>+
>+TEST_P(GLES1ConformanceTest, BClear)
>+{
>+    ASSERT_NE(CONFORMANCE_TEST_ERROR, BClearExec());
>+}
>+
>+TEST_P(GLES1ConformanceTest, BColor)
>+{
>+    ASSERT_NE(CONFORMANCE_TEST_ERROR, BColorExec());
>+}
>+
>+TEST_P(GLES1ConformanceTest, BCorner)
>+{
>+    ASSERT_NE(CONFORMANCE_TEST_ERROR, BCornerExec());
>+}
>+
>+TEST_P(GLES1ConformanceTest, Blend)
>+{
>+    ASSERT_NE(CONFORMANCE_TEST_ERROR, BlendExec());
>+}
>+
>+TEST_P(GLES1ConformanceTest, Clip)
>+{
>+    ASSERT_NE(CONFORMANCE_TEST_ERROR, ClipExec());
>+}
>+
>+TEST_P(GLES1ConformanceTest, ColRamp)
>+{
>+    ASSERT_NE(CONFORMANCE_TEST_ERROR, ColRampExec());
>+}
>+
>+TEST_P(GLES1ConformanceTest, CopyTex)
>+{
>+    ASSERT_NE(CONFORMANCE_TEST_ERROR, CopyTexExec());
>+}
>+
>+TEST_P(GLES1ConformanceTest, DifLight)
>+{
>+    ASSERT_NE(CONFORMANCE_TEST_ERROR, DifLightExec());
>+}
>+
>+TEST_P(GLES1ConformanceTest, DifMat)
>+{
>+    ASSERT_NE(CONFORMANCE_TEST_ERROR, DifMatExec());
>+}
>+
>+TEST_P(GLES1ConformanceTest, DifMatNorm)
>+{
>+    ASSERT_NE(CONFORMANCE_TEST_ERROR, DifMatNormExec());
>+}
>+
>+TEST_P(GLES1ConformanceTest, DifMatPos)
>+{
>+    ASSERT_NE(CONFORMANCE_TEST_ERROR, DifMatPosExec());
>+}
>+
>+TEST_P(GLES1ConformanceTest, Dither)
>+{
>+    ASSERT_NE(CONFORMANCE_TEST_ERROR, DitherExec());
>+}
>+
>+TEST_P(GLES1ConformanceTest, DivZero)
>+{
>+    ASSERT_NE(CONFORMANCE_TEST_ERROR, DivZeroExec());
>+}
>+
>+TEST_P(GLES1ConformanceTest, EmitMat)
>+{
>+    ASSERT_NE(CONFORMANCE_TEST_ERROR, EmitMatExec());
>+}
>+
>+TEST_P(GLES1ConformanceTest, FogExp)
>+{
>+    ASSERT_NE(CONFORMANCE_TEST_ERROR, FogExpExec());
>+}
>+
>+TEST_P(GLES1ConformanceTest, FogLin)
>+{
>+    ASSERT_NE(CONFORMANCE_TEST_ERROR, FogLinExec());
>+}
>+
>+TEST_P(GLES1ConformanceTest, LineAntiAlias)
>+{
>+    ANGLE_SKIP_TEST_IF(true);
>+    ASSERT_NE(CONFORMANCE_TEST_ERROR, LineAntiAliasExec());
>+}
>+
>+TEST_P(GLES1ConformanceTest, LineHV)
>+{
>+    ASSERT_NE(CONFORMANCE_TEST_ERROR, LineHVExec());
>+}
>+
>+TEST_P(GLES1ConformanceTest, LineRaster)
>+{
>+    ASSERT_NE(CONFORMANCE_TEST_ERROR, LineRasterExec());
>+}
>+
>+TEST_P(GLES1ConformanceTest, LogicOp)
>+{
>+    ANGLE_SKIP_TEST_IF(true);
>+    ASSERT_NE(CONFORMANCE_TEST_ERROR, LogicOpExec());
>+}
>+
>+TEST_P(GLES1ConformanceTest, Mip)
>+{
>+    ASSERT_NE(CONFORMANCE_TEST_ERROR, MipExec());
>+}
>+
>+TEST_P(GLES1ConformanceTest, MipLevels)
>+{
>+    ANGLE_SKIP_TEST_IF(true);
>+    ASSERT_NE(CONFORMANCE_TEST_ERROR, MipLevelsExec());
>+}
>+
>+TEST_P(GLES1ConformanceTest, MipLin)
>+{
>+    ASSERT_NE(CONFORMANCE_TEST_ERROR, MipLinExec());
>+}
>+
>+TEST_P(GLES1ConformanceTest, MipSelect)
>+{
>+    ASSERT_NE(CONFORMANCE_TEST_ERROR, MipSelectExec());
>+}
>+
>+TEST_P(GLES1ConformanceTest, Mask)
>+{
>+    ASSERT_NE(CONFORMANCE_TEST_ERROR, MaskExec());
>+}
>+
>+TEST_P(GLES1ConformanceTest, MatrixStack)
>+{
>+    ASSERT_NE(CONFORMANCE_TEST_ERROR, MatrixStackExec());
>+}
>+
>+TEST_P(GLES1ConformanceTest, MultiTex)
>+{
>+    ASSERT_NE(CONFORMANCE_TEST_ERROR, MultiTexExec());
>+}
>+
>+TEST_P(GLES1ConformanceTest, MustPass)
>+{
>+    ANGLE_SKIP_TEST_IF(true);
>+    ASSERT_NE(CONFORMANCE_TEST_ERROR, MustPassExec());
>+}
>+
>+TEST_P(GLES1ConformanceTest, PackedPixels)
>+{
>+    ASSERT_NE(CONFORMANCE_TEST_ERROR, PackedPixelsExec());
>+}
>+
>+TEST_P(GLES1ConformanceTest, PointAntiAlias)
>+{
>+    ANGLE_SKIP_TEST_IF(true);
>+    ASSERT_NE(CONFORMANCE_TEST_ERROR, PointAntiAliasExec());
>+}
>+
>+TEST_P(GLES1ConformanceTest, PointRaster)
>+{
>+    ASSERT_NE(CONFORMANCE_TEST_ERROR, PointRasterExec());
>+}
>+
>+TEST_P(GLES1ConformanceTest, PolyCull)
>+{
>+    ASSERT_NE(CONFORMANCE_TEST_ERROR, PolyCullExec());
>+}
>+
>+TEST_P(GLES1ConformanceTest, ReadFormat)
>+{
>+    ASSERT_NE(CONFORMANCE_TEST_ERROR, ReadFormatExec());
>+}
>+
>+TEST_P(GLES1ConformanceTest, RescaleNormal)
>+{
>+    ANGLE_SKIP_TEST_IF(true);
>+    ASSERT_NE(CONFORMANCE_TEST_ERROR, RescaleNormalExec());
>+}
>+
>+TEST_P(GLES1ConformanceTest, Scissor)
>+{
>+    ASSERT_NE(CONFORMANCE_TEST_ERROR, ScissorExec());
>+}
>+
>+TEST_P(GLES1ConformanceTest, SPClear)
>+{
>+    ASSERT_NE(CONFORMANCE_TEST_ERROR, SPClearExec());
>+}
>+
>+TEST_P(GLES1ConformanceTest, SPCorner)
>+{
>+    ASSERT_NE(CONFORMANCE_TEST_ERROR, SPCornerExec());
>+}
>+
>+TEST_P(GLES1ConformanceTest, SpecExp)
>+{
>+    ASSERT_NE(CONFORMANCE_TEST_ERROR, SpecExpExec());
>+}
>+
>+TEST_P(GLES1ConformanceTest, SpecExpNorm)
>+{
>+    ASSERT_NE(CONFORMANCE_TEST_ERROR, SpecExpNormExec());
>+}
>+
>+TEST_P(GLES1ConformanceTest, SpecLight)
>+{
>+    ASSERT_NE(CONFORMANCE_TEST_ERROR, SpecLightExec());
>+}
>+
>+TEST_P(GLES1ConformanceTest, SpecMat)
>+{
>+    ASSERT_NE(CONFORMANCE_TEST_ERROR, SpecMatExec());
>+}
>+
>+TEST_P(GLES1ConformanceTest, SpecNorm)
>+{
>+    ASSERT_NE(CONFORMANCE_TEST_ERROR, SpecNormExec());
>+}
>+
>+TEST_P(GLES1ConformanceTest, SPFunc)
>+{
>+    ASSERT_NE(CONFORMANCE_TEST_ERROR, SPFuncExec());
>+}
>+
>+TEST_P(GLES1ConformanceTest, SPOp)
>+{
>+    ASSERT_NE(CONFORMANCE_TEST_ERROR, SPOpExec());
>+}
>+
>+TEST_P(GLES1ConformanceTest, SpotPos)
>+{
>+    ASSERT_NE(CONFORMANCE_TEST_ERROR, SpotPosExec());
>+}
>+
>+TEST_P(GLES1ConformanceTest, SpotExpPos)
>+{
>+    ASSERT_NE(CONFORMANCE_TEST_ERROR, SpotExpPosExec());
>+}
>+
>+TEST_P(GLES1ConformanceTest, SpotExpDir)
>+{
>+    ASSERT_NE(CONFORMANCE_TEST_ERROR, SpotExpDirExec());
>+}
>+
>+TEST_P(GLES1ConformanceTest, TexDecal)
>+{
>+    ASSERT_NE(CONFORMANCE_TEST_ERROR, TexDecalExec());
>+}
>+
>+TEST_P(GLES1ConformanceTest, TexPalet)
>+{
>+    ANGLE_SKIP_TEST_IF(true);
>+    ASSERT_NE(CONFORMANCE_TEST_ERROR, TexPaletExec());
>+}
>+
>+TEST_P(GLES1ConformanceTest, TextureEdgeClamp)
>+{
>+    ASSERT_NE(CONFORMANCE_TEST_ERROR, TextureEdgeClampExec());
>+}
>+
>+TEST_P(GLES1ConformanceTest, TriRaster)
>+{
>+    ASSERT_NE(CONFORMANCE_TEST_ERROR, TriRasterExec());
>+}
>+
>+TEST_P(GLES1ConformanceTest, TriTile)
>+{
>+    ASSERT_NE(CONFORMANCE_TEST_ERROR, TriTileExec());
>+}
>+
>+TEST_P(GLES1ConformanceTest, VertexOrder)
>+{
>+    ASSERT_NE(CONFORMANCE_TEST_ERROR, VertexOrderExec());
>+}
>+
>+TEST_P(GLES1ConformanceTest, ViewportClamp)
>+{
>+    ASSERT_NE(CONFORMANCE_TEST_ERROR, ViewportClampExec());
>+}
>+
>+TEST_P(GLES1ConformanceTest, XForm)
>+{
>+    ASSERT_NE(CONFORMANCE_TEST_ERROR, XFormExec());
>+}
>+
>+TEST_P(GLES1ConformanceTest, XFormMix)
>+{
>+    ASSERT_NE(CONFORMANCE_TEST_ERROR, XFormMixExec());
>+}
>+
>+TEST_P(GLES1ConformanceTest, XFormNormal)
>+{
>+    ASSERT_NE(CONFORMANCE_TEST_ERROR, XFormNormalExec());
>+}
>+
>+TEST_P(GLES1ConformanceTest, XFormViewport)
>+{
>+    ASSERT_NE(CONFORMANCE_TEST_ERROR, XFormViewportExec());
>+}
>+
>+TEST_P(GLES1ConformanceTest, XFormHomogenous)
>+{
>+    ASSERT_NE(CONFORMANCE_TEST_ERROR, XFormHomogenousExec());
>+}
>+
>+TEST_P(GLES1ConformanceTest, ZBClear)
>+{
>+    ASSERT_NE(CONFORMANCE_TEST_ERROR, ZBClearExec());
>+}
>+
>+TEST_P(GLES1ConformanceTest, ZBFunc)
>+{
>+    ASSERT_NE(CONFORMANCE_TEST_ERROR, ZBFuncExec());
>+}
>+
>+TEST_P(GLES1ConformanceTest, DrawTex)
>+{
>+    ASSERT_TRUE(IsGLExtensionEnabled("GL_OES_draw_texture"));
>+    ASSERT_NE(CONFORMANCE_TEST_ERROR, DrawTexExec());
>+}
>+
>+TEST_P(GLES1ConformanceTest, MatrixQuery)
>+{
>+    ASSERT_NE(CONFORMANCE_TEST_ERROR, MatrixQueryExec());
>+}
>+
>+TEST_P(GLES1ConformanceTest, BufferObject)
>+{
>+    ASSERT_NE(CONFORMANCE_TEST_ERROR, BufferObjectExec());
>+}
>+
>+TEST_P(GLES1ConformanceTest, PointSizeArray)
>+{
>+    ASSERT_NE(CONFORMANCE_TEST_ERROR, PointSizeArrayExec());
>+}
>+
>+TEST_P(GLES1ConformanceTest, PointSprite)
>+{
>+    ASSERT_NE(CONFORMANCE_TEST_ERROR, PointSpriteExec());
>+}
>+
>+TEST_P(GLES1ConformanceTest, UserClip)
>+{
>+    // "2.11 Clipping" describes the complementarity criterion, where a
>+    // primitive drawn once with a particular clip plane and again with the
>+    // negated version of the clip plane must not overdraw for pixels where the
>+    // plane equation evaluates exactly to zero; that is, we would need to
>+    // detect previously drawn fragments from one clip plane that lie exactly
>+    // on the half space boundary, and avoid drawing them if the same primitive
>+    // is issued next draw with a negated version of the clip plane.
>+    //
>+    // TODO(lfy@google.com)
>+    // We can skip the test for now, or seed the test with a sufficiently nice
>+    // random number so that it still test clip planes, but doesn't have any
>+    // pixels exactly on half space boundaries.
>+    //
>+    // Proper fix would either involve a more complex scheme to track fragments
>+    // on the half space boundary and discard or not next draw based on whether
>+    // they are hit again, or to pass through to a hardware clip plane
>+    // implementation (available in desktop GL or Vulkan)
>+
>+    ANGLE_SKIP_TEST_IF(true);
>+    ASSERT_NE(CONFORMANCE_TEST_ERROR, UserClipExec());
>+}
>+
>+TEST_P(GLES1ConformanceTest, MatrixGetTest)
>+{
>+    ASSERT_NE(CONFORMANCE_TEST_ERROR, MatrixGetTestExec());
>+}
>+
>+TEST_P(GLES1ConformanceTest, Gets)
>+{
>+    ASSERT_NE(CONFORMANCE_TEST_ERROR, GetsExec());
>+}
>+
>+TEST_P(GLES1ConformanceTest, TexCombine)
>+{
>+    ASSERT_NE(CONFORMANCE_TEST_ERROR, TexCombineExec());
>+}
>+
>+TEST_P(GLES1ConformanceTest, MatrixPalette)
>+{
>+    ASSERT_NE(CONFORMANCE_TEST_ERROR, MatrixPaletteExec());
>+}
>+
>+ANGLE_INSTANTIATE_TEST(GLES1ConformanceTest, ES1_OPENGL());
>+}  // namespace angle
>diff --git a/Source/ThirdParty/ANGLE/src/tests/gles_conformance_tests/gles_conformance_tests.cpp b/Source/ThirdParty/ANGLE/src/tests/gles_conformance_tests/gles_conformance_tests.cpp
>index 10565e14221..ce36926156d 100644
>--- a/Source/ThirdParty/ANGLE/src/tests/gles_conformance_tests/gles_conformance_tests.cpp
>+++ b/Source/ThirdParty/ANGLE/src/tests/gles_conformance_tests/gles_conformance_tests.cpp
>@@ -1,13 +1,14 @@
> #include "gles_conformance_tests.h"
> #include "GTFMain.h"
> 
>+#include <stdarg.h>
> #include <stdio.h>
> #include <stdlib.h>
>-#include <vector>
> #include <sstream>
>-#include <stdarg.h>
>+#include <vector>
> 
>-static std::vector<char> FormatArg(const char* fmt, ...)
>+ANGLE_FORMAT_PRINTF(1, 2)
>+static std::vector<char> FormatArg(const char *fmt, ...)
> {
>     va_list vararg;
>     va_start(vararg, fmt);
>@@ -34,7 +35,7 @@ static std::string GetExecutableDirectory()
>     }
> 
>     std::string executableLocation = executableFileBuf.data();
>-    size_t lastPathSepLoc = executableLocation.find_last_of("\\/");
>+    size_t lastPathSepLoc          = executableLocation.find_last_of("\\/");
>     if (lastPathSepLoc != std::string::npos)
>     {
>         executableLocation = executableLocation.substr(0, lastPathSepLoc);
>@@ -49,7 +50,7 @@ static std::string GetExecutableDirectory()
> 
> void RunConformanceTest(const std::string &testPath, EGLNativeDisplayType nativeDisplay)
> {
>-    std::vector<char*> args;
>+    std::vector<char *> args;
> 
>     // Empty first argument for the program name
>     args.push_back("");
>@@ -63,11 +64,12 @@ void RunConformanceTest(const std::string &testPath, EGLNativeDisplayType native
>     std::vector<char> displayArg = FormatArg("-d=%llu", nativeDisplay);
>     args.push_back(displayArg.data());
> 
>-    std::vector<char> runArg = FormatArg("-run=%s/conformance_tests/%s", GetExecutableDirectory().c_str(), testPath.c_str());
>+    std::vector<char> runArg = FormatArg("-run=%s/conformance_tests/%s",
>+                                         GetExecutableDirectory().c_str(), testPath.c_str());
>     args.push_back(runArg.data());
> 
>     // Redirect cout
>-    std::streambuf* oldCoutStreamBuf = std::cout.rdbuf();
>+    std::streambuf *oldCoutStreamBuf = std::cout.rdbuf();
>     std::ostringstream strCout;
>     std::cout.rdbuf(strCout.rdbuf());
> 
>@@ -81,7 +83,7 @@ void RunConformanceTest(const std::string &testPath, EGLNativeDisplayType native
>     std::string log = strCout.str();
> 
>     // Look for failures
>-    size_t offset = 0;
>+    size_t offset                  = 0;
>     std::string offsetSearchString = "failure = ";
>     while ((offset = log.find("failure = ", offset)) != std::string::npos)
>     {
>diff --git a/Source/ThirdParty/ANGLE/src/tests/gles_conformance_tests/gles_conformance_tests.h b/Source/ThirdParty/ANGLE/src/tests/gles_conformance_tests/gles_conformance_tests.h
>index df911b0349f..e888a239731 100644
>--- a/Source/ThirdParty/ANGLE/src/tests/gles_conformance_tests/gles_conformance_tests.h
>+++ b/Source/ThirdParty/ANGLE/src/tests/gles_conformance_tests/gles_conformance_tests.h
>@@ -16,49 +16,39 @@
> 
> struct D3D9
> {
>-    static EGLNativeDisplayType GetNativeDisplay()
>-    {
>-        return EGL_DEFAULT_DISPLAY;
>-    }
>+    static EGLNativeDisplayType GetNativeDisplay() { return EGL_DEFAULT_DISPLAY; }
> };
> 
> struct D3D11
> {
>-    static EGLNativeDisplayType GetNativeDisplay()
>-    {
>-        return EGL_D3D11_ONLY_DISPLAY_ANGLE;
>-    }
>+    static EGLNativeDisplayType GetNativeDisplay() { return EGL_D3D11_ONLY_DISPLAY_ANGLE; }
> };
> 
> #define CONFORMANCE_TESTS_ES2 2
> #define CONFORMANCE_TESTS_ES3 3
> 
> #if CONFORMANCE_TESTS_TYPE == CONFORMANCE_TESTS_ES2
>-    typedef testing::Types<D3D9, D3D11> ConformanceTestTypes;
>+typedef testing::Types<D3D9, D3D11> ConformanceTestTypes;
> #elif CONFORMANCE_TESTS_TYPE == CONFORMANCE_TESTS_ES3
>-    typedef testing::Types<D3D11> ConformanceTestTypes;
>+typedef testing::Types<D3D11> ConformanceTestTypes;
> #else
>-#   error "Unknown CONFORMANCE_TESTS_TYPE"
>+#    error "Unknown CONFORMANCE_TESTS_TYPE"
> #endif
> 
> #define DEFINE_CONFORMANCE_TEST_CLASS(name) \
>-    template <typename T> class name : public ConformanceTest<T> { }; \
>-    TYPED_TEST_CASE(name, ConformanceTestTypes);
>+    template <typename T>                   \
>+    class name : public ConformanceTest<T>  \
>+    {};                                     \
>+    TYPED_TEST_SUITE(name, ConformanceTestTypes);
> 
> template <typename T>
> class ConformanceTest : public testing::Test
> {
>   public:
>-    ConformanceTest()
>-        : mNativeDisplay(T::GetNativeDisplay())
>-    {
>-    }
>+    ConformanceTest() : mNativeDisplay(T::GetNativeDisplay()) {}
> 
>   protected:
>-    void run(const std::string &testPath)
>-    {
>-        RunConformanceTest(testPath, mNativeDisplay);
>-    }
>+    void run(const std::string &testPath) { RunConformanceTest(testPath, mNativeDisplay); }
> 
>   private:
>     EGLNativeDisplayType mNativeDisplay;
>@@ -66,4 +56,4 @@ class ConformanceTest : public testing::Test
> 
> void RunConformanceTest(const std::string &testPath, EGLNativeDisplayType nativeDisplay);
> 
>-#endif // CONFORMANCE_TESTS_CONFORMANCE_TEST_H_
>+#endif  // CONFORMANCE_TESTS_CONFORMANCE_TEST_H_
>diff --git a/Source/ThirdParty/ANGLE/src/tests/gles_conformance_tests/gles_conformance_tests_main.cpp b/Source/ThirdParty/ANGLE/src/tests/gles_conformance_tests/gles_conformance_tests_main.cpp
>index 0b95d5c8945..7fdddcc6617 100644
>--- a/Source/ThirdParty/ANGLE/src/tests/gles_conformance_tests/gles_conformance_tests_main.cpp
>+++ b/Source/ThirdParty/ANGLE/src/tests/gles_conformance_tests/gles_conformance_tests_main.cpp
>@@ -15,7 +15,7 @@
> #include <string>
> #include <vector>
> 
>-int main(int argc, char** argv)
>+int main(int argc, char **argv)
> {
>     testing::InitGoogleTest(&argc, argv);
>     int rt = RUN_ALL_TESTS();
>diff --git a/Source/ThirdParty/ANGLE/src/tests/perf_tests/ANGLEPerfTest.cpp b/Source/ThirdParty/ANGLE/src/tests/perf_tests/ANGLEPerfTest.cpp
>index 8fd29722731..ff2a41200f1 100644
>--- a/Source/ThirdParty/ANGLE/src/tests/perf_tests/ANGLEPerfTest.cpp
>+++ b/Source/ThirdParty/ANGLE/src/tests/perf_tests/ANGLEPerfTest.cpp
>@@ -8,37 +8,168 @@
> //
> 
> #include "ANGLEPerfTest.h"
>+
>+#include "ANGLEPerfTestArgs.h"
>+#include "common/platform.h"
> #include "third_party/perf/perf_test.h"
>+#include "util/shader_utils.h"
>+#include "util/system_utils.h"
> 
> #include <cassert>
> #include <cmath>
>+#include <fstream>
> #include <iostream>
>+#include <sstream>
>+
>+#include <json/json.h>
>+
>+#if defined(ANGLE_USE_UTIL_LOADER) && defined(ANGLE_PLATFORM_WINDOWS)
>+#    include "util/windows/WGLWindow.h"
>+#endif  // defined(ANGLE_USE_UTIL_LOADER) &&defined(ANGLE_PLATFORM_WINDOWS)
>+
>+using namespace angle;
> 
> namespace
> {
>-void EmptyPlatformMethod(angle::PlatformMethods *, const char *)
>+constexpr size_t kInitialTraceEventBufferSize = 50000;
>+constexpr double kMicroSecondsPerSecond       = 1e6;
>+constexpr double kNanoSecondsPerSecond        = 1e9;
>+constexpr double kCalibrationRunTimeSeconds   = 1.0;
>+constexpr double kMaximumRunTimeSeconds       = 10.0;
>+constexpr unsigned int kNumTrials             = 3;
>+
>+struct TraceCategory
> {
>-}
>+    unsigned char enabled;
>+    const char *name;
>+};
>+
>+constexpr TraceCategory gTraceCategories[2] = {
>+    {1, "gpu.angle"},
>+    {1, "gpu.angle.gpu"},
>+};
>+
>+void EmptyPlatformMethod(angle::PlatformMethods *, const char *) {}
> 
> void OverrideWorkaroundsD3D(angle::PlatformMethods *platform, angle::WorkaroundsD3D *workaroundsD3D)
> {
>     auto *angleRenderTest = static_cast<ANGLERenderTest *>(platform->context);
>     angleRenderTest->overrideWorkaroundsD3D(workaroundsD3D);
> }
>-}  // namespace
> 
>-bool g_OnlyOneRunFrame = false;
>+angle::TraceEventHandle AddTraceEvent(angle::PlatformMethods *platform,
>+                                      char phase,
>+                                      const unsigned char *categoryEnabledFlag,
>+                                      const char *name,
>+                                      unsigned long long id,
>+                                      double timestamp,
>+                                      int numArgs,
>+                                      const char **argNames,
>+                                      const unsigned char *argTypes,
>+                                      const unsigned long long *argValues,
>+                                      unsigned char flags)
>+{
>+    if (!gEnableTrace)
>+        return 0;
>+
>+    // Discover the category name based on categoryEnabledFlag.  This flag comes from the first
>+    // parameter of TraceCategory, and corresponds to one of the entries in gTraceCategories.
>+    static_assert(offsetof(TraceCategory, enabled) == 0,
>+                  "|enabled| must be the first field of the TraceCategory class.");
>+    const TraceCategory *category = reinterpret_cast<const TraceCategory *>(categoryEnabledFlag);
>+
>+    ANGLERenderTest *renderTest     = static_cast<ANGLERenderTest *>(platform->context);
>+    std::vector<TraceEvent> &buffer = renderTest->getTraceEventBuffer();
>+    buffer.emplace_back(phase, category->name, name, timestamp);
>+    return buffer.size();
>+}
>+
>+const unsigned char *GetTraceCategoryEnabledFlag(angle::PlatformMethods *platform,
>+                                                 const char *categoryName)
>+{
>+    if (gEnableTrace)
>+    {
>+        for (const TraceCategory &category : gTraceCategories)
>+        {
>+            if (strcmp(category.name, categoryName) == 0)
>+            {
>+                return &category.enabled;
>+            }
>+        }
>+    }
>+
>+    constexpr static unsigned char kZero = 0;
>+    return &kZero;
>+}
>+
>+void UpdateTraceEventDuration(angle::PlatformMethods *platform,
>+                              const unsigned char *categoryEnabledFlag,
>+                              const char *name,
>+                              angle::TraceEventHandle eventHandle)
>+{
>+    // Not implemented.
>+}
>+
>+double MonotonicallyIncreasingTime(angle::PlatformMethods *platform)
>+{
>+    ANGLERenderTest *renderTest = static_cast<ANGLERenderTest *>(platform->context);
>+    // Move the time origin to the first call to this function, to avoid generating unnecessarily
>+    // large timestamps.
>+    static double origin = renderTest->getTimer()->getAbsoluteTime();
>+    return renderTest->getTimer()->getAbsoluteTime() - origin;
>+}
>+
>+void DumpTraceEventsToJSONFile(const std::vector<TraceEvent> &traceEvents,
>+                               const char *outputFileName)
>+{
>+    Json::Value eventsValue(Json::arrayValue);
>+
>+    for (const TraceEvent &traceEvent : traceEvents)
>+    {
>+        Json::Value value(Json::objectValue);
> 
>-ANGLEPerfTest::ANGLEPerfTest(const std::string &name, const std::string &suffix)
>+        std::stringstream phaseName;
>+        phaseName << traceEvent.phase;
>+
>+        unsigned long long microseconds =
>+            static_cast<unsigned long long>(traceEvent.timestamp * 1000.0 * 1000.0);
>+
>+        value["name"] = traceEvent.name;
>+        value["cat"]  = traceEvent.categoryName;
>+        value["ph"]   = phaseName.str();
>+        value["ts"]   = microseconds;
>+        value["pid"]  = "ANGLE";
>+        value["tid"]  = strcmp(traceEvent.categoryName, "gpu.angle.gpu") == 0 ? "GPU" : "CPU";
>+
>+        eventsValue.append(value);
>+    }
>+
>+    Json::Value root(Json::objectValue);
>+    root["traceEvents"] = eventsValue;
>+
>+    std::ofstream outFile;
>+    outFile.open(outputFileName);
>+
>+    Json::StyledWriter styledWrite;
>+    outFile << styledWrite.write(root);
>+
>+    outFile.close();
>+}
>+}  // anonymous namespace
>+
>+ANGLEPerfTest::ANGLEPerfTest(const std::string &name,
>+                             const std::string &suffix,
>+                             unsigned int iterationsPerStep)
>     : mName(name),
>       mSuffix(suffix),
>       mTimer(CreateTimer()),
>-      mRunTimeSeconds(5.0),
>+      mGPUTimeNs(0),
>       mSkipTest(false),
>+      mStepsToRun(std::numeric_limits<unsigned int>::max()),
>       mNumStepsPerformed(0),
>+      mIterationsPerStep(iterationsPerStep),
>       mRunning(true)
>-{
>-}
>+{}
> 
> ANGLEPerfTest::~ANGLEPerfTest()
> {
>@@ -52,45 +183,125 @@ void ANGLEPerfTest::run()
>         return;
>     }
> 
>+    // Calibrate to a fixed number of steps during an initial set time.
>+    if (!gStepsToRunOverride.valid())
>+    {
>+        doRunLoop(kCalibrationRunTimeSeconds);
>+
>+        // Scale steps down according to the time that exeeded one second.
>+        double scale = kCalibrationRunTimeSeconds / mTimer->getElapsedTime();
>+        mStepsToRun  = static_cast<size_t>(static_cast<double>(mNumStepsPerformed) * scale);
>+
>+        // Calibration allows the perf test runner script to save some time.
>+        if (gCalibration)
>+        {
>+            printResult("steps", static_cast<size_t>(mStepsToRun), "count", false);
>+            return;
>+        }
>+    }
>+    else
>+    {
>+        mStepsToRun = gStepsToRunOverride.value();
>+    }
>+
>+    // Do another warmup run. Seems to consistently improve results.
>+    doRunLoop(kMaximumRunTimeSeconds);
>+
>+    double totalTime = 0.0;
>+    for (unsigned int trial = 0; trial < kNumTrials; ++trial)
>+    {
>+        doRunLoop(kMaximumRunTimeSeconds);
>+        totalTime += printResults();
>+    }
>+    double average = totalTime / kNumTrials;
>+    std::ostringstream averageString;
>+    averageString << "for " << kNumTrials << " runs";
>+    printResult("average", average, averageString.str(), false);
>+}
>+
>+void ANGLEPerfTest::doRunLoop(double maxRunTime)
>+{
>+    mNumStepsPerformed = 0;
>+    mRunning           = true;
>     mTimer->start();
>+    startTest();
>+
>     while (mRunning)
>     {
>         step();
>         if (mRunning)
>         {
>             ++mNumStepsPerformed;
>-        }
>-        if (mTimer->getElapsedTime() > mRunTimeSeconds || g_OnlyOneRunFrame)
>-        {
>-            mRunning = false;
>+            if (mTimer->getElapsedTime() > maxRunTime)
>+            {
>+                mRunning = false;
>+            }
>+            else if (mNumStepsPerformed >= mStepsToRun)
>+            {
>+                mRunning = false;
>+            }
>         }
>     }
>     finishTest();
>     mTimer->stop();
> }
> 
>-void ANGLEPerfTest::printResult(const std::string &trace, double value, const std::string &units, bool important) const
>+void ANGLEPerfTest::printResult(const std::string &trace,
>+                                double value,
>+                                const std::string &units,
>+                                bool important) const
> {
>     perf_test::PrintResult(mName, mSuffix, trace, value, units, important);
> }
> 
>-void ANGLEPerfTest::printResult(const std::string &trace, size_t value, const std::string &units, bool important) const
>+void ANGLEPerfTest::printResult(const std::string &trace,
>+                                size_t value,
>+                                const std::string &units,
>+                                bool important) const
> {
>     perf_test::PrintResult(mName, mSuffix, trace, value, units, important);
> }
> 
>-void ANGLEPerfTest::SetUp()
>-{
>-}
>+void ANGLEPerfTest::SetUp() {}
>+
>+void ANGLEPerfTest::TearDown() {}
> 
>-void ANGLEPerfTest::TearDown()
>+double ANGLEPerfTest::printResults()
> {
>-    if (mSkipTest)
>+    double elapsedTimeSeconds[2] = {
>+        mTimer->getElapsedTime(),
>+        mGPUTimeNs * 1e-9,
>+    };
>+
>+    const char *clockNames[2] = {
>+        "wall_time",
>+        "gpu_time",
>+    };
>+
>+    // If measured gpu time is non-zero, print that too.
>+    size_t clocksToOutput = mGPUTimeNs > 0 ? 2 : 1;
>+
>+    double retValue = 0.0;
>+    for (size_t i = 0; i < clocksToOutput; ++i)
>     {
>-        return;
>+        double secondsPerStep = elapsedTimeSeconds[i] / static_cast<double>(mNumStepsPerformed);
>+        double secondsPerIteration = secondsPerStep / static_cast<double>(mIterationsPerStep);
>+
>+        // Give the result a different name to ensure separate graphs if we transition.
>+        if (secondsPerIteration > 1e-3)
>+        {
>+            double microSecondsPerIteration = secondsPerIteration * kMicroSecondsPerSecond;
>+            retValue                        = microSecondsPerIteration;
>+            printResult(clockNames[i], microSecondsPerIteration, "us", true);
>+        }
>+        else
>+        {
>+            double nanoSecPerIteration = secondsPerIteration * kNanoSecondsPerSecond;
>+            retValue                   = nanoSecPerIteration;
>+            printResult(clockNames[i], nanoSecPerIteration, "ns", true);
>+        }
>     }
>-    double relativeScore = static_cast<double>(mNumStepsPerformed) / mTimer->getElapsedTime();
>-    printResult("score", static_cast<size_t>(std::round(relativeScore)), "score", true);
>+    return retValue;
> }
> 
> double ANGLEPerfTest::normalizedTime(size_t value) const
>@@ -100,6 +311,19 @@ double ANGLEPerfTest::normalizedTime(size_t value) const
> 
> std::string RenderTestParams::suffix() const
> {
>+    switch (driver)
>+    {
>+        case angle::GLESDriverType::AngleEGL:
>+            break;
>+        case angle::GLESDriverType::SystemEGL:
>+            return "_native";
>+        case angle::GLESDriverType::SystemWGL:
>+            return "_wgl";
>+        default:
>+            assert(0);
>+            return "_unk";
>+    }
>+
>     switch (getRenderer())
>     {
>         case EGL_PLATFORM_ANGLE_TYPE_D3D11_ANGLE:
>@@ -121,55 +345,111 @@ std::string RenderTestParams::suffix() const
> }
> 
> ANGLERenderTest::ANGLERenderTest(const std::string &name, const RenderTestParams &testParams)
>-    : ANGLEPerfTest(name, testParams.suffix()),
>+    : ANGLEPerfTest(name, testParams.suffix(), OneFrame() ? 1 : testParams.iterationsPerStep),
>       mTestParams(testParams),
>-      mEGLWindow(createEGLWindow(testParams)),
>+      mGLWindow(nullptr),
>       mOSWindow(nullptr)
> {
>+    // Force fast tests to make sure our slowest bots don't time out.
>+    if (OneFrame())
>+    {
>+        const_cast<RenderTestParams &>(testParams).iterationsPerStep = 1;
>+    }
>+
>+    // Try to ensure we don't trigger allocation during execution.
>+    mTraceEventBuffer.reserve(kInitialTraceEventBufferSize);
>+
>+    switch (testParams.driver)
>+    {
>+        case angle::GLESDriverType::AngleEGL:
>+            mGLWindow = EGLWindow::New(testParams.majorVersion, testParams.minorVersion);
>+            mEntryPointsLib.reset(angle::OpenSharedLibrary(ANGLE_EGL_LIBRARY_NAME));
>+            break;
>+        case angle::GLESDriverType::SystemEGL:
>+            std::cerr << "Not implemented." << std::endl;
>+            mSkipTest = true;
>+            break;
>+        case angle::GLESDriverType::SystemWGL:
>+#if defined(ANGLE_USE_UTIL_LOADER) && defined(ANGLE_PLATFORM_WINDOWS)
>+            mGLWindow = WGLWindow::New(testParams.majorVersion, testParams.minorVersion);
>+            mEntryPointsLib.reset(angle::OpenSharedLibrary("opengl32"));
>+#else
>+            std::cout << "WGL driver not available. Skipping test." << std::endl;
>+            mSkipTest = true;
>+#endif  // defined(ANGLE_USE_UTIL_LOADER) && defined(ANGLE_PLATFORM_WINDOWS)
>+            break;
>+        default:
>+            std::cerr << "Error in switch." << std::endl;
>+            mSkipTest = true;
>+            break;
>+    }
> }
> 
>-ANGLERenderTest::ANGLERenderTest(const std::string &name,
>-                                 const RenderTestParams &testParams,
>-                                 const std::vector<std::string> &extensionPrerequisites)
>-    : ANGLEPerfTest(name, testParams.suffix()),
>-      mTestParams(testParams),
>-      mEGLWindow(createEGLWindow(testParams)),
>-      mOSWindow(nullptr),
>-      mExtensionPrerequisites(extensionPrerequisites)
>+ANGLERenderTest::~ANGLERenderTest()
> {
>+    OSWindow::Delete(&mOSWindow);
>+    GLWindowBase::Delete(&mGLWindow);
> }
> 
>-ANGLERenderTest::~ANGLERenderTest()
>+void ANGLERenderTest::addExtensionPrerequisite(const char *extensionName)
> {
>-    SafeDelete(mOSWindow);
>-    SafeDelete(mEGLWindow);
>+    mExtensionPrerequisites.push_back(extensionName);
> }
> 
> void ANGLERenderTest::SetUp()
> {
>+    if (mSkipTest)
>+    {
>+        return;
>+    }
>+
>     ANGLEPerfTest::SetUp();
> 
>-    mOSWindow = CreateOSWindow();
>-    ASSERT(mEGLWindow != nullptr);
>-    mEGLWindow->setSwapInterval(0);
>+    // Set a consistent CPU core affinity and high priority.
>+    angle::StabilizeCPUForBenchmarking();
>+
>+    mOSWindow = OSWindow::New();
>+
>+    if (!mGLWindow)
>+    {
>+        mSkipTest = true;
>+        return;
>+    }
> 
>-    mPlatformMethods.overrideWorkaroundsD3D = OverrideWorkaroundsD3D;
>-    mPlatformMethods.logError               = EmptyPlatformMethod;
>-    mPlatformMethods.logWarning             = EmptyPlatformMethod;
>-    mPlatformMethods.logInfo                = EmptyPlatformMethod;
>-    mPlatformMethods.context                = this;
>-    mEGLWindow->setPlatformMethods(&mPlatformMethods);
>+    mPlatformMethods.overrideWorkaroundsD3D      = OverrideWorkaroundsD3D;
>+    mPlatformMethods.logError                    = EmptyPlatformMethod;
>+    mPlatformMethods.logWarning                  = EmptyPlatformMethod;
>+    mPlatformMethods.logInfo                     = EmptyPlatformMethod;
>+    mPlatformMethods.addTraceEvent               = AddTraceEvent;
>+    mPlatformMethods.getTraceCategoryEnabledFlag = GetTraceCategoryEnabledFlag;
>+    mPlatformMethods.updateTraceEventDuration    = UpdateTraceEventDuration;
>+    mPlatformMethods.monotonicallyIncreasingTime = MonotonicallyIncreasingTime;
>+    mPlatformMethods.context                     = this;
> 
>     if (!mOSWindow->initialize(mName, mTestParams.windowWidth, mTestParams.windowHeight))
>     {
>+        mSkipTest = true;
>         FAIL() << "Failed initializing OSWindow";
>-        return;
>+        // FAIL returns.
>     }
> 
>-    if (!mEGLWindow->initializeGL(mOSWindow))
>+    // Override platform method parameter.
>+    EGLPlatformParameters withMethods = mTestParams.eglParameters;
>+    withMethods.platformMethods       = &mPlatformMethods;
>+
>+    if (!mGLWindow->initializeGL(mOSWindow, mEntryPointsLib.get(), withMethods, mConfigParams))
>     {
>-        FAIL() << "Failed initializing EGLWindow";
>-        return;
>+        mSkipTest = true;
>+        FAIL() << "Failed initializing GL Window";
>+        // FAIL returns.
>+    }
>+
>+    // Disable vsync.
>+    if (!mGLWindow->setSwapInterval(0))
>+    {
>+        mSkipTest = true;
>+        FAIL() << "Failed setting swap interval";
>+        // FAIL returns.
>     }
> 
>     if (!areExtensionPrerequisitesFulfilled())
>@@ -179,19 +459,43 @@ void ANGLERenderTest::SetUp()
> 
>     if (mSkipTest)
>     {
>-        std::cout << "Test skipped due to missing extension." << std::endl;
>         return;
>     }
> 
>     initializeBenchmark();
>+
>+    if (mTestParams.iterationsPerStep == 0)
>+    {
>+        mSkipTest = true;
>+        FAIL() << "Please initialize 'iterationsPerStep'.";
>+        // FAIL returns.
>+    }
> }
> 
> void ANGLERenderTest::TearDown()
> {
>-    destroyBenchmark();
>+    if (!mSkipTest)
>+    {
>+        destroyBenchmark();
>+    }
>+
>+    if (mGLWindow)
>+    {
>+        mGLWindow->destroyGL();
>+        mGLWindow = nullptr;
>+    }
> 
>-    mEGLWindow->destroyGL();
>-    mOSWindow->destroy();
>+    if (mOSWindow)
>+    {
>+        mOSWindow->destroy();
>+        mOSWindow = nullptr;
>+    }
>+
>+    // Dump trace events to json file.
>+    if (gEnableTrace)
>+    {
>+        DumpTraceEventsToJSONFile(mTraceEventBuffer, gTraceFile);
>+    }
> 
>     ANGLEPerfTest::TearDown();
> }
>@@ -217,19 +521,50 @@ void ANGLERenderTest::step()
>     else
>     {
>         drawBenchmark();
>-        // Swap is needed so that the GPU driver will occasionally flush its internal command queue
>-        // to the GPU. The null device benchmarks are only testing CPU overhead, so they don't need
>-        // to swap.
>-        if (mTestParams.eglParameters.deviceType != EGL_PLATFORM_ANGLE_DEVICE_TYPE_NULL_ANGLE)
>-        {
>-            mEGLWindow->swap();
>-        }
>+        // Swap is needed so that the GPU driver will occasionally flush its
>+        // internal command queue to the GPU. This is enabled for null back-end
>+        // devices because some back-ends (e.g. Vulkan) also accumulate internal
>+        // command queues.
>+        mGLWindow->swap();
>         mOSWindow->messageLoop();
>     }
> }
> 
>+void ANGLERenderTest::startGpuTimer()
>+{
>+    if (mTestParams.trackGpuTime)
>+    {
>+        glBeginQueryEXT(GL_TIME_ELAPSED_EXT, mTimestampQuery);
>+    }
>+}
>+
>+void ANGLERenderTest::stopGpuTimer()
>+{
>+    if (mTestParams.trackGpuTime)
>+    {
>+        glEndQueryEXT(GL_TIME_ELAPSED_EXT);
>+        uint64_t gpuTimeNs = 0;
>+        glGetQueryObjectui64vEXT(mTimestampQuery, GL_QUERY_RESULT_EXT, &gpuTimeNs);
>+
>+        mGPUTimeNs += gpuTimeNs;
>+    }
>+}
>+
>+void ANGLERenderTest::startTest()
>+{
>+    if (mTestParams.trackGpuTime)
>+    {
>+        glGenQueriesEXT(1, &mTimestampQuery);
>+        mGPUTimeNs = 0;
>+    }
>+}
>+
> void ANGLERenderTest::finishTest()
> {
>+    if (mTestParams.trackGpuTime)
>+    {
>+        glDeleteQueriesEXT(1, &mTimestampQuery);
>+    }
>     if (mTestParams.eglParameters.deviceType != EGL_PLATFORM_ANGLE_DEVICE_TYPE_NULL_ANGLE)
>     {
>         glFinish();
>@@ -248,11 +583,12 @@ OSWindow *ANGLERenderTest::getWindow()
> 
> bool ANGLERenderTest::areExtensionPrerequisitesFulfilled() const
> {
>-    for (const auto &extension : mExtensionPrerequisites)
>+    for (const char *extension : mExtensionPrerequisites)
>     {
>         if (!CheckExtensionExists(reinterpret_cast<const char *>(glGetString(GL_EXTENSIONS)),
>                                   extension))
>         {
>+            std::cout << "Test skipped due to missing extension: " << extension << std::endl;
>             return false;
>         }
>     }
>@@ -261,17 +597,15 @@ bool ANGLERenderTest::areExtensionPrerequisitesFulfilled() const
> 
> void ANGLERenderTest::setWebGLCompatibilityEnabled(bool webglCompatibility)
> {
>-    mEGLWindow->setWebGLCompatibilityEnabled(webglCompatibility);
>+    mConfigParams.webGLCompatibility = webglCompatibility;
> }
> 
> void ANGLERenderTest::setRobustResourceInit(bool enabled)
> {
>-    mEGLWindow->setRobustResourceInit(enabled);
>+    mConfigParams.robustResourceInit = enabled;
> }
> 
>-// static
>-EGLWindow *ANGLERenderTest::createEGLWindow(const RenderTestParams &testParams)
>+std::vector<TraceEvent> &ANGLERenderTest::getTraceEventBuffer()
> {
>-    return new EGLWindow(testParams.majorVersion, testParams.minorVersion,
>-                         testParams.eglParameters);
>+    return mTraceEventBuffer;
> }
>diff --git a/Source/ThirdParty/ANGLE/src/tests/perf_tests/ANGLEPerfTest.h b/Source/ThirdParty/ANGLE/src/tests/perf_tests/ANGLEPerfTest.h
>index fc15d97fe87..501d76e4644 100644
>--- a/Source/ThirdParty/ANGLE/src/tests/perf_tests/ANGLEPerfTest.h
>+++ b/Source/ThirdParty/ANGLE/src/tests/perf_tests/ANGLEPerfTest.h
>@@ -10,48 +10,74 @@
> #ifndef PERF_TESTS_ANGLE_PERF_TEST_H_
> #define PERF_TESTS_ANGLE_PERF_TEST_H_
> 
>+#include <gtest/gtest.h>
>+
> #include <string>
> #include <vector>
> 
>-#include <gtest/gtest.h>
>-#include <EGL/egl.h>
>-#include <EGL/eglext.h>
>-
>-#include "EGLWindow.h"
>-#include "OSWindow.h"
>-#include "Timer.h"
>-#include "common/angleutils.h"
>-#include "common/debug.h"
> #include "platform/Platform.h"
> #include "test_utils/angle_test_configs.h"
> #include "test_utils/angle_test_instantiate.h"
>+#include "util/EGLWindow.h"
>+#include "util/OSWindow.h"
>+#include "util/Timer.h"
>+#include "util/util_gl.h"
> 
> class Event;
> 
> #if !defined(ASSERT_GL_NO_ERROR)
>-#define ASSERT_GL_NO_ERROR() ASSERT_EQ(static_cast<GLenum>(GL_NO_ERROR), glGetError())
>+#    define ASSERT_GL_NO_ERROR() ASSERT_EQ(static_cast<GLenum>(GL_NO_ERROR), glGetError())
> #endif  // !defined(ASSERT_GL_NO_ERROR)
> 
> #if !defined(ASSERT_GLENUM_EQ)
>-#define ASSERT_GLENUM_EQ(expected, actual) \
>-    ASSERT_EQ(static_cast<GLenum>(expected), static_cast<GLenum>(actual))
>+#    define ASSERT_GLENUM_EQ(expected, actual) \
>+        ASSERT_EQ(static_cast<GLenum>(expected), static_cast<GLenum>(actual))
> #endif  // !defined(ASSERT_GLENUM_EQ)
> 
>+// These are trace events according to Google's "Trace Event Format".
>+// See https://docs.google.com/document/d/1CvAClvFfyA5R-PhYUmn5OOQtYMH4h6I0nSsKchNAySU
>+// Only a subset of the properties are implemented.
>+struct TraceEvent final
>+{
>+    TraceEvent() {}
>+
>+    TraceEvent(char phaseIn, const char *categoryNameIn, const char *nameIn, double timestampIn)
>+        : phase(phaseIn), categoryName(categoryNameIn), name(nameIn), timestamp(timestampIn)
>+    {}
>+
>+    char phase               = 0;
>+    const char *categoryName = nullptr;
>+    const char *name         = nullptr;
>+    double timestamp         = 0;
>+};
>+
> class ANGLEPerfTest : public testing::Test, angle::NonCopyable
> {
>   public:
>-    ANGLEPerfTest(const std::string &name, const std::string &suffix);
>+    ANGLEPerfTest(const std::string &name,
>+                  const std::string &suffix,
>+                  unsigned int iterationsPerStep);
>     virtual ~ANGLEPerfTest();
> 
>     virtual void step() = 0;
> 
>+    // Called right after the timer starts to let the test initialize other metrics if necessary
>+    virtual void startTest() {}
>     // Called right before timer is stopped to let the test wait for asynchronous operations.
>     virtual void finishTest() {}
> 
>+    Timer *getTimer() const { return mTimer; }
>+
>   protected:
>     void run();
>-    void printResult(const std::string &trace, double value, const std::string &units, bool important) const;
>-    void printResult(const std::string &trace, size_t value, const std::string &units, bool important) const;
>+    void printResult(const std::string &trace,
>+                     double value,
>+                     const std::string &units,
>+                     bool important) const;
>+    void printResult(const std::string &trace,
>+                     size_t value,
>+                     const std::string &units,
>+                     bool important) const;
>     void SetUp() override;
>     void TearDown() override;
> 
>@@ -62,37 +88,45 @@ class ANGLEPerfTest : public testing::Test, angle::NonCopyable
>     void abortTest() { mRunning = false; }
> 
>     unsigned int getNumStepsPerformed() const { return mNumStepsPerformed; }
>+    void doRunLoop(double maxRunTime);
> 
>     std::string mName;
>     std::string mSuffix;
>     Timer *mTimer;
>-    double mRunTimeSeconds;
>+    uint64_t mGPUTimeNs;
>     bool mSkipTest;
> 
>   private:
>+    double printResults();
>+
>+    unsigned int mStepsToRun;
>     unsigned int mNumStepsPerformed;
>+    unsigned int mIterationsPerStep;
>     bool mRunning;
> };
> 
> struct RenderTestParams : public angle::PlatformParameters
> {
>+    virtual ~RenderTestParams() {}
>+
>     virtual std::string suffix() const;
> 
>-    EGLint windowWidth  = 64;
>-    EGLint windowHeight = 64;
>+    EGLint windowWidth             = 64;
>+    EGLint windowHeight            = 64;
>+    unsigned int iterationsPerStep = 0;
>+    bool trackGpuTime              = false;
> };
> 
> class ANGLERenderTest : public ANGLEPerfTest
> {
>   public:
>     ANGLERenderTest(const std::string &name, const RenderTestParams &testParams);
>-    ANGLERenderTest(const std::string &name,
>-                    const RenderTestParams &testParams,
>-                    const std::vector<std::string> &extensionPrerequisites);
>     ~ANGLERenderTest();
> 
>-    virtual void initializeBenchmark() { }
>-    virtual void destroyBenchmark() { }
>+    void addExtensionPrerequisite(const char *extensionName);
>+
>+    virtual void initializeBenchmark() {}
>+    virtual void destroyBenchmark() {}
> 
>     virtual void drawBenchmark() = 0;
> 
>@@ -100,6 +134,8 @@ class ANGLERenderTest : public ANGLEPerfTest
> 
>     OSWindow *getWindow();
> 
>+    std::vector<TraceEvent> &getTraceEventBuffer();
>+
>     virtual void overrideWorkaroundsD3D(angle::WorkaroundsD3D *workaroundsD3D) {}
> 
>   protected:
>@@ -108,23 +144,32 @@ class ANGLERenderTest : public ANGLEPerfTest
>     void setWebGLCompatibilityEnabled(bool webglCompatibility);
>     void setRobustResourceInit(bool enabled);
> 
>+    void startGpuTimer();
>+    void stopGpuTimer();
>+
>   private:
>     void SetUp() override;
>     void TearDown() override;
> 
>     void step() override;
>+    void startTest() override;
>     void finishTest() override;
> 
>     bool areExtensionPrerequisitesFulfilled() const;
> 
>-    static EGLWindow *createEGLWindow(const RenderTestParams &testParams);
>-
>-    EGLWindow *mEGLWindow;
>+    GLWindowBase *mGLWindow;
>     OSWindow *mOSWindow;
>-    std::vector<std::string> mExtensionPrerequisites;
>+    std::vector<const char *> mExtensionPrerequisites;
>     angle::PlatformMethods mPlatformMethods;
>-};
>+    ConfigParameters mConfigParams;
>+
>+    GLuint mTimestampQuery;
> 
>-extern bool g_OnlyOneRunFrame;
>+    // Trace event record that can be output.
>+    std::vector<TraceEvent> mTraceEventBuffer;
>+
>+    // Handle to the entry point binding library.
>+    std::unique_ptr<angle::Library> mEntryPointsLib;
>+};
> 
>-#endif // PERF_TESTS_ANGLE_PERF_TEST_H_
>+#endif  // PERF_TESTS_ANGLE_PERF_TEST_H_
>diff --git a/Source/ThirdParty/ANGLE/src/tests/perf_tests/ANGLEPerfTestArgs.cpp b/Source/ThirdParty/ANGLE/src/tests/perf_tests/ANGLEPerfTestArgs.cpp
>new file mode 100644
>index 00000000000..270a8ea9b98
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/tests/perf_tests/ANGLEPerfTestArgs.cpp
>@@ -0,0 +1,65 @@
>+//
>+// Copyright 2019 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// ANGLEPerfTestArgs.cpp:
>+//   Parse command line arguments for angle_perftests.
>+//
>+
>+#include "ANGLEPerfTestArgs.h"
>+#include <string.h>
>+#include <sstream>
>+
>+namespace angle
>+{
>+bool gCalibration = false;
>+Optional<unsigned int> gStepsToRunOverride;
>+bool gEnableTrace      = false;
>+const char *gTraceFile = "ANGLETrace.json";
>+}  // namespace angle
>+
>+using namespace angle;
>+
>+void ANGLEProcessPerfTestArgs(int *argc, char **argv)
>+{
>+    int argcOutCount = 0;
>+
>+    for (int argIndex = 0; argIndex < *argc; argIndex++)
>+    {
>+        if (strcmp("--one-frame-only", argv[argIndex]) == 0)
>+        {
>+            gStepsToRunOverride = 1;
>+        }
>+        else if (strcmp("--enable-trace", argv[argIndex]) == 0)
>+        {
>+            gEnableTrace = true;
>+        }
>+        else if (strcmp("--trace-file", argv[argIndex]) == 0 && argIndex < *argc - 1)
>+        {
>+            gTraceFile = argv[argIndex];
>+            // Skip an additional argument.
>+            argIndex++;
>+        }
>+        else if (strcmp("--calibration", argv[argIndex]) == 0)
>+        {
>+            gCalibration = true;
>+        }
>+        else if (strcmp("--steps", argv[argIndex]) == 0 && argIndex < *argc - 1)
>+        {
>+            unsigned int stepsToRun = 0;
>+            std::stringstream strstr;
>+            strstr << argv[argIndex + 1];
>+            strstr >> stepsToRun;
>+            gStepsToRunOverride = stepsToRun;
>+            // Skip an additional argument.
>+            argIndex++;
>+        }
>+        else
>+        {
>+            argv[argcOutCount++] = argv[argIndex];
>+        }
>+    }
>+
>+    *argc = argcOutCount;
>+}
>diff --git a/Source/ThirdParty/ANGLE/src/tests/perf_tests/ANGLEPerfTestArgs.h b/Source/ThirdParty/ANGLE/src/tests/perf_tests/ANGLEPerfTestArgs.h
>new file mode 100644
>index 00000000000..fb17ec64ba5
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/tests/perf_tests/ANGLEPerfTestArgs.h
>@@ -0,0 +1,28 @@
>+//
>+// Copyright 2019 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// ANGLEPerfTestArgs.h:
>+//   Command line arguments for angle_perftests.
>+//
>+
>+#ifndef TESTS_PERF_TESTS_ANGLE_PERF_TEST_ARGS_H_
>+#define TESTS_PERF_TESTS_ANGLE_PERF_TEST_ARGS_H_
>+
>+#include "common/Optional.h"
>+
>+namespace angle
>+{
>+extern bool gCalibration;
>+extern Optional<unsigned int> gStepsToRunOverride;
>+extern bool gEnableTrace;
>+extern const char *gTraceFile;
>+
>+inline bool OneFrame()
>+{
>+    return gStepsToRunOverride.valid() && gStepsToRunOverride.value() == 1;
>+}
>+}  // namespace angle
>+
>+#endif  // TESTS_PERF_TESTS_ANGLE_PERF_TEST_ARGS_H_
>diff --git a/Source/ThirdParty/ANGLE/src/tests/perf_tests/BindingPerf.cpp b/Source/ThirdParty/ANGLE/src/tests/perf_tests/BindingPerf.cpp
>index 1d8466f878d..680ba5d4872 100644
>--- a/Source/ThirdParty/ANGLE/src/tests/perf_tests/BindingPerf.cpp
>+++ b/Source/ThirdParty/ANGLE/src/tests/perf_tests/BindingPerf.cpp
>@@ -13,10 +13,11 @@
> #include <random>
> #include <sstream>
> 
>-#include "shader_utils.h"
>+#include "util/shader_utils.h"
> 
> namespace angle
> {
>+constexpr unsigned int kIterationsPerStep = 128;
> 
> enum AllocationStyle
> {
>@@ -33,18 +34,15 @@ struct BindingsParams final : public RenderTestParams
>         minorVersion = 0;
>         windowWidth  = 720;
>         windowHeight = 720;
>-        iterations   = 128;
> 
>-        numObjects      = 100;
>-        allocationStyle = EVERY_ITERATION;
>+        numObjects        = 100;
>+        allocationStyle   = EVERY_ITERATION;
>+        iterationsPerStep = kIterationsPerStep;
>     }
> 
>     std::string suffix() const override;
>     size_t numObjects;
>     AllocationStyle allocationStyle;
>-
>-    // static parameters
>-    size_t iterations;
> };
> 
> std::ostream &operator<<(std::ostream &os, const BindingsParams &params)
>@@ -69,7 +67,8 @@ std::string BindingsParams::suffix() const
>             strstr << "_allocated_at_initialization";
>             break;
>         default:
>-            UNREACHABLE();
>+            strstr << "_err";
>+            break;
>     }
> 
>     return strstr.str();
>@@ -91,14 +90,11 @@ class BindingsBenchmark : public ANGLERenderTest,
>     std::vector<GLenum> mBindingPoints;
> };
> 
>-BindingsBenchmark::BindingsBenchmark() : ANGLERenderTest("Bindings", GetParam())
>-{
>-}
>+BindingsBenchmark::BindingsBenchmark() : ANGLERenderTest("Bindings", GetParam()) {}
> 
> void BindingsBenchmark::initializeBenchmark()
> {
>     const auto &params = GetParam();
>-    ASSERT_GT(params.iterations, 0u);
> 
>     mBuffers.resize(params.numObjects, 0);
>     if (params.allocationStyle == AT_INITIALIZATION)
>@@ -144,7 +140,7 @@ void BindingsBenchmark::drawBenchmark()
> {
>     const auto &params = GetParam();
> 
>-    for (size_t it = 0; it < params.iterations; ++it)
>+    for (unsigned int it = 0; it < params.iterationsPerStep; ++it)
>     {
>         // Generate a buffer (if needed) and bind it to a "random" binding point
>         if (params.allocationStyle == EVERY_ITERATION)
>@@ -152,10 +148,23 @@ void BindingsBenchmark::drawBenchmark()
>             glGenBuffers(static_cast<GLsizei>(mBuffers.size()), mBuffers.data());
>         }
> 
>-        for (size_t bufferIdx = 0; bufferIdx < mBuffers.size(); bufferIdx++)
>+        // Fetch a few variables from the underlying data structure to keep them in registers.
>+        // Otherwise each loop iteration they'll be fetched again because the compiler cannot
>+        // guarantee that those are unchanged when calling glBindBuffer.
>+        unsigned int *buffers       = mBuffers.data();
>+        unsigned int *bindingPoints = mBindingPoints.data();
>+        size_t bindingPointsSize    = mBindingPoints.size();
>+        size_t buffersSize          = mBuffers.size();
>+        size_t bindingIndex         = it % bindingPointsSize;
>+        for (size_t bufferIdx = 0; bufferIdx < buffersSize; bufferIdx++)
>         {
>-            GLenum binding = mBindingPoints[(bufferIdx + it) % mBindingPoints.size()];
>-            glBindBuffer(binding, mBuffers[bufferIdx]);
>+            GLenum binding = bindingPoints[bindingIndex];
>+            glBindBuffer(binding, buffers[bufferIdx]);
>+
>+            // Instead of doing a costly division to get an index in the range [0,bindingPointsSize)
>+            // do a bounds-check and reset the index.
>+            ++bindingIndex;
>+            bindingIndex = (bindingIndex >= bindingPointsSize) ? 0 : bindingIndex;
>         }
> 
>         // Delete all the buffers
>@@ -192,6 +201,14 @@ BindingsParams OpenGLOrGLESParams(AllocationStyle allocationStyle)
>     return params;
> }
> 
>+BindingsParams VulkanParams(AllocationStyle allocationStyle)
>+{
>+    BindingsParams params;
>+    params.eglParameters   = egl_platform::VULKAN_NULL();
>+    params.allocationStyle = allocationStyle;
>+    return params;
>+}
>+
> TEST_P(BindingsBenchmark, Run)
> {
>     run();
>@@ -203,6 +220,8 @@ ANGLE_INSTANTIATE_TEST(BindingsBenchmark,
>                        D3D9Params(EVERY_ITERATION),
>                        D3D9Params(AT_INITIALIZATION),
>                        OpenGLOrGLESParams(EVERY_ITERATION),
>-                       OpenGLOrGLESParams(AT_INITIALIZATION));
>+                       OpenGLOrGLESParams(AT_INITIALIZATION),
>+                       VulkanParams(EVERY_ITERATION),
>+                       VulkanParams(AT_INITIALIZATION));
> 
> }  // namespace angle
>diff --git a/Source/ThirdParty/ANGLE/src/tests/perf_tests/BitSetIteratorPerf.cpp b/Source/ThirdParty/ANGLE/src/tests/perf_tests/BitSetIteratorPerf.cpp
>index b19be856d83..6b60f68627a 100644
>--- a/Source/ThirdParty/ANGLE/src/tests/perf_tests/BitSetIteratorPerf.cpp
>+++ b/Source/ThirdParty/ANGLE/src/tests/perf_tests/BitSetIteratorPerf.cpp
>@@ -11,7 +11,6 @@
> 
> #include <gmock/gmock.h>
> 
>-#include "angle_unittests_utils.h"
> #include "common/bitset_utils.h"
> 
> using namespace testing;
>@@ -31,9 +30,8 @@ class BitSetIteratorPerfTest : public ANGLEPerfTest
> };
> 
> template <typename T>
>-BitSetIteratorPerfTest<T>::BitSetIteratorPerfTest() : ANGLEPerfTest("BitSetIteratorPerf", "_run")
>-{
>-}
>+BitSetIteratorPerfTest<T>::BitSetIteratorPerfTest() : ANGLEPerfTest("BitSetIteratorPerf", "_run", 1)
>+{}
> 
> template <typename T>
> void BitSetIteratorPerfTest<T>::step()
>@@ -42,7 +40,7 @@ void BitSetIteratorPerfTest<T>::step()
> 
>     for (size_t bit : mBits)
>     {
>-        UNUSED_VARIABLE(bit);
>+        ANGLE_UNUSED_VARIABLE(bit);
>     }
> 
>     mBits.reset();
>@@ -54,7 +52,7 @@ using TestTypes = Types<angle::IterableBitSet<32>, angle::BitSet32<32>, angle::B
> #else
> using TestTypes = Types<angle::IterableBitSet<32>, angle::BitSet32<32>>;
> #endif  // defined(ANGLE_IS_64_BIT_CPU)
>-TYPED_TEST_CASE(BitSetIteratorPerfTest, TestTypes);
>+TYPED_TEST_SUITE(BitSetIteratorPerfTest, TestTypes);
> 
> TYPED_TEST(BitSetIteratorPerfTest, Run)
> {
>diff --git a/Source/ThirdParty/ANGLE/src/tests/perf_tests/BlitFramebufferPerf.cpp b/Source/ThirdParty/ANGLE/src/tests/perf_tests/BlitFramebufferPerf.cpp
>index a2f6938afb8..de9d536ceb5 100644
>--- a/Source/ThirdParty/ANGLE/src/tests/perf_tests/BlitFramebufferPerf.cpp
>+++ b/Source/ThirdParty/ANGLE/src/tests/perf_tests/BlitFramebufferPerf.cpp
>@@ -10,8 +10,11 @@
> 
> #include "ANGLEPerfTest.h"
> 
>+#include "util/gles_loader_autogen.h"
>+
> namespace
> {
>+constexpr unsigned int kIterationsPerStep = 5;
> 
> enum class BufferType
> {
>@@ -93,10 +96,11 @@ struct BlitFramebufferParams final : public RenderTestParams
> {
>     BlitFramebufferParams()
>     {
>-        majorVersion = 3;
>-        minorVersion = 0;
>-        windowWidth  = 256;
>-        windowHeight = 256;
>+        iterationsPerStep = kIterationsPerStep;
>+        majorVersion      = 3;
>+        minorVersion      = 0;
>+        windowWidth       = 256;
>+        windowHeight      = 256;
>     }
> 
>     std::string suffix() const override
>@@ -114,7 +118,6 @@ struct BlitFramebufferParams final : public RenderTestParams
>     BufferType type              = BufferType::COLOR;
>     unsigned int framebufferSize = 512;
>     unsigned int samples         = 0;
>-    unsigned int iterations      = 5;
> };
> 
> std::ostream &operator<<(std::ostream &os, const BlitFramebufferParams &params)
>@@ -216,7 +219,7 @@ void BlitFramebufferPerf::drawBenchmark()
>             break;
>     }
> 
>-    for (unsigned int iteration = 0; iteration < param.iterations; ++iteration)
>+    for (unsigned int iteration = 0; iteration < param.iterationsPerStep; ++iteration)
>     {
>         glBlitFramebuffer(0, 0, size, size, 0, 0, size, size, mask, GL_NEAREST);
>     }
>@@ -235,7 +238,6 @@ BlitFramebufferParams D3D11(BufferType type, unsigned int samples)
>     params.samples       = samples;
>     return params;
> }
>-
> }  // anonymous namespace
> 
> // TODO(jmadill): Programatically generate these combinations.
>@@ -247,4 +249,4 @@ ANGLE_INSTANTIATE_TEST(BlitFramebufferPerf,
>                        D3D11(BufferType::COLOR, 2),
>                        D3D11(BufferType::DEPTH, 2),
>                        D3D11(BufferType::STENCIL, 2),
>-                       D3D11(BufferType::DEPTH_STENCIL, 2))
>+                       D3D11(BufferType::DEPTH_STENCIL, 2));
>diff --git a/Source/ThirdParty/ANGLE/src/tests/perf_tests/BufferSubData.cpp b/Source/ThirdParty/ANGLE/src/tests/perf_tests/BufferSubData.cpp
>index b31f925a837..5ad1f904595 100644
>--- a/Source/ThirdParty/ANGLE/src/tests/perf_tests/BufferSubData.cpp
>+++ b/Source/ThirdParty/ANGLE/src/tests/perf_tests/BufferSubData.cpp
>@@ -16,20 +16,21 @@ using namespace angle;
> 
> namespace
> {
>+constexpr unsigned int kIterationsPerStep = 4;
> 
> struct BufferSubDataParams final : public RenderTestParams
> {
>     BufferSubDataParams()
>     {
>         // Common default values
>-        majorVersion = 2;
>-        minorVersion = 0;
>-        windowWidth = 512;
>-        windowHeight = 512;
>-        updateSize = 3000;
>-        bufferSize = 40000000;
>-        iterations   = 4;
>-        updateRate = 1;
>+        majorVersion      = 2;
>+        minorVersion      = 0;
>+        windowWidth       = 512;
>+        windowHeight      = 512;
>+        updateSize        = 3000;
>+        bufferSize        = 40000000;
>+        iterationsPerStep = kIterationsPerStep;
>+        updateRate        = 1;
>     }
> 
>     std::string suffix() const override;
>@@ -42,7 +43,6 @@ struct BufferSubDataParams final : public RenderTestParams
>     // static parameters
>     GLsizeiptr updateSize;
>     GLsizeiptr bufferSize;
>-    unsigned int iterations;
> };
> 
> std::ostream &operator<<(std::ostream &os, const BufferSubDataParams &params)
>@@ -70,25 +70,16 @@ class BufferSubDataBenchmark : public ANGLERenderTest,
> 
> GLfloat *GetFloatData(GLint componentCount)
> {
>-    static GLfloat vertices2[] =
>-    {
>-        1, 2,
>-        0, 0,
>-        2, 0,
>+    static GLfloat vertices2[] = {
>+        1, 2, 0, 0, 2, 0,
>     };
> 
>-    static GLfloat vertices3[] =
>-    {
>-        1, 2, 1,
>-        0, 0, 1,
>-        2, 0, 1,
>+    static GLfloat vertices3[] = {
>+        1, 2, 1, 0, 0, 1, 2, 0, 1,
>     };
> 
>-    static GLfloat vertices4[] =
>-    {
>-        1, 2, 1, 3,
>-        0, 0, 1, 3,
>-        2, 0, 1, 3,
>+    static GLfloat vertices4[] = {
>+        1, 2, 1, 3, 0, 0, 1, 3, 2, 0, 1, 3,
>     };
> 
>     switch (componentCount)
>@@ -110,12 +101,13 @@ GLsizeiptr GetNormalizedData(GLsizeiptr numElements, GLfloat *floatData, std::ve
>     GLsizeiptr triDataSize = sizeof(T) * numElements;
>     data->resize(triDataSize);
> 
>-    T *destPtr = reinterpret_cast<T*>(data->data());
>+    T *destPtr = reinterpret_cast<T *>(data->data());
> 
>     for (GLsizeiptr dataIndex = 0; dataIndex < numElements; dataIndex++)
>     {
>         GLfloat scaled = floatData[dataIndex] * 0.25f;
>-        destPtr[dataIndex] = static_cast<T>(scaled * static_cast<GLfloat>(std::numeric_limits<T>::max()));
>+        destPtr[dataIndex] =
>+            static_cast<T>(scaled * static_cast<GLfloat>(std::numeric_limits<T>::max()));
>     }
> 
>     return triDataSize;
>@@ -127,7 +119,7 @@ GLsizeiptr GetIntData(GLsizeiptr numElements, GLfloat *floatData, std::vector<ui
>     GLsizeiptr triDataSize = sizeof(T) * numElements;
>     data->resize(triDataSize);
> 
>-    T *destPtr = reinterpret_cast<T*>(data->data());
>+    T *destPtr = reinterpret_cast<T *>(data->data());
> 
>     for (GLsizeiptr dataIndex = 0; dataIndex < numElements; dataIndex++)
>     {
>@@ -137,10 +129,13 @@ GLsizeiptr GetIntData(GLsizeiptr numElements, GLfloat *floatData, std::vector<ui
>     return triDataSize;
> }
> 
>-GLsizeiptr GetVertexData(GLenum type, GLint componentCount, GLboolean normalized, std::vector<uint8_t> *data)
>+GLsizeiptr GetVertexData(GLenum type,
>+                         GLint componentCount,
>+                         GLboolean normalized,
>+                         std::vector<uint8_t> *data)
> {
>     GLsizeiptr triDataSize = 0;
>-    GLfloat *floatData = GetFloatData(componentCount);
>+    GLfloat *floatData     = GetFloatData(componentCount);
> 
>     if (type == GL_FLOAT)
>     {
>@@ -259,15 +254,13 @@ BufferSubDataBenchmark::BufferSubDataBenchmark()
>       mBuffer(0),
>       mUpdateData(nullptr),
>       mNumTris(0)
>-{
>-}
>+{}
> 
> void BufferSubDataBenchmark::initializeBenchmark()
> {
>     const auto &params = GetParam();
> 
>     ASSERT_LT(1, params.vertexComponentCount);
>-    ASSERT_LT(0u, params.iterations);
> 
>     mProgram = SetupSimpleScaleAndOffsetProgram();
>     ASSERT_NE(0u, mProgram);
>@@ -299,9 +292,8 @@ void BufferSubDataBenchmark::initializeBenchmark()
>     }
> 
>     std::vector<uint8_t> data;
>-    GLsizei triDataSize = static_cast<GLsizei>(GetVertexData(params.vertexType,
>-                                                             params.vertexComponentCount,
>-                                                             params.vertexNormalized, &data));
>+    GLsizei triDataSize = static_cast<GLsizei>(GetVertexData(
>+        params.vertexType, params.vertexComponentCount, params.vertexNormalized, &data));
> 
>     mNumTris = static_cast<int>(params.updateSize / triDataSize);
>     for (int i = 0, offset = 0; i < mNumTris; ++i)
>@@ -335,7 +327,7 @@ void BufferSubDataBenchmark::drawBenchmark()
> 
>     const auto &params = GetParam();
> 
>-    for (unsigned int it = 0; it < params.iterations; it++)
>+    for (unsigned int it = 0; it < params.iterationsPerStep; it++)
>     {
>         if (params.updateSize > 0 && ((getNumStepsPerformed() % params.updateRate) == 0))
>         {
>@@ -351,20 +343,20 @@ void BufferSubDataBenchmark::drawBenchmark()
> BufferSubDataParams BufferUpdateD3D11Params()
> {
>     BufferSubDataParams params;
>-    params.eglParameters = egl_platform::D3D11();
>-    params.vertexType = GL_FLOAT;
>+    params.eglParameters        = egl_platform::D3D11();
>+    params.vertexType           = GL_FLOAT;
>     params.vertexComponentCount = 4;
>-    params.vertexNormalized = GL_FALSE;
>+    params.vertexNormalized     = GL_FALSE;
>     return params;
> }
> 
> BufferSubDataParams BufferUpdateD3D9Params()
> {
>     BufferSubDataParams params;
>-    params.eglParameters = egl_platform::D3D9();
>-    params.vertexType = GL_FLOAT;
>+    params.eglParameters        = egl_platform::D3D9();
>+    params.vertexType           = GL_FLOAT;
>     params.vertexComponentCount = 4;
>-    params.vertexNormalized = GL_FALSE;
>+    params.vertexNormalized     = GL_FALSE;
>     return params;
> }
> 
>@@ -372,9 +364,19 @@ BufferSubDataParams BufferUpdateOpenGLOrGLESParams()
> {
>     BufferSubDataParams params;
>     params.eglParameters        = egl_platform::OPENGL_OR_GLES(false);
>-    params.vertexType = GL_FLOAT;
>+    params.vertexType           = GL_FLOAT;
>+    params.vertexComponentCount = 4;
>+    params.vertexNormalized     = GL_FALSE;
>+    return params;
>+}
>+
>+BufferSubDataParams BufferUpdateVulkanParams()
>+{
>+    BufferSubDataParams params;
>+    params.eglParameters        = egl_platform::VULKAN();
>+    params.vertexType           = GL_FLOAT;
>     params.vertexComponentCount = 4;
>-    params.vertexNormalized = GL_FALSE;
>+    params.vertexNormalized     = GL_FALSE;
>     return params;
> }
> 
>@@ -386,6 +388,7 @@ TEST_P(BufferSubDataBenchmark, Run)
> ANGLE_INSTANTIATE_TEST(BufferSubDataBenchmark,
>                        BufferUpdateD3D11Params(),
>                        BufferUpdateD3D9Params(),
>-                       BufferUpdateOpenGLOrGLESParams());
>+                       BufferUpdateOpenGLOrGLESParams(),
>+                       BufferUpdateVulkanParams());
> 
>-} // namespace
>+}  // namespace
>diff --git a/Source/ThirdParty/ANGLE/src/tests/perf_tests/ClearPerf.cpp b/Source/ThirdParty/ANGLE/src/tests/perf_tests/ClearPerf.cpp
>new file mode 100644
>index 00000000000..3d9f44aecfa
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/tests/perf_tests/ClearPerf.cpp
>@@ -0,0 +1,200 @@
>+//
>+// Copyright 2019 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// ClearPerf:
>+//   Performance test for clearing framebuffers.
>+//
>+
>+#include "ANGLEPerfTest.h"
>+
>+#include <iostream>
>+#include <random>
>+#include <sstream>
>+
>+#include "test_utils/gl_raii.h"
>+#include "util/shader_utils.h"
>+
>+using namespace angle;
>+
>+namespace
>+{
>+constexpr unsigned int kIterationsPerStep = 256;
>+
>+struct ClearParams final : public RenderTestParams
>+{
>+    ClearParams()
>+    {
>+        iterationsPerStep = kIterationsPerStep;
>+        trackGpuTime      = true;
>+
>+        fboSize     = 2048;
>+        textureSize = 16;
>+    }
>+
>+    std::string suffix() const override;
>+
>+    GLsizei fboSize;
>+    GLsizei textureSize;
>+};
>+
>+std::ostream &operator<<(std::ostream &os, const ClearParams &params)
>+{
>+    os << params.suffix().substr(1);
>+    return os;
>+}
>+
>+std::string ClearParams::suffix() const
>+{
>+    std::stringstream strstr;
>+
>+    strstr << RenderTestParams::suffix();
>+
>+    return strstr.str();
>+}
>+
>+class ClearBenchmark : public ANGLERenderTest, public ::testing::WithParamInterface<ClearParams>
>+{
>+  public:
>+    ClearBenchmark();
>+
>+    void initializeBenchmark() override;
>+    void destroyBenchmark() override;
>+    void drawBenchmark() override;
>+
>+  private:
>+    void initShaders();
>+
>+    std::vector<GLuint> mTextures;
>+
>+    GLuint mProgram;
>+    GLuint mPositionLoc;
>+    GLuint mSamplerLoc;
>+};
>+
>+ClearBenchmark::ClearBenchmark()
>+    : ANGLERenderTest("Clear", GetParam()), mProgram(0u), mPositionLoc(-1), mSamplerLoc(-1)
>+{
>+    // Crashes on nvidia+d3d11. http://crbug.com/945415
>+    if (GetParam().getRenderer() == EGL_PLATFORM_ANGLE_TYPE_D3D11_ANGLE)
>+    {
>+        mSkipTest = true;
>+    }
>+}
>+
>+void ClearBenchmark::initializeBenchmark()
>+{
>+    initShaders();
>+    glClearColor(0.0f, 0.0f, 0.0f, 0.0f);
>+    glViewport(0, 0, getWindow()->getWidth(), getWindow()->getHeight());
>+
>+    ASSERT_GL_NO_ERROR();
>+}
>+
>+void ClearBenchmark::initShaders()
>+{
>+    constexpr char kVS[] = R"(attribute vec4 a_position;
>+void main()
>+{
>+    gl_Position = a_position;
>+})";
>+
>+    constexpr char kFS[] = R"(precision mediump float;
>+uniform sampler2D s_texture;
>+void main()
>+{
>+    gl_FragColor = texture2D(s_texture, vec2(0, 0));
>+})";
>+
>+    mProgram = CompileProgram(kVS, kFS);
>+    ASSERT_NE(0u, mProgram);
>+
>+    mPositionLoc = glGetAttribLocation(mProgram, "a_position");
>+    mSamplerLoc  = glGetUniformLocation(mProgram, "s_texture");
>+    glUseProgram(mProgram);
>+
>+    glDisable(GL_DEPTH_TEST);
>+
>+    ASSERT_GL_NO_ERROR();
>+}
>+
>+void ClearBenchmark::destroyBenchmark()
>+{
>+    glDeleteProgram(mProgram);
>+}
>+
>+void ClearBenchmark::drawBenchmark()
>+{
>+    const auto &params = GetParam();
>+
>+    std::vector<float> textureData(params.textureSize * params.textureSize * 4, 0.5);
>+
>+    GLTexture tex;
>+
>+    glActiveTexture(GL_TEXTURE0);
>+    glBindTexture(GL_TEXTURE_2D, tex);
>+
>+    glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, params.textureSize, params.textureSize, 0, GL_RGBA,
>+                 GL_UNSIGNED_BYTE, textureData.data());
>+
>+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
>+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
>+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
>+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
>+
>+    glUniform1i(mSamplerLoc, 0);
>+
>+    GLRenderbuffer colorRbo;
>+    glBindRenderbuffer(GL_RENDERBUFFER, colorRbo);
>+    glRenderbufferStorage(GL_RENDERBUFFER, GL_RGBA8, params.fboSize, params.fboSize);
>+
>+    GLRenderbuffer depthRbo;
>+    glBindRenderbuffer(GL_RENDERBUFFER, depthRbo);
>+    glRenderbufferStorage(GL_RENDERBUFFER, GL_DEPTH_COMPONENT16, params.fboSize, params.fboSize);
>+
>+    GLFramebuffer fbo;
>+    glBindFramebuffer(GL_FRAMEBUFFER, fbo);
>+    glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_RENDERBUFFER, colorRbo);
>+    glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, GL_RENDERBUFFER, depthRbo);
>+
>+    startGpuTimer();
>+    for (size_t it = 0; it < params.iterationsPerStep; ++it)
>+    {
>+        glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
>+        glDrawArrays(GL_TRIANGLES, 0, 3);
>+    }
>+    stopGpuTimer();
>+
>+    ASSERT_GL_NO_ERROR();
>+}
>+
>+ClearParams D3D11Params()
>+{
>+    ClearParams params;
>+    params.eglParameters = egl_platform::D3D11();
>+    return params;
>+}
>+
>+ClearParams OpenGLOrGLESParams()
>+{
>+    ClearParams params;
>+    params.eglParameters = egl_platform::OPENGL_OR_GLES(false);
>+    return params;
>+}
>+
>+ClearParams VulkanParams()
>+{
>+    ClearParams params;
>+    params.eglParameters = egl_platform::VULKAN();
>+    return params;
>+}
>+
>+}  // anonymous namespace
>+
>+TEST_P(ClearBenchmark, Run)
>+{
>+    run();
>+}
>+
>+ANGLE_INSTANTIATE_TEST(ClearBenchmark, D3D11Params(), OpenGLOrGLESParams(), VulkanParams());
>diff --git a/Source/ThirdParty/ANGLE/src/tests/perf_tests/CompilerPerf.cpp b/Source/ThirdParty/ANGLE/src/tests/perf_tests/CompilerPerf.cpp
>new file mode 100644
>index 00000000000..301bcdec810
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/tests/perf_tests/CompilerPerf.cpp
>@@ -0,0 +1,347 @@
>+//
>+// Copyright 2018 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// CompilerPerfTest:
>+//   Performance test for the shader translator. The test initializes the compiler once and then
>+//   compiles the same shader repeatedly. There are different variations of the tests using
>+//   different shaders.
>+//
>+
>+#include "ANGLEPerfTest.h"
>+
>+#include "GLSLANG/ShaderLang.h"
>+#include "compiler/translator/Compiler.h"
>+#include "compiler/translator/InitializeGlobals.h"
>+#include "compiler/translator/PoolAlloc.h"
>+
>+namespace
>+{
>+
>+const char *kSimpleESSL100FragSource = R"(
>+precision mediump float;
>+void main()
>+{
>+    gl_FragColor = vec4(0, 1, 0, 1);
>+}
>+)";
>+
>+const char *kSimpleESSL100Id = "SimpleESSL100";
>+
>+const char *kSimpleESSL300FragSource = R"(#version 300 es
>+precision highp float;
>+out vec4 outColor;
>+void main()
>+{
>+    outColor = vec4(0, 1, 0, 1);
>+}
>+)";
>+
>+const char *kSimpleESSL300Id = "SimpleESSL300";
>+
>+const char *kRealWorldESSL100FragSource = R"(precision highp float;
>+precision highp sampler2D;
>+precision highp int;
>+varying vec2 vPixelCoords; // in pixels
>+uniform int uCircleCount;
>+uniform sampler2D uCircleParameters;
>+uniform sampler2D uBrushTex;
>+void main(void)
>+{
>+    float destAlpha = 0.0;
>+    for (int i = 0; i < 32; ++i)
>+    {
>+        vec4 parameterColor = texture2D(uCircleParameters,vec2(0.25, (float(i) + 0.5) / 32.0));
>+        vec2 center = parameterColor.xy;
>+        float circleRadius = parameterColor.z;
>+        float circleFlowAlpha = parameterColor.w;
>+        vec4 parameterColor2 = texture2D(uCircleParameters,vec2(0.75, (float(i) + 0.5) / 32.0));
>+        float circleRotation = parameterColor2.x;
>+        vec2 centerDiff = vPixelCoords - center;
>+        float radius = max(circleRadius, 0.5);
>+        float flowAlpha = (circleRadius < 0.5) ? circleFlowAlpha * circleRadius * circleRadius * 4.0: circleFlowAlpha;
>+        float antialiasMult = clamp((radius + 1.0 - length(centerDiff)) * 0.5, 0.0, 1.0);
>+        mat2 texRotation = mat2(cos(circleRotation), -sin(circleRotation), sin(circleRotation), cos(circleRotation));
>+        vec2 texCoords = texRotation * centerDiff / radius * 0.5 + 0.5;
>+        float texValue = texture2D(uBrushTex, texCoords).r;
>+        float circleAlpha = flowAlpha * antialiasMult * texValue;
>+        if (i < uCircleCount)
>+        {
>+            destAlpha = clamp(circleAlpha + (1.0 - circleAlpha) * destAlpha, 0.0, 1.0);
>+        }
>+    }
>+    gl_FragColor = vec4(0.0, 0.0, 0.0, destAlpha);
>+})";
>+
>+const char *kRealWorldESSL100Id = "RealWorldESSL100";
>+
>+// This shader is intended to trigger many AST transformations, particularly on the HLSL backend.
>+const char *kTrickyESSL300FragSource = R"(#version 300 es
>+precision highp float;
>+precision highp sampler2D;
>+precision highp isampler2D;
>+precision highp int;
>+
>+float globalF;
>+
>+uniform ivec4 uivec;
>+uniform int ui;
>+
>+struct SS
>+{
>+    int iField;
>+    float fField;
>+    vec2 f2Field;
>+    sampler2D sField;
>+    isampler2D isField;
>+};
>+uniform SS us;
>+
>+out vec4 my_FragColor;
>+
>+float[3] sideEffectArray()
>+{
>+    globalF += 1.0;
>+    return float[3](globalF, globalF * 2.0, globalF * 3.0);
>+}
>+
>+// This struct is unused and can be pruned.
>+struct SUnused
>+{
>+    vec2 fField;
>+};
>+
>+void main()
>+{
>+    struct S2
>+    {
>+        float fField;
>+    } s2;
>+    vec4 foo = vec4(ui);
>+    mat4 fooM = mat4(foo.x);
>+
>+    // Some unused variables that can be pruned.
>+    float fUnused, fUnused2;
>+    ivec4 iUnused, iUnused2;
>+
>+    globalF = us.fField;
>+    s2.fField = us.fField;
>+
>+    float[3] fa = sideEffectArray();
>+
>+    globalF -= us.fField;
>+    if (fa == sideEffectArray())
>+    {
>+        globalF += us.fField * sin(2.0);
>+    }
>+
>+    // Switch with fall-through.
>+    switch (ui)
>+    {
>+      case 0:
>+        // Sequence operator and matrix and vector dynamic indexing.
>+        (globalF += 1.0, fooM[ui][ui] += fooM[ui - 1][uivec[ui] + 1]);
>+      case 1:
>+        // Built-in emulation.
>+        foo[3] = tanh(foo[1]);
>+      default:
>+        // Sequence operator and length of an array expression with side effects.
>+        foo[2] += (globalF -= 1.0, float((sideEffectArray()).length() * 2));
>+    }
>+    int i = 0;
>+    do
>+    {
>+        s2.fField = us.fField * us.f2Field.x;
>+        // Sequence operator and short-circuiting operator with side effects on the right hand side.
>+    } while ((++i, i < int(us.fField) && ++i <= ui || ++i < ui * 2 - 3));
>+    // Samplers in structures and integer texture sampling.
>+    foo += texture(us.sField, us.f2Field) + intBitsToFloat(texture(us.isField, us.f2Field + 4.0));
>+    my_FragColor = foo * s2.fField * globalF + fooM[ui];
>+})";
>+
>+const char *kTrickyESSL300Id = "TrickyESSL300";
>+
>+constexpr int kNumIterationsPerStep = 4;
>+
>+struct CompilerParameters
>+{
>+    CompilerParameters() { output = SH_HLSL_4_1_OUTPUT; }
>+
>+    CompilerParameters(ShShaderOutput output) : output(output) {}
>+
>+    const char *str() const
>+    {
>+        switch (output)
>+        {
>+            case SH_HLSL_4_1_OUTPUT:
>+                return "HLSL_4_1";
>+            case SH_GLSL_450_CORE_OUTPUT:
>+                return "GLSL_4_50";
>+            case SH_ESSL_OUTPUT:
>+                return "ESSL";
>+            default:
>+                UNREACHABLE();
>+                return "unk";
>+        }
>+    }
>+
>+    ShShaderOutput output;
>+};
>+
>+bool IsPlatformAvailable(const CompilerParameters &param)
>+{
>+    switch (param.output)
>+    {
>+        case SH_HLSL_4_1_OUTPUT:
>+        case SH_HLSL_4_0_FL9_3_OUTPUT:
>+        case SH_HLSL_3_0_OUTPUT:
>+        {
>+            angle::PoolAllocator allocator;
>+            InitializePoolIndex();
>+            allocator.push();
>+            SetGlobalPoolAllocator(&allocator);
>+            ShHandle translator =
>+                sh::ConstructCompiler(GL_FRAGMENT_SHADER, SH_WEBGL2_SPEC, param.output);
>+            bool success = translator != nullptr;
>+            SetGlobalPoolAllocator(nullptr);
>+            allocator.pop();
>+            FreePoolIndex();
>+            if (!success)
>+            {
>+                return false;
>+            }
>+            break;
>+        }
>+        default:
>+            break;
>+    }
>+    return true;
>+}
>+
>+struct CompilerPerfParameters final : public CompilerParameters
>+{
>+    CompilerPerfParameters(ShShaderOutput output,
>+                           const char *shaderSource,
>+                           const char *shaderSourceId)
>+        : CompilerParameters(output), shaderSource(shaderSource)
>+    {
>+        testId = shaderSourceId;
>+        testId += "_";
>+        testId += CompilerParameters::str();
>+    }
>+
>+    const char *shaderSource;
>+    std::string testId;
>+};
>+
>+std::ostream &operator<<(std::ostream &stream, const CompilerPerfParameters &p)
>+{
>+    stream << p.testId;
>+    return stream;
>+}
>+
>+class CompilerPerfTest : public ANGLEPerfTest,
>+                         public ::testing::WithParamInterface<CompilerPerfParameters>
>+{
>+  public:
>+    CompilerPerfTest();
>+
>+    void step() override;
>+
>+    void SetUp() override;
>+    void TearDown() override;
>+
>+  protected:
>+    void setTestShader(const char *str) { mTestShader = str; }
>+
>+  private:
>+    const char *mTestShader;
>+
>+    ShBuiltInResources mResources;
>+    angle::PoolAllocator mAllocator;
>+    sh::TCompiler *mTranslator;
>+};
>+
>+CompilerPerfTest::CompilerPerfTest()
>+    : ANGLEPerfTest("CompilerPerf", GetParam().testId, kNumIterationsPerStep)
>+{}
>+
>+void CompilerPerfTest::SetUp()
>+{
>+    ANGLEPerfTest::SetUp();
>+
>+    InitializePoolIndex();
>+    mAllocator.push();
>+    SetGlobalPoolAllocator(&mAllocator);
>+
>+    const auto &params = GetParam();
>+
>+    mTranslator = sh::ConstructCompiler(GL_FRAGMENT_SHADER, SH_WEBGL2_SPEC, params.output);
>+    sh::InitBuiltInResources(&mResources);
>+    mResources.FragmentPrecisionHigh = true;
>+    if (!mTranslator->Init(mResources))
>+    {
>+        SafeDelete(mTranslator);
>+    }
>+
>+    setTestShader(params.shaderSource);
>+}
>+
>+void CompilerPerfTest::TearDown()
>+{
>+    SafeDelete(mTranslator);
>+
>+    SetGlobalPoolAllocator(nullptr);
>+    mAllocator.pop();
>+
>+    FreePoolIndex();
>+
>+    ANGLEPerfTest::TearDown();
>+}
>+
>+void CompilerPerfTest::step()
>+{
>+    const char *shaderStrings[] = {mTestShader};
>+
>+    ShCompileOptions compileOptions = SH_OBJECT_CODE | SH_VARIABLES |
>+                                      SH_INITIALIZE_UNINITIALIZED_LOCALS | SH_INIT_OUTPUT_VARIABLES;
>+
>+#if !defined(NDEBUG)
>+    // Make sure that compilation succeeds and print the info log if it doesn't in debug mode.
>+    if (!mTranslator->compile(shaderStrings, 1, compileOptions))
>+    {
>+        std::cout << "Compiling perf test shader failed with log:\n"
>+                  << mTranslator->getInfoSink().info.c_str();
>+    }
>+#endif
>+
>+    for (unsigned int iteration = 0; iteration < kNumIterationsPerStep; ++iteration)
>+    {
>+        mTranslator->compile(shaderStrings, 1, compileOptions);
>+    }
>+}
>+
>+TEST_P(CompilerPerfTest, Run)
>+{
>+    run();
>+}
>+
>+ANGLE_INSTANTIATE_TEST(
>+    CompilerPerfTest,
>+    CompilerPerfParameters(SH_HLSL_4_1_OUTPUT, kSimpleESSL100FragSource, kSimpleESSL100Id),
>+    CompilerPerfParameters(SH_HLSL_4_1_OUTPUT, kSimpleESSL300FragSource, kSimpleESSL300Id),
>+    CompilerPerfParameters(SH_HLSL_4_1_OUTPUT, kRealWorldESSL100FragSource, kRealWorldESSL100Id),
>+    CompilerPerfParameters(SH_HLSL_4_1_OUTPUT, kTrickyESSL300FragSource, kTrickyESSL300Id),
>+    CompilerPerfParameters(SH_GLSL_450_CORE_OUTPUT, kSimpleESSL100FragSource, kSimpleESSL100Id),
>+    CompilerPerfParameters(SH_GLSL_450_CORE_OUTPUT, kSimpleESSL300FragSource, kSimpleESSL300Id),
>+    CompilerPerfParameters(SH_GLSL_450_CORE_OUTPUT,
>+                           kRealWorldESSL100FragSource,
>+                           kRealWorldESSL100Id),
>+    CompilerPerfParameters(SH_GLSL_450_CORE_OUTPUT, kTrickyESSL300FragSource, kTrickyESSL300Id),
>+    CompilerPerfParameters(SH_ESSL_OUTPUT, kSimpleESSL100FragSource, kSimpleESSL100Id),
>+    CompilerPerfParameters(SH_ESSL_OUTPUT, kSimpleESSL300FragSource, kSimpleESSL300Id),
>+    CompilerPerfParameters(SH_ESSL_OUTPUT, kRealWorldESSL100FragSource, kRealWorldESSL100Id),
>+    CompilerPerfParameters(SH_ESSL_OUTPUT, kTrickyESSL300FragSource, kTrickyESSL300Id));
>+
>+}  // anonymous namespace
>diff --git a/Source/ThirdParty/ANGLE/src/tests/perf_tests/DispatchComputePerf.cpp b/Source/ThirdParty/ANGLE/src/tests/perf_tests/DispatchComputePerf.cpp
>new file mode 100644
>index 00000000000..167c1e3cf2f
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/tests/perf_tests/DispatchComputePerf.cpp
>@@ -0,0 +1,174 @@
>+//
>+// Copyright (c) 2018 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// DispatchComputePerf:
>+//   Performance tests for ANGLE DispatchCompute call overhead.
>+//
>+
>+#include "ANGLEPerfTest.h"
>+#include "util/shader_utils.h"
>+
>+namespace
>+{
>+unsigned int kIterationsPerStep = 50;
>+
>+struct DispatchComputePerfParams final : public RenderTestParams
>+{
>+    DispatchComputePerfParams()
>+    {
>+        iterationsPerStep = kIterationsPerStep;
>+        majorVersion      = 3;
>+        minorVersion      = 1;
>+    }
>+
>+    std::string suffix() const override;
>+
>+    unsigned int localSizeX    = 16;
>+    unsigned int localSizeY    = 16;
>+    unsigned int textureWidth  = 32;
>+    unsigned int textureHeight = 32;
>+};
>+
>+std::string DispatchComputePerfParams::suffix() const
>+{
>+    std::stringstream suffixStr;
>+    suffixStr << RenderTestParams::suffix();
>+
>+    if (eglParameters.deviceType == EGL_PLATFORM_ANGLE_DEVICE_TYPE_NULL_ANGLE)
>+    {
>+        suffixStr << "_null";
>+    }
>+    return suffixStr.str();
>+}
>+
>+std::ostream &operator<<(std::ostream &os, const DispatchComputePerfParams &params)
>+{
>+    os << params.suffix().substr(1);
>+    return os;
>+}
>+
>+class DispatchComputePerfBenchmark : public ANGLERenderTest,
>+                                     public ::testing::WithParamInterface<DispatchComputePerfParams>
>+{
>+  public:
>+    DispatchComputePerfBenchmark();
>+
>+    void initializeBenchmark() override;
>+    void destroyBenchmark() override;
>+    void drawBenchmark() override;
>+
>+  private:
>+    void initComputeShader();
>+    void initTextures();
>+
>+    GLuint mProgram      = 0;
>+    GLuint mReadTexture  = 0;
>+    GLuint mWriteTexture = 0;
>+    GLuint mDispatchX    = 0;
>+    GLuint mDispatchY    = 0;
>+};
>+
>+DispatchComputePerfBenchmark::DispatchComputePerfBenchmark()
>+    : ANGLERenderTest("DispatchComputePerf", GetParam())
>+{}
>+
>+void DispatchComputePerfBenchmark::initializeBenchmark()
>+{
>+    const auto &params = GetParam();
>+
>+    initComputeShader();
>+    initTextures();
>+
>+    glUseProgram(mProgram);
>+    glActiveTexture(GL_TEXTURE0);
>+    glBindTexture(GL_TEXTURE_2D, mReadTexture);
>+    glUniform1i(glGetUniformLocation(mProgram, "readTexture"), 0);
>+    glBindImageTexture(4, mWriteTexture, 0, GL_FALSE, 0, GL_WRITE_ONLY, GL_R32F);
>+
>+    mDispatchX = params.textureWidth / params.localSizeX;
>+    mDispatchY = params.textureHeight / params.localSizeY;
>+    ASSERT_GL_NO_ERROR();
>+}
>+
>+void DispatchComputePerfBenchmark::initComputeShader()
>+{
>+    constexpr char kCS[] = R"(#version 310 es
>+#define LOCAL_SIZE_X 16
>+#define LOCAL_SIZE_Y 16
>+layout(local_size_x=LOCAL_SIZE_X, local_size_y=LOCAL_SIZE_Y) in;
>+precision highp float;
>+uniform sampler2D readTexture;
>+layout(r32f, binding = 4) writeonly uniform highp image2D  outImage;
>+
>+void main() {
>+    float sum = 0.;
>+    sum += texelFetch(readTexture, ivec2(gl_GlobalInvocationID.xy), 0).r;
>+    imageStore(outImage, ivec2(gl_GlobalInvocationID.xy), vec4(sum));
>+})";
>+
>+    mProgram = CompileComputeProgram(kCS, false);
>+    ASSERT_NE(0u, mProgram);
>+}
>+
>+void DispatchComputePerfBenchmark::initTextures()
>+{
>+    const auto &params = GetParam();
>+
>+    unsigned int textureDataSize = params.textureWidth * params.textureHeight;
>+    std::vector<GLfloat> textureInputData(textureDataSize, 0.2f);
>+    std::vector<GLfloat> textureOutputData(textureDataSize, 0.1f);
>+
>+    glGenTextures(1, &mReadTexture);
>+    glBindTexture(GL_TEXTURE_2D, mReadTexture);
>+    glTexImage2D(GL_TEXTURE_2D, 0, GL_R32F, params.textureWidth, params.textureHeight, 0, GL_RED,
>+                 GL_FLOAT, textureInputData.data());
>+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
>+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
>+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
>+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
>+
>+    glGenTextures(1, &mWriteTexture);
>+    glBindTexture(GL_TEXTURE_2D, mWriteTexture);
>+    glTexStorage2D(GL_TEXTURE_2D, 1, GL_R32F, params.textureWidth, params.textureHeight);
>+    glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, params.textureWidth, params.textureHeight, GL_RED,
>+                    GL_FLOAT, textureOutputData.data());
>+    ASSERT_GL_NO_ERROR();
>+}
>+
>+void DispatchComputePerfBenchmark::destroyBenchmark()
>+{
>+    glDeleteProgram(mProgram);
>+    glDeleteTextures(1, &mReadTexture);
>+    glDeleteTextures(1, &mWriteTexture);
>+}
>+
>+void DispatchComputePerfBenchmark::drawBenchmark()
>+{
>+    const auto &params = GetParam();
>+    for (unsigned int it = 0; it < params.iterationsPerStep; it++)
>+    {
>+        glDispatchCompute(mDispatchX, mDispatchY, 1);
>+        glMemoryBarrier(GL_TEXTURE_UPDATE_BARRIER_BIT);
>+    }
>+    ASSERT_GL_NO_ERROR();
>+}
>+
>+DispatchComputePerfParams DispatchComputePerfOpenGLOrGLESParams(bool useNullDevice)
>+{
>+    DispatchComputePerfParams params;
>+    params.eglParameters = angle::egl_platform::OPENGL_OR_GLES(useNullDevice);
>+    return params;
>+}
>+
>+TEST_P(DispatchComputePerfBenchmark, Run)
>+{
>+    run();
>+}
>+
>+ANGLE_INSTANTIATE_TEST(DispatchComputePerfBenchmark,
>+                       DispatchComputePerfOpenGLOrGLESParams(true),
>+                       DispatchComputePerfOpenGLOrGLESParams(false));
>+
>+}  // namespace
>diff --git a/Source/ThirdParty/ANGLE/src/tests/perf_tests/DrawCallPerf.cpp b/Source/ThirdParty/ANGLE/src/tests/perf_tests/DrawCallPerf.cpp
>index 1e0e4713498..df9f5850a8e 100644
>--- a/Source/ThirdParty/ANGLE/src/tests/perf_tests/DrawCallPerf.cpp
>+++ b/Source/ThirdParty/ANGLE/src/tests/perf_tests/DrawCallPerf.cpp
>@@ -10,12 +10,89 @@
> #include "ANGLEPerfTest.h"
> #include "DrawCallPerfParams.h"
> #include "test_utils/draw_call_perf_utils.h"
>+#include "util/shader_utils.h"
> 
> namespace
> {
>+enum class StateChange
>+{
>+    NoChange,
>+    VertexBuffer,
>+    ManyVertexBuffers,
>+    Texture,
>+};
>+
>+struct DrawArraysPerfParams : public DrawCallPerfParams
>+{
>+    DrawArraysPerfParams(const DrawCallPerfParams &base) : DrawCallPerfParams(base) {}
>+
>+    std::string suffix() const override;
>+
>+    StateChange stateChange = StateChange::NoChange;
>+};
>+
>+std::string DrawArraysPerfParams::suffix() const
>+{
>+    std::stringstream strstr;
>+
>+    strstr << DrawCallPerfParams::suffix();
>+
>+    switch (stateChange)
>+    {
>+        case StateChange::VertexBuffer:
>+            strstr << "_vbo_change";
>+            break;
>+        case StateChange::ManyVertexBuffers:
>+            strstr << "_manyvbos_change";
>+            break;
>+        case StateChange::Texture:
>+            strstr << "_tex_change";
>+            break;
>+        default:
>+            break;
>+    }
>+
>+    return strstr.str();
>+}
>+
>+std::ostream &operator<<(std::ostream &os, const DrawArraysPerfParams &params)
>+{
>+    os << params.suffix().substr(1);
>+    return os;
>+}
>+
>+GLuint CreateSimpleTexture2D()
>+{
>+    // Use tightly packed data
>+    glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
>+
>+    // Generate a texture object
>+    GLuint texture;
>+    glGenTextures(1, &texture);
>+
>+    // Bind the texture object
>+    glBindTexture(GL_TEXTURE_2D, texture);
>+
>+    // Load the texture: 2x2 Image, 3 bytes per pixel (R, G, B)
>+    constexpr size_t width             = 2;
>+    constexpr size_t height            = 2;
>+    GLubyte pixels[width * height * 3] = {
>+        255, 0,   0,    // Red
>+        0,   255, 0,    // Green
>+        0,   0,   255,  // Blue
>+        255, 255, 0,    // Yellow
>+    };
>+    glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB, width, height, 0, GL_RGB, GL_UNSIGNED_BYTE, pixels);
>+
>+    // Set the filtering mode
>+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
>+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
>+
>+    return texture;
>+}
> 
> class DrawCallPerfBenchmark : public ANGLERenderTest,
>-                              public ::testing::WithParamInterface<DrawCallPerfParams>
>+                              public ::testing::WithParamInterface<DrawArraysPerfParams>
> {
>   public:
>     DrawCallPerfBenchmark();
>@@ -25,30 +102,77 @@ class DrawCallPerfBenchmark : public ANGLERenderTest,
>     void drawBenchmark() override;
> 
>   private:
>-    GLuint mProgram = 0;
>-    GLuint mBuffer  = 0;
>-    GLuint mFBO     = 0;
>-    GLuint mTexture = 0;
>-    int mNumTris    = GetParam().numTris;
>+    GLuint mProgram    = 0;
>+    GLuint mBuffer1    = 0;
>+    GLuint mBuffer2    = 0;
>+    GLuint mFBO        = 0;
>+    GLuint mFBOTexture = 0;
>+    GLuint mTexture1   = 0;
>+    GLuint mTexture2   = 0;
>+    int mNumTris       = GetParam().numTris;
> };
> 
>-DrawCallPerfBenchmark::DrawCallPerfBenchmark() : ANGLERenderTest("DrawCallPerf", GetParam())
>-{
>-    mRunTimeSeconds = GetParam().runTimeSeconds;
>-}
>+DrawCallPerfBenchmark::DrawCallPerfBenchmark() : ANGLERenderTest("DrawCallPerf", GetParam()) {}
> 
> void DrawCallPerfBenchmark::initializeBenchmark()
> {
>     const auto &params = GetParam();
> 
>-    ASSERT_LT(0u, params.iterations);
>+    if (params.stateChange == StateChange::Texture)
>+    {
>+        mProgram = SetupSimpleTextureProgram();
>+    }
>+    else if (params.stateChange == StateChange::ManyVertexBuffers)
>+    {
>+        constexpr char kVS[] = R"(attribute vec2 vPosition;
>+attribute vec2 v0;
>+attribute vec2 v1;
>+attribute vec2 v2;
>+attribute vec2 v3;
>+const float scale = 0.5;
>+const float offset = -0.5;
>+
>+varying vec2 v;
>+
>+void main()
>+{
>+    gl_Position = vec4(vPosition * vec2(scale) + vec2(offset), 0, 1);
>+    v = (v0 + v1 + v2 + v3) * 0.25;
>+})";
>+
>+        constexpr char kFS[] = R"(precision mediump float;
>+varying vec2 v;
>+void main()
>+{
>+    gl_FragColor = vec4(v, 0, 1);
>+})";
>+
>+        mProgram = CompileProgram(kVS, kFS);
>+        glBindAttribLocation(mProgram, 1, "v0");
>+        glBindAttribLocation(mProgram, 2, "v1");
>+        glBindAttribLocation(mProgram, 3, "v2");
>+        glBindAttribLocation(mProgram, 4, "v3");
>+        glEnableVertexAttribArray(1);
>+        glEnableVertexAttribArray(2);
>+        glEnableVertexAttribArray(3);
>+        glEnableVertexAttribArray(4);
>+    }
>+    else
>+    {
>+        mProgram = SetupSimpleDrawProgram();
>+    }
> 
>-    mProgram = SetupSimpleDrawProgram();
>     ASSERT_NE(0u, mProgram);
> 
>+    // Re-link program to ensure the attrib bindings are used.
>+    glBindAttribLocation(mProgram, 0, "vPosition");
>+    glLinkProgram(mProgram);
>+    glUseProgram(mProgram);
>+
>     glClearColor(0.0f, 0.0f, 0.0f, 0.0f);
> 
>-    mBuffer = Create2DTriangleBuffer(mNumTris, GL_STATIC_DRAW);
>+    mBuffer1 = Create2DTriangleBuffer(mNumTris, GL_STATIC_DRAW);
>+    mBuffer2 = Create2DTriangleBuffer(mNumTris, GL_STATIC_DRAW);
> 
>     glVertexAttribPointer(0, 2, GL_FLOAT, GL_FALSE, 0, 0);
>     glEnableVertexAttribArray(0);
>@@ -58,38 +182,117 @@ void DrawCallPerfBenchmark::initializeBenchmark()
> 
>     if (params.useFBO)
>     {
>-        CreateColorFBO(getWindow()->getWidth(), getWindow()->getHeight(), &mTexture, &mFBO);
>+        CreateColorFBO(getWindow()->getWidth(), getWindow()->getHeight(), &mFBOTexture, &mFBO);
>     }
> 
>+    mTexture1 = CreateSimpleTexture2D();
>+    mTexture2 = CreateSimpleTexture2D();
>+
>     ASSERT_GL_NO_ERROR();
> }
> 
> void DrawCallPerfBenchmark::destroyBenchmark()
> {
>     glDeleteProgram(mProgram);
>-    glDeleteBuffers(1, &mBuffer);
>-    glDeleteTextures(1, &mTexture);
>+    glDeleteBuffers(1, &mBuffer1);
>+    glDeleteBuffers(1, &mBuffer2);
>+    glDeleteTextures(1, &mFBOTexture);
>+    glDeleteTextures(1, &mTexture1);
>+    glDeleteTextures(1, &mTexture2);
>     glDeleteFramebuffers(1, &mFBO);
> }
> 
>+void ClearThenDraw(unsigned int iterations, GLsizei numElements)
>+{
>+    glClear(GL_COLOR_BUFFER_BIT);
>+
>+    for (unsigned int it = 0; it < iterations; it++)
>+    {
>+        glDrawArrays(GL_TRIANGLES, 0, numElements);
>+    }
>+}
>+
>+void JustDraw(unsigned int iterations, GLsizei numElements)
>+{
>+    for (unsigned int it = 0; it < iterations; it++)
>+    {
>+        glDrawArrays(GL_TRIANGLES, 0, numElements);
>+    }
>+}
>+
>+template <int kArrayBufferCount>
>+void ChangeArrayBuffersThenDraw(unsigned int iterations,
>+                                GLsizei numElements,
>+                                GLuint buffer1,
>+                                GLuint buffer2)
>+{
>+    for (unsigned int it = 0; it < iterations; it++)
>+    {
>+        glBindBuffer(GL_ARRAY_BUFFER, buffer1);
>+        for (int arrayIndex = 0; arrayIndex < kArrayBufferCount; ++arrayIndex)
>+        {
>+            glVertexAttribPointer(arrayIndex, 2, GL_FLOAT, GL_FALSE, 0, 0);
>+        }
>+        glDrawArrays(GL_TRIANGLES, 0, numElements);
>+
>+        glBindBuffer(GL_ARRAY_BUFFER, buffer2);
>+        for (int arrayIndex = 0; arrayIndex < kArrayBufferCount; ++arrayIndex)
>+        {
>+            glVertexAttribPointer(arrayIndex, 2, GL_FLOAT, GL_FALSE, 0, 0);
>+        }
>+        glDrawArrays(GL_TRIANGLES, 0, numElements);
>+    }
>+}
>+
>+void ChangeTextureThenDraw(unsigned int iterations,
>+                           GLsizei numElements,
>+                           GLuint texture1,
>+                           GLuint texture2)
>+{
>+    for (unsigned int it = 0; it < iterations; it++)
>+    {
>+        glBindTexture(GL_TEXTURE_2D, texture1);
>+        glDrawArrays(GL_TRIANGLES, 0, numElements);
>+
>+        glBindTexture(GL_TEXTURE_2D, texture2);
>+        glDrawArrays(GL_TRIANGLES, 0, numElements);
>+    }
>+}
>+
> void DrawCallPerfBenchmark::drawBenchmark()
> {
>     // This workaround fixes a huge queue of graphics commands accumulating on the GL
>     // back-end. The GL back-end doesn't have a proper NULL device at the moment.
>     // TODO(jmadill): Remove this when/if we ever get a proper OpenGL NULL device.
>     const auto &eglParams = GetParam().eglParameters;
>-    if (eglParams.deviceType != EGL_PLATFORM_ANGLE_DEVICE_TYPE_NULL_ANGLE ||
>-        (eglParams.renderer != EGL_PLATFORM_ANGLE_TYPE_OPENGL_ANGLE &&
>-         eglParams.renderer != EGL_PLATFORM_ANGLE_TYPE_OPENGLES_ANGLE))
>-    {
>-        glClear(GL_COLOR_BUFFER_BIT);
>-    }
>-
>-    const auto &params = GetParam();
>+    const auto &params    = GetParam();
>+    GLsizei numElements   = static_cast<GLsizei>(3 * mNumTris);
> 
>-    for (unsigned int it = 0; it < params.iterations; it++)
>+    switch (params.stateChange)
>     {
>-        glDrawArrays(GL_TRIANGLES, 0, static_cast<GLsizei>(3 * mNumTris));
>+        case StateChange::VertexBuffer:
>+            ChangeArrayBuffersThenDraw<1>(params.iterationsPerStep, numElements, mBuffer1,
>+                                          mBuffer2);
>+            break;
>+        case StateChange::ManyVertexBuffers:
>+            ChangeArrayBuffersThenDraw<5>(params.iterationsPerStep, numElements, mBuffer1,
>+                                          mBuffer2);
>+            break;
>+        case StateChange::Texture:
>+            ChangeTextureThenDraw(params.iterationsPerStep, numElements, mTexture1, mTexture2);
>+            break;
>+        case StateChange::NoChange:
>+            if (eglParams.deviceType != EGL_PLATFORM_ANGLE_DEVICE_TYPE_NULL_ANGLE ||
>+                (eglParams.renderer != EGL_PLATFORM_ANGLE_TYPE_OPENGL_ANGLE &&
>+                 eglParams.renderer != EGL_PLATFORM_ANGLE_TYPE_OPENGLES_ANGLE))
>+            {
>+                ClearThenDraw(params.iterationsPerStep, numElements);
>+            }
>+            else
>+            {
>+                JustDraw(params.iterationsPerStep, numElements);
>+            }
>+            break;
>     }
> 
>     ASSERT_GL_NO_ERROR();
>@@ -100,16 +303,44 @@ TEST_P(DrawCallPerfBenchmark, Run)
>     run();
> }
> 
>-ANGLE_INSTANTIATE_TEST(DrawCallPerfBenchmark,
>-                       DrawCallPerfD3D9Params(false, false),
>-                       DrawCallPerfD3D9Params(true, false),
>-                       DrawCallPerfD3D11Params(false, false),
>-                       DrawCallPerfD3D11Params(true, false),
>-                       DrawCallPerfD3D11Params(true, true),
>-                       DrawCallPerfOpenGLOrGLESParams(false, false),
>-                       DrawCallPerfOpenGLOrGLESParams(true, false),
>-                       DrawCallPerfOpenGLOrGLESParams(true, true),
>-                       DrawCallPerfValidationOnly(),
>-                       DrawCallPerfVulkanParams(false));
>-
>-} // namespace
>+DrawArraysPerfParams DrawArrays(const DrawCallPerfParams &base, StateChange stateChange)
>+{
>+    DrawArraysPerfParams params(base);
>+    params.stateChange = stateChange;
>+    return params;
>+}
>+
>+ANGLE_INSTANTIATE_TEST(
>+    DrawCallPerfBenchmark,
>+    DrawArrays(DrawCallPerfD3D9Params(false, false), StateChange::NoChange),
>+    DrawArrays(DrawCallPerfD3D9Params(true, false), StateChange::NoChange),
>+    DrawArrays(DrawCallPerfD3D11Params(false, false), StateChange::NoChange),
>+    DrawArrays(DrawCallPerfD3D11Params(true, false), StateChange::NoChange),
>+    DrawArrays(DrawCallPerfD3D11Params(true, true), StateChange::NoChange),
>+    DrawArrays(DrawCallPerfD3D11Params(false, false), StateChange::VertexBuffer),
>+    DrawArrays(DrawCallPerfD3D11Params(true, false), StateChange::VertexBuffer),
>+    DrawArrays(DrawCallPerfD3D11Params(false, false), StateChange::Texture),
>+    DrawArrays(DrawCallPerfD3D11Params(true, false), StateChange::Texture),
>+    DrawArrays(DrawCallPerfOpenGLOrGLESParams(false, false), StateChange::NoChange),
>+    DrawArrays(DrawCallPerfOpenGLOrGLESParams(true, false), StateChange::NoChange),
>+    DrawArrays(DrawCallPerfOpenGLOrGLESParams(true, true), StateChange::NoChange),
>+    DrawArrays(DrawCallPerfOpenGLOrGLESParams(false, false), StateChange::VertexBuffer),
>+    DrawArrays(DrawCallPerfOpenGLOrGLESParams(true, false), StateChange::VertexBuffer),
>+    DrawArrays(DrawCallPerfOpenGLOrGLESParams(false, false), StateChange::ManyVertexBuffers),
>+    DrawArrays(DrawCallPerfOpenGLOrGLESParams(true, false), StateChange::ManyVertexBuffers),
>+    DrawArrays(DrawCallPerfOpenGLOrGLESParams(false, false), StateChange::Texture),
>+    DrawArrays(DrawCallPerfOpenGLOrGLESParams(true, false), StateChange::Texture),
>+    DrawArrays(DrawCallPerfValidationOnly(), StateChange::NoChange),
>+    DrawArrays(DrawCallPerfVulkanParams(false, false), StateChange::NoChange),
>+    DrawArrays(DrawCallPerfVulkanParams(true, false), StateChange::NoChange),
>+    DrawArrays(DrawCallPerfVulkanParams(false, false), StateChange::VertexBuffer),
>+    DrawArrays(DrawCallPerfVulkanParams(true, false), StateChange::VertexBuffer),
>+    DrawArrays(DrawCallPerfVulkanParams(false, false), StateChange::ManyVertexBuffers),
>+    DrawArrays(DrawCallPerfVulkanParams(true, false), StateChange::ManyVertexBuffers),
>+    DrawArrays(DrawCallPerfVulkanParams(false, false), StateChange::Texture),
>+    DrawArrays(DrawCallPerfVulkanParams(true, false), StateChange::Texture),
>+    DrawArrays(DrawCallPerfWGLParams(false), StateChange::NoChange),
>+    DrawArrays(DrawCallPerfWGLParams(false), StateChange::VertexBuffer),
>+    DrawArrays(DrawCallPerfWGLParams(false), StateChange::Texture));
>+
>+}  // anonymous namespace
>diff --git a/Source/ThirdParty/ANGLE/src/tests/perf_tests/DrawCallPerfParams.cpp b/Source/ThirdParty/ANGLE/src/tests/perf_tests/DrawCallPerfParams.cpp
>index 1b7e2cb0d8b..4795349db7e 100644
>--- a/Source/ThirdParty/ANGLE/src/tests/perf_tests/DrawCallPerfParams.cpp
>+++ b/Source/ThirdParty/ANGLE/src/tests/perf_tests/DrawCallPerfParams.cpp
>@@ -11,12 +11,26 @@
> 
> #include <sstream>
> 
>-std::ostream &operator<<(std::ostream &os, const DrawCallPerfParams &params)
>+DrawCallPerfParams::DrawCallPerfParams()
> {
>-    os << params.suffix().substr(1);
>-    return os;
>+    majorVersion = 2;
>+    minorVersion = 0;
>+    windowWidth  = 64;
>+    windowHeight = 64;
>+
>+// Lower the iteration count in debug.
>+#if !defined(NDEBUG)
>+    iterationsPerStep = 100;
>+#else
>+    iterationsPerStep = 20000;
>+#endif
>+    runTimeSeconds = 10.0;
>+    numTris        = 1;
>+    useFBO         = false;
> }
> 
>+DrawCallPerfParams::~DrawCallPerfParams() = default;
>+
> std::string DrawCallPerfParams::suffix() const
> {
>     std::stringstream strstr;
>@@ -71,16 +85,23 @@ DrawCallPerfParams DrawCallPerfValidationOnly()
> {
>     DrawCallPerfParams params;
>     params.eglParameters  = DEFAULT();
>-    params.iterations     = 10000;
>     params.numTris        = 0;
>     params.runTimeSeconds = 5.0;
>     return params;
> }
> 
>-DrawCallPerfParams DrawCallPerfVulkanParams(bool renderToTexture)
>+DrawCallPerfParams DrawCallPerfVulkanParams(bool useNullDevice, bool renderToTexture)
> {
>     DrawCallPerfParams params;
>-    params.eglParameters = VULKAN();
>+    params.eglParameters = useNullDevice ? VULKAN_NULL() : VULKAN();
>     params.useFBO        = renderToTexture;
>     return params;
> }
>+
>+DrawCallPerfParams DrawCallPerfWGLParams(bool renderToTexture)
>+{
>+    DrawCallPerfParams params;
>+    params.useFBO = renderToTexture;
>+    params.driver = angle::GLESDriverType::SystemWGL;
>+    return params;
>+}
>diff --git a/Source/ThirdParty/ANGLE/src/tests/perf_tests/DrawCallPerfParams.h b/Source/ThirdParty/ANGLE/src/tests/perf_tests/DrawCallPerfParams.h
>index 7feabaed7fa..dddc9145cd9 100644
>--- a/Source/ThirdParty/ANGLE/src/tests/perf_tests/DrawCallPerfParams.h
>+++ b/Source/ThirdParty/ANGLE/src/tests/perf_tests/DrawCallPerfParams.h
>@@ -17,33 +17,21 @@
> struct DrawCallPerfParams : public RenderTestParams
> {
>     // Common default options
>-    DrawCallPerfParams()
>-    {
>-        majorVersion = 2;
>-        minorVersion = 0;
>-        windowWidth  = 256;
>-        windowHeight = 256;
>-    }
>-    virtual ~DrawCallPerfParams() {}
>+    DrawCallPerfParams();
>+    virtual ~DrawCallPerfParams();
> 
>     std::string suffix() const override;
> 
>-    unsigned int iterations = 50;
>-    double runTimeSeconds   = 10.0;
>-    int numTris             = 1;
>-    bool useFBO             = false;
>+    double runTimeSeconds;
>+    int numTris;
>+    bool useFBO;
> };
> 
>-std::ostream &operator<<(std::ostream &os, const DrawCallPerfParams &params);
>-
> DrawCallPerfParams DrawCallPerfD3D11Params(bool useNullDevice, bool renderToTexture);
>-
> DrawCallPerfParams DrawCallPerfD3D9Params(bool useNullDevice, bool renderToTexture);
>-
> DrawCallPerfParams DrawCallPerfOpenGLOrGLESParams(bool useNullDevice, bool renderToTexture);
>-
> DrawCallPerfParams DrawCallPerfValidationOnly();
>-
>-DrawCallPerfParams DrawCallPerfVulkanParams(bool renderToTexture);
>+DrawCallPerfParams DrawCallPerfVulkanParams(bool useNullDevice, bool renderToTexture);
>+DrawCallPerfParams DrawCallPerfWGLParams(bool renderToTexture);
> 
> #endif  // TESTS_PERF_TESTS_DRAW_CALL_PERF_PARAMS_H_
>diff --git a/Source/ThirdParty/ANGLE/src/tests/perf_tests/DrawElementsPerf.cpp b/Source/ThirdParty/ANGLE/src/tests/perf_tests/DrawElementsPerf.cpp
>index 167a6e032f3..dc6b9a3864e 100644
>--- a/Source/ThirdParty/ANGLE/src/tests/perf_tests/DrawElementsPerf.cpp
>+++ b/Source/ThirdParty/ANGLE/src/tests/perf_tests/DrawElementsPerf.cpp
>@@ -11,7 +11,6 @@
> 
> #include "ANGLEPerfTest.h"
> #include "DrawCallPerfParams.h"
>-#include "common/utilities.h"
> #include "test_utils/draw_call_perf_utils.h"
> 
> namespace
>@@ -90,15 +89,31 @@ class DrawElementsPerfBenchmark : public ANGLERenderTest,
> DrawElementsPerfBenchmark::DrawElementsPerfBenchmark()
>     : ANGLERenderTest("DrawElementsPerf", GetParam())
> {
>-    mRunTimeSeconds = GetParam().runTimeSeconds;
>+    if (GetParam().type == GL_UNSIGNED_INT)
>+    {
>+        addExtensionPrerequisite("GL_OES_element_index_uint");
>+    }
>+}
>+
>+GLsizei ElementTypeSize(GLenum elementType)
>+{
>+    switch (elementType)
>+    {
>+        case GL_UNSIGNED_BYTE:
>+            return sizeof(GLubyte);
>+        case GL_UNSIGNED_SHORT:
>+            return sizeof(GLushort);
>+        case GL_UNSIGNED_INT:
>+            return sizeof(GLuint);
>+        default:
>+            return 0;
>+    }
> }
> 
> void DrawElementsPerfBenchmark::initializeBenchmark()
> {
>     const auto &params = GetParam();
> 
>-    ASSERT_LT(0u, params.iterations);
>-
>     mProgram = SetupSimpleDrawProgram();
>     ASSERT_NE(0u, mProgram);
> 
>@@ -116,7 +131,7 @@ void DrawElementsPerfBenchmark::initializeBenchmark()
> 
>     glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, mIndexBuffer);
> 
>-    mBufferSize = gl::ElementTypeSize(params.type) * mCount;
>+    mBufferSize = ElementTypeSize(params.type) * mCount;
> 
>     if (params.type == GL_UNSIGNED_INT)
>     {
>@@ -163,22 +178,25 @@ void DrawElementsPerfBenchmark::drawBenchmark()
>         glClear(GL_COLOR_BUFFER_BIT);
>     }
> 
>-    const auto &params = GetParam();
>+    const DrawElementsPerfParams &params = GetParam();
> 
>-    for (unsigned int it = 0; it < params.iterations; it++)
>+    if (params.indexBufferChanged)
>     {
>-        if (params.indexBufferChanged)
>+        const void *bufferData = (params.type == GL_UNSIGNED_INT)
>+                                     ? static_cast<GLvoid *>(mIntIndexData.data())
>+                                     : static_cast<GLvoid *>(mShortIndexData.data());
>+        for (unsigned int it = 0; it < params.iterationsPerStep; it++)
>         {
>-            if (params.type == GL_UNSIGNED_INT)
>-            {
>-                glBufferSubData(GL_ELEMENT_ARRAY_BUFFER, 0, mBufferSize, mIntIndexData.data());
>-            }
>-            else
>-            {
>-                glBufferSubData(GL_ELEMENT_ARRAY_BUFFER, 0, mBufferSize, mShortIndexData.data());
>-            }
>+            glBufferSubData(GL_ELEMENT_ARRAY_BUFFER, 0, mBufferSize, bufferData);
>+            glDrawElements(GL_TRIANGLES, static_cast<GLsizei>(mCount), params.type, 0);
>+        }
>+    }
>+    else
>+    {
>+        for (unsigned int it = 0; it < params.iterationsPerStep; it++)
>+        {
>+            glDrawElements(GL_TRIANGLES, static_cast<GLsizei>(mCount), params.type, 0);
>         }
>-        glDrawElements(GL_TRIANGLES, static_cast<GLsizei>(mCount), params.type, 0);
>     }
> 
>     ASSERT_GL_NO_ERROR();
>@@ -193,6 +211,11 @@ DrawElementsPerfParams DrawElementsPerfD3D11Params(bool indexBufferChanged,
>         useNullDevice ? angle::egl_platform::D3D11_NULL() : angle::egl_platform::D3D11();
>     params.indexBufferChanged = indexBufferChanged;
>     params.type               = indexType;
>+
>+    // Scale down iterations for slower tests.
>+    if (indexBufferChanged)
>+        params.iterationsPerStep /= 100;
>+
>     return params;
> }
> 
>@@ -201,14 +224,59 @@ DrawElementsPerfParams DrawElementsPerfD3D9Params(bool indexBufferChanged)
>     DrawElementsPerfParams params;
>     params.eglParameters      = angle::egl_platform::D3D9();
>     params.indexBufferChanged = indexBufferChanged;
>+
>+    // Scale down iterations for slower tests.
>+    if (indexBufferChanged)
>+        params.iterationsPerStep /= 100;
>+
>+    return params;
>+}
>+
>+DrawElementsPerfParams DrawElementsPerfOpenGLOrGLESParams(bool indexBufferChanged,
>+                                                          bool useNullDevice,
>+                                                          GLenum indexType)
>+{
>+    DrawElementsPerfParams params;
>+    params.eglParameters      = angle::egl_platform::OPENGL_OR_GLES(useNullDevice);
>+    params.indexBufferChanged = indexBufferChanged;
>+    params.type               = indexType;
>+
>+    // Scale down iterations for slower tests.
>+    if (indexBufferChanged)
>+        params.iterationsPerStep /= 100;
>+
>     return params;
> }
> 
>-DrawElementsPerfParams DrawElementsPerfOpenGLOrGLESParams(bool indexBufferChanged)
>+DrawElementsPerfParams DrawElementsPerfVulkanParams(bool indexBufferChanged,
>+                                                    bool useNullDevice,
>+                                                    GLenum indexType)
> {
>     DrawElementsPerfParams params;
>-    params.eglParameters      = angle::egl_platform::OPENGL_OR_GLES(false);
>+    params.eglParameters =
>+        useNullDevice ? angle::egl_platform::VULKAN_NULL() : angle::egl_platform::VULKAN();
>     params.indexBufferChanged = indexBufferChanged;
>+    params.type               = indexType;
>+
>+    // Scale down iterations for slower tests.
>+    if (indexBufferChanged)
>+        params.iterationsPerStep /= 100;
>+
>+    return params;
>+}
>+
>+DrawElementsPerfParams DrawElementsPerfWGLParams(bool indexBufferChanged, GLenum indexType)
>+{
>+    DrawElementsPerfParams params;
>+    params.driver = angle::GLESDriverType::SystemWGL;
>+
>+    params.indexBufferChanged = indexBufferChanged;
>+    params.type               = indexType;
>+
>+    // Scale down iterations for slower tests.
>+    if (indexBufferChanged)
>+        params.iterationsPerStep /= 100;
>+
>     return params;
> }
> 
>@@ -224,8 +292,17 @@ ANGLE_INSTANTIATE_TEST(DrawElementsPerfBenchmark,
>                        DrawElementsPerfD3D11Params(true, true, GL_UNSIGNED_INT),
>                        DrawElementsPerfD3D11Params(false, false, GL_UNSIGNED_INT),
>                        DrawElementsPerfD3D11Params(true, false, GL_UNSIGNED_INT),
>+                       DrawElementsPerfD3D11Params(false, false, GL_UNSIGNED_SHORT),
>                        DrawElementsPerfD3D11Params(false, true, GL_UNSIGNED_SHORT),
>-                       DrawElementsPerfOpenGLOrGLESParams(false),
>-                       DrawElementsPerfOpenGLOrGLESParams(true));
>-
>-}  // namespace
>+                       DrawElementsPerfOpenGLOrGLESParams(false, false, GL_UNSIGNED_SHORT),
>+                       DrawElementsPerfOpenGLOrGLESParams(false, true, GL_UNSIGNED_SHORT),
>+                       DrawElementsPerfOpenGLOrGLESParams(true, false, GL_UNSIGNED_SHORT),
>+                       DrawElementsPerfOpenGLOrGLESParams(false, false, GL_UNSIGNED_INT),
>+                       DrawElementsPerfOpenGLOrGLESParams(true, false, GL_UNSIGNED_INT),
>+                       DrawElementsPerfVulkanParams(false, false, GL_UNSIGNED_SHORT),
>+                       DrawElementsPerfVulkanParams(false, true, GL_UNSIGNED_SHORT),
>+                       DrawElementsPerfVulkanParams(false, false, GL_UNSIGNED_INT),
>+                       DrawElementsPerfVulkanParams(false, true, GL_UNSIGNED_INT),
>+                       DrawElementsPerfWGLParams(false, GL_UNSIGNED_SHORT));
>+
>+}  // anonymous namespace
>diff --git a/Source/ThirdParty/ANGLE/src/tests/perf_tests/DynamicPromotionPerfTest.cpp b/Source/ThirdParty/ANGLE/src/tests/perf_tests/DynamicPromotionPerfTest.cpp
>index 10dd483b56e..128082f8d71 100644
>--- a/Source/ThirdParty/ANGLE/src/tests/perf_tests/DynamicPromotionPerfTest.cpp
>+++ b/Source/ThirdParty/ANGLE/src/tests/perf_tests/DynamicPromotionPerfTest.cpp
>@@ -11,27 +11,24 @@
> 
> #include "ANGLEPerfTest.h"
> #include "common/vector_utils.h"
>-#include "random_utils.h"
>-#include "shader_utils.h"
>+#include "util/random_utils.h"
>+#include "util/shader_utils.h"
> 
> using namespace angle;
> 
> namespace
> {
>+constexpr unsigned int kIterationsPerStep = 4;
> 
> struct DynamicPromotionParams final : public RenderTestParams
> {
>-    DynamicPromotionParams();
>+    DynamicPromotionParams() { iterationsPerStep = kIterationsPerStep; }
>+
>     std::string suffix() const override;
> 
>-    size_t vertexCount;
>-    unsigned int iterations;
>+    size_t vertexCount = 1024;
> };
> 
>-DynamicPromotionParams::DynamicPromotionParams() : vertexCount(1024), iterations(4)
>-{
>-}
>-
> std::string DynamicPromotionParams::suffix() const
> {
>     return RenderTestParams::suffix();
>@@ -64,12 +61,11 @@ DynamicPromotionPerfTest::DynamicPromotionPerfTest()
>       mProgram(0),
>       mElementArrayBuffer(0),
>       mArrayBuffer(0)
>-{
>-}
>+{}
> 
> void DynamicPromotionPerfTest::initializeBenchmark()
> {
>-    const std::string &vertexShaderSource =
>+    constexpr char kVertexShaderSource[] =
>         "attribute vec2 position;\n"
>         "attribute vec3 color;\n"
>         "varying vec3 vColor;\n"
>@@ -79,14 +75,14 @@ void DynamicPromotionPerfTest::initializeBenchmark()
>         "    gl_Position = vec4(position, 0, 1);\n"
>         "}";
> 
>-    const std::string &fragmentShaderSource =
>+    constexpr char kFragmentShaderSource[] =
>         "varying mediump vec3 vColor;\n"
>         "void main()\n"
>         "{\n"
>         "    gl_FragColor = vec4(vColor, 1);\n"
>         "}";
> 
>-    mProgram = CompileProgram(vertexShaderSource, fragmentShaderSource);
>+    mProgram = CompileProgram(kVertexShaderSource, kFragmentShaderSource);
>     ASSERT_NE(0u, mProgram);
> 
>     const size_t vertexCount = GetParam().vertexCount;
>@@ -151,7 +147,7 @@ void DynamicPromotionPerfTest::destroyBenchmark()
> 
> void DynamicPromotionPerfTest::drawBenchmark()
> {
>-    unsigned int iterations = GetParam().iterations;
>+    unsigned int iterations = GetParam().iterationsPerStep;
>     size_t vertexCount      = GetParam().vertexCount;
> 
>     glClear(GL_COLOR_BUFFER_BIT);
>@@ -185,5 +181,4 @@ TEST_P(DynamicPromotionPerfTest, Run)
> ANGLE_INSTANTIATE_TEST(DynamicPromotionPerfTest,
>                        DynamicPromotionD3D11Params(),
>                        DynamicPromotionD3D9Params());
>-
> }  // anonymous namespace
>diff --git a/Source/ThirdParty/ANGLE/src/tests/perf_tests/EGLInitializePerf.cpp b/Source/ThirdParty/ANGLE/src/tests/perf_tests/EGLInitializePerf.cpp
>index 8564c94e4df..e6c759decea 100644
>--- a/Source/ThirdParty/ANGLE/src/tests/perf_tests/EGLInitializePerf.cpp
>+++ b/Source/ThirdParty/ANGLE/src/tests/perf_tests/EGLInitializePerf.cpp
>@@ -8,10 +8,10 @@
> //
> 
> #include "ANGLEPerfTest.h"
>-#include "Timer.h"
>+#include "platform/Platform.h"
> #include "test_utils/angle_test_configs.h"
> #include "test_utils/angle_test_instantiate.h"
>-#include "platform/Platform.h"
>+#include "util/Timer.h"
> 
> using namespace testing;
> 
>@@ -75,9 +75,7 @@ class EGLInitializePerfTest : public ANGLEPerfTest,
> };
> 
> EGLInitializePerfTest::EGLInitializePerfTest()
>-    : ANGLEPerfTest("EGLInitialize", "_run"),
>-      mOSWindow(nullptr),
>-      mDisplay(EGL_NO_DISPLAY)
>+    : ANGLEPerfTest("EGLInitialize", "_run", 1), mOSWindow(nullptr), mDisplay(EGL_NO_DISPLAY)
> {
>     auto platform = GetParam().eglParameters;
> 
>@@ -97,11 +95,11 @@ EGLInitializePerfTest::EGLInitializePerfTest()
>     }
>     displayAttributes.push_back(EGL_NONE);
> 
>-    mOSWindow = CreateOSWindow();
>+    mOSWindow = OSWindow::New();
>     mOSWindow->initialize("EGLInitialize Test", 64, 64);
> 
>-    auto eglGetPlatformDisplayEXT =
>-        reinterpret_cast<PFNEGLGETPLATFORMDISPLAYEXTPROC>(eglGetProcAddress("eglGetPlatformDisplayEXT"));
>+    auto eglGetPlatformDisplayEXT = reinterpret_cast<PFNEGLGETPLATFORMDISPLAYEXTPROC>(
>+        eglGetProcAddress("eglGetPlatformDisplayEXT"));
>     if (eglGetPlatformDisplayEXT == nullptr)
>     {
>         std::cerr << "Error getting platform display!" << std::endl;
>@@ -127,7 +125,7 @@ void EGLInitializePerfTest::SetUp()
> 
> EGLInitializePerfTest::~EGLInitializePerfTest()
> {
>-    SafeDelete(mOSWindow);
>+    OSWindow::Delete(&mOSWindow);
> }
> 
> void EGLInitializePerfTest::step()
>@@ -135,7 +133,8 @@ void EGLInitializePerfTest::step()
>     ASSERT_NE(EGL_NO_DISPLAY, mDisplay);
> 
>     EGLint majorVersion, minorVersion;
>-    ASSERT_EQ(static_cast<EGLBoolean>(EGL_TRUE), eglInitialize(mDisplay, &majorVersion, &minorVersion));
>+    ASSERT_EQ(static_cast<EGLBoolean>(EGL_TRUE),
>+              eglInitialize(mDisplay, &majorVersion, &minorVersion));
>     ASSERT_EQ(static_cast<EGLBoolean>(EGL_TRUE), eglTerminate(mDisplay));
> }
> 
>@@ -154,6 +153,6 @@ TEST_P(EGLInitializePerfTest, Run)
>     run();
> }
> 
>-ANGLE_INSTANTIATE_TEST(EGLInitializePerfTest, angle::ES2_D3D11());
>+ANGLE_INSTANTIATE_TEST(EGLInitializePerfTest, angle::ES2_D3D11(), angle::ES2_VULKAN());
> 
>-} // namespace
>+}  // namespace
>diff --git a/Source/ThirdParty/ANGLE/src/tests/perf_tests/EGLMakeCurrentPerf.cpp b/Source/ThirdParty/ANGLE/src/tests/perf_tests/EGLMakeCurrentPerf.cpp
>new file mode 100644
>index 00000000000..6a4aa9301bd
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/tests/perf_tests/EGLMakeCurrentPerf.cpp
>@@ -0,0 +1,158 @@
>+//
>+// Copyright 2018 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// EGLMakeCurrentPerfTest:
>+//   Performance test for eglMakeCurrent.
>+//
>+
>+#include "ANGLEPerfTest.h"
>+#include "common/platform.h"
>+#include "platform/Platform.h"
>+#include "test_utils/angle_test_configs.h"
>+#include "test_utils/angle_test_instantiate.h"
>+#include "util/system_utils.h"
>+
>+#define ITERATIONS 20
>+
>+using namespace testing;
>+
>+namespace
>+{
>+class EGLMakeCurrentPerfTest : public ANGLEPerfTest,
>+                               public WithParamInterface<angle::PlatformParameters>
>+{
>+  public:
>+    EGLMakeCurrentPerfTest();
>+
>+    void step() override;
>+    void SetUp() override;
>+    void TearDown() override;
>+
>+  private:
>+    OSWindow *mOSWindow;
>+    EGLDisplay mDisplay;
>+    EGLSurface mSurface;
>+    EGLConfig mConfig;
>+    std::array<EGLContext, 2> mContexts;
>+    std::unique_ptr<angle::Library> mEGLLibrary;
>+};
>+
>+EGLMakeCurrentPerfTest::EGLMakeCurrentPerfTest()
>+    : ANGLEPerfTest("EGLMakeCurrent", "_run", ITERATIONS),
>+      mOSWindow(nullptr),
>+      mDisplay(EGL_NO_DISPLAY),
>+      mSurface(EGL_NO_SURFACE),
>+      mConfig(nullptr),
>+      mContexts({})
>+{
>+    auto platform = GetParam().eglParameters;
>+
>+    std::vector<EGLint> displayAttributes;
>+    displayAttributes.push_back(EGL_PLATFORM_ANGLE_TYPE_ANGLE);
>+    displayAttributes.push_back(platform.renderer);
>+    displayAttributes.push_back(EGL_PLATFORM_ANGLE_MAX_VERSION_MAJOR_ANGLE);
>+    displayAttributes.push_back(platform.majorVersion);
>+    displayAttributes.push_back(EGL_PLATFORM_ANGLE_MAX_VERSION_MINOR_ANGLE);
>+    displayAttributes.push_back(platform.minorVersion);
>+    displayAttributes.push_back(EGL_PLATFORM_ANGLE_DEVICE_TYPE_ANGLE);
>+    displayAttributes.push_back(platform.deviceType);
>+    displayAttributes.push_back(EGL_NONE);
>+
>+    mOSWindow = OSWindow::New();
>+    mOSWindow->initialize("EGLMakeCurrent Test", 64, 64);
>+
>+    mEGLLibrary.reset(angle::OpenSharedLibrary(ANGLE_EGL_LIBRARY_NAME));
>+
>+    angle::LoadProc getProc =
>+        reinterpret_cast<angle::LoadProc>(mEGLLibrary->getSymbol("eglGetProcAddress"));
>+
>+    if (!getProc)
>+    {
>+        abortTest();
>+    }
>+    else
>+    {
>+        angle::LoadEGL(getProc);
>+
>+        if (!eglGetPlatformDisplayEXT)
>+        {
>+            abortTest();
>+        }
>+        else
>+        {
>+            mDisplay = eglGetPlatformDisplayEXT(
>+                EGL_PLATFORM_ANGLE_ANGLE, reinterpret_cast<void *>(mOSWindow->getNativeDisplay()),
>+                &displayAttributes[0]);
>+        }
>+    }
>+}
>+
>+void EGLMakeCurrentPerfTest::SetUp()
>+{
>+    ASSERT_NE(EGL_NO_DISPLAY, mDisplay);
>+    EGLint majorVersion, minorVersion;
>+    ASSERT_TRUE(eglInitialize(mDisplay, &majorVersion, &minorVersion));
>+
>+    EGLint numConfigs;
>+    EGLint configAttrs[] = {EGL_RED_SIZE,
>+                            8,
>+                            EGL_GREEN_SIZE,
>+                            8,
>+                            EGL_BLUE_SIZE,
>+                            8,
>+                            EGL_RENDERABLE_TYPE,
>+                            GetParam().majorVersion == 3 ? EGL_OPENGL_ES3_BIT : EGL_OPENGL_ES2_BIT,
>+                            EGL_SURFACE_TYPE,
>+                            EGL_PBUFFER_BIT,
>+                            EGL_NONE};
>+
>+    ASSERT_TRUE(eglChooseConfig(mDisplay, configAttrs, &mConfig, 1, &numConfigs));
>+
>+    mContexts[0] = eglCreateContext(mDisplay, mConfig, EGL_NO_CONTEXT, nullptr);
>+    ASSERT_NE(EGL_NO_CONTEXT, mContexts[0]);
>+    mContexts[1] = eglCreateContext(mDisplay, mConfig, EGL_NO_CONTEXT, nullptr);
>+    ASSERT_NE(EGL_NO_CONTEXT, mContexts[1]);
>+
>+    mSurface = eglCreateWindowSurface(mDisplay, mConfig, mOSWindow->getNativeWindow(), nullptr);
>+    ASSERT_NE(EGL_NO_SURFACE, mSurface);
>+    ASSERT_TRUE(eglMakeCurrent(mDisplay, mSurface, mSurface, mContexts[0]));
>+}
>+
>+void EGLMakeCurrentPerfTest::TearDown()
>+{
>+    ANGLEPerfTest::TearDown();
>+    eglMakeCurrent(mDisplay, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT);
>+    eglDestroySurface(mDisplay, mSurface);
>+    eglDestroyContext(mDisplay, mContexts[0]);
>+    eglDestroyContext(mDisplay, mContexts[1]);
>+}
>+
>+void EGLMakeCurrentPerfTest::step()
>+{
>+    int mCurrContext = 0;
>+    for (int x = 0; x < ITERATIONS; x++)
>+    {
>+        mCurrContext = (mCurrContext + 1) % mContexts.size();
>+        eglMakeCurrent(mDisplay, mSurface, mSurface, mContexts[mCurrContext]);
>+    }
>+}
>+
>+TEST_P(EGLMakeCurrentPerfTest, Run)
>+{
>+    run();
>+}
>+
>+#if !defined(ANGLE_PLATFORM_ANDROID)
>+ANGLE_INSTANTIATE_TEST(EGLMakeCurrentPerfTest,
>+                       angle::ES2_D3D9(),
>+                       angle::ES2_D3D11(),
>+                       angle::ES2_OPENGL(),
>+                       angle::ES2_OPENGLES(),
>+                       angle::ES2_VULKAN());
>+#else
>+ANGLE_INSTANTIATE_TEST(EGLMakeCurrentPerfTest, angle::ES2_D3D9(), angle::ES2_D3D11());
>+#endif
>+
>+}  // namespace
>diff --git a/Source/ThirdParty/ANGLE/src/tests/perf_tests/IndexConversionPerf.cpp b/Source/ThirdParty/ANGLE/src/tests/perf_tests/IndexConversionPerf.cpp
>index 202c9c044e2..3eea9f1a9a8 100644
>--- a/Source/ThirdParty/ANGLE/src/tests/perf_tests/IndexConversionPerf.cpp
>+++ b/Source/ThirdParty/ANGLE/src/tests/perf_tests/IndexConversionPerf.cpp
>@@ -7,16 +7,15 @@
> //   Performance tests for ANGLE index conversion in D3D11.
> //
> 
>-#include <sstream>
>-
> #include "ANGLEPerfTest.h"
> #include "tests/test_utils/draw_call_perf_utils.h"
> 
>+#include <sstream>
>+
> using namespace angle;
> 
> namespace
> {
>-
> struct IndexConversionPerfParams final : public RenderTestParams
> {
>     std::string suffix() const override
>@@ -33,7 +32,6 @@ struct IndexConversionPerfParams final : public RenderTestParams
>         return strstr.str();
>     }
> 
>-    unsigned int iterations;
>     unsigned int numIndexTris;
> 
>     // A second test, which covers using index ranges with an offset.
>@@ -73,15 +71,13 @@ IndexConversionPerfTest::IndexConversionPerfTest()
>       mProgram(0),
>       mVertexBuffer(0),
>       mIndexBuffer(0)
>-{
>-    mRunTimeSeconds = 3.0;
>-}
>+{}
> 
> void IndexConversionPerfTest::initializeBenchmark()
> {
>     const auto &params = GetParam();
> 
>-    ASSERT_LT(0u, params.iterations);
>+    ASSERT_LT(0u, params.iterationsPerStep);
>     ASSERT_LT(0u, params.numIndexTris);
> 
>     mProgram = SetupSimpleScaleAndOffsetProgram();
>@@ -157,7 +153,7 @@ void IndexConversionPerfTest::drawConversion()
>     // Trigger an update to ensure we convert once a frame
>     updateBufferData();
> 
>-    for (unsigned int it = 0; it < params.iterations; it++)
>+    for (unsigned int it = 0; it < params.iterationsPerStep; it++)
>     {
>         glDrawElements(GL_TRIANGLES, static_cast<GLsizei>(params.numIndexTris * 3 - 1),
>                        GL_UNSIGNED_SHORT, reinterpret_cast<void *>(0));
>@@ -178,7 +174,7 @@ void IndexConversionPerfTest::drawIndexRange()
>     // This test increments an offset each step. Drawing repeatedly may cause the system memory
>     // to release. Then, using a fresh offset will require index range validation, which pages
>     // it back in. The performance should be good even if the data is was used quite a bit.
>-    for (unsigned int it = 0; it < params.iterations; it++)
>+    for (unsigned int it = 0; it < params.iterationsPerStep; it++)
>     {
>         glDrawElements(GL_TRIANGLES, static_cast<GLsizei>(indexCount), GL_UNSIGNED_SHORT,
>                        reinterpret_cast<void *>(offset));
>@@ -190,28 +186,28 @@ void IndexConversionPerfTest::drawIndexRange()
> IndexConversionPerfParams IndexConversionPerfD3D11Params()
> {
>     IndexConversionPerfParams params;
>-    params.eglParameters    = egl_platform::D3D11_NULL();
>-    params.majorVersion     = 2;
>-    params.minorVersion     = 0;
>-    params.windowWidth      = 256;
>-    params.windowHeight     = 256;
>-    params.iterations       = 225;
>-    params.numIndexTris     = 3000;
>-    params.indexRangeOffset = 0;
>+    params.eglParameters     = egl_platform::D3D11_NULL();
>+    params.majorVersion      = 2;
>+    params.minorVersion      = 0;
>+    params.windowWidth       = 256;
>+    params.windowHeight      = 256;
>+    params.iterationsPerStep = 225;
>+    params.numIndexTris      = 3000;
>+    params.indexRangeOffset  = 0;
>     return params;
> }
> 
> IndexConversionPerfParams IndexRangeOffsetPerfD3D11Params()
> {
>     IndexConversionPerfParams params;
>-    params.eglParameters    = egl_platform::D3D11_NULL();
>-    params.majorVersion     = 2;
>-    params.minorVersion     = 0;
>-    params.windowWidth      = 256;
>-    params.windowHeight     = 256;
>-    params.iterations       = 16;
>-    params.numIndexTris     = 50000;
>-    params.indexRangeOffset = 64;
>+    params.eglParameters     = egl_platform::D3D11_NULL();
>+    params.majorVersion      = 2;
>+    params.minorVersion      = 0;
>+    params.windowWidth       = 256;
>+    params.windowHeight      = 256;
>+    params.iterationsPerStep = 16;
>+    params.numIndexTris      = 50000;
>+    params.indexRangeOffset  = 64;
>     return params;
> }
> 
>@@ -223,5 +219,4 @@ TEST_P(IndexConversionPerfTest, Run)
> ANGLE_INSTANTIATE_TEST(IndexConversionPerfTest,
>                        IndexConversionPerfD3D11Params(),
>                        IndexRangeOffsetPerfD3D11Params());
>-
> }  // namespace
>diff --git a/Source/ThirdParty/ANGLE/src/tests/perf_tests/IndexDataManagerTest.cpp b/Source/ThirdParty/ANGLE/src/tests/perf_tests/IndexDataManagerTest.cpp
>index 35f65864154..0a3c5b9cc9e 100644
>--- a/Source/ThirdParty/ANGLE/src/tests/perf_tests/IndexDataManagerTest.cpp
>+++ b/Source/ThirdParty/ANGLE/src/tests/perf_tests/IndexDataManagerTest.cpp
>@@ -20,46 +20,49 @@ using namespace testing;
> 
> namespace
> {
>+constexpr unsigned int kIterationsPerStep = 100;
> 
> class MockIndexBuffer : public rx::IndexBuffer
> {
>   public:
>-    MockIndexBuffer(unsigned int bufferSize, GLenum indexType)
>+    MockIndexBuffer(unsigned int bufferSize, gl::DrawElementsType indexType)
>         : mBufferSize(bufferSize), mIndexType(indexType)
>-    {
>-    }
>+    {}
> 
>-    MOCK_METHOD3(initialize, gl::Error(unsigned int, GLenum, bool));
>-    MOCK_METHOD3(mapBuffer, gl::Error(unsigned int, unsigned int, void **));
>-    MOCK_METHOD0(unmapBuffer, gl::Error());
>-    MOCK_METHOD0(discard, gl::Error());
>-    MOCK_METHOD2(setSize, gl::Error(unsigned int, GLenum));
>+    MOCK_METHOD4(initialize,
>+                 angle::Result(const gl::Context *, unsigned int, gl::DrawElementsType, bool));
>+    MOCK_METHOD4(mapBuffer,
>+                 angle::Result(const gl::Context *, unsigned int, unsigned int, void **));
>+    MOCK_METHOD1(unmapBuffer, angle::Result(const gl::Context *));
>+    MOCK_METHOD1(discard, angle::Result(const gl::Context *));
>+    MOCK_METHOD3(setSize, angle::Result(const gl::Context *, unsigned int, gl::DrawElementsType));
> 
>     // inlined for speed
>-    GLenum getIndexType() const override { return mIndexType; }
>+    gl::DrawElementsType getIndexType() const override { return mIndexType; }
>     unsigned int getBufferSize() const override { return mBufferSize; }
> 
>   private:
>     unsigned int mBufferSize;
>-    GLenum mIndexType;
>+    gl::DrawElementsType mIndexType;
> };
> 
> class MockBufferFactoryD3D : public rx::BufferFactoryD3D
> {
>   public:
>-    MockBufferFactoryD3D(unsigned int bufferSize, GLenum indexType)
>+    MockBufferFactoryD3D(unsigned int bufferSize, gl::DrawElementsType indexType)
>         : mBufferSize(bufferSize), mIndexType(indexType)
>-    {
>-    }
>+    {}
> 
>     MOCK_METHOD0(createVertexBuffer, rx::VertexBuffer *());
>-    MOCK_CONST_METHOD1(getVertexConversionType, rx::VertexConversionType(gl::VertexFormatType));
>-    MOCK_CONST_METHOD1(getVertexComponentType, GLenum(gl::VertexFormatType));
>-    MOCK_CONST_METHOD4(getVertexSpaceRequired,
>-                       gl::ErrorOrResult<unsigned int>(const gl::VertexAttribute &,
>-                                                       const gl::VertexBinding &,
>-                                                       GLsizei,
>-                                                       GLsizei));
>+    MOCK_CONST_METHOD1(getVertexConversionType, rx::VertexConversionType(angle::FormatID));
>+    MOCK_CONST_METHOD1(getVertexComponentType, GLenum(angle::FormatID));
>+    MOCK_CONST_METHOD6(getVertexSpaceRequired,
>+                       angle::Result(const gl::Context *,
>+                                     const gl::VertexAttribute &,
>+                                     const gl::VertexBinding &,
>+                                     size_t,
>+                                     GLsizei,
>+                                     unsigned int *));
> 
>     // Dependency injection
>     rx::IndexBuffer *createIndexBuffer() override
>@@ -69,7 +72,7 @@ class MockBufferFactoryD3D : public rx::BufferFactoryD3D
> 
>   private:
>     unsigned int mBufferSize;
>-    GLenum mIndexType;
>+    gl::DrawElementsType mIndexType;
> };
> 
> class MockBufferD3D : public rx::BufferD3D
>@@ -78,39 +81,40 @@ class MockBufferD3D : public rx::BufferD3D
>     MockBufferD3D(rx::BufferFactoryD3D *factory) : BufferD3D(mockState, factory), mData() {}
> 
>     // BufferImpl
>-    gl::Error setData(const gl::Context *context,
>-                      gl::BufferBinding target,
>-                      const void *data,
>-                      size_t size,
>-                      gl::BufferUsage) override
>+    angle::Result setData(const gl::Context *context,
>+                          gl::BufferBinding target,
>+                          const void *data,
>+                          size_t size,
>+                          gl::BufferUsage) override
>     {
>         mData.resize(size);
>         if (data && size > 0)
>         {
>             memcpy(&mData[0], data, size);
>         }
>-        return gl::NoError();
>+        return angle::Result::Continue;
>     }
> 
>-    MOCK_METHOD5(setSubData,
>-                 gl::Error(const gl::Context *, gl::BufferBinding, const void *, size_t, size_t));
>+    MOCK_METHOD5(
>+        setSubData,
>+        angle::Result(const gl::Context *, gl::BufferBinding, const void *, size_t, size_t));
>     MOCK_METHOD5(copySubData,
>-                 gl::Error(const gl::Context *, BufferImpl *, GLintptr, GLintptr, GLsizeiptr));
>-    MOCK_METHOD3(map, gl::Error(const gl::Context *context, GLenum, void **));
>-    MOCK_METHOD5(mapRange, gl::Error(const gl::Context *, size_t, size_t, GLbitfield, void **));
>-    MOCK_METHOD2(unmap, gl::Error(const gl::Context *context, GLboolean *));
>+                 angle::Result(const gl::Context *, BufferImpl *, GLintptr, GLintptr, GLsizeiptr));
>+    MOCK_METHOD3(map, angle::Result(const gl::Context *context, GLenum, void **));
>+    MOCK_METHOD5(mapRange, angle::Result(const gl::Context *, size_t, size_t, GLbitfield, void **));
>+    MOCK_METHOD2(unmap, angle::Result(const gl::Context *context, GLboolean *));
> 
>     // BufferD3D
>-    MOCK_METHOD1(markTransformFeedbackUsage, gl::Error(const gl::Context *));
>+    MOCK_METHOD1(markTransformFeedbackUsage, angle::Result(const gl::Context *));
> 
>     // inlined for speed
>     bool supportsDirectBinding() const override { return false; }
>     size_t getSize() const override { return mData.size(); }
> 
>-    gl::Error getData(const gl::Context *context, const uint8_t **outData) override
>+    angle::Result getData(const gl::Context *context, const uint8_t **outData) override
>     {
>         *outData = &mData[0];
>-        return gl::NoError();
>+        return angle::Result::Continue;
>     }
> 
>   private:
>@@ -154,11 +158,11 @@ class IndexDataManagerPerfTest : public ANGLEPerfTest
> };
> 
> IndexDataManagerPerfTest::IndexDataManagerPerfTest()
>-    : ANGLEPerfTest("IndexDataManger", "_run"),
>+    : ANGLEPerfTest("IndexDataManger", "_run", kIterationsPerStep),
>       mIndexDataManager(&mMockBufferFactory),
>       mIndexCount(4000),
>       mBufferSize(mIndexCount * sizeof(GLushort)),
>-      mMockBufferFactory(mBufferSize, GL_UNSIGNED_SHORT),
>+      mMockBufferFactory(mBufferSize, gl::DrawElementsType::UnsignedShort),
>       mMockGLFactory(&mMockBufferFactory),
>       mIndexBuffer(&mMockGLFactory, 1)
> {
>@@ -167,23 +171,23 @@ IndexDataManagerPerfTest::IndexDataManagerPerfTest()
>     {
>         indexData[index] = static_cast<GLushort>(index);
>     }
>-    EXPECT_FALSE(mIndexBuffer
>-                     .bufferData(nullptr, gl::BufferBinding::Array, &indexData[0],
>-                                 indexData.size() * sizeof(GLushort), gl::BufferUsage::StaticDraw)
>-                     .isError());
>+    EXPECT_EQ(
>+        angle::Result::Continue,
>+        mIndexBuffer.bufferData(nullptr, gl::BufferBinding::Array, &indexData[0],
>+                                indexData.size() * sizeof(GLushort), gl::BufferUsage::StaticDraw));
> }
> 
> void IndexDataManagerPerfTest::step()
> {
>     rx::TranslatedIndexData translatedIndexData;
>     gl::IndexRange indexRange;
>-    for (unsigned int iteration = 0; iteration < 100; ++iteration)
>+    for (unsigned int iteration = 0; iteration < kIterationsPerStep; ++iteration)
>     {
>-        (void)mIndexBuffer.getIndexRange(nullptr, GL_UNSIGNED_SHORT, 0, mIndexCount, false,
>-                                         &indexRange);
>-        (void)mIndexDataManager.prepareIndexData(nullptr, GL_UNSIGNED_SHORT, GL_UNSIGNED_SHORT,
>-                                                 mIndexCount, &mIndexBuffer, nullptr,
>-                                                 &translatedIndexData);
>+        (void)mIndexBuffer.getIndexRange(nullptr, gl::DrawElementsType::UnsignedShort, 0,
>+                                         mIndexCount, false, &indexRange);
>+        (void)mIndexDataManager.prepareIndexData(nullptr, gl::DrawElementsType::UnsignedShort,
>+                                                 gl::DrawElementsType::UnsignedShort, mIndexCount,
>+                                                 &mIndexBuffer, nullptr, &translatedIndexData);
>     }
> }
> 
>diff --git a/Source/ThirdParty/ANGLE/src/tests/perf_tests/InstancingPerf.cpp b/Source/ThirdParty/ANGLE/src/tests/perf_tests/InstancingPerf.cpp
>index e6d90774f53..b6a45d20150 100644
>--- a/Source/ThirdParty/ANGLE/src/tests/perf_tests/InstancingPerf.cpp
>+++ b/Source/ThirdParty/ANGLE/src/tests/perf_tests/InstancingPerf.cpp
>@@ -7,13 +7,14 @@
> //   Performance tests for ANGLE instanced draw calls.
> //
> 
>+#include "ANGLEPerfTest.h"
>+
> #include <cmath>
> #include <sstream>
> 
>-#include "ANGLEPerfTest.h"
>-#include "Matrix.h"
>-#include "random_utils.h"
>-#include "shader_utils.h"
>+#include "util/Matrix.h"
>+#include "util/random_utils.h"
>+#include "util/shader_utils.h"
> 
> using namespace angle;
> using namespace egl_platform;
>@@ -49,7 +50,7 @@ struct InstancingPerfParams final : public RenderTestParams
>         minorVersion      = 0;
>         windowWidth       = 256;
>         windowHeight      = 256;
>-        iterations        = 1;
>+        iterationsPerStep = 1;
>         runTimeSeconds    = 10.0;
>         animationEnabled  = false;
>         instancingEnabled = true;
>@@ -69,7 +70,6 @@ struct InstancingPerfParams final : public RenderTestParams
>         return strstr.str();
>     }
> 
>-    unsigned int iterations;
>     double runTimeSeconds;
>     bool animationEnabled;
>     bool instancingEnabled;
>@@ -103,17 +103,13 @@ class InstancingPerfBenchmark : public ANGLERenderTest,
> 
> InstancingPerfBenchmark::InstancingPerfBenchmark()
>     : ANGLERenderTest("InstancingPerf", GetParam()), mProgram(0), mNumPoints(75000)
>-{
>-    mRunTimeSeconds = GetParam().runTimeSeconds;
>-}
>+{}
> 
> void InstancingPerfBenchmark::initializeBenchmark()
> {
>     const auto &params = GetParam();
> 
>-    ASSERT_LT(0u, params.iterations);
>-
>-    const std::string vs =
>+    const char kVS[] =
>         "attribute vec2 aPosition;\n"
>         "attribute vec3 aTranslate;\n"
>         "attribute float aScale;\n"
>@@ -129,7 +125,7 @@ void InstancingPerfBenchmark::initializeBenchmark()
>         "    vColor = aColor;\n"
>         "}\n";
> 
>-    const std::string fs =
>+    constexpr char kFS[] =
>         "precision mediump float;\n"
>         "varying vec3 vColor;\n"
>         "void main()\n"
>@@ -137,7 +133,7 @@ void InstancingPerfBenchmark::initializeBenchmark()
>         "    gl_FragColor = vec4(vColor, 1.0);\n"
>         "}\n";
> 
>-    mProgram = CompileProgram(vs, fs);
>+    mProgram = CompileProgram(kVS, kFS);
>     ASSERT_NE(0u, mProgram);
> 
>     glUseProgram(mProgram);
>@@ -280,9 +276,6 @@ void InstancingPerfBenchmark::drawBenchmark()
>     // Animatino makes the test more interesting visually, but also eats up many CPU cycles.
>     if (params.animationEnabled)
>     {
>-        // Not implemented for billboards.
>-        ASSERT(params.instancingEnabled);
>-
>         float time = static_cast<float>(mTimer->getElapsedTime());
> 
>         for (size_t pointIndex = 0; pointIndex < mTranslateData.size(); ++pointIndex)
>@@ -314,14 +307,14 @@ void InstancingPerfBenchmark::drawBenchmark()
>     // Render the instances/billboards.
>     if (params.instancingEnabled)
>     {
>-        for (unsigned int it = 0; it < params.iterations; it++)
>+        for (unsigned int it = 0; it < params.iterationsPerStep; it++)
>         {
>             glDrawElementsInstancedANGLE(GL_TRIANGLES, 6, GL_UNSIGNED_INT, nullptr, mNumPoints);
>         }
>     }
>     else
>     {
>-        for (unsigned int it = 0; it < params.iterations; it++)
>+        for (unsigned int it = 0; it < params.iterationsPerStep; it++)
>         {
>             glDrawElements(GL_TRIANGLES, 6 * mNumPoints, GL_UNSIGNED_INT, nullptr);
>         }
>diff --git a/Source/ThirdParty/ANGLE/src/tests/perf_tests/InterleavedAttributeData.cpp b/Source/ThirdParty/ANGLE/src/tests/perf_tests/InterleavedAttributeData.cpp
>index bf3a7c5f1e5..c62a5fa1499 100644
>--- a/Source/ThirdParty/ANGLE/src/tests/perf_tests/InterleavedAttributeData.cpp
>+++ b/Source/ThirdParty/ANGLE/src/tests/perf_tests/InterleavedAttributeData.cpp
>@@ -10,7 +10,7 @@
> #include <sstream>
> 
> #include "ANGLEPerfTest.h"
>-#include "shader_utils.h"
>+#include "util/shader_utils.h"
> 
> using namespace angle;
> 
>@@ -21,6 +21,8 @@ struct InterleavedAttributeDataParams final : public RenderTestParams
> {
>     InterleavedAttributeDataParams()
>     {
>+        iterationsPerStep = 1;
>+
>         // Common default values
>         majorVersion = 2;
>         minorVersion = 0;
>@@ -70,6 +72,11 @@ class InterleavedAttributeDataBenchmark
> InterleavedAttributeDataBenchmark::InterleavedAttributeDataBenchmark()
>     : ANGLERenderTest("InterleavedAttributeData", GetParam()), mPointSpriteProgram(0)
> {
>+    // Timing out on Intel. http://crbug.com/921004
>+    if (GetParam().eglParameters.renderer == EGL_PLATFORM_ANGLE_TYPE_OPENGL_ANGLE)
>+    {
>+        mSkipTest = true;
>+    }
> }
> 
> void InterleavedAttributeDataBenchmark::initializeBenchmark()
>@@ -77,7 +84,7 @@ void InterleavedAttributeDataBenchmark::initializeBenchmark()
>     const auto &params = GetParam();
> 
>     // Compile point sprite shaders
>-    const std::string vs =
>+    constexpr char kVS[] =
>         "attribute vec4 aPosition;"
>         "attribute vec4 aColor;"
>         "varying vec4 vColor;"
>@@ -88,7 +95,7 @@ void InterleavedAttributeDataBenchmark::initializeBenchmark()
>         "    vColor = aColor;"
>         "}";
> 
>-    const std::string fs =
>+    constexpr char kFS[] =
>         "precision mediump float;"
>         "varying vec4 vColor;"
>         "void main()"
>@@ -96,7 +103,7 @@ void InterleavedAttributeDataBenchmark::initializeBenchmark()
>         "    gl_FragColor = vColor;"
>         "}";
> 
>-    mPointSpriteProgram = CompileProgram(vs, fs);
>+    mPointSpriteProgram = CompileProgram(kVS, kFS);
>     ASSERT_NE(0u, mPointSpriteProgram);
> 
>     glClearColor(0.0f, 1.0f, 0.0f, 1.0f);
>@@ -109,10 +116,12 @@ void InterleavedAttributeDataBenchmark::initializeBenchmark()
>         {
>             float pointSpriteX =
>                 (static_cast<float>(rand() % getWindow()->getWidth()) / getWindow()->getWidth()) *
>-                    2.0f - 1.0f;
>+                    2.0f -
>+                1.0f;
>             float pointSpriteY =
>                 (static_cast<float>(rand() % getWindow()->getHeight()) / getWindow()->getHeight()) *
>-                    2.0f - 1.0f;
>+                    2.0f -
>+                1.0f;
>             GLubyte pointSpriteRed   = static_cast<GLubyte>(rand() % 255);
>             GLubyte pointSpriteGreen = static_cast<GLubyte>(rand() % 255);
>             GLubyte pointSpriteBlue  = static_cast<GLubyte>(rand() % 255);
>@@ -182,7 +191,6 @@ void InterleavedAttributeDataBenchmark::drawBenchmark()
> 
>             // Then draw the colored pointsprites
>             glDrawArrays(GL_POINTS, 0, GetParam().numSprites);
>-            glFlush();
> 
>             glDisableVertexAttribArray(positionLocation);
>             glDisableVertexAttribArray(colorLocation);
>@@ -225,10 +233,18 @@ InterleavedAttributeDataParams OpenGLOrGLESParams()
>     return params;
> }
> 
>+InterleavedAttributeDataParams VulkanParams()
>+{
>+    InterleavedAttributeDataParams params;
>+    params.eglParameters = egl_platform::VULKAN();
>+    return params;
>+}
>+
> ANGLE_INSTANTIATE_TEST(InterleavedAttributeDataBenchmark,
>                        D3D11Params(),
>                        D3D11_9_3Params(),
>                        D3D9Params(),
>-                       OpenGLOrGLESParams());
>+                       OpenGLOrGLESParams(),
>+                       VulkanParams());
> 
> }  // anonymous namespace
>diff --git a/Source/ThirdParty/ANGLE/src/tests/perf_tests/LinkProgramPerfTest.cpp b/Source/ThirdParty/ANGLE/src/tests/perf_tests/LinkProgramPerfTest.cpp
>index 0fa0f0199a1..937795ed47c 100644
>--- a/Source/ThirdParty/ANGLE/src/tests/perf_tests/LinkProgramPerfTest.cpp
>+++ b/Source/ThirdParty/ANGLE/src/tests/perf_tests/LinkProgramPerfTest.cpp
>@@ -12,21 +12,41 @@
> #include <array>
> 
> #include "common/vector_utils.h"
>-#include "shader_utils.h"
>+#include "util/shader_utils.h"
> 
> using namespace angle;
> 
> namespace
> {
> 
>+enum class TaskOption
>+{
>+    CompileOnly,
>+    CompileAndLink,
>+
>+    Unspecified
>+};
>+
>+enum class ThreadOption
>+{
>+    SingleThread,
>+    MultiThread,
>+
>+    Unspecified
>+};
>+
> struct LinkProgramParams final : public RenderTestParams
> {
>-    LinkProgramParams()
>+    LinkProgramParams(TaskOption taskOptionIn, ThreadOption threadOptionIn)
>     {
>+        iterationsPerStep = 1;
>+
>         majorVersion = 2;
>         minorVersion = 0;
>         windowWidth  = 256;
>         windowHeight = 256;
>+        taskOption   = taskOptionIn;
>+        threadOption = threadOptionIn;
>     }
> 
>     std::string suffix() const override
>@@ -34,6 +54,24 @@ struct LinkProgramParams final : public RenderTestParams
>         std::stringstream strstr;
>         strstr << RenderTestParams::suffix();
> 
>+        if (taskOption == TaskOption::CompileOnly)
>+        {
>+            strstr << "_compile_only";
>+        }
>+        else if (taskOption == TaskOption::CompileAndLink)
>+        {
>+            strstr << "_compile_and_link";
>+        }
>+
>+        if (threadOption == ThreadOption::SingleThread)
>+        {
>+            strstr << "_single_thread";
>+        }
>+        else if (threadOption == ThreadOption::MultiThread)
>+        {
>+            strstr << "_multi_thread";
>+        }
>+
>         if (eglParameters.deviceType == EGL_PLATFORM_ANGLE_DEVICE_TYPE_NULL_ANGLE)
>         {
>             strstr << "_null";
>@@ -41,6 +79,9 @@ struct LinkProgramParams final : public RenderTestParams
> 
>         return strstr.str();
>     }
>+
>+    TaskOption taskOption;
>+    ThreadOption threadOption;
> };
> 
> std::ostream &operator<<(std::ostream &os, const LinkProgramParams &params)
>@@ -63,12 +104,15 @@ class LinkProgramBenchmark : public ANGLERenderTest,
>     GLuint mVertexBuffer = 0;
> };
> 
>-LinkProgramBenchmark::LinkProgramBenchmark() : ANGLERenderTest("LinkProgram", GetParam())
>-{
>-}
>+LinkProgramBenchmark::LinkProgramBenchmark() : ANGLERenderTest("LinkProgram", GetParam()) {}
> 
> void LinkProgramBenchmark::initializeBenchmark()
> {
>+    if (GetParam().threadOption == ThreadOption::SingleThread)
>+    {
>+        glMaxShaderCompilerThreadsKHR(0);
>+    }
>+
>     std::array<Vector3, 6> vertices = {{Vector3(-1.0f, 1.0f, 0.5f), Vector3(-1.0f, -1.0f, 0.5f),
>                                         Vector3(1.0f, -1.0f, 0.5f), Vector3(-1.0f, 1.0f, 0.5f),
>                                         Vector3(1.0f, -1.0f, 0.5f), Vector3(1.0f, 1.0f, 0.5f)}};
>@@ -77,7 +121,7 @@ void LinkProgramBenchmark::initializeBenchmark()
>     glBindBuffer(GL_ARRAY_BUFFER, mVertexBuffer);
>     glBufferData(GL_ARRAY_BUFFER, vertices.size() * sizeof(Vector3), vertices.data(),
>                  GL_STATIC_DRAW);
>-};
>+}
> 
> void LinkProgramBenchmark::destroyBenchmark()
> {
>@@ -96,10 +140,26 @@ void LinkProgramBenchmark::drawBenchmark()
>         "void main() {\n"
>         "    gl_FragColor = vec4(1, 0, 0, 1);\n"
>         "}";
>+    GLuint vs = CompileShader(GL_VERTEX_SHADER, vertexShader);
>+    GLuint fs = CompileShader(GL_FRAGMENT_SHADER, fragmentShader);
>+
>+    ASSERT_NE(0u, vs);
>+    ASSERT_NE(0u, fs);
>+    if (GetParam().taskOption == TaskOption::CompileOnly)
>+    {
>+        glDeleteShader(vs);
>+        glDeleteShader(fs);
>+        return;
>+    }
> 
>-    GLuint program = CompileProgram(vertexShader, fragmentShader);
>+    GLuint program = glCreateProgram();
>     ASSERT_NE(0u, program);
> 
>+    glAttachShader(program, vs);
>+    glDeleteShader(vs);
>+    glAttachShader(program, fs);
>+    glDeleteShader(fs);
>+    glLinkProgram(program);
>     glUseProgram(program);
> 
>     GLint positionLoc = glGetAttribLocation(program, "position");
>@@ -114,35 +174,56 @@ void LinkProgramBenchmark::drawBenchmark()
> 
> using namespace egl_platform;
> 
>-LinkProgramParams LinkProgramD3D11Params()
>+LinkProgramParams LinkProgramD3D11Params(TaskOption taskOption, ThreadOption threadOption)
> {
>-    LinkProgramParams params;
>+    LinkProgramParams params(taskOption, threadOption);
>     params.eglParameters = D3D11();
>     return params;
> }
> 
>-LinkProgramParams LinkProgramD3D9Params()
>+LinkProgramParams LinkProgramD3D9Params(TaskOption taskOption, ThreadOption threadOption)
> {
>-    LinkProgramParams params;
>+    LinkProgramParams params(taskOption, threadOption);
>     params.eglParameters = D3D9();
>     return params;
> }
> 
>-LinkProgramParams LinkProgramOpenGLOrGLESParams()
>+LinkProgramParams LinkProgramOpenGLOrGLESParams(TaskOption taskOption, ThreadOption threadOption)
> {
>-    LinkProgramParams params;
>+    LinkProgramParams params(taskOption, threadOption);
>     params.eglParameters = OPENGL_OR_GLES(false);
>     return params;
> }
> 
>+LinkProgramParams LinkProgramVulkanParams(TaskOption taskOption, ThreadOption threadOption)
>+{
>+    LinkProgramParams params(taskOption, threadOption);
>+    params.eglParameters = VULKAN();
>+    return params;
>+}
>+
> TEST_P(LinkProgramBenchmark, Run)
> {
>     run();
> }
> 
>-ANGLE_INSTANTIATE_TEST(LinkProgramBenchmark,
>-                       LinkProgramD3D11Params(),
>-                       LinkProgramD3D9Params(),
>-                       LinkProgramOpenGLOrGLESParams());
>+ANGLE_INSTANTIATE_TEST(
>+    LinkProgramBenchmark,
>+    LinkProgramD3D11Params(TaskOption::CompileOnly, ThreadOption::MultiThread),
>+    LinkProgramD3D9Params(TaskOption::CompileOnly, ThreadOption::MultiThread),
>+    LinkProgramOpenGLOrGLESParams(TaskOption::CompileOnly, ThreadOption::MultiThread),
>+    LinkProgramVulkanParams(TaskOption::CompileOnly, ThreadOption::MultiThread),
>+    LinkProgramD3D11Params(TaskOption::CompileAndLink, ThreadOption::MultiThread),
>+    LinkProgramD3D9Params(TaskOption::CompileAndLink, ThreadOption::MultiThread),
>+    LinkProgramOpenGLOrGLESParams(TaskOption::CompileAndLink, ThreadOption::MultiThread),
>+    LinkProgramVulkanParams(TaskOption::CompileAndLink, ThreadOption::MultiThread),
>+    LinkProgramD3D11Params(TaskOption::CompileOnly, ThreadOption::SingleThread),
>+    LinkProgramD3D9Params(TaskOption::CompileOnly, ThreadOption::SingleThread),
>+    LinkProgramOpenGLOrGLESParams(TaskOption::CompileOnly, ThreadOption::SingleThread),
>+    LinkProgramVulkanParams(TaskOption::CompileOnly, ThreadOption::SingleThread),
>+    LinkProgramD3D11Params(TaskOption::CompileAndLink, ThreadOption::SingleThread),
>+    LinkProgramD3D9Params(TaskOption::CompileAndLink, ThreadOption::SingleThread),
>+    LinkProgramOpenGLOrGLESParams(TaskOption::CompileAndLink, ThreadOption::SingleThread),
>+    LinkProgramVulkanParams(TaskOption::CompileAndLink, ThreadOption::SingleThread));
> 
> }  // anonymous namespace
>diff --git a/Source/ThirdParty/ANGLE/src/tests/perf_tests/MultiviewPerf.cpp b/Source/ThirdParty/ANGLE/src/tests/perf_tests/MultiviewPerf.cpp
>index c3d99d23d3d..df6408d0215 100644
>--- a/Source/ThirdParty/ANGLE/src/tests/perf_tests/MultiviewPerf.cpp
>+++ b/Source/ThirdParty/ANGLE/src/tests/perf_tests/MultiviewPerf.cpp
>@@ -13,9 +13,8 @@
> #include "ANGLEPerfTest.h"
> #include "common/vector_utils.h"
> #include "platform/WorkaroundsD3D.h"
>-#include "shader_utils.h"
> #include "test_utils/gl_raii.h"
>-#include "tests/test_utils/ANGLETest.h"
>+#include "util/shader_utils.h"
> 
> #include <string.h>
> 
>@@ -33,12 +32,10 @@ std::string GetShaderExtensionHeader(bool usesMultiview, int numViews, GLenum sh
> 
>     if (shaderType == GL_VERTEX_SHADER)
>     {
>-        return "#extension GL_OVR_multiview : require\nlayout(num_views = " + ToString(numViews) +
>+        return "#extension GL_OVR_multiview2 : require\nlayout(num_views = " + ToString(numViews) +
>                ") in;\n";
>-        ;
>     }
>-    ASSERT(shaderType == GL_FRAGMENT_SHADER);
>-    return "#extension GL_OVR_multiview : require\n";
>+    return "#extension GL_OVR_multiview2 : require\n";
> }
> 
> struct Vertex
>@@ -64,13 +61,14 @@ struct MultiviewPerfParams final : public RenderTestParams
>                         const MultiviewPerfWorkload &workloadIn,
>                         MultiviewOption multiviewOptionIn)
>     {
>-        majorVersion    = 3;
>-        minorVersion    = 0;
>-        eglParameters   = platformParametersIn;
>-        windowWidth     = workloadIn.first;
>-        windowHeight    = workloadIn.second;
>-        multiviewOption = multiviewOptionIn;
>-        numViews        = 2;
>+        iterationsPerStep = 1;
>+        majorVersion      = 3;
>+        minorVersion      = 0;
>+        eglParameters     = platformParametersIn;
>+        windowWidth       = workloadIn.first;
>+        windowHeight      = workloadIn.second;
>+        multiviewOption   = multiviewOptionIn;
>+        numViews          = 2;
>     }
> 
>     std::string suffix() const override
>@@ -88,7 +86,8 @@ struct MultiviewPerfParams final : public RenderTestParams
>                 name += "_instanced_multiview_geometry_shader";
>                 break;
>             default:
>-                UNREACHABLE();
>+                name += "_error";
>+                break;
>         }
>         name += "_" + ToString(numViews) + "_views";
>         return name;
>@@ -109,9 +108,11 @@ class MultiviewBenchmark : public ANGLERenderTest,
> {
>   public:
>     MultiviewBenchmark(const std::string &testName)
>-        : ANGLERenderTest(testName, GetParam(), {"GL_ANGLE_multiview"}), mProgram(0)
>+        : ANGLERenderTest(testName, GetParam()), mProgram(0)
>     {
>+        addExtensionPrerequisite("GL_OVR_multiview2");
>     }
>+
>     virtual ~MultiviewBenchmark()
>     {
>         if (mProgram != 0)
>@@ -132,7 +133,7 @@ class MultiviewBenchmark : public ANGLERenderTest,
>   protected:
>     virtual void renderScene() = 0;
> 
>-    void createProgram(const std::string &vs, const std::string &fs)
>+    void createProgram(const char *vs, const char *fs)
>     {
>         mProgram = CompileProgram(vs, fs);
>         if (mProgram == 0)
>@@ -178,21 +179,20 @@ class MultiviewGPUBoundBenchmark : public MultiviewBenchmark
> void MultiviewBenchmark::initializeBenchmark()
> {
>     const MultiviewPerfParams *params = static_cast<const MultiviewPerfParams *>(&mTestParams);
>-    ASSERT(params->windowWidth % params->numViews == 0);
>-
>-    glBindTexture(GL_TEXTURE_2D, mColorTexture);
>-    glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA8, params->windowWidth, params->windowHeight, 0, GL_RGBA,
>-                 GL_UNSIGNED_BYTE, NULL);
>-
>-    glBindTexture(GL_TEXTURE_2D, mDepthTexture);
>-    glTexImage2D(GL_TEXTURE_2D, 0, GL_DEPTH_COMPONENT32F, params->windowWidth, params->windowHeight,
>-                 0, GL_DEPTH_COMPONENT, GL_FLOAT, NULL);
>-
>-    glBindFramebuffer(GL_FRAMEBUFFER, mFramebuffer);
> 
>     switch (params->multiviewOption)
>     {
>         case MultiviewOption::NoAcceleration:
>+            // No acceleration texture arrays
>+            glBindTexture(GL_TEXTURE_2D, mColorTexture);
>+            glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA8, params->windowWidth, params->windowHeight, 0,
>+                         GL_RGBA, GL_UNSIGNED_BYTE, nullptr);
>+
>+            glBindTexture(GL_TEXTURE_2D, mDepthTexture);
>+            glTexImage2D(GL_TEXTURE_2D, 0, GL_DEPTH_COMPONENT32F, params->windowWidth,
>+                         params->windowHeight, 0, GL_DEPTH_COMPONENT, GL_FLOAT, nullptr);
>+
>+            glBindFramebuffer(GL_FRAMEBUFFER, mFramebuffer);
>             glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D,
>                                    mColorTexture, 0);
>             glFramebufferTexture2D(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, GL_TEXTURE_2D,
>@@ -201,23 +201,25 @@ void MultiviewBenchmark::initializeBenchmark()
>         case MultiviewOption::InstancedMultiviewVertexShader:
>         case MultiviewOption::InstancedMultiviewGeometryShader:
>         {
>-            const int widthPerView = params->windowWidth / params->numViews;
>-            std::vector<GLint> viewportOffsets(2 * params->numViews);
>-            for (int i = 0u; i < params->numViews; ++i)
>-            {
>-                viewportOffsets[i * 2]     = i * widthPerView;
>-                viewportOffsets[i * 2 + 1] = 0;
>-            }
>-            glFramebufferTextureMultiviewSideBySideANGLE(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0,
>-                                                         mColorTexture, 0, params->numViews,
>-                                                         viewportOffsets.data());
>-            glFramebufferTextureMultiviewSideBySideANGLE(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT,
>-                                                         mDepthTexture, 0, params->numViews,
>-                                                         viewportOffsets.data());
>+            // Multiview texture arrays
>+            glBindTexture(GL_TEXTURE_2D_ARRAY, mColorTexture);
>+            glTexImage3D(GL_TEXTURE_2D_ARRAY, 0, GL_RGBA8, params->windowWidth,
>+                         params->windowHeight, 2, 0, GL_RGBA, GL_UNSIGNED_BYTE, nullptr);
>+
>+            glBindTexture(GL_TEXTURE_2D_ARRAY, mDepthTexture);
>+            glTexImage3D(GL_TEXTURE_2D_ARRAY, 0, GL_DEPTH_COMPONENT32F, params->windowWidth,
>+                         params->windowHeight, 2, 0, GL_DEPTH_COMPONENT, GL_FLOAT, nullptr);
>+
>+            glBindFramebuffer(GL_FRAMEBUFFER, mFramebuffer);
>+            glFramebufferTextureMultiviewOVR(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, mColorTexture, 0,
>+                                             0, params->numViews);
>+            glFramebufferTextureMultiviewOVR(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, mDepthTexture, 0,
>+                                             0, params->numViews);
>             break;
>         }
>-        default:
>-            UNREACHABLE();
>+        case MultiviewOption::Unspecified:
>+            // implementation error.
>+            break;
>     }
> 
>     GLenum DrawBuffers[1] = {GL_COLOR_ATTACHMENT0};
>@@ -250,8 +252,9 @@ void MultiviewBenchmark::drawBenchmark()
>             glScissor(0, 0, viewWidth, viewHeight);
>             renderScene();
>             break;
>-        default:
>-            UNREACHABLE();
>+        case MultiviewOption::Unspecified:
>+            // implementation error.
>+            break;
>     }
> 
>     ASSERT_GL_NO_ERROR();
>@@ -264,7 +267,7 @@ void MultiviewCPUBoundBenchmark::initializeBenchmark()
>     const MultiviewPerfParams *params = static_cast<const MultiviewPerfParams *>(&mTestParams);
>     const bool usesMultiview = (params->multiviewOption != MultiviewOption::NoAcceleration);
> 
>-    const std::string &vs =
>+    const std::string vs =
>         "#version 300 es\n" +
>         GetShaderExtensionHeader(usesMultiview, params->numViews, GL_VERTEX_SHADER) +
>         "layout(location=0) in vec4 vPosition;\n"
>@@ -273,10 +276,10 @@ void MultiviewCPUBoundBenchmark::initializeBenchmark()
>         "{\n"
>         "   vec4 v = vPosition;\n"
>         "   v.xy += uOffset;\n"
>-        "   gl_Position = v;\n"
>+        "	gl_Position = v;\n"
>         "}\n";
> 
>-    const std::string &fs =
>+    const std::string fs =
>         "#version 300 es\n" +
>         GetShaderExtensionHeader(usesMultiview, params->numViews, GL_FRAGMENT_SHADER) +
>         "precision mediump float;\n"
>@@ -287,7 +290,7 @@ void MultiviewCPUBoundBenchmark::initializeBenchmark()
>         "    col = vec4(1.);\n"
>         "}\n";
> 
>-    createProgram(vs, fs);
>+    createProgram(vs.c_str(), fs.c_str());
> 
>     const float viewWidth  = static_cast<float>(params->windowWidth / params->numViews);
>     const float viewHeight = static_cast<float>(params->windowHeight);
>@@ -371,7 +374,7 @@ void MultiviewGPUBoundBenchmark::initializeBenchmark()
>         "   frag_Col3 = vert_Col3;\n"
>         "   frag_Col4 = vert_Col4;\n"
>         "   frag_Col5 = vert_Col5;\n"
>-        "   gl_Position = vPosition;\n"
>+        "	gl_Position = vPosition;\n"
>         "}\n";
> 
>     const std::string &fs =
>@@ -395,7 +398,7 @@ void MultiviewGPUBoundBenchmark::initializeBenchmark()
>         "    col += frag_Col5;\n"
>         "}\n";
> 
>-    createProgram(vs, fs);
>+    createProgram(vs.c_str(), fs.c_str());
>     ASSERT_GL_NO_ERROR();
> 
>     // Generate a vertex buffer of triangulated quads so that we have one quad per pixel.
>diff --git a/Source/ThirdParty/ANGLE/src/tests/perf_tests/PointSprites.cpp b/Source/ThirdParty/ANGLE/src/tests/perf_tests/PointSprites.cpp
>index d7537b26fc7..a677996aa32 100644
>--- a/Source/ThirdParty/ANGLE/src/tests/perf_tests/PointSprites.cpp
>+++ b/Source/ThirdParty/ANGLE/src/tests/perf_tests/PointSprites.cpp
>@@ -12,27 +12,29 @@
> #include <iostream>
> #include <sstream>
> 
>-#include "shader_utils.h"
>-#include "random_utils.h"
>+#include "util/random_utils.h"
>+#include "util/shader_utils.h"
> 
> using namespace angle;
> 
> namespace
> {
>+constexpr unsigned int kIterationsPerStep = 100;
> 
> struct PointSpritesParams final : public RenderTestParams
> {
>     PointSpritesParams()
>     {
>+        iterationsPerStep = kIterationsPerStep;
>+
>         // Common default params
>         majorVersion = 2;
>         minorVersion = 0;
>-        windowWidth = 1280;
>+        windowWidth  = 1280;
>         windowHeight = 720;
>-        iterations   = 100;
>-        count = 10;
>-        size = 3.0f;
>-        numVaryings = 3;
>+        count        = 10;
>+        size         = 3.0f;
>+        numVaryings  = 3;
>     }
> 
>     std::string suffix() const override;
>@@ -40,9 +42,6 @@ struct PointSpritesParams final : public RenderTestParams
>     unsigned int count;
>     float size;
>     unsigned int numVaryings;
>-
>-    // static parameters
>-    unsigned int iterations;
> };
> 
> std::ostream &operator<<(std::ostream &os, const PointSpritesParams &params)
>@@ -71,8 +70,7 @@ std::string PointSpritesParams::suffix() const
> {
>     std::stringstream strstr;
> 
>-    strstr << RenderTestParams::suffix()
>-           << "_" << count << "_" << size << "px"
>+    strstr << RenderTestParams::suffix() << "_" << count << "_" << size << "px"
>            << "_" << numVaryings << "vars";
> 
>     return strstr.str();
>@@ -80,15 +78,12 @@ std::string PointSpritesParams::suffix() const
> 
> PointSpritesBenchmark::PointSpritesBenchmark()
>     : ANGLERenderTest("PointSprites", GetParam()), mRNG(1)
>-{
>-}
>+{}
> 
> void PointSpritesBenchmark::initializeBenchmark()
> {
>     const auto &params = GetParam();
> 
>-    ASSERT_LT(0u, params.iterations);
>-
>     std::stringstream vstrstr;
> 
>     // Verify "numVaryings" is within MAX_VARYINGS limit
>@@ -142,7 +137,7 @@ void PointSpritesBenchmark::initializeBenchmark()
>     fstrstr << "    gl_FragColor = colorOut;\n"
>                "}\n";
> 
>-    mProgram = CompileProgram(vstrstr.str(), fstrstr.str());
>+    mProgram = CompileProgram(vstrstr.str().c_str(), fstrstr.str().c_str());
>     ASSERT_NE(0u, mProgram);
> 
>     // Use the program object
>@@ -158,7 +153,8 @@ void PointSpritesBenchmark::initializeBenchmark()
> 
>     glGenBuffers(1, &mBuffer);
>     glBindBuffer(GL_ARRAY_BUFFER, mBuffer);
>-    glBufferData(GL_ARRAY_BUFFER, vertexPositions.size() * sizeof(float), &vertexPositions[0], GL_STATIC_DRAW);
>+    glBufferData(GL_ARRAY_BUFFER, vertexPositions.size() * sizeof(float), &vertexPositions[0],
>+                 GL_STATIC_DRAW);
> 
>     GLint positionLocation = glGetAttribLocation(mProgram, "vPosition");
>     ASSERT_NE(-1, positionLocation);
>@@ -189,9 +185,9 @@ void PointSpritesBenchmark::drawBenchmark()
> 
>     const auto &params = GetParam();
> 
>-    for (unsigned int it = 0; it < params.iterations; it++)
>+    for (unsigned int it = 0; it < params.iterationsPerStep; it++)
>     {
>-        //TODO(jmadill): Indexed point rendering. ANGLE is bad at this.
>+        // TODO(jmadill): Indexed point rendering. ANGLE is bad at this.
>         glDrawArrays(GL_POINTS, 0, params.count);
>     }
> 
>@@ -219,11 +215,22 @@ PointSpritesParams OpenGLOrGLESParams()
>     return params;
> }
> 
>-} // namespace
>+PointSpritesParams VulkanParams()
>+{
>+    PointSpritesParams params;
>+    params.eglParameters = egl_platform::VULKAN();
>+    return params;
>+}
>+
>+}  // namespace
> 
> TEST_P(PointSpritesBenchmark, Run)
> {
>     run();
> }
> 
>-ANGLE_INSTANTIATE_TEST(PointSpritesBenchmark, D3D11Params(), D3D9Params(), OpenGLOrGLESParams());
>+ANGLE_INSTANTIATE_TEST(PointSpritesBenchmark,
>+                       D3D11Params(),
>+                       D3D9Params(),
>+                       OpenGLOrGLESParams(),
>+                       VulkanParams());
>diff --git a/Source/ThirdParty/ANGLE/src/tests/perf_tests/README.md b/Source/ThirdParty/ANGLE/src/tests/perf_tests/README.md
>new file mode 100644
>index 00000000000..7aaa844e0a2
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/tests/perf_tests/README.md
>@@ -0,0 +1,44 @@
>+# ANGLE Performance Tests
>+
>+`angle_perftests` is a standalone testing suite that contains targeted tests for OpenGL, Vulkan and ANGLE internal classes. The tests currently run on the Chromium ANGLE infrastructure and report results to the [Chromium perf dashboard](https://chromeperf.appspot.com/report).
>+
>+You can also build your own dashboards. For example, a comparison of ANGLE's back-end draw call performance on Windows NVIDIA can be found [at this link](https://chromeperf.appspot.com/report?sid=1fdf94a308f52b6bf02c08f6f36e87ca0d0075e2d2eefc61e6cf90c919c1643a&start_rev=577814&end_rev=582136). Note that this link is not kept current.
>+
>+## Running the Tests
>+
>+You can follow the usual instructions to [check out and build ANGLE](../../../doc/DevSetup.md). Build the `angle_perftests` target. Note that all test scores are higher-is-better. You should also ensure `is_debug=false` in your build. Running with `dcheck_always_on` or debug validation enabled is not recommended.
>+
>+Variance can be a problem when benchmarking. We have a test harness to run a single test in an infinite loop and print some statistics to help mitigate variance. See [`scripts/perf_test_runner.py`](https://chromium.googlesource.com/angle/angle/+/master/scripts/perf_test_runner.py). To use the script first compile `angle_perftests` into a folder with the word `Release` in it. Then provide the name of the test as the argument to the script. The script will automatically pick up the most current `angle_perftests` and run in an infinite loop.
>+
>+### Choosing the Test to Run
>+
>+You can choose individual tests to run with `--gtest_filter=*TestName*`. To select a particular ANGLE back-end, add the name of the back-end to the test filter. For example: `DrawCallPerfBenchmark.Run/gl` or `DrawCallPerfBenchmark.Run/d3d11`. Many tests have sub-tests that run slightly different code paths. You might need to experiment to find the right sub-test and its name.
>+
>+### Null/No-op Configurations
>+
>+ANGLE implements a no-op driver for OpenGL, D3D11 and Vulkan. To run on these configurations use the `gl_null`, `d3d11_null` or `vulkan_null` test configurations. These null drivers will not do any GPU work. They will skip the driver entirely. These null configs are useful for diagnosing performance overhead in ANGLE code.
>+
>+## Test Breakdown
>+
>+* [`DrawCallPerfBenchmark`](DrawCallPerf.cpp): Runs a tight loop around DrawArarys calls.
>+  * `validation_only`: Skips all rendering.
>+  * `render_to_texture`: Render to a user Framebuffer instead of the default FBO.
>+  * `vbo_change`: Applies a Vertex Array change between each draw.
>+  * `tex_change`: Applies a Texture change between each draw.
>+* [`UniformsBenchmark`](UniformsPerf.cpp): Tests performance of updating various uniforms counts followed by a DrawArrays call.
>+    * `vec4`: Tests `vec4` Uniforms.
>+    * `matrix`: Tests using Matrix uniforms instead of `vec4`.
>+    * `multiprogram`: Tests switching Programs between updates and draws.
>+    * `repeating`: Skip the update of uniforms before each draw call.
>+* [`DrawElementsPerfBenchmark`](DrawElementsPerf.cpp): Similar to `DrawCallPerfBenchmark` but for indexed DrawElements calls.
>+* [`BindingsBenchmark`](BindingPerf.cpp): Tests Buffer binding performance. Does no draw call operations.
>+    * `100_objects_allocated_every_iteration`: Tests repeated glBindBuffer with new buffers allocated each iteration.
>+    * `100_objects_allocated_at_initialization`: Tests repeated glBindBuffer the same objects each iteration.
>+* [`TexSubImageBenchmark`](TexSubImage.cpp): Tests `glTexSubImage` update performance.
>+* [`BufferSubDataBenchmark`](BufferSubData.cpp): Tests `glBufferSubData` update performance.
>+* [`TextureSamplingBenchmark`](TextureSampling.cpp): Tests Texture sampling performance.
>+* [`TextureBenchmark`](TexturesPerf.cpp): Tests Texture state change performance.
>+* [`LinkProgramBenchmark`](LinkProgramPerfTest.cpp): Tests performance of `glLinkProgram`.
>+* [`glmark2`](glmark2.cpp): Runs the glmark2 benchmark.
>+
>+Many other tests can be found that have documentation in their classes.
>diff --git a/Source/ThirdParty/ANGLE/src/tests/perf_tests/ResultPerf.cpp b/Source/ThirdParty/ANGLE/src/tests/perf_tests/ResultPerf.cpp
>new file mode 100644
>index 00000000000..295947a1180
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/tests/perf_tests/ResultPerf.cpp
>@@ -0,0 +1,71 @@
>+//
>+// Copyright 2018 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// ResultPerf:
>+//   Performance test for ANGLE's Error result class.
>+//
>+
>+#include "ANGLEPerfTest.h"
>+#include "libANGLE/Error.h"
>+
>+volatile int gThing = 0;
>+
>+namespace
>+{
>+constexpr int kIterationsPerStep = 1000;
>+
>+class ResultPerfTest : public ANGLEPerfTest
>+{
>+  public:
>+    ResultPerfTest();
>+    void step() override;
>+};
>+
>+ResultPerfTest::ResultPerfTest() : ANGLEPerfTest("ResultPerf", "_run", kIterationsPerStep) {}
>+
>+ANGLE_NOINLINE angle::Result ExternalCall()
>+{
>+    if (gThing != 0)
>+    {
>+        printf("Something very slow");
>+        return angle::Result::Stop;
>+    }
>+    else
>+    {
>+        return angle::Result::Continue;
>+    }
>+}
>+
>+angle::Result CallReturningResult(int depth)
>+{
>+    ANGLE_TRY(ExternalCall());
>+    ANGLE_TRY(ExternalCall());
>+    ANGLE_TRY(ExternalCall());
>+    ANGLE_TRY(ExternalCall());
>+    ANGLE_TRY(ExternalCall());
>+    ANGLE_TRY(ExternalCall());
>+    ANGLE_TRY(ExternalCall());
>+    ANGLE_TRY(ExternalCall());
>+    ANGLE_TRY(ExternalCall());
>+    return ExternalCall();
>+}
>+
>+void ResultPerfTest::step()
>+{
>+    for (int i = 0; i < kIterationsPerStep; i++)
>+    {
>+        (void)CallReturningResult(0);
>+        (void)CallReturningResult(0);
>+        (void)CallReturningResult(0);
>+        (void)CallReturningResult(0);
>+        (void)CallReturningResult(0);
>+    }
>+}
>+
>+TEST_F(ResultPerfTest, Run)
>+{
>+    run();
>+}
>+}  // anonymous namespace
>diff --git a/Source/ThirdParty/ANGLE/src/tests/perf_tests/TexSubImage.cpp b/Source/ThirdParty/ANGLE/src/tests/perf_tests/TexSubImage.cpp
>deleted file mode 100644
>index 8ebcc80dad9..00000000000
>--- a/Source/ThirdParty/ANGLE/src/tests/perf_tests/TexSubImage.cpp
>+++ /dev/null
>@@ -1,291 +0,0 @@
>-//
>-// Copyright (c) 2014 The ANGLE Project Authors. All rights reserved.
>-// Use of this source code is governed by a BSD-style license that can be
>-// found in the LICENSE file.
>-//
>-// TexSubImageBenchmark:
>-//   Performace test for ANGLE texture updates.
>-//
>-
>-#include <sstream>
>-
>-#include "ANGLEPerfTest.h"
>-#include "shader_utils.h"
>-
>-using namespace angle;
>-
>-namespace
>-{
>-
>-struct TexSubImageParams final : public RenderTestParams
>-{
>-    TexSubImageParams()
>-    {
>-        // Common default parameters
>-        majorVersion = 2;
>-        minorVersion = 0;
>-        windowWidth  = 512;
>-        windowHeight = 512;
>-
>-        imageWidth     = 1024;
>-        imageHeight    = 1024;
>-        subImageWidth  = 64;
>-        subImageHeight = 64;
>-        iterations     = 9;
>-    }
>-
>-    std::string suffix() const override;
>-
>-    // Static parameters
>-    int imageWidth;
>-    int imageHeight;
>-    int subImageWidth;
>-    int subImageHeight;
>-    unsigned int iterations;
>-};
>-
>-std::ostream &operator<<(std::ostream &os, const TexSubImageParams &params)
>-{
>-    os << params.suffix().substr(1);
>-    return os;
>-}
>-
>-class TexSubImageBenchmark : public ANGLERenderTest,
>-                             public ::testing::WithParamInterface<TexSubImageParams>
>-{
>-  public:
>-    TexSubImageBenchmark();
>-
>-    void initializeBenchmark() override;
>-    void destroyBenchmark() override;
>-    void drawBenchmark() override;
>-
>-  private:
>-    GLuint createTexture();
>-
>-    // Handle to a program object
>-    GLuint mProgram;
>-
>-    // Attribute locations
>-    GLint mPositionLoc;
>-    GLint mTexCoordLoc;
>-
>-    // Sampler location
>-    GLint mSamplerLoc;
>-
>-    // Texture handle
>-    GLuint mTexture;
>-
>-    // Buffer handle
>-    GLuint mVertexBuffer;
>-    GLuint mIndexBuffer;
>-
>-    GLubyte *mPixels;
>-};
>-
>-std::string TexSubImageParams::suffix() const
>-{
>-    // TODO(jmadill)
>-    return RenderTestParams::suffix();
>-}
>-
>-TexSubImageBenchmark::TexSubImageBenchmark()
>-    : ANGLERenderTest("TexSubImage", GetParam(), {"GL_EXT_texture_storage"}),
>-      mProgram(0),
>-      mPositionLoc(-1),
>-      mTexCoordLoc(-1),
>-      mSamplerLoc(-1),
>-      mTexture(0),
>-      mVertexBuffer(0),
>-      mIndexBuffer(0),
>-      mPixels(nullptr)
>-{
>-}
>-
>-GLuint TexSubImageBenchmark::createTexture()
>-{
>-    const auto &params = GetParam();
>-
>-    assert(params.iterations > 0);
>-
>-    // Use tightly packed data
>-    glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
>-
>-    // Generate a texture object
>-    GLuint texture;
>-    glGenTextures(1, &texture);
>-
>-    // Bind the texture object
>-    glBindTexture(GL_TEXTURE_2D, texture);
>-
>-    glTexStorage2DEXT(GL_TEXTURE_2D, 1, GL_RGBA8, params.imageWidth, params.imageHeight);
>-
>-    // Set the filtering mode
>-    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
>-    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
>-
>-    return texture;
>-}
>-
>-void TexSubImageBenchmark::initializeBenchmark()
>-{
>-    const auto &params = GetParam();
>-
>-    const std::string vs =
>-        R"(attribute vec4 a_position;
>-        attribute vec2 a_texCoord;
>-        varying vec2 v_texCoord;
>-        void main()
>-        {
>-            gl_Position = a_position;
>-            v_texCoord  = a_texCoord;
>-        })";
>-
>-    const std::string fs =
>-        R"(precision mediump float;
>-        varying vec2 v_texCoord;
>-        uniform sampler2D s_texture;
>-        void main()
>-        {
>-            gl_FragColor = texture2D(s_texture, v_texCoord);
>-        })";
>-
>-    mProgram = CompileProgram(vs, fs);
>-    ASSERT_NE(0u, mProgram);
>-
>-    // Get the attribute locations
>-    mPositionLoc = glGetAttribLocation(mProgram, "a_position");
>-    mTexCoordLoc = glGetAttribLocation(mProgram, "a_texCoord");
>-
>-    // Get the sampler location
>-    mSamplerLoc = glGetUniformLocation(mProgram, "s_texture");
>-
>-    // Build the vertex buffer
>-    GLfloat vertices[] = {
>-        -0.5f, 0.5f,  0.0f,  // Position 0
>-        0.0f,  0.0f,         // TexCoord 0
>-        -0.5f, -0.5f, 0.0f,  // Position 1
>-        0.0f,  1.0f,         // TexCoord 1
>-        0.5f,  -0.5f, 0.0f,  // Position 2
>-        1.0f,  1.0f,         // TexCoord 2
>-        0.5f,  0.5f,  0.0f,  // Position 3
>-        1.0f,  0.0f          // TexCoord 3
>-    };
>-
>-    glGenBuffers(1, &mVertexBuffer);
>-    glBindBuffer(GL_ARRAY_BUFFER, mVertexBuffer);
>-    glBufferData(GL_ARRAY_BUFFER, sizeof(vertices), vertices, GL_STATIC_DRAW);
>-
>-    GLushort indices[] = {0, 1, 2, 0, 2, 3};
>-    glGenBuffers(1, &mIndexBuffer);
>-    glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, mIndexBuffer);
>-    glBufferData(GL_ELEMENT_ARRAY_BUFFER, sizeof(indices), indices, GL_STATIC_DRAW);
>-
>-    // Load the texture
>-    mTexture = createTexture();
>-
>-    glClearColor(0.0f, 0.0f, 0.0f, 0.0f);
>-
>-    mPixels = new GLubyte[params.subImageWidth * params.subImageHeight * 4];
>-
>-    // Fill the pixels structure with random data:
>-    for (int y = 0; y < params.subImageHeight; ++y)
>-    {
>-        for (int x = 0; x < params.subImageWidth; ++x)
>-        {
>-            int offset          = (x + (y * params.subImageWidth)) * 4;
>-            mPixels[offset + 0] = rand() % 255;  // Red
>-            mPixels[offset + 1] = rand() % 255;  // Green
>-            mPixels[offset + 2] = rand() % 255;  // Blue
>-            mPixels[offset + 3] = 255;           // Alpha
>-        }
>-    }
>-
>-    ASSERT_GL_NO_ERROR();
>-}
>-
>-void TexSubImageBenchmark::destroyBenchmark()
>-{
>-    glDeleteProgram(mProgram);
>-    glDeleteBuffers(1, &mVertexBuffer);
>-    glDeleteBuffers(1, &mIndexBuffer);
>-    glDeleteTextures(1, &mTexture);
>-    delete[] mPixels;
>-}
>-
>-void TexSubImageBenchmark::drawBenchmark()
>-{
>-    // Set the viewport
>-    glViewport(0, 0, getWindow()->getWidth(), getWindow()->getHeight());
>-
>-    // Clear the color buffer
>-    glClear(GL_COLOR_BUFFER_BIT);
>-
>-    // Use the program object
>-    glUseProgram(mProgram);
>-
>-    // Bind the buffers
>-    glBindBuffer(GL_ARRAY_BUFFER, mVertexBuffer);
>-    glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, mIndexBuffer);
>-
>-    // Load the vertex position
>-    glVertexAttribPointer(mPositionLoc, 3, GL_FLOAT, GL_FALSE, 5 * sizeof(GLfloat), 0);
>-    // Load the texture coordinate
>-    glVertexAttribPointer(mTexCoordLoc, 2, GL_FLOAT, GL_FALSE, 5 * sizeof(GLfloat),
>-                          reinterpret_cast<void *>(3 * sizeof(GLfloat)));
>-
>-    glEnableVertexAttribArray(mPositionLoc);
>-    glEnableVertexAttribArray(mTexCoordLoc);
>-
>-    // Bind the texture
>-    glActiveTexture(GL_TEXTURE0);
>-    glBindTexture(GL_TEXTURE_2D, mTexture);
>-
>-    // Set the texture sampler to texture unit to 0
>-    glUniform1i(mSamplerLoc, 0);
>-
>-    ASSERT_GL_NO_ERROR();
>-
>-    const auto &params = GetParam();
>-
>-    for (unsigned int iteration = 0; iteration < params.iterations; ++iteration)
>-    {
>-        glTexSubImage2D(GL_TEXTURE_2D, 0, rand() % (params.imageWidth - params.subImageWidth),
>-                        rand() % (params.imageHeight - params.subImageHeight), params.subImageWidth,
>-                        params.subImageHeight, GL_RGBA, GL_UNSIGNED_BYTE, mPixels);
>-
>-        glDrawElements(GL_TRIANGLES, 6, GL_UNSIGNED_SHORT, 0);
>-    }
>-
>-    ASSERT_GL_NO_ERROR();
>-}
>-
>-TexSubImageParams D3D11Params()
>-{
>-    TexSubImageParams params;
>-    params.eglParameters = egl_platform::D3D11();
>-    return params;
>-}
>-
>-TexSubImageParams D3D9Params()
>-{
>-    TexSubImageParams params;
>-    params.eglParameters = egl_platform::D3D9();
>-    return params;
>-}
>-
>-TexSubImageParams OpenGLOrGLESParams()
>-{
>-    TexSubImageParams params;
>-    params.eglParameters = egl_platform::OPENGL_OR_GLES(false);
>-    return params;
>-}
>-
>-}  // namespace
>-
>-TEST_P(TexSubImageBenchmark, Run)
>-{
>-    run();
>-}
>-
>-ANGLE_INSTANTIATE_TEST(TexSubImageBenchmark, D3D11Params(), D3D9Params(), OpenGLOrGLESParams());
>diff --git a/Source/ThirdParty/ANGLE/src/tests/perf_tests/TextureSampling.cpp b/Source/ThirdParty/ANGLE/src/tests/perf_tests/TextureSampling.cpp
>index af0cbd55853..65d92666989 100644
>--- a/Source/ThirdParty/ANGLE/src/tests/perf_tests/TextureSampling.cpp
>+++ b/Source/ThirdParty/ANGLE/src/tests/perf_tests/TextureSampling.cpp
>@@ -16,23 +16,25 @@
> #include <random>
> #include <sstream>
> 
>-#include "shader_utils.h"
>+#include "util/shader_utils.h"
> 
> using namespace angle;
> 
> namespace
> {
>+constexpr unsigned int kIterationsPerStep = 4;
> 
> struct TextureSamplingParams final : public RenderTestParams
> {
>     TextureSamplingParams()
>     {
>+        iterationsPerStep = kIterationsPerStep;
>+
>         // Common default params
>         majorVersion = 2;
>         minorVersion = 0;
>         windowWidth  = 720;
>         windowHeight = 720;
>-        iterations   = 4;
> 
>         numSamplers = 2;
>         textureSize = 32;
>@@ -43,9 +45,6 @@ struct TextureSamplingParams final : public RenderTestParams
>     unsigned int numSamplers;
>     unsigned int textureSize;
>     unsigned int kernelSize;
>-
>-    // static parameters
>-    unsigned int iterations;
> };
> 
> std::ostream &operator<<(std::ostream &os, const TextureSamplingParams &params)
>@@ -85,15 +84,12 @@ class TextureSamplingBenchmark : public ANGLERenderTest,
> 
> TextureSamplingBenchmark::TextureSamplingBenchmark()
>     : ANGLERenderTest("TextureSampling", GetParam()), mProgram(0u), mBuffer(0u)
>-{
>-}
>+{}
> 
> void TextureSamplingBenchmark::initializeBenchmark()
> {
>     const auto &params = GetParam();
> 
>-    ASSERT_LT(0u, params.iterations);
>-
>     // Verify "numSamplers" is within MAX_TEXTURE_IMAGE_UNITS limit
>     GLint maxTextureImageUnits;
>     glGetIntegerv(GL_MAX_TEXTURE_IMAGE_UNITS, &maxTextureImageUnits);
>@@ -135,23 +131,28 @@ void TextureSamplingBenchmark::initShaders()
>     fstrstr << "void main()\n"
>                "{\n"
>                "    const float inverseTextureSize = 1.0 / "
>-            << params.textureSize << ".0;\n"
>-                                     "    vec4 colorOut = vec4(0.0, 0.0, 0.0, 1.0);\n";
>+            << params.textureSize
>+            << ".0;\n"
>+               "    vec4 colorOut = vec4(0.0, 0.0, 0.0, 1.0);\n";
>     for (unsigned int count = 0; count < params.numSamplers; count++)
>     {
>-        fstrstr << "    for (int x = 0; x < " << params.kernelSize << "; ++x)\n"
>+        fstrstr << "    for (int x = 0; x < " << params.kernelSize
>+                << "; ++x)\n"
>                    "    {\n"
>-                   "        for (int y = 0; y < " << params.kernelSize << "; ++y)\n"
>+                   "        for (int y = 0; y < "
>+                << params.kernelSize
>+                << "; ++y)\n"
>                    "        {\n"
>-                   "            colorOut += texture2D(uSampler" << count
>-                   << ", vTextureCoordinates + vec2(x, y) * inverseTextureSize) * 0.1;\n"
>+                   "            colorOut += texture2D(uSampler"
>+                << count
>+                << ", vTextureCoordinates + vec2(x, y) * inverseTextureSize) * 0.1;\n"
>                    "        }\n"
>                    "    }\n";
>     }
>     fstrstr << "    gl_FragColor = colorOut;\n"
>                "}\n";
> 
>-    mProgram = CompileProgram(vstrstr.str(), fstrstr.str());
>+    mProgram = CompileProgram(vstrstr.str().c_str(), fstrstr.str().c_str());
>     ASSERT_NE(0u, mProgram);
> 
>     // Use the program object
>@@ -249,7 +250,7 @@ void TextureSamplingBenchmark::drawBenchmark()
> 
>     const auto &params = GetParam();
> 
>-    for (unsigned int it = 0; it < params.iterations; ++it)
>+    for (unsigned int it = 0; it < params.iterationsPerStep; ++it)
>     {
>         glDrawArrays(GL_TRIANGLES, 0, 6);
>     }
>@@ -278,6 +279,13 @@ TextureSamplingParams OpenGLOrGLESParams()
>     return params;
> }
> 
>+TextureSamplingParams VulkanParams()
>+{
>+    TextureSamplingParams params;
>+    params.eglParameters = egl_platform::VULKAN();
>+    return params;
>+}
>+
> }  // anonymous namespace
> 
> TEST_P(TextureSamplingBenchmark, Run)
>@@ -285,4 +293,8 @@ TEST_P(TextureSamplingBenchmark, Run)
>     run();
> }
> 
>-ANGLE_INSTANTIATE_TEST(TextureSamplingBenchmark, D3D11Params(), D3D9Params(), OpenGLOrGLESParams());
>+ANGLE_INSTANTIATE_TEST(TextureSamplingBenchmark,
>+                       D3D11Params(),
>+                       D3D9Params(),
>+                       OpenGLOrGLESParams(),
>+                       VulkanParams());
>diff --git a/Source/ThirdParty/ANGLE/src/tests/perf_tests/TextureUploadPerf.cpp b/Source/ThirdParty/ANGLE/src/tests/perf_tests/TextureUploadPerf.cpp
>new file mode 100644
>index 00000000000..93dddb1bc1c
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/tests/perf_tests/TextureUploadPerf.cpp
>@@ -0,0 +1,286 @@
>+//
>+// Copyright 2019 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// TextureUploadBenchmark:
>+//   Performance test for uploading texture data.
>+//
>+
>+#include "ANGLEPerfTest.h"
>+
>+#include <iostream>
>+#include <random>
>+#include <sstream>
>+
>+#include "test_utils/gl_raii.h"
>+#include "util/shader_utils.h"
>+
>+using namespace angle;
>+
>+namespace
>+{
>+constexpr unsigned int kIterationsPerStep = 64;
>+
>+struct TextureUploadParams final : public RenderTestParams
>+{
>+    TextureUploadParams()
>+    {
>+        iterationsPerStep = kIterationsPerStep;
>+        trackGpuTime      = true;
>+
>+        baseSize     = 1024;
>+        subImageSize = 64;
>+
>+        webgl = false;
>+    }
>+
>+    std::string suffix() const override;
>+
>+    GLsizei baseSize;
>+    GLsizei subImageSize;
>+
>+    bool webgl;
>+};
>+
>+std::ostream &operator<<(std::ostream &os, const TextureUploadParams &params)
>+{
>+    os << params.suffix().substr(1);
>+    return os;
>+}
>+
>+std::string TextureUploadParams::suffix() const
>+{
>+    std::stringstream strstr;
>+
>+    strstr << RenderTestParams::suffix();
>+
>+    if (webgl)
>+    {
>+        strstr << "_webgl";
>+    }
>+
>+    return strstr.str();
>+}
>+
>+class TextureUploadBenchmarkBase : public ANGLERenderTest,
>+                                   public ::testing::WithParamInterface<TextureUploadParams>
>+{
>+  public:
>+    TextureUploadBenchmarkBase(const char *benchmarkName);
>+
>+    void initializeBenchmark() override;
>+    void destroyBenchmark() override;
>+
>+  protected:
>+    void initShaders();
>+
>+    GLuint mProgram;
>+    GLuint mPositionLoc;
>+    GLuint mSamplerLoc;
>+};
>+
>+class TextureUploadSubImageBenchmark : public TextureUploadBenchmarkBase
>+{
>+  public:
>+    TextureUploadSubImageBenchmark() : TextureUploadBenchmarkBase("TexSubImage")
>+    {
>+        addExtensionPrerequisite("GL_EXT_texture_storage");
>+    }
>+
>+    void drawBenchmark() override;
>+};
>+
>+class TextureUploadFullMipBenchmark : public TextureUploadBenchmarkBase
>+{
>+  public:
>+    TextureUploadFullMipBenchmark() : TextureUploadBenchmarkBase("TextureUpload") {}
>+
>+    void drawBenchmark() override;
>+};
>+
>+TextureUploadBenchmarkBase::TextureUploadBenchmarkBase(const char *benchmarkName)
>+    : ANGLERenderTest(benchmarkName, GetParam()), mProgram(0u), mPositionLoc(-1), mSamplerLoc(-1)
>+{
>+    setWebGLCompatibilityEnabled(GetParam().webgl);
>+    setRobustResourceInit(GetParam().webgl);
>+
>+    // Crashes on nvidia+d3d11. http://crbug.com/945415
>+    if (GetParam().getRenderer() == EGL_PLATFORM_ANGLE_TYPE_D3D11_ANGLE)
>+    {
>+        mSkipTest = true;
>+    }
>+}
>+
>+void TextureUploadBenchmarkBase::initializeBenchmark()
>+{
>+    const auto &params = GetParam();
>+
>+    initShaders();
>+    glClearColor(0.0f, 0.0f, 0.0f, 0.0f);
>+    glViewport(0, 0, getWindow()->getWidth(), getWindow()->getHeight());
>+
>+    if (params.webgl)
>+    {
>+        glRequestExtensionANGLE("GL_EXT_disjoint_timer_query");
>+    }
>+
>+    ASSERT_GL_NO_ERROR();
>+}
>+
>+void TextureUploadBenchmarkBase::initShaders()
>+{
>+    constexpr char kVS[] = R"(attribute vec4 a_position;
>+void main()
>+{
>+    gl_Position = a_position;
>+})";
>+
>+    constexpr char kFS[] = R"(precision mediump float;
>+uniform sampler2D s_texture;
>+void main()
>+{
>+    gl_FragColor = texture2D(s_texture, vec2(0, 0));
>+})";
>+
>+    mProgram = CompileProgram(kVS, kFS);
>+    ASSERT_NE(0u, mProgram);
>+
>+    mPositionLoc = glGetAttribLocation(mProgram, "a_position");
>+    mSamplerLoc  = glGetUniformLocation(mProgram, "s_texture");
>+    glUseProgram(mProgram);
>+
>+    glDisable(GL_DEPTH_TEST);
>+
>+    ASSERT_GL_NO_ERROR();
>+}
>+
>+void TextureUploadBenchmarkBase::destroyBenchmark()
>+{
>+    glDeleteProgram(mProgram);
>+}
>+
>+void TextureUploadSubImageBenchmark::drawBenchmark()
>+{
>+    const auto &params = GetParam();
>+
>+    std::vector<float> textureData(params.subImageSize * params.subImageSize * 4, 0.5);
>+
>+    GLTexture tex;
>+
>+    glActiveTexture(GL_TEXTURE0);
>+    glBindTexture(GL_TEXTURE_2D, tex);
>+    glTexStorage2DEXT(GL_TEXTURE_2D, 1, GL_RGBA8, params.baseSize, params.baseSize);
>+
>+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
>+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
>+
>+    glUniform1i(mSamplerLoc, 0);
>+
>+    ASSERT_GL_NO_ERROR();
>+
>+    startGpuTimer();
>+    for (unsigned int iteration = 0; iteration < params.iterationsPerStep; ++iteration)
>+    {
>+        glTexSubImage2D(GL_TEXTURE_2D, 0, rand() % (params.baseSize - params.subImageSize),
>+                        rand() % (params.baseSize - params.subImageSize), params.subImageSize,
>+                        params.subImageSize, GL_RGBA, GL_UNSIGNED_BYTE, textureData.data());
>+
>+        // Perform a draw just so the texture data is flushed.  With the position attributes not
>+        // set, a constant default value is used, resulting in a very cheap draw.
>+        glDrawArrays(GL_TRIANGLES, 0, 3);
>+    }
>+    stopGpuTimer();
>+
>+    ASSERT_GL_NO_ERROR();
>+}
>+
>+void TextureUploadFullMipBenchmark::drawBenchmark()
>+{
>+    const auto &params = GetParam();
>+
>+    std::vector<float> textureData(params.baseSize * params.baseSize * 4, 0.5);
>+
>+    startGpuTimer();
>+    for (size_t it = 0; it < params.iterationsPerStep; ++it)
>+    {
>+        GLTexture tex;
>+
>+        glActiveTexture(GL_TEXTURE0);
>+        glBindTexture(GL_TEXTURE_2D, tex);
>+
>+        // Stage data for all mips
>+        GLint mip = 0;
>+        for (GLsizei levelSize = params.baseSize; levelSize > 0; levelSize >>= 1)
>+        {
>+            glTexImage2D(GL_TEXTURE_2D, mip++, GL_RGBA, levelSize, levelSize, 0, GL_RGBA,
>+                         GL_UNSIGNED_BYTE, textureData.data());
>+        }
>+
>+        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR);
>+        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
>+        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
>+        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
>+
>+        glUniform1i(mSamplerLoc, 0);
>+
>+        // Perform a draw just so the texture data is flushed.  With the position attributes not
>+        // set, a constant default value is used, resulting in a very cheap draw.
>+        glDrawArrays(GL_TRIANGLES, 0, 3);
>+    }
>+    stopGpuTimer();
>+
>+    ASSERT_GL_NO_ERROR();
>+}
>+
>+TextureUploadParams D3D11Params(bool webglCompat)
>+{
>+    TextureUploadParams params;
>+    params.eglParameters = egl_platform::D3D11();
>+    params.webgl         = webglCompat;
>+    return params;
>+}
>+
>+TextureUploadParams OpenGLOrGLESParams(bool webglCompat)
>+{
>+    TextureUploadParams params;
>+    params.eglParameters = egl_platform::OPENGL_OR_GLES(false);
>+    params.webgl         = webglCompat;
>+    return params;
>+}
>+
>+TextureUploadParams VulkanParams(bool webglCompat)
>+{
>+    TextureUploadParams params;
>+    params.eglParameters = egl_platform::VULKAN();
>+    params.webgl         = webglCompat;
>+    return params;
>+}
>+
>+}  // anonymous namespace
>+
>+TEST_P(TextureUploadSubImageBenchmark, Run)
>+{
>+    run();
>+}
>+
>+TEST_P(TextureUploadFullMipBenchmark, Run)
>+{
>+    run();
>+}
>+
>+ANGLE_INSTANTIATE_TEST(TextureUploadSubImageBenchmark,
>+                       D3D11Params(false),
>+                       D3D11Params(true),
>+                       OpenGLOrGLESParams(false),
>+                       OpenGLOrGLESParams(true),
>+                       VulkanParams(false),
>+                       VulkanParams(true));
>+
>+ANGLE_INSTANTIATE_TEST(TextureUploadFullMipBenchmark,
>+                       D3D11Params(false),
>+                       D3D11Params(true),
>+                       OpenGLOrGLESParams(false),
>+                       OpenGLOrGLESParams(true),
>+                       VulkanParams(false),
>+                       VulkanParams(true));
>diff --git a/Source/ThirdParty/ANGLE/src/tests/perf_tests/TexturesPerf.cpp b/Source/ThirdParty/ANGLE/src/tests/perf_tests/TexturesPerf.cpp
>index a0df45f8fcc..ca8b21fc3da 100644
>--- a/Source/ThirdParty/ANGLE/src/tests/perf_tests/TexturesPerf.cpp
>+++ b/Source/ThirdParty/ANGLE/src/tests/perf_tests/TexturesPerf.cpp
>@@ -13,21 +13,23 @@
> #include <random>
> #include <sstream>
> 
>-#include "shader_utils.h"
>+#include "util/shader_utils.h"
> 
> namespace angle
> {
>+constexpr unsigned int kIterationsPerStep = 256;
> 
> struct TexturesParams final : public RenderTestParams
> {
>     TexturesParams()
>     {
>+        iterationsPerStep = kIterationsPerStep;
>+
>         // Common default params
>         majorVersion = 2;
>         minorVersion = 0;
>         windowWidth  = 720;
>         windowHeight = 720;
>-        iterations   = 256;
> 
>         numTextures                 = 8;
>         textureRebindFrequency      = 5;
>@@ -44,9 +46,6 @@ struct TexturesParams final : public RenderTestParams
>     size_t textureMipCount;
> 
>     bool webgl;
>-
>-    // static parameters
>-    size_t iterations;
> };
> 
> std::ostream &operator<<(std::ostream &os, const TexturesParams &params)
>@@ -103,8 +102,6 @@ void TexturesBenchmark::initializeBenchmark()
> {
>     const auto &params = GetParam();
> 
>-    ASSERT_GT(params.iterations, 0u);
>-
>     // Verify the uniform counts are within the limits
>     GLint maxTextureUnits;
>     glGetIntegerv(GL_MAX_TEXTURE_IMAGE_UNITS, &maxTextureUnits);
>@@ -154,7 +151,7 @@ void TexturesBenchmark::initShaders()
>     fstrstr << ";\n"
>                "}\n";
> 
>-    mProgram = CompileProgram(vs, fstrstr.str());
>+    mProgram = CompileProgram(vs.c_str(), fstrstr.str().c_str());
>     ASSERT_NE(0u, mProgram);
> 
>     for (size_t i = 0; i < params.numTextures; ++i)
>@@ -210,7 +207,7 @@ void TexturesBenchmark::drawBenchmark()
> {
>     const auto &params = GetParam();
> 
>-    for (size_t it = 0; it < params.iterations; ++it)
>+    for (size_t it = 0; it < params.iterationsPerStep; ++it)
>     {
>         if (it % params.textureRebindFrequency == 0)
>         {
>@@ -252,13 +249,16 @@ void TexturesBenchmark::drawBenchmark()
>                                 minFilters[stateUpdateCount % ArraySize(minFilters)]);
> 
>                 const GLenum magFilters[] = {
>-                    GL_NEAREST, GL_LINEAR,
>+                    GL_NEAREST,
>+                    GL_LINEAR,
>                 };
>                 glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER,
>                                 magFilters[stateUpdateCount % ArraySize(magFilters)]);
> 
>                 const GLenum wrapParameters[] = {
>-                    GL_CLAMP_TO_EDGE, GL_REPEAT, GL_MIRRORED_REPEAT,
>+                    GL_CLAMP_TO_EDGE,
>+                    GL_REPEAT,
>+                    GL_MIRRORED_REPEAT,
>                 };
>                 glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S,
>                                 wrapParameters[stateUpdateCount % ArraySize(wrapParameters)]);
>@@ -308,5 +308,4 @@ ANGLE_INSTANTIATE_TEST(TexturesBenchmark,
>                        D3D9Params(true),
>                        OpenGLOrGLESParams(false),
>                        OpenGLOrGLESParams(true));
>-
> }  // namespace angle
>diff --git a/Source/ThirdParty/ANGLE/src/tests/perf_tests/UniformsPerf.cpp b/Source/ThirdParty/ANGLE/src/tests/perf_tests/UniformsPerf.cpp
>index a6b6d5bd1d2..9be03196842 100644
>--- a/Source/ThirdParty/ANGLE/src/tests/perf_tests/UniformsPerf.cpp
>+++ b/Source/ThirdParty/ANGLE/src/tests/perf_tests/UniformsPerf.cpp
>@@ -14,13 +14,14 @@
> #include <random>
> #include <sstream>
> 
>-#include "Matrix.h"
>-#include "shader_utils.h"
>+#include "util/Matrix.h"
>+#include "util/shader_utils.h"
> 
> using namespace angle;
> 
> namespace
> {
>+constexpr unsigned int kIterationsPerStep = 4;
> 
> // Controls when we call glUniform, if the data is the same as last frame.
> enum DataMode
>@@ -48,6 +49,8 @@ struct UniformsParams final : public RenderTestParams
> {
>     UniformsParams()
>     {
>+        iterationsPerStep = kIterationsPerStep;
>+
>         // Common default params
>         majorVersion = 2;
>         minorVersion = 0;
>@@ -59,12 +62,9 @@ struct UniformsParams final : public RenderTestParams
>     size_t numVertexUniforms   = 200;
>     size_t numFragmentUniforms = 200;
> 
>-    DataType dataType = DataType::VEC4;
>-    DataMode dataMode = DataMode::REPEAT;
>+    DataType dataType       = DataType::VEC4;
>+    DataMode dataMode       = DataMode::REPEAT;
>     ProgramMode programMode = ProgramMode::SINGLE;
>-
>-    // static parameters
>-    size_t iterations = 4;
> };
> 
> std::ostream &operator<<(std::ostream &os, const UniformsParams &params)
>@@ -90,7 +90,6 @@ std::string UniformsParams::suffix() const
>     }
>     else
>     {
>-        ASSERT(dataType == DataType::MAT4);
>         strstr << "_matrix";
>     }
> 
>@@ -152,16 +151,12 @@ std::vector<Matrix4> GenMatrixData(size_t count, int parity)
>     return data;
> }
> 
>-UniformsBenchmark::UniformsBenchmark() : ANGLERenderTest("Uniforms", GetParam()), mPrograms({})
>-{
>-}
>+UniformsBenchmark::UniformsBenchmark() : ANGLERenderTest("Uniforms", GetParam()), mPrograms({}) {}
> 
> void UniformsBenchmark::initializeBenchmark()
> {
>     const auto &params = GetParam();
> 
>-    ASSERT_GT(params.iterations, 0u);
>-
>     // Verify the uniform counts are within the limits
>     GLint maxVertexUniformVectors, maxFragmentUniformVectors;
>     glGetIntegerv(GL_MAX_VERTEX_UNIFORM_VECTORS, &maxVertexUniformVectors);
>@@ -283,9 +278,9 @@ void UniformsBenchmark::initShaders()
>     }
>     fstrstr << "}";
> 
>-    mPrograms[0] = CompileProgram(vstrstr.str(), fstrstr.str());
>+    mPrograms[0] = CompileProgram(vstrstr.str().c_str(), fstrstr.str().c_str());
>     ASSERT_NE(0u, mPrograms[0]);
>-    mPrograms[1] = CompileProgram(vstrstr.str(), fstrstr.str());
>+    mPrograms[1] = CompileProgram(vstrstr.str().c_str(), fstrstr.str().c_str());
>     ASSERT_NE(0u, mPrograms[1]);
> 
>     for (size_t i = 0; i < params.numVertexUniforms; ++i)
>@@ -323,7 +318,7 @@ void UniformsBenchmark::drawLoop(const SetUniformFunc &setUniformsFunc)
> 
>     size_t frameIndex = 0;
> 
>-    for (size_t it = 0; it < params.iterations; ++it, frameIndex = (frameIndex == 0 ? 1 : 0))
>+    for (size_t it = 0; it < params.iterationsPerStep; ++it, frameIndex = (frameIndex == 0 ? 1 : 0))
>     {
>         if (MultiProgram)
>         {
>@@ -396,8 +391,8 @@ UniformsParams MatrixUniforms(const EGLPlatformParameters &egl, DataMode dataMod
>     params.dataMode      = dataMode;
> 
>     // Reduce the number of uniforms to fit within smaller upper limits on some configs.
>-    params.numVertexUniforms   = 64;
>-    params.numFragmentUniforms = 64;
>+    params.numVertexUniforms   = 55;
>+    params.numFragmentUniforms = 55;
> 
>     return params;
> }
>diff --git a/Source/ThirdParty/ANGLE/src/tests/perf_tests/VulkanBarriersPerf.cpp b/Source/ThirdParty/ANGLE/src/tests/perf_tests/VulkanBarriersPerf.cpp
>new file mode 100644
>index 00000000000..8067e65b1ad
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/tests/perf_tests/VulkanBarriersPerf.cpp
>@@ -0,0 +1,360 @@
>+//
>+// Copyright 2019 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// VulkanBarriersPerf:
>+//   Performance tests for ANGLE's Vulkan backend w.r.t barrier efficiency.
>+//
>+
>+#include <sstream>
>+
>+#include "ANGLEPerfTest.h"
>+#include "test_utils/gl_raii.h"
>+#include "util/shader_utils.h"
>+
>+using namespace angle;
>+
>+namespace
>+{
>+constexpr unsigned int kIterationsPerStep = 10;
>+
>+struct VulkanBarriersPerfParams final : public RenderTestParams
>+{
>+    VulkanBarriersPerfParams(bool largeTransfers, bool slowFS)
>+    {
>+        iterationsPerStep = kIterationsPerStep;
>+
>+        // Common default parameters
>+        eglParameters = egl_platform::VULKAN();
>+        majorVersion  = 2;
>+        minorVersion  = 0;
>+        windowWidth   = 256;
>+        windowHeight  = 256;
>+        trackGpuTime  = true;
>+
>+        doLargeTransfers      = largeTransfers;
>+        doSlowFragmentShaders = slowFS;
>+    }
>+
>+    std::string suffix() const override;
>+
>+    // Static parameters
>+    static constexpr int kImageSizes[3] = {256, 512, 4096};
>+
>+    bool doLargeTransfers;
>+    bool doSlowFragmentShaders;
>+};
>+
>+constexpr int VulkanBarriersPerfParams::kImageSizes[];
>+
>+std::ostream &operator<<(std::ostream &os, const VulkanBarriersPerfParams &params)
>+{
>+    os << params.suffix().substr(1);
>+    return os;
>+}
>+
>+class VulkanBarriersPerfBenchmark : public ANGLERenderTest,
>+                                    public ::testing::WithParamInterface<VulkanBarriersPerfParams>
>+{
>+  public:
>+    VulkanBarriersPerfBenchmark();
>+
>+    void initializeBenchmark() override;
>+    void destroyBenchmark() override;
>+    void drawBenchmark() override;
>+
>+  private:
>+    void createTexture(uint32_t textureIndex, uint32_t sizeIndex, bool compressed);
>+    void createFramebuffer(uint32_t fboIndex, uint32_t textureIndex, uint32_t sizeIndex);
>+    void createResources();
>+
>+    // Handle to the program object
>+    GLProgram mProgram;
>+
>+    // Attribute locations
>+    GLint mPositionLoc;
>+    GLint mTexCoordLoc;
>+
>+    // Sampler location
>+    GLint mSamplerLoc;
>+
>+    // Texture handles
>+    GLTexture mTextures[4];
>+
>+    // Framebuffer handles
>+    GLFramebuffer mFbos[2];
>+
>+    // Buffer handle
>+    GLBuffer mVertexBuffer;
>+    GLBuffer mIndexBuffer;
>+
>+    static constexpr size_t kSmallFboIndex = 0;
>+    static constexpr size_t kLargeFboIndex = 1;
>+
>+    static constexpr size_t kSmallTextureIndex     = 0;
>+    static constexpr size_t kLargeTextureIndex     = 1;
>+    static constexpr size_t kTransferTexture1Index = 2;
>+    static constexpr size_t kTransferTexture2Index = 3;
>+
>+    static constexpr size_t kSmallSizeIndex = 0;
>+    static constexpr size_t kLargeSizeIndex = 1;
>+    static constexpr size_t kHugeSizeIndex  = 2;
>+};
>+
>+std::string VulkanBarriersPerfParams::suffix() const
>+{
>+    std::ostringstream sout;
>+
>+    sout << RenderTestParams::suffix();
>+
>+    if (doLargeTransfers)
>+    {
>+        sout << "_transfer";
>+    }
>+    if (doSlowFragmentShaders)
>+    {
>+        sout << "_slowfs";
>+    }
>+
>+    return sout.str();
>+}
>+
>+VulkanBarriersPerfBenchmark::VulkanBarriersPerfBenchmark()
>+    : ANGLERenderTest("VulkanBarriersPerf", GetParam()),
>+      mPositionLoc(-1),
>+      mTexCoordLoc(-1),
>+      mSamplerLoc(-1)
>+{}
>+
>+constexpr char kVS[] = R"(attribute vec4 a_position;
>+attribute vec2 a_texCoord;
>+varying vec2 v_texCoord;
>+void main()
>+{
>+    gl_Position = a_position;
>+    v_texCoord  = a_texCoord;
>+})";
>+
>+constexpr char kShortFS[] = R"(precision mediump float;
>+varying vec2 v_texCoord;
>+uniform sampler2D s_texture;
>+void main()
>+{
>+    gl_FragColor = texture2D(s_texture, v_texCoord);
>+})";
>+
>+constexpr char kSlowFS[] = R"(precision mediump float;
>+varying vec2 v_texCoord;
>+uniform sampler2D s_texture;
>+void main()
>+{
>+    vec4 outColor = vec4(0);
>+    if (v_texCoord.x < 0.2)
>+    {
>+        for (int i = 0; i < 100; ++i)
>+        {
>+            outColor += texture2D(s_texture, v_texCoord);
>+        }
>+    }
>+    gl_FragColor = outColor;
>+})";
>+
>+void VulkanBarriersPerfBenchmark::createTexture(uint32_t textureIndex,
>+                                                uint32_t sizeIndex,
>+                                                bool compressed)
>+{
>+    const auto &params = GetParam();
>+
>+    // TODO(syoussefi): compressed copy using vkCmdCopyImage not yet implemented in the vulkan
>+    // backend. http://anglebug.com/2999
>+
>+    glBindTexture(GL_TEXTURE_2D, mTextures[textureIndex]);
>+    glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, params.kImageSizes[sizeIndex],
>+                 params.kImageSizes[sizeIndex], 0, GL_RGBA, GL_UNSIGNED_BYTE, nullptr);
>+
>+    // Disable mipmapping
>+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
>+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
>+}
>+
>+void VulkanBarriersPerfBenchmark::createFramebuffer(uint32_t fboIndex,
>+                                                    uint32_t textureIndex,
>+                                                    uint32_t sizeIndex)
>+{
>+    createTexture(textureIndex, sizeIndex, false);
>+
>+    glBindFramebuffer(GL_FRAMEBUFFER, mFbos[fboIndex]);
>+    glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D,
>+                           mTextures[textureIndex], 0);
>+}
>+
>+void VulkanBarriersPerfBenchmark::createResources()
>+{
>+    const auto &params = GetParam();
>+
>+    mProgram.makeRaster(kVS, params.doSlowFragmentShaders ? kSlowFS : kShortFS);
>+    ASSERT_TRUE(mProgram.valid());
>+
>+    // Get the attribute locations
>+    mPositionLoc = glGetAttribLocation(mProgram, "a_position");
>+    mTexCoordLoc = glGetAttribLocation(mProgram, "a_texCoord");
>+
>+    // Get the sampler location
>+    mSamplerLoc = glGetUniformLocation(mProgram, "s_texture");
>+
>+    // Build the vertex buffer
>+    GLfloat vertices[] = {
>+        -0.5f, 0.5f,  0.0f,  // Position 0
>+        0.0f,  0.0f,         // TexCoord 0
>+        -0.5f, -0.5f, 0.0f,  // Position 1
>+        0.0f,  1.0f,         // TexCoord 1
>+        0.5f,  -0.5f, 0.0f,  // Position 2
>+        1.0f,  1.0f,         // TexCoord 2
>+        0.5f,  0.5f,  0.0f,  // Position 3
>+        1.0f,  0.0f          // TexCoord 3
>+    };
>+
>+    glBindBuffer(GL_ARRAY_BUFFER, mVertexBuffer);
>+    glBufferData(GL_ARRAY_BUFFER, sizeof(vertices), vertices, GL_STATIC_DRAW);
>+
>+    GLushort indices[] = {0, 1, 2, 0, 2, 3};
>+    glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, mIndexBuffer);
>+    glBufferData(GL_ELEMENT_ARRAY_BUFFER, sizeof(indices), indices, GL_STATIC_DRAW);
>+
>+    // Use tightly packed data
>+    glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
>+
>+    // Create four textures.  Two of them are going to be framebuffers, and two are used for large
>+    // transfers.
>+    createFramebuffer(kSmallFboIndex, kSmallTextureIndex, kSmallSizeIndex);
>+    createFramebuffer(kLargeFboIndex, kLargeTextureIndex, kLargeSizeIndex);
>+
>+    if (params.doLargeTransfers)
>+    {
>+        createTexture(kTransferTexture1Index, kHugeSizeIndex, true);
>+        createTexture(kTransferTexture2Index, kHugeSizeIndex, true);
>+    }
>+}
>+
>+void VulkanBarriersPerfBenchmark::initializeBenchmark()
>+{
>+    createResources();
>+
>+    glClearColor(0.0f, 0.0f, 0.0f, 0.0f);
>+
>+    ASSERT_GL_NO_ERROR();
>+}
>+
>+void VulkanBarriersPerfBenchmark::destroyBenchmark() {}
>+
>+void VulkanBarriersPerfBenchmark::drawBenchmark()
>+{
>+    const auto &params = GetParam();
>+
>+    glUseProgram(mProgram);
>+
>+    // Bind the buffers
>+    glBindBuffer(GL_ARRAY_BUFFER, mVertexBuffer);
>+    glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, mIndexBuffer);
>+
>+    // Load the vertex position
>+    glVertexAttribPointer(mPositionLoc, 3, GL_FLOAT, GL_FALSE, 5 * sizeof(GLfloat), 0);
>+    // Load the texture coordinate
>+    glVertexAttribPointer(mTexCoordLoc, 2, GL_FLOAT, GL_FALSE, 5 * sizeof(GLfloat),
>+                          reinterpret_cast<void *>(3 * sizeof(GLfloat)));
>+
>+    glEnableVertexAttribArray(mPositionLoc);
>+    glEnableVertexAttribArray(mTexCoordLoc);
>+
>+    // Set the texture sampler to texture unit to 0
>+    glUniform1i(mSamplerLoc, 0);
>+
>+    /*
>+     * The perf benchmark does the following:
>+     *
>+     * - Alternately clear and draw from fbo 1 into fbo 2 and back.  This would use the color
>+     * attachment and shader read-only layouts in the fragment shader and color attachment stages.
>+     *
>+     * Once compressed texture copies are supported, alternately transfer large chunks of data from
>+     * texture 1 into texture 2 and back.  This would use the transfer layouts in the transfer
>+     * stage.
>+     *
>+     * Once compute shader support is added, another independent set of operations could be a few
>+     * dispatches.  This would use the general and shader read-only layouts in the compute stage.
>+     *
>+     * The idea is to create independent pipelines of operations that would run in parallel on the
>+     * GPU.  Regressions or inefficiencies in the barrier implementation could result in
>+     * serialization of these jobs, resulting in a hit in performance.
>+     *
>+     * The above operations for example should ideally run on the GPU threads in parallel:
>+     *
>+     * + |---draw---||---draw---||---draw---||---draw---||---draw---|
>+     * + |-----------transfer------------||-----------transfer------------|
>+     * + |-----dispatch------||------dispatch------||------dispatch------|
>+     *
>+     * If barriers are too restrictive, situations like this could happen (draw is blocking
>+     * transfer):
>+     *
>+     * + |---draw---||---draw---||---draw---||---draw---||---draw---|
>+     * +             |-----------transfer------------||-----------transfer------------|
>+     *
>+     * Or like this (transfer is blocking draw):
>+     *
>+     * + |---draw---|                     |---draw---|                     |---draw---|
>+     * + |-----------transfer------------||-----------transfer------------|
>+     *
>+     * Or like this (draw and transfer blocking each other):
>+     *
>+     * + |---draw---|                                 |---draw---|
>+     * +             |-----------transfer------------|            |-----------transfer------------|
>+     *
>+     * The idea of doing slow FS calls is to make the second case above slower (by making the draw
>+     * slower than the transfer):
>+     *
>+     * + |------------------draw------------------|                                 |-...draw...-|
>+     * + |-----------transfer------------|         |-----------transfer------------|
>+     */
>+
>+    startGpuTimer();
>+    for (unsigned int iteration = 0; iteration < params.iterationsPerStep; ++iteration)
>+    {
>+        bool altEven = iteration % 2 == 0;
>+
>+        const int fboDestIndex     = altEven ? kLargeFboIndex : kSmallFboIndex;
>+        const int fboTexSrcIndex   = altEven ? kSmallTextureIndex : kLargeTextureIndex;
>+        const int fboDestSizeIndex = altEven ? kLargeSizeIndex : kSmallSizeIndex;
>+
>+        // Set the viewport
>+        glViewport(0, 0, fboDestSizeIndex, fboDestSizeIndex);
>+
>+        // Clear the color buffer
>+        glClear(GL_COLOR_BUFFER_BIT);
>+
>+        // Bind the framebuffer
>+        glBindFramebuffer(GL_FRAMEBUFFER, mFbos[fboDestIndex]);
>+
>+        // Bind the texture
>+        glActiveTexture(GL_TEXTURE0);
>+        glBindTexture(GL_TEXTURE_2D, mTextures[fboTexSrcIndex]);
>+
>+        ASSERT_GL_NO_ERROR();
>+
>+        glDrawElements(GL_TRIANGLES, 6, GL_UNSIGNED_SHORT, 0);
>+    }
>+    stopGpuTimer();
>+
>+    ASSERT_GL_NO_ERROR();
>+}
>+
>+}  // namespace
>+
>+TEST_P(VulkanBarriersPerfBenchmark, Run)
>+{
>+    run();
>+}
>+
>+ANGLE_INSTANTIATE_TEST(VulkanBarriersPerfBenchmark,
>+                       VulkanBarriersPerfParams(false, false),
>+                       VulkanBarriersPerfParams(true, false),
>+                       VulkanBarriersPerfParams(true, true));
>diff --git a/Source/ThirdParty/ANGLE/src/tests/perf_tests/VulkanCommandBufferPerf.cpp b/Source/ThirdParty/ANGLE/src/tests/perf_tests/VulkanCommandBufferPerf.cpp
>new file mode 100644
>index 00000000000..7fdb721f29d
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/tests/perf_tests/VulkanCommandBufferPerf.cpp
>@@ -0,0 +1,650 @@
>+// Copyright 2018 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// VulkanCommandBufferPerf:
>+//   Performance benchmark for Vulkan Primary/Secondary Command Buffer implementations.
>+//  Can run just these tests by adding "--gtest_filter=VulkanCommandBufferPerfTest*"
>+//   option to angle_white_box_perftests.
>+//  When running on Android, use logcat to view output.
>+
>+#include "ANGLEPerfTest.h"
>+#include "common/platform.h"
>+#include "test_utils/third_party/vulkan_command_buffer_utils.h"
>+
>+#if defined(ANDROID)
>+#    define NUM_CMD_BUFFERS 1000
>+// Android devices tend to be slower so only do 10 frames to avoid timeout
>+#    define NUM_FRAMES 10
>+#else
>+#    define NUM_CMD_BUFFERS 1000
>+#    define NUM_FRAMES 100
>+#endif
>+
>+// These are minimal shaders used to submit trivial draw commands to command
>+//  buffers so that we can create large batches of cmd buffers with consistent
>+//  draw patterns but size/type of cmd buffers can be varied to test cmd buffer
>+//  differences across devices.
>+constexpr char kVertShaderText[] = R"(
>+#version 400
>+#extension GL_ARB_separate_shader_objects : enable
>+#extension GL_ARB_shading_language_420pack : enable
>+layout (std140, binding = 0) uniform bufferVals {
>+    mat4 mvp;
>+} myBufferVals;
>+layout (location = 0) in vec4 pos;
>+layout (location = 1) in vec4 inColor;
>+layout (location = 0) out vec4 outColor;
>+void main() {
>+   outColor = inColor;
>+   gl_Position = myBufferVals.mvp * pos;
>+})";
>+
>+constexpr char kFragShaderText[] = R"(
>+#version 400
>+#extension GL_ARB_separate_shader_objects : enable
>+#extension GL_ARB_shading_language_420pack : enable
>+layout (location = 0) in vec4 color;
>+layout (location = 0) out vec4 outColor;
>+void main() {
>+   outColor = color;
>+})";
>+
>+using CommandBufferImpl = void (*)(sample_info &info,
>+                                   VkClearValue *clear_values,
>+                                   VkFence drawFence,
>+                                   VkSemaphore imageAcquiredSemaphore,
>+                                   int numBuffers);
>+
>+struct CommandBufferTestParams
>+{
>+    CommandBufferImpl CBImplementation;
>+    std::string suffix;
>+    int frames  = NUM_FRAMES;
>+    int buffers = NUM_CMD_BUFFERS;
>+};
>+
>+class VulkanCommandBufferPerfTest : public ANGLEPerfTest,
>+                                    public ::testing::WithParamInterface<CommandBufferTestParams>
>+{
>+  public:
>+    VulkanCommandBufferPerfTest();
>+
>+    void SetUp() override;
>+    void TearDown() override;
>+    void step() override;
>+
>+  private:
>+    VkClearValue mClearValues[2]        = {};
>+    VkSemaphore mImageAcquiredSemaphore = VK_NULL_HANDLE;
>+    VkFence mDrawFence                  = VK_NULL_HANDLE;
>+
>+    VkResult res             = VK_NOT_READY;
>+    const bool mDepthPresent = true;
>+    struct sample_info mInfo = {};
>+    std::string mSampleTitle;
>+    CommandBufferImpl mCBImplementation = nullptr;
>+    int mFrames                         = 0;
>+    int mBuffers                        = 0;
>+};
>+
>+VulkanCommandBufferPerfTest::VulkanCommandBufferPerfTest()
>+    : ANGLEPerfTest("VulkanCommandBufferPerfTest", GetParam().suffix, GetParam().frames)
>+{
>+    mInfo             = {};
>+    mSampleTitle      = "Draw Textured Cube";
>+    mCBImplementation = GetParam().CBImplementation;
>+    mFrames           = GetParam().frames;
>+    mBuffers          = GetParam().buffers;
>+
>+// This test appears to be flaky on multiple platforms.
>+#if !defined(ANGLE_PLATFORM_ANDROID)
>+    // mSkipTest = true;
>+#endif  // !defined(ANGLE_PLATFORM_ANDROID)
>+}
>+
>+void VulkanCommandBufferPerfTest::SetUp()
>+{
>+    if (mSkipTest)
>+    {
>+        return;
>+    }
>+
>+    init_global_layer_properties(mInfo);
>+    init_instance_extension_names(mInfo);
>+    init_device_extension_names(mInfo);
>+    init_instance(mInfo, mSampleTitle.c_str());
>+    init_enumerate_device(mInfo);
>+    init_window_size(mInfo, 500, 500);
>+    init_connection(mInfo);
>+    init_window(mInfo);
>+    init_swapchain_extension(mInfo);
>+    init_device(mInfo);
>+
>+    init_command_pool(mInfo, VK_COMMAND_POOL_CREATE_RESET_COMMAND_BUFFER_BIT);
>+    init_command_buffer(mInfo);                   // Primary command buffer to hold secondaries
>+    init_command_buffer_array(mInfo, mBuffers);   // Array of primary command buffers
>+    init_command_buffer2_array(mInfo, mBuffers);  // Array containing all secondary buffers
>+    init_device_queue(mInfo);
>+    init_swap_chain(mInfo);
>+    init_depth_buffer(mInfo);
>+    init_uniform_buffer(mInfo);
>+    init_descriptor_and_pipeline_layouts(mInfo, false);
>+    init_renderpass(mInfo, mDepthPresent);
>+    init_shaders(mInfo, kVertShaderText, kFragShaderText);
>+    init_framebuffers(mInfo, mDepthPresent);
>+    init_vertex_buffer(mInfo, g_vb_solid_face_colors_Data, sizeof(g_vb_solid_face_colors_Data),
>+                       sizeof(g_vb_solid_face_colors_Data[0]), false);
>+    init_descriptor_pool(mInfo, false);
>+    init_descriptor_set(mInfo);
>+    init_pipeline_cache(mInfo);
>+    init_pipeline(mInfo, mDepthPresent);
>+
>+    mClearValues[0].color.float32[0]     = 0.2f;
>+    mClearValues[0].color.float32[1]     = 0.2f;
>+    mClearValues[0].color.float32[2]     = 0.2f;
>+    mClearValues[0].color.float32[3]     = 0.2f;
>+    mClearValues[1].depthStencil.depth   = 1.0f;
>+    mClearValues[1].depthStencil.stencil = 0;
>+
>+    VkSemaphoreCreateInfo imageAcquiredSemaphoreCreateInfo;
>+    imageAcquiredSemaphoreCreateInfo.sType = VK_STRUCTURE_TYPE_SEMAPHORE_CREATE_INFO;
>+    imageAcquiredSemaphoreCreateInfo.pNext = NULL;
>+    imageAcquiredSemaphoreCreateInfo.flags = 0;
>+    res = vkCreateSemaphore(mInfo.device, &imageAcquiredSemaphoreCreateInfo, NULL,
>+                            &mImageAcquiredSemaphore);
>+    ASSERT_EQ(VK_SUCCESS, res);
>+
>+    VkFenceCreateInfo fenceInfo;
>+    fenceInfo.sType = VK_STRUCTURE_TYPE_FENCE_CREATE_INFO;
>+    fenceInfo.pNext = NULL;
>+    fenceInfo.flags = 0;
>+    res             = vkCreateFence(mInfo.device, &fenceInfo, NULL, &mDrawFence);
>+    ASSERT_EQ(VK_SUCCESS, res);
>+}
>+
>+void VulkanCommandBufferPerfTest::step()
>+{
>+    for (int x = 0; x < mFrames; x++)
>+    {
>+        mInfo.current_buffer = x % mInfo.swapchainImageCount;
>+
>+        // Get the index of the next available swapchain image:
>+        res = vkAcquireNextImageKHR(mInfo.device, mInfo.swap_chain, UINT64_MAX,
>+                                    mImageAcquiredSemaphore, VK_NULL_HANDLE, &mInfo.current_buffer);
>+        // Deal with the VK_SUBOPTIMAL_KHR and VK_ERROR_OUT_OF_DATE_KHR
>+        // return codes
>+        ASSERT_EQ(VK_SUCCESS, res);
>+        mCBImplementation(mInfo, mClearValues, mDrawFence, mImageAcquiredSemaphore, mBuffers);
>+    }
>+}
>+
>+void VulkanCommandBufferPerfTest::TearDown()
>+{
>+    if (mSkipTest)
>+    {
>+        return;
>+    }
>+
>+    vkDestroySemaphore(mInfo.device, mImageAcquiredSemaphore, NULL);
>+    vkDestroyFence(mInfo.device, mDrawFence, NULL);
>+    destroy_pipeline(mInfo);
>+    destroy_pipeline_cache(mInfo);
>+    destroy_descriptor_pool(mInfo);
>+    destroy_vertex_buffer(mInfo);
>+    destroy_framebuffers(mInfo);
>+    destroy_shaders(mInfo);
>+    destroy_renderpass(mInfo);
>+    destroy_descriptor_and_pipeline_layouts(mInfo);
>+    destroy_uniform_buffer(mInfo);
>+    destroy_depth_buffer(mInfo);
>+    destroy_swap_chain(mInfo);
>+    destroy_command_buffer2_array(mInfo, mBuffers);
>+    destroy_command_buffer_array(mInfo, mBuffers);
>+    destroy_command_buffer(mInfo);
>+    destroy_command_pool(mInfo);
>+    destroy_device(mInfo);
>+    destroy_window(mInfo);
>+    destroy_instance(mInfo);
>+    ANGLEPerfTest::TearDown();
>+}
>+
>+// Common code to present image used by all tests
>+void Present(sample_info &info, VkFence drawFence)
>+{
>+    // Now present the image in the window
>+
>+    VkPresentInfoKHR present;
>+    present.sType              = VK_STRUCTURE_TYPE_PRESENT_INFO_KHR;
>+    present.pNext              = NULL;
>+    present.swapchainCount     = 1;
>+    present.pSwapchains        = &info.swap_chain;
>+    present.pImageIndices      = &info.current_buffer;
>+    present.pWaitSemaphores    = NULL;
>+    present.waitSemaphoreCount = 0;
>+    present.pResults           = NULL;
>+
>+    // Make sure command buffer is finished before presenting
>+    VkResult res;
>+    do
>+    {
>+        res = vkWaitForFences(info.device, 1, &drawFence, VK_TRUE, FENCE_TIMEOUT);
>+    } while (res == VK_TIMEOUT);
>+    vkResetFences(info.device, 1, &drawFence);
>+
>+    ASSERT_EQ(VK_SUCCESS, res);
>+    res = vkQueuePresentKHR(info.present_queue, &present);
>+    ASSERT_EQ(VK_SUCCESS, res);
>+}
>+
>+// 100 separate primary cmd buffers, each with 1 Draw
>+void PrimaryCommandBufferBenchmarkHundredIndividual(sample_info &info,
>+                                                    VkClearValue *clear_values,
>+                                                    VkFence drawFence,
>+                                                    VkSemaphore imageAcquiredSemaphore,
>+                                                    int numBuffers)
>+{
>+    VkResult res;
>+
>+    VkRenderPassBeginInfo rpBegin;
>+    rpBegin.sType                    = VK_STRUCTURE_TYPE_RENDER_PASS_BEGIN_INFO;
>+    rpBegin.pNext                    = NULL;
>+    rpBegin.renderPass               = info.render_pass;
>+    rpBegin.framebuffer              = info.framebuffers[info.current_buffer];
>+    rpBegin.renderArea.offset.x      = 0;
>+    rpBegin.renderArea.offset.y      = 0;
>+    rpBegin.renderArea.extent.width  = info.width;
>+    rpBegin.renderArea.extent.height = info.height;
>+    rpBegin.clearValueCount          = 2;
>+    rpBegin.pClearValues             = clear_values;
>+
>+    VkCommandBufferBeginInfo cmdBufferInfo = {};
>+    cmdBufferInfo.sType                    = VK_STRUCTURE_TYPE_COMMAND_BUFFER_BEGIN_INFO;
>+    cmdBufferInfo.pNext                    = NULL;
>+    cmdBufferInfo.flags                    = 0;
>+    cmdBufferInfo.pInheritanceInfo         = NULL;
>+
>+    for (int x = 0; x < numBuffers; x++)
>+    {
>+        vkBeginCommandBuffer(info.cmds[x], &cmdBufferInfo);
>+        vkCmdBeginRenderPass(info.cmds[x], &rpBegin, VK_SUBPASS_CONTENTS_INLINE);
>+        vkCmdBindPipeline(info.cmds[x], VK_PIPELINE_BIND_POINT_GRAPHICS, info.pipeline);
>+        vkCmdBindDescriptorSets(info.cmds[x], VK_PIPELINE_BIND_POINT_GRAPHICS, info.pipeline_layout,
>+                                0, NUM_DESCRIPTOR_SETS, info.desc_set.data(), 0, NULL);
>+
>+        const VkDeviceSize offsets[1] = {0};
>+        vkCmdBindVertexBuffers(info.cmds[x], 0, 1, &info.vertex_buffer.buf, offsets);
>+
>+        init_viewports_array(info, x);
>+        init_scissors_array(info, x);
>+
>+        vkCmdDraw(info.cmds[x], 0, 1, 0, 0);
>+        vkCmdEndRenderPass(info.cmds[x]);
>+        res = vkEndCommandBuffer(info.cmds[x]);
>+        ASSERT_EQ(VK_SUCCESS, res);
>+    }
>+
>+    VkPipelineStageFlags pipe_stage_flags = VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT;
>+    VkSubmitInfo submitInfo[1]            = {};
>+    submitInfo[0].pNext                   = NULL;
>+    submitInfo[0].sType                   = VK_STRUCTURE_TYPE_SUBMIT_INFO;
>+    submitInfo[0].waitSemaphoreCount      = 1;
>+    submitInfo[0].pWaitSemaphores         = &imageAcquiredSemaphore;
>+    submitInfo[0].pWaitDstStageMask       = &pipe_stage_flags;
>+    submitInfo[0].commandBufferCount      = numBuffers;
>+    submitInfo[0].pCommandBuffers         = info.cmds.data();
>+    submitInfo[0].signalSemaphoreCount    = 0;
>+    submitInfo[0].pSignalSemaphores       = NULL;
>+
>+    // Queue the command buffer for execution
>+    res = vkQueueSubmit(info.graphics_queue, 1, submitInfo, drawFence);
>+    ASSERT_EQ(VK_SUCCESS, res);
>+
>+    Present(info, drawFence);
>+}
>+
>+// 100 of the same Draw cmds in the same primary cmd buffer
>+void PrimaryCommandBufferBenchmarkOneWithOneHundred(sample_info &info,
>+                                                    VkClearValue *clear_values,
>+                                                    VkFence drawFence,
>+                                                    VkSemaphore imageAcquiredSemaphore,
>+                                                    int numBuffers)
>+{
>+    VkResult res;
>+
>+    VkRenderPassBeginInfo rpBegin;
>+    rpBegin.sType                    = VK_STRUCTURE_TYPE_RENDER_PASS_BEGIN_INFO;
>+    rpBegin.pNext                    = NULL;
>+    rpBegin.renderPass               = info.render_pass;
>+    rpBegin.framebuffer              = info.framebuffers[info.current_buffer];
>+    rpBegin.renderArea.offset.x      = 0;
>+    rpBegin.renderArea.offset.y      = 0;
>+    rpBegin.renderArea.extent.width  = info.width;
>+    rpBegin.renderArea.extent.height = info.height;
>+    rpBegin.clearValueCount          = 2;
>+    rpBegin.pClearValues             = clear_values;
>+
>+    VkCommandBufferBeginInfo cmdBufferInfo = {};
>+    cmdBufferInfo.sType                    = VK_STRUCTURE_TYPE_COMMAND_BUFFER_BEGIN_INFO;
>+    cmdBufferInfo.pNext                    = NULL;
>+    cmdBufferInfo.flags                    = 0;
>+    cmdBufferInfo.pInheritanceInfo         = NULL;
>+
>+    vkBeginCommandBuffer(info.cmd, &cmdBufferInfo);
>+    for (int x = 0; x < numBuffers; x++)
>+    {
>+        vkCmdBeginRenderPass(info.cmd, &rpBegin, VK_SUBPASS_CONTENTS_INLINE);
>+        vkCmdBindPipeline(info.cmd, VK_PIPELINE_BIND_POINT_GRAPHICS, info.pipeline);
>+        vkCmdBindDescriptorSets(info.cmd, VK_PIPELINE_BIND_POINT_GRAPHICS, info.pipeline_layout, 0,
>+                                NUM_DESCRIPTOR_SETS, info.desc_set.data(), 0, NULL);
>+
>+        const VkDeviceSize offsets[1] = {0};
>+        vkCmdBindVertexBuffers(info.cmd, 0, 1, &info.vertex_buffer.buf, offsets);
>+
>+        init_viewports(info);
>+        init_scissors(info);
>+
>+        vkCmdDraw(info.cmd, 0, 1, 0, 0);
>+        vkCmdEndRenderPass(info.cmd);
>+    }
>+    res = vkEndCommandBuffer(info.cmd);
>+    ASSERT_EQ(VK_SUCCESS, res);
>+
>+    const VkCommandBuffer cmd_bufs[]      = {info.cmd};
>+    VkPipelineStageFlags pipe_stage_flags = VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT;
>+    VkSubmitInfo submitInfo[1]            = {};
>+    submitInfo[0].pNext                   = NULL;
>+    submitInfo[0].sType                   = VK_STRUCTURE_TYPE_SUBMIT_INFO;
>+    submitInfo[0].waitSemaphoreCount      = 1;
>+    submitInfo[0].pWaitSemaphores         = &imageAcquiredSemaphore;
>+    submitInfo[0].pWaitDstStageMask       = &pipe_stage_flags;
>+    submitInfo[0].commandBufferCount      = 1;
>+    submitInfo[0].pCommandBuffers         = cmd_bufs;
>+    submitInfo[0].signalSemaphoreCount    = 0;
>+    submitInfo[0].pSignalSemaphores       = NULL;
>+
>+    // Queue the command buffer for execution
>+    res = vkQueueSubmit(info.graphics_queue, 1, submitInfo, drawFence);
>+    ASSERT_EQ(VK_SUCCESS, res);
>+
>+    Present(info, drawFence);
>+}
>+
>+// 100 separate secondary cmd buffers, each with 1 Draw
>+void SecondaryCommandBufferBenchmark(sample_info &info,
>+                                     VkClearValue *clear_values,
>+                                     VkFence drawFence,
>+                                     VkSemaphore imageAcquiredSemaphore,
>+                                     int numBuffers)
>+{
>+    VkResult res;
>+
>+    // Record Secondary Command Buffer
>+    VkCommandBufferInheritanceInfo inheritInfo = {};
>+    inheritInfo.sType                          = VK_STRUCTURE_TYPE_COMMAND_BUFFER_INHERITANCE_INFO;
>+    inheritInfo.pNext                          = NULL;
>+    inheritInfo.renderPass                     = info.render_pass;
>+    inheritInfo.subpass                        = 0;
>+    inheritInfo.framebuffer                    = info.framebuffers[info.current_buffer];
>+    inheritInfo.occlusionQueryEnable           = false;
>+    inheritInfo.queryFlags                     = 0;
>+    inheritInfo.pipelineStatistics             = 0;
>+
>+    VkCommandBufferBeginInfo secondaryCommandBufferInfo = {};
>+    secondaryCommandBufferInfo.sType = VK_STRUCTURE_TYPE_COMMAND_BUFFER_BEGIN_INFO;
>+    secondaryCommandBufferInfo.pNext = NULL;
>+    secondaryCommandBufferInfo.flags = VK_COMMAND_BUFFER_USAGE_RENDER_PASS_CONTINUE_BIT |
>+                                       VK_COMMAND_BUFFER_USAGE_SIMULTANEOUS_USE_BIT;
>+    secondaryCommandBufferInfo.pInheritanceInfo = &inheritInfo;
>+
>+    for (int x = 0; x < numBuffers; x++)
>+    {
>+        vkBeginCommandBuffer(info.cmd2s[x], &secondaryCommandBufferInfo);
>+        vkCmdBindPipeline(info.cmd2s[x], VK_PIPELINE_BIND_POINT_GRAPHICS, info.pipeline);
>+        vkCmdBindDescriptorSets(info.cmd2s[x], VK_PIPELINE_BIND_POINT_GRAPHICS,
>+                                info.pipeline_layout, 0, NUM_DESCRIPTOR_SETS, info.desc_set.data(),
>+                                0, NULL);
>+        const VkDeviceSize offsets[1] = {0};
>+        vkCmdBindVertexBuffers(info.cmd2s[x], 0, 1, &info.vertex_buffer.buf, offsets);
>+        init_viewports2_array(info, x);
>+        init_scissors2_array(info, x);
>+        vkCmdDraw(info.cmd2s[x], 0, 1, 0, 0);
>+        vkEndCommandBuffer(info.cmd2s[x]);
>+    }
>+    // Record Secondary Command Buffer End
>+
>+    // Record Primary Command Buffer Begin
>+    VkRenderPassBeginInfo rpBegin;
>+    rpBegin.sType                    = VK_STRUCTURE_TYPE_RENDER_PASS_BEGIN_INFO;
>+    rpBegin.pNext                    = NULL;
>+    rpBegin.renderPass               = info.render_pass;
>+    rpBegin.framebuffer              = info.framebuffers[info.current_buffer];
>+    rpBegin.renderArea.offset.x      = 0;
>+    rpBegin.renderArea.offset.y      = 0;
>+    rpBegin.renderArea.extent.width  = info.width;
>+    rpBegin.renderArea.extent.height = info.height;
>+    rpBegin.clearValueCount          = 2;
>+    rpBegin.pClearValues             = clear_values;
>+
>+    VkCommandBufferBeginInfo primaryCommandBufferInfo = {};
>+    primaryCommandBufferInfo.sType                    = VK_STRUCTURE_TYPE_COMMAND_BUFFER_BEGIN_INFO;
>+    primaryCommandBufferInfo.pNext                    = NULL;
>+    primaryCommandBufferInfo.flags                    = 0;
>+    primaryCommandBufferInfo.pInheritanceInfo         = NULL;
>+
>+    vkBeginCommandBuffer(info.cmd, &primaryCommandBufferInfo);
>+    for (int x = 0; x < numBuffers; x++)
>+    {
>+        vkCmdBeginRenderPass(info.cmd, &rpBegin, VK_SUBPASS_CONTENTS_SECONDARY_COMMAND_BUFFERS);
>+        vkCmdExecuteCommands(info.cmd, 1, &info.cmd2s[x]);
>+        vkCmdEndRenderPass(info.cmd);
>+    }
>+    vkEndCommandBuffer(info.cmd);
>+    // Record Primary Command Buffer End
>+
>+    const VkCommandBuffer cmd_bufs[]      = {info.cmd};
>+    VkPipelineStageFlags pipe_stage_flags = VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT;
>+    VkSubmitInfo submitInfo[1]            = {};
>+    submitInfo[0].pNext                   = NULL;
>+    submitInfo[0].sType                   = VK_STRUCTURE_TYPE_SUBMIT_INFO;
>+    submitInfo[0].waitSemaphoreCount      = 1;
>+    submitInfo[0].pWaitSemaphores         = &imageAcquiredSemaphore;
>+    submitInfo[0].pWaitDstStageMask       = &pipe_stage_flags;
>+    submitInfo[0].commandBufferCount      = 1;
>+    submitInfo[0].pCommandBuffers         = cmd_bufs;
>+    submitInfo[0].signalSemaphoreCount    = 0;
>+    submitInfo[0].pSignalSemaphores       = NULL;
>+
>+    // Queue the command buffer for execution
>+    res = vkQueueSubmit(info.graphics_queue, 1, submitInfo, drawFence);
>+    ASSERT_EQ(VK_SUCCESS, res);
>+
>+    Present(info, drawFence);
>+}
>+
>+// Details on the following functions that stress various cmd buffer reset methods.
>+// All of these functions wrap the SecondaryCommandBufferBenchmark() test above,
>+// adding additional overhead with various reset methods.
>+// -CommandPoolDestroyBenchmark: Reset command buffers by destroying and re-creating
>+//   command buffer pool.
>+// -CommandPoolHardResetBenchmark: Reset the command pool w/ the RELEASE_RESOURCES
>+//   bit set.
>+// -CommandPoolSoftResetBenchmark: Reset to command pool w/o the RELEASE_RESOURCES
>+//   bit set.
>+// -CommandBufferExplicitHardResetBenchmark: Reset each individual command buffer
>+//   w/ the RELEASE_RESOURCES bit set.
>+// -CommandBufferExplicitSoftResetBenchmark: Reset each individual command buffer
>+//   w/o the RELEASE_RESOURCES bit set.
>+// -CommandBufferImplicitResetBenchmark: Reset each individual command buffer
>+//   implicitly by calling "Begin" on previously used cmd buffer.
>+
>+void CommandPoolDestroyBenchmark(sample_info &info,
>+                                 VkClearValue *clear_values,
>+                                 VkFence drawFence,
>+                                 VkSemaphore imageAcquiredSemaphore,
>+                                 int numBuffers)
>+{
>+    // Save setup cmd buffer data to be restored
>+    auto saved_cmd_pool = info.cmd_pool;
>+    auto saved_cb       = info.cmd;
>+    auto saved_cb2s     = info.cmd2s;
>+    // Now re-allocate & destroy cmd buffers to stress those calls
>+    init_command_pool(info, 0);
>+    init_command_buffer2_array(info, numBuffers);
>+
>+    SecondaryCommandBufferBenchmark(info, clear_values, drawFence, imageAcquiredSemaphore,
>+                                    numBuffers);
>+
>+    destroy_command_pool(info);
>+
>+    // Restore original cmd buffer data for cleanup
>+    info.cmd_pool = saved_cmd_pool;
>+    info.cmd      = saved_cb;
>+    info.cmd2s    = saved_cb2s;
>+}
>+
>+void CommandPoolHardResetBenchmark(sample_info &info,
>+                                   VkClearValue *clear_values,
>+                                   VkFence drawFence,
>+                                   VkSemaphore imageAcquiredSemaphore,
>+                                   int numBuffers)
>+{
>+    SecondaryCommandBufferBenchmark(info, clear_values, drawFence, imageAcquiredSemaphore,
>+                                    numBuffers);
>+    reset_command_pool(info, VK_COMMAND_POOL_RESET_RELEASE_RESOURCES_BIT);
>+}
>+
>+void CommandPoolSoftResetBenchmark(sample_info &info,
>+                                   VkClearValue *clear_values,
>+                                   VkFence drawFence,
>+                                   VkSemaphore imageAcquiredSemaphore,
>+                                   int numBuffers)
>+{
>+    SecondaryCommandBufferBenchmark(info, clear_values, drawFence, imageAcquiredSemaphore,
>+                                    numBuffers);
>+    reset_command_pool(info, 0);
>+}
>+
>+void CommandBufferExplicitHardResetBenchmark(sample_info &info,
>+                                             VkClearValue *clear_values,
>+                                             VkFence drawFence,
>+                                             VkSemaphore imageAcquiredSemaphore,
>+                                             int numBuffers)
>+{
>+    SecondaryCommandBufferBenchmark(info, clear_values, drawFence, imageAcquiredSemaphore,
>+                                    numBuffers);
>+    // Explicitly resetting cmd buffers
>+    reset_command_buffer2_array(info, VK_COMMAND_BUFFER_RESET_RELEASE_RESOURCES_BIT);
>+}
>+
>+void CommandBufferExplicitSoftResetBenchmark(sample_info &info,
>+                                             VkClearValue *clear_values,
>+                                             VkFence drawFence,
>+                                             VkSemaphore imageAcquiredSemaphore,
>+                                             int numBuffers)
>+{
>+    SecondaryCommandBufferBenchmark(info, clear_values, drawFence, imageAcquiredSemaphore,
>+                                    numBuffers);
>+    // Explicitly resetting cmd buffers w/ soft reset (don't release resources)
>+    reset_command_buffer2_array(info, 0);
>+}
>+
>+void CommandBufferImplicitResetBenchmark(sample_info &info,
>+                                         VkClearValue *clear_values,
>+                                         VkFence drawFence,
>+                                         VkSemaphore imageAcquiredSemaphore,
>+                                         int numBuffers)
>+{
>+    // Repeated call SCBBenchmark & BeginCmdBuffer calls will implicitly reset each cmd buffer
>+    SecondaryCommandBufferBenchmark(info, clear_values, drawFence, imageAcquiredSemaphore,
>+                                    numBuffers);
>+}
>+
>+CommandBufferTestParams PrimaryCBHundredIndividualParams()
>+{
>+    CommandBufferTestParams params;
>+    params.CBImplementation = PrimaryCommandBufferBenchmarkHundredIndividual;
>+    params.suffix           = "_PrimaryCB_Submit_100_With_1_Draw";
>+    return params;
>+}
>+
>+CommandBufferTestParams PrimaryCBOneWithOneHundredParams()
>+{
>+    CommandBufferTestParams params;
>+    params.CBImplementation = PrimaryCommandBufferBenchmarkOneWithOneHundred;
>+    params.suffix           = "_PrimaryCB_Submit_1_With_100_Draw";
>+    return params;
>+}
>+
>+CommandBufferTestParams SecondaryCBParams()
>+{
>+    CommandBufferTestParams params;
>+    params.CBImplementation = SecondaryCommandBufferBenchmark;
>+    params.suffix           = "_SecondaryCB_Submit_1_With_100_Draw_In_Individual_Secondary";
>+    return params;
>+}
>+
>+CommandBufferTestParams CommandPoolDestroyParams()
>+{
>+    CommandBufferTestParams params;
>+    params.CBImplementation = CommandPoolDestroyBenchmark;
>+    params.suffix           = "_Reset_CBs_With_Destroy_Command_Pool";
>+    return params;
>+}
>+
>+CommandBufferTestParams CommandPoolHardResetParams()
>+{
>+    CommandBufferTestParams params;
>+    params.CBImplementation = CommandPoolHardResetBenchmark;
>+    params.suffix           = "_Reset_CBs_With_Hard_Reset_Command_Pool";
>+    return params;
>+}
>+
>+CommandBufferTestParams CommandPoolSoftResetParams()
>+{
>+    CommandBufferTestParams params;
>+    params.CBImplementation = CommandPoolSoftResetBenchmark;
>+    params.suffix           = "_Reset_CBs_With_Soft_Reset_Command_Pool";
>+    return params;
>+}
>+
>+CommandBufferTestParams CommandBufferExplicitHardResetParams()
>+{
>+    CommandBufferTestParams params;
>+    params.CBImplementation = CommandBufferExplicitHardResetBenchmark;
>+    params.suffix           = "_Reset_CBs_With_Explicit_Hard_Reset_Command_Buffers";
>+    return params;
>+}
>+
>+CommandBufferTestParams CommandBufferExplicitSoftResetParams()
>+{
>+    CommandBufferTestParams params;
>+    params.CBImplementation = CommandBufferExplicitSoftResetBenchmark;
>+    params.suffix           = "_Reset_CBs_With_Explicit_Soft_Reset_Command_Buffers";
>+    return params;
>+}
>+
>+CommandBufferTestParams CommandBufferImplicitResetParams()
>+{
>+    CommandBufferTestParams params;
>+    params.CBImplementation = CommandBufferImplicitResetBenchmark;
>+    params.suffix           = "_Reset_CBs_With_Implicit_Reset_Command_Buffers";
>+    return params;
>+}
>+
>+TEST_P(VulkanCommandBufferPerfTest, Run)
>+{
>+    run();
>+}
>+
>+INSTANTIATE_TEST_SUITE_P(,
>+                         VulkanCommandBufferPerfTest,
>+                         ::testing::Values(PrimaryCBHundredIndividualParams(),
>+                                           PrimaryCBOneWithOneHundredParams(),
>+                                           SecondaryCBParams(),
>+                                           CommandPoolDestroyParams(),
>+                                           CommandPoolHardResetParams(),
>+                                           CommandPoolSoftResetParams(),
>+                                           CommandBufferExplicitHardResetParams(),
>+                                           CommandBufferExplicitSoftResetParams(),
>+                                           CommandBufferImplicitResetParams()));
>diff --git a/Source/ThirdParty/ANGLE/src/tests/perf_tests/VulkanPipelineCachePerf.cpp b/Source/ThirdParty/ANGLE/src/tests/perf_tests/VulkanPipelineCachePerf.cpp
>new file mode 100644
>index 00000000000..dbd6d2172f6
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/tests/perf_tests/VulkanPipelineCachePerf.cpp
>@@ -0,0 +1,111 @@
>+//
>+// Copyright 2018 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// VulkanPipelineCachePerf:
>+//   Performance benchmark for the Vulkan Pipeline cache.
>+
>+#include "ANGLEPerfTest.h"
>+
>+#include "libANGLE/renderer/vulkan/vk_cache_utils.h"
>+#include "util/random_utils.h"
>+
>+using namespace rx;
>+
>+namespace
>+{
>+constexpr unsigned int kIterationsPerStep = 100;
>+
>+class VulkanPipelineCachePerfTest : public ANGLEPerfTest
>+{
>+  public:
>+    VulkanPipelineCachePerfTest();
>+    ~VulkanPipelineCachePerfTest();
>+
>+    void SetUp() override;
>+    void step() override;
>+
>+    GraphicsPipelineCache mCache;
>+    angle::RNG mRNG;
>+
>+    std::vector<vk::GraphicsPipelineDesc> mCacheHits;
>+    std::vector<vk::GraphicsPipelineDesc> mCacheMisses;
>+    size_t mMissIndex = 0;
>+
>+  private:
>+    void randomizeDesc(vk::GraphicsPipelineDesc *desc);
>+};
>+
>+VulkanPipelineCachePerfTest::VulkanPipelineCachePerfTest()
>+    : ANGLEPerfTest("VulkanPipelineCachePerf", "", kIterationsPerStep)
>+{}
>+
>+VulkanPipelineCachePerfTest::~VulkanPipelineCachePerfTest()
>+{
>+    mCache.destroy(VK_NULL_HANDLE);
>+}
>+
>+void VulkanPipelineCachePerfTest::SetUp()
>+{
>+    // Insert a number of random pipeline states.
>+    for (int pipelineCount = 0; pipelineCount < 100; ++pipelineCount)
>+    {
>+        vk::Pipeline pipeline;
>+        vk::GraphicsPipelineDesc desc;
>+        randomizeDesc(&desc);
>+
>+        if (pipelineCount < 10)
>+        {
>+            mCacheHits.push_back(desc);
>+        }
>+        mCache.populate(desc, std::move(pipeline));
>+    }
>+
>+    for (int missCount = 0; missCount < 10000; ++missCount)
>+    {
>+        vk::GraphicsPipelineDesc desc;
>+        randomizeDesc(&desc);
>+        mCacheMisses.push_back(desc);
>+    }
>+}
>+
>+void VulkanPipelineCachePerfTest::randomizeDesc(vk::GraphicsPipelineDesc *desc)
>+{
>+    std::vector<uint8_t> bytes(sizeof(vk::GraphicsPipelineDesc));
>+    FillVectorWithRandomUBytes(&mRNG, &bytes);
>+    memcpy(desc, bytes.data(), sizeof(vk::GraphicsPipelineDesc));
>+}
>+
>+void VulkanPipelineCachePerfTest::step()
>+{
>+    vk::RenderPass rp;
>+    vk::PipelineLayout pl;
>+    vk::PipelineCache pc;
>+    vk::ShaderModule sm;
>+    const vk::GraphicsPipelineDesc *desc = nullptr;
>+    vk::PipelineHelper *result           = nullptr;
>+    gl::AttributesMask am;
>+
>+    for (unsigned int iteration = 0; iteration < kIterationsPerStep; ++iteration)
>+    {
>+        for (const auto &hit : mCacheHits)
>+        {
>+            (void)mCache.getPipeline(VK_NULL_HANDLE, pc, rp, pl, am, &sm, &sm, hit, &desc, &result);
>+        }
>+    }
>+
>+    for (int missCount = 0; missCount < 20 && mMissIndex < mCacheMisses.size();
>+         ++missCount, ++mMissIndex)
>+    {
>+        const auto &miss = mCacheMisses[mMissIndex];
>+        (void)mCache.getPipeline(VK_NULL_HANDLE, pc, rp, pl, am, &sm, &sm, miss, &desc, &result);
>+    }
>+}
>+
>+}  // anonymous namespace
>+
>+TEST_F(VulkanPipelineCachePerfTest, Run)
>+{
>+    run();
>+}
>diff --git a/Source/ThirdParty/ANGLE/src/tests/perf_tests/glmark2Benchmark.cpp b/Source/ThirdParty/ANGLE/src/tests/perf_tests/glmark2Benchmark.cpp
>new file mode 100644
>index 00000000000..7be924ffea7
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/tests/perf_tests/glmark2Benchmark.cpp
>@@ -0,0 +1,282 @@
>+//
>+// Copyright 2019 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// glmark2Benchmark:
>+//   Runs the glmark2 benchmark.
>+//
>+
>+#include <gtest/gtest.h>
>+
>+#include <stdio.h>
>+#include <sstream>
>+
>+#include "../perf_tests/third_party/perf/perf_test.h"
>+#include "ANGLEPerfTestArgs.h"
>+#include "common/platform.h"
>+#include "common/system_utils.h"
>+#include "test_utils/angle_test_configs.h"
>+#include "test_utils/angle_test_instantiate.h"
>+
>+using namespace angle;
>+
>+namespace
>+{
>+
>+struct BenchmarkInfo
>+{
>+    const char *glmark2Config;
>+    const char *name;
>+};
>+
>+// Each glmark2 scene is individually benchmarked.  If glmark2 is run without a specific benchmark,
>+// it can produce an aggregate score, which is not interesting at the moment.  Adding an empty
>+// string ("") to this list will enable a test where glmark2 is run with the default scenes and the
>+// score for each test as well as the overall score is output.
>+constexpr BenchmarkInfo kBenchmarks[] = {
>+    {"build:use-vbo=false", "build"},
>+    {"build:use-vbo=true", "build_vbo"},
>+    {"texture:texture-filter=nearest", "texture_nearest"},
>+    {"texture:texture-filter=linear", "texture_linear"},
>+    {"texture:texture-filter=mipmap", "texture_mipmap"},
>+    {"shading:shading=gouraud", "shading_gouraud"},
>+    {"shading:shading=blinn-phong-inf", "shading_blinn_phong"},
>+    {"shading:shading=phong", "shading_phong"},
>+    {"shading:shading=cel", "shading_cel"},
>+    {"bump:bump-render=high-poly", "bump_high_poly"},
>+    {"bump:bump-render=normals", "bump_normals"},
>+    {"bump:bump-render=height", "bump_height"},
>+    {"effect2d:kernel=0,1,0;1,-4,1;0,1,0;", "effect2d_edge"},
>+    {"effect2d:kernel=1,1,1,1,1;1,1,1,1,1;1,1,1,1,1;", "effect2d_blur"},
>+    {"pulsar:light=false:quads=5:texture=false", "pulsar"},
>+    {"desktop:blur-radius=5:effect=blur:passes=1:separable=true:windows=4", "desktop_blur"},
>+    {"desktop:effect=shadow:windows=4", "desktop_shadow"},
>+    {"buffer:columns=200:interleave=false:update-dispersion=0.9:update-fraction=0.5:update-method="
>+     "map",
>+     "buffer_map"},
>+    {"buffer:columns=200:interleave=false:update-dispersion=0.9:update-fraction=0.5:update-method="
>+     "subdata",
>+     "buffer_subdata"},
>+    {"buffer:columns=200:interleave=true:update-dispersion=0.9:update-fraction=0.5:update-method="
>+     "map",
>+     "buffer_map_interleave"},
>+    {"ideas:speed=duration", "ideas"},
>+    {"jellyfish", "jellyfish"},
>+    {"terrain", "terrain"},
>+    {"shadow", "shadow"},
>+    {"refract", "refract"},
>+    {"conditionals:fragment-steps=0:vertex-steps=0", "conditionals"},
>+    {"conditionals:fragment-steps=5:vertex-steps=0", "conditionals_fragment"},
>+    {"conditionals:fragment-steps=0:vertex-steps=5", "conditionals_vertex"},
>+    {"function:fragment-complexity=low:fragment-steps=5", "function"},
>+    {"function:fragment-complexity=medium:fragment-steps=5", "function_complex"},
>+    {"loop:fragment-loop=false:fragment-steps=5:vertex-steps=5", "loop_no_fsloop"},
>+    {"loop:fragment-steps=5:fragment-uniform=false:vertex-steps=5", "loop_no_uniform"},
>+    {"loop:fragment-steps=5:fragment-uniform=true:vertex-steps=5", "loop"},
>+};
>+
>+using GLMark2BenchmarkTestParams = std::tuple<PlatformParameters, size_t>;
>+std::string GLMark2BenchmarkPrint(
>+    const ::testing::TestParamInfo<GLMark2BenchmarkTestParams> &paramsInfo)
>+{
>+    const GLMark2BenchmarkTestParams &params = paramsInfo.param;
>+    std::ostringstream out;
>+
>+    out << std::get<0>(params) << '_';
>+    out << kBenchmarks[std::get<1>(params)].name;
>+
>+    return out.str();
>+}
>+
>+class GLMark2Benchmark : public testing::TestWithParam<GLMark2BenchmarkTestParams>
>+{
>+  public:
>+    GLMark2Benchmark()
>+    {
>+        switch (std::get<0>(GetParam()).getRenderer())
>+        {
>+            case EGL_PLATFORM_ANGLE_TYPE_D3D11_ANGLE:
>+                mBackend = "d3d11";
>+                break;
>+            case EGL_PLATFORM_ANGLE_TYPE_OPENGLES_ANGLE:
>+                mBackend = "gl";
>+                break;
>+            case EGL_PLATFORM_ANGLE_TYPE_VULKAN_ANGLE:
>+                mBackend = "vulkan";
>+                break;
>+            default:
>+                break;
>+        }
>+    }
>+
>+    void run()
>+    {
>+        // Only supported on Linux and Windows at the moment.
>+        if (!IsLinux() && !IsWindows())
>+        {
>+            return;
>+        }
>+
>+        const BenchmarkInfo benchmarkInfo = kBenchmarks[std::get<1>(GetParam())];
>+        const char *benchmark             = benchmarkInfo.glmark2Config;
>+        const char *benchmarkName         = benchmarkInfo.name;
>+        bool completeRun      = benchmark == nullptr || benchmark[0] == '\0';
>+
>+        Optional<std::string> cwd = GetCWD();
>+
>+        // Set the current working directory to the executable's, as the data path of glmark2 is
>+        // set relative to that path.
>+        std::string executableDir = GetExecutableDirectory();
>+        SetCWD(executableDir.c_str());
>+        SetEnvironmentVar("ANGLE_DEFAULT_PLATFORM", mBackend.c_str());
>+
>+        std::vector<const char *> args = {
>+            "glmark2_angle",
>+        };
>+        if (OneFrame())
>+        {
>+            args.push_back("--validate");
>+        }
>+        if (!completeRun)
>+        {
>+            args.push_back("--benchmark");
>+            args.push_back(benchmark);
>+            fprintf(stderr, "Running benchmark: %s\n", benchmark);
>+        }
>+        args.push_back(nullptr);
>+
>+        std::string output;
>+        int exitCode;
>+
>+        bool success = RunApp(args, &output, nullptr, &exitCode);
>+
>+        // Restore the current working directory for the next tests.
>+        if (cwd.valid())
>+        {
>+            SetCWD(cwd.value().c_str());
>+        }
>+
>+        ASSERT_TRUE(success);
>+        ASSERT_EQ(EXIT_SUCCESS, exitCode);
>+
>+        if (!OneFrame())
>+        {
>+            parseOutput(output, benchmarkName, completeRun);
>+        }
>+    }
>+
>+  private:
>+    void parseOutput(const std::string &output, const char *benchmarkName, bool completeRun)
>+    {
>+        // Output is in the following format:
>+        //
>+        // =======================================================
>+        //     glmark2 2017.07
>+        // =======================================================
>+        //     OpenGL Information
>+        //     GL_VENDOR:     ...
>+        //     GL_RENDERER:   ...
>+        //     GL_VERSION:    ...
>+        // =======================================================
>+        // [test] config: FPS: uint FrameTime: float ms
>+        // [test] config: Not Supported
>+        // ...
>+        // =======================================================
>+        //                                   glmark2 Score: uint
>+        // =======================================================
>+        //
>+        // This function skips the header, prints one line for each test/config line where there's
>+        // an FPS value, and finally prints the overall score.
>+        std::istringstream glmark2Output(output);
>+        std::string line;
>+
>+        // Expect ==== at the top of the header
>+        std::getline(glmark2Output, line);
>+        ASSERT_EQ('=', line[0]);
>+
>+        // Skip one line
>+        std::getline(glmark2Output, line);
>+
>+        // Expect ==== in the middle of the header
>+        std::getline(glmark2Output, line);
>+        ASSERT_EQ('=', line[0]);
>+
>+        // Skip four lines
>+        std::getline(glmark2Output, line);
>+        std::getline(glmark2Output, line);
>+        std::getline(glmark2Output, line);
>+        std::getline(glmark2Output, line);
>+
>+        // The fourth line is the GL_VERSION.  Expect it to include ANGLE, otherwise we are not
>+        // running against ANGLE.
>+        ASSERT_NE(line.find("ANGLE"), std::string::npos);
>+
>+        // Expect ==== at the bottom of the header
>+        std::getline(glmark2Output, line);
>+        ASSERT_EQ('=', line[0]);
>+
>+        // Read configs until the top of the footer is reached
>+        while (std::getline(glmark2Output, line) && line[0] != '=')
>+        {
>+            // Parse the line
>+            std::istringstream lin(line);
>+
>+            std::string testName, testConfig;
>+            lin >> testName >> testConfig;
>+            EXPECT_TRUE(lin);
>+
>+            std::string fpsTag, frametimeTag;
>+            size_t fps;
>+            float frametime;
>+
>+            lin >> fpsTag >> fps >> frametimeTag >> frametime;
>+
>+            // If the line is not in `FPS: uint FrameTime: Float ms` format, the test is not
>+            // supported.  It will be skipped.
>+            if (!lin)
>+            {
>+                continue;
>+            }
>+
>+            EXPECT_EQ("FPS:", fpsTag);
>+            EXPECT_EQ("FrameTime:", frametimeTag);
>+
>+            if (!completeRun)
>+            {
>+                const std::string kBenchmarkPrefix = "glmark2_";
>+                perf_test::PrintResult(kBenchmarkPrefix + benchmarkName, '_' + mBackend, "fps", fps,
>+                                       "", true);
>+            }
>+        }
>+
>+        // Get the score line: `glmark2 Score: uint`
>+        std::string glmark2Tag, scoreTag;
>+        size_t score;
>+        glmark2Output >> glmark2Tag >> scoreTag >> score;
>+        EXPECT_TRUE(glmark2Output);
>+        EXPECT_EQ("glmark2", glmark2Tag);
>+        EXPECT_EQ("Score:", scoreTag);
>+
>+        if (completeRun)
>+        {
>+            perf_test::PrintResult("glmark2", '_' + mBackend, "score", score, "", true);
>+        }
>+    }
>+
>+    std::string mBackend = "invalid";
>+};
>+
>+TEST_P(GLMark2Benchmark, Run)
>+{
>+    run();
>+}
>+
>+ANGLE_INSTANTIATE_TEST_COMBINE_1(GLMark2Benchmark,
>+                                 GLMark2BenchmarkPrint,
>+                                 testing::Range(static_cast<size_t>(0), ArraySize(kBenchmarks)),
>+                                 ES2_D3D11(),
>+                                 ES2_OPENGLES(),
>+                                 ES2_VULKAN());
>+
>+}  // namespace
>diff --git a/Source/ThirdParty/ANGLE/src/tests/perf_tests/third_party/perf/perf_test.cc b/Source/ThirdParty/ANGLE/src/tests/perf_tests/third_party/perf/perf_test.cc
>index 73643306c97..7144f01c662 100644
>--- a/Source/ThirdParty/ANGLE/src/tests/perf_tests/third_party/perf/perf_test.cc
>+++ b/Source/ThirdParty/ANGLE/src/tests/perf_tests/third_party/perf/perf_test.cc
>@@ -4,10 +4,14 @@
> 
> #include "perf_test.h"
> 
>-#include <stdio.h>
> #include <stdarg.h>
>+#include <stdio.h>
> #include <vector>
> 
>+#if defined(ANDROID)
>+#    include <android/log.h>
>+#endif
>+
> namespace {
> 
> namespace base {
>@@ -73,8 +77,15 @@ void PrintResultsImpl(const std::string& measurement,
>                       const std::string& units,
>                       bool important) {
>   fflush(stdout);
>+#if defined(ANDROID)
>+  __android_log_print(
>+      ANDROID_LOG_INFO, "ANGLE", "%s",
>+      ResultsToString(measurement, modifier, trace, values, prefix, suffix, units, important)
>+          .c_str());
>+#else
>   printf("%s", ResultsToString(measurement, modifier, trace, values,
>                                prefix, suffix, units, important).c_str());
>+#endif  // defined(ANDROID)
>   fflush(stdout);
> }
> 
>diff --git a/Source/ThirdParty/ANGLE/src/tests/perf_tests/third_party/perf/perf_test.h b/Source/ThirdParty/ANGLE/src/tests/perf_tests/third_party/perf/perf_test.h
>index 36e2916c5f5..d269a34cfb8 100644
>--- a/Source/ThirdParty/ANGLE/src/tests/perf_tests/third_party/perf/perf_test.h
>+++ b/Source/ThirdParty/ANGLE/src/tests/perf_tests/third_party/perf/perf_test.h
>@@ -7,7 +7,8 @@
> 
> #include <string>
> 
>-namespace perf_test {
>+namespace perf_test
>+{
> 
> // Prints numerical information to stdout in a controlled format, for
> // post-processing. |measurement| is a description of the quantity being
>@@ -22,94 +23,90 @@ namespace perf_test {
> // produced for various builds, using the combined |measurement| + |modifier|
> // string to specify a particular graph and the |trace| to identify a trace
> // (i.e., data series) on that graph.
>-void PrintResult(const std::string& measurement,
>-                 const std::string& modifier,
>-                 const std::string& trace,
>+void PrintResult(const std::string &measurement,
>+                 const std::string &modifier,
>+                 const std::string &trace,
>                  size_t value,
>-                 const std::string& units,
>+                 const std::string &units,
>                  bool important);
>-void PrintResult(const std::string& measurement,
>-                 const std::string& modifier,
>-                 const std::string& trace,
>+void PrintResult(const std::string &measurement,
>+                 const std::string &modifier,
>+                 const std::string &trace,
>                  double value,
>-                 const std::string& units,
>+                 const std::string &units,
>                  bool important);
> 
>-void AppendResult(std::string& output,
>-                  const std::string& measurement,
>-                  const std::string& modifier,
>-                  const std::string& trace,
>+void AppendResult(std::string &output,
>+                  const std::string &measurement,
>+                  const std::string &modifier,
>+                  const std::string &trace,
>                   size_t value,
>-                  const std::string& units,
>+                  const std::string &units,
>                   bool important);
> 
> // Like the above version of PrintResult(), but takes a std::string value
> // instead of a size_t.
>-void PrintResult(const std::string& measurement,
>-                 const std::string& modifier,
>-                 const std::string& trace,
>-                 const std::string& value,
>-                 const std::string& units,
>+void PrintResult(const std::string &measurement,
>+                 const std::string &modifier,
>+                 const std::string &trace,
>+                 const std::string &value,
>+                 const std::string &units,
>                  bool important);
> 
>-void AppendResult(std::string& output,
>-                  const std::string& measurement,
>-                  const std::string& modifier,
>-                  const std::string& trace,
>-                  const std::string& value,
>-                  const std::string& units,
>+void AppendResult(std::string &output,
>+                  const std::string &measurement,
>+                  const std::string &modifier,
>+                  const std::string &trace,
>+                  const std::string &value,
>+                  const std::string &units,
>                   bool important);
> 
> // Like PrintResult(), but prints a (mean, standard deviation) result pair.
> // The |<values>| should be two comma-separated numbers, the mean and
> // standard deviation (or other error metric) of the measurement.
>-void PrintResultMeanAndError(const std::string& measurement,
>-                             const std::string& modifier,
>-                             const std::string& trace,
>-                             const std::string& mean_and_error,
>-                             const std::string& units,
>+void PrintResultMeanAndError(const std::string &measurement,
>+                             const std::string &modifier,
>+                             const std::string &trace,
>+                             const std::string &mean_and_error,
>+                             const std::string &units,
>                              bool important);
> 
>-void AppendResultMeanAndError(std::string& output,
>-                              const std::string& measurement,
>-                              const std::string& modifier,
>-                              const std::string& trace,
>-                              const std::string& mean_and_error,
>-                              const std::string& units,
>+void AppendResultMeanAndError(std::string &output,
>+                              const std::string &measurement,
>+                              const std::string &modifier,
>+                              const std::string &trace,
>+                              const std::string &mean_and_error,
>+                              const std::string &units,
>                               bool important);
> 
> // Like PrintResult(), but prints an entire list of results. The |values|
> // will generally be a list of comma-separated numbers. A typical
> // post-processing step might produce plots of their mean and standard
> // deviation.
>-void PrintResultList(const std::string& measurement,
>-                     const std::string& modifier,
>-                     const std::string& trace,
>-                     const std::string& values,
>-                     const std::string& units,
>+void PrintResultList(const std::string &measurement,
>+                     const std::string &modifier,
>+                     const std::string &trace,
>+                     const std::string &values,
>+                     const std::string &units,
>                      bool important);
> 
>-void AppendResultList(std::string& output,
>-                      const std::string& measurement,
>-                      const std::string& modifier,
>-                      const std::string& trace,
>-                      const std::string& values,
>-                      const std::string& units,
>+void AppendResultList(std::string &output,
>+                      const std::string &measurement,
>+                      const std::string &modifier,
>+                      const std::string &trace,
>+                      const std::string &values,
>+                      const std::string &units,
>                       bool important);
> 
> // Prints memory commit charge stats for use by perf graphs.
>-void PrintSystemCommitCharge(const std::string& test_name,
>-                             size_t charge,
>-                             bool important);
>+void PrintSystemCommitCharge(const std::string &test_name, size_t charge, bool important);
> 
>-void PrintSystemCommitCharge(FILE* target,
>-                             const std::string& test_name,
>+void PrintSystemCommitCharge(FILE *target,
>+                             const std::string &test_name,
>                              size_t charge,
>                              bool important);
> 
>-std::string SystemCommitChargeToString(const std::string& test_name,
>-                                       size_t charge,
>-                                       bool important);
>+std::string SystemCommitChargeToString(const std::string &test_name, size_t charge, bool important);
> 
> }  // namespace perf_test
> 
>diff --git a/Source/ThirdParty/ANGLE/src/tests/preprocessor_tests/MockDiagnostics.h b/Source/ThirdParty/ANGLE/src/tests/preprocessor_tests/MockDiagnostics.h
>index 397617869b1..747ecdc5fd7 100644
>--- a/Source/ThirdParty/ANGLE/src/tests/preprocessor_tests/MockDiagnostics.h
>+++ b/Source/ThirdParty/ANGLE/src/tests/preprocessor_tests/MockDiagnostics.h
>@@ -7,14 +7,18 @@
> #ifndef PREPROCESSOR_TESTS_MOCK_DIAGNOSTICS_H_
> #define PREPROCESSOR_TESTS_MOCK_DIAGNOSTICS_H_
> 
>-#include "gmock/gmock.h"
> #include "compiler/preprocessor/DiagnosticsBase.h"
>+#include "gmock/gmock.h"
>+
>+namespace angle
>+{
> 
> class MockDiagnostics : public pp::Diagnostics
> {
>   public:
>-    MOCK_METHOD3(print,
>-        void(ID id, const pp::SourceLocation& loc, const std::string& text));
>+    MOCK_METHOD3(print, void(ID id, const pp::SourceLocation &loc, const std::string &text));
> };
> 
>+}  // namespace angle
>+
> #endif  // PREPROCESSOR_TESTS_MOCK_DIAGNOSTICS_H_
>diff --git a/Source/ThirdParty/ANGLE/src/tests/preprocessor_tests/MockDirectiveHandler.h b/Source/ThirdParty/ANGLE/src/tests/preprocessor_tests/MockDirectiveHandler.h
>index 7560adde416..a2008badc73 100644
>--- a/Source/ThirdParty/ANGLE/src/tests/preprocessor_tests/MockDirectiveHandler.h
>+++ b/Source/ThirdParty/ANGLE/src/tests/preprocessor_tests/MockDirectiveHandler.h
>@@ -7,28 +7,31 @@
> #ifndef PREPROCESSOR_TESTS_MOCK_DIRECTIVE_HANDLER_H_
> #define PREPROCESSOR_TESTS_MOCK_DIRECTIVE_HANDLER_H_
> 
>-#include "gmock/gmock.h"
> #include "compiler/preprocessor/DirectiveHandlerBase.h"
>+#include "gmock/gmock.h"
>+
>+namespace angle
>+{
> 
> class MockDirectiveHandler : public pp::DirectiveHandler
> {
>   public:
>-    MOCK_METHOD2(handleError,
>-        void(const pp::SourceLocation& loc, const std::string& msg));
>+    MOCK_METHOD2(handleError, void(const pp::SourceLocation &loc, const std::string &msg));
> 
>     MOCK_METHOD4(handlePragma,
>-        void(const pp::SourceLocation& loc,
>-             const std::string& name,
>-             const std::string& value,
>-             bool stdgl));
>+                 void(const pp::SourceLocation &loc,
>+                      const std::string &name,
>+                      const std::string &value,
>+                      bool stdgl));
> 
>     MOCK_METHOD3(handleExtension,
>-        void(const pp::SourceLocation& loc,
>-             const std::string& name,
>-             const std::string& behavior));
>+                 void(const pp::SourceLocation &loc,
>+                      const std::string &name,
>+                      const std::string &behavior));
> 
>-    MOCK_METHOD2(handleVersion,
>-        void(const pp::SourceLocation& loc, int version));
>+    MOCK_METHOD2(handleVersion, void(const pp::SourceLocation &loc, int version));
> };
> 
>+}  // namespace angle
>+
> #endif  // PREPROCESSOR_TESTS_MOCK_DIRECTIVE_HANDLER_H_
>diff --git a/Source/ThirdParty/ANGLE/src/tests/preprocessor_tests/PreprocessorTest.cpp b/Source/ThirdParty/ANGLE/src/tests/preprocessor_tests/PreprocessorTest.cpp
>index ccb21a55e22..71fde76c670 100644
>--- a/Source/ThirdParty/ANGLE/src/tests/preprocessor_tests/PreprocessorTest.cpp
>+++ b/Source/ThirdParty/ANGLE/src/tests/preprocessor_tests/PreprocessorTest.cpp
>@@ -7,6 +7,9 @@
> #include "PreprocessorTest.h"
> #include "compiler/preprocessor/Token.h"
> 
>+namespace angle
>+{
>+
> void SimplePreprocessorTest::preprocess(const char *input,
>                                         std::stringstream *output,
>                                         pp::Preprocessor *preprocessor)
>@@ -37,12 +40,13 @@ void SimplePreprocessorTest::preprocess(const char *input, const pp::Preprocesso
> 
> void SimplePreprocessorTest::preprocess(const char *input)
> {
>-    preprocess(input, pp::PreprocessorSettings());
>+    preprocess(input, pp::PreprocessorSettings(SH_GLES2_SPEC));
> }
> 
> void SimplePreprocessorTest::preprocess(const char *input, const char *expected)
> {
>-    pp::Preprocessor preprocessor(&mDiagnostics, &mDirectiveHandler, pp::PreprocessorSettings());
>+    pp::Preprocessor preprocessor(&mDiagnostics, &mDirectiveHandler,
>+                                  pp::PreprocessorSettings(SH_GLES2_SPEC));
>     std::stringstream output;
>     preprocess(input, &output, &preprocessor);
> 
>@@ -52,7 +56,8 @@ void SimplePreprocessorTest::preprocess(const char *input, const char *expected)
> 
> void SimplePreprocessorTest::lexSingleToken(const char *input, pp::Token *token)
> {
>-    pp::Preprocessor preprocessor(&mDiagnostics, &mDirectiveHandler, pp::PreprocessorSettings());
>+    pp::Preprocessor preprocessor(&mDiagnostics, &mDirectiveHandler,
>+                                  pp::PreprocessorSettings(SH_GLES2_SPEC));
>     ASSERT_TRUE(preprocessor.init(1, &input, nullptr));
>     preprocessor.lex(token);
> }
>@@ -61,7 +66,10 @@ void SimplePreprocessorTest::lexSingleToken(size_t count,
>                                             const char *const input[],
>                                             pp::Token *token)
> {
>-    pp::Preprocessor preprocessor(&mDiagnostics, &mDirectiveHandler, pp::PreprocessorSettings());
>+    pp::Preprocessor preprocessor(&mDiagnostics, &mDirectiveHandler,
>+                                  pp::PreprocessorSettings(SH_GLES2_SPEC));
>     ASSERT_TRUE(preprocessor.init(count, input, nullptr));
>     preprocessor.lex(token);
>-}
>\ No newline at end of file
>+}
>+
>+}  // namespace angle
>diff --git a/Source/ThirdParty/ANGLE/src/tests/preprocessor_tests/PreprocessorTest.h b/Source/ThirdParty/ANGLE/src/tests/preprocessor_tests/PreprocessorTest.h
>index ead16f79fea..14beff23e0a 100644
>--- a/Source/ThirdParty/ANGLE/src/tests/preprocessor_tests/PreprocessorTest.h
>+++ b/Source/ThirdParty/ANGLE/src/tests/preprocessor_tests/PreprocessorTest.h
>@@ -9,17 +9,20 @@
> #include "MockDiagnostics.h"
> #include "MockDirectiveHandler.h"
> #include "compiler/preprocessor/Preprocessor.h"
>+#include "compiler/preprocessor/SourceLocation.h"
> 
> #ifndef PREPROCESSOR_TESTS_PREPROCESSOR_TEST_H_
>-#define PREPROCESSOR_TESTS_PREPROCESSOR_TEST_H_
>+#    define PREPROCESSOR_TESTS_PREPROCESSOR_TEST_H_
>+
>+namespace angle
>+{
> 
> class PreprocessorTest : public testing::Test
> {
>   protected:
>-    PreprocessorTest()
>-        : mPreprocessor(&mDiagnostics, &mDirectiveHandler, pp::PreprocessorSettings())
>-    {
>-    }
>+    PreprocessorTest(ShShaderSpec shaderSpec)
>+        : mPreprocessor(&mDiagnostics, &mDirectiveHandler, pp::PreprocessorSettings(shaderSpec))
>+    {}
> 
>     MockDiagnostics mDiagnostics;
>     MockDirectiveHandler mDirectiveHandler;
>@@ -47,4 +50,11 @@ class SimplePreprocessorTest : public testing::Test
>     void preprocess(const char *input, std::stringstream *output, pp::Preprocessor *preprocessor);
> };
> 
>+}  // namespace angle
>+
>+inline std::ostream &operator<<(std::ostream &os, const angle::pp::SourceLocation &sourceLoc)
>+{
>+    return os << "(" << sourceLoc.file << ":" << sourceLoc.line << ")";
>+}
>+
> #endif  // PREPROCESSOR_TESTS_PREPROCESSOR_TEST_H_
>diff --git a/Source/ThirdParty/ANGLE/src/tests/preprocessor_tests/char_test.cpp b/Source/ThirdParty/ANGLE/src/tests/preprocessor_tests/char_test.cpp
>index 641ef2cf8c1..4d7e72313a1 100644
>--- a/Source/ThirdParty/ANGLE/src/tests/preprocessor_tests/char_test.cpp
>+++ b/Source/ThirdParty/ANGLE/src/tests/preprocessor_tests/char_test.cpp
>@@ -10,40 +10,41 @@
> #include "PreprocessorTest.h"
> #include "compiler/preprocessor/Token.h"
> 
>-class CharTest : public PreprocessorTest,
>-                 public testing::WithParamInterface<int>
>+namespace angle
> {
>+
>+class CharTest : public PreprocessorTest, public testing::WithParamInterface<int>
>+{
>+  public:
>+    CharTest() : PreprocessorTest(SH_GLES2_SPEC) {}
> };
> 
>-static const char kPunctuators[] = {
>-    '.', '+', '-', '/', '*', '%', '<', '>', '[', ']', '(', ')', '{', '}',
>-    '^', '|', '&', '~', '=', '!', ':', ';', ',', '?'};
>-static const int kNumPunctuators =
>-    sizeof(kPunctuators) / sizeof(kPunctuators[0]);
>+static const char kPunctuators[] = {'.', '+', '-', '/', '*', '%', '<', '>', '[', ']', '(', ')',
>+                                    '{', '}', '^', '|', '&', '~', '=', '!', ':', ';', ',', '?'};
>+static const int kNumPunctuators = sizeof(kPunctuators) / sizeof(kPunctuators[0]);
> 
> bool isPunctuator(char c)
> {
>-    static const char* kPunctuatorBeg = kPunctuators;
>-    static const char* kPunctuatorEnd = kPunctuators + kNumPunctuators;
>+    static const char *kPunctuatorBeg = kPunctuators;
>+    static const char *kPunctuatorEnd = kPunctuators + kNumPunctuators;
>     return std::find(kPunctuatorBeg, kPunctuatorEnd, c) != kPunctuatorEnd;
> }
> 
> static const char kWhitespaces[] = {' ', '\t', '\v', '\f', '\n', '\r'};
>-static const int kNumWhitespaces =
>-    sizeof(kWhitespaces) / sizeof(kWhitespaces[0]);
>+static const int kNumWhitespaces = sizeof(kWhitespaces) / sizeof(kWhitespaces[0]);
> 
> bool isWhitespace(char c)
> {
>-    static const char* kWhitespaceBeg = kWhitespaces;
>-    static const char* kWhitespaceEnd = kWhitespaces + kNumWhitespaces;
>+    static const char *kWhitespaceBeg = kWhitespaces;
>+    static const char *kWhitespaceEnd = kWhitespaces + kNumWhitespaces;
>     return std::find(kWhitespaceBeg, kWhitespaceEnd, c) != kWhitespaceEnd;
> }
> 
> TEST_P(CharTest, Identified)
> {
>     std::string str(1, static_cast<char>(GetParam()));
>-    const char* cstr = str.c_str();
>-    int length = 1;
>+    const char *cstr = str.c_str();
>+    int length       = 1;
> 
>     // Note that we pass the length param as well because the invalid
>     // string may contain the null character.
>@@ -56,21 +57,20 @@ TEST_P(CharTest, Identified)
>     {
>         // Lone '#' is ignored.
>     }
>-    else if ((str[0] == '_') ||
>-             ((str[0] >= 'a') && (str[0] <= 'z')) ||
>+    else if ((str[0] == '_') || ((str[0] >= 'a') && (str[0] <= 'z')) ||
>              ((str[0] >= 'A') && (str[0] <= 'Z')))
>     {
>-        expectedType = pp::Token::IDENTIFIER;
>+        expectedType  = pp::Token::IDENTIFIER;
>         expectedValue = str;
>     }
>     else if (str[0] >= '0' && str[0] <= '9')
>     {
>-        expectedType = pp::Token::CONST_INT;
>+        expectedType  = pp::Token::CONST_INT;
>         expectedValue = str;
>     }
>     else if (isPunctuator(str[0]))
>     {
>-        expectedType = str[0];
>+        expectedType  = str[0];
>         expectedValue = str;
>     }
>     else if (isWhitespace(str[0]))
>@@ -81,18 +81,17 @@ TEST_P(CharTest, Identified)
>     {
>         // Everything else is invalid.
>         using testing::_;
>-        EXPECT_CALL(mDiagnostics,
>-            print(pp::Diagnostics::PP_INVALID_CHARACTER, _, str));
>+        EXPECT_CALL(mDiagnostics, print(pp::Diagnostics::PP_INVALID_CHARACTER, _, str));
>     }
> 
>     pp::Token token;
>     mPreprocessor.lex(&token);
>     EXPECT_EQ(expectedType, token.type);
>     EXPECT_EQ(expectedValue, token.text);
>-};
>+}
> 
> // Note +1 for the max-value in range. It is there because the max-value
> // not included in the range.
>-INSTANTIATE_TEST_CASE_P(All, CharTest,
>-                        testing::Range(CHAR_MIN, CHAR_MAX + 1));
>+INSTANTIATE_TEST_SUITE_P(All, CharTest, testing::Range(CHAR_MIN, CHAR_MAX + 1));
> 
>+}  // namespace angle
>diff --git a/Source/ThirdParty/ANGLE/src/tests/preprocessor_tests/comment_test.cpp b/Source/ThirdParty/ANGLE/src/tests/preprocessor_tests/comment_test.cpp
>index 2501896dc48..78d320689db 100644
>--- a/Source/ThirdParty/ANGLE/src/tests/preprocessor_tests/comment_test.cpp
>+++ b/Source/ThirdParty/ANGLE/src/tests/preprocessor_tests/comment_test.cpp
>@@ -7,41 +7,44 @@
> #include "PreprocessorTest.h"
> #include "compiler/preprocessor/Token.h"
> 
>-class CommentTest : public SimplePreprocessorTest, public testing::WithParamInterface<const char *>
>+namespace angle
> {
>-};
>+
>+class CommentTest : public SimplePreprocessorTest, public testing::WithParamInterface<const char *>
>+{};
> 
> TEST_P(CommentTest, CommentIgnored)
> {
>-    const char* str = GetParam();
>+    const char *str = GetParam();
> 
>     pp::Token token;
>     lexSingleToken(str, &token);
>     EXPECT_EQ(pp::Token::LAST, token.type);
> }
> 
>-INSTANTIATE_TEST_CASE_P(LineComment, CommentTest,
>-                        testing::Values("//foo\n", // With newline.
>-                                        "//foo",   // Without newline.
>-                                        "//**/",   // Nested block comment.
>-                                        "////",    // Nested line comment.
>-                                        "//\""));  // Invalid character.  
>-
>-INSTANTIATE_TEST_CASE_P(BlockComment, CommentTest,
>-                        testing::Values("/*foo*/",
>-                                        "/*foo\n*/", // With newline.
>-                                        "/*//*/",    // Nested line comment.
>-                                        "/*/**/",    // Nested block comment.
>-                                        "/***/",     // With lone '*'.
>-                                        "/*\"*/"));  // Invalid character.
>+INSTANTIATE_TEST_SUITE_P(LineComment,
>+                         CommentTest,
>+                         testing::Values("//foo\n",  // With newline.
>+                                         "//foo",    // Without newline.
>+                                         "//**/",    // Nested block comment.
>+                                         "////",     // Nested line comment.
>+                                         "//\""));   // Invalid character.
>+
>+INSTANTIATE_TEST_SUITE_P(BlockComment,
>+                         CommentTest,
>+                         testing::Values("/*foo*/",
>+                                         "/*foo\n*/",  // With newline.
>+                                         "/*//*/",     // Nested line comment.
>+                                         "/*/**/",     // Nested block comment.
>+                                         "/***/",      // With lone '*'.
>+                                         "/*\"*/"));   // Invalid character.
> 
> class BlockCommentTest : public SimplePreprocessorTest
>-{
>-};
>+{};
> 
> TEST_F(BlockCommentTest, CommentReplacedWithSpace)
> {
>-    const char* str = "/*foo*/bar";
>+    const char *str = "/*foo*/bar";
> 
>     pp::Token token;
>     lexSingleToken(str, &token);
>@@ -52,10 +55,12 @@ TEST_F(BlockCommentTest, CommentReplacedWithSpace)
> 
> TEST_F(BlockCommentTest, UnterminatedComment)
> {
>-    const char* str = "/*foo";
>+    const char *str = "/*foo";
> 
>     using testing::_;
>     EXPECT_CALL(mDiagnostics, print(pp::Diagnostics::PP_EOF_IN_COMMENT, _, _));
> 
>     preprocess(str);
> }
>+
>+}  // namespace angle
>diff --git a/Source/ThirdParty/ANGLE/src/tests/preprocessor_tests/define_test.cpp b/Source/ThirdParty/ANGLE/src/tests/preprocessor_tests/define_test.cpp
>index d5e7ac754a3..16dc81210a4 100644
>--- a/Source/ThirdParty/ANGLE/src/tests/preprocessor_tests/define_test.cpp
>+++ b/Source/ThirdParty/ANGLE/src/tests/preprocessor_tests/define_test.cpp
>@@ -9,72 +9,70 @@
> #include "PreprocessorTest.h"
> #include "compiler/preprocessor/Token.h"
> 
>+namespace angle
>+{
>+
> using testing::_;
> 
> class DefineTest : public SimplePreprocessorTest
>-{
>-};
>+{};
> 
> TEST_F(DefineTest, NonIdentifier)
> {
>-    const char* input = "#define 2 foo\n"
>-                        "2\n";
>-    const char* expected = "\n"
>-                           "2\n";
>+    const char *input =
>+        "#define 2 foo\n"
>+        "2\n";
>+    const char *expected =
>+        "\n"
>+        "2\n";
> 
>     EXPECT_CALL(mDiagnostics,
>-                print(pp::Diagnostics::PP_UNEXPECTED_TOKEN,
>-                      pp::SourceLocation(0, 1),
>-                      "2"));
>+                print(pp::Diagnostics::PP_UNEXPECTED_TOKEN, pp::SourceLocation(0, 1), "2"));
> 
>     preprocess(input, expected);
>-};
>+}
> 
> TEST_F(DefineTest, RedefinePredefined)
> {
>-    const char* input = "#define __LINE__ 10\n"
>-                        "__LINE__\n"
>-                        "#define __FILE__ 20\n"
>-                        "__FILE__\n"
>-                        "#define __VERSION__ 200\n"
>-                        "__VERSION__\n"
>-                        "#define GL_ES 0\n"
>-                        "GL_ES\n";
>-    const char* expected = "\n"
>-                           "2\n"
>-                           "\n"
>-                           "0\n"
>-                           "\n"
>-                           "100\n"
>-                           "\n"
>-                           "1\n";
>+    const char *input =
>+        "#define __LINE__ 10\n"
>+        "__LINE__\n"
>+        "#define __FILE__ 20\n"
>+        "__FILE__\n"
>+        "#define __VERSION__ 200\n"
>+        "__VERSION__\n"
>+        "#define GL_ES 0\n"
>+        "GL_ES\n";
>+    const char *expected =
>+        "\n"
>+        "2\n"
>+        "\n"
>+        "0\n"
>+        "\n"
>+        "100\n"
>+        "\n"
>+        "1\n";
> 
>-    EXPECT_CALL(mDiagnostics,
>-                print(pp::Diagnostics::PP_MACRO_PREDEFINED_REDEFINED,
>-                      pp::SourceLocation(0, 1),
>-                      "__LINE__"));
>-    EXPECT_CALL(mDiagnostics,
>-                print(pp::Diagnostics::PP_MACRO_PREDEFINED_REDEFINED,
>-                      pp::SourceLocation(0, 3),
>-                      "__FILE__"));
>-    EXPECT_CALL(mDiagnostics,
>-                print(pp::Diagnostics::PP_MACRO_PREDEFINED_REDEFINED,
>-                      pp::SourceLocation(0, 5),
>-                      "__VERSION__"));
>-    EXPECT_CALL(mDiagnostics,
>-                print(pp::Diagnostics::PP_MACRO_PREDEFINED_REDEFINED,
>-                      pp::SourceLocation(0, 7),
>-                      "GL_ES"));
>+    EXPECT_CALL(mDiagnostics, print(pp::Diagnostics::PP_MACRO_PREDEFINED_REDEFINED,
>+                                    pp::SourceLocation(0, 1), "__LINE__"));
>+    EXPECT_CALL(mDiagnostics, print(pp::Diagnostics::PP_MACRO_PREDEFINED_REDEFINED,
>+                                    pp::SourceLocation(0, 3), "__FILE__"));
>+    EXPECT_CALL(mDiagnostics, print(pp::Diagnostics::PP_MACRO_PREDEFINED_REDEFINED,
>+                                    pp::SourceLocation(0, 5), "__VERSION__"));
>+    EXPECT_CALL(mDiagnostics, print(pp::Diagnostics::PP_MACRO_PREDEFINED_REDEFINED,
>+                                    pp::SourceLocation(0, 7), "GL_ES"));
> 
>     preprocess(input, expected);
> }
> 
> TEST_F(DefineTest, ReservedUnderScore1)
> {
>-    const char* input = "#define __foo bar\n"
>-                        "__foo\n";
>-    const char* expected = "\n"
>-                           "bar\n";
>+    const char *input =
>+        "#define __foo bar\n"
>+        "__foo\n";
>+    const char *expected =
>+        "\n"
>+        "bar\n";
> 
>     EXPECT_CALL(mDiagnostics, print(pp::Diagnostics::PP_WARNING_MACRO_NAME_RESERVED,
>                                     pp::SourceLocation(0, 1), "__foo"));
>@@ -84,10 +82,12 @@ TEST_F(DefineTest, ReservedUnderScore1)
> 
> TEST_F(DefineTest, ReservedUnderScore2)
> {
>-    const char* input = "#define foo__bar baz\n"
>-                        "foo__bar\n";
>-    const char* expected = "\n"
>-                           "baz\n";
>+    const char *input =
>+        "#define foo__bar baz\n"
>+        "foo__bar\n";
>+    const char *expected =
>+        "\n"
>+        "baz\n";
> 
>     EXPECT_CALL(mDiagnostics, print(pp::Diagnostics::PP_WARNING_MACRO_NAME_RESERVED,
>                                     pp::SourceLocation(0, 1), "foo__bar"));
>@@ -97,27 +97,29 @@ TEST_F(DefineTest, ReservedUnderScore2)
> 
> TEST_F(DefineTest, ReservedGL)
> {
>-    const char* input = "#define GL_foo bar\n"
>-                        "GL_foo\n";
>-    const char* expected = "\n"
>-                           "GL_foo\n";
>+    const char *input =
>+        "#define GL_foo bar\n"
>+        "GL_foo\n";
>+    const char *expected =
>+        "\n"
>+        "GL_foo\n";
> 
>     EXPECT_CALL(mDiagnostics,
>-                print(pp::Diagnostics::PP_MACRO_NAME_RESERVED,
>-                      pp::SourceLocation(0, 1),
>-                      "GL_foo"));
>+                print(pp::Diagnostics::PP_MACRO_NAME_RESERVED, pp::SourceLocation(0, 1), "GL_foo"));
> 
>     preprocess(input, expected);
> }
> 
> TEST_F(DefineTest, ObjRedefineValid)
> {
>-    const char* input = "#define foo (1-1)\n"
>-                        "#define foo /* whitespace */ (1-1) /* other */ \n"
>-                        "foo\n";
>-    const char* expected = "\n"
>-                           "\n"
>-                           "(1-1)\n";
>+    const char *input =
>+        "#define foo (1-1)\n"
>+        "#define foo /* whitespace */ (1-1) /* other */ \n"
>+        "foo\n";
>+    const char *expected =
>+        "\n"
>+        "\n"
>+        "(1-1)\n";
>     // No error or warning.
>     using testing::_;
>     EXPECT_CALL(mDiagnostics, print(_, _, _)).Times(0);
>@@ -127,29 +129,31 @@ TEST_F(DefineTest, ObjRedefineValid)
> 
> TEST_F(DefineTest, ObjRedefineInvalid)
> {
>-    const char* input = "#define foo (0)\n"
>-                        "#define foo (1-1)\n"
>-                        "foo\n";
>-    const char* expected = "\n"
>-                           "\n"
>-                           "(0)\n";
>+    const char *input =
>+        "#define foo (0)\n"
>+        "#define foo (1-1)\n"
>+        "foo\n";
>+    const char *expected =
>+        "\n"
>+        "\n"
>+        "(0)\n";
> 
>     EXPECT_CALL(mDiagnostics,
>-                print(pp::Diagnostics::PP_MACRO_REDEFINED,
>-                      pp::SourceLocation(0, 2),
>-                      "foo"));
>+                print(pp::Diagnostics::PP_MACRO_REDEFINED, pp::SourceLocation(0, 2), "foo"));
> 
>     preprocess(input, expected);
> }
> 
> TEST_F(DefineTest, FuncRedefineValid)
> {
>-    const char* input = "#define foo(a) ( a )\n"
>-                        "#define foo( a )( /* whitespace */ a /* other */ )\n"
>-                        "foo(b)\n";
>-    const char* expected = "\n"
>-                           "\n"
>-                           "( b )\n";
>+    const char *input =
>+        "#define foo(a) ( a )\n"
>+        "#define foo( a )( /* whitespace */ a /* other */ )\n"
>+        "foo(b)\n";
>+    const char *expected =
>+        "\n"
>+        "\n"
>+        "( b )\n";
>     // No error or warning.
>     using testing::_;
>     EXPECT_CALL(mDiagnostics, print(_, _, _)).Times(0);
>@@ -159,632 +163,710 @@ TEST_F(DefineTest, FuncRedefineValid)
> 
> TEST_F(DefineTest, FuncRedefineInvalid)
> {
>-    const char* input = "#define foo(b) ( a )\n"
>-                        "#define foo(b) ( b )\n"
>-                        "foo(1)\n";
>-    const char* expected = "\n"
>-                           "\n"
>-                           "( a )\n";
>+    const char *input =
>+        "#define foo(b) ( a )\n"
>+        "#define foo(b) ( b )\n"
>+        "foo(1)\n";
>+    const char *expected =
>+        "\n"
>+        "\n"
>+        "( a )\n";
> 
>     EXPECT_CALL(mDiagnostics,
>-                print(pp::Diagnostics::PP_MACRO_REDEFINED,
>-                      pp::SourceLocation(0, 2),
>-                      "foo"));
>+                print(pp::Diagnostics::PP_MACRO_REDEFINED, pp::SourceLocation(0, 2), "foo"));
> 
>     preprocess(input, expected);
> }
> 
> TEST_F(DefineTest, ObjBasic)
> {
>-    const char* input = "#define foo 1\n"
>-                        "foo\n";
>-    const char* expected = "\n"
>-                           "1\n";
>+    const char *input =
>+        "#define foo 1\n"
>+        "foo\n";
>+    const char *expected =
>+        "\n"
>+        "1\n";
> 
>     preprocess(input, expected);
> }
> 
> TEST_F(DefineTest, ObjEmpty)
> {
>-    const char* input = "#define foo\n"
>-                        "foo\n";
>-    const char* expected = "\n"
>-                           "\n";
>+    const char *input =
>+        "#define foo\n"
>+        "foo\n";
>+    const char *expected =
>+        "\n"
>+        "\n";
> 
>     preprocess(input, expected);
> }
> 
> TEST_F(DefineTest, ObjChain)
> {
>-    const char* input = "#define foo 1\n"
>-                        "#define bar foo\n"
>-                        "bar\n";
>-    const char* expected = "\n"
>-                           "\n"
>-                           "1\n";
>+    const char *input =
>+        "#define foo 1\n"
>+        "#define bar foo\n"
>+        "bar\n";
>+    const char *expected =
>+        "\n"
>+        "\n"
>+        "1\n";
> 
>     preprocess(input, expected);
> }
> 
> TEST_F(DefineTest, ObjChainReverse)
> {
>-    const char* input = "#define bar foo\n"
>-                        "#define foo 1\n"
>-                        "bar\n";
>-    const char* expected = "\n"
>-                           "\n"
>-                           "1\n";
>+    const char *input =
>+        "#define bar foo\n"
>+        "#define foo 1\n"
>+        "bar\n";
>+    const char *expected =
>+        "\n"
>+        "\n"
>+        "1\n";
> 
>     preprocess(input, expected);
> }
> 
> TEST_F(DefineTest, ObjRecursive)
> {
>-    const char* input = "#define foo bar\n"
>-                        "#define bar baz\n"
>-                        "#define baz foo\n"
>-                        "foo\n"
>-                        "bar\n"
>-                        "baz\n";
>-    const char* expected = "\n"
>-                           "\n"
>-                           "\n"
>-                           "foo\n"
>-                           "bar\n"
>-                           "baz\n";
>+    const char *input =
>+        "#define foo bar\n"
>+        "#define bar baz\n"
>+        "#define baz foo\n"
>+        "foo\n"
>+        "bar\n"
>+        "baz\n";
>+    const char *expected =
>+        "\n"
>+        "\n"
>+        "\n"
>+        "foo\n"
>+        "bar\n"
>+        "baz\n";
> 
>     preprocess(input, expected);
> }
> 
> TEST_F(DefineTest, ObjCompositeChain)
> {
>-    const char* input = "#define foo 1\n"
>-                        "#define bar a foo\n"
>-                        "bar\n";
>-    const char* expected = "\n"
>-                           "\n"
>-                           "a 1\n";
>+    const char *input =
>+        "#define foo 1\n"
>+        "#define bar a foo\n"
>+        "bar\n";
>+    const char *expected =
>+        "\n"
>+        "\n"
>+        "a 1\n";
> 
>     preprocess(input, expected);
> }
> 
> TEST_F(DefineTest, ObjCompositeChainReverse)
> {
>-    const char* input = "#define bar a foo\n"
>-                        "#define foo 1\n"
>-                        "bar\n";
>-    const char* expected = "\n"
>-                           "\n"
>-                           "a 1\n";
>+    const char *input =
>+        "#define bar a foo\n"
>+        "#define foo 1\n"
>+        "bar\n";
>+    const char *expected =
>+        "\n"
>+        "\n"
>+        "a 1\n";
> 
>     preprocess(input, expected);
> }
> 
> TEST_F(DefineTest, ObjCompositeRecursive)
> {
>-    const char* input = "#define foo a bar\n"
>-                        "#define bar b baz\n"
>-                        "#define baz c foo\n"
>-                        "foo\n"
>-                        "bar\n"
>-                        "baz\n";
>-    const char* expected = "\n"
>-                           "\n"
>-                           "\n"
>-                           "a b c foo\n"
>-                           "b c a bar\n"
>-                           "c a b baz\n";
>+    const char *input =
>+        "#define foo a bar\n"
>+        "#define bar b baz\n"
>+        "#define baz c foo\n"
>+        "foo\n"
>+        "bar\n"
>+        "baz\n";
>+    const char *expected =
>+        "\n"
>+        "\n"
>+        "\n"
>+        "a b c foo\n"
>+        "b c a bar\n"
>+        "c a b baz\n";
> 
>     preprocess(input, expected);
> }
> 
> TEST_F(DefineTest, ObjChainSelfRecursive)
> {
>-    const char* input = "#define foo foo\n"
>-                        "#define bar foo\n"
>-                        "bar\n";
>-    const char* expected = "\n"
>-                           "\n"
>-                           "foo\n";
>+    const char *input =
>+        "#define foo foo\n"
>+        "#define bar foo\n"
>+        "bar\n";
>+    const char *expected =
>+        "\n"
>+        "\n"
>+        "foo\n";
> 
>     preprocess(input, expected);
> }
> 
> TEST_F(DefineTest, ObjectLikeWithParens)
> {
>-    const char* input = "#define foo ()1\n"
>-                        "foo()\n"
>-                        "#define bar ()2\n"
>-                        "bar()\n";
>-    const char* expected = "\n"
>-                           "()1()\n"
>-                           "\n"
>-                           "()2()\n";
>+    const char *input =
>+        "#define foo ()1\n"
>+        "foo()\n"
>+        "#define bar ()2\n"
>+        "bar()\n";
>+    const char *expected =
>+        "\n"
>+        "()1()\n"
>+        "\n"
>+        "()2()\n";
> 
>     preprocess(input, expected);
> }
> 
> TEST_F(DefineTest, FuncEmpty)
> {
>-    const char* input = "#define foo()\n"
>-                        "foo()\n";
>-    const char* expected = "\n"
>-                           "\n";
>+    const char *input =
>+        "#define foo()\n"
>+        "foo()\n";
>+    const char *expected =
>+        "\n"
>+        "\n";
> 
>     preprocess(input, expected);
> }
> 
> TEST_F(DefineTest, FuncNoArgs)
> {
>-    const char* input = "#define foo() bar\n"
>-                        "foo()\n";
>-    const char* expected = "\n"
>-                           "bar\n";
>+    const char *input =
>+        "#define foo() bar\n"
>+        "foo()\n";
>+    const char *expected =
>+        "\n"
>+        "bar\n";
> 
>     preprocess(input, expected);
> }
> 
> TEST_F(DefineTest, FuncOneArgUnused)
> {
>-    const char* input = "#define foo(x) 1\n"
>-                        "foo(bar)\n";
>-    const char* expected = "\n"
>-                           "1\n";
>+    const char *input =
>+        "#define foo(x) 1\n"
>+        "foo(bar)\n";
>+    const char *expected =
>+        "\n"
>+        "1\n";
> 
>     preprocess(input, expected);
> }
> 
> TEST_F(DefineTest, FuncTwoArgsUnused)
> {
>-    const char* input = "#define foo(x,y) 1\n"
>-                        "foo(bar,baz)\n";
>-    const char* expected = "\n"
>-                           "1\n";
>+    const char *input =
>+        "#define foo(x,y) 1\n"
>+        "foo(bar,baz)\n";
>+    const char *expected =
>+        "\n"
>+        "1\n";
> 
>     preprocess(input, expected);
> }
> 
> TEST_F(DefineTest, FuncOneArg)
> {
>-    const char* input = "#define foo(x) ((x)+1)\n"
>-                        "foo(bar)\n";
>-    const char* expected = "\n"
>-                           "((bar)+1)\n";
>+    const char *input =
>+        "#define foo(x) ((x)+1)\n"
>+        "foo(bar)\n";
>+    const char *expected =
>+        "\n"
>+        "((bar)+1)\n";
> 
>     preprocess(input, expected);
> }
> 
> TEST_F(DefineTest, FuncTwoArgs)
> {
>-    const char* input = "#define foo(x,y) ((x)*(y))\n"
>-                        "foo(bar,baz)\n";
>-    const char* expected = "\n"
>-                           "((bar)*(baz))\n";
>+    const char *input =
>+        "#define foo(x,y) ((x)*(y))\n"
>+        "foo(bar,baz)\n";
>+    const char *expected =
>+        "\n"
>+        "((bar)*(baz))\n";
> 
>     preprocess(input, expected);
> }
> 
> TEST_F(DefineTest, FuncEmptyArgs)
> {
>-    const char* input = "#define zero() pass\n"
>-                        "#define one(x) pass\n"
>-                        "#define two(x,y) pass\n"
>-                        "zero()\n"
>-                        "one()\n"
>-                        "two(,)\n";
>-    const char* expected = "\n"
>-                           "\n"
>-                           "\n"
>-                           "pass\n"
>-                           "pass\n"
>-                           "pass\n";
>+    const char *input =
>+        "#define zero() pass\n"
>+        "#define one(x) pass\n"
>+        "#define two(x,y) pass\n"
>+        "zero()\n"
>+        "one()\n"
>+        "two(,)\n";
>+    const char *expected =
>+        "\n"
>+        "\n"
>+        "\n"
>+        "pass\n"
>+        "pass\n"
>+        "pass\n";
> 
>     preprocess(input, expected);
> }
> 
> TEST_F(DefineTest, FuncMacroAsParam)
> {
>-    const char* input = "#define x 0\n"
>-                        "#define foo(x) x\n"
>-                        "foo(1)\n";
>-    const char* expected = "\n"
>-                           "\n"
>-                           "1\n";
>+    const char *input =
>+        "#define x 0\n"
>+        "#define foo(x) x\n"
>+        "foo(1)\n";
>+    const char *expected =
>+        "\n"
>+        "\n"
>+        "1\n";
> 
>     preprocess(input, expected);
> }
> 
> TEST_F(DefineTest, FuncOneArgMulti)
> {
>-    const char* input = "#define foo(x) (x)\n"
>-                        "foo(this is a multi-word argument)\n";
>-    const char* expected = "\n"
>-                           "(this is a multi-word argument)\n";
>+    const char *input =
>+        "#define foo(x) (x)\n"
>+        "foo(this is a multi-word argument)\n";
>+    const char *expected =
>+        "\n"
>+        "(this is a multi-word argument)\n";
> 
>     preprocess(input, expected);
> }
> 
> TEST_F(DefineTest, FuncTwoArgsMulti)
> {
>-    const char* input = "#define foo(x,y) x,two fish,red fish,y\n"
>-                        "foo(one fish, blue fish)\n";
>-    const char* expected = "\n"
>-                           "one fish,two fish,red fish,blue fish\n";
>+    const char *input =
>+        "#define foo(x,y) x,two fish,red fish,y\n"
>+        "foo(one fish, blue fish)\n";
>+    const char *expected =
>+        "\n"
>+        "one fish,two fish,red fish,blue fish\n";
> 
>     preprocess(input, expected);
> }
> 
> TEST_F(DefineTest, FuncCompose)
> {
>-    const char* input = "#define bar(x) (1+(x))\n"
>-                        "#define foo(y) (2*(y))\n"
>-                        "foo(bar(3))\n";
>-    const char* expected = "\n"
>-                           "\n"
>-                           "(2*((1+(3))))\n";
>+    const char *input =
>+        "#define bar(x) (1+(x))\n"
>+        "#define foo(y) (2*(y))\n"
>+        "foo(bar(3))\n";
>+    const char *expected =
>+        "\n"
>+        "\n"
>+        "(2*((1+(3))))\n";
> 
>     preprocess(input, expected);
> }
> 
> TEST_F(DefineTest, FuncArgWithParens)
> {
>-    const char* input = "#define foo(x) (x)\n"
>-                        "foo(argument(with parens) FTW)\n";
>-    const char* expected = "\n"
>-                           "(argument(with parens) FTW)\n";
>+    const char *input =
>+        "#define foo(x) (x)\n"
>+        "foo(argument(with parens) FTW)\n";
>+    const char *expected =
>+        "\n"
>+        "(argument(with parens) FTW)\n";
> 
>     preprocess(input, expected);
> }
> 
> TEST_F(DefineTest, FuncMacroAsNonMacro)
> {
>-    const char* input = "#define foo(bar) bar\n"
>-                        "foo bar\n";
>-    const char* expected = "\n"
>-                           "foo bar\n";
>+    const char *input =
>+        "#define foo(bar) bar\n"
>+        "foo bar\n";
>+    const char *expected =
>+        "\n"
>+        "foo bar\n";
> 
>     preprocess(input, expected);
> }
> 
> TEST_F(DefineTest, FuncExtraNewlines)
> {
>-    const char* input = "#define foo(a) (a)\n"
>-                        "foo\n"
>-                        "(\n"
>-                        "1\n"
>-                        ")\n";
>-    const char* expected = "\n"
>-                           "\n"
>-                           "\n"
>-                           "\n"
>-                           "(1)\n";
>+    const char *input =
>+        "#define foo(a) (a)\n"
>+        "foo\n"
>+        "(\n"
>+        "1\n"
>+        ")\n";
>+    const char *expected =
>+        "\n"
>+        "\n"
>+        "\n"
>+        "\n"
>+        "(1)\n";
> 
>     preprocess(input, expected);
> }
> 
> TEST_F(DefineTest, ChainObjToFunc)
> {
>-    const char* input = "#define foo() pass\n"
>-                        "#define bar foo()\n"
>-                        "bar\n";
>-    const char* expected = "\n"
>-                           "\n"
>-                           "pass\n";
>+    const char *input =
>+        "#define foo() pass\n"
>+        "#define bar foo()\n"
>+        "bar\n";
>+    const char *expected =
>+        "\n"
>+        "\n"
>+        "pass\n";
> 
>     preprocess(input, expected);
> }
> 
> TEST_F(DefineTest, ChainObjToNonFunc)
> {
>-    const char* input = "#define pass() fail\n"
>-                        "#define bar pass\n"
>-                        "bar\n";
>-    const char* expected = "\n"
>-                           "\n"
>-                           "pass\n";
>+    const char *input =
>+        "#define pass() fail\n"
>+        "#define bar pass\n"
>+        "bar\n";
>+    const char *expected =
>+        "\n"
>+        "\n"
>+        "pass\n";
> 
>     preprocess(input, expected);
> }
> 
> TEST_F(DefineTest, ChainObjToFuncWithArgs)
> {
>-    const char* input = "#define foo(fail) fail\n"
>-                        "#define bar foo(pass)\n"
>-                        "bar\n";
>-    const char* expected = "\n"
>-                           "\n"
>-                           "pass\n";
>+    const char *input =
>+        "#define foo(fail) fail\n"
>+        "#define bar foo(pass)\n"
>+        "bar\n";
>+    const char *expected =
>+        "\n"
>+        "\n"
>+        "pass\n";
> 
>     preprocess(input, expected);
> }
> 
> TEST_F(DefineTest, ChainObjToFuncCompose)
> {
>-    const char* input = "#define baz(fail) fail\n"
>-                        "#define bar(fail) fail\n"
>-                        "#define foo bar(baz(pass))\n"
>-                        "foo\n";
>-    const char* expected = "\n"
>-                           "\n"
>-                           "\n"
>-                           "pass\n";
>+    const char *input =
>+        "#define baz(fail) fail\n"
>+        "#define bar(fail) fail\n"
>+        "#define foo bar(baz(pass))\n"
>+        "foo\n";
>+    const char *expected =
>+        "\n"
>+        "\n"
>+        "\n"
>+        "pass\n";
> 
>     preprocess(input, expected);
> }
> 
> TEST_F(DefineTest, ChainObjToFuncParensInText1)
> {
>-    const char* input = "#define fail() pass\n"
>-                        "#define foo fail\n"
>-                        "foo()\n";
>-    const char* expected = "\n"
>-                           "\n"
>-                           "pass\n";
>+    const char *input =
>+        "#define fail() pass\n"
>+        "#define foo fail\n"
>+        "foo()\n";
>+    const char *expected =
>+        "\n"
>+        "\n"
>+        "pass\n";
> 
>     preprocess(input, expected);
> }
> 
> TEST_F(DefineTest, ChainObjToFuncParensInText2)
> {
>-    const char* input = "#define bar with,embedded,commas\n"
>-                        "#define func(x) pass\n"
>-                        "#define foo func\n"
>-                        "foo(bar)\n";
>-    const char* expected = "\n"
>-                           "\n"
>-                           "\n"
>-                           "pass\n";
>+    const char *input =
>+        "#define bar with,embedded,commas\n"
>+        "#define func(x) pass\n"
>+        "#define foo func\n"
>+        "foo(bar)\n";
>+    const char *expected =
>+        "\n"
>+        "\n"
>+        "\n"
>+        "pass\n";
> 
>     preprocess(input, expected);
> }
> 
> TEST_F(DefineTest, ChainObjToFuncMultiLevel)
> {
>-    const char* input = "#define foo(x) pass\n"
>-                        "#define bar foo\n"
>-                        "#define baz bar\n"
>-                        "#define joe baz\n"
>-                        "joe (fail)\n";
>-    const char* expected = "\n"
>-                           "\n"
>-                           "\n"
>-                           "\n"
>-                           "pass\n";
>+    const char *input =
>+        "#define foo(x) pass\n"
>+        "#define bar foo\n"
>+        "#define baz bar\n"
>+        "#define joe baz\n"
>+        "joe (fail)\n";
>+    const char *expected =
>+        "\n"
>+        "\n"
>+        "\n"
>+        "\n"
>+        "pass\n";
> 
>     preprocess(input, expected);
> }
> 
> TEST_F(DefineTest, ObjToFuncRecursive)
> {
>-    const char* input = "#define A(a,b) B(a,b)\n"
>-                        "#define C A(0,C)\n"
>-                        "C\n";
>-    const char* expected = "\n"
>-                           "\n"
>-                           "B(0,C)\n";
>+    const char *input =
>+        "#define A(a,b) B(a,b)\n"
>+        "#define C A(0,C)\n"
>+        "C\n";
>+    const char *expected =
>+        "\n"
>+        "\n"
>+        "B(0,C)\n";
> 
>     preprocess(input, expected);
> }
> 
> TEST_F(DefineTest, ChainFuncToFuncCompose)
> {
>-    const char* input = "#define baz(fail) fail\n"
>-                        "#define bar(fail) fail\n"
>-                        "#define foo() bar(baz(pass))\n"
>-                        "foo()\n";
>-    const char* expected = "\n"
>-                           "\n"
>-                           "\n"
>-                           "pass\n";
>+    const char *input =
>+        "#define baz(fail) fail\n"
>+        "#define bar(fail) fail\n"
>+        "#define foo() bar(baz(pass))\n"
>+        "foo()\n";
>+    const char *expected =
>+        "\n"
>+        "\n"
>+        "\n"
>+        "pass\n";
> 
>     preprocess(input, expected);
> }
> 
> TEST_F(DefineTest, FuncSelfRecursive)
> {
>-    const char* input = "#define foo(a) foo(2*(a))\n"
>-                        "foo(3)\n";
>-    const char* expected = "\n"
>-                           "foo(2*(3))\n";
>+    const char *input =
>+        "#define foo(a) foo(2*(a))\n"
>+        "foo(3)\n";
>+    const char *expected =
>+        "\n"
>+        "foo(2*(3))\n";
> 
>     preprocess(input, expected);
> }
> 
> TEST_F(DefineTest, FuncSelfCompose)
> {
>-    const char* input = "#define foo(a) foo(2*(a))\n"
>-                        "foo(foo(3))\n";
>-    const char* expected = "\n"
>-                           "foo(2*(foo(2*(3))))\n";
>+    const char *input =
>+        "#define foo(a) foo(2*(a))\n"
>+        "foo(foo(3))\n";
>+    const char *expected =
>+        "\n"
>+        "foo(2*(foo(2*(3))))\n";
> 
>     preprocess(input, expected);
> }
> 
> TEST_F(DefineTest, FuncSelfComposeNonFunc)
> {
>-    const char* input = "#define foo(bar) bar\n"
>-                        "foo(foo)\n";
>-    const char* expected = "\n"
>-                           "foo\n";
>+    const char *input =
>+        "#define foo(bar) bar\n"
>+        "foo(foo)\n";
>+    const char *expected =
>+        "\n"
>+        "foo\n";
> 
>     preprocess(input, expected);
> }
> 
> TEST_F(DefineTest, FuncSelfComposeNonFuncMultiTokenArg)
> {
>-    const char* input = "#define foo(bar) bar\n"
>-                        "foo(1+foo)\n";
>-    const char* expected = "\n"
>-                           "1+foo\n";
>+    const char *input =
>+        "#define foo(bar) bar\n"
>+        "foo(1+foo)\n";
>+    const char *expected =
>+        "\n"
>+        "1+foo\n";
> 
>     preprocess(input, expected);
> }
> 
> TEST_F(DefineTest, FinalizeUnexpandedMacro)
> {
>-    const char* input = "#define expand(x) expand(x once)\n"
>-                        "#define foo(x) x\n"
>-                        "foo(expand(just))\n";
>-    const char* expected = "\n"
>-                           "\n"
>-                           "expand(just once)\n";
>+    const char *input =
>+        "#define expand(x) expand(x once)\n"
>+        "#define foo(x) x\n"
>+        "foo(expand(just))\n";
>+    const char *expected =
>+        "\n"
>+        "\n"
>+        "expand(just once)\n";
> 
>     preprocess(input, expected);
> }
> 
> TEST_F(DefineTest, FuncArgWithCommas)
> {
>-    const char* input = "#define foo(x) pass\n"
>-                        "foo(argument (with,embedded, commas) -- baz)\n";
>-    const char* expected = "\n"
>-                           "pass\n";
>+    const char *input =
>+        "#define foo(x) pass\n"
>+        "foo(argument (with,embedded, commas) -- baz)\n";
>+    const char *expected =
>+        "\n"
>+        "pass\n";
> 
>     preprocess(input, expected);
> }
> 
> TEST_F(DefineTest, FuncArgObjMaroWithComma)
> {
>-    const char* input = "#define foo(a) (a)\n"
>-                        "#define bar two,words\n"
>-                        "foo(bar)\n";
>-    const char* expected = "\n"
>-                           "\n"
>-                           "(two,words)\n";
>+    const char *input =
>+        "#define foo(a) (a)\n"
>+        "#define bar two,words\n"
>+        "foo(bar)\n";
>+    const char *expected =
>+        "\n"
>+        "\n"
>+        "(two,words)\n";
> 
>     preprocess(input, expected);
> }
> 
> TEST_F(DefineTest, FuncLeftParenInMacroRightParenInText)
> {
>-    const char* input = "#define bar(a) a*2\n"
>-                        "#define foo bar(\n"
>-                        "foo b)\n";
>-    const char* expected = "\n"
>-                           "\n"
>-                           "b*2\n";
>+    const char *input =
>+        "#define bar(a) a*2\n"
>+        "#define foo bar(\n"
>+        "foo b)\n";
>+    const char *expected =
>+        "\n"
>+        "\n"
>+        "b*2\n";
> 
>     preprocess(input, expected);
> }
> 
> TEST_F(DefineTest, RepeatedArg)
> {
>-    const char* input = "#define double(x) x x\n"
>-                        "double(1)\n";
>-    const char* expected = "\n"
>-                           "1 1\n";
>+    const char *input =
>+        "#define double(x) x x\n"
>+        "double(1)\n";
>+    const char *expected =
>+        "\n"
>+        "1 1\n";
> 
>     preprocess(input, expected);
> }
> 
> TEST_F(DefineTest, FuncMissingRightParen)
> {
>-    const char* input = "#define foo(x) (2*(x))\n"
>-                        "foo(3\n";
>-    const char* expected = "\n"
>-                           "\n";
>+    const char *input =
>+        "#define foo(x) (2*(x))\n"
>+        "foo(3\n";
>+    const char *expected =
>+        "\n"
>+        "\n";
> 
>-    EXPECT_CALL(mDiagnostics,
>-                print(pp::Diagnostics::PP_MACRO_UNTERMINATED_INVOCATION,
>-                      pp::SourceLocation(0, 2),
>-                      "foo"));
>+    EXPECT_CALL(mDiagnostics, print(pp::Diagnostics::PP_MACRO_UNTERMINATED_INVOCATION,
>+                                    pp::SourceLocation(0, 2), "foo"));
> 
>     preprocess(input, expected);
> }
> 
> TEST_F(DefineTest, FuncIncorrectArgCount)
> {
>-    const char* input = "#define foo(x,y) ((x)+(y))\n"
>-                        "foo()\n"
>-                        "foo(1)\n"
>-                        "foo(1,2,3)\n";
>-    const char* expected = "\n"
>-                           "\n"
>-                           "\n"
>-                           "\n";
>+    const char *input =
>+        "#define foo(x,y) ((x)+(y))\n"
>+        "foo()\n"
>+        "foo(1)\n"
>+        "foo(1,2,3)\n";
>+    const char *expected =
>+        "\n"
>+        "\n"
>+        "\n"
>+        "\n";
> 
>     EXPECT_CALL(mDiagnostics,
>-                print(pp::Diagnostics::PP_MACRO_TOO_FEW_ARGS,
>-                      pp::SourceLocation(0, 2),
>-                      "foo"));
>+                print(pp::Diagnostics::PP_MACRO_TOO_FEW_ARGS, pp::SourceLocation(0, 2), "foo"));
>     EXPECT_CALL(mDiagnostics,
>-                print(pp::Diagnostics::PP_MACRO_TOO_FEW_ARGS,
>-                      pp::SourceLocation(0, 3),
>-                      "foo"));
>+                print(pp::Diagnostics::PP_MACRO_TOO_FEW_ARGS, pp::SourceLocation(0, 3), "foo"));
>     EXPECT_CALL(mDiagnostics,
>-                print(pp::Diagnostics::PP_MACRO_TOO_MANY_ARGS,
>-                      pp::SourceLocation(0, 4),
>-                      "foo"));
>+                print(pp::Diagnostics::PP_MACRO_TOO_MANY_ARGS, pp::SourceLocation(0, 4), "foo"));
> 
>     preprocess(input, expected);
> }
> 
> TEST_F(DefineTest, Undef)
> {
>-    const char* input = "#define foo 1\n"
>-                        "foo\n"
>-                        "#undef foo\n"
>-                        "foo\n";
>-    const char* expected = "\n"
>-                           "1\n"
>-                           "\n"
>-                           "foo\n";
>+    const char *input =
>+        "#define foo 1\n"
>+        "foo\n"
>+        "#undef foo\n"
>+        "foo\n";
>+    const char *expected =
>+        "\n"
>+        "1\n"
>+        "\n"
>+        "foo\n";
> 
>     preprocess(input, expected);
> }
> 
> TEST_F(DefineTest, UndefPredefined)
> {
>-    const char* input = "#undef __LINE__\n"
>-                        "__LINE__\n"
>-                        "#undef __FILE__\n"
>-                        "__FILE__\n"
>-                        "#undef __VERSION__\n"
>-                        "__VERSION__\n"
>-                        "#undef GL_ES\n"
>-                        "GL_ES\n";
>-    const char* expected = "\n"
>-                           "2\n"
>-                           "\n"
>-                           "0\n"
>-                           "\n"
>-                           "100\n"
>-                           "\n"
>-                           "1\n";
>+    const char *input =
>+        "#undef __LINE__\n"
>+        "__LINE__\n"
>+        "#undef __FILE__\n"
>+        "__FILE__\n"
>+        "#undef __VERSION__\n"
>+        "__VERSION__\n"
>+        "#undef GL_ES\n"
>+        "GL_ES\n";
>+    const char *expected =
>+        "\n"
>+        "2\n"
>+        "\n"
>+        "0\n"
>+        "\n"
>+        "100\n"
>+        "\n"
>+        "1\n";
> 
>-    EXPECT_CALL(mDiagnostics,
>-                print(pp::Diagnostics::PP_MACRO_PREDEFINED_UNDEFINED,
>-                      pp::SourceLocation(0, 1),
>-                      "__LINE__"));
>-    EXPECT_CALL(mDiagnostics,
>-                print(pp::Diagnostics::PP_MACRO_PREDEFINED_UNDEFINED,
>-                      pp::SourceLocation(0, 3),
>-                      "__FILE__"));
>-    EXPECT_CALL(mDiagnostics,
>-                print(pp::Diagnostics::PP_MACRO_PREDEFINED_UNDEFINED,
>-                      pp::SourceLocation(0, 5),
>-                      "__VERSION__"));
>-    EXPECT_CALL(mDiagnostics,
>-                print(pp::Diagnostics::PP_MACRO_PREDEFINED_UNDEFINED,
>-                      pp::SourceLocation(0, 7),
>-                      "GL_ES"));
>+    EXPECT_CALL(mDiagnostics, print(pp::Diagnostics::PP_MACRO_PREDEFINED_UNDEFINED,
>+                                    pp::SourceLocation(0, 1), "__LINE__"));
>+    EXPECT_CALL(mDiagnostics, print(pp::Diagnostics::PP_MACRO_PREDEFINED_UNDEFINED,
>+                                    pp::SourceLocation(0, 3), "__FILE__"));
>+    EXPECT_CALL(mDiagnostics, print(pp::Diagnostics::PP_MACRO_PREDEFINED_UNDEFINED,
>+                                    pp::SourceLocation(0, 5), "__VERSION__"));
>+    EXPECT_CALL(mDiagnostics, print(pp::Diagnostics::PP_MACRO_PREDEFINED_UNDEFINED,
>+                                    pp::SourceLocation(0, 7), "GL_ES"));
> 
>     preprocess(input, expected);
> }
> 
> TEST_F(DefineTest, UndefRedefine)
> {
>-    const char* input = "#define foo 1\n"
>-                        "foo\n"
>-                        "#undef foo\n"
>-                        "foo\n"
>-                        "#define foo 2\n"
>-                        "foo\n";
>-    const char* expected = "\n"
>-                           "1\n"
>-                           "\n"
>-                           "foo\n"
>-                           "\n"
>-                           "2\n";
>+    const char *input =
>+        "#define foo 1\n"
>+        "foo\n"
>+        "#undef foo\n"
>+        "foo\n"
>+        "#define foo 2\n"
>+        "foo\n";
>+    const char *expected =
>+        "\n"
>+        "1\n"
>+        "\n"
>+        "foo\n"
>+        "\n"
>+        "2\n";
> 
>     preprocess(input, expected);
> }
>@@ -792,7 +874,7 @@ TEST_F(DefineTest, UndefRedefine)
> // Example from C99 standard section 6.10.3.5 Scope of macro definitions
> TEST_F(DefineTest, C99Example)
> {
>-    const char* input =
>+    const char *input =
>         "#define x    3          \n"
>         "#define f(a) f(x * (a)) \n"
>         "#undef  x               \n"
>@@ -810,7 +892,7 @@ TEST_F(DefineTest, C99Example)
>         "g(x+(3,4)-w) | h 5) & m\n"
>         "    (f)^m(m);\n"
>         "p() i[q()] = { q(1), 23, 4, 5, };\n";
>-    const char* expected = 
>+    const char *expected =
>         "\n"
>         "\n"
>         "\n"
>@@ -834,23 +916,23 @@ TEST_F(DefineTest, C99Example)
> 
> TEST_F(DefineTest, Predefined_GL_ES)
> {
>-    const char* input = "GL_ES\n";
>-    const char* expected = "1\n";
>+    const char *input    = "GL_ES\n";
>+    const char *expected = "1\n";
> 
>     preprocess(input, expected);
> }
> 
> TEST_F(DefineTest, Predefined_VERSION)
> {
>-    const char* input = "__VERSION__\n";
>-    const char* expected = "100\n";
>+    const char *input    = "__VERSION__\n";
>+    const char *expected = "100\n";
> 
>     preprocess(input, expected);
> }
> 
> TEST_F(DefineTest, Predefined_LINE1)
> {
>-    const char* str = "\n\n__LINE__";
>+    const char *str = "\n\n__LINE__";
> 
>     pp::Token token;
>     lexSingleToken(str, &token);
>@@ -860,8 +942,9 @@ TEST_F(DefineTest, Predefined_LINE1)
> 
> TEST_F(DefineTest, Predefined_LINE2)
> {
>-    const char* str = "#line 10\n"
>-                      "__LINE__\n";
>+    const char *str =
>+        "#line 10\n"
>+        "__LINE__\n";
> 
>     pp::Token token;
>     lexSingleToken(str, &token);
>@@ -871,7 +954,7 @@ TEST_F(DefineTest, Predefined_LINE2)
> 
> TEST_F(DefineTest, Predefined_FILE1)
> {
>-    const char* const str[] = {"", "", "__FILE__"};
>+    const char *const str[] = {"", "", "__FILE__"};
> 
>     pp::Token token;
>     lexSingleToken(3, str, &token);
>@@ -881,7 +964,7 @@ TEST_F(DefineTest, Predefined_FILE1)
> 
> TEST_F(DefineTest, Predefined_FILE2)
> {
>-    const char* const str[] = {"#line 10 20\n", "__FILE__"};
>+    const char *const str[] = {"#line 10 20\n", "__FILE__"};
> 
>     pp::Token token;
>     lexSingleToken(2, str, &token);
>@@ -1024,8 +1107,10 @@ TEST_F(DefineTest, LongMacroInvocationChain)
>     EXPECT_CALL(mDiagnostics, print(pp::Diagnostics::PP_MACRO_INVOCATION_CHAIN_TOO_DEEP,
>                                     pp::SourceLocation(0, 22), _));
> 
>-    pp::PreprocessorSettings settings;
>+    pp::PreprocessorSettings settings(SH_GLES2_SPEC);
>     settings.maxMacroExpansionDepth = 19;
> 
>     preprocess(inputStream.str().c_str(), settings);
> }
>+
>+}  // namespace angle
>diff --git a/Source/ThirdParty/ANGLE/src/tests/preprocessor_tests/error_test.cpp b/Source/ThirdParty/ANGLE/src/tests/preprocessor_tests/error_test.cpp
>index ab2e7abed12..f9054c605f4 100644
>--- a/Source/ThirdParty/ANGLE/src/tests/preprocessor_tests/error_test.cpp
>+++ b/Source/ThirdParty/ANGLE/src/tests/preprocessor_tests/error_test.cpp
>@@ -7,14 +7,16 @@
> #include "PreprocessorTest.h"
> #include "compiler/preprocessor/Token.h"
> 
>-class ErrorTest : public SimplePreprocessorTest
>+namespace angle
> {
>-};
>+
>+class ErrorTest : public SimplePreprocessorTest
>+{};
> 
> TEST_F(ErrorTest, Empty)
> {
>-    const char* str = "#error\n";
>-    const char* expected = "\n";
>+    const char *str      = "#error\n";
>+    const char *expected = "\n";
> 
>     using testing::_;
>     EXPECT_CALL(mDirectiveHandler, handleError(pp::SourceLocation(0, 1), ""));
>@@ -26,12 +28,11 @@ TEST_F(ErrorTest, Empty)
> 
> TEST_F(ErrorTest, OneTokenMessage)
> {
>-    const char* str = "#error foo\n";
>-    const char* expected = "\n";
>+    const char *str      = "#error foo\n";
>+    const char *expected = "\n";
> 
>     using testing::_;
>-    EXPECT_CALL(mDirectiveHandler,
>-                handleError(pp::SourceLocation(0, 1), " foo"));
>+    EXPECT_CALL(mDirectiveHandler, handleError(pp::SourceLocation(0, 1), " foo"));
>     // No error or warning.
>     EXPECT_CALL(mDiagnostics, print(_, _, _)).Times(0);
> 
>@@ -40,12 +41,11 @@ TEST_F(ErrorTest, OneTokenMessage)
> 
> TEST_F(ErrorTest, TwoTokenMessage)
> {
>-    const char* str = "#error foo bar\n";
>-    const char* expected = "\n";
>+    const char *str      = "#error foo bar\n";
>+    const char *expected = "\n";
> 
>     using testing::_;
>-    EXPECT_CALL(mDirectiveHandler,
>-                handleError(pp::SourceLocation(0, 1), " foo bar"));
>+    EXPECT_CALL(mDirectiveHandler, handleError(pp::SourceLocation(0, 1), " foo bar"));
>     // No error or warning.
>     EXPECT_CALL(mDiagnostics, print(_, _, _)).Times(0);
> 
>@@ -54,22 +54,22 @@ TEST_F(ErrorTest, TwoTokenMessage)
> 
> TEST_F(ErrorTest, Comments)
> {
>-    const char* str = "/*foo*/"
>-                      "#"
>-                      "/*foo*/"
>-                      "error"
>-                      "/*foo*/"
>-                      "foo"
>-                      "/*foo*/"
>-                      "bar"
>-                      "/*foo*/"
>-                      "//foo"
>-                      "\n";
>-    const char* expected = "\n";
>+    const char *str =
>+        "/*foo*/"
>+        "#"
>+        "/*foo*/"
>+        "error"
>+        "/*foo*/"
>+        "foo"
>+        "/*foo*/"
>+        "bar"
>+        "/*foo*/"
>+        "//foo"
>+        "\n";
>+    const char *expected = "\n";
> 
>     using testing::_;
>-    EXPECT_CALL(mDirectiveHandler,
>-                handleError(pp::SourceLocation(0, 1), " foo bar"));
>+    EXPECT_CALL(mDirectiveHandler, handleError(pp::SourceLocation(0, 1), " foo bar"));
>     // No error or warning.
>     EXPECT_CALL(mDiagnostics, print(_, _, _)).Times(0);
> 
>@@ -78,15 +78,16 @@ TEST_F(ErrorTest, Comments)
> 
> TEST_F(ErrorTest, MissingNewline)
> {
>-    const char* str = "#error foo";
>-    const char* expected = "";
>+    const char *str      = "#error foo";
>+    const char *expected = "";
> 
>     using testing::_;
>     // Directive successfully parsed.
>-    EXPECT_CALL(mDirectiveHandler,
>-                handleError(pp::SourceLocation(0, 1), " foo"));
>+    EXPECT_CALL(mDirectiveHandler, handleError(pp::SourceLocation(0, 1), " foo"));
>     // Error reported about EOF.
>     EXPECT_CALL(mDiagnostics, print(pp::Diagnostics::PP_EOF_IN_DIRECTIVE, _, _));
> 
>     preprocess(str, expected);
> }
>+
>+}  // namespace angle
>diff --git a/Source/ThirdParty/ANGLE/src/tests/preprocessor_tests/extension_test.cpp b/Source/ThirdParty/ANGLE/src/tests/preprocessor_tests/extension_test.cpp
>index 78c8fe282d1..9aa40907890 100644
>--- a/Source/ThirdParty/ANGLE/src/tests/preprocessor_tests/extension_test.cpp
>+++ b/Source/ThirdParty/ANGLE/src/tests/preprocessor_tests/extension_test.cpp
>@@ -7,18 +7,19 @@
> #include "PreprocessorTest.h"
> #include "compiler/preprocessor/Token.h"
> 
>-class ExtensionTest : public SimplePreprocessorTest
>+namespace angle
> {
>-};
>+
>+class ExtensionTest : public SimplePreprocessorTest
>+{};
> 
> TEST_F(ExtensionTest, Valid)
> {
>-    const char* str = "#extension foo : bar\n";
>-    const char* expected = "\n";
>+    const char *str      = "#extension foo : bar\n";
>+    const char *expected = "\n";
> 
>     using testing::_;
>-    EXPECT_CALL(mDirectiveHandler,
>-                handleExtension(pp::SourceLocation(0, 1), "foo", "bar"));
>+    EXPECT_CALL(mDirectiveHandler, handleExtension(pp::SourceLocation(0, 1), "foo", "bar"));
>     // No error or warning.
>     EXPECT_CALL(mDiagnostics, print(_, _, _)).Times(0);
> 
>@@ -27,24 +28,24 @@ TEST_F(ExtensionTest, Valid)
> 
> TEST_F(ExtensionTest, Comments)
> {
>-    const char* str = "/*foo*/"
>-                      "#"
>-                      "/*foo*/"
>-                      "extension"
>-                      "/*foo*/"
>-                      "foo"
>-                      "/*foo*/"
>-                      ":"
>-                      "/*foo*/"
>-                      "bar"
>-                      "/*foo*/"
>-                      "//foo"
>-                      "\n";
>-    const char* expected = "\n";
>+    const char *str =
>+        "/*foo*/"
>+        "#"
>+        "/*foo*/"
>+        "extension"
>+        "/*foo*/"
>+        "foo"
>+        "/*foo*/"
>+        ":"
>+        "/*foo*/"
>+        "bar"
>+        "/*foo*/"
>+        "//foo"
>+        "\n";
>+    const char *expected = "\n";
> 
>     using testing::_;
>-    EXPECT_CALL(mDirectiveHandler,
>-                handleExtension(pp::SourceLocation(0, 1), "foo", "bar"));
>+    EXPECT_CALL(mDirectiveHandler, handleExtension(pp::SourceLocation(0, 1), "foo", "bar"));
>     // No error or warning.
>     EXPECT_CALL(mDiagnostics, print(_, _, _)).Times(0);
> 
>@@ -53,13 +54,12 @@ TEST_F(ExtensionTest, Comments)
> 
> TEST_F(ExtensionTest, MissingNewline)
> {
>-    const char* str = "#extension foo : bar";
>-    const char* expected = "";
>+    const char *str      = "#extension foo : bar";
>+    const char *expected = "";
> 
>     using testing::_;
>     // Directive successfully parsed.
>-    EXPECT_CALL(mDirectiveHandler,
>-                handleExtension(pp::SourceLocation(0, 1), "foo", "bar"));
>+    EXPECT_CALL(mDirectiveHandler, handleExtension(pp::SourceLocation(0, 1), "foo", "bar"));
>     // Error reported about EOF.
>     EXPECT_CALL(mDiagnostics, print(pp::Diagnostics::PP_EOF_IN_DIRECTIVE, _, _));
> 
>@@ -68,14 +68,14 @@ TEST_F(ExtensionTest, MissingNewline)
> 
> TEST_F(ExtensionTest, ExtensionAfterNonPreProcessorTokenESSL1)
> {
>-    const char *str = "int baz = 1;\n"
>-                      "#extension foo : bar\n";
>+    const char *str =
>+        "int baz = 1;\n"
>+        "#extension foo : bar\n";
>     const char *expected = "int baz = 1;\n\n";
> 
>     using testing::_;
>     // Directive successfully parsed.
>-    EXPECT_CALL(mDirectiveHandler,
>-        handleExtension(pp::SourceLocation(0, 2), "foo", "bar"));
>+    EXPECT_CALL(mDirectiveHandler, handleExtension(pp::SourceLocation(0, 2), "foo", "bar"));
>     // Expect a warning about extension pragmas after non-preprocessor tokens.
>     EXPECT_CALL(mDiagnostics, print(pp::Diagnostics::PP_NON_PP_TOKEN_BEFORE_EXTENSION_ESSL1, _, _));
> 
>@@ -84,15 +84,15 @@ TEST_F(ExtensionTest, ExtensionAfterNonPreProcessorTokenESSL1)
> 
> TEST_F(ExtensionTest, ExtensionAfterNonPreProcessorTokenESSL3)
> {
>-    const char *str = "#version 300 es\n"
>-                      "int baz = 1;\n"
>-                      "#extension foo : bar\n";
>+    const char *str =
>+        "#version 300 es\n"
>+        "int baz = 1;\n"
>+        "#extension foo : bar\n";
>     const char *expected = "\nint baz = 1;\n\n";
> 
>     using testing::_;
>     // Directive successfully parsed.
>-    EXPECT_CALL(mDirectiveHandler,
>-        handleVersion(pp::SourceLocation(0, 1), 300));
>+    EXPECT_CALL(mDirectiveHandler, handleVersion(pp::SourceLocation(0, 1), 300));
>     // Expect a error about extension pragmas after non-preprocessor tokens.
>     EXPECT_CALL(mDiagnostics, print(pp::Diagnostics::PP_NON_PP_TOKEN_BEFORE_EXTENSION_ESSL3, _, _));
> 
>@@ -101,20 +101,18 @@ TEST_F(ExtensionTest, ExtensionAfterNonPreProcessorTokenESSL3)
> 
> struct ExtensionTestParam
> {
>-    const char* str;
>+    const char *str;
>     pp::Diagnostics::ID id;
> };
> 
> using testing::WithParamInterface;
>-class InvalidExtensionTest : public ExtensionTest,
>-                             public WithParamInterface<ExtensionTestParam>
>-{
>-};
>+class InvalidExtensionTest : public ExtensionTest, public WithParamInterface<ExtensionTestParam>
>+{};
> 
> TEST_P(InvalidExtensionTest, Identified)
> {
>     ExtensionTestParam param = GetParam();
>-    const char* expected = "\n";
>+    const char *expected     = "\n";
> 
>     using testing::_;
>     // No handleExtension call.
>@@ -131,6 +129,7 @@ static const ExtensionTestParam kParams[] = {
>     {"#extension foo bar\n", pp::Diagnostics::PP_UNEXPECTED_TOKEN},
>     {"#extension foo : \n", pp::Diagnostics::PP_INVALID_EXTENSION_DIRECTIVE},
>     {"#extension foo : 1\n", pp::Diagnostics::PP_INVALID_EXTENSION_BEHAVIOR},
>-    {"#extension foo : bar baz\n", pp::Diagnostics::PP_UNEXPECTED_TOKEN}
>-};
>-INSTANTIATE_TEST_CASE_P(All, InvalidExtensionTest, testing::ValuesIn(kParams));
>+    {"#extension foo : bar baz\n", pp::Diagnostics::PP_UNEXPECTED_TOKEN}};
>+INSTANTIATE_TEST_SUITE_P(All, InvalidExtensionTest, testing::ValuesIn(kParams));
>+
>+}  // namespace angle
>diff --git a/Source/ThirdParty/ANGLE/src/tests/preprocessor_tests/identifier_test.cpp b/Source/ThirdParty/ANGLE/src/tests/preprocessor_tests/identifier_test.cpp
>index ea341b2e086..194fb1e98b1 100644
>--- a/Source/ThirdParty/ANGLE/src/tests/preprocessor_tests/identifier_test.cpp
>+++ b/Source/ThirdParty/ANGLE/src/tests/preprocessor_tests/identifier_test.cpp
>@@ -4,17 +4,22 @@
> // found in the LICENSE file.
> //
> 
>+#include <tuple>
>+
> #include "PreprocessorTest.h"
> #include "compiler/preprocessor/Token.h"
> 
>+namespace angle
>+{
>+
> #define CLOSED_RANGE(x, y) testing::Range(x, static_cast<char>((y) + 1))
> 
> class IdentifierTest : public SimplePreprocessorTest
> {
>-protected:
>-    void expectIdentifier(const std::string& str)
>+  protected:
>+    void expectIdentifier(const std::string &str)
>     {
>-        const char* cstr = str.c_str();
>+        const char *cstr = str.c_str();
> 
>         pp::Token token;
>         lexSingleToken(cstr, &token);
>@@ -23,10 +28,8 @@ protected:
>     }
> };
> 
>-class SingleLetterIdentifierTest : public IdentifierTest,
>-                                   public testing::WithParamInterface<char>
>-{
>-};
>+class SingleLetterIdentifierTest : public IdentifierTest, public testing::WithParamInterface<char>
>+{};
> 
> // This test covers identifier names of form [_a-zA-Z].
> TEST_P(SingleLetterIdentifierTest, Identified)
>@@ -36,108 +39,88 @@ TEST_P(SingleLetterIdentifierTest, Identified)
> }
> 
> // Test string: '_'
>-INSTANTIATE_TEST_CASE_P(Underscore,
>-                        SingleLetterIdentifierTest,
>-                        testing::Values('_'));
>+INSTANTIATE_TEST_SUITE_P(Underscore, SingleLetterIdentifierTest, testing::Values('_'));
> 
> // Test string: [a-z]
>-INSTANTIATE_TEST_CASE_P(a_z,
>-                        SingleLetterIdentifierTest,
>-                        CLOSED_RANGE('a', 'z'));
>+INSTANTIATE_TEST_SUITE_P(a_z, SingleLetterIdentifierTest, CLOSED_RANGE('a', 'z'));
> 
> // Test string: [A-Z]
>-INSTANTIATE_TEST_CASE_P(A_Z,
>-                        SingleLetterIdentifierTest,
>-                        CLOSED_RANGE('A', 'Z'));
>-
>-typedef std::tr1::tuple<char, char> IdentifierParams;
>-class DoubleLetterIdentifierTest :
>-    public IdentifierTest,
>-    public testing::WithParamInterface<IdentifierParams>
>-{
>-};
>+INSTANTIATE_TEST_SUITE_P(A_Z, SingleLetterIdentifierTest, CLOSED_RANGE('A', 'Z'));
>+
>+typedef std::tuple<char, char> IdentifierParams;
>+class DoubleLetterIdentifierTest : public IdentifierTest,
>+                                   public testing::WithParamInterface<IdentifierParams>
>+{};
> 
> // This test covers identifier names of form [_a-zA-Z][_a-zA-Z0-9].
> TEST_P(DoubleLetterIdentifierTest, Identified)
> {
>     std::string str;
>-    str.push_back(std::tr1::get<0>(GetParam()));
>-    str.push_back(std::tr1::get<1>(GetParam()));
>+    str.push_back(std::get<0>(GetParam()));
>+    str.push_back(std::get<1>(GetParam()));
> 
>     expectIdentifier(str);
> }
> 
> // Test string: "__"
>-INSTANTIATE_TEST_CASE_P(Underscore_Underscore,
>-                        DoubleLetterIdentifierTest,
>-                        testing::Combine(testing::Values('_'),
>-                                         testing::Values('_')));
>+INSTANTIATE_TEST_SUITE_P(Underscore_Underscore,
>+                         DoubleLetterIdentifierTest,
>+                         testing::Combine(testing::Values('_'), testing::Values('_')));
> 
> // Test string: "_"[a-z]
>-INSTANTIATE_TEST_CASE_P(Underscore_a_z,
>-                        DoubleLetterIdentifierTest,
>-                        testing::Combine(testing::Values('_'),
>-                                         CLOSED_RANGE('a', 'z')));
>+INSTANTIATE_TEST_SUITE_P(Underscore_a_z,
>+                         DoubleLetterIdentifierTest,
>+                         testing::Combine(testing::Values('_'), CLOSED_RANGE('a', 'z')));
> 
> // Test string: "_"[A-Z]
>-INSTANTIATE_TEST_CASE_P(Underscore_A_Z,
>-                        DoubleLetterIdentifierTest,
>-                        testing::Combine(testing::Values('_'),
>-                                         CLOSED_RANGE('A', 'Z')));
>+INSTANTIATE_TEST_SUITE_P(Underscore_A_Z,
>+                         DoubleLetterIdentifierTest,
>+                         testing::Combine(testing::Values('_'), CLOSED_RANGE('A', 'Z')));
> 
> // Test string: "_"[0-9]
>-INSTANTIATE_TEST_CASE_P(Underscore_0_9,
>-                        DoubleLetterIdentifierTest,
>-                        testing::Combine(testing::Values('_'),
>-                                         CLOSED_RANGE('0', '9')));
>+INSTANTIATE_TEST_SUITE_P(Underscore_0_9,
>+                         DoubleLetterIdentifierTest,
>+                         testing::Combine(testing::Values('_'), CLOSED_RANGE('0', '9')));
> 
> // Test string: [a-z]"_"
>-INSTANTIATE_TEST_CASE_P(a_z_Underscore,
>-                        DoubleLetterIdentifierTest,
>-                        testing::Combine(CLOSED_RANGE('a', 'z'),
>-                                         testing::Values('_')));
>+INSTANTIATE_TEST_SUITE_P(a_z_Underscore,
>+                         DoubleLetterIdentifierTest,
>+                         testing::Combine(CLOSED_RANGE('a', 'z'), testing::Values('_')));
> 
> // Test string: [a-z][a-z]
>-INSTANTIATE_TEST_CASE_P(a_z_a_z,
>-                        DoubleLetterIdentifierTest,
>-                        testing::Combine(CLOSED_RANGE('a', 'z'),
>-                                         CLOSED_RANGE('a', 'z')));
>+INSTANTIATE_TEST_SUITE_P(a_z_a_z,
>+                         DoubleLetterIdentifierTest,
>+                         testing::Combine(CLOSED_RANGE('a', 'z'), CLOSED_RANGE('a', 'z')));
> 
> // Test string: [a-z][A-Z]
>-INSTANTIATE_TEST_CASE_P(a_z_A_Z,
>-                        DoubleLetterIdentifierTest,
>-                        testing::Combine(CLOSED_RANGE('a', 'z'),
>-                                         CLOSED_RANGE('A', 'Z')));
>+INSTANTIATE_TEST_SUITE_P(a_z_A_Z,
>+                         DoubleLetterIdentifierTest,
>+                         testing::Combine(CLOSED_RANGE('a', 'z'), CLOSED_RANGE('A', 'Z')));
> 
> // Test string: [a-z][0-9]
>-INSTANTIATE_TEST_CASE_P(a_z_0_9,
>-                        DoubleLetterIdentifierTest,
>-                        testing::Combine(CLOSED_RANGE('a', 'z'),
>-                                         CLOSED_RANGE('0', '9')));
>+INSTANTIATE_TEST_SUITE_P(a_z_0_9,
>+                         DoubleLetterIdentifierTest,
>+                         testing::Combine(CLOSED_RANGE('a', 'z'), CLOSED_RANGE('0', '9')));
> 
> // Test string: [A-Z]"_"
>-INSTANTIATE_TEST_CASE_P(A_Z_Underscore,
>-                        DoubleLetterIdentifierTest,
>-                        testing::Combine(CLOSED_RANGE('A', 'Z'),
>-                                         testing::Values('_')));
>+INSTANTIATE_TEST_SUITE_P(A_Z_Underscore,
>+                         DoubleLetterIdentifierTest,
>+                         testing::Combine(CLOSED_RANGE('A', 'Z'), testing::Values('_')));
> 
> // Test string: [A-Z][a-z]
>-INSTANTIATE_TEST_CASE_P(A_Z_a_z,
>-                        DoubleLetterIdentifierTest,
>-                        testing::Combine(CLOSED_RANGE('A', 'Z'),
>-                                         CLOSED_RANGE('a', 'z')));
>+INSTANTIATE_TEST_SUITE_P(A_Z_a_z,
>+                         DoubleLetterIdentifierTest,
>+                         testing::Combine(CLOSED_RANGE('A', 'Z'), CLOSED_RANGE('a', 'z')));
> 
> // Test string: [A-Z][A-Z]
>-INSTANTIATE_TEST_CASE_P(A_Z_A_Z,
>-                        DoubleLetterIdentifierTest,
>-                        testing::Combine(CLOSED_RANGE('A', 'Z'),
>-                                         CLOSED_RANGE('A', 'Z')));
>+INSTANTIATE_TEST_SUITE_P(A_Z_A_Z,
>+                         DoubleLetterIdentifierTest,
>+                         testing::Combine(CLOSED_RANGE('A', 'Z'), CLOSED_RANGE('A', 'Z')));
> 
> // Test string: [A-Z][0-9]
>-INSTANTIATE_TEST_CASE_P(A_Z_0_9,
>-                        DoubleLetterIdentifierTest,
>-                        testing::Combine(CLOSED_RANGE('A', 'Z'),
>-                                         CLOSED_RANGE('0', '9')));
>+INSTANTIATE_TEST_SUITE_P(A_Z_0_9,
>+                         DoubleLetterIdentifierTest,
>+                         testing::Combine(CLOSED_RANGE('A', 'Z'), CLOSED_RANGE('0', '9')));
> 
> // The tests above cover one-letter and various combinations of two-letter
> // identifier names. This test covers all characters in a single string.
>@@ -159,3 +142,5 @@ TEST_F(IdentifierTest, AllLetters)
> 
>     expectIdentifier(str);
> }
>+
>+}  // namespace angle
>diff --git a/Source/ThirdParty/ANGLE/src/tests/preprocessor_tests/if_test.cpp b/Source/ThirdParty/ANGLE/src/tests/preprocessor_tests/if_test.cpp
>index 932ea7fa979..fc8674004d3 100644
>--- a/Source/ThirdParty/ANGLE/src/tests/preprocessor_tests/if_test.cpp
>+++ b/Source/ThirdParty/ANGLE/src/tests/preprocessor_tests/if_test.cpp
>@@ -7,702 +7,758 @@
> #include "PreprocessorTest.h"
> #include "compiler/preprocessor/Token.h"
> 
>-class IfTest : public SimplePreprocessorTest
>+namespace angle
> {
>-};
>+
>+class IfTest : public SimplePreprocessorTest
>+{};
> 
> TEST_F(IfTest, If_0)
> {
>-    const char* str = "pass_1\n"
>-                      "#if 0\n"
>-                      "fail\n"
>-                      "#endif\n"
>-                      "pass_2\n";
>-    const char* expected = "pass_1\n"
>-                           "\n"
>-                           "\n"
>-                           "\n"
>-                           "pass_2\n";
>+    const char *str =
>+        "pass_1\n"
>+        "#if 0\n"
>+        "fail\n"
>+        "#endif\n"
>+        "pass_2\n";
>+    const char *expected =
>+        "pass_1\n"
>+        "\n"
>+        "\n"
>+        "\n"
>+        "pass_2\n";
> 
>     preprocess(str, expected);
> }
> 
> TEST_F(IfTest, If_1)
> {
>-    const char* str = "pass_1\n"
>-                      "#if 1\n"
>-                      "pass_2\n"
>-                      "#endif\n"
>-                      "pass_3\n";
>-    const char* expected = "pass_1\n"
>-                           "\n"
>-                           "pass_2\n"
>-                           "\n"
>-                           "pass_3\n";
>+    const char *str =
>+        "pass_1\n"
>+        "#if 1\n"
>+        "pass_2\n"
>+        "#endif\n"
>+        "pass_3\n";
>+    const char *expected =
>+        "pass_1\n"
>+        "\n"
>+        "pass_2\n"
>+        "\n"
>+        "pass_3\n";
> 
>     preprocess(str, expected);
> }
> 
> TEST_F(IfTest, If_0_Else)
> {
>-    const char* str = "pass_1\n"
>-                      "#if 0\n"
>-                      "fail\n"
>-                      "#else\n"
>-                      "pass_2\n"
>-                      "#endif\n"
>-                      "pass_3\n";
>-    const char* expected = "pass_1\n"
>-                           "\n"
>-                           "\n"
>-                           "\n"
>-                           "pass_2\n"
>-                           "\n"
>-                           "pass_3\n";
>+    const char *str =
>+        "pass_1\n"
>+        "#if 0\n"
>+        "fail\n"
>+        "#else\n"
>+        "pass_2\n"
>+        "#endif\n"
>+        "pass_3\n";
>+    const char *expected =
>+        "pass_1\n"
>+        "\n"
>+        "\n"
>+        "\n"
>+        "pass_2\n"
>+        "\n"
>+        "pass_3\n";
> 
>     preprocess(str, expected);
> }
> 
> TEST_F(IfTest, If_1_Else)
> {
>-    const char* str = "pass_1\n"
>-                      "#if 1\n"
>-                      "pass_2\n"
>-                      "#else\n"
>-                      "fail\n"
>-                      "#endif\n"
>-                      "pass_3\n";
>-    const char* expected = "pass_1\n"
>-                           "\n"
>-                           "pass_2\n"
>-                           "\n"
>-                           "\n"
>-                           "\n"
>-                           "pass_3\n";
>+    const char *str =
>+        "pass_1\n"
>+        "#if 1\n"
>+        "pass_2\n"
>+        "#else\n"
>+        "fail\n"
>+        "#endif\n"
>+        "pass_3\n";
>+    const char *expected =
>+        "pass_1\n"
>+        "\n"
>+        "pass_2\n"
>+        "\n"
>+        "\n"
>+        "\n"
>+        "pass_3\n";
> 
>     preprocess(str, expected);
> }
> 
> TEST_F(IfTest, If_0_Elif)
> {
>-    const char* str = "pass_1\n"
>-                      "#if 0\n"
>-                      "fail_1\n"
>-                      "#elif 0\n"
>-                      "fail_2\n"
>-                      "#elif 1\n"
>-                      "pass_2\n"
>-                      "#elif 1\n"
>-                      "fail_3\n"
>-                      "#else\n"
>-                      "fail_4\n"
>-                      "#endif\n"
>-                      "pass_3\n";
>-    const char* expected = "pass_1\n"
>-                           "\n"
>-                           "\n"
>-                           "\n"
>-                           "\n"
>-                           "\n"
>-                           "pass_2\n"
>-                           "\n"
>-                           "\n"
>-                           "\n"
>-                           "\n"
>-                           "\n"
>-                           "pass_3\n";
>+    const char *str =
>+        "pass_1\n"
>+        "#if 0\n"
>+        "fail_1\n"
>+        "#elif 0\n"
>+        "fail_2\n"
>+        "#elif 1\n"
>+        "pass_2\n"
>+        "#elif 1\n"
>+        "fail_3\n"
>+        "#else\n"
>+        "fail_4\n"
>+        "#endif\n"
>+        "pass_3\n";
>+    const char *expected =
>+        "pass_1\n"
>+        "\n"
>+        "\n"
>+        "\n"
>+        "\n"
>+        "\n"
>+        "pass_2\n"
>+        "\n"
>+        "\n"
>+        "\n"
>+        "\n"
>+        "\n"
>+        "pass_3\n";
> 
>     preprocess(str, expected);
> }
> 
> TEST_F(IfTest, If_1_Elif)
> {
>-    const char* str = "pass_1\n"
>-                      "#if 1\n"
>-                      "pass_2\n"
>-                      "#elif 0\n"
>-                      "fail_1\n"
>-                      "#elif 1\n"
>-                      "fail_2\n"
>-                      "#else\n"
>-                      "fail_4\n"
>-                      "#endif\n"
>-                      "pass_3\n";
>-    const char* expected = "pass_1\n"
>-                           "\n"
>-                           "pass_2\n"
>-                           "\n"
>-                           "\n"
>-                           "\n"
>-                           "\n"
>-                           "\n"
>-                           "\n"
>-                           "\n"
>-                           "pass_3\n";
>+    const char *str =
>+        "pass_1\n"
>+        "#if 1\n"
>+        "pass_2\n"
>+        "#elif 0\n"
>+        "fail_1\n"
>+        "#elif 1\n"
>+        "fail_2\n"
>+        "#else\n"
>+        "fail_4\n"
>+        "#endif\n"
>+        "pass_3\n";
>+    const char *expected =
>+        "pass_1\n"
>+        "\n"
>+        "pass_2\n"
>+        "\n"
>+        "\n"
>+        "\n"
>+        "\n"
>+        "\n"
>+        "\n"
>+        "\n"
>+        "pass_3\n";
> 
>     preprocess(str, expected);
> }
> 
> TEST_F(IfTest, If_Elif_Else)
> {
>-    const char* str = "pass_1\n"
>-                      "#if 0\n"
>-                      "fail_1\n"
>-                      "#elif 0\n"
>-                      "fail_2\n"
>-                      "#elif 0\n"
>-                      "fail_3\n"
>-                      "#else\n"
>-                      "pass_2\n"
>-                      "#endif\n"
>-                      "pass_3\n";
>-    const char* expected = "pass_1\n"
>-                           "\n"
>-                           "\n"
>-                           "\n"
>-                           "\n"
>-                           "\n"
>-                           "\n"
>-                           "\n"
>-                           "pass_2\n"
>-                           "\n"
>-                           "pass_3\n";
>+    const char *str =
>+        "pass_1\n"
>+        "#if 0\n"
>+        "fail_1\n"
>+        "#elif 0\n"
>+        "fail_2\n"
>+        "#elif 0\n"
>+        "fail_3\n"
>+        "#else\n"
>+        "pass_2\n"
>+        "#endif\n"
>+        "pass_3\n";
>+    const char *expected =
>+        "pass_1\n"
>+        "\n"
>+        "\n"
>+        "\n"
>+        "\n"
>+        "\n"
>+        "\n"
>+        "\n"
>+        "pass_2\n"
>+        "\n"
>+        "pass_3\n";
> 
>     preprocess(str, expected);
> }
> 
> TEST_F(IfTest, If_0_Nested)
> {
>-    const char* str = "pass_1\n"
>-                      "#if 0\n"
>-                      "fail_1\n"
>-                      "#if 1\n"
>-                      "fail_2\n"
>-                      "#else\n"
>-                      "fail_3\n"
>-                      "#endif\n"
>-                      "#else\n"
>-                      "pass_2\n"
>-                      "#endif\n"
>-                      "pass_3\n";
>-    const char* expected = "pass_1\n"
>-                           "\n"
>-                           "\n"
>-                           "\n"
>-                           "\n"
>-                           "\n"
>-                           "\n"
>-                           "\n"
>-                           "\n"
>-                           "pass_2\n"
>-                           "\n"
>-                           "pass_3\n";
>+    const char *str =
>+        "pass_1\n"
>+        "#if 0\n"
>+        "fail_1\n"
>+        "#if 1\n"
>+        "fail_2\n"
>+        "#else\n"
>+        "fail_3\n"
>+        "#endif\n"
>+        "#else\n"
>+        "pass_2\n"
>+        "#endif\n"
>+        "pass_3\n";
>+    const char *expected =
>+        "pass_1\n"
>+        "\n"
>+        "\n"
>+        "\n"
>+        "\n"
>+        "\n"
>+        "\n"
>+        "\n"
>+        "\n"
>+        "pass_2\n"
>+        "\n"
>+        "pass_3\n";
> 
>     preprocess(str, expected);
> }
> 
> TEST_F(IfTest, If_1_Nested)
> {
>-    const char* str = "pass_1\n"
>-                      "#if 1\n"
>-                      "pass_2\n"
>-                      "#if 1\n"
>-                      "pass_3\n"
>-                      "#else\n"
>-                      "fail_1\n"
>-                      "#endif\n"
>-                      "#else\n"
>-                      "fail_2\n"
>-                      "#endif\n"
>-                      "pass_4\n";
>-    const char* expected = "pass_1\n"
>-                           "\n"
>-                           "pass_2\n"
>-                           "\n"
>-                           "pass_3\n"
>-                           "\n"
>-                           "\n"
>-                           "\n"
>-                           "\n"
>-                           "\n"
>-                           "\n"
>-                           "pass_4\n";
>+    const char *str =
>+        "pass_1\n"
>+        "#if 1\n"
>+        "pass_2\n"
>+        "#if 1\n"
>+        "pass_3\n"
>+        "#else\n"
>+        "fail_1\n"
>+        "#endif\n"
>+        "#else\n"
>+        "fail_2\n"
>+        "#endif\n"
>+        "pass_4\n";
>+    const char *expected =
>+        "pass_1\n"
>+        "\n"
>+        "pass_2\n"
>+        "\n"
>+        "pass_3\n"
>+        "\n"
>+        "\n"
>+        "\n"
>+        "\n"
>+        "\n"
>+        "\n"
>+        "pass_4\n";
> 
>     preprocess(str, expected);
> }
> 
> TEST_F(IfTest, OperatorPrecedence)
> {
>-    const char* str = "#if 1 + 2 * 3 + - (26 % 17 - + 4 / 2)\n"
>-                      "fail_1\n"
>-                      "#else\n"
>-                      "pass_1\n"
>-                      "#endif\n";
>-    const char* expected = "\n"
>-                           "\n"
>-                           "\n"
>-                           "pass_1\n"
>-                           "\n";
>+    const char *str =
>+        "#if 1 + 2 * 3 + - (26 % 17 - + 4 / 2)\n"
>+        "fail_1\n"
>+        "#else\n"
>+        "pass_1\n"
>+        "#endif\n";
>+    const char *expected =
>+        "\n"
>+        "\n"
>+        "\n"
>+        "pass_1\n"
>+        "\n";
> 
>     preprocess(str, expected);
> }
> 
> TEST_F(IfTest, OperatorDefined)
> {
>-    const char* str = "#if defined foo\n"
>-                      "fail_1\n"
>-                      "#else\n"
>-                      "pass_1\n"
>-                      "#endif\n"
>-                      "#define foo\n"
>-                      "#if defined(foo)\n"
>-                      "pass_2\n"
>-                      "#else\n"
>-                      "fail_2\n"
>-                      "#endif\n"
>-                      "#undef foo\n"
>-                      "#if defined ( foo ) \n"
>-                      "fail_3\n"
>-                      "#else\n"
>-                      "pass_3\n"
>-                      "#endif\n";
>-    const char* expected = "\n"
>-                           "\n"
>-                           "\n"
>-                           "pass_1\n"
>-                           "\n"
>-                           "\n"
>-                           "\n"
>-                           "pass_2\n"
>-                           "\n"
>-                           "\n"
>-                           "\n"
>-                           "\n"
>-                           "\n"
>-                           "\n"
>-                           "\n"
>-                           "pass_3\n"
>-                           "\n";
>+    const char *str =
>+        "#if defined foo\n"
>+        "fail_1\n"
>+        "#else\n"
>+        "pass_1\n"
>+        "#endif\n"
>+        "#define foo\n"
>+        "#if defined(foo)\n"
>+        "pass_2\n"
>+        "#else\n"
>+        "fail_2\n"
>+        "#endif\n"
>+        "#undef foo\n"
>+        "#if defined ( foo ) \n"
>+        "fail_3\n"
>+        "#else\n"
>+        "pass_3\n"
>+        "#endif\n";
>+    const char *expected =
>+        "\n"
>+        "\n"
>+        "\n"
>+        "pass_1\n"
>+        "\n"
>+        "\n"
>+        "\n"
>+        "pass_2\n"
>+        "\n"
>+        "\n"
>+        "\n"
>+        "\n"
>+        "\n"
>+        "\n"
>+        "\n"
>+        "pass_3\n"
>+        "\n";
> 
>     preprocess(str, expected);
> }
> 
> TEST_F(IfTest, OperatorEQ)
> {
>-    const char* str = "#if 4 - 1 == 2 + 1\n"
>-                      "pass\n"
>-                      "#else\n"
>-                      "fail\n"
>-                      "#endif\n";
>-    const char* expected = "\n"
>-                           "pass\n"
>-                           "\n"
>-                           "\n"
>-                           "\n";
>+    const char *str =
>+        "#if 4 - 1 == 2 + 1\n"
>+        "pass\n"
>+        "#else\n"
>+        "fail\n"
>+        "#endif\n";
>+    const char *expected =
>+        "\n"
>+        "pass\n"
>+        "\n"
>+        "\n"
>+        "\n";
> 
>     preprocess(str, expected);
> }
> 
> TEST_F(IfTest, OperatorNE)
> {
>-    const char* str = "#if 1 != 2\n"
>-                      "pass\n"
>-                      "#else\n"
>-                      "fail\n"
>-                      "#endif\n";
>-    const char* expected = "\n"
>-                           "pass\n"
>-                           "\n"
>-                           "\n"
>-                           "\n";
>+    const char *str =
>+        "#if 1 != 2\n"
>+        "pass\n"
>+        "#else\n"
>+        "fail\n"
>+        "#endif\n";
>+    const char *expected =
>+        "\n"
>+        "pass\n"
>+        "\n"
>+        "\n"
>+        "\n";
> 
>     preprocess(str, expected);
> }
> 
> TEST_F(IfTest, OperatorLess)
> {
>-    const char* str = "#if 1 < 2\n"
>-                      "pass\n"
>-                      "#else\n"
>-                      "fail\n"
>-                      "#endif\n";
>-    const char* expected = "\n"
>-                           "pass\n"
>-                           "\n"
>-                           "\n"
>-                           "\n";
>+    const char *str =
>+        "#if 1 < 2\n"
>+        "pass\n"
>+        "#else\n"
>+        "fail\n"
>+        "#endif\n";
>+    const char *expected =
>+        "\n"
>+        "pass\n"
>+        "\n"
>+        "\n"
>+        "\n";
> 
>     preprocess(str, expected);
> }
> 
> TEST_F(IfTest, OperatorGreater)
> {
>-    const char* str = "#if 2 > 1\n"
>-                      "pass\n"
>-                      "#else\n"
>-                      "fail\n"
>-                      "#endif\n";
>-    const char* expected = "\n"
>-                           "pass\n"
>-                           "\n"
>-                           "\n"
>-                           "\n";
>+    const char *str =
>+        "#if 2 > 1\n"
>+        "pass\n"
>+        "#else\n"
>+        "fail\n"
>+        "#endif\n";
>+    const char *expected =
>+        "\n"
>+        "pass\n"
>+        "\n"
>+        "\n"
>+        "\n";
> 
>     preprocess(str, expected);
> }
> 
> TEST_F(IfTest, OperatorLE)
> {
>-    const char* str = "#if 1 <= 2\n"
>-                      "pass_1\n"
>-                      "#else\n"
>-                      "fail_1\n"
>-                      "#endif\n"
>-                      "#if 2 <= 2\n"
>-                      "pass_2\n"
>-                      "#else\n"
>-                      "fail_2\n"
>-                      "#endif\n";
>-    const char* expected = "\n"
>-                           "pass_1\n"
>-                           "\n"
>-                           "\n"
>-                           "\n"
>-                           "\n"
>-                           "pass_2\n"
>-                           "\n"
>-                           "\n"
>-                           "\n";
>+    const char *str =
>+        "#if 1 <= 2\n"
>+        "pass_1\n"
>+        "#else\n"
>+        "fail_1\n"
>+        "#endif\n"
>+        "#if 2 <= 2\n"
>+        "pass_2\n"
>+        "#else\n"
>+        "fail_2\n"
>+        "#endif\n";
>+    const char *expected =
>+        "\n"
>+        "pass_1\n"
>+        "\n"
>+        "\n"
>+        "\n"
>+        "\n"
>+        "pass_2\n"
>+        "\n"
>+        "\n"
>+        "\n";
> 
>     preprocess(str, expected);
> }
> 
> TEST_F(IfTest, OperatorGE)
> {
>-    const char* str = "#if 2 >= 1\n"
>-                      "pass_1\n"
>-                      "#else\n"
>-                      "fail_1\n"
>-                      "#endif\n"
>-                      "#if 2 >= 2\n"
>-                      "pass_2\n"
>-                      "#else\n"
>-                      "fail_2\n"
>-                      "#endif\n";
>-    const char* expected = "\n"
>-                           "pass_1\n"
>-                           "\n"
>-                           "\n"
>-                           "\n"
>-                           "\n"
>-                           "pass_2\n"
>-                           "\n"
>-                           "\n"
>-                           "\n";
>+    const char *str =
>+        "#if 2 >= 1\n"
>+        "pass_1\n"
>+        "#else\n"
>+        "fail_1\n"
>+        "#endif\n"
>+        "#if 2 >= 2\n"
>+        "pass_2\n"
>+        "#else\n"
>+        "fail_2\n"
>+        "#endif\n";
>+    const char *expected =
>+        "\n"
>+        "pass_1\n"
>+        "\n"
>+        "\n"
>+        "\n"
>+        "\n"
>+        "pass_2\n"
>+        "\n"
>+        "\n"
>+        "\n";
> 
>     preprocess(str, expected);
> }
> 
> TEST_F(IfTest, OperatorBitwiseOR)
> {
>-    const char* str = "#if (0xaaaaaaaa | 0x55555555) == 0xffffffff\n"
>-                      "pass\n"
>-                      "#else\n"
>-                      "fail\n"
>-                      "#endif\n";
>-    const char* expected = "\n"
>-                           "pass\n"
>-                           "\n"
>-                           "\n"
>-                           "\n";
>+    const char *str =
>+        "#if (0xaaaaaaaa | 0x55555555) == 0xffffffff\n"
>+        "pass\n"
>+        "#else\n"
>+        "fail\n"
>+        "#endif\n";
>+    const char *expected =
>+        "\n"
>+        "pass\n"
>+        "\n"
>+        "\n"
>+        "\n";
> 
>     preprocess(str, expected);
> }
> 
> TEST_F(IfTest, OperatorBitwiseAND)
> {
>-    const char* str = "#if (0xaaaaaaa & 0x5555555) == 0\n"
>-                      "pass\n"
>-                      "#else\n"
>-                      "fail\n"
>-                      "#endif\n";
>-    const char* expected = "\n"
>-                           "pass\n"
>-                           "\n"
>-                           "\n"
>-                           "\n";
>+    const char *str =
>+        "#if (0xaaaaaaa & 0x5555555) == 0\n"
>+        "pass\n"
>+        "#else\n"
>+        "fail\n"
>+        "#endif\n";
>+    const char *expected =
>+        "\n"
>+        "pass\n"
>+        "\n"
>+        "\n"
>+        "\n";
> 
>     preprocess(str, expected);
> }
> 
> TEST_F(IfTest, OperatorBitwiseXOR)
> {
>-    const char* str = "#if (0xaaaaaaa ^ 0x5555555) == 0xfffffff\n"
>-                      "pass\n"
>-                      "#else\n"
>-                      "fail\n"
>-                      "#endif\n";
>-    const char* expected = "\n"
>-                           "pass\n"
>-                           "\n"
>-                           "\n"
>-                           "\n";
>+    const char *str =
>+        "#if (0xaaaaaaa ^ 0x5555555) == 0xfffffff\n"
>+        "pass\n"
>+        "#else\n"
>+        "fail\n"
>+        "#endif\n";
>+    const char *expected =
>+        "\n"
>+        "pass\n"
>+        "\n"
>+        "\n"
>+        "\n";
> 
>     preprocess(str, expected);
> }
> 
> TEST_F(IfTest, OperatorBitwiseComplement)
> {
>-    const char* str = "#if (~ 0xdeadbeef) == -3735928560\n"
>-                      "pass\n"
>-                      "#else\n"
>-                      "fail\n"
>-                      "#endif\n";
>-    const char* expected = "\n"
>-                           "pass\n"
>-                           "\n"
>-                           "\n"
>-                           "\n";
>+    const char *str =
>+        "#if (~ 0xdeadbeef) == -3735928560\n"
>+        "pass\n"
>+        "#else\n"
>+        "fail\n"
>+        "#endif\n";
>+    const char *expected =
>+        "\n"
>+        "pass\n"
>+        "\n"
>+        "\n"
>+        "\n";
> 
>     preprocess(str, expected);
> }
> 
> TEST_F(IfTest, OperatorLeft)
> {
>-    const char* str = "#if (1 << 12) == 4096\n"
>-                      "pass\n"
>-                      "#else\n"
>-                      "fail\n"
>-                      "#endif\n";
>-    const char* expected = "\n"
>-                           "pass\n"
>-                           "\n"
>-                           "\n"
>-                           "\n";
>+    const char *str =
>+        "#if (1 << 12) == 4096\n"
>+        "pass\n"
>+        "#else\n"
>+        "fail\n"
>+        "#endif\n";
>+    const char *expected =
>+        "\n"
>+        "pass\n"
>+        "\n"
>+        "\n"
>+        "\n";
> 
>     preprocess(str, expected);
> }
> 
> TEST_F(IfTest, OperatorRight)
> {
>-    const char* str = "#if (31762 >> 8) == 124\n"
>-                      "pass\n"
>-                      "#else\n"
>-                      "fail\n"
>-                      "#endif\n";
>-    const char* expected = "\n"
>-                           "pass\n"
>-                           "\n"
>-                           "\n"
>-                           "\n";
>+    const char *str =
>+        "#if (31762 >> 8) == 124\n"
>+        "pass\n"
>+        "#else\n"
>+        "fail\n"
>+        "#endif\n";
>+    const char *expected =
>+        "\n"
>+        "pass\n"
>+        "\n"
>+        "\n"
>+        "\n";
> 
>     preprocess(str, expected);
> }
> 
> TEST_F(IfTest, ExpressionWithMacros)
> {
>-    const char* str = "#define one 1\n"
>-                      "#define two 2\n"
>-                      "#define three 3\n"
>-                      "#if one + two == three\n"
>-                      "pass\n"
>-                      "#else\n"
>-                      "fail\n"
>-                      "#endif\n";
>-    const char* expected = "\n"
>-                           "\n"
>-                           "\n"
>-                           "\n"
>-                           "pass\n"
>-                           "\n"
>-                           "\n"
>-                           "\n";
>+    const char *str =
>+        "#define one 1\n"
>+        "#define two 2\n"
>+        "#define three 3\n"
>+        "#if one + two == three\n"
>+        "pass\n"
>+        "#else\n"
>+        "fail\n"
>+        "#endif\n";
>+    const char *expected =
>+        "\n"
>+        "\n"
>+        "\n"
>+        "\n"
>+        "pass\n"
>+        "\n"
>+        "\n"
>+        "\n";
> 
>     preprocess(str, expected);
> }
> 
> TEST_F(IfTest, JunkInsideExcludedBlockIgnored)
> {
>-    const char* str = "#if 0\n"
>-                      "foo !@#$%^&* .1bar\n"
>-                      "#foo\n"
>-                      "#if bar\n"
>-                      "fail\n"
>-                      "#endif\n"
>-                      "#else\n"
>-                      "pass\n"
>-                      "#endif\n";
>-    const char* expected = "\n"
>-                           "\n"
>-                           "\n"
>-                           "\n"
>-                           "\n"
>-                           "\n"
>-                           "\n"
>-                           "pass\n"
>-                           "\n";
>+    const char *str =
>+        "#if 0\n"
>+        "foo !@#$%^&* .1bar\n"
>+        "#foo\n"
>+        "#if bar\n"
>+        "fail\n"
>+        "#endif\n"
>+        "#else\n"
>+        "pass\n"
>+        "#endif\n";
>+    const char *expected =
>+        "\n"
>+        "\n"
>+        "\n"
>+        "\n"
>+        "\n"
>+        "\n"
>+        "\n"
>+        "pass\n"
>+        "\n";
> 
>     preprocess(str, expected);
> }
> 
> TEST_F(IfTest, Ifdef)
> {
>-    const char* str = "#define foo\n"
>-                      "#ifdef foo\n"
>-                      "pass_1\n"
>-                      "#else\n"
>-                      "fail_1\n"
>-                      "#endif\n"
>-                      "#undef foo\n"
>-                      "#ifdef foo\n"
>-                      "fail_2\n"
>-                      "#else\n"
>-                      "pass_2\n"
>-                      "#endif\n";
>-    const char* expected = "\n"
>-                           "\n"
>-                           "pass_1\n"
>-                           "\n"
>-                           "\n"
>-                           "\n"
>-                           "\n"
>-                           "\n"
>-                           "\n"
>-                           "\n"
>-                           "pass_2\n"
>-                           "\n";
>+    const char *str =
>+        "#define foo\n"
>+        "#ifdef foo\n"
>+        "pass_1\n"
>+        "#else\n"
>+        "fail_1\n"
>+        "#endif\n"
>+        "#undef foo\n"
>+        "#ifdef foo\n"
>+        "fail_2\n"
>+        "#else\n"
>+        "pass_2\n"
>+        "#endif\n";
>+    const char *expected =
>+        "\n"
>+        "\n"
>+        "pass_1\n"
>+        "\n"
>+        "\n"
>+        "\n"
>+        "\n"
>+        "\n"
>+        "\n"
>+        "\n"
>+        "pass_2\n"
>+        "\n";
> 
>     preprocess(str, expected);
> }
> 
> TEST_F(IfTest, Ifndef)
> {
>-    const char* str = "#define foo\n"
>-                      "#ifndef foo\n"
>-                      "fail_1\n"
>-                      "#else\n"
>-                      "pass_1\n"
>-                      "#endif\n"
>-                      "#undef foo\n"
>-                      "#ifndef foo\n"
>-                      "pass_2\n"
>-                      "#else\n"
>-                      "fail_2\n"
>-                      "#endif\n";
>-    const char* expected = "\n"
>-                           "\n"
>-                           "\n"
>-                           "\n"
>-                           "pass_1\n"
>-                           "\n"
>-                           "\n"
>-                           "\n"
>-                           "pass_2\n"
>-                           "\n"
>-                           "\n"
>-                           "\n";
>+    const char *str =
>+        "#define foo\n"
>+        "#ifndef foo\n"
>+        "fail_1\n"
>+        "#else\n"
>+        "pass_1\n"
>+        "#endif\n"
>+        "#undef foo\n"
>+        "#ifndef foo\n"
>+        "pass_2\n"
>+        "#else\n"
>+        "fail_2\n"
>+        "#endif\n";
>+    const char *expected =
>+        "\n"
>+        "\n"
>+        "\n"
>+        "\n"
>+        "pass_1\n"
>+        "\n"
>+        "\n"
>+        "\n"
>+        "pass_2\n"
>+        "\n"
>+        "\n"
>+        "\n";
> 
>     preprocess(str, expected);
> }
> 
> TEST_F(IfTest, MissingExpression)
> {
>-    const char* str = "#if\n"
>-                      "#endif\n";
>+    const char *str =
>+        "#if\n"
>+        "#endif\n";
> 
>-    EXPECT_CALL(mDiagnostics,
>-                print(pp::Diagnostics::PP_INVALID_EXPRESSION,
>-                      pp::SourceLocation(0, 1),
>-                      "syntax error"));
>+    EXPECT_CALL(mDiagnostics, print(pp::Diagnostics::PP_INVALID_EXPRESSION,
>+                                    pp::SourceLocation(0, 1), "syntax error"));
> 
>     preprocess(str);
> }
> 
> TEST_F(IfTest, DivisionByZero)
> {
>-    const char* str = "#if 1 / (3 - (1 + 2))\n"
>-                      "#endif\n";
>+    const char *str =
>+        "#if 1 / (3 - (1 + 2))\n"
>+        "#endif\n";
> 
>     EXPECT_CALL(mDiagnostics,
>-                print(pp::Diagnostics::PP_DIVISION_BY_ZERO,
>-                      pp::SourceLocation(0, 1), "1 / 0"));
>+                print(pp::Diagnostics::PP_DIVISION_BY_ZERO, pp::SourceLocation(0, 1), "1 / 0"));
> 
>     preprocess(str);
> }
> 
> TEST_F(IfTest, ModuloByZero)
> {
>-    const char* str = "#if 1 % (3 - (1 + 2))\n"
>-                      "#endif\n";
>+    const char *str =
>+        "#if 1 % (3 - (1 + 2))\n"
>+        "#endif\n";
> 
>     EXPECT_CALL(mDiagnostics,
>-                print(pp::Diagnostics::PP_DIVISION_BY_ZERO,
>-                      pp::SourceLocation(0, 1), "1 % 0"));
>+                print(pp::Diagnostics::PP_DIVISION_BY_ZERO, pp::SourceLocation(0, 1), "1 % 0"));
> 
>     preprocess(str);
> }
> 
> TEST_F(IfTest, DecIntegerOverflow)
> {
>-    const char* str = "#if 4294967296\n"
>-                      "#endif\n";
>+    const char *str =
>+        "#if 4294967296\n"
>+        "#endif\n";
> 
>-    EXPECT_CALL(mDiagnostics,
>-                print(pp::Diagnostics::PP_INTEGER_OVERFLOW,
>-                      pp::SourceLocation(0, 1), "4294967296"));
>+    EXPECT_CALL(mDiagnostics, print(pp::Diagnostics::PP_INTEGER_OVERFLOW, pp::SourceLocation(0, 1),
>+                                    "4294967296"));
> 
>     preprocess(str);
> }
> 
> TEST_F(IfTest, OctIntegerOverflow)
> {
>-    const char* str = "#if 077777777777\n"
>-                      "#endif\n";
>+    const char *str =
>+        "#if 077777777777\n"
>+        "#endif\n";
> 
>-    EXPECT_CALL(mDiagnostics,
>-                print(pp::Diagnostics::PP_INTEGER_OVERFLOW,
>-                      pp::SourceLocation(0, 1), "077777777777"));
>+    EXPECT_CALL(mDiagnostics, print(pp::Diagnostics::PP_INTEGER_OVERFLOW, pp::SourceLocation(0, 1),
>+                                    "077777777777"));
> 
>     preprocess(str);
> }
> 
> TEST_F(IfTest, HexIntegerOverflow)
> {
>-    const char* str = "#if 0xfffffffff\n"
>-                      "#endif\n";
>+    const char *str =
>+        "#if 0xfffffffff\n"
>+        "#endif\n";
> 
>-    EXPECT_CALL(mDiagnostics,
>-                print(pp::Diagnostics::PP_INTEGER_OVERFLOW,
>-                      pp::SourceLocation(0, 1), "0xfffffffff"));
>+    EXPECT_CALL(mDiagnostics, print(pp::Diagnostics::PP_INTEGER_OVERFLOW, pp::SourceLocation(0, 1),
>+                                    "0xfffffffff"));
> 
>     preprocess(str);
> }
> 
> TEST_F(IfTest, UndefinedMacro)
> {
>-    const char* str = "#if UNDEFINED\n"
>-                      "#endif\n";
>+    const char *str =
>+        "#if UNDEFINED\n"
>+        "#endif\n";
> 
>-    EXPECT_CALL(mDiagnostics,
>-                print(pp::Diagnostics::PP_CONDITIONAL_UNEXPECTED_TOKEN,
>-                      pp::SourceLocation(0, 1),
>-                      "UNDEFINED"));
>+    EXPECT_CALL(mDiagnostics, print(pp::Diagnostics::PP_CONDITIONAL_UNEXPECTED_TOKEN,
>+                                    pp::SourceLocation(0, 1), "UNDEFINED"));
> 
>     preprocess(str);
> }
> 
> TEST_F(IfTest, InvalidExpressionIgnoredForExcludedElif)
> {
>-    const char* str = "#if 1\n"
>-                      "pass\n"
>-                      "#elif UNDEFINED\n"
>-                      "fail\n"
>-                      "#endif\n";
>-    const char* expected = "\n"
>-                           "pass\n"
>-                           "\n"
>-                           "\n"
>-                           "\n";
>+    const char *str =
>+        "#if 1\n"
>+        "pass\n"
>+        "#elif UNDEFINED\n"
>+        "fail\n"
>+        "#endif\n";
>+    const char *expected =
>+        "\n"
>+        "pass\n"
>+        "\n"
>+        "\n"
>+        "\n";
> 
>     // No error or warning.
>     using testing::_;
>@@ -713,90 +769,78 @@ TEST_F(IfTest, InvalidExpressionIgnoredForExcludedElif)
> 
> TEST_F(IfTest, ElseWithoutIf)
> {
>-    const char* str = "#else\n";
>+    const char *str = "#else\n";
> 
>-    EXPECT_CALL(mDiagnostics,
>-                print(pp::Diagnostics::PP_CONDITIONAL_ELSE_WITHOUT_IF,
>-                      pp::SourceLocation(0, 1),
>-                      "else"));
>+    EXPECT_CALL(mDiagnostics, print(pp::Diagnostics::PP_CONDITIONAL_ELSE_WITHOUT_IF,
>+                                    pp::SourceLocation(0, 1), "else"));
> 
>     preprocess(str);
> }
> 
> TEST_F(IfTest, ElifWithoutIf)
> {
>-    const char* str = "#elif 1\n";
>+    const char *str = "#elif 1\n";
> 
>-    EXPECT_CALL(mDiagnostics,
>-                print(pp::Diagnostics::PP_CONDITIONAL_ELIF_WITHOUT_IF,
>-                      pp::SourceLocation(0, 1),
>-                      "elif"));
>+    EXPECT_CALL(mDiagnostics, print(pp::Diagnostics::PP_CONDITIONAL_ELIF_WITHOUT_IF,
>+                                    pp::SourceLocation(0, 1), "elif"));
> 
>     preprocess(str);
> }
> 
> TEST_F(IfTest, EndifWithoutIf)
> {
>-    const char* str = "#endif\n";
>+    const char *str = "#endif\n";
> 
>-    EXPECT_CALL(mDiagnostics,
>-                print(pp::Diagnostics::PP_CONDITIONAL_ENDIF_WITHOUT_IF,
>-                      pp::SourceLocation(0, 1),
>-                      "endif"));
>+    EXPECT_CALL(mDiagnostics, print(pp::Diagnostics::PP_CONDITIONAL_ENDIF_WITHOUT_IF,
>+                                    pp::SourceLocation(0, 1), "endif"));
> 
>     preprocess(str);
> }
> 
> TEST_F(IfTest, ElseAfterElse)
> {
>-    const char* str = "#if 1\n"
>-                      "#else\n"
>-                      "#else\n"
>-                      "#endif\n";
>+    const char *str =
>+        "#if 1\n"
>+        "#else\n"
>+        "#else\n"
>+        "#endif\n";
> 
>-    EXPECT_CALL(mDiagnostics,
>-                print(pp::Diagnostics::PP_CONDITIONAL_ELSE_AFTER_ELSE,
>-                      pp::SourceLocation(0, 3),
>-                      "else"));
>+    EXPECT_CALL(mDiagnostics, print(pp::Diagnostics::PP_CONDITIONAL_ELSE_AFTER_ELSE,
>+                                    pp::SourceLocation(0, 3), "else"));
> 
>     preprocess(str);
> }
> 
> TEST_F(IfTest, ElifAfterElse)
> {
>-    const char* str = "#if 1\n"
>-                      "#else\n"
>-                      "#elif 0\n"
>-                      "#endif\n";
>+    const char *str =
>+        "#if 1\n"
>+        "#else\n"
>+        "#elif 0\n"
>+        "#endif\n";
> 
>-    EXPECT_CALL(mDiagnostics,
>-                print(pp::Diagnostics::PP_CONDITIONAL_ELIF_AFTER_ELSE,
>-                      pp::SourceLocation(0, 3),
>-                      "elif"));
>+    EXPECT_CALL(mDiagnostics, print(pp::Diagnostics::PP_CONDITIONAL_ELIF_AFTER_ELSE,
>+                                    pp::SourceLocation(0, 3), "elif"));
> 
>     preprocess(str);
> }
> 
> TEST_F(IfTest, UnterminatedIf)
> {
>-    const char* str = "#if 1\n";
>+    const char *str = "#if 1\n";
> 
>-    EXPECT_CALL(mDiagnostics,
>-                print(pp::Diagnostics::PP_CONDITIONAL_UNTERMINATED,
>-                      pp::SourceLocation(0, 1),
>-                      "if"));
>+    EXPECT_CALL(mDiagnostics, print(pp::Diagnostics::PP_CONDITIONAL_UNTERMINATED,
>+                                    pp::SourceLocation(0, 1), "if"));
> 
>     preprocess(str);
> }
> 
> TEST_F(IfTest, UnterminatedIfdef)
> {
>-    const char* str = "#ifdef foo\n";
>+    const char *str = "#ifdef foo\n";
> 
>-    EXPECT_CALL(mDiagnostics,
>-                print(pp::Diagnostics::PP_CONDITIONAL_UNTERMINATED,
>-                      pp::SourceLocation(0, 1),
>-                      "ifdef"));
>+    EXPECT_CALL(mDiagnostics, print(pp::Diagnostics::PP_CONDITIONAL_UNTERMINATED,
>+                                    pp::SourceLocation(0, 1), "ifdef"));
> 
>     preprocess(str);
> }
>@@ -864,6 +908,83 @@ TEST_F(IfTest, ShortCircuitedUndefined)
> // which the GLSL spec references (see C++14 draft spec section 16.1.4), but this behavior is
> // needed for passing dEQP tests, which enforce stricter compatibility between implementations.
> TEST_F(IfTest, DefinedOperatorValidAfterMacroExpansion)
>+{
>+    const char *str =
>+        "#define foo defined\n"
>+        "#if !foo bar\n"
>+        "pass\n"
>+        "#endif\n";
>+
>+    preprocess(str, "\n\npass\n\n");
>+}
>+
>+// Validate the defined operator is evaluated when the macro is called, not when defined.
>+TEST_F(IfTest, DefinedOperatorValidWhenUsed)
>+{
>+    constexpr char str[] = R"(#define BBB 1
>+#define AAA defined(BBB)
>+#undef BBB
>+
>+#if !AAA
>+pass
>+#endif
>+)";
>+
>+    preprocess(str, "\n\n\n\n\npass\n\n");
>+}
>+
>+// Validate the defined operator is evaluated when the macro is called, not when defined.
>+TEST_F(IfTest, DefinedOperatorAfterMacro)
>+{
>+    constexpr char str[] = R"(#define AAA defined(BBB)
>+#define BBB 1
>+
>+#if AAA
>+pass
>+#endif
>+)";
>+
>+    preprocess(str, "\n\n\n\npass\n\n");
>+}
>+
>+// Test generating "defined" by concatenation when a macro is called. This is not allowed.
>+TEST_F(IfTest, DefinedInMacroConcatenationNotAllowed)
>+{
>+    constexpr char str[] = R"(#define BBB 1
>+#define AAA(defi, ned) defi ## ned(BBB)
>+
>+#if !AAA(defi, ned)
>+pass
>+#endif
>+)";
>+
>+    EXPECT_CALL(mDiagnostics, print(pp::Diagnostics::PP_CONDITIONAL_UNEXPECTED_TOKEN,
>+                                    pp::SourceLocation(0, 4), "defi"));
>+    EXPECT_CALL(mDiagnostics, print(pp::Diagnostics::PP_CONDITIONAL_UNEXPECTED_TOKEN,
>+                                    pp::SourceLocation(0, 4), "#"));
>+
>+    preprocess(str);
>+}
>+
>+// Test using defined in a macro parameter name. This is not allowed.
>+TEST_F(IfTest, DefinedAsParameterNameNotAllowed)
>+{
>+    constexpr char str[] = R"(#define BBB 1
>+#define AAA(defined) defined(BBB)
>+
>+#if AAA(defined)
>+pass
>+#endif
>+)";
>+
>+    EXPECT_CALL(mDiagnostics,
>+                print(pp::Diagnostics::PP_UNEXPECTED_TOKEN, pp::SourceLocation(0, 0), ""));
>+
>+    preprocess(str);
>+}
>+
>+// This behavour is disabled in WebGL.
>+TEST_F(IfTest, DefinedOperatorInvalidAfterMacroExpansionInWebGL)
> {
>     const char *str =
>         "#define foo defined\n"
>@@ -876,12 +997,13 @@ TEST_F(IfTest, DefinedOperatorValidAfterMacroExpansion)
>     EXPECT_CALL(mDiagnostics, print(pp::Diagnostics::PP_CONDITIONAL_UNEXPECTED_TOKEN,
>                                     pp::SourceLocation(0, 2), "bar"));
> 
>-    preprocess(str);
>+    preprocess(str, pp::PreprocessorSettings(SH_WEBGL_SPEC));
> }
> 
> // Defined operator produced by macro expansion has undefined behavior according to C++ spec,
>-// which the GLSL spec references (see C++14 draft spec section 16.1.4), but this behavior is
>-// needed for passing dEQP tests, which enforce stricter compatibility between implementations.
>+// which the GLSL spec references (see C++14 draft spec section 16.1.4). Some edge case
>+// behaviours with defined are not portable between implementations and thus are not required
>+// to pass dEQP Tests.
> TEST_F(IfTest, UnterminatedDefinedInMacro)
> {
>     const char *str =
>@@ -889,17 +1011,18 @@ TEST_F(IfTest, UnterminatedDefinedInMacro)
>         "#if foo\n"
>         "#endif\n";
> 
>-    EXPECT_CALL(mDiagnostics, print(pp::Diagnostics::PP_CONDITIONAL_UNEXPECTED_TOKEN,
>-                                    pp::SourceLocation(0, 2), "defined"));
>-    EXPECT_CALL(mDiagnostics, print(pp::Diagnostics::PP_CONDITIONAL_UNEXPECTED_TOKEN,
>-                                    pp::SourceLocation(0, 2), "("));
>+    EXPECT_CALL(mDiagnostics,
>+                print(pp::Diagnostics::PP_UNEXPECTED_TOKEN, pp::SourceLocation(0, 2), "\n"));
>+    EXPECT_CALL(mDiagnostics, print(pp::Diagnostics::PP_INVALID_EXPRESSION,
>+                                    pp::SourceLocation(0, 2), "syntax error"));
> 
>     preprocess(str);
> }
> 
> // Defined operator produced by macro expansion has undefined behavior according to C++ spec,
>-// which the GLSL spec references (see C++14 draft spec section 16.1.4), but this behavior is
>-// needed for passing dEQP tests, which enforce stricter compatibility between implementations.
>+// which the GLSL spec references (see C++14 draft spec section 16.1.4). Some edge case
>+// behaviours with defined are not portable between implementations and thus are not required
>+// to pass dEQP Tests.
> TEST_F(IfTest, UnterminatedDefinedInMacro2)
> {
>     const char *str =
>@@ -907,10 +1030,10 @@ TEST_F(IfTest, UnterminatedDefinedInMacro2)
>         "#if foo\n"
>         "#endif\n";
> 
>-    EXPECT_CALL(mDiagnostics, print(pp::Diagnostics::PP_CONDITIONAL_UNEXPECTED_TOKEN,
>-                                    pp::SourceLocation(0, 2), "defined"));
>-    EXPECT_CALL(mDiagnostics, print(pp::Diagnostics::PP_CONDITIONAL_UNEXPECTED_TOKEN,
>-                                    pp::SourceLocation(0, 2), "("));
>+    EXPECT_CALL(mDiagnostics,
>+                print(pp::Diagnostics::PP_UNEXPECTED_TOKEN, pp::SourceLocation(0, 2), "\n"));
>+    EXPECT_CALL(mDiagnostics, print(pp::Diagnostics::PP_INVALID_EXPRESSION,
>+                                    pp::SourceLocation(0, 2), "syntax error"));
> 
>     preprocess(str);
> }
>@@ -1035,3 +1158,5 @@ TEST_F(IfTest, BitShiftRightOperatorNegativeLHS)
> 
>     preprocess(str, expected);
> }
>+
>+}  // namespace angle
>diff --git a/Source/ThirdParty/ANGLE/src/tests/preprocessor_tests/input_test.cpp b/Source/ThirdParty/ANGLE/src/tests/preprocessor_tests/input_test.cpp
>index 1aec2849750..b53ab59602c 100644
>--- a/Source/ThirdParty/ANGLE/src/tests/preprocessor_tests/input_test.cpp
>+++ b/Source/ThirdParty/ANGLE/src/tests/preprocessor_tests/input_test.cpp
>@@ -4,12 +4,17 @@
> // found in the LICENSE file.
> //
> 
>-#include "PreprocessorTest.h"
> #include "compiler/preprocessor/Input.h"
>+#include "PreprocessorTest.h"
> #include "compiler/preprocessor/Token.h"
> 
>+namespace angle
>+{
>+
> class InitTest : public PreprocessorTest
> {
>+  public:
>+    InitTest() : PreprocessorTest(SH_GLES2_SPEC) {}
> };
> 
> TEST_F(InitTest, ZeroCount)
>@@ -36,23 +41,23 @@ TEST(InputTest, DefaultConstructor)
> 
> TEST(InputTest, NullLength)
> {
>-    const char* str[] = {"foo"};
>+    const char *str[] = {"foo"};
>     pp::Input input(1, str, nullptr);
>     EXPECT_EQ(3u, input.length(0));
> }
> 
> TEST(InputTest, NegativeLength)
> {
>-    const char* str[] = {"foo"};
>-    int length[] = {-1};
>+    const char *str[] = {"foo"};
>+    int length[]      = {-1};
>     pp::Input input(1, str, length);
>     EXPECT_EQ(3u, input.length(0));
> }
> 
> TEST(InputTest, ActualLength)
> {
>-    const char* str[] = {"foobar"};
>-    int length[] = {3};
>+    const char *str[] = {"foobar"};
>+    int length[]      = {3};
>     pp::Input input(1, str, length);
>     // Note that strlen(str[0]) != length[0].
>     // Even then Input should just accept any non-negative number.
>@@ -61,19 +66,19 @@ TEST(InputTest, ActualLength)
> 
> TEST(InputTest, String)
> {
>-    const char* str[] = {"foo"};
>+    const char *str[] = {"foo"};
>     pp::Input input(1, str, nullptr);
>     EXPECT_STREQ(str[0], input.string(0));
> }
> 
> TEST(InputTest, ReadSingleString)
> {
>-    int count = 1;
>-    const char* str[] = {"foo"};
>-    char buf[4] = {'\0', '\0', '\0', '\0'};
>+    int count         = 1;
>+    const char *str[] = {"foo"};
>+    char buf[4]       = {'\0', '\0', '\0', '\0'};
> 
>     int maxSize = 1;
>-    int lineNo = 0;
>+    int lineNo  = 0;
>     pp::Input input1(count, str, nullptr);
>     EXPECT_EQ(1u, input1.read(buf, maxSize, &lineNo));
>     EXPECT_EQ('f', buf[0]);
>@@ -106,12 +111,12 @@ TEST(InputTest, ReadSingleString)
> 
> TEST(InputTest, ReadMultipleStrings)
> {
>-    int count = 3;
>-    const char* str[] = {"f", "o", "o"};
>-    char buf[4] = {'\0', '\0', '\0', '\0'};
>+    int count         = 3;
>+    const char *str[] = {"f", "o", "o"};
>+    char buf[4]       = {'\0', '\0', '\0', '\0'};
> 
>     int maxSize = 1;
>-    int lineNo = 0;
>+    int lineNo  = 0;
>     pp::Input input1(count, str, nullptr);
>     EXPECT_EQ(1u, input1.read(buf, maxSize, &lineNo));
>     EXPECT_EQ('f', buf[0]);
>@@ -144,14 +149,14 @@ TEST(InputTest, ReadMultipleStrings)
> 
> TEST(InputTest, ReadStringsWithLength)
> {
>-    int count = 2;
>-    const char* str[] = {"foo", "bar"};
>+    int count         = 2;
>+    const char *str[] = {"foo", "bar"};
>     // Note that the length for the first string is 2 which is less than
>     // strlen(str[0]. We want to make sure that the last character is ignored.
>-    int length[] = {2, 3};
>-    char buf[6] = {'\0', '\0', '\0', '\0', '\0', '\0'};
>+    int length[]   = {2, 3};
>+    char buf[6]    = {'\0', '\0', '\0', '\0', '\0', '\0'};
>     size_t maxSize = 5;
>-    int lineNo = 0;
>+    int lineNo     = 0;
> 
>     pp::Input input(count, str, length);
>     EXPECT_EQ(maxSize, input.read(buf, maxSize, &lineNo));
>@@ -160,12 +165,12 @@ TEST(InputTest, ReadStringsWithLength)
> 
> TEST(InputTest, ReadStringsWithLineContinuation)
> {
>-    int count = 2;
>-    const char* str[] = {"foo\\", "\nba\\\r\nr"};
>-    int length[] = {4, 7};
>-    char buf[11] = {'\0', '\0', '\0', '\0', '\0', '\0', '\0', '\0', '\0', '\0', '\0'};
>-    size_t maxSize = 11;
>-    int lineNo = 0;
>+    int count         = 2;
>+    const char *str[] = {"foo\\", "\nba\\\r\nr"};
>+    int length[]      = {4, 7};
>+    char buf[11]      = {'\0', '\0', '\0', '\0', '\0', '\0', '\0', '\0', '\0', '\0', '\0'};
>+    size_t maxSize    = 11;
>+    int lineNo        = 0;
> 
>     pp::Input input(count, str, length);
>     EXPECT_EQ(3u, input.read(buf, maxSize, &lineNo));
>@@ -176,3 +181,5 @@ TEST(InputTest, ReadStringsWithLineContinuation)
>     EXPECT_EQ(2, lineNo);
>     EXPECT_STREQ("foobar", buf);
> }
>+
>+}  // namespace angle
>diff --git a/Source/ThirdParty/ANGLE/src/tests/preprocessor_tests/location_test.cpp b/Source/ThirdParty/ANGLE/src/tests/preprocessor_tests/location_test.cpp
>index 0b36e4e7008..8e8a5f65162 100644
>--- a/Source/ThirdParty/ANGLE/src/tests/preprocessor_tests/location_test.cpp
>+++ b/Source/ThirdParty/ANGLE/src/tests/preprocessor_tests/location_test.cpp
>@@ -7,13 +7,18 @@
> #include "PreprocessorTest.h"
> #include "compiler/preprocessor/Token.h"
> 
>+namespace angle
>+{
>+
> class LocationTest : public PreprocessorTest
> {
>-protected:
>+  protected:
>+    LocationTest() : PreprocessorTest(SH_GLES2_SPEC) {}
>+
>     void expectLocation(int count,
>-                        const char* const string[],
>+                        const char *const string[],
>                         const int length[],
>-                        const pp::SourceLocation& location)
>+                        const pp::SourceLocation &location)
>     {
>         ASSERT_TRUE(mPreprocessor.init(count, string, length));
> 
>@@ -29,7 +34,7 @@ protected:
> 
> TEST_F(LocationTest, String0_Line1)
> {
>-    const char* str = "foo";
>+    const char *str = "foo";
>     pp::SourceLocation loc(0, 1);
> 
>     SCOPED_TRACE("String0_Line1");
>@@ -38,7 +43,7 @@ TEST_F(LocationTest, String0_Line1)
> 
> TEST_F(LocationTest, String0_Line2)
> {
>-    const char* str = "\nfoo";
>+    const char *str = "\nfoo";
>     pp::SourceLocation loc(0, 2);
> 
>     SCOPED_TRACE("String0_Line2");
>@@ -47,7 +52,7 @@ TEST_F(LocationTest, String0_Line2)
> 
> TEST_F(LocationTest, String1_Line1)
> {
>-    const char* const str[] = {"\n\n", "foo"};
>+    const char *const str[] = {"\n\n", "foo"};
>     pp::SourceLocation loc(1, 1);
> 
>     SCOPED_TRACE("String1_Line1");
>@@ -56,7 +61,7 @@ TEST_F(LocationTest, String1_Line1)
> 
> TEST_F(LocationTest, String1_Line2)
> {
>-    const char* const str[] = {"\n\n", "\nfoo"};
>+    const char *const str[] = {"\n\n", "\nfoo"};
>     pp::SourceLocation loc(1, 2);
> 
>     SCOPED_TRACE("String1_Line2");
>@@ -65,7 +70,7 @@ TEST_F(LocationTest, String1_Line2)
> 
> TEST_F(LocationTest, NewlineInsideCommentCounted)
> {
>-    const char* str = "/*\n\n*/foo";
>+    const char *str = "/*\n\n*/foo";
>     pp::SourceLocation loc(0, 3);
> 
>     SCOPED_TRACE("NewlineInsideCommentCounted");
>@@ -74,12 +79,11 @@ TEST_F(LocationTest, NewlineInsideCommentCounted)
> 
> TEST_F(LocationTest, ErrorLocationAfterComment)
> {
>-    const char* str = "/*\n\n*/@";
>+    const char *str = "/*\n\n*/@";
> 
>     ASSERT_TRUE(mPreprocessor.init(1, &str, nullptr));
>-    EXPECT_CALL(mDiagnostics, print(pp::Diagnostics::PP_INVALID_CHARACTER,
>-                                    pp::SourceLocation(0, 3),
>-                                    "@"));
>+    EXPECT_CALL(mDiagnostics,
>+                print(pp::Diagnostics::PP_INVALID_CHARACTER, pp::SourceLocation(0, 3), "@"));
> 
>     pp::Token token;
>     mPreprocessor.lex(&token);
>@@ -90,7 +94,7 @@ TEST_F(LocationTest, ErrorLocationAfterComment)
> 
> TEST_F(LocationTest, TokenStraddlingTwoStrings)
> {
>-    const char* const str[] = {"f", "oo"};
>+    const char *const str[] = {"f", "oo"};
>     pp::SourceLocation loc(0, 1);
> 
>     SCOPED_TRACE("TokenStraddlingTwoStrings");
>@@ -99,7 +103,7 @@ TEST_F(LocationTest, TokenStraddlingTwoStrings)
> 
> TEST_F(LocationTest, TokenStraddlingThreeStrings)
> {
>-    const char* const str[] = {"f", "o", "o"};
>+    const char *const str[] = {"f", "o", "o"};
>     pp::SourceLocation loc(0, 1);
> 
>     SCOPED_TRACE("TokenStraddlingThreeStrings");
>@@ -108,7 +112,7 @@ TEST_F(LocationTest, TokenStraddlingThreeStrings)
> 
> TEST_F(LocationTest, EndOfFileWithoutNewline)
> {
>-    const char* const str[] = {"foo"};
>+    const char *const str[] = {"foo"};
>     ASSERT_TRUE(mPreprocessor.init(1, str, nullptr));
> 
>     pp::Token token;
>@@ -126,7 +130,7 @@ TEST_F(LocationTest, EndOfFileWithoutNewline)
> 
> TEST_F(LocationTest, EndOfFileAfterNewline)
> {
>-    const char* const str[] = {"foo\n"};
>+    const char *const str[] = {"foo\n"};
>     ASSERT_TRUE(mPreprocessor.init(1, str, nullptr));
> 
>     pp::Token token;
>@@ -144,7 +148,7 @@ TEST_F(LocationTest, EndOfFileAfterNewline)
> 
> TEST_F(LocationTest, EndOfFileAfterEmptyString)
> {
>-    const char* const str[] = {"foo\n", "\n", ""};
>+    const char *const str[] = {"foo\n", "\n", ""};
>     ASSERT_TRUE(mPreprocessor.init(3, str, nullptr));
> 
>     pp::Token token;
>@@ -162,8 +166,9 @@ TEST_F(LocationTest, EndOfFileAfterEmptyString)
> 
> TEST_F(LocationTest, ValidLineDirective1)
> {
>-    const char* str = "#line 10\n"
>-                      "foo";
>+    const char *str =
>+        "#line 10\n"
>+        "foo";
>     pp::SourceLocation loc(0, 10);
> 
>     SCOPED_TRACE("ValidLineDirective1");
>@@ -172,8 +177,9 @@ TEST_F(LocationTest, ValidLineDirective1)
> 
> TEST_F(LocationTest, ValidLineDirective2)
> {
>-    const char* str = "#line 10 20\n"
>-                      "foo";
>+    const char *str =
>+        "#line 10 20\n"
>+        "foo";
>     pp::SourceLocation loc(20, 10);
> 
>     SCOPED_TRACE("ValidLineDirective2");
>@@ -182,18 +188,19 @@ TEST_F(LocationTest, ValidLineDirective2)
> 
> TEST_F(LocationTest, LineDirectiveCommentsIgnored)
> {
>-    const char* str = "/* bar */"
>-                      "#"
>-                      "/* bar */"
>-                      "line"
>-                      "/* bar */"
>-                      "10"
>-                      "/* bar */"
>-                      "20"
>-                      "/* bar */"
>-                      "// bar   "
>-                      "\n"
>-                      "foo";
>+    const char *str =
>+        "/* bar */"
>+        "#"
>+        "/* bar */"
>+        "line"
>+        "/* bar */"
>+        "10"
>+        "/* bar */"
>+        "20"
>+        "/* bar */"
>+        "// bar   "
>+        "\n"
>+        "foo";
>     pp::SourceLocation loc(20, 10);
> 
>     SCOPED_TRACE("LineDirectiveCommentsIgnored");
>@@ -202,10 +209,11 @@ TEST_F(LocationTest, LineDirectiveCommentsIgnored)
> 
> TEST_F(LocationTest, LineDirectiveWithMacro1)
> {
>-    const char* str = "#define L 10\n"
>-                      "#define F(x) x\n"
>-                      "#line L F(20)\n"
>-                      "foo";
>+    const char *str =
>+        "#define L 10\n"
>+        "#define F(x) x\n"
>+        "#line L F(20)\n"
>+        "foo";
>     pp::SourceLocation loc(20, 10);
> 
>     SCOPED_TRACE("LineDirectiveWithMacro1");
>@@ -214,9 +222,10 @@ TEST_F(LocationTest, LineDirectiveWithMacro1)
> 
> TEST_F(LocationTest, LineDirectiveWithMacro2)
> {
>-    const char* str = "#define LOC 10 20\n"
>-                      "#line LOC\n"
>-                      "foo";
>+    const char *str =
>+        "#define LOC 10 20\n"
>+        "#line LOC\n"
>+        "foo";
>     pp::SourceLocation loc(20, 10);
> 
>     SCOPED_TRACE("LineDirectiveWithMacro2");
>@@ -225,8 +234,9 @@ TEST_F(LocationTest, LineDirectiveWithMacro2)
> 
> TEST_F(LocationTest, LineDirectiveWithPredefinedMacro)
> {
>-    const char* str = "#line __LINE__ __FILE__\n"
>-                      "foo";
>+    const char *str =
>+        "#line __LINE__ __FILE__\n"
>+        "foo";
>     pp::SourceLocation loc(0, 1);
> 
>     SCOPED_TRACE("LineDirectiveWithMacro");
>@@ -235,7 +245,7 @@ TEST_F(LocationTest, LineDirectiveWithPredefinedMacro)
> 
> TEST_F(LocationTest, LineDirectiveNewlineBeforeStringBreak)
> {
>-    const char* const str[] = {"#line 10 20\n", "foo"};
>+    const char *const str[] = {"#line 10 20\n", "foo"};
>     // String number is incremented after it is set by the line directive.
>     // Also notice that line number is reset after the string break.
>     pp::SourceLocation loc(21, 1);
>@@ -246,7 +256,7 @@ TEST_F(LocationTest, LineDirectiveNewlineBeforeStringBreak)
> 
> TEST_F(LocationTest, LineDirectiveNewlineAfterStringBreak)
> {
>-    const char* const str[] = {"#line 10 20", "\nfoo"};
>+    const char *const str[] = {"#line 10 20", "\nfoo"};
>     // String number is incremented before it is set by the line directive.
>     pp::SourceLocation loc(20, 10);
> 
>@@ -256,7 +266,7 @@ TEST_F(LocationTest, LineDirectiveNewlineAfterStringBreak)
> 
> TEST_F(LocationTest, LineDirectiveMissingNewline)
> {
>-    const char* str = "#line 10";
>+    const char *str = "#line 10";
>     ASSERT_TRUE(mPreprocessor.init(1, &str, nullptr));
> 
>     using testing::_;
>@@ -272,7 +282,7 @@ TEST_F(LocationTest, LineOverflowRegular)
> {
>     const char *str = "#line 0x7FFFFFFF\n\n";
> 
>-    ASSERT_TRUE(mPreprocessor.init(1, &str, NULL));
>+    ASSERT_TRUE(mPreprocessor.init(1, &str, nullptr));
> 
>     using testing::_;
>     // Error reported about EOF.
>@@ -287,7 +297,7 @@ TEST_F(LocationTest, LineOverflowInComment)
> {
>     const char *str = "#line 0x7FFFFFFF\n/*\n*/";
> 
>-    ASSERT_TRUE(mPreprocessor.init(1, &str, NULL));
>+    ASSERT_TRUE(mPreprocessor.init(1, &str, nullptr));
> 
>     using testing::_;
>     // Error reported about EOF.
>@@ -303,7 +313,7 @@ TEST_F(LocationTest, LineOverflowInContinuationN)
> {
>     const char *str = "#line 0x7FFFFFFF\n \\\n\n";
> 
>-    ASSERT_TRUE(mPreprocessor.init(1, &str, NULL));
>+    ASSERT_TRUE(mPreprocessor.init(1, &str, nullptr));
> 
>     using testing::_;
>     // Error reported about EOF.
>@@ -319,7 +329,7 @@ TEST_F(LocationTest, LineOverflowInContinuationRN)
> {
>     const char *str = "#line 0x7FFFFFFF\n \\\r\n\n";
> 
>-    ASSERT_TRUE(mPreprocessor.init(1, &str, NULL));
>+    ASSERT_TRUE(mPreprocessor.init(1, &str, nullptr));
> 
>     using testing::_;
>     // Error reported about EOF.
>@@ -331,14 +341,12 @@ TEST_F(LocationTest, LineOverflowInContinuationRN)
> 
> struct LineTestParam
> {
>-    const char* str;
>+    const char *str;
>     pp::Diagnostics::ID id;
> };
> 
>-class InvalidLineTest : public LocationTest,
>-                        public testing::WithParamInterface<LineTestParam>
>-{
>-};
>+class InvalidLineTest : public LocationTest, public testing::WithParamInterface<LineTestParam>
>+{};
> 
> TEST_P(InvalidLineTest, Identified)
> {
>@@ -362,7 +370,7 @@ static const LineTestParam kParams[] = {
>     {"#line 0xffffffff\n", pp::Diagnostics::PP_INTEGER_OVERFLOW},
>     {"#line 10 0xffffffff\n", pp::Diagnostics::PP_INTEGER_OVERFLOW}};
> 
>-INSTANTIATE_TEST_CASE_P(All, InvalidLineTest, testing::ValuesIn(kParams));
>+INSTANTIATE_TEST_SUITE_P(All, InvalidLineTest, testing::ValuesIn(kParams));
> 
> struct LineExpressionTestParam
> {
>@@ -372,13 +380,12 @@ struct LineExpressionTestParam
> 
> class LineExpressionTest : public LocationTest,
>                            public testing::WithParamInterface<LineExpressionTestParam>
>-{
>-};
>+{};
> 
> TEST_P(LineExpressionTest, ExpressionEvaluation)
> {
>     LineExpressionTestParam param = GetParam();
>-    const char *strs[3] = {"#line ", param.expression, "\nfoo"};
>+    const char *strs[3]           = {"#line ", param.expression, "\nfoo"};
> 
>     pp::SourceLocation loc(2, param.expectedLine);
> 
>@@ -386,28 +393,12 @@ TEST_P(LineExpressionTest, ExpressionEvaluation)
> }
> 
> static const LineExpressionTestParam kParamsLineExpressionTest[] = {
>-    {"1 + 2", 3},
>-    {"5 - 3", 2},
>-    {"7 * 11", 77},
>-    {"20 / 10", 2},
>-    {"10 % 5", 0},
>-    {"7 && 3", 1},
>-    {"7 || 0", 1},
>-    {"11 == 11", 1},
>-    {"11 != 11", 0},
>-    {"11 > 7", 1},
>-    {"11 < 7", 0},
>-    {"11 >= 7", 1},
>-    {"11 <= 7", 0},
>-    {"!11", 0},
>-    {"-1", -1},
>-    {"+9", 9},
>-    {"(1 + 2) * 4", 12},
>-    {"3 | 5", 7},
>-    {"3 ^ 5", 6},
>-    {"3 & 5", 1},
>-    {"~5", ~5},
>-    {"2 << 3", 16},
>-    {"16 >> 2", 4}};
>-
>-INSTANTIATE_TEST_CASE_P(All, LineExpressionTest, testing::ValuesIn(kParamsLineExpressionTest));
>+    {"1 + 2", 3},  {"5 - 3", 2},        {"7 * 11", 77},  {"20 / 10", 2},  {"10 % 5", 0},
>+    {"7 && 3", 1}, {"7 || 0", 1},       {"11 == 11", 1}, {"11 != 11", 0}, {"11 > 7", 1},
>+    {"11 < 7", 0}, {"11 >= 7", 1},      {"11 <= 7", 0},  {"!11", 0},      {"-1", -1},
>+    {"+9", 9},     {"(1 + 2) * 4", 12}, {"3 | 5", 7},    {"3 ^ 5", 6},    {"3 & 5", 1},
>+    {"~5", ~5},    {"2 << 3", 16},      {"16 >> 2", 4}};
>+
>+INSTANTIATE_TEST_SUITE_P(All, LineExpressionTest, testing::ValuesIn(kParamsLineExpressionTest));
>+
>+}  // namespace angle
>diff --git a/Source/ThirdParty/ANGLE/src/tests/preprocessor_tests/number_test.cpp b/Source/ThirdParty/ANGLE/src/tests/preprocessor_tests/number_test.cpp
>index 6644120113a..bb944db1c8c 100644
>--- a/Source/ThirdParty/ANGLE/src/tests/preprocessor_tests/number_test.cpp
>+++ b/Source/ThirdParty/ANGLE/src/tests/preprocessor_tests/number_test.cpp
>@@ -4,19 +4,23 @@
> // found in the LICENSE file.
> //
> 
>+#include <tuple>
>+
> #include "PreprocessorTest.h"
> #include "compiler/preprocessor/Token.h"
> 
>+namespace angle
>+{
>+
> #define CLOSED_RANGE(x, y) testing::Range(x, static_cast<char>((y) + 1))
> 
> class InvalidNumberTest : public SimplePreprocessorTest,
>                           public testing::WithParamInterface<const char *>
>-{
>-};
>+{};
> 
> TEST_P(InvalidNumberTest, InvalidNumberIdentified)
> {
>-    const char* str = GetParam();
>+    const char *str = GetParam();
> 
>     using testing::_;
>     EXPECT_CALL(mDiagnostics, print(pp::Diagnostics::PP_INVALID_NUMBER, _, str));
>@@ -24,23 +28,21 @@ TEST_P(InvalidNumberTest, InvalidNumberIdentified)
>     preprocess(str);
> }
> 
>-INSTANTIATE_TEST_CASE_P(InvalidIntegers, InvalidNumberTest,
>-                        testing::Values("1a", "08", "0xG"));
>-
>+INSTANTIATE_TEST_SUITE_P(InvalidIntegers, InvalidNumberTest, testing::Values("1a", "08", "0xG"));
> 
>-INSTANTIATE_TEST_CASE_P(InvalidFloats, InvalidNumberTest,
>-                        testing::Values("1eg", "0.a", "0.1.2", ".0a", ".0.1"));
>+INSTANTIATE_TEST_SUITE_P(InvalidFloats,
>+                         InvalidNumberTest,
>+                         testing::Values("1eg", "0.a", "0.1.2", ".0a", ".0.1"));
> 
>-typedef std::tr1::tuple<const char*, char> IntegerParams;
>+typedef std::tuple<const char *, char> IntegerParams;
> class IntegerTest : public SimplePreprocessorTest, public testing::WithParamInterface<IntegerParams>
>-{
>-};
>+{};
> 
> TEST_P(IntegerTest, Identified)
> {
>-    std::string str(std::tr1::get<0>(GetParam()));  // prefix.
>-    str.push_back(std::tr1::get<1>(GetParam()));  // digit.
>-    const char* cstr = str.c_str();
>+    std::string str(std::get<0>(GetParam()));  // prefix.
>+    str.push_back(std::get<1>(GetParam()));    // digit.
>+    const char *cstr = str.c_str();
> 
>     pp::Token token;
>     lexSingleToken(cstr, &token);
>@@ -48,37 +50,32 @@ TEST_P(IntegerTest, Identified)
>     EXPECT_EQ(str, token.text);
> }
> 
>-INSTANTIATE_TEST_CASE_P(DecimalInteger,
>-                        IntegerTest,
>-                        testing::Combine(testing::Values(""),
>-                                         CLOSED_RANGE('0', '9')));
>+INSTANTIATE_TEST_SUITE_P(DecimalInteger,
>+                         IntegerTest,
>+                         testing::Combine(testing::Values(""), CLOSED_RANGE('0', '9')));
> 
>-INSTANTIATE_TEST_CASE_P(OctalInteger,
>-                        IntegerTest,
>-                        testing::Combine(testing::Values("0"),
>-                                         CLOSED_RANGE('0', '7')));
>+INSTANTIATE_TEST_SUITE_P(OctalInteger,
>+                         IntegerTest,
>+                         testing::Combine(testing::Values("0"), CLOSED_RANGE('0', '7')));
> 
>-INSTANTIATE_TEST_CASE_P(HexadecimalInteger_0_9,
>-                        IntegerTest,
>-                        testing::Combine(testing::Values("0x", "0X"),
>-                                         CLOSED_RANGE('0', '9')));
>+INSTANTIATE_TEST_SUITE_P(HexadecimalInteger_0_9,
>+                         IntegerTest,
>+                         testing::Combine(testing::Values("0x", "0X"), CLOSED_RANGE('0', '9')));
> 
>-INSTANTIATE_TEST_CASE_P(HexadecimalInteger_a_f,
>-                        IntegerTest,
>-                        testing::Combine(testing::Values("0x", "0X"),
>-                                         CLOSED_RANGE('a', 'f')));
>+INSTANTIATE_TEST_SUITE_P(HexadecimalInteger_a_f,
>+                         IntegerTest,
>+                         testing::Combine(testing::Values("0x", "0X"), CLOSED_RANGE('a', 'f')));
> 
>-INSTANTIATE_TEST_CASE_P(HexadecimalInteger_A_F,
>-                        IntegerTest,
>-                        testing::Combine(testing::Values("0x", "0X"),
>-                                         CLOSED_RANGE('A', 'F')));
>+INSTANTIATE_TEST_SUITE_P(HexadecimalInteger_A_F,
>+                         IntegerTest,
>+                         testing::Combine(testing::Values("0x", "0X"), CLOSED_RANGE('A', 'F')));
> 
> class FloatTest : public SimplePreprocessorTest
> {
>   protected:
>-    void expectFloat(const std::string& str)
>+    void expectFloat(const std::string &str)
>     {
>-        const char* cstr = str.c_str();
>+        const char *cstr = str.c_str();
> 
>         pp::Token token;
>         lexSingleToken(cstr, &token);
>@@ -87,52 +84,47 @@ class FloatTest : public SimplePreprocessorTest
>     }
> };
> 
>-typedef std::tr1::tuple<char, char, const char*, char> FloatScientificParams;
>-class FloatScientificTest :
>-    public FloatTest,
>-    public testing::WithParamInterface<FloatScientificParams>
>-{
>-};
>+typedef std::tuple<char, char, const char *, char> FloatScientificParams;
>+class FloatScientificTest : public FloatTest,
>+                            public testing::WithParamInterface<FloatScientificParams>
>+{};
> 
> // This test covers floating point numbers of form [0-9][eE][+-]?[0-9].
> TEST_P(FloatScientificTest, FloatIdentified)
> {
>     std::string str;
>-    str.push_back(std::tr1::get<0>(GetParam()));  // significand [0-9].
>-    str.push_back(std::tr1::get<1>(GetParam()));  // separator [eE].
>-    str.append(std::tr1::get<2>(GetParam()));  // sign [" " "+" "-"].
>-    str.push_back(std::tr1::get<3>(GetParam()));  // exponent [0-9].
>+    str.push_back(std::get<0>(GetParam()));  // significand [0-9].
>+    str.push_back(std::get<1>(GetParam()));  // separator [eE].
>+    str.append(std::get<2>(GetParam()));     // sign [" " "+" "-"].
>+    str.push_back(std::get<3>(GetParam()));  // exponent [0-9].
> 
>     SCOPED_TRACE("FloatScientificTest");
>     expectFloat(str);
> }
> 
>-INSTANTIATE_TEST_CASE_P(FloatScientific,
>-                        FloatScientificTest,
>-                        testing::Combine(CLOSED_RANGE('0', '9'),
>-                                         testing::Values('e', 'E'),
>-                                         testing::Values("", "+", "-"),
>-                                         CLOSED_RANGE('0', '9')));
>-
>-typedef std::tr1::tuple<char, char> FloatFractionParams;
>-class FloatFractionTest :
>-    public FloatTest,
>-    public testing::WithParamInterface<FloatFractionParams>
>-{
>-};
>+INSTANTIATE_TEST_SUITE_P(FloatScientific,
>+                         FloatScientificTest,
>+                         testing::Combine(CLOSED_RANGE('0', '9'),
>+                                          testing::Values('e', 'E'),
>+                                          testing::Values("", "+", "-"),
>+                                          CLOSED_RANGE('0', '9')));
>+
>+typedef std::tuple<char, char> FloatFractionParams;
>+class FloatFractionTest : public FloatTest, public testing::WithParamInterface<FloatFractionParams>
>+{};
> 
> // This test covers floating point numbers of form [0-9]"." and [0-9]?"."[0-9].
> TEST_P(FloatFractionTest, FloatIdentified)
> {
>     std::string str;
> 
>-    char significand = std::tr1::get<0>(GetParam());
>+    char significand = std::get<0>(GetParam());
>     if (significand != '\0')
>         str.push_back(significand);
> 
>     str.push_back('.');
> 
>-    char fraction = std::tr1::get<1>(GetParam());
>+    char fraction = std::get<1>(GetParam());
>     if (fraction != '\0')
>         str.push_back(fraction);
> 
>@@ -140,20 +132,17 @@ TEST_P(FloatFractionTest, FloatIdentified)
>     expectFloat(str);
> }
> 
>-INSTANTIATE_TEST_CASE_P(FloatFraction_X_X,
>-                        FloatFractionTest,
>-                        testing::Combine(CLOSED_RANGE('0', '9'),
>-                                         CLOSED_RANGE('0', '9')));
>+INSTANTIATE_TEST_SUITE_P(FloatFraction_X_X,
>+                         FloatFractionTest,
>+                         testing::Combine(CLOSED_RANGE('0', '9'), CLOSED_RANGE('0', '9')));
> 
>-INSTANTIATE_TEST_CASE_P(FloatFraction_0_X,
>-                        FloatFractionTest,
>-                        testing::Combine(testing::Values('\0'),
>-                                         CLOSED_RANGE('0', '9')));
>+INSTANTIATE_TEST_SUITE_P(FloatFraction_0_X,
>+                         FloatFractionTest,
>+                         testing::Combine(testing::Values('\0'), CLOSED_RANGE('0', '9')));
> 
>-INSTANTIATE_TEST_CASE_P(FloatFraction_X_0,
>-                        FloatFractionTest,
>-                        testing::Combine(CLOSED_RANGE('0', '9'),
>-                                         testing::Values('\0')));
>+INSTANTIATE_TEST_SUITE_P(FloatFraction_X_0,
>+                         FloatFractionTest,
>+                         testing::Combine(CLOSED_RANGE('0', '9'), testing::Values('\0')));
> 
> // In the tests above we have tested individual parts of a float separately.
> // This test has all parts of a float.
>@@ -162,3 +151,5 @@ TEST_F(FloatTest, FractionScientific)
>     SCOPED_TRACE("FractionScientific");
>     expectFloat("0.1e+2");
> }
>+
>+}  // namespace angle
>diff --git a/Source/ThirdParty/ANGLE/src/tests/preprocessor_tests/operator_test.cpp b/Source/ThirdParty/ANGLE/src/tests/preprocessor_tests/operator_test.cpp
>index a6d9f83e4fb..d4081f13ff3 100644
>--- a/Source/ThirdParty/ANGLE/src/tests/preprocessor_tests/operator_test.cpp
>+++ b/Source/ThirdParty/ANGLE/src/tests/preprocessor_tests/operator_test.cpp
>@@ -7,16 +7,18 @@
> #include "PreprocessorTest.h"
> #include "compiler/preprocessor/Token.h"
> 
>+namespace angle
>+{
>+
> struct OperatorTestParam
> {
>-    const char* str;
>+    const char *str;
>     int op;
> };
> 
> class OperatorTest : public SimplePreprocessorTest,
>                      public testing::WithParamInterface<OperatorTestParam>
>-{
>-};
>+{};
> 
> TEST_P(OperatorTest, Identified)
> {
>@@ -28,51 +30,49 @@ TEST_P(OperatorTest, Identified)
>     EXPECT_EQ(param.str, token.text);
> }
> 
>-static const OperatorTestParam kOperators[] = {
>-    {"(", '('},
>-    {")", ')'},
>-    {"[", '['},
>-    {"]", ']'},
>-    {".", '.'},
>-    {"+", '+'},
>-    {"-", '-'},
>-    {"~", '~'},
>-    {"!", '!'},
>-    {"*", '*'},
>-    {"/", '/'},
>-    {"%", '%'},
>-    {"<", '<'},
>-    {">", '>'},
>-    {"&", '&'},
>-    {"^", '^'},
>-    {"|", '|'},
>-    {"?", '?'},
>-    {":", ':'},
>-    {"=", '='},
>-    {",", ','},
>-    {"++",  pp::Token::OP_INC},
>-    {"--",  pp::Token::OP_DEC},
>-    {"<<",  pp::Token::OP_LEFT},
>-    {">>",  pp::Token::OP_RIGHT},
>-    {"<=",  pp::Token::OP_LE},
>-    {">=",  pp::Token::OP_GE},
>-    {"==",  pp::Token::OP_EQ},
>-    {"!=",  pp::Token::OP_NE},
>-    {"&&",  pp::Token::OP_AND},
>-    {"^^",  pp::Token::OP_XOR},
>-    {"||",  pp::Token::OP_OR},
>-    {"+=",  pp::Token::OP_ADD_ASSIGN},
>-    {"-=",  pp::Token::OP_SUB_ASSIGN},
>-    {"*=",  pp::Token::OP_MUL_ASSIGN},
>-    {"/=",  pp::Token::OP_DIV_ASSIGN},
>-    {"%=",  pp::Token::OP_MOD_ASSIGN},
>-    {"<<=", pp::Token::OP_LEFT_ASSIGN},
>-    {">>=", pp::Token::OP_RIGHT_ASSIGN},
>-    {"&=",  pp::Token::OP_AND_ASSIGN},
>-    {"^=",  pp::Token::OP_XOR_ASSIGN},
>-    {"|=",  pp::Token::OP_OR_ASSIGN}
>-};
>+static const OperatorTestParam kOperators[] = {{"(", '('},
>+                                               {")", ')'},
>+                                               {"[", '['},
>+                                               {"]", ']'},
>+                                               {".", '.'},
>+                                               {"+", '+'},
>+                                               {"-", '-'},
>+                                               {"~", '~'},
>+                                               {"!", '!'},
>+                                               {"*", '*'},
>+                                               {"/", '/'},
>+                                               {"%", '%'},
>+                                               {"<", '<'},
>+                                               {">", '>'},
>+                                               {"&", '&'},
>+                                               {"^", '^'},
>+                                               {"|", '|'},
>+                                               {"?", '?'},
>+                                               {":", ':'},
>+                                               {"=", '='},
>+                                               {",", ','},
>+                                               {"++", pp::Token::OP_INC},
>+                                               {"--", pp::Token::OP_DEC},
>+                                               {"<<", pp::Token::OP_LEFT},
>+                                               {">>", pp::Token::OP_RIGHT},
>+                                               {"<=", pp::Token::OP_LE},
>+                                               {">=", pp::Token::OP_GE},
>+                                               {"==", pp::Token::OP_EQ},
>+                                               {"!=", pp::Token::OP_NE},
>+                                               {"&&", pp::Token::OP_AND},
>+                                               {"^^", pp::Token::OP_XOR},
>+                                               {"||", pp::Token::OP_OR},
>+                                               {"+=", pp::Token::OP_ADD_ASSIGN},
>+                                               {"-=", pp::Token::OP_SUB_ASSIGN},
>+                                               {"*=", pp::Token::OP_MUL_ASSIGN},
>+                                               {"/=", pp::Token::OP_DIV_ASSIGN},
>+                                               {"%=", pp::Token::OP_MOD_ASSIGN},
>+                                               {"<<=", pp::Token::OP_LEFT_ASSIGN},
>+                                               {">>=", pp::Token::OP_RIGHT_ASSIGN},
>+                                               {"&=", pp::Token::OP_AND_ASSIGN},
>+                                               {"^=", pp::Token::OP_XOR_ASSIGN},
>+                                               {"|=", pp::Token::OP_OR_ASSIGN}};
> 
>-INSTANTIATE_TEST_CASE_P(All, OperatorTest,
>-                        testing::ValuesIn(kOperators));
>+INSTANTIATE_TEST_SUITE_P(All, OperatorTest, testing::ValuesIn(kOperators));
> 
>+}  // namespace angle
>diff --git a/Source/ThirdParty/ANGLE/src/tests/preprocessor_tests/pragma_test.cpp b/Source/ThirdParty/ANGLE/src/tests/preprocessor_tests/pragma_test.cpp
>index dad88cb6562..30ed3b0027f 100644
>--- a/Source/ThirdParty/ANGLE/src/tests/preprocessor_tests/pragma_test.cpp
>+++ b/Source/ThirdParty/ANGLE/src/tests/preprocessor_tests/pragma_test.cpp
>@@ -7,14 +7,16 @@
> #include "PreprocessorTest.h"
> #include "compiler/preprocessor/Token.h"
> 
>-class PragmaTest : public SimplePreprocessorTest
>+namespace angle
> {
>-};
>+
>+class PragmaTest : public SimplePreprocessorTest
>+{};
> 
> TEST_F(PragmaTest, EmptyName)
> {
>-    const char* str = "#pragma\n";
>-    const char* expected = "\n";
>+    const char *str      = "#pragma\n";
>+    const char *expected = "\n";
> 
>     using testing::_;
>     // No handlePragma calls.
>@@ -27,12 +29,11 @@ TEST_F(PragmaTest, EmptyName)
> 
> TEST_F(PragmaTest, EmptyValue)
> {
>-    const char* str = "#pragma foo\n";
>-    const char* expected = "\n";
>+    const char *str      = "#pragma foo\n";
>+    const char *expected = "\n";
> 
>     using testing::_;
>-    EXPECT_CALL(mDirectiveHandler,
>-                handlePragma(pp::SourceLocation(0, 1), "foo", "", false));
>+    EXPECT_CALL(mDirectiveHandler, handlePragma(pp::SourceLocation(0, 1), "foo", "", false));
>     // No error or warning.
>     EXPECT_CALL(mDiagnostics, print(_, _, _)).Times(0);
> 
>@@ -41,12 +42,11 @@ TEST_F(PragmaTest, EmptyValue)
> 
> TEST_F(PragmaTest, NameValue)
> {
>-    const char* str = "#pragma foo(bar)\n";
>-    const char* expected = "\n";
>+    const char *str      = "#pragma foo(bar)\n";
>+    const char *expected = "\n";
> 
>     using testing::_;
>-    EXPECT_CALL(mDirectiveHandler,
>-                handlePragma(pp::SourceLocation(0, 1), "foo", "bar", false));
>+    EXPECT_CALL(mDirectiveHandler, handlePragma(pp::SourceLocation(0, 1), "foo", "bar", false));
>     // No error or warning.
>     EXPECT_CALL(mDiagnostics, print(_, _, _)).Times(0);
> 
>@@ -55,12 +55,11 @@ TEST_F(PragmaTest, NameValue)
> 
> TEST_F(PragmaTest, STDGL)
> {
>-    const char* str = "#pragma STDGL\n";
>-    const char* expected = "\n";
>+    const char *str      = "#pragma STDGL\n";
>+    const char *expected = "\n";
> 
>     using testing::_;
>-    EXPECT_CALL(mDirectiveHandler,
>-                handlePragma(_, _, _, _)).Times(0);
>+    EXPECT_CALL(mDirectiveHandler, handlePragma(_, _, _, _)).Times(0);
>     // No error or warning.
>     EXPECT_CALL(mDiagnostics, print(_, _, _)).Times(0);
> 
>@@ -69,8 +68,8 @@ TEST_F(PragmaTest, STDGL)
> 
> TEST_F(PragmaTest, STDGLInvariantAll)
> {
>-    const char* str = "#pragma STDGL invariant(all)\n";
>-    const char* expected = "\n";
>+    const char *str      = "#pragma STDGL invariant(all)\n";
>+    const char *expected = "\n";
> 
>     using testing::_;
>     EXPECT_CALL(mDirectiveHandler,
>@@ -83,26 +82,26 @@ TEST_F(PragmaTest, STDGLInvariantAll)
> 
> TEST_F(PragmaTest, Comments)
> {
>-    const char* str = "/*foo*/"
>-                      "#"
>-                      "/*foo*/"
>-                      "pragma"
>-                      "/*foo*/"
>-                      "foo"
>-                      "/*foo*/"
>-                      "("
>-                      "/*foo*/"
>-                      "bar"
>-                      "/*foo*/"
>-                      ")"
>-                      "/*foo*/"
>-                      "//foo"
>-                      "\n";
>-    const char* expected = "\n";
>+    const char *str =
>+        "/*foo*/"
>+        "#"
>+        "/*foo*/"
>+        "pragma"
>+        "/*foo*/"
>+        "foo"
>+        "/*foo*/"
>+        "("
>+        "/*foo*/"
>+        "bar"
>+        "/*foo*/"
>+        ")"
>+        "/*foo*/"
>+        "//foo"
>+        "\n";
>+    const char *expected = "\n";
> 
>     using testing::_;
>-    EXPECT_CALL(mDirectiveHandler,
>-                handlePragma(pp::SourceLocation(0, 1), "foo", "bar", false));
>+    EXPECT_CALL(mDirectiveHandler, handlePragma(pp::SourceLocation(0, 1), "foo", "bar", false));
>     // No error or warning.
>     EXPECT_CALL(mDiagnostics, print(_, _, _)).Times(0);
> 
>@@ -111,44 +110,43 @@ TEST_F(PragmaTest, Comments)
> 
> TEST_F(PragmaTest, MissingNewline)
> {
>-    const char* str = "#pragma foo(bar)";
>-    const char* expected = "";
>+    const char *str      = "#pragma foo(bar)";
>+    const char *expected = "";
> 
>     using testing::_;
>     // Pragma successfully parsed.
>-    EXPECT_CALL(mDirectiveHandler,
>-                handlePragma(pp::SourceLocation(0, 1), "foo", "bar", false));
>+    EXPECT_CALL(mDirectiveHandler, handlePragma(pp::SourceLocation(0, 1), "foo", "bar", false));
>     // Error reported about EOF.
>     EXPECT_CALL(mDiagnostics, print(pp::Diagnostics::PP_EOF_IN_DIRECTIVE, _, _));
> 
>     preprocess(str, expected);
> }
> 
>-class InvalidPragmaTest : public PragmaTest,
>-                          public testing::WithParamInterface<const char*>
>-{
>-};
>+class InvalidPragmaTest : public PragmaTest, public testing::WithParamInterface<const char *>
>+{};
> 
> TEST_P(InvalidPragmaTest, Identified)
> {
>-    const char* str = GetParam();
>-    const char* expected = "\n";
>+    const char *str      = GetParam();
>+    const char *expected = "\n";
> 
>     using testing::_;
>     // No handlePragma calls.
>     EXPECT_CALL(mDirectiveHandler, handlePragma(_, _, _, false)).Times(0);
>     // Unrecognized pragma warning.
>     EXPECT_CALL(mDiagnostics,
>-                print(pp::Diagnostics::PP_UNRECOGNIZED_PRAGMA,
>-                      pp::SourceLocation(0, 1), _));
>+                print(pp::Diagnostics::PP_UNRECOGNIZED_PRAGMA, pp::SourceLocation(0, 1), _));
> 
>     preprocess(str, expected);
> }
> 
>-INSTANTIATE_TEST_CASE_P(All, InvalidPragmaTest, testing::Values(
>-    "#pragma 1\n",               // Invalid name.
>-    "#pragma foo()\n",           // Missing value.
>-    "#pragma foo bar)\n",        // Missing left paren,
>-    "#pragma foo(bar\n",         // Missing right paren.
>-    "#pragma foo bar\n",         // Missing parens.
>-    "#pragma foo(bar) baz\n"));  // Extra tokens.
>+INSTANTIATE_TEST_SUITE_P(All,
>+                         InvalidPragmaTest,
>+                         testing::Values("#pragma 1\n",               // Invalid name.
>+                                         "#pragma foo()\n",           // Missing value.
>+                                         "#pragma foo bar)\n",        // Missing left paren,
>+                                         "#pragma foo(bar\n",         // Missing right paren.
>+                                         "#pragma foo bar\n",         // Missing parens.
>+                                         "#pragma foo(bar) baz\n"));  // Extra tokens.
>+
>+}  // namespace angle
>diff --git a/Source/ThirdParty/ANGLE/src/tests/preprocessor_tests/space_test.cpp b/Source/ThirdParty/ANGLE/src/tests/preprocessor_tests/space_test.cpp
>index 0c3494be591..e3a2a2f694e 100644
>--- a/Source/ThirdParty/ANGLE/src/tests/preprocessor_tests/space_test.cpp
>+++ b/Source/ThirdParty/ANGLE/src/tests/preprocessor_tests/space_test.cpp
>@@ -4,15 +4,22 @@
> // found in the LICENSE file.
> //
> 
>+#include <tuple>
>+
> #include "PreprocessorTest.h"
> #include "compiler/preprocessor/Token.h"
> 
>+namespace angle
>+{
>+
> class SpaceTest : public PreprocessorTest
> {
>   protected:
>-    void expectSpace(const std::string& str)
>+    SpaceTest() : PreprocessorTest(SH_GLES2_SPEC) {}
>+
>+    void expectSpace(const std::string &str)
>     {
>-        const char* cstr = str.c_str();
>+        const char *cstr = str.c_str();
>         ASSERT_TRUE(mPreprocessor.init(1, &cstr, 0));
> 
>         pp::Token token;
>@@ -32,10 +39,8 @@ static const char kSpaceChars[] = {' ', '\t', '\v', '\f'};
> // This test fixture tests the processing of a single whitespace character.
> // All tests in this fixture are ran with all possible whitespace character
> // allowed in GLSL.
>-class SpaceCharTest : public SpaceTest,
>-                      public testing::WithParamInterface<char>
>-{
>-};
>+class SpaceCharTest : public SpaceTest, public testing::WithParamInterface<char>
>+{};
> 
> TEST_P(SpaceCharTest, SpaceIgnored)
> {
>@@ -46,43 +51,39 @@ TEST_P(SpaceCharTest, SpaceIgnored)
>     expectSpace(str);
> }
> 
>-INSTANTIATE_TEST_CASE_P(SingleSpaceChar,
>-                        SpaceCharTest,
>-                        testing::ValuesIn(kSpaceChars));
>+INSTANTIATE_TEST_SUITE_P(SingleSpaceChar, SpaceCharTest, testing::ValuesIn(kSpaceChars));
> 
> // This test fixture tests the processing of a string containing consecutive
> // whitespace characters. All tests in this fixture are ran with all possible
> // combinations of whitespace characters allowed in GLSL.
>-typedef std::tr1::tuple<char, char, char> SpaceStringParams;
>-class SpaceStringTest : public SpaceTest,
>-                        public testing::WithParamInterface<SpaceStringParams>
>-{
>-};
>+typedef std::tuple<char, char, char> SpaceStringParams;
>+class SpaceStringTest : public SpaceTest, public testing::WithParamInterface<SpaceStringParams>
>+{};
> 
> TEST_P(SpaceStringTest, SpaceIgnored)
> {
>     // Construct test string with the whitespace char before "foo".
>     std::string str;
>-    str.push_back(std::tr1::get<0>(GetParam()));
>-    str.push_back(std::tr1::get<1>(GetParam()));
>-    str.push_back(std::tr1::get<2>(GetParam()));
>+    str.push_back(std::get<0>(GetParam()));
>+    str.push_back(std::get<1>(GetParam()));
>+    str.push_back(std::get<2>(GetParam()));
>     str.append("foo");
> 
>     expectSpace(str);
> }
> 
>-INSTANTIATE_TEST_CASE_P(SpaceCharCombination,
>-                        SpaceStringTest,
>-                        testing::Combine(testing::ValuesIn(kSpaceChars),
>-                                         testing::ValuesIn(kSpaceChars),
>-                                         testing::ValuesIn(kSpaceChars)));
>+INSTANTIATE_TEST_SUITE_P(SpaceCharCombination,
>+                         SpaceStringTest,
>+                         testing::Combine(testing::ValuesIn(kSpaceChars),
>+                                          testing::ValuesIn(kSpaceChars),
>+                                          testing::ValuesIn(kSpaceChars)));
> 
> // The tests above make sure that the space char is recorded in the
> // next token. This test makes sure that a token is not incorrectly marked
> // to have leading space.
> TEST_F(SpaceTest, LeadingSpace)
> {
>-    const char* str = " foo+ -bar";
>+    const char *str = " foo+ -bar";
>     ASSERT_TRUE(mPreprocessor.init(1, &str, 0));
> 
>     pp::Token token;
>@@ -104,3 +105,5 @@ TEST_F(SpaceTest, LeadingSpace)
>     EXPECT_EQ("bar", token.text);
>     EXPECT_FALSE(token.hasLeadingSpace());
> }
>+
>+}  // namespace angle
>diff --git a/Source/ThirdParty/ANGLE/src/tests/preprocessor_tests/token_test.cpp b/Source/ThirdParty/ANGLE/src/tests/preprocessor_tests/token_test.cpp
>index 106647c8ede..8d21441a80b 100644
>--- a/Source/ThirdParty/ANGLE/src/tests/preprocessor_tests/token_test.cpp
>+++ b/Source/ThirdParty/ANGLE/src/tests/preprocessor_tests/token_test.cpp
>@@ -8,6 +8,9 @@
> 
> #include "compiler/preprocessor/Token.h"
> 
>+namespace angle
>+{
>+
> TEST(TokenTest, DefaultConstructor)
> {
>     pp::Token token;
>@@ -21,8 +24,8 @@ TEST(TokenTest, DefaultConstructor)
> TEST(TokenTest, Assignment)
> {
>     pp::Token token;
>-    token.type = 1;
>-    token.flags = 1;
>+    token.type          = 1;
>+    token.flags         = 1;
>     token.location.line = 1;
>     token.location.file = 1;
>     token.text.assign("foo");
>@@ -88,3 +91,5 @@ TEST(TokenTest, Write)
>     EXPECT_TRUE(out2.good());
>     EXPECT_EQ(" foo", out2.str());
> }
>+
>+}  // namespace angle
>diff --git a/Source/ThirdParty/ANGLE/src/tests/preprocessor_tests/version_test.cpp b/Source/ThirdParty/ANGLE/src/tests/preprocessor_tests/version_test.cpp
>index 780c5342182..a8352b331ea 100644
>--- a/Source/ThirdParty/ANGLE/src/tests/preprocessor_tests/version_test.cpp
>+++ b/Source/ThirdParty/ANGLE/src/tests/preprocessor_tests/version_test.cpp
>@@ -7,18 +7,19 @@
> #include "PreprocessorTest.h"
> #include "compiler/preprocessor/Token.h"
> 
>-class VersionTest : public SimplePreprocessorTest
>+namespace angle
> {
>-};
>+
>+class VersionTest : public SimplePreprocessorTest
>+{};
> 
> TEST_F(VersionTest, Valid)
> {
>-    const char* str = "#version 200\n";
>-    const char* expected = "\n";
>+    const char *str      = "#version 200\n";
>+    const char *expected = "\n";
> 
>     using testing::_;
>-    EXPECT_CALL(mDirectiveHandler,
>-                handleVersion(pp::SourceLocation(0, 1), 200));
>+    EXPECT_CALL(mDirectiveHandler, handleVersion(pp::SourceLocation(0, 1), 200));
>     // No error or warning.
>     EXPECT_CALL(mDiagnostics, print(_, _, _)).Times(0);
> 
>@@ -27,20 +28,20 @@ TEST_F(VersionTest, Valid)
> 
> TEST_F(VersionTest, CommentsIgnored)
> {
>-    const char* str = "/*foo*/"
>-                      "#"
>-                      "/*foo*/"
>-                      "version"
>-                      "/*foo*/"
>-                      "200"
>-                      "/*foo*/"
>-                      "//foo"
>-                      "\n";
>-    const char* expected = "\n";
>+    const char *str =
>+        "/*foo*/"
>+        "#"
>+        "/*foo*/"
>+        "version"
>+        "/*foo*/"
>+        "200"
>+        "/*foo*/"
>+        "//foo"
>+        "\n";
>+    const char *expected = "\n";
> 
>     using testing::_;
>-    EXPECT_CALL(mDirectiveHandler,
>-                handleVersion(pp::SourceLocation(0, 1), 200));
>+    EXPECT_CALL(mDirectiveHandler, handleVersion(pp::SourceLocation(0, 1), 200));
>     // No error or warning.
>     EXPECT_CALL(mDiagnostics, print(_, _, _)).Times(0);
> 
>@@ -49,13 +50,12 @@ TEST_F(VersionTest, CommentsIgnored)
> 
> TEST_F(VersionTest, MissingNewline)
> {
>-    const char* str = "#version 200";
>-    const char* expected = "";
>+    const char *str      = "#version 200";
>+    const char *expected = "";
> 
>     using testing::_;
>     // Directive successfully parsed.
>-    EXPECT_CALL(mDirectiveHandler,
>-                handleVersion(pp::SourceLocation(0, 1), 200));
>+    EXPECT_CALL(mDirectiveHandler, handleVersion(pp::SourceLocation(0, 1), 200));
>     // Error reported about EOF.
>     EXPECT_CALL(mDiagnostics, print(pp::Diagnostics::PP_EOF_IN_DIRECTIVE, _, _));
> 
>@@ -64,126 +64,122 @@ TEST_F(VersionTest, MissingNewline)
> 
> TEST_F(VersionTest, AfterComments)
> {
>-    const char* str = "/* block comment acceptable */\n"
>-                      "// line comment acceptable\n"
>-                      "#version 200\n";
>-    const char* expected = "\n\n\n";
>+    const char *str =
>+        "/* block comment acceptable */\n"
>+        "// line comment acceptable\n"
>+        "#version 200\n";
>+    const char *expected = "\n\n\n";
> 
>     using testing::_;
>     // Directive successfully parsed.
>-    EXPECT_CALL(mDirectiveHandler,
>-                handleVersion(pp::SourceLocation(0, 3), 200));
>+    EXPECT_CALL(mDirectiveHandler, handleVersion(pp::SourceLocation(0, 3), 200));
>     // No error or warning.
>     EXPECT_CALL(mDiagnostics, print(_, _, _)).Times(0);
>-    
>+
>     preprocess(str, expected);
> }
> 
> TEST_F(VersionTest, AfterWhitespace)
> {
>-    const char* str = "\n"
>-                      "\n"
>-                      "#version 200\n";
>-    const char* expected = "\n\n\n";
>+    const char *str =
>+        "\n"
>+        "\n"
>+        "#version 200\n";
>+    const char *expected = "\n\n\n";
> 
>     using testing::_;
>     // Directive successfully parsed.
>-    EXPECT_CALL(mDirectiveHandler,
>-                handleVersion(pp::SourceLocation(0, 3), 200));
>+    EXPECT_CALL(mDirectiveHandler, handleVersion(pp::SourceLocation(0, 3), 200));
>     // No error or warning.
>     EXPECT_CALL(mDiagnostics, print(_, _, _)).Times(0);
>-    
>+
>     preprocess(str, expected);
> }
> 
> TEST_F(VersionTest, AfterValidToken)
> {
>-    const char* str = "foo\n"
>-                      "#version 200\n";
>+    const char *str =
>+        "foo\n"
>+        "#version 200\n";
> 
>     using testing::_;
>-    EXPECT_CALL(mDiagnostics,
>-                print(pp::Diagnostics::PP_VERSION_NOT_FIRST_STATEMENT,
>-                      pp::SourceLocation(0, 2), _));
>+    EXPECT_CALL(mDiagnostics, print(pp::Diagnostics::PP_VERSION_NOT_FIRST_STATEMENT,
>+                                    pp::SourceLocation(0, 2), _));
> 
>     preprocess(str);
> }
> 
> TEST_F(VersionTest, AfterInvalidToken)
> {
>-    const char* str = "$\n"
>-                      "#version 200\n";
>+    const char *str =
>+        "$\n"
>+        "#version 200\n";
> 
>     using testing::_;
>     EXPECT_CALL(mDiagnostics,
>-                print(pp::Diagnostics::PP_INVALID_CHARACTER,
>-                      pp::SourceLocation(0, 1), "$"));
>-    EXPECT_CALL(mDiagnostics,
>-                print(pp::Diagnostics::PP_VERSION_NOT_FIRST_STATEMENT,
>-                      pp::SourceLocation(0, 2), _));
>+                print(pp::Diagnostics::PP_INVALID_CHARACTER, pp::SourceLocation(0, 1), "$"));
>+    EXPECT_CALL(mDiagnostics, print(pp::Diagnostics::PP_VERSION_NOT_FIRST_STATEMENT,
>+                                    pp::SourceLocation(0, 2), _));
> 
>     preprocess(str);
> }
> 
> TEST_F(VersionTest, AfterValidDirective)
> {
>-    const char* str = "#\n"
>-                      "#version 200\n";
>+    const char *str =
>+        "#\n"
>+        "#version 200\n";
> 
>     using testing::_;
>-    EXPECT_CALL(mDiagnostics,
>-                print(pp::Diagnostics::PP_VERSION_NOT_FIRST_STATEMENT,
>-                      pp::SourceLocation(0, 2), _));
>+    EXPECT_CALL(mDiagnostics, print(pp::Diagnostics::PP_VERSION_NOT_FIRST_STATEMENT,
>+                                    pp::SourceLocation(0, 2), _));
> 
>     preprocess(str);
> }
> 
> TEST_F(VersionTest, AfterInvalidDirective)
> {
>-    const char* str = "#foo\n"
>-                      "#version 200\n";
>+    const char *str =
>+        "#foo\n"
>+        "#version 200\n";
> 
>     using testing::_;
>     EXPECT_CALL(mDiagnostics,
>-                print(pp::Diagnostics::PP_DIRECTIVE_INVALID_NAME,
>-                      pp::SourceLocation(0, 1), "foo"));
>-    EXPECT_CALL(mDiagnostics,
>-                print(pp::Diagnostics::PP_VERSION_NOT_FIRST_STATEMENT,
>-                      pp::SourceLocation(0, 2), _));
>+                print(pp::Diagnostics::PP_DIRECTIVE_INVALID_NAME, pp::SourceLocation(0, 1), "foo"));
>+    EXPECT_CALL(mDiagnostics, print(pp::Diagnostics::PP_VERSION_NOT_FIRST_STATEMENT,
>+                                    pp::SourceLocation(0, 2), _));
> 
>     preprocess(str);
> }
> 
> TEST_F(VersionTest, AfterExcludedBlock)
> {
>-    const char* str = "#if 0\n"
>-                      "foo\n"
>-                      "#endif\n"
>-                      "#version 200\n";
>+    const char *str =
>+        "#if 0\n"
>+        "foo\n"
>+        "#endif\n"
>+        "#version 200\n";
> 
>     using testing::_;
>-    EXPECT_CALL(mDiagnostics,
>-                print(pp::Diagnostics::PP_VERSION_NOT_FIRST_STATEMENT,
>-                      pp::SourceLocation(0, 4), _));
>+    EXPECT_CALL(mDiagnostics, print(pp::Diagnostics::PP_VERSION_NOT_FIRST_STATEMENT,
>+                                    pp::SourceLocation(0, 4), _));
> 
>     preprocess(str);
> }
> 
> struct VersionTestParam
> {
>-    const char* str;
>+    const char *str;
>     pp::Diagnostics::ID id;
> };
> 
>-class InvalidVersionTest : public VersionTest,
>-                           public testing::WithParamInterface<VersionTestParam>
>-{
>-};
>+class InvalidVersionTest : public VersionTest, public testing::WithParamInterface<VersionTestParam>
>+{};
> 
> TEST_P(InvalidVersionTest, Identified)
> {
>     VersionTestParam param = GetParam();
>-    const char* expected = "\n";
>+    const char *expected   = "\n";
> 
>     using testing::_;
>     // No handleVersion call.
>@@ -198,7 +194,8 @@ static const VersionTestParam kParams[] = {
>     {"#version\n", pp::Diagnostics::PP_INVALID_VERSION_DIRECTIVE},
>     {"#version foo\n", pp::Diagnostics::PP_INVALID_VERSION_NUMBER},
>     {"#version 100 foo\n", pp::Diagnostics::PP_UNEXPECTED_TOKEN},
>-    {"#version 0xffffffff\n", pp::Diagnostics::PP_INTEGER_OVERFLOW}
>-};
>+    {"#version 0xffffffff\n", pp::Diagnostics::PP_INTEGER_OVERFLOW}};
>+
>+INSTANTIATE_TEST_SUITE_P(All, InvalidVersionTest, testing::ValuesIn(kParams));
> 
>-INSTANTIATE_TEST_CASE_P(All, InvalidVersionTest, testing::ValuesIn(kParams));
>+}  // namespace angle
>diff --git a/Source/ThirdParty/ANGLE/src/tests/test_expectations/GPUTestConfig.cpp b/Source/ThirdParty/ANGLE/src/tests/test_expectations/GPUTestConfig.cpp
>new file mode 100644
>index 00000000000..1a9407992e5
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/tests/test_expectations/GPUTestConfig.cpp
>@@ -0,0 +1,565 @@
>+
>+// Copyright 2019 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+
>+#include "GPUTestConfig.h"
>+
>+#include <stdint.h>
>+#include <iostream>
>+
>+#include "common/angleutils.h"
>+#include "common/debug.h"
>+#include "common/platform.h"
>+#include "common/string_utils.h"
>+#include "gpu_info_util/SystemInfo.h"
>+
>+#if defined(ANGLE_PLATFORM_APPLE)
>+#    include "GPUTestConfig_mac.h"
>+#endif
>+
>+namespace angle
>+{
>+
>+namespace
>+{
>+
>+// Generic function call to get the OS version information from any platform
>+// defined below. This function will also cache the OS version info in static
>+// variables.
>+inline bool OperatingSystemVersionNumbers(int32_t *majorVersion, int32_t *minorVersion)
>+{
>+    static int32_t sSavedMajorVersion = -1;
>+    static int32_t sSavedMinorVersion = -1;
>+    bool ret                          = false;
>+    if (sSavedMajorVersion == -1 || sSavedMinorVersion == -1)
>+    {
>+#if defined(ANGLE_PLATFORM_WINDOWS)
>+        OSVERSIONINFOEX version_info = {sizeof version_info};
>+        ::GetVersionEx(reinterpret_cast<OSVERSIONINFO *>(&version_info));
>+        sSavedMajorVersion = version_info.dwMajorVersion;
>+        *majorVersion      = sSavedMajorVersion;
>+        sSavedMinorVersion = version_info.dwMinorVersion;
>+        *minorVersion      = sSavedMinorVersion;
>+        ret                = true;
>+
>+#elif defined(ANGLE_PLATFORM_APPLE)
>+        GetOperatingSystemVersionNumbers(&sSavedMajorVersion, &sSavedMinorVersion);
>+        *majorVersion = sSavedMajorVersion;
>+        *minorVersion = sSavedMinorVersion;
>+        ret           = true;
>+
>+#else
>+        ret = false;
>+#endif
>+    }
>+    else
>+    {
>+        ret = true;
>+    }
>+    *majorVersion = sSavedMajorVersion;
>+    *minorVersion = sSavedMinorVersion;
>+    return ret;
>+}
>+
>+// Check if the OS is any version of Windows
>+inline bool IsWin()
>+{
>+#if defined(ANGLE_PLATFORM_WINDOWS)
>+    return true;
>+#else
>+    return false;
>+#endif
>+}
>+
>+// Check if the OS is a specific major version of windows.
>+inline bool IsWinVersion(const int32_t majorVersion)
>+{
>+    if (IsWin())
>+    {
>+        int32_t currentMajorVersion = 0;
>+        int32_t currentMinorVersion = 0;
>+        if (OperatingSystemVersionNumbers(&currentMajorVersion, &currentMinorVersion))
>+        {
>+            if (currentMajorVersion == majorVersion)
>+            {
>+                return true;
>+            }
>+        }
>+    }
>+    return false;
>+}
>+
>+// Check if the OS is a specific major and minor version of windows.
>+inline bool IsWinVersion(const int32_t majorVersion, const int32_t minorVersion)
>+{
>+    if (IsWin())
>+    {
>+        int32_t currentMajorVersion = 0;
>+        int32_t currentMinorVersion = 0;
>+        if (OperatingSystemVersionNumbers(&currentMajorVersion, &currentMinorVersion))
>+        {
>+            if (currentMajorVersion == majorVersion && currentMinorVersion == minorVersion)
>+            {
>+                return true;
>+            }
>+        }
>+    }
>+    return false;
>+}
>+
>+// Check if the OS is Windows XP
>+inline bool IsWinXP()
>+{
>+    if (IsWinVersion(5))
>+    {
>+        return true;
>+    }
>+    return false;
>+}
>+
>+// Check if the OS is Windows Vista
>+inline bool IsWinVista()
>+{
>+    if (IsWinVersion(6, 0))
>+    {
>+        return true;
>+    }
>+    return false;
>+}
>+
>+// Check if the OS is Windows 7
>+inline bool IsWin7()
>+{
>+    if (IsWinVersion(6, 1))
>+    {
>+        return true;
>+    }
>+    return false;
>+}
>+
>+// Check if the OS is Windows 8
>+inline bool IsWin8()
>+{
>+    if (IsWinVersion(6, 2) || IsWinVersion(6, 3))
>+    {
>+        return true;
>+    }
>+    return false;
>+}
>+
>+// Check if the OS is Windows 10
>+inline bool IsWin10()
>+{
>+    if (IsWinVersion(10))
>+    {
>+        return true;
>+    }
>+    return false;
>+}
>+
>+// Check if the OS is any version of OSX
>+inline bool IsMac()
>+{
>+#if defined(ANGLE_PLATFORM_APPLE)
>+    return true;
>+#else
>+    return false;
>+#endif
>+}
>+
>+// Check if the OS is a specific major and minor version of OSX
>+inline bool IsMacVersion(const int32_t majorVersion, const int32_t minorVersion)
>+{
>+    if (IsMac())
>+    {
>+        int32_t currentMajorVersion = 0;
>+        int32_t currentMinorVersion = 0;
>+        if (OperatingSystemVersionNumbers(&currentMajorVersion, &currentMinorVersion))
>+        {
>+            if (currentMajorVersion == majorVersion && currentMinorVersion == minorVersion)
>+            {
>+                return true;
>+            }
>+        }
>+    }
>+    return false;
>+}
>+
>+// Check if the OS is OSX Leopard
>+inline bool IsMacLeopard()
>+{
>+    if (IsMacVersion(10, 5))
>+    {
>+        return true;
>+    }
>+    return false;
>+}
>+
>+// Check if the OS is OSX Snow Leopard
>+inline bool IsMacSnowLeopard()
>+{
>+    if (IsMacVersion(10, 6))
>+    {
>+        return true;
>+    }
>+    return false;
>+}
>+
>+// Check if the OS is OSX Lion
>+inline bool IsMacLion()
>+{
>+    if (IsMacVersion(10, 7))
>+    {
>+        return true;
>+    }
>+    return false;
>+}
>+
>+// Check if the OS is OSX Mountain Lion
>+inline bool IsMacMountainLion()
>+{
>+    if (IsMacVersion(10, 8))
>+    {
>+        return true;
>+    }
>+    return false;
>+}
>+
>+// Check if the OS is OSX Mavericks
>+inline bool IsMacMavericks()
>+{
>+    if (IsMacVersion(10, 9))
>+    {
>+        return true;
>+    }
>+    return false;
>+}
>+
>+// Check if the OS is OSX Yosemite
>+inline bool IsMacYosemite()
>+{
>+    if (IsMacVersion(10, 10))
>+    {
>+        return true;
>+    }
>+    return false;
>+}
>+
>+// Check if the OS is OSX El Capitan
>+inline bool IsMacElCapitan()
>+{
>+    if (IsMacVersion(10, 11))
>+    {
>+        return true;
>+    }
>+    return false;
>+}
>+
>+// Check if the OS is OSX Sierra
>+inline bool IsMacSierra()
>+{
>+    if (IsMacVersion(10, 12))
>+    {
>+        return true;
>+    }
>+    return false;
>+}
>+
>+// Check if the OS is OSX High Sierra
>+inline bool IsMacHighSierra()
>+{
>+    if (IsMacVersion(10, 13))
>+    {
>+        return true;
>+    }
>+    return false;
>+}
>+
>+// Check if the OS is OSX Mojave
>+inline bool IsMacMojave()
>+{
>+    if (IsMacVersion(10, 14))
>+    {
>+        return true;
>+    }
>+    return false;
>+}
>+
>+// Check if the OS is any version of Linux
>+inline bool IsLinux()
>+{
>+#if defined(ANGLE_PLATFORM_LINUX)
>+    return true;
>+#else
>+    return false;
>+#endif
>+}
>+
>+// Check if the OS is any version of Android
>+inline bool IsAndroid()
>+{
>+#if defined(ANGLE_PLATFORM_ANDROID)
>+    return true;
>+#else
>+    return false;
>+#endif
>+}
>+
>+// Generic function call to populate the SystemInfo struct. This function will
>+// also cache the SystemInfo struct for future calls. Returns false if the
>+// struct was not fully populated. Guaranteed to set sysInfo to a valid pointer
>+inline bool GetGPUTestSystemInfo(SystemInfo **sysInfo)
>+{
>+    static SystemInfo *sSystemInfo = nullptr;
>+    static bool sPopulated         = false;
>+    if (sSystemInfo == nullptr)
>+    {
>+        sSystemInfo = new SystemInfo;
>+        if (!GetSystemInfo(sSystemInfo))
>+        {
>+            std::cout << "Error populating SystemInfo for dEQP tests." << std::endl;
>+        }
>+        else
>+        {
>+            sPopulated = true;
>+        }
>+    }
>+    *sysInfo = sSystemInfo;
>+    ASSERT(*sysInfo != nullptr);
>+    return sPopulated;
>+}
>+
>+// Get the primary GPUDeviceInfo from the SystemInfo struct.
>+// Returns false if devInfo is not guaranteed to be set to the primary device.
>+inline bool GetPrimaryGPU(GPUDeviceInfo **devInfo)
>+{
>+    SystemInfo *systemInfo = nullptr;
>+    GetGPUTestSystemInfo(&systemInfo);
>+    if (systemInfo->gpus.size() <= 0)
>+    {
>+        return false;
>+    }
>+    // Default to the first index
>+    uint32_t index = 0;
>+    // See if the primaryGPUIndex was set first
>+    if (systemInfo->primaryGPUIndex != -1)
>+    {
>+        index = systemInfo->primaryGPUIndex;
>+    }
>+    ASSERT(index < systemInfo->gpus.size());
>+    *devInfo = &(systemInfo->gpus[index]);
>+    return true;
>+}
>+
>+// Get the vendor ID of the primary GPU from the SystemInfo struct.
>+// Returns 0 if there is an error.
>+inline VendorID GetPrimaryGPUVendorID()
>+{
>+    GPUDeviceInfo *primaryGPU = nullptr;
>+    if (GetPrimaryGPU(&primaryGPU))
>+    {
>+        return primaryGPU->vendorId;
>+    }
>+    else
>+    {
>+        return static_cast<VendorID>(0);
>+    }
>+}
>+
>+// Get the device ID of the primary GPU from the SystemInfo struct.
>+// Returns 0 if there is an error.
>+inline DeviceID GetPrimaryGPUDeviceID()
>+{
>+    GPUDeviceInfo *primaryGPU = nullptr;
>+    if (GetPrimaryGPU(&primaryGPU))
>+    {
>+        return primaryGPU->deviceId;
>+    }
>+    else
>+    {
>+        return static_cast<DeviceID>(0);
>+    }
>+}
>+
>+// Check whether the primary GPU is NVIDIA.
>+inline bool IsNVIDIA()
>+{
>+    return angle::IsNVIDIA(GetPrimaryGPUVendorID());
>+}
>+
>+// Check whether the primary GPU is AMD.
>+inline bool IsAMD()
>+{
>+    return angle::IsAMD(GetPrimaryGPUVendorID());
>+}
>+
>+// Check whether the primary GPU is Intel.
>+inline bool IsIntel()
>+{
>+    return angle::IsIntel(GetPrimaryGPUVendorID());
>+}
>+
>+// Check whether the primary GPU is VMWare.
>+inline bool IsVMWare()
>+{
>+    return angle::IsVMWare(GetPrimaryGPUVendorID());
>+}
>+
>+// Check whether this is a debug build.
>+inline bool IsDebug()
>+{
>+#if !defined(NDEBUG)
>+    return true;
>+#else
>+    return false;
>+#endif
>+}
>+
>+// Check whether this is a release build.
>+inline bool IsRelease()
>+{
>+    return !IsDebug();
>+}
>+
>+// Check whether the system is a specific Android device based on the name.
>+inline bool IsAndroidDevice(const std::string &deviceName)
>+{
>+    if (!IsAndroid())
>+    {
>+        return false;
>+    }
>+    SystemInfo *systemInfo = nullptr;
>+    GetGPUTestSystemInfo(&systemInfo);
>+    if (systemInfo->machineModelName == deviceName)
>+    {
>+        return true;
>+    }
>+    return false;
>+}
>+
>+// Check whether the system is a Nexus 5X device.
>+inline bool IsNexus5X()
>+{
>+    return IsAndroidDevice("Nexus 5X");
>+}
>+
>+// Check whether the system is a Pixel 2 device.
>+inline bool IsPixel2()
>+{
>+    return IsAndroidDevice("Pixel 2");
>+}
>+
>+// Check whether the active GPU is a specific device based on the string device ID.
>+inline bool IsDeviceIdGPU(const std::string &gpuDeviceId)
>+{
>+    uint32_t deviceId = 0;
>+    if (!HexStringToUInt(gpuDeviceId, &deviceId) || deviceId == 0)
>+    {
>+        // PushErrorMessage(kErrorMessage[kErrorEntryWithGpuDeviceIdConflicts], line_number);
>+        return false;
>+    }
>+    return (deviceId == GetPrimaryGPUDeviceID());
>+}
>+
>+// Check whether the active GPU is a NVIDIA Quadro P400
>+inline bool IsNVIDIAQuadroP400()
>+{
>+    if (!IsNVIDIA())
>+    {
>+        return false;
>+    }
>+    return IsDeviceIdGPU("0x1CB3");
>+}
>+
>+// Check whether the backend API has been set to D3D9 in the constructor
>+inline bool IsD3D9(const GPUTestConfig::API &api)
>+{
>+    return (api == GPUTestConfig::kAPID3D9);
>+}
>+
>+// Check whether the backend API has been set to D3D11 in the constructor
>+inline bool IsD3D11(const GPUTestConfig::API &api)
>+{
>+    return (api == GPUTestConfig::kAPID3D11);
>+}
>+
>+// Check whether the backend API has been set to OpenGL in the constructor
>+inline bool IsGLDesktop(const GPUTestConfig::API &api)
>+{
>+    return (api == GPUTestConfig::kAPIGLDesktop);
>+}
>+
>+// Check whether the backend API has been set to OpenGLES in the constructor
>+inline bool IsGLES(const GPUTestConfig::API &api)
>+{
>+    return (api == GPUTestConfig::kAPIGLES);
>+}
>+
>+// Check whether the backend API has been set to Vulkan in the constructor
>+inline bool IsVulkan(const GPUTestConfig::API &api)
>+{
>+    return (api == GPUTestConfig::kAPIVulkan);
>+}
>+
>+}  // anonymous namespace
>+
>+// Load all conditions in the constructor since this data will not change during a test set.
>+GPUTestConfig::GPUTestConfig()
>+{
>+    mConditions[kConditionNone]            = false;
>+    mConditions[kConditionWinXP]           = IsWinXP();
>+    mConditions[kConditionWinVista]        = IsWinVista();
>+    mConditions[kConditionWin7]            = IsWin7();
>+    mConditions[kConditionWin8]            = IsWin8();
>+    mConditions[kConditionWin10]           = IsWin10();
>+    mConditions[kConditionWin]             = IsWin();
>+    mConditions[kConditionMacLeopard]      = IsMacLeopard();
>+    mConditions[kConditionMacSnowLeopard]  = IsMacSnowLeopard();
>+    mConditions[kConditionMacLion]         = IsMacLion();
>+    mConditions[kConditionMacMountainLion] = IsMacMountainLion();
>+    mConditions[kConditionMacMavericks]    = IsMacMavericks();
>+    mConditions[kConditionMacYosemite]     = IsMacYosemite();
>+    mConditions[kConditionMacElCapitan]    = IsMacElCapitan();
>+    mConditions[kConditionMacSierra]       = IsMacSierra();
>+    mConditions[kConditionMacHighSierra]   = IsMacHighSierra();
>+    mConditions[kConditionMacMojave]       = IsMacMojave();
>+    mConditions[kConditionMac]             = IsMac();
>+    mConditions[kConditionLinux]           = IsLinux();
>+    mConditions[kConditionAndroid]         = IsAndroid();
>+    mConditions[kConditionNVIDIA]          = IsNVIDIA();
>+    mConditions[kConditionAMD]             = IsAMD();
>+    mConditions[kConditionIntel]           = IsIntel();
>+    mConditions[kConditionVMWare]          = IsVMWare();
>+    mConditions[kConditionRelease]         = IsRelease();
>+    mConditions[kConditionDebug]           = IsDebug();
>+    // If no API provided, pass these conditions by default
>+    mConditions[kConditionD3D9]      = true;
>+    mConditions[kConditionD3D11]     = true;
>+    mConditions[kConditionGLDesktop] = true;
>+    mConditions[kConditionGLES]      = true;
>+    mConditions[kConditionVulkan]    = true;
>+
>+    mConditions[kConditionNexus5X]          = IsNexus5X();
>+    mConditions[kConditionPixel2]           = IsPixel2();
>+    mConditions[kConditionNVIDIAQuadroP400] = IsNVIDIAQuadroP400();
>+}
>+
>+// If the constructor is passed an API, load those conditions as well
>+GPUTestConfig::GPUTestConfig(const API &api) : GPUTestConfig()
>+{
>+    mConditions[kConditionD3D9]      = IsD3D9(api);
>+    mConditions[kConditionD3D11]     = IsD3D11(api);
>+    mConditions[kConditionGLDesktop] = IsGLDesktop(api);
>+    mConditions[kConditionGLES]      = IsGLES(api);
>+    mConditions[kConditionVulkan]    = IsVulkan(api);
>+}
>+
>+// Return a const reference to the list of all pre-calculated conditions.
>+const GPUTestConfig::ConditionArray &GPUTestConfig::getConditions() const
>+{
>+    return mConditions;
>+}
>+
>+}  // namespace angle
>diff --git a/Source/ThirdParty/ANGLE/src/tests/test_expectations/GPUTestConfig.h b/Source/ThirdParty/ANGLE/src/tests/test_expectations/GPUTestConfig.h
>new file mode 100644
>index 00000000000..5027a93e5e7
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/tests/test_expectations/GPUTestConfig.h
>@@ -0,0 +1,81 @@
>+//
>+// Copyright 2019 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+
>+#ifndef TEST_EXPECTATIONS_GPU_TEST_CONFIG_H_
>+#define TEST_EXPECTATIONS_GPU_TEST_CONFIG_H_
>+
>+#include <array>
>+
>+namespace angle
>+{
>+
>+struct GPUTestConfig
>+{
>+  public:
>+    enum API
>+    {
>+        kAPIUnknown = 0,
>+        kAPID3D9,
>+        kAPID3D11,
>+        kAPIGLDesktop,
>+        kAPIGLES,
>+        kAPIVulkan,
>+    };
>+
>+    enum Condition
>+    {
>+        kConditionNone = 0,
>+        kConditionWinXP,
>+        kConditionWinVista,
>+        kConditionWin7,
>+        kConditionWin8,
>+        kConditionWin10,
>+        kConditionWin,
>+        kConditionMacLeopard,
>+        kConditionMacSnowLeopard,
>+        kConditionMacLion,
>+        kConditionMacMountainLion,
>+        kConditionMacMavericks,
>+        kConditionMacYosemite,
>+        kConditionMacElCapitan,
>+        kConditionMacSierra,
>+        kConditionMacHighSierra,
>+        kConditionMacMojave,
>+        kConditionMac,
>+        kConditionLinux,
>+        kConditionAndroid,
>+        kConditionNVIDIA,
>+        kConditionAMD,
>+        kConditionIntel,
>+        kConditionVMWare,
>+        kConditionRelease,
>+        kConditionDebug,
>+        kConditionD3D9,
>+        kConditionD3D11,
>+        kConditionGLDesktop,
>+        kConditionGLES,
>+        kConditionVulkan,
>+        kConditionNexus5X,
>+        kConditionPixel2,
>+        kConditionNVIDIAQuadroP400,
>+
>+        kNumberOfConditions,
>+    };
>+
>+    typedef std::array<bool, GPUTestConfig::kNumberOfConditions> ConditionArray;
>+
>+    GPUTestConfig();
>+    GPUTestConfig(const API &api);
>+
>+    const GPUTestConfig::ConditionArray &getConditions() const;
>+
>+  protected:
>+    GPUTestConfig::ConditionArray mConditions;
>+};
>+
>+}  // namespace angle
>+
>+#endif  // TEST_EXPECTATIONS_GPU_TEST_CONFIG_H_
>diff --git a/Source/ThirdParty/ANGLE/src/tests/test_expectations/GPUTestConfig_mac.h b/Source/ThirdParty/ANGLE/src/tests/test_expectations/GPUTestConfig_mac.h
>new file mode 100644
>index 00000000000..a7f474fc54c
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/tests/test_expectations/GPUTestConfig_mac.h
>@@ -0,0 +1,22 @@
>+//
>+// Copyright 2019 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// GPUTestConfig_mac.h:
>+//   Helper functions for GPUTestConfig that have to be compiled in ObjectiveC++
>+//
>+
>+#ifndef TEST_EXPECTATIONS_GPU_TEST_CONFIG_MAC_H_
>+#define TEST_EXPECTATIONS_GPU_TEST_CONFIG_MAC_H_
>+
>+#include <stdint.h>
>+
>+namespace angle
>+{
>+
>+void GetOperatingSystemVersionNumbers(int32_t *majorVersion, int32_t *minorVersion);
>+
>+}  // namespace angle
>+
>+#endif  // TEST_EXPECTATIONS_GPU_TEST_CONFIG_MAC_H_
>diff --git a/Source/ThirdParty/ANGLE/src/tests/test_expectations/GPUTestConfig_mac.mm b/Source/ThirdParty/ANGLE/src/tests/test_expectations/GPUTestConfig_mac.mm
>new file mode 100644
>index 00000000000..fcacbd668ad
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/tests/test_expectations/GPUTestConfig_mac.mm
>@@ -0,0 +1,45 @@
>+//
>+// Copyright 2019 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// GPUTestConfig_mac.mm:
>+//   Helper functions for GPUTestConfig that have to be compiled in ObjectiveC++
>+
>+#include "GPUTestConfig_mac.h"
>+
>+#import <Cocoa/Cocoa.h>
>+
>+// OSX 10.8 deprecates Gestalt but doesn't make the operatingSystemVersion property part of the
>+// public interface of NSProcessInfo until 10.10. Add a forward declaration.
>+#if !defined(MAC_OS_X_VERSION_10_10) || MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_10
>+@interface NSProcessInfo (YosemiteSDK)
>+@property(readonly) NSOperatingSystemVersion operatingSystemVersion;
>+@end
>+#endif
>+
>+namespace angle
>+{
>+
>+void GetOperatingSystemVersionNumbers(int32_t *majorVersion, int32_t *minorVersion)
>+{
>+#if MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_8
>+    Gestalt(gestaltSystemVersionMajor, reinterpret_cast<SInt32 *>(majorVersion));
>+    Gestalt(gestaltSystemVersionMinor, reinterpret_cast<SInt32 *>(minorVersion));
>+#else
>+    if (@available(macOS 10.10, *))
>+    {
>+        NSOperatingSystemVersion version = [[NSProcessInfo processInfo] operatingSystemVersion];
>+        *majorVersion                    = version.majorVersion;
>+        *minorVersion                    = version.minorVersion;
>+    }
>+    else
>+    {
>+        // This can only happen on 10.9
>+        *majorVersion = 10;
>+        *minorVersion = 9;
>+    }
>+#endif
>+}
>+
>+}  // namespace angle
>diff --git a/Source/ThirdParty/ANGLE/src/tests/test_expectations/GPUTestExpectationsParser.cpp b/Source/ThirdParty/ANGLE/src/tests/test_expectations/GPUTestExpectationsParser.cpp
>new file mode 100644
>index 00000000000..7c439a4471c
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/tests/test_expectations/GPUTestExpectationsParser.cpp
>@@ -0,0 +1,547 @@
>+//
>+// Copyright 2019 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+
>+#include "GPUTestExpectationsParser.h"
>+
>+#include <stddef.h>
>+#include <stdint.h>
>+
>+#include "common/angleutils.h"
>+#include "common/debug.h"
>+#include "common/string_utils.h"
>+
>+#include "GPUTestConfig.h"
>+
>+namespace angle
>+{
>+
>+namespace
>+{
>+
>+enum LineParserStage
>+{
>+    kLineParserBegin = 0,
>+    kLineParserBugID,
>+    kLineParserConfigs,
>+    kLineParserColon,
>+    kLineParserTestName,
>+    kLineParserEqual,
>+    kLineParserExpectations,
>+};
>+
>+enum Token
>+{
>+    // os
>+    kConfigWinXP = 0,
>+    kConfigWinVista,
>+    kConfigWin7,
>+    kConfigWin8,
>+    kConfigWin10,
>+    kConfigWin,
>+    kConfigMacLeopard,
>+    kConfigMacSnowLeopard,
>+    kConfigMacLion,
>+    kConfigMacMountainLion,
>+    kConfigMacMavericks,
>+    kConfigMacYosemite,
>+    kConfigMacElCapitan,
>+    kConfigMacSierra,
>+    kConfigMacHighSierra,
>+    kConfigMacMojave,
>+    kConfigMac,
>+    kConfigLinux,
>+    kConfigChromeOS,
>+    kConfigAndroid,
>+    // gpu vendor
>+    kConfigNVIDIA,
>+    kConfigAMD,
>+    kConfigIntel,
>+    kConfigVMWare,
>+    // build type
>+    kConfigRelease,
>+    kConfigDebug,
>+    // ANGLE renderer
>+    kConfigD3D9,
>+    kConfigD3D11,
>+    kConfigGLDesktop,
>+    kConfigGLES,
>+    kConfigVulkan,
>+    // Android devices
>+    kConfigNexus5X,
>+    kConfigPixel2,
>+    // GPU devices
>+    kConfigNVIDIAQuadroP400,
>+    // expectation
>+    kExpectationPass,
>+    kExpectationFail,
>+    kExpectationFlaky,
>+    kExpectationTimeout,
>+    kExpectationSkip,
>+    // separator
>+    kSeparatorColon,
>+    kSeparatorEqual,
>+
>+    kNumberOfExactMatchTokens,
>+
>+    // others
>+    kTokenComment,
>+    kTokenWord,
>+
>+    kNumberOfTokens,
>+};
>+
>+enum ErrorType
>+{
>+    kErrorFileIO = 0,
>+    kErrorIllegalEntry,
>+    kErrorInvalidEntry,
>+    kErrorEntryWithExpectationConflicts,
>+    kErrorEntriesOverlap,
>+
>+    kNumberOfErrors,
>+};
>+
>+struct TokenInfo
>+{
>+    const char *name;
>+    GPUTestConfig::Condition condition;
>+    GPUTestExpectationsParser::GPUTestExpectation expectation;
>+};
>+
>+const TokenInfo kTokenData[kNumberOfTokens] = {
>+    {"xp", GPUTestConfig::kConditionWinXP},
>+    {"vista", GPUTestConfig::kConditionWinVista},
>+    {"win7", GPUTestConfig::kConditionWin7},
>+    {"win8", GPUTestConfig::kConditionWin8},
>+    {"win10", GPUTestConfig::kConditionWin10},
>+    {"win", GPUTestConfig::kConditionWin},
>+    {"leopard", GPUTestConfig::kConditionMacLeopard},
>+    {"snowleopard", GPUTestConfig::kConditionMacSnowLeopard},
>+    {"lion", GPUTestConfig::kConditionMacLion},
>+    {"mountainlion", GPUTestConfig::kConditionMacMountainLion},
>+    {"mavericks", GPUTestConfig::kConditionMacMavericks},
>+    {"yosemite", GPUTestConfig::kConditionMacYosemite},
>+    {"elcapitan", GPUTestConfig::kConditionMacElCapitan},
>+    {"sierra", GPUTestConfig::kConditionMacSierra},
>+    {"highsierra", GPUTestConfig::kConditionMacHighSierra},
>+    {"mojave", GPUTestConfig::kConditionMacMojave},
>+    {"mac", GPUTestConfig::kConditionMac},
>+    {"linux", GPUTestConfig::kConditionLinux},
>+    {"chromeos"},  // (https://anglebug.com/3363) ChromeOS not supported yet
>+    {"android", GPUTestConfig::kConditionAndroid},
>+    {"nvidia", GPUTestConfig::kConditionNVIDIA},
>+    {"amd", GPUTestConfig::kConditionAMD},
>+    {"intel", GPUTestConfig::kConditionIntel},
>+    {"vmware", GPUTestConfig::kConditionVMWare},
>+    {"release", GPUTestConfig::kConditionRelease},
>+    {"debug", GPUTestConfig::kConditionDebug},
>+    {"d3d9", GPUTestConfig::kConditionD3D9},
>+    {"d3d11", GPUTestConfig::kConditionD3D11},
>+    {"opengl", GPUTestConfig::kConditionGLDesktop},
>+    {"gles", GPUTestConfig::kConditionGLES},
>+    {"vulkan", GPUTestConfig::kConditionVulkan},
>+    {"nexus5x", GPUTestConfig::kConditionNexus5X},
>+    {"pixel2", GPUTestConfig::kConditionPixel2},
>+    {"quadrop400", GPUTestConfig::kConditionNVIDIAQuadroP400},
>+    {"pass", GPUTestConfig::kConditionNone, GPUTestExpectationsParser::kGpuTestPass},
>+    {"fail", GPUTestConfig::kConditionNone, GPUTestExpectationsParser::kGpuTestFail},
>+    {"flaky", GPUTestConfig::kConditionNone, GPUTestExpectationsParser::kGpuTestFlaky},
>+    {"timeout", GPUTestConfig::kConditionNone, GPUTestExpectationsParser::kGpuTestTimeout},
>+    {"skip", GPUTestConfig::kConditionNone, GPUTestExpectationsParser::kGpuTestSkip},
>+    {":"},  // kSeparatorColon
>+    {"="},  // kSeparatorEqual
>+    {},     // kNumberOfExactMatchTokens
>+    {},     // kTokenComment
>+    {},     // kTokenWord
>+};
>+
>+const char *kErrorMessage[kNumberOfErrors] = {
>+    "file IO failed",
>+    "entry with wrong format",
>+    "entry invalid, likely unimplemented modifiers",
>+    "entry with expectation modifier conflicts",
>+    "two entries' configs overlap",
>+};
>+
>+inline bool StartsWithASCII(const std::string &str, const std::string &search, bool caseSensitive)
>+{
>+    ASSERT(!caseSensitive);
>+    return str.compare(0, search.length(), search) == 0;
>+}
>+
>+template <class Char>
>+inline Char ToLowerASCII(Char c)
>+{
>+    return (c >= 'A' && c <= 'Z') ? (c + ('a' - 'A')) : c;
>+}
>+
>+template <typename Iter>
>+inline bool DoLowerCaseEqualsASCII(Iter a_begin, Iter a_end, const char *b)
>+{
>+    for (Iter it = a_begin; it != a_end; ++it, ++b)
>+    {
>+        if (!*b || ToLowerASCII(*it) != *b)
>+            return false;
>+    }
>+    return *b == 0;
>+}
>+
>+inline bool LowerCaseEqualsASCII(const std::string &a, const char *b)
>+{
>+    return DoLowerCaseEqualsASCII(a.begin(), a.end(), b);
>+}
>+
>+inline Token ParseToken(const std::string &word)
>+{
>+    if (StartsWithASCII(word, "//", false))
>+        return kTokenComment;
>+
>+    for (int32_t i = 0; i < kNumberOfExactMatchTokens; ++i)
>+    {
>+        if (LowerCaseEqualsASCII(word, kTokenData[i].name))
>+            return static_cast<Token>(i);
>+    }
>+    return kTokenWord;
>+}
>+
>+// reference name can have the last character as *.
>+inline bool NamesMatching(const std::string &ref, const std::string &testName)
>+{
>+    size_t len = ref.length();
>+    if (len == 0)
>+        return false;
>+    if (ref[len - 1] == '*')
>+    {
>+        if (testName.length() > len - 1 && ref.compare(0, len - 1, testName, 0, len - 1) == 0)
>+            return true;
>+        return false;
>+    }
>+    return (ref == testName);
>+}
>+
>+}  // anonymous namespace
>+
>+GPUTestExpectationsParser::GPUTestExpectationsParser()
>+{
>+    // Some sanity check.
>+    ASSERT((static_cast<unsigned int>(kNumberOfTokens)) ==
>+           (sizeof(kTokenData) / sizeof(kTokenData[0])));
>+    ASSERT((static_cast<unsigned int>(kNumberOfErrors)) ==
>+           (sizeof(kErrorMessage) / sizeof(kErrorMessage[0])));
>+}
>+
>+GPUTestExpectationsParser::~GPUTestExpectationsParser() = default;
>+
>+bool GPUTestExpectationsParser::loadTestExpectations(const GPUTestConfig &config,
>+                                                     const std::string &data)
>+{
>+    mEntries.clear();
>+    mErrorMessages.clear();
>+
>+    std::vector<std::string> lines = SplitString(data, "\n", TRIM_WHITESPACE, SPLIT_WANT_ALL);
>+    bool rt                        = true;
>+    for (size_t i = 0; i < lines.size(); ++i)
>+    {
>+        if (!parseLine(config, lines[i], i + 1))
>+            rt = false;
>+    }
>+    if (detectConflictsBetweenEntries())
>+    {
>+        mEntries.clear();
>+        rt = false;
>+    }
>+
>+    return rt;
>+}
>+
>+bool GPUTestExpectationsParser::loadTestExpectationsFromFile(const GPUTestConfig &config,
>+                                                             const std::string &path)
>+{
>+    mEntries.clear();
>+    mErrorMessages.clear();
>+
>+    std::string data;
>+    if (!ReadFileToString(path, &data))
>+    {
>+        mErrorMessages.push_back(kErrorMessage[kErrorFileIO]);
>+        return false;
>+    }
>+    return loadTestExpectations(config, data);
>+}
>+
>+int32_t GPUTestExpectationsParser::getTestExpectation(const std::string &testName)
>+{
>+    size_t maxExpectationLen            = 0;
>+    GPUTestExpectationEntry *foundEntry = nullptr;
>+    for (size_t i = 0; i < mEntries.size(); ++i)
>+    {
>+        if (NamesMatching(mEntries[i].testName, testName))
>+        {
>+            size_t expectationLen = mEntries[i].testName.length();
>+            // The longest/most specific matching expectation overrides any others.
>+            if (expectationLen > maxExpectationLen)
>+            {
>+                maxExpectationLen = expectationLen;
>+                foundEntry        = &mEntries[i];
>+            }
>+        }
>+    }
>+    if (foundEntry != nullptr)
>+    {
>+        foundEntry->used = true;
>+        return foundEntry->testExpectation;
>+    }
>+    return kGpuTestPass;
>+}
>+
>+const std::vector<std::string> &GPUTestExpectationsParser::getErrorMessages() const
>+{
>+    return mErrorMessages;
>+}
>+
>+std::vector<std::string> GPUTestExpectationsParser::getUnusedExpectationsMessages() const
>+{
>+    std::vector<std::string> messages;
>+    std::vector<GPUTestExpectationsParser::GPUTestExpectationEntry> unusedExpectations =
>+        getUnusedExpectations();
>+    for (size_t i = 0; i < unusedExpectations.size(); ++i)
>+    {
>+        std::string message =
>+            "Line " + ToString(unusedExpectations[i].lineNumber) + ": expectation was unused.";
>+        messages.push_back(message);
>+    }
>+    return messages;
>+}
>+
>+bool GPUTestExpectationsParser::parseLine(const GPUTestConfig &config,
>+                                          const std::string &lineData,
>+                                          size_t lineNumber)
>+{
>+    std::vector<std::string> tokens =
>+        SplitString(lineData, kWhitespaceASCII, KEEP_WHITESPACE, SPLIT_WANT_NONEMPTY);
>+    int32_t stage = kLineParserBegin;
>+    GPUTestExpectationEntry entry;
>+    entry.lineNumber  = lineNumber;
>+    entry.used        = false;
>+    bool skipLine     = false;
>+    for (size_t i = 0; i < tokens.size() && !skipLine; ++i)
>+    {
>+        Token token = ParseToken(tokens[i]);
>+        switch (token)
>+        {
>+            case kTokenComment:
>+                skipLine = true;
>+                break;
>+            case kConfigWinXP:
>+            case kConfigWinVista:
>+            case kConfigWin7:
>+            case kConfigWin8:
>+            case kConfigWin10:
>+            case kConfigWin:
>+            case kConfigMacLeopard:
>+            case kConfigMacSnowLeopard:
>+            case kConfigMacLion:
>+            case kConfigMacMountainLion:
>+            case kConfigMacMavericks:
>+            case kConfigMacYosemite:
>+            case kConfigMacElCapitan:
>+            case kConfigMacSierra:
>+            case kConfigMacHighSierra:
>+            case kConfigMacMojave:
>+            case kConfigMac:
>+            case kConfigLinux:
>+            case kConfigChromeOS:
>+            case kConfigAndroid:
>+            case kConfigNVIDIA:
>+            case kConfigAMD:
>+            case kConfigIntel:
>+            case kConfigVMWare:
>+            case kConfigRelease:
>+            case kConfigDebug:
>+            case kConfigD3D9:
>+            case kConfigD3D11:
>+            case kConfigGLDesktop:
>+            case kConfigGLES:
>+            case kConfigVulkan:
>+            case kConfigNexus5X:
>+            case kConfigPixel2:
>+            case kConfigNVIDIAQuadroP400:
>+                // MODIFIERS, check each condition and add accordingly.
>+                if (stage != kLineParserConfigs && stage != kLineParserBugID)
>+                {
>+                    pushErrorMessage(kErrorMessage[kErrorIllegalEntry], lineNumber);
>+                    return false;
>+                }
>+                {
>+                    bool err = false;
>+                    if (!checkTokenCondition(config, err, token, lineNumber))
>+                    {
>+                        skipLine = true;  // Move to the next line without adding this one.
>+                    }
>+                    if (err)
>+                    {
>+                        return false;
>+                    }
>+                }
>+                if (stage == kLineParserBugID)
>+                {
>+                    stage++;
>+                }
>+                break;
>+            case kSeparatorColon:
>+                // :
>+                // If there are no modifiers, move straight to separator colon
>+                if (stage == kLineParserBugID)
>+                {
>+                    stage++;
>+                }
>+                if (stage != kLineParserConfigs)
>+                {
>+                    pushErrorMessage(kErrorMessage[kErrorIllegalEntry], lineNumber);
>+                    return false;
>+                }
>+                stage++;
>+                break;
>+            case kSeparatorEqual:
>+                // =
>+                if (stage != kLineParserTestName)
>+                {
>+                    pushErrorMessage(kErrorMessage[kErrorIllegalEntry], lineNumber);
>+                    return false;
>+                }
>+                stage++;
>+                break;
>+            case kTokenWord:
>+                // BUG_ID or TEST_NAME
>+                if (stage == kLineParserBegin)
>+                {
>+                    // Bug ID is not used for anything; ignore it.
>+                }
>+                else if (stage == kLineParserColon)
>+                {
>+                    entry.testName = tokens[i];
>+                }
>+                else
>+                {
>+                    pushErrorMessage(kErrorMessage[kErrorIllegalEntry], lineNumber);
>+                    return false;
>+                }
>+                stage++;
>+                break;
>+            case kExpectationPass:
>+            case kExpectationFail:
>+            case kExpectationFlaky:
>+            case kExpectationTimeout:
>+            case kExpectationSkip:
>+                // TEST_EXPECTATIONS
>+                if (stage != kLineParserEqual && stage != kLineParserExpectations)
>+                {
>+                    pushErrorMessage(kErrorMessage[kErrorIllegalEntry], lineNumber);
>+                    return false;
>+                }
>+                if (entry.testExpectation != 0)
>+                {
>+                    pushErrorMessage(kErrorMessage[kErrorEntryWithExpectationConflicts],
>+                                     lineNumber);
>+                    return false;
>+                }
>+                entry.testExpectation = kTokenData[token].expectation;
>+                if (stage == kLineParserEqual)
>+                    stage++;
>+                break;
>+            default:
>+                ASSERT(false);
>+                break;
>+        }
>+    }
>+    if (stage == kLineParserBegin || skipLine)
>+    {
>+        // The whole line is empty or all comments, or has been skipped to to a condition token.
>+        return true;
>+    }
>+    if (stage == kLineParserExpectations)
>+    {
>+        mEntries.push_back(entry);
>+        return true;
>+    }
>+    pushErrorMessage(kErrorMessage[kErrorIllegalEntry], lineNumber);
>+    return false;
>+}
>+
>+bool GPUTestExpectationsParser::checkTokenCondition(const GPUTestConfig &config,
>+                                                    bool &err,
>+                                                    int32_t token,
>+                                                    size_t lineNumber)
>+{
>+    if (token >= kNumberOfTokens)
>+    {
>+        pushErrorMessage(kErrorMessage[kErrorIllegalEntry], lineNumber);
>+        err = true;
>+        return false;
>+    }
>+
>+    if (kTokenData[token].condition == GPUTestConfig::kConditionNone ||
>+        kTokenData[token].condition >= GPUTestConfig::kNumberOfConditions)
>+    {
>+        pushErrorMessage(kErrorMessage[kErrorInvalidEntry], lineNumber);
>+        // error on any unsupported conditions
>+        err = true;
>+        return false;
>+    }
>+    err = false;
>+    return config.getConditions()[kTokenData[token].condition];
>+}
>+
>+bool GPUTestExpectationsParser::detectConflictsBetweenEntries()
>+{
>+    bool rt = false;
>+    for (size_t i = 0; i < mEntries.size(); ++i)
>+    {
>+        for (size_t j = i + 1; j < mEntries.size(); ++j)
>+        {
>+            if (mEntries[i].testName == mEntries[j].testName)
>+            {
>+                pushErrorMessage(kErrorMessage[kErrorEntriesOverlap], mEntries[i].lineNumber,
>+                                 mEntries[j].lineNumber);
>+                rt = true;
>+            }
>+        }
>+    }
>+    return rt;
>+}
>+
>+std::vector<GPUTestExpectationsParser::GPUTestExpectationEntry>
>+GPUTestExpectationsParser::getUnusedExpectations() const
>+{
>+    std::vector<GPUTestExpectationsParser::GPUTestExpectationEntry> unusedExpectations;
>+    for (size_t i = 0; i < mEntries.size(); ++i)
>+    {
>+        if (!mEntries[i].used)
>+        {
>+            unusedExpectations.push_back(mEntries[i]);
>+        }
>+    }
>+    return unusedExpectations;
>+}
>+
>+void GPUTestExpectationsParser::pushErrorMessage(const std::string &message, size_t lineNumber)
>+{
>+    mErrorMessages.push_back("Line " + ToString(lineNumber) + " : " + message.c_str());
>+}
>+
>+void GPUTestExpectationsParser::pushErrorMessage(const std::string &message,
>+                                                 size_t entry1LineNumber,
>+                                                 size_t entry2LineNumber)
>+{
>+    mErrorMessages.push_back("Line " + ToString(entry1LineNumber) + " and " +
>+                             ToString(entry2LineNumber) + " : " + message.c_str());
>+}
>+
>+GPUTestExpectationsParser::GPUTestExpectationEntry::GPUTestExpectationEntry()
>+    : testExpectation(0), lineNumber(0)
>+{}
>+
>+}  // namespace angle
>diff --git a/Source/ThirdParty/ANGLE/src/tests/test_expectations/GPUTestExpectationsParser.h b/Source/ThirdParty/ANGLE/src/tests/test_expectations/GPUTestExpectationsParser.h
>new file mode 100644
>index 00000000000..18dceaf5763
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/tests/test_expectations/GPUTestExpectationsParser.h
>@@ -0,0 +1,91 @@
>+//
>+// Copyright 2019 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+
>+#ifndef TEST_EXPECTATIONS_GPU_TEST_EXPECTATIONS_PARSER_H_
>+#define TEST_EXPECTATIONS_GPU_TEST_EXPECTATIONS_PARSER_H_
>+
>+#include <stddef.h>
>+#include <stdint.h>
>+
>+#include <string>
>+#include <vector>
>+
>+namespace angle
>+{
>+
>+struct GPUTestConfig;
>+
>+class GPUTestExpectationsParser
>+{
>+  public:
>+    enum GPUTestExpectation
>+    {
>+        kGpuTestPass    = 1 << 0,
>+        kGpuTestFail    = 1 << 1,
>+        kGpuTestFlaky   = 1 << 2,
>+        kGpuTestTimeout = 1 << 3,
>+        kGpuTestSkip    = 1 << 4,
>+    };
>+
>+    GPUTestExpectationsParser();
>+    ~GPUTestExpectationsParser();
>+
>+    // Parse the text expectations, and if no error is encountered,
>+    // save all the entries. Otherwise, generate error messages.
>+    // Return true if parsing succeeds.
>+    bool loadTestExpectations(const GPUTestConfig &config, const std::string &data);
>+    bool loadTestExpectationsFromFile(const GPUTestConfig &config, const std::string &path);
>+
>+    // Query error messages from the last LoadTestExpectations() call.
>+    const std::vector<std::string> &getErrorMessages() const;
>+
>+    // Query error messages from any expectations that weren't used before being queried.
>+    std::vector<std::string> getUnusedExpectationsMessages() const;
>+
>+    // Get the test expectation of a given test on a given bot.
>+    int32_t getTestExpectation(const std::string &testName);
>+
>+  private:
>+    struct GPUTestExpectationEntry
>+    {
>+        GPUTestExpectationEntry();
>+
>+        std::string testName;
>+        int32_t testExpectation;
>+        size_t lineNumber;
>+        bool used;
>+    };
>+
>+    // Parse a line of text. If we have a valid entry, save it; otherwise,
>+    // generate error messages.
>+    bool parseLine(const GPUTestConfig &config, const std::string &lineData, size_t lineNumber);
>+
>+    // Check a the condition assigned to a particular token.
>+    bool checkTokenCondition(const GPUTestConfig &config,
>+                             bool &err,
>+                             int32_t token,
>+                             size_t lineNumber);
>+
>+    // Check if two entries' config overlap with each other. May generate an
>+    // error message.
>+    bool detectConflictsBetweenEntries();
>+
>+    // Query a list of any expectations that were's used before being queried.
>+    std::vector<GPUTestExpectationEntry> getUnusedExpectations() const;
>+
>+    // Save an error message, which can be queried later.
>+    void pushErrorMessage(const std::string &message, size_t lineNumber);
>+    void pushErrorMessage(const std::string &message,
>+                          size_t entry1LineNumber,
>+                          size_t entry2LineNumber);
>+
>+    std::vector<GPUTestExpectationEntry> mEntries;
>+    std::vector<std::string> mErrorMessages;
>+};
>+
>+}  // namespace angle
>+
>+#endif  // TEST_EXPECTATIONS_GPU_TEST_EXPECTATIONS_PARSER_H_
>diff --git a/Source/ThirdParty/ANGLE/src/tests/test_expectations/GPUTestExpectationsParser_unittest.cpp b/Source/ThirdParty/ANGLE/src/tests/test_expectations/GPUTestExpectationsParser_unittest.cpp
>new file mode 100644
>index 00000000000..505ce0248d3
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/tests/test_expectations/GPUTestExpectationsParser_unittest.cpp
>@@ -0,0 +1,424 @@
>+//
>+// Copyright 2019 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// GPUTestExpectationsParser_unittest.cpp: Unit tests for GPUTestExpectationsParser*
>+//
>+
>+#include "tests/test_expectations/GPUTestExpectationsParser.h"
>+#include <gtest/gtest.h>
>+#include "tests/test_expectations/GPUTestConfig.h"
>+
>+using namespace angle;
>+
>+namespace
>+{
>+
>+class GPUTestConfigTester : public GPUTestConfig
>+{
>+  public:
>+    GPUTestConfigTester()
>+    {
>+        for (bool &condition : mConditions)
>+        {
>+            condition = false;
>+        }
>+        mConditions[GPUTestConfig::kConditionWin]    = true;
>+        mConditions[GPUTestConfig::kConditionNVIDIA] = true;
>+        mConditions[GPUTestConfig::kConditionD3D11]  = true;
>+    }
>+};
>+
>+// A correct entry with a test that's skipped on all platforms should not lead
>+// to any errors, and should properly return the expectation SKIP.
>+TEST(GPUTestExpectationsParserTest, GPUTestExpectationsParserSkip)
>+{
>+    GPUTestConfigTester config;
>+    std::string line =
>+        R"(100 : dEQP-GLES31.functional.layout_binding.ubo.vertex_binding_max = SKIP)";
>+    GPUTestExpectationsParser parser;
>+    EXPECT_TRUE(parser.loadTestExpectations(config, line));
>+    EXPECT_TRUE(parser.getErrorMessages().empty());
>+    EXPECT_EQ(
>+        parser.getTestExpectation("dEQP-GLES31.functional.layout_binding.ubo.vertex_binding_max"),
>+        GPUTestExpectationsParser::kGpuTestSkip);
>+}
>+
>+// A correct entry with a test that's failed on all platforms should not lead
>+// to any errors, and should properly return the expectation FAIL.
>+TEST(GPUTestExpectationsParserTest, GPUTestExpectationsParserFail)
>+{
>+    GPUTestConfigTester config;
>+    std::string line =
>+        R"(100 : dEQP-GLES31.functional.layout_binding.ubo.vertex_binding_max = FAIL)";
>+    GPUTestExpectationsParser parser;
>+    EXPECT_TRUE(parser.loadTestExpectations(config, line));
>+    EXPECT_TRUE(parser.getErrorMessages().empty());
>+    EXPECT_EQ(
>+        parser.getTestExpectation("dEQP-GLES31.functional.layout_binding.ubo.vertex_binding_max"),
>+        GPUTestExpectationsParser::kGpuTestFail);
>+}
>+
>+// A correct entry with a test that's passed on all platforms should not lead
>+// to any errors, and should properly return the expectation PASS.
>+TEST(GPUTestExpectationsParserTest, GPUTestExpectationsParserPass)
>+{
>+    GPUTestConfigTester config;
>+    std::string line =
>+        R"(100 : dEQP-GLES31.functional.layout_binding.ubo.vertex_binding_max = PASS)";
>+    GPUTestExpectationsParser parser;
>+    EXPECT_TRUE(parser.loadTestExpectations(config, line));
>+    EXPECT_TRUE(parser.getErrorMessages().empty());
>+    EXPECT_EQ(
>+        parser.getTestExpectation("dEQP-GLES31.functional.layout_binding.ubo.vertex_binding_max"),
>+        GPUTestExpectationsParser::kGpuTestPass);
>+}
>+
>+// A correct entry with a test that's timed out on all platforms should not lead
>+// to any errors, and should properly return the expectation TIMEOUT.
>+TEST(GPUTestExpectationsParserTest, GPUTestExpectationsParserTimeout)
>+{
>+    GPUTestConfigTester config;
>+    std::string line =
>+        R"(100 : dEQP-GLES31.functional.layout_binding.ubo.vertex_binding_max = TIMEOUT)";
>+    GPUTestExpectationsParser parser;
>+    EXPECT_TRUE(parser.loadTestExpectations(config, line));
>+    EXPECT_TRUE(parser.getErrorMessages().empty());
>+    EXPECT_EQ(
>+        parser.getTestExpectation("dEQP-GLES31.functional.layout_binding.ubo.vertex_binding_max"),
>+        GPUTestExpectationsParser::kGpuTestTimeout);
>+}
>+
>+// A correct entry with a test that's flaky on all platforms should not lead
>+// to any errors, and should properly return the expectation FLAKY.
>+TEST(GPUTestExpectationsParserTest, GPUTestExpectationsParserFlaky)
>+{
>+    GPUTestConfigTester config;
>+    std::string line =
>+        R"(100 : dEQP-GLES31.functional.layout_binding.ubo.vertex_binding_max = FLAKY)";
>+    GPUTestExpectationsParser parser;
>+    EXPECT_TRUE(parser.loadTestExpectations(config, line));
>+    EXPECT_TRUE(parser.getErrorMessages().empty());
>+    EXPECT_EQ(
>+        parser.getTestExpectation("dEQP-GLES31.functional.layout_binding.ubo.vertex_binding_max"),
>+        GPUTestExpectationsParser::kGpuTestFlaky);
>+}
>+
>+// A correct entry with a test that's skipped on windows should not lead
>+// to any errors, and should properly return the expectation SKIP on this
>+// tester.
>+TEST(GPUTestExpectationsParserTest, GPUTestExpectationsParserSingleLineWin)
>+{
>+    GPUTestConfigTester config;
>+    std::string line =
>+        R"(100 WIN : dEQP-GLES31.functional.layout_binding.ubo.vertex_binding_max = SKIP)";
>+    GPUTestExpectationsParser parser;
>+    EXPECT_TRUE(parser.loadTestExpectations(config, line));
>+    EXPECT_TRUE(parser.getErrorMessages().empty());
>+    EXPECT_EQ(
>+        parser.getTestExpectation("dEQP-GLES31.functional.layout_binding.ubo.vertex_binding_max"),
>+        GPUTestExpectationsParser::kGpuTestSkip);
>+}
>+
>+// A correct entry with a test that's skipped on windows/NVIDIA should not lead
>+// to any errors, and should properly return the expectation SKIP on this
>+// tester.
>+TEST(GPUTestExpectationsParserTest, GPUTestExpectationsParserSingleLineWinNVIDIA)
>+{
>+    GPUTestConfigTester config;
>+    std::string line =
>+        R"(100 WIN NVIDIA : dEQP-GLES31.functional.layout_binding.ubo.vertex_binding_max = SKIP)";
>+    GPUTestExpectationsParser parser;
>+    EXPECT_TRUE(parser.loadTestExpectations(config, line));
>+    EXPECT_TRUE(parser.getErrorMessages().empty());
>+    EXPECT_EQ(
>+        parser.getTestExpectation("dEQP-GLES31.functional.layout_binding.ubo.vertex_binding_max"),
>+        GPUTestExpectationsParser::kGpuTestSkip);
>+}
>+
>+// A correct entry with a test that's skipped on windows/NVIDIA/D3D11 should not
>+// lead to any errors, and should properly return the expectation SKIP on this
>+// tester.
>+TEST(GPUTestExpectationsParserTest, GPUTestExpectationsParserSingleLineWinNVIDIAD3D11)
>+{
>+    GPUTestConfigTester config;
>+    std::string line =
>+        R"(100 WIN NVIDIA D3D11 : dEQP-GLES31.functional.layout_binding.ubo.vertex_binding_max = SKIP)";
>+    GPUTestExpectationsParser parser;
>+    EXPECT_TRUE(parser.loadTestExpectations(config, line));
>+    EXPECT_TRUE(parser.getErrorMessages().empty());
>+    EXPECT_EQ(
>+        parser.getTestExpectation("dEQP-GLES31.functional.layout_binding.ubo.vertex_binding_max"),
>+        GPUTestExpectationsParser::kGpuTestSkip);
>+}
>+
>+// Same as GPUTestExpectationsParserSingleLineWinNVIDIAD3D11, but verifying that the order
>+// of these conditions doesn't matter
>+TEST(GPUTestExpectationsParserTest, GPUTestExpectationsParserSingleLineWinNVIDIAD3D11OtherOrder)
>+{
>+    GPUTestConfigTester config;
>+    std::string line =
>+        R"(100 D3D11 NVIDIA WIN : dEQP-GLES31.functional.layout_binding.ubo.vertex_binding_max = SKIP)";
>+    GPUTestExpectationsParser parser;
>+    EXPECT_TRUE(parser.loadTestExpectations(config, line));
>+    EXPECT_TRUE(parser.getErrorMessages().empty());
>+    EXPECT_EQ(
>+        parser.getTestExpectation("dEQP-GLES31.functional.layout_binding.ubo.vertex_binding_max"),
>+        GPUTestExpectationsParser::kGpuTestSkip);
>+}
>+
>+// A correct entry with a test that's skipped on mac should not lead
>+// to any errors, and should default to PASS on this tester (windows).
>+TEST(GPUTestExpectationsParserTest, GPUTestExpectationsParserSingleLineMac)
>+{
>+    GPUTestConfigTester config;
>+    std::string line =
>+        R"(100 MAC : dEQP-GLES31.functional.layout_binding.ubo.vertex_binding_max = SKIP)";
>+    GPUTestExpectationsParser parser;
>+    EXPECT_TRUE(parser.loadTestExpectations(config, line));
>+    EXPECT_TRUE(parser.getErrorMessages().empty());
>+    EXPECT_EQ(
>+        parser.getTestExpectation("dEQP-GLES31.functional.layout_binding.ubo.vertex_binding_max"),
>+        GPUTestExpectationsParser::kGpuTestPass);
>+}
>+
>+// A correct entry with a test that has conflicting entries should not lead
>+// to any errors, and should default to PASS.
>+// (https:anglebug.com/3368) In the future, this condition should cause an
>+// error
>+TEST(GPUTestExpectationsParserTest, GPUTestExpectationsParserSingleLineConflict)
>+{
>+    GPUTestConfigTester config;
>+    std::string line =
>+        R"(100 WIN MAC : dEQP-GLES31.functional.layout_binding.ubo.vertex_binding_max = SKIP)";
>+    GPUTestExpectationsParser parser;
>+    EXPECT_TRUE(parser.loadTestExpectations(config, line));
>+    EXPECT_TRUE(parser.getErrorMessages().empty());
>+    EXPECT_EQ(
>+        parser.getTestExpectation("dEQP-GLES31.functional.layout_binding.ubo.vertex_binding_max"),
>+        GPUTestExpectationsParser::kGpuTestPass);
>+}
>+
>+// A line without a bug ID should return an error and not add the expectation.
>+TEST(GPUTestExpectationsParserTest, GPUTestExpectationsParserMissingBugId)
>+{
>+    GPUTestConfigTester config;
>+    std::string line = R"( : dEQP-GLES31.functional.layout_binding.ubo.vertex_binding_max = SKIP)";
>+    GPUTestExpectationsParser parser;
>+    EXPECT_FALSE(parser.loadTestExpectations(config, line));
>+    EXPECT_EQ(parser.getErrorMessages().size(), 1u);
>+    if (parser.getErrorMessages().size() >= 1)
>+        EXPECT_EQ(parser.getErrorMessages()[0], "Line 1 : entry with wrong format");
>+    // Default behavior is to let missing tests pass
>+    EXPECT_EQ(
>+        parser.getTestExpectation("dEQP-GLES31.functional.layout_binding.ubo.vertex_binding_max"),
>+        GPUTestExpectationsParser::kGpuTestPass);
>+}
>+
>+// A line without a bug ID should return an error and not add the expectation, (even if
>+// the line contains conditions that might be mistaken for a bug id)
>+TEST(GPUTestExpectationsParserTest, GPUTestExpectationsParserMissingBugIdWithConditions)
>+{
>+    GPUTestConfigTester config;
>+    std::string line =
>+        R"(WIN D3D11 : dEQP-GLES31.functional.layout_binding.ubo.vertex_binding_max = SKIP)";
>+    GPUTestExpectationsParser parser;
>+    EXPECT_FALSE(parser.loadTestExpectations(config, line));
>+    EXPECT_EQ(parser.getErrorMessages().size(), 1u);
>+    if (parser.getErrorMessages().size() >= 1)
>+        EXPECT_EQ(parser.getErrorMessages()[0], "Line 1 : entry with wrong format");
>+    // Default behavior is to let missing tests pass
>+    EXPECT_EQ(
>+        parser.getTestExpectation("dEQP-GLES31.functional.layout_binding.ubo.vertex_binding_max"),
>+        GPUTestExpectationsParser::kGpuTestPass);
>+}
>+
>+// A line without a colon should return an error and not add the expectation.
>+TEST(GPUTestExpectationsParserTest, GPUTestExpectationsParserMissingColon)
>+{
>+    GPUTestConfigTester config;
>+    std::string line = R"(100 dEQP-GLES31.functional.layout_binding.ubo.vertex_binding_max = SKIP)";
>+    GPUTestExpectationsParser parser;
>+    EXPECT_FALSE(parser.loadTestExpectations(config, line));
>+    EXPECT_EQ(parser.getErrorMessages().size(), 1u);
>+    if (parser.getErrorMessages().size() >= 1)
>+        EXPECT_EQ(parser.getErrorMessages()[0], "Line 1 : entry with wrong format");
>+    // Default behavior is to let missing tests pass
>+    EXPECT_EQ(
>+        parser.getTestExpectation("dEQP-GLES31.functional.layout_binding.ubo.vertex_binding_max"),
>+        GPUTestExpectationsParser::kGpuTestPass);
>+}
>+
>+// A wild character (*) at the end of a line should match any expectations that are a subset of that
>+// line. It should not greedily match to omany expectations that aren't in that subset.
>+TEST(GPUTestExpectationsParserTest, GPUTestExpectationsParserWildChar)
>+{
>+    GPUTestConfigTester config;
>+    std::string line = R"(100 : dEQP-GLES31.functional.layout_binding.ubo.* = SKIP)";
>+    GPUTestExpectationsParser parser;
>+    EXPECT_TRUE(parser.loadTestExpectations(config, line));
>+    EXPECT_TRUE(parser.getErrorMessages().empty());
>+    EXPECT_EQ(
>+        parser.getTestExpectation("dEQP-GLES31.functional.layout_binding.ubo.vertex_binding_max"),
>+        GPUTestExpectationsParser::kGpuTestSkip);
>+    // Also ensure the wild char is not too wild, only covers tests that are more specific
>+    EXPECT_EQ(parser.getTestExpectation(
>+                  "dEQP-GLES31.functional.program_interface_query.transform_feedback_varying."
>+                  "resource_list.vertex_fragment.builtin_gl_position"),
>+              GPUTestExpectationsParser::kGpuTestPass);
>+}
>+
>+// A line without an equals should return an error and not add the expectation.
>+TEST(GPUTestExpectationsParserTest, GPUTestExpectationsParserMissingEquals)
>+{
>+    GPUTestConfigTester config;
>+    std::string line = R"(100 : dEQP-GLES31.functional.layout_binding.ubo.vertex_binding_max SKIP)";
>+    GPUTestExpectationsParser parser;
>+    EXPECT_FALSE(parser.loadTestExpectations(config, line));
>+    EXPECT_EQ(parser.getErrorMessages().size(), 1u);
>+    if (parser.getErrorMessages().size() >= 1)
>+        EXPECT_EQ(parser.getErrorMessages()[0], "Line 1 : entry with wrong format");
>+    // Default behavior is to let missing tests pass
>+    EXPECT_EQ(
>+        parser.getTestExpectation("dEQP-GLES31.functional.layout_binding.ubo.vertex_binding_max"),
>+        GPUTestExpectationsParser::kGpuTestPass);
>+}
>+
>+// A line without an expectation should return an error and not add the expectation.
>+TEST(GPUTestExpectationsParserTest, GPUTestExpectationsParserMissingExpectation)
>+{
>+    GPUTestConfigTester config;
>+    std::string line = R"(100 : dEQP-GLES31.functional.layout_binding.ubo.vertex_binding_max =)";
>+    GPUTestExpectationsParser parser;
>+    EXPECT_FALSE(parser.loadTestExpectations(config, line));
>+    EXPECT_EQ(parser.getErrorMessages().size(), 1u);
>+    if (parser.getErrorMessages().size() >= 1)
>+        EXPECT_EQ(parser.getErrorMessages()[0], "Line 1 : entry with wrong format");
>+    // Default behavior is to let missing tests pass
>+    EXPECT_EQ(
>+        parser.getTestExpectation("dEQP-GLES31.functional.layout_binding.ubo.vertex_binding_max"),
>+        GPUTestExpectationsParser::kGpuTestPass);
>+}
>+
>+// A line with an expectation that doesn't exist should return an error and not add the expectation.
>+TEST(GPUTestExpectationsParserTest, GPUTestExpectationsParserInvalidExpectation)
>+{
>+    GPUTestConfigTester config;
>+    std::string line =
>+        R"(100 : dEQP-GLES31.functional.layout_binding.ubo.vertex_binding_max = WRONG)";
>+    GPUTestExpectationsParser parser;
>+    EXPECT_FALSE(parser.loadTestExpectations(config, line));
>+    EXPECT_EQ(parser.getErrorMessages().size(), 1u);
>+    if (parser.getErrorMessages().size() >= 1)
>+        EXPECT_EQ(parser.getErrorMessages()[0], "Line 1 : entry with wrong format");
>+    // Default behavior is to let missing tests pass
>+    EXPECT_EQ(
>+        parser.getTestExpectation("dEQP-GLES31.functional.layout_binding.ubo.vertex_binding_max"),
>+        GPUTestExpectationsParser::kGpuTestPass);
>+}
>+
>+// ChromeOS is reserved as a token, but doesn't actually check any conditions. Any tokens that
>+// do not check conditions should return an error and not add the expectation
>+// (https://anglebug.com/3363) Remove/update this test when ChromeOS is supported
>+TEST(GPUTestExpectationsParserTest, GPUTestExpectationsParserUnimplementedCondition)
>+{
>+    GPUTestConfigTester config;
>+    std::string line =
>+        R"(100 CHROMEOS : dEQP-GLES31.functional.layout_binding.ubo.vertex_binding_max = SKIP)";
>+    GPUTestExpectationsParser parser;
>+    EXPECT_FALSE(parser.loadTestExpectations(config, line));
>+    EXPECT_EQ(parser.getErrorMessages().size(), 1u);
>+    if (parser.getErrorMessages().size() >= 1)
>+        EXPECT_EQ(parser.getErrorMessages()[0],
>+                  "Line 1 : entry invalid, likely unimplemented modifiers");
>+    // Default behavior is to let missing tests pass
>+    EXPECT_EQ(
>+        parser.getTestExpectation("dEQP-GLES31.functional.layout_binding.ubo.vertex_binding_max"),
>+        GPUTestExpectationsParser::kGpuTestPass);
>+}
>+
>+// If a line starts with a comment, it's ignored and should not be added to the list.
>+TEST(GPUTestExpectationsParserTest, GPUTestExpectationsParserComment)
>+{
>+    GPUTestConfigTester config;
>+    std::string line =
>+        R"(//100 : dEQP-GLES31.functional.layout_binding.ubo.vertex_binding_max = SKIP)";
>+    GPUTestExpectationsParser parser;
>+    EXPECT_TRUE(parser.loadTestExpectations(config, line));
>+    EXPECT_TRUE(parser.getErrorMessages().empty());
>+    EXPECT_EQ(
>+        parser.getTestExpectation("dEQP-GLES31.functional.layout_binding.ubo.vertex_binding_max"),
>+        GPUTestExpectationsParser::kGpuTestPass);
>+}
>+
>+// A misspelled expectation should not be matched from getTestExpectation, and should lead to an
>+// unused expectation when later queried.
>+TEST(GPUTestExpectationsParserTest, GPUTestExpectationsParserMisspelledExpectation)
>+{
>+    GPUTestConfigTester config;
>+    std::string line =
>+        R"(100 : dEQP-GLES31.functionaal.layout_binding.ubo.* = SKIP)";  // "functionaal"
>+    GPUTestExpectationsParser parser;
>+    EXPECT_TRUE(parser.loadTestExpectations(config, line));
>+    EXPECT_TRUE(parser.getErrorMessages().empty());
>+    // Default behavior is to let missing tests pass
>+    EXPECT_EQ(
>+        parser.getTestExpectation("dEQP-GLES31.functional.layout_binding.ubo.vertex_binding_max"),
>+        GPUTestExpectationsParser::kGpuTestPass);
>+    EXPECT_EQ(parser.getUnusedExpectationsMessages().size(), 1u);
>+    if (parser.getUnusedExpectationsMessages().size() >= 1)
>+        EXPECT_EQ(parser.getUnusedExpectationsMessages()[0], "Line 1: expectation was unused.");
>+}
>+
>+// Wild characters that match groups of expectations can be overridden with more specific lines.
>+// The parse should still compute correctly which lines were used and which were unused.
>+TEST(GPUTestExpectationsParserTest, GPUTestExpectationsParserOverrideExpectation)
>+{
>+    GPUTestConfigTester config;
>+    // Fail all layout_binding tests, but skip the layout_binding.ubo subset.
>+    std::string line = R"(100 : dEQP-GLES31.functional.layout_binding.* = FAIL
>+100 : dEQP-GLES31.functional.layout_binding.ubo.* = SKIP)";
>+    GPUTestExpectationsParser parser;
>+    EXPECT_TRUE(parser.loadTestExpectations(config, line));
>+    EXPECT_TRUE(parser.getErrorMessages().empty());
>+    // Default behavior is to let missing tests pass
>+    EXPECT_EQ(
>+        parser.getTestExpectation("dEQP-GLES31.functional.layout_binding.ubo.vertex_binding_max"),
>+        GPUTestExpectationsParser::kGpuTestSkip);
>+    // The FAIL expectation was unused because it was overridden.
>+    EXPECT_EQ(parser.getUnusedExpectationsMessages().size(), 1u);
>+    if (parser.getUnusedExpectationsMessages().size() >= 1)
>+        EXPECT_EQ(parser.getUnusedExpectationsMessages()[0], "Line 1: expectation was unused.");
>+    // Now try a test that doesn't match the override criteria
>+    EXPECT_EQ(parser.getTestExpectation("dEQP-GLES31.functional.layout_binding.image.test"),
>+              GPUTestExpectationsParser::kGpuTestFail);
>+    EXPECT_TRUE(parser.getUnusedExpectationsMessages().empty());
>+}
>+
>+// This test is the same as GPUTestExpectationsParserOverrideExpectation, but verifying the order
>+// doesn't matter when overriding.
>+TEST(GPUTestExpectationsParserTest, GPUTestExpectationsParserOverrideExpectationOtherOrder)
>+{
>+    GPUTestConfigTester config;
>+    // Fail all layout_binding tests, but skip the layout_binding.ubo subset.
>+    std::string line = R"(100 : dEQP-GLES31.functional.layout_binding.ubo.* = SKIP
>+100 : dEQP-GLES31.functional.layout_binding.* = FAIL)";
>+    GPUTestExpectationsParser parser;
>+    EXPECT_TRUE(parser.loadTestExpectations(config, line));
>+    EXPECT_TRUE(parser.getErrorMessages().empty());
>+    // Default behavior is to let missing tests pass
>+    EXPECT_EQ(
>+        parser.getTestExpectation("dEQP-GLES31.functional.layout_binding.ubo.vertex_binding_max"),
>+        GPUTestExpectationsParser::kGpuTestSkip);
>+    // The FAIL expectation was unused because it was overridden.
>+    EXPECT_EQ(parser.getUnusedExpectationsMessages().size(), 1u);
>+    if (parser.getUnusedExpectationsMessages().size() >= 1)
>+        EXPECT_EQ(parser.getUnusedExpectationsMessages()[0], "Line 2: expectation was unused.");
>+    // Now try a test that doesn't match the override criteria
>+    EXPECT_EQ(parser.getTestExpectation("dEQP-GLES31.functional.layout_binding.image.test"),
>+              GPUTestExpectationsParser::kGpuTestFail);
>+    EXPECT_TRUE(parser.getUnusedExpectationsMessages().empty());
>+}
>+
>+}  // anonymous namespace
>diff --git a/Source/ThirdParty/ANGLE/src/tests/test_expectations/GPUTestExpectationsTest.cpp b/Source/ThirdParty/ANGLE/src/tests/test_expectations/GPUTestExpectationsTest.cpp
>new file mode 100644
>index 00000000000..c589a9fe393
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/tests/test_expectations/GPUTestExpectationsTest.cpp
>@@ -0,0 +1,127 @@
>+//
>+// Copyright 2019 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+
>+// GPUTestExpectationsTest.cpp : Tests of the test_expectations library.
>+
>+#include "test_expectations/GPUTestConfig.h"
>+#include "test_expectations/GPUTestExpectationsParser.h"
>+#include "test_utils/ANGLETest.h"
>+
>+namespace angle
>+{
>+
>+class GPUTestConfigTest : public ANGLETest
>+{
>+  protected:
>+    GPUTestConfigTest() {}
>+
>+    // todo(jonahr): Eventually could add support for all conditions/operating
>+    // systems, but these are the ones in use for now
>+    void validateConfigBase(const GPUTestConfig &config)
>+    {
>+        EXPECT_EQ(IsWindows(), config.getConditions()[GPUTestConfig::kConditionWin]);
>+        EXPECT_EQ(IsOSX(), config.getConditions()[GPUTestConfig::kConditionMac]);
>+        EXPECT_EQ(IsLinux(), config.getConditions()[GPUTestConfig::kConditionLinux]);
>+        EXPECT_EQ(IsAndroid(), config.getConditions()[GPUTestConfig::kConditionAndroid]);
>+        EXPECT_EQ(IsNexus5X(), config.getConditions()[GPUTestConfig::kConditionNexus5X]);
>+        EXPECT_EQ(IsPixel2(), config.getConditions()[GPUTestConfig::kConditionPixel2]);
>+        EXPECT_EQ(IsIntel(), config.getConditions()[GPUTestConfig::kConditionIntel]);
>+        EXPECT_EQ(IsAMD(), config.getConditions()[GPUTestConfig::kConditionAMD]);
>+        EXPECT_EQ(IsNVIDIA(), config.getConditions()[GPUTestConfig::kConditionNVIDIA]);
>+        EXPECT_EQ(IsDebug(), config.getConditions()[GPUTestConfig::kConditionDebug]);
>+        EXPECT_EQ(IsRelease(), config.getConditions()[GPUTestConfig::kConditionRelease]);
>+    }
>+
>+    void validateConfigAPI(const GPUTestConfig &config, const GPUTestConfig::API &api)
>+    {
>+        bool D3D9      = false;
>+        bool D3D11     = false;
>+        bool GLDesktop = false;
>+        bool GLES      = false;
>+        bool Vulkan    = false;
>+        switch (api)
>+        {
>+            case GPUTestConfig::kAPID3D9:
>+                D3D9 = true;
>+                break;
>+            case GPUTestConfig::kAPID3D11:
>+                D3D11 = true;
>+                break;
>+            case GPUTestConfig::kAPIGLDesktop:
>+                GLDesktop = true;
>+                break;
>+            case GPUTestConfig::kAPIGLES:
>+                GLES = true;
>+                break;
>+            case GPUTestConfig::kAPIVulkan:
>+                Vulkan = true;
>+                break;
>+            case GPUTestConfig::kAPIUnknown:
>+            default:
>+                break;
>+        }
>+        EXPECT_EQ(D3D9, config.getConditions()[GPUTestConfig::kConditionD3D9]);
>+        EXPECT_EQ(D3D11, config.getConditions()[GPUTestConfig::kConditionD3D11]);
>+        EXPECT_EQ(GLDesktop, config.getConditions()[GPUTestConfig::kConditionGLDesktop]);
>+        EXPECT_EQ(GLES, config.getConditions()[GPUTestConfig::kConditionGLES]);
>+        EXPECT_EQ(Vulkan, config.getConditions()[GPUTestConfig::kConditionVulkan]);
>+    }
>+};
>+
>+// Create a new GPUTestConfig and make sure all the condition flags were set
>+// correctly based on the hardware.
>+TEST_P(GPUTestConfigTest, GPUTestConfigConditions)
>+{
>+    GPUTestConfig config;
>+    validateConfigBase(config);
>+}
>+
>+// Create a new GPUTestConfig with each backend specified and validate the
>+// condition flags are set correctly.
>+TEST_P(GPUTestConfigTest, GPUTestConfigConditions_D3D9)
>+{
>+    GPUTestConfig config(GPUTestConfig::kAPID3D9);
>+    validateConfigAPI(config, GPUTestConfig::kAPID3D9);
>+}
>+
>+TEST_P(GPUTestConfigTest, GPUTestConfigConditions_D3D11)
>+{
>+    GPUTestConfig config(GPUTestConfig::kAPID3D11);
>+    validateConfigAPI(config, GPUTestConfig::kAPID3D11);
>+}
>+
>+TEST_P(GPUTestConfigTest, GPUTestConfigConditions_GLDesktop)
>+{
>+    GPUTestConfig config(GPUTestConfig::kAPIGLDesktop);
>+    validateConfigAPI(config, GPUTestConfig::kAPIGLDesktop);
>+}
>+
>+TEST_P(GPUTestConfigTest, GPUTestConfigConditions_GLES)
>+{
>+    GPUTestConfig config(GPUTestConfig::kAPIGLES);
>+    validateConfigAPI(config, GPUTestConfig::kAPIGLES);
>+}
>+
>+TEST_P(GPUTestConfigTest, GPUTestConfigConditions_Vulkan)
>+{
>+    GPUTestConfig config(GPUTestConfig::kAPIVulkan);
>+    validateConfigAPI(config, GPUTestConfig::kAPIVulkan);
>+}
>+
>+// Use this to select which configurations (e.g. which renderer, which GLES major version) these
>+// tests should be run against.
>+ANGLE_INSTANTIATE_TEST(GPUTestConfigTest,
>+                       ES2_D3D9(),
>+                       ES2_D3D11(),
>+                       ES3_D3D11(),
>+                       ES2_D3D11_FL9_3(),
>+                       ES2_OPENGL(),
>+                       ES3_OPENGL(),
>+                       ES2_OPENGLES(),
>+                       ES3_OPENGLES(),
>+                       ES2_VULKAN());
>+
>+}  // namespace angle
>diff --git a/Source/ThirdParty/ANGLE/src/tests/test_utils/ANGLETest.cpp b/Source/ThirdParty/ANGLE/src/tests/test_utils/ANGLETest.cpp
>index 13cc236dd9b..1022586861b 100644
>--- a/Source/ThirdParty/ANGLE/src/tests/test_utils/ANGLETest.cpp
>+++ b/Source/ThirdParty/ANGLE/src/tests/test_utils/ANGLETest.cpp
>@@ -8,8 +8,15 @@
> //
> 
> #include "ANGLETest.h"
>-#include "EGLWindow.h"
>-#include "OSWindow.h"
>+
>+#include "common/platform.h"
>+#include "gpu_info_util/SystemInfo.h"
>+#include "util/EGLWindow.h"
>+#include "util/OSWindow.h"
>+
>+#if defined(ANGLE_PLATFORM_WINDOWS)
>+#    include <VersionHelpers.h>
>+#endif  // defined(ANGLE_PLATFORM_WINDOWS)
> 
> namespace angle
> {
>@@ -42,7 +49,7 @@ GLubyte ColorDenorm(float colorValue)
>     return static_cast<GLubyte>(colorValue * 255.0f);
> }
> 
>-void TestPlatform_logError(angle::PlatformMethods *platform, const char *errorMessage)
>+void TestPlatform_logError(PlatformMethods *platform, const char *errorMessage)
> {
>     auto *testPlatformContext = static_cast<TestPlatformContext *>(platform->context);
>     if (testPlatformContext->ignoreMessages)
>@@ -51,26 +58,32 @@ void TestPlatform_logError(angle::PlatformMethods *platform, const char *errorMe
>     FAIL() << errorMessage;
> }
> 
>-void TestPlatform_logWarning(angle::PlatformMethods *platform, const char *warningMessage)
>+void TestPlatform_logWarning(PlatformMethods *platform, const char *warningMessage)
> {
>     auto *testPlatformContext = static_cast<TestPlatformContext *>(platform->context);
>     if (testPlatformContext->ignoreMessages)
>         return;
> 
>-    std::cerr << "Warning: " << warningMessage << std::endl;
>+    if (testPlatformContext->warningsAsErrors)
>+    {
>+        FAIL() << warningMessage;
>+    }
>+    else
>+    {
>+        std::cerr << "Warning: " << warningMessage << std::endl;
>+    }
> }
> 
>-void TestPlatform_logInfo(angle::PlatformMethods *platform, const char *infoMessage)
>+void TestPlatform_logInfo(PlatformMethods *platform, const char *infoMessage)
> {
>     auto *testPlatformContext = static_cast<TestPlatformContext *>(platform->context);
>     if (testPlatformContext->ignoreMessages)
>         return;
> 
>-    angle::WriteDebugMessage("%s\n", infoMessage);
>+    WriteDebugMessage("%s\n", infoMessage);
> }
> 
>-void TestPlatform_overrideWorkaroundsD3D(angle::PlatformMethods *platform,
>-                                         WorkaroundsD3D *workaroundsD3D)
>+void TestPlatform_overrideWorkaroundsD3D(PlatformMethods *platform, WorkaroundsD3D *workaroundsD3D)
> {
>     auto *testPlatformContext = static_cast<TestPlatformContext *>(platform->context);
>     if (testPlatformContext->currentTest)
>@@ -79,48 +92,111 @@ void TestPlatform_overrideWorkaroundsD3D(angle::PlatformMethods *platform,
>     }
> }
> 
>-std::array<angle::Vector3, 4> GetIndexedQuadVertices()
>+void TestPlatform_overrideFeaturesVk(PlatformMethods *platform, FeaturesVk *workaroundsVulkan)
> {
>-    std::array<angle::Vector3, 4> vertices;
>-    vertices[0] = angle::Vector3(-1.0f, 1.0f, 0.5f);
>-    vertices[1] = angle::Vector3(-1.0f, -1.0f, 0.5f);
>-    vertices[2] = angle::Vector3(1.0f, -1.0f, 0.5f);
>-    vertices[3] = angle::Vector3(1.0f, 1.0f, 0.5f);
>-    return vertices;
>+    auto *testPlatformContext = static_cast<TestPlatformContext *>(platform->context);
>+    if (testPlatformContext->currentTest)
>+    {
>+        testPlatformContext->currentTest->overrideFeaturesVk(workaroundsVulkan);
>+    }
> }
> 
>-static constexpr std::array<GLushort, 6> IndexedQuadIndices = {{0, 1, 2, 0, 2, 3}};
>+const std::array<Vector3, 6> kQuadVertices = {{
>+    Vector3(-1.0f, 1.0f, 0.5f),
>+    Vector3(-1.0f, -1.0f, 0.5f),
>+    Vector3(1.0f, -1.0f, 0.5f),
>+    Vector3(-1.0f, 1.0f, 0.5f),
>+    Vector3(1.0f, -1.0f, 0.5f),
>+    Vector3(1.0f, 1.0f, 0.5f),
>+}};
> 
>-}  // anonymous namespace
>+const std::array<Vector3, 4> kIndexedQuadVertices = {{
>+    Vector3(-1.0f, 1.0f, 0.5f),
>+    Vector3(-1.0f, -1.0f, 0.5f),
>+    Vector3(1.0f, -1.0f, 0.5f),
>+    Vector3(1.0f, 1.0f, 0.5f),
>+}};
>+
>+constexpr std::array<GLushort, 6> kIndexedQuadIndices = {{0, 1, 2, 0, 2, 3}};
> 
>-GLColorRGB::GLColorRGB() : R(0), G(0), B(0)
>+const char *GetColorName(GLColor color)
> {
>+    if (color == GLColor::red)
>+    {
>+        return "Red";
>+    }
>+
>+    if (color == GLColor::green)
>+    {
>+        return "Green";
>+    }
>+
>+    if (color == GLColor::blue)
>+    {
>+        return "Blue";
>+    }
>+
>+    if (color == GLColor::white)
>+    {
>+        return "White";
>+    }
>+
>+    if (color == GLColor::black)
>+    {
>+        return "Black";
>+    }
>+
>+    if (color == GLColor::transparentBlack)
>+    {
>+        return "Transparent Black";
>+    }
>+
>+    if (color == GLColor::yellow)
>+    {
>+        return "Yellow";
>+    }
>+
>+    if (color == GLColor::magenta)
>+    {
>+        return "Magenta";
>+    }
>+
>+    if (color == GLColor::cyan)
>+    {
>+        return "Cyan";
>+    }
>+
>+    return nullptr;
> }
> 
>-GLColorRGB::GLColorRGB(GLubyte r, GLubyte g, GLubyte b) : R(r), G(g), B(b)
>+bool ShouldAlwaysForceNewDisplay()
> {
>+    // We prefer to reuse config displays. This is faster and solves a driver issue where creating
>+    // many displays causes crashes. However this exposes other driver bugs on many other platforms.
>+    // Conservatively enable the feature only on Windows Intel and NVIDIA for now.
>+    SystemInfo *systemInfo = GetTestSystemInfo();
>+    return (!systemInfo || !IsWindows() || systemInfo->hasAMDGPU());
> }
>+}  // anonymous namespace
>+
>+GLColorRGB::GLColorRGB() : R(0), G(0), B(0) {}
>+
>+GLColorRGB::GLColorRGB(GLubyte r, GLubyte g, GLubyte b) : R(r), G(g), B(b) {}
> 
>-GLColorRGB::GLColorRGB(const angle::Vector3 &floatColor)
>+GLColorRGB::GLColorRGB(const Vector3 &floatColor)
>     : R(ColorDenorm(floatColor.x())), G(ColorDenorm(floatColor.y())), B(ColorDenorm(floatColor.z()))
>-{
>-}
>+{}
> 
>-GLColor::GLColor() : R(0), G(0), B(0), A(0)
>-{
>-}
>+GLColor::GLColor() : R(0), G(0), B(0), A(0) {}
> 
>-GLColor::GLColor(GLubyte r, GLubyte g, GLubyte b, GLubyte a) : R(r), G(g), B(b), A(a)
>-{
>-}
>+GLColor::GLColor(GLubyte r, GLubyte g, GLubyte b, GLubyte a) : R(r), G(g), B(b), A(a) {}
> 
>-GLColor::GLColor(const angle::Vector4 &floatColor)
>+GLColor::GLColor(const Vector4 &floatColor)
>     : R(ColorDenorm(floatColor.x())),
>       G(ColorDenorm(floatColor.y())),
>       B(ColorDenorm(floatColor.z())),
>       A(ColorDenorm(floatColor.w()))
>-{
>-}
>+{}
> 
> GLColor::GLColor(GLuint colorValue) : R(0), G(0), B(0), A(0)
> {
>@@ -139,9 +215,22 @@ testing::AssertionResult GLColor::ExpectNear(const GLColor &expected, const GLCo
>     return result;
> }
> 
>-angle::Vector4 GLColor::toNormalizedVector() const
>+void CreatePixelCenterWindowCoords(const std::vector<Vector2> &pixelPoints,
>+                                   int windowWidth,
>+                                   int windowHeight,
>+                                   std::vector<Vector3> *outVertices)
> {
>-    return angle::Vector4(ColorNorm(R), ColorNorm(G), ColorNorm(B), ColorNorm(A));
>+    for (Vector2 pixelPoint : pixelPoints)
>+    {
>+        outVertices->emplace_back(Vector3((pixelPoint[0] + 0.5f) * 2.0f / windowWidth - 1.0f,
>+                                          (pixelPoint[1] + 0.5f) * 2.0f / windowHeight - 1.0f,
>+                                          0.0f));
>+    }
>+}
>+
>+Vector4 GLColor::toNormalizedVector() const
>+{
>+    return Vector4(ColorNorm(R), ColorNorm(G), ColorNorm(B), ColorNorm(A));
> }
> 
> GLColor ReadColor(GLint x, GLint y)
>@@ -164,6 +253,12 @@ bool operator!=(const GLColor &a, const GLColor &b)
> 
> std::ostream &operator<<(std::ostream &ostream, const GLColor &color)
> {
>+    const char *colorName = GetColorName(color);
>+    if (colorName)
>+    {
>+        return ostream << colorName;
>+    }
>+
>     ostream << "(" << static_cast<unsigned int>(color.R) << ", "
>             << static_cast<unsigned int>(color.G) << ", " << static_cast<unsigned int>(color.B)
>             << ", " << static_cast<unsigned int>(color.A) << ")";
>@@ -188,58 +283,111 @@ GLColor32F ReadColor32F(GLint x, GLint y)
>     EXPECT_GL_NO_ERROR();
>     return actual;
> }
>-
> }  // namespace angle
> 
>+namespace
>+{
>+angle::PlatformMethods gDefaultPlatformMethods;
>+TestPlatformContext gPlatformContext;
>+
>+// After a fixed number of iterations we reset the test window. This works around some driver bugs.
>+constexpr uint32_t kWindowReuseLimit = 50;
>+}  // anonymous namespace
>+
> // static
> std::array<angle::Vector3, 6> ANGLETestBase::GetQuadVertices()
> {
>-    std::array<angle::Vector3, 6> vertices;
>-    vertices[0] = angle::Vector3(-1.0f, 1.0f, 0.5f);
>-    vertices[1] = angle::Vector3(-1.0f, -1.0f, 0.5f);
>-    vertices[2] = angle::Vector3(1.0f, -1.0f, 0.5f);
>-    vertices[3] = angle::Vector3(-1.0f, 1.0f, 0.5f);
>-    vertices[4] = angle::Vector3(1.0f, -1.0f, 0.5f);
>-    vertices[5] = angle::Vector3(1.0f, 1.0f, 0.5f);
>-    return vertices;
>+    return angle::kQuadVertices;
> }
> 
> // static
> std::array<GLushort, 6> ANGLETestBase::GetQuadIndices()
> {
>-    return angle::IndexedQuadIndices;
>+    return angle::kIndexedQuadIndices;
>+}
>+
>+// static
>+std::array<angle::Vector3, 4> ANGLETestBase::GetIndexedQuadVertices()
>+{
>+    return angle::kIndexedQuadVertices;
> }
> 
> ANGLETestBase::ANGLETestBase(const angle::PlatformParameters &params)
>-    : mEGLWindow(nullptr),
>-      mWidth(16),
>+    : mWidth(16),
>       mHeight(16),
>       mIgnoreD3D11SDKLayersWarnings(false),
>       mQuadVertexBuffer(0),
>       mQuadIndexBuffer(0),
>       m2DTexturedQuadProgram(0),
>-      mDeferContextInit(false)
>-{
>-    mEGLWindow = new EGLWindow(params.majorVersion, params.minorVersion, params.eglParameters);
>+      m3DTexturedQuadProgram(0),
>+      mDeferContextInit(false),
>+      mAlwaysForceNewDisplay(angle::ShouldAlwaysForceNewDisplay()),
>+      mForceNewDisplay(mAlwaysForceNewDisplay),
>+      mCurrentParams(nullptr),
>+      mFixture(nullptr)
>+{
>+    // Override the default platform methods with the ANGLE test methods pointer.
>+    angle::PlatformParameters withMethods     = params;
>+    withMethods.eglParameters.platformMethods = &gDefaultPlatformMethods;
>+
>+    auto iter = gPlatforms.find(withMethods);
>+    if (iter != gPlatforms.end())
>+    {
>+        mCurrentParams = &iter->first;
>+        mFixture       = &iter->second;
>+        mFixture->configParams.reset();
>+        return;
>+    }
> 
>-    // Default debug layers to enabled in tests.
>-    mEGLWindow->setDebugLayersEnabled(true);
>+    TestFixture platform;
>+    auto insertIter = gPlatforms.emplace(withMethods, platform);
>+    mCurrentParams  = &insertIter.first->first;
>+    mFixture        = &insertIter.first->second;
> 
>-    // Workaround for NVIDIA not being able to share OpenGL and Vulkan contexts.
>-    EGLint renderer      = params.getRenderer();
>-    bool needsWindowSwap = mLastRendererType.valid() &&
>-                           ((renderer != EGL_PLATFORM_ANGLE_TYPE_VULKAN_ANGLE) !=
>-                            (mLastRendererType.value() != EGL_PLATFORM_ANGLE_TYPE_VULKAN_ANGLE));
>+    std::stringstream windowNameStream;
>+    windowNameStream << "ANGLE Tests - " << params;
>+    std::string windowName = windowNameStream.str();
> 
>-    if (needsWindowSwap)
>+    if (mAlwaysForceNewDisplay)
>     {
>-        DestroyTestWindow();
>-        if (!InitTestWindow())
>+        mFixture->osWindow = mOSWindowSingleton;
>+    }
>+
>+    if (!mFixture->osWindow)
>+    {
>+        mFixture->osWindow = OSWindow::New();
>+        if (!mFixture->osWindow->initialize(windowName.c_str(), 128, 128))
>         {
>-            std::cerr << "Failed to create ANGLE test window.";
>+            std::cerr << "Failed to initialize OS Window.";
>+        }
>+
>+        mOSWindowSingleton = mFixture->osWindow;
>+    }
>+
>+    // On Linux we must keep the test windows visible. On Windows it doesn't seem to need it.
>+    mFixture->osWindow->setVisible(!angle::IsWindows());
>+
>+    switch (params.driver)
>+    {
>+        case angle::GLESDriverType::AngleEGL:
>+        {
>+            mFixture->eglWindow = EGLWindow::New(params.majorVersion, params.minorVersion);
>+            break;
>+        }
>+
>+        case angle::GLESDriverType::SystemEGL:
>+        {
>+            std::cerr << "Unsupported driver." << std::endl;
>+            break;
>+        }
>+
>+        case angle::GLESDriverType::SystemWGL:
>+        {
>+            // WGL tests are currently disabled.
>+            std::cerr << "Unsupported driver." << std::endl;
>+            break;
>         }
>     }
>-    mLastRendererType = renderer;
> }
> 
> ANGLETestBase::~ANGLETestBase()
>@@ -256,41 +404,69 @@ ANGLETestBase::~ANGLETestBase()
>     {
>         glDeleteProgram(m2DTexturedQuadProgram);
>     }
>-    SafeDelete(mEGLWindow);
>+    if (m3DTexturedQuadProgram)
>+    {
>+        glDeleteProgram(m3DTexturedQuadProgram);
>+    }
> }
> 
> void ANGLETestBase::ANGLETestSetUp()
> {
>-    mPlatformContext.ignoreMessages = false;
>-    mPlatformContext.currentTest    = this;
>+    gDefaultPlatformMethods.overrideWorkaroundsD3D = angle::TestPlatform_overrideWorkaroundsD3D;
>+    gDefaultPlatformMethods.overrideFeaturesVk     = angle::TestPlatform_overrideFeaturesVk;
>+    gDefaultPlatformMethods.logError               = angle::TestPlatform_logError;
>+    gDefaultPlatformMethods.logWarning             = angle::TestPlatform_logWarning;
>+    gDefaultPlatformMethods.logInfo                = angle::TestPlatform_logInfo;
>+    gDefaultPlatformMethods.context                = &gPlatformContext;
>+
>+    gPlatformContext.ignoreMessages   = false;
>+    gPlatformContext.warningsAsErrors = false;
>+    gPlatformContext.currentTest      = this;
> 
>     // Resize the window before creating the context so that the first make current
>     // sets the viewport and scissor box to the right size.
>     bool needSwap = false;
>-    if (mOSWindow->getWidth() != mWidth || mOSWindow->getHeight() != mHeight)
>+    if (mFixture->osWindow->getWidth() != mWidth || mFixture->osWindow->getHeight() != mHeight)
>     {
>-        if (!mOSWindow->resize(mWidth, mHeight))
>+        if (!mFixture->osWindow->resize(mWidth, mHeight))
>         {
>             FAIL() << "Failed to resize ANGLE test window.";
>         }
>         needSwap = true;
>     }
> 
>-    mPlatformMethods.overrideWorkaroundsD3D = angle::TestPlatform_overrideWorkaroundsD3D;
>-    mPlatformMethods.logError               = angle::TestPlatform_logError;
>-    mPlatformMethods.logWarning             = angle::TestPlatform_logWarning;
>-    mPlatformMethods.logInfo                = angle::TestPlatform_logInfo;
>-    mPlatformMethods.context                = &mPlatformContext;
>-    mEGLWindow->setPlatformMethods(&mPlatformMethods);
>-
>-    if (!mEGLWindow->initializeDisplayAndSurface(mOSWindow))
>+    // WGL tests are currently disabled.
>+    if (mFixture->wglWindow)
>     {
>-        FAIL() << "egl display or surface init failed.";
>+        FAIL() << "Unsupported driver.";
>     }
>-
>-    if (!mDeferContextInit && !mEGLWindow->initializeContext())
>+    else
>     {
>-        FAIL() << "GL Context init failed.";
>+        if (mForceNewDisplay || !mFixture->eglWindow->isDisplayInitialized())
>+        {
>+            mFixture->eglWindow->destroyGL();
>+            if (!mFixture->eglWindow->initializeDisplay(mFixture->osWindow,
>+                                                        ANGLETestEnvironment::GetEGLLibrary(),
>+                                                        mCurrentParams->eglParameters))
>+            {
>+                FAIL() << "EGL Display init failed.";
>+            }
>+        }
>+        else if (mCurrentParams->eglParameters != mFixture->eglWindow->getPlatform())
>+        {
>+            FAIL() << "Internal parameter conflict error.";
>+        }
>+
>+        if (!mFixture->eglWindow->initializeSurface(
>+                mFixture->osWindow, ANGLETestEnvironment::GetEGLLibrary(), mFixture->configParams))
>+        {
>+            FAIL() << "egl surface init failed.";
>+        }
>+
>+        if (!mDeferContextInit && !mFixture->eglWindow->initializeContext())
>+        {
>+            FAIL() << "GL Context init failed.";
>+        }
>     }
> 
>     if (needSwap)
>@@ -312,31 +488,33 @@ void ANGLETestBase::ANGLETestSetUp()
> 
> void ANGLETestBase::ANGLETestTearDown()
> {
>-    mEGLWindow->setPlatformMethods(nullptr);
>+    gPlatformContext.currentTest = nullptr;
> 
>-    mPlatformContext.currentTest = nullptr;
>-    checkD3D11SDKLayersMessages();
>-
>-    const auto &info = testing::UnitTest::GetInstance()->current_test_info();
>+    const testing::TestInfo *info = testing::UnitTest::GetInstance()->current_test_info();
>     angle::WriteDebugMessage("Exiting %s.%s\n", info->test_case_name(), info->name());
> 
>     swapBuffers();
>+    mFixture->osWindow->messageLoop();
> 
>-    if (eglGetError() != EGL_SUCCESS)
>+    if (mFixture->eglWindow)
>     {
>-        FAIL() << "egl error during swap.";
>+        checkD3D11SDKLayersMessages();
>     }
> 
>-    mOSWindow->messageLoop();
>-
>-    if (!destroyEGLContext())
>+    if (mFixture->reuseCounter++ >= kWindowReuseLimit || mForceNewDisplay)
>     {
>-        FAIL() << "egl context destruction failed.";
>+        mFixture->reuseCounter = 0;
>+        getGLWindow()->destroyGL();
>+    }
>+    else
>+    {
>+        mFixture->eglWindow->destroyContext();
>+        mFixture->eglWindow->destroySurface();
>     }
> 
>     // Check for quit message
>     Event myEvent;
>-    while (mOSWindow->popEvent(&myEvent))
>+    while (mFixture->osWindow->popEvent(&myEvent))
>     {
>         if (myEvent.Type == Event::EVENT_CLOSED)
>         {
>@@ -347,9 +525,14 @@ void ANGLETestBase::ANGLETestTearDown()
> 
> void ANGLETestBase::swapBuffers()
> {
>-    if (mEGLWindow->isGLInitialized())
>+    if (getGLWindow()->isGLInitialized())
>     {
>-        mEGLWindow->swap();
>+        getGLWindow()->swap();
>+
>+        if (mFixture->eglWindow)
>+        {
>+            EXPECT_EGL_SUCCESS();
>+        }
>     }
> }
> 
>@@ -380,7 +563,7 @@ void ANGLETestBase::setupIndexedQuadVertexBuffer(GLfloat positionAttribZ,
>         glGenBuffers(1, &mQuadVertexBuffer);
>     }
> 
>-    auto quadVertices = angle::GetIndexedQuadVertices();
>+    auto quadVertices = angle::kIndexedQuadVertices;
>     for (angle::Vector3 &vertex : quadVertices)
>     {
>         vertex.x() *= positionAttribXYScale;
>@@ -400,8 +583,8 @@ void ANGLETestBase::setupIndexedQuadIndexBuffer()
>     }
> 
>     glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, mQuadIndexBuffer);
>-    glBufferData(GL_ELEMENT_ARRAY_BUFFER, sizeof(angle::IndexedQuadIndices),
>-                 angle::IndexedQuadIndices.data(), GL_STATIC_DRAW);
>+    glBufferData(GL_ELEMENT_ARRAY_BUFFER, sizeof(angle::kIndexedQuadIndices),
>+                 angle::kIndexedQuadIndices.data(), GL_STATIC_DRAW);
> }
> 
> // static
>@@ -462,6 +645,8 @@ void ANGLETestBase::drawQuad(GLuint program,
> 
>     GLint positionLocation = glGetAttribLocation(program, positionAttribName.c_str());
> 
>+    std::array<angle::Vector3, 6> quadVertices;
>+
>     if (useVertexBuffer)
>     {
>         setupQuadVertexBuffer(positionAttribZ, positionAttribXYScale);
>@@ -470,7 +655,7 @@ void ANGLETestBase::drawQuad(GLuint program,
>     }
>     else
>     {
>-        auto quadVertices = GetQuadVertices();
>+        quadVertices = GetQuadVertices();
>         for (angle::Vector3 &vertex : quadVertices)
>         {
>             vertex.x() *= positionAttribXYScale;
>@@ -570,7 +755,7 @@ void ANGLETestBase::drawIndexedQuad(GLuint program,
>     }
>     else
>     {
>-        indices = angle::IndexedQuadIndices.data();
>+        indices = angle::kIndexedQuadIndices.data();
>     }
> 
>     if (!restrictedRange)
>@@ -603,7 +788,7 @@ GLuint ANGLETestBase::get2DTexturedQuadProgram()
>         return m2DTexturedQuadProgram;
>     }
> 
>-    const std::string &vs =
>+    constexpr char kVS[] =
>         "attribute vec2 position;\n"
>         "varying mediump vec2 texCoord;\n"
>         "void main()\n"
>@@ -612,7 +797,7 @@ GLuint ANGLETestBase::get2DTexturedQuadProgram()
>         "    texCoord = position * 0.5 + vec2(0.5);\n"
>         "}\n";
> 
>-    const std::string &fs =
>+    constexpr char kFS[] =
>         "varying mediump vec2 texCoord;\n"
>         "uniform sampler2D tex;\n"
>         "void main()\n"
>@@ -620,52 +805,74 @@ GLuint ANGLETestBase::get2DTexturedQuadProgram()
>         "    gl_FragColor = texture2D(tex, texCoord);\n"
>         "}\n";
> 
>-    m2DTexturedQuadProgram = CompileProgram(vs, fs);
>+    m2DTexturedQuadProgram = CompileProgram(kVS, kFS);
>     return m2DTexturedQuadProgram;
> }
> 
>+GLuint ANGLETestBase::get3DTexturedQuadProgram()
>+{
>+    if (m3DTexturedQuadProgram)
>+    {
>+        return m3DTexturedQuadProgram;
>+    }
>+
>+    constexpr char kVS[] = R"(#version 300 es
>+in vec2 position;
>+out vec2 texCoord;
>+void main()
>+{
>+    gl_Position = vec4(position, 0, 1);
>+    texCoord = position * 0.5 + vec2(0.5);
>+})";
>+
>+    constexpr char kFS[] = R"(#version 300 es
>+precision highp float;
>+
>+in vec2 texCoord;
>+out vec4 my_FragColor;
>+
>+uniform highp sampler3D tex;
>+uniform float u_layer;
>+
>+void main()
>+{
>+    my_FragColor = texture(tex, vec3(texCoord, u_layer));
>+})";
>+
>+    m3DTexturedQuadProgram = CompileProgram(kVS, kFS);
>+    return m3DTexturedQuadProgram;
>+}
>+
> void ANGLETestBase::draw2DTexturedQuad(GLfloat positionAttribZ,
>                                        GLfloat positionAttribXYScale,
>                                        bool useVertexBuffer)
> {
>     ASSERT_NE(0u, get2DTexturedQuadProgram());
>-    return drawQuad(get2DTexturedQuadProgram(), "position", positionAttribZ, positionAttribXYScale,
>-                    useVertexBuffer);
>+    drawQuad(get2DTexturedQuadProgram(), "position", positionAttribZ, positionAttribXYScale,
>+             useVertexBuffer);
> }
> 
>-GLuint ANGLETestBase::compileShader(GLenum type, const std::string &source)
>+void ANGLETestBase::draw3DTexturedQuad(GLfloat positionAttribZ,
>+                                       GLfloat positionAttribXYScale,
>+                                       bool useVertexBuffer,
>+                                       float layer)
> {
>-    GLuint shader = glCreateShader(type);
>-
>-    const char *sourceArray[1] = { source.c_str() };
>-    glShaderSource(shader, 1, sourceArray, nullptr);
>-    glCompileShader(shader);
>-
>-    GLint compileResult;
>-    glGetShaderiv(shader, GL_COMPILE_STATUS, &compileResult);
>-
>-    if (compileResult == 0)
>+    GLuint program = get3DTexturedQuadProgram();
>+    ASSERT_NE(0u, program);
>+    GLint activeProgram = 0;
>+    glGetIntegerv(GL_CURRENT_PROGRAM, &activeProgram);
>+    if (static_cast<GLuint>(activeProgram) != program)
>     {
>-        GLint infoLogLength;
>-        glGetShaderiv(shader, GL_INFO_LOG_LENGTH, &infoLogLength);
>-
>-        if (infoLogLength == 0)
>-        {
>-            std::cerr << "shader compilation failed with empty log." << std::endl;
>-        }
>-        else
>-        {
>-            std::vector<GLchar> infoLog(infoLogLength);
>-            glGetShaderInfoLog(shader, static_cast<GLsizei>(infoLog.size()), nullptr, &infoLog[0]);
>+        glUseProgram(program);
>+    }
>+    glUniform1f(glGetUniformLocation(program, "u_layer"), layer);
> 
>-            std::cerr << "shader compilation failed: " << &infoLog[0] << std::endl;
>-        }
>+    drawQuad(program, "position", positionAttribZ, positionAttribXYScale, useVertexBuffer);
> 
>-        glDeleteShader(shader);
>-        shader = 0;
>+    if (static_cast<GLuint>(activeProgram) != program)
>+    {
>+        glUseProgram(static_cast<GLuint>(activeProgram));
>     }
>-
>-    return shader;
> }
> 
> void ANGLETestBase::checkD3D11SDKLayersMessages()
>@@ -674,14 +881,14 @@ void ANGLETestBase::checkD3D11SDKLayersMessages()
>     // On Windows D3D11, check ID3D11InfoQueue to see if any D3D11 SDK Layers messages
>     // were outputted by the test. We enable the Debug layers in Release tests as well.
>     if (mIgnoreD3D11SDKLayersWarnings ||
>-        mEGLWindow->getPlatform().renderer != EGL_PLATFORM_ANGLE_TYPE_D3D11_ANGLE ||
>-        mEGLWindow->getDisplay() == EGL_NO_DISPLAY)
>+        mFixture->eglWindow->getPlatform().renderer != EGL_PLATFORM_ANGLE_TYPE_D3D11_ANGLE ||
>+        mFixture->eglWindow->getDisplay() == EGL_NO_DISPLAY)
>     {
>         return;
>     }
> 
>-    const char *extensionString =
>-        static_cast<const char *>(eglQueryString(mEGLWindow->getDisplay(), EGL_EXTENSIONS));
>+    const char *extensionString = static_cast<const char *>(
>+        eglQueryString(mFixture->eglWindow->getDisplay(), EGL_EXTENSIONS));
>     if (!extensionString)
>     {
>         std::cout << "Error getting extension string from EGL Window." << std::endl;
>@@ -706,7 +913,8 @@ void ANGLETestBase::checkD3D11SDKLayersMessages()
>     ASSERT_NE(nullptr, queryDisplayAttribEXT);
>     ASSERT_NE(nullptr, queryDeviceAttribEXT);
> 
>-    ASSERT_EGL_TRUE(queryDisplayAttribEXT(mEGLWindow->getDisplay(), EGL_DEVICE_EXT, &angleDevice));
>+    ASSERT_EGL_TRUE(
>+        queryDisplayAttribEXT(mFixture->eglWindow->getDisplay(), EGL_DEVICE_EXT, &angleDevice));
>     ASSERT_EGL_TRUE(queryDeviceAttribEXT(reinterpret_cast<EGLDeviceEXT>(angleDevice),
>                                          EGL_D3D11_DEVICE_ANGLE, &device));
>     ID3D11Device *d3d11Device = reinterpret_cast<ID3D11Device *>(device);
>@@ -747,36 +955,6 @@ void ANGLETestBase::checkD3D11SDKLayersMessages()
> #endif  // defined(ANGLE_PLATFORM_WINDOWS)
> }
> 
>-bool ANGLETestBase::extensionEnabled(const std::string &extName)
>-{
>-    return CheckExtensionExists(reinterpret_cast<const char *>(glGetString(GL_EXTENSIONS)),
>-                                extName);
>-}
>-
>-bool ANGLETestBase::extensionRequestable(const std::string &extName)
>-{
>-    return CheckExtensionExists(
>-        reinterpret_cast<const char *>(glGetString(GL_REQUESTABLE_EXTENSIONS_ANGLE)), extName);
>-}
>-
>-bool ANGLETestBase::eglDisplayExtensionEnabled(EGLDisplay display, const std::string &extName)
>-{
>-    return CheckExtensionExists(eglQueryString(display, EGL_EXTENSIONS), extName);
>-}
>-
>-bool ANGLETestBase::eglClientExtensionEnabled(const std::string &extName)
>-{
>-    return EGLWindow::ClientExtensionEnabled(extName);
>-}
>-
>-bool ANGLETestBase::eglDeviceExtensionEnabled(EGLDeviceEXT device, const std::string &extName)
>-{
>-    PFNEGLQUERYDEVICESTRINGEXTPROC eglQueryDeviceStringEXT =
>-        reinterpret_cast<PFNEGLQUERYDEVICESTRINGEXTPROC>(
>-            eglGetProcAddress("eglQueryDeviceStringEXT"));
>-    return CheckExtensionExists(eglQueryDeviceStringEXT(device, EGL_EXTENSIONS), extName);
>-}
>-
> void ANGLETestBase::setWindowWidth(int width)
> {
>     mWidth = width;
>@@ -787,94 +965,113 @@ void ANGLETestBase::setWindowHeight(int height)
>     mHeight = height;
> }
> 
>+GLWindowBase *ANGLETestBase::getGLWindow() const
>+{
>+    // WGL tests are currently disabled.
>+    assert(!mFixture->wglWindow);
>+    return mFixture->eglWindow;
>+}
>+
> void ANGLETestBase::setConfigRedBits(int bits)
> {
>-    mEGLWindow->setConfigRedBits(bits);
>+    mFixture->configParams.redBits = bits;
> }
> 
> void ANGLETestBase::setConfigGreenBits(int bits)
> {
>-    mEGLWindow->setConfigGreenBits(bits);
>+    mFixture->configParams.greenBits = bits;
> }
> 
> void ANGLETestBase::setConfigBlueBits(int bits)
> {
>-    mEGLWindow->setConfigBlueBits(bits);
>+    mFixture->configParams.blueBits = bits;
> }
> 
> void ANGLETestBase::setConfigAlphaBits(int bits)
> {
>-    mEGLWindow->setConfigAlphaBits(bits);
>+    mFixture->configParams.alphaBits = bits;
> }
> 
> void ANGLETestBase::setConfigDepthBits(int bits)
> {
>-    mEGLWindow->setConfigDepthBits(bits);
>+    mFixture->configParams.depthBits = bits;
> }
> 
> void ANGLETestBase::setConfigStencilBits(int bits)
> {
>-    mEGLWindow->setConfigStencilBits(bits);
>+    mFixture->configParams.stencilBits = bits;
> }
> 
> void ANGLETestBase::setConfigComponentType(EGLenum componentType)
> {
>-    mEGLWindow->setConfigComponentType(componentType);
>+    mFixture->configParams.componentType = componentType;
> }
> 
> void ANGLETestBase::setMultisampleEnabled(bool enabled)
> {
>-    mEGLWindow->setMultisample(enabled);
>+    mFixture->configParams.multisample = enabled;
> }
> 
> void ANGLETestBase::setSamples(EGLint samples)
> {
>-    mEGLWindow->setSamples(samples);
>+    mFixture->configParams.samples = samples;
> }
> 
> void ANGLETestBase::setDebugEnabled(bool enabled)
> {
>-    mEGLWindow->setDebugEnabled(enabled);
>+    mFixture->configParams.debug = enabled;
> }
> 
> void ANGLETestBase::setNoErrorEnabled(bool enabled)
> {
>-    mEGLWindow->setNoErrorEnabled(enabled);
>+    mFixture->configParams.noError = enabled;
> }
> 
> void ANGLETestBase::setWebGLCompatibilityEnabled(bool webglCompatibility)
> {
>-    mEGLWindow->setWebGLCompatibilityEnabled(webglCompatibility);
>+    mFixture->configParams.webGLCompatibility = webglCompatibility;
> }
> 
>-void ANGLETestBase::setRobustAccess(bool enabled)
>+void ANGLETestBase::setExtensionsEnabled(bool extensionsEnabled)
> {
>-    mEGLWindow->setRobustAccess(enabled);
>+    mFixture->configParams.extensionsEnabled = extensionsEnabled;
> }
> 
>-void ANGLETestBase::setBindGeneratesResource(bool bindGeneratesResource)
>+void ANGLETestBase::setRobustAccess(bool enabled)
> {
>-    mEGLWindow->setBindGeneratesResource(bindGeneratesResource);
>+    mFixture->configParams.robustAccess = enabled;
> }
> 
>-void ANGLETestBase::setDebugLayersEnabled(bool enabled)
>+void ANGLETestBase::setBindGeneratesResource(bool bindGeneratesResource)
> {
>-    mEGLWindow->setDebugLayersEnabled(enabled);
>+    mFixture->configParams.bindGeneratesResource = bindGeneratesResource;
> }
> 
> void ANGLETestBase::setClientArraysEnabled(bool enabled)
> {
>-    mEGLWindow->setClientArraysEnabled(enabled);
>+    mFixture->configParams.clientArraysEnabled = enabled;
> }
> 
> void ANGLETestBase::setRobustResourceInit(bool enabled)
> {
>-    mEGLWindow->setRobustResourceInit(enabled);
>+    mFixture->configParams.robustResourceInit = enabled;
>+}
>+
>+void ANGLETestBase::setContextProgramCacheEnabled(bool enabled,
>+                                                  angle::CacheProgramFunc cacheProgramFunc)
>+{
>+    mFixture->configParams.contextProgramCacheEnabled         = enabled;
>+    gDefaultPlatformMethods.cacheProgram                      = cacheProgramFunc;
> }
> 
>-void ANGLETestBase::setContextProgramCacheEnabled(bool enabled)
>+void ANGLETestBase::setContextResetStrategy(EGLenum resetStrategy)
> {
>-    mEGLWindow->setContextProgramCacheEnabled(enabled);
>+    mFixture->configParams.resetStrategy = resetStrategy;
>+}
>+
>+void ANGLETestBase::forceNewDisplay()
>+{
>+    mForceNewDisplay = true;
> }
> 
> void ANGLETestBase::setDeferContextInit(bool enabled)
>@@ -884,17 +1081,17 @@ void ANGLETestBase::setDeferContextInit(bool enabled)
> 
> int ANGLETestBase::getClientMajorVersion() const
> {
>-    return mEGLWindow->getClientMajorVersion();
>+    return getGLWindow()->getClientMajorVersion();
> }
> 
> int ANGLETestBase::getClientMinorVersion() const
> {
>-    return mEGLWindow->getClientMinorVersion();
>+    return getGLWindow()->getClientMinorVersion();
> }
> 
> EGLWindow *ANGLETestBase::getEGLWindow() const
> {
>-    return mEGLWindow;
>+    return mFixture->eglWindow;
> }
> 
> int ANGLETestBase::getWindowWidth() const
>@@ -909,63 +1106,12 @@ int ANGLETestBase::getWindowHeight() const
> 
> bool ANGLETestBase::isMultisampleEnabled() const
> {
>-    return mEGLWindow->isMultisample();
>-}
>-
>-bool ANGLETestBase::destroyEGLContext()
>-{
>-    mEGLWindow->destroyGL();
>-    return true;
>+    return mFixture->eglWindow->isMultisample();
> }
> 
>-// static
>-bool ANGLETestBase::InitTestWindow()
>+void ANGLETestBase::setWindowVisible(bool isVisible)
> {
>-    mOSWindow = CreateOSWindow();
>-    if (!mOSWindow->initialize("ANGLE_TEST", 128, 128))
>-    {
>-        return false;
>-    }
>-
>-    mOSWindow->setVisible(true);
>-
>-    mGLESLibrary.reset(angle::loadLibrary("libGLESv2"));
>-
>-    return true;
>-}
>-
>-// static
>-bool ANGLETestBase::DestroyTestWindow()
>-{
>-    if (mOSWindow)
>-    {
>-        mOSWindow->destroy();
>-        delete mOSWindow;
>-        mOSWindow = nullptr;
>-    }
>-
>-    mGLESLibrary.reset(nullptr);
>-
>-    return true;
>-}
>-
>-void ANGLETestBase::SetWindowVisible(bool isVisible)
>-{
>-    mOSWindow->setVisible(isVisible);
>-}
>-
>-ANGLETest::ANGLETest() : ANGLETestBase(GetParam())
>-{
>-}
>-
>-void ANGLETest::SetUp()
>-{
>-    ANGLETestBase::ANGLETestSetUp();
>-}
>-
>-void ANGLETest::TearDown()
>-{
>-    ANGLETestBase::ANGLETestTearDown();
>+    mFixture->osWindow->setVisible(isVisible);
> }
> 
> bool IsIntel()
>@@ -984,7 +1130,8 @@ bool IsAMD()
> {
>     std::string rendererString(reinterpret_cast<const char *>(glGetString(GL_RENDERER)));
>     return (rendererString.find("AMD") != std::string::npos) ||
>-           (rendererString.find("ATI") != std::string::npos);
>+           (rendererString.find("ATI") != std::string::npos) ||
>+           (rendererString.find("Radeon") != std::string::npos);
> }
> 
> bool IsNVIDIA()
>@@ -1039,107 +1186,148 @@ bool IsNULL()
>     return (rendererString.find("NULL") != std::string::npos);
> }
> 
>-bool IsAndroid()
>-{
>-#if defined(ANGLE_PLATFORM_ANDROID)
>-    return true;
>-#else
>-    return false;
>-#endif
>-}
>-
> bool IsVulkan()
> {
>-    std::string rendererString(reinterpret_cast<const char *>(glGetString(GL_RENDERER)));
>+    const char *renderer = reinterpret_cast<const char *>(glGetString(GL_RENDERER));
>+    std::string rendererString(renderer);
>     return (rendererString.find("Vulkan") != std::string::npos);
> }
> 
>-bool IsOzone()
>+bool IsDebug()
> {
>-#if defined(USE_OZONE)
>+#if !defined(NDEBUG)
>     return true;
> #else
>     return false;
> #endif
> }
> 
>-bool IsLinux()
>+bool IsRelease()
> {
>-#if defined(ANGLE_PLATFORM_LINUX)
>-    return true;
>-#else
>-    return false;
>-#endif
>+    return !IsDebug();
> }
> 
>-bool IsOSX()
>+ANGLETestBase::TestFixture::TestFixture()  = default;
>+ANGLETestBase::TestFixture::~TestFixture() = default;
>+
>+EGLint ANGLETestBase::getPlatformRenderer() const
> {
>-#if defined(ANGLE_PLATFORM_APPLE)
>-    return true;
>-#else
>-    return false;
>-#endif
>+    assert(mFixture->eglWindow);
>+    return mFixture->eglWindow->getPlatform().renderer;
> }
> 
>-bool IsWindows()
>+void ANGLETestBase::ignoreD3D11SDKLayersWarnings()
> {
>-#if defined(ANGLE_PLATFORM_WINDOWS)
>-    return true;
>-#else
>-    return false;
>-#endif
>+    // Some tests may need to disable the D3D11 SDK Layers Warnings checks
>+    mIgnoreD3D11SDKLayersWarnings = true;
> }
> 
>-bool IsDebug()
>+void ANGLETestBase::treatPlatformWarningsAsErrors()
> {
>-#if !defined(NDEBUG)
>-    return true;
>-#else
>-    return false;
>-#endif
>+#if defined(ANGLE_PLATFORM_WINDOWS)
>+    // Only do warnings-as-errors on 8 and above. We may fall back to the old
>+    // compiler DLL on Windows 7.
>+    gPlatformContext.warningsAsErrors = IsWindows8OrGreater();
>+#endif  // defined(ANGLE_PLATFORM_WINDOWS)
> }
> 
>-bool IsRelease()
>+ANGLETestBase::ScopedIgnorePlatformMessages::ScopedIgnorePlatformMessages()
> {
>-    return !IsDebug();
>+    gPlatformContext.ignoreMessages = true;
> }
> 
>-EGLint ANGLETestBase::getPlatformRenderer() const
>+ANGLETestBase::ScopedIgnorePlatformMessages::~ScopedIgnorePlatformMessages()
> {
>-    assert(mEGLWindow);
>-    return mEGLWindow->getPlatform().renderer;
>+    gPlatformContext.ignoreMessages = false;
> }
> 
>-void ANGLETestBase::ignoreD3D11SDKLayersWarnings()
>+OSWindow *ANGLETestBase::mOSWindowSingleton = nullptr;
>+std::map<angle::PlatformParameters, ANGLETestBase::TestFixture> ANGLETestBase::gPlatforms;
>+Optional<EGLint> ANGLETestBase::mLastRendererType;
>+
>+std::unique_ptr<angle::Library> ANGLETestEnvironment::gEGLLibrary;
>+std::unique_ptr<angle::Library> ANGLETestEnvironment::gWGLLibrary;
>+
>+void ANGLETestEnvironment::SetUp() {}
>+
>+void ANGLETestEnvironment::TearDown() {}
>+
>+angle::Library *ANGLETestEnvironment::GetEGLLibrary()
> {
>-    // Some tests may need to disable the D3D11 SDK Layers Warnings checks
>-    mIgnoreD3D11SDKLayersWarnings = true;
>+#if defined(ANGLE_USE_UTIL_LOADER)
>+    if (!gEGLLibrary)
>+    {
>+        gEGLLibrary.reset(angle::OpenSharedLibrary(ANGLE_EGL_LIBRARY_NAME));
>+    }
>+#endif  // defined(ANGLE_USE_UTIL_LOADER)
>+    return gEGLLibrary.get();
> }
> 
>-ANGLETestBase::ScopedIgnorePlatformMessages::ScopedIgnorePlatformMessages(ANGLETestBase *test)
>-    : mTest(test)
>+angle::Library *ANGLETestEnvironment::GetWGLLibrary()
> {
>-    mTest->mPlatformContext.ignoreMessages = true;
>+#if defined(ANGLE_USE_UTIL_LOADER) && defined(ANGLE_PLATFORM_WINDOWS)
>+    if (!gWGLLibrary)
>+    {
>+        gWGLLibrary.reset(angle::OpenSharedLibrary("opengl32"));
>+    }
>+#endif  // defined(ANGLE_USE_UTIL_LOADER) && defined(ANGLE_PLATFORM_WINDOWS)
>+    return gWGLLibrary.get();
> }
> 
>-ANGLETestBase::ScopedIgnorePlatformMessages::~ScopedIgnorePlatformMessages()
>+void ANGLEProcessTestArgs(int *argc, char *argv[])
> {
>-    mTest->mPlatformContext.ignoreMessages = false;
>+    testing::AddGlobalTestEnvironment(new ANGLETestEnvironment());
> }
> 
>-OSWindow *ANGLETestBase::mOSWindow = nullptr;
>-Optional<EGLint> ANGLETestBase::mLastRendererType;
>-std::unique_ptr<angle::Library> ANGLETestBase::mGLESLibrary;
>+EGLTest::EGLTest() = default;
> 
>-void ANGLETestEnvironment::SetUp()
>+EGLTest::~EGLTest() = default;
>+
>+void EGLTest::SetUp()
> {
>-    if (!ANGLETestBase::InitTestWindow())
>+#if defined(ANGLE_USE_UTIL_LOADER)
>+    PFNEGLGETPROCADDRESSPROC getProcAddress;
>+    ANGLETestEnvironment::GetEGLLibrary()->getAs("eglGetProcAddress", &getProcAddress);
>+    ASSERT_NE(nullptr, getProcAddress);
>+
>+    angle::LoadEGL(getProcAddress);
>+    angle::LoadGLES(getProcAddress);
>+#endif  // defined(ANGLE_USE_UTIL_LOADER)
>+}
>+
>+bool EnsureGLExtensionEnabled(const std::string &extName)
>+{
>+    if (IsGLExtensionEnabled("GL_ANGLE_request_extension") && IsGLExtensionRequestable(extName))
>     {
>-        FAIL() << "Failed to create ANGLE test window.";
>+        glRequestExtensionANGLE(extName.c_str());
>     }
>+
>+    return IsGLExtensionEnabled(extName);
> }
> 
>-void ANGLETestEnvironment::TearDown()
>+bool IsEGLClientExtensionEnabled(const std::string &extName)
> {
>-    ANGLETestBase::DestroyTestWindow();
>+    return CheckExtensionExists(eglQueryString(EGL_NO_DISPLAY, EGL_EXTENSIONS), extName);
>+}
>+
>+bool IsEGLDeviceExtensionEnabled(EGLDeviceEXT device, const std::string &extName)
>+{
>+    return CheckExtensionExists(eglQueryDeviceStringEXT(device, EGL_EXTENSIONS), extName);
>+}
>+
>+bool IsEGLDisplayExtensionEnabled(EGLDisplay display, const std::string &extName)
>+{
>+    return CheckExtensionExists(eglQueryString(display, EGL_EXTENSIONS), extName);
>+}
>+
>+bool IsGLExtensionEnabled(const std::string &extName)
>+{
>+    return CheckExtensionExists(reinterpret_cast<const char *>(glGetString(GL_EXTENSIONS)),
>+                                extName);
>+}
>+
>+bool IsGLExtensionRequestable(const std::string &extName)
>+{
>+    return CheckExtensionExists(
>+        reinterpret_cast<const char *>(glGetString(GL_REQUESTABLE_EXTENSIONS_ANGLE)), extName);
> }
>diff --git a/Source/ThirdParty/ANGLE/src/tests/test_utils/ANGLETest.h b/Source/ThirdParty/ANGLE/src/tests/test_utils/ANGLETest.h
>index eb0c5776c87..e01c40c818b 100644
>--- a/Source/ThirdParty/ANGLE/src/tests/test_utils/ANGLETest.h
>+++ b/Source/ThirdParty/ANGLE/src/tests/test_utils/ANGLETest.h
>@@ -14,13 +14,19 @@
> #include <algorithm>
> #include <array>
> 
>-#include "angle_gl.h"
> #include "angle_test_configs.h"
> #include "common/angleutils.h"
> #include "common/vector_utils.h"
> #include "platform/Platform.h"
>-#include "shader_utils.h"
>-#include "system_utils.h"
>+#include "util/EGLWindow.h"
>+#include "util/shader_utils.h"
>+#include "util/system_utils.h"
>+#include "util/util_gl.h"
>+
>+namespace angle
>+{
>+struct SystemInfo;
>+}  // namespace angle
> 
> #define ASSERT_GL_TRUE(a) ASSERT_EQ(static_cast<GLboolean>(GL_TRUE), (a))
> #define ASSERT_GL_FALSE(a) ASSERT_EQ(static_cast<GLboolean>(GL_FALSE), (a))
>@@ -37,21 +43,30 @@
> #define EXPECT_EGL_SUCCESS() EXPECT_EGL_ERROR(EGL_SUCCESS)
> 
> // EGLBoolean is |unsigned int| but EGL_TRUE is 0, not 0u.
>-#define ASSERT_EGL_TRUE(a) ASSERT_EQ(static_cast<EGLBoolean>(EGL_TRUE), (a))
>-#define ASSERT_EGL_FALSE(a) ASSERT_EQ(static_cast<EGLBoolean>(EGL_FALSE), (a))
>-#define EXPECT_EGL_TRUE(a) EXPECT_EQ(static_cast<EGLBoolean>(EGL_TRUE), (a))
>-#define EXPECT_EGL_FALSE(a) EXPECT_EQ(static_cast<EGLBoolean>(EGL_FALSE), (a))
>+#define ASSERT_EGL_TRUE(a) ASSERT_EQ(static_cast<EGLBoolean>(EGL_TRUE), static_cast<EGLBoolean>(a))
>+#define ASSERT_EGL_FALSE(a) \
>+    ASSERT_EQ(static_cast<EGLBoolean>(EGL_FALSE), static_cast<EGLBoolean>(a))
>+#define EXPECT_EGL_TRUE(a) EXPECT_EQ(static_cast<EGLBoolean>(EGL_TRUE), static_cast<EGLBoolean>(a))
>+#define EXPECT_EGL_FALSE(a) \
>+    EXPECT_EQ(static_cast<EGLBoolean>(EGL_FALSE), static_cast<EGLBoolean>(a))
> 
> #define ASSERT_EGL_ERROR(err) ASSERT_EQ((err), eglGetError())
> #define ASSERT_EGL_SUCCESS() ASSERT_EGL_ERROR(EGL_SUCCESS)
> 
>-#define ASSERT_GLENUM_EQ(expected, actual) ASSERT_EQ(static_cast<GLenum>(expected), static_cast<GLenum>(actual))
>-#define EXPECT_GLENUM_EQ(expected, actual) EXPECT_EQ(static_cast<GLenum>(expected), static_cast<GLenum>(actual))
>+#define ASSERT_GLENUM_EQ(expected, actual) \
>+    ASSERT_EQ(static_cast<GLenum>(expected), static_cast<GLenum>(actual))
>+#define EXPECT_GLENUM_EQ(expected, actual) \
>+    EXPECT_EQ(static_cast<GLenum>(expected), static_cast<GLenum>(actual))
> #define ASSERT_GLENUM_NE(expected, actual) \
>     ASSERT_NE(static_cast<GLenum>(expected), static_cast<GLenum>(actual))
> #define EXPECT_GLENUM_NE(expected, actual) \
>     EXPECT_NE(static_cast<GLenum>(expected), static_cast<GLenum>(actual))
> 
>+#define ASSERT_EGLENUM_EQ(expected, actual) \
>+    ASSERT_EQ(static_cast<EGLenum>(expected), static_cast<EGLenum>(actual))
>+#define EXPECT_EGLENUM_EQ(expected, actual) \
>+    EXPECT_EQ(static_cast<EGLenum>(expected), static_cast<EGLenum>(actual))
>+
> namespace angle
> {
> struct GLColorRGB
>@@ -82,6 +97,9 @@ struct GLColor
> 
>     const GLubyte &operator[](size_t index) const { return (&R)[index]; }
> 
>+    const GLubyte *data() const { return &R; }
>+    GLubyte *data() { return &R; }
>+
>     testing::AssertionResult ExpectNear(const GLColor &expected, const GLColor &err) const;
> 
>     GLubyte R, G, B, A;
>@@ -109,7 +127,13 @@ static constexpr GLColor32F kFloatRed   = {1.0f, 0.0f, 0.0f, 1.0f};
> static constexpr GLColor32F kFloatGreen = {0.0f, 1.0f, 0.0f, 1.0f};
> static constexpr GLColor32F kFloatBlue  = {0.0f, 0.0f, 1.0f, 1.0f};
> 
>-struct WorkaroundsD3D;
>+// The input here for pixelPoints are the expected integer window coordinates, we add .5 to every
>+// one of them and re-scale the numbers to be between [-1,1]. Using this technique, we can make
>+// sure the rasterization stage will end up drawing pixels at the expected locations.
>+void CreatePixelCenterWindowCoords(const std::vector<Vector2> &pixelPoints,
>+                                   int windowWidth,
>+                                   int windowHeight,
>+                                   std::vector<Vector3> *outVertices);
> 
> // Useful to cast any type to GLubyte.
> template <typename TR, typename TG, typename TB, typename TA>
>@@ -159,37 +183,49 @@ GLColor32F ReadColor32F(GLint x, GLint y);
> #define EXPECT_PIXEL_COLOR32F_EQ(x, y, angleColor) EXPECT_EQ(angleColor, angle::ReadColor32F(x, y))
> 
> #define EXPECT_PIXEL_RECT_EQ(x, y, width, height, color)                                           \
>-    \
>-{                                                                                           \
>+    do                                                                                             \
>+    {                                                                                              \
>         std::vector<GLColor> actualColors(width *height);                                          \
>         glReadPixels((x), (y), (width), (height), GL_RGBA, GL_UNSIGNED_BYTE, actualColors.data()); \
>         std::vector<GLColor> expectedColors(width *height, color);                                 \
>         EXPECT_EQ(expectedColors, actualColors);                                                   \
>-    \
>-}
>+    } while (0)
>+
>+#define EXPECT_PIXEL_NEAR_HELPER(x, y, r, g, b, a, abs_error, ctype, format, type) \
>+    do                                                                             \
>+    {                                                                              \
>+        ctype pixel[4];                                                            \
>+        glReadPixels((x), (y), 1, 1, format, type, pixel);                         \
>+        EXPECT_GL_NO_ERROR();                                                      \
>+        EXPECT_NEAR((r), pixel[0], abs_error);                                     \
>+        EXPECT_NEAR((g), pixel[1], abs_error);                                     \
>+        EXPECT_NEAR((b), pixel[2], abs_error);                                     \
>+        EXPECT_NEAR((a), pixel[3], abs_error);                                     \
>+    } while (0)
>+
>+#define EXPECT_PIXEL_EQ_HELPER(x, y, r, g, b, a, ctype, format, type) \
>+    do                                                                \
>+    {                                                                 \
>+        ctype pixel[4];                                               \
>+        glReadPixels((x), (y), 1, 1, format, type, pixel);            \
>+        EXPECT_GL_NO_ERROR();                                         \
>+        EXPECT_EQ((r), pixel[0]);                                     \
>+        EXPECT_EQ((g), pixel[1]);                                     \
>+        EXPECT_EQ((b), pixel[2]);                                     \
>+        EXPECT_EQ((a), pixel[3]);                                     \
>+    } while (0)
> 
> #define EXPECT_PIXEL_NEAR(x, y, r, g, b, a, abs_error) \
>-{ \
>-    GLubyte pixel[4]; \
>-    glReadPixels((x), (y), 1, 1, GL_RGBA, GL_UNSIGNED_BYTE, pixel); \
>-    EXPECT_GL_NO_ERROR(); \
>-    EXPECT_NEAR((r), pixel[0], abs_error); \
>-    EXPECT_NEAR((g), pixel[1], abs_error); \
>-    EXPECT_NEAR((b), pixel[2], abs_error); \
>-    EXPECT_NEAR((a), pixel[3], abs_error); \
>-}
>+    EXPECT_PIXEL_NEAR_HELPER(x, y, r, g, b, a, abs_error, GLubyte, GL_RGBA, GL_UNSIGNED_BYTE)
> 
>-#define EXPECT_PIXEL32F_NEAR(x, y, r, g, b, a, abs_error)       \
>-                                                                \
>-    {                                                           \
>-        GLfloat pixel[4];                                       \
>-        glReadPixels((x), (y), 1, 1, GL_RGBA, GL_FLOAT, pixel); \
>-        EXPECT_GL_NO_ERROR();                                   \
>-        EXPECT_NEAR((r), pixel[0], abs_error);                  \
>-        EXPECT_NEAR((g), pixel[1], abs_error);                  \
>-        EXPECT_NEAR((b), pixel[2], abs_error);                  \
>-        EXPECT_NEAR((a), pixel[3], abs_error);                  \
>-    }
>+#define EXPECT_PIXEL_32F_NEAR(x, y, r, g, b, a, abs_error) \
>+    EXPECT_PIXEL_NEAR_HELPER(x, y, r, g, b, a, abs_error, GLfloat, GL_RGBA, GL_FLOAT)
>+
>+#define EXPECT_PIXEL_8I(x, y, r, g, b, a) \
>+    EXPECT_PIXEL_EQ_HELPER(x, y, r, g, b, a, GLbyte, GL_RGBA_INTEGER, GL_BYTE)
>+
>+#define EXPECT_PIXEL_8UI(x, y, r, g, b, a) \
>+    EXPECT_PIXEL_EQ_HELPER(x, y, r, g, b, a, GLubyte, GL_RGBA_INTEGER, GL_UNSIGNED_BYTE)
> 
> // TODO(jmadill): Figure out how we can use GLColor's nice printing with EXPECT_NEAR.
> #define EXPECT_PIXEL_COLOR_NEAR(x, y, angleColor, abs_error) \
>@@ -199,16 +235,15 @@ GLColor32F ReadColor32F(GLint x, GLint y);
>     EXPECT_PIXEL32F_NEAR(x, y, angleColor.R, angleColor.G, angleColor.B, angleColor.A, abs_error)
> 
> #define EXPECT_COLOR_NEAR(expected, actual, abs_error) \
>-    \
>-{                                               \
>+    do                                                 \
>+    {                                                  \
>         EXPECT_NEAR(expected.R, actual.R, abs_error);  \
>         EXPECT_NEAR(expected.G, actual.G, abs_error);  \
>         EXPECT_NEAR(expected.B, actual.B, abs_error);  \
>         EXPECT_NEAR(expected.A, actual.A, abs_error);  \
>-    \
>-}
>+    } while (0)
> #define EXPECT_PIXEL32F_NEAR(x, y, r, g, b, a, abs_error)       \
>-                                                                \
>+    do                                                          \
>     {                                                           \
>         GLfloat pixel[4];                                       \
>         glReadPixels((x), (y), 1, 1, GL_RGBA, GL_FLOAT, pixel); \
>@@ -217,18 +252,21 @@ GLColor32F ReadColor32F(GLint x, GLint y);
>         EXPECT_NEAR((g), pixel[1], abs_error);                  \
>         EXPECT_NEAR((b), pixel[2], abs_error);                  \
>         EXPECT_NEAR((a), pixel[3], abs_error);                  \
>-    }
>+    } while (0)
> 
> #define EXPECT_PIXEL_COLOR32F_NEAR(x, y, angleColor, abs_error) \
>     EXPECT_PIXEL32F_NEAR(x, y, angleColor.R, angleColor.G, angleColor.B, angleColor.A, abs_error)
> 
>+class ANGLETestBase;
> class EGLWindow;
>+class GLWindowBase;
> class OSWindow;
>-class ANGLETestBase;
>+class WGLWindow;
> 
> struct TestPlatformContext final : private angle::NonCopyable
> {
>-    bool ignoreMessages    = false;
>+    bool ignoreMessages        = false;
>+    bool warningsAsErrors      = false;
>     ANGLETestBase *currentTest = nullptr;
> };
> 
>@@ -239,12 +277,10 @@ class ANGLETestBase
>     virtual ~ANGLETestBase();
> 
>   public:
>-    static bool InitTestWindow();
>-    static bool DestroyTestWindow();
>-    static void SetWindowVisible(bool isVisible);
>-    static bool eglDisplayExtensionEnabled(EGLDisplay display, const std::string &extName);
>+    void setWindowVisible(bool isVisible);
> 
>     virtual void overrideWorkaroundsD3D(angle::WorkaroundsD3D *workaroundsD3D) {}
>+    virtual void overrideFeaturesVk(angle::FeaturesVk *workaroundsVulkan) {}
> 
>   protected:
>     void ANGLETestSetUp();
>@@ -275,6 +311,8 @@ class ANGLETestBase
> 
>     static std::array<angle::Vector3, 6> GetQuadVertices();
>     static std::array<GLushort, 6> GetQuadIndices();
>+    static std::array<angle::Vector3, 4> GetIndexedQuadVertices();
>+
>     void drawIndexedQuad(GLuint program,
>                          const std::string &positionAttribName,
>                          GLfloat positionAttribZ);
>@@ -299,11 +337,11 @@ class ANGLETestBase
>                             GLfloat positionAttribXYScale,
>                             bool useVertexBuffer);
> 
>-    static GLuint compileShader(GLenum type, const std::string &source);
>-    static bool extensionEnabled(const std::string &extName);
>-    static bool extensionRequestable(const std::string &extName);
>-    static bool eglClientExtensionEnabled(const std::string &extName);
>-    static bool eglDeviceExtensionEnabled(EGLDeviceEXT device, const std::string &extName);
>+    // The layer parameter chooses the 3D texture layer to sample from.
>+    void draw3DTexturedQuad(GLfloat positionAttribZ,
>+                            GLfloat positionAttribXYScale,
>+                            bool useVertexBuffer,
>+                            float layer);
> 
>     void setWindowWidth(int width);
>     void setWindowHeight(int height);
>@@ -319,12 +357,14 @@ class ANGLETestBase
>     void setDebugEnabled(bool enabled);
>     void setNoErrorEnabled(bool enabled);
>     void setWebGLCompatibilityEnabled(bool webglCompatibility);
>+    void setExtensionsEnabled(bool extensionsEnabled);
>     void setRobustAccess(bool enabled);
>     void setBindGeneratesResource(bool bindGeneratesResource);
>-    void setDebugLayersEnabled(bool enabled);
>     void setClientArraysEnabled(bool enabled);
>     void setRobustResourceInit(bool enabled);
>-    void setContextProgramCacheEnabled(bool enabled);
>+    void setContextProgramCacheEnabled(bool enabled, angle::CacheProgramFunc cacheProgramFunc);
>+    void setContextResetStrategy(EGLenum resetStrategy);
>+    void forceNewDisplay();
> 
>     // Some EGL extension tests would like to defer the Context init until the test body.
>     void setDeferContextInit(bool enabled);
>@@ -332,6 +372,7 @@ class ANGLETestBase
>     int getClientMajorVersion() const;
>     int getClientMinorVersion() const;
> 
>+    GLWindowBase *getGLWindow() const;
>     EGLWindow *getEGLWindow() const;
>     int getWindowWidth() const;
>     int getWindowHeight() const;
>@@ -341,25 +382,24 @@ class ANGLETestBase
> 
>     void ignoreD3D11SDKLayersWarnings();
> 
>-    static OSWindow *GetOSWindow() { return mOSWindow; }
>+    // Allows a test to be more restrictive about platform warnings.
>+    void treatPlatformWarningsAsErrors();
>+
>+    OSWindow *getOSWindow() { return mFixture->osWindow; }
> 
>     GLuint get2DTexturedQuadProgram();
> 
>-    angle::PlatformMethods mPlatformMethods;
>+    // Has a float uniform "u_layer" to choose the 3D texture layer.
>+    GLuint get3DTexturedQuadProgram();
> 
>     class ScopedIgnorePlatformMessages : angle::NonCopyable
>     {
>       public:
>-        ScopedIgnorePlatformMessages(ANGLETestBase *test);
>+        ScopedIgnorePlatformMessages();
>         ~ScopedIgnorePlatformMessages();
>-
>-      private:
>-        ANGLETestBase *mTest;
>     };
> 
>   private:
>-    bool destroyEGLContext();
>-
>     void checkD3D11SDKLayersMessages();
> 
>     void drawQuad(GLuint program,
>@@ -370,7 +410,18 @@ class ANGLETestBase
>                   bool useInstancedDrawCalls,
>                   GLuint numInstances);
> 
>-    EGLWindow *mEGLWindow;
>+    struct TestFixture
>+    {
>+        TestFixture();
>+        ~TestFixture();
>+
>+        EGLWindow *eglWindow = nullptr;
>+        WGLWindow *wglWindow = nullptr;
>+        OSWindow *osWindow   = nullptr;
>+        ConfigParameters configParams;
>+        uint32_t reuseCounter = 0;
>+    };
>+
>     int mWidth;
>     int mHeight;
> 
>@@ -382,35 +433,74 @@ class ANGLETestBase
> 
>     // Used for texture rendering.
>     GLuint m2DTexturedQuadProgram;
>-
>-    TestPlatformContext mPlatformContext;
>+    GLuint m3DTexturedQuadProgram;
> 
>     bool mDeferContextInit;
>+    bool mAlwaysForceNewDisplay;
>+    bool mForceNewDisplay;
> 
>-    static OSWindow *mOSWindow;
>+    // On most systems we force a new display on every test instance. For these configs we can
>+    // share a single OSWindow instance. With display reuse we need a separate OSWindow for each
>+    // different config. This OSWindow sharing seemed to lead to driver bugs on some platforms.
>+    static OSWindow *mOSWindowSingleton;
>+
>+    static std::map<angle::PlatformParameters, TestFixture> gPlatforms;
>+    const angle::PlatformParameters *mCurrentParams;
>+    TestFixture *mFixture;
> 
>     // Workaround for NVIDIA not being able to share a window with OpenGL and Vulkan.
>     static Optional<EGLint> mLastRendererType;
>-
>-    // For loading and freeing platform
>-    static std::unique_ptr<angle::Library> mGLESLibrary;
> };
> 
>-class ANGLETest : public ANGLETestBase, public ::testing::TestWithParam<angle::PlatformParameters>
>+template <typename Params = angle::PlatformParameters>
>+class ANGLETestWithParam : public ANGLETestBase, public ::testing::TestWithParam<Params>
> {
>   protected:
>-    ANGLETest();
>+    ANGLETestWithParam();
> 
>   public:
>-    void SetUp() override;
>-    void TearDown() override;
>+    void SetUp() override { ANGLETestBase::ANGLETestSetUp(); }
>+
>+    void TearDown() override { ANGLETestBase::ANGLETestTearDown(); }
> };
> 
>+template <typename Params>
>+ANGLETestWithParam<Params>::ANGLETestWithParam()
>+    : ANGLETestBase(std::get<angle::PlatformParameters>(this->GetParam()))
>+{}
>+
>+template <>
>+inline ANGLETestWithParam<angle::PlatformParameters>::ANGLETestWithParam()
>+    : ANGLETestBase(this->GetParam())
>+{}
>+
>+// Note: this hack is not necessary in C++17.  Once we switch to C++17, we can just rename
>+// ANGLETestWithParam to ANGLETest.
>+using ANGLETest = ANGLETestWithParam<>;
>+
> class ANGLETestEnvironment : public testing::Environment
> {
>   public:
>     void SetUp() override;
>     void TearDown() override;
>+
>+    static angle::Library *GetEGLLibrary();
>+    static angle::Library *GetWGLLibrary();
>+
>+  private:
>+    // For loading entry points.
>+    static std::unique_ptr<angle::Library> gEGLLibrary;
>+    static std::unique_ptr<angle::Library> gWGLLibrary;
>+};
>+
>+// This base fixture loads the EGL entry points.
>+class EGLTest : public testing::Test
>+{
>+  public:
>+    EGLTest();
>+    ~EGLTest();
>+
>+    void SetUp() override;
> };
> 
> // Driver vendors
>@@ -430,29 +520,28 @@ bool IsD3DSM3();
> bool IsDesktopOpenGL();
> bool IsOpenGLES();
> bool IsOpenGL();
>-bool IsOzone();
> bool IsNULL();
>-
>-// Operating systems
>-bool IsAndroid();
>-bool IsLinux();
>-bool IsOSX();
>-bool IsWindows();
> bool IsVulkan();
> 
> // Debug/Release
> bool IsDebug();
> bool IsRelease();
> 
>-// Note: git cl format messes up this formatting.
>-#define ANGLE_SKIP_TEST_IF(COND)                              \
>-    \
>-if(COND)                                                      \
>-    \
>-{                                                      \
>-        std::cout << "Test skipped: " #COND "." << std::endl; \
>-        return;                                               \
>-    \
>-} ANGLE_EMPTY_STATEMENT
>+bool EnsureGLExtensionEnabled(const std::string &extName);
>+bool IsEGLClientExtensionEnabled(const std::string &extName);
>+bool IsEGLDeviceExtensionEnabled(EGLDeviceEXT device, const std::string &extName);
>+bool IsEGLDisplayExtensionEnabled(EGLDisplay display, const std::string &extName);
>+bool IsGLExtensionEnabled(const std::string &extName);
>+bool IsGLExtensionRequestable(const std::string &extName);
>+
>+#define ANGLE_SKIP_TEST_IF(COND)                                  \
>+    do                                                            \
>+    {                                                             \
>+        if (COND)                                                 \
>+        {                                                         \
>+            std::cout << "Test skipped: " #COND "." << std::endl; \
>+            return;                                               \
>+        }                                                         \
>+    } while (0)
> 
> #endif  // ANGLE_TESTS_ANGLE_TEST_H_
>diff --git a/Source/ThirdParty/ANGLE/src/tests/test_utils/ConstantFoldingTest.cpp b/Source/ThirdParty/ANGLE/src/tests/test_utils/ConstantFoldingTest.cpp
>index b9b508b8f42..86f4ab3cbb6 100644
>--- a/Source/ThirdParty/ANGLE/src/tests/test_utils/ConstantFoldingTest.cpp
>+++ b/Source/ThirdParty/ANGLE/src/tests/test_utils/ConstantFoldingTest.cpp
>@@ -9,47 +9,59 @@
> 
> #include "tests/test_utils/ConstantFoldingTest.h"
> 
>+#include "GLSLANG/ShaderLang.h"
> #include "angle_gl.h"
> #include "compiler/translator/TranslatorESSL.h"
>-#include "GLSLANG/ShaderLang.h"
> 
> using namespace sh;
> 
> void ConstantFoldingExpressionTest::evaluateFloat(const std::string &floatExpression)
> {
>+    // We first assign the expression into a const variable so we can also verify that it gets
>+    // qualified as a constant expression. We then assign that constant expression into my_FragColor
>+    // to make sure that the value is not pruned.
>     std::stringstream shaderStream;
>     shaderStream << "#version 310 es\n"
>                     "precision mediump float;\n"
>                     "out float my_FragColor;\n"
>                     "void main()\n"
>                     "{\n"
>-                 << "    my_FragColor = " << floatExpression << ";\n"
>-                 << "}\n";
>+                 << "    const float f = " << floatExpression << ";\n"
>+                 << "    my_FragColor = f;\n"
>+                    "}\n";
>     compileAssumeSuccess(shaderStream.str());
> }
> 
> void ConstantFoldingExpressionTest::evaluateInt(const std::string &intExpression)
> {
>+    // We first assign the expression into a const variable so we can also verify that it gets
>+    // qualified as a constant expression. We then assign that constant expression into my_FragColor
>+    // to make sure that the value is not pruned.
>     std::stringstream shaderStream;
>     shaderStream << "#version 310 es\n"
>                     "precision mediump int;\n"
>                     "out int my_FragColor;\n"
>                     "void main()\n"
>                     "{\n"
>-                 << "    my_FragColor = " << intExpression << ";\n"
>-                 << "}\n";
>+                 << "    const int i = " << intExpression << ";\n"
>+                 << "    my_FragColor = i;\n"
>+                    "}\n";
>     compileAssumeSuccess(shaderStream.str());
> }
> 
> void ConstantFoldingExpressionTest::evaluateUint(const std::string &uintExpression)
> {
>+    // We first assign the expression into a const variable so we can also verify that it gets
>+    // qualified as a constant expression. We then assign that constant expression into my_FragColor
>+    // to make sure that the value is not pruned.
>     std::stringstream shaderStream;
>     shaderStream << "#version 310 es\n"
>                     "precision mediump int;\n"
>                     "out uint my_FragColor;\n"
>                     "void main()\n"
>                     "{\n"
>-                 << "    my_FragColor = " << uintExpression << ";\n"
>-                 << "}\n";
>+                 << "    const uint u = " << uintExpression << ";\n"
>+                 << "    my_FragColor = u;\n"
>+                    "}\n";
>     compileAssumeSuccess(shaderStream.str());
> }
>diff --git a/Source/ThirdParty/ANGLE/src/tests/test_utils/ConstantFoldingTest.h b/Source/ThirdParty/ANGLE/src/tests/test_utils/ConstantFoldingTest.h
>index c260dc0a482..4df29101ccb 100644
>--- a/Source/ThirdParty/ANGLE/src/tests/test_utils/ConstantFoldingTest.h
>+++ b/Source/ThirdParty/ANGLE/src/tests/test_utils/ConstantFoldingTest.h
>@@ -13,7 +13,9 @@
> #include <vector>
> 
> #include "common/mathutil.h"
>-#include "compiler/translator/IntermTraverse.h"
>+#include "compiler/translator/tree_util/FindMain.h"
>+#include "compiler/translator/tree_util/FindSymbolNode.h"
>+#include "compiler/translator/tree_util/IntermTraverse.h"
> #include "tests/test_utils/ShaderCompileTreeTest.h"
> 
> namespace sh
>@@ -30,16 +32,14 @@ class ConstantFinder : public TIntermTraverser
>           mConstantVector(constantVector),
>           mFaultTolerance(T()),
>           mFound(false)
>-    {
>-    }
>+    {}
> 
>     ConstantFinder(const std::vector<T> &constantVector, const T &faultTolerance)
>         : TIntermTraverser(true, false, false),
>           mConstantVector(constantVector),
>           mFaultTolerance(faultTolerance),
>           mFound(false)
>-    {
>-    }
>+    {}
> 
>     ConstantFinder(const T &value)
>         : TIntermTraverser(true, false, false), mFaultTolerance(T()), mFound(false)
>@@ -54,7 +54,7 @@ class ConstantFinder : public TIntermTraverser
>             bool found = true;
>             for (size_t i = 0; i < mConstantVector.size(); i++)
>             {
>-                if (!isEqual(node->getUnionArrayPointer()[i], mConstantVector[i]))
>+                if (!isEqual(node->getConstantValue()[i], mConstantVector[i]))
>                 {
>                     found = false;
>                     break;
>@@ -169,6 +169,16 @@ class ConstantFoldingTest : public ShaderCompileTreeTest
>         mASTRoot->traverse(&finder);
>         return finder.found();
>     }
>+
>+    bool symbolFoundInAST(const char *symbolName)
>+    {
>+        return FindSymbolNode(mASTRoot, ImmutableString(symbolName)) != nullptr;
>+    }
>+
>+    bool symbolFoundInMain(const char *symbolName)
>+    {
>+        return FindSymbolNode(FindMain(mASTRoot), ImmutableString(symbolName)) != nullptr;
>+    }
> };
> 
> class ConstantFoldingExpressionTest : public ConstantFoldingTest
>diff --git a/Source/ThirdParty/ANGLE/src/tests/test_utils/MultiviewTest.cpp b/Source/ThirdParty/ANGLE/src/tests/test_utils/MultiviewTest.cpp
>new file mode 100644
>index 00000000000..aa2f7aacc43
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/tests/test_utils/MultiviewTest.cpp
>@@ -0,0 +1,236 @@
>+//
>+// Copyright 2018 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// MultiviewTest:
>+//   Implementation of helpers for multiview testing.
>+//
>+
>+#include "test_utils/MultiviewTest.h"
>+#include "platform/WorkaroundsD3D.h"
>+#include "test_utils/gl_raii.h"
>+
>+namespace angle
>+{
>+
>+GLuint CreateSimplePassthroughProgram(int numViews)
>+{
>+    const std::string vsSource =
>+        "#version 300 es\n"
>+        "#extension GL_OVR_multiview2 : require\n"
>+        "layout(num_views = " +
>+        ToString(numViews) +
>+        ") in;\n"
>+        "layout(location=0) in vec2 vPosition;\n"
>+        "void main()\n"
>+        "{\n"
>+        "   gl_PointSize = 1.;\n"
>+        "   gl_Position = vec4(vPosition.xy, 0.0, 1.0);\n"
>+        "}\n";
>+
>+    constexpr char kFS[] =
>+        "#version 300 es\n"
>+        "#extension GL_OVR_multiview2 : require\n"
>+        "precision mediump float;\n"
>+        "out vec4 col;\n"
>+        "void main()\n"
>+        "{\n"
>+        "   col = vec4(0,1,0,1);\n"
>+        "}\n";
>+    return CompileProgram(vsSource.c_str(), kFS);
>+}
>+
>+void CreateMultiviewBackingTextures(int samples,
>+                                    int viewWidth,
>+                                    int height,
>+                                    int numLayers,
>+                                    std::vector<GLuint> colorTextures,
>+                                    GLuint depthTexture,
>+                                    GLuint depthStencilTexture)
>+{
>+    // The same zero data is used to initialize both color and depth/stencil textures.
>+    std::vector<GLubyte> textureData;
>+    textureData.resize(viewWidth * height * numLayers * 4, 0u);
>+
>+    // We can't upload data to multisample textures, so we clear them using a temporary framebuffer
>+    // instead. The current framebuffer binding is stored so we can restore it once we're done with
>+    // using the temporary framebuffers.
>+    GLint restoreDrawFramebuffer;
>+    glGetIntegerv(GL_DRAW_FRAMEBUFFER_BINDING, &restoreDrawFramebuffer);
>+
>+    // Create color and depth textures.
>+    GLenum texTarget = (samples > 0) ? GL_TEXTURE_2D_MULTISAMPLE_ARRAY_OES : GL_TEXTURE_2D_ARRAY;
>+    for (auto colorTexture : colorTextures)
>+    {
>+        glBindTexture(texTarget, colorTexture);
>+        if (samples > 0)
>+        {
>+            glTexStorage3DMultisampleOES(texTarget, samples, GL_RGBA8, viewWidth, height, numLayers,
>+                                         false);
>+
>+            GLFramebuffer tempFbo;
>+            glBindFramebuffer(GL_DRAW_FRAMEBUFFER, tempFbo);
>+            glClearColor(0.0f, 0.0f, 0.0f, 0.0f);
>+            for (int layerIndex = 0; layerIndex < numLayers; ++layerIndex)
>+            {
>+                glFramebufferTextureLayer(GL_DRAW_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, colorTexture,
>+                                          0, layerIndex);
>+                glClear(GL_COLOR_BUFFER_BIT);
>+            }
>+        }
>+        else
>+        {
>+            glTexImage3D(texTarget, 0, GL_RGBA8, viewWidth, height, numLayers, 0, GL_RGBA,
>+                         GL_UNSIGNED_BYTE, textureData.data());
>+            glTexParameteri(texTarget, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
>+            glTexParameteri(texTarget, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
>+        }
>+    }
>+
>+    if (depthTexture != 0)
>+    {
>+        glBindTexture(texTarget, depthTexture);
>+        if (samples > 0)
>+        {
>+            glTexStorage3DMultisampleOES(texTarget, samples, GL_DEPTH_COMPONENT32F, viewWidth,
>+                                         height, numLayers, false);
>+
>+            GLFramebuffer tempFbo;
>+            glBindFramebuffer(GL_DRAW_FRAMEBUFFER, tempFbo);
>+            glClearDepthf(0.0f);
>+            for (int layerIndex = 0; layerIndex < numLayers; ++layerIndex)
>+            {
>+                glFramebufferTextureLayer(GL_DRAW_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, depthTexture, 0,
>+                                          layerIndex);
>+                glClear(GL_DEPTH_BUFFER_BIT);
>+            }
>+        }
>+        else
>+        {
>+            glTexImage3D(texTarget, 0, GL_DEPTH_COMPONENT32F, viewWidth, height, numLayers, 0,
>+                         GL_DEPTH_COMPONENT, GL_FLOAT, textureData.data());
>+        }
>+    }
>+    if (depthStencilTexture != 0)
>+    {
>+        glBindTexture(texTarget, depthStencilTexture);
>+        if (samples > 0)
>+        {
>+            glTexStorage3DMultisampleOES(texTarget, samples, GL_DEPTH24_STENCIL8, viewWidth, height,
>+                                         numLayers, false);
>+
>+            GLFramebuffer tempFbo;
>+            glBindFramebuffer(GL_DRAW_FRAMEBUFFER, tempFbo);
>+            glClearDepthf(0.0f);
>+            glClearStencil(0);
>+            for (int layerIndex = 0; layerIndex < numLayers; ++layerIndex)
>+            {
>+                glFramebufferTextureLayer(GL_DRAW_FRAMEBUFFER, GL_DEPTH_STENCIL_ATTACHMENT,
>+                                          depthTexture, 0, layerIndex);
>+                glClear(GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT);
>+            }
>+        }
>+        else
>+        {
>+            glTexImage3D(texTarget, 0, GL_DEPTH24_STENCIL8, viewWidth, height, numLayers, 0,
>+                         GL_DEPTH_STENCIL, GL_UNSIGNED_INT_24_8, textureData.data());
>+        }
>+    }
>+    glBindTexture(texTarget, 0);
>+    ASSERT_GL_NO_ERROR();
>+
>+    glBindFramebuffer(GL_DRAW_FRAMEBUFFER, restoreDrawFramebuffer);
>+}
>+
>+void CreateMultiviewBackingTextures(int samples,
>+                                    int viewWidth,
>+                                    int height,
>+                                    int numLayers,
>+                                    GLuint colorTexture,
>+                                    GLuint depthTexture,
>+                                    GLuint depthStencilTexture)
>+{
>+    ASSERT_TRUE(colorTexture != 0u);
>+    std::vector<GLuint> colorTextures(1, colorTexture);
>+    CreateMultiviewBackingTextures(samples, viewWidth, height, numLayers, colorTextures,
>+                                   depthTexture, depthStencilTexture);
>+}
>+
>+void AttachMultiviewTextures(GLenum target,
>+                             int viewWidth,
>+                             int numViews,
>+                             int baseViewIndex,
>+                             std::vector<GLuint> colorTextures,
>+                             GLuint depthTexture,
>+                             GLuint depthStencilTexture)
>+{
>+    ASSERT_TRUE(depthTexture == 0u || depthStencilTexture == 0u);
>+    for (size_t i = 0; i < colorTextures.size(); ++i)
>+    {
>+        GLenum attachment = static_cast<GLenum>(GL_COLOR_ATTACHMENT0 + i);
>+        glFramebufferTextureMultiviewOVR(target, attachment, colorTextures[i], 0, baseViewIndex,
>+                                         numViews);
>+    }
>+    if (depthTexture)
>+    {
>+        glFramebufferTextureMultiviewOVR(target, GL_DEPTH_ATTACHMENT, depthTexture, 0,
>+                                         baseViewIndex, numViews);
>+    }
>+    if (depthStencilTexture)
>+    {
>+        glFramebufferTextureMultiviewOVR(target, GL_DEPTH_STENCIL_ATTACHMENT, depthStencilTexture,
>+                                         0, baseViewIndex, numViews);
>+    }
>+}
>+
>+void AttachMultiviewTextures(GLenum target,
>+                             int viewWidth,
>+                             int numViews,
>+                             int baseViewIndex,
>+                             GLuint colorTexture,
>+                             GLuint depthTexture,
>+                             GLuint depthStencilTexture)
>+{
>+    ASSERT_TRUE(colorTexture != 0u);
>+    std::vector<GLuint> colorTextures(1, colorTexture);
>+    AttachMultiviewTextures(target, viewWidth, numViews, baseViewIndex, colorTextures, depthTexture,
>+                            depthStencilTexture);
>+}
>+
>+std::ostream &operator<<(std::ostream &os, const MultiviewImplementationParams &params)
>+{
>+    const PlatformParameters &base = static_cast<const PlatformParameters &>(params);
>+    os << base;
>+    if (params.mForceUseGeometryShaderOnD3D)
>+    {
>+        os << "_force_geom_shader";
>+    }
>+    else
>+    {
>+        os << "_vertex_shader";
>+    }
>+    return os;
>+}
>+
>+MultiviewImplementationParams VertexShaderOpenGL(GLint majorVersion, GLint minorVersion)
>+{
>+    return MultiviewImplementationParams(majorVersion, minorVersion, false, egl_platform::OPENGL());
>+}
>+
>+MultiviewImplementationParams VertexShaderD3D11(GLint majorVersion, GLint minorVersion)
>+{
>+    return MultiviewImplementationParams(majorVersion, minorVersion, false, egl_platform::D3D11());
>+}
>+
>+MultiviewImplementationParams GeomShaderD3D11(GLint majorVersion, GLint minorVersion)
>+{
>+    return MultiviewImplementationParams(majorVersion, minorVersion, true, egl_platform::D3D11());
>+}
>+
>+void MultiviewTest::overrideWorkaroundsD3D(WorkaroundsD3D *workarounds)
>+{
>+    workarounds->selectViewInGeometryShader = GetParam().mForceUseGeometryShaderOnD3D;
>+}
>+
>+}  // namespace angle
>diff --git a/Source/ThirdParty/ANGLE/src/tests/test_utils/MultiviewTest.h b/Source/ThirdParty/ANGLE/src/tests/test_utils/MultiviewTest.h
>new file mode 100644
>index 00000000000..3d087bb671a
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/tests/test_utils/MultiviewTest.h
>@@ -0,0 +1,150 @@
>+//
>+// Copyright 2018 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// MultiviewTest:
>+//   Implementation of helpers for multiview testing.
>+//
>+
>+#ifndef ANGLE_TESTS_TESTUTILS_MULTIVIEWTEST_H_
>+#define ANGLE_TESTS_TESTUTILS_MULTIVIEWTEST_H_
>+
>+#include "test_utils/ANGLETest.h"
>+
>+namespace angle
>+{
>+
>+// Creates a simple program that passes through two-dimensional vertices and renders green
>+// fragments.
>+GLuint CreateSimplePassthroughProgram(int numViews);
>+
>+// Create a 2D texture array to use for multiview rendering. Texture ids should be
>+// created beforehand. If depthTexture or stencilTexture is 0, it will not be initialized.
>+// If samples is 0, then non-multisampled textures are created. Otherwise multisampled textures are
>+// created with the requested sample count.
>+void CreateMultiviewBackingTextures(int samples,
>+                                    int viewWidth,
>+                                    int height,
>+                                    int numLayers,
>+                                    std::vector<GLuint> colorTextures,
>+                                    GLuint depthTexture,
>+                                    GLuint depthStencilTexture);
>+void CreateMultiviewBackingTextures(int samples,
>+                                    int viewWidth,
>+                                    int height,
>+                                    int numLayers,
>+                                    GLuint colorTexture,
>+                                    GLuint depthTexture,
>+                                    GLuint depthStencilTexture);
>+
>+// Attach multiview textures to the framebuffer denoted by target. If there are multiple color
>+// textures they get attached to different color attachments starting from 0.
>+void AttachMultiviewTextures(GLenum target,
>+                             int viewWidth,
>+                             int numViews,
>+                             int baseViewIndex,
>+                             std::vector<GLuint> colorTextures,
>+                             GLuint depthTexture,
>+                             GLuint depthStencilTexture);
>+void AttachMultiviewTextures(GLenum target,
>+                             int viewWidth,
>+                             int numViews,
>+                             int baseViewIndex,
>+                             GLuint colorTexture,
>+                             GLuint depthTexture,
>+                             GLuint depthStencilTexture);
>+
>+struct MultiviewImplementationParams : public PlatformParameters
>+{
>+    MultiviewImplementationParams(GLint majorVersion,
>+                                  GLint minorVersion,
>+                                  bool forceUseGeometryShaderOnD3D,
>+                                  const EGLPlatformParameters &eglPlatformParameters)
>+        : PlatformParameters(majorVersion, minorVersion, eglPlatformParameters),
>+          mForceUseGeometryShaderOnD3D(forceUseGeometryShaderOnD3D)
>+    {}
>+    bool mForceUseGeometryShaderOnD3D;
>+};
>+std::ostream &operator<<(std::ostream &os, const MultiviewImplementationParams &params);
>+
>+MultiviewImplementationParams VertexShaderOpenGL(GLint majorVersion, GLint minorVersion);
>+MultiviewImplementationParams VertexShaderD3D11(GLint majorVersion, GLint minorVersion);
>+MultiviewImplementationParams GeomShaderD3D11(GLint majorVersion, GLint minorVersion);
>+
>+class MultiviewTestBase : public ANGLETestBase
>+{
>+  protected:
>+    MultiviewTestBase(const PlatformParameters &params) : ANGLETestBase(params)
>+    {
>+        setWindowWidth(128);
>+        setWindowHeight(128);
>+        setWebGLCompatibilityEnabled(true);
>+    }
>+    virtual ~MultiviewTestBase() {}
>+
>+    void MultiviewTestBaseSetUp()
>+    {
>+        ANGLETestBase::ANGLETestSetUp();
>+
>+        glRequestExtensionANGLE = reinterpret_cast<PFNGLREQUESTEXTENSIONANGLEPROC>(
>+            eglGetProcAddress("glRequestExtensionANGLE"));
>+    }
>+
>+    void MultiviewTestBaseTearDown() { ANGLETestBase::ANGLETestTearDown(); }
>+
>+    // Requests the OVR_multiview2 extension and returns true if the operation succeeds.
>+    bool requestMultiviewExtension(bool requireMultiviewMultisample)
>+    {
>+        if (IsGLExtensionRequestable("GL_OVR_multiview2"))
>+        {
>+            glRequestExtensionANGLE("GL_OVR_multiview2");
>+        }
>+
>+        if (!IsGLExtensionEnabled("GL_OVR_multiview2"))
>+        {
>+            std::cout << "Test skipped due to missing GL_OVR_multiview2." << std::endl;
>+            return false;
>+        }
>+
>+        if (requireMultiviewMultisample)
>+        {
>+            if (IsGLExtensionRequestable("GL_OES_texture_storage_multisample_2d_array"))
>+            {
>+                glRequestExtensionANGLE("GL_OES_texture_storage_multisample_2d_array");
>+            }
>+            if (IsGLExtensionRequestable("GL_ANGLE_multiview_multisample"))
>+            {
>+                glRequestExtensionANGLE("GL_ANGLE_multiview_multisample");
>+            }
>+
>+            if (!IsGLExtensionEnabled("GL_ANGLE_multiview_multisample"))
>+            {
>+                std::cout << "Test skipped due to missing GL_ANGLE_multiview_multisample."
>+                          << std::endl;
>+                return false;
>+            }
>+        }
>+        return true;
>+    }
>+
>+    bool requestMultiviewExtension() { return requestMultiviewExtension(false); }
>+
>+    PFNGLREQUESTEXTENSIONANGLEPROC glRequestExtensionANGLE = nullptr;
>+};
>+
>+// Base class for multiview tests that don't need specific helper functions.
>+class MultiviewTest : public MultiviewTestBase,
>+                      public ::testing::TestWithParam<MultiviewImplementationParams>
>+{
>+  protected:
>+    MultiviewTest() : MultiviewTestBase(GetParam()) {}
>+    void SetUp() override { MultiviewTestBase::MultiviewTestBaseSetUp(); }
>+    void TearDown() override { MultiviewTestBase::MultiviewTestBaseTearDown(); }
>+
>+    void overrideWorkaroundsD3D(WorkaroundsD3D *workarounds) final;
>+};
>+
>+}  // namespace angle
>+
>+#endif  // ANGLE_TESTS_TESTUTILS_MULTIVIEWTEST_H_
>diff --git a/Source/ThirdParty/ANGLE/src/tests/test_utils/ShaderCompileTreeTest.cpp b/Source/ThirdParty/ANGLE/src/tests/test_utils/ShaderCompileTreeTest.cpp
>index b5056884232..cb7fbd92d14 100644
>--- a/Source/ThirdParty/ANGLE/src/tests/test_utils/ShaderCompileTreeTest.cpp
>+++ b/Source/ThirdParty/ANGLE/src/tests/test_utils/ShaderCompileTreeTest.cpp
>@@ -9,8 +9,8 @@
> 
> #include "tests/test_utils/ShaderCompileTreeTest.h"
> 
>-#include "compiler/translator/IntermTraverse.h"
> #include "compiler/translator/TranslatorESSL.h"
>+#include "compiler/translator/tree_util/IntermTraverse.h"
> 
> namespace sh
> {
>@@ -25,8 +25,7 @@ class OnlyContainsZeroConstantsTraverser final : public TIntermTraverser
>   public:
>     OnlyContainsZeroConstantsTraverser()
>         : TIntermTraverser(true, false, false), mOnlyContainsConstantZeros(true)
>-    {
>-    }
>+    {}
> 
>     bool visitUnary(Visit, TIntermUnary *node) override
>     {
>diff --git a/Source/ThirdParty/ANGLE/src/tests/test_utils/ShaderCompileTreeTest.h b/Source/ThirdParty/ANGLE/src/tests/test_utils/ShaderCompileTreeTest.h
>index 7b3ba83d319..9a2cd317188 100644
>--- a/Source/ThirdParty/ANGLE/src/tests/test_utils/ShaderCompileTreeTest.h
>+++ b/Source/ThirdParty/ANGLE/src/tests/test_utils/ShaderCompileTreeTest.h
>@@ -10,10 +10,10 @@
> #ifndef TESTS_TEST_UTILS_SHADER_COMPILE_TREE_TEST_H_
> #define TESTS_TEST_UTILS_SHADER_COMPILE_TREE_TEST_H_
> 
>+#include "GLSLANG/ShaderLang.h"
> #include "angle_gl.h"
> #include "compiler/translator/PoolAlloc.h"
> #include "gtest/gtest.h"
>-#include "GLSLANG/ShaderLang.h"
> 
> namespace sh
> {
>@@ -53,7 +53,7 @@ class ShaderCompileTreeTest : public testing::Test
>   private:
>     TranslatorESSL *mTranslator;
> 
>-    TPoolAllocator mAllocator;
>+    angle::PoolAllocator mAllocator;
> };
> 
> // Returns true if the node is some kind of a zero node - either constructor or a constant union
>diff --git a/Source/ThirdParty/ANGLE/src/tests/test_utils/ShaderExtensionTest.h b/Source/ThirdParty/ANGLE/src/tests/test_utils/ShaderExtensionTest.h
>new file mode 100644
>index 00000000000..ce0b7ddfffb
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/tests/test_utils/ShaderExtensionTest.h
>@@ -0,0 +1,80 @@
>+//
>+// Copyright (c) 2018 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// ShaderExtensionTest.cpp:
>+//   Utilities for testing that GLSL extension pragma and changing the extension flag in compiler
>+//   resources has the correct effect.
>+//
>+
>+#include "GLSLANG/ShaderLang.h"
>+#include "angle_gl.h"
>+#include "gtest/gtest.h"
>+
>+using testing::Combine;
>+using testing::make_tuple;
>+using testing::Values;
>+
>+namespace sh
>+{
>+
>+const char ESSLVersion100[] = "#version 100\n";
>+const char ESSLVersion300[] = "#version 300 es\n";
>+const char ESSLVersion310[] = "#version 310 es\n";
>+
>+class ShaderExtensionTest
>+    : public testing::TestWithParam<testing::tuple<ShShaderSpec, const char *, const char *>>
>+{
>+  protected:
>+    void SetUp() override
>+    {
>+        sh::InitBuiltInResources(&mResources);
>+        mCompiler = nullptr;
>+    }
>+
>+    void TearDown() override { DestroyCompiler(); }
>+    void DestroyCompiler()
>+    {
>+        if (mCompiler)
>+        {
>+            sh::Destruct(mCompiler);
>+            mCompiler = nullptr;
>+        }
>+    }
>+
>+    void InitializeCompiler()
>+    {
>+        DestroyCompiler();
>+        mCompiler = sh::ConstructCompiler(GL_FRAGMENT_SHADER, testing::get<0>(GetParam()),
>+                                          SH_GLSL_COMPATIBILITY_OUTPUT, &mResources);
>+        ASSERT_TRUE(mCompiler != nullptr) << "Compiler could not be constructed.";
>+    }
>+
>+    testing::AssertionResult TestShaderCompile(const char *pragma)
>+    {
>+        return TestShaderCompile(testing::get<1>(GetParam()),  // Version.
>+                                 pragma,
>+                                 testing::get<2>(GetParam())  // Shader.
>+        );
>+    }
>+
>+    testing::AssertionResult TestShaderCompile(const char *version,
>+                                               const char *pragma,
>+                                               const char *shader)
>+    {
>+        const char *shaderStrings[] = {version, pragma, shader};
>+        bool success                = sh::Compile(mCompiler, shaderStrings, 3, 0);
>+        if (success)
>+        {
>+            return ::testing::AssertionSuccess() << "Compilation success";
>+        }
>+        return ::testing::AssertionFailure() << sh::GetInfoLog(mCompiler);
>+    }
>+
>+  protected:
>+    ShBuiltInResources mResources;
>+    ShHandle mCompiler;
>+};
>+
>+}  // namespace sh
>diff --git a/Source/ThirdParty/ANGLE/src/tests/test_utils/VulkanExternalHelper.cpp b/Source/ThirdParty/ANGLE/src/tests/test_utils/VulkanExternalHelper.cpp
>new file mode 100644
>index 00000000000..f43b7cd655a
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/tests/test_utils/VulkanExternalHelper.cpp
>@@ -0,0 +1,437 @@
>+//
>+// Copyright 2019 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+
>+// VulkanExternalHelper.cpp : Helper for allocating & managing vulkan external objects.
>+
>+#include "test_utils/VulkanExternalHelper.h"
>+
>+#include <vulkan/vulkan.h>
>+#include <vector>
>+
>+#include "common/bitset_utils.h"
>+#include "common/debug.h"
>+
>+namespace angle
>+{
>+
>+namespace
>+{
>+
>+constexpr VkImageUsageFlags kRequiredImageUsageFlags =
>+    VK_IMAGE_USAGE_TRANSFER_SRC_BIT | VK_IMAGE_USAGE_TRANSFER_DST_BIT | VK_IMAGE_USAGE_SAMPLED_BIT |
>+    VK_IMAGE_USAGE_STORAGE_BIT | VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT |
>+    VK_IMAGE_USAGE_INPUT_ATTACHMENT_BIT;
>+
>+std::vector<VkExtensionProperties> EnumerateInstanceExtensionProperties(const char *layerName)
>+{
>+    uint32_t instanceExtensionCount;
>+    VkResult result =
>+        vkEnumerateInstanceExtensionProperties(layerName, &instanceExtensionCount, nullptr);
>+    ASSERT(result == VK_SUCCESS);
>+    std::vector<VkExtensionProperties> instanceExtensionProperties(instanceExtensionCount);
>+    result = vkEnumerateInstanceExtensionProperties(layerName, &instanceExtensionCount,
>+                                                    instanceExtensionProperties.data());
>+    ASSERT(result == VK_SUCCESS);
>+    return instanceExtensionProperties;
>+}
>+
>+std::vector<VkPhysicalDevice> EnumeratePhysicalDevices(VkInstance instance)
>+{
>+    uint32_t physicalDeviceCount;
>+    VkResult result = vkEnumeratePhysicalDevices(instance, &physicalDeviceCount, nullptr);
>+    ASSERT(result == VK_SUCCESS);
>+    std::vector<VkPhysicalDevice> physicalDevices(physicalDeviceCount);
>+    result = vkEnumeratePhysicalDevices(instance, &physicalDeviceCount, physicalDevices.data());
>+    return physicalDevices;
>+}
>+
>+std::vector<VkExtensionProperties> EnumerateDeviceExtensionProperties(
>+    VkPhysicalDevice physicalDevice,
>+    const char *layerName)
>+{
>+    uint32_t deviceExtensionCount;
>+    VkResult result = vkEnumerateDeviceExtensionProperties(physicalDevice, layerName,
>+                                                           &deviceExtensionCount, nullptr);
>+    ASSERT(result == VK_SUCCESS);
>+    std::vector<VkExtensionProperties> deviceExtensionProperties(deviceExtensionCount);
>+    result = vkEnumerateDeviceExtensionProperties(physicalDevice, layerName, &deviceExtensionCount,
>+                                                  deviceExtensionProperties.data());
>+    ASSERT(result == VK_SUCCESS);
>+    return deviceExtensionProperties;
>+}
>+
>+std::vector<VkQueueFamilyProperties> GetPhysicalDeviceQueueFamilyProperties(
>+    VkPhysicalDevice physicalDevice)
>+{
>+    uint32_t queueFamilyPropertyCount;
>+    vkGetPhysicalDeviceQueueFamilyProperties(physicalDevice, &queueFamilyPropertyCount, nullptr);
>+    std::vector<VkQueueFamilyProperties> physicalDeviceQueueFamilyProperties(
>+        queueFamilyPropertyCount);
>+    vkGetPhysicalDeviceQueueFamilyProperties(physicalDevice, &queueFamilyPropertyCount,
>+                                             physicalDeviceQueueFamilyProperties.data());
>+    return physicalDeviceQueueFamilyProperties;
>+}
>+
>+bool HasExtension(const std::vector<VkExtensionProperties> instanceExtensions,
>+                  const char *extensionName)
>+{
>+    for (const auto &extensionProperties : instanceExtensions)
>+    {
>+        if (!strcmp(extensionProperties.extensionName, extensionName))
>+            return true;
>+    }
>+
>+    return false;
>+}
>+
>+bool HasExtension(const std::vector<const char *> enabledExtensions, const char *extensionName)
>+{
>+    for (const char *enabledExtension : enabledExtensions)
>+    {
>+        if (!strcmp(enabledExtension, extensionName))
>+            return true;
>+    }
>+
>+    return false;
>+}
>+
>+uint32_t FindMemoryType(const VkPhysicalDeviceMemoryProperties &memoryProperties,
>+                        uint32_t memoryTypeBits,
>+                        VkMemoryPropertyFlags requiredMemoryPropertyFlags)
>+{
>+    for (size_t memoryIndex : angle::BitSet32<32>(memoryTypeBits))
>+    {
>+        ASSERT(memoryIndex < memoryProperties.memoryTypeCount);
>+
>+        if ((memoryProperties.memoryTypes[memoryIndex].propertyFlags &
>+             requiredMemoryPropertyFlags) == requiredMemoryPropertyFlags)
>+        {
>+            return static_cast<uint32_t>(memoryIndex);
>+        }
>+    }
>+
>+    return UINT32_MAX;
>+}
>+
>+}  // namespace
>+
>+VulkanExternalHelper::VulkanExternalHelper() {}
>+
>+VulkanExternalHelper::~VulkanExternalHelper()
>+{
>+    if (mDevice != VK_NULL_HANDLE)
>+    {
>+        vkDeviceWaitIdle(mDevice);
>+        vkDestroyDevice(mDevice, nullptr);
>+
>+        mDevice        = VK_NULL_HANDLE;
>+        mGraphicsQueue = VK_NULL_HANDLE;
>+    }
>+
>+    if (mInstance != VK_NULL_HANDLE)
>+    {
>+        vkDestroyInstance(mInstance, nullptr);
>+
>+        mInstance = VK_NULL_HANDLE;
>+    }
>+}
>+
>+void VulkanExternalHelper::initialize()
>+{
>+    ASSERT(mInstance == VK_NULL_HANDLE);
>+
>+    std::vector<VkExtensionProperties> instanceExtensionProperties =
>+        EnumerateInstanceExtensionProperties(nullptr);
>+
>+    std::vector<const char *> requestedInstanceExtensions = {
>+        VK_KHR_GET_PHYSICAL_DEVICE_PROPERTIES_2_EXTENSION_NAME,
>+        VK_KHR_EXTERNAL_MEMORY_CAPABILITIES_EXTENSION_NAME,
>+        VK_KHR_EXTERNAL_SEMAPHORE_CAPABILITIES_EXTENSION_NAME};
>+
>+    std::vector<const char *> enabledInstanceExtensions;
>+
>+    for (const char *extensionName : requestedInstanceExtensions)
>+    {
>+        if (HasExtension(instanceExtensionProperties, extensionName))
>+        {
>+            enabledInstanceExtensions.push_back(extensionName);
>+        }
>+    }
>+
>+    VkApplicationInfo applicationInfo = {
>+        /* .sType = */ VK_STRUCTURE_TYPE_APPLICATION_INFO,
>+        /* .pNext = */ nullptr,
>+        /* .pApplicationName = */ "ANGLE Tests",
>+        /* .applicationVersion = */ 1,
>+        /* .pEngineName = */ nullptr,
>+        /* .engineVersion = */ 0,
>+        /* .apiVersion = */ VK_API_VERSION_1_0,
>+    };
>+
>+    uint32_t enabledInstanceExtensionCount =
>+        static_cast<uint32_t>(enabledInstanceExtensions.size());
>+
>+    VkInstanceCreateInfo instanceCreateInfo = {
>+        /* .sType = */ VK_STRUCTURE_TYPE_INSTANCE_CREATE_INFO,
>+        /* .pNext = */ nullptr,
>+        /* .flags = */ 0,
>+        /* .pApplicationInfo = */ &applicationInfo,
>+        /* .enabledLayerCount = */ 0,
>+        /* .ppEnabledLayerNames = */ nullptr,
>+        /* .enabledExtensionCount = */ enabledInstanceExtensionCount,
>+        /* .ppEnabledExtensionName = */ enabledInstanceExtensions.data(),
>+    };
>+
>+    VkResult result = vkCreateInstance(&instanceCreateInfo, nullptr, &mInstance);
>+    ASSERT(result == VK_SUCCESS);
>+    ASSERT(mInstance != VK_NULL_HANDLE);
>+
>+    std::vector<VkPhysicalDevice> physicalDevices = EnumeratePhysicalDevices(mInstance);
>+    ASSERT(physicalDevices.size() > 0);
>+
>+    mPhysicalDevice = physicalDevices[0];
>+
>+    vkGetPhysicalDeviceMemoryProperties(mPhysicalDevice, &mMemoryProperties);
>+
>+    std::vector<VkExtensionProperties> deviceExtensionProperties =
>+        EnumerateDeviceExtensionProperties(mPhysicalDevice, nullptr);
>+
>+    std::vector<const char *> requestedDeviceExtensions = {
>+        VK_KHR_EXTERNAL_SEMAPHORE_EXTENSION_NAME,
>+        VK_KHR_EXTERNAL_SEMAPHORE_FD_EXTENSION_NAME,
>+        VK_KHR_EXTERNAL_MEMORY_EXTENSION_NAME,
>+        VK_KHR_EXTERNAL_MEMORY_FD_EXTENSION_NAME,
>+    };
>+
>+    std::vector<const char *> enabledDeviceExtensions;
>+
>+    for (const char *extensionName : requestedDeviceExtensions)
>+    {
>+        if (HasExtension(deviceExtensionProperties, extensionName))
>+        {
>+            enabledDeviceExtensions.push_back(extensionName);
>+        }
>+    }
>+
>+    std::vector<VkQueueFamilyProperties> queueFamilyProperties =
>+        GetPhysicalDeviceQueueFamilyProperties(mPhysicalDevice);
>+
>+    for (uint32_t i = 0; i < queueFamilyProperties.size(); ++i)
>+    {
>+        if (queueFamilyProperties[i].queueFlags & VK_QUEUE_GRAPHICS_BIT)
>+        {
>+            mGraphicsQueueFamilyIndex = i;
>+        }
>+    }
>+    ASSERT(mGraphicsQueueFamilyIndex != UINT32_MAX);
>+
>+    constexpr uint32_t kQueueCreateInfoCount           = 1;
>+    constexpr uint32_t kGraphicsQueueCount             = 1;
>+    float graphicsQueuePriorities[kGraphicsQueueCount] = {0.f};
>+
>+    VkDeviceQueueCreateInfo queueCreateInfos[kQueueCreateInfoCount] = {
>+        /* [0] = */ {
>+            /* .sType = */ VK_STRUCTURE_TYPE_DEVICE_QUEUE_CREATE_INFO,
>+            /* .pNext = */ nullptr,
>+            /* .flags = */ 0,
>+            /* .queueFamilyIndex = */ mGraphicsQueueFamilyIndex,
>+            /* .queueCount = */ 1,
>+            /* .pQueuePriorities = */ graphicsQueuePriorities,
>+        },
>+    };
>+
>+    uint32_t enabledDeviceExtensionCount = static_cast<uint32_t>(enabledDeviceExtensions.size());
>+
>+    VkDeviceCreateInfo deviceCreateInfo = {
>+        /* .sType = */ VK_STRUCTURE_TYPE_DEVICE_CREATE_INFO,
>+        /* .pNext = */ nullptr,
>+        /* .flags = */ 0,
>+        /* .queueCreateInfoCount = */ kQueueCreateInfoCount,
>+        /* .pQueueCreateInfos = */ queueCreateInfos,
>+        /* .enabledLayerCount = */ 0,
>+        /* .ppEnabledLayerNames = */ nullptr,
>+        /* .enabledExtensionCount = */ enabledDeviceExtensionCount,
>+        /* .ppEnabledExtensionName = */ enabledDeviceExtensions.data(),
>+        /* .pEnabledFeatures = */ nullptr,
>+    };
>+
>+    result = vkCreateDevice(mPhysicalDevice, &deviceCreateInfo, nullptr, &mDevice);
>+    ASSERT(result == VK_SUCCESS);
>+    ASSERT(mDevice != VK_NULL_HANDLE);
>+
>+    constexpr uint32_t kGraphicsQueueIndex = 0;
>+    static_assert(kGraphicsQueueIndex < kGraphicsQueueCount, "must be in range");
>+    vkGetDeviceQueue(mDevice, mGraphicsQueueFamilyIndex, kGraphicsQueueIndex, &mGraphicsQueue);
>+    ASSERT(mGraphicsQueue != VK_NULL_HANDLE);
>+
>+    mHasExternalMemoryFd =
>+        HasExtension(enabledDeviceExtensions, VK_KHR_EXTERNAL_MEMORY_FD_EXTENSION_NAME);
>+    mHasExternalSemaphoreFd =
>+        HasExtension(enabledDeviceExtensions, VK_KHR_EXTERNAL_SEMAPHORE_FD_EXTENSION_NAME);
>+
>+    vkGetPhysicalDeviceImageFormatProperties2 =
>+        reinterpret_cast<PFN_vkGetPhysicalDeviceImageFormatProperties2>(
>+            vkGetInstanceProcAddr(mInstance, "vkGetPhysicalDeviceImageFormatProperties2"));
>+    vkGetMemoryFdKHR = reinterpret_cast<PFN_vkGetMemoryFdKHR>(
>+        vkGetInstanceProcAddr(mInstance, "vkGetMemoryFdKHR"));
>+}
>+
>+bool VulkanExternalHelper::canCreateImageOpaqueFd(VkFormat format,
>+                                                  VkImageType type,
>+                                                  VkImageTiling tiling) const
>+{
>+    if (!mHasExternalMemoryFd)
>+    {
>+        return false;
>+    }
>+
>+    VkPhysicalDeviceExternalImageFormatInfo externalImageFormatInfo = {
>+        /* .sType = */ VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTERNAL_IMAGE_FORMAT_INFO,
>+        /* .pNext = */ nullptr,
>+        /* .handleType = */ VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_FD_BIT,
>+    };
>+
>+    VkPhysicalDeviceImageFormatInfo2 imageFormatInfo = {
>+        /* .sType = */ VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_IMAGE_FORMAT_INFO_2,
>+        /* .pNext = */ &externalImageFormatInfo,
>+        /* .format = */ format,
>+        /* .type = */ type,
>+        /* .tiling = */ tiling,
>+        /* .usage = */ kRequiredImageUsageFlags,
>+        /* .flags = */ 0,
>+    };
>+
>+    VkExternalImageFormatProperties externalImageFormatProperties = {
>+        /* .sType = */ VK_STRUCTURE_TYPE_EXTERNAL_IMAGE_FORMAT_PROPERTIES,
>+        /* .pNext = */ nullptr,
>+    };
>+
>+    VkImageFormatProperties2 imageFormatProperties = {
>+        /* .sType = */ VK_STRUCTURE_TYPE_IMAGE_FORMAT_PROPERTIES_2,
>+        /* .pNext = */ &externalImageFormatProperties};
>+
>+    VkResult result = vkGetPhysicalDeviceImageFormatProperties2(mPhysicalDevice, &imageFormatInfo,
>+                                                                &imageFormatProperties);
>+    if (result == VK_ERROR_FORMAT_NOT_SUPPORTED)
>+    {
>+        return false;
>+    }
>+
>+    ASSERT(result == VK_SUCCESS);
>+
>+    constexpr VkExternalMemoryFeatureFlags kUnsupportedFeatures =
>+        VK_EXTERNAL_MEMORY_FEATURE_DEDICATED_ONLY_BIT;
>+    constexpr VkExternalMemoryFeatureFlags kRequiredFeatures =
>+        VK_EXTERNAL_MEMORY_FEATURE_EXPORTABLE_BIT | VK_EXTERNAL_MEMORY_FEATURE_IMPORTABLE_BIT;
>+    if (externalImageFormatProperties.externalMemoryProperties.externalMemoryFeatures &
>+        kUnsupportedFeatures)
>+    {
>+        return false;
>+    }
>+    if (!(externalImageFormatProperties.externalMemoryProperties.externalMemoryFeatures &
>+          kRequiredFeatures))
>+    {
>+        return false;
>+    }
>+
>+    return true;
>+}
>+
>+VkResult VulkanExternalHelper::createImage2DOpaqueFd(VkFormat format,
>+                                                     VkExtent3D extent,
>+                                                     VkImage *imageOut,
>+                                                     VkDeviceMemory *deviceMemoryOut,
>+                                                     VkDeviceSize *deviceMemorySizeOut)
>+{
>+    VkExternalMemoryImageCreateInfoKHR externalMemoryImageCreateInfo = {
>+        /* .sType = */ VK_STRUCTURE_TYPE_EXTERNAL_MEMORY_IMAGE_CREATE_INFO,
>+        /* .pNext = */ nullptr,
>+        /* .handleTypes = */ VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_FD_BIT,
>+    };
>+
>+    VkImageCreateInfo imageCreateInfo = {
>+        /* .sType = */ VK_STRUCTURE_TYPE_IMAGE_CREATE_INFO,
>+        /* .pNext = */ &externalMemoryImageCreateInfo,
>+        /* .flags = */ 0,
>+        /* .imageType = */ VK_IMAGE_TYPE_2D,
>+        /* .format = */ format,
>+        /* .extent = */ extent,
>+        /* .mipLevels = */ 1,
>+        /* .arrayLayers = */ 1,
>+        /* .samples = */ VK_SAMPLE_COUNT_1_BIT,
>+        /* .tiling = */ VK_IMAGE_TILING_OPTIMAL,
>+        /* .usage = */ kRequiredImageUsageFlags,
>+        /* .sharingMode = */ VK_SHARING_MODE_EXCLUSIVE,
>+        /* .queueFamilyIndexCount = */ 0,
>+        /* .pQueueFamilyIndices = */ nullptr,
>+        /* initialLayout = */ VK_IMAGE_LAYOUT_UNDEFINED,
>+    };
>+
>+    VkImage image   = VK_NULL_HANDLE;
>+    VkResult result = vkCreateImage(mDevice, &imageCreateInfo, nullptr, &image);
>+    if (result != VK_SUCCESS)
>+    {
>+        return result;
>+    }
>+
>+    VkMemoryPropertyFlags requestedMemoryPropertyFlags = 0;
>+    VkMemoryRequirements memoryRequirements;
>+    vkGetImageMemoryRequirements(mDevice, image, &memoryRequirements);
>+    uint32_t memoryTypeIndex = FindMemoryType(mMemoryProperties, memoryRequirements.memoryTypeBits,
>+                                              requestedMemoryPropertyFlags);
>+    ASSERT(memoryTypeIndex != UINT32_MAX);
>+    VkDeviceSize deviceMemorySize = memoryRequirements.size;
>+
>+    VkExportMemoryAllocateInfo exportMemoryAllocateInfo = {
>+        /* .sType = */ VK_STRUCTURE_TYPE_EXPORT_MEMORY_ALLOCATE_INFO,
>+        /* .pNext = */ nullptr,
>+        /* .handleTypes = */ VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_FD_BIT,
>+    };
>+
>+    VkMemoryAllocateInfo memoryAllocateInfo = {
>+        /* .sType = */ VK_STRUCTURE_TYPE_MEMORY_ALLOCATE_INFO,
>+        /* .pNext = */ &exportMemoryAllocateInfo,
>+        /* .allocationSize = */ deviceMemorySize,
>+        /* .memoryTypeIndex = */ memoryTypeIndex,
>+    };
>+
>+    VkDeviceMemory deviceMemory = VK_NULL_HANDLE;
>+    result = vkAllocateMemory(mDevice, &memoryAllocateInfo, nullptr, &deviceMemory);
>+    if (result != VK_SUCCESS)
>+    {
>+        vkDestroyImage(mDevice, image, nullptr);
>+        return result;
>+    }
>+
>+    VkDeviceSize memoryOffset = 0;
>+    result                    = vkBindImageMemory(mDevice, image, deviceMemory, memoryOffset);
>+    if (result != VK_SUCCESS)
>+    {
>+        vkFreeMemory(mDevice, deviceMemory, nullptr);
>+        vkDestroyImage(mDevice, image, nullptr);
>+        return result;
>+    }
>+
>+    *imageOut            = image;
>+    *deviceMemoryOut     = deviceMemory;
>+    *deviceMemorySizeOut = deviceMemorySize;
>+
>+    return VK_SUCCESS;
>+}
>+
>+VkResult VulkanExternalHelper::exportMemoryOpaqueFd(VkDeviceMemory deviceMemory, int *fd)
>+{
>+    VkMemoryGetFdInfoKHR memoryGetFdInfo = {
>+        /* .sType = */ VK_STRUCTURE_TYPE_MEMORY_GET_FD_INFO_KHR,
>+        /* .pNext = */ nullptr,
>+        /* .memory = */ deviceMemory,
>+        /* .handleType = */ VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_FD_BIT,
>+    };
>+
>+    return vkGetMemoryFdKHR(mDevice, &memoryGetFdInfo, fd);
>+}
>+
>+}  // namespace angle
>diff --git a/Source/ThirdParty/ANGLE/src/tests/test_utils/VulkanExternalHelper.h b/Source/ThirdParty/ANGLE/src/tests/test_utils/VulkanExternalHelper.h
>new file mode 100644
>index 00000000000..519a9f076b9
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/tests/test_utils/VulkanExternalHelper.h
>@@ -0,0 +1,57 @@
>+//
>+// Copyright 2019 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// VulkanExternalHelper.h : Helper for allocating & managing vulkan external objects.
>+
>+#ifndef ANGLE_TESTS_TESTUTILS_VULKANEXTERNALHELPER_H_
>+#define ANGLE_TESTS_TESTUTILS_VULKANEXTERNALHELPER_H_
>+
>+#include <vulkan/vulkan.h>
>+
>+namespace angle
>+{
>+
>+class VulkanExternalHelper
>+{
>+  public:
>+    VulkanExternalHelper();
>+    ~VulkanExternalHelper();
>+
>+    void initialize();
>+
>+    VkInstance getInstance() const { return mInstance; }
>+    VkPhysicalDevice getPhysicalDevice() const { return mPhysicalDevice; }
>+    VkDevice getDevice() const { return mDevice; }
>+    VkQueue getGraphicsQueue() const { return mGraphicsQueue; }
>+
>+    // VK_KHR_external_memory_fd
>+    bool canCreateImageOpaqueFd(VkFormat format, VkImageType type, VkImageTiling tiling) const;
>+    VkResult createImage2DOpaqueFd(VkFormat format,
>+                                   VkExtent3D extent,
>+                                   VkImage *imageOut,
>+                                   VkDeviceMemory *deviceMemoryOut,
>+                                   VkDeviceSize *deviceMemorySizeOut);
>+    VkResult exportMemoryOpaqueFd(VkDeviceMemory deviceMemory, int *fd);
>+
>+  private:
>+    VkInstance mInstance             = VK_NULL_HANDLE;
>+    VkPhysicalDevice mPhysicalDevice = VK_NULL_HANDLE;
>+    VkDevice mDevice                 = VK_NULL_HANDLE;
>+    VkQueue mGraphicsQueue           = VK_NULL_HANDLE;
>+
>+    VkPhysicalDeviceMemoryProperties mMemoryProperties = {};
>+
>+    uint32_t mGraphicsQueueFamilyIndex = UINT32_MAX;
>+
>+    bool mHasExternalMemoryFd    = false;
>+    bool mHasExternalSemaphoreFd = false;
>+    PFN_vkGetPhysicalDeviceImageFormatProperties2 vkGetPhysicalDeviceImageFormatProperties2 =
>+        nullptr;
>+    PFN_vkGetMemoryFdKHR vkGetMemoryFdKHR = nullptr;
>+};
>+
>+}  // namespace angle
>+
>+#endif  // ANGLE_TESTS_TESTUTILS_VULKANEXTERNALHELPER_H_
>diff --git a/Source/ThirdParty/ANGLE/src/tests/test_utils/angle_test_configs.cpp b/Source/ThirdParty/ANGLE/src/tests/test_utils/angle_test_configs.cpp
>index f399d67ccc5..911ef9f1daa 100644
>--- a/Source/ThirdParty/ANGLE/src/tests/test_utils/angle_test_configs.cpp
>+++ b/Source/ThirdParty/ANGLE/src/tests/test_utils/angle_test_configs.cpp
>@@ -6,20 +6,31 @@
> 
> #include "test_utils/angle_test_configs.h"
> 
>+#include "common/platform.h"
>+#include "util/util_gl.h"
>+
> namespace angle
> {
> 
>-PlatformParameters::PlatformParameters()
>-    : PlatformParameters(2, 0, EGLPlatformParameters())
>+PlatformParameters::PlatformParameters() : PlatformParameters(2, 0, GLESDriverType::AngleEGL) {}
>+
>+PlatformParameters::PlatformParameters(EGLint majorVersion,
>+                                       EGLint minorVersion,
>+                                       const EGLPlatformParameters &eglPlatformParameters)
>+    : driver(GLESDriverType::AngleEGL),
>+      eglParameters(eglPlatformParameters),
>+      majorVersion(majorVersion),
>+      minorVersion(minorVersion)
> {
>+    initDefaultParameters();
> }
> 
>-PlatformParameters::PlatformParameters(EGLint majorVersion, EGLint minorVersion,
>-                                       const EGLPlatformParameters &eglPlatformParameters)
>-    : majorVersion(majorVersion),
>-      minorVersion(minorVersion),
>-      eglParameters(eglPlatformParameters)
>+PlatformParameters::PlatformParameters(EGLint majorVersion,
>+                                       EGLint minorVersion,
>+                                       GLESDriverType driver)
>+    : driver(driver), majorVersion(majorVersion), minorVersion(minorVersion)
> {
>+    initDefaultParameters();
> }
> 
> EGLint PlatformParameters::getRenderer() const
>@@ -27,61 +38,76 @@ EGLint PlatformParameters::getRenderer() const
>     return eglParameters.renderer;
> }
> 
>-bool operator<(const PlatformParameters &a, const PlatformParameters &b)
>+void PlatformParameters::initDefaultParameters()
> {
>-    if (a.majorVersion != b.majorVersion)
>-    {
>-        return a.majorVersion < b.majorVersion;
>-    }
>-
>-    if (a.minorVersion != b.minorVersion)
>-    {
>-        return a.minorVersion < b.minorVersion;
>-    }
>+    // Default debug layers to enabled in tests.
>+    eglParameters.debugLayersEnabled = EGL_TRUE;
>+}
> 
>-    return a.eglParameters < b.eglParameters;
>+bool operator<(const PlatformParameters &a, const PlatformParameters &b)
>+{
>+    return a.tie() < b.tie();
> }
> 
> bool operator==(const PlatformParameters &a, const PlatformParameters &b)
> {
>-    return (a.majorVersion == b.majorVersion) &&
>-           (a.minorVersion == b.minorVersion) &&
>-           (a.eglParameters == b.eglParameters);
>+    return a.tie() == b.tie();
>+}
>+
>+bool operator!=(const PlatformParameters &a, const PlatformParameters &b)
>+{
>+    return a.tie() != b.tie();
> }
> 
>-std::ostream &operator<<(std::ostream& stream, const PlatformParameters &pp)
>+std::ostream &operator<<(std::ostream &stream, const PlatformParameters &pp)
> {
>-    stream << "ES" << pp.majorVersion << "_" ;
>+    stream << "ES" << pp.majorVersion << "_";
>     if (pp.minorVersion != 0)
>     {
>         stream << pp.minorVersion << "_";
>     }
> 
>-    switch (pp.eglParameters.renderer)
>+    switch (pp.driver)
>     {
>-        case EGL_PLATFORM_ANGLE_TYPE_DEFAULT_ANGLE:
>-            stream << "DEFAULT";
>+        case GLESDriverType::AngleEGL:
>+        {
>+            switch (pp.eglParameters.renderer)
>+            {
>+                case EGL_PLATFORM_ANGLE_TYPE_DEFAULT_ANGLE:
>+                    stream << "DEFAULT";
>+                    break;
>+                case EGL_PLATFORM_ANGLE_TYPE_D3D9_ANGLE:
>+                    stream << "D3D9";
>+                    break;
>+                case EGL_PLATFORM_ANGLE_TYPE_D3D11_ANGLE:
>+                    stream << "D3D11";
>+                    break;
>+                case EGL_PLATFORM_ANGLE_TYPE_NULL_ANGLE:
>+                    stream << "NULL";
>+                    break;
>+                case EGL_PLATFORM_ANGLE_TYPE_OPENGL_ANGLE:
>+                    stream << "OPENGL";
>+                    break;
>+                case EGL_PLATFORM_ANGLE_TYPE_OPENGLES_ANGLE:
>+                    stream << "OPENGLES";
>+                    break;
>+                case EGL_PLATFORM_ANGLE_TYPE_VULKAN_ANGLE:
>+                    stream << "VULKAN";
>+                    break;
>+                default:
>+                    stream << "UNDEFINED";
>+                    break;
>+            }
>             break;
>-        case EGL_PLATFORM_ANGLE_TYPE_D3D9_ANGLE:
>-            stream << "D3D9";
>+        }
>+        case GLESDriverType::SystemWGL:
>+            stream << "WGL";
>             break;
>-        case EGL_PLATFORM_ANGLE_TYPE_D3D11_ANGLE:
>-            stream << "D3D11";
>-            break;
>-        case EGL_PLATFORM_ANGLE_TYPE_NULL_ANGLE:
>-            stream << "NULL";
>-            break;
>-        case EGL_PLATFORM_ANGLE_TYPE_OPENGL_ANGLE:
>-            stream << "OPENGL";
>-            break;
>-        case EGL_PLATFORM_ANGLE_TYPE_OPENGLES_ANGLE:
>-            stream << "OPENGLES";
>-            break;
>-        case EGL_PLATFORM_ANGLE_TYPE_VULKAN_ANGLE:
>-            stream << "VULKAN";
>+        case GLESDriverType::SystemEGL:
>+            stream << "GLES";
>             break;
>         default:
>-            stream << "UNDEFINED";
>+            stream << "ERROR";
>             break;
>     }
> 
>@@ -97,26 +123,26 @@ std::ostream &operator<<(std::ostream& stream, const PlatformParameters &pp)
> 
>     switch (pp.eglParameters.deviceType)
>     {
>-      case EGL_DONT_CARE:
>-      case EGL_PLATFORM_ANGLE_DEVICE_TYPE_HARDWARE_ANGLE:
>-        // default
>-        break;
>-
>-      case EGL_PLATFORM_ANGLE_DEVICE_TYPE_NULL_ANGLE:
>-          stream << "_NULL";
>-          break;
>-
>-      case EGL_PLATFORM_ANGLE_DEVICE_TYPE_REFERENCE_ANGLE:
>-        stream << "_REFERENCE";
>-        break;
>-
>-      case EGL_PLATFORM_ANGLE_DEVICE_TYPE_WARP_ANGLE:
>-        stream << "_WARP";
>-        break;
>-
>-      default:
>-        UNREACHABLE();
>-        break;
>+        case EGL_DONT_CARE:
>+        case EGL_PLATFORM_ANGLE_DEVICE_TYPE_HARDWARE_ANGLE:
>+            // default
>+            break;
>+
>+        case EGL_PLATFORM_ANGLE_DEVICE_TYPE_NULL_ANGLE:
>+            stream << "_NULL";
>+            break;
>+
>+        case EGL_PLATFORM_ANGLE_DEVICE_TYPE_D3D_REFERENCE_ANGLE:
>+            stream << "_REFERENCE";
>+            break;
>+
>+        case EGL_PLATFORM_ANGLE_DEVICE_TYPE_D3D_WARP_ANGLE:
>+            stream << "_WARP";
>+            break;
>+
>+        default:
>+            stream << "_ERR";
>+            break;
>     }
> 
>     switch (pp.eglParameters.presentPath)
>@@ -134,10 +160,15 @@ std::ostream &operator<<(std::ostream& stream, const PlatformParameters &pp)
>             break;
> 
>         default:
>-            UNREACHABLE();
>+            stream << "_ERR";
>             break;
>     }
> 
>+    if (pp.eglParameters.contextVirtualization == EGL_FALSE)
>+    {
>+        stream << "_NO_VIRTUAL";
>+    }
>+
>     return stream;
> }
> 
>@@ -152,42 +183,32 @@ EGLPlatformParameters DEFAULT()
> 
> EGLPlatformParameters DEFAULT_NULL()
> {
>-    return EGLPlatformParameters(
>-        EGL_PLATFORM_ANGLE_TYPE_DEFAULT_ANGLE,
>-        EGL_DONT_CARE, EGL_DONT_CARE,
>-        EGL_PLATFORM_ANGLE_DEVICE_TYPE_NULL_ANGLE);
>+    return EGLPlatformParameters(EGL_PLATFORM_ANGLE_TYPE_DEFAULT_ANGLE, EGL_DONT_CARE,
>+                                 EGL_DONT_CARE, EGL_PLATFORM_ANGLE_DEVICE_TYPE_NULL_ANGLE);
> }
> 
> EGLPlatformParameters D3D9()
> {
>-    return EGLPlatformParameters(
>-        EGL_PLATFORM_ANGLE_TYPE_D3D9_ANGLE,
>-        EGL_DONT_CARE, EGL_DONT_CARE,
>-        EGL_PLATFORM_ANGLE_DEVICE_TYPE_HARDWARE_ANGLE);
>+    return EGLPlatformParameters(EGL_PLATFORM_ANGLE_TYPE_D3D9_ANGLE, EGL_DONT_CARE, EGL_DONT_CARE,
>+                                 EGL_PLATFORM_ANGLE_DEVICE_TYPE_HARDWARE_ANGLE);
> }
> 
> EGLPlatformParameters D3D9_NULL()
> {
>-    return EGLPlatformParameters(
>-        EGL_PLATFORM_ANGLE_TYPE_D3D9_ANGLE,
>-        EGL_DONT_CARE, EGL_DONT_CARE,
>-        EGL_PLATFORM_ANGLE_DEVICE_TYPE_NULL_ANGLE);
>+    return EGLPlatformParameters(EGL_PLATFORM_ANGLE_TYPE_D3D9_ANGLE, EGL_DONT_CARE, EGL_DONT_CARE,
>+                                 EGL_PLATFORM_ANGLE_DEVICE_TYPE_NULL_ANGLE);
> }
> 
> EGLPlatformParameters D3D9_REFERENCE()
> {
>-    return EGLPlatformParameters(
>-        EGL_PLATFORM_ANGLE_TYPE_D3D9_ANGLE,
>-        EGL_DONT_CARE, EGL_DONT_CARE,
>-        EGL_PLATFORM_ANGLE_DEVICE_TYPE_REFERENCE_ANGLE);
>+    return EGLPlatformParameters(EGL_PLATFORM_ANGLE_TYPE_D3D9_ANGLE, EGL_DONT_CARE, EGL_DONT_CARE,
>+                                 EGL_PLATFORM_ANGLE_DEVICE_TYPE_D3D_REFERENCE_ANGLE);
> }
> 
> EGLPlatformParameters D3D11()
> {
>-    return EGLPlatformParameters(
>-        EGL_PLATFORM_ANGLE_TYPE_D3D11_ANGLE,
>-        EGL_DONT_CARE, EGL_DONT_CARE,
>-        EGL_PLATFORM_ANGLE_DEVICE_TYPE_HARDWARE_ANGLE);
>+    return EGLPlatformParameters(EGL_PLATFORM_ANGLE_TYPE_D3D11_ANGLE, EGL_DONT_CARE, EGL_DONT_CARE,
>+                                 EGL_PLATFORM_ANGLE_DEVICE_TYPE_HARDWARE_ANGLE);
> }
> 
> EGLPlatformParameters D3D11(EGLenum presentPath)
>@@ -198,146 +219,110 @@ EGLPlatformParameters D3D11(EGLenum presentPath)
> 
> EGLPlatformParameters D3D11_FL11_1()
> {
>-    return EGLPlatformParameters(
>-        EGL_PLATFORM_ANGLE_TYPE_D3D11_ANGLE,
>-        11, 1,
>-        EGL_PLATFORM_ANGLE_DEVICE_TYPE_HARDWARE_ANGLE);
>+    return EGLPlatformParameters(EGL_PLATFORM_ANGLE_TYPE_D3D11_ANGLE, 11, 1,
>+                                 EGL_PLATFORM_ANGLE_DEVICE_TYPE_HARDWARE_ANGLE);
> }
> 
> EGLPlatformParameters D3D11_FL11_0()
> {
>-    return EGLPlatformParameters(
>-        EGL_PLATFORM_ANGLE_TYPE_D3D11_ANGLE,
>-        11, 0,
>-        EGL_PLATFORM_ANGLE_DEVICE_TYPE_HARDWARE_ANGLE);
>+    return EGLPlatformParameters(EGL_PLATFORM_ANGLE_TYPE_D3D11_ANGLE, 11, 0,
>+                                 EGL_PLATFORM_ANGLE_DEVICE_TYPE_HARDWARE_ANGLE);
> }
> 
> EGLPlatformParameters D3D11_FL10_1()
> {
>-    return EGLPlatformParameters(
>-        EGL_PLATFORM_ANGLE_TYPE_D3D11_ANGLE,
>-        10, 1,
>-        EGL_PLATFORM_ANGLE_DEVICE_TYPE_HARDWARE_ANGLE);
>+    return EGLPlatformParameters(EGL_PLATFORM_ANGLE_TYPE_D3D11_ANGLE, 10, 1,
>+                                 EGL_PLATFORM_ANGLE_DEVICE_TYPE_HARDWARE_ANGLE);
> }
> 
> EGLPlatformParameters D3D11_FL10_0()
> {
>-    return EGLPlatformParameters(
>-        EGL_PLATFORM_ANGLE_TYPE_D3D11_ANGLE,
>-        10, 0,
>-        EGL_PLATFORM_ANGLE_DEVICE_TYPE_HARDWARE_ANGLE);
>+    return EGLPlatformParameters(EGL_PLATFORM_ANGLE_TYPE_D3D11_ANGLE, 10, 0,
>+                                 EGL_PLATFORM_ANGLE_DEVICE_TYPE_HARDWARE_ANGLE);
> }
> 
> EGLPlatformParameters D3D11_FL9_3()
> {
>-    return EGLPlatformParameters(
>-        EGL_PLATFORM_ANGLE_TYPE_D3D11_ANGLE,
>-        9, 3,
>-        EGL_PLATFORM_ANGLE_DEVICE_TYPE_HARDWARE_ANGLE);
>+    return EGLPlatformParameters(EGL_PLATFORM_ANGLE_TYPE_D3D11_ANGLE, 9, 3,
>+                                 EGL_PLATFORM_ANGLE_DEVICE_TYPE_HARDWARE_ANGLE);
> }
> 
> EGLPlatformParameters D3D11_NULL()
> {
>-    return EGLPlatformParameters(
>-        EGL_PLATFORM_ANGLE_TYPE_D3D11_ANGLE,
>-        EGL_DONT_CARE, EGL_DONT_CARE,
>-        EGL_PLATFORM_ANGLE_DEVICE_TYPE_NULL_ANGLE);
>+    return EGLPlatformParameters(EGL_PLATFORM_ANGLE_TYPE_D3D11_ANGLE, EGL_DONT_CARE, EGL_DONT_CARE,
>+                                 EGL_PLATFORM_ANGLE_DEVICE_TYPE_NULL_ANGLE);
> }
> 
> EGLPlatformParameters D3D11_WARP()
> {
>-    return EGLPlatformParameters(
>-        EGL_PLATFORM_ANGLE_TYPE_D3D11_ANGLE,
>-        EGL_DONT_CARE, EGL_DONT_CARE,
>-        EGL_PLATFORM_ANGLE_DEVICE_TYPE_WARP_ANGLE);
>+    return EGLPlatformParameters(EGL_PLATFORM_ANGLE_TYPE_D3D11_ANGLE, EGL_DONT_CARE, EGL_DONT_CARE,
>+                                 EGL_PLATFORM_ANGLE_DEVICE_TYPE_D3D_WARP_ANGLE);
> }
> 
> EGLPlatformParameters D3D11_FL11_1_WARP()
> {
>-    return EGLPlatformParameters(
>-        EGL_PLATFORM_ANGLE_TYPE_D3D11_ANGLE,
>-        11, 1,
>-        EGL_PLATFORM_ANGLE_DEVICE_TYPE_WARP_ANGLE);
>+    return EGLPlatformParameters(EGL_PLATFORM_ANGLE_TYPE_D3D11_ANGLE, 11, 1,
>+                                 EGL_PLATFORM_ANGLE_DEVICE_TYPE_D3D_WARP_ANGLE);
> }
> 
> EGLPlatformParameters D3D11_FL11_0_WARP()
> {
>-    return EGLPlatformParameters(
>-        EGL_PLATFORM_ANGLE_TYPE_D3D11_ANGLE,
>-        11, 0,
>-        EGL_PLATFORM_ANGLE_DEVICE_TYPE_WARP_ANGLE);
>+    return EGLPlatformParameters(EGL_PLATFORM_ANGLE_TYPE_D3D11_ANGLE, 11, 0,
>+                                 EGL_PLATFORM_ANGLE_DEVICE_TYPE_D3D_WARP_ANGLE);
> }
> 
> EGLPlatformParameters D3D11_FL10_1_WARP()
> {
>-    return EGLPlatformParameters(
>-        EGL_PLATFORM_ANGLE_TYPE_D3D11_ANGLE,
>-        10, 1,
>-        EGL_PLATFORM_ANGLE_DEVICE_TYPE_WARP_ANGLE);
>+    return EGLPlatformParameters(EGL_PLATFORM_ANGLE_TYPE_D3D11_ANGLE, 10, 1,
>+                                 EGL_PLATFORM_ANGLE_DEVICE_TYPE_D3D_WARP_ANGLE);
> }
> 
> EGLPlatformParameters D3D11_FL10_0_WARP()
> {
>-    return EGLPlatformParameters(
>-        EGL_PLATFORM_ANGLE_TYPE_D3D11_ANGLE,
>-        10, 0,
>-        EGL_PLATFORM_ANGLE_DEVICE_TYPE_WARP_ANGLE);
>+    return EGLPlatformParameters(EGL_PLATFORM_ANGLE_TYPE_D3D11_ANGLE, 10, 0,
>+                                 EGL_PLATFORM_ANGLE_DEVICE_TYPE_D3D_WARP_ANGLE);
> }
> 
> EGLPlatformParameters D3D11_FL9_3_WARP()
> {
>-    return EGLPlatformParameters(
>-        EGL_PLATFORM_ANGLE_TYPE_D3D11_ANGLE,
>-        9, 3,
>-        EGL_PLATFORM_ANGLE_DEVICE_TYPE_WARP_ANGLE);
>+    return EGLPlatformParameters(EGL_PLATFORM_ANGLE_TYPE_D3D11_ANGLE, 9, 3,
>+                                 EGL_PLATFORM_ANGLE_DEVICE_TYPE_D3D_WARP_ANGLE);
> }
> 
> EGLPlatformParameters D3D11_REFERENCE()
> {
>-    return EGLPlatformParameters(
>-        EGL_PLATFORM_ANGLE_TYPE_D3D11_ANGLE,
>-        EGL_DONT_CARE, EGL_DONT_CARE,
>-        EGL_PLATFORM_ANGLE_DEVICE_TYPE_REFERENCE_ANGLE);
>+    return EGLPlatformParameters(EGL_PLATFORM_ANGLE_TYPE_D3D11_ANGLE, EGL_DONT_CARE, EGL_DONT_CARE,
>+                                 EGL_PLATFORM_ANGLE_DEVICE_TYPE_D3D_REFERENCE_ANGLE);
> }
> 
> EGLPlatformParameters D3D11_FL11_1_REFERENCE()
> {
>-    return EGLPlatformParameters(
>-        EGL_PLATFORM_ANGLE_TYPE_D3D11_ANGLE,
>-        11, 1,
>-        EGL_PLATFORM_ANGLE_DEVICE_TYPE_REFERENCE_ANGLE);
>+    return EGLPlatformParameters(EGL_PLATFORM_ANGLE_TYPE_D3D11_ANGLE, 11, 1,
>+                                 EGL_PLATFORM_ANGLE_DEVICE_TYPE_D3D_REFERENCE_ANGLE);
> }
> 
> EGLPlatformParameters D3D11_FL11_0_REFERENCE()
> {
>-    return EGLPlatformParameters(
>-        EGL_PLATFORM_ANGLE_TYPE_D3D11_ANGLE,
>-        11, 0,
>-        EGL_PLATFORM_ANGLE_DEVICE_TYPE_REFERENCE_ANGLE);
>+    return EGLPlatformParameters(EGL_PLATFORM_ANGLE_TYPE_D3D11_ANGLE, 11, 0,
>+                                 EGL_PLATFORM_ANGLE_DEVICE_TYPE_D3D_REFERENCE_ANGLE);
> }
> 
> EGLPlatformParameters D3D11_FL10_1_REFERENCE()
> {
>-    return EGLPlatformParameters(
>-        EGL_PLATFORM_ANGLE_TYPE_D3D11_ANGLE,
>-        10, 1,
>-        EGL_PLATFORM_ANGLE_DEVICE_TYPE_REFERENCE_ANGLE);
>+    return EGLPlatformParameters(EGL_PLATFORM_ANGLE_TYPE_D3D11_ANGLE, 10, 1,
>+                                 EGL_PLATFORM_ANGLE_DEVICE_TYPE_D3D_REFERENCE_ANGLE);
> }
> 
> EGLPlatformParameters D3D11_FL10_0_REFERENCE()
> {
>-    return EGLPlatformParameters(
>-        EGL_PLATFORM_ANGLE_TYPE_D3D11_ANGLE,
>-        10, 0,
>-        EGL_PLATFORM_ANGLE_DEVICE_TYPE_REFERENCE_ANGLE);
>+    return EGLPlatformParameters(EGL_PLATFORM_ANGLE_TYPE_D3D11_ANGLE, 10, 0,
>+                                 EGL_PLATFORM_ANGLE_DEVICE_TYPE_D3D_REFERENCE_ANGLE);
> }
> 
> EGLPlatformParameters D3D11_FL9_3_REFERENCE()
> {
>-    return EGLPlatformParameters(
>-        EGL_PLATFORM_ANGLE_TYPE_D3D11_ANGLE,
>-        9, 3,
>-        EGL_PLATFORM_ANGLE_DEVICE_TYPE_REFERENCE_ANGLE);
>+    return EGLPlatformParameters(EGL_PLATFORM_ANGLE_TYPE_D3D11_ANGLE, 9, 3,
>+                                 EGL_PLATFORM_ANGLE_DEVICE_TYPE_D3D_REFERENCE_ANGLE);
> }
> 
> EGLPlatformParameters OPENGL()
>@@ -345,21 +330,15 @@ EGLPlatformParameters OPENGL()
>     return EGLPlatformParameters(EGL_PLATFORM_ANGLE_TYPE_OPENGL_ANGLE);
> }
> 
>-
> EGLPlatformParameters OPENGL(EGLint major, EGLint minor)
> {
>-    return EGLPlatformParameters(
>-        EGL_PLATFORM_ANGLE_TYPE_OPENGL_ANGLE,
>-        major, minor,
>-        EGL_DONT_CARE);
>+    return EGLPlatformParameters(EGL_PLATFORM_ANGLE_TYPE_OPENGL_ANGLE, major, minor, EGL_DONT_CARE);
> }
> 
> EGLPlatformParameters OPENGL_NULL()
> {
>-    return EGLPlatformParameters(
>-        EGL_PLATFORM_ANGLE_TYPE_OPENGL_ANGLE,
>-        0, 0,
>-        EGL_PLATFORM_ANGLE_DEVICE_TYPE_NULL_ANGLE);
>+    return EGLPlatformParameters(EGL_PLATFORM_ANGLE_TYPE_OPENGL_ANGLE, EGL_DONT_CARE, EGL_DONT_CARE,
>+                                 EGL_PLATFORM_ANGLE_DEVICE_TYPE_NULL_ANGLE);
> }
> 
> EGLPlatformParameters OPENGLES()
>@@ -393,17 +372,28 @@ EGLPlatformParameters VULKAN()
>     return EGLPlatformParameters(EGL_PLATFORM_ANGLE_TYPE_VULKAN_ANGLE);
> }
> 
>+EGLPlatformParameters VULKAN_NULL()
>+{
>+    return EGLPlatformParameters(EGL_PLATFORM_ANGLE_TYPE_VULKAN_ANGLE, EGL_DONT_CARE, EGL_DONT_CARE,
>+                                 EGL_PLATFORM_ANGLE_DEVICE_TYPE_NULL_ANGLE);
>+}
>+
> }  // namespace egl_platform
> 
> // ANGLE tests platforms
>+PlatformParameters ES1_D3D9()
>+{
>+    return PlatformParameters(1, 0, egl_platform::D3D9());
>+}
>+
> PlatformParameters ES2_D3D9()
> {
>     return PlatformParameters(2, 0, egl_platform::D3D9());
> }
> 
>-PlatformParameters ES2_D3D9_REFERENCE()
>+PlatformParameters ES1_D3D11()
> {
>-    return PlatformParameters(2, 0, egl_platform::D3D9_REFERENCE());
>+    return PlatformParameters(1, 0, egl_platform::D3D11());
> }
> 
> PlatformParameters ES2_D3D11()
>@@ -541,24 +531,9 @@ PlatformParameters ES3_D3D11_FL10_1_WARP()
>     return PlatformParameters(3, 0, egl_platform::D3D11_FL10_1_WARP());
> }
> 
>-PlatformParameters ES3_D3D11_REFERENCE()
>+PlatformParameters ES1_OPENGLES()
> {
>-    return PlatformParameters(3, 0, egl_platform::D3D11_REFERENCE());
>-}
>-
>-PlatformParameters ES3_D3D11_FL11_1_REFERENCE()
>-{
>-    return PlatformParameters(3, 0, egl_platform::D3D11_FL11_1_REFERENCE());
>-}
>-
>-PlatformParameters ES3_D3D11_FL11_0_REFERENCE()
>-{
>-    return PlatformParameters(3, 0, egl_platform::D3D11_FL11_0_REFERENCE());
>-}
>-
>-PlatformParameters ES3_D3D11_FL10_1_REFERENCE()
>-{
>-    return PlatformParameters(3, 0, egl_platform::D3D11_FL10_1_REFERENCE());
>+    return PlatformParameters(1, 0, egl_platform::OPENGLES());
> }
> 
> PlatformParameters ES2_OPENGLES()
>@@ -591,6 +566,11 @@ PlatformParameters ES31_OPENGLES(EGLint major, EGLint minor)
>     return PlatformParameters(3, 1, egl_platform::OPENGLES(major, minor));
> }
> 
>+PlatformParameters ES1_OPENGL()
>+{
>+    return PlatformParameters(1, 0, egl_platform::OPENGL());
>+}
>+
> PlatformParameters ES2_OPENGL()
> {
>     return PlatformParameters(2, 0, egl_platform::OPENGL());
>@@ -621,6 +601,11 @@ PlatformParameters ES31_OPENGL(EGLint major, EGLint minor)
>     return PlatformParameters(3, 1, egl_platform::OPENGL(major, minor));
> }
> 
>+PlatformParameters ES1_NULL()
>+{
>+    return PlatformParameters(1, 0, EGLPlatformParameters(EGL_PLATFORM_ANGLE_TYPE_NULL_ANGLE));
>+}
>+
> PlatformParameters ES2_NULL()
> {
>     return PlatformParameters(2, 0, EGLPlatformParameters(EGL_PLATFORM_ANGLE_TYPE_NULL_ANGLE));
>@@ -636,9 +621,43 @@ PlatformParameters ES31_NULL()
>     return PlatformParameters(3, 1, EGLPlatformParameters(EGL_PLATFORM_ANGLE_TYPE_NULL_ANGLE));
> }
> 
>+PlatformParameters ES1_VULKAN()
>+{
>+    return PlatformParameters(1, 0, egl_platform::VULKAN());
>+}
>+
>+PlatformParameters ES1_VULKAN_NULL()
>+{
>+    return PlatformParameters(1, 0, egl_platform::VULKAN_NULL());
>+}
>+
> PlatformParameters ES2_VULKAN()
> {
>     return PlatformParameters(2, 0, egl_platform::VULKAN());
> }
> 
>+PlatformParameters ES2_VULKAN_NULL()
>+{
>+    return PlatformParameters(2, 0, egl_platform::VULKAN_NULL());
>+}
>+
>+PlatformParameters ES3_VULKAN()
>+{
>+    return PlatformParameters(3, 0, egl_platform::VULKAN());
>+}
>+
>+PlatformParameters ES3_VULKAN_NULL()
>+{
>+    return PlatformParameters(3, 0, egl_platform::VULKAN_NULL());
>+}
>+
>+PlatformParameters ES2_WGL()
>+{
>+    return PlatformParameters(2, 0, GLESDriverType::SystemWGL);
>+}
>+
>+PlatformParameters ES3_WGL()
>+{
>+    return PlatformParameters(3, 0, GLESDriverType::SystemWGL);
>+}
> }  // namespace angle
>diff --git a/Source/ThirdParty/ANGLE/src/tests/test_utils/angle_test_configs.h b/Source/ThirdParty/ANGLE/src/tests/test_utils/angle_test_configs.h
>index cf36cd86fce..7bc7a027029 100644
>--- a/Source/ThirdParty/ANGLE/src/tests/test_utils/angle_test_configs.h
>+++ b/Source/ThirdParty/ANGLE/src/tests/test_utils/angle_test_configs.h
>@@ -17,28 +17,47 @@
> #include <EGL/egl.h>
> #include <EGL/eglext.h>
> 
>+#include "GLSLANG/ShaderLang.h"
> #include "angle_test_instantiate.h"
>-#include "EGLWindow.h"
>+#include "util/EGLPlatformParameters.h"
> 
> namespace angle
> {
> 
>+// The GLES driver type determines what shared object we use to load the GLES entry points.
>+// AngleEGL loads from ANGLE's version of libEGL, libGLESv2, and libGLESv1_CM.
>+// SystemEGL uses the system copies of libEGL, libGLESv2, and libGLESv1_CM.
>+// SystemWGL loads Windows GL with the GLES compatiblity extensions. See util/WGLWindow.h.
>+enum class GLESDriverType
>+{
>+    AngleEGL,
>+    SystemEGL,
>+    SystemWGL,
>+};
>+
> struct PlatformParameters
> {
>     PlatformParameters();
>-    PlatformParameters(EGLint majorVersion, EGLint minorVersion,
>+    PlatformParameters(EGLint majorVersion,
>+                       EGLint minorVersion,
>                        const EGLPlatformParameters &eglPlatformParameters);
>+    PlatformParameters(EGLint majorVersion, EGLint minorVersion, GLESDriverType driver);
> 
>     EGLint getRenderer() const;
> 
>+    void initDefaultParameters();
>+
>+    auto tie() const { return std::tie(driver, eglParameters, majorVersion, minorVersion); }
>+
>+    GLESDriverType driver;
>+    EGLPlatformParameters eglParameters;
>     EGLint majorVersion;
>     EGLint minorVersion;
>-    EGLPlatformParameters eglParameters;
> };
> 
> bool operator<(const PlatformParameters &a, const PlatformParameters &b);
> bool operator==(const PlatformParameters &a, const PlatformParameters &b);
>-std::ostream &operator<<(std::ostream& stream, const PlatformParameters &pp);
>+std::ostream &operator<<(std::ostream &stream, const PlatformParameters &pp);
> 
> // EGL platforms
> namespace egl_platform
>@@ -86,13 +105,15 @@ EGLPlatformParameters OPENGLES_NULL();
> EGLPlatformParameters OPENGL_OR_GLES(bool useNullDevice);
> 
> EGLPlatformParameters VULKAN();
>+EGLPlatformParameters VULKAN_NULL();
> 
> }  // namespace egl_platform
> 
> // ANGLE tests platforms
>+PlatformParameters ES1_D3D9();
> PlatformParameters ES2_D3D9();
>-PlatformParameters ES2_D3D9_REFERENCE();
> 
>+PlatformParameters ES1_D3D11();
> PlatformParameters ES2_D3D11();
> PlatformParameters ES2_D3D11(EGLenum presentPath);
> PlatformParameters ES2_D3D11_FL11_0();
>@@ -125,11 +146,7 @@ PlatformParameters ES3_D3D11_FL11_1_WARP();
> PlatformParameters ES3_D3D11_FL11_0_WARP();
> PlatformParameters ES3_D3D11_FL10_1_WARP();
> 
>-PlatformParameters ES3_D3D11_REFERENCE();
>-PlatformParameters ES3_D3D11_FL11_1_REFERENCE();
>-PlatformParameters ES3_D3D11_FL11_0_REFERENCE();
>-PlatformParameters ES3_D3D11_FL10_1_REFERENCE();
>-
>+PlatformParameters ES1_OPENGL();
> PlatformParameters ES2_OPENGL();
> PlatformParameters ES2_OPENGL(EGLint major, EGLint minor);
> PlatformParameters ES3_OPENGL();
>@@ -137,6 +154,7 @@ PlatformParameters ES3_OPENGL(EGLint major, EGLint minor);
> PlatformParameters ES31_OPENGL();
> PlatformParameters ES31_OPENGL(EGLint major, EGLint minor);
> 
>+PlatformParameters ES1_OPENGLES();
> PlatformParameters ES2_OPENGLES();
> PlatformParameters ES2_OPENGLES(EGLint major, EGLint minor);
> PlatformParameters ES3_OPENGLES();
>@@ -144,12 +162,28 @@ PlatformParameters ES3_OPENGLES(EGLint major, EGLint minor);
> PlatformParameters ES31_OPENGLES();
> PlatformParameters ES31_OPENGLES(EGLint major, EGLint minor);
> 
>+PlatformParameters ES1_NULL();
> PlatformParameters ES2_NULL();
> PlatformParameters ES3_NULL();
> PlatformParameters ES31_NULL();
> 
>+PlatformParameters ES1_VULKAN();
>+PlatformParameters ES1_VULKAN_NULL();
> PlatformParameters ES2_VULKAN();
>+PlatformParameters ES2_VULKAN_NULL();
>+PlatformParameters ES3_VULKAN();
>+PlatformParameters ES3_VULKAN_NULL();
>+
>+PlatformParameters ES2_WGL();
>+PlatformParameters ES3_WGL();
>+
>+inline PlatformParameters WithNoVirtualContexts(const PlatformParameters &params)
>+{
>+    PlatformParameters withNoVirtualContexts                  = params;
>+    withNoVirtualContexts.eglParameters.contextVirtualization = EGL_FALSE;
>+    return withNoVirtualContexts;
>+}
> 
> }  // namespace angle
> 
>-#endif // ANGLE_TEST_CONFIGS_H_
>+#endif  // ANGLE_TEST_CONFIGS_H_
>diff --git a/Source/ThirdParty/ANGLE/src/tests/test_utils/angle_test_instantiate.cpp b/Source/ThirdParty/ANGLE/src/tests/test_utils/angle_test_instantiate.cpp
>index 69fc2273d15..155b32aaccc 100644
>--- a/Source/ThirdParty/ANGLE/src/tests/test_utils/angle_test_instantiate.cpp
>+++ b/Source/ThirdParty/ANGLE/src/tests/test_utils/angle_test_instantiate.cpp
>@@ -9,15 +9,355 @@
> 
> #include "test_utils/angle_test_instantiate.h"
> 
>-#include <map>
> #include <iostream>
>+#include <map>
> 
>-#include "EGLWindow.h"
>-#include "OSWindow.h"
>+#include "angle_gl.h"
>+#include "common/platform.h"
>+#include "gpu_info_util/SystemInfo.h"
> #include "test_utils/angle_test_configs.h"
>+#include "util/EGLWindow.h"
>+#include "util/OSWindow.h"
>+#include "util/system_utils.h"
>+
>+#if defined(ANGLE_PLATFORM_WINDOWS)
>+#    include "util/windows/WGLWindow.h"
>+#endif  // defined(ANGLE_PLATFORM_WINDOWS)
> 
> namespace angle
> {
>+namespace
>+{
>+bool IsANGLEConfigSupported(const PlatformParameters &param, OSWindow *osWindow)
>+{
>+    std::unique_ptr<angle::Library> eglLibrary;
>+
>+#if defined(ANGLE_USE_UTIL_LOADER)
>+    eglLibrary.reset(angle::OpenSharedLibrary(ANGLE_EGL_LIBRARY_NAME));
>+#endif
>+
>+    EGLWindow *eglWindow = EGLWindow::New(param.majorVersion, param.minorVersion);
>+    ConfigParameters configParams;
>+    bool result =
>+        eglWindow->initializeGL(osWindow, eglLibrary.get(), param.eglParameters, configParams);
>+    eglWindow->destroyGL();
>+    EGLWindow::Delete(&eglWindow);
>+    return result;
>+}
>+
>+bool IsWGLConfigSupported(const PlatformParameters &param, OSWindow *osWindow)
>+{
>+#if defined(ANGLE_PLATFORM_WINDOWS) && defined(ANGLE_USE_UTIL_LOADER)
>+    std::unique_ptr<angle::Library> openglLibrary(angle::OpenSharedLibrary("opengl32"));
>+
>+    WGLWindow *wglWindow = WGLWindow::New(param.majorVersion, param.minorVersion);
>+    ConfigParameters configParams;
>+    bool result =
>+        wglWindow->initializeGL(osWindow, openglLibrary.get(), param.eglParameters, configParams);
>+    wglWindow->destroyGL();
>+    WGLWindow::Delete(&wglWindow);
>+    return result;
>+#else
>+    return false;
>+#endif  // defined(ANGLE_PLATFORM_WINDOWS) && defined(ANGLE_USE_UTIL_LOADER)
>+}
>+
>+bool IsNativeConfigSupported(const PlatformParameters &param, OSWindow *osWindow)
>+{
>+    // Not yet implemented.
>+    return false;
>+}
>+}  // namespace
>+
>+SystemInfo *GetTestSystemInfo()
>+{
>+    static SystemInfo *sSystemInfo = nullptr;
>+    if (sSystemInfo == nullptr)
>+    {
>+        sSystemInfo = new SystemInfo;
>+        if (!GetSystemInfo(sSystemInfo))
>+        {
>+            std::cerr << "Warning: incomplete system info collection.\n";
>+        }
>+
>+        // Print complete system info when available.
>+        // Seems to trip up Android test expectation parsing.
>+        if (!IsAndroid())
>+        {
>+            PrintSystemInfo(*sSystemInfo);
>+        }
>+    }
>+    return sSystemInfo;
>+}
>+
>+bool IsAndroid()
>+{
>+#if defined(ANGLE_PLATFORM_ANDROID)
>+    return true;
>+#else
>+    return false;
>+#endif
>+}
>+
>+bool IsLinux()
>+{
>+#if defined(ANGLE_PLATFORM_LINUX)
>+    return true;
>+#else
>+    return false;
>+#endif
>+}
>+
>+bool IsOSX()
>+{
>+#if defined(ANGLE_PLATFORM_APPLE)
>+    return true;
>+#else
>+    return false;
>+#endif
>+}
>+
>+bool IsOzone()
>+{
>+#if defined(USE_OZONE)
>+    return true;
>+#else
>+    return false;
>+#endif
>+}
>+
>+bool IsWindows()
>+{
>+#if defined(ANGLE_PLATFORM_WINDOWS)
>+    return true;
>+#else
>+    return false;
>+#endif
>+}
>+
>+bool IsFuchsia()
>+{
>+#if defined(ANGLE_PLATFORM_FUCHSIA)
>+    return true;
>+#else
>+    return false;
>+#endif
>+}
>+
>+bool IsAndroidDevice(const std::string &deviceName)
>+{
>+    if (!IsAndroid())
>+    {
>+        return false;
>+    }
>+    SystemInfo *systemInfo = GetTestSystemInfo();
>+    if (systemInfo->machineModelName == deviceName)
>+    {
>+        return true;
>+    }
>+    return false;
>+}
>+
>+bool IsNexus5X()
>+{
>+    return IsAndroidDevice("Nexus 5X");
>+}
>+
>+bool IsNexus6P()
>+{
>+    return IsAndroidDevice("Nexus 6P");
>+}
>+
>+bool IsPixelXL()
>+{
>+    return IsAndroidDevice("Pixel XL");
>+}
>+
>+bool IsPixel2()
>+{
>+    return IsAndroidDevice("Pixel 2");
>+}
>+
>+bool IsNVIDIAShield()
>+{
>+    return IsAndroidDevice("SHIELD Android TV");
>+}
>+
>+bool IsConfigWhitelisted(const SystemInfo &systemInfo, const PlatformParameters &param)
>+{
>+    VendorID vendorID = systemInfo.gpus[systemInfo.primaryGPUIndex].vendorId;
>+
>+    // We support the default and null back-ends on every platform.
>+    if (param.driver == GLESDriverType::AngleEGL)
>+    {
>+        if (param.getRenderer() == EGL_PLATFORM_ANGLE_TYPE_DEFAULT_ANGLE)
>+            return true;
>+        if (param.getRenderer() == EGL_PLATFORM_ANGLE_TYPE_NULL_ANGLE)
>+            return true;
>+    }
>+
>+#if ANGLE_VULKAN_CONFORMANT_CONFIGS_ONLY
>+    // Vulkan ES 3.0 is not yet supported.
>+    if (param.majorVersion > 2 && param.getRenderer() == EGL_PLATFORM_ANGLE_TYPE_VULKAN_ANGLE)
>+    {
>+        return false;
>+    }
>+#endif
>+
>+    if (IsWindows())
>+    {
>+        switch (param.driver)
>+        {
>+            case GLESDriverType::AngleEGL:
>+                switch (param.getRenderer())
>+                {
>+                    case EGL_PLATFORM_ANGLE_TYPE_D3D9_ANGLE:
>+                    case EGL_PLATFORM_ANGLE_TYPE_D3D11_ANGLE:
>+                    case EGL_PLATFORM_ANGLE_TYPE_OPENGL_ANGLE:
>+                    case EGL_PLATFORM_ANGLE_TYPE_VULKAN_ANGLE:
>+                        return true;
>+                    case EGL_PLATFORM_ANGLE_TYPE_OPENGLES_ANGLE:
>+                        // ES 3.1+ back-end is not supported properly.
>+                        if (param.eglParameters.majorVersion == 3 &&
>+                            param.eglParameters.minorVersion > 0)
>+                        {
>+                            return false;
>+                        }
>+
>+                        // Win ES emulation is currently only supported on NVIDIA.
>+                        return IsNVIDIA(vendorID);
>+                    default:
>+                        return false;
>+                }
>+            case GLESDriverType::SystemWGL:
>+                // AMD does not support the ES compatibility extensions.
>+                return IsAMD(vendorID);
>+            default:
>+                return false;
>+        }
>+    }
>+
>+    if (IsOSX())
>+    {
>+        // We do not support non-ANGLE bindings on OSX.
>+        if (param.driver != GLESDriverType::AngleEGL)
>+        {
>+            return false;
>+        }
>+
>+        // OSX does not support ES 3.1 features.
>+        if (param.majorVersion == 3 && param.minorVersion > 0)
>+        {
>+            return false;
>+        }
>+
>+        // Currently we only support the OpenGL back-end on OSX.
>+        return (param.getRenderer() == EGL_PLATFORM_ANGLE_TYPE_OPENGL_ANGLE);
>+    }
>+
>+    if (IsFuchsia())
>+    {
>+        // We do not support non-ANGLE bindings on Fuchsia.
>+        if (param.driver != GLESDriverType::AngleEGL)
>+        {
>+            return false;
>+        }
>+
>+        // Currently we only support the Vulkan back-end on Fuchsia.
>+        return (param.getRenderer() == EGL_PLATFORM_ANGLE_TYPE_VULKAN_ANGLE);
>+    }
>+
>+    if (IsOzone())
>+    {
>+        // We do not support non-ANGLE bindings on Ozone.
>+        if (param.driver != GLESDriverType::AngleEGL)
>+            return false;
>+
>+        // ES 3 configs do not work properly on Ozone.
>+        if (param.majorVersion > 2)
>+            return false;
>+
>+        // Currently we only support the GLES back-end on Ozone.
>+        return (param.getRenderer() == EGL_PLATFORM_ANGLE_TYPE_OPENGLES_ANGLE);
>+    }
>+
>+    if (IsLinux())
>+    {
>+        // We do not support non-ANGLE bindings on Linux.
>+        if (param.driver != GLESDriverType::AngleEGL)
>+        {
>+            return false;
>+        }
>+
>+        // Currently we support the OpenGL and Vulkan back-ends on Linux.
>+        switch (param.getRenderer())
>+        {
>+            case EGL_PLATFORM_ANGLE_TYPE_OPENGL_ANGLE:
>+            case EGL_PLATFORM_ANGLE_TYPE_VULKAN_ANGLE:
>+                // Note that system info collection depends on Vulkan support.
>+                return true;
>+            default:
>+                return false;
>+        }
>+    }
>+
>+    if (IsAndroid())
>+    {
>+        // We do not support non-ANGLE bindings on Android.
>+        if (param.driver != GLESDriverType::AngleEGL)
>+        {
>+            return false;
>+        }
>+
>+        // Nexus Android devices don't support backing 3.2 contexts
>+        if (param.eglParameters.majorVersion == 3 && param.eglParameters.minorVersion == 2)
>+        {
>+            if (IsNexus5X() || IsNexus6P())
>+            {
>+                return false;
>+            }
>+        }
>+
>+        // Currently we support the GLES and Vulkan back-ends on Android.
>+        switch (param.getRenderer())
>+        {
>+            case EGL_PLATFORM_ANGLE_TYPE_OPENGLES_ANGLE:
>+            case EGL_PLATFORM_ANGLE_TYPE_VULKAN_ANGLE:
>+                return true;
>+            default:
>+                return false;
>+        }
>+    }
>+
>+    // Unknown platform.
>+    return false;
>+}
>+
>+bool IsConfigSupported(const PlatformParameters &param)
>+{
>+    OSWindow *osWindow = OSWindow::New();
>+    bool result        = false;
>+    if (osWindow->initialize("CONFIG_TESTER", 1, 1))
>+    {
>+        switch (param.driver)
>+        {
>+            case GLESDriverType::AngleEGL:
>+                result = IsANGLEConfigSupported(param, osWindow);
>+                break;
>+            case GLESDriverType::SystemEGL:
>+                result = IsNativeConfigSupported(param, osWindow);
>+                break;
>+            case GLESDriverType::SystemWGL:
>+                result = IsWGLConfigSupported(param, osWindow);
>+                break;
>+        }
>+
>+        osWindow->destroy();
>+    }
>+
>+    OSWindow::Delete(&osWindow);
>+    return result;
>+}
> 
> bool IsPlatformAvailable(const PlatformParameters &param)
> {
>@@ -55,15 +395,15 @@ bool IsPlatformAvailable(const PlatformParameters &param)
>             break;
> #endif
> 
>-      case EGL_PLATFORM_ANGLE_TYPE_NULL_ANGLE:
>+        case EGL_PLATFORM_ANGLE_TYPE_NULL_ANGLE:
> #ifndef ANGLE_ENABLE_NULL
>-          return false;
>+            return false;
> #endif
>-          break;
>+            break;
> 
>-      default:
>-          std::cout << "Unknown test platform: " << param << std::endl;
>-          return false;
>+        default:
>+            std::cout << "Unknown test platform: " << param << std::endl;
>+            return false;
>     }
> 
>     static std::map<PlatformParameters, bool> paramAvailabilityCache;
>@@ -74,31 +414,29 @@ bool IsPlatformAvailable(const PlatformParameters &param)
>     }
>     else
>     {
>-        OSWindow *osWindow = CreateOSWindow();
>-        bool result = osWindow->initialize("CONFIG_TESTER", 1, 1);
>+        const SystemInfo *systemInfo = GetTestSystemInfo();
> 
>-        if (result)
>+        bool result = false;
>+        if (systemInfo)
>         {
>-            EGLWindow *eglWindow =
>-                new EGLWindow(param.majorVersion, param.minorVersion, param.eglParameters);
>-            result = eglWindow->initializeGL(osWindow);
>-
>-            eglWindow->destroyGL();
>-            SafeDelete(eglWindow);
>+            result = IsConfigWhitelisted(*systemInfo, param);
>+        }
>+        else
>+        {
>+            result = IsConfigSupported(param);
>         }
>-
>-        osWindow->destroy();
>-        SafeDelete(osWindow);
> 
>         paramAvailabilityCache[param] = result;
> 
>         if (!result)
>         {
>-            std::cout << "Skipping tests using configuration " << param << " because it is not available." << std::endl;
>+            std::cout << "Skipping tests using configuration " << param
>+                      << " because it is not available." << std::endl;
>         }
> 
>+        // Uncomment this to print available platforms.
>+        // std::cout << "Platform: " << param << " (" << paramAvailabilityCache.size() << ")\n";
>         return result;
>     }
> }
>-
> }  // namespace angle
>diff --git a/Source/ThirdParty/ANGLE/src/tests/test_utils/angle_test_instantiate.h b/Source/ThirdParty/ANGLE/src/tests/test_utils/angle_test_instantiate.h
>index 7ab77c8ab51..b9ff4f2106b 100644
>--- a/Source/ThirdParty/ANGLE/src/tests/test_utils/angle_test_instantiate.h
>+++ b/Source/ThirdParty/ANGLE/src/tests/test_utils/angle_test_instantiate.h
>@@ -12,13 +12,26 @@
> 
> #include <gtest/gtest.h>
> 
>-#include "common/debug.h"
>-
> namespace angle
> {
>-
>+struct SystemInfo;
> struct PlatformParameters;
> 
>+// Operating systems
>+bool IsAndroid();
>+bool IsLinux();
>+bool IsOSX();
>+bool IsOzone();
>+bool IsWindows();
>+bool IsFuchsia();
>+
>+// Android devices
>+bool IsNexus5X();
>+bool IsNexus6P();
>+bool IsPixelXL();
>+bool IsPixel2();
>+bool IsNVIDIAShield();
>+
> bool IsPlatformAvailable(const PlatformParameters &param);
> 
> // This functions is used to filter which tests should be registered,
>@@ -45,14 +58,69 @@ std::vector<T> FilterTestParams(const std::vector<T> &params)
>     return FilterTestParams(params.data(), params.size());
> }
> 
>+// Used to generate valid test names out of testing::PrintToStringParamName used in combined tests.
>+struct CombinedPrintToStringParamName
>+{
>+    template <class ParamType>
>+    std::string operator()(const testing::TestParamInfo<ParamType> &info) const
>+    {
>+        std::string name = testing::PrintToStringParamName()(info);
>+        std::string sanitized;
>+        for (const char c : name)
>+        {
>+            if (c == ',')
>+            {
>+                sanitized += '_';
>+            }
>+            else if (isalnum(c) || c == '_')
>+            {
>+                sanitized += c;
>+            }
>+        }
>+        return sanitized;
>+    }
>+};
>+
>+#define ANGLE_INSTANTIATE_TEST_PLATFORMS(testName) \
>+    testing::ValuesIn(::angle::FilterTestParams(testName##params, ArraySize(testName##params)))
>+
> // Instantiate the test once for each extra argument. The types of all the
> // arguments must match, and getRenderer must be implemented for that type.
>-#define ANGLE_INSTANTIATE_TEST(testName, firstParam, ...) \
>-    const decltype(firstParam) testName##params[] = { firstParam, ##__VA_ARGS__ }; \
>-    INSTANTIATE_TEST_CASE_P(, testName, \
>-                              testing::ValuesIn(::angle::FilterTestParams(testName##params, ArraySize(testName##params))), \
>-                              testing::PrintToStringParamName());
>+#define ANGLE_INSTANTIATE_TEST(testName, first, ...)                                 \
>+    const decltype(first) testName##params[] = {first, ##__VA_ARGS__};               \
>+    INSTANTIATE_TEST_SUITE_P(, testName, ANGLE_INSTANTIATE_TEST_PLATFORMS(testName), \
>+                             testing::PrintToStringParamName())
>+
>+// Instantiate the test for a combination of N parameters and the enumeration of platforms in the
>+// extra args, similar to ANGLE_INSTANTIATE_TEST.  The macros are defined only for the Ns currently
>+// in use, and can be expanded as necessary.
>+#define ANGLE_INSTANTIATE_TEST_COMBINE_1(testName, print, combine1, first, ...) \
>+    const decltype(first) testName##params[] = {first, ##__VA_ARGS__};          \
>+    INSTANTIATE_TEST_SUITE_P(                                                   \
>+        , testName, testing::Combine(ANGLE_INSTANTIATE_TEST_PLATFORMS(testName), combine1), print)
>+#define ANGLE_INSTANTIATE_TEST_COMBINE_4(testName, print, combine1, combine2, combine3, combine4, \
>+                                         first, ...)                                              \
>+    const decltype(first) testName##params[] = {first, ##__VA_ARGS__};                            \
>+    INSTANTIATE_TEST_SUITE_P(, testName,                                                          \
>+                             testing::Combine(ANGLE_INSTANTIATE_TEST_PLATFORMS(testName),         \
>+                                              combine1, combine2, combine3, combine4),            \
>+                             print)
>+#define ANGLE_INSTANTIATE_TEST_COMBINE_5(testName, print, combine1, combine2, combine3, combine4, \
>+                                         combine5, first, ...)                                    \
>+    const decltype(first) testName##params[] = {first, ##__VA_ARGS__};                            \
>+    INSTANTIATE_TEST_SUITE_P(, testName,                                                          \
>+                             testing::Combine(ANGLE_INSTANTIATE_TEST_PLATFORMS(testName),         \
>+                                              combine1, combine2, combine3, combine4, combine5),  \
>+                             print)
>+
>+// Checks if a config is expected to be supported by checking a system-based white list.
>+bool IsConfigWhitelisted(const SystemInfo &systemInfo, const PlatformParameters &param);
>+
>+// Determines if a config is supported by trying to initialize it. Does not require SystemInfo.
>+bool IsConfigSupported(const PlatformParameters &param);
> 
>-} // namespace angle
>+// Returns shared test system information. Can be used globally in the tests.
>+SystemInfo *GetTestSystemInfo();
>+}  // namespace angle
> 
>-#endif // ANGLE_TEST_INSTANTIATE_H_
>+#endif  // ANGLE_TEST_INSTANTIATE_H_
>diff --git a/Source/ThirdParty/ANGLE/src/tests/test_utils/compiler_test.cpp b/Source/ThirdParty/ANGLE/src/tests/test_utils/compiler_test.cpp
>index 4f87bffdf06..5ade27c739f 100644
>--- a/Source/ThirdParty/ANGLE/src/tests/test_utils/compiler_test.cpp
>+++ b/Source/ThirdParty/ANGLE/src/tests/test_utils/compiler_test.cpp
>@@ -10,7 +10,8 @@
> 
> #include "angle_gl.h"
> #include "compiler/translator/Compiler.h"
>-#include "compiler/translator/IntermTraverse.h"
>+#include "compiler/translator/FunctionLookup.h"
>+#include "compiler/translator/tree_util/IntermTraverse.h"
> 
> namespace sh
> {
>@@ -18,19 +19,34 @@ namespace sh
> namespace
> {
> 
>+ImmutableString GetSymbolTableMangledName(TIntermAggregate *node)
>+{
>+    ASSERT(!node->isConstructor());
>+    switch (node->getOp())
>+    {
>+        case EOpCallInternalRawFunction:
>+        case EOpCallBuiltInFunction:
>+        case EOpCallFunctionInAST:
>+            return TFunctionLookup::GetMangledName(node->getFunction()->name().data(),
>+                                                   *node->getSequence());
>+        default:
>+            const char *opString = GetOperatorString(node->getOp());
>+            return TFunctionLookup::GetMangledName(opString, *node->getSequence());
>+    }
>+}
>+
> class FunctionCallFinder : public TIntermTraverser
> {
>   public:
>-    FunctionCallFinder(const TString &functionMangledName)
>+    FunctionCallFinder(const char *functionMangledName)
>         : TIntermTraverser(true, false, false),
>           mFunctionMangledName(functionMangledName),
>           mNodeFound(nullptr)
>-    {
>-    }
>+    {}
> 
>     bool visitAggregate(Visit visit, TIntermAggregate *node) override
>     {
>-        if (node->isFunctionCall() && node->getSymbolTableMangledName() == mFunctionMangledName)
>+        if (node->isFunctionCall() && GetSymbolTableMangledName(node) == mFunctionMangledName)
>         {
>             mNodeFound = node;
>             return false;
>@@ -42,7 +58,7 @@ class FunctionCallFinder : public TIntermTraverser
>     const TIntermAggregate *getNode() const { return mNodeFound; }
> 
>   private:
>-    TString mFunctionMangledName;
>+    const char *mFunctionMangledName;
>     TIntermAggregate *mNodeFound;
> };
> 
>@@ -64,9 +80,10 @@ bool compileTestShader(GLenum type,
>         return false;
>     }
> 
>-    const char *shaderStrings[] = { shaderString.c_str() };
>+    const char *shaderStrings[] = {shaderString.c_str()};
> 
>-    bool compilationSuccess = translator->compile(shaderStrings, 1, SH_OBJECT_CODE | compileOptions);
>+    bool compilationSuccess =
>+        translator->compile(shaderStrings, 1, SH_OBJECT_CODE | compileOptions);
>     TInfoSink &infoSink = translator->getInfoSink();
>     if (translatedCode)
>         *translatedCode = infoSink.obj.c_str();
>@@ -86,7 +103,8 @@ bool compileTestShader(GLenum type,
> {
>     ShBuiltInResources resources;
>     sh::InitBuiltInResources(&resources);
>-    return compileTestShader(type, spec, output, shaderString, &resources, compileOptions, translatedCode, infoLog);
>+    return compileTestShader(type, spec, output, shaderString, &resources, compileOptions,
>+                             translatedCode, infoLog);
> }
> 
> MatchOutputCodeTest::MatchOutputCodeTest(GLenum shaderType,
>@@ -140,19 +158,36 @@ bool MatchOutputCodeTest::compileWithSettings(ShShaderOutput output,
> 
> bool MatchOutputCodeTest::foundInCode(ShShaderOutput output, const char *stringToFind) const
> {
>-    return findInCode(output, stringToFind) != std::string::npos;
>+    const auto code = mOutputCode.find(output);
>+    EXPECT_NE(mOutputCode.end(), code);
>+    if (code == mOutputCode.end())
>+    {
>+        return std::string::npos;
>+    }
>+    return code->second.find(stringToFind) != std::string::npos;
> }
> 
>-size_t MatchOutputCodeTest::findInCode(ShShaderOutput output, const char *stringToFind) const
>+bool MatchOutputCodeTest::foundInCodeInOrder(ShShaderOutput output,
>+                                             std::vector<const char *> stringsToFind)
> {
>     const auto code = mOutputCode.find(output);
>     EXPECT_NE(mOutputCode.end(), code);
>     if (code == mOutputCode.end())
>     {
>-        return std::string::npos;
>+        return false;
>     }
> 
>-    return code->second.find(stringToFind);
>+    size_t currentPos = 0;
>+    for (const char *stringToFind : stringsToFind)
>+    {
>+        auto position = code->second.find(stringToFind, currentPos);
>+        if (position == std::string::npos)
>+        {
>+            return false;
>+        }
>+        currentPos = position + strlen(stringToFind);
>+    }
>+    return true;
> }
> 
> bool MatchOutputCodeTest::foundInCode(ShShaderOutput output,
>@@ -168,6 +203,9 @@ bool MatchOutputCodeTest::foundInCode(ShShaderOutput output,
> 
>     size_t currentPos  = 0;
>     int occurencesLeft = expectedOccurrences;
>+
>+    const size_t searchStringLength = strlen(stringToFind);
>+
>     while (occurencesLeft-- > 0)
>     {
>         auto position = code->second.find(stringToFind, currentPos);
>@@ -175,8 +213,10 @@ bool MatchOutputCodeTest::foundInCode(ShShaderOutput output,
>         {
>             return false;
>         }
>-        currentPos = position + 1;
>+        // Search strings should not overlap.
>+        currentPos = position + searchStringLength;
>     }
>+    // Make sure that there aren't extra occurrences.
>     return code->second.find(stringToFind, currentPos) == std::string::npos;
> }
> 
>@@ -204,6 +244,18 @@ bool MatchOutputCodeTest::foundInCode(const char *stringToFind, const int expect
>     return true;
> }
> 
>+bool MatchOutputCodeTest::foundInCodeInOrder(std::vector<const char *> stringsToFind)
>+{
>+    for (auto &code : mOutputCode)
>+    {
>+        if (!foundInCodeInOrder(code.first, stringsToFind))
>+        {
>+            return false;
>+        }
>+    }
>+    return true;
>+}
>+
> bool MatchOutputCodeTest::notFoundInCode(const char *stringToFind) const
> {
>     for (auto &code : mOutputCode)
>@@ -218,7 +270,7 @@ bool MatchOutputCodeTest::notFoundInCode(const char *stringToFind) const
> 
> const TIntermAggregate *FindFunctionCallNode(TIntermNode *root, const TString &functionMangledName)
> {
>-    FunctionCallFinder finder(functionMangledName);
>+    FunctionCallFinder finder(functionMangledName.c_str());
>     root->traverse(&finder);
>     return finder.getNode();
> }
>diff --git a/Source/ThirdParty/ANGLE/src/tests/test_utils/compiler_test.h b/Source/ThirdParty/ANGLE/src/tests/test_utils/compiler_test.h
>index a12d0ccb77f..f1e53b82ec3 100644
>--- a/Source/ThirdParty/ANGLE/src/tests/test_utils/compiler_test.h
>+++ b/Source/ThirdParty/ANGLE/src/tests/test_utils/compiler_test.h
>@@ -10,13 +10,14 @@
> #define TESTS_TEST_UTILS_COMPILER_TEST_H_
> 
> #include <map>
>+#include <vector>
> 
> #include "gtest/gtest.h"
> 
>+#include "GLSLANG/ShaderLang.h"
> #include "angle_gl.h"
> #include "compiler/translator/TranslatorESSL.h"
>-#include "GLSLANG/ShaderLang.h"
>-#include "compiler/translator/FindSymbolNode.h"
>+#include "compiler/translator/tree_util/FindSymbolNode.h"
> 
> namespace sh
> {
>@@ -64,9 +65,9 @@ class MatchOutputCodeTest : public testing::Test
>     }
> 
>     bool foundInCode(ShShaderOutput output, const char *stringToFind) const;
>-    // Returns the position of the first character of the first match in the translated output
>-    // source. If no matches are found, then string::npos is returned.
>-    size_t findInCode(ShShaderOutput output, const char *stringToFind) const;
>+
>+    // Test that the strings are found in the specified output in the specified order.
>+    bool foundInCodeInOrder(ShShaderOutput output, std::vector<const char *> stringsToFind);
> 
>     // Test that the string occurs for exactly expectedOccurrences times
>     bool foundInCode(ShShaderOutput output,
>@@ -79,6 +80,9 @@ class MatchOutputCodeTest : public testing::Test
>     // Test that the string occurs for exactly expectedOccurrences times in all outputs
>     bool foundInCode(const char *stringToFind, const int expectedOccurrences) const;
> 
>+    // Test that the strings are found in all outputs in the specified order.
>+    bool foundInCodeInOrder(std::vector<const char *> stringsToFind);
>+
>     // Test that the string is found in none of the outputs
>     bool notFoundInCode(const char *stringToFind) const;
> 
>@@ -98,6 +102,6 @@ class MatchOutputCodeTest : public testing::Test
> 
> // Returns a pointer to a function call node with a mangled name functionName.
> const TIntermAggregate *FindFunctionCallNode(TIntermNode *root, const TString &functionName);
>-}
>+}  // namespace sh
> 
>-#endif // TESTS_TEST_UTILS_COMPILER_TEST_H_
>+#endif  // TESTS_TEST_UTILS_COMPILER_TEST_H_
>diff --git a/Source/ThirdParty/ANGLE/src/tests/test_utils/draw_call_perf_utils.cpp b/Source/ThirdParty/ANGLE/src/tests/test_utils/draw_call_perf_utils.cpp
>index beeaf09c27a..10300a16027 100644
>--- a/Source/ThirdParty/ANGLE/src/tests/test_utils/draw_call_perf_utils.cpp
>+++ b/Source/ThirdParty/ANGLE/src/tests/test_utils/draw_call_perf_utils.cpp
>@@ -11,45 +11,48 @@
> 
> #include <vector>
> 
>-#include "shader_utils.h"
>+#include "util/shader_utils.h"
> 
> namespace
> {
>+constexpr char kSimpleScaleAndOffsetVS[] = R"(attribute vec2 vPosition;
>+uniform float uScale;
>+uniform float uOffset;
>+void main()
>+{
>+    gl_Position = vec4(vPosition * vec2(uScale) + vec2(uOffset), 0, 1);
>+})";
>+
>+constexpr char kSimpleDrawVS[] = R"(attribute vec2 vPosition;
>+const float scale = 0.5;
>+const float offset = -0.5;
> 
>-const char *SimpleScaleAndOffsetVertexShaderSource()
>+void main()
> {
>-    return
>-        R"(attribute vec2 vPosition;
>-        uniform float uScale;
>-        uniform float uOffset;
>-        void main()
>-        {
>-            gl_Position = vec4(vPosition * vec2(uScale) + vec2(uOffset), 0, 1);
>-        })";
>-}
>+    gl_Position = vec4(vPosition * vec2(scale) + vec2(offset), 0, 1);
>+})";
> 
>-const char *SimpleDrawVertexShaderSource()
>+constexpr char kSimpleTexCoordVS[] = R"(attribute vec2 vPosition;
>+varying vec2 texCoord;
>+void main()
> {
>-    return
>-        R"(attribute vec2 vPosition;
>-        const float scale = 0.5;
>-        const float offset = -0.5;
>-
>-        void main()
>-        {
>-            gl_Position = vec4(vPosition * vec2(scale) + vec2(offset), 0, 1);
>-        })";
>-}
>+    gl_Position = vec4(vPosition, 0, 1);
>+    texCoord = vPosition * 0.5 + vec2(0.5);
>+})";
> 
>-const char *SimpleFragmentShaderSource()
>+constexpr char kSimpleFS[] = R"(precision mediump float;
>+void main()
> {
>-    return
>-        R"(precision mediump float;
>-        void main()
>-        {
>-            gl_FragColor = vec4(1.0, 0.0, 0.0, 1.0);
>-        })";
>-}
>+    gl_FragColor = vec4(1.0, 0.0, 0.0, 1.0);
>+})";
>+
>+constexpr char kSimpleTextureFS[] = R"(precision mediump float;
>+varying vec2 texCoord;
>+uniform sampler2D tex;
>+void main()
>+{
>+    gl_FragColor = texture2D(tex, texCoord);
>+})";
> 
> void Generate2DTriangleData(size_t numTris, std::vector<float> *floatData)
> {
>@@ -70,9 +73,7 @@ void Generate2DTriangleData(size_t numTris, std::vector<float> *floatData)
> 
> GLuint SetupSimpleScaleAndOffsetProgram()
> {
>-    const std::string vs = SimpleScaleAndOffsetVertexShaderSource();
>-    const std::string fs = SimpleFragmentShaderSource();
>-    GLuint program       = CompileProgram(vs, fs);
>+    GLuint program = CompileProgram(kSimpleScaleAndOffsetVS, kSimpleFS);
>     if (program == 0u)
>     {
>         return program;
>@@ -91,9 +92,21 @@ GLuint SetupSimpleScaleAndOffsetProgram()
> 
> GLuint SetupSimpleDrawProgram()
> {
>-    const std::string vs = SimpleDrawVertexShaderSource();
>-    const std::string fs = SimpleFragmentShaderSource();
>-    GLuint program       = CompileProgram(vs, fs);
>+    GLuint program = CompileProgram(kSimpleDrawVS, kSimpleFS);
>+    if (program == 0u)
>+    {
>+        return program;
>+    }
>+
>+    // Use the program object
>+    glUseProgram(program);
>+
>+    return program;
>+}
>+
>+GLuint SetupSimpleTextureProgram()
>+{
>+    GLuint program = CompileProgram(kSimpleTexCoordVS, kSimpleTextureFS);
>     if (program == 0u)
>     {
>         return program;
>diff --git a/Source/ThirdParty/ANGLE/src/tests/test_utils/draw_call_perf_utils.h b/Source/ThirdParty/ANGLE/src/tests/test_utils/draw_call_perf_utils.h
>index f8c83f9a32e..87d645e034e 100644
>--- a/Source/ThirdParty/ANGLE/src/tests/test_utils/draw_call_perf_utils.h
>+++ b/Source/ThirdParty/ANGLE/src/tests/test_utils/draw_call_perf_utils.h
>@@ -12,11 +12,14 @@
> 
> #include <stddef.h>
> 
>-#include "angle_gl.h"
>+#include "util/gles_loader_autogen.h"
> 
> // Returns program ID. The program is left in use, no uniforms.
> GLuint SetupSimpleDrawProgram();
> 
>+// Returns program ID. Uses a 2D texture.
>+GLuint SetupSimpleTextureProgram();
>+
> // Returns program ID. The program is left in use and the uniforms are set to default values:
> // uScale = 0.5, uOffset = -0.5
> GLuint SetupSimpleScaleAndOffsetProgram();
>diff --git a/Source/ThirdParty/ANGLE/src/tests/test_utils/gl_raii.h b/Source/ThirdParty/ANGLE/src/tests/test_utils/gl_raii.h
>index c6af6246bd3..fd9ed02d460 100644
>--- a/Source/ThirdParty/ANGLE/src/tests/test_utils/gl_raii.h
>+++ b/Source/ThirdParty/ANGLE/src/tests/test_utils/gl_raii.h
>@@ -11,7 +11,7 @@
> 
> #include <functional>
> 
>-#include "angle_gl.h"
>+#include "util/shader_utils.h"
> 
> namespace angle
> {
>@@ -22,12 +22,11 @@ namespace angle
> using GLGen    = decltype(glGenBuffers);
> using GLDelete = decltype(glDeleteBuffers);
> 
>-template <GLGen GenF, GLDelete DeleteF>
> class GLWrapper : angle::NonCopyable
> {
>   public:
>-    GLWrapper() {}
>-    ~GLWrapper() { DeleteF(1, &mHandle); }
>+    GLWrapper(GLGen *genFunc, GLDelete *deleteFunc) : mGenFunc(genFunc), mDeleteFunc(deleteFunc) {}
>+    ~GLWrapper() { (*mDeleteFunc)(1, &mHandle); }
> 
>     // The move-constructor and move-assignment operators are necessary so that the data within a
>     // GLWrapper object can be relocated.
>@@ -45,7 +44,7 @@ class GLWrapper : angle::NonCopyable
>     {
>         if (mHandle != 0u)
>         {
>-            DeleteF(1, &mHandle);
>+            (*mDeleteFunc)(1, &mHandle);
>             mHandle = 0u;
>         }
>     }
>@@ -54,7 +53,7 @@ class GLWrapper : angle::NonCopyable
>     {
>         if (!mHandle)
>         {
>-            GenF(1, &mHandle);
>+            (*mGenFunc)(1, &mHandle);
>         }
>         return mHandle;
>     }
>@@ -62,22 +61,79 @@ class GLWrapper : angle::NonCopyable
>     operator GLuint() { return get(); }
> 
>   private:
>+    GLGen *mGenFunc;
>+    GLDelete *mDeleteFunc;
>     GLuint mHandle = 0u;
> };
> 
>-using GLVertexArray       = GLWrapper<glGenVertexArrays, glDeleteVertexArrays>;
>-using GLBuffer            = GLWrapper<glGenBuffers, glDeleteBuffers>;
>-using GLTexture           = GLWrapper<glGenTextures, glDeleteTextures>;
>-using GLFramebuffer       = GLWrapper<glGenFramebuffers, glDeleteFramebuffers>;
>-using GLRenderbuffer      = GLWrapper<glGenRenderbuffers, glDeleteRenderbuffers>;
>-using GLSampler           = GLWrapper<glGenSamplers, glDeleteSamplers>;
>-using GLTransformFeedback = GLWrapper<glGenTransformFeedbacks, glDeleteTransformFeedbacks>;
>-using GLProgramPipeline   = GLWrapper<glGenProgramPipelines, glDeleteProgramPipelines>;
>-using GLQueryEXT          = GLWrapper<glGenQueriesEXT, glDeleteQueriesEXT>;
>-
>-// Don't use GLProgram directly, use ANGLE_GL_PROGRAM.
>-namespace priv
>+class GLVertexArray : public GLWrapper
> {
>+  public:
>+    GLVertexArray() : GLWrapper(&glGenVertexArrays, &glDeleteVertexArrays) {}
>+};
>+class GLBuffer : public GLWrapper
>+{
>+  public:
>+    GLBuffer() : GLWrapper(&glGenBuffers, &glDeleteBuffers) {}
>+};
>+class GLTexture : public GLWrapper
>+{
>+  public:
>+    GLTexture() : GLWrapper(&glGenTextures, &glDeleteTextures) {}
>+};
>+class GLFramebuffer : public GLWrapper
>+{
>+  public:
>+    GLFramebuffer() : GLWrapper(&glGenFramebuffers, &glDeleteFramebuffers) {}
>+};
>+class GLMemoryObject : public GLWrapper
>+{
>+  public:
>+    GLMemoryObject() : GLWrapper(&glCreateMemoryObjectsEXT, &glDeleteMemoryObjectsEXT) {}
>+};
>+class GLRenderbuffer : public GLWrapper
>+{
>+  public:
>+    GLRenderbuffer() : GLWrapper(&glGenRenderbuffers, &glDeleteRenderbuffers) {}
>+};
>+class GLSampler : public GLWrapper
>+{
>+  public:
>+    GLSampler() : GLWrapper(&glGenSamplers, &glDeleteSamplers) {}
>+};
>+class GLTransformFeedback : public GLWrapper
>+{
>+  public:
>+    GLTransformFeedback() : GLWrapper(&glGenTransformFeedbacks, &glDeleteTransformFeedbacks) {}
>+};
>+class GLProgramPipeline : public GLWrapper
>+{
>+  public:
>+    GLProgramPipeline() : GLWrapper(&glGenProgramPipelines, &glDeleteProgramPipelines) {}
>+};
>+class GLQueryEXT : public GLWrapper
>+{
>+  public:
>+    GLQueryEXT() : GLWrapper(&glGenQueriesEXT, &glDeleteQueriesEXT) {}
>+};
>+
>+class GLShader : angle::NonCopyable
>+{
>+  public:
>+    GLShader() = delete;
>+    explicit GLShader(GLenum shaderType) { mHandle = glCreateShader(shaderType); }
>+
>+    ~GLShader() { glDeleteShader(mHandle); }
>+
>+    GLuint get() { return mHandle; }
>+
>+    operator GLuint() { return get(); }
>+
>+  private:
>+    GLuint mHandle;
>+};
>+
>+// Prefer ANGLE_GL_PROGRAM for local variables.
> class GLProgram
> {
>   public:
>@@ -85,18 +141,24 @@ class GLProgram
> 
>     ~GLProgram() { glDeleteProgram(mHandle); }
> 
>-    void makeCompute(const std::string &computeShader)
>+    void makeEmpty() { mHandle = glCreateProgram(); }
>+
>+    void makeCompute(const char *computeShader) { mHandle = CompileComputeProgram(computeShader); }
>+
>+    void makeRaster(const char *vertexShader, const char *fragmentShader)
>     {
>-        mHandle = CompileComputeProgram(computeShader);
>+        mHandle = CompileProgram(vertexShader, fragmentShader);
>     }
> 
>-    void makeRaster(const std::string &vertexShader, const std::string &fragmentShader)
>+    void makeRaster(const char *vertexShader,
>+                    const char *geometryShader,
>+                    const char *fragmentShader)
>     {
>-        mHandle = CompileProgram(vertexShader, fragmentShader);
>+        mHandle = CompileProgramWithGS(vertexShader, geometryShader, fragmentShader);
>     }
> 
>-    void makeRasterWithTransformFeedback(const std::string &vertexShader,
>-                                         const std::string &fragmentShader,
>+    void makeRasterWithTransformFeedback(const char *vertexShader,
>+                                         const char *fragmentShader,
>                                          const std::vector<std::string> &tfVaryings,
>                                          GLenum bufferMode)
>     {
>@@ -116,43 +178,48 @@ class GLProgram
> 
>     bool valid() const { return mHandle != 0; }
> 
>-    GLuint get()
>-    {
>-        ASSERT(valid());
>-        return mHandle;
>-    }
>+    GLuint get() { return mHandle; }
> 
>     operator GLuint() { return get(); }
> 
>   private:
>     GLuint mHandle;
> };
>-}  // namespace priv
>+
>+#define ANGLE_GL_EMPTY_PROGRAM(name) \
>+    GLProgram name;                  \
>+    name.makeEmpty();                \
>+    ASSERT_TRUE(name.valid())
> 
> #define ANGLE_GL_PROGRAM(name, vertex, fragment) \
>-    priv::GLProgram name;                        \
>+    GLProgram name;                              \
>     name.makeRaster(vertex, fragment);           \
>-    ASSERT_TRUE(name.valid());
>+    ASSERT_TRUE(name.valid())
>+
>+#define ANGLE_GL_PROGRAM_WITH_GS(name, vertex, geometry, fragment) \
>+    GLProgram name;                                                \
>+    name.makeRaster(vertex, geometry, fragment);                   \
>+    ASSERT_TRUE(name.valid())
> 
> #define ANGLE_GL_PROGRAM_TRANSFORM_FEEDBACK(name, vertex, fragment, tfVaryings, bufferMode) \
>-    priv::GLProgram name;                                                                   \
>+    GLProgram name;                                                                         \
>     name.makeRasterWithTransformFeedback(vertex, fragment, tfVaryings, bufferMode);         \
>-    ASSERT_TRUE(name.valid());
>+    ASSERT_TRUE(name.valid())
> 
> #define ANGLE_GL_COMPUTE_PROGRAM(name, compute) \
>-    priv::GLProgram name;                       \
>+    GLProgram name;                             \
>     name.makeCompute(compute);                  \
>-    ASSERT_TRUE(name.valid());
>+    ASSERT_TRUE(name.valid())
> 
> #define ANGLE_GL_BINARY_OES_PROGRAM(name, binary, binaryFormat) \
>-    priv::GLProgram name;                                       \
>+    GLProgram name;                                             \
>     name.makeBinaryOES(binary, binaryFormat);                   \
>-    ASSERT_TRUE(name.valid());
>+    ASSERT_TRUE(name.valid())
> 
> #define ANGLE_GL_BINARY_ES3_PROGRAM(name, binary, binaryFormat) \
>-    priv::GLProgram name;                                       \
>+    GLProgram name;                                             \
>     name.makeBinaryES3(binary, binaryFormat);                   \
>-    ASSERT_TRUE(name.valid());
>+    ASSERT_TRUE(name.valid())
> 
> }  // namespace angle
> 
>diff --git a/Source/ThirdParty/ANGLE/src/tests/test_utils/third_party/LICENSE b/Source/ThirdParty/ANGLE/src/tests/test_utils/third_party/LICENSE
>new file mode 100644
>index 00000000000..3307db4cd2e
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/tests/test_utils/third_party/LICENSE
>@@ -0,0 +1,169 @@
>+Apache License
>+
>+Version 2.0, January 2004
>+
>+http://www.apache.org/licenses/
>+
>+TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
>+
>+1. Definitions.
>+
>+"License" shall mean the terms and conditions for use, reproduction, and distribution as 
>+defined by Sections 1 through 9 of this document.
>+
>+"Licensor" shall mean the copyright owner or entity authorized by the copyright owner 
>+that is granting the License.
>+
>+"Legal Entity" shall mean the union of the acting entity and all other entities that 
>+control, are controlled by, or are under common control with that entity. For the 
>+purposes of this definition, "control" means (i) the power, direct or indirect, to 
>+cause the direction or management of such entity, whether by contract or otherwise, 
>+or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or 
>+(iii) beneficial ownership of such entity.
>+
>+"You" (or "Your") shall mean an individual or Legal Entity exercising permissions 
>+granted by this License.
>+
>+"Source" form shall mean the preferred form for making modifications, including but not 
>+limited to software source code, documentation source, and configuration files.
>+
>+"Object" form shall mean any form resulting from mechanical transformation or 
>+translation of a Source form, including but not limited to compiled object code, 
>+generated documentation, and conversions to other media types.
>+
>+"Work" shall mean the work of authorship, whether in Source or Object form, made 
>+available under the License, as indicated by a copyright notice that is included in or 
>+attached to the work (an example is provided in the Appendix below).
>+
>+"Derivative Works" shall mean any work, whether in Source or Object form, that is based 
>+on (or derived from) the Work and for which the editorial revisions, annotations, 
>+elaborations, or other modifications represent, as a whole, an original work of 
>+authorship. For the purposes of this License, Derivative Works shall not include works 
>+that remain separable from, or merely link (or bind by name) to the interfaces of, the 
>+Work and Derivative Works thereof.
>+
>+"Contribution" shall mean any work of authorship, including the original version of the 
>+Work and any modifications or additions to that Work or Derivative Works thereof, that 
>+is intentionally submitted to Licensor for inclusion in the Work by the copyright owner 
>+or by an individual or Legal Entity authorized to submit on behalf of the copyright owner. 
>+For the purposes of this definition, "submitted" means any form of electronic, verbal, 
>+or written communication sent to the Licensor or its representatives, including but not 
>+limited to communication on electronic mailing lists, source code control systems, and 
>+issue tracking systems that are managed by, or on behalf of, the Licensor for the purpose 
>+of discussing and improving the Work, but excluding communication that is conspicuously 
>+marked or otherwise designated in writing by the copyright owner as "Not a Contribution."
>+
>+"Contributor" shall mean Licensor and any individual or Legal Entity on behalf of whom a 
>+Contribution has been received by Licensor and subsequently incorporated within the Work.
>+
>+2. Grant of Copyright License. Subject to the terms and conditions of this License, each 
>+Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, 
>+royalty-free, irrevocable copyright license to reproduce, prepare Derivative Works of, 
>+publicly display, publicly perform, sublicense, and distribute the Work and such 
>+Derivative Works in Source or Object form.
>+
>+3. Grant of Patent License. Subject to the terms and conditions of this License, each 
>+Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, 
>+royalty-free, irrevocable (except as stated in this section) patent license to make, 
>+have made, use, offer to sell, sell, import, and otherwise transfer the Work, where such 
>+license applies only to those patent claims licensable by such Contributor that are 
>+necessarily infringed by their Contribution(s) alone or by combination of their 
>+Contribution(s) with the Work to which such Contribution(s) was submitted. If You 
>+institute patent litigation against any entity (including a cross-claim or counterclaim 
>+in a lawsuit) alleging that the Work or a Contribution incorporated within the Work 
>+constitutes direct or contributory patent infringement, then any patent licenses granted 
>+to You under this License for that Work shall terminate as of the date such litigation 
>+is filed.
>+
>+4. Redistribution. You may reproduce and distribute copies of the Work or Derivative 
>+Works thereof in any medium, with or without modifications, and in Source or Object form, 
>+provided that You meet the following conditions:
>+
>+You must give any other recipients of the Work or Derivative Works a copy of this 
>+License; and
>+You must cause any modified files to carry prominent notices stating that You changed 
>+the files; and
>+You must retain, in the Source form of any Derivative Works that You distribute, all 
>+copyright, patent, trademark, and attribution notices from the Source form of the Work, 
>+excluding those notices that do not pertain to any part of the Derivative Works; and
>+If the Work includes a "NOTICE" text file as part of its distribution, then any 
>+Derivative Works that You distribute must include a readable copy of the attribution 
>+notices contained within such NOTICE file, excluding those notices that do not pertain 
>+to any part of the Derivative Works, in at least one of the following places: within a 
>+NOTICE text file distributed as part of the Derivative Works; within the Source form or 
>+documentation, if provided along with the Derivative Works; or, within a display 
>+generated by the Derivative Works, if and wherever such third-party notices normally 
>+appear. The contents of the NOTICE file are for informational purposes only and do not 
>+modify the License. You may add Your own attribution notices within Derivative Works 
>+that You distribute, alongside or as an addendum to the NOTICE text from the Work, 
>+provided that such additional attribution notices cannot be construed as modifying 
>+the License. 
>+
>+You may add Your own copyright statement to Your modifications and may provide 
>+additional or different license terms and conditions for use, reproduction, or 
>+distribution of Your modifications, or for any such Derivative Works as a whole, 
>+provided Your use, reproduction, and distribution of the Work otherwise complies with 
>+the conditions stated in this License.
>+
>+5. Submission of Contributions. Unless You explicitly state otherwise, any Contribution 
>+intentionally submitted for inclusion in the Work by You to the Licensor shall be under 
>+the terms and conditions of this License, without any additional terms or conditions. 
>+Notwithstanding the above, nothing herein shall supersede or modify the terms of any 
>+separate license agreement you may have executed with Licensor regarding such 
>+Contributions.
>+
>+6. Trademarks. This License does not grant permission to use the trade names, 
>+trademarks, service marks, or product names of the Licensor, except as required for 
>+reasonable and customary use in describing the origin of the Work and reproducing the 
>+content of the NOTICE file.
>+
>+7. Disclaimer of Warranty. Unless required by applicable law or agreed to in writing, 
>+Licensor provides the Work (and each Contributor provides its Contributions) on an 
>+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, 
>+ including, without limitation, any warranties or conditions of TITLE, NON-INFRINGEMENT, 
>+ MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are solely responsible for 
>+ determining the appropriateness of using or redistributing the Work and assume any 
>+ risks associated with Your exercise of permissions under this License.
>+
>+8. Limitation of Liability. In no event and under no legal theory, whether in tort 
>+(including negligence), contract, or otherwise, unless required by applicable law (such 
>+as deliberate and grossly negligent acts) or agreed to in writing, shall any Contributor 
>+be liable to You for damages, including any direct, indirect, special, incidental, or 
>+consequential damages of any character arising as a result of this License or out of the 
>+use or inability to use the Work (including but not limited to damages for loss of 
>+goodwill, work stoppage, computer failure or malfunction, or any and all other 
>+commercial damages or losses), even if such Contributor has been advised of the 
>+possibility of such damages.
>+
>+9. Accepting Warranty or Additional Liability. While redistributing the Work or 
>+Derivative Works thereof, You may choose to offer, and charge a fee for, acceptance of 
>+support, warranty, indemnity, or other liability obligations and/or rights consistent 
>+with this License. However, in accepting such obligations, You may act only on Your own 
>+behalf and on Your sole responsibility, not on behalf of any other Contributor, and only 
>+if You agree to indemnify, defend, and hold each Contributor harmless for any liability 
>+incurred by, or claims asserted against, such Contributor by reason of your accepting 
>+any such warranty or additional liability.
>+
>+END OF TERMS AND CONDITIONS
>+
>+APPENDIX: HOW TO APPLY THE APACHE LICENSE TO YOUR WORK
>+To apply the Apache License to your work, attach the following boilerplate notice, with 
>+the fields enclosed by brackets "[]" replaced with your own identifying information. 
>+(Don't include the brackets!) The text should be enclosed in the appropriate comment 
>+syntax for the file format. We also recommend that a file or class name and description 
>+of purpose be included on the same "printed page" as the copyright notice for easier 
>+identification within third-party archives.
>+
>+Copyright [yyyy] [name of copyright owner]
>+
>+Licensed under the Apache License, Version 2.0 (the "License");
>+you may not use this file except in compliance with the License.
>+You may obtain a copy of the License at
>+
>+    http://www.apache.org/licenses/LICENSE-2.0
>+
>+Unless required by applicable law or agreed to in writing, software
>+distributed under the License is distributed on an "AS IS" BASIS,
>+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
>+See the License for the specific language governing permissions and
>+limitations under the License.
>\ No newline at end of file
>diff --git a/Source/ThirdParty/ANGLE/src/tests/test_utils/third_party/README.angle b/Source/ThirdParty/ANGLE/src/tests/test_utils/third_party/README.angle
>new file mode 100644
>index 00000000000..e3fdf186e6b
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/tests/test_utils/third_party/README.angle
>@@ -0,0 +1,9 @@
>+Name: vulkan_command_buffer_utils.h, vulkan_command_buffer_utils.cpp
>+URL: https://github.com/LunarG/VulkanSamples/tree/master/API-Samples/utils
>+License: Apache License, Version 2.0
>+License File: http://www.apache.org/licenses/LICENSE-2.0
>+
>+Description:
>+Utility functions used to implement Vulkan samples and performance tests.
>+Modified and reorganized to add support for running applications using
>+various command buffer implementations.
>\ No newline at end of file
>diff --git a/Source/ThirdParty/ANGLE/src/tests/test_utils/third_party/vulkan_command_buffer_utils.cpp b/Source/ThirdParty/ANGLE/src/tests/test_utils/third_party/vulkan_command_buffer_utils.cpp
>new file mode 100644
>index 00000000000..6330600636d
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/tests/test_utils/third_party/vulkan_command_buffer_utils.cpp
>@@ -0,0 +1,1911 @@
>+/*
>+ * Vulkan Samples
>+ *
>+ * Copyright (C) 2015-2016 Valve Corporation
>+ * Copyright (C) 2015-2016 LunarG, Inc.
>+ * Copyright (C) 2015-2018 Google, Inc.
>+ *
>+ * Licensed under the Apache License, Version 2.0 (the "License");
>+ * you may not use this file except in compliance with the License.
>+ * You may obtain a copy of the License at
>+ *
>+ *     http://www.apache.org/licenses/LICENSE-2.0
>+ *
>+ * Unless required by applicable law or agreed to in writing, software
>+ * distributed under the License is distributed on an "AS IS" BASIS,
>+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
>+ * See the License for the specific language governing permissions and
>+ * limitations under the License.
>+ */
>+
>+/*
>+VULKAN_SAMPLE_DESCRIPTION
>+samples utility functions
>+*/
>+
>+#include "vulkan_command_buffer_utils.h"
>+
>+#include <assert.h>
>+#include <string.h>
>+#include <cstdlib>
>+#include <iterator>
>+
>+#if defined(VK_USE_PLATFORM_WAYLAND_KHR)
>+#    include <linux/input.h>
>+#endif
>+
>+using namespace std;
>+
>+/*
>+ * TODO: function description here
>+ */
>+VkResult init_global_extension_properties(layer_properties &layer_props)
>+{
>+    VkExtensionProperties *instance_extensions;
>+    uint32_t instance_extension_count;
>+    VkResult res;
>+    char *layer_name = NULL;
>+
>+    layer_name = layer_props.properties.layerName;
>+
>+    do
>+    {
>+        res = vkEnumerateInstanceExtensionProperties(layer_name, &instance_extension_count, NULL);
>+        if (res)
>+            return res;
>+
>+        if (instance_extension_count == 0)
>+        {
>+            return VK_SUCCESS;
>+        }
>+
>+        layer_props.instance_extensions.resize(instance_extension_count);
>+        instance_extensions = layer_props.instance_extensions.data();
>+        res = vkEnumerateInstanceExtensionProperties(layer_name, &instance_extension_count,
>+                                                     instance_extensions);
>+    } while (res == VK_INCOMPLETE);
>+
>+    return res;
>+}
>+
>+/*
>+ * TODO: function description here
>+ */
>+VkResult init_global_layer_properties(struct sample_info &info)
>+{
>+    uint32_t instance_layer_count;
>+    VkLayerProperties *vk_props = NULL;
>+    VkResult res;
>+
>+    /*
>+     * It's possible, though very rare, that the number of
>+     * instance layers could change. For example, installing something
>+     * could include new layers that the loader would pick up
>+     * between the initial query for the count and the
>+     * request for VkLayerProperties. The loader indicates that
>+     * by returning a VK_INCOMPLETE status and will update the
>+     * the count parameter.
>+     * The count parameter will be updated with the number of
>+     * entries loaded into the data pointer - in case the number
>+     * of layers went down or is smaller than the size given.
>+     */
>+    do
>+    {
>+        res = vkEnumerateInstanceLayerProperties(&instance_layer_count, NULL);
>+        if (res)
>+            return res;
>+
>+        if (instance_layer_count == 0)
>+        {
>+            return VK_SUCCESS;
>+        }
>+
>+        vk_props = (VkLayerProperties *)realloc(vk_props,
>+                                                instance_layer_count * sizeof(VkLayerProperties));
>+
>+        res = vkEnumerateInstanceLayerProperties(&instance_layer_count, vk_props);
>+    } while (res == VK_INCOMPLETE);
>+
>+    /*
>+     * Now gather the extension list for each instance layer.
>+     */
>+    for (uint32_t i = 0; i < instance_layer_count; i++)
>+    {
>+        layer_properties layer_props;
>+        layer_props.properties = vk_props[i];
>+        res                    = init_global_extension_properties(layer_props);
>+        if (res)
>+            return res;
>+        info.instance_layer_properties.push_back(layer_props);
>+    }
>+    free(vk_props);
>+
>+    return res;
>+}
>+
>+VkResult init_device_extension_properties(struct sample_info &info, layer_properties &layer_props)
>+{
>+    VkExtensionProperties *device_extensions;
>+    uint32_t device_extension_count;
>+    VkResult res;
>+    char *layer_name = NULL;
>+
>+    layer_name = layer_props.properties.layerName;
>+
>+    do
>+    {
>+        res = vkEnumerateDeviceExtensionProperties(info.gpus[0], layer_name,
>+                                                   &device_extension_count, NULL);
>+        if (res)
>+            return res;
>+
>+        if (device_extension_count == 0)
>+        {
>+            return VK_SUCCESS;
>+        }
>+
>+        layer_props.device_extensions.resize(device_extension_count);
>+        device_extensions = layer_props.device_extensions.data();
>+        res               = vkEnumerateDeviceExtensionProperties(info.gpus[0], layer_name,
>+                                                   &device_extension_count, device_extensions);
>+    } while (res == VK_INCOMPLETE);
>+
>+    return res;
>+}
>+
>+/*
>+ * Return 1 (true) if all layer names specified in check_names
>+ * can be found in given layer properties.
>+ */
>+VkBool32 demo_check_layers(const std::vector<layer_properties> &layer_props,
>+                           const std::vector<const char *> &layer_names)
>+{
>+    uint32_t check_count = layer_names.size();
>+    uint32_t layer_count = layer_props.size();
>+    for (uint32_t i = 0; i < check_count; i++)
>+    {
>+        VkBool32 found = 0;
>+        for (uint32_t j = 0; j < layer_count; j++)
>+        {
>+            if (!strcmp(layer_names[i], layer_props[j].properties.layerName))
>+            {
>+                found = 1;
>+            }
>+        }
>+        if (!found)
>+        {
>+            std::cout << "Cannot find layer: " << layer_names[i] << std::endl;
>+            return 0;
>+        }
>+    }
>+    return 1;
>+}
>+
>+void init_instance_extension_names(struct sample_info &info)
>+{
>+    info.instance_extension_names.push_back(VK_KHR_SURFACE_EXTENSION_NAME);
>+#ifdef __ANDROID__
>+    info.instance_extension_names.push_back(VK_KHR_ANDROID_SURFACE_EXTENSION_NAME);
>+#elif defined(_WIN32)
>+    info.instance_extension_names.push_back(VK_KHR_WIN32_SURFACE_EXTENSION_NAME);
>+#elif defined(VK_USE_PLATFORM_WAYLAND_KHR)
>+    info.instance_extension_names.push_back(VK_KHR_WAYLAND_SURFACE_EXTENSION_NAME);
>+#else
>+    info.instance_extension_names.push_back(VK_KHR_XCB_SURFACE_EXTENSION_NAME);
>+#endif
>+#ifndef __ANDROID__
>+    info.instance_layer_names.push_back("VK_LAYER_LUNARG_standard_validation");
>+    if (!demo_check_layers(info.instance_layer_properties, info.instance_layer_names))
>+    {
>+        // If standard validation is not present, search instead for the
>+        // individual layers that make it up, in the correct order.
>+        //
>+
>+        info.instance_layer_names.clear();
>+        info.instance_layer_names.push_back("VK_LAYER_GOOGLE_threading");
>+        info.instance_layer_names.push_back("VK_LAYER_LUNARG_parameter_validation");
>+        info.instance_layer_names.push_back("VK_LAYER_LUNARG_object_tracker");
>+        info.instance_layer_names.push_back("VK_LAYER_LUNARG_core_validation");
>+        info.instance_layer_names.push_back("VK_LAYER_LUNARG_image");
>+        info.instance_layer_names.push_back("VK_LAYER_LUNARG_swapchain");
>+        info.instance_layer_names.push_back("VK_LAYER_GOOGLE_unique_objects");
>+
>+        if (!demo_check_layers(info.instance_layer_properties, info.instance_layer_names))
>+        {
>+            exit(1);
>+        }
>+    }
>+
>+    // Enable debug callback extension
>+    info.instance_extension_names.push_back(VK_EXT_DEBUG_REPORT_EXTENSION_NAME);
>+#endif
>+}
>+
>+VkResult init_instance(struct sample_info &info, char const *const app_short_name)
>+{
>+    VkApplicationInfo app_info  = {};
>+    app_info.sType              = VK_STRUCTURE_TYPE_APPLICATION_INFO;
>+    app_info.pNext              = NULL;
>+    app_info.pApplicationName   = app_short_name;
>+    app_info.applicationVersion = 1;
>+    app_info.pEngineName        = app_short_name;
>+    app_info.engineVersion      = 1;
>+    app_info.apiVersion         = VK_API_VERSION_1_0;
>+
>+    VkInstanceCreateInfo inst_info = {};
>+    inst_info.sType                = VK_STRUCTURE_TYPE_INSTANCE_CREATE_INFO;
>+    inst_info.pNext                = NULL;
>+    inst_info.flags                = 0;
>+    inst_info.pApplicationInfo     = &app_info;
>+    inst_info.enabledLayerCount    = info.instance_layer_names.size();
>+    inst_info.ppEnabledLayerNames =
>+        info.instance_layer_names.size() ? info.instance_layer_names.data() : NULL;
>+    inst_info.enabledExtensionCount   = info.instance_extension_names.size();
>+    inst_info.ppEnabledExtensionNames = info.instance_extension_names.data();
>+
>+    VkResult res = vkCreateInstance(&inst_info, NULL, &info.inst);
>+    assert(res == VK_SUCCESS);
>+
>+    return res;
>+}
>+
>+void init_device_extension_names(struct sample_info &info)
>+{
>+    info.device_extension_names.push_back(VK_KHR_SWAPCHAIN_EXTENSION_NAME);
>+}
>+
>+VkResult init_enumerate_device(struct sample_info &info, uint32_t gpu_count)
>+{
>+    VkResult res = vkEnumeratePhysicalDevices(info.inst, &gpu_count, NULL);
>+    assert(gpu_count);
>+    info.gpus.resize(gpu_count);
>+
>+    res = vkEnumeratePhysicalDevices(info.inst, &gpu_count, info.gpus.data());
>+    assert(!res);
>+
>+    vkGetPhysicalDeviceQueueFamilyProperties(info.gpus[0], &info.queue_family_count, NULL);
>+    assert(info.queue_family_count >= 1);
>+
>+    info.queue_props.resize(info.queue_family_count);
>+    vkGetPhysicalDeviceQueueFamilyProperties(info.gpus[0], &info.queue_family_count,
>+                                             info.queue_props.data());
>+    assert(info.queue_family_count >= 1);
>+
>+    /* This is as good a place as any to do this */
>+    vkGetPhysicalDeviceMemoryProperties(info.gpus[0], &info.memory_properties);
>+    vkGetPhysicalDeviceProperties(info.gpus[0], &info.gpu_props);
>+    /* query device extensions for enabled layers */
>+    for (auto &layer_props : info.instance_layer_properties)
>+    {
>+        init_device_extension_properties(info, layer_props);
>+    }
>+
>+    return res;
>+}
>+
>+#if defined(VK_USE_PLATFORM_WAYLAND_KHR)
>+
>+static void handle_ping(void *data, wl_shell_surface *shell_surface, uint32_t serial)
>+{
>+    wl_shell_surface_pong(shell_surface, serial);
>+}
>+
>+static void handle_configure(void *data,
>+                             wl_shell_surface *shell_surface,
>+                             uint32_t edges,
>+                             int32_t width,
>+                             int32_t height)
>+{}
>+
>+static void handle_popup_done(void *data, wl_shell_surface *shell_surface) {}
>+
>+static const wl_shell_surface_listener shell_surface_listener = {handle_ping, handle_configure,
>+                                                                 handle_popup_done};
>+
>+static void registry_handle_global(void *data,
>+                                   wl_registry *registry,
>+                                   uint32_t id,
>+                                   const char *interface,
>+                                   uint32_t version)
>+{
>+    sample_info *info = (sample_info *)data;
>+    // pickup wayland objects when they appear
>+    if (strcmp(interface, "wl_compositor") == 0)
>+    {
>+        info->compositor =
>+            (wl_compositor *)wl_registry_bind(registry, id, &wl_compositor_interface, 1);
>+    }
>+    else if (strcmp(interface, "wl_shell") == 0)
>+    {
>+        info->shell = (wl_shell *)wl_registry_bind(registry, id, &wl_shell_interface, 1);
>+    }
>+}
>+
>+static void registry_handle_global_remove(void *data, wl_registry *registry, uint32_t name) {}
>+
>+static const wl_registry_listener registry_listener = {registry_handle_global,
>+                                                       registry_handle_global_remove};
>+
>+#endif
>+
>+void init_connection(struct sample_info &info)
>+{
>+#if defined(VK_USE_PLATFORM_XCB_KHR)
>+    const xcb_setup_t *setup;
>+    xcb_screen_iterator_t iter;
>+    int scr;
>+
>+    info.connection = xcb_connect(NULL, &scr);
>+    if (info.connection == NULL || xcb_connection_has_error(info.connection))
>+    {
>+        std::cout << "Unable to make an XCB connection\n";
>+        exit(-1);
>+    }
>+
>+    setup = xcb_get_setup(info.connection);
>+    iter  = xcb_setup_roots_iterator(setup);
>+    while (scr-- > 0)
>+        xcb_screen_next(&iter);
>+
>+    info.screen = iter.data;
>+#elif defined(VK_USE_PLATFORM_WAYLAND_KHR)
>+    info.display = wl_display_connect(nullptr);
>+
>+    if (info.display == nullptr)
>+    {
>+        printf(
>+            "Cannot find a compatible Vulkan installable client driver "
>+            "(ICD).\nExiting ...\n");
>+        fflush(stdout);
>+        exit(1);
>+    }
>+
>+    info.registry = wl_display_get_registry(info.display);
>+    wl_registry_add_listener(info.registry, &registry_listener, &info);
>+    wl_display_dispatch(info.display);
>+#endif
>+}
>+#ifdef _WIN32
>+static void run(struct sample_info *info)
>+{ /* Placeholder for samples that want to show dynamic content */
>+}
>+
>+// MS-Windows event handling function:
>+LRESULT CALLBACK WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
>+{
>+    struct sample_info *info =
>+        reinterpret_cast<struct sample_info *>(GetWindowLongPtr(hWnd, GWLP_USERDATA));
>+
>+    switch (uMsg)
>+    {
>+        case WM_CLOSE:
>+            PostQuitMessage(0);
>+            break;
>+        case WM_PAINT:
>+            run(info);
>+            return 0;
>+        default:
>+            break;
>+    }
>+    return (DefWindowProc(hWnd, uMsg, wParam, lParam));
>+}
>+
>+void init_window(struct sample_info &info)
>+{
>+    WNDCLASSEXA win_class;
>+    assert(info.width > 0);
>+    assert(info.height > 0);
>+
>+    info.connection = GetModuleHandle(NULL);
>+    sprintf(info.name, "Sample");
>+
>+    // Initialize the window class structure:
>+    win_class.cbSize        = sizeof(WNDCLASSEX);
>+    win_class.style         = CS_HREDRAW | CS_VREDRAW;
>+    win_class.lpfnWndProc   = WndProc;
>+    win_class.cbClsExtra    = 0;
>+    win_class.cbWndExtra    = 0;
>+    win_class.hInstance     = info.connection;  // hInstance
>+    win_class.hIcon         = LoadIcon(NULL, IDI_APPLICATION);
>+    win_class.hCursor       = LoadCursor(NULL, IDC_ARROW);
>+    win_class.hbrBackground = (HBRUSH)GetStockObject(WHITE_BRUSH);
>+    win_class.lpszMenuName  = NULL;
>+    win_class.lpszClassName = info.name;
>+    win_class.hIconSm       = LoadIcon(NULL, IDI_WINLOGO);
>+    // Register window class:
>+    if (!RegisterClassExA(&win_class))
>+    {
>+        // It didn't work, so try to give a useful error:
>+        printf("Unexpected error trying to start the application!\n");
>+        fflush(stdout);
>+        exit(1);
>+    }
>+    // Create window with the registered class:
>+    RECT wr = {0, 0, info.width, info.height};
>+    AdjustWindowRect(&wr, WS_OVERLAPPEDWINDOW, FALSE);
>+    info.window = CreateWindowExA(0,
>+                                  info.name,             // class name
>+                                  info.name,             // app name
>+                                  WS_OVERLAPPEDWINDOW |  // window style
>+                                      WS_VISIBLE | WS_SYSMENU,
>+                                  100, 100,            // x/y coords
>+                                  wr.right - wr.left,  // width
>+                                  wr.bottom - wr.top,  // height
>+                                  NULL,                // handle to parent
>+                                  NULL,                // handle to menu
>+                                  info.connection,     // hInstance
>+                                  NULL);               // no extra parameters
>+    if (!info.window)
>+    {
>+        // It didn't work, so try to give a useful error:
>+        printf("Cannot create a window in which to draw!\n");
>+        fflush(stdout);
>+        exit(1);
>+    }
>+    SetWindowLongPtr(info.window, GWLP_USERDATA, (LONG_PTR)&info);
>+}
>+
>+void destroy_window(struct sample_info &info)
>+{
>+    vkDestroySurfaceKHR(info.inst, info.surface, NULL);
>+    DestroyWindow(info.window);
>+    UnregisterClassA(info.name, GetModuleHandle(NULL));
>+}
>+
>+#elif defined(__ANDROID__)
>+// Android implementation.
>+void init_window(struct sample_info &info) {}
>+
>+void destroy_window(struct sample_info &info)
>+{
>+    vkDestroySurfaceKHR(info.inst, info.surface, NULL);
>+}
>+
>+#elif defined(VK_USE_PLATFORM_WAYLAND_KHR)
>+
>+void init_window(struct sample_info &info)
>+{
>+    assert(info.width > 0);
>+    assert(info.height > 0);
>+
>+    info.window = wl_compositor_create_surface(info.compositor);
>+    if (!info.window)
>+    {
>+        printf("Can not create wayland_surface from compositor!\n");
>+        fflush(stdout);
>+        exit(1);
>+    }
>+
>+    info.shell_surface = wl_shell_get_shell_surface(info.shell, info.window);
>+    if (!info.shell_surface)
>+    {
>+        printf("Can not get shell_surface from wayland_surface!\n");
>+        fflush(stdout);
>+        exit(1);
>+    }
>+
>+    wl_shell_surface_add_listener(info.shell_surface, &shell_surface_listener, &info);
>+    wl_shell_surface_set_toplevel(info.shell_surface);
>+}
>+
>+void destroy_window(struct sample_info &info)
>+{
>+    wl_shell_surface_destroy(info.shell_surface);
>+    wl_surface_destroy(info.window);
>+    wl_shell_destroy(info.shell);
>+    wl_compositor_destroy(info.compositor);
>+    wl_registry_destroy(info.registry);
>+    wl_display_disconnect(info.display);
>+}
>+
>+#else
>+
>+void init_window(struct sample_info &info)
>+{
>+    assert(info.width > 0);
>+    assert(info.height > 0);
>+
>+    uint32_t value_mask, value_list[32];
>+
>+    info.window = xcb_generate_id(info.connection);
>+
>+    value_mask = XCB_CW_BACK_PIXEL | XCB_CW_EVENT_MASK;
>+    value_list[0] = info.screen->black_pixel;
>+    value_list[1] = XCB_EVENT_MASK_KEY_RELEASE | XCB_EVENT_MASK_EXPOSURE;
>+
>+    xcb_create_window(info.connection, XCB_COPY_FROM_PARENT, info.window, info.screen->root, 0, 0,
>+                      info.width, info.height, 0, XCB_WINDOW_CLASS_INPUT_OUTPUT,
>+                      info.screen->root_visual, value_mask, value_list);
>+
>+    /* Magic code that will send notification when window is destroyed */
>+    xcb_intern_atom_cookie_t cookie = xcb_intern_atom(info.connection, 1, 12, "WM_PROTOCOLS");
>+    xcb_intern_atom_reply_t *reply = xcb_intern_atom_reply(info.connection, cookie, 0);
>+
>+    xcb_intern_atom_cookie_t cookie2 = xcb_intern_atom(info.connection, 0, 16, "WM_DELETE_WINDOW");
>+    info.atom_wm_delete_window = xcb_intern_atom_reply(info.connection, cookie2, 0);
>+
>+    xcb_change_property(info.connection, XCB_PROP_MODE_REPLACE, info.window, (*reply).atom, 4, 32,
>+                        1, &(*info.atom_wm_delete_window).atom);
>+    free(reply);
>+
>+    xcb_map_window(info.connection, info.window);
>+
>+    // Force the x/y coordinates to 100,100 results are identical in consecutive
>+    // runs
>+    const uint32_t coords[] = {100, 100};
>+    xcb_configure_window(info.connection, info.window, XCB_CONFIG_WINDOW_X | XCB_CONFIG_WINDOW_Y,
>+                         coords);
>+    xcb_flush(info.connection);
>+
>+    xcb_generic_event_t *e;
>+    while ((e = xcb_wait_for_event(info.connection)))
>+    {
>+        if ((e->response_type & ~0x80) == XCB_EXPOSE)
>+            break;
>+    }
>+}
>+
>+void destroy_window(struct sample_info &info)
>+{
>+    vkDestroySurfaceKHR(info.inst, info.surface, NULL);
>+    xcb_destroy_window(info.connection, info.window);
>+    xcb_disconnect(info.connection);
>+}
>+
>+#endif  // _WIN32
>+
>+void init_window_size(struct sample_info &info, int32_t default_width, int32_t default_height)
>+{
>+#ifdef __ANDROID__
>+    info.mOSWindow = OSWindow::New();
>+    assert(info.mOSWindow != nullptr);
>+    info.mOSWindow->initialize("VulkanTest", default_width, default_height);
>+#endif
>+    info.width  = default_width;
>+    info.height = default_height;
>+}
>+
>+void init_swapchain_extension(struct sample_info &info)
>+{
>+    /* DEPENDS on init_connection() and init_window() */
>+
>+    VkResult res;
>+
>+// Construct the surface description:
>+#ifdef _WIN32
>+    VkWin32SurfaceCreateInfoKHR createInfo = {};
>+    createInfo.sType                       = VK_STRUCTURE_TYPE_WIN32_SURFACE_CREATE_INFO_KHR;
>+    createInfo.pNext                       = NULL;
>+    createInfo.hinstance                   = info.connection;
>+    createInfo.hwnd                        = info.window;
>+    res = vkCreateWin32SurfaceKHR(info.inst, &createInfo, NULL, &info.surface);
>+#elif defined(__ANDROID__)
>+    GET_INSTANCE_PROC_ADDR(info.inst, CreateAndroidSurfaceKHR);
>+    VkAndroidSurfaceCreateInfoKHR createInfo;
>+    createInfo.sType = VK_STRUCTURE_TYPE_ANDROID_SURFACE_CREATE_INFO_KHR;
>+    createInfo.pNext = nullptr;
>+    createInfo.flags = 0;
>+    createInfo.window = info.mOSWindow->getNativeWindow();
>+    res = info.fpCreateAndroidSurfaceKHR(info.inst, &createInfo, nullptr, &info.surface);
>+#elif defined(VK_USE_PLATFORM_WAYLAND_KHR)
>+    VkWaylandSurfaceCreateInfoKHR createInfo = {};
>+    createInfo.sType = VK_STRUCTURE_TYPE_WAYLAND_SURFACE_CREATE_INFO_KHR;
>+    createInfo.pNext = NULL;
>+    createInfo.display = info.display;
>+    createInfo.surface = info.window;
>+    res = vkCreateWaylandSurfaceKHR(info.inst, &createInfo, NULL, &info.surface);
>+#else
>+    VkXcbSurfaceCreateInfoKHR createInfo = {};
>+    createInfo.sType = VK_STRUCTURE_TYPE_XCB_SURFACE_CREATE_INFO_KHR;
>+    createInfo.pNext = NULL;
>+    createInfo.connection = info.connection;
>+    createInfo.window = info.window;
>+    res = vkCreateXcbSurfaceKHR(info.inst, &createInfo, NULL, &info.surface);
>+#endif  // __ANDROID__  && _WIN32
>+    assert(res == VK_SUCCESS);
>+
>+    // Iterate over each queue to learn whether it supports presenting:
>+    VkBool32 *pSupportsPresent = (VkBool32 *)malloc(info.queue_family_count * sizeof(VkBool32));
>+    for (uint32_t i = 0; i < info.queue_family_count; i++)
>+    {
>+        vkGetPhysicalDeviceSurfaceSupportKHR(info.gpus[0], i, info.surface, &pSupportsPresent[i]);
>+    }
>+
>+    // Search for a graphics and a present queue in the array of queue
>+    // families, try to find one that supports both
>+    info.graphics_queue_family_index = UINT32_MAX;
>+    info.present_queue_family_index  = UINT32_MAX;
>+    for (uint32_t i = 0; i < info.queue_family_count; ++i)
>+    {
>+        if ((info.queue_props[i].queueFlags & VK_QUEUE_GRAPHICS_BIT) != 0)
>+        {
>+            if (info.graphics_queue_family_index == UINT32_MAX)
>+                info.graphics_queue_family_index = i;
>+
>+            if (pSupportsPresent[i] == VK_TRUE)
>+            {
>+                info.graphics_queue_family_index = i;
>+                info.present_queue_family_index  = i;
>+                break;
>+            }
>+        }
>+    }
>+
>+    if (info.present_queue_family_index == UINT32_MAX)
>+    {
>+        // If didn't find a queue that supports both graphics and present, then
>+        // find a separate present queue.
>+        for (size_t i = 0; i < info.queue_family_count; ++i)
>+            if (pSupportsPresent[i] == VK_TRUE)
>+            {
>+                info.present_queue_family_index = i;
>+                break;
>+            }
>+    }
>+    free(pSupportsPresent);
>+
>+    // Generate error if could not find queues that support graphics
>+    // and present
>+    if (info.graphics_queue_family_index == UINT32_MAX ||
>+        info.present_queue_family_index == UINT32_MAX)
>+    {
>+        std::cout << "Could not find a queues for both graphics and present";
>+        exit(-1);
>+    }
>+
>+    // Get the list of VkFormats that are supported:
>+    uint32_t formatCount;
>+    res = vkGetPhysicalDeviceSurfaceFormatsKHR(info.gpus[0], info.surface, &formatCount, NULL);
>+    assert(res == VK_SUCCESS);
>+    VkSurfaceFormatKHR *surfFormats =
>+        (VkSurfaceFormatKHR *)malloc(formatCount * sizeof(VkSurfaceFormatKHR));
>+    res =
>+        vkGetPhysicalDeviceSurfaceFormatsKHR(info.gpus[0], info.surface, &formatCount, surfFormats);
>+    assert(res == VK_SUCCESS);
>+    // If the format list includes just one entry of VK_FORMAT_UNDEFINED,
>+    // the surface has no preferred format.  Otherwise, at least one
>+    // supported format will be returned.
>+    if (formatCount == 1 && surfFormats[0].format == VK_FORMAT_UNDEFINED)
>+    {
>+        info.format = VK_FORMAT_B8G8R8A8_UNORM;
>+    }
>+    else
>+    {
>+        assert(formatCount >= 1);
>+        info.format = surfFormats[0].format;
>+    }
>+    free(surfFormats);
>+}
>+
>+VkResult init_device(struct sample_info &info)
>+{
>+    VkResult res;
>+    VkDeviceQueueCreateInfo queue_info = {};
>+
>+    float queue_priorities[1]   = {0.0};
>+    queue_info.sType            = VK_STRUCTURE_TYPE_DEVICE_QUEUE_CREATE_INFO;
>+    queue_info.pNext            = NULL;
>+    queue_info.queueCount       = 1;
>+    queue_info.pQueuePriorities = queue_priorities;
>+    queue_info.queueFamilyIndex = info.graphics_queue_family_index;
>+
>+    VkDeviceCreateInfo device_info    = {};
>+    device_info.sType                 = VK_STRUCTURE_TYPE_DEVICE_CREATE_INFO;
>+    device_info.pNext                 = NULL;
>+    device_info.queueCreateInfoCount  = 1;
>+    device_info.pQueueCreateInfos     = &queue_info;
>+    device_info.enabledExtensionCount = info.device_extension_names.size();
>+    device_info.ppEnabledExtensionNames =
>+        device_info.enabledExtensionCount ? info.device_extension_names.data() : NULL;
>+    device_info.pEnabledFeatures = NULL;
>+
>+    res = vkCreateDevice(info.gpus[0], &device_info, NULL, &info.device);
>+    assert(res == VK_SUCCESS);
>+
>+    return res;
>+}
>+
>+void init_command_pool(struct sample_info &info, VkCommandPoolCreateFlags cmd_pool_create_flags)
>+{
>+    /* DEPENDS on init_swapchain_extension() */
>+    VkResult res;
>+
>+    VkCommandPoolCreateInfo cmd_pool_info = {};
>+    cmd_pool_info.sType                   = VK_STRUCTURE_TYPE_COMMAND_POOL_CREATE_INFO;
>+    cmd_pool_info.pNext                   = NULL;
>+    cmd_pool_info.queueFamilyIndex        = info.graphics_queue_family_index;
>+    cmd_pool_info.flags                   = cmd_pool_create_flags;
>+
>+    res = vkCreateCommandPool(info.device, &cmd_pool_info, NULL, &info.cmd_pool);
>+    assert(res == VK_SUCCESS);
>+}
>+
>+void init_command_buffer(struct sample_info &info)
>+{
>+    /* DEPENDS on init_swapchain_extension() and init_command_pool() */
>+    VkResult res;
>+
>+    VkCommandBufferAllocateInfo cmd = {};
>+    cmd.sType                       = VK_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOCATE_INFO;
>+    cmd.pNext                       = NULL;
>+    cmd.commandPool                 = info.cmd_pool;
>+    cmd.level                       = VK_COMMAND_BUFFER_LEVEL_PRIMARY;
>+    cmd.commandBufferCount          = 1;
>+
>+    res = vkAllocateCommandBuffers(info.device, &cmd, &info.cmd);
>+    assert(res == VK_SUCCESS);
>+}
>+
>+void init_command_buffer_array(struct sample_info &info, int numBuffers)
>+{
>+    /* DEPENDS on init_swapchain_extension() and init_command_pool() */
>+    VkResult res;
>+    info.cmds.resize(numBuffers);
>+    assert(info.cmds.data() != NULL);
>+
>+    VkCommandBufferAllocateInfo cmd = {};
>+    cmd.sType                       = VK_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOCATE_INFO;
>+    cmd.pNext                       = NULL;
>+    cmd.commandPool                 = info.cmd_pool;
>+    cmd.level                       = VK_COMMAND_BUFFER_LEVEL_PRIMARY;
>+    cmd.commandBufferCount          = numBuffers;
>+
>+    res = vkAllocateCommandBuffers(info.device, &cmd, info.cmds.data());
>+    assert(res == VK_SUCCESS);
>+}
>+
>+void init_command_buffer2_array(struct sample_info &info, int numBuffers)
>+{
>+    /* DEPENDS on init_swapchain_extension() and init_command_pool() */
>+    VkResult res;
>+    info.cmd2s.resize(numBuffers);
>+    VkCommandBufferAllocateInfo cmd = {};
>+    cmd.sType                       = VK_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOCATE_INFO;
>+    cmd.pNext                       = NULL;
>+    cmd.commandPool                 = info.cmd_pool;
>+    cmd.level                       = VK_COMMAND_BUFFER_LEVEL_SECONDARY;
>+    cmd.commandBufferCount          = numBuffers;
>+
>+    res = vkAllocateCommandBuffers(info.device, &cmd, info.cmd2s.data());
>+    assert(res == VK_SUCCESS);
>+}
>+
>+void init_device_queue(struct sample_info &info)
>+{
>+    /* DEPENDS on init_swapchain_extension() */
>+
>+    vkGetDeviceQueue(info.device, info.graphics_queue_family_index, 0, &info.graphics_queue);
>+    if (info.graphics_queue_family_index == info.present_queue_family_index)
>+    {
>+        info.present_queue = info.graphics_queue;
>+    }
>+    else
>+    {
>+        vkGetDeviceQueue(info.device, info.present_queue_family_index, 0, &info.present_queue);
>+    }
>+}
>+
>+void init_swap_chain(struct sample_info &info, VkImageUsageFlags usageFlags)
>+{
>+    /* DEPENDS on info.cmd and info.queue initialized */
>+
>+    VkResult res;
>+    VkSurfaceCapabilitiesKHR surfCapabilities;
>+
>+    res = vkGetPhysicalDeviceSurfaceCapabilitiesKHR(info.gpus[0], info.surface, &surfCapabilities);
>+    assert(res == VK_SUCCESS);
>+
>+    uint32_t presentModeCount;
>+    res = vkGetPhysicalDeviceSurfacePresentModesKHR(info.gpus[0], info.surface, &presentModeCount,
>+                                                    NULL);
>+    assert(res == VK_SUCCESS);
>+    VkPresentModeKHR *presentModes =
>+        (VkPresentModeKHR *)malloc(presentModeCount * sizeof(VkPresentModeKHR));
>+    assert(presentModes);
>+    res = vkGetPhysicalDeviceSurfacePresentModesKHR(info.gpus[0], info.surface, &presentModeCount,
>+                                                    presentModes);
>+    assert(res == VK_SUCCESS);
>+
>+    VkExtent2D swapchainExtent;
>+    // width and height are either both 0xFFFFFFFF, or both not 0xFFFFFFFF.
>+    if (surfCapabilities.currentExtent.width == 0xFFFFFFFF)
>+    {
>+        // If the surface size is undefined, the size is set to
>+        // the size of the images requested.
>+        swapchainExtent.width  = info.width;
>+        swapchainExtent.height = info.height;
>+        if (swapchainExtent.width < surfCapabilities.minImageExtent.width)
>+        {
>+            swapchainExtent.width = surfCapabilities.minImageExtent.width;
>+        }
>+        else if (swapchainExtent.width > surfCapabilities.maxImageExtent.width)
>+        {
>+            swapchainExtent.width = surfCapabilities.maxImageExtent.width;
>+        }
>+
>+        if (swapchainExtent.height < surfCapabilities.minImageExtent.height)
>+        {
>+            swapchainExtent.height = surfCapabilities.minImageExtent.height;
>+        }
>+        else if (swapchainExtent.height > surfCapabilities.maxImageExtent.height)
>+        {
>+            swapchainExtent.height = surfCapabilities.maxImageExtent.height;
>+        }
>+    }
>+    else
>+    {
>+        // If the surface size is defined, the swap chain size must match
>+        swapchainExtent = surfCapabilities.currentExtent;
>+    }
>+
>+    // The FIFO present mode is guaranteed by the spec to be supported
>+    // Also note that current Android driver only supports FIFO
>+    VkPresentModeKHR swapchainPresentMode = VK_PRESENT_MODE_FIFO_KHR;
>+
>+    for (uint32_t presentModeIndex = 0; presentModeIndex < presentModeCount; ++presentModeIndex)
>+    {
>+        if (presentModes[presentModeIndex] == VK_PRESENT_MODE_IMMEDIATE_KHR)
>+        {
>+            swapchainPresentMode = VK_PRESENT_MODE_IMMEDIATE_KHR;
>+            break;
>+        }
>+    }
>+
>+    // Determine the number of VkImage's to use in the swap chain.
>+    // We need to acquire only 1 presentable image at at time.
>+    // Asking for minImageCount images ensures that we can acquire
>+    // 1 presentable image as long as we present it before attempting
>+    // to acquire another.
>+    uint32_t desiredNumberOfSwapChainImages = surfCapabilities.minImageCount;
>+
>+    VkSurfaceTransformFlagBitsKHR preTransform;
>+    if (surfCapabilities.supportedTransforms & VK_SURFACE_TRANSFORM_IDENTITY_BIT_KHR)
>+    {
>+        preTransform = VK_SURFACE_TRANSFORM_IDENTITY_BIT_KHR;
>+    }
>+    else
>+    {
>+        preTransform = surfCapabilities.currentTransform;
>+    }
>+
>+    // Find a supported composite alpha mode - one of these is guaranteed to be set
>+    VkCompositeAlphaFlagBitsKHR compositeAlpha         = VK_COMPOSITE_ALPHA_OPAQUE_BIT_KHR;
>+    VkCompositeAlphaFlagBitsKHR compositeAlphaFlags[4] = {
>+        VK_COMPOSITE_ALPHA_OPAQUE_BIT_KHR,
>+        VK_COMPOSITE_ALPHA_PRE_MULTIPLIED_BIT_KHR,
>+        VK_COMPOSITE_ALPHA_POST_MULTIPLIED_BIT_KHR,
>+        VK_COMPOSITE_ALPHA_INHERIT_BIT_KHR,
>+    };
>+    for (uint32_t i = 0; i < sizeof(compositeAlphaFlags); i++)
>+    {
>+        if (surfCapabilities.supportedCompositeAlpha & compositeAlphaFlags[i])
>+        {
>+            compositeAlpha = compositeAlphaFlags[i];
>+            break;
>+        }
>+    }
>+
>+    VkSwapchainCreateInfoKHR swapchain_ci = {};
>+    swapchain_ci.sType                    = VK_STRUCTURE_TYPE_SWAPCHAIN_CREATE_INFO_KHR;
>+    swapchain_ci.pNext                    = NULL;
>+    swapchain_ci.surface                  = info.surface;
>+    swapchain_ci.minImageCount            = desiredNumberOfSwapChainImages;
>+    swapchain_ci.imageFormat              = info.format;
>+    swapchain_ci.imageExtent.width        = swapchainExtent.width;
>+    swapchain_ci.imageExtent.height       = swapchainExtent.height;
>+    swapchain_ci.preTransform             = preTransform;
>+    swapchain_ci.compositeAlpha           = compositeAlpha;
>+    swapchain_ci.imageArrayLayers         = 1;
>+    swapchain_ci.presentMode              = swapchainPresentMode;
>+    swapchain_ci.oldSwapchain             = VK_NULL_HANDLE;
>+#ifndef __ANDROID__
>+    swapchain_ci.clipped = true;
>+#else
>+    swapchain_ci.clipped = false;
>+#endif
>+    swapchain_ci.imageColorSpace       = VK_COLORSPACE_SRGB_NONLINEAR_KHR;
>+    swapchain_ci.imageUsage            = usageFlags;
>+    swapchain_ci.imageSharingMode      = VK_SHARING_MODE_EXCLUSIVE;
>+    swapchain_ci.queueFamilyIndexCount = 0;
>+    swapchain_ci.pQueueFamilyIndices   = NULL;
>+    uint32_t queueFamilyIndices[2]     = {(uint32_t)info.graphics_queue_family_index,
>+                                      (uint32_t)info.present_queue_family_index};
>+    if (info.graphics_queue_family_index != info.present_queue_family_index)
>+    {
>+        // If the graphics and present queues are from different queue families,
>+        // we either have to explicitly transfer ownership of images between the
>+        // queues, or we have to create the swapchain with imageSharingMode
>+        // as VK_SHARING_MODE_CONCURRENT
>+        swapchain_ci.imageSharingMode      = VK_SHARING_MODE_CONCURRENT;
>+        swapchain_ci.queueFamilyIndexCount = 2;
>+        swapchain_ci.pQueueFamilyIndices   = queueFamilyIndices;
>+    }
>+
>+    res = vkCreateSwapchainKHR(info.device, &swapchain_ci, NULL, &info.swap_chain);
>+    assert(res == VK_SUCCESS);
>+
>+    res = vkGetSwapchainImagesKHR(info.device, info.swap_chain, &info.swapchainImageCount, NULL);
>+    assert(res == VK_SUCCESS);
>+
>+    VkImage *swapchainImages = (VkImage *)malloc(info.swapchainImageCount * sizeof(VkImage));
>+    assert(swapchainImages);
>+    res = vkGetSwapchainImagesKHR(info.device, info.swap_chain, &info.swapchainImageCount,
>+                                  swapchainImages);
>+    assert(res == VK_SUCCESS);
>+
>+    for (uint32_t i = 0; i < info.swapchainImageCount; i++)
>+    {
>+        swap_chain_buffer sc_buffer;
>+
>+        VkImageViewCreateInfo color_image_view           = {};
>+        color_image_view.sType                           = VK_STRUCTURE_TYPE_IMAGE_VIEW_CREATE_INFO;
>+        color_image_view.pNext                           = NULL;
>+        color_image_view.format                          = info.format;
>+        color_image_view.components.r                    = VK_COMPONENT_SWIZZLE_R;
>+        color_image_view.components.g                    = VK_COMPONENT_SWIZZLE_G;
>+        color_image_view.components.b                    = VK_COMPONENT_SWIZZLE_B;
>+        color_image_view.components.a                    = VK_COMPONENT_SWIZZLE_A;
>+        color_image_view.subresourceRange.aspectMask     = VK_IMAGE_ASPECT_COLOR_BIT;
>+        color_image_view.subresourceRange.baseMipLevel   = 0;
>+        color_image_view.subresourceRange.levelCount     = 1;
>+        color_image_view.subresourceRange.baseArrayLayer = 0;
>+        color_image_view.subresourceRange.layerCount     = 1;
>+        color_image_view.viewType                        = VK_IMAGE_VIEW_TYPE_2D;
>+        color_image_view.flags                           = 0;
>+
>+        sc_buffer.image = swapchainImages[i];
>+
>+        color_image_view.image = sc_buffer.image;
>+
>+        res = vkCreateImageView(info.device, &color_image_view, NULL, &sc_buffer.view);
>+        info.buffers.push_back(sc_buffer);
>+        assert(res == VK_SUCCESS);
>+    }
>+    free(swapchainImages);
>+    info.current_buffer = 0;
>+
>+    if (NULL != presentModes)
>+    {
>+        free(presentModes);
>+    }
>+}
>+
>+bool memory_type_from_properties(struct sample_info &info,
>+                                 uint32_t typeBits,
>+                                 VkFlags requirements_mask,
>+                                 uint32_t *typeIndex)
>+{
>+    // Search memtypes to find first index with those properties
>+    for (uint32_t i = 0; i < info.memory_properties.memoryTypeCount; i++)
>+    {
>+        if ((typeBits & 1) == 1)
>+        {
>+            // Type is available, does it match user properties?
>+            if ((info.memory_properties.memoryTypes[i].propertyFlags & requirements_mask) ==
>+                requirements_mask)
>+            {
>+                *typeIndex = i;
>+                return true;
>+            }
>+        }
>+        typeBits >>= 1;
>+    }
>+    // No memory types matched, return failure
>+    return false;
>+}
>+
>+void init_depth_buffer(struct sample_info &info)
>+{
>+    VkResult res;
>+    bool pass;
>+    VkImageCreateInfo image_info = {};
>+
>+/* allow custom depth formats */
>+#ifdef __ANDROID__
>+    // Depth format needs to be VK_FORMAT_D24_UNORM_S8_UINT on Android.
>+    info.depth.format = VK_FORMAT_D24_UNORM_S8_UINT;
>+#else
>+    if (info.depth.format == VK_FORMAT_UNDEFINED)
>+        info.depth.format = VK_FORMAT_D16_UNORM;
>+#endif
>+
>+    const VkFormat depth_format = info.depth.format;
>+    VkFormatProperties props;
>+    vkGetPhysicalDeviceFormatProperties(info.gpus[0], depth_format, &props);
>+    if (props.linearTilingFeatures & VK_FORMAT_FEATURE_DEPTH_STENCIL_ATTACHMENT_BIT)
>+    {
>+        image_info.tiling = VK_IMAGE_TILING_LINEAR;
>+    }
>+    else if (props.optimalTilingFeatures & VK_FORMAT_FEATURE_DEPTH_STENCIL_ATTACHMENT_BIT)
>+    {
>+        image_info.tiling = VK_IMAGE_TILING_OPTIMAL;
>+    }
>+    else
>+    {
>+        /* Try other depth formats? */
>+        std::cout << "depth_format " << depth_format << " Unsupported.\n";
>+        exit(-1);
>+    }
>+
>+    image_info.sType                 = VK_STRUCTURE_TYPE_IMAGE_CREATE_INFO;
>+    image_info.pNext                 = NULL;
>+    image_info.imageType             = VK_IMAGE_TYPE_2D;
>+    image_info.format                = depth_format;
>+    image_info.extent.width          = info.width;
>+    image_info.extent.height         = info.height;
>+    image_info.extent.depth          = 1;
>+    image_info.mipLevels             = 1;
>+    image_info.arrayLayers           = 1;
>+    image_info.samples               = NUM_SAMPLES;
>+    image_info.initialLayout         = VK_IMAGE_LAYOUT_UNDEFINED;
>+    image_info.queueFamilyIndexCount = 0;
>+    image_info.pQueueFamilyIndices   = NULL;
>+    image_info.sharingMode           = VK_SHARING_MODE_EXCLUSIVE;
>+    image_info.usage                 = VK_IMAGE_USAGE_DEPTH_STENCIL_ATTACHMENT_BIT;
>+    image_info.flags                 = 0;
>+
>+    VkMemoryAllocateInfo mem_alloc = {};
>+    mem_alloc.sType                = VK_STRUCTURE_TYPE_MEMORY_ALLOCATE_INFO;
>+    mem_alloc.pNext                = NULL;
>+    mem_alloc.allocationSize       = 0;
>+    mem_alloc.memoryTypeIndex      = 0;
>+
>+    VkImageViewCreateInfo view_info           = {};
>+    view_info.sType                           = VK_STRUCTURE_TYPE_IMAGE_VIEW_CREATE_INFO;
>+    view_info.pNext                           = NULL;
>+    view_info.image                           = VK_NULL_HANDLE;
>+    view_info.format                          = depth_format;
>+    view_info.components.r                    = VK_COMPONENT_SWIZZLE_R;
>+    view_info.components.g                    = VK_COMPONENT_SWIZZLE_G;
>+    view_info.components.b                    = VK_COMPONENT_SWIZZLE_B;
>+    view_info.components.a                    = VK_COMPONENT_SWIZZLE_A;
>+    view_info.subresourceRange.aspectMask     = VK_IMAGE_ASPECT_DEPTH_BIT;
>+    view_info.subresourceRange.baseMipLevel   = 0;
>+    view_info.subresourceRange.levelCount     = 1;
>+    view_info.subresourceRange.baseArrayLayer = 0;
>+    view_info.subresourceRange.layerCount     = 1;
>+    view_info.viewType                        = VK_IMAGE_VIEW_TYPE_2D;
>+    view_info.flags                           = 0;
>+
>+    if (depth_format == VK_FORMAT_D16_UNORM_S8_UINT ||
>+        depth_format == VK_FORMAT_D24_UNORM_S8_UINT || depth_format == VK_FORMAT_D32_SFLOAT_S8_UINT)
>+    {
>+        view_info.subresourceRange.aspectMask |= VK_IMAGE_ASPECT_STENCIL_BIT;
>+    }
>+
>+    VkMemoryRequirements mem_reqs;
>+
>+    /* Create image */
>+    res = vkCreateImage(info.device, &image_info, NULL, &info.depth.image);
>+    assert(res == VK_SUCCESS);
>+
>+    vkGetImageMemoryRequirements(info.device, info.depth.image, &mem_reqs);
>+
>+    mem_alloc.allocationSize = mem_reqs.size;
>+    /* Use the memory properties to determine the type of memory required */
>+    pass = memory_type_from_properties(info, mem_reqs.memoryTypeBits,
>+                                       VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT,
>+                                       &mem_alloc.memoryTypeIndex);
>+    assert(pass);
>+
>+    /* Allocate memory */
>+    res = vkAllocateMemory(info.device, &mem_alloc, NULL, &info.depth.mem);
>+    assert(res == VK_SUCCESS);
>+
>+    /* Bind memory */
>+    res = vkBindImageMemory(info.device, info.depth.image, info.depth.mem, 0);
>+    assert(res == VK_SUCCESS);
>+
>+    /* Create image view */
>+    view_info.image = info.depth.image;
>+    res             = vkCreateImageView(info.device, &view_info, NULL, &info.depth.view);
>+    assert(res == VK_SUCCESS);
>+}
>+
>+void init_uniform_buffer(struct sample_info &info)
>+{
>+    VkResult res;
>+    bool pass;
>+
>+    info.MVP = {1.0f, 0.0f, 0.0f, 0.0f, 0.0f, -1.0f, 0.0f, 0.0f,
>+                0.0f, 0.0f, 0.5f, 0.0f, 0.0f, 0.0f,  0.5f, 1.0f};
>+
>+    /* VULKAN_KEY_START */
>+    VkBufferCreateInfo buf_info    = {};
>+    buf_info.sType                 = VK_STRUCTURE_TYPE_BUFFER_CREATE_INFO;
>+    buf_info.pNext                 = NULL;
>+    buf_info.usage                 = VK_BUFFER_USAGE_UNIFORM_BUFFER_BIT;
>+    buf_info.size                  = sizeof(float) * 16;  // info.MVP.data() size
>+    buf_info.queueFamilyIndexCount = 0;
>+    buf_info.pQueueFamilyIndices   = NULL;
>+    buf_info.sharingMode           = VK_SHARING_MODE_EXCLUSIVE;
>+    buf_info.flags                 = 0;
>+    res = vkCreateBuffer(info.device, &buf_info, NULL, &info.uniform_data.buf);
>+    assert(res == VK_SUCCESS);
>+
>+    VkMemoryRequirements mem_reqs;
>+    vkGetBufferMemoryRequirements(info.device, info.uniform_data.buf, &mem_reqs);
>+
>+    VkMemoryAllocateInfo alloc_info = {};
>+    alloc_info.sType                = VK_STRUCTURE_TYPE_MEMORY_ALLOCATE_INFO;
>+    alloc_info.pNext                = NULL;
>+    alloc_info.memoryTypeIndex      = 0;
>+
>+    alloc_info.allocationSize = mem_reqs.size;
>+    pass                      = memory_type_from_properties(
>+        info, mem_reqs.memoryTypeBits,
>+        VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT | VK_MEMORY_PROPERTY_HOST_COHERENT_BIT,
>+        &alloc_info.memoryTypeIndex);
>+    assert(pass && "No mappable, coherent memory");
>+
>+    res = vkAllocateMemory(info.device, &alloc_info, NULL, &(info.uniform_data.mem));
>+    assert(res == VK_SUCCESS);
>+
>+    uint8_t *pData;
>+    res = vkMapMemory(info.device, info.uniform_data.mem, 0, mem_reqs.size, 0, (void **)&pData);
>+    assert(res == VK_SUCCESS);
>+
>+    memcpy(pData, info.MVP.data(), sizeof(float) * 16);  // info.MVP.data() size
>+
>+    vkUnmapMemory(info.device, info.uniform_data.mem);
>+
>+    res = vkBindBufferMemory(info.device, info.uniform_data.buf, info.uniform_data.mem, 0);
>+    assert(res == VK_SUCCESS);
>+
>+    info.uniform_data.buffer_info.buffer = info.uniform_data.buf;
>+    info.uniform_data.buffer_info.offset = 0;
>+    info.uniform_data.buffer_info.range  = sizeof(float) * 16;  // info.MVP.data() size
>+}
>+
>+void init_descriptor_and_pipeline_layouts(struct sample_info &info,
>+                                          bool use_texture,
>+                                          VkDescriptorSetLayoutCreateFlags descSetLayoutCreateFlags)
>+{
>+    VkDescriptorSetLayoutBinding layout_bindings[2];
>+    layout_bindings[0].binding            = 0;
>+    layout_bindings[0].descriptorType     = VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER;
>+    layout_bindings[0].descriptorCount    = 1;
>+    layout_bindings[0].stageFlags         = VK_SHADER_STAGE_VERTEX_BIT;
>+    layout_bindings[0].pImmutableSamplers = NULL;
>+
>+    if (use_texture)
>+    {
>+        layout_bindings[1].binding            = 1;
>+        layout_bindings[1].descriptorType     = VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER;
>+        layout_bindings[1].descriptorCount    = 1;
>+        layout_bindings[1].stageFlags         = VK_SHADER_STAGE_FRAGMENT_BIT;
>+        layout_bindings[1].pImmutableSamplers = NULL;
>+    }
>+
>+    /* Next take layout bindings and use them to create a descriptor set layout
>+     */
>+    VkDescriptorSetLayoutCreateInfo descriptor_layout = {};
>+    descriptor_layout.sType        = VK_STRUCTURE_TYPE_DESCRIPTOR_SET_LAYOUT_CREATE_INFO;
>+    descriptor_layout.pNext        = NULL;
>+    descriptor_layout.flags        = descSetLayoutCreateFlags;
>+    descriptor_layout.bindingCount = use_texture ? 2 : 1;
>+    descriptor_layout.pBindings    = layout_bindings;
>+
>+    VkResult res;
>+
>+    info.desc_layout.resize(NUM_DESCRIPTOR_SETS);
>+    res =
>+        vkCreateDescriptorSetLayout(info.device, &descriptor_layout, NULL, info.desc_layout.data());
>+    assert(res == VK_SUCCESS);
>+
>+    /* Now use the descriptor layout to create a pipeline layout */
>+    VkPipelineLayoutCreateInfo pPipelineLayoutCreateInfo = {};
>+    pPipelineLayoutCreateInfo.sType = VK_STRUCTURE_TYPE_PIPELINE_LAYOUT_CREATE_INFO;
>+    pPipelineLayoutCreateInfo.pNext = NULL;
>+    pPipelineLayoutCreateInfo.pushConstantRangeCount = 0;
>+    pPipelineLayoutCreateInfo.pPushConstantRanges    = NULL;
>+    pPipelineLayoutCreateInfo.setLayoutCount         = NUM_DESCRIPTOR_SETS;
>+    pPipelineLayoutCreateInfo.pSetLayouts            = info.desc_layout.data();
>+
>+    res = vkCreatePipelineLayout(info.device, &pPipelineLayoutCreateInfo, NULL,
>+                                 &info.pipeline_layout);
>+    assert(res == VK_SUCCESS);
>+}
>+
>+void init_renderpass(struct sample_info &info,
>+                     bool include_depth,
>+                     bool clear,
>+                     VkImageLayout finalLayout)
>+{
>+    /* DEPENDS on init_swap_chain() and init_depth_buffer() */
>+
>+    VkResult res;
>+    /* Need attachments for render target and depth buffer */
>+    VkAttachmentDescription attachments[2];
>+    attachments[0].format        = info.format;
>+    attachments[0].samples       = NUM_SAMPLES;
>+    attachments[0].loadOp        = clear ? VK_ATTACHMENT_LOAD_OP_CLEAR : VK_ATTACHMENT_LOAD_OP_LOAD;
>+    attachments[0].storeOp       = VK_ATTACHMENT_STORE_OP_STORE;
>+    attachments[0].stencilLoadOp = VK_ATTACHMENT_LOAD_OP_DONT_CARE;
>+    attachments[0].stencilStoreOp = VK_ATTACHMENT_STORE_OP_DONT_CARE;
>+    attachments[0].initialLayout  = VK_IMAGE_LAYOUT_UNDEFINED;
>+    attachments[0].finalLayout    = finalLayout;
>+    attachments[0].flags          = 0;
>+
>+    if (include_depth)
>+    {
>+        attachments[1].format  = info.depth.format;
>+        attachments[1].samples = NUM_SAMPLES;
>+        attachments[1].loadOp  = clear ? VK_ATTACHMENT_LOAD_OP_CLEAR : VK_ATTACHMENT_LOAD_OP_LOAD;
>+        attachments[1].storeOp = VK_ATTACHMENT_STORE_OP_STORE;
>+        attachments[1].stencilLoadOp  = VK_ATTACHMENT_LOAD_OP_LOAD;
>+        attachments[1].stencilStoreOp = VK_ATTACHMENT_STORE_OP_STORE;
>+        attachments[1].initialLayout  = VK_IMAGE_LAYOUT_UNDEFINED;
>+        attachments[1].finalLayout    = VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL;
>+        attachments[1].flags          = 0;
>+    }
>+
>+    VkAttachmentReference color_reference = {};
>+    color_reference.attachment            = 0;
>+    color_reference.layout                = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL;
>+
>+    VkAttachmentReference depth_reference = {};
>+    depth_reference.attachment            = 1;
>+    depth_reference.layout                = VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL;
>+
>+    VkSubpassDescription subpass    = {};
>+    subpass.pipelineBindPoint       = VK_PIPELINE_BIND_POINT_GRAPHICS;
>+    subpass.flags                   = 0;
>+    subpass.inputAttachmentCount    = 0;
>+    subpass.pInputAttachments       = NULL;
>+    subpass.colorAttachmentCount    = 1;
>+    subpass.pColorAttachments       = &color_reference;
>+    subpass.pResolveAttachments     = NULL;
>+    subpass.pDepthStencilAttachment = include_depth ? &depth_reference : NULL;
>+    subpass.preserveAttachmentCount = 0;
>+    subpass.pPreserveAttachments    = NULL;
>+
>+    VkRenderPassCreateInfo rp_info = {};
>+    rp_info.sType                  = VK_STRUCTURE_TYPE_RENDER_PASS_CREATE_INFO;
>+    rp_info.pNext                  = NULL;
>+    rp_info.attachmentCount        = include_depth ? 2 : 1;
>+    rp_info.pAttachments           = attachments;
>+    rp_info.subpassCount           = 1;
>+    rp_info.pSubpasses             = &subpass;
>+    rp_info.dependencyCount        = 0;
>+    rp_info.pDependencies          = NULL;
>+
>+    res = vkCreateRenderPass(info.device, &rp_info, NULL, &info.render_pass);
>+    assert(res == VK_SUCCESS);
>+}
>+
>+void init_framebuffers(struct sample_info &info, bool include_depth)
>+{
>+    /* DEPENDS on init_depth_buffer(), init_renderpass() and
>+     * init_swapchain_extension() */
>+
>+    VkResult res;
>+    VkImageView attachments[2];
>+    attachments[1] = info.depth.view;
>+
>+    VkFramebufferCreateInfo fb_info = {};
>+    fb_info.sType                   = VK_STRUCTURE_TYPE_FRAMEBUFFER_CREATE_INFO;
>+    fb_info.pNext                   = NULL;
>+    fb_info.renderPass              = info.render_pass;
>+    fb_info.attachmentCount         = include_depth ? 2 : 1;
>+    fb_info.pAttachments            = attachments;
>+    fb_info.width                   = info.width;
>+    fb_info.height                  = info.height;
>+    fb_info.layers                  = 1;
>+
>+    uint32_t i;
>+
>+    info.framebuffers = (VkFramebuffer *)malloc(info.swapchainImageCount * sizeof(VkFramebuffer));
>+
>+    for (i = 0; i < info.swapchainImageCount; i++)
>+    {
>+        attachments[0] = info.buffers[i].view;
>+        res            = vkCreateFramebuffer(info.device, &fb_info, NULL, &info.framebuffers[i]);
>+        assert(res == VK_SUCCESS);
>+    }
>+}
>+
>+void init_vertex_buffer(struct sample_info &info,
>+                        const void *vertexData,
>+                        uint32_t dataSize,
>+                        uint32_t dataStride,
>+                        bool use_texture)
>+{
>+    VkResult res;
>+    bool pass;
>+
>+    VkBufferCreateInfo buf_info    = {};
>+    buf_info.sType                 = VK_STRUCTURE_TYPE_BUFFER_CREATE_INFO;
>+    buf_info.pNext                 = NULL;
>+    buf_info.usage                 = VK_BUFFER_USAGE_VERTEX_BUFFER_BIT;
>+    buf_info.size                  = dataSize;
>+    buf_info.queueFamilyIndexCount = 0;
>+    buf_info.pQueueFamilyIndices   = NULL;
>+    buf_info.sharingMode           = VK_SHARING_MODE_EXCLUSIVE;
>+    buf_info.flags                 = 0;
>+    res = vkCreateBuffer(info.device, &buf_info, NULL, &info.vertex_buffer.buf);
>+    assert(res == VK_SUCCESS);
>+
>+    VkMemoryRequirements mem_reqs;
>+    vkGetBufferMemoryRequirements(info.device, info.vertex_buffer.buf, &mem_reqs);
>+
>+    VkMemoryAllocateInfo alloc_info = {};
>+    alloc_info.sType                = VK_STRUCTURE_TYPE_MEMORY_ALLOCATE_INFO;
>+    alloc_info.pNext                = NULL;
>+    alloc_info.memoryTypeIndex      = 0;
>+
>+    alloc_info.allocationSize = mem_reqs.size;
>+    pass                      = memory_type_from_properties(
>+        info, mem_reqs.memoryTypeBits,
>+        VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT | VK_MEMORY_PROPERTY_HOST_COHERENT_BIT,
>+        &alloc_info.memoryTypeIndex);
>+    assert(pass && "No mappable, coherent memory");
>+
>+    res = vkAllocateMemory(info.device, &alloc_info, NULL, &(info.vertex_buffer.mem));
>+    assert(res == VK_SUCCESS);
>+    info.vertex_buffer.buffer_info.range  = mem_reqs.size;
>+    info.vertex_buffer.buffer_info.offset = 0;
>+
>+    uint8_t *pData;
>+    res = vkMapMemory(info.device, info.vertex_buffer.mem, 0, mem_reqs.size, 0, (void **)&pData);
>+    assert(res == VK_SUCCESS);
>+
>+    memcpy(pData, vertexData, dataSize);
>+
>+    vkUnmapMemory(info.device, info.vertex_buffer.mem);
>+
>+    res = vkBindBufferMemory(info.device, info.vertex_buffer.buf, info.vertex_buffer.mem, 0);
>+    assert(res == VK_SUCCESS);
>+
>+    info.vi_binding.binding   = 0;
>+    info.vi_binding.inputRate = VK_VERTEX_INPUT_RATE_VERTEX;
>+    info.vi_binding.stride    = dataStride;
>+
>+    info.vi_attribs[0].binding  = 0;
>+    info.vi_attribs[0].location = 0;
>+    info.vi_attribs[0].format   = VK_FORMAT_R32G32B32A32_SFLOAT;
>+    info.vi_attribs[0].offset   = 0;
>+    info.vi_attribs[1].binding  = 0;
>+    info.vi_attribs[1].location = 1;
>+    info.vi_attribs[1].format =
>+        use_texture ? VK_FORMAT_R32G32_SFLOAT : VK_FORMAT_R32G32B32A32_SFLOAT;
>+    info.vi_attribs[1].offset = 16;
>+}
>+
>+void init_descriptor_pool(struct sample_info &info, bool use_texture)
>+{
>+    /* DEPENDS on init_uniform_buffer() and
>+     * init_descriptor_and_pipeline_layouts() */
>+
>+    VkResult res;
>+    VkDescriptorPoolSize type_count[2];
>+    type_count[0].type            = VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER;
>+    type_count[0].descriptorCount = 1;
>+    if (use_texture)
>+    {
>+        type_count[1].type            = VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER;
>+        type_count[1].descriptorCount = 1;
>+    }
>+
>+    VkDescriptorPoolCreateInfo descriptor_pool = {};
>+    descriptor_pool.sType                      = VK_STRUCTURE_TYPE_DESCRIPTOR_POOL_CREATE_INFO;
>+    descriptor_pool.pNext                      = NULL;
>+    descriptor_pool.maxSets                    = 1;
>+    descriptor_pool.poolSizeCount              = use_texture ? 2 : 1;
>+    descriptor_pool.pPoolSizes                 = type_count;
>+
>+    res = vkCreateDescriptorPool(info.device, &descriptor_pool, NULL, &info.desc_pool);
>+    assert(res == VK_SUCCESS);
>+}
>+
>+void init_descriptor_set(struct sample_info &info)
>+{
>+    /* DEPENDS on init_descriptor_pool() */
>+
>+    VkResult res;
>+
>+    VkDescriptorSetAllocateInfo alloc_info[1];
>+    alloc_info[0].sType              = VK_STRUCTURE_TYPE_DESCRIPTOR_SET_ALLOCATE_INFO;
>+    alloc_info[0].pNext              = NULL;
>+    alloc_info[0].descriptorPool     = info.desc_pool;
>+    alloc_info[0].descriptorSetCount = NUM_DESCRIPTOR_SETS;
>+    alloc_info[0].pSetLayouts        = info.desc_layout.data();
>+
>+    info.desc_set.resize(NUM_DESCRIPTOR_SETS);
>+    res = vkAllocateDescriptorSets(info.device, alloc_info, info.desc_set.data());
>+    assert(res == VK_SUCCESS);
>+
>+    VkWriteDescriptorSet writes[2];
>+
>+    writes[0]                 = {};
>+    writes[0].sType           = VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET;
>+    writes[0].pNext           = NULL;
>+    writes[0].dstSet          = info.desc_set[0];
>+    writes[0].descriptorCount = 1;
>+    writes[0].descriptorType  = VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER;
>+    writes[0].pBufferInfo     = &info.uniform_data.buffer_info;
>+    writes[0].dstArrayElement = 0;
>+    writes[0].dstBinding      = 0;
>+
>+    vkUpdateDescriptorSets(info.device, 1, writes, 0, NULL);
>+}
>+
>+bool GLSLtoSPV(const VkShaderStageFlagBits shader_type,
>+               const char *pshader,
>+               std::vector<unsigned int> &spirv)
>+{
>+    EShLanguage stage = FindLanguage(shader_type);
>+    glslang::TShader shader(stage);
>+    glslang::TProgram program;
>+    const char *shaderStrings[1];
>+    TBuiltInResource Resources;
>+    init_resources(Resources);
>+
>+    // Enable SPIR-V and Vulkan rules when parsing GLSL
>+    EShMessages messages = (EShMessages)(EShMsgSpvRules | EShMsgVulkanRules);
>+
>+    shaderStrings[0] = pshader;
>+    shader.setStrings(shaderStrings, 1);
>+
>+    if (!shader.parse(&Resources, 100, false, messages))
>+    {
>+        puts(shader.getInfoLog());
>+        puts(shader.getInfoDebugLog());
>+        return false;  // something didn't work
>+    }
>+
>+    program.addShader(&shader);
>+
>+    //
>+    // Program-level processing...
>+    //
>+
>+    if (!program.link(messages))
>+    {
>+        puts(shader.getInfoLog());
>+        puts(shader.getInfoDebugLog());
>+        fflush(stdout);
>+        return false;
>+    }
>+
>+    glslang::GlslangToSpv(*program.getIntermediate(stage), spirv);
>+    return true;
>+}
>+
>+void init_shaders(struct sample_info &info, const char *vertShaderText, const char *fragShaderText)
>+{
>+    VkResult res;
>+    bool retVal;
>+
>+    // If no shaders were submitted, just return
>+    if (!(vertShaderText || fragShaderText))
>+        return;
>+
>+    glslang::InitializeProcess();
>+    VkShaderModuleCreateInfo moduleCreateInfo;
>+
>+    if (vertShaderText)
>+    {
>+        std::vector<unsigned int> vtx_spv;
>+        info.shaderStages[0].sType = VK_STRUCTURE_TYPE_PIPELINE_SHADER_STAGE_CREATE_INFO;
>+        info.shaderStages[0].pNext = NULL;
>+        info.shaderStages[0].pSpecializationInfo = NULL;
>+        info.shaderStages[0].flags               = 0;
>+        info.shaderStages[0].stage               = VK_SHADER_STAGE_VERTEX_BIT;
>+        info.shaderStages[0].pName               = "main";
>+
>+        retVal = GLSLtoSPV(VK_SHADER_STAGE_VERTEX_BIT, vertShaderText, vtx_spv);
>+        assert(retVal);
>+
>+        moduleCreateInfo.sType    = VK_STRUCTURE_TYPE_SHADER_MODULE_CREATE_INFO;
>+        moduleCreateInfo.pNext    = NULL;
>+        moduleCreateInfo.flags    = 0;
>+        moduleCreateInfo.codeSize = vtx_spv.size() * sizeof(unsigned int);
>+        moduleCreateInfo.pCode    = vtx_spv.data();
>+        res                       = vkCreateShaderModule(info.device, &moduleCreateInfo, NULL,
>+                                   &info.shaderStages[0].module);
>+        assert(res == VK_SUCCESS);
>+    }
>+
>+    if (fragShaderText)
>+    {
>+        std::vector<unsigned int> frag_spv;
>+        info.shaderStages[1].sType = VK_STRUCTURE_TYPE_PIPELINE_SHADER_STAGE_CREATE_INFO;
>+        info.shaderStages[1].pNext = NULL;
>+        info.shaderStages[1].pSpecializationInfo = NULL;
>+        info.shaderStages[1].flags               = 0;
>+        info.shaderStages[1].stage               = VK_SHADER_STAGE_FRAGMENT_BIT;
>+        info.shaderStages[1].pName               = "main";
>+
>+        retVal = GLSLtoSPV(VK_SHADER_STAGE_FRAGMENT_BIT, fragShaderText, frag_spv);
>+        assert(retVal);
>+
>+        moduleCreateInfo.sType    = VK_STRUCTURE_TYPE_SHADER_MODULE_CREATE_INFO;
>+        moduleCreateInfo.pNext    = NULL;
>+        moduleCreateInfo.flags    = 0;
>+        moduleCreateInfo.codeSize = frag_spv.size() * sizeof(unsigned int);
>+        moduleCreateInfo.pCode    = frag_spv.data();
>+        res                       = vkCreateShaderModule(info.device, &moduleCreateInfo, NULL,
>+                                   &info.shaderStages[1].module);
>+        assert(res == VK_SUCCESS);
>+    }
>+
>+    glslang::FinalizeProcess();
>+}
>+
>+void init_pipeline_cache(struct sample_info &info)
>+{
>+    VkResult res;
>+
>+    VkPipelineCacheCreateInfo pipelineCache;
>+    pipelineCache.sType           = VK_STRUCTURE_TYPE_PIPELINE_CACHE_CREATE_INFO;
>+    pipelineCache.pNext           = NULL;
>+    pipelineCache.initialDataSize = 0;
>+    pipelineCache.pInitialData    = NULL;
>+    pipelineCache.flags           = 0;
>+    res = vkCreatePipelineCache(info.device, &pipelineCache, NULL, &info.pipelineCache);
>+    assert(res == VK_SUCCESS);
>+}
>+
>+void init_pipeline(struct sample_info &info, VkBool32 include_depth, VkBool32 include_vi)
>+{
>+    VkResult res;
>+
>+    VkDynamicState dynamicStateEnables[VK_DYNAMIC_STATE_RANGE_SIZE];
>+    VkPipelineDynamicStateCreateInfo dynamicState = {};
>+    memset(dynamicStateEnables, 0, sizeof dynamicStateEnables);
>+    dynamicState.sType             = VK_STRUCTURE_TYPE_PIPELINE_DYNAMIC_STATE_CREATE_INFO;
>+    dynamicState.pNext             = NULL;
>+    dynamicState.pDynamicStates    = dynamicStateEnables;
>+    dynamicState.dynamicStateCount = 0;
>+
>+    VkPipelineVertexInputStateCreateInfo vi;
>+    memset(&vi, 0, sizeof(vi));
>+    vi.sType = VK_STRUCTURE_TYPE_PIPELINE_VERTEX_INPUT_STATE_CREATE_INFO;
>+    if (include_vi)
>+    {
>+        vi.pNext                           = NULL;
>+        vi.flags                           = 0;
>+        vi.vertexBindingDescriptionCount   = 1;
>+        vi.pVertexBindingDescriptions      = &info.vi_binding;
>+        vi.vertexAttributeDescriptionCount = 2;
>+        vi.pVertexAttributeDescriptions    = info.vi_attribs;
>+    }
>+    VkPipelineInputAssemblyStateCreateInfo ia;
>+    ia.sType                  = VK_STRUCTURE_TYPE_PIPELINE_INPUT_ASSEMBLY_STATE_CREATE_INFO;
>+    ia.pNext                  = NULL;
>+    ia.flags                  = 0;
>+    ia.primitiveRestartEnable = VK_FALSE;
>+    ia.topology               = VK_PRIMITIVE_TOPOLOGY_TRIANGLE_LIST;
>+
>+    VkPipelineRasterizationStateCreateInfo rs;
>+    rs.sType                   = VK_STRUCTURE_TYPE_PIPELINE_RASTERIZATION_STATE_CREATE_INFO;
>+    rs.pNext                   = NULL;
>+    rs.flags                   = 0;
>+    rs.polygonMode             = VK_POLYGON_MODE_FILL;
>+    rs.cullMode                = VK_CULL_MODE_BACK_BIT;
>+    rs.frontFace               = VK_FRONT_FACE_CLOCKWISE;
>+    rs.depthClampEnable        = VK_FALSE;
>+    rs.rasterizerDiscardEnable = VK_FALSE;
>+    rs.depthBiasEnable         = VK_FALSE;
>+    rs.depthBiasConstantFactor = 0;
>+    rs.depthBiasClamp          = 0;
>+    rs.depthBiasSlopeFactor    = 0;
>+    rs.lineWidth               = 1.0f;
>+
>+    VkPipelineColorBlendStateCreateInfo cb;
>+    cb.sType = VK_STRUCTURE_TYPE_PIPELINE_COLOR_BLEND_STATE_CREATE_INFO;
>+    cb.flags = 0;
>+    cb.pNext = NULL;
>+    VkPipelineColorBlendAttachmentState att_state[1];
>+    att_state[0].colorWriteMask      = 0xf;
>+    att_state[0].blendEnable         = VK_FALSE;
>+    att_state[0].alphaBlendOp        = VK_BLEND_OP_ADD;
>+    att_state[0].colorBlendOp        = VK_BLEND_OP_ADD;
>+    att_state[0].srcColorBlendFactor = VK_BLEND_FACTOR_ZERO;
>+    att_state[0].dstColorBlendFactor = VK_BLEND_FACTOR_ZERO;
>+    att_state[0].srcAlphaBlendFactor = VK_BLEND_FACTOR_ZERO;
>+    att_state[0].dstAlphaBlendFactor = VK_BLEND_FACTOR_ZERO;
>+    cb.attachmentCount               = 1;
>+    cb.pAttachments                  = att_state;
>+    cb.logicOpEnable                 = VK_FALSE;
>+    cb.logicOp                       = VK_LOGIC_OP_NO_OP;
>+    cb.blendConstants[0]             = 1.0f;
>+    cb.blendConstants[1]             = 1.0f;
>+    cb.blendConstants[2]             = 1.0f;
>+    cb.blendConstants[3]             = 1.0f;
>+
>+    VkPipelineViewportStateCreateInfo vp = {};
>+    vp.sType                             = VK_STRUCTURE_TYPE_PIPELINE_VIEWPORT_STATE_CREATE_INFO;
>+    vp.pNext                             = NULL;
>+    vp.flags                             = 0;
>+#ifndef __ANDROID__
>+    vp.viewportCount                                      = NUM_VIEWPORTS;
>+    dynamicStateEnables[dynamicState.dynamicStateCount++] = VK_DYNAMIC_STATE_VIEWPORT;
>+    vp.scissorCount                                       = NUM_SCISSORS;
>+    dynamicStateEnables[dynamicState.dynamicStateCount++] = VK_DYNAMIC_STATE_SCISSOR;
>+    vp.pScissors                                          = NULL;
>+    vp.pViewports                                         = NULL;
>+#else
>+    // Temporary disabling dynamic viewport on Android because some of drivers doesn't
>+    // support the feature.
>+    VkViewport viewports;
>+    viewports.minDepth = 0.0f;
>+    viewports.maxDepth = 1.0f;
>+    viewports.x = 0;
>+    viewports.y = 0;
>+    viewports.width = info.width;
>+    viewports.height = info.height;
>+    VkRect2D scissor;
>+    scissor.extent.width = info.width;
>+    scissor.extent.height = info.height;
>+    scissor.offset.x = 0;
>+    scissor.offset.y = 0;
>+    vp.viewportCount = NUM_VIEWPORTS;
>+    vp.scissorCount = NUM_SCISSORS;
>+    vp.pScissors = &scissor;
>+    vp.pViewports = &viewports;
>+#endif
>+    VkPipelineDepthStencilStateCreateInfo ds;
>+    ds.sType                 = VK_STRUCTURE_TYPE_PIPELINE_DEPTH_STENCIL_STATE_CREATE_INFO;
>+    ds.pNext                 = NULL;
>+    ds.flags                 = 0;
>+    ds.depthTestEnable       = include_depth;
>+    ds.depthWriteEnable      = include_depth;
>+    ds.depthCompareOp        = VK_COMPARE_OP_LESS_OR_EQUAL;
>+    ds.depthBoundsTestEnable = VK_FALSE;
>+    ds.stencilTestEnable     = VK_FALSE;
>+    ds.back.failOp           = VK_STENCIL_OP_KEEP;
>+    ds.back.passOp           = VK_STENCIL_OP_KEEP;
>+    ds.back.compareOp        = VK_COMPARE_OP_ALWAYS;
>+    ds.back.compareMask      = 0;
>+    ds.back.reference        = 0;
>+    ds.back.depthFailOp      = VK_STENCIL_OP_KEEP;
>+    ds.back.writeMask        = 0;
>+    ds.minDepthBounds        = 0;
>+    ds.maxDepthBounds        = 0;
>+    ds.stencilTestEnable     = VK_FALSE;
>+    ds.front                 = ds.back;
>+
>+    VkPipelineMultisampleStateCreateInfo ms;
>+    ms.sType                 = VK_STRUCTURE_TYPE_PIPELINE_MULTISAMPLE_STATE_CREATE_INFO;
>+    ms.pNext                 = NULL;
>+    ms.flags                 = 0;
>+    ms.pSampleMask           = NULL;
>+    ms.rasterizationSamples  = NUM_SAMPLES;
>+    ms.sampleShadingEnable   = VK_FALSE;
>+    ms.alphaToCoverageEnable = VK_FALSE;
>+    ms.alphaToOneEnable      = VK_FALSE;
>+    ms.minSampleShading      = 0.0;
>+
>+    VkGraphicsPipelineCreateInfo pipeline;
>+    pipeline.sType               = VK_STRUCTURE_TYPE_GRAPHICS_PIPELINE_CREATE_INFO;
>+    pipeline.pNext               = NULL;
>+    pipeline.layout              = info.pipeline_layout;
>+    pipeline.basePipelineHandle  = VK_NULL_HANDLE;
>+    pipeline.basePipelineIndex   = 0;
>+    pipeline.flags               = 0;
>+    pipeline.pVertexInputState   = &vi;
>+    pipeline.pInputAssemblyState = &ia;
>+    pipeline.pRasterizationState = &rs;
>+    pipeline.pColorBlendState    = &cb;
>+    pipeline.pTessellationState  = NULL;
>+    pipeline.pMultisampleState   = &ms;
>+    pipeline.pDynamicState       = &dynamicState;
>+    pipeline.pViewportState      = &vp;
>+    pipeline.pDepthStencilState  = &ds;
>+    pipeline.pStages             = info.shaderStages;
>+    pipeline.stageCount          = 2;
>+    pipeline.renderPass          = info.render_pass;
>+    pipeline.subpass             = 0;
>+
>+    res = vkCreateGraphicsPipelines(info.device, info.pipelineCache, 1, &pipeline, NULL,
>+                                    &info.pipeline);
>+    assert(res == VK_SUCCESS);
>+}
>+
>+void init_viewports(struct sample_info &info)
>+{
>+#ifdef __ANDROID__
>+// Disable dynamic viewport on Android. Some drive has an issue with the dynamic viewport
>+// feature.
>+#else
>+    info.viewport.height = (float)info.height;
>+    info.viewport.width = (float)info.width;
>+    info.viewport.minDepth = (float)0.0f;
>+    info.viewport.maxDepth = (float)1.0f;
>+    info.viewport.x = 0;
>+    info.viewport.y = 0;
>+    vkCmdSetViewport(info.cmd, 0, NUM_VIEWPORTS, &info.viewport);
>+#endif
>+}
>+
>+void init_viewports_array(struct sample_info &info, int index)
>+{
>+#ifdef __ANDROID__
>+// Disable dynamic viewport on Android. Some drive has an issue with the dynamic viewport
>+// feature.
>+#else
>+    info.viewport.height = (float)info.height;
>+    info.viewport.width = (float)info.width;
>+    info.viewport.minDepth = (float)0.0f;
>+    info.viewport.maxDepth = (float)1.0f;
>+    info.viewport.x = 0;
>+    info.viewport.y = 0;
>+    vkCmdSetViewport(info.cmds[index], 0, NUM_VIEWPORTS, &info.viewport);
>+#endif
>+}
>+
>+void init_viewports2_array(struct sample_info &info, int index)
>+{
>+#ifdef __ANDROID__
>+// Disable dynamic viewport on Android. Some drive has an issue with the dynamic viewport
>+// feature.
>+#else
>+    info.viewport.height = (float)info.height;
>+    info.viewport.width = (float)info.width;
>+    info.viewport.minDepth = (float)0.0f;
>+    info.viewport.maxDepth = (float)1.0f;
>+    info.viewport.x = 0;
>+    info.viewport.y = 0;
>+    vkCmdSetViewport(info.cmd2s[index], 0, NUM_VIEWPORTS, &info.viewport);
>+#endif
>+}
>+
>+void init_scissors(struct sample_info &info)
>+{
>+#ifdef __ANDROID__
>+// Disable dynamic viewport on Android. Some drive has an issue with the dynamic scissors
>+// feature.
>+#else
>+    info.scissor.extent.width = info.width;
>+    info.scissor.extent.height = info.height;
>+    info.scissor.offset.x = 0;
>+    info.scissor.offset.y = 0;
>+    vkCmdSetScissor(info.cmd, 0, NUM_SCISSORS, &info.scissor);
>+#endif
>+}
>+
>+void init_scissors_array(struct sample_info &info, int index)
>+{
>+#ifdef __ANDROID__
>+// Disable dynamic viewport on Android. Some drive has an issue with the dynamic scissors
>+// feature.
>+#else
>+    info.scissor.extent.width = info.width;
>+    info.scissor.extent.height = info.height;
>+    info.scissor.offset.x = 0;
>+    info.scissor.offset.y = 0;
>+    vkCmdSetScissor(info.cmds[index], 0, NUM_SCISSORS, &info.scissor);
>+#endif
>+}
>+
>+void init_scissors2_array(struct sample_info &info, int index)
>+{
>+#ifdef __ANDROID__
>+// Disable dynamic viewport on Android. Some drive has an issue with the dynamic scissors
>+// feature.
>+#else
>+    info.scissor.extent.width = info.width;
>+    info.scissor.extent.height = info.height;
>+    info.scissor.offset.x = 0;
>+    info.scissor.offset.y = 0;
>+    vkCmdSetScissor(info.cmd2s[index], 0, NUM_SCISSORS, &info.scissor);
>+#endif
>+}
>+
>+void destroy_pipeline(struct sample_info &info)
>+{
>+    vkDestroyPipeline(info.device, info.pipeline, NULL);
>+}
>+
>+void destroy_pipeline_cache(struct sample_info &info)
>+{
>+    vkDestroyPipelineCache(info.device, info.pipelineCache, NULL);
>+}
>+
>+void destroy_uniform_buffer(struct sample_info &info)
>+{
>+    vkDestroyBuffer(info.device, info.uniform_data.buf, NULL);
>+    vkFreeMemory(info.device, info.uniform_data.mem, NULL);
>+}
>+
>+void destroy_descriptor_and_pipeline_layouts(struct sample_info &info)
>+{
>+    for (int i = 0; i < NUM_DESCRIPTOR_SETS; i++)
>+        vkDestroyDescriptorSetLayout(info.device, info.desc_layout[i], NULL);
>+    vkDestroyPipelineLayout(info.device, info.pipeline_layout, NULL);
>+}
>+
>+void destroy_descriptor_pool(struct sample_info &info)
>+{
>+    vkDestroyDescriptorPool(info.device, info.desc_pool, NULL);
>+}
>+
>+void destroy_shaders(struct sample_info &info)
>+{
>+    vkDestroyShaderModule(info.device, info.shaderStages[0].module, NULL);
>+    vkDestroyShaderModule(info.device, info.shaderStages[1].module, NULL);
>+}
>+
>+void destroy_command_buffer(struct sample_info &info)
>+{
>+    VkCommandBuffer cmd_bufs[1] = {info.cmd};
>+    vkFreeCommandBuffers(info.device, info.cmd_pool, 1, cmd_bufs);
>+}
>+
>+void destroy_command_buffer_array(struct sample_info &info, int numBuffers)
>+{
>+    vkFreeCommandBuffers(info.device, info.cmd_pool, numBuffers, info.cmds.data());
>+}
>+
>+void reset_command_buffer2_array(struct sample_info &info,
>+                                 VkCommandBufferResetFlags cmd_buffer_reset_flags)
>+{
>+    for (auto cb : info.cmd2s)
>+    {
>+        vkResetCommandBuffer(cb, cmd_buffer_reset_flags);
>+    }
>+}
>+
>+void destroy_command_buffer2_array(struct sample_info &info, int numBuffers)
>+{
>+    vkFreeCommandBuffers(info.device, info.cmd_pool, numBuffers, info.cmd2s.data());
>+}
>+
>+void reset_command_pool(struct sample_info &info, VkCommandPoolResetFlags cmd_pool_reset_flags)
>+{
>+    vkResetCommandPool(info.device, info.cmd_pool, cmd_pool_reset_flags);
>+}
>+
>+void destroy_command_pool(struct sample_info &info)
>+{
>+    vkDestroyCommandPool(info.device, info.cmd_pool, NULL);
>+}
>+
>+void destroy_depth_buffer(struct sample_info &info)
>+{
>+    vkDestroyImageView(info.device, info.depth.view, NULL);
>+    vkDestroyImage(info.device, info.depth.image, NULL);
>+    vkFreeMemory(info.device, info.depth.mem, NULL);
>+}
>+
>+void destroy_vertex_buffer(struct sample_info &info)
>+{
>+    vkDestroyBuffer(info.device, info.vertex_buffer.buf, NULL);
>+    vkFreeMemory(info.device, info.vertex_buffer.mem, NULL);
>+}
>+
>+void destroy_swap_chain(struct sample_info &info)
>+{
>+    for (uint32_t i = 0; i < info.swapchainImageCount; i++)
>+    {
>+        vkDestroyImageView(info.device, info.buffers[i].view, NULL);
>+    }
>+    vkDestroySwapchainKHR(info.device, info.swap_chain, NULL);
>+}
>+
>+void destroy_framebuffers(struct sample_info &info)
>+{
>+    for (uint32_t i = 0; i < info.swapchainImageCount; i++)
>+    {
>+        vkDestroyFramebuffer(info.device, info.framebuffers[i], NULL);
>+    }
>+    free(info.framebuffers);
>+}
>+
>+void destroy_renderpass(struct sample_info &info)
>+{
>+    vkDestroyRenderPass(info.device, info.render_pass, NULL);
>+}
>+
>+void destroy_device(struct sample_info &info)
>+{
>+    vkDeviceWaitIdle(info.device);
>+    vkDestroyDevice(info.device, NULL);
>+}
>+
>+void destroy_instance(struct sample_info &info)
>+{
>+    vkDestroyInstance(info.inst, NULL);
>+}
>diff --git a/Source/ThirdParty/ANGLE/src/tests/test_utils/third_party/vulkan_command_buffer_utils.h b/Source/ThirdParty/ANGLE/src/tests/test_utils/third_party/vulkan_command_buffer_utils.h
>new file mode 100644
>index 00000000000..870166a1beb
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/src/tests/test_utils/third_party/vulkan_command_buffer_utils.h
>@@ -0,0 +1,564 @@
>+/*
>+ * Vulkan Samples
>+ *
>+ * Copyright (C) 2015-2016 Valve Corporation
>+ * Copyright (C) 2015-2016 LunarG, Inc.
>+ * Copyright (C) 2015-2018 Google, Inc.
>+ *
>+ * Licensed under the Apache License, Version 2.0 (the "License");
>+ * you may not use this file except in compliance with the License.
>+ * You may obtain a copy of the License at
>+ *
>+ *     http://www.apache.org/licenses/LICENSE-2.0
>+ *
>+ * Unless required by applicable law or agreed to in writing, software
>+ * distributed under the License is distributed on an "AS IS" BASIS,
>+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
>+ * See the License for the specific language governing permissions and
>+ * limitations under the License.
>+ */
>+
>+/*
>+VULKAN_SAMPLE_DESCRIPTION
>+samples utility functions
>+*/
>+
>+#ifndef VULKAN_COMMAND_BUFFER_UTILS_H
>+#define VULKAN_COMMAND_BUFFER_UTILS_H
>+
>+#include <iostream>
>+#include <sstream>
>+#include <string>
>+#include <vector>
>+
>+#include "common/debug.h"
>+
>+// glslang has issues with some specific warnings.
>+ANGLE_DISABLE_EXTRA_SEMI_WARNING
>+
>+#include "SPIRV/GlslangToSpv.h"
>+
>+ANGLE_REENABLE_EXTRA_SEMI_WARNING
>+
>+#ifdef _WIN32
>+#    pragma comment(linker, "/subsystem:console")
>+#    ifndef WIN32_LEAN_AND_MEAN
>+#        define WIN32_LEAN_AND_MEAN
>+#    endif
>+#    ifndef NOMINMAX
>+#        define NOMINMAX /* Don't let Windows define min() or max() */
>+#    endif
>+#    define APP_NAME_STR_LEN 80
>+#elif defined(__ANDROID__)
>+// Include files for Android
>+#    include <android/log.h>
>+#    include <unistd.h>
>+#    include "util/OSWindow.h"
>+#    include "util/android/third_party/android_native_app_glue.h"
>+#else
>+#    include <unistd.h>
>+#    include "vulkan/vk_sdk_platform.h"
>+#endif
>+
>+#include <vulkan/vulkan.h>
>+
>+/* Number of descriptor sets needs to be the same at alloc,       */
>+/* pipeline layout creation, and descriptor set layout creation   */
>+#define NUM_DESCRIPTOR_SETS 1
>+
>+/* Number of samples needs to be the same at image creation,      */
>+/* renderpass creation and pipeline creation.                     */
>+#define NUM_SAMPLES VK_SAMPLE_COUNT_1_BIT
>+
>+/* Number of viewports and number of scissors have to be the same */
>+/* at pipeline creation and in any call to set them dynamically   */
>+/* They also have to be the same as each other                    */
>+#define NUM_VIEWPORTS 1
>+#define NUM_SCISSORS NUM_VIEWPORTS
>+
>+/* Amount of time, in nanoseconds, to wait for a command buffer to complete */
>+#define FENCE_TIMEOUT 100000000
>+
>+#ifdef __ANDROID__
>+#    define LOGI(...) ((void)__android_log_print(ANDROID_LOG_INFO, "VK-SAMPLE", __VA_ARGS__))
>+#    define LOGE(...) ((void)__android_log_print(ANDROID_LOG_ERROR, "VK-SAMPLE", __VA_ARGS__))
>+#    define GET_INSTANCE_PROC_ADDR(inst, entrypoint)                               \
>+        {                                                                          \
>+            info.fp##entrypoint =                                                  \
>+                (PFN_vk##entrypoint)vkGetInstanceProcAddr(inst, "vk" #entrypoint); \
>+            if (info.fp##entrypoint == NULL)                                       \
>+            {                                                                      \
>+                std::cout << "vkGetDeviceProcAddr failed to find vk" #entrypoint;  \
>+                exit(-1);                                                          \
>+            }                                                                      \
>+        }
>+
>+#endif
>+
>+/*
>+ * Keep each of our swap chain buffers' image, command buffer and view in one
>+ * spot
>+ */
>+typedef struct _swap_chain_buffers
>+{
>+    VkImage image;
>+    VkImageView view;
>+    VkDeviceMemory mem;
>+} swap_chain_buffer;
>+
>+/*
>+ * A layer can expose extensions, keep track of those
>+ * extensions here.
>+ */
>+typedef struct
>+{
>+    VkLayerProperties properties;
>+    std::vector<VkExtensionProperties> instance_extensions;
>+    std::vector<VkExtensionProperties> device_extensions;
>+} layer_properties;
>+
>+/*
>+ * Structure for tracking information used / created / modified
>+ * by utility functions.
>+ */
>+struct sample_info
>+{
>+#ifdef _WIN32
>+#    define APP_NAME_STR_LEN 80
>+    HINSTANCE connection;         // hInstance - Windows Instance
>+    char name[APP_NAME_STR_LEN];  // Name to put on the window/icon
>+    HWND window;                  // hWnd - window handle
>+#elif defined(__ANDROID__)
>+    OSWindow *mOSWindow;
>+    PFN_vkCreateAndroidSurfaceKHR fpCreateAndroidSurfaceKHR;
>+#elif defined(VK_USE_PLATFORM_WAYLAND_KHR)
>+    wl_display *display;
>+    wl_registry *registry;
>+    wl_compositor *compositor;
>+    wl_surface *window;
>+    wl_shell *shell;
>+    wl_shell_surface *shell_surface;
>+#else
>+    xcb_connection_t *connection;
>+    xcb_screen_t *screen;
>+    xcb_window_t window;
>+    xcb_intern_atom_reply_t *atom_wm_delete_window;
>+#endif  // _WIN32
>+    VkSurfaceKHR surface;
>+    bool prepared;
>+    bool use_staging_buffer;
>+    bool save_images;
>+
>+    std::vector<const char *> instance_layer_names;
>+    std::vector<const char *> instance_extension_names;
>+    std::vector<layer_properties> instance_layer_properties;
>+    std::vector<VkExtensionProperties> instance_extension_properties;
>+    VkInstance inst;
>+
>+    std::vector<const char *> device_extension_names;
>+    std::vector<VkExtensionProperties> device_extension_properties;
>+    std::vector<VkPhysicalDevice> gpus;
>+    VkDevice device;
>+    VkQueue graphics_queue;
>+    VkQueue present_queue;
>+    uint32_t graphics_queue_family_index;
>+    uint32_t present_queue_family_index;
>+    VkPhysicalDeviceProperties gpu_props;
>+    std::vector<VkQueueFamilyProperties> queue_props;
>+    VkPhysicalDeviceMemoryProperties memory_properties;
>+
>+    VkFramebuffer *framebuffers;
>+    int width, height;
>+    VkFormat format;
>+
>+    uint32_t swapchainImageCount;
>+    VkSwapchainKHR swap_chain;
>+    std::vector<swap_chain_buffer> buffers;
>+    VkSemaphore imageAcquiredSemaphore;
>+
>+    VkCommandPool cmd_pool;
>+
>+    struct
>+    {
>+        VkFormat format;
>+
>+        VkImage image;
>+        VkDeviceMemory mem;
>+        VkImageView view;
>+    } depth;
>+
>+    struct
>+    {
>+        VkBuffer buf;
>+        VkDeviceMemory mem;
>+        VkDescriptorBufferInfo buffer_info;
>+    } uniform_data;
>+
>+    struct
>+    {
>+        VkBuffer buf;
>+        VkDeviceMemory mem;
>+        VkDescriptorBufferInfo buffer_info;
>+    } vertex_buffer;
>+    VkVertexInputBindingDescription vi_binding;
>+    VkVertexInputAttributeDescription vi_attribs[2];
>+
>+    std::vector<float> MVP;
>+
>+    VkCommandBuffer cmd;                 // Buffer for initialization commands
>+    std::vector<VkCommandBuffer> cmds;   // Place to hold a lot of buffers
>+    std::vector<VkCommandBuffer> cmd2s;  // Place to hold a lot of 2nd buffers
>+    VkPipelineLayout pipeline_layout;
>+    std::vector<VkDescriptorSetLayout> desc_layout;
>+    VkPipelineCache pipelineCache;
>+    VkRenderPass render_pass;
>+    VkPipeline pipeline;
>+
>+    VkPipelineShaderStageCreateInfo shaderStages[2];
>+
>+    VkDescriptorPool desc_pool;
>+    std::vector<VkDescriptorSet> desc_set;
>+
>+    PFN_vkCreateDebugReportCallbackEXT dbgCreateDebugReportCallback;
>+    PFN_vkDestroyDebugReportCallbackEXT dbgDestroyDebugReportCallback;
>+    PFN_vkDebugReportMessageEXT dbgBreakCallback;
>+    std::vector<VkDebugReportCallbackEXT> debug_report_callbacks;
>+
>+    uint32_t current_buffer;
>+    uint32_t queue_family_count;
>+
>+    VkViewport viewport;
>+    VkRect2D scissor;
>+};
>+
>+struct Vertex
>+{
>+    float posX, posY, posZ, posW;  // Position data
>+    float r, g, b, a;              // Color
>+};
>+
>+struct VertexUV
>+{
>+    float posX, posY, posZ, posW;  // Position data
>+    float u, v;                    // texture u,v
>+};
>+
>+#define XYZ1(_x_, _y_, _z_) (_x_), (_y_), (_z_), 1.f
>+#define UV(_u_, _v_) (_u_), (_v_)
>+
>+static const Vertex g_vbData[] = {
>+    {XYZ1(-1, -1, -1), XYZ1(0.f, 0.f, 0.f)}, {XYZ1(1, -1, -1), XYZ1(1.f, 0.f, 0.f)},
>+    {XYZ1(-1, 1, -1), XYZ1(0.f, 1.f, 0.f)},  {XYZ1(-1, 1, -1), XYZ1(0.f, 1.f, 0.f)},
>+    {XYZ1(1, -1, -1), XYZ1(1.f, 0.f, 0.f)},  {XYZ1(1, 1, -1), XYZ1(1.f, 1.f, 0.f)},
>+
>+    {XYZ1(-1, -1, 1), XYZ1(0.f, 0.f, 1.f)},  {XYZ1(-1, 1, 1), XYZ1(0.f, 1.f, 1.f)},
>+    {XYZ1(1, -1, 1), XYZ1(1.f, 0.f, 1.f)},   {XYZ1(1, -1, 1), XYZ1(1.f, 0.f, 1.f)},
>+    {XYZ1(-1, 1, 1), XYZ1(0.f, 1.f, 1.f)},   {XYZ1(1, 1, 1), XYZ1(1.f, 1.f, 1.f)},
>+
>+    {XYZ1(1, 1, 1), XYZ1(1.f, 1.f, 1.f)},    {XYZ1(1, 1, -1), XYZ1(1.f, 1.f, 0.f)},
>+    {XYZ1(1, -1, 1), XYZ1(1.f, 0.f, 1.f)},   {XYZ1(1, -1, 1), XYZ1(1.f, 0.f, 1.f)},
>+    {XYZ1(1, 1, -1), XYZ1(1.f, 1.f, 0.f)},   {XYZ1(1, -1, -1), XYZ1(1.f, 0.f, 0.f)},
>+
>+    {XYZ1(-1, 1, 1), XYZ1(0.f, 1.f, 1.f)},   {XYZ1(-1, -1, 1), XYZ1(0.f, 0.f, 1.f)},
>+    {XYZ1(-1, 1, -1), XYZ1(0.f, 1.f, 0.f)},  {XYZ1(-1, 1, -1), XYZ1(0.f, 1.f, 0.f)},
>+    {XYZ1(-1, -1, 1), XYZ1(0.f, 0.f, 1.f)},  {XYZ1(-1, -1, -1), XYZ1(0.f, 0.f, 0.f)},
>+
>+    {XYZ1(1, 1, 1), XYZ1(1.f, 1.f, 1.f)},    {XYZ1(-1, 1, 1), XYZ1(0.f, 1.f, 1.f)},
>+    {XYZ1(1, 1, -1), XYZ1(1.f, 1.f, 0.f)},   {XYZ1(1, 1, -1), XYZ1(1.f, 1.f, 0.f)},
>+    {XYZ1(-1, 1, 1), XYZ1(0.f, 1.f, 1.f)},   {XYZ1(-1, 1, -1), XYZ1(0.f, 1.f, 0.f)},
>+
>+    {XYZ1(1, -1, 1), XYZ1(1.f, 0.f, 1.f)},   {XYZ1(1, -1, -1), XYZ1(1.f, 0.f, 0.f)},
>+    {XYZ1(-1, -1, 1), XYZ1(0.f, 0.f, 1.f)},  {XYZ1(-1, -1, 1), XYZ1(0.f, 0.f, 1.f)},
>+    {XYZ1(1, -1, -1), XYZ1(1.f, 0.f, 0.f)},  {XYZ1(-1, -1, -1), XYZ1(0.f, 0.f, 0.f)},
>+};
>+
>+static const Vertex g_vb_solid_face_colors_Data[] = {
>+    // red face
>+    {XYZ1(-1, -1, 1), XYZ1(1.f, 0.f, 0.f)},
>+    {XYZ1(-1, 1, 1), XYZ1(1.f, 0.f, 0.f)},
>+    {XYZ1(1, -1, 1), XYZ1(1.f, 0.f, 0.f)},
>+    {XYZ1(1, -1, 1), XYZ1(1.f, 0.f, 0.f)},
>+    {XYZ1(-1, 1, 1), XYZ1(1.f, 0.f, 0.f)},
>+    {XYZ1(1, 1, 1), XYZ1(1.f, 0.f, 0.f)},
>+    // green face
>+    {XYZ1(-1, -1, -1), XYZ1(0.f, 1.f, 0.f)},
>+    {XYZ1(1, -1, -1), XYZ1(0.f, 1.f, 0.f)},
>+    {XYZ1(-1, 1, -1), XYZ1(0.f, 1.f, 0.f)},
>+    {XYZ1(-1, 1, -1), XYZ1(0.f, 1.f, 0.f)},
>+    {XYZ1(1, -1, -1), XYZ1(0.f, 1.f, 0.f)},
>+    {XYZ1(1, 1, -1), XYZ1(0.f, 1.f, 0.f)},
>+    // blue face
>+    {XYZ1(-1, 1, 1), XYZ1(0.f, 0.f, 1.f)},
>+    {XYZ1(-1, -1, 1), XYZ1(0.f, 0.f, 1.f)},
>+    {XYZ1(-1, 1, -1), XYZ1(0.f, 0.f, 1.f)},
>+    {XYZ1(-1, 1, -1), XYZ1(0.f, 0.f, 1.f)},
>+    {XYZ1(-1, -1, 1), XYZ1(0.f, 0.f, 1.f)},
>+    {XYZ1(-1, -1, -1), XYZ1(0.f, 0.f, 1.f)},
>+    // yellow face
>+    {XYZ1(1, 1, 1), XYZ1(1.f, 1.f, 0.f)},
>+    {XYZ1(1, 1, -1), XYZ1(1.f, 1.f, 0.f)},
>+    {XYZ1(1, -1, 1), XYZ1(1.f, 1.f, 0.f)},
>+    {XYZ1(1, -1, 1), XYZ1(1.f, 1.f, 0.f)},
>+    {XYZ1(1, 1, -1), XYZ1(1.f, 1.f, 0.f)},
>+    {XYZ1(1, -1, -1), XYZ1(1.f, 1.f, 0.f)},
>+    // magenta face
>+    {XYZ1(1, 1, 1), XYZ1(1.f, 0.f, 1.f)},
>+    {XYZ1(-1, 1, 1), XYZ1(1.f, 0.f, 1.f)},
>+    {XYZ1(1, 1, -1), XYZ1(1.f, 0.f, 1.f)},
>+    {XYZ1(1, 1, -1), XYZ1(1.f, 0.f, 1.f)},
>+    {XYZ1(-1, 1, 1), XYZ1(1.f, 0.f, 1.f)},
>+    {XYZ1(-1, 1, -1), XYZ1(1.f, 0.f, 1.f)},
>+    // cyan face
>+    {XYZ1(1, -1, 1), XYZ1(0.f, 1.f, 1.f)},
>+    {XYZ1(1, -1, -1), XYZ1(0.f, 1.f, 1.f)},
>+    {XYZ1(-1, -1, 1), XYZ1(0.f, 1.f, 1.f)},
>+    {XYZ1(-1, -1, 1), XYZ1(0.f, 1.f, 1.f)},
>+    {XYZ1(1, -1, -1), XYZ1(0.f, 1.f, 1.f)},
>+    {XYZ1(-1, -1, -1), XYZ1(0.f, 1.f, 1.f)},
>+};
>+
>+static const VertexUV g_vb_texture_Data[] = {
>+    // left face
>+    {XYZ1(-1, -1, -1), UV(1.f, 0.f)},  // lft-top-front
>+    {XYZ1(-1, 1, 1), UV(0.f, 1.f)},    // lft-btm-back
>+    {XYZ1(-1, -1, 1), UV(0.f, 0.f)},   // lft-top-back
>+    {XYZ1(-1, 1, 1), UV(0.f, 1.f)},    // lft-btm-back
>+    {XYZ1(-1, -1, -1), UV(1.f, 0.f)},  // lft-top-front
>+    {XYZ1(-1, 1, -1), UV(1.f, 1.f)},   // lft-btm-front
>+    // front face
>+    {XYZ1(-1, -1, -1), UV(0.f, 0.f)},  // lft-top-front
>+    {XYZ1(1, -1, -1), UV(1.f, 0.f)},   // rgt-top-front
>+    {XYZ1(1, 1, -1), UV(1.f, 1.f)},    // rgt-btm-front
>+    {XYZ1(-1, -1, -1), UV(0.f, 0.f)},  // lft-top-front
>+    {XYZ1(1, 1, -1), UV(1.f, 1.f)},    // rgt-btm-front
>+    {XYZ1(-1, 1, -1), UV(0.f, 1.f)},   // lft-btm-front
>+    // top face
>+    {XYZ1(-1, -1, -1), UV(0.f, 1.f)},  // lft-top-front
>+    {XYZ1(1, -1, 1), UV(1.f, 0.f)},    // rgt-top-back
>+    {XYZ1(1, -1, -1), UV(1.f, 1.f)},   // rgt-top-front
>+    {XYZ1(-1, -1, -1), UV(0.f, 1.f)},  // lft-top-front
>+    {XYZ1(-1, -1, 1), UV(0.f, 0.f)},   // lft-top-back
>+    {XYZ1(1, -1, 1), UV(1.f, 0.f)},    // rgt-top-back
>+    // bottom face
>+    {XYZ1(-1, 1, -1), UV(0.f, 0.f)},  // lft-btm-front
>+    {XYZ1(1, 1, 1), UV(1.f, 1.f)},    // rgt-btm-back
>+    {XYZ1(-1, 1, 1), UV(0.f, 1.f)},   // lft-btm-back
>+    {XYZ1(-1, 1, -1), UV(0.f, 0.f)},  // lft-btm-front
>+    {XYZ1(1, 1, -1), UV(1.f, 0.f)},   // rgt-btm-front
>+    {XYZ1(1, 1, 1), UV(1.f, 1.f)},    // rgt-btm-back
>+    // right face
>+    {XYZ1(1, 1, -1), UV(0.f, 1.f)},   // rgt-btm-front
>+    {XYZ1(1, -1, 1), UV(1.f, 0.f)},   // rgt-top-back
>+    {XYZ1(1, 1, 1), UV(1.f, 1.f)},    // rgt-btm-back
>+    {XYZ1(1, -1, 1), UV(1.f, 0.f)},   // rgt-top-back
>+    {XYZ1(1, 1, -1), UV(0.f, 1.f)},   // rgt-btm-front
>+    {XYZ1(1, -1, -1), UV(0.f, 0.f)},  // rgt-top-front
>+    // back face
>+    {XYZ1(-1, 1, 1), UV(1.f, 1.f)},   // lft-btm-back
>+    {XYZ1(1, 1, 1), UV(0.f, 1.f)},    // rgt-btm-back
>+    {XYZ1(-1, -1, 1), UV(1.f, 0.f)},  // lft-top-back
>+    {XYZ1(-1, -1, 1), UV(1.f, 0.f)},  // lft-top-back
>+    {XYZ1(1, 1, 1), UV(0.f, 1.f)},    // rgt-btm-back
>+    {XYZ1(1, -1, 1), UV(0.f, 0.f)},   // rgt-top-back
>+};
>+
>+inline void init_resources(TBuiltInResource &Resources)
>+{
>+    Resources.maxLights                                   = 32;
>+    Resources.maxClipPlanes                               = 6;
>+    Resources.maxTextureUnits                             = 32;
>+    Resources.maxTextureCoords                            = 32;
>+    Resources.maxVertexAttribs                            = 64;
>+    Resources.maxVertexUniformComponents                  = 4096;
>+    Resources.maxVaryingFloats                            = 64;
>+    Resources.maxVertexTextureImageUnits                  = 32;
>+    Resources.maxCombinedTextureImageUnits                = 80;
>+    Resources.maxTextureImageUnits                        = 32;
>+    Resources.maxFragmentUniformComponents                = 4096;
>+    Resources.maxDrawBuffers                              = 32;
>+    Resources.maxVertexUniformVectors                     = 128;
>+    Resources.maxVaryingVectors                           = 8;
>+    Resources.maxFragmentUniformVectors                   = 16;
>+    Resources.maxVertexOutputVectors                      = 16;
>+    Resources.maxFragmentInputVectors                     = 15;
>+    Resources.minProgramTexelOffset                       = -8;
>+    Resources.maxProgramTexelOffset                       = 7;
>+    Resources.maxClipDistances                            = 8;
>+    Resources.maxComputeWorkGroupCountX                   = 65535;
>+    Resources.maxComputeWorkGroupCountY                   = 65535;
>+    Resources.maxComputeWorkGroupCountZ                   = 65535;
>+    Resources.maxComputeWorkGroupSizeX                    = 1024;
>+    Resources.maxComputeWorkGroupSizeY                    = 1024;
>+    Resources.maxComputeWorkGroupSizeZ                    = 64;
>+    Resources.maxComputeUniformComponents                 = 1024;
>+    Resources.maxComputeTextureImageUnits                 = 16;
>+    Resources.maxComputeImageUniforms                     = 8;
>+    Resources.maxComputeAtomicCounters                    = 8;
>+    Resources.maxComputeAtomicCounterBuffers              = 1;
>+    Resources.maxVaryingComponents                        = 60;
>+    Resources.maxVertexOutputComponents                   = 64;
>+    Resources.maxGeometryInputComponents                  = 64;
>+    Resources.maxGeometryOutputComponents                 = 128;
>+    Resources.maxFragmentInputComponents                  = 128;
>+    Resources.maxImageUnits                               = 8;
>+    Resources.maxCombinedImageUnitsAndFragmentOutputs     = 8;
>+    Resources.maxCombinedShaderOutputResources            = 8;
>+    Resources.maxImageSamples                             = 0;
>+    Resources.maxVertexImageUniforms                      = 0;
>+    Resources.maxTessControlImageUniforms                 = 0;
>+    Resources.maxTessEvaluationImageUniforms              = 0;
>+    Resources.maxGeometryImageUniforms                    = 0;
>+    Resources.maxFragmentImageUniforms                    = 8;
>+    Resources.maxCombinedImageUniforms                    = 8;
>+    Resources.maxGeometryTextureImageUnits                = 16;
>+    Resources.maxGeometryOutputVertices                   = 256;
>+    Resources.maxGeometryTotalOutputComponents            = 1024;
>+    Resources.maxGeometryUniformComponents                = 1024;
>+    Resources.maxGeometryVaryingComponents                = 64;
>+    Resources.maxTessControlInputComponents               = 128;
>+    Resources.maxTessControlOutputComponents              = 128;
>+    Resources.maxTessControlTextureImageUnits             = 16;
>+    Resources.maxTessControlUniformComponents             = 1024;
>+    Resources.maxTessControlTotalOutputComponents         = 4096;
>+    Resources.maxTessEvaluationInputComponents            = 128;
>+    Resources.maxTessEvaluationOutputComponents           = 128;
>+    Resources.maxTessEvaluationTextureImageUnits          = 16;
>+    Resources.maxTessEvaluationUniformComponents          = 1024;
>+    Resources.maxTessPatchComponents                      = 120;
>+    Resources.maxPatchVertices                            = 32;
>+    Resources.maxTessGenLevel                             = 64;
>+    Resources.maxViewports                                = 16;
>+    Resources.maxVertexAtomicCounters                     = 0;
>+    Resources.maxTessControlAtomicCounters                = 0;
>+    Resources.maxTessEvaluationAtomicCounters             = 0;
>+    Resources.maxGeometryAtomicCounters                   = 0;
>+    Resources.maxFragmentAtomicCounters                   = 8;
>+    Resources.maxCombinedAtomicCounters                   = 8;
>+    Resources.maxAtomicCounterBindings                    = 1;
>+    Resources.maxVertexAtomicCounterBuffers               = 0;
>+    Resources.maxTessControlAtomicCounterBuffers          = 0;
>+    Resources.maxTessEvaluationAtomicCounterBuffers       = 0;
>+    Resources.maxGeometryAtomicCounterBuffers             = 0;
>+    Resources.maxFragmentAtomicCounterBuffers             = 1;
>+    Resources.maxCombinedAtomicCounterBuffers             = 1;
>+    Resources.maxAtomicCounterBufferSize                  = 16384;
>+    Resources.maxTransformFeedbackBuffers                 = 4;
>+    Resources.maxTransformFeedbackInterleavedComponents   = 64;
>+    Resources.maxCullDistances                            = 8;
>+    Resources.maxCombinedClipAndCullDistances             = 8;
>+    Resources.maxSamples                                  = 4;
>+    Resources.limits.nonInductiveForLoops                 = 1;
>+    Resources.limits.whileLoops                           = 1;
>+    Resources.limits.doWhileLoops                         = 1;
>+    Resources.limits.generalUniformIndexing               = 1;
>+    Resources.limits.generalAttributeMatrixVectorIndexing = 1;
>+    Resources.limits.generalVaryingIndexing               = 1;
>+    Resources.limits.generalSamplerIndexing               = 1;
>+    Resources.limits.generalVariableIndexing              = 1;
>+    Resources.limits.generalConstantMatrixVectorIndexing  = 1;
>+}
>+
>+inline EShLanguage FindLanguage(const VkShaderStageFlagBits shader_type)
>+{
>+    switch (shader_type)
>+    {
>+        case VK_SHADER_STAGE_VERTEX_BIT:
>+            return EShLangVertex;
>+
>+        case VK_SHADER_STAGE_TESSELLATION_CONTROL_BIT:
>+            return EShLangTessControl;
>+
>+        case VK_SHADER_STAGE_TESSELLATION_EVALUATION_BIT:
>+            return EShLangTessEvaluation;
>+
>+        case VK_SHADER_STAGE_GEOMETRY_BIT:
>+            return EShLangGeometry;
>+
>+        case VK_SHADER_STAGE_FRAGMENT_BIT:
>+            return EShLangFragment;
>+
>+        case VK_SHADER_STAGE_COMPUTE_BIT:
>+            return EShLangCompute;
>+
>+        default:
>+            return EShLangVertex;
>+    }
>+}
>+
>+VkResult init_global_extension_properties(layer_properties &layer_props);
>+
>+VkResult init_global_layer_properties(sample_info &info);
>+
>+VkResult init_device_extension_properties(struct sample_info &info, layer_properties &layer_props);
>+
>+void init_instance_extension_names(struct sample_info &info);
>+VkResult init_instance(struct sample_info &info, char const *const app_short_name);
>+void init_device_extension_names(struct sample_info &info);
>+VkResult init_device(struct sample_info &info);
>+VkResult init_enumerate_device(struct sample_info &info, uint32_t gpu_count = 1);
>+VkBool32 demo_check_layers(const std::vector<layer_properties> &layer_props,
>+                           const std::vector<const char *> &layer_names);
>+void init_connection(struct sample_info &info);
>+void init_window(struct sample_info &info);
>+void init_swapchain_extension(struct sample_info &info);
>+void init_command_pool(struct sample_info &info, VkCommandPoolCreateFlags cmd_pool_create_flags);
>+void init_command_buffer(struct sample_info &info);
>+void init_command_buffer_array(struct sample_info &info, int numBuffers);
>+void init_command_buffer2_array(struct sample_info &info, int numBuffers);
>+void execute_begin_command_buffer(struct sample_info &info);
>+void init_device_queue(struct sample_info &info);
>+void init_swap_chain(struct sample_info &info,
>+                     VkImageUsageFlags usageFlags = VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT |
>+                                                    VK_IMAGE_USAGE_TRANSFER_SRC_BIT);
>+void init_depth_buffer(struct sample_info &info);
>+void init_uniform_buffer(struct sample_info &info);
>+void init_descriptor_and_pipeline_layouts(
>+    struct sample_info &info,
>+    bool use_texture,
>+    VkDescriptorSetLayoutCreateFlags descSetLayoutCreateFlags = 0);
>+void init_renderpass(struct sample_info &info,
>+                     bool include_depth,
>+                     bool clear                = true,
>+                     VkImageLayout finalLayout = VK_IMAGE_LAYOUT_PRESENT_SRC_KHR);
>+void init_vertex_buffer(struct sample_info &info,
>+                        const void *vertexData,
>+                        uint32_t dataSize,
>+                        uint32_t dataStride,
>+                        bool use_texture);
>+void init_framebuffers(struct sample_info &info, bool include_depth);
>+void init_descriptor_pool(struct sample_info &info, bool use_texture);
>+void init_descriptor_set(struct sample_info &info);
>+void init_shaders(struct sample_info &info, const char *vertShaderText, const char *fragShaderText);
>+void init_pipeline_cache(struct sample_info &info);
>+void init_pipeline(struct sample_info &info, VkBool32 include_depth, VkBool32 include_vi = true);
>+void init_sampler(struct sample_info &info, VkSampler &sampler);
>+void init_viewports(struct sample_info &info);
>+void init_viewports_array(struct sample_info &info, int index);
>+void init_viewports2_array(struct sample_info &info, int index);
>+void init_scissors(struct sample_info &info);
>+void init_scissors_array(struct sample_info &info, int index);
>+void init_scissors2_array(struct sample_info &info, int index);
>+void init_window_size(struct sample_info &info, int32_t default_width, int32_t default_height);
>+void destroy_pipeline(struct sample_info &info);
>+void destroy_pipeline_cache(struct sample_info &info);
>+void destroy_descriptor_pool(struct sample_info &info);
>+void destroy_vertex_buffer(struct sample_info &info);
>+void destroy_framebuffers(struct sample_info &info);
>+void destroy_shaders(struct sample_info &info);
>+void destroy_renderpass(struct sample_info &info);
>+void destroy_descriptor_and_pipeline_layouts(struct sample_info &info);
>+void destroy_uniform_buffer(struct sample_info &info);
>+void destroy_depth_buffer(struct sample_info &info);
>+void destroy_swap_chain(struct sample_info &info);
>+void destroy_command_buffer(struct sample_info &info);
>+void destroy_command_buffer_array(struct sample_info &info, int numBuffers);
>+void destroy_command_buffer2_array(struct sample_info &info, int numBuffers);
>+void reset_command_buffer2_array(struct sample_info &info,
>+                                 VkCommandBufferResetFlags cmd_buffer_reset_flags);
>+void reset_command_pool(struct sample_info &info, VkCommandPoolResetFlags cmd_pool_reset_flags);
>+void destroy_command_pool(struct sample_info &info);
>+void destroy_device(struct sample_info &info);
>+void destroy_instance(struct sample_info &info);
>+void destroy_window(struct sample_info &info);
>+
>+#endif
>diff --git a/Source/ThirdParty/ANGLE/src/tests/tests.gyp b/Source/ThirdParty/ANGLE/src/tests/tests.gyp
>deleted file mode 100644
>index 2be9fb5a49e..00000000000
>--- a/Source/ThirdParty/ANGLE/src/tests/tests.gyp
>+++ /dev/null
>@@ -1,362 +0,0 @@
>-# Copyright (c) 2012 The ANGLE Project Authors. All rights reserved.
>-# Use of this source code is governed by a BSD-style license that can be
>-# found in the LICENSE file.
>-
>-{
>-    'includes':
>-    [
>-        'deqp.gypi',
>-        '../../gyp/common_defines.gypi',
>-    ],
>-    'variables':
>-    {
>-        'angle_build_conformance_tests%': '0',
>-
>-        'rapidjson_include_dir': 'third_party/rapidjson/include',
>-        'rapidjson_headers':
>-        [
>-            'third_party/rapidjson/include/rapidjson/allocators.h',
>-            'third_party/rapidjson/include/rapidjson/document.h',
>-            'third_party/rapidjson/include/rapidjson/encodedstream.h',
>-            'third_party/rapidjson/include/rapidjson/encodings.h',
>-            'third_party/rapidjson/include/rapidjson/filereadstream.h',
>-            'third_party/rapidjson/include/rapidjson/filestream.h',
>-            'third_party/rapidjson/include/rapidjson/filewritestream.h',
>-            'third_party/rapidjson/include/rapidjson/memorybuffer.h',
>-            'third_party/rapidjson/include/rapidjson/memorystream.h',
>-            'third_party/rapidjson/include/rapidjson/prettywriter.h',
>-            'third_party/rapidjson/include/rapidjson/rapidjson.h',
>-            'third_party/rapidjson/include/rapidjson/reader.h',
>-            'third_party/rapidjson/include/rapidjson/stringbuffer.h',
>-            'third_party/rapidjson/include/rapidjson/writer.h',
>-            'third_party/rapidjson/include/rapidjson/error/en.h',
>-            'third_party/rapidjson/include/rapidjson/error/error.h',
>-            'third_party/rapidjson/include/rapidjson/internal/dtoa.h',
>-            'third_party/rapidjson/include/rapidjson/internal/itoa.h',
>-            'third_party/rapidjson/include/rapidjson/internal/meta.h',
>-            'third_party/rapidjson/include/rapidjson/internal/pow10.h',
>-            'third_party/rapidjson/include/rapidjson/internal/stack.h',
>-            'third_party/rapidjson/include/rapidjson/internal/strfunc.h',
>-            'third_party/rapidjson/include/rapidjson/msinttypes/inttypes.h',
>-            'third_party/rapidjson/include/rapidjson/msinttypes/stdint.h',
>-        ],
>-    },
>-    'conditions':
>-    [
>-        # GoogleTest doesn't support WinRT
>-        ['angle_build_winrt==0',
>-        {
>-            'targets':
>-            [
>-                {
>-                    'target_name': 'angle_test_support',
>-                    'type': 'none',
>-                    'dependencies':
>-                    [
>-                        'angle_internal_gmock',
>-                        'angle_internal_gtest',
>-                    ],
>-                },
>-            ],
>-        }],
>-        ['angle_build_winrt==0',
>-        {
>-            'targets':
>-            [
>-                # Hide these targets from Chromium, because it can't
>-                # find our standalone copy of the gtest/gmock sources.
>-                {
>-                    'target_name': 'angle_internal_gtest',
>-                    'type': 'static_library',
>-                    'includes': [ '../../gyp/common_defines.gypi', ],
>-                    'include_dirs':
>-                    [
>-                        '<(angle_path)/third_party/googletest/src/googletest',
>-                        '<(angle_path)/third_party/googletest/src/googletest/include',
>-                    ],
>-                    'sources':
>-                    [
>-                        '<(angle_path)/third_party/googletest/src/googletest/src/gtest-all.cc',
>-                    ],
>-                    'defines':
>-                    [
>-                        '_VARIADIC_MAX=10',
>-                    ],
>-                    'all_dependent_settings':
>-                    {
>-                        'defines':
>-                        [
>-                            '_VARIADIC_MAX=10',
>-                        ],
>-                        'include_dirs':
>-                        [
>-                            '<(angle_path)/third_party/googletest/src/googletest',
>-                            '<(angle_path)/third_party/googletest/src/googletest/include',
>-                        ],
>-                    },
>-                },
>-
>-                {
>-                    'target_name': 'angle_internal_gmock',
>-                    'type': 'static_library',
>-                    'includes': [ '../../gyp/common_defines.gypi', ],
>-                    'include_dirs':
>-                    [
>-                        '<(angle_path)/third_party/googletest/src/googlemock',
>-                        '<(angle_path)/third_party/googletest/src/googlemock/include',
>-                        '<(angle_path)/third_party/googletest/src/googletest/include',
>-                    ],
>-                    'sources':
>-                    [
>-                        '<(angle_path)/third_party/googletest/src/googlemock/src/gmock-all.cc',
>-                    ],
>-                    'defines':
>-                    [
>-                        '_VARIADIC_MAX=10',
>-                    ],
>-                    'all_dependent_settings':
>-                    {
>-                        'defines':
>-                        [
>-                            '_VARIADIC_MAX=10',
>-                        ],
>-                        'include_dirs':
>-                        [
>-                            '<(angle_path)/third_party/googletest/src/googlemock',
>-                            '<(angle_path)/third_party/googletest/src/googlemock/include',
>-                            '<(angle_path)/third_party/googletest/src/googletest/include',
>-                        ],
>-                    },
>-                },
>-
>-                # These same target names exist on the Chromium side,
>-                # which is forbidden, so we make them conditional on
>-                # ANGLE's standalone build.
>-                {
>-                    'target_name': 'angle_unittests',
>-                    'type': 'executable',
>-                    'includes':
>-                    [
>-                        '../../gyp/common_defines.gypi',
>-                        'angle_unittests.gypi',
>-                    ],
>-                    'sources':
>-                    [
>-                        'angle_unittests_main.cpp',
>-                    ],
>-                    'msvs_settings':
>-                    {
>-                        'VCLinkerTool':
>-                        {
>-                            'conditions':
>-                            [
>-                                ['angle_build_winrt==1',
>-                                {
>-                                    'AdditionalDependencies':
>-                                    [
>-                                        'runtimeobject.lib',
>-                                    ],
>-                                }],
>-                            ],
>-                        },
>-                    },
>-                    'msvs_disabled_warnings':
>-                    [
>-                        4244, # Conversion from 'type1' to 'type2', possible loss of data
>-                    ],
>-                },
>-                {
>-                    'target_name': 'angle_end2end_tests',
>-                    'type': 'executable',
>-                    'includes':
>-                    [
>-                        '../../gyp/common_defines.gypi',
>-                        'angle_end2end_tests.gypi',
>-                    ],
>-                    'sources':
>-                    [
>-                        'angle_end2end_tests_main.cpp',
>-                    ],
>-                },
>-                {
>-                    'target_name': 'angle_white_box_tests',
>-                    'type': 'executable',
>-                    'includes':
>-                    [
>-                        '../../gyp/common_defines.gypi',
>-                        'angle_white_box_tests.gypi',
>-                    ],
>-                    'sources':
>-                    [
>-                        'angle_white_box_tests_main.cpp',
>-                    ],
>-                },
>-                {
>-                    'target_name': 'angle_perftests',
>-                    'type': 'executable',
>-                    'includes':
>-                    [
>-                        '../../gyp/common_defines.gypi',
>-                        'angle_perftests.gypi',
>-                    ],
>-                    'sources':
>-                    [
>-                        'angle_perftests_main.cpp',
>-                    ],
>-                },
>-            ],
>-        }],
>-        ['OS=="win"',
>-        {
>-            'conditions':
>-            [
>-                ['angle_build_conformance_tests',
>-                {
>-                    'variables':
>-                    {
>-                        'gles_conformance_tests_output_dir': '<(SHARED_INTERMEDIATE_DIR)/conformance_tests',
>-                        'gles_conformance_tests_input_dir': 'third_party/gles_conformance_tests/conform/GTF_ES/glsl/GTF',
>-                        'gles_conformance_tests_generator_script': 'gles_conformance_tests/generate_gles_conformance_tests.py',
>-                    },
>-                    'targets':
>-                    [
>-                        {
>-                            'target_name': 'angle_gles2_conformance_tests',
>-                            'type': 'executable',
>-                            'includes': [ '../../gyp/common_defines.gypi', ],
>-                            'dependencies':
>-                            [
>-                                '<(angle_path)/src/angle.gyp:libGLESv2',
>-                                '<(angle_path)/src/angle.gyp:libEGL',
>-                                'third_party/gles_conformance_tests/conform/GTF_ES/glsl/GTF/es_cts.gyp:es_cts_test_data',
>-                                'third_party/gles_conformance_tests/conform/GTF_ES/glsl/GTF/es_cts.gyp:es2_cts',
>-                                'angle_test_support',
>-                            ],
>-                            'variables':
>-                            {
>-                                'gles2_conformance_tests_input_file': '<(gles_conformance_tests_input_dir)/mustpass_es20.run',
>-                                'gles2_conformance_tests_generated_file': '<(gles_conformance_tests_output_dir)/generated_gles2_conformance_tests.cpp',
>-                            },
>-                            'sources':
>-                            [
>-                                'gles_conformance_tests/gles_conformance_tests.cpp',
>-                                'gles_conformance_tests/gles_conformance_tests.h',
>-                                'gles_conformance_tests/gles_conformance_tests_main.cpp',
>-                                '<(gles2_conformance_tests_generated_file)',
>-                            ],
>-                            'include_dirs':
>-                            [
>-                                '<(angle_path)/include',
>-                                'gles_conformance_tests',
>-                            ],
>-                            'defines':
>-                            [
>-                                'CONFORMANCE_TESTS_TYPE=CONFORMANCE_TESTS_ES2',
>-                            ],
>-                            'msvs_settings':
>-                            {
>-                                'VCCLCompilerTool':
>-                                {
>-                                    # MSVS has trouble compiling this due to the obj files becoming too large.
>-                                    'AdditionalOptions': [ '/bigobj' ],
>-                                },
>-                            },
>-                            'actions':
>-                            [
>-                                {
>-                                    'action_name': 'generate_gles2_conformance_tests',
>-                                    'message': 'Generating ES2 conformance tests...',
>-                                    'msvs_cygwin_shell': 0,
>-                                    'inputs':
>-                                    [
>-                                        '<(gles_conformance_tests_generator_script)',
>-                                        '<(gles2_conformance_tests_input_file)',
>-                                    ],
>-                                    'outputs':
>-                                    [
>-                                        '<(gles2_conformance_tests_generated_file)',
>-                                    ],
>-                                    'action':
>-                                    [
>-                                        'python',
>-                                        '<(gles_conformance_tests_generator_script)',
>-                                        '<(gles2_conformance_tests_input_file)',
>-                                        '<(gles_conformance_tests_input_dir)',
>-                                        '<(gles2_conformance_tests_generated_file)',
>-                                    ],
>-                                },
>-                            ],
>-                        },
>-                        {
>-                            'target_name': 'angle_gles3_conformance_tests',
>-                            'type': 'executable',
>-                            'includes': [ '../../gyp/common_defines.gypi', ],
>-                            'dependencies':
>-                            [
>-                                '<(angle_path)/src/angle.gyp:libGLESv2',
>-                                '<(angle_path)/src/angle.gyp:libEGL',
>-                                'third_party/gles_conformance_tests/conform/GTF_ES/glsl/GTF/es_cts.gyp:es_cts_test_data',
>-                                'third_party/gles_conformance_tests/conform/GTF_ES/glsl/GTF/es_cts.gyp:es3_cts',
>-                                'angle_test_support',
>-                            ],
>-                            'variables':
>-                            {
>-                                'gles3_conformance_tests_input_file': '<(gles_conformance_tests_input_dir)/mustpass_es30.run',
>-                                'gles3_conformance_tests_generated_file': '<(gles_conformance_tests_output_dir)/generated_gles3_conformance_tests.cpp',
>-                            },
>-                            'sources':
>-                            [
>-                                'gles_conformance_tests/gles_conformance_tests.cpp',
>-                                'gles_conformance_tests/gles_conformance_tests.h',
>-                                'gles_conformance_tests/gles_conformance_tests_main.cpp',
>-                                '<(gles3_conformance_tests_generated_file)',
>-                            ],
>-                            'include_dirs':
>-                            [
>-                                '<(angle_path)/include',
>-                                'gles_conformance_tests',
>-                            ],
>-                            'defines':
>-                            [
>-                                'CONFORMANCE_TESTS_TYPE=CONFORMANCE_TESTS_ES3',
>-                            ],
>-                            'msvs_settings':
>-                            {
>-                                'VCCLCompilerTool':
>-                                {
>-                                    # MSVS has trouble compiling this due to the obj files becoming too large.
>-                                    'AdditionalOptions': [ '/bigobj' ],
>-                                },
>-                            },
>-                            'actions':
>-                            [
>-                                {
>-                                    'action_name': 'generate_gles3_conformance_tests',
>-                                    'message': 'Generating ES3 conformance tests...',
>-                                    'msvs_cygwin_shell': 0,
>-                                    'inputs':
>-                                    [
>-                                        '<(gles_conformance_tests_generator_script)',
>-                                        '<(gles3_conformance_tests_input_file)',
>-                                    ],
>-                                    'outputs':
>-                                    [
>-                                        '<(gles3_conformance_tests_generated_file)',
>-                                    ],
>-                                    'action':
>-                                    [
>-                                        'python',
>-                                        '<(gles_conformance_tests_generator_script)',
>-                                        '<(gles3_conformance_tests_input_file)',
>-                                        '<(gles_conformance_tests_input_dir)',
>-                                        '<(gles3_conformance_tests_generated_file)',
>-                                    ],
>-                                },
>-                            ],
>-                        },
>-                    ],
>-                }],
>-            ],
>-        }],
>-    ],
>-}
>diff --git a/Source/ThirdParty/ANGLE/src/tests/third_party/gpu_test_expectations/HowToMakeChanges.md b/Source/ThirdParty/ANGLE/src/tests/third_party/gpu_test_expectations/HowToMakeChanges.md
>deleted file mode 100644
>index 190a3e9c362..00000000000
>--- a/Source/ThirdParty/ANGLE/src/tests/third_party/gpu_test_expectations/HowToMakeChanges.md
>+++ /dev/null
>@@ -1,22 +0,0 @@
>-Because the ```gpu_test_expectations``` directory is based on parts of Chromium's ```gpu/config```
>-directory, we want to keep a patch of the changes added to make it compile with ANGLE. This
>-will allow us to merge Chromium changes easily in our ```gpu_test_expectations```.
>-
>-In order to make a change to this directory, do the following:
>-
>- * copy the directory somewhere like in ```gpu_test_expectations_reverted```
>- * in ```gpu_test_expectations_reverted``` run ```patch -p 1 -R < angle-mods.patch```
>- * do your changes in ```gpu_test_expectations```
>- * delete angle-mods.patch in both directories
>- * run ```diff -rupN gpu_test_expectations_reverted gpu_test_expectations > angle-mods.patch```
>- * copy ```angle-mods.patch``` in ```gpu_test_expectations```
>-
>-How to update from Chromium:
>-
>- * ```git apply -R angle-mods.patch```, ```git add . -u```, ```git commit```
>- * Copy over Chromium files, ```git add . -u```, ```git commit```
>- * ```git revert HEAD~```
>- * ```rm angle-mods.patch```
>- * ```git diff HEAD~ (`)ls(`) > angle-mods.patch```,```git add angle-mods.patch```, ```git commit --amend```
>- * ```git rebase -i``` to squash the three patches into one.
>-
>diff --git a/Source/ThirdParty/ANGLE/src/tests/third_party/gpu_test_expectations/angle-mods.patch b/Source/ThirdParty/ANGLE/src/tests/third_party/gpu_test_expectations/angle-mods.patch
>deleted file mode 100644
>index 75cc8ec2694..00000000000
>--- a/Source/ThirdParty/ANGLE/src/tests/third_party/gpu_test_expectations/angle-mods.patch
>+++ /dev/null
>@@ -1,538 +0,0 @@
>-diff -u -rupN gpu_test_expectations_reverted/HowToMakeChanges.md gpu_test_expectations/HowToMakeChanges.md
>---- gpu_test_expectations_reverted/HowToMakeChanges.md	1969-12-31 19:00:00.000000000 -0500
>-+++ gpu_test_expectations/HowToMakeChanges.md	2016-09-13 10:06:02.000000000 -0400
>-@@ -0,0 +1,22 @@
>-+Because the ```gpu_test_expectations``` directory is based on parts of Chromium's ```gpu/config```
>-+directory, we want to keep a patch of the changes added to make it compile with ANGLE. This
>-+will allow us to merge Chromium changes easily in our ```gpu_test_expectations```.
>-+
>-+In order to make a change to this directory, do the following:
>-+
>-+ * copy the directory somewhere like in ```gpu_test_expectations_reverted```
>-+ * in ```gpu_test_expectations_reverted``` run ```patch -p 1 -R < angle-mods.patch```
>-+ * do your changes in ```gpu_test_expectations```
>-+ * delete angle-mods.patch in both directories
>-+ * run ```diff -rupN gpu_test_expectations_reverted gpu_test_expectations > angle-mods.patch```
>-+ * copy ```angle-mods.patch``` in ```gpu_test_expectations```
>-+
>-+How to update from Chromium:
>-+
>-+ * ```git apply -R angle-mods.patch```, ```git add . -u```, ```git commit```
>-+ * Copy over Chromium files, ```git add . -u```, ```git commit```
>-+ * ```git revert HEAD~```
>-+ * ```rm angle-mods.patch```
>-+ * ```git diff HEAD~ (`)ls(`) > angle-mods.patch```,```git add angle-mods.patch```, ```git commit --amend```
>-+ * ```git rebase -i``` to squash the three patches into one.
>-+
>-diff -u -rupN gpu_test_expectations_reverted/angle_config.h gpu_test_expectations/angle_config.h
>---- gpu_test_expectations_reverted/angle_config.h	1969-12-31 19:00:00.000000000 -0500
>-+++ gpu_test_expectations/angle_config.h	2017-09-11 17:18:07.000000000 -0400
>-@@ -0,0 +1,73 @@
>-+//
>-+// Copyright 2015 The ANGLE Project Authors. All rights reserved.
>-+// Use of this source code is governed by a BSD-style license that can be
>-+// found in the LICENSE file.
>-+//
>-+// angle_config.h:
>-+//   Helpers for importing the gpu test expectations package from Chrome.
>-+//
>-+
>-+#ifndef ANGLE_GPU_TEST_EXPECTATIONS_ANGLE_CONFIG_H_
>-+#define ANGLE_GPU_TEST_EXPECTATIONS_ANGLE_CONFIG_H_
>-+
>-+#include <stdint.h>
>-+
>-+#include <iostream>
>-+
>-+#include "common/debug.h"
>-+#include "common/string_utils.h"
>-+
>-+#define DCHECK_EQ(A,B) ASSERT((A) == (B))
>-+#define DCHECK_NE(A,B) ASSERT((A) != (B))
>-+#define DCHECK(X) ASSERT(X)
>-+#define DLOG(X) std::cerr
>-+#define LOG(X) std::cerr
>-+
>-+#define GPU_EXPORT
>-+
>-+// Shim Chromium's types by importing symbols in the correct namespaces
>-+namespace base
>-+{
>-+    using angle::kWhitespaceASCII;
>-+    using angle::TRIM_WHITESPACE;
>-+    using angle::KEEP_WHITESPACE;
>-+    using angle::SPLIT_WANT_ALL;
>-+    using angle::SPLIT_WANT_NONEMPTY;
>-+    using angle::SplitString;
>-+    using angle::SplitStringAlongWhitespace;
>-+    using angle::HexStringToUInt;
>-+    using angle::ReadFileToString;
>-+
>-+    using TimeDelta = int;
>-+}  // namespace base
>-+
>-+namespace gfx
>-+{
>-+    class Size
>-+    {
>-+      public:
>-+        int width() const { return 0; }
>-+        int height() const { return 0; }
>-+    };
>-+}  // namespace gfx
>-+
>-+struct DxDiagNode
>-+{
>-+};
>-+
>-+// TODO(jmadill): other platforms
>-+// clang-format off
>-+#if defined(_WIN32) || defined(_WIN64)
>-+#    define OS_WIN
>-+#elif defined(ANDROID)
>-+#    define OS_ANDROID
>-+#elif defined(__linux__)
>-+#    define OS_LINUX
>-+#elif defined(__APPLE__)
>-+#    define OS_MACOSX
>-+#else
>-+#    error "Unsupported platform"
>-+#endif
>-+// clang-format on
>-+
>-+#endif
>-diff -u -rupN gpu_test_expectations_reverted/gpu_info.cc gpu_test_expectations/gpu_info.cc
>---- gpu_test_expectations_reverted/gpu_info.cc	2017-10-30 14:30:27.000000000 -0400
>-+++ gpu_test_expectations/gpu_info.cc	2017-10-27 13:46:39.000000000 -0400
>-@@ -4,7 +4,7 @@
>- 
>- #include <stdint.h>
>- 
>--#include "gpu/config/gpu_info.h"
>-+#include "gpu_info.h"
>- 
>- namespace {
>- 
>-@@ -100,7 +100,7 @@ const GPUInfo::GPUDevice& GPUInfo::activ
>-     if (secondary_gpu.active)
>-       return secondary_gpu;
>-   }
>--  DLOG(ERROR) << "No active GPU found, returning primary GPU.";
>-+  DLOG(ERROR) << "No active GPU found, returning primary GPU.\n";
>-   return gpu;
>- }
>- 
>-diff -u -rupN gpu_test_expectations_reverted/gpu_info.h gpu_test_expectations/gpu_info.h
>---- gpu_test_expectations_reverted/gpu_info.h	2017-10-30 14:30:27.000000000 -0400
>-+++ gpu_test_expectations/gpu_info.h	2017-10-27 13:46:39.000000000 -0400
>-@@ -2,8 +2,8 @@
>- // Use of this source code is governed by a BSD-style license that can be
>- // found in the LICENSE file.
>- 
>--#ifndef GPU_CONFIG_GPU_INFO_H_
>--#define GPU_CONFIG_GPU_INFO_H_
>-+#ifndef ANGLE_GPU_CONFIG_GPU_INFO_H_
>-+#define ANGLE_GPU_CONFIG_GPU_INFO_H_
>- 
>- // Provides access to the GPU information for the system
>- // on which chrome is currently running.
>-@@ -13,12 +13,7 @@
>- #include <string>
>- #include <vector>
>- 
>--#include "base/time/time.h"
>--#include "base/version.h"
>--#include "build/build_config.h"
>--#include "gpu/config/dx_diag_node.h"
>--#include "gpu/gpu_export.h"
>--#include "ui/gfx/geometry/size.h"
>-+#include "angle_config.h"
>- 
>- #if defined(USE_X11)
>- typedef unsigned long VisualID;
>-@@ -299,4 +294,4 @@ struct GPU_EXPORT GPUInfo {
>- 
>- }  // namespace gpu
>- 
>--#endif  // GPU_CONFIG_GPU_INFO_H_
>-+#endif  // ANGLE_GPU_CONFIG_GPU_INFO_H_
>-diff -u -rupN gpu_test_expectations_reverted/gpu_test_config.cc gpu_test_expectations/gpu_test_config.cc
>---- gpu_test_expectations_reverted/gpu_test_config.cc	2017-10-30 14:30:27.000000000 -0400
>-+++ gpu_test_expectations/gpu_test_config.cc	2017-10-30 14:44:19.000000000 -0400
>-@@ -2,21 +2,53 @@
>- // Use of this source code is governed by a BSD-style license that can be
>- // found in the LICENSE file.
>- 
>--#include "gpu/config/gpu_test_config.h"
>-+#include "gpu_test_config.h"
>- 
>- #include <stddef.h>
>- #include <stdint.h>
>- 
>--#include "base/logging.h"
>--#include "base/sys_info.h"
>--#include "gpu/config/gpu_info.h"
>--#include "gpu/config/gpu_info_collector.h"
>--#include "gpu/config/gpu_test_expectations_parser.h"
>-+#include "gpu_info.h"
>-+#include "gpu_test_expectations_parser.h"
>- 
>--#if defined(OS_WIN)
>--#include "base/win/windows_version.h"
>-+#if defined(OS_MACOSX)
>-+#include "gpu_test_config_mac.h"
>-+#endif
>-+
>-+#if !defined(OS_ANDROID)
>-+#include "gpu_info_util/SystemInfo.h"
>- #endif
>- 
>-+#if defined(OS_WIN)
>-+
>-+namespace base {
>-+namespace {
>-+
>-+// Disable the deprecated function warning for GetVersionEx
>-+#pragma warning(disable: 4996)
>-+
>-+class SysInfo
>-+{
>-+  public:
>-+    static void OperatingSystemVersionNumbers(
>-+        int32_t *major_version, int32_t *minor_version, int32_t *bugfix_version);
>-+};
>-+
>-+// static
>-+void SysInfo::OperatingSystemVersionNumbers(
>-+    int32_t *major_version, int32_t *minor_version, int32_t *bugfix_version)
>-+{
>-+  OSVERSIONINFOEX version_info = { sizeof version_info };
>-+  ::GetVersionEx(reinterpret_cast<OSVERSIONINFO*>(&version_info));
>-+  *major_version = version_info.dwMajorVersion;
>-+  *minor_version = version_info.dwMinorVersion;
>-+  *bugfix_version = version_info.dwBuildNumber;
>-+}
>-+
>-+} // anonymous namespace
>-+} // namespace base
>-+
>-+#endif // defined(OS_WIN)
>-+
>- namespace gpu {
>- 
>- namespace {
>-@@ -46,8 +78,7 @@ GPUTestConfig::OS GetCurrentOS() {
>-   int32_t major_version = 0;
>-   int32_t minor_version = 0;
>-   int32_t bugfix_version = 0;
>--  base::SysInfo::OperatingSystemVersionNumbers(
>--      &major_version, &minor_version, &bugfix_version);
>-+  angle::GetOperatingSystemVersionNumbers(&major_version, &minor_version, &bugfix_version);
>-   if (major_version == 10) {
>-     switch (minor_version) {
>-       case 5:
>-@@ -76,6 +107,26 @@ GPUTestConfig::OS GetCurrentOS() {
>-   return GPUTestConfig::kOsUnknown;
>- }
>- 
>-+#if !defined(OS_ANDROID)
>-+CollectInfoResult CollectBasicGraphicsInfo(GPUInfo* gpu_info) {
>-+  angle::SystemInfo info;
>-+  if (!angle::GetSystemInfo(&info)) {
>-+    return kCollectInfoFatalFailure;
>-+  }
>-+  const angle::GPUDeviceInfo& gpu = info.gpus[info.primaryGPUIndex];
>-+  gpu_info->gpu.vendor_id = gpu.vendorId;
>-+  gpu_info->gpu.device_id = gpu.deviceId;
>-+  gpu_info->gpu.active = true;
>-+  return kCollectInfoSuccess;
>-+}
>-+#else
>-+CollectInfoResult CollectBasicGraphicsInfo(GPUInfo* gpu_info) {
>-+  gpu_info->gpu.vendor_id = 0;
>-+  gpu_info->gpu.device_id = 0;
>-+  gpu_info->gpu.active = true;
>-+  return kCollectInfoNonFatalFailure;
>-+}
>-+#endif  // defined(OS_ANDROID)
>- }  // namespace anonymous
>- 
>- GPUTestConfig::GPUTestConfig()
>-@@ -260,7 +311,7 @@ bool GPUTestBotConfig::LoadCurrentConfig
>-     GPUInfo my_gpu_info;
>-     CollectInfoResult result = CollectBasicGraphicsInfo(&my_gpu_info);
>-     if (result != kCollectInfoSuccess) {
>--      LOG(ERROR) << "Fail to identify GPU";
>-+      LOG(ERROR) << "Fail to identify GPU\n";
>-       DisableGPUInfoValidation();
>-       rt = true;
>-     } else {
>-@@ -271,7 +322,7 @@ bool GPUTestBotConfig::LoadCurrentConfig
>-   }
>-   set_os(GetCurrentOS());
>-   if (os() == kOsUnknown) {
>--    LOG(ERROR) << "Unknown OS";
>-+    LOG(ERROR) << "Unknown OS\n";
>-     rt = false;
>-   }
>- #if defined(NDEBUG)
>-diff -u -rupN gpu_test_expectations_reverted/gpu_test_config.h gpu_test_expectations/gpu_test_config.h
>---- gpu_test_expectations_reverted/gpu_test_config.h	2017-10-30 14:30:27.000000000 -0400
>-+++ gpu_test_expectations/gpu_test_config.h	2017-10-27 13:46:39.000000000 -0400
>-@@ -2,16 +2,15 @@
>- // Use of this source code is governed by a BSD-style license that can be
>- // found in the LICENSE file.
>- 
>--#ifndef GPU_CONFIG_GPU_TEST_CONFIG_H_
>--#define GPU_CONFIG_GPU_TEST_CONFIG_H_
>-+#ifndef ANGLE_GPU_CONFIG_GPU_TEST_CONFIG_H_
>-+#define ANGLE_GPU_CONFIG_GPU_TEST_CONFIG_H_
>- 
>- #include <stdint.h>
>- 
>- #include <string>
>- #include <vector>
>- 
>--#include "base/compiler_specific.h"
>--#include "gpu/gpu_export.h"
>-+#include "angle_config.h"
>- 
>- namespace gpu {
>- 
>-@@ -145,5 +144,5 @@ class GPU_EXPORT GPUTestBotConfig : publ
>- 
>- }  // namespace gpu
>- 
>--#endif  // GPU_CONFIG_GPU_TEST_CONFIG_H_
>-+#endif  // ANGLE_GPU_CONFIG_GPU_TEST_CONFIG_H_
>- 
>-diff -u -rupN gpu_test_expectations_reverted/gpu_test_config_mac.h gpu_test_expectations/gpu_test_config_mac.h
>---- gpu_test_expectations_reverted/gpu_test_config_mac.h	1969-12-31 19:00:00.000000000 -0500
>-+++ gpu_test_expectations/gpu_test_config_mac.h	2017-10-30 14:44:19.000000000 -0400
>-@@ -0,0 +1,24 @@
>-+//
>-+// Copyright 2015 The ANGLE Project Authors. All rights reserved.
>-+// Use of this source code is governed by a BSD-style license that can be
>-+// found in the LICENSE file.
>-+//
>-+// gpu_test_config_mac.h:
>-+//   Helper functions for gpu_test_config that have to be compiled in ObjectiveC++
>-+//
>-+
>-+#ifndef ANGLE_GPU_TEST_EXPECTATIONS_GPU_TEST_CONFIG_MAC_H_
>-+#define ANGLE_GPU_TEST_EXPECTATIONS_GPU_TEST_CONFIG_MAC_H_
>-+
>-+#include "gpu_info.h"
>-+
>-+namespace angle
>-+{
>-+
>-+void GetOperatingSystemVersionNumbers(int32_t *major_version,
>-+                                      int32_t *minor_version,
>-+                                      int32_t *bugfix_version);
>-+
>-+} // namespace angle
>-+
>-+#endif // ANGLE_GPU_TEST_EXPECTATIONS_GPU_TEST_CONFIG_MAC_H_
>-diff -u -rupN gpu_test_expectations_reverted/gpu_test_config_mac.mm gpu_test_expectations/gpu_test_config_mac.mm
>---- gpu_test_expectations_reverted/gpu_test_config_mac.mm	1969-12-31 19:00:00.000000000 -0500
>-+++ gpu_test_expectations/gpu_test_config_mac.mm	2017-10-30 14:31:32.000000000 -0400
>-@@ -0,0 +1,49 @@
>-+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
>-+// Use of this source code is governed by a BSD-style license that can be
>-+// found in the LICENSE file.
>-+
>-+// gpu_test_config_mac.mm:
>-+//   Helper functions for gpu_test_config that have to be compiled in ObjectiveC++
>-+
>-+#include "gpu_test_config_mac.h"
>-+
>-+#import <Cocoa/Cocoa.h>
>-+
>-+// OSX 10.8 deprecates Gestalt but doesn't make the operatingSystemVersion property part of the
>-+// public interface of NSProcessInfo until 10.10. Add a forward declaration.
>-+#if !defined(MAC_OS_X_VERSION_10_10) || MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_10
>-+@interface NSProcessInfo (YosemiteSDK)
>-+@property(readonly) NSOperatingSystemVersion operatingSystemVersion;
>-+@end
>-+#endif
>-+
>-+namespace angle
>-+{
>-+
>-+void GetOperatingSystemVersionNumbers(int32_t *major_version,
>-+                                      int32_t *minor_version,
>-+                                      int32_t *bugfix_version)
>-+{
>-+#if MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_8
>-+    Gestalt(gestaltSystemVersionMajor, reinterpret_cast<SInt32 *>(major_version));
>-+    Gestalt(gestaltSystemVersionMinor, reinterpret_cast<SInt32 *>(minor_version));
>-+    Gestalt(gestaltSystemVersionBugFix, reinterpret_cast<SInt32 *>(bugfix_version));
>-+#else
>-+    if (@available(macOS 10.10, *))
>-+    {
>-+        NSOperatingSystemVersion version = [[NSProcessInfo processInfo] operatingSystemVersion];
>-+        *major_version                   = version.majorVersion;
>-+        *minor_version                   = version.minorVersion;
>-+        *bugfix_version                  = version.patchVersion;
>-+    }
>-+    else
>-+    {
>-+        // This can only happen on 10.9
>-+        *major_version  = 10;
>-+        *minor_version  = 9;
>-+        *bugfix_version = 0;
>-+    }
>-+#endif
>-+}
>-+
>-+} // namespace angle
>-diff -u -rupN gpu_test_expectations_reverted/gpu_test_expectations_parser.cc gpu_test_expectations/gpu_test_expectations_parser.cc
>---- gpu_test_expectations_reverted/gpu_test_expectations_parser.cc	2017-10-30 14:30:35.000000000 -0400
>-+++ gpu_test_expectations/gpu_test_expectations_parser.cc	2017-10-27 13:46:39.000000000 -0400
>-@@ -2,17 +2,47 @@
>- // Use of this source code is governed by a BSD-style license that can be
>- // found in the LICENSE file.
>- 
>--#include "gpu/config/gpu_test_expectations_parser.h"
>-+#include "gpu_test_expectations_parser.h"
>- 
>- #include <stddef.h>
>- #include <stdint.h>
>- 
>--#include "base/files/file_util.h"
>--#include "base/logging.h"
>--#include "base/strings/string_number_conversions.h"
>--#include "base/strings/string_split.h"
>--#include "base/strings/string_util.h"
>--#include "base/strings/stringprintf.h"
>-+#include "angle_config.h"
>-+#include "common/angleutils.h"
>-+
>-+namespace base {
>-+
>-+namespace {
>-+
>-+bool StartsWithASCII(const std::string& str,
>-+                     const std::string& search,
>-+                     bool case_sensitive) {
>-+  ASSERT(!case_sensitive);
>-+  return str.compare(0, search.length(), search) == 0;
>-+}
>-+
>-+template <class Char> inline Char ToLowerASCII(Char c) {
>-+  return (c >= 'A' && c <= 'Z') ? (c + ('a' - 'A')) : c;
>-+}
>-+
>-+template<typename Iter>
>-+static inline bool DoLowerCaseEqualsASCII(Iter a_begin,
>-+                                          Iter a_end,
>-+                                          const char* b) {
>-+  for (Iter it = a_begin; it != a_end; ++it, ++b) {
>-+    if (!*b || base::ToLowerASCII(*it) != *b)
>-+      return false;
>-+  }
>-+  return *b == 0;
>-+}
>-+
>-+bool LowerCaseEqualsASCII(const std::string& a, const char* b) {
>-+  return DoLowerCaseEqualsASCII(a.begin(), a.end(), b);
>-+}
>-+
>-+} // anonymous namespace
>-+
>-+} // namespace base
>- 
>- namespace gpu {
>- 
>-@@ -153,9 +183,9 @@ const char* kErrorMessage[] = {
>- };
>- 
>- Token ParseToken(const std::string& word) {
>--  if (base::StartsWith(word, "//", base::CompareCase::INSENSITIVE_ASCII))
>-+  if (base::StartsWithASCII(word, "//", false))
>-     return kTokenComment;
>--  if (base::StartsWith(word, "0x", base::CompareCase::INSENSITIVE_ASCII))
>-+  if (base::StartsWithASCII(word, "0x", false))
>-     return kConfigGPUDeviceID;
>- 
>-   for (int32_t i = 0; i < kNumberOfExactMatchTokens; ++i) {
>-@@ -211,8 +241,8 @@ bool GPUTestExpectationsParser::LoadTest
>-   return rt;
>- }
>- 
>--bool GPUTestExpectationsParser::LoadTestExpectations(
>--    const base::FilePath& path) {
>-+bool GPUTestExpectationsParser::LoadTestExpectationsFromFile(
>-+    const std::string& path) {
>-   entries_.clear();
>-   error_messages_.clear();
>- 
>-@@ -542,20 +572,17 @@ bool GPUTestExpectationsParser::DetectCo
>- 
>- void GPUTestExpectationsParser::PushErrorMessage(
>-     const std::string& message, size_t line_number) {
>--  error_messages_.push_back(
>--      base::StringPrintf("Line %d : %s",
>--                         static_cast<int>(line_number), message.c_str()));
>-+  error_messages_.push_back("Line " + ToString(line_number) +
>-+                            " : " + message.c_str());
>- }
>- 
>- void GPUTestExpectationsParser::PushErrorMessage(
>-     const std::string& message,
>-     size_t entry1_line_number,
>-     size_t entry2_line_number) {
>--  error_messages_.push_back(
>--      base::StringPrintf("Line %d and %d : %s",
>--                         static_cast<int>(entry1_line_number),
>--                         static_cast<int>(entry2_line_number),
>--                         message.c_str()));
>-+  error_messages_.push_back("Line " + ToString(entry1_line_number) +
>-+                            " and " + ToString(entry2_line_number) +
>-+                            " : " + message.c_str());
>- }
>- 
>- GPUTestExpectationsParser:: GPUTestExpectationEntry::GPUTestExpectationEntry()
>-diff -u -rupN gpu_test_expectations_reverted/gpu_test_expectations_parser.h gpu_test_expectations/gpu_test_expectations_parser.h
>---- gpu_test_expectations_reverted/gpu_test_expectations_parser.h	2017-10-30 14:30:35.000000000 -0400
>-+++ gpu_test_expectations/gpu_test_expectations_parser.h	2017-09-11 17:18:07.000000000 -0400
>-@@ -2,8 +2,8 @@
>- // Use of this source code is governed by a BSD-style license that can be
>- // found in the LICENSE file.
>- 
>--#ifndef GPU_CONFIG_GPU_TEST_EXPECTATIONS_PARSER_H_
>--#define GPU_CONFIG_GPU_TEST_EXPECTATIONS_PARSER_H_
>-+#ifndef ANGLE_GPU_CONFIG_GPU_TEST_EXPECTATIONS_PARSER_H_
>-+#define ANGLE_GPU_CONFIG_GPU_TEST_EXPECTATIONS_PARSER_H_
>- 
>- #include <stddef.h>
>- #include <stdint.h>
>-@@ -11,9 +11,8 @@
>- #include <string>
>- #include <vector>
>- 
>--#include "base/files/file_path.h"
>--#include "gpu/config/gpu_test_config.h"
>--#include "gpu/gpu_export.h"
>-+#include "angle_config.h"
>-+#include "gpu_test_config.h"
>- 
>- namespace gpu {
>- 
>-@@ -34,7 +33,7 @@ class GPU_EXPORT GPUTestExpectationsPars
>-   // save all the entries. Otherwise, generate error messages.
>-   // Return true if parsing succeeds.
>-   bool LoadTestExpectations(const std::string& data);
>--  bool LoadTestExpectations(const base::FilePath& path);
>-+  bool LoadTestExpectationsFromFile(const std::string& path);
>- 
>-   // Query error messages from the last LoadTestExpectations() call.
>-   const std::vector<std::string>& GetErrorMessages() const;
>-@@ -87,5 +86,5 @@ class GPU_EXPORT GPUTestExpectationsPars
>- 
>- }  // namespace gpu
>- 
>--#endif  // GPU_CONFIG_GPU_TEST_EXPECTATIONS_PARSER_H_
>-+#endif  // ANGLE_GPU_CONFIG_GPU_TEST_EXPECTATIONS_PARSER_H_
>- 
>diff --git a/Source/ThirdParty/ANGLE/src/tests/third_party/gpu_test_expectations/angle_config.h b/Source/ThirdParty/ANGLE/src/tests/third_party/gpu_test_expectations/angle_config.h
>deleted file mode 100644
>index 1e67e62796a..00000000000
>--- a/Source/ThirdParty/ANGLE/src/tests/third_party/gpu_test_expectations/angle_config.h
>+++ /dev/null
>@@ -1,73 +0,0 @@
>-//
>-// Copyright 2015 The ANGLE Project Authors. All rights reserved.
>-// Use of this source code is governed by a BSD-style license that can be
>-// found in the LICENSE file.
>-//
>-// angle_config.h:
>-//   Helpers for importing the gpu test expectations package from Chrome.
>-//
>-
>-#ifndef ANGLE_GPU_TEST_EXPECTATIONS_ANGLE_CONFIG_H_
>-#define ANGLE_GPU_TEST_EXPECTATIONS_ANGLE_CONFIG_H_
>-
>-#include <stdint.h>
>-
>-#include <iostream>
>-
>-#include "common/debug.h"
>-#include "common/string_utils.h"
>-
>-#define DCHECK_EQ(A,B) ASSERT((A) == (B))
>-#define DCHECK_NE(A,B) ASSERT((A) != (B))
>-#define DCHECK(X) ASSERT(X)
>-#define DLOG(X) std::cerr
>-#define LOG(X) std::cerr
>-
>-#define GPU_EXPORT
>-
>-// Shim Chromium's types by importing symbols in the correct namespaces
>-namespace base
>-{
>-    using angle::kWhitespaceASCII;
>-    using angle::TRIM_WHITESPACE;
>-    using angle::KEEP_WHITESPACE;
>-    using angle::SPLIT_WANT_ALL;
>-    using angle::SPLIT_WANT_NONEMPTY;
>-    using angle::SplitString;
>-    using angle::SplitStringAlongWhitespace;
>-    using angle::HexStringToUInt;
>-    using angle::ReadFileToString;
>-
>-    using TimeDelta = int;
>-}  // namespace base
>-
>-namespace gfx
>-{
>-    class Size
>-    {
>-      public:
>-        int width() const { return 0; }
>-        int height() const { return 0; }
>-    };
>-}  // namespace gfx
>-
>-struct DxDiagNode
>-{
>-};
>-
>-// TODO(jmadill): other platforms
>-// clang-format off
>-#if defined(_WIN32) || defined(_WIN64)
>-#    define OS_WIN
>-#elif defined(ANDROID)
>-#    define OS_ANDROID
>-#elif defined(__linux__)
>-#    define OS_LINUX
>-#elif defined(__APPLE__)
>-#    define OS_MACOSX
>-#else
>-#    error "Unsupported platform"
>-#endif
>-// clang-format on
>-
>-#endif
>diff --git a/Source/ThirdParty/ANGLE/src/tests/third_party/gpu_test_expectations/gpu_info.cc b/Source/ThirdParty/ANGLE/src/tests/third_party/gpu_test_expectations/gpu_info.cc
>deleted file mode 100644
>index 6632abad442..00000000000
>--- a/Source/ThirdParty/ANGLE/src/tests/third_party/gpu_test_expectations/gpu_info.cc
>+++ /dev/null
>@@ -1,221 +0,0 @@
>-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
>-// Use of this source code is governed by a BSD-style license that can be
>-// found in the LICENSE file.
>-
>-#include <stdint.h>
>-
>-#include "gpu_info.h"
>-
>-namespace {
>-
>-void EnumerateGPUDevice(const gpu::GPUInfo::GPUDevice& device,
>-                        gpu::GPUInfo::Enumerator* enumerator) {
>-  enumerator->BeginGPUDevice();
>-  enumerator->AddInt("vendorId", device.vendor_id);
>-  enumerator->AddInt("deviceId", device.device_id);
>-  enumerator->AddBool("active", device.active);
>-  enumerator->AddString("vendorString", device.vendor_string);
>-  enumerator->AddString("deviceString", device.device_string);
>-  enumerator->EndGPUDevice();
>-}
>-
>-void EnumerateVideoDecodeAcceleratorSupportedProfile(
>-    const gpu::VideoDecodeAcceleratorSupportedProfile& profile,
>-    gpu::GPUInfo::Enumerator* enumerator) {
>-  enumerator->BeginVideoDecodeAcceleratorSupportedProfile();
>-  enumerator->AddInt("profile", profile.profile);
>-  enumerator->AddInt("maxResolutionWidth", profile.max_resolution.width());
>-  enumerator->AddInt("maxResolutionHeight", profile.max_resolution.height());
>-  enumerator->AddInt("minResolutionWidth", profile.min_resolution.width());
>-  enumerator->AddInt("minResolutionHeight", profile.min_resolution.height());
>-  enumerator->AddBool("encrypted_only", profile.encrypted_only);
>-  enumerator->EndVideoDecodeAcceleratorSupportedProfile();
>-}
>-
>-void EnumerateVideoEncodeAcceleratorSupportedProfile(
>-    const gpu::VideoEncodeAcceleratorSupportedProfile& profile,
>-    gpu::GPUInfo::Enumerator* enumerator) {
>-  enumerator->BeginVideoEncodeAcceleratorSupportedProfile();
>-  enumerator->AddInt("profile", profile.profile);
>-  enumerator->AddInt("maxResolutionWidth", profile.max_resolution.width());
>-  enumerator->AddInt("maxResolutionHeight", profile.max_resolution.height());
>-  enumerator->AddInt("maxFramerateNumerator", profile.max_framerate_numerator);
>-  enumerator->AddInt("maxFramerateDenominator",
>-                     profile.max_framerate_denominator);
>-  enumerator->EndVideoEncodeAcceleratorSupportedProfile();
>-}
>-
>-}  // namespace
>-
>-namespace gpu {
>-
>-VideoDecodeAcceleratorCapabilities::VideoDecodeAcceleratorCapabilities()
>-    : flags(0) {}
>-
>-VideoDecodeAcceleratorCapabilities::VideoDecodeAcceleratorCapabilities(
>-    const VideoDecodeAcceleratorCapabilities& other) = default;
>-
>-VideoDecodeAcceleratorCapabilities::~VideoDecodeAcceleratorCapabilities() {}
>-
>-GPUInfo::GPUDevice::GPUDevice()
>-    : vendor_id(0),
>-      device_id(0),
>-      active(false) {
>-}
>-
>-GPUInfo::GPUDevice::~GPUDevice() { }
>-
>-GPUInfo::GPUInfo()
>-    : optimus(false),
>-      amd_switchable(false),
>-      gl_reset_notification_strategy(0),
>-      software_rendering(false),
>-      direct_rendering(true),
>-      sandboxed(false),
>-      process_crash_count(0),
>-      in_process_gpu(true),
>-      passthrough_cmd_decoder(false),
>-      basic_info_state(kCollectInfoNone),
>-      context_info_state(kCollectInfoNone),
>-#if defined(OS_WIN)
>-      dx_diagnostics_info_state(kCollectInfoNone),
>-#endif
>-      jpeg_decode_accelerator_supported(false)
>-#if defined(USE_X11)
>-      ,
>-      system_visual(0),
>-      rgba_visual(0)
>-#endif
>-{
>-}
>-
>-GPUInfo::GPUInfo(const GPUInfo& other) = default;
>-
>-GPUInfo::~GPUInfo() { }
>-
>-const GPUInfo::GPUDevice& GPUInfo::active_gpu() const {
>-  if (gpu.active)
>-    return gpu;
>-  for (const GPUDevice& secondary_gpu : secondary_gpus) {
>-    if (secondary_gpu.active)
>-      return secondary_gpu;
>-  }
>-  DLOG(ERROR) << "No active GPU found, returning primary GPU.\n";
>-  return gpu;
>-}
>-
>-void GPUInfo::EnumerateFields(Enumerator* enumerator) const {
>-  struct GPUInfoKnownFields {
>-    base::TimeDelta initialization_time;
>-    bool optimus;
>-    bool amd_switchable;
>-    GPUDevice gpu;
>-    std::vector<GPUDevice> secondary_gpus;
>-    std::string driver_vendor;
>-    std::string driver_version;
>-    std::string driver_date;
>-    std::string pixel_shader_version;
>-    std::string vertex_shader_version;
>-    std::string max_msaa_samples;
>-    std::string machine_model_name;
>-    std::string machine_model_version;
>-    std::string gl_version_string;
>-    std::string gl_vendor;
>-    std::string gl_renderer;
>-    std::string gl_extensions;
>-    std::string gl_ws_vendor;
>-    std::string gl_ws_version;
>-    std::string gl_ws_extensions;
>-    uint32_t gl_reset_notification_strategy;
>-    bool software_rendering;
>-    bool direct_rendering;
>-    bool sandboxed;
>-    int process_crash_count;
>-    bool in_process_gpu;
>-    bool passthrough_cmd_decoder;
>-    bool supports_overlays;
>-    bool can_support_threaded_texture_mailbox;
>-    CollectInfoResult basic_info_state;
>-    CollectInfoResult context_info_state;
>-#if defined(OS_WIN)
>-    CollectInfoResult dx_diagnostics_info_state;
>-    DxDiagNode dx_diagnostics;
>-#endif
>-    VideoDecodeAcceleratorCapabilities video_decode_accelerator_capabilities;
>-    VideoEncodeAcceleratorSupportedProfiles
>-        video_encode_accelerator_supported_profiles;
>-    bool jpeg_decode_accelerator_supported;
>-#if defined(USE_X11)
>-    VisualID system_visual;
>-    VisualID rgba_visual;
>-#endif
>-  };
>-
>-  // If this assert fails then most likely something below needs to be updated.
>-  // Note that this assert is only approximate. If a new field is added to
>-  // GPUInfo which fits within the current padding then it will not be caught.
>-  static_assert(
>-      sizeof(GPUInfo) == sizeof(GPUInfoKnownFields),
>-      "fields have changed in GPUInfo, GPUInfoKnownFields must be updated");
>-
>-  // Required fields (according to DevTools protocol) first.
>-  enumerator->AddString("machineModelName", machine_model_name);
>-  enumerator->AddString("machineModelVersion", machine_model_version);
>-  EnumerateGPUDevice(gpu, enumerator);
>-  for (const auto& secondary_gpu: secondary_gpus)
>-    EnumerateGPUDevice(secondary_gpu, enumerator);
>-
>-  enumerator->BeginAuxAttributes();
>-  enumerator->AddTimeDeltaInSecondsF("initializationTime",
>-                                     initialization_time);
>-  enumerator->AddBool("optimus", optimus);
>-  enumerator->AddBool("amdSwitchable", amd_switchable);
>-  enumerator->AddString("driverVendor", driver_vendor);
>-  enumerator->AddString("driverVersion", driver_version);
>-  enumerator->AddString("driverDate", driver_date);
>-  enumerator->AddString("pixelShaderVersion", pixel_shader_version);
>-  enumerator->AddString("vertexShaderVersion", vertex_shader_version);
>-  enumerator->AddString("maxMsaaSamples", max_msaa_samples);
>-  enumerator->AddString("glVersion", gl_version);
>-  enumerator->AddString("glVendor", gl_vendor);
>-  enumerator->AddString("glRenderer", gl_renderer);
>-  enumerator->AddString("glExtensions", gl_extensions);
>-  enumerator->AddString("glWsVendor", gl_ws_vendor);
>-  enumerator->AddString("glWsVersion", gl_ws_version);
>-  enumerator->AddString("glWsExtensions", gl_ws_extensions);
>-  enumerator->AddInt(
>-      "glResetNotificationStrategy",
>-      static_cast<int>(gl_reset_notification_strategy));
>-  // TODO(kbr): add performance_stats.
>-  enumerator->AddBool("softwareRendering", software_rendering);
>-  enumerator->AddBool("directRendering", direct_rendering);
>-  enumerator->AddBool("sandboxed", sandboxed);
>-  enumerator->AddInt("processCrashCount", process_crash_count);
>-  enumerator->AddBool("inProcessGpu", in_process_gpu);
>-  enumerator->AddBool("passthroughCmdDecoder", passthrough_cmd_decoder);
>-  enumerator->AddBool("supportsOverlays", supports_overlays);
>-  enumerator->AddBool("canSupportThreadedTextureMailbox",
>-                      can_support_threaded_texture_mailbox);
>-  enumerator->AddInt("basicInfoState", basic_info_state);
>-  enumerator->AddInt("contextInfoState", context_info_state);
>-#if defined(OS_WIN)
>-  enumerator->AddInt("DxDiagnosticsInfoState", dx_diagnostics_info_state);
>-#endif
>-  // TODO(kbr): add dx_diagnostics on Windows.
>-  enumerator->AddInt("videoDecodeAcceleratorFlags",
>-                     video_decode_accelerator_capabilities.flags);
>-  for (const auto& profile :
>-       video_decode_accelerator_capabilities.supported_profiles)
>-    EnumerateVideoDecodeAcceleratorSupportedProfile(profile, enumerator);
>-  for (const auto& profile : video_encode_accelerator_supported_profiles)
>-    EnumerateVideoEncodeAcceleratorSupportedProfile(profile, enumerator);
>-  enumerator->AddBool("jpegDecodeAcceleratorSupported",
>-      jpeg_decode_accelerator_supported);
>-#if defined(USE_X11)
>-  enumerator->AddInt64("systemVisual", system_visual);
>-  enumerator->AddInt64("rgbaVisual", rgba_visual);
>-#endif
>-  enumerator->EndAuxAttributes();
>-}
>-
>-}  // namespace gpu
>diff --git a/Source/ThirdParty/ANGLE/src/tests/third_party/gpu_test_expectations/gpu_info.h b/Source/ThirdParty/ANGLE/src/tests/third_party/gpu_test_expectations/gpu_info.h
>deleted file mode 100644
>index 250f1f32e7f..00000000000
>--- a/Source/ThirdParty/ANGLE/src/tests/third_party/gpu_test_expectations/gpu_info.h
>+++ /dev/null
>@@ -1,297 +0,0 @@
>-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
>-// Use of this source code is governed by a BSD-style license that can be
>-// found in the LICENSE file.
>-
>-#ifndef ANGLE_GPU_CONFIG_GPU_INFO_H_
>-#define ANGLE_GPU_CONFIG_GPU_INFO_H_
>-
>-// Provides access to the GPU information for the system
>-// on which chrome is currently running.
>-
>-#include <stdint.h>
>-
>-#include <string>
>-#include <vector>
>-
>-#include "angle_config.h"
>-
>-#if defined(USE_X11)
>-typedef unsigned long VisualID;
>-#endif
>-
>-namespace gpu {
>-
>-// Result for the various Collect*Info* functions below.
>-// Fatal failures are for cases where we can't create a context at all or
>-// something, making the use of the GPU impossible.
>-// Non-fatal failures are for cases where we could gather most info, but maybe
>-// some is missing (e.g. unable to parse a version string or to detect the exact
>-// model).
>-enum CollectInfoResult {
>-  kCollectInfoNone = 0,
>-  kCollectInfoSuccess = 1,
>-  kCollectInfoNonFatalFailure = 2,
>-  kCollectInfoFatalFailure = 3
>-};
>-
>-// Video profile.  This *must* match media::VideoCodecProfile.
>-enum VideoCodecProfile {
>-  VIDEO_CODEC_PROFILE_UNKNOWN = -1,
>-  VIDEO_CODEC_PROFILE_MIN = VIDEO_CODEC_PROFILE_UNKNOWN,
>-  H264PROFILE_BASELINE = 0,
>-  H264PROFILE_MAIN,
>-  H264PROFILE_EXTENDED,
>-  H264PROFILE_HIGH,
>-  H264PROFILE_HIGH10PROFILE,
>-  H264PROFILE_HIGH422PROFILE,
>-  H264PROFILE_HIGH444PREDICTIVEPROFILE,
>-  H264PROFILE_SCALABLEBASELINE,
>-  H264PROFILE_SCALABLEHIGH,
>-  H264PROFILE_STEREOHIGH,
>-  H264PROFILE_MULTIVIEWHIGH,
>-  VP8PROFILE_ANY,
>-  VP9PROFILE_PROFILE0,
>-  VP9PROFILE_PROFILE1,
>-  VP9PROFILE_PROFILE2,
>-  VP9PROFILE_PROFILE3,
>-  HEVCPROFILE_MAIN,
>-  HEVCPROFILE_MAIN10,
>-  HEVCPROFILE_MAIN_STILL_PICTURE,
>-  DOLBYVISION_PROFILE0,
>-  DOLBYVISION_PROFILE4,
>-  DOLBYVISION_PROFILE5,
>-  DOLBYVISION_PROFILE7,
>-  THEORAPROFILE_ANY,
>-  VIDEO_CODEC_PROFILE_MAX = THEORAPROFILE_ANY,
>-};
>-
>-// Specification of a decoding profile supported by a hardware decoder.
>-struct GPU_EXPORT VideoDecodeAcceleratorSupportedProfile {
>-  VideoCodecProfile profile;
>-  gfx::Size max_resolution;
>-  gfx::Size min_resolution;
>-  bool encrypted_only;
>-};
>-
>-using VideoDecodeAcceleratorSupportedProfiles =
>-    std::vector<VideoDecodeAcceleratorSupportedProfile>;
>-
>-struct GPU_EXPORT VideoDecodeAcceleratorCapabilities {
>-  VideoDecodeAcceleratorCapabilities();
>-  VideoDecodeAcceleratorCapabilities(
>-      const VideoDecodeAcceleratorCapabilities& other);
>-  ~VideoDecodeAcceleratorCapabilities();
>-  VideoDecodeAcceleratorSupportedProfiles supported_profiles;
>-  uint32_t flags;
>-};
>-
>-// Specification of an encoding profile supported by a hardware encoder.
>-struct GPU_EXPORT VideoEncodeAcceleratorSupportedProfile {
>-  VideoCodecProfile profile;
>-  gfx::Size max_resolution;
>-  uint32_t max_framerate_numerator;
>-  uint32_t max_framerate_denominator;
>-};
>-using VideoEncodeAcceleratorSupportedProfiles =
>-    std::vector<VideoEncodeAcceleratorSupportedProfile>;
>-
>-struct GPU_EXPORT GPUInfo {
>-  struct GPU_EXPORT GPUDevice {
>-    GPUDevice();
>-    ~GPUDevice();
>-
>-    // The DWORD (uint32_t) representing the graphics card vendor id.
>-    uint32_t vendor_id;
>-
>-    // The DWORD (uint32_t) representing the graphics card device id.
>-    // Device ids are unique to vendor, not to one another.
>-    uint32_t device_id;
>-
>-    // Whether this GPU is the currently used one.
>-    // Currently this field is only supported and meaningful on OS X.
>-    bool active;
>-
>-    // The strings that describe the GPU.
>-    // In Linux these strings are obtained through libpci.
>-    // In Win/MacOSX, these two strings are not filled at the moment.
>-    // In Android, these are respectively GL_VENDOR and GL_RENDERER.
>-    std::string vendor_string;
>-    std::string device_string;
>-  };
>-
>-  GPUInfo();
>-  GPUInfo(const GPUInfo& other);
>-  ~GPUInfo();
>-
>-  // The amount of time taken to get from the process starting to the message
>-  // loop being pumped.
>-  base::TimeDelta initialization_time;
>-
>-  // Computer has NVIDIA Optimus
>-  bool optimus;
>-
>-  // Computer has AMD Dynamic Switchable Graphics
>-  bool amd_switchable;
>-
>-  // Primary GPU, for exmaple, the discrete GPU in a dual GPU machine.
>-  GPUDevice gpu;
>-
>-  // Secondary GPUs, for example, the integrated GPU in a dual GPU machine.
>-  std::vector<GPUDevice> secondary_gpus;
>-
>-  // The currently active gpu.
>-  const GPUDevice& active_gpu() const;
>-
>-  // The vendor of the graphics driver currently installed.
>-  std::string driver_vendor;
>-
>-  // The version of the graphics driver currently installed.
>-  std::string driver_version;
>-
>-  // The date of the graphics driver currently installed.
>-  std::string driver_date;
>-
>-  // The version of the pixel/fragment shader used by the gpu.
>-  std::string pixel_shader_version;
>-
>-  // The version of the vertex shader used by the gpu.
>-  std::string vertex_shader_version;
>-
>-  // The maximum multisapling sample count, either through ES3 or
>-  // EXT_multisampled_render_to_texture MSAA.
>-  std::string max_msaa_samples;
>-
>-  // The machine model identifier. They can contain any character, including
>-  // whitespaces.  Currently it is supported on MacOSX and Android.
>-  // Android examples: "Naxus 5", "XT1032".
>-  // On MacOSX, the version is stripped out of the model identifier, for
>-  // example, the original identifier is "MacBookPro7,2", and we put
>-  // "MacBookPro" as machine_model_name, and "7.2" as machine_model_version.
>-  std::string machine_model_name;
>-
>-  // The version of the machine model. Currently it is supported on MacOSX.
>-  // See machine_model_name's comment.
>-  std::string machine_model_version;
>-
>-  // The GL_VERSION string.
>-  std::string gl_version;
>-
>-  // The GL_VENDOR string.
>-  std::string gl_vendor;
>-
>-  // The GL_RENDERER string.
>-  std::string gl_renderer;
>-
>-  // The GL_EXTENSIONS string.
>-  std::string gl_extensions;
>-
>-  // GL window system binding vendor.  "" if not available.
>-  std::string gl_ws_vendor;
>-
>-  // GL window system binding version.  "" if not available.
>-  std::string gl_ws_version;
>-
>-  // GL window system binding extensions.  "" if not available.
>-  std::string gl_ws_extensions;
>-
>-  // GL reset notification strategy as defined by GL_ARB_robustness. 0 if GPU
>-  // reset detection or notification not available.
>-  uint32_t gl_reset_notification_strategy;
>-
>-  bool software_rendering;
>-
>-  // Whether the driver uses direct rendering. True on most platforms, false on
>-  // X11 when using remote X.
>-  bool direct_rendering;
>-
>-  // Whether the gpu process is running in a sandbox.
>-  bool sandboxed;
>-
>-  // Number of GPU process crashes recorded.
>-  int process_crash_count;
>-
>-  // True if the GPU is running in the browser process instead of its own.
>-  bool in_process_gpu;
>-
>-  // True if the GPU process is using the passthrough command decoder.
>-  bool passthrough_cmd_decoder;
>-
>-  // True if the current set of outputs supports overlays.
>-  bool supports_overlays = false;
>-
>-  // True only on android when extensions for threaded mailbox sharing are
>-  // present. Threaded mailbox sharing is used on Android only, so this check
>-  // is only implemented on Android.
>-  bool can_support_threaded_texture_mailbox = false;
>-
>-  // The state of whether the basic/context/DxDiagnostics info is collected and
>-  // if the collection fails or not.
>-  CollectInfoResult basic_info_state;
>-  CollectInfoResult context_info_state;
>-#if defined(OS_WIN)
>-  CollectInfoResult dx_diagnostics_info_state;
>-
>-  // The information returned by the DirectX Diagnostics Tool.
>-  DxDiagNode dx_diagnostics;
>-#endif
>-
>-  VideoDecodeAcceleratorCapabilities video_decode_accelerator_capabilities;
>-  VideoEncodeAcceleratorSupportedProfiles
>-      video_encode_accelerator_supported_profiles;
>-  bool jpeg_decode_accelerator_supported;
>-
>-#if defined(USE_X11)
>-  VisualID system_visual;
>-  VisualID rgba_visual;
>-#endif
>-
>-  // Note: when adding new members, please remember to update EnumerateFields
>-  // in gpu_info.cc.
>-
>-  // In conjunction with EnumerateFields, this allows the embedder to
>-  // enumerate the values in this structure without having to embed
>-  // references to its specific member variables. This simplifies the
>-  // addition of new fields to this type.
>-  class Enumerator {
>-   public:
>-    // The following methods apply to the "current" object. Initially this
>-    // is the root object, but calls to BeginGPUDevice/EndGPUDevice and
>-    // BeginAuxAttributes/EndAuxAttributes change the object to which these
>-    // calls should apply.
>-    virtual void AddInt64(const char* name, int64_t value) = 0;
>-    virtual void AddInt(const char* name, int value) = 0;
>-    virtual void AddString(const char* name, const std::string& value) = 0;
>-    virtual void AddBool(const char* name, bool value) = 0;
>-    virtual void AddTimeDeltaInSecondsF(const char* name,
>-                                        const base::TimeDelta& value) = 0;
>-
>-    // Markers indicating that a GPUDevice is being described.
>-    virtual void BeginGPUDevice() = 0;
>-    virtual void EndGPUDevice() = 0;
>-
>-    // Markers indicating that a VideoDecodeAcceleratorSupportedProfile is
>-    // being described.
>-    virtual void BeginVideoDecodeAcceleratorSupportedProfile() = 0;
>-    virtual void EndVideoDecodeAcceleratorSupportedProfile() = 0;
>-
>-    // Markers indicating that a VideoEncodeAcceleratorSupportedProfile is
>-    // being described.
>-    virtual void BeginVideoEncodeAcceleratorSupportedProfile() = 0;
>-    virtual void EndVideoEncodeAcceleratorSupportedProfile() = 0;
>-
>-    // Markers indicating that "auxiliary" attributes of the GPUInfo
>-    // (according to the DevTools protocol) are being described.
>-    virtual void BeginAuxAttributes() = 0;
>-    virtual void EndAuxAttributes() = 0;
>-
>-   protected:
>-    virtual ~Enumerator() {}
>-  };
>-
>-  // Outputs the fields in this structure to the provided enumerator.
>-  void EnumerateFields(Enumerator* enumerator) const;
>-};
>-
>-}  // namespace gpu
>-
>-#endif  // ANGLE_GPU_CONFIG_GPU_INFO_H_
>diff --git a/Source/ThirdParty/ANGLE/src/tests/third_party/gpu_test_expectations/gpu_test_config.cc b/Source/ThirdParty/ANGLE/src/tests/third_party/gpu_test_expectations/gpu_test_config.cc
>deleted file mode 100644
>index 5fe381e981c..00000000000
>--- a/Source/ThirdParty/ANGLE/src/tests/third_party/gpu_test_expectations/gpu_test_config.cc
>+++ /dev/null
>@@ -1,363 +0,0 @@
>-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
>-// Use of this source code is governed by a BSD-style license that can be
>-// found in the LICENSE file.
>-
>-#include "gpu_test_config.h"
>-
>-#include <stddef.h>
>-#include <stdint.h>
>-
>-#include "gpu_info.h"
>-#include "gpu_test_expectations_parser.h"
>-
>-#if defined(OS_MACOSX)
>-#include "gpu_test_config_mac.h"
>-#endif
>-
>-#if !defined(OS_ANDROID)
>-#include "gpu_info_util/SystemInfo.h"
>-#endif
>-
>-#if defined(OS_WIN)
>-
>-namespace base {
>-namespace {
>-
>-// Disable the deprecated function warning for GetVersionEx
>-#pragma warning(disable: 4996)
>-
>-class SysInfo
>-{
>-  public:
>-    static void OperatingSystemVersionNumbers(
>-        int32_t *major_version, int32_t *minor_version, int32_t *bugfix_version);
>-};
>-
>-// static
>-void SysInfo::OperatingSystemVersionNumbers(
>-    int32_t *major_version, int32_t *minor_version, int32_t *bugfix_version)
>-{
>-  OSVERSIONINFOEX version_info = { sizeof version_info };
>-  ::GetVersionEx(reinterpret_cast<OSVERSIONINFO*>(&version_info));
>-  *major_version = version_info.dwMajorVersion;
>-  *minor_version = version_info.dwMinorVersion;
>-  *bugfix_version = version_info.dwBuildNumber;
>-}
>-
>-} // anonymous namespace
>-} // namespace base
>-
>-#endif // defined(OS_WIN)
>-
>-namespace gpu {
>-
>-namespace {
>-
>-GPUTestConfig::OS GetCurrentOS() {
>-#if defined(OS_CHROMEOS)
>-  return GPUTestConfig::kOsChromeOS;
>-#elif defined(OS_LINUX) || defined(OS_OPENBSD)
>-  return GPUTestConfig::kOsLinux;
>-#elif defined(OS_WIN)
>-  int32_t major_version = 0;
>-  int32_t minor_version = 0;
>-  int32_t bugfix_version = 0;
>-  base::SysInfo::OperatingSystemVersionNumbers(
>-      &major_version, &minor_version, &bugfix_version);
>-  if (major_version == 5)
>-    return GPUTestConfig::kOsWinXP;
>-  if (major_version == 6 && minor_version == 0)
>-    return GPUTestConfig::kOsWinVista;
>-  if (major_version == 6 && minor_version == 1)
>-    return GPUTestConfig::kOsWin7;
>-  if (major_version == 6 && (minor_version == 2 || minor_version == 3))
>-    return GPUTestConfig::kOsWin8;
>-  if (major_version == 10)
>-    return GPUTestConfig::kOsWin10;
>-#elif defined(OS_MACOSX)
>-  int32_t major_version = 0;
>-  int32_t minor_version = 0;
>-  int32_t bugfix_version = 0;
>-  angle::GetOperatingSystemVersionNumbers(&major_version, &minor_version, &bugfix_version);
>-  if (major_version == 10) {
>-    switch (minor_version) {
>-      case 5:
>-        return GPUTestConfig::kOsMacLeopard;
>-      case 6:
>-        return GPUTestConfig::kOsMacSnowLeopard;
>-      case 7:
>-        return GPUTestConfig::kOsMacLion;
>-      case 8:
>-        return GPUTestConfig::kOsMacMountainLion;
>-      case 9:
>-        return GPUTestConfig::kOsMacMavericks;
>-      case 10:
>-        return GPUTestConfig::kOsMacYosemite;
>-      case 11:
>-        return GPUTestConfig::kOsMacElCapitan;
>-      case 12:
>-        return GPUTestConfig::kOsMacSierra;
>-      case 13:
>-        return GPUTestConfig::kOsMacHighSierra;
>-    }
>-  }
>-#elif defined(OS_ANDROID)
>-  return GPUTestConfig::kOsAndroid;
>-#endif
>-  return GPUTestConfig::kOsUnknown;
>-}
>-
>-#if !defined(OS_ANDROID)
>-CollectInfoResult CollectBasicGraphicsInfo(GPUInfo* gpu_info) {
>-  angle::SystemInfo info;
>-  if (!angle::GetSystemInfo(&info)) {
>-    return kCollectInfoFatalFailure;
>-  }
>-  const angle::GPUDeviceInfo& gpu = info.gpus[info.primaryGPUIndex];
>-  gpu_info->gpu.vendor_id = gpu.vendorId;
>-  gpu_info->gpu.device_id = gpu.deviceId;
>-  gpu_info->gpu.active = true;
>-  return kCollectInfoSuccess;
>-}
>-#else
>-CollectInfoResult CollectBasicGraphicsInfo(GPUInfo* gpu_info) {
>-  gpu_info->gpu.vendor_id = 0;
>-  gpu_info->gpu.device_id = 0;
>-  gpu_info->gpu.active = true;
>-  return kCollectInfoNonFatalFailure;
>-}
>-#endif  // defined(OS_ANDROID)
>-}  // namespace anonymous
>-
>-GPUTestConfig::GPUTestConfig()
>-    : validate_gpu_info_(true),
>-      os_(kOsUnknown),
>-      gpu_device_id_(0),
>-      build_type_(kBuildTypeUnknown),
>-      api_(kAPIUnknown) {}
>-
>-GPUTestConfig::GPUTestConfig(const GPUTestConfig& other) = default;
>-
>-GPUTestConfig::~GPUTestConfig() {
>-}
>-
>-void GPUTestConfig::set_os(int32_t os) {
>-  DCHECK_EQ(0, os & ~(kOsAndroid | kOsWin | kOsMac | kOsLinux | kOsChromeOS));
>-  os_ = os;
>-}
>-
>-void GPUTestConfig::AddGPUVendor(uint32_t gpu_vendor) {
>-  DCHECK_NE(0u, gpu_vendor);
>-  for (size_t i = 0; i < gpu_vendor_.size(); ++i)
>-    DCHECK_NE(gpu_vendor_[i], gpu_vendor);
>-  gpu_vendor_.push_back(gpu_vendor);
>-}
>-
>-void GPUTestConfig::set_gpu_device_id(uint32_t id) {
>-  gpu_device_id_ = id;
>-}
>-
>-void GPUTestConfig::set_build_type(int32_t build_type) {
>-  DCHECK_EQ(0, build_type & ~(kBuildTypeRelease | kBuildTypeDebug));
>-  build_type_ = build_type;
>-}
>-
>-void GPUTestConfig::set_api(int32_t api) {
>-  DCHECK_EQ(0, api & ~(kAPID3D9 | kAPID3D11 | kAPIGLDesktop | kAPIGLES));
>-  api_ = api;
>-}
>-
>-bool GPUTestConfig::IsValid() const {
>-  if (!validate_gpu_info_)
>-    return true;
>-  if (gpu_device_id_ != 0 && (gpu_vendor_.size() != 1 || gpu_vendor_[0] == 0))
>-    return false;
>-  return true;
>-}
>-
>-bool GPUTestConfig::OverlapsWith(const GPUTestConfig& config) const {
>-  DCHECK(IsValid());
>-  DCHECK(config.IsValid());
>-  if (config.os_ != kOsUnknown && os_ != kOsUnknown &&
>-      (os_ & config.os_) == 0)
>-    return false;
>-  if (config.gpu_vendor_.size() > 0 && gpu_vendor_.size() > 0) {
>-    bool shared = false;
>-    for (size_t i = 0; i < config.gpu_vendor_.size() && !shared; ++i) {
>-      for (size_t j = 0; j < gpu_vendor_.size(); ++j) {
>-        if (config.gpu_vendor_[i] == gpu_vendor_[j]) {
>-          shared = true;
>-          break;
>-        }
>-      }
>-    }
>-    if (!shared)
>-      return false;
>-  }
>-  if (config.gpu_device_id_ != 0 && gpu_device_id_ != 0 &&
>-      gpu_device_id_ != config.gpu_device_id_)
>-    return false;
>-  if (config.build_type_ != kBuildTypeUnknown &&
>-      build_type_ != kBuildTypeUnknown &&
>-      (build_type_ & config.build_type_) == 0)
>-    return false;
>-  return true;
>-}
>-
>-void GPUTestConfig::DisableGPUInfoValidation() {
>-  validate_gpu_info_ = false;
>-}
>-
>-void GPUTestConfig::ClearGPUVendor() {
>-  gpu_vendor_.clear();
>-}
>-
>-GPUTestBotConfig::~GPUTestBotConfig() {
>-}
>-
>-void GPUTestBotConfig::AddGPUVendor(uint32_t gpu_vendor) {
>-  DCHECK_EQ(0u, GPUTestConfig::gpu_vendor().size());
>-  GPUTestConfig::AddGPUVendor(gpu_vendor);
>-}
>-
>-bool GPUTestBotConfig::SetGPUInfo(const GPUInfo& gpu_info) {
>-  DCHECK(validate_gpu_info_);
>-  if (gpu_info.gpu.device_id == 0 || gpu_info.gpu.vendor_id == 0)
>-    return false;
>-  ClearGPUVendor();
>-  AddGPUVendor(gpu_info.gpu.vendor_id);
>-  set_gpu_device_id(gpu_info.gpu.device_id);
>-  return true;
>-}
>-
>-bool GPUTestBotConfig::IsValid() const {
>-  switch (os()) {
>-    case kOsWinXP:
>-    case kOsWinVista:
>-    case kOsWin7:
>-    case kOsWin8:
>-    case kOsWin10:
>-    case kOsMacLeopard:
>-    case kOsMacSnowLeopard:
>-    case kOsMacLion:
>-    case kOsMacMountainLion:
>-    case kOsMacMavericks:
>-    case kOsMacYosemite:
>-    case kOsMacElCapitan:
>-    case kOsMacSierra:
>-    case kOsMacHighSierra:
>-    case kOsLinux:
>-    case kOsChromeOS:
>-    case kOsAndroid:
>-      break;
>-    default:
>-      return false;
>-  }
>-  if (validate_gpu_info_) {
>-    if (gpu_vendor().size() != 1 || gpu_vendor()[0] == 0)
>-      return false;
>-    if (gpu_device_id() == 0)
>-      return false;
>-  }
>-  switch (build_type()) {
>-    case kBuildTypeRelease:
>-    case kBuildTypeDebug:
>-      break;
>-    default:
>-      return false;
>-  }
>-  return true;
>-}
>-
>-bool GPUTestBotConfig::Matches(const GPUTestConfig& config) const {
>-  DCHECK(IsValid());
>-  DCHECK(config.IsValid());
>-  if (config.os() != kOsUnknown && (os() & config.os()) == 0)
>-    return false;
>-  if (config.gpu_vendor().size() > 0) {
>-    bool contained = false;
>-    for (size_t i = 0; i < config.gpu_vendor().size(); ++i) {
>-      if (!gpu_vendor().empty() && config.gpu_vendor()[i] == gpu_vendor()[0]) {
>-        contained = true;
>-        break;
>-      }
>-    }
>-    if (!contained)
>-      return false;
>-  }
>-  if (config.gpu_device_id() != 0 &&
>-      gpu_device_id() != config.gpu_device_id())
>-    return false;
>-  if (config.build_type() != kBuildTypeUnknown &&
>-      (build_type() & config.build_type()) == 0)
>-    return false;
>-  if (config.api() != 0 && (api() & config.api()) == 0)
>-    return false;
>-  return true;
>-}
>-
>-bool GPUTestBotConfig::Matches(const std::string& config_data) const {
>-  GPUTestExpectationsParser parser;
>-  GPUTestConfig config;
>-
>-  if (!parser.ParseConfig(config_data, &config))
>-    return false;
>-  return Matches(config);
>-}
>-
>-bool GPUTestBotConfig::LoadCurrentConfig(const GPUInfo* gpu_info) {
>-  bool rt;
>-  if (gpu_info == NULL) {
>-    GPUInfo my_gpu_info;
>-    CollectInfoResult result = CollectBasicGraphicsInfo(&my_gpu_info);
>-    if (result != kCollectInfoSuccess) {
>-      LOG(ERROR) << "Fail to identify GPU\n";
>-      DisableGPUInfoValidation();
>-      rt = true;
>-    } else {
>-      rt = SetGPUInfo(my_gpu_info);
>-    }
>-  } else {
>-    rt = SetGPUInfo(*gpu_info);
>-  }
>-  set_os(GetCurrentOS());
>-  if (os() == kOsUnknown) {
>-    LOG(ERROR) << "Unknown OS\n";
>-    rt = false;
>-  }
>-#if defined(NDEBUG)
>-  set_build_type(kBuildTypeRelease);
>-#else
>-  set_build_type(kBuildTypeDebug);
>-#endif
>-  return rt;
>-}
>-
>-// static
>-bool GPUTestBotConfig::CurrentConfigMatches(const std::string& config_data) {
>-  GPUTestBotConfig my_config;
>-  if (!my_config.LoadCurrentConfig(NULL))
>-    return false;
>-  return my_config.Matches(config_data);
>-}
>-
>-// static
>-bool GPUTestBotConfig::CurrentConfigMatches(
>-    const std::vector<std::string>& configs) {
>-  GPUTestBotConfig my_config;
>-  if (!my_config.LoadCurrentConfig(NULL))
>-    return false;
>-  for (size_t i = 0 ; i < configs.size(); ++i) {
>-    if (my_config.Matches(configs[i]))
>-      return true;
>-  }
>-  return false;
>-}
>-
>-// static
>-bool GPUTestBotConfig::GpuBlacklistedOnBot() {
>-  return false;
>-}
>-
>-}  // namespace gpu
>-
>diff --git a/Source/ThirdParty/ANGLE/src/tests/third_party/gpu_test_expectations/gpu_test_config.h b/Source/ThirdParty/ANGLE/src/tests/third_party/gpu_test_expectations/gpu_test_config.h
>deleted file mode 100644
>index 89bf5b156ea..00000000000
>--- a/Source/ThirdParty/ANGLE/src/tests/third_party/gpu_test_expectations/gpu_test_config.h
>+++ /dev/null
>@@ -1,148 +0,0 @@
>-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
>-// Use of this source code is governed by a BSD-style license that can be
>-// found in the LICENSE file.
>-
>-#ifndef ANGLE_GPU_CONFIG_GPU_TEST_CONFIG_H_
>-#define ANGLE_GPU_CONFIG_GPU_TEST_CONFIG_H_
>-
>-#include <stdint.h>
>-
>-#include <string>
>-#include <vector>
>-
>-#include "angle_config.h"
>-
>-namespace gpu {
>-
>-struct GPUInfo;
>-
>-class GPU_EXPORT GPUTestConfig {
>- public:
>-  enum OS {
>-    kOsUnknown = 0,
>-    kOsWinXP = 1 << 0,
>-    kOsWinVista = 1 << 1,
>-    kOsWin7 = 1 << 2,
>-    kOsWin8 = 1 << 3,
>-    kOsMacLeopard = 1 << 4,
>-    kOsMacSnowLeopard = 1 << 5,
>-    kOsMacLion = 1 << 6,
>-    kOsMacMountainLion = 1 << 7,
>-    kOsMacMavericks = 1 << 8,
>-    kOsMacYosemite = 1 << 9,
>-    kOsMacElCapitan = 1 << 10,
>-    kOsMacSierra = 1 << 11,
>-    kOsMacHighSierra = 1 << 12,
>-    kOsMac = kOsMacLeopard | kOsMacSnowLeopard | kOsMacLion |
>-             kOsMacMountainLion | kOsMacMavericks | kOsMacYosemite |
>-             kOsMacElCapitan | kOsMacSierra | kOsMacHighSierra,
>-    kOsLinux = 1 << 13,
>-    kOsChromeOS = 1 << 14,
>-    kOsAndroid = 1 << 15,
>-    kOsWin10 = 1 << 16,
>-    kOsWin = kOsWinXP | kOsWinVista | kOsWin7 | kOsWin8 | kOsWin10,
>-  };
>-
>-  enum BuildType {
>-    kBuildTypeUnknown = 0,
>-    kBuildTypeRelease = 1 << 0,
>-    kBuildTypeDebug = 1 << 1,
>-  };
>-
>-  enum API {
>-    kAPIUnknown = 0,
>-    kAPID3D9 = 1 << 0,
>-    kAPID3D11 = 1 << 1,
>-    kAPIGLDesktop = 1 << 2,
>-    kAPIGLES = 1 << 3,
>-  };
>-
>-  GPUTestConfig();
>-  GPUTestConfig(const GPUTestConfig& other);
>-  virtual ~GPUTestConfig();
>-
>-  void set_os(int32_t os);
>-  void set_gpu_device_id(uint32_t id);
>-  void set_build_type(int32_t build_type);
>-  void set_api(int32_t api);
>-
>-  virtual void AddGPUVendor(uint32_t gpu_vendor);
>-
>-  int32_t os() const { return os_; }
>-  const std::vector<uint32_t>& gpu_vendor() const { return gpu_vendor_; }
>-  uint32_t gpu_device_id() const { return gpu_device_id_; }
>-  int32_t build_type() const { return build_type_; }
>-  int32_t api() const { return api_; }
>-
>-  // Check if the config is valid. For example, if gpu_device_id_ is set, but
>-  // gpu_vendor_ is unknown, then it's invalid.
>-  virtual bool IsValid() const;
>-
>-  // Check if two configs overlap, i.e., if there exists a config that matches
>-  // both configs.
>-  bool OverlapsWith(const GPUTestConfig& config) const;
>-
>-  // Disable validation of GPU vendor and device ids.
>-  void DisableGPUInfoValidation();
>-
>- protected:
>-  void ClearGPUVendor();
>-
>-  // Indicates that the OS has the notion of a numeric GPU vendor and device id
>-  // and this data should be validated.
>-  bool validate_gpu_info_;
>-
>- private:
>-  // operating system.
>-  int32_t os_;
>-
>-  // GPU vendor.
>-  std::vector<uint32_t> gpu_vendor_;
>-
>-  // GPU device id (unique to each vendor).
>-  uint32_t gpu_device_id_;
>-
>-  // Release or Debug.
>-  int32_t build_type_;
>-
>-  // Back-end rendering APIs.
>-  int32_t api_;
>-};
>-
>-class GPU_EXPORT GPUTestBotConfig : public GPUTestConfig {
>- public:
>-  GPUTestBotConfig() { }
>-  ~GPUTestBotConfig() override;
>-
>-  // This should only be called when no gpu_vendor is added.
>-  void AddGPUVendor(uint32_t gpu_vendor) override;
>-
>-  // Return false if gpu_info does not have valid vendor_id and device_id.
>-  bool SetGPUInfo(const GPUInfo& gpu_info);
>-
>-  // Check if the bot config is valid, i.e., if it is one valid test-bot
>-  // environment. For example, if a field is unknown, or if OS is not one
>-  // fully defined OS, then it's valid.
>-  bool IsValid() const override;
>-
>-  // Check if a bot config matches a test config, i.e., the test config is a
>-  // superset of the bot config.
>-  bool Matches(const GPUTestConfig& config) const;
>-  bool Matches(const std::string& config_data) const;
>-
>-  // Setup the config with the current gpu testing environment.
>-  // If gpu_info is NULL, collect GPUInfo first.
>-  bool LoadCurrentConfig(const GPUInfo* gpu_info);
>-
>-  // Check if this bot's config matches |config_data| or any of the |configs|.
>-  static bool CurrentConfigMatches(const std::string& config_data);
>-  static bool CurrentConfigMatches(const std::vector<std::string>& configs);
>-
>-  // Check if the bot has blacklisted all GPU features.
>-  static bool GpuBlacklistedOnBot();
>-};
>-
>-}  // namespace gpu
>-
>-#endif  // ANGLE_GPU_CONFIG_GPU_TEST_CONFIG_H_
>-
>diff --git a/Source/ThirdParty/ANGLE/src/tests/third_party/gpu_test_expectations/gpu_test_config_mac.h b/Source/ThirdParty/ANGLE/src/tests/third_party/gpu_test_expectations/gpu_test_config_mac.h
>deleted file mode 100644
>index 5f679f1df65..00000000000
>--- a/Source/ThirdParty/ANGLE/src/tests/third_party/gpu_test_expectations/gpu_test_config_mac.h
>+++ /dev/null
>@@ -1,24 +0,0 @@
>-//
>-// Copyright 2015 The ANGLE Project Authors. All rights reserved.
>-// Use of this source code is governed by a BSD-style license that can be
>-// found in the LICENSE file.
>-//
>-// gpu_test_config_mac.h:
>-//   Helper functions for gpu_test_config that have to be compiled in ObjectiveC++
>-//
>-
>-#ifndef ANGLE_GPU_TEST_EXPECTATIONS_GPU_TEST_CONFIG_MAC_H_
>-#define ANGLE_GPU_TEST_EXPECTATIONS_GPU_TEST_CONFIG_MAC_H_
>-
>-#include "gpu_info.h"
>-
>-namespace angle
>-{
>-
>-void GetOperatingSystemVersionNumbers(int32_t *major_version,
>-                                      int32_t *minor_version,
>-                                      int32_t *bugfix_version);
>-
>-} // namespace angle
>-
>-#endif // ANGLE_GPU_TEST_EXPECTATIONS_GPU_TEST_CONFIG_MAC_H_
>diff --git a/Source/ThirdParty/ANGLE/src/tests/third_party/gpu_test_expectations/gpu_test_config_mac.mm b/Source/ThirdParty/ANGLE/src/tests/third_party/gpu_test_expectations/gpu_test_config_mac.mm
>deleted file mode 100644
>index 9f59973147f..00000000000
>--- a/Source/ThirdParty/ANGLE/src/tests/third_party/gpu_test_expectations/gpu_test_config_mac.mm
>+++ /dev/null
>@@ -1,49 +0,0 @@
>-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
>-// Use of this source code is governed by a BSD-style license that can be
>-// found in the LICENSE file.
>-
>-// gpu_test_config_mac.mm:
>-//   Helper functions for gpu_test_config that have to be compiled in ObjectiveC++
>-
>-#include "gpu_test_config_mac.h"
>-
>-#import <Cocoa/Cocoa.h>
>-
>-// OSX 10.8 deprecates Gestalt but doesn't make the operatingSystemVersion property part of the
>-// public interface of NSProcessInfo until 10.10. Add a forward declaration.
>-#if !defined(MAC_OS_X_VERSION_10_10) || MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_10
>-@interface NSProcessInfo (YosemiteSDK)
>-@property(readonly) NSOperatingSystemVersion operatingSystemVersion;
>-@end
>-#endif
>-
>-namespace angle
>-{
>-
>-void GetOperatingSystemVersionNumbers(int32_t *major_version,
>-                                      int32_t *minor_version,
>-                                      int32_t *bugfix_version)
>-{
>-#if MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_8
>-    Gestalt(gestaltSystemVersionMajor, reinterpret_cast<SInt32 *>(major_version));
>-    Gestalt(gestaltSystemVersionMinor, reinterpret_cast<SInt32 *>(minor_version));
>-    Gestalt(gestaltSystemVersionBugFix, reinterpret_cast<SInt32 *>(bugfix_version));
>-#else
>-    if (@available(macOS 10.10, *))
>-    {
>-        NSOperatingSystemVersion version = [[NSProcessInfo processInfo] operatingSystemVersion];
>-        *major_version                   = version.majorVersion;
>-        *minor_version                   = version.minorVersion;
>-        *bugfix_version                  = version.patchVersion;
>-    }
>-    else
>-    {
>-        // This can only happen on 10.9
>-        *major_version  = 10;
>-        *minor_version  = 9;
>-        *bugfix_version = 0;
>-    }
>-#endif
>-}
>-
>-} // namespace angle
>diff --git a/Source/ThirdParty/ANGLE/src/tests/third_party/gpu_test_expectations/gpu_test_expectations_parser.cc b/Source/ThirdParty/ANGLE/src/tests/third_party/gpu_test_expectations/gpu_test_expectations_parser.cc
>deleted file mode 100644
>index a2d1ee61612..00000000000
>--- a/Source/ThirdParty/ANGLE/src/tests/third_party/gpu_test_expectations/gpu_test_expectations_parser.cc
>+++ /dev/null
>@@ -1,594 +0,0 @@
>-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
>-// Use of this source code is governed by a BSD-style license that can be
>-// found in the LICENSE file.
>-
>-#include "gpu_test_expectations_parser.h"
>-
>-#include <stddef.h>
>-#include <stdint.h>
>-
>-#include "angle_config.h"
>-#include "common/angleutils.h"
>-
>-namespace base {
>-
>-namespace {
>-
>-bool StartsWithASCII(const std::string& str,
>-                     const std::string& search,
>-                     bool case_sensitive) {
>-  ASSERT(!case_sensitive);
>-  return str.compare(0, search.length(), search) == 0;
>-}
>-
>-template <class Char> inline Char ToLowerASCII(Char c) {
>-  return (c >= 'A' && c <= 'Z') ? (c + ('a' - 'A')) : c;
>-}
>-
>-template<typename Iter>
>-static inline bool DoLowerCaseEqualsASCII(Iter a_begin,
>-                                          Iter a_end,
>-                                          const char* b) {
>-  for (Iter it = a_begin; it != a_end; ++it, ++b) {
>-    if (!*b || base::ToLowerASCII(*it) != *b)
>-      return false;
>-  }
>-  return *b == 0;
>-}
>-
>-bool LowerCaseEqualsASCII(const std::string& a, const char* b) {
>-  return DoLowerCaseEqualsASCII(a.begin(), a.end(), b);
>-}
>-
>-} // anonymous namespace
>-
>-} // namespace base
>-
>-namespace gpu {
>-
>-namespace {
>-
>-enum LineParserStage {
>-  kLineParserBegin = 0,
>-  kLineParserBugID,
>-  kLineParserConfigs,
>-  kLineParserColon,
>-  kLineParserTestName,
>-  kLineParserEqual,
>-  kLineParserExpectations,
>-};
>-
>-enum Token {
>-  // os
>-  kConfigWinXP = 0,
>-  kConfigWinVista,
>-  kConfigWin7,
>-  kConfigWin8,
>-  kConfigWin10,
>-  kConfigWin,
>-  kConfigMacLeopard,
>-  kConfigMacSnowLeopard,
>-  kConfigMacLion,
>-  kConfigMacMountainLion,
>-  kConfigMacMavericks,
>-  kConfigMacYosemite,
>-  kConfigMacElCapitan,
>-  kConfigMacSierra,
>-  kConfigMacHighSierra,
>-  kConfigMac,
>-  kConfigLinux,
>-  kConfigChromeOS,
>-  kConfigAndroid,
>-  // gpu vendor
>-  kConfigNVidia,
>-  kConfigAMD,
>-  kConfigIntel,
>-  kConfigVMWare,
>-  // build type
>-  kConfigRelease,
>-  kConfigDebug,
>-  // ANGLE renderer
>-  kConfigD3D9,
>-  kConfigD3D11,
>-  kConfigGLDesktop,
>-  kConfigGLES,
>-  // expectation
>-  kExpectationPass,
>-  kExpectationFail,
>-  kExpectationFlaky,
>-  kExpectationTimeout,
>-  kExpectationSkip,
>-  // separator
>-  kSeparatorColon,
>-  kSeparatorEqual,
>-
>-  kNumberOfExactMatchTokens,
>-
>-  // others
>-  kConfigGPUDeviceID,
>-  kTokenComment,
>-  kTokenWord,
>-};
>-
>-struct TokenInfo {
>-  const char* name;
>-  int32_t flag;
>-};
>-
>-const TokenInfo kTokenData[] = {
>-    {"xp", GPUTestConfig::kOsWinXP},
>-    {"vista", GPUTestConfig::kOsWinVista},
>-    {"win7", GPUTestConfig::kOsWin7},
>-    {"win8", GPUTestConfig::kOsWin8},
>-    {"win10", GPUTestConfig::kOsWin10},
>-    {"win", GPUTestConfig::kOsWin},
>-    {"leopard", GPUTestConfig::kOsMacLeopard},
>-    {"snowleopard", GPUTestConfig::kOsMacSnowLeopard},
>-    {"lion", GPUTestConfig::kOsMacLion},
>-    {"mountainlion", GPUTestConfig::kOsMacMountainLion},
>-    {"mavericks", GPUTestConfig::kOsMacMavericks},
>-    {"yosemite", GPUTestConfig::kOsMacYosemite},
>-    {"elcapitan", GPUTestConfig::kOsMacElCapitan},
>-    {"sierra", GPUTestConfig::kOsMacSierra},
>-    {"highsierra", GPUTestConfig::kOsMacHighSierra},
>-    {"mac", GPUTestConfig::kOsMac},
>-    {"linux", GPUTestConfig::kOsLinux},
>-    {"chromeos", GPUTestConfig::kOsChromeOS},
>-    {"android", GPUTestConfig::kOsAndroid},
>-    {"nvidia", 0x10DE},
>-    {"amd", 0x1002},
>-    {"intel", 0x8086},
>-    {"vmware", 0x15ad},
>-    {"release", GPUTestConfig::kBuildTypeRelease},
>-    {"debug", GPUTestConfig::kBuildTypeDebug},
>-    {"d3d9", GPUTestConfig::kAPID3D9},
>-    {"d3d11", GPUTestConfig::kAPID3D11},
>-    {"opengl", GPUTestConfig::kAPIGLDesktop},
>-    {"gles", GPUTestConfig::kAPIGLES},
>-    {"pass", GPUTestExpectationsParser::kGpuTestPass},
>-    {"fail", GPUTestExpectationsParser::kGpuTestFail},
>-    {"flaky", GPUTestExpectationsParser::kGpuTestFlaky},
>-    {"timeout", GPUTestExpectationsParser::kGpuTestTimeout},
>-    {"skip", GPUTestExpectationsParser::kGpuTestSkip},
>-    {":", 0},
>-    {"=", 0},
>-};
>-
>-enum ErrorType {
>-  kErrorFileIO = 0,
>-  kErrorIllegalEntry,
>-  kErrorInvalidEntry,
>-  kErrorEntryWithOsConflicts,
>-  kErrorEntryWithGpuVendorConflicts,
>-  kErrorEntryWithBuildTypeConflicts,
>-  kErrorEntryWithAPIConflicts,
>-  kErrorEntryWithGpuDeviceIdConflicts,
>-  kErrorEntryWithExpectationConflicts,
>-  kErrorEntriesOverlap,
>-
>-  kNumberOfErrors,
>-};
>-
>-const char* kErrorMessage[] = {
>-    "file IO failed",
>-    "entry with wrong format",
>-    "entry invalid, likely wrong modifiers combination",
>-    "entry with OS modifier conflicts",
>-    "entry with GPU vendor modifier conflicts",
>-    "entry with GPU build type conflicts",
>-    "entry with GPU API conflicts",
>-    "entry with GPU device id conflicts or malformat",
>-    "entry with expectation modifier conflicts",
>-    "two entries' configs overlap",
>-};
>-
>-Token ParseToken(const std::string& word) {
>-  if (base::StartsWithASCII(word, "//", false))
>-    return kTokenComment;
>-  if (base::StartsWithASCII(word, "0x", false))
>-    return kConfigGPUDeviceID;
>-
>-  for (int32_t i = 0; i < kNumberOfExactMatchTokens; ++i) {
>-    if (base::LowerCaseEqualsASCII(word, kTokenData[i].name))
>-      return static_cast<Token>(i);
>-  }
>-  return kTokenWord;
>-}
>-
>-// reference name can have the last character as *.
>-bool NamesMatching(const std::string& ref, const std::string& test_name) {
>-  size_t len = ref.length();
>-  if (len == 0)
>-    return false;
>-  if (ref[len - 1] == '*') {
>-    if (test_name.length() > len -1 &&
>-        ref.compare(0, len - 1, test_name, 0, len - 1) == 0)
>-      return true;
>-    return false;
>-  }
>-  return (ref == test_name);
>-}
>-
>-}  // namespace anonymous
>-
>-GPUTestExpectationsParser::GPUTestExpectationsParser() {
>-  // Some sanity check.
>-  DCHECK_EQ(static_cast<unsigned int>(kNumberOfExactMatchTokens),
>-            sizeof(kTokenData) / sizeof(kTokenData[0]));
>-  DCHECK_EQ(static_cast<unsigned int>(kNumberOfErrors),
>-            sizeof(kErrorMessage) / sizeof(kErrorMessage[0]));
>-}
>-
>-GPUTestExpectationsParser::~GPUTestExpectationsParser() {
>-}
>-
>-bool GPUTestExpectationsParser::LoadTestExpectations(const std::string& data) {
>-  entries_.clear();
>-  error_messages_.clear();
>-
>-  std::vector<std::string> lines = base::SplitString(
>-      data, "\n", base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL);
>-  bool rt = true;
>-  for (size_t i = 0; i < lines.size(); ++i) {
>-    if (!ParseLine(lines[i], i + 1))
>-      rt = false;
>-  }
>-  if (DetectConflictsBetweenEntries()) {
>-    entries_.clear();
>-    rt = false;
>-  }
>-
>-  return rt;
>-}
>-
>-bool GPUTestExpectationsParser::LoadTestExpectationsFromFile(
>-    const std::string& path) {
>-  entries_.clear();
>-  error_messages_.clear();
>-
>-  std::string data;
>-  if (!base::ReadFileToString(path, &data)) {
>-    error_messages_.push_back(kErrorMessage[kErrorFileIO]);
>-    return false;
>-  }
>-  return LoadTestExpectations(data);
>-}
>-
>-int32_t GPUTestExpectationsParser::GetTestExpectation(
>-    const std::string& test_name,
>-    const GPUTestBotConfig& bot_config) const {
>-  for (size_t i = 0; i < entries_.size(); ++i) {
>-    if (NamesMatching(entries_[i].test_name, test_name) &&
>-        bot_config.Matches(entries_[i].test_config))
>-      return entries_[i].test_expectation;
>-  }
>-  return kGpuTestPass;
>-}
>-
>-const std::vector<std::string>&
>-GPUTestExpectationsParser::GetErrorMessages() const {
>-  return error_messages_;
>-}
>-
>-bool GPUTestExpectationsParser::ParseConfig(
>-    const std::string& config_data, GPUTestConfig* config) {
>-  DCHECK(config);
>-  std::vector<std::string> tokens = base::SplitString(
>-      config_data, base::kWhitespaceASCII, base::KEEP_WHITESPACE,
>-      base::SPLIT_WANT_NONEMPTY);
>-
>-  for (size_t i = 0; i < tokens.size(); ++i) {
>-    Token token = ParseToken(tokens[i]);
>-    switch (token) {
>-      case kConfigWinXP:
>-      case kConfigWinVista:
>-      case kConfigWin7:
>-      case kConfigWin8:
>-      case kConfigWin10:
>-      case kConfigWin:
>-      case kConfigMacLeopard:
>-      case kConfigMacSnowLeopard:
>-      case kConfigMacLion:
>-      case kConfigMacMountainLion:
>-      case kConfigMacMavericks:
>-      case kConfigMacYosemite:
>-      case kConfigMacElCapitan:
>-      case kConfigMacSierra:
>-      case kConfigMacHighSierra:
>-      case kConfigMac:
>-      case kConfigLinux:
>-      case kConfigChromeOS:
>-      case kConfigAndroid:
>-      case kConfigNVidia:
>-      case kConfigAMD:
>-      case kConfigIntel:
>-      case kConfigVMWare:
>-      case kConfigRelease:
>-      case kConfigDebug:
>-      case kConfigD3D9:
>-      case kConfigD3D11:
>-      case kConfigGLDesktop:
>-      case kConfigGLES:
>-      case kConfigGPUDeviceID:
>-        if (token == kConfigGPUDeviceID) {
>-          if (!UpdateTestConfig(config, tokens[i], 0))
>-            return false;
>-        } else {
>-          if (!UpdateTestConfig(config, token, 0))
>-            return false;
>-        }
>-        break;
>-      default:
>-        return false;
>-    }
>-  }
>-  return true;
>-}
>-
>-bool GPUTestExpectationsParser::ParseLine(
>-    const std::string& line_data, size_t line_number) {
>-  std::vector<std::string> tokens = base::SplitString(
>-      line_data, base::kWhitespaceASCII, base::KEEP_WHITESPACE,
>-      base::SPLIT_WANT_NONEMPTY);
>-  int32_t stage = kLineParserBegin;
>-  GPUTestExpectationEntry entry;
>-  entry.line_number = line_number;
>-  GPUTestConfig& config = entry.test_config;
>-  bool comments_encountered = false;
>-  for (size_t i = 0; i < tokens.size() && !comments_encountered; ++i) {
>-    Token token = ParseToken(tokens[i]);
>-    switch (token) {
>-      case kTokenComment:
>-        comments_encountered = true;
>-        break;
>-      case kConfigWinXP:
>-      case kConfigWinVista:
>-      case kConfigWin7:
>-      case kConfigWin8:
>-      case kConfigWin10:
>-      case kConfigWin:
>-      case kConfigMacLeopard:
>-      case kConfigMacSnowLeopard:
>-      case kConfigMacLion:
>-      case kConfigMacMountainLion:
>-      case kConfigMacMavericks:
>-      case kConfigMacYosemite:
>-      case kConfigMacElCapitan:
>-      case kConfigMacSierra:
>-      case kConfigMacHighSierra:
>-      case kConfigMac:
>-      case kConfigLinux:
>-      case kConfigChromeOS:
>-      case kConfigAndroid:
>-      case kConfigNVidia:
>-      case kConfigAMD:
>-      case kConfigIntel:
>-      case kConfigVMWare:
>-      case kConfigRelease:
>-      case kConfigDebug:
>-      case kConfigD3D9:
>-      case kConfigD3D11:
>-      case kConfigGLDesktop:
>-      case kConfigGLES:
>-      case kConfigGPUDeviceID:
>-        // MODIFIERS, could be in any order, need at least one.
>-        if (stage != kLineParserConfigs && stage != kLineParserBugID) {
>-          PushErrorMessage(kErrorMessage[kErrorIllegalEntry],
>-                           line_number);
>-          return false;
>-        }
>-        if (token == kConfigGPUDeviceID) {
>-          if (!UpdateTestConfig(&config, tokens[i], line_number))
>-            return false;
>-        } else {
>-          if (!UpdateTestConfig(&config, token, line_number))
>-            return false;
>-        }
>-        if (stage == kLineParserBugID)
>-          stage++;
>-        break;
>-      case kSeparatorColon:
>-        // :
>-        if (stage != kLineParserConfigs) {
>-          PushErrorMessage(kErrorMessage[kErrorIllegalEntry],
>-                           line_number);
>-          return false;
>-        }
>-        stage++;
>-        break;
>-      case kSeparatorEqual:
>-        // =
>-        if (stage != kLineParserTestName) {
>-          PushErrorMessage(kErrorMessage[kErrorIllegalEntry],
>-                           line_number);
>-          return false;
>-        }
>-        stage++;
>-        break;
>-      case kTokenWord:
>-        // BUG_ID or TEST_NAME
>-        if (stage == kLineParserBegin) {
>-          // Bug ID is not used for anything; ignore it.
>-        } else if (stage == kLineParserColon) {
>-          entry.test_name = tokens[i];
>-        } else {
>-          PushErrorMessage(kErrorMessage[kErrorIllegalEntry],
>-                           line_number);
>-          return false;
>-        }
>-        stage++;
>-        break;
>-      case kExpectationPass:
>-      case kExpectationFail:
>-      case kExpectationFlaky:
>-      case kExpectationTimeout:
>-      case kExpectationSkip:
>-        // TEST_EXPECTATIONS
>-        if (stage != kLineParserEqual && stage != kLineParserExpectations) {
>-          PushErrorMessage(kErrorMessage[kErrorIllegalEntry],
>-                           line_number);
>-          return false;
>-        }
>-        if ((kTokenData[token].flag & entry.test_expectation) != 0) {
>-          PushErrorMessage(kErrorMessage[kErrorEntryWithExpectationConflicts],
>-                           line_number);
>-          return false;
>-        }
>-        entry.test_expectation =
>-            (kTokenData[token].flag | entry.test_expectation);
>-        if (stage == kLineParserEqual)
>-          stage++;
>-        break;
>-      default:
>-        DCHECK(false);
>-        break;
>-    }
>-  }
>-  if (stage == kLineParserBegin) {
>-    // The whole line is empty or all comments
>-    return true;
>-  }
>-  if (stage == kLineParserExpectations) {
>-    if (!config.IsValid()) {
>-        PushErrorMessage(kErrorMessage[kErrorInvalidEntry], line_number);
>-        return false;
>-    }
>-    entries_.push_back(entry);
>-    return true;
>-  }
>-  PushErrorMessage(kErrorMessage[kErrorIllegalEntry], line_number);
>-  return false;
>-}
>-
>-bool GPUTestExpectationsParser::UpdateTestConfig(GPUTestConfig* config,
>-                                                 int32_t token,
>-                                                 size_t line_number) {
>-  DCHECK(config);
>-  switch (token) {
>-    case kConfigWinXP:
>-    case kConfigWinVista:
>-    case kConfigWin7:
>-    case kConfigWin8:
>-    case kConfigWin10:
>-    case kConfigWin:
>-    case kConfigMacLeopard:
>-    case kConfigMacSnowLeopard:
>-    case kConfigMacLion:
>-    case kConfigMacMountainLion:
>-    case kConfigMacMavericks:
>-    case kConfigMacYosemite:
>-    case kConfigMacElCapitan:
>-    case kConfigMacSierra:
>-    case kConfigMacHighSierra:
>-    case kConfigMac:
>-    case kConfigLinux:
>-    case kConfigChromeOS:
>-    case kConfigAndroid:
>-      if ((config->os() & kTokenData[token].flag) != 0) {
>-        PushErrorMessage(kErrorMessage[kErrorEntryWithOsConflicts],
>-                         line_number);
>-        return false;
>-      }
>-      config->set_os(config->os() | kTokenData[token].flag);
>-      break;
>-    case kConfigNVidia:
>-    case kConfigAMD:
>-    case kConfigIntel:
>-    case kConfigVMWare:
>-      {
>-      uint32_t gpu_vendor = static_cast<uint32_t>(kTokenData[token].flag);
>-        for (size_t i = 0; i < config->gpu_vendor().size(); ++i) {
>-          if (config->gpu_vendor()[i] == gpu_vendor) {
>-            PushErrorMessage(
>-                kErrorMessage[kErrorEntryWithGpuVendorConflicts],
>-                line_number);
>-            return false;
>-          }
>-        }
>-        config->AddGPUVendor(gpu_vendor);
>-      }
>-      break;
>-    case kConfigRelease:
>-    case kConfigDebug:
>-      if ((config->build_type() & kTokenData[token].flag) != 0) {
>-        PushErrorMessage(
>-            kErrorMessage[kErrorEntryWithBuildTypeConflicts],
>-            line_number);
>-        return false;
>-      }
>-      config->set_build_type(
>-          config->build_type() | kTokenData[token].flag);
>-      break;
>-    case kConfigD3D9:
>-    case kConfigD3D11:
>-    case kConfigGLDesktop:
>-    case kConfigGLES:
>-      if ((config->api() & kTokenData[token].flag) != 0) {
>-        PushErrorMessage(kErrorMessage[kErrorEntryWithAPIConflicts],
>-                         line_number);
>-        return false;
>-      }
>-      config->set_api(config->api() | kTokenData[token].flag);
>-      break;
>-    default:
>-      DCHECK(false);
>-      break;
>-  }
>-  return true;
>-}
>-
>-bool GPUTestExpectationsParser::UpdateTestConfig(
>-    GPUTestConfig* config,
>-    const std::string& gpu_device_id,
>-    size_t line_number) {
>-  DCHECK(config);
>-  uint32_t device_id = 0;
>-  if (config->gpu_device_id() != 0 ||
>-      !base::HexStringToUInt(gpu_device_id, &device_id) ||
>-      device_id == 0) {
>-    PushErrorMessage(kErrorMessage[kErrorEntryWithGpuDeviceIdConflicts],
>-                     line_number);
>-    return false;
>-  }
>-  config->set_gpu_device_id(device_id);
>-  return true;
>-}
>-
>-bool GPUTestExpectationsParser::DetectConflictsBetweenEntries() {
>-  bool rt = false;
>-  for (size_t i = 0; i < entries_.size(); ++i) {
>-    for (size_t j = i + 1; j < entries_.size(); ++j) {
>-      if (entries_[i].test_name == entries_[j].test_name &&
>-          entries_[i].test_config.OverlapsWith(entries_[j].test_config)) {
>-        PushErrorMessage(kErrorMessage[kErrorEntriesOverlap],
>-                         entries_[i].line_number,
>-                         entries_[j].line_number);
>-        rt = true;
>-      }
>-    }
>-  }
>-  return rt;
>-}
>-
>-void GPUTestExpectationsParser::PushErrorMessage(
>-    const std::string& message, size_t line_number) {
>-  error_messages_.push_back("Line " + ToString(line_number) +
>-                            " : " + message.c_str());
>-}
>-
>-void GPUTestExpectationsParser::PushErrorMessage(
>-    const std::string& message,
>-    size_t entry1_line_number,
>-    size_t entry2_line_number) {
>-  error_messages_.push_back("Line " + ToString(entry1_line_number) +
>-                            " and " + ToString(entry2_line_number) +
>-                            " : " + message.c_str());
>-}
>-
>-GPUTestExpectationsParser:: GPUTestExpectationEntry::GPUTestExpectationEntry()
>-    : test_expectation(0),
>-      line_number(0) {
>-}
>-
>-}  // namespace gpu
>-
>diff --git a/Source/ThirdParty/ANGLE/src/tests/third_party/gpu_test_expectations/gpu_test_expectations_parser.h b/Source/ThirdParty/ANGLE/src/tests/third_party/gpu_test_expectations/gpu_test_expectations_parser.h
>deleted file mode 100644
>index 8a56e3da61b..00000000000
>--- a/Source/ThirdParty/ANGLE/src/tests/third_party/gpu_test_expectations/gpu_test_expectations_parser.h
>+++ /dev/null
>@@ -1,90 +0,0 @@
>-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
>-// Use of this source code is governed by a BSD-style license that can be
>-// found in the LICENSE file.
>-
>-#ifndef ANGLE_GPU_CONFIG_GPU_TEST_EXPECTATIONS_PARSER_H_
>-#define ANGLE_GPU_CONFIG_GPU_TEST_EXPECTATIONS_PARSER_H_
>-
>-#include <stddef.h>
>-#include <stdint.h>
>-
>-#include <string>
>-#include <vector>
>-
>-#include "angle_config.h"
>-#include "gpu_test_config.h"
>-
>-namespace gpu {
>-
>-class GPU_EXPORT GPUTestExpectationsParser {
>- public:
>-  enum GPUTestExpectation {
>-    kGpuTestPass = 1 << 0,
>-    kGpuTestFail = 1 << 1,
>-    kGpuTestFlaky = 1 << 2,
>-    kGpuTestTimeout = 1 << 3,
>-    kGpuTestSkip = 1 << 4,
>-  };
>-
>-  GPUTestExpectationsParser();
>-  ~GPUTestExpectationsParser();
>-
>-  // Parse the text expectations, and if no error is encountered,
>-  // save all the entries. Otherwise, generate error messages.
>-  // Return true if parsing succeeds.
>-  bool LoadTestExpectations(const std::string& data);
>-  bool LoadTestExpectationsFromFile(const std::string& path);
>-
>-  // Query error messages from the last LoadTestExpectations() call.
>-  const std::vector<std::string>& GetErrorMessages() const;
>-
>-  // Get the test expectation of a given test on a given bot.
>-  int32_t GetTestExpectation(const std::string& test_name,
>-                             const GPUTestBotConfig& bot_config) const;
>-
>-  // Parse a list of config modifiers. If we have a valid entry with no
>-  // conflicts, | config | stores it, and the function returns true.
>-  bool ParseConfig(const std::string& config_data, GPUTestConfig* config);
>-
>- private:
>-  struct GPUTestExpectationEntry {
>-    GPUTestExpectationEntry();
>-
>-    std::string test_name;
>-    GPUTestConfig test_config;
>-    int32_t test_expectation;
>-    size_t line_number;
>-  };
>-
>-  // Parse a line of text. If we have a valid entry, save it; otherwise,
>-  // generate error messages.
>-  bool ParseLine(const std::string& line_data, size_t line_number);
>-
>-  // Update OS/GPUVendor/BuildType modifiers. May generate an error message.
>-  bool UpdateTestConfig(GPUTestConfig* config,
>-                        int32_t token,
>-                        size_t line_number);
>-
>-  // Update GPUDeviceID modifier. May generate an error message.
>-  bool UpdateTestConfig(GPUTestConfig* config,
>-                        const std::string & gpu_device_id,
>-                        size_t line_number);
>-
>-  // Check if two entries' config overlap with each other. May generate an
>-  // error message.
>-  bool DetectConflictsBetweenEntries();
>-
>-  // Save an error message, which can be queried later.
>-  void PushErrorMessage(const std::string& message, size_t line_number);
>-  void PushErrorMessage(const std::string& message,
>-                        size_t entry1_line_number,
>-                        size_t entry2_line_number);
>-
>-  std::vector<GPUTestExpectationEntry> entries_;
>-  std::vector<std::string> error_messages_;
>-};
>-
>-}  // namespace gpu
>-
>-#endif  // ANGLE_GPU_CONFIG_GPU_TEST_EXPECTATIONS_PARSER_H_
>-
>diff --git a/Source/ThirdParty/ANGLE/src/tests/third_party/rapidjson/LICENSE b/Source/ThirdParty/ANGLE/src/tests/third_party/rapidjson/LICENSE
>deleted file mode 100644
>index 03d97d163ed..00000000000
>--- a/Source/ThirdParty/ANGLE/src/tests/third_party/rapidjson/LICENSE
>+++ /dev/null
>@@ -1,19 +0,0 @@
>-Copyright (C) 2011 Milo Yip
>-
>-Permission is hereby granted, free of charge, to any person obtaining a copy
>-of this software and associated documentation files (the "Software"), to deal
>-in the Software without restriction, including without limitation the rights
>-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
>-copies of the Software, and to permit persons to whom the Software is
>-furnished to do so, subject to the following conditions:
>-
>-The above copyright notice and this permission notice shall be included in
>-all copies or substantial portions of the Software.
>-
>-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
>-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
>-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
>-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
>-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
>-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
>-THE SOFTWARE.
>\ No newline at end of file
>diff --git a/Source/ThirdParty/ANGLE/src/tests/third_party/rapidjson/README.chromium b/Source/ThirdParty/ANGLE/src/tests/third_party/rapidjson/README.chromium
>deleted file mode 100644
>index 466659a8f66..00000000000
>--- a/Source/ThirdParty/ANGLE/src/tests/third_party/rapidjson/README.chromium
>+++ /dev/null
>@@ -1,8 +0,0 @@
>-Name: RapidJSON
>-URL: https://github.com/miloyip/rapidjson
>-Version: 24dd7ef839b79941d129e833368e913aa9c045da
>-License: Custom
>-License File: LICENSE
>-
>-Description:
>-RapidJSON is a JSON parser and generator for C++.
>\ No newline at end of file
>diff --git a/Source/ThirdParty/ANGLE/src/tests/third_party/rapidjson/include/rapidjson/allocators.h b/Source/ThirdParty/ANGLE/src/tests/third_party/rapidjson/include/rapidjson/allocators.h
>deleted file mode 100644
>index 0bd2d2895ae..00000000000
>--- a/Source/ThirdParty/ANGLE/src/tests/third_party/rapidjson/include/rapidjson/allocators.h
>+++ /dev/null
>@@ -1,245 +0,0 @@
>-// Copyright (C) 2011 Milo Yip
>-//
>-// Permission is hereby granted, free of charge, to any person obtaining a copy
>-// of this software and associated documentation files (the "Software"), to deal
>-// in the Software without restriction, including without limitation the rights
>-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
>-// copies of the Software, and to permit persons to whom the Software is
>-// furnished to do so, subject to the following conditions:
>-//
>-// The above copyright notice and this permission notice shall be included in
>-// all copies or substantial portions of the Software.
>-//
>-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
>-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
>-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
>-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
>-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
>-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
>-// THE SOFTWARE.
>-
>-#ifndef RAPIDJSON_ALLOCATORS_H_
>-#define RAPIDJSON_ALLOCATORS_H_
>-
>-#include "rapidjson.h"
>-
>-RAPIDJSON_NAMESPACE_BEGIN
>-
>-///////////////////////////////////////////////////////////////////////////////
>-// Allocator
>-
>-/*! \class rapidjson::Allocator
>-    \brief Concept for allocating, resizing and freeing memory block.
>-    
>-    Note that Malloc() and Realloc() are non-static but Free() is static.
>-    
>-    So if an allocator need to support Free(), it needs to put its pointer in 
>-    the header of memory block.
>-
>-\code
>-concept Allocator {
>-    static const bool kNeedFree;    //!< Whether this allocator needs to call Free().
>-
>-    // Allocate a memory block.
>-    // \param size of the memory block in bytes.
>-    // \returns pointer to the memory block.
>-    void* Malloc(size_t size);
>-
>-    // Resize a memory block.
>-    // \param originalPtr The pointer to current memory block. Null pointer is permitted.
>-    // \param originalSize The current size in bytes. (Design issue: since some allocator may not book-keep this, explicitly pass to it can save memory.)
>-    // \param newSize the new size in bytes.
>-    void* Realloc(void* originalPtr, size_t originalSize, size_t newSize);
>-
>-    // Free a memory block.
>-    // \param pointer to the memory block. Null pointer is permitted.
>-    static void Free(void *ptr);
>-};
>-\endcode
>-*/
>-
>-///////////////////////////////////////////////////////////////////////////////
>-// CrtAllocator
>-
>-//! C-runtime library allocator.
>-/*! This class is just wrapper for standard C library memory routines.
>-    \note implements Allocator concept
>-*/
>-class CrtAllocator {
>-public:
>-    static const bool kNeedFree = true;
>-    void* Malloc(size_t size) { return std::malloc(size); }
>-    void* Realloc(void* originalPtr, size_t originalSize, size_t newSize) { (void)originalSize; return std::realloc(originalPtr, newSize); }
>-    static void Free(void *ptr) { std::free(ptr); }
>-};
>-
>-///////////////////////////////////////////////////////////////////////////////
>-// MemoryPoolAllocator
>-
>-//! Default memory allocator used by the parser and DOM.
>-/*! This allocator allocate memory blocks from pre-allocated memory chunks. 
>-
>-    It does not free memory blocks. And Realloc() only allocate new memory.
>-
>-    The memory chunks are allocated by BaseAllocator, which is CrtAllocator by default.
>-
>-    User may also supply a buffer as the first chunk.
>-
>-    If the user-buffer is full then additional chunks are allocated by BaseAllocator.
>-
>-    The user-buffer is not deallocated by this allocator.
>-
>-    \tparam BaseAllocator the allocator type for allocating memory chunks. Default is CrtAllocator.
>-    \note implements Allocator concept
>-*/
>-template <typename BaseAllocator = CrtAllocator>
>-class MemoryPoolAllocator {
>-public:
>-    static const bool kNeedFree = false;    //!< Tell users that no need to call Free() with this allocator. (concept Allocator)
>-
>-    //! Constructor with chunkSize.
>-    /*! \param chunkSize The size of memory chunk. The default is kDefaultChunkSize.
>-        \param baseAllocator The allocator for allocating memory chunks.
>-    */
>-    MemoryPoolAllocator(size_t chunkSize = kDefaultChunkCapacity, BaseAllocator* baseAllocator = 0) : 
>-        chunkHead_(0), chunk_capacity_(chunkSize), userBuffer_(0), baseAllocator_(baseAllocator), ownBaseAllocator_(0)
>-    {
>-    }
>-
>-    //! Constructor with user-supplied buffer.
>-    /*! The user buffer will be used firstly. When it is full, memory pool allocates new chunk with chunk size.
>-
>-        The user buffer will not be deallocated when this allocator is destructed.
>-
>-        \param buffer User supplied buffer.
>-        \param size Size of the buffer in bytes. It must at least larger than sizeof(ChunkHeader).
>-        \param chunkSize The size of memory chunk. The default is kDefaultChunkSize.
>-        \param baseAllocator The allocator for allocating memory chunks.
>-    */
>-    MemoryPoolAllocator(void *buffer, size_t size, size_t chunkSize = kDefaultChunkCapacity, BaseAllocator* baseAllocator = 0) :
>-        chunkHead_(0), chunk_capacity_(chunkSize), userBuffer_(buffer), baseAllocator_(baseAllocator), ownBaseAllocator_(0)
>-    {
>-        RAPIDJSON_ASSERT(buffer != 0);
>-        RAPIDJSON_ASSERT(size > sizeof(ChunkHeader));
>-        chunkHead_ = reinterpret_cast<ChunkHeader*>(buffer);
>-        chunkHead_->capacity = size - sizeof(ChunkHeader);
>-        chunkHead_->size = 0;
>-        chunkHead_->next = 0;
>-    }
>-
>-    //! Destructor.
>-    /*! This deallocates all memory chunks, excluding the user-supplied buffer.
>-    */
>-    ~MemoryPoolAllocator() {
>-        Clear();
>-        RAPIDJSON_DELETE(ownBaseAllocator_);
>-    }
>-
>-    //! Deallocates all memory chunks, excluding the user-supplied buffer.
>-    void Clear() {
>-        while(chunkHead_ != 0 && chunkHead_ != userBuffer_) {
>-            ChunkHeader* next = chunkHead_->next;
>-            baseAllocator_->Free(chunkHead_);
>-            chunkHead_ = next;
>-        }
>-    }
>-
>-    //! Computes the total capacity of allocated memory chunks.
>-    /*! \return total capacity in bytes.
>-    */
>-    size_t Capacity() const {
>-        size_t capacity = 0;
>-        for (ChunkHeader* c = chunkHead_; c != 0; c = c->next)
>-            capacity += c->capacity;
>-        return capacity;
>-    }
>-
>-    //! Computes the memory blocks allocated.
>-    /*! \return total used bytes.
>-    */
>-    size_t Size() const {
>-        size_t size = 0;
>-        for (ChunkHeader* c = chunkHead_; c != 0; c = c->next)
>-            size += c->size;
>-        return size;
>-    }
>-
>-    //! Allocates a memory block. (concept Allocator)
>-    void* Malloc(size_t size) {
>-        size = RAPIDJSON_ALIGN(size);
>-        if (chunkHead_ == 0 || chunkHead_->size + size > chunkHead_->capacity)
>-            AddChunk(chunk_capacity_ > size ? chunk_capacity_ : size);
>-
>-        void *buffer = reinterpret_cast<char *>(chunkHead_ + 1) + chunkHead_->size;
>-        chunkHead_->size += size;
>-        return buffer;
>-    }
>-
>-    //! Resizes a memory block (concept Allocator)
>-    void* Realloc(void* originalPtr, size_t originalSize, size_t newSize) {
>-        if (originalPtr == 0)
>-            return Malloc(newSize);
>-
>-        // Do not shrink if new size is smaller than original
>-        if (originalSize >= newSize)
>-            return originalPtr;
>-
>-        // Simply expand it if it is the last allocation and there is sufficient space
>-        if (originalPtr == (char *)(chunkHead_ + 1) + chunkHead_->size - originalSize) {
>-            size_t increment = static_cast<size_t>(newSize - originalSize);
>-            increment = RAPIDJSON_ALIGN(increment);
>-            if (chunkHead_->size + increment <= chunkHead_->capacity) {
>-                chunkHead_->size += increment;
>-                return originalPtr;
>-            }
>-        }
>-
>-        // Realloc process: allocate and copy memory, do not free original buffer.
>-        void* newBuffer = Malloc(newSize);
>-        RAPIDJSON_ASSERT(newBuffer != 0);   // Do not handle out-of-memory explicitly.
>-        return std::memcpy(newBuffer, originalPtr, originalSize);
>-    }
>-
>-    //! Frees a memory block (concept Allocator)
>-    static void Free(void *ptr) { (void)ptr; } // Do nothing
>-
>-private:
>-    //! Copy constructor is not permitted.
>-    MemoryPoolAllocator(const MemoryPoolAllocator& rhs) /* = delete */;
>-    //! Copy assignment operator is not permitted.
>-    MemoryPoolAllocator& operator=(const MemoryPoolAllocator& rhs) /* = delete */;
>-
>-    //! Creates a new chunk.
>-    /*! \param capacity Capacity of the chunk in bytes.
>-    */
>-    void AddChunk(size_t capacity) {
>-        if (!baseAllocator_)
>-            ownBaseAllocator_ = baseAllocator_ = RAPIDJSON_NEW(BaseAllocator());
>-        ChunkHeader* chunk = reinterpret_cast<ChunkHeader*>(baseAllocator_->Malloc(sizeof(ChunkHeader) + capacity));
>-        chunk->capacity = capacity;
>-        chunk->size = 0;
>-        chunk->next = chunkHead_;
>-        chunkHead_ =  chunk;
>-    }
>-
>-    static const int kDefaultChunkCapacity = 64 * 1024; //!< Default chunk capacity.
>-
>-    //! Chunk header for perpending to each chunk.
>-    /*! Chunks are stored as a singly linked list.
>-    */
>-    struct ChunkHeader {
>-        size_t capacity;    //!< Capacity of the chunk in bytes (excluding the header itself).
>-        size_t size;        //!< Current size of allocated memory in bytes.
>-        ChunkHeader *next;  //!< Next chunk in the linked list.
>-    };
>-
>-    ChunkHeader *chunkHead_;    //!< Head of the chunk linked-list. Only the head chunk serves allocation.
>-    size_t chunk_capacity_;     //!< The minimum capacity of chunk when they are allocated.
>-    void *userBuffer_;          //!< User supplied buffer.
>-    BaseAllocator* baseAllocator_;  //!< base allocator for allocating memory chunks.
>-    BaseAllocator* ownBaseAllocator_;   //!< base allocator created by this object.
>-};
>-
>-RAPIDJSON_NAMESPACE_END
>-
>-#endif // RAPIDJSON_ENCODINGS_H_
>diff --git a/Source/ThirdParty/ANGLE/src/tests/third_party/rapidjson/include/rapidjson/document.h b/Source/ThirdParty/ANGLE/src/tests/third_party/rapidjson/include/rapidjson/document.h
>deleted file mode 100644
>index 94d6e5355fb..00000000000
>--- a/Source/ThirdParty/ANGLE/src/tests/third_party/rapidjson/include/rapidjson/document.h
>+++ /dev/null
>@@ -1,1932 +0,0 @@
>-// Copyright (C) 2011 Milo Yip
>-//
>-// Permission is hereby granted, free of charge, to any person obtaining a copy
>-// of this software and associated documentation files (the "Software"), to deal
>-// in the Software without restriction, including without limitation the rights
>-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
>-// copies of the Software, and to permit persons to whom the Software is
>-// furnished to do so, subject to the following conditions:
>-//
>-// The above copyright notice and this permission notice shall be included in
>-// all copies or substantial portions of the Software.
>-//
>-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
>-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
>-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
>-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
>-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
>-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
>-// THE SOFTWARE.
>-
>-#ifndef RAPIDJSON_DOCUMENT_H_
>-#define RAPIDJSON_DOCUMENT_H_
>-
>-/*! \file document.h */
>-
>-#include "reader.h"
>-#include "internal/meta.h"
>-#include "internal/strfunc.h"
>-#include <new>      // placement new
>-
>-#ifdef _MSC_VER
>-RAPIDJSON_DIAG_PUSH
>-RAPIDJSON_DIAG_OFF(4127) // conditional expression is constant
>-#elif defined(__GNUC__)
>-RAPIDJSON_DIAG_PUSH
>-RAPIDJSON_DIAG_OFF(effc++)
>-#endif
>-
>-///////////////////////////////////////////////////////////////////////////////
>-// RAPIDJSON_HAS_STDSTRING
>-
>-#ifndef RAPIDJSON_HAS_STDSTRING
>-#ifdef RAPIDJSON_DOXYGEN_RUNNING
>-#define RAPIDJSON_HAS_STDSTRING 1 // force generation of documentation
>-#else
>-#define RAPIDJSON_HAS_STDSTRING 0 // no std::string support by default
>-#endif
>-/*! \def RAPIDJSON_HAS_STDSTRING
>-    \ingroup RAPIDJSON_CONFIG
>-    \brief Enable RapidJSON support for \c std::string
>-
>-    By defining this preprocessor symbol to \c 1, several convenience functions for using
>-    \ref rapidjson::GenericValue with \c std::string are enabled, especially
>-    for construction and comparison.
>-
>-    \hideinitializer
>-*/
>-#include <string>
>-#endif // RAPIDJSON_HAS_STDSTRING
>-
>-#ifndef RAPIDJSON_NOMEMBERITERATORCLASS
>-#include <iterator> // std::iterator, std::random_access_iterator_tag
>-#endif
>-
>-#if RAPIDJSON_HAS_CXX11_RVALUE_REFS
>-#include <utility> // std::move
>-#endif
>-
>-RAPIDJSON_NAMESPACE_BEGIN
>-
>-// Forward declaration.
>-template <typename Encoding, typename Allocator>
>-class GenericValue;
>-
>-//! Name-value pair in a JSON object value.
>-/*!
>-    This class was internal to GenericValue. It used to be a inner struct.
>-    But a compiler (IBM XL C/C++ for AIX) have reported to have problem with that so it moved as a namespace scope struct.
>-    https://code.google.com/p/rapidjson/issues/detail?id=64
>-*/
>-template <typename Encoding, typename Allocator> 
>-struct GenericMember { 
>-    GenericValue<Encoding, Allocator> name;     //!< name of member (must be a string)
>-    GenericValue<Encoding, Allocator> value;    //!< value of member.
>-};
>-
>-///////////////////////////////////////////////////////////////////////////////
>-// GenericMemberIterator
>-
>-#ifndef RAPIDJSON_NOMEMBERITERATORCLASS
>-
>-//! (Constant) member iterator for a JSON object value
>-/*!
>-    \tparam Const Is this a constant iterator?
>-    \tparam Encoding    Encoding of the value. (Even non-string values need to have the same encoding in a document)
>-    \tparam Allocator   Allocator type for allocating memory of object, array and string.
>-
>-    This class implements a Random Access Iterator for GenericMember elements
>-    of a GenericValue, see ISO/IEC 14882:2003(E) C++ standard, 24.1 [lib.iterator.requirements].
>-
>-    \note This iterator implementation is mainly intended to avoid implicit
>-        conversions from iterator values to \c NULL,
>-        e.g. from GenericValue::FindMember.
>-
>-    \note Define \c RAPIDJSON_NOMEMBERITERATORCLASS to fall back to a
>-        pointer-based implementation, if your platform doesn't provide
>-        the C++ <iterator> header.
>-
>-    \see GenericMember, GenericValue::MemberIterator, GenericValue::ConstMemberIterator
>- */
>-template <bool Const, typename Encoding, typename Allocator>
>-class GenericMemberIterator
>-    : public std::iterator<std::random_access_iterator_tag
>-        , typename internal::MaybeAddConst<Const,GenericMember<Encoding,Allocator> >::Type> {
>-
>-    friend class GenericValue<Encoding,Allocator>;
>-    template <bool, typename, typename> friend class GenericMemberIterator;
>-
>-    typedef GenericMember<Encoding,Allocator> PlainType;
>-    typedef typename internal::MaybeAddConst<Const,PlainType>::Type ValueType;
>-    typedef std::iterator<std::random_access_iterator_tag,ValueType> BaseType;
>-
>-public:
>-    //! Iterator type itself
>-    typedef GenericMemberIterator Iterator;
>-    //! Constant iterator type
>-    typedef GenericMemberIterator<true,Encoding,Allocator>  ConstIterator;
>-    //! Non-constant iterator type
>-    typedef GenericMemberIterator<false,Encoding,Allocator> NonConstIterator;
>-
>-    //! Pointer to (const) GenericMember
>-    typedef typename BaseType::pointer         Pointer;
>-    //! Reference to (const) GenericMember
>-    typedef typename BaseType::reference       Reference;
>-    //! Signed integer type (e.g. \c ptrdiff_t)
>-    typedef typename BaseType::difference_type DifferenceType;
>-
>-    //! Default constructor (singular value)
>-    /*! Creates an iterator pointing to no element.
>-        \note All operations, except for comparisons, are undefined on such values.
>-     */
>-    GenericMemberIterator() : ptr_() {}
>-
>-    //! Iterator conversions to more const
>-    /*!
>-        \param it (Non-const) iterator to copy from
>-
>-        Allows the creation of an iterator from another GenericMemberIterator
>-        that is "less const".  Especially, creating a non-constant iterator
>-        from a constant iterator are disabled:
>-        \li const -> non-const (not ok)
>-        \li const -> const (ok)
>-        \li non-const -> const (ok)
>-        \li non-const -> non-const (ok)
>-
>-        \note If the \c Const template parameter is already \c false, this
>-            constructor effectively defines a regular copy-constructor.
>-            Otherwise, the copy constructor is implicitly defined.
>-    */
>-    GenericMemberIterator(const NonConstIterator & it) : ptr_(it.ptr_) {}
>-
>-    //! @name stepping
>-    //@{
>-    Iterator& operator++(){ ++ptr_; return *this; }
>-    Iterator& operator--(){ --ptr_; return *this; }
>-    Iterator  operator++(int){ Iterator old(*this); ++ptr_; return old; }
>-    Iterator  operator--(int){ Iterator old(*this); --ptr_; return old; }
>-    //@}
>-
>-    //! @name increment/decrement
>-    //@{
>-    Iterator operator+(DifferenceType n) const { return Iterator(ptr_+n); }
>-    Iterator operator-(DifferenceType n) const { return Iterator(ptr_-n); }
>-
>-    Iterator& operator+=(DifferenceType n) { ptr_+=n; return *this; }
>-    Iterator& operator-=(DifferenceType n) { ptr_-=n; return *this; }
>-    //@}
>-
>-    //! @name relations
>-    //@{
>-    bool operator==(ConstIterator that) const { return ptr_ == that.ptr_; }
>-    bool operator!=(ConstIterator that) const { return ptr_ != that.ptr_; }
>-    bool operator<=(ConstIterator that) const { return ptr_ <= that.ptr_; }
>-    bool operator>=(ConstIterator that) const { return ptr_ >= that.ptr_; }
>-    bool operator< (ConstIterator that) const { return ptr_ < that.ptr_; }
>-    bool operator> (ConstIterator that) const { return ptr_ > that.ptr_; }
>-    //@}
>-
>-    //! @name dereference
>-    //@{
>-    Reference operator*() const { return *ptr_; }
>-    Pointer   operator->() const { return ptr_; }
>-    Reference operator[](DifferenceType n) const { return ptr_[n]; }
>-    //@}
>-
>-    //! Distance
>-    DifferenceType operator-(ConstIterator that) const { return ptr_-that.ptr_; }
>-
>-private:
>-    //! Internal constructor from plain pointer
>-    explicit GenericMemberIterator(Pointer p) : ptr_(p) {}
>-
>-    Pointer ptr_; //!< raw pointer
>-};
>-
>-#else // RAPIDJSON_NOMEMBERITERATORCLASS
>-
>-// class-based member iterator implementation disabled, use plain pointers
>-
>-template <bool Const, typename Encoding, typename Allocator>
>-struct GenericMemberIterator;
>-
>-//! non-const GenericMemberIterator
>-template <typename Encoding, typename Allocator>
>-struct GenericMemberIterator<false,Encoding,Allocator> {
>-    //! use plain pointer as iterator type
>-    typedef GenericMember<Encoding,Allocator>* Iterator;
>-};
>-//! const GenericMemberIterator
>-template <typename Encoding, typename Allocator>
>-struct GenericMemberIterator<true,Encoding,Allocator> {
>-    //! use plain const pointer as iterator type
>-    typedef const GenericMember<Encoding,Allocator>* Iterator;
>-};
>-
>-#endif // RAPIDJSON_NOMEMBERITERATORCLASS
>-
>-///////////////////////////////////////////////////////////////////////////////
>-// GenericStringRef
>-
>-//! Reference to a constant string (not taking a copy)
>-/*!
>-    \tparam CharType character type of the string
>-
>-    This helper class is used to automatically infer constant string
>-    references for string literals, especially from \c const \b (!)
>-    character arrays.
>-
>-    The main use is for creating JSON string values without copying the
>-    source string via an \ref Allocator.  This requires that the referenced
>-    string pointers have a sufficient lifetime, which exceeds the lifetime
>-    of the associated GenericValue.
>-
>-    \b Example
>-    \code
>-    Value v("foo");   // ok, no need to copy & calculate length
>-    const char foo[] = "foo";
>-    v.SetString(foo); // ok
>-
>-    const char* bar = foo;
>-    // Value x(bar); // not ok, can't rely on bar's lifetime
>-    Value x(StringRef(bar)); // lifetime explicitly guaranteed by user
>-    Value y(StringRef(bar, 3));  // ok, explicitly pass length
>-    \endcode
>-
>-    \see StringRef, GenericValue::SetString
>-*/
>-template<typename CharType>
>-struct GenericStringRef {
>-    typedef CharType Ch; //!< character type of the string
>-
>-    //! Create string reference from \c const character array
>-    /*!
>-        This constructor implicitly creates a constant string reference from
>-        a \c const character array.  It has better performance than
>-        \ref StringRef(const CharType*) by inferring the string \ref length
>-        from the array length, and also supports strings containing null
>-        characters.
>-
>-        \tparam N length of the string, automatically inferred
>-
>-        \param str Constant character array, lifetime assumed to be longer
>-            than the use of the string in e.g. a GenericValue
>-
>-        \post \ref s == str
>-
>-        \note Constant complexity.
>-        \note There is a hidden, private overload to disallow references to
>-            non-const character arrays to be created via this constructor.
>-            By this, e.g. function-scope arrays used to be filled via
>-            \c snprintf are excluded from consideration.
>-            In such cases, the referenced string should be \b copied to the
>-            GenericValue instead.
>-     */
>-    template<SizeType N>
>-    GenericStringRef(const CharType (&str)[N]) RAPIDJSON_NOEXCEPT
>-        : s(str), length(N-1) {}
>-
>-    //! Explicitly create string reference from \c const character pointer
>-    /*!
>-        This constructor can be used to \b explicitly  create a reference to
>-        a constant string pointer.
>-
>-        \see StringRef(const CharType*)
>-
>-        \param str Constant character pointer, lifetime assumed to be longer
>-            than the use of the string in e.g. a GenericValue
>-
>-        \post \ref s == str
>-
>-        \note There is a hidden, private overload to disallow references to
>-            non-const character arrays to be created via this constructor.
>-            By this, e.g. function-scope arrays used to be filled via
>-            \c snprintf are excluded from consideration.
>-            In such cases, the referenced string should be \b copied to the
>-            GenericValue instead.
>-     */
>-    explicit GenericStringRef(const CharType* str)
>-        : s(str), length(internal::StrLen(str)){ RAPIDJSON_ASSERT(s != NULL); }
>-
>-    //! Create constant string reference from pointer and length
>-    /*! \param str constant string, lifetime assumed to be longer than the use of the string in e.g. a GenericValue
>-        \param len length of the string, excluding the trailing NULL terminator
>-
>-        \post \ref s == str && \ref length == len
>-        \note Constant complexity.
>-     */
>-    GenericStringRef(const CharType* str, SizeType len)
>-        : s(str), length(len) { RAPIDJSON_ASSERT(s != NULL); }
>-
>-    //! implicit conversion to plain CharType pointer
>-    operator const Ch *() const { return s; }
>-
>-    const Ch* const s; //!< plain CharType pointer
>-    const SizeType length; //!< length of the string (excluding the trailing NULL terminator)
>-
>-private:
>-    //! Disallow copy-assignment
>-    GenericStringRef operator=(const GenericStringRef&);
>-    //! Disallow construction from non-const array
>-    template<SizeType N>
>-    GenericStringRef(CharType (&str)[N]) /* = delete */;
>-};
>-
>-//! Mark a character pointer as constant string
>-/*! Mark a plain character pointer as a "string literal".  This function
>-    can be used to avoid copying a character string to be referenced as a
>-    value in a JSON GenericValue object, if the string's lifetime is known
>-    to be valid long enough.
>-    \tparam CharType Character type of the string
>-    \param str Constant string, lifetime assumed to be longer than the use of the string in e.g. a GenericValue
>-    \return GenericStringRef string reference object
>-    \relatesalso GenericStringRef
>-
>-    \see GenericValue::GenericValue(StringRefType), GenericValue::operator=(StringRefType), GenericValue::SetString(StringRefType), GenericValue::PushBack(StringRefType, Allocator&), GenericValue::AddMember
>-*/
>-template<typename CharType>
>-inline GenericStringRef<CharType> StringRef(const CharType* str) {
>-    return GenericStringRef<CharType>(str, internal::StrLen(str));
>-}
>-
>-//! Mark a character pointer as constant string
>-/*! Mark a plain character pointer as a "string literal".  This function
>-    can be used to avoid copying a character string to be referenced as a
>-    value in a JSON GenericValue object, if the string's lifetime is known
>-    to be valid long enough.
>-
>-    This version has better performance with supplied length, and also
>-    supports string containing null characters.
>-
>-    \tparam CharType character type of the string
>-    \param str Constant string, lifetime assumed to be longer than the use of the string in e.g. a GenericValue
>-    \param length The length of source string.
>-    \return GenericStringRef string reference object
>-    \relatesalso GenericStringRef
>-*/
>-template<typename CharType>
>-inline GenericStringRef<CharType> StringRef(const CharType* str, size_t length) {
>-    return GenericStringRef<CharType>(str, SizeType(length));
>-}
>-
>-#if RAPIDJSON_HAS_STDSTRING
>-//! Mark a string object as constant string
>-/*! Mark a string object (e.g. \c std::string) as a "string literal".
>-    This function can be used to avoid copying a string to be referenced as a
>-    value in a JSON GenericValue object, if the string's lifetime is known
>-    to be valid long enough.
>-
>-    \tparam CharType character type of the string
>-    \param str Constant string, lifetime assumed to be longer than the use of the string in e.g. a GenericValue
>-    \return GenericStringRef string reference object
>-    \relatesalso GenericStringRef
>-    \note Requires the definition of the preprocessor symbol \ref RAPIDJSON_HAS_STDSTRING.
>-*/
>-template<typename CharType>
>-inline GenericStringRef<CharType> StringRef(const std::basic_string<CharType>& str) {
>-    return GenericStringRef<CharType>(str.data(), SizeType(str.size()));
>-}
>-#endif
>-
>-///////////////////////////////////////////////////////////////////////////////
>-// GenericValue type traits
>-namespace internal {
>-
>-template <typename T, typename Encoding = void, typename Allocator = void>
>-struct IsGenericValueImpl : FalseType {};
>-
>-// select candidates according to nested encoding and allocator types
>-template <typename T> struct IsGenericValueImpl<T, typename Void<typename T::EncodingType>::Type, typename Void<typename T::AllocatorType>::Type>
>-    : IsBaseOf<GenericValue<typename T::EncodingType, typename T::AllocatorType>, T>::Type {};
>-
>-// helper to match arbitrary GenericValue instantiations, including derived classes
>-template <typename T> struct IsGenericValue : IsGenericValueImpl<T>::Type {};
>-
>-} // namespace internal
>-
>-///////////////////////////////////////////////////////////////////////////////
>-// GenericValue
>-
>-//! Represents a JSON value. Use Value for UTF8 encoding and default allocator.
>-/*!
>-    A JSON value can be one of 7 types. This class is a variant type supporting
>-    these types.
>-
>-    Use the Value if UTF8 and default allocator
>-
>-    \tparam Encoding    Encoding of the value. (Even non-string values need to have the same encoding in a document)
>-    \tparam Allocator   Allocator type for allocating memory of object, array and string.
>-*/
>-template <typename Encoding, typename Allocator = MemoryPoolAllocator<> > 
>-class GenericValue {
>-public:
>-    //! Name-value pair in an object.
>-    typedef GenericMember<Encoding, Allocator> Member;
>-    typedef Encoding EncodingType;                  //!< Encoding type from template parameter.
>-    typedef Allocator AllocatorType;                //!< Allocator type from template parameter.
>-    typedef typename Encoding::Ch Ch;               //!< Character type derived from Encoding.
>-    typedef GenericStringRef<Ch> StringRefType;     //!< Reference to a constant string
>-    typedef typename GenericMemberIterator<false,Encoding,Allocator>::Iterator MemberIterator;  //!< Member iterator for iterating in object.
>-    typedef typename GenericMemberIterator<true,Encoding,Allocator>::Iterator ConstMemberIterator;  //!< Constant member iterator for iterating in object.
>-    typedef GenericValue* ValueIterator;            //!< Value iterator for iterating in array.
>-    typedef const GenericValue* ConstValueIterator; //!< Constant value iterator for iterating in array.
>-
>-    //!@name Constructors and destructor.
>-    //@{
>-
>-    //! Default constructor creates a null value.
>-    GenericValue() RAPIDJSON_NOEXCEPT : data_(), flags_(kNullFlag) {}
>-
>-#if RAPIDJSON_HAS_CXX11_RVALUE_REFS
>-    //! Move constructor in C++11
>-    GenericValue(GenericValue&& rhs) RAPIDJSON_NOEXCEPT : data_(rhs.data_), flags_(rhs.flags_) {
>-        rhs.flags_ = kNullFlag; // give up contents
>-    }
>-#endif
>-
>-private:
>-    //! Copy constructor is not permitted.
>-    GenericValue(const GenericValue& rhs);
>-
>-public:
>-
>-    //! Constructor with JSON value type.
>-    /*! This creates a Value of specified type with default content.
>-        \param type Type of the value.
>-        \note Default content for number is zero.
>-    */
>-    explicit GenericValue(Type type) RAPIDJSON_NOEXCEPT : data_(), flags_() {
>-        static const unsigned defaultFlags[7] = {
>-            kNullFlag, kFalseFlag, kTrueFlag, kObjectFlag, kArrayFlag, kShortStringFlag,
>-            kNumberAnyFlag
>-        };
>-        RAPIDJSON_ASSERT(type <= kNumberType);
>-        flags_ = defaultFlags[type];
>-
>-        // Use ShortString to store empty string.
>-        if (type == kStringType)
>-            data_.ss.SetLength(0);
>-    }
>-
>-    //! Explicit copy constructor (with allocator)
>-    /*! Creates a copy of a Value by using the given Allocator
>-        \tparam SourceAllocator allocator of \c rhs
>-        \param rhs Value to copy from (read-only)
>-        \param allocator Allocator for allocating copied elements and buffers. Commonly use GenericDocument::GetAllocator().
>-        \see CopyFrom()
>-    */
>-    template< typename SourceAllocator >
>-    GenericValue(const GenericValue<Encoding, SourceAllocator>& rhs, Allocator & allocator);
>-
>-    //! Constructor for boolean value.
>-    /*! \param b Boolean value
>-        \note This constructor is limited to \em real boolean values and rejects
>-            implicitly converted types like arbitrary pointers.  Use an explicit cast
>-            to \c bool, if you want to construct a boolean JSON value in such cases.
>-     */
>-#ifndef RAPIDJSON_DOXYGEN_RUNNING // hide SFINAE from Doxygen
>-    template <typename T>
>-    explicit GenericValue(T b, RAPIDJSON_ENABLEIF((internal::IsSame<T,bool>))) RAPIDJSON_NOEXCEPT
>-#else
>-    explicit GenericValue(bool b) RAPIDJSON_NOEXCEPT
>-#endif
>-        : data_(), flags_(b ? kTrueFlag : kFalseFlag) {
>-            // safe-guard against failing SFINAE
>-            RAPIDJSON_STATIC_ASSERT((internal::IsSame<bool,T>::Value));
>-    }
>-
>-    //! Constructor for int value.
>-    explicit GenericValue(int i) RAPIDJSON_NOEXCEPT : data_(), flags_(kNumberIntFlag) {
>-        data_.n.i64 = i;
>-        if (i >= 0)
>-            flags_ |= kUintFlag | kUint64Flag;
>-    }
>-
>-    //! Constructor for unsigned value.
>-    explicit GenericValue(unsigned u) RAPIDJSON_NOEXCEPT : data_(), flags_(kNumberUintFlag) {
>-        data_.n.u64 = u; 
>-        if (!(u & 0x80000000))
>-            flags_ |= kIntFlag | kInt64Flag;
>-    }
>-
>-    //! Constructor for int64_t value.
>-    explicit GenericValue(int64_t i64) RAPIDJSON_NOEXCEPT : data_(), flags_(kNumberInt64Flag) {
>-        data_.n.i64 = i64;
>-        if (i64 >= 0) {
>-            flags_ |= kNumberUint64Flag;
>-            if (!(static_cast<uint64_t>(i64) & RAPIDJSON_UINT64_C2(0xFFFFFFFF, 0x00000000)))
>-                flags_ |= kUintFlag;
>-            if (!(static_cast<uint64_t>(i64) & RAPIDJSON_UINT64_C2(0xFFFFFFFF, 0x80000000)))
>-                flags_ |= kIntFlag;
>-        }
>-        else if (i64 >= static_cast<int64_t>(RAPIDJSON_UINT64_C2(0xFFFFFFFF, 0x80000000)))
>-            flags_ |= kIntFlag;
>-    }
>-
>-    //! Constructor for uint64_t value.
>-    explicit GenericValue(uint64_t u64) RAPIDJSON_NOEXCEPT : data_(), flags_(kNumberUint64Flag) {
>-        data_.n.u64 = u64;
>-        if (!(u64 & RAPIDJSON_UINT64_C2(0x80000000, 0x00000000)))
>-            flags_ |= kInt64Flag;
>-        if (!(u64 & RAPIDJSON_UINT64_C2(0xFFFFFFFF, 0x00000000)))
>-            flags_ |= kUintFlag;
>-        if (!(u64 & RAPIDJSON_UINT64_C2(0xFFFFFFFF, 0x80000000)))
>-            flags_ |= kIntFlag;
>-    }
>-
>-    //! Constructor for double value.
>-    explicit GenericValue(double d) RAPIDJSON_NOEXCEPT : data_(), flags_(kNumberDoubleFlag) { data_.n.d = d; }
>-
>-    //! Constructor for constant string (i.e. do not make a copy of string)
>-    GenericValue(const Ch* s, SizeType length) RAPIDJSON_NOEXCEPT : data_(), flags_() { SetStringRaw(StringRef(s, length)); }
>-
>-    //! Constructor for constant string (i.e. do not make a copy of string)
>-    explicit GenericValue(StringRefType s) RAPIDJSON_NOEXCEPT : data_(), flags_() { SetStringRaw(s); }
>-
>-    //! Constructor for copy-string (i.e. do make a copy of string)
>-    GenericValue(const Ch* s, SizeType length, Allocator& allocator) : data_(), flags_() { SetStringRaw(StringRef(s, length), allocator); }
>-
>-    //! Constructor for copy-string (i.e. do make a copy of string)
>-    GenericValue(const Ch*s, Allocator& allocator) : data_(), flags_() { SetStringRaw(StringRef(s), allocator); }
>-
>-#if RAPIDJSON_HAS_STDSTRING
>-    //! Constructor for copy-string from a string object (i.e. do make a copy of string)
>-    /*! \note Requires the definition of the preprocessor symbol \ref RAPIDJSON_HAS_STDSTRING.
>-     */
>-    GenericValue(const std::basic_string<Ch>& s, Allocator& allocator) : data_(), flags_() { SetStringRaw(StringRef(s), allocator); }
>-#endif
>-
>-    //! Destructor.
>-    /*! Need to destruct elements of array, members of object, or copy-string.
>-    */
>-    ~GenericValue() {
>-        if (Allocator::kNeedFree) { // Shortcut by Allocator's trait
>-            switch(flags_) {
>-            case kArrayFlag:
>-                for (GenericValue* v = data_.a.elements; v != data_.a.elements + data_.a.size; ++v)
>-                    v->~GenericValue();
>-                Allocator::Free(data_.a.elements);
>-                break;
>-
>-            case kObjectFlag:
>-                for (MemberIterator m = MemberBegin(); m != MemberEnd(); ++m)
>-                    m->~Member();
>-                Allocator::Free(data_.o.members);
>-                break;
>-
>-            case kCopyStringFlag:
>-                Allocator::Free(const_cast<Ch*>(data_.s.str));
>-                break;
>-
>-            default:
>-                break;  // Do nothing for other types.
>-            }
>-        }
>-    }
>-
>-    //@}
>-
>-    //!@name Assignment operators
>-    //@{
>-
>-    //! Assignment with move semantics.
>-    /*! \param rhs Source of the assignment. It will become a null value after assignment.
>-    */
>-    GenericValue& operator=(GenericValue& rhs) RAPIDJSON_NOEXCEPT {
>-        RAPIDJSON_ASSERT(this != &rhs);
>-        this->~GenericValue();
>-        RawAssign(rhs);
>-        return *this;
>-    }
>-
>-#if RAPIDJSON_HAS_CXX11_RVALUE_REFS
>-    //! Move assignment in C++11
>-    GenericValue& operator=(GenericValue&& rhs) RAPIDJSON_NOEXCEPT {
>-        return *this = rhs.Move();
>-    }
>-#endif
>-
>-    //! Assignment of constant string reference (no copy)
>-    /*! \param str Constant string reference to be assigned
>-        \note This overload is needed to avoid clashes with the generic primitive type assignment overload below.
>-        \see GenericStringRef, operator=(T)
>-    */
>-    GenericValue& operator=(StringRefType str) RAPIDJSON_NOEXCEPT {
>-        GenericValue s(str);
>-        return *this = s;
>-    }
>-
>-    //! Assignment with primitive types.
>-    /*! \tparam T Either \ref Type, \c int, \c unsigned, \c int64_t, \c uint64_t
>-        \param value The value to be assigned.
>-
>-        \note The source type \c T explicitly disallows all pointer types,
>-            especially (\c const) \ref Ch*.  This helps avoiding implicitly
>-            referencing character strings with insufficient lifetime, use
>-            \ref SetString(const Ch*, Allocator&) (for copying) or
>-            \ref StringRef() (to explicitly mark the pointer as constant) instead.
>-            All other pointer types would implicitly convert to \c bool,
>-            use \ref SetBool() instead.
>-    */
>-    template <typename T>
>-    RAPIDJSON_DISABLEIF_RETURN((internal::IsPointer<T>), (GenericValue&))
>-    operator=(T value) {
>-        GenericValue v(value);
>-        return *this = v;
>-    }
>-
>-    //! Deep-copy assignment from Value
>-    /*! Assigns a \b copy of the Value to the current Value object
>-        \tparam SourceAllocator Allocator type of \c rhs
>-        \param rhs Value to copy from (read-only)
>-        \param allocator Allocator to use for copying
>-     */
>-    template <typename SourceAllocator>
>-    GenericValue& CopyFrom(const GenericValue<Encoding, SourceAllocator>& rhs, Allocator& allocator) {
>-        RAPIDJSON_ASSERT((void*)this != (void const*)&rhs);
>-        this->~GenericValue();
>-        new (this) GenericValue(rhs, allocator);
>-        return *this;
>-    }
>-
>-    //! Exchange the contents of this value with those of other.
>-    /*!
>-        \param other Another value.
>-        \note Constant complexity.
>-    */
>-    GenericValue& Swap(GenericValue& other) RAPIDJSON_NOEXCEPT {
>-        GenericValue temp;
>-        temp.RawAssign(*this);
>-        RawAssign(other);
>-        other.RawAssign(temp);
>-        return *this;
>-    }
>-
>-    //! Prepare Value for move semantics
>-    /*! \return *this */
>-    GenericValue& Move() RAPIDJSON_NOEXCEPT { return *this; }
>-    //@}
>-
>-    //!@name Equal-to and not-equal-to operators
>-    //@{
>-    //! Equal-to operator
>-    /*!
>-        \note If an object contains duplicated named member, comparing equality with any object is always \c false.
>-        \note Linear time complexity (number of all values in the subtree and total lengths of all strings).
>-    */
>-    template <typename SourceAllocator>
>-    bool operator==(const GenericValue<Encoding, SourceAllocator>& rhs) const {
>-        typedef GenericValue<Encoding, SourceAllocator> RhsType;
>-        if (GetType() != rhs.GetType())
>-            return false;
>-
>-        switch (GetType()) {
>-        case kObjectType: // Warning: O(n^2) inner-loop
>-            if (data_.o.size != rhs.data_.o.size)
>-                return false;           
>-            for (ConstMemberIterator lhsMemberItr = MemberBegin(); lhsMemberItr != MemberEnd(); ++lhsMemberItr) {
>-                typename RhsType::ConstMemberIterator rhsMemberItr = rhs.FindMember(lhsMemberItr->name);
>-                if (rhsMemberItr == rhs.MemberEnd() || lhsMemberItr->value != rhsMemberItr->value)
>-                    return false;
>-            }
>-            return true;
>-            
>-        case kArrayType:
>-            if (data_.a.size != rhs.data_.a.size)
>-                return false;
>-            for (SizeType i = 0; i < data_.a.size; i++)
>-                if ((*this)[i] != rhs[i])
>-                    return false;
>-            return true;
>-
>-        case kStringType:
>-            return StringEqual(rhs);
>-
>-        case kNumberType:
>-            if (IsDouble() || rhs.IsDouble())
>-                return GetDouble() == rhs.GetDouble(); // May convert one operand from integer to double.
>-            else
>-                return data_.n.u64 == rhs.data_.n.u64;
>-
>-        default: // kTrueType, kFalseType, kNullType
>-            return true;
>-        }
>-    }
>-
>-    //! Equal-to operator with const C-string pointer
>-    bool operator==(const Ch* rhs) const { return *this == GenericValue(StringRef(rhs)); }
>-
>-#if RAPIDJSON_HAS_STDSTRING
>-    //! Equal-to operator with string object
>-    /*! \note Requires the definition of the preprocessor symbol \ref RAPIDJSON_HAS_STDSTRING.
>-     */
>-    bool operator==(const std::basic_string<Ch>& rhs) const { return *this == GenericValue(StringRef(rhs)); }
>-#endif
>-
>-    //! Equal-to operator with primitive types
>-    /*! \tparam T Either \ref Type, \c int, \c unsigned, \c int64_t, \c uint64_t, \c double, \c true, \c false
>-    */
>-    template <typename T> RAPIDJSON_DISABLEIF_RETURN((internal::OrExpr<internal::IsPointer<T>,internal::IsGenericValue<T> >), (bool)) operator==(const T& rhs) const { return *this == GenericValue(rhs); }
>-
>-    //! Not-equal-to operator
>-    /*! \return !(*this == rhs)
>-     */
>-    template <typename SourceAllocator>
>-    bool operator!=(const GenericValue<Encoding, SourceAllocator>& rhs) const { return !(*this == rhs); }
>-
>-    //! Not-equal-to operator with const C-string pointer
>-    bool operator!=(const Ch* rhs) const { return !(*this == rhs); }
>-
>-    //! Not-equal-to operator with arbitrary types
>-    /*! \return !(*this == rhs)
>-     */
>-    template <typename T> RAPIDJSON_DISABLEIF_RETURN((internal::IsGenericValue<T>), (bool)) operator!=(const T& rhs) const { return !(*this == rhs); }
>-
>-    //! Equal-to operator with arbitrary types (symmetric version)
>-    /*! \return (rhs == lhs)
>-     */
>-    template <typename T> friend RAPIDJSON_DISABLEIF_RETURN((internal::IsGenericValue<T>), (bool)) operator==(const T& lhs, const GenericValue& rhs) { return rhs == lhs; }
>-
>-    //! Not-Equal-to operator with arbitrary types (symmetric version)
>-    /*! \return !(rhs == lhs)
>-     */
>-    template <typename T> friend RAPIDJSON_DISABLEIF_RETURN((internal::IsGenericValue<T>), (bool)) operator!=(const T& lhs, const GenericValue& rhs) { return !(rhs == lhs); }
>-    //@}
>-
>-    //!@name Type
>-    //@{
>-
>-    Type GetType()  const { return static_cast<Type>(flags_ & kTypeMask); }
>-    bool IsNull()   const { return flags_ == kNullFlag; }
>-    bool IsFalse()  const { return flags_ == kFalseFlag; }
>-    bool IsTrue()   const { return flags_ == kTrueFlag; }
>-    bool IsBool()   const { return (flags_ & kBoolFlag) != 0; }
>-    bool IsObject() const { return flags_ == kObjectFlag; }
>-    bool IsArray()  const { return flags_ == kArrayFlag; }
>-    bool IsNumber() const { return (flags_ & kNumberFlag) != 0; }
>-    bool IsInt()    const { return (flags_ & kIntFlag) != 0; }
>-    bool IsUint()   const { return (flags_ & kUintFlag) != 0; }
>-    bool IsInt64()  const { return (flags_ & kInt64Flag) != 0; }
>-    bool IsUint64() const { return (flags_ & kUint64Flag) != 0; }
>-    bool IsDouble() const { return (flags_ & kDoubleFlag) != 0; }
>-    bool IsString() const { return (flags_ & kStringFlag) != 0; }
>-
>-    //@}
>-
>-    //!@name Null
>-    //@{
>-
>-    GenericValue& SetNull() { this->~GenericValue(); new (this) GenericValue(); return *this; }
>-
>-    //@}
>-
>-    //!@name Bool
>-    //@{
>-
>-    bool GetBool() const { RAPIDJSON_ASSERT(IsBool()); return flags_ == kTrueFlag; }
>-    //!< Set boolean value
>-    /*! \post IsBool() == true */
>-    GenericValue& SetBool(bool b) { this->~GenericValue(); new (this) GenericValue(b); return *this; }
>-
>-    //@}
>-
>-    //!@name Object
>-    //@{
>-
>-    //! Set this value as an empty object.
>-    /*! \post IsObject() == true */
>-    GenericValue& SetObject() { this->~GenericValue(); new (this) GenericValue(kObjectType); return *this; }
>-
>-    //! Get the number of members in the object.
>-    SizeType MemberCount() const { RAPIDJSON_ASSERT(IsObject()); return data_.o.size; }
>-
>-    //! Check whether the object is empty.
>-    bool ObjectEmpty() const { RAPIDJSON_ASSERT(IsObject()); return data_.o.size == 0; }
>-
>-    //! Get a value from an object associated with the name.
>-    /*! \pre IsObject() == true
>-        \tparam T Either \c Ch or \c const \c Ch (template used for disambiguation with \ref operator[](SizeType))
>-        \note In version 0.1x, if the member is not found, this function returns a null value. This makes issue 7.
>-        Since 0.2, if the name is not correct, it will assert.
>-        If user is unsure whether a member exists, user should use HasMember() first.
>-        A better approach is to use FindMember().
>-        \note Linear time complexity.
>-    */
>-    template <typename T>
>-    RAPIDJSON_DISABLEIF_RETURN((internal::NotExpr<internal::IsSame<typename internal::RemoveConst<T>::Type, Ch> >),(GenericValue&)) operator[](T* name) {
>-        GenericValue n(StringRef(name));
>-        return (*this)[n];
>-    }
>-    template <typename T>
>-    RAPIDJSON_DISABLEIF_RETURN((internal::NotExpr<internal::IsSame<typename internal::RemoveConst<T>::Type, Ch> >),(const GenericValue&)) operator[](T* name) const { return const_cast<GenericValue&>(*this)[name]; }
>-
>-    //! Get a value from an object associated with the name.
>-    /*! \pre IsObject() == true
>-        \tparam SourceAllocator Allocator of the \c name value
>-
>-        \note Compared to \ref operator[](T*), this version is faster because it does not need a StrLen().
>-        And it can also handle strings with embedded null characters.
>-
>-        \note Linear time complexity.
>-    */
>-    template <typename SourceAllocator>
>-    GenericValue& operator[](const GenericValue<Encoding, SourceAllocator>& name) {
>-        MemberIterator member = FindMember(name);
>-        if (member != MemberEnd())
>-            return member->value;
>-        else {
>-            RAPIDJSON_ASSERT(false);    // see above note
>-            static GenericValue NullValue;
>-            return NullValue;
>-        }
>-    }
>-    template <typename SourceAllocator>
>-    const GenericValue& operator[](const GenericValue<Encoding, SourceAllocator>& name) const { return const_cast<GenericValue&>(*this)[name]; }
>-
>-    //! Const member iterator
>-    /*! \pre IsObject() == true */
>-    ConstMemberIterator MemberBegin() const { RAPIDJSON_ASSERT(IsObject()); return ConstMemberIterator(data_.o.members); }
>-    //! Const \em past-the-end member iterator
>-    /*! \pre IsObject() == true */
>-    ConstMemberIterator MemberEnd() const   { RAPIDJSON_ASSERT(IsObject()); return ConstMemberIterator(data_.o.members + data_.o.size); }
>-    //! Member iterator
>-    /*! \pre IsObject() == true */
>-    MemberIterator MemberBegin()            { RAPIDJSON_ASSERT(IsObject()); return MemberIterator(data_.o.members); }
>-    //! \em Past-the-end member iterator
>-    /*! \pre IsObject() == true */
>-    MemberIterator MemberEnd()              { RAPIDJSON_ASSERT(IsObject()); return MemberIterator(data_.o.members + data_.o.size); }
>-
>-    //! Check whether a member exists in the object.
>-    /*!
>-        \param name Member name to be searched.
>-        \pre IsObject() == true
>-        \return Whether a member with that name exists.
>-        \note It is better to use FindMember() directly if you need the obtain the value as well.
>-        \note Linear time complexity.
>-    */
>-    bool HasMember(const Ch* name) const { return FindMember(name) != MemberEnd(); }
>-
>-    //! Check whether a member exists in the object with GenericValue name.
>-    /*!
>-        This version is faster because it does not need a StrLen(). It can also handle string with null character.
>-        \param name Member name to be searched.
>-        \pre IsObject() == true
>-        \return Whether a member with that name exists.
>-        \note It is better to use FindMember() directly if you need the obtain the value as well.
>-        \note Linear time complexity.
>-    */
>-    template <typename SourceAllocator>
>-    bool HasMember(const GenericValue<Encoding, SourceAllocator>& name) const { return FindMember(name) != MemberEnd(); }
>-
>-    //! Find member by name.
>-    /*!
>-        \param name Member name to be searched.
>-        \pre IsObject() == true
>-        \return Iterator to member, if it exists.
>-            Otherwise returns \ref MemberEnd().
>-
>-        \note Earlier versions of Rapidjson returned a \c NULL pointer, in case
>-            the requested member doesn't exist. For consistency with e.g.
>-            \c std::map, this has been changed to MemberEnd() now.
>-        \note Linear time complexity.
>-    */
>-    MemberIterator FindMember(const Ch* name) {
>-        GenericValue n(StringRef(name));
>-        return FindMember(n);
>-    }
>-
>-    ConstMemberIterator FindMember(const Ch* name) const { return const_cast<GenericValue&>(*this).FindMember(name); }
>-
>-    //! Find member by name.
>-    /*!
>-        This version is faster because it does not need a StrLen(). It can also handle string with null character.
>-        \param name Member name to be searched.
>-        \pre IsObject() == true
>-        \return Iterator to member, if it exists.
>-            Otherwise returns \ref MemberEnd().
>-
>-        \note Earlier versions of Rapidjson returned a \c NULL pointer, in case
>-            the requested member doesn't exist. For consistency with e.g.
>-            \c std::map, this has been changed to MemberEnd() now.
>-        \note Linear time complexity.
>-    */
>-    template <typename SourceAllocator>
>-    MemberIterator FindMember(const GenericValue<Encoding, SourceAllocator>& name) {
>-        RAPIDJSON_ASSERT(IsObject());
>-        RAPIDJSON_ASSERT(name.IsString());
>-        MemberIterator member = MemberBegin();
>-        for ( ; member != MemberEnd(); ++member)
>-            if (name.StringEqual(member->name))
>-                break;
>-        return member;
>-    }
>-    template <typename SourceAllocator> ConstMemberIterator FindMember(const GenericValue<Encoding, SourceAllocator>& name) const { return const_cast<GenericValue&>(*this).FindMember(name); }
>-
>-    //! Add a member (name-value pair) to the object.
>-    /*! \param name A string value as name of member.
>-        \param value Value of any type.
>-        \param allocator    Allocator for reallocating memory. It must be the same one as used before. Commonly use GenericDocument::GetAllocator().
>-        \return The value itself for fluent API.
>-        \note The ownership of \c name and \c value will be transferred to this object on success.
>-        \pre  IsObject() && name.IsString()
>-        \post name.IsNull() && value.IsNull()
>-        \note Amortized Constant time complexity.
>-    */
>-    GenericValue& AddMember(GenericValue& name, GenericValue& value, Allocator& allocator) {
>-        RAPIDJSON_ASSERT(IsObject());
>-        RAPIDJSON_ASSERT(name.IsString());
>-
>-        Object& o = data_.o;
>-        if (o.size >= o.capacity) {
>-            if (o.capacity == 0) {
>-                o.capacity = kDefaultObjectCapacity;
>-                o.members = reinterpret_cast<Member*>(allocator.Malloc(o.capacity * sizeof(Member)));
>-            }
>-            else {
>-                SizeType oldCapacity = o.capacity;
>-                o.capacity += (oldCapacity + 1) / 2; // grow by factor 1.5
>-                o.members = reinterpret_cast<Member*>(allocator.Realloc(o.members, oldCapacity * sizeof(Member), o.capacity * sizeof(Member)));
>-            }
>-        }
>-        o.members[o.size].name.RawAssign(name);
>-        o.members[o.size].value.RawAssign(value);
>-        o.size++;
>-        return *this;
>-    }
>-
>-#if RAPIDJSON_HAS_CXX11_RVALUE_REFS
>-    GenericValue& AddMember(GenericValue&& name, GenericValue&& value, Allocator& allocator) {
>-        return AddMember(name, value, allocator);
>-    }
>-    GenericValue& AddMember(GenericValue&& name, GenericValue& value, Allocator& allocator) {
>-        return AddMember(name, value, allocator);
>-    }
>-    GenericValue& AddMember(GenericValue& name, GenericValue&& value, Allocator& allocator) {
>-        return AddMember(name, value, allocator);
>-    }
>-    GenericValue& AddMember(StringRefType name, GenericValue&& value, Allocator& allocator) {
>-        GenericValue n(name);
>-        return AddMember(n, value, allocator);
>-    }
>-#endif // RAPIDJSON_HAS_CXX11_RVALUE_REFS
>-
>-
>-    //! Add a member (name-value pair) to the object.
>-    /*! \param name A constant string reference as name of member.
>-        \param value Value of any type.
>-        \param allocator    Allocator for reallocating memory. It must be the same one as used before. Commonly use GenericDocument::GetAllocator().
>-        \return The value itself for fluent API.
>-        \note The ownership of \c value will be transferred to this object on success.
>-        \pre  IsObject()
>-        \post value.IsNull()
>-        \note Amortized Constant time complexity.
>-    */
>-    GenericValue& AddMember(StringRefType name, GenericValue& value, Allocator& allocator) {
>-        GenericValue n(name);
>-        return AddMember(n, value, allocator);
>-    }
>-
>-    //! Add a constant string value as member (name-value pair) to the object.
>-    /*! \param name A constant string reference as name of member.
>-        \param value constant string reference as value of member.
>-        \param allocator    Allocator for reallocating memory. It must be the same one as used before. Commonly use GenericDocument::GetAllocator().
>-        \return The value itself for fluent API.
>-        \pre  IsObject()
>-        \note This overload is needed to avoid clashes with the generic primitive type AddMember(StringRefType,T,Allocator&) overload below.
>-        \note Amortized Constant time complexity.
>-    */
>-    GenericValue& AddMember(StringRefType name, StringRefType value, Allocator& allocator) {
>-        GenericValue v(value);
>-        return AddMember(name, v, allocator);
>-    }
>-
>-    //! Add any primitive value as member (name-value pair) to the object.
>-    /*! \tparam T Either \ref Type, \c int, \c unsigned, \c int64_t, \c uint64_t
>-        \param name A constant string reference as name of member.
>-        \param value Value of primitive type \c T as value of member
>-        \param allocator Allocator for reallocating memory. Commonly use GenericDocument::GetAllocator().
>-        \return The value itself for fluent API.
>-        \pre  IsObject()
>-
>-        \note The source type \c T explicitly disallows all pointer types,
>-            especially (\c const) \ref Ch*.  This helps avoiding implicitly
>-            referencing character strings with insufficient lifetime, use
>-            \ref AddMember(StringRefType, GenericValue&, Allocator&) or \ref
>-            AddMember(StringRefType, StringRefType, Allocator&).
>-            All other pointer types would implicitly convert to \c bool,
>-            use an explicit cast instead, if needed.
>-        \note Amortized Constant time complexity.
>-    */
>-    template <typename T>
>-    RAPIDJSON_DISABLEIF_RETURN((internal::OrExpr<internal::IsPointer<T>, internal::IsGenericValue<T> >), (GenericValue&))
>-    AddMember(StringRefType name, T value, Allocator& allocator) {
>-        GenericValue n(name);
>-        GenericValue v(value);
>-        return AddMember(n, v, allocator);
>-    }
>-
>-    //! Remove all members in the object.
>-    /*! This function do not deallocate memory in the object, i.e. the capacity is unchanged.
>-        \note Linear time complexity.
>-    */
>-    void RemoveAllMembers() {
>-        RAPIDJSON_ASSERT(IsObject()); 
>-        for (MemberIterator m = MemberBegin(); m != MemberEnd(); ++m)
>-            m->~Member();
>-        data_.o.size = 0;
>-    }
>-
>-    //! Remove a member in object by its name.
>-    /*! \param name Name of member to be removed.
>-        \return Whether the member existed.
>-        \note This function may reorder the object members. Use \ref
>-            EraseMember(ConstMemberIterator) if you need to preserve the
>-            relative order of the remaining members.
>-        \note Linear time complexity.
>-    */
>-    bool RemoveMember(const Ch* name) {
>-        GenericValue n(StringRef(name));
>-        return RemoveMember(n);
>-    }
>-
>-    template <typename SourceAllocator>
>-    bool RemoveMember(const GenericValue<Encoding, SourceAllocator>& name) {
>-        MemberIterator m = FindMember(name);
>-        if (m != MemberEnd()) {
>-            RemoveMember(m);
>-            return true;
>-        }
>-        else
>-            return false;
>-    }
>-
>-    //! Remove a member in object by iterator.
>-    /*! \param m member iterator (obtained by FindMember() or MemberBegin()).
>-        \return the new iterator after removal.
>-        \note This function may reorder the object members. Use \ref
>-            EraseMember(ConstMemberIterator) if you need to preserve the
>-            relative order of the remaining members.
>-        \note Constant time complexity.
>-    */
>-    MemberIterator RemoveMember(MemberIterator m) {
>-        RAPIDJSON_ASSERT(IsObject());
>-        RAPIDJSON_ASSERT(data_.o.size > 0);
>-        RAPIDJSON_ASSERT(data_.o.members != 0);
>-        RAPIDJSON_ASSERT(m >= MemberBegin() && m < MemberEnd());
>-
>-        MemberIterator last(data_.o.members + (data_.o.size - 1));
>-        if (data_.o.size > 1 && m != last) {
>-            // Move the last one to this place
>-            *m = *last;
>-        }
>-        else {
>-            // Only one left, just destroy
>-            m->~Member();
>-        }
>-        --data_.o.size;
>-        return m;
>-    }
>-
>-    //! Remove a member from an object by iterator.
>-    /*! \param pos iterator to the member to remove
>-        \pre IsObject() == true && \ref MemberBegin() <= \c pos < \ref MemberEnd()
>-        \return Iterator following the removed element.
>-            If the iterator \c pos refers to the last element, the \ref MemberEnd() iterator is returned.
>-        \note This function preserves the relative order of the remaining object
>-            members. If you do not need this, use the more efficient \ref RemoveMember(MemberIterator).
>-        \note Linear time complexity.
>-    */
>-    MemberIterator EraseMember(ConstMemberIterator pos) {
>-        return EraseMember(pos, pos +1);
>-    }
>-
>-    //! Remove members in the range [first, last) from an object.
>-    /*! \param first iterator to the first member to remove
>-        \param last  iterator following the last member to remove
>-        \pre IsObject() == true && \ref MemberBegin() <= \c first <= \c last <= \ref MemberEnd()
>-        \return Iterator following the last removed element.
>-        \note This function preserves the relative order of the remaining object
>-            members.
>-        \note Linear time complexity.
>-    */
>-    MemberIterator EraseMember(ConstMemberIterator first, ConstMemberIterator last) {
>-        RAPIDJSON_ASSERT(IsObject());
>-        RAPIDJSON_ASSERT(data_.o.size > 0);
>-        RAPIDJSON_ASSERT(data_.o.members != 0);
>-        RAPIDJSON_ASSERT(first >= MemberBegin());
>-        RAPIDJSON_ASSERT(first <= last);
>-        RAPIDJSON_ASSERT(last <= MemberEnd());
>-
>-        MemberIterator pos = MemberBegin() + (first - MemberBegin());
>-        for (MemberIterator itr = pos; itr != last; ++itr)
>-            itr->~Member();
>-        std::memmove(&*pos, &*last, (MemberEnd() - last) * sizeof(Member));
>-        data_.o.size -= (last - first);
>-        return pos;
>-    }
>-
>-    //@}
>-
>-    //!@name Array
>-    //@{
>-
>-    //! Set this value as an empty array.
>-    /*! \post IsArray == true */
>-    GenericValue& SetArray() {  this->~GenericValue(); new (this) GenericValue(kArrayType); return *this; }
>-
>-    //! Get the number of elements in array.
>-    SizeType Size() const { RAPIDJSON_ASSERT(IsArray()); return data_.a.size; }
>-
>-    //! Get the capacity of array.
>-    SizeType Capacity() const { RAPIDJSON_ASSERT(IsArray()); return data_.a.capacity; }
>-
>-    //! Check whether the array is empty.
>-    bool Empty() const { RAPIDJSON_ASSERT(IsArray()); return data_.a.size == 0; }
>-
>-    //! Remove all elements in the array.
>-    /*! This function do not deallocate memory in the array, i.e. the capacity is unchanged.
>-        \note Linear time complexity.
>-    */
>-    void Clear() {
>-        RAPIDJSON_ASSERT(IsArray()); 
>-        for (SizeType i = 0; i < data_.a.size; ++i)
>-            data_.a.elements[i].~GenericValue();
>-        data_.a.size = 0;
>-    }
>-
>-    //! Get an element from array by index.
>-    /*! \pre IsArray() == true
>-        \param index Zero-based index of element.
>-        \see operator[](T*)
>-    */
>-    GenericValue& operator[](SizeType index) {
>-        RAPIDJSON_ASSERT(IsArray());
>-        RAPIDJSON_ASSERT(index < data_.a.size);
>-        return data_.a.elements[index];
>-    }
>-    const GenericValue& operator[](SizeType index) const { return const_cast<GenericValue&>(*this)[index]; }
>-
>-    //! Element iterator
>-    /*! \pre IsArray() == true */
>-    ValueIterator Begin() { RAPIDJSON_ASSERT(IsArray()); return data_.a.elements; }
>-    //! \em Past-the-end element iterator
>-    /*! \pre IsArray() == true */
>-    ValueIterator End() { RAPIDJSON_ASSERT(IsArray()); return data_.a.elements + data_.a.size; }
>-    //! Constant element iterator
>-    /*! \pre IsArray() == true */
>-    ConstValueIterator Begin() const { return const_cast<GenericValue&>(*this).Begin(); }
>-    //! Constant \em past-the-end element iterator
>-    /*! \pre IsArray() == true */
>-    ConstValueIterator End() const { return const_cast<GenericValue&>(*this).End(); }
>-
>-    //! Request the array to have enough capacity to store elements.
>-    /*! \param newCapacity  The capacity that the array at least need to have.
>-        \param allocator    Allocator for reallocating memory. It must be the same one as used before. Commonly use GenericDocument::GetAllocator().
>-        \return The value itself for fluent API.
>-        \note Linear time complexity.
>-    */
>-    GenericValue& Reserve(SizeType newCapacity, Allocator &allocator) {
>-        RAPIDJSON_ASSERT(IsArray());
>-        if (newCapacity > data_.a.capacity) {
>-            data_.a.elements = (GenericValue*)allocator.Realloc(data_.a.elements, data_.a.capacity * sizeof(GenericValue), newCapacity * sizeof(GenericValue));
>-            data_.a.capacity = newCapacity;
>-        }
>-        return *this;
>-    }
>-
>-    //! Append a GenericValue at the end of the array.
>-    /*! \param value        Value to be appended.
>-        \param allocator    Allocator for reallocating memory. It must be the same one as used before. Commonly use GenericDocument::GetAllocator().
>-        \pre IsArray() == true
>-        \post value.IsNull() == true
>-        \return The value itself for fluent API.
>-        \note The ownership of \c value will be transferred to this array on success.
>-        \note If the number of elements to be appended is known, calls Reserve() once first may be more efficient.
>-        \note Amortized constant time complexity.
>-    */
>-    GenericValue& PushBack(GenericValue& value, Allocator& allocator) {
>-        RAPIDJSON_ASSERT(IsArray());
>-        if (data_.a.size >= data_.a.capacity)
>-            Reserve(data_.a.capacity == 0 ? kDefaultArrayCapacity : (data_.a.capacity + (data_.a.capacity + 1) / 2), allocator);
>-        data_.a.elements[data_.a.size++].RawAssign(value);
>-        return *this;
>-    }
>-
>-#if RAPIDJSON_HAS_CXX11_RVALUE_REFS
>-    GenericValue& PushBack(GenericValue&& value, Allocator& allocator) {
>-        return PushBack(value, allocator);
>-    }
>-#endif // RAPIDJSON_HAS_CXX11_RVALUE_REFS
>-
>-    //! Append a constant string reference at the end of the array.
>-    /*! \param value        Constant string reference to be appended.
>-        \param allocator    Allocator for reallocating memory. It must be the same one used previously. Commonly use GenericDocument::GetAllocator().
>-        \pre IsArray() == true
>-        \return The value itself for fluent API.
>-        \note If the number of elements to be appended is known, calls Reserve() once first may be more efficient.
>-        \note Amortized constant time complexity.
>-        \see GenericStringRef
>-    */
>-    GenericValue& PushBack(StringRefType value, Allocator& allocator) {
>-        return (*this).template PushBack<StringRefType>(value, allocator);
>-    }
>-
>-    //! Append a primitive value at the end of the array.
>-    /*! \tparam T Either \ref Type, \c int, \c unsigned, \c int64_t, \c uint64_t
>-        \param value Value of primitive type T to be appended.
>-        \param allocator    Allocator for reallocating memory. It must be the same one as used before. Commonly use GenericDocument::GetAllocator().
>-        \pre IsArray() == true
>-        \return The value itself for fluent API.
>-        \note If the number of elements to be appended is known, calls Reserve() once first may be more efficient.
>-
>-        \note The source type \c T explicitly disallows all pointer types,
>-            especially (\c const) \ref Ch*.  This helps avoiding implicitly
>-            referencing character strings with insufficient lifetime, use
>-            \ref PushBack(GenericValue&, Allocator&) or \ref
>-            PushBack(StringRefType, Allocator&).
>-            All other pointer types would implicitly convert to \c bool,
>-            use an explicit cast instead, if needed.
>-        \note Amortized constant time complexity.
>-    */
>-    template <typename T>
>-    RAPIDJSON_DISABLEIF_RETURN((internal::OrExpr<internal::IsPointer<T>, internal::IsGenericValue<T> >), (GenericValue&))
>-    PushBack(T value, Allocator& allocator) {
>-        GenericValue v(value);
>-        return PushBack(v, allocator);
>-    }
>-
>-    //! Remove the last element in the array.
>-    /*!
>-        \note Constant time complexity.
>-    */
>-    GenericValue& PopBack() {
>-        RAPIDJSON_ASSERT(IsArray());
>-        RAPIDJSON_ASSERT(!Empty());
>-        data_.a.elements[--data_.a.size].~GenericValue();
>-        return *this;
>-    }
>-
>-    //! Remove an element of array by iterator.
>-    /*!
>-        \param pos iterator to the element to remove
>-        \pre IsArray() == true && \ref Begin() <= \c pos < \ref End()
>-        \return Iterator following the removed element. If the iterator pos refers to the last element, the End() iterator is returned.
>-        \note Linear time complexity.
>-    */
>-    ValueIterator Erase(ConstValueIterator pos) {
>-        return Erase(pos, pos + 1);
>-    }
>-
>-    //! Remove elements in the range [first, last) of the array.
>-    /*!
>-        \param first iterator to the first element to remove
>-        \param last  iterator following the last element to remove
>-        \pre IsArray() == true && \ref Begin() <= \c first <= \c last <= \ref End()
>-        \return Iterator following the last removed element.
>-        \note Linear time complexity.
>-    */
>-    ValueIterator Erase(ConstValueIterator first, ConstValueIterator last) {
>-        RAPIDJSON_ASSERT(IsArray());
>-        RAPIDJSON_ASSERT(data_.a.size > 0);
>-        RAPIDJSON_ASSERT(data_.a.elements != 0);
>-        RAPIDJSON_ASSERT(first >= Begin());
>-        RAPIDJSON_ASSERT(first <= last);
>-        RAPIDJSON_ASSERT(last <= End());
>-        ValueIterator pos = Begin() + (first - Begin());
>-        for (ValueIterator itr = pos; itr != last; ++itr)
>-            itr->~GenericValue();       
>-        std::memmove(pos, last, (End() - last) * sizeof(GenericValue));
>-        data_.a.size -= (last - first);
>-        return pos;
>-    }
>-
>-    //@}
>-
>-    //!@name Number
>-    //@{
>-
>-    int GetInt() const          { RAPIDJSON_ASSERT(flags_ & kIntFlag);   return data_.n.i.i;   }
>-    unsigned GetUint() const    { RAPIDJSON_ASSERT(flags_ & kUintFlag);  return data_.n.u.u;   }
>-    int64_t GetInt64() const    { RAPIDJSON_ASSERT(flags_ & kInt64Flag); return data_.n.i64; }
>-    uint64_t GetUint64() const  { RAPIDJSON_ASSERT(flags_ & kUint64Flag); return data_.n.u64; }
>-
>-    double GetDouble() const {
>-        RAPIDJSON_ASSERT(IsNumber());
>-        if ((flags_ & kDoubleFlag) != 0)                return data_.n.d;   // exact type, no conversion.
>-        if ((flags_ & kIntFlag) != 0)                   return data_.n.i.i; // int -> double
>-        if ((flags_ & kUintFlag) != 0)                  return data_.n.u.u; // unsigned -> double
>-        if ((flags_ & kInt64Flag) != 0)                 return (double)data_.n.i64; // int64_t -> double (may lose precision)
>-        RAPIDJSON_ASSERT((flags_ & kUint64Flag) != 0);  return (double)data_.n.u64; // uint64_t -> double (may lose precision)
>-    }
>-
>-    GenericValue& SetInt(int i)             { this->~GenericValue(); new (this) GenericValue(i);    return *this; }
>-    GenericValue& SetUint(unsigned u)       { this->~GenericValue(); new (this) GenericValue(u);    return *this; }
>-    GenericValue& SetInt64(int64_t i64)     { this->~GenericValue(); new (this) GenericValue(i64);  return *this; }
>-    GenericValue& SetUint64(uint64_t u64)   { this->~GenericValue(); new (this) GenericValue(u64);  return *this; }
>-    GenericValue& SetDouble(double d)       { this->~GenericValue(); new (this) GenericValue(d);    return *this; }
>-
>-    //@}
>-
>-    //!@name String
>-    //@{
>-
>-    const Ch* GetString() const { RAPIDJSON_ASSERT(IsString()); return ((flags_ & kInlineStrFlag) ? data_.ss.str : data_.s.str); }
>-
>-    //! Get the length of string.
>-    /*! Since rapidjson permits "\\u0000" in the json string, strlen(v.GetString()) may not equal to v.GetStringLength().
>-    */
>-    SizeType GetStringLength() const { RAPIDJSON_ASSERT(IsString()); return ((flags_ & kInlineStrFlag) ? (data_.ss.GetLength()) : data_.s.length); }
>-
>-    //! Set this value as a string without copying source string.
>-    /*! This version has better performance with supplied length, and also support string containing null character.
>-        \param s source string pointer. 
>-        \param length The length of source string, excluding the trailing null terminator.
>-        \return The value itself for fluent API.
>-        \post IsString() == true && GetString() == s && GetStringLength() == length
>-        \see SetString(StringRefType)
>-    */
>-    GenericValue& SetString(const Ch* s, SizeType length) { return SetString(StringRef(s, length)); }
>-
>-    //! Set this value as a string without copying source string.
>-    /*! \param s source string reference
>-        \return The value itself for fluent API.
>-        \post IsString() == true && GetString() == s && GetStringLength() == s.length
>-    */
>-    GenericValue& SetString(StringRefType s) { this->~GenericValue(); SetStringRaw(s); return *this; }
>-
>-    //! Set this value as a string by copying from source string.
>-    /*! This version has better performance with supplied length, and also support string containing null character.
>-        \param s source string. 
>-        \param length The length of source string, excluding the trailing null terminator.
>-        \param allocator Allocator for allocating copied buffer. Commonly use GenericDocument::GetAllocator().
>-        \return The value itself for fluent API.
>-        \post IsString() == true && GetString() != s && strcmp(GetString(),s) == 0 && GetStringLength() == length
>-    */
>-    GenericValue& SetString(const Ch* s, SizeType length, Allocator& allocator) { this->~GenericValue(); SetStringRaw(StringRef(s, length), allocator); return *this; }
>-
>-    //! Set this value as a string by copying from source string.
>-    /*! \param s source string. 
>-        \param allocator Allocator for allocating copied buffer. Commonly use GenericDocument::GetAllocator().
>-        \return The value itself for fluent API.
>-        \post IsString() == true && GetString() != s && strcmp(GetString(),s) == 0 && GetStringLength() == length
>-    */
>-    GenericValue& SetString(const Ch* s, Allocator& allocator) { return SetString(s, internal::StrLen(s), allocator); }
>-
>-#if RAPIDJSON_HAS_STDSTRING
>-    //! Set this value as a string by copying from source string.
>-    /*! \param s source string.
>-        \param allocator Allocator for allocating copied buffer. Commonly use GenericDocument::GetAllocator().
>-        \return The value itself for fluent API.
>-        \post IsString() == true && GetString() != s.data() && strcmp(GetString(),s.data() == 0 && GetStringLength() == s.size()
>-        \note Requires the definition of the preprocessor symbol \ref RAPIDJSON_HAS_STDSTRING.
>-    */
>-    GenericValue& SetString(const std::basic_string<Ch>& s, Allocator& allocator) { return SetString(s.data(), s.size(), allocator); }
>-#endif
>-
>-    //@}
>-
>-    //! Generate events of this value to a Handler.
>-    /*! This function adopts the GoF visitor pattern.
>-        Typical usage is to output this JSON value as JSON text via Writer, which is a Handler.
>-        It can also be used to deep clone this value via GenericDocument, which is also a Handler.
>-        \tparam Handler type of handler.
>-        \param handler An object implementing concept Handler.
>-    */
>-    template <typename Handler>
>-    bool Accept(Handler& handler) const {
>-        switch(GetType()) {
>-        case kNullType:     return handler.Null();
>-        case kFalseType:    return handler.Bool(false);
>-        case kTrueType:     return handler.Bool(true);
>-
>-        case kObjectType:
>-            if (!handler.StartObject())
>-                return false;
>-            for (ConstMemberIterator m = MemberBegin(); m != MemberEnd(); ++m) {
>-                RAPIDJSON_ASSERT(m->name.IsString()); // User may change the type of name by MemberIterator.
>-                if (!handler.Key(m->name.GetString(), m->name.GetStringLength(), (m->name.flags_ & kCopyFlag) != 0))
>-                    return false;
>-                if (!m->value.Accept(handler))
>-                    return false;
>-            }
>-            return handler.EndObject(data_.o.size);
>-
>-        case kArrayType:
>-            if (!handler.StartArray())
>-                return false;
>-            for (GenericValue* v = data_.a.elements; v != data_.a.elements + data_.a.size; ++v)
>-                if (!v->Accept(handler))
>-                    return false;
>-            return handler.EndArray(data_.a.size);
>-    
>-        case kStringType:
>-            return handler.String(GetString(), GetStringLength(), (flags_ & kCopyFlag) != 0);
>-    
>-        case kNumberType:
>-            if (IsInt())            return handler.Int(data_.n.i.i);
>-            else if (IsUint())      return handler.Uint(data_.n.u.u);
>-            else if (IsInt64())     return handler.Int64(data_.n.i64);
>-            else if (IsUint64())    return handler.Uint64(data_.n.u64);
>-            else                    return handler.Double(data_.n.d);
>-    
>-        default:
>-            RAPIDJSON_ASSERT(false);
>-        }
>-        return false;
>-    }
>-
>-private:
>-    template <typename, typename> friend class GenericValue;
>-    template <typename, typename, typename> friend class GenericDocument;
>-
>-    enum {
>-        kBoolFlag = 0x100,
>-        kNumberFlag = 0x200,
>-        kIntFlag = 0x400,
>-        kUintFlag = 0x800,
>-        kInt64Flag = 0x1000,
>-        kUint64Flag = 0x2000,
>-        kDoubleFlag = 0x4000,
>-        kStringFlag = 0x100000,
>-        kCopyFlag = 0x200000,
>-        kInlineStrFlag = 0x400000,
>-
>-        // Initial flags of different types.
>-        kNullFlag = kNullType,
>-        kTrueFlag = kTrueType | kBoolFlag,
>-        kFalseFlag = kFalseType | kBoolFlag,
>-        kNumberIntFlag = kNumberType | kNumberFlag | kIntFlag | kInt64Flag,
>-        kNumberUintFlag = kNumberType | kNumberFlag | kUintFlag | kUint64Flag | kInt64Flag,
>-        kNumberInt64Flag = kNumberType | kNumberFlag | kInt64Flag,
>-        kNumberUint64Flag = kNumberType | kNumberFlag | kUint64Flag,
>-        kNumberDoubleFlag = kNumberType | kNumberFlag | kDoubleFlag,
>-        kNumberAnyFlag = kNumberType | kNumberFlag | kIntFlag | kInt64Flag | kUintFlag | kUint64Flag | kDoubleFlag,
>-        kConstStringFlag = kStringType | kStringFlag,
>-        kCopyStringFlag = kStringType | kStringFlag | kCopyFlag,
>-        kShortStringFlag = kStringType | kStringFlag | kCopyFlag | kInlineStrFlag,
>-        kObjectFlag = kObjectType,
>-        kArrayFlag = kArrayType,
>-
>-        kTypeMask = 0xFF    // bitwise-and with mask of 0xFF can be optimized by compiler
>-    };
>-
>-    static const SizeType kDefaultArrayCapacity = 16;
>-    static const SizeType kDefaultObjectCapacity = 16;
>-
>-    struct String {
>-        const Ch* str;
>-        SizeType length;
>-        unsigned hashcode;  //!< reserved
>-    };  // 12 bytes in 32-bit mode, 16 bytes in 64-bit mode
>-
>-    // implementation detail: ShortString can represent zero-terminated strings up to MaxSize chars
>-    // (excluding the terminating zero) and store a value to determine the length of the contained
>-    // string in the last character str[LenPos] by storing "MaxSize - length" there. If the string
>-    // to store has the maximal length of MaxSize then str[LenPos] will be 0 and therefore act as
>-    // the string terminator as well. For getting the string length back from that value just use
>-    // "MaxSize - str[LenPos]".
>-    // This allows to store 11-chars strings in 32-bit mode and 15-chars strings in 64-bit mode
>-    // inline (for `UTF8`-encoded strings).
>-    struct ShortString {
>-        enum { MaxChars = sizeof(String) / sizeof(Ch), MaxSize = MaxChars - 1, LenPos = MaxSize };
>-        Ch str[MaxChars];
>-
>-        inline static bool Usable(SizeType len) { return            (MaxSize >= len); }
>-        inline void     SetLength(SizeType len) { str[LenPos] = (Ch)(MaxSize -  len); }
>-        inline SizeType GetLength() const       { return  (SizeType)(MaxSize -  str[LenPos]); }
>-    };  // at most as many bytes as "String" above => 12 bytes in 32-bit mode, 16 bytes in 64-bit mode
>-
>-    // By using proper binary layout, retrieval of different integer types do not need conversions.
>-    union Number {
>-#if RAPIDJSON_ENDIAN == RAPIDJSON_LITTLEENDIAN
>-        struct I {
>-            int i;
>-            char padding[4];
>-        }i;
>-        struct U {
>-            unsigned u;
>-            char padding2[4];
>-        }u;
>-#else
>-        struct I {
>-            char padding[4];
>-            int i;
>-        }i;
>-        struct U {
>-            char padding2[4];
>-            unsigned u;
>-        }u;
>-#endif
>-        int64_t i64;
>-        uint64_t u64;
>-        double d;
>-    };  // 8 bytes
>-
>-    struct Object {
>-        Member* members;
>-        SizeType size;
>-        SizeType capacity;
>-    };  // 12 bytes in 32-bit mode, 16 bytes in 64-bit mode
>-
>-    struct Array {
>-        GenericValue* elements;
>-        SizeType size;
>-        SizeType capacity;
>-    };  // 12 bytes in 32-bit mode, 16 bytes in 64-bit mode
>-
>-    union Data {
>-        String s;
>-        ShortString ss;
>-        Number n;
>-        Object o;
>-        Array a;
>-    };  // 12 bytes in 32-bit mode, 16 bytes in 64-bit mode
>-
>-    // Initialize this value as array with initial data, without calling destructor.
>-    void SetArrayRaw(GenericValue* values, SizeType count, Allocator& allocator) {
>-        flags_ = kArrayFlag;
>-        data_.a.elements = (GenericValue*)allocator.Malloc(count * sizeof(GenericValue));
>-        std::memcpy(data_.a.elements, values, count * sizeof(GenericValue));
>-        data_.a.size = data_.a.capacity = count;
>-    }
>-
>-    //! Initialize this value as object with initial data, without calling destructor.
>-    void SetObjectRaw(Member* members, SizeType count, Allocator& allocator) {
>-        flags_ = kObjectFlag;
>-        data_.o.members = (Member*)allocator.Malloc(count * sizeof(Member));
>-        std::memcpy(data_.o.members, members, count * sizeof(Member));
>-        data_.o.size = data_.o.capacity = count;
>-    }
>-
>-    //! Initialize this value as constant string, without calling destructor.
>-    void SetStringRaw(StringRefType s) RAPIDJSON_NOEXCEPT {
>-        flags_ = kConstStringFlag;
>-        data_.s.str = s;
>-        data_.s.length = s.length;
>-    }
>-
>-    //! Initialize this value as copy string with initial data, without calling destructor.
>-    void SetStringRaw(StringRefType s, Allocator& allocator) {
>-        Ch* str = NULL;
>-        if(ShortString::Usable(s.length)) {
>-            flags_ = kShortStringFlag;
>-            data_.ss.SetLength(s.length);
>-            str = data_.ss.str;
>-        } else {
>-            flags_ = kCopyStringFlag;
>-            data_.s.length = s.length;
>-            str = (Ch *)allocator.Malloc((s.length + 1) * sizeof(Ch));
>-            data_.s.str = str;
>-        }
>-        std::memcpy(str, s, s.length * sizeof(Ch));
>-        str[s.length] = '\0';
>-    }
>-
>-    //! Assignment without calling destructor
>-    void RawAssign(GenericValue& rhs) RAPIDJSON_NOEXCEPT {
>-        data_ = rhs.data_;
>-        flags_ = rhs.flags_;
>-        rhs.flags_ = kNullFlag;
>-    }
>-
>-    template <typename SourceAllocator>
>-    bool StringEqual(const GenericValue<Encoding, SourceAllocator>& rhs) const {
>-        RAPIDJSON_ASSERT(IsString());
>-        RAPIDJSON_ASSERT(rhs.IsString());
>-
>-        const SizeType len1 = GetStringLength();
>-        const SizeType len2 = rhs.GetStringLength();
>-        if(len1 != len2) { return false; }
>-
>-        const Ch* const str1 = GetString();
>-        const Ch* const str2 = rhs.GetString();
>-        if(str1 == str2) { return true; } // fast path for constant string
>-
>-        return (std::memcmp(str1, str2, sizeof(Ch) * len1) == 0);
>-    }
>-
>-    Data data_;
>-    unsigned flags_;
>-};
>-
>-//! GenericValue with UTF8 encoding
>-typedef GenericValue<UTF8<> > Value;
>-
>-///////////////////////////////////////////////////////////////////////////////
>-// GenericDocument 
>-
>-//! A document for parsing JSON text as DOM.
>-/*!
>-    \note implements Handler concept
>-    \tparam Encoding Encoding for both parsing and string storage.
>-    \tparam Allocator Allocator for allocating memory for the DOM
>-    \tparam StackAllocator Allocator for allocating memory for stack during parsing.
>-    \warning Although GenericDocument inherits from GenericValue, the API does \b not provide any virtual functions, especially no virtual destructor.  To avoid memory leaks, do not \c delete a GenericDocument object via a pointer to a GenericValue.
>-*/
>-template <typename Encoding, typename Allocator = MemoryPoolAllocator<>, typename StackAllocator = CrtAllocator>
>-class GenericDocument : public GenericValue<Encoding, Allocator> {
>-public:
>-    typedef typename Encoding::Ch Ch;                       //!< Character type derived from Encoding.
>-    typedef GenericValue<Encoding, Allocator> ValueType;    //!< Value type of the document.
>-    typedef Allocator AllocatorType;                        //!< Allocator type from template parameter.
>-
>-    //! Constructor
>-    /*! \param allocator        Optional allocator for allocating memory.
>-        \param stackCapacity    Optional initial capacity of stack in bytes.
>-        \param stackAllocator   Optional allocator for allocating memory for stack.
>-    */
>-    GenericDocument(Allocator* allocator = 0, size_t stackCapacity = kDefaultStackCapacity, StackAllocator* stackAllocator = 0) : 
>-        allocator_(allocator), ownAllocator_(0), stack_(stackAllocator, stackCapacity), parseResult_()
>-    {
>-        if (!allocator_)
>-            ownAllocator_ = allocator_ = RAPIDJSON_NEW(Allocator());
>-    }
>-
>-#if RAPIDJSON_HAS_CXX11_RVALUE_REFS
>-    //! Move constructor in C++11
>-    GenericDocument(GenericDocument&& rhs) RAPIDJSON_NOEXCEPT
>-        : ValueType(std::move(rhs)),
>-          allocator_(rhs.allocator_),
>-          ownAllocator_(rhs.ownAllocator_),
>-          stack_(std::move(rhs.stack_)),
>-          parseResult_(rhs.parseResult_)
>-    {
>-        rhs.allocator_ = 0;
>-        rhs.ownAllocator_ = 0;
>-        rhs.parseResult_ = ParseResult();
>-    }
>-#endif
>-
>-    ~GenericDocument() {
>-        Destroy();
>-    }
>-
>-#if RAPIDJSON_HAS_CXX11_RVALUE_REFS
>-    //! Move assignment in C++11
>-    GenericDocument& operator=(GenericDocument&& rhs) RAPIDJSON_NOEXCEPT
>-    {
>-        // The cast to ValueType is necessary here, because otherwise it would
>-        // attempt to call GenericValue's templated assignment operator.
>-        ValueType::operator=(std::forward<ValueType>(rhs));
>-
>-        // Calling the destructor here would prematurely call stack_'s destructor
>-        Destroy();
>-
>-        allocator_ = rhs.allocator_;
>-        ownAllocator_ = rhs.ownAllocator_;
>-        stack_ = std::move(rhs.stack_);
>-        parseResult_ = rhs.parseResult_;
>-
>-        rhs.allocator_ = 0;
>-        rhs.ownAllocator_ = 0;
>-        rhs.parseResult_ = ParseResult();
>-
>-        return *this;
>-    }
>-#endif
>-
>-    //!@name Parse from stream
>-    //!@{
>-
>-    //! Parse JSON text from an input stream (with Encoding conversion)
>-    /*! \tparam parseFlags Combination of \ref ParseFlag.
>-        \tparam SourceEncoding Encoding of input stream
>-        \tparam InputStream Type of input stream, implementing Stream concept
>-        \param is Input stream to be parsed.
>-        \return The document itself for fluent API.
>-    */
>-    template <unsigned parseFlags, typename SourceEncoding, typename InputStream>
>-    GenericDocument& ParseStream(InputStream& is) {
>-        ValueType::SetNull(); // Remove existing root if exist
>-        GenericReader<SourceEncoding, Encoding, Allocator> reader(&GetAllocator());
>-        ClearStackOnExit scope(*this);
>-        parseResult_ = reader.template Parse<parseFlags>(is, *this);
>-        if (parseResult_) {
>-            RAPIDJSON_ASSERT(stack_.GetSize() == sizeof(ValueType)); // Got one and only one root object
>-            this->RawAssign(*stack_.template Pop<ValueType>(1));    // Add this-> to prevent issue 13.
>-        }
>-        return *this;
>-    }
>-
>-    //! Parse JSON text from an input stream
>-    /*! \tparam parseFlags Combination of \ref ParseFlag.
>-        \tparam InputStream Type of input stream, implementing Stream concept
>-        \param is Input stream to be parsed.
>-        \return The document itself for fluent API.
>-    */
>-    template <unsigned parseFlags, typename InputStream>
>-    GenericDocument& ParseStream(InputStream& is) {
>-        return ParseStream<parseFlags,Encoding,InputStream>(is);
>-    }
>-
>-    //! Parse JSON text from an input stream (with \ref kParseDefaultFlags)
>-    /*! \tparam InputStream Type of input stream, implementing Stream concept
>-        \param is Input stream to be parsed.
>-        \return The document itself for fluent API.
>-    */
>-    template <typename InputStream>
>-    GenericDocument& ParseStream(InputStream& is) {
>-        return ParseStream<kParseDefaultFlags, Encoding, InputStream>(is);
>-    }
>-    //!@}
>-
>-    //!@name Parse in-place from mutable string
>-    //!@{
>-
>-    //! Parse JSON text from a mutable string (with Encoding conversion)
>-    /*! \tparam parseFlags Combination of \ref ParseFlag.
>-        \tparam SourceEncoding Transcoding from input Encoding
>-        \param str Mutable zero-terminated string to be parsed.
>-        \return The document itself for fluent API.
>-    */
>-    template <unsigned parseFlags, typename SourceEncoding>
>-    GenericDocument& ParseInsitu(Ch* str) {
>-        GenericInsituStringStream<Encoding> s(str);
>-        return ParseStream<parseFlags | kParseInsituFlag, SourceEncoding>(s);
>-    }
>-
>-    //! Parse JSON text from a mutable string
>-    /*! \tparam parseFlags Combination of \ref ParseFlag.
>-        \param str Mutable zero-terminated string to be parsed.
>-        \return The document itself for fluent API.
>-    */
>-    template <unsigned parseFlags>
>-    GenericDocument& ParseInsitu(Ch* str) {
>-        return ParseInsitu<parseFlags, Encoding>(str);
>-    }
>-
>-    //! Parse JSON text from a mutable string (with \ref kParseDefaultFlags)
>-    /*! \param str Mutable zero-terminated string to be parsed.
>-        \return The document itself for fluent API.
>-    */
>-    GenericDocument& ParseInsitu(Ch* str) {
>-        return ParseInsitu<kParseDefaultFlags, Encoding>(str);
>-    }
>-    //!@}
>-
>-    //!@name Parse from read-only string
>-    //!@{
>-
>-    //! Parse JSON text from a read-only string (with Encoding conversion)
>-    /*! \tparam parseFlags Combination of \ref ParseFlag (must not contain \ref kParseInsituFlag).
>-        \tparam SourceEncoding Transcoding from input Encoding
>-        \param str Read-only zero-terminated string to be parsed.
>-    */
>-    template <unsigned parseFlags, typename SourceEncoding>
>-    GenericDocument& Parse(const Ch* str) {
>-        RAPIDJSON_ASSERT(!(parseFlags & kParseInsituFlag));
>-        GenericStringStream<SourceEncoding> s(str);
>-        return ParseStream<parseFlags, SourceEncoding>(s);
>-    }
>-
>-    //! Parse JSON text from a read-only string
>-    /*! \tparam parseFlags Combination of \ref ParseFlag (must not contain \ref kParseInsituFlag).
>-        \param str Read-only zero-terminated string to be parsed.
>-    */
>-    template <unsigned parseFlags>
>-    GenericDocument& Parse(const Ch* str) {
>-        return Parse<parseFlags, Encoding>(str);
>-    }
>-
>-    //! Parse JSON text from a read-only string (with \ref kParseDefaultFlags)
>-    /*! \param str Read-only zero-terminated string to be parsed.
>-    */
>-    GenericDocument& Parse(const Ch* str) {
>-        return Parse<kParseDefaultFlags>(str);
>-    }
>-    //!@}
>-
>-    //!@name Handling parse errors
>-    //!@{
>-
>-    //! Whether a parse error has occured in the last parsing.
>-    bool HasParseError() const { return parseResult_.IsError(); }
>-
>-    //! Get the \ref ParseErrorCode of last parsing.
>-    ParseErrorCode GetParseError() const { return parseResult_.Code(); }
>-
>-    //! Get the position of last parsing error in input, 0 otherwise.
>-    size_t GetErrorOffset() const { return parseResult_.Offset(); }
>-
>-    //!@}
>-
>-    //! Get the allocator of this document.
>-    Allocator& GetAllocator() { return *allocator_; }
>-
>-    //! Get the capacity of stack in bytes.
>-    size_t GetStackCapacity() const { return stack_.GetCapacity(); }
>-
>-private:
>-    // clear stack on any exit from ParseStream, e.g. due to exception
>-    struct ClearStackOnExit {
>-        explicit ClearStackOnExit(GenericDocument& d) : d_(d) {}
>-        ~ClearStackOnExit() { d_.ClearStack(); }
>-    private:
>-        ClearStackOnExit(const ClearStackOnExit&);
>-        ClearStackOnExit& operator=(const ClearStackOnExit&);
>-        GenericDocument& d_;
>-    };
>-
>-    // callers of the following private Handler functions
>-    template <typename,typename,typename> friend class GenericReader; // for parsing
>-    template <typename, typename> friend class GenericValue; // for deep copying
>-
>-    // Implementation of Handler
>-    bool Null() { new (stack_.template Push<ValueType>()) ValueType(); return true; }
>-    bool Bool(bool b) { new (stack_.template Push<ValueType>()) ValueType(b); return true; }
>-    bool Int(int i) { new (stack_.template Push<ValueType>()) ValueType(i); return true; }
>-    bool Uint(unsigned i) { new (stack_.template Push<ValueType>()) ValueType(i); return true; }
>-    bool Int64(int64_t i) { new (stack_.template Push<ValueType>()) ValueType(i); return true; }
>-    bool Uint64(uint64_t i) { new (stack_.template Push<ValueType>()) ValueType(i); return true; }
>-    bool Double(double d) { new (stack_.template Push<ValueType>()) ValueType(d); return true; }
>-
>-    bool String(const Ch* str, SizeType length, bool copy) { 
>-        if (copy) 
>-            new (stack_.template Push<ValueType>()) ValueType(str, length, GetAllocator());
>-        else
>-            new (stack_.template Push<ValueType>()) ValueType(str, length);
>-        return true;
>-    }
>-
>-    bool StartObject() { new (stack_.template Push<ValueType>()) ValueType(kObjectType); return true; }
>-    
>-    bool Key(const Ch* str, SizeType length, bool copy) { return String(str, length, copy); }
>-
>-    bool EndObject(SizeType memberCount) {
>-        typename ValueType::Member* members = stack_.template Pop<typename ValueType::Member>(memberCount);
>-        stack_.template Top<ValueType>()->SetObjectRaw(members, (SizeType)memberCount, GetAllocator());
>-        return true;
>-    }
>-
>-    bool StartArray() { new (stack_.template Push<ValueType>()) ValueType(kArrayType); return true; }
>-    
>-    bool EndArray(SizeType elementCount) {
>-        ValueType* elements = stack_.template Pop<ValueType>(elementCount);
>-        stack_.template Top<ValueType>()->SetArrayRaw(elements, elementCount, GetAllocator());
>-        return true;
>-    }
>-
>-private:
>-    //! Prohibit copying
>-    GenericDocument(const GenericDocument&);
>-    //! Prohibit assignment
>-    GenericDocument& operator=(const GenericDocument&);
>-
>-    void ClearStack() {
>-        if (Allocator::kNeedFree)
>-            while (stack_.GetSize() > 0)    // Here assumes all elements in stack array are GenericValue (Member is actually 2 GenericValue objects)
>-                (stack_.template Pop<ValueType>(1))->~ValueType();
>-        else
>-            stack_.Clear();
>-        stack_.ShrinkToFit();
>-    }
>-
>-    void Destroy() {
>-        RAPIDJSON_DELETE(ownAllocator_);
>-    }
>-
>-    static const size_t kDefaultStackCapacity = 1024;
>-    Allocator* allocator_;
>-    Allocator* ownAllocator_;
>-    internal::Stack<StackAllocator> stack_;
>-    ParseResult parseResult_;
>-};
>-
>-//! GenericDocument with UTF8 encoding
>-typedef GenericDocument<UTF8<> > Document;
>-
>-// defined here due to the dependency on GenericDocument
>-template <typename Encoding, typename Allocator>
>-template <typename SourceAllocator>
>-inline
>-GenericValue<Encoding,Allocator>::GenericValue(const GenericValue<Encoding,SourceAllocator>& rhs, Allocator& allocator)
>-{
>-    switch (rhs.GetType()) {
>-    case kObjectType:
>-    case kArrayType: { // perform deep copy via SAX Handler
>-            GenericDocument<Encoding,Allocator> d(&allocator);
>-            rhs.Accept(d);
>-            RawAssign(*d.stack_.template Pop<GenericValue>(1));
>-        }
>-        break;
>-    case kStringType:
>-        if (rhs.flags_ == kConstStringFlag) {
>-            flags_ = rhs.flags_;
>-            data_  = *reinterpret_cast<const Data*>(&rhs.data_);
>-        } else {
>-            SetStringRaw(StringRef(rhs.GetString(), rhs.GetStringLength()), allocator);
>-        }
>-        break;
>-    default: // kNumberType, kTrueType, kFalseType, kNullType
>-        flags_ = rhs.flags_;
>-        data_  = *reinterpret_cast<const Data*>(&rhs.data_);
>-    }
>-}
>-
>-RAPIDJSON_NAMESPACE_END
>-
>-#if defined(_MSC_VER) || defined(__GNUC__)
>-RAPIDJSON_DIAG_POP
>-#endif
>-
>-#endif // RAPIDJSON_DOCUMENT_H_
>diff --git a/Source/ThirdParty/ANGLE/src/tests/third_party/rapidjson/include/rapidjson/encodedstream.h b/Source/ThirdParty/ANGLE/src/tests/third_party/rapidjson/include/rapidjson/encodedstream.h
>deleted file mode 100644
>index ee8caa05fe8..00000000000
>--- a/Source/ThirdParty/ANGLE/src/tests/third_party/rapidjson/include/rapidjson/encodedstream.h
>+++ /dev/null
>@@ -1,290 +0,0 @@
>-// Copyright (C) 2011 Milo Yip
>-//
>-// Permission is hereby granted, free of charge, to any person obtaining a copy
>-// of this software and associated documentation files (the "Software"), to deal
>-// in the Software without restriction, including without limitation the rights
>-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
>-// copies of the Software, and to permit persons to whom the Software is
>-// furnished to do so, subject to the following conditions:
>-//
>-// The above copyright notice and this permission notice shall be included in
>-// all copies or substantial portions of the Software.
>-//
>-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
>-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
>-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
>-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
>-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
>-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
>-// THE SOFTWARE.
>-
>-#ifndef RAPIDJSON_ENCODEDSTREAM_H_
>-#define RAPIDJSON_ENCODEDSTREAM_H_
>-
>-#include "rapidjson.h"
>-
>-#ifdef __GNUC__
>-RAPIDJSON_DIAG_PUSH
>-RAPIDJSON_DIAG_OFF(effc++)
>-#endif
>-
>-RAPIDJSON_NAMESPACE_BEGIN
>-
>-//! Input byte stream wrapper with a statically bound encoding.
>-/*!
>-    \tparam Encoding The interpretation of encoding of the stream. Either UTF8, UTF16LE, UTF16BE, UTF32LE, UTF32BE.
>-    \tparam InputByteStream Type of input byte stream. For example, FileReadStream.
>-*/
>-template <typename Encoding, typename InputByteStream>
>-class EncodedInputStream {
>-    RAPIDJSON_STATIC_ASSERT(sizeof(typename InputByteStream::Ch) == 1);
>-public:
>-    typedef typename Encoding::Ch Ch;
>-
>-    EncodedInputStream(InputByteStream& is) : is_(is) { 
>-        current_ = Encoding::TakeBOM(is_);
>-    }
>-
>-    Ch Peek() const { return current_; }
>-    Ch Take() { Ch c = current_; current_ = Encoding::Take(is_); return c; }
>-    size_t Tell() const { return is_.Tell(); }
>-
>-    // Not implemented
>-    void Put(Ch) { RAPIDJSON_ASSERT(false); }
>-    void Flush() { RAPIDJSON_ASSERT(false); } 
>-    Ch* PutBegin() { RAPIDJSON_ASSERT(false); return 0; }
>-    size_t PutEnd(Ch*) { RAPIDJSON_ASSERT(false); return 0; }
>-
>-private:
>-    EncodedInputStream(const EncodedInputStream&);
>-    EncodedInputStream& operator=(const EncodedInputStream&);
>-
>-    InputByteStream& is_;
>-    Ch current_;
>-};
>-
>-//! Output byte stream wrapper with statically bound encoding.
>-/*!
>-    \tparam Encoding The interpretation of encoding of the stream. Either UTF8, UTF16LE, UTF16BE, UTF32LE, UTF32BE.
>-    \tparam InputByteStream Type of input byte stream. For example, FileWriteStream.
>-*/
>-template <typename Encoding, typename OutputByteStream>
>-class EncodedOutputStream {
>-    RAPIDJSON_STATIC_ASSERT(sizeof(typename OutputByteStream::Ch) == 1);
>-public:
>-    typedef typename Encoding::Ch Ch;
>-
>-    EncodedOutputStream(OutputByteStream& os, bool putBOM = true) : os_(os) { 
>-        if (putBOM)
>-            Encoding::PutBOM(os_);
>-    }
>-
>-    void Put(Ch c) { Encoding::Put(os_, c);  }
>-    void Flush() { os_.Flush(); }
>-
>-    // Not implemented
>-    Ch Peek() const { RAPIDJSON_ASSERT(false); }
>-    Ch Take() { RAPIDJSON_ASSERT(false);  }
>-    size_t Tell() const { RAPIDJSON_ASSERT(false);  return 0; }
>-    Ch* PutBegin() { RAPIDJSON_ASSERT(false); return 0; }
>-    size_t PutEnd(Ch*) { RAPIDJSON_ASSERT(false); return 0; }
>-
>-private:
>-    EncodedOutputStream(const EncodedOutputStream&);
>-    EncodedOutputStream& operator=(const EncodedOutputStream&);
>-
>-    OutputByteStream& os_;
>-};
>-
>-#define RAPIDJSON_ENCODINGS_FUNC(x) UTF8<Ch>::x, UTF16LE<Ch>::x, UTF16BE<Ch>::x, UTF32LE<Ch>::x, UTF32BE<Ch>::x
>-
>-//! Input stream wrapper with dynamically bound encoding and automatic encoding detection.
>-/*!
>-    \tparam CharType Type of character for reading.
>-    \tparam InputByteStream type of input byte stream to be wrapped.
>-*/
>-template <typename CharType, typename InputByteStream>
>-class AutoUTFInputStream {
>-    RAPIDJSON_STATIC_ASSERT(sizeof(typename InputByteStream::Ch) == 1);
>-public:
>-    typedef CharType Ch;
>-
>-    //! Constructor.
>-    /*!
>-        \param is input stream to be wrapped.
>-        \param type UTF encoding type if it is not detected from the stream.
>-    */
>-    AutoUTFInputStream(InputByteStream& is, UTFType type = kUTF8) : is_(&is), type_(type), hasBOM_(false) {
>-        DetectType();
>-        static const TakeFunc f[] = { RAPIDJSON_ENCODINGS_FUNC(Take) };
>-        takeFunc_ = f[type_];
>-        current_ = takeFunc_(*is_);
>-    }
>-
>-    UTFType GetType() const { return type_; }
>-    bool HasBOM() const { return hasBOM_; }
>-
>-    Ch Peek() const { return current_; }
>-    Ch Take() { Ch c = current_; current_ = takeFunc_(*is_); return c; }
>-    size_t Tell() const { return is_->Tell(); }
>-
>-    // Not implemented
>-    void Put(Ch) { RAPIDJSON_ASSERT(false); }
>-    void Flush() { RAPIDJSON_ASSERT(false); } 
>-    Ch* PutBegin() { RAPIDJSON_ASSERT(false); return 0; }
>-    size_t PutEnd(Ch*) { RAPIDJSON_ASSERT(false); return 0; }
>-
>-private:
>-    AutoUTFInputStream(const AutoUTFInputStream&);
>-    AutoUTFInputStream& operator=(const AutoUTFInputStream&);
>-
>-    // Detect encoding type with BOM or RFC 4627
>-    void DetectType() {
>-        // BOM (Byte Order Mark):
>-        // 00 00 FE FF  UTF-32BE
>-        // FF FE 00 00  UTF-32LE
>-        // FE FF        UTF-16BE
>-        // FF FE        UTF-16LE
>-        // EF BB BF     UTF-8
>-
>-        const unsigned char* c = (const unsigned char *)is_->Peek4();
>-        if (!c)
>-            return;
>-
>-        unsigned bom = c[0] | (c[1] << 8) | (c[2] << 16) | (c[3] << 24);
>-        hasBOM_ = false;
>-        if (bom == 0xFFFE0000)                  { type_ = kUTF32BE; hasBOM_ = true; is_->Take(); is_->Take(); is_->Take(); is_->Take(); }
>-        else if (bom == 0x0000FEFF)             { type_ = kUTF32LE; hasBOM_ = true; is_->Take(); is_->Take(); is_->Take(); is_->Take(); }
>-        else if ((bom & 0xFFFF) == 0xFFFE)      { type_ = kUTF16BE; hasBOM_ = true; is_->Take(); is_->Take();                           }
>-        else if ((bom & 0xFFFF) == 0xFEFF)      { type_ = kUTF16LE; hasBOM_ = true; is_->Take(); is_->Take();                           }
>-        else if ((bom & 0xFFFFFF) == 0xBFBBEF)  { type_ = kUTF8;    hasBOM_ = true; is_->Take(); is_->Take(); is_->Take();              }
>-
>-        // RFC 4627: Section 3
>-        // "Since the first two characters of a JSON text will always be ASCII
>-        // characters [RFC0020], it is possible to determine whether an octet
>-        // stream is UTF-8, UTF-16 (BE or LE), or UTF-32 (BE or LE) by looking
>-        // at the pattern of nulls in the first four octets."
>-        // 00 00 00 xx  UTF-32BE
>-        // 00 xx 00 xx  UTF-16BE
>-        // xx 00 00 00  UTF-32LE
>-        // xx 00 xx 00  UTF-16LE
>-        // xx xx xx xx  UTF-8
>-
>-        if (!hasBOM_) {
>-            unsigned pattern = (c[0] ? 1 : 0) | (c[1] ? 2 : 0) | (c[2] ? 4 : 0) | (c[3] ? 8 : 0);
>-            switch (pattern) {
>-            case 0x08: type_ = kUTF32BE; break;
>-            case 0x0A: type_ = kUTF16BE; break;
>-            case 0x01: type_ = kUTF32LE; break;
>-            case 0x05: type_ = kUTF16LE; break;
>-            case 0x0F: type_ = kUTF8;    break;
>-            default: break; // Use type defined by user.
>-            }
>-        }
>-
>-        // Runtime check whether the size of character type is sufficient. It only perform checks with assertion.
>-        switch (type_) {
>-        case kUTF8:
>-            // Do nothing
>-            break;
>-        case kUTF16LE:
>-        case kUTF16BE:
>-            RAPIDJSON_ASSERT(sizeof(Ch) >= 2);
>-            break;
>-        case kUTF32LE:
>-        case kUTF32BE:
>-            RAPIDJSON_ASSERT(sizeof(Ch) >= 4);
>-            break;
>-        default:
>-            RAPIDJSON_ASSERT(false);    // Invalid type
>-        }
>-    }
>-
>-    typedef Ch (*TakeFunc)(InputByteStream& is);
>-    InputByteStream* is_;
>-    UTFType type_;
>-    Ch current_;
>-    TakeFunc takeFunc_;
>-    bool hasBOM_;
>-};
>-
>-//! Output stream wrapper with dynamically bound encoding and automatic encoding detection.
>-/*!
>-    \tparam CharType Type of character for writing.
>-    \tparam InputByteStream type of output byte stream to be wrapped.
>-*/
>-template <typename CharType, typename OutputByteStream>
>-class AutoUTFOutputStream {
>-    RAPIDJSON_STATIC_ASSERT(sizeof(typename OutputByteStream::Ch) == 1);
>-public:
>-    typedef CharType Ch;
>-
>-    //! Constructor.
>-    /*!
>-        \param os output stream to be wrapped.
>-        \param type UTF encoding type.
>-        \param putBOM Whether to write BOM at the beginning of the stream.
>-    */
>-    AutoUTFOutputStream(OutputByteStream& os, UTFType type, bool putBOM) : os_(&os), type_(type) {
>-        // RUntime check whether the size of character type is sufficient. It only perform checks with assertion.
>-        switch (type_) {
>-        case kUTF16LE:
>-        case kUTF16BE:
>-            RAPIDJSON_ASSERT(sizeof(Ch) >= 2);
>-            break;
>-        case kUTF32LE:
>-        case kUTF32BE:
>-            RAPIDJSON_ASSERT(sizeof(Ch) >= 4);
>-            break;
>-        case kUTF8:
>-            // Do nothing
>-            break;
>-        default:
>-            RAPIDJSON_ASSERT(false);    // Invalid UTFType
>-        }
>-
>-        static const PutFunc f[] = { RAPIDJSON_ENCODINGS_FUNC(Put) };
>-        putFunc_ = f[type_];
>-
>-        if (putBOM)
>-            PutBOM();
>-    }
>-
>-    UTFType GetType() const { return type_; }
>-
>-    void Put(Ch c) { putFunc_(*os_, c); }
>-    void Flush() { os_->Flush(); } 
>-
>-    // Not implemented
>-    Ch Peek() const { RAPIDJSON_ASSERT(false); }
>-    Ch Take() { RAPIDJSON_ASSERT(false); }
>-    size_t Tell() const { RAPIDJSON_ASSERT(false); return 0; }
>-    Ch* PutBegin() { RAPIDJSON_ASSERT(false); return 0; }
>-    size_t PutEnd(Ch*) { RAPIDJSON_ASSERT(false); return 0; }
>-
>-private:
>-    AutoUTFOutputStream(const AutoUTFOutputStream&);
>-    AutoUTFOutputStream& operator=(const AutoUTFOutputStream&);
>-
>-    void PutBOM() { 
>-        typedef void (*PutBOMFunc)(OutputByteStream&);
>-        static const PutBOMFunc f[] = { RAPIDJSON_ENCODINGS_FUNC(PutBOM) };
>-        f[type_](*os_);
>-    }
>-
>-    typedef void (*PutFunc)(OutputByteStream&, Ch);
>-
>-    OutputByteStream* os_;
>-    UTFType type_;
>-    PutFunc putFunc_;
>-};
>-
>-#undef RAPIDJSON_ENCODINGS_FUNC
>-
>-RAPIDJSON_NAMESPACE_END
>-
>-#ifdef __GNUC__
>-RAPIDJSON_DIAG_POP
>-#endif
>-
>-#endif // RAPIDJSON_FILESTREAM_H_
>diff --git a/Source/ThirdParty/ANGLE/src/tests/third_party/rapidjson/include/rapidjson/encodings.h b/Source/ThirdParty/ANGLE/src/tests/third_party/rapidjson/include/rapidjson/encodings.h
>deleted file mode 100644
>index 71595f70c83..00000000000
>--- a/Source/ThirdParty/ANGLE/src/tests/third_party/rapidjson/include/rapidjson/encodings.h
>+++ /dev/null
>@@ -1,630 +0,0 @@
>-// Copyright (C) 2011 Milo Yip
>-//
>-// Permission is hereby granted, free of charge, to any person obtaining a copy
>-// of this software and associated documentation files (the "Software"), to deal
>-// in the Software without restriction, including without limitation the rights
>-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
>-// copies of the Software, and to permit persons to whom the Software is
>-// furnished to do so, subject to the following conditions:
>-//
>-// The above copyright notice and this permission notice shall be included in
>-// all copies or substantial portions of the Software.
>-//
>-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
>-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
>-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
>-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
>-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
>-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
>-// THE SOFTWARE.
>-
>-#ifndef RAPIDJSON_ENCODINGS_H_
>-#define RAPIDJSON_ENCODINGS_H_
>-
>-#include "rapidjson.h"
>-
>-#ifdef _MSC_VER
>-RAPIDJSON_DIAG_PUSH
>-RAPIDJSON_DIAG_OFF(4244) // conversion from 'type1' to 'type2', possible loss of data
>-RAPIDJSON_DIAG_OFF(4702)  // unreachable code
>-#elif defined(__GNUC__)
>-RAPIDJSON_DIAG_PUSH
>-RAPIDJSON_DIAG_OFF(effc++)
>-#endif
>-
>-RAPIDJSON_NAMESPACE_BEGIN
>-
>-///////////////////////////////////////////////////////////////////////////////
>-// Encoding
>-
>-/*! \class rapidjson::Encoding
>-    \brief Concept for encoding of Unicode characters.
>-
>-\code
>-concept Encoding {
>-    typename Ch;    //! Type of character. A "character" is actually a code unit in unicode's definition.
>-
>-    enum { supportUnicode = 1 }; // or 0 if not supporting unicode
>-
>-    //! \brief Encode a Unicode codepoint to an output stream.
>-    //! \param os Output stream.
>-    //! \param codepoint An unicode codepoint, ranging from 0x0 to 0x10FFFF inclusively.
>-    template<typename OutputStream>
>-    static void Encode(OutputStream& os, unsigned codepoint);
>-
>-    //! \brief Decode a Unicode codepoint from an input stream.
>-    //! \param is Input stream.
>-    //! \param codepoint Output of the unicode codepoint.
>-    //! \return true if a valid codepoint can be decoded from the stream.
>-    template <typename InputStream>
>-    static bool Decode(InputStream& is, unsigned* codepoint);
>-
>-    //! \brief Validate one Unicode codepoint from an encoded stream.
>-    //! \param is Input stream to obtain codepoint.
>-    //! \param os Output for copying one codepoint.
>-    //! \return true if it is valid.
>-    //! \note This function just validating and copying the codepoint without actually decode it.
>-    template <typename InputStream, typename OutputStream>
>-    static bool Validate(InputStream& is, OutputStream& os);
>-
>-    // The following functions are deal with byte streams.
>-
>-    //! Take a character from input byte stream, skip BOM if exist.
>-    template <typename InputByteStream>
>-    static CharType TakeBOM(InputByteStream& is);
>-
>-    //! Take a character from input byte stream.
>-    template <typename InputByteStream>
>-    static Ch Take(InputByteStream& is);
>-
>-    //! Put BOM to output byte stream.
>-    template <typename OutputByteStream>
>-    static void PutBOM(OutputByteStream& os);
>-
>-    //! Put a character to output byte stream.
>-    template <typename OutputByteStream>
>-    static void Put(OutputByteStream& os, Ch c);
>-};
>-\endcode
>-*/
>-
>-///////////////////////////////////////////////////////////////////////////////
>-// UTF8
>-
>-//! UTF-8 encoding.
>-/*! http://en.wikipedia.org/wiki/UTF-8
>-    http://tools.ietf.org/html/rfc3629
>-    \tparam CharType Code unit for storing 8-bit UTF-8 data. Default is char.
>-    \note implements Encoding concept
>-*/
>-template<typename CharType = char>
>-struct UTF8 {
>-    typedef CharType Ch;
>-
>-    enum { supportUnicode = 1 };
>-
>-    template<typename OutputStream>
>-    static void Encode(OutputStream& os, unsigned codepoint) {
>-        if (codepoint <= 0x7F) 
>-            os.Put(static_cast<Ch>(codepoint & 0xFF));
>-        else if (codepoint <= 0x7FF) {
>-            os.Put(static_cast<Ch>(0xC0 | ((codepoint >> 6) & 0xFF)));
>-            os.Put(static_cast<Ch>(0x80 | ((codepoint & 0x3F))));
>-        }
>-        else if (codepoint <= 0xFFFF) {
>-            os.Put(static_cast<Ch>(0xE0 | ((codepoint >> 12) & 0xFF)));
>-            os.Put(static_cast<Ch>(0x80 | ((codepoint >> 6) & 0x3F)));
>-            os.Put(static_cast<Ch>(0x80 | (codepoint & 0x3F)));
>-        }
>-        else {
>-            RAPIDJSON_ASSERT(codepoint <= 0x10FFFF);
>-            os.Put(static_cast<Ch>(0xF0 | ((codepoint >> 18) & 0xFF)));
>-            os.Put(static_cast<Ch>(0x80 | ((codepoint >> 12) & 0x3F)));
>-            os.Put(static_cast<Ch>(0x80 | ((codepoint >> 6) & 0x3F)));
>-            os.Put(static_cast<Ch>(0x80 | (codepoint & 0x3F)));
>-        }
>-    }
>-
>-    template <typename InputStream>
>-    static bool Decode(InputStream& is, unsigned* codepoint) {
>-#define COPY() c = is.Take(); *codepoint = (*codepoint << 6) | ((unsigned char)c & 0x3Fu)
>-#define TRANS(mask) result &= ((GetRange((unsigned char)c) & mask) != 0)
>-#define TAIL() COPY(); TRANS(0x70)
>-        Ch c = is.Take();
>-        if (!(c & 0x80)) {
>-            *codepoint = (unsigned char)c;
>-            return true;
>-        }
>-
>-        unsigned char type = GetRange((unsigned char)c);
>-        *codepoint = (0xFF >> type) & (unsigned char)c;
>-        bool result = true;
>-        switch (type) {
>-        case 2: TAIL(); return result;
>-        case 3: TAIL(); TAIL(); return result;
>-        case 4: COPY(); TRANS(0x50); TAIL(); return result;
>-        case 5: COPY(); TRANS(0x10); TAIL(); TAIL(); return result;
>-        case 6: TAIL(); TAIL(); TAIL(); return result;
>-        case 10: COPY(); TRANS(0x20); TAIL(); return result;
>-        case 11: COPY(); TRANS(0x60); TAIL(); TAIL(); return result;
>-        default: return false;
>-        }
>-#undef COPY
>-#undef TRANS
>-#undef TAIL
>-    }
>-
>-    template <typename InputStream, typename OutputStream>
>-    static bool Validate(InputStream& is, OutputStream& os) {
>-#define COPY() os.Put(c = is.Take())
>-#define TRANS(mask) result &= ((GetRange((unsigned char)c) & mask) != 0)
>-#define TAIL() COPY(); TRANS(0x70)
>-        Ch c;
>-        COPY();
>-        if (!(c & 0x80))
>-            return true;
>-
>-        bool result = true;
>-        switch (GetRange((unsigned char)c)) {
>-        case 2: TAIL(); return result;
>-        case 3: TAIL(); TAIL(); return result;
>-        case 4: COPY(); TRANS(0x50); TAIL(); return result;
>-        case 5: COPY(); TRANS(0x10); TAIL(); TAIL(); return result;
>-        case 6: TAIL(); TAIL(); TAIL(); return result;
>-        case 10: COPY(); TRANS(0x20); TAIL(); return result;
>-        case 11: COPY(); TRANS(0x60); TAIL(); TAIL(); return result;
>-        default: return false;
>-        }
>-#undef COPY
>-#undef TRANS
>-#undef TAIL
>-    }
>-
>-    static unsigned char GetRange(unsigned char c) {
>-        // Referring to DFA of http://bjoern.hoehrmann.de/utf-8/decoder/dfa/
>-        // With new mapping 1 -> 0x10, 7 -> 0x20, 9 -> 0x40, such that AND operation can test multiple types.
>-        static const unsigned char type[] = {
>-            0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,  0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
>-            0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,  0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
>-            0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,  0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
>-            0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,  0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
>-            0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x10,
>-            0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,
>-            0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,
>-            0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,
>-            8,8,2,2,2,2,2,2,2,2,2,2,2,2,2,2,  2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
>-            10,3,3,3,3,3,3,3,3,3,3,3,3,4,3,3, 11,6,6,6,5,8,8,8,8,8,8,8,8,8,8,8,
>-        };
>-        return type[c];
>-    }
>-
>-    template <typename InputByteStream>
>-    static CharType TakeBOM(InputByteStream& is) {
>-        RAPIDJSON_STATIC_ASSERT(sizeof(typename InputByteStream::Ch) == 1);
>-        Ch c = Take(is);
>-        if ((unsigned char)c != 0xEFu) return c;
>-        c = is.Take();
>-        if ((unsigned char)c != 0xBBu) return c;
>-        c = is.Take();
>-        if ((unsigned char)c != 0xBFu) return c;
>-        c = is.Take();
>-        return c;
>-    }
>-
>-    template <typename InputByteStream>
>-    static Ch Take(InputByteStream& is) {
>-        RAPIDJSON_STATIC_ASSERT(sizeof(typename InputByteStream::Ch) == 1);
>-        return is.Take();
>-    }
>-
>-    template <typename OutputByteStream>
>-    static void PutBOM(OutputByteStream& os) {
>-        RAPIDJSON_STATIC_ASSERT(sizeof(typename OutputByteStream::Ch) == 1);
>-        os.Put(0xEFu); os.Put(0xBBu); os.Put(0xBFu);
>-    }
>-
>-    template <typename OutputByteStream>
>-    static void Put(OutputByteStream& os, Ch c) {
>-        RAPIDJSON_STATIC_ASSERT(sizeof(typename OutputByteStream::Ch) == 1);
>-        os.Put(static_cast<typename OutputByteStream::Ch>(c));
>-    }
>-};
>-
>-///////////////////////////////////////////////////////////////////////////////
>-// UTF16
>-
>-//! UTF-16 encoding.
>-/*! http://en.wikipedia.org/wiki/UTF-16
>-    http://tools.ietf.org/html/rfc2781
>-    \tparam CharType Type for storing 16-bit UTF-16 data. Default is wchar_t. C++11 may use char16_t instead.
>-    \note implements Encoding concept
>-
>-    \note For in-memory access, no need to concern endianness. The code units and code points are represented by CPU's endianness.
>-    For streaming, use UTF16LE and UTF16BE, which handle endianness.
>-*/
>-template<typename CharType = wchar_t>
>-struct UTF16 {
>-    typedef CharType Ch;
>-    RAPIDJSON_STATIC_ASSERT(sizeof(Ch) >= 2);
>-
>-    enum { supportUnicode = 1 };
>-
>-    template<typename OutputStream>
>-    static void Encode(OutputStream& os, unsigned codepoint) {
>-        RAPIDJSON_STATIC_ASSERT(sizeof(typename OutputStream::Ch) >= 2);
>-        if (codepoint <= 0xFFFF) {
>-            RAPIDJSON_ASSERT(codepoint < 0xD800 || codepoint > 0xDFFF); // Code point itself cannot be surrogate pair 
>-            os.Put(static_cast<typename OutputStream::Ch>(codepoint));
>-        }
>-        else {
>-            RAPIDJSON_ASSERT(codepoint <= 0x10FFFF);
>-            unsigned v = codepoint - 0x10000;
>-            os.Put(static_cast<typename OutputStream::Ch>((v >> 10) | 0xD800));
>-            os.Put((v & 0x3FF) | 0xDC00);
>-        }
>-    }
>-
>-    template <typename InputStream>
>-    static bool Decode(InputStream& is, unsigned* codepoint) {
>-        RAPIDJSON_STATIC_ASSERT(sizeof(typename InputStream::Ch) >= 2);
>-        Ch c = is.Take();
>-        if (c < 0xD800 || c > 0xDFFF) {
>-            *codepoint = c;
>-            return true;
>-        }
>-        else if (c <= 0xDBFF) {
>-            *codepoint = (c & 0x3FF) << 10;
>-            c = is.Take();
>-            *codepoint |= (c & 0x3FF);
>-            *codepoint += 0x10000;
>-            return c >= 0xDC00 && c <= 0xDFFF;
>-        }
>-        return false;
>-    }
>-
>-    template <typename InputStream, typename OutputStream>
>-    static bool Validate(InputStream& is, OutputStream& os) {
>-        RAPIDJSON_STATIC_ASSERT(sizeof(typename InputStream::Ch) >= 2);
>-        RAPIDJSON_STATIC_ASSERT(sizeof(typename OutputStream::Ch) >= 2);
>-        Ch c;
>-        os.Put(c = is.Take());
>-        if (c < 0xD800 || c > 0xDFFF)
>-            return true;
>-        else if (c <= 0xDBFF) {
>-            os.Put(c = is.Take());
>-            return c >= 0xDC00 && c <= 0xDFFF;
>-        }
>-        return false;
>-    }
>-};
>-
>-//! UTF-16 little endian encoding.
>-template<typename CharType = wchar_t>
>-struct UTF16LE : UTF16<CharType> {
>-    template <typename InputByteStream>
>-    static CharType TakeBOM(InputByteStream& is) {
>-        RAPIDJSON_STATIC_ASSERT(sizeof(typename InputByteStream::Ch) == 1);
>-        CharType c = Take(is);
>-        return (unsigned short)c == 0xFEFFu ? Take(is) : c;
>-    }
>-
>-    template <typename InputByteStream>
>-    static CharType Take(InputByteStream& is) {
>-        RAPIDJSON_STATIC_ASSERT(sizeof(typename InputByteStream::Ch) == 1);
>-        CharType c = (unsigned char)is.Take();
>-        c |= (unsigned char)is.Take() << 8;
>-        return c;
>-    }
>-
>-    template <typename OutputByteStream>
>-    static void PutBOM(OutputByteStream& os) {
>-        RAPIDJSON_STATIC_ASSERT(sizeof(typename OutputByteStream::Ch) == 1);
>-        os.Put(0xFFu); os.Put(0xFEu);
>-    }
>-
>-    template <typename OutputByteStream>
>-    static void Put(OutputByteStream& os, CharType c) {
>-        RAPIDJSON_STATIC_ASSERT(sizeof(typename OutputByteStream::Ch) == 1);
>-        os.Put(c & 0xFFu);
>-        os.Put((c >> 8) & 0xFFu);
>-    }
>-};
>-
>-//! UTF-16 big endian encoding.
>-template<typename CharType = wchar_t>
>-struct UTF16BE : UTF16<CharType> {
>-    template <typename InputByteStream>
>-    static CharType TakeBOM(InputByteStream& is) {
>-        RAPIDJSON_STATIC_ASSERT(sizeof(typename InputByteStream::Ch) == 1);
>-        CharType c = Take(is);
>-        return (unsigned short)c == 0xFEFFu ? Take(is) : c;
>-    }
>-
>-    template <typename InputByteStream>
>-    static CharType Take(InputByteStream& is) {
>-        RAPIDJSON_STATIC_ASSERT(sizeof(typename InputByteStream::Ch) == 1);
>-        CharType c = (unsigned char)is.Take() << 8;
>-        c |= (unsigned char)is.Take();
>-        return c;
>-    }
>-
>-    template <typename OutputByteStream>
>-    static void PutBOM(OutputByteStream& os) {
>-        RAPIDJSON_STATIC_ASSERT(sizeof(typename OutputByteStream::Ch) == 1);
>-        os.Put(0xFEu); os.Put(0xFFu);
>-    }
>-
>-    template <typename OutputByteStream>
>-    static void Put(OutputByteStream& os, CharType c) {
>-        RAPIDJSON_STATIC_ASSERT(sizeof(typename OutputByteStream::Ch) == 1);
>-        os.Put((c >> 8) & 0xFFu);
>-        os.Put(c & 0xFFu);
>-    }
>-};
>-
>-///////////////////////////////////////////////////////////////////////////////
>-// UTF32
>-
>-//! UTF-32 encoding. 
>-/*! http://en.wikipedia.org/wiki/UTF-32
>-    \tparam CharType Type for storing 32-bit UTF-32 data. Default is unsigned. C++11 may use char32_t instead.
>-    \note implements Encoding concept
>-
>-    \note For in-memory access, no need to concern endianness. The code units and code points are represented by CPU's endianness.
>-    For streaming, use UTF32LE and UTF32BE, which handle endianness.
>-*/
>-template<typename CharType = unsigned>
>-struct UTF32 {
>-    typedef CharType Ch;
>-    RAPIDJSON_STATIC_ASSERT(sizeof(Ch) >= 4);
>-
>-    enum { supportUnicode = 1 };
>-
>-    template<typename OutputStream>
>-    static void Encode(OutputStream& os, unsigned codepoint) {
>-        RAPIDJSON_STATIC_ASSERT(sizeof(typename OutputStream::Ch) >= 4);
>-        RAPIDJSON_ASSERT(codepoint <= 0x10FFFF);
>-        os.Put(codepoint);
>-    }
>-
>-    template <typename InputStream>
>-    static bool Decode(InputStream& is, unsigned* codepoint) {
>-        RAPIDJSON_STATIC_ASSERT(sizeof(typename InputStream::Ch) >= 4);
>-        Ch c = is.Take();
>-        *codepoint = c;
>-        return c <= 0x10FFFF;
>-    }
>-
>-    template <typename InputStream, typename OutputStream>
>-    static bool Validate(InputStream& is, OutputStream& os) {
>-        RAPIDJSON_STATIC_ASSERT(sizeof(typename InputStream::Ch) >= 4);
>-        Ch c;
>-        os.Put(c = is.Take());
>-        return c <= 0x10FFFF;
>-    }
>-};
>-
>-//! UTF-32 little endian enocoding.
>-template<typename CharType = unsigned>
>-struct UTF32LE : UTF32<CharType> {
>-    template <typename InputByteStream>
>-    static CharType TakeBOM(InputByteStream& is) {
>-        RAPIDJSON_STATIC_ASSERT(sizeof(typename InputByteStream::Ch) == 1);
>-        CharType c = Take(is);
>-        return (unsigned)c == 0x0000FEFFu ? Take(is) : c;
>-    }
>-
>-    template <typename InputByteStream>
>-    static CharType Take(InputByteStream& is) {
>-        RAPIDJSON_STATIC_ASSERT(sizeof(typename InputByteStream::Ch) == 1);
>-        CharType c = (unsigned char)is.Take();
>-        c |= (unsigned char)is.Take() << 8;
>-        c |= (unsigned char)is.Take() << 16;
>-        c |= (unsigned char)is.Take() << 24;
>-        return c;
>-    }
>-
>-    template <typename OutputByteStream>
>-    static void PutBOM(OutputByteStream& os) {
>-        RAPIDJSON_STATIC_ASSERT(sizeof(typename OutputByteStream::Ch) == 1);
>-        os.Put(0xFFu); os.Put(0xFEu); os.Put(0x00u); os.Put(0x00u);
>-    }
>-
>-    template <typename OutputByteStream>
>-    static void Put(OutputByteStream& os, CharType c) {
>-        RAPIDJSON_STATIC_ASSERT(sizeof(typename OutputByteStream::Ch) == 1);
>-        os.Put(c & 0xFFu);
>-        os.Put((c >> 8) & 0xFFu);
>-        os.Put((c >> 16) & 0xFFu);
>-        os.Put((c >> 24) & 0xFFu);
>-    }
>-};
>-
>-//! UTF-32 big endian encoding.
>-template<typename CharType = unsigned>
>-struct UTF32BE : UTF32<CharType> {
>-    template <typename InputByteStream>
>-    static CharType TakeBOM(InputByteStream& is) {
>-        RAPIDJSON_STATIC_ASSERT(sizeof(typename InputByteStream::Ch) == 1);
>-        CharType c = Take(is);
>-        return (unsigned)c == 0x0000FEFFu ? Take(is) : c; 
>-    }
>-
>-    template <typename InputByteStream>
>-    static CharType Take(InputByteStream& is) {
>-        RAPIDJSON_STATIC_ASSERT(sizeof(typename InputByteStream::Ch) == 1);
>-        CharType c = (unsigned char)is.Take() << 24;
>-        c |= (unsigned char)is.Take() << 16;
>-        c |= (unsigned char)is.Take() << 8;
>-        c |= (unsigned char)is.Take();
>-        return c;
>-    }
>-
>-    template <typename OutputByteStream>
>-    static void PutBOM(OutputByteStream& os) {
>-        RAPIDJSON_STATIC_ASSERT(sizeof(typename OutputByteStream::Ch) == 1);
>-        os.Put(0x00u); os.Put(0x00u); os.Put(0xFEu); os.Put(0xFFu);
>-    }
>-
>-    template <typename OutputByteStream>
>-    static void Put(OutputByteStream& os, CharType c) {
>-        RAPIDJSON_STATIC_ASSERT(sizeof(typename OutputByteStream::Ch) == 1);
>-        os.Put((c >> 24) & 0xFFu);
>-        os.Put((c >> 16) & 0xFFu);
>-        os.Put((c >> 8) & 0xFFu);
>-        os.Put(c & 0xFFu);
>-    }
>-};
>-
>-///////////////////////////////////////////////////////////////////////////////
>-// ASCII
>-
>-//! ASCII encoding.
>-/*! http://en.wikipedia.org/wiki/ASCII
>-    \tparam CharType Code unit for storing 7-bit ASCII data. Default is char.
>-    \note implements Encoding concept
>-*/
>-template<typename CharType = char>
>-struct ASCII {
>-    typedef CharType Ch;
>-
>-    enum { supportUnicode = 0 };
>-
>-    template<typename OutputStream>
>-    static void Encode(OutputStream& os, unsigned codepoint) {
>-        RAPIDJSON_ASSERT(codepoint <= 0x7F);
>-        os.Put(static_cast<Ch>(codepoint & 0xFF));
>-    }
>-
>-    template <typename InputStream>
>-    static bool Decode(InputStream& is, unsigned* codepoint) {
>-        unsigned char c = static_cast<unsigned char>(is.Take());
>-        *codepoint = c;
>-        return c <= 0X7F;
>-    }
>-
>-    template <typename InputStream, typename OutputStream>
>-    static bool Validate(InputStream& is, OutputStream& os) {
>-        unsigned char c = is.Take();
>-        os.Put(c);
>-        return c <= 0x7F;
>-    }
>-
>-    template <typename InputByteStream>
>-    static CharType TakeBOM(InputByteStream& is) {
>-        RAPIDJSON_STATIC_ASSERT(sizeof(typename InputByteStream::Ch) == 1);
>-        Ch c = Take(is);
>-        return c;
>-    }
>-
>-    template <typename InputByteStream>
>-    static Ch Take(InputByteStream& is) {
>-        RAPIDJSON_STATIC_ASSERT(sizeof(typename InputByteStream::Ch) == 1);
>-        return is.Take();
>-    }
>-
>-    template <typename OutputByteStream>
>-    static void PutBOM(OutputByteStream& os) {
>-        RAPIDJSON_STATIC_ASSERT(sizeof(typename OutputByteStream::Ch) == 1);
>-        (void)os;
>-    }
>-
>-    template <typename OutputByteStream>
>-    static void Put(OutputByteStream& os, Ch c) {
>-        RAPIDJSON_STATIC_ASSERT(sizeof(typename OutputByteStream::Ch) == 1);
>-        os.Put(static_cast<typename OutputByteStream::Ch>(c));
>-    }
>-};
>-
>-///////////////////////////////////////////////////////////////////////////////
>-// AutoUTF
>-
>-//! Runtime-specified UTF encoding type of a stream.
>-enum UTFType {
>-    kUTF8 = 0,      //!< UTF-8.
>-    kUTF16LE = 1,   //!< UTF-16 little endian.
>-    kUTF16BE = 2,   //!< UTF-16 big endian.
>-    kUTF32LE = 3,   //!< UTF-32 little endian.
>-    kUTF32BE = 4    //!< UTF-32 big endian.
>-};
>-
>-//! Dynamically select encoding according to stream's runtime-specified UTF encoding type.
>-/*! \note This class can be used with AutoUTFInputtStream and AutoUTFOutputStream, which provides GetType().
>-*/
>-template<typename CharType>
>-struct AutoUTF {
>-    typedef CharType Ch;
>-
>-    enum { supportUnicode = 1 };
>-
>-#define RAPIDJSON_ENCODINGS_FUNC(x) UTF8<Ch>::x, UTF16LE<Ch>::x, UTF16BE<Ch>::x, UTF32LE<Ch>::x, UTF32BE<Ch>::x
>-
>-    template<typename OutputStream>
>-    RAPIDJSON_FORCEINLINE static void Encode(OutputStream& os, unsigned codepoint) {
>-        typedef void (*EncodeFunc)(OutputStream&, unsigned);
>-        static const EncodeFunc f[] = { RAPIDJSON_ENCODINGS_FUNC(Encode) };
>-        (*f[os.GetType()])(os, codepoint);
>-    }
>-
>-    template <typename InputStream>
>-    RAPIDJSON_FORCEINLINE static bool Decode(InputStream& is, unsigned* codepoint) {
>-        typedef bool (*DecodeFunc)(InputStream&, unsigned*);
>-        static const DecodeFunc f[] = { RAPIDJSON_ENCODINGS_FUNC(Decode) };
>-        return (*f[is.GetType()])(is, codepoint);
>-    }
>-
>-    template <typename InputStream, typename OutputStream>
>-    RAPIDJSON_FORCEINLINE static bool Validate(InputStream& is, OutputStream& os) {
>-        typedef bool (*ValidateFunc)(InputStream&, OutputStream&);
>-        static const ValidateFunc f[] = { RAPIDJSON_ENCODINGS_FUNC(Validate) };
>-        return (*f[is.GetType()])(is, os);
>-    }
>-
>-#undef RAPIDJSON_ENCODINGS_FUNC
>-};
>-
>-///////////////////////////////////////////////////////////////////////////////
>-// Transcoder
>-
>-//! Encoding conversion.
>-template<typename SourceEncoding, typename TargetEncoding>
>-struct Transcoder {
>-    //! Take one Unicode codepoint from source encoding, convert it to target encoding and put it to the output stream.
>-    template<typename InputStream, typename OutputStream>
>-    RAPIDJSON_FORCEINLINE static bool Transcode(InputStream& is, OutputStream& os) {
>-        unsigned codepoint;
>-        if (!SourceEncoding::Decode(is, &codepoint))
>-            return false;
>-        TargetEncoding::Encode(os, codepoint);
>-        return true;
>-    }
>-
>-    //! Validate one Unicode codepoint from an encoded stream.
>-    template<typename InputStream, typename OutputStream>
>-    RAPIDJSON_FORCEINLINE static bool Validate(InputStream& is, OutputStream& os) {
>-        return Transcode(is, os);   // Since source/target encoding is different, must transcode.
>-    }
>-};
>-
>-//! Specialization of Transcoder with same source and target encoding.
>-template<typename Encoding>
>-struct Transcoder<Encoding, Encoding> {
>-    template<typename InputStream, typename OutputStream>
>-    RAPIDJSON_FORCEINLINE static bool Transcode(InputStream& is, OutputStream& os) {
>-        os.Put(is.Take());  // Just copy one code unit. This semantic is different from primary template class.
>-        return true;
>-    }
>-    
>-    template<typename InputStream, typename OutputStream>
>-    RAPIDJSON_FORCEINLINE static bool Validate(InputStream& is, OutputStream& os) {
>-        return Encoding::Validate(is, os);  // source/target encoding are the same
>-    }
>-};
>-
>-RAPIDJSON_NAMESPACE_END
>-
>-#if defined(__GNUC__) || defined(_MSV_VER)
>-RAPIDJSON_DIAG_POP
>-#endif
>-
>-#endif // RAPIDJSON_ENCODINGS_H_
>diff --git a/Source/ThirdParty/ANGLE/src/tests/third_party/rapidjson/include/rapidjson/error/en.h b/Source/ThirdParty/ANGLE/src/tests/third_party/rapidjson/include/rapidjson/error/en.h
>deleted file mode 100644
>index 01711833e1e..00000000000
>--- a/Source/ThirdParty/ANGLE/src/tests/third_party/rapidjson/include/rapidjson/error/en.h
>+++ /dev/null
>@@ -1,71 +0,0 @@
>-// Copyright (C) 2011 Milo Yip
>-//
>-// Permission is hereby granted, free of charge, to any person obtaining a copy
>-// of this software and associated documentation files (the "Software"), to deal
>-// in the Software without restriction, including without limitation the rights
>-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
>-// copies of the Software, and to permit persons to whom the Software is
>-// furnished to do so, subject to the following conditions:
>-//
>-// The above copyright notice and this permission notice shall be included in
>-// all copies or substantial portions of the Software.
>-//
>-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
>-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
>-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
>-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
>-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
>-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
>-// THE SOFTWARE.
>-
>-#ifndef RAPIDJSON_ERROR_EN_H__
>-#define RAPIDJSON_ERROR_EN_H__
>-
>-#include "error.h"
>-
>-RAPIDJSON_NAMESPACE_BEGIN
>-
>-//! Maps error code of parsing into error message.
>-/*!
>-    \ingroup RAPIDJSON_ERRORS
>-    \param parseErrorCode Error code obtained in parsing.
>-    \return the error message.
>-    \note User can make a copy of this function for localization.
>-        Using switch-case is safer for future modification of error codes.
>-*/
>-inline const RAPIDJSON_ERROR_CHARTYPE* GetParseError_En(ParseErrorCode parseErrorCode) {
>-    switch (parseErrorCode) {
>-        case kParseErrorNone:                           return RAPIDJSON_ERROR_STRING("No error.");
>-
>-        case kParseErrorDocumentEmpty:                  return RAPIDJSON_ERROR_STRING("The document is empty.");
>-        case kParseErrorDocumentRootNotSingular:        return RAPIDJSON_ERROR_STRING("The document root must not follow by other values.");
>-    
>-        case kParseErrorValueInvalid:                   return RAPIDJSON_ERROR_STRING("Invalid value.");
>-    
>-        case kParseErrorObjectMissName:                 return RAPIDJSON_ERROR_STRING("Missing a name for object member.");
>-        case kParseErrorObjectMissColon:                return RAPIDJSON_ERROR_STRING("Missing a colon after a name of object member.");
>-        case kParseErrorObjectMissCommaOrCurlyBracket:  return RAPIDJSON_ERROR_STRING("Missing a comma or '}' after an object member.");
>-    
>-        case kParseErrorArrayMissCommaOrSquareBracket:  return RAPIDJSON_ERROR_STRING("Missing a comma or ']' after an array element.");
>-
>-        case kParseErrorStringUnicodeEscapeInvalidHex:  return RAPIDJSON_ERROR_STRING("Incorrect hex digit after \\u escape in string.");
>-        case kParseErrorStringUnicodeSurrogateInvalid:  return RAPIDJSON_ERROR_STRING("The surrogate pair in string is invalid.");
>-        case kParseErrorStringEscapeInvalid:            return RAPIDJSON_ERROR_STRING("Invalid escape character in string.");
>-        case kParseErrorStringMissQuotationMark:        return RAPIDJSON_ERROR_STRING("Missing a closing quotation mark in string.");
>-        case kParseErrorStringInvalidEncoding:          return RAPIDJSON_ERROR_STRING("Invalid encoding in string.");
>-
>-        case kParseErrorNumberTooBig:                   return RAPIDJSON_ERROR_STRING("Number too big to be stored in double.");
>-        case kParseErrorNumberMissFraction:             return RAPIDJSON_ERROR_STRING("Miss fraction part in number.");
>-        case kParseErrorNumberMissExponent:             return RAPIDJSON_ERROR_STRING("Miss exponent in number.");
>-
>-        case kParseErrorTermination:                    return RAPIDJSON_ERROR_STRING("Terminate parsing due to Handler error.");
>-        case kParseErrorUnspecificSyntaxError:          return RAPIDJSON_ERROR_STRING("Unspecific syntax error.");
>-
>-        default:
>-            return RAPIDJSON_ERROR_STRING("Unknown error.");
>-    }
>-}
>-
>-RAPIDJSON_NAMESPACE_END
>-
>-#endif // RAPIDJSON_ERROR_EN_H__
>diff --git a/Source/ThirdParty/ANGLE/src/tests/third_party/rapidjson/include/rapidjson/error/error.h b/Source/ThirdParty/ANGLE/src/tests/third_party/rapidjson/include/rapidjson/error/error.h
>deleted file mode 100644
>index 161ef87878e..00000000000
>--- a/Source/ThirdParty/ANGLE/src/tests/third_party/rapidjson/include/rapidjson/error/error.h
>+++ /dev/null
>@@ -1,150 +0,0 @@
>-// Copyright (C) 2011 Milo Yip
>-//
>-// Permission is hereby granted, free of charge, to any person obtaining a copy
>-// of this software and associated documentation files (the "Software"), to deal
>-// in the Software without restriction, including without limitation the rights
>-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
>-// copies of the Software, and to permit persons to whom the Software is
>-// furnished to do so, subject to the following conditions:
>-//
>-// The above copyright notice and this permission notice shall be included in
>-// all copies or substantial portions of the Software.
>-//
>-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
>-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
>-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
>-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
>-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
>-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
>-// THE SOFTWARE.
>-
>-#ifndef RAPIDJSON_ERROR_ERROR_H__
>-#define RAPIDJSON_ERROR_ERROR_H__
>-
>-/*! \file error.h */
>-
>-/*! \defgroup RAPIDJSON_ERRORS RapidJSON error handling */
>-
>-///////////////////////////////////////////////////////////////////////////////
>-// RAPIDJSON_ERROR_CHARTYPE
>-
>-//! Character type of error messages.
>-/*! \ingroup RAPIDJSON_ERRORS
>-    The default character type is \c char.
>-    On Windows, user can define this macro as \c TCHAR for supporting both
>-    unicode/non-unicode settings.
>-*/
>-#ifndef RAPIDJSON_ERROR_CHARTYPE
>-#define RAPIDJSON_ERROR_CHARTYPE char
>-#endif
>-
>-///////////////////////////////////////////////////////////////////////////////
>-// RAPIDJSON_ERROR_STRING
>-
>-//! Macro for converting string literial to \ref RAPIDJSON_ERROR_CHARTYPE[].
>-/*! \ingroup RAPIDJSON_ERRORS
>-    By default this conversion macro does nothing.
>-    On Windows, user can define this macro as \c _T(x) for supporting both
>-    unicode/non-unicode settings.
>-*/
>-#ifndef RAPIDJSON_ERROR_STRING
>-#define RAPIDJSON_ERROR_STRING(x) x
>-#endif
>-
>-RAPIDJSON_NAMESPACE_BEGIN
>-
>-///////////////////////////////////////////////////////////////////////////////
>-// ParseErrorCode
>-
>-//! Error code of parsing.
>-/*! \ingroup RAPIDJSON_ERRORS
>-    \see GenericReader::Parse, GenericReader::GetParseErrorCode
>-*/
>-enum ParseErrorCode {
>-    kParseErrorNone = 0,                        //!< No error.
>-
>-    kParseErrorDocumentEmpty,                   //!< The document is empty.
>-    kParseErrorDocumentRootNotSingular,         //!< The document root must not follow by other values.
>-
>-    kParseErrorValueInvalid,                    //!< Invalid value.
>-
>-    kParseErrorObjectMissName,                  //!< Missing a name for object member.
>-    kParseErrorObjectMissColon,                 //!< Missing a colon after a name of object member.
>-    kParseErrorObjectMissCommaOrCurlyBracket,   //!< Missing a comma or '}' after an object member.
>-
>-    kParseErrorArrayMissCommaOrSquareBracket,   //!< Missing a comma or ']' after an array element.
>-
>-    kParseErrorStringUnicodeEscapeInvalidHex,   //!< Incorrect hex digit after \\u escape in string.
>-    kParseErrorStringUnicodeSurrogateInvalid,   //!< The surrogate pair in string is invalid.
>-    kParseErrorStringEscapeInvalid,             //!< Invalid escape character in string.
>-    kParseErrorStringMissQuotationMark,         //!< Missing a closing quotation mark in string.
>-    kParseErrorStringInvalidEncoding,           //!< Invalid encoding in string.
>-
>-    kParseErrorNumberTooBig,                    //!< Number too big to be stored in double.
>-    kParseErrorNumberMissFraction,              //!< Miss fraction part in number.
>-    kParseErrorNumberMissExponent,              //!< Miss exponent in number.
>-
>-    kParseErrorTermination,                     //!< Parsing was terminated.
>-    kParseErrorUnspecificSyntaxError,           //!< Unspecific syntax error.
>-};
>-
>-//! Result of parsing (wraps ParseErrorCode)
>-/*!
>-    \ingroup RAPIDJSON_ERRORS
>-    \code
>-        Document doc;
>-        ParseResult ok = doc.Parse("[42]");
>-        if (!ok) {
>-            fprintf(stderr, "JSON parse error: %s (%u)",
>-                    GetParseError_En(ok.Code()), ok.Offset());
>-            exit(EXIT_FAILURE);
>-        }
>-    \endcode
>-    \see GenericReader::Parse, GenericDocument::Parse
>-*/
>-struct ParseResult {
>-
>-    //! Default constructor, no error.
>-    ParseResult() : code_(kParseErrorNone), offset_(0) {}
>-    //! Constructor to set an error.
>-    ParseResult(ParseErrorCode code, size_t offset) : code_(code), offset_(offset) {}
>-
>-    //! Get the error code.
>-    ParseErrorCode Code() const { return code_; }
>-    //! Get the error offset, if \ref IsError(), 0 otherwise.
>-    size_t Offset() const { return offset_; }
>-
>-    //! Conversion to \c bool, returns \c true, iff !\ref IsError().
>-    operator bool() const { return !IsError(); }
>-    //! Whether the result is an error.
>-    bool IsError() const { return code_ != kParseErrorNone; }
>-
>-    bool operator==(const ParseResult& that) const { return code_ == that.code_; }
>-    bool operator==(ParseErrorCode code) const { return code_ == code; }
>-    friend bool operator==(ParseErrorCode code, const ParseResult & err) { return code == err.code_; }
>-
>-    //! Reset error code.
>-    void Clear() { Set(kParseErrorNone); }
>-    //! Update error code and offset.
>-    void Set(ParseErrorCode code, size_t offset = 0) { code_ = code; offset_ = offset; }
>-
>-private:
>-    ParseErrorCode code_;
>-    size_t offset_;
>-};
>-
>-//! Function pointer type of GetParseError().
>-/*! \ingroup RAPIDJSON_ERRORS
>-
>-    This is the prototype for \c GetParseError_X(), where \c X is a locale.
>-    User can dynamically change locale in runtime, e.g.:
>-\code
>-    GetParseErrorFunc GetParseError = GetParseError_En; // or whatever
>-    const RAPIDJSON_ERROR_CHARTYPE* s = GetParseError(document.GetParseErrorCode());
>-\endcode
>-*/
>-typedef const RAPIDJSON_ERROR_CHARTYPE* (*GetParseErrorFunc)(ParseErrorCode);
>-
>-RAPIDJSON_NAMESPACE_END
>-
>-#endif // RAPIDJSON_ERROR_ERROR_H__
>diff --git a/Source/ThirdParty/ANGLE/src/tests/third_party/rapidjson/include/rapidjson/filereadstream.h b/Source/ThirdParty/ANGLE/src/tests/third_party/rapidjson/include/rapidjson/filereadstream.h
>deleted file mode 100644
>index 5af9be579db..00000000000
>--- a/Source/ThirdParty/ANGLE/src/tests/third_party/rapidjson/include/rapidjson/filereadstream.h
>+++ /dev/null
>@@ -1,94 +0,0 @@
>-// Copyright (C) 2011 Milo Yip
>-//
>-// Permission is hereby granted, free of charge, to any person obtaining a copy
>-// of this software and associated documentation files (the "Software"), to deal
>-// in the Software without restriction, including without limitation the rights
>-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
>-// copies of the Software, and to permit persons to whom the Software is
>-// furnished to do so, subject to the following conditions:
>-//
>-// The above copyright notice and this permission notice shall be included in
>-// all copies or substantial portions of the Software.
>-//
>-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
>-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
>-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
>-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
>-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
>-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
>-// THE SOFTWARE.
>-
>-#ifndef RAPIDJSON_FILEREADSTREAM_H_
>-#define RAPIDJSON_FILEREADSTREAM_H_
>-
>-#include "rapidjson.h"
>-#include <cstdio>
>-
>-RAPIDJSON_NAMESPACE_BEGIN
>-
>-//! File byte stream for input using fread().
>-/*!
>-    \note implements Stream concept
>-*/
>-class FileReadStream {
>-public:
>-    typedef char Ch;    //!< Character type (byte).
>-
>-    //! Constructor.
>-    /*!
>-        \param fp File pointer opened for read.
>-        \param buffer user-supplied buffer.
>-        \param bufferSize size of buffer in bytes. Must >=4 bytes.
>-    */
>-    FileReadStream(std::FILE* fp, char* buffer, size_t bufferSize) : fp_(fp), buffer_(buffer), bufferSize_(bufferSize), bufferLast_(0), current_(buffer_), readCount_(0), count_(0), eof_(false) { 
>-        RAPIDJSON_ASSERT(fp_ != 0);
>-        RAPIDJSON_ASSERT(bufferSize >= 4);
>-        Read();
>-    }
>-
>-    Ch Peek() const { return *current_; }
>-    Ch Take() { Ch c = *current_; Read(); return c; }
>-    size_t Tell() const { return count_ + static_cast<size_t>(current_ - buffer_); }
>-
>-    // Not implemented
>-    void Put(Ch) { RAPIDJSON_ASSERT(false); }
>-    void Flush() { RAPIDJSON_ASSERT(false); } 
>-    Ch* PutBegin() { RAPIDJSON_ASSERT(false); return 0; }
>-    size_t PutEnd(Ch*) { RAPIDJSON_ASSERT(false); return 0; }
>-
>-    // For encoding detection only.
>-    const Ch* Peek4() const {
>-        return (current_ + 4 <= bufferLast_) ? current_ : 0;
>-    }
>-
>-private:
>-    void Read() {
>-        if (current_ < bufferLast_)
>-            ++current_;
>-        else if (!eof_) {
>-            count_ += readCount_;
>-            readCount_ = fread(buffer_, 1, bufferSize_, fp_);
>-            bufferLast_ = buffer_ + readCount_ - 1;
>-            current_ = buffer_;
>-
>-            if (readCount_ < bufferSize_) {
>-                buffer_[readCount_] = '\0';
>-                ++bufferLast_;
>-                eof_ = true;
>-            }
>-        }
>-    }
>-
>-    std::FILE* fp_;
>-    Ch *buffer_;
>-    size_t bufferSize_;
>-    Ch *bufferLast_;
>-    Ch *current_;
>-    size_t readCount_;
>-    size_t count_;  //!< Number of characters read
>-    bool eof_;
>-};
>-
>-RAPIDJSON_NAMESPACE_END
>-
>-#endif // RAPIDJSON_FILESTREAM_H_
>diff --git a/Source/ThirdParty/ANGLE/src/tests/third_party/rapidjson/include/rapidjson/filestream.h b/Source/ThirdParty/ANGLE/src/tests/third_party/rapidjson/include/rapidjson/filestream.h
>deleted file mode 100644
>index a370c60570f..00000000000
>--- a/Source/ThirdParty/ANGLE/src/tests/third_party/rapidjson/include/rapidjson/filestream.h
>+++ /dev/null
>@@ -1,73 +0,0 @@
>-// Copyright (C) 2011 Milo Yip
>-//
>-// Permission is hereby granted, free of charge, to any person obtaining a copy
>-// of this software and associated documentation files (the "Software"), to deal
>-// in the Software without restriction, including without limitation the rights
>-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
>-// copies of the Software, and to permit persons to whom the Software is
>-// furnished to do so, subject to the following conditions:
>-//
>-// The above copyright notice and this permission notice shall be included in
>-// all copies or substantial portions of the Software.
>-//
>-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
>-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
>-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
>-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
>-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
>-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
>-// THE SOFTWARE.
>-
>-#ifndef RAPIDJSON_FILESTREAM_H_
>-#define RAPIDJSON_FILESTREAM_H_
>-
>-#include "rapidjson.h"
>-#include <cstdio>
>-
>-RAPIDJSON_NAMESPACE_BEGIN
>-
>-//! (Deprecated) Wrapper of C file stream for input or output.
>-/*!
>-    This simple wrapper does not check the validity of the stream.
>-    \note implements Stream concept
>-    \note deprecated: This was only for basic testing in version 0.1, it is found that the performance is very low by using fgetc(). Use FileReadStream instead.
>-*/
>-class FileStream {
>-public:
>-    typedef char Ch;    //!< Character type. Only support char.
>-
>-    FileStream(std::FILE* fp) : fp_(fp), current_('\0'), count_(0) { Read(); }
>-    char Peek() const { return current_; }
>-    char Take() { char c = current_; Read(); return c; }
>-    size_t Tell() const { return count_; }
>-    void Put(char c) { fputc(c, fp_); }
>-    void Flush() { fflush(fp_); }
>-
>-    // Not implemented
>-    char* PutBegin() { return 0; }
>-    size_t PutEnd(char*) { return 0; }
>-
>-private:
>-    // Prohibit copy constructor & assignment operator.
>-    FileStream(const FileStream&);
>-    FileStream& operator=(const FileStream&);
>-
>-    void Read() {
>-        RAPIDJSON_ASSERT(fp_ != 0);
>-        int c = fgetc(fp_);
>-        if (c != EOF) {
>-            current_ = (char)c;
>-            count_++;
>-        }
>-        else if (current_ != '\0')
>-            current_ = '\0';
>-    }
>-
>-    std::FILE* fp_;
>-    char current_;
>-    size_t count_;
>-};
>-
>-RAPIDJSON_NAMESPACE_END
>-
>-#endif // RAPIDJSON_FILESTREAM_H_
>diff --git a/Source/ThirdParty/ANGLE/src/tests/third_party/rapidjson/include/rapidjson/filewritestream.h b/Source/ThirdParty/ANGLE/src/tests/third_party/rapidjson/include/rapidjson/filewritestream.h
>deleted file mode 100644
>index 4352c8f172f..00000000000
>--- a/Source/ThirdParty/ANGLE/src/tests/third_party/rapidjson/include/rapidjson/filewritestream.h
>+++ /dev/null
>@@ -1,97 +0,0 @@
>-// Copyright (C) 2011 Milo Yip
>-//
>-// Permission is hereby granted, free of charge, to any person obtaining a copy
>-// of this software and associated documentation files (the "Software"), to deal
>-// in the Software without restriction, including without limitation the rights
>-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
>-// copies of the Software, and to permit persons to whom the Software is
>-// furnished to do so, subject to the following conditions:
>-//
>-// The above copyright notice and this permission notice shall be included in
>-// all copies or substantial portions of the Software.
>-//
>-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
>-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
>-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
>-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
>-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
>-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
>-// THE SOFTWARE.
>-
>-#ifndef RAPIDJSON_FILEWRITESTREAM_H_
>-#define RAPIDJSON_FILEWRITESTREAM_H_
>-
>-#include "rapidjson.h"
>-#include <cstdio>
>-
>-RAPIDJSON_NAMESPACE_BEGIN
>-
>-//! Wrapper of C file stream for input using fread().
>-/*!
>-    \note implements Stream concept
>-*/
>-class FileWriteStream {
>-public:
>-    typedef char Ch;    //!< Character type. Only support char.
>-
>-    FileWriteStream(std::FILE* fp, char* buffer, size_t bufferSize) : fp_(fp), buffer_(buffer), bufferEnd_(buffer + bufferSize), current_(buffer_) { 
>-        RAPIDJSON_ASSERT(fp_ != 0);
>-    }
>-
>-    void Put(char c) { 
>-        if (current_ >= bufferEnd_)
>-            Flush();
>-
>-        *current_++ = c;
>-    }
>-
>-    void PutN(char c, size_t n) {
>-        size_t avail = static_cast<size_t>(bufferEnd_ - current_);
>-        while (n > avail) {
>-            std::memset(current_, c, avail);
>-            current_ += avail;
>-            Flush();
>-            n -= avail;
>-            avail = static_cast<size_t>(bufferEnd_ - current_);
>-        }
>-
>-        if (n > 0) {
>-            std::memset(current_, c, n);
>-            current_ += n;
>-        }
>-    }
>-
>-    void Flush() {
>-        if (current_ != buffer_) {
>-            fwrite(buffer_, 1, static_cast<size_t>(current_ - buffer_), fp_);
>-            current_ = buffer_;
>-        }
>-    }
>-
>-    // Not implemented
>-    char Peek() const { RAPIDJSON_ASSERT(false); return 0; }
>-    char Take() { RAPIDJSON_ASSERT(false); return 0; }
>-    size_t Tell() const { RAPIDJSON_ASSERT(false); return 0; }
>-    char* PutBegin() { RAPIDJSON_ASSERT(false); return 0; }
>-    size_t PutEnd(char*) { RAPIDJSON_ASSERT(false); return 0; }
>-
>-private:
>-    // Prohibit copy constructor & assignment operator.
>-    FileWriteStream(const FileWriteStream&);
>-    FileWriteStream& operator=(const FileWriteStream&);
>-
>-    std::FILE* fp_;
>-    char *buffer_;
>-    char *bufferEnd_;
>-    char *current_;
>-};
>-
>-//! Implement specialized version of PutN() with memset() for better performance.
>-template<>
>-inline void PutN(FileWriteStream& stream, char c, size_t n) {
>-    stream.PutN(c, n);
>-}
>-
>-RAPIDJSON_NAMESPACE_END
>-
>-#endif // RAPIDJSON_FILESTREAM_H_
>diff --git a/Source/ThirdParty/ANGLE/src/tests/third_party/rapidjson/include/rapidjson/internal/biginteger.h b/Source/ThirdParty/ANGLE/src/tests/third_party/rapidjson/include/rapidjson/internal/biginteger.h
>deleted file mode 100644
>index 72acfc38533..00000000000
>--- a/Source/ThirdParty/ANGLE/src/tests/third_party/rapidjson/include/rapidjson/internal/biginteger.h
>+++ /dev/null
>@@ -1,294 +0,0 @@
>-// Copyright (C) 2011 Milo Yip
>-//
>-// Permission is hereby granted, free of charge, to any person obtaining a copy
>-// of this software and associated documentation files (the "Software"), to deal
>-// in the Software without restriction, including without limitation the rights
>-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
>-// copies of the Software, and to permit persons to whom the Software is
>-// furnished to do so, subject to the following conditions:
>-//
>-// The above copyright notice and this permission notice shall be included in
>-// all copies or substantial portions of the Software.
>-//
>-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
>-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
>-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
>-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
>-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
>-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
>-// THE SOFTWARE.
>-
>-#ifndef RAPIDJSON_BIGINTEGER_H_
>-#define RAPIDJSON_BIGINTEGER_H_
>-
>-#include "../rapidjson.h"
>-
>-#if defined(_MSC_VER) && defined(_M_AMD64)
>-#include <intrin.h> // for _umul128
>-#endif
>-
>-RAPIDJSON_NAMESPACE_BEGIN
>-namespace internal {
>-
>-class BigInteger {
>-public:
>-    typedef uint64_t Type;
>-
>-    BigInteger(const BigInteger& rhs) : count_(rhs.count_) {
>-        std::memcpy(digits_, rhs.digits_, count_ * sizeof(Type));
>-    }
>-
>-    explicit BigInteger(uint64_t u) : count_(1) {
>-        digits_[0] = u;
>-    }
>-
>-    BigInteger(const char* decimals, size_t length) : count_(1) {
>-        RAPIDJSON_ASSERT(length > 0);
>-        digits_[0] = 0;
>-        size_t i = 0;
>-        const size_t kMaxDigitPerIteration = 19;  // 2^64 = 18446744073709551616 > 10^19
>-        while (length >= kMaxDigitPerIteration) {
>-            AppendDecimal64(decimals + i, decimals + i + kMaxDigitPerIteration);
>-            length -= kMaxDigitPerIteration;
>-            i += kMaxDigitPerIteration;
>-        }
>-
>-        if (length > 0)
>-            AppendDecimal64(decimals + i, decimals + i + length);
>-    }
>-
>-    BigInteger& operator=(uint64_t u) {
>-        digits_[0] = u;            
>-        count_ = 1;
>-        return *this;
>-    }
>-
>-    BigInteger& operator+=(uint64_t u) {
>-        Type backup = digits_[0];
>-        digits_[0] += u;
>-        for (size_t i = 0; i < count_ - 1; i++) {
>-            if (digits_[i] >= backup)
>-                return *this; // no carry
>-            backup = digits_[i + 1];
>-            digits_[i + 1] += 1;
>-        }
>-
>-        // Last carry
>-        if (digits_[count_ - 1] < backup)
>-            PushBack(1);
>-
>-        return *this;
>-    }
>-
>-    BigInteger& operator*=(uint64_t u) {
>-        if (u == 0) return *this = 0;
>-        if (u == 1) return *this;
>-        if (*this == 1) return *this = u;
>-
>-        uint64_t k = 0;
>-        for (size_t i = 0; i < count_; i++) {
>-            uint64_t hi;
>-            digits_[i] = MulAdd64(digits_[i], u, k, &hi);
>-            k = hi;
>-        }
>-        
>-        if (k > 0)
>-            PushBack(k);
>-
>-        return *this;
>-    }
>-
>-    BigInteger& operator*=(uint32_t u) {
>-        if (u == 0) return *this = 0;
>-        if (u == 1) return *this;
>-        if (*this == 1) return *this = u;
>-
>-        uint32_t k = 0;
>-        for (size_t i = 0; i < count_; i++) {
>-            const uint64_t c = digits_[i] >> 32;
>-            const uint64_t d = digits_[i] & 0xFFFFFFFF;
>-            const uint64_t uc = u * c;
>-            const uint64_t ud = u * d;
>-            const uint64_t p0 = ud + k;
>-            const uint64_t p1 = uc + (p0 >> 32);
>-            digits_[i] = (p0 & 0xFFFFFFFF) | (p1 << 32);
>-            k = p1 >> 32;
>-        }
>-        
>-        if (k > 0)
>-            PushBack(k);
>-
>-        return *this;
>-    }
>-
>-    BigInteger& operator<<=(size_t shift) {
>-        if (IsZero() || shift == 0) return *this;
>-
>-        size_t offset = shift / kTypeBit;
>-        size_t interShift = shift % kTypeBit;
>-        RAPIDJSON_ASSERT(count_ + offset <= kCapacity);
>-
>-        if (interShift == 0) {
>-            std::memmove(&digits_[count_ - 1 + offset], &digits_[count_ - 1], count_ * sizeof(Type));
>-            count_ += offset;
>-        }
>-        else {
>-            digits_[count_] = 0;
>-            for (size_t i = count_; i > 0; i--)
>-                digits_[i + offset] = (digits_[i] << interShift) | (digits_[i - 1] >> (kTypeBit - interShift));
>-            digits_[offset] = digits_[0] << interShift;
>-            count_ += offset;
>-            if (digits_[count_])
>-                count_++;
>-        }
>-
>-        std::memset(digits_, 0, offset * sizeof(Type));
>-
>-        return *this;
>-    }
>-
>-    bool operator==(const BigInteger& rhs) const {
>-        return count_ == rhs.count_ && memcmp(digits_, rhs.digits_, count_ * sizeof(Type)) == 0;
>-    }
>-
>-    bool operator==(const Type rhs) const {
>-        return count_ == 1 && digits_[0] == rhs;
>-    }
>-
>-    BigInteger& MultiplyPow5(unsigned exp) {
>-        static const uint32_t kPow5[12] = {
>-            5,
>-            5 * 5,
>-            5 * 5 * 5,
>-            5 * 5 * 5 * 5,
>-            5 * 5 * 5 * 5 * 5,
>-            5 * 5 * 5 * 5 * 5 * 5,
>-            5 * 5 * 5 * 5 * 5 * 5 * 5,
>-            5 * 5 * 5 * 5 * 5 * 5 * 5 * 5,
>-            5 * 5 * 5 * 5 * 5 * 5 * 5 * 5 * 5,
>-            5 * 5 * 5 * 5 * 5 * 5 * 5 * 5 * 5 * 5,
>-            5 * 5 * 5 * 5 * 5 * 5 * 5 * 5 * 5 * 5 * 5,
>-            5 * 5 * 5 * 5 * 5 * 5 * 5 * 5 * 5 * 5 * 5 * 5
>-        };
>-        if (exp == 0) return *this;
>-        for (; exp >= 27; exp -= 27) *this *= RAPIDJSON_UINT64_C2(0X6765C793, 0XFA10079D); // 5^27
>-        for (; exp >= 13; exp -= 13) *this *= 1220703125u; // 5^13
>-        if (exp > 0)                 *this *= kPow5[exp - 1];
>-        return *this;
>-    }
>-
>-    // Compute absolute difference of this and rhs.
>-    // Return false if this < rhs
>-    bool Difference(const BigInteger& rhs, BigInteger* out) const {
>-        int cmp = Compare(rhs);
>-        if (cmp == 0) {
>-            *out = BigInteger(0);
>-            return false;
>-        }
>-        const BigInteger *a, *b;  // Makes a > b
>-        bool ret;
>-        if (cmp < 0) { a = &rhs; b = this; ret = true; }
>-        else         { a = this; b = &rhs; ret = false; }
>-
>-        Type borrow = 0;
>-        for (size_t i = 0; i < a->count_; i++) {
>-            Type d = a->digits_[i] - borrow;
>-            if (i < b->count_)
>-                d -= b->digits_[i];
>-            borrow = (d > a->digits_[i]) ? 1 : 0;
>-            out->digits_[i] = d;
>-            if (d != 0)
>-                out->count_ = i + 1;
>-        }
>-
>-        return ret;
>-    }
>-
>-    int Compare(const BigInteger& rhs) const {
>-        if (count_ != rhs.count_)
>-            return count_ < rhs.count_ ? -1 : 1;
>-
>-        for (size_t i = count_; i-- > 0;)
>-            if (digits_[i] != rhs.digits_[i])
>-                return digits_[i] < rhs.digits_[i] ? -1 : 1;
>-
>-        return 0;
>-    }
>-
>-    size_t GetCount() const { return count_; }
>-    Type GetDigit(size_t index) const { RAPIDJSON_ASSERT(index < count_); return digits_[index]; }
>-    bool IsZero() const { return count_ == 1 && digits_[0] == 0; }
>-
>-private:
>-    void AppendDecimal64(const char* begin, const char* end) {
>-        uint64_t u = ParseUint64(begin, end);
>-        if (IsZero())
>-            *this = u;
>-        else {
>-            unsigned exp = static_cast<unsigned>(end - begin);
>-            (MultiplyPow5(exp) <<= exp) += u;   // *this = *this * 10^exp + u
>-        }
>-    }
>-
>-    void PushBack(Type digit) {
>-        RAPIDJSON_ASSERT(count_ < kCapacity);
>-        digits_[count_++] = digit;
>-    }
>-
>-    static uint64_t ParseUint64(const char* begin, const char* end) {
>-        uint64_t r = 0;
>-        for (const char* p = begin; p != end; ++p) {
>-            RAPIDJSON_ASSERT(*p >= '0' && *p <= '9');
>-            r = r * 10 + (*p - '0');
>-        }
>-        return r;
>-    }
>-
>-    // Assume a * b + k < 2^128
>-    static uint64_t MulAdd64(uint64_t a, uint64_t b, uint64_t k, uint64_t* outHigh) {
>-#if defined(_MSC_VER) && defined(_M_AMD64)
>-        uint64_t low = _umul128(a, b, outHigh) + k;
>-        if (low < k)
>-            (*outHigh)++;
>-        return low;
>-#elif (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) && defined(__x86_64__)
>-        unsigned __int128 p = static_cast<unsigned __int128>(a) * static_cast<unsigned __int128>(b);
>-        p += k;
>-        *outHigh = p >> 64;
>-        return static_cast<uint64_t>(p);
>-#else
>-        const uint64_t a0 = a & 0xFFFFFFFF, a1 = a >> 32, b0 = b & 0xFFFFFFFF, b1 = b >> 32;
>-        uint64_t x0 = a0 * b0, x1 = a0 * b1, x2 = a1 * b0, x3 = a1 * b1;
>-        x1 += (x0 >> 32); // can't give carry
>-        x1 += x2;
>-        if (x1 < x2)
>-            x3 += (static_cast<uint64_t>(1) << 32);
>-        uint64_t lo = (x1 << 32) + (x0 & 0xFFFFFFFF);
>-        uint64_t hi = x3 + (x1 >> 32);
>-
>-        lo += k;
>-        if (lo < k)
>-            hi++;
>-        *outHigh = hi;
>-        return lo;
>-#endif
>-    }
>-
>-    static Type FullAdd(Type a, Type b, bool inCarry, bool* outCarry) {
>-        Type c = a + b + (inCarry ? 1 : 0);
>-        *outCarry = c < a;
>-        return c;
>-    }
>-
>-    static const size_t kBitCount = 3328;  // 64bit * 54 > 10^1000
>-    static const size_t kCapacity = kBitCount / sizeof(Type);
>-    static const size_t kTypeBit = sizeof(Type) * 8;
>-
>-    Type digits_[kCapacity];
>-    size_t count_;
>-};
>-
>-} // namespace internal
>-RAPIDJSON_NAMESPACE_END
>-
>-#endif // RAPIDJSON_BIGINTEGER_H_
>diff --git a/Source/ThirdParty/ANGLE/src/tests/third_party/rapidjson/include/rapidjson/internal/diyfp.h b/Source/ThirdParty/ANGLE/src/tests/third_party/rapidjson/include/rapidjson/internal/diyfp.h
>deleted file mode 100644
>index 174b9facfb0..00000000000
>--- a/Source/ThirdParty/ANGLE/src/tests/third_party/rapidjson/include/rapidjson/internal/diyfp.h
>+++ /dev/null
>@@ -1,268 +0,0 @@
>-// Copyright (C) 2011 Milo Yip
>-//
>-// Permission is hereby granted, free of charge, to any person obtaining a copy
>-// of this software and associated documentation files (the "Software"), to deal
>-// in the Software without restriction, including without limitation the rights
>-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
>-// copies of the Software, and to permit persons to whom the Software is
>-// furnished to do so, subject to the following conditions:
>-//
>-// The above copyright notice and this permission notice shall be included in
>-// all copies or substantial portions of the Software.
>-//
>-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
>-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
>-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
>-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
>-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
>-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
>-// THE SOFTWARE.
>-
>-// This is a C++ header-only implementation of Grisu2 algorithm from the publication:
>-// Loitsch, Florian. "Printing floating-point numbers quickly and accurately with
>-// integers." ACM Sigplan Notices 45.6 (2010): 233-243.
>-
>-#ifndef RAPIDJSON_DIYFP_H_
>-#define RAPIDJSON_DIYFP_H_
>-
>-#if defined(_MSC_VER)
>-#include <intrin.h>
>-#if defined(_M_AMD64)
>-#pragma intrinsic(_BitScanReverse64)
>-#endif
>-#endif
>-
>-RAPIDJSON_NAMESPACE_BEGIN
>-namespace internal {
>-
>-#ifdef __GNUC__
>-RAPIDJSON_DIAG_PUSH
>-RAPIDJSON_DIAG_OFF(effc++)
>-#endif
>-
>-struct DiyFp {
>-    DiyFp() {}
>-
>-    DiyFp(uint64_t fp, int exp) : f(fp), e(exp) {}
>-
>-    explicit DiyFp(double d) {
>-        union {
>-            double d;
>-            uint64_t u64;
>-        } u = { d };
>-
>-        int biased_e = (u.u64 & kDpExponentMask) >> kDpSignificandSize;
>-        uint64_t significand = (u.u64 & kDpSignificandMask);
>-        if (biased_e != 0) {
>-            f = significand + kDpHiddenBit;
>-            e = biased_e - kDpExponentBias;
>-        } 
>-        else {
>-            f = significand;
>-            e = kDpMinExponent + 1;
>-        }
>-    }
>-
>-    DiyFp operator-(const DiyFp& rhs) const {
>-        return DiyFp(f - rhs.f, e);
>-    }
>-
>-    DiyFp operator*(const DiyFp& rhs) const {
>-#if defined(_MSC_VER) && defined(_M_AMD64)
>-        uint64_t h;
>-        uint64_t l = _umul128(f, rhs.f, &h);
>-        if (l & (uint64_t(1) << 63)) // rounding
>-            h++;
>-        return DiyFp(h, e + rhs.e + 64);
>-#elif (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) && defined(__x86_64__)
>-        unsigned __int128 p = static_cast<unsigned __int128>(f) * static_cast<unsigned __int128>(rhs.f);
>-        uint64_t h = p >> 64;
>-        uint64_t l = static_cast<uint64_t>(p);
>-        if (l & (uint64_t(1) << 63)) // rounding
>-            h++;
>-        return DiyFp(h, e + rhs.e + 64);
>-#else
>-        const uint64_t M32 = 0xFFFFFFFF;
>-        const uint64_t a = f >> 32;
>-        const uint64_t b = f & M32;
>-        const uint64_t c = rhs.f >> 32;
>-        const uint64_t d = rhs.f & M32;
>-        const uint64_t ac = a * c;
>-        const uint64_t bc = b * c;
>-        const uint64_t ad = a * d;
>-        const uint64_t bd = b * d;
>-        uint64_t tmp = (bd >> 32) + (ad & M32) + (bc & M32);
>-        tmp += 1U << 31;  /// mult_round
>-        return DiyFp(ac + (ad >> 32) + (bc >> 32) + (tmp >> 32), e + rhs.e + 64);
>-#endif
>-    }
>-
>-    DiyFp Normalize() const {
>-#if defined(_MSC_VER) && defined(_M_AMD64)
>-        unsigned long index;
>-        _BitScanReverse64(&index, f);
>-        return DiyFp(f << (63 - index), e - (63 - index));
>-#elif defined(__GNUC__) && __GNUC__ >= 4
>-        int s = __builtin_clzll(f);
>-        return DiyFp(f << s, e - s);
>-#else
>-        DiyFp res = *this;
>-        while (!(res.f & (static_cast<uint64_t>(1) << 63))) {
>-            res.f <<= 1;
>-            res.e--;
>-        }
>-        return res;
>-#endif
>-    }
>-
>-    DiyFp NormalizeBoundary() const {
>-        DiyFp res = *this;
>-        while (!(res.f & (kDpHiddenBit << 1))) {
>-            res.f <<= 1;
>-            res.e--;
>-        }
>-        res.f <<= (kDiySignificandSize - kDpSignificandSize - 2);
>-        res.e = res.e - (kDiySignificandSize - kDpSignificandSize - 2);
>-        return res;
>-    }
>-
>-    void NormalizedBoundaries(DiyFp* minus, DiyFp* plus) const {
>-        DiyFp pl = DiyFp((f << 1) + 1, e - 1).NormalizeBoundary();
>-        DiyFp mi = (f == kDpHiddenBit) ? DiyFp((f << 2) - 1, e - 2) : DiyFp((f << 1) - 1, e - 1);
>-        mi.f <<= mi.e - pl.e;
>-        mi.e = pl.e;
>-        *plus = pl;
>-        *minus = mi;
>-    }
>-
>-    double ToDouble() const {
>-        union {
>-            double d;
>-            uint64_t u64;
>-        }u;
>-        uint64_t significand = f;
>-        int exponent = e;
>-        while (significand > kDpHiddenBit + kDpSignificandMask) {
>-            significand >>= 1;
>-            exponent++;
>-        }
>-        while (exponent > kDpDenormalExponent && (significand & kDpHiddenBit) == 0) {
>-            significand <<= 1;
>-            exponent--;
>-        }
>-        if (exponent >= kDpMaxExponent) {
>-            u.u64 = kDpExponentMask;    // Infinity
>-            return u.d;
>-        }
>-        else if (exponent < kDpDenormalExponent)
>-            return 0.0;
>-        const uint64_t be = (exponent == kDpDenormalExponent && (significand & kDpHiddenBit) == 0) ? 0 : 
>-            static_cast<uint64_t>(exponent + kDpExponentBias);
>-        u.u64 = (significand & kDpSignificandMask) | (be << kDpSignificandSize);
>-        return u.d;
>-    }
>-
>-    static const int kDiySignificandSize = 64;
>-    static const int kDpSignificandSize = 52;
>-    static const int kDpExponentBias = 0x3FF + kDpSignificandSize;
>-    static const int kDpMaxExponent = 0x7FF - kDpExponentBias;
>-    static const int kDpMinExponent = -kDpExponentBias;
>-    static const int kDpDenormalExponent = -kDpExponentBias + 1;
>-    static const uint64_t kDpExponentMask = RAPIDJSON_UINT64_C2(0x7FF00000, 0x00000000);
>-    static const uint64_t kDpSignificandMask = RAPIDJSON_UINT64_C2(0x000FFFFF, 0xFFFFFFFF);
>-    static const uint64_t kDpHiddenBit = RAPIDJSON_UINT64_C2(0x00100000, 0x00000000);
>-
>-    uint64_t f;
>-    int e;
>-};
>-
>-inline DiyFp GetCachedPowerByIndex(size_t index) {
>-    // 10^-348, 10^-340, ..., 10^340
>-    static const uint64_t kCachedPowers_F[] = {
>-        RAPIDJSON_UINT64_C2(0xfa8fd5a0, 0x081c0288), RAPIDJSON_UINT64_C2(0xbaaee17f, 0xa23ebf76),
>-        RAPIDJSON_UINT64_C2(0x8b16fb20, 0x3055ac76), RAPIDJSON_UINT64_C2(0xcf42894a, 0x5dce35ea),
>-        RAPIDJSON_UINT64_C2(0x9a6bb0aa, 0x55653b2d), RAPIDJSON_UINT64_C2(0xe61acf03, 0x3d1a45df),
>-        RAPIDJSON_UINT64_C2(0xab70fe17, 0xc79ac6ca), RAPIDJSON_UINT64_C2(0xff77b1fc, 0xbebcdc4f),
>-        RAPIDJSON_UINT64_C2(0xbe5691ef, 0x416bd60c), RAPIDJSON_UINT64_C2(0x8dd01fad, 0x907ffc3c),
>-        RAPIDJSON_UINT64_C2(0xd3515c28, 0x31559a83), RAPIDJSON_UINT64_C2(0x9d71ac8f, 0xada6c9b5),
>-        RAPIDJSON_UINT64_C2(0xea9c2277, 0x23ee8bcb), RAPIDJSON_UINT64_C2(0xaecc4991, 0x4078536d),
>-        RAPIDJSON_UINT64_C2(0x823c1279, 0x5db6ce57), RAPIDJSON_UINT64_C2(0xc2109436, 0x4dfb5637),
>-        RAPIDJSON_UINT64_C2(0x9096ea6f, 0x3848984f), RAPIDJSON_UINT64_C2(0xd77485cb, 0x25823ac7),
>-        RAPIDJSON_UINT64_C2(0xa086cfcd, 0x97bf97f4), RAPIDJSON_UINT64_C2(0xef340a98, 0x172aace5),
>-        RAPIDJSON_UINT64_C2(0xb23867fb, 0x2a35b28e), RAPIDJSON_UINT64_C2(0x84c8d4df, 0xd2c63f3b),
>-        RAPIDJSON_UINT64_C2(0xc5dd4427, 0x1ad3cdba), RAPIDJSON_UINT64_C2(0x936b9fce, 0xbb25c996),
>-        RAPIDJSON_UINT64_C2(0xdbac6c24, 0x7d62a584), RAPIDJSON_UINT64_C2(0xa3ab6658, 0x0d5fdaf6),
>-        RAPIDJSON_UINT64_C2(0xf3e2f893, 0xdec3f126), RAPIDJSON_UINT64_C2(0xb5b5ada8, 0xaaff80b8),
>-        RAPIDJSON_UINT64_C2(0x87625f05, 0x6c7c4a8b), RAPIDJSON_UINT64_C2(0xc9bcff60, 0x34c13053),
>-        RAPIDJSON_UINT64_C2(0x964e858c, 0x91ba2655), RAPIDJSON_UINT64_C2(0xdff97724, 0x70297ebd),
>-        RAPIDJSON_UINT64_C2(0xa6dfbd9f, 0xb8e5b88f), RAPIDJSON_UINT64_C2(0xf8a95fcf, 0x88747d94),
>-        RAPIDJSON_UINT64_C2(0xb9447093, 0x8fa89bcf), RAPIDJSON_UINT64_C2(0x8a08f0f8, 0xbf0f156b),
>-        RAPIDJSON_UINT64_C2(0xcdb02555, 0x653131b6), RAPIDJSON_UINT64_C2(0x993fe2c6, 0xd07b7fac),
>-        RAPIDJSON_UINT64_C2(0xe45c10c4, 0x2a2b3b06), RAPIDJSON_UINT64_C2(0xaa242499, 0x697392d3),
>-        RAPIDJSON_UINT64_C2(0xfd87b5f2, 0x8300ca0e), RAPIDJSON_UINT64_C2(0xbce50864, 0x92111aeb),
>-        RAPIDJSON_UINT64_C2(0x8cbccc09, 0x6f5088cc), RAPIDJSON_UINT64_C2(0xd1b71758, 0xe219652c),
>-        RAPIDJSON_UINT64_C2(0x9c400000, 0x00000000), RAPIDJSON_UINT64_C2(0xe8d4a510, 0x00000000),
>-        RAPIDJSON_UINT64_C2(0xad78ebc5, 0xac620000), RAPIDJSON_UINT64_C2(0x813f3978, 0xf8940984),
>-        RAPIDJSON_UINT64_C2(0xc097ce7b, 0xc90715b3), RAPIDJSON_UINT64_C2(0x8f7e32ce, 0x7bea5c70),
>-        RAPIDJSON_UINT64_C2(0xd5d238a4, 0xabe98068), RAPIDJSON_UINT64_C2(0x9f4f2726, 0x179a2245),
>-        RAPIDJSON_UINT64_C2(0xed63a231, 0xd4c4fb27), RAPIDJSON_UINT64_C2(0xb0de6538, 0x8cc8ada8),
>-        RAPIDJSON_UINT64_C2(0x83c7088e, 0x1aab65db), RAPIDJSON_UINT64_C2(0xc45d1df9, 0x42711d9a),
>-        RAPIDJSON_UINT64_C2(0x924d692c, 0xa61be758), RAPIDJSON_UINT64_C2(0xda01ee64, 0x1a708dea),
>-        RAPIDJSON_UINT64_C2(0xa26da399, 0x9aef774a), RAPIDJSON_UINT64_C2(0xf209787b, 0xb47d6b85),
>-        RAPIDJSON_UINT64_C2(0xb454e4a1, 0x79dd1877), RAPIDJSON_UINT64_C2(0x865b8692, 0x5b9bc5c2),
>-        RAPIDJSON_UINT64_C2(0xc83553c5, 0xc8965d3d), RAPIDJSON_UINT64_C2(0x952ab45c, 0xfa97a0b3),
>-        RAPIDJSON_UINT64_C2(0xde469fbd, 0x99a05fe3), RAPIDJSON_UINT64_C2(0xa59bc234, 0xdb398c25),
>-        RAPIDJSON_UINT64_C2(0xf6c69a72, 0xa3989f5c), RAPIDJSON_UINT64_C2(0xb7dcbf53, 0x54e9bece),
>-        RAPIDJSON_UINT64_C2(0x88fcf317, 0xf22241e2), RAPIDJSON_UINT64_C2(0xcc20ce9b, 0xd35c78a5),
>-        RAPIDJSON_UINT64_C2(0x98165af3, 0x7b2153df), RAPIDJSON_UINT64_C2(0xe2a0b5dc, 0x971f303a),
>-        RAPIDJSON_UINT64_C2(0xa8d9d153, 0x5ce3b396), RAPIDJSON_UINT64_C2(0xfb9b7cd9, 0xa4a7443c),
>-        RAPIDJSON_UINT64_C2(0xbb764c4c, 0xa7a44410), RAPIDJSON_UINT64_C2(0x8bab8eef, 0xb6409c1a),
>-        RAPIDJSON_UINT64_C2(0xd01fef10, 0xa657842c), RAPIDJSON_UINT64_C2(0x9b10a4e5, 0xe9913129),
>-        RAPIDJSON_UINT64_C2(0xe7109bfb, 0xa19c0c9d), RAPIDJSON_UINT64_C2(0xac2820d9, 0x623bf429),
>-        RAPIDJSON_UINT64_C2(0x80444b5e, 0x7aa7cf85), RAPIDJSON_UINT64_C2(0xbf21e440, 0x03acdd2d),
>-        RAPIDJSON_UINT64_C2(0x8e679c2f, 0x5e44ff8f), RAPIDJSON_UINT64_C2(0xd433179d, 0x9c8cb841),
>-        RAPIDJSON_UINT64_C2(0x9e19db92, 0xb4e31ba9), RAPIDJSON_UINT64_C2(0xeb96bf6e, 0xbadf77d9),
>-        RAPIDJSON_UINT64_C2(0xaf87023b, 0x9bf0ee6b)
>-    };
>-    static const int16_t kCachedPowers_E[] = {
>-        -1220, -1193, -1166, -1140, -1113, -1087, -1060, -1034, -1007,  -980,
>-        -954,  -927,  -901,  -874,  -847,  -821,  -794,  -768,  -741,  -715,
>-        -688,  -661,  -635,  -608,  -582,  -555,  -529,  -502,  -475,  -449,
>-        -422,  -396,  -369,  -343,  -316,  -289,  -263,  -236,  -210,  -183,
>-        -157,  -130,  -103,   -77,   -50,   -24,     3,    30,    56,    83,
>-        109,   136,   162,   189,   216,   242,   269,   295,   322,   348,
>-        375,   402,   428,   455,   481,   508,   534,   561,   588,   614,
>-        641,   667,   694,   720,   747,   774,   800,   827,   853,   880,
>-        907,   933,   960,   986,  1013,  1039,  1066
>-    };
>-    return DiyFp(kCachedPowers_F[index], kCachedPowers_E[index]);
>-}
>-    
>-inline DiyFp GetCachedPower(int e, int* K) {
>-
>-    //int k = static_cast<int>(ceil((-61 - e) * 0.30102999566398114)) + 374;
>-    double dk = (-61 - e) * 0.30102999566398114 + 347;  // dk must be positive, so can do ceiling in positive
>-    int k = static_cast<int>(dk);
>-    if (k != dk)
>-        k++;
>-
>-    unsigned index = static_cast<unsigned>((k >> 3) + 1);
>-    *K = -(-348 + static_cast<int>(index << 3));    // decimal exponent no need lookup table
>-
>-    return GetCachedPowerByIndex(index);
>-}
>-
>-inline DiyFp GetCachedPower10(int exp, int *outExp) {
>-     unsigned index = (exp + 348) / 8;
>-     *outExp = -348 + index * 8;
>-     return GetCachedPowerByIndex(index);
>- }
>-
>-#ifdef __GNUC__
>-RAPIDJSON_DIAG_POP
>-#endif
>-
>-} // namespace internal
>-RAPIDJSON_NAMESPACE_END
>-
>-#endif // RAPIDJSON_DIYFP_H_
>diff --git a/Source/ThirdParty/ANGLE/src/tests/third_party/rapidjson/include/rapidjson/internal/dtoa.h b/Source/ThirdParty/ANGLE/src/tests/third_party/rapidjson/include/rapidjson/internal/dtoa.h
>deleted file mode 100644
>index c0fa2b89085..00000000000
>--- a/Source/ThirdParty/ANGLE/src/tests/third_party/rapidjson/include/rapidjson/internal/dtoa.h
>+++ /dev/null
>@@ -1,225 +0,0 @@
>-// Copyright (C) 2011 Milo Yip
>-//
>-// Permission is hereby granted, free of charge, to any person obtaining a copy
>-// of this software and associated documentation files (the "Software"), to deal
>-// in the Software without restriction, including without limitation the rights
>-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
>-// copies of the Software, and to permit persons to whom the Software is
>-// furnished to do so, subject to the following conditions:
>-//
>-// The above copyright notice and this permission notice shall be included in
>-// all copies or substantial portions of the Software.
>-//
>-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
>-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
>-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
>-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
>-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
>-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
>-// THE SOFTWARE.
>-
>-// This is a C++ header-only implementation of Grisu2 algorithm from the publication:
>-// Loitsch, Florian. "Printing floating-point numbers quickly and accurately with
>-// integers." ACM Sigplan Notices 45.6 (2010): 233-243.
>-
>-#ifndef RAPIDJSON_DTOA_
>-#define RAPIDJSON_DTOA_
>-
>-#include "itoa.h" // GetDigitsLut()
>-#include "diyfp.h"
>-
>-RAPIDJSON_NAMESPACE_BEGIN
>-namespace internal {
>-
>-#ifdef __GNUC__
>-RAPIDJSON_DIAG_PUSH
>-RAPIDJSON_DIAG_OFF(effc++)
>-#endif
>-
>-inline void GrisuRound(char* buffer, int len, uint64_t delta, uint64_t rest, uint64_t ten_kappa, uint64_t wp_w) {
>-    while (rest < wp_w && delta - rest >= ten_kappa &&
>-           (rest + ten_kappa < wp_w ||  /// closer
>-            wp_w - rest > rest + ten_kappa - wp_w)) {
>-        buffer[len - 1]--;
>-        rest += ten_kappa;
>-    }
>-}
>-
>-inline unsigned CountDecimalDigit32(uint32_t n) {
>-    // Simple pure C++ implementation was faster than __builtin_clz version in this situation.
>-    if (n < 10) return 1;
>-    if (n < 100) return 2;
>-    if (n < 1000) return 3;
>-    if (n < 10000) return 4;
>-    if (n < 100000) return 5;
>-    if (n < 1000000) return 6;
>-    if (n < 10000000) return 7;
>-    if (n < 100000000) return 8;
>-    if (n < 1000000000) return 9;
>-    return 10;
>-}
>-
>-inline void DigitGen(const DiyFp& W, const DiyFp& Mp, uint64_t delta, char* buffer, int* len, int* K) {
>-    static const uint32_t kPow10[] = { 1, 10, 100, 1000, 10000, 100000, 1000000, 10000000, 100000000, 1000000000 };
>-    const DiyFp one(uint64_t(1) << -Mp.e, Mp.e);
>-    const DiyFp wp_w = Mp - W;
>-    uint32_t p1 = static_cast<uint32_t>(Mp.f >> -one.e);
>-    uint64_t p2 = Mp.f & (one.f - 1);
>-    int kappa = CountDecimalDigit32(p1);
>-    *len = 0;
>-
>-    while (kappa > 0) {
>-        uint32_t d;
>-        switch (kappa) {
>-            case 10: d = p1 / 1000000000; p1 %= 1000000000; break;
>-            case  9: d = p1 /  100000000; p1 %=  100000000; break;
>-            case  8: d = p1 /   10000000; p1 %=   10000000; break;
>-            case  7: d = p1 /    1000000; p1 %=    1000000; break;
>-            case  6: d = p1 /     100000; p1 %=     100000; break;
>-            case  5: d = p1 /      10000; p1 %=      10000; break;
>-            case  4: d = p1 /       1000; p1 %=       1000; break;
>-            case  3: d = p1 /        100; p1 %=        100; break;
>-            case  2: d = p1 /         10; p1 %=         10; break;
>-            case  1: d = p1;              p1 =           0; break;
>-            default: 
>-#if defined(_MSC_VER)
>-                __assume(0);
>-#elif __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 5)
>-                __builtin_unreachable();
>-#else
>-                d = 0;
>-#endif
>-        }
>-        if (d || *len)
>-            buffer[(*len)++] = static_cast<char>('0' + static_cast<char>(d));
>-        kappa--;
>-        uint64_t tmp = (static_cast<uint64_t>(p1) << -one.e) + p2;
>-        if (tmp <= delta) {
>-            *K += kappa;
>-            GrisuRound(buffer, *len, delta, tmp, static_cast<uint64_t>(kPow10[kappa]) << -one.e, wp_w.f);
>-            return;
>-        }
>-    }
>-
>-    // kappa = 0
>-    for (;;) {
>-        p2 *= 10;
>-        delta *= 10;
>-        char d = static_cast<char>(p2 >> -one.e);
>-        if (d || *len)
>-            buffer[(*len)++] = static_cast<char>('0' + d);
>-        p2 &= one.f - 1;
>-        kappa--;
>-        if (p2 < delta) {
>-            *K += kappa;
>-            GrisuRound(buffer, *len, delta, p2, one.f, wp_w.f * kPow10[-kappa]);
>-            return;
>-        }
>-    }
>-}
>-
>-inline void Grisu2(double value, char* buffer, int* length, int* K) {
>-    const DiyFp v(value);
>-    DiyFp w_m, w_p;
>-    v.NormalizedBoundaries(&w_m, &w_p);
>-
>-    const DiyFp c_mk = GetCachedPower(w_p.e, K);
>-    const DiyFp W = v.Normalize() * c_mk;
>-    DiyFp Wp = w_p * c_mk;
>-    DiyFp Wm = w_m * c_mk;
>-    Wm.f++;
>-    Wp.f--;
>-    DigitGen(W, Wp, Wp.f - Wm.f, buffer, length, K);
>-}
>-
>-inline char* WriteExponent(int K, char* buffer) {
>-    if (K < 0) {
>-        *buffer++ = '-';
>-        K = -K;
>-    }
>-
>-    if (K >= 100) {
>-        *buffer++ = static_cast<char>('0' + static_cast<char>(K / 100));
>-        K %= 100;
>-        const char* d = GetDigitsLut() + K * 2;
>-        *buffer++ = d[0];
>-        *buffer++ = d[1];
>-    }
>-    else if (K >= 10) {
>-        const char* d = GetDigitsLut() + K * 2;
>-        *buffer++ = d[0];
>-        *buffer++ = d[1];
>-    }
>-    else
>-        *buffer++ = static_cast<char>('0' + static_cast<char>(K));
>-
>-    return buffer;
>-}
>-
>-inline char* Prettify(char* buffer, int length, int k) {
>-    const int kk = length + k;  // 10^(kk-1) <= v < 10^kk
>-
>-    if (length <= kk && kk <= 21) {
>-        // 1234e7 -> 12340000000
>-        for (int i = length; i < kk; i++)
>-            buffer[i] = '0';
>-        buffer[kk] = '.';
>-        buffer[kk + 1] = '0';
>-        return &buffer[kk + 2];
>-    }
>-    else if (0 < kk && kk <= 21) {
>-        // 1234e-2 -> 12.34
>-        std::memmove(&buffer[kk + 1], &buffer[kk], length - kk);
>-        buffer[kk] = '.';
>-        return &buffer[length + 1];
>-    }
>-    else if (-6 < kk && kk <= 0) {
>-        // 1234e-6 -> 0.001234
>-        const int offset = 2 - kk;
>-        std::memmove(&buffer[offset], &buffer[0], length);
>-        buffer[0] = '0';
>-        buffer[1] = '.';
>-        for (int i = 2; i < offset; i++)
>-            buffer[i] = '0';
>-        return &buffer[length + offset];
>-    }
>-    else if (length == 1) {
>-        // 1e30
>-        buffer[1] = 'e';
>-        return WriteExponent(kk - 1, &buffer[2]);
>-    }
>-    else {
>-        // 1234e30 -> 1.234e33
>-        std::memmove(&buffer[2], &buffer[1], length - 1);
>-        buffer[1] = '.';
>-        buffer[length + 1] = 'e';
>-        return WriteExponent(kk - 1, &buffer[0 + length + 2]);
>-    }
>-}
>-
>-inline char* dtoa(double value, char* buffer) {
>-    if (value == 0) {
>-        buffer[0] = '0';
>-        buffer[1] = '.';
>-        buffer[2] = '0';
>-        return &buffer[3];
>-    }
>-    else {
>-        if (value < 0) {
>-            *buffer++ = '-';
>-            value = -value;
>-        }
>-        int length, K;
>-        Grisu2(value, buffer, &length, &K);
>-        return Prettify(buffer, length, K);
>-    }
>-}
>-
>-#ifdef __GNUC__
>-RAPIDJSON_DIAG_POP
>-#endif
>-
>-} // namespace internal
>-RAPIDJSON_NAMESPACE_END
>-
>-#endif // RAPIDJSON_DTOA_
>diff --git a/Source/ThirdParty/ANGLE/src/tests/third_party/rapidjson/include/rapidjson/internal/ieee754.h b/Source/ThirdParty/ANGLE/src/tests/third_party/rapidjson/include/rapidjson/internal/ieee754.h
>deleted file mode 100644
>index ab65cc9a820..00000000000
>--- a/Source/ThirdParty/ANGLE/src/tests/third_party/rapidjson/include/rapidjson/internal/ieee754.h
>+++ /dev/null
>@@ -1,90 +0,0 @@
>-// Copyright (C) 2011 Milo Yip
>-//
>-// Permission is hereby granted, free of charge, to any person obtaining a copy
>-// of this software and associated documentation files (the "Software"), to deal
>-// in the Software without restriction, including without limitation the rights
>-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
>-// copies of the Software, and to permit persons to whom the Software is
>-// furnished to do so, subject to the following conditions:
>-//
>-// The above copyright notice and this permission notice shall be included in
>-// all copies or substantial portions of the Software.
>-//
>-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
>-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
>-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
>-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
>-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
>-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
>-// THE SOFTWARE.
>-
>-#ifndef RAPIDJSON_IEEE754_
>-#define RAPIDJSON_IEEE754_
>-
>-#include "../rapidjson.h"
>-
>-RAPIDJSON_NAMESPACE_BEGIN
>-namespace internal {
>-
>-class Double {
>-public:
>-    Double() {}
>-    Double(double d) : d(d) {}
>-    Double(uint64_t u) : u(u) {}
>-
>-    double Value() const { return d; }
>-    uint64_t Uint64Value() const { return u; }
>-
>-    double NextPositiveDouble() const {
>-        RAPIDJSON_ASSERT(!Sign());
>-        return Double(u + 1).Value();
>-    }
>-
>-    double PreviousPositiveDouble() const {
>-        RAPIDJSON_ASSERT(!Sign());
>-        if (d == 0.0)
>-            return 0.0;
>-        else
>-            return Double(u - 1).Value();
>-    }
>-
>-    bool Sign() const { return (u & kSignMask) != 0; }
>-    uint64_t Significand() const { return u & kSignificandMask; }
>-    int Exponent() const { return ((u & kExponentMask) >> kSignificandSize) - kExponentBias; }
>-
>-    bool IsNan() const { return (u & kExponentMask) == kExponentMask && Significand() != 0; }
>-    bool IsInf() const { return (u & kExponentMask) == kExponentMask && Significand() == 0; }
>-    bool IsNormal() const { return (u & kExponentMask) != 0 || Significand() == 0; }
>-
>-    uint64_t IntegerSignificand() const { return IsNormal() ? Significand() | kHiddenBit : Significand(); }
>-    int IntegerExponent() const { return (IsNormal() ? Exponent() : kDenormalExponent) - kSignificandSize; }
>-    uint64_t ToBias() const { return (u & kSignMask) ? ~u + 1 : u | kSignMask; }
>-
>-    static unsigned EffectiveSignificandSize(int order) {
>-        if (order >= -1021)
>-            return 53;
>-        else if (order <= -1074)
>-            return 0;
>-        else
>-            return order + 1074;
>-    }
>-
>-private:
>-    static const int kSignificandSize = 52;
>-    static const int kExponentBias = 0x3FF;
>-    static const int kDenormalExponent = 1 - kExponentBias;
>-    static const uint64_t kSignMask = RAPIDJSON_UINT64_C2(0x80000000, 0x00000000);
>-    static const uint64_t kExponentMask = RAPIDJSON_UINT64_C2(0x7FF00000, 0x00000000);
>-    static const uint64_t kSignificandMask = RAPIDJSON_UINT64_C2(0x000FFFFF, 0xFFFFFFFF);
>-    static const uint64_t kHiddenBit = RAPIDJSON_UINT64_C2(0x00100000, 0x00000000);
>-
>-    union {
>-        double d;
>-        uint64_t u;
>-    };
>-};
>-
>-} // namespace internal
>-RAPIDJSON_NAMESPACE_END
>-
>-#endif // RAPIDJSON_IEEE754_
>diff --git a/Source/ThirdParty/ANGLE/src/tests/third_party/rapidjson/include/rapidjson/internal/itoa.h b/Source/ThirdParty/ANGLE/src/tests/third_party/rapidjson/include/rapidjson/internal/itoa.h
>deleted file mode 100644
>index 3684f07363f..00000000000
>--- a/Source/ThirdParty/ANGLE/src/tests/third_party/rapidjson/include/rapidjson/internal/itoa.h
>+++ /dev/null
>@@ -1,306 +0,0 @@
>-// Copyright (C) 2011 Milo Yip
>-//
>-// Permission is hereby granted, free of charge, to any person obtaining a copy
>-// of this software and associated documentation files (the "Software"), to deal
>-// in the Software without restriction, including without limitation the rights
>-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
>-// copies of the Software, and to permit persons to whom the Software is
>-// furnished to do so, subject to the following conditions:
>-//
>-// The above copyright notice and this permission notice shall be included in
>-// all copies or substantial portions of the Software.
>-//
>-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
>-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
>-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
>-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
>-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
>-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
>-// THE SOFTWARE.
>-
>-#ifndef RAPIDJSON_ITOA_
>-#define RAPIDJSON_ITOA_
>-
>-RAPIDJSON_NAMESPACE_BEGIN
>-namespace internal {
>-
>-inline const char* GetDigitsLut() {
>-    static const char cDigitsLut[200] = {
>-        '0','0','0','1','0','2','0','3','0','4','0','5','0','6','0','7','0','8','0','9',
>-        '1','0','1','1','1','2','1','3','1','4','1','5','1','6','1','7','1','8','1','9',
>-        '2','0','2','1','2','2','2','3','2','4','2','5','2','6','2','7','2','8','2','9',
>-        '3','0','3','1','3','2','3','3','3','4','3','5','3','6','3','7','3','8','3','9',
>-        '4','0','4','1','4','2','4','3','4','4','4','5','4','6','4','7','4','8','4','9',
>-        '5','0','5','1','5','2','5','3','5','4','5','5','5','6','5','7','5','8','5','9',
>-        '6','0','6','1','6','2','6','3','6','4','6','5','6','6','6','7','6','8','6','9',
>-        '7','0','7','1','7','2','7','3','7','4','7','5','7','6','7','7','7','8','7','9',
>-        '8','0','8','1','8','2','8','3','8','4','8','5','8','6','8','7','8','8','8','9',
>-        '9','0','9','1','9','2','9','3','9','4','9','5','9','6','9','7','9','8','9','9'
>-    };
>-    return cDigitsLut;
>-}
>-
>-inline char* u32toa(uint32_t value, char* buffer) {
>-    const char* cDigitsLut = GetDigitsLut();
>-
>-    if (value < 10000) {
>-        const uint32_t d1 = (value / 100) << 1;
>-        const uint32_t d2 = (value % 100) << 1;
>-        
>-        if (value >= 1000)
>-            *buffer++ = cDigitsLut[d1];
>-        if (value >= 100)
>-            *buffer++ = cDigitsLut[d1 + 1];
>-        if (value >= 10)
>-            *buffer++ = cDigitsLut[d2];
>-        *buffer++ = cDigitsLut[d2 + 1];
>-    }
>-    else if (value < 100000000) {
>-        // value = bbbbcccc
>-        const uint32_t b = value / 10000;
>-        const uint32_t c = value % 10000;
>-        
>-        const uint32_t d1 = (b / 100) << 1;
>-        const uint32_t d2 = (b % 100) << 1;
>-        
>-        const uint32_t d3 = (c / 100) << 1;
>-        const uint32_t d4 = (c % 100) << 1;
>-        
>-        if (value >= 10000000)
>-            *buffer++ = cDigitsLut[d1];
>-        if (value >= 1000000)
>-            *buffer++ = cDigitsLut[d1 + 1];
>-        if (value >= 100000)
>-            *buffer++ = cDigitsLut[d2];
>-        *buffer++ = cDigitsLut[d2 + 1];
>-        
>-        *buffer++ = cDigitsLut[d3];
>-        *buffer++ = cDigitsLut[d3 + 1];
>-        *buffer++ = cDigitsLut[d4];
>-        *buffer++ = cDigitsLut[d4 + 1];
>-    }
>-    else {
>-        // value = aabbbbcccc in decimal
>-        
>-        const uint32_t a = value / 100000000; // 1 to 42
>-        value %= 100000000;
>-        
>-        if (a >= 10) {
>-            const unsigned i = a << 1;
>-            *buffer++ = cDigitsLut[i];
>-            *buffer++ = cDigitsLut[i + 1];
>-        }
>-        else
>-            *buffer++ = static_cast<char>('0' + static_cast<char>(a));
>-
>-        const uint32_t b = value / 10000; // 0 to 9999
>-        const uint32_t c = value % 10000; // 0 to 9999
>-        
>-        const uint32_t d1 = (b / 100) << 1;
>-        const uint32_t d2 = (b % 100) << 1;
>-        
>-        const uint32_t d3 = (c / 100) << 1;
>-        const uint32_t d4 = (c % 100) << 1;
>-        
>-        *buffer++ = cDigitsLut[d1];
>-        *buffer++ = cDigitsLut[d1 + 1];
>-        *buffer++ = cDigitsLut[d2];
>-        *buffer++ = cDigitsLut[d2 + 1];
>-        *buffer++ = cDigitsLut[d3];
>-        *buffer++ = cDigitsLut[d3 + 1];
>-        *buffer++ = cDigitsLut[d4];
>-        *buffer++ = cDigitsLut[d4 + 1];
>-    }
>-    return buffer;
>-}
>-
>-inline char* i32toa(int32_t value, char* buffer) {
>-    if (value < 0) {
>-        *buffer++ = '-';
>-        value = -value;
>-    }
>-
>-    return u32toa(static_cast<uint32_t>(value), buffer);
>-}
>-
>-inline char* u64toa(uint64_t value, char* buffer) {
>-    const char* cDigitsLut = GetDigitsLut();
>-    const uint64_t  kTen8 = 100000000;
>-    const uint64_t  kTen9 = kTen8 * 10;
>-    const uint64_t kTen10 = kTen8 * 100;
>-    const uint64_t kTen11 = kTen8 * 1000;
>-    const uint64_t kTen12 = kTen8 * 10000;
>-    const uint64_t kTen13 = kTen8 * 100000;
>-    const uint64_t kTen14 = kTen8 * 1000000;
>-    const uint64_t kTen15 = kTen8 * 10000000;
>-    const uint64_t kTen16 = kTen8 * kTen8;
>-    
>-    if (value < kTen8) {
>-        uint32_t v = static_cast<uint32_t>(value);
>-        if (v < 10000) {
>-            const uint32_t d1 = (v / 100) << 1;
>-            const uint32_t d2 = (v % 100) << 1;
>-            
>-            if (v >= 1000)
>-                *buffer++ = cDigitsLut[d1];
>-            if (v >= 100)
>-                *buffer++ = cDigitsLut[d1 + 1];
>-            if (v >= 10)
>-                *buffer++ = cDigitsLut[d2];
>-            *buffer++ = cDigitsLut[d2 + 1];
>-        }
>-        else {
>-            // value = bbbbcccc
>-            const uint32_t b = v / 10000;
>-            const uint32_t c = v % 10000;
>-            
>-            const uint32_t d1 = (b / 100) << 1;
>-            const uint32_t d2 = (b % 100) << 1;
>-            
>-            const uint32_t d3 = (c / 100) << 1;
>-            const uint32_t d4 = (c % 100) << 1;
>-            
>-            if (value >= 10000000)
>-                *buffer++ = cDigitsLut[d1];
>-            if (value >= 1000000)
>-                *buffer++ = cDigitsLut[d1 + 1];
>-            if (value >= 100000)
>-                *buffer++ = cDigitsLut[d2];
>-            *buffer++ = cDigitsLut[d2 + 1];
>-            
>-            *buffer++ = cDigitsLut[d3];
>-            *buffer++ = cDigitsLut[d3 + 1];
>-            *buffer++ = cDigitsLut[d4];
>-            *buffer++ = cDigitsLut[d4 + 1];
>-        }
>-    }
>-    else if (value < kTen16) {
>-        const uint32_t v0 = static_cast<uint32_t>(value / kTen8);
>-        const uint32_t v1 = static_cast<uint32_t>(value % kTen8);
>-        
>-        const uint32_t b0 = v0 / 10000;
>-        const uint32_t c0 = v0 % 10000;
>-        
>-        const uint32_t d1 = (b0 / 100) << 1;
>-        const uint32_t d2 = (b0 % 100) << 1;
>-        
>-        const uint32_t d3 = (c0 / 100) << 1;
>-        const uint32_t d4 = (c0 % 100) << 1;
>-
>-        const uint32_t b1 = v1 / 10000;
>-        const uint32_t c1 = v1 % 10000;
>-        
>-        const uint32_t d5 = (b1 / 100) << 1;
>-        const uint32_t d6 = (b1 % 100) << 1;
>-        
>-        const uint32_t d7 = (c1 / 100) << 1;
>-        const uint32_t d8 = (c1 % 100) << 1;
>-
>-        if (value >= kTen15)
>-            *buffer++ = cDigitsLut[d1];
>-        if (value >= kTen14)
>-            *buffer++ = cDigitsLut[d1 + 1];
>-        if (value >= kTen13)
>-            *buffer++ = cDigitsLut[d2];
>-        if (value >= kTen12)
>-            *buffer++ = cDigitsLut[d2 + 1];
>-        if (value >= kTen11)
>-            *buffer++ = cDigitsLut[d3];
>-        if (value >= kTen10)
>-            *buffer++ = cDigitsLut[d3 + 1];
>-        if (value >= kTen9)
>-            *buffer++ = cDigitsLut[d4];
>-        if (value >= kTen8)
>-            *buffer++ = cDigitsLut[d4 + 1];
>-        
>-        *buffer++ = cDigitsLut[d5];
>-        *buffer++ = cDigitsLut[d5 + 1];
>-        *buffer++ = cDigitsLut[d6];
>-        *buffer++ = cDigitsLut[d6 + 1];
>-        *buffer++ = cDigitsLut[d7];
>-        *buffer++ = cDigitsLut[d7 + 1];
>-        *buffer++ = cDigitsLut[d8];
>-        *buffer++ = cDigitsLut[d8 + 1];
>-    }
>-    else {
>-        const uint32_t a = static_cast<uint32_t>(value / kTen16); // 1 to 1844
>-        value %= kTen16;
>-        
>-        if (a < 10)
>-            *buffer++ = static_cast<char>('0' + static_cast<char>(a));
>-        else if (a < 100) {
>-            const uint32_t i = a << 1;
>-            *buffer++ = cDigitsLut[i];
>-            *buffer++ = cDigitsLut[i + 1];
>-        }
>-        else if (a < 1000) {
>-            *buffer++ = static_cast<char>('0' + static_cast<char>(a / 100));
>-            
>-            const uint32_t i = (a % 100) << 1;
>-            *buffer++ = cDigitsLut[i];
>-            *buffer++ = cDigitsLut[i + 1];
>-        }
>-        else {
>-            const uint32_t i = (a / 100) << 1;
>-            const uint32_t j = (a % 100) << 1;
>-            *buffer++ = cDigitsLut[i];
>-            *buffer++ = cDigitsLut[i + 1];
>-            *buffer++ = cDigitsLut[j];
>-            *buffer++ = cDigitsLut[j + 1];
>-        }
>-        
>-        const uint32_t v0 = static_cast<uint32_t>(value / kTen8);
>-        const uint32_t v1 = static_cast<uint32_t>(value % kTen8);
>-        
>-        const uint32_t b0 = v0 / 10000;
>-        const uint32_t c0 = v0 % 10000;
>-        
>-        const uint32_t d1 = (b0 / 100) << 1;
>-        const uint32_t d2 = (b0 % 100) << 1;
>-        
>-        const uint32_t d3 = (c0 / 100) << 1;
>-        const uint32_t d4 = (c0 % 100) << 1;
>-        
>-        const uint32_t b1 = v1 / 10000;
>-        const uint32_t c1 = v1 % 10000;
>-        
>-        const uint32_t d5 = (b1 / 100) << 1;
>-        const uint32_t d6 = (b1 % 100) << 1;
>-        
>-        const uint32_t d7 = (c1 / 100) << 1;
>-        const uint32_t d8 = (c1 % 100) << 1;
>-        
>-        *buffer++ = cDigitsLut[d1];
>-        *buffer++ = cDigitsLut[d1 + 1];
>-        *buffer++ = cDigitsLut[d2];
>-        *buffer++ = cDigitsLut[d2 + 1];
>-        *buffer++ = cDigitsLut[d3];
>-        *buffer++ = cDigitsLut[d3 + 1];
>-        *buffer++ = cDigitsLut[d4];
>-        *buffer++ = cDigitsLut[d4 + 1];
>-        *buffer++ = cDigitsLut[d5];
>-        *buffer++ = cDigitsLut[d5 + 1];
>-        *buffer++ = cDigitsLut[d6];
>-        *buffer++ = cDigitsLut[d6 + 1];
>-        *buffer++ = cDigitsLut[d7];
>-        *buffer++ = cDigitsLut[d7 + 1];
>-        *buffer++ = cDigitsLut[d8];
>-        *buffer++ = cDigitsLut[d8 + 1];
>-    }
>-    
>-    return buffer;
>-}
>-
>-inline char* i64toa(int64_t value, char* buffer) {
>-    if (value < 0) {
>-        *buffer++ = '-';
>-        value = -value;
>-    }
>-
>-    return u64toa(static_cast<uint64_t>(value), buffer);
>-}
>-
>-} // namespace internal
>-RAPIDJSON_NAMESPACE_END
>-
>-#endif // RAPIDJSON_ITOA_
>diff --git a/Source/ThirdParty/ANGLE/src/tests/third_party/rapidjson/include/rapidjson/internal/meta.h b/Source/ThirdParty/ANGLE/src/tests/third_party/rapidjson/include/rapidjson/internal/meta.h
>deleted file mode 100644
>index c33f607d585..00000000000
>--- a/Source/ThirdParty/ANGLE/src/tests/third_party/rapidjson/include/rapidjson/internal/meta.h
>+++ /dev/null
>@@ -1,189 +0,0 @@
>-// Copyright (C) 2011 Milo Yip
>-//
>-// Permission is hereby granted, free of charge, to any person obtaining a copy
>-// of this software and associated documentation files (the "Software"), to deal
>-// in the Software without restriction, including without limitation the rights
>-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
>-// copies of the Software, and to permit persons to whom the Software is
>-// furnished to do so, subject to the following conditions:
>-//
>-// The above copyright notice and this permission notice shall be included in
>-// all copies or substantial portions of the Software.
>-//
>-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
>-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
>-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
>-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
>-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
>-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
>-// THE SOFTWARE.
>-
>-#ifndef RAPIDJSON_INTERNAL_META_H_
>-#define RAPIDJSON_INTERNAL_META_H_
>-
>-#ifndef RAPIDJSON_RAPIDJSON_H_
>-#error <rapidjson.h> not yet included. Do not include this file directly.
>-#endif
>-
>-#ifdef __GNUC__
>-RAPIDJSON_DIAG_PUSH
>-RAPIDJSON_DIAG_OFF(effc++)
>-#endif
>-#if defined(_MSC_VER)
>-RAPIDJSON_DIAG_PUSH
>-RAPIDJSON_DIAG_OFF(6334)
>-#endif
>-
>-#if RAPIDJSON_HAS_CXX11_TYPETRAITS
>-#include <type_traits>
>-#endif
>-
>-//@cond RAPIDJSON_INTERNAL
>-RAPIDJSON_NAMESPACE_BEGIN
>-namespace internal {
>-
>-// Helper to wrap/convert arbitrary types to void, useful for arbitrary type matching
>-template <typename T> struct Void { typedef void Type; };
>-
>-///////////////////////////////////////////////////////////////////////////////
>-// BoolType, TrueType, FalseType
>-//
>-template <bool Cond> struct BoolType {
>-    static const bool Value = Cond;
>-    typedef BoolType Type;
>-};
>-typedef BoolType<true> TrueType;
>-typedef BoolType<false> FalseType;
>-
>-
>-///////////////////////////////////////////////////////////////////////////////
>-// SelectIf, BoolExpr, NotExpr, AndExpr, OrExpr
>-//
>-
>-template <bool C> struct SelectIfImpl { template <typename T1, typename T2> struct Apply { typedef T1 Type; }; };
>-template <> struct SelectIfImpl<false> { template <typename T1, typename T2> struct Apply { typedef T2 Type; }; };
>-template <bool C, typename T1, typename T2> struct SelectIfCond : SelectIfImpl<C>::template Apply<T1,T2> {};
>-template <typename C, typename T1, typename T2> struct SelectIf : SelectIfCond<C::Value, T1, T2> {};
>-
>-template <bool Cond1, bool Cond2> struct AndExprCond : FalseType {};
>-template <> struct AndExprCond<true, true> : TrueType {};
>-template <bool Cond1, bool Cond2> struct OrExprCond : TrueType {};
>-template <> struct OrExprCond<false, false> : FalseType {};
>-
>-template <typename C> struct BoolExpr : SelectIf<C,TrueType,FalseType>::Type {};
>-template <typename C> struct NotExpr  : SelectIf<C,FalseType,TrueType>::Type {};
>-template <typename C1, typename C2> struct AndExpr : AndExprCond<C1::Value, C2::Value>::Type {};
>-template <typename C1, typename C2> struct OrExpr  : OrExprCond<C1::Value, C2::Value>::Type {};
>-
>-
>-///////////////////////////////////////////////////////////////////////////////
>-// AddConst, MaybeAddConst, RemoveConst
>-template <typename T> struct AddConst { typedef const T Type; };
>-template <bool Constify, typename T> struct MaybeAddConst : SelectIfCond<Constify, const T, T> {};
>-template <typename T> struct RemoveConst { typedef T Type; };
>-template <typename T> struct RemoveConst<const T> { typedef T Type; };
>-
>-
>-///////////////////////////////////////////////////////////////////////////////
>-// IsSame, IsConst, IsMoreConst, IsPointer
>-//
>-template <typename T, typename U> struct IsSame : FalseType {};
>-template <typename T> struct IsSame<T, T> : TrueType {};
>-
>-template <typename T> struct IsConst : FalseType {};
>-template <typename T> struct IsConst<const T> : TrueType {};
>-
>-template <typename CT, typename T>
>-struct IsMoreConst
>-    : AndExpr<IsSame<typename RemoveConst<CT>::Type, typename RemoveConst<T>::Type>,
>-              BoolType<IsConst<CT>::Value >= IsConst<T>::Value> >::Type {};
>-
>-template <typename T> struct IsPointer : FalseType {};
>-template <typename T> struct IsPointer<T*> : TrueType {};
>-
>-///////////////////////////////////////////////////////////////////////////////
>-// IsBaseOf
>-//
>-#if RAPIDJSON_HAS_CXX11_TYPETRAITS
>-
>-template <typename B, typename D> struct IsBaseOf
>-    : BoolType< ::std::is_base_of<B,D>::value> {};
>-
>-#else // simplified version adopted from Boost
>-
>-template<typename B, typename D> struct IsBaseOfImpl {
>-    RAPIDJSON_STATIC_ASSERT(sizeof(B) != 0);
>-    RAPIDJSON_STATIC_ASSERT(sizeof(D) != 0);
>-
>-    typedef char (&Yes)[1];
>-    typedef char (&No) [2];
>-
>-    template <typename T>
>-    static Yes Check(const D*, T);
>-    static No  Check(const B*, int);
>-
>-    struct Host {
>-        operator const B*() const;
>-        operator const D*();
>-    };
>-
>-    enum { Value = (sizeof(Check(Host(), 0)) == sizeof(Yes)) };
>-};
>-
>-template <typename B, typename D> struct IsBaseOf
>-    : OrExpr<IsSame<B, D>, BoolExpr<IsBaseOfImpl<B, D> > >::Type {};
>-
>-#endif // RAPIDJSON_HAS_CXX11_TYPETRAITS
>-
>-
>-//////////////////////////////////////////////////////////////////////////
>-// EnableIf / DisableIf
>-//
>-template <bool Condition, typename T = void> struct EnableIfCond  { typedef T Type; };
>-template <typename T> struct EnableIfCond<false, T> { /* empty */ };
>-
>-template <bool Condition, typename T = void> struct DisableIfCond { typedef T Type; };
>-template <typename T> struct DisableIfCond<true, T> { /* empty */ };
>-
>-template <typename Condition, typename T = void>
>-struct EnableIf : EnableIfCond<Condition::Value, T> {};
>-
>-template <typename Condition, typename T = void>
>-struct DisableIf : DisableIfCond<Condition::Value, T> {};
>-
>-// SFINAE helpers
>-struct SfinaeTag {};
>-template <typename T> struct RemoveSfinaeTag;
>-template <typename T> struct RemoveSfinaeTag<SfinaeTag&(*)(T)> { typedef T Type; };
>-
>-#define RAPIDJSON_REMOVEFPTR_(type) \
>-    typename ::RAPIDJSON_NAMESPACE::internal::RemoveSfinaeTag \
>-        < ::RAPIDJSON_NAMESPACE::internal::SfinaeTag&(*) type>::Type
>-
>-#define RAPIDJSON_ENABLEIF(cond) \
>-    typename ::RAPIDJSON_NAMESPACE::internal::EnableIf \
>-        <RAPIDJSON_REMOVEFPTR_(cond)>::Type * = NULL
>-
>-#define RAPIDJSON_DISABLEIF(cond) \
>-    typename ::RAPIDJSON_NAMESPACE::internal::DisableIf \
>-        <RAPIDJSON_REMOVEFPTR_(cond)>::Type * = NULL
>-
>-#define RAPIDJSON_ENABLEIF_RETURN(cond,returntype) \
>-    typename ::RAPIDJSON_NAMESPACE::internal::EnableIf \
>-        <RAPIDJSON_REMOVEFPTR_(cond), \
>-         RAPIDJSON_REMOVEFPTR_(returntype)>::Type
>-
>-#define RAPIDJSON_DISABLEIF_RETURN(cond,returntype) \
>-    typename ::RAPIDJSON_NAMESPACE::internal::DisableIf \
>-        <RAPIDJSON_REMOVEFPTR_(cond), \
>-         RAPIDJSON_REMOVEFPTR_(returntype)>::Type
>-
>-} // namespace internal
>-RAPIDJSON_NAMESPACE_END
>-//@endcond
>-
>-#if defined(__GNUC__) || defined(_MSC_VER)
>-RAPIDJSON_DIAG_POP
>-#endif
>-
>-#endif // RAPIDJSON_INTERNAL_META_H_
>diff --git a/Source/ThirdParty/ANGLE/src/tests/third_party/rapidjson/include/rapidjson/internal/pow10.h b/Source/ThirdParty/ANGLE/src/tests/third_party/rapidjson/include/rapidjson/internal/pow10.h
>deleted file mode 100644
>index 91cf6478ba2..00000000000
>--- a/Source/ThirdParty/ANGLE/src/tests/third_party/rapidjson/include/rapidjson/internal/pow10.h
>+++ /dev/null
>@@ -1,59 +0,0 @@
>-// Copyright (C) 2011 Milo Yip
>-//
>-// Permission is hereby granted, free of charge, to any person obtaining a copy
>-// of this software and associated documentation files (the "Software"), to deal
>-// in the Software without restriction, including without limitation the rights
>-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
>-// copies of the Software, and to permit persons to whom the Software is
>-// furnished to do so, subject to the following conditions:
>-//
>-// The above copyright notice and this permission notice shall be included in
>-// all copies or substantial portions of the Software.
>-//
>-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
>-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
>-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
>-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
>-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
>-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
>-// THE SOFTWARE.
>-
>-#ifndef RAPIDJSON_POW10_
>-#define RAPIDJSON_POW10_
>-
>-RAPIDJSON_NAMESPACE_BEGIN
>-namespace internal {
>-
>-//! Computes integer powers of 10 in double (10.0^n).
>-/*! This function uses lookup table for fast and accurate results.
>-    \param n non-negative exponent. Must <= 308.
>-    \return 10.0^n
>-*/
>-inline double Pow10(int n) {
>-    static const double e[] = { // 1e-0...1e308: 309 * 8 bytes = 2472 bytes
>-        1e+0,  
>-        1e+1,  1e+2,  1e+3,  1e+4,  1e+5,  1e+6,  1e+7,  1e+8,  1e+9,  1e+10, 1e+11, 1e+12, 1e+13, 1e+14, 1e+15, 1e+16, 1e+17, 1e+18, 1e+19, 1e+20, 
>-        1e+21, 1e+22, 1e+23, 1e+24, 1e+25, 1e+26, 1e+27, 1e+28, 1e+29, 1e+30, 1e+31, 1e+32, 1e+33, 1e+34, 1e+35, 1e+36, 1e+37, 1e+38, 1e+39, 1e+40,
>-        1e+41, 1e+42, 1e+43, 1e+44, 1e+45, 1e+46, 1e+47, 1e+48, 1e+49, 1e+50, 1e+51, 1e+52, 1e+53, 1e+54, 1e+55, 1e+56, 1e+57, 1e+58, 1e+59, 1e+60,
>-        1e+61, 1e+62, 1e+63, 1e+64, 1e+65, 1e+66, 1e+67, 1e+68, 1e+69, 1e+70, 1e+71, 1e+72, 1e+73, 1e+74, 1e+75, 1e+76, 1e+77, 1e+78, 1e+79, 1e+80,
>-        1e+81, 1e+82, 1e+83, 1e+84, 1e+85, 1e+86, 1e+87, 1e+88, 1e+89, 1e+90, 1e+91, 1e+92, 1e+93, 1e+94, 1e+95, 1e+96, 1e+97, 1e+98, 1e+99, 1e+100,
>-        1e+101,1e+102,1e+103,1e+104,1e+105,1e+106,1e+107,1e+108,1e+109,1e+110,1e+111,1e+112,1e+113,1e+114,1e+115,1e+116,1e+117,1e+118,1e+119,1e+120,
>-        1e+121,1e+122,1e+123,1e+124,1e+125,1e+126,1e+127,1e+128,1e+129,1e+130,1e+131,1e+132,1e+133,1e+134,1e+135,1e+136,1e+137,1e+138,1e+139,1e+140,
>-        1e+141,1e+142,1e+143,1e+144,1e+145,1e+146,1e+147,1e+148,1e+149,1e+150,1e+151,1e+152,1e+153,1e+154,1e+155,1e+156,1e+157,1e+158,1e+159,1e+160,
>-        1e+161,1e+162,1e+163,1e+164,1e+165,1e+166,1e+167,1e+168,1e+169,1e+170,1e+171,1e+172,1e+173,1e+174,1e+175,1e+176,1e+177,1e+178,1e+179,1e+180,
>-        1e+181,1e+182,1e+183,1e+184,1e+185,1e+186,1e+187,1e+188,1e+189,1e+190,1e+191,1e+192,1e+193,1e+194,1e+195,1e+196,1e+197,1e+198,1e+199,1e+200,
>-        1e+201,1e+202,1e+203,1e+204,1e+205,1e+206,1e+207,1e+208,1e+209,1e+210,1e+211,1e+212,1e+213,1e+214,1e+215,1e+216,1e+217,1e+218,1e+219,1e+220,
>-        1e+221,1e+222,1e+223,1e+224,1e+225,1e+226,1e+227,1e+228,1e+229,1e+230,1e+231,1e+232,1e+233,1e+234,1e+235,1e+236,1e+237,1e+238,1e+239,1e+240,
>-        1e+241,1e+242,1e+243,1e+244,1e+245,1e+246,1e+247,1e+248,1e+249,1e+250,1e+251,1e+252,1e+253,1e+254,1e+255,1e+256,1e+257,1e+258,1e+259,1e+260,
>-        1e+261,1e+262,1e+263,1e+264,1e+265,1e+266,1e+267,1e+268,1e+269,1e+270,1e+271,1e+272,1e+273,1e+274,1e+275,1e+276,1e+277,1e+278,1e+279,1e+280,
>-        1e+281,1e+282,1e+283,1e+284,1e+285,1e+286,1e+287,1e+288,1e+289,1e+290,1e+291,1e+292,1e+293,1e+294,1e+295,1e+296,1e+297,1e+298,1e+299,1e+300,
>-        1e+301,1e+302,1e+303,1e+304,1e+305,1e+306,1e+307,1e+308
>-    };
>-    RAPIDJSON_ASSERT(n >= 0 && n <= 308);
>-    return e[n];
>-}
>-
>-} // namespace internal
>-RAPIDJSON_NAMESPACE_END
>-
>-#endif // RAPIDJSON_POW10_
>diff --git a/Source/ThirdParty/ANGLE/src/tests/third_party/rapidjson/include/rapidjson/internal/stack.h b/Source/ThirdParty/ANGLE/src/tests/third_party/rapidjson/include/rapidjson/internal/stack.h
>deleted file mode 100644
>index 62ae7aa8044..00000000000
>--- a/Source/ThirdParty/ANGLE/src/tests/third_party/rapidjson/include/rapidjson/internal/stack.h
>+++ /dev/null
>@@ -1,183 +0,0 @@
>-// Copyright (C) 2011 Milo Yip
>-//
>-// Permission is hereby granted, free of charge, to any person obtaining a copy
>-// of this software and associated documentation files (the "Software"), to deal
>-// in the Software without restriction, including without limitation the rights
>-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
>-// copies of the Software, and to permit persons to whom the Software is
>-// furnished to do so, subject to the following conditions:
>-//
>-// The above copyright notice and this permission notice shall be included in
>-// all copies or substantial portions of the Software.
>-//
>-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
>-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
>-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
>-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
>-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
>-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
>-// THE SOFTWARE.
>-
>-#ifndef RAPIDJSON_INTERNAL_STACK_H_
>-#define RAPIDJSON_INTERNAL_STACK_H_
>-
>-RAPIDJSON_NAMESPACE_BEGIN
>-namespace internal {
>-
>-///////////////////////////////////////////////////////////////////////////////
>-// Stack
>-
>-//! A type-unsafe stack for storing different types of data.
>-/*! \tparam Allocator Allocator for allocating stack memory.
>-*/
>-template <typename Allocator>
>-class Stack {
>-public:
>-    // Optimization note: Do not allocate memory for stack_ in constructor.
>-    // Do it lazily when first Push() -> Expand() -> Resize().
>-    Stack(Allocator* allocator, size_t stackCapacity) : allocator_(allocator), ownAllocator_(0), stack_(0), stackTop_(0), stackEnd_(0), initialCapacity_(stackCapacity) {
>-        RAPIDJSON_ASSERT(stackCapacity > 0);
>-    }
>-
>-#if RAPIDJSON_HAS_CXX11_RVALUE_REFS
>-    Stack(Stack&& rhs)
>-        : allocator_(rhs.allocator_),
>-          ownAllocator_(rhs.ownAllocator_),
>-          stack_(rhs.stack_),
>-          stackTop_(rhs.stackTop_),
>-          stackEnd_(rhs.stackEnd_),
>-          initialCapacity_(rhs.initialCapacity_)
>-    {
>-        rhs.allocator_ = 0;
>-        rhs.ownAllocator_ = 0;
>-        rhs.stack_ = 0;
>-        rhs.stackTop_ = 0;
>-        rhs.stackEnd_ = 0;
>-        rhs.initialCapacity_ = 0;
>-    }
>-#endif
>-
>-    ~Stack() {
>-        Destroy();
>-    }
>-
>-#if RAPIDJSON_HAS_CXX11_RVALUE_REFS
>-    Stack& operator=(Stack&& rhs) {
>-        if (&rhs != this)
>-        {
>-            Destroy();
>-
>-            allocator_ = rhs.allocator_;
>-            ownAllocator_ = rhs.ownAllocator_;
>-            stack_ = rhs.stack_;
>-            stackTop_ = rhs.stackTop_;
>-            stackEnd_ = rhs.stackEnd_;
>-            initialCapacity_ = rhs.initialCapacity_;
>-
>-            rhs.allocator_ = 0;
>-            rhs.ownAllocator_ = 0;
>-            rhs.stack_ = 0;
>-            rhs.stackTop_ = 0;
>-            rhs.stackEnd_ = 0;
>-            rhs.initialCapacity_ = 0;
>-        }
>-        return *this;
>-    }
>-#endif
>-
>-    void Clear() { stackTop_ = stack_; }
>-
>-    void ShrinkToFit() { 
>-        if (Empty()) {
>-            // If the stack is empty, completely deallocate the memory.
>-            Allocator::Free(stack_);
>-            stack_ = 0;
>-            stackTop_ = 0;
>-            stackEnd_ = 0;
>-        }
>-        else
>-            Resize(GetSize());
>-    }
>-
>-    // Optimization note: try to minimize the size of this function for force inline.
>-    // Expansion is run very infrequently, so it is moved to another (probably non-inline) function.
>-    template<typename T>
>-    RAPIDJSON_FORCEINLINE T* Push(size_t count = 1) {
>-         // Expand the stack if needed
>-        if (stackTop_ + sizeof(T) * count >= stackEnd_)
>-            Expand<T>(count);
>-
>-        T* ret = reinterpret_cast<T*>(stackTop_);
>-        stackTop_ += sizeof(T) * count;
>-        return ret;
>-    }
>-
>-    template<typename T>
>-    T* Pop(size_t count) {
>-        RAPIDJSON_ASSERT(GetSize() >= count * sizeof(T));
>-        stackTop_ -= count * sizeof(T);
>-        return reinterpret_cast<T*>(stackTop_);
>-    }
>-
>-    template<typename T>
>-    T* Top() { 
>-        RAPIDJSON_ASSERT(GetSize() >= sizeof(T));
>-        return reinterpret_cast<T*>(stackTop_ - sizeof(T));
>-    }
>-
>-    template<typename T>
>-    T* Bottom() { return (T*)stack_; }
>-
>-    Allocator& GetAllocator() { return *allocator_; }
>-    bool Empty() const { return stackTop_ == stack_; }
>-    size_t GetSize() const { return static_cast<size_t>(stackTop_ - stack_); }
>-    size_t GetCapacity() const { return static_cast<size_t>(stackEnd_ - stack_); }
>-
>-private:
>-    template<typename T>
>-    void Expand(size_t count) {
>-        // Only expand the capacity if the current stack exists. Otherwise just create a stack with initial capacity.
>-        size_t newCapacity;
>-        if (stack_ == 0) {
>-            if (!allocator_)
>-                ownAllocator_ = allocator_ = RAPIDJSON_NEW(Allocator());
>-            newCapacity = initialCapacity_;
>-        } else {
>-            newCapacity = GetCapacity();
>-            newCapacity += (newCapacity + 1) / 2;
>-        }
>-        size_t newSize = GetSize() + sizeof(T) * count;
>-        if (newCapacity < newSize)
>-            newCapacity = newSize;
>-
>-        Resize(newCapacity);
>-    }
>-
>-    void Resize(size_t newCapacity) {
>-        const size_t size = GetSize();  // Backup the current size
>-        stack_ = (char*)allocator_->Realloc(stack_, GetCapacity(), newCapacity);
>-        stackTop_ = stack_ + size;
>-        stackEnd_ = stack_ + newCapacity;
>-    }
>-
>-    void Destroy() {
>-        Allocator::Free(stack_);
>-        RAPIDJSON_DELETE(ownAllocator_); // Only delete if it is owned by the stack
>-    }
>-
>-    // Prohibit copy constructor & assignment operator.
>-    Stack(const Stack&);
>-    Stack& operator=(const Stack&);
>-
>-    Allocator* allocator_;
>-    Allocator* ownAllocator_;
>-    char *stack_;
>-    char *stackTop_;
>-    char *stackEnd_;
>-    size_t initialCapacity_;
>-};
>-
>-} // namespace internal
>-RAPIDJSON_NAMESPACE_END
>-
>-#endif // RAPIDJSON_STACK_H_
>diff --git a/Source/ThirdParty/ANGLE/src/tests/third_party/rapidjson/include/rapidjson/internal/strfunc.h b/Source/ThirdParty/ANGLE/src/tests/third_party/rapidjson/include/rapidjson/internal/strfunc.h
>deleted file mode 100644
>index 734adc36dcb..00000000000
>--- a/Source/ThirdParty/ANGLE/src/tests/third_party/rapidjson/include/rapidjson/internal/strfunc.h
>+++ /dev/null
>@@ -1,43 +0,0 @@
>-// Copyright (C) 2011 Milo Yip
>-//
>-// Permission is hereby granted, free of charge, to any person obtaining a copy
>-// of this software and associated documentation files (the "Software"), to deal
>-// in the Software without restriction, including without limitation the rights
>-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
>-// copies of the Software, and to permit persons to whom the Software is
>-// furnished to do so, subject to the following conditions:
>-//
>-// The above copyright notice and this permission notice shall be included in
>-// all copies or substantial portions of the Software.
>-//
>-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
>-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
>-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
>-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
>-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
>-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
>-// THE SOFTWARE.
>-
>-#ifndef RAPIDJSON_INTERNAL_STRFUNC_H_
>-#define RAPIDJSON_INTERNAL_STRFUNC_H_
>-
>-RAPIDJSON_NAMESPACE_BEGIN
>-namespace internal {
>-
>-//! Custom strlen() which works on different character types.
>-/*! \tparam Ch Character type (e.g. char, wchar_t, short)
>-    \param s Null-terminated input string.
>-    \return Number of characters in the string. 
>-    \note This has the same semantics as strlen(), the return value is not number of Unicode codepoints.
>-*/
>-template <typename Ch>
>-inline SizeType StrLen(const Ch* s) {
>-    const Ch* p = s;
>-    while (*p) ++p;
>-    return SizeType(p - s);
>-}
>-
>-} // namespace internal
>-RAPIDJSON_NAMESPACE_END
>-
>-#endif // RAPIDJSON_INTERNAL_STRFUNC_H_
>diff --git a/Source/ThirdParty/ANGLE/src/tests/third_party/rapidjson/include/rapidjson/internal/strtod.h b/Source/ThirdParty/ANGLE/src/tests/third_party/rapidjson/include/rapidjson/internal/strtod.h
>deleted file mode 100644
>index 1fc6050eeb4..00000000000
>--- a/Source/ThirdParty/ANGLE/src/tests/third_party/rapidjson/include/rapidjson/internal/strtod.h
>+++ /dev/null
>@@ -1,285 +0,0 @@
>-// Copyright (C) 2011 Milo Yip
>-//
>-// Permission is hereby granted, free of charge, to any person obtaining a copy
>-// of this software and associated documentation files (the "Software"), to deal
>-// in the Software without restriction, including without limitation the rights
>-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
>-// copies of the Software, and to permit persons to whom the Software is
>-// furnished to do so, subject to the following conditions:
>-//
>-// The above copyright notice and this permission notice shall be included in
>-// all copies or substantial portions of the Software.
>-//
>-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
>-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
>-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
>-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
>-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
>-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
>-// THE SOFTWARE.
>-
>-#ifndef RAPIDJSON_STRTOD_
>-#define RAPIDJSON_STRTOD_
>-
>-#include "../rapidjson.h"
>-#include "ieee754.h"
>-#include "biginteger.h"
>-#include "diyfp.h"
>-#include "pow10.h"
>-
>-RAPIDJSON_NAMESPACE_BEGIN
>-namespace internal {
>-
>-inline double FastPath(double significand, int exp) {
>-    if (exp < -308)
>-        return 0.0;
>-    else if (exp >= 0)
>-        return significand * internal::Pow10(exp);
>-    else
>-        return significand / internal::Pow10(-exp);
>-}
>-
>-inline double StrtodNormalPrecision(double d, int p) {
>-    if (p < -308) {
>-        // Prevent expSum < -308, making Pow10(p) = 0
>-        d = FastPath(d, -308);
>-        d = FastPath(d, p + 308);
>-    }
>-    else
>-        d = FastPath(d, p);
>-    return d;
>-}
>-
>-template <typename T>
>-inline T Min3(T a, T b, T c) {
>-    T m = a;
>-    if (m > b) m = b;
>-    if (m > c) m = c;
>-    return m;
>-}
>-
>-inline int CheckWithinHalfULP(double b, const BigInteger& d, int dExp, bool* adjustToNegative) {
>-    const Double db(b);
>-    const uint64_t bInt = db.IntegerSignificand();
>-    const int bExp = db.IntegerExponent();
>-    const int hExp = bExp - 1;
>-
>-    int dS_Exp2 = 0, dS_Exp5 = 0, bS_Exp2 = 0, bS_Exp5 = 0, hS_Exp2 = 0, hS_Exp5 = 0;
>-
>-    // Adjust for decimal exponent
>-    if (dExp >= 0) {
>-        dS_Exp2 += dExp;
>-        dS_Exp5 += dExp;
>-    }
>-    else {
>-        bS_Exp2 -= dExp;
>-        bS_Exp5 -= dExp;
>-        hS_Exp2 -= dExp;
>-        hS_Exp5 -= dExp;
>-    }
>-
>-    // Adjust for binary exponent
>-    if (bExp >= 0)
>-        bS_Exp2 += bExp;
>-    else {
>-        dS_Exp2 -= bExp;
>-        hS_Exp2 -= bExp;
>-    }
>-
>-    // Adjust for half ulp exponent
>-    if (hExp >= 0)
>-        hS_Exp2 += hExp;
>-    else {
>-        dS_Exp2 -= hExp;
>-        bS_Exp2 -= hExp;
>-    }
>-
>-    // Remove common power of two factor from all three scaled values
>-    int common_Exp2 = Min3(dS_Exp2, bS_Exp2, hS_Exp2);
>-    dS_Exp2 -= common_Exp2;
>-    bS_Exp2 -= common_Exp2;
>-    hS_Exp2 -= common_Exp2;
>-
>-    BigInteger dS = d;
>-    dS.MultiplyPow5(dS_Exp5) <<= dS_Exp2;
>-
>-    BigInteger bS(bInt);
>-    bS.MultiplyPow5(bS_Exp5) <<= bS_Exp2;
>-
>-    BigInteger hS(1);
>-    hS.MultiplyPow5(hS_Exp5) <<= hS_Exp2;
>-
>-    BigInteger delta(0);
>-    *adjustToNegative = dS.Difference(bS, &delta);
>-
>-    int cmp = delta.Compare(hS);
>-    // If delta is within 1/2 ULP, check for special case when significand is power of two.
>-    // In this case, need to compare with 1/2h in the lower bound.
>-    if (cmp < 0 && *adjustToNegative && // within and dS < bS
>-        db.IsNormal() && (bInt & (bInt - 1)) == 0 && // Power of 2
>-        db.Uint64Value() != RAPIDJSON_UINT64_C2(0x00100000, 0x00000000)) // minimum normal number must not do this
>-    {
>-        delta <<= 1;
>-        return delta.Compare(hS);
>-    }
>-    return cmp;
>-}
>-
>-inline bool StrtodFast(double d, int p, double* result) {
>-    // Use fast path for string-to-double conversion if possible
>-    // see http://www.exploringbinary.com/fast-path-decimal-to-floating-point-conversion/
>-    if (p > 22  && p < 22 + 16) {
>-        // Fast Path Cases In Disguise
>-        d *= internal::Pow10(p - 22);
>-        p = 22;
>-    }
>-
>-    if (p >= -22 && p <= 22 && d <= 9007199254740991.0) { // 2^53 - 1
>-        *result = FastPath(d, p);
>-        return true;
>-    }
>-    else
>-        return false;
>-}
>-
>-// Compute an approximation and see if it is within 1/2 ULP
>-inline bool StrtodDiyFp(const char* decimals, size_t length, size_t decimalPosition, int exp, double* result) {
>-    uint64_t significand = 0;
>-    size_t i = 0;   // 2^64 - 1 = 18446744073709551615, 1844674407370955161 = 0x1999999999999999    
>-    for (; i < length; i++) {
>-        if (significand  >  RAPIDJSON_UINT64_C2(0x19999999, 0x99999999) ||
>-            (significand == RAPIDJSON_UINT64_C2(0x19999999, 0x99999999) && decimals[i] > '5'))
>-            break;
>-        significand = significand * 10 + (decimals[i] - '0');
>-    }
>-    
>-    if (i < length && decimals[i] >= '5') // Rounding
>-        significand++;
>-
>-    size_t remaining = length - i;
>-    const unsigned kUlpShift = 3;
>-    const unsigned kUlp = 1 << kUlpShift;
>-    int error = (remaining == 0) ? 0 : kUlp / 2;
>-
>-    DiyFp v(significand, 0);
>-    v = v.Normalize();
>-    error <<= -v.e;
>-
>-    const int dExp = (int)decimalPosition - (int)i + exp;
>-
>-    int actualExp;
>-    DiyFp cachedPower = GetCachedPower10(dExp, &actualExp);
>-    if (actualExp != dExp) {
>-        static const DiyFp kPow10[] = {
>-            DiyFp(RAPIDJSON_UINT64_C2(0xa0000000, 00000000), -60),  // 10^1
>-            DiyFp(RAPIDJSON_UINT64_C2(0xc8000000, 00000000), -57),  // 10^2
>-            DiyFp(RAPIDJSON_UINT64_C2(0xfa000000, 00000000), -54),  // 10^3
>-            DiyFp(RAPIDJSON_UINT64_C2(0x9c400000, 00000000), -50),  // 10^4
>-            DiyFp(RAPIDJSON_UINT64_C2(0xc3500000, 00000000), -47),  // 10^5
>-            DiyFp(RAPIDJSON_UINT64_C2(0xf4240000, 00000000), -44),  // 10^6
>-            DiyFp(RAPIDJSON_UINT64_C2(0x98968000, 00000000), -40)   // 10^7
>-        };
>-        int adjustment = dExp - actualExp - 1;
>-        RAPIDJSON_ASSERT(adjustment >= 0 && adjustment < 7);
>-        v = v * kPow10[adjustment];
>-        if (length + adjustment > 19) // has more digits than decimal digits in 64-bit
>-            error += kUlp / 2;
>-    }
>-
>-    v = v * cachedPower;
>-
>-    error += kUlp + (error == 0 ? 0 : 1);
>-
>-    const int oldExp = v.e;
>-    v = v.Normalize();
>-    error <<= oldExp - v.e;
>-
>-    const unsigned effectiveSignificandSize = Double::EffectiveSignificandSize(64 + v.e);
>-    unsigned precisionSize = 64 - effectiveSignificandSize;
>-    if (precisionSize + kUlpShift >= 64) {
>-        unsigned scaleExp = (precisionSize + kUlpShift) - 63;
>-        v.f >>= scaleExp;
>-        v.e += scaleExp; 
>-        error = (error >> scaleExp) + 1 + kUlp;
>-        precisionSize -= scaleExp;
>-    }
>-
>-    DiyFp rounded(v.f >> precisionSize, v.e + precisionSize);
>-    const uint64_t precisionBits = (v.f & ((uint64_t(1) << precisionSize) - 1)) * kUlp;
>-    const uint64_t halfWay = (uint64_t(1) << (precisionSize - 1)) * kUlp;
>-    if (precisionBits >= halfWay + error)
>-        rounded.f++;
>-
>-    *result = rounded.ToDouble();
>-
>-    return halfWay - error >= precisionBits || precisionBits >= halfWay + error;
>-}
>-
>-inline double StrtodBigInteger(double approx, const char* decimals, size_t length, size_t decimalPosition, int exp) {
>-    const BigInteger dInt(decimals, length);
>-    const int dExp = (int)decimalPosition - (int)length + exp;
>-    Double a(approx);
>-    for (int i = 0; i < 10; i++) {
>-        bool adjustToNegative;
>-        int cmp = CheckWithinHalfULP(a.Value(), dInt, dExp, &adjustToNegative);
>-        if (cmp < 0)
>-            return a.Value();  // within half ULP
>-        else if (cmp == 0) {
>-            // Round towards even
>-            if (a.Significand() & 1)
>-                return adjustToNegative ? a.PreviousPositiveDouble() : a.NextPositiveDouble();
>-            else
>-                return a.Value();
>-        }
>-        else // adjustment
>-            a = adjustToNegative ? a.PreviousPositiveDouble() : a.NextPositiveDouble();
>-    }
>-
>-    // This should not happen, but in case there is really a bug, break the infinite-loop
>-    return a.Value();
>-}
>-
>-inline double StrtodFullPrecision(double d, int p, const char* decimals, size_t length, size_t decimalPosition, int exp) {
>-    RAPIDJSON_ASSERT(d >= 0.0);
>-    RAPIDJSON_ASSERT(length >= 1);
>-
>-    double result;
>-    if (StrtodFast(d, p, &result))
>-        return result;
>-
>-    // Trim leading zeros
>-    while (*decimals == '0' && length > 1) {
>-        length--;
>-        decimals++;
>-        decimalPosition--;
>-    }
>-
>-    // Trim trailing zeros
>-    while (decimals[length - 1] == '0' && length > 1) {
>-        length--;
>-        decimalPosition--;
>-        exp++;
>-    }
>-
>-    // Trim right-most digits
>-    const int kMaxDecimalDigit = 780;
>-    if ((int)length > kMaxDecimalDigit) {
>-        exp += (int(length) - kMaxDecimalDigit);
>-        length = kMaxDecimalDigit;
>-    }
>-
>-    // If too small, underflow to zero
>-    if (int(length) + exp < -324)
>-        return 0.0;
>-
>-    if (StrtodDiyFp(decimals, length, decimalPosition, exp, &result))
>-        return result;
>-
>-    // Use approximation from StrtodDiyFp and make adjustment with BigInteger comparison
>-    return StrtodBigInteger(result, decimals, length, decimalPosition, exp);
>-}
>-
>-} // namespace internal
>-RAPIDJSON_NAMESPACE_END
>-
>-#endif // RAPIDJSON_STRTOD_
>diff --git a/Source/ThirdParty/ANGLE/src/tests/third_party/rapidjson/include/rapidjson/memorybuffer.h b/Source/ThirdParty/ANGLE/src/tests/third_party/rapidjson/include/rapidjson/memorybuffer.h
>deleted file mode 100644
>index 95c68a38710..00000000000
>--- a/Source/ThirdParty/ANGLE/src/tests/third_party/rapidjson/include/rapidjson/memorybuffer.h
>+++ /dev/null
>@@ -1,76 +0,0 @@
>-// Copyright (C) 2011 Milo Yip
>-//
>-// Permission is hereby granted, free of charge, to any person obtaining a copy
>-// of this software and associated documentation files (the "Software"), to deal
>-// in the Software without restriction, including without limitation the rights
>-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
>-// copies of the Software, and to permit persons to whom the Software is
>-// furnished to do so, subject to the following conditions:
>-//
>-// The above copyright notice and this permission notice shall be included in
>-// all copies or substantial portions of the Software.
>-//
>-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
>-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
>-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
>-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
>-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
>-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
>-// THE SOFTWARE.
>-
>-#ifndef RAPIDJSON_MEMORYBUFFER_H_
>-#define RAPIDJSON_MEMORYBUFFER_H_
>-
>-#include "rapidjson.h"
>-#include "internal/stack.h"
>-
>-RAPIDJSON_NAMESPACE_BEGIN
>-
>-//! Represents an in-memory output byte stream.
>-/*!
>-    This class is mainly for being wrapped by EncodedOutputStream or AutoUTFOutputStream.
>-
>-    It is similar to FileWriteBuffer but the destination is an in-memory buffer instead of a file.
>-
>-    Differences between MemoryBuffer and StringBuffer:
>-    1. StringBuffer has Encoding but MemoryBuffer is only a byte buffer. 
>-    2. StringBuffer::GetString() returns a null-terminated string. MemoryBuffer::GetBuffer() returns a buffer without terminator.
>-
>-    \tparam Allocator type for allocating memory buffer.
>-    \note implements Stream concept
>-*/
>-template <typename Allocator = CrtAllocator>
>-struct GenericMemoryBuffer {
>-    typedef char Ch; // byte
>-
>-    GenericMemoryBuffer(Allocator* allocator = 0, size_t capacity = kDefaultCapacity) : stack_(allocator, capacity) {}
>-
>-    void Put(Ch c) { *stack_.template Push<Ch>() = c; }
>-    void Flush() {}
>-
>-    void Clear() { stack_.Clear(); }
>-    void ShrinkToFit() { stack_.ShrinkToFit(); }
>-    Ch* Push(size_t count) { return stack_.template Push<Ch>(count); }
>-    void Pop(size_t count) { stack_.template Pop<Ch>(count); }
>-
>-    const Ch* GetBuffer() const {
>-        return stack_.template Bottom<Ch>();
>-    }
>-
>-    size_t GetSize() const { return stack_.GetSize(); }
>-
>-    static const size_t kDefaultCapacity = 256;
>-    mutable internal::Stack<Allocator> stack_;
>-};
>-
>-typedef GenericMemoryBuffer<> MemoryBuffer;
>-
>-//! Implement specialized version of PutN() with memset() for better performance.
>-template<>
>-inline void PutN(MemoryBuffer& memoryBuffer, char c, size_t n) {
>-    std::memset(memoryBuffer.stack_.Push<char>(n), c, n * sizeof(c));
>-}
>-
>-RAPIDJSON_NAMESPACE_END
>-
>-#endif // RAPIDJSON_MEMORYBUFFER_H_
>diff --git a/Source/ThirdParty/ANGLE/src/tests/third_party/rapidjson/include/rapidjson/memorystream.h b/Source/ThirdParty/ANGLE/src/tests/third_party/rapidjson/include/rapidjson/memorystream.h
>deleted file mode 100644
>index f994a12fc47..00000000000
>--- a/Source/ThirdParty/ANGLE/src/tests/third_party/rapidjson/include/rapidjson/memorystream.h
>+++ /dev/null
>@@ -1,67 +0,0 @@
>-// Copyright (C) 2011 Milo Yip
>-//
>-// Permission is hereby granted, free of charge, to any person obtaining a copy
>-// of this software and associated documentation files (the "Software"), to deal
>-// in the Software without restriction, including without limitation the rights
>-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
>-// copies of the Software, and to permit persons to whom the Software is
>-// furnished to do so, subject to the following conditions:
>-//
>-// The above copyright notice and this permission notice shall be included in
>-// all copies or substantial portions of the Software.
>-//
>-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
>-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
>-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
>-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
>-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
>-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
>-// THE SOFTWARE.
>-
>-#ifndef RAPIDJSON_MEMORYSTREAM_H_
>-#define RAPIDJSON_MEMORYSTREAM_H_
>-
>-#include "rapidjson.h"
>-
>-RAPIDJSON_NAMESPACE_BEGIN
>-
>-//! Represents an in-memory input byte stream.
>-/*!
>-    This class is mainly for being wrapped by EncodedInputStream or AutoUTFInputStream.
>-
>-    It is similar to FileReadBuffer but the source is an in-memory buffer instead of a file.
>-
>-    Differences between MemoryStream and StringStream:
>-    1. StringStream has encoding but MemoryStream is a byte stream.
>-    2. MemoryStream needs size of the source buffer and the buffer don't need to be null terminated. StringStream assume null-terminated string as source.
>-    3. MemoryStream supports Peek4() for encoding detection. StringStream is specified with an encoding so it should not have Peek4().
>-    \note implements Stream concept
>-*/
>-struct MemoryStream {
>-    typedef char Ch; // byte
>-
>-    MemoryStream(const Ch *src, size_t size) : src_(src), begin_(src), end_(src + size), size_(size) {}
>-
>-    Ch Peek() const { return (src_ == end_) ? '\0' : *src_; }
>-    Ch Take() { return (src_ == end_) ? '\0' : *src_++; }
>-    size_t Tell() const { return static_cast<size_t>(src_ - begin_); }
>-
>-    Ch* PutBegin() { RAPIDJSON_ASSERT(false); return 0; }
>-    void Put(Ch) { RAPIDJSON_ASSERT(false); }
>-    void Flush() { RAPIDJSON_ASSERT(false); }
>-    size_t PutEnd(Ch*) { RAPIDJSON_ASSERT(false); return 0; }
>-
>-    // For encoding detection only.
>-    const Ch* Peek4() const {
>-        return Tell() + 4 <= size_ ? src_ : 0;
>-    }
>-
>-    const Ch* src_;     //!< Current read position.
>-    const Ch* begin_;   //!< Original head of the string.
>-    const Ch* end_;     //!< End of stream.
>-    size_t size_;       //!< Size of the stream.
>-};
>-
>-RAPIDJSON_NAMESPACE_END
>-
>-#endif // RAPIDJSON_MEMORYBUFFER_H_
>diff --git a/Source/ThirdParty/ANGLE/src/tests/third_party/rapidjson/include/rapidjson/msinttypes/inttypes.h b/Source/ThirdParty/ANGLE/src/tests/third_party/rapidjson/include/rapidjson/msinttypes/inttypes.h
>deleted file mode 100644
>index af713c9adf5..00000000000
>--- a/Source/ThirdParty/ANGLE/src/tests/third_party/rapidjson/include/rapidjson/msinttypes/inttypes.h
>+++ /dev/null
>@@ -1,312 +0,0 @@
>-// ISO C9x  compliant inttypes.h for Microsoft Visual Studio
>-// Based on ISO/IEC 9899:TC2 Committee draft (May 6, 2005) WG14/N1124 
>-// 
>-//  Copyright (c) 2006-2013 Alexander Chemeris
>-// 
>-// Redistribution and use in source and binary forms, with or without
>-// modification, are permitted provided that the following conditions are met:
>-// 
>-//   1. Redistributions of source code must retain the above copyright notice,
>-//      this list of conditions and the following disclaimer.
>-// 
>-//   2. Redistributions in binary form must reproduce the above copyright
>-//      notice, this list of conditions and the following disclaimer in the
>-//      documentation and/or other materials provided with the distribution.
>-// 
>-//   3. Neither the name of the product nor the names of its contributors may
>-//      be used to endorse or promote products derived from this software
>-//      without specific prior written permission.
>-// 
>-// THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
>-// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
>-// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
>-// EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
>-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
>-// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
>-// OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, 
>-// WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
>-// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
>-// ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>-// 
>-///////////////////////////////////////////////////////////////////////////////
>-
>-#ifndef _MSC_VER // [
>-#error "Use this header only with Microsoft Visual C++ compilers!"
>-#endif // _MSC_VER ]
>-
>-#ifndef _MSC_INTTYPES_H_ // [
>-#define _MSC_INTTYPES_H_
>-
>-#if _MSC_VER > 1000
>-#pragma once
>-#endif
>-
>-#include "stdint.h"
>-
>-// miloyip: VC supports inttypes.h since VC2013
>-#if _MSC_VER >= 1800
>-#include <inttypes.h>
>-#else
>-
>-// 7.8 Format conversion of integer types
>-
>-typedef struct {
>-   intmax_t quot;
>-   intmax_t rem;
>-} imaxdiv_t;
>-
>-// 7.8.1 Macros for format specifiers
>-
>-#if !defined(__cplusplus) || defined(__STDC_FORMAT_MACROS) // [   See footnote 185 at page 198
>-
>-// The fprintf macros for signed integers are:
>-#define PRId8       "d"
>-#define PRIi8       "i"
>-#define PRIdLEAST8  "d"
>-#define PRIiLEAST8  "i"
>-#define PRIdFAST8   "d"
>-#define PRIiFAST8   "i"
>-
>-#define PRId16       "hd"
>-#define PRIi16       "hi"
>-#define PRIdLEAST16  "hd"
>-#define PRIiLEAST16  "hi"
>-#define PRIdFAST16   "hd"
>-#define PRIiFAST16   "hi"
>-
>-#define PRId32       "I32d"
>-#define PRIi32       "I32i"
>-#define PRIdLEAST32  "I32d"
>-#define PRIiLEAST32  "I32i"
>-#define PRIdFAST32   "I32d"
>-#define PRIiFAST32   "I32i"
>-
>-#define PRId64       "I64d"
>-#define PRIi64       "I64i"
>-#define PRIdLEAST64  "I64d"
>-#define PRIiLEAST64  "I64i"
>-#define PRIdFAST64   "I64d"
>-#define PRIiFAST64   "I64i"
>-
>-#define PRIdMAX     "I64d"
>-#define PRIiMAX     "I64i"
>-
>-#define PRIdPTR     "Id"
>-#define PRIiPTR     "Ii"
>-
>-// The fprintf macros for unsigned integers are:
>-#define PRIo8       "o"
>-#define PRIu8       "u"
>-#define PRIx8       "x"
>-#define PRIX8       "X"
>-#define PRIoLEAST8  "o"
>-#define PRIuLEAST8  "u"
>-#define PRIxLEAST8  "x"
>-#define PRIXLEAST8  "X"
>-#define PRIoFAST8   "o"
>-#define PRIuFAST8   "u"
>-#define PRIxFAST8   "x"
>-#define PRIXFAST8   "X"
>-
>-#define PRIo16       "ho"
>-#define PRIu16       "hu"
>-#define PRIx16       "hx"
>-#define PRIX16       "hX"
>-#define PRIoLEAST16  "ho"
>-#define PRIuLEAST16  "hu"
>-#define PRIxLEAST16  "hx"
>-#define PRIXLEAST16  "hX"
>-#define PRIoFAST16   "ho"
>-#define PRIuFAST16   "hu"
>-#define PRIxFAST16   "hx"
>-#define PRIXFAST16   "hX"
>-
>-#define PRIo32       "I32o"
>-#define PRIu32       "I32u"
>-#define PRIx32       "I32x"
>-#define PRIX32       "I32X"
>-#define PRIoLEAST32  "I32o"
>-#define PRIuLEAST32  "I32u"
>-#define PRIxLEAST32  "I32x"
>-#define PRIXLEAST32  "I32X"
>-#define PRIoFAST32   "I32o"
>-#define PRIuFAST32   "I32u"
>-#define PRIxFAST32   "I32x"
>-#define PRIXFAST32   "I32X"
>-
>-#define PRIo64       "I64o"
>-#define PRIu64       "I64u"
>-#define PRIx64       "I64x"
>-#define PRIX64       "I64X"
>-#define PRIoLEAST64  "I64o"
>-#define PRIuLEAST64  "I64u"
>-#define PRIxLEAST64  "I64x"
>-#define PRIXLEAST64  "I64X"
>-#define PRIoFAST64   "I64o"
>-#define PRIuFAST64   "I64u"
>-#define PRIxFAST64   "I64x"
>-#define PRIXFAST64   "I64X"
>-
>-#define PRIoMAX     "I64o"
>-#define PRIuMAX     "I64u"
>-#define PRIxMAX     "I64x"
>-#define PRIXMAX     "I64X"
>-
>-#define PRIoPTR     "Io"
>-#define PRIuPTR     "Iu"
>-#define PRIxPTR     "Ix"
>-#define PRIXPTR     "IX"
>-
>-// The fscanf macros for signed integers are:
>-#define SCNd8       "d"
>-#define SCNi8       "i"
>-#define SCNdLEAST8  "d"
>-#define SCNiLEAST8  "i"
>-#define SCNdFAST8   "d"
>-#define SCNiFAST8   "i"
>-
>-#define SCNd16       "hd"
>-#define SCNi16       "hi"
>-#define SCNdLEAST16  "hd"
>-#define SCNiLEAST16  "hi"
>-#define SCNdFAST16   "hd"
>-#define SCNiFAST16   "hi"
>-
>-#define SCNd32       "ld"
>-#define SCNi32       "li"
>-#define SCNdLEAST32  "ld"
>-#define SCNiLEAST32  "li"
>-#define SCNdFAST32   "ld"
>-#define SCNiFAST32   "li"
>-
>-#define SCNd64       "I64d"
>-#define SCNi64       "I64i"
>-#define SCNdLEAST64  "I64d"
>-#define SCNiLEAST64  "I64i"
>-#define SCNdFAST64   "I64d"
>-#define SCNiFAST64   "I64i"
>-
>-#define SCNdMAX     "I64d"
>-#define SCNiMAX     "I64i"
>-
>-#ifdef _WIN64 // [
>-#  define SCNdPTR     "I64d"
>-#  define SCNiPTR     "I64i"
>-#else  // _WIN64 ][
>-#  define SCNdPTR     "ld"
>-#  define SCNiPTR     "li"
>-#endif  // _WIN64 ]
>-
>-// The fscanf macros for unsigned integers are:
>-#define SCNo8       "o"
>-#define SCNu8       "u"
>-#define SCNx8       "x"
>-#define SCNX8       "X"
>-#define SCNoLEAST8  "o"
>-#define SCNuLEAST8  "u"
>-#define SCNxLEAST8  "x"
>-#define SCNXLEAST8  "X"
>-#define SCNoFAST8   "o"
>-#define SCNuFAST8   "u"
>-#define SCNxFAST8   "x"
>-#define SCNXFAST8   "X"
>-
>-#define SCNo16       "ho"
>-#define SCNu16       "hu"
>-#define SCNx16       "hx"
>-#define SCNX16       "hX"
>-#define SCNoLEAST16  "ho"
>-#define SCNuLEAST16  "hu"
>-#define SCNxLEAST16  "hx"
>-#define SCNXLEAST16  "hX"
>-#define SCNoFAST16   "ho"
>-#define SCNuFAST16   "hu"
>-#define SCNxFAST16   "hx"
>-#define SCNXFAST16   "hX"
>-
>-#define SCNo32       "lo"
>-#define SCNu32       "lu"
>-#define SCNx32       "lx"
>-#define SCNX32       "lX"
>-#define SCNoLEAST32  "lo"
>-#define SCNuLEAST32  "lu"
>-#define SCNxLEAST32  "lx"
>-#define SCNXLEAST32  "lX"
>-#define SCNoFAST32   "lo"
>-#define SCNuFAST32   "lu"
>-#define SCNxFAST32   "lx"
>-#define SCNXFAST32   "lX"
>-
>-#define SCNo64       "I64o"
>-#define SCNu64       "I64u"
>-#define SCNx64       "I64x"
>-#define SCNX64       "I64X"
>-#define SCNoLEAST64  "I64o"
>-#define SCNuLEAST64  "I64u"
>-#define SCNxLEAST64  "I64x"
>-#define SCNXLEAST64  "I64X"
>-#define SCNoFAST64   "I64o"
>-#define SCNuFAST64   "I64u"
>-#define SCNxFAST64   "I64x"
>-#define SCNXFAST64   "I64X"
>-
>-#define SCNoMAX     "I64o"
>-#define SCNuMAX     "I64u"
>-#define SCNxMAX     "I64x"
>-#define SCNXMAX     "I64X"
>-
>-#ifdef _WIN64 // [
>-#  define SCNoPTR     "I64o"
>-#  define SCNuPTR     "I64u"
>-#  define SCNxPTR     "I64x"
>-#  define SCNXPTR     "I64X"
>-#else  // _WIN64 ][
>-#  define SCNoPTR     "lo"
>-#  define SCNuPTR     "lu"
>-#  define SCNxPTR     "lx"
>-#  define SCNXPTR     "lX"
>-#endif  // _WIN64 ]
>-
>-#endif // __STDC_FORMAT_MACROS ]
>-
>-// 7.8.2 Functions for greatest-width integer types
>-
>-// 7.8.2.1 The imaxabs function
>-#define imaxabs _abs64
>-
>-// 7.8.2.2 The imaxdiv function
>-
>-// This is modified version of div() function from Microsoft's div.c found
>-// in %MSVC.NET%\crt\src\div.c
>-#ifdef STATIC_IMAXDIV // [
>-static
>-#else // STATIC_IMAXDIV ][
>-_inline
>-#endif // STATIC_IMAXDIV ]
>-imaxdiv_t __cdecl imaxdiv(intmax_t numer, intmax_t denom)
>-{
>-   imaxdiv_t result;
>-
>-   result.quot = numer / denom;
>-   result.rem = numer % denom;
>-
>-   if (numer < 0 && result.rem > 0) {
>-      // did division wrong; must fix up
>-      ++result.quot;
>-      result.rem -= denom;
>-   }
>-
>-   return result;
>-}
>-
>-// 7.8.2.3 The strtoimax and strtoumax functions
>-#define strtoimax _strtoi64
>-#define strtoumax _strtoui64
>-
>-// 7.8.2.4 The wcstoimax and wcstoumax functions
>-#define wcstoimax _wcstoi64
>-#define wcstoumax _wcstoui64
>-
>-#endif // _MSC_VER >= 1800
>-
>-#endif // _MSC_INTTYPES_H_ ]
>diff --git a/Source/ThirdParty/ANGLE/src/tests/third_party/rapidjson/include/rapidjson/msinttypes/stdint.h b/Source/ThirdParty/ANGLE/src/tests/third_party/rapidjson/include/rapidjson/msinttypes/stdint.h
>deleted file mode 100644
>index bbad95af159..00000000000
>--- a/Source/ThirdParty/ANGLE/src/tests/third_party/rapidjson/include/rapidjson/msinttypes/stdint.h
>+++ /dev/null
>@@ -1,296 +0,0 @@
>-// ISO C9x  compliant stdint.h for Microsoft Visual Studio
>-// Based on ISO/IEC 9899:TC2 Committee draft (May 6, 2005) WG14/N1124 
>-// 
>-//  Copyright (c) 2006-2013 Alexander Chemeris
>-// 
>-// Redistribution and use in source and binary forms, with or without
>-// modification, are permitted provided that the following conditions are met:
>-// 
>-//   1. Redistributions of source code must retain the above copyright notice,
>-//      this list of conditions and the following disclaimer.
>-// 
>-//   2. Redistributions in binary form must reproduce the above copyright
>-//      notice, this list of conditions and the following disclaimer in the
>-//      documentation and/or other materials provided with the distribution.
>-// 
>-//   3. Neither the name of the product nor the names of its contributors may
>-//      be used to endorse or promote products derived from this software
>-//      without specific prior written permission.
>-// 
>-// THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
>-// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
>-// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
>-// EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
>-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
>-// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
>-// OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, 
>-// WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
>-// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
>-// ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>-// 
>-///////////////////////////////////////////////////////////////////////////////
>-
>-#ifndef _MSC_VER // [
>-#error "Use this header only with Microsoft Visual C++ compilers!"
>-#endif // _MSC_VER ]
>-
>-#ifndef _MSC_STDINT_H_ // [
>-#define _MSC_STDINT_H_
>-
>-#if _MSC_VER > 1000
>-#pragma once
>-#endif
>-
>-// miloyip: Originally Visual Studio 2010 uses its own stdint.h. However it generates warning with INT64_C(), so change to use this file for vs2010.
>-#if _MSC_VER >= 1600 // [
>-#include <stdint.h>
>-
>-#if !defined(__cplusplus) || defined(__STDC_CONSTANT_MACROS) // [   See footnote 224 at page 260
>-
>-#undef INT8_C
>-#undef INT16_C
>-#undef INT32_C
>-#undef INT64_C
>-#undef UINT8_C
>-#undef UINT16_C
>-#undef UINT32_C
>-#undef UINT64_C
>-
>-// 7.18.4.1 Macros for minimum-width integer constants
>-
>-#define INT8_C(val)  val##i8
>-#define INT16_C(val) val##i16
>-#define INT32_C(val) val##i32
>-#define INT64_C(val) val##i64
>-
>-#define UINT8_C(val)  val##ui8
>-#define UINT16_C(val) val##ui16
>-#define UINT32_C(val) val##ui32
>-#define UINT64_C(val) val##ui64
>-
>-// 7.18.4.2 Macros for greatest-width integer constants
>-// These #ifndef's are needed to prevent collisions with <boost/cstdint.hpp>.
>-// Check out Issue 9 for the details.
>-#ifndef INTMAX_C //   [
>-#  define INTMAX_C   INT64_C
>-#endif // INTMAX_C    ]
>-#ifndef UINTMAX_C //  [
>-#  define UINTMAX_C  UINT64_C
>-#endif // UINTMAX_C   ]
>-
>-#endif // __STDC_CONSTANT_MACROS ]
>-
>-#else // ] _MSC_VER >= 1700 [
>-
>-#include <limits.h>
>-
>-// For Visual Studio 6 in C++ mode and for many Visual Studio versions when
>-// compiling for ARM we should wrap <wchar.h> include with 'extern "C++" {}'
>-// or compiler give many errors like this:
>-//   error C2733: second C linkage of overloaded function 'wmemchr' not allowed
>-#ifdef __cplusplus
>-extern "C" {
>-#endif
>-#  include <wchar.h>
>-#ifdef __cplusplus
>-}
>-#endif
>-
>-// Define _W64 macros to mark types changing their size, like intptr_t.
>-#ifndef _W64
>-#  if !defined(__midl) && (defined(_X86_) || defined(_M_IX86)) && _MSC_VER >= 1300
>-#     define _W64 __w64
>-#  else
>-#     define _W64
>-#  endif
>-#endif
>-
>-
>-// 7.18.1 Integer types
>-
>-// 7.18.1.1 Exact-width integer types
>-
>-// Visual Studio 6 and Embedded Visual C++ 4 doesn't
>-// realize that, e.g. char has the same size as __int8
>-// so we give up on __intX for them.
>-#if (_MSC_VER < 1300)
>-   typedef signed char       int8_t;
>-   typedef signed short      int16_t;
>-   typedef signed int        int32_t;
>-   typedef unsigned char     uint8_t;
>-   typedef unsigned short    uint16_t;
>-   typedef unsigned int      uint32_t;
>-#else
>-   typedef signed __int8     int8_t;
>-   typedef signed __int16    int16_t;
>-   typedef signed __int32    int32_t;
>-   typedef unsigned __int8   uint8_t;
>-   typedef unsigned __int16  uint16_t;
>-   typedef unsigned __int32  uint32_t;
>-#endif
>-typedef signed __int64       int64_t;
>-typedef unsigned __int64     uint64_t;
>-
>-
>-// 7.18.1.2 Minimum-width integer types
>-typedef int8_t    int_least8_t;
>-typedef int16_t   int_least16_t;
>-typedef int32_t   int_least32_t;
>-typedef int64_t   int_least64_t;
>-typedef uint8_t   uint_least8_t;
>-typedef uint16_t  uint_least16_t;
>-typedef uint32_t  uint_least32_t;
>-typedef uint64_t  uint_least64_t;
>-
>-// 7.18.1.3 Fastest minimum-width integer types
>-typedef int8_t    int_fast8_t;
>-typedef int16_t   int_fast16_t;
>-typedef int32_t   int_fast32_t;
>-typedef int64_t   int_fast64_t;
>-typedef uint8_t   uint_fast8_t;
>-typedef uint16_t  uint_fast16_t;
>-typedef uint32_t  uint_fast32_t;
>-typedef uint64_t  uint_fast64_t;
>-
>-// 7.18.1.4 Integer types capable of holding object pointers
>-#ifdef _WIN64 // [
>-   typedef signed __int64    intptr_t;
>-   typedef unsigned __int64  uintptr_t;
>-#else // _WIN64 ][
>-   typedef _W64 signed int   intptr_t;
>-   typedef _W64 unsigned int uintptr_t;
>-#endif // _WIN64 ]
>-
>-// 7.18.1.5 Greatest-width integer types
>-typedef int64_t   intmax_t;
>-typedef uint64_t  uintmax_t;
>-
>-
>-// 7.18.2 Limits of specified-width integer types
>-
>-#if !defined(__cplusplus) || defined(__STDC_LIMIT_MACROS) // [   See footnote 220 at page 257 and footnote 221 at page 259
>-
>-// 7.18.2.1 Limits of exact-width integer types
>-#define INT8_MIN     ((int8_t)_I8_MIN)
>-#define INT8_MAX     _I8_MAX
>-#define INT16_MIN    ((int16_t)_I16_MIN)
>-#define INT16_MAX    _I16_MAX
>-#define INT32_MIN    ((int32_t)_I32_MIN)
>-#define INT32_MAX    _I32_MAX
>-#define INT64_MIN    ((int64_t)_I64_MIN)
>-#define INT64_MAX    _I64_MAX
>-#define UINT8_MAX    _UI8_MAX
>-#define UINT16_MAX   _UI16_MAX
>-#define UINT32_MAX   _UI32_MAX
>-#define UINT64_MAX   _UI64_MAX
>-
>-// 7.18.2.2 Limits of minimum-width integer types
>-#define INT_LEAST8_MIN    INT8_MIN
>-#define INT_LEAST8_MAX    INT8_MAX
>-#define INT_LEAST16_MIN   INT16_MIN
>-#define INT_LEAST16_MAX   INT16_MAX
>-#define INT_LEAST32_MIN   INT32_MIN
>-#define INT_LEAST32_MAX   INT32_MAX
>-#define INT_LEAST64_MIN   INT64_MIN
>-#define INT_LEAST64_MAX   INT64_MAX
>-#define UINT_LEAST8_MAX   UINT8_MAX
>-#define UINT_LEAST16_MAX  UINT16_MAX
>-#define UINT_LEAST32_MAX  UINT32_MAX
>-#define UINT_LEAST64_MAX  UINT64_MAX
>-
>-// 7.18.2.3 Limits of fastest minimum-width integer types
>-#define INT_FAST8_MIN    INT8_MIN
>-#define INT_FAST8_MAX    INT8_MAX
>-#define INT_FAST16_MIN   INT16_MIN
>-#define INT_FAST16_MAX   INT16_MAX
>-#define INT_FAST32_MIN   INT32_MIN
>-#define INT_FAST32_MAX   INT32_MAX
>-#define INT_FAST64_MIN   INT64_MIN
>-#define INT_FAST64_MAX   INT64_MAX
>-#define UINT_FAST8_MAX   UINT8_MAX
>-#define UINT_FAST16_MAX  UINT16_MAX
>-#define UINT_FAST32_MAX  UINT32_MAX
>-#define UINT_FAST64_MAX  UINT64_MAX
>-
>-// 7.18.2.4 Limits of integer types capable of holding object pointers
>-#ifdef _WIN64 // [
>-#  define INTPTR_MIN   INT64_MIN
>-#  define INTPTR_MAX   INT64_MAX
>-#  define UINTPTR_MAX  UINT64_MAX
>-#else // _WIN64 ][
>-#  define INTPTR_MIN   INT32_MIN
>-#  define INTPTR_MAX   INT32_MAX
>-#  define UINTPTR_MAX  UINT32_MAX
>-#endif // _WIN64 ]
>-
>-// 7.18.2.5 Limits of greatest-width integer types
>-#define INTMAX_MIN   INT64_MIN
>-#define INTMAX_MAX   INT64_MAX
>-#define UINTMAX_MAX  UINT64_MAX
>-
>-// 7.18.3 Limits of other integer types
>-
>-#ifdef _WIN64 // [
>-#  define PTRDIFF_MIN  _I64_MIN
>-#  define PTRDIFF_MAX  _I64_MAX
>-#else  // _WIN64 ][
>-#  define PTRDIFF_MIN  _I32_MIN
>-#  define PTRDIFF_MAX  _I32_MAX
>-#endif  // _WIN64 ]
>-
>-#define SIG_ATOMIC_MIN  INT_MIN
>-#define SIG_ATOMIC_MAX  INT_MAX
>-
>-#ifndef SIZE_MAX // [
>-#  ifdef _WIN64 // [
>-#     define SIZE_MAX  _UI64_MAX
>-#  else // _WIN64 ][
>-#     define SIZE_MAX  _UI32_MAX
>-#  endif // _WIN64 ]
>-#endif // SIZE_MAX ]
>-
>-// WCHAR_MIN and WCHAR_MAX are also defined in <wchar.h>
>-#ifndef WCHAR_MIN // [
>-#  define WCHAR_MIN  0
>-#endif  // WCHAR_MIN ]
>-#ifndef WCHAR_MAX // [
>-#  define WCHAR_MAX  _UI16_MAX
>-#endif  // WCHAR_MAX ]
>-
>-#define WINT_MIN  0
>-#define WINT_MAX  _UI16_MAX
>-
>-#endif // __STDC_LIMIT_MACROS ]
>-
>-
>-// 7.18.4 Limits of other integer types
>-
>-#if !defined(__cplusplus) || defined(__STDC_CONSTANT_MACROS) // [   See footnote 224 at page 260
>-
>-// 7.18.4.1 Macros for minimum-width integer constants
>-
>-#define INT8_C(val)  val##i8
>-#define INT16_C(val) val##i16
>-#define INT32_C(val) val##i32
>-#define INT64_C(val) val##i64
>-
>-#define UINT8_C(val)  val##ui8
>-#define UINT16_C(val) val##ui16
>-#define UINT32_C(val) val##ui32
>-#define UINT64_C(val) val##ui64
>-
>-// 7.18.4.2 Macros for greatest-width integer constants
>-// These #ifndef's are needed to prevent collisions with <boost/cstdint.hpp>.
>-// Check out Issue 9 for the details.
>-#ifndef INTMAX_C //   [
>-#  define INTMAX_C   INT64_C
>-#endif // INTMAX_C    ]
>-#ifndef UINTMAX_C //  [
>-#  define UINTMAX_C  UINT64_C
>-#endif // UINTMAX_C   ]
>-
>-#endif // __STDC_CONSTANT_MACROS ]
>-
>-#endif // _MSC_VER >= 1600 ]
>-
>-#endif // _MSC_STDINT_H_ ]
>diff --git a/Source/ThirdParty/ANGLE/src/tests/third_party/rapidjson/include/rapidjson/prettywriter.h b/Source/ThirdParty/ANGLE/src/tests/third_party/rapidjson/include/rapidjson/prettywriter.h
>deleted file mode 100644
>index 1d7c70f02d8..00000000000
>--- a/Source/ThirdParty/ANGLE/src/tests/third_party/rapidjson/include/rapidjson/prettywriter.h
>+++ /dev/null
>@@ -1,205 +0,0 @@
>-// Copyright (C) 2011 Milo Yip
>-//
>-// Permission is hereby granted, free of charge, to any person obtaining a copy
>-// of this software and associated documentation files (the "Software"), to deal
>-// in the Software without restriction, including without limitation the rights
>-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
>-// copies of the Software, and to permit persons to whom the Software is
>-// furnished to do so, subject to the following conditions:
>-//
>-// The above copyright notice and this permission notice shall be included in
>-// all copies or substantial portions of the Software.
>-//
>-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
>-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
>-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
>-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
>-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
>-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
>-// THE SOFTWARE.
>-
>-#ifndef RAPIDJSON_PRETTYWRITER_H_
>-#define RAPIDJSON_PRETTYWRITER_H_
>-
>-#include "writer.h"
>-
>-#ifdef __GNUC__
>-RAPIDJSON_DIAG_PUSH
>-RAPIDJSON_DIAG_OFF(effc++)
>-#endif
>-
>-RAPIDJSON_NAMESPACE_BEGIN
>-
>-//! Writer with indentation and spacing.
>-/*!
>-    \tparam OutputStream Type of ouptut os.
>-    \tparam SourceEncoding Encoding of source string.
>-    \tparam TargetEncoding Encoding of output stream.
>-    \tparam StackAllocator Type of allocator for allocating memory of stack.
>-*/
>-template<typename OutputStream, typename SourceEncoding = UTF8<>, typename TargetEncoding = UTF8<>, typename StackAllocator = CrtAllocator>
>-class PrettyWriter : public Writer<OutputStream, SourceEncoding, TargetEncoding, StackAllocator> {
>-public:
>-    typedef Writer<OutputStream, SourceEncoding, TargetEncoding, StackAllocator> Base;
>-    typedef typename Base::Ch Ch;
>-
>-    //! Constructor
>-    /*! \param os Output stream.
>-        \param allocator User supplied allocator. If it is null, it will create a private one.
>-        \param levelDepth Initial capacity of stack.
>-    */
>-    PrettyWriter(OutputStream& os, StackAllocator* allocator = 0, size_t levelDepth = Base::kDefaultLevelDepth) : 
>-        Base(os, allocator, levelDepth), indentChar_(' '), indentCharCount_(4) {}
>-
>-    //! Set custom indentation.
>-    /*! \param indentChar       Character for indentation. Must be whitespace character (' ', '\\t', '\\n', '\\r').
>-        \param indentCharCount  Number of indent characters for each indentation level.
>-        \note The default indentation is 4 spaces.
>-    */
>-    PrettyWriter& SetIndent(Ch indentChar, unsigned indentCharCount) {
>-        RAPIDJSON_ASSERT(indentChar == ' ' || indentChar == '\t' || indentChar == '\n' || indentChar == '\r');
>-        indentChar_ = indentChar;
>-        indentCharCount_ = indentCharCount;
>-        return *this;
>-    }
>-
>-    /*! @name Implementation of Handler
>-        \see Handler
>-    */
>-    //@{
>-
>-    bool Null()                 { PrettyPrefix(kNullType);   return Base::WriteNull(); }
>-    bool Bool(bool b)           { PrettyPrefix(b ? kTrueType : kFalseType); return Base::WriteBool(b); }
>-    bool Int(int i)             { PrettyPrefix(kNumberType); return Base::WriteInt(i); }
>-    bool Uint(unsigned u)       { PrettyPrefix(kNumberType); return Base::WriteUint(u); }
>-    bool Int64(int64_t i64)     { PrettyPrefix(kNumberType); return Base::WriteInt64(i64); }
>-    bool Uint64(uint64_t u64)   { PrettyPrefix(kNumberType); return Base::WriteUint64(u64);  }
>-    bool Double(double d)       { PrettyPrefix(kNumberType); return Base::WriteDouble(d); }
>-
>-    bool String(const Ch* str, SizeType length, bool copy = false) {
>-        (void)copy;
>-        PrettyPrefix(kStringType);
>-        return Base::WriteString(str, length);
>-    }
>-
>-    bool StartObject() {
>-        PrettyPrefix(kObjectType);
>-        new (Base::level_stack_.template Push<typename Base::Level>()) typename Base::Level(false);
>-        return Base::WriteStartObject();
>-    }
>-
>-    bool Key(const Ch* str, SizeType length, bool copy = false) { return String(str, length, copy); }
>-    
>-    bool EndObject(SizeType memberCount = 0) {
>-        (void)memberCount;
>-        RAPIDJSON_ASSERT(Base::level_stack_.GetSize() >= sizeof(typename Base::Level));
>-        RAPIDJSON_ASSERT(!Base::level_stack_.template Top<typename Base::Level>()->inArray);
>-        bool empty = Base::level_stack_.template Pop<typename Base::Level>(1)->valueCount == 0;
>-
>-        if (!empty) {
>-            Base::os_->Put('\n');
>-            WriteIndent();
>-        }
>-        if (!Base::WriteEndObject())
>-            return false;
>-        if (Base::level_stack_.Empty()) // end of json text
>-            Base::os_->Flush();
>-        return true;
>-    }
>-
>-    bool StartArray() {
>-        PrettyPrefix(kArrayType);
>-        new (Base::level_stack_.template Push<typename Base::Level>()) typename Base::Level(true);
>-        return Base::WriteStartArray();
>-    }
>-
>-    bool EndArray(SizeType memberCount = 0) {
>-        (void)memberCount;
>-        RAPIDJSON_ASSERT(Base::level_stack_.GetSize() >= sizeof(typename Base::Level));
>-        RAPIDJSON_ASSERT(Base::level_stack_.template Top<typename Base::Level>()->inArray);
>-        bool empty = Base::level_stack_.template Pop<typename Base::Level>(1)->valueCount == 0;
>-
>-        if (!empty) {
>-            Base::os_->Put('\n');
>-            WriteIndent();
>-        }
>-        if (!Base::WriteEndArray())
>-            return false;
>-        if (Base::level_stack_.Empty()) // end of json text
>-            Base::os_->Flush();
>-        return true;
>-    }
>-
>-    //@}
>-
>-    /*! @name Convenience extensions */
>-    //@{
>-
>-    //! Simpler but slower overload.
>-    bool String(const Ch* str) { return String(str, internal::StrLen(str)); }
>-    bool Key(const Ch* str) { return Key(str, internal::StrLen(str)); }
>-
>-    //@}
>-protected:
>-    void PrettyPrefix(Type type) {
>-        (void)type;
>-        if (Base::level_stack_.GetSize() != 0) { // this value is not at root
>-            typename Base::Level* level = Base::level_stack_.template Top<typename Base::Level>();
>-
>-            if (level->inArray) {
>-                if (level->valueCount > 0) {
>-                    Base::os_->Put(','); // add comma if it is not the first element in array
>-                    Base::os_->Put('\n');
>-                }
>-                else
>-                    Base::os_->Put('\n');
>-                WriteIndent();
>-            }
>-            else {  // in object
>-                if (level->valueCount > 0) {
>-                    if (level->valueCount % 2 == 0) {
>-                        Base::os_->Put(',');
>-                        Base::os_->Put('\n');
>-                    }
>-                    else {
>-                        Base::os_->Put(':');
>-                        Base::os_->Put(' ');
>-                    }
>-                }
>-                else
>-                    Base::os_->Put('\n');
>-
>-                if (level->valueCount % 2 == 0)
>-                    WriteIndent();
>-            }
>-            if (!level->inArray && level->valueCount % 2 == 0)
>-                RAPIDJSON_ASSERT(type == kStringType);  // if it's in object, then even number should be a name
>-            level->valueCount++;
>-        }
>-        else {
>-            RAPIDJSON_ASSERT(!Base::hasRoot_);  // Should only has one and only one root.
>-            Base::hasRoot_ = true;
>-        }
>-    }
>-
>-    void WriteIndent()  {
>-        size_t count = (Base::level_stack_.GetSize() / sizeof(typename Base::Level)) * indentCharCount_;
>-        PutN(*Base::os_, indentChar_, count);
>-    }
>-
>-    Ch indentChar_;
>-    unsigned indentCharCount_;
>-
>-private:
>-    // Prohibit copy constructor & assignment operator.
>-    PrettyWriter(const PrettyWriter&);
>-    PrettyWriter& operator=(const PrettyWriter&);
>-};
>-
>-RAPIDJSON_NAMESPACE_END
>-
>-#ifdef __GNUC__
>-RAPIDJSON_DIAG_POP
>-#endif
>-
>-#endif // RAPIDJSON_RAPIDJSON_H_
>diff --git a/Source/ThirdParty/ANGLE/src/tests/third_party/rapidjson/include/rapidjson/rapidjson.h b/Source/ThirdParty/ANGLE/src/tests/third_party/rapidjson/include/rapidjson/rapidjson.h
>deleted file mode 100644
>index e9bfdba28e0..00000000000
>--- a/Source/ThirdParty/ANGLE/src/tests/third_party/rapidjson/include/rapidjson/rapidjson.h
>+++ /dev/null
>@@ -1,628 +0,0 @@
>-// Copyright (C) 2011 Milo Yip
>-//
>-// Permission is hereby granted, free of charge, to any person obtaining a copy
>-// of this software and associated documentation files (the "Software"), to deal
>-// in the Software without restriction, including without limitation the rights
>-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
>-// copies of the Software, and to permit persons to whom the Software is
>-// furnished to do so, subject to the following conditions:
>-//
>-// The above copyright notice and this permission notice shall be included in
>-// all copies or substantial portions of the Software.
>-//
>-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
>-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
>-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
>-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
>-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
>-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
>-// THE SOFTWARE.
>-
>-#ifndef RAPIDJSON_RAPIDJSON_H_
>-#define RAPIDJSON_RAPIDJSON_H_
>-
>-// Copyright (c) 2011 Milo Yip (miloyip@gmail.com)
>-// Version 0.1
>-
>-/*!\file rapidjson.h
>-    \brief common definitions and configuration
>-
>-    \see RAPIDJSON_CONFIG
>- */
>-
>-/*! \defgroup RAPIDJSON_CONFIG RapidJSON configuration
>-    \brief Configuration macros for library features
>-
>-    Some RapidJSON features are configurable to adapt the library to a wide
>-    variety of platforms, environments and usage scenarios.  Most of the
>-    features can be configured in terms of overriden or predefined
>-    preprocessor macros at compile-time.
>-
>-    Some additional customization is available in the \ref RAPIDJSON_ERRORS APIs.
>-
>-    \note These macros should be given on the compiler command-line
>-          (where applicable)  to avoid inconsistent values when compiling
>-          different translation units of a single application.
>- */
>-
>-#include <cstdlib>  // malloc(), realloc(), free(), size_t
>-#include <cstring>  // memset(), memcpy(), memmove(), memcmp()
>-
>-///////////////////////////////////////////////////////////////////////////////
>-// RAPIDJSON_NAMESPACE_(BEGIN|END)
>-/*! \def RAPIDJSON_NAMESPACE
>-    \ingroup RAPIDJSON_CONFIG
>-    \brief   provide custom rapidjson namespace
>-
>-    In order to avoid symbol clashes and/or "One Definition Rule" errors
>-    between multiple inclusions of (different versions of) RapidJSON in
>-    a single binary, users can customize the name of the main RapidJSON
>-    namespace.
>-
>-    In case of a single nesting level, defining \c RAPIDJSON_NAMESPACE
>-    to a custom name (e.g. \c MyRapidJSON) is sufficient.  If multiple
>-    levels are needed, both \ref RAPIDJSON_NAMESPACE_BEGIN and \ref
>-    RAPIDJSON_NAMESPACE_END need to be defined as well:
>-
>-    \code
>-    // in some .cpp file
>-    #define RAPIDJSON_NAMESPACE my::rapidjson
>-    #define RAPIDJSON_NAMESPACE_BEGIN namespace my { namespace rapidjson {
>-    #define RAPIDJSON_NAMESPACE_END   } }
>-    #include "rapidjson/..."
>-    \endcode
>-
>-    \see rapidjson
>- */
>-/*! \def RAPIDJSON_NAMESPACE_BEGIN
>-    \ingroup RAPIDJSON_CONFIG
>-    \brief   provide custom rapidjson namespace (opening expression)
>-    \see RAPIDJSON_NAMESPACE
>-*/
>-/*! \def RAPIDJSON_NAMESPACE_END
>-    \ingroup RAPIDJSON_CONFIG
>-    \brief   provide custom rapidjson namespace (closing expression)
>-    \see RAPIDJSON_NAMESPACE
>-*/
>-#ifndef RAPIDJSON_NAMESPACE
>-#define RAPIDJSON_NAMESPACE rapidjson
>-#endif
>-#ifndef RAPIDJSON_NAMESPACE_BEGIN
>-#define RAPIDJSON_NAMESPACE_BEGIN namespace RAPIDJSON_NAMESPACE {
>-#endif
>-#ifndef RAPIDJSON_NAMESPACE_END
>-#define RAPIDJSON_NAMESPACE_END }
>-#endif
>-
>-///////////////////////////////////////////////////////////////////////////////
>-// RAPIDJSON_NO_INT64DEFINE
>-
>-/*! \def RAPIDJSON_NO_INT64DEFINE
>-    \ingroup RAPIDJSON_CONFIG
>-    \brief Use external 64-bit integer types.
>-
>-    RapidJSON requires the 64-bit integer types \c int64_t and  \c uint64_t types
>-    to be available at global scope.
>-
>-    If users have their own definition, define RAPIDJSON_NO_INT64DEFINE to
>-    prevent RapidJSON from defining its own types.
>-*/
>-#ifndef RAPIDJSON_NO_INT64DEFINE
>-//!@cond RAPIDJSON_HIDDEN_FROM_DOXYGEN
>-#ifdef _MSC_VER
>-#include "msinttypes/stdint.h"
>-#include "msinttypes/inttypes.h"
>-#else
>-// Other compilers should have this.
>-#include <stdint.h>
>-#include <inttypes.h>
>-#endif
>-//!@endcond
>-#ifdef RAPIDJSON_DOXYGEN_RUNNING
>-#define RAPIDJSON_NO_INT64DEFINE
>-#endif
>-#endif // RAPIDJSON_NO_INT64TYPEDEF
>-
>-///////////////////////////////////////////////////////////////////////////////
>-// RAPIDJSON_FORCEINLINE
>-
>-#ifndef RAPIDJSON_FORCEINLINE
>-//!@cond RAPIDJSON_HIDDEN_FROM_DOXYGEN
>-#ifdef _MSC_VER
>-#define RAPIDJSON_FORCEINLINE __forceinline
>-#elif defined(__GNUC__) && __GNUC__ >= 4
>-#define RAPIDJSON_FORCEINLINE __attribute__((always_inline))
>-#else
>-#define RAPIDJSON_FORCEINLINE
>-#endif
>-//!@endcond
>-#endif // RAPIDJSON_FORCEINLINE
>-
>-///////////////////////////////////////////////////////////////////////////////
>-// RAPIDJSON_ENDIAN
>-#define RAPIDJSON_LITTLEENDIAN  0   //!< Little endian machine
>-#define RAPIDJSON_BIGENDIAN     1   //!< Big endian machine
>-
>-//! Endianness of the machine.
>-/*!
>-    \def RAPIDJSON_ENDIAN
>-    \ingroup RAPIDJSON_CONFIG
>-
>-    GCC 4.6 provided macro for detecting endianness of the target machine. But other
>-    compilers may not have this. User can define RAPIDJSON_ENDIAN to either
>-    \ref RAPIDJSON_LITTLEENDIAN or \ref RAPIDJSON_BIGENDIAN.
>-
>-    Default detection implemented with reference to
>-    \li https://gcc.gnu.org/onlinedocs/gcc-4.6.0/cpp/Common-Predefined-Macros.html
>-    \li http://www.boost.org/doc/libs/1_42_0/boost/detail/endian.hpp
>-*/
>-#ifndef RAPIDJSON_ENDIAN
>-// Detect with GCC 4.6's macro
>-#  ifdef __BYTE_ORDER__
>-#    if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
>-#      define RAPIDJSON_ENDIAN RAPIDJSON_LITTLEENDIAN
>-#    elif __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
>-#      define RAPIDJSON_ENDIAN RAPIDJSON_BIGENDIAN
>-#    else
>-#      error Unknown machine endianess detected. User needs to define RAPIDJSON_ENDIAN.
>-#    endif // __BYTE_ORDER__
>-// Detect with GLIBC's endian.h
>-#  elif defined(__GLIBC__)
>-#    include <endian.h>
>-#    if (__BYTE_ORDER == __LITTLE_ENDIAN)
>-#      define RAPIDJSON_ENDIAN RAPIDJSON_LITTLEENDIAN
>-#    elif (__BYTE_ORDER == __BIG_ENDIAN)
>-#      define RAPIDJSON_ENDIAN RAPIDJSON_BIGENDIAN
>-#    else
>-#      error Unknown machine endianess detected. User needs to define RAPIDJSON_ENDIAN.
>-#   endif // __GLIBC__
>-// Detect with _LITTLE_ENDIAN and _BIG_ENDIAN macro
>-#  elif defined(_LITTLE_ENDIAN) && !defined(_BIG_ENDIAN)
>-#    define RAPIDJSON_ENDIAN RAPIDJSON_LITTLEENDIAN
>-#  elif defined(_BIG_ENDIAN) && !defined(_LITTLE_ENDIAN)
>-#    define RAPIDJSON_ENDIAN RAPIDJSON_BIGENDIAN
>-// Detect with architecture macros
>-#  elif defined(__sparc) || defined(__sparc__) || defined(_POWER) || defined(__powerpc__) || defined(__ppc__) || defined(__hpux) || defined(__hppa) || defined(_MIPSEB) || defined(_POWER) || defined(__s390__)
>-#    define RAPIDJSON_ENDIAN RAPIDJSON_BIGENDIAN
>-#  elif defined(__i386__) || defined(__alpha__) || defined(__ia64) || defined(__ia64__) || defined(_M_IX86) || defined(_M_IA64) || defined(_M_ALPHA) || defined(__amd64) || defined(__amd64__) || defined(_M_AMD64) || defined(__x86_64) || defined(__x86_64__) || defined(_M_X64) || defined(__bfin__)
>-#    define RAPIDJSON_ENDIAN RAPIDJSON_LITTLEENDIAN
>-#  elif defined(RAPIDJSON_DOXYGEN_RUNNING)
>-#    define RAPIDJSON_ENDIAN
>-#  else
>-#    error Unknown machine endianess detected. User needs to define RAPIDJSON_ENDIAN.   
>-#  endif
>-#endif // RAPIDJSON_ENDIAN
>-
>-///////////////////////////////////////////////////////////////////////////////
>-// RAPIDJSON_64BIT
>-
>-//! Whether using 64-bit architecture
>-#ifndef RAPIDJSON_64BIT
>-#if defined(__LP64__) || defined(_WIN64)
>-#define RAPIDJSON_64BIT 1
>-#else
>-#define RAPIDJSON_64BIT 0
>-#endif
>-#endif // RAPIDJSON_64BIT
>-
>-///////////////////////////////////////////////////////////////////////////////
>-// RAPIDJSON_ALIGN
>-
>-//! Data alignment of the machine.
>-/*! \ingroup RAPIDJSON_CONFIG
>-    \param x pointer to align
>-
>-    Some machines require strict data alignment. Currently the default uses 4 bytes
>-    alignment. User can customize by defining the RAPIDJSON_ALIGN function macro.,
>-*/
>-#ifndef RAPIDJSON_ALIGN
>-#define RAPIDJSON_ALIGN(x) ((x + 3u) & ~3u)
>-#endif
>-
>-///////////////////////////////////////////////////////////////////////////////
>-// RAPIDJSON_UINT64_C2
>-
>-//! Construct a 64-bit literal by a pair of 32-bit integer.
>-/*!
>-    64-bit literal with or without ULL suffix is prone to compiler warnings.
>-    UINT64_C() is C macro which cause compilation problems.
>-    Use this macro to define 64-bit constants by a pair of 32-bit integer.
>-*/
>-#ifndef RAPIDJSON_UINT64_C2
>-#define RAPIDJSON_UINT64_C2(high32, low32) ((static_cast<uint64_t>(high32) << 32) | static_cast<uint64_t>(low32))
>-#endif
>-
>-///////////////////////////////////////////////////////////////////////////////
>-// RAPIDJSON_SSE2/RAPIDJSON_SSE42/RAPIDJSON_SIMD
>-
>-/*! \def RAPIDJSON_SIMD
>-    \ingroup RAPIDJSON_CONFIG
>-    \brief Enable SSE2/SSE4.2 optimization.
>-
>-    RapidJSON supports optimized implementations for some parsing operations
>-    based on the SSE2 or SSE4.2 SIMD extensions on modern Intel-compatible
>-    processors.
>-
>-    To enable these optimizations, two different symbols can be defined;
>-    \code
>-    // Enable SSE2 optimization.
>-    #define RAPIDJSON_SSE2
>-
>-    // Enable SSE4.2 optimization.
>-    #define RAPIDJSON_SSE42
>-    \endcode
>-
>-    \c RAPIDJSON_SSE42 takes precedence, if both are defined.
>-
>-    If any of these symbols is defined, RapidJSON defines the macro
>-    \c RAPIDJSON_SIMD to indicate the availability of the optimized code.
>-*/
>-#if defined(RAPIDJSON_SSE2) || defined(RAPIDJSON_SSE42) \
>-    || defined(RAPIDJSON_DOXYGEN_RUNNING)
>-#define RAPIDJSON_SIMD
>-#endif
>-
>-///////////////////////////////////////////////////////////////////////////////
>-// RAPIDJSON_NO_SIZETYPEDEFINE
>-
>-#ifndef RAPIDJSON_NO_SIZETYPEDEFINE
>-/*! \def RAPIDJSON_NO_SIZETYPEDEFINE
>-    \ingroup RAPIDJSON_CONFIG
>-    \brief User-provided \c SizeType definition.
>-
>-    In order to avoid using 32-bit size types for indexing strings and arrays,
>-    define this preprocessor symbol and provide the type rapidjson::SizeType
>-    before including RapidJSON:
>-    \code
>-    #define RAPIDJSON_NO_SIZETYPEDEFINE
>-    namespace rapidjson { typedef ::std::size_t SizeType; }
>-    #include "rapidjson/..."
>-    \endcode
>-
>-    \see rapidjson::SizeType
>-*/
>-#ifdef RAPIDJSON_DOXYGEN_RUNNING
>-#define RAPIDJSON_NO_SIZETYPEDEFINE
>-#endif
>-RAPIDJSON_NAMESPACE_BEGIN
>-//! Size type (for string lengths, array sizes, etc.)
>-/*! RapidJSON uses 32-bit array/string indices even on 64-bit platforms,
>-    instead of using \c size_t. Users may override the SizeType by defining
>-    \ref RAPIDJSON_NO_SIZETYPEDEFINE.
>-*/
>-typedef unsigned SizeType;
>-RAPIDJSON_NAMESPACE_END
>-#endif
>-
>-// always import std::size_t to rapidjson namespace
>-RAPIDJSON_NAMESPACE_BEGIN
>-using std::size_t;
>-RAPIDJSON_NAMESPACE_END
>-
>-///////////////////////////////////////////////////////////////////////////////
>-// RAPIDJSON_ASSERT
>-
>-//! Assertion.
>-/*! \ingroup RAPIDJSON_CONFIG
>-    By default, rapidjson uses C \c assert() for internal assertions.
>-    User can override it by defining RAPIDJSON_ASSERT(x) macro.
>-
>-    \note Parsing errors are handled and can be customized by the
>-          \ref RAPIDJSON_ERRORS APIs.
>-*/
>-#ifndef RAPIDJSON_ASSERT
>-#include <cassert>
>-#define RAPIDJSON_ASSERT(x) assert(x)
>-#endif // RAPIDJSON_ASSERT
>-
>-///////////////////////////////////////////////////////////////////////////////
>-// RAPIDJSON_STATIC_ASSERT
>-
>-// Adopt from boost
>-#ifndef RAPIDJSON_STATIC_ASSERT
>-//!@cond RAPIDJSON_HIDDEN_FROM_DOXYGEN
>-RAPIDJSON_NAMESPACE_BEGIN
>-template <bool x> struct STATIC_ASSERTION_FAILURE;
>-template <> struct STATIC_ASSERTION_FAILURE<true> { enum { value = 1 }; };
>-template<int x> struct StaticAssertTest {};
>-RAPIDJSON_NAMESPACE_END
>-
>-#define RAPIDJSON_JOIN(X, Y) RAPIDJSON_DO_JOIN(X, Y)
>-#define RAPIDJSON_DO_JOIN(X, Y) RAPIDJSON_DO_JOIN2(X, Y)
>-#define RAPIDJSON_DO_JOIN2(X, Y) X##Y
>-
>-#if defined(__GNUC__)
>-#define RAPIDJSON_STATIC_ASSERT_UNUSED_ATTRIBUTE __attribute__((unused))
>-#else
>-#define RAPIDJSON_STATIC_ASSERT_UNUSED_ATTRIBUTE 
>-#endif
>-//!@endcond
>-
>-/*! \def RAPIDJSON_STATIC_ASSERT
>-    \brief (Internal) macro to check for conditions at compile-time
>-    \param x compile-time condition
>-    \hideinitializer
>- */
>-#define RAPIDJSON_STATIC_ASSERT(x) \
>-    typedef ::RAPIDJSON_NAMESPACE::StaticAssertTest< \
>-      sizeof(::RAPIDJSON_NAMESPACE::STATIC_ASSERTION_FAILURE<bool(x) >)> \
>-    RAPIDJSON_JOIN(StaticAssertTypedef, __LINE__) RAPIDJSON_STATIC_ASSERT_UNUSED_ATTRIBUTE
>-#endif
>-
>-///////////////////////////////////////////////////////////////////////////////
>-// Helpers
>-
>-//!@cond RAPIDJSON_HIDDEN_FROM_DOXYGEN
>-
>-#define RAPIDJSON_MULTILINEMACRO_BEGIN do {  
>-#define RAPIDJSON_MULTILINEMACRO_END \
>-} while((void)0, 0)
>-
>-// adopted from Boost
>-#define RAPIDJSON_VERSION_CODE(x,y,z) \
>-  (((x)*100000) + ((y)*100) + (z))
>-
>-// token stringification
>-#define RAPIDJSON_STRINGIFY(x) RAPIDJSON_DO_STRINGIFY(x)
>-#define RAPIDJSON_DO_STRINGIFY(x) #x
>-
>-///////////////////////////////////////////////////////////////////////////////
>-// RAPIDJSON_DIAG_PUSH/POP, RAPIDJSON_DIAG_OFF
>-
>-#if defined(__GNUC__)
>-#define RAPIDJSON_GNUC \
>-    RAPIDJSON_VERSION_CODE(__GNUC__,__GNUC_MINOR__,__GNUC_PATCHLEVEL__)
>-#endif
>-
>-#if defined(__clang__) || (defined(RAPIDJSON_GNUC) && RAPIDJSON_GNUC >= RAPIDJSON_VERSION_CODE(4,2,0))
>-
>-#define RAPIDJSON_PRAGMA(x) _Pragma(RAPIDJSON_STRINGIFY(x))
>-#define RAPIDJSON_DIAG_PRAGMA(x) RAPIDJSON_PRAGMA(GCC diagnostic x)
>-#define RAPIDJSON_DIAG_OFF(x) \
>-    RAPIDJSON_DIAG_PRAGMA(ignored RAPIDJSON_STRINGIFY(RAPIDJSON_JOIN(-W,x)))
>-
>-// push/pop support in Clang and GCC>=4.6
>-#if defined(__clang__) || (defined(RAPIDJSON_GNUC) && RAPIDJSON_GNUC >= RAPIDJSON_VERSION_CODE(4,6,0))
>-#define RAPIDJSON_DIAG_PUSH RAPIDJSON_DIAG_PRAGMA(push)
>-#define RAPIDJSON_DIAG_POP  RAPIDJSON_DIAG_PRAGMA(pop)
>-#else // GCC >= 4.2, < 4.6
>-#define RAPIDJSON_DIAG_PUSH /* ignored */
>-#define RAPIDJSON_DIAG_POP /* ignored */
>-#endif
>-
>-#elif defined(_MSC_VER)
>-
>-// pragma (MSVC specific)
>-#define RAPIDJSON_PRAGMA(x) __pragma(x)
>-#define RAPIDJSON_DIAG_PRAGMA(x) RAPIDJSON_PRAGMA(warning(x))
>-
>-#define RAPIDJSON_DIAG_OFF(x) RAPIDJSON_DIAG_PRAGMA(disable: x)
>-#define RAPIDJSON_DIAG_PUSH RAPIDJSON_DIAG_PRAGMA(push)
>-#define RAPIDJSON_DIAG_POP  RAPIDJSON_DIAG_PRAGMA(pop)
>-
>-#else
>-
>-#define RAPIDJSON_DIAG_OFF(x) /* ignored */
>-#define RAPIDJSON_DIAG_PUSH   /* ignored */
>-#define RAPIDJSON_DIAG_POP    /* ignored */
>-
>-#endif // RAPIDJSON_DIAG_*
>-
>-///////////////////////////////////////////////////////////////////////////////
>-// C++11 features
>-
>-#ifndef RAPIDJSON_HAS_CXX11_RVALUE_REFS
>-#if defined(__clang__)
>-#define RAPIDJSON_HAS_CXX11_RVALUE_REFS __has_feature(cxx_rvalue_references)
>-#elif (defined(RAPIDJSON_GNUC) && (RAPIDJSON_GNUC >= RAPIDJSON_VERSION_CODE(4,3,0)) && defined(__GXX_EXPERIMENTAL_CXX0X__)) || \
>-      (defined(_MSC_VER) && _MSC_VER >= 1600)
>-
>-#define RAPIDJSON_HAS_CXX11_RVALUE_REFS 1
>-#else
>-#define RAPIDJSON_HAS_CXX11_RVALUE_REFS 0
>-#endif
>-#endif // RAPIDJSON_HAS_CXX11_RVALUE_REFS
>-
>-#ifndef RAPIDJSON_HAS_CXX11_NOEXCEPT
>-#if defined(__clang__)
>-#define RAPIDJSON_HAS_CXX11_NOEXCEPT __has_feature(cxx_noexcept)
>-#elif (defined(RAPIDJSON_GNUC) && (RAPIDJSON_GNUC >= RAPIDJSON_VERSION_CODE(4,6,0)) && defined(__GXX_EXPERIMENTAL_CXX0X__))
>-//    (defined(_MSC_VER) && _MSC_VER >= ????) // not yet supported
>-#define RAPIDJSON_HAS_CXX11_NOEXCEPT 1
>-#else
>-#define RAPIDJSON_HAS_CXX11_NOEXCEPT 0
>-#endif
>-#endif
>-#if RAPIDJSON_HAS_CXX11_NOEXCEPT
>-#define RAPIDJSON_NOEXCEPT noexcept
>-#else
>-#define RAPIDJSON_NOEXCEPT /* noexcept */
>-#endif // RAPIDJSON_HAS_CXX11_NOEXCEPT
>-
>-// no automatic detection, yet
>-#ifndef RAPIDJSON_HAS_CXX11_TYPETRAITS
>-#define RAPIDJSON_HAS_CXX11_TYPETRAITS 0
>-#endif
>-
>-//!@endcond
>-
>-///////////////////////////////////////////////////////////////////////////////
>-// new/delete
>-
>-#ifndef RAPIDJSON_NEW
>-///! customization point for global \c new
>-#define RAPIDJSON_NEW(x) new x
>-#endif
>-#ifndef RAPIDJSON_DELETE
>-///! customization point for global \c delete
>-#define RAPIDJSON_DELETE(x) delete x
>-#endif
>-
>-///////////////////////////////////////////////////////////////////////////////
>-// Allocators and Encodings
>-
>-#include "allocators.h"
>-#include "encodings.h"
>-
>-/*! \namespace rapidjson
>-    \brief main RapidJSON namespace
>-    \see RAPIDJSON_NAMESPACE
>-*/
>-RAPIDJSON_NAMESPACE_BEGIN
>-
>-///////////////////////////////////////////////////////////////////////////////
>-//  Stream
>-
>-/*! \class rapidjson::Stream
>-    \brief Concept for reading and writing characters.
>-
>-    For read-only stream, no need to implement PutBegin(), Put(), Flush() and PutEnd().
>-
>-    For write-only stream, only need to implement Put() and Flush().
>-
>-\code
>-concept Stream {
>-    typename Ch;    //!< Character type of the stream.
>-
>-    //! Read the current character from stream without moving the read cursor.
>-    Ch Peek() const;
>-
>-    //! Read the current character from stream and moving the read cursor to next character.
>-    Ch Take();
>-
>-    //! Get the current read cursor.
>-    //! \return Number of characters read from start.
>-    size_t Tell();
>-
>-    //! Begin writing operation at the current read pointer.
>-    //! \return The begin writer pointer.
>-    Ch* PutBegin();
>-
>-    //! Write a character.
>-    void Put(Ch c);
>-
>-    //! Flush the buffer.
>-    void Flush();
>-
>-    //! End the writing operation.
>-    //! \param begin The begin write pointer returned by PutBegin().
>-    //! \return Number of characters written.
>-    size_t PutEnd(Ch* begin);
>-}
>-\endcode
>-*/
>-
>-//! Provides additional information for stream.
>-/*!
>-    By using traits pattern, this type provides a default configuration for stream.
>-    For custom stream, this type can be specialized for other configuration.
>-    See TEST(Reader, CustomStringStream) in readertest.cpp for example.
>-*/
>-template<typename Stream>
>-struct StreamTraits {
>-    //! Whether to make local copy of stream for optimization during parsing.
>-    /*!
>-        By default, for safety, streams do not use local copy optimization.
>-        Stream that can be copied fast should specialize this, like StreamTraits<StringStream>.
>-    */
>-    enum { copyOptimization = 0 };
>-};
>-
>-//! Put N copies of a character to a stream.
>-template<typename Stream, typename Ch>
>-inline void PutN(Stream& stream, Ch c, size_t n) {
>-    for (size_t i = 0; i < n; i++)
>-        stream.Put(c);
>-}
>-
>-///////////////////////////////////////////////////////////////////////////////
>-// StringStream
>-
>-//! Read-only string stream.
>-/*! \note implements Stream concept
>-*/
>-template <typename Encoding>
>-struct GenericStringStream {
>-    typedef typename Encoding::Ch Ch;
>-
>-    GenericStringStream(const Ch *src) : src_(src), head_(src) {}
>-
>-    Ch Peek() const { return *src_; }
>-    Ch Take() { return *src_++; }
>-    size_t Tell() const { return static_cast<size_t>(src_ - head_); }
>-
>-    Ch* PutBegin() { RAPIDJSON_ASSERT(false); return 0; }
>-    void Put(Ch) { RAPIDJSON_ASSERT(false); }
>-    void Flush() { RAPIDJSON_ASSERT(false); }
>-    size_t PutEnd(Ch*) { RAPIDJSON_ASSERT(false); return 0; }
>-
>-    const Ch* src_;     //!< Current read position.
>-    const Ch* head_;    //!< Original head of the string.
>-};
>-
>-template <typename Encoding>
>-struct StreamTraits<GenericStringStream<Encoding> > {
>-    enum { copyOptimization = 1 };
>-};
>-
>-//! String stream with UTF8 encoding.
>-typedef GenericStringStream<UTF8<> > StringStream;
>-
>-///////////////////////////////////////////////////////////////////////////////
>-// InsituStringStream
>-
>-//! A read-write string stream.
>-/*! This string stream is particularly designed for in-situ parsing.
>-    \note implements Stream concept
>-*/
>-template <typename Encoding>
>-struct GenericInsituStringStream {
>-    typedef typename Encoding::Ch Ch;
>-
>-    GenericInsituStringStream(Ch *src) : src_(src), dst_(0), head_(src) {}
>-
>-    // Read
>-    Ch Peek() { return *src_; }
>-    Ch Take() { return *src_++; }
>-    size_t Tell() { return static_cast<size_t>(src_ - head_); }
>-
>-    // Write
>-    void Put(Ch c) { RAPIDJSON_ASSERT(dst_ != 0); *dst_++ = c; }
>-
>-    Ch* PutBegin() { return dst_ = src_; }
>-    size_t PutEnd(Ch* begin) { return static_cast<size_t>(dst_ - begin); }
>-    void Flush() {}
>-
>-    Ch* Push(size_t count) { Ch* begin = dst_; dst_ += count; return begin; }
>-    void Pop(size_t count) { dst_ -= count; }
>-
>-    Ch* src_;
>-    Ch* dst_;
>-    Ch* head_;
>-};
>-
>-template <typename Encoding>
>-struct StreamTraits<GenericInsituStringStream<Encoding> > {
>-    enum { copyOptimization = 1 };
>-};
>-
>-//! Insitu string stream with UTF8 encoding.
>-typedef GenericInsituStringStream<UTF8<> > InsituStringStream;
>-
>-///////////////////////////////////////////////////////////////////////////////
>-// Type
>-
>-//! Type of JSON value
>-enum Type {
>-    kNullType = 0,      //!< null
>-    kFalseType = 1,     //!< false
>-    kTrueType = 2,      //!< true
>-    kObjectType = 3,    //!< object
>-    kArrayType = 4,     //!< array 
>-    kStringType = 5,    //!< string
>-    kNumberType = 6     //!< number
>-};
>-
>-RAPIDJSON_NAMESPACE_END
>-
>-#endif // RAPIDJSON_RAPIDJSON_H_
>diff --git a/Source/ThirdParty/ANGLE/src/tests/third_party/rapidjson/include/rapidjson/reader.h b/Source/ThirdParty/ANGLE/src/tests/third_party/rapidjson/include/rapidjson/reader.h
>deleted file mode 100644
>index bc5cdcf2df7..00000000000
>--- a/Source/ThirdParty/ANGLE/src/tests/third_party/rapidjson/include/rapidjson/reader.h
>+++ /dev/null
>@@ -1,1444 +0,0 @@
>-// Copyright (C) 2011 Milo Yip
>-//
>-// Permission is hereby granted, free of charge, to any person obtaining a copy
>-// of this software and associated documentation files (the "Software"), to deal
>-// in the Software without restriction, including without limitation the rights
>-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
>-// copies of the Software, and to permit persons to whom the Software is
>-// furnished to do so, subject to the following conditions:
>-//
>-// The above copyright notice and this permission notice shall be included in
>-// all copies or substantial portions of the Software.
>-//
>-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
>-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
>-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
>-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
>-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
>-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
>-// THE SOFTWARE.
>-
>-#ifndef RAPIDJSON_READER_H_
>-#define RAPIDJSON_READER_H_
>-
>-/*! \file reader.h */
>-
>-#include "rapidjson.h"
>-#include "encodings.h"
>-#include "internal/meta.h"
>-#include "internal/stack.h"
>-#include "internal/strtod.h"
>-
>-#if defined(RAPIDJSON_SIMD) && defined(_MSC_VER)
>-#include <intrin.h>
>-#pragma intrinsic(_BitScanForward)
>-#endif
>-#ifdef RAPIDJSON_SSE42
>-#include <nmmintrin.h>
>-#elif defined(RAPIDJSON_SSE2)
>-#include <emmintrin.h>
>-#endif
>-
>-#ifdef _MSC_VER
>-RAPIDJSON_DIAG_PUSH
>-RAPIDJSON_DIAG_OFF(4127)  // conditional expression is constant
>-RAPIDJSON_DIAG_OFF(4702)  // unreachable code
>-#endif
>-
>-#ifdef __GNUC__
>-RAPIDJSON_DIAG_PUSH
>-RAPIDJSON_DIAG_OFF(effc++)
>-#endif
>-
>-//!@cond RAPIDJSON_HIDDEN_FROM_DOXYGEN
>-#define RAPIDJSON_NOTHING /* deliberately empty */
>-#ifndef RAPIDJSON_PARSE_ERROR_EARLY_RETURN
>-#define RAPIDJSON_PARSE_ERROR_EARLY_RETURN(value) \
>-    RAPIDJSON_MULTILINEMACRO_BEGIN \
>-    if (HasParseError()) { return value; } \
>-    RAPIDJSON_MULTILINEMACRO_END
>-#endif
>-#define RAPIDJSON_PARSE_ERROR_EARLY_RETURN_VOID \
>-    RAPIDJSON_PARSE_ERROR_EARLY_RETURN(RAPIDJSON_NOTHING)
>-//!@endcond
>-
>-/*! \def RAPIDJSON_PARSE_ERROR_NORETURN
>-    \ingroup RAPIDJSON_ERRORS
>-    \brief Macro to indicate a parse error.
>-    \param parseErrorCode \ref rapidjson::ParseErrorCode of the error
>-    \param offset  position of the error in JSON input (\c size_t)
>-
>-    This macros can be used as a customization point for the internal
>-    error handling mechanism of RapidJSON.
>-
>-    A common usage model is to throw an exception instead of requiring the
>-    caller to explicitly check the \ref rapidjson::GenericReader::Parse's
>-    return value:
>-
>-    \code
>-    #define RAPIDJSON_PARSE_ERROR_NORETURN(parseErrorCode,offset) \
>-       throw ParseException(parseErrorCode, #parseErrorCode, offset)
>-
>-    #include <stdexcept>               // std::runtime_error
>-    #include "rapidjson/error/error.h" // rapidjson::ParseResult
>-
>-    struct ParseException : std::runtime_error, rapidjson::ParseResult {
>-      ParseException(rapidjson::ParseErrorCode code, const char* msg, size_t offset)
>-        : std::runtime_error(msg), ParseResult(code, offset) {}
>-    };
>-
>-    #include "rapidjson/reader.h"
>-    \endcode
>-
>-    \see RAPIDJSON_PARSE_ERROR, rapidjson::GenericReader::Parse
>- */
>-#ifndef RAPIDJSON_PARSE_ERROR_NORETURN
>-#define RAPIDJSON_PARSE_ERROR_NORETURN(parseErrorCode, offset) \
>-    RAPIDJSON_MULTILINEMACRO_BEGIN \
>-    RAPIDJSON_ASSERT(!HasParseError()); /* Error can only be assigned once */ \
>-    SetParseError(parseErrorCode, offset); \
>-    RAPIDJSON_MULTILINEMACRO_END
>-#endif
>-
>-/*! \def RAPIDJSON_PARSE_ERROR
>-    \ingroup RAPIDJSON_ERRORS
>-    \brief (Internal) macro to indicate and handle a parse error.
>-    \param parseErrorCode \ref rapidjson::ParseErrorCode of the error
>-    \param offset  position of the error in JSON input (\c size_t)
>-
>-    Invokes RAPIDJSON_PARSE_ERROR_NORETURN and stops the parsing.
>-
>-    \see RAPIDJSON_PARSE_ERROR_NORETURN
>-    \hideinitializer
>- */
>-#ifndef RAPIDJSON_PARSE_ERROR
>-#define RAPIDJSON_PARSE_ERROR(parseErrorCode, offset) \
>-    RAPIDJSON_MULTILINEMACRO_BEGIN \
>-    RAPIDJSON_PARSE_ERROR_NORETURN(parseErrorCode, offset); \
>-    RAPIDJSON_PARSE_ERROR_EARLY_RETURN_VOID; \
>-    RAPIDJSON_MULTILINEMACRO_END
>-#endif
>-
>-#include "error/error.h" // ParseErrorCode, ParseResult
>-
>-RAPIDJSON_NAMESPACE_BEGIN
>-
>-///////////////////////////////////////////////////////////////////////////////
>-// ParseFlag
>-
>-/*! \def RAPIDJSON_PARSE_DEFAULT_FLAGS 
>-    \ingroup RAPIDJSON_CONFIG
>-    \brief User-defined kParseDefaultFlags definition.
>-
>-    User can define this as any \c ParseFlag combinations.
>-*/
>-#ifndef RAPIDJSON_PARSE_DEFAULT_FLAGS
>-#define RAPIDJSON_PARSE_DEFAULT_FLAGS kParseNoFlags
>-#endif
>-
>-//! Combination of parseFlags
>-/*! \see Reader::Parse, Document::Parse, Document::ParseInsitu, Document::ParseStream
>- */
>-enum ParseFlag {
>-    kParseNoFlags = 0,              //!< No flags are set.
>-    kParseInsituFlag = 1,           //!< In-situ(destructive) parsing.
>-    kParseValidateEncodingFlag = 2, //!< Validate encoding of JSON strings.
>-    kParseIterativeFlag = 4,        //!< Iterative(constant complexity in terms of function call stack size) parsing.
>-    kParseStopWhenDoneFlag = 8,     //!< After parsing a complete JSON root from stream, stop further processing the rest of stream. When this flag is used, parser will not generate kParseErrorDocumentRootNotSingular error.
>-    kParseFullPrecisionFlag = 16,   //!< Parse number in full precision (but slower).
>-    kParseDefaultFlags = RAPIDJSON_PARSE_DEFAULT_FLAGS  //!< Default parse flags. Can be customized by defining RAPIDJSON_PARSE_DEFAULT_FLAGS
>-};
>-
>-///////////////////////////////////////////////////////////////////////////////
>-// Handler
>-
>-/*! \class rapidjson::Handler
>-    \brief Concept for receiving events from GenericReader upon parsing.
>-    The functions return true if no error occurs. If they return false, 
>-    the event publisher should terminate the process.
>-\code
>-concept Handler {
>-    typename Ch;
>-
>-    bool Null();
>-    bool Bool(bool b);
>-    bool Int(int i);
>-    bool Uint(unsigned i);
>-    bool Int64(int64_t i);
>-    bool Uint64(uint64_t i);
>-    bool Double(double d);
>-    bool String(const Ch* str, SizeType length, bool copy);
>-    bool StartObject();
>-    bool Key(const Ch* str, SizeType length, bool copy);
>-    bool EndObject(SizeType memberCount);
>-    bool StartArray();
>-    bool EndArray(SizeType elementCount);
>-};
>-\endcode
>-*/
>-///////////////////////////////////////////////////////////////////////////////
>-// BaseReaderHandler
>-
>-//! Default implementation of Handler.
>-/*! This can be used as base class of any reader handler.
>-    \note implements Handler concept
>-*/
>-template<typename Encoding = UTF8<>, typename Derived = void>
>-struct BaseReaderHandler {
>-    typedef typename Encoding::Ch Ch;
>-
>-    typedef typename internal::SelectIf<internal::IsSame<Derived, void>, BaseReaderHandler, Derived>::Type Override;
>-
>-    bool Default() { return true; }
>-    bool Null() { return static_cast<Override&>(*this).Default(); }
>-    bool Bool(bool) { return static_cast<Override&>(*this).Default(); }
>-    bool Int(int) { return static_cast<Override&>(*this).Default(); }
>-    bool Uint(unsigned) { return static_cast<Override&>(*this).Default(); }
>-    bool Int64(int64_t) { return static_cast<Override&>(*this).Default(); }
>-    bool Uint64(uint64_t) { return static_cast<Override&>(*this).Default(); }
>-    bool Double(double) { return static_cast<Override&>(*this).Default(); }
>-    bool String(const Ch*, SizeType, bool) { return static_cast<Override&>(*this).Default(); }
>-    bool StartObject() { return static_cast<Override&>(*this).Default(); }
>-    bool Key(const Ch* str, SizeType len, bool copy) { return static_cast<Override&>(*this).String(str, len, copy); }
>-    bool EndObject(SizeType) { return static_cast<Override&>(*this).Default(); }
>-    bool StartArray() { return static_cast<Override&>(*this).Default(); }
>-    bool EndArray(SizeType) { return static_cast<Override&>(*this).Default(); }
>-};
>-
>-///////////////////////////////////////////////////////////////////////////////
>-// StreamLocalCopy
>-
>-namespace internal {
>-
>-template<typename Stream, int = StreamTraits<Stream>::copyOptimization>
>-class StreamLocalCopy;
>-
>-//! Do copy optimization.
>-template<typename Stream>
>-class StreamLocalCopy<Stream, 1> {
>-public:
>-    StreamLocalCopy(Stream& original) : s(original), original_(original) {}
>-    ~StreamLocalCopy() { original_ = s; }
>-
>-    Stream s;
>-
>-private:
>-    StreamLocalCopy& operator=(const StreamLocalCopy&) /* = delete */;
>-
>-    Stream& original_;
>-};
>-
>-//! Keep reference.
>-template<typename Stream>
>-class StreamLocalCopy<Stream, 0> {
>-public:
>-    StreamLocalCopy(Stream& original) : s(original) {}
>-
>-    Stream& s;
>-
>-private:
>-    StreamLocalCopy& operator=(const StreamLocalCopy&) /* = delete */;
>-};
>-
>-} // namespace internal
>-
>-///////////////////////////////////////////////////////////////////////////////
>-// SkipWhitespace
>-
>-//! Skip the JSON white spaces in a stream.
>-/*! \param is A input stream for skipping white spaces.
>-    \note This function has SSE2/SSE4.2 specialization.
>-*/
>-template<typename InputStream>
>-void SkipWhitespace(InputStream& is) {
>-    internal::StreamLocalCopy<InputStream> copy(is);
>-    InputStream& s(copy.s);
>-
>-    while (s.Peek() == ' ' || s.Peek() == '\n' || s.Peek() == '\r' || s.Peek() == '\t')
>-        s.Take();
>-}
>-
>-#ifdef RAPIDJSON_SSE42
>-//! Skip whitespace with SSE 4.2 pcmpistrm instruction, testing 16 8-byte characters at once.
>-inline const char *SkipWhitespace_SIMD(const char* p) {
>-    // Fast return for single non-whitespace
>-    if (*p == ' ' || *p == '\n' || *p == '\r' || *p == '\t')
>-        ++p;
>-    else
>-        return p;
>-
>-    // 16-byte align to the next boundary
>-    const char* nextAligned = reinterpret_cast<const char*>((reinterpret_cast<size_t>(p) + 15) & ~15);
>-    while (p != nextAligned)
>-        if (*p == ' ' || *p == '\n' || *p == '\r' || *p == '\t')
>-            ++p;
>-        else
>-            return p;
>-
>-    // The rest of string using SIMD
>-    static const char whitespace[16] = " \n\r\t";
>-    const __m128i w = _mm_loadu_si128((const __m128i *)&whitespace[0]);
>-
>-    for (;; p += 16) {
>-        const __m128i s = _mm_load_si128((const __m128i *)p);
>-        const unsigned r = _mm_cvtsi128_si32(_mm_cmpistrm(w, s, _SIDD_UBYTE_OPS | _SIDD_CMP_EQUAL_ANY | _SIDD_BIT_MASK | _SIDD_NEGATIVE_POLARITY));
>-        if (r != 0) {   // some of characters is non-whitespace
>-#ifdef _MSC_VER         // Find the index of first non-whitespace
>-            unsigned long offset;
>-            _BitScanForward(&offset, r);
>-            return p + offset;
>-#else
>-            return p + __builtin_ffs(r) - 1;
>-#endif
>-        }
>-    }
>-}
>-
>-#elif defined(RAPIDJSON_SSE2)
>-
>-//! Skip whitespace with SSE2 instructions, testing 16 8-byte characters at once.
>-inline const char *SkipWhitespace_SIMD(const char* p) {
>-    // Fast return for single non-whitespace
>-    if (*p == ' ' || *p == '\n' || *p == '\r' || *p == '\t')
>-        ++p;
>-    else
>-        return p;
>-
>-    // 16-byte align to the next boundary
>-    const char* nextAligned = reinterpret_cast<const char*>((reinterpret_cast<size_t>(p) + 15) & ~15);
>-    while (p != nextAligned)
>-        if (*p == ' ' || *p == '\n' || *p == '\r' || *p == '\t')
>-            ++p;
>-        else
>-            return p;
>-
>-    // The rest of string
>-    static const char whitespaces[4][17] = {
>-        "                ",
>-        "\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n",
>-        "\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r",
>-        "\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t"};
>-
>-        const __m128i w0 = _mm_loadu_si128((const __m128i *)&whitespaces[0][0]);
>-        const __m128i w1 = _mm_loadu_si128((const __m128i *)&whitespaces[1][0]);
>-        const __m128i w2 = _mm_loadu_si128((const __m128i *)&whitespaces[2][0]);
>-        const __m128i w3 = _mm_loadu_si128((const __m128i *)&whitespaces[3][0]);
>-
>-    for (;; p += 16) {
>-        const __m128i s = _mm_load_si128((const __m128i *)p);
>-        __m128i x = _mm_cmpeq_epi8(s, w0);
>-        x = _mm_or_si128(x, _mm_cmpeq_epi8(s, w1));
>-        x = _mm_or_si128(x, _mm_cmpeq_epi8(s, w2));
>-        x = _mm_or_si128(x, _mm_cmpeq_epi8(s, w3));
>-        unsigned short r = (unsigned short)~_mm_movemask_epi8(x);
>-        if (r != 0) {   // some of characters may be non-whitespace
>-#ifdef _MSC_VER         // Find the index of first non-whitespace
>-            unsigned long offset;
>-            _BitScanForward(&offset, r);
>-            return p + offset;
>-#else
>-            return p + __builtin_ffs(r) - 1;
>-#endif
>-        }
>-    }
>-}
>-
>-#endif // RAPIDJSON_SSE2
>-
>-#ifdef RAPIDJSON_SIMD
>-//! Template function specialization for InsituStringStream
>-template<> inline void SkipWhitespace(InsituStringStream& is) { 
>-    is.src_ = const_cast<char*>(SkipWhitespace_SIMD(is.src_));
>-}
>-
>-//! Template function specialization for StringStream
>-template<> inline void SkipWhitespace(StringStream& is) {
>-    is.src_ = SkipWhitespace_SIMD(is.src_);
>-}
>-#endif // RAPIDJSON_SIMD
>-
>-///////////////////////////////////////////////////////////////////////////////
>-// GenericReader
>-
>-//! SAX-style JSON parser. Use \ref Reader for UTF8 encoding and default allocator.
>-/*! GenericReader parses JSON text from a stream, and send events synchronously to an 
>-    object implementing Handler concept.
>-
>-    It needs to allocate a stack for storing a single decoded string during 
>-    non-destructive parsing.
>-
>-    For in-situ parsing, the decoded string is directly written to the source 
>-    text string, no temporary buffer is required.
>-
>-    A GenericReader object can be reused for parsing multiple JSON text.
>-    
>-    \tparam SourceEncoding Encoding of the input stream.
>-    \tparam TargetEncoding Encoding of the parse output.
>-    \tparam StackAllocator Allocator type for stack.
>-*/
>-template <typename SourceEncoding, typename TargetEncoding, typename StackAllocator = CrtAllocator>
>-class GenericReader {
>-public:
>-    typedef typename SourceEncoding::Ch Ch; //!< SourceEncoding character type
>-
>-    //! Constructor.
>-    /*! \param allocator Optional allocator for allocating stack memory. (Only use for non-destructive parsing)
>-        \param stackCapacity stack capacity in bytes for storing a single decoded string.  (Only use for non-destructive parsing)
>-    */
>-    GenericReader(StackAllocator* stackAllocator = 0, size_t stackCapacity = kDefaultStackCapacity) : stack_(stackAllocator, stackCapacity), parseResult_() {}
>-
>-    //! Parse JSON text.
>-    /*! \tparam parseFlags Combination of \ref ParseFlag.
>-        \tparam InputStream Type of input stream, implementing Stream concept.
>-        \tparam Handler Type of handler, implementing Handler concept.
>-        \param is Input stream to be parsed.
>-        \param handler The handler to receive events.
>-        \return Whether the parsing is successful.
>-    */
>-    template <unsigned parseFlags, typename InputStream, typename Handler>
>-    ParseResult Parse(InputStream& is, Handler& handler) {
>-        if (parseFlags & kParseIterativeFlag)
>-            return IterativeParse<parseFlags>(is, handler);
>-
>-        parseResult_.Clear();
>-
>-        ClearStackOnExit scope(*this);
>-
>-        SkipWhitespace(is);
>-
>-        if (is.Peek() == '\0') {
>-            RAPIDJSON_PARSE_ERROR_NORETURN(kParseErrorDocumentEmpty, is.Tell());
>-            RAPIDJSON_PARSE_ERROR_EARLY_RETURN(parseResult_);
>-        }
>-        else {
>-            ParseValue<parseFlags>(is, handler);
>-            RAPIDJSON_PARSE_ERROR_EARLY_RETURN(parseResult_);
>-
>-            if (!(parseFlags & kParseStopWhenDoneFlag)) {
>-                SkipWhitespace(is);
>-
>-                if (is.Peek() != '\0') {
>-                    RAPIDJSON_PARSE_ERROR_NORETURN(kParseErrorDocumentRootNotSingular, is.Tell());
>-                    RAPIDJSON_PARSE_ERROR_EARLY_RETURN(parseResult_);
>-                }
>-            }
>-        }
>-
>-        return parseResult_;
>-    }
>-
>-    //! Parse JSON text (with \ref kParseDefaultFlags)
>-    /*! \tparam InputStream Type of input stream, implementing Stream concept
>-        \tparam Handler Type of handler, implementing Handler concept.
>-        \param is Input stream to be parsed.
>-        \param handler The handler to receive events.
>-        \return Whether the parsing is successful.
>-    */
>-    template <typename InputStream, typename Handler>
>-    ParseResult Parse(InputStream& is, Handler& handler) {
>-        return Parse<kParseDefaultFlags>(is, handler);
>-    }
>-
>-    //! Whether a parse error has occured in the last parsing.
>-    bool HasParseError() const { return parseResult_.IsError(); }
>-    
>-    //! Get the \ref ParseErrorCode of last parsing.
>-    ParseErrorCode GetParseErrorCode() const { return parseResult_.Code(); }
>-
>-    //! Get the position of last parsing error in input, 0 otherwise.
>-    size_t GetErrorOffset() const { return parseResult_.Offset(); }
>-
>-protected:
>-    void SetParseError(ParseErrorCode code, size_t offset) { parseResult_.Set(code, offset); }
>-
>-private:
>-    // Prohibit copy constructor & assignment operator.
>-    GenericReader(const GenericReader&);
>-    GenericReader& operator=(const GenericReader&);
>-
>-    void ClearStack() { stack_.Clear(); }
>-
>-    // clear stack on any exit from ParseStream, e.g. due to exception
>-    struct ClearStackOnExit {
>-        explicit ClearStackOnExit(GenericReader& r) : r_(r) {}
>-        ~ClearStackOnExit() { r_.ClearStack(); }
>-    private:
>-        GenericReader& r_;
>-        ClearStackOnExit(const ClearStackOnExit&);
>-        ClearStackOnExit& operator=(const ClearStackOnExit&);
>-    };
>-
>-    // Parse object: { string : value, ... }
>-    template<unsigned parseFlags, typename InputStream, typename Handler>
>-    void ParseObject(InputStream& is, Handler& handler) {
>-        RAPIDJSON_ASSERT(is.Peek() == '{');
>-        is.Take();  // Skip '{'
>-        
>-        if (!handler.StartObject())
>-            RAPIDJSON_PARSE_ERROR(kParseErrorTermination, is.Tell());
>-
>-        SkipWhitespace(is);
>-
>-        if (is.Peek() == '}') {
>-            is.Take();
>-            if (!handler.EndObject(0))  // empty object
>-                RAPIDJSON_PARSE_ERROR(kParseErrorTermination, is.Tell());
>-            return;
>-        }
>-
>-        for (SizeType memberCount = 0;;) {
>-            if (is.Peek() != '"')
>-                RAPIDJSON_PARSE_ERROR(kParseErrorObjectMissName, is.Tell());
>-
>-            ParseString<parseFlags>(is, handler, true);
>-            RAPIDJSON_PARSE_ERROR_EARLY_RETURN_VOID;
>-
>-            SkipWhitespace(is);
>-
>-            if (is.Take() != ':')
>-                RAPIDJSON_PARSE_ERROR(kParseErrorObjectMissColon, is.Tell());
>-
>-            SkipWhitespace(is);
>-
>-            ParseValue<parseFlags>(is, handler);
>-            RAPIDJSON_PARSE_ERROR_EARLY_RETURN_VOID;
>-
>-            SkipWhitespace(is);
>-
>-            ++memberCount;
>-
>-            switch (is.Take()) {
>-                case ',': SkipWhitespace(is); break;
>-                case '}': 
>-                    if (!handler.EndObject(memberCount))
>-                        RAPIDJSON_PARSE_ERROR(kParseErrorTermination, is.Tell());
>-                    return;
>-                default:  RAPIDJSON_PARSE_ERROR(kParseErrorObjectMissCommaOrCurlyBracket, is.Tell());
>-            }
>-        }
>-    }
>-
>-    // Parse array: [ value, ... ]
>-    template<unsigned parseFlags, typename InputStream, typename Handler>
>-    void ParseArray(InputStream& is, Handler& handler) {
>-        RAPIDJSON_ASSERT(is.Peek() == '[');
>-        is.Take();  // Skip '['
>-        
>-        if (!handler.StartArray())
>-            RAPIDJSON_PARSE_ERROR(kParseErrorTermination, is.Tell());
>-        
>-        SkipWhitespace(is);
>-
>-        if (is.Peek() == ']') {
>-            is.Take();
>-            if (!handler.EndArray(0)) // empty array
>-                RAPIDJSON_PARSE_ERROR(kParseErrorTermination, is.Tell());
>-            return;
>-        }
>-
>-        for (SizeType elementCount = 0;;) {
>-            ParseValue<parseFlags>(is, handler);
>-            RAPIDJSON_PARSE_ERROR_EARLY_RETURN_VOID;
>-
>-            ++elementCount;
>-            SkipWhitespace(is);
>-
>-            switch (is.Take()) {
>-                case ',': SkipWhitespace(is); break;
>-                case ']': 
>-                    if (!handler.EndArray(elementCount))
>-                        RAPIDJSON_PARSE_ERROR(kParseErrorTermination, is.Tell());
>-                    return;
>-                default:  RAPIDJSON_PARSE_ERROR(kParseErrorArrayMissCommaOrSquareBracket, is.Tell());
>-            }
>-        }
>-    }
>-
>-    template<unsigned parseFlags, typename InputStream, typename Handler>
>-    void ParseNull(InputStream& is, Handler& handler) {
>-        RAPIDJSON_ASSERT(is.Peek() == 'n');
>-        is.Take();
>-
>-        if (is.Take() == 'u' && is.Take() == 'l' && is.Take() == 'l') {
>-            if (!handler.Null())
>-                RAPIDJSON_PARSE_ERROR(kParseErrorTermination, is.Tell());
>-        }
>-        else
>-            RAPIDJSON_PARSE_ERROR(kParseErrorValueInvalid, is.Tell() - 1);
>-    }
>-
>-    template<unsigned parseFlags, typename InputStream, typename Handler>
>-    void ParseTrue(InputStream& is, Handler& handler) {
>-        RAPIDJSON_ASSERT(is.Peek() == 't');
>-        is.Take();
>-
>-        if (is.Take() == 'r' && is.Take() == 'u' && is.Take() == 'e') {
>-            if (!handler.Bool(true))
>-                RAPIDJSON_PARSE_ERROR(kParseErrorTermination, is.Tell());
>-        }
>-        else
>-            RAPIDJSON_PARSE_ERROR(kParseErrorValueInvalid, is.Tell() - 1);
>-    }
>-
>-    template<unsigned parseFlags, typename InputStream, typename Handler>
>-    void ParseFalse(InputStream& is, Handler& handler) {
>-        RAPIDJSON_ASSERT(is.Peek() == 'f');
>-        is.Take();
>-
>-        if (is.Take() == 'a' && is.Take() == 'l' && is.Take() == 's' && is.Take() == 'e') {
>-            if (!handler.Bool(false))
>-                RAPIDJSON_PARSE_ERROR(kParseErrorTermination, is.Tell());
>-        }
>-        else
>-            RAPIDJSON_PARSE_ERROR(kParseErrorValueInvalid, is.Tell() - 1);
>-    }
>-
>-    // Helper function to parse four hexidecimal digits in \uXXXX in ParseString().
>-    template<typename InputStream>
>-    unsigned ParseHex4(InputStream& is) {
>-        unsigned codepoint = 0;
>-        for (int i = 0; i < 4; i++) {
>-            Ch c = is.Take();
>-            codepoint <<= 4;
>-            codepoint += static_cast<unsigned>(c);
>-            if (c >= '0' && c <= '9')
>-                codepoint -= '0';
>-            else if (c >= 'A' && c <= 'F')
>-                codepoint -= 'A' - 10;
>-            else if (c >= 'a' && c <= 'f')
>-                codepoint -= 'a' - 10;
>-            else {
>-                RAPIDJSON_PARSE_ERROR_NORETURN(kParseErrorStringUnicodeEscapeInvalidHex, is.Tell() - 1);
>-                RAPIDJSON_PARSE_ERROR_EARLY_RETURN(0);
>-            }
>-        }
>-        return codepoint;
>-    }
>-
>-    template <typename CharType>
>-    class StackStream {
>-    public:
>-        typedef CharType Ch;
>-
>-        StackStream(internal::Stack<StackAllocator>& stack) : stack_(stack), length_(0) {}
>-        RAPIDJSON_FORCEINLINE void Put(Ch c) {
>-            *stack_.template Push<Ch>() = c;
>-            ++length_;
>-        }
>-        size_t Length() const { return length_; }
>-        Ch* Pop() {
>-            return stack_.template Pop<Ch>(length_);
>-        }
>-
>-    private:
>-        StackStream(const StackStream&);
>-        StackStream& operator=(const StackStream&);
>-
>-        internal::Stack<StackAllocator>& stack_;
>-        SizeType length_;
>-    };
>-
>-    // Parse string and generate String event. Different code paths for kParseInsituFlag.
>-    template<unsigned parseFlags, typename InputStream, typename Handler>
>-    void ParseString(InputStream& is, Handler& handler, bool isKey = false) {
>-        internal::StreamLocalCopy<InputStream> copy(is);
>-        InputStream& s(copy.s);
>-
>-        bool success = false;
>-        if (parseFlags & kParseInsituFlag) {
>-            typename InputStream::Ch *head = s.PutBegin();
>-            ParseStringToStream<parseFlags, SourceEncoding, SourceEncoding>(s, s);
>-            RAPIDJSON_PARSE_ERROR_EARLY_RETURN_VOID;
>-            size_t length = s.PutEnd(head) - 1;
>-            RAPIDJSON_ASSERT(length <= 0xFFFFFFFF);
>-            const typename TargetEncoding::Ch* const str = (typename TargetEncoding::Ch*)head;
>-            success = (isKey ? handler.Key(str, SizeType(length), false) : handler.String(str, SizeType(length), false));
>-        }
>-        else {
>-            StackStream<typename TargetEncoding::Ch> stackStream(stack_);
>-            ParseStringToStream<parseFlags, SourceEncoding, TargetEncoding>(s, stackStream);
>-            RAPIDJSON_PARSE_ERROR_EARLY_RETURN_VOID;
>-            SizeType length = static_cast<SizeType>(stackStream.Length()) - 1;
>-            const typename TargetEncoding::Ch* const str = stackStream.Pop();
>-            success = (isKey ? handler.Key(str, length, true) : handler.String(str, length, true));
>-        }
>-        if (!success)
>-            RAPIDJSON_PARSE_ERROR(kParseErrorTermination, s.Tell());
>-    }
>-
>-    // Parse string to an output is
>-    // This function handles the prefix/suffix double quotes, escaping, and optional encoding validation.
>-    template<unsigned parseFlags, typename SEncoding, typename TEncoding, typename InputStream, typename OutputStream>
>-    RAPIDJSON_FORCEINLINE void ParseStringToStream(InputStream& is, OutputStream& os) {
>-//!@cond RAPIDJSON_HIDDEN_FROM_DOXYGEN
>-#define Z16 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
>-        static const char escape[256] = {
>-            Z16, Z16, 0, 0,'\"', 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,'/', 
>-            Z16, Z16, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,'\\', 0, 0, 0, 
>-            0, 0,'\b', 0, 0, 0,'\f', 0, 0, 0, 0, 0, 0, 0,'\n', 0, 
>-            0, 0,'\r', 0,'\t', 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
>-            Z16, Z16, Z16, Z16, Z16, Z16, Z16, Z16
>-        };
>-#undef Z16
>-//!@endcond
>-
>-        RAPIDJSON_ASSERT(is.Peek() == '\"');
>-        is.Take();  // Skip '\"'
>-
>-        for (;;) {
>-            Ch c = is.Peek();
>-            if (c == '\\') {    // Escape
>-                is.Take();
>-                Ch e = is.Take();
>-                if ((sizeof(Ch) == 1 || unsigned(e) < 256) && escape[(unsigned char)e]) {
>-                    os.Put(escape[(unsigned char)e]);
>-                }
>-                else if (e == 'u') {    // Unicode
>-                    unsigned codepoint = ParseHex4(is);
>-                    if (codepoint >= 0xD800 && codepoint <= 0xDBFF) {
>-                        // Handle UTF-16 surrogate pair
>-                        if (is.Take() != '\\' || is.Take() != 'u')
>-                            RAPIDJSON_PARSE_ERROR(kParseErrorStringUnicodeSurrogateInvalid, is.Tell() - 2);
>-                        unsigned codepoint2 = ParseHex4(is);
>-                        if (codepoint2 < 0xDC00 || codepoint2 > 0xDFFF)
>-                            RAPIDJSON_PARSE_ERROR(kParseErrorStringUnicodeSurrogateInvalid, is.Tell() - 2);
>-                        codepoint = (((codepoint - 0xD800) << 10) | (codepoint2 - 0xDC00)) + 0x10000;
>-                    }
>-                    TEncoding::Encode(os, codepoint);
>-                }
>-                else
>-                    RAPIDJSON_PARSE_ERROR(kParseErrorStringEscapeInvalid, is.Tell() - 1);
>-            }
>-            else if (c == '"') {    // Closing double quote
>-                is.Take();
>-                os.Put('\0');   // null-terminate the string
>-                return;
>-            }
>-            else if (c == '\0')
>-                RAPIDJSON_PARSE_ERROR(kParseErrorStringMissQuotationMark, is.Tell() - 1);
>-            else if ((unsigned)c < 0x20) // RFC 4627: unescaped = %x20-21 / %x23-5B / %x5D-10FFFF
>-                RAPIDJSON_PARSE_ERROR(kParseErrorStringEscapeInvalid, is.Tell() - 1);
>-            else {
>-                if (parseFlags & kParseValidateEncodingFlag ? 
>-                    !Transcoder<SEncoding, TEncoding>::Validate(is, os) : 
>-                    !Transcoder<SEncoding, TEncoding>::Transcode(is, os))
>-                    RAPIDJSON_PARSE_ERROR(kParseErrorStringInvalidEncoding, is.Tell());
>-            }
>-        }
>-    }
>-
>-    template<typename InputStream, bool backup>
>-    class NumberStream {};
>-
>-    template<typename InputStream>
>-    class NumberStream<InputStream, false> {
>-    public:
>-        NumberStream(GenericReader& reader, InputStream& is) : is(is) { (void)reader;  }
>-        ~NumberStream() {}
>-
>-        RAPIDJSON_FORCEINLINE Ch Peek() const { return is.Peek(); }
>-        RAPIDJSON_FORCEINLINE Ch TakePush() { return is.Take(); }
>-        RAPIDJSON_FORCEINLINE Ch Take() { return is.Take(); }
>-        size_t Tell() { return is.Tell(); }
>-        size_t Length() { return 0; }
>-        const char* Pop() { return 0; }
>-
>-    protected:
>-        NumberStream& operator=(const NumberStream&);
>-
>-        InputStream& is;
>-    };
>-
>-    template<typename InputStream>
>-    class NumberStream<InputStream, true> : public NumberStream<InputStream, false> {
>-        typedef NumberStream<InputStream, false> Base;
>-    public:
>-        NumberStream(GenericReader& reader, InputStream& is) : NumberStream<InputStream, false>(reader, is), stackStream(reader.stack_) {}
>-        ~NumberStream() {}
>-
>-        RAPIDJSON_FORCEINLINE Ch TakePush() {
>-            stackStream.Put((char)Base::is.Peek());
>-            return Base::is.Take();
>-        }
>-
>-        size_t Length() { return stackStream.Length(); }
>-
>-        const char* Pop() {
>-            stackStream.Put('\0');
>-            return stackStream.Pop();
>-        }
>-
>-    private:
>-        StackStream<char> stackStream;
>-    };
>-
>-    template<unsigned parseFlags, typename InputStream, typename Handler>
>-    void ParseNumber(InputStream& is, Handler& handler) {
>-        internal::StreamLocalCopy<InputStream> copy(is);
>-        NumberStream<InputStream, (parseFlags & kParseFullPrecisionFlag) != 0> s(*this, copy.s);
>-
>-        // Parse minus
>-        bool minus = false;
>-        if (s.Peek() == '-') {
>-            minus = true;
>-            s.Take();
>-        }
>-
>-        // Parse int: zero / ( digit1-9 *DIGIT )
>-        unsigned i = 0;
>-        uint64_t i64 = 0;
>-        bool use64bit = false;
>-        int significandDigit = 0;
>-        if (s.Peek() == '0') {
>-            i = 0;
>-            s.TakePush();
>-        }
>-        else if (s.Peek() >= '1' && s.Peek() <= '9') {
>-            i = static_cast<unsigned>(s.TakePush() - '0');
>-
>-            if (minus)
>-                while (s.Peek() >= '0' && s.Peek() <= '9') {
>-                    if (i >= 214748364) { // 2^31 = 2147483648
>-                        if (i != 214748364 || s.Peek() > '8') {
>-                            i64 = i;
>-                            use64bit = true;
>-                            break;
>-                        }
>-                    }
>-                    i = i * 10 + static_cast<unsigned>(s.TakePush() - '0');
>-                    significandDigit++;
>-                }
>-            else
>-                while (s.Peek() >= '0' && s.Peek() <= '9') {
>-                    if (i >= 429496729) { // 2^32 - 1 = 4294967295
>-                        if (i != 429496729 || s.Peek() > '5') {
>-                            i64 = i;
>-                            use64bit = true;
>-                            break;
>-                        }
>-                    }
>-                    i = i * 10 + static_cast<unsigned>(s.TakePush() - '0');
>-                    significandDigit++;
>-                }
>-        }
>-        else
>-            RAPIDJSON_PARSE_ERROR(kParseErrorValueInvalid, s.Tell());
>-
>-        // Parse 64bit int
>-        bool useDouble = false;
>-        double d = 0.0;
>-        if (use64bit) {
>-            if (minus) 
>-                while (s.Peek() >= '0' && s.Peek() <= '9') {                    
>-                     if (i64 >= RAPIDJSON_UINT64_C2(0x0CCCCCCC, 0xCCCCCCCC)) // 2^63 = 9223372036854775808
>-                        if (i64 != RAPIDJSON_UINT64_C2(0x0CCCCCCC, 0xCCCCCCCC) || s.Peek() > '8') {
>-                            d = i64;
>-                            useDouble = true;
>-                            break;
>-                        }
>-                    i64 = i64 * 10 + static_cast<unsigned>(s.TakePush() - '0');
>-                    significandDigit++;
>-                }
>-            else
>-                while (s.Peek() >= '0' && s.Peek() <= '9') {                    
>-                    if (i64 >= RAPIDJSON_UINT64_C2(0x19999999, 0x99999999)) // 2^64 - 1 = 18446744073709551615
>-                        if (i64 != RAPIDJSON_UINT64_C2(0x19999999, 0x99999999) || s.Peek() > '5') {
>-                            d = i64;
>-                            useDouble = true;
>-                            break;
>-                        }
>-                    i64 = i64 * 10 + static_cast<unsigned>(s.TakePush() - '0');
>-                    significandDigit++;
>-                }
>-        }
>-
>-        // Force double for big integer
>-        if (useDouble) {
>-            while (s.Peek() >= '0' && s.Peek() <= '9') {
>-                if (d >= 1.7976931348623157e307) // DBL_MAX / 10.0
>-                    RAPIDJSON_PARSE_ERROR(kParseErrorNumberTooBig, s.Tell());
>-                d = d * 10 + (s.TakePush() - '0');
>-            }
>-        }
>-
>-        // Parse frac = decimal-point 1*DIGIT
>-        int expFrac = 0;
>-        size_t decimalPosition;
>-        if (s.Peek() == '.') {
>-            s.Take();
>-            decimalPosition = s.Length();
>-
>-            if (!(s.Peek() >= '0' && s.Peek() <= '9'))
>-                RAPIDJSON_PARSE_ERROR(kParseErrorNumberMissFraction, s.Tell());
>-
>-            if (!useDouble) {
>-#if RAPIDJSON_64BIT
>-                // Use i64 to store significand in 64-bit architecture
>-                if (!use64bit)
>-                    i64 = i;
>-        
>-                while (s.Peek() >= '0' && s.Peek() <= '9') {
>-                    if (i64 > RAPIDJSON_UINT64_C2(0x1FFFFF, 0xFFFFFFFF)) // 2^53 - 1 for fast path
>-                        break;
>-                    else {
>-                        i64 = i64 * 10 + static_cast<unsigned>(s.TakePush() - '0');
>-                        --expFrac;
>-                        if (i64 != 0)
>-                            significandDigit++;
>-                    }
>-                }
>-
>-                d = (double)i64;
>-#else
>-                // Use double to store significand in 32-bit architecture
>-                d = use64bit ? (double)i64 : (double)i;
>-#endif
>-                useDouble = true;
>-            }
>-
>-            while (s.Peek() >= '0' && s.Peek() <= '9') {
>-                if (significandDigit < 17) {
>-                    d = d * 10.0 + (s.TakePush() - '0');
>-                    --expFrac;
>-                    if (d != 0.0)
>-                        significandDigit++;
>-                }
>-                else
>-                    s.TakePush();
>-            }
>-        }
>-        else
>-            decimalPosition = s.Length(); // decimal position at the end of integer.
>-
>-        // Parse exp = e [ minus / plus ] 1*DIGIT
>-        int exp = 0;
>-        if (s.Peek() == 'e' || s.Peek() == 'E') {
>-            if (!useDouble) {
>-                d = use64bit ? i64 : i;
>-                useDouble = true;
>-            }
>-            s.Take();
>-
>-            bool expMinus = false;
>-            if (s.Peek() == '+')
>-                s.Take();
>-            else if (s.Peek() == '-') {
>-                s.Take();
>-                expMinus = true;
>-            }
>-
>-            if (s.Peek() >= '0' && s.Peek() <= '9') {
>-                exp = s.Take() - '0';
>-                while (s.Peek() >= '0' && s.Peek() <= '9') {
>-                    exp = exp * 10 + (s.Take() - '0');
>-                    if (exp > 308 && !expMinus) // exp > 308 should be rare, so it should be checked first.
>-                        RAPIDJSON_PARSE_ERROR(kParseErrorNumberTooBig, s.Tell());
>-                }
>-            }
>-            else
>-                RAPIDJSON_PARSE_ERROR(kParseErrorNumberMissExponent, s.Tell());
>-
>-            if (expMinus)
>-                exp = -exp;
>-        }
>-
>-        // Finish parsing, call event according to the type of number.
>-        bool cont = true;
>-        size_t length = s.Length();
>-        const char* decimal = s.Pop();  // Pop stack no matter if it will be used or not.
>-
>-        if (useDouble) {
>-            int p = exp + expFrac;
>-            if (parseFlags & kParseFullPrecisionFlag)
>-                d = internal::StrtodFullPrecision(d, p, decimal, length, decimalPosition, exp);
>-            else
>-                d = internal::StrtodNormalPrecision(d, p);
>-
>-            cont = handler.Double(minus ? -d : d);
>-        }
>-        else {
>-            if (use64bit) {
>-                if (minus)
>-                    cont = handler.Int64(-(int64_t)i64);
>-                else
>-                    cont = handler.Uint64(i64);
>-            }
>-            else {
>-                if (minus)
>-                    cont = handler.Int(-(int)i);
>-                else
>-                    cont = handler.Uint(i);
>-            }
>-        }
>-        if (!cont)
>-            RAPIDJSON_PARSE_ERROR(kParseErrorTermination, s.Tell());
>-    }
>-
>-    // Parse any JSON value
>-    template<unsigned parseFlags, typename InputStream, typename Handler>
>-    void ParseValue(InputStream& is, Handler& handler) {
>-        switch (is.Peek()) {
>-            case 'n': ParseNull  <parseFlags>(is, handler); break;
>-            case 't': ParseTrue  <parseFlags>(is, handler); break;
>-            case 'f': ParseFalse <parseFlags>(is, handler); break;
>-            case '"': ParseString<parseFlags>(is, handler); break;
>-            case '{': ParseObject<parseFlags>(is, handler); break;
>-            case '[': ParseArray <parseFlags>(is, handler); break;
>-            default : ParseNumber<parseFlags>(is, handler);
>-        }
>-    }
>-
>-    // Iterative Parsing
>-
>-    // States
>-    enum IterativeParsingState {
>-        IterativeParsingStartState = 0,
>-        IterativeParsingFinishState,
>-        IterativeParsingErrorState,
>-
>-        // Object states
>-        IterativeParsingObjectInitialState,
>-        IterativeParsingMemberKeyState,
>-        IterativeParsingKeyValueDelimiterState,
>-        IterativeParsingMemberValueState,
>-        IterativeParsingMemberDelimiterState,
>-        IterativeParsingObjectFinishState,
>-
>-        // Array states
>-        IterativeParsingArrayInitialState,
>-        IterativeParsingElementState,
>-        IterativeParsingElementDelimiterState,
>-        IterativeParsingArrayFinishState,
>-
>-        // Single value state
>-        IterativeParsingValueState,
>-
>-        cIterativeParsingStateCount
>-    };
>-
>-    // Tokens
>-    enum Token {
>-        LeftBracketToken = 0,
>-        RightBracketToken,
>-
>-        LeftCurlyBracketToken,
>-        RightCurlyBracketToken,
>-
>-        CommaToken,
>-        ColonToken,
>-
>-        StringToken,
>-        FalseToken,
>-        TrueToken,
>-        NullToken,
>-        NumberToken,
>-
>-        kTokenCount
>-    };
>-
>-    RAPIDJSON_FORCEINLINE Token Tokenize(Ch c) {
>-
>-//!@cond RAPIDJSON_HIDDEN_FROM_DOXYGEN
>-#define N NumberToken
>-#define N16 N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,N
>-        // Maps from ASCII to Token
>-        static const unsigned char tokenMap[256] = {
>-            N16, // 00~0F
>-            N16, // 10~1F
>-            N, N, StringToken, N, N, N, N, N, N, N, N, N, CommaToken, N, N, N, // 20~2F
>-            N, N, N, N, N, N, N, N, N, N, ColonToken, N, N, N, N, N, // 30~3F
>-            N16, // 40~4F
>-            N, N, N, N, N, N, N, N, N, N, N, LeftBracketToken, N, RightBracketToken, N, N, // 50~5F
>-            N, N, N, N, N, N, FalseToken, N, N, N, N, N, N, N, NullToken, N, // 60~6F
>-            N, N, N, N, TrueToken, N, N, N, N, N, N, LeftCurlyBracketToken, N, RightCurlyBracketToken, N, N, // 70~7F
>-            N16, N16, N16, N16, N16, N16, N16, N16 // 80~FF
>-        };
>-#undef N
>-#undef N16
>-//!@endcond
>-        
>-        if (sizeof(Ch) == 1 || unsigned(c) < 256)
>-            return (Token)tokenMap[(unsigned char)c];
>-        else
>-            return NumberToken;
>-    }
>-
>-    RAPIDJSON_FORCEINLINE IterativeParsingState Predict(IterativeParsingState state, Token token) {
>-        // current state x one lookahead token -> new state
>-        static const char G[cIterativeParsingStateCount][kTokenCount] = {
>-            // Start
>-            {
>-                IterativeParsingArrayInitialState,  // Left bracket
>-                IterativeParsingErrorState,         // Right bracket
>-                IterativeParsingObjectInitialState, // Left curly bracket
>-                IterativeParsingErrorState,         // Right curly bracket
>-                IterativeParsingErrorState,         // Comma
>-                IterativeParsingErrorState,         // Colon
>-                IterativeParsingValueState,         // String
>-                IterativeParsingValueState,         // False
>-                IterativeParsingValueState,         // True
>-                IterativeParsingValueState,         // Null
>-                IterativeParsingValueState          // Number
>-            },
>-            // Finish(sink state)
>-            {
>-                IterativeParsingErrorState, IterativeParsingErrorState, IterativeParsingErrorState, IterativeParsingErrorState, IterativeParsingErrorState,
>-                IterativeParsingErrorState, IterativeParsingErrorState, IterativeParsingErrorState, IterativeParsingErrorState, IterativeParsingErrorState,
>-                IterativeParsingErrorState
>-            },
>-            // Error(sink state)
>-            {
>-                IterativeParsingErrorState, IterativeParsingErrorState, IterativeParsingErrorState, IterativeParsingErrorState, IterativeParsingErrorState,
>-                IterativeParsingErrorState, IterativeParsingErrorState, IterativeParsingErrorState, IterativeParsingErrorState, IterativeParsingErrorState,
>-                IterativeParsingErrorState
>-            },
>-            // ObjectInitial
>-            {
>-                IterativeParsingErrorState,         // Left bracket
>-                IterativeParsingErrorState,         // Right bracket
>-                IterativeParsingErrorState,         // Left curly bracket
>-                IterativeParsingObjectFinishState,  // Right curly bracket
>-                IterativeParsingErrorState,         // Comma
>-                IterativeParsingErrorState,         // Colon
>-                IterativeParsingMemberKeyState,     // String
>-                IterativeParsingErrorState,         // False
>-                IterativeParsingErrorState,         // True
>-                IterativeParsingErrorState,         // Null
>-                IterativeParsingErrorState          // Number
>-            },
>-            // MemberKey
>-            {
>-                IterativeParsingErrorState,             // Left bracket
>-                IterativeParsingErrorState,             // Right bracket
>-                IterativeParsingErrorState,             // Left curly bracket
>-                IterativeParsingErrorState,             // Right curly bracket
>-                IterativeParsingErrorState,             // Comma
>-                IterativeParsingKeyValueDelimiterState, // Colon
>-                IterativeParsingErrorState,             // String
>-                IterativeParsingErrorState,             // False
>-                IterativeParsingErrorState,             // True
>-                IterativeParsingErrorState,             // Null
>-                IterativeParsingErrorState              // Number
>-            },
>-            // KeyValueDelimiter
>-            {
>-                IterativeParsingArrayInitialState,      // Left bracket(push MemberValue state)
>-                IterativeParsingErrorState,             // Right bracket
>-                IterativeParsingObjectInitialState,     // Left curly bracket(push MemberValue state)
>-                IterativeParsingErrorState,             // Right curly bracket
>-                IterativeParsingErrorState,             // Comma
>-                IterativeParsingErrorState,             // Colon
>-                IterativeParsingMemberValueState,       // String
>-                IterativeParsingMemberValueState,       // False
>-                IterativeParsingMemberValueState,       // True
>-                IterativeParsingMemberValueState,       // Null
>-                IterativeParsingMemberValueState        // Number
>-            },
>-            // MemberValue
>-            {
>-                IterativeParsingErrorState,             // Left bracket
>-                IterativeParsingErrorState,             // Right bracket
>-                IterativeParsingErrorState,             // Left curly bracket
>-                IterativeParsingObjectFinishState,      // Right curly bracket
>-                IterativeParsingMemberDelimiterState,   // Comma
>-                IterativeParsingErrorState,             // Colon
>-                IterativeParsingErrorState,             // String
>-                IterativeParsingErrorState,             // False
>-                IterativeParsingErrorState,             // True
>-                IterativeParsingErrorState,             // Null
>-                IterativeParsingErrorState              // Number
>-            },
>-            // MemberDelimiter
>-            {
>-                IterativeParsingErrorState,         // Left bracket
>-                IterativeParsingErrorState,         // Right bracket
>-                IterativeParsingErrorState,         // Left curly bracket
>-                IterativeParsingErrorState,         // Right curly bracket
>-                IterativeParsingErrorState,         // Comma
>-                IterativeParsingErrorState,         // Colon
>-                IterativeParsingMemberKeyState,     // String
>-                IterativeParsingErrorState,         // False
>-                IterativeParsingErrorState,         // True
>-                IterativeParsingErrorState,         // Null
>-                IterativeParsingErrorState          // Number
>-            },
>-            // ObjectFinish(sink state)
>-            {
>-                IterativeParsingErrorState, IterativeParsingErrorState, IterativeParsingErrorState, IterativeParsingErrorState, IterativeParsingErrorState,
>-                IterativeParsingErrorState, IterativeParsingErrorState, IterativeParsingErrorState, IterativeParsingErrorState, IterativeParsingErrorState,
>-                IterativeParsingErrorState
>-            },
>-            // ArrayInitial
>-            {
>-                IterativeParsingArrayInitialState,      // Left bracket(push Element state)
>-                IterativeParsingArrayFinishState,       // Right bracket
>-                IterativeParsingObjectInitialState,     // Left curly bracket(push Element state)
>-                IterativeParsingErrorState,             // Right curly bracket
>-                IterativeParsingErrorState,             // Comma
>-                IterativeParsingErrorState,             // Colon
>-                IterativeParsingElementState,           // String
>-                IterativeParsingElementState,           // False
>-                IterativeParsingElementState,           // True
>-                IterativeParsingElementState,           // Null
>-                IterativeParsingElementState            // Number
>-            },
>-            // Element
>-            {
>-                IterativeParsingErrorState,             // Left bracket
>-                IterativeParsingArrayFinishState,       // Right bracket
>-                IterativeParsingErrorState,             // Left curly bracket
>-                IterativeParsingErrorState,             // Right curly bracket
>-                IterativeParsingElementDelimiterState,  // Comma
>-                IterativeParsingErrorState,             // Colon
>-                IterativeParsingErrorState,             // String
>-                IterativeParsingErrorState,             // False
>-                IterativeParsingErrorState,             // True
>-                IterativeParsingErrorState,             // Null
>-                IterativeParsingErrorState              // Number
>-            },
>-            // ElementDelimiter
>-            {
>-                IterativeParsingArrayInitialState,      // Left bracket(push Element state)
>-                IterativeParsingErrorState,             // Right bracket
>-                IterativeParsingObjectInitialState,     // Left curly bracket(push Element state)
>-                IterativeParsingErrorState,             // Right curly bracket
>-                IterativeParsingErrorState,             // Comma
>-                IterativeParsingErrorState,             // Colon
>-                IterativeParsingElementState,           // String
>-                IterativeParsingElementState,           // False
>-                IterativeParsingElementState,           // True
>-                IterativeParsingElementState,           // Null
>-                IterativeParsingElementState            // Number
>-            },
>-            // ArrayFinish(sink state)
>-            {
>-                IterativeParsingErrorState, IterativeParsingErrorState, IterativeParsingErrorState, IterativeParsingErrorState, IterativeParsingErrorState,
>-                IterativeParsingErrorState, IterativeParsingErrorState, IterativeParsingErrorState, IterativeParsingErrorState, IterativeParsingErrorState,
>-                IterativeParsingErrorState
>-            },
>-            // Single Value (sink state)
>-            {
>-                IterativeParsingErrorState, IterativeParsingErrorState, IterativeParsingErrorState, IterativeParsingErrorState, IterativeParsingErrorState,
>-                IterativeParsingErrorState, IterativeParsingErrorState, IterativeParsingErrorState, IterativeParsingErrorState, IterativeParsingErrorState,
>-                IterativeParsingErrorState
>-            }
>-        }; // End of G
>-
>-        return (IterativeParsingState)G[state][token];
>-    }
>-
>-    // Make an advance in the token stream and state based on the candidate destination state which was returned by Transit().
>-    // May return a new state on state pop.
>-    template <unsigned parseFlags, typename InputStream, typename Handler>
>-    RAPIDJSON_FORCEINLINE IterativeParsingState Transit(IterativeParsingState src, Token token, IterativeParsingState dst, InputStream& is, Handler& handler) {
>-        switch (dst) {
>-        case IterativeParsingStartState:
>-            RAPIDJSON_ASSERT(false);
>-            return IterativeParsingErrorState;
>-
>-        case IterativeParsingFinishState:
>-            return dst;
>-
>-        case IterativeParsingErrorState:
>-            return dst;
>-
>-        case IterativeParsingObjectInitialState:
>-        case IterativeParsingArrayInitialState:
>-        {
>-            // Push the state(Element or MemeberValue) if we are nested in another array or value of member.
>-            // In this way we can get the correct state on ObjectFinish or ArrayFinish by frame pop.
>-            IterativeParsingState n = src;
>-            if (src == IterativeParsingArrayInitialState || src == IterativeParsingElementDelimiterState)
>-                n = IterativeParsingElementState;
>-            else if (src == IterativeParsingKeyValueDelimiterState)
>-                n = IterativeParsingMemberValueState;
>-            // Push current state.
>-            *stack_.template Push<SizeType>(1) = n;
>-            // Initialize and push the member/element count.
>-            *stack_.template Push<SizeType>(1) = 0;
>-            // Call handler
>-            bool hr = (dst == IterativeParsingObjectInitialState) ? handler.StartObject() : handler.StartArray();
>-            // On handler short circuits the parsing.
>-            if (!hr) {
>-                RAPIDJSON_PARSE_ERROR_NORETURN(kParseErrorTermination, is.Tell());
>-                return IterativeParsingErrorState;
>-            }
>-            else {
>-                is.Take();
>-                return dst;
>-            }
>-        }
>-
>-        case IterativeParsingMemberKeyState:
>-            ParseString<parseFlags>(is, handler, true);
>-            if (HasParseError())
>-                return IterativeParsingErrorState;
>-            else
>-                return dst;
>-
>-        case IterativeParsingKeyValueDelimiterState:
>-            if (token == ColonToken) {
>-                is.Take();
>-                return dst;
>-            }
>-            else
>-                return IterativeParsingErrorState;
>-
>-        case IterativeParsingMemberValueState:
>-            // Must be non-compound value. Or it would be ObjectInitial or ArrayInitial state.
>-            ParseValue<parseFlags>(is, handler);
>-            if (HasParseError()) {
>-                return IterativeParsingErrorState;
>-            }
>-            return dst;
>-
>-        case IterativeParsingElementState:
>-            // Must be non-compound value. Or it would be ObjectInitial or ArrayInitial state.
>-            ParseValue<parseFlags>(is, handler);
>-            if (HasParseError()) {
>-                return IterativeParsingErrorState;
>-            }
>-            return dst;
>-
>-        case IterativeParsingMemberDelimiterState:
>-        case IterativeParsingElementDelimiterState:
>-            is.Take();
>-            // Update member/element count.
>-            *stack_.template Top<SizeType>() = *stack_.template Top<SizeType>() + 1;
>-            return dst;
>-
>-        case IterativeParsingObjectFinishState:
>-        {
>-            // Get member count.
>-            SizeType c = *stack_.template Pop<SizeType>(1);
>-            // If the object is not empty, count the last member.
>-            if (src == IterativeParsingMemberValueState)
>-                ++c;
>-            // Restore the state.
>-            IterativeParsingState n = static_cast<IterativeParsingState>(*stack_.template Pop<SizeType>(1));
>-            // Transit to Finish state if this is the topmost scope.
>-            if (n == IterativeParsingStartState)
>-                n = IterativeParsingFinishState;
>-            // Call handler
>-            bool hr = handler.EndObject(c);
>-            // On handler short circuits the parsing.
>-            if (!hr) {
>-                RAPIDJSON_PARSE_ERROR_NORETURN(kParseErrorTermination, is.Tell());
>-                return IterativeParsingErrorState;
>-            }
>-            else {
>-                is.Take();
>-                return n;
>-            }
>-        }
>-
>-        case IterativeParsingArrayFinishState:
>-        {
>-            // Get element count.
>-            SizeType c = *stack_.template Pop<SizeType>(1);
>-            // If the array is not empty, count the last element.
>-            if (src == IterativeParsingElementState)
>-                ++c;
>-            // Restore the state.
>-            IterativeParsingState n = static_cast<IterativeParsingState>(*stack_.template Pop<SizeType>(1));
>-            // Transit to Finish state if this is the topmost scope.
>-            if (n == IterativeParsingStartState)
>-                n = IterativeParsingFinishState;
>-            // Call handler
>-            bool hr = handler.EndArray(c);
>-            // On handler short circuits the parsing.
>-            if (!hr) {
>-                RAPIDJSON_PARSE_ERROR_NORETURN(kParseErrorTermination, is.Tell());
>-                return IterativeParsingErrorState;
>-            }
>-            else {
>-                is.Take();
>-                return n;
>-            }
>-        }
>-
>-        case IterativeParsingValueState:
>-            // Must be non-compound value. Or it would be ObjectInitial or ArrayInitial state.
>-            ParseValue<parseFlags>(is, handler);
>-            if (HasParseError()) {
>-                return IterativeParsingErrorState;
>-            }
>-            return IterativeParsingFinishState;
>-
>-        default:
>-            RAPIDJSON_ASSERT(false);
>-            return IterativeParsingErrorState;
>-        }
>-    }
>-
>-    template <typename InputStream>
>-    void HandleError(IterativeParsingState src, InputStream& is) {
>-        if (HasParseError()) {
>-            // Error flag has been set.
>-            return;
>-        }
>-        
>-        switch (src) {
>-        case IterativeParsingStartState:            RAPIDJSON_PARSE_ERROR(kParseErrorDocumentEmpty, is.Tell());
>-        case IterativeParsingFinishState:           RAPIDJSON_PARSE_ERROR(kParseErrorDocumentRootNotSingular, is.Tell());
>-        case IterativeParsingObjectInitialState:
>-        case IterativeParsingMemberDelimiterState:  RAPIDJSON_PARSE_ERROR(kParseErrorObjectMissName, is.Tell());
>-        case IterativeParsingMemberKeyState:        RAPIDJSON_PARSE_ERROR(kParseErrorObjectMissColon, is.Tell());
>-        case IterativeParsingMemberValueState:      RAPIDJSON_PARSE_ERROR(kParseErrorObjectMissCommaOrCurlyBracket, is.Tell());
>-        case IterativeParsingElementState:          RAPIDJSON_PARSE_ERROR(kParseErrorArrayMissCommaOrSquareBracket, is.Tell());
>-        default:                                    RAPIDJSON_PARSE_ERROR(kParseErrorUnspecificSyntaxError, is.Tell());
>-        }       
>-    }
>-
>-    template <unsigned parseFlags, typename InputStream, typename Handler>
>-    ParseResult IterativeParse(InputStream& is, Handler& handler) {
>-        parseResult_.Clear();
>-        ClearStackOnExit scope(*this);
>-        IterativeParsingState state = IterativeParsingStartState;
>-
>-        SkipWhitespace(is);
>-        while (is.Peek() != '\0') {
>-            Token t = Tokenize(is.Peek());
>-            IterativeParsingState n = Predict(state, t);
>-            IterativeParsingState d = Transit<parseFlags>(state, t, n, is, handler);
>-
>-            if (d == IterativeParsingErrorState) {
>-                HandleError(state, is);
>-                break;
>-            }
>-
>-            state = d;
>-
>-            // Do not further consume streams if a root JSON has been parsed.
>-            if ((parseFlags & kParseStopWhenDoneFlag) && state == IterativeParsingFinishState)
>-                break;
>-
>-            SkipWhitespace(is);
>-        }
>-
>-        // Handle the end of file.
>-        if (state != IterativeParsingFinishState)
>-            HandleError(state, is);
>-
>-        return parseResult_;
>-    }
>-
>-    static const size_t kDefaultStackCapacity = 256;    //!< Default stack capacity in bytes for storing a single decoded string.
>-    internal::Stack<StackAllocator> stack_;  //!< A stack for storing decoded string temporarily during non-destructive parsing.
>-    ParseResult parseResult_;
>-}; // class GenericReader
>-
>-//! Reader with UTF8 encoding and default allocator.
>-typedef GenericReader<UTF8<>, UTF8<> > Reader;
>-
>-RAPIDJSON_NAMESPACE_END
>-
>-#ifdef __GNUC__
>-RAPIDJSON_DIAG_POP
>-#endif
>-
>-#ifdef _MSC_VER
>-RAPIDJSON_DIAG_POP
>-#endif
>-
>-#endif // RAPIDJSON_READER_H_
>diff --git a/Source/ThirdParty/ANGLE/src/tests/third_party/rapidjson/include/rapidjson/stringbuffer.h b/Source/ThirdParty/ANGLE/src/tests/third_party/rapidjson/include/rapidjson/stringbuffer.h
>deleted file mode 100644
>index 009a5181320..00000000000
>--- a/Source/ThirdParty/ANGLE/src/tests/third_party/rapidjson/include/rapidjson/stringbuffer.h
>+++ /dev/null
>@@ -1,99 +0,0 @@
>-// Copyright (C) 2011 Milo Yip
>-//
>-// Permission is hereby granted, free of charge, to any person obtaining a copy
>-// of this software and associated documentation files (the "Software"), to deal
>-// in the Software without restriction, including without limitation the rights
>-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
>-// copies of the Software, and to permit persons to whom the Software is
>-// furnished to do so, subject to the following conditions:
>-//
>-// The above copyright notice and this permission notice shall be included in
>-// all copies or substantial portions of the Software.
>-//
>-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
>-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
>-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
>-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
>-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
>-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
>-// THE SOFTWARE.
>-
>-#ifndef RAPIDJSON_STRINGBUFFER_H_
>-#define RAPIDJSON_STRINGBUFFER_H_
>-
>-#include "rapidjson.h"
>-
>-#if RAPIDJSON_HAS_CXX11_RVALUE_REFS
>-#include <utility> // std::move
>-#endif
>-
>-#include "internal/stack.h"
>-
>-RAPIDJSON_NAMESPACE_BEGIN
>-
>-//! Represents an in-memory output stream.
>-/*!
>-    \tparam Encoding Encoding of the stream.
>-    \tparam Allocator type for allocating memory buffer.
>-    \note implements Stream concept
>-*/
>-template <typename Encoding, typename Allocator = CrtAllocator>
>-class GenericStringBuffer {
>-public:
>-    typedef typename Encoding::Ch Ch;
>-
>-    GenericStringBuffer(Allocator* allocator = 0, size_t capacity = kDefaultCapacity) : stack_(allocator, capacity) {}
>-
>-#if RAPIDJSON_HAS_CXX11_RVALUE_REFS
>-    GenericStringBuffer(GenericStringBuffer&& rhs) : stack_(std::move(rhs.stack_)) {}
>-    GenericStringBuffer& operator=(GenericStringBuffer&& rhs) {
>-        if (&rhs != this)
>-            stack_ = std::move(rhs.stack_);
>-        return *this;
>-    }
>-#endif
>-
>-    void Put(Ch c) { *stack_.template Push<Ch>() = c; }
>-    void Flush() {}
>-
>-    void Clear() { stack_.Clear(); }
>-    void ShrinkToFit() {
>-        // Push and pop a null terminator. This is safe.
>-        *stack_.template Push<Ch>() = '\0';
>-        stack_.ShrinkToFit();
>-        stack_.template Pop<Ch>(1);
>-    }
>-    Ch* Push(size_t count) { return stack_.template Push<Ch>(count); }
>-    void Pop(size_t count) { stack_.template Pop<Ch>(count); }
>-
>-    const Ch* GetString() const {
>-        // Push and pop a null terminator. This is safe.
>-        *stack_.template Push<Ch>() = '\0';
>-        stack_.template Pop<Ch>(1);
>-
>-        return stack_.template Bottom<Ch>();
>-    }
>-
>-    size_t GetSize() const { return stack_.GetSize(); }
>-
>-    static const size_t kDefaultCapacity = 256;
>-    mutable internal::Stack<Allocator> stack_;
>-
>-private:
>-    // Prohibit copy constructor & assignment operator.
>-    GenericStringBuffer(const GenericStringBuffer&);
>-    GenericStringBuffer& operator=(const GenericStringBuffer&);
>-};
>-
>-//! String buffer with UTF8 encoding
>-typedef GenericStringBuffer<UTF8<> > StringBuffer;
>-
>-//! Implement specialized version of PutN() with memset() for better performance.
>-template<>
>-inline void PutN(GenericStringBuffer<UTF8<> >& stream, char c, size_t n) {
>-    std::memset(stream.stack_.Push<char>(n), c, n * sizeof(c));
>-}
>-
>-RAPIDJSON_NAMESPACE_END
>-
>-#endif // RAPIDJSON_STRINGBUFFER_H_
>diff --git a/Source/ThirdParty/ANGLE/src/tests/third_party/rapidjson/include/rapidjson/writer.h b/Source/ThirdParty/ANGLE/src/tests/third_party/rapidjson/include/rapidjson/writer.h
>deleted file mode 100644
>index 98931fe31a9..00000000000
>--- a/Source/ThirdParty/ANGLE/src/tests/third_party/rapidjson/include/rapidjson/writer.h
>+++ /dev/null
>@@ -1,391 +0,0 @@
>-// Copyright (C) 2011 Milo Yip
>-//
>-// Permission is hereby granted, free of charge, to any person obtaining a copy
>-// of this software and associated documentation files (the "Software"), to deal
>-// in the Software without restriction, including without limitation the rights
>-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
>-// copies of the Software, and to permit persons to whom the Software is
>-// furnished to do so, subject to the following conditions:
>-//
>-// The above copyright notice and this permission notice shall be included in
>-// all copies or substantial portions of the Software.
>-//
>-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
>-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
>-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
>-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
>-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
>-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
>-// THE SOFTWARE.
>-
>-#ifndef RAPIDJSON_WRITER_H_
>-#define RAPIDJSON_WRITER_H_
>-
>-#include "rapidjson.h"
>-#include "internal/stack.h"
>-#include "internal/strfunc.h"
>-#include "internal/dtoa.h"
>-#include "internal/itoa.h"
>-#include "stringbuffer.h"
>-#include <new>      // placement new
>-
>-#ifdef _MSC_VER
>-RAPIDJSON_DIAG_PUSH
>-RAPIDJSON_DIAG_OFF(4127) // conditional expression is constant
>-#endif
>-
>-RAPIDJSON_NAMESPACE_BEGIN
>-
>-//! JSON writer
>-/*! Writer implements the concept Handler.
>-    It generates JSON text by events to an output os.
>-
>-    User may programmatically calls the functions of a writer to generate JSON text.
>-
>-    On the other side, a writer can also be passed to objects that generates events, 
>-
>-    for example Reader::Parse() and Document::Accept().
>-
>-    \tparam OutputStream Type of output stream.
>-    \tparam SourceEncoding Encoding of source string.
>-    \tparam TargetEncoding Encoding of output stream.
>-    \tparam StackAllocator Type of allocator for allocating memory of stack.
>-    \note implements Handler concept
>-*/
>-template<typename OutputStream, typename SourceEncoding = UTF8<>, typename TargetEncoding = UTF8<>, typename StackAllocator = CrtAllocator>
>-class Writer {
>-public:
>-    typedef typename SourceEncoding::Ch Ch;
>-
>-    //! Constructor
>-    /*! \param os Output stream.
>-        \param stackAllocator User supplied allocator. If it is null, it will create a private one.
>-        \param levelDepth Initial capacity of stack.
>-    */
>-    explicit
>-    Writer(OutputStream& os, StackAllocator* stackAllocator = 0, size_t levelDepth = kDefaultLevelDepth) : 
>-        os_(&os), level_stack_(stackAllocator, levelDepth * sizeof(Level)), hasRoot_(false) {}
>-
>-    explicit
>-    Writer(StackAllocator* allocator = 0, size_t levelDepth = kDefaultLevelDepth) :
>-        os_(0), level_stack_(allocator, levelDepth * sizeof(Level)), hasRoot_(false) {}
>-
>-    //! Reset the writer with a new stream.
>-    /*!
>-        This function reset the writer with a new stream and default settings,
>-        in order to make a Writer object reusable for output multiple JSONs.
>-
>-        \param os New output stream.
>-        \code
>-        Writer<OutputStream> writer(os1);
>-        writer.StartObject();
>-        // ...
>-        writer.EndObject();
>-
>-        writer.Reset(os2);
>-        writer.StartObject();
>-        // ...
>-        writer.EndObject();
>-        \endcode
>-    */
>-    void Reset(OutputStream& os) {
>-        os_ = &os;
>-        hasRoot_ = false;
>-        level_stack_.Clear();
>-    }
>-
>-    //! Checks whether the output is a complete JSON.
>-    /*!
>-        A complete JSON has a complete root object or array.
>-    */
>-    bool IsComplete() const {
>-        return hasRoot_ && level_stack_.Empty();
>-    }
>-
>-    /*!@name Implementation of Handler
>-        \see Handler
>-    */
>-    //@{
>-
>-    bool Null()                 { Prefix(kNullType);   return WriteNull(); }
>-    bool Bool(bool b)           { Prefix(b ? kTrueType : kFalseType); return WriteBool(b); }
>-    bool Int(int i)             { Prefix(kNumberType); return WriteInt(i); }
>-    bool Uint(unsigned u)       { Prefix(kNumberType); return WriteUint(u); }
>-    bool Int64(int64_t i64)     { Prefix(kNumberType); return WriteInt64(i64); }
>-    bool Uint64(uint64_t u64)   { Prefix(kNumberType); return WriteUint64(u64); }
>-
>-    //! Writes the given \c double value to the stream
>-    /*!
>-        \param d The value to be written.
>-        \return Whether it is succeed.
>-    */
>-    bool Double(double d)       { Prefix(kNumberType); return WriteDouble(d); }
>-
>-    bool String(const Ch* str, SizeType length, bool copy = false) {
>-        (void)copy;
>-        Prefix(kStringType);
>-        return WriteString(str, length);
>-    }
>-
>-    bool StartObject() {
>-        Prefix(kObjectType);
>-        new (level_stack_.template Push<Level>()) Level(false);
>-        return WriteStartObject();
>-    }
>-
>-    bool Key(const Ch* str, SizeType length, bool copy = false) { return String(str, length, copy); }
>-    
>-    bool EndObject(SizeType memberCount = 0) {
>-        (void)memberCount;
>-        RAPIDJSON_ASSERT(level_stack_.GetSize() >= sizeof(Level));
>-        RAPIDJSON_ASSERT(!level_stack_.template Top<Level>()->inArray);
>-        level_stack_.template Pop<Level>(1);
>-        bool ret = WriteEndObject();
>-        if (level_stack_.Empty())   // end of json text
>-            os_->Flush();
>-        return ret;
>-    }
>-
>-    bool StartArray() {
>-        Prefix(kArrayType);
>-        new (level_stack_.template Push<Level>()) Level(true);
>-        return WriteStartArray();
>-    }
>-
>-    bool EndArray(SizeType elementCount = 0) {
>-        (void)elementCount;
>-        RAPIDJSON_ASSERT(level_stack_.GetSize() >= sizeof(Level));
>-        RAPIDJSON_ASSERT(level_stack_.template Top<Level>()->inArray);
>-        level_stack_.template Pop<Level>(1);
>-        bool ret = WriteEndArray();
>-        if (level_stack_.Empty())   // end of json text
>-            os_->Flush();
>-        return ret;
>-    }
>-    //@}
>-
>-    /*! @name Convenience extensions */
>-    //@{
>-
>-    //! Simpler but slower overload.
>-    bool String(const Ch* str) { return String(str, internal::StrLen(str)); }
>-    bool Key(const Ch* str) { return Key(str, internal::StrLen(str)); }
>-
>-    //@}
>-
>-protected:
>-    //! Information for each nested level
>-    struct Level {
>-        Level(bool inArray_) : valueCount(0), inArray(inArray_) {}
>-        size_t valueCount;  //!< number of values in this level
>-        bool inArray;       //!< true if in array, otherwise in object
>-    };
>-
>-    static const size_t kDefaultLevelDepth = 32;
>-
>-    bool WriteNull()  {
>-        os_->Put('n'); os_->Put('u'); os_->Put('l'); os_->Put('l'); return true;
>-    }
>-
>-    bool WriteBool(bool b)  {
>-        if (b) {
>-            os_->Put('t'); os_->Put('r'); os_->Put('u'); os_->Put('e');
>-        }
>-        else {
>-            os_->Put('f'); os_->Put('a'); os_->Put('l'); os_->Put('s'); os_->Put('e');
>-        }
>-        return true;
>-    }
>-
>-    bool WriteInt(int i) {
>-        char buffer[11];
>-        const char* end = internal::i32toa(i, buffer);
>-        for (const char* p = buffer; p != end; ++p)
>-            os_->Put(*p);
>-        return true;
>-    }
>-
>-    bool WriteUint(unsigned u) {
>-        char buffer[10];
>-        const char* end = internal::u32toa(u, buffer);
>-        for (const char* p = buffer; p != end; ++p)
>-            os_->Put(*p);
>-        return true;
>-    }
>-
>-    bool WriteInt64(int64_t i64) {
>-        char buffer[21];
>-        const char* end = internal::i64toa(i64, buffer);
>-        for (const char* p = buffer; p != end; ++p)
>-            os_->Put(*p);
>-        return true;
>-    }
>-
>-    bool WriteUint64(uint64_t u64) {
>-        char buffer[20];
>-        char* end = internal::u64toa(u64, buffer);
>-        for (char* p = buffer; p != end; ++p)
>-            os_->Put(*p);
>-        return true;
>-    }
>-
>-    bool WriteDouble(double d) {
>-        char buffer[25];
>-        char* end = internal::dtoa(d, buffer);
>-        for (char* p = buffer; p != end; ++p)
>-            os_->Put(*p);
>-        return true;
>-    }
>-
>-    bool WriteString(const Ch* str, SizeType length)  {
>-        static const char hexDigits[16] = { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F' };
>-        static const char escape[256] = {
>-#define Z16 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
>-            //0    1    2    3    4    5    6    7    8    9    A    B    C    D    E    F
>-            'u', 'u', 'u', 'u', 'u', 'u', 'u', 'u', 'b', 't', 'n', 'u', 'f', 'r', 'u', 'u', // 00
>-            'u', 'u', 'u', 'u', 'u', 'u', 'u', 'u', 'u', 'u', 'u', 'u', 'u', 'u', 'u', 'u', // 10
>-              0,   0, '"',   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0, // 20
>-            Z16, Z16,                                                                       // 30~4F
>-              0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,'\\',   0,   0,   0, // 50
>-            Z16, Z16, Z16, Z16, Z16, Z16, Z16, Z16, Z16, Z16                                // 60~FF
>-#undef Z16
>-        };
>-
>-        os_->Put('\"');
>-        GenericStringStream<SourceEncoding> is(str);
>-        while (is.Tell() < length) {
>-            const Ch c = is.Peek();
>-            if (!TargetEncoding::supportUnicode && (unsigned)c >= 0x80) {
>-                // Unicode escaping
>-                unsigned codepoint;
>-                if (!SourceEncoding::Decode(is, &codepoint))
>-                    return false;
>-                os_->Put('\\');
>-                os_->Put('u');
>-                if (codepoint <= 0xD7FF || (codepoint >= 0xE000 && codepoint <= 0xFFFF)) {
>-                    os_->Put(hexDigits[(codepoint >> 12) & 15]);
>-                    os_->Put(hexDigits[(codepoint >>  8) & 15]);
>-                    os_->Put(hexDigits[(codepoint >>  4) & 15]);
>-                    os_->Put(hexDigits[(codepoint      ) & 15]);
>-                }
>-                else if (codepoint >= 0x010000 && codepoint <= 0x10FFFF)    {
>-                    // Surrogate pair
>-                    unsigned s = codepoint - 0x010000;
>-                    unsigned lead = (s >> 10) + 0xD800;
>-                    unsigned trail = (s & 0x3FF) + 0xDC00;
>-                    os_->Put(hexDigits[(lead >> 12) & 15]);
>-                    os_->Put(hexDigits[(lead >>  8) & 15]);
>-                    os_->Put(hexDigits[(lead >>  4) & 15]);
>-                    os_->Put(hexDigits[(lead      ) & 15]);
>-                    os_->Put('\\');
>-                    os_->Put('u');
>-                    os_->Put(hexDigits[(trail >> 12) & 15]);
>-                    os_->Put(hexDigits[(trail >>  8) & 15]);
>-                    os_->Put(hexDigits[(trail >>  4) & 15]);
>-                    os_->Put(hexDigits[(trail      ) & 15]);                    
>-                }
>-                else
>-                    return false;   // invalid code point
>-            }
>-            else if ((sizeof(Ch) == 1 || (unsigned)c < 256) && escape[(unsigned char)c])  {
>-                is.Take();
>-                os_->Put('\\');
>-                os_->Put(escape[(unsigned char)c]);
>-                if (escape[(unsigned char)c] == 'u') {
>-                    os_->Put('0');
>-                    os_->Put('0');
>-                    os_->Put(hexDigits[(unsigned char)c >> 4]);
>-                    os_->Put(hexDigits[(unsigned char)c & 0xF]);
>-                }
>-            }
>-            else
>-                Transcoder<SourceEncoding, TargetEncoding>::Transcode(is, *os_);
>-        }
>-        os_->Put('\"');
>-        return true;
>-    }
>-
>-    bool WriteStartObject() { os_->Put('{'); return true; }
>-    bool WriteEndObject()   { os_->Put('}'); return true; }
>-    bool WriteStartArray()  { os_->Put('['); return true; }
>-    bool WriteEndArray()    { os_->Put(']'); return true; }
>-
>-    void Prefix(Type type) {
>-        (void)type;
>-        if (level_stack_.GetSize() != 0) { // this value is not at root
>-            Level* level = level_stack_.template Top<Level>();
>-            if (level->valueCount > 0) {
>-                if (level->inArray) 
>-                    os_->Put(','); // add comma if it is not the first element in array
>-                else  // in object
>-                    os_->Put((level->valueCount % 2 == 0) ? ',' : ':');
>-            }
>-            if (!level->inArray && level->valueCount % 2 == 0)
>-                RAPIDJSON_ASSERT(type == kStringType);  // if it's in object, then even number should be a name
>-            level->valueCount++;
>-        }
>-        else {
>-            RAPIDJSON_ASSERT(!hasRoot_);    // Should only has one and only one root.
>-            hasRoot_ = true;
>-        }
>-    }
>-
>-    OutputStream* os_;
>-    internal::Stack<StackAllocator> level_stack_;
>-    bool hasRoot_;
>-
>-private:
>-    // Prohibit copy constructor & assignment operator.
>-    Writer(const Writer&);
>-    Writer& operator=(const Writer&);
>-};
>-
>-// Full specialization for StringStream to prevent memory copying
>-
>-template<>
>-inline bool Writer<StringBuffer>::WriteInt(int i) {
>-    char *buffer = os_->Push(11);
>-    const char* end = internal::i32toa(i, buffer);
>-    os_->Pop(11 - (end - buffer));
>-    return true;
>-}
>-
>-template<>
>-inline bool Writer<StringBuffer>::WriteUint(unsigned u) {
>-    char *buffer = os_->Push(10);
>-    const char* end = internal::u32toa(u, buffer);
>-    os_->Pop(10 - (end - buffer));
>-    return true;
>-}
>-
>-template<>
>-inline bool Writer<StringBuffer>::WriteInt64(int64_t i64) {
>-    char *buffer = os_->Push(21);
>-    const char* end = internal::i64toa(i64, buffer);
>-    os_->Pop(21 - (end - buffer));
>-    return true;
>-}
>-
>-template<>
>-inline bool Writer<StringBuffer>::WriteUint64(uint64_t u) {
>-    char *buffer = os_->Push(20);
>-    const char* end = internal::u64toa(u, buffer);
>-    os_->Pop(20 - (end - buffer));
>-    return true;
>-}
>-
>-template<>
>-inline bool Writer<StringBuffer>::WriteDouble(double d) {
>-    char *buffer = os_->Push(25);
>-    char* end = internal::dtoa(d, buffer);
>-    os_->Pop(25 - (end - buffer));
>-    return true;
>-}
>-
>-RAPIDJSON_NAMESPACE_END
>-
>-#ifdef _MSC_VER
>-RAPIDJSON_DIAG_POP
>-#endif
>-
>-#endif // RAPIDJSON_RAPIDJSON_H_
>diff --git a/Source/ThirdParty/ANGLE/src/tests/util_tests/PrintSystemInfoTest.cpp b/Source/ThirdParty/ANGLE/src/tests/util_tests/PrintSystemInfoTest.cpp
>index 8c0ff427042..a7987d6356d 100644
>--- a/Source/ThirdParty/ANGLE/src/tests/util_tests/PrintSystemInfoTest.cpp
>+++ b/Source/ThirdParty/ANGLE/src/tests/util_tests/PrintSystemInfoTest.cpp
>@@ -12,6 +12,7 @@
> #include <iostream>
> 
> #include "common/platform.h"
>+#include "common/system_utils.h"
> #include "gpu_info_util/SystemInfo.h"
> 
> using namespace angle;
>@@ -21,26 +22,7 @@ namespace
> 
> #if defined(ANGLE_PLATFORM_WINDOWS) || defined(ANGLE_PLATFORM_LINUX) || \
>     defined(ANGLE_PLATFORM_APPLE)
>-#define SYSTEM_INFO_IMPLEMENTED
>-#endif
>-
>-#if defined(SYSTEM_INFO_IMPLEMENTED)
>-std::string VendorName(VendorID vendor)
>-{
>-    switch (vendor)
>-    {
>-        case kVendorID_AMD:
>-            return "AMD";
>-        case kVendorID_Intel:
>-            return "Intel";
>-        case kVendorID_Nvidia:
>-            return "Nvidia";
>-        case kVendorID_Qualcomm:
>-            return "Qualcomm";
>-        default:
>-            return "Unknown (" + std::to_string(vendor) + ")";
>-    }
>-}
>+#    define SYSTEM_INFO_IMPLEMENTED
> #endif
> 
> // Prints the information gathered about the system
>@@ -52,50 +34,36 @@ TEST(PrintSystemInfoTest, Print)
>     ASSERT_TRUE(GetSystemInfo(&info));
>     ASSERT_GT(info.gpus.size(), 0u);
> 
>-    std::cout << info.gpus.size() << " GPUs:\n";
>-
>-    for (size_t i = 0; i < info.gpus.size(); i++)
>-    {
>-        const auto &gpu = info.gpus[i];
>-
>-        std::cout << "  " << i << " - " << VendorName(gpu.vendorId) << " device " << gpu.deviceId
>-                  << "\n";
>-        if (!gpu.driverVendor.empty())
>-        {
>-            std::cout << "       Driver Vendor: " << gpu.driverVendor << "\n";
>-        }
>-        if (!gpu.driverVersion.empty())
>-        {
>-            std::cout << "       Driver Version: " << gpu.driverVersion << "\n";
>-        }
>-        if (!gpu.driverDate.empty())
>-        {
>-            std::cout << "       Driver Date: " << gpu.driverDate << "\n";
>-        }
>-    }
>+    PrintSystemInfo(info);
>+#else
>+    std::cerr << "GetSystemInfo not implemented, skipping" << std::endl;
>+#endif
>+}
> 
>-    std::cout << "\n";
>-    std::cout << "Active GPU: " << info.activeGPUIndex << "\n";
>-    std::cout << "Primary GPU: " << info.primaryGPUIndex << "\n";
>+TEST(PrintSystemInfoTest, GetSystemInfoNoCrashOnInvalidDisplay)
>+{
>+#if defined(SYSTEM_INFO_IMPLEMENTED) && defined(ANGLE_USE_X11)
>+    const char kX11DisplayEnvVar[] = "DISPLAY";
>+    const char kInvalidDisplay[]   = "124:";
>+    std::string previous_display   = GetEnvironmentVar(kX11DisplayEnvVar);
>+    SetEnvironmentVar(kX11DisplayEnvVar, kInvalidDisplay);
>+    SystemInfo info;
> 
>-    std::cout << "\n";
>-    std::cout << "Optimus: " << (info.isOptimus ? "true" : "false") << "\n";
>-    std::cout << "AMD Switchable: " << (info.isAMDSwitchable ? "true" : "false") << "\n";
>+    // This should not crash.
>+    GetSystemInfo(&info);
> 
>-    std::cout << "\n";
>-    if (!info.machineModelName.empty() || !info.machineModelVersion.empty())
>+    if (previous_display.empty())
>     {
>-        std::cout << "Machine Model: " << info.machineModelName << " version "
>-                  << info.machineModelVersion << "\n";
>+        UnsetEnvironmentVar(kX11DisplayEnvVar);
>     }
>-
>-    if (!info.primaryDisplayDeviceId.empty())
>+    else
>     {
>-        std::cout << "Primary Display Device: " << info.primaryDisplayDeviceId << "\n";
>+        SetEnvironmentVar(kX11DisplayEnvVar, previous_display.c_str());
>     }
>-    std::cout << std::endl;
>-#else
>+#elif defined(SYSTEM_INFO_IMPLEMENTED)
>     std::cerr << "GetSystemInfo not implemented, skipping" << std::endl;
>+#else
>+    std::cerr << "GetSystemInfo X11 test not applicable, skipping" << std::endl;
> #endif
> }
> 
>diff --git a/Source/ThirdParty/ANGLE/src/third_party/compiler/ArrayBoundsClamper.cpp b/Source/ThirdParty/ANGLE/src/third_party/compiler/ArrayBoundsClamper.cpp
>index 17e272301a5..b9bd73418ce 100644
>--- a/Source/ThirdParty/ANGLE/src/third_party/compiler/ArrayBoundsClamper.cpp
>+++ b/Source/ThirdParty/ANGLE/src/third_party/compiler/ArrayBoundsClamper.cpp
>@@ -25,7 +25,7 @@
> 
> #include "third_party/compiler/ArrayBoundsClamper.h"
> 
>-#include "compiler/translator/IntermTraverse.h"
>+#include "compiler/translator/tree_util/IntermTraverse.h"
> 
> // The built-in 'clamp' instruction only accepts floats and returns a float.  I
> // iterated a few times with our driver team who examined the output from our
>@@ -36,9 +36,11 @@
> // temporary variables was difficult because ANGLE would then need to make more
> // brutal changes to the expression tree.
> 
>-const char* kIntClampBegin = "// BEGIN: Generated code for array bounds clamping\n\n";
>-const char* kIntClampEnd = "// END: Generated code for array bounds clamping\n\n";
>-const char* kIntClampDefinition = "int webgl_int_clamp(int value, int minValue, int maxValue) { return ((value < minValue) ? minValue : ((value > maxValue) ? maxValue : value)); }\n\n";
>+const char *kIntClampBegin = "// BEGIN: Generated code for array bounds clamping\n\n";
>+const char *kIntClampEnd   = "// END: Generated code for array bounds clamping\n\n";
>+const char *kIntClampDefinition =
>+    "int webgl_int_clamp(int value, int minValue, int maxValue) { return ((value < minValue) ? "
>+    "minValue : ((value > maxValue) ? maxValue : value)); }\n\n";
> 
> namespace sh
> {
>@@ -46,48 +48,43 @@ namespace sh
> namespace
> {
> 
>-class ArrayBoundsClamperMarker : public TIntermTraverser {
>-public:
>-    ArrayBoundsClamperMarker()
>-        : TIntermTraverser(true, false, false),
>-          mNeedsClamp(false)
>-   {
>-   }
>+class ArrayBoundsClamperMarker : public TIntermTraverser
>+{
>+  public:
>+    ArrayBoundsClamperMarker() : TIntermTraverser(true, false, false), mNeedsClamp(false) {}
> 
>     bool visitBinary(Visit visit, TIntermBinary *node) override
>-   {
>-       if (node->getOp() == EOpIndexIndirect)
>-       {
>-           TIntermTyped* left = node->getLeft();
>-           if (left->isArray() || left->isVector() || left->isMatrix())
>-           {
>-               node->setAddIndexClamp();
>-               mNeedsClamp = true;
>-           }
>-       }
>-       return true;
>-   }
>+    {
>+        if (node->getOp() == EOpIndexIndirect)
>+        {
>+            TIntermTyped *left = node->getLeft();
>+            if (left->isArray() || left->isVector() || left->isMatrix())
>+            {
>+                node->setAddIndexClamp();
>+                mNeedsClamp = true;
>+            }
>+        }
>+        return true;
>+    }
> 
>     bool GetNeedsClamp() { return mNeedsClamp; }
> 
>-private:
>+  private:
>     bool mNeedsClamp;
> };
> 
> }  // anonymous namespace
> 
> ArrayBoundsClamper::ArrayBoundsClamper()
>-    : mClampingStrategy(SH_CLAMP_WITH_CLAMP_INTRINSIC)
>-    , mArrayBoundsClampDefinitionNeeded(false)
>-{
>-}
>+    : mClampingStrategy(SH_CLAMP_WITH_CLAMP_INTRINSIC), mArrayBoundsClampDefinitionNeeded(false)
>+{}
> 
> void ArrayBoundsClamper::SetClampingStrategy(ShArrayIndexClampingStrategy clampingStrategy)
> {
>     mClampingStrategy = clampingStrategy;
> }
> 
>-void ArrayBoundsClamper::MarkIndirectArrayBoundsForClamping(TIntermNode* root)
>+void ArrayBoundsClamper::MarkIndirectArrayBoundsForClamping(TIntermNode *root)
> {
>     ASSERT(root);
> 
>@@ -99,7 +96,7 @@ void ArrayBoundsClamper::MarkIndirectArrayBoundsForClamping(TIntermNode* root)
>     }
> }
> 
>-void ArrayBoundsClamper::OutputClampingFunctionDefinition(TInfoSinkBase& out) const
>+void ArrayBoundsClamper::OutputClampingFunctionDefinition(TInfoSinkBase &out) const
> {
>     if (!mArrayBoundsClampDefinitionNeeded)
>     {
>diff --git a/Source/ThirdParty/ANGLE/src/third_party/compiler/ArrayBoundsClamper.h b/Source/ThirdParty/ANGLE/src/third_party/compiler/ArrayBoundsClamper.h
>index a4c407f760f..4cb758840c9 100644
>--- a/Source/ThirdParty/ANGLE/src/third_party/compiler/ArrayBoundsClamper.h
>+++ b/Source/ThirdParty/ANGLE/src/third_party/compiler/ArrayBoundsClamper.h
>@@ -43,17 +43,14 @@ class ArrayBoundsClamper
> 
>     // Marks nodes in the tree that index arrays indirectly as
>     // requiring clamping.
>-    void MarkIndirectArrayBoundsForClamping(TIntermNode* root);
>+    void MarkIndirectArrayBoundsForClamping(TIntermNode *root);
> 
>     // If necessary, output array clamp function source into the shader source.
>-    void OutputClampingFunctionDefinition(TInfoSinkBase& out) const;
>+    void OutputClampingFunctionDefinition(TInfoSinkBase &out) const;
> 
>-    void Cleanup()
>-    {
>-        mArrayBoundsClampDefinitionNeeded = false;
>-    }
>+    void Cleanup() { mArrayBoundsClampDefinitionNeeded = false; }
> 
>-private:
>+  private:
>     bool GetArrayBoundsClampDefinitionNeeded() const { return mArrayBoundsClampDefinitionNeeded; }
>     void SetArrayBoundsClampDefinitionNeeded() { mArrayBoundsClampDefinitionNeeded = true; }
> 
>@@ -63,4 +60,4 @@ private:
> 
> }  // namespace sh
> 
>-#endif // THIRD_PARTY_COMPILER_ARRAYBOUNDSCLAMPER_H_
>+#endif  // THIRD_PARTY_COMPILER_ARRAYBOUNDSCLAMPER_H_
>diff --git a/Source/ThirdParty/ANGLE/src/third_party/compiler/README.angle b/Source/ThirdParty/ANGLE/src/third_party/compiler/README.chromium
>similarity index 100%
>rename from Source/ThirdParty/ANGLE/src/third_party/compiler/README.angle
>rename to Source/ThirdParty/ANGLE/src/third_party/compiler/README.chromium
>diff --git a/Source/ThirdParty/ANGLE/src/third_party/libXNVCtrl/NVCtrl.h b/Source/ThirdParty/ANGLE/src/third_party/libXNVCtrl/NVCtrl.h
>index 7bd7ab7a338..181df713a21 100644
>--- a/Source/ThirdParty/ANGLE/src/third_party/libXNVCtrl/NVCtrl.h
>+++ b/Source/ThirdParty/ANGLE/src/third_party/libXNVCtrl/NVCtrl.h
>@@ -2046,10 +2046,10 @@
>      (((range)&0x7FF) << 21))
> 
> #define NV_CTRL_GVO_COMPOSITE_GET_RANGE(val, range, enable, min, max) \
>-    (min) = ((val) >> 0) & 0x3FF;                                     \
>-    (max) = ((val) >> 10) & 0x3FF;                                    \
>+    (min)    = ((val) >> 0) & 0x3FF;                                  \
>+    (max)    = ((val) >> 10) & 0x3FF;                                 \
>     (enable) = ((val) >> 20) & 0x1;                                   \
>-    (range) = ((val) >> 21) & 0x7FF;
>+    (range)  = ((val) >> 21) & 0x7FF;
> 
> /*
>  * NV_CTRL_GVO_COMPOSITE_CR_KEY_RANGE - Set the values of a CR
>diff --git a/Source/ThirdParty/ANGLE/src/third_party/libXNVCtrl/nv_control.h b/Source/ThirdParty/ANGLE/src/third_party/libXNVCtrl/nv_control.h
>index 5023c9b58cd..621cef30b9b 100644
>--- a/Source/ThirdParty/ANGLE/src/third_party/libXNVCtrl/nv_control.h
>+++ b/Source/ThirdParty/ANGLE/src/third_party/libXNVCtrl/nv_control.h
>@@ -107,7 +107,7 @@
> /* Define 32 bit floats */
> typedef float FLOAT32;
> #ifndef F32
>-#define F32
>+#    define F32
> #endif
> 
> typedef struct
>diff --git a/Source/ThirdParty/ANGLE/src/third_party/systeminfo/SystemInfo.cpp b/Source/ThirdParty/ANGLE/src/third_party/systeminfo/SystemInfo.cpp
>index 97dfcaac513..4b111097616 100644
>--- a/Source/ThirdParty/ANGLE/src/third_party/systeminfo/SystemInfo.cpp
>+++ b/Source/ThirdParty/ANGLE/src/third_party/systeminfo/SystemInfo.cpp
>@@ -27,19 +27,20 @@
> #include "common/platform.h"
> 
> #if _WIN32_WINNT_WINBLUE
>-#include <versionhelpers.h>
>+#    include <versionhelpers.h>
> #endif
> 
>-namespace rx {
>+namespace rx
>+{
> 
> #ifndef _WIN32_WINNT_WINBLUE
> static bool IsWindowsVistaOrGreater()
> {
>-    OSVERSIONINFOEXW osvi = { };
>+    OSVERSIONINFOEXW osvi    = {};
>     osvi.dwOSVersionInfoSize = sizeof(osvi);
>-    osvi.dwMajorVersion = HIBYTE(_WIN32_WINNT_VISTA);
>-    osvi.dwMinorVersion = LOBYTE(_WIN32_WINNT_VISTA);
>-    DWORDLONG condition = 0;
>+    osvi.dwMajorVersion      = HIBYTE(_WIN32_WINNT_VISTA);
>+    osvi.dwMinorVersion      = LOBYTE(_WIN32_WINNT_VISTA);
>+    DWORDLONG condition      = 0;
>     VER_SET_CONDITION(condition, VER_MAJORVERSION, VER_GREATER_EQUAL);
>     VER_SET_CONDITION(condition, VER_MINORVERSION, VER_GREATER_EQUAL);
>     return !!::VerifyVersionInfoW(&osvi, VER_MAJORVERSION | VER_MINORVERSION, condition);
>@@ -51,7 +52,8 @@ bool isWindowsVistaOrGreater()
>     static bool initialized = false;
>     static bool cachedIsWindowsVistaOrGreater;
> 
>-    if (!initialized) {
>+    if (!initialized)
>+    {
>         initialized = true;
> #if defined(ANGLE_ENABLE_WINDOWS_STORE)
>         cachedIsWindowsVistaOrGreater = true;
>@@ -62,4 +64,4 @@ bool isWindowsVistaOrGreater()
>     return cachedIsWindowsVistaOrGreater;
> }
> 
>-} // namespace rx
>+}  // namespace rx
>diff --git a/Source/ThirdParty/ANGLE/src/third_party/systeminfo/SystemInfo.h b/Source/ThirdParty/ANGLE/src/third_party/systeminfo/SystemInfo.h
>index 226085fbd3d..5c3b2e65415 100644
>--- a/Source/ThirdParty/ANGLE/src/third_party/systeminfo/SystemInfo.h
>+++ b/Source/ThirdParty/ANGLE/src/third_party/systeminfo/SystemInfo.h
>@@ -26,10 +26,11 @@
> #ifndef THIRD_PARTY_SYSTEMINFO_SYSTEMINFO_H_
> #define THIRD_PARTY_SYSTEMINFO_SYSTEMINFO_H_
> 
>-namespace rx {
>+namespace rx
>+{
> 
> bool isWindowsVistaOrGreater();
> 
>-} // namespace rx
>+}  // namespace rx
> 
>-#endif // THIRD_PARTY_SYSTEMINFO_SYSTEMINFO_H_
>+#endif  // THIRD_PARTY_SYSTEMINFO_SYSTEMINFO_H_
>diff --git a/Source/ThirdParty/ANGLE/src/third_party/trace_event/trace_event.h b/Source/ThirdParty/ANGLE/src/third_party/trace_event/trace_event.h
>index bdb8804428a..040580e8100 100644
>--- a/Source/ThirdParty/ANGLE/src/third_party/trace_event/trace_event.h
>+++ b/Source/ThirdParty/ANGLE/src/third_party/trace_event/trace_event.h
>@@ -148,21 +148,18 @@
> 
> // By default, const char* argument values are assumed to have long-lived scope
> // and will not be copied. Use this macro to force a const char* to be copied.
>-#define TRACE_STR_COPY(str) \
>-    WebCore::TraceEvent::TraceStringWithCopy(str)
>+#define TRACE_STR_COPY(str) WebCore::TraceEvent::TraceStringWithCopy(str)
> 
> // Records a pair of begin and end events called "name" for the current
> // scope, with 0, 1 or 2 associated arguments. If the category is not
> // enabled, then this does nothing.
> // - category and name strings must have application lifetime (statics or
> //   literals). They may not include " chars.
>-#define TRACE_EVENT0(category, name) \
>-    INTERNAL_TRACE_EVENT_ADD_SCOPED(category, name)
>+#define TRACE_EVENT0(category, name) INTERNAL_TRACE_EVENT_ADD_SCOPED(category, name)
> #define TRACE_EVENT1(category, name, arg1_name, arg1_val) \
>     INTERNAL_TRACE_EVENT_ADD_SCOPED(category, name, arg1_name, arg1_val)
> #define TRACE_EVENT2(category, name, arg1_name, arg1_val, arg2_name, arg2_val) \
>-    INTERNAL_TRACE_EVENT_ADD_SCOPED(category, name, arg1_name, arg1_val, \
>-        arg2_name, arg2_val)
>+    INTERNAL_TRACE_EVENT_ADD_SCOPED(category, name, arg1_name, arg1_val, arg2_name, arg2_val)
> 
> // Records a single event called "name" immediately, with 0, 1 or 2
> // associated arguments. If the category is not enabled, then this
>@@ -170,27 +167,21 @@
> // - category and name strings must have application lifetime (statics or
> //   literals). They may not include " chars.
> #define TRACE_EVENT_INSTANT0(category, name) \
>-    INTERNAL_TRACE_EVENT_ADD(TRACE_EVENT_PHASE_INSTANT, \
>-        category, name, TRACE_EVENT_FLAG_NONE)
>-#define TRACE_EVENT_INSTANT1(category, name, arg1_name, arg1_val) \
>-    INTERNAL_TRACE_EVENT_ADD(TRACE_EVENT_PHASE_INSTANT, \
>-        category, name, TRACE_EVENT_FLAG_NONE, arg1_name, arg1_val)
>-#define TRACE_EVENT_INSTANT2(category, name, arg1_name, arg1_val, \
>-        arg2_name, arg2_val) \
>-    INTERNAL_TRACE_EVENT_ADD(TRACE_EVENT_PHASE_INSTANT, \
>-        category, name, TRACE_EVENT_FLAG_NONE, arg1_name, arg1_val, \
>-        arg2_name, arg2_val)
>+    INTERNAL_TRACE_EVENT_ADD(TRACE_EVENT_PHASE_INSTANT, category, name, TRACE_EVENT_FLAG_NONE)
>+#define TRACE_EVENT_INSTANT1(category, name, arg1_name, arg1_val)                              \
>+    INTERNAL_TRACE_EVENT_ADD(TRACE_EVENT_PHASE_INSTANT, category, name, TRACE_EVENT_FLAG_NONE, \
>+                             arg1_name, arg1_val)
>+#define TRACE_EVENT_INSTANT2(category, name, arg1_name, arg1_val, arg2_name, arg2_val)         \
>+    INTERNAL_TRACE_EVENT_ADD(TRACE_EVENT_PHASE_INSTANT, category, name, TRACE_EVENT_FLAG_NONE, \
>+                             arg1_name, arg1_val, arg2_name, arg2_val)
> #define TRACE_EVENT_COPY_INSTANT0(category, name) \
>-    INTERNAL_TRACE_EVENT_ADD(TRACE_EVENT_PHASE_INSTANT, \
>-        category, name, TRACE_EVENT_FLAG_COPY)
>-#define TRACE_EVENT_COPY_INSTANT1(category, name, arg1_name, arg1_val) \
>-    INTERNAL_TRACE_EVENT_ADD(TRACE_EVENT_PHASE_INSTANT, \
>-        category, name, TRACE_EVENT_FLAG_COPY, arg1_name, arg1_val)
>-#define TRACE_EVENT_COPY_INSTANT2(category, name, arg1_name, arg1_val, \
>-        arg2_name, arg2_val) \
>-    INTERNAL_TRACE_EVENT_ADD(TRACE_EVENT_PHASE_INSTANT, \
>-        category, name, TRACE_EVENT_FLAG_COPY, arg1_name, arg1_val, \
>-        arg2_name, arg2_val)
>+    INTERNAL_TRACE_EVENT_ADD(TRACE_EVENT_PHASE_INSTANT, category, name, TRACE_EVENT_FLAG_COPY)
>+#define TRACE_EVENT_COPY_INSTANT1(category, name, arg1_name, arg1_val)                         \
>+    INTERNAL_TRACE_EVENT_ADD(TRACE_EVENT_PHASE_INSTANT, category, name, TRACE_EVENT_FLAG_COPY, \
>+                             arg1_name, arg1_val)
>+#define TRACE_EVENT_COPY_INSTANT2(category, name, arg1_name, arg1_val, arg2_name, arg2_val)    \
>+    INTERNAL_TRACE_EVENT_ADD(TRACE_EVENT_PHASE_INSTANT, category, name, TRACE_EVENT_FLAG_COPY, \
>+                             arg1_name, arg1_val, arg2_name, arg2_val)
> 
> // Records a single BEGIN event called "name" immediately, with 0, 1 or 2
> // associated arguments. If the category is not enabled, then this
>@@ -198,85 +189,67 @@
> // - category and name strings must have application lifetime (statics or
> //   literals). They may not include " chars.
> #define TRACE_EVENT_BEGIN0(category, name) \
>-    INTERNAL_TRACE_EVENT_ADD(TRACE_EVENT_PHASE_BEGIN, \
>-        category, name, TRACE_EVENT_FLAG_NONE)
>-#define TRACE_EVENT_BEGIN1(category, name, arg1_name, arg1_val) \
>-    INTERNAL_TRACE_EVENT_ADD(TRACE_EVENT_PHASE_BEGIN, \
>-        category, name, TRACE_EVENT_FLAG_NONE, arg1_name, arg1_val)
>-#define TRACE_EVENT_BEGIN2(category, name, arg1_name, arg1_val, \
>-        arg2_name, arg2_val) \
>-    INTERNAL_TRACE_EVENT_ADD(TRACE_EVENT_PHASE_BEGIN, \
>-        category, name, TRACE_EVENT_FLAG_NONE, arg1_name, arg1_val, \
>-        arg2_name, arg2_val)
>+    INTERNAL_TRACE_EVENT_ADD(TRACE_EVENT_PHASE_BEGIN, category, name, TRACE_EVENT_FLAG_NONE)
>+#define TRACE_EVENT_BEGIN1(category, name, arg1_name, arg1_val)                              \
>+    INTERNAL_TRACE_EVENT_ADD(TRACE_EVENT_PHASE_BEGIN, category, name, TRACE_EVENT_FLAG_NONE, \
>+                             arg1_name, arg1_val)
>+#define TRACE_EVENT_BEGIN2(category, name, arg1_name, arg1_val, arg2_name, arg2_val)         \
>+    INTERNAL_TRACE_EVENT_ADD(TRACE_EVENT_PHASE_BEGIN, category, name, TRACE_EVENT_FLAG_NONE, \
>+                             arg1_name, arg1_val, arg2_name, arg2_val)
> #define TRACE_EVENT_COPY_BEGIN0(category, name) \
>-    INTERNAL_TRACE_EVENT_ADD(TRACE_EVENT_PHASE_BEGIN, \
>-        category, name, TRACE_EVENT_FLAG_COPY)
>-#define TRACE_EVENT_COPY_BEGIN1(category, name, arg1_name, arg1_val) \
>-    INTERNAL_TRACE_EVENT_ADD(TRACE_EVENT_PHASE_BEGIN, \
>-        category, name, TRACE_EVENT_FLAG_COPY, arg1_name, arg1_val)
>-#define TRACE_EVENT_COPY_BEGIN2(category, name, arg1_name, arg1_val, \
>-        arg2_name, arg2_val) \
>-    INTERNAL_TRACE_EVENT_ADD(TRACE_EVENT_PHASE_BEGIN, \
>-        category, name, TRACE_EVENT_FLAG_COPY, arg1_name, arg1_val, \
>-        arg2_name, arg2_val)
>+    INTERNAL_TRACE_EVENT_ADD(TRACE_EVENT_PHASE_BEGIN, category, name, TRACE_EVENT_FLAG_COPY)
>+#define TRACE_EVENT_COPY_BEGIN1(category, name, arg1_name, arg1_val)                         \
>+    INTERNAL_TRACE_EVENT_ADD(TRACE_EVENT_PHASE_BEGIN, category, name, TRACE_EVENT_FLAG_COPY, \
>+                             arg1_name, arg1_val)
>+#define TRACE_EVENT_COPY_BEGIN2(category, name, arg1_name, arg1_val, arg2_name, arg2_val)    \
>+    INTERNAL_TRACE_EVENT_ADD(TRACE_EVENT_PHASE_BEGIN, category, name, TRACE_EVENT_FLAG_COPY, \
>+                             arg1_name, arg1_val, arg2_name, arg2_val)
> 
> // Records a single END event for "name" immediately. If the category
> // is not enabled, then this does nothing.
> // - category and name strings must have application lifetime (statics or
> //   literals). They may not include " chars.
> #define TRACE_EVENT_END0(category, name) \
>-    INTERNAL_TRACE_EVENT_ADD(TRACE_EVENT_PHASE_END, \
>-        category, name, TRACE_EVENT_FLAG_NONE)
>-#define TRACE_EVENT_END1(category, name, arg1_name, arg1_val) \
>-    INTERNAL_TRACE_EVENT_ADD(TRACE_EVENT_PHASE_END, \
>-        category, name, TRACE_EVENT_FLAG_NONE, arg1_name, arg1_val)
>-#define TRACE_EVENT_END2(category, name, arg1_name, arg1_val, \
>-        arg2_name, arg2_val) \
>-    INTERNAL_TRACE_EVENT_ADD(TRACE_EVENT_PHASE_END, \
>-        category, name, TRACE_EVENT_FLAG_NONE, arg1_name, arg1_val, \
>-        arg2_name, arg2_val)
>+    INTERNAL_TRACE_EVENT_ADD(TRACE_EVENT_PHASE_END, category, name, TRACE_EVENT_FLAG_NONE)
>+#define TRACE_EVENT_END1(category, name, arg1_name, arg1_val)                              \
>+    INTERNAL_TRACE_EVENT_ADD(TRACE_EVENT_PHASE_END, category, name, TRACE_EVENT_FLAG_NONE, \
>+                             arg1_name, arg1_val)
>+#define TRACE_EVENT_END2(category, name, arg1_name, arg1_val, arg2_name, arg2_val)         \
>+    INTERNAL_TRACE_EVENT_ADD(TRACE_EVENT_PHASE_END, category, name, TRACE_EVENT_FLAG_NONE, \
>+                             arg1_name, arg1_val, arg2_name, arg2_val)
> #define TRACE_EVENT_COPY_END0(category, name) \
>-    INTERNAL_TRACE_EVENT_ADD(TRACE_EVENT_PHASE_END, \
>-        category, name, TRACE_EVENT_FLAG_COPY)
>-#define TRACE_EVENT_COPY_END1(category, name, arg1_name, arg1_val) \
>-    INTERNAL_TRACE_EVENT_ADD(TRACE_EVENT_PHASE_END, \
>-        category, name, TRACE_EVENT_FLAG_COPY, arg1_name, arg1_val)
>-#define TRACE_EVENT_COPY_END2(category, name, arg1_name, arg1_val, \
>-        arg2_name, arg2_val) \
>-    INTERNAL_TRACE_EVENT_ADD(TRACE_EVENT_PHASE_END, \
>-        category, name, TRACE_EVENT_FLAG_COPY, arg1_name, arg1_val, \
>-        arg2_name, arg2_val)
>+    INTERNAL_TRACE_EVENT_ADD(TRACE_EVENT_PHASE_END, category, name, TRACE_EVENT_FLAG_COPY)
>+#define TRACE_EVENT_COPY_END1(category, name, arg1_name, arg1_val)                         \
>+    INTERNAL_TRACE_EVENT_ADD(TRACE_EVENT_PHASE_END, category, name, TRACE_EVENT_FLAG_COPY, \
>+                             arg1_name, arg1_val)
>+#define TRACE_EVENT_COPY_END2(category, name, arg1_name, arg1_val, arg2_name, arg2_val)    \
>+    INTERNAL_TRACE_EVENT_ADD(TRACE_EVENT_PHASE_END, category, name, TRACE_EVENT_FLAG_COPY, \
>+                             arg1_name, arg1_val, arg2_name, arg2_val)
> 
> // Records the value of a counter called "name" immediately. Value
> // must be representable as a 32 bit integer.
> // - category and name strings must have application lifetime (statics or
> //   literals). They may not include " chars.
>-#define TRACE_COUNTER1(category, name, value) \
>-    INTERNAL_TRACE_EVENT_ADD(TRACE_EVENT_PHASE_COUNTER, \
>-        category, name, TRACE_EVENT_FLAG_NONE, \
>-        "value", static_cast<int>(value))
>-#define TRACE_COPY_COUNTER1(category, name, value) \
>-    INTERNAL_TRACE_EVENT_ADD(TRACE_EVENT_PHASE_COUNTER, \
>-        category, name, TRACE_EVENT_FLAG_COPY, \
>-        "value", static_cast<int>(value))
>+#define TRACE_COUNTER1(category, name, value)                                                  \
>+    INTERNAL_TRACE_EVENT_ADD(TRACE_EVENT_PHASE_COUNTER, category, name, TRACE_EVENT_FLAG_NONE, \
>+                             "value", static_cast<int>(value))
>+#define TRACE_COPY_COUNTER1(category, name, value)                                             \
>+    INTERNAL_TRACE_EVENT_ADD(TRACE_EVENT_PHASE_COUNTER, category, name, TRACE_EVENT_FLAG_COPY, \
>+                             "value", static_cast<int>(value))
> 
> // Records the values of a multi-parted counter called "name" immediately.
> // The UI will treat value1 and value2 as parts of a whole, displaying their
> // values as a stacked-bar chart.
> // - category and name strings must have application lifetime (statics or
> //   literals). They may not include " chars.
>-#define TRACE_COUNTER2(category, name, value1_name, value1_val, \
>-        value2_name, value2_val) \
>-    INTERNAL_TRACE_EVENT_ADD(TRACE_EVENT_PHASE_COUNTER, \
>-        category, name, TRACE_EVENT_FLAG_NONE, \
>-        value1_name, static_cast<int>(value1_val), \
>-        value2_name, static_cast<int>(value2_val))
>-#define TRACE_COPY_COUNTER2(category, name, value1_name, value1_val, \
>-        value2_name, value2_val) \
>-    INTERNAL_TRACE_EVENT_ADD(TRACE_EVENT_PHASE_COUNTER, \
>-        category, name, TRACE_EVENT_FLAG_COPY, \
>-        value1_name, static_cast<int>(value1_val), \
>-        value2_name, static_cast<int>(value2_val))
>+#define TRACE_COUNTER2(category, name, value1_name, value1_val, value2_name, value2_val)       \
>+    INTERNAL_TRACE_EVENT_ADD(TRACE_EVENT_PHASE_COUNTER, category, name, TRACE_EVENT_FLAG_NONE, \
>+                             value1_name, static_cast<int>(value1_val), value2_name,           \
>+                             static_cast<int>(value2_val))
>+#define TRACE_COPY_COUNTER2(category, name, value1_name, value1_val, value2_name, value2_val)  \
>+    INTERNAL_TRACE_EVENT_ADD(TRACE_EVENT_PHASE_COUNTER, category, name, TRACE_EVENT_FLAG_COPY, \
>+                             value1_name, static_cast<int>(value1_val), value2_name,           \
>+                             static_cast<int>(value2_val))
> 
> // Records the value of a counter called "name" immediately. Value
> // must be representable as a 32 bit integer.
>@@ -286,14 +259,12 @@
> //   be a pointer or an integer value up to 64 bits. If it's a pointer, the bits
> //   will be xored with a hash of the process ID so that the same pointer on
> //   two different processes will not collide.
>-#define TRACE_COUNTER_ID1(category, name, id, value) \
>-    INTERNAL_TRACE_EVENT_ADD_WITH_ID(TRACE_EVENT_PHASE_COUNTER, \
>-        category, name, id, TRACE_EVENT_FLAG_NONE, \
>-        "value", static_cast<int>(value))
>-#define TRACE_COPY_COUNTER_ID1(category, name, id, value) \
>-    INTERNAL_TRACE_EVENT_ADD_WITH_ID(TRACE_EVENT_PHASE_COUNTER, \
>-        category, name, id, TRACE_EVENT_FLAG_COPY, \
>-        "value", static_cast<int>(value))
>+#define TRACE_COUNTER_ID1(category, name, id, value)                                \
>+    INTERNAL_TRACE_EVENT_ADD_WITH_ID(TRACE_EVENT_PHASE_COUNTER, category, name, id, \
>+                                     TRACE_EVENT_FLAG_NONE, "value", static_cast<int>(value))
>+#define TRACE_COPY_COUNTER_ID1(category, name, id, value)                           \
>+    INTERNAL_TRACE_EVENT_ADD_WITH_ID(TRACE_EVENT_PHASE_COUNTER, category, name, id, \
>+                                     TRACE_EVENT_FLAG_COPY, "value", static_cast<int>(value))
> 
> // Records the values of a multi-parted counter called "name" immediately.
> // The UI will treat value1 and value2 as parts of a whole, displaying their
>@@ -304,18 +275,15 @@
> //   be a pointer or an integer value up to 64 bits. If it's a pointer, the bits
> //   will be xored with a hash of the process ID so that the same pointer on
> //   two different processes will not collide.
>-#define TRACE_COUNTER_ID2(category, name, id, value1_name, value1_val, \
>-        value2_name, value2_val) \
>-    INTERNAL_TRACE_EVENT_ADD_WITH_ID(TRACE_EVENT_PHASE_COUNTER, \
>-        category, name, id, TRACE_EVENT_FLAG_NONE, \
>-        value1_name, static_cast<int>(value1_val), \
>-        value2_name, static_cast<int>(value2_val))
>-#define TRACE_COPY_COUNTER_ID2(category, name, id, value1_name, value1_val, \
>-        value2_name, value2_val) \
>-    INTERNAL_TRACE_EVENT_ADD_WITH_ID(TRACE_EVENT_PHASE_COUNTER, \
>-        category, name, id, TRACE_EVENT_FLAG_COPY, \
>-        value1_name, static_cast<int>(value1_val), \
>-        value2_name, static_cast<int>(value2_val))
>+#define TRACE_COUNTER_ID2(category, name, id, value1_name, value1_val, value2_name, value2_val) \
>+    INTERNAL_TRACE_EVENT_ADD_WITH_ID(                                                           \
>+        TRACE_EVENT_PHASE_COUNTER, category, name, id, TRACE_EVENT_FLAG_NONE, value1_name,      \
>+        static_cast<int>(value1_val), value2_name, static_cast<int>(value2_val))
>+#define TRACE_COPY_COUNTER_ID2(category, name, id, value1_name, value1_val, value2_name,   \
>+                               value2_val)                                                 \
>+    INTERNAL_TRACE_EVENT_ADD_WITH_ID(                                                      \
>+        TRACE_EVENT_PHASE_COUNTER, category, name, id, TRACE_EVENT_FLAG_COPY, value1_name, \
>+        static_cast<int>(value1_val), value2_name, static_cast<int>(value2_val))
> 
> // Records a single ASYNC_BEGIN event called "name" immediately, with 0, 1 or 2
> // associated arguments. If the category is not enabled, then this
>@@ -333,77 +301,68 @@
> // An async operation can span threads and processes, but all events in that
> // operation must use the same |name| and |id|. Each event can have its own
> // args.
>-#define TRACE_EVENT_ASYNC_BEGIN0(category, name, id) \
>-    INTERNAL_TRACE_EVENT_ADD_WITH_ID(TRACE_EVENT_PHASE_ASYNC_BEGIN, \
>-        category, name, id, TRACE_EVENT_FLAG_NONE)
>-#define TRACE_EVENT_ASYNC_BEGIN1(category, name, id, arg1_name, arg1_val) \
>-    INTERNAL_TRACE_EVENT_ADD_WITH_ID(TRACE_EVENT_PHASE_ASYNC_BEGIN, \
>-        category, name, id, TRACE_EVENT_FLAG_NONE, arg1_name, arg1_val)
>-#define TRACE_EVENT_ASYNC_BEGIN2(category, name, id, arg1_name, arg1_val, \
>-        arg2_name, arg2_val) \
>-    INTERNAL_TRACE_EVENT_ADD_WITH_ID(TRACE_EVENT_PHASE_ASYNC_BEGIN, \
>-        category, name, id, TRACE_EVENT_FLAG_NONE, \
>-        arg1_name, arg1_val, arg2_name, arg2_val)
>-#define TRACE_EVENT_COPY_ASYNC_BEGIN0(category, name, id) \
>-    INTERNAL_TRACE_EVENT_ADD_WITH_ID(TRACE_EVENT_PHASE_ASYNC_BEGIN, \
>-        category, name, id, TRACE_EVENT_FLAG_COPY)
>-#define TRACE_EVENT_COPY_ASYNC_BEGIN1(category, name, id, arg1_name, arg1_val) \
>-    INTERNAL_TRACE_EVENT_ADD_WITH_ID(TRACE_EVENT_PHASE_ASYNC_BEGIN, \
>-        category, name, id, TRACE_EVENT_FLAG_COPY, \
>-        arg1_name, arg1_val)
>-#define TRACE_EVENT_COPY_ASYNC_BEGIN2(category, name, id, arg1_name, arg1_val, \
>-        arg2_name, arg2_val) \
>-    INTERNAL_TRACE_EVENT_ADD_WITH_ID(TRACE_EVENT_PHASE_ASYNC_BEGIN, \
>-        category, name, id, TRACE_EVENT_FLAG_COPY, \
>-        arg1_name, arg1_val, arg2_name, arg2_val)
>+#define TRACE_EVENT_ASYNC_BEGIN0(category, name, id)                                    \
>+    INTERNAL_TRACE_EVENT_ADD_WITH_ID(TRACE_EVENT_PHASE_ASYNC_BEGIN, category, name, id, \
>+                                     TRACE_EVENT_FLAG_NONE)
>+#define TRACE_EVENT_ASYNC_BEGIN1(category, name, id, arg1_name, arg1_val)               \
>+    INTERNAL_TRACE_EVENT_ADD_WITH_ID(TRACE_EVENT_PHASE_ASYNC_BEGIN, category, name, id, \
>+                                     TRACE_EVENT_FLAG_NONE, arg1_name, arg1_val)
>+#define TRACE_EVENT_ASYNC_BEGIN2(category, name, id, arg1_name, arg1_val, arg2_name, arg2_val) \
>+    INTERNAL_TRACE_EVENT_ADD_WITH_ID(TRACE_EVENT_PHASE_ASYNC_BEGIN, category, name, id,        \
>+                                     TRACE_EVENT_FLAG_NONE, arg1_name, arg1_val, arg2_name,    \
>+                                     arg2_val)
>+#define TRACE_EVENT_COPY_ASYNC_BEGIN0(category, name, id)                               \
>+    INTERNAL_TRACE_EVENT_ADD_WITH_ID(TRACE_EVENT_PHASE_ASYNC_BEGIN, category, name, id, \
>+                                     TRACE_EVENT_FLAG_COPY)
>+#define TRACE_EVENT_COPY_ASYNC_BEGIN1(category, name, id, arg1_name, arg1_val)          \
>+    INTERNAL_TRACE_EVENT_ADD_WITH_ID(TRACE_EVENT_PHASE_ASYNC_BEGIN, category, name, id, \
>+                                     TRACE_EVENT_FLAG_COPY, arg1_name, arg1_val)
>+#define TRACE_EVENT_COPY_ASYNC_BEGIN2(category, name, id, arg1_name, arg1_val, arg2_name,   \
>+                                      arg2_val)                                             \
>+    INTERNAL_TRACE_EVENT_ADD_WITH_ID(TRACE_EVENT_PHASE_ASYNC_BEGIN, category, name, id,     \
>+                                     TRACE_EVENT_FLAG_COPY, arg1_name, arg1_val, arg2_name, \
>+                                     arg2_val)
> 
> // Records a single ASYNC_STEP event for |step| immediately. If the category
> // is not enabled, then this does nothing. The |name| and |id| must match the
> // ASYNC_BEGIN event above. The |step| param identifies this step within the
> // async event. This should be called at the beginning of the next phase of an
> // asynchronous operation.
>-#define TRACE_EVENT_ASYNC_STEP0(category, name, id, step) \
>-    INTERNAL_TRACE_EVENT_ADD_WITH_ID(TRACE_EVENT_PHASE_ASYNC_STEP, \
>-        category, name, id, TRACE_EVENT_FLAG_NONE, "step", step)
>-#define TRACE_EVENT_ASYNC_STEP1(category, name, id, step, \
>-                                      arg1_name, arg1_val) \
>-    INTERNAL_TRACE_EVENT_ADD_WITH_ID(TRACE_EVENT_PHASE_ASYNC_STEP, \
>-        category, name, id, TRACE_EVENT_FLAG_NONE, "step", step, \
>-        arg1_name, arg1_val)
>-#define TRACE_EVENT_COPY_ASYNC_STEP0(category, name, id, step) \
>-    INTERNAL_TRACE_EVENT_ADD_WITH_ID(TRACE_EVENT_PHASE_ASYNC_STEP, \
>-        category, name, id, TRACE_EVENT_FLAG_COPY, "step", step)
>-#define TRACE_EVENT_COPY_ASYNC_STEP1(category, name, id, step, \
>-        arg1_name, arg1_val) \
>-    INTERNAL_TRACE_EVENT_ADD_WITH_ID(TRACE_EVENT_PHASE_ASYNC_STEP, \
>-        category, name, id, TRACE_EVENT_FLAG_COPY, "step", step, \
>-        arg1_name, arg1_val)
>+#define TRACE_EVENT_ASYNC_STEP0(category, name, id, step)                              \
>+    INTERNAL_TRACE_EVENT_ADD_WITH_ID(TRACE_EVENT_PHASE_ASYNC_STEP, category, name, id, \
>+                                     TRACE_EVENT_FLAG_NONE, "step", step)
>+#define TRACE_EVENT_ASYNC_STEP1(category, name, id, step, arg1_name, arg1_val)         \
>+    INTERNAL_TRACE_EVENT_ADD_WITH_ID(TRACE_EVENT_PHASE_ASYNC_STEP, category, name, id, \
>+                                     TRACE_EVENT_FLAG_NONE, "step", step, arg1_name, arg1_val)
>+#define TRACE_EVENT_COPY_ASYNC_STEP0(category, name, id, step)                         \
>+    INTERNAL_TRACE_EVENT_ADD_WITH_ID(TRACE_EVENT_PHASE_ASYNC_STEP, category, name, id, \
>+                                     TRACE_EVENT_FLAG_COPY, "step", step)
>+#define TRACE_EVENT_COPY_ASYNC_STEP1(category, name, id, step, arg1_name, arg1_val)    \
>+    INTERNAL_TRACE_EVENT_ADD_WITH_ID(TRACE_EVENT_PHASE_ASYNC_STEP, category, name, id, \
>+                                     TRACE_EVENT_FLAG_COPY, "step", step, arg1_name, arg1_val)
> 
> // Records a single ASYNC_END event for "name" immediately. If the category
> // is not enabled, then this does nothing.
>-#define TRACE_EVENT_ASYNC_END0(category, name, id) \
>-    INTERNAL_TRACE_EVENT_ADD_WITH_ID(TRACE_EVENT_PHASE_ASYNC_END, \
>-        category, name, id, TRACE_EVENT_FLAG_NONE)
>-#define TRACE_EVENT_ASYNC_END1(category, name, id, arg1_name, arg1_val) \
>-    INTERNAL_TRACE_EVENT_ADD_WITH_ID(TRACE_EVENT_PHASE_ASYNC_END, \
>-        category, name, id, TRACE_EVENT_FLAG_NONE, arg1_name, arg1_val)
>-#define TRACE_EVENT_ASYNC_END2(category, name, id, arg1_name, arg1_val, \
>-        arg2_name, arg2_val) \
>-    INTERNAL_TRACE_EVENT_ADD_WITH_ID(TRACE_EVENT_PHASE_ASYNC_END, \
>-        category, name, id, TRACE_EVENT_FLAG_NONE, \
>-        arg1_name, arg1_val, arg2_name, arg2_val)
>-#define TRACE_EVENT_COPY_ASYNC_END0(category, name, id) \
>-    INTERNAL_TRACE_EVENT_ADD_WITH_ID(TRACE_EVENT_PHASE_ASYNC_END, \
>-        category, name, id, TRACE_EVENT_FLAG_COPY)
>-#define TRACE_EVENT_COPY_ASYNC_END1(category, name, id, arg1_name, arg1_val) \
>-    INTERNAL_TRACE_EVENT_ADD_WITH_ID(TRACE_EVENT_PHASE_ASYNC_END, \
>-        category, name, id, TRACE_EVENT_FLAG_COPY, \
>-        arg1_name, arg1_val)
>-#define TRACE_EVENT_COPY_ASYNC_END2(category, name, id, arg1_name, arg1_val, \
>-        arg2_name, arg2_val) \
>-    INTERNAL_TRACE_EVENT_ADD_WITH_ID(TRACE_EVENT_PHASE_ASYNC_END, \
>-        category, name, id, TRACE_EVENT_FLAG_COPY, \
>-        arg1_name, arg1_val, arg2_name, arg2_val)
>+#define TRACE_EVENT_ASYNC_END0(category, name, id)                                    \
>+    INTERNAL_TRACE_EVENT_ADD_WITH_ID(TRACE_EVENT_PHASE_ASYNC_END, category, name, id, \
>+                                     TRACE_EVENT_FLAG_NONE)
>+#define TRACE_EVENT_ASYNC_END1(category, name, id, arg1_name, arg1_val)               \
>+    INTERNAL_TRACE_EVENT_ADD_WITH_ID(TRACE_EVENT_PHASE_ASYNC_END, category, name, id, \
>+                                     TRACE_EVENT_FLAG_NONE, arg1_name, arg1_val)
>+#define TRACE_EVENT_ASYNC_END2(category, name, id, arg1_name, arg1_val, arg2_name, arg2_val) \
>+    INTERNAL_TRACE_EVENT_ADD_WITH_ID(TRACE_EVENT_PHASE_ASYNC_END, category, name, id,        \
>+                                     TRACE_EVENT_FLAG_NONE, arg1_name, arg1_val, arg2_name,  \
>+                                     arg2_val)
>+#define TRACE_EVENT_COPY_ASYNC_END0(category, name, id)                               \
>+    INTERNAL_TRACE_EVENT_ADD_WITH_ID(TRACE_EVENT_PHASE_ASYNC_END, category, name, id, \
>+                                     TRACE_EVENT_FLAG_COPY)
>+#define TRACE_EVENT_COPY_ASYNC_END1(category, name, id, arg1_name, arg1_val)          \
>+    INTERNAL_TRACE_EVENT_ADD_WITH_ID(TRACE_EVENT_PHASE_ASYNC_END, category, name, id, \
>+                                     TRACE_EVENT_FLAG_COPY, arg1_name, arg1_val)
>+#define TRACE_EVENT_COPY_ASYNC_END2(category, name, id, arg1_name, arg1_val, arg2_name, arg2_val) \
>+    INTERNAL_TRACE_EVENT_ADD_WITH_ID(TRACE_EVENT_PHASE_ASYNC_END, category, name, id,             \
>+                                     TRACE_EVENT_FLAG_COPY, arg1_name, arg1_val, arg2_name,       \
>+                                     arg2_val)
> 
> // Creates a scope of a sampling state with the given category and name (both must
> // be constant strings). These states are intended for a sampling profiler.
>@@ -438,8 +397,7 @@
> // Syntactic sugars for the sampling tracing in the main thread.
> #define TRACE_EVENT_SCOPED_SAMPLING_STATE(category, name) \
>     TRACE_EVENT_SCOPED_SAMPLING_STATE_FOR_BUCKET(0, category, name)
>-#define TRACE_EVENT_GET_SAMPLING_STATE() \
>-    TRACE_EVENT_GET_SAMPLING_STATE_FOR_BUCKET(0)
>+#define TRACE_EVENT_GET_SAMPLING_STATE() TRACE_EVENT_GET_SAMPLING_STATE_FOR_BUCKET(0)
> #define TRACE_EVENT_SET_SAMPLING_STATE(category, name) \
>     TRACE_EVENT_SET_SAMPLING_STATE_FOR_BUCKET(0, category, name)
> #define TRACE_EVENT_SET_NONCONST_SAMPLING_STATE(categoryAndName) \
>@@ -458,8 +416,7 @@
> // for best performance when tracing is disabled.
> // const unsigned char*
> //     TRACE_EVENT_API_GET_CATEGORY_ENABLED(const char* category_name)
>-#define TRACE_EVENT_API_GET_CATEGORY_ENABLED \
>-    angle::GetTraceCategoryEnabledFlag
>+#define TRACE_EVENT_API_GET_CATEGORY_ENABLED angle::GetTraceCategoryEnabledFlag
> 
> // Add a trace event to the platform tracing system.
> // void TRACE_EVENT_API_ADD_TRACE_EVENT(
>@@ -472,72 +429,64 @@
> //                    const unsigned char* arg_types,
> //                    const unsigned long long* arg_values,
> //                    unsigned char flags)
>-#define TRACE_EVENT_API_ADD_TRACE_EVENT \
>-    angle::AddTraceEvent
>+#define TRACE_EVENT_API_ADD_TRACE_EVENT angle::AddTraceEvent
> 
> ////////////////////////////////////////////////////////////////////////////////
> 
> // Implementation detail: trace event macros create temporary variables
> // to keep instrumentation overhead low. These macros give each temporary
> // variable a unique name based on the line number to prevent name collissions.
>-#define INTERNAL_TRACE_EVENT_UID3(a, b) \
>-    trace_event_unique_##a##b
>-#define INTERNAL_TRACE_EVENT_UID2(a, b) \
>-    INTERNAL_TRACE_EVENT_UID3(a, b)
>-#define INTERNALTRACEEVENTUID(name_prefix) \
>-    INTERNAL_TRACE_EVENT_UID2(name_prefix, __LINE__)
>+#define INTERNAL_TRACE_EVENT_UID3(a, b) trace_event_unique_##a##b
>+#define INTERNAL_TRACE_EVENT_UID2(a, b) INTERNAL_TRACE_EVENT_UID3(a, b)
>+#define INTERNALTRACEEVENTUID(name_prefix) INTERNAL_TRACE_EVENT_UID2(name_prefix, __LINE__)
> 
> // Implementation detail: internal macro to create static category.
>-#define INTERNAL_TRACE_EVENT_GET_CATEGORY_INFO(category) \
>-    static const unsigned char* INTERNALTRACEEVENTUID(catstatic) = 0; \
>-    if (!INTERNALTRACEEVENTUID(catstatic)) \
>-      INTERNALTRACEEVENTUID(catstatic) = \
>-          TRACE_EVENT_API_GET_CATEGORY_ENABLED(category);
>+#define INTERNAL_TRACE_EVENT_GET_CATEGORY_INFO(category)              \
>+    static const unsigned char *INTERNALTRACEEVENTUID(catstatic) = 0; \
>+    if (!INTERNALTRACEEVENTUID(catstatic))                            \
>+        INTERNALTRACEEVENTUID(catstatic) = TRACE_EVENT_API_GET_CATEGORY_ENABLED(category);
> 
> // Implementation detail: internal macro to create static category and add
> // event if the category is enabled.
>-#define INTERNAL_TRACE_EVENT_ADD(phase, category, name, flags, ...) \
>-    do { \
>-        INTERNAL_TRACE_EVENT_GET_CATEGORY_INFO(category); \
>-        if (*INTERNALTRACEEVENTUID(catstatic)) { \
>-            gl::TraceEvent::addTraceEvent( \
>-                phase, INTERNALTRACEEVENTUID(catstatic), name, \
>-                gl::TraceEvent::noEventId, flags, ##__VA_ARGS__); \
>-        } \
>+#define INTERNAL_TRACE_EVENT_ADD(phase, category, name, flags, ...)                         \
>+    do                                                                                      \
>+    {                                                                                       \
>+        INTERNAL_TRACE_EVENT_GET_CATEGORY_INFO(category);                                   \
>+        if (*INTERNALTRACEEVENTUID(catstatic))                                              \
>+        {                                                                                   \
>+            gl::TraceEvent::addTraceEvent(phase, INTERNALTRACEEVENTUID(catstatic), name,    \
>+                                          gl::TraceEvent::noEventId, flags, ##__VA_ARGS__); \
>+        }                                                                                   \
>     } while (0)
> 
> // Implementation detail: internal macro to create static category and add begin
> // event if the category is enabled. Also adds the end event when the scope
> // ends.
>-#define INTERNAL_TRACE_EVENT_ADD_SCOPED(category, name, ...) \
>-    INTERNAL_TRACE_EVENT_GET_CATEGORY_INFO(category); \
>-    gl::TraceEvent::TraceEndOnScopeClose \
>-        INTERNALTRACEEVENTUID(profileScope); \
>-    if (*INTERNALTRACEEVENTUID(catstatic)) { \
>-      gl::TraceEvent::addTraceEvent( \
>-          TRACE_EVENT_PHASE_BEGIN, \
>-          INTERNALTRACEEVENTUID(catstatic), \
>-          name, gl::TraceEvent::noEventId, \
>-          TRACE_EVENT_FLAG_NONE, ##__VA_ARGS__); \
>-      INTERNALTRACEEVENTUID(profileScope).initialize( \
>-          INTERNALTRACEEVENTUID(catstatic), name); \
>+#define INTERNAL_TRACE_EVENT_ADD_SCOPED(category, name, ...)                                     \
>+    INTERNAL_TRACE_EVENT_GET_CATEGORY_INFO(category);                                            \
>+    gl::TraceEvent::TraceEndOnScopeClose INTERNALTRACEEVENTUID(profileScope);                    \
>+    if (*INTERNALTRACEEVENTUID(catstatic))                                                       \
>+    {                                                                                            \
>+        gl::TraceEvent::addTraceEvent(TRACE_EVENT_PHASE_BEGIN, INTERNALTRACEEVENTUID(catstatic), \
>+                                      name, gl::TraceEvent::noEventId, TRACE_EVENT_FLAG_NONE,    \
>+                                      ##__VA_ARGS__);                                            \
>+        INTERNALTRACEEVENTUID(profileScope).initialize(INTERNALTRACEEVENTUID(catstatic), name);  \
>     }
> 
> // Implementation detail: internal macro to create static category and add
> // event if the category is enabled.
>-#define INTERNAL_TRACE_EVENT_ADD_WITH_ID(phase, category, name, id, flags, \
>-                                         ...) \
>-    do { \
>-        INTERNAL_TRACE_EVENT_GET_CATEGORY_INFO(category); \
>-        if (*INTERNALTRACEEVENTUID(catstatic)) { \
>-            unsigned char traceEventFlags = flags | TRACE_EVENT_FLAG_HAS_ID; \
>-            gl::TraceEvent::TraceID traceEventTraceID( \
>-                id, &traceEventFlags); \
>-            gl::TraceEvent::addTraceEvent( \
>-                phase, INTERNALTRACEEVENTUID(catstatic), \
>-                name, traceEventTraceID.data(), traceEventFlags, \
>-                ##__VA_ARGS__); \
>-        } \
>+#define INTERNAL_TRACE_EVENT_ADD_WITH_ID(phase, category, name, id, flags, ...)          \
>+    do                                                                                   \
>+    {                                                                                    \
>+        INTERNAL_TRACE_EVENT_GET_CATEGORY_INFO(category);                                \
>+        if (*INTERNALTRACEEVENTUID(catstatic))                                           \
>+        {                                                                                \
>+            unsigned char traceEventFlags = flags | TRACE_EVENT_FLAG_HAS_ID;             \
>+            gl::TraceEvent::TraceID traceEventTraceID(id, &traceEventFlags);             \
>+            gl::TraceEvent::addTraceEvent(phase, INTERNALTRACEEVENTUID(catstatic), name, \
>+                                          traceEventTraceID.data(), traceEventFlags,     \
>+                                          ##__VA_ARGS__);                                \
>+        }                                                                                \
>     } while (0)
> 
> // Notes regarding the following definitions:
>@@ -546,114 +495,128 @@
> // definitions.
> 
> // Phase indicates the nature of an event entry. E.g. part of a begin/end pair.
>-#define TRACE_EVENT_PHASE_BEGIN    ('B')
>-#define TRACE_EVENT_PHASE_END      ('E')
>-#define TRACE_EVENT_PHASE_INSTANT  ('I')
>+#define TRACE_EVENT_PHASE_BEGIN ('B')
>+#define TRACE_EVENT_PHASE_END ('E')
>+#define TRACE_EVENT_PHASE_INSTANT ('I')
> #define TRACE_EVENT_PHASE_ASYNC_BEGIN ('S')
>-#define TRACE_EVENT_PHASE_ASYNC_STEP  ('T')
>-#define TRACE_EVENT_PHASE_ASYNC_END   ('F')
>+#define TRACE_EVENT_PHASE_ASYNC_STEP ('T')
>+#define TRACE_EVENT_PHASE_ASYNC_END ('F')
> #define TRACE_EVENT_PHASE_METADATA ('M')
>-#define TRACE_EVENT_PHASE_COUNTER  ('C')
>-#define TRACE_EVENT_PHASE_SAMPLE  ('P')
>+#define TRACE_EVENT_PHASE_COUNTER ('C')
>+#define TRACE_EVENT_PHASE_SAMPLE ('P')
> 
> // Flags for changing the behavior of TRACE_EVENT_API_ADD_TRACE_EVENT.
>-#define TRACE_EVENT_FLAG_NONE        (static_cast<unsigned char>(0))
>-#define TRACE_EVENT_FLAG_COPY        (static_cast<unsigned char>(1 << 0))
>-#define TRACE_EVENT_FLAG_HAS_ID      (static_cast<unsigned char>(1 << 1))
>-#define TRACE_EVENT_FLAG_MANGLE_ID   (static_cast<unsigned char>(1 << 2))
>+#define TRACE_EVENT_FLAG_NONE (static_cast<unsigned char>(0))
>+#define TRACE_EVENT_FLAG_COPY (static_cast<unsigned char>(1 << 0))
>+#define TRACE_EVENT_FLAG_HAS_ID (static_cast<unsigned char>(1 << 1))
>+#define TRACE_EVENT_FLAG_MANGLE_ID (static_cast<unsigned char>(1 << 2))
> 
> // Type values for identifying types in the TraceValue union.
>-#define TRACE_VALUE_TYPE_BOOL         (static_cast<unsigned char>(1))
>-#define TRACE_VALUE_TYPE_UINT         (static_cast<unsigned char>(2))
>-#define TRACE_VALUE_TYPE_INT          (static_cast<unsigned char>(3))
>-#define TRACE_VALUE_TYPE_DOUBLE       (static_cast<unsigned char>(4))
>-#define TRACE_VALUE_TYPE_POINTER      (static_cast<unsigned char>(5))
>-#define TRACE_VALUE_TYPE_STRING       (static_cast<unsigned char>(6))
>-#define TRACE_VALUE_TYPE_COPY_STRING  (static_cast<unsigned char>(7))
>-
>-
>-namespace gl {
>+#define TRACE_VALUE_TYPE_BOOL (static_cast<unsigned char>(1))
>+#define TRACE_VALUE_TYPE_UINT (static_cast<unsigned char>(2))
>+#define TRACE_VALUE_TYPE_INT (static_cast<unsigned char>(3))
>+#define TRACE_VALUE_TYPE_DOUBLE (static_cast<unsigned char>(4))
>+#define TRACE_VALUE_TYPE_POINTER (static_cast<unsigned char>(5))
>+#define TRACE_VALUE_TYPE_STRING (static_cast<unsigned char>(6))
>+#define TRACE_VALUE_TYPE_COPY_STRING (static_cast<unsigned char>(7))
>+
>+namespace gl
>+{
> 
>-namespace TraceEvent {
>+namespace TraceEvent
>+{
> 
> // Specify these values when the corresponding argument of addTraceEvent is not
> // used.
>-const int zeroNumArgs = 0;
>+const int zeroNumArgs              = 0;
> const unsigned long long noEventId = 0;
> 
> // TraceID encapsulates an ID that can either be an integer or pointer. Pointers
> // are mangled with the Process ID so that they are unlikely to collide when the
> // same pointer is used on different processes.
>-class TraceID {
>-public:
>-    explicit TraceID(const void* id, unsigned char* flags) :
>-        m_data(static_cast<unsigned long long>(reinterpret_cast<uintptr_t>(id)))
>+class TraceID
>+{
>+  public:
>+    explicit TraceID(const void *id, unsigned char *flags)
>+        : m_data(static_cast<unsigned long long>(reinterpret_cast<uintptr_t>(id)))
>     {
>         *flags |= TRACE_EVENT_FLAG_MANGLE_ID;
>     }
>-    explicit TraceID(unsigned long long id, unsigned char* flags) : m_data(id) { (void)flags; }
>-    explicit TraceID(unsigned long id, unsigned char* flags) : m_data(id) { (void)flags; }
>-    explicit TraceID(unsigned int id, unsigned char* flags) : m_data(id) { (void)flags; }
>-    explicit TraceID(unsigned short id, unsigned char* flags) : m_data(id) { (void)flags; }
>-    explicit TraceID(unsigned char id, unsigned char* flags) : m_data(id) { (void)flags; }
>-    explicit TraceID(long long id, unsigned char* flags) :
>-        m_data(static_cast<unsigned long long>(id)) { (void)flags; }
>-    explicit TraceID(long id, unsigned char* flags) :
>-        m_data(static_cast<unsigned long long>(id)) { (void)flags; }
>-    explicit TraceID(int id, unsigned char* flags) :
>-        m_data(static_cast<unsigned long long>(id)) { (void)flags; }
>-    explicit TraceID(short id, unsigned char* flags) :
>-        m_data(static_cast<unsigned long long>(id)) { (void)flags; }
>-    explicit TraceID(signed char id, unsigned char* flags) :
>-        m_data(static_cast<unsigned long long>(id)) { (void)flags; }
>+    explicit TraceID(unsigned long long id, unsigned char *flags) : m_data(id) { (void)flags; }
>+    explicit TraceID(unsigned long id, unsigned char *flags) : m_data(id) { (void)flags; }
>+    explicit TraceID(unsigned int id, unsigned char *flags) : m_data(id) { (void)flags; }
>+    explicit TraceID(unsigned short id, unsigned char *flags) : m_data(id) { (void)flags; }
>+    explicit TraceID(unsigned char id, unsigned char *flags) : m_data(id) { (void)flags; }
>+    explicit TraceID(long long id, unsigned char *flags)
>+        : m_data(static_cast<unsigned long long>(id))
>+    {
>+        (void)flags;
>+    }
>+    explicit TraceID(long id, unsigned char *flags) : m_data(static_cast<unsigned long long>(id))
>+    {
>+        (void)flags;
>+    }
>+    explicit TraceID(int id, unsigned char *flags) : m_data(static_cast<unsigned long long>(id))
>+    {
>+        (void)flags;
>+    }
>+    explicit TraceID(short id, unsigned char *flags) : m_data(static_cast<unsigned long long>(id))
>+    {
>+        (void)flags;
>+    }
>+    explicit TraceID(signed char id, unsigned char *flags)
>+        : m_data(static_cast<unsigned long long>(id))
>+    {
>+        (void)flags;
>+    }
> 
>     unsigned long long data() const { return m_data; }
> 
>-private:
>+  private:
>     unsigned long long m_data;
> };
> 
> // Simple union to store various types as unsigned long long.
>-union TraceValueUnion {
>+union TraceValueUnion
>+{
>     bool m_bool;
>     unsigned long long m_uint;
>     long long m_int;
>     double m_double;
>-    const void* m_pointer;
>-    const char* m_string;
>+    const void *m_pointer;
>+    const char *m_string;
> };
> 
> // Simple container for const char* that should be copied instead of retained.
>-class TraceStringWithCopy {
>-public:
>-    explicit TraceStringWithCopy(const char* str) : m_str(str) { }
>-    operator const char* () const { return m_str; }
>-private:
>-    const char* m_str;
>+class TraceStringWithCopy
>+{
>+  public:
>+    explicit TraceStringWithCopy(const char *str) : m_str(str) {}
>+    operator const char *() const { return m_str; }
>+
>+  private:
>+    const char *m_str;
> };
> 
> // Define setTraceValue for each allowed type. It stores the type and
> // value in the return arguments. This allows this API to avoid declaring any
> // structures so that it is portable to third_party libraries.
>-#define INTERNAL_DECLARE_SET_TRACE_VALUE(actual_type, \
>-                                         union_member, \
>-                                         value_type_id) \
>-    static inline void setTraceValue(actual_type arg, \
>-                                     unsigned char* type, \
>-                                     unsigned long long* value) { \
>-        TraceValueUnion typeValue; \
>-        typeValue.union_member = arg; \
>-        *type = value_type_id; \
>-        *value = typeValue.m_uint; \
>+#define INTERNAL_DECLARE_SET_TRACE_VALUE(actual_type, union_member, value_type_id) \
>+    static inline void setTraceValue(actual_type arg, unsigned char *type,         \
>+                                     unsigned long long *value)                    \
>+    {                                                                              \
>+        TraceValueUnion typeValue;                                                 \
>+        typeValue.union_member = arg;                                              \
>+        *type                  = value_type_id;                                    \
>+        *value                 = typeValue.m_uint;                                 \
>     }
> // Simpler form for int types that can be safely casted.
>-#define INTERNAL_DECLARE_SET_TRACE_VALUE_INT(actual_type, \
>-                                             value_type_id) \
>-    static inline void setTraceValue(actual_type arg, \
>-                                     unsigned char* type, \
>-                                     unsigned long long* value) { \
>-        *type = value_type_id; \
>-        *value = static_cast<unsigned long long>(arg); \
>+#define INTERNAL_DECLARE_SET_TRACE_VALUE_INT(actual_type, value_type_id)   \
>+    static inline void setTraceValue(actual_type arg, unsigned char *type, \
>+                                     unsigned long long *value)            \
>+    {                                                                      \
>+        *type  = value_type_id;                                            \
>+        *value = static_cast<unsigned long long>(arg);                     \
>     }
> 
> INTERNAL_DECLARE_SET_TRACE_VALUE_INT(unsigned long long, TRACE_VALUE_TYPE_UINT)
>@@ -666,23 +629,23 @@ INTERNAL_DECLARE_SET_TRACE_VALUE_INT(short, TRACE_VALUE_TYPE_INT)
> INTERNAL_DECLARE_SET_TRACE_VALUE_INT(signed char, TRACE_VALUE_TYPE_INT)
> INTERNAL_DECLARE_SET_TRACE_VALUE(bool, m_bool, TRACE_VALUE_TYPE_BOOL)
> INTERNAL_DECLARE_SET_TRACE_VALUE(double, m_double, TRACE_VALUE_TYPE_DOUBLE)
>-INTERNAL_DECLARE_SET_TRACE_VALUE(const void*, m_pointer,
>-                                 TRACE_VALUE_TYPE_POINTER)
>-INTERNAL_DECLARE_SET_TRACE_VALUE(const char*, m_string,
>-                                 TRACE_VALUE_TYPE_STRING)
>-INTERNAL_DECLARE_SET_TRACE_VALUE(const TraceStringWithCopy&, m_string,
>+INTERNAL_DECLARE_SET_TRACE_VALUE(const void *, m_pointer, TRACE_VALUE_TYPE_POINTER)
>+INTERNAL_DECLARE_SET_TRACE_VALUE(const char *, m_string, TRACE_VALUE_TYPE_STRING)
>+INTERNAL_DECLARE_SET_TRACE_VALUE(const TraceStringWithCopy &,
>+                                 m_string,
>                                  TRACE_VALUE_TYPE_COPY_STRING)
> 
> #undef INTERNAL_DECLARE_SET_TRACE_VALUE
> #undef INTERNAL_DECLARE_SET_TRACE_VALUE_INT
> 
>-static inline void setTraceValue(const std::string& arg,
>-                                 unsigned char* type,
>-                                 unsigned long long* value) {
>+static inline void setTraceValue(const std::string &arg,
>+                                 unsigned char *type,
>+                                 unsigned long long *value)
>+{
>     TraceValueUnion typeValue;
>     typeValue.m_string = arg.data();
>-    *type = TRACE_VALUE_TYPE_COPY_STRING;
>-    *value = typeValue.m_uint;
>+    *type              = TRACE_VALUE_TYPE_COPY_STRING;
>+    *value             = typeValue.m_uint;
> }
> 
> // These addTraceEvent template functions are defined here instead of in the
>@@ -696,10 +659,8 @@ static inline angle::TraceEventHandle addTraceEvent(char phase,
>                                                     unsigned long long id,
>                                                     unsigned char flags)
> {
>-    return TRACE_EVENT_API_ADD_TRACE_EVENT(
>-        phase, categoryEnabled, name, id,
>-        zeroNumArgs, 0, 0, 0,
>-        flags);
>+    return TRACE_EVENT_API_ADD_TRACE_EVENT(phase, categoryEnabled, name, id, zeroNumArgs, 0, 0, 0,
>+                                           flags);
> }
> 
> template <class ARG1_TYPE>
>@@ -715,10 +676,8 @@ static inline angle::TraceEventHandle addTraceEvent(char phase,
>     unsigned char argTypes[1];
>     unsigned long long argValues[1];
>     setTraceValue(arg1Val, &argTypes[0], &argValues[0]);
>-    return TRACE_EVENT_API_ADD_TRACE_EVENT(
>-        phase, categoryEnabled, name, id,
>-        numArgs, &arg1Name, argTypes, argValues,
>-        flags);
>+    return TRACE_EVENT_API_ADD_TRACE_EVENT(phase, categoryEnabled, name, id, numArgs, &arg1Name,
>+                                           argTypes, argValues, flags);
> }
> 
> template <class ARG1_TYPE, class ARG2_TYPE>
>@@ -732,49 +691,45 @@ static inline angle::TraceEventHandle addTraceEvent(char phase,
>                                                     const char *arg2Name,
>                                                     const ARG2_TYPE &arg2Val)
> {
>-    const int numArgs = 2;
>-    const char* argNames[2] = { arg1Name, arg2Name };
>+    const int numArgs       = 2;
>+    const char *argNames[2] = {arg1Name, arg2Name};
>     unsigned char argTypes[2];
>     unsigned long long argValues[2];
>     setTraceValue(arg1Val, &argTypes[0], &argValues[0]);
>     setTraceValue(arg2Val, &argTypes[1], &argValues[1]);
>-    return TRACE_EVENT_API_ADD_TRACE_EVENT(
>-        phase, categoryEnabled, name, id,
>-        numArgs, argNames, argTypes, argValues,
>-        flags);
>+    return TRACE_EVENT_API_ADD_TRACE_EVENT(phase, categoryEnabled, name, id, numArgs, argNames,
>+                                           argTypes, argValues, flags);
> }
> 
> // Used by TRACE_EVENTx macro. Do not use directly.
>-class TraceEndOnScopeClose {
>-public:
>+class TraceEndOnScopeClose
>+{
>+  public:
>     // Note: members of m_data intentionally left uninitialized. See initialize.
>-    TraceEndOnScopeClose() : m_pdata(0) { }
>+    TraceEndOnScopeClose() : m_pdata(0) {}
>     ~TraceEndOnScopeClose()
>     {
>         if (m_pdata)
>             addEventIfEnabled();
>     }
> 
>-    void initialize(const unsigned char* categoryEnabled,
>-                    const char* name)
>+    void initialize(const unsigned char *categoryEnabled, const char *name)
>     {
>         m_data.categoryEnabled = categoryEnabled;
>-        m_data.name = name;
>-        m_pdata = &m_data;
>+        m_data.name            = name;
>+        m_pdata                = &m_data;
>     }
> 
>-private:
>+  private:
>     // Add the end event if the category is still enabled.
>     void addEventIfEnabled()
>     {
>         // Only called when m_pdata is non-null.
>-        if (*m_pdata->categoryEnabled) {
>-            TRACE_EVENT_API_ADD_TRACE_EVENT(
>-                TRACE_EVENT_PHASE_END,
>-                m_pdata->categoryEnabled,
>-                m_pdata->name, noEventId,
>-                zeroNumArgs, 0, 0, 0,
>-                TRACE_EVENT_FLAG_NONE);
>+        if (*m_pdata->categoryEnabled)
>+        {
>+            TRACE_EVENT_API_ADD_TRACE_EVENT(TRACE_EVENT_PHASE_END, m_pdata->categoryEnabled,
>+                                            m_pdata->name, noEventId, zeroNumArgs, 0, 0, 0,
>+                                            TRACE_EVENT_FLAG_NONE);
>         }
>     }
> 
>@@ -783,16 +738,17 @@ private:
>     // constructed, even when tracing is disabled. If the members of Data were
>     // members of this class instead, compiler warnings occur about potential
>     // uninitialized accesses.
>-    struct Data {
>-        const unsigned char* categoryEnabled;
>-        const char* name;
>+    struct Data
>+    {
>+        const unsigned char *categoryEnabled;
>+        const char *name;
>     };
>-    Data* m_pdata;
>+    Data *m_pdata;
>     Data m_data;
> };
> 
>-} // namespace TraceEvent
>+}  // namespace TraceEvent
> 
>-} // namespace gl
>+}  // namespace gl
> 
> #endif
>diff --git a/Source/ThirdParty/ANGLE/src/vulkan_support/BUILD.gn b/Source/ThirdParty/ANGLE/src/vulkan_support/BUILD.gn
>deleted file mode 100644
>index b2c3473e7ec..00000000000
>--- a/Source/ThirdParty/ANGLE/src/vulkan_support/BUILD.gn
>+++ /dev/null
>@@ -1,508 +0,0 @@
>-# Copyright 2016 The ANGLE Project Authors. All rights reserved.
>-# Use of this source code is governed by a BSD-style license that can be
>-# found in the LICENSE file.
>-
>-# TODO(jmadill): Redo the file entirely when we have standalone GN ANGLE.
>-
>-import("../../gni/angle.gni")
>-
>-if (build_with_chromium) {
>-  third_party_dir = "../../../../third_party"
>-} else {
>-  third_party_dir = "../../third_party"
>-}
>-
>-glslang_dir = "$third_party_dir/glslang-angle/src"
>-spirv_headers_dir = "$third_party_dir/spirv-headers/src"
>-spirv_tools_dir = "$third_party_dir/spirv-tools-angle/src"
>-vulkan_layers_dir = "$third_party_dir/vulkan-validation-layers/src"
>-raw_vulkan_layers_dir = rebase_path(vulkan_layers_dir, root_build_dir)
>-
>-vulkan_gypi =
>-    exec_script("//build/gypi_to_gn.py",
>-                [
>-                  rebase_path("vulkan.gypi"),
>-                  "--replace=<(angle_gen_path)=$target_gen_dir/angle",
>-                  "--replace=<(glslang_path)=../$glslang_dir",
>-                  "--replace=<(spirv_headers_path)=../$spirv_headers_dir",
>-                  "--replace=<(spirv_tools_path)=../$spirv_tools_dir",
>-                  "--replace=<(vulkan_layers_path)=../$vulkan_layers_dir",
>-                ],
>-                "scope",
>-                [ "vulkan.gypi" ])
>-
>-# Subdirectory to place data files (e.g. layer JSON files).
>-data_dir = "angledata"
>-
>-vulkan_gen_json_files_outputs = [
>-  "$root_out_dir/$data_dir/VkLayer_core_validation.json",
>-  "$root_out_dir/$data_dir/VkLayer_object_tracker.json",
>-  "$root_out_dir/$data_dir/VkLayer_parameter_validation.json",
>-  "$root_out_dir/$data_dir/VkLayer_swapchain.json",
>-  "$root_out_dir/$data_dir/VkLayer_threading.json",
>-  "$root_out_dir/$data_dir/VkLayer_unique_objects.json",
>-]
>-
>-vulkan_undefine_configs = []
>-if (is_win) {
>-  vulkan_undefine_configs += [
>-    "//build/config/win:nominmax",
>-    "//build/config/win:unicode",
>-  ]
>-}
>-
>-vulkan_gen_dir = "$target_gen_dir/angle/vulkan"
>-raw_vulkan_gen_dir = rebase_path(vulkan_gen_dir, root_build_dir)
>-
>-# Vulkan helper scripts
>-# ---------------------
>-
>-helper_script_and_deps = [
>-  [
>-    "vulkan_gen_dispatch_table_helper_h",
>-    "vk_dispatch_table_helper.h",
>-    "dispatch_table_helper_generator.py",
>-  ],
>-  [
>-    "vulkan_gen_enum_string_helper",
>-    "vk_enum_string_helper.h",
>-    "helper_file_generator.py",
>-  ],
>-  [
>-    "vulkan_gen_layer_dispatch_table_h",
>-    "vk_layer_dispatch_table.h",
>-    "loader_extension_generator.py",
>-  ],
>-  [
>-    "vulkan_gen_loader_extensions_c",
>-    "vk_loader_extensions.c",
>-    "loader_extension_generator.py",
>-  ],
>-  [
>-    "vulkan_gen_loader_extensions_h",
>-    "vk_loader_extensions.h",
>-    "loader_extension_generator.py",
>-  ],
>-  [
>-    "vulkan_gen_safe_struct_cpp",
>-    "vk_safe_struct.cpp",
>-    "helper_file_generator.py",
>-  ],
>-  [
>-    "vulkan_gen_safe_struct_h",
>-    "vk_safe_struct.h",
>-    "helper_file_generator.py",
>-  ],
>-  [
>-    "vulkan_gen_struct_size_helper_c",
>-    "vk_struct_size_helper.c",
>-    "helper_file_generator.py",
>-  ],
>-  [
>-    "vulkan_gen_struct_size_helper_h",
>-    "vk_struct_size_helper.h",
>-    "helper_file_generator.py",
>-  ],
>-  [
>-    "vulkan_gen_thread_check_helper",
>-    "thread_check.h",
>-    "threading_generator.py",
>-  ],
>-  [
>-    "vulkan_gen_parameter_validation_helper",
>-    "parameter_validation.h",
>-    "parameter_validation_generator.py",
>-  ],
>-  [
>-    "vulkan_gen_unique_objects_wrappers_helper",
>-    "unique_objects_wrappers.h",
>-    "unique_objects_generator.py",
>-  ],
>-]
>-
>-foreach(script_and_dep, helper_script_and_deps) {
>-  target_name = script_and_dep[0]
>-  file = script_and_dep[1]
>-  dep = script_and_dep[2]
>-  target("action", target_name) {
>-    script = "$vulkan_layers_dir/scripts/lvl_genvk.py"
>-    inputs = [
>-      "$vulkan_layers_dir/scripts/$dep",
>-      "$vulkan_layers_dir/scripts/generator.py",
>-      "$vulkan_layers_dir/scripts/reg.py",
>-      "$vulkan_layers_dir/scripts/vk.xml",
>-    ]
>-    outputs = [
>-      "$vulkan_gen_dir/$file",
>-    ]
>-    args = [
>-      "-o",
>-      raw_vulkan_gen_dir,
>-      "-registry",
>-      "$raw_vulkan_layers_dir/scripts/vk.xml",
>-      "$file",
>-      "-quiet",
>-    ]
>-  }
>-}
>-
>-config("vulkan_generate_helper_files_config") {
>-  include_dirs = [
>-    vulkan_gen_dir,
>-    "$vulkan_layers_dir/include",
>-  ]
>-}
>-
>-group("vulkan_generate_helper_files") {
>-  public_deps = []
>-  public_configs = [ ":vulkan_generate_helper_files_config" ]
>-  foreach(script_and_dep, helper_script_and_deps) {
>-    target_name = script_and_dep[0]
>-    public_deps += [ ":$target_name" ]
>-  }
>-}
>-
>-config("vulkan_config") {
>-  if (is_win) {
>-    defines = [
>-      "VK_USE_PLATFORM_WIN32_KHR",
>-      "VK_USE_PLATFORM_WIN32_KHX",
>-    ]
>-  }
>-  if (is_linux) {
>-    defines = [
>-      "VK_USE_PLATFORM_XCB_KHR",
>-      "VK_USE_PLATFORM_XCB_KHX",
>-    ]
>-  }
>-}
>-
>-config("vulkan_internal_config") {
>-  defines = [ "VULKAN_NON_CMAKE_BUILD" ]
>-  if (is_clang || !is_win) {
>-    cflags = [ "-Wno-unused-function" ]
>-
>-    # See https://github.com/KhronosGroup/Vulkan-LoaderAndValidationLayers/issues/1649
>-    # TODO(jmadill): Lift this once github issue is fixed.
>-    cflags += [ "-Wno-ignored-attributes" ]
>-  }
>-  if (is_linux) {
>-    defines += [
>-      "SYSCONFDIR=\"/etc\"",
>-      "FALLBACK_CONFIG_DIRS=\"/etc/xdg\"",
>-      "FALLBACK_DATA_DIRS=\"/usr/local/share:/usr/share\"",
>-    ]
>-  }
>-}
>-
>-# Vulkan loader
>-# -------------
>-
>-config("vulkan_loader_config") {
>-  include_dirs = rebase_path(vulkan_gypi.vulkan_loader_include_dirs, ".", "src")
>-  include_dirs += [ vulkan_gen_dir ]
>-  defines = [
>-    "ANGLE_VK_LAYERS_DIR=\"$data_dir\"",
>-    "API_NAME=\"Vulkan\"",
>-  ]
>-
>-  if (is_win) {
>-    cflags = [ "/wd4201" ]
>-  }
>-  if (is_linux) {
>-    # assume secure_getenv() is available
>-    defines += [ "HAVE_SECURE_GETENV" ]
>-  }
>-}
>-
>-static_library("vulkan_loader") {
>-  sources = rebase_path(vulkan_gypi.vulkan_loader_sources, ".", "src")
>-  if (is_win) {
>-    sources += rebase_path(vulkan_gypi.vulkan_loader_win_sources, ".", "src")
>-    if (!is_clang) {
>-      cflags = vulkan_gypi.vulkan_loader_cflags_win
>-    }
>-  }
>-  deps = [
>-    ":vulkan_generate_helper_files",
>-  ]
>-  configs += [ ":vulkan_internal_config" ]
>-  public_configs = [
>-    ":vulkan_config",
>-    ":vulkan_loader_config",
>-  ]
>-  configs -= vulkan_undefine_configs
>-}
>-
>-# SPIRV-tools
>-# -----------
>-
>-spirv_source_dir = "$spirv_tools_dir/source"
>-spirv_include_dir = "$spirv_headers_dir/include/spirv"
>-raw_spirv_source_dir = rebase_path(spirv_source_dir, root_build_dir)
>-raw_spirv_include_dir = rebase_path(spirv_include_dir, root_build_dir)
>-raw_spirv_headers_dir = rebase_path(spirv_headers_dir, root_build_dir)
>-
>-action("spirv_tools_gen_tables_1_0") {
>-  script = "$spirv_tools_dir/utils/generate_grammar_tables.py"
>-  sources = [
>-    "$spirv_include_dir/1.0/extinst.glsl.std.450.grammar.json",
>-    "$spirv_include_dir/1.0/spirv.core.grammar.json",
>-    "$spirv_source_dir/extinst-1.0.opencl.std.grammar.json",
>-  ]
>-  outputs = [
>-    "$vulkan_gen_dir/core.insts-1.0.inc",
>-    "$vulkan_gen_dir/glsl.std.450.insts-1.0.inc",
>-    "$vulkan_gen_dir/opencl.std.insts-1.0.inc",
>-    "$vulkan_gen_dir/operand.kinds-1.0.inc",
>-  ]
>-  args = [
>-    "--spirv-core-grammar=$raw_spirv_include_dir/1.0/spirv.core.grammar.json",
>-    "--extinst-glsl-grammar=$raw_spirv_include_dir/1.0/extinst.glsl.std.450.grammar.json",
>-    "--extinst-opencl-grammar=$raw_spirv_source_dir/extinst-1.0.opencl.std.grammar.json",
>-    "--core-insts-output=$raw_vulkan_gen_dir/core.insts-1.0.inc",
>-    "--glsl-insts-output=$raw_vulkan_gen_dir/glsl.std.450.insts-1.0.inc",
>-    "--opencl-insts-output=$raw_vulkan_gen_dir/opencl.std.insts-1.0.inc",
>-    "--operand-kinds-output=$raw_vulkan_gen_dir/operand.kinds-1.0.inc",
>-  ]
>-}
>-
>-action("spirv_tools_gen_tables_1_1") {
>-  script = "$spirv_tools_dir/utils/generate_grammar_tables.py"
>-  sources = [
>-    "$spirv_include_dir/1.1/spirv.core.grammar.json",
>-  ]
>-  outputs = [
>-    "$vulkan_gen_dir/core.insts-1.1.inc",
>-    "$vulkan_gen_dir/operand.kinds-1.1.inc",
>-  ]
>-  args = [
>-    "--spirv-core-grammar=$raw_spirv_include_dir/1.1/spirv.core.grammar.json",
>-    "--core-insts-output=$raw_vulkan_gen_dir/core.insts-1.1.inc",
>-    "--operand-kinds-output=$raw_vulkan_gen_dir/operand.kinds-1.1.inc",
>-  ]
>-}
>-
>-action("spirv_tools_gen_generators_inc") {
>-  script = "$spirv_tools_dir/utils/generate_registry_tables.py"
>-  sources = [
>-    "$spirv_headers_dir/include/spirv/spir-v.xml",
>-  ]
>-  outputs = [
>-    "$vulkan_gen_dir/generators.inc",
>-  ]
>-  args = [
>-    "--xml=$raw_spirv_headers_dir/include/spirv/spir-v.xml",
>-    "--generator-output=$raw_vulkan_gen_dir/generators.inc",
>-  ]
>-}
>-
>-config("spirv_tools_config") {
>-  include_dirs = [ "$spirv_tools_dir/include" ]
>-  if (is_win) {
>-    cflags = [
>-      "/wd4706",
>-
>-      # These are triggered in higher optimization levels. Disable for now until
>-      # fixes are landed upstream. See https://crbug.com/677837.
>-      "/wd4701",
>-      "/wd4703",
>-    ]
>-  }
>-}
>-
>-static_library("spirv_tools") {
>-  deps = [
>-    ":spirv_tools_gen_generators_inc",
>-    ":spirv_tools_gen_tables_1_0",
>-    ":spirv_tools_gen_tables_1_1",
>-  ]
>-  include_dirs = [
>-    vulkan_gen_dir,
>-    "$spirv_headers_dir/include",
>-    "$spirv_tools_dir/source",
>-  ]
>-  sources = rebase_path(vulkan_gypi.spirv_tools_sources, ".", "src")
>-  public_configs = [ ":spirv_tools_config" ]
>-}
>-
>-# glslang
>-# -------
>-
>-config("glslang_config") {
>-  include_dirs = [
>-    glslang_dir,
>-    "$glslang_dir/glslang/Public",
>-  ]
>-}
>-
>-config("glslang_internal_config") {
>-  if (is_clang || !is_win) {
>-    cflags = [
>-      "-Wno-ignored-qualifiers",
>-      "-Wno-reorder",
>-    ]
>-  }
>-}
>-
>-static_library("glslang") {
>-  sources = rebase_path(vulkan_gypi.glslang_sources, ".", "src")
>-  public_configs = [ ":glslang_config" ]
>-  configs += [ ":glslang_internal_config" ]
>-
>-  if (is_win) {
>-    cflags = [
>-      "/wd4100",  # Unreferenced formal parameter
>-      "/wd4456",  # Declaration hides previous local declaration
>-      "/wd4457",  # Declaration hides function parameter
>-      "/wd4458",  # Declaration hides class member
>-      "/wd4702",  # Unreachable code (from glslang_tab.cpp)
>-      "/wd4718",  # Recursive call has no side effects (from PpContext.cpp)
>-    ]
>-
>-    sources += rebase_path(vulkan_gypi.glslang_win_sources, ".", "src")
>-  }
>-  if (is_linux) {
>-    sources += rebase_path(vulkan_gypi.glslang_unix_sources, ".", "src")
>-  }
>-}
>-
>-# The validation layers
>-# ---------------------
>-
>-config("vulkan_layer_config") {
>-  include_dirs = [ "$vulkan_layers_dir/layers" ]
>-}
>-
>-source_set("vulkan_layer_table") {
>-  configs -= vulkan_undefine_configs
>-  public_deps = [
>-    ":vulkan_generate_helper_files",
>-  ]
>-  public_configs = [
>-    ":vulkan_config",
>-    ":vulkan_layer_config",
>-    ":vulkan_internal_config",
>-  ]
>-  sources = [
>-    "$target_gen_dir/angle/vulkan/vk_dispatch_table_helper.h",
>-    "$target_gen_dir/angle/vulkan/vk_enum_string_helper.h",
>-    "$vulkan_layers_dir/layers/vk_layer_table.cpp",
>-    "$vulkan_layers_dir/layers/vk_layer_table.h",
>-  ]
>-}
>-
>-layers = [
>-  [
>-    "core_validation",
>-    vulkan_gypi.VkLayer_core_validation_sources,
>-    ":vulkan_core_validation_glslang",
>-  ],
>-  [
>-    "object_tracker",
>-    vulkan_gypi.VkLayer_object_tracker_sources,
>-    "",
>-  ],
>-  [
>-    "unique_objects",
>-    vulkan_gypi.VkLayer_unique_objects_sources,
>-    ":vulkan_gen_unique_objects_wrappers_helper",
>-  ],
>-  [
>-    "parameter_validation",
>-    vulkan_gypi.VkLayer_parameter_validation_sources,
>-    ":vulkan_gen_parameter_validation_helper",
>-  ],
>-  [
>-    "swapchain",
>-    vulkan_gypi.VkLayer_swapchain_sources,
>-    "",
>-  ],
>-  [
>-    "threading",
>-    vulkan_gypi.VkLayer_threading_sources,
>-    ":vulkan_gen_thread_check_helper",
>-  ],
>-]
>-
>-action("vulkan_gen_json_files") {
>-  script = "$angle_root/scripts/generate_vulkan_layers_json.py"
>-  if (is_win) {
>-    sources =
>-        rebase_path(vulkan_gypi.vulkan_gen_json_files_sources_win, ".", "src")
>-    args = [ "$raw_vulkan_layers_dir/layers/windows" ]
>-  }
>-  if (is_linux) {
>-    sources =
>-        rebase_path(vulkan_gypi.vulkan_gen_json_files_sources_linux, ".", "src")
>-    args = [ "$raw_vulkan_layers_dir/layers/linux" ]
>-  }
>-
>-  # The layer JSON files are part of the necessary data deps.
>-  outputs = vulkan_gen_json_files_outputs
>-  data = vulkan_gen_json_files_outputs
>-  args += [ rebase_path("$root_out_dir/$data_dir", root_build_dir) ]
>-}
>-
>-source_set("vulkan_layer_utils") {
>-  sources = rebase_path(vulkan_gypi.vulkan_layer_utils_sources, ".", "src")
>-  public_configs = [
>-    ":vulkan_config",
>-    ":vulkan_loader_config",
>-    ":vulkan_internal_config",
>-  ]
>-  public_deps = [
>-    ":vulkan_generate_helper_files",
>-  ]
>-  configs -= vulkan_undefine_configs
>-}
>-
>-config("vulkan_core_validation_config") {
>-  include_dirs = [ glslang_dir ]
>-}
>-
>-source_set("vulkan_core_validation_glslang") {
>-  public_deps = [
>-    ":spirv_tools",
>-  ]
>-  public_configs = [ ":vulkan_core_validation_config" ]
>-}
>-
>-foreach(layer_info, layers) {
>-  name = layer_info[0]
>-  shared_library("VkLayer_$name") {
>-    configs -= vulkan_undefine_configs
>-    deps = [
>-      ":vulkan_layer_table",
>-      ":vulkan_layer_utils",
>-      "//build/config:exe_and_shlib_deps",
>-    ]
>-    if (layer_info[2] != "") {
>-      deps += [ layer_info[2] ]
>-    }
>-    sources = rebase_path(layer_info[1], ".", "src")
>-    if (is_win) {
>-      sources += [ "$vulkan_layers_dir/layers/VkLayer_$name.def" ]
>-    }
>-  }
>-}
>-
>-# Use this target to include everything ANGLE needs for Vulkan.
>-group("angle_vulkan") {
>-  deps = [
>-    ":glslang",
>-    ":vulkan_loader",
>-  ]
>-  data_deps = [
>-    ":vulkan_gen_json_files",
>-  ]
>-  foreach(layer_info, layers) {
>-    name = layer_info[0]
>-    data_deps += [ ":VkLayer_$name" ]
>-  }
>-  public_configs = [
>-    ":vulkan_config",
>-    ":vulkan_loader_config",
>-    ":glslang_config",
>-  ]
>-}
>diff --git a/Source/ThirdParty/ANGLE/src/vulkan_support/vulkan.gypi b/Source/ThirdParty/ANGLE/src/vulkan_support/vulkan.gypi
>deleted file mode 100644
>index c76e2d86f90..00000000000
>--- a/Source/ThirdParty/ANGLE/src/vulkan_support/vulkan.gypi
>+++ /dev/null
>@@ -1,1315 +0,0 @@
>-# Copyright 2016 The ANGLE Project Authors. All rights reserved.
>-# Use of this source code is governed by a BSD-style license that can be
>-# found in the LICENSE file.
>-
>-{
>-    'variables':
>-    {
>-        'glslang_path': '../../third_party/glslang-angle/src',
>-        'spirv_headers_path': '../../third_party/spirv-headers/src',
>-        'spirv_tools_path': '../../third_party/spirv-tools-angle/src',
>-        'vulkan_layers_path': '../../third_party/vulkan-validation-layers/src',
>-        'vulkan_json': 'angledata',
>-        'vulkan_loader_sources':
>-        [
>-            '<(vulkan_layers_path)/loader/cJSON.c',
>-            '<(vulkan_layers_path)/loader/cJSON.h',
>-            '<(vulkan_layers_path)/loader/debug_report.c',
>-            '<(vulkan_layers_path)/loader/debug_report.h',
>-            '<(vulkan_layers_path)/loader/dev_ext_trampoline.c',
>-            '<(vulkan_layers_path)/loader/extension_manual.c',
>-            '<(vulkan_layers_path)/loader/extension_manual.h',
>-            '<(vulkan_layers_path)/loader/gpa_helper.h',
>-            '<(vulkan_layers_path)/loader/loader.c',
>-            '<(vulkan_layers_path)/loader/loader.h',
>-            '<(vulkan_layers_path)/loader/murmurhash.c',
>-            '<(vulkan_layers_path)/loader/murmurhash.h',
>-            '<(vulkan_layers_path)/loader/phys_dev_ext.c',
>-            '<(vulkan_layers_path)/loader/trampoline.c',
>-            '<(vulkan_layers_path)/loader/vk_loader_platform.h',
>-            '<(vulkan_layers_path)/loader/wsi.c',
>-            '<(vulkan_layers_path)/loader/wsi.h',
>-        ],
>-        'vulkan_loader_win_sources':
>-        [
>-            '<(vulkan_layers_path)/loader/dirent_on_windows.c',
>-            '<(vulkan_layers_path)/loader/dirent_on_windows.h',
>-        ],
>-        'vulkan_loader_include_dirs':
>-        [
>-            '<(vulkan_layers_path)/include',
>-            '<(vulkan_layers_path)/loader',
>-        ],
>-        'vulkan_loader_cflags_win':
>-        [
>-            '/wd4054', # Type cast from function pointer
>-            '/wd4055', # Type cast from data pointer
>-            '/wd4100', # Unreferenced formal parameter
>-            '/wd4152', # Nonstandard extension used (pointer conversion)
>-            '/wd4201', # Nonstandard extension used: nameless struct/union
>-            '/wd4214', # Nonstandard extension used: bit field types other than int
>-            '/wd4232', # Nonstandard extension used: address of dllimport is not static
>-            '/wd4305', # Type cast truncation
>-            '/wd4706', # Assignment within conditional expression
>-            '/wd4996', # Unsafe stdlib function
>-        ],
>-        'vulkan_layer_generated_files':
>-        [
>-            '<(angle_gen_path)/vulkan/vk_enum_string_helper.h',
>-            '<(angle_gen_path)/vulkan/vk_struct_size_helper.h',
>-            '<(angle_gen_path)/vulkan/vk_struct_size_helper.c',
>-            '<(angle_gen_path)/vulkan/vk_safe_struct.h',
>-            '<(angle_gen_path)/vulkan/vk_safe_struct.cpp',
>-            '<(angle_gen_path)/vulkan/vk_layer_dispatch_table.h',
>-            '<(angle_gen_path)/vulkan/vk_dispatch_table_helper.h',
>-            '<(angle_gen_path)/vulkan/vk_loader_extensions.h',
>-            '<(angle_gen_path)/vulkan/vk_loader_extensions.c',
>-            '<@(vulkan_gen_json_files_outputs)',
>-        ],
>-        'glslang_sources':
>-        [
>-            '<(glslang_path)/glslang/GenericCodeGen/CodeGen.cpp',
>-            '<(glslang_path)/glslang/GenericCodeGen/Link.cpp',
>-            '<(glslang_path)/glslang/Include/arrays.h',
>-            '<(glslang_path)/glslang/Include/BaseTypes.h',
>-            '<(glslang_path)/glslang/Include/Common.h',
>-            '<(glslang_path)/glslang/Include/ConstantUnion.h',
>-            '<(glslang_path)/glslang/Include/InfoSink.h',
>-            '<(glslang_path)/glslang/Include/InitializeGlobals.h',
>-            '<(glslang_path)/glslang/Include/intermediate.h',
>-            '<(glslang_path)/glslang/Include/PoolAlloc.h',
>-            '<(glslang_path)/glslang/Include/ResourceLimits.h',
>-            '<(glslang_path)/glslang/Include/revision.h',
>-            '<(glslang_path)/glslang/Include/ShHandle.h',
>-            '<(glslang_path)/glslang/Include/Types.h',
>-            '<(glslang_path)/glslang/MachineIndependent/Constant.cpp',
>-            '<(glslang_path)/glslang/MachineIndependent/gl_types.h',
>-            '<(glslang_path)/glslang/MachineIndependent/glslang.y',
>-            '<(glslang_path)/glslang/MachineIndependent/glslang_tab.cpp',
>-            '<(glslang_path)/glslang/MachineIndependent/glslang_tab.cpp.h',
>-            '<(glslang_path)/glslang/MachineIndependent/InfoSink.cpp',
>-            '<(glslang_path)/glslang/MachineIndependent/Initialize.cpp',
>-            '<(glslang_path)/glslang/MachineIndependent/Initialize.h',
>-            '<(glslang_path)/glslang/MachineIndependent/Intermediate.cpp',
>-            '<(glslang_path)/glslang/MachineIndependent/intermOut.cpp',
>-            '<(glslang_path)/glslang/MachineIndependent/IntermTraverse.cpp',
>-            '<(glslang_path)/glslang/MachineIndependent/iomapper.cpp',
>-            '<(glslang_path)/glslang/MachineIndependent/iomapper.h',
>-            '<(glslang_path)/glslang/MachineIndependent/limits.cpp',
>-            '<(glslang_path)/glslang/MachineIndependent/linkValidate.cpp',
>-            '<(glslang_path)/glslang/MachineIndependent/LiveTraverser.h',
>-            '<(glslang_path)/glslang/MachineIndependent/localintermediate.h',
>-            '<(glslang_path)/glslang/MachineIndependent/parseConst.cpp',
>-            '<(glslang_path)/glslang/MachineIndependent/ParseContextBase.cpp',
>-            '<(glslang_path)/glslang/MachineIndependent/ParseHelper.cpp',
>-            '<(glslang_path)/glslang/MachineIndependent/ParseHelper.h',
>-            '<(glslang_path)/glslang/MachineIndependent/parseVersions.h',
>-            '<(glslang_path)/glslang/MachineIndependent/PoolAlloc.cpp',
>-            '<(glslang_path)/glslang/MachineIndependent/preprocessor/Pp.cpp',
>-            '<(glslang_path)/glslang/MachineIndependent/preprocessor/PpAtom.cpp',
>-            '<(glslang_path)/glslang/MachineIndependent/preprocessor/PpContext.cpp',
>-            '<(glslang_path)/glslang/MachineIndependent/preprocessor/PpContext.h',
>-            '<(glslang_path)/glslang/MachineIndependent/preprocessor/PpMemory.cpp',
>-            '<(glslang_path)/glslang/MachineIndependent/preprocessor/PpScanner.cpp',
>-            '<(glslang_path)/glslang/MachineIndependent/preprocessor/PpSymbols.cpp',
>-            '<(glslang_path)/glslang/MachineIndependent/preprocessor/PpTokens.cpp',
>-            '<(glslang_path)/glslang/MachineIndependent/preprocessor/PpTokens.h',
>-            '<(glslang_path)/glslang/MachineIndependent/propagateNoContraction.cpp',
>-            '<(glslang_path)/glslang/MachineIndependent/propagateNoContraction.h',
>-            '<(glslang_path)/glslang/MachineIndependent/reflection.cpp',
>-            '<(glslang_path)/glslang/MachineIndependent/reflection.h',
>-            '<(glslang_path)/glslang/MachineIndependent/RemoveTree.cpp',
>-            '<(glslang_path)/glslang/MachineIndependent/RemoveTree.h',
>-            '<(glslang_path)/glslang/MachineIndependent/Scan.cpp',
>-            '<(glslang_path)/glslang/MachineIndependent/Scan.h',
>-            '<(glslang_path)/glslang/MachineIndependent/ScanContext.h',
>-            '<(glslang_path)/glslang/MachineIndependent/ShaderLang.cpp',
>-            '<(glslang_path)/glslang/MachineIndependent/SymbolTable.cpp',
>-            '<(glslang_path)/glslang/MachineIndependent/SymbolTable.h',
>-            '<(glslang_path)/glslang/MachineIndependent/Versions.cpp',
>-            '<(glslang_path)/glslang/MachineIndependent/Versions.h',
>-            '<(glslang_path)/glslang/OSDependent/osinclude.h',
>-            '<(glslang_path)/glslang/Public/ShaderLang.h',
>-            '<(glslang_path)/hlsl/hlslAttributes.cpp',
>-            '<(glslang_path)/hlsl/hlslAttributes.h',
>-            '<(glslang_path)/hlsl/hlslGrammar.cpp',
>-            '<(glslang_path)/hlsl/hlslGrammar.h',
>-            '<(glslang_path)/hlsl/hlslOpMap.cpp',
>-            '<(glslang_path)/hlsl/hlslOpMap.h',
>-            '<(glslang_path)/hlsl/hlslParseables.cpp',
>-            '<(glslang_path)/hlsl/hlslParseables.h',
>-            '<(glslang_path)/hlsl/hlslParseHelper.cpp',
>-            '<(glslang_path)/hlsl/hlslParseHelper.h',
>-            '<(glslang_path)/hlsl/hlslScanContext.cpp',
>-            '<(glslang_path)/hlsl/hlslScanContext.h',
>-            '<(glslang_path)/hlsl/hlslTokens.h',
>-            '<(glslang_path)/hlsl/hlslTokenStream.cpp',
>-            '<(glslang_path)/hlsl/hlslTokenStream.h',
>-            '<(glslang_path)/OGLCompilersDLL/InitializeDll.cpp',
>-            '<(glslang_path)/OGLCompilersDLL/InitializeDll.h',
>-            '<(glslang_path)/SPIRV/bitutils.h',
>-            '<(glslang_path)/SPIRV/disassemble.cpp',
>-            '<(glslang_path)/SPIRV/disassemble.h',
>-            '<(glslang_path)/SPIRV/doc.cpp',
>-            '<(glslang_path)/SPIRV/doc.h',
>-            '<(glslang_path)/SPIRV/GLSL.ext.KHR.h',
>-            '<(glslang_path)/SPIRV/GLSL.std.450.h',
>-            '<(glslang_path)/SPIRV/GlslangToSpv.cpp',
>-            '<(glslang_path)/SPIRV/GlslangToSpv.h',
>-            '<(glslang_path)/SPIRV/hex_float.h',
>-            '<(glslang_path)/SPIRV/InReadableOrder.cpp',
>-            '<(glslang_path)/SPIRV/Logger.cpp',
>-            '<(glslang_path)/SPIRV/Logger.h',
>-            '<(glslang_path)/SPIRV/spirv.hpp',
>-            '<(glslang_path)/SPIRV/SpvBuilder.cpp',
>-            '<(glslang_path)/SPIRV/SpvBuilder.h',
>-            '<(glslang_path)/SPIRV/spvIR.h',
>-            '<(glslang_path)/StandAlone/ResourceLimits.cpp',
>-            '<(glslang_path)/StandAlone/ResourceLimits.h',
>-        ],
>-        'glslang_win_sources':
>-        [
>-            '<(glslang_path)/glslang/OSDependent/Windows/ossource.cpp',
>-        ],
>-        'glslang_unix_sources':
>-        [
>-            '<(glslang_path)/glslang/OSDependent/Unix/ossource.cpp',
>-        ],
>-        'spirv_tools_sources':
>-        [
>-            '<(angle_gen_path)/vulkan/core.insts-1.0.inc',
>-            '<(angle_gen_path)/vulkan/core.insts-1.1.inc',
>-            '<(angle_gen_path)/vulkan/generators.inc',
>-            '<(angle_gen_path)/vulkan/glsl.std.450.insts-1.0.inc',
>-            '<(angle_gen_path)/vulkan/opencl.std.insts-1.0.inc',
>-            '<(angle_gen_path)/vulkan/operand.kinds-1.0.inc',
>-            '<(angle_gen_path)/vulkan/operand.kinds-1.1.inc',
>-            '<(spirv_tools_path)/source/assembly_grammar.cpp',
>-            '<(spirv_tools_path)/source/assembly_grammar.h',
>-            '<(spirv_tools_path)/source/binary.cpp',
>-            '<(spirv_tools_path)/source/binary.h',
>-            '<(spirv_tools_path)/source/diagnostic.cpp',
>-            '<(spirv_tools_path)/source/diagnostic.h',
>-            '<(spirv_tools_path)/source/disassemble.cpp',
>-            '<(spirv_tools_path)/source/enum_set.h',
>-            '<(spirv_tools_path)/source/ext_inst.cpp',
>-            '<(spirv_tools_path)/source/ext_inst.h',
>-            '<(spirv_tools_path)/source/instruction.h',
>-            '<(spirv_tools_path)/source/libspirv.cpp',
>-            '<(spirv_tools_path)/source/macro.h',
>-            '<(spirv_tools_path)/source/message.cpp',
>-            '<(spirv_tools_path)/source/name_mapper.cpp',
>-            '<(spirv_tools_path)/source/name_mapper.h',
>-            '<(spirv_tools_path)/source/opcode.cpp',
>-            '<(spirv_tools_path)/source/opcode.h',
>-            '<(spirv_tools_path)/source/operand.cpp',
>-            '<(spirv_tools_path)/source/operand.h',
>-            '<(spirv_tools_path)/source/parsed_operand.cpp',
>-            '<(spirv_tools_path)/source/parsed_operand.h',
>-            '<(spirv_tools_path)/source/print.cpp',
>-            '<(spirv_tools_path)/source/print.h',
>-            # TODO(jmadill): Determine if this is ever needed.
>-            #'<(spirv_tools_path)/source/software_version.cpp',
>-            '<(spirv_tools_path)/source/spirv_constant.h',
>-            '<(spirv_tools_path)/source/spirv_definition.h',
>-            '<(spirv_tools_path)/source/spirv_endian.cpp',
>-            '<(spirv_tools_path)/source/spirv_endian.h',
>-            '<(spirv_tools_path)/source/spirv_target_env.cpp',
>-            '<(spirv_tools_path)/source/spirv_target_env.h',
>-            '<(spirv_tools_path)/source/table.cpp',
>-            '<(spirv_tools_path)/source/table.h',
>-            '<(spirv_tools_path)/source/text.cpp',
>-            '<(spirv_tools_path)/source/text.h',
>-            '<(spirv_tools_path)/source/text_handler.cpp',
>-            '<(spirv_tools_path)/source/text_handler.h',
>-            '<(spirv_tools_path)/source/util/bitutils.h',
>-            '<(spirv_tools_path)/source/util/hex_float.h',
>-            '<(spirv_tools_path)/source/util/parse_number.cpp',
>-            '<(spirv_tools_path)/source/util/parse_number.h',
>-            '<(spirv_tools_path)/source/val/basic_block.cpp',
>-            '<(spirv_tools_path)/source/val/construct.cpp',
>-            '<(spirv_tools_path)/source/val/function.cpp',
>-            '<(spirv_tools_path)/source/val/instruction.cpp',
>-            '<(spirv_tools_path)/source/val/validation_state.cpp',
>-            '<(spirv_tools_path)/source/validate.cpp',
>-            '<(spirv_tools_path)/source/validate.h',
>-            '<(spirv_tools_path)/source/validate_cfg.cpp',
>-            '<(spirv_tools_path)/source/validate_datarules.cpp',
>-            '<(spirv_tools_path)/source/validate_id.cpp',
>-            '<(spirv_tools_path)/source/validate_instruction.cpp',
>-            '<(spirv_tools_path)/source/validate_layout.cpp',
>-        ],
>-        'vulkan_layer_utils_sources':
>-        [
>-            '<(vulkan_layers_path)/layers/vk_layer_config.cpp',
>-            '<(vulkan_layers_path)/layers/vk_layer_config.h',
>-            '<(vulkan_layers_path)/layers/vk_layer_extension_utils.cpp',
>-            '<(vulkan_layers_path)/layers/vk_layer_extension_utils.h',
>-            '<(vulkan_layers_path)/layers/vk_layer_utils.cpp',
>-            '<(vulkan_layers_path)/layers/vk_layer_utils.h',
>-        ],
>-        'vulkan_struct_wrappers_outputs':
>-        [
>-            '<(angle_gen_path)/vulkan/vk_safe_struct.cpp',
>-            '<(angle_gen_path)/vulkan/vk_safe_struct.h',
>-            '<(angle_gen_path)/vulkan/vk_struct_size_helper.c',
>-            '<(angle_gen_path)/vulkan/vk_struct_size_helper.h',
>-            '<(angle_gen_path)/vulkan/vk_struct_string_helper.h',
>-            '<(angle_gen_path)/vulkan/vk_struct_string_helper_cpp.h',
>-        ],
>-        'VkLayer_core_validation_sources':
>-        [
>-            # This file is manually included in the layer
>-            # '<(angle_gen_path)/vulkan/vk_safe_struct.cpp',
>-            '<(angle_gen_path)/vulkan/vk_safe_struct.h',
>-            '<(vulkan_layers_path)/layers/buffer_validation.cpp',
>-            '<(vulkan_layers_path)/layers/buffer_validation.h',
>-            '<(vulkan_layers_path)/layers/core_validation.cpp',
>-            '<(vulkan_layers_path)/layers/core_validation.h',
>-            '<(vulkan_layers_path)/layers/descriptor_sets.cpp',
>-            '<(vulkan_layers_path)/layers/descriptor_sets.h',
>-        ],
>-        'VkLayer_swapchain_sources':
>-        [
>-            '<(vulkan_layers_path)/layers/swapchain.cpp',
>-            '<(vulkan_layers_path)/layers/swapchain.h',
>-        ],
>-        'VkLayer_object_tracker_sources':
>-        [
>-            '<(vulkan_layers_path)/layers/object_tracker.cpp',
>-            '<(vulkan_layers_path)/layers/object_tracker.h',
>-        ],
>-        'VkLayer_unique_objects_sources':
>-        [
>-            '<(angle_gen_path)/vulkan/unique_objects_wrappers.h',
>-            # This file is manually included in the layer
>-            # '<(angle_gen_path)/vulkan/vk_safe_struct.cpp',
>-            '<(angle_gen_path)/vulkan/vk_safe_struct.h',
>-            '<(vulkan_layers_path)/layers/unique_objects.cpp',
>-            '<(vulkan_layers_path)/layers/unique_objects.h',
>-        ],
>-        'VkLayer_threading_sources':
>-        [
>-            '<(angle_gen_path)/vulkan/thread_check.h',
>-            '<(vulkan_layers_path)/layers/threading.cpp',
>-            '<(vulkan_layers_path)/layers/threading.h',
>-        ],
>-        'VkLayer_parameter_validation_sources':
>-        [
>-            '<(angle_gen_path)/vulkan/parameter_validation.h',
>-            '<(vulkan_layers_path)/layers/parameter_validation.cpp',
>-        ],
>-        'vulkan_gen_json_files_sources_win':
>-        [
>-            '<(vulkan_layers_path)/layers/windows/VkLayer_core_validation.json',
>-            '<(vulkan_layers_path)/layers/windows/VkLayer_object_tracker.json',
>-            '<(vulkan_layers_path)/layers/windows/VkLayer_parameter_validation.json',
>-            '<(vulkan_layers_path)/layers/windows/VkLayer_swapchain.json',
>-            '<(vulkan_layers_path)/layers/windows/VkLayer_threading.json',
>-            '<(vulkan_layers_path)/layers/windows/VkLayer_unique_objects.json',
>-        ],
>-        'vulkan_gen_json_files_sources_linux':
>-        [
>-            '<(vulkan_layers_path)/layers/linux/VkLayer_core_validation.json',
>-            '<(vulkan_layers_path)/layers/linux/VkLayer_object_tracker.json',
>-            '<(vulkan_layers_path)/layers/linux/VkLayer_parameter_validation.json',
>-            '<(vulkan_layers_path)/layers/linux/VkLayer_swapchain.json',
>-            '<(vulkan_layers_path)/layers/linux/VkLayer_threading.json',
>-            '<(vulkan_layers_path)/layers/linux/VkLayer_unique_objects.json',
>-        ],
>-        'vulkan_gen_json_files_outputs':
>-        [
>-            '<(PRODUCT_DIR)/<(vulkan_json)/VkLayer_core_validation.json',
>-            '<(PRODUCT_DIR)/<(vulkan_json)/VkLayer_object_tracker.json',
>-            '<(PRODUCT_DIR)/<(vulkan_json)/VkLayer_parameter_validation.json',
>-            '<(PRODUCT_DIR)/<(vulkan_json)/VkLayer_swapchain.json',
>-            '<(PRODUCT_DIR)/<(vulkan_json)/VkLayer_threading.json',
>-            '<(PRODUCT_DIR)/<(vulkan_json)/VkLayer_unique_objects.json',
>-        ],
>-    },
>-    'conditions':
>-    [
>-        ['angle_enable_vulkan==1',
>-        {
>-            'targets':
>-            [
>-                {
>-                    'target_name': 'glslang',
>-                    'type': 'static_library',
>-                    'sources':
>-                    [
>-                        '<@(glslang_sources)',
>-                    ],
>-                    'include_dirs':
>-                    [
>-                        '<(glslang_path)',
>-                    ],
>-                    'msvs_settings':
>-                    {
>-                        'VCCLCompilerTool':
>-                        {
>-                            'PreprocessorDefinitions':
>-                            [
>-                                '_HAS_EXCEPTIONS=0',
>-                            ],
>-                            'AdditionalOptions':
>-                            [
>-                                '/wd4100', # Unreferenced formal parameter
>-                                '/wd4244', # Conversion from 'int' to 'char', possible loss of data
>-                                '/wd4456', # Declaration hides previous local declaration
>-                                '/wd4457', # Declaration hides function parameter
>-                                '/wd4458', # Declaration hides class member
>-                                '/wd4702', # Unreachable code (from glslang_tab.cpp)
>-                                '/wd4718', # Recursive call has no side effects (from PpContext.cpp)
>-                            ],
>-                        },
>-                    },
>-                    'direct_dependent_settings':
>-                    {
>-                        'include_dirs':
>-                        [
>-                            '<(glslang_path)/glslang/Public',
>-                            '<(glslang_path)',
>-                        ],
>-                    },
>-                    'conditions':
>-                    [
>-                        ['OS=="win"',
>-                        {
>-                            'sources':
>-                            [
>-                                '<@(glslang_win_sources)',
>-                            ],
>-                        }],
>-                        ['OS=="linux"',
>-                        {
>-                            'sources':
>-                            [
>-                                '<@(glslang_unix_sources)',
>-                            ],
>-                        }],
>-                    ],
>-                },
>-
>-                {
>-                    'target_name': 'spirv_tools',
>-                    'type': 'static_library',
>-                    'sources':
>-                    [
>-                        '<@(spirv_tools_sources)',
>-                    ],
>-                    'include_dirs':
>-                    [
>-                        '<(angle_gen_path)/vulkan',
>-                        '<(spirv_headers_path)/include',
>-                        '<(spirv_tools_path)/include',
>-                        '<(spirv_tools_path)/source',
>-                    ],
>-                    'msvs_settings':
>-                    {
>-                        'VCCLCompilerTool':
>-                        {
>-                            'PreprocessorDefinitions':
>-                            [
>-                                '_HAS_EXCEPTIONS=0',
>-                            ],
>-                            'AdditionalOptions':
>-                            [
>-                                '/wd4127', # Conditional expression is constant, happens in a template in hex_float.h.
>-                                '/wd4706', # Assignment within conditional expression
>-                                '/wd4996', # Unsafe stdlib function
>-                            ],
>-                        },
>-                    },
>-                    'actions':
>-                    [
>-                        {
>-                            'action_name': 'spirv_tools_gen_build_tables_1_0',
>-                            'message': 'generating info tables for SPIR-V 1.0 instructions and operands',
>-                            'msvs_cygwin_shell': 0,
>-                            'inputs':
>-                            [
>-                                '<(spirv_headers_path)/include/spirv/1.0/extinst.glsl.std.450.grammar.json',
>-                                '<(spirv_headers_path)/include/spirv/1.0/spirv.core.grammar.json',
>-                                '<(spirv_tools_path)/source/extinst-1.0.opencl.std.grammar.json',
>-                                '<(spirv_tools_path)/utils/generate_grammar_tables.py',
>-                            ],
>-                            'outputs':
>-                            [
>-                                '<(angle_gen_path)/vulkan/core.insts-1.0.inc',
>-                                '<(angle_gen_path)/vulkan/glsl.std.450.insts-1.0.inc',
>-                                '<(angle_gen_path)/vulkan/opencl.std.insts-1.0.inc',
>-                                '<(angle_gen_path)/vulkan/operand.kinds-1.0.inc',
>-                            ],
>-                            'action':
>-                            [
>-                                'python', '<(spirv_tools_path)/utils/generate_grammar_tables.py',
>-                                '--spirv-core-grammar=<(spirv_headers_path)/include/spirv/1.0/spirv.core.grammar.json',
>-                                '--extinst-glsl-grammar=<(spirv_headers_path)/include/spirv/1.0/extinst.glsl.std.450.grammar.json',
>-                                '--extinst-opencl-grammar=<(spirv_tools_path)/source/extinst-1.0.opencl.std.grammar.json',
>-                                '--core-insts-output=<(angle_gen_path)/vulkan/core.insts-1.0.inc',
>-                                '--glsl-insts-output=<(angle_gen_path)/vulkan/glsl.std.450.insts-1.0.inc',
>-                                '--opencl-insts-output=<(angle_gen_path)/vulkan/opencl.std.insts-1.0.inc',
>-                                '--operand-kinds-output=<(angle_gen_path)/vulkan/operand.kinds-1.0.inc',
>-                            ],
>-                        },
>-
>-                        {
>-                            'action_name': 'spirv_tools_gen_build_tables_1_1',
>-                            'message': 'generating info tables for SPIR-V 1.1 instructions and operands',
>-                            'msvs_cygwin_shell': 0,
>-                            'inputs':
>-                            [
>-                                '<(spirv_tools_path)/utils/generate_grammar_tables.py',
>-                                '<(spirv_headers_path)/include/spirv/1.1/spirv.core.grammar.json',
>-                            ],
>-                            'outputs':
>-                            [
>-                                '<(angle_gen_path)/vulkan/core.insts-1.1.inc',
>-                                '<(angle_gen_path)/vulkan/operand.kinds-1.1.inc',
>-                            ],
>-                            'action':
>-                            [
>-                                'python', '<(spirv_tools_path)/utils/generate_grammar_tables.py',
>-                                '--spirv-core-grammar=<(spirv_headers_path)/include/spirv/1.1/spirv.core.grammar.json',
>-                                '--core-insts-output=<(angle_gen_path)/vulkan/core.insts-1.1.inc',
>-                                '--operand-kinds-output=<(angle_gen_path)/vulkan/operand.kinds-1.1.inc',
>-                            ],
>-                        },
>-
>-                        {
>-                            'action_name': 'spirv_tools_gen_generators_inc',
>-                            'message': 'generating generators.inc for SPIRV-Tools',
>-                            'msvs_cygwin_shell': 0,
>-                            'inputs':
>-                            [
>-                                '<(spirv_tools_path)/utils/generate_registry_tables.py',
>-                                '<(spirv_headers_path)/include/spirv/spir-v.xml',
>-                            ],
>-                            'outputs':
>-                            [
>-                                '<(angle_gen_path)/vulkan/generators.inc',
>-                            ],
>-                            'action':
>-                            [
>-                                'python', '<(spirv_tools_path)/utils/generate_registry_tables.py',
>-                                '--xml=<(spirv_headers_path)/include/spirv/spir-v.xml',
>-                                '--generator-output=<(angle_gen_path)/vulkan/generators.inc',
>-                            ],
>-                        },
>-                    ],
>-
>-                    'direct_dependent_settings':
>-                    {
>-                        'include_dirs':
>-                        [
>-                            '<(spirv_headers_path)/include',
>-                            '<(spirv_tools_path)/include',
>-                        ],
>-                    },
>-                },
>-
>-                {
>-                    'target_name': 'vulkan_layer_utils_static',
>-                    'type': 'static_library',
>-                    'msvs_cygwin_shell': 0,
>-                    'sources':
>-                    [
>-                        '<@(vulkan_layer_utils_sources)',
>-                    ],
>-                    'include_dirs':
>-                    [
>-                        '<(angle_gen_path)/vulkan',
>-                        '<@(vulkan_loader_include_dirs)',
>-                    ],
>-                    'msvs_settings':
>-                    {
>-                        'VCCLCompilerTool':
>-                        {
>-                            'PreprocessorDefinitions':
>-                            [
>-                                '_HAS_EXCEPTIONS=0',
>-                            ],
>-                            'AdditionalOptions':
>-                            [
>-                                '/wd4100', # Unreferenced formal parameter
>-                                '/wd4309', # Truncation of constant value
>-                                '/wd4505', # Unreferenced local function has been removed
>-                                '/wd4996', # Unsafe stdlib function
>-                            ],
>-                        },
>-                    },
>-                    'conditions':
>-                    [
>-                        ['OS=="win"',
>-                        {
>-                            'defines':
>-                            [
>-                                'WIN32',
>-                                'WIN32_LEAN_AND_MEAN',
>-                                'VK_USE_PLATFORM_WIN32_KHR',
>-                                'VK_USE_PLATFORM_WIN32_KHX',
>-                            ],
>-                        }],
>-                        ['OS=="linux"',
>-                        {
>-                            'defines':
>-                            [
>-                                'VK_USE_PLATFORM_XCB_KHR',
>-                                'VK_USE_PLATFORM_XCB_KHX',
>-                            ],
>-                        }],
>-                    ],
>-                    'direct_dependent_settings':
>-                    {
>-                        'msvs_cygwin_shell': 0,
>-                        'sources':
>-                        [
>-                            '<(vulkan_layers_path)/layers/vk_layer_table.cpp',
>-                            '<(vulkan_layers_path)/layers/vk_layer_table.h',
>-                        ],
>-                        'include_dirs':
>-                        [
>-                            '<(angle_gen_path)/vulkan',
>-                            '<(glslang_path)',
>-                            '<(vulkan_layers_path)/layers',
>-                            '<@(vulkan_loader_include_dirs)',
>-                        ],
>-                        'msvs_settings':
>-                        {
>-                            'VCCLCompilerTool':
>-                            {
>-                                'PreprocessorDefinitions':
>-                                [
>-                                    '_HAS_EXCEPTIONS=0',
>-                                ],
>-                                'AdditionalOptions':
>-                                [
>-                                    '/wd4100', # Unreferenced local parameter
>-                                    '/wd4201', # Nonstandard extension used: nameless struct/union
>-                                    '/wd4456', # declaration hides previous local declaration
>-                                    '/wd4505', # Unreferenced local function has been removed
>-                                    '/wd4996', # Unsafe stdlib function
>-                                ],
>-                            }
>-                        },
>-                        'conditions':
>-                        [
>-                            ['OS=="win"',
>-                            {
>-                                'defines':
>-                                [
>-                                    'WIN32_LEAN_AND_MEAN',
>-                                    'VK_USE_PLATFORM_WIN32_KHR',
>-                                    'VK_USE_PLATFORM_WIN32_KHX',
>-                                ],
>-                                'configurations':
>-                                {
>-                                    'Debug_Base':
>-                                    {
>-                                        'msvs_settings':
>-                                        {
>-                                            'VCCLCompilerTool':
>-                                            {
>-                                                'AdditionalOptions':
>-                                                [
>-                                                    '/bigobj',
>-                                                ],
>-                                            },
>-                                        },
>-                                    },
>-                                },
>-                            }],
>-                            ['OS=="linux"',
>-                            {
>-                                'defines':
>-                                [
>-                                    'VK_USE_PLATFORM_XCB_KHR',
>-                                    'VK_USE_PLATFORM_XCB_KHX',
>-                                ],
>-                            }],
>-                        ],
>-                    },
>-
>-                    'actions':
>-                    [
>-                        # Duplicate everything because of GYP limitations.
>-                        {
>-                            'action_name': 'vulkan_run_vk_xml_generate_vk_enum_string_helper_h',
>-                            'message': 'generating vk_enum_string_helper.h',
>-                            'msvs_cygwin_shell': 0,
>-                            'inputs':
>-                            [
>-                                '<(vulkan_layers_path)/scripts/generator.py',
>-                                '<(vulkan_layers_path)/scripts/helper_file_generator.py',
>-                                '<(vulkan_layers_path)/scripts/lvl_genvk.py',
>-                                '<(vulkan_layers_path)/scripts/reg.py',
>-                                '<(vulkan_layers_path)/scripts/vk.xml',
>-                            ],
>-                            'outputs':
>-                            [
>-                                '<(angle_gen_path)/vulkan/vk_enum_string_helper.h'
>-                            ],
>-                            'action':
>-                            [
>-                                'python', '<(vulkan_layers_path)/scripts/lvl_genvk.py',
>-                                 '-o', '<(angle_gen_path)/vulkan',
>-                                '-registry', '<(vulkan_layers_path)/scripts/vk.xml',
>-                                'vk_enum_string_helper.h', '-quiet',
>-                            ],
>-                        },
>-
>-                        {
>-                            'action_name': 'vulkan_run_vk_xml_generate_vk_struct_size_helper_h',
>-                            'message': 'generating vk_struct_size_helper.h',
>-                            'msvs_cygwin_shell': 0,
>-                            'inputs':
>-                            [
>-                                '<(vulkan_layers_path)/scripts/generator.py',
>-                                '<(vulkan_layers_path)/scripts/helper_file_generator.py',
>-                                '<(vulkan_layers_path)/scripts/lvl_genvk.py',
>-                                '<(vulkan_layers_path)/scripts/reg.py',
>-                                '<(vulkan_layers_path)/scripts/vk.xml',
>-                            ],
>-                            'outputs':
>-                            [
>-                                '<(angle_gen_path)/vulkan/vk_struct_size_helper.h'
>-                            ],
>-                            'action':
>-                            [
>-                                'python', '<(vulkan_layers_path)/scripts/lvl_genvk.py',
>-                                 '-o', '<(angle_gen_path)/vulkan',
>-                                '-registry', '<(vulkan_layers_path)/scripts/vk.xml',
>-                                'vk_struct_size_helper.h', '-quiet',
>-                            ],
>-                        },
>-
>-                        {
>-                            'action_name': 'vulkan_run_vk_xml_generate_vk_struct_size_helper_c',
>-                            'message': 'generating vk_struct_size_helper.c',
>-                            'msvs_cygwin_shell': 0,
>-                            'inputs':
>-                            [
>-                                '<(vulkan_layers_path)/scripts/generator.py',
>-                                '<(vulkan_layers_path)/scripts/helper_file_generator.py',
>-                                '<(vulkan_layers_path)/scripts/lvl_genvk.py',
>-                                '<(vulkan_layers_path)/scripts/reg.py',
>-                                '<(vulkan_layers_path)/scripts/vk.xml',
>-                            ],
>-                            'outputs':
>-                            [
>-                                '<(angle_gen_path)/vulkan/vk_struct_size_helper.c'
>-                            ],
>-                            'action':
>-                            [
>-                                'python', '<(vulkan_layers_path)/scripts/lvl_genvk.py',
>-                                 '-o', '<(angle_gen_path)/vulkan',
>-                                '-registry', '<(vulkan_layers_path)/scripts/vk.xml',
>-                                'vk_struct_size_helper.c', '-quiet',
>-                            ],
>-                        },
>-
>-                        {
>-                            'action_name': 'vulkan_run_vk_xml_generate_vk_safe_struct_h',
>-                            'message': 'generating vk_safe_struct.h',
>-                            'msvs_cygwin_shell': 0,
>-                            'inputs':
>-                            [
>-                                '<(vulkan_layers_path)/scripts/generator.py',
>-                                '<(vulkan_layers_path)/scripts/helper_file_generator.py',
>-                                '<(vulkan_layers_path)/scripts/lvl_genvk.py',
>-                                '<(vulkan_layers_path)/scripts/reg.py',
>-                                '<(vulkan_layers_path)/scripts/vk.xml',
>-                            ],
>-                            'outputs':
>-                            [
>-                                '<(angle_gen_path)/vulkan/vk_safe_struct.h'
>-                            ],
>-                            'action':
>-                            [
>-                                'python', '<(vulkan_layers_path)/scripts/lvl_genvk.py',
>-                                 '-o', '<(angle_gen_path)/vulkan',
>-                                '-registry', '<(vulkan_layers_path)/scripts/vk.xml',
>-                                'vk_safe_struct.h', '-quiet',
>-                            ],
>-                        },
>-
>-                        {
>-                            'action_name': 'vulkan_run_vk_xml_generate_vk_safe_struct_cpp',
>-                            'message': 'generating vk_safe_struct.cpp',
>-                            'msvs_cygwin_shell': 0,
>-                            'inputs':
>-                            [
>-                                '<(vulkan_layers_path)/scripts/generator.py',
>-                                '<(vulkan_layers_path)/scripts/helper_file_generator.py',
>-                                '<(vulkan_layers_path)/scripts/lvl_genvk.py',
>-                                '<(vulkan_layers_path)/scripts/reg.py',
>-                                '<(vulkan_layers_path)/scripts/vk.xml',
>-                            ],
>-                            'outputs':
>-                            [
>-                                '<(angle_gen_path)/vulkan/vk_safe_struct.cpp'
>-                            ],
>-                            'action':
>-                            [
>-                                'python', '<(vulkan_layers_path)/scripts/lvl_genvk.py',
>-                                 '-o', '<(angle_gen_path)/vulkan',
>-                                '-registry', '<(vulkan_layers_path)/scripts/vk.xml',
>-                                'vk_safe_struct.cpp', '-quiet',
>-                            ],
>-                        },
>-
>-                        {
>-                            'action_name': 'vulkan_run_vk_xml_generate_vk_layer_dispatch_table_h',
>-                            'message': 'generating vk_layer_dispatch_table.h',
>-                            'msvs_cygwin_shell': 0,
>-                            'inputs':
>-                            [
>-                                '<(vulkan_layers_path)/scripts/loader_extension_generator.py',
>-                                '<(vulkan_layers_path)/scripts/generator.py',
>-                                '<(vulkan_layers_path)/scripts/lvl_genvk.py',
>-                                '<(vulkan_layers_path)/scripts/reg.py',
>-                                '<(vulkan_layers_path)/scripts/vk.xml',
>-                            ],
>-                            'outputs':
>-                            [
>-                                '<(angle_gen_path)/vulkan/vk_layer_dispatch_table.h',
>-                            ],
>-                            'action':
>-                            [
>-                                'python', '<(vulkan_layers_path)/scripts/lvl_genvk.py', '-o', '<(angle_gen_path)/vulkan',
>-                                '-registry', '<(vulkan_layers_path)/scripts/vk.xml', 'vk_layer_dispatch_table.h', '-quiet',
>-                            ],
>-                        },
>-
>-                        {
>-                            'action_name': 'vulkan_run_vk_xml_generate_vk_dispatch_table_helper_h',
>-                            'message': 'generating vk_dispatch_table_helper.h',
>-                            'msvs_cygwin_shell': 0,
>-                            'inputs':
>-                            [
>-                                '<(vulkan_layers_path)/scripts/dispatch_table_helper_generator.py',
>-                                '<(vulkan_layers_path)/scripts/generator.py',
>-                                '<(vulkan_layers_path)/scripts/lvl_genvk.py',
>-                                '<(vulkan_layers_path)/scripts/reg.py',
>-                                '<(vulkan_layers_path)/scripts/vk.xml',
>-                            ],
>-                            'outputs':
>-                            [
>-                                '<(angle_gen_path)/vulkan/vk_dispatch_table_helper.h',
>-                            ],
>-                            'action':
>-                            [
>-                                'python', '<(vulkan_layers_path)/scripts/lvl_genvk.py', '-o', '<(angle_gen_path)/vulkan',
>-                                '-registry', '<(vulkan_layers_path)/scripts/vk.xml', 'vk_dispatch_table_helper.h', '-quiet',
>-                            ],
>-                        },
>-
>-                        {
>-                            'action_name': 'vulkan_run_vk_xml_generate_vk_loader_extensions_h',
>-                            'message': 'generating vk_loader_extensions.h',
>-                            'msvs_cygwin_shell': 0,
>-                            'inputs':
>-                            [
>-                                '<(vulkan_layers_path)/scripts/loader_extension_generator.py',
>-                                '<(vulkan_layers_path)/scripts/generator.py',
>-                                '<(vulkan_layers_path)/scripts/lvl_genvk.py',
>-                                '<(vulkan_layers_path)/scripts/reg.py',
>-                                '<(vulkan_layers_path)/scripts/vk.xml',
>-                            ],
>-                            'outputs':
>-                            [
>-                                '<(angle_gen_path)/vulkan/vk_loader_extensions.h',
>-                            ],
>-                            'action':
>-                            [
>-                                'python', '<(vulkan_layers_path)/scripts/lvl_genvk.py', '-o', '<(angle_gen_path)/vulkan',
>-                                '-registry', '<(vulkan_layers_path)/scripts/vk.xml', 'vk_loader_extensions.h', '-quiet',
>-                            ],
>-                        },
>-
>-                        {
>-                            'action_name': 'vulkan_run_vk_xml_generate_vk_loader_extensions_c',
>-                            'message': 'generating vk_loader_extensions.c',
>-                            'msvs_cygwin_shell': 0,
>-                            'inputs':
>-                            [
>-                                '<(vulkan_layers_path)/scripts/loader_extension_generator.py',
>-                                '<(vulkan_layers_path)/scripts/generator.py',
>-                                '<(vulkan_layers_path)/scripts/lvl_genvk.py',
>-                                '<(vulkan_layers_path)/scripts/reg.py',
>-                                '<(vulkan_layers_path)/scripts/vk.xml',
>-                            ],
>-                            'outputs':
>-                            [
>-                                '<(angle_gen_path)/vulkan/vk_loader_extensions.c',
>-                            ],
>-                            'action':
>-                            [
>-                                'python', '<(vulkan_layers_path)/scripts/lvl_genvk.py', '-o', '<(angle_gen_path)/vulkan',
>-                                '-registry', '<(vulkan_layers_path)/scripts/vk.xml', 'vk_loader_extensions.c', '-quiet',
>-                            ],
>-                        },
>-
>-                        {
>-                            'action_name': 'vulkan_generate_json_files',
>-                            'message': 'generating Vulkan json files',
>-                            'inputs':
>-                            [
>-                                '<(angle_path)/scripts/generate_vulkan_layers_json.py',
>-                            ],
>-                            'outputs':
>-                            [
>-                                '<@(vulkan_gen_json_files_outputs)',
>-                            ],
>-                            'conditions':
>-                            [
>-                                ['OS=="win"',
>-                                {
>-                                    'inputs':
>-                                    [
>-                                        '<@(vulkan_gen_json_files_sources_win)',
>-                                    ],
>-                                    'action':
>-                                    [
>-                                        'python', '<(angle_path)/scripts/generate_vulkan_layers_json.py',
>-                                        '<(vulkan_layers_path)/layers/windows', '<(PRODUCT_DIR)/<(vulkan_json)',
>-                                    ],
>-                                }],
>-                                ['OS=="linux"',
>-                                {
>-                                    'inputs':
>-                                    [
>-                                        '<@(vulkan_gen_json_files_sources_linux)',
>-                                    ],
>-                                    'action':
>-                                    [
>-                                        'python', '<(angle_path)/scripts/generate_vulkan_layers_json.py',
>-                                        '<(vulkan_layers_path)/layers/linux', '<(PRODUCT_DIR)/<(vulkan_json)',
>-                                    ],
>-                                }],
>-                            ],
>-                        },
>-                    ],
>-                },
>-
>-                {
>-                    'target_name': 'vulkan_loader',
>-                    'type': 'static_library',
>-                    'sources':
>-                    [
>-                        '<@(vulkan_loader_sources)',
>-                    ],
>-                    'include_dirs':
>-                    [
>-                        '<@(vulkan_loader_include_dirs)',
>-                        '<(angle_gen_path)/vulkan',
>-                    ],
>-                    'defines':
>-                    [
>-                        'API_NAME="Vulkan"',
>-                        'VULKAN_NON_CMAKE_BUILD',
>-                    ],
>-                    'msvs_settings':
>-                    {
>-                        'VCCLCompilerTool':
>-                        {
>-                            'AdditionalOptions':
>-                            [
>-                                '<@(vulkan_loader_cflags_win)',
>-                            ],
>-                        },
>-                        'VCLinkerTool':
>-                        {
>-                            'AdditionalDependencies':
>-                            [
>-                                'shlwapi.lib',
>-                            ],
>-                        },
>-                    },
>-                    'direct_dependent_settings':
>-                    {
>-                        'include_dirs':
>-                        [
>-                            '<@(vulkan_loader_include_dirs)',
>-                        ],
>-                        'msvs_settings':
>-                        {
>-                            'VCLinkerTool':
>-                            {
>-                                'AdditionalDependencies':
>-                                [
>-                                    'shlwapi.lib',
>-                                ],
>-                            },
>-                        },
>-                        'defines':
>-                        [
>-                            'ANGLE_VK_LAYERS_DIR="<(vulkan_json)"',
>-                        ],
>-                        'conditions':
>-                        [
>-                            ['OS=="win"',
>-                            {
>-                                'defines':
>-                                [
>-                                    'VK_USE_PLATFORM_WIN32_KHR',
>-                                    'VK_USE_PLATFORM_WIN32_KHX',
>-                                ],
>-                            }],
>-                            ['OS=="linux"',
>-                            {
>-                                'defines':
>-                                [
>-                                    'VK_USE_PLATFORM_XCB_KHR',
>-                                    'VK_USE_PLATFORM_XCB_KHX',
>-                                ],
>-                            }],
>-                        ],
>-                    },
>-                    'conditions':
>-                    [
>-                        ['OS=="win"',
>-                        {
>-                            'sources':
>-                            [
>-                                '<@(vulkan_loader_win_sources)',
>-                            ],
>-                            'defines':
>-                            [
>-                                'VK_USE_PLATFORM_WIN32_KHR',
>-                                'VK_USE_PLATFORM_WIN32_KHX',
>-                            ],
>-                        }],
>-                        ['OS=="linux"',
>-                        {
>-                            'defines':
>-                            [
>-                                'HAVE_SECURE_GETENV',
>-                                'VK_USE_PLATFORM_XCB_KHR',
>-                                'VK_USE_PLATFORM_XCB_KHX',
>-                            ],
>-                        }],
>-                    ],
>-                },
>-
>-                {
>-                    'target_name': 'VkLayer_core_validation',
>-                    'type': 'shared_library',
>-                    'dependencies':
>-                    [
>-                        'spirv_tools',
>-                        'vulkan_layer_utils_static',
>-                    ],
>-                    'sources':
>-                    [
>-                        '<@(VkLayer_core_validation_sources)',
>-                    ],
>-                    'actions':
>-                    [
>-                        {
>-                            'action_name': 'layer_core_validation_order_deps',
>-                            'message': 'stamping for layer_core_validation_order_deps',
>-                            'msvs_cygwin_shell': 0,
>-                            'inputs': [ '<@(vulkan_layer_generated_files)' ],
>-                            'outputs': [ '<(angle_gen_path)/vulkan/layer_core_validation_order_deps.stamp' ],
>-                            'action':
>-                            [
>-                                'python', '<(angle_path)/gyp/touch_stamp.py',
>-                                '<(angle_gen_path)/vulkan/layer_core_validation_order_deps.stamp',
>-                            ]
>-                        },
>-                    ],
>-                    'conditions':
>-                    [
>-                        ['OS=="win"',
>-                        {
>-                            'sources':
>-                            [
>-                                '<(vulkan_layers_path)/layers/VkLayer_core_validation.def',
>-                            ]
>-                        }],
>-                    ],
>-                },
>-
>-                {
>-                    'target_name': 'VkLayer_swapchain',
>-                    'type': 'shared_library',
>-                    'dependencies':
>-                    [
>-                        'vulkan_layer_utils_static',
>-                    ],
>-                    'sources':
>-                    [
>-                        '<@(VkLayer_swapchain_sources)',
>-                    ],
>-                    'actions':
>-                    [
>-                        {
>-                            'action_name': 'layer_swapchain_order_deps',
>-                            'message': 'stamping for layer_swapchain_order_deps',
>-                            'msvs_cygwin_shell': 0,
>-                            'inputs': [ '<@(vulkan_layer_generated_files)' ],
>-                            'outputs': [ '<(angle_gen_path)/vulkan/layer_swapchain_order_deps.stamp' ],
>-                            'action':
>-                            [
>-                                'python', '<(angle_path)/gyp/touch_stamp.py',
>-                                '<(angle_gen_path)/vulkan/layer_swapchain_order_deps.stamp',
>-                            ]
>-                        },
>-                    ],
>-                    'conditions':
>-                    [
>-                        ['OS=="win"',
>-                        {
>-                            'sources':
>-                            [
>-                                '<(vulkan_layers_path)/layers/VkLayer_swapchain.def',
>-                            ]
>-                        }],
>-                    ],
>-                },
>-
>-                {
>-                    'target_name': 'VkLayer_object_tracker',
>-                    'type': 'shared_library',
>-                    'dependencies':
>-                    [
>-                        'vulkan_layer_utils_static',
>-                    ],
>-                    'sources':
>-                    [
>-                        '<@(VkLayer_object_tracker_sources)',
>-                    ],
>-                    'actions':
>-                    [
>-                        {
>-                            'action_name': 'layer_object_tracker_order_deps',
>-                            'message': 'stamping for layer_object_tracker_order_deps',
>-                            'msvs_cygwin_shell': 0,
>-                            'inputs': [ '<@(vulkan_layer_generated_files)' ],
>-                            'outputs': [ '<(angle_gen_path)/vulkan/layer_object_tracker_order_deps.stamp' ],
>-                            'action':
>-                            [
>-                                'python', '<(angle_path)/gyp/touch_stamp.py',
>-                                '<(angle_gen_path)/vulkan/layer_object_tracker_order_deps.stamp',
>-                            ]
>-                        },
>-                    ],
>-                    'conditions':
>-                    [
>-                        ['OS=="win"',
>-                        {
>-                            'sources':
>-                            [
>-                                '<(vulkan_layers_path)/layers/VkLayer_object_tracker.def',
>-                            ]
>-                        }],
>-                    ],
>-                },
>-
>-                {
>-                    'target_name': 'VkLayer_unique_objects',
>-                    'type': 'shared_library',
>-                    'dependencies':
>-                    [
>-                        'vulkan_layer_utils_static',
>-                    ],
>-                    'sources':
>-                    [
>-                        '<@(VkLayer_unique_objects_sources)',
>-                    ],
>-                    'conditions':
>-                    [
>-                        ['OS=="win"',
>-                        {
>-                            'sources':
>-                            [
>-                                '<(vulkan_layers_path)/layers/VkLayer_unique_objects.def',
>-                            ]
>-                        }],
>-                    ],
>-                    'actions':
>-                    [
>-                        {
>-                            'action_name': 'layer_unique_objects_order_deps',
>-                            'message': 'stamping for layer_unique_objects_order_deps',
>-                            'msvs_cygwin_shell': 0,
>-                            'inputs': [ '<@(vulkan_layer_generated_files)' ],
>-                            'outputs': [ '<(angle_gen_path)/vulkan/layer_unique_objects_order_deps.stamp' ],
>-                            'action':
>-                            [
>-                                'python', '<(angle_path)/gyp/touch_stamp.py',
>-                                '<(angle_gen_path)/vulkan/layer_unique_objects_order_deps.stamp',
>-                            ]
>-                        },
>-                        {
>-                            'action_name': 'vulkan_layer_unique_objects_generate',
>-                            'message': 'generating Vulkan unique_objects helpers',
>-                            'msvs_cygwin_shell': 0,
>-                            'inputs':
>-                            [
>-                                '<(vulkan_layers_path)/scripts/generator.py',
>-                                '<(vulkan_layers_path)/scripts/lvl_genvk.py',
>-                                '<(vulkan_layers_path)/scripts/reg.py',
>-                                '<(vulkan_layers_path)/scripts/unique_objects_generator.py',
>-                                '<(vulkan_layers_path)/scripts/vk.xml',
>-                            ],
>-                            'outputs':
>-                            [
>-                                '<(angle_gen_path)/vulkan/unique_objects_wrappers.h',
>-                            ],
>-                            'action':
>-                            [
>-                                'python', '<(vulkan_layers_path)/scripts/lvl_genvk.py', '-o', '<(angle_gen_path)/vulkan',
>-                                '-registry', '<(vulkan_layers_path)/scripts/vk.xml', 'unique_objects_wrappers.h', '-quiet',
>-                            ],
>-                        },
>-                    ],
>-                },
>-
>-                {
>-                    'target_name': 'VkLayer_threading',
>-                    'type': 'shared_library',
>-                    'dependencies':
>-                    [
>-                        'vulkan_layer_utils_static',
>-                    ],
>-                    'sources':
>-                    [
>-                        '<@(VkLayer_threading_sources)',
>-                    ],
>-                    'conditions':
>-                    [
>-                        ['OS=="win"',
>-                        {
>-                            'sources':
>-                            [
>-                                '<(vulkan_layers_path)/layers/VkLayer_threading.def',
>-                            ]
>-                        }],
>-                    ],
>-                    'actions':
>-                    [
>-                        {
>-                            'action_name': 'layer_threading_order_deps',
>-                            'message': 'stamping for layer_threading_order_deps',
>-                            'msvs_cygwin_shell': 0,
>-                            'inputs': [ '<@(vulkan_layer_generated_files)' ],
>-                            'outputs': [ '<(angle_gen_path)/vulkan/layer_threading_order_deps.stamp' ],
>-                            'action':
>-                            [
>-                                'python', '<(angle_path)/gyp/touch_stamp.py',
>-                                '<(angle_gen_path)/vulkan/layer_threading_order_deps.stamp',
>-                            ]
>-                        },
>-                        {
>-                            'action_name': 'vulkan_layer_threading_generate',
>-                            'message': 'generating Vulkan threading header',
>-                            'msvs_cygwin_shell': 0,
>-                            'inputs':
>-                            [
>-                                '<(vulkan_layers_path)/scripts/generator.py',
>-                                '<(vulkan_layers_path)/scripts/lvl_genvk.py',
>-                                '<(vulkan_layers_path)/scripts/reg.py',
>-                                '<(vulkan_layers_path)/scripts/vk.xml',
>-                            ],
>-                            'outputs':
>-                            [
>-                                '<(angle_gen_path)/vulkan/thread_check.h',
>-                            ],
>-                            'action':
>-                            [
>-                                'python', '<(vulkan_layers_path)/scripts/lvl_genvk.py', '-o',
>-                                '<(angle_gen_path)/vulkan', '-registry', '<(vulkan_layers_path)/scripts/vk.xml',
>-                                'thread_check.h', '-quiet',
>-                            ],
>-                        },
>-                    ],
>-                },
>-
>-                {
>-                    'target_name': 'VkLayer_parameter_validation',
>-                    'type': 'shared_library',
>-                    'dependencies':
>-                    [
>-                        'vulkan_layer_utils_static',
>-                    ],
>-                    'sources':
>-                    [
>-                        '<@(VkLayer_parameter_validation_sources)',
>-                    ],
>-                    'conditions':
>-                    [
>-                        ['OS=="win"',
>-                        {
>-                            'sources':
>-                            [
>-                                '<(vulkan_layers_path)/layers/VkLayer_parameter_validation.def',
>-                            ]
>-                        }],
>-                    ],
>-                    'actions':
>-                    [
>-                        {
>-                            'action_name': 'layer_parameter_validation_order_deps',
>-                            'message': 'stamping for layer_parameter_validation_order_deps',
>-                            'msvs_cygwin_shell': 0,
>-                            'inputs': [ '<@(vulkan_layer_generated_files)' ],
>-                            'outputs': [ '<(angle_gen_path)/vulkan/layer_parameter_validation_order_deps.stamp' ],
>-                            'action':
>-                            [
>-                                'python', '<(angle_path)/gyp/touch_stamp.py',
>-                                '<(angle_gen_path)/vulkan/layer_parameter_validation_order_deps.stamp',
>-                            ]
>-                        },
>-                        {
>-                            'action_name': 'vulkan_layer_parameter_validation_generate',
>-                            'message': 'generating Vulkan parameter_validation header',
>-                            'msvs_cygwin_shell': 0,
>-                            'inputs':
>-                            [
>-                                '<(vulkan_layers_path)/scripts/generator.py',
>-                                '<(vulkan_layers_path)/scripts/lvl_genvk.py',
>-                                '<(vulkan_layers_path)/scripts/reg.py',
>-                                '<(vulkan_layers_path)/scripts/vk.xml',
>-                            ],
>-                            'outputs':
>-                            [
>-                                '<(angle_gen_path)/vulkan/parameter_validation.h',
>-                            ],
>-                            'action':
>-                            [
>-                                'python', '<(vulkan_layers_path)/scripts/lvl_genvk.py', '-o', '<(angle_gen_path)/vulkan',
>-                                '-registry', '<(vulkan_layers_path)/scripts/vk.xml', 'parameter_validation.h', '-quiet',
>-                            ],
>-                        },
>-                    ],
>-                },
>-
>-                {
>-                    'target_name': 'angle_vulkan',
>-                    'type': 'none',
>-                    'dependencies':
>-                    [
>-                        'glslang',
>-                        # Need to disable these to prevent multiply defined symbols with ninja.
>-                        # TODO(jmadill): Figure out how to implement data_deps in gyp.
>-                        # 'VkLayer_core_validation',
>-                        # 'VkLayer_object_tracker',
>-                        # 'VkLayer_parameter_validation',
>-                        # 'VkLayer_swapchain',
>-                        # 'VkLayer_threading',
>-                        # 'VkLayer_unique_objects',
>-                        'vulkan_loader',
>-                    ],
>-                    'export_dependent_settings':
>-                    [
>-                        'glslang',
>-                        'vulkan_loader',
>-                    ],
>-                }
>-            ],
>-        }],
>-    ],
>-}
>diff --git a/Source/ThirdParty/ANGLE/third_party/BUILD.gn b/Source/ThirdParty/ANGLE/third_party/BUILD.gn
>new file mode 100644
>index 00000000000..eacbfc14c7f
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/third_party/BUILD.gn
>@@ -0,0 +1,51 @@
>+# Copyright 2019 The ANGLE Project Authors. All rights reserved.
>+# Use of this source code is governed by a BSD-style license that can be
>+# found in the LICENSE file.
>+#
>+# See:
>+# https://chromium.googlesource.com/chromium/src/+/master/third_party/BUILD.gn
>+
>+import("//third_party/libjpeg.gni")
>+
>+assert(!is_ios, "This is not used on iOS, don't drag it in unintentionally")
>+
>+config("system_libjpeg_config") {
>+  libs = [ "jpeg" ]
>+  defines = [ "USE_SYSTEM_LIBJPEG" ]
>+}
>+
>+config("libjpeg_turbo_config") {
>+  defines = [ "USE_LIBJPEG_TURBO=1" ]
>+}
>+
>+# This is a meta target that forwards to the system's libjpeg,
>+# third_party/libjpeg, or third_party/libjpeg_turbo depending on the build args
>+# declared in this file.
>+group("jpeg") {
>+  if (use_system_libjpeg) {
>+    public_configs = [ ":system_libjpeg_config" ]
>+  } else if (use_libjpeg_turbo) {
>+    public_deps = [
>+      "//third_party/libjpeg_turbo:libjpeg",
>+    ]
>+    public_configs = [ ":libjpeg_turbo_config" ]
>+  } else {
>+    public_deps = [
>+      "//third_party/libjpeg:libjpeg",
>+    ]
>+  }
>+}
>+
>+# This is a meta target that forwards include paths only to the system's
>+# libjpeg, third_party/libjpeg, or third_party/libjpeg_turbo depending on the
>+# build args declared in this file. This is needed, rarely, for targets that
>+# need to reference libjpeg without explicitly building it.
>+group("jpeg_includes") {
>+  if (use_system_libjpeg) {
>+    public_configs = [ ":system_libjpeg_config" ]
>+  } else if (use_libjpeg_turbo) {
>+    public_configs = [ "//third_party/libjpeg_turbo:libjpeg_config" ]
>+  } else {
>+    public_configs = [ "//third_party/libjpeg:libjpeg_config" ]
>+  }
>+}
>diff --git a/Source/ThirdParty/ANGLE/third_party/deqp/README.angle b/Source/ThirdParty/ANGLE/third_party/deqp/README.angle
>new file mode 100644
>index 00000000000..40bc0667736
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/third_party/deqp/README.angle
>@@ -0,0 +1,13 @@
>+Name: drawElements Quality Program
>+Short Name: dEQP
>+Version: 1.0
>+URL: https://source.android.com/devices/graphics/testing.html
>+SOURCE CODE: git clone -b deqp-dev https://android.googlesource.com/platform/external/deqp/
>+Date: 20/06/2016
>+Revision: f4f3d8079e7a37d7675ab93583e6438d0bca0e58
>+Security Critical: no
>+License: Apache 2.0
>+License File: LICENSE
>+
>+Description:
>+dEQP is a set of tests and testing tools for GPUs and their drivers. It currently supports OpenGL ES 2.0 - 3.1 & AEP and EGL. The dEQP has been part of the Android CTS since the L release.
>diff --git a/Source/ThirdParty/ANGLE/third_party/glmark2/BUILD.gn b/Source/ThirdParty/ANGLE/third_party/glmark2/BUILD.gn
>new file mode 100644
>index 00000000000..ddd7f2aa11a
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/third_party/glmark2/BUILD.gn
>@@ -0,0 +1,418 @@
>+# Copyright 2019 The ANGLE Project Authors. All rights reserved.
>+# Use of this source code is governed by a BSD-style license that can be
>+# found in the LICENSE file.
>+#
>+# Build integration for glmark2.
>+
>+import("../../gni/angle.gni")
>+
>+glmark2_glad_common_sources = [
>+  "src/src/glad/include/glad/egl.h",
>+  "src/src/glad/src/egl.c",
>+]
>+
>+config("glmark2_glad_config") {
>+  include_dirs = [ "src/src/glad/include" ]
>+}
>+
>+source_set("glmark2_glad_gles") {
>+  sources = glmark2_glad_common_sources + [
>+              "src/src/glad/include/glad/gles2.h",
>+              "src/src/glad/src/gles2.c",
>+            ]
>+  public_configs = [ ":glmark2_glad_config" ]
>+}
>+
>+source_set("glmark2_glad_gl") {
>+  sources = glmark2_glad_common_sources + [
>+              "src/src/glad/include/glad/gl.h",
>+              "src/src/glad/src/gl.c",
>+            ]
>+  public_configs = [ ":glmark2_glad_config" ]
>+}
>+
>+glmark_data_path = "${angle_root}/third_party/glmark2/src/data"
>+raw_glmark_data_path = rebase_path(glmark_data_path, root_build_dir)
>+
>+config("glmark2_common_config") {
>+  defines = [ "GLMARK_DATA_PATH=\"${raw_glmark_data_path}\"" ]
>+  include_dirs = [ "src/src" ]
>+  if (is_win) {
>+    include_dirs += [ "src/src/include" ]
>+
>+    # M_PI is nonstandard.
>+    defines += [ "_USE_MATH_DEFINES" ]
>+
>+    if (!is_clang) {
>+      cflags = [
>+        # MSVC warns about the copyright character being illegal.
>+        "/wd4828",
>+
>+        # A warning generated in scene-effect-2d in vec2::calc_offset
>+        "/wd4146",
>+      ]
>+    }
>+  }
>+}
>+
>+config("glmark2_gles_config") {
>+  defines = [ "GLMARK2_USE_GLESv2" ]
>+}
>+
>+config("glmark2_gl_config") {
>+  defines = [ "GLMARK2_USE_GL" ]
>+}
>+
>+group("glmark2_gles") {
>+  public_configs = [
>+    ":glmark2_common_config",
>+    ":glmark2_gles_config",
>+  ]
>+  public_deps = [
>+    ":glmark2_glad_gles",
>+  ]
>+}
>+
>+group("glmark2_gl") {
>+  public_configs = [
>+    ":glmark2_common_config",
>+    ":glmark2_gl_config",
>+  ]
>+  public_deps = [
>+    ":glmark2_glad_gl",
>+  ]
>+}
>+
>+# Supplies compatible headers on Win32.
>+config("glmark2_headers_config") {
>+  if (is_win) {
>+    if (is_clang) {
>+      cflags = [
>+        "-Wno-unused-function",
>+        "-Wno-writable-strings",
>+        "-Wno-extra-tokens",
>+      ]
>+    }
>+  }
>+}
>+
>+source_set("glmark2_headers") {
>+  sources = [
>+    "src/src/canvas.h",
>+    "src/src/gl-headers.h",
>+    "src/src/gl-state-egl.h",
>+    "src/src/gl-state.h",
>+    "src/src/gl-visual-config.h",
>+    "src/src/mesh.h",
>+    "src/src/scene.h",
>+    "src/src/shared-library.h",
>+    "src/src/texture.h",
>+  ]
>+
>+  if (is_linux) {
>+    sources += [ "src/src/gl-state-glx.h" ]
>+  }
>+  if (is_win) {
>+    sources += [
>+      "src/src/gl-state-wgl.h",
>+      "src/src/include/dirent.h",
>+      "src/src/include/getopt.h",
>+      "src/src/include/sys/time.h",
>+    ]
>+  }
>+  public_configs = [ ":glmark2_headers_config" ]
>+  include_dirs = [ "src/src" ]
>+}
>+
>+config("glmark2_libmatrix_config") {
>+  include_dirs = [ "src/src/libmatrix" ]
>+}
>+
>+template("glmark2_libmatrix") {
>+  source_set(target_name) {
>+    forward_variables_from(invoker, "*")
>+    sources = [
>+      "src/src/libmatrix/gl-if.h",
>+      "src/src/libmatrix/log.cc",
>+      "src/src/libmatrix/log.h",
>+      "src/src/libmatrix/mat.cc",
>+      "src/src/libmatrix/mat.h",
>+      "src/src/libmatrix/program.cc",
>+      "src/src/libmatrix/program.h",
>+      "src/src/libmatrix/shader-source.cc",
>+      "src/src/libmatrix/shader-source.h",
>+      "src/src/libmatrix/stack.h",
>+      "src/src/libmatrix/util.cc",
>+      "src/src/libmatrix/util.h",
>+      "src/src/libmatrix/vec.h",
>+    ]
>+
>+    if (is_clang) {
>+      cflags_cc = [ "-Wno-implicit-fallthrough" ]
>+    }
>+    public_deps = [
>+      ":glmark2_headers",
>+    ]
>+    public_configs = [ ":glmark2_libmatrix_config" ]
>+  }
>+}
>+
>+glmark2_libmatrix("glmark2_libmatrix_gles") {
>+  deps = [
>+    ":glmark2_gles",
>+  ]
>+}
>+
>+glmark2_libmatrix("glmark2_libmatrix_gl") {
>+  deps = [
>+    ":glmark2_gl",
>+  ]
>+}
>+
>+config("glmark2_scene_ideas_config") {
>+  include_dirs = [ "src/src/scene-ideas" ]
>+}
>+
>+template("glmark2_scene_ideas") {
>+  source_set(target_name) {
>+    forward_variables_from(invoker, "*")
>+    sources = [
>+      "src/src/scene-ideas/a.cc",
>+      "src/src/scene-ideas/characters.h",
>+      "src/src/scene-ideas/d.cc",
>+      "src/src/scene-ideas/e.cc",
>+      "src/src/scene-ideas/i.cc",
>+      "src/src/scene-ideas/lamp.cc",
>+      "src/src/scene-ideas/lamp.h",
>+      "src/src/scene-ideas/logo.cc",
>+      "src/src/scene-ideas/logo.h",
>+      "src/src/scene-ideas/m.cc",
>+      "src/src/scene-ideas/n.cc",
>+      "src/src/scene-ideas/o.cc",
>+      "src/src/scene-ideas/s.cc",
>+      "src/src/scene-ideas/splines.cc",
>+      "src/src/scene-ideas/splines.h",
>+      "src/src/scene-ideas/t.cc",
>+      "src/src/scene-ideas/table.cc",
>+      "src/src/scene-ideas/table.h",
>+    ]
>+    public_configs = [ ":glmark2_scene_ideas_config" ]
>+  }
>+}
>+
>+glmark2_scene_ideas("glmark2_scene_ideas_gles") {
>+  deps = [
>+    ":glmark2_gles",
>+    ":glmark2_libmatrix_gles",
>+  ]
>+}
>+
>+glmark2_scene_ideas("glmark2_scene_ideas_gl") {
>+  deps = [
>+    ":glmark2_gl",
>+    ":glmark2_libmatrix_gl",
>+  ]
>+}
>+
>+config("glmark2_scene_terrain_config") {
>+  include_dirs = [ "src/src/scene-terrain" ]
>+}
>+
>+template("glmark2_scene_terrain") {
>+  source_set(target_name) {
>+    forward_variables_from(invoker, "*")
>+    sources = [
>+      "src/src/scene-terrain/base-renderer.cpp",
>+      "src/src/scene-terrain/blur-renderer.cpp",
>+      "src/src/scene-terrain/copy-renderer.cpp",
>+      "src/src/scene-terrain/luminance-renderer.cpp",
>+      "src/src/scene-terrain/normal-from-height-renderer.cpp",
>+      "src/src/scene-terrain/overlay-renderer.cpp",
>+      "src/src/scene-terrain/renderer-chain.cpp",
>+      "src/src/scene-terrain/renderer.h",
>+      "src/src/scene-terrain/simplex-noise-renderer.cpp",
>+      "src/src/scene-terrain/terrain-renderer.cpp",
>+      "src/src/scene-terrain/texture-renderer.cpp",
>+    ]
>+
>+    public_configs = [ ":glmark2_scene_terrain_config" ]
>+  }
>+}
>+
>+glmark2_scene_terrain("glmark2_scene_terrain_gles") {
>+  deps = [
>+    ":glmark2_gles",
>+    ":glmark2_libmatrix_gles",
>+  ]
>+}
>+
>+glmark2_scene_terrain("glmark2_scene_terrain_gl") {
>+  deps = [
>+    ":glmark2_gl",
>+    ":glmark2_libmatrix_gl",
>+  ]
>+}
>+
>+template("glmark2_common") {
>+  source_set(target_name) {
>+    forward_variables_from(invoker, "*")
>+    sources = [
>+      "src/src/benchmark-collection.cpp",
>+      "src/src/benchmark-collection.h",
>+      "src/src/benchmark.cpp",
>+      "src/src/benchmark.h",
>+      "src/src/default-benchmarks.h",
>+      "src/src/gl-headers.cpp",
>+      "src/src/gl-visual-config.cpp",
>+      "src/src/gl-visual-config.h",
>+      "src/src/image-reader.cpp",
>+      "src/src/image-reader.h",
>+      "src/src/main-loop.cpp",
>+      "src/src/main-loop.h",
>+      "src/src/mesh.cpp",
>+      "src/src/model.cpp",
>+      "src/src/model.h",
>+      "src/src/native-state.h",
>+      "src/src/options.cpp",
>+      "src/src/options.h",
>+      "src/src/scene-buffer.cpp",
>+      "src/src/scene-build.cpp",
>+      "src/src/scene-bump.cpp",
>+      "src/src/scene-clear.cpp",
>+      "src/src/scene-collection.h",
>+      "src/src/scene-conditionals.cpp",
>+      "src/src/scene-default-options.cpp",
>+      "src/src/scene-desktop.cpp",
>+      "src/src/scene-effect-2d.cpp",
>+      "src/src/scene-function.cpp",
>+      "src/src/scene-grid.cpp",
>+      "src/src/scene-ideas.cpp",
>+      "src/src/scene-jellyfish.cpp",
>+      "src/src/scene-jellyfish.h",
>+      "src/src/scene-loop.cpp",
>+      "src/src/scene-pulsar.cpp",
>+      "src/src/scene-refract.cpp",
>+      "src/src/scene-refract.h",
>+      "src/src/scene-shading.cpp",
>+      "src/src/scene-shadow.cpp",
>+      "src/src/scene-terrain.cpp",
>+      "src/src/scene-texture.cpp",
>+      "src/src/scene.cpp",
>+      "src/src/shared-library.cpp",
>+      "src/src/text-renderer.cpp",
>+      "src/src/text-renderer.h",
>+      "src/src/texture.cpp",
>+    ]
>+
>+    public_deps += [
>+      ":glmark2_headers",
>+      "${angle_libpng_dir}:libpng",
>+      "${angle_root}/third_party:jpeg",
>+    ]
>+  }
>+}
>+
>+glmark2_common("glmark2_common_gles") {
>+  public_deps = [
>+    ":glmark2_gles",
>+    ":glmark2_libmatrix_gles",
>+    ":glmark2_scene_ideas_gles",
>+    ":glmark2_scene_terrain_gles",
>+  ]
>+}
>+
>+glmark2_common("glmark2_common_gl") {
>+  public_deps = [
>+    ":glmark2_gl",
>+    ":glmark2_libmatrix_gl",
>+    ":glmark2_scene_ideas_gl",
>+    ":glmark2_scene_terrain_gl",
>+  ]
>+}
>+
>+glmark2_version = "2017.07"
>+
>+template("glmark2_exe") {
>+  executable(target_name) {
>+    forward_variables_from(invoker, "*")
>+    sources += [
>+      "src/src/canvas-generic.cpp",
>+      "src/src/canvas-generic.h",
>+      "src/src/main.cpp",
>+    ]
>+    data = [
>+      "src/data/",
>+    ]
>+
>+    defines += [ "GLMARK_VERSION=\"${glmark2_version}\"" ]
>+
>+    if (is_win) {
>+      defines += [ "GLMARK2_USE_WIN32" ]
>+      sources += [
>+        "src/src/native-state-win32.cpp",
>+        "src/src/native-state-win32.h",
>+      ]
>+    }
>+    if (is_linux) {
>+      defines += [ "GLMARK2_USE_X11" ]
>+      sources += [
>+        "src/src/native-state-x11.cpp",
>+        "src/src/native-state-x11.h",
>+      ]
>+      libs = [ "X11" ]
>+    }
>+  }
>+}
>+
>+glmark2_exe("glmark2_angle") {
>+  sources = [
>+    "src/src/gl-state-egl.cpp",
>+  ]
>+  deps = [
>+    ":glmark2_common_gles",
>+  ]
>+  data_deps = [
>+    "${angle_root}:libEGL",
>+    "${angle_root}:libGLESv2",
>+  ]
>+
>+  defines = [
>+    "EGL_EGL_PROTOTYPES=1",
>+    "GLMARK2_USE_EGL",
>+  ]
>+
>+  if (is_linux && !is_component_build) {
>+    # Set rpath to find shared libs in a non-component build.
>+    public_configs = [ "//build/config/gcc:rpath_for_built_shared_libraries" ]
>+  }
>+}
>+
>+if (is_linux) {
>+  glmark2_exe("glmark2_glx") {
>+    sources = [
>+      "src/src/gl-state-glx.cpp",
>+      "src/src/glad/include/glad/glx.h",
>+      "src/src/glad/src/glx.c",
>+    ]
>+    deps = [
>+      ":glmark2_common_gl",
>+    ]
>+
>+    defines = [ "GLMARK2_USE_GLX" ]
>+  }
>+}
>+
>+# opengl32.lib/opengl32.dll are not available on Windows ARM64.
>+if (is_win && target_cpu != "arm64") {
>+  glmark2_exe("glmark2_wgl") {
>+    sources = [
>+      "src/src/gl-state-wgl.cpp",
>+    ]
>+    deps = [
>+      ":glmark2_common_gl",
>+    ]
>+
>+    libs = [ "opengl32.lib" ]
>+    defines = [ "GLMARK2_USE_WGL" ]
>+  }
>+}
>diff --git a/Source/ThirdParty/ANGLE/third_party/glmark2/README.angle b/Source/ThirdParty/ANGLE/third_party/glmark2/README.angle
>new file mode 100644
>index 00000000000..a2b6371fed8
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/third_party/glmark2/README.angle
>@@ -0,0 +1,12 @@
>+Name: glmark2
>+Short Name: glmark2
>+URL: https://github.com/glmark2/glmark2
>+Security Critical: no
>+License: GPL v3
>+License File: NOT_SHIPPED
>+
>+Description:
>+glmark2 is an OpenGL 2.0 and ES 2.0 benchmark.
>+
>+glmark2 is developed by Alexandros Frantzis and Jesse Barker based on the
>+original glmark benchmark by Ben Smith.
>diff --git a/Source/ThirdParty/ANGLE/third_party/glslang/README.angle b/Source/ThirdParty/ANGLE/third_party/glslang/README.angle
>new file mode 100644
>index 00000000000..9424a698b71
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/third_party/glslang/README.angle
>@@ -0,0 +1,10 @@
>+Name: Khronos reference front-end for GLSL and ESSL
>+Short Name: glslang
>+URL: https://github.com/google/glslang
>+Version: N/A
>+Security Critical: yes
>+License: MIT
>+License File: LICENSE
>+
>+Description:
>+An OpenGL and OpenGL ES shader front end and validator.
>diff --git a/Source/ThirdParty/ANGLE/third_party/googletest/README.angle b/Source/ThirdParty/ANGLE/third_party/googletest/README.angle
>new file mode 100644
>index 00000000000..76a0cb4fe23
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/third_party/googletest/README.angle
>@@ -0,0 +1,7 @@
>+Name: Google Test: Google's C++ Testing Framework
>+Short Name: googletest
>+URL: https://github.com/google/googletest.git
>+Version: 1.8.0.git-7f8fefabedf2965980585be8c2bff97458f28e0b
>+License: BSD
>+License File: NOT_SHIPPED
>+Security critical: no
>diff --git a/Source/ThirdParty/ANGLE/third_party/libjpeg.gni b/Source/ThirdParty/ANGLE/third_party/libjpeg.gni
>new file mode 100644
>index 00000000000..8d4527c1358
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/third_party/libjpeg.gni
>@@ -0,0 +1,15 @@
>+# Copyright 2019 The ANGLE Project Authors. All rights reserved.
>+# Use of this source code is governed by a BSD-style license that can be
>+# found in the LICENSE file.
>+#
>+# See:
>+# https://chromium.googlesource.com/chromium/src/+/master/third_party/libjpeg.gni
>+
>+declare_args() {
>+  # Uses system libjpeg. If true, overrides use_libjpeg_turbo.
>+  use_system_libjpeg = false
>+
>+  # Uses libjpeg_turbo as the jpeg implementation. Has no effect if
>+  # use_system_libjpeg is set.
>+  use_libjpeg_turbo = true
>+}
>diff --git a/Source/ThirdParty/ANGLE/third_party/libpng/BUILD.gn b/Source/ThirdParty/ANGLE/third_party/libpng/BUILD.gn
>new file mode 100644
>index 00000000000..f957b3685ba
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/third_party/libpng/BUILD.gn
>@@ -0,0 +1,35 @@
>+# Copyright (c) 2017 The ANGLE Project Authors. All rights reserved.
>+# Use of this source code is governed by a BSD-style license that can be
>+# found in the LICENSE file.
>+
>+config("libpng_config") {
>+  include_dirs = [ "src" ]
>+}
>+
>+static_library("libpng") {
>+  sources = [
>+    "src/png.c",
>+    "src/pngerror.c",
>+    "src/pngget.c",
>+    "src/pngmem.c",
>+    "src/pngpread.c",
>+    "src/pngread.c",
>+    "src/pngrio.c",
>+    "src/pngrtran.c",
>+    "src/pngrutil.c",
>+    "src/pngset.c",
>+    "src/pngtrans.c",
>+    "src/pngwio.c",
>+    "src/pngwrite.c",
>+    "src/pngwtran.c",
>+    "src/pngwutil.c",
>+  ]
>+  if (is_win) {
>+    cflags = [ "/wd4028" ]
>+  }
>+  configs -= [ "//build/config/compiler:chromium_code" ]
>+  public_configs = [ ":libpng_config" ]
>+  deps = [
>+    "//third_party/zlib:zlib",
>+  ]
>+}
>diff --git a/Source/ThirdParty/ANGLE/third_party/libpng/README.angle b/Source/ThirdParty/ANGLE/third_party/libpng/README.angle
>new file mode 100644
>index 00000000000..52345691b0c
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/third_party/libpng/README.angle
>@@ -0,0 +1,6 @@
>+Name: libpng
>+URL: http://libpng.org/
>+Version: 1.6.22
>+Security Critical: yes
>+License: libpng license
>+License Android Compatible: yes
>diff --git a/Source/ThirdParty/ANGLE/third_party/minigbm/BUILD.gn b/Source/ThirdParty/ANGLE/third_party/minigbm/BUILD.gn
>new file mode 100644
>index 00000000000..fc23b2f5783
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/third_party/minigbm/BUILD.gn
>@@ -0,0 +1,13 @@
>+# Copyright 2017 The ANGLE Project Authors. All rights reserved.
>+# Use of this source code is governed by a BSD-style license that can be
>+# found in the LICENSE file.
>+
>+import("//build/config/linux/pkg_config.gni")
>+
>+pkg_config("libgbm") {
>+  packages = [ "gbm" ]
>+}
>+
>+group("minigbm") {
>+  public_configs = [ ":libgbm" ]
>+}
>diff --git a/Source/ThirdParty/ANGLE/third_party/rapidjson/BUILD.gn b/Source/ThirdParty/ANGLE/third_party/rapidjson/BUILD.gn
>new file mode 100644
>index 00000000000..82a854ccbe0
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/third_party/rapidjson/BUILD.gn
>@@ -0,0 +1,52 @@
>+# Copyright 2019 The ANGLE Project Authors. All rights reserved.
>+# Use of this source code is governed by a BSD-style license that can be
>+# found in the LICENSE file.
>+#
>+# Custom GN integration for rapidjson.
>+
>+config("rapidjson_config") {
>+  include_dirs = [ "src/include" ]
>+}
>+
>+source_set("rapidjson") {
>+  sources = [
>+    "src/include/rapidjson/allocators.h",
>+    "src/include/rapidjson/cusorstreamwrapper.h",
>+    "src/include/rapidjson/document.h",
>+    "src/include/rapidjson/encodedstream.h",
>+    "src/include/rapidjson/encodings.h",
>+    "src/include/rapidjson/error/en.h",
>+    "src/include/rapidjson/error/error.h",
>+    "src/include/rapidjson/filereadstream.h",
>+    "src/include/rapidjson/filewritestream.h",
>+    "src/include/rapidjson/fwd.h",
>+    "src/include/rapidjson/internal/biginteger.h",
>+    "src/include/rapidjson/internal/diyfp.h",
>+    "src/include/rapidjson/internal/dtoa.h",
>+    "src/include/rapidjson/internal/ieee754.h",
>+    "src/include/rapidjson/internal/itoa.h",
>+    "src/include/rapidjson/internal/meta.h",
>+    "src/include/rapidjson/internal/pow10.h",
>+    "src/include/rapidjson/internal/regex.h",
>+    "src/include/rapidjson/internal/stack.h",
>+    "src/include/rapidjson/internal/strfunc.h",
>+    "src/include/rapidjson/internal/strtod.h",
>+    "src/include/rapidjson/internal/swap.h",
>+    "src/include/rapidjson/istreamwrapper.h",
>+    "src/include/rapidjson/memorybuffer.h",
>+    "src/include/rapidjson/memorystream.h",
>+    "src/include/rapidjson/msinttypes/inttypes.h",
>+    "src/include/rapidjson/msinttypes/stdint.h",
>+    "src/include/rapidjson/ostreamwrapper.h",
>+    "src/include/rapidjson/pointer.h",
>+    "src/include/rapidjson/prettywriter.h",
>+    "src/include/rapidjson/rapidjson.h",
>+    "src/include/rapidjson/reader.h",
>+    "src/include/rapidjson/schema.h",
>+    "src/include/rapidjson/stream.h",
>+    "src/include/rapidjson/stringbuffer.h",
>+    "src/include/rapidjson/writer.h",
>+  ]
>+
>+  public_configs = [ ":rapidjson_config" ]
>+}
>diff --git a/Source/ThirdParty/ANGLE/third_party/rapidjson/README.chromium b/Source/ThirdParty/ANGLE/third_party/rapidjson/README.chromium
>new file mode 100644
>index 00000000000..b061cbcece3
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/third_party/rapidjson/README.chromium
>@@ -0,0 +1,7 @@
>+Name: RapidJSON
>+URL: https://github.com/TenCent/rapidjson
>+License: MIT
>+License File: src/license.txt
>+
>+Description:
>+A fast JSON parser/generator for C++ with both SAX/DOM style API.
>diff --git a/Source/ThirdParty/ANGLE/third_party/spirv-headers/README.angle b/Source/ThirdParty/ANGLE/third_party/spirv-headers/README.angle
>new file mode 100644
>index 00000000000..835bdbc5cc9
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/third_party/spirv-headers/README.angle
>@@ -0,0 +1,14 @@
>+Name: SPIR-V Headers
>+Short Name: spirv-headers
>+URL: https://github.com/KhronosGroup/SPIRV-Headers.git
>+Version: Unknown
>+Security Critical: yes
>+License: MIT
>+License File: LICENSE
>+
>+Description:
>+This repository contains machine-readable files from the SPIR-V Registry. This includes:
>+
>+* Header files for various languages.
>+* JSON files describing the grammar for the SPIR-V core instruction set, and for the GLSL.std.450 extended instruction set.
>+* The XML registry file.
>diff --git a/Source/ThirdParty/ANGLE/third_party/spirv-tools/README.angle b/Source/ThirdParty/ANGLE/third_party/spirv-tools/README.angle
>new file mode 100644
>index 00000000000..fc648ccae01
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/third_party/spirv-tools/README.angle
>@@ -0,0 +1,11 @@
>+Name: SPIR-V Tools
>+Short Name: SPIRV-Tools
>+URL: https://github.com/KhronosGroup/SPIRV-Tools.git
>+Version: Unknown
>+Security Critical: yes
>+License: MIT
>+License File: LICENSE
>+
>+Description:
>+The SPIR-V Tools project provides an API and commands for processing
>+SPIR-V modules.
>diff --git a/Source/ThirdParty/ANGLE/third_party/vulkan-headers/BUILD.gn b/Source/ThirdParty/ANGLE/third_party/vulkan-headers/BUILD.gn
>new file mode 100644
>index 00000000000..e61be5643f2
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/third_party/vulkan-headers/BUILD.gn
>@@ -0,0 +1,40 @@
>+# Copyright 2018 The ANGLE Project Authors. All rights reserved.
>+# Use of this source code is governed by a BSD-style license that can be
>+# found in the LICENSE file.
>+
>+# BUILD settings for Vulkan Headers
>+# Headers repo is at
>+# https://github.com/KhronosGroup/Vulkan-Headers
>+
>+import("../../gni/angle.gni")
>+
>+config("vulkan_headers_config") {
>+  include_dirs = [ "src/include" ]
>+
>+  if (is_win) {
>+    defines = [ "VK_USE_PLATFORM_WIN32_KHR" ]
>+  }
>+  if (is_linux) {
>+    defines = [ "VK_USE_PLATFORM_XCB_KHR" ]
>+  }
>+  if (is_android) {
>+    defines = [ "VK_USE_PLATFORM_ANDROID_KHR" ]
>+  }
>+  if (is_fuchsia) {
>+    defines = [ "VK_USE_PLATFORM_FUCHSIA" ]
>+  }
>+}
>+
>+# Vulkan headers only, no compiled sources.
>+source_set("vulkan_headers") {
>+  sources = [
>+    "src/include/vulkan/vk_icd.h",
>+    "src/include/vulkan/vk_layer.h",
>+    "src/include/vulkan/vk_platform.h",
>+    "src/include/vulkan/vk_sdk_platform.h",
>+    "src/include/vulkan/vulkan.h",
>+    "src/include/vulkan/vulkan.hpp",
>+    "src/include/vulkan/vulkan_core.h",
>+  ]
>+  public_configs = [ ":vulkan_headers_config" ]
>+}
>diff --git a/Source/ThirdParty/ANGLE/third_party/vulkan-headers/README.angle b/Source/ThirdParty/ANGLE/third_party/vulkan-headers/README.angle
>new file mode 100644
>index 00000000000..e6126015ac1
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/third_party/vulkan-headers/README.angle
>@@ -0,0 +1,15 @@
>+Name: Vulkan Header Components
>+Short Name: Vulkan Headers
>+Version: N/A
>+URL: https://github.com/KhronosGroup/Vulkan-Headers
>+SOURCE CODE: git clone https://github.com/KhronosGroup/Vulkan-Headers.git
>+Date: 06/12/2018
>+Revision: 634e3658d6fa8f95f9062a3a7831d5567baf0eb3
>+Security Critical: no
>+License: Apache 2.0
>+License File: LICENSE.txt
>+
>+Description:
>+The Vulkan Headers Components are used to by Vulkan projects. This includes the Vulkan loader,
>+mock ICD in the Vulkan-Tools repo, and the Vulkan Validation layers.
>+
>diff --git a/Source/ThirdParty/ANGLE/third_party/vulkan-headers/vulkan_headers_script_deps.gni b/Source/ThirdParty/ANGLE/third_party/vulkan-headers/vulkan_headers_script_deps.gni
>new file mode 100644
>index 00000000000..552bf6edf45
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/third_party/vulkan-headers/vulkan_headers_script_deps.gni
>@@ -0,0 +1,13 @@
>+# Copyright 2018 The ANGLE Project Authors. All rights reserved.
>+# Use of this source code is governed by a BSD-style license that can be
>+# found in the LICENSE file.
>+
>+raw_vulkan_headers_registry_dir = rebase_path("src/registry")
>+
>+# Common scripts & input used by multiple other repos
>+vulkan_registry_script_files = [
>+  "$raw_vulkan_headers_registry_dir/cgenerator.py",
>+  "$raw_vulkan_headers_registry_dir/generator.py",
>+  "$raw_vulkan_headers_registry_dir/reg.py",
>+  "$raw_vulkan_headers_registry_dir/vk.xml",
>+]
>diff --git a/Source/ThirdParty/ANGLE/third_party/vulkan-loader/BUILD.gn b/Source/ThirdParty/ANGLE/third_party/vulkan-loader/BUILD.gn
>new file mode 100644
>index 00000000000..966b0007189
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/third_party/vulkan-loader/BUILD.gn
>@@ -0,0 +1,249 @@
>+# Copyright 2018 The ANGLE Project Authors. All rights reserved.
>+# Use of this source code is governed by a BSD-style license that can be
>+# found in the LICENSE file.
>+
>+# BUILD settings for Vulkan Loader
>+# Loader repo is at
>+# https://github.com/KhronosGroup/Vulkan-Loader
>+
>+import("../../gni/angle.gni")
>+import("$angle_root/third_party/vulkan-headers/vulkan_headers_script_deps.gni")
>+
>+# Fuchsia has non-upstream changes to the vulkan loader, so we don't want
>+# to build it from upstream sources.
>+assert(!is_fuchsia)
>+
>+if (!is_android) {
>+  vulkan_undefine_configs = []
>+}
>+if (is_win) {
>+  vulkan_undefine_configs += [
>+    "//build/config/win:nominmax",
>+    "//build/config/win:unicode",
>+  ]
>+}
>+
>+vulkan_gen_dir = "$target_gen_dir/angle/vulkan"
>+raw_vulkan_gen_dir = rebase_path(vulkan_gen_dir, root_build_dir)
>+
>+# Vulkan helper scripts
>+# ---------------------
>+
>+helper_script_and_deps = [
>+  [
>+    "vulkan_gen_dispatch_table_helper_h",
>+    "vk_dispatch_table_helper.h",
>+    "dispatch_table_helper_generator.py",
>+  ],
>+  [
>+    "vulkan_gen_enum_string_helper",
>+    "vk_enum_string_helper.h",
>+    "helper_file_generator.py",
>+  ],
>+  [
>+    "vulkan_gen_extension_helper",
>+    "vk_extension_helper.h",
>+    "helper_file_generator.py",
>+  ],
>+  [
>+    "vulkan_gen_layer_dispatch_table_h",
>+    "vk_layer_dispatch_table.h",
>+    "loader_extension_generator.py",
>+  ],
>+  [
>+    "vulkan_gen_loader_extensions_c",
>+    "vk_loader_extensions.c",
>+    "loader_extension_generator.py",
>+  ],
>+  [
>+    "vulkan_gen_loader_extensions_h",
>+    "vk_loader_extensions.h",
>+    "loader_extension_generator.py",
>+  ],
>+  [
>+    "vulkan_gen_object_types_h",
>+    "vk_object_types.h",
>+    "helper_file_generator.py",
>+  ],
>+  [
>+    "vulkan_gen_safe_struct_cpp",
>+    "vk_safe_struct.cpp",
>+    "helper_file_generator.py",
>+  ],
>+  [
>+    "vulkan_gen_safe_struct_h",
>+    "vk_safe_struct.h",
>+    "helper_file_generator.py",
>+  ],
>+  [
>+    "vulkan_gen_typemap_helper",
>+    "vk_typemap_helper.h",
>+    "helper_file_generator.py",
>+  ],
>+]
>+
>+# Python scripts needed for codegen, copy them to a temp dir
>+# so that all dependencies are together. The reg.py script from
>+# the headers repo is required input to loader_genvk.py.
>+copy("python_gen_deps") {
>+  sources = vulkan_registry_script_files + [
>+              "src/scripts/common_codegen.py",
>+              "src/scripts/dispatch_table_helper_generator.py",
>+              "src/scripts/helper_file_generator.py",
>+              "src/scripts/loader_extension_generator.py",
>+              "src/scripts/loader_genvk.py",
>+            ]
>+  outputs = [
>+    "$vulkan_gen_dir/{{source_file_part}}",
>+  ]
>+}
>+
>+foreach(script_and_dep, helper_script_and_deps) {
>+  target_name = script_and_dep[0]
>+  file = script_and_dep[1]
>+  dep = script_and_dep[2]
>+  target("action", target_name) {
>+    public_deps = [
>+      ":python_gen_deps",
>+    ]
>+    script = "$vulkan_gen_dir/loader_genvk.py"
>+    inputs = [
>+      "$vulkan_gen_dir/$dep",
>+      "$vulkan_gen_dir/common_codegen.py",
>+    ]
>+    outputs = [
>+      "$vulkan_gen_dir/$file",
>+    ]
>+    args = [
>+      "-o",
>+      raw_vulkan_gen_dir,
>+      "-registry",
>+      "$raw_vulkan_gen_dir/vk.xml",
>+      "-scripts",
>+      raw_vulkan_gen_dir,
>+      "$file",
>+      "-quiet",
>+    ]
>+  }
>+}
>+
>+config("vulkan_generated_files_config") {
>+  include_dirs = [ vulkan_gen_dir ]
>+}
>+
>+group("vulkan_generate_helper_files") {
>+  public_deps = [
>+    "$angle_root/third_party/vulkan-headers:vulkan_headers",
>+  ]
>+  public_configs = [ ":vulkan_generated_files_config" ]
>+  foreach(script_and_dep, helper_script_and_deps) {
>+    target_name = script_and_dep[0]
>+    public_deps += [ ":$target_name" ]
>+  }
>+}
>+
>+config("vulkan_internal_config") {
>+  defines = [ "VULKAN_NON_CMAKE_BUILD" ]
>+  if (is_clang || !is_win) {
>+    cflags = [ "-Wno-unused-function" ]
>+  }
>+  if (is_linux) {
>+    defines += [
>+      "SYSCONFDIR=\"/etc\"",
>+      "FALLBACK_CONFIG_DIRS=\"/etc/xdg\"",
>+      "FALLBACK_DATA_DIRS=\"/usr/local/share:/usr/share\"",
>+    ]
>+  }
>+}
>+
>+# Vulkan loader
>+# -------------
>+
>+config("vulkan_loader_config") {
>+  include_dirs = [
>+    vulkan_gen_dir,
>+    "$angle_root/third_party/vulkan-headers/src/include",
>+    "src/loader",
>+  ]
>+  defines = [
>+    "ANGLE_VK_DATA_DIR=\"$data_dir\"",
>+    "ANGLE_VK_ICD_JSON=\"$data_dir/VkICD_mock_icd.json\"",
>+    "API_NAME=\"Vulkan\"",
>+  ]
>+
>+  if (is_win) {
>+    cflags = [ "/wd4201" ]
>+  }
>+  if (is_linux) {
>+    # assume secure_getenv() is available
>+    defines += [ "HAVE_SECURE_GETENV" ]
>+  }
>+}
>+
>+if (!is_android) {
>+  if (angle_shared_libvulkan) {
>+    library_type = "shared_library"
>+  } else {
>+    library_type = "static_library"
>+  }
>+
>+  target(library_type, "libvulkan") {
>+    sources = [
>+      "src/loader/asm_offset.c",
>+      "src/loader/cJSON.c",
>+      "src/loader/cJSON.h",
>+      "src/loader/debug_utils.c",
>+      "src/loader/debug_utils.h",
>+      "src/loader/dev_ext_trampoline.c",
>+      "src/loader/extension_manual.c",
>+      "src/loader/extension_manual.h",
>+      "src/loader/gpa_helper.h",
>+      "src/loader/loader.c",
>+      "src/loader/loader.h",
>+      "src/loader/murmurhash.c",
>+      "src/loader/murmurhash.h",
>+      "src/loader/phys_dev_ext.c",
>+      "src/loader/trampoline.c",
>+
>+      # TODO(jmadill): Use assembler where available.
>+      "src/loader/unknown_ext_chain.c",
>+      "src/loader/vk_loader_platform.h",
>+      "src/loader/wsi.c",
>+      "src/loader/wsi.h",
>+    ]
>+    if (is_win) {
>+      sources += [
>+        "src/loader/dirent_on_windows.c",
>+        "src/loader/dirent_on_windows.h",
>+      ]
>+      if (!is_clang) {
>+        cflags = [
>+          "/wd4054",  # Type cast from function pointer
>+          "/wd4055",  # Type cast from data pointer
>+          "/wd4100",  # Unreferenced formal parameter
>+          "/wd4152",  # Nonstandard extension used (pointer conversion)
>+          "/wd4201",  # Nonstandard extension used: nameless struct/union
>+          "/wd4214",  # Nonstandard extension used: bit field types other than int
>+          "/wd4232",  # Nonstandard extension used: address of dllimport is not static
>+          "/wd4305",  # Type cast truncation
>+          "/wd4706",  # Assignment within conditional expression
>+          "/wd4996",  # Unsafe stdlib function
>+        ]
>+      }
>+    }
>+    deps = [
>+      ":vulkan_generate_helper_files",
>+    ]
>+    public_deps = [
>+      "$angle_root/third_party/vulkan-headers:vulkan_headers",
>+    ]
>+    configs -= [ "//build/config/compiler:chromium_code" ]
>+    configs += [ "//build/config/compiler:no_chromium_code" ]
>+    configs += [ ":vulkan_internal_config" ]
>+    public_configs = [
>+      "$angle_root:vulkan_config",
>+      ":vulkan_loader_config",
>+    ]
>+    configs -= vulkan_undefine_configs
>+  }
>+}
>diff --git a/Source/ThirdParty/ANGLE/third_party/vulkan-loader/README.angle b/Source/ThirdParty/ANGLE/third_party/vulkan-loader/README.angle
>new file mode 100644
>index 00000000000..ed99fff0a3e
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/third_party/vulkan-loader/README.angle
>@@ -0,0 +1,16 @@
>+Name: Vulkan Loader Components
>+Short Name: Vulkan Loader
>+Version: N/A
>+URL: https://github.com/KhronosGroup/Vulkan-Loader
>+SOURCE CODE: git clone https://github.com/KhronosGroup/Vulkan-Loader.git
>+Date: 05/24/2018
>+Revision: dba71dacd085918656a69e07fe8f37a71f5ebe2e
>+Security Critical: no
>+License: Apache 2.0
>+License File: LICENSE.txt
>+
>+Description:
>+The Vulkan Loader Components are used to build the open-source desktop Vulkan loader. The loader
>+is a library that loads the Vulkan entry points and hooks them into the correct layers and the
>+client driver (ICD). This is required for using Vulkan layers and applications.
>+
>diff --git a/Source/ThirdParty/ANGLE/third_party/vulkan-tools/BUILD.gn b/Source/ThirdParty/ANGLE/third_party/vulkan-tools/BUILD.gn
>new file mode 100644
>index 00000000000..8fe74ffe734
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/third_party/vulkan-tools/BUILD.gn
>@@ -0,0 +1,192 @@
>+# Copyright 2018 The ANGLE Project Authors. All rights reserved.
>+# Use of this source code is governed by a BSD-style license that can be
>+# found in the LICENSE file.
>+
>+# BUILD settings for Vulkan Tools where Mock ICD is located
>+# Tools repo is at
>+# https://github.com/KhronosGroup/Vulkan-Tools
>+
>+import("../../gni/angle.gni")
>+
>+import("$angle_root/third_party/vulkan-headers/vulkan_headers_script_deps.gni")
>+
>+# Vulkan-tools isn't ported to Fuchsia yet.
>+# TODO(spang): Port mock ICD to Fuchsia.
>+assert(!is_fuchsia)
>+
>+vulkan_undefine_configs = []
>+if (is_win) {
>+  vulkan_undefine_configs += [
>+    "//build/config/win:nominmax",
>+    "//build/config/win:unicode",
>+  ]
>+}
>+
>+raw_vulkan_icd_dir = rebase_path("src", root_build_dir)
>+raw_vulkan_headers_dir =
>+    rebase_path("$angle_root/third_party/vulkan-headers/src", root_build_dir)
>+
>+vulkan_gen_dir = "$target_gen_dir/angle/vulkan"
>+raw_vulkan_gen_dir = rebase_path(vulkan_gen_dir, root_build_dir)
>+
>+# Vulkan helper scripts
>+# ---------------------
>+
>+helper_script_and_deps = [
>+  [
>+    "vulkan_gen_typemap_helper",
>+    "vk_typemap_helper.h",
>+    "vulkan_tools_helper_file_generator.py",
>+  ],
>+  [
>+    "vulkan_mock_icd_cpp",
>+    "mock_icd.cpp",
>+    "mock_icd_generator.py",
>+  ],
>+  [
>+    "vulkan_mock_icd_h",
>+    "mock_icd.h",
>+    "mock_icd_generator.py",
>+  ],
>+]
>+
>+# Python scripts needed for codegen, copy them to a temp dir
>+# so that all dependencies are together
>+copy("python_gen_deps") {
>+  sources = vulkan_registry_script_files + [
>+              "src/scripts/common_codegen.py",
>+              "src/scripts/kvt_genvk.py",
>+              "src/scripts/mock_icd_generator.py",
>+              "src/scripts/vulkan_tools_helper_file_generator.py",
>+            ]
>+  outputs = [
>+    "$vulkan_gen_dir/{{source_file_part}}",
>+  ]
>+}
>+
>+foreach(script_and_dep, helper_script_and_deps) {
>+  target_name = script_and_dep[0]
>+  file = script_and_dep[1]
>+  dep = script_and_dep[2]
>+  target("action", target_name) {
>+    public_deps = [
>+      ":python_gen_deps",
>+    ]
>+    script = "$vulkan_gen_dir/kvt_genvk.py"
>+    inputs = [
>+      "$vulkan_gen_dir/$dep",
>+      "$vulkan_gen_dir/common_codegen.py",
>+    ]
>+    outputs = [
>+      "$vulkan_gen_dir/$file",
>+    ]
>+    args = [
>+      "-o",
>+      raw_vulkan_gen_dir,
>+      "-registry",
>+      "$raw_vulkan_headers_dir/registry/vk.xml",
>+      "-scripts",
>+      "$raw_vulkan_headers_dir/registry",
>+      "$file",
>+      "-quiet",
>+    ]
>+  }
>+}
>+
>+config("vulkan_generated_files_config") {
>+  include_dirs = [ vulkan_gen_dir ]
>+}
>+
>+group("vulkan_generate_helper_files") {
>+  public_deps = [
>+    "$angle_root/third_party/vulkan-headers:vulkan_headers",
>+  ]
>+  public_configs = [ ":vulkan_generated_files_config" ]
>+  foreach(script_and_dep, helper_script_and_deps) {
>+    target_name = script_and_dep[0]
>+    public_deps += [ ":$target_name" ]
>+  }
>+}
>+
>+config("vulkan_internal_config") {
>+  defines = [ "VULKAN_NON_CMAKE_BUILD" ]
>+  if (is_clang || !is_win) {
>+    cflags = [ "-Wno-unused-function" ]
>+  }
>+  if (is_linux) {
>+    defines += [
>+      "SYSCONFDIR=\"/etc\"",
>+      "FALLBACK_CONFIG_DIRS=\"/etc/xdg\"",
>+      "FALLBACK_DATA_DIRS=\"/usr/local/share:/usr/share\"",
>+    ]
>+  }
>+}
>+
>+# Copy icd header to gen dir
>+copy("icd_header_dep") {
>+  sources = [
>+    "$angle_root/third_party/vulkan-headers/src/include/vulkan/vk_icd.h",
>+  ]
>+  outputs = [
>+    "$vulkan_gen_dir/vk_icd.h",
>+  ]
>+}
>+
>+if (!is_android) {
>+  # Vulkan Mock ICD
>+  # ---------------
>+  group("vulkan_generate_mock_icd_files") {
>+    public_deps = [
>+      ":icd_header_dep",
>+      ":vulkan_generate_helper_files",
>+      ":vulkan_mock_icd_cpp",
>+      ":vulkan_mock_icd_h",
>+    ]
>+  }
>+
>+  mock_icd_sources = [
>+    "$vulkan_gen_dir/mock_icd.cpp",
>+    "$vulkan_gen_dir/mock_icd.h",
>+  ]
>+
>+  shared_library("VkICD_mock_icd") {
>+    configs -= vulkan_undefine_configs
>+    public_configs = [ "$angle_root:vulkan_config" ]
>+    deps = [
>+      ":vulkan_generate_mock_icd_files",
>+    ]
>+    data_deps = [
>+      ":vulkan_gen_icd_json_file",
>+    ]
>+    sources = mock_icd_sources
>+    if (is_win) {
>+      sources += [ "src/icd/VkICD_mock_icd.def" ]
>+    }
>+    configs -= [ "//build/config/compiler:chromium_code" ]
>+    configs += [ "//build/config/compiler:no_chromium_code" ]
>+  }
>+
>+  action("vulkan_gen_icd_json_file") {
>+    script = "$angle_root/scripts/generate_vulkan_layers_json.py"
>+    sources = [
>+      "../vulkan-headers/src/include/vulkan/vulkan_core.h",
>+    ]
>+    args = [ "--icd" ]
>+    if (is_win) {
>+      sources += [ "src/icd/windows/VkICD_mock_icd.json" ]
>+      args += [ "$raw_vulkan_icd_dir/icd/windows" ]
>+    }
>+    if (is_linux) {
>+      sources += [ "src/icd/linux/VkICD_mock_icd.json" ]
>+      args += [ "$raw_vulkan_icd_dir/icd/linux" ]
>+    }
>+
>+    # The layer JSON files are part of the necessary data deps.
>+    outputs = [
>+      "$root_out_dir/$data_dir/VkICD_mock_icd.json",
>+    ]
>+    data = outputs
>+    args += [ rebase_path("$root_out_dir/$data_dir", root_build_dir) ] +
>+            rebase_path(sources, root_build_dir)
>+  }
>+}
>diff --git a/Source/ThirdParty/ANGLE/third_party/vulkan-tools/README.angle b/Source/ThirdParty/ANGLE/third_party/vulkan-tools/README.angle
>new file mode 100644
>index 00000000000..d7c898c1b45
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/third_party/vulkan-tools/README.angle
>@@ -0,0 +1,17 @@
>+Name: Khronos Vulkan Tools Components
>+Short Name: Vulkan Mock ICD
>+Version: N/A
>+URL: https://github.com/KhronosGroup/Vulkan-Tools
>+SOURCE CODE: git clone https://github.com/KhronosGroup/Vulkan-Tools.git
>+Date: 05/24/2018
>+Revision: 51dfb7b8a19820d6716190dd7e45cd6e861e1f1a
>+Security Critical: no
>+License: Apache 2.0
>+License File: LICENSE.txt
>+
>+Description:
>+The Khronos Vulkan Tools Components contain the Vulkan Mock Installable
>+Client Driver (ICD) as well as the vulkaninfo utility. ANGLE is
>+primarily interested in the Mock ICD and uses it to run experiments
>+with the Mock ICD as a null driver.
>+
>diff --git a/Source/ThirdParty/ANGLE/third_party/vulkan-validation-layers/BUILD.gn b/Source/ThirdParty/ANGLE/third_party/vulkan-validation-layers/BUILD.gn
>new file mode 100644
>index 00000000000..4934c7a034c
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/third_party/vulkan-validation-layers/BUILD.gn
>@@ -0,0 +1,521 @@
>+# Copyright 2018 The ANGLE Project Authors. All rights reserved.
>+# Use of this source code is governed by a BSD-style license that can be
>+# found in the LICENSE file.
>+
>+# BUILD settings for Vulkan Validation Layers
>+# Validation repo is at
>+# https://github.com/KhronosGroup/Vulkan-ValidationLayers
>+
>+import("../../gni/angle.gni")
>+
>+# Fuchsia has non-upstream changes to the vulkan layers, so we don't want
>+# to build it from upstream sources.
>+assert(!is_fuchsia)
>+
>+import("$angle_root/third_party/vulkan-headers/vulkan_headers_script_deps.gni")
>+
>+vulkan_undefine_configs = []
>+if (is_win) {
>+  vulkan_undefine_configs += [
>+    "//build/config/win:nominmax",
>+    "//build/config/win:unicode",
>+  ]
>+}
>+
>+raw_root_out_dir = rebase_path(root_out_dir, root_build_dir)
>+raw_data_dir = rebase_path("$root_out_dir/$data_dir", root_build_dir)
>+
>+raw_vulkan_headers_dir =
>+    rebase_path("$angle_root/third_party/vulkan-headers/src", root_build_dir)
>+
>+vulkan_gen_dir = "$target_gen_dir/angle/vulkan"
>+raw_vulkan_gen_dir = rebase_path(vulkan_gen_dir, root_build_dir)
>+
>+# Vulkan helper scripts
>+# ---------------------
>+
>+helper_script_and_deps = [
>+  [
>+    "vulkan_gen_dispatch_table_helper_h",
>+    "vk_dispatch_table_helper.h",
>+    "dispatch_table_helper_generator.py",
>+  ],
>+  [
>+    "vulkan_gen_enum_string_helper",
>+    "vk_enum_string_helper.h",
>+    "helper_file_generator.py",
>+  ],
>+  [
>+    "vulkan_gen_extension_helper",
>+    "vk_extension_helper.h",
>+    "helper_file_generator.py",
>+  ],
>+  [
>+    "vulkan_gen_layer_dispatch_table_h",
>+    "vk_layer_dispatch_table.h",
>+    "layer_dispatch_table_generator.py",
>+  ],
>+  [
>+    "vulkan_gen_object_types_h",
>+    "vk_object_types.h",
>+    "helper_file_generator.py",
>+  ],
>+  [
>+    "vulkan_gen_safe_struct_cpp",
>+    "vk_safe_struct.cpp",
>+    "helper_file_generator.py",
>+  ],
>+  [
>+    "vulkan_gen_safe_struct_h",
>+    "vk_safe_struct.h",
>+    "helper_file_generator.py",
>+  ],
>+  [
>+    "vulkan_gen_thread_safety_h",
>+    "thread_safety.h",
>+    "thread_safety_generator.py",
>+  ],
>+  [
>+    "vulkan_gen_thread_safety_cpp",
>+    "thread_safety.cpp",
>+    "thread_safety_generator.py",
>+  ],
>+  [
>+    "vulkan_gen_typemap_helper",
>+    "vk_typemap_helper.h",
>+    "helper_file_generator.py",
>+  ],
>+  [
>+    "vulkan_gen_object_tracker_h",
>+    "object_tracker.h",
>+    "object_tracker_generator.py",
>+  ],
>+  [
>+    "vulkan_gen_object_tracker_cpp",
>+    "object_tracker.cpp",
>+    "object_tracker_generator.py",
>+  ],
>+  [
>+    "vulkan_gen_parameter_validation_cpp",
>+    "parameter_validation.cpp",
>+    "parameter_validation_generator.py",
>+  ],
>+  [
>+    "vulkan_gen_parameter_validation_h",
>+    "parameter_validation.h",
>+    "parameter_validation_generator.py",
>+  ],
>+  [
>+    "vulkan_gen_layer_chassis_h",
>+    "chassis.h",
>+    "layer_chassis_generator.py",
>+  ],
>+  [
>+    "vulkan_gen_layer_chassis_cpp",
>+    "chassis.cpp",
>+    "layer_chassis_generator.py",
>+  ],
>+  [
>+    "vulkan_gen_layer_chassis_dispatch_h",
>+    "layer_chassis_dispatch.h",
>+    "layer_chassis_dispatch_generator.py",
>+  ],
>+  [
>+    "vulkan_gen_layer_chassis_dispatch_cpp",
>+    "layer_chassis_dispatch.cpp",
>+    "layer_chassis_dispatch_generator.py",
>+  ],
>+]
>+
>+# Python scripts needed for codegen, copy them to a temp dir
>+# so that all dependencies are together
>+copy("python_gen_deps") {
>+  sources = vulkan_registry_script_files + [
>+              "src/scripts/common_codegen.py",
>+              "src/scripts/dispatch_table_helper_generator.py",
>+              "src/scripts/helper_file_generator.py",
>+              "src/scripts/layer_dispatch_table_generator.py",
>+              "src/scripts/lvl_genvk.py",
>+              "src/scripts/object_tracker_generator.py",
>+              "src/scripts/parameter_validation_generator.py",
>+              "src/scripts/thread_safety_generator.py",
>+              "src/scripts/layer_chassis_generator.py",
>+              "src/scripts/layer_chassis_dispatch_generator.py",
>+            ]
>+  outputs = [
>+    "$vulkan_gen_dir/{{source_file_part}}",
>+  ]
>+}
>+
>+# This special action is needed to remove previously-generated header files.
>+# Otherwise the cpp files can pick up the old header files and cause build
>+# failures.
>+action("vulkan_clean_gen_headers") {
>+  script = "$angle_root/scripts/remove_files.py"
>+  deps = [
>+    ":python_gen_deps",
>+  ]
>+  outputs = [
>+    "$vulkan_gen_dir/vk_validation_error_messages_h_is_removed",
>+  ]
>+  args = [
>+    "$raw_vulkan_gen_dir/vk_validation_error_messages_h_is_removed",
>+    "$raw_vulkan_gen_dir/vk_validation_error_messages.h",
>+  ]
>+}
>+
>+# This special action is needed to remove old VVL objects that are now renamed.
>+action("vulkan_clean_old_validation_layer_objects") {
>+  script = "$angle_root/scripts/remove_files.py"
>+
>+  # inputs is a (random) new file since the vvl roll, used to ensure the cleanup is done only once
>+  inputs = [
>+    "src/layers/gpu_validation.cpp",
>+  ]
>+  outputs = [
>+    "$vulkan_gen_dir/old_vvl_files_are_removed",
>+  ]
>+  args = [
>+    "$raw_vulkan_gen_dir/old_vvl_files_are_removed",
>+    "$raw_root_out_dir/libVkLayer*",
>+    "$raw_root_out_dir/VkLayer*",
>+    "$raw_data_dir/VkLayer*.json",
>+  ]
>+}
>+
>+foreach(script_and_dep, helper_script_and_deps) {
>+  target_name = script_and_dep[0]
>+  file = script_and_dep[1]
>+  dep = script_and_dep[2]
>+  target("action", target_name) {
>+    public_deps = [
>+      ":python_gen_deps",
>+      ":vulkan_clean_gen_headers",
>+      ":vulkan_clean_old_validation_layer_objects",
>+    ]
>+    script = "$vulkan_gen_dir/lvl_genvk.py"
>+    inputs = [
>+      "$vulkan_gen_dir/$dep",
>+      "$vulkan_gen_dir/common_codegen.py",
>+      "src/layers/vk_validation_error_messages.h",
>+    ]
>+    outputs = [
>+      "$vulkan_gen_dir/$file",
>+    ]
>+    args = [
>+      "-o",
>+      raw_vulkan_gen_dir,
>+      "-registry",
>+      "$raw_vulkan_headers_dir/registry/vk.xml",
>+      "-scripts",
>+      "$raw_vulkan_headers_dir/registry",
>+      "$file",
>+      "-quiet",
>+    ]
>+  }
>+}
>+
>+raw_spirv_tools_dir = rebase_path("${angle_spirv_tools_dir}", root_build_dir)
>+
>+spirv_git_is_present = exec_script("$angle_root/src/commit_id.py",
>+                                   [
>+                                     "check",
>+                                     raw_spirv_tools_dir,
>+                                   ],
>+                                   "value")
>+
>+spirv_use_commit_id = spirv_git_is_present == 1
>+
>+if (spirv_use_commit_id) {
>+  # This could be generalized to a foreach if other revisions are added.
>+  action("spirv_tools_external_revision_generate") {
>+    script = "src/scripts/external_revision_generator.py"
>+    inputs = [
>+      "//DEPS",
>+    ]
>+    outputs = [
>+      "$vulkan_gen_dir/spirv_tools_commit_id.h",
>+    ]
>+    args = [
>+      "--git_dir",
>+      "$raw_spirv_tools_dir",
>+      "-s",
>+      "SPIRV_TOOLS_COMMIT_ID",
>+      "-o",
>+      "$raw_vulkan_gen_dir/spirv_tools_commit_id.h",
>+    ]
>+  }
>+} else {
>+  copy("spirv_tools_external_revision_generate") {
>+    sources = [
>+      "dummy_spirv_tools_commit_id.h",
>+    ]
>+    outputs = [
>+      "$vulkan_gen_dir/spirv_tools_commit_id.h",
>+    ]
>+  }
>+}
>+
>+config("vulkan_generated_files_config") {
>+  include_dirs = [ vulkan_gen_dir ]
>+}
>+
>+group("vulkan_generate_helper_files") {
>+  public_deps = [
>+    ":spirv_tools_external_revision_generate",
>+    "$angle_root/third_party/vulkan-headers:vulkan_headers",
>+  ]
>+  public_configs = [ ":vulkan_generated_files_config" ]
>+  foreach(script_and_dep, helper_script_and_deps) {
>+    target_name = script_and_dep[0]
>+    public_deps += [ ":$target_name" ]
>+  }
>+}
>+
>+config("vulkan_internal_config") {
>+  defines = [
>+    "VULKAN_NON_CMAKE_BUILD",
>+    "API_NAME=\"Vulkan\"",
>+  ]
>+  if (is_clang || !is_win) {
>+    cflags = [ "-Wno-unused-function" ]
>+  }
>+  if (is_linux) {
>+    defines += [
>+      "SYSCONFDIR=\"/etc\"",
>+      "FALLBACK_CONFIG_DIRS=\"/etc/xdg\"",
>+      "FALLBACK_DATA_DIRS=\"/usr/local/share:/usr/share\"",
>+    ]
>+  }
>+}
>+
>+# The validation layers
>+# ---------------------
>+
>+config("vulkan_layer_config") {
>+  include_dirs = [ "src/layers" ]
>+}
>+
>+core_validation_sources = [
>+  # This file is manually included in the layer
>+  # "$vulkan_gen_dir/vk_safe_struct.cpp",
>+  "$vulkan_gen_dir/vk_safe_struct.h",
>+  "src/layers/buffer_validation.cpp",
>+  "src/layers/buffer_validation.h",
>+  "src/layers/core_validation.cpp",
>+  "src/layers/core_validation.h",
>+  "src/layers/convert_to_renderpass2.cpp",
>+  "src/layers/descriptor_sets.cpp",
>+  "src/layers/descriptor_sets.h",
>+  "src/layers/gpu_validation.cpp",
>+  "src/layers/gpu_validation.h",
>+  "src/layers/shader_validation.cpp",
>+  "src/layers/shader_validation.h",
>+  "src/layers/xxhash.c",
>+  "src/layers/xxhash.h",
>+]
>+
>+object_lifetimes_sources = [
>+  "$vulkan_gen_dir/object_tracker.cpp",
>+  "$vulkan_gen_dir/object_tracker.h",
>+  "src/layers/object_tracker_utils.cpp",
>+]
>+
>+stateless_validation_sources = [
>+  "$vulkan_gen_dir/parameter_validation.cpp",
>+  "$vulkan_gen_dir/parameter_validation.h",
>+  "src/layers/parameter_validation_utils.cpp",
>+]
>+
>+thread_safety_sources = [
>+  "$vulkan_gen_dir/thread_safety.cpp",
>+  "$vulkan_gen_dir/thread_safety.h",
>+]
>+
>+unique_objects_sources = []
>+
>+chassis_sources = [
>+  "$vulkan_gen_dir/chassis.cpp",
>+  "$vulkan_gen_dir/chassis.h",
>+  "$vulkan_gen_dir/layer_chassis_dispatch.cpp",
>+  "$vulkan_gen_dir/layer_chassis_dispatch.h",
>+]
>+
>+core_validation_deps = [ ":vulkan_core_validation_glslang" ]
>+
>+object_lifetimes_deps = [
>+  ":vulkan_gen_object_tracker_cpp",
>+  ":vulkan_gen_object_tracker_h",
>+]
>+
>+stateless_validation_deps = [ ":vulkan_gen_stateless_validation" ]
>+
>+thread_safety_deps = [
>+  ":vulkan_gen_thread_safety_cpp",
>+  ":vulkan_gen_thread_safety_h",
>+]
>+
>+unique_objects_deps = []
>+
>+chassis_deps = [
>+  ":vulkan_gen_layer_chassis_cpp",
>+  ":vulkan_gen_layer_chassis_h",
>+  ":vulkan_gen_layer_chassis_dispatch_cpp",
>+  ":vulkan_gen_layer_chassis_dispatch_h",
>+]
>+
>+layers = [
>+  [
>+    "core_validation",
>+    core_validation_sources + chassis_sources,
>+    core_validation_deps + chassis_deps,
>+    [ "BUILD_CORE_VALIDATION" ],
>+  ],
>+  [
>+    "object_lifetimes",
>+    object_lifetimes_sources + chassis_sources,
>+    object_lifetimes_deps + chassis_deps,
>+    [ "BUILD_OBJECT_TRACKER" ],
>+  ],
>+  [
>+    "stateless_validation",
>+    stateless_validation_sources + chassis_sources,
>+    stateless_validation_deps + chassis_deps,
>+    [ "BUILD_PARAMETER_VALIDATION" ],
>+  ],
>+  [
>+    "thread_safety",
>+    thread_safety_sources + chassis_sources,
>+    thread_safety_deps + chassis_deps,
>+    [ "BUILD_THREAD_SAFETY" ],
>+  ],
>+  [
>+    "unique_objects",
>+    unique_objects_sources + chassis_sources,
>+    unique_objects_deps + chassis_deps,
>+    [ "LAYER_CHASSIS_CAN_WRAP_HANDLES" ],
>+  ],
>+]
>+
>+if (!is_android) {
>+  raw_vulkan_layers_dir = rebase_path("src", root_build_dir)
>+
>+  action("vulkan_gen_json_files") {
>+    script = "$angle_root/scripts/generate_vulkan_layers_json.py"
>+    public_deps = [
>+      ":vulkan_clean_old_validation_layer_objects",
>+    ]
>+    json_names = [
>+      "VkLayer_core_validation.json",
>+      "VkLayer_object_lifetimes.json",
>+      "VkLayer_stateless_validation.json",
>+      "VkLayer_standard_validation.json",
>+      "VkLayer_thread_safety.json",
>+      "VkLayer_unique_objects.json",
>+    ]
>+    sources = [
>+      "../vulkan-headers/src/include/vulkan/vulkan_core.h",
>+    ]
>+    outputs = []
>+    foreach(json_name, json_names) {
>+      sources += [ "src/layers/json/$json_name.in" ]
>+      outputs += [ "$root_out_dir/$data_dir/$json_name" ]
>+    }
>+    args = [
>+             "$raw_vulkan_layers_dir/layers/json",
>+             rebase_path("$root_out_dir/$data_dir", root_build_dir),
>+           ] + rebase_path(sources, root_build_dir)
>+
>+    # The layer JSON files are part of the necessary data deps.
>+    data = outputs
>+  }
>+}
>+
>+source_set("vulkan_layer_utils") {
>+  sources = [
>+    "src/layers/vk_format_utils.cpp",
>+    "src/layers/vk_format_utils.h",
>+    "src/layers/vk_layer_config.cpp",
>+    "src/layers/vk_layer_config.h",
>+    "src/layers/vk_layer_extension_utils.cpp",
>+    "src/layers/vk_layer_extension_utils.h",
>+    "src/layers/vk_layer_utils.cpp",
>+    "src/layers/vk_layer_utils.h",
>+  ]
>+  public_configs = [
>+    "$angle_root:vulkan_config",
>+    ":vulkan_internal_config",
>+  ]
>+  configs -= [ "//build/config/compiler:chromium_code" ]
>+  configs += [ "//build/config/compiler:no_chromium_code" ]
>+  public_deps = [
>+    ":vulkan_generate_helper_files",
>+  ]
>+  configs -= vulkan_undefine_configs
>+}
>+
>+config("vulkan_core_validation_config") {
>+  include_dirs = [ "${angle_glslang_dir}" ]
>+}
>+
>+source_set("vulkan_core_validation_glslang") {
>+  public_deps = [
>+    "${angle_spirv_tools_dir}:spvtools",
>+    "${angle_spirv_tools_dir}:spvtools_opt",
>+    "${angle_spirv_tools_dir}:spvtools_val",
>+  ]
>+  public_configs = [ ":vulkan_core_validation_config" ]
>+}
>+
>+config("vulkan_stateless_validation_config") {
>+  if (is_clang) {
>+    cflags_cc = [ "-Wno-unused-const-variable" ]
>+  }
>+}
>+
>+source_set("vulkan_gen_stateless_validation") {
>+  deps = [
>+    ":vulkan_gen_parameter_validation_cpp",
>+    ":vulkan_gen_parameter_validation_h",
>+  ]
>+  public_configs = [ ":vulkan_stateless_validation_config" ]
>+}
>+
>+foreach(layer_info, layers) {
>+  name = layer_info[0]
>+  shared_library("VkLayer_$name") {
>+    configs -= [ "//build/config/compiler:chromium_code" ]
>+    configs += [ "//build/config/compiler:no_chromium_code" ]
>+    configs -= vulkan_undefine_configs
>+    public_configs = [ ":vulkan_layer_config" ]
>+    deps = [
>+      ":vulkan_layer_utils",
>+    ]
>+    if (layer_info[2] != "") {
>+      deps += layer_info[2]
>+    }
>+    sources = layer_info[1]
>+    if (is_win) {
>+      sources += [ "src/layers/VkLayer_$name.def" ]
>+    }
>+    if (is_linux || is_android) {
>+      ldflags = [ "-Wl,-Bsymbolic,--exclude-libs,ALL" ]
>+    }
>+    if (is_android) {
>+      libs = [
>+        "log",
>+        "nativewindow",
>+      ]
>+      configs -= [ "//build/config/android:hide_all_but_jni_onload" ]
>+    }
>+    defines = layer_info[3]
>+  }
>+}
>+
>+group("vulkan_validation_layers") {
>+  data_deps = []
>+  foreach(layer_info, layers) {
>+    name = layer_info[0]
>+    data_deps += [ ":VkLayer_$name" ]
>+  }
>+}
>diff --git a/Source/ThirdParty/ANGLE/third_party/vulkan-validation-layers/README.angle b/Source/ThirdParty/ANGLE/third_party/vulkan-validation-layers/README.angle
>new file mode 100644
>index 00000000000..9d7021c44b5
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/third_party/vulkan-validation-layers/README.angle
>@@ -0,0 +1,19 @@
>+Name: Khronos Vulkan Validation Layers Components
>+Short Name: Vulkan Layers
>+Version: N/A
>+URL: https://github.com/KhronosGroup/Vulkan-ValidationLayers
>+SOURCE CODE: git clone https://github.com/KhronosGroup/Vulkan-ValidationLayers.git
>+Date: 05/24/2018
>+Revision: 0fe5bfe66443b288ccf19b3d4c523af7e080672c
>+Security Critical: no
>+License: Apache 2.0
>+License File: LICENSE.txt
>+
>+Description:
>+The Khronos Vulkan Validation Layers Components consist of the Vulkan
>+Validation Layers. The layers help validate Vulkan programs at runtime
>+for development. When enabled the Vulkan loader will hook the layers
>+into the Vulkan APIs so that they evaluate Vulkan API calls and flag
>+the incorrect use of the API with callbacks. The layers are essential
>+for developing Vulkan applications.
>+
>diff --git a/Source/ThirdParty/ANGLE/third_party/vulkan-validation-layers/dummy_spirv_tools_commit_id.h b/Source/ThirdParty/ANGLE/third_party/vulkan-validation-layers/dummy_spirv_tools_commit_id.h
>new file mode 100644
>index 00000000000..e1793bdff59
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/third_party/vulkan-validation-layers/dummy_spirv_tools_commit_id.h
>@@ -0,0 +1,10 @@
>+//
>+// Copyright 2018 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// This file is a dummy file to enable building SPIRV tools when git is absent.
>+
>+#pragma once
>+
>+#define SPIRV_TOOLS_COMMIT_ID "0000000000000000000000000000000000000000"
>diff --git a/Source/ThirdParty/ANGLE/tools/glslang/README.md b/Source/ThirdParty/ANGLE/tools/glslang/README.md
>new file mode 100644
>index 00000000000..5d944797245
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/tools/glslang/README.md
>@@ -0,0 +1,20 @@
>+# Standalone glslang validator
>+
>+This folder contains a standalone glslang validator binary. We use this binary
>+for offline compilation of internal Vulkan shaders. See [the internal shader
>+docs](../../src/libANGLE/renderer/vulkan/shaders/README.md) for more info on
>+offline shader compilation.
>+
>+Use the script [`update_glslang_binary.py`](update_glslang_binary.py) to update
>+the versions of the validator in cloud storage. It must be run on Linux or
>+Windows. It will update the SHA for your platform. After running the script run
>+`git commit` and then `git cl upload` to code review using the normal review
>+process. Note that if the version of glslang has been updated you will also want
>+to run [`scripts/run_code_generation.py`](../../scripts/run_code_generation.py)
>+to update the compiled shader binaries.
>+
>+Please update both Windows and Linux binaries at the same time. Use two CLs. One
>+for each platform. Note that we don't currently suport Mac on Vulkan. If we do
>+we should add a glslang download for Mac as well.
>+
>+Contact jmadill or syouseffi for any help with the validator or updating the binaries.
>diff --git a/Source/ThirdParty/ANGLE/tools/glslang/glslang_validator.exe.sha1 b/Source/ThirdParty/ANGLE/tools/glslang/glslang_validator.exe.sha1
>new file mode 100644
>index 00000000000..8a80c3b399c
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/tools/glslang/glslang_validator.exe.sha1
>@@ -0,0 +1 @@
>+1320cd7889b936808e6badd9e0c40d3c5db5b5f2
>\ No newline at end of file
>diff --git a/Source/ThirdParty/ANGLE/tools/glslang/glslang_validator.sha1 b/Source/ThirdParty/ANGLE/tools/glslang/glslang_validator.sha1
>new file mode 100644
>index 00000000000..267c658bf61
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/tools/glslang/glslang_validator.sha1
>@@ -0,0 +1 @@
>+063f4ee998bfa5fea1b2471a2621c7a3107885d6
>\ No newline at end of file
>diff --git a/Source/ThirdParty/ANGLE/tools/glslang/update_glslang_binary.py b/Source/ThirdParty/ANGLE/tools/glslang/update_glslang_binary.py
>new file mode 100644
>index 00000000000..6e94408ef3b
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/tools/glslang/update_glslang_binary.py
>@@ -0,0 +1,118 @@
>+#!/usr/bin/python2
>+#
>+# Copyright 2019 The ANGLE Project Authors. All rights reserved.
>+# Use of this source code is governed by a BSD-style license that can be
>+# found in the LICENSE file.
>+#
>+# update_glslang_binary.py:
>+#   Helper script to update the version of glslang in cloud storage.
>+#   This glslang is used to precompile Vulkan shaders. This script builds
>+#   glslang and uploads it to the bucket for Windows or Linux. It
>+#   currently only works on Windows and Linux. It also will update the
>+#   hashes stored in the tree. For more info see README.md in this folder.
>+
>+import os
>+import platform
>+import re
>+import shutil
>+import subprocess
>+import sys
>+
>+
>+gn_args = """is_clang = true
>+is_debug = false
>+angle_enable_vulkan = true"""
>+
>+
>+is_windows = platform.system() == 'Windows'
>+is_linux  = platform.system() == 'Linux'
>+
>+
>+def find_file_in_path(filename):
>+    """ Finds |filename| by searching the environment paths """
>+    path_delimiter = ';' if is_windows else ':'
>+    for env_path in os.environ['PATH'].split(path_delimiter):
>+        full_path = os.path.join(env_path, filename)
>+        if os.path.isfile(full_path):
>+            return full_path
>+    raise Exception('Cannot find %s in environment' % filename)
>+
>+
>+def main():
>+    if not is_windows and not is_linux:
>+        print('Script must be run on Linux or Windows.')
>+        return 1
>+
>+    # Step 1: Generate an output directory
>+    out_dir = os.path.join('out', 'glslang_release')
>+
>+    if not os.path.isdir(out_dir):
>+        os.mkdir(out_dir)
>+
>+    args_gn = os.path.join(out_dir, 'args.gn')
>+    if not os.path.isfile(args_gn):
>+        with open(args_gn, 'w') as f:
>+            f.write(gn_args)
>+            f.close()
>+
>+    gn_exe = 'gn'
>+    if is_windows:
>+        gn_exe += '.bat'
>+
>+    # Step 2: Generate the ninja build files in the output directory
>+    if subprocess.call([gn_exe, 'gen', out_dir]) != 0:
>+        print('Error calling gn')
>+        return 2
>+
>+    # Step 3: Compile glslang_validator
>+    if subprocess.call(['ninja', '-C', out_dir, 'glslang_validator']) != 0:
>+        print('Error calling ninja')
>+        return 3
>+
>+    # Step 4: Copy glslang_validator to the tools/glslang directory
>+    glslang_exe = 'glslang_validator'
>+    if is_windows:
>+        glslang_exe += '.exe'
>+
>+    glslang_src = os.path.join(out_dir, glslang_exe)
>+    glslang_dst = os.path.join(sys.path[0], glslang_exe)
>+
>+    shutil.copy(glslang_src, glslang_dst)
>+
>+    # Step 5: Delete the build directory
>+    shutil.rmtree(out_dir)
>+
>+    # Step 6: Upload to cloud storage
>+    upload_script = find_file_in_path('upload_to_google_storage.py')
>+    upload_args = ['python', upload_script, '-b', 'angle-glslang-validator', glslang_dst]
>+    if subprocess.call(upload_args) != 0:
>+        print('Error upload to cloud storage')
>+        return 4
>+
>+    # Step 7: Stage new SHA to git
>+    git_exe = 'git'
>+    if is_windows:
>+        git_exe += '.bat'
>+    git_exe = find_file_in_path(git_exe)
>+
>+    if subprocess.call([git_exe, 'add', glslang_dst + '.sha1']) != 0:
>+        print('Error running git add')
>+        return 5
>+
>+    print('')
>+    print('The updated SHA has been staged for commit. Please commit and upload.')
>+    print('Suggested commit message:')
>+    print('----------------------------')
>+    print('')
>+    print('Update glslang_validator binary for %s.' % platform.system())
>+    print('')
>+    print('This binary was updated using %s.' % os.path.basename(__file__))
>+    print('Please see instructions in tools/glslang/README.md.')
>+    print('')
>+    print('Bug: None')
>+
>+    return 0
>+
>+
>+if __name__ == '__main__':
>+    sys.exit(main())
>diff --git a/Source/ThirdParty/ANGLE/util/EGLPlatformParameters.h b/Source/ThirdParty/ANGLE/util/EGLPlatformParameters.h
>new file mode 100644
>index 00000000000..06538fd4e6f
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/util/EGLPlatformParameters.h
>@@ -0,0 +1,79 @@
>+//
>+// Copyright 2018 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// EGLPlatformParameters: Basic description of an EGL device.
>+
>+#ifndef UTIL_EGLPLATFORMPARAMETERS_H_
>+#define UTIL_EGLPLATFORMPARAMETERS_H_
>+
>+#include "util/util_gl.h"
>+
>+#include <tuple>
>+
>+namespace angle
>+{
>+struct PlatformMethods;
>+}  // namespace angle
>+
>+struct EGLPlatformParameters
>+{
>+    EGLPlatformParameters() = default;
>+
>+    explicit EGLPlatformParameters(EGLint renderer) : renderer(renderer) {}
>+
>+    EGLPlatformParameters(EGLint renderer,
>+                          EGLint majorVersion,
>+                          EGLint minorVersion,
>+                          EGLint deviceType)
>+        : renderer(renderer),
>+          majorVersion(majorVersion),
>+          minorVersion(minorVersion),
>+          deviceType(deviceType)
>+    {}
>+
>+    EGLPlatformParameters(EGLint renderer,
>+                          EGLint majorVersion,
>+                          EGLint minorVersion,
>+                          EGLint deviceType,
>+                          EGLint presentPath)
>+        : renderer(renderer),
>+          majorVersion(majorVersion),
>+          minorVersion(minorVersion),
>+          deviceType(deviceType),
>+          presentPath(presentPath)
>+    {}
>+
>+    auto tie() const
>+    {
>+        return std::tie(renderer, majorVersion, minorVersion, deviceType, presentPath,
>+                        debugLayersEnabled, contextVirtualization, platformMethods);
>+    }
>+
>+    EGLint renderer                         = EGL_PLATFORM_ANGLE_TYPE_DEFAULT_ANGLE;
>+    EGLint majorVersion                     = EGL_DONT_CARE;
>+    EGLint minorVersion                     = EGL_DONT_CARE;
>+    EGLint deviceType                       = EGL_PLATFORM_ANGLE_DEVICE_TYPE_HARDWARE_ANGLE;
>+    EGLint presentPath                      = EGL_DONT_CARE;
>+    EGLint debugLayersEnabled               = EGL_DONT_CARE;
>+    EGLint contextVirtualization            = EGL_DONT_CARE;
>+    angle::PlatformMethods *platformMethods = nullptr;
>+};
>+
>+inline bool operator<(const EGLPlatformParameters &a, const EGLPlatformParameters &b)
>+{
>+    return a.tie() < b.tie();
>+}
>+
>+inline bool operator==(const EGLPlatformParameters &a, const EGLPlatformParameters &b)
>+{
>+    return a.tie() == b.tie();
>+}
>+
>+inline bool operator!=(const EGLPlatformParameters &a, const EGLPlatformParameters &b)
>+{
>+    return a.tie() != b.tie();
>+}
>+
>+#endif  // UTIL_EGLPLATFORMPARAMETERS_H_
>diff --git a/Source/ThirdParty/ANGLE/util/EGLWindow.cpp b/Source/ThirdParty/ANGLE/util/EGLWindow.cpp
>index 878c55f1c7b..dcd8cb753c1 100644
>--- a/Source/ThirdParty/ANGLE/util/EGLWindow.cpp
>+++ b/Source/ThirdParty/ANGLE/util/EGLWindow.cpp
>@@ -4,131 +4,61 @@
> // found in the LICENSE file.
> //
> 
>-#include <string.h>
>+#include "util/EGLWindow.h"
>+
> #include <cassert>
> #include <iostream>
> #include <vector>
> 
>-#include "EGLWindow.h"
>-#include "OSWindow.h"
>-#include "common/debug.h"
>-
>-// TODO(jmadill): Clean this up at some point.
>-#define EGL_PLATFORM_ANGLE_PLATFORM_METHODS_ANGLEX 0x9999
>-
>-EGLPlatformParameters::EGLPlatformParameters()
>-    : renderer(EGL_PLATFORM_ANGLE_TYPE_DEFAULT_ANGLE),
>-      majorVersion(EGL_DONT_CARE),
>-      minorVersion(EGL_DONT_CARE),
>-      deviceType(EGL_DONT_CARE),
>-      presentPath(EGL_DONT_CARE)
>-{
>-}
>-
>-EGLPlatformParameters::EGLPlatformParameters(EGLint renderer)
>-    : renderer(renderer),
>-      majorVersion(EGL_DONT_CARE),
>-      minorVersion(EGL_DONT_CARE),
>-      deviceType(EGL_DONT_CARE),
>-      presentPath(EGL_DONT_CARE)
>-{
>-    if (renderer == EGL_PLATFORM_ANGLE_TYPE_D3D9_ANGLE ||
>-        renderer == EGL_PLATFORM_ANGLE_TYPE_D3D11_ANGLE)
>-    {
>-        deviceType = EGL_PLATFORM_ANGLE_DEVICE_TYPE_HARDWARE_ANGLE;
>-    }
>-}
>+#include <string.h>
> 
>-EGLPlatformParameters::EGLPlatformParameters(EGLint renderer,
>-                                             EGLint majorVersion,
>-                                             EGLint minorVersion,
>-                                             EGLint useWarp)
>-    : renderer(renderer),
>-      majorVersion(majorVersion),
>-      minorVersion(minorVersion),
>-      deviceType(useWarp),
>-      presentPath(EGL_DONT_CARE)
>+#include "platform/Platform.h"
>+#include "util/OSWindow.h"
>+#include "util/system_utils.h"
>+
>+// ConfigParameters implementation.
>+ConfigParameters::ConfigParameters()
>+    : redBits(-1),
>+      greenBits(-1),
>+      blueBits(-1),
>+      alphaBits(-1),
>+      depthBits(-1),
>+      stencilBits(-1),
>+      componentType(EGL_COLOR_COMPONENT_TYPE_FIXED_EXT),
>+      multisample(false),
>+      debug(false),
>+      noError(false),
>+      bindGeneratesResource(true),
>+      clientArraysEnabled(true),
>+      robustAccess(false),
>+      samples(-1),
>+      resetStrategy(EGL_NO_RESET_NOTIFICATION_EXT)
>+{}
>+
>+ConfigParameters::~ConfigParameters() = default;
>+
>+void ConfigParameters::reset()
> {
>+    *this = ConfigParameters();
> }
> 
>-EGLPlatformParameters::EGLPlatformParameters(EGLint renderer,
>-                                             EGLint majorVersion,
>-                                             EGLint minorVersion,
>-                                             EGLint useWarp,
>-                                             EGLint presentPath)
>-    : renderer(renderer),
>-      majorVersion(majorVersion),
>-      minorVersion(minorVersion),
>-      deviceType(useWarp),
>-      presentPath(presentPath)
>-{
>-}
>+// GLWindowBase implementation.
>+GLWindowBase::GLWindowBase(EGLint glesMajorVersion, EGLint glesMinorVersion)
>+    : mClientMajorVersion(glesMajorVersion), mClientMinorVersion(glesMinorVersion)
>+{}
> 
>-bool operator<(const EGLPlatformParameters &a, const EGLPlatformParameters &b)
>-{
>-    if (a.renderer != b.renderer)
>-    {
>-        return a.renderer < b.renderer;
>-    }
>+GLWindowBase::~GLWindowBase() = default;
> 
>-    if (a.majorVersion != b.majorVersion)
>-    {
>-        return a.majorVersion < b.majorVersion;
>-    }
>-
>-    if (a.minorVersion != b.minorVersion)
>-    {
>-        return a.minorVersion < b.minorVersion;
>-    }
>-
>-    if (a.deviceType != b.deviceType)
>-    {
>-        return a.deviceType < b.deviceType;
>-    }
>-
>-    return a.presentPath < b.presentPath;
>-}
>-
>-bool operator==(const EGLPlatformParameters &a, const EGLPlatformParameters &b)
>-{
>-    return (a.renderer == b.renderer) && (a.majorVersion == b.majorVersion) &&
>-           (a.minorVersion == b.minorVersion) && (a.deviceType == b.deviceType) &&
>-           (a.presentPath == b.presentPath);
>-}
>-
>-EGLWindow::EGLWindow(EGLint glesMajorVersion,
>-                     EGLint glesMinorVersion,
>-                     const EGLPlatformParameters &platform)
>-    : mDisplay(EGL_NO_DISPLAY),
>+// EGLWindow implementation.
>+EGLWindow::EGLWindow(EGLint glesMajorVersion, EGLint glesMinorVersion)
>+    : GLWindowBase(glesMajorVersion, glesMinorVersion),
>+      mConfig(0),
>+      mDisplay(EGL_NO_DISPLAY),
>       mSurface(EGL_NO_SURFACE),
>       mContext(EGL_NO_CONTEXT),
>-      mClientMajorVersion(glesMajorVersion),
>-      mClientMinorVersion(glesMinorVersion),
>       mEGLMajorVersion(0),
>-      mEGLMinorVersion(0),
>-      mPlatform(platform),
>-      mRedBits(-1),
>-      mGreenBits(-1),
>-      mBlueBits(-1),
>-      mAlphaBits(-1),
>-      mDepthBits(-1),
>-      mStencilBits(-1),
>-      mComponentType(EGL_COLOR_COMPONENT_TYPE_FIXED_EXT),
>-      mMultisample(false),
>-      mDebug(false),
>-      mNoError(false),
>-      mWebGLCompatibility(false),
>-      mBindGeneratesResource(true),
>-      mClientArraysEnabled(true),
>-      mRobustAccess(false),
>-      mRobustResourceInit(),
>-      mSwapInterval(-1),
>-      mSamples(-1),
>-      mDebugLayersEnabled(),
>-      mContextProgramCacheEnabled(),
>-      mPlatformMethods(nullptr)
>-{
>-}
>+      mEGLMinorVersion(0)
>+{}
> 
> EGLWindow::~EGLWindow()
> {
>@@ -160,30 +90,51 @@ EGLContext EGLWindow::getContext() const
>     return mContext;
> }
> 
>-bool EGLWindow::initializeGL(OSWindow *osWindow)
>+bool EGLWindow::initializeGL(OSWindow *osWindow,
>+                             angle::Library *glWindowingLibrary,
>+                             const EGLPlatformParameters &platformParams,
>+                             const ConfigParameters &configParams)
> {
>-    if (!initializeDisplayAndSurface(osWindow))
>+    if (!initializeDisplay(osWindow, glWindowingLibrary, platformParams))
>         return false;
>-    return initializeContext();
>+    if (!initializeSurface(osWindow, glWindowingLibrary, configParams))
>+        return false;
>+    if (!initializeContext())
>+        return false;
>+    return true;
> }
> 
>-bool EGLWindow::initializeDisplayAndSurface(OSWindow *osWindow)
>+bool EGLWindow::initializeDisplay(OSWindow *osWindow,
>+                                  angle::Library *glWindowingLibrary,
>+                                  const EGLPlatformParameters &params)
> {
>+#if defined(ANGLE_USE_UTIL_LOADER)
>+    PFNEGLGETPROCADDRESSPROC getProcAddress;
>+    glWindowingLibrary->getAs("eglGetProcAddress", &getProcAddress);
>+    if (!getProcAddress)
>+    {
>+        return false;
>+    }
>+
>+    // Likely we will need to use a fallback to Library::getAs on non-ANGLE platforms.
>+    angle::LoadEGL(getProcAddress);
>+#endif  // defined(ANGLE_USE_UTIL_LOADER)
>+
>     std::vector<EGLAttrib> displayAttributes;
>     displayAttributes.push_back(EGL_PLATFORM_ANGLE_TYPE_ANGLE);
>-    displayAttributes.push_back(mPlatform.renderer);
>+    displayAttributes.push_back(params.renderer);
>     displayAttributes.push_back(EGL_PLATFORM_ANGLE_MAX_VERSION_MAJOR_ANGLE);
>-    displayAttributes.push_back(mPlatform.majorVersion);
>+    displayAttributes.push_back(params.majorVersion);
>     displayAttributes.push_back(EGL_PLATFORM_ANGLE_MAX_VERSION_MINOR_ANGLE);
>-    displayAttributes.push_back(mPlatform.minorVersion);
>+    displayAttributes.push_back(params.minorVersion);
> 
>-    if (mPlatform.deviceType != EGL_DONT_CARE)
>+    if (params.deviceType != EGL_DONT_CARE)
>     {
>         displayAttributes.push_back(EGL_PLATFORM_ANGLE_DEVICE_TYPE_ANGLE);
>-        displayAttributes.push_back(mPlatform.deviceType);
>+        displayAttributes.push_back(params.deviceType);
>     }
> 
>-    if (mPlatform.presentPath != EGL_DONT_CARE)
>+    if (params.presentPath != EGL_DONT_CARE)
>     {
>         const char *extensionString =
>             static_cast<const char *>(eglQueryString(EGL_NO_DISPLAY, EGL_EXTENSIONS));
>@@ -194,21 +145,28 @@ bool EGLWindow::initializeDisplayAndSurface(OSWindow *osWindow)
>         }
> 
>         displayAttributes.push_back(EGL_EXPERIMENTAL_PRESENT_PATH_ANGLE);
>-        displayAttributes.push_back(mPlatform.presentPath);
>+        displayAttributes.push_back(params.presentPath);
>     }
> 
>     // Set debug layer settings if requested.
>-    if (mDebugLayersEnabled.valid())
>+    if (params.debugLayersEnabled != EGL_DONT_CARE)
>     {
>         displayAttributes.push_back(EGL_PLATFORM_ANGLE_DEBUG_LAYERS_ENABLED_ANGLE);
>-        displayAttributes.push_back(mDebugLayersEnabled.value() ? EGL_TRUE : EGL_FALSE);
>+        displayAttributes.push_back(params.debugLayersEnabled);
>     }
> 
>-    if (mPlatformMethods)
>+    if (params.contextVirtualization != EGL_DONT_CARE)
>     {
>-        static_assert(sizeof(EGLAttrib) == sizeof(mPlatformMethods), "Unexpected pointer size");
>+        displayAttributes.push_back(EGL_PLATFORM_ANGLE_CONTEXT_VIRTUALIZATION_ANGLE);
>+        displayAttributes.push_back(params.contextVirtualization);
>+    }
>+
>+    if (params.platformMethods)
>+    {
>+        static_assert(sizeof(EGLAttrib) == sizeof(params.platformMethods),
>+                      "Unexpected pointer size");
>         displayAttributes.push_back(EGL_PLATFORM_ANGLE_PLATFORM_METHODS_ANGLEX);
>-        displayAttributes.push_back(reinterpret_cast<EGLAttrib>(mPlatformMethods));
>+        displayAttributes.push_back(reinterpret_cast<EGLAttrib>(params.platformMethods));
>     }
> 
>     displayAttributes.push_back(EGL_NONE);
>@@ -228,22 +186,39 @@ bool EGLWindow::initializeDisplayAndSurface(OSWindow *osWindow)
>         return false;
>     }
> 
>+    mPlatform = params;
>+    return true;
>+}
>+
>+bool EGLWindow::initializeSurface(OSWindow *osWindow,
>+                                  angle::Library *glWindowingLibrary,
>+                                  const ConfigParameters &params)
>+{
>+    mConfigParams                 = params;
>     const char *displayExtensions = eglQueryString(mDisplay, EGL_EXTENSIONS);
> 
>     std::vector<EGLint> configAttributes = {
>-        EGL_RED_SIZE,       (mRedBits >= 0) ? mRedBits : EGL_DONT_CARE,
>-        EGL_GREEN_SIZE,     (mGreenBits >= 0) ? mGreenBits : EGL_DONT_CARE,
>-        EGL_BLUE_SIZE,      (mBlueBits >= 0) ? mBlueBits : EGL_DONT_CARE,
>-        EGL_ALPHA_SIZE,     (mAlphaBits >= 0) ? mAlphaBits : EGL_DONT_CARE,
>-        EGL_DEPTH_SIZE,     (mDepthBits >= 0) ? mDepthBits : EGL_DONT_CARE,
>-        EGL_STENCIL_SIZE,   (mStencilBits >= 0) ? mStencilBits : EGL_DONT_CARE,
>-        EGL_SAMPLE_BUFFERS, mMultisample ? 1 : 0,
>-        EGL_SAMPLES,        (mSamples >= 0) ? mSamples : EGL_DONT_CARE,
>+        EGL_RED_SIZE,
>+        (mConfigParams.redBits >= 0) ? mConfigParams.redBits : EGL_DONT_CARE,
>+        EGL_GREEN_SIZE,
>+        (mConfigParams.greenBits >= 0) ? mConfigParams.greenBits : EGL_DONT_CARE,
>+        EGL_BLUE_SIZE,
>+        (mConfigParams.blueBits >= 0) ? mConfigParams.blueBits : EGL_DONT_CARE,
>+        EGL_ALPHA_SIZE,
>+        (mConfigParams.alphaBits >= 0) ? mConfigParams.alphaBits : EGL_DONT_CARE,
>+        EGL_DEPTH_SIZE,
>+        (mConfigParams.depthBits >= 0) ? mConfigParams.depthBits : EGL_DONT_CARE,
>+        EGL_STENCIL_SIZE,
>+        (mConfigParams.stencilBits >= 0) ? mConfigParams.stencilBits : EGL_DONT_CARE,
>+        EGL_SAMPLE_BUFFERS,
>+        mConfigParams.multisample ? 1 : 0,
>+        EGL_SAMPLES,
>+        (mConfigParams.samples >= 0) ? mConfigParams.samples : EGL_DONT_CARE,
>     };
> 
>     // Add dynamic attributes
>     bool hasPixelFormatFloat = strstr(displayExtensions, "EGL_EXT_pixel_format_float") != nullptr;
>-    if (!hasPixelFormatFloat && mComponentType != EGL_COLOR_COMPONENT_TYPE_FIXED_EXT)
>+    if (!hasPixelFormatFloat && mConfigParams.componentType != EGL_COLOR_COMPONENT_TYPE_FIXED_EXT)
>     {
>         destroyGL();
>         return false;
>@@ -251,7 +226,7 @@ bool EGLWindow::initializeDisplayAndSurface(OSWindow *osWindow)
>     if (hasPixelFormatFloat)
>     {
>         configAttributes.push_back(EGL_COLOR_COMPONENT_TYPE_EXT);
>-        configAttributes.push_back(mComponentType);
>+        configAttributes.push_back(mConfigParams.componentType);
>     }
> 
>     // Finish the attribute list
>@@ -264,13 +239,13 @@ bool EGLWindow::initializeDisplayAndSurface(OSWindow *osWindow)
>         return false;
>     }
> 
>-    eglGetConfigAttrib(mDisplay, mConfig, EGL_RED_SIZE, &mRedBits);
>-    eglGetConfigAttrib(mDisplay, mConfig, EGL_GREEN_SIZE, &mGreenBits);
>-    eglGetConfigAttrib(mDisplay, mConfig, EGL_BLUE_SIZE, &mBlueBits);
>-    eglGetConfigAttrib(mDisplay, mConfig, EGL_ALPHA_SIZE, &mAlphaBits);
>-    eglGetConfigAttrib(mDisplay, mConfig, EGL_DEPTH_SIZE, &mDepthBits);
>-    eglGetConfigAttrib(mDisplay, mConfig, EGL_STENCIL_SIZE, &mStencilBits);
>-    eglGetConfigAttrib(mDisplay, mConfig, EGL_SAMPLES, &mSamples);
>+    eglGetConfigAttrib(mDisplay, mConfig, EGL_RED_SIZE, &mConfigParams.redBits);
>+    eglGetConfigAttrib(mDisplay, mConfig, EGL_GREEN_SIZE, &mConfigParams.greenBits);
>+    eglGetConfigAttrib(mDisplay, mConfig, EGL_BLUE_SIZE, &mConfigParams.blueBits);
>+    eglGetConfigAttrib(mDisplay, mConfig, EGL_ALPHA_SIZE, &mConfigParams.alphaBits);
>+    eglGetConfigAttrib(mDisplay, mConfig, EGL_DEPTH_SIZE, &mConfigParams.depthBits);
>+    eglGetConfigAttrib(mDisplay, mConfig, EGL_STENCIL_SIZE, &mConfigParams.stencilBits);
>+    eglGetConfigAttrib(mDisplay, mConfig, EGL_SAMPLES, &mConfigParams.samples);
> 
>     std::vector<EGLint> surfaceAttributes;
>     if (strstr(displayExtensions, "EGL_NV_post_sub_buffer") != nullptr)
>@@ -281,25 +256,33 @@ bool EGLWindow::initializeDisplayAndSurface(OSWindow *osWindow)
> 
>     bool hasRobustResourceInit =
>         strstr(displayExtensions, "EGL_ANGLE_robust_resource_initialization") != nullptr;
>-    if (hasRobustResourceInit && mRobustResourceInit.valid())
>+    if (hasRobustResourceInit && mConfigParams.robustResourceInit.valid())
>     {
>         surfaceAttributes.push_back(EGL_ROBUST_RESOURCE_INITIALIZATION_ANGLE);
>-        surfaceAttributes.push_back(mRobustResourceInit.value() ? EGL_TRUE : EGL_FALSE);
>+        surfaceAttributes.push_back(mConfigParams.robustResourceInit.value() ? EGL_TRUE
>+                                                                             : EGL_FALSE);
>     }
> 
>     surfaceAttributes.push_back(EGL_NONE);
> 
>-    mSurface = eglCreateWindowSurface(mDisplay, mConfig, osWindow->getNativeWindow(), &surfaceAttributes[0]);
>-    if (eglGetError() != EGL_SUCCESS)
>+    osWindow->resetNativeWindow();
>+
>+    mSurface = eglCreateWindowSurface(mDisplay, mConfig, osWindow->getNativeWindow(),
>+                                      &surfaceAttributes[0]);
>+    if (eglGetError() != EGL_SUCCESS || (mSurface == EGL_NO_SURFACE))
>     {
>         destroyGL();
>         return false;
>     }
>-    ASSERT(mSurface != EGL_NO_SURFACE);
>+
>+#if defined(ANGLE_USE_UTIL_LOADER)
>+    angle::LoadGLES(eglGetProcAddress);
>+#endif  // defined(ANGLE_USE_UTIL_LOADER)
>+
>     return true;
> }
> 
>-bool EGLWindow::initializeContext()
>+EGLContext EGLWindow::createContext(EGLContext share) const
> {
>     const char *displayExtensions = eglQueryString(mDisplay, EGL_EXTENSIONS);
> 
>@@ -308,55 +291,65 @@ bool EGLWindow::initializeContext()
>     if (mClientMajorVersion > 2 && !(mEGLMajorVersion > 1 || mEGLMinorVersion >= 5) &&
>         !hasKHRCreateContext)
>     {
>-        destroyGL();
>-        return false;
>+        std::cerr << "EGL_KHR_create_context incompatibility.\n";
>+        return EGL_NO_CONTEXT;
>     }
> 
>     bool hasWebGLCompatibility =
>         strstr(displayExtensions, "EGL_ANGLE_create_context_webgl_compatibility") != nullptr;
>-    if (mWebGLCompatibility && !hasWebGLCompatibility)
>+    if (mConfigParams.webGLCompatibility.valid() && !hasWebGLCompatibility)
>     {
>-        destroyGL();
>-        return false;
>+        std::cerr << "EGL_ANGLE_create_context_webgl_compatibility missing.\n";
>+        return EGL_NO_CONTEXT;
>+    }
>+
>+    bool hasCreateContextExtensionsEnabled =
>+        strstr(displayExtensions, "EGL_ANGLE_create_context_extensions_enabled") != nullptr;
>+    if (mConfigParams.extensionsEnabled.valid() && !hasCreateContextExtensionsEnabled)
>+    {
>+        std::cerr << "EGL_ANGLE_create_context_extensions_enabled missing.\n";
>+        return EGL_NO_CONTEXT;
>     }
> 
>     bool hasRobustness = strstr(displayExtensions, "EGL_EXT_create_context_robustness") != nullptr;
>-    if (mRobustAccess && !hasRobustness)
>+    if ((mConfigParams.robustAccess ||
>+         mConfigParams.resetStrategy != EGL_NO_RESET_NOTIFICATION_EXT) &&
>+        !hasRobustness)
>     {
>-        destroyGL();
>-        return false;
>+        std::cerr << "EGL_EXT_create_context_robustness missing.\n";
>+        return EGL_NO_CONTEXT;
>     }
> 
>     bool hasBindGeneratesResource =
>         strstr(displayExtensions, "EGL_CHROMIUM_create_context_bind_generates_resource") != nullptr;
>-    if (!mBindGeneratesResource && !hasBindGeneratesResource)
>+    if (!mConfigParams.bindGeneratesResource && !hasBindGeneratesResource)
>     {
>-        destroyGL();
>-        return false;
>+        std::cerr << "EGL_CHROMIUM_create_context_bind_generates_resource missing.\n";
>+        return EGL_NO_CONTEXT;
>     }
> 
>     bool hasClientArraysExtension =
>         strstr(displayExtensions, "EGL_ANGLE_create_context_client_arrays") != nullptr;
>-    if (!mClientArraysEnabled && !hasClientArraysExtension)
>+    if (!mConfigParams.clientArraysEnabled && !hasClientArraysExtension)
>     {
>         // Non-default state requested without the extension present
>-        destroyGL();
>-        return false;
>+        std::cerr << "EGL_ANGLE_create_context_client_arrays missing.\n";
>+        return EGL_NO_CONTEXT;
>     }
> 
>     bool hasProgramCacheControlExtension =
>         strstr(displayExtensions, "EGL_ANGLE_program_cache_control ") != nullptr;
>-    if (mContextProgramCacheEnabled.valid() && !hasProgramCacheControlExtension)
>+    if (mConfigParams.contextProgramCacheEnabled.valid() && !hasProgramCacheControlExtension)
>     {
>-        destroyGL();
>-        return false;
>+        std::cerr << "EGL_ANGLE_program_cache_control missing.\n";
>+        return EGL_NO_CONTEXT;
>     }
> 
>     eglBindAPI(EGL_OPENGL_ES_API);
>     if (eglGetError() != EGL_SUCCESS)
>     {
>-        destroyGL();
>-        return false;
>+        std::cerr << "Error on eglBindAPI.\n";
>+        return EGL_NO_CONTEXT;
>     }
> 
>     std::vector<EGLint> contextAttributes;
>@@ -369,106 +362,134 @@ bool EGLWindow::initializeContext()
>         contextAttributes.push_back(mClientMinorVersion);
> 
>         contextAttributes.push_back(EGL_CONTEXT_OPENGL_DEBUG);
>-        contextAttributes.push_back(mDebug ? EGL_TRUE : EGL_FALSE);
>+        contextAttributes.push_back(mConfigParams.debug ? EGL_TRUE : EGL_FALSE);
> 
>         // TODO(jmadill): Check for the extension string.
>         // bool hasKHRCreateContextNoError = strstr(displayExtensions,
>         // "EGL_KHR_create_context_no_error") != nullptr;
> 
>         contextAttributes.push_back(EGL_CONTEXT_OPENGL_NO_ERROR_KHR);
>-        contextAttributes.push_back(mNoError ? EGL_TRUE : EGL_FALSE);
>+        contextAttributes.push_back(mConfigParams.noError ? EGL_TRUE : EGL_FALSE);
> 
>-        if (hasWebGLCompatibility)
>+        if (mConfigParams.webGLCompatibility.valid())
>         {
>             contextAttributes.push_back(EGL_CONTEXT_WEBGL_COMPATIBILITY_ANGLE);
>-            contextAttributes.push_back(mWebGLCompatibility ? EGL_TRUE : EGL_FALSE);
>+            contextAttributes.push_back(mConfigParams.webGLCompatibility.value() ? EGL_TRUE
>+                                                                                 : EGL_FALSE);
>+        }
>+
>+        if (mConfigParams.extensionsEnabled.valid())
>+        {
>+            contextAttributes.push_back(EGL_EXTENSIONS_ENABLED_ANGLE);
>+            contextAttributes.push_back(mConfigParams.extensionsEnabled.value() ? EGL_TRUE
>+                                                                                : EGL_FALSE);
>         }
> 
>         if (hasRobustness)
>         {
>             contextAttributes.push_back(EGL_CONTEXT_OPENGL_ROBUST_ACCESS_EXT);
>-            contextAttributes.push_back(mRobustAccess ? EGL_TRUE : EGL_FALSE);
>+            contextAttributes.push_back(mConfigParams.robustAccess ? EGL_TRUE : EGL_FALSE);
>+
>+            contextAttributes.push_back(EGL_CONTEXT_OPENGL_RESET_NOTIFICATION_STRATEGY_EXT);
>+            contextAttributes.push_back(mConfigParams.resetStrategy);
>         }
> 
>         if (hasBindGeneratesResource)
>         {
>             contextAttributes.push_back(EGL_CONTEXT_BIND_GENERATES_RESOURCE_CHROMIUM);
>-            contextAttributes.push_back(mBindGeneratesResource ? EGL_TRUE : EGL_FALSE);
>+            contextAttributes.push_back(mConfigParams.bindGeneratesResource ? EGL_TRUE : EGL_FALSE);
>         }
> 
>         if (hasClientArraysExtension)
>         {
>             contextAttributes.push_back(EGL_CONTEXT_CLIENT_ARRAYS_ENABLED_ANGLE);
>-            contextAttributes.push_back(mClientArraysEnabled ? EGL_TRUE : EGL_FALSE);
>+            contextAttributes.push_back(mConfigParams.clientArraysEnabled ? EGL_TRUE : EGL_FALSE);
>         }
> 
>-        if (mContextProgramCacheEnabled.valid())
>+        if (mConfigParams.contextProgramCacheEnabled.valid())
>         {
>             contextAttributes.push_back(EGL_CONTEXT_PROGRAM_BINARY_CACHE_ENABLED_ANGLE);
>-            contextAttributes.push_back(mContextProgramCacheEnabled.value() ? EGL_TRUE : EGL_FALSE);
>+            contextAttributes.push_back(
>+                mConfigParams.contextProgramCacheEnabled.value() ? EGL_TRUE : EGL_FALSE);
>         }
> 
>         bool hasRobustResourceInit =
>             strstr(displayExtensions, "EGL_ANGLE_robust_resource_initialization") != nullptr;
>-        if (hasRobustResourceInit && mRobustResourceInit.valid())
>+        if (hasRobustResourceInit && mConfigParams.robustResourceInit.valid())
>         {
>             contextAttributes.push_back(EGL_ROBUST_RESOURCE_INITIALIZATION_ANGLE);
>-            contextAttributes.push_back(mRobustResourceInit.value() ? EGL_TRUE : EGL_FALSE);
>+            contextAttributes.push_back(mConfigParams.robustResourceInit.value() ? EGL_TRUE
>+                                                                                 : EGL_FALSE);
>         }
>     }
>     contextAttributes.push_back(EGL_NONE);
> 
>-    mContext = eglCreateContext(mDisplay, mConfig, nullptr, &contextAttributes[0]);
>+    EGLContext context = eglCreateContext(mDisplay, mConfig, nullptr, &contextAttributes[0]);
>     if (eglGetError() != EGL_SUCCESS)
>     {
>-        destroyGL();
>-        return false;
>+        std::cerr << "Error on eglCreateContext.\n";
>+        return EGL_NO_CONTEXT;
>     }
> 
>-    eglMakeCurrent(mDisplay, mSurface, mSurface, mContext);
>-    if (eglGetError() != EGL_SUCCESS)
>+    return context;
>+}
>+
>+bool EGLWindow::initializeContext()
>+{
>+    mContext = createContext(EGL_NO_CONTEXT);
>+    if (mContext == EGL_NO_CONTEXT)
>     {
>         destroyGL();
>         return false;
>     }
> 
>-    if (mSwapInterval != -1)
>+    if (!makeCurrent())
>     {
>-        eglSwapInterval(mDisplay, mSwapInterval);
>+        destroyGL();
>+        return false;
>     }
> 
>     return true;
> }
> 
> void EGLWindow::destroyGL()
>+{
>+    destroyContext();
>+    destroySurface();
>+
>+    if (mDisplay != EGL_NO_DISPLAY)
>+    {
>+        eglMakeCurrent(mDisplay, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT);
>+        eglTerminate(mDisplay);
>+        mDisplay = EGL_NO_DISPLAY;
>+    }
>+}
>+
>+void EGLWindow::destroySurface()
> {
>     if (mSurface != EGL_NO_SURFACE)
>     {
>+        eglMakeCurrent(mDisplay, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT);
>         assert(mDisplay != EGL_NO_DISPLAY);
>         eglDestroySurface(mDisplay, mSurface);
>         mSurface = EGL_NO_SURFACE;
>     }
>+}
> 
>+void EGLWindow::destroyContext()
>+{
>     if (mContext != EGL_NO_CONTEXT)
>     {
>+        eglMakeCurrent(mDisplay, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT);
>         assert(mDisplay != EGL_NO_DISPLAY);
>         eglDestroyContext(mDisplay, mContext);
>         mContext = EGL_NO_CONTEXT;
>     }
>-
>-    if (mDisplay != EGL_NO_DISPLAY)
>-    {
>-        eglMakeCurrent(mDisplay, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT);
>-        eglTerminate(mDisplay);
>-        mDisplay = EGL_NO_DISPLAY;
>-    }
> }
> 
> bool EGLWindow::isGLInitialized() const
> {
>-    return mSurface != EGL_NO_SURFACE &&
>-           mContext != EGL_NO_CONTEXT &&
>-           mDisplay != EGL_NO_DISPLAY;
>+    return mSurface != EGL_NO_SURFACE && mContext != EGL_NO_CONTEXT && mDisplay != EGL_NO_DISPLAY;
> }
> 
> // Find an EGLConfig that is an exact match for the specified attributes. EGL_FALSE is returned if
>@@ -509,15 +530,32 @@ EGLBoolean EGLWindow::FindEGLConfig(EGLDisplay dpy, const EGLint *attrib_list, E
>     return EGL_FALSE;
> }
> 
>-void EGLWindow::makeCurrent()
>+bool EGLWindow::makeCurrent()
> {
>-    eglMakeCurrent(mDisplay, mSurface, mSurface, mContext);
>+    if (eglMakeCurrent(mDisplay, mSurface, mSurface, mContext) == EGL_FALSE ||
>+        eglGetError() != EGL_SUCCESS)
>+    {
>+        std::cerr << "Error during eglMakeCurrent.\n";
>+        return false;
>+    }
>+
>+    return true;
> }
> 
>-// static
>-bool EGLWindow::ClientExtensionEnabled(const std::string &extName)
>+bool EGLWindow::setSwapInterval(EGLint swapInterval)
>+{
>+    if (eglSwapInterval(mDisplay, swapInterval) == EGL_FALSE || eglGetError() != EGL_SUCCESS)
>+    {
>+        std::cerr << "Error during eglSwapInterval.\n";
>+        return false;
>+    }
>+
>+    return true;
>+}
>+
>+bool EGLWindow::hasError() const
> {
>-    return CheckExtensionExists(eglQueryString(EGL_NO_DISPLAY, EGL_EXTENSIONS), extName);
>+    return eglGetError() != EGL_SUCCESS;
> }
> 
> bool CheckExtensionExists(const char *allExtensions, const std::string &extName)
>@@ -526,3 +564,23 @@ bool CheckExtensionExists(const char *allExtensions, const std::string &extName)
>     return paddedExtensions.find(std::string(" ") + extName + std::string(" ")) !=
>            std::string::npos;
> }
>+
>+// static
>+void GLWindowBase::Delete(GLWindowBase **window)
>+{
>+    delete *window;
>+    *window = nullptr;
>+}
>+
>+// static
>+EGLWindow *EGLWindow::New(EGLint glesMajorVersion, EGLint glesMinorVersion)
>+{
>+    return new EGLWindow(glesMajorVersion, glesMinorVersion);
>+}
>+
>+// static
>+void EGLWindow::Delete(EGLWindow **window)
>+{
>+    delete *window;
>+    *window = nullptr;
>+}
>diff --git a/Source/ThirdParty/ANGLE/util/EGLWindow.h b/Source/ThirdParty/ANGLE/util/EGLWindow.h
>index abbae86df82..c63fa05f881 100644
>--- a/Source/ThirdParty/ANGLE/util/EGLWindow.h
>+++ b/Source/ThirdParty/ANGLE/util/EGLWindow.h
>@@ -7,165 +7,156 @@
> #ifndef UTIL_EGLWINDOW_H_
> #define UTIL_EGLWINDOW_H_
> 
>+#include <stdint.h>
> #include <list>
> #include <memory>
>-#include <stdint.h>
> #include <string>
> 
>-#include <export.h>
>-#include <GLES2/gl2.h>
>-#include <GLES2/gl2ext.h>
>-#include <GLES3/gl3.h>
>-#include <EGL/egl.h>
>-#include <EGL/eglext.h>
>-
>-#include "common/angleutils.h"
> #include "common/Optional.h"
>+#include "common/angleutils.h"
>+#include "util/EGLPlatformParameters.h"
>+#include "util/util_export.h"
>+#include "util/util_gl.h"
> 
> class OSWindow;
> 
>-// A hidden define used in some renderers (currently D3D-only)
>-// to init a no-op renderer. Useful for performance testing.
>-#ifndef EGL_PLATFORM_ANGLE_DEVICE_TYPE_NULL_ANGLE
>-#define EGL_PLATFORM_ANGLE_DEVICE_TYPE_NULL_ANGLE 0x6AC0
>-#endif
>-
> namespace angle
> {
>+class Library;
> struct PlatformMethods;
>-}
>+}  // namespace angle
> 
>-struct ANGLE_EXPORT EGLPlatformParameters
>+struct ANGLE_UTIL_EXPORT ConfigParameters
> {
>-    EGLint renderer;
>-    EGLint majorVersion;
>-    EGLint minorVersion;
>-    EGLint deviceType;
>-    EGLint presentPath;
>-
>-    EGLPlatformParameters();
>-    explicit EGLPlatformParameters(EGLint renderer);
>-    EGLPlatformParameters(EGLint renderer, EGLint majorVersion, EGLint minorVersion, EGLint deviceType);
>-    EGLPlatformParameters(EGLint renderer,
>-                          EGLint majorVersion,
>-                          EGLint minorVersion,
>-                          EGLint deviceType,
>-                          EGLint presentPath);
>+    ConfigParameters();
>+    ~ConfigParameters();
>+
>+    void reset();
>+
>+    // Surface and Context parameters.
>+    int redBits;
>+    int greenBits;
>+    int blueBits;
>+    int alphaBits;
>+    int depthBits;
>+    int stencilBits;
>+
>+    Optional<bool> webGLCompatibility;
>+    Optional<bool> robustResourceInit;
>+
>+    // EGLWindow-specific.
>+    EGLenum componentType;
>+    bool multisample;
>+    bool debug;
>+    bool noError;
>+    Optional<bool> extensionsEnabled;
>+    bool bindGeneratesResource;
>+    bool clientArraysEnabled;
>+    bool robustAccess;
>+    EGLint samples;
>+    Optional<bool> contextProgramCacheEnabled;
>+    EGLenum resetStrategy;
> };
> 
>-ANGLE_EXPORT bool operator<(const EGLPlatformParameters &a, const EGLPlatformParameters &b);
>-ANGLE_EXPORT bool operator==(const EGLPlatformParameters &a, const EGLPlatformParameters &b);
>-
>-class ANGLE_EXPORT EGLWindow : angle::NonCopyable
>+class ANGLE_UTIL_EXPORT GLWindowBase : angle::NonCopyable
> {
>   public:
>-    EGLWindow(EGLint glesMajorVersion,
>-              EGLint glesMinorVersion,
>-              const EGLPlatformParameters &platform);
>-
>-    ~EGLWindow();
>-
>-    void setConfigRedBits(int bits) { mRedBits = bits; }
>-    void setConfigGreenBits(int bits) { mGreenBits = bits; }
>-    void setConfigBlueBits(int bits) { mBlueBits = bits; }
>-    void setConfigAlphaBits(int bits) { mAlphaBits = bits; }
>-    void setConfigDepthBits(int bits) { mDepthBits = bits; }
>-    void setConfigStencilBits(int bits) { mStencilBits = bits; }
>-    void setConfigComponentType(EGLenum componentType) { mComponentType = componentType; }
>-    void setMultisample(bool multisample) { mMultisample = multisample; }
>-    void setSamples(EGLint samples) { mSamples = samples; }
>-    void setDebugEnabled(bool debug) { mDebug = debug; }
>-    void setNoErrorEnabled(bool noError) { mNoError = noError; }
>-    void setWebGLCompatibilityEnabled(bool webglCompatibility)
>-    {
>-        mWebGLCompatibility = webglCompatibility;
>-    }
>-    void setBindGeneratesResource(bool bindGeneratesResource)
>-    {
>-        mBindGeneratesResource = bindGeneratesResource;
>-    }
>-    void setDebugLayersEnabled(bool enabled) { mDebugLayersEnabled = enabled; }
>-    void setClientArraysEnabled(bool enabled) { mClientArraysEnabled = enabled; }
>-    void setRobustAccess(bool enabled) { mRobustAccess = enabled; }
>-    void setRobustResourceInit(bool enabled) { mRobustResourceInit = enabled; }
>-    void setSwapInterval(EGLint swapInterval) { mSwapInterval = swapInterval; }
>-    void setPlatformMethods(angle::PlatformMethods *platformMethods)
>-    {
>-        mPlatformMethods = platformMethods;
>-    }
>-    void setContextProgramCacheEnabled(bool enabled) { mContextProgramCacheEnabled = enabled; }
>-
>-    static EGLBoolean FindEGLConfig(EGLDisplay dpy, const EGLint *attrib_list, EGLConfig *config);
>-
>-    void swap();
>+    static void Delete(GLWindowBase **window);
> 
>+    // It should also be possible to set multisample and floating point framebuffers.
>     EGLint getClientMajorVersion() const { return mClientMajorVersion; }
>     EGLint getClientMinorVersion() const { return mClientMinorVersion; }
>+
>+    virtual bool initializeGL(OSWindow *osWindow,
>+                              angle::Library *glWindowingLibrary,
>+                              const EGLPlatformParameters &platformParams,
>+                              const ConfigParameters &configParams) = 0;
>+    virtual bool isGLInitialized() const                            = 0;
>+    virtual void swap()                                             = 0;
>+    virtual void destroyGL()                                        = 0;
>+    virtual bool makeCurrent()                                      = 0;
>+    virtual bool hasError() const                                   = 0;
>+    virtual bool setSwapInterval(EGLint swapInterval)               = 0;
>+
>+    bool isMultisample() const { return mConfigParams.multisample; }
>+    bool isDebugEnabled() const { return mConfigParams.debug; }
>+
>+    const angle::PlatformMethods *getPlatformMethods() const { return mPlatform.platformMethods; }
>+
>     const EGLPlatformParameters &getPlatform() const { return mPlatform; }
>+    const ConfigParameters &getConfigParams() const { return mConfigParams; }
>+
>+  protected:
>+    GLWindowBase(EGLint glesMajorVersion, EGLint glesMinorVersion);
>+    virtual ~GLWindowBase();
>+
>+    EGLint mClientMajorVersion;
>+    EGLint mClientMinorVersion;
>+    EGLPlatformParameters mPlatform;
>+    ConfigParameters mConfigParams;
>+};
>+
>+class ANGLE_UTIL_EXPORT EGLWindow : public GLWindowBase
>+{
>+  public:
>+    static EGLWindow *New(EGLint glesMajorVersion, EGLint glesMinorVersion);
>+    static void Delete(EGLWindow **window);
>+
>+    static EGLBoolean FindEGLConfig(EGLDisplay dpy, const EGLint *attrib_list, EGLConfig *config);
>+
>     EGLConfig getConfig() const;
>     EGLDisplay getDisplay() const;
>     EGLSurface getSurface() const;
>     EGLContext getContext() const;
>-    int getConfigRedBits() const { return mRedBits; }
>-    int getConfigGreenBits() const { return mGreenBits; }
>-    int getConfigBlueBits() const { return mBlueBits; }
>-    int getConfigAlphaBits() const { return mAlphaBits; }
>-    int getConfigDepthBits() const { return mDepthBits; }
>-    int getConfigStencilBits() const { return mStencilBits; }
>-    bool isMultisample() const { return mMultisample; }
>-    bool isDebugEnabled() const { return mDebug; }
>-    EGLint getSwapInterval() const { return mSwapInterval; }
>-    const angle::PlatformMethods *getPlatformMethods() const { return mPlatformMethods; }
> 
>     // Internally initializes the Display, Surface and Context.
>-    bool initializeGL(OSWindow *osWindow);
>-
>-    // Only initializes the Display and Surface.
>-    bool initializeDisplayAndSurface(OSWindow *osWindow);
>+    bool initializeGL(OSWindow *osWindow,
>+                      angle::Library *glWindowingLibrary,
>+                      const EGLPlatformParameters &platformParams,
>+                      const ConfigParameters &configParams) override;
>+
>+    bool isGLInitialized() const override;
>+    void swap() override;
>+    void destroyGL() override;
>+    bool makeCurrent() override;
>+    bool hasError() const override;
>+    bool setSwapInterval(EGLint swapInterval) override;
>+
>+    // Only initializes the Display.
>+    bool initializeDisplay(OSWindow *osWindow,
>+                           angle::Library *glWindowingLibrary,
>+                           const EGLPlatformParameters &params);
>+
>+    // Only initializes the Surface.
>+    bool initializeSurface(OSWindow *osWindow,
>+                           angle::Library *glWindowingLibrary,
>+                           const ConfigParameters &params);
>+
>+    // Create an EGL context with this window's configuration
>+    EGLContext createContext(EGLContext share) const;
> 
>     // Only initializes the Context.
>     bool initializeContext();
> 
>-    void destroyGL();
>-    bool isGLInitialized() const;
>+    void destroySurface();
>+    void destroyContext();
> 
>-    void makeCurrent();
>-
>-    static bool ClientExtensionEnabled(const std::string &extName);
>+    bool isDisplayInitialized() const { return mDisplay != EGL_NO_DISPLAY; }
> 
>   private:
>+    EGLWindow(EGLint glesMajorVersion, EGLint glesMinorVersion);
>+
>+    ~EGLWindow() override;
>+
>     EGLConfig mConfig;
>     EGLDisplay mDisplay;
>     EGLSurface mSurface;
>     EGLContext mContext;
> 
>-    EGLint mClientMajorVersion;
>-    EGLint mClientMinorVersion;
>     EGLint mEGLMajorVersion;
>     EGLint mEGLMinorVersion;
>-    EGLPlatformParameters mPlatform;
>-    int mRedBits;
>-    int mGreenBits;
>-    int mBlueBits;
>-    int mAlphaBits;
>-    int mDepthBits;
>-    int mStencilBits;
>-    EGLenum mComponentType;
>-    bool mMultisample;
>-    bool mDebug;
>-    bool mNoError;
>-    bool mWebGLCompatibility;
>-    bool mBindGeneratesResource;
>-    bool mClientArraysEnabled;
>-    bool mRobustAccess;
>-    Optional<bool> mRobustResourceInit;
>-    EGLint mSwapInterval;
>-    EGLint mSamples;
>-    Optional<bool> mDebugLayersEnabled;
>-    Optional<bool> mContextProgramCacheEnabled;
>-    angle::PlatformMethods *mPlatformMethods;
> };
> 
>-ANGLE_EXPORT bool CheckExtensionExists(const char *allExtensions, const std::string &extName);
>+ANGLE_UTIL_EXPORT bool CheckExtensionExists(const char *allExtensions, const std::string &extName);
> 
>-#endif // UTIL_EGLWINDOW_H_
>+#endif  // UTIL_EGLWINDOW_H_
>diff --git a/Source/ThirdParty/ANGLE/util/Matrix.h b/Source/ThirdParty/ANGLE/util/Matrix.h
>index 168dc05c3b8..bf883a95d4b 100644
>--- a/Source/ThirdParty/ANGLE/util/Matrix.h
>+++ b/Source/ThirdParty/ANGLE/util/Matrix.h
>@@ -10,11 +10,10 @@
> #ifndef UTIL_MATRIX_H
> #define UTIL_MATRIX_H
> 
>-#include <export.h>
>-
> #include "common/vector_utils.h"
>+#include "util/util_export.h"
> 
>-struct ANGLE_EXPORT Matrix4
>+struct ANGLE_UTIL_EXPORT Matrix4
> {
>     float data[16];
> 
>@@ -51,13 +50,13 @@ struct ANGLE_EXPORT Matrix4
>     static angle::Vector3 transform(const Matrix4 &mat, const angle::Vector4 &pt);
> };
> 
>-ANGLE_EXPORT Matrix4 operator*(const Matrix4 &a, const Matrix4 &b);
>-ANGLE_EXPORT Matrix4 &operator*=(Matrix4 &a, const Matrix4 &b);
>-ANGLE_EXPORT Matrix4 operator*(const Matrix4 &a, float b);
>-ANGLE_EXPORT Matrix4 &operator*=(Matrix4 &a, float b);
>-ANGLE_EXPORT angle::Vector4 operator*(const Matrix4 &a, const angle::Vector4 &b);
>+ANGLE_UTIL_EXPORT Matrix4 operator*(const Matrix4 &a, const Matrix4 &b);
>+ANGLE_UTIL_EXPORT Matrix4 &operator*=(Matrix4 &a, const Matrix4 &b);
>+ANGLE_UTIL_EXPORT Matrix4 operator*(const Matrix4 &a, float b);
>+ANGLE_UTIL_EXPORT Matrix4 &operator*=(Matrix4 &a, float b);
>+ANGLE_UTIL_EXPORT angle::Vector4 operator*(const Matrix4 &a, const angle::Vector4 &b);
> 
>-ANGLE_EXPORT bool operator==(const Matrix4 &a, const Matrix4 &b);
>-ANGLE_EXPORT bool operator!=(const Matrix4 &a, const Matrix4 &b);
>+ANGLE_UTIL_EXPORT bool operator==(const Matrix4 &a, const Matrix4 &b);
>+ANGLE_UTIL_EXPORT bool operator!=(const Matrix4 &a, const Matrix4 &b);
> 
> #endif  // UTIL_MATRIX_H
>diff --git a/Source/ThirdParty/ANGLE/util/OSPixmap.h b/Source/ThirdParty/ANGLE/util/OSPixmap.h
>index 2afcaf0f22f..ba6ccf4ad1f 100644
>--- a/Source/ThirdParty/ANGLE/util/OSPixmap.h
>+++ b/Source/ThirdParty/ANGLE/util/OSPixmap.h
>@@ -11,23 +11,26 @@
> 
> #include <stdlib.h>
> 
>-#include <export.h>
> #include <EGL/egl.h>
> #include <EGL/eglext.h>
> 
>-#include "Event.h"
>+#include "util/Event.h"
>+#include "util/util_export.h"
> 
>-class ANGLE_EXPORT OSPixmap
>+class ANGLE_UTIL_EXPORT OSPixmap
> {
>   public:
>     OSPixmap() {}
>     virtual ~OSPixmap() {}
> 
>-    virtual bool initialize(EGLNativeDisplayType display, size_t width, size_t height, int depth) = 0;
>+    virtual bool initialize(EGLNativeDisplayType display,
>+                            size_t width,
>+                            size_t height,
>+                            int depth) = 0;
> 
>     virtual EGLNativePixmapType getNativePixmap() const = 0;
> };
> 
>-ANGLE_EXPORT OSPixmap *CreateOSPixmap();
>+ANGLE_UTIL_EXPORT OSPixmap *CreateOSPixmap();
> 
>-#endif // SAMPLE_UTIL_PIXMAP_H_
>+#endif  // SAMPLE_UTIL_PIXMAP_H_
>diff --git a/Source/ThirdParty/ANGLE/util/OSWindow.cpp b/Source/ThirdParty/ANGLE/util/OSWindow.cpp
>index 33e7e95bcd4..fc5a0ff2e1e 100644
>--- a/Source/ThirdParty/ANGLE/util/OSWindow.cpp
>+++ b/Source/ThirdParty/ANGLE/util/OSWindow.cpp
>@@ -12,7 +12,7 @@
> #include "common/debug.h"
> 
> #ifndef DEBUG_EVENTS
>-#define DEBUG_EVENTS 0
>+#    define DEBUG_EVENTS 0
> #endif
> 
> #if DEBUG_EVENTS
>@@ -20,21 +20,21 @@ static const char *MouseButtonName(MouseButton button)
> {
>     switch (button)
>     {
>-      case MOUSEBUTTON_UNKNOWN:
>-        return "Unknown";
>-      case MOUSEBUTTON_LEFT:
>-        return "Left";
>-      case MOUSEBUTTON_RIGHT:
>-        return "Right";
>-      case MOUSEBUTTON_MIDDLE:
>-        return "Middle";
>-      case MOUSEBUTTON_BUTTON4:
>-        return "Button4";
>-      case MOUSEBUTTON_BUTTON5:
>-        return "Button5";
>-      default:
>-        UNREACHABLE();
>-        return nullptr;
>+        case MOUSEBUTTON_UNKNOWN:
>+            return "Unknown";
>+        case MOUSEBUTTON_LEFT:
>+            return "Left";
>+        case MOUSEBUTTON_RIGHT:
>+            return "Right";
>+        case MOUSEBUTTON_MIDDLE:
>+            return "Middle";
>+        case MOUSEBUTTON_BUTTON4:
>+            return "Button4";
>+        case MOUSEBUTTON_BUTTON5:
>+            return "Button5";
>+        default:
>+            UNREACHABLE();
>+            return nullptr;
>     }
> }
> 
>@@ -42,109 +42,212 @@ static const char *KeyName(Key key)
> {
>     switch (key)
>     {
>-      case KEY_UNKNOWN:   return "Unknown";
>-      case KEY_A:         return "A";
>-      case KEY_B:         return "B";
>-      case KEY_C:         return "C";
>-      case KEY_D:         return "D";
>-      case KEY_E:         return "E";
>-      case KEY_F:         return "F";
>-      case KEY_G:         return "G";
>-      case KEY_H:         return "H";
>-      case KEY_I:         return "I";
>-      case KEY_J:         return "J";
>-      case KEY_K:         return "K";
>-      case KEY_L:         return "L";
>-      case KEY_M:         return "M";
>-      case KEY_N:         return "N";
>-      case KEY_O:         return "O";
>-      case KEY_P:         return "P";
>-      case KEY_Q:         return "Q";
>-      case KEY_R:         return "R";
>-      case KEY_S:         return "S";
>-      case KEY_T:         return "T";
>-      case KEY_U:         return "U";
>-      case KEY_V:         return "V";
>-      case KEY_W:         return "W";
>-      case KEY_X:         return "X";
>-      case KEY_Y:         return "Y";
>-      case KEY_Z:         return "Z";
>-      case KEY_NUM0:      return "Num0";
>-      case KEY_NUM1:      return "Num1";
>-      case KEY_NUM2:      return "Num2";
>-      case KEY_NUM3:      return "Num3";
>-      case KEY_NUM4:      return "Num4";
>-      case KEY_NUM5:      return "Num5";
>-      case KEY_NUM6:      return "Num6";
>-      case KEY_NUM7:      return "Num7";
>-      case KEY_NUM8:      return "Num8";
>-      case KEY_NUM9:      return "Num9";
>-      case KEY_ESCAPE:    return "Escape";
>-      case KEY_LCONTROL:  return "Left Control";
>-      case KEY_LSHIFT:    return "Left Shift";
>-      case KEY_LALT:      return "Left Alt";
>-      case KEY_LSYSTEM:   return "Left System";
>-      case KEY_RCONTROL:  return "Right Control";
>-      case KEY_RSHIFT:    return "Right Shift";
>-      case KEY_RALT:      return "Right Alt";
>-      case KEY_RSYSTEM:   return "Right System";
>-      case KEY_MENU:      return "Menu";
>-      case KEY_LBRACKET:  return "Left Bracket";
>-      case KEY_RBRACKET:  return "Right Bracket";
>-      case KEY_SEMICOLON: return "Semicolon";
>-      case KEY_COMMA:     return "Comma";
>-      case KEY_PERIOD:    return "Period";
>-      case KEY_QUOTE:     return "Quote";
>-      case KEY_SLASH:     return "Slash";
>-      case KEY_BACKSLASH: return "Backslash";
>-      case KEY_TILDE:     return "Tilde";
>-      case KEY_EQUAL:     return "Equal";
>-      case KEY_DASH:      return "Dash";
>-      case KEY_SPACE:     return "Space";
>-      case KEY_RETURN:    return "Return";
>-      case KEY_BACK:      return "Back";
>-      case KEY_TAB:       return "Tab";
>-      case KEY_PAGEUP:    return "Page Up";
>-      case KEY_PAGEDOWN:  return "Page Down";
>-      case KEY_END:       return "End";
>-      case KEY_HOME:      return "Home";
>-      case KEY_INSERT:    return "Insert";
>-      case KEY_DELETE:    return "Delete";
>-      case KEY_ADD:       return "Add";
>-      case KEY_SUBTRACT:  return "Substract";
>-      case KEY_MULTIPLY:  return "Multiply";
>-      case KEY_DIVIDE:    return "Divide";
>-      case KEY_LEFT:      return "Left";
>-      case KEY_RIGHT:     return "Right";
>-      case KEY_UP:        return "Up";
>-      case KEY_DOWN:      return "Down";
>-      case KEY_NUMPAD0:   return "Numpad 0";
>-      case KEY_NUMPAD1:   return "Numpad 1";
>-      case KEY_NUMPAD2:   return "Numpad 2";
>-      case KEY_NUMPAD3:   return "Numpad 3";
>-      case KEY_NUMPAD4:   return "Numpad 4";
>-      case KEY_NUMPAD5:   return "Numpad 5";
>-      case KEY_NUMPAD6:   return "Numpad 6";
>-      case KEY_NUMPAD7:   return "Numpad 7";
>-      case KEY_NUMPAD8:   return "Numpad 8";
>-      case KEY_NUMPAD9:   return "Numpad 9";
>-      case KEY_F1:        return "F1";
>-      case KEY_F2:        return "F2";
>-      case KEY_F3:        return "F3";
>-      case KEY_F4:        return "F4";
>-      case KEY_F5:        return "F5";
>-      case KEY_F6:        return "F6";
>-      case KEY_F7:        return "F7";
>-      case KEY_F8:        return "F8";
>-      case KEY_F9:        return "F9";
>-      case KEY_F10:       return "F10";
>-      case KEY_F11:       return "F11";
>-      case KEY_F12:       return "F12";
>-      case KEY_F13:       return "F13";
>-      case KEY_F14:       return "F14";
>-      case KEY_F15:       return "F15";
>-      case KEY_PAUSE:     return "Pause";
>-      default:            return "Unknown Key";
>+        case KEY_UNKNOWN:
>+            return "Unknown";
>+        case KEY_A:
>+            return "A";
>+        case KEY_B:
>+            return "B";
>+        case KEY_C:
>+            return "C";
>+        case KEY_D:
>+            return "D";
>+        case KEY_E:
>+            return "E";
>+        case KEY_F:
>+            return "F";
>+        case KEY_G:
>+            return "G";
>+        case KEY_H:
>+            return "H";
>+        case KEY_I:
>+            return "I";
>+        case KEY_J:
>+            return "J";
>+        case KEY_K:
>+            return "K";
>+        case KEY_L:
>+            return "L";
>+        case KEY_M:
>+            return "M";
>+        case KEY_N:
>+            return "N";
>+        case KEY_O:
>+            return "O";
>+        case KEY_P:
>+            return "P";
>+        case KEY_Q:
>+            return "Q";
>+        case KEY_R:
>+            return "R";
>+        case KEY_S:
>+            return "S";
>+        case KEY_T:
>+            return "T";
>+        case KEY_U:
>+            return "U";
>+        case KEY_V:
>+            return "V";
>+        case KEY_W:
>+            return "W";
>+        case KEY_X:
>+            return "X";
>+        case KEY_Y:
>+            return "Y";
>+        case KEY_Z:
>+            return "Z";
>+        case KEY_NUM0:
>+            return "Num0";
>+        case KEY_NUM1:
>+            return "Num1";
>+        case KEY_NUM2:
>+            return "Num2";
>+        case KEY_NUM3:
>+            return "Num3";
>+        case KEY_NUM4:
>+            return "Num4";
>+        case KEY_NUM5:
>+            return "Num5";
>+        case KEY_NUM6:
>+            return "Num6";
>+        case KEY_NUM7:
>+            return "Num7";
>+        case KEY_NUM8:
>+            return "Num8";
>+        case KEY_NUM9:
>+            return "Num9";
>+        case KEY_ESCAPE:
>+            return "Escape";
>+        case KEY_LCONTROL:
>+            return "Left Control";
>+        case KEY_LSHIFT:
>+            return "Left Shift";
>+        case KEY_LALT:
>+            return "Left Alt";
>+        case KEY_LSYSTEM:
>+            return "Left System";
>+        case KEY_RCONTROL:
>+            return "Right Control";
>+        case KEY_RSHIFT:
>+            return "Right Shift";
>+        case KEY_RALT:
>+            return "Right Alt";
>+        case KEY_RSYSTEM:
>+            return "Right System";
>+        case KEY_MENU:
>+            return "Menu";
>+        case KEY_LBRACKET:
>+            return "Left Bracket";
>+        case KEY_RBRACKET:
>+            return "Right Bracket";
>+        case KEY_SEMICOLON:
>+            return "Semicolon";
>+        case KEY_COMMA:
>+            return "Comma";
>+        case KEY_PERIOD:
>+            return "Period";
>+        case KEY_QUOTE:
>+            return "Quote";
>+        case KEY_SLASH:
>+            return "Slash";
>+        case KEY_BACKSLASH:
>+            return "Backslash";
>+        case KEY_TILDE:
>+            return "Tilde";
>+        case KEY_EQUAL:
>+            return "Equal";
>+        case KEY_DASH:
>+            return "Dash";
>+        case KEY_SPACE:
>+            return "Space";
>+        case KEY_RETURN:
>+            return "Return";
>+        case KEY_BACK:
>+            return "Back";
>+        case KEY_TAB:
>+            return "Tab";
>+        case KEY_PAGEUP:
>+            return "Page Up";
>+        case KEY_PAGEDOWN:
>+            return "Page Down";
>+        case KEY_END:
>+            return "End";
>+        case KEY_HOME:
>+            return "Home";
>+        case KEY_INSERT:
>+            return "Insert";
>+        case KEY_DELETE:
>+            return "Delete";
>+        case KEY_ADD:
>+            return "Add";
>+        case KEY_SUBTRACT:
>+            return "Substract";
>+        case KEY_MULTIPLY:
>+            return "Multiply";
>+        case KEY_DIVIDE:
>+            return "Divide";
>+        case KEY_LEFT:
>+            return "Left";
>+        case KEY_RIGHT:
>+            return "Right";
>+        case KEY_UP:
>+            return "Up";
>+        case KEY_DOWN:
>+            return "Down";
>+        case KEY_NUMPAD0:
>+            return "Numpad 0";
>+        case KEY_NUMPAD1:
>+            return "Numpad 1";
>+        case KEY_NUMPAD2:
>+            return "Numpad 2";
>+        case KEY_NUMPAD3:
>+            return "Numpad 3";
>+        case KEY_NUMPAD4:
>+            return "Numpad 4";
>+        case KEY_NUMPAD5:
>+            return "Numpad 5";
>+        case KEY_NUMPAD6:
>+            return "Numpad 6";
>+        case KEY_NUMPAD7:
>+            return "Numpad 7";
>+        case KEY_NUMPAD8:
>+            return "Numpad 8";
>+        case KEY_NUMPAD9:
>+            return "Numpad 9";
>+        case KEY_F1:
>+            return "F1";
>+        case KEY_F2:
>+            return "F2";
>+        case KEY_F3:
>+            return "F3";
>+        case KEY_F4:
>+            return "F4";
>+        case KEY_F5:
>+            return "F5";
>+        case KEY_F6:
>+            return "F6";
>+        case KEY_F7:
>+            return "F7";
>+        case KEY_F8:
>+            return "F8";
>+        case KEY_F9:
>+            return "F9";
>+        case KEY_F10:
>+            return "F10";
>+        case KEY_F11:
>+            return "F11";
>+        case KEY_F12:
>+            return "F12";
>+        case KEY_F13:
>+            return "F13";
>+        case KEY_F14:
>+            return "F14";
>+        case KEY_F15:
>+            return "F15";
>+        case KEY_PAUSE:
>+            return "Pause";
>+        default:
>+            return "Unknown Key";
>     }
> }
> 
>@@ -178,78 +281,75 @@ static std::string KeyState(const Event::KeyEvent &event)
>     return "";
> }
> 
>-static void PrintEvent(const Event& event)
>+static void PrintEvent(const Event &event)
> {
>     switch (event.Type)
>     {
>-      case Event::EVENT_CLOSED:
>-        std::cout << "Event: Window Closed" << std::endl;
>-        break;
>-      case Event::EVENT_MOVED:
>-        std::cout << "Event: Window Moved (" << event.Move.X
>-                  << ", " << event.Move.Y << ")" << std::endl;
>-        break;
>-      case Event::EVENT_RESIZED:
>-        std::cout << "Event: Window Resized (" << event.Size.Width
>-                  << ", " << event.Size.Height << ")" << std::endl;
>-        break;
>-      case Event::EVENT_LOST_FOCUS:
>-        std::cout << "Event: Window Lost Focus" << std::endl;
>-        break;
>-      case Event::EVENT_GAINED_FOCUS:
>-        std::cout << "Event: Window Gained Focus" << std::endl;
>-        break;
>-      case Event::EVENT_TEXT_ENTERED:
>-        // TODO(cwallez) show the character
>-        std::cout << "Event: Text Entered" << std::endl;
>-        break;
>-      case Event::EVENT_KEY_PRESSED:
>-        std::cout << "Event: Key Pressed (" << KeyName(event.Key.Code) << KeyState(event.Key) << ")" << std::endl;
>-        break;
>-      case Event::EVENT_KEY_RELEASED:
>-        std::cout << "Event: Key Released (" << KeyName(event.Key.Code) << KeyState(event.Key) << ")" << std::endl;
>-        break;
>-      case Event::EVENT_MOUSE_WHEEL_MOVED:
>-        std::cout << "Event: Mouse Wheel (" << event.MouseWheel.Delta << ")" << std::endl;
>-        break;
>-      case Event::EVENT_MOUSE_BUTTON_PRESSED:
>-        std::cout << "Event: Mouse Button Pressed " << MouseButtonName(event.MouseButton.Button) <<
>-                  " at (" << event.MouseButton.X << ", " << event.MouseButton.Y << ")" << std::endl;
>-        break;
>-      case Event::EVENT_MOUSE_BUTTON_RELEASED:
>-        std::cout << "Event: Mouse Button Released " << MouseButtonName(event.MouseButton.Button) <<
>-                  " at (" << event.MouseButton.X << ", " << event.MouseButton.Y << ")" << std::endl;
>-        break;
>-      case Event::EVENT_MOUSE_MOVED:
>-        std::cout << "Event: Mouse Moved (" << event.MouseMove.X
>-                  << ", " << event.MouseMove.Y << ")" << std::endl;
>-        break;
>-      case Event::EVENT_MOUSE_ENTERED:
>-        std::cout << "Event: Mouse Entered Window" << std::endl;
>-        break;
>-      case Event::EVENT_MOUSE_LEFT:
>-        std::cout << "Event: Mouse Left Window" << std::endl;
>-        break;
>-      case Event::EVENT_TEST:
>-        std::cout << "Event: Test" << std::endl;
>-        break;
>-      default:
>-        UNREACHABLE();
>-        break;
>+        case Event::EVENT_CLOSED:
>+            std::cout << "Event: Window Closed" << std::endl;
>+            break;
>+        case Event::EVENT_MOVED:
>+            std::cout << "Event: Window Moved (" << event.Move.X << ", " << event.Move.Y << ")"
>+                      << std::endl;
>+            break;
>+        case Event::EVENT_RESIZED:
>+            std::cout << "Event: Window Resized (" << event.Size.Width << ", " << event.Size.Height
>+                      << ")" << std::endl;
>+            break;
>+        case Event::EVENT_LOST_FOCUS:
>+            std::cout << "Event: Window Lost Focus" << std::endl;
>+            break;
>+        case Event::EVENT_GAINED_FOCUS:
>+            std::cout << "Event: Window Gained Focus" << std::endl;
>+            break;
>+        case Event::EVENT_TEXT_ENTERED:
>+            // TODO(cwallez) show the character
>+            std::cout << "Event: Text Entered" << std::endl;
>+            break;
>+        case Event::EVENT_KEY_PRESSED:
>+            std::cout << "Event: Key Pressed (" << KeyName(event.Key.Code) << KeyState(event.Key)
>+                      << ")" << std::endl;
>+            break;
>+        case Event::EVENT_KEY_RELEASED:
>+            std::cout << "Event: Key Released (" << KeyName(event.Key.Code) << KeyState(event.Key)
>+                      << ")" << std::endl;
>+            break;
>+        case Event::EVENT_MOUSE_WHEEL_MOVED:
>+            std::cout << "Event: Mouse Wheel (" << event.MouseWheel.Delta << ")" << std::endl;
>+            break;
>+        case Event::EVENT_MOUSE_BUTTON_PRESSED:
>+            std::cout << "Event: Mouse Button Pressed " << MouseButtonName(event.MouseButton.Button)
>+                      << " at (" << event.MouseButton.X << ", " << event.MouseButton.Y << ")"
>+                      << std::endl;
>+            break;
>+        case Event::EVENT_MOUSE_BUTTON_RELEASED:
>+            std::cout << "Event: Mouse Button Released "
>+                      << MouseButtonName(event.MouseButton.Button) << " at (" << event.MouseButton.X
>+                      << ", " << event.MouseButton.Y << ")" << std::endl;
>+            break;
>+        case Event::EVENT_MOUSE_MOVED:
>+            std::cout << "Event: Mouse Moved (" << event.MouseMove.X << ", " << event.MouseMove.Y
>+                      << ")" << std::endl;
>+            break;
>+        case Event::EVENT_MOUSE_ENTERED:
>+            std::cout << "Event: Mouse Entered Window" << std::endl;
>+            break;
>+        case Event::EVENT_MOUSE_LEFT:
>+            std::cout << "Event: Mouse Left Window" << std::endl;
>+            break;
>+        case Event::EVENT_TEST:
>+            std::cout << "Event: Test" << std::endl;
>+            break;
>+        default:
>+            UNREACHABLE();
>+            break;
>     }
> }
> #endif
> 
>-OSWindow::OSWindow()
>-    : mX(0),
>-      mY(0),
>-      mWidth(0),
>-      mHeight(0)
>-{
>-}
>+OSWindow::OSWindow() : mX(0), mY(0), mWidth(0), mHeight(0) {}
> 
>-OSWindow::~OSWindow()
>-{}
>+OSWindow::~OSWindow() {}
> 
> int OSWindow::getX() const
> {
>@@ -294,16 +394,16 @@ void OSWindow::pushEvent(Event event)
> {
>     switch (event.Type)
>     {
>-      case Event::EVENT_MOVED:
>-        mX = event.Move.X;
>-        mY = event.Move.Y;
>-        break;
>-      case Event::EVENT_RESIZED:
>-        mWidth = event.Size.Width;
>-        mHeight = event.Size.Height;
>-        break;
>-      default:
>-        break;
>+        case Event::EVENT_MOVED:
>+            mX = event.Move.X;
>+            mY = event.Move.Y;
>+            break;
>+        case Event::EVENT_RESIZED:
>+            mWidth  = event.Size.Width;
>+            mHeight = event.Size.Height;
>+            break;
>+        default:
>+            break;
>     }
> 
>     mEvents.push_back(event);
>@@ -326,3 +426,10 @@ bool OSWindow::didTestEventFire()
> 
>     return false;
> }
>+
>+// static
>+void OSWindow::Delete(OSWindow **window)
>+{
>+    delete *window;
>+    *window = nullptr;
>+}
>diff --git a/Source/ThirdParty/ANGLE/util/OSWindow.h b/Source/ThirdParty/ANGLE/util/OSWindow.h
>index 467179235a5..3cdb458ca67 100644
>--- a/Source/ThirdParty/ANGLE/util/OSWindow.h
>+++ b/Source/ThirdParty/ANGLE/util/OSWindow.h
>@@ -3,28 +3,30 @@
> // Use of this source code is governed by a BSD-style license that can be
> // found in the LICENSE file.
> //
>+// OSWindow:
>+//   Operating system window integration base class.
> 
>-#ifndef SAMPLE_UTIL_WINDOW_H
>-#define SAMPLE_UTIL_WINDOW_H
>+#ifndef UTIL_OSWINDOW_H_
>+#define UTIL_OSWINDOW_H_
> 
>-#include <list>
> #include <stdint.h>
>+#include <list>
> #include <string>
> 
>-#include <export.h>
> #include <EGL/egl.h>
> #include <EGL/eglext.h>
> 
>-#include "Event.h"
>+#include "util/Event.h"
>+#include "util/util_export.h"
> 
>-class ANGLE_EXPORT OSWindow
>+class ANGLE_UTIL_EXPORT OSWindow
> {
>   public:
>-    OSWindow();
>-    virtual ~OSWindow();
>+    static OSWindow *New();
>+    static void Delete(OSWindow **osWindow);
> 
>     virtual bool initialize(const std::string &name, size_t width, size_t height) = 0;
>-    virtual void destroy() = 0;
>+    virtual void destroy()                                                        = 0;
> 
>     int getX() const;
>     int getY() const;
>@@ -37,7 +39,13 @@ class ANGLE_EXPORT OSWindow
>     // just grab the pixels of the window. Returns if it was successful.
>     virtual bool takeScreenshot(uint8_t *pixelData);
> 
>-    virtual EGLNativeWindowType getNativeWindow() const = 0;
>+    // Re-initializes the native window. This is used on platforms which do not
>+    // have a reusable EGLNativeWindowType in order to recreate it, and is
>+    // needed by the test suite because it re-uses the same OSWindow for
>+    // multiple EGLSurfaces.
>+    virtual void resetNativeWindow() = 0;
>+
>+    virtual EGLNativeWindowType getNativeWindow() const   = 0;
>     virtual EGLNativeDisplayType getNativeDisplay() const = 0;
> 
>     virtual void messageLoop() = 0;
>@@ -46,9 +54,9 @@ class ANGLE_EXPORT OSWindow
>     virtual void pushEvent(Event event);
> 
>     virtual void setMousePosition(int x, int y) = 0;
>-    virtual bool setPosition(int x, int y) = 0;
>-    virtual bool resize(int width, int height) = 0;
>-    virtual void setVisible(bool isVisible) = 0;
>+    virtual bool setPosition(int x, int y)      = 0;
>+    virtual bool resize(int width, int height)  = 0;
>+    virtual void setVisible(bool isVisible)     = 0;
> 
>     virtual void signalTestEvent() = 0;
> 
>@@ -56,6 +64,10 @@ class ANGLE_EXPORT OSWindow
>     bool didTestEventFire();
> 
>   protected:
>+    OSWindow();
>+    virtual ~OSWindow();
>+    friend ANGLE_UTIL_EXPORT void FreeOSWindow(OSWindow *window);
>+
>     int mX;
>     int mY;
>     int mWidth;
>@@ -64,6 +76,4 @@ class ANGLE_EXPORT OSWindow
>     std::list<Event> mEvents;
> };
> 
>-ANGLE_EXPORT OSWindow *CreateOSWindow();
>-
>-#endif // SAMPLE_UTIL_WINDOW_H
>+#endif  // UTIL_OSWINDOW_H_
>diff --git a/Source/ThirdParty/ANGLE/util/Timer.h b/Source/ThirdParty/ANGLE/util/Timer.h
>index b563131e396..8a1f393048f 100644
>--- a/Source/ThirdParty/ANGLE/util/Timer.h
>+++ b/Source/ThirdParty/ANGLE/util/Timer.h
>@@ -7,17 +7,25 @@
> #ifndef SAMPLE_UTIL_TIMER_H
> #define SAMPLE_UTIL_TIMER_H
> 
>-#include <export.h>
>+#include "util/util_export.h"
> 
>-class ANGLE_EXPORT Timer
>+class ANGLE_UTIL_EXPORT Timer
> {
>   public:
>     virtual ~Timer() {}
>-    virtual void start() = 0;
>-    virtual void stop() = 0;
>+
>+    // Timer functionality: Use start() and stop() to record the duration and use getElapsedTime()
>+    // to query that duration.  If getElapsedTime() is called in between, it will report the elapsed
>+    // time since start().
>+    virtual void start()                  = 0;
>+    virtual void stop()                   = 0;
>     virtual double getElapsedTime() const = 0;
>+
>+    // Timestamp functionality: Use getAbsoluteTime() to get an absolute time with an unknown
>+    // origin. This time moves forward regardless of start()/stop().
>+    virtual double getAbsoluteTime() = 0;
> };
> 
>-ANGLE_EXPORT Timer *CreateTimer();
>+ANGLE_UTIL_EXPORT Timer *CreateTimer();
> 
>-#endif // SAMPLE_UTIL_TIMER_H
>+#endif  // SAMPLE_UTIL_TIMER_H
>diff --git a/Source/ThirdParty/ANGLE/util/android/AndroidPixmap.cpp b/Source/ThirdParty/ANGLE/util/android/AndroidPixmap.cpp
>index 077ebb58817..88223536c47 100644
>--- a/Source/ThirdParty/ANGLE/util/android/AndroidPixmap.cpp
>+++ b/Source/ThirdParty/ANGLE/util/android/AndroidPixmap.cpp
>@@ -6,7 +6,7 @@
> 
> // AndroidPixmap.cpp: Implementation of OSPixmap for Android
> 
>-#include "OSPixmap.h"
>+#include "util/OSPixmap.h"
> 
> OSPixmap *CreateOSPixmap()
> {
>diff --git a/Source/ThirdParty/ANGLE/util/android/AndroidWindow.cpp b/Source/ThirdParty/ANGLE/util/android/AndroidWindow.cpp
>index e759cda55a6..ec6df6b1d3a 100644
>--- a/Source/ThirdParty/ANGLE/util/android/AndroidWindow.cpp
>+++ b/Source/ThirdParty/ANGLE/util/android/AndroidWindow.cpp
>@@ -6,36 +6,32 @@
> 
> // AndroidWindow.cpp: Implementation of OSWindow for Android
> 
>-#include "android/AndroidWindow.h"
>+#include "util/android/AndroidWindow.h"
> 
> #include <pthread.h>
> 
>-#include "android/third_party/android_native_app_glue.h"
> #include "common/debug.h"
>+#include "util/android/third_party/android_native_app_glue.h"
> 
> namespace
> {
>-    struct android_app *sApp = nullptr;
>-    pthread_mutex_t sInitWindowMutex;
>-    pthread_cond_t sInitWindowCond;
>-    bool sInitWindowDone = false;
>+struct android_app *sApp = nullptr;
>+pthread_mutex_t sInitWindowMutex;
>+pthread_cond_t sInitWindowCond;
>+bool sInitWindowDone = false;
> }  // namespace
> 
>-AndroidWindow::AndroidWindow()
>-{
>-}
>+AndroidWindow::AndroidWindow() {}
> 
>-AndroidWindow::~AndroidWindow()
>-{
>-}
>+AndroidWindow::~AndroidWindow() {}
> 
> bool AndroidWindow::initialize(const std::string &name, size_t width, size_t height)
> {
>     return resize(width, height);
> }
>-void AndroidWindow::destroy()
>-{
>-}
>+void AndroidWindow::destroy() {}
>+
>+void AndroidWindow::resetNativeWindow() {}
> 
> EGLNativeWindowType AndroidWindow::getNativeWindow() const
> {
>@@ -68,7 +64,7 @@ bool AndroidWindow::setPosition(int x, int y)
> 
> bool AndroidWindow::resize(int width, int height)
> {
>-    mWidth = width;
>+    mWidth  = width;
>     mHeight = height;
> 
>     // sApp->window used below is valid only after Activity Surface is created
>@@ -85,25 +81,13 @@ bool AndroidWindow::resize(int width, int height)
>     return err == 0;
> }
> 
>-void AndroidWindow::setVisible(bool isVisible)
>-{
>-}
>+void AndroidWindow::setVisible(bool isVisible) {}
> 
> void AndroidWindow::signalTestEvent()
> {
>     UNIMPLEMENTED();
> }
> 
>-OSWindow *CreateOSWindow()
>-{
>-    // There should be only one live instance of AndroidWindow at a time,
>-    // as there is only one Activity Surface behind it.
>-    // Creating a new AndroidWindow each time works for ANGLETest,
>-    // as it destroys an old window before creating a new one.
>-    // TODO: use GLSurfaceView to support multiple windows
>-    return new AndroidWindow();
>-}
>-
> static void onAppCmd(struct android_app *app, int32_t cmd)
> {
>     switch (cmd)
>@@ -114,11 +98,11 @@ static void onAppCmd(struct android_app *app, int32_t cmd)
>             pthread_cond_broadcast(&sInitWindowCond);
>             pthread_mutex_unlock(&sInitWindowMutex);
>             break;
>-        // TODO: process other commands and pass them to AndroidWindow for handling
>-        // TODO: figure out how to handle APP_CMD_PAUSE,
>-        // which should immediately halt all the rendering,
>-        // since Activity Surface is no longer available.
>-        // Currently tests crash when paused, for example, due to device changing orientation
>+            // TODO: process other commands and pass them to AndroidWindow for handling
>+            // TODO: figure out how to handle APP_CMD_PAUSE,
>+            // which should immediately halt all the rendering,
>+            // since Activity Surface is no longer available.
>+            // Currently tests crash when paused, for example, due to device changing orientation
>     }
> }
> 
>@@ -138,7 +122,7 @@ void android_main(struct android_app *app)
>     pthread_cond_init(&sInitWindowCond, nullptr);
> 
>     // Event handlers, invoked from source->process()
>-    app->onAppCmd = onAppCmd;
>+    app->onAppCmd     = onAppCmd;
>     app->onInputEvent = onInputEvent;
> 
>     // Message loop, polling for events indefinitely (due to -1 timeout)
>@@ -152,3 +136,14 @@ void android_main(struct android_app *app)
>         }
>     }
> }
>+
>+// static
>+OSWindow *OSWindow::New()
>+{
>+    // There should be only one live instance of AndroidWindow at a time,
>+    // as there is only one Activity Surface behind it.
>+    // Creating a new AndroidWindow each time works for ANGLETest,
>+    // as it destroys an old window before creating a new one.
>+    // TODO: use GLSurfaceView to support multiple windows
>+    return new AndroidWindow();
>+}
>diff --git a/Source/ThirdParty/ANGLE/util/android/AndroidWindow.h b/Source/ThirdParty/ANGLE/util/android/AndroidWindow.h
>index d6600575738..fc6592db26c 100644
>--- a/Source/ThirdParty/ANGLE/util/android/AndroidWindow.h
>+++ b/Source/ThirdParty/ANGLE/util/android/AndroidWindow.h
>@@ -9,7 +9,7 @@
> #ifndef UTIL_ANDROID_WINDOW_H_
> #define UTIL_ANDROID_WINDOW_H_
> 
>-#include "OSWindow.h"
>+#include "util/OSWindow.h"
> 
> class AndroidWindow : public OSWindow
> {
>@@ -20,6 +20,7 @@ class AndroidWindow : public OSWindow
>     bool initialize(const std::string &name, size_t width, size_t height) override;
>     void destroy() override;
> 
>+    void resetNativeWindow() override;
>     EGLNativeWindowType getNativeWindow() const override;
>     EGLNativeDisplayType getNativeDisplay() const override;
> 
>diff --git a/Source/ThirdParty/ANGLE/util/egl_loader_autogen.cpp b/Source/ThirdParty/ANGLE/util/egl_loader_autogen.cpp
>new file mode 100644
>index 00000000000..97f512aab3d
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/util/egl_loader_autogen.cpp
>@@ -0,0 +1,253 @@
>+// GENERATED FILE - DO NOT EDIT.
>+// Generated by generate_loader.py using data from egl.xml and egl_angle_ext.xml.
>+//
>+// Copyright 2019 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// egl_loader_autogen.cpp:
>+//   Simple EGL function loader.
>+
>+#include "egl_loader_autogen.h"
>+
>+ANGLE_UTIL_EXPORT PFNEGLCHOOSECONFIGPROC eglChooseConfig;
>+ANGLE_UTIL_EXPORT PFNEGLCOPYBUFFERSPROC eglCopyBuffers;
>+ANGLE_UTIL_EXPORT PFNEGLCREATECONTEXTPROC eglCreateContext;
>+ANGLE_UTIL_EXPORT PFNEGLCREATEPBUFFERSURFACEPROC eglCreatePbufferSurface;
>+ANGLE_UTIL_EXPORT PFNEGLCREATEPIXMAPSURFACEPROC eglCreatePixmapSurface;
>+ANGLE_UTIL_EXPORT PFNEGLCREATEWINDOWSURFACEPROC eglCreateWindowSurface;
>+ANGLE_UTIL_EXPORT PFNEGLDESTROYCONTEXTPROC eglDestroyContext;
>+ANGLE_UTIL_EXPORT PFNEGLDESTROYSURFACEPROC eglDestroySurface;
>+ANGLE_UTIL_EXPORT PFNEGLGETCONFIGATTRIBPROC eglGetConfigAttrib;
>+ANGLE_UTIL_EXPORT PFNEGLGETCONFIGSPROC eglGetConfigs;
>+ANGLE_UTIL_EXPORT PFNEGLGETCURRENTDISPLAYPROC eglGetCurrentDisplay;
>+ANGLE_UTIL_EXPORT PFNEGLGETCURRENTSURFACEPROC eglGetCurrentSurface;
>+ANGLE_UTIL_EXPORT PFNEGLGETDISPLAYPROC eglGetDisplay;
>+ANGLE_UTIL_EXPORT PFNEGLGETERRORPROC eglGetError;
>+ANGLE_UTIL_EXPORT PFNEGLGETPROCADDRESSPROC eglGetProcAddress;
>+ANGLE_UTIL_EXPORT PFNEGLINITIALIZEPROC eglInitialize;
>+ANGLE_UTIL_EXPORT PFNEGLMAKECURRENTPROC eglMakeCurrent;
>+ANGLE_UTIL_EXPORT PFNEGLQUERYCONTEXTPROC eglQueryContext;
>+ANGLE_UTIL_EXPORT PFNEGLQUERYSTRINGPROC eglQueryString;
>+ANGLE_UTIL_EXPORT PFNEGLQUERYSURFACEPROC eglQuerySurface;
>+ANGLE_UTIL_EXPORT PFNEGLSWAPBUFFERSPROC eglSwapBuffers;
>+ANGLE_UTIL_EXPORT PFNEGLTERMINATEPROC eglTerminate;
>+ANGLE_UTIL_EXPORT PFNEGLWAITGLPROC eglWaitGL;
>+ANGLE_UTIL_EXPORT PFNEGLWAITNATIVEPROC eglWaitNative;
>+ANGLE_UTIL_EXPORT PFNEGLBINDTEXIMAGEPROC eglBindTexImage;
>+ANGLE_UTIL_EXPORT PFNEGLRELEASETEXIMAGEPROC eglReleaseTexImage;
>+ANGLE_UTIL_EXPORT PFNEGLSURFACEATTRIBPROC eglSurfaceAttrib;
>+ANGLE_UTIL_EXPORT PFNEGLSWAPINTERVALPROC eglSwapInterval;
>+ANGLE_UTIL_EXPORT PFNEGLBINDAPIPROC eglBindAPI;
>+ANGLE_UTIL_EXPORT PFNEGLQUERYAPIPROC eglQueryAPI;
>+ANGLE_UTIL_EXPORT PFNEGLCREATEPBUFFERFROMCLIENTBUFFERPROC eglCreatePbufferFromClientBuffer;
>+ANGLE_UTIL_EXPORT PFNEGLRELEASETHREADPROC eglReleaseThread;
>+ANGLE_UTIL_EXPORT PFNEGLWAITCLIENTPROC eglWaitClient;
>+ANGLE_UTIL_EXPORT PFNEGLGETCURRENTCONTEXTPROC eglGetCurrentContext;
>+ANGLE_UTIL_EXPORT PFNEGLCREATESYNCPROC eglCreateSync;
>+ANGLE_UTIL_EXPORT PFNEGLDESTROYSYNCPROC eglDestroySync;
>+ANGLE_UTIL_EXPORT PFNEGLCLIENTWAITSYNCPROC eglClientWaitSync;
>+ANGLE_UTIL_EXPORT PFNEGLGETSYNCATTRIBPROC eglGetSyncAttrib;
>+ANGLE_UTIL_EXPORT PFNEGLCREATEIMAGEPROC eglCreateImage;
>+ANGLE_UTIL_EXPORT PFNEGLDESTROYIMAGEPROC eglDestroyImage;
>+ANGLE_UTIL_EXPORT PFNEGLGETPLATFORMDISPLAYPROC eglGetPlatformDisplay;
>+ANGLE_UTIL_EXPORT PFNEGLCREATEPLATFORMWINDOWSURFACEPROC eglCreatePlatformWindowSurface;
>+ANGLE_UTIL_EXPORT PFNEGLCREATEPLATFORMPIXMAPSURFACEPROC eglCreatePlatformPixmapSurface;
>+ANGLE_UTIL_EXPORT PFNEGLWAITSYNCPROC eglWaitSync;
>+ANGLE_UTIL_EXPORT PFNEGLSETBLOBCACHEFUNCSANDROIDPROC eglSetBlobCacheFuncsANDROID;
>+ANGLE_UTIL_EXPORT PFNEGLGETCOMPOSITORTIMINGANDROIDPROC eglGetCompositorTimingANDROID;
>+ANGLE_UTIL_EXPORT PFNEGLGETCOMPOSITORTIMINGSUPPORTEDANDROIDPROC
>+    eglGetCompositorTimingSupportedANDROID;
>+ANGLE_UTIL_EXPORT PFNEGLGETFRAMETIMESTAMPSUPPORTEDANDROIDPROC eglGetFrameTimestampSupportedANDROID;
>+ANGLE_UTIL_EXPORT PFNEGLGETFRAMETIMESTAMPSANDROIDPROC eglGetFrameTimestampsANDROID;
>+ANGLE_UTIL_EXPORT PFNEGLGETNEXTFRAMEIDANDROIDPROC eglGetNextFrameIdANDROID;
>+ANGLE_UTIL_EXPORT PFNEGLPRESENTATIONTIMEANDROIDPROC eglPresentationTimeANDROID;
>+ANGLE_UTIL_EXPORT PFNEGLCREATEDEVICEANGLEPROC eglCreateDeviceANGLE;
>+ANGLE_UTIL_EXPORT PFNEGLRELEASEDEVICEANGLEPROC eglReleaseDeviceANGLE;
>+ANGLE_UTIL_EXPORT PFNEGLPROGRAMCACHEGETATTRIBANGLEPROC eglProgramCacheGetAttribANGLE;
>+ANGLE_UTIL_EXPORT PFNEGLPROGRAMCACHEPOPULATEANGLEPROC eglProgramCachePopulateANGLE;
>+ANGLE_UTIL_EXPORT PFNEGLPROGRAMCACHEQUERYANGLEPROC eglProgramCacheQueryANGLE;
>+ANGLE_UTIL_EXPORT PFNEGLPROGRAMCACHERESIZEANGLEPROC eglProgramCacheResizeANGLE;
>+ANGLE_UTIL_EXPORT PFNEGLQUERYSURFACEPOINTERANGLEPROC eglQuerySurfacePointerANGLE;
>+ANGLE_UTIL_EXPORT PFNEGLCREATESTREAMPRODUCERD3DTEXTUREANGLEPROC
>+    eglCreateStreamProducerD3DTextureANGLE;
>+ANGLE_UTIL_EXPORT PFNEGLSTREAMPOSTD3DTEXTUREANGLEPROC eglStreamPostD3DTextureANGLE;
>+ANGLE_UTIL_EXPORT PFNEGLGETSYNCVALUESCHROMIUMPROC eglGetSyncValuesCHROMIUM;
>+ANGLE_UTIL_EXPORT PFNEGLQUERYDEVICEATTRIBEXTPROC eglQueryDeviceAttribEXT;
>+ANGLE_UTIL_EXPORT PFNEGLQUERYDEVICESTRINGEXTPROC eglQueryDeviceStringEXT;
>+ANGLE_UTIL_EXPORT PFNEGLQUERYDISPLAYATTRIBEXTPROC eglQueryDisplayAttribEXT;
>+ANGLE_UTIL_EXPORT PFNEGLCREATEPLATFORMPIXMAPSURFACEEXTPROC eglCreatePlatformPixmapSurfaceEXT;
>+ANGLE_UTIL_EXPORT PFNEGLCREATEPLATFORMWINDOWSURFACEEXTPROC eglCreatePlatformWindowSurfaceEXT;
>+ANGLE_UTIL_EXPORT PFNEGLGETPLATFORMDISPLAYEXTPROC eglGetPlatformDisplayEXT;
>+ANGLE_UTIL_EXPORT PFNEGLDEBUGMESSAGECONTROLKHRPROC eglDebugMessageControlKHR;
>+ANGLE_UTIL_EXPORT PFNEGLLABELOBJECTKHRPROC eglLabelObjectKHR;
>+ANGLE_UTIL_EXPORT PFNEGLQUERYDEBUGKHRPROC eglQueryDebugKHR;
>+ANGLE_UTIL_EXPORT PFNEGLCLIENTWAITSYNCKHRPROC eglClientWaitSyncKHR;
>+ANGLE_UTIL_EXPORT PFNEGLCREATESYNCKHRPROC eglCreateSyncKHR;
>+ANGLE_UTIL_EXPORT PFNEGLDESTROYSYNCKHRPROC eglDestroySyncKHR;
>+ANGLE_UTIL_EXPORT PFNEGLGETSYNCATTRIBKHRPROC eglGetSyncAttribKHR;
>+ANGLE_UTIL_EXPORT PFNEGLCREATEIMAGEKHRPROC eglCreateImageKHR;
>+ANGLE_UTIL_EXPORT PFNEGLDESTROYIMAGEKHRPROC eglDestroyImageKHR;
>+ANGLE_UTIL_EXPORT PFNEGLCREATESTREAMKHRPROC eglCreateStreamKHR;
>+ANGLE_UTIL_EXPORT PFNEGLDESTROYSTREAMKHRPROC eglDestroyStreamKHR;
>+ANGLE_UTIL_EXPORT PFNEGLQUERYSTREAMKHRPROC eglQueryStreamKHR;
>+ANGLE_UTIL_EXPORT PFNEGLQUERYSTREAMU64KHRPROC eglQueryStreamu64KHR;
>+ANGLE_UTIL_EXPORT PFNEGLSTREAMATTRIBKHRPROC eglStreamAttribKHR;
>+ANGLE_UTIL_EXPORT PFNEGLSTREAMCONSUMERACQUIREKHRPROC eglStreamConsumerAcquireKHR;
>+ANGLE_UTIL_EXPORT PFNEGLSTREAMCONSUMERGLTEXTUREEXTERNALKHRPROC
>+    eglStreamConsumerGLTextureExternalKHR;
>+ANGLE_UTIL_EXPORT PFNEGLSTREAMCONSUMERRELEASEKHRPROC eglStreamConsumerReleaseKHR;
>+ANGLE_UTIL_EXPORT PFNEGLSWAPBUFFERSWITHDAMAGEKHRPROC eglSwapBuffersWithDamageKHR;
>+ANGLE_UTIL_EXPORT PFNEGLWAITSYNCKHRPROC eglWaitSyncKHR;
>+ANGLE_UTIL_EXPORT PFNEGLPOSTSUBBUFFERNVPROC eglPostSubBufferNV;
>+ANGLE_UTIL_EXPORT PFNEGLSTREAMCONSUMERGLTEXTUREEXTERNALATTRIBSNVPROC
>+    eglStreamConsumerGLTextureExternalAttribsNV;
>+
>+namespace angle
>+{
>+void LoadEGL(LoadProc loadProc)
>+{
>+    eglChooseConfig  = reinterpret_cast<PFNEGLCHOOSECONFIGPROC>(loadProc("eglChooseConfig"));
>+    eglCopyBuffers   = reinterpret_cast<PFNEGLCOPYBUFFERSPROC>(loadProc("eglCopyBuffers"));
>+    eglCreateContext = reinterpret_cast<PFNEGLCREATECONTEXTPROC>(loadProc("eglCreateContext"));
>+    eglCreatePbufferSurface =
>+        reinterpret_cast<PFNEGLCREATEPBUFFERSURFACEPROC>(loadProc("eglCreatePbufferSurface"));
>+    eglCreatePixmapSurface =
>+        reinterpret_cast<PFNEGLCREATEPIXMAPSURFACEPROC>(loadProc("eglCreatePixmapSurface"));
>+    eglCreateWindowSurface =
>+        reinterpret_cast<PFNEGLCREATEWINDOWSURFACEPROC>(loadProc("eglCreateWindowSurface"));
>+    eglDestroyContext = reinterpret_cast<PFNEGLDESTROYCONTEXTPROC>(loadProc("eglDestroyContext"));
>+    eglDestroySurface = reinterpret_cast<PFNEGLDESTROYSURFACEPROC>(loadProc("eglDestroySurface"));
>+    eglGetConfigAttrib =
>+        reinterpret_cast<PFNEGLGETCONFIGATTRIBPROC>(loadProc("eglGetConfigAttrib"));
>+    eglGetConfigs = reinterpret_cast<PFNEGLGETCONFIGSPROC>(loadProc("eglGetConfigs"));
>+    eglGetCurrentDisplay =
>+        reinterpret_cast<PFNEGLGETCURRENTDISPLAYPROC>(loadProc("eglGetCurrentDisplay"));
>+    eglGetCurrentSurface =
>+        reinterpret_cast<PFNEGLGETCURRENTSURFACEPROC>(loadProc("eglGetCurrentSurface"));
>+    eglGetDisplay     = reinterpret_cast<PFNEGLGETDISPLAYPROC>(loadProc("eglGetDisplay"));
>+    eglGetError       = reinterpret_cast<PFNEGLGETERRORPROC>(loadProc("eglGetError"));
>+    eglGetProcAddress = reinterpret_cast<PFNEGLGETPROCADDRESSPROC>(loadProc("eglGetProcAddress"));
>+    eglInitialize     = reinterpret_cast<PFNEGLINITIALIZEPROC>(loadProc("eglInitialize"));
>+    eglMakeCurrent    = reinterpret_cast<PFNEGLMAKECURRENTPROC>(loadProc("eglMakeCurrent"));
>+    eglQueryContext   = reinterpret_cast<PFNEGLQUERYCONTEXTPROC>(loadProc("eglQueryContext"));
>+    eglQueryString    = reinterpret_cast<PFNEGLQUERYSTRINGPROC>(loadProc("eglQueryString"));
>+    eglQuerySurface   = reinterpret_cast<PFNEGLQUERYSURFACEPROC>(loadProc("eglQuerySurface"));
>+    eglSwapBuffers    = reinterpret_cast<PFNEGLSWAPBUFFERSPROC>(loadProc("eglSwapBuffers"));
>+    eglTerminate      = reinterpret_cast<PFNEGLTERMINATEPROC>(loadProc("eglTerminate"));
>+    eglWaitGL         = reinterpret_cast<PFNEGLWAITGLPROC>(loadProc("eglWaitGL"));
>+    eglWaitNative     = reinterpret_cast<PFNEGLWAITNATIVEPROC>(loadProc("eglWaitNative"));
>+    eglBindTexImage   = reinterpret_cast<PFNEGLBINDTEXIMAGEPROC>(loadProc("eglBindTexImage"));
>+    eglReleaseTexImage =
>+        reinterpret_cast<PFNEGLRELEASETEXIMAGEPROC>(loadProc("eglReleaseTexImage"));
>+    eglSurfaceAttrib = reinterpret_cast<PFNEGLSURFACEATTRIBPROC>(loadProc("eglSurfaceAttrib"));
>+    eglSwapInterval  = reinterpret_cast<PFNEGLSWAPINTERVALPROC>(loadProc("eglSwapInterval"));
>+    eglBindAPI       = reinterpret_cast<PFNEGLBINDAPIPROC>(loadProc("eglBindAPI"));
>+    eglQueryAPI      = reinterpret_cast<PFNEGLQUERYAPIPROC>(loadProc("eglQueryAPI"));
>+    eglCreatePbufferFromClientBuffer = reinterpret_cast<PFNEGLCREATEPBUFFERFROMCLIENTBUFFERPROC>(
>+        loadProc("eglCreatePbufferFromClientBuffer"));
>+    eglReleaseThread = reinterpret_cast<PFNEGLRELEASETHREADPROC>(loadProc("eglReleaseThread"));
>+    eglWaitClient    = reinterpret_cast<PFNEGLWAITCLIENTPROC>(loadProc("eglWaitClient"));
>+    eglGetCurrentContext =
>+        reinterpret_cast<PFNEGLGETCURRENTCONTEXTPROC>(loadProc("eglGetCurrentContext"));
>+    eglCreateSync     = reinterpret_cast<PFNEGLCREATESYNCPROC>(loadProc("eglCreateSync"));
>+    eglDestroySync    = reinterpret_cast<PFNEGLDESTROYSYNCPROC>(loadProc("eglDestroySync"));
>+    eglClientWaitSync = reinterpret_cast<PFNEGLCLIENTWAITSYNCPROC>(loadProc("eglClientWaitSync"));
>+    eglGetSyncAttrib  = reinterpret_cast<PFNEGLGETSYNCATTRIBPROC>(loadProc("eglGetSyncAttrib"));
>+    eglCreateImage    = reinterpret_cast<PFNEGLCREATEIMAGEPROC>(loadProc("eglCreateImage"));
>+    eglDestroyImage   = reinterpret_cast<PFNEGLDESTROYIMAGEPROC>(loadProc("eglDestroyImage"));
>+    eglGetPlatformDisplay =
>+        reinterpret_cast<PFNEGLGETPLATFORMDISPLAYPROC>(loadProc("eglGetPlatformDisplay"));
>+    eglCreatePlatformWindowSurface = reinterpret_cast<PFNEGLCREATEPLATFORMWINDOWSURFACEPROC>(
>+        loadProc("eglCreatePlatformWindowSurface"));
>+    eglCreatePlatformPixmapSurface = reinterpret_cast<PFNEGLCREATEPLATFORMPIXMAPSURFACEPROC>(
>+        loadProc("eglCreatePlatformPixmapSurface"));
>+    eglWaitSync                 = reinterpret_cast<PFNEGLWAITSYNCPROC>(loadProc("eglWaitSync"));
>+    eglSetBlobCacheFuncsANDROID = reinterpret_cast<PFNEGLSETBLOBCACHEFUNCSANDROIDPROC>(
>+        loadProc("eglSetBlobCacheFuncsANDROID"));
>+    eglGetCompositorTimingANDROID = reinterpret_cast<PFNEGLGETCOMPOSITORTIMINGANDROIDPROC>(
>+        loadProc("eglGetCompositorTimingANDROID"));
>+    eglGetCompositorTimingSupportedANDROID =
>+        reinterpret_cast<PFNEGLGETCOMPOSITORTIMINGSUPPORTEDANDROIDPROC>(
>+            loadProc("eglGetCompositorTimingSupportedANDROID"));
>+    eglGetFrameTimestampSupportedANDROID =
>+        reinterpret_cast<PFNEGLGETFRAMETIMESTAMPSUPPORTEDANDROIDPROC>(
>+            loadProc("eglGetFrameTimestampSupportedANDROID"));
>+    eglGetFrameTimestampsANDROID = reinterpret_cast<PFNEGLGETFRAMETIMESTAMPSANDROIDPROC>(
>+        loadProc("eglGetFrameTimestampsANDROID"));
>+    eglGetNextFrameIdANDROID =
>+        reinterpret_cast<PFNEGLGETNEXTFRAMEIDANDROIDPROC>(loadProc("eglGetNextFrameIdANDROID"));
>+    eglPresentationTimeANDROID =
>+        reinterpret_cast<PFNEGLPRESENTATIONTIMEANDROIDPROC>(loadProc("eglPresentationTimeANDROID"));
>+    eglCreateDeviceANGLE =
>+        reinterpret_cast<PFNEGLCREATEDEVICEANGLEPROC>(loadProc("eglCreateDeviceANGLE"));
>+    eglReleaseDeviceANGLE =
>+        reinterpret_cast<PFNEGLRELEASEDEVICEANGLEPROC>(loadProc("eglReleaseDeviceANGLE"));
>+    eglProgramCacheGetAttribANGLE = reinterpret_cast<PFNEGLPROGRAMCACHEGETATTRIBANGLEPROC>(
>+        loadProc("eglProgramCacheGetAttribANGLE"));
>+    eglProgramCachePopulateANGLE = reinterpret_cast<PFNEGLPROGRAMCACHEPOPULATEANGLEPROC>(
>+        loadProc("eglProgramCachePopulateANGLE"));
>+    eglProgramCacheQueryANGLE =
>+        reinterpret_cast<PFNEGLPROGRAMCACHEQUERYANGLEPROC>(loadProc("eglProgramCacheQueryANGLE"));
>+    eglProgramCacheResizeANGLE =
>+        reinterpret_cast<PFNEGLPROGRAMCACHERESIZEANGLEPROC>(loadProc("eglProgramCacheResizeANGLE"));
>+    eglQuerySurfacePointerANGLE = reinterpret_cast<PFNEGLQUERYSURFACEPOINTERANGLEPROC>(
>+        loadProc("eglQuerySurfacePointerANGLE"));
>+    eglCreateStreamProducerD3DTextureANGLE =
>+        reinterpret_cast<PFNEGLCREATESTREAMPRODUCERD3DTEXTUREANGLEPROC>(
>+            loadProc("eglCreateStreamProducerD3DTextureANGLE"));
>+    eglStreamPostD3DTextureANGLE = reinterpret_cast<PFNEGLSTREAMPOSTD3DTEXTUREANGLEPROC>(
>+        loadProc("eglStreamPostD3DTextureANGLE"));
>+    eglGetSyncValuesCHROMIUM =
>+        reinterpret_cast<PFNEGLGETSYNCVALUESCHROMIUMPROC>(loadProc("eglGetSyncValuesCHROMIUM"));
>+    eglQueryDeviceAttribEXT =
>+        reinterpret_cast<PFNEGLQUERYDEVICEATTRIBEXTPROC>(loadProc("eglQueryDeviceAttribEXT"));
>+    eglQueryDeviceStringEXT =
>+        reinterpret_cast<PFNEGLQUERYDEVICESTRINGEXTPROC>(loadProc("eglQueryDeviceStringEXT"));
>+    eglQueryDisplayAttribEXT =
>+        reinterpret_cast<PFNEGLQUERYDISPLAYATTRIBEXTPROC>(loadProc("eglQueryDisplayAttribEXT"));
>+    eglCreatePlatformPixmapSurfaceEXT = reinterpret_cast<PFNEGLCREATEPLATFORMPIXMAPSURFACEEXTPROC>(
>+        loadProc("eglCreatePlatformPixmapSurfaceEXT"));
>+    eglCreatePlatformWindowSurfaceEXT = reinterpret_cast<PFNEGLCREATEPLATFORMWINDOWSURFACEEXTPROC>(
>+        loadProc("eglCreatePlatformWindowSurfaceEXT"));
>+    eglGetPlatformDisplayEXT =
>+        reinterpret_cast<PFNEGLGETPLATFORMDISPLAYEXTPROC>(loadProc("eglGetPlatformDisplayEXT"));
>+    eglDebugMessageControlKHR =
>+        reinterpret_cast<PFNEGLDEBUGMESSAGECONTROLKHRPROC>(loadProc("eglDebugMessageControlKHR"));
>+    eglLabelObjectKHR = reinterpret_cast<PFNEGLLABELOBJECTKHRPROC>(loadProc("eglLabelObjectKHR"));
>+    eglQueryDebugKHR  = reinterpret_cast<PFNEGLQUERYDEBUGKHRPROC>(loadProc("eglQueryDebugKHR"));
>+    eglClientWaitSyncKHR =
>+        reinterpret_cast<PFNEGLCLIENTWAITSYNCKHRPROC>(loadProc("eglClientWaitSyncKHR"));
>+    eglCreateSyncKHR  = reinterpret_cast<PFNEGLCREATESYNCKHRPROC>(loadProc("eglCreateSyncKHR"));
>+    eglDestroySyncKHR = reinterpret_cast<PFNEGLDESTROYSYNCKHRPROC>(loadProc("eglDestroySyncKHR"));
>+    eglGetSyncAttribKHR =
>+        reinterpret_cast<PFNEGLGETSYNCATTRIBKHRPROC>(loadProc("eglGetSyncAttribKHR"));
>+    eglCreateImageKHR = reinterpret_cast<PFNEGLCREATEIMAGEKHRPROC>(loadProc("eglCreateImageKHR"));
>+    eglDestroyImageKHR =
>+        reinterpret_cast<PFNEGLDESTROYIMAGEKHRPROC>(loadProc("eglDestroyImageKHR"));
>+    eglCreateStreamKHR =
>+        reinterpret_cast<PFNEGLCREATESTREAMKHRPROC>(loadProc("eglCreateStreamKHR"));
>+    eglDestroyStreamKHR =
>+        reinterpret_cast<PFNEGLDESTROYSTREAMKHRPROC>(loadProc("eglDestroyStreamKHR"));
>+    eglQueryStreamKHR = reinterpret_cast<PFNEGLQUERYSTREAMKHRPROC>(loadProc("eglQueryStreamKHR"));
>+    eglQueryStreamu64KHR =
>+        reinterpret_cast<PFNEGLQUERYSTREAMU64KHRPROC>(loadProc("eglQueryStreamu64KHR"));
>+    eglStreamAttribKHR =
>+        reinterpret_cast<PFNEGLSTREAMATTRIBKHRPROC>(loadProc("eglStreamAttribKHR"));
>+    eglStreamConsumerAcquireKHR = reinterpret_cast<PFNEGLSTREAMCONSUMERACQUIREKHRPROC>(
>+        loadProc("eglStreamConsumerAcquireKHR"));
>+    eglStreamConsumerGLTextureExternalKHR =
>+        reinterpret_cast<PFNEGLSTREAMCONSUMERGLTEXTUREEXTERNALKHRPROC>(
>+            loadProc("eglStreamConsumerGLTextureExternalKHR"));
>+    eglStreamConsumerReleaseKHR = reinterpret_cast<PFNEGLSTREAMCONSUMERRELEASEKHRPROC>(
>+        loadProc("eglStreamConsumerReleaseKHR"));
>+    eglSwapBuffersWithDamageKHR = reinterpret_cast<PFNEGLSWAPBUFFERSWITHDAMAGEKHRPROC>(
>+        loadProc("eglSwapBuffersWithDamageKHR"));
>+    eglWaitSyncKHR = reinterpret_cast<PFNEGLWAITSYNCKHRPROC>(loadProc("eglWaitSyncKHR"));
>+    eglPostSubBufferNV =
>+        reinterpret_cast<PFNEGLPOSTSUBBUFFERNVPROC>(loadProc("eglPostSubBufferNV"));
>+    eglStreamConsumerGLTextureExternalAttribsNV =
>+        reinterpret_cast<PFNEGLSTREAMCONSUMERGLTEXTUREEXTERNALATTRIBSNVPROC>(
>+            loadProc("eglStreamConsumerGLTextureExternalAttribsNV"));
>+}
>+}  // namespace angle
>diff --git a/Source/ThirdParty/ANGLE/util/egl_loader_autogen.h b/Source/ThirdParty/ANGLE/util/egl_loader_autogen.h
>new file mode 100644
>index 00000000000..5fbec82ffda
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/util/egl_loader_autogen.h
>@@ -0,0 +1,120 @@
>+// GENERATED FILE - DO NOT EDIT.
>+// Generated by generate_loader.py using data from egl.xml and egl_angle_ext.xml.
>+//
>+// Copyright 2019 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// egl_loader_autogen.h:
>+//   Simple EGL function loader.
>+
>+#ifndef UTIL_EGL_LOADER_AUTOGEN_H_
>+#define UTIL_EGL_LOADER_AUTOGEN_H_
>+
>+#include "util/util_export.h"
>+
>+#include <EGL/egl.h>
>+#include <EGL/eglext.h>
>+
>+ANGLE_UTIL_EXPORT extern PFNEGLCHOOSECONFIGPROC eglChooseConfig;
>+ANGLE_UTIL_EXPORT extern PFNEGLCOPYBUFFERSPROC eglCopyBuffers;
>+ANGLE_UTIL_EXPORT extern PFNEGLCREATECONTEXTPROC eglCreateContext;
>+ANGLE_UTIL_EXPORT extern PFNEGLCREATEPBUFFERSURFACEPROC eglCreatePbufferSurface;
>+ANGLE_UTIL_EXPORT extern PFNEGLCREATEPIXMAPSURFACEPROC eglCreatePixmapSurface;
>+ANGLE_UTIL_EXPORT extern PFNEGLCREATEWINDOWSURFACEPROC eglCreateWindowSurface;
>+ANGLE_UTIL_EXPORT extern PFNEGLDESTROYCONTEXTPROC eglDestroyContext;
>+ANGLE_UTIL_EXPORT extern PFNEGLDESTROYSURFACEPROC eglDestroySurface;
>+ANGLE_UTIL_EXPORT extern PFNEGLGETCONFIGATTRIBPROC eglGetConfigAttrib;
>+ANGLE_UTIL_EXPORT extern PFNEGLGETCONFIGSPROC eglGetConfigs;
>+ANGLE_UTIL_EXPORT extern PFNEGLGETCURRENTDISPLAYPROC eglGetCurrentDisplay;
>+ANGLE_UTIL_EXPORT extern PFNEGLGETCURRENTSURFACEPROC eglGetCurrentSurface;
>+ANGLE_UTIL_EXPORT extern PFNEGLGETDISPLAYPROC eglGetDisplay;
>+ANGLE_UTIL_EXPORT extern PFNEGLGETERRORPROC eglGetError;
>+ANGLE_UTIL_EXPORT extern PFNEGLGETPROCADDRESSPROC eglGetProcAddress;
>+ANGLE_UTIL_EXPORT extern PFNEGLINITIALIZEPROC eglInitialize;
>+ANGLE_UTIL_EXPORT extern PFNEGLMAKECURRENTPROC eglMakeCurrent;
>+ANGLE_UTIL_EXPORT extern PFNEGLQUERYCONTEXTPROC eglQueryContext;
>+ANGLE_UTIL_EXPORT extern PFNEGLQUERYSTRINGPROC eglQueryString;
>+ANGLE_UTIL_EXPORT extern PFNEGLQUERYSURFACEPROC eglQuerySurface;
>+ANGLE_UTIL_EXPORT extern PFNEGLSWAPBUFFERSPROC eglSwapBuffers;
>+ANGLE_UTIL_EXPORT extern PFNEGLTERMINATEPROC eglTerminate;
>+ANGLE_UTIL_EXPORT extern PFNEGLWAITGLPROC eglWaitGL;
>+ANGLE_UTIL_EXPORT extern PFNEGLWAITNATIVEPROC eglWaitNative;
>+ANGLE_UTIL_EXPORT extern PFNEGLBINDTEXIMAGEPROC eglBindTexImage;
>+ANGLE_UTIL_EXPORT extern PFNEGLRELEASETEXIMAGEPROC eglReleaseTexImage;
>+ANGLE_UTIL_EXPORT extern PFNEGLSURFACEATTRIBPROC eglSurfaceAttrib;
>+ANGLE_UTIL_EXPORT extern PFNEGLSWAPINTERVALPROC eglSwapInterval;
>+ANGLE_UTIL_EXPORT extern PFNEGLBINDAPIPROC eglBindAPI;
>+ANGLE_UTIL_EXPORT extern PFNEGLQUERYAPIPROC eglQueryAPI;
>+ANGLE_UTIL_EXPORT extern PFNEGLCREATEPBUFFERFROMCLIENTBUFFERPROC eglCreatePbufferFromClientBuffer;
>+ANGLE_UTIL_EXPORT extern PFNEGLRELEASETHREADPROC eglReleaseThread;
>+ANGLE_UTIL_EXPORT extern PFNEGLWAITCLIENTPROC eglWaitClient;
>+ANGLE_UTIL_EXPORT extern PFNEGLGETCURRENTCONTEXTPROC eglGetCurrentContext;
>+ANGLE_UTIL_EXPORT extern PFNEGLCREATESYNCPROC eglCreateSync;
>+ANGLE_UTIL_EXPORT extern PFNEGLDESTROYSYNCPROC eglDestroySync;
>+ANGLE_UTIL_EXPORT extern PFNEGLCLIENTWAITSYNCPROC eglClientWaitSync;
>+ANGLE_UTIL_EXPORT extern PFNEGLGETSYNCATTRIBPROC eglGetSyncAttrib;
>+ANGLE_UTIL_EXPORT extern PFNEGLCREATEIMAGEPROC eglCreateImage;
>+ANGLE_UTIL_EXPORT extern PFNEGLDESTROYIMAGEPROC eglDestroyImage;
>+ANGLE_UTIL_EXPORT extern PFNEGLGETPLATFORMDISPLAYPROC eglGetPlatformDisplay;
>+ANGLE_UTIL_EXPORT extern PFNEGLCREATEPLATFORMWINDOWSURFACEPROC eglCreatePlatformWindowSurface;
>+ANGLE_UTIL_EXPORT extern PFNEGLCREATEPLATFORMPIXMAPSURFACEPROC eglCreatePlatformPixmapSurface;
>+ANGLE_UTIL_EXPORT extern PFNEGLWAITSYNCPROC eglWaitSync;
>+ANGLE_UTIL_EXPORT extern PFNEGLSETBLOBCACHEFUNCSANDROIDPROC eglSetBlobCacheFuncsANDROID;
>+ANGLE_UTIL_EXPORT extern PFNEGLGETCOMPOSITORTIMINGANDROIDPROC eglGetCompositorTimingANDROID;
>+ANGLE_UTIL_EXPORT extern PFNEGLGETCOMPOSITORTIMINGSUPPORTEDANDROIDPROC
>+    eglGetCompositorTimingSupportedANDROID;
>+ANGLE_UTIL_EXPORT extern PFNEGLGETFRAMETIMESTAMPSUPPORTEDANDROIDPROC
>+    eglGetFrameTimestampSupportedANDROID;
>+ANGLE_UTIL_EXPORT extern PFNEGLGETFRAMETIMESTAMPSANDROIDPROC eglGetFrameTimestampsANDROID;
>+ANGLE_UTIL_EXPORT extern PFNEGLGETNEXTFRAMEIDANDROIDPROC eglGetNextFrameIdANDROID;
>+ANGLE_UTIL_EXPORT extern PFNEGLPRESENTATIONTIMEANDROIDPROC eglPresentationTimeANDROID;
>+ANGLE_UTIL_EXPORT extern PFNEGLCREATEDEVICEANGLEPROC eglCreateDeviceANGLE;
>+ANGLE_UTIL_EXPORT extern PFNEGLRELEASEDEVICEANGLEPROC eglReleaseDeviceANGLE;
>+ANGLE_UTIL_EXPORT extern PFNEGLPROGRAMCACHEGETATTRIBANGLEPROC eglProgramCacheGetAttribANGLE;
>+ANGLE_UTIL_EXPORT extern PFNEGLPROGRAMCACHEPOPULATEANGLEPROC eglProgramCachePopulateANGLE;
>+ANGLE_UTIL_EXPORT extern PFNEGLPROGRAMCACHEQUERYANGLEPROC eglProgramCacheQueryANGLE;
>+ANGLE_UTIL_EXPORT extern PFNEGLPROGRAMCACHERESIZEANGLEPROC eglProgramCacheResizeANGLE;
>+ANGLE_UTIL_EXPORT extern PFNEGLQUERYSURFACEPOINTERANGLEPROC eglQuerySurfacePointerANGLE;
>+ANGLE_UTIL_EXPORT extern PFNEGLCREATESTREAMPRODUCERD3DTEXTUREANGLEPROC
>+    eglCreateStreamProducerD3DTextureANGLE;
>+ANGLE_UTIL_EXPORT extern PFNEGLSTREAMPOSTD3DTEXTUREANGLEPROC eglStreamPostD3DTextureANGLE;
>+ANGLE_UTIL_EXPORT extern PFNEGLGETSYNCVALUESCHROMIUMPROC eglGetSyncValuesCHROMIUM;
>+ANGLE_UTIL_EXPORT extern PFNEGLQUERYDEVICEATTRIBEXTPROC eglQueryDeviceAttribEXT;
>+ANGLE_UTIL_EXPORT extern PFNEGLQUERYDEVICESTRINGEXTPROC eglQueryDeviceStringEXT;
>+ANGLE_UTIL_EXPORT extern PFNEGLQUERYDISPLAYATTRIBEXTPROC eglQueryDisplayAttribEXT;
>+ANGLE_UTIL_EXPORT extern PFNEGLCREATEPLATFORMPIXMAPSURFACEEXTPROC eglCreatePlatformPixmapSurfaceEXT;
>+ANGLE_UTIL_EXPORT extern PFNEGLCREATEPLATFORMWINDOWSURFACEEXTPROC eglCreatePlatformWindowSurfaceEXT;
>+ANGLE_UTIL_EXPORT extern PFNEGLGETPLATFORMDISPLAYEXTPROC eglGetPlatformDisplayEXT;
>+ANGLE_UTIL_EXPORT extern PFNEGLDEBUGMESSAGECONTROLKHRPROC eglDebugMessageControlKHR;
>+ANGLE_UTIL_EXPORT extern PFNEGLLABELOBJECTKHRPROC eglLabelObjectKHR;
>+ANGLE_UTIL_EXPORT extern PFNEGLQUERYDEBUGKHRPROC eglQueryDebugKHR;
>+ANGLE_UTIL_EXPORT extern PFNEGLCLIENTWAITSYNCKHRPROC eglClientWaitSyncKHR;
>+ANGLE_UTIL_EXPORT extern PFNEGLCREATESYNCKHRPROC eglCreateSyncKHR;
>+ANGLE_UTIL_EXPORT extern PFNEGLDESTROYSYNCKHRPROC eglDestroySyncKHR;
>+ANGLE_UTIL_EXPORT extern PFNEGLGETSYNCATTRIBKHRPROC eglGetSyncAttribKHR;
>+ANGLE_UTIL_EXPORT extern PFNEGLCREATEIMAGEKHRPROC eglCreateImageKHR;
>+ANGLE_UTIL_EXPORT extern PFNEGLDESTROYIMAGEKHRPROC eglDestroyImageKHR;
>+ANGLE_UTIL_EXPORT extern PFNEGLCREATESTREAMKHRPROC eglCreateStreamKHR;
>+ANGLE_UTIL_EXPORT extern PFNEGLDESTROYSTREAMKHRPROC eglDestroyStreamKHR;
>+ANGLE_UTIL_EXPORT extern PFNEGLQUERYSTREAMKHRPROC eglQueryStreamKHR;
>+ANGLE_UTIL_EXPORT extern PFNEGLQUERYSTREAMU64KHRPROC eglQueryStreamu64KHR;
>+ANGLE_UTIL_EXPORT extern PFNEGLSTREAMATTRIBKHRPROC eglStreamAttribKHR;
>+ANGLE_UTIL_EXPORT extern PFNEGLSTREAMCONSUMERACQUIREKHRPROC eglStreamConsumerAcquireKHR;
>+ANGLE_UTIL_EXPORT extern PFNEGLSTREAMCONSUMERGLTEXTUREEXTERNALKHRPROC
>+    eglStreamConsumerGLTextureExternalKHR;
>+ANGLE_UTIL_EXPORT extern PFNEGLSTREAMCONSUMERRELEASEKHRPROC eglStreamConsumerReleaseKHR;
>+ANGLE_UTIL_EXPORT extern PFNEGLSWAPBUFFERSWITHDAMAGEKHRPROC eglSwapBuffersWithDamageKHR;
>+ANGLE_UTIL_EXPORT extern PFNEGLWAITSYNCKHRPROC eglWaitSyncKHR;
>+ANGLE_UTIL_EXPORT extern PFNEGLPOSTSUBBUFFERNVPROC eglPostSubBufferNV;
>+ANGLE_UTIL_EXPORT extern PFNEGLSTREAMCONSUMERGLTEXTUREEXTERNALATTRIBSNVPROC
>+    eglStreamConsumerGLTextureExternalAttribsNV;
>+
>+namespace angle
>+{
>+using GenericProc = void (*)();
>+using LoadProc    = GenericProc(KHRONOS_APIENTRY *)(const char *);
>+ANGLE_UTIL_EXPORT void LoadEGL(LoadProc loadProc);
>+}  // namespace angle
>+
>+#endif  // UTIL_EGL_LOADER_AUTOGEN_H_
>diff --git a/Source/ThirdParty/ANGLE/util/fuchsia/ScenicWindow.cpp b/Source/ThirdParty/ANGLE/util/fuchsia/ScenicWindow.cpp
>new file mode 100644
>index 00000000000..35c74aff066
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/util/fuchsia/ScenicWindow.cpp
>@@ -0,0 +1,174 @@
>+//
>+// Copyright 2019 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// ScenicWindow.cpp:
>+//    Implements methods from ScenicWindow
>+//
>+
>+#include "util/fuchsia/ScenicWindow.h"
>+
>+#include <fuchsia/images/cpp/fidl.h>
>+#include <fuchsia/ui/views/cpp/fidl.h>
>+#include <lib/async-loop/cpp/loop.h>
>+#include <lib/fdio/directory.h>
>+#include <lib/fidl/cpp/interface_ptr.h>
>+#include <lib/fidl/cpp/interface_request.h>
>+#include <lib/ui/scenic/cpp/view_token_pair.h>
>+#include <lib/zx/channel.h>
>+#include <zircon/status.h>
>+
>+#include "common/debug.h"
>+
>+namespace
>+{
>+
>+async::Loop *GetDefaultLoop()
>+{
>+    static async::Loop *defaultLoop = new async::Loop(&kAsyncLoopConfigAttachToThread);
>+    return defaultLoop;
>+}
>+
>+zx::channel ConnectToServiceRoot()
>+{
>+    zx::channel clientChannel;
>+    zx::channel serverChannel;
>+    zx_status_t result = zx::channel::create(0, &clientChannel, &serverChannel);
>+    ASSERT(result == ZX_OK);
>+    result = fdio_service_connect("/svc/.", serverChannel.release());
>+    ASSERT(result == ZX_OK);
>+    return clientChannel;
>+}
>+
>+template <typename Interface>
>+zx_status_t ConnectToService(zx_handle_t serviceRoot, fidl::InterfaceRequest<Interface> request)
>+{
>+    ASSERT(request.is_valid());
>+    return fdio_service_connect_at(serviceRoot, Interface::Name_, request.TakeChannel().release());
>+}
>+
>+template <typename Interface>
>+fidl::InterfacePtr<Interface> ConnectToService(zx_handle_t serviceRoot)
>+{
>+    fidl::InterfacePtr<Interface> result;
>+    ConnectToService(serviceRoot, result.NewRequest());
>+    return result;
>+}
>+
>+}  // namespace
>+
>+ScenicWindow::ScenicWindow()
>+    : mLoop(GetDefaultLoop()),
>+      mServiceRoot(ConnectToServiceRoot()),
>+      mScenic(ConnectToService<fuchsia::ui::scenic::Scenic>(mServiceRoot.get())),
>+      mPresenter(ConnectToService<fuchsia::ui::policy::Presenter>(mServiceRoot.get())),
>+      mScenicSession(mScenic.get()),
>+      mShape(&mScenicSession),
>+      mMaterial(&mScenicSession)
>+{}
>+
>+ScenicWindow::~ScenicWindow()
>+{
>+    destroy();
>+}
>+
>+bool ScenicWindow::initialize(const std::string &name, size_t width, size_t height)
>+{
>+    // Set up scenic resources.
>+    mShape.SetShape(scenic::Rectangle(&mScenicSession, width, height));
>+    mShape.SetMaterial(mMaterial);
>+
>+    fuchsia::ui::views::ViewToken viewToken;
>+    fuchsia::ui::views::ViewHolderToken viewHolderToken;
>+    std::tie(viewToken, viewHolderToken) = scenic::NewViewTokenPair();
>+
>+    // Create view.
>+    mView = std::make_unique<scenic::View>(&mScenicSession, std::move(viewToken), name);
>+    mView->AddChild(mShape);
>+    mScenicSession.Present(0, [](fuchsia::images::PresentationInfo info) {});
>+
>+    // Present view.
>+    mPresenter->PresentView(std::move(viewHolderToken), nullptr);
>+
>+    mWidth  = width;
>+    mHeight = height;
>+
>+    resetNativeWindow();
>+
>+    return true;
>+}
>+
>+void ScenicWindow::destroy()
>+{
>+    mFuchsiaEGLWindow.reset();
>+}
>+
>+void ScenicWindow::resetNativeWindow()
>+{
>+    fuchsia::images::ImagePipePtr imagePipe;
>+    uint32_t imagePipeId = mScenicSession.AllocResourceId();
>+    mScenicSession.Enqueue(scenic::NewCreateImagePipeCmd(imagePipeId, imagePipe.NewRequest()));
>+    mMaterial.SetTexture(imagePipeId);
>+    mScenicSession.ReleaseResource(imagePipeId);
>+    mScenicSession.Present(0, [](fuchsia::images::PresentationInfo info) {});
>+
>+    mFuchsiaEGLWindow.reset(
>+        fuchsia_egl_window_create(imagePipe.Unbind().TakeChannel().release(), mWidth, mHeight));
>+}
>+
>+EGLNativeWindowType ScenicWindow::getNativeWindow() const
>+{
>+    return reinterpret_cast<EGLNativeWindowType>(mFuchsiaEGLWindow.get());
>+}
>+
>+EGLNativeDisplayType ScenicWindow::getNativeDisplay() const
>+{
>+    return EGL_DEFAULT_DISPLAY;
>+}
>+
>+void ScenicWindow::messageLoop()
>+{
>+    mLoop->Run(zx::deadline_after({}), true /* once */);
>+}
>+
>+void ScenicWindow::setMousePosition(int x, int y)
>+{
>+    UNIMPLEMENTED();
>+}
>+
>+bool ScenicWindow::setPosition(int x, int y)
>+{
>+    UNIMPLEMENTED();
>+    return false;
>+}
>+
>+bool ScenicWindow::resize(int width, int height)
>+{
>+    mWidth  = width;
>+    mHeight = height;
>+
>+    fuchsia_egl_window_resize(mFuchsiaEGLWindow.get(), width, height);
>+
>+    return true;
>+}
>+
>+void ScenicWindow::setVisible(bool isVisible) {}
>+
>+void ScenicWindow::signalTestEvent() {}
>+
>+void ScenicWindow::OnScenicEvents(std::vector<fuchsia::ui::scenic::Event> events)
>+{
>+    UNIMPLEMENTED();
>+}
>+
>+void ScenicWindow::OnScenicError(zx_status_t status)
>+{
>+    WARN() << "OnScenicError: " << zx_status_get_string(status);
>+}
>+
>+// static
>+OSWindow *OSWindow::New()
>+{
>+    return new ScenicWindow;
>+}
>diff --git a/Source/ThirdParty/ANGLE/util/fuchsia/ScenicWindow.h b/Source/ThirdParty/ANGLE/util/fuchsia/ScenicWindow.h
>new file mode 100644
>index 00000000000..1759ee188a2
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/util/fuchsia/ScenicWindow.h
>@@ -0,0 +1,75 @@
>+//
>+// Copyright 2019 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// ScenicWindow.h:
>+//    Subclasses OSWindow for Fuchsia's Scenic compositor.
>+//
>+
>+#ifndef UTIL_FUCHSIA_SCENIC_WINDOW_H
>+#define UTIL_FUCHSIA_SCENIC_WINDOW_H
>+
>+#include <fuchsia/ui/policy/cpp/fidl.h>
>+#include <fuchsia/ui/scenic/cpp/fidl.h>
>+#include <fuchsia_egl.h>
>+#include <lib/async-loop/cpp/loop.h>
>+#include <lib/ui/scenic/cpp/commands.h>
>+#include <lib/ui/scenic/cpp/resources.h>
>+#include <lib/ui/scenic/cpp/session.h>
>+#include <zircon/types.h>
>+#include <string>
>+
>+#include "util/OSWindow.h"
>+#include "util/util_export.h"
>+
>+struct FuchsiaEGLWindowDeleter
>+{
>+    void operator()(fuchsia_egl_window *eglWindow) { fuchsia_egl_window_destroy(eglWindow); }
>+};
>+
>+class ANGLE_UTIL_EXPORT ScenicWindow : public OSWindow
>+{
>+  public:
>+    ScenicWindow();
>+    ~ScenicWindow();
>+
>+    // OSWindow:
>+    bool initialize(const std::string &name, size_t width, size_t height) override;
>+    void destroy() override;
>+    void resetNativeWindow() override;
>+    EGLNativeWindowType getNativeWindow() const override;
>+    EGLNativeDisplayType getNativeDisplay() const override;
>+    void messageLoop() override;
>+    void setMousePosition(int x, int y) override;
>+    bool setPosition(int x, int y) override;
>+    bool resize(int width, int height) override;
>+    void setVisible(bool isVisible) override;
>+    void signalTestEvent() override;
>+
>+    // FIDL callbacks:
>+    void OnScenicEvents(std::vector<fuchsia::ui::scenic::Event> events);
>+    void OnScenicError(zx_status_t status);
>+
>+  private:
>+    // Default message loop.
>+    async::Loop *mLoop;
>+
>+    // System services.
>+    zx::channel mServiceRoot;
>+    fuchsia::ui::scenic::ScenicPtr mScenic;
>+    fuchsia::ui::policy::PresenterPtr mPresenter;
>+
>+    // Scenic session & resources.
>+    scenic::Session mScenicSession;
>+    scenic::ShapeNode mShape;
>+    scenic::Material mMaterial;
>+
>+    // Scenic view.
>+    std::unique_ptr<scenic::View> mView;
>+
>+    // EGL native window.
>+    std::unique_ptr<fuchsia_egl_window, FuchsiaEGLWindowDeleter> mFuchsiaEGLWindow;
>+};
>+
>+#endif  // UTIL_FUCHSIA_SCENIC_WINDOW_H
>diff --git a/Source/ThirdParty/ANGLE/util/geometry_utils.h b/Source/ThirdParty/ANGLE/util/geometry_utils.h
>index 70026476bd2..e9089cfe106 100644
>--- a/Source/ThirdParty/ANGLE/util/geometry_utils.h
>+++ b/Source/ThirdParty/ANGLE/util/geometry_utils.h
>@@ -13,12 +13,12 @@
> #include <cstddef>
> #include <vector>
> 
>-#include <export.h>
> #include <GLES2/gl2.h>
> 
> #include "common/vector_utils.h"
>+#include "util/util_export.h"
> 
>-struct ANGLE_EXPORT SphereGeometry
>+struct ANGLE_UTIL_EXPORT SphereGeometry
> {
>     SphereGeometry();
>     ~SphereGeometry();
>@@ -28,9 +28,11 @@ struct ANGLE_EXPORT SphereGeometry
>     std::vector<GLushort> indices;
> };
> 
>-ANGLE_EXPORT void CreateSphereGeometry(size_t sliceCount, float radius, SphereGeometry *result);
>+ANGLE_UTIL_EXPORT void CreateSphereGeometry(size_t sliceCount,
>+                                            float radius,
>+                                            SphereGeometry *result);
> 
>-struct ANGLE_EXPORT CubeGeometry
>+struct ANGLE_UTIL_EXPORT CubeGeometry
> {
>     CubeGeometry();
>     ~CubeGeometry();
>@@ -41,6 +43,6 @@ struct ANGLE_EXPORT CubeGeometry
>     std::vector<GLushort> indices;
> };
> 
>-ANGLE_EXPORT void GenerateCubeGeometry(float radius, CubeGeometry *result);
>+ANGLE_UTIL_EXPORT void GenerateCubeGeometry(float radius, CubeGeometry *result);
> 
> #endif  // UTIL_GEOMETRY_UTILS_H
>diff --git a/Source/ThirdParty/ANGLE/util/gles_loader_autogen.cpp b/Source/ThirdParty/ANGLE/util/gles_loader_autogen.cpp
>new file mode 100644
>index 00000000000..6f7094a0951
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/util/gles_loader_autogen.cpp
>@@ -0,0 +1,4030 @@
>+// GENERATED FILE - DO NOT EDIT.
>+// Generated by generate_loader.py using data from gl.xml and gl_angle_ext.xml.
>+//
>+// Copyright 2019 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// gles_loader_autogen.cpp:
>+//   Simple GLES function loader.
>+
>+#include "gles_loader_autogen.h"
>+
>+ANGLE_UTIL_EXPORT PFNGLALPHAFUNCPROC glAlphaFunc;
>+ANGLE_UTIL_EXPORT PFNGLCLIPPLANEFPROC glClipPlanef;
>+ANGLE_UTIL_EXPORT PFNGLCOLOR4FPROC glColor4f;
>+ANGLE_UTIL_EXPORT PFNGLFOGFPROC glFogf;
>+ANGLE_UTIL_EXPORT PFNGLFOGFVPROC glFogfv;
>+ANGLE_UTIL_EXPORT PFNGLFRUSTUMFPROC glFrustumf;
>+ANGLE_UTIL_EXPORT PFNGLGETCLIPPLANEFPROC glGetClipPlanef;
>+ANGLE_UTIL_EXPORT PFNGLGETLIGHTFVPROC glGetLightfv;
>+ANGLE_UTIL_EXPORT PFNGLGETMATERIALFVPROC glGetMaterialfv;
>+ANGLE_UTIL_EXPORT PFNGLGETTEXENVFVPROC glGetTexEnvfv;
>+ANGLE_UTIL_EXPORT PFNGLLIGHTMODELFPROC glLightModelf;
>+ANGLE_UTIL_EXPORT PFNGLLIGHTMODELFVPROC glLightModelfv;
>+ANGLE_UTIL_EXPORT PFNGLLIGHTFPROC glLightf;
>+ANGLE_UTIL_EXPORT PFNGLLIGHTFVPROC glLightfv;
>+ANGLE_UTIL_EXPORT PFNGLLOADMATRIXFPROC glLoadMatrixf;
>+ANGLE_UTIL_EXPORT PFNGLMATERIALFPROC glMaterialf;
>+ANGLE_UTIL_EXPORT PFNGLMATERIALFVPROC glMaterialfv;
>+ANGLE_UTIL_EXPORT PFNGLMULTMATRIXFPROC glMultMatrixf;
>+ANGLE_UTIL_EXPORT PFNGLMULTITEXCOORD4FPROC glMultiTexCoord4f;
>+ANGLE_UTIL_EXPORT PFNGLNORMAL3FPROC glNormal3f;
>+ANGLE_UTIL_EXPORT PFNGLORTHOFPROC glOrthof;
>+ANGLE_UTIL_EXPORT PFNGLPOINTPARAMETERFPROC glPointParameterf;
>+ANGLE_UTIL_EXPORT PFNGLPOINTPARAMETERFVPROC glPointParameterfv;
>+ANGLE_UTIL_EXPORT PFNGLPOINTSIZEPROC glPointSize;
>+ANGLE_UTIL_EXPORT PFNGLROTATEFPROC glRotatef;
>+ANGLE_UTIL_EXPORT PFNGLSCALEFPROC glScalef;
>+ANGLE_UTIL_EXPORT PFNGLTEXENVFPROC glTexEnvf;
>+ANGLE_UTIL_EXPORT PFNGLTEXENVFVPROC glTexEnvfv;
>+ANGLE_UTIL_EXPORT PFNGLTRANSLATEFPROC glTranslatef;
>+ANGLE_UTIL_EXPORT PFNGLALPHAFUNCXPROC glAlphaFuncx;
>+ANGLE_UTIL_EXPORT PFNGLCLEARCOLORXPROC glClearColorx;
>+ANGLE_UTIL_EXPORT PFNGLCLEARDEPTHXPROC glClearDepthx;
>+ANGLE_UTIL_EXPORT PFNGLCLIENTACTIVETEXTUREPROC glClientActiveTexture;
>+ANGLE_UTIL_EXPORT PFNGLCLIPPLANEXPROC glClipPlanex;
>+ANGLE_UTIL_EXPORT PFNGLCOLOR4UBPROC glColor4ub;
>+ANGLE_UTIL_EXPORT PFNGLCOLOR4XPROC glColor4x;
>+ANGLE_UTIL_EXPORT PFNGLCOLORPOINTERPROC glColorPointer;
>+ANGLE_UTIL_EXPORT PFNGLDEPTHRANGEXPROC glDepthRangex;
>+ANGLE_UTIL_EXPORT PFNGLDISABLECLIENTSTATEPROC glDisableClientState;
>+ANGLE_UTIL_EXPORT PFNGLENABLECLIENTSTATEPROC glEnableClientState;
>+ANGLE_UTIL_EXPORT PFNGLFOGXPROC glFogx;
>+ANGLE_UTIL_EXPORT PFNGLFOGXVPROC glFogxv;
>+ANGLE_UTIL_EXPORT PFNGLFRUSTUMXPROC glFrustumx;
>+ANGLE_UTIL_EXPORT PFNGLGETCLIPPLANEXPROC glGetClipPlanex;
>+ANGLE_UTIL_EXPORT PFNGLGETFIXEDVPROC glGetFixedv;
>+ANGLE_UTIL_EXPORT PFNGLGETLIGHTXVPROC glGetLightxv;
>+ANGLE_UTIL_EXPORT PFNGLGETMATERIALXVPROC glGetMaterialxv;
>+ANGLE_UTIL_EXPORT PFNGLGETPOINTERVPROC glGetPointerv;
>+ANGLE_UTIL_EXPORT PFNGLGETTEXENVIVPROC glGetTexEnviv;
>+ANGLE_UTIL_EXPORT PFNGLGETTEXENVXVPROC glGetTexEnvxv;
>+ANGLE_UTIL_EXPORT PFNGLGETTEXPARAMETERXVPROC glGetTexParameterxv;
>+ANGLE_UTIL_EXPORT PFNGLLIGHTMODELXPROC glLightModelx;
>+ANGLE_UTIL_EXPORT PFNGLLIGHTMODELXVPROC glLightModelxv;
>+ANGLE_UTIL_EXPORT PFNGLLIGHTXPROC glLightx;
>+ANGLE_UTIL_EXPORT PFNGLLIGHTXVPROC glLightxv;
>+ANGLE_UTIL_EXPORT PFNGLLINEWIDTHXPROC glLineWidthx;
>+ANGLE_UTIL_EXPORT PFNGLLOADIDENTITYPROC glLoadIdentity;
>+ANGLE_UTIL_EXPORT PFNGLLOADMATRIXXPROC glLoadMatrixx;
>+ANGLE_UTIL_EXPORT PFNGLLOGICOPPROC glLogicOp;
>+ANGLE_UTIL_EXPORT PFNGLMATERIALXPROC glMaterialx;
>+ANGLE_UTIL_EXPORT PFNGLMATERIALXVPROC glMaterialxv;
>+ANGLE_UTIL_EXPORT PFNGLMATRIXMODEPROC glMatrixMode;
>+ANGLE_UTIL_EXPORT PFNGLMULTMATRIXXPROC glMultMatrixx;
>+ANGLE_UTIL_EXPORT PFNGLMULTITEXCOORD4XPROC glMultiTexCoord4x;
>+ANGLE_UTIL_EXPORT PFNGLNORMAL3XPROC glNormal3x;
>+ANGLE_UTIL_EXPORT PFNGLNORMALPOINTERPROC glNormalPointer;
>+ANGLE_UTIL_EXPORT PFNGLORTHOXPROC glOrthox;
>+ANGLE_UTIL_EXPORT PFNGLPOINTPARAMETERXPROC glPointParameterx;
>+ANGLE_UTIL_EXPORT PFNGLPOINTPARAMETERXVPROC glPointParameterxv;
>+ANGLE_UTIL_EXPORT PFNGLPOINTSIZEXPROC glPointSizex;
>+ANGLE_UTIL_EXPORT PFNGLPOLYGONOFFSETXPROC glPolygonOffsetx;
>+ANGLE_UTIL_EXPORT PFNGLPOPMATRIXPROC glPopMatrix;
>+ANGLE_UTIL_EXPORT PFNGLPUSHMATRIXPROC glPushMatrix;
>+ANGLE_UTIL_EXPORT PFNGLROTATEXPROC glRotatex;
>+ANGLE_UTIL_EXPORT PFNGLSAMPLECOVERAGEXPROC glSampleCoveragex;
>+ANGLE_UTIL_EXPORT PFNGLSCALEXPROC glScalex;
>+ANGLE_UTIL_EXPORT PFNGLSHADEMODELPROC glShadeModel;
>+ANGLE_UTIL_EXPORT PFNGLTEXCOORDPOINTERPROC glTexCoordPointer;
>+ANGLE_UTIL_EXPORT PFNGLTEXENVIPROC glTexEnvi;
>+ANGLE_UTIL_EXPORT PFNGLTEXENVXPROC glTexEnvx;
>+ANGLE_UTIL_EXPORT PFNGLTEXENVIVPROC glTexEnviv;
>+ANGLE_UTIL_EXPORT PFNGLTEXENVXVPROC glTexEnvxv;
>+ANGLE_UTIL_EXPORT PFNGLTEXPARAMETERXPROC glTexParameterx;
>+ANGLE_UTIL_EXPORT PFNGLTEXPARAMETERXVPROC glTexParameterxv;
>+ANGLE_UTIL_EXPORT PFNGLTRANSLATEXPROC glTranslatex;
>+ANGLE_UTIL_EXPORT PFNGLVERTEXPOINTERPROC glVertexPointer;
>+ANGLE_UTIL_EXPORT PFNGLACTIVETEXTUREPROC glActiveTexture;
>+ANGLE_UTIL_EXPORT PFNGLATTACHSHADERPROC glAttachShader;
>+ANGLE_UTIL_EXPORT PFNGLBINDATTRIBLOCATIONPROC glBindAttribLocation;
>+ANGLE_UTIL_EXPORT PFNGLBINDBUFFERPROC glBindBuffer;
>+ANGLE_UTIL_EXPORT PFNGLBINDFRAMEBUFFERPROC glBindFramebuffer;
>+ANGLE_UTIL_EXPORT PFNGLBINDRENDERBUFFERPROC glBindRenderbuffer;
>+ANGLE_UTIL_EXPORT PFNGLBINDTEXTUREPROC glBindTexture;
>+ANGLE_UTIL_EXPORT PFNGLBLENDCOLORPROC glBlendColor;
>+ANGLE_UTIL_EXPORT PFNGLBLENDEQUATIONPROC glBlendEquation;
>+ANGLE_UTIL_EXPORT PFNGLBLENDEQUATIONSEPARATEPROC glBlendEquationSeparate;
>+ANGLE_UTIL_EXPORT PFNGLBLENDFUNCPROC glBlendFunc;
>+ANGLE_UTIL_EXPORT PFNGLBLENDFUNCSEPARATEPROC glBlendFuncSeparate;
>+ANGLE_UTIL_EXPORT PFNGLBUFFERDATAPROC glBufferData;
>+ANGLE_UTIL_EXPORT PFNGLBUFFERSUBDATAPROC glBufferSubData;
>+ANGLE_UTIL_EXPORT PFNGLCHECKFRAMEBUFFERSTATUSPROC glCheckFramebufferStatus;
>+ANGLE_UTIL_EXPORT PFNGLCLEARPROC glClear;
>+ANGLE_UTIL_EXPORT PFNGLCLEARCOLORPROC glClearColor;
>+ANGLE_UTIL_EXPORT PFNGLCLEARDEPTHFPROC glClearDepthf;
>+ANGLE_UTIL_EXPORT PFNGLCLEARSTENCILPROC glClearStencil;
>+ANGLE_UTIL_EXPORT PFNGLCOLORMASKPROC glColorMask;
>+ANGLE_UTIL_EXPORT PFNGLCOMPILESHADERPROC glCompileShader;
>+ANGLE_UTIL_EXPORT PFNGLCOMPRESSEDTEXIMAGE2DPROC glCompressedTexImage2D;
>+ANGLE_UTIL_EXPORT PFNGLCOMPRESSEDTEXSUBIMAGE2DPROC glCompressedTexSubImage2D;
>+ANGLE_UTIL_EXPORT PFNGLCOPYTEXIMAGE2DPROC glCopyTexImage2D;
>+ANGLE_UTIL_EXPORT PFNGLCOPYTEXSUBIMAGE2DPROC glCopyTexSubImage2D;
>+ANGLE_UTIL_EXPORT PFNGLCREATEPROGRAMPROC glCreateProgram;
>+ANGLE_UTIL_EXPORT PFNGLCREATESHADERPROC glCreateShader;
>+ANGLE_UTIL_EXPORT PFNGLCULLFACEPROC glCullFace;
>+ANGLE_UTIL_EXPORT PFNGLDELETEBUFFERSPROC glDeleteBuffers;
>+ANGLE_UTIL_EXPORT PFNGLDELETEFRAMEBUFFERSPROC glDeleteFramebuffers;
>+ANGLE_UTIL_EXPORT PFNGLDELETEPROGRAMPROC glDeleteProgram;
>+ANGLE_UTIL_EXPORT PFNGLDELETERENDERBUFFERSPROC glDeleteRenderbuffers;
>+ANGLE_UTIL_EXPORT PFNGLDELETESHADERPROC glDeleteShader;
>+ANGLE_UTIL_EXPORT PFNGLDELETETEXTURESPROC glDeleteTextures;
>+ANGLE_UTIL_EXPORT PFNGLDEPTHFUNCPROC glDepthFunc;
>+ANGLE_UTIL_EXPORT PFNGLDEPTHMASKPROC glDepthMask;
>+ANGLE_UTIL_EXPORT PFNGLDEPTHRANGEFPROC glDepthRangef;
>+ANGLE_UTIL_EXPORT PFNGLDETACHSHADERPROC glDetachShader;
>+ANGLE_UTIL_EXPORT PFNGLDISABLEPROC glDisable;
>+ANGLE_UTIL_EXPORT PFNGLDISABLEVERTEXATTRIBARRAYPROC glDisableVertexAttribArray;
>+ANGLE_UTIL_EXPORT PFNGLDRAWARRAYSPROC glDrawArrays;
>+ANGLE_UTIL_EXPORT PFNGLDRAWELEMENTSPROC glDrawElements;
>+ANGLE_UTIL_EXPORT PFNGLENABLEPROC glEnable;
>+ANGLE_UTIL_EXPORT PFNGLENABLEVERTEXATTRIBARRAYPROC glEnableVertexAttribArray;
>+ANGLE_UTIL_EXPORT PFNGLFINISHPROC glFinish;
>+ANGLE_UTIL_EXPORT PFNGLFLUSHPROC glFlush;
>+ANGLE_UTIL_EXPORT PFNGLFRAMEBUFFERRENDERBUFFERPROC glFramebufferRenderbuffer;
>+ANGLE_UTIL_EXPORT PFNGLFRAMEBUFFERTEXTURE2DPROC glFramebufferTexture2D;
>+ANGLE_UTIL_EXPORT PFNGLFRONTFACEPROC glFrontFace;
>+ANGLE_UTIL_EXPORT PFNGLGENBUFFERSPROC glGenBuffers;
>+ANGLE_UTIL_EXPORT PFNGLGENERATEMIPMAPPROC glGenerateMipmap;
>+ANGLE_UTIL_EXPORT PFNGLGENFRAMEBUFFERSPROC glGenFramebuffers;
>+ANGLE_UTIL_EXPORT PFNGLGENRENDERBUFFERSPROC glGenRenderbuffers;
>+ANGLE_UTIL_EXPORT PFNGLGENTEXTURESPROC glGenTextures;
>+ANGLE_UTIL_EXPORT PFNGLGETACTIVEATTRIBPROC glGetActiveAttrib;
>+ANGLE_UTIL_EXPORT PFNGLGETACTIVEUNIFORMPROC glGetActiveUniform;
>+ANGLE_UTIL_EXPORT PFNGLGETATTACHEDSHADERSPROC glGetAttachedShaders;
>+ANGLE_UTIL_EXPORT PFNGLGETATTRIBLOCATIONPROC glGetAttribLocation;
>+ANGLE_UTIL_EXPORT PFNGLGETBOOLEANVPROC glGetBooleanv;
>+ANGLE_UTIL_EXPORT PFNGLGETBUFFERPARAMETERIVPROC glGetBufferParameteriv;
>+ANGLE_UTIL_EXPORT PFNGLGETERRORPROC glGetError;
>+ANGLE_UTIL_EXPORT PFNGLGETFLOATVPROC glGetFloatv;
>+ANGLE_UTIL_EXPORT PFNGLGETFRAMEBUFFERATTACHMENTPARAMETERIVPROC
>+    glGetFramebufferAttachmentParameteriv;
>+ANGLE_UTIL_EXPORT PFNGLGETINTEGERVPROC glGetIntegerv;
>+ANGLE_UTIL_EXPORT PFNGLGETPROGRAMIVPROC glGetProgramiv;
>+ANGLE_UTIL_EXPORT PFNGLGETPROGRAMINFOLOGPROC glGetProgramInfoLog;
>+ANGLE_UTIL_EXPORT PFNGLGETRENDERBUFFERPARAMETERIVPROC glGetRenderbufferParameteriv;
>+ANGLE_UTIL_EXPORT PFNGLGETSHADERIVPROC glGetShaderiv;
>+ANGLE_UTIL_EXPORT PFNGLGETSHADERINFOLOGPROC glGetShaderInfoLog;
>+ANGLE_UTIL_EXPORT PFNGLGETSHADERPRECISIONFORMATPROC glGetShaderPrecisionFormat;
>+ANGLE_UTIL_EXPORT PFNGLGETSHADERSOURCEPROC glGetShaderSource;
>+ANGLE_UTIL_EXPORT PFNGLGETSTRINGPROC glGetString;
>+ANGLE_UTIL_EXPORT PFNGLGETTEXPARAMETERFVPROC glGetTexParameterfv;
>+ANGLE_UTIL_EXPORT PFNGLGETTEXPARAMETERIVPROC glGetTexParameteriv;
>+ANGLE_UTIL_EXPORT PFNGLGETUNIFORMFVPROC glGetUniformfv;
>+ANGLE_UTIL_EXPORT PFNGLGETUNIFORMIVPROC glGetUniformiv;
>+ANGLE_UTIL_EXPORT PFNGLGETUNIFORMLOCATIONPROC glGetUniformLocation;
>+ANGLE_UTIL_EXPORT PFNGLGETVERTEXATTRIBFVPROC glGetVertexAttribfv;
>+ANGLE_UTIL_EXPORT PFNGLGETVERTEXATTRIBIVPROC glGetVertexAttribiv;
>+ANGLE_UTIL_EXPORT PFNGLGETVERTEXATTRIBPOINTERVPROC glGetVertexAttribPointerv;
>+ANGLE_UTIL_EXPORT PFNGLHINTPROC glHint;
>+ANGLE_UTIL_EXPORT PFNGLISBUFFERPROC glIsBuffer;
>+ANGLE_UTIL_EXPORT PFNGLISENABLEDPROC glIsEnabled;
>+ANGLE_UTIL_EXPORT PFNGLISFRAMEBUFFERPROC glIsFramebuffer;
>+ANGLE_UTIL_EXPORT PFNGLISPROGRAMPROC glIsProgram;
>+ANGLE_UTIL_EXPORT PFNGLISRENDERBUFFERPROC glIsRenderbuffer;
>+ANGLE_UTIL_EXPORT PFNGLISSHADERPROC glIsShader;
>+ANGLE_UTIL_EXPORT PFNGLISTEXTUREPROC glIsTexture;
>+ANGLE_UTIL_EXPORT PFNGLLINEWIDTHPROC glLineWidth;
>+ANGLE_UTIL_EXPORT PFNGLLINKPROGRAMPROC glLinkProgram;
>+ANGLE_UTIL_EXPORT PFNGLPIXELSTOREIPROC glPixelStorei;
>+ANGLE_UTIL_EXPORT PFNGLPOLYGONOFFSETPROC glPolygonOffset;
>+ANGLE_UTIL_EXPORT PFNGLREADPIXELSPROC glReadPixels;
>+ANGLE_UTIL_EXPORT PFNGLRELEASESHADERCOMPILERPROC glReleaseShaderCompiler;
>+ANGLE_UTIL_EXPORT PFNGLRENDERBUFFERSTORAGEPROC glRenderbufferStorage;
>+ANGLE_UTIL_EXPORT PFNGLSAMPLECOVERAGEPROC glSampleCoverage;
>+ANGLE_UTIL_EXPORT PFNGLSCISSORPROC glScissor;
>+ANGLE_UTIL_EXPORT PFNGLSHADERBINARYPROC glShaderBinary;
>+ANGLE_UTIL_EXPORT PFNGLSHADERSOURCEPROC glShaderSource;
>+ANGLE_UTIL_EXPORT PFNGLSTENCILFUNCPROC glStencilFunc;
>+ANGLE_UTIL_EXPORT PFNGLSTENCILFUNCSEPARATEPROC glStencilFuncSeparate;
>+ANGLE_UTIL_EXPORT PFNGLSTENCILMASKPROC glStencilMask;
>+ANGLE_UTIL_EXPORT PFNGLSTENCILMASKSEPARATEPROC glStencilMaskSeparate;
>+ANGLE_UTIL_EXPORT PFNGLSTENCILOPPROC glStencilOp;
>+ANGLE_UTIL_EXPORT PFNGLSTENCILOPSEPARATEPROC glStencilOpSeparate;
>+ANGLE_UTIL_EXPORT PFNGLTEXIMAGE2DPROC glTexImage2D;
>+ANGLE_UTIL_EXPORT PFNGLTEXPARAMETERFPROC glTexParameterf;
>+ANGLE_UTIL_EXPORT PFNGLTEXPARAMETERFVPROC glTexParameterfv;
>+ANGLE_UTIL_EXPORT PFNGLTEXPARAMETERIPROC glTexParameteri;
>+ANGLE_UTIL_EXPORT PFNGLTEXPARAMETERIVPROC glTexParameteriv;
>+ANGLE_UTIL_EXPORT PFNGLTEXSUBIMAGE2DPROC glTexSubImage2D;
>+ANGLE_UTIL_EXPORT PFNGLUNIFORM1FPROC glUniform1f;
>+ANGLE_UTIL_EXPORT PFNGLUNIFORM1FVPROC glUniform1fv;
>+ANGLE_UTIL_EXPORT PFNGLUNIFORM1IPROC glUniform1i;
>+ANGLE_UTIL_EXPORT PFNGLUNIFORM1IVPROC glUniform1iv;
>+ANGLE_UTIL_EXPORT PFNGLUNIFORM2FPROC glUniform2f;
>+ANGLE_UTIL_EXPORT PFNGLUNIFORM2FVPROC glUniform2fv;
>+ANGLE_UTIL_EXPORT PFNGLUNIFORM2IPROC glUniform2i;
>+ANGLE_UTIL_EXPORT PFNGLUNIFORM2IVPROC glUniform2iv;
>+ANGLE_UTIL_EXPORT PFNGLUNIFORM3FPROC glUniform3f;
>+ANGLE_UTIL_EXPORT PFNGLUNIFORM3FVPROC glUniform3fv;
>+ANGLE_UTIL_EXPORT PFNGLUNIFORM3IPROC glUniform3i;
>+ANGLE_UTIL_EXPORT PFNGLUNIFORM3IVPROC glUniform3iv;
>+ANGLE_UTIL_EXPORT PFNGLUNIFORM4FPROC glUniform4f;
>+ANGLE_UTIL_EXPORT PFNGLUNIFORM4FVPROC glUniform4fv;
>+ANGLE_UTIL_EXPORT PFNGLUNIFORM4IPROC glUniform4i;
>+ANGLE_UTIL_EXPORT PFNGLUNIFORM4IVPROC glUniform4iv;
>+ANGLE_UTIL_EXPORT PFNGLUNIFORMMATRIX2FVPROC glUniformMatrix2fv;
>+ANGLE_UTIL_EXPORT PFNGLUNIFORMMATRIX3FVPROC glUniformMatrix3fv;
>+ANGLE_UTIL_EXPORT PFNGLUNIFORMMATRIX4FVPROC glUniformMatrix4fv;
>+ANGLE_UTIL_EXPORT PFNGLUSEPROGRAMPROC glUseProgram;
>+ANGLE_UTIL_EXPORT PFNGLVALIDATEPROGRAMPROC glValidateProgram;
>+ANGLE_UTIL_EXPORT PFNGLVERTEXATTRIB1FPROC glVertexAttrib1f;
>+ANGLE_UTIL_EXPORT PFNGLVERTEXATTRIB1FVPROC glVertexAttrib1fv;
>+ANGLE_UTIL_EXPORT PFNGLVERTEXATTRIB2FPROC glVertexAttrib2f;
>+ANGLE_UTIL_EXPORT PFNGLVERTEXATTRIB2FVPROC glVertexAttrib2fv;
>+ANGLE_UTIL_EXPORT PFNGLVERTEXATTRIB3FPROC glVertexAttrib3f;
>+ANGLE_UTIL_EXPORT PFNGLVERTEXATTRIB3FVPROC glVertexAttrib3fv;
>+ANGLE_UTIL_EXPORT PFNGLVERTEXATTRIB4FPROC glVertexAttrib4f;
>+ANGLE_UTIL_EXPORT PFNGLVERTEXATTRIB4FVPROC glVertexAttrib4fv;
>+ANGLE_UTIL_EXPORT PFNGLVERTEXATTRIBPOINTERPROC glVertexAttribPointer;
>+ANGLE_UTIL_EXPORT PFNGLVIEWPORTPROC glViewport;
>+ANGLE_UTIL_EXPORT PFNGLREADBUFFERPROC glReadBuffer;
>+ANGLE_UTIL_EXPORT PFNGLDRAWRANGEELEMENTSPROC glDrawRangeElements;
>+ANGLE_UTIL_EXPORT PFNGLTEXIMAGE3DPROC glTexImage3D;
>+ANGLE_UTIL_EXPORT PFNGLTEXSUBIMAGE3DPROC glTexSubImage3D;
>+ANGLE_UTIL_EXPORT PFNGLCOPYTEXSUBIMAGE3DPROC glCopyTexSubImage3D;
>+ANGLE_UTIL_EXPORT PFNGLCOMPRESSEDTEXIMAGE3DPROC glCompressedTexImage3D;
>+ANGLE_UTIL_EXPORT PFNGLCOMPRESSEDTEXSUBIMAGE3DPROC glCompressedTexSubImage3D;
>+ANGLE_UTIL_EXPORT PFNGLGENQUERIESPROC glGenQueries;
>+ANGLE_UTIL_EXPORT PFNGLDELETEQUERIESPROC glDeleteQueries;
>+ANGLE_UTIL_EXPORT PFNGLISQUERYPROC glIsQuery;
>+ANGLE_UTIL_EXPORT PFNGLBEGINQUERYPROC glBeginQuery;
>+ANGLE_UTIL_EXPORT PFNGLENDQUERYPROC glEndQuery;
>+ANGLE_UTIL_EXPORT PFNGLGETQUERYIVPROC glGetQueryiv;
>+ANGLE_UTIL_EXPORT PFNGLGETQUERYOBJECTUIVPROC glGetQueryObjectuiv;
>+ANGLE_UTIL_EXPORT PFNGLUNMAPBUFFERPROC glUnmapBuffer;
>+ANGLE_UTIL_EXPORT PFNGLGETBUFFERPOINTERVPROC glGetBufferPointerv;
>+ANGLE_UTIL_EXPORT PFNGLDRAWBUFFERSPROC glDrawBuffers;
>+ANGLE_UTIL_EXPORT PFNGLUNIFORMMATRIX2X3FVPROC glUniformMatrix2x3fv;
>+ANGLE_UTIL_EXPORT PFNGLUNIFORMMATRIX3X2FVPROC glUniformMatrix3x2fv;
>+ANGLE_UTIL_EXPORT PFNGLUNIFORMMATRIX2X4FVPROC glUniformMatrix2x4fv;
>+ANGLE_UTIL_EXPORT PFNGLUNIFORMMATRIX4X2FVPROC glUniformMatrix4x2fv;
>+ANGLE_UTIL_EXPORT PFNGLUNIFORMMATRIX3X4FVPROC glUniformMatrix3x4fv;
>+ANGLE_UTIL_EXPORT PFNGLUNIFORMMATRIX4X3FVPROC glUniformMatrix4x3fv;
>+ANGLE_UTIL_EXPORT PFNGLBLITFRAMEBUFFERPROC glBlitFramebuffer;
>+ANGLE_UTIL_EXPORT PFNGLRENDERBUFFERSTORAGEMULTISAMPLEPROC glRenderbufferStorageMultisample;
>+ANGLE_UTIL_EXPORT PFNGLFRAMEBUFFERTEXTURELAYERPROC glFramebufferTextureLayer;
>+ANGLE_UTIL_EXPORT PFNGLMAPBUFFERRANGEPROC glMapBufferRange;
>+ANGLE_UTIL_EXPORT PFNGLFLUSHMAPPEDBUFFERRANGEPROC glFlushMappedBufferRange;
>+ANGLE_UTIL_EXPORT PFNGLBINDVERTEXARRAYPROC glBindVertexArray;
>+ANGLE_UTIL_EXPORT PFNGLDELETEVERTEXARRAYSPROC glDeleteVertexArrays;
>+ANGLE_UTIL_EXPORT PFNGLGENVERTEXARRAYSPROC glGenVertexArrays;
>+ANGLE_UTIL_EXPORT PFNGLISVERTEXARRAYPROC glIsVertexArray;
>+ANGLE_UTIL_EXPORT PFNGLGETINTEGERI_VPROC glGetIntegeri_v;
>+ANGLE_UTIL_EXPORT PFNGLBEGINTRANSFORMFEEDBACKPROC glBeginTransformFeedback;
>+ANGLE_UTIL_EXPORT PFNGLENDTRANSFORMFEEDBACKPROC glEndTransformFeedback;
>+ANGLE_UTIL_EXPORT PFNGLBINDBUFFERRANGEPROC glBindBufferRange;
>+ANGLE_UTIL_EXPORT PFNGLBINDBUFFERBASEPROC glBindBufferBase;
>+ANGLE_UTIL_EXPORT PFNGLTRANSFORMFEEDBACKVARYINGSPROC glTransformFeedbackVaryings;
>+ANGLE_UTIL_EXPORT PFNGLGETTRANSFORMFEEDBACKVARYINGPROC glGetTransformFeedbackVarying;
>+ANGLE_UTIL_EXPORT PFNGLVERTEXATTRIBIPOINTERPROC glVertexAttribIPointer;
>+ANGLE_UTIL_EXPORT PFNGLGETVERTEXATTRIBIIVPROC glGetVertexAttribIiv;
>+ANGLE_UTIL_EXPORT PFNGLGETVERTEXATTRIBIUIVPROC glGetVertexAttribIuiv;
>+ANGLE_UTIL_EXPORT PFNGLVERTEXATTRIBI4IPROC glVertexAttribI4i;
>+ANGLE_UTIL_EXPORT PFNGLVERTEXATTRIBI4UIPROC glVertexAttribI4ui;
>+ANGLE_UTIL_EXPORT PFNGLVERTEXATTRIBI4IVPROC glVertexAttribI4iv;
>+ANGLE_UTIL_EXPORT PFNGLVERTEXATTRIBI4UIVPROC glVertexAttribI4uiv;
>+ANGLE_UTIL_EXPORT PFNGLGETUNIFORMUIVPROC glGetUniformuiv;
>+ANGLE_UTIL_EXPORT PFNGLGETFRAGDATALOCATIONPROC glGetFragDataLocation;
>+ANGLE_UTIL_EXPORT PFNGLUNIFORM1UIPROC glUniform1ui;
>+ANGLE_UTIL_EXPORT PFNGLUNIFORM2UIPROC glUniform2ui;
>+ANGLE_UTIL_EXPORT PFNGLUNIFORM3UIPROC glUniform3ui;
>+ANGLE_UTIL_EXPORT PFNGLUNIFORM4UIPROC glUniform4ui;
>+ANGLE_UTIL_EXPORT PFNGLUNIFORM1UIVPROC glUniform1uiv;
>+ANGLE_UTIL_EXPORT PFNGLUNIFORM2UIVPROC glUniform2uiv;
>+ANGLE_UTIL_EXPORT PFNGLUNIFORM3UIVPROC glUniform3uiv;
>+ANGLE_UTIL_EXPORT PFNGLUNIFORM4UIVPROC glUniform4uiv;
>+ANGLE_UTIL_EXPORT PFNGLCLEARBUFFERIVPROC glClearBufferiv;
>+ANGLE_UTIL_EXPORT PFNGLCLEARBUFFERUIVPROC glClearBufferuiv;
>+ANGLE_UTIL_EXPORT PFNGLCLEARBUFFERFVPROC glClearBufferfv;
>+ANGLE_UTIL_EXPORT PFNGLCLEARBUFFERFIPROC glClearBufferfi;
>+ANGLE_UTIL_EXPORT PFNGLGETSTRINGIPROC glGetStringi;
>+ANGLE_UTIL_EXPORT PFNGLCOPYBUFFERSUBDATAPROC glCopyBufferSubData;
>+ANGLE_UTIL_EXPORT PFNGLGETUNIFORMINDICESPROC glGetUniformIndices;
>+ANGLE_UTIL_EXPORT PFNGLGETACTIVEUNIFORMSIVPROC glGetActiveUniformsiv;
>+ANGLE_UTIL_EXPORT PFNGLGETUNIFORMBLOCKINDEXPROC glGetUniformBlockIndex;
>+ANGLE_UTIL_EXPORT PFNGLGETACTIVEUNIFORMBLOCKIVPROC glGetActiveUniformBlockiv;
>+ANGLE_UTIL_EXPORT PFNGLGETACTIVEUNIFORMBLOCKNAMEPROC glGetActiveUniformBlockName;
>+ANGLE_UTIL_EXPORT PFNGLUNIFORMBLOCKBINDINGPROC glUniformBlockBinding;
>+ANGLE_UTIL_EXPORT PFNGLDRAWARRAYSINSTANCEDPROC glDrawArraysInstanced;
>+ANGLE_UTIL_EXPORT PFNGLDRAWELEMENTSINSTANCEDPROC glDrawElementsInstanced;
>+ANGLE_UTIL_EXPORT PFNGLFENCESYNCPROC glFenceSync;
>+ANGLE_UTIL_EXPORT PFNGLISSYNCPROC glIsSync;
>+ANGLE_UTIL_EXPORT PFNGLDELETESYNCPROC glDeleteSync;
>+ANGLE_UTIL_EXPORT PFNGLCLIENTWAITSYNCPROC glClientWaitSync;
>+ANGLE_UTIL_EXPORT PFNGLWAITSYNCPROC glWaitSync;
>+ANGLE_UTIL_EXPORT PFNGLGETINTEGER64VPROC glGetInteger64v;
>+ANGLE_UTIL_EXPORT PFNGLGETSYNCIVPROC glGetSynciv;
>+ANGLE_UTIL_EXPORT PFNGLGETINTEGER64I_VPROC glGetInteger64i_v;
>+ANGLE_UTIL_EXPORT PFNGLGETBUFFERPARAMETERI64VPROC glGetBufferParameteri64v;
>+ANGLE_UTIL_EXPORT PFNGLGENSAMPLERSPROC glGenSamplers;
>+ANGLE_UTIL_EXPORT PFNGLDELETESAMPLERSPROC glDeleteSamplers;
>+ANGLE_UTIL_EXPORT PFNGLISSAMPLERPROC glIsSampler;
>+ANGLE_UTIL_EXPORT PFNGLBINDSAMPLERPROC glBindSampler;
>+ANGLE_UTIL_EXPORT PFNGLSAMPLERPARAMETERIPROC glSamplerParameteri;
>+ANGLE_UTIL_EXPORT PFNGLSAMPLERPARAMETERIVPROC glSamplerParameteriv;
>+ANGLE_UTIL_EXPORT PFNGLSAMPLERPARAMETERFPROC glSamplerParameterf;
>+ANGLE_UTIL_EXPORT PFNGLSAMPLERPARAMETERFVPROC glSamplerParameterfv;
>+ANGLE_UTIL_EXPORT PFNGLGETSAMPLERPARAMETERIVPROC glGetSamplerParameteriv;
>+ANGLE_UTIL_EXPORT PFNGLGETSAMPLERPARAMETERFVPROC glGetSamplerParameterfv;
>+ANGLE_UTIL_EXPORT PFNGLVERTEXATTRIBDIVISORPROC glVertexAttribDivisor;
>+ANGLE_UTIL_EXPORT PFNGLBINDTRANSFORMFEEDBACKPROC glBindTransformFeedback;
>+ANGLE_UTIL_EXPORT PFNGLDELETETRANSFORMFEEDBACKSPROC glDeleteTransformFeedbacks;
>+ANGLE_UTIL_EXPORT PFNGLGENTRANSFORMFEEDBACKSPROC glGenTransformFeedbacks;
>+ANGLE_UTIL_EXPORT PFNGLISTRANSFORMFEEDBACKPROC glIsTransformFeedback;
>+ANGLE_UTIL_EXPORT PFNGLPAUSETRANSFORMFEEDBACKPROC glPauseTransformFeedback;
>+ANGLE_UTIL_EXPORT PFNGLRESUMETRANSFORMFEEDBACKPROC glResumeTransformFeedback;
>+ANGLE_UTIL_EXPORT PFNGLGETPROGRAMBINARYPROC glGetProgramBinary;
>+ANGLE_UTIL_EXPORT PFNGLPROGRAMBINARYPROC glProgramBinary;
>+ANGLE_UTIL_EXPORT PFNGLPROGRAMPARAMETERIPROC glProgramParameteri;
>+ANGLE_UTIL_EXPORT PFNGLINVALIDATEFRAMEBUFFERPROC glInvalidateFramebuffer;
>+ANGLE_UTIL_EXPORT PFNGLINVALIDATESUBFRAMEBUFFERPROC glInvalidateSubFramebuffer;
>+ANGLE_UTIL_EXPORT PFNGLTEXSTORAGE2DPROC glTexStorage2D;
>+ANGLE_UTIL_EXPORT PFNGLTEXSTORAGE3DPROC glTexStorage3D;
>+ANGLE_UTIL_EXPORT PFNGLGETINTERNALFORMATIVPROC glGetInternalformativ;
>+ANGLE_UTIL_EXPORT PFNGLDISPATCHCOMPUTEPROC glDispatchCompute;
>+ANGLE_UTIL_EXPORT PFNGLDISPATCHCOMPUTEINDIRECTPROC glDispatchComputeIndirect;
>+ANGLE_UTIL_EXPORT PFNGLDRAWARRAYSINDIRECTPROC glDrawArraysIndirect;
>+ANGLE_UTIL_EXPORT PFNGLDRAWELEMENTSINDIRECTPROC glDrawElementsIndirect;
>+ANGLE_UTIL_EXPORT PFNGLFRAMEBUFFERPARAMETERIPROC glFramebufferParameteri;
>+ANGLE_UTIL_EXPORT PFNGLGETFRAMEBUFFERPARAMETERIVPROC glGetFramebufferParameteriv;
>+ANGLE_UTIL_EXPORT PFNGLGETPROGRAMINTERFACEIVPROC glGetProgramInterfaceiv;
>+ANGLE_UTIL_EXPORT PFNGLGETPROGRAMRESOURCEINDEXPROC glGetProgramResourceIndex;
>+ANGLE_UTIL_EXPORT PFNGLGETPROGRAMRESOURCENAMEPROC glGetProgramResourceName;
>+ANGLE_UTIL_EXPORT PFNGLGETPROGRAMRESOURCEIVPROC glGetProgramResourceiv;
>+ANGLE_UTIL_EXPORT PFNGLGETPROGRAMRESOURCELOCATIONPROC glGetProgramResourceLocation;
>+ANGLE_UTIL_EXPORT PFNGLUSEPROGRAMSTAGESPROC glUseProgramStages;
>+ANGLE_UTIL_EXPORT PFNGLACTIVESHADERPROGRAMPROC glActiveShaderProgram;
>+ANGLE_UTIL_EXPORT PFNGLCREATESHADERPROGRAMVPROC glCreateShaderProgramv;
>+ANGLE_UTIL_EXPORT PFNGLBINDPROGRAMPIPELINEPROC glBindProgramPipeline;
>+ANGLE_UTIL_EXPORT PFNGLDELETEPROGRAMPIPELINESPROC glDeleteProgramPipelines;
>+ANGLE_UTIL_EXPORT PFNGLGENPROGRAMPIPELINESPROC glGenProgramPipelines;
>+ANGLE_UTIL_EXPORT PFNGLISPROGRAMPIPELINEPROC glIsProgramPipeline;
>+ANGLE_UTIL_EXPORT PFNGLGETPROGRAMPIPELINEIVPROC glGetProgramPipelineiv;
>+ANGLE_UTIL_EXPORT PFNGLPROGRAMUNIFORM1IPROC glProgramUniform1i;
>+ANGLE_UTIL_EXPORT PFNGLPROGRAMUNIFORM2IPROC glProgramUniform2i;
>+ANGLE_UTIL_EXPORT PFNGLPROGRAMUNIFORM3IPROC glProgramUniform3i;
>+ANGLE_UTIL_EXPORT PFNGLPROGRAMUNIFORM4IPROC glProgramUniform4i;
>+ANGLE_UTIL_EXPORT PFNGLPROGRAMUNIFORM1UIPROC glProgramUniform1ui;
>+ANGLE_UTIL_EXPORT PFNGLPROGRAMUNIFORM2UIPROC glProgramUniform2ui;
>+ANGLE_UTIL_EXPORT PFNGLPROGRAMUNIFORM3UIPROC glProgramUniform3ui;
>+ANGLE_UTIL_EXPORT PFNGLPROGRAMUNIFORM4UIPROC glProgramUniform4ui;
>+ANGLE_UTIL_EXPORT PFNGLPROGRAMUNIFORM1FPROC glProgramUniform1f;
>+ANGLE_UTIL_EXPORT PFNGLPROGRAMUNIFORM2FPROC glProgramUniform2f;
>+ANGLE_UTIL_EXPORT PFNGLPROGRAMUNIFORM3FPROC glProgramUniform3f;
>+ANGLE_UTIL_EXPORT PFNGLPROGRAMUNIFORM4FPROC glProgramUniform4f;
>+ANGLE_UTIL_EXPORT PFNGLPROGRAMUNIFORM1IVPROC glProgramUniform1iv;
>+ANGLE_UTIL_EXPORT PFNGLPROGRAMUNIFORM2IVPROC glProgramUniform2iv;
>+ANGLE_UTIL_EXPORT PFNGLPROGRAMUNIFORM3IVPROC glProgramUniform3iv;
>+ANGLE_UTIL_EXPORT PFNGLPROGRAMUNIFORM4IVPROC glProgramUniform4iv;
>+ANGLE_UTIL_EXPORT PFNGLPROGRAMUNIFORM1UIVPROC glProgramUniform1uiv;
>+ANGLE_UTIL_EXPORT PFNGLPROGRAMUNIFORM2UIVPROC glProgramUniform2uiv;
>+ANGLE_UTIL_EXPORT PFNGLPROGRAMUNIFORM3UIVPROC glProgramUniform3uiv;
>+ANGLE_UTIL_EXPORT PFNGLPROGRAMUNIFORM4UIVPROC glProgramUniform4uiv;
>+ANGLE_UTIL_EXPORT PFNGLPROGRAMUNIFORM1FVPROC glProgramUniform1fv;
>+ANGLE_UTIL_EXPORT PFNGLPROGRAMUNIFORM2FVPROC glProgramUniform2fv;
>+ANGLE_UTIL_EXPORT PFNGLPROGRAMUNIFORM3FVPROC glProgramUniform3fv;
>+ANGLE_UTIL_EXPORT PFNGLPROGRAMUNIFORM4FVPROC glProgramUniform4fv;
>+ANGLE_UTIL_EXPORT PFNGLPROGRAMUNIFORMMATRIX2FVPROC glProgramUniformMatrix2fv;
>+ANGLE_UTIL_EXPORT PFNGLPROGRAMUNIFORMMATRIX3FVPROC glProgramUniformMatrix3fv;
>+ANGLE_UTIL_EXPORT PFNGLPROGRAMUNIFORMMATRIX4FVPROC glProgramUniformMatrix4fv;
>+ANGLE_UTIL_EXPORT PFNGLPROGRAMUNIFORMMATRIX2X3FVPROC glProgramUniformMatrix2x3fv;
>+ANGLE_UTIL_EXPORT PFNGLPROGRAMUNIFORMMATRIX3X2FVPROC glProgramUniformMatrix3x2fv;
>+ANGLE_UTIL_EXPORT PFNGLPROGRAMUNIFORMMATRIX2X4FVPROC glProgramUniformMatrix2x4fv;
>+ANGLE_UTIL_EXPORT PFNGLPROGRAMUNIFORMMATRIX4X2FVPROC glProgramUniformMatrix4x2fv;
>+ANGLE_UTIL_EXPORT PFNGLPROGRAMUNIFORMMATRIX3X4FVPROC glProgramUniformMatrix3x4fv;
>+ANGLE_UTIL_EXPORT PFNGLPROGRAMUNIFORMMATRIX4X3FVPROC glProgramUniformMatrix4x3fv;
>+ANGLE_UTIL_EXPORT PFNGLVALIDATEPROGRAMPIPELINEPROC glValidateProgramPipeline;
>+ANGLE_UTIL_EXPORT PFNGLGETPROGRAMPIPELINEINFOLOGPROC glGetProgramPipelineInfoLog;
>+ANGLE_UTIL_EXPORT PFNGLBINDIMAGETEXTUREPROC glBindImageTexture;
>+ANGLE_UTIL_EXPORT PFNGLGETBOOLEANI_VPROC glGetBooleani_v;
>+ANGLE_UTIL_EXPORT PFNGLMEMORYBARRIERPROC glMemoryBarrier;
>+ANGLE_UTIL_EXPORT PFNGLMEMORYBARRIERBYREGIONPROC glMemoryBarrierByRegion;
>+ANGLE_UTIL_EXPORT PFNGLTEXSTORAGE2DMULTISAMPLEPROC glTexStorage2DMultisample;
>+ANGLE_UTIL_EXPORT PFNGLGETMULTISAMPLEFVPROC glGetMultisamplefv;
>+ANGLE_UTIL_EXPORT PFNGLSAMPLEMASKIPROC glSampleMaski;
>+ANGLE_UTIL_EXPORT PFNGLGETTEXLEVELPARAMETERIVPROC glGetTexLevelParameteriv;
>+ANGLE_UTIL_EXPORT PFNGLGETTEXLEVELPARAMETERFVPROC glGetTexLevelParameterfv;
>+ANGLE_UTIL_EXPORT PFNGLBINDVERTEXBUFFERPROC glBindVertexBuffer;
>+ANGLE_UTIL_EXPORT PFNGLVERTEXATTRIBFORMATPROC glVertexAttribFormat;
>+ANGLE_UTIL_EXPORT PFNGLVERTEXATTRIBIFORMATPROC glVertexAttribIFormat;
>+ANGLE_UTIL_EXPORT PFNGLVERTEXATTRIBBINDINGPROC glVertexAttribBinding;
>+ANGLE_UTIL_EXPORT PFNGLVERTEXBINDINGDIVISORPROC glVertexBindingDivisor;
>+ANGLE_UTIL_EXPORT PFNGLCOPYSUBTEXTURE3DANGLEPROC glCopySubTexture3DANGLE;
>+ANGLE_UTIL_EXPORT PFNGLCOPYTEXTURE3DANGLEPROC glCopyTexture3DANGLE;
>+ANGLE_UTIL_EXPORT PFNGLBLITFRAMEBUFFERANGLEPROC glBlitFramebufferANGLE;
>+ANGLE_UTIL_EXPORT PFNGLRENDERBUFFERSTORAGEMULTISAMPLEANGLEPROC
>+    glRenderbufferStorageMultisampleANGLE;
>+ANGLE_UTIL_EXPORT PFNGLDRAWARRAYSINSTANCEDANGLEPROC glDrawArraysInstancedANGLE;
>+ANGLE_UTIL_EXPORT PFNGLDRAWELEMENTSINSTANCEDANGLEPROC glDrawElementsInstancedANGLE;
>+ANGLE_UTIL_EXPORT PFNGLVERTEXATTRIBDIVISORANGLEPROC glVertexAttribDivisorANGLE;
>+ANGLE_UTIL_EXPORT PFNGLMULTIDRAWARRAYSANGLEPROC glMultiDrawArraysANGLE;
>+ANGLE_UTIL_EXPORT PFNGLMULTIDRAWARRAYSINSTANCEDANGLEPROC glMultiDrawArraysInstancedANGLE;
>+ANGLE_UTIL_EXPORT PFNGLMULTIDRAWELEMENTSANGLEPROC glMultiDrawElementsANGLE;
>+ANGLE_UTIL_EXPORT PFNGLMULTIDRAWELEMENTSINSTANCEDANGLEPROC glMultiDrawElementsInstancedANGLE;
>+ANGLE_UTIL_EXPORT PFNGLPROVOKINGVERTEXANGLEPROC glProvokingVertexANGLE;
>+ANGLE_UTIL_EXPORT PFNGLREQUESTEXTENSIONANGLEPROC glRequestExtensionANGLE;
>+ANGLE_UTIL_EXPORT PFNGLCOMPRESSEDTEXIMAGE2DROBUSTANGLEPROC glCompressedTexImage2DRobustANGLE;
>+ANGLE_UTIL_EXPORT PFNGLCOMPRESSEDTEXIMAGE3DROBUSTANGLEPROC glCompressedTexImage3DRobustANGLE;
>+ANGLE_UTIL_EXPORT PFNGLCOMPRESSEDTEXSUBIMAGE2DROBUSTANGLEPROC glCompressedTexSubImage2DRobustANGLE;
>+ANGLE_UTIL_EXPORT PFNGLCOMPRESSEDTEXSUBIMAGE3DROBUSTANGLEPROC glCompressedTexSubImage3DRobustANGLE;
>+ANGLE_UTIL_EXPORT PFNGLGETACTIVEUNIFORMBLOCKIVROBUSTANGLEPROC glGetActiveUniformBlockivRobustANGLE;
>+ANGLE_UTIL_EXPORT PFNGLGETBOOLEANI_VROBUSTANGLEPROC glGetBooleani_vRobustANGLE;
>+ANGLE_UTIL_EXPORT PFNGLGETBOOLEANVROBUSTANGLEPROC glGetBooleanvRobustANGLE;
>+ANGLE_UTIL_EXPORT PFNGLGETBUFFERPARAMETERI64VROBUSTANGLEPROC glGetBufferParameteri64vRobustANGLE;
>+ANGLE_UTIL_EXPORT PFNGLGETBUFFERPARAMETERIVROBUSTANGLEPROC glGetBufferParameterivRobustANGLE;
>+ANGLE_UTIL_EXPORT PFNGLGETBUFFERPOINTERVROBUSTANGLEPROC glGetBufferPointervRobustANGLE;
>+ANGLE_UTIL_EXPORT PFNGLGETFLOATVROBUSTANGLEPROC glGetFloatvRobustANGLE;
>+ANGLE_UTIL_EXPORT PFNGLGETFRAMEBUFFERATTACHMENTPARAMETERIVROBUSTANGLEPROC
>+    glGetFramebufferAttachmentParameterivRobustANGLE;
>+ANGLE_UTIL_EXPORT PFNGLGETFRAMEBUFFERPARAMETERIVROBUSTANGLEPROC
>+    glGetFramebufferParameterivRobustANGLE;
>+ANGLE_UTIL_EXPORT PFNGLGETINTEGER64I_VROBUSTANGLEPROC glGetInteger64i_vRobustANGLE;
>+ANGLE_UTIL_EXPORT PFNGLGETINTEGER64VROBUSTANGLEPROC glGetInteger64vRobustANGLE;
>+ANGLE_UTIL_EXPORT PFNGLGETINTEGERI_VROBUSTANGLEPROC glGetIntegeri_vRobustANGLE;
>+ANGLE_UTIL_EXPORT PFNGLGETINTEGERVROBUSTANGLEPROC glGetIntegervRobustANGLE;
>+ANGLE_UTIL_EXPORT PFNGLGETINTERNALFORMATIVROBUSTANGLEPROC glGetInternalformativRobustANGLE;
>+ANGLE_UTIL_EXPORT PFNGLGETMULTISAMPLEFVROBUSTANGLEPROC glGetMultisamplefvRobustANGLE;
>+ANGLE_UTIL_EXPORT PFNGLGETPOINTERVROBUSTANGLEROBUSTANGLEPROC glGetPointervRobustANGLERobustANGLE;
>+ANGLE_UTIL_EXPORT PFNGLGETPROGRAMINTERFACEIVROBUSTANGLEPROC glGetProgramInterfaceivRobustANGLE;
>+ANGLE_UTIL_EXPORT PFNGLGETPROGRAMIVROBUSTANGLEPROC glGetProgramivRobustANGLE;
>+ANGLE_UTIL_EXPORT PFNGLGETQUERYOBJECTI64VROBUSTANGLEPROC glGetQueryObjecti64vRobustANGLE;
>+ANGLE_UTIL_EXPORT PFNGLGETQUERYOBJECTIVROBUSTANGLEPROC glGetQueryObjectivRobustANGLE;
>+ANGLE_UTIL_EXPORT PFNGLGETQUERYOBJECTUI64VROBUSTANGLEPROC glGetQueryObjectui64vRobustANGLE;
>+ANGLE_UTIL_EXPORT PFNGLGETQUERYOBJECTUIVROBUSTANGLEPROC glGetQueryObjectuivRobustANGLE;
>+ANGLE_UTIL_EXPORT PFNGLGETQUERYIVROBUSTANGLEPROC glGetQueryivRobustANGLE;
>+ANGLE_UTIL_EXPORT PFNGLGETRENDERBUFFERPARAMETERIVROBUSTANGLEPROC
>+    glGetRenderbufferParameterivRobustANGLE;
>+ANGLE_UTIL_EXPORT PFNGLGETSAMPLERPARAMETERIIVROBUSTANGLEPROC glGetSamplerParameterIivRobustANGLE;
>+ANGLE_UTIL_EXPORT PFNGLGETSAMPLERPARAMETERIUIVROBUSTANGLEPROC glGetSamplerParameterIuivRobustANGLE;
>+ANGLE_UTIL_EXPORT PFNGLGETSAMPLERPARAMETERFVROBUSTANGLEPROC glGetSamplerParameterfvRobustANGLE;
>+ANGLE_UTIL_EXPORT PFNGLGETSAMPLERPARAMETERIVROBUSTANGLEPROC glGetSamplerParameterivRobustANGLE;
>+ANGLE_UTIL_EXPORT PFNGLGETSHADERIVROBUSTANGLEPROC glGetShaderivRobustANGLE;
>+ANGLE_UTIL_EXPORT PFNGLGETTEXLEVELPARAMETERFVROBUSTANGLEPROC glGetTexLevelParameterfvRobustANGLE;
>+ANGLE_UTIL_EXPORT PFNGLGETTEXLEVELPARAMETERIVROBUSTANGLEPROC glGetTexLevelParameterivRobustANGLE;
>+ANGLE_UTIL_EXPORT PFNGLGETTEXPARAMETERIIVROBUSTANGLEPROC glGetTexParameterIivRobustANGLE;
>+ANGLE_UTIL_EXPORT PFNGLGETTEXPARAMETERIUIVROBUSTANGLEPROC glGetTexParameterIuivRobustANGLE;
>+ANGLE_UTIL_EXPORT PFNGLGETTEXPARAMETERFVROBUSTANGLEPROC glGetTexParameterfvRobustANGLE;
>+ANGLE_UTIL_EXPORT PFNGLGETTEXPARAMETERIVROBUSTANGLEPROC glGetTexParameterivRobustANGLE;
>+ANGLE_UTIL_EXPORT PFNGLGETUNIFORMFVROBUSTANGLEPROC glGetUniformfvRobustANGLE;
>+ANGLE_UTIL_EXPORT PFNGLGETUNIFORMIVROBUSTANGLEPROC glGetUniformivRobustANGLE;
>+ANGLE_UTIL_EXPORT PFNGLGETUNIFORMUIVROBUSTANGLEPROC glGetUniformuivRobustANGLE;
>+ANGLE_UTIL_EXPORT PFNGLGETVERTEXATTRIBIIVROBUSTANGLEPROC glGetVertexAttribIivRobustANGLE;
>+ANGLE_UTIL_EXPORT PFNGLGETVERTEXATTRIBIUIVROBUSTANGLEPROC glGetVertexAttribIuivRobustANGLE;
>+ANGLE_UTIL_EXPORT PFNGLGETVERTEXATTRIBPOINTERVROBUSTANGLEPROC glGetVertexAttribPointervRobustANGLE;
>+ANGLE_UTIL_EXPORT PFNGLGETVERTEXATTRIBFVROBUSTANGLEPROC glGetVertexAttribfvRobustANGLE;
>+ANGLE_UTIL_EXPORT PFNGLGETVERTEXATTRIBIVROBUSTANGLEPROC glGetVertexAttribivRobustANGLE;
>+ANGLE_UTIL_EXPORT PFNGLGETNUNIFORMFVROBUSTANGLEPROC glGetnUniformfvRobustANGLE;
>+ANGLE_UTIL_EXPORT PFNGLGETNUNIFORMIVROBUSTANGLEPROC glGetnUniformivRobustANGLE;
>+ANGLE_UTIL_EXPORT PFNGLGETNUNIFORMUIVROBUSTANGLEPROC glGetnUniformuivRobustANGLE;
>+ANGLE_UTIL_EXPORT PFNGLREADPIXELSROBUSTANGLEPROC glReadPixelsRobustANGLE;
>+ANGLE_UTIL_EXPORT PFNGLREADNPIXELSROBUSTANGLEPROC glReadnPixelsRobustANGLE;
>+ANGLE_UTIL_EXPORT PFNGLSAMPLERPARAMETERIIVROBUSTANGLEPROC glSamplerParameterIivRobustANGLE;
>+ANGLE_UTIL_EXPORT PFNGLSAMPLERPARAMETERIUIVROBUSTANGLEPROC glSamplerParameterIuivRobustANGLE;
>+ANGLE_UTIL_EXPORT PFNGLSAMPLERPARAMETERFVROBUSTANGLEPROC glSamplerParameterfvRobustANGLE;
>+ANGLE_UTIL_EXPORT PFNGLSAMPLERPARAMETERIVROBUSTANGLEPROC glSamplerParameterivRobustANGLE;
>+ANGLE_UTIL_EXPORT PFNGLTEXIMAGE2DROBUSTANGLEPROC glTexImage2DRobustANGLE;
>+ANGLE_UTIL_EXPORT PFNGLTEXIMAGE3DROBUSTANGLEPROC glTexImage3DRobustANGLE;
>+ANGLE_UTIL_EXPORT PFNGLTEXPARAMETERIIVROBUSTANGLEPROC glTexParameterIivRobustANGLE;
>+ANGLE_UTIL_EXPORT PFNGLTEXPARAMETERIUIVROBUSTANGLEPROC glTexParameterIuivRobustANGLE;
>+ANGLE_UTIL_EXPORT PFNGLTEXPARAMETERFVROBUSTANGLEPROC glTexParameterfvRobustANGLE;
>+ANGLE_UTIL_EXPORT PFNGLTEXPARAMETERIVROBUSTANGLEPROC glTexParameterivRobustANGLE;
>+ANGLE_UTIL_EXPORT PFNGLTEXSUBIMAGE2DROBUSTANGLEPROC glTexSubImage2DRobustANGLE;
>+ANGLE_UTIL_EXPORT PFNGLTEXSUBIMAGE3DROBUSTANGLEPROC glTexSubImage3DRobustANGLE;
>+ANGLE_UTIL_EXPORT PFNGLGETMULTISAMPLEFVANGLEPROC glGetMultisamplefvANGLE;
>+ANGLE_UTIL_EXPORT PFNGLGETTEXLEVELPARAMETERFVANGLEPROC glGetTexLevelParameterfvANGLE;
>+ANGLE_UTIL_EXPORT PFNGLGETTEXLEVELPARAMETERIVANGLEPROC glGetTexLevelParameterivANGLE;
>+ANGLE_UTIL_EXPORT PFNGLSAMPLEMASKIANGLEPROC glSampleMaskiANGLE;
>+ANGLE_UTIL_EXPORT PFNGLTEXSTORAGE2DMULTISAMPLEANGLEPROC glTexStorage2DMultisampleANGLE;
>+ANGLE_UTIL_EXPORT PFNGLGETTRANSLATEDSHADERSOURCEANGLEPROC glGetTranslatedShaderSourceANGLE;
>+ANGLE_UTIL_EXPORT PFNGLBINDUNIFORMLOCATIONCHROMIUMPROC glBindUniformLocationCHROMIUM;
>+ANGLE_UTIL_EXPORT PFNGLCOMPRESSEDCOPYTEXTURECHROMIUMPROC glCompressedCopyTextureCHROMIUM;
>+ANGLE_UTIL_EXPORT PFNGLCOPYSUBTEXTURECHROMIUMPROC glCopySubTextureCHROMIUM;
>+ANGLE_UTIL_EXPORT PFNGLCOPYTEXTURECHROMIUMPROC glCopyTextureCHROMIUM;
>+ANGLE_UTIL_EXPORT PFNGLCOVERAGEMODULATIONCHROMIUMPROC glCoverageModulationCHROMIUM;
>+ANGLE_UTIL_EXPORT PFNGLMATRIXLOADIDENTITYCHROMIUMPROC glMatrixLoadIdentityCHROMIUM;
>+ANGLE_UTIL_EXPORT PFNGLMATRIXLOADFCHROMIUMPROC glMatrixLoadfCHROMIUM;
>+ANGLE_UTIL_EXPORT PFNGLLOSECONTEXTCHROMIUMPROC glLoseContextCHROMIUM;
>+ANGLE_UTIL_EXPORT PFNGLBINDFRAGMENTINPUTLOCATIONCHROMIUMPROC glBindFragmentInputLocationCHROMIUM;
>+ANGLE_UTIL_EXPORT PFNGLCOVERFILLPATHCHROMIUMPROC glCoverFillPathCHROMIUM;
>+ANGLE_UTIL_EXPORT PFNGLCOVERFILLPATHINSTANCEDCHROMIUMPROC glCoverFillPathInstancedCHROMIUM;
>+ANGLE_UTIL_EXPORT PFNGLCOVERSTROKEPATHCHROMIUMPROC glCoverStrokePathCHROMIUM;
>+ANGLE_UTIL_EXPORT PFNGLCOVERSTROKEPATHINSTANCEDCHROMIUMPROC glCoverStrokePathInstancedCHROMIUM;
>+ANGLE_UTIL_EXPORT PFNGLDELETEPATHSCHROMIUMPROC glDeletePathsCHROMIUM;
>+ANGLE_UTIL_EXPORT PFNGLGENPATHSCHROMIUMPROC glGenPathsCHROMIUM;
>+ANGLE_UTIL_EXPORT PFNGLGETPATHPARAMETERFVCHROMIUMPROC glGetPathParameterfvCHROMIUM;
>+ANGLE_UTIL_EXPORT PFNGLGETPATHPARAMETERIVCHROMIUMPROC glGetPathParameterivCHROMIUM;
>+ANGLE_UTIL_EXPORT PFNGLISPATHCHROMIUMPROC glIsPathCHROMIUM;
>+ANGLE_UTIL_EXPORT PFNGLPATHCOMMANDSCHROMIUMPROC glPathCommandsCHROMIUM;
>+ANGLE_UTIL_EXPORT PFNGLPATHPARAMETERFCHROMIUMPROC glPathParameterfCHROMIUM;
>+ANGLE_UTIL_EXPORT PFNGLPATHPARAMETERICHROMIUMPROC glPathParameteriCHROMIUM;
>+ANGLE_UTIL_EXPORT PFNGLPATHSTENCILFUNCCHROMIUMPROC glPathStencilFuncCHROMIUM;
>+ANGLE_UTIL_EXPORT PFNGLPROGRAMPATHFRAGMENTINPUTGENCHROMIUMPROC
>+    glProgramPathFragmentInputGenCHROMIUM;
>+ANGLE_UTIL_EXPORT PFNGLSTENCILFILLPATHCHROMIUMPROC glStencilFillPathCHROMIUM;
>+ANGLE_UTIL_EXPORT PFNGLSTENCILFILLPATHINSTANCEDCHROMIUMPROC glStencilFillPathInstancedCHROMIUM;
>+ANGLE_UTIL_EXPORT PFNGLSTENCILSTROKEPATHCHROMIUMPROC glStencilStrokePathCHROMIUM;
>+ANGLE_UTIL_EXPORT PFNGLSTENCILSTROKEPATHINSTANCEDCHROMIUMPROC glStencilStrokePathInstancedCHROMIUM;
>+ANGLE_UTIL_EXPORT PFNGLSTENCILTHENCOVERFILLPATHCHROMIUMPROC glStencilThenCoverFillPathCHROMIUM;
>+ANGLE_UTIL_EXPORT PFNGLSTENCILTHENCOVERFILLPATHINSTANCEDCHROMIUMPROC
>+    glStencilThenCoverFillPathInstancedCHROMIUM;
>+ANGLE_UTIL_EXPORT PFNGLSTENCILTHENCOVERSTROKEPATHCHROMIUMPROC glStencilThenCoverStrokePathCHROMIUM;
>+ANGLE_UTIL_EXPORT PFNGLSTENCILTHENCOVERSTROKEPATHINSTANCEDCHROMIUMPROC
>+    glStencilThenCoverStrokePathInstancedCHROMIUM;
>+ANGLE_UTIL_EXPORT PFNGLBINDFRAGDATALOCATIONEXTPROC glBindFragDataLocationEXT;
>+ANGLE_UTIL_EXPORT PFNGLBINDFRAGDATALOCATIONINDEXEDEXTPROC glBindFragDataLocationIndexedEXT;
>+ANGLE_UTIL_EXPORT PFNGLGETFRAGDATAINDEXEXTPROC glGetFragDataIndexEXT;
>+ANGLE_UTIL_EXPORT PFNGLGETPROGRAMRESOURCELOCATIONINDEXEXTPROC glGetProgramResourceLocationIndexEXT;
>+ANGLE_UTIL_EXPORT PFNGLINSERTEVENTMARKEREXTPROC glInsertEventMarkerEXT;
>+ANGLE_UTIL_EXPORT PFNGLPOPGROUPMARKEREXTPROC glPopGroupMarkerEXT;
>+ANGLE_UTIL_EXPORT PFNGLPUSHGROUPMARKEREXTPROC glPushGroupMarkerEXT;
>+ANGLE_UTIL_EXPORT PFNGLDISCARDFRAMEBUFFEREXTPROC glDiscardFramebufferEXT;
>+ANGLE_UTIL_EXPORT PFNGLBEGINQUERYEXTPROC glBeginQueryEXT;
>+ANGLE_UTIL_EXPORT PFNGLDELETEQUERIESEXTPROC glDeleteQueriesEXT;
>+ANGLE_UTIL_EXPORT PFNGLENDQUERYEXTPROC glEndQueryEXT;
>+ANGLE_UTIL_EXPORT PFNGLGENQUERIESEXTPROC glGenQueriesEXT;
>+ANGLE_UTIL_EXPORT PFNGLGETQUERYOBJECTI64VEXTPROC glGetQueryObjecti64vEXT;
>+ANGLE_UTIL_EXPORT PFNGLGETQUERYOBJECTIVEXTPROC glGetQueryObjectivEXT;
>+ANGLE_UTIL_EXPORT PFNGLGETQUERYOBJECTUI64VEXTPROC glGetQueryObjectui64vEXT;
>+ANGLE_UTIL_EXPORT PFNGLGETQUERYOBJECTUIVEXTPROC glGetQueryObjectuivEXT;
>+ANGLE_UTIL_EXPORT PFNGLGETQUERYIVEXTPROC glGetQueryivEXT;
>+ANGLE_UTIL_EXPORT PFNGLISQUERYEXTPROC glIsQueryEXT;
>+ANGLE_UTIL_EXPORT PFNGLQUERYCOUNTEREXTPROC glQueryCounterEXT;
>+ANGLE_UTIL_EXPORT PFNGLDRAWBUFFERSEXTPROC glDrawBuffersEXT;
>+ANGLE_UTIL_EXPORT PFNGLFRAMEBUFFERTEXTUREEXTPROC glFramebufferTextureEXT;
>+ANGLE_UTIL_EXPORT PFNGLDRAWARRAYSINSTANCEDEXTPROC glDrawArraysInstancedEXT;
>+ANGLE_UTIL_EXPORT PFNGLDRAWELEMENTSINSTANCEDEXTPROC glDrawElementsInstancedEXT;
>+ANGLE_UTIL_EXPORT PFNGLVERTEXATTRIBDIVISOREXTPROC glVertexAttribDivisorEXT;
>+ANGLE_UTIL_EXPORT PFNGLFLUSHMAPPEDBUFFERRANGEEXTPROC glFlushMappedBufferRangeEXT;
>+ANGLE_UTIL_EXPORT PFNGLMAPBUFFERRANGEEXTPROC glMapBufferRangeEXT;
>+ANGLE_UTIL_EXPORT PFNGLBUFFERSTORAGEMEMEXTPROC glBufferStorageMemEXT;
>+ANGLE_UTIL_EXPORT PFNGLCREATEMEMORYOBJECTSEXTPROC glCreateMemoryObjectsEXT;
>+ANGLE_UTIL_EXPORT PFNGLDELETEMEMORYOBJECTSEXTPROC glDeleteMemoryObjectsEXT;
>+ANGLE_UTIL_EXPORT PFNGLGETMEMORYOBJECTPARAMETERIVEXTPROC glGetMemoryObjectParameterivEXT;
>+ANGLE_UTIL_EXPORT PFNGLGETUNSIGNEDBYTEI_VEXTPROC glGetUnsignedBytei_vEXT;
>+ANGLE_UTIL_EXPORT PFNGLGETUNSIGNEDBYTEVEXTPROC glGetUnsignedBytevEXT;
>+ANGLE_UTIL_EXPORT PFNGLISMEMORYOBJECTEXTPROC glIsMemoryObjectEXT;
>+ANGLE_UTIL_EXPORT PFNGLMEMORYOBJECTPARAMETERIVEXTPROC glMemoryObjectParameterivEXT;
>+ANGLE_UTIL_EXPORT PFNGLTEXSTORAGEMEM2DEXTPROC glTexStorageMem2DEXT;
>+ANGLE_UTIL_EXPORT PFNGLTEXSTORAGEMEM2DMULTISAMPLEEXTPROC glTexStorageMem2DMultisampleEXT;
>+ANGLE_UTIL_EXPORT PFNGLTEXSTORAGEMEM3DEXTPROC glTexStorageMem3DEXT;
>+ANGLE_UTIL_EXPORT PFNGLTEXSTORAGEMEM3DMULTISAMPLEEXTPROC glTexStorageMem3DMultisampleEXT;
>+ANGLE_UTIL_EXPORT PFNGLIMPORTMEMORYFDEXTPROC glImportMemoryFdEXT;
>+ANGLE_UTIL_EXPORT PFNGLGETGRAPHICSRESETSTATUSEXTPROC glGetGraphicsResetStatusEXT;
>+ANGLE_UTIL_EXPORT PFNGLGETNUNIFORMFVEXTPROC glGetnUniformfvEXT;
>+ANGLE_UTIL_EXPORT PFNGLGETNUNIFORMIVEXTPROC glGetnUniformivEXT;
>+ANGLE_UTIL_EXPORT PFNGLREADNPIXELSEXTPROC glReadnPixelsEXT;
>+ANGLE_UTIL_EXPORT PFNGLDELETESEMAPHORESEXTPROC glDeleteSemaphoresEXT;
>+ANGLE_UTIL_EXPORT PFNGLGENSEMAPHORESEXTPROC glGenSemaphoresEXT;
>+ANGLE_UTIL_EXPORT PFNGLGETSEMAPHOREPARAMETERUI64VEXTPROC glGetSemaphoreParameterui64vEXT;
>+ANGLE_UTIL_EXPORT PFNGLISSEMAPHOREEXTPROC glIsSemaphoreEXT;
>+ANGLE_UTIL_EXPORT PFNGLSEMAPHOREPARAMETERUI64VEXTPROC glSemaphoreParameterui64vEXT;
>+ANGLE_UTIL_EXPORT PFNGLSIGNALSEMAPHOREEXTPROC glSignalSemaphoreEXT;
>+ANGLE_UTIL_EXPORT PFNGLWAITSEMAPHOREEXTPROC glWaitSemaphoreEXT;
>+ANGLE_UTIL_EXPORT PFNGLIMPORTSEMAPHOREFDEXTPROC glImportSemaphoreFdEXT;
>+ANGLE_UTIL_EXPORT PFNGLTEXSTORAGE1DEXTPROC glTexStorage1DEXT;
>+ANGLE_UTIL_EXPORT PFNGLTEXSTORAGE2DEXTPROC glTexStorage2DEXT;
>+ANGLE_UTIL_EXPORT PFNGLTEXSTORAGE3DEXTPROC glTexStorage3DEXT;
>+ANGLE_UTIL_EXPORT PFNGLDEBUGMESSAGECALLBACKKHRPROC glDebugMessageCallbackKHR;
>+ANGLE_UTIL_EXPORT PFNGLDEBUGMESSAGECONTROLKHRPROC glDebugMessageControlKHR;
>+ANGLE_UTIL_EXPORT PFNGLDEBUGMESSAGEINSERTKHRPROC glDebugMessageInsertKHR;
>+ANGLE_UTIL_EXPORT PFNGLGETDEBUGMESSAGELOGKHRPROC glGetDebugMessageLogKHR;
>+ANGLE_UTIL_EXPORT PFNGLGETOBJECTLABELKHRPROC glGetObjectLabelKHR;
>+ANGLE_UTIL_EXPORT PFNGLGETOBJECTPTRLABELKHRPROC glGetObjectPtrLabelKHR;
>+ANGLE_UTIL_EXPORT PFNGLGETPOINTERVKHRPROC glGetPointervKHR;
>+ANGLE_UTIL_EXPORT PFNGLOBJECTLABELKHRPROC glObjectLabelKHR;
>+ANGLE_UTIL_EXPORT PFNGLOBJECTPTRLABELKHRPROC glObjectPtrLabelKHR;
>+ANGLE_UTIL_EXPORT PFNGLPOPDEBUGGROUPKHRPROC glPopDebugGroupKHR;
>+ANGLE_UTIL_EXPORT PFNGLPUSHDEBUGGROUPKHRPROC glPushDebugGroupKHR;
>+ANGLE_UTIL_EXPORT PFNGLMAXSHADERCOMPILERTHREADSKHRPROC glMaxShaderCompilerThreadsKHR;
>+ANGLE_UTIL_EXPORT PFNGLDELETEFENCESNVPROC glDeleteFencesNV;
>+ANGLE_UTIL_EXPORT PFNGLFINISHFENCENVPROC glFinishFenceNV;
>+ANGLE_UTIL_EXPORT PFNGLGENFENCESNVPROC glGenFencesNV;
>+ANGLE_UTIL_EXPORT PFNGLGETFENCEIVNVPROC glGetFenceivNV;
>+ANGLE_UTIL_EXPORT PFNGLISFENCENVPROC glIsFenceNV;
>+ANGLE_UTIL_EXPORT PFNGLSETFENCENVPROC glSetFenceNV;
>+ANGLE_UTIL_EXPORT PFNGLTESTFENCENVPROC glTestFenceNV;
>+ANGLE_UTIL_EXPORT PFNGLEGLIMAGETARGETRENDERBUFFERSTORAGEOESPROC
>+    glEGLImageTargetRenderbufferStorageOES;
>+ANGLE_UTIL_EXPORT PFNGLEGLIMAGETARGETTEXTURE2DOESPROC glEGLImageTargetTexture2DOES;
>+ANGLE_UTIL_EXPORT PFNGLGETPROGRAMBINARYOESPROC glGetProgramBinaryOES;
>+ANGLE_UTIL_EXPORT PFNGLPROGRAMBINARYOESPROC glProgramBinaryOES;
>+ANGLE_UTIL_EXPORT PFNGLGETBUFFERPOINTERVOESPROC glGetBufferPointervOES;
>+ANGLE_UTIL_EXPORT PFNGLMAPBUFFEROESPROC glMapBufferOES;
>+ANGLE_UTIL_EXPORT PFNGLUNMAPBUFFEROESPROC glUnmapBufferOES;
>+ANGLE_UTIL_EXPORT PFNGLGETSAMPLERPARAMETERIIVOESPROC glGetSamplerParameterIivOES;
>+ANGLE_UTIL_EXPORT PFNGLGETSAMPLERPARAMETERIUIVOESPROC glGetSamplerParameterIuivOES;
>+ANGLE_UTIL_EXPORT PFNGLGETTEXPARAMETERIIVOESPROC glGetTexParameterIivOES;
>+ANGLE_UTIL_EXPORT PFNGLGETTEXPARAMETERIUIVOESPROC glGetTexParameterIuivOES;
>+ANGLE_UTIL_EXPORT PFNGLSAMPLERPARAMETERIIVOESPROC glSamplerParameterIivOES;
>+ANGLE_UTIL_EXPORT PFNGLSAMPLERPARAMETERIUIVOESPROC glSamplerParameterIuivOES;
>+ANGLE_UTIL_EXPORT PFNGLTEXPARAMETERIIVOESPROC glTexParameterIivOES;
>+ANGLE_UTIL_EXPORT PFNGLTEXPARAMETERIUIVOESPROC glTexParameterIuivOES;
>+ANGLE_UTIL_EXPORT PFNGLTEXSTORAGE3DMULTISAMPLEOESPROC glTexStorage3DMultisampleOES;
>+ANGLE_UTIL_EXPORT PFNGLBINDVERTEXARRAYOESPROC glBindVertexArrayOES;
>+ANGLE_UTIL_EXPORT PFNGLDELETEVERTEXARRAYSOESPROC glDeleteVertexArraysOES;
>+ANGLE_UTIL_EXPORT PFNGLGENVERTEXARRAYSOESPROC glGenVertexArraysOES;
>+ANGLE_UTIL_EXPORT PFNGLISVERTEXARRAYOESPROC glIsVertexArrayOES;
>+ANGLE_UTIL_EXPORT PFNGLFRAMEBUFFERTEXTUREMULTIVIEWOVRPROC glFramebufferTextureMultiviewOVR;
>+ANGLE_UTIL_EXPORT PFNGLDRAWTEXFOESPROC glDrawTexfOES;
>+ANGLE_UTIL_EXPORT PFNGLDRAWTEXFVOESPROC glDrawTexfvOES;
>+ANGLE_UTIL_EXPORT PFNGLDRAWTEXIOESPROC glDrawTexiOES;
>+ANGLE_UTIL_EXPORT PFNGLDRAWTEXIVOESPROC glDrawTexivOES;
>+ANGLE_UTIL_EXPORT PFNGLDRAWTEXSOESPROC glDrawTexsOES;
>+ANGLE_UTIL_EXPORT PFNGLDRAWTEXSVOESPROC glDrawTexsvOES;
>+ANGLE_UTIL_EXPORT PFNGLDRAWTEXXOESPROC glDrawTexxOES;
>+ANGLE_UTIL_EXPORT PFNGLDRAWTEXXVOESPROC glDrawTexxvOES;
>+ANGLE_UTIL_EXPORT PFNGLBINDFRAMEBUFFEROESPROC glBindFramebufferOES;
>+ANGLE_UTIL_EXPORT PFNGLBINDRENDERBUFFEROESPROC glBindRenderbufferOES;
>+ANGLE_UTIL_EXPORT PFNGLCHECKFRAMEBUFFERSTATUSOESPROC glCheckFramebufferStatusOES;
>+ANGLE_UTIL_EXPORT PFNGLDELETEFRAMEBUFFERSOESPROC glDeleteFramebuffersOES;
>+ANGLE_UTIL_EXPORT PFNGLDELETERENDERBUFFERSOESPROC glDeleteRenderbuffersOES;
>+ANGLE_UTIL_EXPORT PFNGLFRAMEBUFFERRENDERBUFFEROESPROC glFramebufferRenderbufferOES;
>+ANGLE_UTIL_EXPORT PFNGLFRAMEBUFFERTEXTURE2DOESPROC glFramebufferTexture2DOES;
>+ANGLE_UTIL_EXPORT PFNGLGENFRAMEBUFFERSOESPROC glGenFramebuffersOES;
>+ANGLE_UTIL_EXPORT PFNGLGENRENDERBUFFERSOESPROC glGenRenderbuffersOES;
>+ANGLE_UTIL_EXPORT PFNGLGENERATEMIPMAPOESPROC glGenerateMipmapOES;
>+ANGLE_UTIL_EXPORT PFNGLGETFRAMEBUFFERATTACHMENTPARAMETERIVOESPROC
>+    glGetFramebufferAttachmentParameterivOES;
>+ANGLE_UTIL_EXPORT PFNGLGETRENDERBUFFERPARAMETERIVOESPROC glGetRenderbufferParameterivOES;
>+ANGLE_UTIL_EXPORT PFNGLISFRAMEBUFFEROESPROC glIsFramebufferOES;
>+ANGLE_UTIL_EXPORT PFNGLISRENDERBUFFEROESPROC glIsRenderbufferOES;
>+ANGLE_UTIL_EXPORT PFNGLRENDERBUFFERSTORAGEOESPROC glRenderbufferStorageOES;
>+ANGLE_UTIL_EXPORT PFNGLCURRENTPALETTEMATRIXOESPROC glCurrentPaletteMatrixOES;
>+ANGLE_UTIL_EXPORT PFNGLLOADPALETTEFROMMODELVIEWMATRIXOESPROC glLoadPaletteFromModelViewMatrixOES;
>+ANGLE_UTIL_EXPORT PFNGLMATRIXINDEXPOINTEROESPROC glMatrixIndexPointerOES;
>+ANGLE_UTIL_EXPORT PFNGLWEIGHTPOINTEROESPROC glWeightPointerOES;
>+ANGLE_UTIL_EXPORT PFNGLPOINTSIZEPOINTEROESPROC glPointSizePointerOES;
>+ANGLE_UTIL_EXPORT PFNGLQUERYMATRIXXOESPROC glQueryMatrixxOES;
>+ANGLE_UTIL_EXPORT PFNGLGETTEXGENFVOESPROC glGetTexGenfvOES;
>+ANGLE_UTIL_EXPORT PFNGLGETTEXGENIVOESPROC glGetTexGenivOES;
>+ANGLE_UTIL_EXPORT PFNGLGETTEXGENXVOESPROC glGetTexGenxvOES;
>+ANGLE_UTIL_EXPORT PFNGLTEXGENFOESPROC glTexGenfOES;
>+ANGLE_UTIL_EXPORT PFNGLTEXGENFVOESPROC glTexGenfvOES;
>+ANGLE_UTIL_EXPORT PFNGLTEXGENIOESPROC glTexGeniOES;
>+ANGLE_UTIL_EXPORT PFNGLTEXGENIVOESPROC glTexGenivOES;
>+ANGLE_UTIL_EXPORT PFNGLTEXGENXOESPROC glTexGenxOES;
>+ANGLE_UTIL_EXPORT PFNGLTEXGENXVOESPROC glTexGenxvOES;
>+ANGLE_UTIL_EXPORT PFNGLALPHAFUNCCONTEXTANGLEPROC glAlphaFuncContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLCLIPPLANEFCONTEXTANGLEPROC glClipPlanefContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLCOLOR4FCONTEXTANGLEPROC glColor4fContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLFOGFCONTEXTANGLEPROC glFogfContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLFOGFVCONTEXTANGLEPROC glFogfvContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLFRUSTUMFCONTEXTANGLEPROC glFrustumfContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLGETCLIPPLANEFCONTEXTANGLEPROC glGetClipPlanefContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLGETLIGHTFVCONTEXTANGLEPROC glGetLightfvContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLGETMATERIALFVCONTEXTANGLEPROC glGetMaterialfvContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLGETTEXENVFVCONTEXTANGLEPROC glGetTexEnvfvContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLLIGHTMODELFCONTEXTANGLEPROC glLightModelfContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLLIGHTMODELFVCONTEXTANGLEPROC glLightModelfvContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLLIGHTFCONTEXTANGLEPROC glLightfContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLLIGHTFVCONTEXTANGLEPROC glLightfvContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLLOADMATRIXFCONTEXTANGLEPROC glLoadMatrixfContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLMATERIALFCONTEXTANGLEPROC glMaterialfContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLMATERIALFVCONTEXTANGLEPROC glMaterialfvContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLMULTMATRIXFCONTEXTANGLEPROC glMultMatrixfContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLMULTITEXCOORD4FCONTEXTANGLEPROC glMultiTexCoord4fContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLNORMAL3FCONTEXTANGLEPROC glNormal3fContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLORTHOFCONTEXTANGLEPROC glOrthofContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLPOINTPARAMETERFCONTEXTANGLEPROC glPointParameterfContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLPOINTPARAMETERFVCONTEXTANGLEPROC glPointParameterfvContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLPOINTSIZECONTEXTANGLEPROC glPointSizeContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLROTATEFCONTEXTANGLEPROC glRotatefContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLSCALEFCONTEXTANGLEPROC glScalefContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLTEXENVFCONTEXTANGLEPROC glTexEnvfContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLTEXENVFVCONTEXTANGLEPROC glTexEnvfvContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLTRANSLATEFCONTEXTANGLEPROC glTranslatefContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLALPHAFUNCXCONTEXTANGLEPROC glAlphaFuncxContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLCLEARCOLORXCONTEXTANGLEPROC glClearColorxContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLCLEARDEPTHXCONTEXTANGLEPROC glClearDepthxContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLCLIENTACTIVETEXTURECONTEXTANGLEPROC glClientActiveTextureContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLCLIPPLANEXCONTEXTANGLEPROC glClipPlanexContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLCOLOR4UBCONTEXTANGLEPROC glColor4ubContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLCOLOR4XCONTEXTANGLEPROC glColor4xContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLCOLORPOINTERCONTEXTANGLEPROC glColorPointerContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLDEPTHRANGEXCONTEXTANGLEPROC glDepthRangexContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLDISABLECLIENTSTATECONTEXTANGLEPROC glDisableClientStateContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLENABLECLIENTSTATECONTEXTANGLEPROC glEnableClientStateContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLFOGXCONTEXTANGLEPROC glFogxContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLFOGXVCONTEXTANGLEPROC glFogxvContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLFRUSTUMXCONTEXTANGLEPROC glFrustumxContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLGETCLIPPLANEXCONTEXTANGLEPROC glGetClipPlanexContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLGETFIXEDVCONTEXTANGLEPROC glGetFixedvContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLGETLIGHTXVCONTEXTANGLEPROC glGetLightxvContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLGETMATERIALXVCONTEXTANGLEPROC glGetMaterialxvContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLGETPOINTERVCONTEXTANGLEPROC glGetPointervContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLGETTEXENVIVCONTEXTANGLEPROC glGetTexEnvivContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLGETTEXENVXVCONTEXTANGLEPROC glGetTexEnvxvContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLGETTEXPARAMETERXVCONTEXTANGLEPROC glGetTexParameterxvContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLLIGHTMODELXCONTEXTANGLEPROC glLightModelxContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLLIGHTMODELXVCONTEXTANGLEPROC glLightModelxvContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLLIGHTXCONTEXTANGLEPROC glLightxContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLLIGHTXVCONTEXTANGLEPROC glLightxvContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLLINEWIDTHXCONTEXTANGLEPROC glLineWidthxContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLLOADIDENTITYCONTEXTANGLEPROC glLoadIdentityContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLLOADMATRIXXCONTEXTANGLEPROC glLoadMatrixxContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLLOGICOPCONTEXTANGLEPROC glLogicOpContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLMATERIALXCONTEXTANGLEPROC glMaterialxContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLMATERIALXVCONTEXTANGLEPROC glMaterialxvContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLMATRIXMODECONTEXTANGLEPROC glMatrixModeContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLMULTMATRIXXCONTEXTANGLEPROC glMultMatrixxContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLMULTITEXCOORD4XCONTEXTANGLEPROC glMultiTexCoord4xContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLNORMAL3XCONTEXTANGLEPROC glNormal3xContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLNORMALPOINTERCONTEXTANGLEPROC glNormalPointerContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLORTHOXCONTEXTANGLEPROC glOrthoxContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLPOINTPARAMETERXCONTEXTANGLEPROC glPointParameterxContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLPOINTPARAMETERXVCONTEXTANGLEPROC glPointParameterxvContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLPOINTSIZEXCONTEXTANGLEPROC glPointSizexContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLPOLYGONOFFSETXCONTEXTANGLEPROC glPolygonOffsetxContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLPOPMATRIXCONTEXTANGLEPROC glPopMatrixContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLPUSHMATRIXCONTEXTANGLEPROC glPushMatrixContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLROTATEXCONTEXTANGLEPROC glRotatexContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLSAMPLECOVERAGEXCONTEXTANGLEPROC glSampleCoveragexContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLSCALEXCONTEXTANGLEPROC glScalexContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLSHADEMODELCONTEXTANGLEPROC glShadeModelContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLTEXCOORDPOINTERCONTEXTANGLEPROC glTexCoordPointerContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLTEXENVICONTEXTANGLEPROC glTexEnviContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLTEXENVXCONTEXTANGLEPROC glTexEnvxContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLTEXENVIVCONTEXTANGLEPROC glTexEnvivContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLTEXENVXVCONTEXTANGLEPROC glTexEnvxvContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLTEXPARAMETERXCONTEXTANGLEPROC glTexParameterxContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLTEXPARAMETERXVCONTEXTANGLEPROC glTexParameterxvContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLTRANSLATEXCONTEXTANGLEPROC glTranslatexContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLVERTEXPOINTERCONTEXTANGLEPROC glVertexPointerContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLACTIVETEXTURECONTEXTANGLEPROC glActiveTextureContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLATTACHSHADERCONTEXTANGLEPROC glAttachShaderContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLBINDATTRIBLOCATIONCONTEXTANGLEPROC glBindAttribLocationContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLBINDBUFFERCONTEXTANGLEPROC glBindBufferContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLBINDFRAMEBUFFERCONTEXTANGLEPROC glBindFramebufferContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLBINDRENDERBUFFERCONTEXTANGLEPROC glBindRenderbufferContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLBINDTEXTURECONTEXTANGLEPROC glBindTextureContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLBLENDCOLORCONTEXTANGLEPROC glBlendColorContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLBLENDEQUATIONCONTEXTANGLEPROC glBlendEquationContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLBLENDEQUATIONSEPARATECONTEXTANGLEPROC glBlendEquationSeparateContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLBLENDFUNCCONTEXTANGLEPROC glBlendFuncContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLBLENDFUNCSEPARATECONTEXTANGLEPROC glBlendFuncSeparateContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLBUFFERDATACONTEXTANGLEPROC glBufferDataContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLBUFFERSUBDATACONTEXTANGLEPROC glBufferSubDataContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLCHECKFRAMEBUFFERSTATUSCONTEXTANGLEPROC glCheckFramebufferStatusContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLCLEARCONTEXTANGLEPROC glClearContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLCLEARCOLORCONTEXTANGLEPROC glClearColorContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLCLEARDEPTHFCONTEXTANGLEPROC glClearDepthfContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLCLEARSTENCILCONTEXTANGLEPROC glClearStencilContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLCOLORMASKCONTEXTANGLEPROC glColorMaskContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLCOMPILESHADERCONTEXTANGLEPROC glCompileShaderContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLCOMPRESSEDTEXIMAGE2DCONTEXTANGLEPROC glCompressedTexImage2DContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLCOMPRESSEDTEXSUBIMAGE2DCONTEXTANGLEPROC
>+    glCompressedTexSubImage2DContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLCOPYTEXIMAGE2DCONTEXTANGLEPROC glCopyTexImage2DContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLCOPYTEXSUBIMAGE2DCONTEXTANGLEPROC glCopyTexSubImage2DContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLCREATEPROGRAMCONTEXTANGLEPROC glCreateProgramContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLCREATESHADERCONTEXTANGLEPROC glCreateShaderContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLCULLFACECONTEXTANGLEPROC glCullFaceContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLDELETEBUFFERSCONTEXTANGLEPROC glDeleteBuffersContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLDELETEFRAMEBUFFERSCONTEXTANGLEPROC glDeleteFramebuffersContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLDELETEPROGRAMCONTEXTANGLEPROC glDeleteProgramContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLDELETERENDERBUFFERSCONTEXTANGLEPROC glDeleteRenderbuffersContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLDELETESHADERCONTEXTANGLEPROC glDeleteShaderContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLDELETETEXTURESCONTEXTANGLEPROC glDeleteTexturesContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLDEPTHFUNCCONTEXTANGLEPROC glDepthFuncContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLDEPTHMASKCONTEXTANGLEPROC glDepthMaskContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLDEPTHRANGEFCONTEXTANGLEPROC glDepthRangefContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLDETACHSHADERCONTEXTANGLEPROC glDetachShaderContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLDISABLECONTEXTANGLEPROC glDisableContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLDISABLEVERTEXATTRIBARRAYCONTEXTANGLEPROC
>+    glDisableVertexAttribArrayContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLDRAWARRAYSCONTEXTANGLEPROC glDrawArraysContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLDRAWELEMENTSCONTEXTANGLEPROC glDrawElementsContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLENABLECONTEXTANGLEPROC glEnableContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLENABLEVERTEXATTRIBARRAYCONTEXTANGLEPROC
>+    glEnableVertexAttribArrayContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLFINISHCONTEXTANGLEPROC glFinishContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLFLUSHCONTEXTANGLEPROC glFlushContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLFRAMEBUFFERRENDERBUFFERCONTEXTANGLEPROC
>+    glFramebufferRenderbufferContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLFRAMEBUFFERTEXTURE2DCONTEXTANGLEPROC glFramebufferTexture2DContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLFRONTFACECONTEXTANGLEPROC glFrontFaceContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLGENBUFFERSCONTEXTANGLEPROC glGenBuffersContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLGENERATEMIPMAPCONTEXTANGLEPROC glGenerateMipmapContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLGENFRAMEBUFFERSCONTEXTANGLEPROC glGenFramebuffersContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLGENRENDERBUFFERSCONTEXTANGLEPROC glGenRenderbuffersContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLGENTEXTURESCONTEXTANGLEPROC glGenTexturesContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLGETACTIVEATTRIBCONTEXTANGLEPROC glGetActiveAttribContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLGETACTIVEUNIFORMCONTEXTANGLEPROC glGetActiveUniformContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLGETATTACHEDSHADERSCONTEXTANGLEPROC glGetAttachedShadersContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLGETATTRIBLOCATIONCONTEXTANGLEPROC glGetAttribLocationContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLGETBOOLEANVCONTEXTANGLEPROC glGetBooleanvContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLGETBUFFERPARAMETERIVCONTEXTANGLEPROC glGetBufferParameterivContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLGETERRORCONTEXTANGLEPROC glGetErrorContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLGETFLOATVCONTEXTANGLEPROC glGetFloatvContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLGETFRAMEBUFFERATTACHMENTPARAMETERIVCONTEXTANGLEPROC
>+    glGetFramebufferAttachmentParameterivContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLGETINTEGERVCONTEXTANGLEPROC glGetIntegervContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLGETPROGRAMIVCONTEXTANGLEPROC glGetProgramivContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLGETPROGRAMINFOLOGCONTEXTANGLEPROC glGetProgramInfoLogContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLGETRENDERBUFFERPARAMETERIVCONTEXTANGLEPROC
>+    glGetRenderbufferParameterivContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLGETSHADERIVCONTEXTANGLEPROC glGetShaderivContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLGETSHADERINFOLOGCONTEXTANGLEPROC glGetShaderInfoLogContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLGETSHADERPRECISIONFORMATCONTEXTANGLEPROC
>+    glGetShaderPrecisionFormatContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLGETSHADERSOURCECONTEXTANGLEPROC glGetShaderSourceContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLGETSTRINGCONTEXTANGLEPROC glGetStringContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLGETTEXPARAMETERFVCONTEXTANGLEPROC glGetTexParameterfvContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLGETTEXPARAMETERIVCONTEXTANGLEPROC glGetTexParameterivContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLGETUNIFORMFVCONTEXTANGLEPROC glGetUniformfvContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLGETUNIFORMIVCONTEXTANGLEPROC glGetUniformivContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLGETUNIFORMLOCATIONCONTEXTANGLEPROC glGetUniformLocationContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLGETVERTEXATTRIBFVCONTEXTANGLEPROC glGetVertexAttribfvContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLGETVERTEXATTRIBIVCONTEXTANGLEPROC glGetVertexAttribivContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLGETVERTEXATTRIBPOINTERVCONTEXTANGLEPROC
>+    glGetVertexAttribPointervContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLHINTCONTEXTANGLEPROC glHintContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLISBUFFERCONTEXTANGLEPROC glIsBufferContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLISENABLEDCONTEXTANGLEPROC glIsEnabledContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLISFRAMEBUFFERCONTEXTANGLEPROC glIsFramebufferContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLISPROGRAMCONTEXTANGLEPROC glIsProgramContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLISRENDERBUFFERCONTEXTANGLEPROC glIsRenderbufferContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLISSHADERCONTEXTANGLEPROC glIsShaderContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLISTEXTURECONTEXTANGLEPROC glIsTextureContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLLINEWIDTHCONTEXTANGLEPROC glLineWidthContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLLINKPROGRAMCONTEXTANGLEPROC glLinkProgramContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLPIXELSTOREICONTEXTANGLEPROC glPixelStoreiContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLPOLYGONOFFSETCONTEXTANGLEPROC glPolygonOffsetContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLREADPIXELSCONTEXTANGLEPROC glReadPixelsContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLRELEASESHADERCOMPILERCONTEXTANGLEPROC glReleaseShaderCompilerContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLRENDERBUFFERSTORAGECONTEXTANGLEPROC glRenderbufferStorageContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLSAMPLECOVERAGECONTEXTANGLEPROC glSampleCoverageContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLSCISSORCONTEXTANGLEPROC glScissorContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLSHADERBINARYCONTEXTANGLEPROC glShaderBinaryContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLSHADERSOURCECONTEXTANGLEPROC glShaderSourceContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLSTENCILFUNCCONTEXTANGLEPROC glStencilFuncContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLSTENCILFUNCSEPARATECONTEXTANGLEPROC glStencilFuncSeparateContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLSTENCILMASKCONTEXTANGLEPROC glStencilMaskContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLSTENCILMASKSEPARATECONTEXTANGLEPROC glStencilMaskSeparateContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLSTENCILOPCONTEXTANGLEPROC glStencilOpContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLSTENCILOPSEPARATECONTEXTANGLEPROC glStencilOpSeparateContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLTEXIMAGE2DCONTEXTANGLEPROC glTexImage2DContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLTEXPARAMETERFCONTEXTANGLEPROC glTexParameterfContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLTEXPARAMETERFVCONTEXTANGLEPROC glTexParameterfvContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLTEXPARAMETERICONTEXTANGLEPROC glTexParameteriContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLTEXPARAMETERIVCONTEXTANGLEPROC glTexParameterivContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLTEXSUBIMAGE2DCONTEXTANGLEPROC glTexSubImage2DContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLUNIFORM1FCONTEXTANGLEPROC glUniform1fContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLUNIFORM1FVCONTEXTANGLEPROC glUniform1fvContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLUNIFORM1ICONTEXTANGLEPROC glUniform1iContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLUNIFORM1IVCONTEXTANGLEPROC glUniform1ivContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLUNIFORM2FCONTEXTANGLEPROC glUniform2fContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLUNIFORM2FVCONTEXTANGLEPROC glUniform2fvContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLUNIFORM2ICONTEXTANGLEPROC glUniform2iContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLUNIFORM2IVCONTEXTANGLEPROC glUniform2ivContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLUNIFORM3FCONTEXTANGLEPROC glUniform3fContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLUNIFORM3FVCONTEXTANGLEPROC glUniform3fvContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLUNIFORM3ICONTEXTANGLEPROC glUniform3iContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLUNIFORM3IVCONTEXTANGLEPROC glUniform3ivContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLUNIFORM4FCONTEXTANGLEPROC glUniform4fContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLUNIFORM4FVCONTEXTANGLEPROC glUniform4fvContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLUNIFORM4ICONTEXTANGLEPROC glUniform4iContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLUNIFORM4IVCONTEXTANGLEPROC glUniform4ivContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLUNIFORMMATRIX2FVCONTEXTANGLEPROC glUniformMatrix2fvContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLUNIFORMMATRIX3FVCONTEXTANGLEPROC glUniformMatrix3fvContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLUNIFORMMATRIX4FVCONTEXTANGLEPROC glUniformMatrix4fvContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLUSEPROGRAMCONTEXTANGLEPROC glUseProgramContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLVALIDATEPROGRAMCONTEXTANGLEPROC glValidateProgramContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLVERTEXATTRIB1FCONTEXTANGLEPROC glVertexAttrib1fContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLVERTEXATTRIB1FVCONTEXTANGLEPROC glVertexAttrib1fvContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLVERTEXATTRIB2FCONTEXTANGLEPROC glVertexAttrib2fContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLVERTEXATTRIB2FVCONTEXTANGLEPROC glVertexAttrib2fvContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLVERTEXATTRIB3FCONTEXTANGLEPROC glVertexAttrib3fContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLVERTEXATTRIB3FVCONTEXTANGLEPROC glVertexAttrib3fvContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLVERTEXATTRIB4FCONTEXTANGLEPROC glVertexAttrib4fContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLVERTEXATTRIB4FVCONTEXTANGLEPROC glVertexAttrib4fvContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLVERTEXATTRIBPOINTERCONTEXTANGLEPROC glVertexAttribPointerContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLVIEWPORTCONTEXTANGLEPROC glViewportContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLREADBUFFERCONTEXTANGLEPROC glReadBufferContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLDRAWRANGEELEMENTSCONTEXTANGLEPROC glDrawRangeElementsContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLTEXIMAGE3DCONTEXTANGLEPROC glTexImage3DContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLTEXSUBIMAGE3DCONTEXTANGLEPROC glTexSubImage3DContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLCOPYTEXSUBIMAGE3DCONTEXTANGLEPROC glCopyTexSubImage3DContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLCOMPRESSEDTEXIMAGE3DCONTEXTANGLEPROC glCompressedTexImage3DContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLCOMPRESSEDTEXSUBIMAGE3DCONTEXTANGLEPROC
>+    glCompressedTexSubImage3DContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLGENQUERIESCONTEXTANGLEPROC glGenQueriesContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLDELETEQUERIESCONTEXTANGLEPROC glDeleteQueriesContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLISQUERYCONTEXTANGLEPROC glIsQueryContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLBEGINQUERYCONTEXTANGLEPROC glBeginQueryContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLENDQUERYCONTEXTANGLEPROC glEndQueryContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLGETQUERYIVCONTEXTANGLEPROC glGetQueryivContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLGETQUERYOBJECTUIVCONTEXTANGLEPROC glGetQueryObjectuivContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLUNMAPBUFFERCONTEXTANGLEPROC glUnmapBufferContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLGETBUFFERPOINTERVCONTEXTANGLEPROC glGetBufferPointervContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLDRAWBUFFERSCONTEXTANGLEPROC glDrawBuffersContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLUNIFORMMATRIX2X3FVCONTEXTANGLEPROC glUniformMatrix2x3fvContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLUNIFORMMATRIX3X2FVCONTEXTANGLEPROC glUniformMatrix3x2fvContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLUNIFORMMATRIX2X4FVCONTEXTANGLEPROC glUniformMatrix2x4fvContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLUNIFORMMATRIX4X2FVCONTEXTANGLEPROC glUniformMatrix4x2fvContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLUNIFORMMATRIX3X4FVCONTEXTANGLEPROC glUniformMatrix3x4fvContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLUNIFORMMATRIX4X3FVCONTEXTANGLEPROC glUniformMatrix4x3fvContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLBLITFRAMEBUFFERCONTEXTANGLEPROC glBlitFramebufferContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLRENDERBUFFERSTORAGEMULTISAMPLECONTEXTANGLEPROC
>+    glRenderbufferStorageMultisampleContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLFRAMEBUFFERTEXTURELAYERCONTEXTANGLEPROC
>+    glFramebufferTextureLayerContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLMAPBUFFERRANGECONTEXTANGLEPROC glMapBufferRangeContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLFLUSHMAPPEDBUFFERRANGECONTEXTANGLEPROC glFlushMappedBufferRangeContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLBINDVERTEXARRAYCONTEXTANGLEPROC glBindVertexArrayContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLDELETEVERTEXARRAYSCONTEXTANGLEPROC glDeleteVertexArraysContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLGENVERTEXARRAYSCONTEXTANGLEPROC glGenVertexArraysContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLISVERTEXARRAYCONTEXTANGLEPROC glIsVertexArrayContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLGETINTEGERI_VCONTEXTANGLEPROC glGetIntegeri_vContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLBEGINTRANSFORMFEEDBACKCONTEXTANGLEPROC glBeginTransformFeedbackContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLENDTRANSFORMFEEDBACKCONTEXTANGLEPROC glEndTransformFeedbackContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLBINDBUFFERRANGECONTEXTANGLEPROC glBindBufferRangeContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLBINDBUFFERBASECONTEXTANGLEPROC glBindBufferBaseContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLTRANSFORMFEEDBACKVARYINGSCONTEXTANGLEPROC
>+    glTransformFeedbackVaryingsContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLGETTRANSFORMFEEDBACKVARYINGCONTEXTANGLEPROC
>+    glGetTransformFeedbackVaryingContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLVERTEXATTRIBIPOINTERCONTEXTANGLEPROC glVertexAttribIPointerContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLGETVERTEXATTRIBIIVCONTEXTANGLEPROC glGetVertexAttribIivContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLGETVERTEXATTRIBIUIVCONTEXTANGLEPROC glGetVertexAttribIuivContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLVERTEXATTRIBI4ICONTEXTANGLEPROC glVertexAttribI4iContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLVERTEXATTRIBI4UICONTEXTANGLEPROC glVertexAttribI4uiContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLVERTEXATTRIBI4IVCONTEXTANGLEPROC glVertexAttribI4ivContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLVERTEXATTRIBI4UIVCONTEXTANGLEPROC glVertexAttribI4uivContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLGETUNIFORMUIVCONTEXTANGLEPROC glGetUniformuivContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLGETFRAGDATALOCATIONCONTEXTANGLEPROC glGetFragDataLocationContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLUNIFORM1UICONTEXTANGLEPROC glUniform1uiContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLUNIFORM2UICONTEXTANGLEPROC glUniform2uiContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLUNIFORM3UICONTEXTANGLEPROC glUniform3uiContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLUNIFORM4UICONTEXTANGLEPROC glUniform4uiContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLUNIFORM1UIVCONTEXTANGLEPROC glUniform1uivContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLUNIFORM2UIVCONTEXTANGLEPROC glUniform2uivContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLUNIFORM3UIVCONTEXTANGLEPROC glUniform3uivContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLUNIFORM4UIVCONTEXTANGLEPROC glUniform4uivContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLCLEARBUFFERIVCONTEXTANGLEPROC glClearBufferivContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLCLEARBUFFERUIVCONTEXTANGLEPROC glClearBufferuivContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLCLEARBUFFERFVCONTEXTANGLEPROC glClearBufferfvContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLCLEARBUFFERFICONTEXTANGLEPROC glClearBufferfiContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLGETSTRINGICONTEXTANGLEPROC glGetStringiContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLCOPYBUFFERSUBDATACONTEXTANGLEPROC glCopyBufferSubDataContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLGETUNIFORMINDICESCONTEXTANGLEPROC glGetUniformIndicesContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLGETACTIVEUNIFORMSIVCONTEXTANGLEPROC glGetActiveUniformsivContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLGETUNIFORMBLOCKINDEXCONTEXTANGLEPROC glGetUniformBlockIndexContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLGETACTIVEUNIFORMBLOCKIVCONTEXTANGLEPROC
>+    glGetActiveUniformBlockivContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLGETACTIVEUNIFORMBLOCKNAMECONTEXTANGLEPROC
>+    glGetActiveUniformBlockNameContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLUNIFORMBLOCKBINDINGCONTEXTANGLEPROC glUniformBlockBindingContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLDRAWARRAYSINSTANCEDCONTEXTANGLEPROC glDrawArraysInstancedContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLDRAWELEMENTSINSTANCEDCONTEXTANGLEPROC glDrawElementsInstancedContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLFENCESYNCCONTEXTANGLEPROC glFenceSyncContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLISSYNCCONTEXTANGLEPROC glIsSyncContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLDELETESYNCCONTEXTANGLEPROC glDeleteSyncContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLCLIENTWAITSYNCCONTEXTANGLEPROC glClientWaitSyncContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLWAITSYNCCONTEXTANGLEPROC glWaitSyncContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLGETINTEGER64VCONTEXTANGLEPROC glGetInteger64vContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLGETSYNCIVCONTEXTANGLEPROC glGetSyncivContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLGETINTEGER64I_VCONTEXTANGLEPROC glGetInteger64i_vContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLGETBUFFERPARAMETERI64VCONTEXTANGLEPROC glGetBufferParameteri64vContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLGENSAMPLERSCONTEXTANGLEPROC glGenSamplersContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLDELETESAMPLERSCONTEXTANGLEPROC glDeleteSamplersContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLISSAMPLERCONTEXTANGLEPROC glIsSamplerContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLBINDSAMPLERCONTEXTANGLEPROC glBindSamplerContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLSAMPLERPARAMETERICONTEXTANGLEPROC glSamplerParameteriContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLSAMPLERPARAMETERIVCONTEXTANGLEPROC glSamplerParameterivContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLSAMPLERPARAMETERFCONTEXTANGLEPROC glSamplerParameterfContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLSAMPLERPARAMETERFVCONTEXTANGLEPROC glSamplerParameterfvContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLGETSAMPLERPARAMETERIVCONTEXTANGLEPROC glGetSamplerParameterivContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLGETSAMPLERPARAMETERFVCONTEXTANGLEPROC glGetSamplerParameterfvContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLVERTEXATTRIBDIVISORCONTEXTANGLEPROC glVertexAttribDivisorContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLBINDTRANSFORMFEEDBACKCONTEXTANGLEPROC glBindTransformFeedbackContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLDELETETRANSFORMFEEDBACKSCONTEXTANGLEPROC
>+    glDeleteTransformFeedbacksContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLGENTRANSFORMFEEDBACKSCONTEXTANGLEPROC glGenTransformFeedbacksContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLISTRANSFORMFEEDBACKCONTEXTANGLEPROC glIsTransformFeedbackContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLPAUSETRANSFORMFEEDBACKCONTEXTANGLEPROC glPauseTransformFeedbackContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLRESUMETRANSFORMFEEDBACKCONTEXTANGLEPROC
>+    glResumeTransformFeedbackContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLGETPROGRAMBINARYCONTEXTANGLEPROC glGetProgramBinaryContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLPROGRAMBINARYCONTEXTANGLEPROC glProgramBinaryContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLPROGRAMPARAMETERICONTEXTANGLEPROC glProgramParameteriContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLINVALIDATEFRAMEBUFFERCONTEXTANGLEPROC glInvalidateFramebufferContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLINVALIDATESUBFRAMEBUFFERCONTEXTANGLEPROC
>+    glInvalidateSubFramebufferContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLTEXSTORAGE2DCONTEXTANGLEPROC glTexStorage2DContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLTEXSTORAGE3DCONTEXTANGLEPROC glTexStorage3DContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLGETINTERNALFORMATIVCONTEXTANGLEPROC glGetInternalformativContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLDISPATCHCOMPUTECONTEXTANGLEPROC glDispatchComputeContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLDISPATCHCOMPUTEINDIRECTCONTEXTANGLEPROC
>+    glDispatchComputeIndirectContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLDRAWARRAYSINDIRECTCONTEXTANGLEPROC glDrawArraysIndirectContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLDRAWELEMENTSINDIRECTCONTEXTANGLEPROC glDrawElementsIndirectContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLFRAMEBUFFERPARAMETERICONTEXTANGLEPROC glFramebufferParameteriContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLGETFRAMEBUFFERPARAMETERIVCONTEXTANGLEPROC
>+    glGetFramebufferParameterivContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLGETPROGRAMINTERFACEIVCONTEXTANGLEPROC glGetProgramInterfaceivContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLGETPROGRAMRESOURCEINDEXCONTEXTANGLEPROC
>+    glGetProgramResourceIndexContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLGETPROGRAMRESOURCENAMECONTEXTANGLEPROC glGetProgramResourceNameContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLGETPROGRAMRESOURCEIVCONTEXTANGLEPROC glGetProgramResourceivContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLGETPROGRAMRESOURCELOCATIONCONTEXTANGLEPROC
>+    glGetProgramResourceLocationContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLUSEPROGRAMSTAGESCONTEXTANGLEPROC glUseProgramStagesContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLACTIVESHADERPROGRAMCONTEXTANGLEPROC glActiveShaderProgramContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLCREATESHADERPROGRAMVCONTEXTANGLEPROC glCreateShaderProgramvContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLBINDPROGRAMPIPELINECONTEXTANGLEPROC glBindProgramPipelineContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLDELETEPROGRAMPIPELINESCONTEXTANGLEPROC glDeleteProgramPipelinesContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLGENPROGRAMPIPELINESCONTEXTANGLEPROC glGenProgramPipelinesContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLISPROGRAMPIPELINECONTEXTANGLEPROC glIsProgramPipelineContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLGETPROGRAMPIPELINEIVCONTEXTANGLEPROC glGetProgramPipelineivContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLPROGRAMUNIFORM1ICONTEXTANGLEPROC glProgramUniform1iContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLPROGRAMUNIFORM2ICONTEXTANGLEPROC glProgramUniform2iContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLPROGRAMUNIFORM3ICONTEXTANGLEPROC glProgramUniform3iContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLPROGRAMUNIFORM4ICONTEXTANGLEPROC glProgramUniform4iContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLPROGRAMUNIFORM1UICONTEXTANGLEPROC glProgramUniform1uiContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLPROGRAMUNIFORM2UICONTEXTANGLEPROC glProgramUniform2uiContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLPROGRAMUNIFORM3UICONTEXTANGLEPROC glProgramUniform3uiContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLPROGRAMUNIFORM4UICONTEXTANGLEPROC glProgramUniform4uiContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLPROGRAMUNIFORM1FCONTEXTANGLEPROC glProgramUniform1fContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLPROGRAMUNIFORM2FCONTEXTANGLEPROC glProgramUniform2fContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLPROGRAMUNIFORM3FCONTEXTANGLEPROC glProgramUniform3fContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLPROGRAMUNIFORM4FCONTEXTANGLEPROC glProgramUniform4fContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLPROGRAMUNIFORM1IVCONTEXTANGLEPROC glProgramUniform1ivContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLPROGRAMUNIFORM2IVCONTEXTANGLEPROC glProgramUniform2ivContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLPROGRAMUNIFORM3IVCONTEXTANGLEPROC glProgramUniform3ivContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLPROGRAMUNIFORM4IVCONTEXTANGLEPROC glProgramUniform4ivContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLPROGRAMUNIFORM1UIVCONTEXTANGLEPROC glProgramUniform1uivContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLPROGRAMUNIFORM2UIVCONTEXTANGLEPROC glProgramUniform2uivContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLPROGRAMUNIFORM3UIVCONTEXTANGLEPROC glProgramUniform3uivContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLPROGRAMUNIFORM4UIVCONTEXTANGLEPROC glProgramUniform4uivContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLPROGRAMUNIFORM1FVCONTEXTANGLEPROC glProgramUniform1fvContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLPROGRAMUNIFORM2FVCONTEXTANGLEPROC glProgramUniform2fvContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLPROGRAMUNIFORM3FVCONTEXTANGLEPROC glProgramUniform3fvContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLPROGRAMUNIFORM4FVCONTEXTANGLEPROC glProgramUniform4fvContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLPROGRAMUNIFORMMATRIX2FVCONTEXTANGLEPROC
>+    glProgramUniformMatrix2fvContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLPROGRAMUNIFORMMATRIX3FVCONTEXTANGLEPROC
>+    glProgramUniformMatrix3fvContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLPROGRAMUNIFORMMATRIX4FVCONTEXTANGLEPROC
>+    glProgramUniformMatrix4fvContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLPROGRAMUNIFORMMATRIX2X3FVCONTEXTANGLEPROC
>+    glProgramUniformMatrix2x3fvContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLPROGRAMUNIFORMMATRIX3X2FVCONTEXTANGLEPROC
>+    glProgramUniformMatrix3x2fvContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLPROGRAMUNIFORMMATRIX2X4FVCONTEXTANGLEPROC
>+    glProgramUniformMatrix2x4fvContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLPROGRAMUNIFORMMATRIX4X2FVCONTEXTANGLEPROC
>+    glProgramUniformMatrix4x2fvContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLPROGRAMUNIFORMMATRIX3X4FVCONTEXTANGLEPROC
>+    glProgramUniformMatrix3x4fvContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLPROGRAMUNIFORMMATRIX4X3FVCONTEXTANGLEPROC
>+    glProgramUniformMatrix4x3fvContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLVALIDATEPROGRAMPIPELINECONTEXTANGLEPROC
>+    glValidateProgramPipelineContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLGETPROGRAMPIPELINEINFOLOGCONTEXTANGLEPROC
>+    glGetProgramPipelineInfoLogContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLBINDIMAGETEXTURECONTEXTANGLEPROC glBindImageTextureContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLGETBOOLEANI_VCONTEXTANGLEPROC glGetBooleani_vContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLMEMORYBARRIERCONTEXTANGLEPROC glMemoryBarrierContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLMEMORYBARRIERBYREGIONCONTEXTANGLEPROC glMemoryBarrierByRegionContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLTEXSTORAGE2DMULTISAMPLECONTEXTANGLEPROC
>+    glTexStorage2DMultisampleContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLGETMULTISAMPLEFVCONTEXTANGLEPROC glGetMultisamplefvContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLSAMPLEMASKICONTEXTANGLEPROC glSampleMaskiContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLGETTEXLEVELPARAMETERIVCONTEXTANGLEPROC glGetTexLevelParameterivContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLGETTEXLEVELPARAMETERFVCONTEXTANGLEPROC glGetTexLevelParameterfvContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLBINDVERTEXBUFFERCONTEXTANGLEPROC glBindVertexBufferContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLVERTEXATTRIBFORMATCONTEXTANGLEPROC glVertexAttribFormatContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLVERTEXATTRIBIFORMATCONTEXTANGLEPROC glVertexAttribIFormatContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLVERTEXATTRIBBINDINGCONTEXTANGLEPROC glVertexAttribBindingContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLVERTEXBINDINGDIVISORCONTEXTANGLEPROC glVertexBindingDivisorContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLCOPYSUBTEXTURE3DANGLECONTEXTANGLEPROC glCopySubTexture3DANGLEContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLCOPYTEXTURE3DANGLECONTEXTANGLEPROC glCopyTexture3DANGLEContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLBLITFRAMEBUFFERANGLECONTEXTANGLEPROC glBlitFramebufferANGLEContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLRENDERBUFFERSTORAGEMULTISAMPLEANGLECONTEXTANGLEPROC
>+    glRenderbufferStorageMultisampleANGLEContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLDRAWARRAYSINSTANCEDANGLECONTEXTANGLEPROC
>+    glDrawArraysInstancedANGLEContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLDRAWELEMENTSINSTANCEDANGLECONTEXTANGLEPROC
>+    glDrawElementsInstancedANGLEContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLVERTEXATTRIBDIVISORANGLECONTEXTANGLEPROC
>+    glVertexAttribDivisorANGLEContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLMULTIDRAWARRAYSANGLECONTEXTANGLEPROC glMultiDrawArraysANGLEContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLMULTIDRAWARRAYSINSTANCEDANGLECONTEXTANGLEPROC
>+    glMultiDrawArraysInstancedANGLEContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLMULTIDRAWELEMENTSANGLECONTEXTANGLEPROC glMultiDrawElementsANGLEContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLMULTIDRAWELEMENTSINSTANCEDANGLECONTEXTANGLEPROC
>+    glMultiDrawElementsInstancedANGLEContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLPROVOKINGVERTEXANGLECONTEXTANGLEPROC glProvokingVertexANGLEContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLREQUESTEXTENSIONANGLECONTEXTANGLEPROC glRequestExtensionANGLEContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLCOMPRESSEDTEXIMAGE2DROBUSTANGLECONTEXTANGLEPROC
>+    glCompressedTexImage2DRobustANGLEContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLCOMPRESSEDTEXIMAGE3DROBUSTANGLECONTEXTANGLEPROC
>+    glCompressedTexImage3DRobustANGLEContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLCOMPRESSEDTEXSUBIMAGE2DROBUSTANGLECONTEXTANGLEPROC
>+    glCompressedTexSubImage2DRobustANGLEContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLCOMPRESSEDTEXSUBIMAGE3DROBUSTANGLECONTEXTANGLEPROC
>+    glCompressedTexSubImage3DRobustANGLEContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLGETACTIVEUNIFORMBLOCKIVROBUSTANGLECONTEXTANGLEPROC
>+    glGetActiveUniformBlockivRobustANGLEContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLGETBOOLEANI_VROBUSTANGLECONTEXTANGLEPROC
>+    glGetBooleani_vRobustANGLEContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLGETBOOLEANVROBUSTANGLECONTEXTANGLEPROC glGetBooleanvRobustANGLEContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLGETBUFFERPARAMETERI64VROBUSTANGLECONTEXTANGLEPROC
>+    glGetBufferParameteri64vRobustANGLEContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLGETBUFFERPARAMETERIVROBUSTANGLECONTEXTANGLEPROC
>+    glGetBufferParameterivRobustANGLEContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLGETBUFFERPOINTERVROBUSTANGLECONTEXTANGLEPROC
>+    glGetBufferPointervRobustANGLEContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLGETFLOATVROBUSTANGLECONTEXTANGLEPROC glGetFloatvRobustANGLEContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLGETFRAMEBUFFERATTACHMENTPARAMETERIVROBUSTANGLECONTEXTANGLEPROC
>+    glGetFramebufferAttachmentParameterivRobustANGLEContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLGETFRAMEBUFFERPARAMETERIVROBUSTANGLECONTEXTANGLEPROC
>+    glGetFramebufferParameterivRobustANGLEContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLGETINTEGER64I_VROBUSTANGLECONTEXTANGLEPROC
>+    glGetInteger64i_vRobustANGLEContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLGETINTEGER64VROBUSTANGLECONTEXTANGLEPROC
>+    glGetInteger64vRobustANGLEContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLGETINTEGERI_VROBUSTANGLECONTEXTANGLEPROC
>+    glGetIntegeri_vRobustANGLEContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLGETINTEGERVROBUSTANGLECONTEXTANGLEPROC glGetIntegervRobustANGLEContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLGETINTERNALFORMATIVROBUSTANGLECONTEXTANGLEPROC
>+    glGetInternalformativRobustANGLEContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLGETMULTISAMPLEFVROBUSTANGLECONTEXTANGLEPROC
>+    glGetMultisamplefvRobustANGLEContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLGETPOINTERVROBUSTANGLEROBUSTANGLECONTEXTANGLEPROC
>+    glGetPointervRobustANGLERobustANGLEContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLGETPROGRAMINTERFACEIVROBUSTANGLECONTEXTANGLEPROC
>+    glGetProgramInterfaceivRobustANGLEContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLGETPROGRAMIVROBUSTANGLECONTEXTANGLEPROC
>+    glGetProgramivRobustANGLEContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLGETQUERYOBJECTI64VROBUSTANGLECONTEXTANGLEPROC
>+    glGetQueryObjecti64vRobustANGLEContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLGETQUERYOBJECTIVROBUSTANGLECONTEXTANGLEPROC
>+    glGetQueryObjectivRobustANGLEContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLGETQUERYOBJECTUI64VROBUSTANGLECONTEXTANGLEPROC
>+    glGetQueryObjectui64vRobustANGLEContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLGETQUERYOBJECTUIVROBUSTANGLECONTEXTANGLEPROC
>+    glGetQueryObjectuivRobustANGLEContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLGETQUERYIVROBUSTANGLECONTEXTANGLEPROC glGetQueryivRobustANGLEContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLGETRENDERBUFFERPARAMETERIVROBUSTANGLECONTEXTANGLEPROC
>+    glGetRenderbufferParameterivRobustANGLEContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLGETSAMPLERPARAMETERIIVROBUSTANGLECONTEXTANGLEPROC
>+    glGetSamplerParameterIivRobustANGLEContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLGETSAMPLERPARAMETERIUIVROBUSTANGLECONTEXTANGLEPROC
>+    glGetSamplerParameterIuivRobustANGLEContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLGETSAMPLERPARAMETERFVROBUSTANGLECONTEXTANGLEPROC
>+    glGetSamplerParameterfvRobustANGLEContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLGETSAMPLERPARAMETERIVROBUSTANGLECONTEXTANGLEPROC
>+    glGetSamplerParameterivRobustANGLEContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLGETSHADERIVROBUSTANGLECONTEXTANGLEPROC glGetShaderivRobustANGLEContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLGETTEXLEVELPARAMETERFVROBUSTANGLECONTEXTANGLEPROC
>+    glGetTexLevelParameterfvRobustANGLEContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLGETTEXLEVELPARAMETERIVROBUSTANGLECONTEXTANGLEPROC
>+    glGetTexLevelParameterivRobustANGLEContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLGETTEXPARAMETERIIVROBUSTANGLECONTEXTANGLEPROC
>+    glGetTexParameterIivRobustANGLEContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLGETTEXPARAMETERIUIVROBUSTANGLECONTEXTANGLEPROC
>+    glGetTexParameterIuivRobustANGLEContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLGETTEXPARAMETERFVROBUSTANGLECONTEXTANGLEPROC
>+    glGetTexParameterfvRobustANGLEContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLGETTEXPARAMETERIVROBUSTANGLECONTEXTANGLEPROC
>+    glGetTexParameterivRobustANGLEContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLGETUNIFORMFVROBUSTANGLECONTEXTANGLEPROC
>+    glGetUniformfvRobustANGLEContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLGETUNIFORMIVROBUSTANGLECONTEXTANGLEPROC
>+    glGetUniformivRobustANGLEContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLGETUNIFORMUIVROBUSTANGLECONTEXTANGLEPROC
>+    glGetUniformuivRobustANGLEContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLGETVERTEXATTRIBIIVROBUSTANGLECONTEXTANGLEPROC
>+    glGetVertexAttribIivRobustANGLEContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLGETVERTEXATTRIBIUIVROBUSTANGLECONTEXTANGLEPROC
>+    glGetVertexAttribIuivRobustANGLEContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLGETVERTEXATTRIBPOINTERVROBUSTANGLECONTEXTANGLEPROC
>+    glGetVertexAttribPointervRobustANGLEContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLGETVERTEXATTRIBFVROBUSTANGLECONTEXTANGLEPROC
>+    glGetVertexAttribfvRobustANGLEContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLGETVERTEXATTRIBIVROBUSTANGLECONTEXTANGLEPROC
>+    glGetVertexAttribivRobustANGLEContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLGETNUNIFORMFVROBUSTANGLECONTEXTANGLEPROC
>+    glGetnUniformfvRobustANGLEContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLGETNUNIFORMIVROBUSTANGLECONTEXTANGLEPROC
>+    glGetnUniformivRobustANGLEContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLGETNUNIFORMUIVROBUSTANGLECONTEXTANGLEPROC
>+    glGetnUniformuivRobustANGLEContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLREADPIXELSROBUSTANGLECONTEXTANGLEPROC glReadPixelsRobustANGLEContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLREADNPIXELSROBUSTANGLECONTEXTANGLEPROC glReadnPixelsRobustANGLEContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLSAMPLERPARAMETERIIVROBUSTANGLECONTEXTANGLEPROC
>+    glSamplerParameterIivRobustANGLEContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLSAMPLERPARAMETERIUIVROBUSTANGLECONTEXTANGLEPROC
>+    glSamplerParameterIuivRobustANGLEContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLSAMPLERPARAMETERFVROBUSTANGLECONTEXTANGLEPROC
>+    glSamplerParameterfvRobustANGLEContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLSAMPLERPARAMETERIVROBUSTANGLECONTEXTANGLEPROC
>+    glSamplerParameterivRobustANGLEContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLTEXIMAGE2DROBUSTANGLECONTEXTANGLEPROC glTexImage2DRobustANGLEContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLTEXIMAGE3DROBUSTANGLECONTEXTANGLEPROC glTexImage3DRobustANGLEContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLTEXPARAMETERIIVROBUSTANGLECONTEXTANGLEPROC
>+    glTexParameterIivRobustANGLEContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLTEXPARAMETERIUIVROBUSTANGLECONTEXTANGLEPROC
>+    glTexParameterIuivRobustANGLEContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLTEXPARAMETERFVROBUSTANGLECONTEXTANGLEPROC
>+    glTexParameterfvRobustANGLEContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLTEXPARAMETERIVROBUSTANGLECONTEXTANGLEPROC
>+    glTexParameterivRobustANGLEContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLTEXSUBIMAGE2DROBUSTANGLECONTEXTANGLEPROC
>+    glTexSubImage2DRobustANGLEContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLTEXSUBIMAGE3DROBUSTANGLECONTEXTANGLEPROC
>+    glTexSubImage3DRobustANGLEContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLGETMULTISAMPLEFVANGLECONTEXTANGLEPROC glGetMultisamplefvANGLEContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLGETTEXLEVELPARAMETERFVANGLECONTEXTANGLEPROC
>+    glGetTexLevelParameterfvANGLEContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLGETTEXLEVELPARAMETERIVANGLECONTEXTANGLEPROC
>+    glGetTexLevelParameterivANGLEContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLSAMPLEMASKIANGLECONTEXTANGLEPROC glSampleMaskiANGLEContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLTEXSTORAGE2DMULTISAMPLEANGLECONTEXTANGLEPROC
>+    glTexStorage2DMultisampleANGLEContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLGETTRANSLATEDSHADERSOURCEANGLECONTEXTANGLEPROC
>+    glGetTranslatedShaderSourceANGLEContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLBINDUNIFORMLOCATIONCHROMIUMCONTEXTANGLEPROC
>+    glBindUniformLocationCHROMIUMContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLCOMPRESSEDCOPYTEXTURECHROMIUMCONTEXTANGLEPROC
>+    glCompressedCopyTextureCHROMIUMContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLCOPYSUBTEXTURECHROMIUMCONTEXTANGLEPROC glCopySubTextureCHROMIUMContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLCOPYTEXTURECHROMIUMCONTEXTANGLEPROC glCopyTextureCHROMIUMContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLCOVERAGEMODULATIONCHROMIUMCONTEXTANGLEPROC
>+    glCoverageModulationCHROMIUMContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLMATRIXLOADIDENTITYCHROMIUMCONTEXTANGLEPROC
>+    glMatrixLoadIdentityCHROMIUMContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLMATRIXLOADFCHROMIUMCONTEXTANGLEPROC glMatrixLoadfCHROMIUMContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLLOSECONTEXTCHROMIUMCONTEXTANGLEPROC glLoseContextCHROMIUMContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLBINDFRAGMENTINPUTLOCATIONCHROMIUMCONTEXTANGLEPROC
>+    glBindFragmentInputLocationCHROMIUMContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLCOVERFILLPATHCHROMIUMCONTEXTANGLEPROC glCoverFillPathCHROMIUMContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLCOVERFILLPATHINSTANCEDCHROMIUMCONTEXTANGLEPROC
>+    glCoverFillPathInstancedCHROMIUMContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLCOVERSTROKEPATHCHROMIUMCONTEXTANGLEPROC
>+    glCoverStrokePathCHROMIUMContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLCOVERSTROKEPATHINSTANCEDCHROMIUMCONTEXTANGLEPROC
>+    glCoverStrokePathInstancedCHROMIUMContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLDELETEPATHSCHROMIUMCONTEXTANGLEPROC glDeletePathsCHROMIUMContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLGENPATHSCHROMIUMCONTEXTANGLEPROC glGenPathsCHROMIUMContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLGETPATHPARAMETERFVCHROMIUMCONTEXTANGLEPROC
>+    glGetPathParameterfvCHROMIUMContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLGETPATHPARAMETERIVCHROMIUMCONTEXTANGLEPROC
>+    glGetPathParameterivCHROMIUMContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLISPATHCHROMIUMCONTEXTANGLEPROC glIsPathCHROMIUMContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLPATHCOMMANDSCHROMIUMCONTEXTANGLEPROC glPathCommandsCHROMIUMContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLPATHPARAMETERFCHROMIUMCONTEXTANGLEPROC glPathParameterfCHROMIUMContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLPATHPARAMETERICHROMIUMCONTEXTANGLEPROC glPathParameteriCHROMIUMContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLPATHSTENCILFUNCCHROMIUMCONTEXTANGLEPROC
>+    glPathStencilFuncCHROMIUMContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLPROGRAMPATHFRAGMENTINPUTGENCHROMIUMCONTEXTANGLEPROC
>+    glProgramPathFragmentInputGenCHROMIUMContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLSTENCILFILLPATHCHROMIUMCONTEXTANGLEPROC
>+    glStencilFillPathCHROMIUMContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLSTENCILFILLPATHINSTANCEDCHROMIUMCONTEXTANGLEPROC
>+    glStencilFillPathInstancedCHROMIUMContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLSTENCILSTROKEPATHCHROMIUMCONTEXTANGLEPROC
>+    glStencilStrokePathCHROMIUMContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLSTENCILSTROKEPATHINSTANCEDCHROMIUMCONTEXTANGLEPROC
>+    glStencilStrokePathInstancedCHROMIUMContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLSTENCILTHENCOVERFILLPATHCHROMIUMCONTEXTANGLEPROC
>+    glStencilThenCoverFillPathCHROMIUMContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLSTENCILTHENCOVERFILLPATHINSTANCEDCHROMIUMCONTEXTANGLEPROC
>+    glStencilThenCoverFillPathInstancedCHROMIUMContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLSTENCILTHENCOVERSTROKEPATHCHROMIUMCONTEXTANGLEPROC
>+    glStencilThenCoverStrokePathCHROMIUMContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLSTENCILTHENCOVERSTROKEPATHINSTANCEDCHROMIUMCONTEXTANGLEPROC
>+    glStencilThenCoverStrokePathInstancedCHROMIUMContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLBINDFRAGDATALOCATIONEXTCONTEXTANGLEPROC
>+    glBindFragDataLocationEXTContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLBINDFRAGDATALOCATIONINDEXEDEXTCONTEXTANGLEPROC
>+    glBindFragDataLocationIndexedEXTContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLGETFRAGDATAINDEXEXTCONTEXTANGLEPROC glGetFragDataIndexEXTContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLGETPROGRAMRESOURCELOCATIONINDEXEXTCONTEXTANGLEPROC
>+    glGetProgramResourceLocationIndexEXTContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLINSERTEVENTMARKEREXTCONTEXTANGLEPROC glInsertEventMarkerEXTContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLPOPGROUPMARKEREXTCONTEXTANGLEPROC glPopGroupMarkerEXTContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLPUSHGROUPMARKEREXTCONTEXTANGLEPROC glPushGroupMarkerEXTContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLDISCARDFRAMEBUFFEREXTCONTEXTANGLEPROC glDiscardFramebufferEXTContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLBEGINQUERYEXTCONTEXTANGLEPROC glBeginQueryEXTContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLDELETEQUERIESEXTCONTEXTANGLEPROC glDeleteQueriesEXTContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLENDQUERYEXTCONTEXTANGLEPROC glEndQueryEXTContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLGENQUERIESEXTCONTEXTANGLEPROC glGenQueriesEXTContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLGETQUERYOBJECTI64VEXTCONTEXTANGLEPROC glGetQueryObjecti64vEXTContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLGETQUERYOBJECTIVEXTCONTEXTANGLEPROC glGetQueryObjectivEXTContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLGETQUERYOBJECTUI64VEXTCONTEXTANGLEPROC glGetQueryObjectui64vEXTContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLGETQUERYOBJECTUIVEXTCONTEXTANGLEPROC glGetQueryObjectuivEXTContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLGETQUERYIVEXTCONTEXTANGLEPROC glGetQueryivEXTContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLISQUERYEXTCONTEXTANGLEPROC glIsQueryEXTContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLQUERYCOUNTEREXTCONTEXTANGLEPROC glQueryCounterEXTContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLDRAWBUFFERSEXTCONTEXTANGLEPROC glDrawBuffersEXTContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLFRAMEBUFFERTEXTUREEXTCONTEXTANGLEPROC glFramebufferTextureEXTContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLDRAWARRAYSINSTANCEDEXTCONTEXTANGLEPROC glDrawArraysInstancedEXTContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLDRAWELEMENTSINSTANCEDEXTCONTEXTANGLEPROC
>+    glDrawElementsInstancedEXTContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLVERTEXATTRIBDIVISOREXTCONTEXTANGLEPROC glVertexAttribDivisorEXTContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLFLUSHMAPPEDBUFFERRANGEEXTCONTEXTANGLEPROC
>+    glFlushMappedBufferRangeEXTContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLMAPBUFFERRANGEEXTCONTEXTANGLEPROC glMapBufferRangeEXTContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLBUFFERSTORAGEMEMEXTCONTEXTANGLEPROC glBufferStorageMemEXTContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLCREATEMEMORYOBJECTSEXTCONTEXTANGLEPROC glCreateMemoryObjectsEXTContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLDELETEMEMORYOBJECTSEXTCONTEXTANGLEPROC glDeleteMemoryObjectsEXTContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLGETMEMORYOBJECTPARAMETERIVEXTCONTEXTANGLEPROC
>+    glGetMemoryObjectParameterivEXTContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLGETUNSIGNEDBYTEI_VEXTCONTEXTANGLEPROC glGetUnsignedBytei_vEXTContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLGETUNSIGNEDBYTEVEXTCONTEXTANGLEPROC glGetUnsignedBytevEXTContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLISMEMORYOBJECTEXTCONTEXTANGLEPROC glIsMemoryObjectEXTContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLMEMORYOBJECTPARAMETERIVEXTCONTEXTANGLEPROC
>+    glMemoryObjectParameterivEXTContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLTEXSTORAGEMEM2DEXTCONTEXTANGLEPROC glTexStorageMem2DEXTContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLTEXSTORAGEMEM2DMULTISAMPLEEXTCONTEXTANGLEPROC
>+    glTexStorageMem2DMultisampleEXTContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLTEXSTORAGEMEM3DEXTCONTEXTANGLEPROC glTexStorageMem3DEXTContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLTEXSTORAGEMEM3DMULTISAMPLEEXTCONTEXTANGLEPROC
>+    glTexStorageMem3DMultisampleEXTContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLIMPORTMEMORYFDEXTCONTEXTANGLEPROC glImportMemoryFdEXTContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLGETGRAPHICSRESETSTATUSEXTCONTEXTANGLEPROC
>+    glGetGraphicsResetStatusEXTContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLGETNUNIFORMFVEXTCONTEXTANGLEPROC glGetnUniformfvEXTContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLGETNUNIFORMIVEXTCONTEXTANGLEPROC glGetnUniformivEXTContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLREADNPIXELSEXTCONTEXTANGLEPROC glReadnPixelsEXTContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLDELETESEMAPHORESEXTCONTEXTANGLEPROC glDeleteSemaphoresEXTContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLGENSEMAPHORESEXTCONTEXTANGLEPROC glGenSemaphoresEXTContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLGETSEMAPHOREPARAMETERUI64VEXTCONTEXTANGLEPROC
>+    glGetSemaphoreParameterui64vEXTContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLISSEMAPHOREEXTCONTEXTANGLEPROC glIsSemaphoreEXTContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLSEMAPHOREPARAMETERUI64VEXTCONTEXTANGLEPROC
>+    glSemaphoreParameterui64vEXTContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLSIGNALSEMAPHOREEXTCONTEXTANGLEPROC glSignalSemaphoreEXTContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLWAITSEMAPHOREEXTCONTEXTANGLEPROC glWaitSemaphoreEXTContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLIMPORTSEMAPHOREFDEXTCONTEXTANGLEPROC glImportSemaphoreFdEXTContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLTEXSTORAGE1DEXTCONTEXTANGLEPROC glTexStorage1DEXTContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLTEXSTORAGE2DEXTCONTEXTANGLEPROC glTexStorage2DEXTContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLTEXSTORAGE3DEXTCONTEXTANGLEPROC glTexStorage3DEXTContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLDEBUGMESSAGECALLBACKKHRCONTEXTANGLEPROC
>+    glDebugMessageCallbackKHRContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLDEBUGMESSAGECONTROLKHRCONTEXTANGLEPROC glDebugMessageControlKHRContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLDEBUGMESSAGEINSERTKHRCONTEXTANGLEPROC glDebugMessageInsertKHRContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLGETDEBUGMESSAGELOGKHRCONTEXTANGLEPROC glGetDebugMessageLogKHRContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLGETOBJECTLABELKHRCONTEXTANGLEPROC glGetObjectLabelKHRContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLGETOBJECTPTRLABELKHRCONTEXTANGLEPROC glGetObjectPtrLabelKHRContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLGETPOINTERVKHRCONTEXTANGLEPROC glGetPointervKHRContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLOBJECTLABELKHRCONTEXTANGLEPROC glObjectLabelKHRContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLOBJECTPTRLABELKHRCONTEXTANGLEPROC glObjectPtrLabelKHRContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLPOPDEBUGGROUPKHRCONTEXTANGLEPROC glPopDebugGroupKHRContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLPUSHDEBUGGROUPKHRCONTEXTANGLEPROC glPushDebugGroupKHRContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLMAXSHADERCOMPILERTHREADSKHRCONTEXTANGLEPROC
>+    glMaxShaderCompilerThreadsKHRContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLDELETEFENCESNVCONTEXTANGLEPROC glDeleteFencesNVContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLFINISHFENCENVCONTEXTANGLEPROC glFinishFenceNVContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLGENFENCESNVCONTEXTANGLEPROC glGenFencesNVContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLGETFENCEIVNVCONTEXTANGLEPROC glGetFenceivNVContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLISFENCENVCONTEXTANGLEPROC glIsFenceNVContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLSETFENCENVCONTEXTANGLEPROC glSetFenceNVContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLTESTFENCENVCONTEXTANGLEPROC glTestFenceNVContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLEGLIMAGETARGETRENDERBUFFERSTORAGEOESCONTEXTANGLEPROC
>+    glEGLImageTargetRenderbufferStorageOESContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLEGLIMAGETARGETTEXTURE2DOESCONTEXTANGLEPROC
>+    glEGLImageTargetTexture2DOESContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLGETPROGRAMBINARYOESCONTEXTANGLEPROC glGetProgramBinaryOESContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLPROGRAMBINARYOESCONTEXTANGLEPROC glProgramBinaryOESContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLGETBUFFERPOINTERVOESCONTEXTANGLEPROC glGetBufferPointervOESContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLMAPBUFFEROESCONTEXTANGLEPROC glMapBufferOESContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLUNMAPBUFFEROESCONTEXTANGLEPROC glUnmapBufferOESContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLGETSAMPLERPARAMETERIIVOESCONTEXTANGLEPROC
>+    glGetSamplerParameterIivOESContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLGETSAMPLERPARAMETERIUIVOESCONTEXTANGLEPROC
>+    glGetSamplerParameterIuivOESContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLGETTEXPARAMETERIIVOESCONTEXTANGLEPROC glGetTexParameterIivOESContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLGETTEXPARAMETERIUIVOESCONTEXTANGLEPROC glGetTexParameterIuivOESContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLSAMPLERPARAMETERIIVOESCONTEXTANGLEPROC glSamplerParameterIivOESContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLSAMPLERPARAMETERIUIVOESCONTEXTANGLEPROC
>+    glSamplerParameterIuivOESContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLTEXPARAMETERIIVOESCONTEXTANGLEPROC glTexParameterIivOESContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLTEXPARAMETERIUIVOESCONTEXTANGLEPROC glTexParameterIuivOESContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLTEXSTORAGE3DMULTISAMPLEOESCONTEXTANGLEPROC
>+    glTexStorage3DMultisampleOESContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLBINDVERTEXARRAYOESCONTEXTANGLEPROC glBindVertexArrayOESContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLDELETEVERTEXARRAYSOESCONTEXTANGLEPROC glDeleteVertexArraysOESContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLGENVERTEXARRAYSOESCONTEXTANGLEPROC glGenVertexArraysOESContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLISVERTEXARRAYOESCONTEXTANGLEPROC glIsVertexArrayOESContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLFRAMEBUFFERTEXTUREMULTIVIEWOVRCONTEXTANGLEPROC
>+    glFramebufferTextureMultiviewOVRContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLDRAWTEXFOESCONTEXTANGLEPROC glDrawTexfOESContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLDRAWTEXFVOESCONTEXTANGLEPROC glDrawTexfvOESContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLDRAWTEXIOESCONTEXTANGLEPROC glDrawTexiOESContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLDRAWTEXIVOESCONTEXTANGLEPROC glDrawTexivOESContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLDRAWTEXSOESCONTEXTANGLEPROC glDrawTexsOESContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLDRAWTEXSVOESCONTEXTANGLEPROC glDrawTexsvOESContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLDRAWTEXXOESCONTEXTANGLEPROC glDrawTexxOESContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLDRAWTEXXVOESCONTEXTANGLEPROC glDrawTexxvOESContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLBINDFRAMEBUFFEROESCONTEXTANGLEPROC glBindFramebufferOESContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLBINDRENDERBUFFEROESCONTEXTANGLEPROC glBindRenderbufferOESContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLCHECKFRAMEBUFFERSTATUSOESCONTEXTANGLEPROC
>+    glCheckFramebufferStatusOESContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLDELETEFRAMEBUFFERSOESCONTEXTANGLEPROC glDeleteFramebuffersOESContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLDELETERENDERBUFFERSOESCONTEXTANGLEPROC glDeleteRenderbuffersOESContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLFRAMEBUFFERRENDERBUFFEROESCONTEXTANGLEPROC
>+    glFramebufferRenderbufferOESContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLFRAMEBUFFERTEXTURE2DOESCONTEXTANGLEPROC
>+    glFramebufferTexture2DOESContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLGENFRAMEBUFFERSOESCONTEXTANGLEPROC glGenFramebuffersOESContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLGENRENDERBUFFERSOESCONTEXTANGLEPROC glGenRenderbuffersOESContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLGENERATEMIPMAPOESCONTEXTANGLEPROC glGenerateMipmapOESContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLGETFRAMEBUFFERATTACHMENTPARAMETERIVOESCONTEXTANGLEPROC
>+    glGetFramebufferAttachmentParameterivOESContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLGETRENDERBUFFERPARAMETERIVOESCONTEXTANGLEPROC
>+    glGetRenderbufferParameterivOESContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLISFRAMEBUFFEROESCONTEXTANGLEPROC glIsFramebufferOESContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLISRENDERBUFFEROESCONTEXTANGLEPROC glIsRenderbufferOESContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLRENDERBUFFERSTORAGEOESCONTEXTANGLEPROC glRenderbufferStorageOESContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLCURRENTPALETTEMATRIXOESCONTEXTANGLEPROC
>+    glCurrentPaletteMatrixOESContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLLOADPALETTEFROMMODELVIEWMATRIXOESCONTEXTANGLEPROC
>+    glLoadPaletteFromModelViewMatrixOESContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLMATRIXINDEXPOINTEROESCONTEXTANGLEPROC glMatrixIndexPointerOESContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLWEIGHTPOINTEROESCONTEXTANGLEPROC glWeightPointerOESContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLPOINTSIZEPOINTEROESCONTEXTANGLEPROC glPointSizePointerOESContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLQUERYMATRIXXOESCONTEXTANGLEPROC glQueryMatrixxOESContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLGETTEXGENFVOESCONTEXTANGLEPROC glGetTexGenfvOESContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLGETTEXGENIVOESCONTEXTANGLEPROC glGetTexGenivOESContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLGETTEXGENXVOESCONTEXTANGLEPROC glGetTexGenxvOESContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLTEXGENFOESCONTEXTANGLEPROC glTexGenfOESContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLTEXGENFVOESCONTEXTANGLEPROC glTexGenfvOESContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLTEXGENIOESCONTEXTANGLEPROC glTexGeniOESContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLTEXGENIVOESCONTEXTANGLEPROC glTexGenivOESContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLTEXGENXOESCONTEXTANGLEPROC glTexGenxOESContextANGLE;
>+ANGLE_UTIL_EXPORT PFNGLTEXGENXVOESCONTEXTANGLEPROC glTexGenxvOESContextANGLE;
>+
>+namespace angle
>+{
>+void LoadGLES(LoadProc loadProc)
>+{
>+    glAlphaFunc       = reinterpret_cast<PFNGLALPHAFUNCPROC>(loadProc("glAlphaFunc"));
>+    glClipPlanef      = reinterpret_cast<PFNGLCLIPPLANEFPROC>(loadProc("glClipPlanef"));
>+    glColor4f         = reinterpret_cast<PFNGLCOLOR4FPROC>(loadProc("glColor4f"));
>+    glFogf            = reinterpret_cast<PFNGLFOGFPROC>(loadProc("glFogf"));
>+    glFogfv           = reinterpret_cast<PFNGLFOGFVPROC>(loadProc("glFogfv"));
>+    glFrustumf        = reinterpret_cast<PFNGLFRUSTUMFPROC>(loadProc("glFrustumf"));
>+    glGetClipPlanef   = reinterpret_cast<PFNGLGETCLIPPLANEFPROC>(loadProc("glGetClipPlanef"));
>+    glGetLightfv      = reinterpret_cast<PFNGLGETLIGHTFVPROC>(loadProc("glGetLightfv"));
>+    glGetMaterialfv   = reinterpret_cast<PFNGLGETMATERIALFVPROC>(loadProc("glGetMaterialfv"));
>+    glGetTexEnvfv     = reinterpret_cast<PFNGLGETTEXENVFVPROC>(loadProc("glGetTexEnvfv"));
>+    glLightModelf     = reinterpret_cast<PFNGLLIGHTMODELFPROC>(loadProc("glLightModelf"));
>+    glLightModelfv    = reinterpret_cast<PFNGLLIGHTMODELFVPROC>(loadProc("glLightModelfv"));
>+    glLightf          = reinterpret_cast<PFNGLLIGHTFPROC>(loadProc("glLightf"));
>+    glLightfv         = reinterpret_cast<PFNGLLIGHTFVPROC>(loadProc("glLightfv"));
>+    glLoadMatrixf     = reinterpret_cast<PFNGLLOADMATRIXFPROC>(loadProc("glLoadMatrixf"));
>+    glMaterialf       = reinterpret_cast<PFNGLMATERIALFPROC>(loadProc("glMaterialf"));
>+    glMaterialfv      = reinterpret_cast<PFNGLMATERIALFVPROC>(loadProc("glMaterialfv"));
>+    glMultMatrixf     = reinterpret_cast<PFNGLMULTMATRIXFPROC>(loadProc("glMultMatrixf"));
>+    glMultiTexCoord4f = reinterpret_cast<PFNGLMULTITEXCOORD4FPROC>(loadProc("glMultiTexCoord4f"));
>+    glNormal3f        = reinterpret_cast<PFNGLNORMAL3FPROC>(loadProc("glNormal3f"));
>+    glOrthof          = reinterpret_cast<PFNGLORTHOFPROC>(loadProc("glOrthof"));
>+    glPointParameterf = reinterpret_cast<PFNGLPOINTPARAMETERFPROC>(loadProc("glPointParameterf"));
>+    glPointParameterfv =
>+        reinterpret_cast<PFNGLPOINTPARAMETERFVPROC>(loadProc("glPointParameterfv"));
>+    glPointSize   = reinterpret_cast<PFNGLPOINTSIZEPROC>(loadProc("glPointSize"));
>+    glRotatef     = reinterpret_cast<PFNGLROTATEFPROC>(loadProc("glRotatef"));
>+    glScalef      = reinterpret_cast<PFNGLSCALEFPROC>(loadProc("glScalef"));
>+    glTexEnvf     = reinterpret_cast<PFNGLTEXENVFPROC>(loadProc("glTexEnvf"));
>+    glTexEnvfv    = reinterpret_cast<PFNGLTEXENVFVPROC>(loadProc("glTexEnvfv"));
>+    glTranslatef  = reinterpret_cast<PFNGLTRANSLATEFPROC>(loadProc("glTranslatef"));
>+    glAlphaFuncx  = reinterpret_cast<PFNGLALPHAFUNCXPROC>(loadProc("glAlphaFuncx"));
>+    glClearColorx = reinterpret_cast<PFNGLCLEARCOLORXPROC>(loadProc("glClearColorx"));
>+    glClearDepthx = reinterpret_cast<PFNGLCLEARDEPTHXPROC>(loadProc("glClearDepthx"));
>+    glClientActiveTexture =
>+        reinterpret_cast<PFNGLCLIENTACTIVETEXTUREPROC>(loadProc("glClientActiveTexture"));
>+    glClipPlanex   = reinterpret_cast<PFNGLCLIPPLANEXPROC>(loadProc("glClipPlanex"));
>+    glColor4ub     = reinterpret_cast<PFNGLCOLOR4UBPROC>(loadProc("glColor4ub"));
>+    glColor4x      = reinterpret_cast<PFNGLCOLOR4XPROC>(loadProc("glColor4x"));
>+    glColorPointer = reinterpret_cast<PFNGLCOLORPOINTERPROC>(loadProc("glColorPointer"));
>+    glDepthRangex  = reinterpret_cast<PFNGLDEPTHRANGEXPROC>(loadProc("glDepthRangex"));
>+    glDisableClientState =
>+        reinterpret_cast<PFNGLDISABLECLIENTSTATEPROC>(loadProc("glDisableClientState"));
>+    glEnableClientState =
>+        reinterpret_cast<PFNGLENABLECLIENTSTATEPROC>(loadProc("glEnableClientState"));
>+    glFogx          = reinterpret_cast<PFNGLFOGXPROC>(loadProc("glFogx"));
>+    glFogxv         = reinterpret_cast<PFNGLFOGXVPROC>(loadProc("glFogxv"));
>+    glFrustumx      = reinterpret_cast<PFNGLFRUSTUMXPROC>(loadProc("glFrustumx"));
>+    glGetClipPlanex = reinterpret_cast<PFNGLGETCLIPPLANEXPROC>(loadProc("glGetClipPlanex"));
>+    glGetFixedv     = reinterpret_cast<PFNGLGETFIXEDVPROC>(loadProc("glGetFixedv"));
>+    glGetLightxv    = reinterpret_cast<PFNGLGETLIGHTXVPROC>(loadProc("glGetLightxv"));
>+    glGetMaterialxv = reinterpret_cast<PFNGLGETMATERIALXVPROC>(loadProc("glGetMaterialxv"));
>+    glGetPointerv   = reinterpret_cast<PFNGLGETPOINTERVPROC>(loadProc("glGetPointerv"));
>+    glGetTexEnviv   = reinterpret_cast<PFNGLGETTEXENVIVPROC>(loadProc("glGetTexEnviv"));
>+    glGetTexEnvxv   = reinterpret_cast<PFNGLGETTEXENVXVPROC>(loadProc("glGetTexEnvxv"));
>+    glGetTexParameterxv =
>+        reinterpret_cast<PFNGLGETTEXPARAMETERXVPROC>(loadProc("glGetTexParameterxv"));
>+    glLightModelx     = reinterpret_cast<PFNGLLIGHTMODELXPROC>(loadProc("glLightModelx"));
>+    glLightModelxv    = reinterpret_cast<PFNGLLIGHTMODELXVPROC>(loadProc("glLightModelxv"));
>+    glLightx          = reinterpret_cast<PFNGLLIGHTXPROC>(loadProc("glLightx"));
>+    glLightxv         = reinterpret_cast<PFNGLLIGHTXVPROC>(loadProc("glLightxv"));
>+    glLineWidthx      = reinterpret_cast<PFNGLLINEWIDTHXPROC>(loadProc("glLineWidthx"));
>+    glLoadIdentity    = reinterpret_cast<PFNGLLOADIDENTITYPROC>(loadProc("glLoadIdentity"));
>+    glLoadMatrixx     = reinterpret_cast<PFNGLLOADMATRIXXPROC>(loadProc("glLoadMatrixx"));
>+    glLogicOp         = reinterpret_cast<PFNGLLOGICOPPROC>(loadProc("glLogicOp"));
>+    glMaterialx       = reinterpret_cast<PFNGLMATERIALXPROC>(loadProc("glMaterialx"));
>+    glMaterialxv      = reinterpret_cast<PFNGLMATERIALXVPROC>(loadProc("glMaterialxv"));
>+    glMatrixMode      = reinterpret_cast<PFNGLMATRIXMODEPROC>(loadProc("glMatrixMode"));
>+    glMultMatrixx     = reinterpret_cast<PFNGLMULTMATRIXXPROC>(loadProc("glMultMatrixx"));
>+    glMultiTexCoord4x = reinterpret_cast<PFNGLMULTITEXCOORD4XPROC>(loadProc("glMultiTexCoord4x"));
>+    glNormal3x        = reinterpret_cast<PFNGLNORMAL3XPROC>(loadProc("glNormal3x"));
>+    glNormalPointer   = reinterpret_cast<PFNGLNORMALPOINTERPROC>(loadProc("glNormalPointer"));
>+    glOrthox          = reinterpret_cast<PFNGLORTHOXPROC>(loadProc("glOrthox"));
>+    glPointParameterx = reinterpret_cast<PFNGLPOINTPARAMETERXPROC>(loadProc("glPointParameterx"));
>+    glPointParameterxv =
>+        reinterpret_cast<PFNGLPOINTPARAMETERXVPROC>(loadProc("glPointParameterxv"));
>+    glPointSizex      = reinterpret_cast<PFNGLPOINTSIZEXPROC>(loadProc("glPointSizex"));
>+    glPolygonOffsetx  = reinterpret_cast<PFNGLPOLYGONOFFSETXPROC>(loadProc("glPolygonOffsetx"));
>+    glPopMatrix       = reinterpret_cast<PFNGLPOPMATRIXPROC>(loadProc("glPopMatrix"));
>+    glPushMatrix      = reinterpret_cast<PFNGLPUSHMATRIXPROC>(loadProc("glPushMatrix"));
>+    glRotatex         = reinterpret_cast<PFNGLROTATEXPROC>(loadProc("glRotatex"));
>+    glSampleCoveragex = reinterpret_cast<PFNGLSAMPLECOVERAGEXPROC>(loadProc("glSampleCoveragex"));
>+    glScalex          = reinterpret_cast<PFNGLSCALEXPROC>(loadProc("glScalex"));
>+    glShadeModel      = reinterpret_cast<PFNGLSHADEMODELPROC>(loadProc("glShadeModel"));
>+    glTexCoordPointer = reinterpret_cast<PFNGLTEXCOORDPOINTERPROC>(loadProc("glTexCoordPointer"));
>+    glTexEnvi         = reinterpret_cast<PFNGLTEXENVIPROC>(loadProc("glTexEnvi"));
>+    glTexEnvx         = reinterpret_cast<PFNGLTEXENVXPROC>(loadProc("glTexEnvx"));
>+    glTexEnviv        = reinterpret_cast<PFNGLTEXENVIVPROC>(loadProc("glTexEnviv"));
>+    glTexEnvxv        = reinterpret_cast<PFNGLTEXENVXVPROC>(loadProc("glTexEnvxv"));
>+    glTexParameterx   = reinterpret_cast<PFNGLTEXPARAMETERXPROC>(loadProc("glTexParameterx"));
>+    glTexParameterxv  = reinterpret_cast<PFNGLTEXPARAMETERXVPROC>(loadProc("glTexParameterxv"));
>+    glTranslatex      = reinterpret_cast<PFNGLTRANSLATEXPROC>(loadProc("glTranslatex"));
>+    glVertexPointer   = reinterpret_cast<PFNGLVERTEXPOINTERPROC>(loadProc("glVertexPointer"));
>+    glActiveTexture   = reinterpret_cast<PFNGLACTIVETEXTUREPROC>(loadProc("glActiveTexture"));
>+    glAttachShader    = reinterpret_cast<PFNGLATTACHSHADERPROC>(loadProc("glAttachShader"));
>+    glBindAttribLocation =
>+        reinterpret_cast<PFNGLBINDATTRIBLOCATIONPROC>(loadProc("glBindAttribLocation"));
>+    glBindBuffer      = reinterpret_cast<PFNGLBINDBUFFERPROC>(loadProc("glBindBuffer"));
>+    glBindFramebuffer = reinterpret_cast<PFNGLBINDFRAMEBUFFERPROC>(loadProc("glBindFramebuffer"));
>+    glBindRenderbuffer =
>+        reinterpret_cast<PFNGLBINDRENDERBUFFERPROC>(loadProc("glBindRenderbuffer"));
>+    glBindTexture   = reinterpret_cast<PFNGLBINDTEXTUREPROC>(loadProc("glBindTexture"));
>+    glBlendColor    = reinterpret_cast<PFNGLBLENDCOLORPROC>(loadProc("glBlendColor"));
>+    glBlendEquation = reinterpret_cast<PFNGLBLENDEQUATIONPROC>(loadProc("glBlendEquation"));
>+    glBlendEquationSeparate =
>+        reinterpret_cast<PFNGLBLENDEQUATIONSEPARATEPROC>(loadProc("glBlendEquationSeparate"));
>+    glBlendFunc = reinterpret_cast<PFNGLBLENDFUNCPROC>(loadProc("glBlendFunc"));
>+    glBlendFuncSeparate =
>+        reinterpret_cast<PFNGLBLENDFUNCSEPARATEPROC>(loadProc("glBlendFuncSeparate"));
>+    glBufferData    = reinterpret_cast<PFNGLBUFFERDATAPROC>(loadProc("glBufferData"));
>+    glBufferSubData = reinterpret_cast<PFNGLBUFFERSUBDATAPROC>(loadProc("glBufferSubData"));
>+    glCheckFramebufferStatus =
>+        reinterpret_cast<PFNGLCHECKFRAMEBUFFERSTATUSPROC>(loadProc("glCheckFramebufferStatus"));
>+    glClear         = reinterpret_cast<PFNGLCLEARPROC>(loadProc("glClear"));
>+    glClearColor    = reinterpret_cast<PFNGLCLEARCOLORPROC>(loadProc("glClearColor"));
>+    glClearDepthf   = reinterpret_cast<PFNGLCLEARDEPTHFPROC>(loadProc("glClearDepthf"));
>+    glClearStencil  = reinterpret_cast<PFNGLCLEARSTENCILPROC>(loadProc("glClearStencil"));
>+    glColorMask     = reinterpret_cast<PFNGLCOLORMASKPROC>(loadProc("glColorMask"));
>+    glCompileShader = reinterpret_cast<PFNGLCOMPILESHADERPROC>(loadProc("glCompileShader"));
>+    glCompressedTexImage2D =
>+        reinterpret_cast<PFNGLCOMPRESSEDTEXIMAGE2DPROC>(loadProc("glCompressedTexImage2D"));
>+    glCompressedTexSubImage2D =
>+        reinterpret_cast<PFNGLCOMPRESSEDTEXSUBIMAGE2DPROC>(loadProc("glCompressedTexSubImage2D"));
>+    glCopyTexImage2D = reinterpret_cast<PFNGLCOPYTEXIMAGE2DPROC>(loadProc("glCopyTexImage2D"));
>+    glCopyTexSubImage2D =
>+        reinterpret_cast<PFNGLCOPYTEXSUBIMAGE2DPROC>(loadProc("glCopyTexSubImage2D"));
>+    glCreateProgram = reinterpret_cast<PFNGLCREATEPROGRAMPROC>(loadProc("glCreateProgram"));
>+    glCreateShader  = reinterpret_cast<PFNGLCREATESHADERPROC>(loadProc("glCreateShader"));
>+    glCullFace      = reinterpret_cast<PFNGLCULLFACEPROC>(loadProc("glCullFace"));
>+    glDeleteBuffers = reinterpret_cast<PFNGLDELETEBUFFERSPROC>(loadProc("glDeleteBuffers"));
>+    glDeleteFramebuffers =
>+        reinterpret_cast<PFNGLDELETEFRAMEBUFFERSPROC>(loadProc("glDeleteFramebuffers"));
>+    glDeleteProgram = reinterpret_cast<PFNGLDELETEPROGRAMPROC>(loadProc("glDeleteProgram"));
>+    glDeleteRenderbuffers =
>+        reinterpret_cast<PFNGLDELETERENDERBUFFERSPROC>(loadProc("glDeleteRenderbuffers"));
>+    glDeleteShader   = reinterpret_cast<PFNGLDELETESHADERPROC>(loadProc("glDeleteShader"));
>+    glDeleteTextures = reinterpret_cast<PFNGLDELETETEXTURESPROC>(loadProc("glDeleteTextures"));
>+    glDepthFunc      = reinterpret_cast<PFNGLDEPTHFUNCPROC>(loadProc("glDepthFunc"));
>+    glDepthMask      = reinterpret_cast<PFNGLDEPTHMASKPROC>(loadProc("glDepthMask"));
>+    glDepthRangef    = reinterpret_cast<PFNGLDEPTHRANGEFPROC>(loadProc("glDepthRangef"));
>+    glDetachShader   = reinterpret_cast<PFNGLDETACHSHADERPROC>(loadProc("glDetachShader"));
>+    glDisable        = reinterpret_cast<PFNGLDISABLEPROC>(loadProc("glDisable"));
>+    glDisableVertexAttribArray =
>+        reinterpret_cast<PFNGLDISABLEVERTEXATTRIBARRAYPROC>(loadProc("glDisableVertexAttribArray"));
>+    glDrawArrays   = reinterpret_cast<PFNGLDRAWARRAYSPROC>(loadProc("glDrawArrays"));
>+    glDrawElements = reinterpret_cast<PFNGLDRAWELEMENTSPROC>(loadProc("glDrawElements"));
>+    glEnable       = reinterpret_cast<PFNGLENABLEPROC>(loadProc("glEnable"));
>+    glEnableVertexAttribArray =
>+        reinterpret_cast<PFNGLENABLEVERTEXATTRIBARRAYPROC>(loadProc("glEnableVertexAttribArray"));
>+    glFinish = reinterpret_cast<PFNGLFINISHPROC>(loadProc("glFinish"));
>+    glFlush  = reinterpret_cast<PFNGLFLUSHPROC>(loadProc("glFlush"));
>+    glFramebufferRenderbuffer =
>+        reinterpret_cast<PFNGLFRAMEBUFFERRENDERBUFFERPROC>(loadProc("glFramebufferRenderbuffer"));
>+    glFramebufferTexture2D =
>+        reinterpret_cast<PFNGLFRAMEBUFFERTEXTURE2DPROC>(loadProc("glFramebufferTexture2D"));
>+    glFrontFace       = reinterpret_cast<PFNGLFRONTFACEPROC>(loadProc("glFrontFace"));
>+    glGenBuffers      = reinterpret_cast<PFNGLGENBUFFERSPROC>(loadProc("glGenBuffers"));
>+    glGenerateMipmap  = reinterpret_cast<PFNGLGENERATEMIPMAPPROC>(loadProc("glGenerateMipmap"));
>+    glGenFramebuffers = reinterpret_cast<PFNGLGENFRAMEBUFFERSPROC>(loadProc("glGenFramebuffers"));
>+    glGenRenderbuffers =
>+        reinterpret_cast<PFNGLGENRENDERBUFFERSPROC>(loadProc("glGenRenderbuffers"));
>+    glGenTextures     = reinterpret_cast<PFNGLGENTEXTURESPROC>(loadProc("glGenTextures"));
>+    glGetActiveAttrib = reinterpret_cast<PFNGLGETACTIVEATTRIBPROC>(loadProc("glGetActiveAttrib"));
>+    glGetActiveUniform =
>+        reinterpret_cast<PFNGLGETACTIVEUNIFORMPROC>(loadProc("glGetActiveUniform"));
>+    glGetAttachedShaders =
>+        reinterpret_cast<PFNGLGETATTACHEDSHADERSPROC>(loadProc("glGetAttachedShaders"));
>+    glGetAttribLocation =
>+        reinterpret_cast<PFNGLGETATTRIBLOCATIONPROC>(loadProc("glGetAttribLocation"));
>+    glGetBooleanv = reinterpret_cast<PFNGLGETBOOLEANVPROC>(loadProc("glGetBooleanv"));
>+    glGetBufferParameteriv =
>+        reinterpret_cast<PFNGLGETBUFFERPARAMETERIVPROC>(loadProc("glGetBufferParameteriv"));
>+    glGetError  = reinterpret_cast<PFNGLGETERRORPROC>(loadProc("glGetError"));
>+    glGetFloatv = reinterpret_cast<PFNGLGETFLOATVPROC>(loadProc("glGetFloatv"));
>+    glGetFramebufferAttachmentParameteriv =
>+        reinterpret_cast<PFNGLGETFRAMEBUFFERATTACHMENTPARAMETERIVPROC>(
>+            loadProc("glGetFramebufferAttachmentParameteriv"));
>+    glGetIntegerv  = reinterpret_cast<PFNGLGETINTEGERVPROC>(loadProc("glGetIntegerv"));
>+    glGetProgramiv = reinterpret_cast<PFNGLGETPROGRAMIVPROC>(loadProc("glGetProgramiv"));
>+    glGetProgramInfoLog =
>+        reinterpret_cast<PFNGLGETPROGRAMINFOLOGPROC>(loadProc("glGetProgramInfoLog"));
>+    glGetRenderbufferParameteriv = reinterpret_cast<PFNGLGETRENDERBUFFERPARAMETERIVPROC>(
>+        loadProc("glGetRenderbufferParameteriv"));
>+    glGetShaderiv = reinterpret_cast<PFNGLGETSHADERIVPROC>(loadProc("glGetShaderiv"));
>+    glGetShaderInfoLog =
>+        reinterpret_cast<PFNGLGETSHADERINFOLOGPROC>(loadProc("glGetShaderInfoLog"));
>+    glGetShaderPrecisionFormat =
>+        reinterpret_cast<PFNGLGETSHADERPRECISIONFORMATPROC>(loadProc("glGetShaderPrecisionFormat"));
>+    glGetShaderSource = reinterpret_cast<PFNGLGETSHADERSOURCEPROC>(loadProc("glGetShaderSource"));
>+    glGetString       = reinterpret_cast<PFNGLGETSTRINGPROC>(loadProc("glGetString"));
>+    glGetTexParameterfv =
>+        reinterpret_cast<PFNGLGETTEXPARAMETERFVPROC>(loadProc("glGetTexParameterfv"));
>+    glGetTexParameteriv =
>+        reinterpret_cast<PFNGLGETTEXPARAMETERIVPROC>(loadProc("glGetTexParameteriv"));
>+    glGetUniformfv = reinterpret_cast<PFNGLGETUNIFORMFVPROC>(loadProc("glGetUniformfv"));
>+    glGetUniformiv = reinterpret_cast<PFNGLGETUNIFORMIVPROC>(loadProc("glGetUniformiv"));
>+    glGetUniformLocation =
>+        reinterpret_cast<PFNGLGETUNIFORMLOCATIONPROC>(loadProc("glGetUniformLocation"));
>+    glGetVertexAttribfv =
>+        reinterpret_cast<PFNGLGETVERTEXATTRIBFVPROC>(loadProc("glGetVertexAttribfv"));
>+    glGetVertexAttribiv =
>+        reinterpret_cast<PFNGLGETVERTEXATTRIBIVPROC>(loadProc("glGetVertexAttribiv"));
>+    glGetVertexAttribPointerv =
>+        reinterpret_cast<PFNGLGETVERTEXATTRIBPOINTERVPROC>(loadProc("glGetVertexAttribPointerv"));
>+    glHint           = reinterpret_cast<PFNGLHINTPROC>(loadProc("glHint"));
>+    glIsBuffer       = reinterpret_cast<PFNGLISBUFFERPROC>(loadProc("glIsBuffer"));
>+    glIsEnabled      = reinterpret_cast<PFNGLISENABLEDPROC>(loadProc("glIsEnabled"));
>+    glIsFramebuffer  = reinterpret_cast<PFNGLISFRAMEBUFFERPROC>(loadProc("glIsFramebuffer"));
>+    glIsProgram      = reinterpret_cast<PFNGLISPROGRAMPROC>(loadProc("glIsProgram"));
>+    glIsRenderbuffer = reinterpret_cast<PFNGLISRENDERBUFFERPROC>(loadProc("glIsRenderbuffer"));
>+    glIsShader       = reinterpret_cast<PFNGLISSHADERPROC>(loadProc("glIsShader"));
>+    glIsTexture      = reinterpret_cast<PFNGLISTEXTUREPROC>(loadProc("glIsTexture"));
>+    glLineWidth      = reinterpret_cast<PFNGLLINEWIDTHPROC>(loadProc("glLineWidth"));
>+    glLinkProgram    = reinterpret_cast<PFNGLLINKPROGRAMPROC>(loadProc("glLinkProgram"));
>+    glPixelStorei    = reinterpret_cast<PFNGLPIXELSTOREIPROC>(loadProc("glPixelStorei"));
>+    glPolygonOffset  = reinterpret_cast<PFNGLPOLYGONOFFSETPROC>(loadProc("glPolygonOffset"));
>+    glReadPixels     = reinterpret_cast<PFNGLREADPIXELSPROC>(loadProc("glReadPixels"));
>+    glReleaseShaderCompiler =
>+        reinterpret_cast<PFNGLRELEASESHADERCOMPILERPROC>(loadProc("glReleaseShaderCompiler"));
>+    glRenderbufferStorage =
>+        reinterpret_cast<PFNGLRENDERBUFFERSTORAGEPROC>(loadProc("glRenderbufferStorage"));
>+    glSampleCoverage = reinterpret_cast<PFNGLSAMPLECOVERAGEPROC>(loadProc("glSampleCoverage"));
>+    glScissor        = reinterpret_cast<PFNGLSCISSORPROC>(loadProc("glScissor"));
>+    glShaderBinary   = reinterpret_cast<PFNGLSHADERBINARYPROC>(loadProc("glShaderBinary"));
>+    glShaderSource   = reinterpret_cast<PFNGLSHADERSOURCEPROC>(loadProc("glShaderSource"));
>+    glStencilFunc    = reinterpret_cast<PFNGLSTENCILFUNCPROC>(loadProc("glStencilFunc"));
>+    glStencilFuncSeparate =
>+        reinterpret_cast<PFNGLSTENCILFUNCSEPARATEPROC>(loadProc("glStencilFuncSeparate"));
>+    glStencilMask = reinterpret_cast<PFNGLSTENCILMASKPROC>(loadProc("glStencilMask"));
>+    glStencilMaskSeparate =
>+        reinterpret_cast<PFNGLSTENCILMASKSEPARATEPROC>(loadProc("glStencilMaskSeparate"));
>+    glStencilOp = reinterpret_cast<PFNGLSTENCILOPPROC>(loadProc("glStencilOp"));
>+    glStencilOpSeparate =
>+        reinterpret_cast<PFNGLSTENCILOPSEPARATEPROC>(loadProc("glStencilOpSeparate"));
>+    glTexImage2D     = reinterpret_cast<PFNGLTEXIMAGE2DPROC>(loadProc("glTexImage2D"));
>+    glTexParameterf  = reinterpret_cast<PFNGLTEXPARAMETERFPROC>(loadProc("glTexParameterf"));
>+    glTexParameterfv = reinterpret_cast<PFNGLTEXPARAMETERFVPROC>(loadProc("glTexParameterfv"));
>+    glTexParameteri  = reinterpret_cast<PFNGLTEXPARAMETERIPROC>(loadProc("glTexParameteri"));
>+    glTexParameteriv = reinterpret_cast<PFNGLTEXPARAMETERIVPROC>(loadProc("glTexParameteriv"));
>+    glTexSubImage2D  = reinterpret_cast<PFNGLTEXSUBIMAGE2DPROC>(loadProc("glTexSubImage2D"));
>+    glUniform1f      = reinterpret_cast<PFNGLUNIFORM1FPROC>(loadProc("glUniform1f"));
>+    glUniform1fv     = reinterpret_cast<PFNGLUNIFORM1FVPROC>(loadProc("glUniform1fv"));
>+    glUniform1i      = reinterpret_cast<PFNGLUNIFORM1IPROC>(loadProc("glUniform1i"));
>+    glUniform1iv     = reinterpret_cast<PFNGLUNIFORM1IVPROC>(loadProc("glUniform1iv"));
>+    glUniform2f      = reinterpret_cast<PFNGLUNIFORM2FPROC>(loadProc("glUniform2f"));
>+    glUniform2fv     = reinterpret_cast<PFNGLUNIFORM2FVPROC>(loadProc("glUniform2fv"));
>+    glUniform2i      = reinterpret_cast<PFNGLUNIFORM2IPROC>(loadProc("glUniform2i"));
>+    glUniform2iv     = reinterpret_cast<PFNGLUNIFORM2IVPROC>(loadProc("glUniform2iv"));
>+    glUniform3f      = reinterpret_cast<PFNGLUNIFORM3FPROC>(loadProc("glUniform3f"));
>+    glUniform3fv     = reinterpret_cast<PFNGLUNIFORM3FVPROC>(loadProc("glUniform3fv"));
>+    glUniform3i      = reinterpret_cast<PFNGLUNIFORM3IPROC>(loadProc("glUniform3i"));
>+    glUniform3iv     = reinterpret_cast<PFNGLUNIFORM3IVPROC>(loadProc("glUniform3iv"));
>+    glUniform4f      = reinterpret_cast<PFNGLUNIFORM4FPROC>(loadProc("glUniform4f"));
>+    glUniform4fv     = reinterpret_cast<PFNGLUNIFORM4FVPROC>(loadProc("glUniform4fv"));
>+    glUniform4i      = reinterpret_cast<PFNGLUNIFORM4IPROC>(loadProc("glUniform4i"));
>+    glUniform4iv     = reinterpret_cast<PFNGLUNIFORM4IVPROC>(loadProc("glUniform4iv"));
>+    glUniformMatrix2fv =
>+        reinterpret_cast<PFNGLUNIFORMMATRIX2FVPROC>(loadProc("glUniformMatrix2fv"));
>+    glUniformMatrix3fv =
>+        reinterpret_cast<PFNGLUNIFORMMATRIX3FVPROC>(loadProc("glUniformMatrix3fv"));
>+    glUniformMatrix4fv =
>+        reinterpret_cast<PFNGLUNIFORMMATRIX4FVPROC>(loadProc("glUniformMatrix4fv"));
>+    glUseProgram      = reinterpret_cast<PFNGLUSEPROGRAMPROC>(loadProc("glUseProgram"));
>+    glValidateProgram = reinterpret_cast<PFNGLVALIDATEPROGRAMPROC>(loadProc("glValidateProgram"));
>+    glVertexAttrib1f  = reinterpret_cast<PFNGLVERTEXATTRIB1FPROC>(loadProc("glVertexAttrib1f"));
>+    glVertexAttrib1fv = reinterpret_cast<PFNGLVERTEXATTRIB1FVPROC>(loadProc("glVertexAttrib1fv"));
>+    glVertexAttrib2f  = reinterpret_cast<PFNGLVERTEXATTRIB2FPROC>(loadProc("glVertexAttrib2f"));
>+    glVertexAttrib2fv = reinterpret_cast<PFNGLVERTEXATTRIB2FVPROC>(loadProc("glVertexAttrib2fv"));
>+    glVertexAttrib3f  = reinterpret_cast<PFNGLVERTEXATTRIB3FPROC>(loadProc("glVertexAttrib3f"));
>+    glVertexAttrib3fv = reinterpret_cast<PFNGLVERTEXATTRIB3FVPROC>(loadProc("glVertexAttrib3fv"));
>+    glVertexAttrib4f  = reinterpret_cast<PFNGLVERTEXATTRIB4FPROC>(loadProc("glVertexAttrib4f"));
>+    glVertexAttrib4fv = reinterpret_cast<PFNGLVERTEXATTRIB4FVPROC>(loadProc("glVertexAttrib4fv"));
>+    glVertexAttribPointer =
>+        reinterpret_cast<PFNGLVERTEXATTRIBPOINTERPROC>(loadProc("glVertexAttribPointer"));
>+    glViewport   = reinterpret_cast<PFNGLVIEWPORTPROC>(loadProc("glViewport"));
>+    glReadBuffer = reinterpret_cast<PFNGLREADBUFFERPROC>(loadProc("glReadBuffer"));
>+    glDrawRangeElements =
>+        reinterpret_cast<PFNGLDRAWRANGEELEMENTSPROC>(loadProc("glDrawRangeElements"));
>+    glTexImage3D    = reinterpret_cast<PFNGLTEXIMAGE3DPROC>(loadProc("glTexImage3D"));
>+    glTexSubImage3D = reinterpret_cast<PFNGLTEXSUBIMAGE3DPROC>(loadProc("glTexSubImage3D"));
>+    glCopyTexSubImage3D =
>+        reinterpret_cast<PFNGLCOPYTEXSUBIMAGE3DPROC>(loadProc("glCopyTexSubImage3D"));
>+    glCompressedTexImage3D =
>+        reinterpret_cast<PFNGLCOMPRESSEDTEXIMAGE3DPROC>(loadProc("glCompressedTexImage3D"));
>+    glCompressedTexSubImage3D =
>+        reinterpret_cast<PFNGLCOMPRESSEDTEXSUBIMAGE3DPROC>(loadProc("glCompressedTexSubImage3D"));
>+    glGenQueries    = reinterpret_cast<PFNGLGENQUERIESPROC>(loadProc("glGenQueries"));
>+    glDeleteQueries = reinterpret_cast<PFNGLDELETEQUERIESPROC>(loadProc("glDeleteQueries"));
>+    glIsQuery       = reinterpret_cast<PFNGLISQUERYPROC>(loadProc("glIsQuery"));
>+    glBeginQuery    = reinterpret_cast<PFNGLBEGINQUERYPROC>(loadProc("glBeginQuery"));
>+    glEndQuery      = reinterpret_cast<PFNGLENDQUERYPROC>(loadProc("glEndQuery"));
>+    glGetQueryiv    = reinterpret_cast<PFNGLGETQUERYIVPROC>(loadProc("glGetQueryiv"));
>+    glGetQueryObjectuiv =
>+        reinterpret_cast<PFNGLGETQUERYOBJECTUIVPROC>(loadProc("glGetQueryObjectuiv"));
>+    glUnmapBuffer = reinterpret_cast<PFNGLUNMAPBUFFERPROC>(loadProc("glUnmapBuffer"));
>+    glGetBufferPointerv =
>+        reinterpret_cast<PFNGLGETBUFFERPOINTERVPROC>(loadProc("glGetBufferPointerv"));
>+    glDrawBuffers = reinterpret_cast<PFNGLDRAWBUFFERSPROC>(loadProc("glDrawBuffers"));
>+    glUniformMatrix2x3fv =
>+        reinterpret_cast<PFNGLUNIFORMMATRIX2X3FVPROC>(loadProc("glUniformMatrix2x3fv"));
>+    glUniformMatrix3x2fv =
>+        reinterpret_cast<PFNGLUNIFORMMATRIX3X2FVPROC>(loadProc("glUniformMatrix3x2fv"));
>+    glUniformMatrix2x4fv =
>+        reinterpret_cast<PFNGLUNIFORMMATRIX2X4FVPROC>(loadProc("glUniformMatrix2x4fv"));
>+    glUniformMatrix4x2fv =
>+        reinterpret_cast<PFNGLUNIFORMMATRIX4X2FVPROC>(loadProc("glUniformMatrix4x2fv"));
>+    glUniformMatrix3x4fv =
>+        reinterpret_cast<PFNGLUNIFORMMATRIX3X4FVPROC>(loadProc("glUniformMatrix3x4fv"));
>+    glUniformMatrix4x3fv =
>+        reinterpret_cast<PFNGLUNIFORMMATRIX4X3FVPROC>(loadProc("glUniformMatrix4x3fv"));
>+    glBlitFramebuffer = reinterpret_cast<PFNGLBLITFRAMEBUFFERPROC>(loadProc("glBlitFramebuffer"));
>+    glRenderbufferStorageMultisample = reinterpret_cast<PFNGLRENDERBUFFERSTORAGEMULTISAMPLEPROC>(
>+        loadProc("glRenderbufferStorageMultisample"));
>+    glFramebufferTextureLayer =
>+        reinterpret_cast<PFNGLFRAMEBUFFERTEXTURELAYERPROC>(loadProc("glFramebufferTextureLayer"));
>+    glMapBufferRange = reinterpret_cast<PFNGLMAPBUFFERRANGEPROC>(loadProc("glMapBufferRange"));
>+    glFlushMappedBufferRange =
>+        reinterpret_cast<PFNGLFLUSHMAPPEDBUFFERRANGEPROC>(loadProc("glFlushMappedBufferRange"));
>+    glBindVertexArray = reinterpret_cast<PFNGLBINDVERTEXARRAYPROC>(loadProc("glBindVertexArray"));
>+    glDeleteVertexArrays =
>+        reinterpret_cast<PFNGLDELETEVERTEXARRAYSPROC>(loadProc("glDeleteVertexArrays"));
>+    glGenVertexArrays = reinterpret_cast<PFNGLGENVERTEXARRAYSPROC>(loadProc("glGenVertexArrays"));
>+    glIsVertexArray   = reinterpret_cast<PFNGLISVERTEXARRAYPROC>(loadProc("glIsVertexArray"));
>+    glGetIntegeri_v   = reinterpret_cast<PFNGLGETINTEGERI_VPROC>(loadProc("glGetIntegeri_v"));
>+    glBeginTransformFeedback =
>+        reinterpret_cast<PFNGLBEGINTRANSFORMFEEDBACKPROC>(loadProc("glBeginTransformFeedback"));
>+    glEndTransformFeedback =
>+        reinterpret_cast<PFNGLENDTRANSFORMFEEDBACKPROC>(loadProc("glEndTransformFeedback"));
>+    glBindBufferRange = reinterpret_cast<PFNGLBINDBUFFERRANGEPROC>(loadProc("glBindBufferRange"));
>+    glBindBufferBase  = reinterpret_cast<PFNGLBINDBUFFERBASEPROC>(loadProc("glBindBufferBase"));
>+    glTransformFeedbackVaryings = reinterpret_cast<PFNGLTRANSFORMFEEDBACKVARYINGSPROC>(
>+        loadProc("glTransformFeedbackVaryings"));
>+    glGetTransformFeedbackVarying = reinterpret_cast<PFNGLGETTRANSFORMFEEDBACKVARYINGPROC>(
>+        loadProc("glGetTransformFeedbackVarying"));
>+    glVertexAttribIPointer =
>+        reinterpret_cast<PFNGLVERTEXATTRIBIPOINTERPROC>(loadProc("glVertexAttribIPointer"));
>+    glGetVertexAttribIiv =
>+        reinterpret_cast<PFNGLGETVERTEXATTRIBIIVPROC>(loadProc("glGetVertexAttribIiv"));
>+    glGetVertexAttribIuiv =
>+        reinterpret_cast<PFNGLGETVERTEXATTRIBIUIVPROC>(loadProc("glGetVertexAttribIuiv"));
>+    glVertexAttribI4i = reinterpret_cast<PFNGLVERTEXATTRIBI4IPROC>(loadProc("glVertexAttribI4i"));
>+    glVertexAttribI4ui =
>+        reinterpret_cast<PFNGLVERTEXATTRIBI4UIPROC>(loadProc("glVertexAttribI4ui"));
>+    glVertexAttribI4iv =
>+        reinterpret_cast<PFNGLVERTEXATTRIBI4IVPROC>(loadProc("glVertexAttribI4iv"));
>+    glVertexAttribI4uiv =
>+        reinterpret_cast<PFNGLVERTEXATTRIBI4UIVPROC>(loadProc("glVertexAttribI4uiv"));
>+    glGetUniformuiv = reinterpret_cast<PFNGLGETUNIFORMUIVPROC>(loadProc("glGetUniformuiv"));
>+    glGetFragDataLocation =
>+        reinterpret_cast<PFNGLGETFRAGDATALOCATIONPROC>(loadProc("glGetFragDataLocation"));
>+    glUniform1ui     = reinterpret_cast<PFNGLUNIFORM1UIPROC>(loadProc("glUniform1ui"));
>+    glUniform2ui     = reinterpret_cast<PFNGLUNIFORM2UIPROC>(loadProc("glUniform2ui"));
>+    glUniform3ui     = reinterpret_cast<PFNGLUNIFORM3UIPROC>(loadProc("glUniform3ui"));
>+    glUniform4ui     = reinterpret_cast<PFNGLUNIFORM4UIPROC>(loadProc("glUniform4ui"));
>+    glUniform1uiv    = reinterpret_cast<PFNGLUNIFORM1UIVPROC>(loadProc("glUniform1uiv"));
>+    glUniform2uiv    = reinterpret_cast<PFNGLUNIFORM2UIVPROC>(loadProc("glUniform2uiv"));
>+    glUniform3uiv    = reinterpret_cast<PFNGLUNIFORM3UIVPROC>(loadProc("glUniform3uiv"));
>+    glUniform4uiv    = reinterpret_cast<PFNGLUNIFORM4UIVPROC>(loadProc("glUniform4uiv"));
>+    glClearBufferiv  = reinterpret_cast<PFNGLCLEARBUFFERIVPROC>(loadProc("glClearBufferiv"));
>+    glClearBufferuiv = reinterpret_cast<PFNGLCLEARBUFFERUIVPROC>(loadProc("glClearBufferuiv"));
>+    glClearBufferfv  = reinterpret_cast<PFNGLCLEARBUFFERFVPROC>(loadProc("glClearBufferfv"));
>+    glClearBufferfi  = reinterpret_cast<PFNGLCLEARBUFFERFIPROC>(loadProc("glClearBufferfi"));
>+    glGetStringi     = reinterpret_cast<PFNGLGETSTRINGIPROC>(loadProc("glGetStringi"));
>+    glCopyBufferSubData =
>+        reinterpret_cast<PFNGLCOPYBUFFERSUBDATAPROC>(loadProc("glCopyBufferSubData"));
>+    glGetUniformIndices =
>+        reinterpret_cast<PFNGLGETUNIFORMINDICESPROC>(loadProc("glGetUniformIndices"));
>+    glGetActiveUniformsiv =
>+        reinterpret_cast<PFNGLGETACTIVEUNIFORMSIVPROC>(loadProc("glGetActiveUniformsiv"));
>+    glGetUniformBlockIndex =
>+        reinterpret_cast<PFNGLGETUNIFORMBLOCKINDEXPROC>(loadProc("glGetUniformBlockIndex"));
>+    glGetActiveUniformBlockiv =
>+        reinterpret_cast<PFNGLGETACTIVEUNIFORMBLOCKIVPROC>(loadProc("glGetActiveUniformBlockiv"));
>+    glGetActiveUniformBlockName = reinterpret_cast<PFNGLGETACTIVEUNIFORMBLOCKNAMEPROC>(
>+        loadProc("glGetActiveUniformBlockName"));
>+    glUniformBlockBinding =
>+        reinterpret_cast<PFNGLUNIFORMBLOCKBINDINGPROC>(loadProc("glUniformBlockBinding"));
>+    glDrawArraysInstanced =
>+        reinterpret_cast<PFNGLDRAWARRAYSINSTANCEDPROC>(loadProc("glDrawArraysInstanced"));
>+    glDrawElementsInstanced =
>+        reinterpret_cast<PFNGLDRAWELEMENTSINSTANCEDPROC>(loadProc("glDrawElementsInstanced"));
>+    glFenceSync       = reinterpret_cast<PFNGLFENCESYNCPROC>(loadProc("glFenceSync"));
>+    glIsSync          = reinterpret_cast<PFNGLISSYNCPROC>(loadProc("glIsSync"));
>+    glDeleteSync      = reinterpret_cast<PFNGLDELETESYNCPROC>(loadProc("glDeleteSync"));
>+    glClientWaitSync  = reinterpret_cast<PFNGLCLIENTWAITSYNCPROC>(loadProc("glClientWaitSync"));
>+    glWaitSync        = reinterpret_cast<PFNGLWAITSYNCPROC>(loadProc("glWaitSync"));
>+    glGetInteger64v   = reinterpret_cast<PFNGLGETINTEGER64VPROC>(loadProc("glGetInteger64v"));
>+    glGetSynciv       = reinterpret_cast<PFNGLGETSYNCIVPROC>(loadProc("glGetSynciv"));
>+    glGetInteger64i_v = reinterpret_cast<PFNGLGETINTEGER64I_VPROC>(loadProc("glGetInteger64i_v"));
>+    glGetBufferParameteri64v =
>+        reinterpret_cast<PFNGLGETBUFFERPARAMETERI64VPROC>(loadProc("glGetBufferParameteri64v"));
>+    glGenSamplers    = reinterpret_cast<PFNGLGENSAMPLERSPROC>(loadProc("glGenSamplers"));
>+    glDeleteSamplers = reinterpret_cast<PFNGLDELETESAMPLERSPROC>(loadProc("glDeleteSamplers"));
>+    glIsSampler      = reinterpret_cast<PFNGLISSAMPLERPROC>(loadProc("glIsSampler"));
>+    glBindSampler    = reinterpret_cast<PFNGLBINDSAMPLERPROC>(loadProc("glBindSampler"));
>+    glSamplerParameteri =
>+        reinterpret_cast<PFNGLSAMPLERPARAMETERIPROC>(loadProc("glSamplerParameteri"));
>+    glSamplerParameteriv =
>+        reinterpret_cast<PFNGLSAMPLERPARAMETERIVPROC>(loadProc("glSamplerParameteriv"));
>+    glSamplerParameterf =
>+        reinterpret_cast<PFNGLSAMPLERPARAMETERFPROC>(loadProc("glSamplerParameterf"));
>+    glSamplerParameterfv =
>+        reinterpret_cast<PFNGLSAMPLERPARAMETERFVPROC>(loadProc("glSamplerParameterfv"));
>+    glGetSamplerParameteriv =
>+        reinterpret_cast<PFNGLGETSAMPLERPARAMETERIVPROC>(loadProc("glGetSamplerParameteriv"));
>+    glGetSamplerParameterfv =
>+        reinterpret_cast<PFNGLGETSAMPLERPARAMETERFVPROC>(loadProc("glGetSamplerParameterfv"));
>+    glVertexAttribDivisor =
>+        reinterpret_cast<PFNGLVERTEXATTRIBDIVISORPROC>(loadProc("glVertexAttribDivisor"));
>+    glBindTransformFeedback =
>+        reinterpret_cast<PFNGLBINDTRANSFORMFEEDBACKPROC>(loadProc("glBindTransformFeedback"));
>+    glDeleteTransformFeedbacks =
>+        reinterpret_cast<PFNGLDELETETRANSFORMFEEDBACKSPROC>(loadProc("glDeleteTransformFeedbacks"));
>+    glGenTransformFeedbacks =
>+        reinterpret_cast<PFNGLGENTRANSFORMFEEDBACKSPROC>(loadProc("glGenTransformFeedbacks"));
>+    glIsTransformFeedback =
>+        reinterpret_cast<PFNGLISTRANSFORMFEEDBACKPROC>(loadProc("glIsTransformFeedback"));
>+    glPauseTransformFeedback =
>+        reinterpret_cast<PFNGLPAUSETRANSFORMFEEDBACKPROC>(loadProc("glPauseTransformFeedback"));
>+    glResumeTransformFeedback =
>+        reinterpret_cast<PFNGLRESUMETRANSFORMFEEDBACKPROC>(loadProc("glResumeTransformFeedback"));
>+    glGetProgramBinary =
>+        reinterpret_cast<PFNGLGETPROGRAMBINARYPROC>(loadProc("glGetProgramBinary"));
>+    glProgramBinary = reinterpret_cast<PFNGLPROGRAMBINARYPROC>(loadProc("glProgramBinary"));
>+    glProgramParameteri =
>+        reinterpret_cast<PFNGLPROGRAMPARAMETERIPROC>(loadProc("glProgramParameteri"));
>+    glInvalidateFramebuffer =
>+        reinterpret_cast<PFNGLINVALIDATEFRAMEBUFFERPROC>(loadProc("glInvalidateFramebuffer"));
>+    glInvalidateSubFramebuffer =
>+        reinterpret_cast<PFNGLINVALIDATESUBFRAMEBUFFERPROC>(loadProc("glInvalidateSubFramebuffer"));
>+    glTexStorage2D = reinterpret_cast<PFNGLTEXSTORAGE2DPROC>(loadProc("glTexStorage2D"));
>+    glTexStorage3D = reinterpret_cast<PFNGLTEXSTORAGE3DPROC>(loadProc("glTexStorage3D"));
>+    glGetInternalformativ =
>+        reinterpret_cast<PFNGLGETINTERNALFORMATIVPROC>(loadProc("glGetInternalformativ"));
>+    glDispatchCompute = reinterpret_cast<PFNGLDISPATCHCOMPUTEPROC>(loadProc("glDispatchCompute"));
>+    glDispatchComputeIndirect =
>+        reinterpret_cast<PFNGLDISPATCHCOMPUTEINDIRECTPROC>(loadProc("glDispatchComputeIndirect"));
>+    glDrawArraysIndirect =
>+        reinterpret_cast<PFNGLDRAWARRAYSINDIRECTPROC>(loadProc("glDrawArraysIndirect"));
>+    glDrawElementsIndirect =
>+        reinterpret_cast<PFNGLDRAWELEMENTSINDIRECTPROC>(loadProc("glDrawElementsIndirect"));
>+    glFramebufferParameteri =
>+        reinterpret_cast<PFNGLFRAMEBUFFERPARAMETERIPROC>(loadProc("glFramebufferParameteri"));
>+    glGetFramebufferParameteriv = reinterpret_cast<PFNGLGETFRAMEBUFFERPARAMETERIVPROC>(
>+        loadProc("glGetFramebufferParameteriv"));
>+    glGetProgramInterfaceiv =
>+        reinterpret_cast<PFNGLGETPROGRAMINTERFACEIVPROC>(loadProc("glGetProgramInterfaceiv"));
>+    glGetProgramResourceIndex =
>+        reinterpret_cast<PFNGLGETPROGRAMRESOURCEINDEXPROC>(loadProc("glGetProgramResourceIndex"));
>+    glGetProgramResourceName =
>+        reinterpret_cast<PFNGLGETPROGRAMRESOURCENAMEPROC>(loadProc("glGetProgramResourceName"));
>+    glGetProgramResourceiv =
>+        reinterpret_cast<PFNGLGETPROGRAMRESOURCEIVPROC>(loadProc("glGetProgramResourceiv"));
>+    glGetProgramResourceLocation = reinterpret_cast<PFNGLGETPROGRAMRESOURCELOCATIONPROC>(
>+        loadProc("glGetProgramResourceLocation"));
>+    glUseProgramStages =
>+        reinterpret_cast<PFNGLUSEPROGRAMSTAGESPROC>(loadProc("glUseProgramStages"));
>+    glActiveShaderProgram =
>+        reinterpret_cast<PFNGLACTIVESHADERPROGRAMPROC>(loadProc("glActiveShaderProgram"));
>+    glCreateShaderProgramv =
>+        reinterpret_cast<PFNGLCREATESHADERPROGRAMVPROC>(loadProc("glCreateShaderProgramv"));
>+    glBindProgramPipeline =
>+        reinterpret_cast<PFNGLBINDPROGRAMPIPELINEPROC>(loadProc("glBindProgramPipeline"));
>+    glDeleteProgramPipelines =
>+        reinterpret_cast<PFNGLDELETEPROGRAMPIPELINESPROC>(loadProc("glDeleteProgramPipelines"));
>+    glGenProgramPipelines =
>+        reinterpret_cast<PFNGLGENPROGRAMPIPELINESPROC>(loadProc("glGenProgramPipelines"));
>+    glIsProgramPipeline =
>+        reinterpret_cast<PFNGLISPROGRAMPIPELINEPROC>(loadProc("glIsProgramPipeline"));
>+    glGetProgramPipelineiv =
>+        reinterpret_cast<PFNGLGETPROGRAMPIPELINEIVPROC>(loadProc("glGetProgramPipelineiv"));
>+    glProgramUniform1i =
>+        reinterpret_cast<PFNGLPROGRAMUNIFORM1IPROC>(loadProc("glProgramUniform1i"));
>+    glProgramUniform2i =
>+        reinterpret_cast<PFNGLPROGRAMUNIFORM2IPROC>(loadProc("glProgramUniform2i"));
>+    glProgramUniform3i =
>+        reinterpret_cast<PFNGLPROGRAMUNIFORM3IPROC>(loadProc("glProgramUniform3i"));
>+    glProgramUniform4i =
>+        reinterpret_cast<PFNGLPROGRAMUNIFORM4IPROC>(loadProc("glProgramUniform4i"));
>+    glProgramUniform1ui =
>+        reinterpret_cast<PFNGLPROGRAMUNIFORM1UIPROC>(loadProc("glProgramUniform1ui"));
>+    glProgramUniform2ui =
>+        reinterpret_cast<PFNGLPROGRAMUNIFORM2UIPROC>(loadProc("glProgramUniform2ui"));
>+    glProgramUniform3ui =
>+        reinterpret_cast<PFNGLPROGRAMUNIFORM3UIPROC>(loadProc("glProgramUniform3ui"));
>+    glProgramUniform4ui =
>+        reinterpret_cast<PFNGLPROGRAMUNIFORM4UIPROC>(loadProc("glProgramUniform4ui"));
>+    glProgramUniform1f =
>+        reinterpret_cast<PFNGLPROGRAMUNIFORM1FPROC>(loadProc("glProgramUniform1f"));
>+    glProgramUniform2f =
>+        reinterpret_cast<PFNGLPROGRAMUNIFORM2FPROC>(loadProc("glProgramUniform2f"));
>+    glProgramUniform3f =
>+        reinterpret_cast<PFNGLPROGRAMUNIFORM3FPROC>(loadProc("glProgramUniform3f"));
>+    glProgramUniform4f =
>+        reinterpret_cast<PFNGLPROGRAMUNIFORM4FPROC>(loadProc("glProgramUniform4f"));
>+    glProgramUniform1iv =
>+        reinterpret_cast<PFNGLPROGRAMUNIFORM1IVPROC>(loadProc("glProgramUniform1iv"));
>+    glProgramUniform2iv =
>+        reinterpret_cast<PFNGLPROGRAMUNIFORM2IVPROC>(loadProc("glProgramUniform2iv"));
>+    glProgramUniform3iv =
>+        reinterpret_cast<PFNGLPROGRAMUNIFORM3IVPROC>(loadProc("glProgramUniform3iv"));
>+    glProgramUniform4iv =
>+        reinterpret_cast<PFNGLPROGRAMUNIFORM4IVPROC>(loadProc("glProgramUniform4iv"));
>+    glProgramUniform1uiv =
>+        reinterpret_cast<PFNGLPROGRAMUNIFORM1UIVPROC>(loadProc("glProgramUniform1uiv"));
>+    glProgramUniform2uiv =
>+        reinterpret_cast<PFNGLPROGRAMUNIFORM2UIVPROC>(loadProc("glProgramUniform2uiv"));
>+    glProgramUniform3uiv =
>+        reinterpret_cast<PFNGLPROGRAMUNIFORM3UIVPROC>(loadProc("glProgramUniform3uiv"));
>+    glProgramUniform4uiv =
>+        reinterpret_cast<PFNGLPROGRAMUNIFORM4UIVPROC>(loadProc("glProgramUniform4uiv"));
>+    glProgramUniform1fv =
>+        reinterpret_cast<PFNGLPROGRAMUNIFORM1FVPROC>(loadProc("glProgramUniform1fv"));
>+    glProgramUniform2fv =
>+        reinterpret_cast<PFNGLPROGRAMUNIFORM2FVPROC>(loadProc("glProgramUniform2fv"));
>+    glProgramUniform3fv =
>+        reinterpret_cast<PFNGLPROGRAMUNIFORM3FVPROC>(loadProc("glProgramUniform3fv"));
>+    glProgramUniform4fv =
>+        reinterpret_cast<PFNGLPROGRAMUNIFORM4FVPROC>(loadProc("glProgramUniform4fv"));
>+    glProgramUniformMatrix2fv =
>+        reinterpret_cast<PFNGLPROGRAMUNIFORMMATRIX2FVPROC>(loadProc("glProgramUniformMatrix2fv"));
>+    glProgramUniformMatrix3fv =
>+        reinterpret_cast<PFNGLPROGRAMUNIFORMMATRIX3FVPROC>(loadProc("glProgramUniformMatrix3fv"));
>+    glProgramUniformMatrix4fv =
>+        reinterpret_cast<PFNGLPROGRAMUNIFORMMATRIX4FVPROC>(loadProc("glProgramUniformMatrix4fv"));
>+    glProgramUniformMatrix2x3fv = reinterpret_cast<PFNGLPROGRAMUNIFORMMATRIX2X3FVPROC>(
>+        loadProc("glProgramUniformMatrix2x3fv"));
>+    glProgramUniformMatrix3x2fv = reinterpret_cast<PFNGLPROGRAMUNIFORMMATRIX3X2FVPROC>(
>+        loadProc("glProgramUniformMatrix3x2fv"));
>+    glProgramUniformMatrix2x4fv = reinterpret_cast<PFNGLPROGRAMUNIFORMMATRIX2X4FVPROC>(
>+        loadProc("glProgramUniformMatrix2x4fv"));
>+    glProgramUniformMatrix4x2fv = reinterpret_cast<PFNGLPROGRAMUNIFORMMATRIX4X2FVPROC>(
>+        loadProc("glProgramUniformMatrix4x2fv"));
>+    glProgramUniformMatrix3x4fv = reinterpret_cast<PFNGLPROGRAMUNIFORMMATRIX3X4FVPROC>(
>+        loadProc("glProgramUniformMatrix3x4fv"));
>+    glProgramUniformMatrix4x3fv = reinterpret_cast<PFNGLPROGRAMUNIFORMMATRIX4X3FVPROC>(
>+        loadProc("glProgramUniformMatrix4x3fv"));
>+    glValidateProgramPipeline =
>+        reinterpret_cast<PFNGLVALIDATEPROGRAMPIPELINEPROC>(loadProc("glValidateProgramPipeline"));
>+    glGetProgramPipelineInfoLog = reinterpret_cast<PFNGLGETPROGRAMPIPELINEINFOLOGPROC>(
>+        loadProc("glGetProgramPipelineInfoLog"));
>+    glBindImageTexture =
>+        reinterpret_cast<PFNGLBINDIMAGETEXTUREPROC>(loadProc("glBindImageTexture"));
>+    glGetBooleani_v = reinterpret_cast<PFNGLGETBOOLEANI_VPROC>(loadProc("glGetBooleani_v"));
>+    glMemoryBarrier = reinterpret_cast<PFNGLMEMORYBARRIERPROC>(loadProc("glMemoryBarrier"));
>+    glMemoryBarrierByRegion =
>+        reinterpret_cast<PFNGLMEMORYBARRIERBYREGIONPROC>(loadProc("glMemoryBarrierByRegion"));
>+    glTexStorage2DMultisample =
>+        reinterpret_cast<PFNGLTEXSTORAGE2DMULTISAMPLEPROC>(loadProc("glTexStorage2DMultisample"));
>+    glGetMultisamplefv =
>+        reinterpret_cast<PFNGLGETMULTISAMPLEFVPROC>(loadProc("glGetMultisamplefv"));
>+    glSampleMaski = reinterpret_cast<PFNGLSAMPLEMASKIPROC>(loadProc("glSampleMaski"));
>+    glGetTexLevelParameteriv =
>+        reinterpret_cast<PFNGLGETTEXLEVELPARAMETERIVPROC>(loadProc("glGetTexLevelParameteriv"));
>+    glGetTexLevelParameterfv =
>+        reinterpret_cast<PFNGLGETTEXLEVELPARAMETERFVPROC>(loadProc("glGetTexLevelParameterfv"));
>+    glBindVertexBuffer =
>+        reinterpret_cast<PFNGLBINDVERTEXBUFFERPROC>(loadProc("glBindVertexBuffer"));
>+    glVertexAttribFormat =
>+        reinterpret_cast<PFNGLVERTEXATTRIBFORMATPROC>(loadProc("glVertexAttribFormat"));
>+    glVertexAttribIFormat =
>+        reinterpret_cast<PFNGLVERTEXATTRIBIFORMATPROC>(loadProc("glVertexAttribIFormat"));
>+    glVertexAttribBinding =
>+        reinterpret_cast<PFNGLVERTEXATTRIBBINDINGPROC>(loadProc("glVertexAttribBinding"));
>+    glVertexBindingDivisor =
>+        reinterpret_cast<PFNGLVERTEXBINDINGDIVISORPROC>(loadProc("glVertexBindingDivisor"));
>+    glCopySubTexture3DANGLE =
>+        reinterpret_cast<PFNGLCOPYSUBTEXTURE3DANGLEPROC>(loadProc("glCopySubTexture3DANGLE"));
>+    glCopyTexture3DANGLE =
>+        reinterpret_cast<PFNGLCOPYTEXTURE3DANGLEPROC>(loadProc("glCopyTexture3DANGLE"));
>+    glBlitFramebufferANGLE =
>+        reinterpret_cast<PFNGLBLITFRAMEBUFFERANGLEPROC>(loadProc("glBlitFramebufferANGLE"));
>+    glRenderbufferStorageMultisampleANGLE =
>+        reinterpret_cast<PFNGLRENDERBUFFERSTORAGEMULTISAMPLEANGLEPROC>(
>+            loadProc("glRenderbufferStorageMultisampleANGLE"));
>+    glDrawArraysInstancedANGLE =
>+        reinterpret_cast<PFNGLDRAWARRAYSINSTANCEDANGLEPROC>(loadProc("glDrawArraysInstancedANGLE"));
>+    glDrawElementsInstancedANGLE = reinterpret_cast<PFNGLDRAWELEMENTSINSTANCEDANGLEPROC>(
>+        loadProc("glDrawElementsInstancedANGLE"));
>+    glVertexAttribDivisorANGLE =
>+        reinterpret_cast<PFNGLVERTEXATTRIBDIVISORANGLEPROC>(loadProc("glVertexAttribDivisorANGLE"));
>+    glMultiDrawArraysANGLE =
>+        reinterpret_cast<PFNGLMULTIDRAWARRAYSANGLEPROC>(loadProc("glMultiDrawArraysANGLE"));
>+    glMultiDrawArraysInstancedANGLE = reinterpret_cast<PFNGLMULTIDRAWARRAYSINSTANCEDANGLEPROC>(
>+        loadProc("glMultiDrawArraysInstancedANGLE"));
>+    glMultiDrawElementsANGLE =
>+        reinterpret_cast<PFNGLMULTIDRAWELEMENTSANGLEPROC>(loadProc("glMultiDrawElementsANGLE"));
>+    glMultiDrawElementsInstancedANGLE = reinterpret_cast<PFNGLMULTIDRAWELEMENTSINSTANCEDANGLEPROC>(
>+        loadProc("glMultiDrawElementsInstancedANGLE"));
>+    glProvokingVertexANGLE =
>+        reinterpret_cast<PFNGLPROVOKINGVERTEXANGLEPROC>(loadProc("glProvokingVertexANGLE"));
>+    glRequestExtensionANGLE =
>+        reinterpret_cast<PFNGLREQUESTEXTENSIONANGLEPROC>(loadProc("glRequestExtensionANGLE"));
>+    glCompressedTexImage2DRobustANGLE = reinterpret_cast<PFNGLCOMPRESSEDTEXIMAGE2DROBUSTANGLEPROC>(
>+        loadProc("glCompressedTexImage2DRobustANGLE"));
>+    glCompressedTexImage3DRobustANGLE = reinterpret_cast<PFNGLCOMPRESSEDTEXIMAGE3DROBUSTANGLEPROC>(
>+        loadProc("glCompressedTexImage3DRobustANGLE"));
>+    glCompressedTexSubImage2DRobustANGLE =
>+        reinterpret_cast<PFNGLCOMPRESSEDTEXSUBIMAGE2DROBUSTANGLEPROC>(
>+            loadProc("glCompressedTexSubImage2DRobustANGLE"));
>+    glCompressedTexSubImage3DRobustANGLE =
>+        reinterpret_cast<PFNGLCOMPRESSEDTEXSUBIMAGE3DROBUSTANGLEPROC>(
>+            loadProc("glCompressedTexSubImage3DRobustANGLE"));
>+    glGetActiveUniformBlockivRobustANGLE =
>+        reinterpret_cast<PFNGLGETACTIVEUNIFORMBLOCKIVROBUSTANGLEPROC>(
>+            loadProc("glGetActiveUniformBlockivRobustANGLE"));
>+    glGetBooleani_vRobustANGLE =
>+        reinterpret_cast<PFNGLGETBOOLEANI_VROBUSTANGLEPROC>(loadProc("glGetBooleani_vRobustANGLE"));
>+    glGetBooleanvRobustANGLE =
>+        reinterpret_cast<PFNGLGETBOOLEANVROBUSTANGLEPROC>(loadProc("glGetBooleanvRobustANGLE"));
>+    glGetBufferParameteri64vRobustANGLE =
>+        reinterpret_cast<PFNGLGETBUFFERPARAMETERI64VROBUSTANGLEPROC>(
>+            loadProc("glGetBufferParameteri64vRobustANGLE"));
>+    glGetBufferParameterivRobustANGLE = reinterpret_cast<PFNGLGETBUFFERPARAMETERIVROBUSTANGLEPROC>(
>+        loadProc("glGetBufferParameterivRobustANGLE"));
>+    glGetBufferPointervRobustANGLE = reinterpret_cast<PFNGLGETBUFFERPOINTERVROBUSTANGLEPROC>(
>+        loadProc("glGetBufferPointervRobustANGLE"));
>+    glGetFloatvRobustANGLE =
>+        reinterpret_cast<PFNGLGETFLOATVROBUSTANGLEPROC>(loadProc("glGetFloatvRobustANGLE"));
>+    glGetFramebufferAttachmentParameterivRobustANGLE =
>+        reinterpret_cast<PFNGLGETFRAMEBUFFERATTACHMENTPARAMETERIVROBUSTANGLEPROC>(
>+            loadProc("glGetFramebufferAttachmentParameterivRobustANGLE"));
>+    glGetFramebufferParameterivRobustANGLE =
>+        reinterpret_cast<PFNGLGETFRAMEBUFFERPARAMETERIVROBUSTANGLEPROC>(
>+            loadProc("glGetFramebufferParameterivRobustANGLE"));
>+    glGetInteger64i_vRobustANGLE = reinterpret_cast<PFNGLGETINTEGER64I_VROBUSTANGLEPROC>(
>+        loadProc("glGetInteger64i_vRobustANGLE"));
>+    glGetInteger64vRobustANGLE =
>+        reinterpret_cast<PFNGLGETINTEGER64VROBUSTANGLEPROC>(loadProc("glGetInteger64vRobustANGLE"));
>+    glGetIntegeri_vRobustANGLE =
>+        reinterpret_cast<PFNGLGETINTEGERI_VROBUSTANGLEPROC>(loadProc("glGetIntegeri_vRobustANGLE"));
>+    glGetIntegervRobustANGLE =
>+        reinterpret_cast<PFNGLGETINTEGERVROBUSTANGLEPROC>(loadProc("glGetIntegervRobustANGLE"));
>+    glGetInternalformativRobustANGLE = reinterpret_cast<PFNGLGETINTERNALFORMATIVROBUSTANGLEPROC>(
>+        loadProc("glGetInternalformativRobustANGLE"));
>+    glGetMultisamplefvRobustANGLE = reinterpret_cast<PFNGLGETMULTISAMPLEFVROBUSTANGLEPROC>(
>+        loadProc("glGetMultisamplefvRobustANGLE"));
>+    glGetPointervRobustANGLERobustANGLE =
>+        reinterpret_cast<PFNGLGETPOINTERVROBUSTANGLEROBUSTANGLEPROC>(
>+            loadProc("glGetPointervRobustANGLERobustANGLE"));
>+    glGetProgramInterfaceivRobustANGLE =
>+        reinterpret_cast<PFNGLGETPROGRAMINTERFACEIVROBUSTANGLEPROC>(
>+            loadProc("glGetProgramInterfaceivRobustANGLE"));
>+    glGetProgramivRobustANGLE =
>+        reinterpret_cast<PFNGLGETPROGRAMIVROBUSTANGLEPROC>(loadProc("glGetProgramivRobustANGLE"));
>+    glGetQueryObjecti64vRobustANGLE = reinterpret_cast<PFNGLGETQUERYOBJECTI64VROBUSTANGLEPROC>(
>+        loadProc("glGetQueryObjecti64vRobustANGLE"));
>+    glGetQueryObjectivRobustANGLE = reinterpret_cast<PFNGLGETQUERYOBJECTIVROBUSTANGLEPROC>(
>+        loadProc("glGetQueryObjectivRobustANGLE"));
>+    glGetQueryObjectui64vRobustANGLE = reinterpret_cast<PFNGLGETQUERYOBJECTUI64VROBUSTANGLEPROC>(
>+        loadProc("glGetQueryObjectui64vRobustANGLE"));
>+    glGetQueryObjectuivRobustANGLE = reinterpret_cast<PFNGLGETQUERYOBJECTUIVROBUSTANGLEPROC>(
>+        loadProc("glGetQueryObjectuivRobustANGLE"));
>+    glGetQueryivRobustANGLE =
>+        reinterpret_cast<PFNGLGETQUERYIVROBUSTANGLEPROC>(loadProc("glGetQueryivRobustANGLE"));
>+    glGetRenderbufferParameterivRobustANGLE =
>+        reinterpret_cast<PFNGLGETRENDERBUFFERPARAMETERIVROBUSTANGLEPROC>(
>+            loadProc("glGetRenderbufferParameterivRobustANGLE"));
>+    glGetSamplerParameterIivRobustANGLE =
>+        reinterpret_cast<PFNGLGETSAMPLERPARAMETERIIVROBUSTANGLEPROC>(
>+            loadProc("glGetSamplerParameterIivRobustANGLE"));
>+    glGetSamplerParameterIuivRobustANGLE =
>+        reinterpret_cast<PFNGLGETSAMPLERPARAMETERIUIVROBUSTANGLEPROC>(
>+            loadProc("glGetSamplerParameterIuivRobustANGLE"));
>+    glGetSamplerParameterfvRobustANGLE =
>+        reinterpret_cast<PFNGLGETSAMPLERPARAMETERFVROBUSTANGLEPROC>(
>+            loadProc("glGetSamplerParameterfvRobustANGLE"));
>+    glGetSamplerParameterivRobustANGLE =
>+        reinterpret_cast<PFNGLGETSAMPLERPARAMETERIVROBUSTANGLEPROC>(
>+            loadProc("glGetSamplerParameterivRobustANGLE"));
>+    glGetShaderivRobustANGLE =
>+        reinterpret_cast<PFNGLGETSHADERIVROBUSTANGLEPROC>(loadProc("glGetShaderivRobustANGLE"));
>+    glGetTexLevelParameterfvRobustANGLE =
>+        reinterpret_cast<PFNGLGETTEXLEVELPARAMETERFVROBUSTANGLEPROC>(
>+            loadProc("glGetTexLevelParameterfvRobustANGLE"));
>+    glGetTexLevelParameterivRobustANGLE =
>+        reinterpret_cast<PFNGLGETTEXLEVELPARAMETERIVROBUSTANGLEPROC>(
>+            loadProc("glGetTexLevelParameterivRobustANGLE"));
>+    glGetTexParameterIivRobustANGLE = reinterpret_cast<PFNGLGETTEXPARAMETERIIVROBUSTANGLEPROC>(
>+        loadProc("glGetTexParameterIivRobustANGLE"));
>+    glGetTexParameterIuivRobustANGLE = reinterpret_cast<PFNGLGETTEXPARAMETERIUIVROBUSTANGLEPROC>(
>+        loadProc("glGetTexParameterIuivRobustANGLE"));
>+    glGetTexParameterfvRobustANGLE = reinterpret_cast<PFNGLGETTEXPARAMETERFVROBUSTANGLEPROC>(
>+        loadProc("glGetTexParameterfvRobustANGLE"));
>+    glGetTexParameterivRobustANGLE = reinterpret_cast<PFNGLGETTEXPARAMETERIVROBUSTANGLEPROC>(
>+        loadProc("glGetTexParameterivRobustANGLE"));
>+    glGetUniformfvRobustANGLE =
>+        reinterpret_cast<PFNGLGETUNIFORMFVROBUSTANGLEPROC>(loadProc("glGetUniformfvRobustANGLE"));
>+    glGetUniformivRobustANGLE =
>+        reinterpret_cast<PFNGLGETUNIFORMIVROBUSTANGLEPROC>(loadProc("glGetUniformivRobustANGLE"));
>+    glGetUniformuivRobustANGLE =
>+        reinterpret_cast<PFNGLGETUNIFORMUIVROBUSTANGLEPROC>(loadProc("glGetUniformuivRobustANGLE"));
>+    glGetVertexAttribIivRobustANGLE = reinterpret_cast<PFNGLGETVERTEXATTRIBIIVROBUSTANGLEPROC>(
>+        loadProc("glGetVertexAttribIivRobustANGLE"));
>+    glGetVertexAttribIuivRobustANGLE = reinterpret_cast<PFNGLGETVERTEXATTRIBIUIVROBUSTANGLEPROC>(
>+        loadProc("glGetVertexAttribIuivRobustANGLE"));
>+    glGetVertexAttribPointervRobustANGLE =
>+        reinterpret_cast<PFNGLGETVERTEXATTRIBPOINTERVROBUSTANGLEPROC>(
>+            loadProc("glGetVertexAttribPointervRobustANGLE"));
>+    glGetVertexAttribfvRobustANGLE = reinterpret_cast<PFNGLGETVERTEXATTRIBFVROBUSTANGLEPROC>(
>+        loadProc("glGetVertexAttribfvRobustANGLE"));
>+    glGetVertexAttribivRobustANGLE = reinterpret_cast<PFNGLGETVERTEXATTRIBIVROBUSTANGLEPROC>(
>+        loadProc("glGetVertexAttribivRobustANGLE"));
>+    glGetnUniformfvRobustANGLE =
>+        reinterpret_cast<PFNGLGETNUNIFORMFVROBUSTANGLEPROC>(loadProc("glGetnUniformfvRobustANGLE"));
>+    glGetnUniformivRobustANGLE =
>+        reinterpret_cast<PFNGLGETNUNIFORMIVROBUSTANGLEPROC>(loadProc("glGetnUniformivRobustANGLE"));
>+    glGetnUniformuivRobustANGLE = reinterpret_cast<PFNGLGETNUNIFORMUIVROBUSTANGLEPROC>(
>+        loadProc("glGetnUniformuivRobustANGLE"));
>+    glReadPixelsRobustANGLE =
>+        reinterpret_cast<PFNGLREADPIXELSROBUSTANGLEPROC>(loadProc("glReadPixelsRobustANGLE"));
>+    glReadnPixelsRobustANGLE =
>+        reinterpret_cast<PFNGLREADNPIXELSROBUSTANGLEPROC>(loadProc("glReadnPixelsRobustANGLE"));
>+    glSamplerParameterIivRobustANGLE = reinterpret_cast<PFNGLSAMPLERPARAMETERIIVROBUSTANGLEPROC>(
>+        loadProc("glSamplerParameterIivRobustANGLE"));
>+    glSamplerParameterIuivRobustANGLE = reinterpret_cast<PFNGLSAMPLERPARAMETERIUIVROBUSTANGLEPROC>(
>+        loadProc("glSamplerParameterIuivRobustANGLE"));
>+    glSamplerParameterfvRobustANGLE = reinterpret_cast<PFNGLSAMPLERPARAMETERFVROBUSTANGLEPROC>(
>+        loadProc("glSamplerParameterfvRobustANGLE"));
>+    glSamplerParameterivRobustANGLE = reinterpret_cast<PFNGLSAMPLERPARAMETERIVROBUSTANGLEPROC>(
>+        loadProc("glSamplerParameterivRobustANGLE"));
>+    glTexImage2DRobustANGLE =
>+        reinterpret_cast<PFNGLTEXIMAGE2DROBUSTANGLEPROC>(loadProc("glTexImage2DRobustANGLE"));
>+    glTexImage3DRobustANGLE =
>+        reinterpret_cast<PFNGLTEXIMAGE3DROBUSTANGLEPROC>(loadProc("glTexImage3DRobustANGLE"));
>+    glTexParameterIivRobustANGLE = reinterpret_cast<PFNGLTEXPARAMETERIIVROBUSTANGLEPROC>(
>+        loadProc("glTexParameterIivRobustANGLE"));
>+    glTexParameterIuivRobustANGLE = reinterpret_cast<PFNGLTEXPARAMETERIUIVROBUSTANGLEPROC>(
>+        loadProc("glTexParameterIuivRobustANGLE"));
>+    glTexParameterfvRobustANGLE = reinterpret_cast<PFNGLTEXPARAMETERFVROBUSTANGLEPROC>(
>+        loadProc("glTexParameterfvRobustANGLE"));
>+    glTexParameterivRobustANGLE = reinterpret_cast<PFNGLTEXPARAMETERIVROBUSTANGLEPROC>(
>+        loadProc("glTexParameterivRobustANGLE"));
>+    glTexSubImage2DRobustANGLE =
>+        reinterpret_cast<PFNGLTEXSUBIMAGE2DROBUSTANGLEPROC>(loadProc("glTexSubImage2DRobustANGLE"));
>+    glTexSubImage3DRobustANGLE =
>+        reinterpret_cast<PFNGLTEXSUBIMAGE3DROBUSTANGLEPROC>(loadProc("glTexSubImage3DRobustANGLE"));
>+    glGetMultisamplefvANGLE =
>+        reinterpret_cast<PFNGLGETMULTISAMPLEFVANGLEPROC>(loadProc("glGetMultisamplefvANGLE"));
>+    glGetTexLevelParameterfvANGLE = reinterpret_cast<PFNGLGETTEXLEVELPARAMETERFVANGLEPROC>(
>+        loadProc("glGetTexLevelParameterfvANGLE"));
>+    glGetTexLevelParameterivANGLE = reinterpret_cast<PFNGLGETTEXLEVELPARAMETERIVANGLEPROC>(
>+        loadProc("glGetTexLevelParameterivANGLE"));
>+    glSampleMaskiANGLE =
>+        reinterpret_cast<PFNGLSAMPLEMASKIANGLEPROC>(loadProc("glSampleMaskiANGLE"));
>+    glTexStorage2DMultisampleANGLE = reinterpret_cast<PFNGLTEXSTORAGE2DMULTISAMPLEANGLEPROC>(
>+        loadProc("glTexStorage2DMultisampleANGLE"));
>+    glGetTranslatedShaderSourceANGLE = reinterpret_cast<PFNGLGETTRANSLATEDSHADERSOURCEANGLEPROC>(
>+        loadProc("glGetTranslatedShaderSourceANGLE"));
>+    glBindUniformLocationCHROMIUM = reinterpret_cast<PFNGLBINDUNIFORMLOCATIONCHROMIUMPROC>(
>+        loadProc("glBindUniformLocationCHROMIUM"));
>+    glCompressedCopyTextureCHROMIUM = reinterpret_cast<PFNGLCOMPRESSEDCOPYTEXTURECHROMIUMPROC>(
>+        loadProc("glCompressedCopyTextureCHROMIUM"));
>+    glCopySubTextureCHROMIUM =
>+        reinterpret_cast<PFNGLCOPYSUBTEXTURECHROMIUMPROC>(loadProc("glCopySubTextureCHROMIUM"));
>+    glCopyTextureCHROMIUM =
>+        reinterpret_cast<PFNGLCOPYTEXTURECHROMIUMPROC>(loadProc("glCopyTextureCHROMIUM"));
>+    glCoverageModulationCHROMIUM = reinterpret_cast<PFNGLCOVERAGEMODULATIONCHROMIUMPROC>(
>+        loadProc("glCoverageModulationCHROMIUM"));
>+    glMatrixLoadIdentityCHROMIUM = reinterpret_cast<PFNGLMATRIXLOADIDENTITYCHROMIUMPROC>(
>+        loadProc("glMatrixLoadIdentityCHROMIUM"));
>+    glMatrixLoadfCHROMIUM =
>+        reinterpret_cast<PFNGLMATRIXLOADFCHROMIUMPROC>(loadProc("glMatrixLoadfCHROMIUM"));
>+    glLoseContextCHROMIUM =
>+        reinterpret_cast<PFNGLLOSECONTEXTCHROMIUMPROC>(loadProc("glLoseContextCHROMIUM"));
>+    glBindFragmentInputLocationCHROMIUM =
>+        reinterpret_cast<PFNGLBINDFRAGMENTINPUTLOCATIONCHROMIUMPROC>(
>+            loadProc("glBindFragmentInputLocationCHROMIUM"));
>+    glCoverFillPathCHROMIUM =
>+        reinterpret_cast<PFNGLCOVERFILLPATHCHROMIUMPROC>(loadProc("glCoverFillPathCHROMIUM"));
>+    glCoverFillPathInstancedCHROMIUM = reinterpret_cast<PFNGLCOVERFILLPATHINSTANCEDCHROMIUMPROC>(
>+        loadProc("glCoverFillPathInstancedCHROMIUM"));
>+    glCoverStrokePathCHROMIUM =
>+        reinterpret_cast<PFNGLCOVERSTROKEPATHCHROMIUMPROC>(loadProc("glCoverStrokePathCHROMIUM"));
>+    glCoverStrokePathInstancedCHROMIUM =
>+        reinterpret_cast<PFNGLCOVERSTROKEPATHINSTANCEDCHROMIUMPROC>(
>+            loadProc("glCoverStrokePathInstancedCHROMIUM"));
>+    glDeletePathsCHROMIUM =
>+        reinterpret_cast<PFNGLDELETEPATHSCHROMIUMPROC>(loadProc("glDeletePathsCHROMIUM"));
>+    glGenPathsCHROMIUM =
>+        reinterpret_cast<PFNGLGENPATHSCHROMIUMPROC>(loadProc("glGenPathsCHROMIUM"));
>+    glGetPathParameterfvCHROMIUM = reinterpret_cast<PFNGLGETPATHPARAMETERFVCHROMIUMPROC>(
>+        loadProc("glGetPathParameterfvCHROMIUM"));
>+    glGetPathParameterivCHROMIUM = reinterpret_cast<PFNGLGETPATHPARAMETERIVCHROMIUMPROC>(
>+        loadProc("glGetPathParameterivCHROMIUM"));
>+    glIsPathCHROMIUM = reinterpret_cast<PFNGLISPATHCHROMIUMPROC>(loadProc("glIsPathCHROMIUM"));
>+    glPathCommandsCHROMIUM =
>+        reinterpret_cast<PFNGLPATHCOMMANDSCHROMIUMPROC>(loadProc("glPathCommandsCHROMIUM"));
>+    glPathParameterfCHROMIUM =
>+        reinterpret_cast<PFNGLPATHPARAMETERFCHROMIUMPROC>(loadProc("glPathParameterfCHROMIUM"));
>+    glPathParameteriCHROMIUM =
>+        reinterpret_cast<PFNGLPATHPARAMETERICHROMIUMPROC>(loadProc("glPathParameteriCHROMIUM"));
>+    glPathStencilFuncCHROMIUM =
>+        reinterpret_cast<PFNGLPATHSTENCILFUNCCHROMIUMPROC>(loadProc("glPathStencilFuncCHROMIUM"));
>+    glProgramPathFragmentInputGenCHROMIUM =
>+        reinterpret_cast<PFNGLPROGRAMPATHFRAGMENTINPUTGENCHROMIUMPROC>(
>+            loadProc("glProgramPathFragmentInputGenCHROMIUM"));
>+    glStencilFillPathCHROMIUM =
>+        reinterpret_cast<PFNGLSTENCILFILLPATHCHROMIUMPROC>(loadProc("glStencilFillPathCHROMIUM"));
>+    glStencilFillPathInstancedCHROMIUM =
>+        reinterpret_cast<PFNGLSTENCILFILLPATHINSTANCEDCHROMIUMPROC>(
>+            loadProc("glStencilFillPathInstancedCHROMIUM"));
>+    glStencilStrokePathCHROMIUM = reinterpret_cast<PFNGLSTENCILSTROKEPATHCHROMIUMPROC>(
>+        loadProc("glStencilStrokePathCHROMIUM"));
>+    glStencilStrokePathInstancedCHROMIUM =
>+        reinterpret_cast<PFNGLSTENCILSTROKEPATHINSTANCEDCHROMIUMPROC>(
>+            loadProc("glStencilStrokePathInstancedCHROMIUM"));
>+    glStencilThenCoverFillPathCHROMIUM =
>+        reinterpret_cast<PFNGLSTENCILTHENCOVERFILLPATHCHROMIUMPROC>(
>+            loadProc("glStencilThenCoverFillPathCHROMIUM"));
>+    glStencilThenCoverFillPathInstancedCHROMIUM =
>+        reinterpret_cast<PFNGLSTENCILTHENCOVERFILLPATHINSTANCEDCHROMIUMPROC>(
>+            loadProc("glStencilThenCoverFillPathInstancedCHROMIUM"));
>+    glStencilThenCoverStrokePathCHROMIUM =
>+        reinterpret_cast<PFNGLSTENCILTHENCOVERSTROKEPATHCHROMIUMPROC>(
>+            loadProc("glStencilThenCoverStrokePathCHROMIUM"));
>+    glStencilThenCoverStrokePathInstancedCHROMIUM =
>+        reinterpret_cast<PFNGLSTENCILTHENCOVERSTROKEPATHINSTANCEDCHROMIUMPROC>(
>+            loadProc("glStencilThenCoverStrokePathInstancedCHROMIUM"));
>+    glBindFragDataLocationEXT =
>+        reinterpret_cast<PFNGLBINDFRAGDATALOCATIONEXTPROC>(loadProc("glBindFragDataLocationEXT"));
>+    glBindFragDataLocationIndexedEXT = reinterpret_cast<PFNGLBINDFRAGDATALOCATIONINDEXEDEXTPROC>(
>+        loadProc("glBindFragDataLocationIndexedEXT"));
>+    glGetFragDataIndexEXT =
>+        reinterpret_cast<PFNGLGETFRAGDATAINDEXEXTPROC>(loadProc("glGetFragDataIndexEXT"));
>+    glGetProgramResourceLocationIndexEXT =
>+        reinterpret_cast<PFNGLGETPROGRAMRESOURCELOCATIONINDEXEXTPROC>(
>+            loadProc("glGetProgramResourceLocationIndexEXT"));
>+    glInsertEventMarkerEXT =
>+        reinterpret_cast<PFNGLINSERTEVENTMARKEREXTPROC>(loadProc("glInsertEventMarkerEXT"));
>+    glPopGroupMarkerEXT =
>+        reinterpret_cast<PFNGLPOPGROUPMARKEREXTPROC>(loadProc("glPopGroupMarkerEXT"));
>+    glPushGroupMarkerEXT =
>+        reinterpret_cast<PFNGLPUSHGROUPMARKEREXTPROC>(loadProc("glPushGroupMarkerEXT"));
>+    glDiscardFramebufferEXT =
>+        reinterpret_cast<PFNGLDISCARDFRAMEBUFFEREXTPROC>(loadProc("glDiscardFramebufferEXT"));
>+    glBeginQueryEXT = reinterpret_cast<PFNGLBEGINQUERYEXTPROC>(loadProc("glBeginQueryEXT"));
>+    glDeleteQueriesEXT =
>+        reinterpret_cast<PFNGLDELETEQUERIESEXTPROC>(loadProc("glDeleteQueriesEXT"));
>+    glEndQueryEXT   = reinterpret_cast<PFNGLENDQUERYEXTPROC>(loadProc("glEndQueryEXT"));
>+    glGenQueriesEXT = reinterpret_cast<PFNGLGENQUERIESEXTPROC>(loadProc("glGenQueriesEXT"));
>+    glGetQueryObjecti64vEXT =
>+        reinterpret_cast<PFNGLGETQUERYOBJECTI64VEXTPROC>(loadProc("glGetQueryObjecti64vEXT"));
>+    glGetQueryObjectivEXT =
>+        reinterpret_cast<PFNGLGETQUERYOBJECTIVEXTPROC>(loadProc("glGetQueryObjectivEXT"));
>+    glGetQueryObjectui64vEXT =
>+        reinterpret_cast<PFNGLGETQUERYOBJECTUI64VEXTPROC>(loadProc("glGetQueryObjectui64vEXT"));
>+    glGetQueryObjectuivEXT =
>+        reinterpret_cast<PFNGLGETQUERYOBJECTUIVEXTPROC>(loadProc("glGetQueryObjectuivEXT"));
>+    glGetQueryivEXT   = reinterpret_cast<PFNGLGETQUERYIVEXTPROC>(loadProc("glGetQueryivEXT"));
>+    glIsQueryEXT      = reinterpret_cast<PFNGLISQUERYEXTPROC>(loadProc("glIsQueryEXT"));
>+    glQueryCounterEXT = reinterpret_cast<PFNGLQUERYCOUNTEREXTPROC>(loadProc("glQueryCounterEXT"));
>+    glDrawBuffersEXT  = reinterpret_cast<PFNGLDRAWBUFFERSEXTPROC>(loadProc("glDrawBuffersEXT"));
>+    glFramebufferTextureEXT =
>+        reinterpret_cast<PFNGLFRAMEBUFFERTEXTUREEXTPROC>(loadProc("glFramebufferTextureEXT"));
>+    glDrawArraysInstancedEXT =
>+        reinterpret_cast<PFNGLDRAWARRAYSINSTANCEDEXTPROC>(loadProc("glDrawArraysInstancedEXT"));
>+    glDrawElementsInstancedEXT =
>+        reinterpret_cast<PFNGLDRAWELEMENTSINSTANCEDEXTPROC>(loadProc("glDrawElementsInstancedEXT"));
>+    glVertexAttribDivisorEXT =
>+        reinterpret_cast<PFNGLVERTEXATTRIBDIVISOREXTPROC>(loadProc("glVertexAttribDivisorEXT"));
>+    glFlushMappedBufferRangeEXT = reinterpret_cast<PFNGLFLUSHMAPPEDBUFFERRANGEEXTPROC>(
>+        loadProc("glFlushMappedBufferRangeEXT"));
>+    glMapBufferRangeEXT =
>+        reinterpret_cast<PFNGLMAPBUFFERRANGEEXTPROC>(loadProc("glMapBufferRangeEXT"));
>+    glBufferStorageMemEXT =
>+        reinterpret_cast<PFNGLBUFFERSTORAGEMEMEXTPROC>(loadProc("glBufferStorageMemEXT"));
>+    glCreateMemoryObjectsEXT =
>+        reinterpret_cast<PFNGLCREATEMEMORYOBJECTSEXTPROC>(loadProc("glCreateMemoryObjectsEXT"));
>+    glDeleteMemoryObjectsEXT =
>+        reinterpret_cast<PFNGLDELETEMEMORYOBJECTSEXTPROC>(loadProc("glDeleteMemoryObjectsEXT"));
>+    glGetMemoryObjectParameterivEXT = reinterpret_cast<PFNGLGETMEMORYOBJECTPARAMETERIVEXTPROC>(
>+        loadProc("glGetMemoryObjectParameterivEXT"));
>+    glGetUnsignedBytei_vEXT =
>+        reinterpret_cast<PFNGLGETUNSIGNEDBYTEI_VEXTPROC>(loadProc("glGetUnsignedBytei_vEXT"));
>+    glGetUnsignedBytevEXT =
>+        reinterpret_cast<PFNGLGETUNSIGNEDBYTEVEXTPROC>(loadProc("glGetUnsignedBytevEXT"));
>+    glIsMemoryObjectEXT =
>+        reinterpret_cast<PFNGLISMEMORYOBJECTEXTPROC>(loadProc("glIsMemoryObjectEXT"));
>+    glMemoryObjectParameterivEXT = reinterpret_cast<PFNGLMEMORYOBJECTPARAMETERIVEXTPROC>(
>+        loadProc("glMemoryObjectParameterivEXT"));
>+    glTexStorageMem2DEXT =
>+        reinterpret_cast<PFNGLTEXSTORAGEMEM2DEXTPROC>(loadProc("glTexStorageMem2DEXT"));
>+    glTexStorageMem2DMultisampleEXT = reinterpret_cast<PFNGLTEXSTORAGEMEM2DMULTISAMPLEEXTPROC>(
>+        loadProc("glTexStorageMem2DMultisampleEXT"));
>+    glTexStorageMem3DEXT =
>+        reinterpret_cast<PFNGLTEXSTORAGEMEM3DEXTPROC>(loadProc("glTexStorageMem3DEXT"));
>+    glTexStorageMem3DMultisampleEXT = reinterpret_cast<PFNGLTEXSTORAGEMEM3DMULTISAMPLEEXTPROC>(
>+        loadProc("glTexStorageMem3DMultisampleEXT"));
>+    glImportMemoryFdEXT =
>+        reinterpret_cast<PFNGLIMPORTMEMORYFDEXTPROC>(loadProc("glImportMemoryFdEXT"));
>+    glGetGraphicsResetStatusEXT = reinterpret_cast<PFNGLGETGRAPHICSRESETSTATUSEXTPROC>(
>+        loadProc("glGetGraphicsResetStatusEXT"));
>+    glGetnUniformfvEXT =
>+        reinterpret_cast<PFNGLGETNUNIFORMFVEXTPROC>(loadProc("glGetnUniformfvEXT"));
>+    glGetnUniformivEXT =
>+        reinterpret_cast<PFNGLGETNUNIFORMIVEXTPROC>(loadProc("glGetnUniformivEXT"));
>+    glReadnPixelsEXT = reinterpret_cast<PFNGLREADNPIXELSEXTPROC>(loadProc("glReadnPixelsEXT"));
>+    glDeleteSemaphoresEXT =
>+        reinterpret_cast<PFNGLDELETESEMAPHORESEXTPROC>(loadProc("glDeleteSemaphoresEXT"));
>+    glGenSemaphoresEXT =
>+        reinterpret_cast<PFNGLGENSEMAPHORESEXTPROC>(loadProc("glGenSemaphoresEXT"));
>+    glGetSemaphoreParameterui64vEXT = reinterpret_cast<PFNGLGETSEMAPHOREPARAMETERUI64VEXTPROC>(
>+        loadProc("glGetSemaphoreParameterui64vEXT"));
>+    glIsSemaphoreEXT = reinterpret_cast<PFNGLISSEMAPHOREEXTPROC>(loadProc("glIsSemaphoreEXT"));
>+    glSemaphoreParameterui64vEXT = reinterpret_cast<PFNGLSEMAPHOREPARAMETERUI64VEXTPROC>(
>+        loadProc("glSemaphoreParameterui64vEXT"));
>+    glSignalSemaphoreEXT =
>+        reinterpret_cast<PFNGLSIGNALSEMAPHOREEXTPROC>(loadProc("glSignalSemaphoreEXT"));
>+    glWaitSemaphoreEXT =
>+        reinterpret_cast<PFNGLWAITSEMAPHOREEXTPROC>(loadProc("glWaitSemaphoreEXT"));
>+    glImportSemaphoreFdEXT =
>+        reinterpret_cast<PFNGLIMPORTSEMAPHOREFDEXTPROC>(loadProc("glImportSemaphoreFdEXT"));
>+    glTexStorage1DEXT = reinterpret_cast<PFNGLTEXSTORAGE1DEXTPROC>(loadProc("glTexStorage1DEXT"));
>+    glTexStorage2DEXT = reinterpret_cast<PFNGLTEXSTORAGE2DEXTPROC>(loadProc("glTexStorage2DEXT"));
>+    glTexStorage3DEXT = reinterpret_cast<PFNGLTEXSTORAGE3DEXTPROC>(loadProc("glTexStorage3DEXT"));
>+    glDebugMessageCallbackKHR =
>+        reinterpret_cast<PFNGLDEBUGMESSAGECALLBACKKHRPROC>(loadProc("glDebugMessageCallbackKHR"));
>+    glDebugMessageControlKHR =
>+        reinterpret_cast<PFNGLDEBUGMESSAGECONTROLKHRPROC>(loadProc("glDebugMessageControlKHR"));
>+    glDebugMessageInsertKHR =
>+        reinterpret_cast<PFNGLDEBUGMESSAGEINSERTKHRPROC>(loadProc("glDebugMessageInsertKHR"));
>+    glGetDebugMessageLogKHR =
>+        reinterpret_cast<PFNGLGETDEBUGMESSAGELOGKHRPROC>(loadProc("glGetDebugMessageLogKHR"));
>+    glGetObjectLabelKHR =
>+        reinterpret_cast<PFNGLGETOBJECTLABELKHRPROC>(loadProc("glGetObjectLabelKHR"));
>+    glGetObjectPtrLabelKHR =
>+        reinterpret_cast<PFNGLGETOBJECTPTRLABELKHRPROC>(loadProc("glGetObjectPtrLabelKHR"));
>+    glGetPointervKHR = reinterpret_cast<PFNGLGETPOINTERVKHRPROC>(loadProc("glGetPointervKHR"));
>+    glObjectLabelKHR = reinterpret_cast<PFNGLOBJECTLABELKHRPROC>(loadProc("glObjectLabelKHR"));
>+    glObjectPtrLabelKHR =
>+        reinterpret_cast<PFNGLOBJECTPTRLABELKHRPROC>(loadProc("glObjectPtrLabelKHR"));
>+    glPopDebugGroupKHR =
>+        reinterpret_cast<PFNGLPOPDEBUGGROUPKHRPROC>(loadProc("glPopDebugGroupKHR"));
>+    glPushDebugGroupKHR =
>+        reinterpret_cast<PFNGLPUSHDEBUGGROUPKHRPROC>(loadProc("glPushDebugGroupKHR"));
>+    glMaxShaderCompilerThreadsKHR = reinterpret_cast<PFNGLMAXSHADERCOMPILERTHREADSKHRPROC>(
>+        loadProc("glMaxShaderCompilerThreadsKHR"));
>+    glDeleteFencesNV = reinterpret_cast<PFNGLDELETEFENCESNVPROC>(loadProc("glDeleteFencesNV"));
>+    glFinishFenceNV  = reinterpret_cast<PFNGLFINISHFENCENVPROC>(loadProc("glFinishFenceNV"));
>+    glGenFencesNV    = reinterpret_cast<PFNGLGENFENCESNVPROC>(loadProc("glGenFencesNV"));
>+    glGetFenceivNV   = reinterpret_cast<PFNGLGETFENCEIVNVPROC>(loadProc("glGetFenceivNV"));
>+    glIsFenceNV      = reinterpret_cast<PFNGLISFENCENVPROC>(loadProc("glIsFenceNV"));
>+    glSetFenceNV     = reinterpret_cast<PFNGLSETFENCENVPROC>(loadProc("glSetFenceNV"));
>+    glTestFenceNV    = reinterpret_cast<PFNGLTESTFENCENVPROC>(loadProc("glTestFenceNV"));
>+    glEGLImageTargetRenderbufferStorageOES =
>+        reinterpret_cast<PFNGLEGLIMAGETARGETRENDERBUFFERSTORAGEOESPROC>(
>+            loadProc("glEGLImageTargetRenderbufferStorageOES"));
>+    glEGLImageTargetTexture2DOES = reinterpret_cast<PFNGLEGLIMAGETARGETTEXTURE2DOESPROC>(
>+        loadProc("glEGLImageTargetTexture2DOES"));
>+    glGetProgramBinaryOES =
>+        reinterpret_cast<PFNGLGETPROGRAMBINARYOESPROC>(loadProc("glGetProgramBinaryOES"));
>+    glProgramBinaryOES =
>+        reinterpret_cast<PFNGLPROGRAMBINARYOESPROC>(loadProc("glProgramBinaryOES"));
>+    glGetBufferPointervOES =
>+        reinterpret_cast<PFNGLGETBUFFERPOINTERVOESPROC>(loadProc("glGetBufferPointervOES"));
>+    glMapBufferOES   = reinterpret_cast<PFNGLMAPBUFFEROESPROC>(loadProc("glMapBufferOES"));
>+    glUnmapBufferOES = reinterpret_cast<PFNGLUNMAPBUFFEROESPROC>(loadProc("glUnmapBufferOES"));
>+    glGetSamplerParameterIivOES = reinterpret_cast<PFNGLGETSAMPLERPARAMETERIIVOESPROC>(
>+        loadProc("glGetSamplerParameterIivOES"));
>+    glGetSamplerParameterIuivOES = reinterpret_cast<PFNGLGETSAMPLERPARAMETERIUIVOESPROC>(
>+        loadProc("glGetSamplerParameterIuivOES"));
>+    glGetTexParameterIivOES =
>+        reinterpret_cast<PFNGLGETTEXPARAMETERIIVOESPROC>(loadProc("glGetTexParameterIivOES"));
>+    glGetTexParameterIuivOES =
>+        reinterpret_cast<PFNGLGETTEXPARAMETERIUIVOESPROC>(loadProc("glGetTexParameterIuivOES"));
>+    glSamplerParameterIivOES =
>+        reinterpret_cast<PFNGLSAMPLERPARAMETERIIVOESPROC>(loadProc("glSamplerParameterIivOES"));
>+    glSamplerParameterIuivOES =
>+        reinterpret_cast<PFNGLSAMPLERPARAMETERIUIVOESPROC>(loadProc("glSamplerParameterIuivOES"));
>+    glTexParameterIivOES =
>+        reinterpret_cast<PFNGLTEXPARAMETERIIVOESPROC>(loadProc("glTexParameterIivOES"));
>+    glTexParameterIuivOES =
>+        reinterpret_cast<PFNGLTEXPARAMETERIUIVOESPROC>(loadProc("glTexParameterIuivOES"));
>+    glTexStorage3DMultisampleOES = reinterpret_cast<PFNGLTEXSTORAGE3DMULTISAMPLEOESPROC>(
>+        loadProc("glTexStorage3DMultisampleOES"));
>+    glBindVertexArrayOES =
>+        reinterpret_cast<PFNGLBINDVERTEXARRAYOESPROC>(loadProc("glBindVertexArrayOES"));
>+    glDeleteVertexArraysOES =
>+        reinterpret_cast<PFNGLDELETEVERTEXARRAYSOESPROC>(loadProc("glDeleteVertexArraysOES"));
>+    glGenVertexArraysOES =
>+        reinterpret_cast<PFNGLGENVERTEXARRAYSOESPROC>(loadProc("glGenVertexArraysOES"));
>+    glIsVertexArrayOES =
>+        reinterpret_cast<PFNGLISVERTEXARRAYOESPROC>(loadProc("glIsVertexArrayOES"));
>+    glFramebufferTextureMultiviewOVR = reinterpret_cast<PFNGLFRAMEBUFFERTEXTUREMULTIVIEWOVRPROC>(
>+        loadProc("glFramebufferTextureMultiviewOVR"));
>+    glDrawTexfOES  = reinterpret_cast<PFNGLDRAWTEXFOESPROC>(loadProc("glDrawTexfOES"));
>+    glDrawTexfvOES = reinterpret_cast<PFNGLDRAWTEXFVOESPROC>(loadProc("glDrawTexfvOES"));
>+    glDrawTexiOES  = reinterpret_cast<PFNGLDRAWTEXIOESPROC>(loadProc("glDrawTexiOES"));
>+    glDrawTexivOES = reinterpret_cast<PFNGLDRAWTEXIVOESPROC>(loadProc("glDrawTexivOES"));
>+    glDrawTexsOES  = reinterpret_cast<PFNGLDRAWTEXSOESPROC>(loadProc("glDrawTexsOES"));
>+    glDrawTexsvOES = reinterpret_cast<PFNGLDRAWTEXSVOESPROC>(loadProc("glDrawTexsvOES"));
>+    glDrawTexxOES  = reinterpret_cast<PFNGLDRAWTEXXOESPROC>(loadProc("glDrawTexxOES"));
>+    glDrawTexxvOES = reinterpret_cast<PFNGLDRAWTEXXVOESPROC>(loadProc("glDrawTexxvOES"));
>+    glBindFramebufferOES =
>+        reinterpret_cast<PFNGLBINDFRAMEBUFFEROESPROC>(loadProc("glBindFramebufferOES"));
>+    glBindRenderbufferOES =
>+        reinterpret_cast<PFNGLBINDRENDERBUFFEROESPROC>(loadProc("glBindRenderbufferOES"));
>+    glCheckFramebufferStatusOES = reinterpret_cast<PFNGLCHECKFRAMEBUFFERSTATUSOESPROC>(
>+        loadProc("glCheckFramebufferStatusOES"));
>+    glDeleteFramebuffersOES =
>+        reinterpret_cast<PFNGLDELETEFRAMEBUFFERSOESPROC>(loadProc("glDeleteFramebuffersOES"));
>+    glDeleteRenderbuffersOES =
>+        reinterpret_cast<PFNGLDELETERENDERBUFFERSOESPROC>(loadProc("glDeleteRenderbuffersOES"));
>+    glFramebufferRenderbufferOES = reinterpret_cast<PFNGLFRAMEBUFFERRENDERBUFFEROESPROC>(
>+        loadProc("glFramebufferRenderbufferOES"));
>+    glFramebufferTexture2DOES =
>+        reinterpret_cast<PFNGLFRAMEBUFFERTEXTURE2DOESPROC>(loadProc("glFramebufferTexture2DOES"));
>+    glGenFramebuffersOES =
>+        reinterpret_cast<PFNGLGENFRAMEBUFFERSOESPROC>(loadProc("glGenFramebuffersOES"));
>+    glGenRenderbuffersOES =
>+        reinterpret_cast<PFNGLGENRENDERBUFFERSOESPROC>(loadProc("glGenRenderbuffersOES"));
>+    glGenerateMipmapOES =
>+        reinterpret_cast<PFNGLGENERATEMIPMAPOESPROC>(loadProc("glGenerateMipmapOES"));
>+    glGetFramebufferAttachmentParameterivOES =
>+        reinterpret_cast<PFNGLGETFRAMEBUFFERATTACHMENTPARAMETERIVOESPROC>(
>+            loadProc("glGetFramebufferAttachmentParameterivOES"));
>+    glGetRenderbufferParameterivOES = reinterpret_cast<PFNGLGETRENDERBUFFERPARAMETERIVOESPROC>(
>+        loadProc("glGetRenderbufferParameterivOES"));
>+    glIsFramebufferOES =
>+        reinterpret_cast<PFNGLISFRAMEBUFFEROESPROC>(loadProc("glIsFramebufferOES"));
>+    glIsRenderbufferOES =
>+        reinterpret_cast<PFNGLISRENDERBUFFEROESPROC>(loadProc("glIsRenderbufferOES"));
>+    glRenderbufferStorageOES =
>+        reinterpret_cast<PFNGLRENDERBUFFERSTORAGEOESPROC>(loadProc("glRenderbufferStorageOES"));
>+    glCurrentPaletteMatrixOES =
>+        reinterpret_cast<PFNGLCURRENTPALETTEMATRIXOESPROC>(loadProc("glCurrentPaletteMatrixOES"));
>+    glLoadPaletteFromModelViewMatrixOES =
>+        reinterpret_cast<PFNGLLOADPALETTEFROMMODELVIEWMATRIXOESPROC>(
>+            loadProc("glLoadPaletteFromModelViewMatrixOES"));
>+    glMatrixIndexPointerOES =
>+        reinterpret_cast<PFNGLMATRIXINDEXPOINTEROESPROC>(loadProc("glMatrixIndexPointerOES"));
>+    glWeightPointerOES =
>+        reinterpret_cast<PFNGLWEIGHTPOINTEROESPROC>(loadProc("glWeightPointerOES"));
>+    glPointSizePointerOES =
>+        reinterpret_cast<PFNGLPOINTSIZEPOINTEROESPROC>(loadProc("glPointSizePointerOES"));
>+    glQueryMatrixxOES = reinterpret_cast<PFNGLQUERYMATRIXXOESPROC>(loadProc("glQueryMatrixxOES"));
>+    glGetTexGenfvOES  = reinterpret_cast<PFNGLGETTEXGENFVOESPROC>(loadProc("glGetTexGenfvOES"));
>+    glGetTexGenivOES  = reinterpret_cast<PFNGLGETTEXGENIVOESPROC>(loadProc("glGetTexGenivOES"));
>+    glGetTexGenxvOES  = reinterpret_cast<PFNGLGETTEXGENXVOESPROC>(loadProc("glGetTexGenxvOES"));
>+    glTexGenfOES      = reinterpret_cast<PFNGLTEXGENFOESPROC>(loadProc("glTexGenfOES"));
>+    glTexGenfvOES     = reinterpret_cast<PFNGLTEXGENFVOESPROC>(loadProc("glTexGenfvOES"));
>+    glTexGeniOES      = reinterpret_cast<PFNGLTEXGENIOESPROC>(loadProc("glTexGeniOES"));
>+    glTexGenivOES     = reinterpret_cast<PFNGLTEXGENIVOESPROC>(loadProc("glTexGenivOES"));
>+    glTexGenxOES      = reinterpret_cast<PFNGLTEXGENXOESPROC>(loadProc("glTexGenxOES"));
>+    glTexGenxvOES     = reinterpret_cast<PFNGLTEXGENXVOESPROC>(loadProc("glTexGenxvOES"));
>+    glAlphaFuncContextANGLE =
>+        reinterpret_cast<PFNGLALPHAFUNCCONTEXTANGLEPROC>(loadProc("glAlphaFuncContextANGLE"));
>+    glClipPlanefContextANGLE =
>+        reinterpret_cast<PFNGLCLIPPLANEFCONTEXTANGLEPROC>(loadProc("glClipPlanefContextANGLE"));
>+    glColor4fContextANGLE =
>+        reinterpret_cast<PFNGLCOLOR4FCONTEXTANGLEPROC>(loadProc("glColor4fContextANGLE"));
>+    glFogfContextANGLE =
>+        reinterpret_cast<PFNGLFOGFCONTEXTANGLEPROC>(loadProc("glFogfContextANGLE"));
>+    glFogfvContextANGLE =
>+        reinterpret_cast<PFNGLFOGFVCONTEXTANGLEPROC>(loadProc("glFogfvContextANGLE"));
>+    glFrustumfContextANGLE =
>+        reinterpret_cast<PFNGLFRUSTUMFCONTEXTANGLEPROC>(loadProc("glFrustumfContextANGLE"));
>+    glGetClipPlanefContextANGLE = reinterpret_cast<PFNGLGETCLIPPLANEFCONTEXTANGLEPROC>(
>+        loadProc("glGetClipPlanefContextANGLE"));
>+    glGetLightfvContextANGLE =
>+        reinterpret_cast<PFNGLGETLIGHTFVCONTEXTANGLEPROC>(loadProc("glGetLightfvContextANGLE"));
>+    glGetMaterialfvContextANGLE = reinterpret_cast<PFNGLGETMATERIALFVCONTEXTANGLEPROC>(
>+        loadProc("glGetMaterialfvContextANGLE"));
>+    glGetTexEnvfvContextANGLE =
>+        reinterpret_cast<PFNGLGETTEXENVFVCONTEXTANGLEPROC>(loadProc("glGetTexEnvfvContextANGLE"));
>+    glLightModelfContextANGLE =
>+        reinterpret_cast<PFNGLLIGHTMODELFCONTEXTANGLEPROC>(loadProc("glLightModelfContextANGLE"));
>+    glLightModelfvContextANGLE =
>+        reinterpret_cast<PFNGLLIGHTMODELFVCONTEXTANGLEPROC>(loadProc("glLightModelfvContextANGLE"));
>+    glLightfContextANGLE =
>+        reinterpret_cast<PFNGLLIGHTFCONTEXTANGLEPROC>(loadProc("glLightfContextANGLE"));
>+    glLightfvContextANGLE =
>+        reinterpret_cast<PFNGLLIGHTFVCONTEXTANGLEPROC>(loadProc("glLightfvContextANGLE"));
>+    glLoadMatrixfContextANGLE =
>+        reinterpret_cast<PFNGLLOADMATRIXFCONTEXTANGLEPROC>(loadProc("glLoadMatrixfContextANGLE"));
>+    glMaterialfContextANGLE =
>+        reinterpret_cast<PFNGLMATERIALFCONTEXTANGLEPROC>(loadProc("glMaterialfContextANGLE"));
>+    glMaterialfvContextANGLE =
>+        reinterpret_cast<PFNGLMATERIALFVCONTEXTANGLEPROC>(loadProc("glMaterialfvContextANGLE"));
>+    glMultMatrixfContextANGLE =
>+        reinterpret_cast<PFNGLMULTMATRIXFCONTEXTANGLEPROC>(loadProc("glMultMatrixfContextANGLE"));
>+    glMultiTexCoord4fContextANGLE = reinterpret_cast<PFNGLMULTITEXCOORD4FCONTEXTANGLEPROC>(
>+        loadProc("glMultiTexCoord4fContextANGLE"));
>+    glNormal3fContextANGLE =
>+        reinterpret_cast<PFNGLNORMAL3FCONTEXTANGLEPROC>(loadProc("glNormal3fContextANGLE"));
>+    glOrthofContextANGLE =
>+        reinterpret_cast<PFNGLORTHOFCONTEXTANGLEPROC>(loadProc("glOrthofContextANGLE"));
>+    glPointParameterfContextANGLE = reinterpret_cast<PFNGLPOINTPARAMETERFCONTEXTANGLEPROC>(
>+        loadProc("glPointParameterfContextANGLE"));
>+    glPointParameterfvContextANGLE = reinterpret_cast<PFNGLPOINTPARAMETERFVCONTEXTANGLEPROC>(
>+        loadProc("glPointParameterfvContextANGLE"));
>+    glPointSizeContextANGLE =
>+        reinterpret_cast<PFNGLPOINTSIZECONTEXTANGLEPROC>(loadProc("glPointSizeContextANGLE"));
>+    glRotatefContextANGLE =
>+        reinterpret_cast<PFNGLROTATEFCONTEXTANGLEPROC>(loadProc("glRotatefContextANGLE"));
>+    glScalefContextANGLE =
>+        reinterpret_cast<PFNGLSCALEFCONTEXTANGLEPROC>(loadProc("glScalefContextANGLE"));
>+    glTexEnvfContextANGLE =
>+        reinterpret_cast<PFNGLTEXENVFCONTEXTANGLEPROC>(loadProc("glTexEnvfContextANGLE"));
>+    glTexEnvfvContextANGLE =
>+        reinterpret_cast<PFNGLTEXENVFVCONTEXTANGLEPROC>(loadProc("glTexEnvfvContextANGLE"));
>+    glTranslatefContextANGLE =
>+        reinterpret_cast<PFNGLTRANSLATEFCONTEXTANGLEPROC>(loadProc("glTranslatefContextANGLE"));
>+    glAlphaFuncxContextANGLE =
>+        reinterpret_cast<PFNGLALPHAFUNCXCONTEXTANGLEPROC>(loadProc("glAlphaFuncxContextANGLE"));
>+    glClearColorxContextANGLE =
>+        reinterpret_cast<PFNGLCLEARCOLORXCONTEXTANGLEPROC>(loadProc("glClearColorxContextANGLE"));
>+    glClearDepthxContextANGLE =
>+        reinterpret_cast<PFNGLCLEARDEPTHXCONTEXTANGLEPROC>(loadProc("glClearDepthxContextANGLE"));
>+    glClientActiveTextureContextANGLE = reinterpret_cast<PFNGLCLIENTACTIVETEXTURECONTEXTANGLEPROC>(
>+        loadProc("glClientActiveTextureContextANGLE"));
>+    glClipPlanexContextANGLE =
>+        reinterpret_cast<PFNGLCLIPPLANEXCONTEXTANGLEPROC>(loadProc("glClipPlanexContextANGLE"));
>+    glColor4ubContextANGLE =
>+        reinterpret_cast<PFNGLCOLOR4UBCONTEXTANGLEPROC>(loadProc("glColor4ubContextANGLE"));
>+    glColor4xContextANGLE =
>+        reinterpret_cast<PFNGLCOLOR4XCONTEXTANGLEPROC>(loadProc("glColor4xContextANGLE"));
>+    glColorPointerContextANGLE =
>+        reinterpret_cast<PFNGLCOLORPOINTERCONTEXTANGLEPROC>(loadProc("glColorPointerContextANGLE"));
>+    glDepthRangexContextANGLE =
>+        reinterpret_cast<PFNGLDEPTHRANGEXCONTEXTANGLEPROC>(loadProc("glDepthRangexContextANGLE"));
>+    glDisableClientStateContextANGLE = reinterpret_cast<PFNGLDISABLECLIENTSTATECONTEXTANGLEPROC>(
>+        loadProc("glDisableClientStateContextANGLE"));
>+    glEnableClientStateContextANGLE = reinterpret_cast<PFNGLENABLECLIENTSTATECONTEXTANGLEPROC>(
>+        loadProc("glEnableClientStateContextANGLE"));
>+    glFogxContextANGLE =
>+        reinterpret_cast<PFNGLFOGXCONTEXTANGLEPROC>(loadProc("glFogxContextANGLE"));
>+    glFogxvContextANGLE =
>+        reinterpret_cast<PFNGLFOGXVCONTEXTANGLEPROC>(loadProc("glFogxvContextANGLE"));
>+    glFrustumxContextANGLE =
>+        reinterpret_cast<PFNGLFRUSTUMXCONTEXTANGLEPROC>(loadProc("glFrustumxContextANGLE"));
>+    glGetClipPlanexContextANGLE = reinterpret_cast<PFNGLGETCLIPPLANEXCONTEXTANGLEPROC>(
>+        loadProc("glGetClipPlanexContextANGLE"));
>+    glGetFixedvContextANGLE =
>+        reinterpret_cast<PFNGLGETFIXEDVCONTEXTANGLEPROC>(loadProc("glGetFixedvContextANGLE"));
>+    glGetLightxvContextANGLE =
>+        reinterpret_cast<PFNGLGETLIGHTXVCONTEXTANGLEPROC>(loadProc("glGetLightxvContextANGLE"));
>+    glGetMaterialxvContextANGLE = reinterpret_cast<PFNGLGETMATERIALXVCONTEXTANGLEPROC>(
>+        loadProc("glGetMaterialxvContextANGLE"));
>+    glGetPointervContextANGLE =
>+        reinterpret_cast<PFNGLGETPOINTERVCONTEXTANGLEPROC>(loadProc("glGetPointervContextANGLE"));
>+    glGetTexEnvivContextANGLE =
>+        reinterpret_cast<PFNGLGETTEXENVIVCONTEXTANGLEPROC>(loadProc("glGetTexEnvivContextANGLE"));
>+    glGetTexEnvxvContextANGLE =
>+        reinterpret_cast<PFNGLGETTEXENVXVCONTEXTANGLEPROC>(loadProc("glGetTexEnvxvContextANGLE"));
>+    glGetTexParameterxvContextANGLE = reinterpret_cast<PFNGLGETTEXPARAMETERXVCONTEXTANGLEPROC>(
>+        loadProc("glGetTexParameterxvContextANGLE"));
>+    glLightModelxContextANGLE =
>+        reinterpret_cast<PFNGLLIGHTMODELXCONTEXTANGLEPROC>(loadProc("glLightModelxContextANGLE"));
>+    glLightModelxvContextANGLE =
>+        reinterpret_cast<PFNGLLIGHTMODELXVCONTEXTANGLEPROC>(loadProc("glLightModelxvContextANGLE"));
>+    glLightxContextANGLE =
>+        reinterpret_cast<PFNGLLIGHTXCONTEXTANGLEPROC>(loadProc("glLightxContextANGLE"));
>+    glLightxvContextANGLE =
>+        reinterpret_cast<PFNGLLIGHTXVCONTEXTANGLEPROC>(loadProc("glLightxvContextANGLE"));
>+    glLineWidthxContextANGLE =
>+        reinterpret_cast<PFNGLLINEWIDTHXCONTEXTANGLEPROC>(loadProc("glLineWidthxContextANGLE"));
>+    glLoadIdentityContextANGLE =
>+        reinterpret_cast<PFNGLLOADIDENTITYCONTEXTANGLEPROC>(loadProc("glLoadIdentityContextANGLE"));
>+    glLoadMatrixxContextANGLE =
>+        reinterpret_cast<PFNGLLOADMATRIXXCONTEXTANGLEPROC>(loadProc("glLoadMatrixxContextANGLE"));
>+    glLogicOpContextANGLE =
>+        reinterpret_cast<PFNGLLOGICOPCONTEXTANGLEPROC>(loadProc("glLogicOpContextANGLE"));
>+    glMaterialxContextANGLE =
>+        reinterpret_cast<PFNGLMATERIALXCONTEXTANGLEPROC>(loadProc("glMaterialxContextANGLE"));
>+    glMaterialxvContextANGLE =
>+        reinterpret_cast<PFNGLMATERIALXVCONTEXTANGLEPROC>(loadProc("glMaterialxvContextANGLE"));
>+    glMatrixModeContextANGLE =
>+        reinterpret_cast<PFNGLMATRIXMODECONTEXTANGLEPROC>(loadProc("glMatrixModeContextANGLE"));
>+    glMultMatrixxContextANGLE =
>+        reinterpret_cast<PFNGLMULTMATRIXXCONTEXTANGLEPROC>(loadProc("glMultMatrixxContextANGLE"));
>+    glMultiTexCoord4xContextANGLE = reinterpret_cast<PFNGLMULTITEXCOORD4XCONTEXTANGLEPROC>(
>+        loadProc("glMultiTexCoord4xContextANGLE"));
>+    glNormal3xContextANGLE =
>+        reinterpret_cast<PFNGLNORMAL3XCONTEXTANGLEPROC>(loadProc("glNormal3xContextANGLE"));
>+    glNormalPointerContextANGLE = reinterpret_cast<PFNGLNORMALPOINTERCONTEXTANGLEPROC>(
>+        loadProc("glNormalPointerContextANGLE"));
>+    glOrthoxContextANGLE =
>+        reinterpret_cast<PFNGLORTHOXCONTEXTANGLEPROC>(loadProc("glOrthoxContextANGLE"));
>+    glPointParameterxContextANGLE = reinterpret_cast<PFNGLPOINTPARAMETERXCONTEXTANGLEPROC>(
>+        loadProc("glPointParameterxContextANGLE"));
>+    glPointParameterxvContextANGLE = reinterpret_cast<PFNGLPOINTPARAMETERXVCONTEXTANGLEPROC>(
>+        loadProc("glPointParameterxvContextANGLE"));
>+    glPointSizexContextANGLE =
>+        reinterpret_cast<PFNGLPOINTSIZEXCONTEXTANGLEPROC>(loadProc("glPointSizexContextANGLE"));
>+    glPolygonOffsetxContextANGLE = reinterpret_cast<PFNGLPOLYGONOFFSETXCONTEXTANGLEPROC>(
>+        loadProc("glPolygonOffsetxContextANGLE"));
>+    glPopMatrixContextANGLE =
>+        reinterpret_cast<PFNGLPOPMATRIXCONTEXTANGLEPROC>(loadProc("glPopMatrixContextANGLE"));
>+    glPushMatrixContextANGLE =
>+        reinterpret_cast<PFNGLPUSHMATRIXCONTEXTANGLEPROC>(loadProc("glPushMatrixContextANGLE"));
>+    glRotatexContextANGLE =
>+        reinterpret_cast<PFNGLROTATEXCONTEXTANGLEPROC>(loadProc("glRotatexContextANGLE"));
>+    glSampleCoveragexContextANGLE = reinterpret_cast<PFNGLSAMPLECOVERAGEXCONTEXTANGLEPROC>(
>+        loadProc("glSampleCoveragexContextANGLE"));
>+    glScalexContextANGLE =
>+        reinterpret_cast<PFNGLSCALEXCONTEXTANGLEPROC>(loadProc("glScalexContextANGLE"));
>+    glShadeModelContextANGLE =
>+        reinterpret_cast<PFNGLSHADEMODELCONTEXTANGLEPROC>(loadProc("glShadeModelContextANGLE"));
>+    glTexCoordPointerContextANGLE = reinterpret_cast<PFNGLTEXCOORDPOINTERCONTEXTANGLEPROC>(
>+        loadProc("glTexCoordPointerContextANGLE"));
>+    glTexEnviContextANGLE =
>+        reinterpret_cast<PFNGLTEXENVICONTEXTANGLEPROC>(loadProc("glTexEnviContextANGLE"));
>+    glTexEnvxContextANGLE =
>+        reinterpret_cast<PFNGLTEXENVXCONTEXTANGLEPROC>(loadProc("glTexEnvxContextANGLE"));
>+    glTexEnvivContextANGLE =
>+        reinterpret_cast<PFNGLTEXENVIVCONTEXTANGLEPROC>(loadProc("glTexEnvivContextANGLE"));
>+    glTexEnvxvContextANGLE =
>+        reinterpret_cast<PFNGLTEXENVXVCONTEXTANGLEPROC>(loadProc("glTexEnvxvContextANGLE"));
>+    glTexParameterxContextANGLE = reinterpret_cast<PFNGLTEXPARAMETERXCONTEXTANGLEPROC>(
>+        loadProc("glTexParameterxContextANGLE"));
>+    glTexParameterxvContextANGLE = reinterpret_cast<PFNGLTEXPARAMETERXVCONTEXTANGLEPROC>(
>+        loadProc("glTexParameterxvContextANGLE"));
>+    glTranslatexContextANGLE =
>+        reinterpret_cast<PFNGLTRANSLATEXCONTEXTANGLEPROC>(loadProc("glTranslatexContextANGLE"));
>+    glVertexPointerContextANGLE = reinterpret_cast<PFNGLVERTEXPOINTERCONTEXTANGLEPROC>(
>+        loadProc("glVertexPointerContextANGLE"));
>+    glActiveTextureContextANGLE = reinterpret_cast<PFNGLACTIVETEXTURECONTEXTANGLEPROC>(
>+        loadProc("glActiveTextureContextANGLE"));
>+    glAttachShaderContextANGLE =
>+        reinterpret_cast<PFNGLATTACHSHADERCONTEXTANGLEPROC>(loadProc("glAttachShaderContextANGLE"));
>+    glBindAttribLocationContextANGLE = reinterpret_cast<PFNGLBINDATTRIBLOCATIONCONTEXTANGLEPROC>(
>+        loadProc("glBindAttribLocationContextANGLE"));
>+    glBindBufferContextANGLE =
>+        reinterpret_cast<PFNGLBINDBUFFERCONTEXTANGLEPROC>(loadProc("glBindBufferContextANGLE"));
>+    glBindFramebufferContextANGLE = reinterpret_cast<PFNGLBINDFRAMEBUFFERCONTEXTANGLEPROC>(
>+        loadProc("glBindFramebufferContextANGLE"));
>+    glBindRenderbufferContextANGLE = reinterpret_cast<PFNGLBINDRENDERBUFFERCONTEXTANGLEPROC>(
>+        loadProc("glBindRenderbufferContextANGLE"));
>+    glBindTextureContextANGLE =
>+        reinterpret_cast<PFNGLBINDTEXTURECONTEXTANGLEPROC>(loadProc("glBindTextureContextANGLE"));
>+    glBlendColorContextANGLE =
>+        reinterpret_cast<PFNGLBLENDCOLORCONTEXTANGLEPROC>(loadProc("glBlendColorContextANGLE"));
>+    glBlendEquationContextANGLE = reinterpret_cast<PFNGLBLENDEQUATIONCONTEXTANGLEPROC>(
>+        loadProc("glBlendEquationContextANGLE"));
>+    glBlendEquationSeparateContextANGLE =
>+        reinterpret_cast<PFNGLBLENDEQUATIONSEPARATECONTEXTANGLEPROC>(
>+            loadProc("glBlendEquationSeparateContextANGLE"));
>+    glBlendFuncContextANGLE =
>+        reinterpret_cast<PFNGLBLENDFUNCCONTEXTANGLEPROC>(loadProc("glBlendFuncContextANGLE"));
>+    glBlendFuncSeparateContextANGLE = reinterpret_cast<PFNGLBLENDFUNCSEPARATECONTEXTANGLEPROC>(
>+        loadProc("glBlendFuncSeparateContextANGLE"));
>+    glBufferDataContextANGLE =
>+        reinterpret_cast<PFNGLBUFFERDATACONTEXTANGLEPROC>(loadProc("glBufferDataContextANGLE"));
>+    glBufferSubDataContextANGLE = reinterpret_cast<PFNGLBUFFERSUBDATACONTEXTANGLEPROC>(
>+        loadProc("glBufferSubDataContextANGLE"));
>+    glCheckFramebufferStatusContextANGLE =
>+        reinterpret_cast<PFNGLCHECKFRAMEBUFFERSTATUSCONTEXTANGLEPROC>(
>+            loadProc("glCheckFramebufferStatusContextANGLE"));
>+    glClearContextANGLE =
>+        reinterpret_cast<PFNGLCLEARCONTEXTANGLEPROC>(loadProc("glClearContextANGLE"));
>+    glClearColorContextANGLE =
>+        reinterpret_cast<PFNGLCLEARCOLORCONTEXTANGLEPROC>(loadProc("glClearColorContextANGLE"));
>+    glClearDepthfContextANGLE =
>+        reinterpret_cast<PFNGLCLEARDEPTHFCONTEXTANGLEPROC>(loadProc("glClearDepthfContextANGLE"));
>+    glClearStencilContextANGLE =
>+        reinterpret_cast<PFNGLCLEARSTENCILCONTEXTANGLEPROC>(loadProc("glClearStencilContextANGLE"));
>+    glColorMaskContextANGLE =
>+        reinterpret_cast<PFNGLCOLORMASKCONTEXTANGLEPROC>(loadProc("glColorMaskContextANGLE"));
>+    glCompileShaderContextANGLE = reinterpret_cast<PFNGLCOMPILESHADERCONTEXTANGLEPROC>(
>+        loadProc("glCompileShaderContextANGLE"));
>+    glCompressedTexImage2DContextANGLE =
>+        reinterpret_cast<PFNGLCOMPRESSEDTEXIMAGE2DCONTEXTANGLEPROC>(
>+            loadProc("glCompressedTexImage2DContextANGLE"));
>+    glCompressedTexSubImage2DContextANGLE =
>+        reinterpret_cast<PFNGLCOMPRESSEDTEXSUBIMAGE2DCONTEXTANGLEPROC>(
>+            loadProc("glCompressedTexSubImage2DContextANGLE"));
>+    glCopyTexImage2DContextANGLE = reinterpret_cast<PFNGLCOPYTEXIMAGE2DCONTEXTANGLEPROC>(
>+        loadProc("glCopyTexImage2DContextANGLE"));
>+    glCopyTexSubImage2DContextANGLE = reinterpret_cast<PFNGLCOPYTEXSUBIMAGE2DCONTEXTANGLEPROC>(
>+        loadProc("glCopyTexSubImage2DContextANGLE"));
>+    glCreateProgramContextANGLE = reinterpret_cast<PFNGLCREATEPROGRAMCONTEXTANGLEPROC>(
>+        loadProc("glCreateProgramContextANGLE"));
>+    glCreateShaderContextANGLE =
>+        reinterpret_cast<PFNGLCREATESHADERCONTEXTANGLEPROC>(loadProc("glCreateShaderContextANGLE"));
>+    glCullFaceContextANGLE =
>+        reinterpret_cast<PFNGLCULLFACECONTEXTANGLEPROC>(loadProc("glCullFaceContextANGLE"));
>+    glDeleteBuffersContextANGLE = reinterpret_cast<PFNGLDELETEBUFFERSCONTEXTANGLEPROC>(
>+        loadProc("glDeleteBuffersContextANGLE"));
>+    glDeleteFramebuffersContextANGLE = reinterpret_cast<PFNGLDELETEFRAMEBUFFERSCONTEXTANGLEPROC>(
>+        loadProc("glDeleteFramebuffersContextANGLE"));
>+    glDeleteProgramContextANGLE = reinterpret_cast<PFNGLDELETEPROGRAMCONTEXTANGLEPROC>(
>+        loadProc("glDeleteProgramContextANGLE"));
>+    glDeleteRenderbuffersContextANGLE = reinterpret_cast<PFNGLDELETERENDERBUFFERSCONTEXTANGLEPROC>(
>+        loadProc("glDeleteRenderbuffersContextANGLE"));
>+    glDeleteShaderContextANGLE =
>+        reinterpret_cast<PFNGLDELETESHADERCONTEXTANGLEPROC>(loadProc("glDeleteShaderContextANGLE"));
>+    glDeleteTexturesContextANGLE = reinterpret_cast<PFNGLDELETETEXTURESCONTEXTANGLEPROC>(
>+        loadProc("glDeleteTexturesContextANGLE"));
>+    glDepthFuncContextANGLE =
>+        reinterpret_cast<PFNGLDEPTHFUNCCONTEXTANGLEPROC>(loadProc("glDepthFuncContextANGLE"));
>+    glDepthMaskContextANGLE =
>+        reinterpret_cast<PFNGLDEPTHMASKCONTEXTANGLEPROC>(loadProc("glDepthMaskContextANGLE"));
>+    glDepthRangefContextANGLE =
>+        reinterpret_cast<PFNGLDEPTHRANGEFCONTEXTANGLEPROC>(loadProc("glDepthRangefContextANGLE"));
>+    glDetachShaderContextANGLE =
>+        reinterpret_cast<PFNGLDETACHSHADERCONTEXTANGLEPROC>(loadProc("glDetachShaderContextANGLE"));
>+    glDisableContextANGLE =
>+        reinterpret_cast<PFNGLDISABLECONTEXTANGLEPROC>(loadProc("glDisableContextANGLE"));
>+    glDisableVertexAttribArrayContextANGLE =
>+        reinterpret_cast<PFNGLDISABLEVERTEXATTRIBARRAYCONTEXTANGLEPROC>(
>+            loadProc("glDisableVertexAttribArrayContextANGLE"));
>+    glDrawArraysContextANGLE =
>+        reinterpret_cast<PFNGLDRAWARRAYSCONTEXTANGLEPROC>(loadProc("glDrawArraysContextANGLE"));
>+    glDrawElementsContextANGLE =
>+        reinterpret_cast<PFNGLDRAWELEMENTSCONTEXTANGLEPROC>(loadProc("glDrawElementsContextANGLE"));
>+    glEnableContextANGLE =
>+        reinterpret_cast<PFNGLENABLECONTEXTANGLEPROC>(loadProc("glEnableContextANGLE"));
>+    glEnableVertexAttribArrayContextANGLE =
>+        reinterpret_cast<PFNGLENABLEVERTEXATTRIBARRAYCONTEXTANGLEPROC>(
>+            loadProc("glEnableVertexAttribArrayContextANGLE"));
>+    glFinishContextANGLE =
>+        reinterpret_cast<PFNGLFINISHCONTEXTANGLEPROC>(loadProc("glFinishContextANGLE"));
>+    glFlushContextANGLE =
>+        reinterpret_cast<PFNGLFLUSHCONTEXTANGLEPROC>(loadProc("glFlushContextANGLE"));
>+    glFramebufferRenderbufferContextANGLE =
>+        reinterpret_cast<PFNGLFRAMEBUFFERRENDERBUFFERCONTEXTANGLEPROC>(
>+            loadProc("glFramebufferRenderbufferContextANGLE"));
>+    glFramebufferTexture2DContextANGLE =
>+        reinterpret_cast<PFNGLFRAMEBUFFERTEXTURE2DCONTEXTANGLEPROC>(
>+            loadProc("glFramebufferTexture2DContextANGLE"));
>+    glFrontFaceContextANGLE =
>+        reinterpret_cast<PFNGLFRONTFACECONTEXTANGLEPROC>(loadProc("glFrontFaceContextANGLE"));
>+    glGenBuffersContextANGLE =
>+        reinterpret_cast<PFNGLGENBUFFERSCONTEXTANGLEPROC>(loadProc("glGenBuffersContextANGLE"));
>+    glGenerateMipmapContextANGLE = reinterpret_cast<PFNGLGENERATEMIPMAPCONTEXTANGLEPROC>(
>+        loadProc("glGenerateMipmapContextANGLE"));
>+    glGenFramebuffersContextANGLE = reinterpret_cast<PFNGLGENFRAMEBUFFERSCONTEXTANGLEPROC>(
>+        loadProc("glGenFramebuffersContextANGLE"));
>+    glGenRenderbuffersContextANGLE = reinterpret_cast<PFNGLGENRENDERBUFFERSCONTEXTANGLEPROC>(
>+        loadProc("glGenRenderbuffersContextANGLE"));
>+    glGenTexturesContextANGLE =
>+        reinterpret_cast<PFNGLGENTEXTURESCONTEXTANGLEPROC>(loadProc("glGenTexturesContextANGLE"));
>+    glGetActiveAttribContextANGLE = reinterpret_cast<PFNGLGETACTIVEATTRIBCONTEXTANGLEPROC>(
>+        loadProc("glGetActiveAttribContextANGLE"));
>+    glGetActiveUniformContextANGLE = reinterpret_cast<PFNGLGETACTIVEUNIFORMCONTEXTANGLEPROC>(
>+        loadProc("glGetActiveUniformContextANGLE"));
>+    glGetAttachedShadersContextANGLE = reinterpret_cast<PFNGLGETATTACHEDSHADERSCONTEXTANGLEPROC>(
>+        loadProc("glGetAttachedShadersContextANGLE"));
>+    glGetAttribLocationContextANGLE = reinterpret_cast<PFNGLGETATTRIBLOCATIONCONTEXTANGLEPROC>(
>+        loadProc("glGetAttribLocationContextANGLE"));
>+    glGetBooleanvContextANGLE =
>+        reinterpret_cast<PFNGLGETBOOLEANVCONTEXTANGLEPROC>(loadProc("glGetBooleanvContextANGLE"));
>+    glGetBufferParameterivContextANGLE =
>+        reinterpret_cast<PFNGLGETBUFFERPARAMETERIVCONTEXTANGLEPROC>(
>+            loadProc("glGetBufferParameterivContextANGLE"));
>+    glGetErrorContextANGLE =
>+        reinterpret_cast<PFNGLGETERRORCONTEXTANGLEPROC>(loadProc("glGetErrorContextANGLE"));
>+    glGetFloatvContextANGLE =
>+        reinterpret_cast<PFNGLGETFLOATVCONTEXTANGLEPROC>(loadProc("glGetFloatvContextANGLE"));
>+    glGetFramebufferAttachmentParameterivContextANGLE =
>+        reinterpret_cast<PFNGLGETFRAMEBUFFERATTACHMENTPARAMETERIVCONTEXTANGLEPROC>(
>+            loadProc("glGetFramebufferAttachmentParameterivContextANGLE"));
>+    glGetIntegervContextANGLE =
>+        reinterpret_cast<PFNGLGETINTEGERVCONTEXTANGLEPROC>(loadProc("glGetIntegervContextANGLE"));
>+    glGetProgramivContextANGLE =
>+        reinterpret_cast<PFNGLGETPROGRAMIVCONTEXTANGLEPROC>(loadProc("glGetProgramivContextANGLE"));
>+    glGetProgramInfoLogContextANGLE = reinterpret_cast<PFNGLGETPROGRAMINFOLOGCONTEXTANGLEPROC>(
>+        loadProc("glGetProgramInfoLogContextANGLE"));
>+    glGetRenderbufferParameterivContextANGLE =
>+        reinterpret_cast<PFNGLGETRENDERBUFFERPARAMETERIVCONTEXTANGLEPROC>(
>+            loadProc("glGetRenderbufferParameterivContextANGLE"));
>+    glGetShaderivContextANGLE =
>+        reinterpret_cast<PFNGLGETSHADERIVCONTEXTANGLEPROC>(loadProc("glGetShaderivContextANGLE"));
>+    glGetShaderInfoLogContextANGLE = reinterpret_cast<PFNGLGETSHADERINFOLOGCONTEXTANGLEPROC>(
>+        loadProc("glGetShaderInfoLogContextANGLE"));
>+    glGetShaderPrecisionFormatContextANGLE =
>+        reinterpret_cast<PFNGLGETSHADERPRECISIONFORMATCONTEXTANGLEPROC>(
>+            loadProc("glGetShaderPrecisionFormatContextANGLE"));
>+    glGetShaderSourceContextANGLE = reinterpret_cast<PFNGLGETSHADERSOURCECONTEXTANGLEPROC>(
>+        loadProc("glGetShaderSourceContextANGLE"));
>+    glGetStringContextANGLE =
>+        reinterpret_cast<PFNGLGETSTRINGCONTEXTANGLEPROC>(loadProc("glGetStringContextANGLE"));
>+    glGetTexParameterfvContextANGLE = reinterpret_cast<PFNGLGETTEXPARAMETERFVCONTEXTANGLEPROC>(
>+        loadProc("glGetTexParameterfvContextANGLE"));
>+    glGetTexParameterivContextANGLE = reinterpret_cast<PFNGLGETTEXPARAMETERIVCONTEXTANGLEPROC>(
>+        loadProc("glGetTexParameterivContextANGLE"));
>+    glGetUniformfvContextANGLE =
>+        reinterpret_cast<PFNGLGETUNIFORMFVCONTEXTANGLEPROC>(loadProc("glGetUniformfvContextANGLE"));
>+    glGetUniformivContextANGLE =
>+        reinterpret_cast<PFNGLGETUNIFORMIVCONTEXTANGLEPROC>(loadProc("glGetUniformivContextANGLE"));
>+    glGetUniformLocationContextANGLE = reinterpret_cast<PFNGLGETUNIFORMLOCATIONCONTEXTANGLEPROC>(
>+        loadProc("glGetUniformLocationContextANGLE"));
>+    glGetVertexAttribfvContextANGLE = reinterpret_cast<PFNGLGETVERTEXATTRIBFVCONTEXTANGLEPROC>(
>+        loadProc("glGetVertexAttribfvContextANGLE"));
>+    glGetVertexAttribivContextANGLE = reinterpret_cast<PFNGLGETVERTEXATTRIBIVCONTEXTANGLEPROC>(
>+        loadProc("glGetVertexAttribivContextANGLE"));
>+    glGetVertexAttribPointervContextANGLE =
>+        reinterpret_cast<PFNGLGETVERTEXATTRIBPOINTERVCONTEXTANGLEPROC>(
>+            loadProc("glGetVertexAttribPointervContextANGLE"));
>+    glHintContextANGLE =
>+        reinterpret_cast<PFNGLHINTCONTEXTANGLEPROC>(loadProc("glHintContextANGLE"));
>+    glIsBufferContextANGLE =
>+        reinterpret_cast<PFNGLISBUFFERCONTEXTANGLEPROC>(loadProc("glIsBufferContextANGLE"));
>+    glIsEnabledContextANGLE =
>+        reinterpret_cast<PFNGLISENABLEDCONTEXTANGLEPROC>(loadProc("glIsEnabledContextANGLE"));
>+    glIsFramebufferContextANGLE = reinterpret_cast<PFNGLISFRAMEBUFFERCONTEXTANGLEPROC>(
>+        loadProc("glIsFramebufferContextANGLE"));
>+    glIsProgramContextANGLE =
>+        reinterpret_cast<PFNGLISPROGRAMCONTEXTANGLEPROC>(loadProc("glIsProgramContextANGLE"));
>+    glIsRenderbufferContextANGLE = reinterpret_cast<PFNGLISRENDERBUFFERCONTEXTANGLEPROC>(
>+        loadProc("glIsRenderbufferContextANGLE"));
>+    glIsShaderContextANGLE =
>+        reinterpret_cast<PFNGLISSHADERCONTEXTANGLEPROC>(loadProc("glIsShaderContextANGLE"));
>+    glIsTextureContextANGLE =
>+        reinterpret_cast<PFNGLISTEXTURECONTEXTANGLEPROC>(loadProc("glIsTextureContextANGLE"));
>+    glLineWidthContextANGLE =
>+        reinterpret_cast<PFNGLLINEWIDTHCONTEXTANGLEPROC>(loadProc("glLineWidthContextANGLE"));
>+    glLinkProgramContextANGLE =
>+        reinterpret_cast<PFNGLLINKPROGRAMCONTEXTANGLEPROC>(loadProc("glLinkProgramContextANGLE"));
>+    glPixelStoreiContextANGLE =
>+        reinterpret_cast<PFNGLPIXELSTOREICONTEXTANGLEPROC>(loadProc("glPixelStoreiContextANGLE"));
>+    glPolygonOffsetContextANGLE = reinterpret_cast<PFNGLPOLYGONOFFSETCONTEXTANGLEPROC>(
>+        loadProc("glPolygonOffsetContextANGLE"));
>+    glReadPixelsContextANGLE =
>+        reinterpret_cast<PFNGLREADPIXELSCONTEXTANGLEPROC>(loadProc("glReadPixelsContextANGLE"));
>+    glReleaseShaderCompilerContextANGLE =
>+        reinterpret_cast<PFNGLRELEASESHADERCOMPILERCONTEXTANGLEPROC>(
>+            loadProc("glReleaseShaderCompilerContextANGLE"));
>+    glRenderbufferStorageContextANGLE = reinterpret_cast<PFNGLRENDERBUFFERSTORAGECONTEXTANGLEPROC>(
>+        loadProc("glRenderbufferStorageContextANGLE"));
>+    glSampleCoverageContextANGLE = reinterpret_cast<PFNGLSAMPLECOVERAGECONTEXTANGLEPROC>(
>+        loadProc("glSampleCoverageContextANGLE"));
>+    glScissorContextANGLE =
>+        reinterpret_cast<PFNGLSCISSORCONTEXTANGLEPROC>(loadProc("glScissorContextANGLE"));
>+    glShaderBinaryContextANGLE =
>+        reinterpret_cast<PFNGLSHADERBINARYCONTEXTANGLEPROC>(loadProc("glShaderBinaryContextANGLE"));
>+    glShaderSourceContextANGLE =
>+        reinterpret_cast<PFNGLSHADERSOURCECONTEXTANGLEPROC>(loadProc("glShaderSourceContextANGLE"));
>+    glStencilFuncContextANGLE =
>+        reinterpret_cast<PFNGLSTENCILFUNCCONTEXTANGLEPROC>(loadProc("glStencilFuncContextANGLE"));
>+    glStencilFuncSeparateContextANGLE = reinterpret_cast<PFNGLSTENCILFUNCSEPARATECONTEXTANGLEPROC>(
>+        loadProc("glStencilFuncSeparateContextANGLE"));
>+    glStencilMaskContextANGLE =
>+        reinterpret_cast<PFNGLSTENCILMASKCONTEXTANGLEPROC>(loadProc("glStencilMaskContextANGLE"));
>+    glStencilMaskSeparateContextANGLE = reinterpret_cast<PFNGLSTENCILMASKSEPARATECONTEXTANGLEPROC>(
>+        loadProc("glStencilMaskSeparateContextANGLE"));
>+    glStencilOpContextANGLE =
>+        reinterpret_cast<PFNGLSTENCILOPCONTEXTANGLEPROC>(loadProc("glStencilOpContextANGLE"));
>+    glStencilOpSeparateContextANGLE = reinterpret_cast<PFNGLSTENCILOPSEPARATECONTEXTANGLEPROC>(
>+        loadProc("glStencilOpSeparateContextANGLE"));
>+    glTexImage2DContextANGLE =
>+        reinterpret_cast<PFNGLTEXIMAGE2DCONTEXTANGLEPROC>(loadProc("glTexImage2DContextANGLE"));
>+    glTexParameterfContextANGLE = reinterpret_cast<PFNGLTEXPARAMETERFCONTEXTANGLEPROC>(
>+        loadProc("glTexParameterfContextANGLE"));
>+    glTexParameterfvContextANGLE = reinterpret_cast<PFNGLTEXPARAMETERFVCONTEXTANGLEPROC>(
>+        loadProc("glTexParameterfvContextANGLE"));
>+    glTexParameteriContextANGLE = reinterpret_cast<PFNGLTEXPARAMETERICONTEXTANGLEPROC>(
>+        loadProc("glTexParameteriContextANGLE"));
>+    glTexParameterivContextANGLE = reinterpret_cast<PFNGLTEXPARAMETERIVCONTEXTANGLEPROC>(
>+        loadProc("glTexParameterivContextANGLE"));
>+    glTexSubImage2DContextANGLE = reinterpret_cast<PFNGLTEXSUBIMAGE2DCONTEXTANGLEPROC>(
>+        loadProc("glTexSubImage2DContextANGLE"));
>+    glUniform1fContextANGLE =
>+        reinterpret_cast<PFNGLUNIFORM1FCONTEXTANGLEPROC>(loadProc("glUniform1fContextANGLE"));
>+    glUniform1fvContextANGLE =
>+        reinterpret_cast<PFNGLUNIFORM1FVCONTEXTANGLEPROC>(loadProc("glUniform1fvContextANGLE"));
>+    glUniform1iContextANGLE =
>+        reinterpret_cast<PFNGLUNIFORM1ICONTEXTANGLEPROC>(loadProc("glUniform1iContextANGLE"));
>+    glUniform1ivContextANGLE =
>+        reinterpret_cast<PFNGLUNIFORM1IVCONTEXTANGLEPROC>(loadProc("glUniform1ivContextANGLE"));
>+    glUniform2fContextANGLE =
>+        reinterpret_cast<PFNGLUNIFORM2FCONTEXTANGLEPROC>(loadProc("glUniform2fContextANGLE"));
>+    glUniform2fvContextANGLE =
>+        reinterpret_cast<PFNGLUNIFORM2FVCONTEXTANGLEPROC>(loadProc("glUniform2fvContextANGLE"));
>+    glUniform2iContextANGLE =
>+        reinterpret_cast<PFNGLUNIFORM2ICONTEXTANGLEPROC>(loadProc("glUniform2iContextANGLE"));
>+    glUniform2ivContextANGLE =
>+        reinterpret_cast<PFNGLUNIFORM2IVCONTEXTANGLEPROC>(loadProc("glUniform2ivContextANGLE"));
>+    glUniform3fContextANGLE =
>+        reinterpret_cast<PFNGLUNIFORM3FCONTEXTANGLEPROC>(loadProc("glUniform3fContextANGLE"));
>+    glUniform3fvContextANGLE =
>+        reinterpret_cast<PFNGLUNIFORM3FVCONTEXTANGLEPROC>(loadProc("glUniform3fvContextANGLE"));
>+    glUniform3iContextANGLE =
>+        reinterpret_cast<PFNGLUNIFORM3ICONTEXTANGLEPROC>(loadProc("glUniform3iContextANGLE"));
>+    glUniform3ivContextANGLE =
>+        reinterpret_cast<PFNGLUNIFORM3IVCONTEXTANGLEPROC>(loadProc("glUniform3ivContextANGLE"));
>+    glUniform4fContextANGLE =
>+        reinterpret_cast<PFNGLUNIFORM4FCONTEXTANGLEPROC>(loadProc("glUniform4fContextANGLE"));
>+    glUniform4fvContextANGLE =
>+        reinterpret_cast<PFNGLUNIFORM4FVCONTEXTANGLEPROC>(loadProc("glUniform4fvContextANGLE"));
>+    glUniform4iContextANGLE =
>+        reinterpret_cast<PFNGLUNIFORM4ICONTEXTANGLEPROC>(loadProc("glUniform4iContextANGLE"));
>+    glUniform4ivContextANGLE =
>+        reinterpret_cast<PFNGLUNIFORM4IVCONTEXTANGLEPROC>(loadProc("glUniform4ivContextANGLE"));
>+    glUniformMatrix2fvContextANGLE = reinterpret_cast<PFNGLUNIFORMMATRIX2FVCONTEXTANGLEPROC>(
>+        loadProc("glUniformMatrix2fvContextANGLE"));
>+    glUniformMatrix3fvContextANGLE = reinterpret_cast<PFNGLUNIFORMMATRIX3FVCONTEXTANGLEPROC>(
>+        loadProc("glUniformMatrix3fvContextANGLE"));
>+    glUniformMatrix4fvContextANGLE = reinterpret_cast<PFNGLUNIFORMMATRIX4FVCONTEXTANGLEPROC>(
>+        loadProc("glUniformMatrix4fvContextANGLE"));
>+    glUseProgramContextANGLE =
>+        reinterpret_cast<PFNGLUSEPROGRAMCONTEXTANGLEPROC>(loadProc("glUseProgramContextANGLE"));
>+    glValidateProgramContextANGLE = reinterpret_cast<PFNGLVALIDATEPROGRAMCONTEXTANGLEPROC>(
>+        loadProc("glValidateProgramContextANGLE"));
>+    glVertexAttrib1fContextANGLE = reinterpret_cast<PFNGLVERTEXATTRIB1FCONTEXTANGLEPROC>(
>+        loadProc("glVertexAttrib1fContextANGLE"));
>+    glVertexAttrib1fvContextANGLE = reinterpret_cast<PFNGLVERTEXATTRIB1FVCONTEXTANGLEPROC>(
>+        loadProc("glVertexAttrib1fvContextANGLE"));
>+    glVertexAttrib2fContextANGLE = reinterpret_cast<PFNGLVERTEXATTRIB2FCONTEXTANGLEPROC>(
>+        loadProc("glVertexAttrib2fContextANGLE"));
>+    glVertexAttrib2fvContextANGLE = reinterpret_cast<PFNGLVERTEXATTRIB2FVCONTEXTANGLEPROC>(
>+        loadProc("glVertexAttrib2fvContextANGLE"));
>+    glVertexAttrib3fContextANGLE = reinterpret_cast<PFNGLVERTEXATTRIB3FCONTEXTANGLEPROC>(
>+        loadProc("glVertexAttrib3fContextANGLE"));
>+    glVertexAttrib3fvContextANGLE = reinterpret_cast<PFNGLVERTEXATTRIB3FVCONTEXTANGLEPROC>(
>+        loadProc("glVertexAttrib3fvContextANGLE"));
>+    glVertexAttrib4fContextANGLE = reinterpret_cast<PFNGLVERTEXATTRIB4FCONTEXTANGLEPROC>(
>+        loadProc("glVertexAttrib4fContextANGLE"));
>+    glVertexAttrib4fvContextANGLE = reinterpret_cast<PFNGLVERTEXATTRIB4FVCONTEXTANGLEPROC>(
>+        loadProc("glVertexAttrib4fvContextANGLE"));
>+    glVertexAttribPointerContextANGLE = reinterpret_cast<PFNGLVERTEXATTRIBPOINTERCONTEXTANGLEPROC>(
>+        loadProc("glVertexAttribPointerContextANGLE"));
>+    glViewportContextANGLE =
>+        reinterpret_cast<PFNGLVIEWPORTCONTEXTANGLEPROC>(loadProc("glViewportContextANGLE"));
>+    glReadBufferContextANGLE =
>+        reinterpret_cast<PFNGLREADBUFFERCONTEXTANGLEPROC>(loadProc("glReadBufferContextANGLE"));
>+    glDrawRangeElementsContextANGLE = reinterpret_cast<PFNGLDRAWRANGEELEMENTSCONTEXTANGLEPROC>(
>+        loadProc("glDrawRangeElementsContextANGLE"));
>+    glTexImage3DContextANGLE =
>+        reinterpret_cast<PFNGLTEXIMAGE3DCONTEXTANGLEPROC>(loadProc("glTexImage3DContextANGLE"));
>+    glTexSubImage3DContextANGLE = reinterpret_cast<PFNGLTEXSUBIMAGE3DCONTEXTANGLEPROC>(
>+        loadProc("glTexSubImage3DContextANGLE"));
>+    glCopyTexSubImage3DContextANGLE = reinterpret_cast<PFNGLCOPYTEXSUBIMAGE3DCONTEXTANGLEPROC>(
>+        loadProc("glCopyTexSubImage3DContextANGLE"));
>+    glCompressedTexImage3DContextANGLE =
>+        reinterpret_cast<PFNGLCOMPRESSEDTEXIMAGE3DCONTEXTANGLEPROC>(
>+            loadProc("glCompressedTexImage3DContextANGLE"));
>+    glCompressedTexSubImage3DContextANGLE =
>+        reinterpret_cast<PFNGLCOMPRESSEDTEXSUBIMAGE3DCONTEXTANGLEPROC>(
>+            loadProc("glCompressedTexSubImage3DContextANGLE"));
>+    glGenQueriesContextANGLE =
>+        reinterpret_cast<PFNGLGENQUERIESCONTEXTANGLEPROC>(loadProc("glGenQueriesContextANGLE"));
>+    glDeleteQueriesContextANGLE = reinterpret_cast<PFNGLDELETEQUERIESCONTEXTANGLEPROC>(
>+        loadProc("glDeleteQueriesContextANGLE"));
>+    glIsQueryContextANGLE =
>+        reinterpret_cast<PFNGLISQUERYCONTEXTANGLEPROC>(loadProc("glIsQueryContextANGLE"));
>+    glBeginQueryContextANGLE =
>+        reinterpret_cast<PFNGLBEGINQUERYCONTEXTANGLEPROC>(loadProc("glBeginQueryContextANGLE"));
>+    glEndQueryContextANGLE =
>+        reinterpret_cast<PFNGLENDQUERYCONTEXTANGLEPROC>(loadProc("glEndQueryContextANGLE"));
>+    glGetQueryivContextANGLE =
>+        reinterpret_cast<PFNGLGETQUERYIVCONTEXTANGLEPROC>(loadProc("glGetQueryivContextANGLE"));
>+    glGetQueryObjectuivContextANGLE = reinterpret_cast<PFNGLGETQUERYOBJECTUIVCONTEXTANGLEPROC>(
>+        loadProc("glGetQueryObjectuivContextANGLE"));
>+    glUnmapBufferContextANGLE =
>+        reinterpret_cast<PFNGLUNMAPBUFFERCONTEXTANGLEPROC>(loadProc("glUnmapBufferContextANGLE"));
>+    glGetBufferPointervContextANGLE = reinterpret_cast<PFNGLGETBUFFERPOINTERVCONTEXTANGLEPROC>(
>+        loadProc("glGetBufferPointervContextANGLE"));
>+    glDrawBuffersContextANGLE =
>+        reinterpret_cast<PFNGLDRAWBUFFERSCONTEXTANGLEPROC>(loadProc("glDrawBuffersContextANGLE"));
>+    glUniformMatrix2x3fvContextANGLE = reinterpret_cast<PFNGLUNIFORMMATRIX2X3FVCONTEXTANGLEPROC>(
>+        loadProc("glUniformMatrix2x3fvContextANGLE"));
>+    glUniformMatrix3x2fvContextANGLE = reinterpret_cast<PFNGLUNIFORMMATRIX3X2FVCONTEXTANGLEPROC>(
>+        loadProc("glUniformMatrix3x2fvContextANGLE"));
>+    glUniformMatrix2x4fvContextANGLE = reinterpret_cast<PFNGLUNIFORMMATRIX2X4FVCONTEXTANGLEPROC>(
>+        loadProc("glUniformMatrix2x4fvContextANGLE"));
>+    glUniformMatrix4x2fvContextANGLE = reinterpret_cast<PFNGLUNIFORMMATRIX4X2FVCONTEXTANGLEPROC>(
>+        loadProc("glUniformMatrix4x2fvContextANGLE"));
>+    glUniformMatrix3x4fvContextANGLE = reinterpret_cast<PFNGLUNIFORMMATRIX3X4FVCONTEXTANGLEPROC>(
>+        loadProc("glUniformMatrix3x4fvContextANGLE"));
>+    glUniformMatrix4x3fvContextANGLE = reinterpret_cast<PFNGLUNIFORMMATRIX4X3FVCONTEXTANGLEPROC>(
>+        loadProc("glUniformMatrix4x3fvContextANGLE"));
>+    glBlitFramebufferContextANGLE = reinterpret_cast<PFNGLBLITFRAMEBUFFERCONTEXTANGLEPROC>(
>+        loadProc("glBlitFramebufferContextANGLE"));
>+    glRenderbufferStorageMultisampleContextANGLE =
>+        reinterpret_cast<PFNGLRENDERBUFFERSTORAGEMULTISAMPLECONTEXTANGLEPROC>(
>+            loadProc("glRenderbufferStorageMultisampleContextANGLE"));
>+    glFramebufferTextureLayerContextANGLE =
>+        reinterpret_cast<PFNGLFRAMEBUFFERTEXTURELAYERCONTEXTANGLEPROC>(
>+            loadProc("glFramebufferTextureLayerContextANGLE"));
>+    glMapBufferRangeContextANGLE = reinterpret_cast<PFNGLMAPBUFFERRANGECONTEXTANGLEPROC>(
>+        loadProc("glMapBufferRangeContextANGLE"));
>+    glFlushMappedBufferRangeContextANGLE =
>+        reinterpret_cast<PFNGLFLUSHMAPPEDBUFFERRANGECONTEXTANGLEPROC>(
>+            loadProc("glFlushMappedBufferRangeContextANGLE"));
>+    glBindVertexArrayContextANGLE = reinterpret_cast<PFNGLBINDVERTEXARRAYCONTEXTANGLEPROC>(
>+        loadProc("glBindVertexArrayContextANGLE"));
>+    glDeleteVertexArraysContextANGLE = reinterpret_cast<PFNGLDELETEVERTEXARRAYSCONTEXTANGLEPROC>(
>+        loadProc("glDeleteVertexArraysContextANGLE"));
>+    glGenVertexArraysContextANGLE = reinterpret_cast<PFNGLGENVERTEXARRAYSCONTEXTANGLEPROC>(
>+        loadProc("glGenVertexArraysContextANGLE"));
>+    glIsVertexArrayContextANGLE = reinterpret_cast<PFNGLISVERTEXARRAYCONTEXTANGLEPROC>(
>+        loadProc("glIsVertexArrayContextANGLE"));
>+    glGetIntegeri_vContextANGLE = reinterpret_cast<PFNGLGETINTEGERI_VCONTEXTANGLEPROC>(
>+        loadProc("glGetIntegeri_vContextANGLE"));
>+    glBeginTransformFeedbackContextANGLE =
>+        reinterpret_cast<PFNGLBEGINTRANSFORMFEEDBACKCONTEXTANGLEPROC>(
>+            loadProc("glBeginTransformFeedbackContextANGLE"));
>+    glEndTransformFeedbackContextANGLE =
>+        reinterpret_cast<PFNGLENDTRANSFORMFEEDBACKCONTEXTANGLEPROC>(
>+            loadProc("glEndTransformFeedbackContextANGLE"));
>+    glBindBufferRangeContextANGLE = reinterpret_cast<PFNGLBINDBUFFERRANGECONTEXTANGLEPROC>(
>+        loadProc("glBindBufferRangeContextANGLE"));
>+    glBindBufferBaseContextANGLE = reinterpret_cast<PFNGLBINDBUFFERBASECONTEXTANGLEPROC>(
>+        loadProc("glBindBufferBaseContextANGLE"));
>+    glTransformFeedbackVaryingsContextANGLE =
>+        reinterpret_cast<PFNGLTRANSFORMFEEDBACKVARYINGSCONTEXTANGLEPROC>(
>+            loadProc("glTransformFeedbackVaryingsContextANGLE"));
>+    glGetTransformFeedbackVaryingContextANGLE =
>+        reinterpret_cast<PFNGLGETTRANSFORMFEEDBACKVARYINGCONTEXTANGLEPROC>(
>+            loadProc("glGetTransformFeedbackVaryingContextANGLE"));
>+    glVertexAttribIPointerContextANGLE =
>+        reinterpret_cast<PFNGLVERTEXATTRIBIPOINTERCONTEXTANGLEPROC>(
>+            loadProc("glVertexAttribIPointerContextANGLE"));
>+    glGetVertexAttribIivContextANGLE = reinterpret_cast<PFNGLGETVERTEXATTRIBIIVCONTEXTANGLEPROC>(
>+        loadProc("glGetVertexAttribIivContextANGLE"));
>+    glGetVertexAttribIuivContextANGLE = reinterpret_cast<PFNGLGETVERTEXATTRIBIUIVCONTEXTANGLEPROC>(
>+        loadProc("glGetVertexAttribIuivContextANGLE"));
>+    glVertexAttribI4iContextANGLE = reinterpret_cast<PFNGLVERTEXATTRIBI4ICONTEXTANGLEPROC>(
>+        loadProc("glVertexAttribI4iContextANGLE"));
>+    glVertexAttribI4uiContextANGLE = reinterpret_cast<PFNGLVERTEXATTRIBI4UICONTEXTANGLEPROC>(
>+        loadProc("glVertexAttribI4uiContextANGLE"));
>+    glVertexAttribI4ivContextANGLE = reinterpret_cast<PFNGLVERTEXATTRIBI4IVCONTEXTANGLEPROC>(
>+        loadProc("glVertexAttribI4ivContextANGLE"));
>+    glVertexAttribI4uivContextANGLE = reinterpret_cast<PFNGLVERTEXATTRIBI4UIVCONTEXTANGLEPROC>(
>+        loadProc("glVertexAttribI4uivContextANGLE"));
>+    glGetUniformuivContextANGLE = reinterpret_cast<PFNGLGETUNIFORMUIVCONTEXTANGLEPROC>(
>+        loadProc("glGetUniformuivContextANGLE"));
>+    glGetFragDataLocationContextANGLE = reinterpret_cast<PFNGLGETFRAGDATALOCATIONCONTEXTANGLEPROC>(
>+        loadProc("glGetFragDataLocationContextANGLE"));
>+    glUniform1uiContextANGLE =
>+        reinterpret_cast<PFNGLUNIFORM1UICONTEXTANGLEPROC>(loadProc("glUniform1uiContextANGLE"));
>+    glUniform2uiContextANGLE =
>+        reinterpret_cast<PFNGLUNIFORM2UICONTEXTANGLEPROC>(loadProc("glUniform2uiContextANGLE"));
>+    glUniform3uiContextANGLE =
>+        reinterpret_cast<PFNGLUNIFORM3UICONTEXTANGLEPROC>(loadProc("glUniform3uiContextANGLE"));
>+    glUniform4uiContextANGLE =
>+        reinterpret_cast<PFNGLUNIFORM4UICONTEXTANGLEPROC>(loadProc("glUniform4uiContextANGLE"));
>+    glUniform1uivContextANGLE =
>+        reinterpret_cast<PFNGLUNIFORM1UIVCONTEXTANGLEPROC>(loadProc("glUniform1uivContextANGLE"));
>+    glUniform2uivContextANGLE =
>+        reinterpret_cast<PFNGLUNIFORM2UIVCONTEXTANGLEPROC>(loadProc("glUniform2uivContextANGLE"));
>+    glUniform3uivContextANGLE =
>+        reinterpret_cast<PFNGLUNIFORM3UIVCONTEXTANGLEPROC>(loadProc("glUniform3uivContextANGLE"));
>+    glUniform4uivContextANGLE =
>+        reinterpret_cast<PFNGLUNIFORM4UIVCONTEXTANGLEPROC>(loadProc("glUniform4uivContextANGLE"));
>+    glClearBufferivContextANGLE = reinterpret_cast<PFNGLCLEARBUFFERIVCONTEXTANGLEPROC>(
>+        loadProc("glClearBufferivContextANGLE"));
>+    glClearBufferuivContextANGLE = reinterpret_cast<PFNGLCLEARBUFFERUIVCONTEXTANGLEPROC>(
>+        loadProc("glClearBufferuivContextANGLE"));
>+    glClearBufferfvContextANGLE = reinterpret_cast<PFNGLCLEARBUFFERFVCONTEXTANGLEPROC>(
>+        loadProc("glClearBufferfvContextANGLE"));
>+    glClearBufferfiContextANGLE = reinterpret_cast<PFNGLCLEARBUFFERFICONTEXTANGLEPROC>(
>+        loadProc("glClearBufferfiContextANGLE"));
>+    glGetStringiContextANGLE =
>+        reinterpret_cast<PFNGLGETSTRINGICONTEXTANGLEPROC>(loadProc("glGetStringiContextANGLE"));
>+    glCopyBufferSubDataContextANGLE = reinterpret_cast<PFNGLCOPYBUFFERSUBDATACONTEXTANGLEPROC>(
>+        loadProc("glCopyBufferSubDataContextANGLE"));
>+    glGetUniformIndicesContextANGLE = reinterpret_cast<PFNGLGETUNIFORMINDICESCONTEXTANGLEPROC>(
>+        loadProc("glGetUniformIndicesContextANGLE"));
>+    glGetActiveUniformsivContextANGLE = reinterpret_cast<PFNGLGETACTIVEUNIFORMSIVCONTEXTANGLEPROC>(
>+        loadProc("glGetActiveUniformsivContextANGLE"));
>+    glGetUniformBlockIndexContextANGLE =
>+        reinterpret_cast<PFNGLGETUNIFORMBLOCKINDEXCONTEXTANGLEPROC>(
>+            loadProc("glGetUniformBlockIndexContextANGLE"));
>+    glGetActiveUniformBlockivContextANGLE =
>+        reinterpret_cast<PFNGLGETACTIVEUNIFORMBLOCKIVCONTEXTANGLEPROC>(
>+            loadProc("glGetActiveUniformBlockivContextANGLE"));
>+    glGetActiveUniformBlockNameContextANGLE =
>+        reinterpret_cast<PFNGLGETACTIVEUNIFORMBLOCKNAMECONTEXTANGLEPROC>(
>+            loadProc("glGetActiveUniformBlockNameContextANGLE"));
>+    glUniformBlockBindingContextANGLE = reinterpret_cast<PFNGLUNIFORMBLOCKBINDINGCONTEXTANGLEPROC>(
>+        loadProc("glUniformBlockBindingContextANGLE"));
>+    glDrawArraysInstancedContextANGLE = reinterpret_cast<PFNGLDRAWARRAYSINSTANCEDCONTEXTANGLEPROC>(
>+        loadProc("glDrawArraysInstancedContextANGLE"));
>+    glDrawElementsInstancedContextANGLE =
>+        reinterpret_cast<PFNGLDRAWELEMENTSINSTANCEDCONTEXTANGLEPROC>(
>+            loadProc("glDrawElementsInstancedContextANGLE"));
>+    glFenceSyncContextANGLE =
>+        reinterpret_cast<PFNGLFENCESYNCCONTEXTANGLEPROC>(loadProc("glFenceSyncContextANGLE"));
>+    glIsSyncContextANGLE =
>+        reinterpret_cast<PFNGLISSYNCCONTEXTANGLEPROC>(loadProc("glIsSyncContextANGLE"));
>+    glDeleteSyncContextANGLE =
>+        reinterpret_cast<PFNGLDELETESYNCCONTEXTANGLEPROC>(loadProc("glDeleteSyncContextANGLE"));
>+    glClientWaitSyncContextANGLE = reinterpret_cast<PFNGLCLIENTWAITSYNCCONTEXTANGLEPROC>(
>+        loadProc("glClientWaitSyncContextANGLE"));
>+    glWaitSyncContextANGLE =
>+        reinterpret_cast<PFNGLWAITSYNCCONTEXTANGLEPROC>(loadProc("glWaitSyncContextANGLE"));
>+    glGetInteger64vContextANGLE = reinterpret_cast<PFNGLGETINTEGER64VCONTEXTANGLEPROC>(
>+        loadProc("glGetInteger64vContextANGLE"));
>+    glGetSyncivContextANGLE =
>+        reinterpret_cast<PFNGLGETSYNCIVCONTEXTANGLEPROC>(loadProc("glGetSyncivContextANGLE"));
>+    glGetInteger64i_vContextANGLE = reinterpret_cast<PFNGLGETINTEGER64I_VCONTEXTANGLEPROC>(
>+        loadProc("glGetInteger64i_vContextANGLE"));
>+    glGetBufferParameteri64vContextANGLE =
>+        reinterpret_cast<PFNGLGETBUFFERPARAMETERI64VCONTEXTANGLEPROC>(
>+            loadProc("glGetBufferParameteri64vContextANGLE"));
>+    glGenSamplersContextANGLE =
>+        reinterpret_cast<PFNGLGENSAMPLERSCONTEXTANGLEPROC>(loadProc("glGenSamplersContextANGLE"));
>+    glDeleteSamplersContextANGLE = reinterpret_cast<PFNGLDELETESAMPLERSCONTEXTANGLEPROC>(
>+        loadProc("glDeleteSamplersContextANGLE"));
>+    glIsSamplerContextANGLE =
>+        reinterpret_cast<PFNGLISSAMPLERCONTEXTANGLEPROC>(loadProc("glIsSamplerContextANGLE"));
>+    glBindSamplerContextANGLE =
>+        reinterpret_cast<PFNGLBINDSAMPLERCONTEXTANGLEPROC>(loadProc("glBindSamplerContextANGLE"));
>+    glSamplerParameteriContextANGLE = reinterpret_cast<PFNGLSAMPLERPARAMETERICONTEXTANGLEPROC>(
>+        loadProc("glSamplerParameteriContextANGLE"));
>+    glSamplerParameterivContextANGLE = reinterpret_cast<PFNGLSAMPLERPARAMETERIVCONTEXTANGLEPROC>(
>+        loadProc("glSamplerParameterivContextANGLE"));
>+    glSamplerParameterfContextANGLE = reinterpret_cast<PFNGLSAMPLERPARAMETERFCONTEXTANGLEPROC>(
>+        loadProc("glSamplerParameterfContextANGLE"));
>+    glSamplerParameterfvContextANGLE = reinterpret_cast<PFNGLSAMPLERPARAMETERFVCONTEXTANGLEPROC>(
>+        loadProc("glSamplerParameterfvContextANGLE"));
>+    glGetSamplerParameterivContextANGLE =
>+        reinterpret_cast<PFNGLGETSAMPLERPARAMETERIVCONTEXTANGLEPROC>(
>+            loadProc("glGetSamplerParameterivContextANGLE"));
>+    glGetSamplerParameterfvContextANGLE =
>+        reinterpret_cast<PFNGLGETSAMPLERPARAMETERFVCONTEXTANGLEPROC>(
>+            loadProc("glGetSamplerParameterfvContextANGLE"));
>+    glVertexAttribDivisorContextANGLE = reinterpret_cast<PFNGLVERTEXATTRIBDIVISORCONTEXTANGLEPROC>(
>+        loadProc("glVertexAttribDivisorContextANGLE"));
>+    glBindTransformFeedbackContextANGLE =
>+        reinterpret_cast<PFNGLBINDTRANSFORMFEEDBACKCONTEXTANGLEPROC>(
>+            loadProc("glBindTransformFeedbackContextANGLE"));
>+    glDeleteTransformFeedbacksContextANGLE =
>+        reinterpret_cast<PFNGLDELETETRANSFORMFEEDBACKSCONTEXTANGLEPROC>(
>+            loadProc("glDeleteTransformFeedbacksContextANGLE"));
>+    glGenTransformFeedbacksContextANGLE =
>+        reinterpret_cast<PFNGLGENTRANSFORMFEEDBACKSCONTEXTANGLEPROC>(
>+            loadProc("glGenTransformFeedbacksContextANGLE"));
>+    glIsTransformFeedbackContextANGLE = reinterpret_cast<PFNGLISTRANSFORMFEEDBACKCONTEXTANGLEPROC>(
>+        loadProc("glIsTransformFeedbackContextANGLE"));
>+    glPauseTransformFeedbackContextANGLE =
>+        reinterpret_cast<PFNGLPAUSETRANSFORMFEEDBACKCONTEXTANGLEPROC>(
>+            loadProc("glPauseTransformFeedbackContextANGLE"));
>+    glResumeTransformFeedbackContextANGLE =
>+        reinterpret_cast<PFNGLRESUMETRANSFORMFEEDBACKCONTEXTANGLEPROC>(
>+            loadProc("glResumeTransformFeedbackContextANGLE"));
>+    glGetProgramBinaryContextANGLE = reinterpret_cast<PFNGLGETPROGRAMBINARYCONTEXTANGLEPROC>(
>+        loadProc("glGetProgramBinaryContextANGLE"));
>+    glProgramBinaryContextANGLE = reinterpret_cast<PFNGLPROGRAMBINARYCONTEXTANGLEPROC>(
>+        loadProc("glProgramBinaryContextANGLE"));
>+    glProgramParameteriContextANGLE = reinterpret_cast<PFNGLPROGRAMPARAMETERICONTEXTANGLEPROC>(
>+        loadProc("glProgramParameteriContextANGLE"));
>+    glInvalidateFramebufferContextANGLE =
>+        reinterpret_cast<PFNGLINVALIDATEFRAMEBUFFERCONTEXTANGLEPROC>(
>+            loadProc("glInvalidateFramebufferContextANGLE"));
>+    glInvalidateSubFramebufferContextANGLE =
>+        reinterpret_cast<PFNGLINVALIDATESUBFRAMEBUFFERCONTEXTANGLEPROC>(
>+            loadProc("glInvalidateSubFramebufferContextANGLE"));
>+    glTexStorage2DContextANGLE =
>+        reinterpret_cast<PFNGLTEXSTORAGE2DCONTEXTANGLEPROC>(loadProc("glTexStorage2DContextANGLE"));
>+    glTexStorage3DContextANGLE =
>+        reinterpret_cast<PFNGLTEXSTORAGE3DCONTEXTANGLEPROC>(loadProc("glTexStorage3DContextANGLE"));
>+    glGetInternalformativContextANGLE = reinterpret_cast<PFNGLGETINTERNALFORMATIVCONTEXTANGLEPROC>(
>+        loadProc("glGetInternalformativContextANGLE"));
>+    glDispatchComputeContextANGLE = reinterpret_cast<PFNGLDISPATCHCOMPUTECONTEXTANGLEPROC>(
>+        loadProc("glDispatchComputeContextANGLE"));
>+    glDispatchComputeIndirectContextANGLE =
>+        reinterpret_cast<PFNGLDISPATCHCOMPUTEINDIRECTCONTEXTANGLEPROC>(
>+            loadProc("glDispatchComputeIndirectContextANGLE"));
>+    glDrawArraysIndirectContextANGLE = reinterpret_cast<PFNGLDRAWARRAYSINDIRECTCONTEXTANGLEPROC>(
>+        loadProc("glDrawArraysIndirectContextANGLE"));
>+    glDrawElementsIndirectContextANGLE =
>+        reinterpret_cast<PFNGLDRAWELEMENTSINDIRECTCONTEXTANGLEPROC>(
>+            loadProc("glDrawElementsIndirectContextANGLE"));
>+    glFramebufferParameteriContextANGLE =
>+        reinterpret_cast<PFNGLFRAMEBUFFERPARAMETERICONTEXTANGLEPROC>(
>+            loadProc("glFramebufferParameteriContextANGLE"));
>+    glGetFramebufferParameterivContextANGLE =
>+        reinterpret_cast<PFNGLGETFRAMEBUFFERPARAMETERIVCONTEXTANGLEPROC>(
>+            loadProc("glGetFramebufferParameterivContextANGLE"));
>+    glGetProgramInterfaceivContextANGLE =
>+        reinterpret_cast<PFNGLGETPROGRAMINTERFACEIVCONTEXTANGLEPROC>(
>+            loadProc("glGetProgramInterfaceivContextANGLE"));
>+    glGetProgramResourceIndexContextANGLE =
>+        reinterpret_cast<PFNGLGETPROGRAMRESOURCEINDEXCONTEXTANGLEPROC>(
>+            loadProc("glGetProgramResourceIndexContextANGLE"));
>+    glGetProgramResourceNameContextANGLE =
>+        reinterpret_cast<PFNGLGETPROGRAMRESOURCENAMECONTEXTANGLEPROC>(
>+            loadProc("glGetProgramResourceNameContextANGLE"));
>+    glGetProgramResourceivContextANGLE =
>+        reinterpret_cast<PFNGLGETPROGRAMRESOURCEIVCONTEXTANGLEPROC>(
>+            loadProc("glGetProgramResourceivContextANGLE"));
>+    glGetProgramResourceLocationContextANGLE =
>+        reinterpret_cast<PFNGLGETPROGRAMRESOURCELOCATIONCONTEXTANGLEPROC>(
>+            loadProc("glGetProgramResourceLocationContextANGLE"));
>+    glUseProgramStagesContextANGLE = reinterpret_cast<PFNGLUSEPROGRAMSTAGESCONTEXTANGLEPROC>(
>+        loadProc("glUseProgramStagesContextANGLE"));
>+    glActiveShaderProgramContextANGLE = reinterpret_cast<PFNGLACTIVESHADERPROGRAMCONTEXTANGLEPROC>(
>+        loadProc("glActiveShaderProgramContextANGLE"));
>+    glCreateShaderProgramvContextANGLE =
>+        reinterpret_cast<PFNGLCREATESHADERPROGRAMVCONTEXTANGLEPROC>(
>+            loadProc("glCreateShaderProgramvContextANGLE"));
>+    glBindProgramPipelineContextANGLE = reinterpret_cast<PFNGLBINDPROGRAMPIPELINECONTEXTANGLEPROC>(
>+        loadProc("glBindProgramPipelineContextANGLE"));
>+    glDeleteProgramPipelinesContextANGLE =
>+        reinterpret_cast<PFNGLDELETEPROGRAMPIPELINESCONTEXTANGLEPROC>(
>+            loadProc("glDeleteProgramPipelinesContextANGLE"));
>+    glGenProgramPipelinesContextANGLE = reinterpret_cast<PFNGLGENPROGRAMPIPELINESCONTEXTANGLEPROC>(
>+        loadProc("glGenProgramPipelinesContextANGLE"));
>+    glIsProgramPipelineContextANGLE = reinterpret_cast<PFNGLISPROGRAMPIPELINECONTEXTANGLEPROC>(
>+        loadProc("glIsProgramPipelineContextANGLE"));
>+    glGetProgramPipelineivContextANGLE =
>+        reinterpret_cast<PFNGLGETPROGRAMPIPELINEIVCONTEXTANGLEPROC>(
>+            loadProc("glGetProgramPipelineivContextANGLE"));
>+    glProgramUniform1iContextANGLE = reinterpret_cast<PFNGLPROGRAMUNIFORM1ICONTEXTANGLEPROC>(
>+        loadProc("glProgramUniform1iContextANGLE"));
>+    glProgramUniform2iContextANGLE = reinterpret_cast<PFNGLPROGRAMUNIFORM2ICONTEXTANGLEPROC>(
>+        loadProc("glProgramUniform2iContextANGLE"));
>+    glProgramUniform3iContextANGLE = reinterpret_cast<PFNGLPROGRAMUNIFORM3ICONTEXTANGLEPROC>(
>+        loadProc("glProgramUniform3iContextANGLE"));
>+    glProgramUniform4iContextANGLE = reinterpret_cast<PFNGLPROGRAMUNIFORM4ICONTEXTANGLEPROC>(
>+        loadProc("glProgramUniform4iContextANGLE"));
>+    glProgramUniform1uiContextANGLE = reinterpret_cast<PFNGLPROGRAMUNIFORM1UICONTEXTANGLEPROC>(
>+        loadProc("glProgramUniform1uiContextANGLE"));
>+    glProgramUniform2uiContextANGLE = reinterpret_cast<PFNGLPROGRAMUNIFORM2UICONTEXTANGLEPROC>(
>+        loadProc("glProgramUniform2uiContextANGLE"));
>+    glProgramUniform3uiContextANGLE = reinterpret_cast<PFNGLPROGRAMUNIFORM3UICONTEXTANGLEPROC>(
>+        loadProc("glProgramUniform3uiContextANGLE"));
>+    glProgramUniform4uiContextANGLE = reinterpret_cast<PFNGLPROGRAMUNIFORM4UICONTEXTANGLEPROC>(
>+        loadProc("glProgramUniform4uiContextANGLE"));
>+    glProgramUniform1fContextANGLE = reinterpret_cast<PFNGLPROGRAMUNIFORM1FCONTEXTANGLEPROC>(
>+        loadProc("glProgramUniform1fContextANGLE"));
>+    glProgramUniform2fContextANGLE = reinterpret_cast<PFNGLPROGRAMUNIFORM2FCONTEXTANGLEPROC>(
>+        loadProc("glProgramUniform2fContextANGLE"));
>+    glProgramUniform3fContextANGLE = reinterpret_cast<PFNGLPROGRAMUNIFORM3FCONTEXTANGLEPROC>(
>+        loadProc("glProgramUniform3fContextANGLE"));
>+    glProgramUniform4fContextANGLE = reinterpret_cast<PFNGLPROGRAMUNIFORM4FCONTEXTANGLEPROC>(
>+        loadProc("glProgramUniform4fContextANGLE"));
>+    glProgramUniform1ivContextANGLE = reinterpret_cast<PFNGLPROGRAMUNIFORM1IVCONTEXTANGLEPROC>(
>+        loadProc("glProgramUniform1ivContextANGLE"));
>+    glProgramUniform2ivContextANGLE = reinterpret_cast<PFNGLPROGRAMUNIFORM2IVCONTEXTANGLEPROC>(
>+        loadProc("glProgramUniform2ivContextANGLE"));
>+    glProgramUniform3ivContextANGLE = reinterpret_cast<PFNGLPROGRAMUNIFORM3IVCONTEXTANGLEPROC>(
>+        loadProc("glProgramUniform3ivContextANGLE"));
>+    glProgramUniform4ivContextANGLE = reinterpret_cast<PFNGLPROGRAMUNIFORM4IVCONTEXTANGLEPROC>(
>+        loadProc("glProgramUniform4ivContextANGLE"));
>+    glProgramUniform1uivContextANGLE = reinterpret_cast<PFNGLPROGRAMUNIFORM1UIVCONTEXTANGLEPROC>(
>+        loadProc("glProgramUniform1uivContextANGLE"));
>+    glProgramUniform2uivContextANGLE = reinterpret_cast<PFNGLPROGRAMUNIFORM2UIVCONTEXTANGLEPROC>(
>+        loadProc("glProgramUniform2uivContextANGLE"));
>+    glProgramUniform3uivContextANGLE = reinterpret_cast<PFNGLPROGRAMUNIFORM3UIVCONTEXTANGLEPROC>(
>+        loadProc("glProgramUniform3uivContextANGLE"));
>+    glProgramUniform4uivContextANGLE = reinterpret_cast<PFNGLPROGRAMUNIFORM4UIVCONTEXTANGLEPROC>(
>+        loadProc("glProgramUniform4uivContextANGLE"));
>+    glProgramUniform1fvContextANGLE = reinterpret_cast<PFNGLPROGRAMUNIFORM1FVCONTEXTANGLEPROC>(
>+        loadProc("glProgramUniform1fvContextANGLE"));
>+    glProgramUniform2fvContextANGLE = reinterpret_cast<PFNGLPROGRAMUNIFORM2FVCONTEXTANGLEPROC>(
>+        loadProc("glProgramUniform2fvContextANGLE"));
>+    glProgramUniform3fvContextANGLE = reinterpret_cast<PFNGLPROGRAMUNIFORM3FVCONTEXTANGLEPROC>(
>+        loadProc("glProgramUniform3fvContextANGLE"));
>+    glProgramUniform4fvContextANGLE = reinterpret_cast<PFNGLPROGRAMUNIFORM4FVCONTEXTANGLEPROC>(
>+        loadProc("glProgramUniform4fvContextANGLE"));
>+    glProgramUniformMatrix2fvContextANGLE =
>+        reinterpret_cast<PFNGLPROGRAMUNIFORMMATRIX2FVCONTEXTANGLEPROC>(
>+            loadProc("glProgramUniformMatrix2fvContextANGLE"));
>+    glProgramUniformMatrix3fvContextANGLE =
>+        reinterpret_cast<PFNGLPROGRAMUNIFORMMATRIX3FVCONTEXTANGLEPROC>(
>+            loadProc("glProgramUniformMatrix3fvContextANGLE"));
>+    glProgramUniformMatrix4fvContextANGLE =
>+        reinterpret_cast<PFNGLPROGRAMUNIFORMMATRIX4FVCONTEXTANGLEPROC>(
>+            loadProc("glProgramUniformMatrix4fvContextANGLE"));
>+    glProgramUniformMatrix2x3fvContextANGLE =
>+        reinterpret_cast<PFNGLPROGRAMUNIFORMMATRIX2X3FVCONTEXTANGLEPROC>(
>+            loadProc("glProgramUniformMatrix2x3fvContextANGLE"));
>+    glProgramUniformMatrix3x2fvContextANGLE =
>+        reinterpret_cast<PFNGLPROGRAMUNIFORMMATRIX3X2FVCONTEXTANGLEPROC>(
>+            loadProc("glProgramUniformMatrix3x2fvContextANGLE"));
>+    glProgramUniformMatrix2x4fvContextANGLE =
>+        reinterpret_cast<PFNGLPROGRAMUNIFORMMATRIX2X4FVCONTEXTANGLEPROC>(
>+            loadProc("glProgramUniformMatrix2x4fvContextANGLE"));
>+    glProgramUniformMatrix4x2fvContextANGLE =
>+        reinterpret_cast<PFNGLPROGRAMUNIFORMMATRIX4X2FVCONTEXTANGLEPROC>(
>+            loadProc("glProgramUniformMatrix4x2fvContextANGLE"));
>+    glProgramUniformMatrix3x4fvContextANGLE =
>+        reinterpret_cast<PFNGLPROGRAMUNIFORMMATRIX3X4FVCONTEXTANGLEPROC>(
>+            loadProc("glProgramUniformMatrix3x4fvContextANGLE"));
>+    glProgramUniformMatrix4x3fvContextANGLE =
>+        reinterpret_cast<PFNGLPROGRAMUNIFORMMATRIX4X3FVCONTEXTANGLEPROC>(
>+            loadProc("glProgramUniformMatrix4x3fvContextANGLE"));
>+    glValidateProgramPipelineContextANGLE =
>+        reinterpret_cast<PFNGLVALIDATEPROGRAMPIPELINECONTEXTANGLEPROC>(
>+            loadProc("glValidateProgramPipelineContextANGLE"));
>+    glGetProgramPipelineInfoLogContextANGLE =
>+        reinterpret_cast<PFNGLGETPROGRAMPIPELINEINFOLOGCONTEXTANGLEPROC>(
>+            loadProc("glGetProgramPipelineInfoLogContextANGLE"));
>+    glBindImageTextureContextANGLE = reinterpret_cast<PFNGLBINDIMAGETEXTURECONTEXTANGLEPROC>(
>+        loadProc("glBindImageTextureContextANGLE"));
>+    glGetBooleani_vContextANGLE = reinterpret_cast<PFNGLGETBOOLEANI_VCONTEXTANGLEPROC>(
>+        loadProc("glGetBooleani_vContextANGLE"));
>+    glMemoryBarrierContextANGLE = reinterpret_cast<PFNGLMEMORYBARRIERCONTEXTANGLEPROC>(
>+        loadProc("glMemoryBarrierContextANGLE"));
>+    glMemoryBarrierByRegionContextANGLE =
>+        reinterpret_cast<PFNGLMEMORYBARRIERBYREGIONCONTEXTANGLEPROC>(
>+            loadProc("glMemoryBarrierByRegionContextANGLE"));
>+    glTexStorage2DMultisampleContextANGLE =
>+        reinterpret_cast<PFNGLTEXSTORAGE2DMULTISAMPLECONTEXTANGLEPROC>(
>+            loadProc("glTexStorage2DMultisampleContextANGLE"));
>+    glGetMultisamplefvContextANGLE = reinterpret_cast<PFNGLGETMULTISAMPLEFVCONTEXTANGLEPROC>(
>+        loadProc("glGetMultisamplefvContextANGLE"));
>+    glSampleMaskiContextANGLE =
>+        reinterpret_cast<PFNGLSAMPLEMASKICONTEXTANGLEPROC>(loadProc("glSampleMaskiContextANGLE"));
>+    glGetTexLevelParameterivContextANGLE =
>+        reinterpret_cast<PFNGLGETTEXLEVELPARAMETERIVCONTEXTANGLEPROC>(
>+            loadProc("glGetTexLevelParameterivContextANGLE"));
>+    glGetTexLevelParameterfvContextANGLE =
>+        reinterpret_cast<PFNGLGETTEXLEVELPARAMETERFVCONTEXTANGLEPROC>(
>+            loadProc("glGetTexLevelParameterfvContextANGLE"));
>+    glBindVertexBufferContextANGLE = reinterpret_cast<PFNGLBINDVERTEXBUFFERCONTEXTANGLEPROC>(
>+        loadProc("glBindVertexBufferContextANGLE"));
>+    glVertexAttribFormatContextANGLE = reinterpret_cast<PFNGLVERTEXATTRIBFORMATCONTEXTANGLEPROC>(
>+        loadProc("glVertexAttribFormatContextANGLE"));
>+    glVertexAttribIFormatContextANGLE = reinterpret_cast<PFNGLVERTEXATTRIBIFORMATCONTEXTANGLEPROC>(
>+        loadProc("glVertexAttribIFormatContextANGLE"));
>+    glVertexAttribBindingContextANGLE = reinterpret_cast<PFNGLVERTEXATTRIBBINDINGCONTEXTANGLEPROC>(
>+        loadProc("glVertexAttribBindingContextANGLE"));
>+    glVertexBindingDivisorContextANGLE =
>+        reinterpret_cast<PFNGLVERTEXBINDINGDIVISORCONTEXTANGLEPROC>(
>+            loadProc("glVertexBindingDivisorContextANGLE"));
>+    glCopySubTexture3DANGLEContextANGLE =
>+        reinterpret_cast<PFNGLCOPYSUBTEXTURE3DANGLECONTEXTANGLEPROC>(
>+            loadProc("glCopySubTexture3DANGLEContextANGLE"));
>+    glCopyTexture3DANGLEContextANGLE = reinterpret_cast<PFNGLCOPYTEXTURE3DANGLECONTEXTANGLEPROC>(
>+        loadProc("glCopyTexture3DANGLEContextANGLE"));
>+    glBlitFramebufferANGLEContextANGLE =
>+        reinterpret_cast<PFNGLBLITFRAMEBUFFERANGLECONTEXTANGLEPROC>(
>+            loadProc("glBlitFramebufferANGLEContextANGLE"));
>+    glRenderbufferStorageMultisampleANGLEContextANGLE =
>+        reinterpret_cast<PFNGLRENDERBUFFERSTORAGEMULTISAMPLEANGLECONTEXTANGLEPROC>(
>+            loadProc("glRenderbufferStorageMultisampleANGLEContextANGLE"));
>+    glDrawArraysInstancedANGLEContextANGLE =
>+        reinterpret_cast<PFNGLDRAWARRAYSINSTANCEDANGLECONTEXTANGLEPROC>(
>+            loadProc("glDrawArraysInstancedANGLEContextANGLE"));
>+    glDrawElementsInstancedANGLEContextANGLE =
>+        reinterpret_cast<PFNGLDRAWELEMENTSINSTANCEDANGLECONTEXTANGLEPROC>(
>+            loadProc("glDrawElementsInstancedANGLEContextANGLE"));
>+    glVertexAttribDivisorANGLEContextANGLE =
>+        reinterpret_cast<PFNGLVERTEXATTRIBDIVISORANGLECONTEXTANGLEPROC>(
>+            loadProc("glVertexAttribDivisorANGLEContextANGLE"));
>+    glMultiDrawArraysANGLEContextANGLE =
>+        reinterpret_cast<PFNGLMULTIDRAWARRAYSANGLECONTEXTANGLEPROC>(
>+            loadProc("glMultiDrawArraysANGLEContextANGLE"));
>+    glMultiDrawArraysInstancedANGLEContextANGLE =
>+        reinterpret_cast<PFNGLMULTIDRAWARRAYSINSTANCEDANGLECONTEXTANGLEPROC>(
>+            loadProc("glMultiDrawArraysInstancedANGLEContextANGLE"));
>+    glMultiDrawElementsANGLEContextANGLE =
>+        reinterpret_cast<PFNGLMULTIDRAWELEMENTSANGLECONTEXTANGLEPROC>(
>+            loadProc("glMultiDrawElementsANGLEContextANGLE"));
>+    glMultiDrawElementsInstancedANGLEContextANGLE =
>+        reinterpret_cast<PFNGLMULTIDRAWELEMENTSINSTANCEDANGLECONTEXTANGLEPROC>(
>+            loadProc("glMultiDrawElementsInstancedANGLEContextANGLE"));
>+    glProvokingVertexANGLEContextANGLE =
>+        reinterpret_cast<PFNGLPROVOKINGVERTEXANGLECONTEXTANGLEPROC>(
>+            loadProc("glProvokingVertexANGLEContextANGLE"));
>+    glRequestExtensionANGLEContextANGLE =
>+        reinterpret_cast<PFNGLREQUESTEXTENSIONANGLECONTEXTANGLEPROC>(
>+            loadProc("glRequestExtensionANGLEContextANGLE"));
>+    glCompressedTexImage2DRobustANGLEContextANGLE =
>+        reinterpret_cast<PFNGLCOMPRESSEDTEXIMAGE2DROBUSTANGLECONTEXTANGLEPROC>(
>+            loadProc("glCompressedTexImage2DRobustANGLEContextANGLE"));
>+    glCompressedTexImage3DRobustANGLEContextANGLE =
>+        reinterpret_cast<PFNGLCOMPRESSEDTEXIMAGE3DROBUSTANGLECONTEXTANGLEPROC>(
>+            loadProc("glCompressedTexImage3DRobustANGLEContextANGLE"));
>+    glCompressedTexSubImage2DRobustANGLEContextANGLE =
>+        reinterpret_cast<PFNGLCOMPRESSEDTEXSUBIMAGE2DROBUSTANGLECONTEXTANGLEPROC>(
>+            loadProc("glCompressedTexSubImage2DRobustANGLEContextANGLE"));
>+    glCompressedTexSubImage3DRobustANGLEContextANGLE =
>+        reinterpret_cast<PFNGLCOMPRESSEDTEXSUBIMAGE3DROBUSTANGLECONTEXTANGLEPROC>(
>+            loadProc("glCompressedTexSubImage3DRobustANGLEContextANGLE"));
>+    glGetActiveUniformBlockivRobustANGLEContextANGLE =
>+        reinterpret_cast<PFNGLGETACTIVEUNIFORMBLOCKIVROBUSTANGLECONTEXTANGLEPROC>(
>+            loadProc("glGetActiveUniformBlockivRobustANGLEContextANGLE"));
>+    glGetBooleani_vRobustANGLEContextANGLE =
>+        reinterpret_cast<PFNGLGETBOOLEANI_VROBUSTANGLECONTEXTANGLEPROC>(
>+            loadProc("glGetBooleani_vRobustANGLEContextANGLE"));
>+    glGetBooleanvRobustANGLEContextANGLE =
>+        reinterpret_cast<PFNGLGETBOOLEANVROBUSTANGLECONTEXTANGLEPROC>(
>+            loadProc("glGetBooleanvRobustANGLEContextANGLE"));
>+    glGetBufferParameteri64vRobustANGLEContextANGLE =
>+        reinterpret_cast<PFNGLGETBUFFERPARAMETERI64VROBUSTANGLECONTEXTANGLEPROC>(
>+            loadProc("glGetBufferParameteri64vRobustANGLEContextANGLE"));
>+    glGetBufferParameterivRobustANGLEContextANGLE =
>+        reinterpret_cast<PFNGLGETBUFFERPARAMETERIVROBUSTANGLECONTEXTANGLEPROC>(
>+            loadProc("glGetBufferParameterivRobustANGLEContextANGLE"));
>+    glGetBufferPointervRobustANGLEContextANGLE =
>+        reinterpret_cast<PFNGLGETBUFFERPOINTERVROBUSTANGLECONTEXTANGLEPROC>(
>+            loadProc("glGetBufferPointervRobustANGLEContextANGLE"));
>+    glGetFloatvRobustANGLEContextANGLE =
>+        reinterpret_cast<PFNGLGETFLOATVROBUSTANGLECONTEXTANGLEPROC>(
>+            loadProc("glGetFloatvRobustANGLEContextANGLE"));
>+    glGetFramebufferAttachmentParameterivRobustANGLEContextANGLE =
>+        reinterpret_cast<PFNGLGETFRAMEBUFFERATTACHMENTPARAMETERIVROBUSTANGLECONTEXTANGLEPROC>(
>+            loadProc("glGetFramebufferAttachmentParameterivRobustANGLEContextANGLE"));
>+    glGetFramebufferParameterivRobustANGLEContextANGLE =
>+        reinterpret_cast<PFNGLGETFRAMEBUFFERPARAMETERIVROBUSTANGLECONTEXTANGLEPROC>(
>+            loadProc("glGetFramebufferParameterivRobustANGLEContextANGLE"));
>+    glGetInteger64i_vRobustANGLEContextANGLE =
>+        reinterpret_cast<PFNGLGETINTEGER64I_VROBUSTANGLECONTEXTANGLEPROC>(
>+            loadProc("glGetInteger64i_vRobustANGLEContextANGLE"));
>+    glGetInteger64vRobustANGLEContextANGLE =
>+        reinterpret_cast<PFNGLGETINTEGER64VROBUSTANGLECONTEXTANGLEPROC>(
>+            loadProc("glGetInteger64vRobustANGLEContextANGLE"));
>+    glGetIntegeri_vRobustANGLEContextANGLE =
>+        reinterpret_cast<PFNGLGETINTEGERI_VROBUSTANGLECONTEXTANGLEPROC>(
>+            loadProc("glGetIntegeri_vRobustANGLEContextANGLE"));
>+    glGetIntegervRobustANGLEContextANGLE =
>+        reinterpret_cast<PFNGLGETINTEGERVROBUSTANGLECONTEXTANGLEPROC>(
>+            loadProc("glGetIntegervRobustANGLEContextANGLE"));
>+    glGetInternalformativRobustANGLEContextANGLE =
>+        reinterpret_cast<PFNGLGETINTERNALFORMATIVROBUSTANGLECONTEXTANGLEPROC>(
>+            loadProc("glGetInternalformativRobustANGLEContextANGLE"));
>+    glGetMultisamplefvRobustANGLEContextANGLE =
>+        reinterpret_cast<PFNGLGETMULTISAMPLEFVROBUSTANGLECONTEXTANGLEPROC>(
>+            loadProc("glGetMultisamplefvRobustANGLEContextANGLE"));
>+    glGetPointervRobustANGLERobustANGLEContextANGLE =
>+        reinterpret_cast<PFNGLGETPOINTERVROBUSTANGLEROBUSTANGLECONTEXTANGLEPROC>(
>+            loadProc("glGetPointervRobustANGLERobustANGLEContextANGLE"));
>+    glGetProgramInterfaceivRobustANGLEContextANGLE =
>+        reinterpret_cast<PFNGLGETPROGRAMINTERFACEIVROBUSTANGLECONTEXTANGLEPROC>(
>+            loadProc("glGetProgramInterfaceivRobustANGLEContextANGLE"));
>+    glGetProgramivRobustANGLEContextANGLE =
>+        reinterpret_cast<PFNGLGETPROGRAMIVROBUSTANGLECONTEXTANGLEPROC>(
>+            loadProc("glGetProgramivRobustANGLEContextANGLE"));
>+    glGetQueryObjecti64vRobustANGLEContextANGLE =
>+        reinterpret_cast<PFNGLGETQUERYOBJECTI64VROBUSTANGLECONTEXTANGLEPROC>(
>+            loadProc("glGetQueryObjecti64vRobustANGLEContextANGLE"));
>+    glGetQueryObjectivRobustANGLEContextANGLE =
>+        reinterpret_cast<PFNGLGETQUERYOBJECTIVROBUSTANGLECONTEXTANGLEPROC>(
>+            loadProc("glGetQueryObjectivRobustANGLEContextANGLE"));
>+    glGetQueryObjectui64vRobustANGLEContextANGLE =
>+        reinterpret_cast<PFNGLGETQUERYOBJECTUI64VROBUSTANGLECONTEXTANGLEPROC>(
>+            loadProc("glGetQueryObjectui64vRobustANGLEContextANGLE"));
>+    glGetQueryObjectuivRobustANGLEContextANGLE =
>+        reinterpret_cast<PFNGLGETQUERYOBJECTUIVROBUSTANGLECONTEXTANGLEPROC>(
>+            loadProc("glGetQueryObjectuivRobustANGLEContextANGLE"));
>+    glGetQueryivRobustANGLEContextANGLE =
>+        reinterpret_cast<PFNGLGETQUERYIVROBUSTANGLECONTEXTANGLEPROC>(
>+            loadProc("glGetQueryivRobustANGLEContextANGLE"));
>+    glGetRenderbufferParameterivRobustANGLEContextANGLE =
>+        reinterpret_cast<PFNGLGETRENDERBUFFERPARAMETERIVROBUSTANGLECONTEXTANGLEPROC>(
>+            loadProc("glGetRenderbufferParameterivRobustANGLEContextANGLE"));
>+    glGetSamplerParameterIivRobustANGLEContextANGLE =
>+        reinterpret_cast<PFNGLGETSAMPLERPARAMETERIIVROBUSTANGLECONTEXTANGLEPROC>(
>+            loadProc("glGetSamplerParameterIivRobustANGLEContextANGLE"));
>+    glGetSamplerParameterIuivRobustANGLEContextANGLE =
>+        reinterpret_cast<PFNGLGETSAMPLERPARAMETERIUIVROBUSTANGLECONTEXTANGLEPROC>(
>+            loadProc("glGetSamplerParameterIuivRobustANGLEContextANGLE"));
>+    glGetSamplerParameterfvRobustANGLEContextANGLE =
>+        reinterpret_cast<PFNGLGETSAMPLERPARAMETERFVROBUSTANGLECONTEXTANGLEPROC>(
>+            loadProc("glGetSamplerParameterfvRobustANGLEContextANGLE"));
>+    glGetSamplerParameterivRobustANGLEContextANGLE =
>+        reinterpret_cast<PFNGLGETSAMPLERPARAMETERIVROBUSTANGLECONTEXTANGLEPROC>(
>+            loadProc("glGetSamplerParameterivRobustANGLEContextANGLE"));
>+    glGetShaderivRobustANGLEContextANGLE =
>+        reinterpret_cast<PFNGLGETSHADERIVROBUSTANGLECONTEXTANGLEPROC>(
>+            loadProc("glGetShaderivRobustANGLEContextANGLE"));
>+    glGetTexLevelParameterfvRobustANGLEContextANGLE =
>+        reinterpret_cast<PFNGLGETTEXLEVELPARAMETERFVROBUSTANGLECONTEXTANGLEPROC>(
>+            loadProc("glGetTexLevelParameterfvRobustANGLEContextANGLE"));
>+    glGetTexLevelParameterivRobustANGLEContextANGLE =
>+        reinterpret_cast<PFNGLGETTEXLEVELPARAMETERIVROBUSTANGLECONTEXTANGLEPROC>(
>+            loadProc("glGetTexLevelParameterivRobustANGLEContextANGLE"));
>+    glGetTexParameterIivRobustANGLEContextANGLE =
>+        reinterpret_cast<PFNGLGETTEXPARAMETERIIVROBUSTANGLECONTEXTANGLEPROC>(
>+            loadProc("glGetTexParameterIivRobustANGLEContextANGLE"));
>+    glGetTexParameterIuivRobustANGLEContextANGLE =
>+        reinterpret_cast<PFNGLGETTEXPARAMETERIUIVROBUSTANGLECONTEXTANGLEPROC>(
>+            loadProc("glGetTexParameterIuivRobustANGLEContextANGLE"));
>+    glGetTexParameterfvRobustANGLEContextANGLE =
>+        reinterpret_cast<PFNGLGETTEXPARAMETERFVROBUSTANGLECONTEXTANGLEPROC>(
>+            loadProc("glGetTexParameterfvRobustANGLEContextANGLE"));
>+    glGetTexParameterivRobustANGLEContextANGLE =
>+        reinterpret_cast<PFNGLGETTEXPARAMETERIVROBUSTANGLECONTEXTANGLEPROC>(
>+            loadProc("glGetTexParameterivRobustANGLEContextANGLE"));
>+    glGetUniformfvRobustANGLEContextANGLE =
>+        reinterpret_cast<PFNGLGETUNIFORMFVROBUSTANGLECONTEXTANGLEPROC>(
>+            loadProc("glGetUniformfvRobustANGLEContextANGLE"));
>+    glGetUniformivRobustANGLEContextANGLE =
>+        reinterpret_cast<PFNGLGETUNIFORMIVROBUSTANGLECONTEXTANGLEPROC>(
>+            loadProc("glGetUniformivRobustANGLEContextANGLE"));
>+    glGetUniformuivRobustANGLEContextANGLE =
>+        reinterpret_cast<PFNGLGETUNIFORMUIVROBUSTANGLECONTEXTANGLEPROC>(
>+            loadProc("glGetUniformuivRobustANGLEContextANGLE"));
>+    glGetVertexAttribIivRobustANGLEContextANGLE =
>+        reinterpret_cast<PFNGLGETVERTEXATTRIBIIVROBUSTANGLECONTEXTANGLEPROC>(
>+            loadProc("glGetVertexAttribIivRobustANGLEContextANGLE"));
>+    glGetVertexAttribIuivRobustANGLEContextANGLE =
>+        reinterpret_cast<PFNGLGETVERTEXATTRIBIUIVROBUSTANGLECONTEXTANGLEPROC>(
>+            loadProc("glGetVertexAttribIuivRobustANGLEContextANGLE"));
>+    glGetVertexAttribPointervRobustANGLEContextANGLE =
>+        reinterpret_cast<PFNGLGETVERTEXATTRIBPOINTERVROBUSTANGLECONTEXTANGLEPROC>(
>+            loadProc("glGetVertexAttribPointervRobustANGLEContextANGLE"));
>+    glGetVertexAttribfvRobustANGLEContextANGLE =
>+        reinterpret_cast<PFNGLGETVERTEXATTRIBFVROBUSTANGLECONTEXTANGLEPROC>(
>+            loadProc("glGetVertexAttribfvRobustANGLEContextANGLE"));
>+    glGetVertexAttribivRobustANGLEContextANGLE =
>+        reinterpret_cast<PFNGLGETVERTEXATTRIBIVROBUSTANGLECONTEXTANGLEPROC>(
>+            loadProc("glGetVertexAttribivRobustANGLEContextANGLE"));
>+    glGetnUniformfvRobustANGLEContextANGLE =
>+        reinterpret_cast<PFNGLGETNUNIFORMFVROBUSTANGLECONTEXTANGLEPROC>(
>+            loadProc("glGetnUniformfvRobustANGLEContextANGLE"));
>+    glGetnUniformivRobustANGLEContextANGLE =
>+        reinterpret_cast<PFNGLGETNUNIFORMIVROBUSTANGLECONTEXTANGLEPROC>(
>+            loadProc("glGetnUniformivRobustANGLEContextANGLE"));
>+    glGetnUniformuivRobustANGLEContextANGLE =
>+        reinterpret_cast<PFNGLGETNUNIFORMUIVROBUSTANGLECONTEXTANGLEPROC>(
>+            loadProc("glGetnUniformuivRobustANGLEContextANGLE"));
>+    glReadPixelsRobustANGLEContextANGLE =
>+        reinterpret_cast<PFNGLREADPIXELSROBUSTANGLECONTEXTANGLEPROC>(
>+            loadProc("glReadPixelsRobustANGLEContextANGLE"));
>+    glReadnPixelsRobustANGLEContextANGLE =
>+        reinterpret_cast<PFNGLREADNPIXELSROBUSTANGLECONTEXTANGLEPROC>(
>+            loadProc("glReadnPixelsRobustANGLEContextANGLE"));
>+    glSamplerParameterIivRobustANGLEContextANGLE =
>+        reinterpret_cast<PFNGLSAMPLERPARAMETERIIVROBUSTANGLECONTEXTANGLEPROC>(
>+            loadProc("glSamplerParameterIivRobustANGLEContextANGLE"));
>+    glSamplerParameterIuivRobustANGLEContextANGLE =
>+        reinterpret_cast<PFNGLSAMPLERPARAMETERIUIVROBUSTANGLECONTEXTANGLEPROC>(
>+            loadProc("glSamplerParameterIuivRobustANGLEContextANGLE"));
>+    glSamplerParameterfvRobustANGLEContextANGLE =
>+        reinterpret_cast<PFNGLSAMPLERPARAMETERFVROBUSTANGLECONTEXTANGLEPROC>(
>+            loadProc("glSamplerParameterfvRobustANGLEContextANGLE"));
>+    glSamplerParameterivRobustANGLEContextANGLE =
>+        reinterpret_cast<PFNGLSAMPLERPARAMETERIVROBUSTANGLECONTEXTANGLEPROC>(
>+            loadProc("glSamplerParameterivRobustANGLEContextANGLE"));
>+    glTexImage2DRobustANGLEContextANGLE =
>+        reinterpret_cast<PFNGLTEXIMAGE2DROBUSTANGLECONTEXTANGLEPROC>(
>+            loadProc("glTexImage2DRobustANGLEContextANGLE"));
>+    glTexImage3DRobustANGLEContextANGLE =
>+        reinterpret_cast<PFNGLTEXIMAGE3DROBUSTANGLECONTEXTANGLEPROC>(
>+            loadProc("glTexImage3DRobustANGLEContextANGLE"));
>+    glTexParameterIivRobustANGLEContextANGLE =
>+        reinterpret_cast<PFNGLTEXPARAMETERIIVROBUSTANGLECONTEXTANGLEPROC>(
>+            loadProc("glTexParameterIivRobustANGLEContextANGLE"));
>+    glTexParameterIuivRobustANGLEContextANGLE =
>+        reinterpret_cast<PFNGLTEXPARAMETERIUIVROBUSTANGLECONTEXTANGLEPROC>(
>+            loadProc("glTexParameterIuivRobustANGLEContextANGLE"));
>+    glTexParameterfvRobustANGLEContextANGLE =
>+        reinterpret_cast<PFNGLTEXPARAMETERFVROBUSTANGLECONTEXTANGLEPROC>(
>+            loadProc("glTexParameterfvRobustANGLEContextANGLE"));
>+    glTexParameterivRobustANGLEContextANGLE =
>+        reinterpret_cast<PFNGLTEXPARAMETERIVROBUSTANGLECONTEXTANGLEPROC>(
>+            loadProc("glTexParameterivRobustANGLEContextANGLE"));
>+    glTexSubImage2DRobustANGLEContextANGLE =
>+        reinterpret_cast<PFNGLTEXSUBIMAGE2DROBUSTANGLECONTEXTANGLEPROC>(
>+            loadProc("glTexSubImage2DRobustANGLEContextANGLE"));
>+    glTexSubImage3DRobustANGLEContextANGLE =
>+        reinterpret_cast<PFNGLTEXSUBIMAGE3DROBUSTANGLECONTEXTANGLEPROC>(
>+            loadProc("glTexSubImage3DRobustANGLEContextANGLE"));
>+    glGetMultisamplefvANGLEContextANGLE =
>+        reinterpret_cast<PFNGLGETMULTISAMPLEFVANGLECONTEXTANGLEPROC>(
>+            loadProc("glGetMultisamplefvANGLEContextANGLE"));
>+    glGetTexLevelParameterfvANGLEContextANGLE =
>+        reinterpret_cast<PFNGLGETTEXLEVELPARAMETERFVANGLECONTEXTANGLEPROC>(
>+            loadProc("glGetTexLevelParameterfvANGLEContextANGLE"));
>+    glGetTexLevelParameterivANGLEContextANGLE =
>+        reinterpret_cast<PFNGLGETTEXLEVELPARAMETERIVANGLECONTEXTANGLEPROC>(
>+            loadProc("glGetTexLevelParameterivANGLEContextANGLE"));
>+    glSampleMaskiANGLEContextANGLE = reinterpret_cast<PFNGLSAMPLEMASKIANGLECONTEXTANGLEPROC>(
>+        loadProc("glSampleMaskiANGLEContextANGLE"));
>+    glTexStorage2DMultisampleANGLEContextANGLE =
>+        reinterpret_cast<PFNGLTEXSTORAGE2DMULTISAMPLEANGLECONTEXTANGLEPROC>(
>+            loadProc("glTexStorage2DMultisampleANGLEContextANGLE"));
>+    glGetTranslatedShaderSourceANGLEContextANGLE =
>+        reinterpret_cast<PFNGLGETTRANSLATEDSHADERSOURCEANGLECONTEXTANGLEPROC>(
>+            loadProc("glGetTranslatedShaderSourceANGLEContextANGLE"));
>+    glBindUniformLocationCHROMIUMContextANGLE =
>+        reinterpret_cast<PFNGLBINDUNIFORMLOCATIONCHROMIUMCONTEXTANGLEPROC>(
>+            loadProc("glBindUniformLocationCHROMIUMContextANGLE"));
>+    glCompressedCopyTextureCHROMIUMContextANGLE =
>+        reinterpret_cast<PFNGLCOMPRESSEDCOPYTEXTURECHROMIUMCONTEXTANGLEPROC>(
>+            loadProc("glCompressedCopyTextureCHROMIUMContextANGLE"));
>+    glCopySubTextureCHROMIUMContextANGLE =
>+        reinterpret_cast<PFNGLCOPYSUBTEXTURECHROMIUMCONTEXTANGLEPROC>(
>+            loadProc("glCopySubTextureCHROMIUMContextANGLE"));
>+    glCopyTextureCHROMIUMContextANGLE = reinterpret_cast<PFNGLCOPYTEXTURECHROMIUMCONTEXTANGLEPROC>(
>+        loadProc("glCopyTextureCHROMIUMContextANGLE"));
>+    glCoverageModulationCHROMIUMContextANGLE =
>+        reinterpret_cast<PFNGLCOVERAGEMODULATIONCHROMIUMCONTEXTANGLEPROC>(
>+            loadProc("glCoverageModulationCHROMIUMContextANGLE"));
>+    glMatrixLoadIdentityCHROMIUMContextANGLE =
>+        reinterpret_cast<PFNGLMATRIXLOADIDENTITYCHROMIUMCONTEXTANGLEPROC>(
>+            loadProc("glMatrixLoadIdentityCHROMIUMContextANGLE"));
>+    glMatrixLoadfCHROMIUMContextANGLE = reinterpret_cast<PFNGLMATRIXLOADFCHROMIUMCONTEXTANGLEPROC>(
>+        loadProc("glMatrixLoadfCHROMIUMContextANGLE"));
>+    glLoseContextCHROMIUMContextANGLE = reinterpret_cast<PFNGLLOSECONTEXTCHROMIUMCONTEXTANGLEPROC>(
>+        loadProc("glLoseContextCHROMIUMContextANGLE"));
>+    glBindFragmentInputLocationCHROMIUMContextANGLE =
>+        reinterpret_cast<PFNGLBINDFRAGMENTINPUTLOCATIONCHROMIUMCONTEXTANGLEPROC>(
>+            loadProc("glBindFragmentInputLocationCHROMIUMContextANGLE"));
>+    glCoverFillPathCHROMIUMContextANGLE =
>+        reinterpret_cast<PFNGLCOVERFILLPATHCHROMIUMCONTEXTANGLEPROC>(
>+            loadProc("glCoverFillPathCHROMIUMContextANGLE"));
>+    glCoverFillPathInstancedCHROMIUMContextANGLE =
>+        reinterpret_cast<PFNGLCOVERFILLPATHINSTANCEDCHROMIUMCONTEXTANGLEPROC>(
>+            loadProc("glCoverFillPathInstancedCHROMIUMContextANGLE"));
>+    glCoverStrokePathCHROMIUMContextANGLE =
>+        reinterpret_cast<PFNGLCOVERSTROKEPATHCHROMIUMCONTEXTANGLEPROC>(
>+            loadProc("glCoverStrokePathCHROMIUMContextANGLE"));
>+    glCoverStrokePathInstancedCHROMIUMContextANGLE =
>+        reinterpret_cast<PFNGLCOVERSTROKEPATHINSTANCEDCHROMIUMCONTEXTANGLEPROC>(
>+            loadProc("glCoverStrokePathInstancedCHROMIUMContextANGLE"));
>+    glDeletePathsCHROMIUMContextANGLE = reinterpret_cast<PFNGLDELETEPATHSCHROMIUMCONTEXTANGLEPROC>(
>+        loadProc("glDeletePathsCHROMIUMContextANGLE"));
>+    glGenPathsCHROMIUMContextANGLE = reinterpret_cast<PFNGLGENPATHSCHROMIUMCONTEXTANGLEPROC>(
>+        loadProc("glGenPathsCHROMIUMContextANGLE"));
>+    glGetPathParameterfvCHROMIUMContextANGLE =
>+        reinterpret_cast<PFNGLGETPATHPARAMETERFVCHROMIUMCONTEXTANGLEPROC>(
>+            loadProc("glGetPathParameterfvCHROMIUMContextANGLE"));
>+    glGetPathParameterivCHROMIUMContextANGLE =
>+        reinterpret_cast<PFNGLGETPATHPARAMETERIVCHROMIUMCONTEXTANGLEPROC>(
>+            loadProc("glGetPathParameterivCHROMIUMContextANGLE"));
>+    glIsPathCHROMIUMContextANGLE = reinterpret_cast<PFNGLISPATHCHROMIUMCONTEXTANGLEPROC>(
>+        loadProc("glIsPathCHROMIUMContextANGLE"));
>+    glPathCommandsCHROMIUMContextANGLE =
>+        reinterpret_cast<PFNGLPATHCOMMANDSCHROMIUMCONTEXTANGLEPROC>(
>+            loadProc("glPathCommandsCHROMIUMContextANGLE"));
>+    glPathParameterfCHROMIUMContextANGLE =
>+        reinterpret_cast<PFNGLPATHPARAMETERFCHROMIUMCONTEXTANGLEPROC>(
>+            loadProc("glPathParameterfCHROMIUMContextANGLE"));
>+    glPathParameteriCHROMIUMContextANGLE =
>+        reinterpret_cast<PFNGLPATHPARAMETERICHROMIUMCONTEXTANGLEPROC>(
>+            loadProc("glPathParameteriCHROMIUMContextANGLE"));
>+    glPathStencilFuncCHROMIUMContextANGLE =
>+        reinterpret_cast<PFNGLPATHSTENCILFUNCCHROMIUMCONTEXTANGLEPROC>(
>+            loadProc("glPathStencilFuncCHROMIUMContextANGLE"));
>+    glProgramPathFragmentInputGenCHROMIUMContextANGLE =
>+        reinterpret_cast<PFNGLPROGRAMPATHFRAGMENTINPUTGENCHROMIUMCONTEXTANGLEPROC>(
>+            loadProc("glProgramPathFragmentInputGenCHROMIUMContextANGLE"));
>+    glStencilFillPathCHROMIUMContextANGLE =
>+        reinterpret_cast<PFNGLSTENCILFILLPATHCHROMIUMCONTEXTANGLEPROC>(
>+            loadProc("glStencilFillPathCHROMIUMContextANGLE"));
>+    glStencilFillPathInstancedCHROMIUMContextANGLE =
>+        reinterpret_cast<PFNGLSTENCILFILLPATHINSTANCEDCHROMIUMCONTEXTANGLEPROC>(
>+            loadProc("glStencilFillPathInstancedCHROMIUMContextANGLE"));
>+    glStencilStrokePathCHROMIUMContextANGLE =
>+        reinterpret_cast<PFNGLSTENCILSTROKEPATHCHROMIUMCONTEXTANGLEPROC>(
>+            loadProc("glStencilStrokePathCHROMIUMContextANGLE"));
>+    glStencilStrokePathInstancedCHROMIUMContextANGLE =
>+        reinterpret_cast<PFNGLSTENCILSTROKEPATHINSTANCEDCHROMIUMCONTEXTANGLEPROC>(
>+            loadProc("glStencilStrokePathInstancedCHROMIUMContextANGLE"));
>+    glStencilThenCoverFillPathCHROMIUMContextANGLE =
>+        reinterpret_cast<PFNGLSTENCILTHENCOVERFILLPATHCHROMIUMCONTEXTANGLEPROC>(
>+            loadProc("glStencilThenCoverFillPathCHROMIUMContextANGLE"));
>+    glStencilThenCoverFillPathInstancedCHROMIUMContextANGLE =
>+        reinterpret_cast<PFNGLSTENCILTHENCOVERFILLPATHINSTANCEDCHROMIUMCONTEXTANGLEPROC>(
>+            loadProc("glStencilThenCoverFillPathInstancedCHROMIUMContextANGLE"));
>+    glStencilThenCoverStrokePathCHROMIUMContextANGLE =
>+        reinterpret_cast<PFNGLSTENCILTHENCOVERSTROKEPATHCHROMIUMCONTEXTANGLEPROC>(
>+            loadProc("glStencilThenCoverStrokePathCHROMIUMContextANGLE"));
>+    glStencilThenCoverStrokePathInstancedCHROMIUMContextANGLE =
>+        reinterpret_cast<PFNGLSTENCILTHENCOVERSTROKEPATHINSTANCEDCHROMIUMCONTEXTANGLEPROC>(
>+            loadProc("glStencilThenCoverStrokePathInstancedCHROMIUMContextANGLE"));
>+    glBindFragDataLocationEXTContextANGLE =
>+        reinterpret_cast<PFNGLBINDFRAGDATALOCATIONEXTCONTEXTANGLEPROC>(
>+            loadProc("glBindFragDataLocationEXTContextANGLE"));
>+    glBindFragDataLocationIndexedEXTContextANGLE =
>+        reinterpret_cast<PFNGLBINDFRAGDATALOCATIONINDEXEDEXTCONTEXTANGLEPROC>(
>+            loadProc("glBindFragDataLocationIndexedEXTContextANGLE"));
>+    glGetFragDataIndexEXTContextANGLE = reinterpret_cast<PFNGLGETFRAGDATAINDEXEXTCONTEXTANGLEPROC>(
>+        loadProc("glGetFragDataIndexEXTContextANGLE"));
>+    glGetProgramResourceLocationIndexEXTContextANGLE =
>+        reinterpret_cast<PFNGLGETPROGRAMRESOURCELOCATIONINDEXEXTCONTEXTANGLEPROC>(
>+            loadProc("glGetProgramResourceLocationIndexEXTContextANGLE"));
>+    glInsertEventMarkerEXTContextANGLE =
>+        reinterpret_cast<PFNGLINSERTEVENTMARKEREXTCONTEXTANGLEPROC>(
>+            loadProc("glInsertEventMarkerEXTContextANGLE"));
>+    glPopGroupMarkerEXTContextANGLE = reinterpret_cast<PFNGLPOPGROUPMARKEREXTCONTEXTANGLEPROC>(
>+        loadProc("glPopGroupMarkerEXTContextANGLE"));
>+    glPushGroupMarkerEXTContextANGLE = reinterpret_cast<PFNGLPUSHGROUPMARKEREXTCONTEXTANGLEPROC>(
>+        loadProc("glPushGroupMarkerEXTContextANGLE"));
>+    glDiscardFramebufferEXTContextANGLE =
>+        reinterpret_cast<PFNGLDISCARDFRAMEBUFFEREXTCONTEXTANGLEPROC>(
>+            loadProc("glDiscardFramebufferEXTContextANGLE"));
>+    glBeginQueryEXTContextANGLE = reinterpret_cast<PFNGLBEGINQUERYEXTCONTEXTANGLEPROC>(
>+        loadProc("glBeginQueryEXTContextANGLE"));
>+    glDeleteQueriesEXTContextANGLE = reinterpret_cast<PFNGLDELETEQUERIESEXTCONTEXTANGLEPROC>(
>+        loadProc("glDeleteQueriesEXTContextANGLE"));
>+    glEndQueryEXTContextANGLE =
>+        reinterpret_cast<PFNGLENDQUERYEXTCONTEXTANGLEPROC>(loadProc("glEndQueryEXTContextANGLE"));
>+    glGenQueriesEXTContextANGLE = reinterpret_cast<PFNGLGENQUERIESEXTCONTEXTANGLEPROC>(
>+        loadProc("glGenQueriesEXTContextANGLE"));
>+    glGetQueryObjecti64vEXTContextANGLE =
>+        reinterpret_cast<PFNGLGETQUERYOBJECTI64VEXTCONTEXTANGLEPROC>(
>+            loadProc("glGetQueryObjecti64vEXTContextANGLE"));
>+    glGetQueryObjectivEXTContextANGLE = reinterpret_cast<PFNGLGETQUERYOBJECTIVEXTCONTEXTANGLEPROC>(
>+        loadProc("glGetQueryObjectivEXTContextANGLE"));
>+    glGetQueryObjectui64vEXTContextANGLE =
>+        reinterpret_cast<PFNGLGETQUERYOBJECTUI64VEXTCONTEXTANGLEPROC>(
>+            loadProc("glGetQueryObjectui64vEXTContextANGLE"));
>+    glGetQueryObjectuivEXTContextANGLE =
>+        reinterpret_cast<PFNGLGETQUERYOBJECTUIVEXTCONTEXTANGLEPROC>(
>+            loadProc("glGetQueryObjectuivEXTContextANGLE"));
>+    glGetQueryivEXTContextANGLE = reinterpret_cast<PFNGLGETQUERYIVEXTCONTEXTANGLEPROC>(
>+        loadProc("glGetQueryivEXTContextANGLE"));
>+    glIsQueryEXTContextANGLE =
>+        reinterpret_cast<PFNGLISQUERYEXTCONTEXTANGLEPROC>(loadProc("glIsQueryEXTContextANGLE"));
>+    glQueryCounterEXTContextANGLE = reinterpret_cast<PFNGLQUERYCOUNTEREXTCONTEXTANGLEPROC>(
>+        loadProc("glQueryCounterEXTContextANGLE"));
>+    glDrawBuffersEXTContextANGLE = reinterpret_cast<PFNGLDRAWBUFFERSEXTCONTEXTANGLEPROC>(
>+        loadProc("glDrawBuffersEXTContextANGLE"));
>+    glFramebufferTextureEXTContextANGLE =
>+        reinterpret_cast<PFNGLFRAMEBUFFERTEXTUREEXTCONTEXTANGLEPROC>(
>+            loadProc("glFramebufferTextureEXTContextANGLE"));
>+    glDrawArraysInstancedEXTContextANGLE =
>+        reinterpret_cast<PFNGLDRAWARRAYSINSTANCEDEXTCONTEXTANGLEPROC>(
>+            loadProc("glDrawArraysInstancedEXTContextANGLE"));
>+    glDrawElementsInstancedEXTContextANGLE =
>+        reinterpret_cast<PFNGLDRAWELEMENTSINSTANCEDEXTCONTEXTANGLEPROC>(
>+            loadProc("glDrawElementsInstancedEXTContextANGLE"));
>+    glVertexAttribDivisorEXTContextANGLE =
>+        reinterpret_cast<PFNGLVERTEXATTRIBDIVISOREXTCONTEXTANGLEPROC>(
>+            loadProc("glVertexAttribDivisorEXTContextANGLE"));
>+    glFlushMappedBufferRangeEXTContextANGLE =
>+        reinterpret_cast<PFNGLFLUSHMAPPEDBUFFERRANGEEXTCONTEXTANGLEPROC>(
>+            loadProc("glFlushMappedBufferRangeEXTContextANGLE"));
>+    glMapBufferRangeEXTContextANGLE = reinterpret_cast<PFNGLMAPBUFFERRANGEEXTCONTEXTANGLEPROC>(
>+        loadProc("glMapBufferRangeEXTContextANGLE"));
>+    glBufferStorageMemEXTContextANGLE = reinterpret_cast<PFNGLBUFFERSTORAGEMEMEXTCONTEXTANGLEPROC>(
>+        loadProc("glBufferStorageMemEXTContextANGLE"));
>+    glCreateMemoryObjectsEXTContextANGLE =
>+        reinterpret_cast<PFNGLCREATEMEMORYOBJECTSEXTCONTEXTANGLEPROC>(
>+            loadProc("glCreateMemoryObjectsEXTContextANGLE"));
>+    glDeleteMemoryObjectsEXTContextANGLE =
>+        reinterpret_cast<PFNGLDELETEMEMORYOBJECTSEXTCONTEXTANGLEPROC>(
>+            loadProc("glDeleteMemoryObjectsEXTContextANGLE"));
>+    glGetMemoryObjectParameterivEXTContextANGLE =
>+        reinterpret_cast<PFNGLGETMEMORYOBJECTPARAMETERIVEXTCONTEXTANGLEPROC>(
>+            loadProc("glGetMemoryObjectParameterivEXTContextANGLE"));
>+    glGetUnsignedBytei_vEXTContextANGLE =
>+        reinterpret_cast<PFNGLGETUNSIGNEDBYTEI_VEXTCONTEXTANGLEPROC>(
>+            loadProc("glGetUnsignedBytei_vEXTContextANGLE"));
>+    glGetUnsignedBytevEXTContextANGLE = reinterpret_cast<PFNGLGETUNSIGNEDBYTEVEXTCONTEXTANGLEPROC>(
>+        loadProc("glGetUnsignedBytevEXTContextANGLE"));
>+    glIsMemoryObjectEXTContextANGLE = reinterpret_cast<PFNGLISMEMORYOBJECTEXTCONTEXTANGLEPROC>(
>+        loadProc("glIsMemoryObjectEXTContextANGLE"));
>+    glMemoryObjectParameterivEXTContextANGLE =
>+        reinterpret_cast<PFNGLMEMORYOBJECTPARAMETERIVEXTCONTEXTANGLEPROC>(
>+            loadProc("glMemoryObjectParameterivEXTContextANGLE"));
>+    glTexStorageMem2DEXTContextANGLE = reinterpret_cast<PFNGLTEXSTORAGEMEM2DEXTCONTEXTANGLEPROC>(
>+        loadProc("glTexStorageMem2DEXTContextANGLE"));
>+    glTexStorageMem2DMultisampleEXTContextANGLE =
>+        reinterpret_cast<PFNGLTEXSTORAGEMEM2DMULTISAMPLEEXTCONTEXTANGLEPROC>(
>+            loadProc("glTexStorageMem2DMultisampleEXTContextANGLE"));
>+    glTexStorageMem3DEXTContextANGLE = reinterpret_cast<PFNGLTEXSTORAGEMEM3DEXTCONTEXTANGLEPROC>(
>+        loadProc("glTexStorageMem3DEXTContextANGLE"));
>+    glTexStorageMem3DMultisampleEXTContextANGLE =
>+        reinterpret_cast<PFNGLTEXSTORAGEMEM3DMULTISAMPLEEXTCONTEXTANGLEPROC>(
>+            loadProc("glTexStorageMem3DMultisampleEXTContextANGLE"));
>+    glImportMemoryFdEXTContextANGLE = reinterpret_cast<PFNGLIMPORTMEMORYFDEXTCONTEXTANGLEPROC>(
>+        loadProc("glImportMemoryFdEXTContextANGLE"));
>+    glGetGraphicsResetStatusEXTContextANGLE =
>+        reinterpret_cast<PFNGLGETGRAPHICSRESETSTATUSEXTCONTEXTANGLEPROC>(
>+            loadProc("glGetGraphicsResetStatusEXTContextANGLE"));
>+    glGetnUniformfvEXTContextANGLE = reinterpret_cast<PFNGLGETNUNIFORMFVEXTCONTEXTANGLEPROC>(
>+        loadProc("glGetnUniformfvEXTContextANGLE"));
>+    glGetnUniformivEXTContextANGLE = reinterpret_cast<PFNGLGETNUNIFORMIVEXTCONTEXTANGLEPROC>(
>+        loadProc("glGetnUniformivEXTContextANGLE"));
>+    glReadnPixelsEXTContextANGLE = reinterpret_cast<PFNGLREADNPIXELSEXTCONTEXTANGLEPROC>(
>+        loadProc("glReadnPixelsEXTContextANGLE"));
>+    glDeleteSemaphoresEXTContextANGLE = reinterpret_cast<PFNGLDELETESEMAPHORESEXTCONTEXTANGLEPROC>(
>+        loadProc("glDeleteSemaphoresEXTContextANGLE"));
>+    glGenSemaphoresEXTContextANGLE = reinterpret_cast<PFNGLGENSEMAPHORESEXTCONTEXTANGLEPROC>(
>+        loadProc("glGenSemaphoresEXTContextANGLE"));
>+    glGetSemaphoreParameterui64vEXTContextANGLE =
>+        reinterpret_cast<PFNGLGETSEMAPHOREPARAMETERUI64VEXTCONTEXTANGLEPROC>(
>+            loadProc("glGetSemaphoreParameterui64vEXTContextANGLE"));
>+    glIsSemaphoreEXTContextANGLE = reinterpret_cast<PFNGLISSEMAPHOREEXTCONTEXTANGLEPROC>(
>+        loadProc("glIsSemaphoreEXTContextANGLE"));
>+    glSemaphoreParameterui64vEXTContextANGLE =
>+        reinterpret_cast<PFNGLSEMAPHOREPARAMETERUI64VEXTCONTEXTANGLEPROC>(
>+            loadProc("glSemaphoreParameterui64vEXTContextANGLE"));
>+    glSignalSemaphoreEXTContextANGLE = reinterpret_cast<PFNGLSIGNALSEMAPHOREEXTCONTEXTANGLEPROC>(
>+        loadProc("glSignalSemaphoreEXTContextANGLE"));
>+    glWaitSemaphoreEXTContextANGLE = reinterpret_cast<PFNGLWAITSEMAPHOREEXTCONTEXTANGLEPROC>(
>+        loadProc("glWaitSemaphoreEXTContextANGLE"));
>+    glImportSemaphoreFdEXTContextANGLE =
>+        reinterpret_cast<PFNGLIMPORTSEMAPHOREFDEXTCONTEXTANGLEPROC>(
>+            loadProc("glImportSemaphoreFdEXTContextANGLE"));
>+    glTexStorage1DEXTContextANGLE = reinterpret_cast<PFNGLTEXSTORAGE1DEXTCONTEXTANGLEPROC>(
>+        loadProc("glTexStorage1DEXTContextANGLE"));
>+    glTexStorage2DEXTContextANGLE = reinterpret_cast<PFNGLTEXSTORAGE2DEXTCONTEXTANGLEPROC>(
>+        loadProc("glTexStorage2DEXTContextANGLE"));
>+    glTexStorage3DEXTContextANGLE = reinterpret_cast<PFNGLTEXSTORAGE3DEXTCONTEXTANGLEPROC>(
>+        loadProc("glTexStorage3DEXTContextANGLE"));
>+    glDebugMessageCallbackKHRContextANGLE =
>+        reinterpret_cast<PFNGLDEBUGMESSAGECALLBACKKHRCONTEXTANGLEPROC>(
>+            loadProc("glDebugMessageCallbackKHRContextANGLE"));
>+    glDebugMessageControlKHRContextANGLE =
>+        reinterpret_cast<PFNGLDEBUGMESSAGECONTROLKHRCONTEXTANGLEPROC>(
>+            loadProc("glDebugMessageControlKHRContextANGLE"));
>+    glDebugMessageInsertKHRContextANGLE =
>+        reinterpret_cast<PFNGLDEBUGMESSAGEINSERTKHRCONTEXTANGLEPROC>(
>+            loadProc("glDebugMessageInsertKHRContextANGLE"));
>+    glGetDebugMessageLogKHRContextANGLE =
>+        reinterpret_cast<PFNGLGETDEBUGMESSAGELOGKHRCONTEXTANGLEPROC>(
>+            loadProc("glGetDebugMessageLogKHRContextANGLE"));
>+    glGetObjectLabelKHRContextANGLE = reinterpret_cast<PFNGLGETOBJECTLABELKHRCONTEXTANGLEPROC>(
>+        loadProc("glGetObjectLabelKHRContextANGLE"));
>+    glGetObjectPtrLabelKHRContextANGLE =
>+        reinterpret_cast<PFNGLGETOBJECTPTRLABELKHRCONTEXTANGLEPROC>(
>+            loadProc("glGetObjectPtrLabelKHRContextANGLE"));
>+    glGetPointervKHRContextANGLE = reinterpret_cast<PFNGLGETPOINTERVKHRCONTEXTANGLEPROC>(
>+        loadProc("glGetPointervKHRContextANGLE"));
>+    glObjectLabelKHRContextANGLE = reinterpret_cast<PFNGLOBJECTLABELKHRCONTEXTANGLEPROC>(
>+        loadProc("glObjectLabelKHRContextANGLE"));
>+    glObjectPtrLabelKHRContextANGLE = reinterpret_cast<PFNGLOBJECTPTRLABELKHRCONTEXTANGLEPROC>(
>+        loadProc("glObjectPtrLabelKHRContextANGLE"));
>+    glPopDebugGroupKHRContextANGLE = reinterpret_cast<PFNGLPOPDEBUGGROUPKHRCONTEXTANGLEPROC>(
>+        loadProc("glPopDebugGroupKHRContextANGLE"));
>+    glPushDebugGroupKHRContextANGLE = reinterpret_cast<PFNGLPUSHDEBUGGROUPKHRCONTEXTANGLEPROC>(
>+        loadProc("glPushDebugGroupKHRContextANGLE"));
>+    glMaxShaderCompilerThreadsKHRContextANGLE =
>+        reinterpret_cast<PFNGLMAXSHADERCOMPILERTHREADSKHRCONTEXTANGLEPROC>(
>+            loadProc("glMaxShaderCompilerThreadsKHRContextANGLE"));
>+    glDeleteFencesNVContextANGLE = reinterpret_cast<PFNGLDELETEFENCESNVCONTEXTANGLEPROC>(
>+        loadProc("glDeleteFencesNVContextANGLE"));
>+    glFinishFenceNVContextANGLE = reinterpret_cast<PFNGLFINISHFENCENVCONTEXTANGLEPROC>(
>+        loadProc("glFinishFenceNVContextANGLE"));
>+    glGenFencesNVContextANGLE =
>+        reinterpret_cast<PFNGLGENFENCESNVCONTEXTANGLEPROC>(loadProc("glGenFencesNVContextANGLE"));
>+    glGetFenceivNVContextANGLE =
>+        reinterpret_cast<PFNGLGETFENCEIVNVCONTEXTANGLEPROC>(loadProc("glGetFenceivNVContextANGLE"));
>+    glIsFenceNVContextANGLE =
>+        reinterpret_cast<PFNGLISFENCENVCONTEXTANGLEPROC>(loadProc("glIsFenceNVContextANGLE"));
>+    glSetFenceNVContextANGLE =
>+        reinterpret_cast<PFNGLSETFENCENVCONTEXTANGLEPROC>(loadProc("glSetFenceNVContextANGLE"));
>+    glTestFenceNVContextANGLE =
>+        reinterpret_cast<PFNGLTESTFENCENVCONTEXTANGLEPROC>(loadProc("glTestFenceNVContextANGLE"));
>+    glEGLImageTargetRenderbufferStorageOESContextANGLE =
>+        reinterpret_cast<PFNGLEGLIMAGETARGETRENDERBUFFERSTORAGEOESCONTEXTANGLEPROC>(
>+            loadProc("glEGLImageTargetRenderbufferStorageOESContextANGLE"));
>+    glEGLImageTargetTexture2DOESContextANGLE =
>+        reinterpret_cast<PFNGLEGLIMAGETARGETTEXTURE2DOESCONTEXTANGLEPROC>(
>+            loadProc("glEGLImageTargetTexture2DOESContextANGLE"));
>+    glGetProgramBinaryOESContextANGLE = reinterpret_cast<PFNGLGETPROGRAMBINARYOESCONTEXTANGLEPROC>(
>+        loadProc("glGetProgramBinaryOESContextANGLE"));
>+    glProgramBinaryOESContextANGLE = reinterpret_cast<PFNGLPROGRAMBINARYOESCONTEXTANGLEPROC>(
>+        loadProc("glProgramBinaryOESContextANGLE"));
>+    glGetBufferPointervOESContextANGLE =
>+        reinterpret_cast<PFNGLGETBUFFERPOINTERVOESCONTEXTANGLEPROC>(
>+            loadProc("glGetBufferPointervOESContextANGLE"));
>+    glMapBufferOESContextANGLE =
>+        reinterpret_cast<PFNGLMAPBUFFEROESCONTEXTANGLEPROC>(loadProc("glMapBufferOESContextANGLE"));
>+    glUnmapBufferOESContextANGLE = reinterpret_cast<PFNGLUNMAPBUFFEROESCONTEXTANGLEPROC>(
>+        loadProc("glUnmapBufferOESContextANGLE"));
>+    glGetSamplerParameterIivOESContextANGLE =
>+        reinterpret_cast<PFNGLGETSAMPLERPARAMETERIIVOESCONTEXTANGLEPROC>(
>+            loadProc("glGetSamplerParameterIivOESContextANGLE"));
>+    glGetSamplerParameterIuivOESContextANGLE =
>+        reinterpret_cast<PFNGLGETSAMPLERPARAMETERIUIVOESCONTEXTANGLEPROC>(
>+            loadProc("glGetSamplerParameterIuivOESContextANGLE"));
>+    glGetTexParameterIivOESContextANGLE =
>+        reinterpret_cast<PFNGLGETTEXPARAMETERIIVOESCONTEXTANGLEPROC>(
>+            loadProc("glGetTexParameterIivOESContextANGLE"));
>+    glGetTexParameterIuivOESContextANGLE =
>+        reinterpret_cast<PFNGLGETTEXPARAMETERIUIVOESCONTEXTANGLEPROC>(
>+            loadProc("glGetTexParameterIuivOESContextANGLE"));
>+    glSamplerParameterIivOESContextANGLE =
>+        reinterpret_cast<PFNGLSAMPLERPARAMETERIIVOESCONTEXTANGLEPROC>(
>+            loadProc("glSamplerParameterIivOESContextANGLE"));
>+    glSamplerParameterIuivOESContextANGLE =
>+        reinterpret_cast<PFNGLSAMPLERPARAMETERIUIVOESCONTEXTANGLEPROC>(
>+            loadProc("glSamplerParameterIuivOESContextANGLE"));
>+    glTexParameterIivOESContextANGLE = reinterpret_cast<PFNGLTEXPARAMETERIIVOESCONTEXTANGLEPROC>(
>+        loadProc("glTexParameterIivOESContextANGLE"));
>+    glTexParameterIuivOESContextANGLE = reinterpret_cast<PFNGLTEXPARAMETERIUIVOESCONTEXTANGLEPROC>(
>+        loadProc("glTexParameterIuivOESContextANGLE"));
>+    glTexStorage3DMultisampleOESContextANGLE =
>+        reinterpret_cast<PFNGLTEXSTORAGE3DMULTISAMPLEOESCONTEXTANGLEPROC>(
>+            loadProc("glTexStorage3DMultisampleOESContextANGLE"));
>+    glBindVertexArrayOESContextANGLE = reinterpret_cast<PFNGLBINDVERTEXARRAYOESCONTEXTANGLEPROC>(
>+        loadProc("glBindVertexArrayOESContextANGLE"));
>+    glDeleteVertexArraysOESContextANGLE =
>+        reinterpret_cast<PFNGLDELETEVERTEXARRAYSOESCONTEXTANGLEPROC>(
>+            loadProc("glDeleteVertexArraysOESContextANGLE"));
>+    glGenVertexArraysOESContextANGLE = reinterpret_cast<PFNGLGENVERTEXARRAYSOESCONTEXTANGLEPROC>(
>+        loadProc("glGenVertexArraysOESContextANGLE"));
>+    glIsVertexArrayOESContextANGLE = reinterpret_cast<PFNGLISVERTEXARRAYOESCONTEXTANGLEPROC>(
>+        loadProc("glIsVertexArrayOESContextANGLE"));
>+    glFramebufferTextureMultiviewOVRContextANGLE =
>+        reinterpret_cast<PFNGLFRAMEBUFFERTEXTUREMULTIVIEWOVRCONTEXTANGLEPROC>(
>+            loadProc("glFramebufferTextureMultiviewOVRContextANGLE"));
>+    glDrawTexfOESContextANGLE =
>+        reinterpret_cast<PFNGLDRAWTEXFOESCONTEXTANGLEPROC>(loadProc("glDrawTexfOESContextANGLE"));
>+    glDrawTexfvOESContextANGLE =
>+        reinterpret_cast<PFNGLDRAWTEXFVOESCONTEXTANGLEPROC>(loadProc("glDrawTexfvOESContextANGLE"));
>+    glDrawTexiOESContextANGLE =
>+        reinterpret_cast<PFNGLDRAWTEXIOESCONTEXTANGLEPROC>(loadProc("glDrawTexiOESContextANGLE"));
>+    glDrawTexivOESContextANGLE =
>+        reinterpret_cast<PFNGLDRAWTEXIVOESCONTEXTANGLEPROC>(loadProc("glDrawTexivOESContextANGLE"));
>+    glDrawTexsOESContextANGLE =
>+        reinterpret_cast<PFNGLDRAWTEXSOESCONTEXTANGLEPROC>(loadProc("glDrawTexsOESContextANGLE"));
>+    glDrawTexsvOESContextANGLE =
>+        reinterpret_cast<PFNGLDRAWTEXSVOESCONTEXTANGLEPROC>(loadProc("glDrawTexsvOESContextANGLE"));
>+    glDrawTexxOESContextANGLE =
>+        reinterpret_cast<PFNGLDRAWTEXXOESCONTEXTANGLEPROC>(loadProc("glDrawTexxOESContextANGLE"));
>+    glDrawTexxvOESContextANGLE =
>+        reinterpret_cast<PFNGLDRAWTEXXVOESCONTEXTANGLEPROC>(loadProc("glDrawTexxvOESContextANGLE"));
>+    glBindFramebufferOESContextANGLE = reinterpret_cast<PFNGLBINDFRAMEBUFFEROESCONTEXTANGLEPROC>(
>+        loadProc("glBindFramebufferOESContextANGLE"));
>+    glBindRenderbufferOESContextANGLE = reinterpret_cast<PFNGLBINDRENDERBUFFEROESCONTEXTANGLEPROC>(
>+        loadProc("glBindRenderbufferOESContextANGLE"));
>+    glCheckFramebufferStatusOESContextANGLE =
>+        reinterpret_cast<PFNGLCHECKFRAMEBUFFERSTATUSOESCONTEXTANGLEPROC>(
>+            loadProc("glCheckFramebufferStatusOESContextANGLE"));
>+    glDeleteFramebuffersOESContextANGLE =
>+        reinterpret_cast<PFNGLDELETEFRAMEBUFFERSOESCONTEXTANGLEPROC>(
>+            loadProc("glDeleteFramebuffersOESContextANGLE"));
>+    glDeleteRenderbuffersOESContextANGLE =
>+        reinterpret_cast<PFNGLDELETERENDERBUFFERSOESCONTEXTANGLEPROC>(
>+            loadProc("glDeleteRenderbuffersOESContextANGLE"));
>+    glFramebufferRenderbufferOESContextANGLE =
>+        reinterpret_cast<PFNGLFRAMEBUFFERRENDERBUFFEROESCONTEXTANGLEPROC>(
>+            loadProc("glFramebufferRenderbufferOESContextANGLE"));
>+    glFramebufferTexture2DOESContextANGLE =
>+        reinterpret_cast<PFNGLFRAMEBUFFERTEXTURE2DOESCONTEXTANGLEPROC>(
>+            loadProc("glFramebufferTexture2DOESContextANGLE"));
>+    glGenFramebuffersOESContextANGLE = reinterpret_cast<PFNGLGENFRAMEBUFFERSOESCONTEXTANGLEPROC>(
>+        loadProc("glGenFramebuffersOESContextANGLE"));
>+    glGenRenderbuffersOESContextANGLE = reinterpret_cast<PFNGLGENRENDERBUFFERSOESCONTEXTANGLEPROC>(
>+        loadProc("glGenRenderbuffersOESContextANGLE"));
>+    glGenerateMipmapOESContextANGLE = reinterpret_cast<PFNGLGENERATEMIPMAPOESCONTEXTANGLEPROC>(
>+        loadProc("glGenerateMipmapOESContextANGLE"));
>+    glGetFramebufferAttachmentParameterivOESContextANGLE =
>+        reinterpret_cast<PFNGLGETFRAMEBUFFERATTACHMENTPARAMETERIVOESCONTEXTANGLEPROC>(
>+            loadProc("glGetFramebufferAttachmentParameterivOESContextANGLE"));
>+    glGetRenderbufferParameterivOESContextANGLE =
>+        reinterpret_cast<PFNGLGETRENDERBUFFERPARAMETERIVOESCONTEXTANGLEPROC>(
>+            loadProc("glGetRenderbufferParameterivOESContextANGLE"));
>+    glIsFramebufferOESContextANGLE = reinterpret_cast<PFNGLISFRAMEBUFFEROESCONTEXTANGLEPROC>(
>+        loadProc("glIsFramebufferOESContextANGLE"));
>+    glIsRenderbufferOESContextANGLE = reinterpret_cast<PFNGLISRENDERBUFFEROESCONTEXTANGLEPROC>(
>+        loadProc("glIsRenderbufferOESContextANGLE"));
>+    glRenderbufferStorageOESContextANGLE =
>+        reinterpret_cast<PFNGLRENDERBUFFERSTORAGEOESCONTEXTANGLEPROC>(
>+            loadProc("glRenderbufferStorageOESContextANGLE"));
>+    glCurrentPaletteMatrixOESContextANGLE =
>+        reinterpret_cast<PFNGLCURRENTPALETTEMATRIXOESCONTEXTANGLEPROC>(
>+            loadProc("glCurrentPaletteMatrixOESContextANGLE"));
>+    glLoadPaletteFromModelViewMatrixOESContextANGLE =
>+        reinterpret_cast<PFNGLLOADPALETTEFROMMODELVIEWMATRIXOESCONTEXTANGLEPROC>(
>+            loadProc("glLoadPaletteFromModelViewMatrixOESContextANGLE"));
>+    glMatrixIndexPointerOESContextANGLE =
>+        reinterpret_cast<PFNGLMATRIXINDEXPOINTEROESCONTEXTANGLEPROC>(
>+            loadProc("glMatrixIndexPointerOESContextANGLE"));
>+    glWeightPointerOESContextANGLE = reinterpret_cast<PFNGLWEIGHTPOINTEROESCONTEXTANGLEPROC>(
>+        loadProc("glWeightPointerOESContextANGLE"));
>+    glPointSizePointerOESContextANGLE = reinterpret_cast<PFNGLPOINTSIZEPOINTEROESCONTEXTANGLEPROC>(
>+        loadProc("glPointSizePointerOESContextANGLE"));
>+    glQueryMatrixxOESContextANGLE = reinterpret_cast<PFNGLQUERYMATRIXXOESCONTEXTANGLEPROC>(
>+        loadProc("glQueryMatrixxOESContextANGLE"));
>+    glGetTexGenfvOESContextANGLE = reinterpret_cast<PFNGLGETTEXGENFVOESCONTEXTANGLEPROC>(
>+        loadProc("glGetTexGenfvOESContextANGLE"));
>+    glGetTexGenivOESContextANGLE = reinterpret_cast<PFNGLGETTEXGENIVOESCONTEXTANGLEPROC>(
>+        loadProc("glGetTexGenivOESContextANGLE"));
>+    glGetTexGenxvOESContextANGLE = reinterpret_cast<PFNGLGETTEXGENXVOESCONTEXTANGLEPROC>(
>+        loadProc("glGetTexGenxvOESContextANGLE"));
>+    glTexGenfOESContextANGLE =
>+        reinterpret_cast<PFNGLTEXGENFOESCONTEXTANGLEPROC>(loadProc("glTexGenfOESContextANGLE"));
>+    glTexGenfvOESContextANGLE =
>+        reinterpret_cast<PFNGLTEXGENFVOESCONTEXTANGLEPROC>(loadProc("glTexGenfvOESContextANGLE"));
>+    glTexGeniOESContextANGLE =
>+        reinterpret_cast<PFNGLTEXGENIOESCONTEXTANGLEPROC>(loadProc("glTexGeniOESContextANGLE"));
>+    glTexGenivOESContextANGLE =
>+        reinterpret_cast<PFNGLTEXGENIVOESCONTEXTANGLEPROC>(loadProc("glTexGenivOESContextANGLE"));
>+    glTexGenxOESContextANGLE =
>+        reinterpret_cast<PFNGLTEXGENXOESCONTEXTANGLEPROC>(loadProc("glTexGenxOESContextANGLE"));
>+    glTexGenxvOESContextANGLE =
>+        reinterpret_cast<PFNGLTEXGENXVOESCONTEXTANGLEPROC>(loadProc("glTexGenxvOESContextANGLE"));
>+}
>+}  // namespace angle
>diff --git a/Source/ThirdParty/ANGLE/util/gles_loader_autogen.h b/Source/ThirdParty/ANGLE/util/gles_loader_autogen.h
>new file mode 100644
>index 00000000000..2a507c3f666
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/util/gles_loader_autogen.h
>@@ -0,0 +1,1577 @@
>+// GENERATED FILE - DO NOT EDIT.
>+// Generated by generate_loader.py using data from gl.xml and gl_angle_ext.xml.
>+//
>+// Copyright 2019 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// gles_loader_autogen.h:
>+//   Simple GLES function loader.
>+
>+#ifndef UTIL_GLES_LOADER_AUTOGEN_H_
>+#define UTIL_GLES_LOADER_AUTOGEN_H_
>+
>+#if defined(GL_GLES_PROTOTYPES) && GL_GLES_PROTOTYPES
>+#    error "Don't define GL prototypes if you want to use a loader!"
>+#endif  // defined(GL_GLES_PROTOTYPES)
>+
>+#include "angle_gl.h"
>+#include "util/util_export.h"
>+
>+ANGLE_UTIL_EXPORT extern PFNGLALPHAFUNCPROC glAlphaFunc;
>+ANGLE_UTIL_EXPORT extern PFNGLCLIPPLANEFPROC glClipPlanef;
>+ANGLE_UTIL_EXPORT extern PFNGLCOLOR4FPROC glColor4f;
>+ANGLE_UTIL_EXPORT extern PFNGLFOGFPROC glFogf;
>+ANGLE_UTIL_EXPORT extern PFNGLFOGFVPROC glFogfv;
>+ANGLE_UTIL_EXPORT extern PFNGLFRUSTUMFPROC glFrustumf;
>+ANGLE_UTIL_EXPORT extern PFNGLGETCLIPPLANEFPROC glGetClipPlanef;
>+ANGLE_UTIL_EXPORT extern PFNGLGETLIGHTFVPROC glGetLightfv;
>+ANGLE_UTIL_EXPORT extern PFNGLGETMATERIALFVPROC glGetMaterialfv;
>+ANGLE_UTIL_EXPORT extern PFNGLGETTEXENVFVPROC glGetTexEnvfv;
>+ANGLE_UTIL_EXPORT extern PFNGLLIGHTMODELFPROC glLightModelf;
>+ANGLE_UTIL_EXPORT extern PFNGLLIGHTMODELFVPROC glLightModelfv;
>+ANGLE_UTIL_EXPORT extern PFNGLLIGHTFPROC glLightf;
>+ANGLE_UTIL_EXPORT extern PFNGLLIGHTFVPROC glLightfv;
>+ANGLE_UTIL_EXPORT extern PFNGLLOADMATRIXFPROC glLoadMatrixf;
>+ANGLE_UTIL_EXPORT extern PFNGLMATERIALFPROC glMaterialf;
>+ANGLE_UTIL_EXPORT extern PFNGLMATERIALFVPROC glMaterialfv;
>+ANGLE_UTIL_EXPORT extern PFNGLMULTMATRIXFPROC glMultMatrixf;
>+ANGLE_UTIL_EXPORT extern PFNGLMULTITEXCOORD4FPROC glMultiTexCoord4f;
>+ANGLE_UTIL_EXPORT extern PFNGLNORMAL3FPROC glNormal3f;
>+ANGLE_UTIL_EXPORT extern PFNGLORTHOFPROC glOrthof;
>+ANGLE_UTIL_EXPORT extern PFNGLPOINTPARAMETERFPROC glPointParameterf;
>+ANGLE_UTIL_EXPORT extern PFNGLPOINTPARAMETERFVPROC glPointParameterfv;
>+ANGLE_UTIL_EXPORT extern PFNGLPOINTSIZEPROC glPointSize;
>+ANGLE_UTIL_EXPORT extern PFNGLROTATEFPROC glRotatef;
>+ANGLE_UTIL_EXPORT extern PFNGLSCALEFPROC glScalef;
>+ANGLE_UTIL_EXPORT extern PFNGLTEXENVFPROC glTexEnvf;
>+ANGLE_UTIL_EXPORT extern PFNGLTEXENVFVPROC glTexEnvfv;
>+ANGLE_UTIL_EXPORT extern PFNGLTRANSLATEFPROC glTranslatef;
>+ANGLE_UTIL_EXPORT extern PFNGLALPHAFUNCXPROC glAlphaFuncx;
>+ANGLE_UTIL_EXPORT extern PFNGLCLEARCOLORXPROC glClearColorx;
>+ANGLE_UTIL_EXPORT extern PFNGLCLEARDEPTHXPROC glClearDepthx;
>+ANGLE_UTIL_EXPORT extern PFNGLCLIENTACTIVETEXTUREPROC glClientActiveTexture;
>+ANGLE_UTIL_EXPORT extern PFNGLCLIPPLANEXPROC glClipPlanex;
>+ANGLE_UTIL_EXPORT extern PFNGLCOLOR4UBPROC glColor4ub;
>+ANGLE_UTIL_EXPORT extern PFNGLCOLOR4XPROC glColor4x;
>+ANGLE_UTIL_EXPORT extern PFNGLCOLORPOINTERPROC glColorPointer;
>+ANGLE_UTIL_EXPORT extern PFNGLDEPTHRANGEXPROC glDepthRangex;
>+ANGLE_UTIL_EXPORT extern PFNGLDISABLECLIENTSTATEPROC glDisableClientState;
>+ANGLE_UTIL_EXPORT extern PFNGLENABLECLIENTSTATEPROC glEnableClientState;
>+ANGLE_UTIL_EXPORT extern PFNGLFOGXPROC glFogx;
>+ANGLE_UTIL_EXPORT extern PFNGLFOGXVPROC glFogxv;
>+ANGLE_UTIL_EXPORT extern PFNGLFRUSTUMXPROC glFrustumx;
>+ANGLE_UTIL_EXPORT extern PFNGLGETCLIPPLANEXPROC glGetClipPlanex;
>+ANGLE_UTIL_EXPORT extern PFNGLGETFIXEDVPROC glGetFixedv;
>+ANGLE_UTIL_EXPORT extern PFNGLGETLIGHTXVPROC glGetLightxv;
>+ANGLE_UTIL_EXPORT extern PFNGLGETMATERIALXVPROC glGetMaterialxv;
>+ANGLE_UTIL_EXPORT extern PFNGLGETPOINTERVPROC glGetPointerv;
>+ANGLE_UTIL_EXPORT extern PFNGLGETTEXENVIVPROC glGetTexEnviv;
>+ANGLE_UTIL_EXPORT extern PFNGLGETTEXENVXVPROC glGetTexEnvxv;
>+ANGLE_UTIL_EXPORT extern PFNGLGETTEXPARAMETERXVPROC glGetTexParameterxv;
>+ANGLE_UTIL_EXPORT extern PFNGLLIGHTMODELXPROC glLightModelx;
>+ANGLE_UTIL_EXPORT extern PFNGLLIGHTMODELXVPROC glLightModelxv;
>+ANGLE_UTIL_EXPORT extern PFNGLLIGHTXPROC glLightx;
>+ANGLE_UTIL_EXPORT extern PFNGLLIGHTXVPROC glLightxv;
>+ANGLE_UTIL_EXPORT extern PFNGLLINEWIDTHXPROC glLineWidthx;
>+ANGLE_UTIL_EXPORT extern PFNGLLOADIDENTITYPROC glLoadIdentity;
>+ANGLE_UTIL_EXPORT extern PFNGLLOADMATRIXXPROC glLoadMatrixx;
>+ANGLE_UTIL_EXPORT extern PFNGLLOGICOPPROC glLogicOp;
>+ANGLE_UTIL_EXPORT extern PFNGLMATERIALXPROC glMaterialx;
>+ANGLE_UTIL_EXPORT extern PFNGLMATERIALXVPROC glMaterialxv;
>+ANGLE_UTIL_EXPORT extern PFNGLMATRIXMODEPROC glMatrixMode;
>+ANGLE_UTIL_EXPORT extern PFNGLMULTMATRIXXPROC glMultMatrixx;
>+ANGLE_UTIL_EXPORT extern PFNGLMULTITEXCOORD4XPROC glMultiTexCoord4x;
>+ANGLE_UTIL_EXPORT extern PFNGLNORMAL3XPROC glNormal3x;
>+ANGLE_UTIL_EXPORT extern PFNGLNORMALPOINTERPROC glNormalPointer;
>+ANGLE_UTIL_EXPORT extern PFNGLORTHOXPROC glOrthox;
>+ANGLE_UTIL_EXPORT extern PFNGLPOINTPARAMETERXPROC glPointParameterx;
>+ANGLE_UTIL_EXPORT extern PFNGLPOINTPARAMETERXVPROC glPointParameterxv;
>+ANGLE_UTIL_EXPORT extern PFNGLPOINTSIZEXPROC glPointSizex;
>+ANGLE_UTIL_EXPORT extern PFNGLPOLYGONOFFSETXPROC glPolygonOffsetx;
>+ANGLE_UTIL_EXPORT extern PFNGLPOPMATRIXPROC glPopMatrix;
>+ANGLE_UTIL_EXPORT extern PFNGLPUSHMATRIXPROC glPushMatrix;
>+ANGLE_UTIL_EXPORT extern PFNGLROTATEXPROC glRotatex;
>+ANGLE_UTIL_EXPORT extern PFNGLSAMPLECOVERAGEXPROC glSampleCoveragex;
>+ANGLE_UTIL_EXPORT extern PFNGLSCALEXPROC glScalex;
>+ANGLE_UTIL_EXPORT extern PFNGLSHADEMODELPROC glShadeModel;
>+ANGLE_UTIL_EXPORT extern PFNGLTEXCOORDPOINTERPROC glTexCoordPointer;
>+ANGLE_UTIL_EXPORT extern PFNGLTEXENVIPROC glTexEnvi;
>+ANGLE_UTIL_EXPORT extern PFNGLTEXENVXPROC glTexEnvx;
>+ANGLE_UTIL_EXPORT extern PFNGLTEXENVIVPROC glTexEnviv;
>+ANGLE_UTIL_EXPORT extern PFNGLTEXENVXVPROC glTexEnvxv;
>+ANGLE_UTIL_EXPORT extern PFNGLTEXPARAMETERXPROC glTexParameterx;
>+ANGLE_UTIL_EXPORT extern PFNGLTEXPARAMETERXVPROC glTexParameterxv;
>+ANGLE_UTIL_EXPORT extern PFNGLTRANSLATEXPROC glTranslatex;
>+ANGLE_UTIL_EXPORT extern PFNGLVERTEXPOINTERPROC glVertexPointer;
>+ANGLE_UTIL_EXPORT extern PFNGLACTIVETEXTUREPROC glActiveTexture;
>+ANGLE_UTIL_EXPORT extern PFNGLATTACHSHADERPROC glAttachShader;
>+ANGLE_UTIL_EXPORT extern PFNGLBINDATTRIBLOCATIONPROC glBindAttribLocation;
>+ANGLE_UTIL_EXPORT extern PFNGLBINDBUFFERPROC glBindBuffer;
>+ANGLE_UTIL_EXPORT extern PFNGLBINDFRAMEBUFFERPROC glBindFramebuffer;
>+ANGLE_UTIL_EXPORT extern PFNGLBINDRENDERBUFFERPROC glBindRenderbuffer;
>+ANGLE_UTIL_EXPORT extern PFNGLBINDTEXTUREPROC glBindTexture;
>+ANGLE_UTIL_EXPORT extern PFNGLBLENDCOLORPROC glBlendColor;
>+ANGLE_UTIL_EXPORT extern PFNGLBLENDEQUATIONPROC glBlendEquation;
>+ANGLE_UTIL_EXPORT extern PFNGLBLENDEQUATIONSEPARATEPROC glBlendEquationSeparate;
>+ANGLE_UTIL_EXPORT extern PFNGLBLENDFUNCPROC glBlendFunc;
>+ANGLE_UTIL_EXPORT extern PFNGLBLENDFUNCSEPARATEPROC glBlendFuncSeparate;
>+ANGLE_UTIL_EXPORT extern PFNGLBUFFERDATAPROC glBufferData;
>+ANGLE_UTIL_EXPORT extern PFNGLBUFFERSUBDATAPROC glBufferSubData;
>+ANGLE_UTIL_EXPORT extern PFNGLCHECKFRAMEBUFFERSTATUSPROC glCheckFramebufferStatus;
>+ANGLE_UTIL_EXPORT extern PFNGLCLEARPROC glClear;
>+ANGLE_UTIL_EXPORT extern PFNGLCLEARCOLORPROC glClearColor;
>+ANGLE_UTIL_EXPORT extern PFNGLCLEARDEPTHFPROC glClearDepthf;
>+ANGLE_UTIL_EXPORT extern PFNGLCLEARSTENCILPROC glClearStencil;
>+ANGLE_UTIL_EXPORT extern PFNGLCOLORMASKPROC glColorMask;
>+ANGLE_UTIL_EXPORT extern PFNGLCOMPILESHADERPROC glCompileShader;
>+ANGLE_UTIL_EXPORT extern PFNGLCOMPRESSEDTEXIMAGE2DPROC glCompressedTexImage2D;
>+ANGLE_UTIL_EXPORT extern PFNGLCOMPRESSEDTEXSUBIMAGE2DPROC glCompressedTexSubImage2D;
>+ANGLE_UTIL_EXPORT extern PFNGLCOPYTEXIMAGE2DPROC glCopyTexImage2D;
>+ANGLE_UTIL_EXPORT extern PFNGLCOPYTEXSUBIMAGE2DPROC glCopyTexSubImage2D;
>+ANGLE_UTIL_EXPORT extern PFNGLCREATEPROGRAMPROC glCreateProgram;
>+ANGLE_UTIL_EXPORT extern PFNGLCREATESHADERPROC glCreateShader;
>+ANGLE_UTIL_EXPORT extern PFNGLCULLFACEPROC glCullFace;
>+ANGLE_UTIL_EXPORT extern PFNGLDELETEBUFFERSPROC glDeleteBuffers;
>+ANGLE_UTIL_EXPORT extern PFNGLDELETEFRAMEBUFFERSPROC glDeleteFramebuffers;
>+ANGLE_UTIL_EXPORT extern PFNGLDELETEPROGRAMPROC glDeleteProgram;
>+ANGLE_UTIL_EXPORT extern PFNGLDELETERENDERBUFFERSPROC glDeleteRenderbuffers;
>+ANGLE_UTIL_EXPORT extern PFNGLDELETESHADERPROC glDeleteShader;
>+ANGLE_UTIL_EXPORT extern PFNGLDELETETEXTURESPROC glDeleteTextures;
>+ANGLE_UTIL_EXPORT extern PFNGLDEPTHFUNCPROC glDepthFunc;
>+ANGLE_UTIL_EXPORT extern PFNGLDEPTHMASKPROC glDepthMask;
>+ANGLE_UTIL_EXPORT extern PFNGLDEPTHRANGEFPROC glDepthRangef;
>+ANGLE_UTIL_EXPORT extern PFNGLDETACHSHADERPROC glDetachShader;
>+ANGLE_UTIL_EXPORT extern PFNGLDISABLEPROC glDisable;
>+ANGLE_UTIL_EXPORT extern PFNGLDISABLEVERTEXATTRIBARRAYPROC glDisableVertexAttribArray;
>+ANGLE_UTIL_EXPORT extern PFNGLDRAWARRAYSPROC glDrawArrays;
>+ANGLE_UTIL_EXPORT extern PFNGLDRAWELEMENTSPROC glDrawElements;
>+ANGLE_UTIL_EXPORT extern PFNGLENABLEPROC glEnable;
>+ANGLE_UTIL_EXPORT extern PFNGLENABLEVERTEXATTRIBARRAYPROC glEnableVertexAttribArray;
>+ANGLE_UTIL_EXPORT extern PFNGLFINISHPROC glFinish;
>+ANGLE_UTIL_EXPORT extern PFNGLFLUSHPROC glFlush;
>+ANGLE_UTIL_EXPORT extern PFNGLFRAMEBUFFERRENDERBUFFERPROC glFramebufferRenderbuffer;
>+ANGLE_UTIL_EXPORT extern PFNGLFRAMEBUFFERTEXTURE2DPROC glFramebufferTexture2D;
>+ANGLE_UTIL_EXPORT extern PFNGLFRONTFACEPROC glFrontFace;
>+ANGLE_UTIL_EXPORT extern PFNGLGENBUFFERSPROC glGenBuffers;
>+ANGLE_UTIL_EXPORT extern PFNGLGENERATEMIPMAPPROC glGenerateMipmap;
>+ANGLE_UTIL_EXPORT extern PFNGLGENFRAMEBUFFERSPROC glGenFramebuffers;
>+ANGLE_UTIL_EXPORT extern PFNGLGENRENDERBUFFERSPROC glGenRenderbuffers;
>+ANGLE_UTIL_EXPORT extern PFNGLGENTEXTURESPROC glGenTextures;
>+ANGLE_UTIL_EXPORT extern PFNGLGETACTIVEATTRIBPROC glGetActiveAttrib;
>+ANGLE_UTIL_EXPORT extern PFNGLGETACTIVEUNIFORMPROC glGetActiveUniform;
>+ANGLE_UTIL_EXPORT extern PFNGLGETATTACHEDSHADERSPROC glGetAttachedShaders;
>+ANGLE_UTIL_EXPORT extern PFNGLGETATTRIBLOCATIONPROC glGetAttribLocation;
>+ANGLE_UTIL_EXPORT extern PFNGLGETBOOLEANVPROC glGetBooleanv;
>+ANGLE_UTIL_EXPORT extern PFNGLGETBUFFERPARAMETERIVPROC glGetBufferParameteriv;
>+ANGLE_UTIL_EXPORT extern PFNGLGETERRORPROC glGetError;
>+ANGLE_UTIL_EXPORT extern PFNGLGETFLOATVPROC glGetFloatv;
>+ANGLE_UTIL_EXPORT extern PFNGLGETFRAMEBUFFERATTACHMENTPARAMETERIVPROC
>+    glGetFramebufferAttachmentParameteriv;
>+ANGLE_UTIL_EXPORT extern PFNGLGETINTEGERVPROC glGetIntegerv;
>+ANGLE_UTIL_EXPORT extern PFNGLGETPROGRAMIVPROC glGetProgramiv;
>+ANGLE_UTIL_EXPORT extern PFNGLGETPROGRAMINFOLOGPROC glGetProgramInfoLog;
>+ANGLE_UTIL_EXPORT extern PFNGLGETRENDERBUFFERPARAMETERIVPROC glGetRenderbufferParameteriv;
>+ANGLE_UTIL_EXPORT extern PFNGLGETSHADERIVPROC glGetShaderiv;
>+ANGLE_UTIL_EXPORT extern PFNGLGETSHADERINFOLOGPROC glGetShaderInfoLog;
>+ANGLE_UTIL_EXPORT extern PFNGLGETSHADERPRECISIONFORMATPROC glGetShaderPrecisionFormat;
>+ANGLE_UTIL_EXPORT extern PFNGLGETSHADERSOURCEPROC glGetShaderSource;
>+ANGLE_UTIL_EXPORT extern PFNGLGETSTRINGPROC glGetString;
>+ANGLE_UTIL_EXPORT extern PFNGLGETTEXPARAMETERFVPROC glGetTexParameterfv;
>+ANGLE_UTIL_EXPORT extern PFNGLGETTEXPARAMETERIVPROC glGetTexParameteriv;
>+ANGLE_UTIL_EXPORT extern PFNGLGETUNIFORMFVPROC glGetUniformfv;
>+ANGLE_UTIL_EXPORT extern PFNGLGETUNIFORMIVPROC glGetUniformiv;
>+ANGLE_UTIL_EXPORT extern PFNGLGETUNIFORMLOCATIONPROC glGetUniformLocation;
>+ANGLE_UTIL_EXPORT extern PFNGLGETVERTEXATTRIBFVPROC glGetVertexAttribfv;
>+ANGLE_UTIL_EXPORT extern PFNGLGETVERTEXATTRIBIVPROC glGetVertexAttribiv;
>+ANGLE_UTIL_EXPORT extern PFNGLGETVERTEXATTRIBPOINTERVPROC glGetVertexAttribPointerv;
>+ANGLE_UTIL_EXPORT extern PFNGLHINTPROC glHint;
>+ANGLE_UTIL_EXPORT extern PFNGLISBUFFERPROC glIsBuffer;
>+ANGLE_UTIL_EXPORT extern PFNGLISENABLEDPROC glIsEnabled;
>+ANGLE_UTIL_EXPORT extern PFNGLISFRAMEBUFFERPROC glIsFramebuffer;
>+ANGLE_UTIL_EXPORT extern PFNGLISPROGRAMPROC glIsProgram;
>+ANGLE_UTIL_EXPORT extern PFNGLISRENDERBUFFERPROC glIsRenderbuffer;
>+ANGLE_UTIL_EXPORT extern PFNGLISSHADERPROC glIsShader;
>+ANGLE_UTIL_EXPORT extern PFNGLISTEXTUREPROC glIsTexture;
>+ANGLE_UTIL_EXPORT extern PFNGLLINEWIDTHPROC glLineWidth;
>+ANGLE_UTIL_EXPORT extern PFNGLLINKPROGRAMPROC glLinkProgram;
>+ANGLE_UTIL_EXPORT extern PFNGLPIXELSTOREIPROC glPixelStorei;
>+ANGLE_UTIL_EXPORT extern PFNGLPOLYGONOFFSETPROC glPolygonOffset;
>+ANGLE_UTIL_EXPORT extern PFNGLREADPIXELSPROC glReadPixels;
>+ANGLE_UTIL_EXPORT extern PFNGLRELEASESHADERCOMPILERPROC glReleaseShaderCompiler;
>+ANGLE_UTIL_EXPORT extern PFNGLRENDERBUFFERSTORAGEPROC glRenderbufferStorage;
>+ANGLE_UTIL_EXPORT extern PFNGLSAMPLECOVERAGEPROC glSampleCoverage;
>+ANGLE_UTIL_EXPORT extern PFNGLSCISSORPROC glScissor;
>+ANGLE_UTIL_EXPORT extern PFNGLSHADERBINARYPROC glShaderBinary;
>+ANGLE_UTIL_EXPORT extern PFNGLSHADERSOURCEPROC glShaderSource;
>+ANGLE_UTIL_EXPORT extern PFNGLSTENCILFUNCPROC glStencilFunc;
>+ANGLE_UTIL_EXPORT extern PFNGLSTENCILFUNCSEPARATEPROC glStencilFuncSeparate;
>+ANGLE_UTIL_EXPORT extern PFNGLSTENCILMASKPROC glStencilMask;
>+ANGLE_UTIL_EXPORT extern PFNGLSTENCILMASKSEPARATEPROC glStencilMaskSeparate;
>+ANGLE_UTIL_EXPORT extern PFNGLSTENCILOPPROC glStencilOp;
>+ANGLE_UTIL_EXPORT extern PFNGLSTENCILOPSEPARATEPROC glStencilOpSeparate;
>+ANGLE_UTIL_EXPORT extern PFNGLTEXIMAGE2DPROC glTexImage2D;
>+ANGLE_UTIL_EXPORT extern PFNGLTEXPARAMETERFPROC glTexParameterf;
>+ANGLE_UTIL_EXPORT extern PFNGLTEXPARAMETERFVPROC glTexParameterfv;
>+ANGLE_UTIL_EXPORT extern PFNGLTEXPARAMETERIPROC glTexParameteri;
>+ANGLE_UTIL_EXPORT extern PFNGLTEXPARAMETERIVPROC glTexParameteriv;
>+ANGLE_UTIL_EXPORT extern PFNGLTEXSUBIMAGE2DPROC glTexSubImage2D;
>+ANGLE_UTIL_EXPORT extern PFNGLUNIFORM1FPROC glUniform1f;
>+ANGLE_UTIL_EXPORT extern PFNGLUNIFORM1FVPROC glUniform1fv;
>+ANGLE_UTIL_EXPORT extern PFNGLUNIFORM1IPROC glUniform1i;
>+ANGLE_UTIL_EXPORT extern PFNGLUNIFORM1IVPROC glUniform1iv;
>+ANGLE_UTIL_EXPORT extern PFNGLUNIFORM2FPROC glUniform2f;
>+ANGLE_UTIL_EXPORT extern PFNGLUNIFORM2FVPROC glUniform2fv;
>+ANGLE_UTIL_EXPORT extern PFNGLUNIFORM2IPROC glUniform2i;
>+ANGLE_UTIL_EXPORT extern PFNGLUNIFORM2IVPROC glUniform2iv;
>+ANGLE_UTIL_EXPORT extern PFNGLUNIFORM3FPROC glUniform3f;
>+ANGLE_UTIL_EXPORT extern PFNGLUNIFORM3FVPROC glUniform3fv;
>+ANGLE_UTIL_EXPORT extern PFNGLUNIFORM3IPROC glUniform3i;
>+ANGLE_UTIL_EXPORT extern PFNGLUNIFORM3IVPROC glUniform3iv;
>+ANGLE_UTIL_EXPORT extern PFNGLUNIFORM4FPROC glUniform4f;
>+ANGLE_UTIL_EXPORT extern PFNGLUNIFORM4FVPROC glUniform4fv;
>+ANGLE_UTIL_EXPORT extern PFNGLUNIFORM4IPROC glUniform4i;
>+ANGLE_UTIL_EXPORT extern PFNGLUNIFORM4IVPROC glUniform4iv;
>+ANGLE_UTIL_EXPORT extern PFNGLUNIFORMMATRIX2FVPROC glUniformMatrix2fv;
>+ANGLE_UTIL_EXPORT extern PFNGLUNIFORMMATRIX3FVPROC glUniformMatrix3fv;
>+ANGLE_UTIL_EXPORT extern PFNGLUNIFORMMATRIX4FVPROC glUniformMatrix4fv;
>+ANGLE_UTIL_EXPORT extern PFNGLUSEPROGRAMPROC glUseProgram;
>+ANGLE_UTIL_EXPORT extern PFNGLVALIDATEPROGRAMPROC glValidateProgram;
>+ANGLE_UTIL_EXPORT extern PFNGLVERTEXATTRIB1FPROC glVertexAttrib1f;
>+ANGLE_UTIL_EXPORT extern PFNGLVERTEXATTRIB1FVPROC glVertexAttrib1fv;
>+ANGLE_UTIL_EXPORT extern PFNGLVERTEXATTRIB2FPROC glVertexAttrib2f;
>+ANGLE_UTIL_EXPORT extern PFNGLVERTEXATTRIB2FVPROC glVertexAttrib2fv;
>+ANGLE_UTIL_EXPORT extern PFNGLVERTEXATTRIB3FPROC glVertexAttrib3f;
>+ANGLE_UTIL_EXPORT extern PFNGLVERTEXATTRIB3FVPROC glVertexAttrib3fv;
>+ANGLE_UTIL_EXPORT extern PFNGLVERTEXATTRIB4FPROC glVertexAttrib4f;
>+ANGLE_UTIL_EXPORT extern PFNGLVERTEXATTRIB4FVPROC glVertexAttrib4fv;
>+ANGLE_UTIL_EXPORT extern PFNGLVERTEXATTRIBPOINTERPROC glVertexAttribPointer;
>+ANGLE_UTIL_EXPORT extern PFNGLVIEWPORTPROC glViewport;
>+ANGLE_UTIL_EXPORT extern PFNGLREADBUFFERPROC glReadBuffer;
>+ANGLE_UTIL_EXPORT extern PFNGLDRAWRANGEELEMENTSPROC glDrawRangeElements;
>+ANGLE_UTIL_EXPORT extern PFNGLTEXIMAGE3DPROC glTexImage3D;
>+ANGLE_UTIL_EXPORT extern PFNGLTEXSUBIMAGE3DPROC glTexSubImage3D;
>+ANGLE_UTIL_EXPORT extern PFNGLCOPYTEXSUBIMAGE3DPROC glCopyTexSubImage3D;
>+ANGLE_UTIL_EXPORT extern PFNGLCOMPRESSEDTEXIMAGE3DPROC glCompressedTexImage3D;
>+ANGLE_UTIL_EXPORT extern PFNGLCOMPRESSEDTEXSUBIMAGE3DPROC glCompressedTexSubImage3D;
>+ANGLE_UTIL_EXPORT extern PFNGLGENQUERIESPROC glGenQueries;
>+ANGLE_UTIL_EXPORT extern PFNGLDELETEQUERIESPROC glDeleteQueries;
>+ANGLE_UTIL_EXPORT extern PFNGLISQUERYPROC glIsQuery;
>+ANGLE_UTIL_EXPORT extern PFNGLBEGINQUERYPROC glBeginQuery;
>+ANGLE_UTIL_EXPORT extern PFNGLENDQUERYPROC glEndQuery;
>+ANGLE_UTIL_EXPORT extern PFNGLGETQUERYIVPROC glGetQueryiv;
>+ANGLE_UTIL_EXPORT extern PFNGLGETQUERYOBJECTUIVPROC glGetQueryObjectuiv;
>+ANGLE_UTIL_EXPORT extern PFNGLUNMAPBUFFERPROC glUnmapBuffer;
>+ANGLE_UTIL_EXPORT extern PFNGLGETBUFFERPOINTERVPROC glGetBufferPointerv;
>+ANGLE_UTIL_EXPORT extern PFNGLDRAWBUFFERSPROC glDrawBuffers;
>+ANGLE_UTIL_EXPORT extern PFNGLUNIFORMMATRIX2X3FVPROC glUniformMatrix2x3fv;
>+ANGLE_UTIL_EXPORT extern PFNGLUNIFORMMATRIX3X2FVPROC glUniformMatrix3x2fv;
>+ANGLE_UTIL_EXPORT extern PFNGLUNIFORMMATRIX2X4FVPROC glUniformMatrix2x4fv;
>+ANGLE_UTIL_EXPORT extern PFNGLUNIFORMMATRIX4X2FVPROC glUniformMatrix4x2fv;
>+ANGLE_UTIL_EXPORT extern PFNGLUNIFORMMATRIX3X4FVPROC glUniformMatrix3x4fv;
>+ANGLE_UTIL_EXPORT extern PFNGLUNIFORMMATRIX4X3FVPROC glUniformMatrix4x3fv;
>+ANGLE_UTIL_EXPORT extern PFNGLBLITFRAMEBUFFERPROC glBlitFramebuffer;
>+ANGLE_UTIL_EXPORT extern PFNGLRENDERBUFFERSTORAGEMULTISAMPLEPROC glRenderbufferStorageMultisample;
>+ANGLE_UTIL_EXPORT extern PFNGLFRAMEBUFFERTEXTURELAYERPROC glFramebufferTextureLayer;
>+ANGLE_UTIL_EXPORT extern PFNGLMAPBUFFERRANGEPROC glMapBufferRange;
>+ANGLE_UTIL_EXPORT extern PFNGLFLUSHMAPPEDBUFFERRANGEPROC glFlushMappedBufferRange;
>+ANGLE_UTIL_EXPORT extern PFNGLBINDVERTEXARRAYPROC glBindVertexArray;
>+ANGLE_UTIL_EXPORT extern PFNGLDELETEVERTEXARRAYSPROC glDeleteVertexArrays;
>+ANGLE_UTIL_EXPORT extern PFNGLGENVERTEXARRAYSPROC glGenVertexArrays;
>+ANGLE_UTIL_EXPORT extern PFNGLISVERTEXARRAYPROC glIsVertexArray;
>+ANGLE_UTIL_EXPORT extern PFNGLGETINTEGERI_VPROC glGetIntegeri_v;
>+ANGLE_UTIL_EXPORT extern PFNGLBEGINTRANSFORMFEEDBACKPROC glBeginTransformFeedback;
>+ANGLE_UTIL_EXPORT extern PFNGLENDTRANSFORMFEEDBACKPROC glEndTransformFeedback;
>+ANGLE_UTIL_EXPORT extern PFNGLBINDBUFFERRANGEPROC glBindBufferRange;
>+ANGLE_UTIL_EXPORT extern PFNGLBINDBUFFERBASEPROC glBindBufferBase;
>+ANGLE_UTIL_EXPORT extern PFNGLTRANSFORMFEEDBACKVARYINGSPROC glTransformFeedbackVaryings;
>+ANGLE_UTIL_EXPORT extern PFNGLGETTRANSFORMFEEDBACKVARYINGPROC glGetTransformFeedbackVarying;
>+ANGLE_UTIL_EXPORT extern PFNGLVERTEXATTRIBIPOINTERPROC glVertexAttribIPointer;
>+ANGLE_UTIL_EXPORT extern PFNGLGETVERTEXATTRIBIIVPROC glGetVertexAttribIiv;
>+ANGLE_UTIL_EXPORT extern PFNGLGETVERTEXATTRIBIUIVPROC glGetVertexAttribIuiv;
>+ANGLE_UTIL_EXPORT extern PFNGLVERTEXATTRIBI4IPROC glVertexAttribI4i;
>+ANGLE_UTIL_EXPORT extern PFNGLVERTEXATTRIBI4UIPROC glVertexAttribI4ui;
>+ANGLE_UTIL_EXPORT extern PFNGLVERTEXATTRIBI4IVPROC glVertexAttribI4iv;
>+ANGLE_UTIL_EXPORT extern PFNGLVERTEXATTRIBI4UIVPROC glVertexAttribI4uiv;
>+ANGLE_UTIL_EXPORT extern PFNGLGETUNIFORMUIVPROC glGetUniformuiv;
>+ANGLE_UTIL_EXPORT extern PFNGLGETFRAGDATALOCATIONPROC glGetFragDataLocation;
>+ANGLE_UTIL_EXPORT extern PFNGLUNIFORM1UIPROC glUniform1ui;
>+ANGLE_UTIL_EXPORT extern PFNGLUNIFORM2UIPROC glUniform2ui;
>+ANGLE_UTIL_EXPORT extern PFNGLUNIFORM3UIPROC glUniform3ui;
>+ANGLE_UTIL_EXPORT extern PFNGLUNIFORM4UIPROC glUniform4ui;
>+ANGLE_UTIL_EXPORT extern PFNGLUNIFORM1UIVPROC glUniform1uiv;
>+ANGLE_UTIL_EXPORT extern PFNGLUNIFORM2UIVPROC glUniform2uiv;
>+ANGLE_UTIL_EXPORT extern PFNGLUNIFORM3UIVPROC glUniform3uiv;
>+ANGLE_UTIL_EXPORT extern PFNGLUNIFORM4UIVPROC glUniform4uiv;
>+ANGLE_UTIL_EXPORT extern PFNGLCLEARBUFFERIVPROC glClearBufferiv;
>+ANGLE_UTIL_EXPORT extern PFNGLCLEARBUFFERUIVPROC glClearBufferuiv;
>+ANGLE_UTIL_EXPORT extern PFNGLCLEARBUFFERFVPROC glClearBufferfv;
>+ANGLE_UTIL_EXPORT extern PFNGLCLEARBUFFERFIPROC glClearBufferfi;
>+ANGLE_UTIL_EXPORT extern PFNGLGETSTRINGIPROC glGetStringi;
>+ANGLE_UTIL_EXPORT extern PFNGLCOPYBUFFERSUBDATAPROC glCopyBufferSubData;
>+ANGLE_UTIL_EXPORT extern PFNGLGETUNIFORMINDICESPROC glGetUniformIndices;
>+ANGLE_UTIL_EXPORT extern PFNGLGETACTIVEUNIFORMSIVPROC glGetActiveUniformsiv;
>+ANGLE_UTIL_EXPORT extern PFNGLGETUNIFORMBLOCKINDEXPROC glGetUniformBlockIndex;
>+ANGLE_UTIL_EXPORT extern PFNGLGETACTIVEUNIFORMBLOCKIVPROC glGetActiveUniformBlockiv;
>+ANGLE_UTIL_EXPORT extern PFNGLGETACTIVEUNIFORMBLOCKNAMEPROC glGetActiveUniformBlockName;
>+ANGLE_UTIL_EXPORT extern PFNGLUNIFORMBLOCKBINDINGPROC glUniformBlockBinding;
>+ANGLE_UTIL_EXPORT extern PFNGLDRAWARRAYSINSTANCEDPROC glDrawArraysInstanced;
>+ANGLE_UTIL_EXPORT extern PFNGLDRAWELEMENTSINSTANCEDPROC glDrawElementsInstanced;
>+ANGLE_UTIL_EXPORT extern PFNGLFENCESYNCPROC glFenceSync;
>+ANGLE_UTIL_EXPORT extern PFNGLISSYNCPROC glIsSync;
>+ANGLE_UTIL_EXPORT extern PFNGLDELETESYNCPROC glDeleteSync;
>+ANGLE_UTIL_EXPORT extern PFNGLCLIENTWAITSYNCPROC glClientWaitSync;
>+ANGLE_UTIL_EXPORT extern PFNGLWAITSYNCPROC glWaitSync;
>+ANGLE_UTIL_EXPORT extern PFNGLGETINTEGER64VPROC glGetInteger64v;
>+ANGLE_UTIL_EXPORT extern PFNGLGETSYNCIVPROC glGetSynciv;
>+ANGLE_UTIL_EXPORT extern PFNGLGETINTEGER64I_VPROC glGetInteger64i_v;
>+ANGLE_UTIL_EXPORT extern PFNGLGETBUFFERPARAMETERI64VPROC glGetBufferParameteri64v;
>+ANGLE_UTIL_EXPORT extern PFNGLGENSAMPLERSPROC glGenSamplers;
>+ANGLE_UTIL_EXPORT extern PFNGLDELETESAMPLERSPROC glDeleteSamplers;
>+ANGLE_UTIL_EXPORT extern PFNGLISSAMPLERPROC glIsSampler;
>+ANGLE_UTIL_EXPORT extern PFNGLBINDSAMPLERPROC glBindSampler;
>+ANGLE_UTIL_EXPORT extern PFNGLSAMPLERPARAMETERIPROC glSamplerParameteri;
>+ANGLE_UTIL_EXPORT extern PFNGLSAMPLERPARAMETERIVPROC glSamplerParameteriv;
>+ANGLE_UTIL_EXPORT extern PFNGLSAMPLERPARAMETERFPROC glSamplerParameterf;
>+ANGLE_UTIL_EXPORT extern PFNGLSAMPLERPARAMETERFVPROC glSamplerParameterfv;
>+ANGLE_UTIL_EXPORT extern PFNGLGETSAMPLERPARAMETERIVPROC glGetSamplerParameteriv;
>+ANGLE_UTIL_EXPORT extern PFNGLGETSAMPLERPARAMETERFVPROC glGetSamplerParameterfv;
>+ANGLE_UTIL_EXPORT extern PFNGLVERTEXATTRIBDIVISORPROC glVertexAttribDivisor;
>+ANGLE_UTIL_EXPORT extern PFNGLBINDTRANSFORMFEEDBACKPROC glBindTransformFeedback;
>+ANGLE_UTIL_EXPORT extern PFNGLDELETETRANSFORMFEEDBACKSPROC glDeleteTransformFeedbacks;
>+ANGLE_UTIL_EXPORT extern PFNGLGENTRANSFORMFEEDBACKSPROC glGenTransformFeedbacks;
>+ANGLE_UTIL_EXPORT extern PFNGLISTRANSFORMFEEDBACKPROC glIsTransformFeedback;
>+ANGLE_UTIL_EXPORT extern PFNGLPAUSETRANSFORMFEEDBACKPROC glPauseTransformFeedback;
>+ANGLE_UTIL_EXPORT extern PFNGLRESUMETRANSFORMFEEDBACKPROC glResumeTransformFeedback;
>+ANGLE_UTIL_EXPORT extern PFNGLGETPROGRAMBINARYPROC glGetProgramBinary;
>+ANGLE_UTIL_EXPORT extern PFNGLPROGRAMBINARYPROC glProgramBinary;
>+ANGLE_UTIL_EXPORT extern PFNGLPROGRAMPARAMETERIPROC glProgramParameteri;
>+ANGLE_UTIL_EXPORT extern PFNGLINVALIDATEFRAMEBUFFERPROC glInvalidateFramebuffer;
>+ANGLE_UTIL_EXPORT extern PFNGLINVALIDATESUBFRAMEBUFFERPROC glInvalidateSubFramebuffer;
>+ANGLE_UTIL_EXPORT extern PFNGLTEXSTORAGE2DPROC glTexStorage2D;
>+ANGLE_UTIL_EXPORT extern PFNGLTEXSTORAGE3DPROC glTexStorage3D;
>+ANGLE_UTIL_EXPORT extern PFNGLGETINTERNALFORMATIVPROC glGetInternalformativ;
>+ANGLE_UTIL_EXPORT extern PFNGLDISPATCHCOMPUTEPROC glDispatchCompute;
>+ANGLE_UTIL_EXPORT extern PFNGLDISPATCHCOMPUTEINDIRECTPROC glDispatchComputeIndirect;
>+ANGLE_UTIL_EXPORT extern PFNGLDRAWARRAYSINDIRECTPROC glDrawArraysIndirect;
>+ANGLE_UTIL_EXPORT extern PFNGLDRAWELEMENTSINDIRECTPROC glDrawElementsIndirect;
>+ANGLE_UTIL_EXPORT extern PFNGLFRAMEBUFFERPARAMETERIPROC glFramebufferParameteri;
>+ANGLE_UTIL_EXPORT extern PFNGLGETFRAMEBUFFERPARAMETERIVPROC glGetFramebufferParameteriv;
>+ANGLE_UTIL_EXPORT extern PFNGLGETPROGRAMINTERFACEIVPROC glGetProgramInterfaceiv;
>+ANGLE_UTIL_EXPORT extern PFNGLGETPROGRAMRESOURCEINDEXPROC glGetProgramResourceIndex;
>+ANGLE_UTIL_EXPORT extern PFNGLGETPROGRAMRESOURCENAMEPROC glGetProgramResourceName;
>+ANGLE_UTIL_EXPORT extern PFNGLGETPROGRAMRESOURCEIVPROC glGetProgramResourceiv;
>+ANGLE_UTIL_EXPORT extern PFNGLGETPROGRAMRESOURCELOCATIONPROC glGetProgramResourceLocation;
>+ANGLE_UTIL_EXPORT extern PFNGLUSEPROGRAMSTAGESPROC glUseProgramStages;
>+ANGLE_UTIL_EXPORT extern PFNGLACTIVESHADERPROGRAMPROC glActiveShaderProgram;
>+ANGLE_UTIL_EXPORT extern PFNGLCREATESHADERPROGRAMVPROC glCreateShaderProgramv;
>+ANGLE_UTIL_EXPORT extern PFNGLBINDPROGRAMPIPELINEPROC glBindProgramPipeline;
>+ANGLE_UTIL_EXPORT extern PFNGLDELETEPROGRAMPIPELINESPROC glDeleteProgramPipelines;
>+ANGLE_UTIL_EXPORT extern PFNGLGENPROGRAMPIPELINESPROC glGenProgramPipelines;
>+ANGLE_UTIL_EXPORT extern PFNGLISPROGRAMPIPELINEPROC glIsProgramPipeline;
>+ANGLE_UTIL_EXPORT extern PFNGLGETPROGRAMPIPELINEIVPROC glGetProgramPipelineiv;
>+ANGLE_UTIL_EXPORT extern PFNGLPROGRAMUNIFORM1IPROC glProgramUniform1i;
>+ANGLE_UTIL_EXPORT extern PFNGLPROGRAMUNIFORM2IPROC glProgramUniform2i;
>+ANGLE_UTIL_EXPORT extern PFNGLPROGRAMUNIFORM3IPROC glProgramUniform3i;
>+ANGLE_UTIL_EXPORT extern PFNGLPROGRAMUNIFORM4IPROC glProgramUniform4i;
>+ANGLE_UTIL_EXPORT extern PFNGLPROGRAMUNIFORM1UIPROC glProgramUniform1ui;
>+ANGLE_UTIL_EXPORT extern PFNGLPROGRAMUNIFORM2UIPROC glProgramUniform2ui;
>+ANGLE_UTIL_EXPORT extern PFNGLPROGRAMUNIFORM3UIPROC glProgramUniform3ui;
>+ANGLE_UTIL_EXPORT extern PFNGLPROGRAMUNIFORM4UIPROC glProgramUniform4ui;
>+ANGLE_UTIL_EXPORT extern PFNGLPROGRAMUNIFORM1FPROC glProgramUniform1f;
>+ANGLE_UTIL_EXPORT extern PFNGLPROGRAMUNIFORM2FPROC glProgramUniform2f;
>+ANGLE_UTIL_EXPORT extern PFNGLPROGRAMUNIFORM3FPROC glProgramUniform3f;
>+ANGLE_UTIL_EXPORT extern PFNGLPROGRAMUNIFORM4FPROC glProgramUniform4f;
>+ANGLE_UTIL_EXPORT extern PFNGLPROGRAMUNIFORM1IVPROC glProgramUniform1iv;
>+ANGLE_UTIL_EXPORT extern PFNGLPROGRAMUNIFORM2IVPROC glProgramUniform2iv;
>+ANGLE_UTIL_EXPORT extern PFNGLPROGRAMUNIFORM3IVPROC glProgramUniform3iv;
>+ANGLE_UTIL_EXPORT extern PFNGLPROGRAMUNIFORM4IVPROC glProgramUniform4iv;
>+ANGLE_UTIL_EXPORT extern PFNGLPROGRAMUNIFORM1UIVPROC glProgramUniform1uiv;
>+ANGLE_UTIL_EXPORT extern PFNGLPROGRAMUNIFORM2UIVPROC glProgramUniform2uiv;
>+ANGLE_UTIL_EXPORT extern PFNGLPROGRAMUNIFORM3UIVPROC glProgramUniform3uiv;
>+ANGLE_UTIL_EXPORT extern PFNGLPROGRAMUNIFORM4UIVPROC glProgramUniform4uiv;
>+ANGLE_UTIL_EXPORT extern PFNGLPROGRAMUNIFORM1FVPROC glProgramUniform1fv;
>+ANGLE_UTIL_EXPORT extern PFNGLPROGRAMUNIFORM2FVPROC glProgramUniform2fv;
>+ANGLE_UTIL_EXPORT extern PFNGLPROGRAMUNIFORM3FVPROC glProgramUniform3fv;
>+ANGLE_UTIL_EXPORT extern PFNGLPROGRAMUNIFORM4FVPROC glProgramUniform4fv;
>+ANGLE_UTIL_EXPORT extern PFNGLPROGRAMUNIFORMMATRIX2FVPROC glProgramUniformMatrix2fv;
>+ANGLE_UTIL_EXPORT extern PFNGLPROGRAMUNIFORMMATRIX3FVPROC glProgramUniformMatrix3fv;
>+ANGLE_UTIL_EXPORT extern PFNGLPROGRAMUNIFORMMATRIX4FVPROC glProgramUniformMatrix4fv;
>+ANGLE_UTIL_EXPORT extern PFNGLPROGRAMUNIFORMMATRIX2X3FVPROC glProgramUniformMatrix2x3fv;
>+ANGLE_UTIL_EXPORT extern PFNGLPROGRAMUNIFORMMATRIX3X2FVPROC glProgramUniformMatrix3x2fv;
>+ANGLE_UTIL_EXPORT extern PFNGLPROGRAMUNIFORMMATRIX2X4FVPROC glProgramUniformMatrix2x4fv;
>+ANGLE_UTIL_EXPORT extern PFNGLPROGRAMUNIFORMMATRIX4X2FVPROC glProgramUniformMatrix4x2fv;
>+ANGLE_UTIL_EXPORT extern PFNGLPROGRAMUNIFORMMATRIX3X4FVPROC glProgramUniformMatrix3x4fv;
>+ANGLE_UTIL_EXPORT extern PFNGLPROGRAMUNIFORMMATRIX4X3FVPROC glProgramUniformMatrix4x3fv;
>+ANGLE_UTIL_EXPORT extern PFNGLVALIDATEPROGRAMPIPELINEPROC glValidateProgramPipeline;
>+ANGLE_UTIL_EXPORT extern PFNGLGETPROGRAMPIPELINEINFOLOGPROC glGetProgramPipelineInfoLog;
>+ANGLE_UTIL_EXPORT extern PFNGLBINDIMAGETEXTUREPROC glBindImageTexture;
>+ANGLE_UTIL_EXPORT extern PFNGLGETBOOLEANI_VPROC glGetBooleani_v;
>+ANGLE_UTIL_EXPORT extern PFNGLMEMORYBARRIERPROC glMemoryBarrier;
>+ANGLE_UTIL_EXPORT extern PFNGLMEMORYBARRIERBYREGIONPROC glMemoryBarrierByRegion;
>+ANGLE_UTIL_EXPORT extern PFNGLTEXSTORAGE2DMULTISAMPLEPROC glTexStorage2DMultisample;
>+ANGLE_UTIL_EXPORT extern PFNGLGETMULTISAMPLEFVPROC glGetMultisamplefv;
>+ANGLE_UTIL_EXPORT extern PFNGLSAMPLEMASKIPROC glSampleMaski;
>+ANGLE_UTIL_EXPORT extern PFNGLGETTEXLEVELPARAMETERIVPROC glGetTexLevelParameteriv;
>+ANGLE_UTIL_EXPORT extern PFNGLGETTEXLEVELPARAMETERFVPROC glGetTexLevelParameterfv;
>+ANGLE_UTIL_EXPORT extern PFNGLBINDVERTEXBUFFERPROC glBindVertexBuffer;
>+ANGLE_UTIL_EXPORT extern PFNGLVERTEXATTRIBFORMATPROC glVertexAttribFormat;
>+ANGLE_UTIL_EXPORT extern PFNGLVERTEXATTRIBIFORMATPROC glVertexAttribIFormat;
>+ANGLE_UTIL_EXPORT extern PFNGLVERTEXATTRIBBINDINGPROC glVertexAttribBinding;
>+ANGLE_UTIL_EXPORT extern PFNGLVERTEXBINDINGDIVISORPROC glVertexBindingDivisor;
>+ANGLE_UTIL_EXPORT extern PFNGLCOPYSUBTEXTURE3DANGLEPROC glCopySubTexture3DANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLCOPYTEXTURE3DANGLEPROC glCopyTexture3DANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLBLITFRAMEBUFFERANGLEPROC glBlitFramebufferANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLRENDERBUFFERSTORAGEMULTISAMPLEANGLEPROC
>+    glRenderbufferStorageMultisampleANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLDRAWARRAYSINSTANCEDANGLEPROC glDrawArraysInstancedANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLDRAWELEMENTSINSTANCEDANGLEPROC glDrawElementsInstancedANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLVERTEXATTRIBDIVISORANGLEPROC glVertexAttribDivisorANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLMULTIDRAWARRAYSANGLEPROC glMultiDrawArraysANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLMULTIDRAWARRAYSINSTANCEDANGLEPROC glMultiDrawArraysInstancedANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLMULTIDRAWELEMENTSANGLEPROC glMultiDrawElementsANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLMULTIDRAWELEMENTSINSTANCEDANGLEPROC glMultiDrawElementsInstancedANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLPROVOKINGVERTEXANGLEPROC glProvokingVertexANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLREQUESTEXTENSIONANGLEPROC glRequestExtensionANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLCOMPRESSEDTEXIMAGE2DROBUSTANGLEPROC glCompressedTexImage2DRobustANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLCOMPRESSEDTEXIMAGE3DROBUSTANGLEPROC glCompressedTexImage3DRobustANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLCOMPRESSEDTEXSUBIMAGE2DROBUSTANGLEPROC
>+    glCompressedTexSubImage2DRobustANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLCOMPRESSEDTEXSUBIMAGE3DROBUSTANGLEPROC
>+    glCompressedTexSubImage3DRobustANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLGETACTIVEUNIFORMBLOCKIVROBUSTANGLEPROC
>+    glGetActiveUniformBlockivRobustANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLGETBOOLEANI_VROBUSTANGLEPROC glGetBooleani_vRobustANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLGETBOOLEANVROBUSTANGLEPROC glGetBooleanvRobustANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLGETBUFFERPARAMETERI64VROBUSTANGLEPROC
>+    glGetBufferParameteri64vRobustANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLGETBUFFERPARAMETERIVROBUSTANGLEPROC glGetBufferParameterivRobustANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLGETBUFFERPOINTERVROBUSTANGLEPROC glGetBufferPointervRobustANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLGETFLOATVROBUSTANGLEPROC glGetFloatvRobustANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLGETFRAMEBUFFERATTACHMENTPARAMETERIVROBUSTANGLEPROC
>+    glGetFramebufferAttachmentParameterivRobustANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLGETFRAMEBUFFERPARAMETERIVROBUSTANGLEPROC
>+    glGetFramebufferParameterivRobustANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLGETINTEGER64I_VROBUSTANGLEPROC glGetInteger64i_vRobustANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLGETINTEGER64VROBUSTANGLEPROC glGetInteger64vRobustANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLGETINTEGERI_VROBUSTANGLEPROC glGetIntegeri_vRobustANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLGETINTEGERVROBUSTANGLEPROC glGetIntegervRobustANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLGETINTERNALFORMATIVROBUSTANGLEPROC glGetInternalformativRobustANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLGETMULTISAMPLEFVROBUSTANGLEPROC glGetMultisamplefvRobustANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLGETPOINTERVROBUSTANGLEROBUSTANGLEPROC
>+    glGetPointervRobustANGLERobustANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLGETPROGRAMINTERFACEIVROBUSTANGLEPROC
>+    glGetProgramInterfaceivRobustANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLGETPROGRAMIVROBUSTANGLEPROC glGetProgramivRobustANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLGETQUERYOBJECTI64VROBUSTANGLEPROC glGetQueryObjecti64vRobustANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLGETQUERYOBJECTIVROBUSTANGLEPROC glGetQueryObjectivRobustANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLGETQUERYOBJECTUI64VROBUSTANGLEPROC glGetQueryObjectui64vRobustANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLGETQUERYOBJECTUIVROBUSTANGLEPROC glGetQueryObjectuivRobustANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLGETQUERYIVROBUSTANGLEPROC glGetQueryivRobustANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLGETRENDERBUFFERPARAMETERIVROBUSTANGLEPROC
>+    glGetRenderbufferParameterivRobustANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLGETSAMPLERPARAMETERIIVROBUSTANGLEPROC
>+    glGetSamplerParameterIivRobustANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLGETSAMPLERPARAMETERIUIVROBUSTANGLEPROC
>+    glGetSamplerParameterIuivRobustANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLGETSAMPLERPARAMETERFVROBUSTANGLEPROC
>+    glGetSamplerParameterfvRobustANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLGETSAMPLERPARAMETERIVROBUSTANGLEPROC
>+    glGetSamplerParameterivRobustANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLGETSHADERIVROBUSTANGLEPROC glGetShaderivRobustANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLGETTEXLEVELPARAMETERFVROBUSTANGLEPROC
>+    glGetTexLevelParameterfvRobustANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLGETTEXLEVELPARAMETERIVROBUSTANGLEPROC
>+    glGetTexLevelParameterivRobustANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLGETTEXPARAMETERIIVROBUSTANGLEPROC glGetTexParameterIivRobustANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLGETTEXPARAMETERIUIVROBUSTANGLEPROC glGetTexParameterIuivRobustANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLGETTEXPARAMETERFVROBUSTANGLEPROC glGetTexParameterfvRobustANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLGETTEXPARAMETERIVROBUSTANGLEPROC glGetTexParameterivRobustANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLGETUNIFORMFVROBUSTANGLEPROC glGetUniformfvRobustANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLGETUNIFORMIVROBUSTANGLEPROC glGetUniformivRobustANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLGETUNIFORMUIVROBUSTANGLEPROC glGetUniformuivRobustANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLGETVERTEXATTRIBIIVROBUSTANGLEPROC glGetVertexAttribIivRobustANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLGETVERTEXATTRIBIUIVROBUSTANGLEPROC glGetVertexAttribIuivRobustANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLGETVERTEXATTRIBPOINTERVROBUSTANGLEPROC
>+    glGetVertexAttribPointervRobustANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLGETVERTEXATTRIBFVROBUSTANGLEPROC glGetVertexAttribfvRobustANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLGETVERTEXATTRIBIVROBUSTANGLEPROC glGetVertexAttribivRobustANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLGETNUNIFORMFVROBUSTANGLEPROC glGetnUniformfvRobustANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLGETNUNIFORMIVROBUSTANGLEPROC glGetnUniformivRobustANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLGETNUNIFORMUIVROBUSTANGLEPROC glGetnUniformuivRobustANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLREADPIXELSROBUSTANGLEPROC glReadPixelsRobustANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLREADNPIXELSROBUSTANGLEPROC glReadnPixelsRobustANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLSAMPLERPARAMETERIIVROBUSTANGLEPROC glSamplerParameterIivRobustANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLSAMPLERPARAMETERIUIVROBUSTANGLEPROC glSamplerParameterIuivRobustANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLSAMPLERPARAMETERFVROBUSTANGLEPROC glSamplerParameterfvRobustANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLSAMPLERPARAMETERIVROBUSTANGLEPROC glSamplerParameterivRobustANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLTEXIMAGE2DROBUSTANGLEPROC glTexImage2DRobustANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLTEXIMAGE3DROBUSTANGLEPROC glTexImage3DRobustANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLTEXPARAMETERIIVROBUSTANGLEPROC glTexParameterIivRobustANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLTEXPARAMETERIUIVROBUSTANGLEPROC glTexParameterIuivRobustANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLTEXPARAMETERFVROBUSTANGLEPROC glTexParameterfvRobustANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLTEXPARAMETERIVROBUSTANGLEPROC glTexParameterivRobustANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLTEXSUBIMAGE2DROBUSTANGLEPROC glTexSubImage2DRobustANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLTEXSUBIMAGE3DROBUSTANGLEPROC glTexSubImage3DRobustANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLGETMULTISAMPLEFVANGLEPROC glGetMultisamplefvANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLGETTEXLEVELPARAMETERFVANGLEPROC glGetTexLevelParameterfvANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLGETTEXLEVELPARAMETERIVANGLEPROC glGetTexLevelParameterivANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLSAMPLEMASKIANGLEPROC glSampleMaskiANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLTEXSTORAGE2DMULTISAMPLEANGLEPROC glTexStorage2DMultisampleANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLGETTRANSLATEDSHADERSOURCEANGLEPROC glGetTranslatedShaderSourceANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLBINDUNIFORMLOCATIONCHROMIUMPROC glBindUniformLocationCHROMIUM;
>+ANGLE_UTIL_EXPORT extern PFNGLCOMPRESSEDCOPYTEXTURECHROMIUMPROC glCompressedCopyTextureCHROMIUM;
>+ANGLE_UTIL_EXPORT extern PFNGLCOPYSUBTEXTURECHROMIUMPROC glCopySubTextureCHROMIUM;
>+ANGLE_UTIL_EXPORT extern PFNGLCOPYTEXTURECHROMIUMPROC glCopyTextureCHROMIUM;
>+ANGLE_UTIL_EXPORT extern PFNGLCOVERAGEMODULATIONCHROMIUMPROC glCoverageModulationCHROMIUM;
>+ANGLE_UTIL_EXPORT extern PFNGLMATRIXLOADIDENTITYCHROMIUMPROC glMatrixLoadIdentityCHROMIUM;
>+ANGLE_UTIL_EXPORT extern PFNGLMATRIXLOADFCHROMIUMPROC glMatrixLoadfCHROMIUM;
>+ANGLE_UTIL_EXPORT extern PFNGLLOSECONTEXTCHROMIUMPROC glLoseContextCHROMIUM;
>+ANGLE_UTIL_EXPORT extern PFNGLBINDFRAGMENTINPUTLOCATIONCHROMIUMPROC
>+    glBindFragmentInputLocationCHROMIUM;
>+ANGLE_UTIL_EXPORT extern PFNGLCOVERFILLPATHCHROMIUMPROC glCoverFillPathCHROMIUM;
>+ANGLE_UTIL_EXPORT extern PFNGLCOVERFILLPATHINSTANCEDCHROMIUMPROC glCoverFillPathInstancedCHROMIUM;
>+ANGLE_UTIL_EXPORT extern PFNGLCOVERSTROKEPATHCHROMIUMPROC glCoverStrokePathCHROMIUM;
>+ANGLE_UTIL_EXPORT extern PFNGLCOVERSTROKEPATHINSTANCEDCHROMIUMPROC
>+    glCoverStrokePathInstancedCHROMIUM;
>+ANGLE_UTIL_EXPORT extern PFNGLDELETEPATHSCHROMIUMPROC glDeletePathsCHROMIUM;
>+ANGLE_UTIL_EXPORT extern PFNGLGENPATHSCHROMIUMPROC glGenPathsCHROMIUM;
>+ANGLE_UTIL_EXPORT extern PFNGLGETPATHPARAMETERFVCHROMIUMPROC glGetPathParameterfvCHROMIUM;
>+ANGLE_UTIL_EXPORT extern PFNGLGETPATHPARAMETERIVCHROMIUMPROC glGetPathParameterivCHROMIUM;
>+ANGLE_UTIL_EXPORT extern PFNGLISPATHCHROMIUMPROC glIsPathCHROMIUM;
>+ANGLE_UTIL_EXPORT extern PFNGLPATHCOMMANDSCHROMIUMPROC glPathCommandsCHROMIUM;
>+ANGLE_UTIL_EXPORT extern PFNGLPATHPARAMETERFCHROMIUMPROC glPathParameterfCHROMIUM;
>+ANGLE_UTIL_EXPORT extern PFNGLPATHPARAMETERICHROMIUMPROC glPathParameteriCHROMIUM;
>+ANGLE_UTIL_EXPORT extern PFNGLPATHSTENCILFUNCCHROMIUMPROC glPathStencilFuncCHROMIUM;
>+ANGLE_UTIL_EXPORT extern PFNGLPROGRAMPATHFRAGMENTINPUTGENCHROMIUMPROC
>+    glProgramPathFragmentInputGenCHROMIUM;
>+ANGLE_UTIL_EXPORT extern PFNGLSTENCILFILLPATHCHROMIUMPROC glStencilFillPathCHROMIUM;
>+ANGLE_UTIL_EXPORT extern PFNGLSTENCILFILLPATHINSTANCEDCHROMIUMPROC
>+    glStencilFillPathInstancedCHROMIUM;
>+ANGLE_UTIL_EXPORT extern PFNGLSTENCILSTROKEPATHCHROMIUMPROC glStencilStrokePathCHROMIUM;
>+ANGLE_UTIL_EXPORT extern PFNGLSTENCILSTROKEPATHINSTANCEDCHROMIUMPROC
>+    glStencilStrokePathInstancedCHROMIUM;
>+ANGLE_UTIL_EXPORT extern PFNGLSTENCILTHENCOVERFILLPATHCHROMIUMPROC
>+    glStencilThenCoverFillPathCHROMIUM;
>+ANGLE_UTIL_EXPORT extern PFNGLSTENCILTHENCOVERFILLPATHINSTANCEDCHROMIUMPROC
>+    glStencilThenCoverFillPathInstancedCHROMIUM;
>+ANGLE_UTIL_EXPORT extern PFNGLSTENCILTHENCOVERSTROKEPATHCHROMIUMPROC
>+    glStencilThenCoverStrokePathCHROMIUM;
>+ANGLE_UTIL_EXPORT extern PFNGLSTENCILTHENCOVERSTROKEPATHINSTANCEDCHROMIUMPROC
>+    glStencilThenCoverStrokePathInstancedCHROMIUM;
>+ANGLE_UTIL_EXPORT extern PFNGLBINDFRAGDATALOCATIONEXTPROC glBindFragDataLocationEXT;
>+ANGLE_UTIL_EXPORT extern PFNGLBINDFRAGDATALOCATIONINDEXEDEXTPROC glBindFragDataLocationIndexedEXT;
>+ANGLE_UTIL_EXPORT extern PFNGLGETFRAGDATAINDEXEXTPROC glGetFragDataIndexEXT;
>+ANGLE_UTIL_EXPORT extern PFNGLGETPROGRAMRESOURCELOCATIONINDEXEXTPROC
>+    glGetProgramResourceLocationIndexEXT;
>+ANGLE_UTIL_EXPORT extern PFNGLINSERTEVENTMARKEREXTPROC glInsertEventMarkerEXT;
>+ANGLE_UTIL_EXPORT extern PFNGLPOPGROUPMARKEREXTPROC glPopGroupMarkerEXT;
>+ANGLE_UTIL_EXPORT extern PFNGLPUSHGROUPMARKEREXTPROC glPushGroupMarkerEXT;
>+ANGLE_UTIL_EXPORT extern PFNGLDISCARDFRAMEBUFFEREXTPROC glDiscardFramebufferEXT;
>+ANGLE_UTIL_EXPORT extern PFNGLBEGINQUERYEXTPROC glBeginQueryEXT;
>+ANGLE_UTIL_EXPORT extern PFNGLDELETEQUERIESEXTPROC glDeleteQueriesEXT;
>+ANGLE_UTIL_EXPORT extern PFNGLENDQUERYEXTPROC glEndQueryEXT;
>+ANGLE_UTIL_EXPORT extern PFNGLGENQUERIESEXTPROC glGenQueriesEXT;
>+ANGLE_UTIL_EXPORT extern PFNGLGETQUERYOBJECTI64VEXTPROC glGetQueryObjecti64vEXT;
>+ANGLE_UTIL_EXPORT extern PFNGLGETQUERYOBJECTIVEXTPROC glGetQueryObjectivEXT;
>+ANGLE_UTIL_EXPORT extern PFNGLGETQUERYOBJECTUI64VEXTPROC glGetQueryObjectui64vEXT;
>+ANGLE_UTIL_EXPORT extern PFNGLGETQUERYOBJECTUIVEXTPROC glGetQueryObjectuivEXT;
>+ANGLE_UTIL_EXPORT extern PFNGLGETQUERYIVEXTPROC glGetQueryivEXT;
>+ANGLE_UTIL_EXPORT extern PFNGLISQUERYEXTPROC glIsQueryEXT;
>+ANGLE_UTIL_EXPORT extern PFNGLQUERYCOUNTEREXTPROC glQueryCounterEXT;
>+ANGLE_UTIL_EXPORT extern PFNGLDRAWBUFFERSEXTPROC glDrawBuffersEXT;
>+ANGLE_UTIL_EXPORT extern PFNGLFRAMEBUFFERTEXTUREEXTPROC glFramebufferTextureEXT;
>+ANGLE_UTIL_EXPORT extern PFNGLDRAWARRAYSINSTANCEDEXTPROC glDrawArraysInstancedEXT;
>+ANGLE_UTIL_EXPORT extern PFNGLDRAWELEMENTSINSTANCEDEXTPROC glDrawElementsInstancedEXT;
>+ANGLE_UTIL_EXPORT extern PFNGLVERTEXATTRIBDIVISOREXTPROC glVertexAttribDivisorEXT;
>+ANGLE_UTIL_EXPORT extern PFNGLFLUSHMAPPEDBUFFERRANGEEXTPROC glFlushMappedBufferRangeEXT;
>+ANGLE_UTIL_EXPORT extern PFNGLMAPBUFFERRANGEEXTPROC glMapBufferRangeEXT;
>+ANGLE_UTIL_EXPORT extern PFNGLBUFFERSTORAGEMEMEXTPROC glBufferStorageMemEXT;
>+ANGLE_UTIL_EXPORT extern PFNGLCREATEMEMORYOBJECTSEXTPROC glCreateMemoryObjectsEXT;
>+ANGLE_UTIL_EXPORT extern PFNGLDELETEMEMORYOBJECTSEXTPROC glDeleteMemoryObjectsEXT;
>+ANGLE_UTIL_EXPORT extern PFNGLGETMEMORYOBJECTPARAMETERIVEXTPROC glGetMemoryObjectParameterivEXT;
>+ANGLE_UTIL_EXPORT extern PFNGLGETUNSIGNEDBYTEI_VEXTPROC glGetUnsignedBytei_vEXT;
>+ANGLE_UTIL_EXPORT extern PFNGLGETUNSIGNEDBYTEVEXTPROC glGetUnsignedBytevEXT;
>+ANGLE_UTIL_EXPORT extern PFNGLISMEMORYOBJECTEXTPROC glIsMemoryObjectEXT;
>+ANGLE_UTIL_EXPORT extern PFNGLMEMORYOBJECTPARAMETERIVEXTPROC glMemoryObjectParameterivEXT;
>+ANGLE_UTIL_EXPORT extern PFNGLTEXSTORAGEMEM2DEXTPROC glTexStorageMem2DEXT;
>+ANGLE_UTIL_EXPORT extern PFNGLTEXSTORAGEMEM2DMULTISAMPLEEXTPROC glTexStorageMem2DMultisampleEXT;
>+ANGLE_UTIL_EXPORT extern PFNGLTEXSTORAGEMEM3DEXTPROC glTexStorageMem3DEXT;
>+ANGLE_UTIL_EXPORT extern PFNGLTEXSTORAGEMEM3DMULTISAMPLEEXTPROC glTexStorageMem3DMultisampleEXT;
>+ANGLE_UTIL_EXPORT extern PFNGLIMPORTMEMORYFDEXTPROC glImportMemoryFdEXT;
>+ANGLE_UTIL_EXPORT extern PFNGLGETGRAPHICSRESETSTATUSEXTPROC glGetGraphicsResetStatusEXT;
>+ANGLE_UTIL_EXPORT extern PFNGLGETNUNIFORMFVEXTPROC glGetnUniformfvEXT;
>+ANGLE_UTIL_EXPORT extern PFNGLGETNUNIFORMIVEXTPROC glGetnUniformivEXT;
>+ANGLE_UTIL_EXPORT extern PFNGLREADNPIXELSEXTPROC glReadnPixelsEXT;
>+ANGLE_UTIL_EXPORT extern PFNGLDELETESEMAPHORESEXTPROC glDeleteSemaphoresEXT;
>+ANGLE_UTIL_EXPORT extern PFNGLGENSEMAPHORESEXTPROC glGenSemaphoresEXT;
>+ANGLE_UTIL_EXPORT extern PFNGLGETSEMAPHOREPARAMETERUI64VEXTPROC glGetSemaphoreParameterui64vEXT;
>+ANGLE_UTIL_EXPORT extern PFNGLISSEMAPHOREEXTPROC glIsSemaphoreEXT;
>+ANGLE_UTIL_EXPORT extern PFNGLSEMAPHOREPARAMETERUI64VEXTPROC glSemaphoreParameterui64vEXT;
>+ANGLE_UTIL_EXPORT extern PFNGLSIGNALSEMAPHOREEXTPROC glSignalSemaphoreEXT;
>+ANGLE_UTIL_EXPORT extern PFNGLWAITSEMAPHOREEXTPROC glWaitSemaphoreEXT;
>+ANGLE_UTIL_EXPORT extern PFNGLIMPORTSEMAPHOREFDEXTPROC glImportSemaphoreFdEXT;
>+ANGLE_UTIL_EXPORT extern PFNGLTEXSTORAGE1DEXTPROC glTexStorage1DEXT;
>+ANGLE_UTIL_EXPORT extern PFNGLTEXSTORAGE2DEXTPROC glTexStorage2DEXT;
>+ANGLE_UTIL_EXPORT extern PFNGLTEXSTORAGE3DEXTPROC glTexStorage3DEXT;
>+ANGLE_UTIL_EXPORT extern PFNGLDEBUGMESSAGECALLBACKKHRPROC glDebugMessageCallbackKHR;
>+ANGLE_UTIL_EXPORT extern PFNGLDEBUGMESSAGECONTROLKHRPROC glDebugMessageControlKHR;
>+ANGLE_UTIL_EXPORT extern PFNGLDEBUGMESSAGEINSERTKHRPROC glDebugMessageInsertKHR;
>+ANGLE_UTIL_EXPORT extern PFNGLGETDEBUGMESSAGELOGKHRPROC glGetDebugMessageLogKHR;
>+ANGLE_UTIL_EXPORT extern PFNGLGETOBJECTLABELKHRPROC glGetObjectLabelKHR;
>+ANGLE_UTIL_EXPORT extern PFNGLGETOBJECTPTRLABELKHRPROC glGetObjectPtrLabelKHR;
>+ANGLE_UTIL_EXPORT extern PFNGLGETPOINTERVKHRPROC glGetPointervKHR;
>+ANGLE_UTIL_EXPORT extern PFNGLOBJECTLABELKHRPROC glObjectLabelKHR;
>+ANGLE_UTIL_EXPORT extern PFNGLOBJECTPTRLABELKHRPROC glObjectPtrLabelKHR;
>+ANGLE_UTIL_EXPORT extern PFNGLPOPDEBUGGROUPKHRPROC glPopDebugGroupKHR;
>+ANGLE_UTIL_EXPORT extern PFNGLPUSHDEBUGGROUPKHRPROC glPushDebugGroupKHR;
>+ANGLE_UTIL_EXPORT extern PFNGLMAXSHADERCOMPILERTHREADSKHRPROC glMaxShaderCompilerThreadsKHR;
>+ANGLE_UTIL_EXPORT extern PFNGLDELETEFENCESNVPROC glDeleteFencesNV;
>+ANGLE_UTIL_EXPORT extern PFNGLFINISHFENCENVPROC glFinishFenceNV;
>+ANGLE_UTIL_EXPORT extern PFNGLGENFENCESNVPROC glGenFencesNV;
>+ANGLE_UTIL_EXPORT extern PFNGLGETFENCEIVNVPROC glGetFenceivNV;
>+ANGLE_UTIL_EXPORT extern PFNGLISFENCENVPROC glIsFenceNV;
>+ANGLE_UTIL_EXPORT extern PFNGLSETFENCENVPROC glSetFenceNV;
>+ANGLE_UTIL_EXPORT extern PFNGLTESTFENCENVPROC glTestFenceNV;
>+ANGLE_UTIL_EXPORT extern PFNGLEGLIMAGETARGETRENDERBUFFERSTORAGEOESPROC
>+    glEGLImageTargetRenderbufferStorageOES;
>+ANGLE_UTIL_EXPORT extern PFNGLEGLIMAGETARGETTEXTURE2DOESPROC glEGLImageTargetTexture2DOES;
>+ANGLE_UTIL_EXPORT extern PFNGLGETPROGRAMBINARYOESPROC glGetProgramBinaryOES;
>+ANGLE_UTIL_EXPORT extern PFNGLPROGRAMBINARYOESPROC glProgramBinaryOES;
>+ANGLE_UTIL_EXPORT extern PFNGLGETBUFFERPOINTERVOESPROC glGetBufferPointervOES;
>+ANGLE_UTIL_EXPORT extern PFNGLMAPBUFFEROESPROC glMapBufferOES;
>+ANGLE_UTIL_EXPORT extern PFNGLUNMAPBUFFEROESPROC glUnmapBufferOES;
>+ANGLE_UTIL_EXPORT extern PFNGLGETSAMPLERPARAMETERIIVOESPROC glGetSamplerParameterIivOES;
>+ANGLE_UTIL_EXPORT extern PFNGLGETSAMPLERPARAMETERIUIVOESPROC glGetSamplerParameterIuivOES;
>+ANGLE_UTIL_EXPORT extern PFNGLGETTEXPARAMETERIIVOESPROC glGetTexParameterIivOES;
>+ANGLE_UTIL_EXPORT extern PFNGLGETTEXPARAMETERIUIVOESPROC glGetTexParameterIuivOES;
>+ANGLE_UTIL_EXPORT extern PFNGLSAMPLERPARAMETERIIVOESPROC glSamplerParameterIivOES;
>+ANGLE_UTIL_EXPORT extern PFNGLSAMPLERPARAMETERIUIVOESPROC glSamplerParameterIuivOES;
>+ANGLE_UTIL_EXPORT extern PFNGLTEXPARAMETERIIVOESPROC glTexParameterIivOES;
>+ANGLE_UTIL_EXPORT extern PFNGLTEXPARAMETERIUIVOESPROC glTexParameterIuivOES;
>+ANGLE_UTIL_EXPORT extern PFNGLTEXSTORAGE3DMULTISAMPLEOESPROC glTexStorage3DMultisampleOES;
>+ANGLE_UTIL_EXPORT extern PFNGLBINDVERTEXARRAYOESPROC glBindVertexArrayOES;
>+ANGLE_UTIL_EXPORT extern PFNGLDELETEVERTEXARRAYSOESPROC glDeleteVertexArraysOES;
>+ANGLE_UTIL_EXPORT extern PFNGLGENVERTEXARRAYSOESPROC glGenVertexArraysOES;
>+ANGLE_UTIL_EXPORT extern PFNGLISVERTEXARRAYOESPROC glIsVertexArrayOES;
>+ANGLE_UTIL_EXPORT extern PFNGLFRAMEBUFFERTEXTUREMULTIVIEWOVRPROC glFramebufferTextureMultiviewOVR;
>+ANGLE_UTIL_EXPORT extern PFNGLDRAWTEXFOESPROC glDrawTexfOES;
>+ANGLE_UTIL_EXPORT extern PFNGLDRAWTEXFVOESPROC glDrawTexfvOES;
>+ANGLE_UTIL_EXPORT extern PFNGLDRAWTEXIOESPROC glDrawTexiOES;
>+ANGLE_UTIL_EXPORT extern PFNGLDRAWTEXIVOESPROC glDrawTexivOES;
>+ANGLE_UTIL_EXPORT extern PFNGLDRAWTEXSOESPROC glDrawTexsOES;
>+ANGLE_UTIL_EXPORT extern PFNGLDRAWTEXSVOESPROC glDrawTexsvOES;
>+ANGLE_UTIL_EXPORT extern PFNGLDRAWTEXXOESPROC glDrawTexxOES;
>+ANGLE_UTIL_EXPORT extern PFNGLDRAWTEXXVOESPROC glDrawTexxvOES;
>+ANGLE_UTIL_EXPORT extern PFNGLBINDFRAMEBUFFEROESPROC glBindFramebufferOES;
>+ANGLE_UTIL_EXPORT extern PFNGLBINDRENDERBUFFEROESPROC glBindRenderbufferOES;
>+ANGLE_UTIL_EXPORT extern PFNGLCHECKFRAMEBUFFERSTATUSOESPROC glCheckFramebufferStatusOES;
>+ANGLE_UTIL_EXPORT extern PFNGLDELETEFRAMEBUFFERSOESPROC glDeleteFramebuffersOES;
>+ANGLE_UTIL_EXPORT extern PFNGLDELETERENDERBUFFERSOESPROC glDeleteRenderbuffersOES;
>+ANGLE_UTIL_EXPORT extern PFNGLFRAMEBUFFERRENDERBUFFEROESPROC glFramebufferRenderbufferOES;
>+ANGLE_UTIL_EXPORT extern PFNGLFRAMEBUFFERTEXTURE2DOESPROC glFramebufferTexture2DOES;
>+ANGLE_UTIL_EXPORT extern PFNGLGENFRAMEBUFFERSOESPROC glGenFramebuffersOES;
>+ANGLE_UTIL_EXPORT extern PFNGLGENRENDERBUFFERSOESPROC glGenRenderbuffersOES;
>+ANGLE_UTIL_EXPORT extern PFNGLGENERATEMIPMAPOESPROC glGenerateMipmapOES;
>+ANGLE_UTIL_EXPORT extern PFNGLGETFRAMEBUFFERATTACHMENTPARAMETERIVOESPROC
>+    glGetFramebufferAttachmentParameterivOES;
>+ANGLE_UTIL_EXPORT extern PFNGLGETRENDERBUFFERPARAMETERIVOESPROC glGetRenderbufferParameterivOES;
>+ANGLE_UTIL_EXPORT extern PFNGLISFRAMEBUFFEROESPROC glIsFramebufferOES;
>+ANGLE_UTIL_EXPORT extern PFNGLISRENDERBUFFEROESPROC glIsRenderbufferOES;
>+ANGLE_UTIL_EXPORT extern PFNGLRENDERBUFFERSTORAGEOESPROC glRenderbufferStorageOES;
>+ANGLE_UTIL_EXPORT extern PFNGLCURRENTPALETTEMATRIXOESPROC glCurrentPaletteMatrixOES;
>+ANGLE_UTIL_EXPORT extern PFNGLLOADPALETTEFROMMODELVIEWMATRIXOESPROC
>+    glLoadPaletteFromModelViewMatrixOES;
>+ANGLE_UTIL_EXPORT extern PFNGLMATRIXINDEXPOINTEROESPROC glMatrixIndexPointerOES;
>+ANGLE_UTIL_EXPORT extern PFNGLWEIGHTPOINTEROESPROC glWeightPointerOES;
>+ANGLE_UTIL_EXPORT extern PFNGLPOINTSIZEPOINTEROESPROC glPointSizePointerOES;
>+ANGLE_UTIL_EXPORT extern PFNGLQUERYMATRIXXOESPROC glQueryMatrixxOES;
>+ANGLE_UTIL_EXPORT extern PFNGLGETTEXGENFVOESPROC glGetTexGenfvOES;
>+ANGLE_UTIL_EXPORT extern PFNGLGETTEXGENIVOESPROC glGetTexGenivOES;
>+ANGLE_UTIL_EXPORT extern PFNGLGETTEXGENXVOESPROC glGetTexGenxvOES;
>+ANGLE_UTIL_EXPORT extern PFNGLTEXGENFOESPROC glTexGenfOES;
>+ANGLE_UTIL_EXPORT extern PFNGLTEXGENFVOESPROC glTexGenfvOES;
>+ANGLE_UTIL_EXPORT extern PFNGLTEXGENIOESPROC glTexGeniOES;
>+ANGLE_UTIL_EXPORT extern PFNGLTEXGENIVOESPROC glTexGenivOES;
>+ANGLE_UTIL_EXPORT extern PFNGLTEXGENXOESPROC glTexGenxOES;
>+ANGLE_UTIL_EXPORT extern PFNGLTEXGENXVOESPROC glTexGenxvOES;
>+ANGLE_UTIL_EXPORT extern PFNGLALPHAFUNCCONTEXTANGLEPROC glAlphaFuncContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLCLIPPLANEFCONTEXTANGLEPROC glClipPlanefContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLCOLOR4FCONTEXTANGLEPROC glColor4fContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLFOGFCONTEXTANGLEPROC glFogfContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLFOGFVCONTEXTANGLEPROC glFogfvContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLFRUSTUMFCONTEXTANGLEPROC glFrustumfContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLGETCLIPPLANEFCONTEXTANGLEPROC glGetClipPlanefContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLGETLIGHTFVCONTEXTANGLEPROC glGetLightfvContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLGETMATERIALFVCONTEXTANGLEPROC glGetMaterialfvContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLGETTEXENVFVCONTEXTANGLEPROC glGetTexEnvfvContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLLIGHTMODELFCONTEXTANGLEPROC glLightModelfContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLLIGHTMODELFVCONTEXTANGLEPROC glLightModelfvContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLLIGHTFCONTEXTANGLEPROC glLightfContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLLIGHTFVCONTEXTANGLEPROC glLightfvContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLLOADMATRIXFCONTEXTANGLEPROC glLoadMatrixfContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLMATERIALFCONTEXTANGLEPROC glMaterialfContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLMATERIALFVCONTEXTANGLEPROC glMaterialfvContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLMULTMATRIXFCONTEXTANGLEPROC glMultMatrixfContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLMULTITEXCOORD4FCONTEXTANGLEPROC glMultiTexCoord4fContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLNORMAL3FCONTEXTANGLEPROC glNormal3fContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLORTHOFCONTEXTANGLEPROC glOrthofContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLPOINTPARAMETERFCONTEXTANGLEPROC glPointParameterfContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLPOINTPARAMETERFVCONTEXTANGLEPROC glPointParameterfvContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLPOINTSIZECONTEXTANGLEPROC glPointSizeContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLROTATEFCONTEXTANGLEPROC glRotatefContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLSCALEFCONTEXTANGLEPROC glScalefContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLTEXENVFCONTEXTANGLEPROC glTexEnvfContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLTEXENVFVCONTEXTANGLEPROC glTexEnvfvContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLTRANSLATEFCONTEXTANGLEPROC glTranslatefContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLALPHAFUNCXCONTEXTANGLEPROC glAlphaFuncxContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLCLEARCOLORXCONTEXTANGLEPROC glClearColorxContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLCLEARDEPTHXCONTEXTANGLEPROC glClearDepthxContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLCLIENTACTIVETEXTURECONTEXTANGLEPROC glClientActiveTextureContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLCLIPPLANEXCONTEXTANGLEPROC glClipPlanexContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLCOLOR4UBCONTEXTANGLEPROC glColor4ubContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLCOLOR4XCONTEXTANGLEPROC glColor4xContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLCOLORPOINTERCONTEXTANGLEPROC glColorPointerContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLDEPTHRANGEXCONTEXTANGLEPROC glDepthRangexContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLDISABLECLIENTSTATECONTEXTANGLEPROC glDisableClientStateContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLENABLECLIENTSTATECONTEXTANGLEPROC glEnableClientStateContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLFOGXCONTEXTANGLEPROC glFogxContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLFOGXVCONTEXTANGLEPROC glFogxvContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLFRUSTUMXCONTEXTANGLEPROC glFrustumxContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLGETCLIPPLANEXCONTEXTANGLEPROC glGetClipPlanexContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLGETFIXEDVCONTEXTANGLEPROC glGetFixedvContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLGETLIGHTXVCONTEXTANGLEPROC glGetLightxvContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLGETMATERIALXVCONTEXTANGLEPROC glGetMaterialxvContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLGETPOINTERVCONTEXTANGLEPROC glGetPointervContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLGETTEXENVIVCONTEXTANGLEPROC glGetTexEnvivContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLGETTEXENVXVCONTEXTANGLEPROC glGetTexEnvxvContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLGETTEXPARAMETERXVCONTEXTANGLEPROC glGetTexParameterxvContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLLIGHTMODELXCONTEXTANGLEPROC glLightModelxContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLLIGHTMODELXVCONTEXTANGLEPROC glLightModelxvContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLLIGHTXCONTEXTANGLEPROC glLightxContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLLIGHTXVCONTEXTANGLEPROC glLightxvContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLLINEWIDTHXCONTEXTANGLEPROC glLineWidthxContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLLOADIDENTITYCONTEXTANGLEPROC glLoadIdentityContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLLOADMATRIXXCONTEXTANGLEPROC glLoadMatrixxContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLLOGICOPCONTEXTANGLEPROC glLogicOpContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLMATERIALXCONTEXTANGLEPROC glMaterialxContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLMATERIALXVCONTEXTANGLEPROC glMaterialxvContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLMATRIXMODECONTEXTANGLEPROC glMatrixModeContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLMULTMATRIXXCONTEXTANGLEPROC glMultMatrixxContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLMULTITEXCOORD4XCONTEXTANGLEPROC glMultiTexCoord4xContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLNORMAL3XCONTEXTANGLEPROC glNormal3xContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLNORMALPOINTERCONTEXTANGLEPROC glNormalPointerContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLORTHOXCONTEXTANGLEPROC glOrthoxContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLPOINTPARAMETERXCONTEXTANGLEPROC glPointParameterxContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLPOINTPARAMETERXVCONTEXTANGLEPROC glPointParameterxvContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLPOINTSIZEXCONTEXTANGLEPROC glPointSizexContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLPOLYGONOFFSETXCONTEXTANGLEPROC glPolygonOffsetxContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLPOPMATRIXCONTEXTANGLEPROC glPopMatrixContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLPUSHMATRIXCONTEXTANGLEPROC glPushMatrixContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLROTATEXCONTEXTANGLEPROC glRotatexContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLSAMPLECOVERAGEXCONTEXTANGLEPROC glSampleCoveragexContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLSCALEXCONTEXTANGLEPROC glScalexContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLSHADEMODELCONTEXTANGLEPROC glShadeModelContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLTEXCOORDPOINTERCONTEXTANGLEPROC glTexCoordPointerContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLTEXENVICONTEXTANGLEPROC glTexEnviContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLTEXENVXCONTEXTANGLEPROC glTexEnvxContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLTEXENVIVCONTEXTANGLEPROC glTexEnvivContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLTEXENVXVCONTEXTANGLEPROC glTexEnvxvContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLTEXPARAMETERXCONTEXTANGLEPROC glTexParameterxContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLTEXPARAMETERXVCONTEXTANGLEPROC glTexParameterxvContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLTRANSLATEXCONTEXTANGLEPROC glTranslatexContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLVERTEXPOINTERCONTEXTANGLEPROC glVertexPointerContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLACTIVETEXTURECONTEXTANGLEPROC glActiveTextureContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLATTACHSHADERCONTEXTANGLEPROC glAttachShaderContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLBINDATTRIBLOCATIONCONTEXTANGLEPROC glBindAttribLocationContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLBINDBUFFERCONTEXTANGLEPROC glBindBufferContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLBINDFRAMEBUFFERCONTEXTANGLEPROC glBindFramebufferContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLBINDRENDERBUFFERCONTEXTANGLEPROC glBindRenderbufferContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLBINDTEXTURECONTEXTANGLEPROC glBindTextureContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLBLENDCOLORCONTEXTANGLEPROC glBlendColorContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLBLENDEQUATIONCONTEXTANGLEPROC glBlendEquationContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLBLENDEQUATIONSEPARATECONTEXTANGLEPROC
>+    glBlendEquationSeparateContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLBLENDFUNCCONTEXTANGLEPROC glBlendFuncContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLBLENDFUNCSEPARATECONTEXTANGLEPROC glBlendFuncSeparateContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLBUFFERDATACONTEXTANGLEPROC glBufferDataContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLBUFFERSUBDATACONTEXTANGLEPROC glBufferSubDataContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLCHECKFRAMEBUFFERSTATUSCONTEXTANGLEPROC
>+    glCheckFramebufferStatusContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLCLEARCONTEXTANGLEPROC glClearContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLCLEARCOLORCONTEXTANGLEPROC glClearColorContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLCLEARDEPTHFCONTEXTANGLEPROC glClearDepthfContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLCLEARSTENCILCONTEXTANGLEPROC glClearStencilContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLCOLORMASKCONTEXTANGLEPROC glColorMaskContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLCOMPILESHADERCONTEXTANGLEPROC glCompileShaderContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLCOMPRESSEDTEXIMAGE2DCONTEXTANGLEPROC
>+    glCompressedTexImage2DContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLCOMPRESSEDTEXSUBIMAGE2DCONTEXTANGLEPROC
>+    glCompressedTexSubImage2DContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLCOPYTEXIMAGE2DCONTEXTANGLEPROC glCopyTexImage2DContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLCOPYTEXSUBIMAGE2DCONTEXTANGLEPROC glCopyTexSubImage2DContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLCREATEPROGRAMCONTEXTANGLEPROC glCreateProgramContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLCREATESHADERCONTEXTANGLEPROC glCreateShaderContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLCULLFACECONTEXTANGLEPROC glCullFaceContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLDELETEBUFFERSCONTEXTANGLEPROC glDeleteBuffersContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLDELETEFRAMEBUFFERSCONTEXTANGLEPROC glDeleteFramebuffersContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLDELETEPROGRAMCONTEXTANGLEPROC glDeleteProgramContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLDELETERENDERBUFFERSCONTEXTANGLEPROC glDeleteRenderbuffersContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLDELETESHADERCONTEXTANGLEPROC glDeleteShaderContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLDELETETEXTURESCONTEXTANGLEPROC glDeleteTexturesContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLDEPTHFUNCCONTEXTANGLEPROC glDepthFuncContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLDEPTHMASKCONTEXTANGLEPROC glDepthMaskContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLDEPTHRANGEFCONTEXTANGLEPROC glDepthRangefContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLDETACHSHADERCONTEXTANGLEPROC glDetachShaderContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLDISABLECONTEXTANGLEPROC glDisableContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLDISABLEVERTEXATTRIBARRAYCONTEXTANGLEPROC
>+    glDisableVertexAttribArrayContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLDRAWARRAYSCONTEXTANGLEPROC glDrawArraysContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLDRAWELEMENTSCONTEXTANGLEPROC glDrawElementsContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLENABLECONTEXTANGLEPROC glEnableContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLENABLEVERTEXATTRIBARRAYCONTEXTANGLEPROC
>+    glEnableVertexAttribArrayContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLFINISHCONTEXTANGLEPROC glFinishContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLFLUSHCONTEXTANGLEPROC glFlushContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLFRAMEBUFFERRENDERBUFFERCONTEXTANGLEPROC
>+    glFramebufferRenderbufferContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLFRAMEBUFFERTEXTURE2DCONTEXTANGLEPROC
>+    glFramebufferTexture2DContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLFRONTFACECONTEXTANGLEPROC glFrontFaceContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLGENBUFFERSCONTEXTANGLEPROC glGenBuffersContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLGENERATEMIPMAPCONTEXTANGLEPROC glGenerateMipmapContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLGENFRAMEBUFFERSCONTEXTANGLEPROC glGenFramebuffersContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLGENRENDERBUFFERSCONTEXTANGLEPROC glGenRenderbuffersContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLGENTEXTURESCONTEXTANGLEPROC glGenTexturesContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLGETACTIVEATTRIBCONTEXTANGLEPROC glGetActiveAttribContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLGETACTIVEUNIFORMCONTEXTANGLEPROC glGetActiveUniformContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLGETATTACHEDSHADERSCONTEXTANGLEPROC glGetAttachedShadersContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLGETATTRIBLOCATIONCONTEXTANGLEPROC glGetAttribLocationContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLGETBOOLEANVCONTEXTANGLEPROC glGetBooleanvContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLGETBUFFERPARAMETERIVCONTEXTANGLEPROC
>+    glGetBufferParameterivContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLGETERRORCONTEXTANGLEPROC glGetErrorContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLGETFLOATVCONTEXTANGLEPROC glGetFloatvContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLGETFRAMEBUFFERATTACHMENTPARAMETERIVCONTEXTANGLEPROC
>+    glGetFramebufferAttachmentParameterivContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLGETINTEGERVCONTEXTANGLEPROC glGetIntegervContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLGETPROGRAMIVCONTEXTANGLEPROC glGetProgramivContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLGETPROGRAMINFOLOGCONTEXTANGLEPROC glGetProgramInfoLogContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLGETRENDERBUFFERPARAMETERIVCONTEXTANGLEPROC
>+    glGetRenderbufferParameterivContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLGETSHADERIVCONTEXTANGLEPROC glGetShaderivContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLGETSHADERINFOLOGCONTEXTANGLEPROC glGetShaderInfoLogContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLGETSHADERPRECISIONFORMATCONTEXTANGLEPROC
>+    glGetShaderPrecisionFormatContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLGETSHADERSOURCECONTEXTANGLEPROC glGetShaderSourceContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLGETSTRINGCONTEXTANGLEPROC glGetStringContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLGETTEXPARAMETERFVCONTEXTANGLEPROC glGetTexParameterfvContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLGETTEXPARAMETERIVCONTEXTANGLEPROC glGetTexParameterivContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLGETUNIFORMFVCONTEXTANGLEPROC glGetUniformfvContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLGETUNIFORMIVCONTEXTANGLEPROC glGetUniformivContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLGETUNIFORMLOCATIONCONTEXTANGLEPROC glGetUniformLocationContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLGETVERTEXATTRIBFVCONTEXTANGLEPROC glGetVertexAttribfvContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLGETVERTEXATTRIBIVCONTEXTANGLEPROC glGetVertexAttribivContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLGETVERTEXATTRIBPOINTERVCONTEXTANGLEPROC
>+    glGetVertexAttribPointervContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLHINTCONTEXTANGLEPROC glHintContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLISBUFFERCONTEXTANGLEPROC glIsBufferContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLISENABLEDCONTEXTANGLEPROC glIsEnabledContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLISFRAMEBUFFERCONTEXTANGLEPROC glIsFramebufferContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLISPROGRAMCONTEXTANGLEPROC glIsProgramContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLISRENDERBUFFERCONTEXTANGLEPROC glIsRenderbufferContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLISSHADERCONTEXTANGLEPROC glIsShaderContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLISTEXTURECONTEXTANGLEPROC glIsTextureContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLLINEWIDTHCONTEXTANGLEPROC glLineWidthContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLLINKPROGRAMCONTEXTANGLEPROC glLinkProgramContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLPIXELSTOREICONTEXTANGLEPROC glPixelStoreiContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLPOLYGONOFFSETCONTEXTANGLEPROC glPolygonOffsetContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLREADPIXELSCONTEXTANGLEPROC glReadPixelsContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLRELEASESHADERCOMPILERCONTEXTANGLEPROC
>+    glReleaseShaderCompilerContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLRENDERBUFFERSTORAGECONTEXTANGLEPROC glRenderbufferStorageContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLSAMPLECOVERAGECONTEXTANGLEPROC glSampleCoverageContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLSCISSORCONTEXTANGLEPROC glScissorContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLSHADERBINARYCONTEXTANGLEPROC glShaderBinaryContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLSHADERSOURCECONTEXTANGLEPROC glShaderSourceContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLSTENCILFUNCCONTEXTANGLEPROC glStencilFuncContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLSTENCILFUNCSEPARATECONTEXTANGLEPROC glStencilFuncSeparateContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLSTENCILMASKCONTEXTANGLEPROC glStencilMaskContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLSTENCILMASKSEPARATECONTEXTANGLEPROC glStencilMaskSeparateContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLSTENCILOPCONTEXTANGLEPROC glStencilOpContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLSTENCILOPSEPARATECONTEXTANGLEPROC glStencilOpSeparateContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLTEXIMAGE2DCONTEXTANGLEPROC glTexImage2DContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLTEXPARAMETERFCONTEXTANGLEPROC glTexParameterfContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLTEXPARAMETERFVCONTEXTANGLEPROC glTexParameterfvContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLTEXPARAMETERICONTEXTANGLEPROC glTexParameteriContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLTEXPARAMETERIVCONTEXTANGLEPROC glTexParameterivContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLTEXSUBIMAGE2DCONTEXTANGLEPROC glTexSubImage2DContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLUNIFORM1FCONTEXTANGLEPROC glUniform1fContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLUNIFORM1FVCONTEXTANGLEPROC glUniform1fvContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLUNIFORM1ICONTEXTANGLEPROC glUniform1iContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLUNIFORM1IVCONTEXTANGLEPROC glUniform1ivContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLUNIFORM2FCONTEXTANGLEPROC glUniform2fContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLUNIFORM2FVCONTEXTANGLEPROC glUniform2fvContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLUNIFORM2ICONTEXTANGLEPROC glUniform2iContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLUNIFORM2IVCONTEXTANGLEPROC glUniform2ivContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLUNIFORM3FCONTEXTANGLEPROC glUniform3fContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLUNIFORM3FVCONTEXTANGLEPROC glUniform3fvContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLUNIFORM3ICONTEXTANGLEPROC glUniform3iContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLUNIFORM3IVCONTEXTANGLEPROC glUniform3ivContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLUNIFORM4FCONTEXTANGLEPROC glUniform4fContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLUNIFORM4FVCONTEXTANGLEPROC glUniform4fvContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLUNIFORM4ICONTEXTANGLEPROC glUniform4iContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLUNIFORM4IVCONTEXTANGLEPROC glUniform4ivContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLUNIFORMMATRIX2FVCONTEXTANGLEPROC glUniformMatrix2fvContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLUNIFORMMATRIX3FVCONTEXTANGLEPROC glUniformMatrix3fvContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLUNIFORMMATRIX4FVCONTEXTANGLEPROC glUniformMatrix4fvContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLUSEPROGRAMCONTEXTANGLEPROC glUseProgramContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLVALIDATEPROGRAMCONTEXTANGLEPROC glValidateProgramContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLVERTEXATTRIB1FCONTEXTANGLEPROC glVertexAttrib1fContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLVERTEXATTRIB1FVCONTEXTANGLEPROC glVertexAttrib1fvContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLVERTEXATTRIB2FCONTEXTANGLEPROC glVertexAttrib2fContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLVERTEXATTRIB2FVCONTEXTANGLEPROC glVertexAttrib2fvContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLVERTEXATTRIB3FCONTEXTANGLEPROC glVertexAttrib3fContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLVERTEXATTRIB3FVCONTEXTANGLEPROC glVertexAttrib3fvContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLVERTEXATTRIB4FCONTEXTANGLEPROC glVertexAttrib4fContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLVERTEXATTRIB4FVCONTEXTANGLEPROC glVertexAttrib4fvContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLVERTEXATTRIBPOINTERCONTEXTANGLEPROC glVertexAttribPointerContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLVIEWPORTCONTEXTANGLEPROC glViewportContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLREADBUFFERCONTEXTANGLEPROC glReadBufferContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLDRAWRANGEELEMENTSCONTEXTANGLEPROC glDrawRangeElementsContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLTEXIMAGE3DCONTEXTANGLEPROC glTexImage3DContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLTEXSUBIMAGE3DCONTEXTANGLEPROC glTexSubImage3DContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLCOPYTEXSUBIMAGE3DCONTEXTANGLEPROC glCopyTexSubImage3DContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLCOMPRESSEDTEXIMAGE3DCONTEXTANGLEPROC
>+    glCompressedTexImage3DContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLCOMPRESSEDTEXSUBIMAGE3DCONTEXTANGLEPROC
>+    glCompressedTexSubImage3DContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLGENQUERIESCONTEXTANGLEPROC glGenQueriesContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLDELETEQUERIESCONTEXTANGLEPROC glDeleteQueriesContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLISQUERYCONTEXTANGLEPROC glIsQueryContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLBEGINQUERYCONTEXTANGLEPROC glBeginQueryContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLENDQUERYCONTEXTANGLEPROC glEndQueryContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLGETQUERYIVCONTEXTANGLEPROC glGetQueryivContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLGETQUERYOBJECTUIVCONTEXTANGLEPROC glGetQueryObjectuivContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLUNMAPBUFFERCONTEXTANGLEPROC glUnmapBufferContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLGETBUFFERPOINTERVCONTEXTANGLEPROC glGetBufferPointervContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLDRAWBUFFERSCONTEXTANGLEPROC glDrawBuffersContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLUNIFORMMATRIX2X3FVCONTEXTANGLEPROC glUniformMatrix2x3fvContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLUNIFORMMATRIX3X2FVCONTEXTANGLEPROC glUniformMatrix3x2fvContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLUNIFORMMATRIX2X4FVCONTEXTANGLEPROC glUniformMatrix2x4fvContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLUNIFORMMATRIX4X2FVCONTEXTANGLEPROC glUniformMatrix4x2fvContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLUNIFORMMATRIX3X4FVCONTEXTANGLEPROC glUniformMatrix3x4fvContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLUNIFORMMATRIX4X3FVCONTEXTANGLEPROC glUniformMatrix4x3fvContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLBLITFRAMEBUFFERCONTEXTANGLEPROC glBlitFramebufferContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLRENDERBUFFERSTORAGEMULTISAMPLECONTEXTANGLEPROC
>+    glRenderbufferStorageMultisampleContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLFRAMEBUFFERTEXTURELAYERCONTEXTANGLEPROC
>+    glFramebufferTextureLayerContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLMAPBUFFERRANGECONTEXTANGLEPROC glMapBufferRangeContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLFLUSHMAPPEDBUFFERRANGECONTEXTANGLEPROC
>+    glFlushMappedBufferRangeContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLBINDVERTEXARRAYCONTEXTANGLEPROC glBindVertexArrayContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLDELETEVERTEXARRAYSCONTEXTANGLEPROC glDeleteVertexArraysContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLGENVERTEXARRAYSCONTEXTANGLEPROC glGenVertexArraysContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLISVERTEXARRAYCONTEXTANGLEPROC glIsVertexArrayContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLGETINTEGERI_VCONTEXTANGLEPROC glGetIntegeri_vContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLBEGINTRANSFORMFEEDBACKCONTEXTANGLEPROC
>+    glBeginTransformFeedbackContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLENDTRANSFORMFEEDBACKCONTEXTANGLEPROC
>+    glEndTransformFeedbackContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLBINDBUFFERRANGECONTEXTANGLEPROC glBindBufferRangeContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLBINDBUFFERBASECONTEXTANGLEPROC glBindBufferBaseContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLTRANSFORMFEEDBACKVARYINGSCONTEXTANGLEPROC
>+    glTransformFeedbackVaryingsContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLGETTRANSFORMFEEDBACKVARYINGCONTEXTANGLEPROC
>+    glGetTransformFeedbackVaryingContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLVERTEXATTRIBIPOINTERCONTEXTANGLEPROC
>+    glVertexAttribIPointerContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLGETVERTEXATTRIBIIVCONTEXTANGLEPROC glGetVertexAttribIivContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLGETVERTEXATTRIBIUIVCONTEXTANGLEPROC glGetVertexAttribIuivContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLVERTEXATTRIBI4ICONTEXTANGLEPROC glVertexAttribI4iContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLVERTEXATTRIBI4UICONTEXTANGLEPROC glVertexAttribI4uiContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLVERTEXATTRIBI4IVCONTEXTANGLEPROC glVertexAttribI4ivContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLVERTEXATTRIBI4UIVCONTEXTANGLEPROC glVertexAttribI4uivContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLGETUNIFORMUIVCONTEXTANGLEPROC glGetUniformuivContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLGETFRAGDATALOCATIONCONTEXTANGLEPROC glGetFragDataLocationContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLUNIFORM1UICONTEXTANGLEPROC glUniform1uiContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLUNIFORM2UICONTEXTANGLEPROC glUniform2uiContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLUNIFORM3UICONTEXTANGLEPROC glUniform3uiContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLUNIFORM4UICONTEXTANGLEPROC glUniform4uiContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLUNIFORM1UIVCONTEXTANGLEPROC glUniform1uivContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLUNIFORM2UIVCONTEXTANGLEPROC glUniform2uivContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLUNIFORM3UIVCONTEXTANGLEPROC glUniform3uivContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLUNIFORM4UIVCONTEXTANGLEPROC glUniform4uivContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLCLEARBUFFERIVCONTEXTANGLEPROC glClearBufferivContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLCLEARBUFFERUIVCONTEXTANGLEPROC glClearBufferuivContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLCLEARBUFFERFVCONTEXTANGLEPROC glClearBufferfvContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLCLEARBUFFERFICONTEXTANGLEPROC glClearBufferfiContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLGETSTRINGICONTEXTANGLEPROC glGetStringiContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLCOPYBUFFERSUBDATACONTEXTANGLEPROC glCopyBufferSubDataContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLGETUNIFORMINDICESCONTEXTANGLEPROC glGetUniformIndicesContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLGETACTIVEUNIFORMSIVCONTEXTANGLEPROC glGetActiveUniformsivContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLGETUNIFORMBLOCKINDEXCONTEXTANGLEPROC
>+    glGetUniformBlockIndexContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLGETACTIVEUNIFORMBLOCKIVCONTEXTANGLEPROC
>+    glGetActiveUniformBlockivContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLGETACTIVEUNIFORMBLOCKNAMECONTEXTANGLEPROC
>+    glGetActiveUniformBlockNameContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLUNIFORMBLOCKBINDINGCONTEXTANGLEPROC glUniformBlockBindingContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLDRAWARRAYSINSTANCEDCONTEXTANGLEPROC glDrawArraysInstancedContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLDRAWELEMENTSINSTANCEDCONTEXTANGLEPROC
>+    glDrawElementsInstancedContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLFENCESYNCCONTEXTANGLEPROC glFenceSyncContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLISSYNCCONTEXTANGLEPROC glIsSyncContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLDELETESYNCCONTEXTANGLEPROC glDeleteSyncContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLCLIENTWAITSYNCCONTEXTANGLEPROC glClientWaitSyncContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLWAITSYNCCONTEXTANGLEPROC glWaitSyncContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLGETINTEGER64VCONTEXTANGLEPROC glGetInteger64vContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLGETSYNCIVCONTEXTANGLEPROC glGetSyncivContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLGETINTEGER64I_VCONTEXTANGLEPROC glGetInteger64i_vContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLGETBUFFERPARAMETERI64VCONTEXTANGLEPROC
>+    glGetBufferParameteri64vContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLGENSAMPLERSCONTEXTANGLEPROC glGenSamplersContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLDELETESAMPLERSCONTEXTANGLEPROC glDeleteSamplersContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLISSAMPLERCONTEXTANGLEPROC glIsSamplerContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLBINDSAMPLERCONTEXTANGLEPROC glBindSamplerContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLSAMPLERPARAMETERICONTEXTANGLEPROC glSamplerParameteriContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLSAMPLERPARAMETERIVCONTEXTANGLEPROC glSamplerParameterivContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLSAMPLERPARAMETERFCONTEXTANGLEPROC glSamplerParameterfContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLSAMPLERPARAMETERFVCONTEXTANGLEPROC glSamplerParameterfvContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLGETSAMPLERPARAMETERIVCONTEXTANGLEPROC
>+    glGetSamplerParameterivContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLGETSAMPLERPARAMETERFVCONTEXTANGLEPROC
>+    glGetSamplerParameterfvContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLVERTEXATTRIBDIVISORCONTEXTANGLEPROC glVertexAttribDivisorContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLBINDTRANSFORMFEEDBACKCONTEXTANGLEPROC
>+    glBindTransformFeedbackContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLDELETETRANSFORMFEEDBACKSCONTEXTANGLEPROC
>+    glDeleteTransformFeedbacksContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLGENTRANSFORMFEEDBACKSCONTEXTANGLEPROC
>+    glGenTransformFeedbacksContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLISTRANSFORMFEEDBACKCONTEXTANGLEPROC glIsTransformFeedbackContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLPAUSETRANSFORMFEEDBACKCONTEXTANGLEPROC
>+    glPauseTransformFeedbackContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLRESUMETRANSFORMFEEDBACKCONTEXTANGLEPROC
>+    glResumeTransformFeedbackContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLGETPROGRAMBINARYCONTEXTANGLEPROC glGetProgramBinaryContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLPROGRAMBINARYCONTEXTANGLEPROC glProgramBinaryContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLPROGRAMPARAMETERICONTEXTANGLEPROC glProgramParameteriContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLINVALIDATEFRAMEBUFFERCONTEXTANGLEPROC
>+    glInvalidateFramebufferContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLINVALIDATESUBFRAMEBUFFERCONTEXTANGLEPROC
>+    glInvalidateSubFramebufferContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLTEXSTORAGE2DCONTEXTANGLEPROC glTexStorage2DContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLTEXSTORAGE3DCONTEXTANGLEPROC glTexStorage3DContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLGETINTERNALFORMATIVCONTEXTANGLEPROC glGetInternalformativContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLDISPATCHCOMPUTECONTEXTANGLEPROC glDispatchComputeContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLDISPATCHCOMPUTEINDIRECTCONTEXTANGLEPROC
>+    glDispatchComputeIndirectContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLDRAWARRAYSINDIRECTCONTEXTANGLEPROC glDrawArraysIndirectContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLDRAWELEMENTSINDIRECTCONTEXTANGLEPROC
>+    glDrawElementsIndirectContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLFRAMEBUFFERPARAMETERICONTEXTANGLEPROC
>+    glFramebufferParameteriContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLGETFRAMEBUFFERPARAMETERIVCONTEXTANGLEPROC
>+    glGetFramebufferParameterivContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLGETPROGRAMINTERFACEIVCONTEXTANGLEPROC
>+    glGetProgramInterfaceivContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLGETPROGRAMRESOURCEINDEXCONTEXTANGLEPROC
>+    glGetProgramResourceIndexContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLGETPROGRAMRESOURCENAMECONTEXTANGLEPROC
>+    glGetProgramResourceNameContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLGETPROGRAMRESOURCEIVCONTEXTANGLEPROC
>+    glGetProgramResourceivContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLGETPROGRAMRESOURCELOCATIONCONTEXTANGLEPROC
>+    glGetProgramResourceLocationContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLUSEPROGRAMSTAGESCONTEXTANGLEPROC glUseProgramStagesContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLACTIVESHADERPROGRAMCONTEXTANGLEPROC glActiveShaderProgramContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLCREATESHADERPROGRAMVCONTEXTANGLEPROC
>+    glCreateShaderProgramvContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLBINDPROGRAMPIPELINECONTEXTANGLEPROC glBindProgramPipelineContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLDELETEPROGRAMPIPELINESCONTEXTANGLEPROC
>+    glDeleteProgramPipelinesContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLGENPROGRAMPIPELINESCONTEXTANGLEPROC glGenProgramPipelinesContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLISPROGRAMPIPELINECONTEXTANGLEPROC glIsProgramPipelineContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLGETPROGRAMPIPELINEIVCONTEXTANGLEPROC
>+    glGetProgramPipelineivContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLPROGRAMUNIFORM1ICONTEXTANGLEPROC glProgramUniform1iContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLPROGRAMUNIFORM2ICONTEXTANGLEPROC glProgramUniform2iContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLPROGRAMUNIFORM3ICONTEXTANGLEPROC glProgramUniform3iContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLPROGRAMUNIFORM4ICONTEXTANGLEPROC glProgramUniform4iContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLPROGRAMUNIFORM1UICONTEXTANGLEPROC glProgramUniform1uiContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLPROGRAMUNIFORM2UICONTEXTANGLEPROC glProgramUniform2uiContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLPROGRAMUNIFORM3UICONTEXTANGLEPROC glProgramUniform3uiContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLPROGRAMUNIFORM4UICONTEXTANGLEPROC glProgramUniform4uiContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLPROGRAMUNIFORM1FCONTEXTANGLEPROC glProgramUniform1fContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLPROGRAMUNIFORM2FCONTEXTANGLEPROC glProgramUniform2fContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLPROGRAMUNIFORM3FCONTEXTANGLEPROC glProgramUniform3fContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLPROGRAMUNIFORM4FCONTEXTANGLEPROC glProgramUniform4fContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLPROGRAMUNIFORM1IVCONTEXTANGLEPROC glProgramUniform1ivContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLPROGRAMUNIFORM2IVCONTEXTANGLEPROC glProgramUniform2ivContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLPROGRAMUNIFORM3IVCONTEXTANGLEPROC glProgramUniform3ivContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLPROGRAMUNIFORM4IVCONTEXTANGLEPROC glProgramUniform4ivContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLPROGRAMUNIFORM1UIVCONTEXTANGLEPROC glProgramUniform1uivContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLPROGRAMUNIFORM2UIVCONTEXTANGLEPROC glProgramUniform2uivContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLPROGRAMUNIFORM3UIVCONTEXTANGLEPROC glProgramUniform3uivContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLPROGRAMUNIFORM4UIVCONTEXTANGLEPROC glProgramUniform4uivContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLPROGRAMUNIFORM1FVCONTEXTANGLEPROC glProgramUniform1fvContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLPROGRAMUNIFORM2FVCONTEXTANGLEPROC glProgramUniform2fvContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLPROGRAMUNIFORM3FVCONTEXTANGLEPROC glProgramUniform3fvContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLPROGRAMUNIFORM4FVCONTEXTANGLEPROC glProgramUniform4fvContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLPROGRAMUNIFORMMATRIX2FVCONTEXTANGLEPROC
>+    glProgramUniformMatrix2fvContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLPROGRAMUNIFORMMATRIX3FVCONTEXTANGLEPROC
>+    glProgramUniformMatrix3fvContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLPROGRAMUNIFORMMATRIX4FVCONTEXTANGLEPROC
>+    glProgramUniformMatrix4fvContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLPROGRAMUNIFORMMATRIX2X3FVCONTEXTANGLEPROC
>+    glProgramUniformMatrix2x3fvContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLPROGRAMUNIFORMMATRIX3X2FVCONTEXTANGLEPROC
>+    glProgramUniformMatrix3x2fvContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLPROGRAMUNIFORMMATRIX2X4FVCONTEXTANGLEPROC
>+    glProgramUniformMatrix2x4fvContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLPROGRAMUNIFORMMATRIX4X2FVCONTEXTANGLEPROC
>+    glProgramUniformMatrix4x2fvContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLPROGRAMUNIFORMMATRIX3X4FVCONTEXTANGLEPROC
>+    glProgramUniformMatrix3x4fvContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLPROGRAMUNIFORMMATRIX4X3FVCONTEXTANGLEPROC
>+    glProgramUniformMatrix4x3fvContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLVALIDATEPROGRAMPIPELINECONTEXTANGLEPROC
>+    glValidateProgramPipelineContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLGETPROGRAMPIPELINEINFOLOGCONTEXTANGLEPROC
>+    glGetProgramPipelineInfoLogContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLBINDIMAGETEXTURECONTEXTANGLEPROC glBindImageTextureContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLGETBOOLEANI_VCONTEXTANGLEPROC glGetBooleani_vContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLMEMORYBARRIERCONTEXTANGLEPROC glMemoryBarrierContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLMEMORYBARRIERBYREGIONCONTEXTANGLEPROC
>+    glMemoryBarrierByRegionContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLTEXSTORAGE2DMULTISAMPLECONTEXTANGLEPROC
>+    glTexStorage2DMultisampleContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLGETMULTISAMPLEFVCONTEXTANGLEPROC glGetMultisamplefvContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLSAMPLEMASKICONTEXTANGLEPROC glSampleMaskiContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLGETTEXLEVELPARAMETERIVCONTEXTANGLEPROC
>+    glGetTexLevelParameterivContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLGETTEXLEVELPARAMETERFVCONTEXTANGLEPROC
>+    glGetTexLevelParameterfvContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLBINDVERTEXBUFFERCONTEXTANGLEPROC glBindVertexBufferContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLVERTEXATTRIBFORMATCONTEXTANGLEPROC glVertexAttribFormatContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLVERTEXATTRIBIFORMATCONTEXTANGLEPROC glVertexAttribIFormatContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLVERTEXATTRIBBINDINGCONTEXTANGLEPROC glVertexAttribBindingContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLVERTEXBINDINGDIVISORCONTEXTANGLEPROC
>+    glVertexBindingDivisorContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLCOPYSUBTEXTURE3DANGLECONTEXTANGLEPROC
>+    glCopySubTexture3DANGLEContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLCOPYTEXTURE3DANGLECONTEXTANGLEPROC glCopyTexture3DANGLEContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLBLITFRAMEBUFFERANGLECONTEXTANGLEPROC
>+    glBlitFramebufferANGLEContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLRENDERBUFFERSTORAGEMULTISAMPLEANGLECONTEXTANGLEPROC
>+    glRenderbufferStorageMultisampleANGLEContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLDRAWARRAYSINSTANCEDANGLECONTEXTANGLEPROC
>+    glDrawArraysInstancedANGLEContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLDRAWELEMENTSINSTANCEDANGLECONTEXTANGLEPROC
>+    glDrawElementsInstancedANGLEContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLVERTEXATTRIBDIVISORANGLECONTEXTANGLEPROC
>+    glVertexAttribDivisorANGLEContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLMULTIDRAWARRAYSANGLECONTEXTANGLEPROC
>+    glMultiDrawArraysANGLEContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLMULTIDRAWARRAYSINSTANCEDANGLECONTEXTANGLEPROC
>+    glMultiDrawArraysInstancedANGLEContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLMULTIDRAWELEMENTSANGLECONTEXTANGLEPROC
>+    glMultiDrawElementsANGLEContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLMULTIDRAWELEMENTSINSTANCEDANGLECONTEXTANGLEPROC
>+    glMultiDrawElementsInstancedANGLEContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLPROVOKINGVERTEXANGLECONTEXTANGLEPROC
>+    glProvokingVertexANGLEContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLREQUESTEXTENSIONANGLECONTEXTANGLEPROC
>+    glRequestExtensionANGLEContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLCOMPRESSEDTEXIMAGE2DROBUSTANGLECONTEXTANGLEPROC
>+    glCompressedTexImage2DRobustANGLEContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLCOMPRESSEDTEXIMAGE3DROBUSTANGLECONTEXTANGLEPROC
>+    glCompressedTexImage3DRobustANGLEContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLCOMPRESSEDTEXSUBIMAGE2DROBUSTANGLECONTEXTANGLEPROC
>+    glCompressedTexSubImage2DRobustANGLEContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLCOMPRESSEDTEXSUBIMAGE3DROBUSTANGLECONTEXTANGLEPROC
>+    glCompressedTexSubImage3DRobustANGLEContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLGETACTIVEUNIFORMBLOCKIVROBUSTANGLECONTEXTANGLEPROC
>+    glGetActiveUniformBlockivRobustANGLEContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLGETBOOLEANI_VROBUSTANGLECONTEXTANGLEPROC
>+    glGetBooleani_vRobustANGLEContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLGETBOOLEANVROBUSTANGLECONTEXTANGLEPROC
>+    glGetBooleanvRobustANGLEContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLGETBUFFERPARAMETERI64VROBUSTANGLECONTEXTANGLEPROC
>+    glGetBufferParameteri64vRobustANGLEContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLGETBUFFERPARAMETERIVROBUSTANGLECONTEXTANGLEPROC
>+    glGetBufferParameterivRobustANGLEContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLGETBUFFERPOINTERVROBUSTANGLECONTEXTANGLEPROC
>+    glGetBufferPointervRobustANGLEContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLGETFLOATVROBUSTANGLECONTEXTANGLEPROC
>+    glGetFloatvRobustANGLEContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLGETFRAMEBUFFERATTACHMENTPARAMETERIVROBUSTANGLECONTEXTANGLEPROC
>+    glGetFramebufferAttachmentParameterivRobustANGLEContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLGETFRAMEBUFFERPARAMETERIVROBUSTANGLECONTEXTANGLEPROC
>+    glGetFramebufferParameterivRobustANGLEContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLGETINTEGER64I_VROBUSTANGLECONTEXTANGLEPROC
>+    glGetInteger64i_vRobustANGLEContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLGETINTEGER64VROBUSTANGLECONTEXTANGLEPROC
>+    glGetInteger64vRobustANGLEContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLGETINTEGERI_VROBUSTANGLECONTEXTANGLEPROC
>+    glGetIntegeri_vRobustANGLEContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLGETINTEGERVROBUSTANGLECONTEXTANGLEPROC
>+    glGetIntegervRobustANGLEContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLGETINTERNALFORMATIVROBUSTANGLECONTEXTANGLEPROC
>+    glGetInternalformativRobustANGLEContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLGETMULTISAMPLEFVROBUSTANGLECONTEXTANGLEPROC
>+    glGetMultisamplefvRobustANGLEContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLGETPOINTERVROBUSTANGLEROBUSTANGLECONTEXTANGLEPROC
>+    glGetPointervRobustANGLERobustANGLEContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLGETPROGRAMINTERFACEIVROBUSTANGLECONTEXTANGLEPROC
>+    glGetProgramInterfaceivRobustANGLEContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLGETPROGRAMIVROBUSTANGLECONTEXTANGLEPROC
>+    glGetProgramivRobustANGLEContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLGETQUERYOBJECTI64VROBUSTANGLECONTEXTANGLEPROC
>+    glGetQueryObjecti64vRobustANGLEContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLGETQUERYOBJECTIVROBUSTANGLECONTEXTANGLEPROC
>+    glGetQueryObjectivRobustANGLEContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLGETQUERYOBJECTUI64VROBUSTANGLECONTEXTANGLEPROC
>+    glGetQueryObjectui64vRobustANGLEContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLGETQUERYOBJECTUIVROBUSTANGLECONTEXTANGLEPROC
>+    glGetQueryObjectuivRobustANGLEContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLGETQUERYIVROBUSTANGLECONTEXTANGLEPROC
>+    glGetQueryivRobustANGLEContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLGETRENDERBUFFERPARAMETERIVROBUSTANGLECONTEXTANGLEPROC
>+    glGetRenderbufferParameterivRobustANGLEContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLGETSAMPLERPARAMETERIIVROBUSTANGLECONTEXTANGLEPROC
>+    glGetSamplerParameterIivRobustANGLEContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLGETSAMPLERPARAMETERIUIVROBUSTANGLECONTEXTANGLEPROC
>+    glGetSamplerParameterIuivRobustANGLEContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLGETSAMPLERPARAMETERFVROBUSTANGLECONTEXTANGLEPROC
>+    glGetSamplerParameterfvRobustANGLEContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLGETSAMPLERPARAMETERIVROBUSTANGLECONTEXTANGLEPROC
>+    glGetSamplerParameterivRobustANGLEContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLGETSHADERIVROBUSTANGLECONTEXTANGLEPROC
>+    glGetShaderivRobustANGLEContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLGETTEXLEVELPARAMETERFVROBUSTANGLECONTEXTANGLEPROC
>+    glGetTexLevelParameterfvRobustANGLEContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLGETTEXLEVELPARAMETERIVROBUSTANGLECONTEXTANGLEPROC
>+    glGetTexLevelParameterivRobustANGLEContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLGETTEXPARAMETERIIVROBUSTANGLECONTEXTANGLEPROC
>+    glGetTexParameterIivRobustANGLEContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLGETTEXPARAMETERIUIVROBUSTANGLECONTEXTANGLEPROC
>+    glGetTexParameterIuivRobustANGLEContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLGETTEXPARAMETERFVROBUSTANGLECONTEXTANGLEPROC
>+    glGetTexParameterfvRobustANGLEContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLGETTEXPARAMETERIVROBUSTANGLECONTEXTANGLEPROC
>+    glGetTexParameterivRobustANGLEContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLGETUNIFORMFVROBUSTANGLECONTEXTANGLEPROC
>+    glGetUniformfvRobustANGLEContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLGETUNIFORMIVROBUSTANGLECONTEXTANGLEPROC
>+    glGetUniformivRobustANGLEContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLGETUNIFORMUIVROBUSTANGLECONTEXTANGLEPROC
>+    glGetUniformuivRobustANGLEContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLGETVERTEXATTRIBIIVROBUSTANGLECONTEXTANGLEPROC
>+    glGetVertexAttribIivRobustANGLEContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLGETVERTEXATTRIBIUIVROBUSTANGLECONTEXTANGLEPROC
>+    glGetVertexAttribIuivRobustANGLEContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLGETVERTEXATTRIBPOINTERVROBUSTANGLECONTEXTANGLEPROC
>+    glGetVertexAttribPointervRobustANGLEContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLGETVERTEXATTRIBFVROBUSTANGLECONTEXTANGLEPROC
>+    glGetVertexAttribfvRobustANGLEContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLGETVERTEXATTRIBIVROBUSTANGLECONTEXTANGLEPROC
>+    glGetVertexAttribivRobustANGLEContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLGETNUNIFORMFVROBUSTANGLECONTEXTANGLEPROC
>+    glGetnUniformfvRobustANGLEContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLGETNUNIFORMIVROBUSTANGLECONTEXTANGLEPROC
>+    glGetnUniformivRobustANGLEContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLGETNUNIFORMUIVROBUSTANGLECONTEXTANGLEPROC
>+    glGetnUniformuivRobustANGLEContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLREADPIXELSROBUSTANGLECONTEXTANGLEPROC
>+    glReadPixelsRobustANGLEContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLREADNPIXELSROBUSTANGLECONTEXTANGLEPROC
>+    glReadnPixelsRobustANGLEContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLSAMPLERPARAMETERIIVROBUSTANGLECONTEXTANGLEPROC
>+    glSamplerParameterIivRobustANGLEContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLSAMPLERPARAMETERIUIVROBUSTANGLECONTEXTANGLEPROC
>+    glSamplerParameterIuivRobustANGLEContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLSAMPLERPARAMETERFVROBUSTANGLECONTEXTANGLEPROC
>+    glSamplerParameterfvRobustANGLEContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLSAMPLERPARAMETERIVROBUSTANGLECONTEXTANGLEPROC
>+    glSamplerParameterivRobustANGLEContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLTEXIMAGE2DROBUSTANGLECONTEXTANGLEPROC
>+    glTexImage2DRobustANGLEContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLTEXIMAGE3DROBUSTANGLECONTEXTANGLEPROC
>+    glTexImage3DRobustANGLEContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLTEXPARAMETERIIVROBUSTANGLECONTEXTANGLEPROC
>+    glTexParameterIivRobustANGLEContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLTEXPARAMETERIUIVROBUSTANGLECONTEXTANGLEPROC
>+    glTexParameterIuivRobustANGLEContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLTEXPARAMETERFVROBUSTANGLECONTEXTANGLEPROC
>+    glTexParameterfvRobustANGLEContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLTEXPARAMETERIVROBUSTANGLECONTEXTANGLEPROC
>+    glTexParameterivRobustANGLEContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLTEXSUBIMAGE2DROBUSTANGLECONTEXTANGLEPROC
>+    glTexSubImage2DRobustANGLEContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLTEXSUBIMAGE3DROBUSTANGLECONTEXTANGLEPROC
>+    glTexSubImage3DRobustANGLEContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLGETMULTISAMPLEFVANGLECONTEXTANGLEPROC
>+    glGetMultisamplefvANGLEContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLGETTEXLEVELPARAMETERFVANGLECONTEXTANGLEPROC
>+    glGetTexLevelParameterfvANGLEContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLGETTEXLEVELPARAMETERIVANGLECONTEXTANGLEPROC
>+    glGetTexLevelParameterivANGLEContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLSAMPLEMASKIANGLECONTEXTANGLEPROC glSampleMaskiANGLEContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLTEXSTORAGE2DMULTISAMPLEANGLECONTEXTANGLEPROC
>+    glTexStorage2DMultisampleANGLEContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLGETTRANSLATEDSHADERSOURCEANGLECONTEXTANGLEPROC
>+    glGetTranslatedShaderSourceANGLEContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLBINDUNIFORMLOCATIONCHROMIUMCONTEXTANGLEPROC
>+    glBindUniformLocationCHROMIUMContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLCOMPRESSEDCOPYTEXTURECHROMIUMCONTEXTANGLEPROC
>+    glCompressedCopyTextureCHROMIUMContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLCOPYSUBTEXTURECHROMIUMCONTEXTANGLEPROC
>+    glCopySubTextureCHROMIUMContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLCOPYTEXTURECHROMIUMCONTEXTANGLEPROC glCopyTextureCHROMIUMContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLCOVERAGEMODULATIONCHROMIUMCONTEXTANGLEPROC
>+    glCoverageModulationCHROMIUMContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLMATRIXLOADIDENTITYCHROMIUMCONTEXTANGLEPROC
>+    glMatrixLoadIdentityCHROMIUMContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLMATRIXLOADFCHROMIUMCONTEXTANGLEPROC glMatrixLoadfCHROMIUMContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLLOSECONTEXTCHROMIUMCONTEXTANGLEPROC glLoseContextCHROMIUMContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLBINDFRAGMENTINPUTLOCATIONCHROMIUMCONTEXTANGLEPROC
>+    glBindFragmentInputLocationCHROMIUMContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLCOVERFILLPATHCHROMIUMCONTEXTANGLEPROC
>+    glCoverFillPathCHROMIUMContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLCOVERFILLPATHINSTANCEDCHROMIUMCONTEXTANGLEPROC
>+    glCoverFillPathInstancedCHROMIUMContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLCOVERSTROKEPATHCHROMIUMCONTEXTANGLEPROC
>+    glCoverStrokePathCHROMIUMContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLCOVERSTROKEPATHINSTANCEDCHROMIUMCONTEXTANGLEPROC
>+    glCoverStrokePathInstancedCHROMIUMContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLDELETEPATHSCHROMIUMCONTEXTANGLEPROC glDeletePathsCHROMIUMContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLGENPATHSCHROMIUMCONTEXTANGLEPROC glGenPathsCHROMIUMContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLGETPATHPARAMETERFVCHROMIUMCONTEXTANGLEPROC
>+    glGetPathParameterfvCHROMIUMContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLGETPATHPARAMETERIVCHROMIUMCONTEXTANGLEPROC
>+    glGetPathParameterivCHROMIUMContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLISPATHCHROMIUMCONTEXTANGLEPROC glIsPathCHROMIUMContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLPATHCOMMANDSCHROMIUMCONTEXTANGLEPROC
>+    glPathCommandsCHROMIUMContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLPATHPARAMETERFCHROMIUMCONTEXTANGLEPROC
>+    glPathParameterfCHROMIUMContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLPATHPARAMETERICHROMIUMCONTEXTANGLEPROC
>+    glPathParameteriCHROMIUMContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLPATHSTENCILFUNCCHROMIUMCONTEXTANGLEPROC
>+    glPathStencilFuncCHROMIUMContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLPROGRAMPATHFRAGMENTINPUTGENCHROMIUMCONTEXTANGLEPROC
>+    glProgramPathFragmentInputGenCHROMIUMContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLSTENCILFILLPATHCHROMIUMCONTEXTANGLEPROC
>+    glStencilFillPathCHROMIUMContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLSTENCILFILLPATHINSTANCEDCHROMIUMCONTEXTANGLEPROC
>+    glStencilFillPathInstancedCHROMIUMContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLSTENCILSTROKEPATHCHROMIUMCONTEXTANGLEPROC
>+    glStencilStrokePathCHROMIUMContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLSTENCILSTROKEPATHINSTANCEDCHROMIUMCONTEXTANGLEPROC
>+    glStencilStrokePathInstancedCHROMIUMContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLSTENCILTHENCOVERFILLPATHCHROMIUMCONTEXTANGLEPROC
>+    glStencilThenCoverFillPathCHROMIUMContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLSTENCILTHENCOVERFILLPATHINSTANCEDCHROMIUMCONTEXTANGLEPROC
>+    glStencilThenCoverFillPathInstancedCHROMIUMContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLSTENCILTHENCOVERSTROKEPATHCHROMIUMCONTEXTANGLEPROC
>+    glStencilThenCoverStrokePathCHROMIUMContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLSTENCILTHENCOVERSTROKEPATHINSTANCEDCHROMIUMCONTEXTANGLEPROC
>+    glStencilThenCoverStrokePathInstancedCHROMIUMContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLBINDFRAGDATALOCATIONEXTCONTEXTANGLEPROC
>+    glBindFragDataLocationEXTContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLBINDFRAGDATALOCATIONINDEXEDEXTCONTEXTANGLEPROC
>+    glBindFragDataLocationIndexedEXTContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLGETFRAGDATAINDEXEXTCONTEXTANGLEPROC glGetFragDataIndexEXTContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLGETPROGRAMRESOURCELOCATIONINDEXEXTCONTEXTANGLEPROC
>+    glGetProgramResourceLocationIndexEXTContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLINSERTEVENTMARKEREXTCONTEXTANGLEPROC
>+    glInsertEventMarkerEXTContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLPOPGROUPMARKEREXTCONTEXTANGLEPROC glPopGroupMarkerEXTContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLPUSHGROUPMARKEREXTCONTEXTANGLEPROC glPushGroupMarkerEXTContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLDISCARDFRAMEBUFFEREXTCONTEXTANGLEPROC
>+    glDiscardFramebufferEXTContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLBEGINQUERYEXTCONTEXTANGLEPROC glBeginQueryEXTContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLDELETEQUERIESEXTCONTEXTANGLEPROC glDeleteQueriesEXTContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLENDQUERYEXTCONTEXTANGLEPROC glEndQueryEXTContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLGENQUERIESEXTCONTEXTANGLEPROC glGenQueriesEXTContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLGETQUERYOBJECTI64VEXTCONTEXTANGLEPROC
>+    glGetQueryObjecti64vEXTContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLGETQUERYOBJECTIVEXTCONTEXTANGLEPROC glGetQueryObjectivEXTContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLGETQUERYOBJECTUI64VEXTCONTEXTANGLEPROC
>+    glGetQueryObjectui64vEXTContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLGETQUERYOBJECTUIVEXTCONTEXTANGLEPROC
>+    glGetQueryObjectuivEXTContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLGETQUERYIVEXTCONTEXTANGLEPROC glGetQueryivEXTContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLISQUERYEXTCONTEXTANGLEPROC glIsQueryEXTContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLQUERYCOUNTEREXTCONTEXTANGLEPROC glQueryCounterEXTContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLDRAWBUFFERSEXTCONTEXTANGLEPROC glDrawBuffersEXTContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLFRAMEBUFFERTEXTUREEXTCONTEXTANGLEPROC
>+    glFramebufferTextureEXTContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLDRAWARRAYSINSTANCEDEXTCONTEXTANGLEPROC
>+    glDrawArraysInstancedEXTContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLDRAWELEMENTSINSTANCEDEXTCONTEXTANGLEPROC
>+    glDrawElementsInstancedEXTContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLVERTEXATTRIBDIVISOREXTCONTEXTANGLEPROC
>+    glVertexAttribDivisorEXTContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLFLUSHMAPPEDBUFFERRANGEEXTCONTEXTANGLEPROC
>+    glFlushMappedBufferRangeEXTContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLMAPBUFFERRANGEEXTCONTEXTANGLEPROC glMapBufferRangeEXTContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLBUFFERSTORAGEMEMEXTCONTEXTANGLEPROC glBufferStorageMemEXTContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLCREATEMEMORYOBJECTSEXTCONTEXTANGLEPROC
>+    glCreateMemoryObjectsEXTContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLDELETEMEMORYOBJECTSEXTCONTEXTANGLEPROC
>+    glDeleteMemoryObjectsEXTContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLGETMEMORYOBJECTPARAMETERIVEXTCONTEXTANGLEPROC
>+    glGetMemoryObjectParameterivEXTContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLGETUNSIGNEDBYTEI_VEXTCONTEXTANGLEPROC
>+    glGetUnsignedBytei_vEXTContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLGETUNSIGNEDBYTEVEXTCONTEXTANGLEPROC glGetUnsignedBytevEXTContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLISMEMORYOBJECTEXTCONTEXTANGLEPROC glIsMemoryObjectEXTContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLMEMORYOBJECTPARAMETERIVEXTCONTEXTANGLEPROC
>+    glMemoryObjectParameterivEXTContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLTEXSTORAGEMEM2DEXTCONTEXTANGLEPROC glTexStorageMem2DEXTContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLTEXSTORAGEMEM2DMULTISAMPLEEXTCONTEXTANGLEPROC
>+    glTexStorageMem2DMultisampleEXTContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLTEXSTORAGEMEM3DEXTCONTEXTANGLEPROC glTexStorageMem3DEXTContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLTEXSTORAGEMEM3DMULTISAMPLEEXTCONTEXTANGLEPROC
>+    glTexStorageMem3DMultisampleEXTContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLIMPORTMEMORYFDEXTCONTEXTANGLEPROC glImportMemoryFdEXTContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLGETGRAPHICSRESETSTATUSEXTCONTEXTANGLEPROC
>+    glGetGraphicsResetStatusEXTContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLGETNUNIFORMFVEXTCONTEXTANGLEPROC glGetnUniformfvEXTContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLGETNUNIFORMIVEXTCONTEXTANGLEPROC glGetnUniformivEXTContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLREADNPIXELSEXTCONTEXTANGLEPROC glReadnPixelsEXTContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLDELETESEMAPHORESEXTCONTEXTANGLEPROC glDeleteSemaphoresEXTContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLGENSEMAPHORESEXTCONTEXTANGLEPROC glGenSemaphoresEXTContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLGETSEMAPHOREPARAMETERUI64VEXTCONTEXTANGLEPROC
>+    glGetSemaphoreParameterui64vEXTContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLISSEMAPHOREEXTCONTEXTANGLEPROC glIsSemaphoreEXTContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLSEMAPHOREPARAMETERUI64VEXTCONTEXTANGLEPROC
>+    glSemaphoreParameterui64vEXTContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLSIGNALSEMAPHOREEXTCONTEXTANGLEPROC glSignalSemaphoreEXTContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLWAITSEMAPHOREEXTCONTEXTANGLEPROC glWaitSemaphoreEXTContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLIMPORTSEMAPHOREFDEXTCONTEXTANGLEPROC
>+    glImportSemaphoreFdEXTContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLTEXSTORAGE1DEXTCONTEXTANGLEPROC glTexStorage1DEXTContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLTEXSTORAGE2DEXTCONTEXTANGLEPROC glTexStorage2DEXTContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLTEXSTORAGE3DEXTCONTEXTANGLEPROC glTexStorage3DEXTContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLDEBUGMESSAGECALLBACKKHRCONTEXTANGLEPROC
>+    glDebugMessageCallbackKHRContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLDEBUGMESSAGECONTROLKHRCONTEXTANGLEPROC
>+    glDebugMessageControlKHRContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLDEBUGMESSAGEINSERTKHRCONTEXTANGLEPROC
>+    glDebugMessageInsertKHRContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLGETDEBUGMESSAGELOGKHRCONTEXTANGLEPROC
>+    glGetDebugMessageLogKHRContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLGETOBJECTLABELKHRCONTEXTANGLEPROC glGetObjectLabelKHRContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLGETOBJECTPTRLABELKHRCONTEXTANGLEPROC
>+    glGetObjectPtrLabelKHRContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLGETPOINTERVKHRCONTEXTANGLEPROC glGetPointervKHRContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLOBJECTLABELKHRCONTEXTANGLEPROC glObjectLabelKHRContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLOBJECTPTRLABELKHRCONTEXTANGLEPROC glObjectPtrLabelKHRContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLPOPDEBUGGROUPKHRCONTEXTANGLEPROC glPopDebugGroupKHRContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLPUSHDEBUGGROUPKHRCONTEXTANGLEPROC glPushDebugGroupKHRContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLMAXSHADERCOMPILERTHREADSKHRCONTEXTANGLEPROC
>+    glMaxShaderCompilerThreadsKHRContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLDELETEFENCESNVCONTEXTANGLEPROC glDeleteFencesNVContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLFINISHFENCENVCONTEXTANGLEPROC glFinishFenceNVContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLGENFENCESNVCONTEXTANGLEPROC glGenFencesNVContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLGETFENCEIVNVCONTEXTANGLEPROC glGetFenceivNVContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLISFENCENVCONTEXTANGLEPROC glIsFenceNVContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLSETFENCENVCONTEXTANGLEPROC glSetFenceNVContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLTESTFENCENVCONTEXTANGLEPROC glTestFenceNVContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLEGLIMAGETARGETRENDERBUFFERSTORAGEOESCONTEXTANGLEPROC
>+    glEGLImageTargetRenderbufferStorageOESContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLEGLIMAGETARGETTEXTURE2DOESCONTEXTANGLEPROC
>+    glEGLImageTargetTexture2DOESContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLGETPROGRAMBINARYOESCONTEXTANGLEPROC glGetProgramBinaryOESContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLPROGRAMBINARYOESCONTEXTANGLEPROC glProgramBinaryOESContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLGETBUFFERPOINTERVOESCONTEXTANGLEPROC
>+    glGetBufferPointervOESContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLMAPBUFFEROESCONTEXTANGLEPROC glMapBufferOESContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLUNMAPBUFFEROESCONTEXTANGLEPROC glUnmapBufferOESContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLGETSAMPLERPARAMETERIIVOESCONTEXTANGLEPROC
>+    glGetSamplerParameterIivOESContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLGETSAMPLERPARAMETERIUIVOESCONTEXTANGLEPROC
>+    glGetSamplerParameterIuivOESContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLGETTEXPARAMETERIIVOESCONTEXTANGLEPROC
>+    glGetTexParameterIivOESContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLGETTEXPARAMETERIUIVOESCONTEXTANGLEPROC
>+    glGetTexParameterIuivOESContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLSAMPLERPARAMETERIIVOESCONTEXTANGLEPROC
>+    glSamplerParameterIivOESContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLSAMPLERPARAMETERIUIVOESCONTEXTANGLEPROC
>+    glSamplerParameterIuivOESContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLTEXPARAMETERIIVOESCONTEXTANGLEPROC glTexParameterIivOESContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLTEXPARAMETERIUIVOESCONTEXTANGLEPROC glTexParameterIuivOESContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLTEXSTORAGE3DMULTISAMPLEOESCONTEXTANGLEPROC
>+    glTexStorage3DMultisampleOESContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLBINDVERTEXARRAYOESCONTEXTANGLEPROC glBindVertexArrayOESContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLDELETEVERTEXARRAYSOESCONTEXTANGLEPROC
>+    glDeleteVertexArraysOESContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLGENVERTEXARRAYSOESCONTEXTANGLEPROC glGenVertexArraysOESContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLISVERTEXARRAYOESCONTEXTANGLEPROC glIsVertexArrayOESContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLFRAMEBUFFERTEXTUREMULTIVIEWOVRCONTEXTANGLEPROC
>+    glFramebufferTextureMultiviewOVRContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLDRAWTEXFOESCONTEXTANGLEPROC glDrawTexfOESContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLDRAWTEXFVOESCONTEXTANGLEPROC glDrawTexfvOESContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLDRAWTEXIOESCONTEXTANGLEPROC glDrawTexiOESContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLDRAWTEXIVOESCONTEXTANGLEPROC glDrawTexivOESContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLDRAWTEXSOESCONTEXTANGLEPROC glDrawTexsOESContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLDRAWTEXSVOESCONTEXTANGLEPROC glDrawTexsvOESContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLDRAWTEXXOESCONTEXTANGLEPROC glDrawTexxOESContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLDRAWTEXXVOESCONTEXTANGLEPROC glDrawTexxvOESContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLBINDFRAMEBUFFEROESCONTEXTANGLEPROC glBindFramebufferOESContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLBINDRENDERBUFFEROESCONTEXTANGLEPROC glBindRenderbufferOESContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLCHECKFRAMEBUFFERSTATUSOESCONTEXTANGLEPROC
>+    glCheckFramebufferStatusOESContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLDELETEFRAMEBUFFERSOESCONTEXTANGLEPROC
>+    glDeleteFramebuffersOESContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLDELETERENDERBUFFERSOESCONTEXTANGLEPROC
>+    glDeleteRenderbuffersOESContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLFRAMEBUFFERRENDERBUFFEROESCONTEXTANGLEPROC
>+    glFramebufferRenderbufferOESContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLFRAMEBUFFERTEXTURE2DOESCONTEXTANGLEPROC
>+    glFramebufferTexture2DOESContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLGENFRAMEBUFFERSOESCONTEXTANGLEPROC glGenFramebuffersOESContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLGENRENDERBUFFERSOESCONTEXTANGLEPROC glGenRenderbuffersOESContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLGENERATEMIPMAPOESCONTEXTANGLEPROC glGenerateMipmapOESContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLGETFRAMEBUFFERATTACHMENTPARAMETERIVOESCONTEXTANGLEPROC
>+    glGetFramebufferAttachmentParameterivOESContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLGETRENDERBUFFERPARAMETERIVOESCONTEXTANGLEPROC
>+    glGetRenderbufferParameterivOESContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLISFRAMEBUFFEROESCONTEXTANGLEPROC glIsFramebufferOESContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLISRENDERBUFFEROESCONTEXTANGLEPROC glIsRenderbufferOESContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLRENDERBUFFERSTORAGEOESCONTEXTANGLEPROC
>+    glRenderbufferStorageOESContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLCURRENTPALETTEMATRIXOESCONTEXTANGLEPROC
>+    glCurrentPaletteMatrixOESContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLLOADPALETTEFROMMODELVIEWMATRIXOESCONTEXTANGLEPROC
>+    glLoadPaletteFromModelViewMatrixOESContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLMATRIXINDEXPOINTEROESCONTEXTANGLEPROC
>+    glMatrixIndexPointerOESContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLWEIGHTPOINTEROESCONTEXTANGLEPROC glWeightPointerOESContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLPOINTSIZEPOINTEROESCONTEXTANGLEPROC glPointSizePointerOESContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLQUERYMATRIXXOESCONTEXTANGLEPROC glQueryMatrixxOESContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLGETTEXGENFVOESCONTEXTANGLEPROC glGetTexGenfvOESContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLGETTEXGENIVOESCONTEXTANGLEPROC glGetTexGenivOESContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLGETTEXGENXVOESCONTEXTANGLEPROC glGetTexGenxvOESContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLTEXGENFOESCONTEXTANGLEPROC glTexGenfOESContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLTEXGENFVOESCONTEXTANGLEPROC glTexGenfvOESContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLTEXGENIOESCONTEXTANGLEPROC glTexGeniOESContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLTEXGENIVOESCONTEXTANGLEPROC glTexGenivOESContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLTEXGENXOESCONTEXTANGLEPROC glTexGenxOESContextANGLE;
>+ANGLE_UTIL_EXPORT extern PFNGLTEXGENXVOESCONTEXTANGLEPROC glTexGenxvOESContextANGLE;
>+
>+namespace angle
>+{
>+using GenericProc = void (*)();
>+using LoadProc    = GenericProc(KHRONOS_APIENTRY *)(const char *);
>+ANGLE_UTIL_EXPORT void LoadGLES(LoadProc loadProc);
>+}  // namespace angle
>+
>+#endif  // UTIL_GLES_LOADER_AUTOGEN_H_
>diff --git a/Source/ThirdParty/ANGLE/util/linux/LinuxTimer.cpp b/Source/ThirdParty/ANGLE/util/linux/LinuxTimer.cpp
>deleted file mode 100644
>index 19682058088..00000000000
>--- a/Source/ThirdParty/ANGLE/util/linux/LinuxTimer.cpp
>+++ /dev/null
>@@ -1,49 +0,0 @@
>-//
>-// Copyright (c) 2015 The ANGLE Project Authors. All rights reserved.
>-// Use of this source code is governed by a BSD-style license that can be
>-// found in the LICENSE file.
>-//
>-
>-// LinuxTimer.cpp: Implementation of a high precision timer class on Linux
>-
>-#include "linux/LinuxTimer.h"
>-#include <iostream>
>-
>-LinuxTimer::LinuxTimer()
>-    : mRunning(false)
>-{
>-}
>-
>-void LinuxTimer::start()
>-{
>-    clock_gettime(CLOCK_MONOTONIC, &mStartTime);
>-    mRunning = true;
>-}
>-
>-void LinuxTimer::stop()
>-{
>-    clock_gettime(CLOCK_MONOTONIC, &mStopTime);
>-    mRunning = false;
>-}
>-
>-double LinuxTimer::getElapsedTime() const
>-{
>-    struct timespec endTime;
>-    if (mRunning)
>-    {
>-        clock_gettime(CLOCK_MONOTONIC, &endTime);
>-    }
>-    else
>-    {
>-        endTime = mStopTime;
>-    }
>-
>-    double startSeconds = mStartTime.tv_sec + (1.0 / 1000000000) * mStartTime.tv_nsec;
>-    double endSeconds = endTime.tv_sec + (1.0 / 1000000000) * endTime.tv_nsec;
>-    return endSeconds - startSeconds;
>-}
>-
>-Timer *CreateTimer()
>-{
>-    return new LinuxTimer();
>-}
>diff --git a/Source/ThirdParty/ANGLE/util/linux/LinuxTimer.h b/Source/ThirdParty/ANGLE/util/linux/LinuxTimer.h
>deleted file mode 100644
>index 8e68dd84297..00000000000
>--- a/Source/ThirdParty/ANGLE/util/linux/LinuxTimer.h
>+++ /dev/null
>@@ -1,31 +0,0 @@
>-//
>-// Copyright (c) 2015 The ANGLE Project Authors. All rights reserved.
>-// Use of this source code is governed by a BSD-style license that can be
>-// found in the LICENSE file.
>-//
>-
>-// LinuxTimer.h: Definition of a high precision timer class on Linux
>-
>-#ifndef UTIL_LINUX_TIMER_H
>-#define UTIL_LINUX_TIMER_H
>-
>-#include <time.h>
>-
>-#include "Timer.h"
>-
>-class LinuxTimer : public Timer
>-{
>-  public:
>-    LinuxTimer();
>-
>-    void start() override;
>-    void stop() override;
>-    double getElapsedTime() const override;
>-
>-  private:
>-    bool mRunning;
>-    struct timespec mStartTime;
>-    struct timespec mStopTime;
>-};
>-
>-#endif // UTIL_LINUX_TIMER_H
>diff --git a/Source/ThirdParty/ANGLE/util/osx/OSXPixmap.h b/Source/ThirdParty/ANGLE/util/osx/OSXPixmap.h
>index f9cdfdcbf61..776adb2564c 100644
>--- a/Source/ThirdParty/ANGLE/util/osx/OSXPixmap.h
>+++ b/Source/ThirdParty/ANGLE/util/osx/OSXPixmap.h
>@@ -9,6 +9,6 @@
> #ifndef UTIL_OSX_PIXMAP_H_
> #define UTIL_OSX_PIXMAP_H_
> 
>-#include "OSPixmap.h"
>+#include "util/OSPixmap.h"
> 
>-#endif // UTIL_OSX_PIXMAP_H_
>+#endif  // UTIL_OSX_PIXMAP_H_
>diff --git a/Source/ThirdParty/ANGLE/util/osx/OSXPixmap.mm b/Source/ThirdParty/ANGLE/util/osx/OSXPixmap.mm
>index 16af8bf37e2..c12c3a96b50 100644
>--- a/Source/ThirdParty/ANGLE/util/osx/OSXPixmap.mm
>+++ b/Source/ThirdParty/ANGLE/util/osx/OSXPixmap.mm
>@@ -6,7 +6,7 @@
> 
> // OSXPixmap.cpp: Implementation of OSPixmap for OSX
> 
>-#include "osx/OSXPixmap.h"
>+#include "util/osx/OSXPixmap.h"
> 
> // TODO(cwallez) find out the native OSX pixmap type and implement this
> OSPixmap *CreateOSPixmap()
>diff --git a/Source/ThirdParty/ANGLE/util/osx/OSXTimer.cpp b/Source/ThirdParty/ANGLE/util/osx/OSXTimer.cpp
>index 909155d8680..da22bf3797d 100644
>--- a/Source/ThirdParty/ANGLE/util/osx/OSXTimer.cpp
>+++ b/Source/ThirdParty/ANGLE/util/osx/OSXTimer.cpp
>@@ -6,54 +6,59 @@
> 
> // OSXTimer.cpp: Implementation of a high precision timer class on OSX
> 
>-#include "osx/OSXTimer.h"
>+#include "util/osx/OSXTimer.h"
> 
> #include <CoreServices/CoreServices.h>
> #include <mach/mach.h>
> #include <mach/mach_time.h>
> 
>-OSXTimer::OSXTimer()
>-    : mRunning(false)
>+OSXTimer::OSXTimer() : mRunning(false), mSecondCoeff(0) {}
>+
>+double OSXTimer::getSecondCoeff()
> {
>+    // If this is the first time we've run, get the timebase.
>+    if (mSecondCoeff == 0.0)
>+    {
>+        mach_timebase_info_data_t timebaseInfo;
>+        mach_timebase_info(&timebaseInfo);
>+
>+        mSecondCoeff = timebaseInfo.numer * (1.0 / 1000000000) / timebaseInfo.denom;
>+    }
>+
>+    return mSecondCoeff;
> }
> 
> void OSXTimer::start()
> {
>     mStartTime = mach_absolute_time();
>+    // Cache secondCoeff
>+    getSecondCoeff();
>     mRunning = true;
> }
> 
> void OSXTimer::stop()
> {
>     mStopTime = mach_absolute_time();
>-    mRunning = false;
>+    mRunning  = false;
> }
> 
> double OSXTimer::getElapsedTime() const
> {
>-    // If this is the first time we've run, get the timebase.
>-    // We can use denom == 0 to indicate that sTimebaseInfo is
>-    // uninitialised because it makes no sense to have a zero
>-    // denominator in a fraction.
>-    static mach_timebase_info_data_t timebaseInfo;
>-    static double secondCoeff;
>-
>-    if ( timebaseInfo.denom == 0 )
>-    {
>-        mach_timebase_info(&timebaseInfo);
>-        secondCoeff = timebaseInfo.numer * (1.0 / 1000000000) / timebaseInfo.denom;
>-    }
>-
>     if (mRunning)
>     {
>-        return secondCoeff * (mach_absolute_time() - mStartTime);
>+        return mSecondCoeff * (mach_absolute_time() - mStartTime);
>     }
>     else
>     {
>-        return secondCoeff * (mStopTime - mStartTime);
>+        return mSecondCoeff * (mStopTime - mStartTime);
>     }
> }
> 
>+double OSXTimer::getAbsoluteTime()
>+{
>+    return getSecondCoeff() * mach_absolute_time();
>+}
>+
> Timer *CreateTimer()
> {
>     return new OSXTimer();
>diff --git a/Source/ThirdParty/ANGLE/util/osx/OSXTimer.h b/Source/ThirdParty/ANGLE/util/osx/OSXTimer.h
>index af1c278ba9c..827ae9542b8 100644
>--- a/Source/ThirdParty/ANGLE/util/osx/OSXTimer.h
>+++ b/Source/ThirdParty/ANGLE/util/osx/OSXTimer.h
>@@ -12,9 +12,9 @@
> #include <stdint.h>
> #include <time.h>
> 
>-#include "Timer.h"
>+#include "util/Timer.h"
> 
>-class OSXTimer : public Timer
>+class ANGLE_UTIL_EXPORT OSXTimer : public Timer
> {
>   public:
>     OSXTimer();
>@@ -23,10 +23,15 @@ class OSXTimer : public Timer
>     void stop() override;
>     double getElapsedTime() const override;
> 
>+    double getAbsoluteTime() override;
>+
>   private:
>+    double getSecondCoeff();
>+
>     bool mRunning;
>     uint64_t mStartTime;
>     uint64_t mStopTime;
>+    double mSecondCoeff;
> };
> 
>-#endif // UTIL_OSX_TIMER_H_
>+#endif  // UTIL_OSX_TIMER_H_
>diff --git a/Source/ThirdParty/ANGLE/util/osx/OSXWindow.h b/Source/ThirdParty/ANGLE/util/osx/OSXWindow.h
>index 980f8165d77..4f7a6916435 100644
>--- a/Source/ThirdParty/ANGLE/util/osx/OSXWindow.h
>+++ b/Source/ThirdParty/ANGLE/util/osx/OSXWindow.h
>@@ -11,24 +11,22 @@
> 
> #import <Cocoa/Cocoa.h>
> 
>-#include "OSWindow.h"
>+#include "util/OSWindow.h"
> 
> class OSXWindow;
> 
>-@interface WindowDelegate : NSObject
>-{
>+@interface WindowDelegate : NSObject {
>     OSXWindow *mWindow;
> }
>-- (id) initWithWindow: (OSXWindow*) window;
>+- (id)initWithWindow:(OSXWindow *)window;
> @end
> 
>-@interface ContentView : NSView
>-{
>+@interface ContentView : NSView {
>     OSXWindow *mWindow;
>     NSTrackingArea *mTrackingArea;
>     int mCurrentModifier;
> }
>-- (id) initWithWindow: (OSXWindow*) window;
>+- (id)initWithWindow:(OSXWindow *)window;
> @end
> 
> class OSXWindow : public OSWindow
>@@ -40,6 +38,7 @@ class OSXWindow : public OSWindow
>     bool initialize(const std::string &name, size_t width, size_t height) override;
>     void destroy() override;
> 
>+    void resetNativeWindow() override;
>     EGLNativeWindowType getNativeWindow() const override;
>     EGLNativeDisplayType getNativeDisplay() const override;
> 
>@@ -60,4 +59,4 @@ class OSXWindow : public OSWindow
>     ContentView *mView;
> };
> 
>-#endif // UTIL_OSX_WINDOW_H_
>+#endif  // UTIL_OSX_WINDOW_H_
>diff --git a/Source/ThirdParty/ANGLE/util/osx/OSXWindow.mm b/Source/ThirdParty/ANGLE/util/osx/OSXWindow.mm
>index 98e71248d6b..665698f6f48 100644
>--- a/Source/ThirdParty/ANGLE/util/osx/OSXWindow.mm
>+++ b/Source/ThirdParty/ANGLE/util/osx/OSXWindow.mm
>@@ -6,7 +6,7 @@
> 
> // OSXWindow.mm: Implementation of OSWindow for OSX
> 
>-#include "osx/OSXWindow.h"
>+#include "util/osx/OSXWindow.h"
> 
> #include <set>
> // Include Carbon to use the keycode names in Carbon's Event.h
>@@ -23,28 +23,28 @@
> // Some events such as "ShouldTerminate" are sent to the whole application so we keep a list of
> // all the windows in order to forward the event to each of them. However this and calling pushEvent
> // in ApplicationDelegate is inherently unsafe in a multithreaded environment.
>-static std::set<OSXWindow*> gAllWindows;
>+static std::set<OSXWindow *> gAllWindows;
> 
> @interface Application : NSApplication
> @end
> 
> @implementation Application
>-    - (void) sendEvent: (NSEvent*) nsEvent
>+- (void)sendEvent:(NSEvent *)nsEvent
>+{
>+    if ([nsEvent type] == NSApplicationDefined)
>     {
>-        if ([nsEvent type] == NSApplicationDefined)
>+        for (auto window : gAllWindows)
>         {
>-            for (auto window : gAllWindows)
>+            if ([window->getNSWindow() windowNumber] == [nsEvent windowNumber])
>             {
>-                if ([window->getNSWindow() windowNumber] == [nsEvent windowNumber])
>-                {
>-                    Event event;
>-                    event.Type = Event::EVENT_TEST;
>-                    window->pushEvent(event);
>-                }
>+                Event event;
>+                event.Type = Event::EVENT_TEST;
>+                window->pushEvent(event);
>             }
>         }
>-        [super sendEvent: nsEvent];
>     }
>+    [super sendEvent:nsEvent];
>+}
> @end
> 
> // The Delegate receiving application-wide events.
>@@ -52,16 +52,16 @@ static std::set<OSXWindow*> gAllWindows;
> @end
> 
> @implementation ApplicationDelegate
>-    - (NSApplicationTerminateReply) applicationShouldTerminate: (NSApplication*) sender
>+- (NSApplicationTerminateReply)applicationShouldTerminate:(NSApplication *)sender
>+{
>+    Event event;
>+    event.Type = Event::EVENT_CLOSED;
>+    for (auto window : gAllWindows)
>     {
>-        Event event;
>-        event.Type = Event::EVENT_CLOSED;
>-        for (auto window : gAllWindows)
>-        {
>-            window->pushEvent(event);
>-        }
>-        return NSTerminateCancel;
>+        window->pushEvent(event);
>     }
>+    return NSTerminateCancel;
>+}
> @end
> static ApplicationDelegate *gApplicationDelegate = nil;
> 
>@@ -84,7 +84,7 @@ static bool InitializeAppKit()
>     {
>         return false;
>     }
>-    [NSApp setDelegate: static_cast<id>(gApplicationDelegate)];
>+    [NSApp setDelegate:static_cast<id>(gApplicationDelegate)];
> 
>     // Set our status to "started" so we are not bouncing in the doc and can activate
>     [NSApp finishLaunching];
>@@ -101,67 +101,67 @@ static float YCoordToFromCG(float y)
> 
> // Delegate for window-wide events, note that the protocol doesn't contain anything input related.
> @implementation WindowDelegate
>-    - (id) initWithWindow: (OSXWindow*) window
>+- (id)initWithWindow:(OSXWindow *)window
>+{
>+    self = [super init];
>+    if (self != nil)
>     {
>-        self = [super init];
>-        if (self != nil)
>-        {
>-            mWindow = window;
>-        }
>-        return self;
>+        mWindow = window;
>     }
>+    return self;
>+}
> 
>-    - (void) onOSXWindowDeleted
>-    {
>-        mWindow = nil;
>-    }
>+- (void)onOSXWindowDeleted
>+{
>+    mWindow = nil;
>+}
> 
>-    - (BOOL) windowShouldClose: (id) sender
>-    {
>-        Event event;
>-        event.Type = Event::EVENT_CLOSED;
>-        mWindow->pushEvent(event);
>-        return NO;
>-    }
>+- (BOOL)windowShouldClose:(id)sender
>+{
>+    Event event;
>+    event.Type = Event::EVENT_CLOSED;
>+    mWindow->pushEvent(event);
>+    return NO;
>+}
> 
>-    - (void) windowDidResize: (NSNotification*) notification
>-    {
>-        NSSize windowSize = [[mWindow->getNSWindow() contentView] frame].size;
>-        Event event;
>-        event.Type = Event::EVENT_RESIZED;
>-        event.Size.Width = windowSize.width;
>-        event.Size.Height = windowSize.height;
>-        mWindow->pushEvent(event);
>-    }
>+- (void)windowDidResize:(NSNotification *)notification
>+{
>+    NSSize windowSize = [[mWindow->getNSWindow() contentView] frame].size;
>+    Event event;
>+    event.Type        = Event::EVENT_RESIZED;
>+    event.Size.Width  = windowSize.width;
>+    event.Size.Height = windowSize.height;
>+    mWindow->pushEvent(event);
>+}
> 
>-    - (void) windowDidMove: (NSNotification*) notification
>-    {
>-        NSRect screenspace = [mWindow->getNSWindow() frame];
>-        Event event;
>-        event.Type = Event::EVENT_MOVED;
>-        event.Move.X = screenspace.origin.x;
>-        event.Move.Y = YCoordToFromCG(screenspace.origin.y + screenspace.size.height);
>-        mWindow->pushEvent(event);
>-    }
>+- (void)windowDidMove:(NSNotification *)notification
>+{
>+    NSRect screenspace = [mWindow->getNSWindow() frame];
>+    Event event;
>+    event.Type   = Event::EVENT_MOVED;
>+    event.Move.X = screenspace.origin.x;
>+    event.Move.Y = YCoordToFromCG(screenspace.origin.y + screenspace.size.height);
>+    mWindow->pushEvent(event);
>+}
>+
>+- (void)windowDidBecomeKey:(NSNotification *)notification
>+{
>+    Event event;
>+    event.Type = Event::EVENT_GAINED_FOCUS;
>+    mWindow->pushEvent(event);
>+    [self retain];
>+}
> 
>-    - (void) windowDidBecomeKey: (NSNotification*) notification
>+- (void)windowDidResignKey:(NSNotification *)notification
>+{
>+    if (mWindow != nil)
>     {
>         Event event;
>-        event.Type = Event::EVENT_GAINED_FOCUS;
>+        event.Type = Event::EVENT_LOST_FOCUS;
>         mWindow->pushEvent(event);
>-        [self retain];
>-    }
>-
>-    - (void) windowDidResignKey: (NSNotification*) notification
>-    {
>-        if (mWindow != nil)
>-        {
>-            Event event;
>-            event.Type = Event::EVENT_LOST_FOCUS;
>-            mWindow->pushEvent(event);
>-        }
>-        [self release];
>     }
>+    [self release];
>+}
> @end
> 
> static Key NSCodeToKey(int keyCode)
>@@ -169,112 +169,211 @@ static Key NSCodeToKey(int keyCode)
>     // Missing KEY_PAUSE
>     switch (keyCode)
>     {
>-      case kVK_Shift:               return KEY_LSHIFT;
>-      case kVK_RightShift:          return KEY_RSHIFT;
>-      case kVK_Option:              return KEY_LALT;
>-      case kVK_RightOption:         return KEY_RALT;
>-      case kVK_Control:             return KEY_LCONTROL;
>-      case kVK_RightControl:        return KEY_RCONTROL;
>-      case kVK_Command:             return KEY_LSYSTEM;
>-      // Right System doesn't have a name, but shows up as 0x36.
>-      case 0x36:                    return KEY_RSYSTEM;
>-      case kVK_Function:            return KEY_MENU;
>-
>-      case kVK_ANSI_Semicolon:      return KEY_SEMICOLON;
>-      case kVK_ANSI_Slash:          return KEY_SLASH;
>-      case kVK_ANSI_Equal:          return KEY_EQUAL;
>-      case kVK_ANSI_Minus:          return KEY_DASH;
>-      case kVK_ANSI_LeftBracket:    return KEY_LBRACKET;
>-      case kVK_ANSI_RightBracket:   return KEY_RBRACKET;
>-      case kVK_ANSI_Comma:          return KEY_COMMA;
>-      case kVK_ANSI_Period:         return KEY_PERIOD;
>-      case kVK_ANSI_Backslash:      return KEY_BACKSLASH;
>-      case kVK_ANSI_Grave:          return KEY_TILDE;
>-      case kVK_Escape:              return KEY_ESCAPE;
>-      case kVK_Space:               return KEY_SPACE;
>-      case kVK_Return:              return KEY_RETURN;
>-      case kVK_Delete:              return KEY_BACK;
>-      case kVK_Tab:                 return KEY_TAB;
>-      case kVK_PageUp:              return KEY_PAGEUP;
>-      case kVK_PageDown:            return KEY_PAGEDOWN;
>-      case kVK_End:                 return KEY_END;
>-      case kVK_Home:                return KEY_HOME;
>-      case kVK_Help:                return KEY_INSERT;
>-      case kVK_ForwardDelete:       return KEY_DELETE;
>-      case kVK_ANSI_KeypadPlus:     return KEY_ADD;
>-      case kVK_ANSI_KeypadMinus:    return KEY_SUBTRACT;
>-      case kVK_ANSI_KeypadMultiply: return KEY_MULTIPLY;
>-      case kVK_ANSI_KeypadDivide:   return KEY_DIVIDE;
>-
>-      case kVK_F1:                  return KEY_F1;
>-      case kVK_F2:                  return KEY_F2;
>-      case kVK_F3:                  return KEY_F3;
>-      case kVK_F4:                  return KEY_F4;
>-      case kVK_F5:                  return KEY_F5;
>-      case kVK_F6:                  return KEY_F6;
>-      case kVK_F7:                  return KEY_F7;
>-      case kVK_F8:                  return KEY_F8;
>-      case kVK_F9:                  return KEY_F9;
>-      case kVK_F10:                 return KEY_F10;
>-      case kVK_F11:                 return KEY_F11;
>-      case kVK_F12:                 return KEY_F12;
>-      case kVK_F13:                 return KEY_F13;
>-      case kVK_F14:                 return KEY_F14;
>-      case kVK_F15:                 return KEY_F15;
>-
>-      case kVK_LeftArrow:           return KEY_LEFT;
>-      case kVK_RightArrow:          return KEY_RIGHT;
>-      case kVK_DownArrow:           return KEY_DOWN;
>-      case kVK_UpArrow:             return KEY_UP;
>-
>-      case kVK_ANSI_Keypad0:        return KEY_NUMPAD0;
>-      case kVK_ANSI_Keypad1:        return KEY_NUMPAD1;
>-      case kVK_ANSI_Keypad2:        return KEY_NUMPAD2;
>-      case kVK_ANSI_Keypad3:        return KEY_NUMPAD3;
>-      case kVK_ANSI_Keypad4:        return KEY_NUMPAD4;
>-      case kVK_ANSI_Keypad5:        return KEY_NUMPAD5;
>-      case kVK_ANSI_Keypad6:        return KEY_NUMPAD6;
>-      case kVK_ANSI_Keypad7:        return KEY_NUMPAD7;
>-      case kVK_ANSI_Keypad8:        return KEY_NUMPAD8;
>-      case kVK_ANSI_Keypad9:        return KEY_NUMPAD9;
>-
>-      case kVK_ANSI_A:              return KEY_A;
>-      case kVK_ANSI_B:              return KEY_B;
>-      case kVK_ANSI_C:              return KEY_C;
>-      case kVK_ANSI_D:              return KEY_D;
>-      case kVK_ANSI_E:              return KEY_E;
>-      case kVK_ANSI_F:              return KEY_F;
>-      case kVK_ANSI_G:              return KEY_G;
>-      case kVK_ANSI_H:              return KEY_H;
>-      case kVK_ANSI_I:              return KEY_I;
>-      case kVK_ANSI_J:              return KEY_J;
>-      case kVK_ANSI_K:              return KEY_K;
>-      case kVK_ANSI_L:              return KEY_L;
>-      case kVK_ANSI_M:              return KEY_M;
>-      case kVK_ANSI_N:              return KEY_N;
>-      case kVK_ANSI_O:              return KEY_O;
>-      case kVK_ANSI_P:              return KEY_P;
>-      case kVK_ANSI_Q:              return KEY_Q;
>-      case kVK_ANSI_R:              return KEY_R;
>-      case kVK_ANSI_S:              return KEY_S;
>-      case kVK_ANSI_T:              return KEY_T;
>-      case kVK_ANSI_U:              return KEY_U;
>-      case kVK_ANSI_V:              return KEY_V;
>-      case kVK_ANSI_W:              return KEY_W;
>-      case kVK_ANSI_X:              return KEY_X;
>-      case kVK_ANSI_Y:              return KEY_Y;
>-      case kVK_ANSI_Z:              return KEY_Z;
>-
>-      case kVK_ANSI_1:              return KEY_NUM1;
>-      case kVK_ANSI_2:              return KEY_NUM2;
>-      case kVK_ANSI_3:              return KEY_NUM3;
>-      case kVK_ANSI_4:              return KEY_NUM4;
>-      case kVK_ANSI_5:              return KEY_NUM5;
>-      case kVK_ANSI_6:              return KEY_NUM6;
>-      case kVK_ANSI_7:              return KEY_NUM7;
>-      case kVK_ANSI_8:              return KEY_NUM8;
>-      case kVK_ANSI_9:              return KEY_NUM9;
>-      case kVK_ANSI_0:              return KEY_NUM0;
>+        case kVK_Shift:
>+            return KEY_LSHIFT;
>+        case kVK_RightShift:
>+            return KEY_RSHIFT;
>+        case kVK_Option:
>+            return KEY_LALT;
>+        case kVK_RightOption:
>+            return KEY_RALT;
>+        case kVK_Control:
>+            return KEY_LCONTROL;
>+        case kVK_RightControl:
>+            return KEY_RCONTROL;
>+        case kVK_Command:
>+            return KEY_LSYSTEM;
>+        // Right System doesn't have a name, but shows up as 0x36.
>+        case 0x36:
>+            return KEY_RSYSTEM;
>+        case kVK_Function:
>+            return KEY_MENU;
>+
>+        case kVK_ANSI_Semicolon:
>+            return KEY_SEMICOLON;
>+        case kVK_ANSI_Slash:
>+            return KEY_SLASH;
>+        case kVK_ANSI_Equal:
>+            return KEY_EQUAL;
>+        case kVK_ANSI_Minus:
>+            return KEY_DASH;
>+        case kVK_ANSI_LeftBracket:
>+            return KEY_LBRACKET;
>+        case kVK_ANSI_RightBracket:
>+            return KEY_RBRACKET;
>+        case kVK_ANSI_Comma:
>+            return KEY_COMMA;
>+        case kVK_ANSI_Period:
>+            return KEY_PERIOD;
>+        case kVK_ANSI_Backslash:
>+            return KEY_BACKSLASH;
>+        case kVK_ANSI_Grave:
>+            return KEY_TILDE;
>+        case kVK_Escape:
>+            return KEY_ESCAPE;
>+        case kVK_Space:
>+            return KEY_SPACE;
>+        case kVK_Return:
>+            return KEY_RETURN;
>+        case kVK_Delete:
>+            return KEY_BACK;
>+        case kVK_Tab:
>+            return KEY_TAB;
>+        case kVK_PageUp:
>+            return KEY_PAGEUP;
>+        case kVK_PageDown:
>+            return KEY_PAGEDOWN;
>+        case kVK_End:
>+            return KEY_END;
>+        case kVK_Home:
>+            return KEY_HOME;
>+        case kVK_Help:
>+            return KEY_INSERT;
>+        case kVK_ForwardDelete:
>+            return KEY_DELETE;
>+        case kVK_ANSI_KeypadPlus:
>+            return KEY_ADD;
>+        case kVK_ANSI_KeypadMinus:
>+            return KEY_SUBTRACT;
>+        case kVK_ANSI_KeypadMultiply:
>+            return KEY_MULTIPLY;
>+        case kVK_ANSI_KeypadDivide:
>+            return KEY_DIVIDE;
>+
>+        case kVK_F1:
>+            return KEY_F1;
>+        case kVK_F2:
>+            return KEY_F2;
>+        case kVK_F3:
>+            return KEY_F3;
>+        case kVK_F4:
>+            return KEY_F4;
>+        case kVK_F5:
>+            return KEY_F5;
>+        case kVK_F6:
>+            return KEY_F6;
>+        case kVK_F7:
>+            return KEY_F7;
>+        case kVK_F8:
>+            return KEY_F8;
>+        case kVK_F9:
>+            return KEY_F9;
>+        case kVK_F10:
>+            return KEY_F10;
>+        case kVK_F11:
>+            return KEY_F11;
>+        case kVK_F12:
>+            return KEY_F12;
>+        case kVK_F13:
>+            return KEY_F13;
>+        case kVK_F14:
>+            return KEY_F14;
>+        case kVK_F15:
>+            return KEY_F15;
>+
>+        case kVK_LeftArrow:
>+            return KEY_LEFT;
>+        case kVK_RightArrow:
>+            return KEY_RIGHT;
>+        case kVK_DownArrow:
>+            return KEY_DOWN;
>+        case kVK_UpArrow:
>+            return KEY_UP;
>+
>+        case kVK_ANSI_Keypad0:
>+            return KEY_NUMPAD0;
>+        case kVK_ANSI_Keypad1:
>+            return KEY_NUMPAD1;
>+        case kVK_ANSI_Keypad2:
>+            return KEY_NUMPAD2;
>+        case kVK_ANSI_Keypad3:
>+            return KEY_NUMPAD3;
>+        case kVK_ANSI_Keypad4:
>+            return KEY_NUMPAD4;
>+        case kVK_ANSI_Keypad5:
>+            return KEY_NUMPAD5;
>+        case kVK_ANSI_Keypad6:
>+            return KEY_NUMPAD6;
>+        case kVK_ANSI_Keypad7:
>+            return KEY_NUMPAD7;
>+        case kVK_ANSI_Keypad8:
>+            return KEY_NUMPAD8;
>+        case kVK_ANSI_Keypad9:
>+            return KEY_NUMPAD9;
>+
>+        case kVK_ANSI_A:
>+            return KEY_A;
>+        case kVK_ANSI_B:
>+            return KEY_B;
>+        case kVK_ANSI_C:
>+            return KEY_C;
>+        case kVK_ANSI_D:
>+            return KEY_D;
>+        case kVK_ANSI_E:
>+            return KEY_E;
>+        case kVK_ANSI_F:
>+            return KEY_F;
>+        case kVK_ANSI_G:
>+            return KEY_G;
>+        case kVK_ANSI_H:
>+            return KEY_H;
>+        case kVK_ANSI_I:
>+            return KEY_I;
>+        case kVK_ANSI_J:
>+            return KEY_J;
>+        case kVK_ANSI_K:
>+            return KEY_K;
>+        case kVK_ANSI_L:
>+            return KEY_L;
>+        case kVK_ANSI_M:
>+            return KEY_M;
>+        case kVK_ANSI_N:
>+            return KEY_N;
>+        case kVK_ANSI_O:
>+            return KEY_O;
>+        case kVK_ANSI_P:
>+            return KEY_P;
>+        case kVK_ANSI_Q:
>+            return KEY_Q;
>+        case kVK_ANSI_R:
>+            return KEY_R;
>+        case kVK_ANSI_S:
>+            return KEY_S;
>+        case kVK_ANSI_T:
>+            return KEY_T;
>+        case kVK_ANSI_U:
>+            return KEY_U;
>+        case kVK_ANSI_V:
>+            return KEY_V;
>+        case kVK_ANSI_W:
>+            return KEY_W;
>+        case kVK_ANSI_X:
>+            return KEY_X;
>+        case kVK_ANSI_Y:
>+            return KEY_Y;
>+        case kVK_ANSI_Z:
>+            return KEY_Z;
>+
>+        case kVK_ANSI_1:
>+            return KEY_NUM1;
>+        case kVK_ANSI_2:
>+            return KEY_NUM2;
>+        case kVK_ANSI_3:
>+            return KEY_NUM3;
>+        case kVK_ANSI_4:
>+            return KEY_NUM4;
>+        case kVK_ANSI_5:
>+            return KEY_NUM5;
>+        case kVK_ANSI_6:
>+            return KEY_NUM6;
>+        case kVK_ANSI_7:
>+            return KEY_NUM7;
>+        case kVK_ANSI_8:
>+            return KEY_NUM8;
>+        case kVK_ANSI_9:
>+            return KEY_NUM9;
>+        case kVK_ANSI_0:
>+            return KEY_NUM0;
>     }
> 
>     return Key(0);
>@@ -282,249 +381,236 @@ static Key NSCodeToKey(int keyCode)
> 
> static void AddNSKeyStateToEvent(Event *event, int state)
> {
>-    event->Key.Shift = state & NSShiftKeyMask;
>+    event->Key.Shift   = state & NSShiftKeyMask;
>     event->Key.Control = state & NSControlKeyMask;
>-    event->Key.Alt = state & NSAlternateKeyMask;
>-    event->Key.System = state & NSCommandKeyMask;
>+    event->Key.Alt     = state & NSAlternateKeyMask;
>+    event->Key.System  = state & NSCommandKeyMask;
> }
> 
> static MouseButton TranslateMouseButton(int button)
> {
>     switch (button)
>     {
>-      case 2:
>-        return MOUSEBUTTON_MIDDLE;
>-      case 3:
>-        return MOUSEBUTTON_BUTTON4;
>-      case 4:
>-        return MOUSEBUTTON_BUTTON5;
>-      default:
>-        return MOUSEBUTTON_UNKNOWN;
>+        case 2:
>+            return MOUSEBUTTON_MIDDLE;
>+        case 3:
>+            return MOUSEBUTTON_BUTTON4;
>+        case 4:
>+            return MOUSEBUTTON_BUTTON5;
>+        default:
>+            return MOUSEBUTTON_UNKNOWN;
>     }
> }
> 
> // Delegate for NSView events, mostly the input events
> @implementation ContentView
>-    - (id) initWithWindow: (OSXWindow*) window
>+- (id)initWithWindow:(OSXWindow *)window
>+{
>+    self = [super init];
>+    if (self != nil)
>     {
>-        self = [super init];
>-        if (self != nil)
>-        {
>-            mWindow = window;
>-            mTrackingArea = nil;
>-            mCurrentModifier = 0;
>-            [self updateTrackingAreas];
>-        }
>-        return self;
>+        mWindow          = window;
>+        mTrackingArea    = nil;
>+        mCurrentModifier = 0;
>+        [self updateTrackingAreas];
>     }
>+    return self;
>+}
> 
>-    - (void) dealloc
>+- (void)dealloc
>+{
>+    [mTrackingArea release];
>+    [super dealloc];
>+}
>+
>+- (void)updateTrackingAreas
>+{
>+    if (mTrackingArea != nil)
>     {
>+        [self removeTrackingArea:mTrackingArea];
>         [mTrackingArea release];
>-        [super dealloc];
>+        mTrackingArea = nil;
>     }
> 
>-    - (void) updateTrackingAreas
>-    {
>-        if (mTrackingArea != nil)
>-        {
>-            [self removeTrackingArea: mTrackingArea];
>-            [mTrackingArea release];
>-            mTrackingArea = nil;
>-        }
>+    NSRect bounds               = [self bounds];
>+    NSTrackingAreaOptions flags = NSTrackingMouseEnteredAndExited | NSTrackingActiveInKeyWindow |
>+                                  NSTrackingCursorUpdate | NSTrackingInVisibleRect |
>+                                  NSTrackingAssumeInside;
>+    mTrackingArea = [[NSTrackingArea alloc] initWithRect:bounds
>+                                                 options:flags
>+                                                   owner:self
>+                                                userInfo:nil];
> 
>-        NSRect bounds = [self bounds];
>-        NSTrackingAreaOptions flags = NSTrackingMouseEnteredAndExited |
>-                                      NSTrackingActiveInKeyWindow |
>-                                      NSTrackingCursorUpdate |
>-                                      NSTrackingInVisibleRect |
>-                                      NSTrackingAssumeInside;
>-        mTrackingArea = [[NSTrackingArea alloc] initWithRect: bounds
>-                                                    options: flags
>-                                                      owner: self
>-                                                   userInfo: nil];
>-
>-        [self addTrackingArea: mTrackingArea];
>-        [super updateTrackingAreas];
>-    }
>+    [self addTrackingArea:mTrackingArea];
>+    [super updateTrackingAreas];
>+}
> 
>-    // Helps with performance
>-    - (BOOL) isOpaque
>-    {
>-        return YES;
>-    }
>+// Helps with performance
>+- (BOOL)isOpaque
>+{
>+    return YES;
>+}
> 
>-    - (BOOL) canBecomeKeyView
>-    {
>-        return YES;
>-    }
>+- (BOOL)canBecomeKeyView
>+{
>+    return YES;
>+}
> 
>-    - (BOOL) acceptsFirstResponder
>-    {
>-        return YES;
>-    }
>+- (BOOL)acceptsFirstResponder
>+{
>+    return YES;
>+}
> 
>-    // Handle mouse events from the NSResponder protocol
>-    - (float) translateMouseY: (float) y
>-    {
>-        return [self frame].size.height - y;
>-    }
>+// Handle mouse events from the NSResponder protocol
>+- (float)translateMouseY:(float)y
>+{
>+    return [self frame].size.height - y;
>+}
> 
>-    - (void) addButtonEvent: (NSEvent*) nsEvent type:(Event::EventType) eventType button:(MouseButton) button
>-    {
>-        Event event;
>-        event.Type = eventType;
>-        event.MouseButton.Button = button;
>-        event.MouseButton.X = [nsEvent locationInWindow].x;
>-        event.MouseButton.Y = [self translateMouseY: [nsEvent locationInWindow].y];
>-        mWindow->pushEvent(event);
>-    }
>+- (void)addButtonEvent:(NSEvent *)nsEvent
>+                  type:(Event::EventType)eventType
>+                button:(MouseButton)button
>+{
>+    Event event;
>+    event.Type               = eventType;
>+    event.MouseButton.Button = button;
>+    event.MouseButton.X      = [nsEvent locationInWindow].x;
>+    event.MouseButton.Y      = [self translateMouseY:[nsEvent locationInWindow].y];
>+    mWindow->pushEvent(event);
>+}
> 
>-    - (void) mouseDown: (NSEvent*) event
>-    {
>-        [self addButtonEvent: event
>-                        type: Event::EVENT_MOUSE_BUTTON_PRESSED
>-                      button: MOUSEBUTTON_LEFT];
>-    }
>+- (void)mouseDown:(NSEvent *)event
>+{
>+    [self addButtonEvent:event type:Event::EVENT_MOUSE_BUTTON_PRESSED button:MOUSEBUTTON_LEFT];
>+}
> 
>-    - (void) mouseDragged: (NSEvent*) event
>-    {
>-        [self mouseMoved: event];
>-    }
>+- (void)mouseDragged:(NSEvent *)event
>+{
>+    [self mouseMoved:event];
>+}
> 
>-    - (void) mouseUp: (NSEvent*) event
>-    {
>-        [self addButtonEvent: event
>-                        type: Event::EVENT_MOUSE_BUTTON_RELEASED
>-                      button: MOUSEBUTTON_LEFT];
>-    }
>+- (void)mouseUp:(NSEvent *)event
>+{
>+    [self addButtonEvent:event type:Event::EVENT_MOUSE_BUTTON_RELEASED button:MOUSEBUTTON_LEFT];
>+}
> 
>-    - (void) mouseMoved: (NSEvent*) nsEvent
>-    {
>-        Event event;
>-        event.Type = Event::EVENT_MOUSE_MOVED;
>-        event.MouseMove.X = [nsEvent locationInWindow].x;
>-        event.MouseMove.Y = [self translateMouseY: [nsEvent locationInWindow].y];
>-        mWindow->pushEvent(event);
>-    }
>+- (void)mouseMoved:(NSEvent *)nsEvent
>+{
>+    Event event;
>+    event.Type        = Event::EVENT_MOUSE_MOVED;
>+    event.MouseMove.X = [nsEvent locationInWindow].x;
>+    event.MouseMove.Y = [self translateMouseY:[nsEvent locationInWindow].y];
>+    mWindow->pushEvent(event);
>+}
> 
>-    - (void) mouseEntered: (NSEvent*) nsEvent
>-    {
>-        Event event;
>-        event.Type = Event::EVENT_MOUSE_ENTERED;
>-        mWindow->pushEvent(event);
>-    }
>+- (void)mouseEntered:(NSEvent *)nsEvent
>+{
>+    Event event;
>+    event.Type = Event::EVENT_MOUSE_ENTERED;
>+    mWindow->pushEvent(event);
>+}
> 
>-    - (void) mouseExited: (NSEvent*) nsEvent
>-    {
>-        Event event;
>-        event.Type = Event::EVENT_MOUSE_LEFT;
>-        mWindow->pushEvent(event);
>-    }
>+- (void)mouseExited:(NSEvent *)nsEvent
>+{
>+    Event event;
>+    event.Type = Event::EVENT_MOUSE_LEFT;
>+    mWindow->pushEvent(event);
>+}
> 
>-    - (void)rightMouseDown:(NSEvent *)event
>-    {
>-        [self addButtonEvent: event
>-                        type: Event::EVENT_MOUSE_BUTTON_PRESSED
>-                      button: MOUSEBUTTON_RIGHT];
>-    }
>+- (void)rightMouseDown:(NSEvent *)event
>+{
>+    [self addButtonEvent:event type:Event::EVENT_MOUSE_BUTTON_PRESSED button:MOUSEBUTTON_RIGHT];
>+}
> 
>-    - (void) rightMouseDragged: (NSEvent*) event
>-    {
>-        [self mouseMoved: event];
>-    }
>+- (void)rightMouseDragged:(NSEvent *)event
>+{
>+    [self mouseMoved:event];
>+}
> 
>-    - (void) rightMouseUp: (NSEvent*)event
>-    {
>-        [self addButtonEvent: event
>-                        type: Event::EVENT_MOUSE_BUTTON_RELEASED
>-                      button: MOUSEBUTTON_RIGHT];
>-    }
>+- (void)rightMouseUp:(NSEvent *)event
>+{
>+    [self addButtonEvent:event type:Event::EVENT_MOUSE_BUTTON_RELEASED button:MOUSEBUTTON_RIGHT];
>+}
> 
>-    - (void) otherMouseDown: (NSEvent*) event
>-    {
>-        [self addButtonEvent: event
>-                        type: Event::EVENT_MOUSE_BUTTON_PRESSED
>-                      button: TranslateMouseButton([event buttonNumber])];
>-    }
>+- (void)otherMouseDown:(NSEvent *)event
>+{
>+    [self addButtonEvent:event
>+                    type:Event::EVENT_MOUSE_BUTTON_PRESSED
>+                  button:TranslateMouseButton([event buttonNumber])];
>+}
> 
>-    - (void) otherMouseDragged: (NSEvent*) event
>-    {
>-        [self mouseMoved: event];
>-    }
>+- (void)otherMouseDragged:(NSEvent *)event
>+{
>+    [self mouseMoved:event];
>+}
>+
>+- (void)otherMouseUp:(NSEvent *)event
>+{
>+    [self addButtonEvent:event
>+                    type:Event::EVENT_MOUSE_BUTTON_RELEASED
>+                  button:TranslateMouseButton([event buttonNumber])];
>+}
> 
>-    - (void) otherMouseUp: (NSEvent*) event
>+- (void)scrollWheel:(NSEvent *)nsEvent
>+{
>+    if (static_cast<int>([nsEvent deltaY]) == 0)
>     {
>-        [self addButtonEvent: event
>-                        type: Event::EVENT_MOUSE_BUTTON_RELEASED
>-                      button: TranslateMouseButton([event buttonNumber])];
>+        return;
>     }
> 
>-    - (void) scrollWheel: (NSEvent*) nsEvent
>-    {
>-        if (static_cast<int>([nsEvent deltaY]) == 0)
>-        {
>-            return;
>-        }
>+    Event event;
>+    event.Type             = Event::EVENT_MOUSE_WHEEL_MOVED;
>+    event.MouseWheel.Delta = [nsEvent deltaY];
>+    mWindow->pushEvent(event);
>+}
> 
>-        Event event;
>-        event.Type = Event::EVENT_MOUSE_WHEEL_MOVED;
>-        event.MouseWheel.Delta = [nsEvent deltaY];
>-        mWindow->pushEvent(event);
>-    }
>+// Handle key events from the NSResponder protocol
>+- (void)keyDown:(NSEvent *)nsEvent
>+{
>+    // TODO(cwallez) also send text events
>+    Event event;
>+    event.Type     = Event::EVENT_KEY_PRESSED;
>+    event.Key.Code = NSCodeToKey([nsEvent keyCode]);
>+    AddNSKeyStateToEvent(&event, [nsEvent modifierFlags]);
>+    mWindow->pushEvent(event);
>+}
> 
>-    // Handle key events from the NSResponder protocol
>-    - (void) keyDown: (NSEvent*) nsEvent
>-    {
>-        // TODO(cwallez) also send text events
>-        Event event;
>-        event.Type = Event::EVENT_KEY_PRESSED;
>-        event.Key.Code = NSCodeToKey([nsEvent keyCode]);
>-        AddNSKeyStateToEvent(&event, [nsEvent modifierFlags]);
>-        mWindow->pushEvent(event);
>-    }
>+- (void)keyUp:(NSEvent *)nsEvent
>+{
>+    Event event;
>+    event.Type     = Event::EVENT_KEY_RELEASED;
>+    event.Key.Code = NSCodeToKey([nsEvent keyCode]);
>+    AddNSKeyStateToEvent(&event, [nsEvent modifierFlags]);
>+    mWindow->pushEvent(event);
>+}
>+
>+// Modifier keys do not trigger keyUp/Down events but only flagsChanged events.
>+- (void)flagsChanged:(NSEvent *)nsEvent
>+{
>+    Event event;
> 
>-    - (void) keyUp: (NSEvent*) nsEvent
>+    // Guess if the key has been pressed or released with the change of modifiers
>+    // It currently doesn't work when modifiers are unchanged, such as when pressing
>+    // both shift keys. GLFW has a solution for this but it requires tracking the
>+    // state of the keys. Implementing this is still TODO(cwallez)
>+    int modifier = [nsEvent modifierFlags] & NSDeviceIndependentModifierFlagsMask;
>+    if (modifier < mCurrentModifier)
>     {
>-        Event event;
>         event.Type = Event::EVENT_KEY_RELEASED;
>-        event.Key.Code = NSCodeToKey([nsEvent keyCode]);
>-        AddNSKeyStateToEvent(&event, [nsEvent modifierFlags]);
>-        mWindow->pushEvent(event);
>     }
>-
>-    // Modifier keys do not trigger keyUp/Down events but only flagsChanged events.
>-    - (void) flagsChanged: (NSEvent*) nsEvent
>+    else
>     {
>-        Event event;
>-
>-        // Guess if the key has been pressed or released with the change of modifiers
>-        // It currently doesn't work when modifiers are unchanged, such as when pressing
>-        // both shift keys. GLFW has a solution for this but it requires tracking the
>-        // state of the keys. Implementing this is still TODO(cwallez)
>-        int modifier = [nsEvent modifierFlags] & NSDeviceIndependentModifierFlagsMask;
>-        if (modifier < mCurrentModifier)
>-        {
>-            event.Type = Event::EVENT_KEY_RELEASED;
>-        }
>-        else
>-        {
>-            event.Type = Event::EVENT_KEY_PRESSED;
>-        }
>-        mCurrentModifier = modifier;
>-
>-        event.Key.Code = NSCodeToKey([nsEvent keyCode]);
>-        AddNSKeyStateToEvent(&event, [nsEvent modifierFlags]);
>-        mWindow->pushEvent(event);
>+        event.Type = Event::EVENT_KEY_PRESSED;
>     }
>-@end
>+    mCurrentModifier = modifier;
> 
>-OSXWindow::OSXWindow()
>-    : mWindow(nil),
>-      mDelegate(nil),
>-      mView(nil)
>-{
>+    event.Key.Code = NSCodeToKey([nsEvent keyCode]);
>+    AddNSKeyStateToEvent(&event, [nsEvent modifierFlags]);
>+    mWindow->pushEvent(event);
> }
>+@end
>+
>+OSXWindow::OSXWindow() : mWindow(nil), mDelegate(nil), mView(nil) {}
> 
> OSXWindow::~OSXWindow()
> {
>@@ -540,40 +626,40 @@ bool OSXWindow::initialize(const std::string &name, size_t width, size_t height)
> 
>     unsigned int styleMask = NSTitledWindowMask | NSClosableWindowMask | NSResizableWindowMask |
>                              NSMiniaturizableWindowMask;
>-    mWindow = [[NSWindow alloc] initWithContentRect: NSMakeRect(0, 0, width, height)
>-                                          styleMask: styleMask
>-                                            backing: NSBackingStoreBuffered
>-                                              defer: NO];
>+    mWindow = [[NSWindow alloc] initWithContentRect:NSMakeRect(0, 0, width, height)
>+                                          styleMask:styleMask
>+                                            backing:NSBackingStoreBuffered
>+                                              defer:NO];
> 
>     if (mWindow == nil)
>     {
>         return false;
>     }
> 
>-    mDelegate = [[WindowDelegate alloc] initWithWindow: this];
>+    mDelegate = [[WindowDelegate alloc] initWithWindow:this];
>     if (mDelegate == nil)
>     {
>         return false;
>     }
>-    [mWindow setDelegate: static_cast<id>(mDelegate)];
>+    [mWindow setDelegate:static_cast<id>(mDelegate)];
> 
>-    mView = [[ContentView alloc] initWithWindow: this];
>+    mView = [[ContentView alloc] initWithWindow:this];
>     if (mView == nil)
>     {
>         return false;
>     }
>     [mView setWantsLayer:YES];
> 
>-    [mWindow setContentView: mView];
>-    [mWindow setTitle: [NSString stringWithUTF8String: name.c_str()]];
>-    [mWindow setAcceptsMouseMovedEvents: YES];
>+    [mWindow setContentView:mView];
>+    [mWindow setTitle:[NSString stringWithUTF8String:name.c_str()]];
>+    [mWindow setAcceptsMouseMovedEvents:YES];
>     [mWindow center];
> 
>-    [NSApp activateIgnoringOtherApps: YES];
>+    [NSApp activateIgnoringOtherApps:YES];
> 
>-    mX = 0;
>-    mY = 0;
>-    mWidth = width;
>+    mX      = 0;
>+    mY      = 0;
>+    mWidth  = width;
>     mHeight = height;
> 
>     gAllWindows.insert(this);
>@@ -593,6 +679,8 @@ void OSXWindow::destroy()
>     mWindow = nil;
> }
> 
>+void OSXWindow::resetNativeWindow() {}
>+
> EGLNativeWindowType OSXWindow::getNativeWindow() const
> {
>     return [mView layer];
>@@ -610,10 +698,10 @@ void OSXWindow::messageLoop()
>     {
>         while (true)
>         {
>-            NSEvent* event = [NSApp nextEventMatchingMask: NSAnyEventMask
>-                                                untilDate: [NSDate distantPast]
>-                                                   inMode: NSDefaultRunLoopMode
>-                                                  dequeue: YES];
>+            NSEvent *event = [NSApp nextEventMatchingMask:NSAnyEventMask
>+                                                untilDate:[NSDate distantPast]
>+                                                   inMode:NSDefaultRunLoopMode
>+                                                  dequeue:YES];
>             if (event == nil)
>             {
>                 break;
>@@ -623,21 +711,21 @@ void OSXWindow::messageLoop()
>             {
>                 continue;
>             }
>-            [NSApp sendEvent: event];
>+            [NSApp sendEvent:event];
>         }
>     }
> }
> 
> void OSXWindow::setMousePosition(int x, int y)
> {
>-    y = [mWindow frame].size.height - y -1;
>+    y = [mWindow frame].size.height - y - 1;
>     NSPoint screenspace;
> 
>-    #if MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_7
>-        screenspace = [mWindow convertBaseToScreen: NSMakePoint(x, y)];
>-    #else
>-        screenspace = [mWindow convertRectToScreen: NSMakeRect(x, y, 0, 0)].origin;
>-    #endif
>+#if MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_7
>+    screenspace = [mWindow convertBaseToScreen:NSMakePoint(x, y)];
>+#else
>+    screenspace = [mWindow convertRectToScreen:NSMakeRect(x, y, 0, 0)].origin;
>+#endif
>     CGWarpMouseCursorPosition(CGPointMake(screenspace.x, YCoordToFromCG(screenspace.y)));
> }
> 
>@@ -645,15 +733,15 @@ bool OSXWindow::setPosition(int x, int y)
> {
>     // Given CG and NS's coordinate system, the "Y" position of a window is the Y coordinate
>     // of the bottom of the window.
>-    int newBottom = [mWindow frame].size.height + y;
>+    int newBottom    = [mWindow frame].size.height + y;
>     NSRect emptyRect = NSMakeRect(x, YCoordToFromCG(newBottom), 0, 0);
>-    [mWindow setFrameOrigin: [mWindow frameRectForContentRect: emptyRect].origin];
>+    [mWindow setFrameOrigin:[mWindow frameRectForContentRect:emptyRect].origin];
>     return true;
> }
> 
> bool OSXWindow::resize(int width, int height)
> {
>-    [mWindow setContentSize: NSMakeSize(width, height)];
>+    [mWindow setContentSize:NSMakeSize(width, height)];
>     return true;
> }
> 
>@@ -661,11 +749,11 @@ void OSXWindow::setVisible(bool isVisible)
> {
>     if (isVisible)
>     {
>-        [mWindow makeKeyAndOrderFront: nil];
>+        [mWindow makeKeyAndOrderFront:nil];
>     }
>     else
>     {
>-        [mWindow orderOut: nil];
>+        [mWindow orderOut:nil];
>     }
> }
> 
>@@ -673,25 +761,26 @@ void OSXWindow::signalTestEvent()
> {
>     @autoreleasepool
>     {
>-        NSEvent *event = [NSEvent otherEventWithType: NSApplicationDefined
>-                                            location: NSMakePoint(0, 0)
>-                                       modifierFlags: 0
>-                                           timestamp: 0.0
>-                                        windowNumber: [mWindow windowNumber]
>-                                             context: nil
>-                                             subtype: 0
>-                                               data1: 0
>-                                               data2: 0];
>-        [NSApp postEvent: event atStart: YES];
>+        NSEvent *event = [NSEvent otherEventWithType:NSApplicationDefined
>+                                            location:NSMakePoint(0, 0)
>+                                       modifierFlags:0
>+                                           timestamp:0.0
>+                                        windowNumber:[mWindow windowNumber]
>+                                             context:nil
>+                                             subtype:0
>+                                               data1:0
>+                                               data2:0];
>+        [NSApp postEvent:event atStart:YES];
>     }
> }
> 
>-NSWindow* OSXWindow::getNSWindow() const
>+NSWindow *OSXWindow::getNSWindow() const
> {
>     return mWindow;
> }
> 
>-OSWindow *CreateOSWindow()
>+// static
>+OSWindow *OSWindow::New()
> {
>     return new OSXWindow;
> }
>diff --git a/Source/ThirdParty/ANGLE/util/ozone/OzonePixmap.cpp b/Source/ThirdParty/ANGLE/util/ozone/OzonePixmap.cpp
>index cc310a7a053..09ec75e6a53 100644
>--- a/Source/ThirdParty/ANGLE/util/ozone/OzonePixmap.cpp
>+++ b/Source/ThirdParty/ANGLE/util/ozone/OzonePixmap.cpp
>@@ -4,7 +4,7 @@
> // found in the LICENSE file.
> //
> 
>-#include "OSPixmap.h"
>+#include "util/OSPixmap.h"
> 
> OSPixmap *CreateOSPixmap()
> {
>diff --git a/Source/ThirdParty/ANGLE/util/ozone/OzoneWindow.cpp b/Source/ThirdParty/ANGLE/util/ozone/OzoneWindow.cpp
>index 9feece2161f..3f9bac49491 100644
>--- a/Source/ThirdParty/ANGLE/util/ozone/OzoneWindow.cpp
>+++ b/Source/ThirdParty/ANGLE/util/ozone/OzoneWindow.cpp
>@@ -6,17 +6,13 @@
> 
> // OzoneWindow.cpp: Implementation of OSWindow for Ozone
> 
>-#include "ozone/OzoneWindow.h"
>+#include "util/ozone/OzoneWindow.h"
> 
> int OzoneWindow::sLastDepth = 0;
> 
>-OzoneWindow::OzoneWindow()
>-{
>-}
>+OzoneWindow::OzoneWindow() {}
> 
>-OzoneWindow::~OzoneWindow()
>-{
>-}
>+OzoneWindow::~OzoneWindow() {}
> 
> bool OzoneWindow::initialize(const std::string &name, size_t width, size_t height)
> {
>@@ -24,16 +20,16 @@ bool OzoneWindow::initialize(const std::string &name, size_t width, size_t heigh
>     mNative.y = mY = 0;
>     mNative.width = mWidth = width;
>     mNative.height = mHeight = height;
>-    mNative.borderWidth  = 5;
>-    mNative.borderHeight = 5;
>-    mNative.visible      = 0;
>-    mNative.depth        = sLastDepth++;
>+    mNative.borderWidth      = 5;
>+    mNative.borderHeight     = 5;
>+    mNative.visible          = 0;
>+    mNative.depth            = sLastDepth++;
>     return true;
> }
> 
>-void OzoneWindow::destroy()
>-{
>-}
>+void OzoneWindow::destroy() {}
>+
>+void OzoneWindow::resetNativeWindow() {}
> 
> EGLNativeWindowType OzoneWindow::getNativeWindow() const
> {
>@@ -45,13 +41,9 @@ EGLNativeDisplayType OzoneWindow::getNativeDisplay() const
>     return EGL_DEFAULT_DISPLAY;
> }
> 
>-void OzoneWindow::messageLoop()
>-{
>-}
>+void OzoneWindow::messageLoop() {}
> 
>-void OzoneWindow::setMousePosition(int x, int y)
>-{
>-}
>+void OzoneWindow::setMousePosition(int x, int y) {}
> 
> bool OzoneWindow::setPosition(int x, int y)
> {
>@@ -72,11 +64,10 @@ void OzoneWindow::setVisible(bool isVisible)
>     mNative.visible = isVisible;
> }
> 
>-void OzoneWindow::signalTestEvent()
>-{
>-}
>+void OzoneWindow::signalTestEvent() {}
> 
>-OSWindow *CreateOSWindow()
>+// static
>+OSWindow *OSWindow::New()
> {
>     return new OzoneWindow();
> }
>diff --git a/Source/ThirdParty/ANGLE/util/ozone/OzoneWindow.h b/Source/ThirdParty/ANGLE/util/ozone/OzoneWindow.h
>index 1a2fed50ceb..d5bda029983 100644
>--- a/Source/ThirdParty/ANGLE/util/ozone/OzoneWindow.h
>+++ b/Source/ThirdParty/ANGLE/util/ozone/OzoneWindow.h
>@@ -11,7 +11,7 @@
> 
> #include <string>
> 
>-#include "OSWindow.h"
>+#include "util/OSWindow.h"
> 
> class OzoneWindow : public OSWindow
> {
>@@ -22,6 +22,7 @@ class OzoneWindow : public OSWindow
>     bool initialize(const std::string &name, size_t width, size_t height) override;
>     void destroy() override;
> 
>+    void resetNativeWindow() override;
>     EGLNativeWindowType getNativeWindow() const override;
>     EGLNativeDisplayType getNativeDisplay() const override;
> 
>diff --git a/Source/ThirdParty/ANGLE/util/posix/PosixTimer.cpp b/Source/ThirdParty/ANGLE/util/posix/PosixTimer.cpp
>new file mode 100644
>index 00000000000..85b91cecf6c
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/util/posix/PosixTimer.cpp
>@@ -0,0 +1,59 @@
>+//
>+// Copyright (c) 2015 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+
>+// PosixTimer.cpp: Implementation of a high precision timer class on POSIX
>+
>+#include "util/posix/PosixTimer.h"
>+#include <iostream>
>+
>+PosixTimer::PosixTimer() : mRunning(false) {}
>+
>+namespace
>+{
>+uint64_t getCurrentTimeNs()
>+{
>+    struct timespec currentTime;
>+    clock_gettime(CLOCK_MONOTONIC, &currentTime);
>+    return currentTime.tv_sec * 1'000'000'000llu + currentTime.tv_nsec;
>+}
>+}  // anonymous namespace
>+
>+void PosixTimer::start()
>+{
>+    mStartTimeNs = getCurrentTimeNs();
>+    mRunning     = true;
>+}
>+
>+void PosixTimer::stop()
>+{
>+    mStopTimeNs = getCurrentTimeNs();
>+    mRunning    = false;
>+}
>+
>+double PosixTimer::getElapsedTime() const
>+{
>+    uint64_t endTimeNs;
>+    if (mRunning)
>+    {
>+        endTimeNs = getCurrentTimeNs();
>+    }
>+    else
>+    {
>+        endTimeNs = mStopTimeNs;
>+    }
>+
>+    return (endTimeNs - mStartTimeNs) * 1e-9;
>+}
>+
>+double PosixTimer::getAbsoluteTime()
>+{
>+    return getCurrentTimeNs() * 1e-9;
>+}
>+
>+Timer *CreateTimer()
>+{
>+    return new PosixTimer();
>+}
>diff --git a/Source/ThirdParty/ANGLE/util/posix/PosixTimer.h b/Source/ThirdParty/ANGLE/util/posix/PosixTimer.h
>new file mode 100644
>index 00000000000..5ffd83ca3a5
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/util/posix/PosixTimer.h
>@@ -0,0 +1,34 @@
>+//
>+// Copyright (c) 2015 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+
>+// PosixTimer.h: Definition of a high precision timer class on Linux
>+
>+#ifndef UTIL_POSIX_TIMER_H
>+#define UTIL_POSIX_TIMER_H
>+
>+#include <stdint.h>
>+#include <time.h>
>+
>+#include "util/Timer.h"
>+
>+class ANGLE_UTIL_EXPORT PosixTimer : public Timer
>+{
>+  public:
>+    PosixTimer();
>+
>+    void start() override;
>+    void stop() override;
>+    double getElapsedTime() const override;
>+
>+    double getAbsoluteTime() override;
>+
>+  private:
>+    bool mRunning;
>+    uint64_t mStartTimeNs;
>+    uint64_t mStopTimeNs;
>+};
>+
>+#endif  // UTIL_POSIX_TIMER_H
>diff --git a/Source/ThirdParty/ANGLE/util/posix/Posix_system_utils.cpp b/Source/ThirdParty/ANGLE/util/posix/Posix_system_utils.cpp
>index 010735b3bf6..92100880f98 100644
>--- a/Source/ThirdParty/ANGLE/util/posix/Posix_system_utils.cpp
>+++ b/Source/ThirdParty/ANGLE/util/posix/Posix_system_utils.cpp
>@@ -6,14 +6,19 @@
> 
> // Posix_system_utils.cpp: Implementation of OS-specific functions for Posix systems
> 
>-#include "system_utils.h"
>+#include "util/system_utils.h"
> 
>-#include <sys/resource.h>
>-#include <dlfcn.h>
> #include <sched.h>
> #include <time.h>
> #include <unistd.h>
> 
>+#if !defined(ANGLE_PLATFORM_FUCHSIA)
>+#    include <dlfcn.h>
>+#    include <sys/resource.h>
>+#endif
>+
>+#include "common/platform.h"
>+
> namespace angle
> {
> 
>@@ -27,9 +32,8 @@ void Sleep(unsigned int milliseconds)
>     }
>     else
>     {
>-        timespec sleepTime =
>-        {
>-            .tv_sec = milliseconds / 1000,
>+        timespec sleepTime = {
>+            .tv_sec  = milliseconds / 1000,
>             .tv_nsec = (milliseconds % 1000) * 1000000,
>         };
> 
>@@ -39,53 +43,51 @@ void Sleep(unsigned int milliseconds)
> 
> void SetLowPriorityProcess()
> {
>+#if !defined(ANGLE_PLATFORM_FUCHSIA)
>     setpriority(PRIO_PROCESS, getpid(), 10);
>+#endif
> }
> 
> void WriteDebugMessage(const char *format, ...)
> {
>-    // TODO(jmadill): Implement this
>-}
>-
>-class PosixLibrary : public Library
>-{
>-  public:
>-    PosixLibrary(const std::string &libraryName);
>-    ~PosixLibrary() override;
>-
>-    void *getSymbol(const std::string &symbolName) override;
>-
>-  private:
>-    void *mModule;
>-};
>-
>-PosixLibrary::PosixLibrary(const std::string &libraryName) : mModule(nullptr)
>-{
>-    const auto &fullName = libraryName + "." + GetSharedLibraryExtension();
>-    mModule              = dlopen(fullName.c_str(), RTLD_NOW);
>+    va_list vararg;
>+    va_start(vararg, format);
>+    vfprintf(stderr, format, vararg);
>+    va_end(vararg);
> }
> 
>-PosixLibrary::~PosixLibrary()
>+bool StabilizeCPUForBenchmarking()
> {
>-    if (mModule)
>+#if !defined(ANGLE_PLATFORM_FUCHSIA)
>+    bool success = true;
>+    errno        = 0;
>+    setpriority(PRIO_PROCESS, getpid(), -20);
>+    if (errno)
>     {
>-        dlclose(mModule);
>+        // A friendly warning in case the test was run without appropriate permission.
>+        perror(
>+            "Warning: setpriority failed in StabilizeCPUForBenchmarking. Process will retain "
>+            "default priority");
>+        success = false;
>     }
>-}
>-
>-void *PosixLibrary::getSymbol(const std::string &symbolName)
>-{
>-    if (!mModule)
>+#if ANGLE_PLATFORM_LINUX
>+    cpu_set_t affinity;
>+    CPU_SET(0, &affinity);
>+    errno = 0;
>+    if (sched_setaffinity(getpid(), sizeof(affinity), &affinity))
>     {
>-        return nullptr;
>+        perror(
>+            "Warning: sched_setaffinity failed in StabilizeCPUForBenchmarking. Process will retain "
>+            "default affinity");
>+        success = false;
>     }
>-
>-    return dlsym(mModule, symbolName.c_str());
>+#else
>+    // TODO(jmadill): Implement for non-linux. http://anglebug.com/2923
>+#endif
>+
>+    return success;
>+#else  // defined(ANGLE_PLATFORM_FUCHSIA)
>+    return false;
>+#endif
> }
>-
>-Library *loadLibrary(const std::string &libraryName)
>-{
>-    return new PosixLibrary(libraryName);
>-}
>-
>-} // namespace angle
>+}  // namespace angle
>diff --git a/Source/ThirdParty/ANGLE/util/random_utils.cpp b/Source/ThirdParty/ANGLE/util/random_utils.cpp
>index 2968a3f9113..d64fa5b150b 100644
>--- a/Source/ThirdParty/ANGLE/util/random_utils.cpp
>+++ b/Source/ThirdParty/ANGLE/util/random_utils.cpp
>@@ -37,6 +37,12 @@ void RNG::reseed(unsigned int newSeed)
>     mGenerator.seed(newSeed);
> }
> 
>+bool RNG::randomBool(float probTrue)
>+{
>+    std::bernoulli_distribution dist(probTrue);
>+    return dist(mGenerator);
>+}
>+
> int RNG::randomInt()
> {
>     std::uniform_int_distribution<int> intDistribution;
>@@ -67,6 +73,13 @@ float RNG::randomFloatBetween(float min, float max)
>     return floatDistribution(mGenerator);
> }
> 
>+float RNG::randomFloatNonnegative()
>+{
>+    std::uniform_real_distribution<float> floatDistribution(0.0f,
>+                                                            std::numeric_limits<float>::max());
>+    return floatDistribution(mGenerator);
>+}
>+
> float RNG::randomNegativeOneToOne()
> {
>     return randomFloatBetween(-1.0f, 1.0f);
>diff --git a/Source/ThirdParty/ANGLE/util/random_utils.h b/Source/ThirdParty/ANGLE/util/random_utils.h
>index 1128e033268..a19ad8bc50c 100644
>--- a/Source/ThirdParty/ANGLE/util/random_utils.h
>+++ b/Source/ThirdParty/ANGLE/util/random_utils.h
>@@ -12,13 +12,14 @@
> 
> // TODO(jmadill): Rework this if Chromium decides to ban <random>
> #include <random>
>+#include <vector>
> 
>-#include <export.h>
>+#include "util/util_export.h"
> 
> namespace angle
> {
> 
>-class ANGLE_EXPORT RNG
>+class ANGLE_UTIL_EXPORT RNG
> {
>   public:
>     // Seed from clock
>@@ -29,27 +30,46 @@ class ANGLE_EXPORT RNG
> 
>     void reseed(unsigned int newSeed);
> 
>+    bool randomBool(float probTrue = 0.5f);
>     int randomInt();
>     int randomIntBetween(int min, int max);
>     unsigned int randomUInt();
>     float randomFloat();
>     float randomFloatBetween(float min, float max);
>+    float randomFloatNonnegative();
>     float randomNegativeOneToOne();
> 
>+    template <class T>
>+    T &randomSelect(std::vector<T> &elements)
>+    {
>+        return elements[randomIntBetween(0, static_cast<int>(elements.size()) - 1)];
>+    }
>+
>+    template <class T>
>+    const T &randomSelect(const std::vector<T> &elements)
>+    {
>+        return elements.at(randomIntBetween(0, static_cast<int>(elements.size()) - 1));
>+    }
>+
>   private:
>     std::default_random_engine mGenerator;
> };
> 
>-// Implemented htis way because of cross-module allocation issues.
>-inline void FillVectorWithRandomUBytes(std::vector<uint8_t> *data)
>+// Implemented inline to avoid cross-module allocation issues.
>+inline void FillVectorWithRandomUBytes(RNG *rng, std::vector<uint8_t> *data)
> {
>-    RNG rng;
>     for (size_t i = 0; i < data->size(); ++i)
>     {
>-        (*data)[i] = static_cast<uint8_t>(rng.randomIntBetween(0, 255));
>+        (*data)[i] = static_cast<uint8_t>(rng->randomIntBetween(0, 255));
>     }
> }
> 
>+inline void FillVectorWithRandomUBytes(std::vector<uint8_t> *data)
>+{
>+    RNG rng;
>+    FillVectorWithRandomUBytes(&rng, data);
>+}
>+
> }  // namespace angle
> 
>-#endif // UTIL_RANDOM_UTILS_H
>+#endif  // UTIL_RANDOM_UTILS_H
>diff --git a/Source/ThirdParty/ANGLE/util/shader_utils.cpp b/Source/ThirdParty/ANGLE/util/shader_utils.cpp
>index 3b6dffaf989..97fa9f30ecf 100644
>--- a/Source/ThirdParty/ANGLE/util/shader_utils.cpp
>+++ b/Source/ThirdParty/ANGLE/util/shader_utils.cpp
>@@ -6,11 +6,14 @@
> 
> #include "shader_utils.h"
> 
>-#include <vector>
>-#include <iostream>
>+#include <cstring>
> #include <fstream>
>+#include <iostream>
>+#include <vector>
> 
>-static std::string ReadFileToString(const std::string &source)
>+namespace
>+{
>+std::string ReadFileToString(const std::string &source)
> {
>     std::ifstream stream(source.c_str());
>     if (!stream)
>@@ -30,11 +33,62 @@ static std::string ReadFileToString(const std::string &source)
>     return result;
> }
> 
>-GLuint CompileShader(GLenum type, const std::string &source)
>+GLuint CompileProgramInternal(const char *vsSource,
>+                              const char *gsSource,
>+                              const char *fsSource,
>+                              const std::function<void(GLuint)> &preLinkCallback)
>+{
>+    GLuint vs = CompileShader(GL_VERTEX_SHADER, vsSource);
>+    GLuint fs = CompileShader(GL_FRAGMENT_SHADER, fsSource);
>+
>+    if (vs == 0 || fs == 0)
>+    {
>+        glDeleteShader(fs);
>+        glDeleteShader(vs);
>+        return 0;
>+    }
>+
>+    GLuint program = glCreateProgram();
>+
>+    glAttachShader(program, vs);
>+    glDeleteShader(vs);
>+
>+    glAttachShader(program, fs);
>+    glDeleteShader(fs);
>+
>+    GLuint gs = 0;
>+
>+    if (strlen(gsSource) > 0)
>+    {
>+        gs = CompileShader(GL_GEOMETRY_SHADER_EXT, gsSource);
>+        if (gs == 0)
>+        {
>+            glDeleteShader(vs);
>+            glDeleteShader(fs);
>+            glDeleteProgram(program);
>+            return 0;
>+        }
>+
>+        glAttachShader(program, gs);
>+        glDeleteShader(gs);
>+    }
>+
>+    if (preLinkCallback)
>+    {
>+        preLinkCallback(program);
>+    }
>+
>+    glLinkProgram(program);
>+
>+    return CheckLinkStatusAndReturnProgram(program, true);
>+}
>+}  // namespace
>+
>+GLuint CompileShader(GLenum type, const char *source)
> {
>     GLuint shader = glCreateShader(type);
> 
>-    const char *sourceArray[1] = { source.c_str() };
>+    const char *sourceArray[1] = {source};
>     glShaderSource(shader, 1, sourceArray, nullptr);
>     glCompileShader(shader);
> 
>@@ -76,7 +130,7 @@ GLuint CompileShaderFromFile(GLenum type, const std::string &sourcePath)
>         return 0;
>     }
> 
>-    return CompileShader(type, source);
>+    return CompileShader(type, source.c_str());
> }
> 
> GLuint CheckLinkStatusAndReturnProgram(GLuint program, bool outputErrorMessages)
>@@ -117,52 +171,45 @@ GLuint CheckLinkStatusAndReturnProgram(GLuint program, bool outputErrorMessages)
> }
> 
> GLuint CompileProgramWithTransformFeedback(
>-    const std::string &vsSource,
>-    const std::string &fsSource,
>+    const char *vsSource,
>+    const char *fsSource,
>     const std::vector<std::string> &transformFeedbackVaryings,
>     GLenum bufferMode)
> {
>-    GLuint program = glCreateProgram();
>-
>-    GLuint vs = CompileShader(GL_VERTEX_SHADER, vsSource);
>-    GLuint fs = CompileShader(GL_FRAGMENT_SHADER, fsSource);
>-
>-    if (vs == 0 || fs == 0)
>-    {
>-        glDeleteShader(fs);
>-        glDeleteShader(vs);
>-        glDeleteProgram(program);
>-        return 0;
>-    }
>-
>-    glAttachShader(program, vs);
>-    glDeleteShader(vs);
>-
>-    glAttachShader(program, fs);
>-    glDeleteShader(fs);
>+    auto preLink = [&](GLuint program) {
>+        if (transformFeedbackVaryings.size() > 0)
>+        {
>+            std::vector<const char *> constCharTFVaryings;
> 
>-    if (transformFeedbackVaryings.size() > 0)
>-    {
>-        std::vector<const char *> constCharTFVaryings;
>+            for (const std::string &transformFeedbackVarying : transformFeedbackVaryings)
>+            {
>+                constCharTFVaryings.push_back(transformFeedbackVarying.c_str());
>+            }
> 
>-        for (const std::string &transformFeedbackVarying : transformFeedbackVaryings)
>-        {
>-            constCharTFVaryings.push_back(transformFeedbackVarying.c_str());
>+            glTransformFeedbackVaryings(program,
>+                                        static_cast<GLsizei>(transformFeedbackVaryings.size()),
>+                                        &constCharTFVaryings[0], bufferMode);
>         }
>+    };
> 
>-        glTransformFeedbackVaryings(program, static_cast<GLsizei>(transformFeedbackVaryings.size()),
>-                                    &constCharTFVaryings[0], bufferMode);
>-    }
>+    return CompileProgramInternal(vsSource, "", fsSource, preLink);
>+}
> 
>-    glLinkProgram(program);
>+GLuint CompileProgram(const char *vsSource, const char *fsSource)
>+{
>+    return CompileProgramInternal(vsSource, "", fsSource, nullptr);
>+}
> 
>-    return CheckLinkStatusAndReturnProgram(program, true);
>+GLuint CompileProgram(const char *vsSource,
>+                      const char *fsSource,
>+                      const std::function<void(GLuint)> &preLinkCallback)
>+{
>+    return CompileProgramInternal(vsSource, "", fsSource, preLinkCallback);
> }
> 
>-GLuint CompileProgram(const std::string &vsSource, const std::string &fsSource)
>+GLuint CompileProgramWithGS(const char *vsSource, const char *gsSource, const char *fsSource)
> {
>-    std::vector<std::string> emptyVector;
>-    return CompileProgramWithTransformFeedback(vsSource, fsSource, emptyVector, GL_NONE);
>+    return CompileProgramInternal(vsSource, gsSource, fsSource, nullptr);
> }
> 
> GLuint CompileProgramFromFiles(const std::string &vsPath, const std::string &fsPath)
>@@ -174,10 +221,10 @@ GLuint CompileProgramFromFiles(const std::string &vsPath, const std::string &fsP
>         return 0;
>     }
> 
>-    return CompileProgram(vsSource, fsSource);
>+    return CompileProgram(vsSource.c_str(), fsSource.c_str());
> }
> 
>-GLuint CompileComputeProgram(const std::string &csSource, bool outputErrorMessages)
>+GLuint CompileComputeProgram(const char *csSource, bool outputErrorMessages)
> {
>     GLuint program = glCreateProgram();
> 
>@@ -214,3 +261,261 @@ bool LinkAttachedProgram(GLuint program)
>     glLinkProgram(program);
>     return (CheckLinkStatusAndReturnProgram(program, true) != 0);
> }
>+
>+namespace angle
>+{
>+
>+namespace essl1_shaders
>+{
>+
>+const char *PositionAttrib()
>+{
>+    return "a_position";
>+}
>+const char *ColorUniform()
>+{
>+    return "u_color";
>+}
>+
>+namespace vs
>+{
>+
>+// A shader that sets gl_Position to zero.
>+const char *Zero()
>+{
>+    return R"(void main()
>+{
>+    gl_Position = vec4(0);
>+})";
>+}
>+
>+// A shader that sets gl_Position to attribute a_position.
>+const char *Simple()
>+{
>+    return R"(precision highp float;
>+attribute vec4 a_position;
>+
>+void main()
>+{
>+    gl_Position = a_position;
>+})";
>+}
>+
>+// A shader that simply passes through attribute a_position, setting it to gl_Position and varying
>+// v_position.
>+const char *Passthrough()
>+{
>+    return R"(precision highp float;
>+attribute vec4 a_position;
>+varying vec4 v_position;
>+
>+void main()
>+{
>+    gl_Position = a_position;
>+    v_position = a_position;
>+})";
>+}
>+
>+}  // namespace vs
>+
>+namespace fs
>+{
>+
>+// A shader that renders a simple checker pattern of red and green. X axis and y axis separate the
>+// different colors. Needs varying v_position.
>+const char *Checkered()
>+{
>+    return R"(precision highp float;
>+varying vec4 v_position;
>+
>+void main()
>+{
>+    if (v_position.x * v_position.y > 0.0)
>+    {
>+        gl_FragColor = vec4(1.0, 0.0, 0.0, 1.0);
>+    }
>+    else
>+    {
>+        gl_FragColor = vec4(0.0, 1.0, 0.0, 1.0);
>+    }
>+})";
>+}
>+
>+// A shader that fills with color taken from uniform named "color".
>+const char *UniformColor()
>+{
>+    return R"(uniform mediump vec4 u_color;
>+void main(void)
>+{
>+    gl_FragColor = u_color;
>+})";
>+}
>+
>+// A shader that fills with 100% opaque red.
>+const char *Red()
>+{
>+    return R"(precision mediump float;
>+
>+void main()
>+{
>+    gl_FragColor = vec4(1.0, 0.0, 0.0, 1.0);
>+})";
>+}
>+
>+// A shader that fills with 100% opaque green.
>+const char *Green()
>+{
>+    return R"(precision mediump float;
>+
>+void main()
>+{
>+    gl_FragColor = vec4(0.0, 1.0, 0.0, 1.0);
>+})";
>+}
>+
>+// A shader that fills with 100% opaque blue.
>+const char *Blue()
>+{
>+    return R"(precision mediump float;
>+
>+void main()
>+{
>+    gl_FragColor = vec4(0.0, 0.0, 1.0, 1.0);
>+})";
>+}
>+
>+}  // namespace fs
>+}  // namespace essl1_shaders
>+
>+namespace essl3_shaders
>+{
>+
>+const char *PositionAttrib()
>+{
>+    return "a_position";
>+}
>+
>+namespace vs
>+{
>+
>+// A shader that sets gl_Position to zero.
>+const char *Zero()
>+{
>+    return R"(#version 300 es
>+void main()
>+{
>+    gl_Position = vec4(0);
>+})";
>+}
>+
>+// A shader that sets gl_Position to attribute a_position.
>+const char *Simple()
>+{
>+    return R"(#version 300 es
>+in vec4 a_position;
>+void main()
>+{
>+    gl_Position = a_position;
>+})";
>+}
>+
>+// A shader that simply passes through attribute a_position, setting it to gl_Position and varying
>+// v_position.
>+const char *Passthrough()
>+{
>+    return R"(#version 300 es
>+in vec4 a_position;
>+out vec4 v_position;
>+void main()
>+{
>+    gl_Position = a_position;
>+    v_position = a_position;
>+})";
>+}
>+
>+}  // namespace vs
>+
>+namespace fs
>+{
>+
>+// A shader that fills with 100% opaque red.
>+const char *Red()
>+{
>+    return R"(#version 300 es
>+precision highp float;
>+out vec4 my_FragColor;
>+void main()
>+{
>+    my_FragColor = vec4(1.0, 0.0, 0.0, 1.0);
>+})";
>+}
>+
>+}  // namespace fs
>+}  // namespace essl3_shaders
>+
>+namespace essl31_shaders
>+{
>+
>+const char *PositionAttrib()
>+{
>+    return "a_position";
>+}
>+
>+namespace vs
>+{
>+
>+// A shader that sets gl_Position to zero.
>+const char *Zero()
>+{
>+    return R"(#version 310 es
>+void main()
>+{
>+    gl_Position = vec4(0);
>+})";
>+}
>+
>+// A shader that sets gl_Position to attribute a_position.
>+const char *Simple()
>+{
>+    return R"(#version 310 es
>+in vec4 a_position;
>+void main()
>+{
>+    gl_Position = a_position;
>+})";
>+}
>+
>+// A shader that simply passes through attribute a_position, setting it to gl_Position and varying
>+// v_position.
>+const char *Passthrough()
>+{
>+    return R"(#version 310 es
>+in vec4 a_position;
>+out vec4 v_position;
>+void main()
>+{
>+    gl_Position = a_position;
>+    v_position = a_position;
>+})";
>+}
>+
>+}  // namespace vs
>+
>+namespace fs
>+{
>+
>+// A shader that fills with 100% opaque red.
>+const char *Red()
>+{
>+    return R"(#version 310 es
>+precision highp float;
>+out vec4 my_FragColor;
>+void main()
>+{
>+    my_FragColor = vec4(1.0, 0.0, 0.0, 1.0);
>+})";
>+}
>+
>+}  // namespace fs
>+}  // namespace essl31_shaders
>+}  // namespace angle
>diff --git a/Source/ThirdParty/ANGLE/util/shader_utils.h b/Source/ThirdParty/ANGLE/util/shader_utils.h
>index 7c8dd2ee29f..73835e2ec15 100644
>--- a/Source/ThirdParty/ANGLE/util/shader_utils.h
>+++ b/Source/ThirdParty/ANGLE/util/shader_utils.h
>@@ -7,32 +7,146 @@
> #ifndef SAMPLE_UTIL_SHADER_UTILS_H
> #define SAMPLE_UTIL_SHADER_UTILS_H
> 
>-#include <export.h>
>-#include <GLES3/gl31.h>
>-#include <GLES3/gl3.h>
>-#include <GLES2/gl2.h>
>-#include <GLES2/gl2ext.h>
>-#include <EGL/egl.h>
>-#include <EGL/eglext.h>
>-
>+#include <functional>
> #include <string>
> #include <vector>
> 
>-ANGLE_EXPORT GLuint CompileShader(GLenum type, const std::string &source);
>-ANGLE_EXPORT GLuint CompileShaderFromFile(GLenum type, const std::string &sourcePath);
>+#include "util/util_export.h"
>+#include "util/util_gl.h"
>+
>+ANGLE_UTIL_EXPORT GLuint CheckLinkStatusAndReturnProgram(GLuint program, bool outputErrorMessages);
>+ANGLE_UTIL_EXPORT GLuint CompileShader(GLenum type, const char *source);
>+ANGLE_UTIL_EXPORT GLuint CompileShaderFromFile(GLenum type, const std::string &sourcePath);
> 
>-ANGLE_EXPORT GLuint
>-CompileProgramWithTransformFeedback(const std::string &vsSource,
>-                                    const std::string &fsSource,
>+ANGLE_UTIL_EXPORT GLuint
>+CompileProgramWithTransformFeedback(const char *vsSource,
>+                                    const char *fsSource,
>                                     const std::vector<std::string> &transformFeedbackVaryings,
>                                     GLenum bufferMode);
>-ANGLE_EXPORT GLuint CompileProgram(const std::string &vsSource, const std::string &fsSource);
>-ANGLE_EXPORT GLuint CompileProgramFromFiles(const std::string &vsPath, const std::string &fsPath);
>-ANGLE_EXPORT GLuint CompileComputeProgram(const std::string &csSource,
>-                                          bool outputErrorMessages = true);
>-ANGLE_EXPORT bool LinkAttachedProgram(GLuint program);
> 
>-ANGLE_EXPORT GLuint LoadBinaryProgramOES(const std::vector<uint8_t> &binary, GLenum binaryFormat);
>-ANGLE_EXPORT GLuint LoadBinaryProgramES3(const std::vector<uint8_t> &binary, GLenum binaryFormat);
>+ANGLE_UTIL_EXPORT GLuint CompileProgram(const char *vsSource, const char *fsSource);
>+
>+ANGLE_UTIL_EXPORT GLuint CompileProgram(const char *vsSource,
>+                                        const char *fsSource,
>+                                        const std::function<void(GLuint)> &preLinkCallback);
>+
>+ANGLE_UTIL_EXPORT GLuint CompileProgramWithGS(const char *vsSource,
>+                                              const char *gsSource,
>+                                              const char *fsSource);
>+ANGLE_UTIL_EXPORT GLuint CompileProgramFromFiles(const std::string &vsPath,
>+                                                 const std::string &fsPath);
>+ANGLE_UTIL_EXPORT GLuint CompileComputeProgram(const char *csSource,
>+                                               bool outputErrorMessages = true);
>+ANGLE_UTIL_EXPORT bool LinkAttachedProgram(GLuint program);
>+
>+ANGLE_UTIL_EXPORT GLuint LoadBinaryProgramOES(const std::vector<uint8_t> &binary,
>+                                              GLenum binaryFormat);
>+ANGLE_UTIL_EXPORT GLuint LoadBinaryProgramES3(const std::vector<uint8_t> &binary,
>+                                              GLenum binaryFormat);
>+
>+namespace angle
>+{
>+
>+namespace essl1_shaders
>+{
>+
>+ANGLE_UTIL_EXPORT const char *PositionAttrib();
>+ANGLE_UTIL_EXPORT const char *ColorUniform();
>+
>+namespace vs
>+{
>+
>+// A shader that sets gl_Position to zero.
>+ANGLE_UTIL_EXPORT const char *Zero();
>+
>+// A shader that sets gl_Position to attribute a_position.
>+ANGLE_UTIL_EXPORT const char *Simple();
>+
>+// A shader that passes through attribute a_position, setting it to gl_Position and varying
>+// v_position.
>+ANGLE_UTIL_EXPORT const char *Passthrough();
>+
>+}  // namespace vs
>+
>+namespace fs
>+{
>+
>+// A shader that renders a simple checker pattern of red and green. X axis and y axis separate the
>+// different colors. Needs varying v_position.
>+ANGLE_UTIL_EXPORT const char *Checkered();
>+
>+// A shader that fills with color taken from uniform named "color".
>+ANGLE_UTIL_EXPORT const char *UniformColor();
>+
>+// A shader that fills with 100% opaque red.
>+ANGLE_UTIL_EXPORT const char *Red();
>+
>+// A shader that fills with 100% opaque green.
>+ANGLE_UTIL_EXPORT const char *Green();
>+
>+// A shader that fills with 100% opaque blue.
>+ANGLE_UTIL_EXPORT const char *Blue();
>+
>+}  // namespace fs
>+}  // namespace essl1_shaders
>+
>+namespace essl3_shaders
>+{
>+
>+ANGLE_UTIL_EXPORT const char *PositionAttrib();
>+
>+namespace vs
>+{
>+
>+// A shader that sets gl_Position to zero.
>+ANGLE_UTIL_EXPORT const char *Zero();
>+
>+// A shader that sets gl_Position to attribute a_position.
>+ANGLE_UTIL_EXPORT const char *Simple();
>+
>+// A shader that simply passes through attribute a_position, setting it to gl_Position and varying
>+// v_position.
>+ANGLE_UTIL_EXPORT const char *Passthrough();
>+
>+}  // namespace vs
>+
>+namespace fs
>+{
>+
>+// A shader that fills with 100% opaque red.
>+ANGLE_UTIL_EXPORT const char *Red();
>+
>+}  // namespace fs
>+}  // namespace essl3_shaders
>+
>+namespace essl31_shaders
>+{
>+
>+ANGLE_UTIL_EXPORT const char *PositionAttrib();
>+
>+namespace vs
>+{
>+
>+// A shader that sets gl_Position to zero.
>+ANGLE_UTIL_EXPORT const char *Zero();
>+
>+// A shader that sets gl_Position to attribute a_position.
>+ANGLE_UTIL_EXPORT const char *Simple();
>+
>+// A shader that simply passes through attribute a_position, setting it to gl_Position and varying
>+// v_position.
>+ANGLE_UTIL_EXPORT const char *Passthrough();
>+
>+}  // namespace vs
>+
>+namespace fs
>+{
>+
>+// A shader that fills with 100% opaque red.
>+ANGLE_UTIL_EXPORT const char *Red();
>+
>+}  // namespace fs
>+}  // namespace essl31_shaders
>+}  // namespace angle
> 
>-#endif // SAMPLE_UTIL_SHADER_UTILS_H
>+#endif  // SAMPLE_UTIL_SHADER_UTILS_H
>diff --git a/Source/ThirdParty/ANGLE/util/system_utils.h b/Source/ThirdParty/ANGLE/util/system_utils.h
>index 1da43b81030..d8e3dbe4cac 100644
>--- a/Source/ThirdParty/ANGLE/util/system_utils.h
>+++ b/Source/ThirdParty/ANGLE/util/system_utils.h
>@@ -11,31 +11,21 @@
> 
> #include <string>
> 
>-#include <export.h>
>-
>-#include "common/angleutils.h"
> #include "common/system_utils.h"
>+#include "util/util_export.h"
> 
> namespace angle
> {
>-
> // Cross platform equivalent of the Windows Sleep function
>-ANGLE_EXPORT void Sleep(unsigned int milliseconds);
>+ANGLE_UTIL_EXPORT void Sleep(unsigned int milliseconds);
> 
>-ANGLE_EXPORT void SetLowPriorityProcess();
>+ANGLE_UTIL_EXPORT void SetLowPriorityProcess();
> 
> // Write a debug message, either to a standard output or Debug window.
>-ANGLE_EXPORT void WriteDebugMessage(const char *format, ...);
>-
>-class ANGLE_EXPORT Library : angle::NonCopyable
>-{
>-  public:
>-    virtual ~Library() {}
>-    virtual void *getSymbol(const std::string &symbolName) = 0;
>-};
>-
>-ANGLE_EXPORT Library *loadLibrary(const std::string &libraryName);
>+ANGLE_UTIL_EXPORT void WriteDebugMessage(const char *format, ...);
> 
>-} // namespace angle
>+// Set thread affinity and priority.
>+ANGLE_UTIL_EXPORT bool StabilizeCPUForBenchmarking();
>+}  // namespace angle
> 
> #endif  // UTIL_SYSTEM_UTILS_H_
>diff --git a/Source/ThirdParty/ANGLE/util/util.gni b/Source/ThirdParty/ANGLE/util/util.gni
>new file mode 100644
>index 00000000000..edc67115918
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/util/util.gni
>@@ -0,0 +1,96 @@
>+# Copyright (c) 2014 The ANGLE Project Authors. All rights reserved.
>+# Use of this source code is governed by a BSD-style license that can be
>+# found in the LICENSE file.
>+
>+util_sources = [
>+  "util/com_utils.h",
>+  "util/keyboard.h",
>+  "util/geometry_utils.cpp",
>+  "util/geometry_utils.h",
>+  "util/mouse.h",
>+  "util/random_utils.cpp",
>+  "util/random_utils.h",
>+  "util/shader_utils.cpp",
>+  "util/shader_utils.h",
>+  "util/system_utils.h",
>+  "util/util_export.h",
>+  "util/util_gl.h",
>+  "util/Event.h",
>+  "util/EGLWindow.cpp",
>+  "util/EGLWindow.h",
>+  "util/Matrix.cpp",
>+  "util/Matrix.h",
>+  "util/OSPixmap.h",
>+  "util/OSWindow.cpp",
>+  "util/OSWindow.h",
>+  "util/Timer.h",
>+]
>+
>+util_win_sources = [
>+  "util/windows/win32/Win32_system_utils.cpp",
>+  "util/windows/win32/Win32Pixmap.cpp",
>+  "util/windows/win32/Win32Pixmap.h",
>+  "util/windows/win32/Win32Window.cpp",
>+  "util/windows/win32/Win32Window.h",
>+  "util/windows/Windows_system_utils.cpp",
>+  "util/windows/WindowsTimer.cpp",
>+  "util/windows/WindowsTimer.h",
>+  "util/windows/WGLWindow.h",
>+]
>+
>+util_win_shared_sources = [ "util/windows/WGLWindow.cpp" ]
>+
>+util_winrt_sources = [
>+  "util/windows/winrt/WinRT_system_utils.cpp",
>+  "util/windows/winrt/WinRTPixmap.cpp",
>+  "util/windows/winrt/WinRTWindow.cpp",
>+  "util/windows/winrt/WinRTWindow.h",
>+  "util/windows/Windows_system_utils.cpp",
>+  "util/windows/WindowsTimer.cpp",
>+  "util/windows/WindowsTimer.h",
>+]
>+
>+util_linux_sources = [
>+  "util/posix/PosixTimer.cpp",
>+  "util/posix/PosixTimer.h",
>+  "util/posix/Posix_system_utils.cpp",
>+]
>+
>+util_x11_sources = [
>+  "util/x11/X11Pixmap.cpp",
>+  "util/x11/X11Pixmap.h",
>+  "util/x11/X11Window.cpp",
>+  "util/x11/X11Window.h",
>+]
>+
>+util_fuchsia_sources = [
>+  "util/posix/PosixTimer.cpp",
>+  "util/posix/PosixTimer.h",
>+  "util/posix/Posix_system_utils.cpp",
>+  "util/fuchsia/ScenicWindow.cpp",
>+  "util/fuchsia/ScenicWindow.h",
>+]
>+
>+util_ozone_sources = [
>+  "util/ozone/OzonePixmap.cpp",
>+  "util/ozone/OzoneWindow.cpp",
>+  "util/ozone/OzoneWindow.h",
>+]
>+
>+util_osx_sources = [
>+  "util/osx/OSXTimer.cpp",
>+  "util/osx/OSXTimer.h",
>+  "util/osx/OSXPixmap.mm",
>+  "util/osx/OSXPixmap.h",
>+  "util/osx/OSXWindow.mm",
>+  "util/osx/OSXWindow.h",
>+  "util/posix/Posix_system_utils.cpp",
>+]
>+
>+util_android_sources = [
>+  "util/android/AndroidPixmap.cpp",
>+  "util/android/AndroidWindow.cpp",
>+  "util/android/AndroidWindow.h",
>+  "util/android/third_party/android_native_app_glue.c",
>+  "util/android/third_party/android_native_app_glue.h",
>+]
>diff --git a/Source/ThirdParty/ANGLE/util/util.gyp b/Source/ThirdParty/ANGLE/util/util.gyp
>deleted file mode 100644
>index bda8a0530eb..00000000000
>--- a/Source/ThirdParty/ANGLE/util/util.gyp
>+++ /dev/null
>@@ -1,251 +0,0 @@
>-# Copyright (c) 2014 The ANGLE Project Authors. All rights reserved.
>-# Use of this source code is governed by a BSD-style license that can be
>-# found in the LICENSE file.
>-
>-{
>-    # Everything below  this is duplicated in the GN build, except Mac support.
>-    # If you change anything also change angle/BUILD.gn
>-    'variables':
>-    {
>-        'util_sources':
>-        [
>-            'com_utils.h',
>-            'keyboard.h',
>-            'geometry_utils.cpp',
>-            'geometry_utils.h',
>-            'mouse.h',
>-            'random_utils.cpp',
>-            'random_utils.h',
>-            'shader_utils.cpp',
>-            'shader_utils.h',
>-            'system_utils.h',
>-            'Event.h',
>-            'EGLWindow.cpp',
>-            'EGLWindow.h',
>-            'Matrix.cpp',
>-            'Matrix.h',
>-            'OSPixmap.h',
>-            'OSWindow.cpp',
>-            'OSWindow.h',
>-            'Timer.h',
>-        ],
>-        'util_win32_sources':
>-        [
>-            'windows/win32/Win32_system_utils.cpp',
>-            'windows/win32/Win32Pixmap.cpp',
>-            'windows/win32/Win32Pixmap.h',
>-            'windows/win32/Win32Window.cpp',
>-            'windows/win32/Win32Window.h',
>-            'windows/Windows_system_utils.cpp',
>-            'windows/WindowsTimer.cpp',
>-            'windows/WindowsTimer.h',
>-        ],
>-        'util_winrt_sources':
>-        [
>-            'windows/winrt/WinRT_system_utils.cpp',
>-            'windows/winrt/WinRTPixmap.cpp',
>-            'windows/winrt/WinRTWindow.cpp',
>-            'windows/winrt/WinRTWindow.h',
>-            'windows/Windows_system_utils.cpp',
>-            'windows/WindowsTimer.cpp',
>-            'windows/WindowsTimer.h',
>-        ],
>-        'util_linux_sources':
>-        [
>-            'linux/LinuxTimer.cpp',
>-            'linux/LinuxTimer.h',
>-            'posix/Posix_system_utils.cpp',
>-        ],
>-        'util_x11_sources':
>-        [
>-            'x11/X11Pixmap.cpp',
>-            'x11/X11Pixmap.h',
>-            'x11/X11Window.cpp',
>-            'x11/X11Window.h',
>-        ],
>-        'util_ozone_sources':
>-        [
>-            'ozone/OzonePixmap.cpp',
>-            'ozone/OzoneWindow.cpp',
>-            'ozone/OzoneWindow.h',
>-        ],
>-        'util_osx_sources':
>-        [
>-            'osx/OSXTimer.cpp',
>-            'osx/OSXTimer.h',
>-            'osx/OSXPixmap.mm',
>-            'osx/OSXPixmap.h',
>-            'osx/OSXWindow.mm',
>-            'osx/OSXWindow.h',
>-            'posix/Posix_system_utils.cpp',
>-        ],
>-        'util_android_sources':
>-        [
>-            'android/AndroidPixmap.cpp',
>-            'android/AndroidWindow.cpp',
>-            'android/AndroidWindow.h',
>-            'android/third_party/android_native_app_glue.c',
>-            'android/third_party/android_native_app_glue.h',
>-        ],
>-    },
>-    'targets':
>-    [
>-        {
>-            'target_name': 'angle_util_config',
>-            'type': 'none',
>-            'direct_dependent_settings':
>-            {
>-                'include_dirs':
>-                [
>-                    '<(angle_path)/include',
>-                    '<(angle_path)/util',
>-                ],
>-                'sources':
>-                [
>-                    '<@(util_sources)',
>-                ],
>-                'defines':
>-                [
>-                    'GL_GLEXT_PROTOTYPES',
>-                    'EGL_EGLEXT_PROTOTYPES',
>-                    'LIBANGLE_UTIL_IMPLEMENTATION',
>-                ],
>-                'conditions':
>-                [
>-                    ['OS=="win" and angle_build_winrt==0',
>-                    {
>-                        'sources':
>-                        [
>-                            '<@(util_win32_sources)',
>-                        ],
>-                    }],
>-                    ['OS=="win" and angle_build_winrt==1',
>-                    {
>-                        'sources':
>-                        [
>-                            '<@(util_winrt_sources)',
>-                        ],
>-                    }],
>-                    ['OS=="linux"',
>-                    {
>-                        'sources':
>-                        [
>-                            '<@(util_linux_sources)',
>-                        ],
>-                        'link_settings':
>-                        {
>-                            'libraries':
>-                            [
>-                                '-ldl',
>-                            ],
>-                        },
>-                    }],
>-                    ['use_x11==1',
>-                    {
>-                        'sources':
>-                        [
>-                            '<@(util_x11_sources)',
>-                        ],
>-                        'link_settings':
>-                        {
>-                            'ldflags':
>-                            [
>-                                '<!@(<(pkg-config) --libs-only-L --libs-only-other x11 xi)',
>-                            ],
>-                            'libraries':
>-                            [
>-                                '<!@(<(pkg-config) --libs-only-l x11 xi)',
>-                            ],
>-                        },
>-                    }],
>-                    ['use_ozone==1',
>-                    {
>-                        'sources':
>-                        [
>-                            '<@(util_ozone_sources)',
>-                        ],
>-                    }],
>-                    ['OS=="mac"',
>-                    {
>-                        'sources':
>-                        [
>-                            '<@(util_osx_sources)',
>-                        ],
>-                        'xcode_settings':
>-                        {
>-                            'DYLIB_INSTALL_NAME_BASE': '@rpath',
>-                        },
>-                        'link_settings':
>-                        {
>-                            'libraries':
>-                            [
>-                                '$(SDKROOT)/System/Library/Frameworks/AppKit.framework',
>-                                '$(SDKROOT)/System/Library/Frameworks/QuartzCore.framework',
>-                            ],
>-                        },
>-                    }],
>-                ],
>-            },
>-        },
>-
>-        {
>-            'target_name': 'angle_util',
>-            'type': 'shared_library',
>-            'includes': [ '../gyp/common_defines.gypi', ],
>-            'dependencies':
>-            [
>-                'angle_util_config',
>-                '<(angle_path)/src/angle.gyp:angle_common',
>-                '<(angle_path)/src/angle.gyp:libEGL',
>-                '<(angle_path)/src/angle.gyp:libGLESv2',
>-            ],
>-            'export_dependent_settings':
>-            [
>-                '<(angle_path)/src/angle.gyp:angle_common',
>-            ],
>-            'direct_dependent_settings':
>-            {
>-                'include_dirs':
>-                [
>-                    '<(angle_path)/include',
>-                    '<(angle_path)/util',
>-                ],
>-                'defines':
>-                [
>-                    'GL_GLEXT_PROTOTYPES',
>-                    'EGL_EGLEXT_PROTOTYPES',
>-                ],
>-            },
>-        },
>-
>-        {
>-            'target_name': 'angle_util_static',
>-            'type': 'static_library',
>-            'includes': [ '../gyp/common_defines.gypi', ],
>-            'dependencies':
>-            [
>-                'angle_util_config',
>-                '<(angle_path)/src/angle.gyp:angle_common',
>-                '<(angle_path)/src/angle.gyp:libEGL_static',
>-                '<(angle_path)/src/angle.gyp:libGLESv2_static',
>-            ],
>-            'export_dependent_settings':
>-            [
>-                '<(angle_path)/src/angle.gyp:angle_common',
>-            ],
>-            'direct_dependent_settings':
>-            {
>-                'include_dirs':
>-                [
>-                    '<(angle_path)/include',
>-                    '<(angle_path)/util',
>-                ],
>-                'defines':
>-                [
>-                    'GL_GLEXT_PROTOTYPES',
>-                    'EGL_EGLEXT_PROTOTYPES',
>-                ],
>-            },
>-        },
>-    ],
>-}
>diff --git a/Source/ThirdParty/ANGLE/util/util_export.h b/Source/ThirdParty/ANGLE/util/util_export.h
>new file mode 100644
>index 00000000000..6579831e88e
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/util/util_export.h
>@@ -0,0 +1,29 @@
>+//
>+// Copyright 2018 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// util_export.h : Defines ANGLE_UTIL_EXPORT, a macro for exporting symbols.
>+
>+#ifndef UTIL_EXPORT_H_
>+#define UTIL_EXPORT_H_
>+
>+#if !defined(ANGLE_UTIL_EXPORT)
>+#    if defined(_WIN32)
>+#        if defined(LIBANGLE_UTIL_IMPLEMENTATION)
>+#            define ANGLE_UTIL_EXPORT __declspec(dllexport)
>+#        else
>+#            define ANGLE_UTIL_EXPORT __declspec(dllimport)
>+#        endif
>+#    elif defined(__GNUC__)
>+#        if defined(LIBANGLE_UTIL_IMPLEMENTATION)
>+#            define ANGLE_UTIL_EXPORT __attribute__((visibility("default")))
>+#        else
>+#            define ANGLE_UTIL_EXPORT
>+#        endif
>+#    else
>+#        define ANGLE_UTIL_EXPORT
>+#    endif
>+#endif  // !defined(ANGLE_UTIL_EXPORT)
>+
>+#endif  // UTIL_EXPORT_H_
>diff --git a/Source/ThirdParty/ANGLE/util/util_gl.h b/Source/ThirdParty/ANGLE/util/util_gl.h
>new file mode 100644
>index 00000000000..c044742fa4f
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/util/util_gl.h
>@@ -0,0 +1,30 @@
>+//
>+// Copyright 2018 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// util_gl.h: Includes the right GL/EGL headers for static/shared link.
>+
>+#ifndef UTIL_GL_H_
>+#define UTIL_GL_H_
>+
>+#include "common/platform.h"
>+
>+#if defined(ANGLE_USE_UTIL_LOADER)
>+#    include "util/egl_loader_autogen.h"
>+#    include "util/gles_loader_autogen.h"
>+#    if defined(ANGLE_PLATFORM_WINDOWS)
>+#        include "util/windows/wgl_loader_autogen.h"
>+#    endif  // defined(ANGLE_PLATFORM_WINDOWS)
>+#else
>+
>+#    if !defined(GL_GLES_PROTOTYPES)
>+#        error Config error. Should either be using the ANGLE GL loader or header prototypes.
>+#    endif  // !defined(GL_GLES_PROTOTYPES)
>+
>+#    include <EGL/egl.h>
>+#    include <EGL/eglext.h>
>+#    include "angle_gl.h"
>+#endif  // defined(ANGLE_USE_UTIL_LOADER)
>+
>+#endif  // UTIL_GL_H_
>diff --git a/Source/ThirdParty/ANGLE/util/windows/WGLWindow.cpp b/Source/ThirdParty/ANGLE/util/windows/WGLWindow.cpp
>new file mode 100644
>index 00000000000..bac587533df
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/util/windows/WGLWindow.cpp
>@@ -0,0 +1,247 @@
>+//
>+// Copyright 2018 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// WGLWindow:
>+//   Implements initializing a WGL rendering context.
>+//
>+
>+#include "util/windows/WGLWindow.h"
>+
>+#include "common/string_utils.h"
>+#include "util/OSWindow.h"
>+#include "util/system_utils.h"
>+
>+#include <iostream>
>+
>+namespace
>+{
>+PIXELFORMATDESCRIPTOR GetDefaultPixelFormatDescriptor()
>+{
>+    PIXELFORMATDESCRIPTOR pixelFormatDescriptor = {0};
>+    pixelFormatDescriptor.nSize                 = sizeof(pixelFormatDescriptor);
>+    pixelFormatDescriptor.nVersion              = 1;
>+    pixelFormatDescriptor.dwFlags =
>+        PFD_DRAW_TO_WINDOW | PFD_GENERIC_ACCELERATED | PFD_SUPPORT_OPENGL | PFD_DOUBLEBUFFER;
>+    pixelFormatDescriptor.iPixelType   = PFD_TYPE_RGBA;
>+    pixelFormatDescriptor.cColorBits   = 24;
>+    pixelFormatDescriptor.cAlphaBits   = 8;
>+    pixelFormatDescriptor.cDepthBits   = 24;
>+    pixelFormatDescriptor.cStencilBits = 8;
>+    pixelFormatDescriptor.iLayerType   = PFD_MAIN_PLANE;
>+
>+    return pixelFormatDescriptor;
>+}
>+
>+PFNWGLGETPROCADDRESSPROC gCurrentWGLGetProcAddress = nullptr;
>+HMODULE gCurrentModule                             = nullptr;
>+
>+angle::GenericProc WINAPI GetProcAddressWithFallback(const char *name)
>+{
>+    angle::GenericProc proc = reinterpret_cast<angle::GenericProc>(gCurrentWGLGetProcAddress(name));
>+    if (proc)
>+    {
>+        return proc;
>+    }
>+
>+    return reinterpret_cast<angle::GenericProc>(GetProcAddress(gCurrentModule, name));
>+}
>+
>+bool HasExtension(const std::vector<std::string> &extensions, const char *ext)
>+{
>+    return std::find(extensions.begin(), extensions.end(), ext) != extensions.end();
>+}
>+
>+void DumpLastWindowsError()
>+{
>+    std::cerr << "Last Windows error code: 0x" << std::hex << GetLastError() << std::endl;
>+}
>+}  // namespace
>+
>+WGLWindow::WGLWindow(int glesMajorVersion, int glesMinorVersion)
>+    : GLWindowBase(glesMajorVersion, glesMinorVersion),
>+      mDeviceContext(nullptr),
>+      mWGLContext(nullptr),
>+      mWindow(nullptr)
>+{}
>+
>+WGLWindow::~WGLWindow() {}
>+
>+// Internally initializes GL resources.
>+bool WGLWindow::initializeGL(OSWindow *osWindow,
>+                             angle::Library *glWindowingLibrary,
>+                             const EGLPlatformParameters &platformParams,
>+                             const ConfigParameters &configParams)
>+{
>+    glWindowingLibrary->getAs("wglGetProcAddress", &gCurrentWGLGetProcAddress);
>+
>+    if (!gCurrentWGLGetProcAddress)
>+    {
>+        std::cerr << "Error loading wglGetProcAddress." << std::endl;
>+        return false;
>+    }
>+
>+    gCurrentModule = reinterpret_cast<HMODULE>(glWindowingLibrary->getNative());
>+    angle::LoadWGL(GetProcAddressWithFallback);
>+
>+    mWindow                                           = osWindow->getNativeWindow();
>+    mDeviceContext                                    = GetDC(mWindow);
>+    const PIXELFORMATDESCRIPTOR pixelFormatDescriptor = GetDefaultPixelFormatDescriptor();
>+
>+    int pixelFormat = ChoosePixelFormat(mDeviceContext, &pixelFormatDescriptor);
>+    if (pixelFormat == 0)
>+    {
>+        std::cerr << "Could not find a compatible pixel format." << std::endl;
>+        DumpLastWindowsError();
>+        return false;
>+    }
>+
>+    // According to the Windows docs, it is an error to set a pixel format twice.
>+    int currentPixelFormat = GetPixelFormat(mDeviceContext);
>+    if (currentPixelFormat != pixelFormat)
>+    {
>+        if (SetPixelFormat(mDeviceContext, pixelFormat, &pixelFormatDescriptor) != TRUE)
>+        {
>+            std::cerr << "Failed to set the pixel format." << std::endl;
>+            DumpLastWindowsError();
>+            return false;
>+        }
>+    }
>+
>+    mWGLContext = _wglCreateContext(mDeviceContext);
>+    if (!mWGLContext)
>+    {
>+        std::cerr << "Failed to create a WGL context." << std::endl;
>+        return false;
>+    }
>+
>+    if (!makeCurrent())
>+    {
>+        return false;
>+    }
>+
>+    // Reload entry points to capture extensions.
>+    angle::LoadWGL(GetProcAddressWithFallback);
>+
>+    if (!_wglGetExtensionsStringARB)
>+    {
>+        std::cerr << "Driver does not expose wglGetExtensionsStringARB." << std::endl;
>+        return false;
>+    }
>+
>+    const char *extensionsString = _wglGetExtensionsStringARB(mDeviceContext);
>+
>+    std::vector<std::string> extensions;
>+    angle::SplitStringAlongWhitespace(extensionsString, &extensions);
>+
>+    if (!HasExtension(extensions, "WGL_EXT_create_context_es2_profile"))
>+    {
>+        std::cerr << "Driver does not expose WGL_EXT_create_context_es2_profile." << std::endl;
>+        return false;
>+    }
>+
>+    if (configParams.webGLCompatibility.valid() || configParams.robustResourceInit.valid())
>+    {
>+        std::cerr << "WGLWindow does not support the requested feature set." << std::endl;
>+        return false;
>+    }
>+
>+    // Tear down the context and create another with ES2 compatibility.
>+    _wglDeleteContext(mWGLContext);
>+
>+    // This could be extended to cover ES1 compatiblity.
>+    int kCreateAttribs[] = {WGL_CONTEXT_MAJOR_VERSION_ARB,
>+                            mClientMajorVersion,
>+                            WGL_CONTEXT_MINOR_VERSION_ARB,
>+                            mClientMinorVersion,
>+                            WGL_CONTEXT_PROFILE_MASK_ARB,
>+                            WGL_CONTEXT_ES2_PROFILE_BIT_EXT,
>+                            0,
>+                            0};
>+
>+    mWGLContext = _wglCreateContextAttribsARB(mDeviceContext, nullptr, kCreateAttribs);
>+    if (!mWGLContext)
>+    {
>+        std::cerr << "Failed to create an ES2 compatible WGL context." << std::endl;
>+        return false;
>+    }
>+
>+    if (!makeCurrent())
>+    {
>+        return false;
>+    }
>+
>+    mPlatform     = platformParams;
>+    mConfigParams = configParams;
>+
>+    angle::LoadGLES(GetProcAddressWithFallback);
>+    return true;
>+}
>+
>+void WGLWindow::destroyGL()
>+{
>+    if (mWGLContext)
>+    {
>+        _wglDeleteContext(mWGLContext);
>+        mWGLContext = nullptr;
>+    }
>+
>+    if (mDeviceContext)
>+    {
>+        ReleaseDC(mWindow, mDeviceContext);
>+        mDeviceContext = nullptr;
>+    }
>+}
>+
>+bool WGLWindow::isGLInitialized() const
>+{
>+    return mWGLContext != nullptr;
>+}
>+
>+bool WGLWindow::makeCurrent()
>+{
>+    if (_wglMakeCurrent(mDeviceContext, mWGLContext) == FALSE)
>+    {
>+        std::cerr << "Error during wglMakeCurrent.\n";
>+        return false;
>+    }
>+
>+    return true;
>+}
>+
>+bool WGLWindow::setSwapInterval(EGLint swapInterval)
>+{
>+    if (!_wglSwapIntervalEXT || _wglSwapIntervalEXT(swapInterval) == FALSE)
>+    {
>+        std::cerr << "Error during wglSwapIntervalEXT.\n";
>+        return false;
>+    }
>+    return true;
>+}
>+
>+void WGLWindow::swap()
>+{
>+    if (SwapBuffers(mDeviceContext) == FALSE)
>+    {
>+        std::cerr << "Error during SwapBuffers.\n";
>+    }
>+}
>+
>+bool WGLWindow::hasError() const
>+{
>+    return GetLastError() != S_OK;
>+}
>+
>+// static
>+WGLWindow *WGLWindow::New(int glesMajorVersion, int glesMinorVersion)
>+{
>+    return new WGLWindow(glesMajorVersion, glesMinorVersion);
>+}
>+
>+// static
>+void WGLWindow::Delete(WGLWindow **window)
>+{
>+    delete *window;
>+    *window = nullptr;
>+}
>diff --git a/Source/ThirdParty/ANGLE/util/windows/WGLWindow.h b/Source/ThirdParty/ANGLE/util/windows/WGLWindow.h
>new file mode 100644
>index 00000000000..a614bb35ef3
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/util/windows/WGLWindow.h
>@@ -0,0 +1,53 @@
>+//
>+// Copyright 2018 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// WGLWindow:
>+//   Implements initializing a WGL rendering context.
>+//
>+
>+#ifndef UTIL_WINDOWS_WGLWINDOW_H_
>+#define UTIL_WINDOWS_WGLWINDOW_H_
>+
>+#include "common/angleutils.h"
>+#include "export.h"
>+#include "util/EGLWindow.h"
>+
>+class OSWindow;
>+
>+namespace angle
>+{
>+class Library;
>+}  // namespace angle
>+
>+class ANGLE_UTIL_EXPORT WGLWindow : public GLWindowBase
>+{
>+  public:
>+    static WGLWindow *New(int glesMajorVersion, int glesMinorVersion);
>+    static void Delete(WGLWindow **window);
>+
>+    // Internally initializes GL resources.
>+    bool initializeGL(OSWindow *osWindow,
>+                      angle::Library *glWindowingLibrary,
>+                      const EGLPlatformParameters &platformParams,
>+                      const ConfigParameters &configParams) override;
>+    void destroyGL() override;
>+    bool isGLInitialized() const override;
>+
>+    bool makeCurrent() override;
>+    void swap() override;
>+    bool hasError() const override;
>+    bool setSwapInterval(EGLint swapInterval) override;
>+
>+  private:
>+    WGLWindow(int glesMajorVersion, int glesMinorVersion);
>+    ~WGLWindow() override;
>+
>+    // OS resources.
>+    HDC mDeviceContext;
>+    HGLRC mWGLContext;
>+    HWND mWindow;
>+};
>+
>+#endif  // UTIL_WINDOWS_WGLWINDOW_H_
>diff --git a/Source/ThirdParty/ANGLE/util/windows/WindowsTimer.cpp b/Source/ThirdParty/ANGLE/util/windows/WindowsTimer.cpp
>index c6a9e9dd83b..25e498756d0 100644
>--- a/Source/ThirdParty/ANGLE/util/windows/WindowsTimer.cpp
>+++ b/Source/ThirdParty/ANGLE/util/windows/WindowsTimer.cpp
>@@ -6,22 +6,32 @@
> 
> // WindowsTimer.cpp: Implementation of a high precision timer class on Windows
> 
>-#include "windows/WindowsTimer.h"
>+#include "util/windows/WindowsTimer.h"
> 
>-WindowsTimer::WindowsTimer() : mRunning(false), mStartTime(0), mStopTime(0)
>+WindowsTimer::WindowsTimer() : mRunning(false), mStartTime(0), mStopTime(0), mFrequency(0) {}
>+
>+LONGLONG WindowsTimer::getFrequency()
> {
>+    if (mFrequency == 0)
>+    {
>+        LARGE_INTEGER frequency = {};
>+        QueryPerformanceFrequency(&frequency);
>+
>+        mFrequency = frequency.QuadPart;
>+    }
>+
>+    return mFrequency;
> }
> 
> void WindowsTimer::start()
> {
>-    LARGE_INTEGER frequency;
>-    QueryPerformanceFrequency(&frequency);
>-    mFrequency = frequency.QuadPart;
>-
>     LARGE_INTEGER curTime;
>     QueryPerformanceCounter(&curTime);
>     mStartTime = curTime.QuadPart;
> 
>+    // Cache the frequency
>+    getFrequency();
>+
>     mRunning = true;
> }
> 
>@@ -51,6 +61,14 @@ double WindowsTimer::getElapsedTime() const
>     return static_cast<double>(endTime - mStartTime) / mFrequency;
> }
> 
>+double WindowsTimer::getAbsoluteTime()
>+{
>+    LARGE_INTEGER curTime;
>+    QueryPerformanceCounter(&curTime);
>+
>+    return static_cast<double>(curTime.QuadPart) / getFrequency();
>+}
>+
> Timer *CreateTimer()
> {
>     return new WindowsTimer();
>diff --git a/Source/ThirdParty/ANGLE/util/windows/WindowsTimer.h b/Source/ThirdParty/ANGLE/util/windows/WindowsTimer.h
>index a194300050a..86875fe2040 100644
>--- a/Source/ThirdParty/ANGLE/util/windows/WindowsTimer.h
>+++ b/Source/ThirdParty/ANGLE/util/windows/WindowsTimer.h
>@@ -11,9 +11,9 @@
> 
> #include <windows.h>
> 
>-#include "Timer.h"
>+#include "util/Timer.h"
> 
>-class WindowsTimer : public Timer
>+class ANGLE_UTIL_EXPORT WindowsTimer : public Timer
> {
>   public:
>     WindowsTimer();
>@@ -22,11 +22,14 @@ class WindowsTimer : public Timer
>     void stop() override;
>     double getElapsedTime() const override;
> 
>+    double getAbsoluteTime() override;
>+
>   private:
>+    LONGLONG getFrequency();
>+
>     bool mRunning;
>     LONGLONG mStartTime;
>     LONGLONG mStopTime;
>-
>     LONGLONG mFrequency;
> };
> 
>diff --git a/Source/ThirdParty/ANGLE/util/windows/Windows_system_utils.cpp b/Source/ThirdParty/ANGLE/util/windows/Windows_system_utils.cpp
>index 36b4f664b05..7d7dffdfede 100644
>--- a/Source/ThirdParty/ANGLE/util/windows/Windows_system_utils.cpp
>+++ b/Source/ThirdParty/ANGLE/util/windows/Windows_system_utils.cpp
>@@ -6,7 +6,7 @@
> 
> // Windows_system_utils.cpp: Implementation of OS-specific functions for Windows
> 
>-#include "system_utils.h"
>+#include "util/system_utils.h"
> 
> #include <stdarg.h>
> #include <windows.h>
>diff --git a/Source/ThirdParty/ANGLE/util/windows/wgl_loader_autogen.cpp b/Source/ThirdParty/ANGLE/util/windows/wgl_loader_autogen.cpp
>new file mode 100644
>index 00000000000..dd96efdf920
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/util/windows/wgl_loader_autogen.cpp
>@@ -0,0 +1,97 @@
>+// GENERATED FILE - DO NOT EDIT.
>+// Generated by generate_loader.py using data from wgl.xml.
>+//
>+// Copyright 2019 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// wgl_loader_autogen.cpp:
>+//   Simple WGL function loader.
>+
>+#include "wgl_loader_autogen.h"
>+
>+PFNCHOOSEPIXELFORMATPROC _ChoosePixelFormat;
>+PFNDESCRIBEPIXELFORMATPROC _DescribePixelFormat;
>+PFNGETENHMETAFILEPIXELFORMATPROC _GetEnhMetaFilePixelFormat;
>+PFNGETPIXELFORMATPROC _GetPixelFormat;
>+PFNSETPIXELFORMATPROC _SetPixelFormat;
>+PFNSWAPBUFFERSPROC _SwapBuffers;
>+PFNWGLCOPYCONTEXTPROC _wglCopyContext;
>+PFNWGLCREATECONTEXTPROC _wglCreateContext;
>+PFNWGLCREATELAYERCONTEXTPROC _wglCreateLayerContext;
>+PFNWGLDELETECONTEXTPROC _wglDeleteContext;
>+PFNWGLDESCRIBELAYERPLANEPROC _wglDescribeLayerPlane;
>+PFNWGLGETCURRENTCONTEXTPROC _wglGetCurrentContext;
>+PFNWGLGETCURRENTDCPROC _wglGetCurrentDC;
>+PFNWGLGETLAYERPALETTEENTRIESPROC _wglGetLayerPaletteEntries;
>+PFNWGLGETPROCADDRESSPROC _wglGetProcAddress;
>+PFNWGLMAKECURRENTPROC _wglMakeCurrent;
>+PFNWGLREALIZELAYERPALETTEPROC _wglRealizeLayerPalette;
>+PFNWGLSETLAYERPALETTEENTRIESPROC _wglSetLayerPaletteEntries;
>+PFNWGLSHARELISTSPROC _wglShareLists;
>+PFNWGLSWAPLAYERBUFFERSPROC _wglSwapLayerBuffers;
>+PFNWGLUSEFONTBITMAPSPROC _wglUseFontBitmaps;
>+PFNWGLUSEFONTBITMAPSAPROC _wglUseFontBitmapsA;
>+PFNWGLUSEFONTBITMAPSWPROC _wglUseFontBitmapsW;
>+PFNWGLUSEFONTOUTLINESPROC _wglUseFontOutlines;
>+PFNWGLUSEFONTOUTLINESAPROC _wglUseFontOutlinesA;
>+PFNWGLUSEFONTOUTLINESWPROC _wglUseFontOutlinesW;
>+PFNWGLCREATECONTEXTATTRIBSARBPROC _wglCreateContextAttribsARB;
>+PFNWGLGETEXTENSIONSSTRINGARBPROC _wglGetExtensionsStringARB;
>+PFNWGLGETSWAPINTERVALEXTPROC _wglGetSwapIntervalEXT;
>+PFNWGLSWAPINTERVALEXTPROC _wglSwapIntervalEXT;
>+
>+namespace angle
>+{
>+void LoadWGL(LoadProc loadProc)
>+{
>+    _ChoosePixelFormat = reinterpret_cast<PFNCHOOSEPIXELFORMATPROC>(loadProc("ChoosePixelFormat"));
>+    _DescribePixelFormat =
>+        reinterpret_cast<PFNDESCRIBEPIXELFORMATPROC>(loadProc("DescribePixelFormat"));
>+    _GetEnhMetaFilePixelFormat =
>+        reinterpret_cast<PFNGETENHMETAFILEPIXELFORMATPROC>(loadProc("GetEnhMetaFilePixelFormat"));
>+    _GetPixelFormat   = reinterpret_cast<PFNGETPIXELFORMATPROC>(loadProc("GetPixelFormat"));
>+    _SetPixelFormat   = reinterpret_cast<PFNSETPIXELFORMATPROC>(loadProc("SetPixelFormat"));
>+    _SwapBuffers      = reinterpret_cast<PFNSWAPBUFFERSPROC>(loadProc("SwapBuffers"));
>+    _wglCopyContext   = reinterpret_cast<PFNWGLCOPYCONTEXTPROC>(loadProc("wglCopyContext"));
>+    _wglCreateContext = reinterpret_cast<PFNWGLCREATECONTEXTPROC>(loadProc("wglCreateContext"));
>+    _wglCreateLayerContext =
>+        reinterpret_cast<PFNWGLCREATELAYERCONTEXTPROC>(loadProc("wglCreateLayerContext"));
>+    _wglDeleteContext = reinterpret_cast<PFNWGLDELETECONTEXTPROC>(loadProc("wglDeleteContext"));
>+    _wglDescribeLayerPlane =
>+        reinterpret_cast<PFNWGLDESCRIBELAYERPLANEPROC>(loadProc("wglDescribeLayerPlane"));
>+    _wglGetCurrentContext =
>+        reinterpret_cast<PFNWGLGETCURRENTCONTEXTPROC>(loadProc("wglGetCurrentContext"));
>+    _wglGetCurrentDC = reinterpret_cast<PFNWGLGETCURRENTDCPROC>(loadProc("wglGetCurrentDC"));
>+    _wglGetLayerPaletteEntries =
>+        reinterpret_cast<PFNWGLGETLAYERPALETTEENTRIESPROC>(loadProc("wglGetLayerPaletteEntries"));
>+    _wglGetProcAddress = reinterpret_cast<PFNWGLGETPROCADDRESSPROC>(loadProc("wglGetProcAddress"));
>+    _wglMakeCurrent    = reinterpret_cast<PFNWGLMAKECURRENTPROC>(loadProc("wglMakeCurrent"));
>+    _wglRealizeLayerPalette =
>+        reinterpret_cast<PFNWGLREALIZELAYERPALETTEPROC>(loadProc("wglRealizeLayerPalette"));
>+    _wglSetLayerPaletteEntries =
>+        reinterpret_cast<PFNWGLSETLAYERPALETTEENTRIESPROC>(loadProc("wglSetLayerPaletteEntries"));
>+    _wglShareLists = reinterpret_cast<PFNWGLSHARELISTSPROC>(loadProc("wglShareLists"));
>+    _wglSwapLayerBuffers =
>+        reinterpret_cast<PFNWGLSWAPLAYERBUFFERSPROC>(loadProc("wglSwapLayerBuffers"));
>+    _wglUseFontBitmaps = reinterpret_cast<PFNWGLUSEFONTBITMAPSPROC>(loadProc("wglUseFontBitmaps"));
>+    _wglUseFontBitmapsA =
>+        reinterpret_cast<PFNWGLUSEFONTBITMAPSAPROC>(loadProc("wglUseFontBitmapsA"));
>+    _wglUseFontBitmapsW =
>+        reinterpret_cast<PFNWGLUSEFONTBITMAPSWPROC>(loadProc("wglUseFontBitmapsW"));
>+    _wglUseFontOutlines =
>+        reinterpret_cast<PFNWGLUSEFONTOUTLINESPROC>(loadProc("wglUseFontOutlines"));
>+    _wglUseFontOutlinesA =
>+        reinterpret_cast<PFNWGLUSEFONTOUTLINESAPROC>(loadProc("wglUseFontOutlinesA"));
>+    _wglUseFontOutlinesW =
>+        reinterpret_cast<PFNWGLUSEFONTOUTLINESWPROC>(loadProc("wglUseFontOutlinesW"));
>+    _wglCreateContextAttribsARB =
>+        reinterpret_cast<PFNWGLCREATECONTEXTATTRIBSARBPROC>(loadProc("wglCreateContextAttribsARB"));
>+    _wglGetExtensionsStringARB =
>+        reinterpret_cast<PFNWGLGETEXTENSIONSSTRINGARBPROC>(loadProc("wglGetExtensionsStringARB"));
>+    _wglGetSwapIntervalEXT =
>+        reinterpret_cast<PFNWGLGETSWAPINTERVALEXTPROC>(loadProc("wglGetSwapIntervalEXT"));
>+    _wglSwapIntervalEXT =
>+        reinterpret_cast<PFNWGLSWAPINTERVALEXTPROC>(loadProc("wglSwapIntervalEXT"));
>+}
>+}  // namespace angle
>diff --git a/Source/ThirdParty/ANGLE/util/windows/wgl_loader_autogen.h b/Source/ThirdParty/ANGLE/util/windows/wgl_loader_autogen.h
>new file mode 100644
>index 00000000000..52c83c78e39
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/util/windows/wgl_loader_autogen.h
>@@ -0,0 +1,59 @@
>+// GENERATED FILE - DO NOT EDIT.
>+// Generated by generate_loader.py using data from wgl.xml.
>+//
>+// Copyright 2019 The ANGLE Project Authors. All rights reserved.
>+// Use of this source code is governed by a BSD-style license that can be
>+// found in the LICENSE file.
>+//
>+// wgl_loader_autogen.h:
>+//   Simple WGL function loader.
>+
>+#ifndef UTIL_WINDOWS_WGL_LOADER_AUTOGEN_H_
>+#define UTIL_WINDOWS_WGL_LOADER_AUTOGEN_H_
>+
>+#include <GLES2/gl2.h>
>+#include <WGL/wgl.h>
>+
>+// We add an underscore before each function name to ensure common names like "ChoosePixelFormat"
>+// and "SwapBuffers" don't conflict with our function pointers. We can't use a namespace because
>+// some functions conflict with preprocessor definitions.
>+
>+extern PFNCHOOSEPIXELFORMATPROC _ChoosePixelFormat;
>+extern PFNDESCRIBEPIXELFORMATPROC _DescribePixelFormat;
>+extern PFNGETENHMETAFILEPIXELFORMATPROC _GetEnhMetaFilePixelFormat;
>+extern PFNGETPIXELFORMATPROC _GetPixelFormat;
>+extern PFNSETPIXELFORMATPROC _SetPixelFormat;
>+extern PFNSWAPBUFFERSPROC _SwapBuffers;
>+extern PFNWGLCOPYCONTEXTPROC _wglCopyContext;
>+extern PFNWGLCREATECONTEXTPROC _wglCreateContext;
>+extern PFNWGLCREATELAYERCONTEXTPROC _wglCreateLayerContext;
>+extern PFNWGLDELETECONTEXTPROC _wglDeleteContext;
>+extern PFNWGLDESCRIBELAYERPLANEPROC _wglDescribeLayerPlane;
>+extern PFNWGLGETCURRENTCONTEXTPROC _wglGetCurrentContext;
>+extern PFNWGLGETCURRENTDCPROC _wglGetCurrentDC;
>+extern PFNWGLGETLAYERPALETTEENTRIESPROC _wglGetLayerPaletteEntries;
>+extern PFNWGLGETPROCADDRESSPROC _wglGetProcAddress;
>+extern PFNWGLMAKECURRENTPROC _wglMakeCurrent;
>+extern PFNWGLREALIZELAYERPALETTEPROC _wglRealizeLayerPalette;
>+extern PFNWGLSETLAYERPALETTEENTRIESPROC _wglSetLayerPaletteEntries;
>+extern PFNWGLSHARELISTSPROC _wglShareLists;
>+extern PFNWGLSWAPLAYERBUFFERSPROC _wglSwapLayerBuffers;
>+extern PFNWGLUSEFONTBITMAPSPROC _wglUseFontBitmaps;
>+extern PFNWGLUSEFONTBITMAPSAPROC _wglUseFontBitmapsA;
>+extern PFNWGLUSEFONTBITMAPSWPROC _wglUseFontBitmapsW;
>+extern PFNWGLUSEFONTOUTLINESPROC _wglUseFontOutlines;
>+extern PFNWGLUSEFONTOUTLINESAPROC _wglUseFontOutlinesA;
>+extern PFNWGLUSEFONTOUTLINESWPROC _wglUseFontOutlinesW;
>+extern PFNWGLCREATECONTEXTATTRIBSARBPROC _wglCreateContextAttribsARB;
>+extern PFNWGLGETEXTENSIONSSTRINGARBPROC _wglGetExtensionsStringARB;
>+extern PFNWGLGETSWAPINTERVALEXTPROC _wglGetSwapIntervalEXT;
>+extern PFNWGLSWAPINTERVALEXTPROC _wglSwapIntervalEXT;
>+
>+namespace angle
>+{
>+using GenericProc = void (*)();
>+using LoadProc    = GenericProc(KHRONOS_APIENTRY *)(const char *);
>+void LoadWGL(LoadProc loadProc);
>+}  // namespace angle
>+
>+#endif  // UTIL_WINDOWS_WGL_LOADER_AUTOGEN_H_
>diff --git a/Source/ThirdParty/ANGLE/util/windows/win32/Win32Pixmap.cpp b/Source/ThirdParty/ANGLE/util/windows/win32/Win32Pixmap.cpp
>index 8015131637e..ad4ad2b9290 100644
>--- a/Source/ThirdParty/ANGLE/util/windows/win32/Win32Pixmap.cpp
>+++ b/Source/ThirdParty/ANGLE/util/windows/win32/Win32Pixmap.cpp
>@@ -6,11 +6,9 @@
> 
> // Win32Pixmap.cpp: Implementation of OSPixmap for Win32 (Windows)
> 
>-#include "windows/win32/Win32Pixmap.h"
>+#include "util/windows/win32/Win32Pixmap.h"
> 
>-Win32Pixmap::Win32Pixmap() : mBitmap(nullptr)
>-{
>-}
>+Win32Pixmap::Win32Pixmap() : mBitmap(nullptr) {}
> 
> Win32Pixmap::~Win32Pixmap()
> {
>@@ -43,7 +41,7 @@ bool Win32Pixmap::initialize(EGLNativeDisplayType display, size_t width, size_t
>     bitmapInfo.bmiHeader.biClrImportant  = 0;
> 
>     void *bitmapPtr = nullptr;
>-    mBitmap         = CreateDIBSection(display, &bitmapInfo, DIB_RGB_COLORS, &bitmapPtr, nullptr, 0);
>+    mBitmap = CreateDIBSection(display, &bitmapInfo, DIB_RGB_COLORS, &bitmapPtr, nullptr, 0);
> 
>     return mBitmap != nullptr;
> }
>diff --git a/Source/ThirdParty/ANGLE/util/windows/win32/Win32Pixmap.h b/Source/ThirdParty/ANGLE/util/windows/win32/Win32Pixmap.h
>index 7e14f8a11c8..4d1bf42f1fd 100644
>--- a/Source/ThirdParty/ANGLE/util/windows/win32/Win32Pixmap.h
>+++ b/Source/ThirdParty/ANGLE/util/windows/win32/Win32Pixmap.h
>@@ -11,7 +11,7 @@
> 
> #include <windows.h>
> 
>-#include "OSPixmap.h"
>+#include "util/OSPixmap.h"
> 
> class Win32Pixmap : public OSPixmap
> {
>diff --git a/Source/ThirdParty/ANGLE/util/windows/win32/Win32Window.cpp b/Source/ThirdParty/ANGLE/util/windows/win32/Win32Window.cpp
>index ee848f1f318..c7317cb188b 100644
>--- a/Source/ThirdParty/ANGLE/util/windows/win32/Win32Window.cpp
>+++ b/Source/ThirdParty/ANGLE/util/windows/win32/Win32Window.cpp
>@@ -6,7 +6,7 @@
> 
> // Win32Window.cpp: Implementation of OSWindow for Win32 (Windows)
> 
>-#include "windows/win32/Win32Window.h"
>+#include "util/windows/win32/Win32Window.h"
> 
> #include <sstream>
> 
>@@ -325,7 +325,7 @@ LRESULT CALLBACK Win32Window::WndProc(HWND hWnd, UINT message, WPARAM wParam, LP
>                 event.Type        = down ? Event::EVENT_KEY_PRESSED : Event::EVENT_KEY_RELEASED;
>                 event.Key.Alt     = HIWORD(GetAsyncKeyState(VK_MENU)) != 0;
>                 event.Key.Control = HIWORD(GetAsyncKeyState(VK_CONTROL)) != 0;
>-                event.Key.Shift = HIWORD(GetAsyncKeyState(VK_SHIFT)) != 0;
>+                event.Key.Shift   = HIWORD(GetAsyncKeyState(VK_SHIFT)) != 0;
>                 event.Key.System =
>                     HIWORD(GetAsyncKeyState(VK_LWIN)) || HIWORD(GetAsyncKeyState(VK_RWIN));
>                 event.Key.Code = VirtualKeyCodeToKey(wParam, lParam);
>@@ -350,7 +350,7 @@ LRESULT CALLBACK Win32Window::WndProc(HWND hWnd, UINT message, WPARAM wParam, LP
>                 event.Type               = Event::EVENT_MOUSE_BUTTON_PRESSED;
>                 event.MouseButton.Button = MOUSEBUTTON_LEFT;
>                 event.MouseButton.X      = static_cast<short>(LOWORD(lParam));
>-                event.MouseButton.Y = static_cast<short>(HIWORD(lParam));
>+                event.MouseButton.Y      = static_cast<short>(HIWORD(lParam));
>                 window->pushEvent(event);
>                 break;
>             }
>@@ -361,7 +361,7 @@ LRESULT CALLBACK Win32Window::WndProc(HWND hWnd, UINT message, WPARAM wParam, LP
>                 event.Type               = Event::EVENT_MOUSE_BUTTON_RELEASED;
>                 event.MouseButton.Button = MOUSEBUTTON_LEFT;
>                 event.MouseButton.X      = static_cast<short>(LOWORD(lParam));
>-                event.MouseButton.Y = static_cast<short>(HIWORD(lParam));
>+                event.MouseButton.Y      = static_cast<short>(HIWORD(lParam));
>                 window->pushEvent(event);
>                 break;
>             }
>@@ -373,7 +373,7 @@ LRESULT CALLBACK Win32Window::WndProc(HWND hWnd, UINT message, WPARAM wParam, LP
>                 event.Type               = Event::EVENT_MOUSE_BUTTON_PRESSED;
>                 event.MouseButton.Button = MOUSEBUTTON_RIGHT;
>                 event.MouseButton.X      = static_cast<short>(LOWORD(lParam));
>-                event.MouseButton.Y = static_cast<short>(HIWORD(lParam));
>+                event.MouseButton.Y      = static_cast<short>(HIWORD(lParam));
>                 window->pushEvent(event);
>                 break;
>             }
>@@ -385,7 +385,7 @@ LRESULT CALLBACK Win32Window::WndProc(HWND hWnd, UINT message, WPARAM wParam, LP
>                 event.Type               = Event::EVENT_MOUSE_BUTTON_RELEASED;
>                 event.MouseButton.Button = MOUSEBUTTON_RIGHT;
>                 event.MouseButton.X      = static_cast<short>(LOWORD(lParam));
>-                event.MouseButton.Y = static_cast<short>(HIWORD(lParam));
>+                event.MouseButton.Y      = static_cast<short>(HIWORD(lParam));
>                 window->pushEvent(event);
>                 break;
>             }
>@@ -398,7 +398,7 @@ LRESULT CALLBACK Win32Window::WndProc(HWND hWnd, UINT message, WPARAM wParam, LP
>                 event.Type               = Event::EVENT_MOUSE_BUTTON_PRESSED;
>                 event.MouseButton.Button = MOUSEBUTTON_MIDDLE;
>                 event.MouseButton.X      = static_cast<short>(LOWORD(lParam));
>-                event.MouseButton.Y = static_cast<short>(HIWORD(lParam));
>+                event.MouseButton.Y      = static_cast<short>(HIWORD(lParam));
>                 window->pushEvent(event);
>                 break;
>             }
>@@ -410,7 +410,7 @@ LRESULT CALLBACK Win32Window::WndProc(HWND hWnd, UINT message, WPARAM wParam, LP
>                 event.Type               = Event::EVENT_MOUSE_BUTTON_RELEASED;
>                 event.MouseButton.Button = MOUSEBUTTON_MIDDLE;
>                 event.MouseButton.X      = static_cast<short>(LOWORD(lParam));
>-                event.MouseButton.Y = static_cast<short>(HIWORD(lParam));
>+                event.MouseButton.Y      = static_cast<short>(HIWORD(lParam));
>                 window->pushEvent(event);
>                 break;
>             }
>@@ -491,8 +491,7 @@ Win32Window::Win32Window()
>       mNativeWindow(0),
>       mParentWindow(0),
>       mNativeDisplay(0)
>-{
>-}
>+{}
> 
> Win32Window::~Win32Window()
> {
>@@ -550,8 +549,8 @@ bool Win32Window::initialize(const std::string &name, size_t width, size_t heigh
>         return false;
>     }
> 
>-    DWORD parentStyle         = WS_CAPTION | WS_THICKFRAME | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_SYSMENU;
>-    DWORD parentExtendedStyle = WS_EX_APPWINDOW;
>+    DWORD parentStyle = WS_CAPTION | WS_THICKFRAME | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_SYSMENU;
>+    DWORD parentExtendedStyle = WS_EX_APPWINDOW | WS_EX_TOOLWINDOW;
> 
>     RECT sizeRect = {0, 0, static_cast<LONG>(width), static_cast<LONG>(height)};
>     AdjustWindowRectEx(&sizeRect, parentStyle, FALSE, parentExtendedStyle);
>@@ -679,9 +678,9 @@ bool Win32Window::takeScreenshot(uint8_t *pixelData)
>         bitmapInfo.biYPelsPerMeter = 0;
>         bitmapInfo.biClrUsed       = 0;
>         bitmapInfo.biClrImportant  = 0;
>-        int getBitsResult = GetDIBits(screenDC, tmpBitmap, 0, mHeight, pixelData,
>+        int getBitsResult          = GetDIBits(screenDC, tmpBitmap, 0, mHeight, pixelData,
>                                       reinterpret_cast<BITMAPINFO *>(&bitmapInfo), DIB_RGB_COLORS);
>-        error = (getBitsResult == 0);
>+        error                      = (getBitsResult == 0);
>     }
> 
>     if (tmpBitmap != nullptr)
>@@ -704,6 +703,8 @@ bool Win32Window::takeScreenshot(uint8_t *pixelData)
>     return !error;
> }
> 
>+void Win32Window::resetNativeWindow() {}
>+
> EGLNativeWindowType Win32Window::getNativeWindow() const
> {
>     return mNativeWindow;
>@@ -737,11 +738,6 @@ void Win32Window::setMousePosition(int x, int y)
>     SetCursorPos(topLeft.x + x, topLeft.y + y);
> }
> 
>-OSWindow *CreateOSWindow()
>-{
>-    return new Win32Window();
>-}
>-
> bool Win32Window::setPosition(int x, int y)
> {
>     if (mX == x && mY == y)
>@@ -831,3 +827,9 @@ void Win32Window::signalTestEvent()
> {
>     PostMessage(mNativeWindow, WM_USER, 0, 0);
> }
>+
>+// static
>+OSWindow *OSWindow::New()
>+{
>+    return new Win32Window();
>+}
>diff --git a/Source/ThirdParty/ANGLE/util/windows/win32/Win32Window.h b/Source/ThirdParty/ANGLE/util/windows/win32/Win32Window.h
>index c0904e930e2..1846a1fe171 100644
>--- a/Source/ThirdParty/ANGLE/util/windows/win32/Win32Window.h
>+++ b/Source/ThirdParty/ANGLE/util/windows/win32/Win32Window.h
>@@ -12,8 +12,8 @@
> #include <windows.h>
> #include <string>
> 
>-#include "OSWindow.h"
>-#include "Timer.h"
>+#include "util/OSWindow.h"
>+#include "util/Timer.h"
> 
> class Win32Window : public OSWindow
> {
>@@ -26,6 +26,7 @@ class Win32Window : public OSWindow
> 
>     bool takeScreenshot(uint8_t *pixelData) override;
> 
>+    void resetNativeWindow() override;
>     EGLNativeWindowType getNativeWindow() const override;
>     EGLNativeDisplayType getNativeDisplay() const override;
> 
>diff --git a/Source/ThirdParty/ANGLE/util/windows/win32/Win32_system_utils.cpp b/Source/ThirdParty/ANGLE/util/windows/win32/Win32_system_utils.cpp
>index a9fd97fe731..3be713d5225 100644
>--- a/Source/ThirdParty/ANGLE/util/windows/win32/Win32_system_utils.cpp
>+++ b/Source/ThirdParty/ANGLE/util/windows/win32/Win32_system_utils.cpp
>@@ -6,7 +6,7 @@
> 
> // Win32_system_utils.cpp: Implementation of OS-specific functions for Win32 (Windows)
> 
>-#include "system_utils.h"
>+#include "util/system_utils.h"
> 
> #include <windows.h>
> #include <array>
>@@ -19,45 +19,21 @@ void SetLowPriorityProcess()
>     SetPriorityClass(GetCurrentProcess(), BELOW_NORMAL_PRIORITY_CLASS);
> }
> 
>-class Win32Library : public Library
>+bool StabilizeCPUForBenchmarking()
> {
>-  public:
>-    Win32Library(const std::string &libraryName);
>-    ~Win32Library() override;
>-
>-    void *getSymbol(const std::string &symbolName) override;
>-
>-  private:
>-    HMODULE mModule;
>-};
>-
>-Win32Library::Win32Library(const std::string &libraryName) : mModule(nullptr)
>-{
>-    const auto &fullName = libraryName + "." + GetSharedLibraryExtension();
>-    mModule              = LoadLibraryA(fullName.c_str());
>-}
>-
>-Win32Library::~Win32Library()
>-{
>-    if (mModule)
>+    if (SetThreadAffinityMask(GetCurrentThread(), 1) == 0)
>     {
>-        FreeLibrary(mModule);
>+        return false;
>     }
>-}
>-
>-void *Win32Library::getSymbol(const std::string &symbolName)
>-{
>-    if (!mModule)
>+    if (SetPriorityClass(GetCurrentProcess(), REALTIME_PRIORITY_CLASS) == FALSE)
>     {
>-        return nullptr;
>+        return false;
>+    }
>+    if (SetThreadPriority(GetCurrentThread(), THREAD_PRIORITY_TIME_CRITICAL) == FALSE)
>+    {
>+        return false;
>     }
> 
>-    return GetProcAddress(mModule, symbolName.c_str());
>-}
>-
>-Library *loadLibrary(const std::string &libraryName)
>-{
>-    return new Win32Library(libraryName);
>+    return true;
> }
>-
> }  // namespace angle
>diff --git a/Source/ThirdParty/ANGLE/util/windows/winrt/WinRTWindow.cpp b/Source/ThirdParty/ANGLE/util/windows/winrt/WinRTWindow.cpp
>index 33f76a29fba..11f0551d8f2 100644
>--- a/Source/ThirdParty/ANGLE/util/windows/winrt/WinRTWindow.cpp
>+++ b/Source/ThirdParty/ANGLE/util/windows/winrt/WinRTWindow.cpp
>@@ -8,9 +8,9 @@
> 
> #include "windows/winrt/WinRTWindow.h"
> 
>-#include <wrl.h>
> #include <windows.applicationmodel.core.h>
> #include <windows.ui.xaml.h>
>+#include <wrl.h>
> 
> #include "angle_windowsstore.h"
> #include "common/debug.h"
>@@ -22,9 +22,7 @@ using namespace ABI::Windows::UI::Core;
> using namespace Microsoft::WRL;
> using namespace Microsoft::WRL::Wrappers;
> 
>-WinRTWindow::WinRTWindow() : mNativeWindow(nullptr)
>-{
>-}
>+WinRTWindow::WinRTWindow() : mNativeWindow(nullptr) {}
> 
> WinRTWindow::~WinRTWindow()
> {
>@@ -50,8 +48,8 @@ bool WinRTWindow::initialize(const std::string &name, size_t width, size_t heigh
>     destroy();
> 
>     // Get all the relevant activation factories
>-    result = GetActivationFactory(
>-        HStringReference(RuntimeClass_Windows_UI_Core_CoreWindow).Get(), &coreWindowStatic);
>+    result = GetActivationFactory(HStringReference(RuntimeClass_Windows_UI_Core_CoreWindow).Get(),
>+                                  &coreWindowStatic);
>     if (FAILED(result))
>     {
>         return false;
>@@ -90,7 +88,7 @@ bool WinRTWindow::initialize(const std::string &name, size_t width, size_t heigh
> 
>     // Get the PropertySet as a map, so we can Insert things into it later
>     ComPtr<IInspectable> tempNativeWindow = mNativeWindow;
>-    result = tempNativeWindow.As(&nativeWindowAsMap);
>+    result                                = tempNativeWindow.As(&nativeWindowAsMap);
>     if (FAILED(result))
>     {
>         return false;
>@@ -195,7 +193,7 @@ bool WinRTWindow::initialize(const std::string &name, size_t width, size_t heigh
>     Size renderSize;
>     renderSize.Width  = static_cast<float>(width);
>     renderSize.Height = static_cast<float>(height);
>-    result = propertyValueStatics->CreateSize(renderSize, sizeValue.GetAddressOf());
>+    result            = propertyValueStatics->CreateSize(renderSize, sizeValue.GetAddressOf());
>     if (FAILED(result))
>     {
>         return false;
>@@ -219,6 +217,8 @@ void WinRTWindow::destroy()
>     mCoreDispatcher.Reset();
> }
> 
>+void WinRTWindow::resetNativeWindow() {}
>+
> EGLNativeWindowType WinRTWindow::getNativeWindow() const
> {
>     return mNativeWindow;
>@@ -278,7 +278,7 @@ void WinRTWindow::signalTestEvent()
>     UNIMPLEMENTED();
> }
> 
>-OSWindow *CreateOSWindow()
>+OSWindow *OSWindow::New()
> {
>     return new WinRTWindow();
> }
>\ No newline at end of file
>diff --git a/Source/ThirdParty/ANGLE/util/windows/winrt/WinRTWindow.h b/Source/ThirdParty/ANGLE/util/windows/winrt/WinRTWindow.h
>index 9eabc049d85..1a78c6ab200 100644
>--- a/Source/ThirdParty/ANGLE/util/windows/winrt/WinRTWindow.h
>+++ b/Source/ThirdParty/ANGLE/util/windows/winrt/WinRTWindow.h
>@@ -25,6 +25,7 @@ class WinRTWindow : public OSWindow
>     bool initialize(const std::string &name, size_t width, size_t height) override;
>     void destroy() override;
> 
>+    void resetNativeWindow() override;
>     EGLNativeWindowType getNativeWindow() const override;
>     EGLNativeDisplayType getNativeDisplay() const override;
> 
>diff --git a/Source/ThirdParty/ANGLE/util/windows/winrt/WinRT_system_utils.cpp b/Source/ThirdParty/ANGLE/util/windows/winrt/WinRT_system_utils.cpp
>index 8513bacd915..dacd09b4960 100644
>--- a/Source/ThirdParty/ANGLE/util/windows/winrt/WinRT_system_utils.cpp
>+++ b/Source/ThirdParty/ANGLE/util/windows/winrt/WinRT_system_utils.cpp
>@@ -19,10 +19,9 @@ void SetLowPriorityProcess()
>     // No equivalent to this in WinRT
> }
> 
>-Library *loadLibrary(const std::string &libraryName)
>+bool StabilizeCPUForBenchmarking()
> {
>-    // WinRT cannot load code dynamically.
>-    return nullptr;
>+    // No equivalent to this in WinRT
>+    return true;
> }
>-
> }  // namespace angle
>diff --git a/Source/ThirdParty/ANGLE/util/x11/X11Pixmap.cpp b/Source/ThirdParty/ANGLE/util/x11/X11Pixmap.cpp
>index 943527a1ff0..a3be53a6bdb 100644
>--- a/Source/ThirdParty/ANGLE/util/x11/X11Pixmap.cpp
>+++ b/Source/ThirdParty/ANGLE/util/x11/X11Pixmap.cpp
>@@ -6,13 +6,9 @@
> 
> // X11Pixmap.cpp: Implementation of OSPixmap for X11
> 
>-#include "x11/X11Pixmap.h"
>+#include "util/x11/X11Pixmap.h"
> 
>-X11Pixmap::X11Pixmap()
>-  : mPixmap(0),
>-    mDisplay(nullptr)
>-{
>-}
>+X11Pixmap::X11Pixmap() : mPixmap(0), mDisplay(nullptr) {}
> 
> X11Pixmap::~X11Pixmap()
> {
>@@ -26,7 +22,7 @@ bool X11Pixmap::initialize(EGLNativeDisplayType display, size_t width, size_t he
> {
>     mDisplay = display;
> 
>-    int screen = DefaultScreen(mDisplay);
>+    int screen  = DefaultScreen(mDisplay);
>     Window root = RootWindow(mDisplay, screen);
> 
>     mPixmap = XCreatePixmap(mDisplay, root, width, height, depth);
>diff --git a/Source/ThirdParty/ANGLE/util/x11/X11Pixmap.h b/Source/ThirdParty/ANGLE/util/x11/X11Pixmap.h
>index fd12db624b0..3ccb27e4939 100644
>--- a/Source/ThirdParty/ANGLE/util/x11/X11Pixmap.h
>+++ b/Source/ThirdParty/ANGLE/util/x11/X11Pixmap.h
>@@ -12,7 +12,7 @@
> #include <X11/Xlib.h>
> #include <X11/Xutil.h>
> 
>-#include "OSPixmap.h"
>+#include "util/OSPixmap.h"
> 
> class X11Pixmap : public OSPixmap
> {
>@@ -29,4 +29,4 @@ class X11Pixmap : public OSPixmap
>     Display *mDisplay;
> };
> 
>-#endif // UTIL_X11_PIXMAP_H_
>+#endif  // UTIL_X11_PIXMAP_H_
>diff --git a/Source/ThirdParty/ANGLE/util/x11/X11Window.cpp b/Source/ThirdParty/ANGLE/util/x11/X11Window.cpp
>index 91461d5be30..d50067eef2b 100644
>--- a/Source/ThirdParty/ANGLE/util/x11/X11Window.cpp
>+++ b/Source/ThirdParty/ANGLE/util/x11/X11Window.cpp
>@@ -6,13 +6,14 @@
> 
> // X11Window.cpp: Implementation of OSWindow for X11
> 
>-#include "x11/X11Window.h"
>+#include "util/x11/X11Window.h"
> 
> #include "common/debug.h"
>-#include "system_utils.h"
>-#include "Timer.h"
>+#include "util/Timer.h"
>+#include "util/system_utils.h"
> 
>-namespace {
>+namespace
>+{
> 
> Bool WaitForMapNotify(Display *dpy, XEvent *event, XPointer window)
> {
>@@ -30,112 +31,212 @@ static Key X11CodeToKey(Display *display, unsigned int scancode)
> 
>     switch (keySymbol)
>     {
>-      case XK_Shift_L:     return KEY_LSHIFT;
>-      case XK_Shift_R:     return KEY_RSHIFT;
>-      case XK_Alt_L:       return KEY_LALT;
>-      case XK_Alt_R:       return KEY_RALT;
>-      case XK_Control_L:   return KEY_LCONTROL;
>-      case XK_Control_R:   return KEY_RCONTROL;
>-      case XK_Super_L:     return KEY_LSYSTEM;
>-      case XK_Super_R:     return KEY_RSYSTEM;
>-      case XK_Menu:        return KEY_MENU;
>-
>-      case XK_semicolon:   return KEY_SEMICOLON;
>-      case XK_slash:       return KEY_SLASH;
>-      case XK_equal:       return KEY_EQUAL;
>-      case XK_minus:       return KEY_DASH;
>-      case XK_bracketleft: return KEY_LBRACKET;
>-      case XK_bracketright:return KEY_RBRACKET;
>-      case XK_comma:       return KEY_COMMA;
>-      case XK_period:      return KEY_PERIOD;
>-      case XK_backslash:   return KEY_BACKSLASH;
>-      case XK_asciitilde:  return KEY_TILDE;
>-      case XK_Escape:      return KEY_ESCAPE;
>-      case XK_space:       return KEY_SPACE;
>-      case XK_Return:      return KEY_RETURN;
>-      case XK_BackSpace:   return KEY_BACK;
>-      case XK_Tab:         return KEY_TAB;
>-      case XK_Page_Up:     return KEY_PAGEUP;
>-      case XK_Page_Down:   return KEY_PAGEDOWN;
>-      case XK_End:         return KEY_END;
>-      case XK_Home:        return KEY_HOME;
>-      case XK_Insert:      return KEY_INSERT;
>-      case XK_Delete:      return KEY_DELETE;
>-      case XK_KP_Add:      return KEY_ADD;
>-      case XK_KP_Subtract: return KEY_SUBTRACT;
>-      case XK_KP_Multiply: return KEY_MULTIPLY;
>-      case XK_KP_Divide:   return KEY_DIVIDE;
>-      case XK_Pause:       return KEY_PAUSE;
>-
>-      case XK_F1:          return KEY_F1;
>-      case XK_F2:          return KEY_F2;
>-      case XK_F3:          return KEY_F3;
>-      case XK_F4:          return KEY_F4;
>-      case XK_F5:          return KEY_F5;
>-      case XK_F6:          return KEY_F6;
>-      case XK_F7:          return KEY_F7;
>-      case XK_F8:          return KEY_F8;
>-      case XK_F9:          return KEY_F9;
>-      case XK_F10:         return KEY_F10;
>-      case XK_F11:         return KEY_F11;
>-      case XK_F12:         return KEY_F12;
>-      case XK_F13:         return KEY_F13;
>-      case XK_F14:         return KEY_F14;
>-      case XK_F15:         return KEY_F15;
>-
>-      case XK_Left:        return KEY_LEFT;
>-      case XK_Right:       return KEY_RIGHT;
>-      case XK_Down:        return KEY_DOWN;
>-      case XK_Up:          return KEY_UP;
>-
>-      case XK_KP_Insert:   return KEY_NUMPAD0;
>-      case XK_KP_End:      return KEY_NUMPAD1;
>-      case XK_KP_Down:     return KEY_NUMPAD2;
>-      case XK_KP_Page_Down:return KEY_NUMPAD3;
>-      case XK_KP_Left:     return KEY_NUMPAD4;
>-      case XK_KP_5:        return KEY_NUMPAD5;
>-      case XK_KP_Right:    return KEY_NUMPAD6;
>-      case XK_KP_Home:     return KEY_NUMPAD7;
>-      case XK_KP_Up:       return KEY_NUMPAD8;
>-      case XK_KP_Page_Up:  return KEY_NUMPAD9;
>-
>-      case XK_a:           return KEY_A;
>-      case XK_b:           return KEY_B;
>-      case XK_c:           return KEY_C;
>-      case XK_d:           return KEY_D;
>-      case XK_e:           return KEY_E;
>-      case XK_f:           return KEY_F;
>-      case XK_g:           return KEY_G;
>-      case XK_h:           return KEY_H;
>-      case XK_i:           return KEY_I;
>-      case XK_j:           return KEY_J;
>-      case XK_k:           return KEY_K;
>-      case XK_l:           return KEY_L;
>-      case XK_m:           return KEY_M;
>-      case XK_n:           return KEY_N;
>-      case XK_o:           return KEY_O;
>-      case XK_p:           return KEY_P;
>-      case XK_q:           return KEY_Q;
>-      case XK_r:           return KEY_R;
>-      case XK_s:           return KEY_S;
>-      case XK_t:           return KEY_T;
>-      case XK_u:           return KEY_U;
>-      case XK_v:           return KEY_V;
>-      case XK_w:           return KEY_W;
>-      case XK_x:           return KEY_X;
>-      case XK_y:           return KEY_Y;
>-      case XK_z:           return KEY_Z;
>-
>-      case XK_1:           return KEY_NUM1;
>-      case XK_2:           return KEY_NUM2;
>-      case XK_3:           return KEY_NUM3;
>-      case XK_4:           return KEY_NUM4;
>-      case XK_5:           return KEY_NUM5;
>-      case XK_6:           return KEY_NUM6;
>-      case XK_7:           return KEY_NUM7;
>-      case XK_8:           return KEY_NUM8;
>-      case XK_9:           return KEY_NUM9;
>-      case XK_0:           return KEY_NUM0;
>+        case XK_Shift_L:
>+            return KEY_LSHIFT;
>+        case XK_Shift_R:
>+            return KEY_RSHIFT;
>+        case XK_Alt_L:
>+            return KEY_LALT;
>+        case XK_Alt_R:
>+            return KEY_RALT;
>+        case XK_Control_L:
>+            return KEY_LCONTROL;
>+        case XK_Control_R:
>+            return KEY_RCONTROL;
>+        case XK_Super_L:
>+            return KEY_LSYSTEM;
>+        case XK_Super_R:
>+            return KEY_RSYSTEM;
>+        case XK_Menu:
>+            return KEY_MENU;
>+
>+        case XK_semicolon:
>+            return KEY_SEMICOLON;
>+        case XK_slash:
>+            return KEY_SLASH;
>+        case XK_equal:
>+            return KEY_EQUAL;
>+        case XK_minus:
>+            return KEY_DASH;
>+        case XK_bracketleft:
>+            return KEY_LBRACKET;
>+        case XK_bracketright:
>+            return KEY_RBRACKET;
>+        case XK_comma:
>+            return KEY_COMMA;
>+        case XK_period:
>+            return KEY_PERIOD;
>+        case XK_backslash:
>+            return KEY_BACKSLASH;
>+        case XK_asciitilde:
>+            return KEY_TILDE;
>+        case XK_Escape:
>+            return KEY_ESCAPE;
>+        case XK_space:
>+            return KEY_SPACE;
>+        case XK_Return:
>+            return KEY_RETURN;
>+        case XK_BackSpace:
>+            return KEY_BACK;
>+        case XK_Tab:
>+            return KEY_TAB;
>+        case XK_Page_Up:
>+            return KEY_PAGEUP;
>+        case XK_Page_Down:
>+            return KEY_PAGEDOWN;
>+        case XK_End:
>+            return KEY_END;
>+        case XK_Home:
>+            return KEY_HOME;
>+        case XK_Insert:
>+            return KEY_INSERT;
>+        case XK_Delete:
>+            return KEY_DELETE;
>+        case XK_KP_Add:
>+            return KEY_ADD;
>+        case XK_KP_Subtract:
>+            return KEY_SUBTRACT;
>+        case XK_KP_Multiply:
>+            return KEY_MULTIPLY;
>+        case XK_KP_Divide:
>+            return KEY_DIVIDE;
>+        case XK_Pause:
>+            return KEY_PAUSE;
>+
>+        case XK_F1:
>+            return KEY_F1;
>+        case XK_F2:
>+            return KEY_F2;
>+        case XK_F3:
>+            return KEY_F3;
>+        case XK_F4:
>+            return KEY_F4;
>+        case XK_F5:
>+            return KEY_F5;
>+        case XK_F6:
>+            return KEY_F6;
>+        case XK_F7:
>+            return KEY_F7;
>+        case XK_F8:
>+            return KEY_F8;
>+        case XK_F9:
>+            return KEY_F9;
>+        case XK_F10:
>+            return KEY_F10;
>+        case XK_F11:
>+            return KEY_F11;
>+        case XK_F12:
>+            return KEY_F12;
>+        case XK_F13:
>+            return KEY_F13;
>+        case XK_F14:
>+            return KEY_F14;
>+        case XK_F15:
>+            return KEY_F15;
>+
>+        case XK_Left:
>+            return KEY_LEFT;
>+        case XK_Right:
>+            return KEY_RIGHT;
>+        case XK_Down:
>+            return KEY_DOWN;
>+        case XK_Up:
>+            return KEY_UP;
>+
>+        case XK_KP_Insert:
>+            return KEY_NUMPAD0;
>+        case XK_KP_End:
>+            return KEY_NUMPAD1;
>+        case XK_KP_Down:
>+            return KEY_NUMPAD2;
>+        case XK_KP_Page_Down:
>+            return KEY_NUMPAD3;
>+        case XK_KP_Left:
>+            return KEY_NUMPAD4;
>+        case XK_KP_5:
>+            return KEY_NUMPAD5;
>+        case XK_KP_Right:
>+            return KEY_NUMPAD6;
>+        case XK_KP_Home:
>+            return KEY_NUMPAD7;
>+        case XK_KP_Up:
>+            return KEY_NUMPAD8;
>+        case XK_KP_Page_Up:
>+            return KEY_NUMPAD9;
>+
>+        case XK_a:
>+            return KEY_A;
>+        case XK_b:
>+            return KEY_B;
>+        case XK_c:
>+            return KEY_C;
>+        case XK_d:
>+            return KEY_D;
>+        case XK_e:
>+            return KEY_E;
>+        case XK_f:
>+            return KEY_F;
>+        case XK_g:
>+            return KEY_G;
>+        case XK_h:
>+            return KEY_H;
>+        case XK_i:
>+            return KEY_I;
>+        case XK_j:
>+            return KEY_J;
>+        case XK_k:
>+            return KEY_K;
>+        case XK_l:
>+            return KEY_L;
>+        case XK_m:
>+            return KEY_M;
>+        case XK_n:
>+            return KEY_N;
>+        case XK_o:
>+            return KEY_O;
>+        case XK_p:
>+            return KEY_P;
>+        case XK_q:
>+            return KEY_Q;
>+        case XK_r:
>+            return KEY_R;
>+        case XK_s:
>+            return KEY_S;
>+        case XK_t:
>+            return KEY_T;
>+        case XK_u:
>+            return KEY_U;
>+        case XK_v:
>+            return KEY_V;
>+        case XK_w:
>+            return KEY_W;
>+        case XK_x:
>+            return KEY_X;
>+        case XK_y:
>+            return KEY_Y;
>+        case XK_z:
>+            return KEY_Z;
>+
>+        case XK_1:
>+            return KEY_NUM1;
>+        case XK_2:
>+            return KEY_NUM2;
>+        case XK_3:
>+            return KEY_NUM3;
>+        case XK_4:
>+            return KEY_NUM4;
>+        case XK_5:
>+            return KEY_NUM5;
>+        case XK_6:
>+            return KEY_NUM6;
>+        case XK_7:
>+            return KEY_NUM7;
>+        case XK_8:
>+            return KEY_NUM8;
>+        case XK_9:
>+            return KEY_NUM9;
>+        case XK_0:
>+            return KEY_NUM0;
>     }
> 
>     return Key(0);
>@@ -143,13 +244,13 @@ static Key X11CodeToKey(Display *display, unsigned int scancode)
> 
> static void AddX11KeyStateToEvent(Event *event, unsigned int state)
> {
>-    event->Key.Shift = state & ShiftMask;
>+    event->Key.Shift   = state & ShiftMask;
>     event->Key.Control = state & ControlMask;
>-    event->Key.Alt = state & Mod1Mask;
>-    event->Key.System = state & Mod4Mask;
>+    event->Key.Alt     = state & Mod1Mask;
>+    event->Key.System  = state & Mod4Mask;
> }
> 
>-}
>+}  // namespace
> 
> X11Window::X11Window()
>     : WM_DELETE_WINDOW(None),
>@@ -159,8 +260,7 @@ X11Window::X11Window()
>       mWindow(0),
>       mRequestedVisualId(-1),
>       mVisible(false)
>-{
>-}
>+{}
> 
> X11Window::X11Window(int visualId)
>     : WM_DELETE_WINDOW(None),
>@@ -170,8 +270,7 @@ X11Window::X11Window(int visualId)
>       mWindow(0),
>       mRequestedVisualId(visualId),
>       mVisible(false)
>-{
>-}
>+{}
> 
> X11Window::~X11Window()
> {
>@@ -189,7 +288,7 @@ bool X11Window::initialize(const std::string &name, size_t width, size_t height)
>     }
> 
>     {
>-        int screen = DefaultScreen(mDisplay);
>+        int screen  = DefaultScreen(mDisplay);
>         Window root = RootWindow(mDisplay, screen);
> 
>         Visual *visual;
>@@ -202,8 +301,9 @@ bool X11Window::initialize(const std::string &name, size_t width, size_t height)
>             XVisualInfo visualTemplate;
>             visualTemplate.visualid = mRequestedVisualId;
> 
>-            int numVisuals       = 0;
>-            XVisualInfo *visuals = XGetVisualInfo(mDisplay, VisualIDMask, &visualTemplate, &numVisuals);
>+            int numVisuals = 0;
>+            XVisualInfo *visuals =
>+                XGetVisualInfo(mDisplay, VisualIDMask, &visualTemplate, &numVisuals);
>             if (numVisuals <= 0)
>             {
>                 return false;
>@@ -214,7 +314,7 @@ bool X11Window::initialize(const std::string &name, size_t width, size_t height)
>             XFree(visuals);
>         }
> 
>-        int depth = DefaultDepth(mDisplay, screen);
>+        int depth         = DefaultDepth(mDisplay, screen);
>         Colormap colormap = XCreateColormap(mDisplay, root, visual, AllocNone);
> 
>         XSetWindowAttributes attributes;
>@@ -224,10 +324,10 @@ bool X11Window::initialize(const std::string &name, size_t width, size_t height)
>                                 ButtonReleaseMask | FocusChangeMask | EnterWindowMask |
>                                 LeaveWindowMask | KeyPressMask | KeyReleaseMask;
>         attributes.border_pixel = 0;
>-        attributes.colormap = colormap;
>+        attributes.colormap     = colormap;
> 
>-        mWindow = XCreateWindow(mDisplay, root, 0, 0, width, height, 0, depth, InputOutput,
>-                                visual, attributeMask, &attributes);
>+        mWindow = XCreateWindow(mDisplay, root, 0, 0, width, height, 0, depth, InputOutput, visual,
>+                                attributeMask, &attributes);
>         XFreeColormap(mDisplay, colormap);
>     }
> 
>@@ -240,14 +340,14 @@ bool X11Window::initialize(const std::string &name, size_t width, size_t height)
>     // Tell the window manager to notify us when the user wants to close the
>     // window so we can do it ourselves.
>     WM_DELETE_WINDOW = XInternAtom(mDisplay, "WM_DELETE_WINDOW", False);
>-    WM_PROTOCOLS = XInternAtom(mDisplay, "WM_PROTOCOLS", False);
>+    WM_PROTOCOLS     = XInternAtom(mDisplay, "WM_PROTOCOLS", False);
>     if (WM_DELETE_WINDOW == None || WM_PROTOCOLS == None)
>     {
>         destroy();
>         return false;
>     }
> 
>-    if(XSetWMProtocols(mDisplay, mWindow, &WM_DELETE_WINDOW, 1) == 0)
>+    if (XSetWMProtocols(mDisplay, mWindow, &WM_DELETE_WINDOW, 1) == 0)
>     {
>         destroy();
>         return false;
>@@ -263,9 +363,9 @@ bool X11Window::initialize(const std::string &name, size_t width, size_t height)
> 
>     XFlush(mDisplay);
> 
>-    mX = 0;
>-    mY = 0;
>-    mWidth = width;
>+    mX      = 0;
>+    mY      = 0;
>+    mWidth  = width;
>     mHeight = height;
> 
>     return true;
>@@ -284,9 +384,11 @@ void X11Window::destroy()
>         mDisplay = nullptr;
>     }
>     WM_DELETE_WINDOW = None;
>-    WM_PROTOCOLS = None;
>+    WM_PROTOCOLS     = None;
> }
> 
>+void X11Window::resetNativeWindow() {}
>+
> EGLNativeWindowType X11Window::getNativeWindow() const
> {
>     return mWindow;
>@@ -313,11 +415,6 @@ void X11Window::setMousePosition(int x, int y)
>     XWarpPointer(mDisplay, None, mWindow, 0, 0, 0, 0, x, y);
> }
> 
>-OSWindow *CreateOSWindow()
>-{
>-    return new X11Window();
>-}
>-
> bool X11Window::setPosition(int x, int y)
> {
>     XMoveWindow(mDisplay, mWindow, x, y);
>@@ -330,13 +427,13 @@ bool X11Window::resize(int width, int height)
>     XResizeWindow(mDisplay, mWindow, width, height);
>     XFlush(mDisplay);
> 
>-    Timer* timer = CreateTimer();
>+    Timer *timer = CreateTimer();
>     timer->start();
> 
>     // Wait until the window as actually been resized so that the code calling resize
>     // can assume the window has been resized.
>     const double kResizeWaitDelay = 0.2;
>-    while (mHeight != height && mWidth != width && timer->getElapsedTime() < kResizeWaitDelay)
>+    while ((mHeight != height || mWidth != width) && timer->getElapsedTime() < kResizeWaitDelay)
>     {
>         messageLoop();
>         angle::Sleep(10);
>@@ -376,13 +473,17 @@ void X11Window::setVisible(bool isVisible)
> void X11Window::signalTestEvent()
> {
>     XEvent event;
>-    event.type = ClientMessage;
>+    event.type                 = ClientMessage;
>     event.xclient.message_type = TEST_EVENT;
>     // Format needs to be valid or a BadValue is generated
>     event.xclient.format = 32;
> 
>     // Hijack StructureNotifyMask as we know we will be listening for it.
>     XSendEvent(mDisplay, mWindow, False, StructureNotifyMask, &event);
>+
>+    // For test events, the tests want to check that it really did arrive, and they don't wait
>+    // long.  XSync here makes sure the event is sent by the time the messageLoop() is called.
>+    XSync(mDisplay, false);
> }
> 
> void X11Window::processEvent(const XEvent &xEvent)
>@@ -390,123 +491,123 @@ void X11Window::processEvent(const XEvent &xEvent)
>     // TODO(cwallez) text events
>     switch (xEvent.type)
>     {
>-      case ButtonPress:
>+        case ButtonPress:
>         {
>             Event event;
>             MouseButton button = MOUSEBUTTON_UNKNOWN;
>-            int wheelY = 0;
>+            int wheelY         = 0;
> 
>             // The mouse wheel updates are sent via button events.
>             switch (xEvent.xbutton.button)
>             {
>-              case Button4:
>-                wheelY = 1;
>-                break;
>-              case Button5:
>-                wheelY = -1;
>-                break;
>-              case 6:
>-                break;
>-              case 7:
>-                break;
>-
>-              case Button1:
>-                button = MOUSEBUTTON_LEFT;
>-                break;
>-              case Button2:
>-                button = MOUSEBUTTON_MIDDLE;
>-                break;
>-              case Button3:
>-                button = MOUSEBUTTON_RIGHT;
>-                break;
>-              case 8:
>-                button = MOUSEBUTTON_BUTTON4;
>-                break;
>-              case 9:
>-                button = MOUSEBUTTON_BUTTON5;
>-                break;
>-
>-              default:
>-                break;
>+                case Button4:
>+                    wheelY = 1;
>+                    break;
>+                case Button5:
>+                    wheelY = -1;
>+                    break;
>+                case 6:
>+                    break;
>+                case 7:
>+                    break;
>+
>+                case Button1:
>+                    button = MOUSEBUTTON_LEFT;
>+                    break;
>+                case Button2:
>+                    button = MOUSEBUTTON_MIDDLE;
>+                    break;
>+                case Button3:
>+                    button = MOUSEBUTTON_RIGHT;
>+                    break;
>+                case 8:
>+                    button = MOUSEBUTTON_BUTTON4;
>+                    break;
>+                case 9:
>+                    button = MOUSEBUTTON_BUTTON5;
>+                    break;
>+
>+                default:
>+                    break;
>             }
> 
>             if (wheelY != 0)
>             {
>-                event.Type = Event::EVENT_MOUSE_WHEEL_MOVED;
>+                event.Type             = Event::EVENT_MOUSE_WHEEL_MOVED;
>                 event.MouseWheel.Delta = wheelY;
>                 pushEvent(event);
>             }
> 
>             if (button != MOUSEBUTTON_UNKNOWN)
>             {
>-                event.Type = Event::EVENT_MOUSE_BUTTON_RELEASED;
>+                event.Type               = Event::EVENT_MOUSE_BUTTON_RELEASED;
>                 event.MouseButton.Button = button;
>-                event.MouseButton.X = xEvent.xbutton.x;
>-                event.MouseButton.Y = xEvent.xbutton.y;
>+                event.MouseButton.X      = xEvent.xbutton.x;
>+                event.MouseButton.Y      = xEvent.xbutton.y;
>                 pushEvent(event);
>             }
>         }
>         break;
> 
>-      case ButtonRelease:
>+        case ButtonRelease:
>         {
>             Event event;
>             MouseButton button = MOUSEBUTTON_UNKNOWN;
> 
>             switch (xEvent.xbutton.button)
>             {
>-              case Button1:
>-                button = MOUSEBUTTON_LEFT;
>-                break;
>-              case Button2:
>-                button = MOUSEBUTTON_MIDDLE;
>-                break;
>-              case Button3:
>-                button = MOUSEBUTTON_RIGHT;
>-                break;
>-              case 8:
>-                button = MOUSEBUTTON_BUTTON4;
>-                break;
>-              case 9:
>-                button = MOUSEBUTTON_BUTTON5;
>-                break;
>-
>-              default:
>-                break;
>+                case Button1:
>+                    button = MOUSEBUTTON_LEFT;
>+                    break;
>+                case Button2:
>+                    button = MOUSEBUTTON_MIDDLE;
>+                    break;
>+                case Button3:
>+                    button = MOUSEBUTTON_RIGHT;
>+                    break;
>+                case 8:
>+                    button = MOUSEBUTTON_BUTTON4;
>+                    break;
>+                case 9:
>+                    button = MOUSEBUTTON_BUTTON5;
>+                    break;
>+
>+                default:
>+                    break;
>             }
> 
>             if (button != MOUSEBUTTON_UNKNOWN)
>             {
>-                event.Type = Event::EVENT_MOUSE_BUTTON_RELEASED;
>+                event.Type               = Event::EVENT_MOUSE_BUTTON_RELEASED;
>                 event.MouseButton.Button = button;
>-                event.MouseButton.X = xEvent.xbutton.x;
>-                event.MouseButton.Y = xEvent.xbutton.y;
>+                event.MouseButton.X      = xEvent.xbutton.x;
>+                event.MouseButton.Y      = xEvent.xbutton.y;
>                 pushEvent(event);
>             }
>         }
>         break;
> 
>-      case KeyPress:
>+        case KeyPress:
>         {
>             Event event;
>-            event.Type = Event::EVENT_KEY_PRESSED;
>+            event.Type     = Event::EVENT_KEY_PRESSED;
>             event.Key.Code = X11CodeToKey(mDisplay, xEvent.xkey.keycode);
>             AddX11KeyStateToEvent(&event, xEvent.xkey.state);
>             pushEvent(event);
>         }
>         break;
> 
>-      case KeyRelease:
>+        case KeyRelease:
>         {
>             Event event;
>-            event.Type = Event::EVENT_KEY_RELEASED;
>+            event.Type     = Event::EVENT_KEY_RELEASED;
>             event.Key.Code = X11CodeToKey(mDisplay, xEvent.xkey.keycode);
>             AddX11KeyStateToEvent(&event, xEvent.xkey.state);
>             pushEvent(event);
>         }
>         break;
> 
>-      case EnterNotify:
>+        case EnterNotify:
>         {
>             Event event;
>             event.Type = Event::EVENT_MOUSE_ENTERED;
>@@ -514,7 +615,7 @@ void X11Window::processEvent(const XEvent &xEvent)
>         }
>         break;
> 
>-      case LeaveNotify:
>+        case LeaveNotify:
>         {
>             Event event;
>             event.Type = Event::EVENT_MOUSE_LEFT;
>@@ -522,23 +623,23 @@ void X11Window::processEvent(const XEvent &xEvent)
>         }
>         break;
> 
>-      case MotionNotify:
>+        case MotionNotify:
>         {
>             Event event;
>-            event.Type = Event::EVENT_MOUSE_MOVED;
>+            event.Type        = Event::EVENT_MOUSE_MOVED;
>             event.MouseMove.X = xEvent.xmotion.x;
>             event.MouseMove.Y = xEvent.xmotion.y;
>             pushEvent(event);
>         }
>         break;
> 
>-      case ConfigureNotify:
>+        case ConfigureNotify:
>         {
>             if (xEvent.xconfigure.width != mWidth || xEvent.xconfigure.height != mHeight)
>             {
>                 Event event;
>-                event.Type = Event::EVENT_RESIZED;
>-                event.Size.Width = xEvent.xconfigure.width;
>+                event.Type        = Event::EVENT_RESIZED;
>+                event.Size.Width  = xEvent.xconfigure.width;
>                 event.Size.Height = xEvent.xconfigure.height;
>                 pushEvent(event);
>             }
>@@ -548,7 +649,7 @@ void X11Window::processEvent(const XEvent &xEvent)
>                 // when resizing) then the X and Y coordinates will be with respect to
>                 // the new parent and not what the user wants to know. Use
>                 // XTranslateCoordinates to get the coordinates on the screen.
>-                int screen = DefaultScreen(mDisplay);
>+                int screen  = DefaultScreen(mDisplay);
>                 Window root = RootWindow(mDisplay, screen);
> 
>                 int x, y;
>@@ -558,7 +659,7 @@ void X11Window::processEvent(const XEvent &xEvent)
>                 if (x != mX || y != mY)
>                 {
>                     Event event;
>-                    event.Type = Event::EVENT_MOVED;
>+                    event.Type   = Event::EVENT_MOVED;
>                     event.Move.X = x;
>                     event.Move.Y = y;
>                     pushEvent(event);
>@@ -567,42 +668,48 @@ void X11Window::processEvent(const XEvent &xEvent)
>         }
>         break;
> 
>-      case FocusIn:
>-        if (xEvent.xfocus.mode == NotifyNormal || xEvent.xfocus.mode == NotifyWhileGrabbed)
>-        {
>-            Event event;
>-            event.Type = Event::EVENT_GAINED_FOCUS;
>-            pushEvent(event);
>-        }
>-        break;
>+        case FocusIn:
>+            if (xEvent.xfocus.mode == NotifyNormal || xEvent.xfocus.mode == NotifyWhileGrabbed)
>+            {
>+                Event event;
>+                event.Type = Event::EVENT_GAINED_FOCUS;
>+                pushEvent(event);
>+            }
>+            break;
> 
>-      case FocusOut:
>-        if (xEvent.xfocus.mode == NotifyNormal || xEvent.xfocus.mode == NotifyWhileGrabbed)
>-        {
>-            Event event;
>-            event.Type = Event::EVENT_LOST_FOCUS;
>-            pushEvent(event);
>-        }
>-        break;
>+        case FocusOut:
>+            if (xEvent.xfocus.mode == NotifyNormal || xEvent.xfocus.mode == NotifyWhileGrabbed)
>+            {
>+                Event event;
>+                event.Type = Event::EVENT_LOST_FOCUS;
>+                pushEvent(event);
>+            }
>+            break;
> 
>-      case DestroyNotify:
>-        // We already received WM_DELETE_WINDOW
>-        break;
>+        case DestroyNotify:
>+            // We already received WM_DELETE_WINDOW
>+            break;
> 
>-      case ClientMessage:
>-        if (xEvent.xclient.message_type == WM_PROTOCOLS &&
>-            static_cast<Atom>(xEvent.xclient.data.l[0]) == WM_DELETE_WINDOW)
>-        {
>-            Event event;
>-            event.Type = Event::EVENT_CLOSED;
>-            pushEvent(event);
>-        }
>-        else if (xEvent.xclient.message_type == TEST_EVENT)
>-        {
>-            Event event;
>-            event.Type = Event::EVENT_TEST;
>-            pushEvent(event);
>-        }
>-        break;
>+        case ClientMessage:
>+            if (xEvent.xclient.message_type == WM_PROTOCOLS &&
>+                static_cast<Atom>(xEvent.xclient.data.l[0]) == WM_DELETE_WINDOW)
>+            {
>+                Event event;
>+                event.Type = Event::EVENT_CLOSED;
>+                pushEvent(event);
>+            }
>+            else if (xEvent.xclient.message_type == TEST_EVENT)
>+            {
>+                Event event;
>+                event.Type = Event::EVENT_TEST;
>+                pushEvent(event);
>+            }
>+            break;
>     }
> }
>+
>+// static
>+OSWindow *OSWindow::New()
>+{
>+    return new X11Window();
>+}
>diff --git a/Source/ThirdParty/ANGLE/util/x11/X11Window.h b/Source/ThirdParty/ANGLE/util/x11/X11Window.h
>index ecc1de3e83a..74e5d0c7d91 100644
>--- a/Source/ThirdParty/ANGLE/util/x11/X11Window.h
>+++ b/Source/ThirdParty/ANGLE/util/x11/X11Window.h
>@@ -9,16 +9,15 @@
> #ifndef UTIL_X11_WINDOW_H
> #define UTIL_X11_WINDOW_H
> 
>-#include <string>
> #include <X11/Xlib.h>
>-#include <X11/Xutil.h>
> #include <X11/Xresource.h>
>+#include <X11/Xutil.h>
>+#include <string>
> 
>-#include <export.h>
>-
>-#include "OSWindow.h"
>+#include "util/OSWindow.h"
>+#include "util/util_export.h"
> 
>-class ANGLE_EXPORT X11Window : public OSWindow
>+class ANGLE_UTIL_EXPORT X11Window : public OSWindow
> {
>   public:
>     X11Window();
>@@ -28,6 +27,7 @@ class ANGLE_EXPORT X11Window : public OSWindow
>     bool initialize(const std::string &name, size_t width, size_t height) override;
>     void destroy() override;
> 
>+    void resetNativeWindow() override;
>     EGLNativeWindowType getNativeWindow() const override;
>     EGLNativeDisplayType getNativeDisplay() const override;
> 
>@@ -53,4 +53,4 @@ class ANGLE_EXPORT X11Window : public OSWindow
>     bool mVisible;
> };
> 
>-#endif // UTIL_X11_WINDOW_H
>+#endif  // UTIL_X11_WINDOW_H
>diff --git a/Source/WebCore/CMakeLists.txt b/Source/WebCore/CMakeLists.txt
>index e06abb5d75b..e0fb489dc68 100644
>--- a/Source/WebCore/CMakeLists.txt
>+++ b/Source/WebCore/CMakeLists.txt
>@@ -1137,12 +1137,6 @@ set(WebCore_SVG_IDL_FILES
>     svg/SVGZoomEvent.idl
> )
> 
>-if (WIN32 AND INTERNAL_BUILD)
>-    set(ANGLE_FORWARDING_HEADERS_DIR "${CMAKE_BINARY_DIR}/../include/private/ANGLE")
>-else ()
>-    set(ANGLE_FORWARDING_HEADERS_DIR "${FORWARDING_HEADERS_DIR}/ANGLE")
>-endif ()
>-
> if (ENABLE_GAMEPAD)
>     list(APPEND WebCore_PRIVATE_INCLUDE_DIRECTORIES
>         "${WEBCORE_DIR}/Modules/gamepad"
>@@ -1210,6 +1204,10 @@ set(WebCore_LIBRARIES
>     PAL${DEBUG_SUFFIX}
> )
> 
>+set(WebCoreTestSupport_LIBRARIES
>+    JavaScriptCore${DEBUG_SUFFIX}
>+)
>+
> if (ENABLE_LEGACY_ENCRYPTED_MEDIA)
>     list(APPEND WebCore_SOURCES
>         Modules/encryptedmedia/legacy/LegacyCDM.cpp
>@@ -1448,6 +1446,15 @@ if (ENABLE_QUOTA)
> endif ()
> 
> if (ENABLE_GRAPHICS_CONTEXT_3D)
>+    list(APPEND WebCore_SOURCES
>+        platform/graphics/ANGLEWebKitBridge.cpp
>+        platform/graphics/FormatConverter.cpp
>+        platform/graphics/GraphicsContext3D.cpp
>+    )
>+
>+    list(APPEND WebCore_LIBRARIES ANGLEFramework)
>+    list(APPEND WebCoreTestSupport_LIBRARIES ANGLEFramework)
>+
>     # For platforms that want to use system-provided OpenGL (ES) / EGL headers,
>     # these include directories, libraries or definitions need to be
>     # added before the ANGLE directories.
>@@ -1490,150 +1497,8 @@ if (ENABLE_GRAPHICS_CONTEXT_3D)
>     endif ()
> 
>     list(APPEND WebCore_PRIVATE_INCLUDE_DIRECTORIES
>-        "${ANGLE_FORWARDING_HEADERS_DIR}"
>         "${WEBCORE_DIR}/platform/graphics/gpu"
>     )
>-
>-    list(APPEND ANGLESupport_SOURCES
>-        ${THIRDPARTY_DIR}/ANGLE/src/common/angleutils.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/common/debug.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/common/event_tracer.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/common/Float16ToFloat32.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/common/mathutil.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/common/MemoryBuffer.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/common/string_utils.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/common/third_party/smhasher/src/PMurHash.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/common/tls.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/common/uniform_type_info_autogen.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/common/utilities.cpp
>-
>-        ${THIRDPARTY_DIR}/ANGLE/src/compiler/preprocessor/DiagnosticsBase.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/compiler/preprocessor/DirectiveHandlerBase.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/compiler/preprocessor/DirectiveParser.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/compiler/preprocessor/ExpressionParser.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/compiler/preprocessor/Input.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/compiler/preprocessor/Lexer.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/compiler/preprocessor/Macro.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/compiler/preprocessor/MacroExpander.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/compiler/preprocessor/Preprocessor.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/compiler/preprocessor/Token.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/compiler/preprocessor/Tokenizer.cpp
>-
>-        ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/ASTMetadataHLSL.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/AddAndTrueToLoopCondition.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/AddDefaultReturnStatements.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/ArrayReturnValueToOutParameter.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/BreakVariableAliasingInInnerLoops.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/BuiltInFunctionEmulator.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/BuiltInFunctionEmulatorGLSL.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/BuiltInFunctionEmulatorHLSL.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/Cache.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/CallDAG.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/ClampPointSize.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/CodeGen.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/CollectVariables.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/Compiler.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/ConstantUnion.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/DeclareAndInitBuiltinsForInstancedMultiview.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/DeferGlobalInitializers.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/Diagnostics.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/DirectiveHandler.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/EmulateGLFragColorBroadcast.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/EmulatePrecision.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/ExpandIntegerPowExpressions.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/ExtensionBehavior.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/ExtensionGLSL.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/FindMain.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/FindSymbolNode.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/FlagStd140Structs.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/HashNames.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/ImageFunctionHLSL.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/InfoSink.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/Initialize.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/InitializeDll.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/InitializeVariables.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/IntermNode.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/IntermNodePatternMatcher.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/IntermNode_util.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/IntermTraverse.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/IsASTDepthBelowLimit.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/Operator.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/OutputESSL.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/OutputGLSL.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/OutputGLSLBase.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/OutputHLSL.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/OutputTree.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/OutputVulkanGLSL.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/ParseContext.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/PoolAlloc.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/PruneNoOps.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/QualifierTypes.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/RecordConstantPrecision.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/RegenerateStructNames.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/RemoveArrayLengthMethod.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/RemoveDynamicIndexing.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/RemoveEmptySwitchStatements.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/RemoveInvariantDeclaration.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/RemoveNoOpCasesFromEndOfSwitchStatements.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/RemovePow.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/RemoveSwitchFallThrough.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/RemoveUnreferencedVariables.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/RewriteDoWhile.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/RewriteElseBlocks.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/RewriteTexelFetchOffset.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/RewriteUnaryMinusOperatorFloat.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/RewriteUnaryMinusOperatorInt.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/RunAtTheEndOfShader.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/ScalarizeVecAndMatConstructorArgs.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/SearchSymbol.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/SeparateArrayInitialization.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/SeparateDeclarations.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/SeparateExpressionsReturningArrays.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/ShaderLang.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/ShaderVars.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/SimplifyLoopConditions.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/SplitSequenceOperator.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/StructureHLSL.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/SymbolTable.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/SymbolUniqueId.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/TextureFunctionHLSL.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/TranslatorESSL.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/TranslatorGLSL.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/TranslatorHLSL.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/TranslatorVulkan.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/Types.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/UnfoldShortCircuitAST.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/UnfoldShortCircuitToIf.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/UniformHLSL.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/UseInterfaceBlockFields.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/UtilsHLSL.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/ValidateGlobalInitializer.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/ValidateLimitations.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/ValidateMaxParameters.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/ValidateOutputs.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/ValidateSwitch.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/ValidateVaryingLocations.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/VariablePacker.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/VectorizeVectorScalarArithmetic.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/VersionGLSL.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/WrapSwitchStatementsInBlocks.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/blocklayout.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/blocklayoutHLSL.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/emulated_builtin_functions_hlsl_autogen.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/glslang_lex.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/glslang_tab.cpp
>-        ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/util.cpp
>-
>-        ${THIRDPARTY_DIR}/ANGLE/src/third_party/compiler/ArrayBoundsClamper.cpp
>-
>-        ${THIRDPARTY_DIR}/ANGLE/src/libANGLE/Platform.cpp
>-    )
>-
>-    list(APPEND WebCore_SOURCES
>-        platform/graphics/ANGLEWebKitBridge.cpp
>-        platform/graphics/FormatConverter.cpp
>-        platform/graphics/GraphicsContext3D.cpp
>-    )
> endif ()
> 
> if (ENABLE_USER_MESSAGE_HANDLERS)
>@@ -1732,10 +1597,6 @@ list(APPEND WebCoreTestSupport_SOURCES
>     testing/js/WebCoreTestSupport.cpp
> )
> 
>-set(WebCoreTestSupport_LIBRARIES
>-    PRIVATE JavaScriptCore${DEBUG_SUFFIX}
>-)
>-
> # Modules that the bindings generator scripts may use
> set(SCRIPTS_RESOLVE_SUPPLEMENTAL
>     ${WEBCORE_DIR}/bindings/scripts/IDLParser.pm
>@@ -2121,36 +1982,6 @@ if (WebCoreTestSupport_OUTPUT_NAME)
>     endif ()
> endif ()
> 
>-if (ENABLE_GRAPHICS_CONTEXT_3D AND NOT WIN32)
>-    add_library(ANGLESupport STATIC ${ANGLESupport_SOURCES})
>-
>-    # Enable the ESSL and GLSL translators.
>-    set_property(TARGET ANGLESupport
>-        PROPERTY COMPILE_DEFINITIONS
>-        ANGLE_ENABLE_ESSL
>-        ANGLE_ENABLE_GLSL
>-        ${ANGLE_PLATFORM_DEFINITIONS})
>-
>-    target_include_directories(ANGLESupport PRIVATE
>-        "${THIRDPARTY_DIR}/ANGLE"
>-        "${THIRDPARTY_DIR}/ANGLE/include"
>-        "${THIRDPARTY_DIR}/ANGLE/include/KHR"
>-        "${THIRDPARTY_DIR}/ANGLE/src"
>-        "${THIRDPARTY_DIR}/ANGLE/src/common/third_party/base"
>-    )
>-    target_link_libraries(WebCore ANGLESupport)
>-
>-    if (COMPILER_IS_GCC_OR_CLANG)
>-        WEBKIT_ADD_TARGET_CXX_FLAGS(ANGLESupport -Wno-implicit-fallthrough
>-                                                 -Wno-inconsistent-missing-override
>-                                                 -Wno-null-conversion
>-                                                 -Wno-suggest-attribute=format
>-                                                 -Wno-unused-function
>-                                                 -Wno-unused-parameter)
>-    endif ()
>-endif ()
>-
>-
> if (${WebCore_LIBRARY_TYPE} MATCHES "SHARED")
>     set_target_properties(WebCore PROPERTIES VERSION ${PROJECT_VERSION} SOVERSION ${PROJECT_VERSION_MAJOR})
>     install(TARGETS WebCore DESTINATION "${LIB_INSTALL_DIR}")
>diff --git a/Source/WebCore/PlatformGTK.cmake b/Source/WebCore/PlatformGTK.cmake
>index b9682cfa0e0..856a005226d 100644
>--- a/Source/WebCore/PlatformGTK.cmake
>+++ b/Source/WebCore/PlatformGTK.cmake
>@@ -15,8 +15,6 @@ list(APPEND WebCore_UNIFIED_SOURCE_LIST_FILES
> )
> 
> list(APPEND WebCore_PRIVATE_INCLUDE_DIRECTORIES
>-    "${THIRDPARTY_DIR}/ANGLE/"
>-    "${THIRDPARTY_DIR}/ANGLE/include/KHR"
>     "${WEBCORE_DIR}/accessibility/atk"
>     "${WEBCORE_DIR}/editing/atk"
>     "${WEBCORE_DIR}/page/gtk"
>diff --git a/Source/WebCore/PlatformMac.cmake b/Source/WebCore/PlatformMac.cmake
>index d7012814275..dec34334a0f 100644
>--- a/Source/WebCore/PlatformMac.cmake
>+++ b/Source/WebCore/PlatformMac.cmake
>@@ -71,9 +71,6 @@ if (NOT LOOKUP_FRAMEWORK-NOTFOUND)
> endif ()
> 
> list(APPEND WebCore_PRIVATE_INCLUDE_DIRECTORIES
>-    "${CMAKE_SOURCE_DIR}/Source"
>-    "${THIRDPARTY_DIR}/ANGLE"
>-    "${THIRDPARTY_DIR}/ANGLE/include/KHR"
>     "${WEBCORE_DIR}/accessibility/mac"
>     "${WEBCORE_DIR}/bridge/objc"
>     "${WEBCORE_DIR}/editing/cocoa"
>diff --git a/Source/WebCore/PlatformPlayStation.cmake b/Source/WebCore/PlatformPlayStation.cmake
>index 84edc2616b3..d1ea46ce800 100644
>--- a/Source/WebCore/PlatformPlayStation.cmake
>+++ b/Source/WebCore/PlatformPlayStation.cmake
>@@ -5,8 +5,6 @@ include(platform/ImageDecoders.cmake)
> include(platform/TextureMapper.cmake)
> 
> list(APPEND WebCore_PRIVATE_INCLUDE_DIRECTORIES
>-    ${THIRDPARTY_DIR}/ANGLE/
>-    ${THIRDPARTY_DIR}/ANGLE/include/KHR
>     ${WEBCORE_DIR}/platform
>     ${WEBCORE_DIR}/platform/generic
>     ${WEBCORE_DIR}/platform/graphics/egl
>diff --git a/Source/WebCore/PlatformWPE.cmake b/Source/WebCore/PlatformWPE.cmake
>index 3bd9a067bcb..1cad0e617fb 100644
>--- a/Source/WebCore/PlatformWPE.cmake
>+++ b/Source/WebCore/PlatformWPE.cmake
>@@ -16,12 +16,7 @@ list(APPEND WebCore_UNIFIED_SOURCE_LIST_FILES
>     "platform/SourcesGLib.txt"
> )
> 
>-# Allow building ANGLE on platforms that don't provide X11 headers.
>-list(APPEND ANGLE_PLATFORM_DEFINITIONS "USE_WPE")
>-
> list(APPEND WebCore_PRIVATE_INCLUDE_DIRECTORIES
>-    "${THIRDPARTY_DIR}/ANGLE/"
>-    "${THIRDPARTY_DIR}/ANGLE/include/KHR"
>     "${WEBCORE_DIR}/platform/graphics/egl"
>     "${WEBCORE_DIR}/platform/graphics/epoxy"
>     "${WEBCORE_DIR}/platform/graphics/glx"
>diff --git a/Source/WebCore/PlatformWin.cmake b/Source/WebCore/PlatformWin.cmake
>index bdc70cd2b0e..eaf009f7b02 100644
>--- a/Source/WebCore/PlatformWin.cmake
>+++ b/Source/WebCore/PlatformWin.cmake
>@@ -14,11 +14,8 @@ list(APPEND WebCore_PRIVATE_INCLUDE_DIRECTORIES
>     "${WEBCORE_DIR}/platform/win"
> )
> 
>-# FIXME: ANGLE should put its headers into a single directory
> list(APPEND WebCore_INCLUDE_DIRECTORIES
>     "${DERIVED_SOURCES_DIR}/ForwardingHeaders"
>-    "${THIRDPARTY_DIR}/ANGLE/include"
>-    "${THIRDPARTY_DIR}/ANGLE/include/egl"
> )
> 
> list(APPEND WebCore_SOURCES
>@@ -244,7 +241,4 @@ set(WebCore_OUTPUT_NAME
> )
> 
> list(APPEND WebCore_LIBRARIES WTF${DEBUG_SUFFIX})
>-if (TARGET libEGL)
>-    list(APPEND WebCore_LIBRARIES libEGL)
>-endif ()
> list(APPEND WebCoreTestSupport_LIBRARIES WTF${DEBUG_SUFFIX})
>diff --git a/Source/WebCore/platform/graphics/ANGLEWebKitBridge.h b/Source/WebCore/platform/graphics/ANGLEWebKitBridge.h
>index 38235919526..9eba2f49ab9 100644
>--- a/Source/WebCore/platform/graphics/ANGLEWebKitBridge.h
>+++ b/Source/WebCore/platform/graphics/ANGLEWebKitBridge.h
>@@ -32,7 +32,7 @@
> #include <epoxy/gl.h>
> #endif
> 
>-#include <ANGLE/ShaderLang.h>
>+#include <GLSLANG/ShaderLang.h>
> #include <wtf/text/WTFString.h>
> 
> #if PLATFORM(COCOA)
>diff --git a/Source/WebCore/platform/graphics/GLContext.cpp b/Source/WebCore/platform/graphics/GLContext.cpp
>index 0db199cd41c..5d0b5ed428f 100644
>--- a/Source/WebCore/platform/graphics/GLContext.cpp
>+++ b/Source/WebCore/platform/graphics/GLContext.cpp
>@@ -29,7 +29,6 @@
> #if USE(LIBEPOXY)
> #include <epoxy/gl.h>
> #elif USE(OPENGL_ES)
>-#define GL_GLEXT_PROTOTYPES 1
> #include <GLES2/gl2.h>
> #endif
> 
>diff --git a/Source/WebCore/platform/graphics/egl/GLContextEGL.cpp b/Source/WebCore/platform/graphics/egl/GLContextEGL.cpp
>index 732137c6b9c..d6ff3790a37 100644
>--- a/Source/WebCore/platform/graphics/egl/GLContextEGL.cpp
>+++ b/Source/WebCore/platform/graphics/egl/GLContextEGL.cpp
>@@ -38,7 +38,6 @@
> #if USE(LIBEPOXY)
> #include <epoxy/gl.h>
> #elif USE(OPENGL_ES)
>-#define GL_GLEXT_PROTOTYPES 1
> #include <GLES2/gl2.h>
> #include <GLES2/gl2ext.h>
> #else
>diff --git a/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGLCommon.cpp b/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGLCommon.cpp
>index d3f00e600be..bf91e72457a 100644
>--- a/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGLCommon.cpp
>+++ b/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGLCommon.cpp
>@@ -50,7 +50,6 @@
> #include "EpoxyShims.h"
> #elif USE(OPENGL_ES)
> #include "OpenGLESShims.h"
>-#define GL_GLEXT_PROTOTYPES 1
> #include <GLES2/gl2.h>
> #include <GLES2/gl2ext.h>
> #elif PLATFORM(GTK) || PLATFORM(WIN)
>diff --git a/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGLES.h b/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGLES.h
>index d01e3b2930f..f56222f2089 100644
>--- a/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGLES.h
>+++ b/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGLES.h
>@@ -33,7 +33,6 @@
> #if USE(LIBEPOXY)
> #include <epoxy/gl.h>
> #else
>-#define GL_GLEXT_PROTOTYPES 1
> #include <GLES2/gl2.h>
> #include <GLES2/gl2ext.h>
> #endif
>diff --git a/Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGLES.cpp b/Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGLES.cpp
>index 14d42862bf2..fc9459e3c1a 100644
>--- a/Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGLES.cpp
>+++ b/Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGLES.cpp
>@@ -40,7 +40,7 @@
> #if PLATFORM(WIN)
> #include <GLSLANG/ShaderLang.h>
> #else
>-#include <ANGLE/ShaderLang.h>
>+#include <GLSLANG/ShaderLang.h>
> #endif
> 
> namespace WebCore {
>diff --git a/Source/WebCore/platform/graphics/opengl/TemporaryOpenGLSetting.cpp b/Source/WebCore/platform/graphics/opengl/TemporaryOpenGLSetting.cpp
>index f2ea7130009..2ffa6b77673 100644
>--- a/Source/WebCore/platform/graphics/opengl/TemporaryOpenGLSetting.cpp
>+++ b/Source/WebCore/platform/graphics/opengl/TemporaryOpenGLSetting.cpp
>@@ -41,7 +41,6 @@
> #endif
> 
> #elif USE(OPENGL_ES)
>-#define GL_GLEXT_PROTOTYPES 1
> #include <GLES2/gl2.h>
> #include "OpenGLESShims.h"
> 
>diff --git a/Source/WebCore/platform/graphics/texmap/GraphicsContext3DTextureMapper.cpp b/Source/WebCore/platform/graphics/texmap/GraphicsContext3DTextureMapper.cpp
>index 652c90fdb01..fe705bdf0ad 100644
>--- a/Source/WebCore/platform/graphics/texmap/GraphicsContext3DTextureMapper.cpp
>+++ b/Source/WebCore/platform/graphics/texmap/GraphicsContext3DTextureMapper.cpp
>@@ -38,7 +38,7 @@
> #if PLATFORM(WIN)
> #include <GLSLANG/ShaderLang.h>
> #else
>-#include <ANGLE/ShaderLang.h>
>+#include <GLSLANG/ShaderLang.h>
> #endif
> 
> #if USE(LIBEPOXY)
>diff --git a/Source/WebCore/platform/graphics/texmap/TextureMapperGLHeaders.h b/Source/WebCore/platform/graphics/texmap/TextureMapperGLHeaders.h
>index 53e2069e0a0..fdd25425859 100644
>--- a/Source/WebCore/platform/graphics/texmap/TextureMapperGLHeaders.h
>+++ b/Source/WebCore/platform/graphics/texmap/TextureMapperGLHeaders.h
>@@ -28,7 +28,6 @@
> #if USE(LIBEPOXY)
> #include <epoxy/gl.h>
> #elif USE(OPENGL_ES)
>-#define GL_GLEXT_PROTOTYPES 1
> #include <GLES2/gl2.h>
> #else
> #include "OpenGLShims.h"
>diff --git a/Source/WebKit/CMakeLists.txt b/Source/WebKit/CMakeLists.txt
>index ce4f200b5fc..4b0bec7cb80 100644
>--- a/Source/WebKit/CMakeLists.txt
>+++ b/Source/WebKit/CMakeLists.txt
>@@ -272,11 +272,6 @@ if (ENABLE_GRAPHICS_CONTEXT_3D)
>             add_definitions(${EGL_DEFINITIONS})
>         endif ()
>     endif ()
>-
>-    list(APPEND WebKit_INCLUDE_DIRECTORIES
>-        "${THIRDPARTY_DIR}/ANGLE"
>-        "${THIRDPARTY_DIR}/ANGLE/include/KHR"
>-    )
> endif ()
> 
> if (ATOMIC_INT64_REQUIRES_LIBATOMIC)
>diff --git a/Source/WebKitLegacy/PlatformWin.cmake b/Source/WebKitLegacy/PlatformWin.cmake
>index 3506b154db7..7408928bf18 100644
>--- a/Source/WebKitLegacy/PlatformWin.cmake
>+++ b/Source/WebKitLegacy/PlatformWin.cmake
>@@ -52,10 +52,6 @@ list(APPEND WebKitLegacy_PRIVATE_INCLUDE_DIRECTORIES
>     "${WEBKITLEGACY_DIR}/win/WebCoreSupport"
>     "${WebKitLegacy_DERIVED_SOURCES_DIR}/include"
>     "${WebKitLegacy_DERIVED_SOURCES_DIR}/Interfaces"
>-    "${FORWARDING_HEADERS_DIR}/ANGLE"
>-    "${FORWARDING_HEADERS_DIR}/ANGLE/include"
>-    "${FORWARDING_HEADERS_DIR}/ANGLE/include/egl"
>-    "${FORWARDING_HEADERS_DIR}/ANGLE/include/khr"
> )
> 
> list(APPEND WebKitLegacy_INCLUDES
>@@ -452,14 +448,6 @@ list(APPEND WebKitLegacy_LIBRARIES
>     PRIVATE WindowsCodecs
> )
> 
>-if (ENABLE_GRAPHICS_CONTEXT_3D)
>-    list(APPEND WebKitLegacy_LIBRARIES
>-        libANGLE${DEBUG_SUFFIX}
>-        libEGL${DEBUG_SUFFIX}
>-        libGLESv2${DEBUG_SUFFIX}
>-    )
>-endif ()
>-
> set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /SUBSYSTEM:WINDOWS")
> set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /SUBSYSTEM:WINDOWS")
> 
>diff --git a/Source/WebKitLegacy/win/WebCoreSupport/AcceleratedCompositingContext.cpp b/Source/WebKitLegacy/win/WebCoreSupport/AcceleratedCompositingContext.cpp
>index ae47e305876..e447370d9d1 100644
>--- a/Source/WebKitLegacy/win/WebCoreSupport/AcceleratedCompositingContext.cpp
>+++ b/Source/WebKitLegacy/win/WebCoreSupport/AcceleratedCompositingContext.cpp
>@@ -43,7 +43,6 @@
> #include <WebCore/TextureMapperLayer.h>
> 
> #if USE(OPENGL_ES)
>-#define GL_GLEXT_PROTOTYPES 1
> #include <GLES2/gl2.h>
> #else
> #include <GL/gl.h>
>diff --git a/Source/cmake/OptionsWinCairo.cmake b/Source/cmake/OptionsWinCairo.cmake
>index 2458e7e37af..a716ec6f0ea 100644
>--- a/Source/cmake/OptionsWinCairo.cmake
>+++ b/Source/cmake/OptionsWinCairo.cmake
>@@ -33,6 +33,8 @@ SET_AND_EXPOSE_TO_BUILD(USE_INSPECTOR_SOCKET_SERVER ENABLE_REMOTE_INSPECTOR)
> set(ENABLE_GRAPHICS_CONTEXT_3D ON)
> set(ENABLE_WEBKIT ON)
> 
>+set(USE_ANGLE_EGL ON)
>+
> set(COREFOUNDATION_LIBRARY CFlite)
> 
> SET_AND_EXPOSE_TO_BUILD(ENABLE_DEVELOPER_MODE ${DEVELOPER_MODE})
>@@ -40,6 +42,7 @@ SET_AND_EXPOSE_TO_BUILD(ENABLE_DEVELOPER_MODE ${DEVELOPER_MODE})
> add_definitions(-DWTF_PLATFORM_WIN_CAIRO=1)
> 
> # Override headers directories
>+set(ANGLE_FRAMEWORK_HEADERS_DIR ${CMAKE_BINARY_DIR}/ANGLE/Headers)
> set(WTF_FRAMEWORK_HEADERS_DIR ${CMAKE_BINARY_DIR}/WTF/Headers)
> set(JavaScriptCore_FRAMEWORK_HEADERS_DIR ${CMAKE_BINARY_DIR}/JavaScriptCore/Headers)
> set(JavaScriptCore_PRIVATE_FRAMEWORK_HEADERS_DIR ${CMAKE_BINARY_DIR}/JavaScriptCore/PrivateHeaders)
>diff --git a/Source/cmake/WebKitFS.cmake b/Source/cmake/WebKitFS.cmake
>index b182e1a18d6..b4918c1e107 100644
>--- a/Source/cmake/WebKitFS.cmake
>+++ b/Source/cmake/WebKitFS.cmake
>@@ -50,6 +50,7 @@ set(WebInspectorUI_DERIVED_SOURCES_DIR "${CMAKE_BINARY_DIR}/DerivedSources/WebIn
> 
> set(FORWARDING_HEADERS_DIR ${DERIVED_SOURCES_DIR}/ForwardingHeaders)
> 
>+set(ANGLE_FRAMEWORK_HEADERS_DIR ${FORWARDING_HEADERS_DIR})
> set(WTF_FRAMEWORK_HEADERS_DIR ${FORWARDING_HEADERS_DIR})
> set(JavaScriptCore_FRAMEWORK_HEADERS_DIR ${FORWARDING_HEADERS_DIR})
> set(JavaScriptCore_PRIVATE_FRAMEWORK_HEADERS_DIR ${FORWARDING_HEADERS_DIR})
>diff --git a/Tools/TestWebKitAPI/PlatformWin.cmake b/Tools/TestWebKitAPI/PlatformWin.cmake
>index 931fa2b92d9..651ea158487 100644
>--- a/Tools/TestWebKitAPI/PlatformWin.cmake
>+++ b/Tools/TestWebKitAPI/PlatformWin.cmake
>@@ -57,7 +57,6 @@ if (${WTF_PLATFORM_WIN_CAIRO})
>     list(APPEND TestWebCore_LIBRARIES
>         ${CAIRO_LIBRARIES}
>         ${OPENSSL_LIBRARIES}
>-        libANGLE
>         mfuuid
>         strmiids
>         vcruntime

Actions: View | Formatted Diff | Diff

Attachments on bug 197676: 369333 | 369336 | 369351 | 369365 | 369395 | 369406 | 369454 | 369510